diff --git a/Makefile b/Makefile
index 2f5e37c2ec..f9bc8ba938 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,9 @@
 
 # Packages (separated by spaces) to link in development mode or
 # to include in a distribution:
-PKGS = main-distribution plt-services
+PKGS = base racket-lib # plt-services
+LINK_PKGS = $(PKGS) racket-doc at-exp-lib racket-test racket-benchmarks racket-index
+INSTALL_PKGS = main-distribution main-distribution-test
 
 # ------------------------------------------------------------
 # In-place build
@@ -29,6 +31,10 @@ PKGS = main-distribution plt-services
 PLAIN_RACKET = racket/bin/racket
 WIN32_PLAIN_RACKET = racket\racket
 
+PLAIN_RACO = racket/bin/racket -N raco -l- raco
+WIN32_PLAIN_RACO = racket\racket -N raco -l- raco
+
+
 MACOSX_CHECK_ARGS = -I racket/base -e '(case (system-type) [(macosx) (exit 0)] [else (exit 1)])'
 MACOSX_CHECK = $(PLAIN_RACKET) -G build/config $(MACOSX_CHECK_ARGS)
 
@@ -46,6 +52,7 @@ cpus-in-place:
 
 # Explicitly propagate variables for non-GNU `make's:
 PKG_LINK_COPY_ARGS = PKGS="$(PKGS)" LINK_MODE="$(LINK_MODE)"
+PKG_LINK_COPY_EXTRA_ARGS = PKGS="$(LINK_PKGS)" LINK_MODE="$(LINK_MODE)"
 LIBSETUP = -N raco -l- raco setup
 
 plain-in-place:
@@ -53,6 +60,9 @@ plain-in-place:
 	if $(MACOSX_CHECK) ; then $(MAKE) native-from-git ; fi
 	$(MAKE) pkg-links $(PKG_LINK_COPY_ARGS)
 	$(PLAIN_RACKET) $(LIBSETUP) $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)
+	$(MAKE) pkg-extra-links $(PKG_LINK_COPY_EXTRA_ARGS) # NOTE: no setup after this step
+	$(PLAIN_RACO) pkg install $(JOB_OPTIONS) --scope installation \
+	 --deps search-auto $(INSTALL_PKGS)
 
 # For Windows: set up the following collections first, so that native
 # libraries are in place for use by a full setup:
@@ -63,6 +73,8 @@ win32-in-place:
 	$(MAKE) win32-pkg-links $(PKG_LINK_COPY_ARGS)
 	$(WIN32_PLAIN_RACKET) $(LIBSETUP) -nxiID $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS) $(LIB_PRE_COLLECTS)
 	$(WIN32_PLAIN_RACKET) $(LIBSETUP) $(JOB_OPTIONS) $(PLT_SETUP_OPTIONS)
+	$(WIN32_PLAIN_RACO) pkg install $(JOB_OPTIONS) --scope installation \
+	 --deps search-auto $(INSTALL_PKGS)
 
 again:
 	$(MAKE) LINK_MODE="--restore"
@@ -96,6 +108,7 @@ plain-unix-style:
 	$(MAKE) local-catalog-maybe-native RACKET="$(DESTDIR)$(PREFIX)/bin/racket"
 	"$(DESTDIR)$(PREFIX)/bin/raco" pkg install $(UNIX_RACO_ARGS) $(REQUIRED_PKGS) $(PKGS)
 	cd racket/src/build; $(MAKE) fix-paths
+	"$(DESTDIR)$(PREFIX)/bin/raco" pkg install $(JOB_OPTIONS) -i --dep search-auto $(INSTALL_PKGS)
 
 error-need-prefix:
 	: ================================================================
@@ -302,6 +315,9 @@ LINK_ALL = -U -G build/config racket/src/link-all.rkt ++dir pkgs ++dir native-pk
 pkg-links:
 	$(PLAIN_RACKET) $(LINK_ALL) $(LINK_MODE) $(PKGS) $(REQUIRED_PKGS)
 
+pkg-extra-links:
+	$(PLAIN_RACKET) $(LINK_ALL) $(LINK_MODE) $(LINK_PKGS) $(REQUIRED_PKGS)
+
 win32-pkg-links:
 	IF NOT EXIST native-pkgs\racket-win32-i386 $(MAKE) complain-no-submodule
 	$(MAKE) pkg-links PLAIN_RACKET="$(WIN32_PLAIN_RACKET)" LINK_MODE="$(LINK_MODE)" PKGS="$(PKGS)"
diff --git a/pkgs/algol60/LICENSE.txt b/pkgs/algol60/LICENSE.txt
deleted file mode 100644
index c2900e58d6..0000000000
--- a/pkgs/algol60/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-algol60
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/algol60/algol60.rkt b/pkgs/algol60/algol60.rkt
deleted file mode 100644
index e15e94a982..0000000000
--- a/pkgs/algol60/algol60.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#cs(module algol60 mzscheme
-     (require-for-syntax "parse.rkt"
-                         ;; Parses to generate an AST. Identifiers in the AST
-                         ;; are represented as syntax objects with source location.
-
-                         "simplify.rkt"
-                         ;; Desugars the AST, transforming `for' to `if'+`goto',
-                         ;; and flattening `if' statements so they are always
-                         ;; of the for `if <exp> then goto <label> else goto <label>'
-
-                         "compile.rkt"
-                         ;; Compiles a simplified AST to Scheme.
-
-                         mzlib/file)
-
-     ;; By using #'here for the context of identifiers
-     ;; introduced by compilation, the identifiers can
-     ;; refer to runtime functions and primitives, as
-     ;; well as mzscheme:
-     (require "runtime.rkt" "prims.rkt")
-
-
-     (provide include-algol literal-algol)
-
-     (define-syntax (include-algol stx)
-       (syntax-case stx ()
-         [(_ str)
-          (string? (syntax-e (syntax str)))
-          
-	  (compile-simplified
-	   (simplify 
-	    (parse-a60-file 
-	     (normalize-path (syntax-e (syntax str))
-			     (or
-			      (current-load-relative-directory)
-			      (current-directory))))
-	    #'here)
-	   #'here)]))
-     
-     (define-syntax (literal-algol stx)
-       (syntax-case stx ()
-         [(_ strs ...)
-          (andmap (λ (x) (string? (syntax-e x))) 
-                  (syntax->list (syntax (strs ...))))
-          
-	  (compile-simplified
-	   (simplify 
-	    (parse-a60-port
-             (open-input-string 
-              (apply 
-               string-append
-               (map syntax-e (syntax->list #'(strs ...)))))
-             (syntax-source stx))
-	    #'here)
-	   #'here)])))
diff --git a/pkgs/algol60/algol60.scrbl b/pkgs/algol60/algol60.scrbl
deleted file mode 100644
index 354c3df44c..0000000000
--- a/pkgs/algol60/algol60.scrbl
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          (for-label algol60/algol60))
-
-@title{Algol 60}
-
-@section{Implementation}
-
-The ``Algol 60'' language for DrRacket implements the language defined
-by the ``Revised Report on the Algorithmic Language Algol 60,'' edited
-by Peter Naur.
-
-@section{Including Algol 60 Programs}
-
-Although Algol 60 is mainly provided as a DrRacket language,
-@racket[include-algol] supports limited use of Algol 60 programs in
-larger programs.
-
-@defmodule[algol60/algol60]
-
-@defform[(include-algol path-string)]{
-
-Includes the Algol 60 program indicated by @racket[path-string] as an
-expression in a Racket program. The included Algol 60 program is
-closed (i.e., it doesn't see any bindings in the included context),
-and the result is always @|void-const|.}
-
-
-@defform[(literal-algol string ...)]{
-
-Evaluates the Algol 60 program indicated by the literal @racket[string]s
-as an expression in a Racket program. The Algol 60 program is
-closed (i.e., it doesn't see any bindings in the included context),
-and the result is always @|void-const|.
-
-This is generally useful when combined with the @racketmodname[at-exp] reader,
-e.g.,
-@codeblock|{
-#lang at-exp racket
-@literal-algol{
-  begin
-    printsln (`hello world')
-  end
-}
-}|
-}
-
-@section{Language}
-
-The DrRacket and @racket[include-algol] implementation departs from
-the Algol 60 specification in the following minor ways:
-
-@(itemize (item "Strings are not permitted to contain nested quotes.")
-          (item "Identifiers cannot contain whitespace.")
-          (item "Argument separators are constrained to be identifiers (i.e., they
-    cannot be keywords, and they cannot consist of multiple
-    identifiers separated by whitespace.)")
-          (item "Numbers containing exponents (using the ``10'' subscript) are not
-    supported."))
-
-Identifiers and keywords are case-sensitive. The boldface/underlined
-keywords of the report are represented by the obvious character
-sequence, as are most operators. A few operators do not fit into
-ASCII, and they are mapped as follows:
-
-@(verbatim 
-"   times             *
-   quotient          div
-   exponential       ^  
-   less or equal     <= 
-   greater or equal  >=
-   not equal         !=
-   equivalence       ==
-   implication       =>
-   and               &
-   or                |
-   negation          !")
-
-In addition to the standard functions, the following output functions
-are supported:
-
-@(verbatim
-"   prints(E)    prints the string E
-   printsln(E)  prints the string E followed by a newline
-   printn(E)    prints the number E
-   printnln(E)  prints the number E followed by a newline")
-
-A prompt in DrRacket's interactions area accepts whole programs only
-for the Algol 60 language.
-
diff --git a/pkgs/algol60/base.rkt b/pkgs/algol60/base.rkt
deleted file mode 100644
index a994ca1be7..0000000000
--- a/pkgs/algol60/base.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-(module base mzscheme
-  (require "prims.rkt"
-           "runtime.rkt")
-
-  (define base-importing-stx #'here)
-
-  (provide (all-from mzscheme)
-           (all-from "prims.rkt")
-           (all-from "runtime.rkt")
-           base-importing-stx))
diff --git a/pkgs/algol60/bd-tool.rkt b/pkgs/algol60/bd-tool.rkt
deleted file mode 100644
index fd94bdb1e7..0000000000
--- a/pkgs/algol60/bd-tool.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang s-exp framework/private/decode
-
-jVTJbtswEL3rK6YujJBFmbhGFyBAF/TUc69BAlDiWGJCkSpJ2/HfdyhKka04TXmwoZk3bxa+Y
-   c        E     8        /     t              l     q                 j
-9  \  B  \  \  \  \  \6V\  \  \  \  \OB\  \l9\  \  \  \  \YD\xq\jI\yh\  P
-F     j  a     3  U  E     5  Y     e     v     6  J  z  h     R        c
-EUb\rRF  \8K\4s\  \  D6J\U8v  \C9\AG\  \AGI  7AbB  \  \  \  \  S  xg5\awK
-4        p        u  S     E     Y     F  V  W     +  /     R  R        j
-G  \YO\b/\  lBK\cA\  \  \  \aQ\  \  \n8\  \  \  FVi\Ci\db\Z2\  \ID\i8\  I
-V        P  R     q  J  O        p        j     W           n        M  +
-Utd\S3\  \  \  \  \  \  \Kt\hg\YTqvo\D2\vl\Aw\pX\  3mM\VC\  \R1\b2\  S  1
-H        H     3     n        L                 r  T     Z        K  d  J
-L  \yscoZ\Qyjtb\DY\sp\Km\d+\  \  \  \bxacF\iU\  \  \  6  \vK\+q\  \  \  x
-e  n        y                 Y  2  O        0  e  A  r        +  W  k  U
-7  \  \  2  \  \gW\Zf\tK\KU\eH\  \  \  \Xa\  \  X  \  BEV\/u\  \  \  \  D
-m     q  M     Y                 q  9  V     b  D  h     8  5  P  8  d  0
-aCum5h\  \C+O0s\  6EZ\V5\6o\Rq\lp\  \  \  \C2Y  \  \6Xk  \  \  p  \  l  7
-W        s     I  H           o     g  y        V     N  A  i  r  y  /  W
-n  /uc\cT\  \  H  \  \m5F5lu  \  LGY\  \Fq\5c\IB\+Db  \  \  \  \  z  \  R
-G           A  C  u        i  H     3        H     m  3  0              w
-ohK\e3\HNHWR\  \  dFh\ka\  \  \wF\  \Mt\53\  z  \  \  \  \SZ\eh\arDF6\  2
-S              /        I  z        a     G     j     8        8        d
-I  \ht\DDxgusWt\kw\A+\  w  \c1\rN\re\  u  \5N\c/\M4r4v\Qm\y8\  \  \bH\EJY
-d                       u        h     X  /                 Y  d        s
-L  \wx\2Z\Jb\Yto26\Gl\10\p2U2x\  \  \h7\  \  \eV\k0Q8u\sB\  w  ttQ5Q2\  6
-n     5     N                 +     O     j  L     e     Y  f  Z        5
-ODhg  \  \  \  \x0HZM\8kJnas  \zN\H2\  \Qv6  \  \  \  \  \  \  Mly\2p\Nq1
-D     8  g     P           u  4     o     n     O  p  n     0           +
-F  \o3S  \0rh6C\  Ytf\su\  \  s  \  \O8\  \FP\72J  D03\8P\vt\AZ\vFula\  b
-2  d     6     P  S        F  o  M  Q     R     Z  0           w     Q  H
-o  \  \ah\  \  \  \  \/g\Yc\  \  e  \  \59\  \  \  \  mekqmzi  \  zHvD  5
-C  P        C  o  T           Q  u  H        2     q     8     f     x  K
-5  \XP\BSucV\  \  \+j\no\lC\P2\  \  \78\Lk\iw\da\kw\u6\  \  \PZ\ob\  q  s
-m              Z                 o                       5           7
-fBFSNtDWKqqHXiB7IqWDy0btkw9A+GJ7Z2L4h2Oy9YU9ipwxX+Bgp23X+OxIsnBVxmgMv/gI=
diff --git a/pkgs/algol60/bd.jpg b/pkgs/algol60/bd.jpg
deleted file mode 100644
index 689dda07cf..0000000000
Binary files a/pkgs/algol60/bd.jpg and /dev/null differ
diff --git a/pkgs/algol60/cfg-parser.rkt b/pkgs/algol60/cfg-parser.rkt
deleted file mode 100644
index 67d373d01c..0000000000
--- a/pkgs/algol60/cfg-parser.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-;; Legacy module.  cfg-parser used to live in the algol60 collection.
-;; This module re-exports its contents for backwards compatibility.
-
-(require parser-tools/cfg-parser)
-(provide (all-from-out parser-tools/cfg-parser))
diff --git a/pkgs/algol60/compile.rkt b/pkgs/algol60/compile.rkt
deleted file mode 100644
index c7677ba2d8..0000000000
--- a/pkgs/algol60/compile.rkt
+++ /dev/null
@@ -1,536 +0,0 @@
-#cs(module compile mzscheme
-     (require "parse.rkt"
-              mzlib/match
-              mzlib/list)
-
-     (provide compile-simplified)
-
-     ;; The compiler generates references to "prims.rkt" and
-     ;; "runtime.rkt" exports, as well as Racket forms
-     ;; and functions. The `ctx' argument provides
-     ;; an appropriate context for those bindings (in
-     ;; the form of a syntax object to use with d->s-o).
-     (define (compile-simplified stmt ctx)
-       (datum->syntax-object 
-	ctx
-	(parameterize ([current-compile-context ctx])
-	  (compile-a60 stmt 'void (empty-context) #t))))
-
-     (define current-compile-context (make-parameter #f))
-     
-     (define (compile-a60 stmt next-label context add-to-top-level?)
-       (match stmt
-         [($ a60:block decls statements)
-          (compile-block decls statements next-label context add-to-top-level?)]
-         [else
-          (compile-statement stmt next-label context)]))
-     
-     (define (compile-block decls statements next-label context add-to-top-level?)
-       (let* ([labels-with-numbers (map car statements)]
-              [labels (map (lambda (l)
-                             (if (stx-number? l)
-				 (datum->syntax-object
-				  l
-				  (string->symbol (format "~a" (syntax-e l)))
-				  l
-				  l)
-                                 l))
-                           labels-with-numbers)]
-              ;; Build environment by adding labels, then decls:
-              [context (foldl (lambda (decl context)
-                                (match decl
-                                  [($ a60:proc-decl result-type var arg-vars by-value-vars arg-specs body)
-                                   (add-procedure context var result-type arg-vars by-value-vars arg-specs)]
-                                  [($ a60:type-decl type ids)
-                                   (add-atoms context ids type)]
-                                  [($ a60:array-decl type arrays)
-                                   (add-arrays context 
-                                               (map car arrays) ; names
-                                               (map cdr arrays) ; dimensions
-                                               type)]
-                                  [($ a60:switch-decl name exprs)
-                                   (add-switch context name)]))
-                              (add-labels
-                               context
-                               labels)
-                              decls)])
-         ;; Generate bindings and initialization for all decls,
-         ;; plus all statements (thunked):
-	 (let ([bindings
-		(append
-		 (apply
-		  append
-                  ;; Decls:
-		  (map (lambda (decl)
-			 (match decl
-                           [($ a60:proc-decl result-type var arg-vars by-value-vars arg-specs body)
-                            (let ([code
-                                   `(lambda (kont . ,arg-vars)
-                                      ;; Extract by-value variables
-                                      (let ,(map (lambda (var)
-                                                   `[,var (get-value ,var)])
-                                                 by-value-vars)
-                                        ;; Set up the result variable and done continuation:
-                                        ,(let ([result-var (gensym 'prec-result)]
-                                               [done (gensym 'done)])
-                                           `(let* ([,result-var undefined]
-                                                   [,done (lambda () (kont ,result-var))])
-                                              ;; Include the compiled body:
-                                              ,(compile-a60 body done
-                                                            (add-settable-procedure
-                                                             (add-bindings
-                                                              context
-                                                              arg-vars
-                                                              by-value-vars
-                                                              arg-specs)
-                                                             var
-                                                             result-type
-                                                             result-var)
-                                                            #f)))))])
-                              (if add-to-top-level?
-                                  `([,var
-                                     (let ([tmp ,code])
-                                       (namespace-set-variable-value! ',var tmp)
-                                       tmp)])
-                                  `([,var
-                                     ,code])))]
-			   [($ a60:type-decl type ids)
-			    (map (lambda (id) `[,id undefined]) ids)]
-			   [($ a60:array-decl type arrays)
-			    (map (lambda (array) 
-				   `[,(car array) (make-array
-						   ,@(apply
-						      append
-						      (map
-						       (lambda (bp)
-							 (list
-							  (compile-expression (car bp) context 'num)
-							  (compile-expression (cdr bp) context 'num)))
-						       (cdr array))))])
-				 arrays)]
-			   [($ a60:switch-decl name exprs)
-			    `([,name (make-switch ,@(map (lambda (e) `(lambda () ,(compile-expression e context 'des)))
-							 exprs))])]
-			   [else (error "can't compile decl")]))
-		       decls))
-                 ;; Statements: most of the work is in `compile-statement', but
-                 ;;  we provide the continuation label:
-		 (cdr
-		  (foldr (lambda (stmt label next-label+compiled)
-			   (cons label
-				 (cons
-				  `[,label
-				    (lambda ()
-				      ,(compile-statement (cdr stmt) 
-							  (car next-label+compiled)
-							  context))]
-				  (cdr next-label+compiled))))
-			 (cons next-label null)
-			 statements
-			 labels)))])
-           ;; Check for duplicate bindings:
-	   (let ([dup (check-duplicate-identifier (filter identifier? (map car bindings)))])
-	     (when dup
-	       (raise-syntax-error
-		#f
-		"name defined twice"
-		dup)))
-           ;; Generate code; body of leterec jumps to the first statement label.
-	   `(letrec ,bindings 
-              (,(caar statements))))))
-     
-     (define (compile-statement statement next-label context)
-       (match statement
-         [($ a60:block decls statements)
-          (compile-block decls statements next-label context #f)]
-         [($ a60:branch test ($ a60:goto then) ($ a60:goto else))
-          `(if (check-boolean ,(compile-expression test context 'bool))
-               (goto ,(check-label then context))
-               (goto ,(check-label else context)))]
-         [($ a60:goto label)
-          (at (expression-location label)
-              `(goto ,(compile-expression label context 'des)))]
-         [($ a60:dummy)
-          `(,next-label)]
-         [($ a60:call proc args)
-          (at (expression-location proc)
-              `(,(compile-expression proc context 'func)
-                (lambda (val) 
-                  (,next-label))
-                ,@(map (lambda (arg) (compile-argument arg context))
-                       args)))]
-         [($ a60:assign vars val)
-          ;; >>>>>>>>>>>>>>> Start clean-up here <<<<<<<<<<<<<<<<<
-          ;; Lift out the spec-finding part, and use it to generate
-          ;; an expected type that is passed to `compile-expression':
-          `(begin
-             (let ([val ,(compile-expression val context 'numbool)])
-               ,@(map (lambda (avar)
-                        (let ([var (a60:variable-name avar)])
-                          (at var
-                              (cond
-                                [(null? (a60:variable-indices avar))
-                                 (cond
-                                   [(call-by-name-variable? var context)
-                                    => (lambda (spec)
-                                         `(set-target! ,var ',var (coerce ',(spec-coerce-target spec null) val)))]
-                                   [(procedure-result-variable? var context)
-                                    `(set! ,(procedure-result-variable-name var context) 
-                                           (coerce ',(spec-coerce-target (procedure-result-spec var context) null) val))]
-                                   [(or (settable-variable? var context)
-                                        (array-element? var context))
-                                    => (lambda (spec)
-                                         `(,(if (own-variable? var context) 'set-box! 'set!)
-                                           ,var
-                                           (coerce ',(spec-coerce-target spec null) val)))]
-                                   [else (raise-syntax-error #f "confused by assignment" (expression-location var))])]
-                                [else
-                                 (let ([spec (or (array-element? var context)
-                                                 (call-by-name-variable? var context))])
-                                   `(array-set! ,(compile-expression (make-a60:variable var null) context 'numbool)
-                                                (coerce ',(spec-coerce-target spec null) val)
-                                                ,@(map (lambda (e) (compile-expression e context 'num)) 
-                                                       (a60:variable-indices avar))))]))))
-                      vars))
-             (,next-label))]
-         [else (error "can't compile statement")]))
-     
-     (define (compile-expression expr context type)
-       (match expr
-         [(? (lambda (x) (and (syntax? x) (number? (syntax-e x)))) n) 
-	  (if (eq? type 'des)
-	      ;; Need a label:
-	      (check-label (datum->syntax-object expr
-						 (string->symbol (number->string (syntax-e expr)))
-						 expr
-						 expr)
-			   context)
-	      ;; Normal use of a number:
-	      (begin
-		(check-type 'num type expr) 
-		(as-builtin n)))]
-         [(? (lambda (x) (and (syntax? x) (boolean? (syntax-e x)))) n) (check-type 'bool type expr) (as-builtin n)]
-         [(? (lambda (x) (and (syntax? x) (string? (syntax-e x)))) n)  (check-type 'string type expr) (as-builtin n)]
-         [(? identifier? i) (compile-expression (make-a60:variable i null) context type)]
-         [(? symbol? i) ; either a generated label or 'val:
-	  (unless (eq? expr 'val)
-	    (check-type 'des type expr))
-	  (datum->syntax-object #f i)]
-         [($ a60:subscript array index)
-          ;; Maybe a switch index, or maybe an array reference
-	  (at array
-	      (cond
-	       [(array-element? array context)
-		`(array-ref ,array ,(compile-expression index context 'num))]
-	       [(switch-variable? array context)
-		`(switch-ref ,array ,(compile-expression index context 'num))]
-	       [else (raise-syntax-error
-		      #f
-		      "confused by variable"
-		      array)]))]
-         [($ a60:binary t argt op e1 e2)
-	  (check-type t type expr)
-          (at op
-              `(,(as-builtin op) ,(compile-expression e1 context argt) ,(compile-expression e2 context argt)))]
-         [($ a60:unary t argt op e1)
-	  (check-type t type expr)
-          (at op
-              `(,(as-builtin op) ,(compile-expression e1 context argt)))]
-         [($ a60:variable var subscripts)
-          (let ([sub (lambda (wrap v)
-                       (wrap
-                        (if (null? subscripts)
-                            v
-                            `(array-ref ,v ,@(map (lambda (e) (compile-expression e context 'num)) subscripts)))))])
-            (cond
-              [(call-by-name-variable? var context)
-               => (lambda (spec)
-                    (check-spec-type spec type var subscripts)
-                    (sub (lambda (val) `(coerce ',(spec-coerce-target spec subscripts) ,val)) `(get-value ,var)))]
-	      [(primitive-variable? var context)
-	       => (lambda (name)
-		    (sub values
-                         (datum->syntax-object
-			  (current-compile-context)
-			  name
-			  var
-			  var)))]
-              [(and (procedure-result-variable? var context)
-                    (not (eq? type 'func)))
-               (unless (null? subscripts)
-                 (raise-syntax-error "confused by subscripts" var))
-               (let ([spec (procedure-result-spec var context)])
-                 (check-spec-type spec type var null)
-                 (at var
-                     `(coerce
-                       ',(spec-coerce-target spec null)
-                       ,(procedure-result-variable-name var context))))]
-              [(or (procedure-result-variable? var context)
-                   (procedure-variable? var context)
-                   (label-variable? var context)
-                   (settable-variable? var context)
-                   (array-element? var context))
-               => (lambda (spec)
-                    (let ([spec (if (or (procedure-result-variable? var context)
-                                        (procedure-variable? var context)
-                                        (and (array-element? var context)
-                                             (null? subscripts)))
-                                    #f ;; need just the proc or array...
-                                    spec)])
-                      (check-spec-type spec type var subscripts)
-                      (let ([target (spec-coerce-target spec subscripts)])
-                        (sub (if target
-                                 (lambda (v) `(coerce ',target ,v))
-                                 values)
-                             (if (own-variable? var context)
-                                 `(unbox ,var)
-                                 var)))))]
-              [else (raise-syntax-error
-                     #f
-                     "confused by expression"
-                     (expression-location var))]))]
-                   
-         [($ a60:app func args)
-          (at (expression-location func)
-              `(,(compile-expression func context 'func)
-                values
-                ,@(map (lambda (e) (compile-argument e context))
-                       args)))]
-         [($ a60:if test then else)
-          `(if (check-boolean ,(compile-expression test context 'bool))
-	       ,(compile-expression then context type)
-	       ,(compile-expression else context type))]
-         [else (error 'compile-expression "can't compile expression ~a" expr)]))
-     
-     (define (expression-location expr)
-       (if (syntax? expr)
-           expr
-           (match expr
-             [($ a60:subscript array index) (expression-location array)]
-             [($ a60:binary type argtype op e1 e2) op]
-             [($ a60:unary type argtype op e1) op]
-             [($ a60:variable var subscripts) (expression-location var)]
-             [($ a60:app func args)
-              (expression-location func)]
-             [else #f])))
-     
-     (define (compile-argument arg context)
-       (cond
-         [(or (and (a60:variable? arg)
-                   (not (let ([v  (a60:variable-name arg)])
-                          (or (procedure-variable? v context)
-                              (label-variable? v context)
-                              (primitive-variable? v context)))))
-              (a60:subscript? arg))
-          (let ([arg (if (a60:subscript? arg)
-                         (make-a60:variable (a60:subscript-array arg)
-                                            (list (a60:subscript-index arg)))
-                         arg)])
-            `(case-lambda
-              [() ,(compile-expression arg context 'any)]
-              [(val)  ,(compile-statement (make-a60:assign (list arg) 'val) 'void context)]))]
-         [(identifier? arg)
-          (compile-argument (make-a60:variable arg null) context)]
-         [else `(lambda () ,(compile-expression arg context 'any))]))
-
-     (define (check-type got expected expr)
-       (or (eq? expected 'any)
-	   (case got
-	     [(num) (memq expected '(num numbool))]
-	     [(bool) (memq expected '(bool numbool))]
-	     [(des) (memq expected '(des))]
-	     [(func) (memq expected '(func))]
-	     [else #f])
-	   (raise-syntax-error #f
-			       (format "type mismatch (~a != ~a)" got expected)
-			       expr)))
-     
-     (define (check-spec-type spec type expr subscripts)
-       (let ([target (spec-coerce-target spec subscripts)])
-         (when target
-           (case (syntax-e target)
-             [(integer real) (check-type 'num type expr)]
-             [(boolean) (check-type 'bool type expr)]
-             [(procedure) (check-type 'func type expr)]))))
-       
-
-     (define (check-label l context)
-       (if (or (symbol? l)
-	       (label-variable? l context))
-	   l
-	   (raise-syntax-error
-	    #f
-	    "undefined label"
-	    l)))
-     
-     (define (at stx expr)
-       (if (syntax? stx)
-           (datum->syntax-object (current-compile-context) expr stx)
-           expr))
-
-     (define (as-builtin stx)
-       ;; Preserve source loc, but change to reference to
-       ;; a builtin operation by changing the context:
-       (datum->syntax-object
-	(current-compile-context)
-	(syntax-e stx)
-	stx
-	stx))
-
-     ;; --------------------
-     
-     (define (empty-context)
-       `(((sign prim sign)
-	  (entier prim entier)
-
-	  (sin prim a60:sin)
-	  (cos prim a60:cos)
-	  (acrtan prim a60:arctan)
-	  (sqrt prim a60:sqrt)
-	  (abs prim a60:abs)
-	  (ln prim a60:ln)
-	  (exp prim a60:exp)
-
-	  (prints prim prints)
-	  (printn prim printn)
-	  (printsln prim printsln)
-	  (printnln prim printnln))))
-     
-     (define (add-labels context l)
-       (cons (map (lambda (lbl) (cons (if (symbol? lbl)
-                                          (datum->syntax-object #f lbl)
-                                          lbl)
-                                      'label)) l)
-             context))
-     
-     (define (add-procedure context var result-type arg-vars by-value-vars arg-specs)
-       (cons (list (cons var 'procedure))
-             context))
-     
-     (define (add-settable-procedure context var result-type result-var)
-       (cons (list (cons var `(settable-procedure ,result-var ,result-type)))
-             context))
-     
-     (define (add-atoms context ids type)
-       (cons (map (lambda (id) (cons id type)) ids)
-             context))
-
-     (define (add-arrays context names dimensionses type)
-       (cons (map (lambda (name dimensions)
-                    (cons name `(array ,type ,(length dimensions))))
-                  names dimensionses)
-             context))
-
-     (define (add-switch context name)
-       (cons (list (cons name 'switch))
-             context))
-     
-     (define (add-bindings context arg-vars by-value-vars arg-specs)
-       (cons (map (lambda (var)
-                    (let ([spec (or (ormap (lambda (spec)
-                                             (and (ormap (lambda (x) (bound-identifier=? var x))
-                                                         (cdr spec))
-                                                  (car spec)))
-                                           arg-specs)
-                                    #'unknown)])
-                      (cons var
-                            (if (ormap (lambda (x) (bound-identifier=? var x)) by-value-vars)
-                                spec
-                                (list 'by-name spec)))))
-                  arg-vars)
-             context))
-     
-     ;; var-binding : syntax context -> symbol
-     ;; returns an identifier indicating where the var is
-     ;; bound, or 'free if it isn't. The compiler inserts
-     ;; top-level procedure definitions into the namespace; if 
-     ;; the variable is bound there, it is a procedure.
-     (define (var-binding var context)
-       (cond
-         [(null? context)
-          (let/ec k
-            (namespace-variable-value (syntax-e var)
-                                      #t 
-                                      (lambda () (k 'free)))
-            'procedure)]
-         [else
-          (let ([m (var-in-rib var (car context))])
-            (or m (var-binding var (cdr context))))]))
-     
-     (define (var-in-rib var rib)
-       (ormap (lambda (b)
-                (if (symbol? (car b))
-                    ;; primitives:
-                    (and (eq? (syntax-e var) (car b))
-                         (cdr b))
-                    ;; everything else:
-                    (and (bound-identifier=? var (car b))
-                         (cdr b))))
-              rib))
-     
-     (define (primitive-variable? var context)
-       (let ([v (var-binding var context)])
-	 (and (pair? v)
-	      (eq? (car v) 'prim)
-	      (cadr v))))
-
-     (define (call-by-name-variable? var context)
-       (let ([v (var-binding var context)])
-         (and (pair? v)
-              (eq? (car v) 'by-name)
-              (cadr v))))
-
-     (define (procedure-variable? var context)
-       (let ([v (var-binding var context)])
-         (eq? v 'procedure)))
-
-     (define (procedure-result-variable? var context)
-       (let ([v (var-binding var context)])
-         (and (pair? v)
-              (eq? (car v) 'settable-procedure)
-              (cdr v))))
-     
-     (define (procedure-result-variable-name var context)
-       (let ([v (procedure-result-variable? var context)])
-         (car v)))
-
-     (define (procedure-result-spec var context)
-       (let ([v (procedure-result-variable? var context)])
-         (cadr v)))
-
-     (define (label-variable? var context)
-       (let ([v (var-binding var context)])
-         (eq? v 'label)))
-         
-     (define (switch-variable? var context)
-       (let ([v (var-binding var context)])
-         (eq? v 'switch)))
-         
-     (define (settable-variable? var context)
-       (let ([v (var-binding var context)])
-         (or (box? v)
-             (and (syntax? v)
-                  (memq (syntax-e v) '(integer real boolean))
-                  v))))
-     
-     (define (own-variable? var context)
-       (let ([v (var-binding var context)])
-         (box? v)))
-
-     (define (array-element? var context)
-       (let ([v (var-binding var context)])
-         (and (pair? v)
-              (eq? (car v) 'array)
-              (or (cadr v)
-                  #'unknown))))
-     
-     (define (spec-coerce-target spec subscripts)
-       (cond
-         [(and (syntax? spec) (memq (syntax-e spec) '(string label switch real integer boolean unknown))) spec]
-         [(and (syntax? spec) (memq (syntax-e spec) '(unknown))) #f]
-         [(or (not spec) (not (pair? spec))) #f]
-         [(eq? (car spec) 'array) (if (null? subscripts) #'array (cadr spec))]
-         [(eq? (car spec) 'procedure) #'procedure]
-         [else #f]))
-     
-     (define (stx-number? a) (and (syntax? a) (number? (syntax-e a)))))
diff --git a/pkgs/algol60/examples/euler.a60 b/pkgs/algol60/examples/euler.a60
deleted file mode 100644
index 54cdbbd341..0000000000
--- a/pkgs/algol60/examples/euler.a60
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang algol60
-
-begin
-
-procedure euler (fct,sum,eps,tim); value eps,tim; integer tim;
-real procedure fct; real sum,eps;
-comment euler computes the sum of fct(i) for i from zero up to
-infinity by means of a suitably refined euler transformation. The
-summation is stopped as soon as tim times in succession the absolute
-value of the terms of the transformed series are found to be less than
-eps. Hence, one should provide a function fct with one integer argument,
-an upper bound eps, and an integer tim. The output is the sum sum. euler
-is particularly efficient in the case of a slowly convergent or
-divergent alternating series;
-begin integer i,k,n,t; array m[0:15]; real mn,mp,ds;
-i:=n:=t:=0; m[0]:=fct(0); sum:=m[0]/2;
-nextterm: i:=i+1; mn:=fct(i);
-        for k:=0 step 1 until n do
-            begin mp:=(mn+m[k])/2; m[k]:=mn;
-                mn:=mp end;
-        if (abs(mn)<abs(m[n])) & (n<15) then
-            begin ds:=mn/2; n:=n+1; m[n]:=mn end
-        else ds:=mn;
-        sum:=sum+ds;
-        if abs(ds)<eps then t:=t+1 else t:=0;
-        if t<tim then goto nextterm
-end;
-
-procedure inv(v) ; inv := 1.0/((v+1)^2);
-
-real result;
-euler(inv, result, 0.00005, 10);
-printnln(result);
-
-end
diff --git a/pkgs/algol60/examples/jensen.a60 b/pkgs/algol60/examples/jensen.a60
deleted file mode 100644
index e884279015..0000000000
--- a/pkgs/algol60/examples/jensen.a60
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang algol60
-
-begin
-  integer procedure SIGMA(x, i, n);
-    value n;
-    integer x, i, n;
-  begin
-    integer sum;
-    sum:=0;
-    for i:=1 step 1 until n do
-        sum:=sum+x;
-    SIGMA:=sum;
-  end;
-  integer q;
-  printnln(SIGMA(q*2-1, q, 7));
-end
diff --git a/pkgs/algol60/examples/nqueen.a60 b/pkgs/algol60/examples/nqueen.a60
deleted file mode 100644
index f74ec2ec2c..0000000000
--- a/pkgs/algol60/examples/nqueen.a60
+++ /dev/null
@@ -1,124 +0,0 @@
-#lang algol60
-
-begin
-        comment
-          -- From the NASE A60 distribution --
-                Find a solution for the `N queen problem.
-                (got the algorithm from a Modula program from
-                 Martin Neitzel).
-        ;
-
-        integer N, MAXN;
-
-        MAXN := 9;              comment maximum size;
-        N := 2;                 comment current size;
-
-tryNextN:
-
-        begin
-
-        integer array column [1 : N];
-        Boolean array empcol [1 : N];
-        Boolean array empup [-N+1 : N-1];
-        Boolean array empdo [2 : 2*N];
-        integer i;
-
-        procedure print;
-        comment
-                print the current solution in a chessboard alike
-                picture ;
-        begin
-                integer i, j;
-
-                procedure outframe;
-                begin
-                        integer i;
-
-                        for i := 1 step 1 until N do
-                                prints (`+---');
-                        printsln (`+')
-                end;
-
-                for j := 1 step 1 until N do begin
-                        outframe;
-                        prints (`|');
-                        for i := 1 step 1 until N do begin
-                                if N + 1 - j = column [i] then
-                                        prints (` Q |')
-                                else
-                                        prints (`   |')
-                        end;
-                        printsln (`')
-                end;
-                outframe;
-        end;
-
-
-        procedure set (x);
-        value x;
-        integer x;
-        begin
-                integer y;
-
-                for y := 1 step 1 until N do
-                begin
-                        if empcol [ y ] & empup [ x-y ] 
-                                        & empdo [ x+y ] then
-                        begin
-                                column [ y ] := x ;
-                                empcol [ y ] := false ;
-                                empup [ x-y ] := false ;
-                                empdo [ x+y ] := false ;
-                                if x = N then
-                                        goto gotone
-                                else
-                                        set ( x + 1 ) ;
-                                empdo [ x+y ] := true ;
-                                empup [ x-y ] := true ;
-                                empcol [ y ] := true ;
-                                column [ y ] := 0
-                        end
-                end
-        end;
-
-        comment
-                main program start
-        ;
-
-        prints (`looking onto a ');
-        printn (N);
-        prints (` x ');
-        printn (N);
-        printsln (` chessboard...');
-
-        for i := 1 step 1 until N do
-        begin
-                 column [ i ] := 0 ;
-                 empcol [ i ] := true
-        end;
-
-        for i := -N+1 step 1 until N-1 do
-                 empup [ i ] := true ;
-
-        for  i := 2 step 1 until 2*N do
-                 empdo [ i ] := true ;
-
-        set ( 1 ) ;
-
-        printsln (`NO SOLUTION.');
-        goto contN;
-
-gotone:
-        printsln(`SOLVED');
-        print;
-
-contN:
-        if N < MAXN then begin
-                N := N + 1;
-                goto tryNextN
-        end;
-
-        printsln (`done.')
-
-        end
-end
diff --git a/pkgs/algol60/examples/primes.a60 b/pkgs/algol60/examples/primes.a60
deleted file mode 100644
index c4844f6459..0000000000
--- a/pkgs/algol60/examples/primes.a60
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang algol60
-
-begin
-        comment
-          -- From the NASE A60 distribution --
-                calculation of the prime numbers between 2 and 200
-        ;
-
-        integer NN;
-
-        NN := 200;
-
-        begin
-                comment first algorithm (check division in a loop) ;
-
-                Boolean procedure isprime (n);
-                value n;
-                integer n;
-                begin
-                        Boolean procedure even (n);
-                        value n; integer n;
-                                even := entier (n / 2) * 2 = n;
-                        integer i;
-
-                        isprime := false;
-                        if even (n) & n != 2 then
-                                goto ret;
-
-                        for i := 3 step 2 until n div 2 do
-                                if entier (n / i) * i = n then
-                                        goto ret;
-                        isprime := true;
-                    ret:
-
-                end;
-
-                integer i;
-
-                printsln (`first:');
-
-                for i := 2 step 1 until NN do
-                        if isprime (i) then
-                                printnln (i);
-                printsln (`done.')
-        end;
-
-        begin
-                comment second algorithm (sieve) ;
-
-
-                Boolean array arr [2 : NN];
-                integer i, j;
-
-                printsln (`second:');
-
-                for i := 2 step 1 until NN do
-                        arr [i] := true;
-
-                for i := 2 step 1 until NN div 2 do
-                        for j := 2 * i step i until NN do
-                                arr [j] := false;
-
-                for i := 2 step 1 until NN do
-                        if arr [i] then
-                                printnln (i);
-                printsln (`done.')
-
-        end
-end
diff --git a/pkgs/algol60/info.rkt b/pkgs/algol60/info.rkt
deleted file mode 100644
index 1da483bc41..0000000000
--- a/pkgs/algol60/info.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang info
-
-(define collection "algol60")
-(define build-deps '("at-exp-lib"
-                     "rackunit-lib"
-                     "racket-doc"
-                     "scribble-doc"
-                     "scribble-lib"
-                     "drracket-plugin-lib"))
-
-(define tools '(("tool.rkt")))
-(define tool-names '("Algol 60"))
-(define scribblings '(("algol60.scrbl" () (experimental 40))))
-(define deps '("base"
-               "compatibility-lib"
-               "drracket-plugin-lib"
-               "errortrace-lib"
-               "gui-lib"
-               "parser-tools-lib"
-               "string-constants-lib"))
-
-(define pkg-desc "An implementation of the Algol60 language")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/algol60/lang/algol60.rkt b/pkgs/algol60/lang/algol60.rkt
deleted file mode 100644
index 9b71e33fa7..0000000000
--- a/pkgs/algol60/lang/algol60.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require "../runtime.rkt"
-         "../prims.rkt")
-
-(provide (all-from-out racket/base)
-         (all-from-out "../prims.rkt")
-         (all-from-out "../runtime.rkt"))
diff --git a/pkgs/algol60/lang/reader.rkt b/pkgs/algol60/lang/reader.rkt
deleted file mode 100644
index 017861bb4f..0000000000
--- a/pkgs/algol60/lang/reader.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang s-exp syntax/module-reader
-algol60/lang/algol60
-
-#:read algol60-read
-#:read-syntax algol60-read-syntax
-#:info algol60-get-info
-#:whole-body-readers? #t
-
-
-(require "../parse.rkt"
-         ;; Parses to generate an AST. Identifiers in the AST
-         ;; are represented as syntax objects with source location.
-
-         "../simplify.rkt"
-         ;; Desugars the AST, transforming `for' to `if'+`goto',
-         ;; and flattening `if' statements so they are always
-         ;; of the for `if <exp> then goto <label> else goto <label>'
-
-         "../compile.rkt"
-         ;; Compiles a simplified AST to Scheme.
-
-         mzlib/file
-         syntax/strip-context)
-
-
-(define (algol60-read in)
-  (map syntax->datum (algol60-read-syntax #f in)))
-
-
-(define (algol60-read-syntax src in)
-  (define parsed (parse-a60-port in src))
-  (define simplified (simplify parsed #'here))
-  (define compiled (compile-simplified simplified #'here))
-  (define stripped (strip-context compiled))
-
-  (list stripped))
-
-
-
-;; Extension: cooperate with DrRacket and tell it to use the default,
-;; textual lexer and color scheme when editing algol programs.
-(define (algol60-get-info key default default-filter)
-  (case key
-    [(color-lexer)
-     (dynamic-require 'syntax-color/default-lexer
-                      'default-lexer)]
-    [else
-     (default-filter key default)]))
diff --git a/pkgs/algol60/parse.rkt b/pkgs/algol60/parse.rkt
deleted file mode 100644
index db52594448..0000000000
--- a/pkgs/algol60/parse.rkt
+++ /dev/null
@@ -1,413 +0,0 @@
-#cs(module parse mzscheme
-     (require parser-tools/lex
-              (prefix : parser-tools/lex-sre)
-              "cfg-parser.rkt"
-              parser-tools/yacc
-              syntax/readerr
-              "prims.rkt")
-
-     (define-lex-abbrevs [lex:letter (:or (:/ #\a #\z) (:/ #\A #\Z))]
-                         [lex:digit (:/ #\0 #\9)]
-                         [lex:whitespace (:or #\newline #\return #\tab #\space #\vtab)]
-                         [lex:comment (:: (:* lex:whitespace) "comment" (:* (:~ #\;)) #\;)])
-     
-     (define-tokens non-terminals (<logical-value> 
-                                   <type> <identifier> 
-                                   <unsigned-integer> <unsigned-float> <string>
-                                   
-                                   GOTO IF THEN ELSE FOR DO STEP UNTIL WHILE
-                                   OWN ARRAY STRING PROCEDURE SWITCH LABEL VALUE
-                                   BEGIN END
-                                   POWER PLUS MINUS TIMES SLASH DIVIDE
-                                   LESS LESS-OR-EQUAL EQUAL GREATER-OR-EQUAL GREATER NOT-EQUAL ASSIGN
-                                   NEGATE AND OR IMPLIES EQUIV
-                                   COMMA COLON SEMICOLON
-                                   OPEN CLOSE OPENSQ CLOSESQ
-                                   EOF
-                                   UNPARSEABLE))
-     
-     (define stx-for-original-property (read-syntax #f (open-input-string "original")))
-     
-     (define-syntax (token stx)
-       (syntax-case stx ()
-         [(_ name val)
-          (identifier? (syntax name))
-          (let ([name (syntax name)])
-            (with-syntax ([token-name (datum->syntax-object
-                                       name
-                                       (string->symbol
-                                        (format "token-~a" (syntax-e name))))]
-                          [source-name (datum->syntax-object name 'source-name)]
-                          [start-pos (datum->syntax-object name 'start-pos)]
-                          [end-pos (datum->syntax-object name 'end-pos)])
-              (syntax 
-	       (token-name 
-		(datum->syntax-object #f val
-				      (list
-				       source-name
-				       (position-line start-pos)
-				       (position-col start-pos)
-				       (position-offset start-pos)
-				       (- (position-offset end-pos)
-					  (position-offset start-pos)))
-				      stx-for-original-property)))))]))
-     (define-syntax (ttoken stx)
-       (syntax-case stx ()
-         [(_ name)
-          (identifier? (syntax name))
-          (syntax (token name 'name))]))
-     
-     (define (lex source-name)
-       (lexer
-        [(:+ lex:whitespace) (void)]
-        ["true" (token <logical-value> #t)]
-        ["false" (token <logical-value> #f)]
-        ["real" (token <type> 'real)]
-        ["integer" (token <type> 'integer)]
-        ["Boolean" (token <type> 'boolean)]
-        ["goto" (ttoken GOTO)]
-        ["if" (ttoken IF)]
-        ["then" (ttoken THEN)]
-        ["else" (ttoken ELSE)]
-        ["for" (ttoken FOR)]
-        ["do" (ttoken DO)]
-        ["step" (ttoken STEP)]
-        ["until" (ttoken UNTIL)]
-        ["while" (ttoken WHILE)]
-        ["own" (ttoken OWN)]
-        ["array" (ttoken ARRAY)]
-        ["string" (ttoken STRING)]
-        ["procedure" (ttoken PROCEDURE)]
-        ["switch" (ttoken SWITCH)]
-        ["label" (ttoken LABEL)]
-        ["value" (ttoken VALUE)]
-        [(:: "begin" lex:comment) (ttoken BEGIN)]
-        ["begin" (ttoken BEGIN)]
-        [(:: "end" lex:comment) (ttoken BEGIN)]
-        ["end" (ttoken END)]
-        ["^" (token POWER 'expt)]
-        ["+" (token PLUS '+)]
-        ["-" (token MINUS '-)]
-        ["*" (token TIMES '*)]
-        ["/" (token SLASH '/)]
-        ["div" (token DIVIDE 'quotient)]
-        ["<" (token LESS '<)]
-        ["<=" (token LESS-OR-EQUAL '<=)]
-        ["=" (token EQUAL '=)]
-        [">" (token GREATER '>)]
-        [">=" (token GREATER-OR-EQUAL '>=)]
-        ["!=" (token NOT-EQUAL '!=)]
-        ["!" (token NEGATE '!)]
-        ["&" (token AND '&)]
-        ["|" (token OR '\|)]
-        ["=>" (token IMPLIES '==>)]
-        ["==" (token EQUIV '==)]
-        [":=" (ttoken ASSIGN)]
-        ["," (ttoken COMMA)]
-        [":" (ttoken COLON)]
-        [(:: ";" lex:comment) (ttoken SEMICOLON)]
-        [";" (ttoken SEMICOLON)]
-        ["(" (ttoken OPEN)]
-        [")" (ttoken CLOSE)]
-        ["[" (ttoken OPENSQ)]
-        ["]" (ttoken CLOSESQ)]
-        [(:: lex:letter (:* (:or lex:letter lex:digit))) (token <identifier> (string->symbol lexeme))]
-        [(:+ lex:digit) (token <unsigned-integer> (string->number lexeme))]
-        [(:or (:: (:+ lex:digit) #\. (:* lex:digit))
-              (:: (:* lex:digit) #\. (:+ lex:digit))) (token <unsigned-float> (string->number lexeme))]
-        [(:: #\` (:* (:~ #\' #\`)) #\') (let ([s lexeme])
-                                          (token <string> (substring s 1 (sub1 (string-length s)))))]
-        [(eof) (ttoken EOF)]
-        [any-char (token UNPARSEABLE (string->symbol lexeme))]))
-     
-     (define parse
-       (cfg-parser
-        (tokens non-terminals)
-        (start <program>)
-        (end EOF)
-        (error (lambda (_ name stx start end) 
-                 (raise-read-error (format "parse error near ~a" name)
-				   (syntax-source stx)
-				   (syntax-line stx)
-				   (syntax-column stx)
-				   (syntax-position stx)
-				   (syntax-span stx))))
-        (suppress)
-        (grammar 
-         ;; ==================== Expressions ====================
-         (<expression> [(<arithmetic-expression>) $1]
-                       [(<Boolean-expression>) $1]
-                       [(<designational-expression>) $1])
-         ;; -------------------- Numbers --------------------
-         (<arithmetic-expression> [(<simple-arithmetic-expression>) $1]
-                                  [(IF <Boolean-expression> 
-                                       THEN <simple-arithmetic-expression> 
-                                       ELSE <arithmetic-expression>)
-                                   (make-a60:if $2 $4 $6)])
-         (<simple-arithmetic-expression> [(<term>) $1]
-                                         [(<adding-operator> <term>) (make-a60:unary 'num 'num $1 $2)]
-                                         [(<simple-arithmetic-expression> <adding-operator> <term>) 
-                                          (make-a60:binary 'num 'num $2 $1 $3)])
-         (<term> [(<factor>) $1]
-                 [(<term> <multiplying-operator> <factor>) (make-a60:binary 'num 'num $2 $1 $3)])
-         (<factor> [(<primary>) $1]
-                   [(<factor> POWER <primary>) (make-a60:binary 'num 'num $2 $1 $3)])
-         (<adding-operator> [(PLUS) $1]
-                            [(MINUS) $1])
-         (<multiplying-operator> [(TIMES) $1]
-                                 [(SLASH) $1]
-                                 [(DIVIDE) $1])
-         (<primary> [(<unsigned-integer>) $1]
-                    [(<unsigned-float>) $1]
-                    [(<variable>) $1]
-                    [(<function-designator>) $1]
-                    [(OPEN <arithmetic-expression> CLOSE) $2])
-         ;; -------------------- Booleans --------------------
-         (<relational-operator> [(LESS) $1]
-                                [(LESS-OR-EQUAL) $1]
-                                [(EQUAL) $1]
-                                [(GREATER-OR-EQUAL) $1]
-                                [(GREATER) $1]
-                                [(NOT-EQUAL) $1])
-         (<relation> [(<simple-arithmetic-expression> <relational-operator> <simple-arithmetic-expression>)
-                      (make-a60:binary 'bool 'num $2 $1 $3)])
-         (<Boolean-primary> [(<logical-value>) $1]
-                            [(<variable>) $1]
-                            [(<function-designator>) $1]
-                            [(<relation>) $1]
-                            [(OPEN <Boolean-expression> CLOSE) $2])
-         (<Boolean-secondary> [(<Boolean-primary>) $1]
-                              [(NEGATE <Boolean-primary>) (make-a60:unary 'bool 'bool $1 $2)])
-         (<Boolean-factor> [(<Boolean-secondary>) $1]
-                           [(<Boolean-factor> AND <Boolean-secondary>) (make-a60:binary 'bool 'bool $2 $1 $3)])
-         (<Boolean-term> [(<Boolean-factor>) $1]
-                         [(<Boolean-term> OR <Boolean-factor>)  (make-a60:binary 'bool 'bool $2 $1 $3)])
-         
-         (<implication> [(<Boolean-term>) $1]
-                        [(<implication> IMPLIES <Boolean-term>) (make-a60:binary 'bool 'bool $2 $1 $3)])
-         (<simple-Boolean> [(<implication>) $1]
-                           [(<simple-Boolean> EQUIV <implication>) (make-a60:binary 'bool 'bool $2 $1 $3)])
-         (<Boolean-expression> [(<simple-Boolean>) $1]
-                               [(IF <Boolean-expression> 
-                                    THEN <simple-Boolean> 
-                                    ELSE <Boolean-expression>)
-				(make-a60:if $2 $4 $6)])
-         ;; -------------------- Designationals --------------------
-         (<label> [(<identifier>) $1]
-                  [(<unsigned-integer>) $1])
-         (<switch-identifier> [(<identifier>) $1])
-         (<switch-designator> [(<switch-identifier> OPENSQ <arithmetic-expression> CLOSESQ)
-                               (make-a60:subscript $1 $3)])
-         (<simple-designational-expression> [(<label>) $1]
-                                            [(<switch-designator>) $1]
-                                            [(OPEN <designational-expression> CLOSE) $2])
-         (<designational-expression> [(<simple-designational-expression>) $1]
-                                     [(IF <Boolean-expression> 
-                                          THEN <simple-designational-expression> 
-                                          ELSE <designational-expression>)
-				      (make-a60:if $2 $4 $6)])
-         ;; -------------------- Variables --------------------
-         (<subscript-list> [(<arithmetic-expression>) (list $1)]
-                           [(<subscript-list> COMMA <arithmetic-expression>) (append $1 (list $3))])
-         (<subscripted-variable> [(<identifier> OPENSQ <subscript-list> CLOSESQ) (make-a60:variable $1 $3)])
-         (<variable> [(<identifier>) (make-a60:variable $1 null)]
-                     [(<subscripted-variable>) $1])
-         ;; -------------------- Function calls --------------------
-         (<function-designator> [(<identifier> <actual-parameter-part>) (make-a60:app $1 $2)])
-         ;; ==================== Statements ====================
-         ;;  - - - - - - - - - - non-empty - - - - - - - - - - 
-         (<unlabelled-basic-nonempty-statement> [(<assignment-statement>) $1]
-                                                [(<go-to-statement>) $1]
-                                                [(<procedure-statement>) $1])
-         (<basic-nonempty-statement> [(<unlabelled-basic-nonempty-statement>) $1]
-                                     [(<label> COLON <basic-statement>) (make-a60:label $1 $3)])
-         (<unconditional-nonempty-statement> [(<basic-nonempty-statement>) $1]
-                                             [(<compound-statement>) $1]
-                                             [(<block>) $1])
-         (<nonempty-statement> [(<unconditional-nonempty-statement>) $1]
-                               [(<conditional-statement>) $1]
-                               [(<for-statement>) $1])
-         ;;  - - - - - - - - - - possibly empty - - - - - - - - - -          
-         (<unlabelled-basic-statement> [(<unlabelled-basic-nonempty-statement>) $1]
-                                       [(<dummy-statement>) $1])
-         (<basic-statement> [(<unlabelled-basic-statement>) $1]
-                            [(<label> COLON <basic-statement>) (make-a60:label $1 $3)])
-         (<unconditional-statement> [(<basic-statement>) $1]
-                                    [(<unconditional-nonempty-statement>) $1])
-         (<statement> [(<unconditional-statement>) $1]
-                      [(<nonempty-statement>) $1])
-         ;; -------------------- block and compound --------------------
-         (<compound-tail> [(<statement> END) (list $1)]
-                          [(<statement> SEMICOLON <compound-tail>) (cons $1 $3)])
-         (<block-head> [(BEGIN <declaration>) (list $2)]
-                       [(<block-head> SEMICOLON <declaration>) (append $1 (list $3))])
-         (<unlabelled-block> [(<block-head> SEMICOLON <compound-tail>) (make-a60:block $1 $3)])
-         (<unlabelled-compound> [(BEGIN <compound-tail>) (make-a60:compound $2)])
-         
-         (<compound-statement> [(<unlabelled-compound>) $1]
-                               [(<label> COLON <compound-statement>) (make-a60:label $1 $3)])
-         (<block> [(<unlabelled-block>) $1]
-                  [(<label> COLON <block>) (make-a60:label $1 $3)])
-         ;; -------------------- assignment --------------------
-         (<left-part> [(<variable> ASSIGN) $1])
-         (<left-part-list> [(<left-part>) (list $1)]
-                           [(<left-part-list> <left-part>) (append $1 (list $2))])
-         (<assignment-statement> [(<left-part-list> <arithmetic-expression>) (make-a60:assign $1 $2)]
-                                 [(<left-part-list> <Boolean-expression>) (make-a60:assign $1 $2)])
-         ;; -------------------- goto --------------------
-         (<go-to-statement> [(GOTO <designational-expression>) (make-a60:goto $2)])
-         ;; -------------------- dummy --------------------
-         (<dummy-statement> [() (make-a60:compound null)])
-         ;; -------------------- conditional --------------------
-         (<conditional-statement> [(IF <Boolean-expression> THEN <unconditional-statement>)
-                                   (make-a60:branch $2 $4 (make-a60:compound null))]
-                                  [(IF <Boolean-expression> THEN <unconditional-statement> ELSE <statement>)
-                                   (make-a60:branch $2 $4 $6)]
-                                  [(IF <Boolean-expression> THEN <for-statement>)
-                                   (make-a60:branch $2 $4 (make-a60:compound null))]
-                                  [(<label> COLON <conditional-statement>) (make-a60:label $1 $3)])
-         ;; -------------------- for --------------------
-         (<for-list-element> [(<arithmetic-expression>) (make-a60:for-number $1)]
-                             [(<arithmetic-expression> STEP <arithmetic-expression> UNTIL <arithmetic-expression>)
-                              (make-a60:for-step $1 $3 $5)]
-                             [(<arithmetic-expression> WHILE <Boolean-expression>) (make-a60:for-while $1 $3)])
-         (<for-list> [(<for-list-element>) (list $1)]
-                     [(<for-list> COMMA <for-list-element>) (append $1 (list $3))])
-         (<for-statement> [(FOR <variable> ASSIGN <for-list> DO <statement>)
-                           (make-a60:for $2 $4 $6)]
-                          [(<label> COLON <for-statement>) (make-a60:label $1 $3)])
-         ;; -------------------- procedure statement --------------------
-         (<actual-parameter> [(<string>) $1]
-                             [(<expression>) $1]
-                             ; [(<identifier>) $1] ; switch, array, or procedure
-                             )
-         (<parameter-delimiter> [(COMMA) (void)]
-                                [(CLOSE <identifier> COLON OPEN) (void)]) ;; <identifier> was <letter-string>!
-         (<actual-parameter-list> [(<actual-parameter>) (list $1)]
-                                  [(<actual-parameter-list> <parameter-delimiter> <actual-parameter>)
-                                   (append $1 (list $3))])
-         (<actual-parameter-part> [() null]
-                                  [(OPEN <actual-parameter-list> CLOSE) $2])
-         (<procedure-statement> [(<identifier> <actual-parameter-part>) (make-a60:call $1 $2)])
-         ;; ==================== Declarations ====================
-         (<declaration> [(<type-declaration>) $1]
-                        [(<array-declaration>) $1]
-                        [(<switch-declaration>) $1]
-                        [(<procedure-declaration>) $1])
-         ;; -------------------- Simple --------------------
-         (<type-list> [(<identifier>) (list $1)]
-                      [(<identifier> COMMA <type-list>) (cons $1 $3)])
-         (<local-or-own-type> [(<type>) $1]
-                              [(OWN <type>) (box $2)]) ; box => own
-         (<type-declaration> [(<local-or-own-type> <type-list>) (make-a60:type-decl $1 $2)])
-         ;; -------------------- Arrays --------------------
-         (<bound-pair> [(<arithmetic-expression> COLON <arithmetic-expression>) (cons $1 $3)])
-         (<bound-pair-list> [(<bound-pair>) (list $1)]
-                            [(<bound-pair-list> COMMA <bound-pair>) (append $1 (list $3))])
-         (<array-segment> [(<identifier> OPENSQ <bound-pair-list> CLOSESQ) (list (cons $1 $3))]
-                          [(<identifier> COMMA <array-segment>) (cons (cons $1 (cdar $3)) $3)])
-         (<array-list> [(<array-segment>) $1]
-                       [(<array-list> COMMA <array-segment>) (append $1 $3)])
-         (<array-declaration> [(ARRAY <array-list>) (make-a60:array-decl #'unknown $2)]
-                              [(<local-or-own-type> ARRAY <array-list>) (make-a60:array-decl $1 $3)])
-         ;; -------------------- Switches --------------------
-         (<switch-list> [(<designational-expression>) (list $1)]
-                        [(<switch-list> COMMA <designational-expression>) (append $1 (list $3))])
-         (<switch-declaration> [(SWITCH <switch-identifier> ASSIGN <switch-list>) (make-a60:switch-decl $2 $4)])
-         ;; -------------------- Procedures --------------------
-         (<formal-parameter> [(<identifier>) $1])
-         (<formal-parameter-list> [(<formal-parameter>) (list $1)]
-                                  [(<formal-parameter-list> <parameter-delimiter> <formal-parameter>) 
-                                   (append $1 (list $3))])
-         (<formal-parameter-part> [() null]
-                                  [(OPEN <formal-parameter-list> CLOSE) $2])
-         (<identifier-list> [(<identifier>) (list $1)]
-                            [(<identifier-list> COMMA <identifier>) (append $1 (list $3))])
-         (<value-part> [(VALUE <identifier-list> SEMICOLON) $2]
-                       [() null])
-         (<specifier> [(STRING) 'string]
-                      [(<type>) $1]
-                      [(ARRAY) '(array #'unknown)]
-                      [(<type> ARRAY) `(array ,$1)]
-                      [(LABEL) 'label]
-                      [(SWITCH) 'switch]
-                      [(PROCEDURE) '(procedure #'unknown)]
-                      [(<type> PROCEDURE) `(procedure ,$1)])
-         (<nonempty-specification-part> [(<specifier> <identifier-list> SEMICOLON) (list (cons $1 $2))]
-                                        [(<nonempty-specification-part> <specifier> <identifier-list> SEMICOLON)
-                                         (append $1 (list (cons $2 $3)))])
-         (<specification-part> [() null]
-                               [(<nonempty-specification-part>) $1])
-         (<procedure-heading> [(<identifier> <formal-parameter-part> SEMICOLON <value-part> <specification-part>)
-                               (list $1 $2 $4 $5)])
-         (<procedure-body> [(<nonempty-statement>) $1])
-         (<procedure-declaration> [(PROCEDURE <procedure-heading> <procedure-body>)
-                                   (make-a60:proc-decl #'unknown (car $2) (cadr $2) (caddr $2) (cadddr $2) $3)]
-                                  [(<type> PROCEDURE <procedure-heading> <procedure-body>)
-                                   (make-a60:proc-decl $1 (car $3) (cadr $3) (caddr $3) (cadddr $3) $4)])
-         ;; ==================== Program ====================
-         (<program> [(<block>) $1]
-                    [(<compound-statement>) $1]))))
-     
-     (define-syntax (define-a60-structs stx)
-       (syntax-case stx ()
-         [(_ (struct-name (field ...)) ...)
-          (with-syntax ([(a60:struct ...) (map (lambda (id)
-						 (datum->syntax-object
-						  id
-						  (string->symbol
-						   (format "a60:~a" (syntax-e id)))))
-                                               (syntax->list (syntax (struct-name ...))))])
-            (syntax (begin (define-struct a60:struct (field ...)) ...
-                           (provide (struct a60:struct (field ...)) ...))))]))
-     
-     (define-a60-structs
-      ;; Expressions
-      (if (test then else))
-      (unary (type argtype op arg))
-      (binary (type argtype op arg1 arg2))
-      (subscript (array index))
-      (variable (name indices))
-      (app (func args))
-      ;; plus numbers, strings, and booleans
-
-      ;; Statements
-      (block (decls statements))
-      (compound (statements))
-      (assign (variables rhs))
-      (goto (target))
-      (branch (test then else))
-      (call (proc args))
-      (for (variable values body))
-      (dummy ())
-      (label (name statement))
-      
-      ;; for values
-      (for-number (value))
-      (for-step (start step end))
-      (for-while (value test))
-
-      ;; declarations
-      (type-decl (type vars))
-      (array-decl (type vars))
-      (switch-decl (var cases))
-      (proc-decl (result-type var arg-vars by-value-vars arg-specs body)))
-     
-     (define (parse-a60-port port file)
-       (let ([lexer (lex file)])
-	 (port-count-lines! port)
-         (parse
-          (lambda () 
-            (let loop ()
-              (let ([v (lexer port)])
-                (if (void? v)
-                    (loop)
-                    v)))))))
-     
-     (define (parse-a60-file file)
-       (with-input-from-file file
-         (lambda ()
-           (parse-a60-port (current-input-port)
-                           (path->complete-path file)))))
-
-      (provide parse-a60-file parse-a60-port))
diff --git a/pkgs/algol60/prims.rkt b/pkgs/algol60/prims.rkt
deleted file mode 100644
index c47fabe4ba..0000000000
--- a/pkgs/algol60/prims.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-(module prims mzscheme
-  (provide != ! & \|
-           ==> ==
-           sign entier
-
-	   a60:sin
-           a60:cos
-           a60:arctan
-           a60:sqrt
-           a60:abs
-           a60:ln
-           a60:exp
-
-           prints printn
-           printsln printnln)
-  
-  (define (!= a b)
-    (not (= a b)))
-  
-  (define (! a)
-    (unless (boolean? a)
-      (raise-type-error '! "boolean" a))
-    (not a))
-  
-  (define (& a b)
-    (unless (boolean? a)
-      (raise-type-error '& "boolean" 0 a b))
-    (unless (boolean? b)
-      (raise-type-error '& "boolean" 1 a b))
-    (and a b))
-  
-  (define (\| a b)
-    (unless (boolean? a)
-      (raise-type-error '\| "boolean" 0 a b))
-    (unless (boolean? b)
-      (raise-type-error '\| "boolean" 1 a b))
-    (or a b))
-  
-  (define (==> a b)
-    (unless (boolean? a)
-      (raise-type-error '=> "boolean" 0 a b))
-    (unless (boolean? b)
-      (raise-type-error '=> "boolean" 1 a b))
-    (or (not a) b))
-  
-  (define (== a b)
-    (unless (boolean? a)
-      (raise-type-error '== "boolean" 0 a b))
-    (unless (boolean? b)
-      (raise-type-error '== "boolean" 1 a b))
-    (eq? a b))
-  
-  (define (get-number who v)
-    (let ([v (v)])
-      (unless (number? v)
-	(raise-type-error who "number" v))
-      v))
-
-  (define (get-string who v)
-    (let ([v (v)])
-      (unless (string? v)
-	(raise-type-error who "string" v))
-      v))
-
-  (define (sign k v)
-    (k (let ([v (get-number 'sign v)])
-         (cond
-           [(< v 0) -1]
-           [(> v 0) 1]
-           [else 0]))))
-  
-  (define (entier k v)
-    (k (inexact->exact (floor (get-number 'entier v)))))
-
-  (define (a60:abs k v)
-    (k (abs (get-number 'abs v))))
-  
-  (define (a60:sqrt k v)
-    (k (sqrt (get-number 'sqrt v))))
-  
-  (define (a60:sin k v)
-    (k (sin (get-number 'sin v))))
-  
-  (define (a60:cos k v)
-    (k (cos (get-number 'cos v))))
-  
-  (define (a60:exp k v)
-    (k (exp (get-number 'exp v))))
-  
-  (define (a60:arctan k v)
-    (k (atan (get-number 'arctan v))))
-  
-  (define (a60:ln k v)
-    (k (log (get-number 'ln v))))
-  
-  (define (printsln k v)
-    (k (printf "~a\n" (get-string 'printsln v))))
-  
-  (define (printnln k v)
-    (k (printf "~a\n" (get-number 'printnln v))))
-  
-  (define (prints k v)
-    (k (printf "~a" (get-string 'prints v))))
-  
-  (define (printn k v)
-    (k (printf "~a" (get-number 'printn v)))))
diff --git a/pkgs/algol60/runtime.rkt b/pkgs/algol60/runtime.rkt
deleted file mode 100644
index 7e88cce853..0000000000
--- a/pkgs/algol60/runtime.rkt
+++ /dev/null
@@ -1,108 +0,0 @@
-(module runtime mzscheme
-  (require racket/undefined)
-  
-  (provide (struct a60:array (vec dimens))
-           (struct a60:switch (choices))
-           undefined
-           check-boolean
-           goto
-           get-value
-           set-target!
-           make-array
-           array-ref
-           array-set!
-           make-switch
-           switch-ref
-           coerce)
-           
-  (define-struct a60:array (vec dimens))
-  (define-struct a60:switch (choices))
-  
-  (define (check-boolean b) b)
-  (define (goto f) (f))
-  (define (get-value v) (v))
-  (define (set-target! t name v)
-    (unless (procedure-arity-includes? t 1)
-      (error 'assignment "formal-argument variable ~a is assigned, but actual argument was not assignable"
-             name))
-    (t v))
-  
-  (define (bad what v)
-    (error '|bad value| "expected a ~a, got ~e" what v))
-  (define (coerce type v)
-    (cond
-      [(eq? type 'integer) 
-       (if (number? v)
-           (inexact->exact (floor v))
-           (bad 'number v))]
-      [(eq? type 'real) 
-       (if (number? v)
-           (exact->inexact v)
-           (bad 'number v))]
-      [(eq? type 'boolean) 
-       (if (boolean? v)
-           v
-           (bad 'boolean v))]
-      [else v]))
-  
-  (define (make-array . dimens)
-    (make-a60:array
-     ((let loop ([dimens dimens])
-        (if (null? dimens)
-            (lambda () undefined)
-            (let ([start (car dimens)]
-                  [end (cadr dimens)])
-              (let ([build (loop (cddr dimens))])
-                (lambda () 
-                  (let ([len (add1 (- end start))])
-                    (let ([v (make-vector len)])
-                      (let loop ([len len])
-                        (unless (zero? len)
-                          (vector-set! v (sub1 len) (build))
-                          (loop (sub1 len))))
-                      v))))))))
-     dimens))
-
-  (define (check-array a is who)
-    (unless (a60:array? a)
-      (error who "not an array: ~e" a))
-    (unless (= (length is) (/ (length (a60:array-dimens a)) 2))
-      (error who "array dimension ~a doesn't match the number of provided indices ~a"
-             (length is) (/ (length (a60:array-dimens a)) 2))))
-  
-  (define (check-index who dimens indices)
-    (unless (and (number? (car indices))
-                 (exact? (car indices))
-                 (integer? (car indices)))
-      (error who "index is not an integer: ~e"
-             (car indices)))
-    (unless (<= (car dimens) (car indices) (cadr dimens))
-      (error who "index ~a out of range ~a:~a"
-             (car indices) (car dimens) (cadr dimens))))
-  
-  (define (array-ref a . indices)
-    (check-array a indices 'array-reference)
-    (let loop ([v (a60:array-vec a)][indices indices][dimens (a60:array-dimens a)])
-      (check-index 'array-reference dimens indices)
-      (let ([i (vector-ref v (- (car indices) (car dimens)))])
-        (if (null? (cdr indices))
-            i
-            (loop i (cdr indices) (cddr dimens))))))
-  
-  (define (array-set! a val . indices)
-    (check-array a indices 'array-assignment)
-    (let loop ([v (a60:array-vec a)][indices indices][dimens (a60:array-dimens a)])
-      (check-index 'array-assignment dimens indices)
-      (if (null? (cdr indices))
-          (vector-set! v (- (car indices) (car dimens)) val)
-          (loop (vector-ref v (- (car indices) (car dimens))) (cdr indices) (cddr dimens)))))
-  
-  (define (make-switch . choices)
-    (make-a60:switch (list->vector choices)))
-  (define (switch-ref sw index)
-    (unless (and (number? index)
-                 (integer? index)
-                 (exact? index)
-                 (<= 1 index (vector-length (a60:switch-choices sw))))
-      (error "bad switch index: " index))
-    ((vector-ref (a60:switch-choices sw) (sub1 index)))))
diff --git a/pkgs/algol60/simplify.rkt b/pkgs/algol60/simplify.rkt
deleted file mode 100644
index 19c434545e..0000000000
--- a/pkgs/algol60/simplify.rkt
+++ /dev/null
@@ -1,169 +0,0 @@
-#cs(module simplify mzscheme
-     (require "parse.rkt"
-              "prims.rkt"
-              mzlib/match)
-
-     (provide simplify)
-
-     ;; flatten/label-block : list-of-decl list-of-stmt -> block-stmt
-     ;; Desugars `for', converts `if' so that it's always of the form
-     ;; `if <test> then goto <label> else goto <label>', flattens
-     ;; compound statements into the enclosing block, and gives every
-     ;; statement exactly one label. The result usually has lots of
-     ;; "dummy" statements that could easily be eliminated by merging
-     ;; labels.
-     (define (flatten/label-block decls statements ->stx)
-       (define extra-decls null)
-       (define new-statements
-         (let loop ([l statements])
-           (if (null? l)
-               null
-               (match (car l)
-                 [($ a60:block decls statements)
-                  (cons (cons (gensym 'block) (flatten/label-block decls statements ->stx))
-                        (loop (cdr l)))]
-                 [($ a60:compound statements)
-                  (loop (append statements (cdr l)))]
-                 [($ a60:branch test then else)
-                  (if (and (a60:goto? then) (a60:goto? else))
-                      (cons (cons (gensym 'branch) (car l))
-                            (loop (cdr l)))
-                      (let ([then-label (gensym 'then)]
-                            [else-label (gensym 'else)]
-                            [cont-label (gensym 'if-cont)])
-                        (loop
-                         (list*
-                          (make-a60:branch test (make-a60:goto then-label) (make-a60:goto else-label))
-                          (make-a60:label then-label then)
-                          (make-a60:goto cont-label)
-                          (make-a60:label else-label else)
-                          (make-a60:label cont-label (make-a60:dummy))
-                          (cdr l)))))]
-                 [($ a60:for variable val-exprs body)
-                  (let ([body-label (gensym 'for-body)]
-                        [cont-label (gensym 'for-cont)])
-                    (letrec ([make-init+test+increment+loop
-                              (lambda (value)
-                                (match value
-                                  [($ a60:for-number value)
-                                   (values (make-a60:assign (list variable) (make-a60:binary 'num 'num
-											     (->stx '+) 
-											     (->stx '0)
-											     value)) ; +0 => number
-                                           (->stx #t)
-                                           (make-a60:dummy)
-                                           #f)]
-                                  [($ a60:for-step start step end)
-                                   (values (make-a60:assign (list variable) start)
-                                           (make-a60:binary 'bool 'num
-							    (->stx '<=)
-                                                            (make-a60:binary 'num 'num
-									     (->stx '*)
-                                                                             (make-a60:binary 'num 'num (->stx '-) variable end)
-                                                                             (make-a60:app (->stx 'sign) (list step)))
-                                                            (->stx '0))
-                                           (make-a60:assign (list variable) (make-a60:binary 'num 'num (->stx '+) variable step))
-                                           #t)]
-                                  [($ a60:for-while value test)
-                                   (values (make-a60:assign (list variable) value)
-                                           test
-                                           (make-a60:assign (list variable) value)
-                                           #t)]))])
-                      (if (= 1 (length val-exprs))
-                          (let-values ([(init test inc loop?) (make-init+test+increment+loop (car val-exprs))])
-                            (loop (list*
-                                   init
-                                   (make-a60:label body-label (make-a60:dummy))
-                                   (make-a60:branch test 
-                                                    (make-a60:compound
-                                                     (list
-                                                      body
-                                                      inc
-                                                      (if loop?
-                                                          (make-a60:goto body-label)
-                                                          (make-a60:dummy))))
-                                                    (make-a60:dummy))
-                                   (cdr l))))
-                          (let* ([stage-name (datum->syntax-object #f (gensym 'stage-number))]
-                                 [switch-name (datum->syntax-object #f (gensym 'stage-switch))]
-                                 [end-switch-name (datum->syntax-object #f (gensym 'stage-switch))]
-                                 [stage-var (make-a60:variable stage-name null)]
-                                 [start-labels (map (lambda (x) (gensym 'stage)) (append val-exprs (list 'extra)))]
-                                 [end-labels (map (lambda (x) (gensym 'stage)) val-exprs)])
-                            (set! extra-decls (list* stage-name 
-                                                     (cons switch-name start-labels)
-                                                     (cons end-switch-name end-labels)
-                                                     extra-decls))
-                            (loop
-                             (append
-                              (list (make-a60:assign (list stage-var) (->stx '0)))
-                              (let loop ([start-labels start-labels][end-labels end-labels][val-exprs val-exprs])
-                                (if (null? val-exprs)
-                                    (list (make-a60:label (car start-labels) (make-a60:dummy)))
-                                    (let-values ([(init test inc loop?) (make-init+test+increment+loop (car val-exprs))])
-                                      (list*
-                                       (make-a60:label (car start-labels) (make-a60:dummy))
-                                       init
-                                       (make-a60:branch test 
-                                                        (make-a60:goto body-label)
-                                                        (make-a60:compound                                                   
-                                                         (list
-                                                          (make-a60:assign (list stage-var) (make-a60:binary 'num 'num
-													     (->stx '+)
-													     (->stx '1)
-													     stage-var))
-                                                          (make-a60:goto (make-a60:subscript switch-name stage-var)))))
-                                       (make-a60:label (car end-labels) (make-a60:dummy))
-                                       inc
-                                       (if loop?
-                                           (make-a60:goto (car start-labels))
-                                           (make-a60:goto (cadr start-labels)))
-                                       (loop (cdr start-labels)
-                                             (cdr end-labels)
-                                             (cdr val-exprs))))))
-                              (list 
-                               (make-a60:goto cont-label)
-                               (make-a60:label body-label (make-a60:dummy))
-                               body
-                               (make-a60:goto (make-a60:subscript end-switch-name stage-var))
-                               (make-a60:label cont-label (make-a60:dummy)))
-                              (cdr l)))))))]
-                 [($ a60:label name statement)
-                  (cons (cons name (make-a60:dummy))
-                        (loop (cons statement (cdr l))))]
-                 [else
-                  (cons (cons (gensym 'other) (car l))
-                        (loop (cdr l)))]))))
-       (make-a60:block
-        (append
-         (map (lambda (decl)
-                (match decl
-                  [($ a60:proc-decl result-type var arg-vars by-value-vars arg-specs body)
-                   (make-a60:proc-decl result-type var arg-vars by-value-vars arg-specs
-                                       (simplify-statement body ->stx))]
-                  [else decl]))
-              decls)
-         (map (lambda (extra)
-                (if (identifier? extra)
-                    (make-a60:type-decl (->stx 'integer) (list extra))
-                    (make-a60:switch-decl
-                     (car extra)
-                     (map (lambda (x)
-                            (make-a60:variable (datum->syntax-object #f x)
-                                               null))
-                          (cdr extra)))))
-              extra-decls))
-        (if (null? new-statements)
-            (list (cons (gensym 'other) (make-a60:dummy)))
-            new-statements)))
-
-     (define (simplify stmt ctx)
-       (simplify-statement stmt (lambda (x) (datum->syntax-object ctx x))))
-
-     (define (simplify-statement stmt ->stx)
-       (match stmt
-         [($ a60:block decls statements)
-          (flatten/label-block decls statements ->stx)]
-         [($ a60:compound statements)
-          (flatten/label-block null statements ->stx)]
-         [else stmt])))
diff --git a/pkgs/algol60/tests/test.rkt b/pkgs/algol60/tests/test.rkt
deleted file mode 100644
index d6a2131165..0000000000
--- a/pkgs/algol60/tests/test.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang at-exp racket/base
-(require algol60/algol60
-         rackunit
-         (for-syntax racket/base))
-
-(define-syntax (capture-output stx)
-  (syntax-case stx ()
-    [(_ exp)
-     (with-handlers ((exn:fail?
-                      (λ (exn)
-                        #`(list 'expand
-                                #,(exn-message exn)))))
-       (define expanded (local-expand #'exp 'expression #f))
-       #`(let ([op (open-output-string)]
-               [ep (open-output-string)])
-           (let/ec k
-             (parameterize ([current-output-port op]
-                            [current-error-port ep]
-                            [error-escape-handler (λ () (k (void)))])
-               #,expanded))
-           (list 'run
-                 (get-output-string op)
-                 (get-output-string ep))))]))
-
-(check-equal?
- (capture-output
-  @literal-algol{
-    begin
-      printsln (`hello world')
-    end
-  })
- '(run "hello world\n" ""))
-
-(check-pred
- (λ (x) (and (eq? (list-ref x 0) 'expand)
-             (regexp-match #rx"parse error near BEGIN"
-                           (list-ref x 1))))
- (capture-output
-  @literal-algol{
-    begin
-  }))
-
-
-(check-pred
- (λ (x) (and (eq? (list-ref x 0) 'expand)
-             (regexp-match #rx"parse error near PROCEDURE"
-                           (list-ref x 1))))
- (capture-output
-  @literal-algol{
-    procedure Absmax(a) Size:(n, m) Result:(y) Subscripts:(i, k);
-       value n, m; array a; integer n, m, i, k; real y;
-    begin integer p, q;
-       y := 0; i := k := 1;
-       for p:=1 step 1 until n do
-       for q:=1 step 1 until m do
-           if abs(a[p, q]) > y then
-               begin y := abs(a[p, q]);
-               i := p; k := q
-               end
-    end Absmax
-  }))
diff --git a/pkgs/algol60/tool.rkt b/pkgs/algol60/tool.rkt
deleted file mode 100644
index 90d987f53d..0000000000
--- a/pkgs/algol60/tool.rkt
+++ /dev/null
@@ -1,123 +0,0 @@
-(module tool mzscheme
-  (require drscheme/tool
-           mred
-           mzlib/unit
-           mzlib/class
-           "parse.rkt"
-           "simplify.rkt"
-           "compile.rkt"
-           compiler/embed
-           string-constants
-           errortrace/errortrace-lib
-           (prefix bd: "bd-tool.rkt"))
-
-  (provide tool@)
-
-  (define base-importing-stx (dynamic-require 'algol60/base
-					      'base-importing-stx))
-
-  (define tool@
-    (unit 
-      (import drscheme:tool^)
-      (export drscheme:tool-exports^)
-      
-      (define-values/invoke-unit bd:tool@
-        (import drscheme:tool^)
-        (export (prefix bd: drscheme:tool-exports^)))
-
-      (define (phase1) (bd:phase1))
-      (define (phase2) 
-	(bd:phase2)
-        (drscheme:language-configuration:add-language
-         (make-object (override-mrflow-methods
-                       ((drscheme:language:get-default-mixin) 
-                        lang%)))))
-      
-      (define (override-mrflow-methods %)
-	(if (method-in-interface? 'render-value-set (class->interface %))
-	    (class %
-	      (inherit [super-render-value-set render-value-set]
-		       [super-get-mrflow-primitives-filename get-mrflow-primitives-filename])
-	      (define/override (render-value-set . x)
-		;; needs to be filled in!
-		(super-render-value-set . x))
-	      (define/override (get-mrflow-primitives-filename)
-		(build-path (collection-path "mrflow")
-			    "primitives"
-			    "algol60.rkt"))
-	      (super-instantiate ()))
-	    %))
-
-      (define lang%
-        (class* object% (drscheme:language:language<%>)
-          (define/public (front-end/finished-complete-program settings) (void))
-          (define/public (extra-repl-information settings port) (void))
-          (define/public (get-reader-module) #f)
-          (define/public (get-metadata a b) #f)
-          (define/public (metadata->settings m) #f)
-          (define/public (get-metadata-lines) #f)
-          
-          (define/public (capability-value s) (drscheme:language:get-capability-default s))
-          (define/public (first-opened) (void))
-          (define/public (config-panel parent)
-            (case-lambda
-              [() null]
-              [(x) (void)]))
-          (define/public (get-comment-character) (values "'COMMENT'" #\*))
-          (define/public (default-settings) null)
-          (define/public (default-settings? x) #t)
-          (define/private (front-end port settings)
-            (let ([name (object-name port)])
-              (lambda ()
-                (if (eof-object? (peek-char port))
-                    eof
-		    (compile-simplified 
-		     (simplify (parse-a60-port port name) base-importing-stx) 
-		     base-importing-stx)))))
-          (define/public (front-end/complete-program port settings) (front-end port settings))
-          (define/public (front-end/interaction port settings) (front-end port settings))
-          (define/public (get-style-delta) #f)
-          (define/public (get-language-position)
-	    (list (string-constant experimental-languages)
-		  "Algol 60"))
-          (define/public (get-language-name) "Algol 60")
-          (define/public (get-language-url) #f)
-          (define/public (get-language-numbers) (list 1000 10))
-          (define/public (get-teachpack-names) null)
-          (define/public (marshall-settings x) x)
-          (define/public (on-execute settings run-in-user-thread)
-            (dynamic-require 'algol60/base #f)
-            (let ([path ((current-module-name-resolver) 'algol60/base #f #f #t)]
-                  [n (current-namespace)])
-              (run-in-user-thread
-               (lambda ()
-		 (error-display-handler 
-		  (drscheme:debug:make-debug-error-display-handler (error-display-handler)))
-		 (current-compile (make-errortrace-compile-handler))
-                 (with-handlers ([void (lambda (x)
-                                         (printf "~a\n"
-                                                 (exn-message x)))])
-                   (namespace-attach-module n path)
-                   (namespace-require path))))))
-          (define/public (render-value value settings port) (write value port))
-          (define/public (render-value/format value settings port width) (write value port))
-          (define/public (unmarshall-settings x) x)
-	  (define/public (create-executable settings parent src-file)
-	    (let ([dst-file (drscheme:language:put-executable
-			     parent src-file #f #f
-			     (string-constant save-a-mzscheme-stand-alone-executable))])
-	      (when dst-file
-		(let ([code (compile-simplified (simplify (parse-a60-file src-file)
-							  base-importing-stx)
-						base-importing-stx)])
-		  (make-embedding-executable dst-file
-					     #f #f
-					     '((#f algol60/base))
-					     null
-					     (compile
-					      `(module m algol60/base
-						 ,code))
-					     (list "-mvqe" "(require m)"))))))
-	  (define/public (get-one-line-summary) "Of historic interest")
-          
-          (super-instantiate ()))))))
diff --git a/pkgs/cext-lib/compiler/commands/ctool.rkt b/pkgs/cext-lib/compiler/commands/ctool.rkt
deleted file mode 100644
index 6ef83b54d3..0000000000
--- a/pkgs/cext-lib/compiler/commands/ctool.rkt
+++ /dev/null
@@ -1,306 +0,0 @@
-#lang scheme/base
-
-(module test racket/base)
-
-;; On error, exit with 1 status code
-(error-escape-handler (lambda () (exit 1)))
-
-(error-print-width 512)
-
-(require (prefix-in compiler:option: compiler/option)
-         compiler/compiler
-         raco/command-name
-         racket/cmdline
-         dynext/file
-         dynext/compile
-         dynext/link
-         scheme/pretty
-         setup/pack
-         setup/getinfo
-         setup/dirs)
-
-(define dest-dir (make-parameter #f))
-
-(define ld-output (make-parameter #f))
-
-(define exe-output (make-parameter #f))
-(define exe-embedded-flags (make-parameter '("-U" "--")))
-(define exe-embedded-libraries (make-parameter null))
-(define exe-aux (make-parameter null))
-(define exe-embedded-collects-path (make-parameter #f))
-(define exe-embedded-collects-dest (make-parameter #f))
-(define exe-dir-add-collects-dirs (make-parameter null))
-
-(define exe-dir-output (make-parameter #f))
-
-(define mods-output (make-parameter #f))
-
-(define default-plt-name "archive")
-
-(define disable-inlining (make-parameter #f))
-
-(define plt-output (make-parameter #f))
-(define plt-name (make-parameter default-plt-name))
-(define plt-files-replace (make-parameter #f))
-(define plt-files-plt-relative? (make-parameter #f))
-(define plt-files-plt-home-relative? (make-parameter #f))
-(define plt-force-install-dir? (make-parameter #f))
-(define plt-setup-collections (make-parameter null))
-(define plt-include-compiled (make-parameter #f))
-
-(define stop-at-source (make-parameter #f))
-
-(define (extract-suffix appender)
-  (bytes->string/latin-1
-   (subbytes (path->bytes (appender (bytes->path #"x"))) 1)))
-
-(define ((add-to-param param) f v) (param (append (param) (list v))))
-
-(define mzc-symbol (string->symbol (short-program+command-name)))
-
-;; Returns (values mode files prefixes)
-;;  where mode is 'compile, 'make-zo, etc.
-(define-values (mode source-files prefix)
-  (parse-command-line
-   (short-program+command-name)
-   (current-command-line-arguments)
-   `([help-labels
-      "-------------------------------- mode flags ---------------------------------"]
-     [once-any
-      [("--cc")
-       ,(lambda (f) 'cc)
-       (,(format "Compile arbitrary file(s) for an extension: ~a -> ~a"
-                 (extract-suffix append-c-suffix)
-                 (extract-suffix append-object-suffix)))]
-      [("--ld")
-       ,(lambda (f name) (ld-output name) 'ld)
-       (,(format "Link arbitrary file(s) to create <extension>: ~a -> ~a"
-                 (extract-suffix append-object-suffix)
-                 (extract-suffix append-extension-suffix))
-        "extension")]
-      [("-x" "--xform")
-       ,(lambda (f) 'xform)
-       ((,(format "Convert for 3m compilation: ~a -> ~a"
-                  (extract-suffix append-c-suffix)
-                  (extract-suffix append-c-suffix))
-         ""))]
-      [("--c-mods")
-       ,(lambda (f name) (mods-output name) 'c-mods)
-       ((,(format "Write C-embeddable module bytecode to <file>") "")
-        "file")]]
-     [help-labels ""]
-     [once-any
-      [("--3m")
-       ,(lambda (f) (compiler:option:3m #t))
-       (,(format "Compile/link for 3m~a"
-                 (if (eq? '3m (system-type 'gc)) " [current default]" "")))]
-      [("--cgc")
-       ,(lambda (f) (compiler:option:3m #f))
-       (,(format "Compile/link for CGC~a"
-                 (if (eq? 'cgc (system-type 'gc)) " [current default]" "")))]]
-     [once-each
-      [("-n" "--name")
-       ,(lambda (f name) (compiler:option:setup-prefix name))
-       ("Use <name> as extra part of public low-level names" "name")]]
-     [once-any
-      [("-d" "--destination")
-       ,(lambda (f d)
-          (unless (directory-exists? d)
-            (error mzc-symbol "the destination directory does not exist: ~s" d))
-          (dest-dir d))
-       ("Output --cc/--ld/-x file(s) to <dir>" "dir")]]
-     [help-labels
-      "------------------- compiler/linker configuration flags ---------------------"]
-     [once-each
-      [("--tool")
-       ,(lambda (f v)
-          (let ([v (string->symbol v)])
-            (use-standard-compiler v)
-            (use-standard-linker v)))
-       (,(format "Use pre-defined <tool> as C compiler/linker:~a"
-                 (apply string-append
-                        (apply append (map (lambda (t)
-                                             (list " " (symbol->string t)))
-                                           (get-standard-compilers)))))
-        "tool")]
-      [("--compiler")
-       ,(lambda (f v) (current-extension-compiler v))
-       ("Use <compiler-path> as C compiler" "compiler-path")]]
-     [multi
-      [("++ccf")
-       ,(add-to-param current-extension-compiler-flags)
-       ("Add C compiler flag" "flag")]
-      [("--ccf")
-       ,(lambda (f v)
-          (current-extension-compiler-flags
-           (remove v (current-extension-compiler-flags))))
-       ("Remove C compiler flag" "flag")]
-      [("--ccf-clear")
-       ,(lambda (f) (current-extension-compiler-flags null))
-       ("Clear C compiler flags")]
-      [("--ccf-show")
-       ,(lambda (f)
-          (printf "C compiler flags: ~s\n"
-                  (expand-for-link-variant (current-extension-compiler-flags))))
-       ("Show C compiler flags")]]
-     [once-each
-      [("--linker")
-       ,(lambda (f v) (current-extension-linker v))
-       ("Use <linker-path> as C linker" "linker-path")]]
-     [multi
-      [("++ldf")
-       ,(add-to-param current-extension-linker-flags)
-       ("Add C linker flag" "flag")]
-      [("--ldf")
-       ,(lambda (f v)
-          (current-extension-linker-flags
-           (remove v (current-extension-linker-flags))))
-       ("Remove C linker flag" "flag")]
-      [("--ldf-clear")
-       ,(lambda (f) (current-extension-linker-flags null))
-       ("Clear C linker flags")]
-      [("--ldf-show")
-       ,(lambda (f)
-          (printf "C linker flags: ~s\n"
-                  (expand-for-link-variant (current-extension-linker-flags))))
-       ("Show C linker flags")]
-      [("++ldl")
-       ,(add-to-param current-standard-link-libraries)
-       ("Add C linker library" "lib")]
-      [("--ldl-show")
-       ,(lambda (f)
-          (printf "C linker libraries: ~s\n"
-                  (expand-for-link-variant (current-standard-link-libraries))))
-       ("Show C linker libraries")]]
-     [multi
-      [("++cppf")
-       ,(add-to-param current-extension-preprocess-flags)
-       ("Add C preprocess (xform) flag" "flag")]
-      [("--cppf")
-       ,(lambda (f v)
-          (current-extension-preprocess-flags
-           (remove v (current-extension-preprocess-flags))))
-       ("Remove C preprocess (xform) flag" "flag")]
-      [("--cppf-clear")
-       ,(lambda (f) (current-extension-preprocess-flags null))
-       ("Clear C preprocess (xform) flags")]
-      [("--cppf-show")
-       ,(lambda (f)
-          (printf "C compiler flags: ~s\n"
-                  (expand-for-link-variant (current-extension-preprocess-flags))))
-       ("Show C preprocess (xform) flags")]]
-     [help-labels
-      "----------------------- C-embeddable module flags ---------------------------"]
-     [multi
-      [("++lib")
-       ,(lambda (f l)
-          (exe-embedded-libraries (append (exe-embedded-libraries) (list l))))
-       ("Embed <lib> in --c-mods output" "lib")]]
-     [help-labels
-      "-------------------------- miscellaneous flags ------------------------------"]
-     [once-each
-      [("-v")
-       ,(lambda (f) (compiler:option:somewhat-verbose #t))
-       ("Slightly verbose mode, including version banner and output files")]
-      [("--vv")
-       ,(lambda (f) (compiler:option:somewhat-verbose #t) (compiler:option:verbose #t))
-       ("Very verbose mode")]])
-   (lambda (accum . files)
-     (let ([mode (let ([l (filter symbol? accum)])
-                   (if (null? l) 
-                       (error mzc-symbol "no mode flag specified")
-                       (car l)))])
-       (values
-        mode
-        files
-        #f)))
-   (list "file")))
-
-(when (compiler:option:somewhat-verbose)
-  (printf "~a v~a [~a], Copyright (c) 2004-2014 PLT Design Inc.\n"
-          (short-program+command-name)
-          (version)
-          (system-type 'gc)))
-
-(if (compiler:option:3m)
-  (begin (link-variant '3m)  (compile-variant '3m))
-  (begin (link-variant 'cgc) (compile-variant 'cgc)))
-
-(define (compiler-warning)
-  (eprintf "Warning: ~a\n         ~a\n"
-           "compilation to C is usually less effective for performance"
-           "than relying on the bytecode just-in-time compiler."))
-
-(case mode
-  [(cc)
-   (for ([file source-files])
-     (let* ([base (extract-base-filename/c file mzc-symbol)]
-            [dest (append-object-suffix
-                   (let-values ([(base name dir?) (split-path base)])
-                     (build-path (or (dest-dir) 'same) name)))])
-       (when (compiler:option:somewhat-verbose)
-         (printf "\"~a\":\n" file))
-       (compile-extension (not (compiler:option:verbose)) file dest null)
-       (when (compiler:option:somewhat-verbose)
-         (printf " [output to \"~a\"]\n" dest))))]
-  [(ld)
-   (extract-base-filename/ext (ld-output) mzc-symbol)
-   ;; (for ([file source-files]) (extract-base-filename/o file mzc-symbol))
-   (let ([dest (if (dest-dir)
-                 (build-path (dest-dir) (ld-output))
-                 (ld-output))])
-     (when (compiler:option:somewhat-verbose)
-       (printf "~a:\n" (let ([s (apply string-append
-                                       (map (lambda (n) (format " \"~a\"" n))
-                                            source-files))])
-                         (substring s 1 (string-length s)))))
-     (link-extension (not (compiler:option:verbose))
-                     source-files
-                     dest)
-     (when (compiler:option:somewhat-verbose)
-       (printf " [output to \"~a\"]\n" dest)))]
-  [(xform)
-   (for ([file source-files])
-     (let* ([out-file (path-replace-suffix file ".3m.c")]
-            [out-file  (if (dest-dir)
-                         (build-path (dest-dir) out-file)
-                         out-file)])
-       ((dynamic-require 'compiler/xform 'xform)
-        (not (compiler:option:verbose))
-        file
-        out-file
-        (list (find-include-dir)))
-       (when (compiler:option:somewhat-verbose)
-         (printf " [output to \"~a\"]\n" out-file))))]
-  [(c-mods)
-   (let ([dest (mods-output)])
-     (let-values ([(in out) (make-pipe)])
-       (parameterize ([current-output-port out])
-         ((dynamic-require 'compiler/embed 'write-module-bundle)
-          #:modules
-          (append (map (lambda (l) `(#f (file ,l))) source-files)
-             (map (lambda (l) `(#t (lib ,l))) (exe-embedded-libraries)))))
-       (close-output-port out)
-       (let ([out (open-output-file dest #:exists 'truncate/replace)])
-         (fprintf out "#ifdef MZ_XFORM\n")
-         (fprintf out "XFORM_START_SKIP;\n")
-         (fprintf out "#endif\n")
-         (fprintf out "static void declare_modules(Scheme_Env *env) {\n")
-         (fprintf out "  static unsigned char data[] = {")
-         (let loop ([pos 0])
-           (let ([b (read-byte in)])
-             (when (zero? (modulo pos 20)) (fprintf out "\n    "))
-             (unless (eof-object? b) (fprintf out "~a," b) (loop (add1 pos)))))
-         (fprintf out "0\n  };\n")
-         (fprintf out "  scheme_register_embedded_load(~a, (const char *)data);\n"
-                  (file-position in))
-         (fprintf out "  scheme_embedded_load(~a, (const char *)data, 1);\n"
-                  (file-position in))
-         (fprintf out "}\n")
-         (fprintf out "#ifdef MZ_XFORM\n")
-         (fprintf out "XFORM_END_SKIP;\n")
-         (fprintf out "#endif\n")
-         (close-output-port out)))
-     (when (compiler:option:somewhat-verbose)
-       (printf " [output to \"~a\"]\n" dest)))]
-  [else (printf "bad mode: ~a\n" mode)])
diff --git a/pkgs/cext-lib/compiler/commands/info.rkt b/pkgs/cext-lib/compiler/commands/info.rkt
deleted file mode 100644
index 2acc69e1f9..0000000000
--- a/pkgs/cext-lib/compiler/commands/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define raco-commands
-  '(("ctool" compiler/commands/ctool "compile and link C-based extensions" #f)))
diff --git a/pkgs/cext-lib/compiler/xform.rkt b/pkgs/cext-lib/compiler/xform.rkt
deleted file mode 100644
index fa9fcfb7e4..0000000000
--- a/pkgs/cext-lib/compiler/xform.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang scheme/base
-
-(require dynext/compile
-         setup/dirs
-         (prefix-in xform: compiler/private/xform))
-
-(provide xform)
-
-(define (xform quiet? src dest header-dirs #:keep-lines? [keep-lines? #f])
-  (let ([exe (current-extension-compiler)]
-        [flags (expand-for-compile-variant
-                (current-extension-preprocess-flags))]
-        [headers (apply append
-                        (map (current-make-compile-include-strings)
-                             (append
-                              header-dirs
-                              (list (find-include-dir)))))])
-    (xform:xform quiet?
-                 (cons exe
-                       (append flags headers))
-                 src
-                 dest
-                 keep-lines?
-                 #f #t #t
-                 #f #f
-                 #f #f
-                 #f)))
-
diff --git a/pkgs/cext-lib/dynext/compile-sig.rkt b/pkgs/cext-lib/dynext/compile-sig.rkt
deleted file mode 100644
index 2d77778f45..0000000000
--- a/pkgs/cext-lib/dynext/compile-sig.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require racket/unit)
-
-(provide dynext:compile^)
-
-(define-signature dynext:compile^
-  (compile-extension
-   preprocess-extension
-   current-extension-compiler 
-   current-extension-compiler-flags
-   current-extension-preprocess-flags
-   current-make-compile-include-strings
-   current-make-compile-input-strings
-   current-make-compile-output-strings
-   use-standard-compiler
-   get-standard-compilers
-   compile-variant
-   expand-for-compile-variant))
-
diff --git a/pkgs/cext-lib/dynext/compile-unit.rkt b/pkgs/cext-lib/dynext/compile-unit.rkt
deleted file mode 100644
index ab785fe5a7..0000000000
--- a/pkgs/cext-lib/dynext/compile-unit.rkt
+++ /dev/null
@@ -1,300 +0,0 @@
-(module compile-unit racket/base
-  (require racket/unit
-           racket/system
-           "private/dirs.rkt"
-           "private/stdio.rkt"
-           "private/cmdargs.rkt")
-
-  (require "compile-sig.rkt")
-
-  (provide dynext:compile@)
-
-  (define-unit dynext:compile@
-      (import)
-      (export dynext:compile^)
-      
-      (define (get-unix-compile)
-	(or (find-executable-path "gcc" #f)
-	    (find-executable-path "cc" #f)))
-      
-      (define (get-windows-compile)
-	(or (find-executable-path "cl.exe" #f)
-	    (find-executable-path "gcc.exe" #f)
-	    (find-executable-path "bcc32.exe" #f)))
-      
-      (define current-extension-compiler 
-	(make-parameter 
-	 (or (let ([p (or (getenv "MZSCHEME_DYNEXT_COMPILER")
-			  (getenv "CC"))])
-	       (and p
-		    (if (absolute-path? p)
-			(string->path p)
-			(find-executable-path p #f))))
-	     (case (system-type) 
-	       [(unix macosx) (get-unix-compile)]
-	       [(windows) (get-windows-compile)]
-	       [else #f]))
-	 (lambda (v)
-	   (when v 
-	     (if (path-string? v)
-		 (unless (and (file-exists? v)
-			      (memq 'execute (file-or-directory-permissions v)))
-		   (error 'current-extension-compiler 
-			  "compiler not found or not executable: ~s" v))
-		 (raise-type-error 'current-extension-compiler "path, valid-path string, or #f" v)))
-	   v)))
-
-      (define win-gcc?
-	(let ([c (current-extension-compiler)])
-	  (and c (regexp-match #"gcc.exe$" (path->bytes c)))))
-      (define win-borland?
-	(let ([c (current-extension-compiler)])
-	  (and c (regexp-match #"bcc32.exe$" (path->bytes c)))))
-      (define unix-cc?
-	(let ([c (current-extension-compiler)])
-	  (and c (regexp-match #"[^g]cc$" (path->bytes c)))))
-
-      (define (add-variant-flags l)
-	(append l (list (lambda ()
-			  (if (eq? '3m (specific-compile-variant))
-			      '("-DMZ_PRECISE_GC")
-			      null)))))
-
-      (define gcc-cpp-flags 
-	(add-variant-flags (case (string->symbol (path->string (system-library-subpath #f)))
-			     [(parisc-hpux) '("-D_HPUX_SOURCE")]
-			     [(ppc-macosx x86_64-macosx) '("-DOS_X")]
-			     [(i386-macosx) '("-DOS_X" "-m32")]
-			     [(ppc-darwin x86_64-darwin) '("-DOS_X" "-DXONX")]
-			     [(i386-darwin) '("-DOS_X" "-DXONX" "-m32")]
-			     [else null])))
-
-      (define gcc-compile-flags (append '("-c" "-O2" "-fPIC")
-					(case (string->symbol (path->string (system-library-subpath #f)))
-					  [(i386-macosx i386-darwin) '("-m32" "-fno-common")]
-					  [(ppc-macosx ppc-darwin x86_64-macosx x86_64-darwin) '("-fno-common")]
-					  [(win32\\i386) '("-DAS_MSVC_EXTENSION")]
-					  [else null])
-					gcc-cpp-flags))
-
-      (define unix-cpp-flags 
-	(add-variant-flags (case (string->symbol (path->string (system-library-subpath #f)))
-			     [(parisc-hpux) '("-D_HPUX_SOURCE")]
-			     [else gcc-cpp-flags])))
-
-      (define unix-compile-flags (case (string->symbol (path->string (system-library-subpath #f)))
-				   [(parisc-hpux) (append '("-c" "-O2" "-Aa" "+z" "+e")
-							  unix-cpp-flags)]
-				   [else gcc-compile-flags]))
-
-      (define msvc-compile-flags 
-	(add-variant-flags '("/c" "/MT" "/O2")))
-
-      (define (make-flags-guard who)
-	(lambda (l)
-	  (unless (and (list? l) (andmap (lambda (s) (or (path-string? s)
-							 (and (procedure? s) (procedure-arity-includes? s 0))))
-					 l))
-	    (raise-type-error who "list of paths/strings and thunks" l))
-	  l))
-
-      (define (get-env-compile-flags)
-	(let ([v (or (getenv "MZSCHEME_DYNEXT_COMPILER_FLAGS")
-		     (getenv "CFLAGS"))])
-	  (if v
-	      (split-command-line-args v)
-	      null)))
-
-      (define current-extension-compiler-flags
-	(make-parameter
-	 (append 
-	  (get-env-compile-flags)
-	  (case (system-type)
-	    [(unix macosx) (if unix-cc?
-			       unix-compile-flags
-			       gcc-compile-flags)]
-	    [(windows) (if (or win-gcc? win-borland?)
-			   gcc-compile-flags
-			   msvc-compile-flags)]
-	    [(macos) '()]))
-	 (make-flags-guard 'current-extension-compiler-flags)))
-
-      (define current-extension-preprocess-flags
-	(make-parameter
-	 (case (system-type)
-	   [(unix macosx) (cons "-E" (if unix-cc?
-					 unix-cpp-flags
-					 gcc-cpp-flags))]
-	   [(windows) (if (or win-gcc? win-borland?)
-			  (cons "-E" gcc-cpp-flags)
-			  '("/E"))]
-	   [(macos) '()])
-	 (make-flags-guard 'current-extension-preprocess-flags)))
-
-      (define compile-variant (make-parameter 
-			       'normal
-			       (lambda (s)
-				 (unless (memq s '(normal cgc 3m))
-				   (raise-type-error 'compile-variant "'normal, 'cgc, or '3m" s))
-				 s)))
-
-      (define (specific-compile-variant)
-        (let ([v (compile-variant)])
-          (if (eq? v 'normal)
-              (system-type 'gc)
-              v)))
-
-      (define (expand-for-compile-variant l)
-	(apply append (map (lambda (s) (if (path-string? s) (list s) (s))) l)))
-
-      (define current-make-extra-extension-compiler-flags
-	(make-parameter
-	 (lambda () (case (specific-compile-variant)
-		      [(3m) '("-DMZ_PRECISE_GC")]
-		      [else null]))
-	 (lambda (p)
-	   (unless (and (procedure? p) (procedure-arity-includes? p 0))
-	     (raise-type-error 'current-make-extra-extension-compiler-flags "procedure (arity 0)" p))
-	   p)))
-      
-      (define (path-string->string s)
-	(if (string? s) s (path->string s)))
-
-      (define unix-compile-include-strings (lambda (s) 
-					     (list (string-append "-I" (path-string->string s)))))
-      (define msvc-compile-include-strings (lambda (s) 
-					     (list (string-append "/I" (path-string->string s)))))
-
-      (define current-make-compile-include-strings
-	(make-parameter
-	 (case (system-type)
-	   [(unix macosx) unix-compile-include-strings]
-	   [(windows) (if (or win-gcc? win-borland?)
-			  unix-compile-include-strings
-			  msvc-compile-include-strings)]
-	   [(macos) unix-compile-include-strings])
-	 (lambda (p)
-	   (unless (procedure-arity-includes? p 1)
-	     (raise-type-error 'current-make-compile-include-strings "procedure of arity 1" p))
-	   p)))
-      
-      (define current-make-compile-input-strings
-	(make-parameter
-	 (lambda (s) (list (path-string->string s)))
-	 (lambda (p)
-	   (unless (procedure-arity-includes? p 1)
-	     (raise-type-error 'current-make-compile-input-strings "procedure of arity 1" p))
-	   p)))
-      
-      (define unix-compile-output-strings (lambda (s) (list "-o" (path-string->string s))))
-      (define msvc-compile-output-strings (lambda (s) (list (string-append "/Fo" (path-string->string s)))))
-
-      (define current-make-compile-output-strings
-	(make-parameter
-	 (case (system-type)
-	   [(unix macosx) unix-compile-output-strings]
-	   [(windows) (if (or win-gcc? win-borland?)
-			  unix-compile-output-strings
-			  msvc-compile-output-strings)]
-	   [(macos) unix-compile-output-strings])
-	 (lambda (p)
-	   (unless (procedure-arity-includes? p 1)
-	     (raise-type-error 'current-make-compile-output-strings "procedure of arity 1" p))
-	   p)))
-      
-      (define (get-standard-compilers)
-	(case (system-type)
-	  [(unix macosx) '(gcc cc)]
-	  [(windows) '(gcc msvc borland)]
-	  [(macos) '(cw)]))
-
-      (define (use-standard-compiler name)
-	(define (bad-name name)
-	  (error 'use-standard-compiler "unknown compiler: ~a" name))
-	(case (system-type)
-	  [(unix macosx) 
-	   (case name
-	     [(cc gcc) (let* ([n (if (eq? name 'gcc) "gcc" "cc")]
-			      [f (find-executable-path n n)])
-			 (unless f
-			   (error 'use-standard-compiler "cannot find ~a" n))
-			 (current-extension-compiler f))
-	      (current-extension-compiler-flags (add-variant-flags
-						 (if (eq? name 'gcc)
-						     gcc-compile-flags
-						     unix-compile-flags)))
-	      (current-make-compile-include-strings unix-compile-include-strings)
-	      (current-make-compile-input-strings (lambda (s) (list (path-string->string s))))
-	      (current-make-compile-output-strings unix-compile-output-strings)]
-	     [else (bad-name name)])]
-	  [(windows) 
-	   (case name
-	     [(gcc) (let ([f (find-executable-path "gcc.exe" #f)])
-		      (unless f
-			(error 'use-standard-compiler "cannot find gcc.exe"))
-		      (current-extension-compiler f))
-	      (current-extension-compiler-flags (add-variant-flags gcc-compile-flags))
-	      (current-make-compile-include-strings unix-compile-include-strings)
-	      (current-make-compile-input-strings (lambda (s) (list (path-string->string s))))
-	      (current-make-compile-output-strings unix-compile-output-strings)]
-	     [(borland) (let ([f (find-executable-path "bcc32.exe" #f)])
-			  (unless f
-			    (error 'use-standard-compiler "cannot find bcc32.exe"))
-			  (current-extension-compiler f))
-	      (current-extension-compiler-flags (add-variant-flags gcc-compile-flags))
-	      (current-make-compile-include-strings unix-compile-include-strings)
-	      (current-make-compile-input-strings (lambda (s) (list (path-string->string s))))
-	      (current-make-compile-output-strings unix-compile-output-strings)]
-	     [(msvc) (let ([f (find-executable-path "cl.exe" #f)])
-		       (unless f
-			 (error 'use-standard-compiler "cannot find MSVC's cl.exe"))
-		       (current-extension-compiler f))
-	      (current-extension-compiler-flags (add-variant-flags msvc-compile-flags))
-	      (current-make-compile-include-strings msvc-compile-include-strings)
-	      (current-make-compile-input-strings (lambda (s) (list (path-string->string s))))
-	      (current-make-compile-output-strings msvc-compile-output-strings)]
-	     [else (bad-name name)])]
-	  [(macos) 
-	   (case name
-	     [(cw) (current-extension-compiler #f)
-	      (current-extension-compiler-flags (add-variant-flags unix-compile-flags))
-	      (current-make-compile-include-strings unix-compile-include-strings)
-	      (current-make-compile-input-strings (lambda (s) (list (path-string->string s))))
-	      (current-make-compile-output-strings unix-compile-output-strings)]
-	     [else (bad-name name)])]))
-      
-      (define-values (my-process* stdio-compile)
-	(let-values ([(p* do-stdio) (get-stdio)])
-	  (values
-	   p*
-	   (lambda (start-process quiet?)
-	     (do-stdio start-process quiet? (lambda (s) (error 'compile-extension "~a" s)))))))
-      
-      (define (make-compile-extension current-extension-compiler-flags)
-	(lambda (quiet? in out includes)
-	  (let ([c (current-extension-compiler)])
-	    (if c
-		(stdio-compile (lambda (quiet?) 
-				 (let ([command (append 
-						 (list c)
-						 (expand-for-compile-variant
-						  (current-extension-compiler-flags))
-						 (apply append 
-							(map 
-							 (lambda (s) 
-							   ((current-make-compile-include-strings) s)) 
-							 includes))
-						 ((current-make-compile-include-strings) (include-dir))
-						 ((current-make-compile-input-strings) in)
-						 ((current-make-compile-output-strings) out))])
-				   (unless quiet? 
-				     (printf "compile-extension: ~a\n" command))
-				   (apply my-process* command)))
-			       quiet?)
-		(error 'compile-extension "can't find an installed C compiler")))))
-
-      (define compile-extension (make-compile-extension
-				 current-extension-compiler-flags))
-      (define preprocess-extension (make-compile-extension
-				    current-extension-compiler-flags))))
-
diff --git a/pkgs/cext-lib/dynext/compile.rkt b/pkgs/cext-lib/dynext/compile.rkt
deleted file mode 100644
index b424658a61..0000000000
--- a/pkgs/cext-lib/dynext/compile.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require racket/unit)
-
-(require "compile-sig.rkt"
-         "compile-unit.rkt")
-
-(define-values/invoke-unit/infer dynext:compile@)
-
-(provide-signature-elements dynext:compile^)
diff --git a/pkgs/cext-lib/dynext/dynext-sig.rkt b/pkgs/cext-lib/dynext/dynext-sig.rkt
deleted file mode 100644
index d4bc8b9d18..0000000000
--- a/pkgs/cext-lib/dynext/dynext-sig.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module dynext-sig racket/base
-
-  (require "compile-sig.rkt" "link-sig.rkt")
-
-  (provide (all-from-out "compile-sig.rkt")
-           (all-from-out "link-sig.rkt")))
diff --git a/pkgs/cext-lib/dynext/dynext-unit.rkt b/pkgs/cext-lib/dynext/dynext-unit.rkt
deleted file mode 100644
index 249f0d0d3f..0000000000
--- a/pkgs/cext-lib/dynext/dynext-unit.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-(require "compile-unit.rkt" "link-unit.rkt")
-
-(provide (all-from-out "compile-unit.rkt")
-         (all-from-out "link-unit.rkt"))
diff --git a/pkgs/cext-lib/dynext/dynext.rkt b/pkgs/cext-lib/dynext/dynext.rkt
deleted file mode 100644
index 200c89b8ce..0000000000
--- a/pkgs/cext-lib/dynext/dynext.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-(require "compile.rkt" "link.rkt" dynext/file)
-
-(provide (all-from-out "compile.rkt")
-         (all-from-out "link.rkt")
-         (all-from-out dynext/file))
diff --git a/pkgs/cext-lib/dynext/file-sig.rkt b/pkgs/cext-lib/dynext/file-sig.rkt
deleted file mode 100644
index 25945c21ca..0000000000
--- a/pkgs/cext-lib/dynext/file-sig.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-(require racket/unit)
-
-(provide dynext:file^)
-
-(define-signature dynext:file^
-  (append-zo-suffix
-   append-c-suffix
-   append-constant-pool-suffix
-   append-object-suffix
-   append-extension-suffix
-   
-   extract-base-filename/ss
-   extract-base-filename/c
-   extract-base-filename/kp
-   extract-base-filename/o
-   extract-base-filename/ext))
\ No newline at end of file
diff --git a/pkgs/cext-lib/dynext/file-unit.rkt b/pkgs/cext-lib/dynext/file-unit.rkt
deleted file mode 100644
index be35c903f0..0000000000
--- a/pkgs/cext-lib/dynext/file-unit.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-(require racket/unit "file-sig.rkt" dynext/file)
-
-(provide dynext:file@)
-
-(define-unit-from-context dynext:file@ dynext:file^)
diff --git a/pkgs/cext-lib/dynext/link-sig.rkt b/pkgs/cext-lib/dynext/link-sig.rkt
deleted file mode 100644
index 2eebe0e390..0000000000
--- a/pkgs/cext-lib/dynext/link-sig.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-(require racket/unit)
-
-(provide dynext:link^)
-
-(define-signature dynext:link^
-  (link-extension
-   current-extension-linker
-   current-extension-linker-flags
-   current-make-link-input-strings
-   current-make-link-output-strings
-   current-standard-link-libraries
-   current-use-mzdyn
-   use-standard-linker
-   link-variant
-   expand-for-link-variant))
diff --git a/pkgs/cext-lib/dynext/link-unit.rkt b/pkgs/cext-lib/dynext/link-unit.rkt
deleted file mode 100644
index 56d3cfe33a..0000000000
--- a/pkgs/cext-lib/dynext/link-unit.rkt
+++ /dev/null
@@ -1,440 +0,0 @@
-(module link-unit racket/base
-  (require racket/unit
-           racket/system
-           "private/dirs.rkt"
-           "private/stdio.rkt"
-           "private/cmdargs.rkt"
-           dynext/filename-version)
-
-  (require "link-sig.rkt")
-
-  (provide dynext:link@)
-
-  (define-unit dynext:link@
-      (import)
-      (export dynext:link^)
-
-      (define (path-string->string s)
-	(if (string? s) s (path->string s)))
-
-      ;; ---- Find a linker for this platform --------------------
-
-      (define (get-windows-linker)
-	(or (find-executable-path "cl.exe" #f)
-	    (find-executable-path "ld.exe" #f)
-	    (find-executable-path "ilink32.exe" #f)))
-
-      (define (get-unix-linker)
-	(let ([l (case (string->symbol (path->string (system-library-subpath #f)))
-                   [(sparc-solaris i386-solaris 
-                                   sparc-sunos4
-                                   i386-freebsd-2.x
-                                   parisc-hpux
-                                   i386-cygwin)
-                    '("ld")]
-		   [else '("gcc" "cc")])])
-          (ormap (lambda (s)
-                   (find-executable-path s #f))
-                 l)))
-      
-      (define (check-valid-linker-path v)
-	(unless (and (file-exists? v)
-		     (memq 'execute (file-or-directory-permissions v)))
-	  (error 'current-extension-linker 
-		 "linker not found or not executable: ~s" v)))
-
-      ;; See manual:
-      (define current-extension-linker 
-	(make-parameter 
-	 (or (let ([p (getenv "MZSCHEME_DYNEXT_LINKER")])
-	       (and p
-		    (if (absolute-path? p)
-			(string->path p)
-			(find-executable-path p #f))))
-	     (case (system-type) 
-	       [(unix macosx) (get-unix-linker)]
-	       [(windows) (get-windows-linker)]
-	       [else #f]))
-	 (lambda (v)
-	   (when v 
-	     (if (path-string? v)
-		 (check-valid-linker-path v)
-		 (raise-type-error 'current-extension-linker "path, valid-path string, or #f" v)))
-	   v)))
-
-      ;; Helpers to tell us about the selected linker in Windows:
-      
-      (define (still-win-gcc?)
-	(or (and (eq? 'windows (system-type))
-		 (let ([c (current-extension-linker)])
-		   (and c (regexp-match #"ld.exe$" (path-string->string c)))))
-	    (and (eq? 'unix (system-type))
-		 (string=? "i386-cygwin"
-			   (path->string (system-library-subpath #f))))))
-      (define (still-win-borland?)
-	(and (eq? 'windows (system-type))
-	     (let ([c (current-extension-linker)])
-	       (and c (regexp-match #"ilink32.exe$" (path-string->string c))))))
-
-      (define win-gcc? (still-win-gcc?))
-      (define win-borland? (still-win-borland?))
-      
-      ;; ---- The right flags for this platform+linker --------------------
-      
-      ;; We need 
-      ;;   1) the basic flags
-      ;;   2) a way to wrap inputs on the command line
-      ;;   3) a way to wrap the output on the command line
-      ;;   4) needed base libraries and objects
-
-      (define link-variant (make-parameter 
-			    'normal
-			    (lambda (s)
-			      (unless (memq s '(normal cgc 3m))
-				(raise-type-error 'link-variant "'normal, 'cgc, or '3m" s))
-			      s)))
-
-      (define (specific-link-variant)
-        (let ([v (link-variant)])
-          (if (eq? v 'normal)
-              (system-type 'gc)
-              v)))
-
-      (define (wrap-3m s)
-	(lambda ()
-	  (list (format s (if (eq? '3m (specific-link-variant)) "3m" "")))))
-
-      (define (drop-3m s)
-	(lambda ()
-	  (if (eq? '3m (specific-link-variant))
-	      null
-	      (list s))))
-
-      (define (expand-for-link-variant l)
-	(apply append (map (lambda (s) (if (path-string? s) (list (path-string->string s)) (s))) l)))
-
-      (define current-use-mzdyn (make-parameter #t))
-      (define (mzdyn-maybe s)
-        (lambda ()
-          (if (current-use-mzdyn) (s) null)))
-
-      (define msvc-linker-flags (list "/LD"))
-      (define win-gcc-linker-flags (list "--dll"))
-      (define borland-linker-flags (list "/Tpd" "/c"))
-
-      (define mac-link-flags (list "-bundle" "-flat_namespace" "-undefined" "suppress"))
-
-      (define (get-unix-link-flags)
-	(case (string->symbol (path->string (system-library-subpath #f)))
-	  [(sparc-solaris i386-solaris) (list "-G")]
-	  [(sparc-sunos4) (list "-Bdynamic")]
-	  [(i386-freebsd-2.x) (list "-Bshareable")]
-	  [(rs6k-aix) (list "-bM:SRE"
-			    "-brtl"
-			    (lambda () 
-			      (map (lambda (mz-exp)
-				     (format "-bI:~a/~a" (include-dir) mz-exp))
-				   ((wrap-3m "mzscheme~a.exp"))))
-			    (format "-bE:~a/ext.exp" (include-dir))
-			    "-bnoentry")]
-	  [(parisc-hpux) (list "-b")]
-	  [(ppc-macosx ppc-darwin x86_64-macosx x86_64-darwin) mac-link-flags]
-          [(i386-macosx i386-darwin) (append mac-link-flags '("-m32"))]
-	  [(i386-cygwin) win-gcc-linker-flags]
-	  [else (list "-fPIC" "-shared")]))
-
-      (define (get-env-link-flags)
-	(let ([v (or (getenv "MZSCHEME_DYNEXT_LINKER_FLAGS")
-		     (getenv "LDFLAGS"))])
-	  (if v
-	      (split-command-line-args v)
-	      null)))
-      
-      ;; See manual:
-      (define current-extension-linker-flags
-	(make-parameter
-	 (append (get-env-link-flags)
-		 (case (system-type)
-		   [(unix macosx) (get-unix-link-flags)]
-		   [(windows) (cond
-			       [win-gcc? win-gcc-linker-flags]
-			       [win-borland? borland-linker-flags]
-			       [else msvc-linker-flags])]
-		   [(macos) null]))
-	 (lambda (l)
-	   (unless (and (list? l) (andmap string? l))
-	     (raise-type-error 'current-extension-linker-flags "list of strings" l))
-	   l)))
-
-      ;; See manual:
-      (define current-make-link-input-strings
-	(make-parameter
-	 (lambda (s) (list (path-string->string s)))
-	 (lambda (p)
-	   (unless (procedure-arity-includes? p 1)
-	     (raise-type-error 'current-make-link-input-strings "procedure of arity 1" p))
-	   p)))
-            
-      (define win-gcc-link-output-strings (lambda (s) (list "--base-file"
-							    (path->string (make-win-gcc-temp "base"))
-							    "-e" "_dll_entry@12" 
-							    "-o" (path-string->string s))))
-      (define msvc-link-output-strings (lambda (s) (list (string-append "/Fe" (path-string->string s)))))
-      (define borland-link-output-strings (lambda (s) (list* "," (path-string->string s)
-                                                             "," "," "c0d32.obj" "cw32.lib" "import32.lib"
-                                                             (if (current-use-mzdyn)
-                                                               (list "," (path->string
-                                                                          (build-path (std-library-dir)
-                                                                                      "bcc" 
-                                                                                      "mzdynb.def")))
-                                                               null))))
-      
-      ;; See manual:
-      (define current-make-link-output-strings
-	(make-parameter
-	 (case (system-type)
-	   [(unix macosx) 
-	    (case (string->symbol (path->string (system-library-subpath #f)))
-	      [(i386-cygwin) win-gcc-link-output-strings]
-	      [else (lambda (s) (list "-o" (path-string->string s)))])]
-	   [(windows) (cond
-		       [win-gcc? win-gcc-link-output-strings]
-		       [win-borland? borland-link-output-strings]
-		       [else msvc-link-output-strings])]
-	   [(macos) (lambda (s) (list "-o" (path-string->string s)))])
-	 (lambda (p)
-	   (unless (procedure-arity-includes? p 1)
-	     (raise-type-error 'current-make-link-output-strings "procedure of arity 1" p))
-	   p)))
-
-      (define (make-win-link-libraries win-gcc? win-borland? unix?)
-	(let* ([file (lambda (f)
-		       (path->string
-			(build-path (std-library-dir)
-				    (cond
-                                     [win-gcc? "gcc"]
-                                     [win-borland? "bcc"]
-                                     [else "msvc"])
-				    f)))]
-	       [dllfile (lambda (f)
-			  (path->string
-			   (build-path (std-library-dir) f)))]
-               [filethunk (lambda (f)
-                            (lambda ()
-			      (map file (f))))]
-	       [wrap-xxxxxxx
-                (lambda (file f)
-                  (lambda ()
-                    (map (lambda (s)
-                           (if (file-exists?
-                                (file (format s filename-version-part)))
-                             (file (format s filename-version-part))
-                             (file (format s "xxxxxxx"))))
-                         (f))))])
-	  (cond
-	   [win-gcc? (append
-		      (if unix?
-			  null
-			  (list (wrap-xxxxxxx dllfile (wrap-3m "libracket~a~~a.dll"))
-				(wrap-xxxxxxx dllfile (drop-3m "libmzgc~a.dll"))))
-		      (list
-		       (mzdyn-maybe (filethunk (wrap-3m "mzdyn~a.exp")))
-		       (mzdyn-maybe (filethunk (wrap-3m 
-						;; mzdyn.o is for Unix build, mzdynw.o for Windows
-						(format "mzdyn~a~~a.o"
-							(if unix? "" "w")))))
-		       (file "init.o")
-		       (file "fixup.o")))]
-	   [win-borland? (map file (if (current-use-mzdyn)
-                                     (list "mzdynb.obj")
-                                     null))]
-	   [else (list (wrap-xxxxxxx file (wrap-3m "libracket~a~~a.lib"))
-		       (wrap-xxxxxxx file (drop-3m "libmzgc~a.lib"))
-		       (mzdyn-maybe (filethunk (wrap-3m "mzdyn~a.exp")))
-		       (mzdyn-maybe (filethunk (wrap-3m "mzdyn~a.obj"))))])))
-
-      (define (get-unix/macos-link-libraries)
-	(case (string->symbol (path->string (system-library-subpath #f)))
-	  [(i386-cygwin)
-	   (make-win-link-libraries #t #f #t)]
-	  [else
-	   (list (lambda ()
-		   (if (current-use-mzdyn)
-		       (map (lambda (mz.o)
-			      (path->string (build-path (std-library-dir) mz.o)))
-			    ((wrap-3m "mzdyn~a.o")))
-		       null)))]))
-
-      ;; See manual:
-      (define current-standard-link-libraries
-	(make-parameter
-	 (case (system-type)
-	   [(unix macos macosx) (get-unix/macos-link-libraries)]
-	   [(windows) (make-win-link-libraries win-gcc? win-borland? #f)])
-	 (lambda (l)
-	   (unless (and (list? l) 
-			(andmap (lambda (s) (or (path-string? s)
-						(and (procedure? s) (procedure-arity-includes? s 0))))
-				l))
-	     (raise-type-error 'current-stand-link-libraries "list of paths/strings and thunks" l))
-	   l)))
-      
-      ;; ---- Function to install standard linker parameters --------------------
-
-      ;; see manual
-      (define (use-standard-linker name)
-	(define (bad-name name)
-	  (error 'use-standard-linker "unknown linker: ~a" name))
-	(case (system-type)
-	  [(unix macosx) 
-	   (case name
-	     [(cc gcc) (current-extension-linker (get-unix-linker))
-	      (current-extension-linker-flags (get-unix-link-flags))
-	      (current-make-link-input-strings (lambda (s) (list (path-string->string s))))
-	      (current-make-link-output-strings (lambda (s) (list "-o" (path-string->string s))))
-	      (current-standard-link-libraries (get-unix/macos-link-libraries))]
-	     [else (bad-name name)])]
-	  [(windows)
-	   (case name
-	     [(gcc) (let ([f (find-executable-path "ld.exe" #f)])
-		      (unless f
-			(error 'use-standard-linker "cannot find gcc's ld.exe"))
-		      (current-extension-linker f)
-		      (current-extension-linker-flags win-gcc-linker-flags)
-		      (current-make-link-input-strings (lambda (s) (list (path-string->string s))))
-		      (current-make-link-output-strings win-gcc-link-output-strings)
-		      (current-standard-link-libraries (make-win-link-libraries #t #f #f)))]
-	     [(borland) (let ([f (find-executable-path "ilink32.exe" #f)])
-			  (unless f
-			    (error 'use-standard-linker "cannot find ilink32.exe"))
-			  (current-extension-linker f)
-			  (current-extension-linker-flags borland-linker-flags)
-			  (current-make-link-input-strings (lambda (s) (list (path-string->string s))))
-			  (current-make-link-output-strings borland-link-output-strings)
-			  (current-standard-link-libraries (make-win-link-libraries #f #t #f)))]
-	     [(msvc) (let ([f (find-executable-path "cl.exe" #f)])
-		       (unless f
-			 (error 'use-standard-linker "cannot find MSVC's cl.exe"))
-		       (current-extension-linker f)
-		       (current-extension-linker-flags msvc-linker-flags)
-		       (current-make-link-input-strings (lambda (s) (list (path-string->string s))))
-		       (current-make-link-output-strings msvc-link-output-strings)
-		       (current-standard-link-libraries (make-win-link-libraries #f #f #f)))]
-	     [else (bad-name name)])]
-	  [(macos)
-	   (case name
-	     [(cw) (current-extension-linker #f)
-	      (current-extension-linker-flags null)
-	      (current-make-link-input-strings (lambda (s) (list (path-string->string s))))
-	      (current-make-link-output-strings (lambda (s) (list "-o" (path-string->string s))))
-	      (current-standard-link-libraries (get-unix/macos-link-libraries))]
-	     [else (bad-name name)])]))
-
-      ;; ---- The link driver for each platform --------------------
-
-      (define unix/windows-link
-	(lambda (quiet? in out)
-	  (let ([c (current-extension-linker)])
-	    (if c
-		(let* ([output-strings
-			((current-make-link-output-strings) out)]
-		       [libs (expand-for-link-variant (current-standard-link-libraries))]
-		       [command 
-			(append 
-			 (list c)
-			 (expand-for-link-variant (current-extension-linker-flags))
-			 (apply append (map (lambda (s) ((current-make-link-input-strings) s))
-					    in))
-			 libs
-			 output-strings)])
-		  (unless quiet? 
-		    (printf "link-extension: ~a\n" command))
-		  (stdio-link (lambda (quiet?)
-				(apply my-process* command))
-			      quiet?)
-
-		  ;; Stange Cygwin system for relocatable DLLs: we run dlltool twice and
-		  ;;  ld three times total
-		  (when (still-win-gcc?)
-		    (let ([dlltool (find-executable-path "dlltool.exe" "dlltool.exe")]
-			  ;; Find base-file name we already made up:
-			  [basefile (let ([m (member "--base-file" output-strings)])
-				      (and m (cadr m)))]
-			  ;; Make new exp file name:
-			  [expfile (make-win-gcc-temp "exp")])
-		      (when (and dlltool basefile)
-			(let* ([dll-command
-				;; Generate DLL link information
-				`("--dllname" ,(if (path? out) (path->string out) out)
-				  ,@(if (current-use-mzdyn)
-                                      `("--def" ,(path->string (build-path (std-library-dir) "gcc" "mzdyn.def")))
-                                      `())
-				  "--base-file" ,basefile
-				  "--output-exp" ,(path->string expfile))]
-			       ;; Command to link with new .exp, re-create .base:
-			       [command1
-				(map (lambda (s)
-				       (let ([s (if (path? s)
-						    (path->string s)
-						    s)])
-					 (if (regexp-match "[.]exp$" s)
-					     (path->string expfile)
-					     s)))
-				     command)]
-			       ;; Command to link with new .exp file, no .base needed:
-			       [command2
-				(let loop ([l command1])
-				  (cond
-				   [(null? l) null]
-				   [(and (string? (car l))
-					 (string=? (car l) "--base-file"))
-				    (cddr l)]
-				   [else (cons (car l) (loop (cdr l)))]))])
-			  (unless quiet?
-			    (printf "link-extension, dlltool phase: ~a\n" 
-				    (cons dlltool dll-command)))
-			  (stdio-link (lambda (quiet?) 
-					(apply my-process* dlltool dll-command))
-				      quiet?)
-			  (unless quiet?
-			    (printf "link-extension, re-link phase: ~a\n" 
-				    command1))
-			  (stdio-link (lambda (quiet?) 
-					(apply my-process* command1))
-				      quiet?)
-			  (unless quiet?
-			    (printf "link-extension, re-dlltool phase: ~a\n" 
-				    (cons dlltool dll-command)))
-			  (stdio-link (lambda (quiet?)
-					(apply my-process* dlltool dll-command))
-				      quiet?)
-			  (unless quiet?
-			    (printf "link-extension, last re-link phase: ~a\n" 
-				    command2))
-			  (stdio-link (lambda (quiet?)
-					(apply my-process* command2))
-				      quiet?)
-			  (delete-file basefile)
-			  (delete-file expfile))))))
-		(error 'link-extension "can't find an installed linker")))))
-      
-      (define link-extension
-	(case (system-type)
-	  [(unix windows macosx) unix/windows-link]))
-
-      ;; ---- some helpers:
-      
-      (define-values (my-process* stdio-link)
-	(let-values ([(p* do-stdio) (get-stdio)])
-	  (values
-	   p*
-	   (lambda (start-process quiet?)
-	     (do-stdio start-process quiet? (lambda (s) (error 'link-extension "~a" s)))))))
-      
-      (define (make-win-gcc-temp suffix)
-	(let ([d (find-system-path 'temp-dir)])
-	  (let loop ([n 1])
-	    (let ([f (build-path d (format "tmp~a.~a" n suffix))])
-	      (if (file-exists? f)
-		  (loop (add1 n))
-		  f)))))))
diff --git a/pkgs/cext-lib/dynext/link.rkt b/pkgs/cext-lib/dynext/link.rkt
deleted file mode 100644
index f478f018fd..0000000000
--- a/pkgs/cext-lib/dynext/link.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require racket/unit)
-
-(require "link-sig.rkt"
-         "link-unit.rkt")
-
-(define-values/invoke-unit/infer dynext:link@)
-
-(provide-signature-elements dynext:link^)
diff --git a/pkgs/cext-lib/dynext/main.rkt b/pkgs/cext-lib/dynext/main.rkt
deleted file mode 100644
index 6c752661a1..0000000000
--- a/pkgs/cext-lib/dynext/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require "dynext.rkt")
-(provide (all-from-out "dynext.rkt"))
diff --git a/pkgs/cext-lib/dynext/private/cmdargs.rkt b/pkgs/cext-lib/dynext/private/cmdargs.rkt
deleted file mode 100644
index 7f0f6824ac..0000000000
--- a/pkgs/cext-lib/dynext/private/cmdargs.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-(module cmdargs racket/base
-
-  (provide split-command-line-args)
-
-  (define (split-command-line-args v)
-    (let loop ([v (strip-leading-spaces (strip-trailing-spaces v))])
-      (if (string=? v "")
-	  null
-	  (let-values ([(s v) (let loop ([v v])
-				(cond
-				 [(string=? v "") (values "" "")]
-				 [(regexp-match #rx"^[ \t\r\n]" v) (values "" v)]
-				 [(regexp-match-positions #rx"^\"[^\"]*\"" v)
-				  => (combine v loop 1)]
-				 [(regexp-match-positions #rx"^'[^']*'" v)
-				  => (combine v loop 1)]
-				 [(regexp-match-positions #rx"^[^ \t\r\n]+" v)
-				  => (combine v loop 0)]))])
-	    (cons s (loop (strip-leading-spaces v)))))))
-
-  (define (combine v loop inset)
-    (lambda (m)
-      (let-values ([(rest leftover) (loop (substring v (cdar m)))])
-	(values (string-append
-		 (substring v (+ (caar m) inset) (- (cdar m) inset)))
-		leftover))))
-
-  (define (strip-leading-spaces v)
-    (regexp-replace #rx"^[\t \r\n]+" v ""))
-
-  (define (strip-trailing-spaces v)
-    (regexp-replace #rx"[\t \r\n]+$" v "")))
diff --git a/pkgs/cext-lib/dynext/private/dirs.rkt b/pkgs/cext-lib/dynext/private/dirs.rkt
deleted file mode 100644
index b3d2f63ead..0000000000
--- a/pkgs/cext-lib/dynext/private/dirs.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require setup/dirs)
-
-(define include-dir find-include-dir)
-(define std-library-dir find-lib-dir)
-
-(provide include-dir std-library-dir)
diff --git a/pkgs/cext-lib/dynext/private/stdio.rkt b/pkgs/cext-lib/dynext/private/stdio.rkt
deleted file mode 100644
index d3b1f9e2a8..0000000000
--- a/pkgs/cext-lib/dynext/private/stdio.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang racket/base
-(require racket/system)
-
-(provide get-stdio)
-
-(define (get-stdio)
-  (values
-   (if (member (system-library-subpath) '("rs6k-aix" "parisc-hpux"))
-       (letrec ([pseudo-process* 
-                 (lambda (c . args)
-                   (if (null? args)
-                       (let ([r (process* "/usr/bin/csh" "-t")])
-                         (display c (cadr r))
-                         (newline (cadr r))
-                         r)
-                       (apply pseudo-process* (string-append c " " (car args)) (cdr args))))])
-         pseudo-process*)
-       process*)
-   
-   (lambda (start-process quiet? error)
-     (let* ([l (start-process quiet?)]
-            [in (car l)]
-            [out (cadr l)]
-            [in-error (cadddr l)]
-            [control (cadddr (cdr l))]
-
-            [collect-output (box "")]
-            
-            [make-collector
-             (lambda (in dest box)
-               (thread (lambda () 
-                         (let loop ()
-                           (let ([t (read-line in 'any)])
-                             (unless (eof-object? t)
-                               (unless quiet? (fprintf (dest) "~a\n" t))
-                               (set-box! box (string-append (unbox box) 
-                                                            (string #\newline) t))
-                               (loop)))))))]
-            [in-thread (make-collector in current-output-port collect-output)]
-            [in-error-thread (make-collector in-error current-error-port collect-output)])
-
-       (close-output-port out)
-
-       (control 'wait)
-
-       (thread-wait in-thread)
-       (thread-wait in-error-thread)
-
-       (close-input-port in)
-       (close-input-port in-error)
-
-       (unless (eq? (control 'status) 'done-ok)
-         (error (if quiet?
-                    (unbox collect-output)
-                    "command failed")))))))
-
diff --git a/pkgs/cext-lib/info.rkt b/pkgs/cext-lib/info.rkt
deleted file mode 100644
index 368314d38d..0000000000
--- a/pkgs/cext-lib/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-(define collection 'multi)
-(define deps '("base"
-               "compiler-lib"
-               "scheme-lib"
-               "rackunit-lib"))
-
-(define pkg-desc "Tools for managing C extensions, such as `raco ctool`")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/LICENSE.txt b/pkgs/compatibility-pkgs/compatibility-doc/LICENSE.txt
deleted file mode 100644
index 67c77e5e92..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-compatibility-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/info.rkt b/pkgs/compatibility-pkgs/compatibility-doc/info.rkt
deleted file mode 100644
index 00061e8046..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/info.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang info
-(define collection 'multi)
-(define deps '("base"
-               "scribble-lib"
-               "compatibility-lib"
-               "pconvert-lib"
-               "sandbox-lib"
-	       "compiler-lib"
-               "gui-lib"
-               "racket-doc"))
-
-(define pkg-desc "documentation part of \"compatibility\"")
-
-(define pkg-authors '(eli mflatt robby samth))
-(define build-deps '("data-doc"
-                     "mzscheme-doc"
-                     "scheme-lib"))
-(define update-implies '("compatibility-lib"))
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/info.rkt b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/info.rkt
deleted file mode 100644
index 629436e3f0..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all mflatt)))
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/awk.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/awk.scrbl
deleted file mode 100644
index aa2f0bc3de..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/awk.scrbl
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/awk
-                     scheme/contract))
-
-@mzlib[#:mode title awk]
-
-@defform/subs[
-#:literals (after range / => :range range: :range: else)
-(awk next-record-expr
-     (record field-id ...)
-     maybe-counter
-     ((state-variable init-expr) ...)
-     maybe-continue
-  clause ...)
-([maybe-counter code:blank
-                id]
- [maybe-continue code:blank
-                 id]
- [clause (test body ...+)
-         (test => procedure-expr)
-         (/ regexp-str / (id-or-false ...+) body ...+)
-         (range excl-start-test excl-stop-test body ...+)
-         (:range incl-start-test excl-stop-test body ...+)
-         (range: excl-start-test incl-stop-test body ...+)
-         (:range: incl-start-test incl-stop-test body ...+)
-         (else body ...+)
-         (after body ...+)]
- [test integer
-       regexp-string
-       expr]
- [excl-start-test test]
- [excl-stop-test test]
- [incl-start-test test]
- [incl-stop-test test]
- [id-or-false id
-              #f])]{
-
-The @racket[awk] macro from Scsh @cite["Shivers06"]. In addition to
-@racket[awk], the Scsh-compatible procedures @racket[match:start],
-@racket[match:end], @racket[match:substring], and @racket[regexp-exec]
-are defined. These @racketidfont{match:} procedures must be used to
-extract match information in a regular expression clause when using
-the @racket[=>] form.  }
-
-@deftogether[(
-@defproc[(match:start [rec ....]
-                      [which exact-nonnegative-integer? 0])
-         exact-nonnegative-integer?]
-@defproc[(match:end   [rec ....]
-                      [which exact-nonnegative-integer? 0])
-         exact-nonnegative-integer?]
-@defproc[(match:substring   
-                      [rec ....]
-                      [which exact-nonnegative-integer? 0])
-         string?]
-)]{
-
-Extracts a start position, end position, or substring corresponding to
-a match. The first argument is the value supplied to the procedure
-after @racket[=>] in a @racket[awk] clause or the result of
-@racket[regexp-exec].}
-
-
-@defproc[(regexp-exec [re (or/c string? regexp?)] [s string?])
-         (or/c .... false/c)]{
-
-Matches a regexp to a string, returning a record compatible with
-@racket[match:start], etc.}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/cmdline.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/cmdline.scrbl
deleted file mode 100644
index 622371ae75..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/cmdline.scrbl
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/cmdline))
-
-@(define-syntax-rule (intro id)
-   (begin
-     (require (for-label racket/cmdline))
-     (define id (racket command-line))))
-@(intro racket-command-line)
-
-@mzlib[#:mode title cmdline]
-
-@deprecated[@racketmodname[racket/cmdline]]{}
-
-Provides a @racket[command-line] from that is similar to the one in
-@racketmodname[racket/cmdline], but without using keywords.  The
-@racket[parse-command-line] procedure from
-@racketmodname[racket/cmdline] is re-exported directly.
-
-@defform/subs[
-#:literals (multi once-each once-any final help-labels args =>)
-(command-line program-name-expr argv-expr clause ...)
-([clause (multi flag-spec ...)
-         (once-each flag-spec ...)
-         (once-any flag-spec ...)
-         (final flag-spec ...)
-         (help-labels string ...)
-         (args arg-formals body-expr ...+)
-         (=> finish-proc-expr arg-help-expr help-proc-expr 
-             unknown-proc-expr)]
- [flag-spec (flags id ... help-str ...+ body-expr ...+) 
-            (flags => handler-expr help-expr)]
- [flags flag-string 
-        (flag-string ...+)]
- [arg-formals id
-              (id ...)
-              (id ...+ . id)])]{
-
-Like @racket-command-line from @racket[racket/cmdline], but without
-keywords in the syntax.}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/cml.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/cml.scrbl
deleted file mode 100644
index fcc46f6397..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/cml.scrbl
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/cml))
-
-@mzlib[#:mode title cml]
-
-The @racketmodname[mzlib/cml] library defines a number of procedures
-that wrap Racket concurrency procedures. The wrapper procedures
-have names and interfaces that more closely match those of Concurrent
-ML @cite["Reppy99"].
-
-
-@defproc[(spawn [thunk (-> any)]) thread?]{
-
-Equivalent to @racket[(thread/suspend-to-kill thunk)].}
-
-
-@defproc[(channel) channel?]{
-
-Equivalent to @racket[(make-channel)].}
-
-
-@defproc[(channel-recv-evt [ch channel?]) evt?]{
-
-Equivalent to @racket[ch].}
-
-
-@defproc[(channel-send-evt [ch channel?][v any/c]) evt?]{
-
-Equivalent to @racket[(channel-put-evt ch v)].}
-
-
-@defproc[(thread-done-evt [thd thread?]) any]{
-
-Equivalent to @racket[(thread-dead-evt thread)].}
-
-
-@defproc[(current-time) real?]{
-
-Equivalent to @racket[(current-inexact-milliseconds)].}
-
-
-@defproc[(time-evt [tm real?]) evt?]{
-
-Equivalent to @racket[(alarm-evt tm)].}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/common.rkt b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/common.rkt
deleted file mode 100644
index 713a2f17c2..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/common.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang scheme/base
-
-(require (for-syntax scheme/base)
-         scribble/manual
-         (for-label mzscheme
-		    (only-in scheme/base exn:fail exn:fail:unsupported exn:fail:contract)))
-
-(provide mzlib
-         (all-from-out scribble/manual)
-         (for-label (all-from-out mzscheme)
-		    (all-from-out scheme/base)))
-
-(define-syntax (mzlib stx)
-  (syntax-case stx ()
-    [(_ #:mode section name #:use-sources (src ...))
-     (with-syntax ([lib (string->symbol
-                         (format "mzlib/~a" (syntax-e #'name)))])
-       #'(begin
-           (section #:style 'hidden (racket lib))
-           (defmodule lib #:use-sources (src ...))))]
-    [(_ #:mode section name)
-     #'(mzlib #:mode section name #:use-sources ())]
-    [(_ name) 
-     #'(mzlib #:mode section name #:use-sources ())]))
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/compat.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/compat.scrbl
deleted file mode 100644
index 2514dfc0b6..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/compat.scrbl
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          scribble/eval
-          (for-label mzlib/compat))
-
-@(define compat-eval (make-base-eval))
-
-@interaction-eval[#:eval compat-eval (require mzlib/compat)]
-
-@mzlib[#:mode title compat]
-
-The @racketmodname[mzlib/compat] library defines a number of
-procedures and syntactic forms that are commonly provided by other
-Scheme implementations. Most of the procedures are aliases for
-@racketmodname[mzscheme] procedures.
-
-@deftogether[(
-@defproc[(=? [n number?] ...+) boolean?]
-@defproc[(<? [n real?] ...+) boolean?]
-@defproc[(>? [n real?] ...+) boolean?]
-@defproc[(<=? [n real?] ...+) boolean?]
-@defproc[(>=? [n real?] ...+) boolean?]
-)]{
-
-Same as @racket[=], @racket[<], etc.}
-
-@deftogether[(
-@defproc[(1+ [n number?]) number?]
-@defproc[(1- [n number?]) number?]
-)]{
-
-Same as @racket[add1] and @racket[sub1].}
-
-
-@defproc[(gentmp [base (or/c string? symbol?) "g"]) symbol?]{
-
-Same as @racket[gensym].}
-
-
-@defproc[(flush-output-port [o output-port? (current-output-port)]) void?]{
-
-Same as @racket[flush-output].}
-
-@defproc[(real-time) exact-integer?]{
-
-Same as @racket[current-milliseconds].}
-
-
-@defproc[(atom? [v any/c]) any]{
-
-Same as @racket[(not (pair? v))] (which does not actually imply an
-atomic value).}
-
-
-@defform*[[(define-structure (name-id field-id ...))
-           (define-structure (name-id field-id ...) 
-                             ((init-field-id init-expr) ...))]]{
-
-Like @racket[define-struct], except that the @racket[name-id] is moved
-inside the parenthesis for fields. In addition,
-@racket[init-field-id]s can be specified with automatic initial-value
-expression.
-
-The @racket[init-field-id]s do not have corresponding arguments for
-the @racketidfont{make-}@racket[name-id] constructor. Instead, each
-@racket[init-field-id]'s @racket[init-expr] is evaluated to obtain the
-field's value when the constructor is called. The @racket[field-id]s
-are bound in @racket[init-expr]s, but not other
-@racket[init-field-id]s.
-
-@examples[
-#:eval compat-eval
-(define-structure (add left right) ([sum (+ left right)]))
-(add-sum (make-add 3 6))
-]}
-
-@deftogether[(
-@defproc[(getprop [sym symbol?][property symbol?][default any/c #f]) any/c]
-@defproc[(putprop [sym symbol?][property symbol?][value any/c]) void?]
-)]{
-
-The @racket[getprop] function gets a property value associated with
-@racket[sym].  The @racket[property] argument names the property to be
-found. If the property is not found, @racket[default] is returned.
-
-The properties obtained with @racket[getprop] are the ones installed
-with @racket[putprop].}
-
-
-@defproc[(new-cafe [eval-handler (any/c . -> . any) #f]) any]{
-
-Emulates Chez Scheme's @racket[new-cafe] by installing
-@racket[eval-handler] into the @racket[current-eval] parameter while
-running @racket[read-eval-print]. In addition, @racket[current-exit]
-is set to escape from the call to @racket[new-cafe].}
-
-
-@close-eval[compat-eval]
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/compile.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/compile.scrbl
deleted file mode 100644
index 0bc69bb28b..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/compile.scrbl
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label compiler/compile-file))
-
-@mzlib[#:mode title compile]
-
-Re-exports @racket[compile-file] from @racketmodname[compiler/compile-file].
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/contract-label.rkt b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/contract-label.rkt
deleted file mode 100644
index 1e1df7604e..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/contract-label.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require (for-label racket/contract)
-         scribble/manual)
-(provide (all-defined-out))
-
-;; this file establishes the right for-label
-;; bindings so that I can link to racket/contract
-;; combinators in the mzlib/contract docs
-
-(define r:-> (racket ->))
-(define r:->* (racket ->*))
-(define r:->i (racket ->i))
-(define r:->d (racket ->d))
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/contract.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/contract.scrbl
deleted file mode 100644
index 6709fa6d1f..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/contract.scrbl
+++ /dev/null
@@ -1,294 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          scribble/struct
-          "contract-label.rkt"
-          (for-label mzlib/contract)
-          (for-label (prefix-in r: racket/contract)))
-
-@(define-syntax-rule (twocolumns id ...)
-   (*twocolumns (list (racket id) ...)))
-@(define (*twocolumns uneven-l)
-   (let* ([l (if (zero? (modulo (length uneven-l) 2)) uneven-l (append uneven-l (list #f)))]
-          [len (length l)]
-          [half (quotient len 2)]
-          [a (for/list ([i (in-range half)]
-                        [e l])
-               e)]
-          [b (list-tail l half)]
-          [spacer (hspace 2)]
-          [to-flow (compose make-flow list make-paragraph list)])
-     (make-table #f
-                 (map (lambda (a b)
-                        (list (to-flow spacer)
-                              (to-flow a)
-                              (to-flow spacer)
-                              (to-flow (or b ""))))
-                      a b))))
-
-@mzlib[#:mode title contract]
-
-@deprecated[@racketmodname[racket/contract]]{
-  This library is designed as a backwards compatible library
-  for old uses of contracts. It should not be used for new
-  libraries.
-}
-
-The main differences: the function contract syntax is more
-regular and function contracts now support keywords, and
-@tt{union} is now @racket[or/c].
-
-The @racketmodname[mzlib/contract] library re-exports many bindings
-from @racketmodname[racket/contract]:
-
-@twocolumns[
- </c
- <=/c
- =/c
- >/c
- >=/c
- and/c
- any
- any/c
- between/c
- box-immutable/c
- build-compound-type-name
- coerce-contract
- cons/c
- contract
- contract-first-order-passes?
- contract-violation->string
- contract?
- define-contract-struct
- false/c
- flat-contract
- flat-contract-predicate
- flat-contract?
- flat-murec-contract
- flat-named-contract
- flat-rec-contract
- guilty-party
- integer-in
- list/c
- listof
- make-none/c
- make-proj-contract
- natural-number/c
- none/c
- not/c
- one-of/c
- or/c
- parameter/c
- printable/c
- promise/c
- provide/contract
- raise-contract-error
- real-in
- recursive-contract
- string/len
- symbols
- syntax/c
- vector-immutable/c
- vector-immutableof]
-
-It also provides the old version of the following contracts:
-
-@defform[(define/contract id contract-expr init-value-expr)]{
-
-Attaches the contract @racket[contract-expr] to
-@racket[init-value-expr] and binds that to @racket[id].
-
-The @racket[define/contract] form treats individual definitions as
-units of blame. The definition itself is responsible for positive
-(co-variant) positions of the contract and each reference to
-@racket[id] (including those in the initial value expression) must
-meet the negative positions of the contract.
-
-Error messages with @racket[define/contract] are not as clear as those
-provided by @racket[provide/contract], because
-@racket[define/contract] cannot detect the name of the definition
-where the reference to the defined variable occurs. Instead, it uses
-the source location of the reference to the variable as the name of
-that definition.}
-
-@defproc[(box/c [c flat-contract?]) flat-contract?]{
-
-Returns a flat contract that recognizes boxes. The content of the box
-must match @racket[c].}
-
-@defproc[(vectorof [c flat-contract?]) flat-contract?]{
-
-Accepts a flat contract and returns a flat contract
-that checks for vectors whose elements match the original contract.}
-
-@defproc[(vector/c [c flat-contract?] ...) flat-contract?]{
-
-Accepts any number of flat contracts and returns a
-flat contract that recognizes vectors. The number of elements in the
-vector must match the number of arguments supplied to
-@racket[vector/c], and each element of the vector must match the
-corresponding flat contract.}
-
-@defform[(struct/c struct-id flat-contract-expr ...)]{
-
-Produces a flat contract that recognizes instances of the structure
-type named by @racket[struct-id], and whose field values match the
-flat contracts produced by the @racket[flat-contract-expr]s.}
-
-@defproc[(build-flat-contract [name symbol?] [predicate (-> any/c any)]) flat-contract?]{
-  Builds a flat contract out of @racket[predicate], giving it the name
-  @racket[name]. Nowadays, just using @racket[predicate] directly is preferred.
-}
-
-@defform*[((-> contract-dom-expr ... any)
-           (-> contract-dom-expr ... contract-rng-expr))]{
-This is a restricted form of @racketmodname[racket/contract]'s
-                             @r:-> contract that does not
-                             handle keyword arguments or multiple
-                             value results.
-
-}
-
-@defform*/subs[((->* (contract-dom-expr ...) ->*rng)
-                (->* (contract-dom-expr ...) contract-rest-expr ->*rng)) 
-               ([->*rng (contract-rng-expr ...)
-                        any])]{
-  The @racket[->*] form matches up to
-  @racketmodname[racket/contract]'s @r:-> and @r:->*, according
-  to the following rules; each equation on the
-  left refers to a @racketmodname[mzlib/contract] combinator;
-  on the right are the @racketmodname[racket/contract] equivalents.
-  @racketblock[(->* (contract-dom-expr ...) any) =
-               (#,r:-> contract-dom-expr ... any)]
-  @racketblock[(->* (contract-dom-expr ...) (contract-rng-expr ...)) =
-               (#,r:-> contract-dom-expr ... (values contract-rng-expr))]
-  @racketblock[(->* (contract-expr ...) contract-rest-expr any) =
-               (#,r:->* (contract-expr ...) #:rest contract-rest-expr any)]
-  @racketblock[(->* (contract-expr ...) contract-rest-expr (contract-rng-expr ...)) =
-               (#,r:->* (contract-expr ...)
-                        #:rest contract-rest-expr 
-                        (values contract-rng-expr ...))]
-
-}
-
-@defform*[((opt-> (contract-req-expr ...) (contact-opt-expr ...) any)
-           (opt-> (contract-req-expr ...) (contact-opt-expr ...) contract-rng-expr))]{
-
-  The @racket[opt->] form is a simplified verison of @racketmodname[racket/contract]'s
-      @|r:->*| and appearances of @racket[opt->] can be simply replaced with @|r:->*|.
-
-}
-
-@defform*[((opt->* (contract-req-expr ...) (contact-opt-expr ...) any)
-           (opt->* (contract-req-expr ...) (contact-opt-expr ...) (contract-rng-expr ...)))]{
-
-  The @racket[opt->*] form   matches up to
-      @racketmodname[racket/contract]'s @r:->*, according
-  to the following rules; each equation on the
-  left refers to a @racketmodname[mzlib/contract] combinator;
-  on the right are the @racketmodname[racket/contract] equivalents.
-
-  @racketblock[(opt->* (contract-req-expr ...) (contract-opt-expr ...) any) =
-               (#,r:->* (contract-req-expr ...) (contract-opt-expr ...) any)]
-
-  @racketblock[(opt->* (contract-req-expr ...)
-                       (contract-opt-expr ...)
-                       (contract-rng-expr ...)) =
-               (#,r:->* (contract-req-expr ...)
-                        (contract-opt-expr ...)
-                        (values contract-rng-expr ...))]
-}
-
-@defform[(->d contract-dom-expr ... contract-rng-fun-expr)]{
-  The @racket[->d] contract constructor is just like @racket[->],
-  except that the range position is expected to be a function
-  that accepts the actual arguments passed to the function,
-  and returns a contract for the range. For example, this
-  is one contract for @racket[sqrt]:
-  @racketblock[(->d real?
-                    (λ (in)
-                      (and/c real?
-                             (λ (out)
-                               (< (abs (- (sqr out) in))
-                                  0.01)))))]
-  It says that the input must be a real number, and so must the
-  result, and that the square of the result is within
-  @racket[0.01] of input.
-
-}
-
-@defform*[((->d* (contract-dom-expr ...) contract-rng-fun-expr)
-           (->d* (contract-dom-expr ...) contract-rest-expr contract-rng-fun-expr))]{
-  The @racket[->d*] contract constructor is a generalization of 
-      @racket[->d] to support multiple values and rest arguments.
-      
-      In the two sub-expression case, the first sequence of contracts
-      are contracts on the domain of the function and the second
-      subexpression is expected to evaluate to a function that accepts
-      as many arguments as there are expressions in the first position.
-      It should return multiple values: one contract for each result
-      of the function.
-      
-      In the three sub-expression case, the first and last subexpressions
-      are just like the sub-expressions in the two sub-expression case;
-      the middle sub-expression si expected to evaluate to a contract on
-      the rest argument.
-      
-}
-
-@defform*/subs[((->r ([dom-x contract-dom-expr] ...) rng)
-                (->r ([dom-x contract-dom-expr] ...) rest-x contract-rest-expr rng))
-               ((rng any
-                     (values contract-expr ...)
-                     contract-expr))]{
-
-  The @racket[->r] form is a simplified version of @racketmodname[racket/contract]'s @|r:->i|, where
-  each @racket[contract-dom-expr] is parameterized over all of the @racket[dom-x] variables
-  (and does lax checking; see @r:->d for details).
-
-}
-
-@defform*[((->pp ([dom-x contract-dom-expr] ...) pre-cond-expr any)
-           (->pp ([dom-x contract-dom-expr] ...)
-                 pre-cond-expr
-                 (values [rng-x contract-rng-expr] ...)
-                 post-cond-expr)
-           (->pp ([dom-x contract-dom-expr] ...)
-                 pre-cond-expr
-                 contract-rng-expr
-                 rng-x
-                 post-cond-expr))]{
-
-  The @racket[->pp] form, like @racket[->r] is a simplified version of @racketmodname[racket/contract]'s @|r:->i|, where
-  each @racket[contract-dom-expr] is parameterized over all of the @racket[dom-x] variables
-  (and does lax checking; see @racketmodname[racket/contract]'s @r:->d for details). Unlike @racket[->r], it also has pre- and post-condition
-  expressions; these expressions are also implicitly parameterized over all of the @racket[dom-x]
-  variables and the post-condition is also paramterized over @racket[rng-x], which is bound to the result
-  of the function.
-
-}
-
-@defform*[((->pp-rest ([dom-x contract-dom-expr] ...) rest-x rest-contract-expr pre-cond-expr any)
-           (->pp-rest ([dom-x contract-dom-expr] ...)
-                      rest-x rest-contract-expr
-                      pre-cond-expr
-                      (values [rng-x contract-rng-expr] ...)
-                      post-cond-expr)
-           (->pp-rest ([dom-x contract-dom-expr] ...)
-                      rest-x rest-contract-expr
-                      pre-cond-expr
-                      contract-rng-expr
-                      rng-x
-                      post-cond-expr))]{
-  Like @racket[->pp], but with an additional contract for the rest arguments of the function.
-}
-
-@defform[(case-> mzlib/contract-arrow-contract-expr ...)]{
-   Builds a contract analogous to @racket[case-lambda],
-   where each case comes from one of the contract expression arguments
-   (tried in order).
-}
-
-@defform[(object-contract [id mzlib/contract-arrow-contract-expr] ...)]{
-   Builds a contract for objects where each @racket[id] is expected to be 
-   a method on the object living up to the corresponding contract
-}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/etc.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/etc.scrbl
deleted file mode 100644
index 704eb7f82c..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/etc.scrbl
+++ /dev/null
@@ -1,274 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          scribble/eval
-          (for-label mzlib/etc
-                     scheme/bool
-                     scheme/local
-                     setup/dirs
-                     racket/block
-                     (only-in scheme build-list build-string build-vector
-                              symbol=?)))
-
-@(define etc-eval (make-base-eval))
-@interaction-eval[#:eval etc-eval (require mzlib/etc)]
-
-@(begin
-   (define-syntax-rule (bind id else-id)
-     (begin
-       (require (for-label scheme/base))
-       (define id (racket lambda))
-       (define else-id (racket else))))
-   (bind base-lambda base-else))
-
-@mzlib[#:mode title etc]
-
-The @racketmodname[mzlib/etc] library re-exports the following from
-@racketmodname[scheme/base] and other libraries:
-
-@racketblock[
-  boolean=?
-  true
-  false
-  build-list
-  build-string
-  build-vector
-  compose
-  local
-  symbol=?
-  nand 
-  nor
-]
-
-@defform[(begin-lifted expr ...+)]
-
-Lifts the @racket[expr]s so that they are evaluated once at the ``top
-level'' of the current context, and the result of the last
-@racket[expr] is used for every evaluation of the
-@racket[begin-lifted] form.
-
-When this form is used as a run-time expression within a module, the
-``top level'' corresponds to the module's top level, so that each
-@racket[expr] is evaluated once for each invocation of the
-module. When it is used as a run-time expression outside of a module,
-the ``top level'' corresponds to the true top level. When this form is
-used in a @racket[define-syntax], @racket[letrec-syntax],
-etc. binding, the ``top level'' corresponds to the beginning of the
-binding's right-hand side. Other forms may redefine ``top level''
-(using @racket[local-expand/capture-lifts]) for the expressions that
-they enclose.
-
-@defform[(begin-with-definitions defn-or-expr ...)]{
-
-The same as @racket[(block defn-or-expr ...)].}
-
-@defform[(define-syntax-set (id ...) defn ...)]{
-
-Similar to @racket[define-syntaxes], but instead of a single body
-expression, a sequence of definitions follows the sequence of defined
-identifiers. For each @racket[identifier], the @racket[defn]s should
-include a definition for @racket[id]@racketidfont{/proc}.  The value
-for @racket[id]@racketidfont{/proc} is used as the (expansion-time)
-value for @racket[id].
-
-The @racket[define-syntax-set] form is useful for defining a set of
-syntax transformers that share helper functions, though
-@racket[begin-for-syntax] now serves essentially the same purposes.
-
-@as-examples[
-@racketblock[
-(define-syntax-set (let-current-continuation 
-                    let-current-escape-continuation)
-  (define (mk call-id)
-    (lambda (stx)
-      (syntax-case stx ()
-        [(_ id body1 body ...) 
-         (with-syntax ([call call-id])
-           (syntax (call (lambda (id) body1 body ...))))])))
-  (define let-current-continuation/proc
-    (mk (quote-syntax call/cc)))
-  (define let-current-escape-continuation/proc
-    (mk (quote-syntax call/ec))))
-]]}
-
-
-@defform*[#:literals (else)
-          [(evcase key-expr (value-expr body-expr ...) ...+)
-           (evcase key-expr (value-expr body-expr ...) ... [else body-expr ...])]]{
-
-The @racket[evcase] form is similar to @racket[case], except that
-expressions are provided in each clause instead of a sequence of
-data. After @racket[key-expr] is evaluated, each @racket[value-expr]
-is evaluated until a value is found that is @racket[eqv?] to the key
-value; when a matching value is found, the corresponding
-@racket[body-expr]s are evaluated and the value(s) for the last is the
-result of the entire @racket[evcase] expression.
-
-The @racket[else] literal is recognized either as unbound (like in the
-@racketmodname[mzscheme] language) or bound as @|base-else| from
-@racketmodname[scheme/base].}
-
-
-@defproc[(identity [v any/c]) any/c]{
-
-Returns @racket[v].}
-
-
-@defform/subs[#:literals (val rec vals recs _ values)
-              (let+ clause body-expr ...+)
-              ([clause (val target expr)
-                       (rec target expr)
-                       (vals (target ...) expr)
-                       (recs (target expr) ...)
-                       (_ expr ...)]
-               [target id
-                       (values id ...)])]{
-
-A binding construct that specifies scoping on a per-binding basis
-instead of a per-expression basis.  It helps eliminate rightward-drift
-in programs.  It looks similar to @racket[let], except each clause has
-an additional keyword tag before the binding variables.
-
-Each @racket[clause] has one of the following forms:
-
-@itemize[
-
- @item{@racket[(val target expr)] : Binds @racket[target]
- non-recursively to @racket[expr].}
-
- @item{@racket[(rec target expr)] : Binds @racket[target] recursively to
- @racket[expr].}
-
- @item{@racket[(vals (target expr) ...)] : The @racket[target]s are
- bound to the @racket[expr]s. The environment of the @racket[expr]s is
- the environment active before this clause.}
-
- @item{@racket[(recs (target expr) ...)] : The @racket[targets]s are
- bound to the @racket[expr]s. The environment of the @racket[expr]s
- includes all of the @racket[targets]s.}
-
- @item{@racket[(_ expr ...)] : Evaluates the @racket[expr]s without
- binding any variables.}
-
-]
-
-The clauses bind left-to-right. When a @racket[target] is
-@racket[(values id ...)], multiple values returned by the
-corresponding expression are bound to the multiple variables.
-
-@examples[
-#:eval etc-eval
-(let+ ([val (values x y) (values 1 2)])
-  (list x y))
-
-(let ([x 1])
-  (let+ ([val x 3]
-         [val y x])
-     y))
-]}
-
-
-@defproc[(loop-until [start any/c] [done? (any/c . -> . any)]
-                     [next (any/c . -> . any/c)]
-                     [f (any/c . -> . any)])
-         void?]{
-
-Repeatedly invokes the @racket[f] procedure until the @racket[done?]
-procedure returns @racket[#t]:
-
-@racketblock[
-  (define (loop-until start done? next f)
-    (let loop ([i start])
-      (unless (done? i)
-        (f i)
-        (loop (next i)))))
-]}
-
-
-@defproc[(namespace-defined? [sym symbol?]) boolean?]{
-
-Returns @racket[#t] if @racket[namespace-variable-value] would return
-a value for @racket[sym], @racket[#f] otherwise.}
-
-
-@defform[(nand expr ...)]{
-
-Same as @racket[(not (and expr ...))].}
-
-
-@defform[(nor expr ...)]{
-
-Same as @racket[(not (or expr ...))].}
-
-
-@defform[(opt-lambda formals body ...+)]{
-
-Supports optional (but not keyword) arguments like @base-lambda from
-@racket[scheme/base].}
-
-
-@defform[(recur id bindings body ...+)]{
-
-Equivalent to @racket[(let id bindings body ...+)].}
-
-
-@defform*[[(rec id value-expr)
-           (rec (id arg-id ...) expr)
-           (rec (id arg-id ... . rest-id) expr)]]{
-
-Equivalent, respectively, to
-
-@racketblock[
-  (letrec ([id value-expr]) id)
-  (letrec ([id (lambda (arg-id ...) value-expr)]) id)
-  (letrec ([id (lambda (arg-id ... . rest-id) value-expr)]) id)
-]}
-
-
-@defform*[[(this-expression-source-directory)
-           (this-expression-source-directory datum)]]{
-
-@margin-note{See @racketmodname[scheme/runtime-path] for a definition form
-that works better when creating executables.}
-
-Expands to an expression that evaluates to the directory of the file
-containing the source @racket[datum]. If @racket[datum] is not
-supplied, then the entire @racket[(this-expression-source-directory)]
-expression is used as @racket[datum].
-
-If @racket[datum] has a source module, then the expansion attempts to
-determine the module's run-time location. This location is determined
-by preserving the lexical context of @racket[datum] in a syntax
-object, extracting its source module path at run time, and then
-resolving the module path.
-
-Otherwise, @racket[datum]'s source file is determined through source
-location information associated with @racket[datum], if it is
-present. As a last resort, @racket[current-load-relative-directory] is
-used if it is not @racket[#f], and @racket[current-directory] is used
-if all else fails.
-
-A directory path derived from source location is always stored in
-bytes in the expanded code, unless the file is within the result of
-@racket[find-collects-dir], in which case the expansion records the
-path relative to @racket[(find-collects-dir)] and then reconstructs it
-using @racket[(find-collects-dir)] at run time.}
-
-
-@defform*[[(this-expression-file-name)
-           (this-expression-file-name datum)]]{
-
-Similar to @racket[this-expression-source-directory], except that only
-source information associated with @racket[datum] or
-@racket[(this-expression-file-name)] is used to extract a filename. If
-no filename is available, the result is @racket[#f].}
-
-
-@defform[#:literals (quote unsyntax scheme)
-         (hash-table (#,(racket quote) flag) ... (key-expr val-expr) ...)]{
-
-Creates a new hash-table providing the quoted flags (if any) to
-@racket[make-hash-table], and then mapping each key to the
-corresponding values.}
-
-
-@close-eval[etc-eval]
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/file.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/file.scrbl
deleted file mode 100644
index 847df9f36c..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/file.scrbl
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/file
-                     scheme/contract))
-
-
-@mzlib[#:mode title file]
-
-@deprecated[@racketmodname[racket/file]]{}
-
-The @racketmodname[mzlib/file] library mostly re-exports from
-@racketmodname[scheme/file]:
-
-@racketblock[
-find-relative-path
-explode-path
-normalize-path
-filename-extension
-file-name-from-path
-path-only
-delete-directory/files
-copy-directory/files
-make-directory*
-make-temporary-file
-get-preference
-put-preferences
-fold-files
-find-files
-pathlist-closure
-]
-
-@deftogether[(
-@defproc[(call-with-input-file* [file path-string?] 
-                                [proc (input-port? -> any)]
-                                [mode (one-of/c 'text 'binary) 'binary])
-         any]
-@defproc[(call-with-output-file* [file path-string?] 
-                                 [proc (output-port? -> any)]
-                                 [mode (one-of/c 'text 'binary) 'binary]
-                                 [exists (one-of/c 'error 'append 'update
-                                                   'replace 'truncate 'truncate/replace) 'error])
-         any]
-)]{
-
-Like @racket[call-with-input-file]and @racket[call-with-output-file],
-except that the opened port is closed if control escapes from the body
-of @racket[proc].}
-
-@deftogether[(
-@defproc[(build-relative-path [base (or/c path-string?
-                                          (one-of/c 'up 'same))]
-                              [sub (or/c (and/c path-string? 
-                                                relative-path?)
-                                         (one-of/c 'up 'same))] ...)
-         (and/c path? relative-path?)]
-@defproc[(build-absolute-path [base (or/c (and/c path-string?
-                                                 (not/c relative-path?))
-                                          (one-of/c 'up 'same))]
-                              [sub (or/c (and/c path-string? 
-                                                (not/c complete-path?))
-                                         (one-of/c 'up 'same))] ...)
-         (and/c path? absolute-path?)]
-)]{
-
-Like @racket[build-path], but with extra constraints to ensure a
-relative or absolute result.}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/for.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/for.scrbl
deleted file mode 100644
index 5f6500e1b7..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/for.scrbl
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/for))
-
-@mzlib[#:mode title for]
-
-@deprecated[@racketmodname[racket/base]]{}
-
-The @racketmodname[mzlib/for] library re-exports from
-@racketmodname[scheme/base]:
-
-@racketblock[
-for/fold for*/fold
-for for*
-for/list for*/list
-for/lists for*/lists
-for/and for*/and
-for/or for*/or
-for/first for*/first
-for/last for*/last
-
-for/fold/derived for*/fold/derived
-
-in-range
-in-naturals
-in-list
-in-vector
-in-string
-in-bytes
-in-input-port-bytes
-in-input-port-chars
-in-hash-table
-in-hash-table-keys
-in-hash-table-values
-in-hash-table-pairs
-
-in-parallel
-stop-before
-stop-after
-in-indexed
-
-sequence?
-sequence-generate
-
-define-sequence-syntax
-make-do-sequence
-:do-in]
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/include.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/include.scrbl
deleted file mode 100644
index 631d067d75..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/include.scrbl
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/include))
-
-@mzlib[#:mode title include]
-
-@deprecated[@racketmodname[racket/include]]{}
-
-Similar to @racketmodname[scheme/include], but with a different syntax
-for paths.
-
-@defform/subs[#:literals (build-path lib up same)
-              (include path-spec)
-              ([path-spec string
-                          (build-path elem ...+)
-                          (lib file-string collection-string ...)]
-               [elem string
-                     up
-                     same])]{
-
-Inlines the syntax in the designated file in place of the
-@racket[include] expression. The @racket[path-spec] can be any of the
-following:
-
-@itemize[
-
- @item{A literal string that specifies a path to include, parsed
-       according to the platform's conventions (which means that it is
-       not portable).}
-
- @item{A path construction of the form @racket[(build-path elem
-       ...+)], where @racket[build-path] is
-       @racket[module-identifier=?] either to the @racket[build-path]
-       export from @racket[mzscheme] or to the top-level
-       @racket[build-path], and where each @racket[elem] is a path
-       string, @racket[up] (unquoted), or @racket[same] (unquoted).
-       The @racket[elem]s are combined in the same way as for the
-       @racket[build-path] function to obtain the path to include.}
-
- @item{A path construction of the form @racket[(lib file-string
-       collection-string ...)], where @racket[lib] is free or refers
-       to a top-level @racket[lib] variable.  The
-       @racket[collection-string]s are passed to
-       @racket[collection-path] to obtain a directory; if no
-       @racket[collection-strings]s are supplied, @racket["mzlib"] is
-       used. The @racket[file-string] is then appended to the
-       directory using @racket[build-path] to obtain the path to
-       include.}
-
-]
-
-If @racket[path-spec] specifies a relative path to include, the path
-is resolved relative to the source for the @racket[include]
-expression, if that source is a complete path string. If the source is
-not a complete path string, then @racket[path-spec] is resolved
-relative to the current load relative directory if one is available,
-or to the current directory otherwise.
-
-The included syntax is given the lexical context of the
-@racket[include] expression.}
-
-@deftogether[(
-@defform[(include-at/relative-to context source path-spec)]
-@defform[(include-at/relative-to/reader context source path-spec reader-expr)]
-@defform[(include/reader path-spec reader-expr)]
-)]{
-
-Variants of @racket[include] analogous to the variants of
-@racketmodname[scheme/include].}
-
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/info.rkt b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/info.rkt
deleted file mode 100644
index da01189a71..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("mzlib.scrbl" (multi-page) (legacy))))
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/integer-set.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/integer-set.scrbl
deleted file mode 100644
index c569f3bf34..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/integer-set.scrbl
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label data/integer-set
-                     mzlib/integer-set))
-
-@mzlib[#:mode title integer-set]
-
-@deprecated[@racketmodname[data/integer-set]]{}
-
-The @racketmodname[mzlib/integer-set] library re-exports bindings
-from @racketmodname[data/integer-set] except that it renames
-@racket[symmetric-difference] to @racket[xor], @racket[subtract]
-to @racket[difference], and @racket[count] to @racket[card].
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/kw.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/kw.scrbl
deleted file mode 100644
index f72cf73805..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/kw.scrbl
+++ /dev/null
@@ -1,452 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          scribble/eval
-          (for-label mzlib/kw
-                     mzlib/etc))
-
-@(define kw-eval (make-base-eval))
-
-@interaction-eval[#:eval kw-eval (require mzscheme)]
-@interaction-eval[#:eval kw-eval (require mzlib/kw)]
-
-@(begin
-   (define-syntax-rule (bind id)
-     (begin
-       (require (for-label scheme/base))
-       (define id (racket lambda))))
-   (bind base-lambda))
-
-@mzlib[#:mode title kw]
-
-@deprecated[@racketmodname[racket/base]]{The Racket base language
-supports keyword arguments. Using the built-in keyword arguments
-in Racket is highly recommended.}
-
-@margin-note{The @base-lambda and procedure-application forms of
-             @racket[scheme/base] support keyword arguments, and it is
-             @emph{not} compatible with the @racket[mzlib/kw]
-             library.}
-
-@deftogether[(
-@defform[(lambda/kw kw-formals body ...+)]
-@defform/subs[
-(define/kw (head args) body ...+)
-([kw-formals id
-             (id ... [#:optional optional-spec ...]
-                     [#:key key-spec ...]
-                     [rest/mode-spec ...])
-             (id ... . id)]
- [optional-spec id
-                (id default-expr)]
- [key-spec id
-           (id default-expr)
-           (id keyword default-expr)]
- [rest/mode-spec (code:line #:rest id)
-                 (code:line #:other-keys id)
-                 (code:line #:other-keys+body id)
-                 (code:line #:all-keys id)
-                 (code:line #:body kw-formals)
-                 (code:line #:allow-other-keys)
-                 (code:line #:forbid-other-keys)
-                 (code:line #:allow-duplicate-keys)
-                 (code:line #:forbid-duplicate-keys)
-                 (code:line #:allow-body)
-                 (code:line #:forbid-body)
-                 (code:line #:allow-anything)
-                 (code:line #:forbid-anything)]
-  [head id
-        (head . kw-formals)])
-])]{
-
-Like @racket[lambda], but with optional and keyword-based argument
-processing.  This form is similar to an extended version of Common
-Lisp procedure arguments (but note the differences below).  When used
-with plain variable names, @racket[lambda/kw] expands to a plain
-@racket[lambda], so @racket[lambda/kw] is suitable for a language
-module that will use it to replace @racket[lambda].  Also, when used
-with only optionals, the resulting procedure is similar to
-@racket[opt-lambda] (but a bit faster).
-
-In addition to @racket[lambda/kw], @racket[define/kw] is similar to
-@racket[define], except that the @racket[formals] are as in
-@racket[lambda/kw].  Like @racket[define], this form can be used with
-nested parenthesis for curried functions (the MIT-style generalization
-of @racket[define]).
-
-The syntax of @racket[lambda/kw] is the same as @racket[lambda],
-except for the list of formal argument specifications.  These
-specifications can hold (zero or more) plain argument names, then an
-optionals (and defaults) section that begins after an
-@racket[#:optional] marker, then a keyword section that is marked by
-@racket[#:keyword], and finally a section holding rest and
-``rest''-like arguments which are described below, together with
-argument processing flag directives.  Each section is optional, but
-the order of the sections must be as listed. Of course, all binding
-@racket[id]s must be unique.
-
-The following sections describe each part of the @racket[kw-formals].}
-
-@; ----------------------------------------
-
-@section{Required Arguments}
-
-Required arguments correspond to @racket[id]s that appear before any
-keyword marker in the argument list. They determine the minimum arity
-of the resulting procedure.
-
-@; ----------------------------------------
-
-@section{Optional Arguments}
-
-The optional-arguments section follows an
-@as-index{@racket[#:optional]} marker in the @racket[_kw-formals].
-Each optional argument can take the form of a parenthesized variable
-and a default expression; the latter is used if a value is not given
-at the call site.  The default expression can be omitted (along with
-the parentheses), in which case @racket[#f] is the default.
-
-The default expression's environment includes all previous arguments,
-both required and optional names.  With @math{k} optionals after
-@math{n} required arguments, and with no keyword arguments or
-rest-like arguments, the resulting procedure accept between @math{n}
-and @math{n+k} arguments, inclusive.
-
-The treatment of optionals is efficient, with an important caveat:
-default expressions appear multiple times in the resulting
-@racket[case-lambda]. For example, the default expression for the last
-optional argument appears @math{k-1} times (but no expression is ever
-evaluated more than once in a procedure call). This expansion risks
-exponential blow-up is if @racket[lambda/kw] is used in a default
-expression of a @racket[lambda/kw], etc.  The bottom line, however, is
-that @racket[lambda/kw] is a sensible choice, due to its enhanced
-efficiency, even when you need only optional arguments.
-
-Using both optional and keyword arguments is possible, but note that
-the resulting behavior differs from traditional keyword facilities
-(including the one in Common Lisp).  See the following section for
-details.
-
-@; ----------------------------------------
-
-@section{Keyword Arguments}
-
-A keyword argument section is marked by a @as-index{@racket[#:key]}.
-If it is used with optional arguments, then the keyword specifications
-must follow the optional arguments (which mirrors the use in call
-sites; where optionals are given before keywords).
-
-When a procedure accepts both optional and keyword arguments, the
-argument-handling convention is slightly different than in traditional
-keyword-argument facilities: a keyword after required arguments marks
-the beginning of keyword arguments, no matter how many optional
-arguments have been provided before the keyword.  This convention
-restricts the procedure's non-keyword optional arguments to
-non-keyword values, but it also avoids confusion when mixing optional
-arguments and keywords.  For example, when a procedure that takes two
-optional arguments and a keyword argument @racket[#:x] is called with
-@racket[#:x 1], then the optional arguments get their default values
-and the keyword argument is bound to @racket[1]. (The traditional
-behavior would bind @racket[#:x] and @racket[1] to the two optional
-arguments.) When the same procedure is called with @racket[1 #:x 2],
-the first optional argument is bound to @racket[1], the second
-optional argument is bound to its default, and the keyword argument is
-bound to @racket[2]. (The traditional behavior would report an error,
-because @racket[2] is provided where @racket[#:x] is expected.)
-
-Like optional arguments, each keyword argument is specified as a
-parenthesized variable name and a default expression.  The default
-expression can be omitted (with the parentheses), in which case
-@racket[#f] is the default value. The keyword used at a call site for
-the corresponding variable has the same name as the variable; a third
-form of keyword arguments has three parts---a variable name, a
-keyword, and a default expression---to allow the name of the locally
-bound variable to differ from the keyword used at call sites.
-
-When calling a procedure with keyword arguments, the required argument
-(and all optional arguments, if specified) must be followed by an even
-number of arguments, where the first argument is a keyword that
-determines which variable should get the following value, etc.  If the
-same keyword appears multiple times (and if multiple instances of the
-keyword are allowed; see @secref["mode-keywords"]), the value after
-the first occurrence is used for the variable:
-
-@examples[
-#:eval kw-eval
-((lambda/kw (#:key x [y 2] [z #:zz 3] #:allow-duplicate-keys)
-   (list x y z))
- #:x 'x #:zz 'z #:x "foo")
-]
-
-Default expressions are evaluated only for keyword arguments that do
-not receive a value for a particular call. Like optional arguments,
-each default expression is evaluated in an environment that includes
-all previous bindings (required, optional, and keywords that were
-specified on its left).
-
-See @secref["mode-keywords"] for information on when duplicate or
-unknown keywords are allowed at a call site.
-
-@; ----------------------------------------
-
-@section{Rest and Rest-like Arguments}
-
-The last @racket[_kw-formals] section---after the required, optional,
-and keyword arguments---may contain specifications for rest-like
-arguments and/or mode keywords.  Up to five rest-like arguments can be
-declared, each with an @racket[_id] to bind:
-
-@itemize[
-
- @item{@as-index{@racket[#:rest]} --- The variable is bound to the
-  list of ``rest'' arguments, which is the list of all values after
-  the required and the optional values.  This list includes all
-  keyword-value pairs, exactly as they are specified at the call site.
-
-  Scheme's usual dot-notation is accepted in @racket[_kw-formals] only
-  if no other meta-keywords are specified, since it is not clear
-  whether it should specify the same binding as a @racket[#:rest] or
-  as a @racket[#:body].  The dot notation is allowed without
-  meta-keywords to make the @racket[lambda/kw] syntax compatible with
-  @racket[lambda].}
-
- @item{@as-index{@racket[#:body]} --- The variable is bound to all
-  arguments after keyword--value pairs.  (This is different from
-  Common Lisp's @racket[&body], which is a synonym for
-  @racket[&rest].)  More generally, a @racket[#:body] specification
-  can be followed by another @racket[_kw-formals], not just a single
-  @racket[_id]; see @secref["kw-body"] for more information.}
-
- @item{@as-index{@racket[#:all-keys]} --- the variable is bound to the
-  list of all keyword-values from the call site, which is always a
-  proper prefix of a @racket[#:rest] argument.  (If no @racket[#:body]
-  arguments are declared, then @racket[#:all-keys] binds the same as
-  @racket[#:rest].) See also @racket[keyword-get].}
-
- @item{@racket[#:other-keys] --- The variable is bound like an
-  @racket[#:all-keys] variable, except that all keywords specified in
-  the @racket[kw-formals] are removed from the list.  When a keyword
-  is used multiple times at a call cite (and this is allowed), only
-  the first instances is removed for the @racket[#:other-keys]
-  binding.}
-
- @item{@racket[#:other-keys+body] --- the variable is bound like a
-  @racket[#:rest] variable, except that all keywords specified in the
-  @racket[_kw-formals] are removed from the list.  When a keyword is
-  used multiple times at a call site (and this is allowed), only the
-  first instance us removed for the @racket[#:other-keys+body]
-  binding.  (When no @racket[#:body] variables are specified, then
-  @racket[#:other-keys+body] is the same as @racket[#:other-keys].)}
-
-]
-
-In the following example, all rest-like arguments are used and have different
-bindings:
-
-@examples[
-#:eval kw-eval
-((lambda/kw (#:key x y
-             #:rest r
-             #:other-keys+body rk
-             #:all-keys ak
-             #:other-keys ok
-             #:body b)
-   (list r rk b ak ok))
- #:z 1 #:x 2 2 3 4)
-]
-
-Note that the following invariants always hold:
-
-@itemize[
-@item{@racket[_rest] = @racket[(append _all-keys _body)]}
-@item{@racket[_other-keys+body] = @racket[(append _other-keys _body)]}
-]
-
-To write a procedure that uses a few keyword argument values, and that
-also calls another procedure with the same list of arguments
-(including all keywords), use @racket[#:other-keys] (or
-@racket[#:other-keys+body]).  The Common Lisp approach is to specify
-@racket[:allow-other-keys], so that the second procedure call will not
-cause an error due to unknown keywords, but the
-@racket[:allow-other-keys] approach risks confusing the two layers of
-keywords.
-
-@; ----------------------------------------
-
-@section[#:tag "kw-body"]{Body Argument}
-
-The most notable divergence from Common Lisp in @racket[lambda/kw] is
-the @racket[#:body] argument, and the fact that it is possible at a
-call site to pass plain values after the keyword-value pairs.  The
-@racket[#:body] binding is useful for procedure calls that use
-keyword-value pairs as sort of an attribute list before the actual
-arguments to the procedure.  For example, consider a procedure that
-accepts any number of numeric arguments and will apply a procedure to
-them, but the procedure can be specified as an optional keyword
-argument. It is easily implemented with a @racket[#:body] argument:
-
-@examples[
-#:eval kw-eval
-(define/kw (mathop #:key [op +] #:body b)
-  (apply op b))
-(mathop 1 2 3)
-(mathop #:op max 1 2 3)
-]
-
-(Note that the first body value cannot itself be a keyword.)
-
-A @racket[#:body] declaration works as an arbitrary
-@racket[kw-formals], not just a single variable like @racket[b] in the
-above example. For example, to make the above @racket[mathop] work
-only on three arguments that follow the keyword, use @racket[(x y z)]
-instead of @racket[b]:
-
-@examples[
-#:eval kw-eval
-(define/kw (mathop #:key [op +] #:body (x y z))
-  (op x y z))
-]
-
-In general, @racket[#:body] handling is compiled to a sub procedure
-using @racket[lambda/kw], so that a procedure can use more then one
-level of keyword arguments. For example:
-
-@examples[
-#:eval kw-eval
-(define/kw (mathop #:key [op +]
-                   #:body (x y z #:key [convert values]))
-  (op (convert x) (convert y) (convert z)))
-(mathop #:op * 2 4 6 #:convert exact->inexact)
-]
-
-Obviously, nested keyword arguments works only when non-keyword
-arguments separate the sets.
-
-Run-time errors during such calls report a mismatch for a procedure
-with a name that is based on the original name plus a @racketidfont{~body}
-suffix:
-
-@examples[
-#:eval kw-eval
-(mathop #:op * 2 4)
-]
-
-@; ----------------------------------------
-
-@section[#:tag "mode-keywords"]{Mode Keywords}
-
-Finally, the argument list of a @racket[lambda/kw] can contain
-keywords that serve as mode flags to control error reporting.
-
-@itemize[
-
- @item{@as-index{@racket[#:allow-other-keys]} --- The keyword-value
-  sequence at the call site @italic{can} include keywords that are not
-  listed in the keyword part of the @racket[lambda/kw] form.}
-
- @item{@as-index{@racket[#:forbid-other-keys]} --- The keyword-value
-  sequence at the call site @italic{cannot} include keywords that are
-  not listed in the keyword part of the @racket[lambda/kw] form,
-  otherwise the @racket[exn:fail:contract] exception is raised.}
-
- @item{@as-index{@racket[#:allow-duplicate-keys]} --- The
-  keyword-value list at the call site @emph{can} include duplicate
-  values associated with same keyword, the first one is used.}
-
- @item{@as-index{@racket[#:forbid-duplicate-keys]} --- The
-  keyword-value list at the call site @italic{cannot} include
-  duplicate values for keywords, otherwise the
-  @racket[exn:fail:contract] exception is raised. This restriction
-  applies only to keywords that are listed in the keyword part of the
-  @racket[lambda/kw] form --- if other keys are allowed, this
-  restriction does not apply to them.}
-
- @item{@as-index{@racket[#:allow-body]} --- Body arguments
-  @italic{can} be specified at the call site after all keyword-value
-  pairs.}
-
- @item{@as-index{@racket[#:forbid-body]} --- Body arguments
-  @italic{cannot} be specified at the call site after all
-  keyword-value pairs.}
-
- @item{@as-index{@racket[#:allow-anything]} --- Allows all of the
-  above, and treat a single keyword at the end of an argument list as
-  a @racket[#:body], a situation that is usually an error.  When this
-  is used and no rest-like arguments are used except @racket[#:rest],
-  an extra loop is saved and calling the procedures is faster (around
-  20%).}
-
- @item{@as-index{@racket[#:forbid-anything]} --- Forbids all of the
-  above, ensuring that calls are as restricted as possible.}
-
-]
-
-These above mode markers are rarely needed, because the default modes
-are determined by the declared rest-like arguments:
-
-@itemize[
-
- @item{The default is to allow other keys if a @racket[#:rest],
-  @racket[#:other-keys+body], @racket[#:all-keys], or
-  @racket[#:other-keys] variable is declared (and an
-  @racket[#:other-keys] declaration requires allowing other keys).}
-
- @item{The default is to allow duplicate keys if a @racket[#:rest] or
-  @racket[#:all-keys] variable is declared.}
-
- @item{The default is to allow body arguments if a @racket[#:rest],
-  @racket[#:body], or @racket[#:other-keys+body] variable is declared
-  (and a @racket[#:body] argument requires allowing them).}
-
-]
-
-Here's an alternate specification, which maps rest-like arguments to
-the behavior that they imply:
-
-@itemize[
-
- @item{@racket[#:rest]: Everything is allowed (a body, other keys,
-  and duplicate keys);}
-
- @item{@racket[#:other-keys+body]: Other keys and body are allowed,
-  but duplicates are not;}
-
- @item{@racket[#:all-keys]: Other keys and duplicate keys are allowed,
-  but a body is not;}
-
- @item{@racket[#:other-keys]: Other keys must be allowed (on by
-   default, cannot use with @racket[#:forbid-other-keys]), and
-   duplicate keys and body are not allowed;}
-
- @item{@racket[#:body]: Body must be allowed (on by default, cannot use
-   with @racket[#:forbid-body]) and other keys and duplicate keys and
-   body are not allowed;}
-
- @item{Except for the previous two ``must''s, defaults can be
-   overridden by an explicit @racket[#:allow-...] or a
-   @racket[#:forbid-...] mode.}
-
-]
-
-@; ----------------------------------------
-
-@section[#:tag "keyword-get"]{Property Lists}
-
-@defproc[(keyword-get [args (listof (cons/c keyword? any/c))] [kw keyword?]
-                      [not-found (-> any)])
-         any]{
-
-Searches a list of keyword arguments (a ``property list'' or ``plist''
-in Lisp jargon) for the given keyword, and returns the associated
-value.  It is the facility that is used by @racket[lambda/kw] to
-search for keyword values.
-
-The @racket[args] list is scanned from left to right, if the keyword
-is found, then the next value is returned.  If the @racket[kw] was not
-found, then the @racket[not-found] thunk is used to produce a value by
-applying it.  If the @racket[kw] was not found, and @racket[not-found]
-thunk is not given, @racket[#f] is returned.  (No exception is raised
-if the @racket[args] list is imbalanced, and the search stops at a
-non-keyword value.)}
-
-
-@close-eval[kw-eval]
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/list.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/list.scrbl
deleted file mode 100644
index fe306968bb..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/list.scrbl
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/list))
-
-@mzlib[#:mode title list]
-
-@deprecated[@racketmodname[racket/list]]{}
-
-The @racketmodname[mzlib/list] library re-exports several functions
-from @racketmodname[scheme/base] and @racketmodname[scheme/list]:
-
-@racketblock[
-cons?
-empty?
-empty
-foldl
-foldr
-remv
-remq
-remove
-remv*
-remq*
-remove*
-findf
-memf
-assf
-filter
-sort
-]
-
-@deftogether[(
-@defproc[(first [v pair?]) any/c]
-@defproc[(second [v (and/c pair? ....)]) any/c]
-@defproc[(third [v (and/c pair? ....)]) any/c]
-@defproc[(fourth [v (and/c pair? ....)]) any/c]
-@defproc[(fifth [v (and/c pair? ....)]) any/c]
-@defproc[(sixth [v (and/c pair? ....)]) any/c]
-@defproc[(seventh [v (and/c pair? ....)]) any/c]
-@defproc[(eighth [v (and/c pair? ....)]) any/c]
-)]{
-
-Accesses the first, second, @|etc| elment of ``list'' @racket[v]. The
-argument need not actually be a list; it is inspected only as far as
-necessary to obtain an element (unlike the same-named functions from
-@racketmodname[scheme/list], which do require the argument to be a
-list).}
-
-
-@defproc[(rest [v pair?]) any/c]{
-
-The same as @racket[cdr].}
-
-
-@defproc[(last-pair [v pair?]) pair?]{
-
-Returns the last pair in @racket[v], raising an error if @racket[v] is
-not a pair (but @racket[v] does not have to be a proper list).}
-
-
-
-@defproc[(merge-sorted-lists [lst1 list?][lst2 lst?]
-                             [less-than? (any/c any/c . -> . any/c)])
-         list?]{
-
-Merges the two sorted input lists, creating a new sorted list.  The
-merged result is stable: equal items in both lists stay in the same
-order, and these in @racket[lst1] precede @racket[lst2].}
-
-@defproc[(mergesort [lst list?] [less-than? (any/c any/c . -> . any/c)])
-         list?]{
-
-The same as @racket[sort].}
-
-@defproc[(quicksort [lst list?] [less-than? (any/c any/c . -> . any/c)])
-         list?]{
-
-The same as @racket[sort].}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/match-grammar.rkt b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/match-grammar.rkt
deleted file mode 100644
index 3d3993eee6..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/match-grammar.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang scheme/base
-(require scribblings/reference/match-parse)
-
-(provide match-grammar)
-
-(define grammar "
-pat     ::= id                         @match anything, bind identifier
-         |  _                          @match anything
-         |  literal                    @match literal
-         |  'datum                     @match equal% datum
-         |  (lvp ...)                  @match sequence of lvps
-         |  (lvp ... . pat)            @match lvps consed onto a pat
-         |  #(lvp ...)                 @match vector of pats
-         |  #&pat                      @match boxed pat
-         |  ($ struct-id pat ...)      @match struct-id instance
-         |  (AND pat ...)              @match when all pats match
-         |  (OR pat ...)               @match when any pat match
-         |  (NOT pat ...)              @match when no pat match
-         |  (= expr pat)               @match (expr value) to pat
-         |  (? pred-expr pat ...)      @match if (expr value) and pats
-         |  `qp                        @match quasipattern
-literal ::= #t                         @match true
-         |  #f                         @match false
-         |  string                     @match equal% string
-         |  number                     @match equal% number
-         |  character                  @match equal% character
-         |  bytes                      @match equal% byte string
-         |  keyword                    @match equal% keyword
-         |  regexp literal             @match equal% regexp literal
-         |  pregexp literal            @match equal% pregexp literal
-lvp     ::= pat ooo                    @greedily match pat instances
-         |  pat                        @match pat
-ooo     ::= ***                        @zero or more; *** is literal
-         |  ___                        @zero or more
-         |  ..K                        @K or more
-         |  __K                        @K or more
-qp      ::= literal                    @match literal
-         |  id                         @match equal% symbol
-         |  (qp ...)                   @match sequences of qps
-         |  (qp ... . qp)              @match sequence of qps consed onto a qp
-         |  (qp ... qp ooo)            @match qps consed onto a repeated qp
-         |  #(qp ...)                  @match vector of qps
-         |  #&qp                       @match boxed qp
-         |  ,pat                       @match pat
-         |  ,@pat                      @match pat, spliced
-")
-
-(define match-grammar
-  (parse-match-grammar grammar))
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/match.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/match.scrbl
deleted file mode 100644
index 3919fd668e..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/match.scrbl
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          "match-grammar.rkt"
-          (for-label mzlib/match))
-
-@(begin
-  (define-syntax-rule (bind id)
-    (begin
-      (require racket/match)
-      (define id (racket match))))
-  (bind racket-match))
-
-@mzlib[#:mode title match]
-
-@deprecated[@racketmodname[racket/match]]{}
-
-The @racketmodname[mzlib/match] library provides a @racket[match] form
-similar to that of @racketmodname[racket/match], but with an different
-(older and less extensible) syntax of patterns.
-
-@defform/subs[(match val-expr clause ...)
-              ([clause [pat expr ...+]
-                       [pat (=> id) expr ...+]])]{
-
-See @racket-match from @racketmodname[racket/match] for a description
-of matching. The grammar of @racket[pat] for this @racket[match] is as
-follows:
-
-@|match-grammar|}
-
-@; ------------------------------------------------------------
-
-@deftogether[(
-@defform[(define/match (head args) match*-clause ...)]
-@defform[(match-lambda clause ...)]
-@defform[(match-lambda* clause ...)]
-@defform[(match-let ([pat expr] ...) body ...+)]
-@defform[(match-let* ([pat expr] ...) body ...+)]
-@defform[(match-letrec ([pat expr] ...) body ...+)]
-@defform[(match-define pat expr)]
-)]{
-
-Analogous to the combined forms from @racket[racket/match].}
-
-@; ------------------------------------------------------------
-
-@deftogether[(
-@defform*[((define-match-expander id proc-expr)
-           (define-match-expander id proc-expr proc-expr)
-           (define-match-expander id proc-expr proc-expr proc-expr))]
-@defparam[match-equality-test comp-proc (any/c any/c . -> . any)]
-)]{
-
-Analogous to the form and parameter from @racket[racket/match]. The
-@racket[define-match-expander] form, however, supports an extra
-@racket[proc-expr] as the middle one: an expander for use with
-@racket[match] from @racketmodname[mzlib/match].}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/math.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/math.scrbl
deleted file mode 100644
index 17791b2128..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/math.scrbl
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/math))
-
-@mzlib[#:mode title math]
-
-@deprecated[@racketmodname[racket/math]]{}
-
-Re-exports @racketmodname[scheme/math], and also exports @racket[e].
-
-@defthing[e real?]{
-
-An approximation to Euler's constant: @number->string[(exp 1)].}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/mzlib.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/mzlib.scrbl
deleted file mode 100644
index 2dcc8708b3..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/mzlib.scrbl
+++ /dev/null
@@ -1,378 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{MzLib: Legacy Libraries}
-
-The @filepath{mzlib} collection contains wrappers and libraries for
-compatibility with older versions of Racket. In many ways, the
-libraries of the @filepath{mzlib} collection go with the
-@racketmodname[mzscheme] legacy language. Newer variants of many
-libraries reside in the @filepath{scheme} collection.
-
-@table-of-contents[]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[a-signature]
-
-@deprecated[@racketmodname[racket/signature]]{}
-
-Like @racketmodname[scheme/signature] in @hash-lang[] form for
-defining a single signature within a module, but based on
-@racketmodname[mzscheme] instead of @racketmodname[scheme/base].
-
-@; ----------------------------------------------------------------------
-
-@mzlib[a-unit]
-
-@deprecated[@racketmodname[racket/unit]]{}
-
-Like @racketmodname[scheme/unit] in @hash-lang[] form for defining a
-single unit within a module, but based on @racketmodname[mzscheme]
-instead of @racketmodname[scheme/base].
-
-@; ----------------------------------------------------------------------
-
-@mzlib[async-channel]
-
-@deprecated[@racketmodname[racket/async-channel]]{}
-
-Re-exports @racketmodname[scheme/async-channel].
-
-@; ----------------------------------------------------------------------
-
-@include-section["awk.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[class]
-
-@deprecated[@racketmodname[racket/class]]{}
-
-Re-exports @racketmodname[scheme/class], except for the contract
-constructors.
-
-@; ----------------------------------------------------------------------
-
-@mzlib[cm]
-
-@deprecated[@racketmodname[compiler/cm]]{}
-
-Re-exports @racketmodname[compiler/cm].
-
-@; ----------------------------------------------------------------------
-
-@mzlib[cm-accomplice]
-
-@deprecated[@racketmodname[compiler/cm-accomplice]]{}
-
-Re-exports @racketmodname[compiler/cm-accomplice].
-
-@; ----------------------------------------------------------------------
-
-@include-section["cmdline.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["cml.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["compat.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["compile.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["contract.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[control]
-
-@deprecated[@racketmodname[racket/control]]{}
-
-Re-exports @racketmodname[scheme/control].
-
-@; ----------------------------------------------------------------------
-
-@mzlib[date]
-
-@deprecated[@racketmodname[racket/date]]{}
-
-Re-exports @racketmodname[scheme/date].
-
-@; ----------------------------------------------------------------------
-
-@mzlib[deflate]
-
-@deprecated[@racketmodname[file/gzip]]{}
-
-Re-exports @racketmodname[file/gzip].
-
-@; ----------------------------------------------------------------------
-
-@mzlib[defmacro]
-
-@deprecated[@racketmodname[compatibility/defmacro]]{}
-
-Re-exports @racketmodname[compatibility/defmacro].
-
-@; ----------------------------------------------------------------------
-
-@include-section["etc.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["file.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["for.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[foreign]
-
-@deprecated[@racketmodname[ffi/unsafe]]{}
-
-Re-exports @racketmodname[scheme/foreign].
-
-@; ----------------------------------------------------------------------
-
-@include-section["include.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[inflate]
-
-@deprecated[@racketmodname[file/gunzip]]{}
-
-Re-exports @racketmodname[file/gunzip].
-
-@; ----------------------------------------------------------------------
-
-@include-section["integer-set.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["kw.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["list.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["match.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["math.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[md5]
-
-@deprecated[@racketmodname[file/md5]]{}
-
-Re-exports @racketmodname[file/md5].
-
-@; ----------------------------------------------------------------------
-
-@include-section["os.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["pconvert.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["pconvert-prop.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["plt-match.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["port.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["pregexp.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[pretty]
-
-@deprecated[@racketmodname[racket/pretty]]{}
-
-Re-exports @racketmodname[scheme/pretty].
-
-@; ----------------------------------------------------------------------
-
-@mzlib[process]
-
-@deprecated[@racketmodname[racket/system]]{}
-
-Re-exports @racketmodname[scheme/system].
-
-@; ----------------------------------------------------------------------
-
-@include-section["restart.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[runtime-path]
-
-@deprecated[@racketmodname[racket/runtime-path]]{}
-
-Re-exports @racketmodname[scheme/runtime-path].
-
-@; ----------------------------------------------------------------------
-
-@include-section["sandbox.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["sendevent.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["serialize.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[shared]
-
-@deprecated[@racketmodname[racket/shared]]{}
-
-Re-exports @racketmodname[scheme/shared].
-
-@; ----------------------------------------------------------------------
-
-@include-section["string.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["struct.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[stxparam]
-
-@deprecated[@racketmodname[racket/stxparam]]{
-Also see @racketmodname[racket/stxparam-exptime].
-}
-
-Re-exports @racketmodname[scheme/stxparam] and
-@racketmodname[scheme/stxparam-exptime] (both at phase level 0).
-
-@; ----------------------------------------------------------------------
-
-@mzlib[surrogate]
-
-@deprecated[@racketmodname[racket/surrogate]]{}
-
-Re-exports @racketmodname[scheme/surrogate].
-
-@; ----------------------------------------------------------------------
-
-@mzlib[tar]
-
-@deprecated[@racketmodname[file/tar]]{}
-
-Re-exports @racketmodname[file/tar].
-
-@; ----------------------------------------------------------------------
-
-@include-section["thread.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[trace]
-
-@deprecated[@racketmodname[racket/trace]]{}
-
-Re-exports @racketmodname[racket/trace].
-
-@; ----------------------------------------------------------------------
-
-@include-section["traceld.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[trait]
-
-@deprecated[@racketmodname[racket/trait]]{}
-
-Re-exports @racketmodname[scheme/trait].
-
-@; ----------------------------------------------------------------------
-
-@include-section["transcr.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@include-section["unit.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@mzlib[unit-exptime]
-
-@deprecated[@racketmodname[racket/unit-exptime]]{}
-
-Re-exports @racketmodname[scheme/unit-exptime].
-
-@; ----------------------------------------
-
-@mzlib[unit200]
-
-@deprecated[@racketmodname[racket/unit]]{}
-
-The @racketmodname[mzlib/unit200] library provides an old
-implementation of units. See archived version 360 documentation on the
-@filepath{unit.ss} library of the @filepath{mzlib} collection for
-information about this library.
-
-@; ----------------------------------------
-
-@mzlib[unitsig200]
-
-@deprecated[@racketmodname[racket/unit]]{}
-
-The @racketmodname[mzlib/unit200] library provides an old
-implementation of units. See archived version 360 documentation on the
-@filepath{unitsig.ss} library of the @filepath{mzlib} collection for
-information about this library.
-
-@; ----------------------------------------
-
-@mzlib[zip]
-
-@deprecated[@racketmodname[file/zip]]{}
-
-Re-exports @racketmodname[file/zip].
-
-@; ----------------------------------------------------------------------
-
-@(bibliography
- 
-  (bib-entry #:key "Shivers06"
-             #:title "Scsh Reference Manual"
-             #:author "Olin Shivers, Brian D. Carlstrom, Martin Gasbichler, and Mike Sperber"
-             #:date "2006")
-
-  (bib-entry #:key "Reppy99"
-             #:title @italic{Concurrent Programming in ML}
-             #:author "John H. Reppy"
-             #:date "1999")
-
- )
-
-@;------------------------------------------------------------------------
-
-@index-section[]
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/os.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/os.scrbl
deleted file mode 100644
index 896cd249a7..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/os.scrbl
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/os))
-
-@mzlib[#:mode title os]
-
-@defproc[(gethostname) string?]{
-
-Returns a string for the current machine's hostname (including its
-domain).}
-
-
-@defproc[(getpid) exact-integer?]{
-
-Returns an integer identifying the current process within the
-operating system.}
-
-
-@defproc[(truncate-file [file path-string?][n-bytes exact-nonnegative-integer? 0])
-         void?]{
-
-Truncates or extends the given @racket[file] so that it is
-@racket[n-bytes] long. If the file does not exist, or if the process
-does not have sufficient privilege to truncate the file, the
-@racket[exn:fail] exception is raised.
-
-The @racket[truncate-file] function is implemented in terms of
-@racketmodname[racket/base]'s @racket[file-truncate].}
-
-
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pconvert-prop.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pconvert-prop.scrbl
deleted file mode 100644
index ad875fc2e8..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pconvert-prop.scrbl
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/pconvert
-                     mzlib/pconvert-prop))
-
-@mzlib[#:mode title pconvert-prop]
-
-
-@deftogether[(
-@defthing[prop:print-converter property?]
-@defproc[(print-converter? [v any/c]) any]
-@defproc[(print-converter-proc [v print-converter?]) (any/c (any/c . -> . any/c) . -> . any/c)]
-)]{
-
-The @racket[prop:print-converter] property can be given a procedure
-value for a structure type. In that case, for constructor-style print
-conversion via @racket[print-convert], instances of the structure are
-converted by calling the procedure that is the property's value. The
-procedure is called with the value to convert and a procedure to
-recursively convert nested values. The result should be an
-S-expression for the converted value.
-
-The @racket[print-converter?] predicate recognizes instances of
-structure types that have the @racket[prop:print-converter] property,
-and @racket[print-converter-proc] extracts the property value.}
-
-
-@deftogether[(
-@defthing[prop:print-convert-constructor-name property?]
-@defproc[(print-convert-named-constructor? [v any/c]) any]
-@defproc[(print-convert-constructor-name [v print-convert-named-constructor?]) any]
-)]{
-
-The @racket[prop:print-convert-constructor-name] property can be given
-a symbol value for a structure type. In that case, for
-constructor-style print conversion via @racket[print-convert],
-instances of the structure are shown using the symbol as the
-constructor name. 
-
-The @racket[prop:print-converter] property takes precedence over
-@racket[prop:print-convert-constructor-name]. If neither is attached
-to a structure type, its instances are converted using a constructor
-name that is @racketidfont{make-} prefixed onto the result of
-@racket[object-name].
-
-The @racket[print-convert-named-constructor?] predicate recognizes
-instances of structure types that have the
-@racket[prop:print-convert-constructor-name] property, and
-@racket[print-convert-constructor-name] extracts the property value.}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pconvert.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pconvert.scrbl
deleted file mode 100644
index f46a35953d..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pconvert.scrbl
+++ /dev/null
@@ -1,263 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/pconvert
-                     mzlib/pconvert-prop
-                     racket/contract
-                     racket/pretty))
-
-@mzlib[#:mode title pconvert]
-
-The @racketmodname[mzlib/pconvert] library defines routines for
-printing Racket values as @racket[eval]uable S-expressions. Racket's
-default printing mode also prints values as expressions (in contrast
-to the Lisp and Racket tradition of printing @racket[read]able
-S-expressions), but @racketmodname[mzlib/pconvert] is more
-configurable and approximates expressions for a wider range of
-values. For example, procedures print using @racketresultfont{lambda}
-instead of @racketresultfont{#<procedure>}.
-
-The @racket[print-convert] procedure does not print values; rather, it
-converts a Racket value into another Racket value such that the new
-value @racket[pretty-write]s as a Racket expression that evaluates to
-the original value. For example, @racket[(pretty-write (print-convert
-`(9 ,(box 5) #(6 7))))] prints the literal expression
-@racketresult[(list 9 (box 5) (vector 6 7))] to the current output
-port.
-
-To install print converting into the read-eval-print loop, require
-@racketmodname[mzlib/pconvert] and call the procedure
-@racket[install-converting-printer].
-
-In addition to @racket[print-convert], this library provides
-@racket[print-convert], @racket[build-share], @racket[get-shared], 
-and @racket[print-convert-expr].  The last three are used to convert
-sub-expressions of a larger expression (potentially with shared
-structure).
-
-See also @racket[prop:print-convert-constructor-name].
-
-@defboolparam[abbreviate-cons-as-list abbreviate?]{
-
-A parameter that controls how lists are represented with
-constructor-style conversion. If the parameter's value is @racket[#t],
-lists are represented using @racket[list]. Otherwise, lists are
-represented using @racket[cons]. The initial value of the parameter is
-@racket[#t].}
-
-
-@defboolparam[booleans-as-true/false use-name?]{
-
-A parameter that controls how @racket[#t] and @racket[#f] are
-represented. If the parameter's value is @racket[#t], then @racket[#t]
-is represented as @racket[true] and @racket[#f] is represented as
-@racket[false].  The initial value of the parameter is @racket[#t].}
-
-
-@defparam[use-named/undefined-handler use-handler (any/c . -> . any/c)]{
-
-A parameter that controls how values that have inferred names are
-represented. The procedure is passed a value. If the procedure returns
-true, the procedure associated with @racket[named/undefined-handler]
-is invoked to render that value. Only values that have inferred names
-but are not defined at the top-level are used with this handler.
-
-The initial value of the parameter is @racket[(lambda (x) #f)].}
-
-
-@defparam[named/undefined-handler use-handler (any/c . -> . any/c)]{
-
-Parameter for a procedure that controls how values that have inferred
-names are represented. The procedure is called only if
-@racket[use-named/undefined-handler] returns true for some value. In
-that case, the procedure is passed that same value, and the result of
-the parameter is used as the representation for the value.
-
-The initial value of the parameter is @racket[(lambda (x) #f)].}
-
-
-@defboolparam[add-make-prefix-to-constructor add-prefix?]{
-
-A parameter that controls whether a @racketidfont{make-} prefix is
-added to a constructor name for a structure instance.  The initial
-value of the parameter is @racket[#f].}
-
-
-
-@defproc[(build-share [v any/c]) ....]{
-
-Takes a value and computes sharing information used for representing
-the value as an expression. The return value is an opaque structure
-that can be passed back into @racket[get-shared] or
-@racket[print-convert-expr].}
-
-
-@defboolparam[constructor-style-printing use-constructors?]{
-
-Parameter that controls how values are represented after conversion.
-If this parameter's value is @racket[#t], then constructors are used;
-e.g., pair containing @racket[1] and @racket[2] is represented as
-@racket[(cons 1 2)].  Otherwise, @racket[quasiquote]-style syntax is
-used; e.g., the pair containing @racket[1] and @racket[2] is
-represented as @racket[`(1 . 2)]. The initial value of the parameter
-is @racket[#f].
-
-The constructor used for mutable pairs is @racketidfont{mcons}, unless
-@racket[print-mpair-curly-braces] is set to @racket[#f], in which case
-@racketidfont{cons} and @racketidfont{list} are used. Similarly, when
-using @racket[quasiquote] style and @racket[print-mpair-curly-braces]
-is set to @racket[#f], mutable pair constructions are represented
-using @racketidfont{quote}, @racketidfont{quasiquote}, etc.
-
-See also @racket[quasi-read-style-printing] and
-@racket[prop:print-convert-constructor-name].}
-
-
-@defparam[current-build-share-hook 
-          hook
-          (any/c (any/c . -> . void?)
-                 (any/c . -> . void?) . -> . any)]{
-
-Parameter that sets a procedure used by @racket[print-convert] and
-@racket[build-share] to assemble sharing information. The procedure
-@racket[hook] takes three arguments: a value @racket[_v], a procedure
-@racket[_basic-share], and a procedure @racket[_sub-share]; the return
-value is ignored. The @racket[basic-share] procedure takes @racket[_v]
-and performs the built-in sharing analysis, while the
-@racket[_sub-share] procedure takes a component of @racket[_v] ands
-analyzes it. Sharing information is accumulated as values are passed
-to @racket[basic-share] and @racket[sub-share].
-
-A @racket[current-build-share-hook] procedure usually works together
-with a @racket[current-print-convert-hook] procedure.}
-
-
-@defparam[current-build-share-name-hook hook (any/c . -> . (or/c symbol? false/c))]{
-
-Parameter that sets a procedure used by @racket[print-convert] and
-@racket[build-share] to generate a new name for a shared value. The
-@racket[hook] procedure takes a single value and returns a symbol for
-the value's name. If @racket[hook] returns @racket[#f], a name is
-generated using the form
-``@racketidfont{-}@racket[_n]@racketidfont{-}, where @racket[n] is an
-integer.}
-
-
-@defparam[current-print-convert-hook
-          hook
-          (any/c (any/c . -> . any/c)
-                 (any/c . -> . any/c)
-                 . -> . any/c)]{
-
-Parameter that sets a procedure used by @racket[print-convert] and
-@racket[print-convert-expr] to convert values. The procedure
-@racket[hook] takes three arguments---a value @racket[_v], a procedure
-@racket[_basic-convert], and a procedure @racket[_sub-convert]---and
-returns the converted representation of @racket[_v]. The
-@racket[_basic-convert] procedure takes @racket[_v] and returns the
-default conversion, while the @racket[_sub-convert] procedure takes a
-component of @racket[_v] and returns its conversion.
-
-A @racket[current-print-convert-hook] procedure usually works together
-with a @racket[current-build-share-hook] procedure.}
-
-
-@defparam[current-read-eval-convert-print-prompt str string?]{
-
-Parameter that sets the prompt used by
-@racket[install-converting-printer].
-The initial value is @racket["|- "].}
-
-
-@defproc[(get-shared [share-info ....]
-                     [cycles-only? any/c #f])
-         (list-of (cons/c symbol? any/c))]{
-
-The @racket[shared-info] value must be a result from @racket[build-share].
-The procedure returns a list matching variables to shared values
-within the value passed to @racket[build-share].
-
-The default value for @racket[cycles-only?] is @racket[#f];
-if it is not @racket[#f], @racket[get-shared] returns only information
-about cycles.
-
-For example,
-
-@racketblock[
-(get-shared (build-share (shared ([a (cons 1 b)]
-                                  [b (cons 2 a)]) 
-                           a)))
-]
-
-might return the list 
-
-@racketblock[
-'((-1- (cons 1 -2-)) (-2- (cons 2 -1-)))
-]}
-
-
-@defproc[(install-converting-printer) void?]{
-
-Sets the current print handler to print values using
-@racket[print-convert] and sets @racket[print-as-expression] to
-@racket[#f] (since the conversion of a value is meant to be printed in
-@racket[read]able form rather than @racket[eval]uable form). The
-current read handler is also set to use the prompt returned by
-@racket[current-read-eval-convert-print-prompt].}
-
-
-@defproc[(print-convert [v any/c][cycles-only? any/c (show-sharing)]) any/c]{
-
-Converts the value @racket[v]. If @racket[cycles-only?] is not
-@racket[#f], then only circular objects are included in the
-output.}
-
-
-@defproc[(print-convert-expr [share-info ....]
-                             [v any/c]
-                             [unroll-once? any/c]) any/c]{
-
-Converts the value @racket[v] using sharing information
-@racket[share-info], which was previously returned by
-@racket[build-share] for a value containing @racket[v]. If the most
-recent call to @racket[get-shared] with @racket[share-info] requested
-information only for cycles, then @racket[print-convert-expr] will
-only display sharing among values for cycles, rather than showing all
-value sharing.
-
-The @racket[unroll-once?] argument is used if @racket[v] is a shared
-value in @racket[share-info]. In this case, if @racket[unroll-once?]
-is @racket[#f], then the return value will be a shared-value
-identifier; otherwise, the returned value shows the internal structure
-of @racket[v] (using shared value identifiers within @racket[v]'s
-immediate structure as appropriate).}
-
-
-@defboolparam[quasi-read-style-printing on?]{
-
-Parameter that controls how vectors and boxes are represented after
-conversion when the value of @racket[constructor-style-printing] is
-@racket[#f]. If @racket[quasi-read-style-printing] is set to
-@racket[#f], then boxes and vectors are unquoted and represented using
-constructors. For example, the list of a box containing the number 1
-and a vector containing the number 1 is represented as @racketresult[`(,(box
-1) ,(vector 1))]. If the parameter's value is @racket[#t], then
-@racket[#&....]  and @racket[#(....)] are used, e.g., @racket[`(#&1
-#(1))].  The initial value of the parameter is @racket[#t].}
-
-
-@defboolparam[show-sharing show?]{
-
-Parameter that determines whether sub-value sharing is conserved (and
-shown) in the converted output by default. The initial value of the
-parameter is @racket[#t].}
-
-
-@defboolparam[whole/fractional-exact-numbers whole-frac?]{
-
-Parameter that controls how exact, non-integer numbers are converted
-when the numerator is greater than the denominator. If the parameter's
-value is @racket[#t], the number is converted to the form @racket[(+
-_integer _fraction)] (i.e., a list containing @racket['+], an exact
-integer, and an exact rational less than @racket[1] and greater than
-@racket[-1]). The initial value of the parameter is @racket[#f].}
-
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/plt-match.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/plt-match.scrbl
deleted file mode 100644
index 4c85ed53bc..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/plt-match.scrbl
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/plt-match))
-
-@mzlib[#:mode title plt-match]
-
-@deprecated[@racketmodname[racket/match]]{}
-
-The @racketmodname[mzlib/plt-match] library mostly re-provides
-@racket[scheme/match].
-
-@deftogether[(
-@defform*[((define-match-expander id proc-expr)
-           (define-match-expander id proc-expr proc-expr)
-           (define-match-expander id proc-expr proc-expr proc-expr))]
-)]{
-
-The same as the form from @racketmodname[mzlib/match].}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/port.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/port.scrbl
deleted file mode 100644
index a172c071be..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/port.scrbl
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/port))
-
-@mzlib[#:mode title port]
-
-@deprecated[@racketmodname[racket/port]]{}
-
-The @racketmodname[mzlib/port] library mostly re-provides
-@racketmodname[racket/port].
-
-@defproc[(strip-shell-command-start [in input-port?]) void?]{
-
-Reads and discards a leading @litchar{#!} in @racket[in] (plus
-continuing lines if the line ends with a backslash). Since
-@litchar{#!}  followed by a forward slash or space is a comment, this
-procedure is not needed before reading Scheme expressions.}
-
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pregexp.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pregexp.scrbl
deleted file mode 100644
index b988a7c6e7..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pregexp.scrbl
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/pregexp
-                     (only-in scheme/base regexp-quote)))
-
-@mzlib[#:mode title pregexp]
-
-@deprecated[@racketmodname[racket/base]]{}
-
-The @racketmodname[mzlib/pregexp] library provides wrappers around
-@racket[regexp-match], @|etc| that coerce string and byte-string
-arguments to @racket[pregexp] matchers instead of @racket[regexp]
-matchers.
-
-The library also re-exports: @racket[pregexp], and it re-exports
-@racket[regexp-quote] as @racket[pregexp-quote].
-
-@deftogether[(
-@defproc[(pregexp-match [pattern (or/c string? bytes? regexp? byte-regexp?)]
-                       [input (or/c string? bytes? input-port?)]
-                       [start-pos exact-nonnegative-integer? 0]
-                       [end-pos (or/c exact-nonnegative-integer? false/c) #f]
-                       [output-port (or/c output-port? false/c) #f])
-         (or/c (listof (or/c (cons (or/c string? bytes?)
-                                   (or/c string? bytes?))
-                             false/c))
-               false/c)]
-@defproc[(pregexp-match-positions [pattern (or/c string? bytes? regexp? byte-regexp?)]
-                        [input (or/c string? bytes? input-port?)]
-                        [start-pos exact-nonnegative-integer? 0]
-                        [end-pos (or/c exact-nonnegative-integer? false/c) #f]
-                        [output-port (or/c output-port? false/c) #f])
-          (or/c (listof (or/c (cons exact-nonnegative-integer?
-                                    exact-nonnegative-integer?)
-                              false/c))
-                false/c)]
-@defproc[(pregexp-split [pattern (or/c string? bytes? regexp? byte-regexp?)]
-                       [input (or/c string? bytes? input-port?)]
-                       [start-pos exact-nonnegative-integer? 0]
-                       [end-pos (or/c exact-nonnegative-integer? false/c) #f])
-         (listof (or/c string? bytes?))]
-@defproc[(pregexp-replace [pattern (or/c string? bytes? regexp? byte-regexp?)]
-                         [input (or/c string? bytes?)]
-                         [insert (or/c string? bytes? 
-                                       (string? . -> . string?)
-                                       (bytes? . -> . bytes?))])
-         (or/c string? bytes?)]
-@defproc[(pregexp-replace* [pattern (or/c string? bytes? regexp? byte-regexp?)]
-                          [input (or/c string? bytes?)]
-                          [insert (or/c string? bytes? 
-                                        (string? . -> . string?)
-                                        (bytes? . -> . bytes?))])
-         (or/c string? bytes?)]
-)]{
-
-Like @racket[regexp-match], @|etc|, but a string @racket[pattern]
-argument is compiled via @racket[pregexp], and a byte string
-@racket[pattern] argument is compiled via @racket[byte-pregexp].}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/restart.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/restart.scrbl
deleted file mode 100644
index 610a50063d..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/restart.scrbl
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/restart
-                     mzlib/cmdline))
-
-@mzlib[#:mode title restart]
-
-@deprecated[@racketmodname[racket/sandbox]]{
-The @racket[racket/sandbox] library provides a more general way to
-simulate running a new Racket process.
-}
-
-@defproc[(restart-mzscheme [init-argv (vectorof string?)]
-                           [adjust-flag-table (any/c . -> . any/c)]
-                           [argv (vectorof string?)]
-                           [init-namespace (-> any)])
-         boolean?]{
-
-Simulates starting Racket with the vector of command-line strings
-@racket[argv]. The @racket[init-argv], @racket[adjust-flag-table], and
-@racket[init-namespace] arguments are used to modify the default
-settings for command-line flags, adjust the parsing of command-line
-flags, and customize the initial namespace, respectively.
-
-The vector of strings @racket[init-argv] is read first with the
-standard Racket command-line parsing. Flags that load files or
-evaluate expressions (e.g., @Flag{f} and @Flag{e}) are ignored, but
-flags that set Racket's modes (e.g., @Flag{c} or @Flag{j})
-effectively set the default mode before @racket[argv] is parsed.
-
-Before @racket[argv] is parsed, the procedure
-@racket[adjust-flag-table] is called with a command-line flag table as
-accepted by @racket[parse-command-line]. The return value must also be
-a table of command-line flags, and this table is used to parse
-@racket[argv]. The intent is to allow @racket[adjust-flag-table] to
-add or remove flags from the standard set.
-
-After @racket[argv] is parsed, a new thread and a namespace are
-created for the ``restarted'' Racket. (The new namespace is
-installed as the current namespace in the new thread.) In the new
-thread, restarting performs the following actions:
-
-@itemize[
-
- @item{The @racket[init-namespace] procedure is called with no
-       arguments.  The return value is ignored.}
-
- @item{Expressions and files specified by @racket[argv] are evaluated
-       and loaded.  If an error occurs, the remaining expressions and
-       files are ignored, and the return value for
-       @racket[restart-mzscheme] is set to @racket[#f].}
-
- @item{The @racket[read-eval-print-loop] procedure is called, unless a
-       flag in @racket[init-argv] or @racket[argv] disables it. When
-       @racket[read-eval-print-loop] returns, the return value for
-       @racket[restart-mzscheme] is set to @racket[#t].}
-
-]
-
-Before evaluating command-line arguments, an exit handler is installed
-that immediately returns from @racket[restart-mzscheme] with the value
-supplied to the handler. This exit handler remains in effect when
-@racket[read-eval-print-loop] is called (unless a command-line
-argument changes it). If @racket[restart-mzscheme] returns normally,
-the return value is determined as described above.
-
-Note that an error in a command-line expression followed by
-@racket[read-eval-print-loop] produces a @racket[#t] result. This is
-consistent with Racket's stand-alone behavior.}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/sandbox.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/sandbox.scrbl
deleted file mode 100644
index b71eda9a7e..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/sandbox.scrbl
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/sandbox
-                     (only-in racket/sandbox make-module-evaluator)))
-
-@(begin
-   (define-syntax-rule (bind id)
-     (begin
-       (require (for-label racket/sandbox))
-       (define id (racket make-evaluator))))
-   (bind racket-make-evaluator))
-
-@mzlib[#:mode title sandbox]
-
-@deprecated[@racketmodname[racket/sandbox]]{}
-
-The @racketmodname[mzlib/sandbox] library mostly re-exports
-@racketmodname[racket/sandbox], but it provides a slightly different
-@racket[make-evaluator] function.
-
-The library re-exports the following bindings:
-
-@racketblock[
-sandbox-init-hook
-sandbox-reader
-sandbox-input
-sandbox-output
-sandbox-error-output
-sandbox-propagate-breaks
-sandbox-coverage-enabled
-sandbox-namespace-specs
-sandbox-override-collection-paths
-sandbox-security-guard
-sandbox-path-permissions
-sandbox-network-guard
-sandbox-make-inspector
-sandbox-eval-limits
-kill-evaluator
-break-evaluator
-set-eval-limits
-put-input
-get-output
-get-error-output
-get-uncovered-expressions
-call-with-limits
-with-limits
-exn:fail:resource?
-exn:fail:resource-resource
-]
-
-@defproc*[([(make-evaluator [language (or/c module-path? 
-                                            (one-of/c 'r5rs 'beginner 'beginner-abbr 
-                                                      'intermediate 'intermediate-lambda 'advanced)
-                                            (list/c (one-of/c 'special) symbol?)
-                                            (list/c (one-of/c 'special) symbol?)
-                                            (cons/c (one-of/c 'begin) list?))]
-                            [requires (or/c (cons/c 'begin list?)
-                                            (listof (or/c module-path? path?)))]
-                            [input-program any/c] ...)
-            (any/c . -> . any)]
-           [(make-evaluator [module-decl (or/c syntax? pair?)])
-            (any/c . -> . any)])]{
-
-Like @racket-make-evaluator or @racket[make-module-evaluator], but
-with several differences:
-
-@itemize[
-
- @item{The @racket[language] argument can be one of a fixed set of
-       symbols: @racket['r5rs], etc. They are converted by adding a
-       @racket[(list 'special ....)] wrapper.}
-
- @item{If @racket[requires] starts with @racket['begin], then each
-       element in the remainder of the list is effectively evaluated
-       as a prefix to the program. Otherwise, it corresponds to the
-       @racket[#:requires] argument of @|racket-make-evaluator|.}
-
- @item{For each of @racket[language] and @racket[requires] that starts
-       with @racket['begin], the expressions are inspected to find
-       top-level @racket[require] forms (using symbolic equality to
-       detect @racket[require]), and the @racket[require]d modules are
-       added to the @racket[#:allow] list for @|racket-make-evaluator|.}
-
-]}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/sendevent.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/sendevent.scrbl
deleted file mode 100644
index 818453b4c2..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/sendevent.scrbl
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/sendevent))
-
-@(begin
-   (define-syntax-rule (bind id)
-     (begin
-       (require (for-label scheme/gui/base))
-       (define id (racket send-event))))
-   (bind mred-send-event))
-
-@mzlib[#:mode title sendevent]
-
-The @racketmodname[mzlib/sendevent] library provides a
-@racket[send-event] function that works only on Mac OS X, and only
-when running in GRacket (though the library can be loaded in Racket).
-
-@defproc[(send-event [receiver-bytes (lambda (s) (and (bytes? s)
-                                                      (= 4 (bytes-length s))))]
-                     [event-class-bytes (lambda (s) (and (bytes? s)
-                                                         (= 4 (bytes-length s))))]
-                     [event-id-bytes (lambda (s) (and (bytes? s)
-                                                      (= 4 (bytes-length s))))]
-                     [direct-arg-v any/c (void)]
-                     [argument-list list? null])
-         any/c]{
-
-Calls @|mred-send-event| @racketmodname[scheme/gui/base], if
-available, otherwise raises @racket[exn:fail:unsupported].}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/serialize.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/serialize.scrbl
deleted file mode 100644
index 126213b856..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/serialize.scrbl
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/serialize))
-
-@(begin
-   (define-syntax-rule (bind id id2)
-     (begin
-       (require (for-label racket/serialize))
-       (define id (racket define-serializable-struct))
-       (define id2 (racket define-serializable-struct/versions))))
-   (bind racket-define-serializable-struct
-         racket-define-serializable-struct/versions))
-
-@mzlib[#:mode title serialize]
-
-@deprecated[@racketmodname[racket/serialize]]{}
-
-The @racketmodname[mzlib/serialize] library provides the same bindings
-as @racketmodname[racket/serialize], except that
-@racket[define-serializable-struct] and
-@racket[define-serializable-struct/versions] are based on the syntax
-of @racket[define-struct] from @racketmodname[mzscheme].
-
-@deftogether[(
-@defform[(define-serializable-struct id-maybe-super (field-id ...) maybe-inspector-expr)]
-@defform/subs[(define-serializable-struct/versions id-maybe-super vers-num (field-id ...)
-                                                   (other-version-clause ...)
-                                                   maybe-inspector-expr)
-              ([id-maybe-super id
-                               (id super-id)]
-               [maybe-inspector-expr code:blank
-                                     inspector-expr]
-               [other-version-clause (other-vers make-proc-expr 
-                                                 cycle-make-proc-expr)])]
-)]{
-
-Like @racket-define-serializable-struct and
-@racket-define-serializable-struct/versions, but with the syntax of
-closer to @racket[define-struct] of @racketmodname[mzscheme].}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/string.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/string.scrbl
deleted file mode 100644
index 509bfc0f89..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/string.scrbl
+++ /dev/null
@@ -1,118 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/string
-                     scheme/contract
-                     (only-in scheme/base
-                              regexp-try-match)))
-
-@mzlib[#:mode title string]
-
-@deprecated[@racketmodname[racket/base]]{
-Also see @racketmodname[racket/string]
-}
-
-The @racketmodname[mzlib/string] library re-exports several functions
-from @racketmodname[scheme/base]:
-
-@racketblock[
-real->decimal-string
-regexp-quote
-regexp-replace-quote
-regexp-match*
-regexp-match-positions*
-regexp-match-peek-positions*
-regexp-split
-regexp-match-exact?
-]
-
-It also re-exports @racket[regexp-try-match] as
-@racket[regexp-match/fail-without-reading].
-
-
-@defproc[(glob->regexp [str (or/c string bytes?)?]
-                       [hide-dots? any/c #t]
-                       [case-sensitive? any/c (eq? (system-path-convention-type)'unix)]
-                       [simple? any/c #f])
-         (or/c regexp? byte-regexp?)]{
-
-Produces a regexp for a an input ``glob pattern'' @racket[str].  A
-glob pattern is one that matches @litchar{*} with any string,
-@litchar{?} with a single character, and character ranges are the same
-as in regexps (unless @racket[simple?] is true). In addition, the
-resulting regexp does not match strings that begin with @litchar{.},
-unless @racket[str] begins with @litchar{.} or @racket[hide-dots?] is
-@racket[#f].  The resulting regexp can be used with string file names
-to check the glob pattern.  If the glob pattern is provided as a byte
-string, the result is a byte regexp.
-
-The @racket[case-sensitive?] argument determines whether the resulting
-regexp is case-sensitive.
-
-If @racket[simple?] is true, then ranges with
-@litchar{[}...@litchar{]} in @racket[str] are treated as literal
-character sequences.}
-
-
-@defproc[(string-lowercase! [str (and/c string? (not/c immutable?))]) void?]{
-
-Destructively changes @racket[str] to contain only lowercase
-characters.}
-
-
-@defproc[(string-uppercase! [str (and/c string? (not/c immutable?))]) void?]{
-
-Destructively changes @racket[str] to contain only uppercase
-characters.}
-
-
-
-@defproc[(eval-string [str (or/c string? bytes?)]
-                      [err-handler (or/c false/c
-                                         (any/c . -> . any/c)
-                                         (-> any/c))
-                                   #f])
-         list?]{
-
-Reads and evaluates S-expressions from @racket[str], returning results
-for all of the expressions in the string. If any expression produces
-multiple results, the results are spliced into the resulting list.  If
-@racket[str] contains only whitespace and comments, an empty list is
-returned, and if @racket[str] contains multiple expressions, the
-result will be contain multiple values from all subexpressions.
-
-The @racket[err-handler] argument can be:
-@itemize[
-@item{@racket[#f] (the default) which means that errors are not
-      caught;}
-@item{a one-argument procedure, which will be used with an exception
-      (when an error occurs) and its result will be returned}
-@item{a thunk, which will be used to produce a result.}
-]}
-
-
-@defproc[(expr->string [expr any/c]) string?]{
-
-Prints @racket[expr] into a string and returns the string.}
-
-
-@defproc[(read-from-string [str (or/c string? bytes?)]
-                           [err-handler (or/c false/c
-                                              (any/c . -> . any/c)
-                                              (-> any/c))
-                                        #f])
-          any/c]{
-
-Reads the first S-expression from @racket[str] and returns it.  The
-@racket[err-handler] is as in @racket[eval-string].}
-
-
-@defproc[(read-from-string-all [str (or/c string? bytes?)]
-                               [err-handler (or/c false/c
-                                                  (any/c . -> . any/c)
-                                                  (-> any/c))
-                                            #f])
-          list?]{
-
-Reads all S-expressions from the string (or byte string) @racket[str]
-and returns them in a list.  The @racket[err-handler] is as in
-@racket[eval-string].}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/struct.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/struct.scrbl
deleted file mode 100644
index 98a96f7802..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/struct.scrbl
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          scribble/eval
-          (for-label mzlib/struct
-                     scheme/contract
-                     (only-in scheme/base
-                              regexp-try-match)))
-
-@(define struct-eval (make-base-eval))
-@interaction-eval[#:eval struct-eval (require mzscheme)]
-@interaction-eval[#:eval struct-eval (require mzlib/struct)]
-
-@mzlib[#:mode title struct]
-
-@defform[(copy-struct struct-id struct-expr 
-                      (accessor-id field-expr) ...)]{
-
-``Functional update'' for structure instances. The result of
-evaluating @racket[struct-expr] must be an instance of the structure
-type named by @racket[struct-id]. The result of the
-@racket[copy-struct] expression is a fresh instance of
-@racket[struct-id] with the same field values as the result of
-@racket[struct-expr], except that the value for the field accessed by
-each @racket[accessor-id] is replaced by the result of
-@racket[field-expr].
-
-The result of @racket[struct-expr] might be an instance of a sub-type
-of @racket[struct-id], but the result of the @racket[copy-struct]
-expression is an immediate instance of @racket[struct-id]. If
-@racket[struct-expr] does not produce an instance of
-@racket[struct-id], the @racket[exn:fail:contract] exception is
-raised.
-
-If any @racket[accessor-id] is not bound to an accessor of
-@racket[struct-id] (according to the expansion-time information
-associated with @racket[struct-id]), or if the same
-@racket[accessor-id] is used twice, then a syntax error is raised.}
-
-
-@defform/subs[(define-struct/properties id (field-id ...) 
-                                        ((prop-expr val-expr) ...) 
-                                        maybe-inspector-expr)
-              ([maybe-inspector-expr code:blank
-                                     expr])]{
-
-Like @racket[define-struct] from @racketmodname[mzscheme], but
-properties can be attached to the structure type. Each
-@racket[prop-expr] should produce a structure-type property value, and
-each @racket[val-expr] produces the corresponding value for the
-property.
-
-@examples[
-#:eval struct-eval
-(define-struct/properties point (x y)
-  ([prop:custom-write (lambda (p port write?)
-                       (fprintf port "(~a, ~a)"
-                                     (point-x p)
-                                     (point-y p)))]))
-(display (make-point 1 2))
-]}
-
-
-@defform[(make-->vector struct-id)]{
-
-Builds a function that accepts a structure type instance (matching
-@racket[struct-id]) and provides a vector of the fields of the
-structure type instance.}
-
-
-@close-eval[struct-eval]
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/thread.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/thread.scrbl
deleted file mode 100644
index 8ebd38bee2..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/thread.scrbl
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/thread
-                     racket/engine
-                     scheme/contract
-                     scheme/tcp))
-
-@mzlib[#:mode title thread]
-
-@deprecated[@racketmodname[racket/engine]]{}
-
-Re-exports the bindings from @racketmodname[racket/engine] under
-different names and also provides two extra bindings. The renamings
-are:
-
-@itemlist[
-  @item{@racket[engine] as @racket[coroutine]}
-  @item{@racket[engine?] as @racket[coroutine?]}
-  @item{@racket[engine-run] as @racket[coroutine-run]}
-  @item{@racket[engine-result] as @racket[coroutine-result]}
-  @item{@racket[engine-kill] as @racket[coroutine-kill]}
-]
-
-@defproc[(consumer-thread [f procedure?][init (-> any) void])
-         (values thread? procedure?)]{
-
-Returns two values: a thread descriptor for a new thread, and a
-procedure with the same arity as @racket[f].
-
-When the returned procedure is applied, its arguments are queued to be
-passed on to @racket[f], and @|void-const| is immediately returned.
-The thread created by @racket[consumer-thread] dequeues arguments and
-applies @racket[f] to them, removing a new set of arguments from the
-queue only when the previous application of @racket[f] has completed;
-if @racket[f] escapes from a normal return (via an exception or a
-continuation), the @racket[f]-applying thread terminates.
-
-The @racket[init] argument is a procedure of no arguments; if it is
-provided, @racket[init] is called in the new thread immediately after the
-thread is created.}
-
-
-@defproc[(run-server [port-no (integer-in 1 65535)]
-                     [conn-proc (input-port? output-port? . -> . any)]
-                     [conn-timeout (and/c real? (not/c negative?))]
-                     [handler (exn? . -> . any/c) void]
-                     [listen ((integer-in 1 65535) (one-of/c 5) (one-of/c #t) 
-                              . -> . listener?) 
-                                  tcp-listen]
-                     [close (listener? . -> . any) tcp-close]
-                     [accept (listener? . ->* . (input-port? output-port?)) tcp-accept]
-                     [accept/break (listener? . ->* . (input-port? output-port?)) tcp-accept/enable-break])
-         void?]{
-
-Executes a TCP server on the port indicated by @racket[port-no]. When
-a connection is made by a client, @racket[conn] is called with two
-values: an input port to receive from the client, and an output port
-to send to the client.
-
-Each client connection is managed by a new custodian, and each call to
-@racket[conn] occurs in a new thread (managed by the connection's
-custodian). If the thread executing @racket[conn] terminates for any
-reason (e.g., @racket[conn] returns), the connection's custodian is
-shut down. Consequently, @racket[conn] need not close the ports
-provided to it. Breaks are enabled in the connection thread if breaks
-are enabled when @racket[run-server] is called.
-
-To facilitate capturing a continuation in one connection thread and
-invoking it in another, the parameterization of the
-@racket[run-server] call is used for every call to
-@racket[handler]. In this parameterization and for the connection's
-thread, the @racket[current-custodian] parameter is assigned to the
-connection's custodian.
-
-If @racket[conn-timeout] is not @racket[#f], then it must be a
-non-negative number specifying the time in seconds that a connection
-thread is allowed to run before it is sent a break signal. Then, if
-the thread runs longer than @racket[(* conn-timeout 2)] seconds, then
-the connection's custodian is shut down. If @racket[conn-timeout] is
-@racket[#f], a connection thread can run indefinitely.
-
-If @racket[handler] is provided, it is passed exceptions related
-to connections (i.e., exceptions not caught by @racket[conn-proc], or
-exceptions that occur when trying to accept a connection). The default
-handler ignores the exception and returns @|void-const|.
-
-The @racket[run-server] function uses @racket[listen], @racket[close],
-@racket[accept] and @racket[accept/break] in the same way as it might
-use @racket[tcp-listen], @racket[tcp-close], @racket[tcp-accept], and
-@racket[tcp-accept/enable-break] to accept connections. Provide
-alternate procedures to use an alternate communication protocol (such
-as SSL) or to supply optional arguments in the use of
-@racket[tcp-listen]. The @racket[listener?] part of the contract
-indicates that the procedures must all work on the same kind of
-listener value.
-
-The @racket[run-server] procedure loops to serve client connections,
-so it never returns. If a break occurs, the loop will cleanly shut
-down the server, but it will not terminate active connections.}
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/traceld.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/traceld.scrbl
deleted file mode 100644
index bda84bb9f7..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/traceld.scrbl
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@mzlib[#:mode title traceld]
-
-The @racketmodname[mzlib/traceld] library does not provide any
-bindings. Instead, @racketmodname[mzlib/traceld] is @racket[require]d
-for its side-effects. 
-
-The @racketmodname[mzlib/traceld] library installs a new load handler
-(see @racket[current-load]) and load-extension handler (see
-@racket[current-load-extension]) to print information about the files
-that are loaded. These handlers chain to the current handlers to
-perform the actual loads. Trace output is printed to the port that is
-the current error port (see @racket[current-error-port]) when the
-library is instantiated.
-
-Before a file is loaded, the tracer prints the file name and ``time''
-(as reported by the procedure @racket[current-process-milliseconds])
-when the load starts. Trace information for nested loads is printed
-with indentation. After the file is loaded, the file name is printed
-with the ``time'' that the load completed.
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/transcr.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/transcr.scrbl
deleted file mode 100644
index 1d8cd9ef02..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/transcr.scrbl
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@mzlib[#:mode title transcr]
-
-The @racket[transcript-on] and @racket[transcript-off] procedures of
-@racketmodname[mzscheme] always raise
-@racket[exn:fail:unsupported]. The @racketmodname[mzlib/transcr]
-library provides working versions of @racket[transcript-on] and
-@racket[transcript-off].
-
-@(define-syntax-rule (go)
-   (begin
-     (require (for-label mzlib/transcr))
-
-     @deftogether[(
-     @defproc[(transcript-on [filename any/c]) any]
-     @defproc[(transcript-off) any]
-     )]{
-
-   Starts/stops recording a transcript at @racket[filename].}))
-@(go)
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/unit.scrbl b/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/unit.scrbl
deleted file mode 100644
index ce5afd608b..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/unit.scrbl
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mzlib/unit))
-
-@(begin
-   (define-syntax-rule (bind id)
-     (begin
-       (require (for-label racket/base))
-       (define id (racket struct))))
-   (bind racket-struct)
-   (define-syntax-rule (bindc id)
-     (begin
-       (require (for-label racket/unit))
-       (define id (racket struct/ctc))))
-   (bindc racket-struct/ctc))
-
-@mzlib[#:mode title unit #:use-sources ((submod racket/unit compat))]
-
-@deprecated[@racketmodname[racket/unit]]{}
-
-The @racketmodname[mzlib/unit] library mostly re-provides
-@racketmodname[racket/unit], except for @racket-struct and
-@racket-struct/ctc from @racketmodname[racket/unit].
-
-@defform/subs[(struct id (field-id ...) omit-decl ...)
-              ([omit-decl -type
-                          -selectors
-                          -setters
-                          -constructor])]{
-
-A signature form like @racket-struct from @racketmodname[racket/base],
-but with a different syntax for options that limit exports.}
-
-@defform/subs[(struct/ctc id ([field-id contract-expr] ...) omit-decl ...)
-              ([omit-decl -type
-                          -selectors
-                          -setters
-                          -constructor])]{
-
-A signature form like @racket-struct/ctc from @racketmodname[racket/unit],
-but with a different syntax for the options that limit exports.}
-
-@deftogether[(
-@defidform[struct~r]
-@defidform[struct~r/ctc]
-)]{
-
-The same as @|racket-struct| from @racketmodname[racket/base] and @|racket-struct/ctc| from
-@racketmodname[racket/unit].}
-
-@deftogether[(
-@defidform[struct~s]
-@defidform[struct~s/ctc]
-)]{
-
-Like @racket[struct~r] and @racket[struct~r/ctc], but the constructor is
-named the same as the type, instead of with  @racketidfont{make-} prefix.}
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/LICENSE.txt b/pkgs/compatibility-pkgs/compatibility-lib/LICENSE.txt
deleted file mode 100644
index a56ff834c7..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-compatibility-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/compatibility/defmacro.rkt b/pkgs/compatibility-pkgs/compatibility-lib/compatibility/defmacro.rkt
deleted file mode 100644
index ca92215b62..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/compatibility/defmacro.rkt
+++ /dev/null
@@ -1,136 +0,0 @@
-#lang racket/base
-
-;; defmacro - for legacy macros only
-
-(require (for-syntax racket/base syntax/stx))
-
-(provide define-macro
-         defmacro)
-
-(define-syntax define-macro
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ (name . args) proc0 proc ...)
-       (begin
-         (unless (identifier? (syntax name))
-           (raise-syntax-error
-            #f
-            "expected an identifier for the macro name"
-            stx
-            (syntax name)))
-         (let loop ([args (syntax args)])
-           (cond
-            [(stx-null? args) 'ok]
-            [(identifier? args) 'ok]
-            [(stx-pair? args)
-             (unless (identifier? (stx-car args))
-               (raise-syntax-error
-                #f
-                "expected an identifier for a macro argument"
-                stx
-                (stx-car args)))
-             (loop (stx-cdr args))]
-            [else (raise-syntax-error
-                   #f
-                   "not a valid argument sequence after the macro name"
-                   stx)]))
-         (syntax
-          (define-macro name (lambda args proc0 proc ...))))]
-      [(_ name proc)
-       (begin
-         (unless (identifier? (syntax name))
-           (raise-syntax-error
-            #f
-            "expected an identifier for the macro name"
-            stx
-            (syntax name)))
-         (syntax
-          (define-syntax name
-            (let ([p proc])
-              (unless (procedure? p)
-                (raise-type-error
-                 'define-macro
-                 "procedure (arity 1)"
-                 p))
-              (lambda (stx)
-                (let ([l (syntax->list stx)])
-                  (unless (and l (procedure-arity-includes? p (sub1 (length l))))
-                    (raise-syntax-error
-                     #f
-                     "bad form"
-                     stx))
-                  (let ([ht (make-hash)])
-                    (datum->syntax
-                     stx
-                     (dm-subst
-                      ht
-                      (apply p (cdr (dm-syntax->datum stx ht))))
-                     stx))))))))])))
-
-(define-syntax defmacro
-  (syntax-rules ()
-      [(_ name formals body1 body ...)
-       (define-macro (name . formals) body1 body ...)]))
-
-;; helper submodule
-;;
-;; defined as a submodule because swindle requires it
-(module dmhelp racket/base
-  (require syntax/stx)
-
-  (provide dm-syntax->datum
-           dm-subst)
-
-  ;; `dm-syntax->datum' is like syntax-object->datum, but it also
-  ;; builds a hash table that maps generated data to original syntax
-  ;; objects. The hash table can then be used with `dm-subst' to
-  ;; replace each re-used, unmodified datum with the original syntax
-  ;; object.
-
-  (define (dm-syntax->datum stx ht)
-    ;; Easiest to handle cycles by letting `syntax-object->datum'
-    ;;  do all the work.
-    (let ([v (syntax->datum stx)])
-      (let loop ([stx stx][v v])
-        (let ([already (hash-ref ht v (lambda () #f))])
-          (if already
-              (hash-set! ht v #t) ;; not stx => don't subst later
-              (hash-set! ht v stx))
-          (cond
-           [(stx-pair? stx)
-            (loop (stx-car stx) (car v))
-            (loop (stx-cdr stx) (cdr v))]
-           [(stx-null? stx) null]
-           [(vector? (syntax-e stx))
-            (for-each
-             loop
-             (vector->list
-              (syntax-e stx))
-             (vector->list v))]
-           [(box? (syntax-e stx))
-            (loop (unbox (syntax-e stx))
-                  (unbox v))]
-           [else (void)])))
-      v))
-
-  (define (dm-subst ht v)
-    (define cycle-ht (make-hash))
-    (let loop ([v v])
-      (if (hash-ref cycle-ht v (lambda () #f))
-          v
-          (begin
-            (hash-set! cycle-ht v #t)
-            (let ([m (hash-ref ht v (lambda () #f))])
-              (cond
-               [(syntax? m) m] ;; subst back!
-               [(pair? v) (cons (loop (car v))
-                                (loop (cdr v)))]
-               [(vector? v) (list->vector
-                             (map
-                              loop
-                              (vector->list v)))]
-               [(box? v) (box (loop (unbox v)))]
-               [else v])))))))
-
-;; this require has to be here after the submodule
-(require (for-syntax 'dmhelp))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/compatibility/mlist.rkt b/pkgs/compatibility-pkgs/compatibility-lib/compatibility/mlist.rkt
deleted file mode 100644
index 9f5169bc9e..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/compatibility/mlist.rkt
+++ /dev/null
@@ -1,210 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         racket/performance-hint)
-
-(provide mmap
-         mfor-each
-         mlist
-         mlist?
-         mlength
-         mappend
-         mappend!
-         mreverse
-         mreverse!
-         mlist-tail
-         mlist-ref
-         mmemq
-         mmemv
-         mmember
-         massq
-         massv
-         massoc
-         mlist->list
-         list->mlist
-         mlistof)
-
-(begin-encourage-inline
- (define mmap
-   (case-lambda
-    [(f l) (let loop ([l l])
-             (cond
-              [(null? l) null]
-              [else (mcons (f (mcar l)) (loop (mcdr l)))]))]
-    [(f l1 l2) (let loop ([l1 l1][l2 l2])
-                 (cond
-                  [(null? l1) null]
-                  [else (mcons (f (mcar l1) (mcar l2))
-                               (loop (mcdr l1) (mcdr l2)))]))]
-    [(f l . ls) (let loop ([l l][ls ls])
-                  (cond
-                   [(null? l) null]
-                   [else (mcons (apply f (mcar l) (map mcar ls))
-                                (loop (mcdr l) (map mcdr ls)))]))]))
-
- (define mfor-each
-   (case-lambda
-    [(f l) (let loop ([l l])
-             (cond
-              [(null? l) (void)]
-              [else (f (mcar l))
-                    (loop (mcdr l))]))]
-    [(f l1 l2) (let loop ([l1 l1][l2 l2])
-                 (cond
-                  [(null? l1) (void)]
-                  [else (f (mcar l1) (mcar l2))
-                        (loop (mcdr l1) (mcdr l2))]))]
-    [(f l . ls) (let loop ([l l][ls ls])
-                  (cond
-                   [(null? l) (void)]
-                   [else (apply f (mcar l) (map mcar ls))
-                         (loop (mcdr l) (map mcdr ls))]))])))
-
-(define (list->mlist l)
-  (cond
-   [(null? l) null]
-   [else (mcons (car l) (list->mlist (cdr l)))]))
-
-(define (mlist->list l)
-  (cond
-   [(null? l) null]
-   [else (cons (mcar l) (mlist->list (mcdr l)))]))
-
-(define-syntax mlist
-  (make-set!-transformer
-   (lambda (stx)
-     (syntax-case stx (set!)
-       [(set! id . _) (raise-syntax-error #f
-                                          "cannot mutate imported variable"
-                                          stx
-                                          #'id)]
-       [(_ a) #'(mcons a null)]
-       [(_ a b) #'(mcons a (mcons b null))]
-       [(_ a b c) #'(mcons a (mcons b (mcons c null)))]
-       [(_ arg ...) #'(-mlist arg ...)]
-       [_ #'-mlist]))))
-
-(define -mlist
-  (let ([mlist
-         (case-lambda
-          [() null]
-          [(a) (mcons a null)]
-          [(a b) (mcons a (mcons b null))]
-          [(a b c) (mcons a (mcons b (mcons c null)))]
-          [(a b c d) (mcons a (mcons b (mcons c (mcons d null))))]
-          [l (list->mlist l)])])
-    mlist))
-
-(define (mlist? l)
-  (cond
-   [(null? l) #t]
-   [(mpair? l)
-    (let loop ([turtle l][hare (mcdr l)])
-      (cond
-       [(null? hare) #t]
-       [(eq? hare turtle) #f]
-       [(mpair? hare)
-        (let ([hare (mcdr hare)])
-          (cond
-           [(null? hare) #t]
-           [(eq? hare turtle) #f]
-           [(mpair? hare)
-            (loop (mcdr turtle) (mcdr hare))]
-           [else #f]))]
-       [else #f]))]
-   [else #f]))
-  
-(define (mlength l)
-  (let loop ([l l][len 0])
-    (cond
-     [(null? l) len]
-     [else (loop (mcdr l) (add1 len))])))
-
-(define mappend
-  (case-lambda
-   [() null]
-   [(a) a]
-   [(a b) (let loop ([a a])
-            (if (null? a)
-                b
-                (mcons (mcar a) (loop (mcdr a)))))]
-   [(a . l) (mappend a (apply mappend l))]))
-
-;; mappend! : like append, but mutate each list to refer to the next.
-;; modeled loosely on the v372 behavior
-
-(define mappend!
-  (case-lambda
-    [() null]
-    [(a) a]
-    [(a b) (if (null? a)
-               b
-               (let loop ([atail a])
-                 (cond [(null? (mcdr atail)) (set-mcdr! atail b) a]
-                       [else (loop (mcdr atail))])))]
-    [(a . l) (mappend! a (apply mappend! l))]))
-
-(define (mreverse l)
-  (let loop ([l l][a null])
-    (cond
-     [(null? l) a]
-     [else (loop (mcdr l) (mcons (mcar l) a))])))
-
-(define (mreverse! l)
-  (let loop ([l l][prev null])
-    (cond
-     [(null? l) prev]
-     [else (let ([next (mcdr l)])
-             (set-mcdr! l prev)
-             (loop next l))])))
-
-(define (mlist-tail l n)
-  (cond
-   [(zero? n) l]
-   [else (mlist-tail (mcdr l) (sub1 n))]))
-
-(define (mlist-ref l n)
-  (cond
-   [(zero? n) (mcar l)]
-   [else (mlist-ref (mcdr l) (sub1 n))]))
-
-(define (do-member =? v l)
-  (let loop ([l l])
-    (cond
-     [(null? l) #f]
-     [(=? v (mcar l)) l]
-     [else (loop (mcdr l))])))
-
-(define (mmemq v l)
-  (do-member eq? v l))
-
-(define (mmemv v l)
-  (do-member eqv? v l))
-
-(define (mmember v l)
-  (do-member equal? v l))
-
-
-(define (do-assoc =? v l)
-  (let loop ([l l])
-    (cond
-     [(null? l) #f]
-     [(=? v (mcar (mcar l))) (mcar l)]
-     [else (loop (mcdr l))])))
-
-(define (massq v l)
-  (do-assoc eq? v l))
-
-(define (massv v l)
-  (do-assoc eqv? v l))
-
-(define (massoc v l)
-  (do-assoc equal? v l))
-
-(define ((mlistof p?) l)
-  (let loop ([l l])
-    (cond
-     [(null? l) #t]
-     [(not (mpair? l)) #f]
-     [(p? (mcar l)) (loop (mcdr l))]
-     [else #f])))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/compatibility/package.rkt b/pkgs/compatibility-pkgs/compatibility-lib/compatibility/package.rkt
deleted file mode 100644
index 103e77d54b..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/compatibility/package.rkt
+++ /dev/null
@@ -1,458 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     racket/list
-                     syntax/kerncase
-                     syntax/boundmap
-                     syntax/define
-                     syntax/flatten-begin
-                     syntax/context))
-
-(provide define-package
-         package-begin
-
-         open-package
-         open*-package
-
-         define*
-         define*-values
-         define*-syntax
-         define*-syntaxes
-
-         (for-syntax package?
-                     package-exported-identifiers
-                     package-original-identifiers))
-
-(define-for-syntax (do-define-* stx define-values-id)
-  (syntax-case stx ()
-    [(_ (id ...) rhs)
-     (let ([ids (syntax->list #'(id ...))])
-       (for-each (lambda (id)
-                   (unless (identifier? id)
-                     (raise-syntax-error
-                      #f
-                      "expected an identifier for definition"
-                      stx
-                      id)))
-                 ids)
-       (with-syntax ([define-values define-values-id])
-         (syntax/loc stx
-           (define-values (id ...) rhs))))]))
-(define-syntax (-define*-values stx)
-  (do-define-* stx #'define-values))
-(define-syntax (-define*-syntaxes stx)
-  (do-define-* stx #'define-syntaxes))
-(define-syntax (define*-values stx)
-  (syntax-case stx ()
-    [(_ (id ...) rhs)
-     (syntax-property
-      (syntax/loc stx (-define*-values (id ...) rhs))
-      'certify-mode
-      'transparent-binding)]))
-(define-syntax (define*-syntaxes stx)
-  (syntax-case stx ()
-    [(_ (id ...) rhs)
-     (syntax-property
-      (syntax/loc stx (-define*-syntaxes (id ...) rhs))
-      'certify-mode
-      'transparent-binding)]))
-
-(define-syntax (define* stx)
-  (let-values ([(id rhs) (normalize-definition stx #'lambda)])
-    (quasisyntax/loc stx
-      (define*-values (#,id) #,rhs))))
-(define-syntax (define*-syntax stx)
-  (let-values ([(id rhs) (normalize-definition stx #'lambda)])
-    (quasisyntax/loc stx
-      (define*-syntaxes (#,id) #,rhs))))
-
-(begin-for-syntax
- (define-struct package (exports hidden)
-   #:omit-define-syntaxes
-   #:property prop:procedure (lambda (r stx)
-                               (raise-syntax-error
-                                #f
-                                "misuse of a package name"
-                                stx)))
-
- (define (generate-hidden id)
-   ;; Like `generate-temporaries', but preserve the symbolic name
-   ((make-syntax-introducer) (datum->syntax #f (syntax-e id))))
- 
- (define (reverse-mapping who id exports hidden)
-   (or (ormap (lambda (m)
-                (and (free-identifier=? id (cdr m))
-                     (car m)))
-              exports)
-       (ormap (lambda (h)
-                (and (free-identifier=? id h)
-                     ;; Not at top level, where free-id=? is unreliable,
-                     ;; and re-definition is ok:
-                     (identifier-binding id)
-                     ;; Name is inaccessible. Generate a temporary to
-                     ;; avoid potential duplicate-definition errors
-                     ;; when the name is bound in the same context as
-                     ;; the package.
-                     (generate-hidden id)))
-              hidden)
-       id)))
-
-(define-for-syntax (move-props orig new)
-  (datum->syntax new
-                 (syntax-e new)
-                 orig
-                 orig))
-
-(define-for-syntax code-insp (variable-reference->module-declaration-inspector
-                              (#%variable-reference)))
-(define-for-syntax (disarm* stx)
-  (cond
-   [(and (syntax? stx)
-         (pair? (syntax-e stx)))
-    (let ([stx (syntax-disarm stx code-insp)])
-      (datum->syntax stx (disarm* (syntax-e stx)) stx stx))]
-   [(pair? stx) (cons (disarm* (car stx)) (disarm* (cdr stx)))]
-   [else stx]))
-
-(define-for-syntax (do-define-package stx exp-stx)
-  (syntax-case exp-stx ()
-    [(_ pack-id mode exports form ...)
-     (let ([id #'pack-id]
-           [exports #'exports]
-           [mode (syntax-e #'mode)])
-       (unless (eq? mode '#:begin)
-         (unless (identifier? id)
-           (raise-syntax-error #f
-                               "expected an identifier"
-                               stx
-                               id)))
-       (let ([exports
-              (cond
-               [(syntax->list exports)
-                => (lambda (l)
-                     (for-each (lambda (i)
-                                 (unless (identifier? i)
-                                   (raise-syntax-error #f
-                                                       "expected identifier to export"
-                                                       stx
-                                                       i)))
-                               l)
-                     (let ([dup-id (check-duplicate-identifier l)])
-                       (when dup-id
-                         (raise-syntax-error
-                          #f
-                          "duplicate export"
-                          stx
-                          dup-id)))
-                     l)]
-               [else (raise-syntax-error #f
-                                         (format "expected a parenthesized sequence of identifiers ~a"
-                                                 (case mode
-                                                   [(#:only) "to export"]
-                                                   [(#:all-defined-except) "to exclude from export"]
-                                                   [else (format "for ~a" mode)]))
-                                         stx
-                                         exports)])])
-         (let* ([def-ctx (syntax-local-make-definition-context)]
-                [ctx (generate-expand-context #t)]
-                [pre-package-id (lambda (id def-ctxes)
-                                  (identifier-remove-from-definition-context 
-                                   id 
-                                   def-ctxes))]
-                [kernel-forms (list*
-                               #'-define*-values
-                               #'-define*-syntaxes
-                               (kernel-form-identifier-list))]
-                [init-exprs (syntax->list #'(form ...))]
-                [new-bindings (make-bound-identifier-mapping)]
-                [fixup-sub-package (lambda (renamed-exports renamed-defines def-ctxes)
-                                     (lambda (stx)
-                                       (syntax-case* (disarm* stx) (define-syntaxes #%plain-app make-package quote-syntax 
-                                                                     list cons #%plain-lambda)
-                                                     free-transformer-identifier=?
-                                         [(define-syntaxes (pack-id)
-                                            (#%plain-app
-                                             make-package
-                                             (#%plain-lambda ()
-                                                             (#%plain-app list 
-                                                                          (#%plain-app cons 
-                                                                                       (quote-syntax export)
-                                                                                       (quote-syntax renamed))
-                                                                          ...))
-                                             hidden))
-                                          (with-syntax ([(export ...)
-                                                         (map (lambda (id)
-                                                                (if (or (ormap (lambda (e-id)
-                                                                                 (bound-identifier=? id e-id))
-                                                                               renamed-exports)
-                                                                        (not (ormap (lambda (e-id)
-                                                                                      (bound-identifier=? id e-id))
-                                                                                    renamed-defines)))
-                                                                    ;; Need to preserve the original
-                                                                    (pre-package-id id def-ctxes)
-                                                                    ;; It's not accessible, so just hide the name
-                                                                    ;;  to avoid re-binding errors. (Is this necessary,
-                                                                    ;;  or would `pre-package-id' take care of it?)
-                                                                    (generate-hidden id)))
-                                                              (syntax->list #'(export ...)))])
-                                            (syntax/loc stx
-                                              (define-syntaxes (pack-id)
-                                                (make-package
-                                                 (lambda ()
-                                                   (list (cons (quote-syntax export)
-                                                               (quote-syntax renamed))
-                                                         ...))
-                                                 hidden))))]
-                                         [_ stx])))]
-                [complement (lambda (bindings ids)
-                              (let ([tmp (make-bound-identifier-mapping)])
-                                (bound-identifier-mapping-for-each bindings
-                                                                   (lambda (k v)
-                                                                     (bound-identifier-mapping-put! tmp k #t)))
-                                (for-each (lambda (id)
-                                            (bound-identifier-mapping-put! tmp id #f))
-                                          ids)
-                                (filter
-                                 values
-                                 (bound-identifier-mapping-map tmp (lambda (k v) (and v k))))))])
-           (let ([register-bindings!
-                  (lambda (ids)
-                    (for-each (lambda (id)
-                                (when (bound-identifier-mapping-get new-bindings id (lambda () #f))
-                                  (raise-syntax-error #f 
-                                                      "duplicate binding"
-                                                      stx
-                                                      id))
-                                (bound-identifier-mapping-put! new-bindings
-                                                               id
-                                                               #t))
-                              ids))]
-                 [add-package-context (lambda (def-ctxes)
-                                        (lambda (stx)
-                                          (let ([q (local-expand #`(quote #,stx)
-                                                                 ctx
-                                                                 (list #'quote)
-                                                                 def-ctxes)])
-                                            (syntax-case q ()
-                                              [(_ stx) #'stx]))))])
-             (let loop ([exprs init-exprs]
-                        [rev-forms null]
-                        [def-ctxes (list def-ctx)])
-               (cond
-                [(null? exprs)
-                 (for-each (lambda (def-ctx)
-                             (internal-definition-context-seal def-ctx))
-                           def-ctxes)
-                 (let ([exports-renamed (map (add-package-context def-ctxes) exports)]
-                       [defined-renamed (bound-identifier-mapping-map new-bindings
-                                                                      (lambda (k v) k))])
-                   (for-each (lambda (ex renamed)
-                               (unless (bound-identifier-mapping-get new-bindings
-                                                                     renamed
-                                                                     (lambda () #f))
-                                 (raise-syntax-error #f
-                                                     (format "no definition for ~a identifier"
-                                                             (case mode
-                                                               [(#:only) "exported"]
-                                                               [(#:all-defined-except) "excluded"]))
-                                                     stx
-                                                     ex)))
-                             exports
-                             exports-renamed)
-                   (let-values ([(exports exports-renamed)
-                                 (if (memq mode '(#:only #:begin))
-                                     (values exports exports-renamed)
-                                     (let ([all-exports-renamed (complement new-bindings exports-renamed)])
-                                       ;; In case of define*, get only the last definition:
-                                       (let ([tmp (make-bound-identifier-mapping)])
-                                         (for-each (lambda (id)
-                                                     (bound-identifier-mapping-put!
-                                                      tmp
-                                                      ((add-package-context def-ctxes) 
-                                                       (pre-package-id id def-ctxes))
-                                                      #t))
-                                                   all-exports-renamed)
-                                         (let* ([exports-renamed (bound-identifier-mapping-map tmp (lambda (k v) k))]
-                                                [exports (map (lambda (id) (pre-package-id id def-ctxes))
-                                                              exports-renamed)])
-                                           (values exports exports-renamed)))))]
-                                [(prune)
-                                 (lambda (stx)
-                                   (identifier-prune-lexical-context stx (list (syntax-e stx) '#%top)))])
-                     (with-syntax ([(export ...) (map prune exports)]
-                                   [(renamed ...) (map prune exports-renamed)]
-                                   [(hidden ...) (map prune (complement new-bindings exports-renamed))])
-                       (let ([body (map (fixup-sub-package exports-renamed defined-renamed def-ctxes) 
-                                        (reverse rev-forms))])
-                         (if (eq? mode '#:begin)
-                             (if (eq? 'expression (syntax-local-context))
-                                 (quasisyntax/loc stx (let () #,@body))
-                                 (quasisyntax/loc stx (begin #,@body)))
-                             (quasisyntax/loc stx
-                               (begin
-                                 #,@(if (eq? 'top-level (syntax-local-context))
-                                        ;; delcare all bindings before they are used:
-                                        #`((define-syntaxes #,defined-renamed (values)))
-                                        null)
-                                 #,@body
-                                 (define-syntax pack-id
-                                   (make-package
-                                    (lambda ()
-                                      (list (cons (quote-syntax export)
-                                                  (quote-syntax renamed))
-                                            ...))
-                                    (lambda ()
-                                      (list (quote-syntax hidden) ...)))))))))))]
-                [else
-                 (let ([expr (local-expand (car exprs)
-                                           ctx
-                                           kernel-forms 
-                                           def-ctxes)])
-                   (syntax-case expr (begin)
-                     [(begin . rest)
-                      (loop (append (flatten-begin expr) (cdr exprs))
-                            rev-forms
-                            def-ctxes)]
-                     [(def (id ...) rhs)
-                      (and (or (free-identifier=? #'def #'define-syntaxes)
-                               (free-identifier=? #'def #'-define*-syntaxes))
-                           (andmap identifier? (syntax->list #'(id ...))))
-                      (with-syntax ([rhs (local-transformer-expand
-                                          #'rhs
-                                          'expression
-                                          null)])
-                        (let ([star? (free-identifier=? #'def #'-define*-syntaxes)]
-                              [ids (syntax->list #'(id ...))])
-                          (let* ([def-ctx (if star?
-                                              (syntax-local-make-definition-context (car def-ctxes))
-                                              (last def-ctxes))]
-                                 [ids (map
-                                       (lambda (id) (syntax-property id 'unshadowable #t))
-                                       (if star? 
-                                           (map (add-package-context (list def-ctx)) ids)
-                                           ids))])
-                            (syntax-local-bind-syntaxes ids #'rhs def-ctx)
-                            (register-bindings! ids)
-                            (loop (cdr exprs)
-                                  (cons (move-props expr #`(define-syntaxes #,ids rhs))
-                                        rev-forms)
-                                  (if star? (cons def-ctx def-ctxes) def-ctxes)))))]
-                     [(def (id ...) rhs)
-                      (and (or (free-identifier=? #'def #'define-values)
-                               (free-identifier=? #'def #'-define*-values))
-                           (andmap identifier? (syntax->list #'(id ...))))
-                      (let ([star? (free-identifier=? #'def #'-define*-values)]
-                            [ids (syntax->list #'(id ...))])
-                        (let* ([def-ctx (if star?
-                                            (syntax-local-make-definition-context (car def-ctxes))
-                                            (last def-ctxes))]
-                               [ids (map
-                                     (lambda (id) (syntax-property id 'unshadowable #t))
-                                     (if star? 
-                                         (map (add-package-context (list def-ctx)) ids)
-                                         ids))])
-                          (syntax-local-bind-syntaxes ids #f def-ctx)
-                          (register-bindings! ids)
-                          (loop (cdr exprs)
-                                (cons (move-props expr #`(define-values #,ids rhs)) rev-forms)
-                                (if star? (cons def-ctx def-ctxes) def-ctxes))))]
-                     [else
-                      (loop (cdr exprs) 
-                            (cons (if (and (eq? mode '#:begin)
-                                           (null? (cdr exprs)))
-                                      expr
-                                      #`(define-values () (begin #,expr (values))))
-                                  rev-forms)
-                            def-ctxes)]))]))))))]))
-
-(define-syntax (define-package stx)
-  (syntax-case stx ()
-    [(_ id #:all-defined form ...)
-     (do-define-package stx #'(define-package id #:all-defined () form ...))]
-    [(_ id #:all-defined-except ids form ...)
-     (do-define-package stx stx)]
-    [(_ id #:only ids form ...)
-     (do-define-package stx stx)]
-    [(_ id ids form ...)
-     (do-define-package stx #'(define-package id #:only ids form ...))]))
-
-(define-syntax (package-begin stx)
-  (syntax-case stx ()
-    [(_ form ...)
-     (do-define-package stx #'(define-package #f #:begin () form ...))]))
-
-(define-for-syntax (do-open stx define-syntaxes-id)
-  (syntax-case stx ()
-    [(_ pack-id)
-     (let ([id #'pack-id])
-       (unless (identifier? id)
-         (raise-syntax-error #f
-                             "expected an identifier for a package"
-                             stx
-                             id))
-       (let ([v (syntax-local-value id (lambda () #f))])
-         (unless (package? v)
-           (raise-syntax-error #f
-                               "identifier is not bound to a package"
-                               stx
-                               id))
-         (let ([introduce (syntax-local-make-delta-introducer 
-                           (syntax-local-introduce id))])
-           (with-syntax ([(intro ...)
-                          (map (lambda (i)
-                                 (syntax-local-introduce
-                                  (syntax-local-get-shadower
-                                   (introduce i))))
-                               (map car ((package-exports v))))]
-                         [(defined ...)
-                          (map (lambda (v) (syntax-local-introduce (cdr v)))
-                               ((package-exports v)))]
-                         [((a . b) ...) (map (lambda (p)
-                                               (cons (syntax-local-introduce (car p))
-                                                     (syntax-local-introduce (cdr p))))
-                                             ((package-exports v)))]
-                         [(h ...) (map syntax-local-introduce ((package-hidden v)))])
-             (syntax-property
-              #`(#,define-syntaxes-id (intro ...)
-                  (let ([rev-map (lambda (x)
-                                   (reverse-mapping
-                                    'pack-id
-                                    x
-                                    (list (cons (quote-syntax a)
-                                                (quote-syntax b))
-                                          ...)
-                                    (list (quote-syntax h) ...)))])
-                    (values (make-rename-transformer #'defined rev-map)
-                            ...)))
-              'disappeared-use
-              (syntax-local-introduce id))))))]))
-
-(define-syntax (open-package stx)
-  (do-open stx #'define-syntaxes))
-(define-syntax (open*-package stx)
-  (do-open stx #'define*-syntaxes))
-
-(define-for-syntax (package-exported-identifiers id)
-  (let ([v (and (identifier? id)
-                (syntax-local-value id (lambda () #f)))])
-    (unless (package? v)
-      (if (identifier? id)
-          (raise-arguments-error 'package-exported-identifiers "identifier is not bound to a package"
-                                 "identifier" id)
-          (raise-argument-error 'package-exported-identifiers "identifier?" id)))
-    (let ([introduce (syntax-local-make-delta-introducer 
-                      (syntax-local-introduce id))])
-      (map (lambda (i)
-             (syntax-local-introduce
-              (syntax-local-get-shadower
-               (introduce (car i)))))
-           ((package-exports v))))))
-
-(define-for-syntax (package-original-identifiers id)
-  (let ([v (and (identifier? id)
-                (syntax-local-value id (lambda () #f)))])
-    (unless (package? v)
-      (if (identifier? id)
-          (raise-arguments-error 'package-original-identifiers "identifier is not bound to a package"
-                                 "identifier" id)
-          (raise-argument-error 'package-original-identifiers "identifier?" id)))
-    (map cdr ((package-exports v)))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/info.rkt b/pkgs/compatibility-pkgs/compatibility-lib/info.rkt
deleted file mode 100644
index c7842d56eb..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-(define collection 'multi)
-(define deps '("scheme-lib"
-               "base" 
-               "net-lib"
-               "sandbox-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"compatibility\"")
-
-(define pkg-authors '(eli mflatt robby samth))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/lazy/mz-without-promises.rkt b/pkgs/compatibility-pkgs/compatibility-lib/lazy/mz-without-promises.rkt
deleted file mode 100644
index bdb0ea143e..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/lazy/mz-without-promises.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-;; A tiny language to build our promises with no built-in interference
-(module mz-without-promises mzscheme
-  (provide (all-from-except mzscheme delay force promise?)))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/a-signature.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/a-signature.rkt
deleted file mode 100644
index 6771c55db2..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/a-signature.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-(module a-signature mzscheme
-  (require-for-syntax racket/private/unit-compiletime
-                      racket/private/unit-syntax)
-  (require "unit.rkt")
-  
-  (provide (rename module-begin #%module-begin)
-           (all-from-except mzscheme #%module-begin)
-           (all-from "unit.rkt"))
-
-  (define-for-syntax (make-name s)
-    (string->symbol
-     (string-append (regexp-replace "-sig$" (symbol->string s) "")
-                    "^")))
-
-  (define-syntax (module-begin stx)
-    (parameterize ((error-syntax stx))
-      (with-syntax ((name (make-name (syntax-property stx 'enclosing-module-name))))
-        (syntax-case stx ()
-          ((_ . x)
-           (with-syntax ((((reqs ...) . (body ...))
-                          (split-requires (checked-syntax->list #'x))))
-             (datum->syntax-object
-              stx
-              (syntax-e #'(#%module-begin
-                           reqs ...
-                           (provide name)
-                           (define-signature name (body ...))))
-              stx))))))))
-  
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/a-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/a-unit.rkt
deleted file mode 100644
index e0e9446cd7..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/a-unit.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-(module a-unit mzscheme
-  (require "unit.rkt")
-  (require-for-syntax syntax/kerncase)
-  
-  (provide (rename module-begin #%module-begin)
-           (all-from-except mzscheme #%module-begin)
-           (all-from "unit.rkt"))
-  
-  (define-for-syntax (make-name s)
-    (string->symbol
-     (string-append (regexp-replace "-unit$" (symbol->string s) "")
-                    "@")))
-
-  ;; Look for `import' and `export', and start processing the body:
-  (define-syntax (module-begin stx)
-    (syntax-case stx ()
-      [(_ elem ...)
-       (with-syntax ([((elem ...) . (literal ...))
-                      (let loop ([elems (syntax->list #'(elem ...))]
-                                 [accum null])
-                        (syntax-case elems (import export)
-                          [((import . _1) (export . _2) . _3)
-                           (cons (reverse accum) elems)]
-                          [((import . _1) . _2)
-                           (raise-syntax-error
-                            #f
-                            "expected an `export' clause after `import'"
-                            stx)]
-                          [()
-                           (raise-syntax-error
-                            #f
-                            "missing an `import' clause"
-                            stx)]
-                          [_else
-                           (loop (cdr elems) (cons (car elems) accum))]))])
-         (with-syntax ((name (datum->syntax-object
-                              stx
-                              (make-name (syntax-property stx 'enclosing-module-name))
-                              stx))
-                       (orig-stx stx))
-           (datum->syntax-object
-            stx
-            (syntax-e
-             #'(#%module-begin (a-unit-module orig-stx finish-a-unit (import export) 
-                                              "original import form"
-                                              name (elem ...) (literal ...))))
-            stx
-            stx)))]))
-
-  ;; Process one `require' form (and make sure it's a require form):
-  (define-syntax (a-unit-module stx)
-    (syntax-case stx ()
-      [(_ orig-stx finish stops separator name (elem1 elem ...) (literal ...))
-       (let ([e (local-expand #'elem1
-                              'module
-                              (append
-                               (syntax->list #'stops)
-                               (list*
-                                #'require
-                                #'require-for-syntax
-                                #'require-for-template
-                                (kernel-form-identifier-list))))])
-         (syntax-case e (begin)
-           [(req r ...)
-            (or (module-identifier=? #'req #'require)
-                (module-identifier=? #'req #'require-for-syntax)
-                (module-identifier=? #'req #'require-for-template))
-            #'(begin
-                (req r ...)
-                (a-unit-module orig-stx finish stops separator name (elem ...) (literal ...)))]
-           [(begin b ...)
-            #'(a-unit-module orig-stx finish stops separator name (b ... elem ...) (literal ...))]
-           [_else
-            (raise-syntax-error
-             #f
-             (format "non-require form before ~a" (syntax-e #'separator))
-             #'orig-stx
-             e)]))]
-      [(_ orig-stx finish stops separator name () (literal ...))
-       #'(finish orig-stx name literal ...)]))
-    
-  ;; All requires are done, so finish handling the unit:
-  (define-syntax (finish-a-unit stx)
-    (syntax-case stx (import export)
-      [(_ orig-stx name imports exports elem ...)
-       #'(begin
-           (provide name)
-           (define-unit name imports exports elem ...))])))
-
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/async-channel.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/async-channel.rkt
deleted file mode 100644
index fa1a0060fb..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/async-channel.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require racket/async-channel)
-(provide (all-from-out racket/async-channel))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/awk.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/awk.rkt
deleted file mode 100644
index 77456231f5..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/awk.rkt
+++ /dev/null
@@ -1,256 +0,0 @@
-
-(module awk mzscheme
-  (require-for-syntax syntax/stx)
-
-  (provide awk match:start match:end match:substring regexp-exec)
-
-  (define-syntax awk
-    (lambda (stx)
-      (syntax-case stx ()
-	[(_ next-record
-	    (record field ...)
-	    counter
-	    ((state-variable init-expr) ...)
-	    continue
-	    clause ...)
-	 (and (identifier? (syntax counter))
-	      (identifier? (syntax continue)))
-	 (let ([clauses (syntax->list (syntax (clause ...)))]
-	       [initvars null])
-	   (with-syntax ([(local-state ...) (generate-temporaries
-					     (syntax->list (syntax (state-variable ...))))])
-	     (letrec ([get-after-clauses
-		       (lambda ()
-			 (let loop ([l clauses][afters null])
-			   (cond
-			    [(null? l) (if (stx-null? afters)
-					   (syntax ((values state-variable ...)))
-					   afters)]
-			    [(syntax-case (car l) (after)
-			       [(after . rest) (syntax rest)]
-			       [_else #f])
-			     => (lambda (rest)
-				  (with-syntax ([(after ...) afters])
-				    (loop (cdr l) (syntax (after ... .  rest)))))]
-			    [else
-			     (loop (cdr l) afters)])))]
-		      [wrap-state
-		       (lambda (e)
-			 (syntax-case e (=>)
-			   [(=> f)
-			    (with-syntax ([body (wrap-state (syntax ((f arg))))])
-			      (syntax (=> (lambda (arg)
-					    . body))))]
-			   [body
-			    (syntax
-			     ((call-with-values (lambda () . body)
-				(lambda (local-state ... . extras)
-				  (set! else-ready? #f)
-				  (set! state-variable local-state)
-				  ...))))]))]
-		      [make-range
-		       (lambda (include-on? include-off? body rest)
-			 (syntax-case body ()
-			   [(t1 t2 . body)
-			    (with-syntax ([on? (car (generate-temporaries '(1)))]
-					  [t1 (make-test (syntax-e (syntax t1)) (syntax t1))]
-					  [t2 (make-test (syntax-e (syntax t2)) (syntax t2))]
-					  [body (wrap-state (syntax body))])
-			      (with-syntax ([check (if include-on?
-						       (if include-off?
-							   (syntax post-on-on?)
-							   (syntax on?))
-						       (if include-off?
-							   (syntax orig-on?)
-							   (syntax (and orig-on? on?))))])
-				(set! initvars (cons (syntax (on? #f)) initvars))
-				(syntax
-				 ((let ([orig-on? on?])
-				    (unless on? 
-				      (set! on? t1))
-				    (let ([post-on-on? on?])
-				      (when on? 
-					(set! on? (not t2))))
-				    (when check
-				      . body))
-				  . rest))))]
-			   [_else (raise-syntax-error
-				   #f
-				   "bad range"
-				   stx
-				   body)]))]
-		      [make-test
-		       (lambda (test expr)
-			 (cond
-			  [(string? test)
-			   (with-syntax ([g (car (generate-temporaries '(1)))]
-					 [expr expr])
-			     (set! initvars (cons (syntax (g (regexp expr))) initvars))
-			     (syntax (regexp-exec g record)))]
-			  [(number? test)
-			   (with-syntax ([expr expr])
-			     (syntax (= expr counter)))]
-			  [else expr]))]
-		      [get-testing-clauses
-		       (lambda ()
-			 (let loop ([l clauses])
-			   (if (null? l)
-			       null
-			       (syntax-case (car l) ()
-				 [(test-expr body ...)
-				  (with-syntax ([rest (loop (cdr l))])
-				    (let ([test (syntax-e (syntax test-expr))]
-					  [body (syntax (body ...))])
-				      (cond
-				       [(or (string? test) (number? test))
-					(with-syntax ([t (make-test test (syntax test-expr))]
-						      [body (wrap-state body)])
-					  (syntax
-					   ((cond [t . body]
-						  [else (void)])
-					    . rest)))]
-				       [(eq? test 'else)
-					(with-syntax ([body (wrap-state body)])
-					  (syntax
-					   ((when else-ready? . body)
-					    (set! else-ready? #t)
-					    . rest)))]
-				       [(eq? test 'range)
-					(make-range #f #f body (syntax rest))]
-				       [(eq? test ':range)
-					(make-range #t #f body (syntax rest))]
-				       [(eq? test 'range:)
-					(make-range #f #t body (syntax rest))]
-				       [(eq? test ':range:)
-					(make-range #t #t body (syntax rest))]
-				       [(eq? test 'after)
-					(syntax rest)]
-				       [(eq? test '/)
-					(with-syntax ([g (car (generate-temporaries '(1)))])
-					  (syntax-case* body (/) (lambda (a b)
-								  (eq? (syntax-e a)
-								       (syntax-e b)))
-					    [(re / (var ...) . body)
-					     (and (string? (syntax-e (syntax re)))
-						  (andmap (lambda (x) (or (identifier? x)
-									  (not (syntax-e x))))
-							  (syntax->list (syntax (var ...)))))
-					     (with-syntax ([(var ...)
-							    (map (lambda (x)
-								   (if (identifier? x)
-								       x
-								       (car (generate-temporaries '(1)))))
-								 (syntax->list (syntax (var ...))))]
-							   [body (wrap-state (syntax body))])
-					       (set! initvars (cons (syntax (g (regexp re))) initvars))
-					       (syntax
-						((cond
-						  [(regexp-match re record)
-						   => (lambda (arg)
-							(apply
-							 (lambda (var ...) . body)
-							 arg))]
-						  [else (void)])
-						 . rest)))]
-					    [_else (raise-syntax-error
-						    #f
-						    "bad / ... / clause"
-						    stx
-						    (car l))]))]
-				       [else
-					(with-syntax ([body (wrap-state body)])
-					  (syntax
-					   ((cond [test-expr . body]
-						  [else (void)])
-					    . rest)))])))]
-				 [_else (raise-syntax-error
-					 #f
-					 "bad clause"
-					 stx
-					 (car l))]))))])
-	       (with-syntax ([testing-clauses (get-testing-clauses)]
-			     [after-clauses (get-after-clauses)]
-			     [initvars initvars])
-		 (syntax
-		  (let ((state-variable init-expr) ...
-			. initvars)
-		    (let loop ([counter 1]) 
-		      (call-with-values (lambda () next-record)
-			(lambda (record field ...)
-			  (if (eof-object? record)
-			      (begin
-				. after-clauses)
-			      (let ([else-ready? #t])
-				(let/ec escape
-				  (let ([continue
-					 (lambda (local-state ... . extras)
-					   (set! state-variable local-state)
-					   ...
-					   (escape))])
-				    . testing-clauses))
-				(loop (add1 counter)))))))))))))]
-	;; Left out continue...
-	[(_ next-record
-	    (record field-variable ...)
-	    counter-variable
-	    ((state-variable init-expr) ...)
-	    clause ...)
-	 (identifier? (syntax counter-variable))
-	 (syntax
-	  (awk next-record
-	       (record field-variable ...)
-	       counter-variable
-	       ((state-variable init-expr) ...)
-	       continue
-	       clause ...))]
-	;; Left out counter...
-	[(_ next-record
-	    (record field-variable ...)
-	    ((state-variable init-expr) ...)
-	    continue-variable
-	    clause ...)
-	 (identifier? (syntax continue-variable))
-	 (syntax
-	  (awk next-record
-	       (record field-variable ...)
-	       counter
-	       ((state-variable init-expr) ...)
-	       continue-variable
-	       clause ...))]
-	;; Left out both...
-	[(_ next-record
-	    (record field-variable ...)
-	    ((state-variable init-expr) ...)
-	    clause ...)
-	 (syntax
-	  (awk next-record
-	       (record field-variable ...)
-	       counter
-	       ((state-variable init-expr) ...)
-	       continue
-	       clause ...))])))
-
-  (define-struct match (s a))
-
-  (define match:start
-    (case-lambda
-     [(rec) (match:start rec 0)]
-     [(rec which) (car (list-ref (match-a rec) which))]))
-
-  (define match:end
-    (case-lambda
-     [(rec) (match:end rec 0)]
-     [(rec which) (cdr (list-ref (match-a rec) which))]))
-
-  (define match:substring
-    (case-lambda
-     [(rec) (match:substring rec 0)]
-     [(rec which) (let ([p (list-ref (match-a rec) which)])
-		    (substring (match-s rec) (car p) (cdr p)))]))
-
-  (define regexp-exec
-    (lambda (re s)
-      (let ([r (regexp-match-positions re s)])
-	(if r
-	    (make-match s r)
-	    #f)))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/class.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/class.rkt
deleted file mode 100644
index 27e53d4c45..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/class.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require racket/private/class-internal
-         racket/private/class-c-old)
-(provide-public-names)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cm-accomplice.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cm-accomplice.rkt
deleted file mode 100644
index 74bdf451d5..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cm-accomplice.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require compiler/cm-accomplice)
-(provide (all-from-out compiler/cm-accomplice))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cm.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cm.rkt
deleted file mode 100644
index fb6006f28f..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cm.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require compiler/cm)
-(provide (all-from-out compiler/cm))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cmdline.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cmdline.rkt
deleted file mode 100644
index 1cce81eac0..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cmdline.rkt
+++ /dev/null
@@ -1,145 +0,0 @@
-#lang mzscheme
-
-(require (only racket/cmdline parse-command-line))
-
-(provide command-line
-         parse-command-line)
-
-(define-syntax (command-line stx)
-  (define (id=? x y)
-    (eq? (syntax-e x) (syntax-e y)))
-  (define (serror msg . detail)
-    (apply raise-syntax-error #f msg stx detail))
-  (define (extract-one what args . detail)
-    (if (null? args)
-        (apply serror (format "missing ~a" what) detail)
-        (values (car args) (cdr args))))
-  (define (extract-list stx/list pred)
-    (let loop ([xs null]
-               [rest (if (syntax? stx/list) (syntax->list stx/list) stx/list)])
-      (if (and (pair? rest) (pred (car rest)))
-          (loop (cons (car rest) xs) (cdr rest))
-          (values (reverse xs) rest))))
-  (define (formal-names l)
-    (map (lambda (a)
-           (datum->syntax-object
-            (quote-syntax here)
-            (let ([s (symbol->string (syntax-e a))])
-              (if (char=? #\* (string-ref s (sub1 (string-length s))))
-                  (substring s 0 (sub1 (string-length s)))
-                  s))
-            #f))
-         l))
-  (syntax-case stx ()
-    [(_ program-name argv clause ...)
-     (let ([clauses
-            (let loop ([csrcs (syntax->list #'(clause ...))][clauses null])
-              (with-syntax ([(clause ...) clauses])
-                (if (null? csrcs)
-                    #'((list clause ...) (lambda (accum) (void)) null)
-                    (let ([line (car csrcs)]
-                          [arest (cdr csrcs)])
-                      (syntax-case* line (help-labels => args) id=?
-                        [(help-labels s ...)
-                         (begin
-                           (unless (andmap (lambda (x) (string? (syntax-e x)))
-                                           (syntax->list #'(s ...)))
-                             (serror "help-labels clause must contain only strings" line))
-                           (loop arest #'(clause ... '(help-labels s ...))))]
-                        [(tag . rest)
-                         (ormap (lambda (x) (id=? #'tag x))
-                                (syntax->list #'(once-each once-any multi final)))
-                         (with-syntax 
-                             ([sublines
-                               (let slloop ([sublines (syntax->list #'rest)])
-                                 (if (null? sublines)
-                                     #'()
-                                     (with-syntax 
-                                         ([looped (slloop (cdr sublines))]
-                                          [subline
-                                           (with-syntax 
-                                               ([flags 
-                                                 (syntax-case (car sublines) ()
-                                                   [((flag ...) . rest)
-                                                    (begin
-                                                      (unless (andmap 
-                                                               (lambda (x) (string? (syntax-e x)))
-                                                               (syntax->list #'(flag ...)))
-                                                        (serror 
-                                                         "flag specification is not a string or sequence of strings" 
-                                                         #'(flag ...)))
-                                                      #'(flag ...))]
-                                                   [(flag . rest)
-                                                    (string? (syntax-e #'flag))
-                                                    #'(flag)]
-                                                   [else
-                                                    (serror "clause does not start with flags")])])
-                                             (syntax-case* (car sublines) (=>) id=?
-                                               [(_ => a b)
-                                                #'(list 'flags a b)]
-                                               [(_ rest ...)
-                                                (let*-values ([(formals rest)
-                                                               (extract-list #'(rest ...) identifier?)]
-                                                              [(helps rest)
-                                                               (extract-list
-                                                                rest (lambda (x) (string? (syntax-e x))))]
-                                                              [(expr1 rest)
-                                                               (extract-one
-                                                                "handler body expressions" rest line)])
-                                                  (when (null? helps)
-                                                    (serror "missing help string/s"))
-                                                  (with-syntax ([formals formals]
-                                                                [formal-names (formal-names formals)]
-                                                                [helps helps]
-                                                                [expr1 expr1]
-                                                                [rest rest])
-                                                    #'(list 'flags
-                                                            (lambda (flag . formals) expr1 . rest)
-                                                            '(helps . formal-names))))]))])
-                                       #'(subline . looped))))])
-                           (loop arest #'(clause ... (list 'tag . sublines))))]
-                        [(=> finish-proc arg-help help-proc unknown-proc)
-                         (begin
-                           (unless (null? arest)
-                             (serror "=> must be the last clause line"))
-                           #'((list clause ...)
-                              finish-proc arg-help help-proc unknown-proc))]
-                        [(=> finish-proc arg-help help-proc)
-                         (begin
-                           (unless (null? arest)
-                             (serror "=> must be the last clause line"))
-                           #'((list clause ...)
-                              finish-proc arg-help help-proc))]
-                        [(=> finish-proc arg-help)
-                         (begin
-                           (unless (null? arest)
-                             (serror "=> must be the last clause line"))
-                           #'((list clause ...) finish-proc arg-help))]
-                        [(=> . _)
-                         (serror "bad => line" line)]
-                        [(args arg-formals body1 body ...)
-                         (begin
-                           (unless (null? arest)
-                             (serror "args must be the last clause" line))
-                           (let ([formals
-                                  (let loop ([f #'arg-formals])
-                                    (syntax-case f ()
-                                      [() null]
-                                      [(arg . rest)
-                                       (identifier? #'arg)
-                                       (cons #'arg (loop #'rest))]
-                                      [arg
-                                       (identifier? #'arg)
-                                       (list #'arg)]
-                                      [else
-                                       (serror "bad argument list" line)]))])
-                             (with-syntax ([formal-names (formal-names formals)])
-                               #'((list clause ...)
-                                  (lambda (accume . arg-formals)
-                                    body1 body ...)
-                                  'formal-names))))]
-                        [(args . _)
-                         (serror "bad args line" line)]
-                        [else (serror "not a once-each, once-any, multi, final, args, or => line" line)])))))])
-       (with-syntax ([clauses clauses])
-         #'(parse-command-line program-name argv . clauses)))]))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cml.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cml.rkt
deleted file mode 100644
index 8eaf1b762b..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cml.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-(require racket/contract/base)
-
-  (define (spawn thunk)
-    (thread/suspend-to-kill thunk))
-
-  (define (channel)
-    (make-channel))
-
-  (define (channel-recv-evt ch)
-    ch)
-
-  (define (channel-send-evt ch v)
-    (wrap-evt
-     (channel-put-evt ch v)
-     void))
-
-  (define (thread-done-evt th)
-    (thread-dead-evt th))
-  
-  (define (current-time)
-    (current-inexact-milliseconds))
-  (define (time-evt t)
-    (alarm-evt t))
-
-  (provide/contract
-   (spawn ((-> any) . -> . thread?))
-   (channel (-> channel?))
-   (channel-recv-evt (channel? . -> . evt?))
-   (channel-send-evt (channel? any/c . -> . evt?))
-   
-   (thread-done-evt (thread? . -> . evt?))
-   (current-time (-> number?))
-   (time-evt (real? . -> . evt?)))
-
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/compat.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/compat.rkt
deleted file mode 100644
index 1a23f6b2f1..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/compat.rkt
+++ /dev/null
@@ -1,109 +0,0 @@
-
-(module compat mzscheme
-
-  (provide real-time
-	   1+ 1-
-	   >=? <=? >? <? =?
-	   flush-output-port
-	   gentemp
-	   atom?
-	   putprop getprop
-	   new-cafe
-	   define-structure)
-
-  (define 1+ add1)
-  (define 1- sub1)
-
-  (define =? =)
-  (define <? <)
-  (define >? >)
-  (define <=? <)
-  (define >=? >)
-
-  (define atom? (lambda (v) (not (pair? v))))
-
-  (define gentemp gensym)
-
-  (define flush-output-port flush-output)
-
-  (define real-time current-milliseconds)
-
-  (define table (make-hash-table))
-  (define getprop
-    (case-lambda
-     [(k prop) (getprop k prop #f)]
-     [(k prop def)
-      (let ([al (hash-table-get table k (lambda () #f))])
-	(if al
-	    (let ([v (assq prop al)])
-	      (if v
-		  (unbox (cdr v))
-		  def))
-	    def))]))
-  (define putprop
-    (lambda (k prop nv)
-      (let ([al (hash-table-get table k (lambda () '()))])
-	(let ([v (assq prop al)])
-	  (if v
-	      (set-box! (cdr v) nv)
-	      (hash-table-put! table k (cons (cons prop (box nv)) al)))))))
-
-  ;; Chez's new-cafe
-  (define new-cafe 
-    (letrec ([nc
-	      (case-lambda
-	       [() (nc (current-eval))]
-	       [(eval)
-		(let/ec escape
-		  (let ([orig-exit (exit-handler)]
-			[orig-eval (current-eval)])
-		    (dynamic-wind
-			(lambda ()
-			  (current-eval eval)
-			  (exit-handler
-			   (lambda (v) (escape v))))
-			read-eval-print-loop
-			(lambda ()
-			  (current-eval orig-eval)
-			  (exit-handler orig-exit)))))])])
-      nc))
-
-  (define-syntax define-structure
-    (lambda (stx)
-      (syntax-case stx ()
-	[(_ (sname field ...))
-	 (syntax (define-structure (sname field ...) ()))]
-	[(_ (sname field ...) ([init-field init] ...))
-	 (andmap identifier? (syntax->list 
-			      (syntax (sname field ... init-field ...))))
-	 (let ([name (symbol->string (syntax-e (syntax sname)))]
-	       [fields (map symbol->string 
-			    (map syntax-e 
-				 (syntax->list (syntax (field ...)))))]
-	       [init-fields (map symbol->string 
-				 (map syntax-e 
-				      (syntax->list (syntax (init-field ...)))))]
-	       [+ (lambda args
-		    (datum->syntax-object
-		     (syntax sname)
-		     (string->symbol (apply string-append args)) 
-		     (syntax sname)))])
-	   (with-syntax ([struct: (+ "struct:" name)]
-			 [make- (+ "make-" name)]
-			 [? (+ name "?")]
-			 [(gs ...)
-			  (apply
-			   append
-			   (map (lambda (f) (list (+ name "-" f)
-						  (+ "set-" name "-" f "!")))
-				(append fields init-fields)))])
-	     (syntax
-	      (define-values (struct: make- ? gs ...)
-		(let ()
-		  (define-struct sname (field ... init-field ...))
-		  (values struct: 
-			  (let ([make- (lambda (field ...)
-					 (make- field ...
-						init ...))])
-			    make-)
-			  ? gs ...))))))]))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/compile.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/compile.rkt
deleted file mode 100644
index af29dccd74..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/compile.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require compiler/compile-file)
-
-(provide compile-file)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/contract.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/contract.rkt
deleted file mode 100644
index 3d0291603d..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/contract.rkt
+++ /dev/null
@@ -1,209 +0,0 @@
-#lang racket/base
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  provide arrow contracts from our local copy (mostly)
-;;
-
-(require "private/contract-arrow.rkt")
-(provide (all-from-out "private/contract-arrow.rkt"))
-(require (only-in racket/contract/base unconstrained-domain->))
-(provide unconstrained-domain->)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  provide contracts for objects
-;;
-(require "private/contract-object.rkt")
-(provide (all-from-out "private/contract-object.rkt"))
-
-(require (only-in racket/class
-                  is-a?/c
-                  implementation?/c
-                  subclass?/c
-                  mixin-contract
-                  make-mixin-contract))
-(provide is-a?/c
-         implementation?/c
-         subclass?/c
-         mixin-contract
-         make-mixin-contract)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; old-style define/contract
-;;
-
-(require "private/contract-define.rkt")
-(provide (all-from-out "private/contract-define.rkt"))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; old-style flat mutable contracts
-;;
-(require "private/contract-mutable.rkt")
-(provide (all-from-out "private/contract-mutable.rkt"))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; old-style flat struct contracts
-;;
-(require "private/contract-struct.rkt")
-(provide (all-from-out "private/contract-struct.rkt"))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; provide everything from the racket/ implementation
-;; except the arrow contracts
-;;
-
-(require (prefix-in : racket/contract))
-(require (for-syntax racket/provide-transform racket/base))
-(define-syntax remove-prefix
-  (make-provide-transformer
-   (λ (stx ctxt)
-     (syntax-case stx ()
-       [(_ args ...)
-        (for/list ([arg (in-list (syntax->list #'(args ...)))])
-          (export arg 
-                  (string->symbol
-                   (regexp-replace #rx"^:" (symbol->string (syntax-e arg)) ""))
-                  0
-                  #f
-                  arg))]))))
-
-(provide (remove-prefix
-          :define-contract-struct
-          :</c
-          :>/c
-          :chaperone-contract?
-          :contract-name
-          :contract-projection
-          :contract?
-          :false/c
-          :flat-contract
-          :flat-contract-predicate
-          :flat-contract?
-          :flat-named-contract
-          :impersonator-contract?
-          :make-none/c
-          :n->th
-          :natural-number/c
-          :printable/c
-          :promise/c
-          :or/c
-          :prompt-tag/c
-          :>=/c
-          :syntax/c
-          :any
-          :non-empty-listof
-          :any/c
-          :between/c
-          :cons/c
-          :integer-in
-          :symbols
-          :real-in
-          :list/c
-          :continuation-mark-key/c
-          :one-of/c
-          :procedure-arity-includes/c
-          :not/c
-          :flat-rec-contract
-          :flat-murec-contract
-          :=/c
-          :and/c
-          :parameter/c
-          :none/c
-          :<=/c
-          :listof
-          :contract
-          :current-contract-region
-          :recursive-contract
-          :provide/contract
-          :build-compound-type-name
-          :coerce-chaperone-contract
-          :coerce-chaperone-contracts
-          :coerce-contract
-          :coerce-contract/f
-          :coerce-contracts
-          :coerce-flat-contract
-          :coerce-flat-contracts
-          :contract-first-order
-          :contract-first-order-passes?
-          :contract-stronger?
-          :eq-contract-val
-          :eq-contract?
-          :equal-contract-val
-          :equal-contract?
-          :has-contract?
-          :impersonator-prop:contracted
-          :prop:contracted
-          :value-contract
-          :define/subexpression-pos-prop
-          :define/final-prop
-          :blame-add-unknown-context
-          :blame-context
-          :blame-contract
-          :blame-fmt->-string
-          :blame-negative
-          :blame-original?
-          :blame-positive
-          :blame-replace-negative
-          :blame-source
-          :blame-swap
-          :blame-swapped?
-          :blame-value
-          :blame?
-          :current-blame-format
-          :exn:fail:contract:blame-object
-          :exn:fail:contract:blame?
-          :make-exn:fail:contract:blame
-          :raise-blame-error
-          :struct:exn:fail:contract:blame
-          :blame-add-context
-          :exn:fail:contract:blame
-          :build-chaperone-contract-property
-          :build-contract-property
-          :build-flat-contract-property
-          :chaperone-contract-property?
-          :contract-property?
-          :contract-struct-exercise
-          :contract-struct-generate
-          :flat-contract-property?
-          :make-chaperone-contract
-          :make-contract
-          :make-flat-contract
-          :prop:chaperone-contract
-          :prop:contract
-          :prop:flat-contract
-          :prop:opt-chaperone-contract
-          :prop:opt-chaperone-contract-get-test
-          :prop:opt-chaperone-contract?
-          :skip-projection-wrapper?
-          :opt/c
-          :define-opt/c))
-(provide 
- (rename-out [:or/c union])
- (rename-out [:string-len/c string/len]))
-
-(define (build-flat-contract name pred) 
-  (:flat-contract (procedure-rename pred name)))
-(provide build-flat-contract)
-
-(require racket/contract/combinator)
-;; exports from racket/contract/combinator as of 5.3.5
-(provide blame-add-unknown-context blame-context blame-contract blame-fmt->-string blame-negative
-         blame-original? blame-positive blame-replace-negative blame-source blame-swap blame-swapped?
-         blame-update blame-value blame? build-chaperone-contract-property build-compound-type-name 
-         build-contract-property build-flat-contract-property chaperone-contract-property? 
-         coerce-chaperone-contract coerce-chaperone-contracts coerce-contract coerce-contract/f
-         coerce-contracts coerce-flat-contract coerce-flat-contracts contract-first-order
-         contract-first-order-passes? contract-property? contract-stronger? contract-struct-exercise
-         contract-struct-generate current-blame-format eq-contract-val eq-contract? equal-contract-val
-         equal-contract? exn:fail:contract:blame-object exn:fail:contract:blame? 
-         flat-contract-property? impersonator-prop:contracted make-chaperone-contract make-contract
-         make-exn:fail:contract:blame make-flat-contract prop:chaperone-contract prop:contract
-         prop:contracted prop:flat-contract prop:opt-chaperone-contract
-         prop:opt-chaperone-contract-get-test prop:opt-chaperone-contract? raise-blame-error
-         skip-projection-wrapper? struct:exn:fail:contract:blame define/final-prop 
-         exn:fail:contract:blame blame-add-context define/subexpression-pos-prop)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/control.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/control.rkt
deleted file mode 100644
index 44b48c6ada..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/control.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see `racket/control`
-
-(require racket/control)
-(provide (all-from-out racket/control))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/date.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/date.rkt
deleted file mode 100644
index 558aea2485..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/date.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see `racket/date`
-
-(require racket/date)
-(provide (all-from-out racket/date))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/deflate.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/deflate.rkt
deleted file mode 100644
index 31d33e2f17..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/deflate.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see `file/gzip`
-
-(require file/gzip)
-(provide (all-from-out file/gzip))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/defmacro.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/defmacro.rkt
deleted file mode 100644
index aed326c8e9..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/defmacro.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see compatibility/defmacro
-;;
-;; for legacy use only
-
-(require compatibility/defmacro)
-(provide (all-from-out compatibility/defmacro))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/etc.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/etc.rkt
deleted file mode 100644
index 328ef6d575..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/etc.rkt
+++ /dev/null
@@ -1,309 +0,0 @@
-#lang mzscheme
-(require setup/main-collects
-         racket/local
-         racket/bool
-         racket/block
-         racket/private/this-expression-source-directory
-         (only racket/function
-               identity)
-         (only racket/base
-               build-string
-               build-list
-               build-vector
-               compose)
-         (rename racket/base base-else else))
-
-(require-for-syntax syntax/name
-                    setup/main-collects
-                    "private/stxset.rkt")
-
-(provide boolean=? symbol=?
-         identity
-         compose
-
-         true false
-
-         build-string
-         build-vector
-         build-list
-
-         loop-until
-
-         opt-lambda
-
-         local
-         recur
-         rec
-         evcase
-         nor
-         nand
-         let+
-
-         namespace-defined?
-         this-expression-source-directory
-         this-expression-file-name
-         define-syntax-set
-
-         hash-table
-
-         (rename block begin-with-definitions)
-
-         begin-lifted)
-
-(define (loop-until start done? next body)
-  (let loop ([i start])
-    (unless (done? i)
-      (body i)
-      (loop (next i)))))
-
-(define-syntax (opt-lambda stx)
-  (with-syntax ([name (or (syntax-local-infer-name stx)
-                          (quote-syntax opt-lambda-proc))])
-    (syntax-case stx ()
-      [(_ args body1 body ...)
-       (let ([clauses (let loop ([pre-args null]
-                                 [args (syntax args)]
-                                 [needs-default? #f])
-                        (syntax-case args ()
-                          [id
-                           (identifier? (syntax id))
-                           (with-syntax ([(pre-arg ...) pre-args])
-                             (syntax ([(pre-arg ... . id)
-                                       body1 body ...])))]
-                          [()
-                           (with-syntax ([(pre-arg ...) pre-args])
-                             (syntax ([(pre-arg ...)
-                                       body1 body ...])))]
-                          [(id . rest)
-                           (identifier? (syntax id))
-                           (begin
-                             (when needs-default?
-                               (raise-syntax-error
-                                #f "default value missing" stx (syntax id)))
-                             (loop (append pre-args (list (syntax id)))
-                                   (syntax rest)
-                                   #f))]
-                          [([id default] . rest)
-                           (identifier? (syntax id))
-                           (with-syntax ([rest (loop (append pre-args (list (syntax id)))
-                                                     (syntax rest)
-                                                     #t)]
-                                         [(pre-arg ...) pre-args])
-                             (syntax ([(pre-arg ...) (name pre-arg ... default)]
-                                      . rest)))]
-                          [(bad . rest)
-                           (raise-syntax-error
-                            #f
-                            "not an identifier or identifier with default"
-                            stx
-                            (syntax bad))]
-                          [else
-                           (raise-syntax-error
-                            #f "bad identifier sequence" stx (syntax args))]))])
-         (with-syntax ([clauses clauses])
-           (syntax/loc stx
-             (letrec ([name (case-lambda . clauses)]) name))))])))
-
-;; recur is another name for 'let' in a named let
-(define-syntax (recur stx)
-  (syntax-case stx ()
-    [(_ . rest) (syntax/loc stx (let . rest))]))
-
-;; define a recursive value
-;; implementation by Jens Axel Soegaard
-(define-syntax (rec stx)
-  (syntax-case stx ()
-    [(rec id expr)
-     (identifier? #'id)
-     #`(letrec ((id expr))
-         #,(syntax-property #'id 'inferred-name (syntax-e #'id)))]
-    [(rec (name id ...) body ...)
-     (andmap identifier? (syntax->list #'(name id ...)))
-     #`(letrec ((name (lambda (id ...) body ...)))
-         #,(syntax-property #'name 'inferred-name (syntax-e #'name)))]
-    [(rec (name id ... . did) body ...)
-     (andmap identifier? (syntax->list #'(name did id ...)))
-     #`(letrec ((name (lambda (id ... . did) body ...)))
-         #,(syntax-property #'name 'inferred-name (syntax-e #'name)))]
-    [_
-     (raise-syntax-error
-      #f "expects either an identifier followed by an expresion, or a (possibly dotted) sequence of identifiers followed by a body" stx)]))
-
-(define-syntax (evcase stx)
-  (syntax-case stx ()
-    [(_ val [test body ...] ...)
-     (let ([tests (syntax->list (syntax (test ...)))])
-       (with-syntax ([(a-test ...)
-                      (map (lambda (t)
-                             (syntax-case t (else base-else)
-                               [else (syntax #t)]
-                               [base-else (syntax #t)]
-                               [_else (with-syntax ([t t])
-                                        (syntax (eqv? evcase-v t)))]))
-                           tests)])
-         ;; Make sure else is last:
-         (unless (null? tests)
-           (let loop ([tests tests])
-             (unless (null? (cdr tests))
-               (when (and (identifier? (car tests))
-                          (module-identifier=? (quote-syntax else)
-                                               (car tests)))
-                 (raise-syntax-error
-                  #f "else is not in last clause" stx (car tests)))
-               (loop (cdr tests)))))
-         (syntax/loc stx
-           (let ([evcase-v val])
-             (cond [a-test (begin body ...)]
-                   ...)))))]
-    [(_ val something ...)
-     ;; Provide a good error message:
-     (for-each
-      (lambda (s)
-        (syntax-case s ()
-          [(t a ...) (raise-syntax-error #f "invalid clause" stx s)]))
-      (syntax->list (syntax (something ...))))]))
-
-(define-syntax (let+ stx)
-  (syntax-case stx ()
-    [(_ [clause ...] body1 body ...)
-     (let ([clauses (syntax->list (syntax (clause ...)))]
-           [bad (lambda (c n)
-                  (raise-syntax-error
-                   #f (format "illegal use of ~a for a clause" n) stx c))]
-           [var? (lambda (x)
-                   (or (identifier? x)
-                       (let ([l (syntax->list x)])
-                         (and l
-                              (pair? l)
-                              (eq? (syntax-e (car l)) 'values)
-                              (andmap identifier? (cdr l))))))]
-           [normal-var (lambda (x)
-                         (if (identifier? x)
-                           (list x)
-                           (cdr (syntax-e x))))])
-       ;; syntax checks
-       (for-each
-        (lambda (clause)
-          (syntax-case* clause (val rec vals recs _)
-                        (lambda (a b) (eq? (syntax-e b) (syntax-e a)))
-            [(val var expr)
-             (var? (syntax var))
-             'ok]
-            [(rec var expr)
-             (var? (syntax var))
-             'ok]
-            [(vals (var expr) ...)
-             (andmap var? (syntax->list (syntax (var ...))))
-             'ok]
-            [(recs (var expr) ...)
-             (andmap var? (syntax->list (syntax (var ...))))
-             'ok]
-            [(_ expr0 expr ...)
-             'ok]
-            [(val . __) (bad clause "val")]
-            [(rec . __) (bad clause "rec")]
-            [(vals . __) (bad clause "vals")]
-            [(recs . __) (bad  clause"recs")]
-            [(_ . __) (bad clause "_")]
-            [_else (raise-syntax-error #f "bad clause" stx clause)]))
-        clauses)
-       ;; result
-       (let loop ([clauses clauses])
-         (if (null? clauses)
-           (syntax (let () body1 body ...))
-           (with-syntax ([rest (loop (cdr clauses))])
-             (syntax-case* (car clauses) (val rec vals recs _)
-                           (lambda (a b) (eq? (syntax-e b) (syntax-e a)))
-               [(val var expr)
-                (with-syntax ([vars (normal-var (syntax var))])
-                  (syntax (let-values ([vars expr]) rest)))]
-               [(rec var expr)
-                (with-syntax ([vars (normal-var (syntax var))])
-                  (syntax (letrec-values ([vars expr]) rest)))]
-               [(vals (var expr) ...)
-                (with-syntax ([(vars ...)
-                               (map normal-var
-                                    (syntax->list (syntax (var ...))))])
-                  (syntax (let-values ([vars expr] ...) rest)))]
-               [(recs (var expr) ...)
-                (with-syntax ([(vars ...)
-                               (map normal-var
-                                    (syntax->list (syntax (var ...))))])
-                  (syntax (letrec-values ([vars expr] ...) rest)))]
-               [(_ expr0 expr ...)
-                (syntax (begin expr0 expr ... rest))])))))]))
-
-(define ns-undefined (gensym))
-
-(define (namespace-defined? n)
-  (unless (symbol? n)
-    (raise-argument-error 'namespace-defined? "symbol?" n))
-  (not (eq? (namespace-variable-value n #t (lambda () ns-undefined))
-            ns-undefined)))
-
-(define-syntax (this-expression-file-name stx)
-  (syntax-case stx ()
-    [(_ sub)
-     (let ([stx #'sub])
-       (let* ([f (syntax-source stx)]
-              [f (and f (path? f) (file-exists? f)
-                      (let-values ([(base file dir?) (split-path f)]) file))])
-         (if f
-             (with-syntax ([f (path->bytes f)]) #'(bytes->path f))
-             #'#f)))]
-    [(_) #`(this-expression-file-name #,stx)]))
-
-;; This is a macro-generating macro that wants to expand
-;; expressions used in the generated macro. So it's weird,
-;; and we put much of the work in a helper macro,
-;; `finish-syntax-set'.
-(define-syntax (define-syntax-set stx)
-  (syntax-case stx ()
-    [(_ (id ...) defn ...)
-     (let ([ids (syntax->list (syntax (id ...)))])
-       ;; Check ids ------------------------------
-       (for-each (lambda (id)
-                   (unless (identifier? id)
-                     (raise-syntax-error
-                      #f
-                      "not an identifier or two identifier in parentheses"
-                      stx
-                      id)))
-                 ids)
-       (let ([dup (check-duplicate-identifier ids)])
-         (when dup
-           (raise-syntax-error #f "duplicate identifier" stx dup)))
-
-       ;; We'd like to check the `defns', but that requires
-       ;; and expansion in a different phase. So we move
-       ;; into that phase using `finish-syntax-set':
-       (with-syntax ([orig-stx stx])
-         (syntax/loc stx
-           (define-syntaxes (id ...)
-             (finish-syntax-set orig-stx)))))]))
-
-(define-syntax (hash-table stx)
-  (syntax-case stx (quote)
-    [(_ x ...)
-     (let loop ([xs #'(x ...)] [flags '()])
-       (syntax-case xs (quote)
-         [('flag x ...) (loop #'(x ...) (cons #''flag flags))]
-         [([key val] ...)
-          (with-syntax ([(flag ...) (reverse flags)])
-            (syntax/loc stx
-              (let ([ht (make-hash-table flag ...)])
-                (hash-table-put! ht key val) ...
-                ht)))]
-         [_else (raise-syntax-error 'hash-table "bad syntax" stx)]))]))
-
-(define-syntax (begin-lifted stx)
-  (syntax-case stx ()
-    [(_ expr0 expr ...)
-     (let ([name (syntax-local-name)])
-       (if name
-         (with-syntax ([name name])
-           (syntax-local-lift-expression
-            #'(let ([name (begin expr0 expr ...)])
-                name)))
-         (syntax-local-lift-expression
-          #'(begin expr0 expr ...))))]))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/file.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/file.rkt
deleted file mode 100644
index 40eee70c19..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/file.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-(module file racket/base
-  (require racket/file
-           racket/path
-           (prefix-in mz: (only-in mzscheme 
-                                   open-input-file
-                                   open-output-file)))
-  (provide find-relative-path
-	   explode-path
-	   normalize-path
-	   build-absolute-path
-	   build-relative-path
-	   filename-extension
-	   file-name-from-path
-	   path-only
-	   delete-directory/files
-	   copy-directory/files
-	   make-directory*
-	   make-temporary-file
-	   find-library
-
-	   get-preference
-	   put-preferences
-
-	   (rename-out [-call-with-input-file* call-with-input-file*]
-                       [-call-with-output-file* call-with-output-file*])
-
-	   fold-files
-	   find-files
-	   pathlist-closure)
-
-  (define (build-relative-path p . args)
-    (if (relative-path? p)
-      (apply build-path p args)
-      (error 'build-relative-path "base path ~s is absolute" p)))
-
-  (define (build-absolute-path p . args)
-    (if (relative-path? p)
-      (error 'build-absolute-path "base path ~s is relative" p)
-      (apply build-path p args)))
-
-  (define (find-library name . cp)
-    (apply collection-file-path name cp))
-
-  (define (-call-with-input-file* file thunk . flags)
-    (let ([p (apply mz:open-input-file file flags)])
-      (dynamic-wind
-        void
-        (lambda () (thunk p))
-        (lambda () (close-input-port p)))))
-
-  (define (-call-with-output-file* file thunk . flags)
-    (let ([p (apply mz:open-output-file file flags)])
-      (dynamic-wind
-        void
-        (lambda () (thunk p))
-        (lambda () (close-output-port p))))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/for.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/for.rkt
deleted file mode 100644
index c41ea2e6b7..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/for.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-(module for racket/base
-  (provide for/fold for*/fold
-           for for*
-           for/list for*/list
-           for/lists for*/lists
-           for/and for*/and
-           for/or for*/or
-           for/first for*/first
-           for/last for*/last
-
-           for/fold/derived for*/fold/derived
-           
-           in-range
-           in-naturals
-           in-list
-           in-vector
-           in-string
-           in-bytes
-           in-input-port-bytes
-           in-input-port-chars
-           (rename-out [in-hash in-hash-table]
-                       [in-hash-keys in-hash-table-keys]
-                       [in-hash-values in-hash-table-values]
-                       [in-hash-pairs in-hash-table-pairs])
-           
-           in-parallel
-           stop-before
-           stop-after
-           in-indexed
-           
-           sequence?
-           sequence-generate
-           
-           define-sequence-syntax
-           make-do-sequence
-           :do-in))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/foreign.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/foreign.rkt
deleted file mode 100644
index e1f021cae8..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/foreign.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-(module foreign racket/base
-  (require scheme/foreign)
-  (provide (all-from-out scheme/foreign)))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/include.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/include.rkt
deleted file mode 100644
index 37618216ad..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/include.rkt
+++ /dev/null
@@ -1,220 +0,0 @@
-
-(module include mzscheme
-  (require-for-syntax syntax/stx
-		      racket/private/increader
-		      "cm-accomplice.rkt")
-  (require mzlib/etc)
-
-  (define-for-syntax (resolve-path-spec fn loc stx build-path-stx)
-    (let ([file
-	   (syntax-case* fn (lib) module-or-top-identifier=?
-	     [_
-	      (string? (syntax-e fn))
-	      (let ([s (syntax-e fn)])
-		(unless (or (relative-path? s)
-			    (absolute-path? s))
-		  (raise-syntax-error
-		   #f
-		   "bad pathname string"
-		   stx
-		   fn))
-		(string->path s))]
-	     [(-build-path elem ...)
-              (begin
-                (collect-garbage)
-                (module-identifier=? #'-build-path build-path-stx)
-                (module-or-top-identifier=? #'-build-path build-path-stx))
-	      (let ([l (syntax-object->datum (syntax (elem ...)))])
-		(when (null? l)
-		  (raise-syntax-error
-		   #f
-		   "`build-path' keyword is not followed by at least one string"
-		   stx
-		   fn))
-		(apply build-path l))]
-	     [(lib filename ...)
-	      (let ([l (syntax-object->datum (syntax (filename ...)))])
-		(unless (or (andmap string? l)
-			    (pair? l))
-		  (raise-syntax-error
-		   #f
-		   "`lib' keyword is not followed by a sequence of string datums"
-		   stx
-		   fn))
-                (apply collection-file-path
-                       (car l)
-                       (if (null? (cdr l))
-                           (list "mzlib")
-                           (cdr l))))]
-	     [else
-	      (raise-syntax-error
-	       #f
-	       "not a pathname string, `build-path' form, or `lib' form for file"
-	       stx
-	       fn)])])
-      (if (complete-path? file)
-	  file
-	  (path->complete-path
-	   file
-	   (cond
-	    ;; Src of include expression is a path?
-	    [(and (path? (syntax-source loc))
-		  (complete-path? (syntax-source loc)))
-	     (let-values ([(base name dir?) 
-			   (split-path (syntax-source loc))])
-	       (if dir?
-		   (syntax-source loc)
-		   base))]
-	    ;; Load relative?
-	    [(current-load-relative-directory)]
-	    ;; Current directory
-	    [(current-directory)])))))
-
-  (define-syntax-set (do-include ; private
-		      include-at/relative-to
-		      include
-		      include-at/relative-to/reader
-		      include/reader)
-
-    (define (do-include/proc stx)
-      (syntax-case stx ()
-	[(_ orig-stx ctx loc fn reader)
-	 ;; Parse the file name
-	 (let ([orig-c-file (resolve-path-spec (syntax fn) (syntax loc) (syntax orig-stx) #'build-path)]
-	       [ctx (syntax ctx)]
-	       [loc (syntax loc)]
-	       [reader (syntax reader)]
-	       [orig-stx (syntax orig-stx)]
-               [rkt->ss (lambda (p)
-                          (let ([b (path->bytes p)])
-                            (if (regexp-match? #rx#"[.]rkt$" b)
-                                (path-replace-suffix p #".ss")
-                                p)))])
-
-           (let ([c-file (if (file-exists? orig-c-file)
-                             orig-c-file
-                             (let ([p2 (rkt->ss orig-c-file)])
-                               (if (file-exists? p2)
-                                   p2
-                                   orig-c-file)))])
-             (register-external-file c-file)
-
-             (let ([read-syntax (if (syntax-e reader)
-                                    (reader-val
-                                     (let loop ([e (syntax-object->datum
-                                                    (local-expand reader 'expression null))])
-                                       (cond
-                                        [(reader? e) e]
-                                        [(pair? e) (or (loop (car e))
-                                                       (loop (cdr e)))]
-                                        [else #f])))
-                                    read-syntax)])
-               (unless (and (procedure? read-syntax)
-                            (procedure-arity-includes? read-syntax 2))
-                 (raise-syntax-error
-                  #f
-                  "reader is not a procedure of two arguments"
-                  orig-stx))
-
-               ;; Open the included file
-               (let ([p (with-handlers ([exn:fail?
-                                         (lambda (exn)
-                                           (raise-syntax-error
-                                            #f
-                                            (format
-                                             "can't open include file (~a)"
-                                             (if (exn? exn)
-                                                 (exn-message exn)
-                                                 exn))
-                                            orig-stx
-                                            c-file))])
-                          (open-input-file c-file))])
-                 (port-count-lines! p)
-                 ;; Read expressions from file
-                 (let ([content
-                        (let loop ()
-                          (let ([r (with-handlers ([exn:fail?
-                                                    (lambda (exn)
-                                                      (close-input-port p)
-                                                      (raise-syntax-error
-                                                       #f
-                                                       (format
-                                                        "read error (~a)"
-                                                        (if (exn? exn)
-                                                            (exn-message exn)
-                                                            exn))
-                                                       orig-stx))])
-                                     (read-syntax c-file p))])
-                            (if (eof-object? r)
-                                null
-                                (cons r (loop)))))])
-                   (close-input-port p)
-                   ;; Preserve src info for content, but set its
-                   ;; lexical context to be that of the include expression
-                   (let ([lexed-content
-                          (let loop ([content content])
-                            (cond
-                             [(pair? content)
-                              (cons (loop (car content))
-                                    (loop (cdr content)))]
-                             [(null? content) null]
-                             [else
-                              (let ([v (syntax-e content)])
-                                (datum->syntax-object
-                                 ctx
-                                 (cond
-                                  [(pair? v) 
-                                   (loop v)]
-                                  [(vector? v)
-                                   (list->vector (loop (vector->list v)))]
-                                  [(box? v)
-                                   (box (loop (unbox v)))]
-                                  [else
-                                   v])
-                                 content))]))])
-                     (datum->syntax-object
-                      (quote-syntax here)
-                      `(begin ,@lexed-content)
-                      orig-stx)))))))]))
-    
-    (define (include/proc stx)
-      (syntax-case stx ()
-	[(_ fn)
-	 (with-syntax ([_stx stx])
-	   (syntax/loc stx (do-include _stx _stx _stx fn #f)))]))
-
-    (define (include-at/relative-to/proc stx)
-      (syntax-case stx ()
-	[(_ ctx loc fn)
-	 (with-syntax ([_stx stx])
-	   (syntax/loc stx (do-include _stx ctx loc fn #f)))]))
-      
-    (define (include/reader/proc stx)
-      (syntax-case stx ()
-	[(_ fn reader)
-	 ;; Expand to do-include:
-	 (with-syntax ([_stx stx])
-	   (syntax/loc stx 
-	     (do-include _stx _stx _stx fn 
-			 (letrec-syntax ([the-reader (lambda (stx)
-						       (datum->syntax-object
-							#'here
-							(make-reader reader)))])
-			   the-reader))))]))
-    
-    (define (include-at/relative-to/reader/proc stx)
-      (syntax-case stx ()
-	[(_ ctx loc fn reader)
-	 (with-syntax ([_stx stx])
-	   (syntax/loc stx 
-	     (do-include _stx ctx loc fn 
-			 (letrec-syntax ([the-reader (lambda (stx)
-						       (datum->syntax-object
-							#'here
-							(make-reader reader)))])
-			   the-reader))))])))
-  
-  (provide include
-	   include-at/relative-to
-	   include/reader
-	   include-at/relative-to/reader))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/inflate.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/inflate.rkt
deleted file mode 100644
index 1823d67105..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/inflate.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see `file/gunzip`
-
-(require file/gunzip)
-(provide (all-from-out file/gunzip))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/info.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/info.rkt
deleted file mode 100644
index c2091b019f..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define test-responsibles '(("shared.rkt" robby)
-                            ("plt-match.rkt" samth)
-                            ("match.rkt" samth)
-                            ("kw.rkt" eli)
-                            ("foreign.rkt" eli)
-                            ("contract.rkt" robby)))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/integer-set.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/integer-set.rkt
deleted file mode 100644
index 732e3421c7..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/integer-set.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see data/integer-set
-
-(require data/integer-set)
-(provide (except-out (all-from-out data/integer-set)
-                     subtract
-                     symmetric-difference
-                     count)
-         (rename-out [subtract difference]
-                     [symmetric-difference xor]
-                     [count card]))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/kw.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/kw.rkt
deleted file mode 100644
index 014f5969dd..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/kw.rkt
+++ /dev/null
@@ -1,548 +0,0 @@
-(module kw mzscheme
-
-(require-for-syntax syntax/name)
-
-(begin-for-syntax ; -> configuration for lambda/kw
-  ;; must appear at the end, each with exactly one variable
-  (define rest-like-kwds
-    '(#:rest #:body #:all-keys #:other-keys #:other-keys+body))
-  ;; mode keys are in the end, without variable, cannot have contradictions
-  ;; each descriptor for #:allow-kwd and #:forbid-kwd is
-  ;;   (kwd-sym (forcer ...) (enabler ...))
-  ;; `forcer' is a rest-like keyword that forces the mode, `enabler' is a
-  ;; rest-like keyword that makes it on by default
-  (define mode-keyword-specs
-    '((other-keys     (#:other-keys) (#:rest #:all-keys #:other-keys+body))
-      (duplicate-keys ()             (#:rest #:all-keys))
-      (body           (#:body)       (#:rest #:other-keys+body))
-      (anything       ()             ())))
-  ;; precomputed mode keyword stuff
-  (define processed-keyword-specs
-    (map (lambda (ks)
-           (let* ([k (car ks)]
-                  [make (lambda (str)
-                          (string->keyword
-                           (string-append str (symbol->string k))))])
-             (list* k (make "allow-") (make "forbid-") (cdr ks))))
-         mode-keyword-specs))
-  (define mode-keywords
-    (apply append (map (lambda (ks) (list (cadr ks) (caddr ks)))
-                       processed-keyword-specs))))
-
-(define true (list 'true)) ; used for flag values
-
-(provide lambda/kw)
-(define-syntax (lambda/kw stx)
-  ;; --------------------------------------------------------------------------
-  ;; easy syntax errors
-  (define (serror sub fmt . args)
-    (apply raise-syntax-error
-           #f (apply format fmt args) stx (if sub (list sub) '())))
-  ;; contents of syntax
-  (define (syntax-e* x) (if (syntax? x) (syntax-e x) x))
-  ;; turns formals into a syntax list
-  (define (formals->list formals)
-    (syntax-case formals ()
-      [(formal ... . rest)
-       (not (null? (syntax-e #'rest)))
-       ;; dot is exactly like #:rest, but don't allow it with other
-       ;; meta-keywords since its meaning is confusing
-       (let* ([formals (syntax->list #'(formal ...))]
-              [kwd (ormap (lambda (s) (and (keyword? (syntax-e* s)) s))
-                          formals)])
-         (if kwd
-           (serror #'rest "use #:rest or #:body instead of dot notation"
-                   ;; (syntax-e* kwd) <- confusing to show this
-                   )
-           (append formals (list #'#:rest #'rest))))]
-      [(formal ...) (syntax->list formals)]))
-  ;; split a list of syntax objects based on syntax keywords:
-  ;;   (x ... #:k1 ... #:k2 ... ...) --> ((x ...) (#:k1 ...) (#:k2 ...) ...)
-  (define (split-by-keywords xs)
-    (let loop ([xs (if (syntax? xs) (formals->list xs) xs)] [cur '()] [r '()])
-      (if (null? xs)
-        (reverse (cons (reverse cur) r))
-        (let ([x (car xs)])
-          (if (keyword? (syntax-e* x))
-            (loop (cdr xs) (list x) (cons (reverse cur) r))
-            (loop (cdr xs) (cons x cur) r))))))
-  ;; --------------------------------------------------------------------------
-  ;; process an optional argument spec, returns (<id> <default-expr>)
-  (define (process-opt o)
-    (syntax-case o ()
-      [(var default) (identifier? #'var) (list #'var #'default)]
-      [(var) (identifier? #'var) (list #'var #'#f)]
-      [var (identifier? #'var) (list #'var #'#f)]
-      [var (serror #'var "not a valid ~a spec" #:optional)]))
-  ;; --------------------------------------------------------------------------
-  ;; process a key argument spec, returns (<id> <key-stx> <default-expr>)
-  (define (process-key k)
-    (define (key var)
-      (datum->syntax-object
-       k (string->keyword (symbol->string (syntax-e var))) k k))
-    (syntax-case k ()
-      [(var key default)
-       (and (identifier? #'var) (keyword? (syntax-e #'key)))
-       (list #'var #'key #'default)]
-      [(var default) (identifier? #'var) (list #'var (key #'var) #'default)]
-      [(var) (identifier? #'var) (list #'var (key #'var) #'#f)]
-      [var   (identifier? #'var) (list #'var (key #'var) #'#f)]
-      [var (serror #'var "not a valid ~a spec" #:key)]))
-  ;; --------------------------------------------------------------------------
-  ;; process a flag argument spec, returns (<id> <key-stx> <default-expr>)
-  ;; so it can be used like keys
-  (define (process-flag k)
-    (define (key var)
-      (datum->syntax-object
-       k (string->keyword (symbol->string (syntax-e var))) k k))
-    (syntax-case k ()
-      [(var key)
-       (and (identifier? #'var) (keyword? (syntax-e #'key)))
-       (list #'var #'key #'#f)]
-      [(var) (identifier? #'var) (list #'var (key #'var) #'#f)]
-      [var   (identifier? #'var) (list #'var (key #'var) #'#f)]
-      [var (serror #'var "not a valid ~a spec" #:flag)]))
-  ;; --------------------------------------------------------------------------
-  ;; helpers for process-vars
-  (define ((process-mode modes rests) processed-spec)
-    (let ([allow      (memq (cadr processed-spec) modes)]
-          [forbid     (memq (caddr processed-spec) modes)]
-          [allow-any  (memq #:allow-anything modes)]
-          [forbid-any (memq #:forbid-anything modes)])
-      (cond
-       [(and allow forbid)
-        (serror #f "contradicting #:...-~a keywords" (car processed-spec))]
-       [(and forbid allow-any)
-        (serror #f "~a contradicts #:allow-anything" (caddr processed-spec))]
-       [(and allow forbid-any)
-        (serror #f "~a contradicts #:forbid-anything" (cadr processed-spec))]
-       [(ormap (lambda (k) (assq k rests)) (cadddr processed-spec))
-        => ; forced?
-        (lambda (r)
-          (when (or forbid forbid-any)
-            (serror #f "cannot ~s with ~s"
-                    (car (or forbid forbid-any)) (car r)))
-          #t)]
-       [(or allow allow-any) #t]
-       [(or forbid forbid-any) #f]
-       [else (ormap (lambda (k) (and (assq k rests) #t)) ; suggested?
-                    (car (cddddr processed-spec)))])))
-  (define (make-keyword-get-expr key rest default known-vars)
-    ;; expand (for id macros) and check if it's a simple expression, because if
-    ;; it is, evaluation cannot have side-effects and we can use keyword-get*
-    (define default*
-      (local-expand default 'expression (cons #'#%app known-vars)))
-    (define simple?
-      (syntax-case default* (#%datum #%top quote)
-        [(#%datum . _) #t] [(#%top . _) #t] [(quote . _) #t]
-        [_ (identifier? default*)]))
-    (with-syntax ([getter  (if simple? #'keyword-get* #'keyword-get)]
-                  [default (if simple? default* #`(lambda () #,default*))]
-                  [rest rest] [key key])
-      #'(getter rest key default)))
-  ;; --------------------------------------------------------------------------
-  ;; test variables
-  (define (process-vars vars opts keys0 flags rests modes . only-vars?)
-    (define (gensym x)
-      (car (generate-temporaries (list x))))
-    (let*-values
-        ([(only-vars?) (and (pair? only-vars?) (car only-vars?))]
-         [(opts)  (map process-opt opts)]
-         [(keys0) (map process-key keys0)]
-         [(flags) (map process-flag flags)]
-         [(rest body all-keys other-keys other-keys+body)
-          (apply values (map (lambda (k)
-                               (cond [(assq k rests) => cdr] [else #f]))
-                             rest-like-kwds))]
-         [(rest*)       (or rest (gensym #'rest))]
-         [(body*)       (if (and body (identifier? body)) body (gensym #'body))]
-         [(other-keys*) (or other-keys (gensym #'other-keys))]
-         [(other-keys-mode duplicate-keys-mode body-mode anything-mode)
-          (apply values (map (process-mode modes rests)
-                             processed-keyword-specs))]
-         ;; turn (<id> <key> <default>) keys to (<id> <getter>)
-         [(keys)
-          (with-syntax ([rst rest*])
-            (let loop ([ks (append keys0 flags)]  [r '()]
-                       [known-vars (append vars (map car opts))])
-              (if (null? ks)
-                (reverse r)
-                (let ([k (car ks)])
-                  (loop (cdr ks)
-                        (cons (list (car k)
-                                    (make-keyword-get-expr
-                                     (cadr k) rest* (caddr k) known-vars))
-                              r)
-                        (cons (car k) known-vars))))))]
-         [(all-ids)
-          `(,@vars ,@(map car opts) ,@(map car keys) ,rest* ,body*
-            ;; make up names if not specified, to make checking easy
-            ,(or all-keys        (gensym #'all-keys))
-            ,(or other-keys      (gensym #'other-keys))
-            ,(or other-keys+body (gensym #'other-keys+body))
-            ,@(if (and body (not (identifier? body)))
-                (parse-formals body #t) '()))])
-      (cond [only-vars? all-ids]
-            [(ormap (lambda (x) (and (not (identifier? x)) x)) all-ids)
-             => (lambda (d) (serror d "not an identifier"))]
-            [(check-duplicate-identifier all-ids)
-             => (lambda (d) (serror d "duplicate argument name"))]
-            [else (values
-                   vars opts keys (map cadr flags) rest rest* body body*
-                   all-keys other-keys other-keys* other-keys+body
-                   other-keys-mode duplicate-keys-mode body-mode anything-mode
-                   (append (map cadr keys0) (map cadr flags)))])))
-  ;; --------------------------------------------------------------------------
-  ;; parses formals, returns list of normal vars, optional var specs, key var
-  ;; specs, an alist of rest-like kw+vars, and a mode for allowing other keys
-  ;; or not; no duplicate names
-  (define (parse-formals formals . only-vars?)
-    (let* ([formals (split-by-keywords formals)]
-           [vars (car formals)]
-           [formals (cdr formals)]
-           [opts  '()]
-           [keys  '()]
-           [flags '()])
-      (when (and (pair? formals) (eq? #:optional (syntax-e* (caar formals))))
-        (set! opts (cdar formals)) (set! formals (cdr formals)))
-      (let loop ([last #f])
-        (let* ([k-stx (and (pair? formals) (caar formals))]
-               [k     (and k-stx (syntax-e* k-stx))])
-          (when (and k (eq? k last)) (serror k-stx "two ~s sections" k))
-          (case k
-            [(#:key) (set! keys (append keys (cdar formals)))
-             (set! formals (cdr formals)) (loop k)]
-            [(#:flag) (set! flags (append flags (cdar formals)))
-             (set! formals (cdr formals)) (loop k)]
-            #| else continue below |#)))
-      ;; now get all rest-like vars and modes
-      (let loop ([formals formals] [rests '()] [modes '()])
-        (if (null? formals)
-          (apply process-vars vars opts keys flags rests modes only-vars?)
-          (let* ([k-stx (caar formals)]
-                 [k     (syntax-e* k-stx)])
-            (cond [(memq k '(#:optional #:key #:flag))
-                   (serror k-stx "misplaced ~a" k)]
-                  [(memq k mode-keywords)
-                   (cond
-                    #; ;(*)
-                    ;; don't throw an error here, it is still fine if used with
-                    ;; #:allow-other-keys (explicit or implicit), also below
-                    [(and (null? keys) (null? flags))
-                     (serror k-stx "cannot use without #:key/#:flag arguments")]
-                    [(pair? (cdar formals))
-                     (serror (cadar formals)
-                             "identifier following mode keyword ~a" k)]
-                    [else (loop (cdr formals) rests (cons k modes))])]
-                  [(not (memq k rest-like-kwds))
-                   (serror k-stx "unknown meta keyword")]
-                  [(assq k rests)
-                   (serror k-stx "duplicate ~a" k)]
-                  [(null? (cdar formals))
-                   (serror k-stx "missing variable name")]
-                  [(not (null? (cddar formals)))
-                   (serror k-stx "too many variable names")]
-                  #; ;(*)
-                  ;; same as above: don't throw an error here, still fine if
-                  ;; used with #:allow-other-keys (explicit or implicit)
-                  [(and (null? keys) (not (eq? #:rest k)))
-                   (serror k-stx "cannot use without #:key/#:flag arguments")]
-                  [else (loop (cdr formals)
-                              (cons (cons k (cadar formals)) rests)
-                              modes)]))))))
-  ;; --------------------------------------------------------------------------
-  ;; generates the actual body
-  (define (generate-body formals expr)
-    ;; relations:
-    ;;   rest = (append all-keys body)
-    ;;   other-keys+body = (append other-keys body)
-    (define-values (vars        ; plain variables
-                    opts        ; optionals, each is (id default)
-                    keys        ; keywords, each is (id key default)
-                    flags       ; flag keyword syntaxes (args are part of keys)
-                    rest        ; rest variable (no optionals)
-                    rest*       ;   always an id
-                    body        ; rest after all keyword-vals (id or formals)
-                    body*       ;   always an id
-                    all-keys    ; keyword-vals without body
-                    other-keys  ; unprocessed keyword-vals
-                    other-keys* ;   always an id
-                    other-keys+body ; rest without specified keys
-                    allow-other-keys?     ; allowing other keys?
-                    allow-duplicate-keys? ; allowing duplicate keys?
-                    allow-body?           ; allowing body after keys?
-                    allow-anything?       ; allowing anything?
-                    keywords)   ; list of mentioned keywords
-      (parse-formals formals))
-    (define name
-      (or (syntax-local-infer-name stx) (quote-syntax lambda/kw-proc)))
-    ;; ------------------------------------------------------------------------
-    ;; make case-lambda clauses for a procedure with optionals
-    (define (make-opt-clauses expr rest)
-      (let loop ([vars (reverse vars)]
-                 [opts opts]
-                 [clauses '()])
-        (if (null? opts)
-          ;; fast order: first the all-variable section, then from vars up
-          (cons (with-syntax ([vars (append (reverse vars) rest)]
-                              [expr expr])
-                  #'[vars expr])
-                (reverse clauses))
-          (loop (cons (caar opts) vars) (cdr opts)
-                (cons (with-syntax ([(var ...) (reverse vars)]
-                                    [((ovar default) ...) opts]
-                                    [name name])
-                        #'[(var ...)
-                           (let* ([ovar default] ...)
-                             (name var ... ovar ...))])
-                      clauses)))))
-    ;; ------------------------------------------------------------------------
-    ;; generates the part of the body that deals with rest-related stuff
-    (define (make-rest-body expr)
-      (define others?     (or other-keys other-keys+body))
-      (define track-seen? (or others? (not allow-duplicate-keys?)))
-      (with-syntax ([name        name]
-                    [rest*       rest*]
-                    [body*       body*]
-                    [keywords    keywords]
-                    [expr        expr]
-                    [all-keys*   all-keys]
-                    [other-keys* other-keys*]
-                    [other-keys+body* other-keys+body]
-                    [seen-keys   #'seen-keys])
-        (with-syntax
-            ([loop-vars #`([body* rest*]
-                           #,@(if all-keys    #`([all-keys* '()]) '())
-                           #,@(if others?     #`([other-keys* '()]) '())
-                           #,@(if track-seen? #`([seen-keys '()]) '()))]
-             [next-loop
-              (let ([nl #`(loop
-                           (cddr body*)
-                           #,@(if all-keys
-                                #`((list* (cadr body*) (car body*) all-keys*))
-                                '())
-                           #,@(if others?
-                                #`((if (and in-keys? (not in-seen?))
-                                     other-keys*
-                                     (list* (cadr body*) (car body*)
-                                            other-keys*)))
-                                '())
-                           #,@(if track-seen?
-                                #`((if (and in-seen? in-keys?)
-                                     #,(if allow-duplicate-keys?
-                                         #`seen-keys
-                                         #`(error* 'name "duplicate keyword: ~.s"
-                                                   (car body*)))
-                                     (cons (car body*) seen-keys)))
-                                '()))])
-                (cond
-                 [(or track-seen? others?)
-                  #`(let ([in-keys? (memq (car body*) 'keywords)]
-                          [in-seen? (memq (car body*) seen-keys)])
-                      #,(if allow-other-keys?
-                          nl
-                          #`(if in-keys?
-                              #,nl
-                              (error* 'name "unknown keyword: ~.s"
-                                      (car body*)))))]
-                 [(not allow-other-keys?)
-                  #`(if (memq (car body*) 'keywords)
-                      #,nl
-                      (error* 'name "unknown keyword: ~.s"
-                              (car body*)))]
-                 [else nl]))]
-             [expr
-              (if (or all-keys others?)
-                #`(let* (#,@(if all-keys
-                              #'([all-keys* (reverse all-keys*)])
-                              '())
-                         #,@(if others?
-                              #'([other-keys* (reverse other-keys*)])
-                              '())
-                         #,@(cond [(and other-keys other-keys+body)
-                                   #'([other-keys+body*
-                                       (append other-keys* body*)])]
-                                  [other-keys+body ; can destroy other-keys
-                                   #'([other-keys+body*
-                                       (append other-keys* body*)])]
-                                  [else '()]))
-                    expr)
-                #'expr)])
-          (if (and allow-anything? (not body)
-                   (not other-keys+body) (not all-keys) (not other-keys)
-                   (null? flags))
-            ;; allowing anything and don't need special rests, so no loop
-            #'expr
-            ;; normal code
-            #`(let loop loop-vars
-                (if (and (pair? body*) (keyword? (car body*))
-                         #,@(if allow-anything? #'((pair? (cdr body*))) '()))
-                  #,(if allow-anything? ; already checked pair? above
-                      #'next-loop
-                      #'(if (pair? (cdr body*))
-                          next-loop
-                          (error* 'name "keyword list not balanced: ~.s" rest*)))
-                  #,(if allow-body?
-                      (if (and body (not (identifier? body)))
-                        (with-syntax ([name (string->symbol
-                                             (format "~a~~body"
-                                                     (syntax-e* #'name)))])
-                          (with-syntax ([subcall
-                                         (quasisyntax/loc stx
-                                           (let ([name (lambda/kw #,body expr)])
-                                             name))])
-                            #'(apply subcall body*)))
-                        #'expr)
-                      #'(if (null? body*)
-                          expr
-                          (error* 'name "expecting a ~s keyword got: ~.s"
-                                  'keywords (car body*))))))))))
-    ;; ------------------------------------------------------------------------
-    ;; generates the loop that turns flags to #t's
-    (define (make-flags-body) ; called only when there are flags
-      (with-syntax ([flags flags] [rest* rest*])
-        #'(let loop ([xs rest*])
-            (if (and (pair? xs) (keyword? (car xs)))
-                (if (memq (car xs) 'flags)
-                    (if (null? (cdr xs))
-                        (list (car xs) true)
-                        (list* (car xs)
-                               true
-                               (loop (cddr xs))))
-                    (if (pair? (cdr xs))
-                        (list* (car xs)
-                               (cadr xs)
-                               (loop (cddr xs)))
-                        xs))
-                xs))))
-    ;; ------------------------------------------------------------------------
-    ;; generates the part of the body that deals with rest-related stuff
-    (define (make-keys-body expr)
-      (let ([kb (with-syntax ([body (make-rest-body expr)] [keys keys])
-                  #'(let* keys body))])
-        (if (null? flags)
-          kb
-          (with-syntax ([keys-body kb] [flag-tweaks (make-flags-body)] [rest* rest*])
-            #'(let ([rest* flag-tweaks]) keys-body)))))
-    ;; ------------------------------------------------------------------------
-    ;; more sanity tests (see commented code above -- search for "(*)")
-    (when (null? keys)
-      (let ([r (or all-keys other-keys other-keys+body body rest)])
-        (if allow-other-keys?
-          ;; allow-other-keys? ==>
-          (unless r
-            (serror #f "cannout allow other keys ~a"
-                    "without using them in some way"))
-          ;; (not allow-other-keys?) ==>
-          (begin
-            ;; can use #:body with no keys to forbid all keywords
-            (when (and r (not (eq? r body)))
-              (serror r "cannot use without #:key, #:flag, or ~a"
-                      "#:allow-other-keys"))
-            (when allow-duplicate-keys?
-              (serror #f "cannot allow duplicate keys without ~a"
-                      "#:key, #:flag, or #:allow-other-keys"))))))
-    ;; ------------------------------------------------------------------------
-    ;; body generation starts here
-    (cond
-     ;; no optionals or keys (or other-keys) => plain lambda
-     [(and (null? opts) (null? keys) (not allow-other-keys?))
-      (if (not body)
-        ;; really just a plain lambda
-        (with-syntax ([vars (append vars (or rest '()))] [expr expr])
-          (syntax/loc stx (lambda vars expr)))
-        ;; has body => forbid keywords
-        (with-syntax ([vars (append vars body)] [expr expr] [body body])
-          (syntax/loc stx
-            (lambda vars
-              (if (and (pair? body) (keyword? (car body)))
-                (error* 'name "unknown keyword: ~.s" (car body))
-                expr)))))]
-     ;; no keys => make a case-lambda for optionals
-     [(and (null? keys) (not (or body allow-other-keys?)))
-      ;; cannot write a special case for having `body' here, because it
-      ;; requires the special pop-non-keywords-for-optionals that is done
-      ;; below, and generalizing that is a hassle with little benefit
-      (let ([clauses (make-opt-clauses expr (or rest '()))])
-        (with-syntax ([name name] [clauses clauses])
-          (syntax/loc stx (letrec ([name (case-lambda . clauses)]) name))))]
-     ;; no opts => normal processing of keywords etc
-     [(null? opts)
-      (with-syntax ([vars (append vars rest*)]
-                    [body (make-keys-body expr)])
-        (syntax/loc stx (lambda vars body)))]
-     ;; both opts and keys => combine the above two
-     ;; (the problem with this is that things that follow the required
-     ;; arguments are always taken as optionals, even if they're keywords, so
-     ;; the next piece of code is used.)
-     #;
-     [else
-      (let ([clauses (make-opt-clauses (make-keys-body expr) rest*)])
-        (with-syntax ([name name] [clauses clauses])
-          (syntax/loc stx (letrec ([name (case-lambda . clauses)]) name))))]
-     ;; both opts and keys => pop optionals as long as they're not keywords
-     [else
-      (with-syntax
-          ([rest rest*]
-           [vars (append vars rest*)]
-           [body (make-keys-body expr)]
-           [((optvar optexpr) ...)
-            (apply append
-                   (map (lambda (opt)
-                          (with-syntax ([(ovar odef) opt] [rest rest*])
-                            (list #'[otmp (if (null? rest)
-                                            #t (keyword? (car rest)))]
-                                  #'[ovar (if otmp odef (car rest))]
-                                  #'[rest (if otmp rest (cdr rest))])))
-                        opts))])
-        (syntax/loc stx (lambda vars (let* ([optvar optexpr] ...) body))))]))
-  (syntax-case stx ()
-    [(_ formals expr0 expr ...)
-     ;; check if there are only identifiers, and save the whole mess if so
-     (if (let loop ([xs #'formals])
-           (cond [(syntax? xs) (loop (syntax-e xs))]
-                 [(symbol? xs) #t]
-                 [(null? xs)   #t]
-                 [(not (pair? xs)) #f]
-                 [(symbol? (if (syntax? (car xs)) (syntax-e (car xs)) (car xs)))
-                  (loop (cdr xs))]
-                 [else #f]))
-       #'(lambda formals expr0 expr ...)
-       (generate-body #'formals #'(let () expr0 expr ...)))]))
-
-(provide define/kw)
-(define-syntax (define/kw stx)
-  (syntax-case stx ()
-    [(_ name val) (identifier? #'name) #'(define name val)]
-    [(d/kw (name . args) body0 body ...)
-     (syntax/loc stx (d/kw name (lambda/kw args body0 body ...)))]))
-
-;; raise an appropriate exception
-(define (error* who fmt . args)
-  (raise (make-exn:fail:contract
-          (apply format (string-append "~a: " fmt) who args)
-          (current-continuation-marks))))
-
-;; keyword searching utility (note: no errors for odd length)
-(provide keyword-get)
-(define keyword-get
-  (case-lambda
-   [(args keyword not-found)
-    (let loop ([args args])
-      (cond [(or (null? args) (null? (cdr args)) (not (keyword? (car args))))
-             (not-found)]
-            [(eq? (car args) keyword) (cadr args)]
-            [else (loop (cddr args))]))]
-   ;; the following makes another function call, but the code that is generated
-   ;; by this module never gets here
-   [(args keyword) (keyword-get* args keyword #f)]))
-
-;; a private version of keyword-get that is used with simple values
-(define (keyword-get* args keyword not-found)
-  (let loop ([args args])
-    (cond [(or (null? args) (null? (cdr args)) (not (keyword? (car args))))
-           not-found]
-          [(eq? (car args) keyword) (cadr args)]
-          [else (loop (cddr args))])))
-
-)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/list.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/list.rkt
deleted file mode 100644
index 3bae96662d..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/list.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang racket/base
-
-;; The `first', etc. operations in this library
-;;  work on pairs, not lists.
-
-(require (only-in racket/list
-                  cons?
-                  empty?
-                  empty
-                  last-pair))
-
-(provide first
-         second
-         third
-         fourth
-         fifth
-         sixth
-         seventh
-         eighth
-
-         rest
-
-         cons?
-         empty
-         empty?
-
-         foldl
-         foldr
-
-         last-pair
-
-         remv
-         remq
-         remove
-         remv*
-         remq*
-         remove*
-
-         assf
-         memf
-         findf
-
-         filter
-
-         quicksort ; deprecated
-         mergesort ; deprecated
-         sort
-         merge-sorted-lists)
-
-;; a non-destructive version for symmetry with merge-sorted-lists!
-(define (merge-sorted-lists a b less?)
-  (cond [(null? a) b]
-        [(null? b) a]
-        [else (let loop ([x (car a)] [a (cdr a)] [y (car b)] [b (cdr b)])
-                ;; The loop handles the merging of non-empty lists.  It has
-                ;; been written this way to save testing and car/cdring.
-                (if (less? y x)
-                  (if (null? b)
-                    (list* y x a)
-                    (cons y (loop x a (car b) (cdr b))))
-                  ;; x <= y
-                  (if (null? a)
-                    (list* x y b)
-                    (cons x (loop (car a) (cdr a) y b)))))]))
-
-;; deprecated!
-(define quicksort sort)
-(define mergesort sort)
-
-(define (first x)
-  (unless (pair? x) (raise-type-error 'first "non-empty list" x))
-  (car x))
-(define-syntax define-lgetter
-  (syntax-rules ()
-    [(_ name npos)
-     (define (name l0)
-       (let loop ([l l0] [pos npos])
-         (if (pair? l)
-           (if (eq? pos 1) (car l) (loop (cdr l) (sub1 pos)))
-           (raise-type-error
-            'name (format "list with ~a or more items" npos) l0))))]))
-(define-lgetter second  2)
-(define-lgetter third   3)
-(define-lgetter fourth  4)
-(define-lgetter fifth   5)
-(define-lgetter sixth   6)
-(define-lgetter seventh 7)
-(define-lgetter eighth  8)
-
-(define (rest x)
-  (unless (pair? x)
-    (raise-type-error 'rest "non-empty list" x))
-  (cdr x))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/match.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/match.rkt
deleted file mode 100644
index 8362e9a912..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/match.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require racket/match/legacy-match)
-(provide (all-from-out racket/match/legacy-match))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/math.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/math.rkt
deleted file mode 100644
index bfc1841752..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/math.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-(module math racket/base
-  (require racket/math)
-  (provide (all-from-out racket/math)
-           e)
-  (define e (exp 1.0)))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/md5.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/md5.rkt
deleted file mode 100644
index 8a82a112d1..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/md5.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require file/md5)
-(provide (all-from-out file/md5))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/os.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/os.rkt
deleted file mode 100644
index 7e0a6d19a4..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/os.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang mzscheme
-
-(require mzlib/etc 
-	 ffi/unsafe 
-	 ffi/cvector
-	 ffi/winapi)
-
-(define kernel32
-  (delay (and (eq? 'windows (system-type)) (ffi-lib "kernel32"))))
-
-(define (delay-ffi-obj name lib type)
-  (delay (get-ffi-obj name lib type)))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; gethostbyname
-
-(define BUFFER-SIZE 1024)
-(define (extract-terminated-string proc)
-  (let ([s (make-bytes BUFFER-SIZE)])
-    (if (proc s BUFFER-SIZE)
-      (bytes->string/utf-8 (car (regexp-match #rx#"^[^\0]*" s)))
-      (error 'gethostname "could not get hostname"))))
-
-(define unix-gethostname
-  (delay-ffi-obj "gethostname" #f (_fun _bytes _int -> _int)))
-
-(define windows-getcomputername
-  (delay-ffi-obj "GetComputerNameExA" (force kernel32)
-                 (_fun #:abi winapi _int _bytes _cvector -> _int)))
-
-(define (gethostname)
-  (case (system-type)
-    [(unix macosx)
-     (let ([ghn (force unix-gethostname)])
-       (extract-terminated-string (lambda (s sz) (zero? (ghn s sz)))))]
-    [(windows)
-     (let ([gcn (force windows-getcomputername)]
-           [DNS_FULLY_QUALIFIED 3])
-       (extract-terminated-string
-        (lambda (s sz)
-          (let ([sz_ptr (cvector _int sz)])
-            (and (not (zero? (gcn DNS_FULLY_QUALIFIED s sz_ptr)))
-                 (let ([sz (cvector-ref sz_ptr 0)])
-                   (when (sz . < . (bytes-length s)) (bytes-set! s sz 0))
-                   #t))))))]
-    [else #f]))
-
-(provide gethostname)
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; getpid
-
-(define unix-getpid
-  (delay-ffi-obj "getpid" #f (_fun -> _int)))
-
-(define windows-getpid
-  (delay-ffi-obj "GetCurrentProcessId" (force kernel32)
-                 (_fun #:abi 'stdcall -> _int)))
-
-(define (getpid)
-  ((force (case (system-type)
-            [(macosx unix) unix-getpid]
-            [(windows) windows-getpid]
-            [else (error 'getpid "unknown platform ~e" (system-type))]))))
-
-(provide getpid)
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; truncate-file
-
-;; truncate-file : path int -> void
-(define truncate-file
-  (opt-lambda (file [size 0])
-    (when (not (path-string? file))
-      (error 'truncate-file
-             "expects argument of type <string> or <path>; given ~s" file))
-    (when (not (integer? size))
-      (error 'truncate-file
-             "expects argument of type <integer>; given ~s" size))
-    (let ([c (make-custodian)]) ; avoid leaks on errors
-      (dynamic-wind
-          void
-          (lambda ()
-            (define out (open-output-file file 'update))
-            (file-truncate out size))
-          (lambda ()
-            (custodian-shutdown-all c))))))
-
-(provide truncate-file)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/plt-match.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/plt-match.rkt
deleted file mode 100644
index 6814849d7c..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/plt-match.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require racket/match/match)
-(provide (all-from-out racket/match/match))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/port.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/port.rkt
deleted file mode 100644
index 73c8ee93fa..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/port.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see `racket/port`
-
-(require racket/port)
-(provide ;; these are the functions that used to be defined in
-         ;; `mzlib/port` but are now defined in `racket/port`
-         open-output-nowhere
-         make-pipe-with-specials
-         make-input-port/read-to-peek
-         peeking-input-port
-         relocate-input-port
-         transplant-input-port
-         filter-read-input-port
-         special-filter-input-port
-         relocate-output-port
-         transplant-output-port
-         merge-input
-         copy-port
-         input-port-append
-         convert-stream
-         make-limited-input-port
-         reencode-input-port
-         reencode-output-port
-         dup-input-port
-         dup-output-port
-
-         read-bytes-avail!-evt
-         peek-bytes-avail!-evt
-         read-bytes!-evt
-         peek-bytes!-evt
-         read-bytes-evt
-         peek-bytes-evt
-         read-string!-evt
-         peek-string!-evt 
-         read-string-evt
-         peek-string-evt
-         regexp-match-evt
-         read-bytes-line-evt
-         read-line-evt
-         eof-evt
-
-         ;; defined here and not in racket/port
-         strip-shell-command-start)
-
-;; ----------------------------------------
-
-(define (strip-shell-command-start in)
-  (when (regexp-match-peek #rx#"^#![^\r\n]*" in)
-    (let loop ([s (read-line in)])
-      (when (regexp-match #rx#"\\\\$" s)
-        (loop (read-line in))))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/pregexp.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/pregexp.rkt
deleted file mode 100644
index 25dae13d62..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/pregexp.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-;; pregexp.rkt
-;; Originally:
-;;   ;Portable regular expressions for Scheme
-;;   ;Dorai Sitaram
-;;   ;http://www.ccs.neu.edu/~dorai/pregexp/pregexp.html
-;; but `pregexp' functionality is now built into Racket, so
-;; this is mostly a wrapper module.
-
-(module pregexp mzscheme
-  (require (only racket/base regexp-quote regexp-split)
-	   mzlib/kw)
-  (provide pregexp
-	   pregexp-match-positions
-	   pregexp-match
-	   pregexp-split
-	   pregexp-replace
-	   pregexp-replace*
-	   (rename regexp-quote pregexp-quote))
-
-  (define (pattern->pregexp who pattern)
-    (cond
-     [(bytes? pattern) (byte-pregexp pattern)]
-     [(string? pattern) (pregexp pattern)]
-     [(regexp? pattern) pattern]
-     [(byte-regexp? pattern) pattern]
-     [else (raise-argument-error who "(or/c regexp? byte-regexp? string? bytes?)"
-			     pattern)]))
-
-  (define/kw (pregexp-match pattern input #:optional [start-k 0] [end-k #f] [output-port #f])
-    (let ([pattern (pattern->pregexp 'pregexp-match pattern)])
-      (regexp-match pattern input start-k end-k output-port)))
-
-  (define/kw (pregexp-match-positions pattern input #:optional [start-k 0] [end-k #f] [output-port #f])
-    (let ([pattern (pattern->pregexp 'pregexp-match-positions pattern)])
-      (regexp-match-positions pattern input start-k end-k output-port)))
-  
-  (define/kw (pregexp-split pattern string #:optional [start 0] [end #f])
-    (let ([pattern (pattern->pregexp 'pregexp-split pattern)])
-      (regexp-split pattern string start end)))
-
-  (define/kw (pregexp-replace pattern input insert)
-    (let ([pattern (pattern->pregexp 'regexp-replace pattern)])
-      (regexp-replace pattern input insert)))
-
-  (define/kw (pregexp-replace* pattern input insert)
-    (let ([pattern (pattern->pregexp 'regexp-replace* pattern)])
-      (regexp-replace* pattern input insert))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/pretty.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/pretty.rkt
deleted file mode 100644
index c62b682d63..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/pretty.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-(module pretty racket/base
-  (require scheme/pretty)
-  (provide (all-from-out scheme/pretty)))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arr-checks.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arr-checks.rkt
deleted file mode 100644
index 5a7ebe8afe..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arr-checks.rkt
+++ /dev/null
@@ -1,209 +0,0 @@
-#lang racket/base
-
-(provide (all-defined-out))
-(require racket/contract/private/blame
-         racket/contract/private/misc)
-
-(define empty-case-lambda/c
-  (flat-named-contract '(case->)
-                       (λ (x) (and (procedure? x) (null? (procedure-arity x))))))
-
-;; ----------------------------------------
-;; Checks and error functions used in macro expansions
-
-;; procedure-accepts-and-more? : procedure number -> boolean
-;; returns #t if val accepts dom-length arguments and
-;; any number of arguments more than dom-length. 
-;; returns #f otherwise.
-(define (procedure-accepts-and-more? val dom-length)
-  (let ([arity (procedure-arity val)])
-    (cond
-      [(number? arity) #f]
-      [(arity-at-least? arity)
-       (<= (arity-at-least-value arity) dom-length)]
-      [else
-       (let ([min-at-least (let loop ([ars arity]
-                                      [acc #f])
-                             (cond
-                               [(null? ars) acc]
-                               [else (let ([ar (car ars)])
-                                       (cond
-                                         [(arity-at-least? ar)
-                                          (if (and acc
-                                                   (< acc (arity-at-least-value ar)))
-                                              (loop (cdr ars) acc)
-                                              (loop (cdr ars) (arity-at-least-value ar)))]
-                                         [(number? ar)
-                                          (loop (cdr ars) acc)]))]))])
-         (and min-at-least
-              (begin
-                (let loop ([counts (sort (filter number? arity) >=)])
-                  (unless (null? counts)
-                    (let ([count (car counts)])
-                      (cond
-                        [(= (+ count 1) min-at-least)
-                         (set! min-at-least count)
-                         (loop (cdr counts))]
-                        [(< count min-at-least)
-                         (void)]
-                        [else (loop (cdr counts))]))))
-                (<= min-at-least dom-length))))])))
-
-(define (check->* f arity-count)
-  (unless (procedure? f)
-    (error 'object-contract "expected last argument of ->d* to be a procedure, got ~e" f))
-  (unless (and (procedure-arity-includes? f arity-count)
-               (no-mandatory-keywords? f))
-    (error 'object-contract 
-           "expected last argument of ->d* to be a procedure that accepts ~a arguments, got ~e"
-           arity-count
-           f)))
-
-(define (get-mandatory-keywords f)
-  (let-values ([(mandatory optional) (procedure-keywords f)])
-    mandatory))
-
-(define (no-mandatory-keywords? f)
-  (let-values ([(mandatory optional) (procedure-keywords f)])
-    (null? mandatory)))
-
-(define (check->*/more f arity-count)
-  (unless (procedure? f)
-    (error 'object-contract "expected last argument of ->d* to be a procedure, got ~e" f))
-  (unless (procedure-accepts-and-more? f arity-count)
-    (error 'object-contract 
-           "expected last argument of ->d* to be a procedure that accepts ~a argument~a and arbitrarily many more, got ~e"
-           arity-count
-           (if (= 1 arity-count) "" "s")
-           f)))
-
-
-(define (check-pre-expr->pp/h val pre-expr blame)
-  (unless pre-expr
-    (raise-blame-error blame val "pre-condition expression failure")))
-
-(define (check-post-expr->pp/h val post-expr blame)
-  (unless post-expr
-    (raise-blame-error blame val "post-condition expression failure")))
-
-(define (check-procedure val dom-length optionals mandatory-kwds optional-keywords blame)
-  (unless (and (procedure? val)
-               (procedure-arity-includes?/optionals val dom-length optionals)
-               (keywords-match mandatory-kwds optional-keywords val))
-    (raise-blame-error
-     blame
-     val
-     "expected a procedure that accepts ~a arguments~a, given: ~e"
-     dom-length
-     (keyword-error-text mandatory-kwds)
-     val)))
-
-(define (procedure-arity-includes?/optionals f base optionals)
-  (cond
-    [(zero? optionals) (procedure-arity-includes? f base)]
-    [else (and (procedure-arity-includes? f (+ base optionals))
-               (procedure-arity-includes?/optionals f base (- optionals 1)))]))
-
-(define (keywords-match mandatory-kwds optional-kwds val)
-  (let-values ([(proc-mandatory proc-all) (procedure-keywords val)])
-    (and (equal? proc-mandatory mandatory-kwds)
-         (andmap (λ (kwd) (and (member kwd proc-all)
-                               (not (member kwd proc-mandatory))))
-                 optional-kwds))))
-
-(define (keyword-error-text mandatory-keywords)
-  (cond
-    [(null? mandatory-keywords) " without any keywords"]
-    [(null? (cdr mandatory-keywords))
-     (format " and the keyword ~a" (car mandatory-keywords))]
-    [else
-     (format
-      " and the keywords ~a~a"
-      (car mandatory-keywords)
-      (apply string-append (map (λ (x) (format " ~a" x)) (cdr mandatory-keywords))))]))
-
-(define ((check-procedure? arity) val)
-  (and (procedure? val)
-       (procedure-arity-includes? val arity)
-       (no-mandatory-keywords? val)))
-
-(define ((check-procedure/more? arity) val)
-  (and (procedure? val)
-       (procedure-accepts-and-more? val arity)))
-
-(define (check-procedure/kind val arity kind-of-thing blame)
-  (unless (procedure? val)
-    (raise-blame-error blame val "expected a procedure, got ~e" val))
-  (unless (procedure-arity-includes? val arity)
-    (raise-blame-error blame
-                       val
-                       "expected a ~a of arity ~a (not arity ~a), got  ~e"
-                       kind-of-thing
-                       arity
-                       (procedure-arity val)
-                       val)))
-
-(define (check-procedure/more/kind val arity kind-of-thing blame)
-  (unless (procedure? val)
-    (raise-blame-error blame val "expected a procedure, got ~e" val))
-  (unless (procedure-accepts-and-more? val arity)
-    (raise-blame-error blame
-                       val
-                       "expected a ~a that accepts ~a arguments and aribtrarily more (not arity ~a), got  ~e"
-                       kind-of-thing
-                       arity
-                       (procedure-arity val)
-                       val)))
-
-(define (check-procedure/more val dom-length mandatory-kwds optional-kwds blame)
-  (unless (and (procedure? val)
-               (procedure-accepts-and-more? val dom-length)
-               (keywords-match mandatory-kwds optional-kwds val))
-    (raise-blame-error
-     blame
-     val
-     "expected a procedure that accepts ~a arguments and arbitrarily more~a, given: ~e"
-     dom-length
-     (keyword-error-text mandatory-kwds)
-     val)))
-
-
-(define (check-rng-procedure who rng-x arity)
-  (unless (and (procedure? rng-x)
-               (procedure-arity-includes? rng-x arity))
-    (error who "expected range position to be a procedure that accepts ~a arguments, given: ~e"
-           arity
-           rng-x)))
-
-(define (check-rng-procedure/more rng-mk-x arity)
-  (unless (and (procedure? rng-mk-x)
-               (procedure-accepts-and-more? rng-mk-x arity))
-    (error '->d* "expected range position to be a procedure that accepts ~a arguments and arbitrarily many more, given: ~e"
-           arity 
-           rng-mk-x)))
-
-(define (check-rng-lengths results rng-contracts)
-  (unless (= (length results) (length rng-contracts))
-    (error '->d* 
-           "expected range contract contructor and function to have the same number of values, given: ~a and ~a respectively" 
-           (length results) (length rng-contracts))))
-
-#|
-
-  test cases for procedure-accepts-and-more?
-
-  (and (procedure-accepts-and-more? (lambda (x . y) 1) 3)
-       (procedure-accepts-and-more? (lambda (x . y) 1) 2)
-       (procedure-accepts-and-more? (lambda (x . y) 1) 1)
-       (not (procedure-accepts-and-more? (lambda (x . y) 1) 0))
-       
-       (procedure-accepts-and-more? (case-lambda [(x . y) 1] [(y) 1]) 3)
-       (procedure-accepts-and-more? (case-lambda [(x . y) 1] [(y) 1]) 2)
-       (procedure-accepts-and-more? (case-lambda [(x . y) 1] [(y) 1]) 1)
-       (not (procedure-accepts-and-more? (case-lambda [(x . y) 1] [(y) 1]) 0))
-       
-       (procedure-accepts-and-more? (case-lambda [(x y . z) 1] [(x) 1]) 2)
-       (procedure-accepts-and-more? (case-lambda [(x y . z) 1] [(x) 1]) 1)
-       (not (procedure-accepts-and-more? (case-lambda [(x y . z) 1] [(x) 1]) 0)))
-  
-  |#
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arr-obj-helpers.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arr-obj-helpers.rkt
deleted file mode 100644
index 12a1abc7b4..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arr-obj-helpers.rkt
+++ /dev/null
@@ -1,1115 +0,0 @@
-#lang racket/base
-(require syntax/stx 
-         syntax/name)
-
-(require (for-syntax racket/base))
-(require (for-template racket/base)
-         (for-template racket/contract/private/guts
-                       racket/contract/private/misc
-                       racket/contract/private/prop
-                       racket/contract/private/blame)
-         (for-template "contract-arr-checks.rkt"))
-
-(provide make-/proc ->/h ->*/h ->d/h ->d*/h ->r/h 
-         ->pp/h ->pp-rest/h 
-         make-case->/proc 
-         make-opt->/proc make-opt->*/proc)
-
-;; make-/proc : boolean
-;;              (syntax -> (values (syntax -> syntax) (syntax -> syntax) (syntax -> syntax) (syntax -> syntax))) 
-;;              syntax
-;;           -> (syntax -> syntax)
-(define (make-/proc method-proc? /h stx)
-  (let-values ([(arguments-check build-proj check-val first-order-check wrapper)
-                (/h method-proc? stx)])
-    (let ([outer-args (syntax (val blame name-id))])
-      (with-syntax ([inner-check (check-val outer-args)]
-                    [(val blame name-id) outer-args]
-                    [(val-args body) (wrapper outer-args)])
-        (with-syntax ([inner-lambda
-                       (set-inferred-name-from
-                        stx
-                        (syntax/loc stx (lambda val-args body)))])
-          (let ([inner-lambda
-                 (syntax
-                  (lambda (val)
-                    inner-check
-                    inner-lambda))])
-            (with-syntax ([proj-code (build-proj outer-args inner-lambda)]
-                          [first-order-check first-order-check])
-              (arguments-check
-               outer-args
-               (syntax/loc stx
-                 (make-contract
-                  #:name name-id
-                  #:projection (lambda (blame) proj-code)
-                  #:first-order first-order-check))))))))))
-
-(define (make-case->/proc method-proc? stx inferred-name-stx select/h)
-  (syntax-case stx ()
-    
-    ;; if there are no cases, this contract should only accept the "empty" case-lambda.
-    [(_) (syntax empty-case-lambda/c)]
-    
-    ;; if there is only a single case, just skip it.
-    [(_ case) (syntax case)]
-    
-    [(_ cases ...)
-     (let-values ([(arguments-check build-projs check-val first-order-check wrapper) 
-                   (case->/h method-proc? stx (syntax->list (syntax (cases ...))) select/h)])
-       (let ([outer-args (syntax (val blame name-id))])
-         (with-syntax ([(inner-check ...) (check-val outer-args)]
-                       [(val blame name-id) outer-args]
-                       [(body ...) (wrapper outer-args)])
-           (with-syntax ([inner-lambda 
-                          (set-inferred-name-from
-                           inferred-name-stx
-                           (syntax/loc stx (case-lambda body ...)))])
-             (let ([inner-lambda
-                    (syntax
-                     (lambda (val)
-                       inner-check ...
-                       inner-lambda))])
-               (with-syntax ([proj-code (build-projs outer-args inner-lambda)]
-                             [first-order-check first-order-check])
-                 (arguments-check
-                  outer-args
-                  (syntax/loc stx
-                    (make-contract
-                     #:name (apply build-compound-type-name 'case-> name-id)
-                     #:projection (lambda (blame) proj-code)
-                     #:first-order first-order-check)))))))))]))
-
-(define (make-opt->/proc method-proc? stx select/h case-arr-stx arr-stx)
-  (syntax-case stx (any)
-    [(_ (reqs ...) (opts ...) any)
-     (make-opt->*/proc method-proc? (syntax (opt->* (reqs ...) (opts ...) any)) stx select/h case-arr-stx arr-stx)]
-    [(_ (reqs ...) (opts ...) res)
-     (make-opt->*/proc method-proc? (syntax (opt->* (reqs ...) (opts ...) (res))) stx select/h case-arr-stx arr-stx)]))
-
-(define (make-opt->*/proc method-proc? stx inferred-name-stx select/h case-arr-stx arr-stx)
-  (syntax-case stx (any)
-    [(_ (reqs ...) (opts ...) any)
-     (let* ([req-vs (generate-temporaries (syntax->list (syntax (reqs ...))))]
-            [opt-vs (generate-temporaries (syntax->list (syntax (opts ...))))]
-            [cses
-             (reverse
-              (let loop ([opt-vs (reverse opt-vs)])
-                (cond
-                  [(null? opt-vs) (list req-vs)]
-                  [else (cons (append req-vs (reverse opt-vs))
-                              (loop (cdr opt-vs)))])))])
-       (with-syntax ([(req-vs ...) req-vs]
-                     [(opt-vs ...) opt-vs]
-                     [((case-doms ...) ...) cses])
-         (with-syntax ([expanded-case->
-                        (make-case->/proc
-                         method-proc?
-                         (with-syntax ([case-> case-arr-stx]
-                                       [-> arr-stx])
-                           (syntax (case-> (-> case-doms ... any) ...)))
-                         inferred-name-stx
-                         select/h)])
-           (syntax/loc stx
-             (let ([req-vs reqs] ...
-                   [opt-vs opts] ...)
-               expanded-case->)))))]
-    [(_ (reqs ...) (opts ...) (ress ...))
-     (let* ([res-vs (generate-temporaries (syntax->list (syntax (ress ...))))]
-            [req-vs (generate-temporaries (syntax->list (syntax (reqs ...))))]
-            [opt-vs (generate-temporaries (syntax->list (syntax (opts ...))))]
-            [cses
-             (reverse
-              (let loop ([opt-vs (reverse opt-vs)])
-                (cond
-                  [(null? opt-vs) (list req-vs)]
-                  [else (cons (append req-vs (reverse opt-vs))
-                              (loop (cdr opt-vs)))])))])
-       (with-syntax ([(res-vs ...) res-vs]
-                     [(req-vs ...) req-vs]
-                     [(opt-vs ...) opt-vs]
-                     [((case-doms ...) ...) cses])
-         (with-syntax ([(single-case-result ...)
-                        (let* ([ress-lst (syntax->list (syntax (ress ...)))]
-                               [only-one?
-                                (and (pair? ress-lst)
-                                     (null? (cdr ress-lst)))])
-                          (map
-                           (if only-one?
-                               (lambda (x) (car (syntax->list (syntax (res-vs ...)))))
-                               (lambda (x) (syntax (values res-vs ...))))
-                           cses))])
-           (with-syntax ([expanded-case->
-                          (make-case->/proc
-                           method-proc?
-                           (with-syntax ([case-> case-arr-stx]
-                                         [-> arr-stx])
-                             (syntax (case-> (-> case-doms ... single-case-result) ...)))
-                           inferred-name-stx
-                           select/h)])
-             (set-inferred-name-from
-              stx
-              (syntax/loc stx
-                (let ([res-vs ress] 
-                      ...
-                      [req-vs reqs]
-                      ...
-                      [opt-vs opts]
-                      ...)
-                  expanded-case->)))))))]))
-
-;; exactract-argument-lists : syntax -> (listof syntax)
-(define (extract-argument-lists stx)
-  (map (lambda (x)
-         (syntax-case x ()
-           [(arg-list body) (syntax arg-list)]))
-       (syntax->list stx)))
-
-;; ensure-cases-disjoint : syntax syntax[list] -> void
-(define (ensure-cases-disjoint stx cases)
-  (let ([individual-cases null]
-        [dot-min #f])
-    (for-each (lambda (case)
-                (let ([this-case (get-case case)])
-                  (cond
-                    [(number? this-case) 
-                     (cond
-                       [(member this-case individual-cases)
-                        (raise-syntax-error
-                         'case-> 
-                         (format "found multiple cases with ~a arguments" this-case)
-                         stx)]
-                       [(and dot-min (dot-min . <= . this-case))
-                        (raise-syntax-error 
-                         'case-> 
-                         (format "found overlapping cases (~a+ followed by ~a)" dot-min this-case)
-                         stx)]
-                       [else (set! individual-cases (cons this-case individual-cases))])]
-                    [(pair? this-case)
-                     (let ([new-dot-min (car this-case)])
-                       (cond
-                         [dot-min
-                          (if (dot-min . <= . new-dot-min)
-                              (raise-syntax-error
-                               'case->
-                               (format "found overlapping cases (~a+ followed by ~a+)" dot-min new-dot-min)
-                               stx)
-                              (set! dot-min new-dot-min))]
-                         [else
-                          (set! dot-min new-dot-min)]))])))
-              cases)))
-
-;; get-case : syntax -> (union number (cons number 'more))
-(define (get-case stx)
-  (let ([ilist (syntax->datum stx)])
-    (if (list? ilist)
-        (length ilist)
-        (cons 
-         (let loop ([i ilist])
-           (cond
-             [(pair? i) (+ 1 (loop (cdr i)))]
-             [else 0]))
-         'more))))
-
-
-;; case->/h : boolean
-;;            syntax
-;;            (listof syntax) 
-;;            select/h
-;;         -> (values (syntax -> syntax)
-;;                    (syntax -> syntax)
-;;                    (syntax -> syntax)
-;;                    (syntax syntax -> syntax) 
-;;                    (syntax -> syntax)
-;;                    (syntax -> syntax))
-;; like the other /h functions, but composes the wrapper functions
-;; together and combines the cases of the case-lambda into a single list.
-(define (case->/h method-proc? orig-stx cases select/h)
-  (let loop ([cases cases]
-             [name-ids '()])
-    (cond
-      [(null? cases) 
-       (values 
-        (lambda (outer-args body)
-          (with-syntax ([(val blame name-id) outer-args]
-                        [body body]
-                        [(name-ids ...) (reverse name-ids)])
-            (syntax
-             (let ([name-id (list name-ids ...)])
-               body))))
-        (lambda (x y) y)
-        (lambda (args) (syntax ()))
-        (syntax (lambda (x) #t))
-        (lambda (args) (syntax ())))]
-      [else
-       (let ([/h (select/h (car cases) 'case-> orig-stx)]
-             [new-id (car (generate-temporaries (syntax (case->name-id))))])
-         (let-values ([(arguments-checks build-projs check-vals first-order-checks wrappers)
-                       (loop (cdr cases) (cons new-id name-ids))]
-                      [(arguments-check build-proj check-val first-order-check wrapper)
-                       (/h method-proc? (car cases))])
-           (values
-            (lambda (outer-args x) 
-              (with-syntax ([(val blame name-id) outer-args]
-                            [new-id new-id])
-                (arguments-check 
-                 (syntax (val blame new-id)) 
-                 (arguments-checks 
-                  outer-args
-                  x))))
-            (lambda (args inner) (build-projs args (build-proj args inner)))
-            (lambda (args)
-              (with-syntax ([checks (check-vals args)]
-                            [check (check-val args)])
-                (syntax (check . checks))))
-            (with-syntax ([checks first-order-checks]
-                          [check first-order-check])
-              (syntax (lambda (x) (and (checks x) (check x)))))
-            (lambda (args)
-              (with-syntax ([case (wrapper args)]
-                            [cases (wrappers args)])
-                (syntax (case . cases)))))))])))
-
-;; ensure-no-duplicates : syntax (listof syntax[identifier]) -> void
-(define (ensure-no-duplicates stx form-name names)
-  (let ([ht (make-hasheq)])
-    (for-each (lambda (name)
-                (let ([key (syntax-e name)])
-                  (when (hash-ref ht key (lambda () #f))
-                    (raise-syntax-error form-name
-                                        "duplicate method name"
-                                        stx
-                                        name))
-                  (hash-set! ht key #t)))
-              names)))
-
-;; method-specifier? : syntax -> boolean
-;; returns #t if x is the syntax for a valid method specifier
-(define (method-specifier? x)
-  (or (eq? 'public (syntax-e x))
-      (eq? 'override (syntax-e x))))
-
-;; prefix-super : syntax[identifier] -> syntax[identifier]
-;; adds super- to the front of the identifier
-(define (prefix-super stx)
-  (datum->syntax
-   #'here
-   (string->symbol
-    (format 
-     "super-~a"
-     (syntax->datum
-      stx)))))
-
-;; method-name->contract-method-name : syntax[identifier] -> syntax[identifier]
-;; given the syntax for a method name, constructs the name of a method
-;; that returns the super's contract for the original method.
-(define (method-name->contract-method-name stx)
-  (datum->syntax
-   #'here
-   (string->symbol
-    (format 
-     "ACK_DONT_GUESS_ME-super-contract-~a"
-     (syntax->datum
-      stx)))))
-
-;; Each of the /h functions builds six pieces of syntax:
-;;  - [arguments-check]
-;;    code that binds the contract values to names and
-;;    does error checking for the contract specs
-;;    (were the arguments all contracts?)
-;;  - [build-proj]
-;;    code that partially applies the input contracts to build the projection
-;;  - [check-val]
-;;    code that does error checking on the contract'd value itself
-;;    (is it a function of the right arity?)
-;;  - [first-order-check]
-;;    predicate function that does the first order check and returns a boolean
-;;    (is it a function of the right arity?)
-;;  - [pos-wrapper]
-;;    a piece of syntax that has the arguments to the wrapper
-;;    and the body of the wrapper.
-;;  - [neg-wrapper]
-;;    a piece of syntax that has the arguments to the wrapper
-;;    and the body of the wrapper.
-;; the first function accepts a body expression and wraps
-;;    the body expression with checks. In addition, it
-;;    adds a let that binds the contract exprssions to names
-;;    the results of the other functions mention these names.
-;; the second and third function's input syntax should be five
-;;    names: val, blame, src-info, orig-str, name-id
-;; the fourth function returns a syntax list with two elements,
-;;    the argument list (to be used as the first arg to lambda,
-;;    or as a case-lambda clause) and the body of the function.
-;; They are combined into a lambda for the -> ->* ->d ->d* macros,
-;; and combined into a case-lambda for the case-> macro.
-
-;; ->/h : boolean stx -> (values (syntax -> syntax) (syntax -> syntax) (syntax -> syntax))
-(define (->/h method-proc? stx)
-  (syntax-case stx ()
-    [(_) (raise-syntax-error '-> "expected at least one argument" stx)]
-    [(_ dom ... rng)
-     (with-syntax ([(dom-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-contract-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-projection-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-length dom-index ...) (generate-indices (syntax (dom ...)))]
-                   [(dom-ant-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(arg-x ...) (generate-temporaries (syntax (dom ...)))])
-       (with-syntax ([(name-dom-contract-x ...)
-                      (if method-proc?
-                          (cdr
-                           (syntax->list
-                            (syntax (dom-contract-x ...))))
-                          (syntax (dom-contract-x ...)))])
-         (syntax-case* (syntax rng) (any values) module-or-top-identifier=?
-           [any 
-            (values
-             (lambda (outer-args body)
-               (with-syntax ([body body]
-                             [(val blame name-id) outer-args])
-                 (syntax
-                  (let ([dom-contract-x (coerce-contract '-> dom)] ...)
-                    (let ([dom-x (contract-projection dom-contract-x)] ...)
-                      (let ([name-id (build-compound-type-name '-> name-dom-contract-x ... 'any)])
-                        body))))))
-             
-             ;; proj
-             (lambda (outer-args inner-lambda)
-               (with-syntax ([(val blame name-id) outer-args]
-                             [inner-lambda inner-lambda])
-                 (syntax
-                  (let ([dom-projection-x (dom-x (blame-swap blame))] ...)
-                    inner-lambda))))
-             
-             (lambda (outer-args)
-               (with-syntax ([(val blame name-id) outer-args])
-                 (syntax
-                  (check-procedure val dom-length 0 '() '() #|keywords|# blame))))
-             (syntax (check-procedure? dom-length))
-             (lambda (outer-args)
-               (with-syntax ([(val blame name-id) outer-args])
-                 (syntax
-                  ((arg-x ...)
-                   (val (dom-projection-x arg-x) ...))))))]
-           [(values rng ...)
-            (with-syntax ([(rng-x ...) (generate-temporaries (syntax (rng ...)))]
-                          [(rng-contract-x ...) (generate-temporaries (syntax (rng ...)))]
-                          [(rng-projection-x ...) (generate-temporaries (syntax (rng ...)))]
-                          [(rng-length rng-index ...) (generate-indices (syntax (rng ...)))]
-                          [(rng-ant-x ...) (generate-temporaries (syntax (rng ...)))]
-                          [(res-x ...) (generate-temporaries (syntax (rng ...)))])
-              (values
-               (lambda (outer-args body)
-                 (with-syntax ([body body]
-                               [(val blame name-id) outer-args])
-                   (syntax
-                    (let ([dom-contract-x (coerce-contract '-> dom)] 
-                          ...
-                          [rng-contract-x (coerce-contract '-> rng)] ...)
-                      (let ([dom-x (contract-projection dom-contract-x)] 
-                            ...
-                            [rng-x (contract-projection rng-contract-x)]
-                            ...)
-                        (let ([name-id 
-                               (build-compound-type-name 
-                                '-> 
-                                name-dom-contract-x ...
-                                (build-compound-type-name 'values rng-contract-x ...))])
-                          body))))))
-               
-               ;; proj
-               (lambda (outer-args inner-lambda)
-                 (with-syntax ([(val blame name-id) outer-args]
-                               [inner-lambda inner-lambda])
-                   (syntax
-                    (let ([dom-projection-x (dom-x (blame-swap blame))] 
-                          ...
-                          [rng-projection-x (rng-x blame)] ...)
-                      inner-lambda))))
-               
-               (lambda (outer-args)
-                 (with-syntax ([(val blame name-id) outer-args])
-                   (syntax
-                    (check-procedure val dom-length 0 '() '() #|keywords|# blame))))
-               (syntax (check-procedure? dom-length))
-               
-               (lambda (outer-args)
-                 (with-syntax ([(val blame name-id) outer-args])
-                   (syntax
-                    ((arg-x ...)
-                     (let-values ([(res-x ...) (val (dom-projection-x arg-x) ...)])
-                       (values (rng-projection-x
-                                res-x)
-                               ...))))))))]
-           [rng
-            (with-syntax ([(rng-x) (generate-temporaries (syntax (rng)))]
-                          [(rng-contact-x) (generate-temporaries (syntax (rng)))]
-                          [(rng-projection-x) (generate-temporaries (syntax (rng)))]
-                          [(rng-ant-x) (generate-temporaries (syntax (rng)))]
-                          [(res-x) (generate-temporaries (syntax (rng)))])
-              (values
-               (lambda (outer-args body)
-                 (with-syntax ([body body]
-                               [(val blame name-id) outer-args])
-                   (syntax
-                    (let ([dom-contract-x (coerce-contract '-> dom)] 
-                          ...
-                          [rng-contract-x (coerce-contract '-> rng)])
-                      (let ([dom-x (contract-projection dom-contract-x)] 
-                            ...
-                            [rng-x (contract-projection rng-contract-x)])
-                        (let ([name-id (build-compound-type-name '-> name-dom-contract-x ... rng-contract-x)])
-                          body))))))
-               
-               ;; proj
-               (lambda (outer-args inner-lambda)
-                 (with-syntax ([(val blame name-id) outer-args]
-                               [inner-lambda inner-lambda])
-                   (syntax
-                    (let ([dom-projection-x (dom-x (blame-swap blame))] 
-                          ...
-                          [rng-projection-x (rng-x blame)])
-                      inner-lambda))))
-               
-               (lambda (outer-args)
-                 (with-syntax ([(val blame name-id) outer-args])
-                   (syntax
-                    (check-procedure val dom-length 0 '() '() #|keywords|# blame))))
-               (syntax (check-procedure? dom-length))
-               (lambda (outer-args)
-                 (with-syntax ([(val blame name-id) outer-args])
-                   (syntax
-                    ((arg-x ...)
-                     (let ([res-x (val (dom-projection-x arg-x) ...)])
-                       (rng-projection-x res-x))))))))])))]))
-
-;; ->*/h : boolean stx -> (values (syntax -> syntax) (syntax syntax -> syntax) (syntax -> syntax) (syntax -> syntax))
-(define (->*/h method-proc? stx)
-  (syntax-case stx (any)
-    [(_ (dom ...) (rng ...))
-     (->/h method-proc? (syntax (-> dom ... (values rng ...))))]
-    [(_ (dom ...) any)
-     (->/h method-proc? (syntax (-> dom ... any)))]
-    [(_ (dom ...) rest (rng ...))
-     (with-syntax ([(dom-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-contract-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-projection-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(arg-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-length dom-index ...) (generate-indices (syntax (dom ...)))]
-                   [(dom-ant-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [dom-rest-x (car (generate-temporaries (list (syntax rest))))]
-                   [dom-rest-contract-x (car (generate-temporaries (list (syntax rest))))]
-                   [dom-rest-projection-x (car (generate-temporaries (list (syntax rest))))]
-                   [arg-rest-x (car (generate-temporaries (list (syntax rest))))]
-                   
-                   [(rng-x ...) (generate-temporaries (syntax (rng ...)))]
-                   [(rng-contract-x ...) (generate-temporaries (syntax (rng ...)))]
-                   [(rng-projection-x ...) (generate-temporaries (syntax (rng ...)))]
-                   [(rng-length rng-index ...) (generate-indices (syntax (rng ...)))]
-                   [(rng-ant-x ...) (generate-temporaries (syntax (rng ...)))]
-                   [(res-x ...) (generate-temporaries (syntax (rng ...)))]
-                   [arity (length (syntax->list (syntax (dom ...))))])
-       (values
-        (lambda (outer-args body)
-          (with-syntax ([(val blame name-id) outer-args]
-                        [body body]
-                        [(name-dom-contract-x ...)
-                         (if method-proc?
-                             (cdr
-                              (syntax->list
-                               (syntax (dom-contract-x ...))))
-                             (syntax (dom-contract-x ...)))])
-            (syntax
-             (let ([dom-contract-x (coerce-contract '->* dom)] 
-                   ...
-                   [dom-rest-contract-x (coerce-contract '->* rest)]
-                   [rng-contract-x (coerce-contract '->* rng)] ...)
-               (let ([dom-x (contract-projection dom-contract-x)]
-                     ...
-                     [dom-rest-x (contract-projection dom-rest-contract-x)]
-                     [rng-x (contract-projection rng-contract-x)] 
-                     ...)
-                 (let ([name-id 
-                        (build-compound-type-name 
-                         '->*
-                         (build-compound-type-name dom-contract-x ...)
-                         dom-rest-contract-x
-                         (build-compound-type-name rng-contract-x ...))])
-                   body))))))
-        ;; proj
-        (lambda (outer-args inner-lambda)
-          (with-syntax ([(val blame name-id) outer-args]
-                        [inner-lambda inner-lambda])
-            (syntax
-             (let ([dom-projection-x (dom-x (blame-swap blame))] 
-                   ...
-                   [dom-rest-projection-x (dom-rest-x (blame-swap blame))]
-                   [rng-projection-x (rng-x blame)] ...)
-               inner-lambda))))
-        
-        (lambda (outer-args)
-          (with-syntax ([(val blame name-id) outer-args])
-            (syntax
-             (check-procedure/more val dom-length '() '() #|keywords|# blame))))
-        (syntax (check-procedure/more? dom-length))
-        (lambda (outer-args)
-          (with-syntax ([(val blame name-id) outer-args])
-            (syntax
-             ((arg-x ... . arg-rest-x)
-              (let-values ([(res-x ...)
-                            (apply
-                             val
-                             (dom-projection-x arg-x)
-                             ...
-                             (dom-rest-projection-x arg-rest-x))])
-                (values (rng-projection-x res-x) ...))))))))]
-    [(_ (dom ...) rest any)
-     (with-syntax ([(dom-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-contract-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-projection-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(arg-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-length dom-index ...) (generate-indices (syntax (dom ...)))]
-                   [(dom-ant-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [dom-rest-x (car (generate-temporaries (list (syntax rest))))]
-                   [dom-rest-contract-x (car (generate-temporaries (list (syntax rest))))]
-                   [dom-projection-rest-x (car (generate-temporaries (list (syntax rest))))]
-                   [arg-rest-x (car (generate-temporaries (list (syntax rest))))]
-                   
-                   [arity (length (syntax->list (syntax (dom ...))))])
-       (values
-        (lambda (outer-args body)
-          (with-syntax ([body body]
-                        [(val blame name-id) outer-args]
-                        [(name-dom-contract-x ...)
-                         (if method-proc?
-                             (cdr
-                              (syntax->list
-                               (syntax (dom-contract-x ...))))
-                             (syntax (dom-contract-x ...)))])
-            (syntax
-             (let ([dom-contract-x (coerce-contract '->* dom)] 
-                   ...
-                   [dom-rest-contract-x (coerce-contract '->* rest)])
-               (let ([dom-x (contract-projection dom-contract-x)]
-                     ...
-                     [dom-rest-x (contract-projection dom-rest-contract-x)])
-                 (let ([name-id (build-compound-type-name
-                                 '->* 
-                                 (build-compound-type-name name-dom-contract-x ...)
-                                 dom-rest-contract-x
-                                 'any)])
-                   body))))))
-        ;; proj
-        (lambda (outer-args inner-lambda)
-          (with-syntax ([(val blame name-id) outer-args]
-                        [inner-lambda inner-lambda])
-            (syntax
-             (let ([dom-projection-x (dom-x (blame-swap blame))] 
-                   ...
-                   [dom-projection-rest-x (dom-rest-x (blame-swap blame))])
-               inner-lambda))))
-        
-        (lambda (outer-args)
-          (with-syntax ([(val blame name-id) outer-args])
-            (syntax
-             (check-procedure/more val dom-length '() '() #|keywords|# blame))))
-        (syntax (check-procedure/more? dom-length))
-        (lambda (outer-args)
-          (with-syntax ([(val blame name-id) outer-args])
-            (syntax
-             ((arg-x ... . arg-rest-x)
-              (apply
-               val
-               (dom-projection-x arg-x)
-               ...
-               (dom-projection-rest-x arg-rest-x))))))))]))
-
-;; ->d/h : boolean stx -> (values (syntax -> syntax) (syntax -> syntax) (syntax -> syntax))
-(define (->d/h method-proc? stx)
-  (syntax-case stx ()
-    [(_) (raise-syntax-error '->d "expected at least one argument" stx)]
-    [(_ dom ... rng)
-     (with-syntax ([(rng-x) (generate-temporaries (syntax (rng)))]
-                   [(dom-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-contract-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-projection-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(arg-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [arity (length (syntax->list (syntax (dom ...))))])
-       (values
-        (lambda (outer-args body)
-          (with-syntax ([body body]
-                        [(val blame name-id) outer-args]
-                        [(name-dom-contract-x ...)
-                         (if method-proc?
-                             (cdr
-                              (syntax->list
-                               (syntax (dom-contract-x ...))))
-                             (syntax (dom-contract-x ...)))])
-            (syntax
-             (let ([dom-contract-x (coerce-contract '->d dom)] ...)
-               (let ([dom-x (contract-projection dom-contract-x)] 
-                     ...
-                     [rng-x rng])
-                 (check-rng-procedure '->d rng-x arity)
-                 (let ([name-id (build-compound-type-name '->d name-dom-contract-x ... '(... ...))])
-                   body))))))
-        
-        ;; proj
-        (lambda (outer-args inner-lambda)
-          (with-syntax ([(val blame name-id) outer-args]
-                        [inner-lambda inner-lambda])
-            (syntax
-             (let ([dom-projection-x (dom-x (blame-swap blame))] ...)
-               inner-lambda))))
-        
-        (lambda (outer-args)
-          (with-syntax ([(val blame name-id) outer-args])
-            (syntax
-             (check-procedure val arity 0 '() '() #|keywords|# blame))))
-        
-        (syntax (check-procedure? arity))
-        
-        (lambda (outer-args)
-          (with-syntax ([(val blame name-id) outer-args])
-            (syntax
-             ((arg-x ...)
-              (let ([arg-x (dom-projection-x arg-x)] ...) 
-                (let ([rng-contract (rng-x arg-x ...)])
-                  (((contract-projection (coerce-contract '->d rng-contract))
-                    blame)
-                   (val arg-x ...))))))))))]))
-
-;; ->d*/h : boolean stx -> (values (syntax -> syntax) (syntax -> syntax) (syntax -> syntax))
-(define (->d*/h method-proc? stx)
-  (syntax-case stx ()
-    [(_ (dom ...) rng-mk)
-     (with-syntax ([(dom-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-contract-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-projection-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-length dom-index ...) (generate-indices (syntax (dom ...)))]
-                   [(dom-ant-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(arg-x ...) (generate-temporaries (syntax (dom ...)))])
-       (values
-        (lambda (outer-args body)
-          (with-syntax ([body body]
-                        [(val blame name-id) outer-args]
-                        [(name-dom-contract-x ...)
-                         (if method-proc?
-                             (cdr
-                              (syntax->list
-                               (syntax (dom-contract-x ...))))
-                             (syntax (dom-contract-x ...)))])
-            (syntax
-             (let ([dom-contract-x (coerce-contract '->d* dom)] ...)
-               (let ([dom-x (contract-projection dom-contract-x)] 
-                     ...
-                     [rng-mk-x rng-mk])
-                 (check-rng-procedure '->d* rng-mk-x dom-length)
-                 (let ([name-id (build-compound-type-name
-                                 '->d* 
-                                 (build-compound-type-name name-dom-contract-x ...)
-                                 '(... ...))])
-                   body))))))
-        
-        ;; proj
-        (lambda (outer-args inner-lambda)
-          (with-syntax ([(val blame name-id) outer-args]
-                        [inner-lambda inner-lambda])
-            (syntax
-             (let ([dom-projection-x (dom-x (blame-swap blame))] ...)
-               inner-lambda))))
-        
-        (lambda (outer-args)
-          (with-syntax ([(val blame name-id) outer-args])
-            (syntax
-             (check-procedure val dom-length 0 '() '() #|keywords|# blame))))
-        (syntax (check-procedure? dom-length))
-        
-        (lambda (outer-args)
-          (with-syntax ([(val blame name-id) outer-args])
-            (syntax
-             ((arg-x ...)
-              (call-with-values
-               (lambda () (rng-mk-x arg-x ...))
-               (lambda rng-contracts
-                 (call-with-values
-                  (lambda ()
-                    (val (dom-projection-x arg-x) ...))
-                  (lambda results
-                    (check-rng-lengths results rng-contracts)
-                    (apply 
-                     values
-                     (map (lambda (rng-contract result)
-                            (((contract-projection (coerce-contract '->d* rng-contract))
-                              blame)
-                             result))
-                          rng-contracts
-                          results))))))))))))]
-    [(_ (dom ...) rest rng-mk)
-     (with-syntax ([(dom-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-contract-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-projection-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [(dom-rest-x) (generate-temporaries (syntax (rest)))]
-                   [(dom-rest-contract-x) (generate-temporaries (syntax (rest)))]
-                   [(dom-rest-projection-x) (generate-temporaries (syntax (rest)))]
-                   [(arg-x ...) (generate-temporaries (syntax (dom ...)))]
-                   [arity (length (syntax->list (syntax (dom ...))))])
-       (values
-        (lambda (outer-args body)
-          (with-syntax ([body body]
-                        [(val blame name-id) outer-args]
-                        [(name-dom-contract-x ...)
-                         (if method-proc?
-                             (cdr
-                              (syntax->list
-                               (syntax (dom-contract-x ...))))
-                             (syntax (dom-contract-x ...)))])
-            (syntax
-             (let ([dom-contract-x (coerce-contract '->d* dom)] 
-                   ...
-                   [dom-rest-contract-x (coerce-contract '->d* rest)])
-               (let ([dom-x (contract-projection dom-contract-x)] 
-                     ...
-                     [dom-rest-x (contract-projection dom-rest-contract-x)]
-                     [rng-mk-x rng-mk])
-                 (check-rng-procedure/more rng-mk-x arity)
-                 (let ([name-id (build-compound-type-name 
-                                 '->d*
-                                 (build-compound-type-name name-dom-contract-x ...)
-                                 dom-rest-contract-x
-                                 '(... ...))])
-                   body))))))
-        
-        ;; proj
-        (lambda (outer-args inner-lambda)
-          (with-syntax ([(val blame name-id) outer-args]
-                        [inner-lambda inner-lambda])
-            (syntax
-             (let ([dom-projection-x (dom-x (blame-swap blame))] 
-                   ...
-                   [dom-rest-projection-x (dom-rest-x (blame-swap blame))])
-               inner-lambda))))
-        
-        (lambda (outer-args)
-          (with-syntax ([(val blame name-id) outer-args])
-            (syntax
-             (check-procedure/more val arity '() '() #|keywords|# blame))))
-        (syntax (check-procedure/more? arity))
-        
-        (lambda (outer-args)
-          (with-syntax ([(val blame name-id) outer-args])
-            (syntax
-             ((arg-x ... . rest-arg-x)
-              (call-with-values
-               (lambda ()
-                 (apply rng-mk-x arg-x ... rest-arg-x))
-               (lambda rng-contracts
-                 (call-with-values
-                  (lambda ()
-                    (apply 
-                     val
-                     (dom-projection-x arg-x)
-                     ...
-                     (dom-rest-projection-x rest-arg-x)))
-                  (lambda results
-                    (check-rng-lengths results rng-contracts)
-                    (apply 
-                     values
-                     (map (lambda (rng-contract result)
-                            (((contract-projection (coerce-contract '->d* rng-contract))
-                              blame)
-                             result))
-                          rng-contracts
-                          results))))))))))))]))
-
-;; ->r/h : boolean stx -> (values (syntax -> syntax) (syntax -> syntax) (syntax -> syntax))
-(define (->r/h method-proc? stx)
-  (syntax-case stx ()
-    [(_ ([x dom] ...) rng)
-     (syntax-case* (syntax rng) (any values) module-or-top-identifier=?
-       [any 
-        (->r-pp/h method-proc? '->r (syntax (->r ([x dom] ...) #t any)))]
-       [(values . args)
-        (->r-pp/h method-proc? '->r (syntax (->r ([x dom] ...) #t rng #t)))]
-       [rng
-        (->r-pp/h method-proc? '->r (syntax (->r ([x dom] ...) #t rng unused-id #t)))]
-       [_
-        (raise-syntax-error '->r "unknown result contract spec" stx (syntax rng))])]
-    
-    [(_ ([x dom] ...) rest-x rest-dom rng)
-     (syntax-case* (syntax rng) (values any) module-or-top-identifier=?
-       [any 
-        (->r-pp-rest/h method-proc? '->r (syntax (->r ([x dom] ...) rest-x rest-dom #t any)))]
-       [(values . whatever)
-        (->r-pp-rest/h method-proc? '->r (syntax (->r ([x dom] ...) rest-x rest-dom #t rng #t)))]
-       [_
-        (->r-pp-rest/h method-proc? '->r (syntax (->r ([x dom] ...) rest-x rest-dom #t rng unused-id #t)))])]))
-
-;; ->pp/h : boolean stx -> (values (syntax -> syntax) (syntax -> syntax) (syntax -> syntax))
-(define (->pp/h method-proc? stx) (->r-pp/h method-proc? '->pp stx))
-
-;; ->pp/h : boolean symbol stx -> (values (syntax -> syntax) (syntax -> syntax) (syntax -> syntax))
-(define (->r-pp/h method-proc? name stx)
-  (syntax-case stx ()
-    [(_ ([x dom] ...) pre-expr . result-stuff)
-     (and (andmap identifier? (syntax->list (syntax (x ...))))
-          (not (check-duplicate-identifier (syntax->list (syntax (x ...))))))
-     (with-syntax ([stx-name name])
-       (with-syntax ([(dom-id ...) (generate-temporaries (syntax (dom ...)))]
-                     [arity (length (syntax->list (syntax (dom ...))))]
-                     [name-stx
-                      (with-syntax ([(name-xs ...) (if method-proc?
-                                                       (cdr (syntax->list (syntax (x ...))))
-                                                       (syntax (x ...)))])
-                        (syntax 
-                         (build-compound-type-name 'stx-name
-                                                   (build-compound-type-name
-                                                    (build-compound-type-name 'name-xs '(... ...))
-                                                    ...)
-                                                   '(... ...))))])
-         (values
-          (lambda (outer-args body)
-            (with-syntax ([body body]
-                          [(val blame name-id) outer-args])
-              (syntax
-               (let ([name-id name-stx])
-                 body))))
-          (lambda (outer-args inner-lambda) inner-lambda)
-          
-          (lambda (outer-args)
-            (with-syntax ([(val blame name-id) outer-args]
-                          [kind-of-thing (if method-proc? 'method 'procedure)])
-              (syntax
-               (begin 
-                 (check-procedure/kind val arity 'kind-of-thing blame)))))
-          
-          (syntax (check-procedure? arity))
-          
-          (lambda (outer-args)
-            (with-syntax ([(val blame name-id) outer-args])
-              (syntax-case* (syntax result-stuff) (any values) module-or-top-identifier=?
-                [(any)
-                 (syntax
-                  ((x ...)
-                   (begin
-                     (check-pre-expr->pp/h val pre-expr (blame-swap blame))
-                     (let ([dom-id ((contract-projection (coerce-contract 'stx-name dom)) 
-                                    (blame-swap blame))]
-                           ...)
-                       (val (dom-id x) ...)))))]
-                [((values (rng-ids rng-ctc) ...) post-expr)
-                 (and (andmap identifier? (syntax->list (syntax (rng-ids ...))))
-                      (not (check-duplicate-identifier (syntax->list (syntax (rng-ids ...))))))
-                 (with-syntax ([(rng-ids-x ...) (generate-temporaries (syntax (rng-ids ...)))])
-                   (syntax
-                    ((x ...)
-                     (begin
-                       (check-pre-expr->pp/h val pre-expr (blame-swap blame))
-                       (let ([dom-id ((contract-projection (coerce-contract 'stx-name dom))
-                                      (blame-swap blame))]
-                             ...)
-                         (let-values ([(rng-ids ...) (val (dom-id x) ...)])
-                           (check-post-expr->pp/h val post-expr blame)
-                           (let ([rng-ids-x ((contract-projection (coerce-contract 'stx-name rng-ctc))
-                                             blame)] ...)
-                             (values (rng-ids-x rng-ids) ...))))))))]
-                [((values (rng-ids rng-ctc) ...) post-expr)
-                 (andmap identifier? (syntax->list (syntax (rng-ids ...))))
-                 (let ([dup (check-duplicate-identifier (syntax->list (syntax (rng-ids ...))))])
-                   (raise-syntax-error name "duplicate identifier" stx dup))]
-                [((values (rng-ids rng-ctc) ...) post-expr)
-                 (for-each (lambda (rng-id) 
-                             (unless (identifier? rng-id)
-                               (raise-syntax-error name "expected identifier" stx rng-id)))
-                           (syntax->list (syntax (rng-ids ...))))]
-                [((values . x) . junk)
-                 (raise-syntax-error name "malformed multiple values result" stx (syntax (values . x)))]
-                [(rng res-id post-expr)
-                 (syntax
-                  ((x ...)
-                   (begin
-                     (check-pre-expr->pp/h val pre-expr (blame-swap blame))
-                     (let ([dom-id ((contract-projection (coerce-contract 'stx-name dom))
-                                    (blame-swap blame))]
-                           ...
-                           [rng-id ((contract-projection (coerce-contract 'stx-name rng)) 
-                                    blame)])
-                       (let ([res-id (rng-id (val (dom-id x) ...))])
-                         (check-post-expr->pp/h val post-expr blame)
-                         res-id)))))]
-                [_ 
-                 (raise-syntax-error name "unknown result specification" stx (syntax result-stuff))]))))))]
-    
-    [(_ ([x dom] ...) pre-expr . result-stuff)
-     (andmap identifier? (syntax->list (syntax (x ...))))
-     (raise-syntax-error 
-      name
-      "duplicate identifier"
-      stx
-      (check-duplicate-identifier (syntax->list (syntax (x ...)))))]
-    [(_ ([x dom] ...) pre-expr . result-stuff)
-     (for-each (lambda (x) (unless (identifier? x) (raise-syntax-error name "expected identifier" stx x)))
-               (syntax->list (syntax (x ...))))]
-    [(_ (x ...) pre-expr . result-stuff)
-     (for-each (lambda (x)
-                 (syntax-case x ()
-                   [(x y) (identifier? (syntax x)) (void)]
-                   [bad (raise-syntax-error name "expected identifier and contract" stx (syntax bad))]))
-               (syntax->list (syntax (x ...))))]
-    [(_ x dom pre-expr . result-stuff)
-     (raise-syntax-error name "expected list of identifiers and expression pairs" stx (syntax x))]))
-
-;; ->pp-rest/h : boolean stx -> (values (syntax -> syntax) (syntax -> syntax) (syntax -> syntax))
-(define (->pp-rest/h method-proc? stx) (->r-pp-rest/h method-proc? '->pp-rest stx))
-
-;; ->r-pp-rest/h : boolean stx -> (values (syntax -> syntax) (syntax -> syntax) (syntax -> syntax))
-(define (->r-pp-rest/h method-proc? name stx)
-  (syntax-case stx ()
-    [(_ ([x dom] ...) rest-x rest-dom pre-expr . result-stuff)
-     (and (identifier? (syntax rest-x))
-          (andmap identifier? (syntax->list (syntax (x ...))))
-          (not (check-duplicate-identifier (cons (syntax rest-x) (syntax->list (syntax (x ...)))))))
-     (with-syntax ([stx-name name])
-       (with-syntax ([(dom-id ...) (generate-temporaries (syntax (dom ...)))]
-                     [arity (length (syntax->list (syntax (dom ...))))]
-                     [name-stx 
-                      (with-syntax ([(name-xs ...) (if method-proc?
-                                                       (cdr (syntax->list (syntax (x ...))))
-                                                       (syntax (x ...)))])
-                        (syntax 
-                         (build-compound-type-name 'stx-name
-                                                   `(,(build-compound-type-name 'name-xs '(... ...)) ...)
-                                                   'rest-x
-                                                   '(... ...)
-                                                   '(... ...))))])
-         (values
-          (lambda (outer-args body)
-            (with-syntax ([body body]
-                          [(val blame name-id) outer-args])
-              (syntax
-               (let ([name-id name-stx])
-                 body))))
-          (lambda (outer-args inner-lambda) inner-lambda)
-          
-          (lambda (outer-args)
-            (with-syntax ([(val blame name-id) outer-args]
-                          [kind-of-thing (if method-proc? 'method 'procedure)])
-              (syntax
-               (begin 
-                 (check-procedure/more/kind val arity 'kind-of-thing blame)))))
-          (syntax (check-procedure/more? arity))
-          
-          (lambda (outer-args)
-            (with-syntax ([(val blame name-id) outer-args])
-              (syntax-case* (syntax result-stuff) (values any) module-or-top-identifier=?
-                [(any)
-                 (syntax
-                  ((x ... . rest-x)
-                   (begin
-                     (check-pre-expr->pp/h val pre-expr (blame-swap blame))
-                     (let ([dom-id ((contract-projection (coerce-contract 'stx-name dom))
-                                    (blame-swap blame))]
-                           ...
-                           [rest-id ((contract-projection (coerce-contract 'stx-name rest-dom))
-                                     (blame-swap blame))])
-                       (apply val (dom-id x) ... (rest-id rest-x))))))]
-                [(any . x)
-                 (raise-syntax-error name "cannot have anything after any" stx (syntax result-stuff))]
-                [((values (rng-ids rng-ctc) ...) post-expr)
-                 (and (andmap identifier? (syntax->list (syntax (rng-ids ...))))
-                      (not (check-duplicate-identifier (syntax->list (syntax (rng-ids ...))))))
-                 (with-syntax ([(rng-ids-x ...) (generate-temporaries (syntax (rng-ids ...)))])
-                   (syntax
-                    ((x ... . rest-x)
-                     (begin
-                       (check-pre-expr->pp/h val pre-expr (blame-swap blame))
-                       (let ([dom-id ((contract-projection (coerce-contract 'stx-name dom))
-                                      (blame-swap blame))]
-                             ...
-                             [rest-id ((contract-projection (coerce-contract 'stx-name rest-dom))
-                                       (blame-swap blame))])
-                         (let-values ([(rng-ids ...) (apply val (dom-id x) ... (rest-id rest-x))])
-                           (check-post-expr->pp/h val post-expr blame)
-                           (let ([rng-ids-x ((contract-projection (coerce-contract 'stx-name rng-ctc))
-                                             blame)] ...)
-                             (values (rng-ids-x rng-ids) ...))))))))]
-                [((values (rng-ids rng-ctc) ...) . whatever)
-                 (and (andmap identifier? (syntax->list (syntax (rng-ids ...))))
-                      (not (check-duplicate-identifier (syntax->list (syntax (rng-ids ...))))))
-                 (raise-syntax-error name "expected exactly on post-expression at the end" stx)]
-                [((values (rng-ids rng-ctc) ...) . whatever)
-                 (andmap identifier? (syntax->list (syntax (rng-ids ...))))
-                 (let ([dup (check-duplicate-identifier (syntax->list (syntax (rng-ids ...))))])
-                   (raise-syntax-error name "duplicate identifier" stx dup))]
-                [((values (rng-ids rng-ctc) ...) . whatever)
-                 (for-each (lambda (rng-id) 
-                             (unless (identifier? rng-id)
-                               (raise-syntax-error name "expected identifier" stx rng-id)))
-                           (syntax->list (syntax (rng-ids ...))))]
-                [((values . x) . whatever)
-                 (raise-syntax-error name "malformed multiple values result" stx (syntax (values . x)))]
-                [(rng res-id post-expr)
-                 (identifier? (syntax res-id))
-                 (syntax
-                  ((x ... . rest-x)
-                   (begin
-                     (check-pre-expr->pp/h val pre-expr (blame-swap blame))
-                     (let ([dom-id ((contract-projection (coerce-contract 'stx-name dom))
-                                    (blame-swap blame))]
-                           ...
-                           [rest-id ((contract-projection (coerce-contract 'stx-name rest-dom))
-                                     (blame-swap blame))]
-                           [rng-id ((contract-projection (coerce-contract 'stx-name rng))
-                                    blame)])
-                       (let ([res-id (rng-id (apply val (dom-id x) ... (rest-id rest-x)))])
-                         (check-post-expr->pp/h val post-expr blame)
-                         res-id)))))]
-                [(rng res-id post-expr)
-                 (not (identifier? (syntax res-id)))
-                 (raise-syntax-error name "expected an identifier" stx (syntax res-id))]
-                [_
-                 (raise-syntax-error name "malformed result sepecification" stx (syntax result-stuff))]))))))]
-    [(_ ([x dom] ...) rest-x rest-dom pre-expr . result-stuff)
-     (not (identifier? (syntax rest-x)))
-     (raise-syntax-error name "expected identifier" stx (syntax rest-x))]
-    [(_ ([x dom] ...) rest-x rest-dom rng . result-stuff)
-     (and (identifier? (syntax rest-x))
-          (andmap identifier? (cons (syntax rest-x) (syntax->list (syntax (x ...))))))
-     (raise-syntax-error 
-      name
-      "duplicate identifier"
-      stx
-      (check-duplicate-identifier (syntax->list (syntax (x ...)))))]
-    
-    [(_ ([x dom] ...) rest-x rest-dom rng . result-stuff)
-     (for-each (lambda (x) (unless (identifier? x) (raise-syntax-error name "expected identifier" stx x)))
-               (cons
-                (syntax rest-x)
-                (syntax->list (syntax (x ...)))))]
-    [(_ x dom rest-x rest-dom rng . result-stuff)
-     (raise-syntax-error name "expected list of identifiers and expression pairs" stx (syntax x))]))
-
-;; set-inferred-name-from : syntax syntax -> syntax
-(define (set-inferred-name-from with-name to-be-named)
-  (let ([name (syntax-local-infer-name with-name)])
-    (cond
-      [(identifier? name)
-       (with-syntax ([rhs (syntax-property to-be-named 'inferred-name (syntax-e name))]
-                     [name (syntax-e name)])
-         (syntax (let ([name rhs]) name)))]
-      [(symbol? name)
-       (with-syntax ([rhs (syntax-property to-be-named 'inferred-name name)]
-                     [name name])
-         (syntax (let ([name rhs]) name)))]
-      [else to-be-named])))
-
-;; generate-indices : syntax[list] -> (cons number (listof number))
-;; given a syntax list of length `n', returns a list containing
-;; the number n followed by th numbers from 0 to n-1
-(define (generate-indices stx)
-  (let ([n (length (syntax->list stx))])
-    (cons n
-          (let loop ([i n])
-            (cond
-              [(zero? i) null]
-              [else (cons (- n i)
-                          (loop (- i 1)))])))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arrow.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arrow.rkt
deleted file mode 100644
index c3a8aa8e8b..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arrow.rkt
+++ /dev/null
@@ -1,379 +0,0 @@
-#lang racket/base
-
-(require racket/contract/private/guts
-         racket/contract/private/blame
-         racket/contract/private/prop
-         racket/contract/private/opt
-         racket/contract/private/misc
-         "contract-arr-checks.rkt")
-(require (for-syntax racket/base)
-         (for-syntax racket/contract/private/opt-guts)
-         (for-syntax racket/contract/private/helpers)
-         (for-syntax "contract-arr-obj-helpers.rkt")
-         (for-syntax syntax/stx)
-         (for-syntax syntax/name))
-
-(provide ->
-         ->d
-         ->*
-         ->d*
-         ->r
-         ->pp
-         ->pp-rest
-         case->
-         opt->
-         opt->*)
-
-(define-struct contracted-function (proc ctc)
-  #:property prop:procedure 0
-  #:property prop:contracted 1)
-
-(define (build--> name doms doms-rest rngs kwds quoted-kwds rng-any? func)
-  (let ([doms/c (map (λ (dom) (coerce-contract name dom)) doms)]
-        [rngs/c (map (λ (rng) (coerce-contract name rng)) rngs)]
-        [kwds/c (map (λ (kwd) (coerce-contract name kwd)) kwds)]
-        [doms-rest/c (and doms-rest (coerce-contract name doms-rest))])
-    (make--> rng-any? doms/c doms-rest/c rngs/c kwds/c quoted-kwds func)))
-;; rng-any? : boolean
-;; doms : (listof contract)
-;; dom-rest : (or/c false/c contract)
-;; rngs : (listof contract) -- may be ignored by the wrapper function in the case of any
-;; kwds : (listof contract)
-;; quoted-keywords : (listof keyword) -- must be sorted by keyword<
-;; func : the wrapper function maker. It accepts a procedure for
-;;        checking the first-order properties and the contracts
-;;        and it produces a wrapper-making function.
-(define-struct -> (rng-any? doms dom-rest rngs kwds quoted-kwds func)
-  #:omit-define-syntaxes
-  #:property prop:contract
-  (build-contract-property
-   #:projection
-   (λ (ctc) 
-      (let* ([doms/c (map contract-projection
-                          (if (->-dom-rest ctc)
-                            (append (->-doms ctc) (list (->-dom-rest ctc)))
-                            (->-doms ctc)))]
-             [rngs/c (map contract-projection (->-rngs ctc))]
-             [kwds/c (map contract-projection (->-kwds ctc))]
-             [mandatory-keywords (->-quoted-kwds ctc)]
-             [func (->-func ctc)]
-             [dom-length (length (->-doms ctc))]
-             [has-rest? (and (->-dom-rest ctc) #t)])
-        (lambda (blame)
-          (let ([partial-doms (map (λ (dom) (dom (blame-swap blame)))
-                                   doms/c)]
-                [partial-ranges (map (λ (rng) (rng blame))
-                                     rngs/c)]
-                [partial-kwds (map (λ (kwd) (kwd (blame-swap blame)))
-                                   kwds/c)])
-            (apply func
-                   (λ (val)
-                      (if has-rest?
-                        (check-procedure/more val dom-length '() mandatory-keywords blame)
-                        (check-procedure val dom-length 0 '() mandatory-keywords blame)))
-                   ctc
-                   (append partial-doms partial-ranges partial-kwds))))))
-
-   #:name
-   (λ (ctc) (single-arrow-name-maker 
-             (->-doms ctc)
-             (->-dom-rest ctc)
-             (->-kwds ctc)
-             (->-quoted-kwds ctc)
-             (->-rng-any? ctc)
-             (->-rngs ctc)))
-   #:first-order
-   (λ (ctc)
-      (let ([l (length (->-doms ctc))])
-        (if (->-dom-rest ctc)
-          (λ (x)
-             (and (procedure? x) 
-                  (procedure-accepts-and-more? x l)))
-          (λ (x)
-             (and (procedure? x) 
-                  (procedure-arity-includes? x l)
-                  (no-mandatory-keywords? x))))))
-   #:stronger
-   (λ (this that)
-      (and (->? that)
-           (= (length (->-doms that))
-              (length (->-doms this)))
-           (andmap contract-stronger?
-                   (->-doms that)
-                   (->-doms this))
-           (= (length (->-rngs that))
-              (length (->-rngs this)))
-           (andmap contract-stronger?
-                   (->-rngs this) 
-                   (->-rngs that))))))
-
-(define (single-arrow-name-maker doms/c doms-rest kwds/c kwds rng-any? rngs)
-  (cond
-    [doms-rest
-     (build-compound-type-name 
-      '->*
-      (apply build-compound-type-name (append doms/c (apply append (map list kwds kwds/c))))
-      doms-rest
-      (cond
-        [rng-any? 'any]
-        [else (apply build-compound-type-name rngs)]))]
-    [else
-     (let ([rng-name
-            (cond
-              [rng-any? 'any]
-              [(null? rngs) '(values)]
-              [(null? (cdr rngs)) (car rngs)]
-              [else (apply build-compound-type-name 'values rngs)])])
-       (apply build-compound-type-name 
-              '->
-              (append doms/c
-                      (apply append (map list kwds kwds/c))
-                      (list rng-name))))]))
-
-(define-for-syntax (sort-keywords stx kwd/ctc-pairs)
-  (define (insert x lst)
-    (cond
-      [(null? lst) (list x)]
-      [else
-       (let ([fst-kwd (syntax-e (car (car lst)))])
-         #;(printf "comparing ~s to ~s\n" (car x) fst-kwd)
-         (cond
-           [(equal? (syntax-e (car x)) fst-kwd)
-            (raise-syntax-error #f 
-                                "duplicate keyword"
-                                stx
-                                (car x))]
-           [(keyword<? (syntax-e (car x)) fst-kwd)
-            (cons x lst)]
-           [else (cons (car lst) (insert x (cdr lst)))]))]))
-  
-  (let loop ([pairs (map syntax->list kwd/ctc-pairs)])
-    (cond
-      [(null? pairs) null]
-      [else (insert (car pairs) (loop (cdr pairs)))])))
-
-(define-for-syntax (split-doms stx name raw-doms)
-  (let loop ([raw-doms raw-doms]
-             [doms '()]
-             [kwd-doms '()])
-    (syntax-case raw-doms ()
-      [() (list (reverse doms)
-                (sort-keywords stx kwd-doms))]
-      [(kwd arg . rest)
-       (and (keyword? (syntax-e #'kwd))
-            (not (keyword? (syntax-e #'arg))))
-       (loop #'rest
-             doms
-             (cons #'(kwd arg) kwd-doms))]
-      [(kwd arg . rest)
-       (and (keyword? (syntax-e #'kwd))
-            (keyword? (syntax-e #'arg)))
-       (raise-syntax-error name
-                           "expected a keyword followed by a contract"
-                           stx
-                           #'kwd)]
-      [(kwd)
-       (keyword? (syntax-e #'kwd))
-       (raise-syntax-error name
-                           "expected a keyword to be followed by a contract"
-                           stx
-                           #'kwd)]
-      [(x . rest)
-       (loop #'rest (cons #'x doms) kwd-doms)])))
-
-(define-for-syntax (->-helper stx)
-  (syntax-case stx ()
-    [(-> raw-doms ... last-one)
-     (with-syntax ([((doms ...) ((dom-kwd dom-kwd-ctc) ...)) (split-doms stx '-> #'(raw-doms ...))])
-       (with-syntax ([(dom-kwd-arg ...) (generate-temporaries (syntax (dom-kwd ...)))]
-                     [(dom-kwd-ctc-id ...) (generate-temporaries (syntax (dom-kwd ...)))])
-         (with-syntax ([(keyword-call/ctc ...) (apply append (map syntax->list (syntax->list #'((dom-kwd (dom-kwd-ctc-id dom-kwd-arg)) ...))))]
-                       [(keyword-formal-parameters ...) (apply append (map syntax->list (syntax->list #'((dom-kwd dom-kwd-arg) ...))))]
-                       [(args ...) (generate-temporaries (syntax (doms ...)))]
-                       [(dom-ctc ...) (generate-temporaries (syntax (doms ...)))])
-           (syntax-case* #'last-one (-> any values) module-or-top-identifier=?
-             [any
-              (with-syntax ([(ignored) (generate-temporaries (syntax (rng)))])
-                (values (syntax (dom-ctc ...))
-                        (syntax (ignored))
-                        (syntax (dom-kwd-ctc-id ...))
-                        (syntax (doms ...))
-                        (syntax (any/c))
-                        (syntax (dom-kwd-ctc ...))
-                        (syntax (dom-kwd ...))
-                        (syntax ((args ... keyword-formal-parameters ...) (val (dom-ctc args) ... keyword-call/ctc ...)))
-                        #t))]
-             [(values rngs ...)
-              (with-syntax ([(rng-x ...) (generate-temporaries (syntax (rngs ...)))]
-                            [(rng-ctc ...) (generate-temporaries (syntax (rngs ...)))])
-                (values (syntax (dom-ctc ...))
-                        (syntax (rng-ctc ...))
-                        (syntax (dom-kwd-ctc-id ...))
-                        (syntax (doms ...))
-                        (syntax (rngs ...))
-                        (syntax (dom-kwd-ctc ...))
-                        (syntax (dom-kwd ...))
-                        (syntax ((args ... keyword-formal-parameters ...) 
-                                 (let-values ([(rng-x ...) (val (dom-ctc args) ... keyword-call/ctc ...)])
-                                   (values (rng-ctc rng-x) ...))))
-                        #f))]
-             [rng
-              (with-syntax ([(rng-ctc) (generate-temporaries (syntax (rng)))])
-                (values (syntax (dom-ctc ...))
-                        (syntax (rng-ctc))
-                        (syntax (dom-kwd-ctc-id ...))
-                        (syntax (doms ...))
-                        (syntax (rng))
-                        (syntax (dom-kwd-ctc ...))
-                        (syntax (dom-kwd ...))
-                        (syntax ((args ... keyword-formal-parameters ...) (rng-ctc (val (dom-ctc args) ... keyword-call/ctc ...))))
-                        #f))]))))]))
-
-;; ->/proc/main : syntax -> (values syntax[contract-record] syntax[args/lambda-body] syntax[names])
-(define-for-syntax (->/proc/main stx)
-  (let-values ([(dom-names rng-names kwd-names dom-ctcs rng-ctcs kwd-ctcs kwds inner-args/body use-any?) (->-helper stx)])
-    (with-syntax ([(args body) inner-args/body])
-      (with-syntax ([(dom-names ...) dom-names]
-                    [(rng-names ...) rng-names]
-                    [(kwd-names ...) kwd-names]
-                    [(dom-ctcs ...) dom-ctcs]
-                    [(rng-ctcs ...) rng-ctcs]
-                    [(kwd-ctcs ...) kwd-ctcs]
-                    [(kwds ...) kwds]
-                    [inner-lambda 
-                     (add-name-prop
-                      (syntax-local-infer-name stx)
-                      (syntax (lambda args body)))]
-                    [use-any? use-any?])
-        (with-syntax ([outer-lambda
-                       (syntax
-                        (lambda (chk ctc dom-names ... rng-names ... kwd-names ...)
-                          (lambda (val)
-                            (chk val)
-                            (make-contracted-function inner-lambda ctc))))])
-          (values
-           (syntax (build--> '->
-                             (list dom-ctcs ...)
-                             #f
-                             (list rng-ctcs ...)
-                             (list kwd-ctcs ...)
-                             '(kwds ...)
-                             use-any?
-                             outer-lambda))
-           inner-args/body
-           (syntax (dom-names ... rng-names ...))))))))
-  
-(define-syntax (-> stx) 
-  (let-values ([(stx _1 _2) (->/proc/main stx)])
-    stx))
-
-;; ->/proc/main : syntax -> (values syntax[contract-record] syntax[args/lambda-body] syntax[names])
-(define-for-syntax (->*/proc/main stx)
-  (syntax-case* stx (->* any) module-or-top-identifier=?
-    [(->* (doms ...) any)
-     (->/proc/main (syntax (-> doms ... any)))]
-    [(->* (doms ...) (rngs ...))
-     (->/proc/main (syntax (-> doms ... (values rngs ...))))]
-    [(->* (raw-doms ...) rst rng)
-     (with-syntax ([((doms ...) ((dom-kwd dom-kwd-ctc) ...)) (split-doms stx '-> #'(raw-doms ...))])
-       (with-syntax ([(dom-kwd-arg ...) (generate-temporaries (syntax (dom-kwd ...)))]
-                     [(dom-kwd-ctc-id ...) (generate-temporaries (syntax (dom-kwd ...)))])
-         (with-syntax ([(keyword-formal-parameters ...) (apply append (map syntax->list (syntax->list #'((dom-kwd dom-kwd-arg) ...))))]
-                       [(args ...) (generate-temporaries (syntax (doms ...)))]
-                       [(dom-ctc ...) (generate-temporaries (syntax (doms ...)))])
-           (with-syntax ([(dom-x ...) (generate-temporaries (syntax (doms ...)))]
-                         [(args ...) (generate-temporaries (syntax (doms ...)))]
-                         [(rst-x) (generate-temporaries (syntax (rst)))]
-                         [(rest-arg) (generate-temporaries (syntax (rst)))])
-             (syntax-case #'rng (any)
-               [(rngs ...)
-                (with-syntax ([(rng-x ...) (generate-temporaries (syntax (rngs ...)))]
-                              [(rng-args ...) (generate-temporaries (syntax (rngs ...)))])
-                  
-                  (let ([inner-args/body 
-                         #`((args ... keyword-formal-parameters ... . rest-arg)
-                            (let-values ([(rng-args ...)
-                                          #,(if (null? (syntax-e #'(dom-kwd ...)))
-                                                #'(apply val (dom-x args) ... (rst-x rest-arg))
-                                                #'(keyword-apply val 
-                                                                 '(dom-kwd ...)
-                                                                 (list (dom-kwd-ctc-id dom-kwd-arg) ...) 
-                                                                 (dom-x args) ...
-                                                                 (rst-x rest-arg)))])
-                              (values (rng-x rng-args) ...)))])
-                    (with-syntax ([inner-lambda (with-syntax ([(args body) inner-args/body])
-                                                  (add-name-prop
-                                                   (syntax-local-infer-name stx)
-                                                   (syntax (lambda args body))))])
-                      (with-syntax ([outer-lambda 
-                                     (syntax
-                                      (lambda (chk ctc dom-x ... rst-x rng-x ... dom-kwd-ctc-id ...)
-                                        (lambda (val)
-                                          (chk val)
-                                          (make-contracted-function inner-lambda ctc))))])
-                        (values (syntax (build--> '->*
-                                                  (list doms ...)
-                                                  rst
-                                                  (list rngs ...)
-                                                  (list dom-kwd-ctc ...)
-                                                  '(dom-kwd ...)
-                                                  #f 
-                                                  outer-lambda))
-                                inner-args/body
-                                (syntax (dom-x ... rst-x rng-x ...)))))))]
-               [any
-                (let ([inner-args/body 
-                       #`((args ... keyword-formal-parameters ... . rest-arg)
-                          #,(if (null? (syntax-e #'(dom-kwd ...)))
-                                #'(apply val (dom-x args) ... (rst-x rest-arg))
-                                #'(keyword-apply val
-                                                 '(dom-kwd ...) 
-                                                 (list (dom-kwd-ctc-id dom-kwd-arg) ...)
-                                                 (dom-x args) ...
-                                                 (rst-x rest-arg))))])
-                  (with-syntax ([inner-lambda (with-syntax ([(args body) inner-args/body])
-                                                (add-name-prop
-                                                 (syntax-local-infer-name stx)
-                                                 (syntax (lambda args body))))])
-                    (with-syntax ([outer-lambda 
-                                   (syntax
-                                    (lambda (chk ctc dom-x ... rst-x ignored dom-kwd-ctc-id ...)
-                                      (lambda (val)
-                                        (chk val)
-                                        (make-contracted-function inner-lambda ctc))))])
-                      (values (syntax (build--> '->*
-                                                (list doms ...)
-                                                rst
-                                                (list any/c)
-                                                (list dom-kwd-ctc ...)
-                                                '(dom-kwd ...)
-                                                #t
-                                                outer-lambda))
-                              inner-args/body
-                              (syntax (dom-x ... rst-x))))))])))))]))
-
-(define-syntax (->* stx) 
-  (let-values ([(stx _1 _2) (->*/proc/main stx)])
-    stx))
-
-(define-for-syntax (select/h stx err-name ctxt-stx)
-  (syntax-case stx (-> ->* ->d ->d* ->r ->pp ->pp-rest)
-    [(-> . args) ->/h]
-    [(->* . args) ->*/h]
-    [(->d . args) ->d/h]
-    [(->d* . args) ->d*/h]
-    [(->r . args) ->r/h]
-    [(->pp . args) ->pp/h]
-    [(->pp-rest . args) ->pp-rest/h]
-    [(xxx . args) (raise-syntax-error err-name "unknown arrow constructor" ctxt-stx (syntax xxx))]
-    [_ (raise-syntax-error err-name "malformed arrow clause" ctxt-stx stx)]))
-
-(define-syntax (->d stx) (make-/proc #f ->d/h stx))
-(define-syntax (->d* stx) (make-/proc #f ->d*/h stx))
-(define-syntax (->r stx) (make-/proc #f ->r/h stx))
-(define-syntax (->pp stx) (make-/proc #f ->pp/h stx))
-(define-syntax (->pp-rest stx) (make-/proc #f ->pp-rest/h stx))
-(define-syntax (case-> stx) (make-case->/proc #f stx stx select/h))
-(define-syntax (opt-> stx) (make-opt->/proc #f stx select/h #'case-> #'->))
-(define-syntax (opt->* stx) (make-opt->*/proc #f stx stx select/h #'case-> #'->))
-
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-define.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-define.rkt
deleted file mode 100644
index ebf3154b6c..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-define.rkt
+++ /dev/null
@@ -1,71 +0,0 @@
-#lang racket/base
-
-(provide define/contract)
-
-(require (for-syntax racket/base
-                     syntax/srcloc
-                     (prefix-in a: racket/contract/private/helpers))
-         (only-in racket/contract/private/base contract))
-
-;; First, we have the old define/contract implementation, which
-;; is still used in mzlib/contract.
-
-(define-for-syntax (make-define/contract-transformer contract-id id)
-  (make-set!-transformer
-   (λ (stx)
-     (with-syntax ([neg-blame-str (source-location->string stx "<<unknown>>")]
-                   [contract-id contract-id]
-                   [id id])
-       (syntax-case stx (set!)
-         [(set! id arg)
-          (raise-syntax-error 'define/contract
-                              "cannot set! a define/contract variable"
-                              stx
-                              (syntax id))]
-         [(f arg ...)
-          (syntax/loc stx
-            ((contract contract-id
-                       id
-                       (syntax->datum (quote-syntax f))
-                       neg-blame-str
-                       (quote f)
-                       (quote-syntax f))
-             arg
-             ...))]
-         [ident
-          (identifier? (syntax ident))
-          (syntax/loc stx
-            (contract contract-id
-                      id
-                      (syntax->datum (quote-syntax ident))
-                      neg-blame-str
-                      (quote ident)
-                      (quote-syntax ident)))])))))
-
-;; (define/contract id contract expr)
-;; defines `id' with `contract'; initially binding
-;; it to the result of `expr'.  These variables may not be set!'d.
-(define-syntax (define/contract define-stx)
-  (syntax-case define-stx ()
-    [(_ name contract-expr expr)
-     (identifier? (syntax name))
-     (with-syntax ([contract-id
-                    (a:mangle-id "define/contract-contract-id"
-                                 (syntax name))]
-                   [id (a:mangle-id "define/contract-id"
-                                    (syntax name))])
-       (syntax/loc define-stx
-         (begin
-           (define contract-id contract-expr)
-           (define-syntax name
-             (make-define/contract-transformer (quote-syntax contract-id)
-                                                   (quote-syntax id)))
-           (define id (let ([name expr]) name))  ;; let for procedure naming
-           )))]
-    [(_ name contract-expr expr)
-     (raise-syntax-error 'define/contract "expected identifier in first position"
-                         define-stx
-                         (syntax name))]))
-
-
-
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-mutable.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-mutable.rkt
deleted file mode 100644
index ca1670f41a..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-mutable.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket/base
-
-(require (only-in racket/contract/private/box box-immutable/c)
-         (only-in racket/contract/private/vector
-                  vector-immutableof vector-immutable/c)
-         racket/contract/private/blame
-         racket/contract/private/guts
-         racket/contract/private/prop
-         racket/contract/private/misc)
-
-(provide box/c box-immutable/c
-         vector/c vectorof vector-immutableof vector-immutable/c)
-
-(define/subexpression-pos-prop (box/c ctc)
-  (let ([ctc (coerce-flat-contract 'box/c ctc)])
-    (make-flat-contract
-     #:name (build-compound-type-name 'box/c ctc)
-     #:first-order
-     (λ (val)
-       (and (box? val)
-            (contract-first-order-passes? ctc (unbox val))))
-     #:projection
-     (λ (blame)
-       (λ (val)
-         (let ([proj ((contract-projection ctc) blame)])
-           (unless (box? val)
-             (raise-blame-error blame val "not a box"))
-           (proj (unbox val))
-           val))))))
-
-(define/subexpression-pos-prop (vectorof ctc)
-  (let ([ctc (coerce-flat-contract 'vectorof ctc)])
-    (make-flat-contract
-     #:name (build-compound-type-name 'vectorof ctc)
-     #:first-order
-     (λ (val)
-       (and (vector? val)
-            (for/and ([v (in-vector val)])
-              (contract-first-order-passes? ctc v))))
-     #:projection
-     (λ (blame)
-       (λ (val)
-         (let ([proj ((contract-projection ctc) blame)])
-           (unless (vector? val)
-             (raise-blame-error blame val "not a vector"))
-           (for ([v (in-vector val)])
-             (proj v))
-           val))))))
-
-(define/subexpression-pos-prop (vector/c . ctcs)
-  (let ([ctcs (for/list ([ctc (in-list ctcs)])
-                (coerce-flat-contract 'vector/c ctc))])
-    (make-flat-contract
-     #:name (apply build-compound-type-name 'vector/c ctcs)
-     #:first-order
-     (λ (val)
-       (and (vector? val)
-            (= (vector-length val) (length ctcs))
-            (for/and ([v (in-vector val)]
-                      [c (in-list ctcs)])
-              (contract-first-order-passes? c v))))
-     #:projection
-     (λ (blame)
-       (λ (val)
-         (let ([projs (for/list ([ctc (in-list ctcs)])
-                        ((contract-projection ctc) blame))])
-           (unless (vector? val)
-             (raise-blame-error blame val "not a vector"))
-           (unless (= (vector-length val) (length ctcs))
-             (raise-blame-error blame val "expected vector of length ~a, got length ~a"
-                                (length ctcs) (vector-length val)))
-           (for ([v (in-vector val)]
-                 [p (in-list projs)])
-             (p v))
-           val))))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-object.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-object.rkt
deleted file mode 100644
index c2b6906223..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-object.rkt
+++ /dev/null
@@ -1,301 +0,0 @@
-#lang racket/base
-(require "contract-arrow.rkt"
-         racket/contract/private/guts
-         racket/contract/private/misc
-         racket/contract/private/prop
-         racket/private/class-internal
-         racket/private/class-c-old
-         "contract-arr-checks.rkt")
-
-(require (for-syntax racket/base
-                     "contract-arr-obj-helpers.rkt"))
-
-(provide object-contract)
-
-(define-syntax object-contract
-  (let ()
-    (define (obj->/proc stx) (make-/proc #t ->/h stx))
-    (define (obj->*/proc stx) (make-/proc #t ->*/h stx))
-    (define (obj->d/proc stx) (make-/proc #t ->d/h stx))
-    (define (obj->d*/proc stx) (make-/proc #t ->d*/h stx))
-    (define (obj->r/proc stx) (make-/proc #t ->r/h stx))
-    (define (obj->pp/proc stx) (make-/proc #t ->pp/h stx))
-    (define (obj->pp-rest/proc stx) (make-/proc #t ->pp-rest/h stx))
-    (define (obj-case->/proc stx) (make-case->/proc #t stx stx select/h))
-    
-    ;; WARNING: select/h is copied from contract-arrow.rkt. I'm not sure how
-    ;; I can avoid this duplication -robby
-    (define (select/h stx err-name ctxt-stx)
-      (syntax-case stx (-> ->* ->d ->d* ->r ->pp ->pp-rest)
-        [(-> . args) ->/h]
-        [(->* . args) ->*/h]
-        [(->d . args) ->d/h]
-        [(->d* . args) ->d*/h]
-        [(->r . args) ->r/h]
-        [(->pp . args) ->pp/h]
-        [(->pp-rest . args) ->pp-rest/h]
-        [(xxx . args) (raise-syntax-error err-name "unknown arrow constructor" ctxt-stx (syntax xxx))]
-        [_ (raise-syntax-error err-name "malformed arrow clause" ctxt-stx stx)]))
-    
-    
-    (define (obj-opt->/proc stx) (make-opt->/proc #t stx select/h #'case-> #'->))
-    (define (obj-opt->*/proc stx) (make-opt->*/proc #t stx stx select/h #'case-> #'->))
-    
-    (λ (stx)
-      
-      ;; name : syntax
-      ;; ctc-stx : syntax[evals to a contract]
-      ;; mtd-arg-stx : syntax[list of arg-specs] (ie, for use in a case-lambda)
-      (define-struct mtd (name ctc-stx mtd-arg-stx))
-      
-      ;; name : syntax
-      ;; ctc-stx : syntax[evals to a contract]
-      (define-struct fld (name ctc-stx))
-      
-      ;; expand-field/mtd-spec : stx -> (union mtd fld)
-      (define (expand-field/mtd-spec f/m-stx)
-        (syntax-case f/m-stx (field)
-          [(field field-name ctc)
-           (identifier? (syntax field-name))
-           (make-fld (syntax field-name) (syntax ctc))]
-          [(field field-name ctc)
-           (raise-syntax-error 'object-contract "expected name of field" stx (syntax field-name))]
-          [(mtd-name ctc)
-           (identifier? (syntax mtd-name))
-           (let-values ([(ctc-stx proc-stx) (expand-mtd-contract (syntax ctc))])
-             (make-mtd (syntax mtd-name)
-                       ctc-stx
-                       proc-stx))]
-          [(mtd-name ctc)
-           (raise-syntax-error 'object-contract "expected name of method" stx (syntax mtd-name))]
-          [_ (raise-syntax-error 'object-contract "expected field or method clause" stx f/m-stx)]))
-      
-      ;; expand-mtd-contract : syntax -> (values syntax[expanded ctc] syntax[mtd-arg])
-      (define (expand-mtd-contract mtd-stx)
-        (syntax-case mtd-stx (case-> opt-> opt->*)
-          [(case-> cases ...)
-           (let loop ([cases (syntax->list (syntax (cases ...)))]
-                      [ctc-stxs null]
-                      [args-stxs null])
-             (cond
-               [(null? cases) 
-                (values
-                 (with-syntax ([(x ...) (reverse ctc-stxs)])
-                   (obj-case->/proc (syntax (case-> x ...))))
-                 (with-syntax ([(x ...) (apply append (map syntax->list (reverse args-stxs)))])
-                   (syntax (x ...))))]
-               [else
-                (let-values ([(trans ctc-stx mtd-args) (expand-mtd-arrow (car cases))])
-                  (loop (cdr cases)
-                        (cons ctc-stx ctc-stxs)
-                        (cons mtd-args args-stxs)))]))]
-          [(opt->* (req-contracts ...) (opt-contracts ...) (res-contracts ...))
-           (values
-            (obj-opt->*/proc (syntax (opt->* (any/c req-contracts ...) (opt-contracts ...) (res-contracts ...))))
-            (generate-opt->vars (syntax (req-contracts ...))
-                                (syntax (opt-contracts ...))))]
-          [(opt->* (req-contracts ...) (opt-contracts ...) any)
-           (values
-            (obj-opt->*/proc (syntax (opt->* (any/c req-contracts ...) (opt-contracts ...) any)))
-            (generate-opt->vars (syntax (req-contracts ...))
-                                (syntax (opt-contracts ...))))]
-          [(opt-> (req-contracts ...) (opt-contracts ...) res-contract) 
-           (values
-            (obj-opt->/proc (syntax (opt-> (any/c req-contracts ...) (opt-contracts ...) res-contract)))
-            (generate-opt->vars (syntax (req-contracts ...))
-                                (syntax (opt-contracts ...))))]
-          [else 
-           (let-values ([(x y z) (expand-mtd-arrow mtd-stx)])
-             (values (x y) z))]))
-      
-      ;; generate-opt->vars : syntax[requried contracts] syntax[optional contracts] -> syntax[list of arg specs]
-      (define (generate-opt->vars req-stx opt-stx)
-        (with-syntax ([(req-vars ...) (generate-temporaries req-stx)]
-                      [(ths) (generate-temporaries (syntax (ths)))])
-          (let loop ([opt-vars (generate-temporaries opt-stx)])
-            (cond
-              [(null? opt-vars) (list (syntax (ths req-vars ...)))]
-              [else (with-syntax ([(opt-vars ...) opt-vars]
-                                  [(rests ...) (loop (cdr opt-vars))])
-                      (syntax ((ths req-vars ... opt-vars ...)
-                               rests ...)))]))))
-      
-      ;; expand-mtd-arrow : stx -> (values (syntax[ctc] -> syntax[expanded ctc]) syntax[ctc] syntax[mtd-arg])
-      (define (expand-mtd-arrow mtd-stx)
-        (syntax-case mtd-stx (-> ->* ->d ->d* ->r ->pp ->pp-rest)
-          [(->) (raise-syntax-error 'object-contract "-> must have arguments" stx mtd-stx)]
-          [(-> args ...)
-           ;; this case cheats a little bit --
-           ;; (args ...) contains the right number of arguments
-           ;; to the method because it also contains one arg for the result! urgh.
-           (with-syntax ([(arg-vars ...) (generate-temporaries (syntax (args ...)))])
-             (values obj->/proc
-                     (syntax (-> any/c args ...))
-                     (syntax ((arg-vars ...)))))]
-          [(->* (doms ...) (rngs ...))
-           (with-syntax ([(args-vars ...) (generate-temporaries (syntax (doms ...)))]
-                         [(this-var) (generate-temporaries (syntax (this-var)))])
-             (values obj->*/proc
-                     (syntax (->* (any/c doms ...) (rngs ...)))
-                     (syntax ((this-var args-vars ...)))))]
-          [(->* (doms ...) rst (rngs ...))
-           (with-syntax ([(args-vars ...) (generate-temporaries (syntax (doms ...)))]
-                         [(rst-var) (generate-temporaries (syntax (rst)))]
-                         [(this-var) (generate-temporaries (syntax (this-var)))])
-             (values obj->*/proc
-                     (syntax (->* (any/c doms ...) rst (rngs ...)))
-                     (syntax ((this-var args-vars ... . rst-var)))))]
-          [(->* x ...)
-           (raise-syntax-error 'object-contract "malformed ->*" stx mtd-stx)]
-          [(->d) (raise-syntax-error 'object-contract "->d must have arguments" stx mtd-stx)]
-          [(->d doms ... rng-proc)
-           (let ([doms-val (syntax->list (syntax (doms ...)))])
-             (values
-              obj->d/proc
-              (with-syntax ([(arg-vars ...) (generate-temporaries doms-val)]
-                            [arity-count (length doms-val)])
-                (syntax 
-                 (->d any/c doms ... 
-                      (let ([f rng-proc])
-                        (check->* f arity-count)
-                        (lambda (_this-var arg-vars ...)
-                          (f arg-vars ...))))))
-              (with-syntax ([(args-vars ...) (generate-temporaries doms-val)])
-                (syntax ((this-var args-vars ...))))))]
-          [(->d* (doms ...) rng-proc)
-           (values
-            obj->d*/proc
-            (let ([doms-val (syntax->list (syntax (doms ...)))])
-              (with-syntax ([(arg-vars ...) (generate-temporaries doms-val)]
-                            [arity-count (length doms-val)])
-                (syntax (->d* (any/c doms ...)
-                              (let ([f rng-proc])
-                                (check->* f arity-count)
-                                (lambda (_this-var arg-vars ...)
-                                  (f arg-vars ...)))))))
-            (with-syntax ([(args-vars ...) (generate-temporaries (syntax (doms ...)))]
-                          [(this-var) (generate-temporaries (syntax (this-var)))])
-              (syntax ((this-var args-vars ...)))))]
-          [(->d* (doms ...) rst-ctc rng-proc)
-           (let ([doms-val (syntax->list (syntax (doms ...)))])
-             (values
-              obj->d*/proc
-              (with-syntax ([(arg-vars ...) (generate-temporaries doms-val)]
-                            [(rest-var) (generate-temporaries (syntax (rst-ctc)))]
-                            [arity-count (length doms-val)])
-                (syntax (->d* (any/c doms ...)
-                              rst-ctc
-                              (let ([f rng-proc])
-                                (check->*/more f arity-count)
-                                (lambda (_this-var arg-vars ... . rest-var)
-                                  (apply f arg-vars ... rest-var))))))
-              (with-syntax ([(args-vars ...) (generate-temporaries (syntax (doms ...)))]
-                            [(rst-var) (generate-temporaries (syntax (rst-ctc)))]
-                            [(this-var) (generate-temporaries (syntax (this-var)))])
-                (syntax ((this-var args-vars ... . rst-var))))))]
-          [(->d* x ...)
-           (raise-syntax-error 'object-contract "malformed ->d* method contract" stx mtd-stx)]
-          
-          [(->r ([x dom] ...) rng)
-           (andmap identifier? (syntax->list (syntax (x ...))))
-           (with-syntax ([(arg-vars ...) (generate-temporaries (syntax (x ...)))]
-                         [(this-var) (generate-temporaries (syntax (this-var)))]
-                         [this (datum->syntax mtd-stx 'this)])
-             (values
-              obj->r/proc
-              (syntax (->r ([this any/c] [x dom] ...) rng))
-              (syntax ((this-var arg-vars ...)))))]
-          
-          [(->r ([x dom] ...) rest-x rest-dom rng)
-           (andmap identifier? (syntax->list (syntax (x ...))))
-           (with-syntax ([(arg-vars ...) (generate-temporaries (syntax (x ...)))]
-                         [(this-var) (generate-temporaries (syntax (this-var)))]
-                         [this (datum->syntax mtd-stx 'this)])
-             (values
-              obj->r/proc
-              (syntax (->r ([this any/c] [x dom] ...) rest-x rest-dom rng))
-              (syntax ((this-var arg-vars ... . rest-var)))))]
-          
-          [(->r . x)
-           (raise-syntax-error 'object-contract "malformed ->r declaration")]
-          [(->pp ([x dom] ...) . other-stuff)
-           (andmap identifier? (syntax->list (syntax (x ...))))
-           (with-syntax ([(arg-vars ...) (generate-temporaries (syntax (x ...)))]
-                         [(this-var) (generate-temporaries (syntax (this-var)))]
-                         [this (datum->syntax mtd-stx 'this)])
-             (values
-              obj->pp/proc
-              (syntax (->pp ([this any/c] [x dom] ...) . other-stuff))
-              (syntax ((this-var arg-vars ...)))))]
-          [(->pp . x)
-           (raise-syntax-error 'object-contract "malformed ->pp declaration")]
-          [(->pp-rest ([x dom] ...) rest-id . other-stuff)
-           (and (identifier? (syntax id))
-                (andmap identifier? (syntax->list (syntax (x ...)))))
-           (with-syntax ([(arg-vars ...) (generate-temporaries (syntax (x ...)))]
-                         [(this-var) (generate-temporaries (syntax (this-var)))]
-                         [this (datum->syntax mtd-stx 'this)])
-             (values
-              obj->pp-rest/proc
-              (syntax (->pp ([this any/c] [x dom] ...) rest-id . other-stuff))
-              (syntax ((this-var arg-vars ... . rest-id)))))]
-          [(->pp-rest . x)
-           (raise-syntax-error 'object-contract "malformed ->pp-rest declaration")]
-          [else (raise-syntax-error 'object-contract "unknown method contract syntax" stx mtd-stx)]))
-      
-      (define (syntax->improper-list stx)
-        (define (se->il se)
-          (cond
-            [(pair? se) (sp->il se)]
-            [else se]))
-        (define (stx->il stx)
-          (se->il (syntax-e stx)))
-        (define (sp->il p)
-          (cond
-            [(null? (cdr p)) p]
-            [(pair? (cdr p)) (cons (car p) (sp->il (cdr p)))]
-            [(syntax? (cdr p)) 
-             (let ([un (syntax-e (cdr p))])
-               (if (pair? un)
-                   (cons (car p) (sp->il un))
-                   p))]))
-        (stx->il stx))
-      
-      (syntax-case stx ()
-        [(_ field/mtd-specs ...)
-         (let* ([mtd/flds (map expand-field/mtd-spec (syntax->list (syntax (field/mtd-specs ...))))]
-                [mtds (filter mtd? mtd/flds)]
-                [flds (filter fld? mtd/flds)])
-           (with-syntax ([(method-ctc-stx ...) (map mtd-ctc-stx mtds)]
-                         [(method-name ...) (map mtd-name mtds)]
-                         [(method-ctc-var ...) (generate-temporaries mtds)]
-                         
-                         [(field-ctc-stx ...) (map fld-ctc-stx flds)]
-                         [(field-name ...) (map fld-name flds)]
-                         [(field-ctc-var ...) (generate-temporaries flds)])
-             (syntax
-              (let ([method-ctc-var method-ctc-stx] 
-                    ...
-                    [field-ctc-var (coerce-contract 'object-contract field-ctc-stx)]
-                    ...)
-                (define ctc
-                  (make-contract
-                   #:name
-                   `(object-contract 
-                     ,(build-compound-type-name 'method-name method-ctc-var) ...
-                     ,(build-compound-type-name 'field 'field-name field-ctc-var) ...)
-                   #:projection
-                   (lambda (blame)
-                     (lambda (val)
-                       (make-wrapper-object ctc val blame
-                                            (list 'method-name ...) (list method-ctc-var ...)
-                                            (list 'field-name ...) (list field-ctc-var ...))))
-                   #:first-order
-                   (lambda (val)
-                     (let/ec ret
-                       (check-object-contract val (list 'method-name ...) (list 'field-name ...)
-                                              (λ args (ret #f)))))))
-                  ctc))))]))))
-
-
-
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-struct.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-struct.rkt
deleted file mode 100644
index b7427c3603..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-struct.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     racket/contract/private/helpers
-                     racket/struct-info)
-         racket/contract/private/guts
-         racket/contract/private/misc)
-
-(provide struct/c)
-
-  #|
-    as with copy-struct in struct.rkt, this first begin0
-    expansion "declares" that struct/c is an expression.
-    It prevents further expansion until the internal definition
-    context is sorted out.
-   |#
-(define-syntax (struct/c stx)
-  (syntax-case stx ()
-    [(_ . args) 
-     (with-syntax ([x (syntax/loc stx (do-struct/c . args))])
-       (syntax/loc stx (begin0 x)))]))
-
-(define-syntax (do-struct/c stx)
-  (syntax-case stx ()
-    [(_ struct-name args ...)
-     (and (identifier? (syntax struct-name))
-          (struct-info? (syntax-local-value (syntax struct-name) (λ () #f))))
-     (with-syntax ([(ctc-x ...) (generate-temporaries (syntax (args ...)))]
-                   [(ctc-name-x ...) (generate-temporaries (syntax (args ...)))]
-                   [(ctc-pred-x ...) (generate-temporaries (syntax (args ...)))]
-                   [(ctc-app-x ...) (generate-temporaries (syntax (args ...)))]
-                   [(field-numbers ...)
-                    (let loop ([i 0]
-                               [l (syntax->list (syntax (args ...)))])
-                      (cond
-                        [(null? l) '()]
-                        [else (cons i (loop (+ i 1) (cdr l)))]))]
-                   [(type-desc-id 
-                     constructor-id 
-                     predicate-id 
-                     (rev-selector-id ...)
-                     (mutator-id ...)
-                     super-id)
-                    (lookup-struct-info (syntax struct-name) stx)])
-       (unless (= (length (syntax->list (syntax (rev-selector-id ...))))
-                  (length (syntax->list (syntax (args ...)))))
-         (raise-syntax-error 'struct/c 
-                             (format "expected ~a contracts because struct ~a has ~a fields"
-                                     (length (syntax->list (syntax (rev-selector-id ...))))
-                                     (syntax-e #'struct-name)
-                                     (length (syntax->list (syntax (rev-selector-id ...)))))
-                             stx))
-       (with-syntax ([(selector-id ...) (reverse (syntax->list (syntax (rev-selector-id ...))))])
-         (syntax
-          (let ([ctc-x (coerce-contract 'struct/c args)] ...)
-            
-            (unless predicate-id
-              (error 'struct/c "could not determine predicate for ~s" 'struct-name))
-            (unless (and selector-id ...)
-              (error 'struct/c "could not determine selectors for ~s" 'struct-name))
-            
-            (unless (flat-contract? ctc-x)
-              (error 'struct/c "expected flat contracts as arguments, got ~e" args))
-            ...
-            
-            (let ([ctc-pred-x (flat-contract-predicate ctc-x)] 
-                  ...
-                  [ctc-name-x (contract-name ctc-x)]
-                  ...)
-              (flat-named-contract
-               (build-compound-type-name 'struct/c 'struct-name ctc-x ...)
-               (λ (val)
-                 (and (predicate-id val)
-                      (ctc-pred-x (selector-id val)) ...))))))))]
-    [(_ struct-name anything ...)
-     (raise-syntax-error 'struct/c "expected a struct identifier" stx (syntax struct-name))]))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/package-helper.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/package-helper.rkt
deleted file mode 100644
index 1fbd25d803..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/package-helper.rkt
+++ /dev/null
@@ -1,278 +0,0 @@
-(module package-helper mzscheme
-  (require syntax/boundmap)
-
-  (provide str str? str-renames str-all-renames make-str 
-	   check-defn-context
-	   pre-register-package
-	   re-pre-register-package 
-	   remove-dups stx-assoc mark-to-localize rebuild rebuild-cons
-	   split open
-	   protect
-	   walk-path)
-
-  ;; A compile-time struct for package info:
-  (define-struct str (renames all-renames))
-  ;; renames = renames for exports: (list (id-stx . id-stx) ...)
-  ;; all-renames = all internal renames (needed to determine
-  ;;               the appropriate shadowing variable when `open'
-  ;;               appears in a `package' body)
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; General utilities
-
-  ;; Helper:
-  (define (check-defn-context stx)
-    (when (eq? 'expression (syntax-local-context))
-      (raise-syntax-error
-       #f
-       "allowed only in definition contexts"
-       stx)))
-  
-  ;; Removes dups from * defns
-  (define (remove-dups l)
-    (let ((ht (make-bound-identifier-mapping)))
-      (let loop ((l l))
-        (cond
-          ((null? l) (bound-identifier-mapping-map ht (lambda (k v) v)))
-          ((bound-identifier-mapping-get ht (caar l) (lambda () #f)) (loop (cdr l)))
-          (else 
-           (bound-identifier-mapping-put! ht (caar l) (car l))
-	   (loop (cdr l)))))))
-  
-  (define (stx-assoc id renames)
-    (cond
-     ((null? renames) #f)
-     ((bound-identifier=? id (caar renames)) (car renames))
-     (else (stx-assoc id (cdr renames)))))
-  
-  (define insp (variable-reference->module-declaration-inspector
-                (#%variable-reference)))
-
-  (define (rebuild ctxt val)
-    (if (syntax? ctxt)
-	(datum->syntax-object ctxt val ctxt ctxt)
-	val))
-  
-  (define (rebuild-cons car cdr stx)
-    (rebuild stx (cons car cdr)))
-
-  (define (split path)
-    (let ((r (reverse path)))
-      (values (reverse (cdr r)) (car r))))
-
-  ;; The mark-to-localize function detects uses of `protect'
-  ;; to prevent localization.
-  (define-syntax protect
-    (syntax-rules ()
-      [(_ id) (quote-syntax id)]))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; Side registration table of packages
-
-  (define pre-registered (make-hash-table 'weak))
-  ;; maps context keys to context-hash,
-  ;; where a contetx hash maps id to (cons renames sub-context-hash-or-#f)
-
-  (define (pre-register-package expand-ctx name renames all-renames introducers protect-stx)
-    ;; expand-ctx is the context used for expanding the body;
-    ;; if it's a list longer than 1, then the package itself was
-    ;; expanded in an internal-def position. In that case,
-    ;; we register the just-created package in the table. We
-    ;; also remember any packages that were registered with
-    ;; `(car expand-ctx)'.
-    (when (> (length expand-ctx) 1)
-      (let ([sub-ht (hash-table-get pre-registered (car expand-ctx) (lambda () #f))])
-	(do-pre-register-package
-	 (cadr expand-ctx)
-	 (syntax-local-introduce name)
-	 (list (map (lambda (i)
-		      (cons (syntax-local-introduce (car i)) 
-			    (syntax-local-introduce (cdr i))))
-		    renames)
-	       (map (lambda (i)
-		      (cons (syntax-local-introduce (car i)) 
-			    (syntax-local-introduce (cdr i))))
-		    all-renames)
-	       ;; Each package in the sub-ht table needs to be fixed
-	       ;; up with the renamings introduced by the enclosing package.
-	       (convert-subs sub-ht introducers protect-stx)
-	       #t)))))
-
-  ;; Just a hash-table wrapper
-  (define (do-pre-register-package immediate-ctx name val)
-    (let ([ht (hash-table-get pre-registered immediate-ctx
-			      (lambda ()
-				(let ([ht (make-bound-identifier-mapping)])
-				  (hash-table-put! pre-registered immediate-ctx ht)
-				  ht)))])
-      (bound-identifier-mapping-put! 
-       ht 
-       name
-       val)))
-
-  ;; Gets info for a package that has been expanded but not
-  ;; yet executed as syntax. Used only by get-renames.
-  (define (get-pre-registered-package use-ctx name)
-    (and (pair? use-ctx)
-	 (ormap (lambda (ctx)
-		  (let ([ht (hash-table-get pre-registered ctx (lambda () #f))])
-		    (and ht
-			 (bound-identifier-mapping-get ht 
-						       name
-						       (lambda () #f)))))
-		use-ctx)))
-
-  ;; When `open' exposes a package, we need to pre-register it.
-  ;; Ditto for renaming a package.
-  (define (re-pre-register-package subs expand-ctx name id)
-    (let ([v (if subs
-		 (bound-identifier-mapping-get subs id (lambda () #f))
-		 (get-renames id (lambda (x) (lambda () #f)) #t))])
-      (when v
-	(do-pre-register-package
-	 (car expand-ctx)
-	 name
-	 v))))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;  Fixup
-
-  ;; See pre-register-package. In each package's rename mappings,
-  ;; the source is the original name, so it needs no conversion,
-  ;; but the rename targets need to be the final names.
-  ;; Recursively fix up nasted-package info.
-  (define (convert-subs rn introducers protect-stx)
-    (and rn
-	 (let ([naya (make-bound-identifier-mapping)])
-	   (bound-identifier-mapping-for-each
-	    rn
-	    (lambda (id v)
-	      (bound-identifier-mapping-put!
-	       naya
-	       id
-	       (list (map (lambda (i)
-			    (cons (car i)
-				  ;; The main fixup operation:
-				  (intro-mark-to-localize (cdr i) introducers protect-stx)))
-			  (car v))
-		     (map (lambda (i)
-			    (cons (car i)
-				  ;; The main fixup operation:
-				  (intro-mark-to-localize (cdr i) introducers protect-stx)))
-			  (cadr v))
-		     (convert-subs (caddr v) introducers protect-stx)
-		     #t))))
-	   naya)))
-
-  ;; Mainly applies the introducers, but those introducers are
-  ;;  for the package currently being expanded, and the saved
-  ;;  syntax objects were stored in a table on the side from a
-  ;;  previous expansion. So, we need to "introduce" the
-  ;;  expressions before applying the renaming introducers, then
-  ;;  un-introduce nack to neutral to store in the table.
-  (define (intro-mark-to-localize def introducers protect-stx)
-    (syntax-local-introduce
-     (mark-to-localize (syntax-local-introduce def) introducers protect-stx)))
-
-  ;; Traverses an S-expression, "introducing" identifiers
-  ;; so that they refer to bindings that will be hidden 
-  ;; by the package. Don't localize protected ids, though.
-  (define (mark-to-localize def introducers protect-stx)
-    (let ((contents 
-	   (if (syntax? def)
-	       (syntax-e def)
-	       def)))
-      (cond
-       ((symbol? contents)
-	(let ((introducer (stx-assoc def introducers)))
-	  (if introducer ((cdr introducer) def) def)))
-       ((pair? contents)
-	(if (and (identifier? (car contents))
-		 (module-transformer-identifier=? protect-stx (car contents)))
-	    def
-	    (rebuild-cons (mark-to-localize (car contents) introducers protect-stx)
-			  (mark-to-localize (cdr contents) introducers protect-stx)
-			  def)))
-       ((vector? contents)
-	(rebuild def (list->vector
-		      (map (lambda (x) (mark-to-localize x introducers protect-stx))
-			   (vector->list contents)))))
-       (else def))))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;  Open
-
-  ;; Finds a package, either as a syntax definition or in the
-  ;;  pre-registration table.
-  ;; If the id was input to the current macro expander, it
-  ;;  as been introduced (so we need to un-introduce it
-  ;;  before using syntax-local-value).
-  ;; The resulting env+rns+subs+ispre will have #f for subs when
-  ;;  the package is found by `syntax-local-introduce'. In
-  ;;  that case, sub-packages will be found in the
-  ;;  environment, too.
-  (define (get-renames id err try-pre?)
-    (let ([env+rns+subs+ispre 
-	   (or (and try-pre?
-		    (get-pre-registered-package (syntax-local-context) id))
-	       (let ([v (syntax-local-value (syntax-local-introduce id) (err id))])
-		 (and (str? v)
-		      (list (str-renames v) (str-all-renames v) #f #f))))])
-      (or env+rns+subs+ispre
-	  ((err id)))))
-  
-  ;; Wraps `get-renames' with suitable error handling.
-  (define (open name orig-name stx)
-    (unless (identifier? name)
-      (raise-syntax-error #f "path component must be an identifier" stx name))
-    (let ((err (lambda (name)
-                 (lambda ()
-                   (raise-syntax-error #f "unknown package" stx (if (identifier? orig-name)
-								    orig-name 
-								    name))))))
-      (get-renames (syntax-local-introduce name) err #t)))
-
-  ;; Given an initial package description (as env+rns+subs+ispre), find
-  ;;  the innermost package indicated by `path'. The `stx'
-  ;;  argument is for error reporting, the `rename' argument
-  ;;  accumulates a renamer for environment lookups, and 
-  ;;  `cp-rename' reverse-maps source ids for table lookups 
-  ;;  (when we're in an enclosing package).
-  ;; When env+rns+subs+ispre has a non-#f subs, then we'll always
-  ;;  walk pre-registration info, and the renamer is
-  ;;  not extended.
-  (define (walk-path path env+rns+subs+ispre stx rename cp-rename)
-    (let loop ([path path][env+rns+subs+ispre env+rns+subs+ispre][rename rename])
-      (cond
-       [(null? path) (values env+rns+subs+ispre rename)]
-       [else (let* (;; Revser-map id, in case we're in an enclosing package:
-		    [id (cp-rename (syntax-local-introduce (car path)))]
-		    ;; If we have a sub-package table, it maps the 
-		    ;;  original name, otherwise we need to search
-		    ;;  based on the renamed package in an enclosing package.
-		    [new-name (if (caddr env+rns+subs+ispre)
-				  (cons id id)
-				  (stx-assoc id (cadr env+rns+subs+ispre)))]
-		    [v (and new-name
-			    (if (caddr env+rns+subs+ispre)
-				(bound-identifier-mapping-get (caddr env+rns+subs+ispre) 
-							      (cdr new-name)
-							      (lambda () #f))
-				(get-renames (rename (cdr new-name))
-					     (lambda (x) (lambda () #f))
-					     #f)))])
-	       (if v
-		   (loop (cdr path) v (if (caddr env+rns+subs+ispre)
-					  rename
-					  (lambda (id)
-					    (let ([a (stx-assoc id (cadr env+rns+subs+ispre))])
-					      (rename (if a
-							  (cdr a)
-							  id))))))
-		   (raise-syntax-error
-		    #f
-		    "no such exported subpackage"
-		    stx
-		    (car path))))])))
-  
-  )
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigmatch.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigmatch.rkt
deleted file mode 100644
index 2122e79bb4..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigmatch.rkt
+++ /dev/null
@@ -1,148 +0,0 @@
-(module sigmatch mzscheme
-
-  (require "../unit200.rkt")
-
-  (define (hash-sig src-sig table)
-    (and (pair? src-sig)
-	 (vector? (car src-sig))
-	 (andmap
-	  (lambda (s)
-	    (cond
-	     [(symbol? s)
-	      (if (hash-table-get table s #f)
-		  #f
-		  (begin
-		    (hash-table-put! table s s)
-		    #t))]
-	     [(and (pair? s) (symbol? (car s)))
-	      (let ([name (car s)])
-		(if (hash-table-get table name #f)
-		  #f
-		  (let ([t (make-hash-table)])
-		    (hash-table-put! table name t)
-		    (hash-sig (cdr s) t))))]
-	     [else #f]))
-	  (vector->list (car src-sig)))))
-
-  (define (sig-path-name name path)
-    (let loop ([s (symbol->string name)]
-	       [path path])
-      (if (null? path)
-	  s
-	  (loop (format "~a:~a" s (car path))
-		(cdr path)))))
-
-  (define no-val (gensym))
-
-  (define (check-sig-match table sig path exact? who src-context dest-context wrapped? unwrap)
-    (and (wrapped? sig)
-	 (vector? (unwrap sig))
-	 (andmap
-	  (lambda (s)
-	    (cond
-	     [(symbol? s)
-	      (let ([v (hash-table-get table s no-val)])
-		(when (eq? v no-val)
-		  (raise
-		   (make-exn:fail:unit
-		    (format
-                     "~a: ~a is missing a value name `~a', required by ~a"
-                     who
-                     src-context
-                     (sig-path-name s path)
-                     dest-context)
-		    (current-continuation-marks))))
-		(and v
-		     (begin
-		       (unless (symbol? v)
-			 (let ([p (sig-path-name s path)])
-			   (raise
-			    (make-exn:fail:unit
-			     (format
-                              "~a: ~a contains `~a' as a sub-unit name, but ~a contains `~a' as a value name"
-                              who
-                              src-context
-                              p
-                              dest-context
-                              p)
-			     (current-continuation-marks)))))
-		       (hash-table-put! table s #f)
-		       #t)))]
-	     [(and (pair? s) (symbol? (car s)))
-	      (let ([v (hash-table-get table (car s) no-val)])
-		(when (eq? v no-val)
-		  (raise
-		   (make-exn:fail:unit
-		    (format
-                     "~a: ~a is missing a sub-unit name `~a', required by ~a"
-                     who
-                     src-context
-                     (sig-path-name (car s) path)
-                     dest-context)
-		    (current-continuation-marks))))
-		(and v
-		     (begin
-		       (unless (hash-table? v)
-			 (let ([p (sig-path-name (car s) path)])
-			   (raise
-			    (make-exn:fail:unit
-			     (format
-                              "~a: ~a contains `~a' as a value name, but ~a contains `~a' as a sub-unit name"
-                              who
-                              src-context
-                              p
-                              dest-context
-                              p)
-			     (current-continuation-marks)))))
-		       (hash-table-put! table (car s) #f)
-		       (check-sig-match v (cdr s) (cons (car s) path)
-					exact? who src-context dest-context
-					wrapped? unwrap))))]
-	     [else #f]))
-	  (vector->list (unwrap sig)))
-	 (or (not exact?)
-	     (hash-table-for-each
-	      table
-	      (lambda (k v)
-		(when v
-		  (let ([p (sig-path-name k path)])
-		    (raise
-		     (make-exn:fail:unit
-		      (format
-                       "~a: ~a contains an extra ~a name `~a' that is not required by ~a"
-                       who
-                       src-context
-                       (if (symbol? v) 'value 'sub-unit)
-                       p
-                       dest-context)
-		      (current-continuation-marks)))))))
-	     #t)))
-
-  (define (-verify-signature-match who exact? dest-context dest-sig src-context src-sig wrapped? unwrap)
-    (unless (symbol? who)
-      (raise-type-error 'verify-signature-match "symbol" who))
-    (unless (string? dest-context)
-      (raise-type-error 'verify-signature-match "string" dest-context))
-    (unless (string? src-context)
-      (raise-type-error 'verify-signature-match "string" src-context))
-
-    (let ([src-table (make-hash-table)])
-      (unless (hash-sig src-sig src-table)
-	(raise-type-error 'verify-signature-match "exploded signature" src-sig))
-
-      (unless (check-sig-match src-table dest-sig null
-			       exact? who src-context dest-context
-			       wrapped? unwrap)
-	(raise-type-error 'verify-signature-match "exploded signature" dest-sig))))
-
-  (define (alt-verify-signature-match who exact? dest-context dest-sig src-context src-sig)
-    (-verify-signature-match who exact? dest-context dest-sig src-context src-sig
-			     pair? car))
-
-  (define (verify-signature-match who exact? dest-context dest-sig src-context src-sig)
-    (-verify-signature-match who exact? dest-context dest-sig src-context src-sig
-			     values values))
-
-  (provide -verify-signature-match
-	   verify-signature-match
-	   alt-verify-signature-match))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigutil.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigutil.rkt
deleted file mode 100644
index ccd2dcc574..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigutil.rkt
+++ /dev/null
@@ -1,1229 +0,0 @@
-(module sigutil mzscheme
-  ;; Used by unitsig.rkt
-  ;; (needs an overhaul, too)
-
-  (require syntax/stx
-	   syntax/struct
-	   syntax/context)
-
-  (require "sigmatch.rkt")
-  (require "../unit200.rkt")
-  (require (only racket/base filter sort))
-
-  (define-struct signature (name      ; sym
-			    src       ; sym
-			    elems     ; list of syms and signatures
-			    ctxs      ; list of stx
-			    structs)) ; list of struct-infos
-  (define-struct parsed-unit (imports renames vars import-vars body stx-checks))
-
-  (define-struct struct-def (name super-name names))
-
-  (define-struct sigdef (content interned))
-  (define (make-sig x) (make-sigdef x #f))
-  (provide make-sig)
-
-  (define inline-sig-name '<unnamed>)
-
-  (define-syntax literal?
-    (lambda (expr)
-      (syntax-case expr ()
-	[(_ a)
-	 (syntax (eq? (syntax-e (syntax a)) 'a))])))
-
-  (define (stx->sym s)
-    (if (syntax? s) (syntax-e s) s))
-
-  (define syntax-error
-    (case-lambda 
-     [(who expr msg sub)
-      (raise-syntax-error who msg expr sub)]
-     [(who expr msg)
-      (raise-syntax-error who msg expr)]))
-
-  (define undef-sig-error
-    (lambda (who expr what)
-      (syntax-error #f expr 
-		    "signature not defined"
-		    what)))
-
-  (define not-a-sig-error
-    (lambda (who expr what)
-      (syntax-error #f expr 
-		    "not a signature"
-		    what)))
-
-  (define rename-signature
-    (lambda (sig name main-ctx)
-      (make-signature name 
-		      (signature-src sig) 
-		      (signature-elems sig)
-		      (if main-ctx
-			  (map (lambda (ctx) (or ctx main-ctx)) (signature-ctxs sig))
-			  (signature-ctxs sig))
-		      (signature-structs sig))))
-
-  (define intern-signature
-    (lambda (name desc)
-      (let ([elems (vector->list (car desc))])
-	(make-signature
-	 name
-	 name
-	 (map
-	  (lambda (elem)
-	    (cond
-	     [(symbol? elem) elem]
-	     [(and (pair? elem) (symbol? (car elem)))
-	      (intern-signature (car elem) (cdr elem))]
-	     [else (error "intern failed")]))
-	  elems)
-	 (map (lambda (elem) #f) elems)
-	 (map
-	  (lambda (elem)
-	    (make-struct-def (vector-ref elem 0)
-			     (vector-ref elem 1)
-			     (cddr (vector->list elem))))
-	  (vector->list (cdr desc)))))))
-
-  (define get-sig
-    (lambda (who expr name sigid main-ctx)
-      (if (not (identifier? sigid))
-	  (parse-signature who expr 
-			   (if name
-			       name
-			       inline-sig-name)
-			   sigid
-			   main-ctx)
-	  (let ([v (syntax-local-value sigid (lambda () #f))])
-	    (unless v
-	      (undef-sig-error who expr sigid))
-	    (unless (sigdef? v)
-	      (not-a-sig-error who expr sigid))
-	    (unless (sigdef-interned v)
-	      (set-sigdef-interned! v (intern-signature (syntax-e sigid) (sigdef-content v))))
-	    (let ([s (sigdef-interned v)])
-	      (if name
-		  (rename-signature s (stx->sym name) (and main-ctx sigid))
-		  s))))))
-
-  (define check-unique
-    (lambda (names error-k)
-      (let ([dup (check-duplicate-identifier 
-		  (map (lambda (n)
-			 (if (syntax? n)
-			     n
-			     (datum->syntax-object #f n #f)))
-		       names))])
-	(when dup
-	  (error-k dup)))))
-
-  (define parse-signature
-    (lambda (who expr name body main-ctx)
-      (let-values ([(elems ctxs struct-defs)
-		    (let loop ([body body][accum null][ctx-accum null][struct-accum null])
-		      (syntax-case body ()
-			[() (values (reverse accum) (reverse ctx-accum) (reverse struct-accum))]
-			[(something . rest)
-			 (syntax-case (syntax something) ()
-			   [:
-			    (literal? :)
-			    (syntax-error #f expr
-					  "misplaced `:'"
-					  (syntax something))]
-			   [id
-			    (identifier? (syntax id))
-			    (loop
-			     (syntax rest)
-			     (cons (syntax id) accum)
-			     (cons (syntax id) ctx-accum)
-			     struct-accum)]
-			   [(struct name (field ...) omission ...)
-			    (literal? struct)
-			    (let ([name (syntax name)]
-				  [fields (syntax->list (syntax (field ...)))]
-				  [omissions (syntax->list (syntax (omission ...)))])
-			      (unless (or (identifier? name)
-					  ;; >>> disabled the `(name super)' case for now <<<
-					  (and #f (syntax-case name ()
-						    [(name super)
-						     (and (identifier? (syntax name))
-							  (identifier? (syntax super)))]
-						    [_else #f])))
-				(syntax-error #f expr
-					      "struct name is not an identifier" ;; " or a parenthesized name--super sequence of identifiers"
-					      name))
-			      (for-each
-			       (lambda (fld)
-				 (unless (identifier? fld)
-				   (syntax-error #f expr
-						 "field name is not an identifier"
-						 fld)))
-			       fields)
-			      (let-values ([(omit-names
-					     omit-setters?
-					     omit-selectors?)
-					    (let loop ([omissions omissions]
-						       [names null]
-						       [no-set? #f]
-						       [no-sel? #f])
-					      (if (null? omissions)
-						  (values names no-set? no-sel?)
-						  (let ([rest (cdr omissions)])
-						    (syntax-case (car omissions) ()
-						      [-selectors
-						       (literal? -selectors)
-						       (loop rest names no-sel? #t)]
-						      [-setters
-						       (literal? -setters)
-						       (loop rest names #t no-set?)]
-						      [(- name)
-						       (and (literal? -) (identifier? (syntax name)))
-						       (loop rest (cons (syntax name) names)
-							     no-set? no-sel?)]
-						      [else
-						       (syntax-error #f expr
-								     "bad struct omission"
-								     (car omissions))]))))]
-					   [(name super-name) (if (identifier? name)
-								  (values name #f)
-								  (values (stx-car name)
-									  (stx-car (stx-cdr name))))])
-				(letrec ([names (build-struct-names 
-						 name fields 
-						 omit-selectors? omit-setters?)]
-					 [filter
-					  (lambda (names)
-					    (cond
-					     [(null? names) null]
-					     [(ormap (lambda (x) (eq? (syntax-e (car names))
-								      (syntax-e x)))
-						     omit-names)
-					      (filter (cdr names))]
-					     [else (cons (car names) (filter (cdr names)))]))])
-				  (let ([elems (if (null? omit-names)
-						   names 
-						   (filter names))])
-				    (loop (syntax rest)
-					  (append
-					   elems
-					   accum)
-					  (append
-					   (map (lambda (elem) name) elems)
-					   ctx-accum)
-					  (cons (make-struct-def (syntax-e name) 
-								 (and super-name (syntax-e super-name))
-								 names)
-						struct-accum))))))]
-			   [(struct . _)
-			    (literal? struct)
-			    (syntax-error #f expr
-					  "bad `struct' clause form"
-					  (syntax something))]
-			   [(unit name : sig) 
-			    (and (literal? unit)
-				 (identifier? (syntax name)))
-			    (let ([s (get-sig who expr (syntax name) (syntax sig) (and main-ctx (syntax sig)))])
-			      (loop (syntax rest)
-				    (cons s accum)
-				    (cons (syntax name) ctx-accum)
-				    struct-accum))]
-			   [(unit . _)
-			    (literal? unit)
-			    (syntax-error #f expr 
-					  "bad `unit' clause form"
-					  (syntax something))]
-			   [(open sig)
-			    (literal? open)
-			    (let ([s (get-sig who expr #f (syntax sig) (and main-ctx (syntax sig)))])
-			      (loop (syntax rest)
-				    (append (signature-elems s) accum)
-				    (append
-				     (map (lambda (e ctx)
-					    (or ctx (syntax sig)))
-					  (signature-elems s)
-					  (signature-ctxs s))
-				     ctx-accum)
-				    (append (signature-structs s) struct-accum)))]
-			   [(open . _)
-			    (literal? open)
-			    (syntax-error #f expr 
-					  "bad `open' clause form"
-					  (syntax something))]
-			   [else
-			    (syntax-error #f expr "improper signature clause type"
-					  (syntax something))])]
-			[_else (syntax-error #f expr "ill-formed signature"
-					     body)]))])
-	(check-unique (map
-		       (lambda (elem)
-			 (cond
-			  [(symbol? elem) elem]
-			  [(identifier? elem) (syntax-e elem)]
-			  [else (signature-name elem)]))
-		       elems)
-		      (lambda (name)
-			(syntax-error #f expr
-				      "duplicate name in signature"
-				      name)))
-	(let ([sorted (sort-signature-elems (map cons 
-						 (map (lambda (id)
-							(if (identifier? id)
-							    (syntax-e id)
-							    id))
-						      elems)
-						 (if main-ctx
-						     (map (lambda (ctx) (or ctx main-ctx)) ctxs)
-						     (map (lambda (id) #f) ctxs))))])
-	  (make-signature (stx->sym name)
-			  (stx->sym name)
-			  (map car sorted)
-			  (map cdr sorted)
-			  struct-defs)))))
-
-  (define (intern-vector intern-box v)
-    (if (and intern-box
-	     (equal? #() (cdr v))
-	     (andmap symbol? (vector->list (car v))))
-	(or (ormap (lambda (i)
-		     (and (equal? (car v) (caadr i))
-			  (list 'unquote (car i))))
-		   (unbox intern-box))
-	    (let ([name (car (generate-temporaries '(idvec)))])
-	      (set-box! intern-box
-			(cons (list name v)
-			      (unbox intern-box)))
-	      (list 'unquote name)))
-	v))
-
-  (define explode-sig
-    (lambda (sig intern-box)
-      (intern-vector
-       intern-box
-       (cons
-	(list->vector
-	 (map
-	  (lambda (v)
-	    (if (symbol? v)
-		v
-		(cons
-		 (signature-name v)
-		 (explode-sig v intern-box))))
-	  (signature-elems sig)))
-	(list->vector
-	 (map
-	  (lambda (v)
-	    (list->vector (list* (struct-def-name v)
-				 (struct-def-super-name v)
-				 (struct-def-names v))))
-	  (signature-structs sig)))))))
-
-  (define explode-named-sig
-    (lambda (s intern-box)
-      (cons
-       (cond
-	[(signature-name s)]
-	[(signature-src s)]
-	[else inline-sig-name])
-       (explode-sig s intern-box))))
-
-  (define explode-named-sigs
-    (lambda (sigs intern-box)
-      (map (lambda (sig) (explode-named-sig sig intern-box)) sigs)))
-
-  (define sort-signature-elems
-    (lambda (elems)
-      (map car
-	   (sort (map (lambda (ip)
-                        (let ([i (car ip)])
-                          (cons ip (symbol->string
-                                    (if (symbol? i) i (signature-name i))))))
-                      elems)
-                 ;; Less-than; put subs at front
-                 (lambda (a b)
-                   (if (symbol? (caar a))
-                     (if (symbol? (caar b))
-                       (string<? (cdr a) (cdr b))
-                       #f)
-                     (if (symbol? (caar b))
-                       #t
-                       (string<? (cdr a) (cdr b)))))))))
-  
-  (define flatten-signature
-    (lambda (id sig main-ctx)
-      (apply
-       append
-       (map
-	(lambda (elem ctx)
-	  (if (symbol? elem)
-	      (let ([sym
-		     (if id
-			 (string->symbol (string-append id ":" (symbol->string elem)))
-			 elem)])
-		(list
-		 (if main-ctx
-		     (datum->syntax-object (or ctx main-ctx) sym)
-		     sym)))
-	      (flatten-signature (let* ([n (signature-name elem)]
-					[s (if n
-					       (symbol->string n)
-					       #f)])
-				   (if (and id s)
-				       (string-append id ":" s)
-				       (or id s)))
-				 elem
-				 (or ctx main-ctx))))
-	(signature-elems sig)
-	(signature-ctxs sig)))))
-
-  (define flatten-signatures
-    (lambda (sigs main-ctx)
-      (apply append (map (lambda (s) 
-			   (let* ([name (signature-name s)]
-				  [id (if name
-					  (symbol->string name)
-					  #f)])
-			     (flatten-signature id s main-ctx)))
-			 sigs))))
-
-  (define signature-parts
-    (lambda (q?)
-      (lambda (sig)
-	(let loop ([elems (signature-elems sig)])
-	  (cond
-	   [(null? elems) null]
-	   [(q? (car elems)) (cons (car elems) (loop (cdr elems)))]
-	   [else (loop (cdr elems))])))))
-  (define signature-vars (signature-parts symbol?))
-  (define signature-subsigs (signature-parts signature?))
-
-  (define do-rename
-    (lambda (export-name renames)
-      (let loop ([renames renames])
-	(cond
-	 [(null? renames) export-name]
-	 [(eq? (cadar renames) export-name)
-	  (caar renames)]
-	 [else (loop (cdr renames))]))))
-
-  (define (make-struct-stx-decls sig prefix init-prefix? src-stx check?)
-    ;; If check? is #f, generates a syntax definition for <name> for
-    ;; each <name> struct form in `sig'. Used for imports.
-    ;; If check? is #t, generates an empty syntax "definition" that has
-    ;; the side-effect of checking <name> against its expected shape.
-    ;; CURRENTLY, check? is always #f.
-    (let ([signame (and init-prefix?
-			(signature-name sig))])
-      (append
-       (apply
-	append
-	(map (lambda (s)
-	       (make-struct-stx-decls s
-				      (if signame
-					  (format "~a~a:"
-						  (or prefix "")
-						  signame)
-					  prefix)
-				      #t
-				      src-stx
-				      check?))
-	     (filter signature? (signature-elems sig))))
-       (map (lambda (si)
-	      (let ([names (struct-def-names si)]
-		    [pfx (lambda (s)
-			   `(quote-syntax
-			     ,(let ([id (string->symbol 
-					 (format "~a~a~a" 
-						 (or prefix "")
-						 (if signame
-						     (format "~a:" signame)
-						     "")
-						 (if (syntax? s)
-						     (syntax-e s)
-						     s)))])
-				(datum->syntax-object src-stx id))))])
-		(let* ([name (pfx (struct-def-name si))]
-		       [check (if check?
-				  (lambda (l)
-				    `(verify-struct-shape ,name ,l))
-				  values)])
-		  `(define-syntaxes (,@(if check? null (list (cadr name))))
-		     ,(check
-		       `(list ,(pfx (car names))
-                              ,(pfx (cadr names))
-                              ,(pfx (caddr names))
-                              ;; trailing #fs below mean that we don't know whether we have all the fields:
-                              (list
-                               ,@(map pfx (every-other (cdddr names)))
-                               #f)
-                              (list
-                               ,@(map pfx (every-other (if (null? (cdddr names)) null (cddddr names))))
-                               #f)
-                              #f))))))
-	    (signature-structs sig)))))
-
-  ;; Could be called at expansion time from the result of a `unit/sig' expansion.
-  ;; NOT CURRENTLY USED.
-  (define (verify-struct-shape name shape)
-    (let ([v (syntax-local-value name (lambda () #f))]
-	  [n (length (list-ref shape 3))])
-      (unless (and (list? v)
-		   (= (length v) 5)
-		   (identifier? (car v))
-		   (module-identifier=? (car v) (car shape))
-		   (identifier? (cadr v))
-		   (module-identifier=? (cadr v) (cadr shape))
-		   (identifier? (caddr v))
-		   (module-identifier=? (caddr v) (caddr shape))
-		   (list? (list-ref v 3))
-		   (= (length (list-ref v 3)) n)
-		   (andmap identifier? (list-ref v 3))
-		   (andmap module-identifier=? (list-ref v 3) (list-ref shape 3))
-		   (list? (list-ref v 4))
-		   (= (length (list-ref v 4)) n)
-		   (andmap identifier? (list-ref v 4))
-		   (andmap module-identifier=? (list-ref v 4) (list-ref shape 4)))
-	(raise-syntax-error
-	 'unit/sig
-	 (format "struct definition for `~a' within the unit does not match the export signature (~a)"
-		 (let ([s (symbol->string (syntax-e name))])
-		   (substring s 0 (- (string-length s) 2)))
-		 ;; Say why:
-		 (cond
-		  [(not v) "definition is missing or does not use `define-struct'"]
-		  [(not (and (list? v)
-			     (= (length v) 5)
-			     (identifier? (car v))
-			     (identifier? (cadr v))
-			     (identifier? (caddr v))
-			     (list? (list-ref v 3))
-			     (andmap identifier? (list-ref v 3))
-			     (list? (list-ref v 4))
-			     (andmap identifier? (list-ref v 4))
-			     (= (length (list-ref v 4)) (length (list-ref v 3)))))
-		   "compile-time struct information is stragely malformed"]
-		  [(not (< (length (list-ref v 3)) n))
-		   "extra fields in definition"]
-		  [(not (> (length (list-ref v 3)) n))
-		   "missing fields in definition"]
-		  [else
-		   "different field names or order"]))))
-      ;; Return 0 values to context
-      (values)))
-	 
-
-  (define (every-other l)
-    (let loop ([l l][r null])
-      (cond
-       [(null? l) r]
-       [(null? (cdr l)) (cons (car l) r)]
-       [else (loop (cddr l) (cons (car l) r))])))
-  
-  ;; ------------------------------------------------------------
-      
-  (define check-signature-unit-body
-    (lambda (sig a-unit renames who expr)
-      (let ([vars (map syntax-e (parsed-unit-vars a-unit))])
-	(for-each
-	 (lambda (var)
-	   (let ([renamed (let ([s (do-rename var renames)])
-			    (if (syntax? s)
-				(syntax-e s)
-				s))])
-	     (unless (memq renamed vars)
-		     (syntax-error #f expr
-				   (format 
-				    "signature \"~s\" requires variable \"~s\"~a"
-				    (signature-src sig)
-				    var
-				    (if (eq? var renamed)
-					""
-					(format " renamed \"~s\"" renamed)))))))
-	 (signature-vars sig))
-	(unless (null? (signature-subsigs sig))
-		(syntax-error #f expr
-			      (format 
-			       "signature \"~s\" requires sub-units"
-			       (signature-src sig)))))))
-
-  (define parse-imports
-    (lambda (who untagged-legal? really-import? expr clause keep-ctx?)
-      (let ([bad
-	     (lambda (why . rest)
-	       (apply
-		syntax-error #f expr 
-		(format (if really-import?
-			    "bad `import' clause~a" 
-			    "bad linkage specification~a")
-			why)
-		rest))])
-	(let ([clause (stx->list clause)])
-	  (unless (stx-list? clause)
-	    (bad ""))
-	  (map
-	   (lambda (item)
-	     (syntax-case item ()
-	       [id 
-		(and (identifier? (syntax id))
-		     untagged-legal?)
-		(rename-signature (get-sig who expr #f item (and keep-ctx? (syntax id))) #f (syntax id))]
-	       [(id : sig)
-		(and (identifier? (syntax id))
-		     (literal? :))
-		(get-sig who expr (syntax id) (syntax sig) (and keep-ctx? (syntax sig)))]
-	       [any
-		untagged-legal?
-		(rename-signature (get-sig who expr #f item (and keep-ctx? (syntax any))) #f (syntax any))]
-	       [_else
-		(bad "" item)]))
-	   clause)))))
-
-  (define parse-unit
-    (lambda (expr body sig user-stx-forms dv-stx ds-stx begin-stx)
-      (let ([body (stx->list body)])
-	(unless body
-	  (syntax-error #f expr "illegal use of `.'"))
-	(unless (and (pair? body)
-		     (stx-pair? (car body))
-		     (eq? 'import (syntax-e (stx-car (car body)))))
-	  (syntax-error #f expr 
-			"expected `import' clause"))
-	(let* ([imports (parse-imports 'unit/sig #t #t expr (stx-cdr (car body)) #t)]
-	       [imported-names (flatten-signatures imports #f)]
-	       [exported-names (flatten-signature #f sig #f)]
-	       [def-ctx (syntax-local-make-definition-context)]
-	       [body (cdr body)])
-	  (let-values ([(renames body)
-			(if (and (stx-pair? body)
-				 (stx-pair? (car body))
-				 (eq? 'rename (syntax-e (stx-car (car body)))))
-			    (values (map (lambda (p)
-					   (list (stx-car p)
-						 (syntax-e (stx-car (stx-cdr p)))))
-					 (cdr (stx->list 
-					       (let ([rn (car body)])
-                                                 ;; Use internal-definition-context-apply ??
-						 (local-expand rn
-							       'expression
-							       (list (stx-car rn))
-							       def-ctx)))))
-				    (cdr body))
-			    (values null body))])
-	    (unless renames
-	      (syntax-error #f expr "illegal use of `.'" (car body)))
-	    ;; Check renames:
-	    (let ([bad
-		   (lambda (why sub)
-		     (syntax-error #f expr 
-				   (format "bad `rename' clause~a" why)
-				   sub))])
-	      (for-each
-	       (lambda (id)
-		 (syntax-case id ()
-		   [(iid eid)
-		    (begin
-		      (unless (identifier? (syntax iid))
-			(bad ": original name is not an identifier" (syntax iid)))
-		      (unless (identifier? (syntax eid))
-			(bad ": new name is not an identifier" (syntax eid))))]
-		   [else
-		    (bad "" id)]))
-	       renames))
-	    (check-unique (map car renames)
-			  (lambda (name)
-			    (syntax-error #f expr
-					  "id renamed twice"
-					  name)))
-	    (let* ([renamed-internals (map car renames)]
-		   [swapped-renames (map (lambda (s) (cons (cadr s) (car s))) renames)]
-		   [filtered-exported-names 
-		    (if (null? renames) ;; an optimization
-			exported-names
-			(let loop ([e exported-names])
-			  (if (null? e)
-			      e
-			      (if (ormap (lambda (rn) (eq? (car rn) (car e))) 
-					 swapped-renames)
-				  (loop (cdr e))
-				  (cons (car e) (loop (cdr e)))))))]
-		   [local-vars (map (lambda (s)
-                                      (datum->syntax-object expr s))
-                                    (append renamed-internals filtered-exported-names imported-names))]
-		   [expand-context (generate-expand-context)]
-		   [import-stxes (apply append (map (lambda (i) 
-						      (map
-						       (lambda (d)
-							 (datum->syntax-object expr d))
-						       (make-struct-stx-decls i #f #t expr #f)))
-						    imports))]
-		   [import-vars
-		    (let ([vars (map (lambda (sym) (datum->syntax-object expr sym expr))
-				     (flatten-signatures imports 'must-have-ctx))])
-		      ;; Treat imported names like internal definitions:
-		      (syntax-local-bind-syntaxes vars #f def-ctx)
-		      (cdr (syntax->list (local-expand #`(stop #,@vars)
-						       'expression
-						       (list #'stop)
-						       def-ctx))))])
-	      (let loop ([pre-lines null][lines (append import-stxes body)][port #f][port-name #f][body null][vars null])
-		(cond
-		 [(and (null? pre-lines) (not port) (null? lines))
-                  (internal-definition-context-seal def-ctx)
-		  (make-parsed-unit imports 
-				    renames 
-				    vars 
-				    import-vars
-				    body
-				    (lambda (src-stx) 
-				      ;; Disabled until we have a mechanism for declaring precise information in signatures:
-				      ;; (make-struct-stx-decls sig #f #f src-stx #t)
-				      null))]
-		 [(and (null? pre-lines) (not port) (not (pair? lines)))
-		  (syntax-error #f expr "improper body list form")]
-		 [else
-		  (let-values ([(line) (let ([s (cond
-						 [(pair? pre-lines) (car pre-lines)]
-						 [port (read-syntax port-name port)]
-						 [else (car lines)])])
-					 (if (eof-object? s)
-					     s
-					     (local-expand s    
-							   expand-context
-							   (append
-							    user-stx-forms
-							    local-vars)
-							   def-ctx)))]
-			       [(rest-pre-lines) 
-				(if (null? pre-lines)
-				    null
-				    (cdr pre-lines))]
-			       [(rest-lines)
-				(if (and (null? pre-lines) (not port))
-				    (cdr lines)
-				    lines)])
-		    (cond
-		     [(and (null? pre-lines) 
-			   port
-			   (eof-object? line))
-		      (values lines body vars)]
-		     [(and (stx-pair? line)
-			   (identifier? (stx-car line))
-			   (module-identifier=? (stx-car line) dv-stx))
-		      (syntax-case line ()
-			[(_ (id ...) rhs)
-			 (let ([ids (syntax->list #'(id ...))])
-			   (for-each (lambda (id)
-				       (unless (identifier? #'id)
-					 (syntax-error #f id "not an identifier" line)))
-				     ids)
-			   (syntax-local-bind-syntaxes ids #f def-ctx)
-			   (loop rest-pre-lines
-				 rest-lines
-				 port
-				 port-name
-				 (cons line body)
-				 (append ids vars)))]
-			[else
-			 (syntax-error #f expr 
-				       "improper `define-values' clause form"
-				       line)])]
-		     [(and (stx-pair? line)
-			   (identifier? (stx-car line))
-			   (module-identifier=? (stx-car line) ds-stx))
-		      (syntax-case line ()
-			[(_ (id ...) rhs)
-			 (let ([ids (syntax->list #'(id ...))])
-			   (for-each (lambda (id)
-				       (unless (identifier? #'id)
-					 (syntax-error #f id "not an identifier" line)))
-				     ids)
-			   (with-syntax ([rhs (local-transformer-expand
-					       #'rhs
-					       'expression
-					       null)])
-			     (syntax-local-bind-syntaxes ids #'rhs def-ctx)
-			     (loop rest-pre-lines
-				   rest-lines
-				   port
-				   port-name
-				   (cons line body)
-				   vars)))]
-			[else
-			 (syntax-error #f expr 
-				       "improper `define-syntaxes' clause form"
-				       line)])]
-		     [(and (stx-pair? line)
-			   (identifier? (stx-car line))
-			   (module-identifier=? (stx-car line) begin-stx))
-		      (let ([line-list (stx->list line)])
-			(unless line-list
-			  (syntax-error #f expr 
-					"improper `begin' clause form"
-					line))
-			(loop (append (cdr line-list) rest-pre-lines)
-			      rest-lines
-			      port
-			      port-name
-			      body
-			      vars))]
-		     [else
-		      (loop rest-pre-lines
-			    rest-lines
-			    port
-			    port-name
-			    (cons line body)
-			    vars)]))]))))))))
-  
-  (define-struct link (name sig expr links))
-  (define-struct sig-explode-pair (sigpart exploded))
-
-  (define parse-compound-unit
-    (lambda (expr body)
-      (syntax-case body ()
-	[((import . imports)
-	  (link . links)
-	  (export . exports))
-	 (and (literal? import) (literal? link) (literal? export))
-	 (let* ([imports (parse-imports 'compound-unit/sig #f #t expr (syntax imports) #f)])
-	   (let ([link-list (syntax->list (syntax links))])
-	     (unless link-list
-	       (syntax-error #f expr 
-			     "improper `link' clause form"
-			     (syntax links)))
-	     (let* ([bad
-		     (lambda (why sub)
-		       (syntax-error #f expr 
-				     (format "bad `link' element~a" why)
-				     sub))]
-		    [links
-		     (map
-		      (lambda (line)
-			(syntax-case line ()
-			  [(tag : sig (expr linkage ...))
-			   (literal? :)
-			   (begin
-			     (unless (identifier? (syntax tag))
-			       (bad ": link tag is not an identifier" line))
-			     (make-link (syntax-e (syntax tag))
-					(get-sig 'compound-unit/sig (syntax expr) #f (syntax sig) #f)
-					(syntax expr)
-					(syntax->list (syntax (linkage ...)))))]
-			  [(tag . x)
-			   (not (identifier? (syntax tag)))
-			   (bad ": tag is not an identifier" (syntax tag))]
-			  [(tag : sig (expr linkage ...) . rest)
-			   (literal? :)
-			   (bad ": extra expressions in sub-clause" line)]
-			  [(tag : sig (expr . rest))
-			   (literal? :)
-			   (bad ": illegal use of `.' in linkages" line)]
-			  [(tag : sig)
-			   (literal? :)
-			   (bad ": expected a unit expression and its linkages" line)]
-			  [(tag : sig . e)
-			   (literal? :)
-			   (bad ": unit expression and its linkages not parenthesized" line)]
-			  [(tag :)
-			   (literal? :)
-			   (bad ": expected a signature" line)]
-			  [(tag)
-			   (bad ": expected `:'" line)]
-			  [_else
-			   (bad "" line)]))
-		      link-list)]
-		    [in-sigs imports]
-		    [find-link
-		     (lambda (name links)
-		       (let loop ([links links])
-			 (cond
-			  [(null? links) #f]
-			  [(eq? name (link-name (car links)))
-			   (car links)]
-			  [else (loop (cdr links))])))]
-		    [find-sig
-		     (lambda (name sigs)
-		       (let loop ([sigs sigs])
-			 (cond
-			  [(null? sigs) #f]
-			  [(and (signature? (car sigs))
-				(eq? name (signature-name (car sigs))))
-			   (car sigs)]
-			  [else (loop (cdr sigs))])))]
-		    [flatten-path
-		     (lambda (clause path var-k unit-k)
-		       (letrec ([check-sig
-				 (lambda (sig use-sig)
-				   (when use-sig
-				     (with-handlers ([exn:fail:unit?
-						      (lambda (exn)
-							(syntax-error 
-							 #f expr
-							 (exn-message exn)))])
-				       (alt-verify-signature-match
-					'compound-unit/sig #f
-					(format "signature ~s" (signature-src use-sig))
-					(explode-sig use-sig #f)
-					(format "signature ~s" (signature-src sig))
-					(explode-sig sig #f)))))]
-				[flatten-subpath
-				 (lambda (base last use-sig name sig p)
-				   (cond
-				    [(stx-null? p) 
-				     (check-sig sig use-sig)
-				     (unit-k base last name (if use-sig
-								use-sig
-								sig))]
-				    [(or (not (stx-pair? p))
-					 (not (identifier? (stx-car p))))
-				     (syntax-error #f expr
-						   path)]
-				    [(memq (syntax-e (stx-car p)) (signature-vars sig))
-				     (if (and (stx-null? (stx-cdr p)) (not use-sig))
-					 (let* ([id-nopath (syntax-e (stx-car p))]
-						[id (if name
-							(string->symbol 
-							 (string-append name
-									":"
-									(symbol->string id-nopath)))
-							id-nopath)])
-					   (var-k base id id-nopath))
-					 (syntax-error #f expr
-						       (format 
-							"bad `~a' path: \"~a\" is a variable" 
-							clause
-							(syntax-e (stx-car p)))
-						       path))]
-				    [(find-sig (syntax-e (stx-car p)) (signature-elems sig))
-				     =>
-				     (lambda (s)
-				       (flatten-subpath base
-							(syntax-e (stx-car p))
-							use-sig
-							(let ([n (symbol->string 
-								  (signature-name s))])
-							  (if name
-							      (string-append name ":" n)
-							      n))
-							s
-							(stx-cdr p)))]
-				    [else
-				     (syntax-error #f expr
-						   (format 
-						    "bad `~a' path: \"~a\" not found"
-						    clause
-						    (syntax-e (stx-car p)))
-						   path)]))])
-			 (let-values ([(p use-sig)
-				       (syntax-case path ()
-					[_
-					 (identifier? path)
-					 (values (list path) #f)]
-					[(name : sig)
-					 (and (identifier? (syntax name))
-					      (literal? :))
-					 (values (list (syntax name))
-						 (get-sig 'compound-unit/sig expr
-							  #f
-							  (syntax sig)
-							  #f))]
-					[((elem ...) : sig)
-					 (and (andmap (lambda (s)
-							(and (identifier? s)
-							     (not (eq? (syntax-e s) ':))))
-						      (syntax->list (syntax (elem ...))))
-					      (literal? :))
-					 (values (syntax (elem ...))
-						 (get-sig 'compound-unit/sig expr
-							  #f
-							  (syntax sig)
-							  #f))]
-					[(elem1 elem ...)
-					 (andmap (lambda (s)
-						   (and (identifier? s)
-							(not (eq? (syntax-e s) ':))))
-						 (syntax->list (syntax (elem1 elem ...))))
-					 (values path #f)]
-					[else
-					 (syntax-error #f expr
-						       (format 
-							"bad `~a' path"
-							clause)
-						       path)])])
-			   (cond
-			    [(find-link (syntax-e (stx-car p)) links)
-			     => (lambda (link) 
-				  (flatten-subpath (link-name link)
-						   (syntax-e (stx-car p))
-						   use-sig
-						   #f
-						   (link-sig link)
-						   (stx-cdr p)))]
-			    [(find-sig (syntax-e (stx-car p)) in-sigs)
-			     => (lambda (sig) 
-				  (let ([s (symbol->string (signature-name sig))])
-				    (flatten-subpath #f
-						     (syntax-e (stx-car p))
-						     use-sig
-						     s
-						     sig
-						     (stx-cdr p))))]
-			    [else
-			     (syntax-error #f expr
-					   (format 
-					    "bad `~a' path: \"~a\" not found"
-					    clause
-					    (syntax-e (stx-car p)))
-					   path)]))))])
-	       (check-unique (map link-name links)
-			     (lambda (name)
-			       (syntax-error #f expr
-					     (format "duplicate sub-unit tag \"~s\"" name))))
-	       (check-unique (map signature-name imports)
-			     (lambda (name)
-			       (syntax-error #f expr
-					     (format "duplicate import identifier \"~s\"" name))))
-	       (check-unique (append (map signature-name imports)
-				     (map link-name links))
-			     (lambda (name)
-			       (syntax-error #f expr
-					     (format 
-					      "name \"~s\" is both import and sub-unit identifier" 
-					      name))))
-	       ;; Expand `link' clause using signatures
-	       (for-each
-		(lambda (link)
-		  (set-link-links! 
-		   link
-		   (map
-		    (lambda (link)
-		      (flatten-path 'link link
-				    (lambda (base var var-nopath)
-				      (make-sig-explode-pair
-				       var
-				       (list
-					(if base
-					    (list base var)
-					    var))))
-				    (lambda (base last id sig)
-				      (make-sig-explode-pair
-				       (rename-signature sig last #f)
-				       (if base
-					   (list (cons base (flatten-signature id sig #f)))
-					   (flatten-signature id sig #f))))))
-		    (link-links link))))
-		links)
-	       (let ([export-list (syntax->list (syntax exports))])
-		 (unless export-list
-		   (syntax-error #f expr 
-				 "improper `export' clause form"
-				 (syntax exports)))
-		 (let* ([upath? (lambda (p)
-				  (or (identifier? p)
-				      (and (stx-list? p)
-					   (andmap identifier? (stx->list p)))))]
-			[spath? (lambda (p)
-				  (syntax-case p ()
-				    [(name : sig)
-				     (and (literal? :)
-					  (upath? (syntax name))
-					  (or (identifier? (syntax sig))
-					      (parse-signature 'compound-unit/sig expr #f (syntax sig) #f)))
-				     #t]
-				    [_else
-				     (upath? p)]))]
-			[exports 
-			 (map
-			  (lambda (export)
-			    (syntax-case export ()
-			      [(open spath)
-			       (literal? open)
-			       (begin
-				 (unless (spath? (syntax spath))
-				   (syntax-error #f expr 
-						 "bad `open' sub-clause of `export'"
-						 export))
-				 (flatten-path 'export
-					       (syntax spath)
-					       (lambda (base var var-nopath)
-						 (syntax-error 
-						  #f expr 
-						  "`open' sub-clause path is a variable"
-						  (car export)))
-					       (lambda (base last name sig)
-						 (if base
-						     (make-sig-explode-pair
-						      (signature-elems sig)
-						      (cons base 
-							    (map
-							     list
-							     (flatten-signature name sig #f)
-							     (flatten-signature #f sig #f))))
-						     (syntax-error 
-						      #f expr 
-						      "cannot export imported variables"
-						      export)))))]
-			      [(var (upath vname) . exname)
-			       (literal? var)
-			       (let ([upath (syntax upath)]
-				     [vname (syntax vname)]
-				     [exname (syntax exname)])
-				 (unless (and (upath? upath)
-					      (identifier? vname)
-					      (or (stx-null? exname)
-						  (and (stx-pair? exname)
-						       (identifier? (stx-car exname))
-						       (stx-null? (stx-cdr exname)))))
-				   (syntax-error #f expr 
-						 "bad `var' sub-clause of `export'"
-						 export))
-				 (flatten-path 'export
-					       (if (identifier? upath)
-						   (list upath vname)
-						   (append (stx->list upath) (list vname)))
-					       (lambda (base var var-nopath)
-						 (if base
-						     (make-sig-explode-pair
-						      (list (if (stx-null? exname)
-								var-nopath
-								(syntax-e (stx-car exname))))
-						      (list base
-							    (if (stx-null? exname)
-								(list var var-nopath)
-								(list var (syntax-e (stx-car exname))))))
-						     (syntax-error 
-						      #f expr 
-						      "cannot export imported variables"
-						      export)))
-					       (lambda (base last name var)
-						 (syntax-error 
-						  #f expr 
-						  "`var' sub-clause path specifies a unit"
-						  export))))]
-			      [(unit spath . exname)
-			       (literal? unit)
-			       (let ([spath (syntax spath)]
-				     [exname (syntax exname)])
-				 (unless (and (spath? spath)
-					      (or (stx-null? exname)
-						  (and (stx-pair? exname)
-						       (identifier? (stx-car exname))
-						       (stx-null? (stx-cdr exname)))))
-				   (syntax-error #f expr 
-						 "bad `unit' sub-clause of `export'"
-						 export))
-				 (flatten-path 'export
-					       spath
-					       (lambda (base var var-nopath)
-						 (syntax-error 
-						  #f expr 
-						  "`unit' sub-clause path is a variable"
-						  export))
-					       (lambda (base last name sig)
-						 (if base
-						     (make-sig-explode-pair
-						      (list (rename-signature
-							     sig
-							     (if (stx-null? exname)
-								 last
-								 (syntax-e (stx-car exname)))
-							     #f))
-						      (let ([flat (flatten-signature name sig #f)])
-							(cons base 
-							      (map
-							       list
-							       flat
-							       (flatten-signature 
-								(symbol->string
-								 (if (stx-null? exname)
-								     last
-								     (syntax-e (stx-car exname))))
-								sig
-								#f)))))
-						     (syntax-error 
-						      #f expr 
-						      "cannot export imported variables"
-						      export)))))]
-			      [_else
-			       (syntax-error #f expr 
-					     (format 
-					      "bad `export' sub-clause")
-					     export)]))
-			  export-list)]
-			[interned-vectors (box null)])
-		   (check-unique (map
-				  (lambda (s)
-				    (if (signature? s)
-					(signature-name s)
-					s))
-				  (apply
-				   append
-				   (map sig-explode-pair-sigpart exports)))
-				 (lambda (name)
-				   (syntax-error #f expr
-						 "name is exported twice"
-						 name)))
-		   (values (map link-name links)
-			   (map link-expr links)
-			   (map (lambda (link) (explode-sig (link-sig link) interned-vectors)) links)
-			   (map
-			    (lambda (link)
-			      (map (lambda (sep)
-				     (explode-named-sig (sig-explode-pair-sigpart sep) interned-vectors))
-				   (link-links link)))
-			    links)
-			   (flatten-signatures imports #f)
-			   (map (lambda (link)
-				  (apply
-				   append
-				   (map 
-				    sig-explode-pair-exploded 
-				    (link-links link))))
-				links)
-			   (map sig-explode-pair-exploded exports)
-			   (explode-named-sigs imports interned-vectors)
-			   (explode-sig
-			    (let ([elems (apply
-					  append
-					  (map sig-explode-pair-sigpart exports))])
-			      (make-signature
-			       'dummy
-			       'dummy
-			       elems
-			       (map (lambda (x) #f) elems)
-			       null))
-			    interned-vectors)
-			   interned-vectors))))))]
-	[_else (raise-syntax-error 
-		#f
-		"bad syntax"
-		expr)])))
-  
-  (define parse-invoke-vars
-    (lambda (who rest expr)
-      (parse-imports who #t #f expr rest #f)))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-  (provide parse-unit
-	   parse-compound-unit
-	   parse-invoke-vars
-
-	   parsed-unit-renames
-	   parsed-unit-imports
-	   parsed-unit-import-vars
-	   parsed-unit-body
-	   parsed-unit-stx-checks
-	   parsed-unit-vars
-
-	   make-struct-stx-decls
-	   verify-struct-shape
-
-	   signature-vars
-	   signature-structs
-	   do-rename
-	   get-sig
-	   explode-sig
-	   explode-named-sigs
-	   check-signature-unit-body
-	   flatten-signature
-	   flatten-signatures
-	   struct-def-name))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/structure-helper.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/structure-helper.rkt
deleted file mode 100644
index 5128fe1323..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/structure-helper.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-(module structure-helper mzscheme
-  (require syntax/stx)
-  (provide str str? str-renames make-str remove-dups split open open-as-helper)
-  (define-struct str (renames))
-  
-  (define (remove-dups l)
-    (let ((ht (make-hash-table)))
-      (let loop ((l l))
-        (cond
-          ((null? l) null)
-          ((hash-table-get ht (caar l) (lambda () #f)) (loop (cdr l)))
-          (else 
-           (hash-table-put! ht (caar l) #t)
-           (cons (car l) (loop (cdr l))))))))
-  
-  (define (split path)
-    (let ((r (reverse path)))
-      (values (reverse (cdr r)) (car r))))
-
-  (define (get-renames id err)
-    (let ((x (syntax-local-value id (err id))))
-      (unless (str? x)
-        ((err id)))
-      (str-renames x)))
-  
-  (define (open path type)
-    (unless (identifier? (car path))
-      (raise-syntax-error type "Path component must be an identifier" (car path)))
-    (let ((err (lambda (name)
-                 (lambda ()
-                   (raise-syntax-error type "Unknown structure" name)))))
-      (let loop ((path (cdr path))
-                 (env (get-renames (car path) err)))
-        (cond
-          ((null? path) env)
-          (else
-           (unless (identifier? (car path))
-             (raise-syntax-error type "Path component must be an identifier" (car path)))
-           (let ((bind (assq (syntax-object->datum (car path)) env)))
-             (unless bind
-               ((err (car path))))
-             (loop (cdr path) (get-renames (cdr bind) err))))))))
-
-  (define (open-as-helper path field)
-    (unless (identifier? field)
-      (raise-syntax-error 'open-as "Field to open must be an identifier" field))
-    (let ((hid (assq (syntax-object->datum field )
-                     (open (stx->list path) 'open-as))))
-      (unless hid
-        (raise-syntax-error 'open-as "Unknown field" field))
-      (make-rename-transformer (cdr hid))))
-  
-  )
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/stxparamkey.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/stxparamkey.rkt
deleted file mode 100644
index ae5738851e..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/stxparamkey.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-
-(module stxparamkey mzscheme
-
-  (define-struct wrapped-renamer (renamer))
-  
-  (define-values (struct:syntax-parameter make-syntax-parameter syntax-parameter? syntax-parameter-ref syntax-parameter-set!)
-    (make-struct-type 'syntax-parameter #f 2 0 #f null (current-inspector) 0))
-
-  (define (syntax-parameter-target sp)
-    (syntax-parameter-ref sp 1))
-
-  (define (syntax-parameter-target-value target)
-    (let ([v (syntax-local-value (syntax-local-get-shadower target)
-				 (lambda ()
-				   #f
-				   (syntax-local-value 
-				    target
-				    (lambda () #f))))])
-      (if (wrapped-renamer? v)
-	  (wrapped-renamer-renamer v)
-	  v)))
-
-  (define (convert-renamer v)
-    (if (rename-transformer? v)
-	(make-wrapped-renamer v)
-	v))
-
-  (define (apply-transformer v stx set!-stx)
-    (cond
-     [(rename-transformer? v) 
-      (with-syntax ([target (rename-transformer-target v)])
-	(syntax-case stx ()
-	  [(set! id _expr) 
-	   (module-identifier=? #'set! set!-stx)
-	   (syntax/loc stx (set! target expr))]
-	  [(id . rest)
-	   (let ([v (syntax (target . rest))])
-	     (datum->syntax-object
-	      stx
-	      (syntax-e v)
-	      stx))]
-	  [_else
-	   #'target]))]
-     [(set!-transformer? v) ((set!-transformer-procedure v) stx)]
-     [(and (procedure? v)
-	   (procedure-arity-includes? v 1))
-      (syntax-case stx ()
-	[(set! id _) 
-	 (module-identifier=? #'set! set!-stx)
-	 (raise-syntax-error
-	  #f
-	  "cannot mutate syntax identifier"
-	  stx
-	  #'id)]
-	[else (v stx)])]
-     [else
-      (raise-syntax-error
-       #f
-       "bad syntax"
-       stx
-       #f)]))
-
-
-  (provide convert-renamer
-	   apply-transformer
-	   syntax-parameter?
-	   make-syntax-parameter
-	   syntax-parameter-target
-	   syntax-parameter-target-value))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/stxset.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/stxset.rkt
deleted file mode 100644
index 123cf7b6f2..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/stxset.rkt
+++ /dev/null
@@ -1,102 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     syntax/kerncase
-                     syntax/context))
-
-(provide finish-syntax-set)
-
-;; Used in the expansion of `define-syntax-set' from "etc.rkt"
-(define-syntax (finish-syntax-set stx)
-  (syntax-case stx ()
-    [(_ stx)
-     (let ([stx (syntax stx)])
-       (syntax-case stx ()
-         [(_ (id ...) defn ...)
-          ;; The ids have already been checked --------------------
-          (let ([ids (syntax->list (syntax (id ...)))])
-            (let ([internal-ids (map (lambda (id)
-                                       (datum->syntax
-                                        id
-                                        (string->symbol (format "~a/proc" (syntax-e id)))
-                                        id))
-                                     ids)]
-                  [expand-context (generate-expand-context)])
-              ;; Check defns (requires expand) ---------
-              (let* ([defns (let loop ([defns (syntax->list (syntax (defn ...)))])
-                              (apply 
-                               append
-                               (map
-                                (lambda (defn)
-                                  (let ([defn (local-expand
-                                               defn
-                                               expand-context
-                                               (kernel-form-identifier-list))])
-                                    (syntax-case defn (define-values define-syntaxes begin)
-                                      [(define-values (id ...) expr)
-                                       (andmap identifier? (syntax->list (syntax (id ...))))
-                                       (list defn)]
-                                      [(define-values . _)
-                                       (raise-syntax-error
-                                        #f
-                                        "bad definition"
-                                        stx
-                                        defn)]
-                                      [(define-syntaxes (id ...) expr)
-                                       (andmap identifier? (syntax->list (syntax (id ...))))
-                                       (list defn)]
-                                      [(define-syntaxes . _)
-                                       (raise-syntax-error
-                                        #f
-                                        "bad definition"
-                                        stx
-                                        defn)]
-                                      [(begin defn ...)
-                                       (loop (syntax->list (syntax (defn ...))))]
-                                      [(begin . _)
-                                       (raise-syntax-error
-                                        #f
-                                        "bad `begin'"
-                                        stx
-                                        defn)]
-                                      [else
-                                       (raise-syntax-error
-                                        #f
-                                        "not a definition"
-                                        stx
-                                        defn)])))
-                                defns)))]
-                     
-                     [def-ids (apply append (map (lambda (defn)
-                                                   (syntax-case defn ()
-                                                     [(_ (id ...) expr)
-                                                      (syntax->list (syntax (id ...)))]))
-                                                 defns))]
-                     [val-ids (apply append (map (lambda (defn)
-                                                   (syntax-case defn (define-values)
-                                                     [(define-values (id ...) expr)
-                                                      (syntax->list (syntax (id ...)))]
-                                                     [_else null]))
-                                                 defns))])
-                (let ([dup (check-duplicate-identifier def-ids)])
-                  (when dup
-                    (raise-syntax-error
-                     #f
-                     "duplicate defined identifier"
-                     stx
-                     dup)))
-                ;; Check that declared are defined ---------
-                (for-each (lambda (id)
-                            (unless (check-duplicate-identifier (cons id val-ids))
-                              (raise-syntax-error
-                               #f
-                               "expected identifier is not defined"
-                               stx
-                               id)))
-                          internal-ids)
-                ;; Produce result ------------------------------
-                (with-syntax ([(defn ...) defns]
-                              [(internal-id ...) internal-ids])
-                  (syntax/loc stx
-                    (let ()
-                      defn ...
-                      (values internal-id ...)))))))]))]))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/unitidmap.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/unitidmap.rkt
deleted file mode 100644
index c9ab855ac5..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/unitidmap.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-
-;; Help Desk binding info:
-(define (binding binder bound stx)
-  stx
-  ;; This 'bound-in-source is no longer needed
-  #;
-  (syntax-property
-   stx
-   'bound-in-source
-   (cons binder (syntax-local-introduce bound))))
-
-(define (make-id-mapper unbox-stx the-binder)
-  (let ([set!-stx (datum->syntax unbox-stx 'set! #f)])
-    (make-set!-transformer
-     (lambda (sstx)
-       (cond
-         [(identifier? sstx) 
-          (binding the-binder sstx
-                   unbox-stx)]
-         [(free-identifier=? set!-stx (car (syntax-e sstx)))
-          (raise-syntax-error
-           'unit
-           "cannot set! imported or exported variables"
-           sstx)]
-         [else
-          (binding
-           the-binder (car (syntax-e sstx))
-           (datum->syntax
-            sstx
-            (cons unbox-stx (cdr (syntax-e sstx)))
-            sstx))])))))
-
-(provide make-id-mapper)
-
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/process.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/process.rkt
deleted file mode 100644
index 9f287ee9d4..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/process.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see `racket/system`
-
-(require racket/system)
-(provide (all-from-out racket/system))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/restart.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/restart.rkt
deleted file mode 100644
index 23ee17079e..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/restart.rkt
+++ /dev/null
@@ -1,141 +0,0 @@
-
-(module restart scheme/base
-  (require racket/cmdline)
-
-  (provide restart-mzscheme)
-
-  (define (restart-mzscheme init-argv adjust-flag-table argv init-namespace)
-    (let* ([result #t]
-	   [args #f]
-	   [version? #f]
-	   [rep? #f]
-	   [no-coll-paths? #f]
-	   [no-init-file? #f]
-	   [no-compiled? #f]
-	   [scheme? #f]
-	   [scheme-set? #f]
-	   [print-error
-	    (lambda (e)
-	      (if (exn? e)
-		  (eprintf "~a\n" (exn-message e))
-		  (eprintf "Exception in init file: ~e\n" e)))]
-           [beginize (lambda (l)
-                       (string-append
-                        "(begin "
-                        (apply string-append l)
-                        ")"))]
-	   [load-scheme (lambda (s?)
-			  (unless scheme-set?
-				  (set! scheme? s?)
-				  (set! scheme-set? #t)))]
-           [script (lambda (flags proc like s?)
-                     `[,flags
-                       ,(lambda (f file) (load-scheme s?) (lambda () (proc file)))
-                       (,(format "Same as -~a-" like) "file")])]
-	   [table
-	    `([multi
-	       [("-e" "--eval")
-		,(lambda (f expr) (load-scheme #t) expr)
-		("Evaluates <expr>" "expr")]
-	       [("-f" "--load")
-		,(lambda (f file) (load-scheme #t) (lambda () (load file)))
-		("Loads <file>" "file")]
-	       [("-t" "--require")
-		,(lambda (f file) (load-scheme #f) (lambda () (namespace-require `(file ,file))))
-		("Requires <file>" "file")]
-	       [("-l" "--lib")
-		,(lambda (f file) (load-scheme #f) (lambda () (namespace-require `(lib ,file))))
-		("Imports library <file>" "file")]]
-              [final
-               ,(script '("-r" "--script") load "f" #t)
-               ,(script '("-u" "--require-script") (lambda (f) (namespace-require `(file ,f))) "t" #f)]
-              [multi
-	       [("-k")
-		,(lambda (f n m) (error 'mzscheme "The -k flag is not supported in this mode"))
-		("Load executable-embedded code from file offset <n> to <m>" "n" "m")]
-               [("-m" "--main")
-                ,(lambda (f) (lambda ()
-                               (when result
-				 (eval `(main ,@(cdr args))))))
-                ("Calls `main' with a list of argument strings, if no prior errors")]
-	       [("-x" "--no-init-path")
-		,(lambda (f) (set! no-coll-paths? #t))
-		("Don't set current-library-collection-paths")]
-	       [("-q" "--no-init-file")
-		,(lambda (f) (set! no-init-file? #t))
-		("Don't load \"~/.mzschemerc\" or \"mzscheme.rc\"")]
-	       [("-c" "--no-compiled")
-		,(lambda (f) (set! no-compiled? #t))
-		("Don't use compiled bytecode")]
-	       [("-v" "--version")
-		,(lambda (f) (set! version? #t))
-		("Show the version")]
-	       [("-i" "--repl")
-		,(lambda (f) (load-scheme #t) (set! rep? #t))
-		("Run the read-eval-print loop")]
-	       [("-b" "--binary")
-		,(lambda (f) (error 'mzscheme "The -b flag is not supported in this mode"))
-		("Read stdin and write stdout/stderr in binary mode")]])])
-      (parse-command-line
-       "mzscheme"
-       init-argv
-       table
-       void
-       '("ignored"))
-      (set! args #f)
-      (when (equal? argv #())
-	(set! scheme? #t)
-	(set! rep? #t))
-      (parse-command-line
-       "mzscheme"
-       argv
-       (adjust-flag-table table)
-       (lambda (exprs . rest)
-	 (unless (null? rest)
-	   (set! args rest))
-	 ;(when args (set! rest args))
-	 (let ([n (make-base-empty-namespace)]
-	       [argv (if args (list->vector args) (vector))])
-	   (parameterize ([current-command-line-arguments argv]
-                          [print-as-expression #f])
-	     (thread-wait
-	      (thread
-	       (lambda ()
-		 (current-namespace n)
-		 (when no-compiled?
-		   (use-compiled-file-paths null))
-		 (let ([program (find-system-path 'exec-file)])
-		   (when version? (display (banner)))
-		   
-		   (find-library-collection-paths))
-		 
-		 (init-namespace)
-
-		 (when scheme?
-		   (namespace-require 'scheme/init))
-		 
-		 (let/ec k
-		   (exit-handler
-		    (lambda (status)
-		      (set! result status)
-		      (k #f)))
-		   (let/ec escape
-		     (for-each
-		      (lambda (e)
-			(with-handlers ([void (lambda (e) 
-						(print-error e) 
-						(set! result #f)
-						(escape #f))])
-			  (if (string? e)
-			      (eval (read (open-input-string e)))
-			      (e))))
-		      exprs))
-		   (when rep? 
-		     (unless no-init-file?
-		       (let ([f (find-system-path 'init-file)])
-			 (when (file-exists? f)
-			       (with-handlers ([void print-error])
-					      (load f)))))
-		     (read-eval-print-loop)))))))))
-       `("arg"))
-      result)))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/runtime-path.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/runtime-path.rkt
deleted file mode 100644
index dc070f5e18..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/runtime-path.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see `racket/runtime-path`
-
-(require racket/runtime-path)
-(provide define-runtime-path
-         define-runtime-paths
-         define-runtime-path-list
-         define-runtime-module-path-index
-         runtime-paths)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/sandbox.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/sandbox.rkt
deleted file mode 100644
index 569f394863..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/sandbox.rkt
+++ /dev/null
@@ -1,118 +0,0 @@
-#lang scheme/base
-
-(require scheme/sandbox
-         (prefix-in mz: (only-in mzscheme make-namespace)))
-
-(provide sandbox-init-hook
-         sandbox-reader
-         sandbox-input
-         sandbox-output
-         sandbox-error-output
-         sandbox-propagate-breaks
-         sandbox-coverage-enabled
-         sandbox-namespace-specs
-         sandbox-override-collection-paths
-         sandbox-security-guard
-         sandbox-path-permissions
-         sandbox-network-guard
-         sandbox-make-inspector
-         sandbox-eval-limits
-         kill-evaluator
-         break-evaluator
-         set-eval-limits
-         put-input
-         get-output
-         get-error-output
-         get-uncovered-expressions
-         call-with-limits
-         with-limits
-         exn:fail:resource?
-         exn:fail:resource-resource
-         (rename-out [*make-evaluator make-evaluator]
-                     [gui? mred?]))
-
-(define-namespace-anchor anchor)
-
-;; Compatbility:
-;;   * recognize 'r5rs, etc, and wrap them as a list.
-;;   * 'begin form of reqs
-;;   * more aggressively extract requires from lang and reqs
-(define *make-evaluator
-  (case-lambda
-    [(lang reqs . progs)
-     (with-ns-params
-      (lambda ()
-        (let ([beg-req? (and (list? reqs)
-                             (pair? reqs)
-                             (eq? 'begin (car reqs)))]
-              [reqs (or reqs '())]
-              [lang (or lang '(begin))])
-          (keyword-apply
-           make-evaluator
-           '(#:allow-read #:requires)
-           (list (extract-requires lang reqs)
-                 (if beg-req? null reqs))
-           (case lang
-             [(r5rs beginner beginner-abbr intermediate intermediate-lambda
-               advanced)
-              (list 'special lang)]
-             [else lang])
-           (append (if beg-req? (cdr reqs) null) progs)))))]
-    [(mod) (with-ns-params (lambda () (make-module-evaluator mod)))]))
-
-(define (make-mz-namespace)
-  (let ([ns (mz:make-namespace)])
-    ;; Because scheme/sandbox needs scheme/base:
-    (namespace-attach-module (namespace-anchor->namespace anchor)
-                             'scheme/base ns)
-    ns))
-
-(define (with-ns-params thunk)
-  (let ([v (sandbox-namespace-specs)])
-    (cond [(and (not gui?) (eq? (car v) make-base-namespace))
-           (parameterize ([sandbox-namespace-specs
-                           (cons make-mz-namespace (cdr v))])
-             (thunk))]
-          [(and gui? (eq? (car v) (dynamic-require 'mred 'make-gui-namespace)))
-           (parameterize
-               ([sandbox-namespace-specs
-                 ;; Simulate the old make-namespace-with-mred:
-                 (cons (lambda ()
-                         (let ([ns (make-mz-namespace)]
-                               [ns2 ((dynamic-require
-                                      'mred 'make-gui-namespace))])
-                           (namespace-attach-module ns2 'mred ns)
-                           (namespace-attach-module ns2 'scheme/class ns)
-                           (parameterize ([current-namespace ns])
-                             (namespace-require 'mred)
-                             (namespace-require 'scheme/class))
-                           ns))
-                       (cdr v))])
-             (thunk))]
-          [else (thunk)])))
-
-(define (literal-identifier=? x y)
-  (or (free-identifier=? x y) (eq? (syntax-e x) (syntax-e y))))
-
-(define (extract-requires language requires)
-  (define (find-requires forms)
-    (let loop ([forms (reverse forms)] [reqs '()])
-      (if (null? forms)
-        reqs
-        (loop (cdr forms)
-              (syntax-case* (car forms) (require) literal-identifier=?
-                [(require specs ...)
-                 (append (syntax->datum #'(specs ...)) reqs)]
-                [_else reqs])))))
-  (let* ([requires (if (and (pair? requires) (eq? 'begin (car requires)))
-                     (find-requires (cdr requires))
-                     null)]
-         [requires (cond [(string? language) requires]
-                         [(not (pair? language)) requires]
-                         [(memq (car language) '(lib file planet quote))
-                          requires]
-                         [(eq? (car language) 'begin)
-                          (append (find-requires (cdr language)) requires)]
-                         [else (error 'extract-requires
-                                      "bad language spec: ~e" language)])])
-    requires))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/sendevent.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/sendevent.rkt
deleted file mode 100644
index c28c1690ee..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/sendevent.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require racket/gui/dynamic)
-
-(provide send-event)
-  
-(define send-event 
-  (lambda (who class msg [data (void)] [args null])
-    (if (gui-available?)
-        ((gui-dynamic-require 'send-event) who class msg data args)
-        (raise
-         (make-exn:fail:unsupported
-          "send-event: only supported in GRacket"
-          (current-continuation-marks))))))
-
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/serialize.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/serialize.rkt
deleted file mode 100644
index ecde5b4275..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/serialize.rkt
+++ /dev/null
@@ -1,397 +0,0 @@
-(module serialize mzscheme
-  (require-for-syntax syntax/struct)
-  (require ;; core [de]serializer:
-           racket/private/serialize
-           (only racket/base module+))
-
-  (provide define-serializable-struct
-	   define-serializable-struct/versions
-
-           ;; core [de]serializer:
-           (all-from racket/private/serialize))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; define-serializable-struct
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-  (define-values (prop:internal-deserialize internal-deserialize? internal-deserialize-info)
-    (make-struct-type-property 'internal-deserialize #f))
-
-  ;; generate-struct-declaration wants a function to generate the actual
-  ;;  call to `make-struct-type'. This is where we insert the serializable property.
-  (define-for-syntax (make-make-make-struct-type inspector+deserializer-stx)
-    (let-values ([(inspector-stx deserialize-id)
-		  (apply values (syntax->list inspector+deserializer-stx))])
-      (lambda (orig-stx name-stx defined-name-stxes super-info)
-	(when super-info
-	  (unless (andmap values (list-ref super-info 3))
-	    (raise-syntax-error
-	     #f
-	     "not all fields are known for parent struct type"
-	     orig-stx
-	     (syntax-case orig-stx ()
-	       [(_ (__ super-id) . rest) #'super-id]))))
-	(let ([num-fields (/ (- (length defined-name-stxes) 3) 2)])
-	  #`(letrec-values ([(type maker pred access mutate)
-			     (make-struct-type '#,name-stx 
-					       #,(and super-info (list-ref super-info 0))
-					       #,num-fields
-					       0 #f
-					       (list
-						;; --- The prop:serializable property means this is serializable
-						(cons
-						 prop:serializable
-						 (make-serialize-info
-						  ;; The struct-to-vector function: --------------------
-						  (lambda (v)
-						    (vector
-						     #,@(if super-info
-							    (reverse
-							     (map (lambda (sel)
-								    #`(#,sel v))
-								  (list-ref super-info 3)))
-							    null)
-						     #,@(let loop ([n num-fields][r null])
-							  (if (zero? n)
-							      r
-							      (loop (sub1 n)
-								    (cons
-								     #`(access v #,(sub1 n))
-								     r))))))
-						  ;; The serializer id: --------------------
-						  (quote-syntax #,deserialize-id)
-						  ;; Alternate --- does the same thing, due to the way
-						  ;;  this macro is set up:
-						  #;
-						  (let ([b (identifier-binding (quote-syntax #,deserialize-id))])
-						    (if (list? b)
-							(cons '#,deserialize-id (caddr b))
-							'#,deserialize-id))
-						  ;; Can handle cycles? --------------------
-						  ;;  Yes, as long as we have mutators for the
-						  ;;  superclass.
-						  #,(or (not super-info)
-							(andmap values (list-ref super-info 4)))
-						  ;; Directory for last-ditch resolution --------------------
-						  (or (current-load-relative-directory) 
-						      (current-directory))))
-						;; --- The prop:internal-deserialize property just communicates
-						;;     information to the deserialize binding (because it's more
-						;;     convenient to generate the deserialize info here)
-						(cons
-						 prop:internal-deserialize
-						 (list
-						  ;; The maker-getter: --------------------
-						  (lambda () maker)
-						  ;; The shell function: --------------------
-						  ;;  Returns an shell object plus
-						  ;;  a function to update the shell (used for
-						  ;;  building cycles): 
-						  (let ([super-sets
-							 (list #,@(if super-info
-								      (list-ref super-info 4)
-								      null))])
-						    (lambda ()
-						      (let ([s0
-							     (#,(list-ref defined-name-stxes 1)
-							      #,@(append
-								  (if super-info
-								      (map (lambda (x) #f)
-									   (list-ref super-info 3))
-								      null)
-								  (vector->list
-								   (make-vector num-fields #f))))])
-							(values
-							 s0
-							 (lambda (s)
-							   #,@(if super-info
-								  (map (lambda (set get)
-									 #`(#,set s0 (#,get s)))
-								       (list-ref super-info 4)
-								       (list-ref super-info 3))
-								  null)
-							   #,@(let loop ([n num-fields])
-								(if (zero? n)
-								    null
-								    (let ([n (sub1 n)])
-								      (cons #`(mutate s0 #,n (access s #,n))
-									    (loop n)))))
-							   (void)))))))))
-					       #,inspector-stx)])
-	      (values type maker pred access mutate))))))
-    
-  (define-syntaxes (define-serializable-struct define-serializable-struct/versions)
-    (let ()
-      (define expected-ids
-	"expected an identifier or parenthesized sequence of struct identifier and parent identifier")
-      (define expected-fields
-	"expected parenthesized sequence of field identifiers")
-      (define expected-version
-	"expected a version (literal, exact, non-negative integer)")
-      (define (after-name id/sup-stx)
-	(if (identifier? id/sup-stx)
-	    " after struct identifier"
-	    " after sequence of struct and parent identifiers"))
-      (define version-conflicts
-	"version number for other-version deserializer conflicts with")
-      
-      (define (context-check stx)
-	(unless (memq (syntax-local-context) '(top-level module))
-	  (raise-syntax-error
-	   #f
-	   "allowed only at the top level or within a module top level"
-	   stx)))
-
-      (define (ok-version? v)
-	(and (number? v)
-	     (integer? v)
-	     (v . >= . 0)
-	     (exact? v)))
-
-      ;; ------------------------------
-      ;;  Main parsing
-      
-      ;; Check high-level syntax, then dispatch to parsing parts
-      (define main
-	(lambda (stx)
-	  (syntax-case stx ()
-	    [(_ id/sup fields)
-	     (parse stx #'id/sup #'0 #'fields #'() #'(current-inspector))]
-	    [(_ id/sup fields inspector-expr)
-	     (parse stx #'id/sup #'0 #'fields #'() #'inspector-expr)]
-	    [(_ id/sup)
-	     (parse stx #'id/sup #'0 #f #f #f)]
-	    [(_)
-	     (raise-syntax-error
-	      #f
-	      expected-ids
-	      stx)])))
-
-      ;; Check high-level syntax with versions, then dispatch to parsing parts
-      (define main/versions
-	(lambda (stx)
-	  (syntax-case stx ()
-	    [(_ id/sup version-num fields other-versions)
-	     (parse stx #'id/sup #'version-num #'fields #'other-versions #'(current-inspector))]
-	    [(_ id/sup version-num fields other-versions inspector-expr)
-	     (parse stx #'id/sup #'version-num #'fields #'other-versions #'inspector-expr)]
-	    [(_ id/sup)
-	     (parse stx #'id/sup #f #f #f #f)]
-	    [(_ id/sup version-num)
-	     (parse stx #'id/sup #'version-num #f #f #f)]
-	    [(_ id/sup version-num fields)
-	     (parse stx #'id/sup #'version-num #'fields #f #f)]
-	    [(_)
-	     (raise-syntax-error
-	      #f
-	      expected-ids
-	      stx)])))
-      
-      ;; ------------------------------
-      ;;  Part parsing
-
-      ;; Parse parts, then dispatch to result generation
-      (define (parse stx id/sup-stx version-num-stx fields-stx other-versions-stx inspector-stx)
-	;; First, check id or id+super:
-	(let-values ([(id super-id) (parse-id+super stx id/sup-stx)])
-	  (let* ([version-num (parse-version stx id/sup-stx version-num-stx)]
-		 [field-ids (parse-fields stx id/sup-stx version-num-stx fields-stx)]
-		 [other-versions (parse-other-versions stx version-num other-versions-stx)])
-	    ;; Input syntax is ok! Generate the results
-	    #`(begin
-		#,(generate-main-result stx id super-id field-ids inspector-stx version-num)
-		#,@(map (lambda (other-version)
-			  (generate-other-result stx id other-version))
-			other-versions)))))
-
-      ;; id+super
-      (define (parse-id+super stx id/sup-stx)
-	(syntax-case id/sup-stx ()
-	  [id
-	   (identifier? #'id)
-	   (values #'id #f)]
-	  [(id sup-id)
-	   (and (identifier? #'id)
-		(identifier? #'sup-id))
-	   (values #'id #'sup-id)]
-	  [(id other)
-	   (identifier? #'id)
-	   (raise-syntax-error
-	    #f
-	    "expected identifier for parent struct type"
-	    stx
-	    #'other)]
-	  [else
-	   (raise-syntax-error
-	    #f
-	    expected-ids
-	    stx
-	    id/sup-stx)]))
-
-      ;; version
-      (define (parse-version stx id/sup-stx version-num-stx)
-	;; Check version; #f means no version in original expression
-	(unless version-num-stx
-	  (raise-syntax-error
-	   #f
-	   (string-append expected-version
-			  (after-name id/sup-stx))
-	   stx))
-	(let ([v (syntax-e version-num-stx)])
-	  (unless (ok-version? v)
-	    (raise-syntax-error
-	     #f
-	     (string-append expected-version
-			    (after-name id/sup-stx))
-	     stx
-	     version-num-stx))
-	  v))
-
-      ;; fields
-      (define (parse-fields stx id/sup-stx version-num-stx fields-stx)
-	;; Now check fields; #f means no fields in oirignal expression
-	(unless fields-stx
-	  (raise-syntax-error
-	   #f
-	   (string-append expected-fields
-			  (cond
-			   [version-num-stx
-			    " after version number"]
-			   [else (after-name id/sup-stx)]))
-	   stx))
-	(let ([field-ids (syntax-case fields-stx ()
-			   [(field ...)
-			    (let ([field-ids (syntax->list #'(field ...))])
-			      (for-each (lambda (id)
-					  (unless (identifier? id)
-					      (raise-syntax-error
-					       #f
-					       "expected a field identifier"
-					       stx
-					       id)))
-					field-ids)
-			      field-ids)]
-			   [else
-			    (raise-syntax-error
-			     #f
-			     expected-fields
-			     stx
-			     fields-stx)])])
-	  ;; Fields are all identifiers, so check for distinct fields
-	  (let ([dup (check-duplicate-identifier field-ids)])
-	    (when dup
-	      (raise-syntax-error
-	       #f
-	       "duplicate field identifier"
-	       stx
-	       dup)))
-	  field-ids))
-
-      ;; Other-version deserializers
-      (define (parse-other-versions stx main-version-num other-versions-stx)
-	(when (or (not other-versions-stx)
-		  (not (syntax->list other-versions-stx)))
-	  (raise-syntax-error
-	   #f
-	   "expected a parenthesized sequence of other-version deserializers after field sequence"
-	   stx
-	   other-versions-stx))
-	(let* ([ht (make-hash-table 'equal)]
-	       [other-versions
-		(map (lambda (other-stx)
-		       (syntax-case other-stx ()
-			 [(version-num maker-expr cycle-maker-expr)
-			  (let ([v (syntax-e #'version-num)])
-			    (unless (ok-version? v)
-			      (raise-syntax-error
-			       #f
-			       (string-append expected-version
-					      " for other-version deserializer")
-			       stx
-			       #'version-num))
-			    (when (= v main-version-num)
-			      (raise-syntax-error
-			       #f
-			       (string-append version-conflicts " the main version")
-			       stx
-			       other-stx))
-			    (when (hash-table-get ht v (lambda () #f))
-			      (raise-syntax-error
-			       #f
-			       (string-append version-conflicts " another deserializer")
-			       stx
-			       other-stx))
-			    (hash-table-put! ht v #t)
-			    (list v #'maker-expr #'cycle-maker-expr))]
-			 [else
-			  (raise-syntax-error
-			   #f
-			   "expected a deserializer for another version: version number, constructor, and cycle constructor"
-			   stx
-			   other-stx)]))
-		     (syntax->list other-versions-stx))])
-	  other-versions))
-
-      ;; ------------------------------
-      ;;  Generate result
-
-      ;; Generate the result expression. This is complicated
-      ;; by the fact that super-id information may or may not be
-      ;; immediately available, so we also need continue-define-...
-      (define (generate-main-result stx id super-id field-ids inspector-stx version-num)
-	(with-syntax ([deserializer-id (make-deserialize-name id version-num)]
-		      [struct-type-id (datum->syntax-object
-				       id
-				       (string->symbol
-					(format "struct:~a" (syntax-e id)))
-				       id)]
-		      [inspector-expr inspector-stx])
-	  #`(begin
-	      #,(generate-struct-declaration stx
-					     id super-id field-ids 
-					     (syntax-local-context)
-					     (make-make-make-struct-type #'(inspector-expr deserializer-id)))
-	      (define deserializer-id (let ([l (internal-deserialize-info struct-type-id)])
-					(make-deserialize-info
-					 ((car l))
-					 (cadr l))))
-	      #,@(make-deserialize-provide stx #'deserializer-id))))
-
-      (define (generate-other-result stx id other-version)
-	(with-syntax ([deserializer-id (make-deserialize-name id (car other-version))])
-	  #`(begin
-	      (define deserializer-id (make-deserialize-info #,(cadr other-version)
-							     #,(caddr other-version)))
-              #,@(make-deserialize-provide stx #'deserializer-id))))
-
-      (define (make-deserialize-name id version-num)
-	(datum->syntax-object
-	 id
-	 (string->symbol
-	  (format "deserialize-info:~a-v~a" 
-		  (syntax-e id) 
-		  version-num))
-	 id))
-
-      (define (make-deserialize-provide stx deserializer-id-stx)
-	(if (eq? 'top-level (syntax-local-context))
-	    ;; Top level; in case deserializer-id-stx is macro-introduced,
-	    ;;  explicitly use namespace-set-variable-value!
-	    (list (quasisyntax/loc stx
-		    (namespace-set-variable-value! '#,deserializer-id-stx 
-						   #,deserializer-id-stx )))
-	    ;; In a module; provide via submodule:
-	    (list (quasisyntax/loc stx
-                    (module+ deserialize-info
-                      (provide #,deserializer-id-stx))))))
-
-      ;; ------------------------------
-      ;;  The transformers
-
-      (values
-       (lambda (stx)
-	 (context-check stx)
-	 (main stx))
-       (lambda (stx)
-	 (context-check stx)
-	 (main/versions stx))))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/shared.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/shared.rkt
deleted file mode 100644
index 04ffee5e80..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/shared.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see `racket/shared`
-
-(require racket/shared)
-(provide shared)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/string.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/string.rkt
deleted file mode 100644
index 7a157189c8..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/string.rkt
+++ /dev/null
@@ -1,132 +0,0 @@
-#lang racket/base
-
-(provide string-lowercase!
-         string-uppercase!
-         eval-string
-         read-from-string
-         read-from-string-all
-         expr->string
-         
-         real->decimal-string
-         regexp-quote
-         regexp-replace-quote
-         regexp-match*
-         regexp-match-positions*
-         regexp-match-peek-positions*
-         regexp-split
-         regexp-match-exact?
-         (rename-out [regexp-try-match regexp-match/fail-without-reading])
-
-         glob->regexp)
-
-(define ((make-string-do! translate who) s)
-  (if (and (string? s) (not (immutable? s)))
-    (let loop ([n (sub1 (string-length s))])
-      (unless (negative? n)
-        (string-set! s n (translate (string-ref s n)))
-        (loop (sub1 n))))
-    (raise-type-error who "mutable string" s)))
-(define string-lowercase! (make-string-do! char-downcase 'string-lowercase!))
-(define string-uppercase! (make-string-do! char-upcase   'string-uppercase!))
-
-;; helpers for eval-string and read-from-string-one-or-all
-(define-syntax wrap-errors
-  (syntax-rules ()
-    [(wrap-errors who error-handler body ...)
-     (if error-handler
-       (with-handlers
-           ([void
-             (cond [(not (procedure? error-handler))
-                    (error who "bad error handler: ~e" error-handler)]
-                   [(procedure-arity-includes? error-handler 1)
-                    error-handler]
-                   [(procedure-arity-includes? error-handler 0)
-                    (lambda (exn) (error-handler))]
-                   [else (error who "bad error handler: ~e" error-handler)])])
-         body ...)
-       (begin body ...))]))
-(define (open-input-bstring s)
-  (if (bytes? s) (open-input-bytes s) (open-input-string s)))
-
-(define (eval-string str [error-handler #f])
-  (wrap-errors 'eval-string error-handler
-    (let ([p (open-input-bstring str)])
-      (apply values
-             (let loop ()
-               (let ([e (read p)])
-                 (if (eof-object? e)
-                   '()
-                   (call-with-values
-                       (lambda () (eval e))
-                       (lambda vals (append vals (loop)))))))))))
-
-(define (read-from-string str [error-handler #f])
-  (wrap-errors 'read-from-string error-handler
-    (read (open-input-bstring str))))
-
-(define (read-from-string-all str [error-handler #f])
-  (let ([p (open-input-bstring str)])
-    (wrap-errors 'read-from-string-all error-handler
-      (let loop ([r '()])
-        (let ([v (read p)])
-          (if (eof-object? v) (reverse r) (loop (cons v r))))))))
-
-(define (expr->string v)
-  (let ([port (open-output-string)])
-    (write v port)
-    (get-output-string port)))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define glob->regexp
-  (let-values
-      ([(def-case-sens) (eq? (system-path-convention-type) 'unix)]
-       [(item:s item:b simple-item:s simple-item:b)
-        (let ([rx (lambda (s)
-                    (string-append
-                     "(?:"
-                     "[\\]." ; escaped item
-                     "|"
-                     "[*?]"  ; wildcards -- the only 1-character match
-                     s       ; [*] more stuff here
-                     ")"
-                     ))]
-              [range "|\\[(?:\\^?\\]|\\^?[^]^])[^]]*\\]"]) ; goes in [*]
-          (values (regexp (rx range))
-                  (byte-regexp (string->bytes/utf-8 (rx range)))
-                  (regexp (rx ""))
-                  (byte-regexp (string->bytes/utf-8 (rx "")))))])
-    (lambda (glob [hide-dots? #t] [case-sens? def-case-sens] [simple? #f])
-      (let*-values ([(b?) (cond [(bytes? glob) #t]
-                                [(string? glob) #f]
-                                [else (raise-type-error
-                                       'glob->regexp
-                                       "string or byte string" glob)])]
-                    [(app sub ref rx item star any one)
-                     (if b?
-                       (values bytes-append subbytes bytes-ref byte-regexp
-                               (if simple? simple-item:b item:b)
-                               (char->integer #\*) #".*" #".")
-                       (values string-append substring string-ref regexp
-                               (if simple? simple-item:s item:s)
-                               #\* ".*" "."))]
-                    [(pfx sfx) (if case-sens?
-                                 (if b? (values #"^" #"$")
-                                        (values  "^"  "$"))
-                                 (if b? (values #"^(?i:" #")$")
-                                        (values  "^(?i:"  ")$")))]
-                    [(pfx) (if hide-dots?
-                             (app pfx (if b? #"(?![.])" "(?![.])"))
-                             pfx)]
-                    [(subq) (lambda xs (regexp-quote (apply sub xs)))])
-        (let loop ([i 0] [ps (regexp-match-positions* item glob)] [r '()])
-          (if (null? ps)
-            (let ([r (apply app (reverse (cons (subq glob i) r)))])
-              (rx (app pfx r sfx)))
-            (loop (cdar ps) (cdr ps)
-                  ;; length=1 is only for `*' or `?'
-                  (cons (if (= 1 (- (cdar ps) (caar ps)))
-                          (if (equal? star (ref glob (caar ps))) any one)
-                          (sub glob (caar ps) (cdar ps)))
-                        (if (= i (caar ps))
-                          r (cons (subq glob i (caar ps)) r))))))))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/struct.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/struct.rkt
deleted file mode 100644
index 9e3e79bfbe..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/struct.rkt
+++ /dev/null
@@ -1,191 +0,0 @@
-
-;; by Jacob Matthews (and others)
-
-(module struct mzscheme
-  (provide copy-struct 
-	   define-struct/properties
-	   make-->vector)
-  (require-for-syntax syntax/struct
-		      (only racket/base filter)
-                      syntax/stx)
-
-  ;; ------------------------------------------------------------
-  ;; copy-struct
-
-  ;; copy-struct expands to `do-copy-struct' to delay the expansion
-  ;;  in an internal-definition context. (The `begin0' wrapper
-  ;;  effectively declares the form to be an expression.)
-  (define-syntax (copy-struct stx)
-    (syntax-case stx ()
-      [frm #'(begin0 (do-copy-struct frm))]))
-  
-  (define-syntax (do-copy-struct dstx)
-    (syntax-case dstx ()
-      [(_ stx)
-       (let ([stx #'stx])
-	 (syntax-case stx ()
-	   [(_ info structure (accessor-name new-val) ...)
-	    (let ([ans (syntax->list  #'((accessor-name new-val) ...))])
-	      (unless (identifier? #'info)
-		(raise-syntax-error #f "not an identifier for structure type" stx #'info))
-	      (for-each (lambda (an)
-			  (unless (identifier? (stx-car an))
-			    (raise-syntax-error #f "not an identifier for accessor name" stx (stx-car an))))
-			ans)
-	      
-	      ;; new-binding-for : syntax[field-name] -> (union syntax[expression] #f)
-	      (let ((new-binding-for 
-		     (lambda (f)
-		       (ormap (lambda (x) 
-				(if (module-or-top-identifier=? (stx-car x) f)
-				    (cadr (syntax-e x)) 
-				    #f))
-			      ans))))
-		
-		(let-values ([(construct pred accessors)
-			      (let ([v (syntax-local-value #'info (lambda () #f))])
-				(unless (struct-declaration-info? v)
-				  (raise-syntax-error #f "identifier is not bound to a structure type" stx #'info))
-                                (let ([v (extract-struct-info v)])
-                                  (values (cadr v)
-                                          (caddr v)
-                                          (cadddr v))))]
-			     [(as) (map (lambda (an) (stx-car an)) ans)])
-		  (let ([dests
-			 (map
-			  (lambda (field)
-			    (or (ormap (lambda (f2) (and f2 (module-or-top-identifier=? field f2) f2)) accessors)
-				(raise-syntax-error #f "accessor name not associated with the given structure type" stx field)))
-			  as)])
-		    ;; Check for duplicates using dests, not as, because mod=? as might not be id=?
-		    (let ((dupe (check-duplicate-identifier dests)))
-		      (when dupe 
-			(raise-syntax-error #f 
-					    "duplicate field assignment" 
-					    stx 
-					    ;; Map back to an original field:
-					    (ormap (lambda (a)
-						     (and a
-							  (module-or-top-identifier=? dupe a)
-							  a))
-						   (reverse as))))))
-		  
-		  ;; the actual result
-		  #`(let ((the-struct structure))
-		      (if (#,pred the-struct)
-			  (#,construct
-			   #,@(map 
-			       (lambda (field) (or (new-binding-for field) #`(#,field the-struct)))
-			       (reverse accessors)))
-			  (raise-type-error '_  #,(format "struct:~a" (syntax-object->datum #'info)) the-struct))))))]))]))
-
-  ;; --------------------------------------------------
-  ;; define-struct/properties
-  
-  ;; Used at run time:
-  (define (check-prop v)
-    (unless (struct-type-property? v)
-      (raise-type-error
-       'define-struct/properties
-       "struct-type property"
-       v))
-    v)
-    
-  ;; This compile-time proc fills in the crucial part of the expansion.
-  ;; Because it's called through a syntax trampoline, the arguments have to
-  ;; to be packaged as a syntax object.
-  (define-for-syntax (make-make-make-struct-type props+insp-stx)
-    (with-syntax ([(([prop expr] ...) inspector) props+insp-stx])
-      (lambda (orig-stx name-stx defined-name-stxes super-info)
-	#`(make-struct-type '#,name-stx 
-			    #,(and super-info (list-ref super-info 0))
-			    #,(/ (- (length defined-name-stxes) 3) 2)
-			    0 #f
-			    (list
-			     (cons (check-prop prop)
-				   expr)
-			     ...)
-			    inspector))))
-  
-  ;; The main macro:
-  (define-syntax (define-struct/properties stx)    
-
-    ;; Start paring. Exploit `parse-define-struct' as much as possible.
-    (define (parse-at-main)
-      (syntax-case stx ()
-	[(_ id/sup fields . rest)
-	 ;; Check initial part:
-	 (let-values ([(id sup-id fields _) 
-		       (parse-define-struct #`(_ id/sup fields) stx)])
-	   (parse-at-props id sup-id fields #'rest))]
-	[_
-	 ;; Not even right up to define-struct, so let the
-	 ;;  simple parser report the problem:
-	 (parse-define-struct stx stx)]))
-    
-    ;; So far, so good. Parse props.
-    (define (parse-at-props id sup-id fields rest)
-      (syntax-case rest ()
-	[(([prop expr] ...) . rrest)
-	 (parse-at-inspector id sup-id fields (stx-car rest) (stx-cdr rest))]
-	[((bad ...) . rest)
-	 (for-each (lambda (bad)
-		     (syntax-case bad ()
-		       [(a b) 'ok]
-		       [_ (raise-syntax-error
-			   #f
-			   "expected a parenthesized property--value pairing"
-			   stx
-			   bad)]))
-		   (syntax->list #'(bad ...)))]
-	[(bad . rest)
-	 (raise-syntax-error
-	  #f
-	  "expected a parenthesized sequence of property--value pairings"
-	  stx
-	  #'bad)]
-	[_
-	 (raise-syntax-error
-	  #f
-	  "expected a parenthesized sequence of property--value pairings after fields"
-	  stx)]))
-
-    ;; Finally, parse optional inspector expr, again exploiting
-    ;;  `parse-define-struct'.
-    (define (parse-at-inspector id sup-id fields props rest)
-      (let-values ([(_ __ ___ inspector-stx)
-		    (parse-define-struct #`(ds id () #,@rest) stx)])
-	(build-result id sup-id fields props inspector-stx)))
-
-    ;; Build the result using `generate-struct-declaration', which 
-    ;;  sometimes needs the `continue-ds/p' trampoline to eventually get
-    ;;  to make-make-make-struct-type.
-    (define (build-result id sup-id fields props inspector)
-      (let ([props+insp #`(#,props #,inspector)])
-	(generate-struct-declaration stx
-				     id sup-id fields
-				     (syntax-local-context)
-				     (make-make-make-struct-type props+insp))))
-    
-    (parse-at-main))
-
-  ;; ------------------------------------------------------------
-  ;; make->vector
-  
-  (define-syntax (make-->vector stx)
-    (syntax-case stx ()
-      [(_ name) ; a struct type name
-       (identifier? (syntax name))
-       (let ([info (syntax-local-value (syntax name))])
-         (if (struct-declaration-info? info)
-             (with-syntax ([(accessor ...)
-                            (reverse
-                             (filter identifier? (list-ref (extract-struct-info info) 3)))])
-               (syntax
-                (λ (s)
-                  (vector (accessor s) ...))))
-             (raise-syntax-error
-              #f
-              "not a declared structure type name"
-              stx
-              (syntax name))))])))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/stxparam.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/stxparam.rkt
deleted file mode 100644
index 19f10315e8..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/stxparam.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-(module stxparam racket/base
-  (require racket/stxparam)
-  (provide define-syntax-parameter
-	   syntax-parameterize)
-
-  (require racket/stxparam-exptime)
-  (provide syntax-parameter-value
-           make-parameter-rename-transformer))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/surrogate.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/surrogate.rkt
deleted file mode 100644
index 1f53f2fe85..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/surrogate.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require racket/surrogate)
-(provide (all-from-out racket/surrogate))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/tar.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/tar.rkt
deleted file mode 100644
index 70cd53168f..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/tar.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require file/tar)
-(provide (all-from-out file/tar))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/thread.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/thread.rkt
deleted file mode 100644
index c93506a5e9..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/thread.rkt
+++ /dev/null
@@ -1,136 +0,0 @@
-
-(module thread mzscheme
-  (require mzlib/kw mzlib/contract racket/engine)
-
-  (provide run-server
-           consumer-thread
-
-           (rename engine? coroutine?)
-           (rename engine coroutine)
-           (rename engine-run coroutine-run)
-           (rename engine-result coroutine-result)
-           (rename engine-kill coroutine-kill))
-
-  #|
-  t accepts a function, f, and creates a thread. It returns the thread and a
-  function, g. When g is applied it passes its argument to f, and evaluates
-  the call of f in the time of the thread that was created. Calls to g do not
-  block.
-  |#
-
-  (define/kw (consumer-thread f #:optional [init void])
-    (unless (procedure? f) (raise-type-error 'consumer-thread "procedure" f))
-    (let ([sema (make-semaphore 0)]
-          [protect (make-semaphore 1)]
-          [front-state null]
-          [back-state null])
-      (values
-       (thread
-        (letrec ([loop
-                  (lambda ()
-                    (semaphore-wait sema)
-                    (let ([local-state
-                           (begin
-                             (semaphore-wait protect)
-                             (if (null? back-state)
-                               (let ([new-front (reverse front-state)])
-                                 (set! back-state (cdr new-front))
-                                 (set! front-state null)
-                                 (semaphore-post protect)
-                                 (car new-front))
-                               (begin0
-                                   (car back-state)
-                                 (set! back-state (cdr back-state))
-                                 (semaphore-post protect))))])
-                      (apply f local-state))
-                    (loop))])
-          (lambda ()
-            (init)
-            (loop))))
-       (procedure-reduce-arity
-        (lambda new-state
-          (semaphore-wait protect)
-          (set! front-state (cons new-state front-state))
-          (semaphore-post protect)
-          (semaphore-post sema))
-        (procedure-arity f)))))
-
-  (define/kw (run-server port-number handler connection-timeout
-                         #:optional
-                         [handle-exn void]
-                         [tcp-listen tcp-listen]
-                         [tcp-close tcp-close]
-                         [tcp-accept tcp-accept]
-                         [tcp-accept/enable-break tcp-accept/enable-break])
-    (let ([l (tcp-listen port-number 5 #t)]
-          [can-break? (break-enabled)])
-      (dynamic-wind
-          void
-          (lambda ()
-            ;; All connections should use the same parameterization,
-            ;;  to facilitate transferring continuations from one
-            ;;  connection to another:
-            (let ([paramz (current-parameterization)])
-              ;; Loop to handle connections:
-              (let loop ()
-                ;; Introducing this thread causes PR12443 to no longer fail.
-                
-                ;; The Web Server will definitely kill the custodian
-                ;; associated with the resources of the connection. I
-                ;; think what is going on is that the loop here is
-                ;; attached to one of these custodians (eventually)
-                ;; and then the listening loop thread gets killed
-                ;; too. This patch basically just disconnects the loop
-                ;; from the new custodian. The error reported in the
-                ;; PR still shows up, but it has no effect on the
-                ;; response time/etc, whereas before it would stop
-                ;; listening and 'ab' would fail.
-                (with-handlers 
-                    ([exn:fail:network? handle-exn])
-                  ;; Make a custodian for the next session:
-                  (let ([c (make-custodian)])
-                    (parameterize
-                        ([current-custodian c])
-                      ;; disable breaks during session set-up...
-                      (parameterize-break 
-                       #f
-                       ;; ... but enable breaks while blocked on an accept:
-                       (let-values ([(r w) ((if can-break?
-                                              tcp-accept/enable-break
-                                              tcp-accept)
-                                            l)])
-                         ;; Handler thread:
-                         (let ([t 
-                                (thread 
-                                 (lambda ()
-                                   ;; First, install the parameterization
-                                   ;;  used for all connections:
-                                   (call-with-parameterization
-                                    paramz
-                                    (lambda ()
-                                      ;; Install this connection's custodian
-                                      ;;  for this thread in the shared
-                                      ;;  parameterization:
-                                      (current-custodian c)
-                                      ;; Enable breaking:
-                                      (when can-break?
-                                        (break-enabled #t))
-                                      ;; Prevent the handler from
-                                      ;; killing this custodian, by
-                                      ;; creating an intermediary,
-                                      ;; but child custodian
-                                      (parameterize ([current-custodian 
-                                                      (make-custodian)])
-                                        ;; Call the handler
-                                        (handler r w))))))])
-                           ;; Clean-up and timeout thread:
-                           (thread 
-                            (lambda ()
-                              (sync/timeout connection-timeout t)
-                              (when (thread-running? t)
-                                ;; Only happens if connection-timeout is not #f
-                                (break-thread t))
-                              (sync/timeout connection-timeout t)
-                              (custodian-shutdown-all c)))))))))
-                (loop))))
-          (lambda () (tcp-close l))))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/trace.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/trace.rkt
deleted file mode 100644
index be802c4f36..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/trace.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require racket/trace)
-(provide (all-from-out racket/trace))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/traceld.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/traceld.rkt
deleted file mode 100644
index ea98091cfe..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/traceld.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-
-(let ([load (current-load)]
-      [load-extension (current-load-extension)]
-      [ep (current-error-port)]
-      [tab ""])
-  (let ([mk-chain
-         (lambda (load)
-           (lambda (filename expected-module)
-             (define name
-               (if (pair? expected-module)
-                   (format "~a ~s" filename `(submod "." ,@(cdr expected-module)))
-                   filename))
-             (fprintf ep 
-                      "~aloading ~a at ~a\n"
-                      tab name (current-process-milliseconds))
-             (begin0
-              (let ([s tab])
-                (dynamic-wind
-                    (lambda () (set! tab (string-append " " tab)))
-                    (lambda () 
-                      (load filename expected-module))
-                    (lambda () (set! tab s))))
-              (fprintf ep
-                       "~adone ~a at ~a\n"
-                       tab name (current-process-milliseconds)))))])
-    (current-load (mk-chain load))
-    (current-load-extension (mk-chain load-extension))))
-
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/trait.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/trait.rkt
deleted file mode 100644
index bfcc46e8fd..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/trait.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-(module trait racket/base
-  (require racket/trait)
-  (provide (all-from-out racket/trait)))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/transcr.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/transcr.rkt
deleted file mode 100644
index 11b5779ec7..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/transcr.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-
-(module transcr mzscheme
-  (require mzlib/port)
-  (provide (rename -transcript-on transcript-on)
-	   (rename -transcript-off transcript-off))
-
-  ;; Bug: the implementation strategy used for the tees does not
-  ;; guarantee that flushes to stdout and stderr are kept in order.
-  ;; It depends instead on the whims of scheduling the tee threads.
-  ;; This problem could be fixed using `make-output-port' instead
-  ;; of pipes and `copy-port'.
-
-  (define-values (-transcript-on -transcript-off)
-    (let ([in #f]
-	  [out #f]
-	  [err #f]
-	  [tee-out (lambda (p p2)
-		     (let-values ([(r w) (make-pipe)])
-		       (thread
-			(lambda () 
-			  (copy-port r p p2)))
-		       w))]
-	  [tee-in (lambda (in out)
-		     (let-values ([(r w) (make-pipe)])
-		       (thread
-			(lambda ()
-			  (copy-port in w out)))
-		       r))])
-      (values
-       (lambda (file)
-	 (when in
-	   (error 'transcript-on "transcript is already on"))
-	 (let ([p (open-output-file file)])
-	   (set! in (current-input-port))
-	   (set! out (current-output-port))
-	   (set! err (current-error-port))
-	   (current-output-port (tee-out out p))
-	   (current-error-port (tee-out err p))
-	   (current-input-port (tee-in in p))))
-       (lambda ()
-	 (unless in
-	   (error 'transcript-on "transcript is not on"))
-	 (current-input-port in)
-	 (current-output-port out)
-	 (current-error-port err)
-	 (set! in #f)
-	 (set! out #f)
-	 (set! err #f))))))
-
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit-exptime.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit-exptime.rkt
deleted file mode 100644
index 088d79bf99..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit-exptime.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see `racket/unit-exptime`
-
-(require racket/unit-exptime)
-(provide (all-from-out racket/unit-exptime))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit.rkt
deleted file mode 100644
index 6079b0f64a..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see `racket/unit`
-
-(require (except-in racket/unit struct/ctc)
-         (submod racket/unit compat))
-(provide (all-from-out racket/unit)
-         (all-from-out (submod racket/unit compat)))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit200.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit200.rkt
deleted file mode 100644
index 3ea346ddfe..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit200.rkt
+++ /dev/null
@@ -1,864 +0,0 @@
-
-;; Unit system
-
-(module unit200 mzscheme
-  (require racket/undefined)
-  (require-for-syntax syntax/kerncase
-		      syntax/stx
-		      syntax/name
-		      syntax/context
-                      racket/syntax
-		      (only racket/base filter)
-		      "private/unitidmap.rkt")
-
-  ;; ----------------------------------------------------------------------
-  ;; Structures and helpers
-
-  (define insp (current-inspector)) ; for named structures
-
-  (define-struct unit (num-imports exports go)) ; unit value
-  (define-struct (exn:fail:unit exn:fail) ()) ; run-time exception
-
-  ;; For units with inferred names, generate a struct that prints using the name:
-  (define (make-naming-constructor type name)
-    (let-values ([(struct: make- ? -accessor -mutator)
-		  (make-struct-type name type 0 0 #f null insp)])
-      make-))
-
-  ;; Make a unt value (call by the macro expansion of `unit')
-  (define (make-a-unit name num-imports exports go)
-    ((if name 
-	 (make-naming-constructor 
-	  struct:unit
-	  (string->symbol (format "unit:~a" name)))
-	 make-unit)
-     num-imports exports go))
-
-  ;; ----------------------------------------------------------------------
-  ;; The `unit' syntactic form
-
-  (define-syntaxes (:unit unit/no-expand)
-    (let ([do-unit 
-	   (lambda (stx expand?)
-	     (syntax-case stx (import export)
-	       [(_ (import ivar ...)
-		   (export evar ...)
-		   defn&expr ...)
-		(let ([check-id (lambda (v)
-				  (unless (identifier? v)
-				    (raise-syntax-error
-				     #f
-				     "import is not an identifier"
-				     stx
-				     v)))]
-		      [check-renamed-id 
-		       (lambda (v)
-			 (syntax-case v ()
-			   [id (identifier? (syntax id)) (list v)]
-			   [(lid eid) (and (identifier? (syntax lid))
-					   (identifier? (syntax eid))) 
-			    (list #'lid #'eid)]
-			   [else (raise-syntax-error
-				  #f
-				  "export is not an identifier or renamed identifier"
-				  stx
-				  v)]))]
-		      [expand-context (generate-expand-context)]
-		      [def-ctx (and expand?
-				    (syntax-local-make-definition-context))]
-		      [localify (lambda (ids def-ctx)
-				  (if (andmap identifier? ids)
-				      ;; In expand mode, add internal defn context
-				      (if expand?
-					  (begin
-					    ;; Treat imports as internal-defn names:
-					    (syntax-local-bind-syntaxes ids #f def-ctx)
-                                            (syntax->list
-                                             (internal-definition-context-apply def-ctx ids)))
-					  ids)
-				      ;; Let later checking report an error:
-				      ids))])
-		  (let ([ivars (localify (syntax->list (syntax (ivar ...))) def-ctx)]
-			[evars (syntax->list (syntax (evar ...)))])
-		    (for-each check-id ivars)
-		    (for-each check-renamed-id evars)
-		    
-		    ;; Get import/export declared names:
-		    (let* ([exported-names
-			    (localify
-			     (map (lambda (v)
-				    (syntax-case v ()
-				      [(lid eid) (syntax lid)]
-				      [id (syntax id)]))
-				  evars)
-			     def-ctx)]
-			   [extnames (map (lambda (v)
-					    (syntax-case v ()
-					      [(lid eid) (syntax eid)]
-					      [id (syntax id)]))
-					  evars)]
-			   [imported-names ivars]
-			   [declared-names (append imported-names exported-names)])
-		      ;; Check that all exports are distinct (as symbols)
-		      (let ([ht (make-hash-table)])
-			(for-each (lambda (name)
-				    (when (hash-table-get ht (syntax-e name) (lambda () #f))
-				      (raise-syntax-error
-				       #f
-				       "duplicate export"
-				       stx
-				       name))
-				    (hash-table-put! ht (syntax-e name) #t))
-				  extnames))
-
-		      ;; Expand all body expressions
-		      ;; so that all definitions are exposed.
-		      (letrec ([expand-all
-				(if expand?
-				    (lambda (defns&exprs)
-				      (apply
-				       append
-				       (map
-					(lambda (defn-or-expr)
-					  (let ([defn-or-expr
-						  (local-expand
-						   defn-or-expr
-						   expand-context
-						   (append
-						    (kernel-form-identifier-list)
-						    declared-names)
-						   def-ctx)])
-					    (syntax-case defn-or-expr (begin define-values define-syntaxes)
-					      [(begin . l)
-					       (let ([l (syntax->list (syntax l))])
-						 (unless l
-						   (raise-syntax-error
-						    #f
-						    "bad syntax (illegal use of `.')"
-						    defn-or-expr))
-						 (expand-all (map (lambda (s)
-								    (syntax-track-origin s defn-or-expr #'begin))
-								  l)))]
-					      [(define-syntaxes (id ...) rhs)
-					       (andmap identifier? (syntax->list #'(id ...)))
-					       (with-syntax ([rhs (local-transformer-expand
-								   #'rhs
-								   'expression
-								   null)])
-						 (syntax-local-bind-syntaxes (syntax->list #'(id ...)) #'rhs def-ctx)
-						 (list #'(define-syntaxes (id ...) rhs)))]
-					      [(define-values (id ...) rhs)
-					       (andmap identifier? (syntax->list #'(id ...)))
-					       (begin
-						 (syntax-local-bind-syntaxes (syntax->list #'(id ...)) #f def-ctx)
-						 (list defn-or-expr))]
-					      [else (list defn-or-expr)])))
-					defns&exprs)))
-				    values)])
-
-			(let ([all-expanded (expand-all (syntax->list (syntax (defn&expr ...))))])
-                          (when def-ctx
-                            (internal-definition-context-seal def-ctx))
-			  ;; Get all the defined names, sorting out variable definitions
-			  ;; from syntax definitions.
-			  (let* ([definition?
-				   (lambda (id)
-				     (and (identifier? id)
-					  (or (module-identifier=? id (quote-syntax define-values))
-					      (module-identifier=? id (quote-syntax define-syntaxes)))))]
-				 [all-defined-names/kinds
-				  (apply
-				   append
-				   (map
-				    (lambda (defn-or-expr)
-				      (syntax-case defn-or-expr (define-values define-syntaxes)
-					[(dv (id ...) expr)
-					 (definition? (syntax dv))
-					 (let ([l (syntax->list (syntax (id ...)))])
-					   (for-each (lambda (i)
-						       (unless (identifier? i)
-							 (raise-syntax-error
-							  #f
-							  "not an identifier in definition"
-							  defn-or-expr
-							  i)))
-						     l)
-					   (let ([key (if (module-identifier=? (syntax dv) (quote-syntax define-syntaxes))
-							  'stx
-							  'val)])
-					     (map (lambda (id) (cons key id)) l)))]
-					[(define-values . l)
-					 (raise-syntax-error
-					  #f
-					  "bad definition form"
-					  defn-or-expr)]
-					[(define-syntaxes . l)
-					 (raise-syntax-error
-					  #f
-					  "bad syntax definition form"
-					  defn-or-expr)]
-					[else null]))
-				    all-expanded))]
-				 [all-defined-names (map cdr all-defined-names/kinds)]
-				 [all-defined-val-names (map cdr 
-							     (filter (lambda (i) (eq? (car i) 'val))
-								     all-defined-names/kinds))])
-			    ;; Check that all defined names (var + stx) are distinct:
-			    (let ([name (check-duplicate-identifier
-					 (append imported-names all-defined-names))])
-			      (when name
-				(raise-syntax-error 
-				 #f
-				 "variable imported and/or defined twice"
-				 stx
-				 name)))
-			    ;; Check that all exported names are defined (as var):
-			    (let ([ht (make-hash-table)]
-				  [stx-ht (make-hash-table)])
-			      (for-each
-			       (lambda (kind+name)
-				 (let ([name (cdr kind+name)])
-				   (let ([l (hash-table-get ht (syntax-e name) (lambda () null))])
-				     (hash-table-put! (if (eq? (car kind+name) 'val) ht stx-ht)
-						      (syntax-e name) 
-						      (cons name l)))))
-			       all-defined-names/kinds)
-			      (for-each 
-			       (lambda (n)
-				 (let ([v (hash-table-get ht (syntax-e n) (lambda () null))])
-				   (unless (ormap (lambda (i) (bound-identifier=? i n)) v)
-				     ;; Either not defined, or defined as syntax:
-				     (let ([stx-v (hash-table-get stx-ht (syntax-e n) (lambda () null))])
-				       (if (ormap (lambda (i) (bound-identifier=? i n)) stx-v)
-					   (raise-syntax-error
-					    #f
-					    "cannot export syntax from a unit"
-					    stx
-					    n)
-					   (raise-syntax-error
-					    #f
-					    "exported variable is not defined"
-					    stx
-					    n))))))
-			       exported-names))
-
-			    ;; Compute defined but not exported:
-			    (let ([ht (make-hash-table)])
-			      (for-each
-			       (lambda (name)
-				 (let ([l (hash-table-get ht (syntax-e name) (lambda () null))])
-				   (hash-table-put! ht (syntax-e name) (cons name l))))
-			       exported-names)
-			      (let ([internal-names
-				     (let loop ([l all-defined-val-names])
-				       (cond
-					[(null? l) null]
-					[(let ([v (hash-table-get ht (syntax-e (car l)) (lambda () null))])
-					   (ormap (lambda (i) (bound-identifier=? i (car l))) v))
-					 (loop (cdr l))]
-					[else (cons (car l) (loop (cdr l)))]))])
-				;; Generate names for import/export boxes, etc:
-				(with-syntax ([(ivar ...) ivars]
-					      [(iloc ...) (generate-temporaries ivars)]
-					      [(eloc ...) (generate-temporaries evars)]
-					      [(extname ...) extnames]
-					      [(expname ...) exported-names]
-					      [(intname ...) internal-names])
-				  ;; Change all definitions to set!s. Convert evars to set-box!,
-				  ;; because set! on exported variables is not allowed.
-				  (with-syntax ([(defn&expr ...) 
-						 (let ([elocs (syntax->list (syntax (eloc ...)))])
-						   (filter
-						    values
-						    (map (lambda (defn-or-expr)
-							   (syntax-case defn-or-expr (define-values define-syntaxes)
-							     [(define-values ids expr)
-							      (let* ([ids (syntax->list (syntax ids))])
-								(if (null? ids)
-								    (syntax/loc defn-or-expr (set!-values ids expr))
-								    (let ([do-one
-									   (lambda (id tmp name)
-									     (let loop ([evars exported-names]
-											[elocs elocs])
-									       (cond
-										[(null? evars)
-										 ;; not an exported id
-										 (with-syntax ([id id][tmp tmp])
-										   (syntax/loc
-										       defn-or-expr
-										     (set! id tmp)))]
-										[(bound-identifier=? (car evars) id)
-										 ;; set! exported id:
-										 (with-syntax 
-										     ([loc (car elocs)]
-										      [tmp 
-										       (if name
-											   (with-syntax 
-											       ([tmp tmp]
-												[name name])
-											     (syntax 
-											      (let ([name tmp])
-												name)))
-											   tmp)])
-										   (syntax/loc defn-or-expr
-										     (set-box! loc tmp)))]
-										[else (loop (cdr evars) 
-											    (cdr elocs))])))])
-								      (if (null? (cdr ids))
-									  (do-one (car ids) (syntax expr) (car ids))
-									  (let ([tmps (generate-temporaries ids)])
-									    (with-syntax ([(tmp ...) tmps]
-											  [(set ...)
-											   (map (lambda (id tmp)
-												  (do-one id tmp #f))
-												ids tmps)])
-									      (syntax/loc defn-or-expr
-										(let-values ([(tmp ...) expr])
-										  set ...))))))))]
-							     [(define-syntaxes . l) #f]
-							     [else defn-or-expr]))
-							 all-expanded)))]
-						[(stx-defn ...) 
-						 (filter
-						  values
-						  (map (lambda (defn-or-expr)
-							 (syntax-case defn-or-expr (define-syntaxes)
-							   [(define-syntaxes . l) #'l]
-							   [else #f]))
-						       all-expanded))])
-				    ;; Build up set! redirection chain:
-				    (with-syntax ([redirections
-						   (let ([varlocs 
-							  (syntax->list 
-							   (syntax ((ivar iloc) ... (expname eloc) ...)))])
-						     (with-syntax ([vars (map stx-car varlocs)]
-								   [rhss
-								    (map
-								     (lambda (varloc)
-								       (with-syntax ([(var loc) varloc])
-									 (syntax
-									  (make-id-mapper (quote-syntax (unbox loc))
-											  (quote-syntax var)))))
-								     varlocs)])
-						       (syntax
-							([vars (values . rhss)]))))]
-						  [num-imports (datum->syntax-object
-								(quote-syntax here)
-								(length (syntax->list (syntax (iloc ...))))
-								#f)]
-						  [name (syntax-local-infer-name stx)])
-				      (syntax/loc stx
-					(make-a-unit
-					 'name
-					 num-imports
-					 (list (quote extname) ...)
-					 (lambda ()
-					   (let ([eloc (box undefined)] ...)
-					     (list (vector eloc ...)
-						   (lambda (iloc ...)
-						     (letrec-syntaxes+values 
-						      (stx-defn ... . redirections)
-						      ([(intname) undefined] ...)
-						      (void) ; in case the body would be empty
-						      defn&expr ...))))))))))))))))))]))])
-      (values (lambda (stx) (do-unit stx #t))
-	      (lambda (stx) (do-unit stx #f)))))
-
-  ;; ----------------------------------------------------------------------
-  ;; check-expected-interface: used by the expansion of `compound-unit'
-  
-  (define (check-expected-interface tag unit num-imports exports)
-    (unless (unit? unit)
-      (raise
-       (make-exn:fail:unit
-	(format "compound-unit: result of expression for tag ~s not a unit: ~e" tag unit)
-	(current-continuation-marks))))
-    (unless (= num-imports (unit-num-imports unit))
-      (raise
-       (make-exn:fail:unit
-	(format "compound-unit: unit for tag ~s expects ~a imports, given ~a" 
-                tag
-                (unit-num-imports unit)
-                num-imports)
-	(current-continuation-marks))))
-    (list->vector
-     (map (lambda (ex)
-	    (let loop ([l (unit-exports unit)][i 0])
-	      (cond
-	       [(null? l)
-		(raise
-		 (make-exn:fail:unit
-		  (format "compound-unit: unit for tag ~s has no ~s export" 
-                          tag ex)
-		  (current-continuation-marks)))]
-	       [(eq? (car l) ex)
-		i]
-	       [else (loop (cdr l) (add1 i))])))
-	  exports)))
-
-  ;; ----------------------------------------------------------------------
-  ;; The `compound-unit' syntactic form
-
-  (define-syntax compound-unit
-    (lambda (stx)
-      (syntax-case stx (import export link)
-	[(_ (import ivar ...)
-	    (link [tag (unit-expr linkage ...)] ...)
-	    (export exportage ...))
-	 (let ([check-id (lambda (v)
-			   (unless (identifier? v)
-			     (raise-syntax-error
-			      #f
-			      "import is not an identifier"
-			      stx
-			      v)))]
-	       [check-tag (lambda (v)
-			   (unless (identifier? v)
-			     (raise-syntax-error
-			      #f
-			      "tag is not an identifier"
-			      stx
-			      v)))]
-	       [check-linkage (lambda (v)
-				(syntax-case v ()
-				  [id (identifier? (syntax id)) #t]
-				  [(tag id ...)
-				   (for-each (lambda (v)
-					       (unless (identifier? v)
-						 (raise-syntax-error
-						  #f
-						  "non-identifier in linkage"
-						  stx
-						  v)))
-					     (syntax->list v))]
-				  [else
-				   (raise-syntax-error
-				    #f
-				    "ill-formed linkage"
-				    stx
-				    v)]))]
-	       [check-exportage (lambda (v)
-				  (syntax-case v ()
-				    [(tag ex ...)
-				     (begin
-				       (unless (identifier? (syntax tag))
-					 (raise-syntax-error
-					  #f
-					  "export tag is not an identifier"
-					  stx
-					  (syntax tag)))
-				       (for-each 
-					(lambda (e)
-					  (syntax-case e ()
-					    [id (identifier? (syntax id)) #t]
-					    [(iid eid)
-					     (begin
-					       (unless (identifier? (syntax iid))
-						 (raise-syntax-error
-						  #f
-						  "export internal name is not an identifier"
-						  stx
-						  (syntax iid)))
-					       (unless (identifier? (syntax eid))
-						 (raise-syntax-error
-						  #f
-						  "export internal name is not an identifier"
-						  stx
-						  (syntax eid))))]
-					    [else
-					     (raise-syntax-error
-					      #f
-					      (format "ill-formed export with tag ~a" 
-						      (syntax-e (syntax tag)))
-					      stx
-					      e)]))
-					(syntax->list (syntax (ex ...)))))]
-				    [else
-				     (raise-syntax-error
-				      #f
-				      "ill-formed export"
-				      stx
-				      v)]))]
-	       [imports (syntax->list (syntax (ivar ...)))]
-	       [tags (syntax->list (syntax (tag ...)))]
-	       [linkages (map syntax->list (syntax->list (syntax ((linkage ...) ...))))]
-	       [exports (syntax->list (syntax (exportage ...)))])
-	   ;; Syntax checks:
-	   (for-each check-id imports)
-	   (for-each check-tag tags)
-	   (for-each (lambda (l) (for-each check-linkage l)) linkages)
-	   (for-each check-exportage exports)
-	   ;; Check for duplicate imports
-	   (let ([dup (check-duplicate-identifier imports)])
-	     (when dup
-	       (raise-syntax-error
-		#f
-		"duplicate import"
-		stx
-		dup)))
-	   ;; Check for duplicate tags
-	   (let ([dup (check-duplicate-identifier tags)])
-	     (when dup
-	       (raise-syntax-error
-		#f
-		"duplicate tag"
-		stx
-		dup)))
-	   ;; Check referenced imports and tags
-	   (let ([check-linkage-refs (lambda (v)
-				       (syntax-case v ()
-					 [(tag . exs)
-					  (unless (ormap (lambda (t)
-							   (bound-identifier=? t (syntax tag)))
-							 tags)
-					    (raise-syntax-error
-					     #f
-					     "linkage tag is not bound"
-					     stx
-					     (syntax tag)))]
-					 [id (unless (ormap (lambda (i)
-							      (bound-identifier=? i (syntax id)))
-							    imports)
-					       (raise-syntax-error
-						#f
-						"no imported identified for linkage"
-						stx
-						(syntax id)))]))]
-		 [check-export-refs (lambda (v)
-				      (syntax-case v ()
-					[(tag . r)
-					 (unless (ormap (lambda (t)
-							  (bound-identifier=? t (syntax tag)))
-							tags)
-					   (raise-syntax-error
-					    #f
-					    "export tag is not bound"
-					    stx
-					    (syntax tag)))]))])
-	     (for-each (lambda (l) (for-each check-linkage-refs l))
-		       linkages)
-	     (for-each check-export-refs exports)
-	     ;; Get all export names, and check for duplicates
-	     (let ([export-names
-		    (apply
-		     append
-		     (map
-		      (lambda (v)
-			(syntax-case v ()
-			  [(tag . exs)
-			   (map
-			    (lambda (e)
-			      (syntax-case e ()
-				[(iid eid) (syntax eid)]
-				[id e]))
-			    (syntax->list (syntax exs)))]))
-		      exports))])
-	       (let ([dup (check-duplicate-identifier export-names)])
-		 (when dup
-		   (raise-syntax-error
-		    #f
-		    "duplicate export"
-		    stx
-		    dup)))
-
-	       (let ([constituents (generate-temporaries tags)]
-		     [unit-export-positionss (generate-temporaries tags)]
-		     [unit-setups (generate-temporaries tags)]
-		     [unit-extracts (generate-temporaries tags)]
-		     [unit-export-lists
-		      ;; For each tag, get all expected exports
-		      (let* ([hts (map (lambda (x) (make-hash-table)) tags)]
-			     [get-add-name 
-			      (lambda (tag)
-				(ormap (lambda (t ht)
-					 (and (bound-identifier=? t tag)
-					      (lambda (name)
-						(hash-table-put! ht (syntax-e name) name))))
-				       tags hts))])
-			;; Walk though linkages
-			(for-each
-			 (lambda (linkage-list)
-			   (for-each 
-			    (lambda (linkage)
-			      (syntax-case linkage ()
-				[(tag . ids)
-				 (let ([add-name (get-add-name (syntax tag))])
-				   (for-each add-name (syntax->list (syntax ids))))]
-				[else (void)]))
-			    linkage-list))
-			 linkages)
-			;; Walk through exports
-			(for-each
-			 (lambda (v)
-			   (syntax-case v ()
-			     [(tag . exs)
-			      (let ([add-name (get-add-name (syntax tag))])
-				(for-each 
-				 (lambda (e)
-				   (syntax-case e ()
-				     [(iid eid) (add-name (syntax iid))]
-				     [id (add-name (syntax id))]))
-				 (syntax->list (syntax exs))))]))
-			 exports)
-			;; Extract names from hash tables
-			(map (lambda (ht)
-			       (hash-table-map ht (lambda (k v) v)))
-			     hts))])
-		 ;; Map exports to imports and indices based on expected unit exports
-		 (let ([map-tag (lambda (t l)
-				  (let loop ([tags tags][l l])
-				    (if (bound-identifier=? (car tags) t)
-					(car l)
-					(loop (cdr tags) (cdr l)))))]
-		       [unit-export-hts (map (lambda (export-list)
-					       (let ([ht (make-hash-table)])
-						 (let loop ([l export-list][p 0])
-						   (unless (null? l)
-						     (hash-table-put! ht (syntax-e (car l)) p)
-						     (loop (cdr l) (add1 p))))
-						 ht))
-					     unit-export-lists)]
-		       [interned-integer-lists null]
-		       [interned-id-lists null])
-		   (let ([make-mapping
-			  (lambda (v)
-			    (syntax-case v ()
-			      [(tag . exs)
-			       (let ([extract (map-tag (syntax tag)
-						       unit-extracts)]
-				     [ht (map-tag (syntax tag)
-						  unit-export-hts)])
-				 (with-syntax ([extract extract]
-					       [pos-name
-						(let ([il
-						       (map
-							(lambda (e)
-							  (hash-table-get
-							   ht
-							   (syntax-e
-							    (syntax-case e ()
-							      [(iid eid) (syntax iid)]
-							      [id e]))))
-							(syntax->list (syntax exs)))])
-						  (or (ormap (lambda (i)
-							       (and (equal? il (cadadr i))
-								    (car i)))
-							     interned-integer-lists)
-						      (let ([name (car (generate-temporaries 
-									(list (syntax tag))))])
-							(set! interned-integer-lists
-							      (cons `(,name ',il)
-								    interned-integer-lists))
-							name)))])
-				   (syntax (map extract pos-name))))]
-			      [import v]))]
-			 [collapse (lambda (l)
-				     (let loop ([l l])
-				       (cond
-					[(null? l) null]
-					[(identifier? (car l))
-					 (let-values ([(ids rest)
-						       (let loop ([l l][ids null])
-							 (if (or (null? l)
-								 (not (identifier? (car l))))
-							     (values (reverse ids) l)
-							     (loop (cdr l) (cons (car l) ids))))])
-					   (let ([name
-						  (let ([id-syms (map syntax-e ids)])
-						    (or (ormap (lambda (i)
-								 (and (equal? id-syms (cadr i))
-								      (car i)))
-							       interned-id-lists)
-							(let ([name 
-							       (car (generate-temporaries (list 'ids)))])
-							  (set! interned-id-lists
-								(cons (list* name id-syms ids)
-								      interned-id-lists))
-							  name)))])
-					     (cons name
-						   (loop rest))))]
-					[else (cons (car l) (loop (cdr l)))])))])
-		     (let ([export-mapping (collapse (map make-mapping exports))]
-			   [import-mappings (map (lambda (linkage-list)
-						   (collapse
-						    (map make-mapping linkage-list)))
-						 linkages)])
-		       (with-syntax ([(constituent ...) constituents]
-				     [(unit-export-positions ...) unit-export-positionss]
-				     [(unit-setup ...) unit-setups]
-				     [(unit-extract ...) unit-extracts]
-				     [interned-integer-lists interned-integer-lists]
-				     [interned-id-lists (map (lambda (i)
-							       (with-syntax ([name (car i)]
-									     [ids (cddr i)])
-								 (syntax [name (list . ids)])))
-							     interned-id-lists)]
-				     [(unit-export-list ...) unit-export-lists]
-				     [(import-mapping ...) import-mappings]
-				     [(unit-import-count ...) 
-				      (map (lambda (l) 
-					     (datum->syntax-object
-					      (quote-syntax here)
-					      (apply
-					       +
-					       (map (lambda (v)
-						      (if (identifier? v)
-							  1
-							  (length (cdr (syntax->list v)))))
-						    l))
-					      #f))
-					   linkages)]
-				     [num-imports (datum->syntax-object
-						   (quote-syntax here)
-						   (length imports)
-						   #f)]
-				     [export-names export-names]
-				     [export-mapping export-mapping]
-				     [name (syntax-local-infer-name stx)])
-			 (syntax/loc
-			  stx
-			  (let ([constituent unit-expr]
-				...)
-			    (let ([unit-export-positions
-				   (check-expected-interface 
-                                    'tag
-				    constituent
-				    unit-import-count
-				    'unit-export-list)]
-				  ...)
-			      (make-a-unit
-			       'name
-			       num-imports
-			       (quote export-names)
-			       (lambda ()
-				 (let ([unit-setup ((unit-go constituent))] ...)
-				   (let ([unit-extract
-					  (lambda (pos)
-					    (vector-ref (car unit-setup)
-							(vector-ref unit-export-positions pos)))]
-					 ...
-					 .
-					 interned-integer-lists)
-				     (list (list->vector (append . export-mapping))
-					   (lambda (ivar ...)
-					     (let interned-id-lists
-						 (void) ;; in case there are no units
-					       (apply (list-ref unit-setup 1) 
-						      (append . import-mapping))
-					       ...))))))))))))))))))])))
-
-  ;; ----------------------------------------------------------------------
-  ;; check-unit: used by the expansion of `invoke-unit'
-  
-  (define (check-unit u n)
-    (unless (unit? u)
-      (raise
-       (make-exn:fail:unit
-	(format "invoke-unit: result of unit expression was not a unit: ~e" u)
-	(current-continuation-marks))))
-    (unless (= (unit-num-imports u) n)
-      (raise
-       (make-exn:fail:unit
-	(format "invoke-unit: expected a unit with ~a imports, given one with ~a imports"
-                n (unit-num-imports u))
-	(current-continuation-marks)))))
-
-  ;; ----------------------------------------------------------------------
-  ;; The `invoke-unit' syntactic form
-  
-  (define-syntax invoke-unit
-    (lambda (stx)
-      (syntax-case stx (import export)
-	[(_ unit-expr expr ...)
-	 (let ([exprs (syntax (expr ...))])
-	   (with-syntax ([(bx ...) (generate-temporaries (syntax (expr ...)))]
-			 [num (datum->syntax-object
-			       (quote-syntax here)
-			       (length (syntax->list exprs)) 
-			       #f)])
-	     (syntax/loc
-	      stx
-	      (let ([u unit-expr])
-		(check-unit u num)
-		(let ([bx (box expr)] ...)
-		  ((list-ref ((unit-go u)) 1)
-		   bx ...))))))])))
-
-  (define-syntaxes (define-values/invoke-unit
-		     namespace-variable-bind/invoke-unit)
-    (let ([mk
-	   (lambda (global?)
-	     (lambda (stx)
-	       (syntax-case stx ()
-		 [(_ exports unite . prefix+imports)
-		  (let* ([badsyntax (lambda (s why)
-				      (raise-syntax-error
-				       #f
-				       (format "bad syntax (~a)" why)
-				       stx
-				       s))]
-			 [symcheck (lambda (s)
-				     (or (identifier? s)
-					 (badsyntax s "not an identifier")))])
-		    (unless (stx-list? (syntax exports))
-		      (badsyntax (syntax exports) "not a sequence of identifiers"))
-		    (for-each symcheck (syntax->list (syntax exports)))
-		    (let ([prefix (if (stx-null? (syntax prefix+imports))
-				      #f
-				      (stx-car (syntax prefix+imports)))])
-		      (unless (or (not prefix)
-				  (not (syntax-e prefix))
-				  (identifier? prefix))
-			(badsyntax prefix "prefix is not an identifier"))
-		      (for-each symcheck (let ([v (syntax prefix+imports)])
-					   (cond
-					    [(stx-null? v) null]
-					    [(stx-list? v) (cdr (syntax->list v))]
-					    [else
-					     (badsyntax (syntax prefix+imports) "illegal use of `.'")])))
-		      (with-syntax ([(tagged-export ...) 
-				     (if (and prefix (syntax-e prefix))
-					 (let ([prefix (string-append
-							(symbol->string 
-							 (syntax-e prefix))
-						      ":")])
-					   (map (lambda (s)
-						  (datum->syntax-object
-						   s
-						   (string->symbol
-						    (string-append
-						     prefix
-						     (symbol->string (syntax-e s))))
-						   s))
-						(syntax->list (syntax exports))))
-					 (syntax exports))]
-				    [extract-unit (syntax (:unit
-							    (import . exports)
-							    (export)
-							    (values . exports)))])
-			(with-syntax ([invoke-unit (with-syntax ([(x . imports)
-								  (if prefix
-								      (syntax prefix+imports)
-								      `(#f))])
-						     (syntax (invoke-unit
-							      (compound-unit
-							       (import . imports)
-							       (link [unit-to-invoke (unite . imports)]
-								     [export-extractor 
-								      (extract-unit (unit-to-invoke . exports))])
-							       (export))
-							      . imports)))])
-			  (if global?
-			      (syntax (let-values ([(tagged-export ...) invoke-unit])
-					(namespace-set-variable-value! 'tagged-export tagged-export)
-					...
-					(void)))
-			      (syntax (define-values (tagged-export ...) invoke-unit)))))))])))])
-      (values (mk #f) (mk #t))))
-  
-  (provide (rename :unit unit) unit/no-expand
-	   compound-unit invoke-unit unit?
-	   (struct exn:fail:unit ())
-
-	   define-values/invoke-unit
-	   namespace-variable-bind/invoke-unit))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig.rkt
deleted file mode 100644
index aa01405726..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-(module unitsig mzscheme
-  (require mzlib/unitsig200)
-  (provide (all-from mzlib/unitsig200)))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig200.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig200.rkt
deleted file mode 100644
index 1cd69d5c51..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig200.rkt
+++ /dev/null
@@ -1,355 +0,0 @@
-
-;; This implementation of `unit/sig' was ported from the old v100
-;; implementation, and then hacked a bit to produce more compact
-;; output, and finally mangled to handle the v200 `struct' (with
-;; compile-time information). It's in dire need of an overhaul.
-
-(module unitsig200 mzscheme
-  (require "unit200.rkt")
-  (require "private/sigmatch.rkt")
-
-  (require-for-syntax "private/sigutil.rkt")
-  (require-for-syntax syntax/kerncase)
-
-  (define-struct signed-unit (unit imports exports))
-
-  (define-syntax define-signature
-    (lambda (expr)
-      (syntax-case expr ()
-	[(_ name sig)
-	 (identifier? (syntax name))
-	 (let ([sig (get-sig 'define-signature expr (syntax-e (syntax name))
-			     (syntax sig) #f)])
-	   (with-syntax ([content (explode-sig sig #f)])
-	     (syntax (define-syntax name
-		       (make-sig (quote content))))))])))
-
-  (define-syntax let-signature
-    (lambda (expr)
-      (syntax-case expr ()
-	[(_ name sig . body)
-	 (identifier? (syntax name))
-	 (let ([sig (get-sig 'let-signature expr (syntax-e (syntax name))
-			     (syntax sig) #f)])
-	   (with-syntax ([content (explode-sig sig #f)])
-	     (syntax (letrec-syntax ([name (make-sig (quote content))])
-		       . body))))])))
-  
-  (define-syntax unit/sig
-    (lambda (expr)
-      (syntax-case expr ()
-	[(_ sig . rest)
-	 (let ([sig (get-sig 'unit/sig expr #f (syntax sig) #f)])
-	  (let ([a-unit (parse-unit expr (syntax rest) sig
-				    (kernel-form-identifier-list)
-				    (quote-syntax define-values)
-				    (quote-syntax define-syntaxes)
-				    (quote-syntax begin))])
-	    (check-signature-unit-body sig a-unit (parsed-unit-renames a-unit) 'unit/sig expr)
-	    (with-syntax ([imports (parsed-unit-import-vars a-unit)]
-			  [exports (datum->syntax-object
-				    expr
-				    (let ([vars (make-hash-table)])
-				      (for-each (lambda (var)
-						  (hash-table-put! vars (syntax-e var) var))
-						(parsed-unit-vars a-unit))
-				      (map
-				       (lambda (name)
-					 (list (let ([name (do-rename name (parsed-unit-renames a-unit))])
-						 (hash-table-get vars name name))
-					       name))
-				       (signature-vars sig)))
-				    expr)]
-			  [body (append
-				 (reverse (parsed-unit-body a-unit))
-				 ((parsed-unit-stx-checks a-unit) expr))]
-			  [import-sigs (explode-named-sigs (parsed-unit-imports a-unit) #f)]
-			  [export-sig (explode-sig sig #f)])
-	      (syntax/loc expr
-		(make-signed-unit
-		 (unit/no-expand
-		   (import . imports)
-		   (export . exports)
-		   . body)
-		 (quote import-sigs)
-		 (quote export-sig))))))])))
-
-  (define-syntax compound-unit/sig
-    (lambda (expr)
-      (syntax-case expr ()
-	[(_ . body)
-	 (let-values ([(tags
-			exprs
-			exploded-link-imports
-			exploded-link-exports
-			flat-imports
-			link-imports
-			flat-exports
-			exploded-imports
-			exploded-exports
-			boxed-interned-symbol-vectors)
-		       (parse-compound-unit expr (syntax body))]
-		      [(t) (lambda (l) (datum->syntax-object expr l expr))])
-	   (with-syntax ([(tag ...) (t tags)]
-			 [(uexpr ...) (t exprs)]
-			 [(tagx ...) (t (map (lambda (t) (string->symbol (format "u:~a" t))) tags))]
-			 [exploded-link-imports (t exploded-link-imports)]
-			 [exploded-link-exports (t exploded-link-exports)]
-			 [flat-imports (t flat-imports)]
-			 [(link-import ...) (t link-imports)]
-			 [flat-exports (t flat-exports)]
-			 [exploded-imports (t exploded-imports)]
-			 [exploded-exports (t exploded-exports)]
-			 [interned-vectors (t (map (lambda (x) `(,(car x) (quote ,(cadr x))))
-						   (unbox boxed-interned-symbol-vectors)))])
-	     (syntax/loc
-	      expr
-	      (let ([tagx uexpr] ... . interned-vectors)
-		(alt-verify-linkage-signature-match
-		 'compound-unit/sig
-		 '(tag ...)
-		 (list tagx ...)
-		 `exploded-link-imports
-		 `exploded-link-exports)
-		;; All checks done. Make the unit:
-		(make-signed-unit
-		 (compound-unit
-		  (import . flat-imports)
-		  (link [tag ((signed-unit-unit tagx)
-			      . link-import)]
-			...)
-		  (export . flat-exports))
-		 `exploded-imports
-		 `exploded-exports)))))])))
-
-  (define-syntax invoke-unit/sig
-    (lambda (expr)
-      (syntax-case expr ()
-	[(_ u sig ...)
-	 (let ([sigs (parse-invoke-vars 'invoke-unit/sig (syntax (sig ...)) expr)])
-	   (with-syntax ([exploded-sigs (datum->syntax-object
-					 expr
-					 (explode-named-sigs sigs #f)
-					 expr)]
-			 [flat-sigs (datum->syntax-object
-				     expr
-				     (flatten-signatures sigs #f) 
-				     expr)])
-	     (syntax/loc
-	      expr
-	      (let ([unt u])
-		(alt-verify-linkage-signature-match
-		 (quote invoke-unit/sig)
-		 (quote (invoke))
-		 (list unt)
-		 (quote ((#() . #())))
-		 (quote (exploded-sigs)))
-		(invoke-unit (signed-unit-unit unt)
-			     . flat-sigs)))))])))
-  
-  (define-syntax unit->unit/sig
-    (lambda (expr)
-      (syntax-case expr ()
-	[(_ e (im-sig ...) ex-sig)
-	 (let ([im-sigs (map (lambda (sig)
-			       (get-sig 'unit->unit/sig expr #f sig #f))
-			     (syntax->list (syntax (im-sig ...))))]
-	       [ex-sig (get-sig 'unit->unit/sig expr #f (syntax ex-sig) #f)])
-	   (with-syntax ([exploded-imports (datum->syntax-object
-					    expr
-					    (explode-named-sigs im-sigs #f)
-					    expr)]
-			 [exploded-exports (datum->syntax-object
-					    expr
-					    (explode-sig ex-sig #f)
-					    expr)])
-	     (syntax
-	      (make-signed-unit
-	       e
-	       (quote exploded-imports)
-	      (quote exploded-exports)))))])))
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-  (define -verify-linkage-signature-match
-    (let ([make-exn make-exn:fail:unit]
-	  [p-suffix (lambda (pos) (case pos [(1) 'st][(2) 'nd][(3) 'rd][else 'th]))])
-      (lambda (who tags units esigs isigs wrapped? unwrap)
-	(for-each
-	 (lambda (u tag)
-	   (unless (signed-unit? u)
-	     (raise
-	      (make-exn
-	       (format "~s: expression for \"~s\" is not a signed unit: ~e"
-                       who tag u)
-	       (current-continuation-marks)))))
-	 units tags)
-	(for-each
-	 (lambda (u tag esig)
-	   (-verify-signature-match
-	    who #f
-	    (format "specified export signature for ~a" tag)
-	    esig
-	    (format "export signature for actual ~a sub-unit" tag)
-	    (signed-unit-exports u)
-	    wrapped? unwrap))
-	 units tags esigs)
-	(for-each
-	 (lambda (u tag isig)
-	   (let ([n (length (signed-unit-imports u))]
-		 [c (length isig)])
-	     (unless (= c n)
-	       (raise
-		(make-exn
-		 (format
-                  "~s: ~a unit imports ~a units, but ~a units were provided"
-                  who tag n c)
-		 (current-continuation-marks))))))
-	 units tags isigs)
-	(for-each
-	 (lambda (u tag isig)
-	   (let loop ([isig isig][expecteds (signed-unit-imports u)][pos 1])
-	     (unless (null? isig)
-	       (let ([expected (car expecteds)]
-		     [provided (car isig)])
-		 (-verify-signature-match
-		  who #t
-		  (format "~a unit's ~s~s import (which is ~a)" tag
-			  pos (p-suffix pos)
-			  (car expected))
-		  (cdr expected)
-		  (format "~a's ~s~s linkage (which is ~a)"
-			  tag
-			  pos (p-suffix pos)
-			  (car provided))
-		  (cdr provided)
-		  wrapped? unwrap)
-		 (loop (cdr isig) (cdr expecteds) (add1 pos))))))
-	 units tags isigs))))
-
-  (define verify-linkage-signature-match
-    (lambda (who tags units esigs isigs)
-      (-verify-linkage-signature-match who tags units esigs isigs values values)))
-
-  (define alt-verify-linkage-signature-match
-    (lambda (who tags units esigs isigs)
-      (-verify-linkage-signature-match who tags units esigs isigs pair? car)))
-
-  (define-syntax signature->symbols
-    (lambda (stx)
-      (syntax-case stx ()
-	[(_ name)
-	 (identifier? (syntax name))
-	 (let ([sig (get-sig 'signature->symbols stx #f (syntax name) #f)])
-	   (with-syntax ([e (let cleanup ([p (explode-sig sig #f)])
-			      ;; Strip struct info:
-			      (list->vector 
-			       (map (lambda (i)
-				      (if (symbol? i)
-					  i
-					  (cons (car i) (cleanup (cdr i)))))
-				    (vector->list (car p)))))])
-	     (syntax 'e)))])))
-
-  ;; Internal:
-  (define-syntax do-define-values/invoke-unit/sig
-    (lambda (stx)
-      (syntax-case stx ()
-	[(_ global? signame unite prefix imports orig)
-	 (let* ([formname (if (syntax-e (syntax global?))
-			      'namespace-variable-bind/invoke-unit/sig
-			      'define-values/invoke-unit/sig)]
-		[badsyntax (lambda (s why)
-			     (raise-syntax-error
-			      #f
-			      (format "bad syntax (~a)" why)
-			      (syntax orig)
-			      s))])
-	   (unless (or (not (syntax-e (syntax prefix)))
-		       (identifier? (syntax prefix)))
-	     (badsyntax (syntax prefix) "prefix is not an identifier"))
-	   (let ([ex-sig (get-sig formname (syntax orig) #f (syntax signame) (syntax signame))])
-	     (let ([ex-exploded (explode-sig ex-sig #f)]
-		   [ex-flattened (flatten-signature #f ex-sig #'signame)])
-	       (let ([im-sigs
-		      (parse-invoke-vars formname (syntax imports) (syntax orig))])
-		 (let ([im-explodeds (explode-named-sigs im-sigs #f)]
-		       [im-flattened (flatten-signatures im-sigs #f)]
-		       [d->s (lambda (x) (datum->syntax-object (syntax orig) x (syntax orig)))])
-		   (with-syntax ([dv/iu (if (syntax-e (syntax global?))
-					    (quote-syntax namespace-variable-bind/invoke-unit)
-					    (quote-syntax define-values/invoke-unit))]
-				 [ex-flattened ex-flattened]
-				 [ex-exploded (d->s ex-exploded)]
-				 [im-explodeds (d->s im-explodeds)]
-				 [im-flattened (d->s im-flattened)]
-				 [formname formname]
-				 [stx-decls (if (syntax-e (syntax global?))
-						null
-						(make-struct-stx-decls ex-sig #f #f (syntax signame) #f))])
-		     (syntax/loc stx
-		       (begin
-			 (dv/iu
-			  ex-flattened
-			  (let ([unit-var unite])
-			    (alt-verify-linkage-signature-match
-			     'formname
-			     '(invoke)
-			     (list unit-var)
-			     '(ex-exploded)
-			     '(im-explodeds))
-			    (signed-unit-unit unit-var))
-			  prefix
-			  . im-flattened)
-			 . stx-decls))))))))])))
-  
-  (define-syntax define-values/invoke-unit/sig
-    (lambda (stx)
-      (with-syntax ([orig stx])
-	(syntax-case stx ()
-	  [(_ signame unit prefix . imports)
-	   (syntax (do-define-values/invoke-unit/sig #f signame unit prefix imports orig))]
-	  [(_ signame unit)
-	   (syntax (do-define-values/invoke-unit/sig #f signame unit #f () orig))]))))
-
-  (define-syntax namespace-variable-bind/invoke-unit/sig
-    (lambda (stx)
-      (with-syntax ([orig stx])
-	(syntax-case stx ()
-	  [(_ signame unit prefix . imports)
-	   (syntax (do-define-values/invoke-unit/sig #t signame unit prefix imports orig))]
-	  [(_ signame unit)
-	   (syntax (do-define-values/invoke-unit/sig #t signame unit #f () orig))]))))
-
-  (define-syntax provide-signature-elements
-    (lambda (stx)
-      (with-syntax ([orig stx])
-	(syntax-case stx ()
-	  [(_ signame)
-	   (let ([sig (get-sig 'provide-signature-elements stx #f (syntax signame) (syntax signame))])
-	     (let ([flattened (flatten-signature #f sig (syntax signame))]
-		   [structs (map struct-def-name (signature-structs sig))])
-	       (with-syntax ([flattened (map (lambda (x) (datum->syntax-object (syntax signame) x #f))
-					     (append flattened structs))])
-		 (syntax/loc stx
-		   (provide . flattened)))))]))))
-  
-  (define (unit/sig? x) (signed-unit? x))
-  (define (unit/sig->unit x) (signed-unit-unit x))
-
-  (provide define-signature
-	   let-signature
-	   unit/sig
-	   compound-unit/sig
-	   invoke-unit/sig
-	   unit->unit/sig
-	   signature->symbols
-	   verify-signature-match
-	   verify-linkage-signature-match
-
-	   (struct signed-unit (unit imports exports))
-	   unit/sig? unit/sig->unit
-	   
-	   define-values/invoke-unit/sig
-	   namespace-variable-bind/invoke-unit/sig
-	   provide-signature-elements))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/zip.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzlib/zip.rkt
deleted file mode 100644
index d1c59e6bae..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/zip.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-;; deprecated library, see `file/zip`
-
-(require file/zip)
-(provide (all-from-out file/zip))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/lang/reader.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/lang/reader.rkt
deleted file mode 100644
index bc02ffaaaf..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-mzscheme
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/main.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/main.rkt
deleted file mode 100644
index 05311db5e4..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/main.rkt
+++ /dev/null
@@ -1,111 +0,0 @@
-;;----------------------------------------------------------------------
-;; mzscheme: provide everything
-
-(module mzscheme '#%kernel
-  (#%require racket/private/more-scheme
-             (all-except racket/private/misc
-			 collection-path
-			 collection-file-path)
-             racket/private/letstx-scheme
-             racket/private/stxcase-scheme
-             racket/private/stx
-             racket/private/qqstx
-             racket/private/define
-             mzscheme/private/stxmz-body
-             mzscheme/private/old-ds
-             mzscheme/private/old-rp
-             mzscheme/private/old-if
-             mzscheme/private/old-procs
-             racket/private/map ; shadows #%kernel bindings
-             racket/private/kernstruct
-             racket/private/promise
-             racket/private/cert
-             (only racket/private/cond old-cond)
-             ;; shadows #%kernel bindings:
-             (only racket/private/list 
-                   assq assv assoc reverse)
-             racket/private/member
-             racket/tcp
-             racket/udp
-             '#%builtin) ; so it's attached
-
-  (#%provide require require-for-syntax require-for-template require-for-label
-             provide provide-for-syntax provide-for-label
-             (all-from-except racket/private/more-scheme case old-case 
-                              log-fatal log-error log-warning log-info log-debug
-                              hash-update hash-update!)
-             (rename old-case case)
-             (all-from racket/private/misc)
-             collection-path
-             collection-file-path
-             (all-from-except racket/private/stxcase-scheme _ datum datum-case with-datum)
-             (all-from-except racket/private/letstx-scheme 
-                              -define -define-syntax -define-struct
-                              cond old-cond else =>)
-             (rename old-cond cond)
-             define-struct let-struct
-             identifier? ;; from racket/private/stx
-             (all-from racket/private/cert)
-             (all-from-except racket/private/qqstx quasidatum undatum undatum-splicing)
-             (all-from racket/private/define)
-             (all-from racket/private/kernstruct)
-             force delay promise?
-             (all-from-except '#%kernel #%module-begin #%datum 
-                              if make-empty-namespace
-                              syntax->datum datum->syntax
-                              free-identifier=?
-                              free-transformer-identifier=?
-                              free-template-identifier=?
-                              free-label-identifier=?
-                              vector-copy!
-                              thread-send
-                              thread-receive
-                              thread-try-receive
-                              thread-receive-evt
-                              make-hash make-immutable-hash make-weak-hash
-                              make-hasheq make-immutable-hasheq make-weak-hasheq
-                              hash? hash-eq? hash-weak?
-                              hash-ref hash-set! hash-set
-                              hash-remove! hash-remove 
-                              hash-copy hash-count
-                              hash-map hash-for-each 
-                              hash-iterate-first hash-iterate-next
-                              hash-iterate-value hash-iterate-key
-                              log-message log-level? make-logger logger? current-logger logger-name
-                              make-log-receiver log-receiver?
-                              prop:incomplete-arity)
-             (rename syntax->datum syntax-object->datum)
-             (rename datum->syntax datum->syntax-object)
-             (rename free-identifier=? module-identifier=?)
-             (rename free-transformer-identifier=? module-transformer-identifier=?)
-             (rename free-template-identifier=? module-template-identifier=?)
-             (rename free-label-identifier=? module-label-identifier=?)
-             (rename free-identifier=?* free-identifier=?)
-             make-hash-table hash-table? make-immutable-hash-table
-             (rename hash-ref hash-table-get)
-             (rename hash-set! hash-table-put!)
-             (rename hash-remove! hash-table-remove!)
-             (rename hash-count hash-table-count)
-             (rename hash-copy hash-table-copy)
-             (rename hash-map hash-table-map)
-             (rename hash-for-each hash-table-for-each)
-             (rename hash-iterate-first hash-table-iterate-first)
-             (rename hash-iterate-next hash-table-iterate-next)
-             (rename hash-iterate-value hash-table-iterate-value)
-             (rename hash-iterate-key hash-table-iterate-key)
-             namespace-transformer-require
-             transcript-on transcript-off
-             (rename cleanse-path expand-path)
-             (rename if* if)
-             (rename list list-immutable)
-             make-namespace
-             #%top-interaction
-             map for-each andmap ormap
-             assq assv assoc reverse memq memv member
-             (rename old-datum #%datum)
-             (rename mzscheme-in-stx-module-begin #%module-begin)
-             (rename #%module-begin #%plain-module-begin)
-             (rename lambda #%plain-lambda)
-             (rename #%app #%plain-app)
-	     (all-from racket/tcp)
-             (all-from racket/udp)))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-ds.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-ds.rkt
deleted file mode 100644
index 3b7c9ff128..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-ds.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-
-(module old-ds '#%kernel
-  (#%require racket/private/define-struct
-             (for-syntax '#%kernel
-                         racket/private/stxcase-scheme))
-
-  (#%provide define-struct let-struct old-datum)
-  
-  (define-syntaxes (define-struct)
-    (lambda (stx)
-      (with-syntax ([orig stx])
-        (syntax-case stx ()
-          [(_ base (field ...))
-           #'(define-struct/derived orig base (field ...) #:mutable)]
-          [(_ base (field ...) insp)
-           (with-syntax ([insp
-                          (if (keyword? (syntax-e #'insp))
-                              (datum->syntax #'insp
-                                             (cons '#%datum #'insp)
-                                             #'insp)
-                              #'insp)])
-             #'(define-struct/derived orig base (field ...) #:mutable #:inspector insp))]))))
-
-  (define-syntaxes (let-struct)
-    (syntax-rules ()
-      [(_ base (field ...) body1 body ...)
-       (let-values ()
-         (define-struct base (field ...))
-         body1 body ...)]))
-
-  (define-syntaxes (old-datum)
-    (syntax-rules ()
-      [(_ . any) (quote any)])))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-if.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-if.rkt
deleted file mode 100644
index 2bd380676f..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-if.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-(module old-if '#%kernel
-  (#%require (for-syntax '#%kernel))
-  (#%provide if*)
-
-  (define-syntaxes (if*)
-    (lambda (stx)
-      (let-values ([(if-stx) (quote-syntax if)])
-        (if (pair? (syntax-e stx))
-            (let-values ([(l) (syntax->list stx)])
-              (if (if l
-                      (if (= (length l) 3)
-                          #t
-                          #f)
-                      #f)
-                  (datum->syntax
-                   stx
-                   (list if-stx
-                         (cadr l)
-                         (caddr l)
-                         (quote-syntax (void)))
-                   stx
-                   stx)
-                  (datum->syntax
-                   stx
-                   (cons if-stx
-                         (cdr (syntax-e stx)))
-                   stx
-                   stx)))
-            (datum->syntax
-             if-stx
-             'if
-             stx))))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-procs.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-procs.rkt
deleted file mode 100644
index 61861b7ba1..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-procs.rkt
+++ /dev/null
@@ -1,128 +0,0 @@
-
-(module old-procs '#%kernel
-  (#%require racket/private/small-scheme
-             racket/private/more-scheme
-             racket/private/define
-             racket/private/member
-	     (only racket/private/misc collection-path collection-file-path))
-
-  (#%provide make-namespace
-             free-identifier=?*
-             namespace-transformer-require
-             transcript-on
-             transcript-off
-	     (rename new:collection-path collection-path)
-	     (rename new:collection-file-path collection-file-path)
-             make-hash-table
-             make-immutable-hash-table
-             hash-table?)
-
-  (define reflect-var #f)
-
-  (define new:collection-path
-    (let ([collection-path (lambda (collection . collections)
-                             (collection-path
-                              (lambda (s)
-                                (raise
-                                 (exn:fail:filesystem
-                                  (string-append "collection-path: " s)
-                                  (current-continuation-marks))))
-                              collection collections))])
-      collection-path))
-
-  (define new:collection-file-path
-    (let ([collection-file-path (lambda (file-name collection . collections)
-                                  (collection-file-path
-                                   (lambda (s)
-                                     (raise
-                                      (exn:fail:filesystem
-                                       (string-append "collection-file-path: " s)
-                                       (current-continuation-marks))))
-                                   #f
-                                   file-name collection collections))])
-      collection-file-path))
-
-  
-  (define make-namespace
-    (case-lambda
-     [() (make-namespace 'initial)]
-     [(flag)
-      (unless (memq flag '(initial empty))
-        (raise-syntax-error 'make-namespace
-                            "'initial or 'empty"
-                            flag))
-      (let* ([old (variable-reference->empty-namespace (#%variable-reference reflect-var))]
-             [new (parameterize ([current-namespace old])
-                    (make-empty-namespace))])
-        (namespace-attach-module old 'mzscheme new)
-        (unless (eq? flag 'empty)
-          (parameterize ([current-namespace new])
-            (namespace-require/copy 'mzscheme)))
-        new)]))
-
-  (define (free-identifier=?* a b)
-    (and (eq? (syntax-e a)
-              (syntax-e b))
-         (free-identifier=? a b)))
-
-  (define (namespace-transformer-require qrs)
-    (namespace-require `(for-syntax ,qrs)))
-
-  (define (transcript-on filename)
-    (error 'transcript-on "unsupported"))
-  (define (transcript-off)
-    (error 'transcript-off "unsupported"))
-
-  (define make-hash-table
-    (case-lambda
-     [() (make-hasheq)]
-     [(a) (if (eq? a 'equal)
-              (make-hash)
-              (if (eq? a 'weak)
-                  (make-weak-hasheq)
-                  (if (eq? a 'eqv)
-                      (make-hasheqv)
-                      (raise-mismatch-error 'make-hash-table "bad argument: " a))))]
-     [(a b) (if (or (and (or (eq? a 'equal)
-                             (eq? a 'eqv))
-                         (eq? b 'weak))
-                    (and (eq? a 'weak)
-                         (or (eq? b 'equal)
-                             (eq? b 'eqv))))
-                (if (or (eq? a 'eqv) (eq? b 'eqv))
-                    (make-weak-hasheqv)
-                    (make-weak-hash))
-                (raise-mismatch-error 'make-hash-table "bad arguments: " (list a b)))]))
-
-  (define make-immutable-hash-table
-    (case-lambda
-     [(l) (make-immutable-hasheq l)]
-     [(l a) (if (eq? a 'equal)
-                (make-immutable-hash l)
-                (if (eq? a 'eqv)
-                    (make-immutable-hasheqv l)
-                    (raise-mismatch-error 'make-immutable-hash-table "bad argument: " a)))]))
-  
-  (define hash-table?
-    (case-lambda
-     [(v) (hash? v)]
-     [(v a) (if (eq? a 'equal)
-                (and (hash? v)
-                     (not (hash-eq? v))
-                     (not (hash-eqv? v)))
-                (if (eq? a 'weak)
-                    (and (hash? v)
-                         (hash-weak? v))
-                    (if (eq? a 'eqv)
-                        (hash-eqv? v)
-                        (raise-mismatch-error 'hash-table? "bad argument: " a))))]
-     [(v a b) (if (or (and (or (eq? a 'equal) (eq? a 'eqv))
-                           (eq? b 'weak))
-                      (and (eq? a 'weak)
-                           (or (eq? b 'equal) (eq? b 'eqv))))
-                  (and (hash? v)
-                       (if (or (eq? a 'eqv) (eq? b 'eqv))
-                           (hash-eqv? v)
-                           (not (or (hash-eq? v) (hash-eqv? v))))
-                       (hash-weak? v))
-                  (raise-mismatch-error 'hash-table? "bad arguments: " (list a b)))])))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-rp.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-rp.rkt
deleted file mode 100644
index b922da931a..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-rp.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-
-(module old-rp '#%kernel
-  (#%require (for-syntax '#%kernel racket/private/stx racket/private/small-scheme
-			 racket/private/stxcase-scheme))
-
-  (#%provide require require-for-syntax require-for-template require-for-label
-             provide provide-for-syntax provide-for-label)
-
-  (begin-for-syntax
-   (define-values (rebuild-elem)
-     (lambda (stx elem sub pos loop ids)
-       ;; For sub-forms, we loop and reconstruct:
-       (for-each (lambda (id)
-                   (unless (identifier? id)
-                     (raise-syntax-error
-                      #f
-                      "expected an identifier"
-                      stx
-                      id)))
-                 (syntax->list ids))
-       (let rloop ([elem elem][pos pos])
-         (if (syntax? elem)
-             (datum->syntax elem
-                            (rloop (syntax-e elem) pos)
-                            elem
-                            elem)
-             (if (zero? pos)
-                 (cons (loop (car elem))
-                       (cdr elem))
-                 (cons (car elem)
-                       (rloop (cdr elem) (sub1 pos)))))))))
-
-
-  (define-syntaxes (require require-for-syntax require-for-template require-for-label)
-    (let ([mk
-           (lambda (for-stx)
-             (lambda (stx)
-               (syntax-case stx ()
-                 [(_ elem ...)
-                  (if for-stx
-                      (with-syntax ([for for-stx])
-                        (syntax/loc stx
-                          (#%require (for-meta for (just-meta 0 elem ...)))))
-                      (syntax/loc stx
-                        (#%require elem ...)))])))])
-      (values (mk #f)
-              (mk #'1)
-              (mk #'-1)
-              (mk #'#f))))
-
-  (define-syntaxes (provide provide-for-syntax provide-for-label)
-    (let ([mk
-           (lambda (for-stx)
-             (lambda (stx)
-               (syntax-case stx ()
-                 [(_ elem ...)
-                  (if for-stx
-                      (with-syntax ([for for-stx])
-                        (syntax/loc stx
-                          (#%provide (for elem ...))))
-                      (syntax/loc stx
-                        (#%provide elem ...)))])))])
-      (values (mk #f)
-              (mk #'for-syntax)
-              (mk #'for-label)))))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/stxmz-body.rkt b/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/stxmz-body.rkt
deleted file mode 100644
index c6de635053..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/stxmz-body.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-;;----------------------------------------------------------------------
-;; mzscheme's `#%module-begin'
-
-(module stxmz-body '#%kernel
-  ;; These could probably change to just be `(require racket/base)`.
-  (#%require racket/private/define
-             (for-syntax '#%kernel racket/private/stx))
-
-  ;; So that expansions print the way the Racket programmer expects:
-  (#%require (rename '#%kernel #%plain-module-begin #%module-begin))
-
-  (define-syntax mzscheme-in-stx-module-begin
-    (lambda (stx)
-      (if (stx-pair? stx)
-	  (datum->syntax
-	   (quote-syntax here)
-	   (list* (quote-syntax #%plain-module-begin)
-                  (datum->syntax
-		   stx
-                   (list (quote-syntax #%require) '(for-syntax mzscheme)))
-		  (stx-cdr stx))
-	   stx)
-	  (raise-syntax-error #f "bad syntax" stx))))
-
-  (define-syntax #%top-interaction
-    (lambda (stx)
-      (if (eq? 'top-level (syntax-local-context))
-          'ok
-          (raise-syntax-error
-           #f
-           "not at top level"
-           stx))
-      (datum->syntax stx (stx-cdr stx) stx stx)))
-
-  (#%provide mzscheme-in-stx-module-begin
-             #%top-interaction))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/base64-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/base64-sig.rkt
deleted file mode 100644
index 21d2aa915f..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/base64-sig.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/signature
-
-base64-encode-stream
-base64-decode-stream
-base64-encode
-base64-decode
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/base64-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/base64-unit.rkt
deleted file mode 100644
index bac266a25d..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/base64-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "base64-sig.rkt" net/base64)
-
-(define-unit-from-context base64@ base64^)
-
-(provide base64@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-sig.rkt
deleted file mode 100644
index 43dfa6a616..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-sig.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/signature
-
-;; -- cgi methods --
-get-bindings
-get-bindings/post
-get-bindings/get
-output-http-headers
-generate-html-output
-generate-error-output
-bindings-as-html
-extract-bindings
-extract-binding/single
-get-cgi-method
-
-;; -- general HTML utilities --
-string->html
-generate-link-text
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-unit.rkt
deleted file mode 100644
index 2a663b448f..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "cgi-sig.rkt" net/cgi)
-
-(define-unit-from-context cgi@ cgi^)
-
-(provide cgi@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-sig.rkt
deleted file mode 100644
index 34cbaa4df3..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-sig.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/signature
-
-cookie-name?
-cookie-value?
-cookie?
-valid-domain?
-set-cookie
-cookie:add-comment
-cookie:add-domain
-cookie:add-max-age
-cookie:add-path
-cookie:secure
-cookie:version
-;; To actually return a cookie (string formated as a cookie):
-print-cookie
-;; To parse the Cookies header:
-get-cookie
-get-cookie/single
-;; exceptions
-(struct cookie-error ())
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-unit.rkt
deleted file mode 100644
index 1dfc62d1fe..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require racket/unit
-         "cookie-sig.rkt"
-         net/cookie)
-
-(define-unit-from-context cookie@ cookie^)
-
-(provide cookie@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/dns-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/dns-sig.rkt
deleted file mode 100644
index c97c295fd0..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/dns-sig.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/signature
-
-dns-get-address
-dns-get-name
-dns-get-mail-exchanger
-dns-find-nameserver
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/dns-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/dns-unit.rkt
deleted file mode 100644
index cce9e8218e..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/dns-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "dns-sig.rkt" net/dns)
-
-(define-unit-from-context dns@ dns^)
-
-(provide dns@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-sig.rkt
deleted file mode 100644
index 8b2c508266..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-sig.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/signature
-
-ftp-connection?
-ftp-cd
-ftp-establish-connection ftp-establish-connection*
-ftp-close-connection
-ftp-directory-list
-ftp-download-file
-ftp-make-file-seconds
-ftp-upload-file
-ftp-delete-file
-ftp-make-directory
-ftp-delete-directory
-ftp-rename-file
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-unit.rkt
deleted file mode 100644
index 5609f1d580..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-unit.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-
-;; Version 0.2
-;;   Version 0.1a
-;;   Micah Flatt
-;;   06-06-2002
-(require racket/unit
-         "ftp-sig.rkt" net/ftp)
-
-(define-unit-from-context ftp@ ftp^)
-
-(provide ftp@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/head-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/head-sig.rkt
deleted file mode 100644
index 698dc3d258..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/head-sig.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/signature
-
-empty-header
-validate-header
-extract-field
-remove-field
-insert-field
-replace-field
-extract-all-fields
-append-headers
-standard-message-header
-data-lines->data
-extract-addresses
-assemble-address-field
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/head-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/head-unit.rkt
deleted file mode 100644
index ea5b6ae5ef..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/head-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "head-sig.rkt" net/head)
-
-(define-unit-from-context head@ head^)
-
-(provide head@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/imap-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/imap-sig.rkt
deleted file mode 100644
index 9fb67849a8..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/imap-sig.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket/signature
-
-imap-port-number
-imap-connection?
-
-imap-connect imap-connect*
-imap-disconnect
-imap-force-disconnect
-imap-reselect
-imap-examine
-imap-noop
-imap-status
-imap-poll
-
-imap-new?
-imap-messages
-imap-recent
-imap-uidnext
-imap-uidvalidity
-imap-unseen
-imap-reset-new!
-
-imap-get-expunges
-imap-pending-expunges?
-imap-get-updates
-imap-pending-updates?
-
-imap-get-messages
-imap-copy imap-append
-imap-store imap-flag->symbol symbol->imap-flag
-imap-expunge
-
-imap-mailbox-exists?
-imap-create-mailbox
-
-imap-list-child-mailboxes
-imap-mailbox-flags
-imap-get-hierarchy-delimiter
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/imap-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/imap-unit.rkt
deleted file mode 100644
index 2205f05cb3..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/imap-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "imap-sig.rkt" net/imap)
-
-(define-unit-from-context imap@ imap^)
-
-(provide imap@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/mime-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/mime-sig.rkt
deleted file mode 100644
index 5737f21c5e..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/mime-sig.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/signature
-
-;; -- exceptions raised --
-(struct mime-error () #:omit-constructor)
-(struct unexpected-termination (msg) #:omit-constructor)
-(struct missing-multipart-boundary-parameter () #:omit-constructor)
-(struct malformed-multipart-entity (msg) #:omit-constructor)
-(struct empty-mechanism () #:omit-constructor)
-(struct empty-type () #:omit-constructor)
-(struct empty-subtype () #:omit-constructor)
-(struct empty-disposition-type () #:omit-constructor)
-
-;; -- basic mime structures --
-(struct message (version entity fields))
-(struct entity (type subtype charset encoding
-                disposition params id
-                description other fields
-                parts body))
-(struct disposition (type filename creation
-                     modification read
-                     size params))
-
-;; -- mime methods --
-mime-analyze
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/mime-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/mime-unit.rkt
deleted file mode 100644
index a620637abd..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/mime-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "mime-sig.rkt" net/mime)
-
-(define-unit-from-context mime@ mime^)
-
-(provide mime@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-sig.rkt
deleted file mode 100644
index eb14817678..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-sig.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/signature
-
-(struct communicator (sender receiver server port))
-connect-to-server connect-to-server* disconnect-from-server
-authenticate-user open-news-group
-head-of-message body-of-message
-newnews-since generic-message-command
-make-desired-header extract-desired-headers
-
-(struct nntp ())
-(struct unexpected-response (code text))
-(struct bad-status-line (line))
-(struct premature-close (communicator))
-(struct bad-newsgroup-line (line))
-(struct non-existent-group (group))
-(struct article-not-in-group (article))
-(struct no-group-selected ())
-(struct article-not-found (article))
-(struct authentication-rejected ())
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-unit.rkt
deleted file mode 100644
index 6e81bacafe..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "nntp-sig.rkt" net/nntp)
-
-(define-unit-from-context nntp@ nntp^)
-
-(provide nntp@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-sig.rkt
deleted file mode 100644
index 03cc804285..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-sig.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/signature
-
-(struct communicator (sender receiver server port state))
-connect-to-server connect-to-server* disconnect-from-server
-authenticate/plain-text
-get-mailbox-status
-get-message/complete get-message/headers get-message/body
-delete-message
-get-unique-id/single get-unique-id/all
-
-make-desired-header extract-desired-headers
-
-(struct pop3 ())
-(struct cannot-connect ())
-(struct username-rejected ())
-(struct password-rejected ())
-(struct not-ready-for-transaction (communicator))
-(struct not-given-headers (communicator message))
-(struct illegal-message-number (communicator message))
-(struct cannot-delete-message (communicator message))
-(struct disconnect-not-quiet (communicator))
-(struct malformed-server-response (communicator))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-unit.rkt
deleted file mode 100644
index 3357b8aafd..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "pop3-sig.rkt" net/pop3)
-
-(define-unit-from-context pop3@ pop3^)
-
-(provide pop3@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/qp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/qp-sig.rkt
deleted file mode 100644
index 7c07d57caf..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/qp-sig.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/signature
-
-;; -- exceptions raised --
-(struct qp-error () #:omit-constructor)
-(struct qp-wrong-input () #:omit-constructor)
-(struct qp-wrong-line-size (size) #:omit-constructor)
-
-;; -- qp methods --
-qp-encode
-qp-decode
-qp-encode-stream
-qp-decode-stream
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/qp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/qp-unit.rkt
deleted file mode 100644
index 8704dba6de..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/qp-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "qp-sig.rkt" net/qp)
-
-(define-unit-from-context qp@ qp^)
-
-(provide qp@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-sig.rkt
deleted file mode 100644
index b4d68c2816..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-sig.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/signature
-
-send-mail-message/port
-send-mail-message
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-unit.rkt
deleted file mode 100644
index ad0876b7b1..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "sendmail-sig.rkt" net/sendmail)
-
-(define-unit-from-context sendmail@ sendmail^)
-
-(provide sendmail@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-sig.rkt
deleted file mode 100644
index a81062b7db..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-sig.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/signature
-
-smtp-sending-server
-smtp-send-message
-smtp-send-message*
-smtp-sending-end-of-message
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-unit.rkt
deleted file mode 100644
index 029ccaf732..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "smtp-sig.rkt" net/smtp)
-
-(define-unit-from-context smtp@ smtp^)
-
-(provide smtp@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-sig.rkt
deleted file mode 100644
index 6c5a85a494..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-sig.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/signature
-
-uri-encode
-uri-decode
-uri-path-segment-encode
-uri-path-segment-decode
-uri-userinfo-encode
-uri-userinfo-decode
-form-urlencoded-encode
-form-urlencoded-decode
-alist->form-urlencoded
-form-urlencoded->alist
-current-alist-separator-mode
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-unit.rkt
deleted file mode 100644
index 477b849a34..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "uri-codec-sig.rkt" net/uri-codec)
-
-(define-unit-from-context uri-codec@ uri-codec^)
-
-(provide uri-codec@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/url-sig.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/url-sig.rkt
deleted file mode 100644
index 4475c39d3e..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/url-sig.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-(require racket/unit)
-
-(provide url^ url+scheme^)
-
-(define-signature url^
-  (get-pure-port
-   get-impure-port
-   post-pure-port
-   post-impure-port
-   head-pure-port
-   head-impure-port
-   delete-pure-port
-   delete-impure-port
-   put-pure-port
-   put-impure-port
-   display-pure-port
-   purify-port
-   netscape/string->url
-   string->url
-   url->string
-   path->url
-   url->path
-   call/input-url
-   combine-url/relative
-   url-exception?
-   current-proxy-servers
-   file-url-path-convention-type))
-
-(define-signature url+scheme^ extends url^
-  (current-connect-scheme))
-
-
-
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/url-unit.rkt b/pkgs/compatibility-pkgs/compatibility-lib/net/url-unit.rkt
deleted file mode 100644
index 8623748f38..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/net/url-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         "url-sig.rkt" net/url net/url-connect)
-
-(define-unit-from-context url@ url+scheme^)
-
-(provide url@)
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/racket/mpair.rkt b/pkgs/compatibility-pkgs/compatibility-lib/racket/mpair.rkt
deleted file mode 100644
index 52d2b82f19..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/racket/mpair.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-;; compatibility library, see compatibility/mlist
-
-(require compatibility/mlist)
-(provide (all-from-out compatibility/mlist))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/racket/package.rkt b/pkgs/compatibility-pkgs/compatibility-lib/racket/package.rkt
deleted file mode 100644
index d095cc9868..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/racket/package.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-;; compatibility library, see compatibility/package
-
-(require compatibility/package)
-(provide (all-from-out compatibility/package))
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/scheme/mpair.rkt b/pkgs/compatibility-pkgs/compatibility-lib/scheme/mpair.rkt
deleted file mode 100644
index fd74621737..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/scheme/mpair.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/mpair
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/scheme/package.rkt b/pkgs/compatibility-pkgs/compatibility-lib/scheme/package.rkt
deleted file mode 100644
index 332c173eda..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-lib/scheme/package.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/package
diff --git a/pkgs/compatibility-pkgs/compatibility-test/LICENSE.txt b/pkgs/compatibility-pkgs/compatibility-test/LICENSE.txt
deleted file mode 100644
index a56ff834c7..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-compatibility-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/compatibility-pkgs/compatibility-test/info.rkt b/pkgs/compatibility-pkgs/compatibility-test/info.rkt
deleted file mode 100644
index cebd00514f..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-(define collection 'multi)
-(define deps '("base"
-               "racket-test"))
-
-(define pkg-desc "tests for \"compatibility-lib\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/awk.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/awk.rktl
deleted file mode 100644
index 6b22fcb6a2..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/awk.rktl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(Section 'awk)
-
-(require mzlib/awk)
-
-(define-syntax (test-awk stx)
-  (syntax-case stx ()
-    [(_ val body ...) 
-     (with-syntax ([next (datum->syntax stx 'next)]
-		   [result (datum->syntax stx 'result)])
-       (syntax
-	(let* ([p (open-input-string "Hello world.")]
-	       [next (lambda () (let ([o (read p)])
-				  (if (eof-object? o)
-				      o
-				      (symbol->string o))))]
-	       [r null]
-	       [result (lambda (v)
-			 (set! r (append r (list v))))])
-	  body ...
-	  (test val 'awk r))))]))
-			
-		
-
-(test-awk '(hi there)
-	  (awk (next) (str) ()
-	       ["ell" (result 'hi)]
-	       ["x" (result 'yikes)]
-	       ["orl" (result 'there)]))
-
-(test-awk '("l" done)
-	  (awk (next) (str) ()
-	       [/ "el(l)" / (#f a) (result a)]
-	       [(equal? str "world.") (result 'done)]))
-
-(report-errs)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/binc.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/binc.rktl
deleted file mode 100644
index 9dd2939ec9..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/binc.rktl
+++ /dev/null
@@ -1,4 +0,0 @@
-(begin
- (define w x)
- (define z w))
-(define y z)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/cmdline.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/cmdline.rktl
deleted file mode 100644
index 95b88c3acd..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/cmdline.rktl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(Section 'command-line)
-
-(require mzlib/cmdline)
-
-(test (void) 'cmdline
-      (command-line "something" #("-ab")
-        (once-each
-         [("-a") "ok" 5]
-         [("-b" "--more") "Help" 7])))
-
-;; test that keywords are compared for the literal symbol
-(test "foo" 'cmdline
-      (let ([once-each 3] [args "args"])
-        (command-line "something" #("-ab" "foo")
-          (once-each
-           [("-a") "ok" 5]
-           [("-b" "--more") "Help" 7])
-          (args (x) x))))
-
-(syntax-test #'(command-line))
-(syntax-test #'(command-line "hello"))
-(err/rt-test (command-line 'hello #("ok")))
-(syntax-test #'(command-line "hello" #("ok") (bad)))
-(syntax-test #'(command-line "hello" #("ok") (once-any ())))
-(syntax-test #'(command-line "hello" #("ok") (once-any ("-ok"))))
-(syntax-test #'(command-line "hello" #("ok") (once-any ("-ok" "the ok flag"))))
-(syntax-test #'(command-line "hello" #("ok") (once-any ("-ok" a "the ok flag"))))
-(syntax-test #'(command-line "hello" #("ok") (once-any ("-ok" (a) "the ok flag"))))
-(syntax-test #'(command-line "hello" #("ok") (once-any ("-ok" a "the ok flag") ())))
-(syntax-test #'(command-line "hello" #("ok") (args 'done) (once-any ("-ok" a "the ok flag" 7))))
-(syntax-test #'(command-line "hello" #("ok") (args (ok) 'done) (once-any ("-ok" a "the ok flag" 7))))
-(syntax-test #'(command-line "hello" #("ok") (=> 'done) (once-any ("-ok" a "the ok flag" 7))))
-(syntax-test #'(command-line "hello" #("ok") (=> 1 2 3 4) (once-any ("-ok" a "the ok flag" 7))))
-
-(report-errs)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/compat.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/compat.rktl
deleted file mode 100644
index 5e25b8334f..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/compat.rktl
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-(load-relative "loadtest.rktl")
-
-(Section 'compat)
-
-(require mzlib/compat)
-
-(define-structure (add left right) ([sum (+ left right)]))
-(test 9 add-sum (make-add 3 6))
-
-
-(test #f getprop 'hello-world 'any)
-(test 'oops getprop 'hello-world 'any 'oops)
-(test #f getprop 'hello-world 'any)
-(test (void) putprop 'hello-world 'any 'aha)
-(test 'aha getprop 'hello-world 'any)
-(test 'aha getprop 'hello-world 'any 'oops)
-(test #f getprop 'hello-world 'many)
-(test 'oops getprop 'hello-world 'many 'oops)
-(test #f getprop 'bye-world 'any)
-(test 'oops getprop 'bye-world 'any 'oops)
-
-(report-errs)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/contract-mzlib-test.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/contract-mzlib-test.rktl
deleted file mode 100644
index de4292ff43..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/contract-mzlib-test.rktl
+++ /dev/null
@@ -1,5151 +0,0 @@
-#|
-
-This file started out as a copy of contract-test.rktl.
-Its purpose is to try to ensure that the mzlib version
-of the contract library does not change over time.
-
-|#
-
-(load-relative "loadtest.rktl")
-(Section 'mzlib/contract)
-
-(parameterize ([error-print-width 200])
-(let ()
-  
-  (define contract-namespace 
-    (let ([n ((dynamic-require 'mzscheme 'make-namespace))])
-      (parameterize ([current-namespace n])
-        (namespace-require 'mzlib/contract)
-        (namespace-require 'mzlib/class)
-        (namespace-require 'mzlib/etc)
-        (namespace-require '(only mzscheme force delay)))
-      n))
-  
-  (define (contract-eval x)
-    (parameterize ([current-namespace contract-namespace])
-      (eval x)))
-  
-  (define-syntax (ctest stx)
-    (syntax-case stx ()
-      [(_ a ...)
-       (syntax (contract-eval `(,test a ...)))]))
-
-  (define (contract-error-test exp exn-ok?)
-    (test #t 
-          'contract-error-test 
-          (contract-eval `(with-handlers ((exn? (λ (x) (and (,exn-ok? x) #t)))) ,exp))))
-  
-  ;; test/spec-passed : symbol sexp -> void
-  ;; tests a passing specification
-  (define (test/spec-passed name expression)
-    (printf "testing: ~s\n" name)
-    (contract-eval
-     `(,test 
-        (void)
-        (let ([for-each-eval (lambda (l) (for-each eval l))]) for-each-eval)
-        (list ',expression '(void))))
-    (let/ec k
-      (contract-eval
-       `(,test (void)
-          (let ([for-each-eval (lambda (l) (for-each (λ (x) (eval x)) l))])
-            for-each-eval)
-          (list ',(rewrite expression k) '(void))))))
-  
-  (define (test/spec-passed/result name expression result)
-    (printf "testing: ~s\n" name)
-    (contract-eval `(,test ',result eval ',expression))
-    (let/ec k
-      (contract-eval
-       `(,test
-          ',result
-          eval
-          ',(rewrite expression k)))))
-  
-  ;; rewrites `contract' to use opt/c. If there is a module definition in there, we skip that test.
-  (define (rewrite exp k)
-    (let loop ([exp exp])
-      (cond
-        [(null? exp) null]
-        [(list? exp)
-         (case (car exp)
-           [(contract) `(contract (opt/c ,(loop (cadr exp))) ,@(map loop (cddr exp)))]
-           [(module) (k #f)]
-           [else (map loop exp)])]
-        [(pair? exp) (cons (loop (car exp))
-                           (loop (cdr exp)))]
-        [else exp])))
-  
-  (define (test/spec-failed name expression blame)
-    (let ()
-      (define (has-proper-blame? msg)
-        (define reg
-          (case blame
-            [(pos) #rx"^self-contract violation"]
-            [(neg) #rx"blaming neg"]
-            [else (error 'test/spec-failed "unknown blame name ~s" blame)]))
-        (regexp-match? reg msg))
-      (printf "testing: ~s\n" name)
-      (contract-eval
-       `(,thunk-error-test 
-          (lambda () ,expression)
-          (datum->syntax-object #'here ',expression)
-          (lambda (exn)
-            (and (exn? exn)
-                 (,has-proper-blame? (exn-message exn))))))
-      (let/ec k
-        (let ([rewritten (rewrite expression k)])
-          (contract-eval
-           `(,thunk-error-test 
-             (lambda () ,rewritten)
-             (datum->syntax-object #'here ',rewritten)
-             (lambda (exn)
-               (and (exn? exn)
-                    (,has-proper-blame? (exn-message exn))))))))))
-  
-  (define (test/pos-blame name expression) (test/spec-failed name expression "pos"))
-  (define (test/neg-blame name expression) (test/spec-failed name expression "neg"))
-  
-  (define (test/well-formed stx)
-    (contract-eval
-     `(,test (void) 
-            (let ([expand/ret-void (lambda (x) (expand x) (void))]) expand/ret-void)
-            ,stx)))
-  
-  (define (test/no-error sexp)
-    (contract-eval
-    `(,test (void)
-       eval
-       '(begin ,sexp (void)))))
-  
-  (define (test-flat-contract contract pass fail)
-    (define (run-three-tests contract)
-      (let ([name (if (pair? contract)
-                      (car contract)
-                      contract)])
-        (contract-eval `(,test #t flat-contract? ,contract))
-        (test/spec-failed (format "~a fail" name)
-                          `(contract ,contract ',fail 'pos 'neg)
-                          "pos")
-        (test/spec-passed/result
-         (format "~a pass" name)
-         `(contract ,contract ',pass 'pos 'neg)
-         pass)))
-    (run-three-tests contract)
-    (let/ec k (run-three-tests (rewrite contract k))))
-
-  (define-syntax (test-name stx)
-    (syntax-case stx ()
-      [(_ name contract)
-       #'(do-name-test 'name 'contract)]))
-  
-  (define (do-name-test name contract-exp)
-    (printf "~s\n" (list 'do-name-test name contract-exp))
-    (contract-eval `(,test ,name contract-name ,contract-exp))
-    (contract-eval `(,test ,name contract-name (opt/c ,contract-exp))))
-  
-  (test/spec-passed
-   'contract-flat1 
-   '(contract not #f 'pos 'neg))
-  
-  (test/pos-blame
-   'contract-flat2 
-   '(contract not #t 'pos 'neg))
-  
-  (test/no-error '(-> integer? integer?))
-  (test/no-error '(-> (flat-contract integer?) (flat-contract integer?)))
-  (test/no-error '(-> integer? any))
-  (test/no-error '(-> (flat-contract integer?) any))
-  
-  (test/no-error '(->* (integer?) (integer?)))
-  (test/no-error '(->* (integer?) integer? (integer?)))
-  (test/no-error '(->* (integer?) integer? any))
-  (test/no-error '(->* ((flat-contract integer?)) ((flat-contract integer?))))
-  (test/no-error '(->* ((flat-contract integer?)) (flat-contract integer?) ((flat-contract integer?))))
-  (test/no-error '(->* ((flat-contract integer?)) (flat-contract integer?) any))
-  
-  (test/no-error '(->d integer? (lambda (x) integer?)))
-  (test/no-error '(->d (flat-contract integer?) (lambda (x) (flat-contract integer?))))
-
-  (test/no-error '(->d* (integer?) (lambda (x) integer?)))
-  (test/no-error '(->d* ((flat-contract integer?)) (lambda (x) (flat-contract integer?))))
-  (test/no-error '(->d* (integer?) integer? (lambda (x . y) integer?)))
-  (test/no-error '(->d* ((flat-contract integer?)) (flat-contract integer?) (lambda (x . y) (flat-contract integer?))))
-  
-  (test/no-error '(opt-> (integer?) (integer?) integer?))
-  (test/no-error '(opt-> ((flat-contract integer?)) ((flat-contract integer?)) (flat-contract integer?)))
-  (test/no-error '(opt-> ((flat-contract integer?)) ((flat-contract integer?)) any))
-  (test/no-error '(opt->* (integer?) (integer?) (integer?)))
-  (test/no-error '(opt->* ((flat-contract integer?)) ((flat-contract integer?)) ((flat-contract integer?))))
-  (test/no-error '(opt->* (integer?) (integer?) any))
-  (test/no-error '(opt->* ((flat-contract integer?)) ((flat-contract integer?)) any))
-  
-  (test/no-error '(unconstrained-domain-> number?))
-  (test/no-error '(unconstrained-domain-> (flat-contract number?)))
-  
-  (test/no-error '(listof any/c))
-  (test/no-error '(listof (lambda (x) #t)))
-  
-  (test/spec-passed/result 'any/c '(contract any/c 1 'pos 'neg) 1)
-  (test/pos-blame 'none/c '(contract none/c 1 'pos 'neg))
-  
-  (test/spec-passed
-   'contract-arrow-star0a
-   '(contract (->* (integer?) (integer?))
-              (lambda (x) x)
-              'pos
-              'neg))
-  
-  (test/neg-blame
-   'contract-arrow-star0b
-   '((contract (->* (integer?) (integer?))
-               (lambda (x) x)
-               'pos
-               'neg)
-     #f))
-  
-  (test/pos-blame
-   'contract-arrow-star0c
-   '((contract (->* (integer?) (integer?))
-               (lambda (x) #f)
-               'pos
-               'neg)
-     1))
-  
-  (test/spec-passed
-   'contract-arrow-star1
-   '(let-values ([(a b) ((contract (->* (integer?) (integer? integer?))
-                                   (lambda (x) (values x x))
-                                   'pos
-                                   'neg)
-                         2)])
-      1))
-  
-  (test/neg-blame
-   'contract-arrow-star2
-   '((contract (->* (integer?) (integer? integer?))
-               (lambda (x) (values x x))
-               'pos
-               'neg)
-     #f))
-  
-  (test/pos-blame
-   'contract-arrow-star3
-   '((contract (->* (integer?) (integer? integer?))
-               (lambda (x) (values 1 #t))
-               'pos
-               'neg)
-     1))
-  
-  (test/pos-blame
-   'contract-arrow-star4
-   '((contract (->* (integer?) (integer? integer?))
-               (lambda (x) (values #t 1))
-               'pos
-               'neg)
-     1))
-  
-  
-  (test/spec-passed
-   'contract-arrow-star5
-   '(let-values ([(a b) ((contract (->* (integer?) 
-                                        (listof integer?)
-                                        (integer? integer?))
-                                   (lambda (x . y) (values x x))
-                                   'pos
-                                   'neg)
-                         2)])
-      1))
-  
-  (test/neg-blame
-   'contract-arrow-star6
-   '((contract (->* (integer?) (listof integer?) (integer? integer?))
-               (lambda (x . y) (values x x))
-               'pos
-               'neg)
-     #f))
-  
-  (test/pos-blame
-   'contract-arrow-star7
-   '((contract (->* (integer?) (listof integer?) (integer? integer?))
-               (lambda (x . y) (values 1 #t))
-               'pos
-               'neg)
-     1))
-  
-  (test/pos-blame
-   'contract-arrow-star8
-   '((contract (->* (integer?) (listof integer?) (integer? integer?))
-               (lambda (x) (values #t 1))
-               'pos
-               'neg)
-     1))
-  
-  (test/spec-passed
-   'contract-arrow-star9
-   '((contract (->* (integer?) (listof integer?) (integer?))
-               (lambda (x . y) 1)
-               'pos
-               'neg)
-     1 2))
-  
-  (test/neg-blame
-   'contract-arrow-star10
-   '((contract (->* (integer?) (listof integer?) (integer?))
-               (lambda (x . y) 1)
-               'pos
-               'neg)
-     1 2 'bad))
-  
-  (test/spec-passed
-   'contract-arrow-star11
-   '(let-values ([(a b) ((contract (->* (integer?) 
-                                        (listof integer?)
-					any)
-                                   (lambda (x . y) (values x x))
-                                   'pos
-                                   'neg)
-                         2)])
-      1))
-  
-  (test/pos-blame
-   'contract-arrow-star11b
-   '(let-values ([(a b) ((contract (->* (integer?) 
-                                        (listof integer?)
-					any)
-                                   (lambda (x) (values x x))
-                                   'pos
-                                   'neg)
-                         2)])
-      1))
-  
-  (test/neg-blame
-   'contract-arrow-star12
-   '((contract (->* (integer?) (listof integer?) any)
-               (lambda (x . y) (values x x))
-               'pos
-               'neg)
-     #f))
-  
-  (test/spec-passed
-   'contract-arrow-star13
-   '((contract (->* (integer?) (listof integer?) any)
-               (lambda (x . y) 1)
-               'pos
-               'neg)
-     1 2))
-  
-  (test/neg-blame
-   'contract-arrow-star14
-   '((contract (->* (integer?) (listof integer?) any)
-               (lambda (x . y) 1)
-               'pos
-               'neg)
-     1 2 'bad))
-  
-  (test/spec-passed
-   'contract-arrow-star15
-   '(let-values ([(a b) ((contract (->* (integer?) any)
-                                   (lambda (x) (values x x))
-                                   'pos
-                                   'neg)
-                         2)])
-      1))
-  
-  (test/spec-passed
-   'contract-arrow-star16
-   '((contract (->* (integer?) any)
-               (lambda (x) x)
-               'pos
-               'neg)
-     2))
-  
-  (test/neg-blame
-   'contract-arrow-star17
-   '((contract (->* (integer?) any)
-               (lambda (x) (values x x))
-               'pos
-               'neg)
-     #f))
-
-  (test/pos-blame
-   'contract-arrow-star-arity-check1
-   '(contract (->* (integer?) (listof integer?) (integer? integer?))
-              (lambda (x) (values 1 #t))
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'contract-arrow-star-arity-check2
-   '(contract (->* (integer?) (listof integer?) (integer? integer?))
-              (lambda (x y) (values 1 #t))
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'contract-arrow-star-arity-check3
-   '(contract (->* (integer?) (listof integer?) (integer? integer?))
-              (case-lambda [(x y) #f] [(x y . z) #t])
-              'pos
-              'neg))
-  
-  (test/spec-passed
-   'contract-arrow-star-arity-check4
-   '(contract (->* (integer?) (listof integer?) (integer? integer?))
-              (case-lambda [(x y) #f] [(x y . z) #t] [(x) #f])
-              'pos
-              'neg))
-  
-  (test/spec-passed
-   'contract-arrow-values1
-   '(let-values ([(a b) ((contract (-> integer? (values integer? integer?))
-                                   (lambda (x) (values x x))
-                                   'pos
-                                   'neg)
-                         2)])
-      1))
-  
-  (test/neg-blame
-   'contract-arrow-values2
-   '((contract (-> integer? (values integer? integer?))
-               (lambda (x) (values x x))
-               'pos
-               'neg)
-     #f))
-  
-  (test/pos-blame
-   'contract-arrow-values3
-   '((contract (-> integer? (values integer? integer?))
-               (lambda (x) (values 1 #t))
-               'pos
-               'neg)
-     1))
-  
-  (test/pos-blame
-   'contract-arrow-values4
-   '((contract (-> integer? (values integer? integer?))
-               (lambda (x) (values #t 1))
-               'pos
-               'neg)
-     1))
-
-
-  (test/pos-blame
-   'contract-d1
-   '(contract (integer? . ->d . (lambda (x) (lambda (y) (= x y))))
-              1
-              'pos
-              'neg))
-  
-  (test/spec-passed
-   'contract-d2
-   '(contract (integer? . ->d . (lambda (x) (lambda (y) (= x y))))
-              (lambda (x) x)
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'contract-d2
-   '((contract (integer? . ->d . (lambda (x) (lambda (y) (= x y))))
-               (lambda (x) (+ x 1))
-               'pos
-               'neg)
-     2))
-
-  (test/neg-blame
-   'contract-d3
-   '((contract (integer? . ->d . (lambda (x)  (let ([z (+ x 1)]) (lambda (y) (= z y)))))
-               (lambda (x) (+ x 1))
-               'pos
-               'neg)
-     "bad input"))
-  
-  (test/neg-blame
-   'contract-d4
-   '((contract (integer? . ->d . (lambda (x)  (lambda (y) (= (+ x 1) y))))
-               (lambda (x) (+ x 1))
-               'pos
-               'neg)
-     "bad input"))
-  
-  (test/spec-passed
-   'contract-arrow1
-   '(contract (integer? . -> . integer?) (lambda (x) x) 'pos 'neg))
-  
-  ;; make sure we skip the optimizations
-  (test/spec-passed
-   'contract-arrow1b
-   '(contract (integer? integer? integer? integer? integer? integer? integer? integer? integer? integer? . -> . integer?) 
-              (lambda (x1 x2 x3 x4 x5 x6 x7 x8 x9 x10) x1) 'pos 'neg))
-  
-  (test/pos-blame
-   'contract-arrow2
-   '(contract (integer? . -> . integer?) (lambda (x y) x) 'pos 'neg))
-  
-  (test/neg-blame
-   'contract-arrow3
-   '((contract (integer? . -> . integer?) (lambda (x) #f) 'pos 'neg) #t))
-  
-  (test/pos-blame
-   'contract-arrow4
-   '((contract (integer? . -> . integer?) (lambda (x) #f) 'pos 'neg) 1))
-
-
-  (test/spec-passed
-   'contract-arrow-any1
-   '(contract (integer? . -> . any) (lambda (x) x) 'pos 'neg))
-  
-  (test/pos-blame
-   'contract-arrow-any2
-   '(contract (integer? . -> . any) (lambda (x y) x) 'pos 'neg))
-  
-  (test/neg-blame
-   'contract-arrow-any3
-   '((contract (integer? . -> . any) (lambda (x) #f) 'pos 'neg) #t))
-
-  (test/spec-passed
-   'contract-arrow-star-d1
-   '((contract (->d* (integer?) (lambda (arg) (lambda (res) (= arg res))))
-               (lambda (x) x)
-               'pos
-               'neg)
-     1))
-  
-  (test/spec-passed
-   'contract-arrow-star-d2
-   '(let-values ([(a b)
-                  ((contract (->d* (integer?) (lambda (arg) 
-                                                (values (lambda (res) (= arg res)) 
-                                                        (lambda (res) (= arg res)))))
-                             (lambda (x) (values x x))
-                             'pos
-                             'neg)
-                   1)])
-      1))
-  
-  (test/pos-blame
-   'contract-arrow-star-d3
-   '((contract (->d* (integer?) (lambda (arg) 
-                                  (values (lambda (res) (= arg res)) 
-                                          (lambda (res) (= arg res)))))
-               (lambda (x) (values 1 2))
-               'pos
-               'neg)
-     2))
-  
-  (test/pos-blame
-   'contract-arrow-star-d4
-   '((contract (->d* (integer?) (lambda (arg) 
-                                  (values (lambda (res) (= arg res)) 
-                                          (lambda (res) (= arg res)))))
-               (lambda (x) (values 2 1))
-               'pos
-               'neg)
-     2))
-  
-  (test/spec-passed
-   'contract-arrow-star-d5
-   '((contract (->d* ()
-                     (listof integer?)
-                     (lambda args (lambda (res) (= (car args) res))))
-               (lambda x (car x))
-               'pos
-               'neg)
-     1))
-  
-  (test/spec-passed
-   'contract-arrow-star-d6
-   '((contract (->d* () 
-                     (listof integer?)
-                     (lambda args
-                       (values (lambda (res) (= (car args) res)) 
-                               (lambda (res) (= (car args) res)))))
-               (lambda x (values (car x) (car x)))
-               'pos
-               'neg)
-     1))
-  
-  (test/pos-blame
-   'contract-arrow-star-d7
-   '((contract (->d* () 
-                     (listof integer?)
-                     (lambda args
-                       (values (lambda (res) (= (car args) res)) 
-                               (lambda (res) (= (car args) res)))))
-               (lambda x (values 1 2))
-               'pos
-               'neg)
-     2))
-  
-  (test/pos-blame
-   'contract-arrow-star-d8
-   '((contract (->d* ()
-                     (listof integer?)
-                     (lambda args
-                       (values (lambda (res) (= (car args) res)) 
-                               (lambda (res) (= (car args) res)))))
-               (lambda x (values 2 1))
-               'pos
-               'neg)
-     2))
-  
-  (test/pos-blame
-   'contract-arrow-star-d8
-   '(contract (->d* ()
-                    (listof integer?)
-                    (lambda arg
-                      (values (lambda (res) (= (car arg) res)) 
-                              (lambda (res) (= (car arg) res)))))
-              (lambda (x) (values 2 1))
-              'pos
-              'neg))
-  
-  (test/spec-passed
-   'and/c1
-   '((contract (and/c (-> (<=/c 100) (<=/c 100))
-                      (-> (>=/c -100) (>=/c -100)))
-               (λ (x) x)
-               'pos
-               'neg)
-     1))
-  
-  (test/neg-blame
-   'and/c2
-   '((contract (and/c (-> (<=/c 100) (<=/c 100))
-                      (-> (>=/c -100) (>=/c -100)))
-               (λ (x) x)
-               'pos
-               'neg)
-     200))
-  
-  (test/pos-blame
-   'and/c3
-   '((contract (and/c (-> (<=/c 100) (<=/c 100))
-                      (-> (>=/c -100) (>=/c -100)))
-               (λ (x) 200)
-               'pos
-               'neg)
-     1))
-  
-  (test/spec-passed
-   '->r1
-   '((contract (->r () number?) (lambda () 1) 'pos 'neg)))
-  
-  (test/spec-passed
-   '->r2
-   '((contract (->r ([x number?]) number?) (lambda (x) (+ x 1)) 'pos 'neg) 1))
-
-  (test/pos-blame
-   '->r3
-   '((contract (->r () number?) 1 'pos 'neg)))
-  
-  (test/pos-blame
-   '->r4
-   '((contract (->r () number?) (lambda (x) x) 'pos 'neg)))
-  
-  (test/neg-blame
-   '->r5
-   '((contract (->r ([x number?]) any) (lambda (x) (+ x 1)) 'pos 'neg) #f))
-  
-  (test/pos-blame
-   '->r6
-   '((contract (->r ([x number?]) (<=/c x)) (lambda (x) (+ x 1)) 'pos 'neg) 1))
-  
-  (test/spec-passed
-   '->r7
-   '((contract (->r ([x number?] [y (<=/c x)]) (<=/c x)) (lambda (x y) (- x 1)) 'pos 'neg) 1 0))
-  
-  (test/neg-blame
-   '->r8
-   '((contract (->r ([x number?] [y (<=/c x)]) (<=/c x)) (lambda (x y) (+ x 1)) 'pos 'neg) 1 2))
-  
-  (test/spec-passed
-   '->r9
-   '((contract (->r ([y (<=/c x)] [x number?]) (<=/c x)) (lambda (y x) (- x 1)) 'pos 'neg) 1 2))
-  
-  (test/neg-blame
-   '->r10
-   '((contract (->r ([y (<=/c x)] [x number?]) (<=/c x)) (lambda (y x) (+ x 1)) 'pos 'neg) 1 0))
-  
-  (test/spec-passed
-   '->r11
-   '((contract (->r () rest any/c number?) (lambda x 1) 'pos 'neg)))
-  
-  (test/spec-passed
-   '->r12
-   '((contract (->r ([x number?]) rest any/c number?) (lambda (x . y) (+ x 1)) 'pos 'neg) 1))
-
-  (test/pos-blame
-   '->r13
-   '((contract (->r () rest any/c number?) 1 'pos 'neg)))
-  
-  (test/pos-blame
-   '->r14
-   '((contract (->r () rest any/c number?) (lambda (x) x) 'pos 'neg)))
-  
-  (test/neg-blame
-   '->r15
-   '((contract (->r ([x number?]) rest any/c any) (lambda (x . y) (+ x 1)) 'pos 'neg) #f))
-  
-  (test/pos-blame
-   '->r16
-   '((contract (->r ([x number?]) rest any/c (<=/c x)) (lambda (x . y) (+ x 1)) 'pos 'neg) 1))
-  
-  (test/spec-passed
-   '->r17
-   '((contract (->r ([x number?] [y (<=/c x)]) rest any/c (<=/c x)) (lambda (x y . z) (- x 1)) 'pos 'neg) 1 0))
-  
-  (test/neg-blame
-   '->r18
-   '((contract (->r ([x number?] [y (<=/c x)]) rest any/c (<=/c x)) (lambda (x y . z) (+ x 1)) 'pos 'neg) 1 2))
-  
-  (test/spec-passed
-   '->r19
-   '((contract (->r ([y (<=/c x)] [x number?]) rest any/c (<=/c x)) (lambda (y x . z) (- x 1)) 'pos 'neg) 1 2))
-  
-  (test/neg-blame
-   '->r20
-   '((contract (->r ([y (<=/c x)] [x number?]) rest any/c (<=/c x)) (lambda (y x . z) (+ x 1)) 'pos 'neg) 1 0))
-
-  (test/spec-passed
-   '->r21
-   '((contract (->r () rst (listof number?) any/c) (lambda w 1) 'pos 'neg) 1))
-  
-  (test/neg-blame
-   '->r22
-   '((contract (->r () rst (listof number?) any/c) (lambda w 1) 'pos 'neg) #f))
-  
-  (test/spec-passed
-   '->r-any1
-   '((contract (->r () any) (lambda () 1) 'pos 'neg)))
-  
-  (test/spec-passed
-   '->r-any2
-   '((contract (->r ([x number?]) any) (lambda (x) (+ x 1)) 'pos 'neg) 1))
-
-  (test/pos-blame
-   '->r-any3
-   '((contract (->r () any) 1 'pos 'neg)))
-  
-  (test/pos-blame
-   '->r-any4
-   '((contract (->r () any) (lambda (x) x) 'pos 'neg)))
-  
-  (test/neg-blame
-   '->r-any5
-   '((contract (->r ([x number?]) any) (lambda (x) (+ x 1)) 'pos 'neg) #f))
-  
-  (test/spec-passed
-   '->r-any6
-   '((contract (->r ([x number?] [y (<=/c x)]) any) (lambda (x y) (- x 1)) 'pos 'neg) 1 0))
-  
-  (test/neg-blame
-   '->r-any7
-   '((contract (->r ([x number?] [y (<=/c x)]) any) (lambda (x y) (+ x 1)) 'pos 'neg) 1 2))
-  
-  (test/spec-passed
-   '->r-any8
-   '((contract (->r ([y (<=/c x)] [x number?]) any) (lambda (y x) (- x 1)) 'pos 'neg) 1 2))
-  
-  (test/neg-blame
-   '->r-any9
-   '((contract (->r ([y (<=/c x)] [x number?]) any) (lambda (y x) (+ x 1)) 'pos 'neg) 1 0))
-  
-  (test/spec-passed
-   '->r-any10
-   '((contract (->r () rest any/c any) (lambda x 1) 'pos 'neg)))
-  
-  (test/spec-passed
-   '->r-any11
-   '((contract (->r ([x number?]) rest any/c any) (lambda (x . y) (+ x 1)) 'pos 'neg) 1))
-
-  (test/pos-blame
-   '->r-any12
-   '((contract (->r () rest any/c any) 1 'pos 'neg)))
-  
-  (test/pos-blame
-   '->r-any13
-   '((contract (->r () rest any/c any) (lambda (x) x) 'pos 'neg)))
-  
-  (test/neg-blame
-   '->r-any14
-   '((contract (->r ([x number?]) rest any/c any) (lambda (x . y) (+ x 1)) 'pos 'neg) #f))
-  
-  (test/spec-passed
-   '->r-any15
-   '((contract (->r ([x number?] [y (<=/c x)]) rest any/c any) (lambda (x y . z) (- x 1)) 'pos 'neg) 1 0))
-  
-  (test/neg-blame
-   '->r-any16
-   '((contract (->r ([x number?] [y (<=/c x)]) rest any/c any) (lambda (x y . z) (+ x 1)) 'pos 'neg) 1 2))
-  
-  (test/spec-passed
-   '->r-any17
-   '((contract (->r ([y (<=/c x)] [x number?]) rest any/c any) (lambda (y x . z) (- x 1)) 'pos 'neg) 1 2))
-  
-  (test/neg-blame
-   '->r-any18
-   '((contract (->r ([y (<=/c x)] [x number?]) rest any/c any) (lambda (y x . z) (+ x 1)) 'pos 'neg) 1 0))
-
-  (test/spec-passed
-   '->r-any19
-   '((contract (->r () rst (listof number?) any) (lambda w 1) 'pos 'neg) 1))
-  
-  (test/neg-blame
-   '->r-any20
-   '((contract (->r () rst (listof number?) any) (lambda w 1) 'pos 'neg) #f))
-  
-  (test/spec-passed
-   '->r-values1
-   '((contract (->r () (values [x boolean?] [y number?])) (lambda () (values #t 1)) 'pos 'neg)))
-  
-  (test/spec-passed
-   '->r-values2
-   '((contract (->r ([x number?]) (values [x boolean?] [y number?])) (lambda (x) (values #t (+ x 1))) 'pos 'neg) 1))
-
-  (test/pos-blame
-   '->r-values3
-   '((contract (->r () (values [x boolean?] [y number?])) 1 'pos 'neg)))
-  
-  (test/pos-blame
-   '->r-values4
-   '((contract (->r () (values [x boolean?] [y number?])) (lambda (x) x) 'pos 'neg)))
-  
-  (test/neg-blame
-   '->r-values5
-   '((contract (->r ([x number?]) (values [y boolean?] [z (<=/c x)])) (lambda (x) (+ x 1)) 'pos 'neg) #f))
-  
-  (test/pos-blame
-   '->r-values6
-   '((contract (->r ([x number?]) (values [y boolean?] [z (<=/c x)])) (lambda (x) (values #t (+ x 1))) 'pos 'neg) 1))
-  
-  (test/spec-passed
-   '->r-values7
-   '((contract (->r ([x number?] [y (<=/c x)]) (values [z boolean?] [w (<=/c x)])) 
-               (lambda (x y) (values #t (- x 1)))
-               'pos
-               'neg) 
-     1
-     0))
-  
-  (test/neg-blame
-   '->r-values8
-   '((contract (->r ([x number?] [y (<=/c x)]) (values [z boolean?] [w (<=/c x)])) 
-               (lambda (x y) (values #f (+ x 1)))
-               'pos
-               'neg)
-     1
-     2))
-  
-  (test/spec-passed
-   '->r-values9
-   '((contract (->r ([y (<=/c x)] [x number?]) (values [z boolean?] [w (<=/c x)]))
-               (lambda (y x) (values #f (- x 1)))
-               'pos 
-               'neg)
-     1
-     2))
-  
-  (test/neg-blame
-   '->r-values10
-   '((contract (->r ([y (<=/c x)] [x number?]) (values [z boolean?] [w (<=/c x)]))
-               (lambda (y x) (values #f (+ x 1))) 'pos 'neg)
-     1 0))
-  
-  (test/spec-passed
-   '->r-values11
-   '((contract (->r () rest any/c (values [z boolean?] [w number?])) (lambda x (values #f 1)) 'pos 'neg)))
-  
-  (test/spec-passed
-   '->r-values12
-   '((contract (->r ([x number?]) rest any/c (values [z boolean?] [w number?]))
-               (lambda (x . y) (values #f (+ x 1)))
-               'pos 
-               'neg)
-     1))
-
-  (test/pos-blame
-   '->r-values13
-   '((contract (->r () rest any/c (values [z boolean?] [w number?])) 1 'pos 'neg)))
-  
-  (test/pos-blame
-   '->r-values14
-   '((contract (->r () rest any/c (values [z boolean?] [w number?])) (lambda (x) x) 'pos 'neg)))
-  
-  (test/neg-blame
-   '->r-values15
-   '((contract (->r ([x number?]) rest any/c  (values [z boolean?] [w (<=/c x)]))
-               (lambda (x . y) (+ x 1)) 'pos 'neg)
-     #f))
-  
-  (test/pos-blame
-   '->r-values16
-   '((contract (->r ([x number?]) rest any/c (values [z boolean?] [w (<=/c x)]))
-               (lambda (x . y) (values #f (+ x 1))) 'pos 'neg) 
-     1))
-  
-  (test/spec-passed
-   '->r-values17
-   '((contract (->r ([x number?] [y (<=/c x)]) rest any/c (values [z boolean?] [w (<=/c x)]))
-               (lambda (x y . z) (values #f (- x 1))) 'pos 'neg) 
-     1 0))
-  
-  (test/neg-blame
-   '->r-values18
-   '((contract (->r ([x number?] [y (<=/c x)]) rest any/c (values [z boolean?] [w (<=/c x)]))
-               (lambda (x y . z) (values #f (+ x 1))) 'pos 'neg) 
-     1 2))
-  
-  (test/spec-passed
-   '->r-values19
-   '((contract (->r ([y (<=/c x)] [x number?]) rest any/c  (values [z boolean?] [w (<=/c x)]))
-               (lambda (y x . z) (values #f (- x 1))) 'pos 'neg)
-     1 2))
-  
-  (test/neg-blame
-   '->r-values20
-   '((contract (->r ([y (<=/c x)] [x number?]) rest any/c  (values [z boolean?] [w (<=/c x)]))
-               (lambda (y x . z) (values #f (+ x 1))) 'pos 'neg) 
-     1 0))
-
-  (test/spec-passed
-   '->r-values21
-   '((contract (->r () rst (listof number?) (values [z boolean?] [w any/c])) (lambda w (values #f 1)) 'pos 'neg) 1))
-  
-  (test/neg-blame
-   '->r-values22
-   '((contract (->r () rst (listof number?) (values [z boolean?] [w any/c])) (lambda w (values #f 1)) 'pos 'neg) #f))
-
-  (test/spec-passed
-   '->r-values23
-   '((contract (->r () (values [x number?] [y (>=/c x)])) (lambda () (values 1 2)) 'pos 'neg)))
-  
-  (test/pos-blame
-   '->r-values24
-   '((contract (->r () (values [x number?] [y (>=/c x)])) (lambda () (values 2 1)) 'pos 'neg)))
-
-  (test/spec-passed
-   '->r-values25
-   '((contract (->r ([x number?]) (values [z number?] [y (>=/c x)])) (lambda (x) (values 1 2)) 'pos 'neg) 1))
-  
-  (test/pos-blame
-   '->r-values26
-   '((contract (->r ([x number?]) (values [z number?] [y (>=/c x)])) (lambda (x) (values 2 1)) 'pos 'neg) 4))
-
-
-    
-  (test/spec-passed
-   '->r1
-   '((contract (->r () number?) (lambda () 1) 'pos 'neg)))
-  
-  (test/spec-passed
-   '->r2
-   '((contract (->r ([x number?]) number?) (lambda (x) (+ x 1)) 'pos 'neg) 1))
-
-  (test/pos-blame
-   '->r3
-   '((contract (->r () number?) 1 'pos 'neg)))
-  
-  (test/pos-blame
-   '->r4
-   '((contract (->r () number?) (lambda (x) x) 'pos 'neg)))
-  
-  (test/neg-blame
-   '->r5
-   '((contract (->r ([x number?]) any) (lambda (x) (+ x 1)) 'pos 'neg) #f))
-  
-  (test/pos-blame
-   '->r6
-   '((contract (->r ([x number?]) (<=/c x)) (lambda (x) (+ x 1)) 'pos 'neg) 1))
-  
-  (test/spec-passed
-   '->r7
-   '((contract (->r ([x number?] [y (<=/c x)]) (<=/c x)) (lambda (x y) (- x 1)) 'pos 'neg) 1 0))
-  
-  (test/neg-blame
-   '->r8
-   '((contract (->r ([x number?] [y (<=/c x)]) (<=/c x)) (lambda (x y) (+ x 1)) 'pos 'neg) 1 2))
-  
-  (test/spec-passed
-   '->r9
-   '((contract (->r ([y (<=/c x)] [x number?]) (<=/c x)) (lambda (y x) (- x 1)) 'pos 'neg) 1 2))
-  
-  (test/neg-blame
-   '->r10
-   '((contract (->r ([y (<=/c x)] [x number?]) (<=/c x)) (lambda (y x) (+ x 1)) 'pos 'neg) 1 0))
-  
-  (test/spec-passed
-   '->r11
-   '((contract (->r () rest any/c number?) (lambda x 1) 'pos 'neg)))
-  
-  (test/spec-passed
-   '->r12
-   '((contract (->r ([x number?]) rest any/c number?) (lambda (x . y) (+ x 1)) 'pos 'neg) 1))
-
-  (test/pos-blame
-   '->r13
-   '((contract (->r () rest any/c number?) 1 'pos 'neg)))
-  
-  (test/pos-blame
-   '->r14
-   '((contract (->r () rest any/c number?) (lambda (x) x) 'pos 'neg)))
-  
-  (test/neg-blame
-   '->r15
-   '((contract (->r ([x number?]) rest any/c any) (lambda (x . y) (+ x 1)) 'pos 'neg) #f))
-  
-  (test/pos-blame
-   '->r16
-   '((contract (->r ([x number?]) rest any/c (<=/c x)) (lambda (x . y) (+ x 1)) 'pos 'neg) 1))
-  
-  (test/spec-passed
-   '->r17
-   '((contract (->r ([x number?] [y (<=/c x)]) rest any/c (<=/c x)) (lambda (x y . z) (- x 1)) 'pos 'neg) 1 0))
-  
-  (test/neg-blame
-   '->r18
-   '((contract (->r ([x number?] [y (<=/c x)]) rest any/c (<=/c x)) (lambda (x y . z) (+ x 1)) 'pos 'neg) 1 2))
-  
-  (test/spec-passed
-   '->r19
-   '((contract (->r ([y (<=/c x)] [x number?]) rest any/c (<=/c x)) (lambda (y x . z) (- x 1)) 'pos 'neg) 1 2))
-  
-  (test/neg-blame
-   '->r20
-   '((contract (->r ([y (<=/c x)] [x number?]) rest any/c (<=/c x)) (lambda (y x . z) (+ x 1)) 'pos 'neg) 1 0))
-
-  (test/spec-passed
-   '->r21
-   '((contract (->r () rst (listof number?) any/c) (lambda w 1) 'pos 'neg) 1))
-  
-  (test/neg-blame
-   '->r22
-   '((contract (->r () rst (listof number?) any/c) (lambda w 1) 'pos 'neg) #f))
-
-  
-  (test/spec-passed/result
-   '->r23
-   '((contract (->r ((i number?) (j (and/c number? (>=/c i)))) number?)
-               (λ (i j) 1)
-               'pos
-               'neg)
-     1
-     2)
-   1)
-
-  (test/spec-passed/result
-   '->r24
-   '((contract (->r ((i number?) (j (and/c number? (>=/c i)))) any)
-               (λ (i j) 1)
-               'pos
-               'neg)
-     1
-     2)
-   1)
-
-  (test/spec-passed/result
-   '->r25
-   '(call-with-values
-    (λ ()
-      ((contract (->r ((i number?) (j (and/c number? (>=/c i)))) (values [x number?] [y number?]))
-                 (λ (i j) (values 1 2))
-                 'pos
-                 'neg)
-       1
-       2))
-    list)
-   '(1 2))
-
-  (test/spec-passed/result
-   '->r26
-   '((contract (->r ((i number?) (j (and/c number? (>=/c i)))) rest-args any/c number?)
-               (λ (i j . z) 1)
-               'pos
-               'neg)
-     1
-     2)
-   1)
-
-  (test/spec-passed/result
-   '->r27
-   '((contract (->r ((i number?) (j (and/c number? (>=/c i)))) rest-args any/c any)
-               (λ (i j . z) 1)
-               'pos
-               'neg)
-     1
-     2)
-   1)
-
-(test/spec-passed/result
- '->r28
- '(call-with-values
-   (λ ()
-     ((contract (->r ((i number?) (j (and/c number? (>=/c i)))) rest-args any/c (values [x number?] [y number?]))
-                (λ (i j . z) (values 1 2))
-                'pos
-                'neg)
-      1
-      2))
-   list)
- '(1 2))
-
-  
-  (test/pos-blame
-   '->pp1
-   '((contract (->pp ([x number?]) (= x 1) number? result (= x 2))
-               (λ (x) x)
-               'pos
-               'neg)
-     1))
-  
-  (test/neg-blame
-   '->pp2
-   '((contract (->pp ([x number?]) (= x 1) number? result (= x 2))
-               (λ (x) x)
-               'pos
-               'neg)
-     2))
-  
-  (test/pos-blame
-   '->pp3
-   '((contract (->pp ([x number?]) (= x 1) number? result (= result 2))
-               (λ (x) x)
-               'pos
-               'neg)
-     1))
-  
-  (test/spec-passed
-   '->pp3.5
-   '((contract (->pp ([x number?]) (= x 1) number? result (= result 2))
-               (λ (x) 2)
-               'pos
-               'neg)
-     1))
-  
-  (test/neg-blame
-   '->pp4
-   '((contract (->pp ([x number?]) (= x 1) any)
-               (λ (x) x)
-               'pos
-               'neg)
-     2))
-  
-  (test/neg-blame
-   '->pp5
-   '((contract (->pp ([x number?]) (= x 1) (values [x number?] [y number?]) (= x y 3))
-               (λ (x) (values 4 5))
-               'pos
-               'neg)
-     2))
-  
-  (test/pos-blame
-   '->pp6
-   '((contract (->pp ([x number?]) (= x 1) (values [x number?] [y number?]) (= x y 3))
-               (λ (x) (values 4 5))
-               'pos
-               'neg)
-     1))
-
-  (test/pos-blame
-   '->pp-r1
-   '((contract (->pp-rest ([x number?]) rst any/c (= x 1) number? result (= x 2))
-               (λ (x . rst) x)
-               'pos
-               'neg)
-     1))
-  
-  (test/neg-blame
-   '->pp-r2
-   '((contract (->pp-rest ([x number?]) rst any/c (= x 1)  number? result (= x 2))
-               (λ (x . rst) x)
-               'pos
-               'neg)
-     2))
-  
-  (test/pos-blame
-   '->pp-r3
-   '((contract (->pp-rest ([x number?]) rst any/c (= x 1) number? result (= result 2))
-               (λ (x . rst) x)
-               'pos
-               'neg)
-     1))
-  
-  (test/spec-passed
-   '->pp-r3.5
-   '((contract (->pp-rest ([x number?]) rst any/c (= x 1) number? result (= result 2))
-               (λ (x . rst) 2)
-               'pos
-               'neg)
-     1))
-  
-  (test/neg-blame
-   '->pp-r4
-   '((contract (->pp-rest ([x number?]) rst any/c (= x 1) any)
-               (λ (x . rst) x)
-               'pos
-               'neg)
-     2))
-  
-  (test/neg-blame
-   '->pp-r5
-   '((contract (->pp-rest ([x number?]) rst any/c (= x 1) (values [x number?] [y number?]) (= x y 3))
-               (λ (x . rst) (values 4 5))
-               'pos
-               'neg)
-     2))
-  
-  (test/pos-blame
-   '->pp-r6
-   '((contract (->pp-rest ([x number?]) rst any/c (= x 1) (values [x number?] [y number?]) (= x y 3))
-               (λ (x . rst) (values 4 5))
-               'pos
-               'neg)
-     1))
-  
-  (test/pos-blame
-   'contract-case->0a
-   '(contract (case->)
-              (lambda (x) x)
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'contract-case->0b
-   '(contract (case->)
-              (lambda () 1)
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'contract-case->0c
-   '(contract (case->)
-              1
-              'pos
-              'neg))
-  
-  (test/spec-passed
-   'contract-case->0d
-   '(contract (case->)
-              (case-lambda)
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'contract-case->1
-   '(contract (case-> (integer? integer? . -> . integer?) (integer? . -> . integer?))
-              (lambda (x) x)
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'contract-case->2
-   '((contract (case-> (integer? integer? . -> . integer?) (integer? . -> . integer?))
-               (case-lambda 
-                 [(x y) 'case1]
-                 [(x) 'case2])
-               'pos
-               'neg)
-     1 2))
-  
-  (test/pos-blame
-   'contract-case->3
-   '((contract (case-> (integer? integer? . -> . integer?) (integer? . -> . integer?))
-               (case-lambda 
-                 [(x y) 'case1]
-                 [(x) 'case2])
-               'pos
-               'neg)
-     1))
-  
-  (test/neg-blame
-   'contract-case->4
-   '((contract (case-> (integer? integer? . -> . integer?) (integer? . -> . integer?))
-               (case-lambda 
-                 [(x y) 'case1]
-                 [(x) 'case2])
-               'pos
-               'neg)
-     'a 2))
-  
-  (test/neg-blame
-   'contract-case->5
-   '((contract (case-> (integer? integer? . -> . integer?) (integer? . -> . integer?))
-               (case-lambda 
-                 [(x y) 'case1]
-                 [(x) 'case2])
-               'pos
-               'neg)
-     2 'a))
-  
-  (test/neg-blame
-   'contract-case->6
-   '((contract (case-> (integer? integer? . -> . integer?) (integer? . -> . integer?))
-               (case-lambda 
-                 [(x y) 'case1]
-                 [(x) 'case2])
-               'pos
-               'neg)
-     #t))
-  
-  (test/pos-blame
-   'contract-case->7
-   '((contract (case-> (integer? integer? . -> . integer?) (->* (integer?) any/c (boolean?)))
-               (lambda x #\a)
-               'pos
-               'neg)
-     1 2))
-  
-  (test/pos-blame
-   'contract-case->8
-   '((contract (case-> (integer? integer? . -> . integer?) (->* (integer?) any/c (boolean?)))
-               (lambda x #t)
-               'pos
-               'neg)
-     1 2))
- 
-  (test/spec-passed
-   'contract-case->8
-   '((contract (case-> (integer? integer? . -> . integer?) (->* (integer?) any/c (boolean?)))
-               (lambda x 1)
-               'pos
-               'neg)
-     1 2))
-  
-  (test/spec-passed
-   'contract-case->9
-   '((contract (case-> (->r ([x number?]) (<=/c x)))
-               (lambda (x) (- x 1))
-               'pos
-               'neg)
-     1))
-  
-  (test/spec-passed
-   'contract-case->9b
-   '((contract (case-> (->r ([x number?]) (<=/c x)) (-> integer? integer? integer?))
-               (case-lambda 
-                 [(x) (- x 1)]
-                 [(x y) x])
-               'pos
-               'neg)
-     1))
-  
-  (test/pos-blame 
-   'contract-case->10
-   '((contract (case-> (->r ([x number?]) (<=/c x)))
-               (lambda (x) (+ x 1))
-               'pos
-               'neg)
-     1))
-  
-  (test/pos-blame 
-   'contract-case->10b
-   '((contract (case-> (->r ([x number?]) (<=/c x)) (-> number? number? number?))
-               (case-lambda
-                 [(x) (+ x 1)]
-                 [(x y) x])
-               'pos
-               'neg)
-     1))
-  
-  (test/spec-passed/result
-   'contract-case->11
-   '(let ([f 
-           (contract (case-> (-> char?) (-> integer? boolean?) (-> symbol? input-port? string?))
-                     (case-lambda
-                       [() #\a]
-                       [(x) (= x 0)]
-                       [(sym port) 
-                        (string-append
-                         (symbol->string sym)
-                         (read port))])
-                     'pos
-                     'neg)])
-      (list (f)
-            (f 1)
-            (f 'x (open-input-string (format "~s" "string")))))
-   (list #\a #f "xstring"))
- 
-  (test/neg-blame
-   'contract-d-protect-shared-state
-   '(let ([x 1])
-      ((contract ((->d (lambda () (let ([pre-x x]) (lambda (res) (= x pre-x)))))
-                  . -> .
-                  (lambda (x) #t))
-                 (lambda (thnk) (thnk))
-                 'pos
-                 'neg)
-       (lambda () (set! x 2)))))
-  
-  #;
-  (test/neg-blame
-   'combo1
-   '(let ([cf (contract (case->
-                         ((class? . ->d . (lambda (%) (lambda (x) #f))) . -> . void?)
-                         ((class? . ->d . (lambda (%) (lambda (x) #f))) boolean? . -> . void?))
-                        (letrec ([c% (class object% (super-instantiate ()))]
-                                 [f
-                                  (case-lambda
-                                    [(class-maker) (f class-maker #t)]
-                                    [(class-maker b) 
-                                     (class-maker c%)
-                                     (void)])])
-                          f)
-                        'pos
-                        'neg)])
-      (cf (lambda (x%) 'going-to-be-bad))))   
-
-  (test/spec-passed
-   'unconstrained-domain->1
-   '(contract (unconstrained-domain-> number?) (λ (x) x) 'pos 'neg))
-  (test/pos-blame
-   'unconstrained-domain->2
-   '(contract (unconstrained-domain-> number?) 1 'pos 'neg))
-  (test/spec-passed
-   'unconstrained-domain->3
-   '((contract (unconstrained-domain-> number?) (λ (x) x) 'pos 'neg) 1))
-  (test/pos-blame
-   'unconstrained-domain->4
-   '((contract (unconstrained-domain-> number?) (λ (x) x) 'pos 'neg) #f))
-  
-  (test/spec-passed/result
-   'unconstrained-domain->4
-   '((contract (->r ([size natural-number/c]
-                     [proc (and/c (unconstrained-domain-> number?)
-                                  (λ (p) (procedure-arity-includes? p size)))])
-                    number?)
-               (λ (i f) (apply f (build-list i add1)))
-               'pos
-               'neg)
-     10 +)
-   55)
-  
-  (test/pos-blame
-   'or/c1
-   '(contract (or/c false/c) #t 'pos 'neg))
-
-  (test/spec-passed
-   'or/c2
-   '(contract (or/c false/c) #f 'pos 'neg))
-
-  (test/spec-passed
-   'or/c3
-   '((contract (or/c (-> integer? integer?)) (lambda (x) x) 'pos 'neg) 1))
-  
-  (test/neg-blame
-   'or/c4
-   '((contract (or/c (-> integer? integer?)) (lambda (x) x) 'pos 'neg) #f))
-  
-  (test/pos-blame
-   'or/c5
-   '((contract (or/c (-> integer? integer?)) (lambda (x) #f) 'pos 'neg) 1))
-  
-  (test/spec-passed
-   'or/c6
-   '(contract (or/c false/c (-> integer? integer?)) #f 'pos 'neg))
-  
-  (test/spec-passed
-   'or/c7
-   '((contract (or/c false/c (-> integer? integer?)) (lambda (x) x) 'pos 'neg) 1))
-  
-  (test/spec-passed/result
-   'or/c8
-   '((contract ((or/c false/c (-> string?))  . -> . any)
-               (λ (y) y)
-               'pos
-               'neg)
-     #f)
-   #f)
-
-  (test/spec-passed/result
-   'or/c9
-   '((contract (or/c (-> string?) (-> integer? integer?))
-               (λ () "x")
-               'pos
-               'neg))
-   "x")
-  
-  (test/spec-passed/result
-   'or/c10
-   '((contract (or/c (-> string?) (-> integer? integer?))
-               (λ (x) x)
-               'pos
-               'neg) 
-     1)
-   1)
-  
-  (test/pos-blame
-   'or/c11
-   '(contract (or/c (-> string?) (-> integer? integer?))
-              1
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'or/c12
-   '((contract (or/c (-> string?) (-> integer? integer?))
-               1
-               'pos
-               'neg)
-     'x))
-  
-  (test/pos-blame
-   'or/c13
-   '(contract (or/c not) #t 'pos 'neg))
-  
-  (test/spec-passed
-   'or/c14
-   '(contract (or/c not) #f 'pos 'neg))
-  
-  (test/spec-passed/result
-   'or/c-not-error-early 
-   '(begin (or/c (-> integer? integer?) (-> boolean? boolean?))
-           1)
-   1)
-  
-  (contract-error-test
-   #'(contract (or/c (-> integer? integer?) (-> boolean? boolean?))
-               (λ (x) x)
-               'pos
-               'neg)
-   exn:fail?)
-  
-  (test/spec-passed/result
-   'or/c-ordering
-   '(let ([x '()])
-      (contract (or/c (lambda (y) (set! x (cons 2 x)) #f) (lambda (y) (set! x (cons 1 x)) #t))
-                'anything
-                'pos
-                'neg)
-      x)
-   '(1 2))
-  
-  (test/spec-passed/result
-   'or/c-ordering2
-   '(let ([x '()])
-      (contract (or/c (lambda (y) (set! x (cons 2 x)) #t) (lambda (y) (set! x (cons 1 x)) #t))
-                'anything
-                'pos
-                'neg)
-      x)
-   '(2))
-  
-  (test/spec-passed/result
-   'and/c-ordering
-   '(let ([x '()])
-      (contract (and/c (lambda (y) (set! x (cons 2 x)) #t) (lambda (y) (set! x (cons 1 x)) #t))
-                'anything
-                'pos
-                'neg)
-      x)
-   '(1 2))
-  
-  (test/spec-passed/result
-   'ho-and/c-ordering
-   '(let ([x '()])
-      ((contract (and/c (-> (lambda (y) (set! x (cons 1 x)) #t)
-                            (lambda (y) (set! x (cons 2 x)) #t))
-                        (-> (lambda (y) (set! x (cons 3 x)) #t)
-                            (lambda (y) (set! x (cons 4 x)) #t)))
-                 (λ (x) x)
-                 'pos
-                 'neg)
-       1)
-      (reverse x))
-   '(3 1 2 4))
-
-  (test/neg-blame
-   'parameter/c1
-   '((contract (parameter/c integer?)
-               (make-parameter 1)
-               'pos 'neg)
-     #f))
-  
-  (test/pos-blame
-   'parameter/c1
-   '((contract (parameter/c integer?)
-               (make-parameter 'not-an-int)
-               'pos 'neg)))
-  
-  (test/spec-passed
-   'define/contract1
-   '(let ()
-      (define/contract i integer? 1)
-      i))
-  
-  (test/spec-failed
-   'define/contract2
-   '(let ()
-      (define/contract i integer? #t)
-      i)
-   "i")
-  
-  (test/spec-failed
-   'define/contract3
-   '(let ()
-      (define/contract i (-> integer? integer?) (lambda (x) #t))
-      (i 1))
-   "i")
-  
-  (test/spec-failed
-   'define/contract4
-   '(let ()
-      (define/contract i (-> integer? integer?) (lambda (x) 1))
-      (i #f))
-   "<<unknown>>")
-  
-  (test/spec-failed
-   'define/contract5
-   '(let ()
-      (define/contract i (-> integer? integer?) (lambda (x) (i #t)))
-      (i 1))
-   "<<unknown>>")
-  
-  (test/spec-passed
-   'define/contract6
-   '(let ()
-      (define/contract contracted-func
-                       (string?  string? . -> . string?)
-                       (lambda (label t)
-                         t))
-      (contracted-func
-       "I'm a string constant with side effects"
-       "ans")))
-
-  (test/spec-passed
-   'define/contract7
-   '(let ()
-      (eval '(module contract-test-suite-define1 mzscheme
-               (require mzlib/contract)
-               (define/contract x string? "a")
-               x))
-      (eval '(require 'contract-test-suite-define1))))
-  
-
-  
-;                                                                                                     
-;                                                                                                     
-;                                                                                                     
-;           ;       ;                                                                                 
-;           ;                                                                                         
-;           ;                         ;                                   ;                       ;   
-;    ;;;    ; ;;    ;    ;;;    ;;;  ;;;;           ;;;    ;;;    ; ;;   ;;;;  ; ;  ;;;     ;;;  ;;;; 
-;   ;   ;   ;;  ;   ;   ;   ;  ;   ;  ;            ;   ;  ;   ;   ;;  ;   ;    ;;  ;   ;   ;   ;  ;   
-;  ;     ;  ;    ;  ;  ;    ; ;       ;           ;      ;     ;  ;   ;   ;    ;       ;  ;       ;   
-;  ;     ;  ;    ;  ;  ;;;;;; ;       ;    ;;;;;; ;      ;     ;  ;   ;   ;    ;    ;;;;  ;       ;   
-;  ;     ;  ;    ;  ;  ;      ;       ;           ;      ;     ;  ;   ;   ;    ;   ;   ;  ;       ;   
-;   ;   ;   ;;  ;   ;   ;      ;   ;  ;            ;   ;  ;   ;   ;   ;   ;    ;   ;   ;   ;   ;  ;   
-;    ;;;    ; ;;    ;    ;;;;   ;;;    ;;           ;;;    ;;;    ;   ;    ;;  ;    ;;;;;   ;;;    ;; 
-;                   ;                                                                                 
-;                   ;                                                                                 
-;                 ;;                                                                                  
-
-  
-  (test/spec-passed
-   'object-contract0
-   '(contract (object-contract)
-              (new object%)
-              'pos
-              'neg))
-
-  (test/pos-blame
-   'object-contract/field1
-   '(contract (object-contract (field x integer?))
-              (new object%)
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'object-contract/field2
-   '(get-field
-     x
-     (contract (object-contract (field x integer?))
-               (new (class object% (field [x #t]) (super-new)))
-               'pos
-               'neg)))
-  
-  (test/spec-passed/result
-   'object-contract/field3
-   '(get-field
-     x
-     (contract (object-contract (field x integer?))
-               (new (class object% (field [x 12]) (super-new)))
-               'pos
-               'neg))
-   12)
-  
-  (test/pos-blame
-   'object-contract/field4
-   '(get-field
-     y
-     (contract (object-contract (field x boolean?) (field y boolean?))
-               (new (class object% (field [x #t] [y 'x]) (super-new)))
-               'pos
-               'neg)))
-  
-  (test/pos-blame
-   'object-contract/field5
-   '(get-field
-     x
-     (contract (object-contract (field x symbol?) (field y symbol?))
-               (new (class object% (field [x #t] [y 'x]) (super-new)))
-               'pos
-               'neg)))
-  
-  (test/spec-passed/result
-   'object-contract/field6
-   '(let ([o (contract (object-contract [m (integer? . -> . integer?)])
-                       (new (class object% (field [x 1]) (define/public (m y) x) (super-new)))
-                       'pos
-                       'neg)])
-      (list (send o m 2)
-            (send/apply o m '(2))
-            (let ([x '(2)]) (send o m . x))
-            (with-method ([mm (o m)])
-              (mm 2))
-            (send* o (m 3) (m 4))))
-   (list 1 1 1 1 1))
-  
-  (test/spec-passed/result
-   'object-contract/field7
-   '(let ([o (contract (object-contract)
-                       (new (class object% (field [x 1]) (define/public (m y) x) (super-new)))
-                       'pos
-                       'neg)])
-      (list (send o m 2)
-            (send/apply o m '(2))
-            (let ([x '(2)]) (send o m . x))
-            (with-method ([mm (o m)])
-              (mm 2))
-            (send* o (m 3) (m 4))))
-   (list 1 1 1 1 1))
-  
-  (test/spec-passed/result
-   'object-contract/field8
-   '(let ([o (contract (object-contract [m (integer? . -> . integer?)])
-                       (new (class object% (define x 6) (define/public (m y) x) (super-new)))
-                       'pos
-                       'neg)])
-      (list (send o m 2)
-            (send/apply o m '(2))
-            (let ([x '(2)]) (send o m . x))
-            (with-method ([mm (o m)])
-              (mm 2))
-            (send* o (m 3) (m 4))))
-   (list 6 6 6 6 6))
-  
-  (test/spec-passed/result
-   'object-contract/field9
-   '(let ([o (contract (object-contract)
-                       (new (class object% (define x 6) (define/public (m y) x) (super-new)))
-                       'pos
-                       'neg)])
-      (list (send o m 2)
-            (send/apply o m '(2))
-            (let ([x '(2)]) (send o m . x))
-            (with-method ([mm (o m)])
-              (mm 2))
-            (send* o (m 3) (m 4))))
-   (list 6 6 6 6 6))
-  
-  (test/spec-passed/result
-   'object-contract/field10
-   '(send (contract (object-contract)
-                    (new (class object% (define x 1) (define/public (m y) x) (super-new)))
-                    'pos
-                    'neg)
-          m
-          2)
-   1)
-  
-  (test/spec-passed/result
-   'object-contract->1
-   '(send
-     (contract (object-contract (m (integer? . -> . integer?)))
-               (new (class object% (define/public (m x) x) (super-new)))
-               'pos
-               'neg)
-     m
-     1)
-   1)
-  
-  (test/pos-blame
-   'object-contract->2
-   '(contract (object-contract (m (integer? . -> . integer?)))
-              (make-object object%)
-              'pos
-              'neg))
-  
-  (test/neg-blame
-   'object-contract->3
-   '(send
-     (contract (object-contract (m (integer? . -> . integer?)))
-               (make-object (class object% (define/public (m x) x) (super-instantiate ())))
-               'pos
-               'neg)
-     m
-     'x))
-  
-  (test/pos-blame
-   'object-contract->4
-   '(send
-     (contract (object-contract (m (integer? . -> . integer?)))
-               (make-object (class object% (define/public (m x) 'x) (super-instantiate ())))
-               'pos
-               'neg)
-     m
-     1))
-  
-  (test/pos-blame
-   'object-contract->5
-   '(contract (object-contract (m (integer? integer? . -> . integer?)))
-              (make-object (class object% (define/public (m x) 'x) (super-instantiate ())))
-              'pos
-              'neg))
-
-  (test/spec-passed/result
-   'object-contract->6
-   '(send
-     (contract (object-contract (m (integer? . -> . any)))
-               (new (class object% (define/public (m x) x) (super-new)))
-               'pos
-               'neg)
-     m
-     1)
-   1)
-  
-  (test/neg-blame
-   'object-contract->7
-   '(send
-     (contract (object-contract (m (integer? . -> . any)))
-               (make-object (class object% (define/public (m x) x) (super-instantiate ())))
-               'pos
-               'neg)
-     m
-     'x))
-  
-  (test/spec-passed
-   'object-contract->8
-   '(begin
-      (send
-       (contract (object-contract (m (integer? . -> . any)))
-                 (make-object (class object% (define/public (m x) (values 1 2)) (super-instantiate ())))
-                 'pos
-                 'neg)
-       m
-       1)
-      (void)))
-  
-  (test/spec-passed
-   'object-contract->9
-   '(begin
-      (send
-       (contract (object-contract (m (integer? . -> . any)))
-                 (make-object (class object% (define/public (m x) (values)) (super-instantiate ())))
-                 'pos
-                 'neg)
-       m
-       1)
-      (void)))
-  
-  (test/spec-passed
-   'object-contract->10
-   '(begin
-      (send (contract (object-contract (m (integer? . -> . (values integer? boolean?))))
-                      (make-object (class object% (define/public (m x) (values 1 #t)) (super-instantiate ())))
-                      'pos
-                      'neg)
-            m 1)
-      (void)))
-  
-  (test/neg-blame
-   'object-contract->11
-   '(send 
-     (contract (object-contract (m (integer? . -> . (values integer? boolean?))))
-               (make-object (class object% (define/public (m x) (values #t #t)) (super-instantiate ())))
-               'pos
-               'neg)
-     m
-     #f))
-  
-  (test/pos-blame
-   'object-contract->12
-   '(send 
-     (contract (object-contract (m (integer? . -> . (values integer? boolean?))))
-               (make-object (class object% (define/public (m x) (values #t #t)) (super-instantiate ())))
-               'pos
-               'neg)
-     m
-     1))
-  
-  (test/pos-blame
-   'object-contract->13
-   '(send (contract (object-contract (m (integer? . -> . (values integer? boolean?))))
-                    (make-object (class object% (define/public (m x) (values #f #t)) (super-instantiate ())))
-                    'pos
-                    'neg)
-          m 1))
-  
-  (test/pos-blame
-   'object-contract->14
-   '(send (contract (object-contract (m (integer? . -> . (values integer? boolean?))))
-                    (make-object (class object% (define/public (m x) (values 5 6)) (super-instantiate ())))
-                    'pos
-                    'neg)
-          m 1))
-  
-  (test/pos-blame
-   'object-contract-case->1
-   '(contract (object-contract (m (case-> (boolean? . -> . boolean?)
-                                          (integer? integer? . -> . integer?))))
-              (new object%)
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'object-contract-case->2
-   '(contract (object-contract (m (case-> (boolean? . -> . boolean?)
-                                          (integer? integer? . -> . integer?))))
-              (new (class object% (define/public (m x) x) (super-new)))
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'object-contract-case->3
-   '(contract (object-contract (m (case-> (boolean? . -> . boolean?)
-                                          (integer? integer? . -> . integer?))))
-              (new (class object% (define/public (m x y) x) (super-new)))
-              'pos
-              'neg))
-  
-  (test/spec-passed
-   'object-contract-case->4
-   '(contract (object-contract (m (case-> (boolean? . -> . boolean?)
-                                          (integer? integer? . -> . integer?))))
-              (new (class object% 
-                     (define/public m
-                       (case-lambda
-                         [(b) (not b)]
-                         [(x y) (+ x y)]))
-                     (super-new)))
-              'pos
-              'neg))
-  
-  (test/spec-passed/result
-   'object-contract-case->5
-   '(send (contract (object-contract (m (case-> (boolean? . -> . boolean?)
-                                                (integer? integer? . -> . integer?))))
-                    (new (class object% 
-                           (define/public m
-                             (case-lambda
-                               [(b) (not b)]
-                               [(x y) (+ x y)]))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m 
-          #t)
-   #f)
-  
-  (test/spec-passed/result
-   'object-contract-case->6
-   '(send (contract (object-contract (m (case-> (boolean? . -> . boolean?)
-                                                (integer? integer? . -> . integer?))))
-                    (new (class object% 
-                           (define/public m
-                             (case-lambda
-                               [(b) (not b)]
-                               [(x y) (+ x y)]))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m 
-          3
-          4)
-   7)
-  
-  (test/pos-blame
-   'object-contract-opt->*1
-   '(contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number?))))
-              (new (class object%
-                     (define/public m
-                       (opt-lambda (x [y 'a])
-                         x))
-                     (super-new)))
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'object-contract-opt->*2
-   '(contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number?))))
-              (new (class object%
-                     (define/public m
-                       (opt-lambda (x y [z #t])
-                         x))
-                     (super-new)))
-              'pos
-              'neg))
-  
-  (test/spec-passed
-   'object-contract-opt->*3
-   '(contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number?))))
-              (new (class object%
-                     (define/public m
-                       (opt-lambda (x [y 'a] [z #t])
-                         x))
-                     (super-new)))
-              'pos
-              'neg))
-  
-  (test/spec-passed/result
-   'object-contract-opt->*4
-   '(send (contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number?))))
-                    (new (class object%
-                           (define/public m
-                             (opt-lambda (x [y 'a] [z #t])
-                               x))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m
-          1)
-   1)
-  
-  (test/spec-passed/result
-   'object-contract-opt->*5
-   '(send (contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number?))))
-                    (new (class object%
-                           (define/public m
-                             (opt-lambda (x [y 'a] [z #t])
-                               x))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m
-          2
-          'z)
-   2)
-  
-  (test/spec-passed/result
-   'object-contract-opt->*7
-   '(send (contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number?))))
-                    (new (class object%
-                           (define/public m
-                             (opt-lambda (x [y 'a] [z #t])
-                               x))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m
-          3
-          'z
-          #f)
-   3)
-  
-  (test/neg-blame
-   'object-contract-opt->*8
-   '(send (contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number?))))
-                    (new (class object%
-                           (define/public m
-                             (opt-lambda (x [y 'a] [z #t])
-                               x))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m
-          #f))
-  
-  (test/neg-blame
-   'object-contract-opt->*9
-   '(send (contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number?))))
-                    (new (class object%
-                           (define/public m
-                             (opt-lambda (x [y 'a] [z #t])
-                               x))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m
-          2
-          4))
-  
-  (test/neg-blame
-   'object-contract-opt->*10
-   '(send (contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number?))))
-                    (new (class object%
-                           (define/public m
-                             (opt-lambda (x [y 'a] [z #t])
-                               x))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m
-          3
-          'z
-          'y))
-  
-  (test/pos-blame
-   'object-contract-opt->*11
-   '(send (contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number?))))
-                    (new (class object%
-                           (define/public m
-                             (opt-lambda (x [y 'a] [z #t])
-                               'x))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m
-          3
-          'z
-          #f))
-  
-  (test/spec-passed/result
-   'object-contract-opt->*12
-   '(let-values ([(x y)
-                  (send (contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number? symbol?))))
-                                  (new (class object%
-                                         (define/public m
-                                           (opt-lambda (x [y 'a] [z #t])
-                                             (values 1 'x)))
-                                         (super-new)))
-                                  'pos
-                                  'neg)
-                        m
-                        3
-                        'z
-                        #f)])
-      (cons x y))
-   (cons 1 'x))
-  
-  (test/pos-blame
-   'object-contract-opt->*13
-   '(send (contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number? symbol?))))
-                    (new (class object%
-                           (define/public m
-                             (opt-lambda (x [y 'a] [z #t])
-                               (values 'x 'x)))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m
-          3
-          'z
-          #f))
-  
-  (test/pos-blame
-   'object-contract-opt->*14
-   '(send (contract (object-contract (m (opt->* (integer?) (symbol? boolean?) (number? symbol?))))
-                    (new (class object%
-                           (define/public m
-                             (opt-lambda (x [y 'a] [z #t])
-                               (values 1 1)))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m
-          3
-          'z
-          #f))
-
-  (test/pos-blame
-   'object-contract->*1
-   '(contract (object-contract (m (->* (integer?) (boolean?))))
-              (new (class object% (define/public (m x y) x) (super-new)))
-              'pos
-              'neg))
-  
-  (test/neg-blame
-   'object-contract->*2
-   '(send (contract (object-contract (m (->* (integer?) (boolean?))))
-                    (new (class object% (define/public (m x) x) (super-new)))
-                    'pos
-                    'neg)
-          m #f))
-  
-  (test/pos-blame
-   'object-contract->*3
-   '(send (contract (object-contract (m (->* (integer?) (boolean?))))
-                    (new (class object% (define/public (m x) x) (super-new)))
-                    'pos
-                    'neg)
-          m 1))
-  
-  (test/spec-passed
-   'object-contract->*4
-   '(send (contract (object-contract (m (->* (integer?) (boolean?))))
-                    (new (class object% (define/public (m x) #f) (super-new)))
-                    'pos
-                    'neg)
-          m 1))
-  
-  (test/pos-blame
-   'object-contract->*5
-   '(contract (object-contract (m (->* (integer?) any/c (boolean?))))
-              (new (class object% (define/public (m x y . z) x) (super-new)))
-              'pos
-              'neg))
-  
-  (test/neg-blame
-   'object-contract->*6
-   '(send (contract (object-contract (m (->* (integer?) any/c (boolean?))))
-                    (new (class object% (define/public (m x . z) x) (super-new)))
-                    'pos
-                    'neg)
-          m #t))
-  
-  (test/pos-blame
-   'object-contract->*7
-   '(send (contract (object-contract (m (->* (integer?) any/c (boolean?))))
-                    (new (class object% (define/public (m x . z) 1) (super-new)))
-                    'pos
-                    'neg)
-          m 1))
-  
-  (test/spec-passed
-   'object-contract->*8
-   '(send (contract (object-contract (m (->* (integer?) any/c (boolean?))))
-                    (new (class object% (define/public (m x . z) #f) (super-new)))
-                    'pos
-                    'neg)
-          m 1))
-  
-  (test/spec-passed
-   'object-contract->*9
-   '(send (contract (object-contract (m (->* () (listof number?) (boolean?))))
-                    (new (class object% (define/public (m . z) #f) (super-new)))
-                    'pos
-                    'neg)
-          m 1 2 3))
-  
-  (test/neg-blame
-   'object-contract->*10
-   '(send (contract (object-contract (m (->* () (listof number?) (boolean?))))
-                    (new (class object% (define/public (m . z) #f) (super-new)))
-                    'pos
-                    'neg)
-          m 
-          #t))
-  
-  (test/spec-passed
-   'object-contract->d1
-   '(contract (object-contract (m (->d integer? (lambda (x) (lambda (y) (and (integer? y) (= y (+ x 1))))))))
-              (new (class object% (define/public (m x) 1) (super-new)))
-              'pos 
-              'neg))
-  
-  (test/neg-blame
-   'object-contract->d2
-   '(send (contract (object-contract (m (->d integer? (lambda (x) (lambda (y) (and (integer? y) (= y (+ x 1))))))))
-                    (new (class object% (define/public (m x) 1) (super-new)))
-                    'pos 
-                    'neg)
-          m #f))
-  
-  (test/pos-blame
-   'object-contract->d3
-   '(send (contract (object-contract (m (->d integer? (lambda (x) (lambda (y) (and (integer? y) (= y (+ x 1))))))))
-                    (new (class object% (define/public (m x) 1) (super-new)))
-                    'pos 
-                    'neg)
-          m 
-          1))
-  
-  (test/spec-passed
-   'object-contract->d4
-   '(send (contract (object-contract (m (->d integer? (lambda (x) (lambda (y) (and (integer? y) (= y (+ x 1))))))))
-                    (new (class object% (define/public (m x) 1) (super-new)))
-                    'pos 
-                    'neg)
-          m 
-          0))
-  
-  (test/spec-passed
-   'object-contract->d*1
-   '(contract (object-contract (m (->d* (integer? integer?) 
-                                        (lambda (x z) (lambda (y) (and (integer? y) (= y (+ x 1))))))))
-              (new (class object% (define/public (m x y) 1) (super-new)))
-              'pos 
-              'neg))
-  
-  (test/neg-blame
-   'object-contract->d*2
-   '(send (contract (object-contract (m (->d* (integer? boolean?)
-                                              (lambda (x z) (lambda (y) (and (integer? y) (= y (+ x 1))))))))
-                    (new (class object% (define/public (m x y) 1) (super-new)))
-                    'pos 
-                    'neg)
-          m #f #f))
-  
-  (test/neg-blame
-   'object-contract->d*3
-   '(send (contract (object-contract (m (->d* (integer? boolean?)
-                                              (lambda (x z) (lambda (y) (and (integer? y) (= y (+ x 1))))))))
-                    (new (class object% (define/public (m x y) 1) (super-new)))
-                    'pos 
-                    'neg)
-          m 1 1))
-  
-  (test/pos-blame
-   'object-contract->d*4
-   '(send (contract (object-contract (m (->d* (integer? boolean?)
-                                              (lambda (x z) (lambda (y) (and (integer? y) (= y (+ x 1))))))))
-                    (new (class object% (define/public (m x y) 1) (super-new)))
-                    'pos 
-                    'neg)
-          m 
-          1
-          #t))
-  
-  (test/spec-passed
-   'object-contract->d*5
-   '(send (contract (object-contract (m (->d* (integer? boolean?)
-                                              (lambda (x z) (lambda (y) (and (integer? y) (= y (+ x 1))))))))
-                    (new (class object% (define/public (m x y) 1) (super-new)))
-                    'pos 
-                    'neg)
-          m 
-          0
-          #t))
-  
-  (test/spec-passed
-   'object-contract->d*6
-   '(contract (object-contract (m (->d* (integer? integer?) 
-                                        any/c
-                                        (lambda (x z . rst) (lambda (y) 
-                                                              (= y (length rst)))))))
-              (new (class object% (define/public (m x y . z) 2) (super-new)))
-              'pos 
-              'neg))
-  
-  (test/neg-blame
-   'object-contract->d*7
-   '(send (contract (object-contract (m (->d* (integer? boolean?) 
-                                              any/c
-                                              (lambda (x z . rst) (lambda (y) 
-                                                                    (= y (length rst)))))))
-                    (new (class object% (define/public (m x y . z) 2) (super-new)))
-                    'pos 
-                    'neg)
-          m 1 1))
-  
-  (test/neg-blame
-   'object-contract->d*8
-   '(send (contract (object-contract (m (->d* (integer? boolean?) 
-                                              any/c
-                                              (lambda (x z . rst) (lambda (y) 
-                                                                    (= y (length rst)))))))
-                    (new (class object% (define/public (m x y . z) 2) (super-new)))
-                    'pos 
-                    'neg)
-          m #t #t))
-  
-  (test/neg-blame
-   'object-contract->d*9
-   '(send (contract (object-contract (m (->d* (integer? boolean?) 
-                                              (listof symbol?)
-                                              (lambda (x z . rst) (lambda (y) 
-                                                                    (= y (length rst)))))))
-                    (new (class object% (define/public (m x y . z) 2) (super-new)))
-                    'pos 
-                    'neg)
-          m #t #t))
-  
-  (test/neg-blame
-   'object-contract->d*10
-   '(send (contract (object-contract (m (->d* (integer? boolean?) 
-                                              (listof symbol?)
-                                              (lambda (x z . rst) (lambda (y) 
-                                                                    (= y (length rst)))))))
-                    (new (class object% (define/public (m x y . z) 2) (super-new)))
-                    'pos 
-                    'neg)
-          m 1 #t #t))
-  
-  (test/pos-blame
-   'object-contract->d*11
-   '(send (contract (object-contract (m (->d* (integer? boolean?) 
-                                              (listof symbol?)
-                                              (lambda (x z . rst) (lambda (y) 
-                                                                    (= y (length rst)))))))
-                    (new (class object% (define/public (m x y . z) 2) (super-new)))
-                    'pos 
-                    'neg)
-          m 1 #t 'x))
-  
-  (test/spec-passed
-   'object-contract->d*12
-   '(send (contract (object-contract (m (->d* (integer? boolean?) 
-                                              (listof symbol?)
-                                              (lambda (x z . rst) (lambda (y) 
-                                                                    (= y (length rst)))))))
-                    (new (class object% (define/public (m x y . z) 2) (super-new)))
-                    'pos 
-                    'neg)
-          m 1 #t 'x 'y))
-
-  (test/spec-passed
-   'object-contract-->r1
-   '(send (contract (object-contract (m (case-> (->r ([x number?]) (<=/c x)))))
-                    (new (class object% (define/public m (lambda (x) (- x 1))) (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-  
-  (test/spec-passed
-   'object-contract-->r1b
-   '(send (contract (object-contract (m (case-> (->r ([x number?]) (<=/c x))
-                                                (-> integer? integer? integer?))))
-                    (new (class object% (define/public m (case-lambda [(x) (- x 1)] [(x y) x])) (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-
-  (test/pos-blame 
-   'object-contract-->r2
-   '(send (contract (object-contract (m (case-> (->r ([x number?]) (<=/c x)))))
-                    (new (class object% (define/public m (lambda (x) (+ x 1))) (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-  
-  (test/pos-blame 
-   'object-contract-->r2b
-   '(send (contract (object-contract (m (case-> (->r ([x number?]) (<=/c x)) (-> integer? integer? integer?))))
-                    (new (class object% (define/public m (case-lambda [(x) (+ x 1)] [(x y) y])) (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-  
-  (test/spec-passed
-   'object-contract-->r3
-   '(send (contract (object-contract (m (->r () rst (listof number?) any/c)))
-                    (new (class object% (define/public m (lambda w 1)) (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-  
-  (test/neg-blame
-   'object-contract-->r4
-   '(send (contract (object-contract (m (->r () rst (listof number?) any/c)))
-                    (new (class object% (define/public m (lambda w 1)) (super-new)))
-                    'pos 
-                    'neg)
-          m
-          #f))
-    
-  (test/spec-passed
-   'object-contract-->r5
-   '(send (contract (object-contract (m (->r () any)))
-                    (new (class object% (define/public m (lambda () 1)) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  (test/spec-passed
-   'object-contract-->r6
-   '(send (contract (object-contract (m (->r () (values [x number?] [y (>=/c x)]))))
-                    (new (class object% (define/public m (lambda () (values 1 2))) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  (test/pos-blame
-   'object-contract-->r7
-   '(send (contract (object-contract (m (->r () (values [x number?] [y (>=/c x)]))))
-                    (new (class object% (define/public m (lambda () (values 2 1))) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  (test/neg-blame
-   'object-contract-->r/this-1
-   '(send (contract (object-contract (m (->r ([x (and/c integer? (lambda (x) (= x (get-field f this))))])
-                                             any)))
-                    (new (class object% (field [f 1]) (define/public m (lambda (x) 1)) (super-new)))
-                    'pos
-                    'neg)
-          m
-          2))
-  
-  (test/spec-passed
-   'object-contract-->r/this-2
-   '(send (contract (object-contract (m (->r ([x (and/c integer? (lambda (x) (= x (get-field f this))))])
-                                             any)))
-                    (new (class object% (field [f 1]) (define/public m (lambda (x) 1)) (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-  
-  (test/neg-blame
-   'object-contract-->r/this-3
-   '(send (contract (object-contract (m (->r ([x (and/c integer? (lambda (x) (= x (get-field f this))))])
-                                             rest-var any/c
-                                             any)))
-                    (new (class object% (field [f 1]) (define/public m (lambda (x . rest) 1)) (super-new)))
-                    'pos
-                    'neg)
-          m
-          2))
-  
-  (test/spec-passed
-   'object-contract-->r/this-4
-   '(send (contract (object-contract (m (->r ([x (and/c integer? (lambda (x) (= x (get-field f this))))])
-                                             rest-var any/c
-                                             any)))
-                    (new (class object% (field [f 1]) (define/public m (lambda (x . rest) 1)) (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-
-  (test/spec-passed
-   'object-contract-->pp1
-   '(send (contract (object-contract (m (case-> (->pp ([x number?]) #t (<=/c x) unused #t))))
-                    (new (class object% (define/public m (lambda (x) (- x 1))) (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-  
-  (test/spec-passed
-   'object-contract-->pp1b
-   '(send (contract (object-contract (m (case-> (->pp ([x number?]) #t (<=/c x) unused #t) 
-                                                (-> integer? integer? integer?))))
-                    (new (class object%
-                           (define/public m (case-lambda [(x) (- x 1)]
-                                                         [(x y) y]))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-
-  (test/pos-blame 
-   'object-contract-->pp2
-   '(send (contract (object-contract (m (case-> (->pp ([x number?]) #t (<=/c x) unused #t))))
-                    (new (class object% (define/public m (lambda (x) (+ x 1))) (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-  
-  (test/pos-blame 
-   'object-contract-->pp2b
-   '(send (contract (object-contract (m (case-> (->pp ([x number?]) #t (<=/c x) unused #t)
-                                                (-> integer? integer? integer?))))
-                    (new (class object% 
-                           (define/public m (case-lambda
-                                              [(x) (+ x 1)]
-                                              [(x y) x]))
-                           (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-  
-  (test/spec-passed
-   'object-contract-->pp3
-   '(send (contract (object-contract (m (->pp-rest () rst (listof number?) #t any/c unused #t)))
-                    (new (class object% (define/public m (lambda w 1)) (super-new)))
-                    'pos
-                    'neg)
-          m
-          1))
-  
-  (test/neg-blame
-   'object-contract-->pp4
-   '(send (contract (object-contract (m (->pp-rest () rst (listof number?) #t any/c unused #t)))
-                    (new (class object% (define/public m (lambda w 1)) (super-new)))
-                    'pos 
-                    'neg)
-          m
-          #f))
-    
-  (test/spec-passed
-   'object-contract-->pp5
-   '(send (contract (object-contract (m (->pp () #t any)))
-                    (new (class object% (define/public m (lambda () 1)) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  (test/spec-passed
-   'object-contract-->pp6
-   '(send (contract (object-contract (m (->pp () #t (values [x number?] [y (>=/c x)]) #t)))
-                    (new (class object% (define/public m (lambda () (values 1 2))) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  (test/pos-blame
-   'object-contract-->pp7
-   '(send (contract (object-contract (m (->pp () #t (values [x number?] [y (>=/c x)]) #t)))
-                    (new (class object% (define/public m (lambda () (values 2 1))) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  (test/neg-blame
-   'object-contract-->pp/this-1
-   '(send (contract (object-contract (m (->pp ()
-                                              (= 1 (get-field f this))
-                                              any/c
-                                              result-x
-                                              (= 2 (get-field f this)))))
-                    (new (class object% (field [f 2]) (define/public m (lambda () (set! f 3))) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  (test/pos-blame
-   'object-contract-->pp/this-2
-   '(send (contract (object-contract (m (->pp ()
-                                              (= 1 (get-field f this))
-                                              any/c
-                                              result-x
-                                              (= 2 (get-field f this)))))
-                    (new (class object% (field [f 1]) (define/public m (lambda () (set! f 3))) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  (test/spec-passed
-   'object-contract-->pp/this-3
-   '(send (contract (object-contract (m (->pp ()
-                                              (= 1 (get-field f this))
-                                              any/c
-                                              result-x
-                                              (= 2 (get-field f this)))))
-                    (new (class object% (field [f 1]) (define/public m (lambda () (set! f 2))) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  (test/neg-blame
-   'object-contract-->pp/this-4
-   '(send (contract (object-contract (m (->pp-rest ()
-                                                   rest-id
-                                                   any/c
-                                                   (= 1 (get-field f this))
-                                                   any/c
-                                                   result-x
-                                                   (= 2 (get-field f this)))))
-                    (new (class object% (field [f 2]) (define/public m (lambda args (set! f 3))) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  (test/pos-blame
-   'object-contract-->pp/this-5
-   '(send (contract (object-contract (m (->pp-rest ()
-                                                   rest-id
-                                                   any/c
-                                                   (= 1 (get-field f this))
-                                                   any/c
-                                                   result-x
-                                                   (= 2 (get-field f this)))))
-                    (new (class object% (field [f 1]) (define/public m (lambda args (set! f 3))) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  
-  
-  (test/spec-passed
-   'object-contract-->pp/this-6
-   '(send (contract (object-contract (m (->pp-rest ()
-                                                   rest-id
-                                                   any/c
-                                                   (= 1 (get-field f this))
-                                                   any/c
-                                                   result-x
-                                                   (= 2 (get-field f this)))))
-                    (new (class object% (field [f 1]) (define/public m (lambda args (set! f 2))) (super-new)))
-                    'pos
-                    'neg)
-          m))
-  
-  (test/spec-passed/result
-   'object-contract-drop-method1
-   '(send (contract (object-contract (m (-> integer? integer?)))
-                    (new (class object% (define/public (m x) x) (define/public (n x) x) (super-new)))
-                    'pos
-                    'neg)
-          n 1)
-   1)
-  
-  (test/spec-passed/result
-   'object-contract-drop-method2
-   '(let ([o (contract (object-contract (m (-> integer? integer?)))
-                       (new (class object% (define/public (m x) x) (define/public (n x) x) (super-new)))
-                       'pos
-                       'neg)])
-      (with-method ([m (o m)]
-                    [n (o n)])
-        (list (m 1) (n 2))))
-   '(1 2))
-  
-  (test/spec-passed/result
-   'object-contract-drop-field1
-   '(get-field g (contract (object-contract (field f integer?))
-                           (new (class object% (field [f 1] [g 2]) (super-new)))
-                           'pos
-                           'neg))
-   2)
-  
-  (test/spec-passed/result
-   'object-contract-drop-field2
-   '(field-bound? g (contract (object-contract (field f integer?))
-                              (new (class object% (field [f 1] [g 2]) (super-new)))
-                              'pos
-                              'neg))
-   #t)
-  
-  (test/spec-passed/result
-   'object-contract-drop-field3
-   '(field-names
-     (contract (object-contract)
-               (new (class object% (field [g 2]) (super-new)))
-               'pos
-               'neg))
-   '(g))
-
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;; test error message has right format
-  ;;
-
-  (test/spec-passed/result
-   'wrong-method-arity-error-message
-   '(with-handlers ([exn:fail? exn-message])
-      (send (contract (object-contract [m (integer? . -> . integer?)])
-                      (new (class object% (define/public (m x) x) (super-new)))
-                      'pos
-                      'neg)
-            m
-            1
-            2))
-   (string-append
-    "m method: arity mismatch;\n"
-    " the expected number of arguments does not match the given number\n"
-    "  expected: 1\n"
-    "  given: 2\n"
-    "  arguments...:\n"
-    "   1\n"
-    "   2"))
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;; tests object utilities to be sure wrappers work right
-  ;;
-  
-  (let* ([o1 (contract-eval '(new object%))]
-         [o2 (contract-eval `(contract (object-contract) ,o1 'pos 'neg))])
-    (test #t (contract-eval 'object=?) o1 o1)
-    (test #f (contract-eval 'object=?) o1 (contract-eval '(new object%)))
-    (test #t (contract-eval 'object=?) o1 o2)
-    (test #t (contract-eval 'object=?) o2 o1)
-    (test #f (contract-eval 'object=?) (contract-eval '(new object%)) o2))
-  
-  (ctest #t
-         method-in-interface? 
-         'm 
-         (object-interface 
-          (contract
-           (object-contract (m (integer? . -> . integer?)))
-           (new (class object% (define/public (m x) x) (super-new)))
-           'pos
-           'neg)))
-  
-  (let* ([i<%> (contract-eval '(interface ()))]
-         [c% (contract-eval `(class* object% (,i<%>) (super-new)))]
-         [o (contract-eval `(new ,c%))])
-    (test #t (contract-eval 'is-a?) o i<%>)
-    (test #t (contract-eval 'is-a?) o c%)
-    (test #t (contract-eval 'is-a?) (contract-eval `(contract (object-contract) ,o 'pos 'neg)) i<%>)
-    (test #t (contract-eval 'is-a?) (contract-eval `(contract (object-contract) ,o 'pos 'neg)) c%))
-  
-  (let ([c% (parameterize ([current-inspector (make-inspector)])
-              (contract-eval '(class object% (super-new))))])
-    (test (list c% #f) 
-          'object-info
-          (contract-eval
-           `(call-with-values 
-             (lambda () (object-info (contract (object-contract) (new ,c%) 'pos 'neg)))
-             list))))
-
-  ;; object->vector tests
-  (let* ([obj
-          (parameterize ([current-inspector (make-inspector)])
-            (contract-eval '(new (class object% (field [x 1] [y 2]) (super-new)))))]
-         [vec (contract-eval `(object->vector ,obj))])
-    (test vec
-          (contract-eval 'object->vector)
-          (contract-eval
-           `(contract (object-contract (field x integer?) (field y integer?))
-                      ,obj
-                      'pos
-                      'neg))))
-  
-;                                                                     
-;                                                                     
-;                                                                     
-;   ;                                               ;       ;         
-;                                                   ;       ;         
-;                                       ;           ;       ;         
-;   ;   ; ;;  ;;    ; ;;  ;;    ;   ;  ;;;;  ;;;    ; ;;    ;    ;;;  
-;   ;   ;;  ;;  ;   ;;  ;;  ;   ;   ;   ;   ;   ;   ;;  ;   ;   ;   ; 
-;   ;   ;   ;   ;   ;   ;   ;   ;   ;   ;       ;   ;    ;  ;  ;    ; 
-;   ;   ;   ;   ;   ;   ;   ;   ;   ;   ;    ;;;;   ;    ;  ;  ;;;;;; 
-;   ;   ;   ;   ;   ;   ;   ;   ;   ;   ;   ;   ;   ;    ;  ;  ;      
-;   ;   ;   ;   ;   ;   ;   ;   ;  ;;   ;   ;   ;   ;;  ;   ;   ;     
-;   ;   ;   ;   ;   ;   ;   ;    ;; ;    ;;  ;;;;;  ; ;;    ;    ;;;; 
-;                                                                     
-;                                                                     
-;                                                                     
-
-
-  (test/pos-blame
-   'immutable1
-   '(let ([ct (contract (listof (boolean? . -> . boolean?)) 
-                        #f 
-                        'pos
-                        'neg)])
-      ((car ct) 1)))
-  
-  (test/neg-blame
-   'immutable2
-   '(let ([ct (contract (listof (boolean? . -> . boolean?)) 
-                        (list (lambda (x) x)) 
-                        'pos
-                        'neg)])
-      ((car ct) 1)))
-  
-  (test/neg-blame
-   'immutable3
-   '(let ([ct (contract (listof (number? . -> . boolean?)) 
-                        (list (lambda (x) 1)) 
-                        'pos
-                        'neg)])
-      ((car ct) #f)))
-  
-  (test/pos-blame
-   'immutable4
-   '(let ([ct (contract (listof (number? . -> . boolean?)) 
-                        (list (lambda (x) 1)) 
-                        'pos
-                        'neg)])
-      ((car ct) 1)))
-  
-  (test/spec-passed
-   'immutable5
-   '(let ([ct (contract (listof (number? . -> . boolean?)) 
-                        (list (lambda (x) #t)) 
-                        'pos
-                        'neg)])
-      ((car ct) 1)))
-  
-
-  (test/pos-blame
-   'immutable6
-   '(contract (cons/c (boolean? . -> . boolean?) (boolean? . -> . boolean?)) 
-              #f 
-              'pos
-              'neg))
-  
-  (test/neg-blame
-   'immutable8
-   '(let ([ct (contract (cons/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-                        (cons (lambda (x) 1) (lambda (x) 1))
-                        'pos
-                        'neg)])
-      ((car ct) #f)))
-  
-  (test/neg-blame
-   'immutable9
-   '(let ([ct (contract (cons/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-                        (cons (lambda (x) 1) (lambda (x) 1))
-                        'pos
-                        'neg)])
-      ((cdr ct) #f)))
-  
-  (test/pos-blame
-   'immutable10
-   '(let ([ct (contract (cons/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-                        (cons (lambda (x) 1) (lambda (x) 1)) 
-                        'pos
-                        'neg)])
-      ((car ct) 1)))
-  
-  (test/pos-blame
-   'immutable11
-   '(let ([ct (contract (cons/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-                        (cons (lambda (x) 1) (lambda (x) 1)) 
-                        'pos
-                        'neg)])
-      ((cdr ct) 1)))
-  
-  (test/spec-passed
-   'immutable12
-   '(let ([ct (contract (cons/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-                        (cons (lambda (x) #t) (lambda (x) #t)) 
-                        'pos
-                        'neg)])
-      ((car ct) 1)))
-  
-  (test/spec-passed
-   'immutable13
-   '(let ([ct (contract (cons/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-                        (cons (lambda (x) #t) (lambda (x) #t)) 
-                        'pos
-                        'neg)])
-      ((cdr ct) 1)))
-  
-  (test/spec-passed/result
-   'immutable14
-   '(contract (cons/c number? boolean?) 
-              (cons 1 #t) 
-              'pos
-              'neg)
-   (cons 1 #t))
-  
-  (test/pos-blame
-   'immutable15
-   '(contract (list/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-              #f
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'immutable17
-   '(contract (list/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-              (list (lambda (x) #t)) 
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'immutable18
-   '(contract (list/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-              (list (lambda (x) #t) (lambda (x) #t) (lambda (x) #t)) 
-              'pos
-              'neg))
-  
-  (test/spec-passed
-   'immutable19
-   '(let ([ctc (contract (list/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-                         (list (lambda (x) #t) (lambda (x) #t)) 
-                         'pos
-                         'neg)])
-      (for-each (lambda (x) (x 1)) ctc)))
-  
-  (test/pos-blame
-   'vector-immutable1
-   '(contract (vector-immutableof (boolean? . -> . boolean?)) 
-              #f 
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'vector-immutable2
-   '(contract (vector-immutableof (boolean? . -> . boolean?)) 
-              (vector (lambda (x) x)) 
-              'pos
-              'neg))
-  
-  (test/neg-blame
-   'vector-immutable3
-   '(let ([ct (contract (vector-immutableof (number? . -> . boolean?)) 
-                        (vector->immutable-vector (vector (lambda (x) 1)))
-                        'pos
-                        'neg)])
-      ((vector-ref ct 0) #f)))
-  
-  (test/pos-blame
-   'vector-immutable4
-   '(let ([ct (contract (vector-immutableof (number? . -> . boolean?)) 
-                        (vector->immutable-vector (vector (lambda (x) 1)))
-                        'pos
-                        'neg)])
-      ((vector-ref ct 0) 1)))
-  
-  (test/spec-passed
-   'vector-immutable5
-   '(let ([ct (contract (vector-immutableof (number? . -> . boolean?)) 
-                        (vector->immutable-vector (vector (lambda (x) #t)))
-                        'pos
-                        'neg)])
-      ((vector-ref ct 0) 1)))
-  
-  (test/pos-blame
-   'vector-immutable6
-   '(contract (vector-immutable/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-              #f
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'vector-immutable7
-   '(contract (vector-immutable/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-              (vector (lambda (x) #t) (lambda (x) #t)) 
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'vector-immutable8
-   '(contract (vector-immutable/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-              (vector->immutable-vector (vector (lambda (x) #t)))
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'vector-immutable9
-   '(contract (vector-immutable/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-              (vector->immutable-vector (vector (lambda (x) #t) (lambda (x) #t) (lambda (x) #t)))
-              'pos
-              'neg))
-  
-  (test/spec-passed
-   'vector-immutable10
-   '(let ([ctc (contract (vector-immutable/c (number? . -> . boolean?) (number? . -> . boolean?)) 
-                         (vector->immutable-vector (vector (lambda (x) #t) (lambda (x) #t))) 
-                         'pos
-                         'neg)])
-      ((vector-ref ctc 0) 1)
-      ((vector-ref ctc 1) 1)))
-
-  (test/spec-passed/result
-   'vector-immutable11
-   '(contract (vector-immutable/c number? boolean?) 
-              (vector->immutable-vector (vector 1 #t))
-              'pos
-              'neg)
-   (vector->immutable-vector (vector 1 #t)))
-  
-  (test/spec-passed/result
-   'vector-immutable12
-   '(immutable? (contract (vector-immutable/c number? boolean?) 
-                          (vector->immutable-vector (vector 1 #t))
-                          'pos
-                          'neg))
-   #t)
-
-  (test/pos-blame
-   'box-immutable1
-   '(contract (box-immutable/c (number? . -> . boolean?)) 
-              #f
-              'pos
-              'neg))
-  
-  (test/pos-blame
-   'box-immutable2
-   '(contract (box-immutable/c (number? . -> . boolean?)) 
-              (box (lambda (x) #t)) 
-              'pos
-              'neg))
-  
-  (test/neg-blame
-   'box-immutable3
-   '(let ([ctc (contract (box-immutable/c (number? . -> . boolean?)) 
-                         (box-immutable (lambda (x) #t))
-                         'pos
-                         'neg)])
-      ((unbox ctc) #f)))
-  
-  (test/pos-blame
-   'box-immutable4
-   '(let ([ctc (contract (box-immutable/c (number? . -> . boolean?)) 
-                         (box-immutable (lambda (x) 1))
-                         'pos
-                         'neg)])
-      ((unbox ctc) 1)))
-  
-  (test/spec-passed
-   'box-immutable5
-   '(let ([ctc (contract (box-immutable/c (number? . -> . boolean?)) 
-                         (box-immutable (lambda (x) #t))
-                         'pos
-                         'neg)])
-      ((unbox ctc) 1)))
-
-  (test/spec-passed/result
-   'box-immutable6
-   '(contract (box-immutable/c boolean?) 
-              (box-immutable #t)
-              'pos
-              'neg)
-   (box-immutable #t))
-  
-  (test/spec-passed/result
-   'box-immutable7
-   '(immutable? (contract (box-immutable/c boolean?) 
-                          (box-immutable #t)
-                          'pos
-                          'neg))
-   #t)
-  
-  (test/pos-blame
-   'promise/c1
-   '(force (contract (promise/c boolean?)
-                     (delay 1)
-                     'pos
-                     'neg)))
-  
-  (test/spec-passed
-   'promise/c2
-   '(force (contract (promise/c boolean?)
-                     (delay #t)
-                     'pos
-                     'neg)))
-  
-  (test/spec-passed/result
-   'promise/c3
-   '(let ([x 0])
-      (contract (promise/c any/c)
-                (delay (set! x (+ x 1)))
-                'pos
-                'neg)
-      x)
-   0)
-  
-  (test/spec-passed/result
-   'promise/c4
-   '(let ([x 0])
-      (force (contract (promise/c any/c)
-                       (delay (set! x (+ x 1)))
-                       'pos
-                       'neg))
-      x)
-   1)
-  
-  (test/spec-passed/result
-   'promise/c5
-   '(let ([x 0])
-      (let ([p (contract (promise/c any/c)
-                         (delay (set! x (+ x 1)))
-                         'pos
-                         'neg)])
-        (force p)
-        (force p))
-      x)
-   1)
-  
-  (test/pos-blame 
-   'syntax/c1
-   '(contract (syntax/c boolean?)
-              #'x
-              'pos
-              'neg))
-  
-  (test/spec-passed
-   'syntax/c2
-   '(contract (syntax/c symbol?)
-              #'x
-              'pos
-              'neg))
-  
-  (test/spec-passed
-   'struct/c1
-   '(let ()
-      (define-struct s (a))
-      (contract (struct/c s integer?)
-                (make-s 1)
-                'pos
-                'neg)))
-  
-  (test/pos-blame
-   'struct/c2
-   '(let ()
-      (define-struct s (a))
-      (contract (struct/c s integer?)
-                (make-s #f)
-                'pos
-                'neg)))
-  
-  (test/pos-blame
-   'struct/c3
-   '(let ()
-      (define-struct s (a))
-      (contract (struct/c s integer?)
-                1
-                'pos
-                'neg)))
-  
-  (test/spec-passed
-   'struct/c4
-   '(let ()
-      (define-struct s (a b))
-      (contract (struct/c s integer? (struct/c s integer? boolean?))
-                (make-s 1 (make-s 2 #t))
-                'pos
-                'neg)))
-  
-  (test/pos-blame
-   'struct/c5
-   '(let ()
-      (define-struct s (a b))
-      (contract (struct/c s integer? (struct/c s integer? boolean?))
-                (make-s 1 (make-s 2 3))
-                'pos
-                'neg)))
-
-  (test/spec-passed
-   'recursive-contract1
-   '(letrec ([ctc (-> integer? (recursive-contract ctc))])
-      (letrec ([f (λ (x) f)])
-        ((((contract ctc f 'pos 'neg) 1) 2) 3))))
-  
-  (test/neg-blame
-   'recursive-contract2
-   '(letrec ([ctc (-> integer? (recursive-contract ctc))])
-      (letrec ([f (λ (x) f)])
-        ((contract ctc f 'pos 'neg) #f))))
-  
-  (test/neg-blame
-   'recursive-contract3
-   '(letrec ([ctc (-> integer? (recursive-contract ctc))])
-      (letrec ([f (λ (x) f)])
-        ((((contract ctc f 'pos 'neg) 1) 2) #f))))
-  
-  (test/pos-blame
-   'recursive-contract4
-   '(letrec ([ctc (-> integer? (recursive-contract ctc))])
-      (letrec ([c 0]
-               [f (λ (x) 
-                    (set! c (+ c 1))
-                    (if (= c 2)
-                        'nope
-                        f))])
-        ((((contract ctc f 'pos 'neg) 1) 2) 3))))
-  
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;; define-contract-struct tests
-  ;;
-  
-  (contract-eval '(define-contract-struct couple (hd tl)))
-  
-  (test/spec-passed
-   'd-c-s-match1
-   '(begin
-      (eval '(module d-c-s-match1 mzscheme
-               (require mzlib/contract
-                        mzlib/match)
-               
-               (define-contract-struct foo (bar baz))
-               
-               (match (make-foo #t #f)
-                 [($ foo bar baz) #t]
-                 [_ #f])))
-      (eval '(require 'd-c-s-match1))))
-  
-  (test/spec-passed/result
-   'd-c-s-match2
-   '(begin
-      (eval '(module d-c-s-match2 mzscheme
-               (require mzlib/contract
-                        mzlib/match)
-               
-               (define-contract-struct foo (bar baz))
-               
-               (provide d-c-s-match2-f1)
-               (define d-c-s-match2-f1
-                 (match (make-foo 'first 'second)
-                   [($ foo bar baz) (list bar baz)]
-                   [_ #f]))))
-      (eval '(require 'd-c-s-match2))
-      (eval 'd-c-s-match2-f1))
-   '(first second))
-   
-
-  
-  (test/pos-blame 'd-c-s1
-                  '(begin
-                     (eval '(module d-c-s1 mzscheme
-                              (require mzlib/contract)
-                              (define-contract-struct couple (hd tl))
-                              (contract (couple/c any/c any/c) 1 'pos 'neg)))
-                     (eval '(require 'd-c-s1))))
-  
-  (test/spec-passed 'd-c-s2
-                    '(contract (couple/c any/c any/c) (make-couple 1 2) 'pos 'neg))
-  (test/spec-passed 'd-c-s3
-                    '(contract (couple/c number? number?)
-                               (make-couple 1 2)
-                               'pos 'neg))
-  (test/spec-passed 'd-c-s4
-                    '(couple-hd 
-                      (contract (couple/c number? number?)
-                                (make-couple 1 2)
-                                'pos 'neg)))
-  (test/spec-passed 'd-c-s5
-                    '(couple-tl
-                      (contract (couple/c number? number?)
-                                (make-couple 1 2)
-                                'pos 'neg)))
-  
-
-  (test/pos-blame 
-   'd-c-s6 
-   '(couple-tl
-     (contract (couple/c number?
-                         number?)
-               (make-couple #f 2)
-               'pos 'neg)))
-  (test/pos-blame
-   'd-c-s7
-   '(couple-hd
-     (contract (couple/c number? number?)
-               (make-couple #f 2)
-               'pos 'neg)))
-  
-  (test/pos-blame 
-   'd-c-s8
-   '(contract (couple/dc [hd any/c] [tl any/c])
-              1
-              'pos 'neg))
-  
-  (test/pos-blame 
-   'd-c-s9
-   '(contract (couple/dc [hd () any/c] [tl () any/c])
-              1
-              'pos 'neg))
-
-  
-  (test/spec-passed 'd-c-s10
-                    '(contract (couple/dc [hd any/c] [tl any/c])
-                               (make-couple 1 2)
-                               'pos 'neg))
-  (test/spec-passed 'd-c-s11
-                    '(contract (couple/dc [hd () any/c] [tl () any/c]) 
-                               (make-couple 1 2)
-                               'pos 'neg))
-  
-  (test/spec-passed 'd-c-s12
-                    '(contract (couple/dc [hd number?]
-                                          [tl number?])
-                               (make-couple 1 2)
-                               'pos 'neg))
-  (test/spec-passed 'd-c-s13
-                    '(couple-hd 
-                      (contract (couple/dc [hd number?]
-                                           [tl number?])
-                                (make-couple 1 2)
-                                'pos 'neg)))
-  (test/spec-passed 'd-c-s14
-                    '(couple-tl
-                      (contract (couple/dc [hd number?]
-                                           [tl number?])
-                                (make-couple 1 2)
-                                'pos 'neg)))
-  
-  
-  (test/pos-blame 
-   'd-c-s15
-   '(couple-hd
-     (contract (couple/dc [hd number?]
-                          [tl number?])
-               (make-couple #f 2)
-               'pos 'neg)))
-  
-  (test/pos-blame
-   'd-c-s16
-   '(couple-tl
-     (contract (couple/dc [hd number?]
-                          [tl number?])
-               (make-couple #f 2)
-               'pos 'neg)))
-
-  (test/spec-passed
-   'd-c-s17
-   '(couple-hd
-     (contract (couple/dc [hd number?]
-                          [tl (hd) (>=/c hd)])
-               (make-couple 1 2)
-               'pos 'neg)))
-
-  (test/pos-blame
-   'd-c-s18
-   '(couple-hd
-     (contract (couple/dc [hd number?]
-                          [tl (hd) (>=/c hd)])
-               (make-couple 2 1)
-               'pos 'neg)))
-  
-  (test/spec-passed
-   'd-c-s19
-   '(couple-tl
-     (couple-tl
-      (contract (couple/dc [hd number?]
-                           [tl (hd)
-                               (let ([hd1 hd])
-                                 (couple/dc [hd (>=/c hd1)]
-                                            [tl (hd) (>=/c hd)]))])
-                (make-couple 1 (make-couple 2 3))
-                'pos 'neg))))
-  
-  (test/pos-blame
-   'd-c-s20
-   '(couple-tl
-     (couple-tl
-      (contract (couple/dc [hd number?]
-                           [tl (hd)
-                               (let ([hd1 hd])
-                                 (couple/dc [hd (>=/c hd1)]
-                                            [tl (hd) (>=/c hd1)]))])
-                (make-couple 1 (make-couple 2 0))
-                'pos 'neg))))
-  
-  (test/spec-passed
-   'd-c-s21
-   '(couple-hd
-     (contract (couple/dc [hd number?]
-                          [tl number?])
-               (contract (couple/dc [hd number?]
-                                    [tl number?])
-                         (make-couple 1 2)
-                         'pos 'neg)
-               'pos 'neg)))
-  
-  (test/spec-passed
-   'd-c-s22
-   '(couple-hd
-     (contract (couple/dc [hd (>=/c 0)]
-                          [tl (>=/c 0)])
-               (contract (couple/dc [hd number?]
-                                    [tl number?])
-                         (make-couple 1 2)
-                         'pos 'neg)
-               'pos 'neg)))
-  
-  (test/pos-blame
-   'd-c-s23
-   '(couple-hd
-     (contract (couple/dc [hd (>=/c 0)]
-                          [tl (>=/c 0)])
-               (contract (couple/dc [hd number?]
-                                    [tl number?])
-                         (make-couple -1 2)
-                         'pos 'neg)
-               'pos 'neg)))
-  
-   (test/pos-blame
-    'd-c-s24
-    '(couple-hd
-      (contract (couple/dc [hd number?]
-                           [tl number?])
-                (contract (couple/dc [hd (>=/c 0)]
-                                     [tl (>=/c 0)])
-                          (make-couple -1 2)
-                          'pos 'neg)
-                'pos 'neg)))
-  
-   (test/pos-blame
-    'd-c-s25
-    '(couple-hd
-      (contract (couple/dc [hd number?]
-                           [tl number?])
-                (contract (couple/dc [hd number?]
-                                     [tl number?])
-                          (contract (couple/dc [hd (>=/c 0)]
-                                               [tl (>=/c 0)])
-                                    (make-couple -1 2)
-                                    'pos 'neg)
-                          'pos 'neg)
-                'pos 'neg)))
-  
-   (test/pos-blame
-    'd-c-s26
-    '(couple-hd
-      (contract (couple/dc [hd (>=/c 10)]
-                           [tl (>=/c 10)])
-                (contract (couple/dc [hd positive?]
-                                     [tl positive?])
-                          (contract (couple/dc [hd number?]
-                                               [tl number?])
-                                    (make-couple 1 2)
-                                    'pos 'neg)
-                          'pos 'neg)
-                'pos 'neg)))
-  
-
-  ;; test caching
-  (test/spec-passed 
-   'd-c-s27
-   '(let ([ctc (couple/c any/c any/c)])
-      (couple-hd (contract ctc (contract ctc (make-couple 1 2) 'pos 'neg) 'pos 'neg))))
-
-  ;; make sure lazy really is lazy
-  (test/spec-passed
-   'd-c-s28
-   '(contract (couple/c number? number?)
-              (make-couple #f #f)
-              'pos 'neg))
-  
-  (test/spec-passed
-   'd-c-s29
-   '(couple-hd
-     (contract (couple/c (couple/c number? number?)
-                         (couple/c number? number?))
-               (make-couple (make-couple #f #f)
-                            (make-couple #f #f))
-               'pos 'neg)))
-  
-  (test/spec-passed
-   'd-c-s30
-   '(couple-tl
-     (contract (couple/c (couple/c number? number?)
-                         (couple/c number? number?))
-               (make-couple (make-couple #f #f)
-                            (make-couple #f #f))
-               'pos 'neg)))
-  
-  ;; make sure second accesses work
-  (test/spec-passed/result
-   'd-c-s31
-   '(let ([v (contract (couple/c number? number?)
-                       (make-couple 1 2)
-                       'pos 'neg)])
-      (list (couple-hd v) (couple-hd v)))
-   (list 1 1))
-  
-  (test/pos-blame
-   'd-c-s32
-   '(let ([v (contract (couple/c number? boolean?)
-                       (make-couple 1 2)
-                       'pos 'neg)])
-      (with-handlers ([void void]) (couple-hd v))
-      (couple-hd v)))
-  
-  (test/pos-blame
-   'd-c-s33
-   '(let ([v (contract (couple/c number? number?)
-                       (make-couple 1 2)
-                       'pos 'neg)])
-      (couple-hd v)
-      (couple-hd v)
-      (couple-hd
-       (contract (couple/c boolean? boolean?)
-                 v
-                 'pos 'neg))))
-
-  (contract-eval '(define-contract-struct single (a)))
-  ;; a related test to the above:
-  (test/spec-passed/result
-   'd-c-s34
-   '(let ([v (contract (single/c number?) (make-single 1) 'pos 'neg)])
-      (single-a v)
-      (let ([v3 (contract (single/c number?) v 'pos 'neg)])
-        (single-a v3)))
-   1)
-  
-  ;; make sure the caching doesn't break the semantics
-  (test/pos-blame
-   'd-c-s35
-   '(let ([v (contract (couple/c any/c
-                                 (couple/c any/c
-                                           (couple/c any/c
-                                                     number?)))
-                       (make-couple 1
-                                    (make-couple 2
-                                                 (make-couple 3
-                                                              #f)))
-                       'pos 'neg)])
-      (let* ([x (couple-tl v)]
-             [y (couple-tl x)])
-        (couple-hd (couple-tl x)))))
-  
-  (test/spec-passed/result
-   'd-c-s36
-   '(let ([x (make-couple 1 2)]
-          [y (make-couple 1 2)]
-          [c1 (couple/dc [hd any/c]
-                         [tl (hd) any/c])]
-          [c2 (couple/c any/c any/c)])
-      (couple-hd (contract c1 x 'pos 'neg))
-      (couple-hd (contract c2 x 'pos 'neg))
-      (couple-hd (contract c2 y 'pos 'neg))
-      (couple-hd (contract c1 y 'pos 'neg)))
-   1)
-  
-  ;; make sure that define-contract-struct contracts can go at the top level
-  (test/spec-passed
-   'd-c-s37
-   '(contract-stronger?
-     (couple/dc [hd any/c]
-                [tl (hd) any/c])
-     (couple/dc [hd any/c]
-                [tl (hd) any/c])))
-  
-  ;; test functions inside structs
-  
-  (test/spec-passed/result
-   'd-c-s38
-   '(let ([x (make-couple (lambda (x) x) (lambda (x) x))]
-          [c (couple/dc [hd (-> integer? integer?)]
-                        [tl (hd) any/c])])
-      ((couple-hd (contract c x 'pos 'neg)) 1))
-   1)
-  
-  (test/neg-blame
-   'd-c-s39
-   '(let ([x (make-couple (lambda (x) x) (lambda (x) x))]
-          [c (couple/dc [hd (-> integer? integer?)]
-                        [tl (hd) any/c])])
-      ((couple-hd (contract c x 'pos 'neg)) #f)))
-  
-  (test/pos-blame
-   'd-c-s40
-   '(let ([x (make-couple (lambda (x) #f) (lambda (x) #f))]
-          [c (couple/dc [hd (-> integer? integer?)]
-                        [tl (hd) any/c])])
-      ((couple-hd (contract c x 'pos 'neg)) 1)))
-  
-  (test/spec-passed/result
-   'd-c-s41
-   '(let ([x (make-couple 5 (lambda (x) x))]
-          [c (couple/dc [hd number?]
-                        [tl (hd) (-> (>=/c hd) (>=/c hd))])])
-      ((couple-tl (contract c x 'pos 'neg)) 6))
-   6)
-  
-  (test/pos-blame
-   'd-c-s42
-   '(let ([x (make-couple 5 (lambda (x) -10))]
-          [c (couple/dc [hd number?]
-                        [tl (hd) (-> (>=/c hd) (>=/c hd))])])
-      ((couple-tl (contract c x 'pos 'neg)) 6)))
-  
-  (test/neg-blame
-   'd-c-s42
-   '(let ([x (make-couple 5 (lambda (x) -10))]
-          [c (couple/dc [hd number?]
-                        [tl (hd) (-> (>=/c hd) (>=/c hd))])])
-      ((couple-tl (contract c x 'pos 'neg)) -11)))
-  
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;;  testing define-opt/c
-  ;;
-  
-  (contract-eval '(define-contract-struct node (val obj rank left right) (make-inspector)))
-  (contract-eval '(define (compute-rank n)
-                    (if n 
-                        (node-rank n)
-                        0)))
-  
-  (contract-eval '(define-opt/c (leftist-heap-greater-than/rank/opt n r)
-                    (or/c not
-                          (node/dc [val (>=/c n)]
-                                   [obj any/c]
-                                   [rank (<=/c r)]
-                                   [left (val) (leftist-heap-greater-than/rank/opt val +inf.0)]
-                                   [right (val left) (leftist-heap-greater-than/rank/opt val (compute-rank left))]))))
-  
-  (contract-eval '(define leftist-heap/c (leftist-heap-greater-than/rank/opt -inf.0 +inf.0)))
-  
-  (test/pos-blame 'd-o/c1 '(contract leftist-heap/c 2 'pos 'neg))
-  
-  
-  (test/spec-passed 'd-o/c2 '(contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg))
-  (test/spec-passed 'd-o/c3 '(contract leftist-heap/c #f 'pos 'neg))
-  (test/spec-passed 'd-o/c4 '(contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg))
-  (test/spec-passed/result 'd-o/c5
-                           '(node? (contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg))
-                           #t)
-  
-  (test/spec-passed/result 'd-o/c6 '(node-val (contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg)) 1)
-  (test/spec-passed/result 'd-o/c7 '(node-obj (contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg)) 2)
-  (test/spec-passed/result 'd-o/c8 '(node-rank (contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg)) 3)
-  (test/spec-passed/result 'd-o/c9 '(node-left (contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg)) #f)
-  (test/spec-passed/result 'd-o/c10 '(node-right (contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg)) #f)
-  
-  (test/spec-passed/result 'd-o/c11
-                           '(node-val (contract leftist-heap/c 
-                                                (contract leftist-heap/c 
-                                                          (make-node 1 2 3 #f #f)
-                                                          'pos 'neg)
-                                                'pos 'neg))
-                           1)
-  (test/spec-passed/result 'd-o/c12
-                           '(node-obj (contract leftist-heap/c 
-                                                (contract leftist-heap/c 
-                                                          (make-node 1 2 3 #f #f)
-                                                          'pos 'neg)
-                                                'pos 'neg))
-                           2)
-  (test/spec-passed/result 'd-o/c13
-                           '(node-rank (contract leftist-heap/c 
-                                                 (contract leftist-heap/c 
-                                                           (make-node 1 2 3 #f #f)
-                                                           'pos 'neg)
-                                                 'pos 'neg))
-                           3)
-  (test/spec-passed/result 'd-o/c14
-                           '(node-left (contract leftist-heap/c 
-                                                 (contract leftist-heap/c 
-                                                           (make-node 1 2 3 #f #f)
-                                                           'pos 'neg)
-                                                 'pos 'neg)) 
-                           #f)
-  (test/spec-passed/result 'd-o/c15
-                           '(node-right (contract leftist-heap/c 
-                                                  (contract leftist-heap/c 
-                                                            (make-node 1 2 3 #f #f)
-                                                            'pos 'neg)
-                                                  'pos 'neg))
-                           #f)
-  
-  (test/spec-passed/result 'd-o/c16
-                           '(let ([h (contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg)])
-                              (node-val h)
-                              (node-val h))
-                           1)
-  (test/spec-passed/result 'd-o/c17
-                           '(let ([h (contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg)])
-                              (node-obj h)
-                              (node-obj h))
-                           2)
-  
-  (test/spec-passed/result 'd-o/c18
-                           '(let ([h (contract leftist-heap/c (make-node 1 2 3 #f #f)'pos 'neg)])
-                              (node-rank h)
-                              (node-rank h))
-                           3)
-  (test/spec-passed/result 'd-o/c19
-                           '(let ([h (contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg)])
-                              (node-left h)
-                              (node-left h))
-                           #f)
-  (test/spec-passed/result 'd-o/c20
-                           '(let ([h (contract leftist-heap/c (make-node 1 2 3 #f #f) 'pos 'neg)])
-                              (node-right h)
-                              (node-right h))
-                           #f)
-  
-  (test/spec-passed/result 'd-o/c21
-                           '(node-val
-                             (node-right
-                              (contract leftist-heap/c 
-                                        (make-node 1 2 3 
-                                                   (make-node 7 8 9 #f #f)
-                                                   (make-node 4 5 6 #f #f))
-                                        'pos 'neg)))
-                           4)
-  (test/spec-passed/result 'd-o/c22
-                           '(node-val
-                             (node-left
-                              (contract leftist-heap/c 
-                                        (make-node 1 2 3 
-                                                   (make-node 7 8 9 #f #f)
-                                                   (make-node 4 5 6 #f #f))
-                                        'pos 'neg)))
-                           7)
-  
-  (test/pos-blame 'd-o/c23
-                  '(node-val
-                    (node-right
-                     (contract leftist-heap/c 
-                               (make-node 5 2 3 
-                                          (make-node 7 8 9 #f #f)
-                                          (make-node 4 5 6 #f #f))
-                               'pos 'neg))))
-  
-  (test/pos-blame 'd-o/c24
-                  '(node-val
-                    (node-left
-                     (contract leftist-heap/c 
-                               (make-node 9 2 3 
-                                          (make-node 7 8 9 #f #f)
-                                          (make-node 11 5 6 #f #f))
-                               'pos 'neg))))
-  
-  (test/neg-blame 'd-o/c25
-                  '((contract (-> leftist-heap/c any)
-                              (λ (kh)
-                                (node-val
-                                 (node-left
-                                  kh)))
-                              'pos 'neg)
-                    (make-node 9 2 3 
-                               (make-node 7 8 9 #f #f)
-                               (make-node 11 5 6 #f #f))))
-  
-  
-  
-  (test/spec-passed/result
-   'd-o/c26 
-   '(let ([ai (λ (x) (contract leftist-heap/c x 'pos 'neg))])
-      (define (remove-min t) (merge (node-left t) (node-right t)))
-      
-      (define (merge t1 t2)
-        (cond
-          [(not t1) t2]
-          [(not t2) t1]
-          [#t
-           (let ([t1-val (node-val t1)]
-                 [t2-val (node-val t2)])
-             (cond
-               [(<= t1-val t2-val)
-                (pick t1-val 
-                      (node-obj t1)
-                      (node-left t1)
-                      (merge (node-right t1)
-                             t2))]
-               [#t
-                (pick t2-val 
-                      (node-obj t2)
-                      (node-left t2)
-                      (merge t1
-                             (node-right t2)))]))]))
-      
-      (define (pick x obj a b)
-        (let ([ra (compute-rank a)]
-              [rb (compute-rank b)])
-          (cond
-            [(>= ra rb)
-             (make-node x obj (+ rb 1) a b)]
-            [#t
-             (make-node x obj (+ ra 1) b a)])))
-      (node-val
-       (remove-min (ai (make-node 137 'x 1 
-                                  (ai (make-node 178 'y 1 
-                                                 (make-node 178 'z 1 #f #f)
-                                                 #f))
-                                  #f)))))
-   178)
-  
-  ;;
-  ;;  end of define-opt/c
-  ;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; NOT YET RELEASED
-  #;
-  (test/pos-blame
-   'd-c-s/attr-1
-   '(let ()
-      (define-contract-struct pr (x y))
-      (pr-x
-       (contract (pr/dc [x integer?]
-                        [y integer?]
-                        where
-                        [x-val x]
-                        [y-val y]
-                        and
-                        (= x-val y-val))
-                 (make-pr 4 5)
-                 'pos
-                 'neg))))
-  
-  ;; NOT YET RELEASED
-  #;
-  (test/spec-passed
-   'd-c-s/attr-2
-   '(let ()
-      (define-contract-struct pr (x y))
-      (contract (pr/dc [x integer?]
-                       [y integer?]
-                       where
-                       [x-val x]
-                       [y-val y]
-                       and
-                       (= x-val y-val))
-                (make-pr 4 5)
-                'pos
-                'neg)))
-  
-  ;; NOT YET RELEASED
-  #;
-  (let ()
-    (define-contract-struct node (n l r) (make-inspector))
-    
-    (define (get-val n attr)
-      (if (null? n)
-          1
-          (let ([h (synthesized-value n attr)])
-            (if (unknown? h)
-                h
-                (+ h 1)))))
-    
-    (define (full-bbt lo hi)
-      (or/c null?
-            (node/dc [n (between/c lo hi)]
-                     [l (n) (full-bbt lo n)]
-                     [r (n) (full-bbt n hi)]
-                     
-                     where
-                     [lheight (get-val l lheight)]
-                     [rheight (get-val r rheight)]
-                     
-                     and
-                     (<= 0 (- lheight rheight) 1))))
-    
-    (define t (contract (full-bbt -inf.0 +inf.0)
-                        (make-node 0
-                                   (make-node -1 null null) 
-                                   (make-node 2
-                                              (make-node 1 null null) 
-                                              (make-node 3 null null)))
-                        'pos
-                        'neg))
-    (test/spec-passed
-     'd-c-s/attr-3
-     `(,node-l (,node-l ,t)))
-     
-    (test/pos-blame 
-     'd-c-s/attr-4
-     `(,node-r (,node-r (,node-r ,t)))))
-
-  ;; NOT YET RELEASED
-  #|
-
-need a test that will revisit a node a second time (when it already has a wrapper)
-with a new parent. make sure the new parent is recorded in the parents field
-so that propagation occurs.
-
-|#
-  
-  
-  ;; test the predicate
-  (ctest #t couple? (contract (couple/c any/c any/c) (make-couple 1 2) 'pos 'neg))
-  (ctest #t couple? (make-couple 1 2))
-  (ctest #t couple? (contract (couple/dc [hd any/c] [tl (hd) any/c]) (make-couple 1 2) 'pos 'neg))
-  (ctest #f couple? 1)
-  (ctest #f couple? #f)
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;                                                        ;;
-  ;;   Flat Contract Tests                                  ;;
-  ;;                                                        ;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (ctest #t flat-contract? (or/c))
-  (ctest #t flat-contract? (or/c integer? (lambda (x) (> x 0))))
-  (ctest #t flat-contract? (or/c (flat-contract integer?) (flat-contract boolean?)))
-  (ctest #t flat-contract? (or/c integer? boolean?))
-  (test-flat-contract '(or/c (flat-contract integer?) char?) #\a #t)
-  (test-flat-contract '(or/c (flat-contract integer?) char?) 1 #t)
-  
-  (ctest #t flat-contract? (and/c))
-  (ctest #t flat-contract? (and/c number? integer?))
-  (ctest #t flat-contract? (and/c (flat-contract number?)
-				 (flat-contract integer?)))
-  (ctest #t flat-contract? (let ()
-                            (define-struct s (a b))
-                            (struct/c s any/c any/c)))
-  
-  (test-flat-contract '(and/c number? integer?) 1 3/2)
-
-  (test-flat-contract '(not/c integer?) #t 1)
-  (test-flat-contract '(=/c 2) 2 3)
-  (test-flat-contract '(>=/c 5) 5 0)
-  (test-flat-contract '(<=/c 5) 5 10)
-  (test-flat-contract '(</c 5) 0 5)
-  (test-flat-contract '(>/c 5) 10 5)
-  (test-flat-contract '(integer-in 0 10) 0 11)
-  (test-flat-contract '(integer-in 0 10) 10 3/2)
-  (test-flat-contract '(integer-in 0 10) 1 1.0)
-  (test-flat-contract '(real-in 1 10) 3/2 20)
-  (test-flat-contract '(string/len 3) "ab" "abc")
-  (test-flat-contract 'natural-number/c 5 -1)
-  (test-flat-contract 'false/c #f #t)
-  (test/spec-passed 'any/c '(contract any/c 1 'pos 'neg))
-  (test-flat-contract 'printable/c (vector (cons 1 (box #f))) (lambda (x) x))
-  (test-flat-contract '(symbols 'a 'b 'c) 'a 'd)
-  (test-flat-contract '(one-of/c (expt 2 65)) (expt 2 65) 12)
-  (test-flat-contract '(one-of/c '#:x '#:z) '#:x '#:y)
-  
-  (let ([c% (contract-eval '(class object% (super-new)))])
-    (test-flat-contract `(subclass?/c ,c%) c% (contract-eval `object%))
-    (test-flat-contract `(subclass?/c ,c%) (contract-eval `(class ,c%)) (contract-eval `(class object%))))
-  
-  (let ([i<%> (contract-eval '(interface ()))])
-    (test-flat-contract `(implementation?/c ,i<%>) 
-                        (contract-eval `(class* object% (,i<%>) (super-new)))
-                        (contract-eval 'object%))
-    (test-flat-contract `(implementation?/c ,i<%>) 
-                        (contract-eval `(class* object% (,i<%>) (super-new)))
-                        #f))
-  
-  (let ([i<%> (contract-eval '(interface ()))]
-        [c% (contract-eval '(class object% (super-new)))])
-    (test-flat-contract `(is-a?/c ,i<%>) 
-                        (contract-eval `(new (class* object% (,i<%>) (super-new))))
-                        (contract-eval '(new object%)))
-    (test-flat-contract `(is-a?/c ,c%)
-                        (contract-eval `(new ,c%))
-                        (contract-eval '(new object%))))
-  
-  (test-flat-contract '(listof boolean?) (list #t #f) (list #f 3 #t))
-  (test-flat-contract '(listof any/c) (list #t #f) 3)
-  
-  (test-flat-contract '(vectorof boolean?) (vector #t #f) (vector #f 3 #t))
-  (test-flat-contract '(vectorof any/c) (vector #t #f) 3)
-  
-  (test-flat-contract '(vector/c boolean? (flat-contract integer?)) (vector #t 1) (vector 1 #f))
-  (test-flat-contract '(vector/c boolean? (flat-contract integer?)) (vector #t 1) #f)
-
-  (test-flat-contract '(cons/c boolean? (flat-contract integer?)) (cons #t 1) (cons 1 #f))
-  (test-flat-contract '(cons/c boolean? (flat-contract integer?)) (cons #t 1) #f)
-  (test-flat-contract '(list/c boolean? (flat-contract integer?)) (list #t 1) (list 1 #f))
-  (test-flat-contract '(list/c boolean? (flat-contract integer?)) (list #t 1) #f)
-
-  (contract-eval '(define (a-predicate-that-wont-be-optimized x) (boolean? x)))
-  (test-flat-contract '(cons/c a-predicate-that-wont-be-optimized (flat-contract integer?)) (cons #t 1) (cons 1 #f))
-  (test-flat-contract '(cons/c a-predicate-that-wont-be-optimized (flat-contract integer?)) (cons #t 1) #f)
-  (test-flat-contract '(list/c a-predicate-that-wont-be-optimized (flat-contract integer?)) (list #t 1) (list 1 #f))
-  (test-flat-contract '(list/c a-predicate-that-wont-be-optimized (flat-contract integer?)) (list #t 1) #f)
-
-  (test-flat-contract '(box/c boolean?) (box #f) (box 1))
-  (test-flat-contract '(box/c (flat-contract boolean?)) (box #t) #f)
-  
-  (test-flat-contract '(flat-rec-contract sexp (cons/c sexp sexp) number?) '(1 2 . 3) '(1 . #f))
-  (test-flat-contract '(flat-murec-contract ([even1 (or/c null? (cons/c number? even2))] 
-                                             [even2 (cons/c number? even1)])
-                                            even1)
-                      '(1 2 3 4)
-                      '(1 2 3))
-  (test #t 'malformed-binder
-        (with-handlers ((exn? exn:fail:syntax?)) 
-          (contract-eval '(flat-murec-contract ([(x) y]) x))
-          'no-err))
-  (test #t 'missing-body 
-        (with-handlers ((exn? exn:fail:syntax?)) 
-          (contract-eval '(flat-murec-contract ([x y])))
-          'no-err))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;                                                        ;;
-  ;;   case-> arity checking tests                          ;;
-  ;;                                                        ;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (test/well-formed '(case-> (-> integer? integer?)))
-  (test/well-formed '(case-> (-> integer? integer?) (-> integer? integer? integer?)))
-  (test/well-formed '(case-> (-> integer? integer?) (-> integer? integer? any)))
-  (test/well-formed '(case-> (-> integer? any) (-> integer? integer? any)))
-  
-  (test/well-formed '(case-> (->d (lambda x any/c)) (-> integer? integer?)))
-
-  (test/well-formed '(case-> (->* (any/c any/c) (integer?)) (-> integer? integer?)))
-  (test/well-formed '(case-> (->* (any/c any/c) any/c (integer?)) (-> integer? integer?)))
-  (test/well-formed '(case-> (->* (any/c any/c) any/c any) (-> integer? integer?)))
-  
-  (test/well-formed '(case-> (->d* (any/c any/c) (lambda x any/c)) (-> integer? integer?)))
-  (test/well-formed '(case-> (->d* (any/c any/c) any/c (lambda x any/c)) (-> integer? integer?)))
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;                                                        ;;
-  ;;   Inferred Name Tests                                  ;;
-  ;;                                                        ;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-  (contract-eval 
-   '(module contract-test-suite-inferred-name1 mzscheme
-      (require mzlib/contract)
-      (define contract-inferred-name-test-contract (-> integer? any))
-      (define (contract-inferred-name-test x) #t)
-      (provide/contract (contract-inferred-name-test contract-inferred-name-test-contract))
-      
-      (define (contract-inferred-name-test2 x) x)
-      (provide/contract (contract-inferred-name-test2 (-> number? number?)))
-      
-      (define (contract-inferred-name-test2b x) (values x x))
-      (provide/contract (contract-inferred-name-test2b (-> number? (values number? number?))))
-      
-      (define (contract-inferred-name-test3 x . y) x)
-      (provide/contract (contract-inferred-name-test3 (->* (number?) (listof number?) (number?))))
-
-      (define contract-inferred-name-test4
-        (case-lambda [(x) x]
-                     [(x y) x]))
-      (provide/contract (contract-inferred-name-test4 (case-> (->* (number?) (number?))
-                                                              (-> integer? integer? integer?))))
-
-      (define contract-inferred-name-test5 (case-lambda [(x) x] [(x y) x]))
-      (provide/contract (contract-inferred-name-test5 (case-> (-> number? number?) 
-                                                              (-> number? number? number?))))
-
-      (define contract-inferred-name-test6 (case-lambda [(x) x]
-                                                        [(x y) y]))
-      (provide/contract (contract-inferred-name-test6 (opt-> (number?) (number?) number?)))
-      
-      (define contract-inferred-name-test7 (case-lambda [(x) (values x x)]
-                                                        [(x y) (values y y)]))
-      (provide/contract (contract-inferred-name-test7 (opt->* (number?) (number?) (number? number?))))))
-  (contract-eval '(require 'contract-test-suite-inferred-name1))
-  ;; (eval '(test 'contract-inferred-name-test object-name contract-inferred-name-test)) ;; this one can't be made to pass, sadly.
-  (test 'contract-inferred-name-test2 object-name (contract-eval 'contract-inferred-name-test2))
-  (test 'contract-inferred-name-test2b object-name (contract-eval 'contract-inferred-name-test2b))
-  (test 'contract-inferred-name-test3 object-name (contract-eval 'contract-inferred-name-test3))
-  (test 'contract-inferred-name-test4 object-name (contract-eval 'contract-inferred-name-test4))
-  (test 'contract-inferred-name-test5 object-name (contract-eval 'contract-inferred-name-test5))
-  (test 'contract-inferred-name-test6 object-name (contract-eval 'contract-inferred-name-test6))
-  (test 'contract-inferred-name-test7 object-name (contract-eval 'contract-inferred-name-test7))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;                                                        ;;
-  ;;   Contract Name Tests                                  ;;
-  ;;                                                        ;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (test-name 'integer? (flat-contract integer?))
-  (test-name 'boolean? (flat-contract boolean?))
-  (test-name 'char? (flat-contract char?))
-  (test-name 'any/c any/c)
-  (test-name '(-> integer? integer?) (-> integer? integer?))
-  (test-name '(-> integer? any) (-> integer? any))
-  (test-name '(-> integer? (values boolean? char?)) (-> integer? (values boolean? char?)))
-  (test-name '(-> integer? boolean? (values char? any/c)) (->* (integer? boolean?) (char? any/c)))
-  (test-name '(-> integer? boolean? any) (->* (integer? boolean?) any))
-  (test-name '(->* (integer?) boolean? (char? any/c)) (->* (integer?) boolean? (char? any/c)))
-  (test-name '(->* (integer? char?) boolean? any) (->* (integer? char?) boolean? any))
-  (test-name '(->d integer? boolean? ...) (->d integer? boolean? (lambda (x y) char?)))
-  (test-name '(->d* (integer? boolean?) ...) (->d* (integer? boolean?) (lambda (x y) char?)))
-  (test-name '(->d* (integer? boolean?) any/c ...) (->d* (integer? boolean?) any/c (lambda (x y . z) char?)))
-  (test-name '(->r ((x ...)) ...) (->r ((x number?)) number?))
-  (test-name '(->r ((x ...) (y ...) (z ...)) ...) (->r ((x number?) (y boolean?) (z pair?)) number?))
-  (test-name '(->r ((x ...) (y ...) (z ...)) rest-x ... ...) 
-             (->r ((x number?) (y boolean?) (z pair?)) rest-x any/c number?))
-  (test-name '(->pp ((x ...)) ...) (->pp ((x number?)) #t number? blech #t))
-  
-  (test-name '(->r ((x ...)) ...) (case-> (->r ((x number?)) number?)))
-  (test-name '(case-> (->r ((x ...)) ...) (-> integer? integer? integer?))
-             (case-> (->r ((x number?)) number?) (-> integer? integer? integer?)))
-  (test-name '(->r ((x ...) (y ...) (z ...)) ...)
-             (case-> (->r ((x number?) (y boolean?) (z pair?)) number?)))
-  (test-name '(case-> (->r ((x ...) (y ...) (z ...)) ...)
-                      (-> integer? integer? integer?))
-             (case-> (->r ((x number?) (y boolean?) (z pair?)) number?)
-                     (-> integer? integer? integer?)))
-  (test-name '(case->) (case->))
-  
-  (test-name '(case-> (-> integer? integer?) (-> integer? integer? integer?))
-             (case-> (-> integer? integer?) (-> integer? integer? integer?)))
-
-  (test-name '(unconstrained-domain-> number?) (unconstrained-domain-> number?))
-  
-  (test-name '(or/c) (or/c))
-  (test-name '(or/c integer? gt0?) (or/c integer? (let ([gt0? (lambda (x) (> x 0))]) gt0?)))
-  (test-name '(or/c integer? boolean?)
-             (or/c (flat-contract integer?)
-                   (flat-contract boolean?)))
-  (test-name '(or/c integer? boolean?)
-             (or/c integer? boolean?))
-  (test-name '(or/c (-> (>=/c 5) (>=/c 5)) boolean?)
-             (or/c (-> (>=/c 5) (>=/c 5)) boolean?))
-  (test-name '(or/c boolean? (-> (>=/c 5) (>=/c 5)))
-             (or/c boolean? (-> (>=/c 5) (>=/c 5))))
-  (test-name '(or/c (-> (>=/c 5) (>=/c 5))
-                    (-> (<=/c 5) (<=/c 5) (<=/c 5)))
-             (or/c (-> (>=/c 5) (>=/c 5))
-                   (-> (<=/c 5) (<=/c 5) (<=/c 5))))
-  (test-name '(or/c boolean?
-                    (-> (>=/c 5) (>=/c 5))
-                    (-> (<=/c 5) (<=/c 5) (<=/c 5)))
-             (or/c boolean?
-                   (-> (>=/c 5) (>=/c 5))
-                   (-> (<=/c 5) (<=/c 5) (<=/c 5))))
-  
-  (test-name 'any/c (and/c))
-  (test-name '(and/c any/c) (and/c any/c))
-  (test-name '(and/c any/c any/c) (and/c any/c any/c))
-  (test-name '(and/c number? integer?) (and/c number? integer?))
-  (test-name '(and/c number? integer?) (and/c (flat-contract number?)
-                                              (flat-contract integer?)))
-  (test-name '(and/c number? (-> integer? integer?)) (and/c number? (-> integer? integer?)))
-  (test-name '(and/c (-> boolean? boolean?) (-> integer? integer?)) (and/c (-> boolean? boolean?) (-> integer? integer?)))
-
-  (test-name '(not/c integer?) (not/c integer?))
-  (test-name '(=/c 5) (=/c 5))
-  (test-name '(>=/c 5) (>=/c 5))
-  (test-name '(<=/c 5) (<=/c 5))
-  (test-name '(</c 5) (</c 5))
-  (test-name '(>/c 5) (>/c 5))
-  (test-name '(between/c 5 6) (between/c 5 6))
-  (test-name '(integer-in 0 10) (integer-in 0 10))
-  (test-name '(real-in 1 10) (real-in 1 10))
-  (test-name '(between/c 1 10) (between/c 1 10))
-  (test-name '(string-len/c 3) (string/len 3))
-  (test-name 'natural-number/c natural-number/c)
-  (test-name #f false/c)
-  (test-name 'printable/c printable/c)
-  (test-name '(or/c 'a 'b 'c) (symbols 'a 'b 'c))
-  (test-name '(or/c 1 2 3) (one-of/c 1 2 3))
-  (test-name '(or/c '() 'x 1 #f #\a void?)
-             (one-of/c '() 'x 1 #f #\a (void)))
-  
-  (test-name '(subclass?/c c%) 
-             (let ([c% (class object% (super-new))]) (subclass?/c c%)))
-  
-  (test-name '(implementation?/c i<%>) 
-             (let ([i<%> (interface ())])
-               (implementation?/c i<%>)))
-  
-  (test-name '(is-a?/c i<%>)
-             (let ([i<%> (interface ())])
-               (is-a?/c i<%>)))
-  (test-name '(is-a?/c c%) 
-             (let ([i<%> (interface ())]
-                   [c% (class object% (super-new))])
-               (is-a?/c c%)))
-  
-  (test-name '(listof boolean?) (listof boolean?))  
-  (test-name '(listof any/c) (listof any/c))
-  (test-name '(listof boolean?) (listof boolean?))
-  (test-name '(listof any/c) (listof any/c))
-  (test-name '(listof boolean?) (listof boolean?))
-  (test-name '(listof (-> boolean? boolean?)) (listof (-> boolean? boolean?)))
-  
-  (test-name '(vectorof boolean?) (vectorof boolean?))
-  (test-name '(vectorof any/c) (vectorof any/c))
-  
-  (test-name '(vector/c boolean? integer?) (vector/c boolean? integer?))
-  (test-name '(vector/c boolean? integer?) (vector/c boolean? (flat-contract integer?)))
-
-  (test-name '(cons/c boolean? integer?) (cons/c boolean? (flat-contract integer?)))
-  (test-name '(cons/c boolean? integer?) (cons/c boolean? (flat-contract integer?)))
-  (test-name '(list/c boolean? integer?) (list/c boolean? (flat-contract integer?)))
-  (test-name '(list/c boolean? integer?) (list/c boolean? (flat-contract integer?)))
-
-  (test-name '(cons/c boolean? integer?) (cons/c boolean? (flat-contract integer?)))
-  (test-name '(cons/c boolean? integer?) (cons/c boolean? (flat-contract integer?)))
-  (test-name '(cons/c boolean? integer?) (cons/c boolean? (flat-contract integer?)))
-  (test-name '(cons/c (-> boolean? boolean?) integer?) (cons/c (-> boolean? boolean?) integer?))
-  
-  (test-name '(list/c boolean? integer?)
-             (list/c boolean? (flat-contract integer?)))
-  (test-name '(list/c boolean? integer?) 
-             (list/c boolean? (flat-contract integer?)))
-  (test-name '(list/c boolean? integer?)
-             (list/c boolean? (flat-contract integer?)))
-  (test-name '(list/c (-> boolean? boolean?) integer?)
-             (list/c (-> boolean? boolean?) integer?))
-  
-  (test-name '(parameter/c integer?) (parameter/c integer?))
-  
-  (test-name '(box/c boolean?) (box/c boolean?))
-  (test-name '(box/c boolean?) (box/c (flat-contract boolean?)))
-  (test-name 'the-name (flat-rec-contract the-name))
-
-  (test-name '(object-contract) (object-contract))
-  (test-name '(object-contract (field x integer?)) (object-contract (field x integer?)))
-  (test-name '(object-contract (m (-> integer? integer?)))
-             (object-contract (m (-> integer? integer?))))
-  (test-name '(object-contract (m (-> integer? any)))
-             (object-contract (m (-> integer? any))))
-  (test-name '(object-contract (m (-> integer? (values integer? integer?)))) 
-             (object-contract (m (-> integer? (values integer? integer?)))))
-  (test-name '(object-contract (m (case-> (-> integer? integer? integer?)
-                                          (-> integer? (values integer? integer?)))))
-             (object-contract (m (case-> 
-                                  (-> integer? integer? integer?)
-                                  (-> integer? (values integer? integer?))))))
-  (test-name
-   '(object-contract (m (case-> (-> integer? symbol?)
-                                (-> integer? boolean? symbol?)
-                                (-> integer? boolean? number? symbol?))))
-   (object-contract (m (opt->* (integer?) (boolean? number?) (symbol?)))))
-  (test-name
-    '(object-contract (m (case-> (-> integer? symbol?)
-                                 (-> integer? boolean? symbol?)
-                                 (-> integer? boolean? number? symbol?))))
-   (object-contract (m (opt-> (integer?) (boolean? number?) symbol?))))
-  (test-name
-    '(object-contract (m (case-> (-> integer? any)
-                                 (-> integer? boolean? any)
-                                 (-> integer? boolean? number? any))))
-   (object-contract (m (opt->* (integer?) (boolean? number?) any))))
-  (test-name
-    '(object-contract (m (case-> (-> integer? (values symbol? boolean?))
-                                 (-> integer? boolean? (values symbol? boolean?)))))
-   (object-contract (m (opt->* (integer?) (boolean?) (symbol? boolean?)))))
-  
-  (test-name '(object-contract (m (->r ((x ...)) ...))) (object-contract (m (->r ((x number?)) number?))))
-  (test-name '(object-contract (m (->r ((x ...) (y ...) (z ...)) ...))) 
-             (object-contract (m (->r ((x number?) (y boolean?) (z pair?)) number?))))
-  (test-name '(object-contract (m (->r ((x ...) (y ...) (z ...)) rest-x ... ...))) 
-             (object-contract (m (->r ((x number?) (y boolean?) (z pair?)) rest-x any/c number?))))
-  (test-name '(promise/c any/c) (promise/c any/c))
-  (test-name '(syntax/c any/c) (syntax/c any/c))
-  (test-name '(struct/c st integer?) 
-             (let ()
-               (define-struct st (a))
-               (struct/c st integer?)))
-  
-  (test-name '(recursive-contract (box/c boolean?)) (recursive-contract (box/c boolean?)))
-  (test-name '(recursive-contract x) (let ([x (box/c boolean?)]) (recursive-contract x)))
-  
-  (test-name '(couple/c any/c any/c) 
-             (couple/c any/c any/c))
-  (test-name '(couple/c any/c any/c) 
-             (couple/dc [hd any/c] [tl any/c]))
-  (test-name '(couple/dc [hd any/c] [tl ...])
-             (couple/dc [hd any/c] [tl (hd) any/c]))
-
-  ;; NOT YET RELEASED
-  #;
-  (test-name '(pr/dc [x integer?]
-                     [y integer?]
-                     where
-                     [x-val ...]
-                     [y-val ...]
-                     and
-                     ...)
-             (let ()
-               (define-contract-struct pr (x y))
-               (pr/dc [x integer?]
-                      [y integer?]
-                      where
-                      [x-val x]
-                      [y-val y]
-                      and
-                      (= x-val y-val))))
-             
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;;  stronger tests
-  ;;
-  
-  (ctest #t contract-stronger? any/c any/c)
-  (ctest #t contract-stronger? (between/c 1 3) (between/c 0 4))
-  (ctest #f contract-stronger? (between/c 0 4) (between/c 1 3))
-  (ctest #t contract-stronger? (>=/c 3) (>=/c 2))
-  (ctest #f contract-stronger? (>=/c 2) (>=/c 3))
-  (ctest #f contract-stronger? (<=/c 3) (<=/c 2))
-  (ctest #t contract-stronger? (<=/c 2) (<=/c 3))
-  (ctest #t contract-stronger? (recursive-contract (<=/c 2)) (recursive-contract (<=/c 3)))
-  (ctest #f contract-stronger? (recursive-contract (<=/c 3)) (recursive-contract (<=/c 2)))
-  (let ([f (contract-eval '(λ (x) (recursive-contract (<=/c x))))])
-    (test #t (contract-eval 'contract-stronger?) (contract-eval `(,f 1)) (contract-eval `(,f 1))))
-  (ctest #t contract-stronger? (-> integer? integer?) (-> integer? integer?))
-  (ctest #f contract-stronger? (-> boolean? boolean?) (-> integer? integer?))
-  (ctest #t contract-stronger? (-> (>=/c 3) (>=/c 3)) (-> (>=/c 4) (>=/c 3)))
-  (ctest #f contract-stronger? (-> (>=/c 4) (>=/c 3)) (-> (>=/c 3) (>=/c 3)))
-  (ctest #t contract-stronger? (-> (>=/c 3) (>=/c 3)) (-> (>=/c 3) (>=/c 2)))
-  (ctest #f contract-stronger? (-> (>=/c 3) (>=/c 2)) (-> (>=/c 3) (>=/c 3)))
-  (ctest #f contract-stronger? (-> (>=/c 2)) (-> (>=/c 3) (>=/c 3)))
-  (ctest #t contract-stronger? (or/c null? any/c) (or/c null? any/c))
-  (ctest #f contract-stronger? (or/c null? any/c) (or/c boolean? any/c))
-  (ctest #t contract-stronger? (or/c null? boolean?) (or/c null? boolean?))
-  (ctest #t contract-stronger? (or/c null? boolean?) (or/c boolean? null?))
-  (ctest #t contract-stronger? (or/c null? (-> integer? integer?)) (or/c null? (-> integer? integer?)))
-  (ctest #f contract-stronger? (or/c null? (-> boolean? boolean?)) (or/c null? (-> integer? integer?)))
-  
-  (ctest #t contract-stronger? number? number?)
-  (ctest #f contract-stronger? boolean? number?)
-    
-  (ctest #t contract-stronger? (parameter/c (between/c 0 5)) (parameter/c (between/c 0 5)))
-  (ctest #f contract-stronger? (parameter/c (between/c 0 5)) (parameter/c (between/c 1 4)))
-  (ctest #f contract-stronger? (parameter/c (between/c 1 4)) (parameter/c (between/c 0 5)))
-  
-  (ctest #t contract-stronger? (symbols 'x 'y) (symbols 'x 'y 'z))
-  (ctest #f contract-stronger? (symbols 'x 'y 'z) (symbols 'x 'y))
-  (ctest #t contract-stronger? (symbols 'x 'y) (symbols 'z 'x 'y))
-  (ctest #f contract-stronger? (symbols 'z 'x 'y) (symbols 'x 'y))
-  (ctest #t contract-stronger? (one-of/c (expt 2 100)) (one-of/c (expt 2 100) 12))
-  
-  (ctest #t contract-stronger?
-         (or/c (-> (>=/c 3) (>=/c 3)) (-> string?))
-         (or/c (-> (>=/c 4) (>=/c 3)) (-> string?)))
-  (ctest #f contract-stronger?
-         (or/c (-> string?) (-> integer? integer?))
-         (or/c (-> string?) (-> any/c integer?)))
-  (ctest #f contract-stronger?
-         (or/c (-> string?) (-> any/c integer?))
-         (or/c (-> string?) (-> integer? integer?)))
-  (ctest #t contract-stronger?
-         (or/c (-> string?) (-> integer? integer?) integer? boolean?)
-         (or/c (-> string?) (-> integer? integer?) integer? boolean?))
-  (ctest #f contract-stronger?
-         (or/c (-> string?) (-> integer? integer?) integer? char?)
-         (or/c (-> string?) (-> integer? integer?) integer? boolean?))
-  (ctest #t contract-stronger?
-         (or/c (-> string?) (-> integer? integer?) integer?)
-         (or/c (-> string?) (-> integer? integer?) integer? boolean?))
-  (ctest #f contract-stronger?
-         (or/c (-> string?) (-> integer? integer?) integer?)
-         (or/c (-> integer? integer?) integer?))
-
-  (contract-eval
-   `(let ()
-      (define (non-zero? x) (not (zero? x)))
-      (define list-of-numbers
-        (or/c null?
-              (couple/c number?
-                        (recursive-contract list-of-numbers))))
-      (define (short-list/less-than n)
-        (or/c null?
-              (couple/c (<=/c n)
-                        (or/c null?
-                              (couple/c (<=/c n)
-                                        any/c)))))
-      (define (short-sorted-list/less-than n)
-        (or/c null?
-              (couple/dc 
-               [hd (<=/c n)]
-               [tl (hd) (or/c null?
-                              (couple/c (<=/c hd)
-                                        any/c))])))
-      
-      (define (sorted-list/less-than n)
-        (or/c null?
-              (couple/dc 
-               [hd (<=/c n)]
-               [tl (hd) (sorted-list/less-than hd)])))
-      
-      ;; for some reason, the `n' makes it harder to optimize. without it, this test isn't as good a test
-      (define (closure-comparison-test n)
-        (couple/dc 
-         [hd any/c]
-         [tl (hd) any/c]))
-      
-      (,test #t contract-stronger? (couple/c any/c any/c) (couple/c any/c any/c))
-      (,test #f contract-stronger? (couple/c (>=/c 2) (>=/c 3)) (couple/c (>=/c 4) (>=/c 5)))
-      (,test #t contract-stronger? (couple/c (>=/c 4) (>=/c 5)) (couple/c (>=/c 2) (>=/c 3)))
-      (,test #f contract-stronger? (couple/c (>=/c 1) (>=/c 5)) (couple/c (>=/c 5) (>=/c 1)))
-      (let ([ctc (couple/dc [hd any/c] [tl (hd) any/c])])
-        (,test #t contract-stronger? ctc ctc))
-      (let ([ctc (couple/dc [hd any/c] [tl (hd) (<=/c hd)])])
-        (,test #t contract-stronger? ctc ctc))
-      (,test #t contract-stronger? list-of-numbers list-of-numbers)
-      (,test #t contract-stronger? (short-list/less-than 4) (short-list/less-than 5))
-      (,test #f contract-stronger? (short-list/less-than 5) (short-list/less-than 4))
-      (,test #t contract-stronger? (short-sorted-list/less-than 4) (short-sorted-list/less-than 5))
-      (,test #f contract-stronger? (short-sorted-list/less-than 5) (short-sorted-list/less-than 4))
-      (,test #t contract-stronger? (sorted-list/less-than 4) (sorted-list/less-than 5))
-      (,test #f contract-stronger? (sorted-list/less-than 5) (sorted-list/less-than 4))
-      (,test #t contract-stronger? (closure-comparison-test 4) (closure-comparison-test 5))))
-
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;;  first-order tests
-  ;;
-  
-  (ctest #t contract-first-order-passes? (flat-contract integer?) 1)
-  (ctest #f contract-first-order-passes? (flat-contract integer?) 'x)
-  (ctest #t contract-first-order-passes? (flat-contract boolean?) #t)
-  (ctest #f contract-first-order-passes? (flat-contract boolean?) 'x)
-  (ctest #t contract-first-order-passes? any/c 1)
-  (ctest #t contract-first-order-passes? any/c #t)
-  (ctest #t contract-first-order-passes? (-> integer? integer?) (λ (x) #t))
-  (ctest #f contract-first-order-passes? (-> integer? integer?) (λ (x y) #t))
-  (ctest #f contract-first-order-passes? (-> integer? integer?) 'x)
-  (ctest #t contract-first-order-passes? (-> integer? boolean? integer?) (λ (x y) #t))
-  (ctest #f contract-first-order-passes? (-> integer? boolean? integer?) (λ (x) #t))
-  (ctest #f contract-first-order-passes? (-> integer? boolean? integer?) (λ (x y z) #t))
-  
-  (ctest #t contract-first-order-passes? (->* (integer?) boolean? (char? any/c)) (λ (x . y) #f))
-  (ctest #f contract-first-order-passes? (->* (integer?) boolean? (char? any/c)) (λ (x y . z) #f))
-  (ctest #f contract-first-order-passes? (->* (integer?) boolean? (char? any/c)) (λ (x) #f))
-  (ctest #t contract-first-order-passes? (->* (integer?) boolean? (char? any/c)) (λ x #f))
-  
-  (ctest #t contract-first-order-passes? (->d integer? boolean? (lambda (x y) char?)) (λ (x y) x))
-  (ctest #f contract-first-order-passes? (->d integer? boolean? (lambda (x y) char?)) (λ (x) x))
-  (ctest #f contract-first-order-passes? (->d integer? boolean? (lambda (x y) char?)) (λ (x y z) x))
-
-  (ctest #t contract-first-order-passes? (listof integer?) (list 1))
-  (ctest #f contract-first-order-passes? (listof integer?) #f)
-
-  (ctest #t contract-first-order-passes? (vector-immutableof integer?) (vector->immutable-vector (vector 1)))
-  (ctest #f contract-first-order-passes? (vector-immutableof integer?) 'x)
-  (ctest #f contract-first-order-passes? (vector-immutableof integer?) '())
-  
-  (ctest #t contract-first-order-passes? (promise/c integer?) (delay 1))
-  (ctest #f contract-first-order-passes? (promise/c integer?) 1)
-  
-  (ctest #t contract-first-order-passes? (->d* (integer? boolean?) (lambda (x y) char?)) (λ (x y) #t))
-  (ctest #f contract-first-order-passes? (->d* (integer? boolean?) (lambda (x y) char?)) (λ (x) #t))
-  (ctest #f contract-first-order-passes? (->d* (integer? boolean?) (lambda (x y) char?)) (λ (x y z) #t))
-
-  (ctest #t contract-first-order-passes? 
-        (->d* (integer? boolean?) any/c (lambda (x y . z) char?))
-        (λ (x y . z) z))
-  (ctest #t contract-first-order-passes? 
-        (->d* (integer? boolean?) any/c (lambda (x y . z) char?))
-        (λ (y . z) z))
-  (ctest #t contract-first-order-passes? 
-        (->d* (integer? boolean?) any/c (lambda (x y . z) char?))
-        (λ z z))
-  (ctest #f contract-first-order-passes? 
-        (->d* (integer? boolean?) any/c (lambda (x y . z) char?))
-        (λ (x y z . w) 1))
-  (ctest #f contract-first-order-passes? 
-        (->d* (integer? boolean?) any/c (lambda (x y . z) char?))
-        (λ (x y) 1))
-  
-  (ctest #t contract-first-order-passes? (->r ((x number?)) number?) (λ (x) 1))
-  (ctest #f contract-first-order-passes? (->r ((x number?)) number?) (λ (x y) 1))
-  (ctest #f contract-first-order-passes? (->r ((x number?)) number?) (λ () 1))
-  (ctest #t contract-first-order-passes? (->r ((x number?)) number?) (λ args 1))
-  
-  (ctest #t contract-first-order-passes? (->pp ((x number?)) #t number? blech #t) (λ (x) 1))
-  (ctest #f contract-first-order-passes? (->pp ((x number?)) #t number? blech #t) (λ () 1))
-  (ctest #t contract-first-order-passes? (->pp ((x number?)) #t number? blech #t) (λ (x . y) 1))
-  
-  (ctest #f contract-first-order-passes? 
-        (case-> (-> integer? integer?)
-                (-> integer? integer? integer?))
-        (λ () 1))
-  (ctest #f contract-first-order-passes? 
-        (case-> (-> integer? integer?)
-                (-> integer? integer? integer?))
-        (λ (x) 1))
-  (ctest #f contract-first-order-passes? 
-        (case-> (-> integer? integer?)
-                (-> integer? integer? integer?))
-        (λ (x y) 1))
-  (ctest #f contract-first-order-passes? 
-        (case->)
-        1)
-  
-  (ctest #t contract-first-order-passes? 
-        (case->)
-        (case-lambda))
-  
-  (ctest #t contract-first-order-passes? 
-        (case-> (-> integer? integer?)
-                (-> integer? integer? integer?))
-        (case-lambda [(x) x] [(x y) x]))
-  (ctest #t contract-first-order-passes? 
-        (case-> (-> integer? integer?)
-                (-> integer? integer? integer?))
-        (case-lambda [() 1] [(x) x] [(x y) x]))
-  (ctest #t contract-first-order-passes? 
-        (case-> (-> integer? integer?)
-                (-> integer? integer? integer?))
-        (case-lambda [() 1] [(x) x] [(x y) x] [(x y z) x]))
-  
-  (ctest #t contract-first-order-passes? (and/c (-> positive? positive?) (-> integer? integer?)) (λ (x) x))
-  (ctest #t contract-first-order-passes? (and/c (-> positive? positive?) (-> integer? integer?)) values)
-  (ctest #f contract-first-order-passes? (and/c (-> integer?) (-> integer? integer?)) (λ (x) x))
-  
-  (ctest #t contract-first-order-passes? 
-        (cons/c boolean? (-> integer? integer?))
-        (list* #t (λ (x) x)))
-  (ctest #f contract-first-order-passes? 
-        (cons/c boolean? (-> integer? integer?))
-        (list* 1 2))
-  
-  (ctest #f contract-first-order-passes? (flat-rec-contract the-name) 1)
-  
-  (ctest #f contract-first-order-passes? 
-         (object-contract (m (-> integer? integer?)))
-         (new object%))
-  (ctest #f contract-first-order-passes? 
-         (object-contract (m (-> integer? integer?)))
-         1)
-  
-  (ctest #t contract-first-order-passes?
-         (couple/c any/c any/c) 
-         (make-couple 1 2))
-  
-  (ctest #f contract-first-order-passes?
-         (couple/c any/c any/c) 
-         2)
-  
-  (ctest #t contract-first-order-passes?
-         (couple/dc [hd any/c] [tl any/c]) 
-         (make-couple 1 2))
-  
-  (ctest #f contract-first-order-passes?
-         (couple/dc [hd any/c] [tl any/c]) 
-         1)
-  
-  (ctest #t contract-first-order-passes?
-         (couple/dc [hd any/c] [tl (hd) any/c]) 
-         (make-couple 1 2))
-  
-  (ctest #f contract-first-order-passes?
-         (couple/dc [hd any/c] [tl (hd) any/c]) 
-         1)
-
-  (ctest #t contract-first-order-passes? (or/c (-> (>=/c 5) (>=/c 5)) boolean?) #t)
-  (ctest #t contract-first-order-passes? (or/c (-> (>=/c 5) (>=/c 5)) boolean?) (λ (x) x))
-  (ctest #f contract-first-order-passes? (or/c (-> (>=/c 5) (>=/c 5)) boolean?) 'x)
-
-  (ctest #t contract-first-order-passes? 
-        (or/c (-> integer? integer? integer?)
-              (-> integer? integer?))
-        (λ (x) x))
-  (ctest #t contract-first-order-passes? 
-        (or/c (-> integer? integer? integer?)
-              (-> integer? integer?))
-        (λ (x y) x))
-  (ctest #f contract-first-order-passes? 
-        (or/c (-> integer? integer? integer?)
-              (-> integer? integer?))
-        (λ () x))
-  (ctest #f contract-first-order-passes? 
-        (or/c (-> integer? integer? integer?)
-              (-> integer? integer?))
-        1)
-  
-  (test-name '(or/c) (or/c))
-  (test-name '(or/c integer? gt0?) (or/c integer? (let ([gt0? (lambda (x) (> x 0))]) gt0?)))
-  (test-name '(or/c integer? boolean?)
-             (or/c (flat-contract integer?)
-                   (flat-contract boolean?)))
-  (test-name '(or/c (-> (>=/c 5) (>=/c 5)) boolean?)
-             (or/c (-> (>=/c 5) (>=/c 5)) boolean?))
-  (test-name '(or/c boolean? (-> (>=/c 5) (>=/c 5)))
-             (or/c boolean? (-> (>=/c 5) (>=/c 5))))
-
-  
-  (ctest 1
-        length
-        (let ([f (contract (-> integer? any)
-                           (lambda (x) 
-                             (with-continuation-mark 'x 'x
-                               (continuation-mark-set->list (current-continuation-marks) 'x)))
-                           'pos
-                           'neg)])
-          (with-continuation-mark 'x 'x
-            (f 1))))
-  
-  (ctest 2
-        length
-        (let ([f (contract (-> integer? list?)
-                           (lambda (x) 
-                             (with-continuation-mark 'x 'x
-                               (continuation-mark-set->list (current-continuation-marks) 'x)))
-                           'pos
-                           'neg)])
-          (with-continuation-mark 'x 'x
-            (f 1))))
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;; provide/contract tests
-  ;; (at the end, because they are slow w/out .zo files)
-  ;;
-  
-  (test/spec-passed
-   'provide/contract1
-   '(let ()
-      (eval '(module contract-test-suite1 mzscheme
-                (require mzlib/contract)
-                (define x 1)
-                (provide/contract (x integer?))))
-      (eval '(require 'contract-test-suite1))
-      (eval 'x)))
-  
-  (test/spec-passed
-   'provide/contract2
-   '(let ()
-      (eval '(module contract-test-suite2 mzscheme
-                (require mzlib/contract)
-                (provide/contract)))
-      (eval '(require 'contract-test-suite2))))
-  
-  (test/spec-failed
-   'provide/contract3
-   '(let ()
-      (eval '(module contract-test-suite3 mzscheme
-               (require mzlib/contract)
-               (define x #f)
-               (provide/contract (x integer?))))
-      (eval '(require 'contract-test-suite3))
-      (eval 'x))
-   "'contract-test-suite3")
-  
-  (test/spec-passed
-   'provide/contract4
-   '(begin
-      (eval '(module contract-test-suite4 mzscheme
-               (require mzlib/contract)
-               (define-struct s (a))
-               (provide/contract (struct s ((a any/c))))))
-      (eval '(require 'contract-test-suite4))
-      (eval '(list (make-s 1)
-                   (s-a (make-s 1))
-                   (s? (make-s 1))
-                   (set-s-a! (make-s 1) 2)))))
-  
-  (test/spec-passed
-   'provide/contract4-b
-   '(begin
-      (eval '(module contract-test-suite4-b mzscheme
-               (require mzlib/contract)
-               (define-struct s (a))
-               (provide/contract (struct s ((a any/c))))))
-      (eval '(require 'contract-test-suite4-b))
-      (eval '(list (make-s 1)
-                   (s-a (make-s 1))
-                   (s? (make-s 1))))))
-  
-  (test/spec-passed/result
-   'provide/contract4-c
-   '(begin
-      (eval '(module contract-test-suite4-c mzscheme
-               (require mzlib/contract)
-               (define-struct s (a b))
-               (provide/contract (struct s ((a any/c) (b any/c))))))
-      (eval '(require 'contract-test-suite4-c))
-      (eval '(let ([an-s (make-s 1 2)])
-               (list (s-a an-s)
-                     (s-b an-s)
-                     (begin (set-s-a! an-s 3)
-                            (s-a an-s))
-                     (begin (set-s-b! an-s 4)
-                            (s-b an-s))))))
-   
-   (list 1 2 3 4))
-  
-  (test/spec-passed
-   'provide/contract5
-   '(begin
-      (eval '(module contract-test-suite5 mzscheme
-               (require mzlib/contract)
-               (define-struct s (a))
-               (define-struct t (a))
-               (provide/contract (struct s ((a any/c)))
-                                 (struct t ((a any/c))))))
-      (eval '(require 'contract-test-suite5))
-      (eval '(list (make-s 1)
-                   (s-a (make-s 1))
-                   (s? (make-s 1))
-                   (make-t 1)
-                   (t-a (make-t 1))
-                   (t? (make-t 1))))))
-  
-  (test/spec-passed
-   'provide/contract6
-   '(begin
-      (eval '(module contract-test-suite6 mzscheme
-               (require mzlib/contract)
-               (define-struct s (a))
-               (provide/contract (struct s ((a any/c))))))
-      (eval '(require 'contract-test-suite6))
-      (eval '(define-struct (t s) ()))))
-  
-  (test/spec-passed
-   'provide/contract6b
-   '(begin
-      (eval '(module contract-test-suite6b mzscheme
-               (require mzlib/contract)
-               (define-struct s_ (a))
-               (provide/contract (struct s_ ((a any/c))))))
-      (eval '(require 'contract-test-suite6b))
-      (eval '(module contract-test-suite6b2 mzscheme
-               (require 'contract-test-suite6b)
-               (require mzlib/contract)
-               (define-struct (t_ s_) (b))
-               (provide s_-a)
-               (provide/contract (struct (t_ s_) ((a any/c) (b any/c))))))
-      (eval '(require 'contract-test-suite6b2))
-      (eval '(define-struct (u_ t_) ()))
-      (eval '(s_-a (make-u_ 1 2)))))
-  
-  (test/spec-passed
-   'provide/contract7
-   '(begin
-      (eval '(module contract-test-suite7 mzscheme
-               (require mzlib/contract)
-               (define-struct s (a b))
-               (define-struct (t s) (c d))
-               (provide/contract 
-                (struct s ((a any/c) (b any/c)))
-                (struct (t s) ((a any/c) (b any/c) (c any/c) (d any/c))))))
-      (eval '(require 'contract-test-suite7))
-      (eval '(let ([x (make-t 1 2 3 4)])
-               (s-a x)
-               (s-b x)
-               (t-c x)
-               (t-d x)
-               (void)))))
-  
-  (test/spec-passed
-   'provide/contract8
-   '(begin
-      (eval '(module contract-test-suite8 mzscheme
-               (require mzlib/contract)
-               (define-struct i-s (contents))
-               (define (w-f-s? x) #t)
-               (provide/contract 
-                (struct i-s ((contents (flat-named-contract "integer-set-list" w-f-s?)))))))
-      (eval '(require 'contract-test-suite8))
-      (eval '(i-s-contents (make-i-s 1)))))
-   
-  (test/spec-passed
-   'provide/contract9
-   '(begin
-      (eval '(module contract-test-suite9 mzscheme
-               (require mzlib/contract)
-               (define the-internal-name 1)
-               (provide/contract (rename the-internal-name the-external-name integer?))
-               (+ the-internal-name 1)))
-      (eval '(require 'contract-test-suite9))
-      (eval '(+ the-external-name 1))))
-  
-  (test/spec-passed
-   'provide/contract10
-   '(begin
-      (eval '(module pc10-m mzscheme
-               (require mzlib/contract)
-               (define-struct s (a b) (make-inspector))
-               (provide/contract (struct s ((a number?) (b number?))))))
-      (eval '(module pc10-n mzscheme
-               (require mzlib/struct
-                        'pc10-m)
-               (print-struct #t)
-               (copy-struct s 
-                            (make-s 1 2)
-                            [s-a 3])))
-      (eval '(require 'pc10-n))))
-  
-  (test/spec-passed
-   'provide/contract11
-   '(begin
-      (eval '(module pc11-m mzscheme
-               (require mzlib/contract)
-               (define x 1)
-               (provide/contract [rename x y integer?]
-                                 [rename x z integer?])))
-      (eval '(module pc11-n mzscheme
-               (require 'pc11-m)
-               (+ y z)))
-      (eval '(require 'pc11-n))))
-  
-  ;; this test is broken, not sure why
-  #|
-  (test/spec-failed
-   'provide/contract11b
-   '(parameterize ([current-namespace (make-namespace)])
-      (eval '(module pc11b-m mzscheme
-               (require mzlib/contract)
-               (define-struct s (a b) (make-inspector))
-               (provide/contract (struct s ((a number?) (b number?))))))
-      (eval '(module pc11b-n mzscheme
-               (require mzlib/struct
-                        m)
-               (print-struct #t)
-               (copy-struct s 
-                            (make-s 1 2)
-                            [s-a #f])))
-      (eval '(require 'pc11b-n)))
-   "'n")
-|#
-  
-  (test/spec-passed
-   'provide/contract12
-   '(begin
-      (eval '(module pc12-m mzscheme
-               (require mzlib/contract)
-               (define-struct (exn2 exn) ())
-               (provide/contract (struct (exn2 exn) ((message any/c) (continuation-marks any/c))))))
-      (eval '(require 'pc12-m))))
-  
-  (test/spec-passed/result
-   'provide/contract13
-   '(begin
-      (eval '(module pc13-common-msg-structs mzscheme
-               (require mzlib/contract)
-               (define-struct register (name type) (make-inspector))
-               (provide/contract (struct register ([name any/c] [type any/c])))))
-      
-      (eval '(require 'pc13-common-msg-structs))
-      (eval '(require (lib "plt-match.rkt")))
-      (eval '(match (make-register 1 2)
-               [(struct register (name type))
-                (list name type)])))
-   (list 1 2))
-  
-  (test/spec-passed
-   'provide/contract14
-   '(begin
-      (eval '(module pc14-test1 mzscheme
-               (require mzlib/contract)
-               
-               (define-struct type (flags))
-               (define-struct (type:ptr type) (type))
-               
-               (provide/contract
-                (struct type
-                        ([flags (listof string?)]))
-                
-                (struct (type:ptr type)
-                        ([flags (listof string?)] [type type?])))))
-
-      (eval '(module pc14-test2 mzscheme
-               (require mzlib/plt-match)
-               (require 'pc14-test1)
-               (match (make-type:ptr '() (make-type '()))
-                 [(struct type:ptr (flags type)) #f])))
-      (eval '(require 'pc14-test2))))
-  
-  ;; make sure unbound identifier exception is raised.
-  (contract-error-test
-   #'(begin
-       (eval '(module pos mzscheme
-                (require mzlib/contract)
-                (provide/contract [i any/c]))))
-   exn:fail:syntax?)
-  
-  ;; provide/contract should signal errors without requiring a reference to the variable
-  ;; this test is bogus, because provide/contract'd variables can be set!'d.
-  (test/spec-failed
-   'provide/contract15
-   '(begin
-      (eval '(module pos mzscheme
-               (require mzlib/contract)
-               (define i #f)
-               (provide/contract [i integer?])))
-      (eval '(require 'pos)))
-   "'pos")
-  
-  ;; this is really a positive violation, but name the module `neg' just for an addl test
-  (test/spec-failed
-   'provide/contract16
-   '(begin
-      (eval '(module neg mzscheme
-               (require mzlib/contract)
-               (define i #f)
-               (provide/contract [i integer?])))
-      (eval '(require 'neg)))
-   "'neg")
-  
-  ;; this test doesn't pass yet ... waiting for support from define-struct
-  
-  #;
-  (test/neg-blame
-   'provide/contract17
-   '(begin
-      (eval '(module pos mzscheme
-               (require mzlib/contract)
-               (define-struct s (a))
-               (provide/contract [struct s ((a integer?))])))
-      (eval '(module neg mzscheme
-               (require 'pos)
-               (define-struct (t s) ())
-               (make-t #f)))
-      (eval '(require 'neg))))
-  
-  (test/spec-passed
-   'provide/contract18
-   '(begin
-      (eval '(module pc18-pos mzscheme
-               (require mzlib/contract)
-               (define-struct s ())
-               (provide/contract [struct s ()])))
-      (eval '(require 'pc18-pos))
-      (eval '(make-s))))
-
-  (test/spec-passed/result
-   'provide/contract19
-   '(begin
-      (eval '(module pc19-a mzscheme
-               (require mzlib/contract)
-               (define-struct a (x))
-               (provide/contract [struct a ([x number?])])))
-
-      (eval '(module pc19-b mzscheme
-               (require 'pc19-a
-                        mzlib/contract)
-               (define-struct (b a) (y))
-               (provide/contract [struct (b a) ([x number?] [y number?])])))
-
-      (eval '(module pc19-c mzscheme
-               (require 'pc19-b
-                        mzlib/contract)
-               
-               (define-struct (c b) (z))
-               (provide/contract [struct (c b) ([x number?] [y number?] [z number?])])))
-
-      (eval' (module pc19-d mzscheme
-               (require 'pc19-a 'pc19-c)
-               (define pc19-ans (a-x (make-c 1 2 3)))
-               (provide pc19-ans)))
-      
-      (eval '(require 'pc19-d))
-      (eval 'pc19-ans))
-   1)
-
-  ;; test that unit & contract don't collide over the name `struct'
-  (test/spec-passed
-   'provide/contract20
-   '(eval '(module tmp mzscheme
-             (require mzlib/contract
-                      mzlib/unit)
-             
-             (define-struct s (a b))
-             
-             (provide/contract
-              [struct s ([a number?]
-                         [b symbol?])]))))
-  
-  (test/spec-passed
-   'provide/contract21
-   '(begin
-      (eval '(module provide/contract21a mzscheme
-               (require mzlib/contract)
-               (provide/contract [f integer?])
-               (define f 1)))
-      (eval '(module provide/contract21b mzscheme
-               (require (for-syntax 'provide/contract21a)
-                        (for-syntax mzscheme))
-               (define-syntax (unit-body stx)
-                 f f
-                 #'1)))))
-  
-  (test/spec-passed
-   'provide/contract22
-   '(begin
-      (eval '(module provide/contract22a mzscheme
-               (require mzlib/contract)
-               (provide/contract [make-bound-identifier-mapping integer?])
-               (define make-bound-identifier-mapping 1)))
-      (eval '(module provide/contract22b mzscheme
-               (require (for-syntax 'provide/contract22a)
-                        (for-syntax mzscheme))
-               
-               (define-syntax (unit-body stx)
-                 make-bound-identifier-mapping)
-               
-               (define-syntax (f stx)
-                 make-bound-identifier-mapping)))))
-  
-  (test/spec-passed
-   'provide/contract23
-   '(begin
-      (eval '(module provide/contract23a mzscheme
-               (require mzlib/contract)
-               (provide/contract [f integer?])
-               (define f 3)))
-      
-      (eval '(module provide/contract23b mzscheme
-               (require 'provide/contract23a)
-               (#%expression f)
-               f))
-      
-      (eval '(require 'provide/contract23b))))
-  
-  (test/spec-passed
-   'provide/contract24
-   '(begin
-      (eval '(module provide/contract24 mzscheme
-               (require (prefix c: mzlib/contract))
-               (c:case-> (c:-> integer? integer?)
-                         (c:-> integer? integer? integer?))))))
-  
-  ;; tests that contracts pick up the #%app from the context
-  ;; instead of always using the mzscheme #%app.
-  (test/spec-passed
-   'provide/contract25
-   '(begin
-      (eval '(module provide/contract25a mzscheme
-               (require mzlib/contract)
-               (provide/contract [seventeen integer?])
-               (define seventeen 17)))
-      (eval '(module provide/contract25b mzscheme
-               (require 'provide/contract25a)
-               (let-syntax ([#%app (syntax-rules ()
-                                     [(#%app e ...) (list e ...)])])
-                 (seventeen 18))))
-      (eval '(require 'provide/contract25b))))
-  
-  (test/spec-passed/result
-   'provide/contract26
-   '(begin
-      (eval '(module provide/contract26 mzscheme
-               (require mzlib/contract)
-               (define-struct pc26-s (a))
-               (provide/contract (struct pc26-s ((a integer?))))))
-      (eval '(require 'provide/contract26))
-      (eval '(pc26-s-a (make-pc26-s 1))))
-   1)
-
-  (contract-error-test
-   #'(begin
-       (eval '(module pce1-bug mzscheme
-                (require mzlib/contract)
-                (define the-defined-variable1 'five)
-                (provide/contract [the-defined-variable1 number?])))
-       (eval '(require 'pce1-bug)))
-   (λ (x)
-     (and (exn? x)
-          (regexp-match #rx"the-defined-variable1:" (exn-message x)))))
-  
-  (contract-error-test
-   #'(begin
-       (eval '(module pce2-bug mzscheme
-                (require mzlib/contract)
-                (define the-defined-variable2 values)
-                (provide/contract [the-defined-variable2 (-> number? any)])))
-       (eval '(require 'pce2-bug))
-       (eval '(the-defined-variable2 #f)))
-   (λ (x)
-     (and (exn? x)
-          (regexp-match #rx"the-defined-variable2:" (exn-message x)))))
-  
-  (contract-error-test
-   #'(begin
-       (eval '(module pce3-bug mzscheme
-                (require mzlib/contract)
-                (define the-defined-variable3 (λ (x) #f))
-                (provide/contract [the-defined-variable3 (-> any/c number?)])))
-       (eval '(require 'pce3-bug))
-       (eval '(the-defined-variable3 #f)))
-   (λ (x)
-     (and (exn? x)
-          (regexp-match #rx"the-defined-variable3:" (exn-message x)))))
-  
-  (contract-error-test
-   #'(begin
-       (eval '(module pce4-bug mzscheme
-                (require mzlib/contract)
-                (define the-defined-variable4 (λ (x) #f))
-                (provide/contract [the-defined-variable4 (-> any/c number?)])))
-       (eval '(require 'pce4-bug))
-       (eval '((if #t the-defined-variable4 the-defined-variable4) #f)))
-   (λ (x)
-     (and (exn? x)
-          (regexp-match #rx"the-defined-variable4:" (exn-message x)))))
-
-  (contract-error-test
-   #'(begin
-       (eval '(module pce5-bug mzscheme
-                (require mzlib/contract)
-                
-                (define-struct bad (a b))
-                
-                (provide/contract
-                 [struct bad ((string? a) (string? b))])))
-       (eval '(require 'pce5-bug)))
-   (λ (x)
-     (and (exn? x)
-          (regexp-match #rx"expected field name to be b, but found string?" (exn-message x)))))
-  
-  (contract-error-test
-   #'(begin
-       (eval '(module pce6-bug mzscheme
-                (require mzlib/contract)
-                
-                (define-struct bad-parent (a))
-                (define-struct (bad bad-parent) (b))
-                
-                (provide/contract
-                 [struct bad ((a string?) (string? b))])))
-       (eval '(require 'pce6-bug)))
-   (λ (x)
-     (and (exn? x)
-          (regexp-match #rx"expected field name to be b, but found string?" (exn-message x)))))
-  
-  (contract-eval
-   `(,test
-     'pos
-     (compose blame-positive exn:fail:contract:blame-object)
-     (with-handlers ((void values)) (contract not #t 'pos 'neg))))
-  
-  (report-errs)
-  
-))
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/etc.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/etc.rktl
deleted file mode 100644
index 41256aeca6..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/etc.rktl
+++ /dev/null
@@ -1,69 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(Section 'etc)
-
-(require mzlib/etc)
-
-(let () 
-  (begin-with-definitions 
-   (define-syntax (goo stx) 
-     (syntax-case stx () 
-       [(_ foo) #'(define-syntax (foo stx) (syntax-case stx () [(_ x) #'(define x 12)]))]))
-   (goo foo)
-   (foo x)
-   (test 12 'bwd x)))
-
-(let-syntax ([goo (lambda (stx) #'(begin (define z 13) (test 13 'bwd z)))])
-  (let-syntax ([y (lambda (stx) #'goo)])
-    (let () 
-      (begin-with-definitions 
-       (define-syntax (goo stx) 
-	 (syntax-case stx () 
-	   [(_ foo) #'(define-syntax (foo stx) (syntax-case stx () [(_ x) #'(define x 12)]))]))
-       (goo foo)
-       (foo x)
-       y
-       (test 12 'bwd x)))))
-
-(let ()
-  (begin-with-definitions 
-   (define-struct a (b c))
-   (test 2 'bwd (a-c (make-a 1 2)))))
-
-(let ()
-  (begin-with-definitions 
-   (define-struct a (b c))
-   (let ()
-     (define-struct (d a) (e))
-     (test 3 'bwd (d-e (make-d 1 2 3))))))
-
-(let ()
-  (begin-with-definitions 
-   (define-struct a (b c))
-   (define-struct (d a) (e))
-   (test 3 'bwd (d-e (make-d 1 2 3)))))
-
-(syntax-test #'(begin-with-definitions
-		 (define-syntax goo 10)
-		 (define goo 10)
-		 12))
-
-(let ()
-  (test 3 (rec f (λ (x) 3)) 3)
-  (test 3 (rec f (λ (x) x)) 3)
-  (test 2 (rec f (λ (x) (if (= x 3) (f 2) x))) 3)
-  (test 3 (rec (f x) 3) 3)
-  (test 3 (rec (f x) x) 3)
-  (test 2 (rec (f x) (if (= x 3) (f 2) x)) 3)
-  (test 2 (rec (f x . y) (car y)) 1 2 3)
-  (test 2 'no-duplications
-        (let ([x 1]) (rec ignored (begin (set! x (+ x 1)) void)) x))
-  (test 'f object-name (rec (f x) x))
-  (test 'f object-name (rec (f x . y) x))
-  (test 'f object-name (rec  f (lambda (x) x)))
-  (test (list 2) (rec (f . x) (if (= (car x) 3) (f 2) x)) 3))
-
-
-(report-errs)
-
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/kw.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/kw.rktl
deleted file mode 100644
index 185ae18cf0..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/kw.rktl
+++ /dev/null
@@ -1,412 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(Section 'kw)
-
-(require mzlib/kw
-         (prefix-in mz: mzscheme))
-
-(let-syntax ([#%datum (syntax-rules () [(_ . xs) (mz:#%datum . xs)])]
-             [#%app   (syntax-rules () [(_ . xs) (mz:#%app   . xs)])])
-  (define-syntax t
-    (syntax-rules (=> <= :rt-err: :st-err:)
-      [(t E => :rt-err:) (err/rt-test E)]
-      [(t E => :st-err:) (syntax-test #'E)]
-      [(t (f x ...) => res) (test res f x ...)]
-      [(t E => R more ...) (begin (t E => R) (t more ...))]
-      [(t R <= E more ...) (t E => R more ...)]))
-
-  ;; make sure that lambda/kw behaves as lambda
-  (t ((lambda/kw () 1)) => 1
-     ((lambda/kw (x) 1) 0) => 1
-     ((lambda/kw x x)) => '()
-     ((lambda/kw x x) 1 2) => '(1 2)
-     ((lambda/kw (x . xs) xs) 0 1 2) => '(1 2))
-  ;; even with keywords
-  (t ((lambda/kw () #:x)) => #:x
-     ((lambda/kw (x) #:x) #:y) => #:x
-     ((lambda/kw x x) #:x #:y) => '(#:x #:y)
-     ((lambda/kw (x . xs) xs) #:z #:x #:y) => '(#:x #:y))
-
-  ;; just using #:rest is the same as a dot
-  (let ([f (lambda/kw (#:rest r) r)])
-    (t (f)     => '()
-       (f 1)   => '(1)
-       (f 1 2) => '(1 2)))
-  (let ([f (lambda/kw (x #:rest r) r)])
-    (t (f 0)     => '()
-       (f 0 1)   => '(1)
-       (f 0 1 2) => '(1 2)))
-
-  ;; using only optionals
-  (t (procedure-arity (lambda/kw (#:optional) 0))       => 0
-     (procedure-arity (lambda/kw (x #:optional y z) 0)) => '(1 2 3))
-  (let ([f (lambda/kw (x #:optional y) (list x y))])
-    (t (f 0)   => '(0 #f)
-       (f 0 1) => '(0 1)))
-  (let ([f (lambda/kw (x #:optional [y 0]) (list x y))])
-    (t (f 0)   => '(0 0)
-       (f 0 1) => '(0 1)))
-  (let ([f (lambda/kw (x #:optional [y x]) (list x y))])
-    (t (f 0)   => '(0 0)
-       (f 0 1) => '(0 1)))
-  (let ([f (lambda/kw (x #:optional [y x] [z x]) (list x y z))])
-    (t (f 0)     => '(0 0 0)
-       (f 0 1)   => '(0 1 0)
-       (f 0 1 2) => '(0 1 2)))
-  (let ([f (lambda/kw (x #:optional [y x] [z y]) (list x y z))])
-    (t (f 0)     => '(0 0 0)
-       (f 0 1)   => '(0 1 1)
-       (f 0 1 2) => '(0 1 2)))
-
-  ;; keywords: basic stuff
-  (let ([f (lambda/kw (#:key x [y 1] [z #:zz #:z] #:allow-duplicate-keys)
-             (list x y z))])
-    (t (f) => '(#f 1 #:z)
-       (f #:zz #:zzz #:zz 123 #:x #:zz) => '(#:zz 1 #:zzz)))
-  ;; keywords: default-expr scope
-  (let ([f (lambda/kw (#:key x y #:allow-duplicate-keys) (list x y))])
-    (t '(#f #f) <= (f)
-       '(1  #f) <= (f #:x 1)
-       '(#f 2 ) <= (f #:y 2)
-       '(1  2 ) <= (f #:x 1 #:y 2)
-       '(1  2 ) <= (f #:x 1 #:y 2 #:y 3 #:x 4)))
-  (let ([f (lambda/kw (#:key x [y x]) (list x y))])
-    (t '(1  1 ) <= (f #:x 1)
-       '(#f 2 ) <= (f #:y 2)
-       '(1  2 ) <= (f #:x 1 #:y 2)))
-  (let ([f (lambda/kw (#:key x [y x] [z x]) (list x y z))])
-    (t '(1  1  1 ) <= (f #:x 1)
-       '(#f 1  #f) <= (f #:y 1)
-       '(#f #f 1 ) <= (f #:z 1)))
-  (let ([f (lambda/kw (#:key x [y x] [z y]) (list x y z))])
-    (t '(1  1  1 ) <= (f #:x 1)
-       '(#f 1  1 ) <= (f #:y 1)
-       '(#f #f 1 ) <= (f #:z 1)))
-  (t
-   ((let ([y 1]) (lambda/kw (#:key [x y] [y (add1 x)]) (list x y)))) => '(1 2)
-   ((let ([x 1]) (lambda/kw (#:key [x x] [y (add1 x)]) (list x y)))) => '(1 2))
-  ;; keywords: default-expr evaluation
-  (t ((lambda/kw (#:key [x 1]) x))   => 1
-     ((lambda/kw (#:key [x "1"]) x)) => "1"
-     ((lambda/kw (#:key [x '1]) x))  => 1
-     ((lambda/kw (#:key [x ''1]) x)) => ''1
-     ((lambda/kw (#:key [x '(add1 1)]) x)) => '(add1 1)
-     ((lambda/kw (#:key [x +]) x))   => +)
-  (let ([f (lambda ()
-             (let ([y 1]) (lambda/kw (#:key [x (begin (set! y 3) 2)]) y)))])
-    (t ((f))       => 3
-       ((f) #:x 1) => 1))
-  (let ([f (lambda ()
-             (let ([y 1])
-               (let-syntax ([z (syntax-id-rules () [_ (begin (set! y 3) 2)])])
-                 (lambda/kw (#:key [x z]) y))))])
-    (t ((f))       => 3
-       ((f) #:x 1) => 1))
-  ;; keywords: make sure that getarg stops at end of keyword part
-  (let ([f (lambda/kw (#:key x y #:body b) (list x y b))])
-    (t (f)           => '(#f #f ())
-       (f 2)         => '(#f #f (2))
-       (f 2 #:x 1)   => '(#f #f (2 #:x 1))
-       (f 2 3 #:x 1) => '(#f #f (2 3 #:x 1))))
-
-  ;; exotic extras
-  (let ([f (lambda/kw (#:key a b #:rest r #:allow-duplicate-keys) r)])
-    (t (f 1 2 3)                   => '(1 2 3)
-       (f #:a 1 1 2 3)             => '(#:a 1 1 2 3)
-       (f #:a 1 #:a 2 1 2 3)       => '(#:a 1 #:a 2 1 2 3)
-       (f #:b 2 1 2 3)             => '(#:b 2 1 2 3)
-       (f #:a 1 #:b 2 1 2 3)       => '(#:a 1 #:b 2 1 2 3)
-       (f #:a 1 #:b 2 #:c 3 1 2 3) => '(#:a 1 #:b 2 #:c 3 1 2 3)))
-  (let ([f (lambda/kw (#:key a b #:body r) r)])
-    (t (f 1 2 3)             => '(1 2 3)
-       (f #:a 1 1 2 3)       => '(1 2 3)
-       (f #:a 1 #:a 2 1 2 3) => :rt-err:
-       (f #:b 2 1 2 3)       => '(1 2 3)
-       (f #:a 1 #:b 2 1 2 3) => '(1 2 3)))
-  (let ([f (lambda/kw (#:key a b #:other-keys r) r)])
-    (t (f) => '()
-       (f #:a 1 #:b 2) => '()
-       (f #:a 1 #:b 2 #:c 3) => '(#:c 3)
-       (f #:d 4 #:a 1 #:b 2 #:c 3) => '(#:d 4 #:c 3)
-       ;; #:c is not a specified key, so it is allowed to repeat
-       (f #:d 4 #:a 1 #:b 2 #:c 3 #:c 33) => '(#:d 4 #:c 3 #:c 33)
-       (f #:d 4 #:a 1 #:c 3 #:b 2 #:c 33) => '(#:d 4 #:c 3 #:c 33)
-       ))
-  (let ([f (lambda/kw (#:key a b #:other-keys r #:allow-duplicate-keys) r)])
-    (t (f)                                => '()
-       (f #:a 1 #:b 2)                    => '()
-       (f #:b 1 #:a 2)                    => '()
-       (f #:a 1 #:b 2 #:c 3)              => '(#:c 3)
-       (f #:a 1 #:c 2 #:b 3)              => '(#:c 2)
-       (f #:c 1 #:a 2 #:b 3)              => '(#:c 1)
-       (f #:a 1 #:a 2 #:b 3)              => '(#:a 2)
-       (f #:a 1 #:b 2 #:c 3)              => '(#:c 3)
-       (f #:a 1 #:a 2 #:b 3 #:a 4)        => '(#:a 2 #:a 4)
-       (f #:a 1 #:a 2 #:b 3 #:b 4 #:a 5)  => '(#:a 2 #:b 4 #:a 5)
-       (f #:d 4 #:a 1 #:b 2 #:c 3)        => '(#:d 4 #:c 3)
-       (f #:d 4 #:a 1 #:b 2 #:c 3 #:c 33) => '(#:d 4 #:c 3 #:c 33)
-       (f #:d 4 #:a 1 #:b 2 #:a 3 #:c 33) => '(#:d 4 #:a 3 #:c 33)
-       (f #:d 4 #:a 1 #:c 3 #:b 2 #:c 33) => '(#:d 4 #:c 3 #:c 33)
-       (f #:d 4 #:a 1 #:c 3 #:a 2 #:c 33) => '(#:d 4 #:c 3 #:a 2 #:c 33)))
-  (let ([f (lambda/kw (#:key a b #:other-keys+body r) r)])
-    (t (f)                                    => '()
-       (f 1 2)                                => '(1 2)
-       (f #:a 1 #:b 2)                        => '()
-       (f #:a 1 #:b 2 1 2)                    => '(1 2)
-       (f #:a 1 #:b 2 #:c 3)                  => '(#:c 3)
-       (f #:a 1 #:b 2 #:c 3 1 2)              => '(#:c 3 1 2)
-       (f #:d 4 #:a 1 #:b 2 #:c 3)            => '(#:d 4 #:c 3)
-       (f #:d 4 #:a 1 #:b 2 #:c 3 1 2)        => '(#:d 4 #:c 3 1 2)
-       (f #:d 4 #:a 1 #:b 2 #:c 3 #:c 33)     => '(#:d 4 #:c 3 #:c 33)
-       (f #:d 4 #:a 1 #:b 2 #:c 3 #:c 33 1 2) => '(#:d 4 #:c 3 #:c 33 1 2)
-       (f #:d 4 #:a 1 #:c 3 #:b 2 #:c 33)     => '(#:d 4 #:c 3 #:c 33)
-       (f #:d 4 #:a 1 #:c 3 #:b 2 #:c 33 1 2) => '(#:d 4 #:c 3 #:c 33 1 2)))
-  (let ([f (lambda/kw (#:key a b #:other-keys+body r #:allow-duplicate-keys)
-             r)])
-    (t (f)                                    => '()
-       (f 1 2)                                => '(1 2)
-       (f #:a 1 #:b 2)                        => '()
-       (f #:a 1 #:b 2 1 2)                    => '(1 2)
-       (f #:a 1 #:a 2 #:b 3)                  => '(#:a 2)
-       (f #:a 1 #:a 2 #:b 3 1 2)              => '(#:a 2 1 2)
-       (f #:a 1 #:b 2 #:c 3)                  => '(#:c 3)
-       (f #:a 1 #:b 2 #:c 3 1 2)              => '(#:c 3 1 2)
-       (f #:d 4 #:a 1 #:b 2 #:c 3)            => '(#:d 4 #:c 3)
-       (f #:d 4 #:a 1 #:b 2 #:c 3 1 2)        => '(#:d 4 #:c 3 1 2)
-       (f #:d 4 #:a 1 #:b 2 #:c 3 #:c 33)     => '(#:d 4 #:c 3 #:c 33)
-       (f #:d 4 #:a 1 #:b 2 #:c 3 #:c 33 1 2) => '(#:d 4 #:c 3 #:c 33 1 2)
-       (f #:d 4 #:a 1 #:c 3 #:b 2 #:c 33)     => '(#:d 4 #:c 3 #:c 33)
-       (f #:d 4 #:a 1 #:c 3 #:b 2 #:c 33 1 2) => '(#:d 4 #:c 3 #:c 33 1 2)))
-  (let ([f (lambda/kw (x #:key a b #:all-keys r) r)])
-    (t (f 1)                                => '()
-       (f 1 #:a 1 #:b 2)                    => '(#:a 1 #:b 2)
-       (f 1 #:a 1 #:a 2 #:b 3)              => '(#:a 1 #:a 2 #:b 3)
-       (f 1 #:a 1 #:b 2 #:c 3)              => '(#:a 1 #:b 2 #:c 3)
-       (f 1 #:d 4 #:a 1 #:b 2 #:c 3)        => '(#:d 4 #:a 1 #:b 2 #:c 3)
-       (f 1 #:d 4 #:a 1 #:b 2 #:c 3 #:c 33) => '(#:d 4 #:a 1 #:b 2 #:c 3 #:c 33)
-       (f 1 #:d 4 #:a 1 #:c 3 #:b 2 #:c 33) => '(#:d 4 #:a 1 #:c 3 #:b 2 #:c 33)
-       (f 1 #:a 2 3)                        => :rt-err:
-       (f 1 #:a 2 3 4)                      => :rt-err:))
-  ;; check when other keys are allowed
-  (t :rt-err: <= ((lambda/kw (#:key a #:body r) r) #:a 1 #:b 2)
-     :rt-err: <= ((lambda/kw (#:key a) a) #:a 1 #:b 2)
-     1 <= ((lambda/kw (#:key a #:rest r) a) #:a 1 #:b 2)
-     1 <= ((lambda/kw (#:key a #:other-keys+body r) a) #:a 1 #:b 2)
-     1 <= ((lambda/kw (#:key a #:allow-other-keys) a) #:a 1 #:b 2)
-     :rt-err: <= ((lambda/kw (#:key a #:rest r #:forbid-other-keys) a)
-                  #:a 1 #:b 2))
-  ;; check when duplicate keys are allowed
-  (t :rt-err: <= ((lambda/kw (#:key a #:body r) r) #:a 1 #:a 2)
-     :rt-err: <= ((lambda/kw (#:key a) a) #:a 1 #:a 2)
-     1        <= ((lambda/kw (#:key a #:rest r) a) #:a 1 #:a 2)
-     :rt-err: <= ((lambda/kw (#:key a #:other-keys+body r) a) #:a 1 #:a 2)
-     1        <= ((lambda/kw (#:key a #:allow-duplicate-keys) a) #:a 1 #:a 2)
-     :rt-err: <= ((lambda/kw (#:key a #:rest r #:forbid-duplicate-keys) a)
-                  #:a 1 #:a 2))
-  ;; check when body is allowed
-  (t :rt-err: <= ((lambda/kw (#:key a #:all-keys r) r) #:a 1 #:b 2 3)
-     :rt-err: <= ((lambda/kw (#:key a #:all-keys r) r) #:a 1 #:b 2 3 4)
-     :rt-err: <= ((lambda/kw (#:key a #:other-keys r) r) #:a 1 #:b 2 3)
-     :rt-err: <= ((lambda/kw (#:key a #:other-keys r) r) #:a 1 #:b 2 3 4)
-     '(#:a 1 #:b 2 3)   <= ((lambda/kw (#:key a #:rest r) r) #:a 1 #:b 2 3)
-     '(#:a 1 #:b 2 3 4) <= ((lambda/kw (#:key a #:rest r) r) #:a 1 #:b 2 3 4))
-  (let ([f (lambda/kw (#:key a #:body r) r)])
-    (t '(3)   <= (f #:a 1 3)
-       '(3 4) <= (f #:a 1 3 4)
-       :rt-err: <= (f #:a 1 #:a 2 3)
-       :rt-err: <= (f #:a 1 #:a 2 3 4)))
-  (let ([f (lambda/kw (#:key a #:body r #:allow-duplicate-keys) r)])
-    (t '(3)   <= (f #:a 1 3)
-       '(3 4) <= (f #:a 1 3 4)
-       '(3)   <= (f #:a 1 #:a 2 3)
-       '(3 4) <= (f #:a 1 #:a 2 3 4)))
-  (t '(#:a 1 #:b 2) <= ((lambda/kw (#:key a #:all-keys r #:allow-body) r)
-                        #:a 1 #:b 2 3)
-     :rt-err: <= ((lambda/kw (#:key x y) (list x y)) #:x)
-     :rt-err: <= ((lambda/kw (#:key x y) (list x y)) #:x 1 #:x)
-     :rt-err: <= ((lambda/kw (#:key x y) (list x y)) #:x #:x #:x))
-
-  ;; optionals and keys
-  (let ([f (lambda/kw (#:optional a b #:key c d) (list a b c d))])
-    ;; the parts that are commented out are relying on the old (CL-like)
-    ;; behavior of always treating the first arguments as optionals.  Now a
-    ;; keyword marks the end of the optionals.
-    (t '(#f #f #f #f)    <= (f)
-       '(1 #f #f #f)     <= (f 1)
-       '(1 2 #f #f)      <= (f 1 2)
-       ;; '(#:c #:d #f #f)  <= (f #:c #:d)
-       ;; '(#:c 1 #f #f)    <= (f #:c 1)
-       '(1 2 #:d #f)     <= (f 1 2 #:c #:d)
-       ;; '(#:c #:d #:d #f) <= (f #:c #:d #:c #:d)
-       ;; '(#:c 1 #:d #f)   <= (f #:c 1 #:c #:d)
-       ;; Test new behavior on the commented expressions that are valid
-       '(#f #f #:d #f)   <= (f #:c #:d)
-       '(#f #f 1 #f)     <= (f #:c 1)
-       ;; Now test the new behavior
-       '(#f #f #f 2)     <= (f #:d 2)
-       '(1 #f #f 2)      <= (f 1 #:d 2)
-       '(1 2 #f 2)       <= (f 1 2 #:d 2)
-       '(1 #f #f 2)      <= (f 1 #f #:d 2)))
-  (let ([f (lambda/kw (x #:optional a b #:key c d) (list x a b c d))])
-    ;; also test that the required argument is still working fine
-    (t '(0 #f #f #f 2)   <= (f 0 #:d 2)
-       '(0 1 #f #f 2)    <= (f 0 1 #:d 2)
-       '(0 1 2 #f 2)     <= (f 0 1 2 #:d 2)
-       '(0 1 #f #f 2)    <= (f 0 1 #f #:d 2)
-       '(#:x 1 #f #f 2)  <= (f #:x 1 #f #:d 2)
-       ;; and test errors
-       :rt-err:          <= (f 0 #:c 2 #:c 3)))
-
-  ;; multi-level arg lists with #:body specs
-  (let ([f (lambda/kw (#:key x y #:body (z)) (list x y z))])
-    (t (f 3) => '(#f #f 3)
-       (f #:y 2 3) => '(#f 2 3)
-       (f #:y 2) => :rt-err:
-       (f #:y 2 3 4) => :rt-err:))
-  (let ([f (lambda/kw (#:key x y #:body (z . r)) (list x y z r))])
-    (t (f 3)         => '(#f #f 3 ())
-       (f #:y 2 3)   => '(#f 2 3 ())
-       (f #:y 2)     => :rt-err:
-       (f #:y 2 3 4) => '(#f 2 3 (4))))
-  (let ([f (lambda/kw (#:key x y #:body (a #:key (xx #:x #f) (yy #:y #f)
-                                           #:allow-duplicate-keys)
-                                 #:allow-duplicate-keys)
-             (list x y a xx yy))])
-    (t '(1 #f 2 3 #f)   <= (f #:x 1 2 #:x 3)
-       '(1 #:x 2 3 #:x) <= (f #:x 1 #:y #:x        2 #:x 3 #:y #:x)
-       '(1 #:x 2 3 #:x) <= (f #:x 1 #:y #:x #:x 11 2 #:x 3 #:y #:x)
-       '(1 #:x 2 3 #:x) <= (f #:x 1 #:y #:x        2 #:x 3 #:y #:x #:x 33)
-       '(1 #:x 2 3 #:x) <= (f #:x 1 #:y #:x #:x 11 2 #:x 3 #:y #:x #:x 33)))
-  (let ([f (lambda/kw (#:key x y #:body (a #:key (xx #:x #f) (yy #:y #f)
-                                           #:allow-duplicate-keys))
-             (list x y a xx yy))])
-    (t '(1 #f 2 3 #f)   <= (f #:x 1 2 #:x 3)
-       '(1 #:x 2 3 #:x) <= (f #:x 1 #:y #:x        2 #:x 3 #:y #:x)
-       :rt-err:         <= (f #:x 1 #:y #:x #:x 11 2 #:x 3 #:y #:x)
-       '(1 #:x 2 3 #:x) <= (f #:x 1 #:y #:x        2 #:x 3 #:y #:x #:x 33)
-       :rt-err:         <= (f #:x 1 #:y #:x #:x 11 2 #:x 3 #:y #:x #:x 33)))
-  (let ([f (lambda/kw (#:key x y #:body (a #:key (xx #:x #f) (yy #:y #f))
-                                 #:allow-duplicate-keys)
-             (list x y a xx yy))])
-    (t '(1 #f 2 3 #f)   <= (f #:x 1 2 #:x 3)
-       '(1 #:x 2 3 #:x) <= (f #:x 1 #:y #:x        2 #:x 3 #:y #:x)
-       '(1 #:x 2 3 #:x) <= (f #:x 1 #:y #:x #:x 11 2 #:x 3 #:y #:x)
-       :rt-err:         <= (f #:x 1 #:y #:x        2 #:x 3 #:y #:x #:x 33)
-       :rt-err:         <= (f #:x 1 #:y #:x #:x 11 2 #:x 3 #:y #:x #:x 33)))
-  (let ([f (lambda/kw (#:key x y #:body (a #:key (xx #:x #f) (yy #:y #f)))
-             (list x y a xx yy))])
-    (t '(1 #f 2 3 #f)   <= (f #:x 1 2 #:x 3)
-       '(1 #:x 2 3 #:x) <= (f #:x 1 #:y #:x        2 #:x 3 #:y #:x)
-       :rt-err:         <= (f #:x 1 #:y #:x #:x 11 2 #:x 3 #:y #:x)
-       :rt-err:         <= (f #:x 1 #:y #:x        2 #:x 3 #:y #:x #:x 33)
-       :rt-err:         <= (f #:x 1 #:y #:x #:x 11 2 #:x 3 #:y #:x #:x 33)))
-
-  ;; #:allow-anything does not check for imbalanced keyword-values
-  (let ([f (lambda/kw (#:key x #:allow-anything) x)])
-    (t (f #:x 1)           => 1
-       (f #:x 1 2)         => 1
-       (f #:x 1 #:y)       => 1
-       (f #:x 1 #:x)       => 1
-       (f #:x 1 #:y 1)     => 1
-       (f #:x 1 #:x 2)     => 1
-       (f #:x 1 #:x 2 #:y) => 1))
-  (t '(#:x 1 #:z) <= ((lambda/kw (#:key x #:allow-anything #:rest r) r)
-                      #:x 1 #:z))
-  (t '(#:z) <= ((lambda/kw (#:key x #:allow-anything #:body r) r) #:x 1 #:z))
-
-  ;; #:body without #:keys forbids all keys
-  (let ([f1 (lambda/kw (#:body b) b)]
-        [f2 (lambda/kw (x #:body b) (cons x b))])
-    (t (f1 1 2) => '(1 2)
-       (f2 1 2) => '(1 2)
-       (f1 #:foo 1 1 2) => :rt-err:
-       (f2 1 #:foo 1 2) => :rt-err:))
-
-  ;; make sure that internal definitions work
-  (let ([f (lambda/kw (#:key x) (define xx x) xx)])
-    (t #f <= (f)
-       1  <= (f #:x 1)))
-
-  ;; test syntax errors
-  (t :st-err: <= (lambda/kw (x #:blah y) 1)
-     :st-err: <= (lambda/kw (x #:rest) 1)
-     :st-err: <= (lambda/kw (x #:key k . r) 1)
-     :st-err: <= (lambda/kw (x #:key k #:key o) 1)
-     :st-err: <= (lambda/kw (x #:key k #:optional o) 1)
-     :st-err: <= (lambda/kw (x #:optional k #:optional o) 1)
-     :st-err: <= (lambda/kw (x #:rest r #:optional o) 1)
-     :st-err: <=
-       (lambda/kw (x #:rest r #:forbid-other-keys #:allow-other-keys) 1)
-     :st-err: <=
-       (lambda/kw (x #:rest r #:allow-other-keys #:forbid-other-keys) 1)
-     :st-err: <=
-       (lambda/kw (x #:rest r #:forbid-duplicate-keys #:allow-duplicate-keys) 1)
-     :st-err: <=
-       (lambda/kw (x #:rest r #:allow-duplicate-keys #:forbid-duplicate-keys) 1)
-     :st-err: <= (lambda/kw (x #:rest r #:forbid-body #:allow-body) 1)
-     :st-err: <= (lambda/kw (x #:rest r #:allow-body #:forbid-body) 1)
-     :st-err: <= (lambda/kw (x #:rest r #:forbid-anything #:allow-anything) 1)
-     :st-err: <= (lambda/kw (x #:rest r #:allow-anything #:forbid-anything) 1)
-     :st-err: <= (lambda/kw (#:key a #:forbid-other-keys #:allow-anything) 1)
-     :st-err: <=
-       (lambda/kw (#:key a #:forbid-duplicate-keys #:allow-anything) 1)
-     :st-err: <= (lambda/kw (#:key a #:forbid-other-keys #:allow-anything) 1)
-     :st-err: <=
-       (lambda/kw (#:key a #:forbid-duplicate-keys #:allow-anything) 1)
-     :st-err: <=
-       (lambda/kw (#:key a #:forbid-body #:allow-anything) 1)
-     :st-err: <= (lambda/kw (x #:rest r1 #:rest r2) 1)
-     :st-err: <= (lambda/kw (x #:rest) 1)
-     :st-err: <= (lambda/kw (x #:rest r1 r2) 1)
-     ;; :st-err: <= (lambda/kw (x #:body b) 1) ; valid!
-     :st-err: <= (lambda/kw (x x) 1)
-     :st-err: <= (lambda/kw (x #:optional [x 1]) 1)
-     :st-err: <= (lambda/kw (x #:key [x 1]) 1)
-     :st-err: <= (lambda/kw (x #:rest x) 1)
-     :st-err: <= (lambda/kw (x #:body x) 1)
-     :st-err: <= (lambda/kw (x #:optional 3) 1)
-     :st-err: <= (lambda/kw (x #:optional "3") 1)
-     :st-err: <= (lambda/kw (x #:optional [(x) 3]) 1)
-     :st-err: <= (lambda/kw (x #:key 3) 1)
-     :st-err: <= (lambda/kw (x #:key "3") 1)
-     :st-err: <= (lambda/kw (x #:key [(y) 3]) 1)
-     :st-err: <= (lambda/kw (x #:key [x]) 1)
-     :st-err: <= (lambda/kw (x #:key [y 1 2]) 1)
-     :st-err: <= (lambda/kw (x #:key [y #:y 1 2]) 1)
-     :st-err: <= (lambda/kw (x #:rest 3) 1)
-     :st-err: <= (lambda/kw (x #:rest "3") 1)
-     :st-err: <= (lambda/kw (x #:rest (x)) 1)
-     :st-err: <= (lambda/kw (x #:body 3) 1)
-     :st-err: <= (lambda/kw (x #:key y #:body 3) 1)
-     :st-err: <= (lambda/kw (x #:body "3") 1)
-     :st-err: <= (lambda/kw (x #:key y #:body "3") 1)
-     :st-err: <= (lambda/kw (x #:body (x)) 1)
-     :st-err: <= (lambda/kw (x #:body x #:allow-other-keys) 1)
-     :st-err: <= (lambda/kw (x #:optional ()) 1)
-     :st-err: <= (lambda/kw (x #:optional (x y z)) 1)
-     ;; :st-err: <= (lambda/kw (x #:other-keys z) 1)      <-- these are all
-     ;; :st-err: <= (lambda/kw (x #:other-keys+body z) 1) <-- fine!
-     ;; :st-err: <= (lambda/kw (x #:all-keys z) 1)        <-- (see below)
-     :st-err: <= (lambda/kw (x #:other-keys z #:forbid-other-keys) 1)
-     :st-err: <= (lambda/kw (x #:all-keys   z #:forbid-other-keys) 1)
-     :st-err: <= (lambda/kw (x #:key y #:allow-other-keys z) 1)
-     :st-err: <= (lambda/kw (x #:key y #:forbid-body z) 1)
-     :st-err: <= (lambda/kw (x #:key y #:allow-body #:rest r #:forbid-body) 1)
-     :st-err: <=
-       (lambda/kw (x #:key y #:forbid-other-keys #:rest r #:allow-other-keys) 1)
-     :st-err: <= (lambda/kw (x #:key y z #:body (x)) x)
-     :st-err: <= (lambda/kw (#:key a #:body r #:forbid-body) r)
-     :st-err: <= (lambda/kw (#:key a #:other-keys r #:forbid-other-keys) r))
-
-  ;; it is ok to have no keys, and still specify all-keys etc
-  (let ([f (lambda/kw (x #:all-keys ak) (list x ak))])
-    (t (f 1)             => '(1 ())
-       (f 1 #:a 2)       => '(1 (#:a 2))
-       (f 1 #:a 2 #:b 3) => '(1 (#:a 2 #:b 3))
-       (f 1 #:a 2 #:a 3) => '(1 (#:a 2 #:a 3))
-       (f 1 #:a 2 #:a 3) => '(1 (#:a 2 #:a 3))))
-
-  )
-
-(report-errs)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/loadtest.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/loadtest.rktl
deleted file mode 100644
index 97a89e74e7..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/loadtest.rktl
+++ /dev/null
@@ -1 +0,0 @@
-(load (collection-file-path "loadtest.rktl" "tests/racket"))
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/macrolib.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/macrolib.rktl
deleted file mode 100644
index 1e5b52262d..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/macrolib.rktl
+++ /dev/null
@@ -1,128 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(Section 'macrolib)
-
-(require mzlib/etc)
-
-(err/rt-test (let+ ([rec a a]) 5) exn:fail:contract:variable?)
-(err/rt-test (let+ ([recs [b c] [c b]]) 5) exn:fail:contract:variable?)
-
-(let ([l1
-       (let+ ([rec d 1]
-              [val e 1]
-              [val x 1]
-              [val y 2]
-              [vals (x y) (y x)]
-              [rec (values f) (values 1)]
-              [vals [(values g h) (values 2 3)]]
-              [val i 3]
-              [_ (set! i 4)
-                 (set! i 5)])
-             'x
-             (list d e x y f g h i))]
-      [l2 (list 1 1 2 1 1 2 3 5)])
-  (test l1 'let-plus l2))
-
-(test 'hi 'local (local () 'hi))
-(define x 7)
-(test 6 'local (local ((define x 6)) x))
-(test 7 'local x)
-(test '... vector-ref (struct->vector (local ((define x 6) (define-struct a (b))) (make-a x))) 1)
-(test #t 'local (local [(define o (lambda (x) (if (zero? x) #f (e (sub1 x)))))
-			(define e (lambda (x) (if (zero? x) #t (o (sub1 x)))))]
-		       (e 10)))
-(test 'second 'local (local ((define x 10) (define u 'second)) (cons x 1) u))
-(test-values '(4 6) (lambda () (local ((define y 6) (define x 4)) (values x y))))
-(test 10 'local (let ([x 10]) (local ((define y (lambda () x))) (define x 5) (y))))
-(test 5 'local (let ([x 10]) (local ((define y (lambda () x))) (define x 5) x)))
-(test 8 'local (let ([lambda 9]) (local [(define lambda 8)] lambda)))
-(test 9 'local (let ([lambda 10]) (local [(define lambda 9) (define lambda2 lambda)] lambda2)))
-(test 19 'local (local [(define lambda 19) (define lambda2 lambda)] lambda2))
-(test 1 'local (local ((define-values (a b c) (values 1 2 3))) a))
-(test 1 (lambda () (local ((define-values (a b c) (values 1 2 3))) a)))
-(test 8 'local (local [(define lambda 8)] lambda))
-(test 12 'local (local [(define (f y) (add1 y))] (f 11)))
-(test 120 'local (local [(define (f y) 'ignore-me (add1 y))] (f 119)))
-(test 17 'local (local [(define-values (apple b) (values 12 17))] b))
-(test 4 'local (local [(define-struct cons (car cdr))] (cons-car (make-cons 4 5))))
-(test 40 'local (local [(define-struct (cons exn) (car cdr))] (cons-car (make-cons "" (current-continuation-marks) 40 50))))
-(syntax-test #'(local))
-(syntax-test #'(local . 1))
-(syntax-test #'(local ()))
-(syntax-test #'(local () . 1))
-(syntax-test #'(local 1 1))
-(syntax-test #'(local (1) 1))
-(syntax-test #'(local (x) 1))
-(syntax-test #'(local ((+ 1 2)) 1))
-(syntax-test #'(local ((define x)) 1))
-(syntax-test #'(local ((define x 4) (+ 1 2)) 1))
-(syntax-test #'(local ((define x 4) (+ 1 2) (define y 10)) 1))
-(syntax-test #'(local ((define (x 8) 4)) 1))
-(syntax-test #'(local ((define (x . 8) 4)) 1))
-(syntax-test #'(local ((define x 8 4)) 1))
-(syntax-test #'(local ((define 1 8 4)) 1))
-(syntax-test #'(let ([define 10]) (local ((define x 4)) 10)))
-(syntax-test #'(let ([define-values 10]) (local ((define-values (x) 4)) 10)))
-(syntax-test #'(let ([define-struct 10]) (local ((define-struct x ())) 10)))
-
-(define else #t) ;; `evcase' needs unbound `else' !!!! <------------------ WARNING
-
-(for-each syntax-test 
-	  (list #'(evcase)
-		#'(evcase 1 (a))
-		#'(evcase 1 (a b) a)
-		#'(evcase 1 (a . b) a)
-		#'(evcase 1 [else 5] [1 10])))
-(define => 17)
-(test (void) 'void-evcase (with-handlers ([(lambda (x) #t) (lambda (x) 17)]) (evcase 1)))
-(test #t andmap (lambda (x) (= x 17))
-      (list
-       (evcase 3 [3 17])
-       (evcase 3 [(+ 1 2) 17] [3 1])
-       (evcase 3 [3 4 5 17])
-       (evcase 3 [4 1] [3 4 5 17])
-       (evcase 3 [4 1 2 3 4] [3 4 5 17])
-       (evcase 3 [4 4] [2 10] [else 17])
-       (let ([else 10]) (evcase 3 [4 4] [2 10] [else 15] [3 17]))
-       (let ([else 3]) (evcase 3 [else 17] [2 14]))
-       (if (eq? (void) (evcase 1)) 17 'bad)
-       (evcase 3 [3 =>])
-       (evcase 3 [3 => 17])
-       (let ([=> 12]) (evcase 3 [3 => 17]))
-       (let ([=> 17]) (evcase 3 [3 =>]))))
-
-(require (only-in scheme/base else)) ; fix `else'
-
-(define (opt-lam-test exp expected)
-   (let ([got (eval exp)])
-     (unless (equal? got expected)
-       (printf  "FAILED test: ~a\n   expected: ~s\n        got: ~s\n"
-                exp expected got))))
-
-(define (opt-lam-test/bad exp expected)
-   (let ([got (with-handlers ([exn:syntax?
-                               (lambda (exn) (exn-message exn))])
-                (cons 'got-result (eval exp)))])
-     (unless (regexp-match expected got)
-       (printf  "FAILED test: ~a\n   expected: ~s\n        got: ~s\n"
-                exp expected got))))
-
-(test 1 (opt-lambda (start) start) 1)
-(test 1 (opt-lambda ([start 1]) start))
-(test 1 (opt-lambda ([start 2]) start) 1)
-(test '(1) (opt-lambda args args) 1)
-(test '(1) (opt-lambda (x . args) args) 2 1)
-(test '(2 1) (opt-lambda ([x 1] . args) (cons x args)) 2 1)
-(test '(1) (opt-lambda ([x 1] . args) (cons x args)))
-(test '(1 2 3) (opt-lambda ([x 1] . args) (cons x args)) 1 2 3)
-
-(syntax-test #'(opt-lambda))
-(syntax-test #'(opt-lambda 1 x))
-(syntax-test #'(opt-lambda (x [x 1]) x))
-(syntax-test #'(opt-lambda ([x 1] y) x))
-(syntax-test #'(opt-lambda (1) x))
-(syntax-test #'(opt-lambda ([2 1]) x))
-
-(report-errs)
-
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/pconvert.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/pconvert.rktl
deleted file mode 100644
index 523a24ddb3..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/pconvert.rktl
+++ /dev/null
@@ -1,438 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(Section 'pconvert)
-
-(require mzlib/file
-         mzlib/class
-         mzlib/pconvert
-         mzlib/pconvert-prop)
-
-(constructor-style-printing #t)
-(quasi-read-style-printing #f)
-(add-make-prefix-to-constructor #t)
-
-(define (xl) 1)
-(define (xc) (class object% (sequence (super-init))))
-
-(let ()
-  (define-struct pctest (value constructor-sexp
-                               whole/frac-constructor-sexp
-                               shared-constructor-sexp
-                               quasi-sexp
-                               whole/frac-quasi-sexp
-                               shared-quasi-sexp
-                               cons-as-list))
-  
-  (define-struct no-cons-test (value constructor-sexp shared-constructor-sexp
-                                     quasi-sexp shared-quasi-sexp))
-  (define-struct same-test (value sexp))
-  (define get-value
-    (lambda (test-case)
-      (cond
-        [(pctest? test-case)
-         (pctest-value test-case)]
-        [(no-cons-test? test-case)
-         (no-cons-test-value test-case)]
-        [(same-test? test-case)
-         (same-test-value test-case)])))
-  (define run-test
-    (lambda (test-case)
-      (let* ([before (get-value test-case)]
-             [cmp
-              (lambda (selector constructor-style?
-                                quasi-read?
-                                sharing?
-                                cons-as-list?
-                                whole/fractional-numbers?)
-                (unless (parameterize ([constructor-style-printing constructor-style?]
-                                       [show-sharing sharing?]
-                                       [quasi-read-style-printing quasi-read?]
-                                       [abbreviate-cons-as-list cons-as-list?]
-                                       [whole/fractional-exact-numbers whole/fractional-numbers?])
-                          (test (selector test-case) print-convert before))
-                  (printf
-                   ">> (constructor-style-printing ~a) (quasi-read-style-printing ~a) (show-sharing ~a) (abbreviate-cons-as-list ~a) (whole/fractional-exact-numbers ~a)\n"
-                   constructor-style? quasi-read? 
-                   sharing? cons-as-list?
-                   whole/fractional-numbers?)))])
-        ;(printf "testing: ~s\n" before)
-        ;(printf ".") (flush-output (current-output-port))
-        (cond
-          [(pctest? test-case)
-           (cmp pctest-constructor-sexp #t #f #f #t #f)
-           (cmp pctest-whole/frac-constructor-sexp #t #f #f #t #t)
-           (cmp pctest-shared-constructor-sexp #t #f #t #t #f)
-           (cmp pctest-quasi-sexp #f #f #f #t #f)
-           (cmp pctest-whole/frac-quasi-sexp #f #f #f #t #t)
-           (cmp pctest-shared-quasi-sexp #f #f #t #t #f)
-           (cmp pctest-cons-as-list #t #f #f #f #f)]
-          [(no-cons-test? test-case)
-           (cmp no-cons-test-shared-constructor-sexp #t #f #t #t #t)
-           (cmp no-cons-test-constructor-sexp #t #f #f #t #t)
-           (cmp no-cons-test-shared-quasi-sexp #f #f #t #t #t)
-           (cmp no-cons-test-quasi-sexp #f #f #f #t #t)]
-          [(same-test? test-case)
-           (cmp same-test-sexp #t #t #t #t #t)
-           (cmp same-test-sexp #t #t #t #t #f)
-           (cmp same-test-sexp #t #t #t #f #t)
-           (cmp same-test-sexp #t #t #t #f #f)
-           (cmp same-test-sexp #t #t #f #t #t)
-           (cmp same-test-sexp #t #t #f #t #f)
-           (cmp same-test-sexp #t #t #f #f #t)
-           (cmp same-test-sexp #t #t #f #f #f)
-           
-           (cmp same-test-sexp #t #f #t #t #t)
-           (cmp same-test-sexp #t #f #t #t #f)
-           (cmp same-test-sexp #t #f #t #f #t)
-           (cmp same-test-sexp #t #f #t #f #f)
-           (cmp same-test-sexp #t #f #f #t #t)
-           (cmp same-test-sexp #t #f #f #t #f)
-           (cmp same-test-sexp #t #f #f #f #t)
-           (cmp same-test-sexp #t #f #f #f #f)
-           
-           (cmp same-test-sexp #f #t #t #t #t)
-           (cmp same-test-sexp #f #t #t #t #f)
-           (cmp same-test-sexp #f #t #t #f #t)
-           (cmp same-test-sexp #f #t #t #f #f)
-           (cmp same-test-sexp #f #t #f #t #t)
-           (cmp same-test-sexp #f #t #f #t #f)
-           (cmp same-test-sexp #f #t #f #f #t)
-           (cmp same-test-sexp #f #t #f #f #f)
-           
-           (cmp same-test-sexp #f #f #t #t #t)
-           (cmp same-test-sexp #f #f #t #t #f)
-           (cmp same-test-sexp #f #f #t #f #t)
-           (cmp same-test-sexp #f #f #t #f #f)
-           (cmp same-test-sexp #f #f #f #t #t)
-           (cmp same-test-sexp #f #f #f #t #f)
-           (cmp same-test-sexp #f #f #f #f #t)
-           (cmp same-test-sexp #f #f #f #f #f)]))))
-  
-  (define 
-    tests
-    (list
-     (make-same-test "abc" "abc")
-     (make-same-test 'a ''a)
-     (make-same-test '#:abc ''#:abc)
-     
-     (make-same-test 8 8)
-     (make-same-test 1/2 1/2)
-     (make-same-test 1.1 1.1)
-     
-     (make-pctest -10/3 -10/3 '(+ -3 -1/3) -10/3 -10/3 '(+ -3 -1/3) -10/3 -10/3)
-     (make-pctest 3/2 3/2 '(+ 1 1/2) 3/2 3/2 '(+ 1 1/2) 3/2 3/2)
-     
-     (make-pctest (list 1) '(list 1) '(list 1) '(list 1) '`(1) '`(1) '`(1) '(cons 1 empty))
-     (make-pctest (list 1/2) '(list 1/2) '(list 1/2) '(list 1/2)
-                  '`(1/2) '`(1/2)  '`(1/2)
-                  '(cons 1/2 empty))
-     (make-pctest (list 3/2) '(list 3/2) '(list (+ 1 1/2)) '(list 3/2)
-                  '`(3/2) '`(,(+ 1 1/2)) '`(3/2)
-                  '(cons 3/2 empty))
-     (make-pctest (list 1/2+1/2i) 
-                  '(list 1/2+1/2i) 
-                  '(list (+ 1/2 (* 0+1i 1/2))) 
-                  '(list 1/2+1/2i)
-                  '`(1/2+1/2i) 
-                  '`(,(+ 1/2 (* 0+1i 1/2)))  
-                  '`(1/2+1/2i)
-                  '(cons 1/2+1/2i empty))
-     (make-pctest (list 3/2+1/2i) 
-                  '(list 3/2+1/2i) 
-                  '(list (+ (+ 1 1/2) (* 0+1i 1/2))) 
-                  '(list 3/2+1/2i)
-                  '`(3/2+1/2i) 
-                  '`(,(+ (+ 1 1/2) (* 0+1i 1/2)))  
-                  '`(3/2+1/2i)
-                  '(cons 3/2+1/2i empty))
-     (make-pctest (list 1/2+3/2i) 
-                  '(list 1/2+3/2i) 
-                  '(list (+ 1/2 (* 0+1i (+ 1 1/2)))) 
-                  '(list 1/2+3/2i)
-                  '`(1/2+3/2i) 
-                  '`(,(+ 1/2 (* 0+1i (+ 1 1/2))))  
-                  '`(1/2+3/2i)
-                  '(cons 1/2+3/2i empty))
-     (make-pctest (list 3/2+3/2i) 
-                  '(list 3/2+3/2i) 
-                  '(list (+ (+ 1 1/2) (* 0+1i (+ 1 1/2)))) 
-                  '(list 3/2+3/2i)
-                  '`(3/2+3/2i) 
-                  '`(,(+ (+ 1 1/2) (* 0+1i (+ 1 1/2))))  
-                  '`(3/2+3/2i)
-                  '(cons 3/2+3/2i empty))
-     
-     (make-same-test (vector 0 0 0 0 0 0 0 0 0 0) '(vector 0 0 0 0 0 0 0 0 0 0))
-     (make-same-test (vector-immutable 1 2 3 4 5) '(vector-immutable 1 2 3 4 5))
-     (make-same-test #t 'true)
-     (make-same-test #f 'false)
-     
-     (make-same-test (interface () a b c) '(interface ...))
-     
-     (make-same-test (delay 1) '(delay ...))
-     (make-same-test (let () (define-struct a (a) #:inspector (make-inspector)) (make-a 3)) '(make-a 3))
-     (make-same-test (box 3) '(box 3))
-     (make-same-test (box-immutable 4) '(box-immutable 4))
-     (make-pctest null 'empty 'empty 'empty '`() '`() '`() 'empty)
-     (make-same-test add1 'add1)
-     (make-same-test (void) '(void))
-     (make-same-test (make-weak-box 12) '(make-weak-box 12))
-     (make-same-test (regexp "1") '(regexp "1"))
-     (make-same-test (module-path-index-join #f #f) '(module-path-index-join false false))
-     (make-same-test (lambda () 0) '(lambda () ...))
-
-     (make-same-test xl 'xl)
-     (make-same-test (letrec ([xl (lambda () 1)]) xl) '(lambda () ...))
-     (make-same-test (letrec ([xl-ID-BETTER-NOT-BE-DEFINED (lambda () 1)]) 
-                       xl-ID-BETTER-NOT-BE-DEFINED)
-                     '(lambda () ...))
-     (make-same-test xc 'xc)
-     (make-same-test (letrec ([xc (class object%)]) xc) '(class ...))
-     (make-same-test (letrec ([xc-ID-BETTER-NOT-BE-DEFINED (class object%)]) 
-                       xc-ID-BETTER-NOT-BE-DEFINED)
-                     '(class ...))
-     (make-same-test (lambda (x) x) '(lambda (a1) ...))
-     (make-same-test (lambda x x) '(lambda args ...))
-     (make-same-test (lambda (a b . c) a) '(lambda (a1 a2 . args) ...))
-     (make-same-test (case-lambda) '(case-lambda))
-     (make-same-test (case-lambda [() 'a] [(x) 'a]) '(case-lambda [() ...] [(a1) ...]))
-     (make-same-test (case-lambda [() 'a] [(x y) 'a])
-                     '(case-lambda [() ...] [(a1 a2) ...]))
-     (make-same-test (case-lambda [() 'a] [(x . y) 'a])
-                     '(case-lambda [() ...] [(a1 . args) ...]))
-     (make-same-test (case-lambda [() 'a] [x 'a])
-                     '(case-lambda [() ...] [args ...]))
-     (make-same-test (case-lambda [() 'a] [(x y z) 'a] [x 'a])
-                     '(case-lambda [() ...] [(a1 a2 a3) ...] [args ...]))
-     (make-same-test (make-hasheq)
-                     '(make-hasheq))
-     (make-same-test (make-weak-hasheq)
-                     '(make-weak-hasheq))
-     (make-same-test (make-hash)
-                     '(make-hash))
-     (make-same-test (make-weak-hash)
-                     '(make-weak-hash))
-     (make-same-test (let ([ht (make-hash)])
-                       (hash-set! ht 'x 1)
-                       ht)
-                     '(make-hash (list (cons 'x 1))))
-     (make-pctest (list 'a (box (list '())) (cons 1 '()))
-                  '(list (quote a) (box (list empty)) (list 1))
-                  '(list (quote a) (box (list empty)) (list 1))
-                  '(list (quote a) (box (list empty)) (list 1))
-                  '`(a ,(box `(())) (1))
-                  '`(a ,(box `(())) (1))
-                  '`(a ,(box `(())) (1))
-                  '(cons 'a 
-                         (cons (box (cons empty empty))
-                               (cons (cons 1 empty)
-                                     empty))))
-     (make-pctest (list "" "" (vector) (vector))
-                  '(list "" "" (vector) (vector))
-                  '(list "" "" (vector) (vector))
-                  '(list "" "" (vector) (vector))
-                  '`("" "" ,(vector) ,(vector))
-                  '`("" "" ,(vector) ,(vector))
-                  '`("" "" ,(vector) ,(vector))
-                  '(cons "" (cons "" (cons (vector) (cons (vector) empty)))))
-     (make-pctest (read (open-input-string "#0=(#0#)"))
-                  '(shared ([-0- (list -0-)]) -0-)
-                  '(shared ([-0- (list -0-)]) -0-)
-                  '(shared ([-0- (list -0-)]) -0-)
-                  '(shared ([-0- `(,-0-)]) -0-)
-                  '(shared ([-0- `(,-0-)]) -0-)
-                  '(shared ([-0- `(,-0-)]) -0-)
-                  '(shared ([-0- (cons -0- empty)]) -0-))
-     (make-pctest (read (open-input-string "#0=(1 . #0#)"))
-                  '(shared ([-0- (cons 1 -0-)]) -0-)
-                  '(shared ([-0- (cons 1 -0-)]) -0-)
-                  '(shared ([-0- (cons 1 -0-)]) -0-)
-                  '(shared ([-0- `(1 . ,-0-)]) -0-)
-                  '(shared ([-0- `(1 . ,-0-)]) -0-)
-                  '(shared ([-0- `(1 . ,-0-)]) -0-)
-                  '(shared ([-0- (cons 1 -0-)]) -0-))
-     (make-pctest (let ([b (read (open-input-string "#0=(#0# (1 . #1=(2 3)) #1#)"))])
-                    (append b (list (list 2 3))))
-                  '(shared ([-1- (list -1- (list 1 2 3) (list 2 3))])
-                     (list -1- (list 1 2 3) (list 2 3) (list 2 3)))
-                  '(shared ([-1- (list -1- (list 1 2 3) (list 2 3))])
-                     (list -1- (list 1 2 3) (list 2 3) (list 2 3)))
-                  '(shared ([-1- (list -1- -3- -4-)]
-                            [-3- (cons 1 -4-)]
-                            [-4- (list 2 3)])
-                     (list -1- -3- -4- (list 2 3)))
-                  '(shared ([-1- `(,-1- (1 2 3) (2 3))])
-                     `(,-1- (1 2 3) (2 3) (2 3)))
-                  '(shared ([-1- `(,-1- (1 2 3) (2 3))])
-                     `(,-1- (1 2 3) (2 3) (2 3)))
-                  '(shared ([-1- `(,-1- ,-3- ,-4-)]
-                            [-3- `(1 . ,-4-)]
-                            [-4- `(2 3)])
-                     `(,-1- ,-3- ,-4- (2 3)))
-                  '(shared ([-1- (cons -1- 
-                                       (cons (cons 1 (cons 2 (cons 3 empty)))
-                                             (cons (cons 2 (cons 3 empty))
-                                                   empty)))])
-                     (cons -1- 
-                           (cons (cons 1 (cons 2 (cons 3 empty)))
-                                 (cons (cons 2 (cons 3 empty)) 
-                                       (cons (cons 2 (cons 3 empty))
-                                             empty))))))
-     (make-no-cons-test (let ([b (read (open-input-string "#0=(#0# (1 . #1=(2 3)) #1#)"))])
-                          (let* ([share-list (append b (list (list 2 3)))]
-                                 [v (vector 1 share-list (cdr share-list))])
-                            (vector-set! v 0 v)
-                            v))
-                        '(shared
-                             ((-0- (vector -0-
-                                           (list -2-
-                                                 (list 1 2 3)
-                                                 (list 2 3)
-                                                 (list 2 3))
-                                           (list (list 1 2 3)
-                                                 (list 2 3)
-                                                 (list 2 3))))
-                              (-2- (list -2- (list 1 2 3) (list 2 3))))
-                           -0-)
-                        '(shared
-                             ((-0- (vector -0- (cons -2- -8-) -8-))
-                              (-2- (list -2- -4- -5-))
-                              (-4- (cons 1 -5-))
-                              (-5- (list 2 3))
-                              (-8- (list -4- -5- (list 2 3))))
-                           -0-)
-                        '(shared
-                             ((-0- (vector -0-
-                                           `(,-2-
-                                             (1 2 3)
-                                             (2 3)
-                                             (2 3))
-                                           `((1 2 3)
-                                             (2 3)
-                                             (2 3))))
-                              (-2- `(,-2- (1 2 3) (2 3))))
-                           -0-)
-                        '(shared
-                             ((-0- (vector -0- `(,-2- . ,-8-) -8-))
-                              (-2- `(,-2- ,-4- ,-5-))
-                              (-4- `(1 . ,-5-))
-                              (-5- `(2 3))
-                              (-8- `(,-4- ,-5- (2 3))))
-                           -0-))
-     (make-pctest (read (open-input-string "#hasheq((#0=(1 . #0#) . a))"))
-                  '(shared ((-1- (cons 1 -1-))) (make-hasheq (list (cons -1- 'a))))
-                  '(shared ((-1- (cons 1 -1-))) (make-hasheq (list (cons -1- 'a))))
-                  '(shared ((-1- (cons 1 -1-))) (make-hasheq (list (cons -1- 'a))))
-                  '(shared ((-1- `(1 unquote -1-))) (make-hasheq (list (cons -1- 'a))))
-                  '(shared ((-1- `(1 unquote -1-))) (make-hasheq (list (cons -1- 'a))))
-                  '(shared ((-1- `(1 unquote -1-))) (make-hasheq (list (cons -1- 'a))))
-                  '(shared ((-1- (cons 1 -1-))) (make-hasheq (list (cons -1- 'a)))))))
-  (for-each run-test tests))
-
-(let ()
-  (define make-pctest-shared
-    (lambda (shared?)
-      (lambda (object output)
-        (parameterize ([constructor-style-printing #t]
-                       [show-sharing #t]
-                       [quasi-read-style-printing #f]
-                       [abbreviate-cons-as-list #t])
-          (test (if shared?
-                    `(shared ((-1- ,output))
-                       (list -1- -1-))
-                    `(list ,output ,output))
-                print-convert
-                (list object object))))))
-  (define test-shared (make-pctest-shared #t))
-  (define test-not-shared (make-pctest-shared #f))
-  
-  (test-not-shared #t 'true)
-  (test-not-shared #f 'false)
-  (test-not-shared 1 1)
-  (test-not-shared 3276832768327683276832768327683276832768
-                   3276832768327683276832768327683276832768)
-  (test-shared (regexp "") '(regexp ""))
-  (let ([in (open-input-string "")]) (test-shared in in))
-  (let ([out (open-output-string)]) (test-shared out out))
-  (test-not-shared #\a #\a)
-  (test-not-shared 'x ''x)
-  (test-shared (lambda (x) x) '(lambda (a1) ...))
-  (test-shared (delay 1) '(delay ...))
-  (test-shared (class object%) '(class ...))
-  (test-shared (new (class object% (super-new))) '(instantiate (class ...) ...))
-  
-  (test-shared "abc" "abc")
-  (test-shared (list 1 2 3) '(list 1 2 3))
-  (test-shared (vector 1 2 3) '(vector 1 2 3))
-  (let () (define-struct a () #:inspector (make-inspector)) (test-shared (make-a) '(make-a)))
-  (test-shared (box 1) '(box 1))
-  (test-shared (make-hash) '(make-hash)))
-
-(arity-test print-convert 1 2)
-(arity-test build-share 1 1)
-(arity-test get-shared 1 2)
-(arity-test print-convert-expr 3 3)
-
-(test 'empty print-convert '())
-
-(let ([fn (make-temporary-file "pconvert.rktl-test~a")])
-  (let ([in (open-input-file fn)])
-    (test `(open-input-file ,fn) print-convert in)
-    (close-input-port in))
-  (delete-file fn))
-
-(let ()
-  (define-struct hidden (a))
-  (define-struct visible (b) #:inspector (make-inspector))
-  (test '(make-hidden ...) print-convert (make-hidden 1))
-  (test '(make-visible 2) print-convert (make-visible 2)))
-
-(let ([pc
-       (lambda (pv)
-         (lambda (x)
-           (parameterize ([booleans-as-true/false pv])
-             (print-convert x))))])
-  (test 'false (pc #t) #f)
-  (test 'true (pc #t) #t)
-  (test #f (pc #f) #f)
-  (test #t (pc #f) #t))
-
-(let ([pc
-       (λ (prefix?)
-         (λ (x)
-           (parameterize ([add-make-prefix-to-constructor prefix?])
-             (print-convert x))))])
-  (struct s (x) #:transparent)
-  (test '(s 1) (pc #f) (s 1))
-  (test '(make-s 1) (pc #t) (s 1)))
-
-(let ([pc
-       (lambda (pv)
-         (lambda (x)
-           (parameterize ([named/undefined-handler (lambda (x) 'whee)]
-                          [use-named/undefined-handler
-                           (lambda (x) pv)])
-             (print-convert x))))])
-  (test '(lambda (a1) ...) (pc #f) (let ([f (lambda (x) x)]) f))
-  (test 'whee (pc #t) (let ([f (lambda (x) x)]) f))
-  (test '(list whee whee) 
-        (pc #t) 
-        (let ([g (lambda (y) (let ([f (lambda (x) y)]) f))]) (list (g 1) (g 2)))))
-
-;; ----------------------------------------
-
-(let ()
-  (define-struct pt (x [y #:mutable])
-    #:property prop:print-converter (lambda (v recur)
-                                      `(PT! ,(recur (pt-y v))
-                                            ,(recur (pt-x v)))))
-  (test '(PT! 2 3) print-convert (make-pt 3 2))
-  (test '(PT! 2 (list 3)) print-convert (make-pt '(3) 2))
-  (let ([p (make-pt 1 2)])
-    (set-pt-y! p p)
-    (test '(shared ([-0- (PT! -0- 1)]) -0-) print-convert p)))
-
-;; ----------------------------------------
-
-(report-errs)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/restart.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/restart.rktl
deleted file mode 100644
index 2fcaa5f247..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/restart.rktl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(require mzlib/restart)
-
-(Section 'restart)
-
-(test #t restart-mzscheme #("ignore-me") values #("") void)
-(let ([test-in-out 
-       (lambda (pre post in out err?)
-         (let ([err-out (open-output-string)])
-           (test (if out
-                     (string-append "> " out "\n> ")
-                     "")
-                 'result
-                 (let ([s (open-output-string)])
-                   (parameterize ([current-input-port (open-input-string in)]
-                                  [current-output-port s]
-                                  [current-error-port err-out])
-                     (restart-mzscheme pre values post void)
-                     (get-output-string s))))
-           (test err? not (string=? "" (get-output-string err-out)))))])
-  (test-in-out #("-q" "ignore-me") #("-i") "(current-command-line-arguments)" "#()" #f)
-  (test-in-out #("-q") #("-i") "'Hello" "Hello" #f)
-  (test-in-out #("-q") #() "'Hello" "Hello" #f)
-  (test-in-out #("-q") #("-e" "1") "" #f #f)
-  (test-in-out #("-q") #("-i" "-e" "1") "'Hello" "Hello" #f)
-  (test-in-out #("-q") #("-e" "z") "" #f #t)
-  (test-in-out #("-q") #("-e" "car" "-i") "'Hello" "Hello" #f)
-  (test-in-out #("-q") #("-e" "car") "" #f #f)
-  (test-in-out #("-q") #("-l" "scheme/list" "-e" "car") "" #f #t)
-  )
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(report-errs)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/serialize.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/serialize.rktl
deleted file mode 100644
index 7b7cc5b3e9..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/serialize.rktl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(Section 'serialization)
-
-(module ser-mod mzscheme
-   (require mzlib/serialize)
-   (provide ser-mod-test)
-
-   (define-serializable-struct foo (a b))
-
-   (define (ser-mod-test)
-     (foo-a (deserialize (serialize (make-foo 1 2))))))
-
-(require 'ser-mod)
-(test 1 ser-mod-test)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/string-mzlib.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/string-mzlib.rktl
deleted file mode 100644
index b0c6406c79..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/string-mzlib.rktl
+++ /dev/null
@@ -1,106 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(Section 'mzlib-string)
-
-(require mzlib/string)
-
-(let ([s1 (string-copy "Hello!")])
-  (string-lowercase! s1)
-  (test "hello!" 'lowercase s1)
-  (string-uppercase! s1)
-  (test "HELLO!" 'uppercase s1))
-
-(test 1 read-from-string "1")
-(test #f read-from-string "#f (2 3) (")
-(test #f read-from-string #"#f (2 3) (")
-(test 1 read-from-string "(" (lambda () 1))
-(test 1 read-from-string "(" (lambda (_) 1))
-(test '(1) read-from-string-all "1")
-(test '(#f (2 3)) read-from-string-all "#f (2 3)")
-(test '(#f (2 3)) read-from-string-all #"#f (2 3)")
-(test 1 read-from-string-all "(" (lambda () 1))
-(test 1 read-from-string-all "(" (lambda (_) 1))
-
-(test '1 eval-string "1")
-(test-values '(1 2 3) (lambda () (eval-string "1 2 3")))
-(test-values '(1 2 3) (lambda () (eval-string #"1 2 3")))
-(test-values '(1 2 3) (lambda () (eval-string "(values 1 2 3)")))
-(test-values '()      (lambda () (eval-string "(values)")))
-(test-values '(1 2 3) (lambda () (eval-string "1 (values 2 3)")))
-(test-values '(1 2 3) (lambda () (eval-string "(values 1 2) 3")))
-(test-values '(1 2 3 4 5)
-             (lambda ()
-               (eval-string "(values 1 2) 3 (values) (values 4 5)")))
-
-(let ([s (open-input-string "hello there")])
-  (test #f regexp-match/fail-without-reading #rx"not there" s)
-  (test #f regexp-match/fail-without-reading #rx"t$" s)
-  (test #f regexp-match/fail-without-reading #rx"hello there!!!" s)
-  (test "hello there" read-string 50 s))
-
-;; Check remaining `regexp-match/fail-without-reading' arguments
-(let ([s (open-input-string "hello there")]
-      [o (open-output-bytes)])
-  (test #f regexp-match/fail-without-reading #rx"not there" s 0 5 o)
-  (test #"" get-output-bytes o)
-  (test #f regexp-match/fail-without-reading #rx"^hello" s 1 #f o)
-  (test #"" get-output-bytes o)
-  (test #f regexp-match/fail-without-reading #rx"^hello" s 0 #f o #"_")
-  (test #"" get-output-bytes o)
-  (test '(#"ello") regexp-match/fail-without-reading #rx"ello" s 0 #f o)
-  (test #"h" get-output-bytes o))
-
-(let ([g->re-test
-       (lambda (glob . more)
-         (let ([re (apply glob->regexp glob more)])
-           (lambda xs
-             (let loop ([xs xs] [res 'unspecified])
-               (when (pair? xs)
-                 (loop (cdr xs)
-                       (if (boolean? (car xs))
-                         (car xs)
-                         (begin (test res regexp-match? re (car xs))
-                                res))))))))])
-  ((g->re-test #"foo*bar" #t #t)
-   #t #"foobar" #"foo-bar" #"foo--bar"
-   #f #"fobar" #"foo-barr" #"ffoo-bar" #".foobar")
-  ((g->re-test "foo*bar" #t #t)
-   #t "foobar" "foo-bar" "foo--bar"
-   #f "fobar" "foo-barr" "ffoo-bar" ".foobar")
-  ((g->re-test "*foo-bar" #t #t)
-   #f "foobar" "foo-barr"
-   #t "foo-bar" "-foo-bar" "foo-foo-bar" "foo-bar-foo-bar" "f.foo-bar"
-   #f ".foo-bar" ".foo-foo-bar")
-  ((g->re-test "[ab]*foo-bar" #t #t)
-   #f "foobar" "foo-barr" "foo-bar"
-   #t "afoo-bar" "b-foo-bar" "a-foo-foo-bar" "b.foo-bar"
-   #f ".afoo-bar" ".b-foo-bar")
-  ((g->re-test "[.]foo-bar" #t #t)
-   #f "foobar" "foo-barr" "foo-bar" "-foo-bar" ".foo-bar")
-  ((g->re-test "foo*bar" #t #f)
-   #t "fOobAr" "Foo-Bar" "foO--baR"
-   #f "FoBar" "fOO-baRR" "FFoo-bar" ".foobar")
-  ((g->re-test "foo*bar" #f #t)
-   #t "foobar" "foo-bar" "foo--bar"
-   #f "fobar" "foo-barr" "ffoo-bar" ".foobar")
-  ((g->re-test "*foo-bar" #f #t)
-   #f "foobar" "foo-barr"
-   #t "foo-bar" "-foo-bar" "foo-foo-bar" "foo-bar-foo-bar" "f.foo-bar"
-   #t ".foo-bar" ".foo-foo-bar")
-  ((g->re-test "[ab]*foo-bar" #f #t)
-   #f "foobar" "foo-barr" "foo-bar"
-   #t "afoo-bar" "b-foo-bar" "a-foo-foo-bar" "b.foo-bar"
-   #f ".afoo-bar" ".b-foo-bar")
-  ((g->re-test "[.]foo-bar" #f #t)
-   #f "foobar" "foo-barr" "foo-bar" "-foo-bar"
-   #t ".foo-bar")
-  ((g->re-test "foo{*}bar" #t #t)
-   #f "foo{bar" "foo{-{bar" "foo{}barr" ".foo-bar"
-   #t "foo{}bar" "foo{-}bar" "foo{{}}bar"  "foo{}{}bar")
-  ((g->re-test "^foo{[*]}bar$" #t #t #t)
-   #f "^foo{[}bar$" "^foo{[-]{bar$" "^foo{[]}barr$" ".^foo{[]}bar$"
-   #t "^foo{[]}bar$" "^foo{[-]}bar$" "^foo{[{}]}bar$"  "^foo{[]}{[]}bar$")
-  ((g->re-test "$[.]^" #t #t #t) #f "$[,]^" #t "$[.]^"))
-
-(report-errs)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/structlib.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/structlib.rktl
deleted file mode 100644
index 0bc13c80d3..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/structlib.rktl
+++ /dev/null
@@ -1,40 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(Section 'structlib)
-
-(require mzlib/struct)
-
-(let* ([now (seconds->date (current-seconds))]
-       [v (modulo (add1 (date-second now)) 60)])
-  (test #t equal? now (copy-struct date* now))
-  (test #f equal? now (copy-struct date* now (date-second v)))
-  (test v date-second (copy-struct date* now (date-second v)))
-  (test (date-year now) date-year (copy-struct date* now (date-second v))))
-
-(err/rt-test (copy-struct date 10))
-(err/rt-test (copy-struct date 10 (date-second 0)))
-
-(syntax-test #'copy-struct)
-(syntax-test #'(copy-struct))
-(syntax-test #'(copy-struct date))
-(syntax-test #'(copy-struct date 10 foo))
-(syntax-test #'(copy-struct date 10 . foo))
-(syntax-test #'(copy-struct date 10 (foo)))
-(syntax-test #'(copy-struct date 10 (foo . bar)))
-
-(syntax-test #'(copy-struct x 10))
-(syntax-test #'(copy-struct date 10 (date-foo 12)))
-(syntax-test #'(copy-struct date 10 (date-second 12) (date-yeeer 10)))
-(syntax-test #'(copy-struct date 10 (date-second 12) (date-second 10)))
-
-(require (only-in mzscheme [date-second mz:date-second]))
-(syntax-test #'(copy-struct date 10 (date-second 12) (mz:date-second 10)))
-
-(let ([v (let ()
-	   (define-struct a (b c) #:inspector (make-inspector))
-	   ;; This `copy-struct' is expanded in an internal-defn context
-	   (copy-struct a (make-a 1 2) (a-c 13)))])
-  (test #(struct:a 1 13) struct->vector v))
-
-(report-errs)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/test.rkt b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/test.rkt
deleted file mode 100644
index 3d4b07add8..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/test.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/load
-
-(define quiet-load (collection-file-path "tests.rktl" "tests" "mzlib"))
-(load (collection-file-path "quiet.rktl" "tests" "racket"))
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/testing.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/testing.rktl
deleted file mode 100644
index 8e3014ed44..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/testing.rktl
+++ /dev/null
@@ -1 +0,0 @@
-(load (collection-file-path "testing.rktl" "tests/racket"))
\ No newline at end of file
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/tests.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/tests.rktl
deleted file mode 100644
index cba4188700..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/tests.rktl
+++ /dev/null
@@ -1,17 +0,0 @@
-(load-relative "loadtest.rktl")
-
-(load-in-sandbox "kw.rktl")
-(load-in-sandbox "awk.rktl")
-(load-in-sandbox "etc.rktl")
-(load-in-sandbox "compat.rktl")
-(load-in-sandbox "unit.rktl")
-(load-in-sandbox "unitsig.rktl")
-(load-in-sandbox "string-mzlib.rktl")
-(load-in-sandbox "threadlib.rktl")
-(load-in-sandbox "serialize.rktl")
-(load-in-sandbox "pconvert.rktl")
-(load-in-sandbox "cmdline.rktl")
-(load-in-sandbox "restart.rktl")
-(load-in-sandbox "macrolib.rktl")
-(load-in-sandbox "structlib.rktl")
-(load-in-sandbox "contract-mzlib-test.rktl")
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/threadlib.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/threadlib.rktl
deleted file mode 100644
index b5b4d38e43..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/threadlib.rktl
+++ /dev/null
@@ -1,102 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(Section 'threadlib)
-
-(require mzlib/thread)
-
-(define sema (make-semaphore))
-(define sema2 (make-semaphore))
-(define c-out 0)
-(define SLEEP-TIME 0.1)
-
-;;; consumer-thread ;;;
-
-(define-values (th g) (consumer-thread (case-lambda
-					[(f arg) (set! c-out (f arg))
-						 (semaphore-post sema)]
-					[(f arg1 arg2) (set! c-out (f arg1 arg2))
-						       (semaphore-post sema)])))
-(g + 1 2)
-(semaphore-wait sema)
-(test 3 'consumer-thread c-out)
-
-; queue 2
-(g car '(4 5))
-(g semaphore-wait sema2)
-(semaphore-wait sema)
-(test 4 'consumer-thread c-out)
-(semaphore-post sema2)
-(semaphore-wait sema)
-(test (void) 'consumer-thread c-out)
-
-; queue 3
-(g / 2)
-(g semaphore-wait sema2)
-(g (lambda (s) (semaphore-wait s) 5) sema2)
-(semaphore-wait sema)
-(test 1/2 'consumer-thread c-out)
-(semaphore-post sema2)
-(semaphore-wait sema)
-(test (void) 'consumer-thread c-out)
-(semaphore-post sema2)
-(semaphore-wait sema)
-(test 5 'consumer-thread c-out)
-
-; kill the consumer
-(kill-thread th)
-(g - 7)
-(sleep SLEEP-TIME)
-(test 5 'consumer-thread c-out)
-
-(arity-test consumer-thread 1 2)
-(err/rt-test (consumer-thread 9))
-(arity-test g 2 3)
-
-
-;; coroutines ----------------------------------------
-
-(define cntr 0)
-(define cntr-sema (make-semaphore))
-(define w (coroutine (lambda (enable-stop)
-		       (let loop ((i 0))
-			 (enable-stop #f)
-			 (set! cntr i)
-                         (when (= cntr 1)
-                           (semaphore-post cntr-sema))
-			 (enable-stop #t)
-			 (loop (add1 i))))))
-(test #t coroutine? w)
-(test #f coroutine-result w)
-(test #f coroutine-run cntr-sema w)
-(test #t positive? cntr)
-(test (void) coroutine-kill w)
-(test #t coroutine-run 100 w)
-
-(define w2 (coroutine (lambda (enable-stop)
-			(let loop ((i 100))
-			  (cond 
-			   ((< i 0) 13)
-			   (else
-			    (enable-stop #f)
-			    (set! cntr i)
-			    (enable-stop #t)
-			    (loop (sub1 i))))))))
-(test #t coroutine-run (system-idle-evt) w2)
-(test 13 coroutine-result w2)
-(test #t coroutine-run 100 w2)
-
-(define w3 (coroutine (lambda (enable-stop)
-			(raise 14))))
-(err/rt-test (coroutine-run (system-idle-evt) w3) (lambda (x) (eq? x 14)))
-(test #f coroutine-result w3)
-(test #t coroutine-run 100 w3)
-
-(define w4 (coroutine (lambda (enable-stop)
-			(enable-stop #f)
-			(raise 15))))
-(test #f coroutine-result w4)
-(err/rt-test (coroutine-run (system-idle-evt) w4) (lambda (x) (eq? x 15)))
-(test #t coroutine-run 100 w4)
-
-(report-errs)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/ttt/uinc4.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/ttt/uinc4.rktl
deleted file mode 100644
index bd0a771311..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/ttt/uinc4.rktl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-(define also-unused 'ok)
-
-(include (build-path up "uinc.rktl"))
-
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc.rktl
deleted file mode 100644
index ea489aaa3f..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc.rktl
+++ /dev/null
@@ -1,2 +0,0 @@
-
-(+ 4 5)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc2.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc2.rktl
deleted file mode 100644
index c1de73fb3e..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc2.rktl
+++ /dev/null
@@ -1,2 +0,0 @@
-
-(define x 8)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc3.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc3.rktl
deleted file mode 100644
index bc16584276..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc3.rktl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-(define unused 'hello)
-
-(include (build-path "ttt" "uinc4.rktl"))
-
-
-
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unit.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unit.rktl
deleted file mode 100644
index 3cccd7f7b1..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unit.rktl
+++ /dev/null
@@ -1,612 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(Section 'unit)
-(require mzlib/unit200)
-(require racket/undefined)
-
-;; Hide keywords from scheme/unit.rkt:
-(define import #f)
-(define export #f)
-(define link #f)
-
-(syntax-test #'(unit))
-(syntax-test #'(unit (import)))
-(syntax-test #'(unit (impLort)))
-(syntax-test #'(unit (impLort) (export) 5))
-(syntax-test #'(unit (import) (expLort) 5))
-(syntax-test #'(unit import (export) 5))
-(syntax-test #'(unit (import) export 5))
-(syntax-test #'(unit (import) (export) . 5))
-(syntax-test #'(unit (import 8) (export) 5))
-(syntax-test #'(unit (import . i) (export) 5))
-(syntax-test #'(unit (import (i)) (export) 5))
-(syntax-test #'(unit (import i 8) (export) 5))
-(syntax-test #'(unit (import i . b) (export) 5))
-(syntax-test #'(unit (import i (b)) (export) 5))
-(syntax-test #'(unit (import i) (export 7) 5))
-(syntax-test #'(unit (import i) (export . a) (define a 6)))
-(syntax-test #'(unit (import i) (export a . b) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i) (export (a x) . b) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i) (export (a 8) b) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i) (export b (a 8)) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i) (export (a . x) b) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i) (export b (a . x)) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i) (export (a x y) b) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i) (export (a x . y) b) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i) (export b (a x . y)) (define a 5) (define b 6)))
-
-(syntax-test #'(unit (import i) (export) (begin 1 . 2)))
-(syntax-test #'(unit (import i) (export b a) (begin (define a 5) (define b 6) . x)))
-(syntax-test #'(unit (import i) (export b a) (begin (define a 5) (define b 6)) (define b 6)))
-
-(syntax-test #'(unit (import) (export) (define-values (3) 5)))
-
-(syntax-test #'(unit (import a) (export (a x) b) (define a 5) (define b 6)))
-(syntax-test #'(unit (import a) (export (a x) (a y)) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i a) (export (a x) b) (define a 5) (define b 6)))
-(syntax-test #'(unit (import b) (export (a x) b) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i j i) (export (a x) b) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i j j) (export (a x) b) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i) (export a a) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i) (export (a x) (b x)) (define a 5) (define b 6)))
-(syntax-test #'(unit (import i) (export (a x) b) (define a 5) (define a 6) (define b 6)))
-(syntax-test #'(unit (import make-i) (export (a x) b) (define a 5) (define-struct i ()) (define b 6)))
-(syntax-test #'(unit (import i) (export (make-a x) b) (define make-a 5) (define-struct a ()) (define b 6)))
-(syntax-test #'(unit (import i) (export (a x) b) (define a 5) (define r 6) (define r 7) (define b 6)))
-
-(syntax-test #'(unit (import i) (export b (a x)) 5))
-(syntax-test #'(unit (import i) (export (a x) b) (define x 5) (define b 6)))
-(syntax-test #'(unit (import i) (export (a x) b) (set! a 5) (define b 6)))
-
-(syntax-test #'(unit (import i) (export) (set! i 5)))
-
-; Empty exports are syntactically ok::
-(error-test #'(compound-unit (import) (link (A (0))) (export (A))) exn:fail:unit?)
-(error-test #'(compound-unit (import) (link (A (0 (B))) (B (0))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit (import) (link (A (0)) (B (0))) (export (A x) (B))) exn:fail:unit?)
-
-; Self-import is now allowed
-; (syntax-test #'(compound-unit (import) (link (A (0 (A)))) (export))) 
-; (syntax-test #'(compound-unit (import) (link (A (0 (A x)))) (export)))
-(test (list undefined 5)
-      'self-import
-      (invoke-unit 
-       (compound-unit
-	(import)
-	(link [U ((unit (import a) (export b) (define x a) (define b 5) (list x a))
-		  (U b))])
-	(export))))
-
-(error-test #'(invoke-unit (unit (import not-defined) (export) 10) not-defined) exn:fail:contract:variable?)
-
-(test #t unit? (unit (import) (export)))
-(test #t unit? (unit (import) (export) 5))
-(test #t unit? (unit (import i) (export (a x)) (define a 8) (define x 5)))
-(test 5 (lambda (f) (invoke-unit f)) (unit (import) (export) 5))
-
-(test #t unit? (unit (import i) (export b a) (begin (define a 5) (define b 6))))
-(test #t unit? (unit (import i) (export b a) 'a (begin (define a 5) (define b 6)) 'b))
-(test #t unit? (unit (import i) (export b a) (begin (define a 5)) (define b 6)))
-(test #t unit? (unit (import i) (export b a) (define a 5) (begin (define b 6))))
-(test #t unit? (unit (import i) (export b a) (define a 5) (begin (define y 7) (define b 6)) (+ y b a)))
-
-(test 3 'embedded-deeply ((invoke-unit (unit (import) (export) (lambda () (define x 3) x)))))
-(test 1 'embedded-deeply-struct ((invoke-unit (unit (import) (export) (lambda () 
-									(define-struct a ())
-									make-a
-									1)))))
-
-; Empty begin is OK in a unit context:
-(test #t unit? (unit (import i) (export) (begin)))
-(test #t unit? (unit (import i) (export) (begin (begin))))
-
-(syntax-test #'(compound-unit))
-(syntax-test #'(compound-unit . x))
-(syntax-test #'(compound-unit (import)))
-(syntax-test #'(compound-unit (import) . x))
-(syntax-test #'(compound-unit (import) (link)))
-(syntax-test #'(compound-unit (import) (link) . x))
-(syntax-test #'(compound-unit import (link) (export)))
-(syntax-test #'(compound-unit (import) link (export)))
-(syntax-test #'(compound-unit (import) (link) export))
-(syntax-test #'(compound-unit ((import)) (link) (export)))
-(syntax-test #'(compound-unit (import) ((link)) (export)))
-(syntax-test #'(compound-unit (import) (link) ((export))))
-(syntax-test #'(compound-unit (import . a) (link) (export)))
-(syntax-test #'(compound-unit (import b . a) (link) (export)))
-(syntax-test #'(compound-unit (import 1) (link) (export)))
-(syntax-test #'(compound-unit (import (a)) (link) (export)))
-(syntax-test #'(compound-unit (import (a . b)) (link) (export)))
-(syntax-test #'(compound-unit (import (a (b))) (link) (export)))
-(syntax-test #'(compound-unit (import ((a) b)) (link) (export)))
-(syntax-test #'(compound-unit (import) (link . a) (export)))
-(syntax-test #'(compound-unit (import) (link a) (export)))
-(syntax-test #'(compound-unit (import) (link (a)) (export)))
-(syntax-test #'(compound-unit (import) (link (a (b)) . c) (export)))
-(syntax-test #'(compound-unit (import) (link (a (b) . c)) (export)))
-(syntax-test #'(compound-unit (import) (link (a (b . c)) (c (d))) (export)))
-(syntax-test #'(compound-unit (import) (link (a (b c . e)) (c (d)) (e (f))) (export)))
-(syntax-test #'(compound-unit (import) (link (a (b 1))) (export)))
-(syntax-test #'(compound-unit (import) (link (a (b))) (export . a)))
-(syntax-test #'(compound-unit (import) (link (a (b))) (export a)))
-(syntax-test #'(compound-unit (import) (link (a (b))) (export (a w) . a)))
-(syntax-test #'(compound-unit (import) (link (a (b))) (export (a 1))))
-(syntax-test #'(compound-unit (import) (link (a (b))) (export (a (x)))))
-(syntax-test #'(compound-unit (import) (link (a (b))) (export (1 w))))
-
-(test #t unit? (compound-unit (import) (link) (export)))
-
-; Simple:
-
-(define m1
-  (unit
-   (import)
-   (export x y a? set-a-b!)
-   
-   (define-struct a (b c) #:mutable)
-
-   (define x 7)
-   (define z 8)
-   (define y (lambda () (* z x)))
-
-   (list x y z)))
-
-(test #t apply (lambda (x y z) (and (= x 7) (= z 8) (procedure? y) (= 0 (procedure-arity y))))
-      (invoke-unit m1))
-
-(test #t apply
-      (lambda (x y-val a? set-a-b!)
-	(and (= x 7) (= y-val 56)
-	     (= 1 (procedure-arity a?))
-	     (= 2 (procedure-arity set-a-b!))))
-      (invoke-unit
-       (compound-unit 
-	(import)
-	(link [M (m1)]
-	      [N ((unit 
-		   (import x y a? set-a-b!)
-		   (export)
-		   (list x (y) a? set-a-b!))
-		  (M x y a? set-a-b!))])
-	(export))))
-
-; Structures:
-
-
-(define m2-1
-  (unit 
-   (import)
-   (export x struct:a a? v y)
-
-   (define x 5)
-   (define-struct a (b c) #:mutable)
-   (define v (make-a 5 6))
-   (define (y v) (a? v))))
-
-(define m2-2
-  (unit
-   (import struct:a a?)
-   (export x? make-x x-z both)
-   
-   (define-syntax a (list #'struct:a #f #'a? (list #f) (list #f) #f))
-
-   (define-struct (x a) (y z) #:mutable)
-   (define both (lambda (v)
-		  (and (a? v) (x? v))))))
-
-(define m2-3
-  (compound-unit
-   (import)
-   (link [O (m2-1)][T (m2-2 (O struct:a) (O a?))])
-   (export [O x struct:a v y]
-	   [T x? make-x x-z both])))
-
-
-(let ([p (open-output-string)])
-  (invoke-unit
-   (compound-unit
-    (import)
-    (link [M (m2-3)]
-	  [N ((unit
-	       (import x v struct:a y x? make-x x-z both)
-	       (export)
-	       (define (filter v)
-		 (if (procedure? v)
-		     `(proc: ,(object-name v))
-		     v))
-	       (display 
-		(map filter (list x v struct:a y make-x x? x-z both))
-		p)
-	       (let ([v2 (make-x 1 2 3 4)])
-		 (display (map filter
-			       (list x (struct-type? struct:a)
-				     v (y v) (y x)
-				     v2
-				     (y v2)
-				     (x? v2)
-				     (both v)
-				     (both v2)))
-			  p)))
-	      (M x v struct:a y x? make-x x-z both))])
-    (export)))
-
-  (test (string-append "(5 #<a> #<struct-type:a> (proc: y)"
-		       " (proc: x) (proc: x?)"
-		       " (proc: x-z) (proc: both))"
-		       "(5 #t #<a> #t #f #<x> #t #t #f #t)")
-	get-output-string p))
-
-; Compound with circularity
-
-(define make-z
-  (lambda (x-val)
-    (unit
-     (import z)
-     (export (x z) y)
-     
-     (define x x-val)
-     (define y (lambda () (- z x))))))
-    
-(define z1 (make-z 8))
-(define z2 (make-z 7))
-
-; Dynamic linking
-
-(let ([u
-       (unit
-	(import x)
-	(export)
-	
-	(+ x 8))])
-
-  (test 10 'dynamic (invoke-unit
-		     (unit
-		      (import)
-		      (export w)
-		      
-		      (define w 2)
-
-		      (invoke-unit u w)))))
-
-; Misc
-
-(test 12 'nested-units
-      (invoke-unit
-       (compound-unit
-	(import)
-	(link (a@ ((unit (import) (export s@:a) (define s@:a 5))))
-	      (u@ ((compound-unit
-		    (import a@:s@:a)
-		    (link (r@ ((unit (import a) (export) (+ a 7)) a@:s@:a)))
-		    (export))
-		   (a@ s@:a))))
-	(export))))
-
-; Import linking via invoke-unit
-
-(test '(5 7 (7 7)) 'invoke-unit-linking
-      (let ([u (unit (import x) (export) x)]
-	    [v (unit (import x) (export) (lambda () x))]
-	    [x 5])
-	(list (invoke-unit u x)
-	      (begin 
-		(set! x 7)
-		(invoke-unit u x))
-	      (let ([f (invoke-unit v x)])
-		(list
-		 (f)
-		 (begin
-		   (set! x 2)
-		   (f)))))))
-
-
-; Multiple values
-(test '(1 2 3) 
-      call-with-values
-      (lambda () (invoke-unit (unit (import) (export) (values 1 2 3))))
-      list)
-
-; Units within units:
-
-(define u (unit
-	   (import)
-	   (export)
-	   (define y 10)
-	   (define x 5)
-	   (unit
-	    (import)
-	    (export)
-	    x)))
-(test #t unit? u)
-(define u2 (invoke-unit u))
-(test #t unit? u2)
-(test 5 'invoke-unit-in-unit (invoke-unit u2))
-
-
-; Units and objects combined:
-
-(require scheme/class)
-
-(define u@
-  (unit (import x) (export)  
-	(class* object% ()
-		(public y)
-		(define y (lambda () x))
-		(super-make-object))))
-(define v (invoke-unit u@ car))
-(test #t class? v)
-(define w (make-object v))
-(test car 'ivar (send w y))
-
-(define c%
-  (class* object% ()
-    (init x)
-    (define -x x)
-    (public z)
-    (define (z) (unit (import) (export) -x))
-    (super-make-object)))
-(define u (send (make-object c% car) z))
-(test #t unit? u)
-(test car 'invoke (invoke-unit u))
-
-(define c%
-  (class* object% () 
-	  (init x) 
-	  (define -x x)
-	  (public y z)
-	  (define (y) -x)
-	  (define (z) (unit (import) (export) (y)))
-	  (super-make-object)))
-(define u (make-object c% 3))
-(define u2 (send u z))
-(test #t unit? u2)
-(test 3 'invoke (invoke-unit u2))
-
-(test undefined #;(letrec ([x y][y 0]) x) 'invoke 
-      (invoke-unit (unit (import) (export) (define x y) (define y 7) x)))
-
-; Can shadow syntax/macros in unit
-(test #t unit? (unit 
-		 (import) 
-		 (export)
-		 (define define 10)))
-(test #t unit? (unit 
-		 (import) 
-		 (export)
-		 (define lambda 10)))
-
-; Shadowing also ok if it's in the export list:
-(test #t unit? (unit 
-		(import) 
-		(export define-values)
-		(define define-values 10)))
-(test #t unit? (unit 
-		(import) 
-		(export lambda)
-		(define lambda 10)))
-(test #t unit? (unit 
-		(import) 
-		(export [lambda l])
-		(define lambda 10)))
-
-; These are ok, too:
-(test #t unit? (unit
-		(import define)
-		(export)
-		(define define 10)))
-(test #t unit? (let ([define-values 5])
-		 (unit
-		  (import)
-		  (export)
-		  (define define-values 10))))
-(test 10 'invoke-w/shadowed 
-      (let ([define-values 5])
-	(invoke-unit
-	 (unit
-	   (import)
-	   (export define-values)
-	   (define define-values 10)
-	   define-values))))
-	
-; Check set! of shadowed variable:
-(test #t unit? (unit 
-		 (import x)
-		 (export)
-		 (let ([x 10])
-		   (set! x 5))))
-(test #t unit? (unit 
-		 (import x)
-		 (export)
-		 (class object%
-		   (field
-		     [x 10])
-		   (set! x 5))))
-(syntax-test #'(let ([x 10])
-		(unit 
-		  (import x)
-		  (export)
-		  (set! x 5))))
-
-; Especially for zodiac:
-(test '(b c 10 b a (c a b) (c b a) (c . c) (a) #t
-	  (nested-b a b c) (a 2 b) (10 b c) (cl-unit-a 12 c))
-      'invoke-w/shadowed-a-lot
-      (let ([a 'bad-a]
-	    [b 'bad-b]
-	    [c 'bad-c]
-	    [struct:d 'bad-d]
-	    [i 'bad-i])
-	(invoke-unit
-	 (unit
-	   (import)
-	   (export b)
-	   (define a 'a)
-	   (define b 'b)
-	   (begin
-	     (define c 'c)
-	     (define-struct d (w)))
-	   (define x '...)
-
-	   (define-struct (e d) ())
-	   (set! x (cons c c))
-
-	   (define i (interface ()))
-
-	   (list
-	    (if (eq? a 'a)
-		b
-		c)
-	    (if (eq? a 'bad-a)
-		b
-		c)
-	    (d-w (make-e 10))
-	    (begin a b)
-	    (begin0 a b)
-	    (let ([ab (list a b)])
-	      (cons c ab))
-	    (letrec ([mk-ba (lambda ()
-			      (list b a))])
-	      (cons c (mk-ba)))
-	    x
-	    (with-continuation-mark 
-	     b a 
-	     (continuation-mark-set->list (current-continuation-marks) b))
-	    (interface? (interface (i)))
-	    (invoke-unit
-	     (unit
-	       (import w a)
-	       (export)
-	       (define b 'nested-b)
-	       (list b w a c))
-	     a b)
-	    (invoke-unit
-	      (compound-unit
-	       (import a)
-	       (link [u ((unit (import c) (export (xa a) (b xb))
-			       (define xa 1)
-			       (define b 2)
-			       (list a b c))
-			 a)])
-	       (export))
-	      b)
-	    (send
-	     (make-object
-	      (class object%
-		(field [a 10])
-		(public tester)
-		(define tester
-		  (lambda () (list a b c)))
-		(super-make-object)))
-	     tester)
-	    (send
-	     (make-object
-	      (class object%
-		(field
-		 [a 10]
-		 [b 12])
-		(public tester)
-		(define tester
-		   (lambda () 
-		     (invoke-unit
-		      (unit 
-			(import)
-			(export)
-			(define a 'cl-unit-a)
-			(list a b c)))))
-		(super-make-object)))
-	     tester))))))
-
-; Not ok if defining an imported name, but error should be about
-; redefining an imported name. (This behavior is not actually tested.)
-(syntax-test #'(unit 
-	       (import define-values) 
-	       (export)
-	       (define define-values 10)))
-
-(test #t unit? (unit 
-		(import define-values) 
-		(export)
-		(let () (define define-values 10) define-values)))
-
-;; Invoke-unit linking in let-bound variables
-(test '(the-x 10) 'invoke 
-      (let ([x 'the-x])
-	(invoke-unit
-	 (unit (import w) (export)
-	       (list w 10))
-	 x)))
-
-;; ----------------------------------------
-;; Macro definitions in units
-
-(test 5 'stx-def
-      (invoke-unit
-       (unit 
-	 (import)
-	 (export)
-	 
-	 (define-syntax (five stx) #'5)
-	 five)))
-
-(test 5 'stx-def
-      (let ()
-	(define-values/invoke-unit (x)
-	  (unit 
-	    (import)
-	    (export x)
-	 
-	    (define-syntax (five stx) #'5)
-	    (define x five)))
-	x))
-
-(test 50 'stx-def
-      (let ()
-	(define-values/invoke-unit (x)
-	  (unit 
-	    (import)
-	    (export x)
-	 
-	    (define-syntax (five stx) #'fifty)
-	    (define fifty 50)
-	    (define x five)))
-	x))
-
-(test 60 'stx-def
-      (let ()
-	(define-values/invoke-unit (x)
-	  (unit 
-	    (import)
-	    (export x sixty)
-	 
-	    (define-syntax (five stx) #'sixty)
-	    (define sixty 60)
-	    (define x five)))
-	x))
-
-(test 70 'stx-def
-      (let ([y 70])
-	(define-values/invoke-unit (x)
-	  (unit 
-	    (import seventy)
-	    (export x)
-	 
-	    (define-syntax (five stx) #'seventy)
-	    (define x five))
-	  #f y)
-	x))
-
-(test 55 'namespace
-      (parameterize ([current-namespace (make-base-namespace)])
-	(namespace-variable-bind/invoke-unit
-	 (x)
-	 (unit 
-	   (import)
-	   (export x)
-	   
-	   (define-syntax (five stx) #'55)
-	   (define x five)))
-	(eval 'x)))
-
-
-(report-errs)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unitsig.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unitsig.rktl
deleted file mode 100644
index b0ea4b3253..0000000000
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unitsig.rktl
+++ /dev/null
@@ -1,742 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-;; Hide keywords from scheme/unit.rkt:
-(define import #f)
-(define export #f)
-(define link #f)
-
-(require mzlib/unit200)
-(require mzlib/unitsig200)
-(require mzlib/include)
-(require racket/undefined)
-
-(Section 'unit/sig)
-
-(syntax-test #'(define-signature))
-(syntax-test #'(define-signature))
-(syntax-test #'(define-signature 8))
-(syntax-test #'(define-signature . x))
-(syntax-test #'(define-signature x))
-(syntax-test #'(define-signature 8))
-(syntax-test #'(define-signature x (8)))
-(syntax-test #'(define-signature x (a . 8)))
-(syntax-test #'(define-signature x (a . y)))
-(syntax-test #'(define-signature x (y y)))
-(syntax-test #'(define-signature x ((y))))
-(syntax-test #'(define-signature x ((struct))))
-(syntax-test #'(define-signature x ((struct y))))
-(syntax-test #'(define-signature x ((struct . y))))
-(syntax-test #'(define-signature x ((struct y . x))))
-(syntax-test #'(define-signature x ((struct y x))))
-(syntax-test #'(define-signature x ((struct y (x)) . x)))
-(syntax-test #'(define-signature x ((unit))))
-(syntax-test #'(define-signature x ((unit y))))
-(syntax-test #'(define-signature x ((unit . y))))
-(syntax-test #'(define-signature x ((unit y : a))))
-(define-signature a ())
-(syntax-test #'(define-signature x ((unit y a))))
-(syntax-test #'(define-signature x ((unit y . a))))
-(syntax-test #'(define-signature x ((unit y : . a))))
-(syntax-test #'(define-signature x ((unit y a) . x)))
-(syntax-test #'(define-signature x (y (unit y a))))
-
-(syntax-test #'(unit/sig))
-(syntax-test #'(unit/sig 8))
-(syntax-test #'(unit/sig b))
-(define-signature b (x y))
-(syntax-test #'(unit/sig (a)))
-(syntax-test #'(unit/sig a (impLort)))
-(syntax-test #'(unit/sig a (impLort) 5))
-(syntax-test #'(unit/sig a import 5))
-(syntax-test #'(unit/sig a (import . x) . 5))
-(syntax-test #'(unit/sig a (import (x) 8) 5))
-(syntax-test #'(unit/sig a (import (x) . i) 5))
-(syntax-test #'(unit/sig a (import (i : a) . b) 5))
-(syntax-test #'(unit/sig b (import (i : a)) 5))
-(syntax-test #'(unit/sig a (import (i : a x)) 5))
-(syntax-test #'(unit/sig a (import (i : a) x) 5))
-(syntax-test #'(unit/sig b (import (i : a)) (define x 7)))
-(syntax-test #'(unit/sig b (import (i : a)) (define x 7) (define i:y 6)))
-(syntax-test #'(unit/sig blah (import) (define x 7)))
-
-(syntax-test #'(unit/sig () (import) (begin 1 . 2)))
-(syntax-test #'(unit/sig () (import) (begin (define x 5)) (define x 5)))
-
-(define b@ (unit/sig b (import) (define x 9) (define y 9)))
-(define b2@ (unit/sig b (import (i : a)) (define x 9) (define y 9)))
-(define b3@ (unit/sig b (import (i : ())) (define x 9) (define y 9)))
-(define b3u@ (unit/sig b (import ()) (define x 9) (define y 9)))
-(define b3u2@ (unit/sig b (import a) (define x 9) (define y 9)))
-(define-signature >b ((unit b@ : b)))
-(define b3u3@ (unit/sig b (import (i : >b)) (define x 9) (define y 9)))
-
-(define >b@ (compound-unit/sig (import) (link [b@ : b (b@)]) (export (unit b@))))
-
-(syntax-test #'(compound-unit/sig))
-(syntax-test #'(compound-unit/sig 8))
-(syntax-test #'(compound-unit/sig b))
-(syntax-test #'(compound-unit/sig (import) (link) (export (var (U x)))))
-(syntax-test #'(compound-unit/sig (import a) (link) (export)))
-(syntax-test #'(compound-unit/sig (import 5) (link) (export)))
-(syntax-test #'(compound-unit/sig (import . i) (link) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link ()) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@)) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ b)) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b)) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b ())) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@ 5))) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@ . i))) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@ (i . a)))) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@ (i a a)))) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@ c@))) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@ (c@ a)))) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export . b@)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export b@)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (unit))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (unit c@))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (unit b@ : c))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (unit b@ (b@)))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (unit b@ : (b@)))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (open))))
-(error-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@ (i : a)))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (5 (i : a)))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : b)) (link (b@ : b (b3@ (i : b)))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : b)) (link (b@ : b (b3u@ (i : b)))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : b)) (link (b@ : b (b3u2@ (i : b)))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : >b)) (link (b@ : b (b3@ (i : >b)))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : ((open a) x))) (link (b@ : b (b3@ (i : ((open a) x))))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : ((unit b@ : ((open b) w))))) (link (b@ : b (b3u3@ i))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : a)) (link (b@ : (w) (b@))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : ())) (link (b@ : b (b3u3@ i))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : ((unit b@ : ())))) (link (b@ : b (b3u3@ i))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : (b@))) (link (b@ : b (b3u3@ i))) (export)) exn:fail:unit?)
-(error-test #'(compound-unit/sig (import (i : ((unit b@ : (x (unit y : ())))))) (link (b@ : b (b3u3@ i))) (export)) exn:fail:unit?)
-(syntax-test #'(compound-unit/sig (import) (link [b@ : b (0 5)]) (export)))
-(syntax-test #'(compound-unit/sig (import) (link [b@ : b (0 ())]) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : a (5 (i : b)))) (export)))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var b@))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var (b@)))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var (b@ x y)))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var (5 x)))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var (b@ 5)))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var ((b@ w) 5)))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var ((b@ 7) 5)))))
-(syntax-test #'(compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var (b@ x . a)))))
-
-; Self-import is now allowed
-; (syntax-test #'(compound-unit/sig (import) (link (A : () (0 A))) (export))) ; self-import
-; (syntax-test #'(compound-unit/sig (import) (link (A : (x) (0 A))) (export))) ; self-import
-(test (list undefined 5)
-      'self-import
-      (invoke-unit/sig
-       (compound-unit/sig
-	(import)
-	(link [U : (a) ((unit/sig (a) (import (a)) (rename (b a)) (define x a) (define b 5) (list x a))
-			U)])
-	(export))))
-
-(define-signature not-defined^ (not-defined))
-(error-test #'(invoke-unit/sig (unit/sig () (import not-defined^) 10) not-defined^) exn:fail:contract:variable?)
-
-(test #t unit/sig? (unit/sig a (import)))
-(test #t unit/sig? (unit/sig b (import) (define x 1) (define y 2)))
-(test #t unit/sig? (unit/sig a (import (i : b)) i:x))
-(test 5 (lambda (f) (invoke-unit/sig f ())) (unit/sig a (import ()) 5))
-(test #t unit/sig? (unit/sig (x) (import) (begin (define x 5))))
-(test #t unit/sig? (unit/sig (x) (import) (define a 14) (begin (define x 5) (define y 10)) (define z 12)))
-(test #t unit/sig? (compound-unit/sig (import) (link) (export)))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export)))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b2@ (i : a)))) (export)))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b2@ ((i) : a)))) (export)))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b2@ ((i) : ())))) (export)))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var (b@ x)))))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var (b@ x) w))))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (var ((b@) x) w))))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (unit b@))))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (unit (b@)))))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (unit b@ b@))))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (open b@))))
-(test #t unit/sig? (compound-unit/sig (import (i : a)) (link (b@ : b (b@))) (export (open (b@ : b)))))
-
-(test #t unit/sig? (compound-unit/sig (import)
-		      (link [compound-unit : () ((unit/sig () (import) 10))])
-		      (export)))
-(test #t unit/sig? (compound-unit/sig 
-		    (import)
-		    (link [export : () ((unit/sig () (import) 10))])
-		    (export)))
-
-; Empty begin is OK in a unit context:
-(test #t unit/sig? (unit/sig () (import) (begin)))
-(test #t unit/sig? (unit/sig () (import) (begin (begin))))
-
-; Include:
-
-(define i1@
-  (unit/sig 
-   ()
-   (import)
-   
-   (include "uinc.rktl")))
-
-(test 9 'include (invoke-unit/sig i1@))
-
-;; Nested includes, macros that expand to `(include ...)'
-(define i1.5@
-  (unit/sig 
-   ()
-   (import)
-   
-   (+ 3 4)
-   (include "uinc3.rktl")))
-
-(test 9 'include (invoke-unit/sig i1.5@))
-
-(define i2@
-  (unit/sig 
-   ()
-   (import)
-   
-   (include "uinc.rktl")
-   (include "uinc2.rktl")
-   (include "uinc.rktl")
-   (+ x 2)))
-
-(test 10 'include (invoke-unit/sig i2@))
-
-;; Include with begin:
-
-(test 5 'include-begin
-      (invoke-unit/sig
-       (unit/sig ()
-	 (import)
-	 (define x 5)
-	 (include "binc.rktl")
-	 y)))
-
-; Simple:
-
-(define-signature m1^
-  (x y a? set-a-b!))
-
-(define m1@
-  (unit/sig 
-   m1^
-   (import)
-   
-   (define-struct a (b c) #:mutable)
-
-   (define x 7)
-   (define z 8)
-   (define y (lambda () (* z x)))
-
-   (list x y z)))
-
-(test #t apply (lambda (x y z) (and (= x 7) (= z 8) (procedure? y) (= 0 (procedure-arity y))))
-      (invoke-unit/sig m1@))
-
-(test #t apply
-      (lambda (x y-val a? set-a-b!)
-	(and (= x 7) (= y-val 56)
-	     (= 1 (procedure-arity a?))
-	     (= 2 (procedure-arity set-a-b!))))
-      (invoke-unit/sig
-       (compound-unit/sig 
-	(import)
-	(link [M@ : m1^ (m1@)]
-	      [N@ : () ((unit/sig
-			 ()
-			 (import (i@ : m1^))
-			 (list i@:x (i@:y) i@:a? i@:set-a-b!))
-			M@)])
-	(export (open M@)))))
-
-; More:
-
-(define-signature m2-1-lite^
-  (xx struct:a v y))
-
-(define-signature m2-1^
-  (a?
-   (open m2-1-lite^)))
-
-(define-signature m2-2^
-  (x? make-x x-z both))
-
-(define m2-1@
-  (unit/sig 
-   m2-1^
-   (import)
-
-   (define xx 5)
-   (define-struct a (b c) #:inspector (make-inspector) #:mutable)
-   (define v (make-a 5 6))
-   (define (y v) (a? v))))
-
-(define m2-2@
-  (unit/sig
-   m2-2^
-   (import m2-1^)
-
-   (define-syntax a (list #'struct:a #f #f (list #f) (list #f) #f))
-
-   (define-struct (x a) (y z) #:mutable)
-   (define both (lambda (v)
-		  (and (a? v) (x? v))))))
-
-(define-signature m2-3^
-  (simple))
-
-(let-signature m2-3^
-  ((unit one@ : m2-1-lite^)
-   (unit two@ : m2-2^)
-   a?-again)
-
-  (define m2-3@
-    (compound-unit/sig
-     (import)
-     (link [O@ : m2-1^ (m2-1@)]
-	   [T@ : m2-2^ (m2-2@ O@)])
-     (export (unit (O@ : m2-1-lite^) one@)
-	     (unit T@ two@)
-	     (var (O@ a?) a?-again))))
-
-  (let ([p (open-output-string)]
-	[filter (lambda (v)
-		  (if (procedure? v)
-		      `(proc: ,(object-name v))
-		      v))])
-    (invoke-unit/sig
-     (compound-unit/sig
-      (import)
-      (link [M@ : m2-3^ (m2-3@)]
-	    [N@ : () ((unit/sig
-		       ()
-		       (import (i : m2-3^))
-		       (display (map
-				 filter
-				 (list i:one@:xx i:one@:v i:one@:struct:a i:one@:y 
-				       i:two@:make-x i:two@:x? i:two@:x-z i:two@:both
-				       i:a?-again))
-				p)
-		       (let ([v2 (i:two@:make-x 1 2 3 4)])
-			 (display (map
-				   filter
-				   (list i:one@:xx (struct-type? i:one@:struct:a)
-					 i:one@:v (i:one@:y i:one@:v) (i:one@:y i:one@:xx)
-					 v2
-					 (i:one@:y v2)
-					 (i:two@:x? v2)
-					 (i:two@:both i:one@:v)
-					 (i:two@:both v2)))
-				  p)))
-		      M@)])
-      (export)))
-    (test (string-append "(5 #(struct:a 5 6) #<struct-type:a> (proc: y)"
-			 " (proc: x) (proc: x?)"
-			 " (proc: x-z) (proc: both) (proc: a?))"
-			 "(5 #t #(struct:a 5 6) #t #f #(struct:x 1 2 ...) #t #t #f #t)")
-	  get-output-string p)))
-
-(test 5 'let-sig
-      (invoke-unit/sig
-       (unit/sig
-	m2-3^
-	(import)
-	(define simple 5)
-	simple)))
-
-(define-signature big^
-  (a b c))
-(define-signature little^
-  (a b c))
-
-(test 11
-      'link-restrict 
-      (invoke-unit/sig
-       (compound-unit/sig
-	(import)
-	(link [a@ : big^ ((unit/sig big^ (import) (define a 5) (define b 6) (define c 7)))]
-	      [b@ : () ((unit/sig () (import (i : little^)) (+ i:a i:b)) 
-			(a@ : little^))])
-	(export))))
-
-(define-signature just-a^
-  (a))
-(define-signature >just-a^
-  ((unit s@ : just-a^)))
-
-; Test a path for linking: root is a constiuent
-(test 12
-      'link-path
-      (invoke-unit/sig
-       (compound-unit/sig
-	(import)
-	(link [a@ : >just-a^ ((compound-unit/sig
-			       (import)
-			       (link [i@ : just-a^ ((unit/sig 
-						     just-a^ 
-						     (import) 
-						     (define a 5)))])
-			       (export (unit i@ s@))))]
-	      [r@ : () ((unit/sig 
-			 () 
-			 (import (i : just-a^))
-			 (+ i:a 7))
-			(a@ s@))])
-	(export))))
-
-; Test a path for linking: root is a constituent, interface is restricted
-(test 12
-      'import-path
-      (invoke-unit/sig
-       (compound-unit/sig
-	(import)
-	(link [a@ : >just-a^ ((compound-unit/sig
-			       (import)
-			       (link [i@ : just-a^ ((unit/sig 
-						     just-a^ 
-						     (import) 
-						     (define a 5)))])
-			       (export (unit i@ s@))))]
-	      [u@ : () ((compound-unit/sig
-			 (import (a@ : >just-a^))
-			 (link [r@ : () ((unit/sig 
-					  () 
-					  (import (i : just-a^))
-					  (+ i:a 7))
-					 (a@ s@))])
-			 (export))
-			a@)])
-	(export))))
-
-; Test a path for linking: 
-(test 85
-      'import-path
-      (invoke-unit/sig
-       (compound-unit/sig
-	(import)
-	(link [zodiac : (z)
-		      ((unit/sig (z)
-			 (import (i))
-			 
-			 (define z 1))
-		       ((export* interface) : (i)))]
-	      [export* : ((unit interface : (i extra)))
-		       ((compound-unit/sig
-			 (import)
-			 (link [interface : (i extra)
-					  ((unit/sig (i extra)
-					     (import)
-					     (define i 1)
-					     (define extra 2)
-					     85))])
-			 (export (unit interface))))])
-	(export))))
-
-; Signature ordering
-
-(define o1 (unit/sig (num sym) (import) (define num 5) (define sym 'a)))
-(define o2 (unit/sig () (import (sym num)) (list sym (+ num))))
-
-(test (list 'a 5)
-      'order
-      (invoke-unit/sig
-       (compound-unit/sig
-	(import)
-	(link [one : (num sym) (o1)]
-	      [two : () (o2 one)])
-	(export))))
-
-; unit->unit/sig, etc.
-
-(define-signature s1
-  (a b c))
-(define-signature s2
-  (+))
-
-(define us1 
-  (unit
-   (import +)
-   (export a b c)
-   
-   (define a 1)
-   (define b 2)
-   (define c 3)
-   (+ a b c)))
-   
-(test 6 'u->s (invoke-unit us1 +))
-(test 6 'u->s (invoke-unit/sig (unit->unit/sig us1 (s2) s1) s2))
-
-; Exporting a name twice:
-
-(syntax-test
- #'(compound-unit/sig
-    (import)
-    (link [A : (a) ((unit/sig (a) (import) (define a 1)))])
-    (export (var (A a)) (open A))))
-
-(syntax-test
- #'(compound-unit/sig
-    (import)
-    (link [A : (a) ((unit/sig (a) (import) (define a 1)))]
-	  [B : (b) ((unit/sig (b) (import) (define b 2)))])
-    (export (unit A x) (unit B x))))
-
-(syntax-test
- #'(compound-unit/sig
-    (import)
-    (link [A : (a) ((unit/sig (a) (import) (define a 1)))]
-	  [B : (b) ((unit/sig (b) (import) (define b 2)))])
-    (export (unit A) (unit B A))))
-
-; Can shadow syntax/macros in unit
-(test #t unit/sig? (unit/sig ()
-		     (import) 
-		     (define define 10)))
-(test #t unit/sig? (unit/sig ()
-		     (import) 
-		     (define lambda 11)))
-
-; Shadowing ok if it's in the export list:
-(test #t unit/sig? (unit/sig (define-values)
-		    (import) 
-		    (define define-values 12)))
-(test #t unit/sig? (unit/sig (lambda)
-		    (import) 
-		    (define lambda 13)))
-(test #t unit/sig? (unit/sig (l)
-		    (import) 
-		    (rename (lambda l))
-		    (define lambda 14)))
-
-(test 9 'rename (let ()
-		  (define-signature s (b))
-		  (define-values/invoke-unit/sig s
-		    (unit/sig s
-		      (import)
-		      (rename (a b))
-		      (define a 9)))
-		  b))
-(test 10 'rename (let ()
-		   (define-signature s (b))
-		   (define-values/invoke-unit/sig s
-		     (unit/sig s
-		       (import)
-		       (rename (a b))
-		       (define a 10)
-		       (define b 12)))
-		   b))
-
-; These are ok, too:
-(test #t unit/sig? (unit/sig ()
-		    (import (define))
-		    (define define 15)))
-(test #t unit/sig? (let ([define-values 5])
-		     (unit/sig ()
-		      (import)
-		      (define define-values 16))))
-
-; Not ok if defining an imported name, but error should be about
-; redefining an imported name. (This behavior is not actually tested.)
-(syntax-test #'(unit/sig ()
-		 (import (define-values))
-		 (define define-values 17)))
-
-(test #t unit/sig? (unit/sig ()
-		     (import (define-values))
-		     (let () (define define-values 10) define-values)))
-
-;; Invoke-unit linking in let-bound variables
-(define x 'not-the-right-x)
-(test '(the-x 10) 'invoke/sig 
-      (let ([x 'the-x])
-	(invoke-unit/sig
-	 (unit/sig () (import (x))
-		   (list x 10))
-	 (x))))
-
-;; Check -setters, -selectors, and -
-
-(let ([foo-bar 10]
-      [set-foo-bar! 100]
-      [foo@ (unit/sig ((struct foo (bar)))
-	      (import)
-	      (define-struct foo (bar) #:mutable))])
-  (define-syntax (go stx)
-    (syntax-case stx ()
-      [(_ lookup omit ...)
-       (syntax
-	(invoke-unit/sig
-	 (compound-unit/sig
-	  (import)
-	  (link [FOO : ((struct foo (bar))) (foo@)]
-		[CLIENT : () ((unit/sig ()
-				(import ((struct foo (bar) omit ...)))
-				(if (eq? 'foo-bar 'lookup)
-				    foo-bar
-				    set-foo-bar!))
-			      (FOO : ((struct foo (bar) omit ...))))])
-	  (export))))]))
-
-  (test #t struct-accessor-procedure? (go foo-bar))
-  (test #t struct-mutator-procedure? (go set-foo-bar!))
-  (test 10 'no-sel (go foo-bar -selectors))
-  (test #t struct-mutator-procedure? (go set-foo-bar! -selectors))
-  (test #t struct-accessor-procedure? (go foo-bar -setters))
-  (test 100 'no-set (go set-foo-bar! -setters))
-  (test 10 'no-sel (go foo-bar (- foo-bar)))
-  (test 100 'no-set (go set-foo-bar! (- set-foo-bar!)))
-  (test #t struct-accessor-procedure? (go foo-bar (- set-foo-bar!)))
-  (test #t struct-mutator-procedure? (go set-foo-bar! (- foo-bar)))
-  (test #t struct-accessor-procedure? (go foo-bar (- make-foo)))
-  (test #t struct-mutator-procedure? (go set-foo-bar! (- make-foo))))
-
-;; Definitions and namespace:
-(test 12
-      'def-val
-      (let ()
-	(define-values/invoke-unit/sig (foo)
-	  (unit/sig (foo)
-	    (import) 
-	    (define foo 12)))
-	foo))
-
-(test 120
-      'namespace
-      (parameterize ([current-namespace (make-base-namespace)])
-	(namespace-variable-bind/invoke-unit/sig
-	 (foo)
-	 (unit/sig (foo)
-	   (import) 
-	   (define foo 120)))
-	(eval 'foo)))
-
-;; -- Macro interaction ----------------------------------------
-
-(define-syntax let-values/invoke-unit/sig
-  (syntax-rules ()
-    [(_ (sig unit) exp ...)
-     (let ()
-       (define-values/invoke-unit/sig sig unit)
-       (let () exp ...))]))
-
-(define-signature b (y z))
-(define-signature a (x (open b)))
-(define-signature c (x (unit i : b)))
-
-(define u@ (unit/sig a
-	     (import)
-	     (define x 1)
-	     (define y 2)
-	     (define z 3)))
-
-(test '(1 2 3) 'macro-unitsig
-      (let-values/invoke-unit/sig ((x y z) u@) (list x y z)))
-(test '(1 2 3) 'macro-unitsig
-      (let-values/invoke-unit/sig ((x (open b)) u@) (list x y z)))
-
-(define-syntax goo
-  (syntax-rules ()
-    [(_ id body)
-     (let-values/invoke-unit/sig ((x id) u@) body)]))
-
-(test '(0 2 0) 'macro-unitsig
-      (let ([x 0][y 0][z 0])
-	(goo y (list x y z))))
-
-(test '(0 2 3) 'macro-unitsig
-      (let ([x 0][y 0][z 0])
-	(goo (open b) (list x y z))))
-
-(define-syntax goow
-  (syntax-rules ()
-    [(_ sid body)
-     (let-values/invoke-unit/sig ((x (open sid)) u@) body)]))
-
-(test '(0 2 3) 'macro-unitsig
-      (let ([x 0][y 0][z 0])
-	(goow b (list x y z))))
-
-(define t@ (compound-unit/sig
-	    (import)
-	    (link [u1 : a (u@)]
-		  [u2 : b (u@)])
-	    (export (open u1) (unit u2 i))))
-
-(test '(1 2 3) 'macro-unitsig
-      (let-values/invoke-unit/sig (c t@) (list x i:y i:z)))
-
-(define-syntax moo
-  (syntax-rules ()
-    [(_ id body)
-     (let-values/invoke-unit/sig ((x id) t@) body)]))
-
-(test '(0 2 3) 'macro-unitsig
-      (let ([x 0][i:y 0][i:z 0])
-	(moo (unit i : b) (list x i:y i:z))))
-
-(define-syntax moow
-  (syntax-rules ()
-    [(_ id body)
-     (let-values/invoke-unit/sig ((x (unit i : id)) t@) body)]))
-
-(test '(0 2 3) 'macro-unitsig
-      (let ([x 0][i:y 0][i:z 0])
-	(moow b (list x i:y i:z))))
-
-(test '(0 2 3) 'macro-unitsig
-      (let ([x 0][i:y 0][i:z 0])
-	(moow (y z) (list x i:y i:z))))
-
-(test '(0 0 3) 'macro-unitsig
-      (let ([x 0][i:y 0][i:z 0])
-	(moow (z) (list x i:y i:z))))
-
-(define-syntax moot
-  (syntax-rules ()
-    [(_ id body)
-     (let-values/invoke-unit/sig ((id (unit i : b)) t@) body)]))
-
-(test '(1 0 0) 'macro-unitsig
-      (let ([x 0][i:y 0][i:z 0])
-	(moot x (list x i:y i:z))))
-
-;; --------------------------------------------------
-
-(let ()
-  (define-signature s^ (x)) 
-  (test (void)
-	verify-linkage-signature-match 'where 
-	(list 'tag) 
-	(list (unit/sig s^ (import) (define x 1)))
-	(list (signature->symbols s^))
-	(list (list))))
-
-;; ----------------------------------------
-;; In a submodule
-
-(module unit-in-a-submodule racket/base
-  (require racket/unit)
-
-  (define-signature foo^ (f))
-  
-  (module+ main
-    (define-unit foo@
-      (import)
-      (export foo^)
-      
-      (define f (lambda (x) x)))
-    (define-values/invoke-unit/infer foo@)
-
-    (define out (f 50))
-    (provide out)))
-
-(test 50 dynamic-require '(submod 'unit-in-a-submodule main) 'out)
-
-;; --------------------------------------------------
-
-(report-errs)
-
diff --git a/pkgs/compatibility-pkgs/compatibility/LICENSE.txt b/pkgs/compatibility-pkgs/compatibility/LICENSE.txt
deleted file mode 100644
index 70ae75ce21..0000000000
--- a/pkgs/compatibility-pkgs/compatibility/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-compatibility
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/compatibility-pkgs/compatibility/info.rkt b/pkgs/compatibility-pkgs/compatibility/info.rkt
deleted file mode 100644
index d16eac9a01..0000000000
--- a/pkgs/compatibility-pkgs/compatibility/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("compatibility-lib" "compatibility-doc"))
-(define implies '("compatibility-lib" "compatibility-doc"))
-
-(define pkg-desc "Libraries that implement legacy interfaces")
-
-(define pkg-authors '(eli mflatt robby samth))
diff --git a/pkgs/compiler-pkgs/compiler-lib/LICENSE.txt b/pkgs/compiler-pkgs/compiler-lib/LICENSE.txt
deleted file mode 100644
index e3fb23eec0..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-compiler-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/bundle-dist.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/bundle-dist.rkt
deleted file mode 100644
index af419cf515..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/bundle-dist.rkt
+++ /dev/null
@@ -1,94 +0,0 @@
-
-(module bundle-dist racket/base
-  (require racket/file
-           (only-in racket/base lambda)
-           racket/path
-	   racket/system
-	   file/zip
-	   file/tar)
-
-  (provide bundle-put-file-extension+style+filters
-	   bundle-directory)
-  
-  (define (bundle-file-suffix)
-    (case (system-type)
-      [(macosx) "dmg"]
-      [(windows) "zip"]
-      [(unix) "tgz"]))
-
-  (define (bundle-put-file-extension+style+filters)
-    (values (bundle-file-suffix)
-	    null
-	    (case (system-type)
-	      [(windows) '(("Zip file" "*.zip"))]
-	      [(macosx) '(("Disk image" "*.dmg"))]
-	      [(unix) '(("Gzipped tar file" "*.tgz"))])))
-
-  (define (add-suffix name suffix)
-    (if (filename-extension name)
-	name
-	(path-replace-suffix name
-			     (string->bytes/utf-8 (string-append "." suffix)))))
-
-  (define (with-prepared-directory dir for-exe? k)
-    ;; If `dir' contains multiple files, create a new
-    ;;  directory that contains a copy of `dir'
-    (if (and for-exe?
-	     (= 1 (length (directory-list dir))))
-	(k dir)
-	(let ([temp-dir (make-temporary-file "bundle-tmp-~a" 'directory)])
-	  (dynamic-wind
-	      void
-	      (lambda ()
-		(let ([dest
-		       (let-values ([(base name dir?) (split-path dir)])
-			 (build-path temp-dir name))])
-		  (make-directory dest)
-		  (let loop ([src dir][dest dest])
-		    (for-each (lambda (f)
-				(let ([src (build-path src f)]
-				      [dest (build-path dest f)])
-				  (cond
-				   [(directory-exists? src)
-				    (make-directory dest)
-				    (loop src dest)]
-				   [(file-exists? src)
-				    (copy-file src dest)
-				    (file-or-directory-modify-seconds 
-				     dest
-				     (file-or-directory-modify-seconds src))])))
-			      (directory-list src))))
-		(k temp-dir))
-	      (lambda () (delete-directory/files temp-dir))))))
-
-  (define bundle-directory
-    (lambda (target dir [for-exe? #f])
-      (let ([target (add-suffix target (bundle-file-suffix))])
-	(case (system-type)
-	  [(macosx)
-	   (with-prepared-directory
-	    dir for-exe?
-	    (lambda (dir)
-	      (let* ([cout (open-output-bytes)]
-		     [cerr (open-output-bytes)]
-		     [cin (open-input-bytes #"")]
-		     [p (process*/ports
-			 cout cin cerr
-			 "/usr/bin/hdiutil"
-			 "create" "-format" "UDZO"
-			 "-imagekey" "zlib-level=9"
-			 "-mode" "555" 
-			 "-volname" (path->string
-				     (path-replace-suffix (file-name-from-path target) #""))
-			 "-srcfolder" (path->string (cleanse-path (path->complete-path dir)))
-			 (path->string (cleanse-path (path->complete-path target))))])
-		((list-ref p 4) 'wait)
-		(unless (eq? ((list-ref p 4) 'status) 'done-ok)
-		  (error 'bundle-directory
-			 "error bundling: ~a"
-			 (regexp-replace #rx"[\r\n]*$" (get-output-string cerr) ""))))))]
-	  [(windows unix)
-	   (let-values ([(base name dir?) (split-path (path->complete-path dir))])
-	     (parameterize ([current-directory base])
-	       ((if (eq? 'unix (system-type)) tar-gzip zip) target name)))]
-	  [else (error 'bundle-directory "don't know how")])))))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/decompile.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/decompile.rkt
deleted file mode 100644
index bada535b72..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/decompile.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-(require racket/cmdline
-         raco/command-name
-         compiler/zo-parse
-         compiler/decompile
-         compiler/compilation-path
-         racket/pretty
-         racket/format)
-
-(define (get-name)
-  (string->symbol (short-program+command-name)))
-
-(define force? #f)
-
-(define source-files
-  (command-line
-   #:program (short-program+command-name)
-   #:once-each
-   [("--force") "Ignore timestamp mimatch on associated \".zo\""
-    (set! force? #t)]
-   [("--columns" "-n") n "Format for <n> columns"
-    (let ([num (string->number n)])
-      (unless (exact-positive-integer? num)
-        (raise-user-error (get-name)
-                          "not a valid column count: ~a" n))
-      (pretty-print-columns num))]
-   #:args source-or-bytecode-file
-   source-or-bytecode-file))
-
-(define (check-files orig-file alt-file)
-  (cond
-   [(not (file-exists? alt-file))
-    (cond
-     [(file-exists? orig-file)
-      (unless (is-bytecode-file? orig-file)
-        (raise-user-error (get-name)
-                          (~a "not a bytecode file, and no associated \".zo\" file\n"
-                              "  path: ~a\n"
-                              "  tried associated path: ~a")
-                          orig-file
-                          alt-file))]
-     [else
-      (raise-user-error (get-name)
-                        (~a "no such file, and no associated \".zo\" file\n"
-                            "  path: ~a\n"
-                            "  tried associated path: ~a")
-                        orig-file
-                        alt-file)])]
-   [(not (is-bytecode-file? alt-file))
-    (raise-user-error (get-name)
-                      (~a "associated \".zo\" file is not a bytecode file\n"
-                          "  original path: ~a\n"
-                          "  associated path: ~a")
-                      orig-file
-                      alt-file)]
-   [(and (not force?)
-         ((file-or-directory-modify-seconds orig-file
-                                            #f
-                                            (lambda () -inf.0))
-          . > .
-          (file-or-directory-modify-seconds alt-file)))
-    ;; return a warning:
-    (raise-user-error (get-name)
-                      (~a "associated \".zo\" file's date is older than given file's date;\n"
-                          " consider using `raco make` to rebuild the source file, or use `--force`\n"
-                          " to skip the date check\n"
-                          "  original path: ~a\n"
-                          "  associated path: ~a")
-                      orig-file
-                      alt-file)]))
-
-(define (is-bytecode-file? orig-file)
-  (call-with-input-file*
-   orig-file
-   (lambda (i)
-     (equal? #"#~" (read-bytes 2 i)))))
-
-(for ([zo-file source-files])
-  (let ([zo-file (path->complete-path zo-file)])
-    (let-values ([(base name dir?) (split-path zo-file)])
-      (let ([alt-file (get-compilation-bytecode-file zo-file)])
-        (check-files zo-file alt-file)
-        (parameterize ([current-load-relative-directory base]
-                       [print-graph #t])
-          (pretty-write
-           (decompile
-            (call-with-input-file*
-             (if (file-exists? alt-file) alt-file zo-file)
-             (lambda (in)
-               (zo-parse in))))))))))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe-dir.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe-dir.rkt
deleted file mode 100644
index acc3b94919..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe-dir.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang scheme/base
-(require scheme/cmdline
-         raco/command-name
-         compiler/distribute)
-
-(define verbose (make-parameter #f))
-(define exe-embedded-collects-path (make-parameter #f))
-(define exe-dir-add-collects-dirs (make-parameter null))
-
-(define-values (dest-dir source-files)
-  (command-line
-   #:program (short-program+command-name)
-   #:once-each
-   [("--collects-path") path "Set <path> as main collects for executables"
-    (exe-embedded-collects-path path)]
-   #:multi
-   [("++collects-copy") dir "Add collects in <dir> to directory"
-    (exe-dir-add-collects-dirs (append (exe-dir-add-collects-dirs) (list dir)))]
-   #:once-each
-   [("-v") "Verbose mode"
-    (verbose #t)]
-   #:args (dest-dir . executable)
-   (values dest-dir executable)))
-
-(assemble-distribution
- dest-dir
- source-files
- #:collects-path (exe-embedded-collects-path)
- #:copy-collects (exe-dir-add-collects-dirs))
-(when (verbose)
-  (printf " [output to \"~a\"]\n" dest-dir))
-
-(module test racket/base)
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe.rkt
deleted file mode 100644
index 305879651f..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang racket/base
-(require racket/cmdline
-         raco/command-name
-         compiler/private/embed
-         launcher/launcher
-         dynext/file)
-
-(define verbose (make-parameter #f))
-(define very-verbose (make-parameter #f))
-
-(define gui (make-parameter #f))
-(define 3m (make-parameter #t))
-(define launcher (make-parameter #f))
-
-(define exe-output (make-parameter #f))
-(define exe-embedded-flags (make-parameter '("-U" "--")))
-(define exe-embedded-libraries (make-parameter null))
-(define exe-aux (make-parameter null))
-(define exe-embedded-config-path (make-parameter "etc"))
-(define exe-embedded-collects-path (make-parameter null))
-(define exe-embedded-collects-dest (make-parameter #f))
-
-(define source-file
-  (command-line
-   #:program (short-program+command-name)
-   #:once-each
-   [("-o") file "Write executable as <file>"
-    (exe-output file)]
-   [("--gui") "Generate GUI executable"
-    (gui #t)]
-   [("-l" "--launcher") "Generate a launcher"
-    (launcher #t)]
-   [("--config-path") path "Set <path> as configuration directory for executable"
-    (exe-embedded-config-path path)]
-   [("--collects-path") path "Set <path> as main collects for executable"
-    (exe-embedded-collects-path path)]
-   [("--collects-dest") dir "Write collection code to <dir>"
-    (exe-embedded-collects-dest dir)]
-   [("--ico") .ico-file "Set Windows icon for executable"
-    (exe-aux (cons (cons 'ico .ico-file) (exe-aux)))]
-   [("--icns") .icns-file "Set Mac OS X icon for executable"
-    (exe-aux (cons (cons 'icns .icns-file) (exe-aux)))]
-   [("--orig-exe") "Use original executable instead of stub"
-    (exe-aux (cons (cons 'original-exe? #t) (exe-aux)))]
-   [("--3m") "Generate using 3m variant"
-    (3m #t)]
-   [("--cgc") "Generate using CGC variant"
-    (3m #f)]
-   #:multi
-   [("++aux") aux-file "Extra executable info (based on <aux-file> suffix)"
-    (let ([auxes (extract-aux-from-path (path->complete-path aux-file))])
-      (when (null? auxes)
-        (printf " warning: no recognized information from ~s\n" aux-file))
-      (exe-aux (append auxes (exe-aux))))]
-   [("++lib") lib "Embed <lib> in executable"
-    (exe-embedded-libraries (append (exe-embedded-libraries) (list lib)))]
-   [("++exf") flag "Add flag to embed in executable"
-    (exe-embedded-flags (append (exe-embedded-flags) (list flag)))]
-   [("--exf") flag "Remove flag to embed in executable"
-    (exe-embedded-flags (remove flag (exe-embedded-flags)))]
-   [("--exf-clear") "Clear flags to embed in executable"
-    (exe-embedded-flags null)]
-   [("--exf-show") "Show flags to embed in executable"
-    (printf "Flags to embed: ~s\n" (exe-embedded-flags))]
-   #:once-each
-   [("-v") "Verbose mode"
-    (verbose #t)]
-   [("--vv") "Very verbose mode"
-    (verbose #t)
-    (very-verbose #t)]
-   #:args (source-file)
-   source-file))
-
-(let ([dest (mzc:embedding-executable-add-suffix
-             (or (exe-output)
-                 (extract-base-filename/ss source-file
-                                           (string->symbol (short-program+command-name))))
-             (gui))])
-  (unless (file-exists? source-file)
-    (raise-user-error (string->symbol (short-program+command-name))
-                      "source file does not exist\n  path: ~a" source-file))
-  (with-handlers ([exn:fail:filesystem? (lambda (exn) (void))])
-    (call-with-input-file* dest
-      (lambda (dest-in)
-        (call-with-input-file* source-file
-          (lambda (source-in)
-            (when (equal? (port-file-identity dest-in)
-                          (port-file-identity source-in))
-              (raise-user-error (string->symbol (short-program+command-name))
-                                (string-append
-                                 "source file is the same as the destination file"
-                                 "\n  source path: ~a"
-                                 "\n  destination path: ~a")
-                                source-file
-                                dest)))))))
-  (cond
-   [(launcher)
-    (parameterize ([current-launcher-variant (if (3m) '3m 'cgc)])
-      ((if (gui) 
-           make-gracket-launcher 
-           make-racket-launcher)
-       (append (list "-t" (path->string (path->complete-path source-file)))
-               (exe-embedded-flags))
-       dest
-       (exe-aux)))]
-   [else
-    (define mod-sym (string->symbol
-                     (format "#%mzc:~a"
-                             (let-values ([(base name dir?)
-                                           (split-path source-file)])
-                               (path->bytes (path-replace-suffix name #""))))))
-    (mzc:create-embedding-executable
-     dest
-     #:mred? (gui)
-     #:variant (if (3m) '3m 'cgc)
-     #:verbose? (very-verbose)
-     #:modules (cons `(#%mzc: (file ,source-file) (main configure-runtime))
-                     (map (lambda (l) `(#t (lib ,l)))
-                          (exe-embedded-libraries)))
-     #:configure-via-first-module? #t
-     #:early-literal-expressions
-     (parameterize ([current-namespace (make-base-namespace)])
-       (define cr-sym (string->symbol (format "~a(configure-runtime)" mod-sym)))
-       (list
-        (compile
-         `(when (module-declared? '',cr-sym)
-            (dynamic-require '',cr-sym #f)))))
-     #:literal-expression
-     (parameterize ([current-namespace (make-base-namespace)])
-       (define main-sym (string->symbol (format "~a(main)" mod-sym)))
-       (compile
-        `(begin
-           (namespace-require '',mod-sym)
-           (when (module-declared? '',main-sym)
-             (dynamic-require '',main-sym #f)))))
-     #:cmdline (exe-embedded-flags)
-     #:collects-path (exe-embedded-collects-path)
-     #:collects-dest (exe-embedded-collects-dest)
-     #:aux (cons `(config-dir . ,(exe-embedded-config-path))
-                 (exe-aux)))])
-  (when (verbose)
-    (printf " [output to \"~a\"]\n" dest)))
-
-(module test racket/base)
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/expand.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/expand.rkt
deleted file mode 100644
index cb320a2a9a..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/expand.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require racket/cmdline
-         raco/command-name
-         racket/pretty)
-
-(define source-files
-  (command-line
-   #:program (short-program+command-name)
-   #:once-each
-   [("--columns" "-n") n "Format for <n> columns"
-    (let ([num (string->number n)])
-      (unless (exact-positive-integer? num)
-        (raise-user-error (string->symbol (short-program+command-name))
-                          "not a valid column count: ~a" n))
-      (pretty-print-columns num))]
-   #:args source-file
-   source-file))
-
-(for ([src-file source-files])
-  (let ([src-file (path->complete-path src-file)])
-    (let-values ([(base name dir?) (split-path src-file)])
-      (parameterize ([current-load-relative-directory base]
-                     [current-namespace (make-base-namespace)]
-                     [read-accept-reader #t])
-        (call-with-input-file*
-         src-file
-         (lambda (in)
-           (port-count-lines! in)
-           (let loop ()
-             (let ([e (read-syntax src-file in)])
-               (unless (eof-object? e)
-                 (pretty-write (syntax->datum (expand e)))
-                 (loop))))))))))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/info.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/info.rkt
deleted file mode 100644
index b7f1ac48d0..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define raco-commands
-  '(("make" compiler/commands/make "compile source to bytecode" 100)
-    ("exe" compiler/commands/exe "create executable" 20)
-    ("pack" compiler/commands/pack "pack files/collections into a .plt archive" #f)
-    ("unpack" compiler/commands/unpack "unpack files/collections from a .plt archive" #f)
-    ("decompile" compiler/commands/decompile "decompile bytecode" #f)
-    ("test" compiler/commands/test "run tests associated with files/directories" 15)
-    ("expand" compiler/commands/expand "macro-expand source" #f)
-    ("distribute" compiler/commands/exe-dir "prepare executable(s) in a directory for distribution" #f)
-    ("demodularize" compiler/demodularizer/batch "produce a whole program from a single module" #f)))
-
-(define test-responsibles '(("test.rkt" jay)))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/make.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/make.rkt
deleted file mode 100644
index 2724b49057..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/make.rkt
+++ /dev/null
@@ -1,119 +0,0 @@
-#lang scheme/base
-(require scheme/cmdline
-         raco/command-name
-         compiler/cm
-         compiler/compiler
-         compiler/compilation-path
-         dynext/file
-         setup/parallel-build
-         setup/path-to-relative
-         racket/match)
-
-(module test racket/base)
-
-(define verbose (make-parameter #f))
-(define very-verbose (make-parameter #f))
-(define disable-inlining (make-parameter #f))
-
-(define disable-deps (make-parameter #f))
-(define disable-const (make-parameter #f))
-(define prefixes (make-parameter null))
-(define assume-primitives (make-parameter #t))
-(define worker-count (make-parameter 1))
-
-(define mzc-symbol (string->symbol (short-program+command-name)))
-
-(define source-files
-  (command-line
-   #:program (short-program+command-name)
-   #:once-each
-   [("-j") n "Compile with up to <n> tasks in parallel" 
-    (let ([num (string->number n)])
-      (unless num (raise-user-error (format "~a: bad count for -j: ~s"
-                                            (short-program+command-name) 
-                                            n)))
-      (worker-count num))]
-   [("--disable-inline") "Disable procedure inlining during compilation"
-    (disable-inlining #t)]
-   [("--disable-constant") "Disable enforcement of module constants"
-    (disable-const #t)]
-   [("--no-deps") "Compile immediate files without updating dependencies"
-    (disable-deps #t)]
-   [("-p" "--prefix") file "Add elaboration-time prefix file for --no-deps"
-    (prefixes (append (prefixes) (list file)))]
-   [("--no-prim") "Do not assume `scheme' bindings at top level for --no-deps"
-    (assume-primitives #f)]
-   [("-v") "Verbose mode"
-    (verbose #t)]
-   [("--vv") "Very verbose mode"
-    (verbose #t)
-    (very-verbose #t)]
-   #:args (file . another-file) (cons file another-file)))
-
-(cond 
-  ;; Just compile one file:
-  [(disable-deps)
-    (let ([prefix
-           `(begin
-              (require scheme)
-              ,(if (assume-primitives)
-                   '(void)
-                   '(namespace-require/copy 'scheme))
-              ,@(map (lambda (s) `(load ,s)) (prefixes))
-              (void))])
-      ((compile-zos prefix #:verbose? (verbose))
-       source-files
-       'auto))]
-  ;; Normal make:
-  [(= (worker-count) 1)
-    (let ([n (make-base-empty-namespace)]
-          [did-one? #f])
-      (parameterize ([current-namespace n]
-                     [manager-trace-handler
-                      (lambda (p)
-                        (when (very-verbose)
-                          (printf "  ~a\n" p)))]
-                     [manager-compile-notify-handler
-                      (lambda (p)
-                        (set! did-one? #t)
-                        (when (verbose)
-                          (printf "  making ~s\n" p)))])
-        (for ([file source-files])
-          (unless (file-exists? file)
-            (error mzc-symbol "file does not exist: ~a" file))
-          (set! did-one? #f)
-          (let ([name (extract-base-filename/ss file mzc-symbol)])
-            (when (verbose)
-              (printf "\"~a\":\n" file))
-            (parameterize ([compile-context-preservation-enabled
-                            (disable-inlining)]
-                           [compile-enforce-module-constants
-                            (not (disable-const))])
-              (managed-compile-zo file))
-            (when (verbose)
-              (printf " [~a \"~a\"]\n"
-                      (if did-one? "output to" "already up-to-date at")
-                      (get-compilation-bytecode-file file)))))))]
-  ;; Parallel make:
-  [else
-   (define path-cache (make-hash))
-   (or (parallel-compile-files
-        source-files
-        #:worker-count (worker-count)
-        #:handler (lambda (id type work msg out err)
-                    (define (->rel p)
-                      (path->relative-string/library p #:cache path-cache))
-                    (match type
-                      ['start (when (verbose) (printf " ~a making ~a\n" id (->rel work)))]
-                      ['done (when (verbose) (printf " ~a made ~a\n" id (->rel work)))]
-                      ['output (printf " ~a output from: ~a\n~a~a" id work out err)]
-                      [else (printf " ~a error compiling ~a\n~a\n~a~a" id work msg out err)]))
-        #:options (let ([cons-if-true (lambda (bool carv cdrv)
-                                        (if bool
-                                            (cons carv cdrv)
-                                            cdrv))])
-                    (cons-if-true
-                     (very-verbose)
-                     'very-verbose
-                     (cons-if-true (disable-inlining) 'disable-inlining null))))
-       (exit 1))])
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/pack.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/pack.rkt
deleted file mode 100644
index ebb56ae73a..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/pack.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang scheme/base
-(require scheme/cmdline
-         raco/command-name
-         setup/pack
-         setup/getinfo
-         compiler/distribute)
-
-(define verbose (make-parameter #f))
-
-(define collection? (make-parameter #f))
-
-(define default-plt-name "archive")
-
-(define plt-name (make-parameter default-plt-name))
-(define plt-files-replace (make-parameter #f))
-(define plt-files-plt-relative? (make-parameter #f))
-(define plt-files-plt-home-relative? (make-parameter #f))
-(define plt-force-install-dir? (make-parameter #f))
-(define plt-setup-collections (make-parameter null))
-(define plt-include-compiled (make-parameter #f))
-
-(define mzc-symbol (string->symbol (short-program+command-name)))
-
-(define-values (plt-output source-files)
-  (command-line
-   #:program (short-program+command-name)
-   #:once-each
-   [("--collect") "<path>s specify collections instead of files/dirs"
-    (collection? #t)]
-   [("--plt-name") name "Set the printed <name> describing the archive"
-    (plt-name name)]
-   [("--replace") "Files in archive replace existing files when unpacked"
-    (plt-files-replace #t)]
-   [("--at-plt") "Files/dirs in archive are relative to user's add-ons directory"
-    (plt-files-plt-relative? #t)]
-   #:once-any
-   [("--all-users") "Files/dirs in archive go to PLT installation if writable"
-    (plt-files-plt-home-relative? #t)]
-   [("--force-all-users") "Files/dirs forced to PLT installation"
-    (plt-files-plt-home-relative? #t) (plt-force-install-dir? #t)]
-   #:once-each
-   [("--include-compiled") "Include \"compiled\" subdirectories in the archive"
-    (plt-include-compiled #t)]
-   #:multi
-   [("++setup") collect "Setup <collect> after the archive is unpacked"
-    (plt-setup-collections (append (plt-setup-collections) (list collect)))]
-   #:once-each
-   [("-v") "Verbose mode"
-    (verbose #t)]
-   #:args (dest-file . path)
-   (values dest-file path)))
-
-(if (not (collection?))
-    ;; Files and directories
-    (begin
-      (for ([fd source-files])
-        (unless (relative-path? fd)
-          (error mzc-symbol
-                 "file/directory is not relative to the current directory: \"~a\""
-                 fd)))
-      (pack-plt plt-output
-                (plt-name)
-                source-files
-                #:collections (map list (plt-setup-collections))
-                #:file-mode (if (plt-files-replace) 'file-replace 'file)
-                #:plt-relative? (or (plt-files-plt-relative?)
-                                    (plt-files-plt-home-relative?))
-                #:at-plt-home? (plt-files-plt-home-relative?)
-                #:test-plt-dirs (if (or (plt-force-install-dir?)
-                                        (not (plt-files-plt-home-relative?)))
-                                    #f
-                                    '("collects" "doc" "include" "lib"))
-                #:requires
-                null)
-      (when (verbose)
-        (printf " [output to \"~a\"]\n" plt-output)))
-    ;; Collection
-    (begin
-      (pack-collections-plt
-       plt-output
-       (if (eq? default-plt-name (plt-name)) #f (plt-name))
-       (map (lambda (sf)
-              (let loop ([sf sf])
-                (let ([m (regexp-match "^([^/]*)/(.*)$" sf)])
-                  (if m (cons (cadr m) (loop (caddr m))) (list sf)))))
-            source-files)
-       #:replace? (plt-files-replace)
-       #:extra-setup-collections (map list (plt-setup-collections))
-       #:file-filter (if (plt-include-compiled)
-                         (lambda (path)
-                           (or (regexp-match #rx#"compiled$" (path->bytes path))
-                               (std-filter path)))
-                         std-filter)
-       #:at-plt-home? (plt-files-plt-home-relative?)
-       #:test-plt-collects? (not (plt-force-install-dir?)))
-      (when (verbose)
-        (printf " [output to \"~a\"]\n" plt-output))))
-
-(module test racket/base)
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/test.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/test.rkt
deleted file mode 100644
index 1c599475e1..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/test.rkt
+++ /dev/null
@@ -1,1033 +0,0 @@
-#lang racket/base
-(require racket/cmdline
-         racket/match
-         racket/format
-         racket/list
-         racket/function
-         racket/port
-         racket/path
-         racket/place
-         racket/future
-         racket/file
-         compiler/find-exe
-         raco/command-name
-         racket/system
-         rackunit/log
-         pkg/lib
-         pkg/path
-         setup/collects
-         setup/getinfo)
-
-(define rx:default-suffixes #rx#"\\.(?:rkt|scrbl)$")
-;; For any other file suffix, a `test-command-line-arguments`
-;; entry is required in "info.rkt".
-
-(define submodules '()) ; '() means "default"
-(define first-avail? #f)
-(define run-anyways? #t)
-(define quiet? #f)
-(define quiet-program? #f)
-(define check-stderr? #f)
-(define table? #f)
-(define fresh-user? #f)
-(define empty-input? #f)
-(define heartbeat-secs #f)
-(define ignore-stderr-patterns null)
-
-(define jobs 0) ; 0 mean "default"
-(define task-sema (make-semaphore 1))
-
-(define default-timeout #f) ; #f means "none"
-(define default-mode #f) ; #f => depends on how many files are provided
-
-(define single-file? #t)
-
-(define lock-file-dir (or (getenv "PLTLOCKDIR")
-                          (find-system-path 'temp-dir)))
-(define max-lock-delay (or (let ([n (string->number (or (getenv "PLTLOCKTIME") ""))])
-                             (and (real? n)
-                                  n))
-                           (* 4 60 60))) ; default: wait at most 4 hours
-
-(define test-exe-name (string->symbol (short-program+command-name)))
-
-;; Stub for running a test in a process:
-(module process racket/base
-  (require rackunit/log
-           racket/file)
-  ;; Arguments are a temp file to hold test results, the module
-  ;; path to run, and the `dynamic-require` second argument:
-  (define argv (current-command-line-arguments))
-  (define result-file (vector-ref argv 0))
-  (define test-module (read (open-input-string (vector-ref argv 1))))
-  (define d (read (open-input-string (vector-ref argv 2))))
-  (define args (list-tail (vector->list argv) 3))
-
-  ;; In case PLTUSERHOME is set, make sure relevant
-  ;; directories exist:
-  (define (ready-dir d)
-    (make-directory* d))
-  (ready-dir (find-system-path 'doc-dir))
-
-  (parameterize ([current-command-line-arguments (list->vector args)])
-    (dynamic-require test-module d)
-    ((executable-yield-handler) 0))
-
-  (call-with-output-file*
-   result-file
-   #:exists 'truncate
-   (lambda (o)
-     (write (test-log #:display? #f #:exit? #f) o)))
-  (exit 0))
-
-;; Driver for running a test in a place:
-(module place racket/base
-  (require racket/place
-           rackunit/log)
-  (provide go)
-  (define (go pch)
-    (define l (place-channel-get pch))
-    ;; Run the test:
-    (parameterize ([current-command-line-arguments (list->vector
-                                                    (cadddr l))]
-                   [current-directory (caddr l)])
-      (dynamic-require (car l) (cadr l))
-      ((executable-yield-handler) 0))
-    ;; If the tests use `rackunit`, collect result stats:
-    (define test-results 
-      (test-log #:display? #f #:exit? #f))
-    ;; Return test results. If we don't get this far, the result
-    ;; code of the place determines whether it the test counts as
-    ;; successful.
-    (place-channel-put pch
-                       ;; If the test did not use `rackunit`, claim
-                       ;; success:
-                       (if (zero? (car test-results))
-                           (cons 0 1)
-                           test-results))))
-
-;; Run each test in its own place or process, and collect both test
-;; results and whether any output went to stderr.
-(define (dynamic-require-elsewhere p d args
-                                   #:id id
-                                   #:mode [mode (or default-mode
-                                                    (if single-file?
-                                                        'direct
-                                                        'process))]
-                                   #:timeout timeout
-                                   #:responsible responsible
-                                   #:lock-name lock-name
-                                   #:random? random?)
-  (define c (make-custodian))
-  (define timeout? #f)
-  (with-handlers ([exn:fail? (lambda (exn)
-                               (custodian-shutdown-all c)
-                               (unless quiet?
-                                 (eprintf "~a: ~a\n" 
-                                          (extract-file-name p)
-                                          (exn-message exn)))
-                               (summary 1 1 (current-label) #f (if timeout? 1 0)))])
-    (define (go)
-      (define e (open-output-bytes))
-
-      (define stdout (if quiet-program?
-                         (open-output-nowhere)
-                         (current-output-port)))
-      (define stderr (if quiet-program?
-                         e
-                         (if check-stderr?
-                             (tee-output-port (current-error-port) e)
-                             (current-error-port))))
-      (define stdin (if empty-input?
-                        (open-input-bytes #"")
-                        (current-input-port)))
-
-      (unless quiet?
-        (when responsible
-          (fprintf stdout "raco test:~a @(test-responsible '~s)\n"
-                   id
-                   responsible))
-        (when random?
-          (fprintf stdout "raco test:~a @(test-random #t)\n"
-                   id))
-        (when lock-name
-          (fprintf stdout "raco test:~a @(lock-name ~s)\n"
-                   id
-                   lock-name)))
-      
-      (define-values (result-code test-results)
-        (case mode
-          [(direct)
-           (define pre (test-log #:display? #f #:exit? #f))
-           (define done? #f)
-           (define t
-             (parameterize ([current-output-port stdout]
-                            [current-error-port stderr]
-                            [current-input-port stdin]
-                            [current-command-line-arguments (list->vector args)])
-               (thread
-                (lambda ()
-                  (dynamic-require p d)
-                  ((executable-yield-handler) 0)
-                  (set! done? #t)))))
-           (unless (thread? (sync/timeout timeout t))
-             (set! timeout? #t)
-             (error test-exe-name "timeout after ~a seconds" timeout))
-           (unless done?
-             (error test-exe-name "test raised an exception"))
-           (define post (test-log #:display? #f #:exit? #f))
-           (values 0
-                   (cons (- (car post) (car pre))
-                         (- (cdr post) (cdr pre))))]
-          [(place)
-           ;; Start the test place:
-           (define-values (pl in out/f err/f)
-             (parameterize ([current-custodian c])
-               (dynamic-place* '(submod compiler/commands/test place)
-                               'go
-                               #:in stdin
-                               #:out stdout
-                               #:err stderr)))
-           
-           ;; Send the module path to test:
-           (place-channel-put pl (list p d (current-directory) args))
-
-           ;; Wait for the place to finish:
-           (unless (sync/timeout timeout (place-dead-evt pl))
-             (set! timeout? #t)
-             (error test-exe-name "timeout after ~a seconds" timeout))
-
-           ;; Get result code and test results:
-           (values (place-wait pl)
-                   (sync/timeout 0 pl))]
-          [(process)
-           (define tmp-file (make-temporary-file))
-           (define tmp-dir (and fresh-user?
-                                (make-temporary-file "home~a" 'directory)))
-           (define ps
-             (parameterize ([current-output-port stdout]
-                            [current-error-port stderr]
-                            [current-subprocess-custodian-mode 'kill]
-                            [current-custodian c]
-                            [current-environment-variables (environment-variables-copy
-                                                            (current-environment-variables))])
-               (when fresh-user?
-                 (environment-variables-set! (current-environment-variables)
-                                             #"PLTUSERHOME"
-                                             (path->bytes tmp-dir))
-                 (environment-variables-set! (current-environment-variables)
-                                             #"TMPDIR"
-                                             (path->bytes tmp-dir))
-                 (environment-variables-set! (current-environment-variables)
-                                             #"PLTADDONDIR"
-                                             (path->bytes (find-system-path 'addon-dir))))
-               (apply process*/ports
-                      stdout
-                      stdin
-                      stderr
-                      (find-exe)
-                      "-l"
-                      "racket/base"
-                      "-e"
-                      "(dynamic-require '(submod compiler/commands/test process) #f)"
-                      tmp-file
-                      (format "~s" (normalize-module-path p))
-                      (format "~s" d)
-                      args)))
-           (define proc (list-ref ps 4))
-           
-           (unless (sync/timeout timeout (thread (lambda () (proc 'wait))))
-             (set! timeout? #t)
-             (error test-exe-name "timeout after ~a seconds" timeout))
-
-           (define results
-             (with-handlers ([exn:fail:read? (lambda () #f)])
-               (call-with-input-file* tmp-file read)))
-
-           (delete-file tmp-file)
-           (when tmp-dir
-             (delete-directory/files tmp-dir))
-           
-           (values (proc 'exit-code)
-                   (and (pair? results)
-                        (exact-positive-integer? (car results))
-                        (exact-positive-integer? (cdr results))
-                        results))]))
-      
-      ;; Shut down the place/process (usually a no-op unless it timed out):
-      (custodian-shutdown-all c)
-
-      ;; Check results:
-      (when check-stderr?
-        (unless (let ([s (get-output-bytes e)])
-                  (or (equal? #"" s)
-                      (ormap (lambda (p) (regexp-match? p s))
-                             ignore-stderr-patterns)))
-          (parameterize ([error-print-width 16384])
-            (error test-exe-name "non-empty stderr: ~e" (get-output-bytes e)))))
-      (unless (zero? result-code)
-        (error test-exe-name "non-zero exit: ~e" result-code))
-      (cond
-       [test-results
-        (summary (car test-results) (cdr test-results) (current-label) #f 0)]
-       [else
-        (summary 0 1 (current-label) #f 0)]))
-
-    ;; Serialize the above with a lock, if any:
-    (if lock-name
-        (call-with-file-lock/timeout
-         #:max-delay max-lock-delay 
-         (build-path lock-file-dir lock-name)
-         'exclusive
-         go
-         (lambda () (error test-exe-name "could not obtain lock: ~s" lock-name)))
-        (go))))
-
-;; For recording stderr while also propagating to the original stderr:
-(define (tee-output-port p1 p2)
-  (make-output-port
-   (object-name p1)
-   p1
-   (lambda (bstr start end non-block? enable-break?)
-     (cond
-      [(= start end)
-       (flush-output p1)
-       0]
-      [else
-       (define n (write-bytes-avail* bstr p1 start end))
-       (cond
-        [(or (not n)
-             (zero? n))
-         (wrap-evt p1 (lambda (v) 0))]
-        [else
-         (write-bytes bstr p2 start (+ start n))
-         n])]))
-   (lambda () 
-     (close-output-port p1)
-     (close-output-port p2))))
-
-(define (extract-file-name p)
-  (cond
-   [(and (pair? p) (eq? 'submod (car p)))
-    (cadr p)]
-   [else p]))
-
-(define (add-submod mod sm)
-  (if (and (pair? mod) (eq? 'submod (car mod)))
-      (append mod '(config))
-      (error test-exe-name "cannot add test-config submodule to path: ~s" mod)))
-
-(define (dynamic-require* p d
-                          #:id id
-                          #:try-config? try-config?
-                          #:args args
-                          #:timeout timeout
-                          #:responsible responsible
-                          #:lock-name lock-name
-                          #:random? random?)
-  (define lookup
-    (or (cond
-         [(not try-config?) #f]
-         [(module-declared? (add-submod p 'config) #t)
-          (dynamic-require (add-submod p 'config) '#%info-lookup)]
-         [else #f])
-        (lambda (what get-default) (get-default))))
-  (dynamic-require-elsewhere
-   p d args
-   #:id id
-   #:responsible (lookup 'responsible
-                         (lambda () responsible))
-   #:timeout (if default-timeout
-                 (lookup 'timeout
-                         (lambda () timeout))
-                 +inf.0)
-   #:lock-name (lookup 'lock-name
-                       (lambda () lock-name))
-   #:random? (lookup 'random?
-                     (lambda () random?))))
-
-(define current-label (make-parameter "???"))
-(struct summary (failed total label body-res timeout))
-
-(define-syntax-rule (with-summary label . body)
-  (call-with-summary label (lambda () . body)))
-
-(define (call-with-summary label thunk)
-  (define res
-    ;; Produces either a summary or a list of summary:
-    (parameterize ([current-label label])
-      (thunk)))
-  (if (summary? res)
-      res
-      (summary
-       (apply + (map summary-failed res))
-       (apply + (map summary-total res))
-       (current-label)
-       res
-       (apply + (map summary-timeout res)))))
-
-
-(define (iprintf i fmt . more)
-  (for ([j (in-range i)])
-    (display #\space))
-  (apply printf fmt more))
-(define (display-summary top)
-  (define files
-    (let flatten ([sum top])
-      (match sum
-        [(list sum ...)
-         (append-map flatten sum)]
-        [(summary failed total `(file ,p) body timeout)
-         (list sum)]
-        [(summary failed total label body timeout)
-         (flatten body)]
-        [(? void?)
-         empty])))
-  (define sfiles
-    (sort files
-          (λ (x y)
-            (cond
-              [(= (summary-failed x) (summary-failed y))
-               (> (summary-total x) (summary-total y))]
-              [else
-               (< (summary-failed x) (summary-failed y))]))))
-  (define (max-width f)
-    (string-length
-     (number->string
-      (apply max 0 (map f sfiles)))))
-  (define failed-wid (max-width summary-failed))
-  (define total-wid (max-width summary-total))
-  (for ([f (in-list sfiles)])
-    (match-define (summary failed total `(file ,p) _ _) f)
-    (displayln (~a (~a #:min-width failed-wid
-                       #:align 'right
-                       (if (zero? failed)
-                         ""
-                         failed))
-                   " "
-                   (~a #:min-width total-wid
-                       #:align 'right
-                       total)
-                   " " p))))
-
-;; Like `map`, but allows `run-one-test`s in parallel while starting
-;; tasks in the order that a plain `map` would run them. The #:sema
-;; argument everywhere makes tests start in a deterministic order
-;; and keeps a filesystem traversal from getting far ahead of the
-;; test runs.
-(define (map/parallel f l #:sema continue-sema)
-  (cond
-   [(jobs . <= . 1) (map (lambda (v) (f v #:sema continue-sema)) l)]
-   [else
-    (struct task (th result-box))
-    (define ts
-      (for/list ([i (in-list l)])
-        (define b (box #f))
-        (define c-sema (make-semaphore))
-        (define t (thread
-                   (lambda ()
-                     (set-box! b (with-handlers ([exn? values])
-                                   (f i #:sema c-sema)))
-                     ;; If no parallel task was ever created,
-                     ;; count that as progress to the parent
-                     ;; thread:
-                     (semaphore-post c-sema))))
-        (sync c-sema)
-        (task t b)))
-    (semaphore-post continue-sema)
-    (map sync (map task-th ts))
-    (for/list ([t (in-list ts)])
-      (define v (unbox (task-result-box t)))
-      (if (exn? v)
-          (raise v)
-          v))]))
-
-(define (normalize-module-path p)
-  (cond
-   [(path? p) (path->string p)]
-   [(and (pair? p) (eq? 'submod (car p)))
-    (list* 'submod (normalize-module-path (cadr p)) (cddr p))]
-   [else p]))
-
-(define ids '(1))
-(define ids-lock (make-semaphore 1))
-
-(define (set-jobs! n)
-  (set! jobs n)
-  (set! task-sema (make-semaphore jobs))
-  (set! ids (for/list ([i (in-range jobs)]) i)))
-
-;; Perform test of one module (in parallel, as allowed by
-;; `task-sema`):
-(define (test-module p mod
-                     #:sema continue-sema
-                     #:try-config? try-config?
-                     #:args [args '()]
-                     #:timeout [timeout +inf.0]
-                     #:responsible [responsible #f]
-                     #:lock-name [lock-name #f]
-                     #:random? [random? #f])
-  (call-with-semaphore
-   task-sema ; limits parallelism
-   (lambda ()
-     (semaphore-post continue-sema) ; allow next to try to start
-     (define id
-       (call-with-semaphore
-        ids-lock
-        (lambda ()
-          (define id (car ids))
-          (set! ids (cdr ids))
-          (unless quiet?
-            ;; in lock, so printouts are not interleaved
-            (printf "raco test: ~a~s~a\n"
-                    (if (jobs . <= . 1)
-                        ""
-                        (format "~a " id))
-                    (let ([m (normalize-module-path p)])
-                      (if (and (pair? mod) (eq? 'submod (car mod)))
-                          (list* 'submod m (cddr mod))
-                          m))
-                    (apply string-append
-                           (for/list ([a (in-list args)])
-                             (format " ~s" (format "~a" a)))))
-            (flush-output))
-          id)))
-     (define heartbeat-sema (make-semaphore))
-     (define heartbeat-t
-       (and heartbeat-secs
-            (thread (lambda ()
-                      (let loop ()
-                        (unless (sync/timeout heartbeat-secs heartbeat-sema)
-                          (call-with-semaphore
-                           ids-lock
-                           (lambda ()
-                             (printf "raco test: ~a[still on ~s]\n"
-                                     (if (jobs . <= . 1)
-                                         ""
-                                         (format "~a " id))
-                                     (let ([m (normalize-module-path p)])
-                                       (if (and (pair? mod) (eq? 'submod (car mod)))
-                                           (list* 'submod m (cddr mod))
-                                           m)))))
-                          (loop)))))))
-     (begin0
-      (dynamic-require* mod 0
-                        #:id (if (jobs . <= . 1)
-                                 ""
-                                 (format " ~a" id))
-                        #:try-config? try-config?
-                        #:args args
-                        #:timeout timeout
-                        #:responsible responsible
-                        #:lock-name lock-name
-                        #:random? random?)
-      (when heartbeat-t
-        (semaphore-post heartbeat-sema)
-        (sync heartbeat-t))
-      (call-with-semaphore
-       ids-lock
-       (lambda ()
-         (set! ids (cons id ids))))))))
-
-;; Perform all tests in path `e`:
-(define (test-files e
-                    #:check-suffix? [check-suffix? #f]
-                    #:sema continue-sema)
-  (match e
-    [(? string? s)
-     (test-files (string->path s)
-                 #:check-suffix? check-suffix?
-                 #:sema continue-sema)]
-    [(? path? p)
-     (cond
-       [(directory-exists? p)
-        (set! single-file? #f)
-        (define dir-p (path->directory-path p))
-        (check-info dir-p)
-        (if (omit-path? dir-p)
-            (summary 0 0 #f null 0)
-            (with-summary
-             `(directory ,p)
-             (map/parallel
-              (λ (dp #:sema s)
-                (test-files (build-path p dp)
-                            #:check-suffix? #t
-                            #:sema s))
-              (directory-list p)
-              #:sema continue-sema)))]
-       [(and (or (not check-suffix?)
-                 (regexp-match rx:default-suffixes p)
-                 (get-cmdline p #f #:check-info? #t))
-             (or (not check-suffix?)
-                 (not (omit-path? p  #:check-info? #t))))
-        (unless check-suffix?
-          ;; make sure "info.rkt" information is loaded:
-          (check-info p))
-        (define norm-p (normalize-info-path p))
-        (define args (get-cmdline norm-p))
-        (define timeout (get-timeout norm-p))
-        (define lock-name (get-lock-name norm-p))
-        (define responsible (get-responsible norm-p))
-        (define random? (get-random norm-p))
-        (parameterize ([current-directory (let-values ([(base name dir?) (split-path p)])
-                                            (if (path? base)
-                                                base
-                                                (current-directory)))])
-          (define file-name (file-name-from-path p))
-          (define (test-this-module mod try-config?)
-            (test-module p mod
-                         #:try-config? try-config?
-                         #:sema continue-sema
-                         #:args args
-                         #:timeout timeout
-                         #:responsible responsible
-                         #:lock-name lock-name
-                         #:random? random?))
-          (with-summary
-           `(file ,p)
-           (let ([something-wasnt-declared? #f]
-                 [did-one? #f])
-             (filter
-              values
-              (append
-               (for/list ([submodule (in-list (if (null? submodules)
-                                                  '(test)
-                                                  (reverse submodules)))])
-                 (define mod `(submod ,file-name ,submodule))
-                 (cond
-                  [(and did-one? first-avail?)
-                   #f]
-                  [(with-handlers ([exn:fail?
-                                    (lambda (exn)
-                                      ;; If there's an error, then try running
-                                      ;; this submodule to let the error show.
-                                      ;; Log a warning, just in case.
-                                      (log-warning "submodule load failed: ~s"
-                                                   (exn-message exn))
-                                      'error)])
-                     (and (module-declared? mod #t)
-                          'ok))
-                   => (lambda (mode)
-                        (set! did-one? #t)
-                        (test-this-module mod (eq? mode 'ok)))]
-                  [else
-                   (set! something-wasnt-declared? #t)
-                   #f]))
-               (list
-                (and (and run-anyways? something-wasnt-declared?)
-                     (test-this-module file-name #f))))))))]
-       [else (summary 0 0 #f null 0)])]))
-
-(module paths racket/base
-  (require setup/link
-           racket/match
-           racket/list)
-
-  (struct col (name path) #:transparent)
-
-  (define (get-linked file user? version?)
-    (define version-re
-      (and version?
-           (regexp-quote (version))))
-    (append
-     (for/list ([c+p
-                 (in-list
-                  (links #:file file #:user? user? #:version-regexp version-re
-                         #:with-path? #t))])
-       (col (car c+p)
-            (cdr c+p)))
-     (for/list ([cp
-                 (in-list
-                  (links #:file file #:user? user? #:version-regexp version-re
-                         #:root? #t))]
-                #:when (directory-exists? cp)
-                [collection (directory-list cp)]
-                #:when (directory-exists? (build-path cp collection)))
-       (col (path->string collection)
-            (build-path cp collection)))))
-
-  ;; A list of `col's, where each collection may be represented
-  ;; by multiple elements of the list, each with its own path.
-  (define (all-collections)
-    (remove-duplicates
-     (append*
-      (for/list ([cp (current-library-collection-paths)]
-                 #:when (directory-exists? cp)
-                 [collection (directory-list cp)]
-                 #:when (directory-exists? (build-path cp collection)))
-        (col (path->string collection)
-             (build-path cp collection)))
-      (for*/list ([file (in-list (current-library-collection-links))]
-                  [user? (in-list '(#t #f))]
-                  [version? (in-list '(#t #f))])
-        (get-linked file user? version?)))))
-
-  ;; This should be in Racket somewhere and return all the collection
-  ;; paths, rather than just the first as collection-path does.
-  (define (collection-paths c)
-    (match-define (list-rest sc more) (map path->string (explode-path c)))
-    (append*
-     (for/list ([col (all-collections)]
-                #:when (string=? sc (col-name col)))
-       (define p (col-path col))
-       (define cp (apply build-path p more))
-       (if (directory-exists? cp)
-         (list cp)
-         empty))))
-
-  (provide collection-paths))
-
-(require (submod "." paths))
-
-(define collections? #f)
-(define packages? #f)
-(define libraries? #f)
-(define check-top-suffix? #f)
-
-(define (test-top e 
-                  #:check-suffix? check-suffix?
-                  #:sema continue-sema)
-  (cond
-    [collections?
-     (match (collection-paths e)
-       [(list)
-        (error test-exe-name
-               (string-append "collection not found\n"
-                              "  collection name: ~a")
-               e)]
-       [l
-        (with-summary
-         `(collection ,e)
-         (map/parallel test-files l #:sema continue-sema))])]
-    [libraries?     
-     (define (find x)
-       (define rmp ((current-module-name-resolver) x #f #f #f))
-       (define p (resolved-module-path-name rmp))
-       (and (file-exists? p) p))
-     (match (find `(lib ,e))
-       [#f
-        (error test-exe-name
-               (string-append "module not found\n"
-                              "  module path: ~a")
-               e)]
-       [l
-        (with-summary
-         `(library ,l)
-         (test-files l #:sema continue-sema))])]
-    [packages?
-     (define pd (pkg-directory e))
-     (if pd
-       (with-summary
-        `(package ,e)
-        (test-files pd #:sema continue-sema))
-       (error test-exe-name
-              (string-append "no such installed package\n"
-                             "  package name: ~a")
-              e))]
-    [else
-     (unless (or (file-exists? e)
-                 (directory-exists? e))
-       (error test-exe-name
-              (string-append "no such file or directory\n"
-                             "  path: ~a")
-              e))
-     (test-files e
-                 #:check-suffix? check-suffix? 
-                 #:sema continue-sema)]))
-
-;; --------------------------------------------------
-;; Reading "info.rkt" files
-
-(define omit-paths (make-hash))
-(define command-line-arguments (make-hash))
-(define timeouts (make-hash))
-(define lock-names (make-hash))
-(define responsibles (make-hash))
-(define randoms (make-hash))
-
-(define pkg-cache (make-hash))
-(define collects-cache (make-hash))
-(define info-done (make-hash))
-
-(define (check-dir-info p)
-  (define-values (base name dir?) (split-path p))
-  (define dir (normalize-info-path
-               (if dir?
-                   p
-                   (if (path? base)
-                       (path->complete-path base)
-                       (current-directory)))))
-
-  (unless (hash-ref info-done dir #f)
-    (hash-set! info-done dir #t)
-    (define info (get-info/full dir))
-    (when info
-      (define (bad what v)
-        (log-error "bad `~a' in \"info.rkt\": ~e" what v))
-      
-      (define (get-members table what all-ok?)
-        (define v (info what (lambda () '())))
-        (cond
-         [(and all-ok? (eq? v 'all))
-          (hash-set! table dir #t)]
-         [(list? v)
-          (for ([i (in-list v)])
-            (unless (path-string? i) (bad what v))
-            (define p (normalize-info-path (path->complete-path i dir)))
-            (define dp (if (directory-exists? p)
-                           (path->directory-path p)
-                           p))
-            (hash-set! table dp #t))]
-         [else (bad what v)]))
-      (get-members omit-paths 'test-omit-paths #t)
-      (get-members randoms 'test-randoms #t)
-      
-      (define (get-keyed table what check? #:ok-all? [ok-all? #f])
-        (define a (info what (lambda () '())))
-        (if (list? a)
-            (for ([arg (in-list a)])
-              (unless (and (list? arg)
-                           (= 2 (length arg))
-                           (or (path-string? (car arg))
-                               (and ok-all?
-                                    (eq? (car arg) 'all)))
-                           (check? (cadr arg)))
-                (bad what a))
-              (hash-set! table
-                         (normalize-info-path (if (eq? (car arg) 'all)
-                                                  dir
-                                                  (path->complete-path (car arg) dir)))
-                         (cadr arg)))
-            (bad what a)))
-
-      (get-keyed command-line-arguments
-                 'test-command-line-arguments 
-                 (lambda (v) (and (list? v)
-                                  (andmap path-string? v))))
-      (get-keyed timeouts
-                 'test-timeouts
-                 (lambda (v) (real? v)))
-      (get-keyed lock-names
-                 'test-lock-names
-                 (lambda (v) (or (not v)
-                                 (and (string? v)
-                                      (path-string? v)))))
-      (get-keyed responsibles
-                 'test-responsibles
-                 ok-responsible?
-                 #:ok-all? #t)
-      (get-keyed randoms
-                 'test-random
-                 (lambda (v) (string? v))))))
-
-(define (check-info/parents dir subpath)
-  (let loop ([dir dir] [subpath subpath])
-    (check-dir-info dir)
-    (define-values (next-subpath subpath-name subpath-dir?) (split-path subpath))
-    (define-values (next-dir dir-name dir-dir?) (split-path dir))
-    (when (path? next-subpath)
-      (loop next-dir next-subpath))))
-
-(define (check-info p)
-  (check-dir-info p)
-  ;; Check enclosing collection
-  (define-values (base name dir?) (split-path p))
-  (define c (if dir?
-                #f
-                (path->collects-relative p #:cache collects-cache)))
-  (when (list? c)
-    (check-info/parents (if (path? base)
-                            (path->complete-path base)
-                            (current-directory)) ; got 'relative
-                        (apply build-path (map bytes->path (reverse (cdr (reverse (cdr c)))))))))
-
-(define (normalize-info-path p)
-  (simplify-path (path->complete-path p) #f))
-
-(define (omit-path? p #:check-info? [check-info? #f])
-  (when check-info? (check-info p))
-  (let ([p (normalize-info-path p)])
-    (or (hash-ref omit-paths p #f)
-        (let-values ([(base name dir?) (split-path p)])
-          (and (path? base)
-               (omit-path? base))))))
-
-(define (get-cmdline p [default null] #:check-info? [check-info? #f])
-  (when check-info? (check-info p))
-  (hash-ref command-line-arguments
-            (if check-info? (normalize-info-path p) p)
-            default))
-
-(define (get-timeout p)
-  ;; assumes `(check-info p)` has been called and `p` is normalized
-  (hash-ref timeouts p +inf.0))
-
-(define (get-lock-name p)
-  ;; assumes `(check-info p)` has been called and `p` is normalized
-  (hash-ref lock-names p #f))
-
-(define (get-responsible p)
-  ;; assumes `(check-info p)` has been called and `p` is normalized
-  (or (let loop ([p p])
-        (or (hash-ref responsibles p #f)
-            (let-values ([(base name dir?) (split-path p)])
-              (and (path? base)
-                   (loop base)))))
-      ;; Check package authors:
-      (let-values ([(pkg subpath) (path->pkg+subpath p #:cache pkg-cache)])
-        (and pkg
-             (let ([pkg-dir (if (path? subpath)
-                                (apply build-path
-                                       (drop-right (explode-path p)
-                                                   (length (explode-path subpath))))
-                                pkg)])
-               (define info (get-info/full pkg-dir))
-               (and info
-                    (let ([v (info 'pkg-authors (lambda () #f))])
-                      (and (ok-responsible? v)
-                           v))))))))
-
-(define (get-random p)
-  ;; assumes `(check-info p)` has been called and `p` is normalized
-  (hash-ref randoms p #f))
-
-(define (ok-responsible? v)
-  (or (string? v)
-      (symbol? v)
-      (and (list? v)
-           (andmap (lambda (v) (or (symbol? v) (string? v)))
-                   v))))
-
-;; --------------------------------------------------
-
-(define (string->number* what s check)
-  (define n (string->number s))
-  (unless (check n)
-    (raise-user-error (string->symbol (short-program+command-name))
-                      "invalid ~a: ~s"
-                      what
-                      s))
-  n)
-
-(command-line
- #:program (short-program+command-name)
- #:once-any
- [("--collection" "-c")
-  "Interpret arguments as collections"
-  (set! collections? #t)]
- [("--lib" "-l")
-  "Interpret arguments as libraries"
-  (set! libraries? #t)]
- [("--package" "-p")
-  "Interpret arguments as packages"
-  (set! packages? #t)]
- [("--modules" "-m")
-  ("Interpret arguments as modules"
-   "  (ignore argument unless \".rkt\", \".scrbl\", or enabled by \"info.rkt\")")
-  (set! check-top-suffix? #t)]
- #:once-each
- [("--drdr")
-  "Configure defaults to imitate DrDr"
-  (set! check-top-suffix? #t)
-  (set! first-avail? #t)
-  (set! empty-input? #t)
-  (when (zero? jobs)
-    (set-jobs! (processor-count)))
-  (unless default-timeout
-    (set! default-timeout 90))
-  (set! check-stderr? #t)
-  (set! quiet-program? #t)
-  (set! fresh-user? #t)
-  (set! table? #t)
-  (unless default-mode
-    (set! default-mode 'process))]
- #:multi
- [("--submodule" "-s") name
-  "Runs submodule <name>\n    (defaults to running just the `test' submodule)"
-  (let ([n (string->symbol name)])
-    (set! submodules (cons n submodules)))]
- #:once-any
- [("--run-if-absent" "-r")
-  "Require module if submodule is absent (on by default)"
-  (set! run-anyways? #t)]
- [("--no-run-if-absent" "-x")
-  "Require nothing if submodule is absent"
-  (set! run-anyways? #f)]
- #:once-each
- [("--first-avail")
-  "Run only the first available submodule"
-  (set! first-avail? #f)]
- #:once-any
- [("--direct")
-  "Run tests directly (default for a single file)"
-  (set! default-mode 'direct)]
- [("--process")
-  "Run tests in separate processes (default for multiple files)"
-  (set! default-mode 'process)]
- [("--place")
-  "Run tests in places"
-  (set! default-mode 'place)]
- #:once-each
- [("--jobs" "-j") n
-  "Run up to <n> tests in parallel"
-  (set-jobs! (string->number* "jobs" n exact-positive-integer?))]
- [("--timeout") seconds
-  "Set default timeout to <seconds>"
-  (set! default-timeout (string->number* "timeout" seconds real?))]
- [("--fresh-user")
-  "Fresh PLTUSERHOME, etc., for each test"
-  (set! fresh-user? #t)]
- [("--empty-stdin")
-  "Call program with an empty stdin"
-  (set! empty-input? #t)]
- [("--quiet-program" "-Q")
-  "Quiet the program"
-  (set! quiet-program? #t)]
- [("--check-stderr" "-e")
-  "Treat stderr output as a test failure"
-  (set! check-stderr? #t)]
- #:multi
- [("++ignore-stderr") pattern
-  "Ignore standard error output if it matches #px\"<pattern>\""
-  (set! ignore-stderr-patterns
-        (cons (pregexp pattern) ignore-stderr-patterns))]
- #:once-each
- [("--quiet" "-q")
-  "Suppress `raco test: ...' message"
-  (set! quiet? #t)]
- [("--heartbeat")
-  "Periodically report that a test is still running"
-  (set! heartbeat-secs 5)]
- [("--table" "-t")
-  "Print a summary table"
-  (set! table? #t)]
- #:args file-or-directory
- (begin (unless (= 1 (length file-or-directory))
-          (set! single-file? #f))
-        (define sum
-          ;; The #:sema argument everywhre makes tests start
-          ;; in a deterministic order:
-          (map/parallel (lambda (f #:sema s)
-                          (test-top f
-                                    #:check-suffix? check-top-suffix?
-                                    #:sema s))
-                        file-or-directory
-                        #:sema (make-semaphore)))
-        (when table?
-          (display-summary sum))
-        (unless (or (eq? default-mode 'direct)
-                    (and (not default-mode) single-file?))
-          ;; Re-log failures and successes, and then report using `test-log`.
-          ;; (This is awkward; is it better to not try to use `test-log`?)
-          (for ([s (in-list sum)])
-            (for ([i (in-range (summary-failed s))])
-              (test-log! #f))
-            (for ([i (in-range (- (summary-total s)
-                                  (summary-failed s)))])
-              (test-log! #t))))
-        (test-log #:display? #t #:exit? #f)
-        (define sum1 (call-with-summary #f (lambda () sum)))
-        (exit (cond
-               [(positive? (summary-timeout sum1)) 2]
-               [(positive? (summary-failed sum1)) 1]
-               [else 0]))))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/unpack.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/unpack.rkt
deleted file mode 100644
index 2c2a1cfdd7..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/unpack.rkt
+++ /dev/null
@@ -1,102 +0,0 @@
-#lang scheme/base
-(require scheme/cmdline
-         raco/command-name
-         setup/unpack
-         racket/file
-         racket/port
-         racket/match
-         racket/string
-         racket/pretty)
-
-(define verbose (make-parameter #f))
-
-(define just-show? (make-parameter #f))
-(define replace? (make-parameter #f))
-(define show-config? (make-parameter #f))
-
-(define mzc-symbol (string->symbol (short-program+command-name)))
-
-(define files
-  (command-line
-   #:program (short-program+command-name)
-   #:once-each
-   [("-l" "--list") "just list archive content"
-    (just-show? #t)]
-   [("-c" "--config") "show archive configuration"
-    (show-config? #t)]
-   [("-f" "--force") "replace existing files when unpacking"
-    (replace? #t)]
-   #:args archive
-   archive))
-
-(define (desc->path dir)
-  (if (path? dir)
-      dir
-      (apply build-path
-             (symbol->string (car dir))
-             (cdr dir))))
-
-(for ([filename (in-list files)])
-  (fold-plt-archive filename 
-                    (lambda (config a)
-                      (when (show-config?)
-                        (match config
-                          [`(lambda (request failure) 
-                              (case request 
-                                ((name) ,name) 
-                                ((unpacker) (quote mzscheme)) 
-                                ((requires) (quote ,reqs)) 
-                                ((conflicts) (quote ,conflicts)) 
-                                ((plt-relative?) ,plt-rel?) 
-                                ((plt-home-relative?) ,plt-home-rel?) 
-                                ((test-plt-dirs) ,test-plt-dirs) 
-                                (else (failure))))
-                           (printf "config:\n")
-                           (printf " name: ~s\n" name)
-                           (printf " requires:\n")
-                           (for ([c (in-list reqs)])
-                             (printf "  ~s ~s\n" (string-join (car c) "/") (cadr c)))
-                           (printf " conflicts:\n")
-                           (for ([c (in-list conflicts)])
-                             (printf "  ~s\n" (string-join c "/")))
-                           (cond
-                            [plt-home-rel? (printf " unpack to main installation\n")]
-                            [plt-rel? (printf " unpack to user add-ons\n")]
-                            [else (printf " unpack locally\n")])]
-                          [else
-                           (printf "config function:\n")
-                           (pretty-write config)]))
-                      a)
-                    (lambda (setup i a)
-                      (when (show-config?)
-                        (match setup
-                          [`(unit (import main-collects-parent-dir mzuntar) (export) (mzuntar void) (quote ,c))
-                           (printf "setup collections:\n")
-                           (for ([c (in-list c)])
-                             (printf " ~s\n" (string-join c "/")))]
-                          [else
-                           (printf "setup unit:\n")
-                           (pretty-write setup)]))
-                      a)
-                    (lambda (dir a)
-                      (unless (eq? dir 'same)
-                        (if (just-show?)
-                            (printf "~a\n" (path->directory-path (desc->path dir)))
-                            (make-directory* (desc->path dir))))
-                      a)
-                    (lambda (file i kind a)
-                      (if (just-show?)
-                          (printf "~a~a\n" (desc->path file)
-                                  (if (eq? kind 'file-replace)
-                                      " [replace]"
-                                      ""))
-                          (call-with-output-file*
-                           (desc->path file)
-                           #:exists (if (or (eq? kind 'file-replace)
-                                            (replace?))
-                                        'truncate/replace
-                                        'error)
-                           (lambda (o)
-                             (copy-port i o))))
-                      a)
-                    (void)))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/compiler-unit.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/compiler-unit.rkt
deleted file mode 100644
index 4f6b768420..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/compiler-unit.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-
-(require compiler/compiler compiler/sig racket/unit)
-(provide compiler@)
-(define-unit-from-context compiler@ compiler^)
\ No newline at end of file
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/decompile.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/decompile.rkt
deleted file mode 100644
index 5acfe47c06..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/decompile.rkt
+++ /dev/null
@@ -1,515 +0,0 @@
-#lang racket/base
-(require compiler/zo-parse
-         syntax/modcollapse
-         racket/port
-         racket/match
-         racket/list
-         racket/set
-         racket/path)
-
-(provide decompile)
-
-;; ----------------------------------------
-
-(define primitive-table
-  ;; Figure out number-to-id mapping for kernel functions in `primitive'
-  (let ([bindings
-         (let ([ns (make-base-empty-namespace)])
-           (parameterize ([current-namespace ns])
-             (namespace-require ''#%kernel)
-             (namespace-require ''#%unsafe)
-             (namespace-require ''#%flfxnum)
-             (namespace-require ''#%extfl)
-             (namespace-require ''#%futures)
-             (namespace-require ''#%foreign)
-             (for/list ([l (namespace-mapped-symbols)])
-               (cons l (with-handlers ([exn:fail? (lambda (x) #f)])
-                         (compile l))))))]
-        [table (make-hash)])
-    (for ([b (in-list bindings)])
-      (let ([v (and (cdr b)
-                    (zo-parse 
-                     (open-input-bytes
-                      (with-output-to-bytes
-                          (λ () (write (cdr b)))))))])
-        (let ([n (match v
-                   [(struct compilation-top (_ prefix (struct primval (n)))) n]
-                   [else #f])])
-          (hash-set! table n (car b)))))
-    table))
-
-(define (list-ref/protect l pos who)
-  (list-ref l pos)
-  #;
-  (if (pos . < . (length l))
-      (list-ref l pos)
-      `(OUT-OF-BOUNDS ,who ,pos ,(length l) ,l)))
-
-;; ----------------------------------------
-
-(define-struct glob-desc (vars num-tls num-stxs num-lifts))
-
-;; Main entry:
-(define (decompile top)
-  (let ([stx-ht (make-hasheq)])
-    (match top
-      [(struct compilation-top (max-let-depth prefix form))
-       (let-values ([(globs defns) (decompile-prefix prefix stx-ht)])
-         `(begin
-            ,@defns
-            ,(decompile-form form globs '(#%globals) (make-hasheq) stx-ht)))]
-      [else (error 'decompile "unrecognized: ~e" top)])))
-
-(define (decompile-prefix a-prefix stx-ht)
-  (match a-prefix
-    [(struct prefix (num-lifts toplevels stxs))
-     (let ([lift-ids (for/list ([i (in-range num-lifts)])
-                       (gensym 'lift))]
-           [stx-ids (map (lambda (i) (gensym 'stx)) 
-                         stxs)])
-       (values (glob-desc 
-                (append 
-                 (map (lambda (tl)
-                        (match tl
-                          [#f '#%linkage]
-                          [(? symbol?) (string->symbol (format "_~a" tl))]
-                          [(struct global-bucket (name)) 
-                           (string->symbol (format "_~a" name))]
-                          [(struct module-variable (modidx sym pos phase constantness))
-                           (if (and (module-path-index? modidx)
-                                    (let-values ([(n b) (module-path-index-split modidx)])
-                                      (and (not n) (not b))))
-                               (string->symbol (format "_~a" sym))
-                               (string->symbol (format "_~s~a@~s~a" 
-                                                       sym 
-                                                       (match constantness
-                                                         ['constant ":c"]
-                                                         ['fixed ":f"]
-                                                         [(function-shape a pm?) 
-                                                          (if pm? ":P" ":p")]
-                                                         [(struct-type-shape c) ":t"]
-                                                         [(constructor-shape a) ":mk"]
-                                                         [(predicate-shape) ":?"]
-                                                         [(accessor-shape c) ":ref"]
-                                                         [(mutator-shape c) ":set!"]
-                                                         [else ""])
-                                                       (mpi->string modidx) 
-                                                       (if (zero? phase)
-                                                           ""
-                                                           (format "/~a" phase)))))]
-                          [else (error 'decompile-prefix "bad toplevel: ~e" tl)]))
-                      toplevels)
-                 stx-ids
-                 (if (null? stx-ids) null '(#%stx-array))
-                 lift-ids)
-                (length toplevels)
-                (length stxs)
-                num-lifts)
-               (map (lambda (stx id)
-                      `(define ,id ,(if stx
-                                        `(#%decode-syntax 
-                                          ,(decompile-stx (stx-encoded stx) stx-ht))
-                                        #f)))
-                    stxs stx-ids)))]
-    [else (error 'decompile-prefix "huh?: ~e" a-prefix)]))
-
-(define (decompile-stx stx stx-ht)
-  (or (hash-ref stx-ht stx #f)
-      (let ([p (mcons #f #f)])
-        (hash-set! stx-ht stx p)
-        (match stx
-          [(wrapped datum wraps tamper-status)
-           (set-mcar! p (case tamper-status
-                          [(clean) 'wrap]
-                          [(tainted) 'wrap-tainted]
-                          [(armed) 'wrap-armed]))
-           (set-mcdr! p (mcons
-                         (cond
-                          [(pair? datum) 
-                           (cons (decompile-stx (car datum) stx-ht)
-                                 (let loop ([l (cdr datum)])
-                                   (cond
-                                    [(null? l) null]
-                                    [(pair? l)
-                                     (cons (decompile-stx (car l) stx-ht)
-                                           (loop (cdr l)))]
-                                    [else
-                                     (decompile-stx l stx-ht)])))]
-                          [(vector? datum)
-                           (for/vector ([e (in-vector datum)])
-                             (decompile-stx e stx-ht))]
-                          [(box? datum)
-                           (box (decompile-stx (unbox datum) stx-ht))]
-                          [else datum])
-                         (let loop ([wraps wraps])
-                           (cond
-                            [(null? wraps) null]
-                            [else
-                             (or (hash-ref stx-ht wraps #f)
-                                 (let ([p (mcons #f #f)])
-                                   (hash-set! stx-ht wraps p)
-                                   (set-mcar! p (decompile-wrap (car wraps) stx-ht))
-                                   (set-mcdr! p (loop (cdr wraps)))
-                                   p))]))))
-           p]))))
-
-(define (decompile-wrap w stx-ht)
-  (or (hash-ref stx-ht w #f)
-      (let ([v (match w
-                 [(lexical-rename has-free-id-renames?
-                                  ignored
-                                  alist)
-                  `(,(if has-free-id-renames? 'lexical/free-id=? 'lexical) . ,alist)]
-                 [(phase-shift amt src dest cancel-id)
-                  `(phase-shift ,amt ,src ,dest, cancel-id)]
-                 [(wrap-mark val)
-                  val]
-                 [(prune sym)
-                  `(prune ,sym)]
-                 [(module-rename phase kind set-id unmarshals renames mark-renames plus-kern?)
-                  `(module-rename ,phase ,kind ,set-id ,unmarshals ,renames ,mark-renames ,plus-kern?)]
-                 [(top-level-rename flag)
-                  `(top-level-rename ,flag)]
-                 [else w])])
-        (hash-set! stx-ht w v)
-        v)))
-
-(define (mpi->string modidx)
-  (cond
-   [(symbol? modidx) modidx]
-   [else 
-    (collapse-module-path-index modidx (build-path
-                                        (or (current-load-relative-directory)
-                                            (current-directory))
-                                        "here.rkt"))]))
-
-(define (decompile-module mod-form orig-stack stx-ht mod-name)
-  (match mod-form
-    [(struct mod (name srcname self-modidx prefix provides requires body syntax-bodies unexported 
-                       max-let-depth dummy lang-info internal-context flags pre-submodules post-submodules))
-     (let-values ([(globs defns) (decompile-prefix prefix stx-ht)]
-                  [(stack) (append '(#%modvars) orig-stack)]
-                  [(closed) (make-hasheq)])
-       `(,mod-name ,(if (symbol? name) name (last name)) ....
-           ,@(if (null? flags) '() (list `(quote ,flags)))
-           ,@(let ([l (apply
-                       append
-                       (for/list ([req (in-list requires)]
-                                  #:when (pair? (cdr req)))
-                         (define l (for/list ([mpi (in-list (cdr req))])
-                                     (define p (mpi->string mpi))
-                                     (if (path? p)
-                                         (let ([d (current-load-relative-directory)])
-                                           (path->string (if d
-                                                             (find-relative-path (simplify-path d #t)
-                                                                                 (simplify-path p #f) 
-                                                                                 #:more-than-root? #t)
-                                                             p)))
-                                         p)))
-                         (if (eq? 0 (car req))
-                             l
-                             `((,@(case (car req)
-                                    [(#f) `(for-label)]
-                                    [(1) `(for-syntax)]
-                                    [else `(for-meta ,(car req))])
-                                ,@l)))))])
-               (if (null? l)
-                   null
-                   `((require ,@l))))
-           (provide ,@(apply
-                       append
-                       (for/list ([p (in-list provides)])
-                         (define phase (car p))
-                         (define l
-                           (for/list ([pv (in-list (append (cadr p) (caddr p)))])
-                             (match pv
-                               [(struct provided (name src src-name nom-src src-phase protected?))
-                                (define n (if (eq? name src-name)
-                                              name
-                                              `(rename-out [,src-name ,name])))
-                                (if protected?
-                                    `(protect-out ,n)
-                                    n)])))
-                         (if (or (null? l) (eq? phase 0))
-                             l
-                             `((,@(case phase
-                                    [(#f) `(for-label)]
-                                    [(1) `(for-syntax)]
-                                    [else `(for-meta ,phase)])
-                                ,@l))))))
-          ,@defns
-          ,@(for/list ([submod (in-list pre-submodules)])
-              (decompile-module submod orig-stack stx-ht 'module))
-          ,@(for/list ([b (in-list syntax-bodies)])
-              (let loop ([n (sub1 (car b))])
-                (if (zero? n)
-                    (cons 'begin
-                          (for/list ([form (in-list (cdr b))])
-                            (decompile-form form globs stack closed stx-ht)))
-                    (list 'begin-for-syntax (loop (sub1 n))))))
-          ,@(map (lambda (form)
-                   (decompile-form form globs stack closed stx-ht))
-                 body)
-          ,@(for/list ([submod (in-list post-submodules)])
-              (decompile-module submod orig-stack stx-ht 'module*))))]
-    [else (error 'decompile-module "huh?: ~e" mod-form)]))
-
-(define (decompile-form form globs stack closed stx-ht)
-  (match form
-    [(? mod?)
-     (decompile-module form stack stx-ht 'module)]
-    [(struct def-values (ids rhs))
-     `(define-values ,(map (lambda (tl)
-                             (match tl
-                               [(struct toplevel (depth pos const? set-const?))
-                                (list-ref/protect (glob-desc-vars globs) pos 'def-vals)]))
-                           ids)
-        ,(if (inline-variant? rhs)
-             `(begin
-                ,(list 'quote '%%inline-variant%%)
-                ,(decompile-expr (inline-variant-inline rhs) globs stack closed)
-                ,(decompile-expr (inline-variant-direct rhs) globs stack closed))
-             (decompile-expr rhs globs stack closed)))]
-    [(struct def-syntaxes (ids rhs prefix max-let-depth dummy))
-     `(define-syntaxes ,ids
-        ,(let-values ([(globs defns) (decompile-prefix prefix stx-ht)])
-           `(let ()
-              ,@defns
-              ,(decompile-form rhs globs '(#%globals) closed stx-ht))))]
-    [(struct seq-for-syntax (exprs prefix max-let-depth dummy))
-     `(begin-for-syntax
-       ,(let-values ([(globs defns) (decompile-prefix prefix stx-ht)])
-          `(let ()
-             ,@defns
-             ,@(for/list ([rhs (in-list exprs)])
-                 (decompile-form rhs globs '(#%globals) closed stx-ht)))))]
-    [(struct seq (forms))
-     `(begin ,@(map (lambda (form)
-                      (decompile-form form globs stack closed stx-ht))
-                    forms))]
-    [(struct splice (forms))
-     `(begin ,@(map (lambda (form)
-                      (decompile-form form globs stack closed stx-ht))
-                    forms))]
-    [(struct req (reqs dummy))
-     `(#%require . (#%decode-syntax ,reqs))]
-    [else
-     (decompile-expr form globs stack closed)]))
-
-(define (extract-name name)
-  (if (symbol? name)
-      (gensym name)
-      (if (vector? name)
-          (gensym (vector-ref name 0))
-          #f)))
-
-(define (extract-id expr)
-  (match expr
-    [(struct lam (name flags num-params arg-types rest? closure-map closure-types tl-map max-let-depth body))
-     (extract-name name)]
-    [(struct case-lam (name lams))
-     (extract-name name)]
-    [(struct closure (lam gen-id))
-     (extract-id lam)]
-    [else #f]))
-
-(define (extract-ids! body ids)
-  (match body
-    [(struct let-rec (procs body))
-     (for ([proc (in-list procs)]
-           [delta (in-naturals)])
-       (when (< -1 delta (vector-length ids))
-         (vector-set! ids delta (extract-id proc))))
-     (extract-ids! body ids)]
-    [(struct install-value (val-count pos boxes? rhs body))
-     (extract-ids! body ids)]
-    [(struct boxenv (pos body))
-     (extract-ids! body ids)]
-    [else #f]))
-
-(define (decompile-tl expr globs stack closed no-check?)
-  (match expr
-    [(struct toplevel (depth pos const? ready?))
-     (let ([id (list-ref/protect (glob-desc-vars globs) pos 'toplevel)])
-       (cond
-        [no-check? id]
-        [(and (not const?) (not ready?))
-         `(#%checked ,id)]
-        #;[(and const? ready?) `(#%const ,id)]
-        #;[const? `(#%iconst ,id)]
-        [else id]))]))
-
-(define (decompile-expr expr globs stack closed)
-  (match expr
-    [(struct toplevel (depth pos const? ready?))
-     (decompile-tl expr globs stack closed #f)]
-    [(struct varref (tl dummy))
-     `(#%variable-reference ,(if (eq? tl #t)
-                                 '<constant-local>
-                                 (decompile-tl tl globs stack closed #t)))]
-    [(struct topsyntax (depth pos midpt))
-     (list-ref/protect (glob-desc-vars globs) (+ midpt pos) 'topsyntax)]
-    [(struct primval (id))
-     (hash-ref primitive-table id (lambda () (error "unknown primitive")))]
-    [(struct assign (id rhs undef-ok?))
-     `(set! ,(decompile-expr id globs stack closed)
-            ,(decompile-expr rhs globs stack closed))]
-    [(struct localref (unbox? offset clear? other-clears? type))
-     (let ([id (list-ref/protect stack offset 'localref)])
-       (let ([e (if unbox?
-                    `(#%unbox ,id)
-                    id)])
-         (if clear?
-             `(#%sfs-clear ,e)
-             e)))]
-    [(? lam?)
-     `(lambda . ,(decompile-lam expr globs stack closed))]
-    [(struct case-lam (name lams))
-     `(case-lambda
-       ,@(map (lambda (lam)
-                (decompile-lam lam globs stack closed))
-              lams))]
-    [(struct let-one (rhs body type unused?))
-     (let ([id (or (extract-id rhs)
-                   (gensym (or type (if unused? 'unused 'local))))])
-       `(let ([,id ,(decompile-expr rhs globs (cons id stack) closed)])
-          ,(decompile-expr body globs (cons id stack) closed)))]
-    [(struct let-void (count boxes? body))
-     (let ([ids (make-vector count #f)])
-       (extract-ids! body ids)
-       (let ([vars (for/list ([i (in-range count)]
-                              [id (in-vector ids)])
-                     (or id (gensym (if boxes? 'localvb 'localv))))])
-         `(let ,(map (lambda (i) `[,i ,(if boxes? `(#%box ?) '?)])
-                     vars)
-            ,(decompile-expr body globs (append vars stack) closed))))]
-    [(struct let-rec (procs body))
-     `(begin
-        (#%set!-rec-values ,(for/list ([p (in-list procs)]
-                                       [i (in-naturals)])
-                              (list-ref/protect stack i 'let-rec))
-                           ,@(map (lambda (proc)
-                                    (decompile-expr proc globs stack closed))
-                                  procs))
-        ,(decompile-expr body globs stack closed))]
-    [(struct install-value (count pos boxes? rhs body))
-     `(begin
-        (,(if boxes? '#%set-boxes! 'set!-values)
-         ,(for/list ([i (in-range count)])
-            (list-ref/protect stack (+ i pos) 'install-value))
-         ,(decompile-expr rhs globs stack closed))
-        ,(decompile-expr body globs stack closed))]
-    [(struct boxenv (pos body))
-     (let ([id (list-ref/protect stack pos 'boxenv)])
-       `(begin
-          (set! ,id (#%box ,id))
-          ,(decompile-expr body globs stack closed)))]
-    [(struct branch (test then else))
-     `(if ,(decompile-expr test globs stack closed)
-          ,(decompile-expr then globs stack closed)
-          ,(decompile-expr else globs stack closed))]
-    [(struct application (rator rands))
-     (let ([stack (append (for/list ([i (in-list rands)]) (gensym 'rand))
-                          stack)])
-       (annotate-unboxed
-        rands
-        (annotate-inline
-         `(,(decompile-expr rator globs stack closed)
-           ,@(map (lambda (rand)
-                    (decompile-expr rand globs stack closed))
-                  rands)))))]
-    [(struct apply-values (proc args-expr))
-     `(#%apply-values ,(decompile-expr proc globs stack closed) 
-                      ,(decompile-expr args-expr globs stack closed))]
-    [(struct seq (exprs))
-     `(begin ,@(for/list ([expr (in-list exprs)])
-                 (decompile-expr expr globs stack closed)))]
-    [(struct beg0 (exprs))
-     `(begin0 ,@(for/list ([expr (in-list exprs)])
-                  (decompile-expr expr globs stack closed)))]
-    [(struct with-cont-mark (key val body))
-     `(with-continuation-mark
-          ,(decompile-expr key globs stack closed)
-          ,(decompile-expr val globs stack closed)
-          ,(decompile-expr body globs stack closed))]
-    [(struct closure (lam gen-id))
-     (if (hash-ref closed gen-id #f)
-         gen-id
-         (begin
-           (hash-set! closed gen-id #t)
-           `(#%closed ,gen-id ,(decompile-expr lam globs stack closed))))]
-    [else `(quote ,expr)]))
-
-(define (decompile-lam expr globs stack closed)
-  (match expr
-    [(struct closure (lam gen-id)) (decompile-lam lam globs stack closed)]
-    [(struct lam (name flags num-params arg-types rest? closure-map closure-types tl-map max-let-depth body))
-     (let ([vars (for/list ([i (in-range num-params)]
-                            [type (in-list arg-types)])
-                   (gensym (format "~a~a-" 
-                                   (case type 
-                                     [(ref) "argbox"] 
-                                     [(val) "arg"]
-                                     [else (format "arg~a" type)])
-                                   i)))]
-           [rest-vars (if rest? (list (gensym 'rest)) null)]
-           [captures (map (lambda (v)
-                            (list-ref/protect stack v 'lam))
-                          (vector->list closure-map))])
-       `((,@vars . ,(if rest?
-                        (car rest-vars)
-                        null))
-         ,@(if (and name (not (null? name)))
-               `(',name)
-               null)
-         ,@(if (null? flags) null `('(flags: ,@flags)))
-         ,@(if (null? captures)
-               null
-               `('(captures: ,@(map (lambda (c t)
-                                      (if t
-                                          `(,t ,c)
-                                          c))
-                                    captures
-                                    closure-types)
-                             ,@(if (not tl-map)
-                                   '()
-                                   (list
-                                    (for/list ([pos (in-set tl-map)])
-                                      (list-ref/protect (glob-desc-vars globs)
-                                                        (if (or (pos . < . (glob-desc-num-tls globs))
-                                                                (zero? (glob-desc-num-stxs globs)))
-                                                            pos
-                                                            (+ pos (glob-desc-num-stxs globs) 1))
-                                                        'lam)))))))
-         ,(decompile-expr body globs
-                          (append captures
-                                  (append vars rest-vars))
-                          closed)))]))
-
-(define (annotate-inline a)
-  a)
-
-(define (annotate-unboxed args a)
-  a)
-
-;; ----------------------------------------
-
-#;
-(begin
-  (require scheme/pretty)
-  (define (try e)
-    (pretty-print
-     (decompile
-      (zo-parse (let-values ([(in out) (make-pipe)])
-                  (write (parameterize ([current-namespace (make-base-namespace)])
-                           (compile e))
-                         out)
-                  (close-output-port out)
-                  in)))))
-  (pretty-print
-   (decompile
-    (zo-parse (open-input-file "/home/mflatt/proj/plt/collects/tests/mzscheme/benchmarks/common/sboyer_ss.zo"))))
-  #;
-  (try '(lambda (q . more)
-          (letrec ([f (lambda (x) f)])
-            (lambda (g) f)))))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/alpha.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/alpha.rkt
deleted file mode 100644
index 2f3c71398d..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/alpha.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-
-(require racket/match racket/contract compiler/zo-parse)
-
-(define (alpha-vary-ctop top)
-  (match top
-    [(struct compilation-top (max-let-depth prefix form))
-     (make-compilation-top max-let-depth (alpha-vary-prefix prefix) form)]))
-(define (alpha-vary-prefix p)
-  (struct-copy prefix p
-               [toplevels
-                (map (match-lambda
-                       [(and sym (? symbol?))
-                        (gensym sym)]
-                       [other
-                        other])
-                     (prefix-toplevels p))]))
-
-(provide/contract
- [alpha-vary-ctop (compilation-top? . -> . compilation-top?)])
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/batch.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/batch.rkt
deleted file mode 100644
index 456ded38e7..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/batch.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-
-#|
-Here's the idea:
-
-- Take a module's bytecode
-- Recursively get all the bytecode for modules that the target requires
-- After reading it, prune everything that isn't at phase 0 (the runtime phase)
-
-- Now that we have all the modules, the next step is to merge them into a single
-  module
--- Although actually we collapse them into the top-level, not a module
-- To do that, we iterate through all the modules doing two things as we go:
--- Incrementing all the global variable references by all the references in all
-   the modules
---- So if A has 5, then B's start at index 5 and so on
--- Replacing module variable references with the actual global variables
-   corresponding to those variables
---- So if A's variable 'x' is in global slot 4, then if B refers to it, it 
-    directly uses slot 4, rather than a module-variable slot
-
-- At that point we have all the module code in a single top-level, but many
-  toplevels won't be used because a library function isn't really used
-- So, we do a "garbage collection" on elements of the prefix
-- First, we create a dependency graph of all toplevels and the initial scope
-- Then, we do a DFS on the initial scope and keep all those toplevels, throwing
-  away the construction of everything else
-  [XXX: This may be broken because of side-effects.]
-
-- Now we have a small amount code, but because we want to go back to source,
-  we need to fix it up a bit; because different modules may've used the same
-  names
-- So, we do alpha-renaming, but it's easy because names are only used in the
-  compilation-top prefix structure
-
-[TODO]
-
-- Next, we decompile
-- Then, it will pay to do dead code elimination and inlining, etc.
-|#
-
-(require racket/cmdline
-         racket/set
-         raco/command-name
-         "main.rkt")
-
-
-(let ([output-file (make-parameter #f)])
-  (command-line #:program (short-program+command-name)
-                #:multi
-                [("-e" "--exclude-modules") path "Exclude <path> from flattening"
-                 (current-excluded-modules (set-add (current-excluded-modules) path))]
-                #:once-each
-                [("-o") dest-filename "Write output as <dest-filename>"
-                 (output-file (string->path dest-filename))]
-                [("-g" "--garbage-collect") "Garbage-collect final module (unsound)"
-                 (garbage-collect-toplevels-enabled #t)]                         
-                #:args (filename) 
-                (demodularize filename (output-file))))
-
-(module test racket/base)
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/gc-toplevels.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/gc-toplevels.rkt
deleted file mode 100644
index a32f3857f1..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/gc-toplevels.rkt
+++ /dev/null
@@ -1,284 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         racket/list
-         racket/dict
-         racket/contract
-         compiler/zo-parse
-         "util.rkt")
-
-; XXX Use efficient set structure
-(define (gc-toplevels top)
-  (match top
-    [(struct compilation-top (max-let-depth top-prefix form))
-     (define lift-start
-       (prefix-lift-start top-prefix))
-     (define max-depgraph-index 
-       (+ (prefix-num-lifts top-prefix)
-          lift-start))
-     (define top-node max-depgraph-index)
-     (define DEP-GRAPH (make-vector (add1 top-node) (make-refs empty empty)))
-     (define build-graph! (make-build-graph! DEP-GRAPH))
-     (define _void (build-graph! (list top-node) form))
-     (define-values (used-tls stxs) (graph-dfs DEP-GRAPH top-node))
-     (define ordered-used-tls (sort (rest used-tls) <=)) ; This rest drops off the top-node
-     (define ordered-stxs (sort stxs <=))
-     (define (lift? i) (lift-start . <= . i))
-     (define-values (lifts normal-tls) (partition lift? ordered-used-tls))
-     (define new-prefix
-       (make-prefix 
-        (length lifts)
-        (for/list ([i normal-tls])
-          (list-ref (prefix-toplevels top-prefix) i))
-        (for/list ([i ordered-stxs])
-          (list-ref (prefix-stxs top-prefix) i))))
-     (define new-lift-start
-       (prefix-lift-start new-prefix))
-     ; XXX This probably breaks max-let-depth
-     (define new-form
-       ((gc-toplevels-form 
-         (lambda (pos) (index<=? pos ordered-used-tls))
-         (lambda (pos)
-           (if (lift? pos)
-               (+ new-lift-start (index<=? pos lifts))
-               (index<=? pos normal-tls)))
-         (lambda (stx-pos)
-           (index<=? stx-pos ordered-stxs))
-         (prefix-syntax-start new-prefix))
-        form))
-     (log-debug (format "Total TLS: ~S" (length normal-tls)))
-     (log-debug (format "Used TLS: ~S" normal-tls))
-     (log-debug (format "Total lifts: ~S" (length lifts)))
-     (log-debug (format "Used lifts: ~S" lifts))
-     (log-debug (format "Total stxs: ~S" (length stxs)))
-     (log-debug (format "Used stxs: ~S" ordered-stxs))
-     (make-compilation-top
-      max-let-depth
-      new-prefix
-      new-form)]))
-
-(define-struct refs (tl stx) #:transparent)
-
-(define (make-build-graph! DEP-GRAPH)
-  (define (build-graph!* form lhs)
-    (match form
-      [(struct def-values (ids rhs))
-       (define new-lhs (map toplevel-pos ids))
-       ; If we require one, we should require all, so make them reference each other
-       (for-each (lambda (tl) (build-graph! new-lhs tl)) ids)
-       (build-graph! new-lhs rhs)]
-      [(? def-syntaxes?)
-       (error 'build-graph "Doesn't handle syntax")]
-      [(? seq-for-syntax?)
-       (error 'build-graph "Doesn't handle syntax")]
-      [(struct inline-variant (direct inline))
-       (build-graph! lhs direct)]
-      [(struct req (reqs dummy))
-       (build-graph! lhs dummy)]
-      [(? mod?)
-       (error 'build-graph "Doesn't handle modules")]
-      [(struct seq (forms))
-       (for-each (lambda (f) (build-graph! lhs f)) forms)]
-      [(struct splice (forms))
-       (for-each (lambda (f) (build-graph! lhs f)) forms)]
-      [(and l (struct lam (name flags num-params param-types rest? closure-map closure-types tl-map max-let-depth body)))
-       (build-graph! lhs body)]
-      [(and c (struct closure (code gen-id)))
-       (build-graph! lhs code)]
-      [(and cl (struct case-lam (name clauses)))
-       (for-each (lambda (l) (build-graph! lhs l))
-                 clauses)]
-      [(struct let-one (rhs body flonum? unused?))
-       (build-graph! lhs rhs)
-       (build-graph! lhs body)]
-      [(and f (struct let-void (count boxes? body)))
-       (build-graph! lhs body)]
-      [(and f (struct install-value (_ _ _ rhs body)))
-       (build-graph! lhs rhs)
-       (build-graph! lhs body)]
-      [(struct let-rec (procs body))
-       (for-each (lambda (l) (build-graph! lhs l)) procs)
-       (build-graph! lhs body)]
-      [(and f (struct boxenv (_ body)))
-       (build-graph! lhs body)]
-      [(and f (struct toplevel (_ pos _ _)))
-       (for-each (lambda (lhs)
-                   (dict-update! DEP-GRAPH lhs
-                                 (match-lambda 
-                                   [(struct refs (tls stxs))
-                                    (make-refs (list* pos tls) stxs)])))
-                 lhs)]
-      [(and f (struct topsyntax (_ pos _)))
-       (for-each (lambda (lhs)
-                   (dict-update! DEP-GRAPH lhs
-                                 (match-lambda 
-                                   [(struct refs (tls stxs))
-                                    (make-refs tls (list* pos stxs))])))
-                 lhs)]
-      [(struct application (rator rands))
-       (for-each (lambda (f) (build-graph! lhs f))
-                 (list* rator rands))]
-      [(struct branch (test then else))
-       (for-each (lambda (f) (build-graph! lhs f))
-                 (list test then else))]
-      [(struct with-cont-mark (key val body))
-       (for-each (lambda (f) (build-graph! lhs f))
-                 (list key val body))]
-      [(struct beg0 (seq))
-       (for-each (lambda (f) (build-graph! lhs f))
-                 seq)]
-      [(struct varref (tl dummy))
-       (build-graph! lhs tl)
-       (build-graph! lhs dummy)]
-      [(and f (struct assign (id rhs undef-ok?)))
-       (build-graph! lhs id)
-       (build-graph! lhs rhs)]
-      [(struct apply-values (proc args-expr))
-       (build-graph! lhs proc)
-       (build-graph! lhs args-expr)]
-      [(and f (struct primval (id)))
-       (void)]
-      [(and f (struct localref (unbox? pos clear? other-clears? type)))
-       (void)]
-      [(and v (not (? form?)))
-       (void)]))
-  (define-values (first-build-graph!** build-graph!**) 
-    (build-form-memo build-graph!* #:void? #t))
-  (define (build-graph! lhs form) (first-build-graph!** form lhs))
-  build-graph!)
-
-(define (graph-dfs g start-node)
-  (define visited? (make-hasheq))
-  (define (visit-tl n tls stxs)
-    (if (hash-has-key? visited? n)
-        (values tls stxs)
-        (match (dict-ref g n)
-          [(struct refs (n-tls n-stxs))
-           (hash-set! visited? n #t)
-           (define-values (new-tls1 new-stxs1)
-             (for/fold ([new-tls tls]
-                        [new-stxs stxs])
-                       ([tl (in-list n-tls)])
-               (visit-tl tl new-tls new-stxs)))
-           (define new-stxs2
-             (for/fold ([new-stxs new-stxs1])
-                       ([stx (in-list n-stxs)])
-               (define this-stx (visit-stx stx))
-               (if this-stx
-                   (list* this-stx new-stxs)
-                   new-stxs)))
-           (values (list* n new-tls1)
-                   new-stxs2)])))
-  (define stx-visited? (make-hasheq))
-  (define (visit-stx n)
-    (if (hash-has-key? stx-visited? n)
-        #f
-        (begin (hash-set! stx-visited? n #t)
-               n)))
-  (visit-tl start-node empty empty))
-
-; index<=? : number? (listof number?) -> (or/c number? false/c)
-; returns the index of n in l and assumes that l is sorted by <=
-(define (index<=? n l)
-  (match l
-    [(list) #f]
-    [(list-rest f l)
-     (cond
-       [(= n f)
-        0]
-       [(< n f)
-        #f]
-       [else
-        (let ([rec (index<=? n l)])
-          (if rec (add1 rec) rec))])]))
-
-(define (identity x) x)
-(define (gc-toplevels-form keep? update-tl update-ts new-ts-midpt)
-  (define (inner-update form)
-    (match form
-      [(struct def-values (ids rhs))
-       (if (ormap (compose keep? toplevel-pos) ids)
-           (make-def-values (map update ids)
-                            (update rhs))
-           #f)]
-      [(? def-syntaxes?)
-       (error 'gc-tls "Doesn't handle syntax")]
-      [(? seq-for-syntax?)
-       (error 'gc-tls "Doesn't handle syntax")]
-      [(struct req (reqs dummy))
-       (make-req reqs (update dummy))]
-      [(? mod?)
-       (error 'gc-tls "Doesn't handle modules")]
-      [(struct seq (forms))
-       (make-seq (filter identity (map update forms)))]
-      [(struct splice (forms))
-       (make-splice (filter identity (map update forms)))]
-      [(and l (struct lam (name flags num-params param-types rest? closure-map closure-types tl-map max-let-depth body)))
-       (struct-copy lam l
-                    [toplevel-map #f] ; consevrative
-                    [body (update body)])]
-      [(and c (struct closure (code gen-id)))
-       (struct-copy closure c
-                    [code (update code)])]
-      [(and cl (struct case-lam (name clauses)))
-       (struct-copy case-lam cl
-                    [clauses (map update clauses)])]
-      [(struct let-one (rhs body type unused?))
-       (make-let-one (update rhs) (update body) type unused?)]
-      [(and f (struct let-void (count boxes? body)))
-       (struct-copy let-void f
-                    [body (update body)])]
-      [(and f (struct install-value (_ _ _ rhs body)))
-       (struct-copy install-value f
-                    [rhs (update rhs)]
-                    [body (update body)])]
-      [(struct let-rec (procs body))
-       (make-let-rec (map update procs) (update body))]
-      [(and f (struct boxenv (_ body)))
-       (struct-copy boxenv f [body (update body)])]
-      [(and f (struct toplevel (_ pos _ _)))
-       (struct-copy toplevel f
-                    [pos (update-tl pos)])]
-      [(and f (struct topsyntax (_ pos _)))
-       (struct-copy topsyntax f
-                    [pos (update-ts pos)]
-                    [midpt new-ts-midpt])]
-      [(struct application (rator rands))
-       (make-application 
-        (update rator)
-        (map update rands))]
-      [(struct branch (test then else))
-       (make-branch 
-        (update test)
-        (update then)
-        (update else))]
-      [(struct with-cont-mark (key val body))
-       (make-with-cont-mark 
-        (update key)
-        (update val)
-        (update body))]
-      [(struct beg0 (seq))
-       (make-beg0 (map update seq))]
-      [(struct varref (tl dummy))
-       (make-varref (update tl) (update dummy))]
-      [(and f (struct assign (id rhs undef-ok?)))
-       (struct-copy assign f
-                    [id (update id)]
-                    [rhs (update rhs)])]
-      [(struct apply-values (proc args-expr))
-       (make-apply-values
-        (update proc)
-        (update args-expr))]
-      [(and f (struct primval (id)))
-       f]
-      [(and f (struct localref (unbox? pos clear? other-clears? type)))
-       f]
-      [(and v (not (? form?)))
-       v]
-      ))
-  (define-values (first-update update)
-    (build-form-memo inner-update))
-  first-update)
-
-(provide/contract
- [gc-toplevels (compilation-top? . -> . compilation-top?)])
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/info.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/info.rkt
deleted file mode 100644
index 84ad0ac2d5..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/main.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/main.rkt
deleted file mode 100644
index b6fc0989a9..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/main.rkt
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang racket/base
-(require compiler/cm
-         compiler/zo-marshal
-         "alpha.rkt"
-         "gc-toplevels.rkt"
-         "merge.rkt"
-         "module.rkt"
-         "mpi.rkt"
-         "nodep.rkt"
-         "replace-modidx.rkt")
-
-(provide current-excluded-modules
-         garbage-collect-toplevels-enabled
-         demodularize)
-
-(define garbage-collect-toplevels-enabled (make-parameter #f))
-
-(define logger (make-logger 'demodularizer (current-logger)))
-
-(define (demodularize file-to-batch [output-file #f])
-  (parameterize ([current-logger logger])
-    (define-values (base name must-be-dir?) (split-path file-to-batch))
-    (when must-be-dir?
-      (error 'demodularize "Cannot run on directory: ~a" file-to-batch))
-    (unless (file-exists? file-to-batch)
-      (error 'demodularize "File does not exist: ~a" file-to-batch))
-    
-    ;; Compile
-    (log-info "Compiling module")
-    (parameterize ([current-namespace (make-base-empty-namespace)])
-      (managed-compile-zo file-to-batch))
-    
-    (define merged-zo-path 
-      (or output-file
-          (path-add-suffix file-to-batch #"_merged.zo")))
-    
-    ;; Transformations
-    (define path-cache (make-hasheq))
-    
-    (log-info "Removing dependencies")
-    (define-values (batch-nodep top-lang-info top-self-modidx get-modvar-rewrite)
-      (parameterize ([MODULE-PATHS path-cache])
-        (nodep-file file-to-batch)))
-    
-    (log-info "Merging modules")
-    (define batch-merge
-      (parameterize ([MODULE-PATHS path-cache])
-        (merge-compilation-top get-modvar-rewrite batch-nodep)))
-    
-    (define batch-gcd
-      (if (garbage-collect-toplevels-enabled)
-          (begin
-            (log-info "GC-ing top-levels")
-            (gc-toplevels batch-merge))
-          batch-merge))
-    
-    (log-info "Alpha-varying top-levels")
-    (define batch-alpha
-      (alpha-vary-ctop batch-gcd))
-    
-    (log-info "Replacing self-modidx")
-    (define batch-replace-modidx
-      (replace-modidx batch-alpha top-self-modidx))
-    
-    (define batch-modname
-      (string->symbol (regexp-replace #rx"\\.zo$" (path->string merged-zo-path) "")))
-    (log-info (format "Modularizing into ~a" batch-modname))
-    (define batch-mod
-      (wrap-in-kernel-module batch-modname batch-modname top-lang-info top-self-modidx batch-replace-modidx))
-    
-    (log-info "Writing merged zo")
-    (void
-     (with-output-to-file 
-         merged-zo-path
-       (lambda ()
-         (zo-marshal-to batch-mod (current-output-port)))
-       #:exists 'replace))))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/merge.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/merge.rkt
deleted file mode 100644
index 04de2e30a9..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/merge.rkt
+++ /dev/null
@@ -1,196 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         racket/match
-         racket/contract
-         compiler/zo-parse
-         "util.rkt"
-         "mpi.rkt"
-         "nodep.rkt"
-         "update-toplevels.rkt")
-
-(define MODULE-TOPLEVEL-OFFSETS (make-hasheq))
-
-(define current-get-modvar-rewrite (make-parameter #f))
-(define (merge-compilation-top get-modvar-rewrite top)
-  (parameterize ([current-get-modvar-rewrite get-modvar-rewrite])
-    (match top
-      [(struct compilation-top (max-let-depth prefix form))
-       (define-values (new-max-let-depth new-prefix gen-new-forms)
-         (merge-form max-let-depth prefix form))
-       (define total-tls (length (prefix-toplevels new-prefix)))
-       (define total-stxs (length (prefix-stxs new-prefix)))
-       (define total-lifts (prefix-num-lifts new-prefix))
-       (log-debug (format "max-let-depth ~S to ~S" max-let-depth new-max-let-depth))
-       (log-debug (format "total toplevels ~S" total-tls))
-       (log-debug (format "total stxs ~S" total-stxs))
-       (log-debug (format "num-lifts ~S" total-lifts))
-       (make-compilation-top
-        new-max-let-depth new-prefix
-        (make-splice (gen-new-forms new-prefix)))]
-      [else (error 'merge "unrecognized: ~e" top)])))
-
-(define (merge-forms max-let-depth prefix forms)
-  (if (empty? forms)
-    (values max-let-depth prefix (lambda _ empty))
-    (let*-values ([(fmax-let-depth fprefix gen-fform) (merge-form max-let-depth prefix (first forms))]
-                  [(rmax-let-depth rprefix gen-rforms) (merge-forms fmax-let-depth fprefix (rest forms))])
-      (values rmax-let-depth
-              rprefix
-              (lambda args
-                (append (apply gen-fform args)
-                        (apply gen-rforms args)))))))
-
-(define (merge-form max-let-depth prefix form)
-  (match form
-    [(? mod?)
-     (merge-module max-let-depth prefix form)]
-    [(struct seq (forms))
-     (merge-forms max-let-depth prefix forms)]
-    [(struct splice (forms))
-     (merge-forms max-let-depth prefix forms)]
-    [else
-     (values max-let-depth prefix (lambda _ (list form)))]))
-
-(define (merge-prefix root-prefix mod-prefix)
-  (match root-prefix
-    [(struct prefix (root-num-lifts root-toplevels root-stxs))
-     (match mod-prefix
-       [(struct prefix (mod-num-lifts mod-toplevels mod-stxs))
-        (make-prefix (+ root-num-lifts mod-num-lifts)
-                     (append root-toplevels mod-toplevels)
-                     (append root-stxs mod-stxs))])]))
-
-(struct toplevel-offset-rewriter (rewrite-fun meta) #:transparent)
-
-(define (compute-new-modvar mv rw)
-  (match mv
-    [(struct module-variable (modidx sym pos phase constantness))
-     (match rw
-       [(struct modvar-rewrite (self-modidx provide->toplevel))
-        (log-debug (format "Rewriting ~a@~a of ~S" sym pos (mpi->path* modidx)))
-        (define tl (provide->toplevel sym pos))
-        (log-debug (format "Rewriting ~a@~a of ~S to ~S" sym pos (mpi->path* modidx) tl))
-        (match-define (toplevel-offset-rewriter rewrite-fun meta)
-                      (hash-ref MODULE-TOPLEVEL-OFFSETS self-modidx
-                                (lambda ()
-                                  (error 'compute-new-modvar "toplevel offset not yet computed: ~S" self-modidx))))
-        (log-debug (format "Rewriting ~a@~a of ~S (which is ~a) with ~S" sym pos (mpi->path* modidx) tl meta))
-        (define res (rewrite-fun tl))
-        (log-debug (format "Rewriting ~a@~a of ~S (which is ~a) with ~S and got ~S"
-                           sym pos (mpi->path* modidx) tl meta res))
-        res])]))
-
-(define (filter-rewritable-module-variable? toplevel-offset mod-toplevels)
-  (define-values
-    (i new-toplevels remap)
-    (for/fold ([i 0]
-               [new-toplevels empty]
-               [remap empty])
-        ([tl (in-list mod-toplevels)])
-      (match tl
-        [(and mv (struct module-variable (modidx sym pos phase constantness)))
-         (define rw ((current-get-modvar-rewrite) modidx))
-         ;; XXX We probably don't need to deal with #f phase
-         (unless (or (not phase) (zero? phase))
-           (error 'eliminate-module-variables "Non-zero phases not supported: ~S" mv))
-         (cond
-                                        ; Primitive module like #%paramz
-           [(symbol? rw)
-            (log-debug (format "~S from ~S" sym rw))
-            (values (add1 i)
-                    (list* tl new-toplevels)
-                    (list* (+ i toplevel-offset) remap))]
-           [(module-path-index? rw)
-            (values (add1 i)
-                    (list* tl new-toplevels)
-                    (list* (+ i toplevel-offset) remap))]
-           [(modvar-rewrite? rw)
-            (values i
-                    new-toplevels
-                    (list* (compute-new-modvar mv rw) remap))]
-           [else
-            (error 'filter-rewritable-module-variable? "Unsupported module-rewrite: ~S" rw)])]
-        [tl
-         (values (add1 i)
-                 (list* tl new-toplevels)
-                 (list* (+ i toplevel-offset) remap))])))
-                                        ; XXX This would be more efficient as a vector
-  (values (reverse new-toplevels)
-          (reverse remap)))
-
-(define (merge-module max-let-depth top-prefix mod-form)
-  (match mod-form
-    [(struct mod (name srcname self-modidx mod-prefix provides requires body syntax-bodies
-                       unexported mod-max-let-depth dummy lang-info internal-context
-                       flags pre-submodules post-submodules))
-     (define toplevel-offset (length (prefix-toplevels top-prefix)))
-     (define topsyntax-offset (length (prefix-stxs top-prefix)))
-     (define lift-offset (prefix-num-lifts top-prefix))
-     (define mod-toplevels (prefix-toplevels mod-prefix))
-     (define-values (new-mod-toplevels toplevel-remap)
-       (filter-rewritable-module-variable? toplevel-offset mod-toplevels))
-     (define num-mod-toplevels
-       (length toplevel-remap))
-     (define mod-stxs
-       (length (prefix-stxs mod-prefix)))
-     (define mod-num-lifts
-       (prefix-num-lifts mod-prefix))
-     (define new-mod-prefix
-       (struct-copy prefix mod-prefix
-                    [toplevels new-mod-toplevels]))
-     (define offset-meta (vector name srcname self-modidx))
-     (log-debug "Setting toplevel offsets rewriter for ~S and it is currently ~S"
-                offset-meta
-                (hash-ref MODULE-TOPLEVEL-OFFSETS self-modidx #f))
-     (hash-set! MODULE-TOPLEVEL-OFFSETS self-modidx
-                (toplevel-offset-rewriter
-                 (lambda (n)
-                   (log-debug "Finding offset ~a in ~S of ~S" n toplevel-remap offset-meta)
-                   (list-ref toplevel-remap n))
-                 offset-meta))
-     (unless (= (length toplevel-remap)
-                (length mod-toplevels))
-       (error 'merge-module "Not remapping everything: ~S ~S"
-              mod-toplevels toplevel-remap))
-     (log-debug (format "[~S] Incrementing toplevels by ~a"
-                        name
-                        toplevel-offset))
-     (log-debug (format "[~S] Incrementing lifts by ~a"
-                        name
-                        lift-offset))
-     (log-debug (format "[~S] Filtered mod-vars from ~a to ~a"
-                        name
-                        (length mod-toplevels)
-                        (length new-mod-toplevels)))
-     (values (max max-let-depth mod-max-let-depth)
-             (merge-prefix top-prefix new-mod-prefix)
-             (lambda (top-prefix)
-               (log-debug (format "[~S] Updating top-levels" name))
-               (define top-lift-start (prefix-lift-start top-prefix))
-               (define mod-lift-start (prefix-lift-start mod-prefix))
-               (define total-lifts (prefix-num-lifts top-prefix))
-               (define max-toplevel (+ top-lift-start total-lifts))
-               (define update
-                 (update-toplevels
-                  (lambda (n)
-                    (cond
-                      [(mod-lift-start . <= . n)
-                                        ; This is a lift
-                       (define which-lift (- n mod-lift-start))
-                       (define lift-tl (+ top-lift-start lift-offset which-lift))
-                       (when (lift-tl . >= . max-toplevel)
-                         (error 'merge-module "[~S] lift error: orig(~a) which(~a) max(~a) lifts(~a) now(~a)"
-                                name n which-lift num-mod-toplevels mod-num-lifts lift-tl))
-                       lift-tl]
-                      [else
-                       (list-ref toplevel-remap n)]))
-                  (lambda (n)
-                    (+ n topsyntax-offset))
-                  (prefix-syntax-start top-prefix)))
-               (map update body)))]))
-
-(provide/contract
- [merge-compilation-top (-> get-modvar-rewrite/c
-                            compilation-top?
-                            compilation-top?)])
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/module.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/module.rkt
deleted file mode 100644
index 1be8d31309..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/module.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         racket/match
-         racket/contract
-         compiler/zo-parse
-         "util.rkt")
-
-(define (->module-path-index s)
-  (if (module-path-index? s)
-      s
-      (module-path-index-join `(quote ,s) #f)))
-
-(define (wrap-in-kernel-module name srcname lang-info self-modidx top)
-  (match top
-    [(struct compilation-top (max-let-depth prefix form))
-     (define-values (reqs new-forms)
-       (partition req? (splice-forms form)))
-     (define requires
-       (map (compose ->module-path-index wrapped-datum stx-encoded req-reqs) reqs))
-     (make-compilation-top 
-      0
-      (make-prefix 0 (list #f) empty)
-      (make-mod name srcname
-                self-modidx
-                prefix
-                empty ; provides
-                (list (cons 0 requires))
-                new-forms
-                empty ; syntax-body
-                (list) ; unexported
-                max-let-depth
-                (make-toplevel 0 0 #f #f) ; dummy
-                lang-info
-                #t
-                empty
-                empty
-                empty))]))
-
-(provide/contract
- [wrap-in-kernel-module (symbol? symbol? lang-info/c module-path-index? compilation-top? . -> . compilation-top?)])
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/mpi.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/mpi.rkt
deleted file mode 100644
index 65c0b76ad7..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/mpi.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         syntax/modresolve)
-
-(define current-module-path (make-parameter #f))
-
-(define (mpi->string modidx)
-  (cond
-    [(symbol? modidx) modidx]
-    [else 
-     (mpi->path! modidx)]))
-
-(define MODULE-PATHS (make-parameter #f))
-(define (mpi->path! mpi)
-  (hash-ref! 
-   (MODULE-PATHS) mpi 
-   (lambda ()
-     (define _pth
-       (resolve-module-path-index mpi (current-module-path)))
-     (cond
-      [(path? _pth) (simplify-path _pth #t)]
-      [(and (pair? _pth)
-            (path? (cadr _pth)))
-       (list* 'submod (simplify-path (cadr _pth) #t) (cddr _pth))]
-      [else _pth]))))
-(define (mpi->path* mpi)
-  (hash-ref (MODULE-PATHS) mpi 
-            (lambda ()
-              (error 'mpi->path* "Cannot locate cache of path for ~S" mpi))))
-
-(define submod-path/c
-  (cons/c 'submod
-          (cons/c (or/c symbol? path?)
-                  (listof symbol?))))
-
-(provide/contract
- [MODULE-PATHS (parameter/c (or/c false/c hash?))]
- [current-module-path (parameter/c (or/c path-string? submod-path/c))]
- [mpi->path! (module-path-index? . -> . (or/c symbol? path? submod-path/c))]
- [mpi->path* (module-path-index? . -> . (or/c symbol? path? pair? submod-path/c))])
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/nodep.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/nodep.rkt
deleted file mode 100644
index 019584d076..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/nodep.rkt
+++ /dev/null
@@ -1,220 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         racket/match
-         racket/contract
-         compiler/zo-parse
-         "util.rkt"
-         "mpi.rkt"
-         racket/set)
-
-(define current-excluded-modules (make-parameter (set)))
-
-(define ZOS (make-parameter #f))
-(define MODULE-IDX-MAP (make-parameter #f))
-(define PHASE*MODULE-CACHE (make-parameter #f))
-
-(define (nodep-file file-to-batch)
-  (define idx-map (make-hash))
-  (parameterize ([ZOS (make-hash)]
-                 [MODULE-IDX-MAP idx-map]
-                 [PHASE*MODULE-CACHE (make-hash)])
-    (define (get-modvar-rewrite modidx)
-      (define pth (mpi->path* modidx))
-      (hash-ref idx-map pth
-                (lambda ()
-                  (error 'get-modvar-rewrite "Cannot locate modvar rewrite for ~S" pth))))
-    (match (get-nodep-module-code/path file-to-batch 0)
-      [(struct @phase (_ (struct module-code (modvar-rewrite lang-info ctop))))
-       (values ctop lang-info (modvar-rewrite-modidx modvar-rewrite) get-modvar-rewrite)])))
-
-(define (path->comp-top pth submod)
-  (hash-ref! (ZOS) (cons pth submod)
-             (λ ()
-                (define zo (call-with-input-file pth zo-parse))
-                (if submod
-                    (extract-submod zo submod)
-                    zo))))
-
-(define (extract-submod zo submod)
-  (define m (compilation-top-code zo))
-  (struct-copy compilation-top
-               zo
-               [code (let loop ([m m])
-                       (if (and (pair? (mod-name m))
-                                (equal? submod (cdr (mod-name m))))
-                           m
-                           (or (ormap loop (mod-pre-submodules m))
-                               (ormap loop (mod-post-submodules m)))))]))
-
-(define (excluded? pth)
-  (and (path? pth)
-       (set-member? (current-excluded-modules) (path->string pth))))
-
-(define (get-nodep-module-code/index mpi phase)
-  (define pth (mpi->path! mpi))
-  (cond
-    [(symbol? pth)
-     (hash-set! (MODULE-IDX-MAP) pth pth)
-     pth]
-    [(excluded? pth)
-     (hash-set! (MODULE-IDX-MAP) pth mpi)
-     mpi]
-    [else
-     (get-nodep-module-code/path pth phase)]))
-
-(define-struct @phase (phase code))
-(define-struct modvar-rewrite (modidx provide->toplevel))
-(define-struct module-code (modvar-rewrite lang-info ctop))
-(define @phase-ctop (compose module-code-ctop @phase-code))
-
-(define (get-nodep-module-code/path pth phase)
-  (define MODULE-CACHE
-    (hash-ref! (PHASE*MODULE-CACHE) phase make-hash))
-  (if (hash-ref MODULE-CACHE pth #f)
-      #f
-      (hash-ref! 
-       MODULE-CACHE pth 
-       (lambda ()
-         (define-values (base file dir?) (split-path (if (path-string? pth)
-                                                         pth
-                                                         (cadr pth))))
-         (define base-directory
-           (if (path? base) 
-               (path->complete-path base (current-directory))
-               (current-directory)))
-         (define-values (modvar-rewrite lang-info ctop)
-           (begin
-             (log-debug (format "Load ~S @ ~S" pth phase))
-             (nodep/dir
-              (parameterize ([current-load-relative-directory base-directory])
-                (path->comp-top
-                 (build-compiled-path 
-                  base 
-                  (path-add-suffix file #".zo"))
-                 (and (pair? pth) (cddr pth))))
-              pth
-              phase)))
-         (when (and phase (zero? phase))
-           (hash-set! (MODULE-IDX-MAP) pth modvar-rewrite))
-         (make-@phase 
-          phase
-          (make-module-code modvar-rewrite lang-info ctop))))))
-
-(define (nodep/dir top pth phase)
-  (parameterize ([current-module-path pth])
-    (nodep top phase)))
-
-(define (nodep top phase)
-  (match top
-    [(struct compilation-top (max-let-depth prefix form))
-     (define-values (modvar-rewrite lang-info new-form) (nodep-form form phase))
-     (values modvar-rewrite lang-info (make-compilation-top max-let-depth prefix new-form))]
-    [else (error 'nodep "unrecognized: ~e" top)]))
-
-(define (nodep-form form phase)
-  (if (mod? form)
-      (let-values ([(modvar-rewrite lang-info mods)
-                    (nodep-module form phase)])
-        (values modvar-rewrite lang-info (make-splice mods)))
-      (error 'nodep-form "Doesn't support non mod forms")))
-
-; XXX interning is hack to fix test/add04.ss and provide/contract renaming
-(define (intern s) (string->symbol (symbol->string s)))
-(define (construct-provide->toplevel prefix provides)
-  (define provide-ht (make-hasheq))
-  (for ([tl (prefix-toplevels prefix)]
-        [i (in-naturals)])
-      (when (symbol? tl)
-        (hash-set! provide-ht (intern tl) i)))  
-  (lambda (sym pos)
-    (define isym (intern sym))
-    (log-debug (format "Looking up ~S@~a [~S] in ~S" sym pos isym prefix))
-    (define res
-      (hash-ref provide-ht isym
-              (lambda ()
-                (error 'provide->toplevel "Cannot find ~S in ~S" sym prefix))))
-    (log-debug (format "Looked up ~S@~a and got ~v" sym pos res))
-    res))
-
-(define (nodep-module mod-form phase)
-  (match mod-form
-    [(struct mod (name srcname self-modidx prefix provides requires body syntax-bodies
-                       unexported max-let-depth dummy lang-info internal-context
-                       flags pre-submodules post-submodules))
-     (define new-prefix prefix)
-     ;; Cache all the mpi paths
-     (for-each (match-lambda
-                 [(and mv (struct module-variable (modidx sym pos phase constantness)))
-                  (mpi->path! modidx)]
-                 [tl
-                  (void)])
-               (prefix-toplevels new-prefix))
-     (define mvs (filter module-variable? (prefix-toplevels new-prefix)))
-     (log-debug (format "[~S] module-variables: ~S - ~S" name (length mvs) mvs))
-     (values (make-modvar-rewrite self-modidx (construct-provide->toplevel new-prefix provides))
-             lang-info
-             (append (requires->modlist requires phase)
-                     (if (and phase (zero? phase))
-                         (begin (log-debug (format "[~S] lang-info : ~S" name lang-info)) ; XXX Seems to always be #f now
-                                (list (make-mod name srcname self-modidx new-prefix provides requires body empty
-                                                unexported max-let-depth dummy lang-info internal-context
-                                                empty empty empty)))
-                         (begin (log-debug (format "[~S] Dropping module @ ~S" name phase))
-                                empty))))]              
-    [else (error 'nodep-module "huh?: ~e" mod-form)]))
-
-(define (+* l r)
-  (if (and l r) (+ l r) #f))
-
-(define (requires->modlist requires current-phase)
-  (apply append
-         (map
-          (match-lambda
-            [(list-rest req-phase mpis)
-             (define phase (+* current-phase req-phase))
-             (apply append
-                    (map (compose extract-modules (lambda (mpi) (get-nodep-module-code/index mpi phase))) mpis))])
-          requires)))
-
-(define (all-but-last l)
-  (reverse (rest (reverse l))))
-
-(define REQUIRED (make-hasheq))
-(define (extract-modules ct)
-  (cond
-    [(compilation-top? ct)
-     (match (compilation-top-code ct)
-       [(and m (? mod?))
-        (list m)]
-       [(struct splice (mods))
-        mods])]
-    [(symbol? ct)
-     (if (hash-has-key? REQUIRED ct)
-         empty
-         (begin
-           (hash-set! REQUIRED ct #t)
-           (list (make-req (make-stx (make-wrapped ct empty 'clean)) (make-toplevel 0 0 #f #f)))))]
-    [(module-path-index? ct)
-     (if (hash-has-key? REQUIRED ct)
-         empty
-         (begin
-           (hash-set! REQUIRED ct #t)
-           (list (make-req (make-stx (make-wrapped ct empty 'clean)) (make-toplevel 0 0 #f #f)))))]
-    [(not ct)
-     empty]
-    [(@phase? ct)
-     (extract-modules (@phase-ctop ct))]
-    [else
-     (error 'extract-modules "Unknown extraction: ~S" ct)]))
-
-(define get-modvar-rewrite/c 
-  (module-path-index? . -> . (or/c symbol? modvar-rewrite? module-path-index?)))
-(provide/contract
- [struct modvar-rewrite 
-         ([modidx module-path-index?]
-          [provide->toplevel (symbol? exact-nonnegative-integer? . -> . exact-nonnegative-integer?)])]
- [get-modvar-rewrite/c contract?]
- [current-excluded-modules (parameter/c generic-set?)]
- [nodep-file (-> path-string?
-                 (values compilation-top? lang-info/c module-path-index? get-modvar-rewrite/c))])
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/replace-modidx.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/replace-modidx.rkt
deleted file mode 100644
index f470e2b8f1..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/replace-modidx.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         racket/vector
-         unstable/struct
-         "util.rkt")
-
-(provide replace-modidx)
-
-(define (replace-modidx expr self-modidx)
-  (define (inner-update e)
-      (match e
-        [(app prefab-struct-key (and key (not #f))) 
-         (apply make-prefab-struct key 
-                (map update
-                     (struct->list e)))]
-        [(? module-path-index?) 
-         (define-values (path mpi) (module-path-index-split e))
-         (if (not path)
-             self-modidx
-             (module-path-index-join path (update mpi)))]
-        [(cons a b)
-         (cons (update a) (update b))]
-        [(? vector?)
-         (vector-map update e)]
-        [else e]))
-  (define-values (first-update update)
-    (build-form-memo inner-update))
-  (first-update expr))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/update-toplevels.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/update-toplevels.rkt
deleted file mode 100644
index c1701d5412..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/update-toplevels.rkt
+++ /dev/null
@@ -1,103 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         racket/contract
-         compiler/zo-structs
-         "util.rkt")
-
-(define (update-toplevels toplevel-updater topsyntax-updater topsyntax-new-midpt)
-  (define (inner-update form)
-    (match form
-      [(struct def-values (ids rhs))
-       (make-def-values (map update ids)
-                        (update rhs))]
-      [(? def-syntaxes?)
-       (error 'increment "Doesn't handle syntax")]
-      [(? seq-for-syntax?)
-       (error 'increment "Doesn't handle syntax")]
-      [(struct inline-variant (direct inline))
-       (update direct)]
-      [(struct req (reqs dummy))
-       (make-req reqs (update dummy))]
-      [(? mod?)
-       (error 'increment "Doesn't handle modules")]
-      [(struct seq (forms))
-       (make-seq (map update forms))]
-      [(struct splice (forms))
-       (make-splice (map update forms))]
-      [(and l (struct lam (name flags num-params param-types rest? closure-map closure-types tl-map max-let-depth body)))
-       (struct-copy lam l
-                    [toplevel-map #f] ; conservative
-                    [body (update body)])]
-      [(and c (struct closure (code gen-id)))
-       (struct-copy closure c
-                    [code (update code)])]
-      [(and cl (struct case-lam (name clauses)))
-       (define new-clauses
-         (map update clauses))
-       (struct-copy case-lam cl
-                    [clauses new-clauses])]
-      [(struct let-one (rhs body type unused?))
-       (make-let-one (update rhs) (update body) type unused?)]
-      [(and f (struct let-void (count boxes? body)))
-       (struct-copy let-void f
-                    [body (update body)])]
-      [(and f (struct install-value (_ _ _ rhs body)))
-       (struct-copy install-value f
-                    [rhs (update rhs)]
-                    [body (update body)])]
-      [(struct let-rec (procs body))
-       (make-let-rec (map update procs) (update body))]
-      [(and f (struct boxenv (_ body)))
-       (struct-copy boxenv f [body (update body)])]
-      [(and f (struct toplevel (_ pos _ _)))
-       (struct-copy toplevel f
-                    [pos (toplevel-updater pos)])]
-      [(and f (struct topsyntax (_ pos _)))
-       (struct-copy topsyntax f
-                    [pos (topsyntax-updater pos)]
-                    [midpt topsyntax-new-midpt])]
-      [(struct application (rator rands))
-       (make-application 
-        (update rator)
-        (map update rands))]
-      [(struct branch (test then else))
-       (make-branch 
-        (update test)
-        (update then)
-        (update else))]
-      [(struct with-cont-mark (key val body))
-       (make-with-cont-mark 
-        (update key)
-        (update val)
-        (update body))]
-      [(struct beg0 (seq))
-       (make-beg0 (map update seq))]
-      [(struct varref (tl dummy))
-       (make-varref (update tl) (update dummy))]
-      [(and f (struct assign (id rhs undef-ok?)))
-       (struct-copy assign f
-                    [id (update id)]
-                    [rhs (update rhs)])]
-      [(struct apply-values (proc args-expr))
-       (make-apply-values
-        (update proc)
-        (update args-expr))]
-      [(and f (struct primval (id)))
-       f]
-      [(and f (struct localref (unbox? pos clear? other-clears? type)))
-       f]
-      [(and f (not (? form?)))
-       f]
-      ))
-  (define-values (first-update update)
-    (build-form-memo inner-update))
-  first-update)
-
-(provide/contract
- [update-toplevels 
-  ((exact-nonnegative-integer? . -> . exact-nonnegative-integer?)
-   (exact-nonnegative-integer? . -> . exact-nonnegative-integer?)
-   exact-nonnegative-integer?
-   . -> .
-   (form? . -> . form?))])
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/util.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/util.rkt
deleted file mode 100644
index e18966798e..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/util.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         compiler/zo-parse)
-
-(define (prefix-syntax-start pre)
-  (length (prefix-toplevels pre)))
-
-(define (prefix-lift-start pre)
-  (define syntax-start (prefix-syntax-start pre))
-  (define total-stxs (length (prefix-stxs pre)))
-  (+ syntax-start total-stxs (if (zero? total-stxs) 0 1)))
-
-(struct nothing ())
-
-(define-syntax-rule (eprintf* . args) (void))
-
-(define (build-form-memo inner-update #:void? [void? #f])
-  (define memo (make-hasheq))
-  (define (update form . args)
-    (eprintf* "Updating on ~a\n" form)
-    (define fin
-      (cond
-        [(hash-ref memo form #f) 
-         => (λ (x)
-              (eprintf* "Found in memo table\n")
-              x)]
-        [else
-         (eprintf* "Not in memo table\n")
-         (let ()
-           (define ph (make-placeholder (nothing)))
-           (hash-set! memo form ph)
-           (define nv (nothing))
-           (dynamic-wind void
-                         (λ ()
-                           (set! nv (apply inner-update form args)))
-                         (λ ()
-                           (if (nothing? nv)
-                               (eprintf* "inner-update returned nothing (or there was an escape) on ~a\n" form)
-                               (begin
-                                 (placeholder-set! ph nv)
-                                 (hash-set! memo form nv)))))
-           nv)]))
-    (eprintf* "Updating on ~a ---->\n ~a\n" form fin)
-    fin)
-  (define (first-update form . args)
-    (eprintf* "Top level update on ~a\n" form)
-    (define final (apply update form args))
-    (eprintf* "Top level update on ~a ---->\n ~a\n" form final)
-    (define fin (make-reader-graph final))
-    (eprintf* "Top level update on ~a ---->\n ~a [after reader-graph]\n" form fin)
-    fin)
-  (values first-update update))
-
-(define lang-info/c
-  (or/c #f (vector/c module-path? symbol? any/c)))
-
-
-(define (build-compiled-path base name)
-  (build-path 
-   (cond [(path? base) base]
-	 [(eq? base 'relative) 'same]
-	 [(eq? base #f) (error 'batch "Impossible")])
-   "compiled"
-   name))
-
-
-(provide/contract
- [prefix-syntax-start (prefix? . -> . exact-nonnegative-integer?)]
- [prefix-lift-start (prefix? . -> . exact-nonnegative-integer?)]
- [eprintf ((string?) () #:rest (listof any/c) . ->* . void)]
- [build-form-memo 
-  (((unconstrained-domain-> any/c))
-   (#:void? boolean?)
-   . ->* .
-   (values (unconstrained-domain-> any/c)
-           (unconstrained-domain-> any/c)))]
- [lang-info/c contract?]
- [build-compiled-path ((or/c path-string? (symbols 'relative) false/c) path-string? . -> . (or/c path-string? (symbols 'same 'up)))])
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/embed-sig.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/embed-sig.rkt
deleted file mode 100644
index aeded68b62..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/embed-sig.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-(module embed-sig racket/base
-  (require racket/unit)
-  (provide compiler:embed^)
-
-  (define-signature compiler:embed^
-    (create-embedding-executable
-     make-embedding-executable
-     write-module-bundle
-     embedding-executable-is-directory?
-     embedding-executable-is-actually-directory?
-     embedding-executable-put-file-extension+style+filters
-     embedding-executable-add-suffix)))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/embed-unit.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/embed-unit.rkt
deleted file mode 100644
index 6361ca61cd..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/embed-unit.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require racket/unit
-         racket/contract
-	 "sig.rkt"
-	 compiler/embed 
-	 "embed-sig.rkt")
-
-(define-unit-from-context compiler:embed@ compiler:embed^)
-(provide compiler:embed@)
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/option-unit.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/option-unit.rkt
deleted file mode 100644
index c0f42328b5..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/option-unit.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-(require racket/unit compiler/sig compiler/option)
-
-(provide compiler:option@)
-
-(define-unit-from-context compiler:option@ compiler:option^)
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/sig.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/sig.rkt
deleted file mode 100644
index 87f1af4dda..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/sig.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-
-(require racket/unit)
-
-(provide compiler:option^
-         compiler^)
-
-;; Compiler options
-(define-signature compiler:option^
-  (somewhat-verbose ; default = #f
-   verbose ; default = #f
-   
-
-   setup-prefix ; string to embed in public names;
-                ; used mainly for compiling extensions
-                ;  with the collection name so that 
-                ;  cross-extension conflicts are less
-                ;  likely in architectures that expose
-                ;  the public names of loaded extensions
-                ; default = ""
-
-   3m ; #t => build for 3m
-      ; default = #f
-
-   compile-subcollections   ; #t => compile collection subdirectories
-                            ; default = #t
-
-   ))
-
-;; Compiler procedures
-(define-signature compiler^
-  (compile-zos
-
-   compile-collection-zos
-   compile-directory-zos
-   compile-directory-srcs
-
-   current-compiler-dynamic-require-wrapper
-   compile-notify-handler))
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/zo-marshal.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/zo-marshal.rkt
deleted file mode 100644
index c241013d04..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/zo-marshal.rkt
+++ /dev/null
@@ -1,1201 +0,0 @@
-#lang racket/base
-(require compiler/zo-structs
-         unstable/struct
-         racket/port
-         racket/vector
-         racket/match
-         racket/contract
-         racket/local
-         racket/list
-         racket/dict
-         racket/function
-         racket/pretty
-         racket/path
-         racket/set
-         racket/extflonum)
-
-(provide/contract
- [zo-marshal (compilation-top? . -> . bytes?)]
- [zo-marshal-to (compilation-top? output-port? . -> . void?)])
-
-(struct not-ready ())
-
-(define (zo-marshal top)
-  (define bs (open-output-bytes))
-  (zo-marshal-to top bs)
-  (get-output-bytes bs))
-
-(define (zo-marshal-to top outp) 
-  (if (and (mod? (compilation-top-code top))
-           (or (pair? (mod-pre-submodules (compilation-top-code top)))
-               (pair? (mod-post-submodules (compilation-top-code top)))))
-      ;; module directory and submodules:
-      (zo-marshal-modules-to top outp)
-      ;; single module or other:
-      (zo-marshal-top-to top outp)))
-
-(define (zo-marshal-modules-to top outp)
-  ;; Write the compiled form header
-  (write-bytes #"#~" outp)
-  ;; Write the version:
-  (define version-bs (string->bytes/latin-1 (version)))
-  (write-bytes (bytes (bytes-length version-bs)) outp)
-  (write-bytes version-bs outp)
-
-  (write-byte (char->integer #\D) outp)
-
-  (struct mod-bytes (code-bstr name-bstr offset))
-  ;; bytestring encodings of the modules and module names
-  ;; --- in the order that they must be written:
-  (define pre-mod-bytess
-    (reverse
-     (let loop ([m (compilation-top-code top)] [pre-accum null])
-       (define (encode-module-name name)
-         (if (symbol? name)
-             #""
-             (apply bytes-append
-                    (for/list ([sym (in-list (cdr name))])
-                      (define b (string->bytes/utf-8 (symbol->string sym)))
-                      (define len (bytes-length b))
-                      (bytes-append (if (len . < . 255)
-                                        (bytes len)
-                                        (bytes-append
-                                         (bytes 255)
-                                         (integer->integer-bytes len 4 #f #f)))
-                                    b)))))
-       (define accum
-         (let iloop ([accum pre-accum] [subm (mod-pre-submodules m)])
-           (if (null? subm)
-               accum
-               (iloop (loop (car subm) accum) (cdr subm)))))
-       (define o (open-output-bytes))
-       (zo-marshal-top-to (struct-copy compilation-top top 
-                                       [code (struct-copy mod m 
-                                                          [pre-submodules null]
-                                                          [post-submodules null])])
-                          o)
-       (define new-accum
-         (cons (mod-bytes (get-output-bytes o)
-                          (encode-module-name (mod-name m))
-                          0)
-               accum))
-       (let iloop ([accum new-accum] [subm (mod-post-submodules m)])
-         (if (null? subm)
-             accum
-             (iloop (loop (car subm) accum) (cdr subm)))))))
-  (write-bytes (int->bytes (length pre-mod-bytess)) outp)
-  ;; Size of btree:
-  (define btree-size 
-    (+ 8
-       (string-length (version))
-       (apply + (for/list ([mb (in-list pre-mod-bytess)])
-                  (+ (bytes-length (mod-bytes-name-bstr mb))
-                     20)))))
-  ;; Add offsets to mod-bytess:
-  (define mod-bytess (let loop ([offset btree-size] [mod-bytess pre-mod-bytess])
-                       (if (null? mod-bytess)
-                           null
-                           (let ([mb (car mod-bytess)])
-                             (cons (mod-bytes (mod-bytes-code-bstr mb)
-                                              (mod-bytes-name-bstr mb)
-                                              offset)
-                                   (loop (+ offset 
-                                            (bytes-length (mod-bytes-code-bstr mb)))
-                                         (cdr mod-bytess)))))))
-  ;; Sort by name for btree order:
-  (define sorted-mod-bytess 
-    (list->vector (sort mod-bytess bytes<? #:key mod-bytes-name-bstr)))
-  (define right-offsets (make-vector (vector-length sorted-mod-bytess) 0))
-  ;; Write out btree or compute offsets:
-  (define (write-btree write-bytes)
-    (let loop ([lo 0] [hi (vector-length sorted-mod-bytess)] [pos 0])
-      (define mid (quotient (+ lo hi) 2))
-      (define mb (vector-ref sorted-mod-bytess mid))
-      (define name-len (bytes-length (mod-bytes-name-bstr mb)))
-      (write-bytes (int->bytes name-len) outp)
-      (write-bytes (mod-bytes-name-bstr mb) outp)
-      (write-bytes (int->bytes (mod-bytes-offset mb)) outp)
-      (write-bytes (int->bytes (bytes-length (mod-bytes-code-bstr mb))) outp)
-      (define left-pos (+ pos name-len 20))
-      (write-bytes (int->bytes (if (= lo mid)
-                                   0
-                                   left-pos))
-                   outp)
-      (write-bytes (int->bytes (if (= (add1 mid) hi)
-                                   0
-                                   (vector-ref right-offsets mid)))
-                   outp)
-      (define right-pos (if (= lo mid)
-                            left-pos
-                            (loop lo mid left-pos)))
-      (vector-set! right-offsets mid right-pos)
-      (if (= (add1 mid) hi)
-          right-pos
-          (loop (add1 mid) hi right-pos))))
-  (write-btree void) ; to fill `right-offsets'
-  (write-btree write-bytes) ; to actually write the btree
-  ;; write modules:
-  (for ([mb (in-list mod-bytess)])
-    (write-bytes (mod-bytes-code-bstr mb) outp)))
-
-(define (zo-marshal-top-to top outp) 
-  
-  ; XXX: wraps were encoded in traverse, now needs to be handled when writing
-  (define wrapped (make-hash))
-  
-  ; (obj -> (or pos #f)) output-port -> number
-  ; writes top to outp using shared-obj-pos to determine symref
-  ; returns the file position at the end of the compilation top
-  (define (out-compilation-top shared-obj-pos shared-obj-unsee outp)
-    (define ct
-      (match top
-        [(compilation-top max-let-depth prefix form)
-         (list* max-let-depth prefix (protect-quote form))]))
-    (out-anything ct (make-out outp shared-obj-pos shared-obj-unsee wrapped))
-    (file-position outp))
-  
-  ; -> vector
-  ; calculates what values show up in the compilation top more than once
-  ; closures are always included even if they only show up once
-  (define (create-symbol-table)
-    (define encountered (make-hasheq))
-    (define shared (make-hasheq))
-    (define (encountered? v)
-      ((hash-ref encountered v 0) . > . 0))
-    (define (encounter! v)
-      (hash-update! encountered v add1 0) 
-      #f)
-    (define (unencounter! v)
-      (define how-many-encounters (hash-ref encountered v))
-      (when (= how-many-encounters 1)
-        (hash-set! encountered v 0)))
-    (define (shared-obj-pos v #:error? [error? #f])
-      (hash-ref shared v 
-                (if error?
-                    (λ () (error 'symref "~e not in symbol table" v))
-                    #f)))
-    (define (share! v) ; XXX this doesn't always set something, probably should be refactored
-      (or (shared-obj-pos v)
-          (let ([pos (add1 (hash-count shared))])
-            (hash-set! shared v pos) 
-            pos)))
-    
-    (out-compilation-top 
-     (λ (v #:error? [error? #f])
-       (cond
-         [(hash? v) (error 'create-symbol-table "current type trace: ~a" (current-type-trace))]
-         [(closure? v)
-          (let ([pos (share! v)])
-            (if (encountered? v)
-                pos
-                (encounter! v)))]
-         [error? ; If we would error if this were not present, then we must share it
-          (encounter! v)
-          (share! v)]
-         [(encountered? v)
-          (share! v)]
-         [else
-          (encounter! v)]))
-     (λ (v)
-       (unencounter! v))
-     (open-output-nowhere))
-    
-    (define symbol-table (make-vector (hash-count shared) (not-ready)))
-    (hash-map shared (λ (k v) (vector-set! symbol-table (sub1 v) k)))
-    (values symbol-table shared-obj-pos))
-  
-  (define-values (symbol-table shared-obj-pos)
-    (create-symbol-table))
-  
-  ; vector output-port -> (listof number) number
-  ; writes symbol-table to outp
-  ; returns the file positions of each value in the symbol table and the end of the symbol table
-  (define (out-symbol-table symbol-table outp)
-    (define (shared-obj-pos/modulo-v v)
-      (define skip? #t)
-      (λ (v2 #:error? [error? #f])
-        (if (and skip? (eq? v v2))
-            (begin
-              (set! skip? #f)
-              #f)
-            (shared-obj-pos v2 
-                            #:error? error?))))
-    (values
-     (for/list ([v (in-vector symbol-table)]
-                [i (in-naturals)])
-       (begin0
-         (file-position outp)
-         (out-anything v (make-out outp (shared-obj-pos/modulo-v v) void wrapped))))
-     (file-position outp)))
-  
-  ; Calculate file positions
-  (define counting-port (open-output-nowhere))
-  (define-values (offsets post-shared) (out-symbol-table symbol-table counting-port))
-  (define all-forms-length (out-compilation-top shared-obj-pos void counting-port))
-  
-  ; Write the compiled form header
-  (write-bytes #"#~" outp)
-  
-  ; Write the version (notice that it isn't the same as out-string)
-  (define version-bs (string->bytes/latin-1 (version)))
-  (write-bytes (bytes (bytes-length version-bs)) outp)
-  (write-bytes version-bs outp)
-
-  (write-byte (char->integer #\T) outp)
-
-  ; Write empty hash code
-  (write-bytes (make-bytes 20 0) outp)
-  
-  ; Write the symbol table information (size, offsets)
-  (define symtabsize (add1 (vector-length symbol-table)))
-  (write-bytes (int->bytes symtabsize) outp)
-  (define all-short? (post-shared . < . #xFFFF))
-  (write-bytes (bytes (if all-short? 1 0)) outp)
-  (for ([o (in-list offsets)])
-    (write-bytes (integer->integer-bytes o (if all-short? 2 4) #f #f) outp))
-  ; Post-shared is where the ctop actually starts
-  (write-bytes (int->bytes post-shared) outp)
-  ; This is where the file should end
-  (write-bytes (int->bytes all-forms-length) outp)
-  ; Actually write the zo
-  (out-symbol-table symbol-table outp)
-  (out-compilation-top shared-obj-pos void outp)
-  (void))
-
-;; ----------------------------------------
-
-(define toplevel-type-num 0)
-(define sequence-type-num 6)
-(define unclosed-procedure-type-num 8)
-(define let-value-type-num 9)
-(define let-void-type-num 10)
-(define letrec-type-num 11)
-(define wcm-type-num 13)
-(define quote-syntax-type-num 14)
-(define define-values-type-num 15)
-(define define-syntaxes-type-num 16)
-(define begin-for-syntax-type-num 17)
-(define set-bang-type-num 18)
-(define boxenv-type-num 19)
-(define begin0-sequence-type-num 20)
-(define splice-sequence-type-num 21)
-(define require-form-type-num 22)
-(define varref-form-type-num 23)
-(define apply-values-type-num 24)
-(define case-lambda-sequence-type-num 25)
-(define module-type-num 26)
-(define inline-variants-type-num 27)
-(define variable-type-num 35)
-(define prefix-type-num 114)
-(define free-id-info-type-num 164)
-
-(define-syntax define-enum
-  (syntax-rules ()
-    [(_ n) (begin)]
-    [(_ n id . rest)
-     (begin
-       (define id n)
-       (define-enum (add1 n) . rest))])) 
-
-(define-enum
-  0
-  CPT_ESCAPE
-  CPT_SYMBOL
-  CPT_SYMREF
-  CPT_WEIRD_SYMBOL
-  CPT_KEYWORD
-  CPT_BYTE_STRING
-  CPT_CHAR_STRING
-  CPT_CHAR
-  CPT_INT
-  CPT_NULL
-  CPT_TRUE
-  CPT_FALSE
-  CPT_VOID
-  CPT_BOX
-  CPT_PAIR
-  CPT_LIST
-  CPT_VECTOR
-  CPT_HASH_TABLE
-  CPT_STX
-  CPT_LET_ONE_TYPED
-  CPT_MARSHALLED
-  CPT_QUOTE
-  CPT_REFERENCE
-  CPT_LOCAL
-  CPT_LOCAL_UNBOX
-  CPT_SVECTOR
-  CPT_APPLICATION
-  CPT_LET_ONE
-  CPT_BRANCH
-  CPT_MODULE_INDEX
-  CPT_MODULE_VAR
-  CPT_PATH
-  CPT_CLOSURE
-  CPT_DELAY_REF ; XXX unused, but appears to be same as CPT_SYMREF
-  CPT_PREFAB
-  CPT_LET_ONE_UNUSED)
-
-(define CPT_SMALL_NUMBER_START 36)
-(define CPT_SMALL_NUMBER_END 60)
-
-(define CPT_SMALL_SYMBOL_START 60)
-(define CPT_SMALL_SYMBOL_END 80)
-
-(define CPT_SMALL_MARSHALLED_START 80)
-(define CPT_SMALL_MARSHALLED_END 92)
-
-(define CPT_SMALL_LIST_MAX 50)
-(define CPT_SMALL_PROPER_LIST_START 92)
-(define CPT_SMALL_PROPER_LIST_END (+ CPT_SMALL_PROPER_LIST_START CPT_SMALL_LIST_MAX))
-
-(define CPT_SMALL_LIST_START CPT_SMALL_PROPER_LIST_END)
-(define CPT_SMALL_LIST_END 192)
-
-(define CPT_SMALL_LOCAL_START 192)
-(define CPT_SMALL_LOCAL_END 207)
-(define CPT_SMALL_LOCAL_UNBOX_START 207)
-(define CPT_SMALL_LOCAL_UNBOX_END 222)
-
-(define CPT_SMALL_SVECTOR_START 222)
-(define CPT_SMALL_SVECTOR_END 247)
-
-(define CPT_SMALL_APPLICATION_START 247)
-(define CPT_SMALL_APPLICATION_END 255)
-
-(define CLOS_HAS_REST 1)
-(define CLOS_HAS_REF_ARGS 2)
-(define CLOS_PRESERVES_MARKS 4)
-(define CLOS_NEED_REST_CLEAR 8)
-(define CLOS_IS_METHOD 16)
-(define CLOS_SINGLE_RESULT 32)
-
-(define BITS_PER_MZSHORT 32)
-(define BITS_PER_ARG 4)
-
-(define (int->bytes x)
-  (integer->integer-bytes x
-                          4
-                          #f
-                          #f))
-
-(define (encode-module-bindings module-bindings)
-  (define encode-nominal-path
-    (match-lambda
-      [(struct simple-nominal-path (value))
-       value]
-      [(struct imported-nominal-path (value import-phase))
-       (cons value import-phase)]
-      [(struct phased-nominal-path (value import-phase phase))
-       (cons value (cons import-phase phase))]))
-  (define encoded-bindings (make-vector (* (length module-bindings) 2)))
-  (for ([i (in-naturals)]
-        [(k v) (in-dict module-bindings)])
-    (vector-set! encoded-bindings (* i 2) k)
-    (vector-set! encoded-bindings (add1 (* i 2))
-                 (match v
-                   [(struct simple-module-binding (path))
-                    path]
-                   [(struct exported-module-binding (path export-name))
-                    (cons path export-name)]
-                   [(struct nominal-module-binding (path nominal-path))
-                    (cons path (encode-nominal-path nominal-path))]
-                   [(struct exported-nominal-module-binding (path export-name nominal-path nominal-export-name))
-                    (list* path export-name (encode-nominal-path nominal-path) nominal-export-name)]
-                   [(struct phased-module-binding (path phase export-name nominal-path nominal-export-name))
-                    (list* path phase export-name (encode-nominal-path nominal-path) nominal-export-name)])))
-  encoded-bindings)
-
-(define (encode-all-from-module afm)
-  (match afm
-    [(struct all-from-module (path phase src-phase '() #f '()))
-     (list* path phase src-phase)]
-    [(struct all-from-module (path phase src-phase '() #f context))
-     (list* path phase context src-phase)]
-    [(struct all-from-module (path phase src-phase exns prefix '()))
-     (list* path phase src-phase exns prefix)]))
-
-(define (encode-wraps wraps)
-  (for/list ([wrap (in-list wraps)])
-    (match wrap
-      [(struct phase-shift (amt src dest cancel-id))
-       (box (vector amt src dest #f #f cancel-id))]
-      [(struct module-rename (phase kind set-id unmarshals renames mark-renames plus-kern?))
-       (define encoded-kind (eq? kind 'marked))
-       (define encoded-unmarshals (map encode-all-from-module unmarshals))
-       (define encoded-renames (encode-module-bindings renames))
-       (define-values (maybe-unmarshals maybe-renames) (if (null? encoded-unmarshals) 
-                                                           (values encoded-renames mark-renames)
-                                                           (values encoded-unmarshals (cons encoded-renames mark-renames))))
-       (define mod-rename (list* phase encoded-kind set-id maybe-unmarshals maybe-renames))
-       (if plus-kern?
-           (cons #t mod-rename)
-           mod-rename)]
-      [(struct lexical-rename (bool1 bool2 alist))
-       (define len (length alist))
-       (define vec (make-vector (+ (* 2 len) 2))) ; + 2 for booleans at the beginning
-       (vector-set! vec 0 bool1)
-       (vector-set! vec 1 bool2)
-       (for ([(k v) (in-dict alist)]
-             [i (in-naturals)])
-         (vector-set! vec (+ 2 i) k)
-         (vector-set! vec (+ 2 i len) v))
-       vec]
-      [(struct top-level-rename (flag))
-       flag]
-      [(struct mark-barrier (value)) 
-       value]
-      [(struct prune (syms))
-       (box syms)]
-      [(struct wrap-mark (val))
-       (list val)])))
-
-(define (encode-mark-map mm)
-  mm
-  #;(for/fold ([l empty])
-      ([(k v) (in-hash ht)])
-      (list* k v l)))
-
-(define-struct protected-symref (val))
-
-(define (encode-wrapped w)
-  (match w
-    [(struct wrapped (datum wraps tamper-status))
-     (let* ([enc-datum
-             (match datum
-               [(cons a b) 
-                (let ([p (cons (encode-wrapped a)
-                               (let bloop ([b b])
-                                 (match b
-                                   ['() null]
-                                   [(cons b1 b2)
-                                    (cons (encode-wrapped b1)
-                                          (bloop b2))]
-                                   [else
-                                    (encode-wrapped b)])))]
-                      ; XXX Cylic list error possible
-                      [len (let loop ([datum datum][len 0])
-                             (cond
-                               [(null? datum) #f]
-                               [(pair? datum) (loop (cdr datum) (add1 len))]
-                               [else len]))])
-                  ;; for improper lists, we need to include the length so the 
-                  ;; parser knows where the end of the improper list is
-                  (if len
-                      (cons len p) 
-                      p))]
-               [(box x)
-                (box (encode-wrapped x))]
-               [(? vector? v)
-                (vector-map encode-wrapped v)]
-               [(? prefab-struct-key)
-                (define l (vector->list (struct->vector datum)))
-                (apply
-                 make-prefab-struct
-                 (car l)
-                 (map encode-wrapped (cdr l)))]
-               [_ datum])]
-            [p (cons enc-datum
-                     (encode-wraps wraps))])
-       (case tamper-status
-         [(clean) p]
-         [(tainted) (vector p)]
-         [(armed) (vector p #f)]))]))
-
-(define-struct out (s shared-index shared-unsee encoded-wraps))
-(define (out-shared v out k)
-  (if (shareable? v)
-      (let ([v ((out-shared-index out) v)])
-        (if v
-            (begin
-              (out-byte CPT_SYMREF out)
-              (out-number v out))
-            (k)))
-      (k)))
-
-(define (out-byte v out)
-  (write-byte v (out-s out)))
-
-(define (out-bytes b out)
-  (write-bytes b (out-s out)))
-
-(define (out-number n out)
-  (cond
-    [(n . < . 0)
-     (if (n . > . -32)
-         (out-byte (bitwise-ior #xC0 (- n)) out)
-         (begin
-           (out-byte #xE0 out)
-           (out-bytes (int->bytes (- n)) out)))]
-    [(n . < . 128)
-     (out-byte n out)]
-    [(n . < . #x4000)
-     (out-byte (bitwise-ior #x80 (bitwise-and n #x3F)) out)
-     (out-byte (bitwise-and #xFF (arithmetic-shift n -6)) out)]
-    [else
-     (out-byte #xF0 out)
-     (out-bytes (int->bytes n) out)]))
-
-(define (out-marshaled type-num val out)
-  (if (type-num . < . (- CPT_SMALL_MARSHALLED_END CPT_SMALL_MARSHALLED_START))
-      (out-byte (+ CPT_SMALL_MARSHALLED_START type-num) out)
-      (begin
-        (out-byte CPT_MARSHALLED out)
-        (out-number type-num out)))
-  (out-anything val out))
-
-(define (or-pred? v . ps)
-  (ormap (lambda (?) (? v)) ps))
-
-(define quoting? (make-parameter #f))
-
-(define (shareable? v)
-  (define never-share-this?
-    (or-pred? v char? maybe-same-as-fixnum? empty? boolean? void? hash?))
-  (define always-share-this?
-    (or-pred? v closure?))
-  (or always-share-this?
-      (if (quoting?) 
-          #f
-          (not never-share-this?))))
-
-(define (maybe-same-as-fixnum? v)
-  (and (exact-integer? v)
-       (and (v . >= . -1073741824) (v . <= . 1073741823))))
-
-(define (current-type-trace)
-  (reverse (continuation-mark-set->list (current-continuation-marks) 'zo)))
-
-(define (typeof v)
-  (cond
-    [(pair? v) 'cons]
-    [(hash? v) 'hash]
-    [(prefab-struct-key v) => (λ (key) key)]
-    [(vector? v) 'vector]
-    [else v]))
-
-(define-syntax with-type-trace
-  (syntax-rules ()
-    [(_ v body ...)
-     #;(begin body ...)
-     (with-continuation-mark 'zo (typeof v)
-       (begin0 (begin body ...) (void)))]))
-
-(define (type->index type)
-  (case type
-    [(flonum) 1]
-    [(fixnum) 2]
-    [(extflonum) 3]
-    [else (error 'type->index "unknown type: ~e" type)]))
-
-(define (out-anything v out)
-  (with-type-trace v
-  (out-shared 
-   v out
-   (λ ()
-     (match v
-       [(? char?)
-        (out-byte CPT_CHAR out)
-        (out-number (char->integer v) out)]
-       [(? maybe-same-as-fixnum?) ;XXX not sure if it's okay to use fixnum? instead of exact range check
-        (if (and (v . >= . 0)
-                 (v . < . (- CPT_SMALL_NUMBER_END CPT_SMALL_NUMBER_START)))
-            (out-byte (+ CPT_SMALL_NUMBER_START v) out)
-            (begin
-              (out-byte CPT_INT out)
-              (out-number v out)))]
-       [(list)
-        (out-byte CPT_NULL out)]
-       [#t
-        (out-byte CPT_TRUE out)]
-       [#f
-        (out-byte CPT_FALSE out)]
-       [(? void?)
-        (out-byte CPT_VOID out)]
-       [(struct module-variable (modidx sym pos phase constantness))
-        (define (to-sym n) (string->symbol (format "struct~a" n)))
-        (out-byte CPT_MODULE_VAR out)
-        (out-anything modidx out)
-        (out-anything sym out)
-        (out-anything (cond
-                       [(function-shape? constantness)
-                        (let ([a (function-shape-arity constantness)])
-                          (cond
-                           [(arity-at-least? a) 
-                            (bitwise-ior (arithmetic-shift (- (add1 (arity-at-least-value a))) 1)
-                                         (if (function-shape-preserves-marks? constantness) 1 0))]
-                           [(list? a)
-                            (string->symbol (apply
-                                             string-append
-                                             (add-between
-                                              (for/list ([a (in-list a)])
-                                                (define n (if (arity-at-least? a)
-                                                              (- (add1 (arity-at-least-value a)))
-                                                              a))
-                                                (number->string n))
-                                              ":")))]
-                           [else 
-                            (bitwise-ior (arithmetic-shift a 1) 
-                                         (if (function-shape-preserves-marks? constantness) 1 0))]))]
-                       [(struct-type-shape? constantness)
-                        (to-sym (arithmetic-shift (struct-type-shape-field-count constantness)
-                                                  4))]
-                       [(constructor-shape? constantness)
-                        (to-sym (bitwise-ior 1 (arithmetic-shift (constructor-shape-arity constantness)
-                                                                 4)))]
-                       [(predicate-shape? constantness) (to-sym 2)]
-                       [(accessor-shape? constantness)
-                        (to-sym (bitwise-ior 3 (arithmetic-shift (accessor-shape-field-count constantness)
-                                                                 4)))]
-                       [(mutator-shape? constantness)
-                        (to-sym (bitwise-ior 4 (arithmetic-shift (mutator-shape-field-count constantness)
-                                                                 4)))]
-                       [(struct-other-shape? constantness)
-                        (to-sym 5)]
-                       [else #f])
-                      out)
-        (case constantness
-          [(#f) (void)]
-          [(fixed) (out-number -5 out)]
-          [else (out-number -4 out)])
-        (unless (zero? phase)
-          (out-number -2 out)
-          (out-number phase out))
-        (out-number pos out)]
-       [(struct closure (lam gen-id))
-        (out-byte CPT_CLOSURE out)
-        (let ([pos ((out-shared-index out) v #:error? #t)])
-          (out-number pos out)
-          (out-anything lam out))]
-       [(struct prefix (num-lifts toplevels stxs))
-        (out-marshaled
-         prefix-type-num
-         (cons num-lifts
-               (cons (list->vector toplevels)
-                     (list->vector stxs)))
-         out)]
-       [(struct global-bucket (name)) 
-        (out-marshaled variable-type-num name out)]
-       [(struct free-id-info (mpi0 s0 mpi1 s1 p0 p1 p2 insp?))
-        (out-marshaled
-         free-id-info-type-num
-         (vector mpi0 s0 mpi1 s1 p0 p1 p2 insp?)
-         out)]
-       [(? mod?)
-        (out-module v out)]
-       [(struct def-values (ids rhs))
-        (out-marshaled define-values-type-num
-                       (list->vector (cons (protect-quote rhs) ids))
-                       out)]
-       [(struct def-syntaxes (ids rhs prefix max-let-depth dummy))
-        (out-marshaled define-syntaxes-type-num
-                       (list->vector (list* (protect-quote rhs)
-                                            prefix
-                                            max-let-depth
-                                            dummy
-                                            ids))
-                       out)]
-       [(struct seq-for-syntax (rhs prefix max-let-depth dummy))
-        (out-marshaled begin-for-syntax-type-num
-                       (vector (map protect-quote rhs)
-                               prefix
-                               max-let-depth
-                               dummy)
-                       out)]
-       [(struct beg0 (forms))
-        (out-marshaled begin0-sequence-type-num (map protect-quote forms) out)]
-       [(struct seq (forms))
-        (out-marshaled sequence-type-num (map protect-quote forms) out)]
-       [(struct splice (forms))
-        (out-marshaled splice-sequence-type-num forms out)]
-       [(struct req (reqs dummy))
-        (error "cannot handle top-level `require', yet")
-        (out-marshaled require-form-type-num (cons dummy reqs) out)]
-       [(struct toplevel (depth pos const? ready?))
-        (out-marshaled toplevel-type-num
-                       (cons
-                        depth
-                        (if (or const? ready?)
-                            (cons pos
-                                  (bitwise-ior 
-                                   (if const? #x2 0)
-                                   (if ready? #x1 0)))
-                            pos))
-                       out)]
-       [(struct topsyntax (depth pos midpt))
-        (out-marshaled quote-syntax-type-num
-                       (cons depth
-                             (cons pos midpt))
-                       out)]
-       [(struct primval (id))
-        (out-byte CPT_REFERENCE out)
-        (out-number id out)]
-       [(struct assign (id rhs undef-ok?))
-        (out-marshaled set-bang-type-num
-                       (cons undef-ok? (cons id rhs))
-                       out)]
-       [(struct localref (unbox? offset clear? other-clears? type))
-        (if (and (not clear?) (not other-clears?) (not flonum?)
-                 (offset . < . (- CPT_SMALL_LOCAL_END CPT_SMALL_LOCAL_START)))
-            (out-byte (+ (if unbox?
-                             CPT_SMALL_LOCAL_UNBOX_START
-                             CPT_SMALL_LOCAL_START)
-                         offset)
-                      out)
-            (begin
-              (out-byte (if unbox? CPT_LOCAL_UNBOX CPT_LOCAL) out)
-              (if (not (or clear? other-clears? type))
-                  (out-number offset out)
-                  (begin
-                    (out-number (- (add1 offset)) out)
-                    (out-number (cond
-                                 [clear? 1]
-                                 [other-clears? 2]
-                                 [else (+ 2 (type->index type))])
-                                out)))))]
-       [(? lam?)
-        (out-lam v out)]
-       [(struct case-lam (name lams))
-        (out-marshaled case-lambda-sequence-type-num
-                       (cons (or name null)
-                             lams)
-                       out)]
-       [(struct let-one (rhs body type unused?))
-        (out-byte (cond
-                    [type CPT_LET_ONE_TYPED]
-                    [unused? CPT_LET_ONE_UNUSED]
-                    [else CPT_LET_ONE])
-                  out)
-        (out-anything (protect-quote rhs) out)
-        (out-anything (protect-quote body) out)
-        (when type
-          (out-number (type->index type) out))]
-       [(struct let-void (count boxes? body))
-        (out-marshaled let-void-type-num
-                       (list*
-                        count
-                        boxes?
-                        (protect-quote body))
-                       out)]
-       [(struct let-rec (procs body))
-        (out-marshaled letrec-type-num
-                       (list*
-                        (length procs)
-                        (protect-quote body)
-                        procs)
-                       out)]
-       [(struct install-value (count pos boxes? rhs body))
-        (out-marshaled let-value-type-num
-                       (list*
-                        count
-                        pos
-                        boxes?
-                        (protect-quote rhs)
-                        (protect-quote body))
-                       out)]
-       [(struct boxenv (pos body))
-        (out-marshaled boxenv-type-num
-                       (cons
-                        pos
-                        (protect-quote body))
-                       out)]
-       [(struct branch (test then else))
-        (out-byte CPT_BRANCH out)
-        (out-anything (protect-quote test) out)
-        (out-anything (protect-quote then) out)
-        (out-anything (protect-quote else) out)]
-       [(struct application (rator rands))
-        (let ([len (length rands)]) 
-          (if (len . < . (- CPT_SMALL_APPLICATION_END CPT_SMALL_APPLICATION_START))
-              (out-byte (+ CPT_SMALL_APPLICATION_START (length rands)) out)
-              (begin
-                (out-byte CPT_APPLICATION out)
-                (out-number len out)))
-          (for-each (lambda (e)
-                      (out-anything (protect-quote e) out))
-                    (cons rator rands)))]
-       [(struct apply-values (proc args-expr))
-        (out-marshaled apply-values-type-num
-                       (cons (protect-quote proc)
-                             (protect-quote args-expr))
-                       out)]
-       [(struct with-cont-mark (key val body))
-        (out-marshaled wcm-type-num
-                       (list*
-                        (protect-quote key)
-                        (protect-quote val)
-                        (protect-quote body))
-                       out)]
-       [(struct varref (expr dummy))
-        (out-marshaled varref-form-type-num
-                       (cons expr dummy)
-                       out)]
-       [(protected-symref v)
-        (out-anything ((out-shared-index out) v #:error? #t) out)]
-       [(and (? symbol?) (not (? symbol-interned?)))
-        (out-as-bytes v 
-                      #:before-length (if (symbol-unreadable? v) 0 1)
-                      (compose string->bytes/utf-8 symbol->string) 
-                      CPT_WEIRD_SYMBOL
-                      #f
-                      out)]     
-       [(? symbol?)
-        (define bs (string->bytes/utf-8 (symbol->string v)))
-        (define len (bytes-length bs))
-        (if (len . < . (- CPT_SMALL_SYMBOL_END CPT_SMALL_SYMBOL_START))
-            (out-byte (+ CPT_SMALL_SYMBOL_START len) out)
-            (begin (out-byte CPT_SYMBOL out)
-                   (out-number len out)))
-        (out-bytes bs out)]
-       [(? keyword?)
-        (out-as-bytes v 
-                      (compose string->bytes/utf-8 keyword->string) 
-                      CPT_KEYWORD
-                      #f
-                      out)]
-       [(? string?)
-        (out-as-bytes v 
-                      string->bytes/utf-8
-                      CPT_CHAR_STRING
-                      (string-length v)
-                      out)]
-       [(? bytes?)
-        (out-as-bytes v 
-                      values
-                      CPT_BYTE_STRING
-                      #f
-                      out)]
-       [(? box?)
-        (out-byte CPT_BOX out)
-        (out-anything (unbox v) out)]
-       [(? pair?)
-        ; This code will not turn two different lists that share a common tail
-        ;  e.g. (list* 1 l) and (list* 2 l)
-        ; into a form that puts l into the symbol table
-        ; (when that is possible)
-        
-        ; In contrast, if we always use CPT_PAIR, then it would
-        
-        ; Unfortunately, detecting this situation during the traversal
-        ; phase, without introducing false sharing, is difficult.
-        ; We had an implementation (see the history), but it was buggy.
-        (define (list-length-before-cycle/improper-end l)
-          (let loop ([len 0] [l l] [seen (set)])
-            (cond 
-              [(set-member? seen l)
-               (values len #f)]
-              [(null? l)
-               (values len #t)]
-              [(pair? l)
-               (loop (add1 len) (cdr l) (set-add seen l))]
-              [else
-               (values len #f)])))
-        (define-values (len proper?) (list-length-before-cycle/improper-end v))
-        
-        (define (print-contents-as-proper)
-          (for ([e (in-list v)])
-            (out-anything e out)))
-        (define (print-contents-as-improper)
-          (let loop ([l v] [i len])
-            (cond
-              [(zero? i)
-               (out-anything l out)]
-              [else
-               (out-anything (car l) out)
-               (loop (cdr l) (sub1 i))])))
-        (if proper?
-            (if (len . < . (- CPT_SMALL_PROPER_LIST_END CPT_SMALL_PROPER_LIST_START))
-                (begin (out-byte (+ CPT_SMALL_PROPER_LIST_START len) out)
-                       (print-contents-as-proper))
-                (begin (out-byte CPT_LIST out)
-                       (out-number len out)
-                       (print-contents-as-proper)
-                       (out-anything null out)))
-            (if (len . < . (- CPT_SMALL_LIST_END CPT_SMALL_LIST_START))
-                ; XXX If len = 1 (or maybe = 2?) then this could by CPT_PAIR
-                (begin (out-byte (+ CPT_SMALL_LIST_START len) out)
-                       (print-contents-as-improper))
-                (begin (out-byte CPT_LIST out)
-                       (out-number len out)
-                       (print-contents-as-improper))))]
-       [(? vector?)
-        (out-byte CPT_VECTOR out)
-        (out-number (vector-length v) out)
-        (for ([v (in-vector v)])
-          (out-anything v out))]
-       [(? hash?)
-        (out-byte CPT_HASH_TABLE out)
-        (out-number (cond
-                      [(hash-eqv? v) 2]
-                      [(hash-eq? v) 0]
-                      [(hash-equal? v) 1])
-                    out)
-        (out-number (hash-count v) out)
-        (for ([(k v) (in-hash v)])
-          (out-anything k out)
-          (out-anything v out))]
-       [(svector vec)
-        (let* ([len (vector-length vec)])
-          (if (len . < . (- CPT_SMALL_SVECTOR_END CPT_SMALL_SVECTOR_START))
-              (out-byte (+ CPT_SMALL_SVECTOR_START len) out)
-              (begin (out-byte CPT_SVECTOR out)
-                     (out-number len out)))
-          (for ([n (in-range (sub1 len) -1 -1)])
-            (out-number (vector-ref vec n) out)))]
-       [(? module-path-index?)
-        (out-byte CPT_MODULE_INDEX out)
-        (let-values ([(name base) (module-path-index-split v)])
-          (out-anything name out)
-          (out-anything base out)
-          (unless (or name base)
-            (out-anything (module-path-index-submodule v) out)))]
-       [(stx encoded)
-        (out-byte CPT_STX out)
-        (out-anything encoded out)]
-       [(? wrapped?)
-        (out-anything (lookup-encoded-wrapped v out) out)]
-       [(? prefab-struct-key)
-        (define pre-v (struct->vector v))
-        (vector-set! pre-v 0 (prefab-struct-key v))
-        (out-byte CPT_PREFAB out)
-        (out-anything pre-v out)]
-       [(quoted qv)
-        (out-byte CPT_QUOTE out)
-        (parameterize ([quoting? #t])
-          (out-anything qv out))]
-       [(or (? path?) ; XXX Why not use CPT_PATH?
-            (? regexp?)
-            (? byte-regexp?)
-            (? number?)
-            (? extflonum?))
-        (out-byte CPT_QUOTE out)
-        (define s (open-output-bytes))
-        (parameterize 
-            ([pretty-print-size-hook
-              (lambda (v mode port)
-                (and (path? v)
-                     (let ([v (make-relative v)])
-                       (+ 2 (let ([p (open-output-bytes)])
-                              (write (path->bytes v) p)
-                              (bytes-length (get-output-bytes p)))))))]
-             [pretty-print-print-hook
-              (lambda (v mode port)
-                (display "#^" port)
-                (write (path->bytes (make-relative v)) port))])
-          (pretty-write v s))
-        (out-byte CPT_ESCAPE out)
-        (define bstr (get-output-bytes s))
-        (out-number (bytes-length bstr) out)
-        (out-bytes bstr out)]
-       [else (error 'out-anything "~s" (current-type-trace))])))))
-
-(define (out-module mod-form out)
-  (out-marshaled module-type-num
-                 (convert-module mod-form)
-                 out))
-
-(define (convert-module mod-form)
-  (match mod-form
-    [(struct mod (name srcname self-modidx prefix provides requires body syntax-bodies unexported 
-                       max-let-depth dummy lang-info internal-context flags pre-submodules post-submodules))
-     (let* ([lookup-req (lambda (phase)
-                          (let ([a (assq phase requires)])
-                            (if a
-                                (cdr a)
-                                null)))]
-            [other-requires (filter (lambda (l)
-                                      (not (memq (car l) '(#f -1 0 1))))
-                                    requires)]
-            [extract-protects
-             (lambda (phase)
-               (let ([a (assq phase provides)])
-                 (and a
-                      (let ([p (map provided-protected? (append (cadr a)
-                                                                (caddr a)))])
-                        (if (ormap values p)
-                            (list->vector p)
-                            #f)))))]
-            [extract-unexported
-             (lambda (phase)
-               (let ([a (assq phase unexported)])
-                 (and a
-                      (cdr a))))]
-            [list->vector/#f (lambda (default l)
-                               (if (andmap (lambda (x) (equal? x default)) l)
-                                   #f
-                                   (list->vector l)))]
-            [l 
-             (let loop ([l other-requires])
-               (match l
-                 [(list)
-                  empty]
-                 [(list-rest (cons phase reqs) rst)
-                  (list* phase reqs (loop rst))]))]
-            [l (cons (length other-requires) l)]
-            [l (cons (lookup-req #f) l)] ; dt-requires
-            [l (cons (lookup-req -1) l)] ; tt-requires
-            [l (cons (lookup-req 1) l)] ; et-requires
-            [l (cons (lookup-req 0) l)] ; requires
-            [l (cons (list->vector body) l)]
-            [l (append (reverse
-                        (for/list ([b (in-list syntax-bodies)])
-                          (for/vector ([i (in-list (cdr b))])
-                            (define (maybe-one l) ;; a single symbol is ok
-                              (if (and (pair? l) (null? (cdr l)))
-                                  (car l)
-                                  l))
-                            (match i
-                              [(struct def-syntaxes (ids rhs prefix max-let-depth dummy))
-                               (vector (maybe-one ids) rhs max-let-depth prefix #f)]
-                              [(struct seq-for-syntax ((list rhs) prefix max-let-depth dummy))
-                               (vector #f rhs max-let-depth prefix #t)]))))
-                       l)]
-            [l (append (apply
-                        append
-                        (map (lambda (l)
-                               (let* ([phase (car l)]
-                                      [all (append (cadr l) (caddr l))]
-                                      [protects (extract-protects phase)]
-                                      [unexported (extract-unexported phase)])
-                                 (append
-                                  (list phase)
-                                  (if (and (not protects) 
-                                           (not unexported))
-                                      (list (void))
-                                      (let ([unexported (or unexported
-                                                            '(() ()))])
-                                        (list (list->vector (cadr unexported))
-                                              (length (cadr unexported))
-                                              (list->vector (car unexported))
-                                              (length (car unexported))
-                                              protects)))
-                                  (list (list->vector/#f 0 (map provided-src-phase all))
-                                        (list->vector/#f #f (map (lambda (p)
-                                                                   (if (eq? (provided-nom-src p)
-                                                                            (provided-src p))
-                                                                       #f ; #f means "same as src"
-                                                                       (provided-nom-src p)))
-                                                                 all))
-                                        (list->vector (map provided-src-name all))
-                                        (list->vector (map provided-src all))
-                                        (list->vector (map provided-name all))
-                                        (length (cadr l))
-                                        (length all)))))
-                             provides))
-                       l)]
-            [l (cons (length provides) l)] ; number of provide sets
-            [l (cons (add1 (length syntax-bodies)) l)]
-            [l (cons prefix l)]
-            [l (cons dummy l)]
-            [l (cons max-let-depth l)]
-            [l (cons internal-context l)] ; module->namespace syntax
-            [l (list* #f #f l)] ; obsolete `functional?' info
-            [l (cons lang-info l)] ; lang-info
-            [l (cons (map convert-module post-submodules) l)]
-            [l (cons (map convert-module pre-submodules) l)]
-            [l (cons (if (memq 'cross-phase flags) #t #f) l)]
-            [l (cons self-modidx l)]
-            [l (cons srcname l)]
-            [l (cons (if (pair? name) (car name) name) l)]
-            [l (cons (if (pair? name) (cdr name) null) l)])
-       l)]))
-
-(define (lookup-encoded-wrapped w out)
-  (hash-ref! (out-encoded-wraps out) w
-            (λ ()
-              (encode-wrapped w))))
-
-
-(define (out-lam expr out)  
-  (match expr
-    [(struct lam (name flags num-params param-types rest? closure-map closure-types toplevel-map max-let-depth body))
-     (let* ([l (protect-quote body)]
-            [any-refs? (or (not (andmap (lambda (t) (eq? t 'val)) param-types))
-                           (not (andmap (lambda (t) (eq? t 'val/ref)) closure-types)))]
-            [num-all-params (if (and rest? (not (memq 'only-rest-arg-not-used flags)))
-                                (add1 num-params)
-                                num-params)]
-            [l (cons (make-svector (if any-refs?
-                                       (list->vector
-                                        (append
-                                         (vector->list closure-map)
-                                         (let* ([v (make-vector (ceiling 
-                                                                 (/ (* BITS_PER_ARG (+ num-params (vector-length closure-map)))
-                                                                    BITS_PER_MZSHORT)))]
-                                                [set-bit! (lambda (i bit)
-                                                            (let ([pos (quotient (* BITS_PER_ARG i) BITS_PER_MZSHORT)])
-                                                              (vector-set! v pos
-                                                                           (bitwise-ior (vector-ref v pos)
-                                                                                        (arithmetic-shift 
-                                                                                         bit
-                                                                                         (modulo (* BITS_PER_ARG i) BITS_PER_MZSHORT))))))])
-                                           (for ([t (in-list param-types)]
-                                                 [i (in-naturals)])
-                                             (case t
-                                               [(val) (void)]
-                                               [(ref) (set-bit! i 1)]
-                                               [else (set-bit! i (+ 1 (type->index t)))]))
-                                           (for ([t (in-list closure-types)]
-                                                 [i (in-naturals num-all-params)])
-                                             (case t
-                                               [(val/ref) (void)]
-                                               [else (set-bit! i (+ 1 (type->index t)))]))
-                                           (vector->list v))))
-                                       closure-map))
-                     l)]
-            [l (if any-refs?
-                   (cons (vector-length closure-map) l)
-                   l)]
-            [tl-map (and toplevel-map
-                         (for/fold ([v 0]) ([i (in-set toplevel-map)])
-                           (bitwise-ior v (arithmetic-shift 1 i))))])
-       (out-marshaled unclosed-procedure-type-num
-                      (list*
-                       (+ (if rest? CLOS_HAS_REST 0)
-                          (if any-refs? CLOS_HAS_REF_ARGS 0)
-                          (if (memq 'preserves-marks flags) CLOS_PRESERVES_MARKS 0)
-                          (if (memq 'sfs-clear-rest-args flags) CLOS_NEED_REST_CLEAR 0)
-                          (if (memq 'is-method flags) CLOS_IS_METHOD 0)
-                          (if (memq 'single-result flags) CLOS_SINGLE_RESULT 0))
-                       num-all-params
-                       max-let-depth
-                       (and tl-map
-                            (if (tl-map . <= . #xFFFFFFF)
-                                ;; Encode as a fixnum:
-                                tl-map
-                                ;; Encode as an even-sized vector of 16-bit integers:
-                                (let ([len (* 2 (quotient (+ (integer-length tl-map) 31) 32))])
-                                  (for/vector ([i (in-range len)])
-                                    (let ([s (* i 16)])
-                                      (bitwise-bit-field tl-map s (+ s 16)))))))
-                       name
-                       l)
-                      out))]))
-
-(define (out-as-bytes expr ->bytes CPT len2 out #:before-length [before-length #f])
-  (define s (->bytes expr))
-  (out-byte CPT out)
-  (when before-length
-    (out-number before-length out))
-  (out-number (bytes-length s) out)
-  (when len2 (out-number len2 out))
-  (out-bytes s out))
-
-(define-struct quoted (v))
-
-(define (protect-quote v)
-  (if (or (pair? v) (vector? v) (and (not (zo? v)) (prefab-struct-key v)) (box? v) (hash? v) (svector? v))
-      (make-quoted v)
-      v))
-
-(define-struct svector (vec))
-
-(define (make-relative v)
-  (let ([r (current-write-relative-directory)])
-    (if r
-        (find-relative-path r v)
-        v)))
-
-
-;; ----------------------------------------
-
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/zo-parse.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/zo-parse.rkt
deleted file mode 100644
index 751ccea841..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/zo-parse.rkt
+++ /dev/null
@@ -1,1272 +0,0 @@
-#lang racket/base
-(require racket/function
-         racket/match
-         racket/list
-         unstable/struct
-         compiler/zo-structs
-         racket/dict
-         racket/set)
-
-(provide zo-parse)
-(provide (all-from-out compiler/zo-structs))
-
-#| Unresolved Issues
-
-  The order of indirect-et-provides, indirect-syntax-provides, indirect-provides was changed, is that okay?
- 
-  orig-port of cport struct is never used, is it needed?
-
-  Lines 628, 630 seem to be only for debugging and should probably throw errors
-
-  vector and pair cases of decode-wraps seem to do different things from the corresponding C code
-
-  Line 816: This should be an eqv placeholder (but they don't exist)
-
-  Line 634: Export registry is always matched as false, but might not be
-
-  What are the real differences between the module-binding cases?
-
-  I think parse-module-path-index was only used for debugging, so it is short-circuited now
-
-|#
-;; ----------------------------------------
-;; Bytecode unmarshalers for various forms
-
-(define (read-toplevel v)
-  (define SCHEME_TOPLEVEL_CONST #x02)
-  (define SCHEME_TOPLEVEL_READY #x01)
-  (match v
-    [(cons depth (cons pos flags))
-     ;; In the VM, the two flag bits are actually interpreted
-     ;; as a number when the toplevel is a reference, but we
-     ;; interpret the bits as flags here for backward compatibility.
-     (make-toplevel depth pos 
-                    (positive? (bitwise-and flags SCHEME_TOPLEVEL_CONST))
-                    (positive? (bitwise-and flags SCHEME_TOPLEVEL_READY)))]
-    [(cons depth pos)
-     (make-toplevel depth pos #f #f)]))
-
-(define (read-topsyntax v)
-  (match v
-    [`(,depth ,pos . ,midpt)
-     (make-topsyntax depth pos midpt)]))
-
-(define (read-variable v)
-  (if (symbol? v)
-      (make-global-bucket v)
-      (error "expected a symbol")))
-
-(define (do-not-read-variable v)
-  (error "should not get here"))
-
-(define (read-compilation-top v)
-  (match v
-    [`(,ld ,prefix . ,code)
-     (unless (prefix? prefix)
-       (error 'bad "not prefix ~a" prefix))
-     (make-compilation-top ld prefix code)]))
-
-(define (read-resolve-prefix v)
-  (match v
-    [`(,i ,tv . ,sv)
-     ;; XXX Why not leave them as vectors and change the contract?
-     (make-prefix i (vector->list tv) (vector->list sv))]))
-
-(define read-free-id-info
-  (match-lambda
-    [(vector mpi0 symbol0 mpi1 symbol1 num0 num1 num2 bool0) ; I have no idea what these mean
-     (make-free-id-info mpi0 symbol0 mpi1 symbol1 num0 num1 num2 bool0)]))
-
-(define (read-unclosed-procedure v)
-  (define CLOS_HAS_REST 1)
-  (define CLOS_HAS_REF_ARGS 2)
-  (define CLOS_PRESERVES_MARKS 4)
-  (define CLOS_NEED_REST_CLEAR 8)
-  (define CLOS_IS_METHOD 16)
-  (define CLOS_SINGLE_RESULT 32)
-  (define BITS_PER_MZSHORT 32)
-  (define BITS_PER_ARG 4)
-  (match v
-    [`(,flags ,num-params ,max-let-depth ,tl-map ,name ,v . ,rest)
-     (let ([rest? (positive? (bitwise-and flags CLOS_HAS_REST))])
-       (let*-values ([(closure-size closed-over body)
-                      (if (zero? (bitwise-and flags CLOS_HAS_REF_ARGS))
-                          (values (vector-length v) v rest)
-                          (values v (car rest) (cdr rest)))]
-                     [(get-flags) (lambda (i)
-                                    (if (zero? (bitwise-and flags CLOS_HAS_REF_ARGS))
-                                        0
-                                        (let ([byte (vector-ref closed-over
-                                                                (+ closure-size (quotient (* BITS_PER_ARG i) BITS_PER_MZSHORT)))])
-                                          (bitwise-and (arithmetic-shift byte (- (remainder (* BITS_PER_ARG i) BITS_PER_MZSHORT)))
-                                                       (sub1 (arithmetic-shift 1 BITS_PER_ARG))))))]
-                     [(num->type) (lambda (n)
-                                    (case n
-                                      [(2) 'flonum]
-                                      [(3) 'fixnum]
-                                      [(4) 'extflonum]
-                                      [else (error "invaid type flag")]))]
-                     [(arg-types) (let ([num-params ((if rest? sub1 values) num-params)])
-                                    (for/list ([i (in-range num-params)]) 
-                                      (define v (get-flags i))
-                                      (case v
-                                        [(0) 'val]
-                                        [(1) 'ref]
-                                        [else (num->type v)])))]
-                     [(closure-types) (for/list ([i (in-range closure-size)]
-                                                 [j (in-naturals num-params)])
-                                        (define v (get-flags j))
-                                        (case v
-                                          [(0) 'val/ref]
-                                          [(1) (error "invalid 'ref closure variable")]
-                                          [else (num->type v)]))])
-         (make-lam name
-                   (append
-                    (if (zero? (bitwise-and flags flags CLOS_PRESERVES_MARKS)) null '(preserves-marks))
-                    (if (zero? (bitwise-and flags flags CLOS_IS_METHOD)) null '(is-method))
-                    (if (zero? (bitwise-and flags flags CLOS_SINGLE_RESULT)) null '(single-result))
-                    (if (zero? (bitwise-and flags flags CLOS_NEED_REST_CLEAR)) null '(sfs-clear-rest-args))
-                    (if (and rest? (zero? num-params)) '(only-rest-arg-not-used) null))
-                   (if (and rest? (num-params . > . 0))
-                       (sub1 num-params)
-                       num-params)
-                   arg-types
-                   rest?
-                   (if (= closure-size (vector-length closed-over))
-                       closed-over
-                       (let ([v2 (make-vector closure-size)])
-                         (vector-copy! v2 0 closed-over 0 closure-size)
-                         v2))
-                   closure-types
-                   (and tl-map
-                        (let* ([bits (if (exact-integer? tl-map)
-                                         tl-map
-                                         (for/fold ([i 0]) ([v (in-vector tl-map)]
-                                                            [s (in-naturals)])
-                                           (bitwise-ior i (arithmetic-shift v (* s 16)))))]
-                               [len (integer-length bits)])
-                          (list->set
-                           (let loop ([bit 0])
-                             (cond
-                              [(bit . >= . len) null]
-                              [(bitwise-bit-set? bits bit)
-                               (cons bit (loop (add1 bit)))]
-                              [else (loop (add1 bit))])))))
-                   max-let-depth
-                   body)))]))
-
-(define (read-let-value v)
-  (match v
-    [`(,count ,pos ,boxes? ,rhs . ,body)
-     (make-install-value count pos boxes? rhs body)]))
-
-(define (read-let-void v)
-  (match v
-    [`(,count ,boxes? . ,body)
-     (make-let-void count boxes? body)]))
-
-(define (read-letrec v)
-  (match v
-    [`(,count ,body . ,procs)
-     (make-let-rec procs body)]))
-
-(define (read-with-cont-mark v)
-  (match v
-    [`(,key ,val . ,body)
-     (make-with-cont-mark key val body)]))
-
-(define (read-sequence v) 
-  (make-seq v))
-
-; XXX Allocates unnessary list
-(define (read-define-values v)
-  (make-def-values
-   (cdr (vector->list v))
-   (vector-ref v 0)))
-
-(define (read-define-syntax v)
-  (make-def-syntaxes (list-tail (vector->list v) 4)
-                     (vector-ref v 0)
-                     (vector-ref v 1)
-                     (vector-ref v 2)
-                     (vector-ref v 3)))
-
-(define (read-begin-for-syntax v)
-  (make-seq-for-syntax 
-   (vector-ref v 0)
-   (vector-ref v 1)
-   (vector-ref v 2)
-   (vector-ref v 3)))
-
-(define (read-set! v)
-  (make-assign (cadr v) (cddr v) (car v)))
-
-(define (read-case-lambda v)
-  (make-case-lam (car v) (cdr v)))
-
-(define (read-begin0 v) 
-  (make-beg0 v))
-
-(define (read-boxenv v)
-  (make-boxenv (car v) (cdr v)))
-(define (read-require v)
-  (make-req (cdr v) (car v)))
-(define (read-#%variable-ref v)
-  (make-varref (car v) (cdr v)))
-(define (read-apply-values v)
-  (make-apply-values (car v) (cdr v)))
-(define (read-splice v)
-  (make-splice v))
-
-(define (in-list* l n)
-  (make-do-sequence
-   (lambda ()
-     (values (lambda (l) (apply values (take l n)))
-             (lambda (l) (drop l n))
-             l
-             (lambda (l) (>= (length l) n))
-             (lambda _ #t)
-             (lambda _ #t)))))
-
-(define (split-phase-data rest n)
-  (let loop ([n n] [rest rest] [phase-accum null])
-    (cond
-     [(zero? n)
-      (values (reverse phase-accum) rest)]
-     [else
-      (let ([maybe-indirect (list-ref rest 1)])
-        (if (void? maybe-indirect) 
-            ;; no indirect or protect info:
-            (loop (sub1 n)
-                  (list-tail rest 9)
-                  (cons (take rest 9) phase-accum))
-            ;; has indirect or protect info:
-            (loop (sub1 n)
-                  (list-tail rest (+ 5 8))
-                  (cons (take rest (+ 5 8)) phase-accum))))])))
-      
-(define (read-module v)
-  (match v
-    [`(,submod-path 
-       ,name ,srcname ,self-modidx ,cross-phase?
-       ,pre-submods ,post-submods
-       ,lang-info ,functional? ,et-functional?
-       ,rename ,max-let-depth ,dummy
-       ,prefix ,num-phases
-       ,provide-phase-count . ,rest)
-     (let*-values ([(phase-data rest-module) (split-phase-data rest provide-phase-count)]
-                   [(bodies rest-module) (values (take rest-module num-phases)
-                                                 (drop rest-module num-phases))])
-       (match rest-module
-         [`(,requires ,syntax-requires ,template-requires ,label-requires
-                      ,more-requires-count . ,more-requires)
-          (make-mod (if (null? submod-path)
-                        name 
-                        (if (symbol? name)
-                            (cons name submod-path)
-                            (cons (car name) submod-path)))
-                    srcname self-modidx
-                    prefix
-                    ;; provides:
-                    (for/list ([l (in-list phase-data)])
-                      (let* ([phase (list-ref l 0)]
-                             [has-info? (not (void? (list-ref l 1)))]
-                             [delta (if has-info? 5 1)]
-                             [num-vars (list-ref l (+ delta 6))]
-                             [num-all (list-ref l (+ delta 7))]
-                             [ps (for/list ([name (in-vector (list-ref l (+ delta 5)))]
-                                            [src (in-vector (list-ref l (+ delta 4)))]
-                                            [src-name (in-vector (list-ref l (+ delta 3)))]
-                                            [nom-src (or (list-ref l (+ delta 2))
-                                                         (in-cycle (in-value #f)))]
-                                            [src-phase (or (list-ref l (+ delta 1))
-                                                           (in-cycle (in-value 0)))]
-                                            [protected? (cond
-                                                         [(or (not has-info?)
-                                                              (not (list-ref l 5)))
-                                                          (in-cycle (in-value #f))]
-                                                         [else (list-ref l 5)])])
-                                   (make-provided name src src-name 
-                                                  (or nom-src src)
-                                                  src-phase
-                                                  protected?))])
-                        (list
-                         phase
-                         (take ps num-vars)
-                         (drop ps num-vars))))
-                    ;; requires:
-                    (list*
-                     (cons 0 requires)
-                     (cons 1 syntax-requires)
-                     (cons -1 template-requires)
-                     (cons #f label-requires)
-                     (for/list ([(phase reqs) (in-list* more-requires 2)])
-                       (cons phase reqs)))
-                    ;; body:
-                    (vector->list (last bodies))
-                    ;; syntax-bodies: add phase to each list, break apart
-                    (for/list ([b (cdr (reverse bodies))]
-                               [i (in-naturals 1)])
-                      (cons i
-                            (for/list ([sb (in-vector b)])
-                              (match sb
-                                [`#(,ids ,expr ,max-let-depth ,prefix ,for-stx?)
-                                 (if for-stx?
-                                     (make-seq-for-syntax (list expr) prefix max-let-depth #f)
-                                     (make-def-syntaxes
-                                      (if (list? ids) ids (list ids)) expr prefix max-let-depth #f))]
-                                [else (error 'zo-parse "bad phase ~a body element: ~e" i sb)]))))
-                    ;; unexported:
-                    (for/list ([l (in-list phase-data)]
-                               #:unless (void? (list-ref l 1)))
-                      (let* ([phase (list-ref l 0)]
-                             [indirect-syntax 
-                              ;; could check: (list-ref l 2) should be size of vector:
-                              (list-ref l 1)]
-                             [indirect 
-                              ;; could check: (list-ref l 4) should be size of vector:
-                              (list-ref l 3)])
-                        (list
-                         phase
-                         (vector->list indirect)
-                         (vector->list indirect-syntax))))
-                    max-let-depth
-                    dummy
-                    lang-info
-                    rename
-                    (if cross-phase? '(cross-phase) '())
-                    (map read-module pre-submods)
-                    (map read-module post-submods))]))]))
-(define (read-module-wrap v)
-  v)
-
-(define (read-inline-variant v)
-  (make-inline-variant (car v) (cdr v)))
-
-;; ----------------------------------------
-;; Unmarshal dispatch for various types
-
-;; Type mappings from "stypes.h":
-(define (int->type i)
-  (case i
-    [(0) 'toplevel-type]
-    [(6) 'sequence-type]
-    [(8) 'unclosed-procedure-type]
-    [(9) 'let-value-type]
-    [(10) 'let-void-type]
-    [(11) 'letrec-type]
-    [(13) 'with-cont-mark-type]
-    [(14) 'quote-syntax-type]
-    [(15) 'define-values-type]
-    [(16) 'define-syntaxes-type]
-    [(17) 'begin-for-syntax-type]
-    [(18) 'set-bang-type]
-    [(19) 'boxenv-type]
-    [(20) 'begin0-sequence-type]
-    [(21) 'splice-sequence-type]
-    [(22) 'require-form-type]
-    [(23) 'varref-form-type]
-    [(24) 'apply-values-type]
-    [(25) 'case-lambda-sequence-type]
-    [(26) 'module-type]
-    [(27) 'inline-variant-type]
-    [(35) 'variable-type]
-    [(36) 'module-variable-type]
-    [(114) 'resolve-prefix-type]
-    [(164) 'free-id-info-type]
-    [else (error 'int->type "unknown type: ~e" i)]))
-
-(define type-readers
-  (make-immutable-hash
-   (list
-    (cons 'toplevel-type read-toplevel)
-    (cons 'sequence-type read-sequence)
-    (cons 'unclosed-procedure-type read-unclosed-procedure)
-    (cons 'let-value-type read-let-value)
-    (cons 'let-void-type read-let-void)
-    (cons 'letrec-type read-letrec)
-    (cons 'with-cont-mark-type read-with-cont-mark)
-    (cons 'quote-syntax-type read-topsyntax)
-    (cons 'variable-type read-variable)
-    (cons 'module-variable-type do-not-read-variable)
-    (cons 'compilation-top-type read-compilation-top)
-    (cons 'case-lambda-sequence-type read-case-lambda)
-    (cons 'begin0-sequence-type read-begin0)
-    (cons 'module-type read-module)
-    (cons 'inline-variant-type read-inline-variant)
-    (cons 'resolve-prefix-type read-resolve-prefix)
-    (cons 'free-id-info-type read-free-id-info)
-    (cons 'define-values-type read-define-values)
-    (cons 'define-syntaxes-type read-define-syntax)
-    (cons 'begin-for-syntax-type read-begin-for-syntax)
-    (cons 'set-bang-type read-set!)
-    (cons 'boxenv-type read-boxenv)
-    (cons 'require-form-type read-require)
-    (cons 'varref-form-type read-#%variable-ref)
-    (cons 'apply-values-type read-apply-values)
-    (cons 'splice-sequence-type read-splice))))
-
-(define (get-reader type)
-  (hash-ref type-readers type
-            (λ ()
-              (error 'read-marshalled "reader for ~a not implemented" type))))
-
-;; ----------------------------------------
-;; Lowest layer of bytecode parsing
-
-(define (split-so all-short so)
-  (define n (if (zero? all-short) 4 2))
-  (let loop ([so so])
-    (if (zero? (bytes-length so))
-        null
-        (cons (integer-bytes->integer (subbytes so 0 n) #f #f)
-              (loop (subbytes so n))))))
-
-(define (read-simple-number p)
-  (integer-bytes->integer (read-bytes 4 p) #f #f))
-
-(define-struct cport ([pos #:mutable] shared-start orig-port size bytes-start symtab shared-offsets decoded rns mpis))
-(define (cport-get-bytes cp len)
-  (define port (cport-orig-port cp))
-  (define pos (cport-pos cp))
-  (file-position port (+ (cport-bytes-start cp) pos))
-  (read-bytes len port))
-(define (cport-get-byte cp pos)
-  (define port (cport-orig-port cp))
-  (file-position port (+ (cport-bytes-start cp) pos))
-  (read-byte port))
-
-(define (cport-rpos cp)
-  (+ (cport-pos cp) (cport-shared-start cp)))
-
-(define (cp-getc cp)
-  (when ((cport-pos cp) . >= . (cport-size cp))
-    (error "off the end"))
-  (define r (cport-get-byte cp (cport-pos cp)))
-  (set-cport-pos! cp (add1 (cport-pos cp)))
-  r)
-
-(define small-list-max 50)
-(define raw-cpt-table
-  ;; The "schcpt.h" mapping, earlier entries override later ones
-  `([0  escape]
-    [1  symbol]
-    [2  symref]
-    [3  weird-symbol]
-    [4  keyword]
-    [5  byte-string]
-    [6  string]
-    [7  char]
-    [8  int]
-    [9  null]
-    [10 true]
-    [11 false]
-    [12 void]
-    [13 box]
-    [14 pair]
-    [15 list]
-    [16 vector]
-    [17 hash-table]
-    [18 stx]
-    [19 let-one-typed]
-    [20 marshalled]
-    [21 quote]
-    [22 reference]
-    [23 local]
-    [24 local-unbox]
-    [25 svector]
-    [26 application]
-    [27 let-one]
-    [28 branch]
-    [29 module-index]
-    [30 module-var]
-    [31 path]
-    [32 closure]
-    [33 delayed]
-    [34 prefab]
-    [35 let-one-unused]
-    [36 60 small-number]
-    [60 80 small-symbol]
-    [80 92 small-marshalled]
-    [92 ,(+ 92 small-list-max) small-proper-list]
-    [,(+ 92 small-list-max) 192 small-list]
-    [192 207 small-local]
-    [207 222 small-local-unbox]
-    [222 247 small-svector]
-    [248 small-application2]
-    [249 small-application3]
-    [247 255 small-application]))
-
-;; To accelerate cpt-table lookup, we flatten out the above
-;; list into a vector:
-(define cpt-table (make-vector 256 #f))
-(for ([ent (in-list (reverse raw-cpt-table))])
-  ;; reverse order so that early entries override later ones.
-  (match ent
-    [(list k sym)    (vector-set! cpt-table k (cons k sym))]
-    [(list k k* sym) (for ([i (in-range k k*)])
-                       (vector-set! cpt-table i (cons k sym)))]))
-
-(define (read-compact-bytes port c)
-  (begin0
-    (cport-get-bytes port c)
-    (set-cport-pos! port (+ c (cport-pos port)))))
-
-(define (read-compact-chars port c)
-  (bytes->string/utf-8 (read-compact-bytes port c)))
-
-(define (read-compact-list c proper port)
-  (cond [(= 0 c)
-         (if proper null (read-compact port))]
-        [else (cons (read-compact port) (read-compact-list (sub1 c) proper port))]))
-
-(define (read-compact-number port)
-  (define flag (cp-getc port))
-  (cond [(< flag 128)
-         flag]
-        [(zero? (bitwise-and flag #x40))
-         (let ([a (cp-getc port)])
-           (+ (a . << . 6) (bitwise-and flag 63)))]
-        [(zero? (bitwise-and flag #x20))
-         (- (bitwise-and flag #x1F))]
-        [else
-         (let ([a (cp-getc port)]
-               [b (cp-getc port)]
-               [c (cp-getc port)]
-               [d (cp-getc port)])
-           (let ([n (integer-bytes->integer (bytes a b c d) #f #f)])
-             (if (zero? (bitwise-and flag #x10))
-                 (- n)
-                 n)))]))
-
-(define (read-compact-svector port n)
-  (define v (make-vector n))
-  (for ([i (in-range n)])
-    (vector-set! v (sub1 (- n i)) (read-compact-number port)))
-  v)
-
-(define (read-marshalled type port)
-  (let* ([type (if (number? type) (int->type type) type)]
-         [l (read-compact port)]
-         [reader (get-reader type)])
-    (reader l)))
-
-(define SCHEME_LOCAL_TYPE_FLONUM 1)
-(define SCHEME_LOCAL_TYPE_FIXNUM 2)
-(define SCHEME_LOCAL_TYPE_EXTFLONUM 3)
-
-(define (make-local unbox? pos flags)
-  (define SCHEME_LOCAL_CLEAR_ON_READ 1)
-  (define SCHEME_LOCAL_OTHER_CLEARS 2)
-  (define SCHEME_LOCAL_TYPE_OFFSET 2)
-  (make-localref unbox? pos 
-                 (= flags SCHEME_LOCAL_CLEAR_ON_READ)
-                 (= flags SCHEME_LOCAL_OTHER_CLEARS)
-                 (let ([t (- flags SCHEME_LOCAL_TYPE_OFFSET)])
-                   (cond
-                    [(= t SCHEME_LOCAL_TYPE_FLONUM) 'flonum]
-                    [(= t SCHEME_LOCAL_TYPE_EXTFLONUM) 'extflonum]
-                    [(= t SCHEME_LOCAL_TYPE_FIXNUM) 'fixnum]
-                    [else #f]))))
-
-(define (a . << . b)
-  (arithmetic-shift a b))
-
-(define-struct not-ready ())
-
-;; ----------------------------------------
-;; Syntax unmarshaling
-(define (make-memo) (make-weak-hash))
-(define (with-memo* mt arg thnk)
-  (hash-ref! mt arg thnk))
-(define-syntax-rule (with-memo mt arg body ...)
-  (with-memo* mt arg (λ () body ...)))
-
-(define (decode-mark-map alist)
-  alist)
-
-(define stx-memo (make-memo))
-; XXX More memo use
-(define (decode-stx cp v)
-  (with-memo stx-memo v
-    (if (integer? v)
-        (unmarshal-stx-get/decode cp v decode-stx) 
-        (let loop ([v v])
-          (let-values ([(tamper-status v encoded-wraps)
-                        (match v
-                          [`#((,datum . ,wraps)) (values 'tainted datum wraps)]
-                          [`#((,datum . ,wraps) #f) (values 'armed datum wraps)]
-                          [`(,datum . ,wraps) (values 'clean datum wraps)]
-                          [else (error 'decode-wraps "bad datum+wrap: ~.s" v)])])
-            (let* ([wraps (decode-wraps cp encoded-wraps)]
-                   [wrapped-memo (make-memo)]
-                   [add-wrap (lambda (v) (with-memo wrapped-memo v (make-wrapped v wraps tamper-status)))])
-              (cond
-                [(pair? v)
-                 (if (eq? #t (car v))
-                     ;; Share decoded wraps with all nested parts.
-                     (let iloop ([v (cdr v)])
-                       (cond
-                         [(pair? v) 
-                          (let ploop ([v v])
-                            (cond
-                              [(null? v) null]
-                              [(pair? v) (add-wrap (cons (iloop (car v)) (ploop (cdr v))))]
-                              [else (iloop v)]))]
-                         [(box? v) (add-wrap (box (iloop (unbox v))))]
-                         [(vector? v)
-                          (add-wrap (list->vector (map iloop (vector->list v))))]
-                         [(hash? v)
-                          (add-wrap (for/hash ([(k v) (in-hash v)])
-                                      (values k (iloop v))))]
-                         [(prefab-struct-key v)
-                          => (lambda (k)
-                               (add-wrap
-                                (apply
-                                 make-prefab-struct 
-                                 k
-                                 (map iloop (struct->list v)))))]
-                         [else (add-wrap v)]))
-                     ;; Decode sub-elements that have their own wraps:
-                     (let-values ([(v counter) (if (exact-integer? (car v))
-                                                   (values (cdr v) (car v))
-                                                   (values v -1))])
-                       (add-wrap
-                        (let ploop ([v v][counter counter])
-                          (cond
-                            [(null? v) null]
-                            [(or (not (pair? v)) (zero? counter)) (loop v)]
-                            [(pair? v) (cons (loop (car v))
-                                             (ploop (cdr v) (sub1 counter)))])))))]
-                [(box? v) (add-wrap (box (loop (unbox v))))]
-                [(vector? v)
-                 (add-wrap (list->vector (map loop (vector->list v))))]
-                [(hash? v)
-                 (add-wrap (for/hash ([(k v) (in-hash v)])
-                             (values k (loop v))))]
-                [(prefab-struct-key v)
-                 => (lambda (k)
-                      (add-wrap
-                       (apply
-                        make-prefab-struct 
-                        k
-                        (map loop (struct->list v)))))]
-                [else (add-wrap v)])))))))
-
-(define wrape-memo (make-memo))
-(define (decode-wrape cp a)
-  (define (aloop a) (decode-wrape cp a))
-  (with-memo wrape-memo a
-    ; A wrap-elem is either
-    (cond
-      ; A reference 
-      [(integer? a) 
-       (unmarshal-stx-get/decode cp a (lambda (cp v) (aloop v)))]
-      ; A mark wraped in a list
-      [(and (pair? a) (number? (car a)) (null? (cdr a)))
-       (make-wrap-mark (car a))]
-      
-      [(vector? a) 
-       (make-lexical-rename (vector-ref a 0) (vector-ref a 1)
-                            (let ([top (+ (/ (- (vector-length a) 2) 2) 2)])
-                              (let loop ([i 2])
-                                (if (= i top)
-                                    null
-                                    (cons (cons (vector-ref a i)
-                                                (vector-ref a (+ (- top 2) i)))
-                                          (loop (+ i 1)))))))]
-      [(pair? a)
-       (let-values ([(plus-kern? a) (if (eq? (car a) #t)
-                                        (values #t (cdr a))
-                                        (values #f a))])
-         (match a
-           [`(,phase ,kind ,set-id ,maybe-unmarshals . ,renames)
-            (let-values ([(unmarshals renames mark-renames)
-                          (if (vector? maybe-unmarshals)
-                              (values null maybe-unmarshals renames)
-                              (values maybe-unmarshals
-                                      (car renames)
-                                      (cdr renames)))])
-              (make-module-rename phase 
-                                  (if kind 'marked 'normal)
-                                  set-id
-                                  (map (curry decode-all-from-module cp) unmarshals)
-                                  (decode-renames renames)
-                                  mark-renames
-                                  (and plus-kern? 'plus-kern)))]
-           [else (error "bad module rename: ~e" a)]))]
-      [(boolean? a)
-       (make-top-level-rename a)]
-      [(symbol? a)
-       (make-mark-barrier a)]
-      [(box? a)
-       (match (unbox a)
-         [(list (? symbol?) ...) (make-prune (unbox a))]
-         [`#(,amt ,src ,dest #f #f ,cancel-id) 
-          (make-phase-shift amt 
-                            (parse-module-path-index cp src)
-                            (parse-module-path-index cp dest)
-                            cancel-id)]
-         [else (error 'parse "bad phase shift: ~e" a)])]
-      [else (error 'decode-wraps "bad wrap element: ~e" a)])))
-
-(define (afm-context? v)
-  (or (and (list? v) (andmap exact-integer? v))
-      (and (vector? v) 
-           (= 2 (vector-length v))
-           (list? (vector-ref v 0))
-           (andmap exact-integer? (vector-ref v 0)))))
-
-(define all-from-module-memo (make-memo))
-(define (decode-all-from-module cp afm)
-  (define (phase? v)
-    (or (number? v) (not v)))
-  (with-memo all-from-module-memo afm
-    (match afm
-      [(list* path (? phase? phase) (? phase? src-phase) (list exn ...) prefix)
-       (make-all-from-module
-        (parse-module-path-index cp path)
-        phase src-phase exn prefix null)]
-      [(list* path (? phase? phase) (? afm-context? context) (? phase? src-phase))
-       (make-all-from-module
-        (parse-module-path-index cp path)
-        phase src-phase null #f context)]
-      [(list* path (? phase? phase) (? phase? src-phase))
-       (make-all-from-module
-        (parse-module-path-index cp path)
-        phase src-phase null #f null)])))
-
-(define wraps-memo (make-memo))
-(define (decode-wraps cp w)
-  (with-memo wraps-memo w
-    ; A wraps is either a indirect reference or a list of wrap-elems (from stxobj.c:252)
-    (if (integer? w)
-        (unmarshal-stx-get/decode cp w decode-wraps)
-        (map (curry decode-wrape cp) w))))
-
-(define (in-vector* v n)
-  (make-do-sequence
-   (λ ()
-     (values (λ (i) (vector->values v i (+ i n)))
-             (λ (i) (+ i n))
-             0
-             (λ (i) (>= (vector-length v) (+ i n)))
-             (λ _ #t)
-             (λ _ #t)))))
-
-(define nominal-path-memo (make-memo))
-(define (decode-nominal-path np)
-  (with-memo nominal-path-memo np
-    (match np
-      [(cons nominal-path (cons import-phase nominal-phase))
-       (make-phased-nominal-path nominal-path import-phase nominal-phase)]
-      [(cons nominal-path import-phase)
-       (make-imported-nominal-path nominal-path import-phase)]
-      [nominal-path
-       (make-simple-nominal-path nominal-path)])))
-
-; XXX Weird test copied from C code. Matthew?
-(define (nom_mod_p p)
-  (and (pair? p) (not (pair? (cdr p))) (not (symbol? (cdr p))))) 
-
-(define rename-v-memo (make-memo))
-(define (decode-rename-v v)
-  (with-memo rename-v-memo v
-    (match v
-      [(list-rest path phase export-name nominal-path nominal-export-name)
-       (make-phased-module-binding path
-                                   phase
-                                   export-name
-                                   (decode-nominal-path nominal-path) 
-                                   nominal-export-name)]
-      [(list-rest path export-name nominal-path nominal-export-name)
-       (make-exported-nominal-module-binding path
-                                             export-name 
-                                             (decode-nominal-path nominal-path)
-                                             nominal-export-name)]
-      [(cons module-path-index (? nom_mod_p nominal-path))
-       (make-nominal-module-binding module-path-index (decode-nominal-path nominal-path))]
-      [(cons module-path-index export-name)
-       (make-exported-module-binding module-path-index export-name)]
-      [module-path-index 
-       (make-simple-module-binding module-path-index)])))
-
-(define renames-memo (make-memo))
-(define (decode-renames renames)
-  (with-memo renames-memo renames
-    (for/list ([(k v) (in-vector* renames 2)])
-      (cons k (decode-rename-v v)))))
-
-(define (parse-module-path-index cp s)
-  s)
-
-;; ----------------------------------------
-;; Main parsing loop
-
-(define (read-compact cp)
-  (let loop ([need-car 0] [proper #f])
-    (define ch (cp-getc cp))
-    (define-values (cpt-start cpt-tag)
-      (let ([x (vector-ref cpt-table ch)])
-        (unless x (error 'read-compact "unknown code : ~a" ch))
-        (values (car x) (cdr x))))
-    (define v
-      (case cpt-tag
-        [(delayed)
-         (let ([pos (read-compact-number cp)])
-           (read-sym cp pos))]
-        [(escape)
-         (let* ([len (read-compact-number cp)]
-                [s (cport-get-bytes cp len)])
-           (set-cport-pos! cp (+ (cport-pos cp) len))
-           (parameterize ([read-accept-compiled #t]
-                          [read-accept-bar-quote #t]
-                          [read-accept-box #t]
-                          [read-accept-graph #t]
-                          [read-case-sensitive #t]
-                          [read-square-bracket-as-paren #t]
-                          [read-curly-brace-as-paren #t]
-                          [read-decimal-as-inexact #t]
-                          [read-accept-dot #t]
-                          [read-accept-infix-dot #t]
-                          [read-accept-quasiquote #t]
-                          [current-readtable
-                           (make-readtable 
-                            #f
-                            #\^
-                            'dispatch-macro
-                            (lambda (char port src line col pos)
-                              (let ([b (read port)])
-                                (unless (bytes? b)
-                                  (error 'read-escaped-path
-                                         "expected a byte string after #^"))
-                                (let ([p (bytes->path b)])
-                                  (if (and (relative-path? p)
-                                           (current-load-relative-directory))
-                                    (build-path (current-load-relative-directory) p)
-                                    p)))))])
-             (read/recursive (open-input-bytes s))))]
-        [(reference)
-         (make-primval (read-compact-number cp))]
-        [(small-list small-proper-list)
-         (let* ([l (- ch cpt-start)]
-                [ppr (eq? cpt-tag 'small-proper-list)])
-           (if (positive? need-car)
-             (if (= l 1)
-               (cons (read-compact cp)
-                     (if ppr null (read-compact cp)))
-               (read-compact-list l ppr cp))
-             (loop l ppr)))]
-        [(let-one let-one-typed let-one-unused)
-         (make-let-one (read-compact cp) (read-compact cp)
-                       (and (eq? cpt-tag 'let-one-typed)
-                            (case (read-compact-number cp)
-                              [(1) 'flonum]
-                              [(2) 'fixnum]
-                              [(3) 'extflonum]
-                              [else #f]))
-                       (eq? cpt-tag 'let-one-unused))]
-        [(branch)
-         (make-branch (read-compact cp) (read-compact cp) (read-compact cp))]
-        [(module-index) 
-         (define name (read-compact cp))
-         (define base (read-compact cp))
-         (if (or name base)
-             (module-path-index-join name base)
-             (module-path-index-join #f #f (read-compact cp)))]
-        [(module-var)
-         (let ([mod (read-compact cp)]
-               [var (read-compact cp)]
-               [shape (read-compact cp)]
-               [pos (read-compact-number cp)])
-           (let-values ([(flags mod-phase pos)
-                         (let loop ([pos pos])
-                           (cond
-                            [(pos . < . -3)
-                             (let ([real-pos (read-compact-number cp)])
-                               (define-values (_ m p) (loop real-pos))
-                               (values (- (+ pos 3)) m p))]
-                            [(= pos -2)
-                             (values 0 (read-compact-number cp) (read-compact-number cp))]
-                            [else (values 0 0 pos)]))])
-             (make-module-variable mod var pos mod-phase
-                                   (cond
-                                    [shape
-                                     (cond
-                                      [(number? shape) 
-                                       (define n (arithmetic-shift shape -1))
-                                       (make-function-shape (if (negative? n)
-                                                                (make-arity-at-least (sub1 (- n)))
-                                                                n)
-                                                            (odd? shape))]
-                                      [(and (symbol? shape)
-                                            (regexp-match? #rx"^struct" (symbol->string shape)))
-                                       (define n (string->number (substring (symbol->string shape) 6)))
-                                       (case (bitwise-and n #x7)
-                                         [(0) (make-struct-type-shape (arithmetic-shift n -3))]
-                                         [(1) (make-constructor-shape (arithmetic-shift n -3))]
-                                         [(2) (make-predicate-shape)]
-                                         [(3) (make-accessor-shape (arithmetic-shift n -3))]
-                                         [(4) (make-mutator-shape (arithmetic-shift n -3))]
-                                         [else (make-struct-other-shape)])]
-                                      [else
-                                       ;; parse symbol as ":"-separated sequence of arities
-                                       (make-function-shape
-                                        (for/list ([s (regexp-split #rx":" (symbol->string shape))])
-                                          (define i (string->number s))
-                                          (if (negative? i)
-                                              (make-arity-at-least (sub1 (- i)))
-                                              i))
-                                        #f)])]
-                                    [(not (zero? (bitwise-and #x1 flags))) 'constant]
-                                    [(not (zero? (bitwise-and #x2 flags))) 'fixed]
-                                    [else #f]))))]
-        [(local-unbox)
-         (let* ([p* (read-compact-number cp)]
-                [p (if (< p* 0) (- (add1 p*)) p*)]
-                [flags (if (< p* 0) (read-compact-number cp) 0)])
-           (make-local #t p flags))]
-        [(path)
-         (let* ([p (bytes->path (read-compact-bytes cp (read-compact-number cp)))])
-           (if (relative-path? p)
-             (path->complete-path p (or (current-load-relative-directory)
-                                        (current-directory)))
-             p))]
-        [(small-number)
-         (let ([l (- ch cpt-start)])
-           l)]
-        [(int)
-         (read-compact-number cp)]
-        [(false) #f]
-        [(true) #t]
-        [(null) null]
-        [(void) (void)]
-        [(vector)
-         ; XXX We should provide build-immutable-vector and write this as:
-         #;(build-immutable-vector (read-compact-number cp)
-                                   (lambda (i) (read-compact cp)))
-         ; XXX Now it allocates an unnessary list AND vector
-         (let* ([n (read-compact-number cp)]
-                [lst (for/list ([i (in-range n)]) (read-compact cp))])
-           (vector->immutable-vector (list->vector lst)))]
-        [(pair)
-         (let* ([a (read-compact cp)]
-                [d (read-compact cp)])
-           (cons a d))]
-        [(list)
-         (let ([len (read-compact-number cp)])
-           (let loop ([i len])
-             (if (zero? i)
-               (read-compact cp)
-               (list* (read-compact cp)
-                      (loop (sub1 i))))))]
-        [(prefab)
-         (let ([v (read-compact cp)])
-           ; XXX This is faster than apply+->list, but can we avoid allocating the vector?
-           (call-with-values (lambda () (vector->values v))
-                             make-prefab-struct))]
-        [(hash-table)
-         ; XXX Allocates an unnessary list (maybe use for/hash(eq))
-         (let ([eq (read-compact-number cp)]
-               [len (read-compact-number cp)])
-           ((case eq
-              [(0) make-hasheq-placeholder]
-              [(1) make-hash-placeholder]
-              [(2) make-hasheqv-placeholder])
-            (for/list ([i (in-range len)])
-              (cons (read-compact cp)
-                    (read-compact cp)))))]
-        [(marshalled) (read-marshalled (read-compact-number cp) cp)]
-        [(stx)
-         (let ([v (make-reader-graph (read-compact cp))])
-           (make-stx (decode-stx cp v)))]
-        [(local local-unbox)
-         (let ([c (read-compact-number cp)]
-               [unbox? (eq? cpt-tag 'local-unbox)])
-           (if (negative? c)
-             (make-local unbox? (- (add1 c)) (read-compact-number cp))
-             (make-local unbox? c 0)))]
-        [(small-local)
-         (make-local #f (- ch cpt-start) 0)]
-        [(small-local-unbox)
-         (make-local #t (- ch cpt-start) 0)]
-        [(small-symbol)
-         (let ([l (- ch cpt-start)])
-           (string->symbol (read-compact-chars cp l)))]
-        [(symbol)
-         (let ([l (read-compact-number cp)])
-           (string->symbol (read-compact-chars cp l)))]
-        [(keyword)
-         (let ([l (read-compact-number cp)])
-           (string->keyword (read-compact-chars cp l)))]
-        [(byte-string)
-         (let ([l (read-compact-number cp)])
-           (read-compact-bytes cp l))]
-        [(string)
-         (let ([l (read-compact-number cp)]
-               [cl (read-compact-number cp)])
-           (read-compact-chars cp l))]
-        [(char)
-         (integer->char (read-compact-number cp))]
-        [(box)
-         (box (read-compact cp))]
-        [(quote)
-         (make-reader-graph 
-          ;; Nested escapes need to share graph references. So get inside the
-          ;;  read where `read/recursive' can be used:
-          (let ([rt (current-readtable)])
-            (parameterize ([current-readtable (make-readtable
-                                               #f
-                                               #\x 'terminating-macro
-                                               (lambda args
-                                                 (parameterize ([current-readtable rt])
-                                                   (read-compact cp))))])
-              (read (open-input-bytes #"x")))))]
-        [(symref)
-         (let* ([l (read-compact-number cp)])
-           (read-sym cp l))]
-        [(weird-symbol)
-         (let ([uninterned (read-compact-number cp)]
-               [str (read-compact-chars cp (read-compact-number cp))])
-           (if (= 1 uninterned)
-             ; uninterned is equivalent to weird in the C implementation 
-             (string->uninterned-symbol str)
-             ; unreadable is equivalent to parallel in the C implementation
-             (string->unreadable-symbol str)))]
-        [(small-marshalled)
-         (read-marshalled (- ch cpt-start) cp)]
-        [(small-application2)
-         (make-application (read-compact cp)
-                           (list (read-compact cp)))]
-        [(small-application3)
-         (make-application (read-compact cp)
-                           (list (read-compact cp)
-                                 (read-compact cp)))]
-        [(small-application)
-         (let ([c (add1 (- ch cpt-start))])
-           (make-application (read-compact cp)
-                             (for/list ([i (in-range (sub1 c))])
-                               (read-compact cp))))]
-        [(application)
-         (let ([c (read-compact-number cp)])
-           (make-application (read-compact cp)
-                             (for/list ([i (in-range c)])
-                               (read-compact cp))))]
-        [(closure)
-         (read-compact-number cp) ; symbol table pos. our marshaler will generate this
-         (let ([v (read-compact cp)])
-           (make-closure
-            v
-            (gensym
-             (let ([s (lam-name v)])
-               (cond
-                 [(symbol? s) s]
-                 [(vector? s) (vector-ref s 0)]
-                 [else 'closure])))))]
-        [(svector)
-         (read-compact-svector cp (read-compact-number cp))]
-        [(small-svector)
-         (read-compact-svector cp (- ch cpt-start))]
-        [else (error 'read-compact "unknown tag ~a" cpt-tag)]))
-    (cond
-      [(zero? need-car) v]
-      [(and proper (= need-car 1))
-       (cons v null)]
-      [else
-       (cons v (loop (sub1 need-car) proper))])))
-
-(define (unmarshal-stx-get/decode cp pos decode-stx)
-  (define v2 (read-sym cp pos))
-  (define decoded? (vector-ref (cport-decoded cp) pos))
-  (if decoded?
-      v2
-      (let ([dv2 (decode-stx cp v2)])
-        (symtab-write! cp pos dv2)
-        (vector-set! (cport-decoded cp) pos #t)
-        dv2)))
-
-(define (symtab-write! cp i v)
-  (placeholder-set! (vector-ref (cport-symtab cp) i) v))
-
-(define (symtab-lookup cp i)
-  (vector-ref (cport-symtab cp) i))
-
-(require unstable/markparam)
-(define read-sym-mark (mark-parameter))
-(define (read-sym cp i)
-  (define ph (symtab-lookup cp i))
-  ; We are reading this already, so return the placeholder
-  (if (memq i (mark-parameter-all read-sym-mark))
-      ph
-      ; Otherwise, try to read it and return the real thing
-      (let ([vv (placeholder-get ph)])
-        (when (not-ready? vv)
-          (let ([save-pos (cport-pos cp)])
-            (set-cport-pos! cp (vector-ref (cport-shared-offsets cp) (sub1 i)))
-            (mark-parameterize
-             ([read-sym-mark i])
-             (let ([v (read-compact cp)])
-               (placeholder-set! ph v)))
-            (set-cport-pos! cp save-pos)))
-        (placeholder-get ph))))
-
-(define (read-prefix port)
-  ;; skip the "#~"
-  (unless (equal? #"#~" (read-bytes 2 port))
-    (error 'zo-parse "not a bytecode stream"))
-
-  (define version (read-bytes (min 63 (read-byte port)) port))
-
-  (read-char port))
-
-;; path -> bytes
-;; implementes read.c:read_compiled
-(define (zo-parse [port (current-input-port)])
-  (define init-pos (file-position port))
-
-  (define mode (read-prefix port))
-
-  (case mode
-    [(#\T) (zo-parse-top port)]
-    [(#\D)
-     (struct mod-info (name start len))
-     (define mod-infos
-       (sort
-        (for/list ([i (in-range (read-simple-number port))])
-          (define size (read-simple-number port))
-          (define name (read-bytes size port))
-          (define start (read-simple-number port))
-          (define len (read-simple-number port))
-          (define left (read-simple-number port))
-          (define right (read-simple-number port))
-          (define name-p (open-input-bytes name))
-          (mod-info (let loop ()
-                      (define c (read-byte name-p))
-                      (if (eof-object? c)
-                          null
-                          (cons (string->symbol
-                                 (bytes->string/utf-8 (read-bytes (if (= c 255)
-                                                                      (read-simple-number port)
-                                                                      c)
-                                                                  name-p)))
-                                (loop))))
-                    start
-                    len))
-        <
-        #:key mod-info-start))
-     (define tops
-       (for/list ([mod-info (in-list mod-infos)])
-         (define pos (file-position port))
-         (unless (= (- pos init-pos) (mod-info-start mod-info))
-           (error 'zo-parse 
-                  "next module expected at ~a, currently at ~a"
-                  (+ init-pos (mod-info-start mod-info)) pos))
-         (unless (eq? (read-prefix port) #\T)
-           (error 'zo-parse "expected a module"))
-         (define top (zo-parse-top port #f))
-         (define m (compilation-top-code top))
-         (unless (mod? m)
-           (error 'zo-parse "expected a module"))
-         (unless (equal? (mod-info-name mod-info)
-                         (if (symbol? (mod-name m))
-                             '()
-                             (cdr (mod-name m))))
-           (error 'zo-parse "module name mismatch"))
-         top))
-     (define avail (for/hash ([mod-info (in-list mod-infos)]
-                              [top (in-list tops)])
-                     (values (mod-info-name mod-info) top)))
-     (unless (hash-ref avail '() #f)
-       (error 'zo-parse "no root module in directory"))
-     (define-values (pre-subs post-subs seen)
-       (for/fold ([pre-subs (hash)] [post-subs (hash)] [seen (hash)]) ([mod-info (in-list mod-infos)])
-         (if (null? (mod-info-name mod-info))
-             (values pre-subs post-subs (hash-set seen '() #t))
-             (let ()
-               (define name (mod-info-name mod-info))
-               (define prefix (take name (sub1 (length name))))
-               (unless (hash-ref avail prefix #f)
-                 (error 'zo-parse "no parent module for ~s" name))
-               (define (add subs)
-                 (hash-set subs prefix (cons name (hash-ref subs prefix '()))))
-               (define new-seen (hash-set seen name #t))
-               (if (hash-ref seen prefix #f)
-                   (values pre-subs (add post-subs) new-seen)
-                   (values (add pre-subs) post-subs new-seen))))))
-     (define (get-all prefix)
-       (struct-copy mod 
-                    (compilation-top-code (hash-ref avail prefix))
-                    [pre-submodules (map get-all (reverse (hash-ref pre-subs prefix '())))]
-                    [post-submodules (map get-all (reverse (hash-ref post-subs prefix '())))]))
-     (struct-copy compilation-top (hash-ref avail '())
-                  [code (get-all '())])]
-    [else
-     (error 'zo-parse "bad file format specifier")]))
-
-(define (zo-parse-top [port (current-input-port)] [check-end? #t])
-
-  ;; Skip module hash code
-  (read-bytes 20 port)
-
-  (define symtabsize (read-simple-number port))
-
-  (define all-short (read-byte port))
-
-  (define cnt (* (if (not (zero? all-short)) 2 4)
-                 (sub1 symtabsize)))
-
-  (define so (read-bytes cnt port))
-
-  (define so* (list->vector (split-so all-short so)))
-
-  (define shared-size (read-simple-number port))
-  (define size* (read-simple-number port))
-
-  (when (shared-size . >= . size*) 
-    (error 'zo-parse "Non-shared data segment start is not after shared data segment (according to offsets)"))
-
-  (define rst-start (file-position port))
-
-  (file-position port (+ rst-start size*))
- 
-  (when check-end?
-    (unless (eof-object? (read-byte port))
-      (error 'zo-parse "File too big")))
-
-  (define nr (make-not-ready))
-  (define symtab
-    (build-vector symtabsize (λ (i) (make-placeholder nr))))
-
-  (define cp
-    (make-cport 0 shared-size port size* rst-start symtab so*
-                (make-vector symtabsize #f) (make-hash) (make-hash)))
-
-  (for ([i (in-range 1 symtabsize)])
-    (read-sym cp i))
-
-  #;(printf "Parsed table:\n")
-  #;(for ([(i v) (in-dict (cport-symtab cp))])
-      (printf "~a = ~a\n" i (placeholder-get v)))
-  (set-cport-pos! cp shared-size)
-  (make-reader-graph (read-marshalled 'compilation-top-type cp)))
-
-;; ----------------------------------------
-
-#;
-(begin
-  (define (compile/write sexp)
-    (define s (open-output-bytes))
-    (write (parameterize ([current-namespace (make-base-namespace)])
-             (eval '(require (for-syntax scheme/base)))
-             (compile sexp))
-           s)
-    (get-output-bytes s))
-
-  (define (compile/parse sexp)
-    (let* ([bs (compile/write sexp)]
-           [p (open-input-bytes bs)])
-      (zo-parse p)))
-
-  #;(compile/parse #s(foo 10 13))
-  (zo-parse (open-input-file "/home/mflatt/proj/plt/collects/scheme/private/compiled/more-scheme_ss.zo"))
-  )
diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/zo-structs.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/zo-structs.rkt
deleted file mode 100644
index 52be542051..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/compiler/zo-structs.rkt
+++ /dev/null
@@ -1,275 +0,0 @@
-#lang scheme/base
-(require scheme/match
-         scheme/contract
-         scheme/list
-         racket/set)
-
-#| Unresolved issues
-
-  what are the booleans in lexical-rename?
-
-  contracts that are probably too generous:
-  prefix-stxs
-  provided-nom-src
-  lam-num-params
-  lexical-rename-alist
-  all-from-module
-
-|#
-
-;; ----------------------------------------
-;;  Structures to represent bytecode
-
-(define-syntax-rule (define-form-struct* id id+par ([field-id field-contract] ...))
-  (begin
-    (define-struct id+par (field-id ...) #:prefab)
-    #;(provide (struct-out id))
-    (provide/contract
-     [struct id ([field-id field-contract] ...)])))
-
-(define-struct zo () #:prefab)
-(provide (struct-out zo))
-
-(define-syntax define-form-struct
-  (syntax-rules ()
-    [(_ (id sup) . rest)
-     (define-form-struct* id (id sup) . rest)]
-    [(_ id . rest)
-     (define-form-struct* id (id zo) . rest)]))
-
-(define-form-struct function-shape ([arity procedure-arity?]
-                                    [preserves-marks? boolean?]))
-
-(define-form-struct struct-shape ())
-(define-form-struct (constructor-shape struct-shape) ([arity exact-nonnegative-integer?]))
-(define-form-struct (predicate-shape struct-shape) ())
-(define-form-struct (accessor-shape struct-shape) ([field-count exact-nonnegative-integer?]))
-(define-form-struct (mutator-shape struct-shape) ([field-count exact-nonnegative-integer?]))
-(define-form-struct (struct-type-shape struct-shape) ([field-count exact-nonnegative-integer?]))
-(define-form-struct (struct-other-shape struct-shape) ())
-
-;; In toplevels of resove prefix:
-(define-form-struct global-bucket ([name symbol?])) ; top-level binding
-(define-form-struct module-variable ([modidx module-path-index?] 
-                                     [sym symbol?] 
-                                     [pos exact-integer?] 
-                                     [phase exact-nonnegative-integer?]
-                                     [constantness (or/c #f 'constant 'fixed 
-                                                         function-shape? 
-                                                         struct-shape?)]))
-
-;; Syntax object
-(define ((alist/c k? v?) l)
-  (let loop ([l l])
-    (match l
-      [(list) #t]
-      [(list* (? k?) (? v?) l)
-       (loop l)]
-      [_ #f])))
-
-(define mark-map? 
-  (alist/c number? module-path-index?)
-  #;(hash/c number? module-path-index?))
-
-(define-form-struct wrap ())
-(define-form-struct wrapped ([datum any/c] 
-                             [wraps (listof wrap?)] 
-                             [tamper-status (or/c 'clean 'armed 'tainted)]))
-
-;; In stxs of prefix:
-(define-form-struct stx ([encoded wrapped?]))
-
-(define-form-struct prefix ([num-lifts exact-nonnegative-integer?] 
-                            [toplevels (listof (or/c #f symbol? global-bucket? module-variable?))] 
-                            [stxs list?]))   ; should be (listof stx?) sets up top-level and syntax-object array
-
-(define-form-struct form ())
-(define-form-struct (expr form) ())
-
-(define-form-struct compilation-top ([max-let-depth exact-nonnegative-integer?] [prefix prefix?] [code (or/c form? any/c)])) ; compiled code always wrapped with this
-
-;; A provided identifier
-(define-form-struct provided ([name symbol?] 
-                              [src (or/c module-path-index? #f)] 
-                              [src-name symbol?] 
-                              [nom-src any/c] ; should be (or/c module-path-index? #f)
-                              [src-phase exact-nonnegative-integer?] 
-                              [protected? boolean?]))
-
-(define-form-struct (toplevel expr) ([depth exact-nonnegative-integer?] 
-                                     [pos exact-nonnegative-integer?] 
-                                     [const? boolean?] 
-                                     [ready? boolean?]))  ; access binding via prefix array (which is on stack)
-
-(define-form-struct (seq form) ([forms (listof (or/c form? any/c))])) ; `begin'
-(define-form-struct (seq-for-syntax form) ([forms (listof (or/c form? any/c))] ; `begin-for-syntax'
-                                           [prefix prefix?] 
-                                           [max-let-depth exact-nonnegative-integer?]
-                                           [dummy (or/c toplevel? #f)]))
-
-(define-form-struct (inline-variant form) ([direct expr?]
-                                           [inline expr?]))
-
-;; Definitions (top level or within module):
-(define-form-struct (def-values form) ([ids (listof (or/c toplevel? symbol?))]
-                                       [rhs (or/c expr? seq? inline-variant? any/c)])) 
-(define-form-struct (def-syntaxes form) ([ids (listof (or/c toplevel? symbol?))]
-                                         [rhs (or/c expr? seq? any/c)] 
-                                         [prefix prefix?] 
-                                         [max-let-depth exact-nonnegative-integer?]
-                                         [dummy (or/c toplevel? #f)]))
-
-(define-form-struct (mod form) ([name (or/c symbol? (listof symbol?))]
-                                [srcname symbol?]
-                                [self-modidx module-path-index?] 
-                                [prefix prefix?] 
-                                [provides (listof (list/c (or/c exact-integer? #f)
-                                                          (listof provided?)
-                                                          (listof provided?)))] 
-                                [requires (listof (cons/c (or/c exact-integer? #f)
-                                                          (listof module-path-index?)))]
-                                [body (listof (or/c form? any/c))]
-                                [syntax-bodies (listof (cons/c exact-positive-integer?
-                                                               (listof (or/c def-syntaxes? seq-for-syntax?))))]
-                                [unexported (listof (list/c exact-nonnegative-integer?
-                                                            (listof symbol?)
-                                                            (listof symbol?)))]
-                                [max-let-depth exact-nonnegative-integer?]
-                                [dummy toplevel?]
-                                [lang-info (or/c #f (vector/c module-path? symbol? any/c))]
-                                [internal-context (or/c #f #t stx? (vectorof stx?))]
-                                [flags (listof (or/c 'cross-phase))]
-                                [pre-submodules (listof mod?)]
-                                [post-submodules (listof mod?)]))
-
-(define-form-struct (lam expr) ([name (or/c symbol? vector? empty?)]
-                                [flags (listof (or/c 'preserves-marks 'is-method 'single-result
-                                                     'only-rest-arg-not-used 'sfs-clear-rest-args))]
-                                [num-params exact-nonnegative-integer?]
-                                [param-types (listof (or/c 'val 'ref 'flonum 'fixnum 'extflonum))]
-                                [rest? boolean?]
-                                [closure-map (vectorof exact-nonnegative-integer?)]
-                                [closure-types (listof (or/c 'val/ref 'flonum 'fixnum 'extflonum))]
-                                [toplevel-map (or/c #f (set/c exact-nonnegative-integer?))]
-                                [max-let-depth exact-nonnegative-integer?]
-                                [body (or/c expr? seq? any/c)])) ; `lambda'
-(define-form-struct (closure expr) ([code lam?] [gen-id symbol?])) ; a static closure (nothing to close over)
-(define-form-struct (case-lam expr) ([name (or/c symbol? vector? empty?)] [clauses (listof (or/c lam? closure?))]))
-
-(define-form-struct (let-one expr) ([rhs (or/c expr? seq? any/c)]  ; pushes one value onto stack
-                                    [body (or/c expr? seq? any/c)] 
-                                    [type (or/c #f 'flonum 'fixnum 'extflonum)]
-                                    [unused? boolean?]))
-(define-form-struct (let-void expr) ([count exact-nonnegative-integer?] [boxes? boolean?] [body (or/c expr? seq? any/c)])) ; create new stack slots
-(define-form-struct (install-value expr) ([count exact-nonnegative-integer?] 
-                                          [pos exact-nonnegative-integer?] 
-                                          [boxes? boolean?] 
-                                          [rhs (or/c expr? seq? any/c)] 
-                                          [body (or/c expr? seq? any/c)])) ; set existing stack slot(s)
-(define-form-struct (let-rec expr) ([procs (listof lam?)] [body (or/c expr? seq? any/c)])) ; put `letrec'-bound closures into existing stack slots
-(define-form-struct (boxenv expr) ([pos exact-nonnegative-integer?] [body (or/c expr? seq? any/c)])) ; box existing stack element
-
-(define-form-struct (localref expr) ([unbox? boolean?] 
-                                     [pos exact-nonnegative-integer?] 
-                                     [clear? boolean?] 
-                                     [other-clears? boolean?] 
-                                     [type (or/c #f 'flonum 'fixnum 'extflonum)])) ; access local via stack
-
-
-(define-form-struct (topsyntax expr) ([depth exact-nonnegative-integer?] [pos exact-nonnegative-integer?] [midpt exact-nonnegative-integer?])) ; access syntax object via prefix array (which is on stack)
-
-(define-form-struct (application expr) ([rator (or/c expr? seq? any/c)] [rands (listof (or/c expr? seq? any/c))])) ; function call
-(define-form-struct (branch expr) ([test (or/c expr? seq? any/c)] [then (or/c expr? seq? any/c)] [else (or/c expr? seq? any/c)])) ; `if'
-(define-form-struct (with-cont-mark expr) ([key (or/c expr? seq? any/c)] 
-                                           [val (or/c expr? seq? any/c)] 
-                                           [body (or/c expr? seq? any/c)])) ; `with-continuation-mark'
-(define-form-struct (beg0 expr) ([seq (listof (or/c expr? seq? any/c))])) ; `begin0'
-(define-form-struct (splice form) ([forms (listof (or/c form? any/c))])) ; top-level `begin'
-(define-form-struct (varref expr) ([toplevel (or/c toplevel? #t)] [dummy (or/c toplevel? #f)])) ; `#%variable-reference'
-(define-form-struct (assign expr) ([id toplevel?] [rhs (or/c expr? seq? any/c)] [undef-ok? boolean?])) ; top-level or module-level set!
-(define-form-struct (apply-values expr) ([proc (or/c expr? seq? any/c)] [args-expr (or/c expr? seq? any/c)])) ; `(call-with-values (lambda () ,args-expr) ,proc)
-(define-form-struct (primval expr) ([id exact-nonnegative-integer?])) ; direct preference to a kernel primitive
-
-;; Top-level `require'
-(define-form-struct (req form) ([reqs stx?] [dummy toplevel?]))
-
-
-(define-form-struct free-id-info ([path0 module-path-index?]
-                                  [symbol0 symbol?]
-                                  [path1 module-path-index?]
-                                  [symbol1 symbol?]
-                                  [phase0 (or/c exact-integer? #f)]
-                                  [phase1 (or/c exact-integer? #f)]
-                                  [phase2 (or/c exact-integer? #f)]
-                                  [use-current-inspector? boolean?]))
-
-(define-form-struct (lexical-rename wrap) ([has-free-id-renames? boolean?]
-                                           [bool2 boolean?] ; this needs a name
-                                           [alist (listof 
-                                                   (cons/c symbol?
-                                                           (or/c
-                                                            symbol?
-                                                            (cons/c
-                                                             symbol?
-                                                             (or/c
-                                                              (cons/c symbol? (or/c symbol? #f))
-                                                              free-id-info?)))))])) 
-(define-form-struct (phase-shift wrap) ([amt (or/c exact-integer? #f)] 
-                                        [src (or/c module-path-index? #f)] 
-                                        [dest (or/c module-path-index? #f)]
-                                        [cancel-id (or/c exact-integer? #f)]))
-(define-form-struct (wrap-mark wrap) ([val exact-integer?]))
-(define-form-struct (prune wrap) ([sym any/c]))
-
-(define-form-struct all-from-module ([path module-path-index?] 
-                                     [phase (or/c exact-integer? #f)] 
-                                     [src-phase (or/c exact-integer? #f)]
-                                     [exceptions (listof symbol?)]
-                                     [prefix (or/c symbol? #f)]
-                                     [context (or/c (listof exact-integer?) 
-                                                    (vector/c (listof exact-integer?) any/c))]))
-
-(define-form-struct nominal-path ())
-(define-form-struct (simple-nominal-path nominal-path) ([value module-path-index?]))
-(define-form-struct (imported-nominal-path nominal-path) ([value module-path-index?] 
-                                                          [import-phase exact-integer?]))
-(define-form-struct (phased-nominal-path nominal-path) ([value module-path-index?]
-                                                        [import-phase (or/c false/c exact-integer?)]
-                                                        [phase exact-integer?]))
-
-(define-form-struct module-binding ())
-(define-form-struct (phased-module-binding module-binding) ([path module-path-index?]
-                                                            [phase exact-integer?]
-                                                            [export-name any/c]
-                                                            [nominal-path nominal-path?]
-                                                            [nominal-export-name any/c]))
-(define-form-struct (exported-nominal-module-binding module-binding) ([path module-path-index?]
-                                                                      [export-name any/c]
-                                                                      [nominal-path nominal-path?]
-                                                                      [nominal-export-name any/c]))
-(define-form-struct (nominal-module-binding module-binding) ([path module-path-index?]
-                                                             [nominal-path nominal-path?]))
-(define-form-struct (exported-module-binding module-binding) ([path module-path-index?]
-                                                              [export-name any/c]))
-(define-form-struct (simple-module-binding module-binding) ([path module-path-index?]))
-
-(define-form-struct (module-rename wrap) ([phase (or/c exact-integer? #f)] 
-                                          [kind (or/c 'marked 'normal)] 
-                                          [set-id any/c] 
-                                          [unmarshals (listof all-from-module?)]
-                                          [renames (listof (cons/c symbol? module-binding?))] 
-                                          [mark-renames any/c] 
-                                          [plus-kern? boolean?]))
-
-; XXX better name for 'flag'
-(define-form-struct (top-level-rename wrap) ([flag boolean?]))
-
-; XXX better name for 'value'
-(define-form-struct (mark-barrier wrap) ([value symbol?]))
-
-
-
-
-
-
-
diff --git a/pkgs/compiler-pkgs/compiler-lib/info.rkt b/pkgs/compiler-pkgs/compiler-lib/info.rkt
deleted file mode 100644
index d45f961b06..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/info.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "scheme-lib"
-               "rackunit-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"compiler\"")
-
-(define pkg-authors '(mflatt))
-
-(define version "1.2")
diff --git a/pkgs/compiler-pkgs/compiler-lib/launcher/launcher-sig.rkt b/pkgs/compiler-pkgs/compiler-lib/launcher/launcher-sig.rkt
deleted file mode 100644
index 5554889de1..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/launcher/launcher-sig.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/signature
-
-make-gracket-launcher
-make-racket-launcher
-make-mred-launcher
-make-mzscheme-launcher
-
-make-gracket-program-launcher
-make-racket-program-launcher
-make-mred-program-launcher
-make-mzscheme-program-launcher
-
-gracket-program-launcher-path
-racket-program-launcher-path
-mred-program-launcher-path
-mzscheme-program-launcher-path
-
-install-gracket-program-launcher
-install-racket-program-launcher
-install-mred-program-launcher
-install-mzscheme-program-launcher
-
-gracket-launcher-up-to-date?
-racket-launcher-up-to-date?
-mred-launcher-up-to-date?
-mzscheme-launcher-up-to-date?
-
-gracket-launcher-is-directory?
-racket-launcher-is-directory?
-mred-launcher-is-directory?
-mzscheme-launcher-is-directory?
-
-gracket-launcher-is-actually-directory?
-racket-launcher-is-actually-directory?
-mred-launcher-is-actually-directory?
-mzscheme-launcher-is-actually-directory?
-
-gracket-launcher-add-suffix
-racket-launcher-add-suffix
-mred-launcher-add-suffix
-mzscheme-launcher-add-suffix
-
-gracket-launcher-put-file-extension+style+filters
-racket-launcher-put-file-extension+style+filters
-mred-launcher-put-file-extension+style+filters
-mzscheme-launcher-put-file-extension+style+filters
-
-build-aux-from-path
-extract-aux-from-path
-current-launcher-variant
-available-mred-variants
-available-mzscheme-variants
-available-gracket-variants
-available-racket-variants
-
-installed-executable-path->desktop-path
-installed-desktop-path->icon-path
diff --git a/pkgs/compiler-pkgs/compiler-lib/launcher/launcher-unit.rkt b/pkgs/compiler-pkgs/compiler-lib/launcher/launcher-unit.rkt
deleted file mode 100644
index 165362229c..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/launcher/launcher-unit.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-(require racket/unit "launcher-sig.rkt" launcher/launcher)
-
-(provide launcher@)
-
-(define-unit-from-context launcher@ launcher^)
diff --git a/pkgs/compiler-pkgs/compiler-lib/setup/option-sig.rkt b/pkgs/compiler-pkgs/compiler-lib/setup/option-sig.rkt
deleted file mode 100644
index 5308450163..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/setup/option-sig.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-(module option-sig racket/base
-  (require racket/unit)
-  
-  (provide setup-option^)
-
-  (define-signature setup-option^
-    (setup-program-name
-     verbose
-     make-verbose
-     compiler-verbose
-     clean
-     compile-mode
-     make-only
-     make-zo
-     make-info-domain
-     make-foreign-libs
-     make-launchers
-     make-docs
-     make-user
-     make-planet
-     avoid-main-installation
-     make-tidy
-     make-doc-index
-     check-dependencies
-     fix-dependencies
-     call-install
-     call-post-install
-     pause-on-errors
-     parallel-workers
-     force-unpacks
-     doc-pdf-dest
-     specific-collections
-     specific-planet-dirs
-     archives
-     archive-implies-reindex
-     current-target-directory-getter
-     current-target-plt-directory-getter)))
diff --git a/pkgs/compiler-pkgs/compiler-lib/setup/option-unit.rkt b/pkgs/compiler-pkgs/compiler-lib/setup/option-unit.rkt
deleted file mode 100644
index 1b36be3f1d..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/setup/option-unit.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-(require racket/unit setup/option "option-sig.rkt")
-
-(provide setup:option@ set-flag-params)
-
-(define-unit-from-context setup:option@ setup-option^)
\ No newline at end of file
diff --git a/pkgs/compiler-pkgs/compiler-lib/setup/setup-unit.rkt b/pkgs/compiler-pkgs/compiler-lib/setup/setup-unit.rkt
deleted file mode 100644
index addfd12088..0000000000
--- a/pkgs/compiler-pkgs/compiler-lib/setup/setup-unit.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-
-(require racket/unit setup/setup-core)
-
-(provide setup@)
-(define-unit setup@
-  (import)
-  (export)
-  (setup-core))
diff --git a/pkgs/compiler-pkgs/compiler-test/LICENSE.txt b/pkgs/compiler-pkgs/compiler-test/LICENSE.txt
deleted file mode 100644
index bf291935db..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-compiler-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/compiler-pkgs/compiler-test/info.rkt b/pkgs/compiler-pkgs/compiler-test/info.rkt
deleted file mode 100644
index 5b2913375c..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/info.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "tests for \"compiler-lib\"")
-
-(define pkg-authors '(mflatt))
-(define build-deps '("compiler-lib"
-                     "eli-tester"
-                     "net-lib"
-                     "scheme-lib"
-                     "compatibility-lib"
-                     "gui-lib"
-                     "htdp-lib"
-                     "plai"))
-(define update-implies '("compiler-lib"))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/collection-zos.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/collection-zos.rkt
deleted file mode 100644
index f74074d856..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/collection-zos.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket
-(require compiler/compiler)
-
-;; minimal sanity check:
-(compile-collection-zos "setup")
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/ctool.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/ctool.rkt
deleted file mode 100644
index 32c2e36907..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/ctool.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket
-(require setup/dirs)
-
-(define raco (build-path (find-console-bin-dir)
-                         (if (eq? (system-type) 'windows)
-                             "raco.exe"
-                             "raco")))
-
-(define tmp (make-temporary-file))
-
-(system* raco
-         "ctool"
-         "--3m"
-         "--c-mods"
-         tmp
-         "++lib"
-         "racket")
-
-(delete-file tmp)
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/demod-test.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/demod-test.rkt
deleted file mode 100644
index 0fd5b24fa8..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/demod-test.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket
-(require tests/eli-tester
-         racket/runtime-path
-         compiler/find-exe)
-
-(define (capture-output command . args)
-  (define o (open-output-string))
-  (define e (open-output-string))
-  (parameterize ([current-input-port (open-input-string "")]
-                 [current-output-port o]
-                 [current-error-port e])
-    (apply system* command args))
-  (values (get-output-string o) (get-output-string e)))
-
-(define (test-on-program filename)
-  ;; run modular program, capture output
-  (define-values (modular-output modular-error)
-    (capture-output (find-exe) filename))
-  
-  (define demod-filename 
-    (let-values ([(base filename dir?) (split-path filename)])
-      (path->string
-       (build-path
-        (find-system-path 'temp-dir)
-        (path-add-suffix filename #"_merged.zo")))))
-  
-  ;; demodularize
-  (parameterize ([current-input-port (open-input-string "")])
-    (system* (find-exe) "-l-" "raco" "demod" "-o" demod-filename filename))
-  
-  ;; run whole program
-  (define-values (whole-output whole-error)
-    (capture-output (find-exe) demod-filename))
-  
-  ;; compare output 
-  (test
-   #:failure-prefix (format "~a stdout" filename)
-   whole-output => modular-output
-   #:failure-prefix (format "~a stderr" filename)
-   whole-error => modular-error))
-
-(define-runtime-path tests "tests")
-
-(define (modular-program? filename)
-  (and (not (regexp-match #rx"merged" filename))
-       (regexp-match #rx"rkt$" filename)))
-
-(test
- (for ([i (in-list (directory-list tests))])
-   (define ip (build-path tests i))
-   (when (modular-program? ip)
-     (printf "Checking ~a\n" ip)
-     (test-on-program (path->string ip)))))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/tests/base-5.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/tests/base-5.rkt
deleted file mode 100644
index ea2c5d0f5e..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/tests/base-5.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang racket/base
-5
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/tests/kernel-5.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/tests/kernel-5.rkt
deleted file mode 100644
index 9b75f464c6..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/tests/kernel-5.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-(module kernel-5 '#%kernel
-  (#%require racket/private/map)
-  (define-values (id) (λ (x) x))
-  (define-values (xs) (list 1 2 3 4 5))
-  (map id (map id xs)))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/tests/racket-5.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/tests/racket-5.rkt
deleted file mode 100644
index e4d92af6b9..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/demodularizer/tests/racket-5.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang racket
-5
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-asl.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-asl.rkt
deleted file mode 100644
index 14a2c20866..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-asl.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-advanced-reader.ss" "lang")((modname ex) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-10
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-bsl.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-bsl.rkt
deleted file mode 100644
index 2c8819a72f..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-bsl.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname ex) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-10
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-bsla.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-bsla.rkt
deleted file mode 100644
index a8382c3bd6..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-bsla.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-abbr-reader.ss" "lang")((modname ex) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-10
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-isl.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-isl.rkt
deleted file mode 100644
index ef27ea6de6..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-isl.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-reader.ss" "lang")((modname ex) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-10
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-isll.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-isll.rkt
deleted file mode 100644
index 225485a486..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-isll.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname ex) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-10
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1.rkt
deleted file mode 100644
index c7cf7b2bfb..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-(module embed-me1 mzscheme
-  (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-    (lambda () (printf "This is 1\n"))
-    'append))
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me10.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me10.rkt
deleted file mode 100644
index 7ba6b48b13..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me10.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-(module embed-me10 mzscheme
-  (require openssl/mzssl)
-
-  (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-    (lambda () 
-      (printf "~a\n" ssl-available?))
-    'append))
-
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me11-rd.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me11-rd.rkt
deleted file mode 100644
index ad91d873e7..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me11-rd.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-(module embed-me11-rd mzscheme
-  (provide (rename *read-syntax read-syntax)
-           (rename *read read))
-
-  (define (*read port)
-    `(module embed-me11 mzscheme
-       (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-         (lambda () 
-           (printf ,(read port) 
-                   ;; Use `getenv' at read time!!!
-                   ,(getenv "ELEVEN")))
-         'append)))
-
-  (define (*read-syntax src port)
-    (*read port)))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me11.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me11.rkt
deleted file mode 100644
index 105f4033ea..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me11.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#reader(lib "embed-me11-rd.ss" "tests" "compiler" "embed")
-"It goes to ~a!\n"
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me12-rd.ss b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me12-rd.ss
deleted file mode 100644
index ad91d873e7..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me12-rd.ss
+++ /dev/null
@@ -1,15 +0,0 @@
-(module embed-me11-rd mzscheme
-  (provide (rename *read-syntax read-syntax)
-           (rename *read read))
-
-  (define (*read port)
-    `(module embed-me11 mzscheme
-       (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-         (lambda () 
-           (printf ,(read port) 
-                   ;; Use `getenv' at read time!!!
-                   ,(getenv "ELEVEN")))
-         'append)))
-
-  (define (*read-syntax src port)
-    (*read port)))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me12.ss b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me12.ss
deleted file mode 100644
index b1d4610954..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me12.ss
+++ /dev/null
@@ -1,2 +0,0 @@
-#reader(lib "embed-me12-rd.rkt" "tests" "compiler" "embed")
-"It goes to ~a!\n"
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me13.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me13.rkt
deleted file mode 100644
index a29c30b53e..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me13.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require racket/runtime-path)
-(define-runtime-module-path-index _mod "embed-me14.rkt")
-(dynamic-require _mod #f)
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me14.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me14.rkt
deleted file mode 100644
index 21987b423f..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me14.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require "embed-me13.rkt")
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  (lambda () (printf "This is 14\n"))
-  #:exists 'append)
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me15-one.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me15-one.rkt
deleted file mode 100644
index c1df6af344..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me15-one.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(define two 2)
-(provide two)
-
-(module* one #f
-  (require (submod "." ".." three))
-  (define one 1)
-  (provide one two three))
-
-(module three racket/base
-  (define three 3)
-  (provide three))
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me15.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me15.rkt
deleted file mode 100644
index ebd9f5d9c9..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me15.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require (submod "embed-me15-one.rkt" one))
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  (lambda () (printf "This is ~a.\n" (+ 9 one two three)))
-  #:exists 'append)
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me16.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me16.rkt
deleted file mode 100644
index 6bb9de67b3..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me16.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-;; a `main' submodule:
-(module main racket/base
-  (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-    (lambda () (printf "This is 16.\n"))
-    #:exists 'append))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me17.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me17.rkt
deleted file mode 100644
index ecac985e4a..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me17.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang racket/base
-(require (submod "embed-me17a.rkt" sub))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me17a.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me17a.rkt
deleted file mode 100644
index 6f61620ea8..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me17a.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket
-
-(define print-17
-  (lambda () (printf "This is 17.\n")))
-
-(module+ sub
-  (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-    print-17
-    #:exists 'append))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me18.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me18.rkt
deleted file mode 100644
index b8fd250173..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me18.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require (submod tests/compiler/embed/embed-me18a sub))
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  (dynamic-require '(submod tests/compiler/embed/embed-me18a sub) 'print-18)
-  #:exists 'append)
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me18a.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me18a.rkt
deleted file mode 100644
index 107e3fedd2..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me18a.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(module sub racket/base
-  (provide print-18)
-  (define (print-18)
-    (printf "This is 18.\n")))
-
-
-
-  
\ No newline at end of file
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me19.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me19.rkt
deleted file mode 100644
index addc967a4e..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me19.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require racket/runtime-path)
-
-(define-runtime-module-path plai plai)
-(define-runtime-module-path plai-reader plai/lang/reader)
-(define-runtime-module-path runtime racket/runtime-config)
-
-(parameterize ([read-accept-reader #t])
-  (namespace-require 'racket/base)
-  (eval (read (open-input-string "#lang plai 10"))))
-
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  (lambda () (printf "This is 19.\n"))
-  #:exists 'append)
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1b.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1b.rkt
deleted file mode 100644
index 6344f44446..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1b.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang scheme/base
-
-(require scheme/runtime-path
-         (for-syntax scheme/base))
-(define-runtime-path file '(lib "icons/file.gif"))
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  (lambda () (printf "This is 1b\n"))
-  #:exists 'append)
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1c.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1c.rkt
deleted file mode 100644
index d08dd0b4ee..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1c.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang scheme/base
-
-(require scheme/runtime-path
-         (for-syntax scheme/base))
-(define-runtime-path file '(lib "etc.ss")) ; in mzlib
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  (lambda () (printf "This is 1c\n"))
-  #:exists 'append)
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1d.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1d.rkt
deleted file mode 100644
index 3847ca2c43..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1d.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scheme/base
-
-(require scheme/runtime-path
-         (for-syntax scheme/base))
-(define-runtime-path file '(lib "file.gif" "icons"))
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  (lambda () (printf "This is 1d\n"))
-  #:exists 'append)
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1e.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1e.rkt
deleted file mode 100644
index 1942a29e6f..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1e.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scheme/base
-
-(require scheme/runtime-path
-         (for-syntax scheme/base))
-(define-runtime-path file '(lib "html"))
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  (lambda () (printf "This is 1e\n"))
-  #:exists 'append)
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f.rkt
deleted file mode 100644
index ef2d99ed30..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scheme/base
-
-(require scheme/runtime-path)
-
-;; Check that relative paths are preserved:
-(define-runtime-path f1 "embed-me1f1.rktl")
-(define-runtime-path f2 "sub/embed-me1f2.rktl")
-
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  (lambda () (parameterize ([current-namespace (make-base-namespace)])
-               (load f1)))
-  #:exists 'append)
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f1.rktl b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f1.rktl
deleted file mode 100644
index 5e2940e678..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me1f1.rktl
+++ /dev/null
@@ -1 +0,0 @@
-(load-relative "sub/embed-me1f2.rktl")
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me2.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me2.rkt
deleted file mode 100644
index 232c0a8c4d..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me2.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module embed-me2 mzscheme
-  (require "embed-me1.ss"
-	   mzlib/etc)
-  (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-    (lambda () (printf "This is 2: ~a\n" true))
-    'append))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me20.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me20.rkt
deleted file mode 100644
index f0851e8134..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me20.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-;; like "embed-me16.rkt" using `module+'
-(module+ main
-  (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-    (lambda () (printf "This is 20.\n"))
-    #:exists 'append))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me21.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me21.rkt
deleted file mode 100644
index 856fd11230..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me21.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require racket/match)
-
-;; check using `racket/match', particularly with a pattern
-;; that eneds run-time support that may go through a
-;; compile-time `lazy-require':
-
-(match "x"
-  [(pregexp "x")
-   (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-     (lambda () (printf "This is 21.\n"))
-     #:exists 'append)])
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me22.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me22.rkt
deleted file mode 100644
index 729a45a171..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me22.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/kernel
-
-(printf "This is 22.\n")
-
-(module configure-runtime racket/kernel
-  (printf "Configure!\n"))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me23.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me23.rkt
deleted file mode 100644
index 2f6eb92c10..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me23.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require racket/serialize)
-
-(serializable-struct foo (a b))
-
-(define f (deserialize (serialize (foo 1 2))))
-(foo-a f)
-(foo-b f)
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me24.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me24.rkt
deleted file mode 100644
index 974da5b6fe..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me24.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-
-"Ok"
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me3.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me3.rkt
deleted file mode 100644
index d34cde4dc6..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me3.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-(module embed-me3 mzscheme
-  (require mzlib/etc)
-  (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-    (lambda () 
-      (printf "3 is here, too? ~a\n" true))
-    'append))
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me4.rktl b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me4.rktl
deleted file mode 100644
index 24e22b0787..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me4.rktl
+++ /dev/null
@@ -1,4 +0,0 @@
-(with-output-to-file "stdout"
-  (lambda () (printf "This is the literal expression 4.\n"))
-  'append)
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me5.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me5.rkt
deleted file mode 100644
index f78a77d77a..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me5.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module embed-me5 mzscheme
-  (require mred)
-  (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-    (lambda () (printf "This is 5: ~s\n" button%))
-    'append))
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me6.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me6.rkt
deleted file mode 100644
index 8cc774ae89..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me6.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-(module embed-me6 mzscheme
-  (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-    (lambda () 
-      (printf "This is 6\n")
-      (with-handlers ([void (lambda (exn) (printf "no etc.ss\n"))])
-	(printf "~a\n" (dynamic-require 'mzlib/etc 'true))))
-    'append))
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me6b.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me6b.rkt
deleted file mode 100644
index c2643bf99b..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me6b.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-(module embed-me6b racket/base
-  (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-    (lambda () 
-      (printf "This is 6\n")
-      (with-handlers ([void (lambda (exn) (printf "no etc.ss\n"))])
-	(printf "~a\n" (and (dynamic-require 'racket/fixnum #f) #t))))
-    #:exists 'append))
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me8.c b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me8.c
deleted file mode 100644
index c4fda30513..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me8.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "escheme.h"
-
-Scheme_Object *ex(int argc, Scheme_Object **argv)
-{
-  return scheme_make_utf8_string("Hello, world!");
-}
-
-Scheme_Object *scheme_reload(Scheme_Env *env)
-{
-  Scheme_Env *menv;
-
-  menv = scheme_primitive_module(scheme_intern_symbol("embed-me8"),
-				 env);
-
-  scheme_add_global("ex", scheme_make_prim_w_arity(ex, "ex", 0, 0), menv);
-
-  scheme_finish_primitive_module(menv);
-
-  return scheme_void;
-}
-
-Scheme_Object *scheme_initialize(Scheme_Env *env)
-{
-  /* First load is same as every load: */
-  return scheme_reload(env);
-}
-
-Scheme_Object *scheme_module_name()
-{
-  return scheme_intern_symbol("embed-me8");
-}
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me9.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me9.rkt
deleted file mode 100644
index f9aabb24b5..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me9.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-(module embed-me9 mzscheme
-  (require "embed-me8.ss")
-  (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-    (lambda () 
-      (printf "~a\n" (ex)))
-    'append)
-  
-  (module test racket/base))
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-place.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-place.rkt
deleted file mode 100644
index 46e33a7483..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-place.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require racket/place)
-
-(provide go)
-
-(define (go ch)
-  (place-channel-put ch 42))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/alt.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/alt.rkt
deleted file mode 100644
index 68008701f7..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/alt.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-(require "main.rkt")
-
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  #:exists 'append
-  (lambda () (displayln "alt")))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/dyn-sub.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/dyn-sub.rkt
deleted file mode 100644
index e3f8034168..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/dyn-sub.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require (submod (planet racket-tester/p1/has-sub) the-sub))
-
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  #:exists 'append
-  (lambda () (displayln (dynamic-require
-                         '(submod (planet racket-tester/p1/has-sub) the-sub)
-                         'out))))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/has-sub.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/has-sub.rkt
deleted file mode 100644
index e2f1bb7de1..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/has-sub.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-(module+ the-sub
-  (provide out)
-  (define out 'out))
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/main.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/main.rkt
deleted file mode 100644
index 550c457847..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  (lambda () (displayln "one")))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/other.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/other.rkt
deleted file mode 100644
index d05dfbd3d8..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-1/other.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-(require (planet racket-tester/p2))
-
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  #:exists 'append
-  (lambda () (displayln "other")))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-2/main.ss b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-2/main.ss
deleted file mode 100644
index 6874861598..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-2/main.ss
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-
-
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  (lambda () (displayln "two")))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-2/private/sub.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-2/private/sub.rkt
deleted file mode 100644
index 24ff5d4162..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-planet-2/private/sub.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-(require "../main.ss")
-
-(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-  #:exists 'append
-  (lambda () (displayln "sub")))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/info.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/info.rkt
deleted file mode 100644
index 538a0e0b38..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/info.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("embed-me9.rkt"
-                             "embed-planet-1"
-                             
-                             ;; Could be compiled, but we skep them to avoid
-                             ;; dependencies. This needs to be cleaned up.
-                             "embed-me5.rkt"
-                             "embed-me19.rkt"
-                             "embed-bsl.rkt"
-                             "embed-bsla.rkt"
-                             "embed-isl.rkt"
-                             "embed-isll.rkt"
-                             "embed-asl.rkt"))
-
-(define test-omit-paths '("embed-me9.rkt"
-                          "embed-planet-1"
-                          "embed-planet-2"))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/sub/embed-me1f2.rktl b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/sub/embed-me1f2.rktl
deleted file mode 100644
index a70455650f..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/sub/embed-me1f2.rktl
+++ /dev/null
@@ -1 +0,0 @@
-(printf "This is 1f\n")
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/test.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/test.rkt
deleted file mode 100644
index 62afaaffea..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/test.rkt
+++ /dev/null
@@ -1,642 +0,0 @@
-#lang racket/base
-
-(require compiler/embed
-         racket/file
-	 racket/system
-         racket/port
-         launcher
-         compiler/distribute)
-
-(define (test expect f/label . args)
-  (define r (apply (if (procedure? f/label)
-                       f/label
-                       values)
-                   args))
-  (unless (equal? expect r)
-    (error "failed\n")))
-
-(define (mk-dest-bin mred?)
-  (case (system-type)
-    [(windows) "e.exe"]
-    [(unix) "e"]
-    [(macosx) (if mred?
-                  "e.app"
-                  "e")]))
-
-(define (mk-dest mred?)
-  (build-path (find-system-path 'temp-dir) 
-              (mk-dest-bin mred?)))
-
-(define mz-dest (mk-dest #f))
-(define mr-dest (mk-dest #t))
-
-(define dist-dir (build-path (find-system-path 'temp-dir)
-                             "e-dist"))
-(define dist-mz-exe (build-path
-                     (case (system-type)
-                       [(windows) 'same]
-                       [else "bin"])
-                     (mk-dest-bin #f)))
-(define dist-mred-exe (build-path
-                       (case (system-type)
-                         [(windows macosx) 'same]
-                         [else "bin"])
-                       (mk-dest-bin #t)))
-
-(define (prepare exe src)
-  (printf "Making ~a with ~a...\n" exe src)
-  (when (file-exists? exe)
-    (delete-file exe)))
-
-(define (try-one-exe exe expect mred?)
-  (printf "Running ~a\n" exe)
-  (let ([plthome (getenv "PLTHOME")]
-	[collects (getenv "PLTCOLLECTS")]
-        [out (open-output-string)])
-    (define temp-home-dir (make-temporary-file "racket-tmp-home~a" 'directory))
-    ;; Try to hide usual collections:
-    (parameterize ([current-environment-variables
-                    (environment-variables-copy
-                     (current-environment-variables))])
-      (putenv "PLTUSERHOME" (path->string temp-home-dir))
-      (when plthome
-        (putenv "PLTHOME" (path->string (build-path (find-system-path 'temp-dir) "NOPE"))))
-      (when collects
-        (putenv "PLTCOLLECTS" (path->string (build-path (find-system-path 'temp-dir) "NOPE"))))
-      ;; Execute:
-      (parameterize ([current-directory (find-system-path 'temp-dir)])
-        (when (file-exists? "stdout")
-          (delete-file "stdout"))
-        (let ([path (if (and mred? (eq? 'macosx (system-type)))
-                        (let-values ([(base name dir?) (split-path exe)])
-                          (build-path exe "Contents" "MacOS"
-                                      (path-replace-suffix name #"")))
-                        exe)])
-          (test #t
-                path
-                (parameterize ([current-output-port out])
-                  (system* path))))))
-    (delete-directory/files temp-home-dir)
-    (let ([stdout-file (build-path (find-system-path 'temp-dir) "stdout")])
-      (if (file-exists? stdout-file)
-          (test expect with-input-from-file stdout-file
-                (lambda () (read-string 5000)))
-          (test expect get-output-string out)))))
-  
-(define (try-exe exe expect mred? [dist-hook void] #:dist? [dist? #t] . collects)
-  (try-one-exe exe expect mred?)
-  (when dist?
-    ;; Build a distribution directory, and try that, too:
-    (printf " ... from distribution ...\n")
-    (when (directory-exists? dist-dir)
-      (delete-directory/files dist-dir))
-    (assemble-distribution dist-dir (list exe) #:copy-collects collects)
-    (dist-hook)
-    (try-one-exe (build-path dist-dir
-                             (if mred?
-                                 dist-mred-exe
-                                 dist-mz-exe))
-                 expect mred?)
-    (delete-directory/files dist-dir)))
-
-(define (base-compile e)
-  (parameterize ([current-namespace (make-base-namespace)])
-    (compile e)))
-(define (kernel-compile e)
-  (parameterize ([current-namespace (make-base-empty-namespace)])
-    (namespace-require ''#%kernel)
-    (compile e)))
-
-(define (mz-tests mred?)
-  (define dest (if mred? mr-dest mz-dest))
-  (define (flags s)
-    (string-append "-" s))
-  (define (one-mz-test filename expect literal?)
-    ;; Try simple mode: one module, launched from cmd line:
-    (prepare dest filename)
-    (make-embedding-executable 
-     dest mred? #f
-     `((#t (lib ,filename "tests" "compiler" "embed")))
-     null
-     #f
-     `(,(flags "l") ,(string-append "tests/compiler/embed/" filename)))
-    (try-exe dest expect mred?)
-
-    ;; As a launcher:
-    (prepare dest filename)
-    ((if mred? make-gracket-launcher make-racket-launcher)
-     (list "-l" (string-append "tests/compiler/embed/" filename))
-     dest)
-    (try-exe dest expect mred? #:dist? #f)
-
-    ;; Try explicit prefix:
-    (printf ">>>explicit prefix\n")
-    (let ([w/prefix
-	   (lambda (pfx)
-	     (prepare dest filename)
-	     (make-embedding-executable 
-	      dest mred? #f
-	      `((,pfx (lib ,filename "tests" "compiler" "embed"))
-                (#t (lib "scheme/init")))
-	      null
-	      #f
-	      `(,(flags "lne") 
-                "scheme/base"
-                ,(format "(require '~a~a)" 
-                         (or pfx "")
-                         (regexp-replace #rx"[.].*$" filename ""))))
-	     (try-exe dest expect mred?))])
-      (w/prefix #f)
-      (w/prefix 'before:))
-
-    (when literal?
-      ;; Try full path, and use literal S-exp to start
-      (printf ">>>literal sexp\n")
-      (prepare dest filename)
-      (let ([path (build-path (collection-path "tests" "compiler" "embed") filename)])
-        (make-embedding-executable 
-         dest mred? #f
-         `((#t ,path))
-         null
-         (base-compile
-          `(namespace-require '(file ,(path->string path))))
-         `(,(flags ""))))
-      (try-exe dest expect mred?)
-      
-      ;; Use `file' form:
-      (printf ">>>file\n")
-      (prepare dest filename)
-      (let ([path (build-path (collection-path "tests" "compiler" "embed") filename)])
-        (make-embedding-executable 
-         dest mred? #f
-         `((#t (file ,(path->string path))))
-         null
-         (base-compile
-          `(namespace-require '(file ,(path->string path))))
-         `(,(flags ""))))
-      (try-exe dest expect mred?)
-
-      ;; Use relative path
-      (printf ">>>relative path\n")
-      (prepare dest filename)
-      (parameterize ([current-directory (collection-path "tests" "compiler" "embed")])
-        (make-embedding-executable 
-         dest mred? #f
-         `((#f ,filename))
-         null
-         (base-compile
-          `(namespace-require '',(string->symbol (regexp-replace #rx"[.].*$" filename ""))))
-         `(,(flags ""))))
-      (try-exe dest expect mred?)
-
-      ;; Try multiple modules
-      (printf ">>>multiple\n")
-      (prepare dest filename)
-      (make-embedding-executable 
-       dest mred? #f
-       `((#t (lib ,filename "tests" "compiler" "embed"))
-         (#t (lib "embed-me3.rkt" "tests" "compiler" "embed")))
-       null
-       (base-compile
-        `(begin
-           (namespace-require '(lib "embed-me3.rkt" "tests" "compiler" "embed"))
-           (namespace-require '(lib ,filename "tests" "compiler" "embed"))))
-       `(,(flags "")))
-      (try-exe dest (string-append "3 is here, too? #t\n" expect) mred?)
-
-      ;; Try a literal file
-      (printf ">>>literal\n")
-      (prepare dest filename)
-      (let ([tmp (make-temporary-file)])
-        (with-output-to-file tmp 
-          #:exists 'truncate
-          (lambda ()
-            (write (kernel-compile
-                    '(namespace-require ''#%kernel)))))
-        (make-embedding-executable 
-         dest mred? #f
-         `((#t (lib ,filename "tests" "compiler" "embed")))
-         (list 
-          tmp
-          (build-path (collection-path "tests" "compiler" "embed") "embed-me4.rktl"))
-         `(with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-            (lambda () (display "... and more!\n"))
-            'append)
-         `(,(flags "l") ,(string-append "tests/compiler/embed/" filename)))
-        (delete-file tmp))
-      (try-exe dest (string-append 
-                     "This is the literal expression 4.\n" 
-                     "... and more!\n"
-                     expect)
-               mred?)))
-
-  (one-mz-test "embed-me1.rkt" "This is 1\n" #t)
-  (unless mred?
-    (one-mz-test "embed-me1b.rkt" "This is 1b\n" #f)
-    (one-mz-test "embed-me1c.rkt" "This is 1c\n" #f)
-    (one-mz-test "embed-me1d.rkt" "This is 1d\n" #f)
-    (one-mz-test "embed-me1e.rkt" "This is 1e\n" #f)
-    (one-mz-test "embed-me1f.rkt" "This is 1f\n" #f)
-    (one-mz-test "embed-me2.rkt" "This is 1\nThis is 2: #t\n" #t)
-    (one-mz-test "embed-me13.rkt" "This is 14\n" #f)
-    (one-mz-test "embed-me14.rkt" "This is 14\n" #f)
-    (one-mz-test "embed-me15.rkt" "This is 15.\n" #f)
-    (one-mz-test "embed-me17.rkt" "This is 17.\n" #f)
-    (one-mz-test "embed-me18.rkt" "This is 18.\n" #f)
-    (one-mz-test "embed-me19.rkt" "This is 19.\n" #f)
-    (one-mz-test "embed-me21.rkt" "This is 21.\n" #f))
-
-  ;; Try unicode expr and cmdline:
-  (prepare dest "unicode")
-  (make-embedding-executable 
-   dest mred? #f
-   '((#t scheme/base))
-   null
-   (base-compile
-    '(begin 
-       (require scheme/base)
-       (eval '(define (out s)
-                (with-output-to-file (build-path (find-system-path 'temp-dir) "stdout")
-                  (lambda () (printf s))
-                  #:exists 'append)))
-       (out "\uA9, \u7238, and \U1D670\n")))
-   `(,(flags "ne") "(out \"\u7237...\U1D671\n\")"))
-  (try-exe dest "\uA9, \u7238, and \U1D670\n\u7237...\U1D671\n" mred?))
-
-(define (try-basic)
-  (mz-tests #f)
-  (mz-tests #t)
-
-  (begin
-    (prepare mr-dest "embed-me5.rkt")
-    (make-embedding-executable 
-     mr-dest #t #f
-     `((#t (lib "embed-me5.rkt" "tests" "compiler" "embed")))
-     null
-     #f
-     `("-l" "tests/compiler/embed/embed-me5.rkt"))
-    (try-exe mr-dest "This is 5: #<class:button%>\n" #t)))
-
-;; Try the raco interface:
-(require setup/dirs
-	 mzlib/file)
-(define mzc (build-path (find-console-bin-dir) (if (eq? 'windows (system-type))
-                                                   "mzc.exe"
-                                                   "mzc")))
-(define raco (build-path (find-console-bin-dir) (if (eq? 'windows (system-type))
-                                                    "raco.exe"
-                                                    "raco")))
-
-(define (short-mzc-tests mred?)
-  (parameterize ([current-directory (find-system-path 'temp-dir)])
-
-    ;; raco exe
-    (system* raco
-             "exe"
-	     "-o" (path->string (mk-dest mred?))
-	     (if mred? "--gui" "--")
-	     (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me1.rkt")))
-    (try-exe (mk-dest mred?) "This is 1\n" mred?)
-
-    ;; raco exe on a module with a `main' submodule
-    (system* raco
-             "exe"
-	     "-o" (path->string (mk-dest mred?))
-	     (if mred? "--gui" "--")
-	     (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me16.rkt")))
-    (try-exe (mk-dest mred?) "This is 16.\n" mred?)))
-
-(define (mzc-tests mred?)
-  (short-mzc-tests mred?)
-  (parameterize ([current-directory (find-system-path 'temp-dir)])
-
-    ;; raco exe
-    (system* raco
-             "exe"
-	     "-o" (path->string (mk-dest mred?))
-	     (if mred? "--gui" "--")
-	     (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me1.rkt")))
-    (try-exe (mk-dest mred?) "This is 1\n" mred?)
-
-    ;; raco exe on a module with a `main' submodule
-    (system* raco
-             "exe"
-	     "-o" (path->string (mk-dest mred?))
-	     (if mred? "--gui" "--")
-	     (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me16.rkt")))
-    (try-exe (mk-dest mred?) "This is 16.\n" mred?)
-
-    ;; raco exe on a module with a `main' submodule+
-    (system* raco
-             "exe"
-	     "-o" (path->string (mk-dest mred?))
-	     (if mred? "--gui" "--")
-	     (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me20.rkt")))
-    (try-exe (mk-dest mred?) "This is 20.\n" mred?)
-
-    ;; raco exe on a module with a `configure-runtime' submodule
-    (system* raco
-             "exe"
-	     "-o" (path->string (mk-dest mred?))
-	     (if mred? "--gui" "--")
-	     (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me22.rkt")))
-    (try-exe (mk-dest mred?) "Configure!\nThis is 22.\n" mred?)
-
-    ;; raco exe on a module with serialization
-    (system* raco
-             "exe"
-	     "-o" (path->string (mk-dest mred?))
-	     (if mred? "--gui" "--")
-	     (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me23.rkt")))
-    (try-exe (mk-dest mred?) "1\n2\n" mred?)
-
-    ;; raco exe --launcher
-    (system* raco
-             "exe"
-             "--launcher"
-	     "-o" (path->string (mk-dest mred?))
-	     (if mred? "--gui" "--")
-	     (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me1.rkt")))
-    (try-exe (mk-dest mred?) "This is 1\n" mred? #:dist? #f)
-
-    ;; the rest use mzc...
-
-    (system* mzc 
-	     (if mred? "--gui-exe" "--exe")
-	     (path->string (mk-dest mred?))
-	     (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me1.rkt")))
-    (try-exe (mk-dest mred?) "This is 1\n" mred?)
-
-    (define (check-collection-path prog lib in-main?)
-      ;; Check that etc.rkt isn't found if it's not included:
-      (printf ">>not included\n")
-      (system* mzc 
-               (if mred? "--gui-exe" "--exe")
-               (path->string (mk-dest mred?))
-               (path->string (build-path (collection-path "tests" "compiler" "embed") prog)))
-      (try-exe (mk-dest mred?) "This is 6\nno etc.ss\n" mred?)
-
-      ;; And it is found if it is included:
-      (printf ">>included\n")
-      (system* mzc 
-               (if mred? "--gui-exe" "--exe")
-               (path->string (mk-dest mred?))
-               "++lib" lib
-               (path->string (build-path (collection-path "tests" "compiler" "embed") prog)))
-      (try-exe (mk-dest mred?) "This is 6\n#t\n" mred?)
-
-      ;; Or, it's found if we set the collection path and the config path (where the latter
-      ;; finds links for packages):
-      (printf ">>set coll path\n")
-      (system* mzc 
-               (if mred? "--gui-exe" "--exe")
-               (path->string (mk-dest mred?))
-               "--collects-path"
-               (path->string (find-collects-dir))
-               (path->string (build-path (collection-path "tests" "compiler" "embed") prog)))
-      ;; Don't try a distribution for this one:
-      (try-one-exe (mk-dest mred?) (if in-main? "This is 6\n#t\n" "This is 6\nno etc.ss\n") mred?)
-
-      ;; Or, it's found if we set the collection path and the config path (where the latter
-      ;; finds links for packages):
-      (printf ">>set coll path plus config\n")
-      (system* mzc 
-               (if mred? "--gui-exe" "--exe")
-               (path->string (mk-dest mred?))
-               "--collects-path"
-               (path->string (find-collects-dir))
-               "--config-path"
-               (path->string (find-config-dir))
-               (path->string (build-path (collection-path "tests" "compiler" "embed") prog)))
-      ;; Don't try a distribution for this one:
-      (try-one-exe (mk-dest mred?) "This is 6\n#t\n" mred?)
-
-      ;; Try --collects-dest mode
-      (printf ">>--collects-dest\n")
-      (system* mzc 
-               (if mred? "--gui-exe" "--exe")
-               (path->string (mk-dest mred?))
-               "++lib" lib
-               "--collects-dest" "cts"
-               "--collects-path" "cts"
-               (path->string (build-path (collection-path "tests" "compiler" "embed") prog)))
-      (try-exe (mk-dest mred?) "This is 6\n#t\n" mred? void "cts") ; <- cts copied to distribution
-      (delete-directory/files "cts")
-      (parameterize ([current-error-port (open-output-nowhere)])
-        (test #f system* (mk-dest mred?))))
-    (check-collection-path "embed-me6b.rkt" "racket/fixnum.rkt" #t)
-    (check-collection-path "embed-me6.rkt" "mzlib/etc.rkt"
-                           ;; "mzlib" is found via the "collects" path
-                           ;; if it is accessible via the default
-                           ;; collection-links configuration:
-                           (file-exists? (build-path
-                                          (find-collects-dir)
-                                          "../share/pkgs/compatibility-lib/mzlib/etc.rkt")))
-  
-    (void)))
-
-(define (try-mzc)
-  (mzc-tests #f)
-  (short-mzc-tests #t))
-
-(require dynext/file)
-(define (extension-test mred?)
-  (parameterize ([current-directory (find-system-path 'temp-dir)])
-    
-    (define obj-file
-      (build-path (find-system-path 'temp-dir) (append-object-suffix "embed-me8")))
-
-    (define ext-base-dir
-      (build-path (find-system-path 'temp-dir)
-                  "compiled"))
-
-    (define ext-dir
-      (build-path ext-base-dir
-                  "native"
-                  (system-library-subpath)))
-
-    (define ext-file
-      (build-path ext-dir (append-extension-suffix "embed-me8_rkt")))
-
-    (define ss-file
-      (build-path (find-system-path 'temp-dir) "embed-me9.rkt"))
-
-    (make-directory* ext-dir)
-    
-    (system* mzc 
-             "--cc"
-             "-d" (path->string (path-only obj-file))
-             (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me8.c")))
-    (system* mzc 
-             "--ld"
-             (path->string ext-file)
-             (path->string obj-file))
-
-    (when (file-exists? ss-file)
-      (delete-file ss-file))
-    (copy-file (build-path (collection-path "tests" "compiler" "embed") "embed-me9.rkt")
-               ss-file)
-
-    (system* mzc 
-             (if mred? "--gui-exe" "--exe")
-             (path->string (mk-dest mred?))
-             (path->string ss-file))
-
-    (delete-file ss-file)
-
-    (try-exe (mk-dest mred?) "Hello, world!\n" mred? (lambda ()
-                                                       (delete-directory/files ext-base-dir)))
-
-    ;; openssl, which needs extra binaries under Windows
-    (system* mzc 
-             (if mred? "--gui-exe" "--exe")
-             (path->string (mk-dest mred?))
-             (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me10.rkt")))
-    (try-exe (mk-dest mred?) "#t\n" mred?)))
-
-(define (try-extension)
-  (extension-test #f)
-  (extension-test #t))
-
-(define (try-gracket)
-  ;; A GRacket-specific test with mzc:
-  (parameterize ([current-directory (find-system-path 'temp-dir)])
-    (system* mzc 
-             "--gui-exe"
-             (path->string (mk-dest #t))
-             (path->string (build-path (collection-path "tests" "compiler" "embed") "embed-me5.rkt")))
-    (try-exe (mk-dest #t) "This is 5: #<class:button%>\n" #t)))
-
-;; Try including source that needs a reader extension
-
-(define (try-reader-test 12? mred? ss-file? ss-reader?)
-  ;; actual "11" files use ".rkt", actual "12" files use ".ss"
-  (define dest (mk-dest mred?))
-  (define filename (format (if ss-file?
-                               "embed-me~a.ss"
-                               "embed-me~a.rkt")
-                           (if 12? "12" "11")))
-  (define (flags s)
-    (string-append "-" s))
-
-  (printf "Trying ~s ~s ~s ~s...\n" (if 12? "12" "11") mred? ss-file? ss-reader?)
-
-  (create-embedding-executable 
-   dest
-   #:modules `((#t (lib ,filename "tests" "compiler" "embed")))
-   #:cmdline `(,(flags "l") ,(string-append "tests/compiler/embed/" filename))
-   #:src-filter (lambda (f)
-                  (let-values ([(base name dir?) (split-path f)])
-                    (equal? name (path-replace-suffix (string->path filename) 
-                                                      (if 12? #".ss" #".rkt")))))
-   #:get-extra-imports (lambda (f code)
-                         (let-values ([(base name dir?) (split-path f)])
-                           (if (equal? name (path-replace-suffix (string->path filename) 
-                                                                 (if 12? #".ss" #".rkt")))
-                               `((lib ,(format (if ss-reader?
-                                                   "embed-me~a-rd.ss"
-                                                   "embed-me~a-rd.rkt")
-                                               (if 12? "12" "11"))
-                                      "tests" 
-                                      "compiler"
-                                      "embed"))
-                               null)))
-   #:mred? mred?)
-
-  (putenv "ELEVEN" "eleven")
-  (try-exe dest "It goes to eleven!\n" mred?)
-  (putenv "ELEVEN" "done"))
-
-(define (try-reader)
-  (for ([12? (in-list '(#f #t))])
-    (try-reader-test 12? #f #f #f)
-    (try-reader-test 12? #t #f #f)
-    (try-reader-test 12? #f #t #f)
-    (try-reader-test 12? #f #f #t)))
-
-;; ----------------------------------------
-
-(define planet (build-path (find-console-bin-dir) (if (eq? 'windows (system-type))
-                                                      "planet.exe"
-                                                      "planet")))
-
-(define (try-planet)
-  (system* raco "planet" "link" "racket-tester" "p1.plt" "1" "0"
-           (path->string (collection-path "tests" "compiler" "embed" "embed-planet-1")))
-  (system* raco "planet" "link" "racket-tester" "p2.plt" "2" "2"
-           (path->string (collection-path "tests" "compiler" "embed" "embed-planet-2")))
-
-  (let ([go (lambda (path expected)
-              (printf "Trying planet ~s...\n" path)
-              (let ([tmp (make-temporary-file)]
-                    [dest (mk-dest #f)])
-                (with-output-to-file tmp
-                  #:exists 'truncate
-                  (lambda ()
-                    (printf "#lang racket/base (require ~s)\n" path)))
-                (system* mzc "--exe" (path->string dest) (path->string tmp))
-                (try-exe dest expected #f)
-
-                (delete-directory/files dest)
-
-                (delete-file tmp)))])
-    (go '(planet racket-tester/p1) "one\n")
-    (go '(planet "racket-tester/p1:1") "one\n")
-    (go '(planet "racket-tester/p1:1:0") "one\n")
-    (go '(planet "racket-tester/p1:1:0/main.ss") "one\n")
-    (go '(planet racket-tester/p2) "two\n")
-
-    (go '(planet racket-tester/p1/alt) "one\nalt\n")
-    (go '(planet racket-tester/p1/other) "two\nother\n")
-    (go '(planet "private/sub.rkt" ("racket-tester" "p2.plt" 2 0)) "two\nsub\n")
-    (go '(planet "private/sub.ss" ("racket-tester" "p2.plt" 2 0)) "two\nsub\n")
-    (go '(planet "main.ss" ("racket-tester" "p2.plt" 2 0)) "two\n")
-
-    (go '(planet racket-tester/p1/dyn-sub) "out\n")
-
-    (void))
-  
-  (system* raco "planet" "unlink" "racket-tester" "p1.plt" "1" "0")
-  (system* raco "planet" "unlink" "racket-tester" "p2.plt" "2" "2"))
-
-;; ----------------------------------------
-
-(define (try-*sl)
-  (define (try-one src)
-    (printf "Trying ~a...\n" src)
-    (define exe (path->string (mk-dest #f)))
-    (system* raco
-             "exe"
-             "-o" exe
-             "--"
-             (path->string (build-path (collection-path "tests" "compiler" "embed") src)))
-    (try-exe exe "10\n" #f))
-
-  (try-one "embed-bsl.rkt")
-  (try-one "embed-bsla.rkt")
-  (try-one "embed-isl.rkt")
-  (try-one "embed-isll.rkt")
-  (try-one "embed-asl.rkt"))
-  
-;; ----------------------------------------
-
-(try-basic)
-(try-mzc)
-(try-extension)
-(try-gracket)
-(try-reader)
-(try-planet)
-(try-*sl)
-
-;; ----------------------------------------
-;; Make sure that embedding does not break future module declarations
-
-(let ()
-  (parameterize ([current-output-port (open-output-bytes)])
-    (write-module-bundle
-     #:modules (list (list #f (collection-file-path "embed-me24.rkt" "tests" "compiler" "embed")))))
-  
-  (parameterize ([read-accept-reader #t]
-                 [current-namespace (make-base-namespace)])
-    (eval (read (open-input-string "#lang racket 10")))))
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/info.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/info.rkt
deleted file mode 100644
index 84ad0ac2d5..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/make.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/make.rkt
deleted file mode 100644
index e537e03b4a..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/make.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-(require racket/file
-         racket/path
-         racket/system
-         compiler/find-exe)
-
-(define tmpdir (make-temporary-file "tmp~a" 'directory (current-directory)))
-(define tmppath (build-path tmpdir "tmp.rkt"))
-(with-output-to-file (build-path tmpdir "tmp.rkt")  #:exists 'replace
-                     (lambda ()
-                       (printf "#lang racket\n")))
-(define exec-path (find-exe))
-(define relpath (find-relative-path (current-directory) tmppath))
-
-(define ok? (system* exec-path "-l" "raco" "make" "-j" "2" (path->string relpath)))
-(delete-directory/files tmpdir)
-
-(unless ok?
-  (error "`raco make` test failed"))
-
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/regression.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/regression.rkt
deleted file mode 100644
index 4e6e8825ff..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/regression.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scheme
-(require net/cookie
-         tests/eli-tester)
-
-(define (set-when-true fn val)
-  (if val
-      (λ (c) (fn c val))
-      (λ (c) c)))
-
-(define (make-cookie name val)
-  ((lambda (x)
-     ((set-when-true cookie:add-comment #f)
-      x))
-   (set-cookie name val)))
-
-(test
- (cookie? (make-cookie "name" "value")))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/a.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/a.rkt
deleted file mode 100644
index a8b4a5e6f7..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/a.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(error 'dont-run)
-(module test racket/base
-  (printf "a\n"))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/b.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/b.rkt
deleted file mode 100644
index dc1a6edb80..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/b.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(error 'dont-run)
-(module test racket/base
-  (printf "b\n"))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/d/c.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/d/c.rkt
deleted file mode 100644
index 892e318617..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/d/c.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(error 'dont-run)
-(module test racket/base
-  (printf "c\n"))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/d/d.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/d/d.rkt
deleted file mode 100644
index 7bc35af1c4..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/test/d/d.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang racket/base
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-exs.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-exs.rkt
deleted file mode 100644
index fbf325980f..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-exs.rkt
+++ /dev/null
@@ -1,116 +0,0 @@
-#lang racket
-(require compiler/zo-parse
-         compiler/zo-marshal
-         tests/eli-tester)
-
-(define (read-compiled-bytes bs)
-  (parameterize ([read-accept-compiled #t])
-    (read (open-input-bytes bs))))
-
-(define (run-compiled-bytes bs [delayed? #t])
-  (system "touch test.rkt")
-  (system "touch compiled/test_rkt.zo")
-  (system (format "racket ~a -t test.rkt" (if delayed? "" "-d"))))
-
-(define (roundtrip ct)
-  (define bs (zo-marshal ct))
-  (test #:failure-prefix (format "~S" ct)
-        (test bs
-              (zo-parse (open-input-bytes bs)) => ct
-              (read-compiled-bytes bs)
-              #;(with-output-to-file "compiled/test_rkt.zo" (λ () (write-bytes bs)) #:exists 'replace)
-              #;(run-compiled-bytes bs #t)
-              #;(run-compiled-bytes bs #f))))
-
-(define mpi (module-path-index-join #f #f))
-
-
-(test
- (roundtrip
-    (compilation-top 0 
-                     (prefix 0 empty empty)
-                     (list 1 (list 2 3) (list 2 3) 4 5)))
- 
- (roundtrip
-    (compilation-top 0 
-                     (prefix 1 empty empty)
-                     (list (lam 'proc null 0 null #f #(0) '(val/ref) (set 0) 3 1))))
- (roundtrip
-    (compilation-top 0 
-                     (prefix 1 empty empty)
-                     (list (lam 'proc null 0 null #f #(0) '(val/ref) #f 3 1))))
- 
- #;(roundtrip
-  (compilation-top 0 
-                   (prefix 0 empty empty)
-                   (let* ([ph (make-placeholder #f)]
-                          [x (closure 
-                               (lam 'name
-                                    empty
-                                    0 
-                                    empty
-                                    #f
-                                    #()
-                                    empty
-                                    0
-                                    ph)
-                               'name)])
-                     (placeholder-set! ph x)
-                     (make-reader-graph x))))
- 
- ; This should work, but module-path-index-join doesn't create equal? module-path-index's
- #;(roundtrip
-    (compilation-top
-     0
-     (prefix 0 (list #f) (list))
-     (mod
-      'simple
-      'simple
-      (module-path-index-join #f #f)
-      (prefix
-       0
-       (list (module-variable 
-              (module-path-index-join
-               "modbeg.rkt"
-               (module-path-index-join
-                "pre-base.rkt"
-                (module-path-index-join
-                 "namespace.rkt"
-                 (module-path-index-join "private/base.rkt" (module-path-index-join 'racket/base #f))))) 'print-values 0 0))
-       (list))
-      (list)
-      (list (list 0 (module-path-index-join 'racket/base #f)) (list 1) (list -1) (list #f))
-      (list (apply-values
-             (toplevel 0 0 #f #t)
-             (application
-              (primval 231)
-              (list 1 'a))))
-      (list)
-      (list (list) (list) (list))
-      2
-      (toplevel 0 0 #f #f)
-      #(racket/language-info get-info #f)
-      #t)))
-
- (roundtrip 
-    (compilation-top 0 
-                     (prefix 0 empty empty)
-                     (current-directory)))
- 
- (roundtrip 
-    (compilation-top 0 
-                     (prefix 0 empty empty)
-                     (list (current-directory))))
- 
- (roundtrip
-    (compilation-top
-     0
-     (prefix 0 empty empty)
-     (cons #hash()
-           #hash())))
- 
- (roundtrip
-    (compilation-top
-     0
-     (prefix 0 empty empty)
-     #hash())))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test-util.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test-util.rkt
deleted file mode 100644
index 95dbc1c85b..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test-util.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket
-
-(struct result (phase) #:prefab)
-(struct failure result (serious? msg) #:prefab)
-(struct success result () #:prefab)
-
-(provide/contract
- [struct result ([phase symbol?])]
- [struct failure ([phase symbol?]
-                  [serious? boolean?]
-                  [msg string?])]
- [struct success ([phase symbol?])])
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test-worker.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test-worker.rkt
deleted file mode 100644
index 8be85d8121..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test-worker.rkt
+++ /dev/null
@@ -1,272 +0,0 @@
-#lang racket/base
-(require racket/cmdline
-         compiler/zo-parse
-         compiler/zo-marshal
-         compiler/decompile
-         racket/port
-         racket/bool
-         racket/list
-         racket/match
-         "zo-test-util.rkt")
-
-(define (bytes-gulp f)
-  (with-input-from-file f 
-    (λ () (port->bytes (current-input-port)))))
-
-(define (read-compiled-bytes bs)
-  (define ib (open-input-bytes bs))
-  (dynamic-wind void
-                (lambda ()
-                  (parameterize ([read-accept-compiled #t])
-                    (read ib)))
-                (lambda ()
-                  (close-input-port ib))))
-
-(define (zo-parse/bytes bs)
-  (define ib (open-input-bytes bs))
-  (dynamic-wind void
-                (lambda ()
-                  (zo-parse ib))
-                (lambda ()
-                  (close-input-port ib))))
-
-(define (bytes-not-equal?-error b1 b2)
-  (unless (bytes=? b1 b2)
-    (error 'bytes-not-equal?-error "Not equal")))
-
-(define (replace-file file bytes)
-  (with-output-to-file file
-    (λ () (write-bytes bytes))
-    #:exists 'truncate))
-
-(define (equal?/why-not v1 v2)
-  (define v1->v2 (make-hasheq))
-  (define (interned-symbol=? s1 s2)
-    (symbol=? (hash-ref! v1->v2 s1 s2) s2))
-  (define (yield p m v1 v2)
-    (error 'equal?/why-not "~a in ~a: ~S ~S"
-           m (reverse p) v1 v2))
-  (define (inner p v1 v2)
-    (unless (eq? v1 v2)
-      (match v1
-        [(cons car1 cdr1)
-         (match v2
-           [(cons car2 cdr2)
-            (inner (list* 'car p) car1 car2)
-            (inner (list* 'cdr p) cdr1 cdr2)]
-           [_
-            (yield p "Not a cons on right" v1 v2)])]
-        [(? vector?)
-         (match v2
-           [(? vector?)
-            (define v1l (vector-length v1))
-            (define v2l (vector-length v2))
-            (if (= v1l v2l)
-                (for ([i (in-range v1l)])
-                  (inner (list* `(vector-ref ,i) p)
-                         (vector-ref v1 i)
-                         (vector-ref v2 i)))
-                (yield p "Vector lengths not equal" v1 v2))]
-           [_
-            (yield p "Not a vector on right" v1 v2)])]
-        [(? struct?)
-         (match v2
-           [(? struct?)
-            (define vv1 (struct->vector v1))
-            (define vv2 (struct->vector v2))
-            (inner (list* `(struct->vector ,(vector-ref vv1 0)) p)
-                   vv1 vv2)]
-           [_
-            (yield p "Not a struct on right" v1 v2)])]
-        [(? hash?)
-         (match v2
-           [(? hash?)
-            (let ([p (list* 'in-hash p)])
-              (for ([(k1 hv1) (in-hash v1)])
-                (define hv2 
-                  (hash-ref v2 k1
-                            (lambda ()
-                              (yield p (format "~S not in hash on right" k1) v1 v2))))
-                (inner (list* `(hash-ref ,k1) p)
-                       hv1 hv2)))]
-           [_
-            (yield p "Not a hash on right" v1 v2)])]
-        [(? module-path-index?)
-         (match v2
-           [(? module-path-index?)
-            (define-values (mp1 bmpi1) (module-path-index-split v1))
-            (define-values (mp2 bmpi2) (module-path-index-split v2))
-            (inner (list* 'module-path-index-split_0 p) mp1 mp2)
-            (inner (list* 'module-path-index-split_1 p) bmpi1 bmpi2)]
-           [_
-            (yield p "Not a module path index on right" v1 v2)])]
-        [(? string?)
-         (match v2
-           [(? string?)
-            (unless (string=? v1 v2)
-              (yield p "Unequal strings" v1 v2))]
-           [_
-            (yield p "Not a string on right" v1 v2)])]
-        [(? bytes?)
-         (match v2
-           [(? bytes?)
-            (unless (bytes=? v1 v2)
-              (yield p "Unequal bytes" v1 v2))]
-           [_
-            (yield p "Not a bytes on right" v1 v2)])]
-        [(? path?)
-         (match v2
-           [(? path?)
-            (unless (equal? v1 v2)
-              (yield p "Unequal paths" v1 v2))]
-           [_
-            (yield p "Not a path on right" v1 v2)])]
-        [(? number?)
-         (match v2
-           [(? number?)
-            (unless (equal? v1 v2)
-              (yield p "Unequal numbers" v1 v2))]
-           [_
-            (yield p "Not a number on right" v1 v2)])]
-        [(? regexp?)
-         (match v2
-           [(? regexp?)
-            (unless (string=? (object-name v1) (object-name v2))
-              (yield p "Unequal regexp" v1 v2))]
-           [_
-            (yield p "Not a regexp on right" v1 v2)])]
-        [(? byte-regexp?)
-         (match v2
-           [(? byte-regexp?)
-            (unless (bytes=? (object-name v1) (object-name v2))
-              (yield p "Unequal byte-regexp" v1 v2))]
-           [_
-            (yield p "Not a byte-regexp on right" v1 v2)])]
-        [(? box?)
-         (match v2
-           [(? box?)
-            (inner (list* 'unbox) (unbox v1) (unbox v2))]
-           [_
-            (yield p "Not a box on right" v1 v2)])]
-        [(? symbol?)
-         (match v2
-           [(? symbol?)
-            (unless (symbol=? v1 v2)
-              (cond
-                [(and (symbol-interned? v1) (not (symbol-interned? v1)))
-                 (yield p "Not interned symbol on right" v1 v2)]
-                [(and (symbol-unreadable? v1) (not (symbol-unreadable? v1)))
-                 (yield p "Not unreadable symbol on right" v1 v2)]
-                [(and (symbol-uninterned? v1) (not (symbol-uninterned? v1)))
-                 (yield p "Not uninterned symbol on right" v1 v2)]
-                [(and (symbol-uninterned? v1) (symbol-uninterned? v2))
-                 (unless (interned-symbol=? v1 v2)
-                   (yield p "Uninterned symbols don't align" v1 v2))]
-                [else
-                 (yield p "Other symbol-related problem" v1 v2)]))]
-           [_
-            (yield p "Not a symbol on right" v1 v2)])]
-        [(? empty?)
-         (yield p "Not empty on right" v1 v2)]
-        [_
-         (yield p "Cannot inspect values deeper" v1 v2)])))
-  (inner empty v1 v2))  
-
-(define (symbol-uninterned? s)
-  (not (or (symbol-interned? s) (symbol-unreadable? s))))
-
-(define (run-with-limit file k thnk)
-  (define file-custodian (make-custodian))
-  (define ch (make-channel))
-  (custodian-limit-memory file-custodian k)
-  (define worker-thread
-    (parameterize ([current-custodian file-custodian])
-      (thread
-       (lambda ()
-         (define r (thnk))
-         (channel-put ch r)
-         (channel-get ch)))))
-  (begin0
-    (sync
-     (handle-evt ch
-                 (lambda (v)
-                   (when (exn? v) (raise v))
-                   v))
-     (handle-evt worker-thread
-                 (lambda _
-                   (record! (failure 'memory #f "Over memory limit")))))
-    (custodian-shutdown-all file-custodian)))
-
-(define-syntax run/stages*
-  (syntax-rules ()
-    [(_ file) 
-     (record! (success 'everything))]
-    [(_ file [step1 serious? e] . rst)
-     (let/ec esc
-       (let ([step1 (with-handlers ([exn:fail? 
-                                     (lambda (x)
-                                       (record! (failure 'step1 serious? 
-                                                         (exn-message x)))
-                                       (if serious?
-                                           (esc #f)
-                                           #f))])
-                      (begin0 e
-                              (record! (success 'step1))))])
-         (run/stages* file . rst)))]))
-
-(define-syntax-rule (define-stages (run! file)
-                      [stage serious? e] ...)
-  (define (run! file)
-    (run/stages* file [stage serious? e] ...)))
-
-(define-stages (run! file)
-  [read-orig 
-   #t
-   (bytes-gulp file)]
-  [parse-orig 
-   #t
-   (zo-parse/bytes read-orig)]
-  [marshal-parsed 
-   #t
-   (zo-marshal parse-orig)]
-  [parse-marshalled 
-   #t
-   (zo-parse/bytes marshal-parsed)]
-  #;[compare-parsed-to-parsed-marshalled 
-   #f
-   (equal?/why-not parse-orig parse-marshalled)]
-  #;[marshal-marshalled 
-   #t
-   (zo-marshal parse-marshalled)]
-  #;[compare-marshalled-to-marshalled-marshalled 
-   #f
-   (bytes-not-equal?-error marshal-parsed marshal-marshalled)]
-  #;[replace-with-marshalled 
-     #t
-     (replace-file file marshal-marshalled)]
-  #;[decompile-parsed 
-   #t
-   (decompile parse-orig)]
-  [c-parse-marshalled
-   #t
-   (read-compiled-bytes marshal-parsed)]
-  #;[compare-orig-to-marshalled 
-   #f
-   (bytes-not-equal?-error read-orig marshal-parsed)])
-
-(define RESULTS empty)
-(define (record! v)
-  (set! RESULTS (list* v RESULTS)))
-(define (run-test file)
-  (run-with-limit 
-   file
-   (* 1024 1024 512)
-   (lambda ()
-     (run! file)))
-  (write (reverse RESULTS)))
-
-(command-line #:program "zo-test-worker" 
-              #:args (file)
-              (run-test file))
-
-(module test racket/base)
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test.rkt
deleted file mode 100755
index 6bd475bbaa..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test.rkt
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/bin/sh
-#|
-exec racket -t "$0" -- -s -t 60 -v -R $*
-|#
-
-#lang racket
-(require setup/dirs
-         racket/runtime-path
-         racket/future
-         compiler/find-exe
-         "zo-test-util.rkt")
-
-(define ((make-recorder! ht) file phase)
-  (hash-update! ht phase (curry list* file) empty))
-
-(define stop-on-first-error (make-parameter #f))
-(define verbose-mode (make-parameter #f))
-(define care-about-nonserious? (make-parameter #t))
-(define invariant-output (make-parameter #f))
-(define time-limit (make-parameter +inf.0))
-(define randomize (make-parameter #f))
-(define num-processes (make-parameter (processor-count)))
-
-(define errors (make-hash))
-(define (record-common-error! exn-msg)
-  (hash-update! errors (common-message exn-msg) add1 0))
-
-(define (common-message exn-msg)
-  (define given-messages (regexp-match #rx".*given" exn-msg))
-  (if (and given-messages (not (empty? given-messages)))
-      (first given-messages)
-      exn-msg))
-
-(define success-ht (make-hasheq))
-(define success! (make-recorder! success-ht))
-(define failure-ht (make-hasheq))
-(define failure! (make-recorder! failure-ht))
-
-(define debugging? (make-parameter #f))
-
-(define (randomize-list l)
-  (define ll (length l))
-  (define seen? (make-hasheq))
-  (let loop ([t 0])
-    (if (= t ll)
-        empty
-        (let ([i (random ll)])
-          (if (hash-has-key? seen? i)
-              (loop t)
-              (begin (hash-set! seen? i #t)
-                     (list* (list-ref l i)
-                            (loop (add1 t)))))))))
-
-(define (maybe-randomize-list l)
-  (if (randomize) (randomize-list l) l))
-
-(define (for-zos ! p)
-  (define p-str (if (path? p) (path->string p) p))
-  (cond
-    [(directory-exists? p)
-     (for ([sp (in-list (maybe-randomize-list (directory-list p)))])
-       (for-zos ! (build-path p sp)))]
-    [(regexp-match #rx"\\.zo$" p-str)
-     (! p-str)]))
-
-(define-runtime-path zo-test-worker-path "zo-test-worker.rkt")
-(define racket-path (path->string (find-exe)))
-
-(define p
-  (command-line #:program "zo-test" 
-                #:once-each
-                [("-D") 
-                 "Enable debugging output"
-                 (debugging? #t)]
-                [("-s" "--stop-on-first-error") 
-                 "Stop testing when first error is encountered"
-                 (stop-on-first-error #t)]
-                [("-S")
-                 "Don't take some errors seriously"
-                 (care-about-nonserious? #f)]
-                [("-v" "--verbose")
-                 "Display verbose error messages"
-                 (verbose-mode #t)]
-                [("-I")
-                 "Invariant output"
-                 (invariant-output #t)]
-                [("-R")
-                 "Randomize"
-                 (randomize #t)]
-                [("-t") 
-                 number
-                 "Limit the run to a given amount of time"
-                 (time-limit (string->number number))]
-                [("-j") 
-                 n
-                 "Run <n> in parallel"
-                 (num-processes (string->number n))]
-                #:args p
-                (if (empty? p)
-                    (list (find-collects-dir))
-                    p)))
-
-(define to-worker-ch (make-channel))
-(define stop-ch (make-channel))
-(define from-worker-ch (make-channel))
-
-(define worker-threads
-  (for/list ([i (in-range (num-processes))])
-    (thread
-     (λ ()
-       (let loop ()
-         (sync
-          (handle-evt to-worker-ch
-                      (λ (p)
-                        (when (debugging?)
-                          (printf "~a\n" p))
-                        (define-values
-                          (sp stdout stdin stderr)
-                          (subprocess #f #f #f racket-path (path->string zo-test-worker-path) p))
-                        (define r
-                          (dynamic-wind
-                           void
-                           (λ ()
-                             (read stdout))
-                           (λ ()
-                             (close-input-port stdout)
-                             (close-input-port stderr)
-                             (close-output-port stdin)
-                             (subprocess-kill sp #t))))
-                        (channel-put from-worker-ch (cons p r))
-                        (loop)))
-          (handle-evt stop-ch
-                      (λ (die)
-                        (void)))))))))          
-
-(define (process-result p r)
-  (match r
-    [(success phase)
-     (success! p phase)]
-    [(failure phase serious? exn-msg)
-     (record-common-error! exn-msg)
-     (failure! p phase)
-     
-     (unless (and (not (care-about-nonserious?)) (not serious?))
-       (when (or (verbose-mode) (stop-on-first-error))
-         (eprintf "~a -- ~a: ~a\n" p phase exn-msg))
-       (when (stop-on-first-error)
-         (stop!)))]))
-
-(define timing-thread
-  (thread
-   (λ ()
-     (sync 
-      (alarm-evt (+ (current-inexact-milliseconds)
-                    (* 1000 (time-limit)))))
-     (stop!))))
-
-(define server-thread
-  (thread
-   (λ ()
-     (let loop ([ts worker-threads])
-       (if (empty? ts)
-           (stop!)
-           (apply
-            sync
-            (handle-evt from-worker-ch
-                        (match-lambda
-                          [(cons p rs)
-                           (for-each (curry process-result p) rs)
-                           (loop ts)]))
-            (for/list ([t (in-list ts)])
-              (handle-evt t (λ _ (loop (remq t ts)))))))))))
-
-(define (spawn-worker p)
-  (channel-put to-worker-ch p))
-
-(define (zo-test paths)
-  (for-each (curry for-zos spawn-worker) paths)
-  
-  (for ([i (in-range (processor-count))])
-    (channel-put stop-ch #t)))
-
-(define root-thread
-  (thread
-   (λ ()
-     (zo-test p))))
-
-(define final-sema (make-semaphore 0))
-(define (stop!)
-  (semaphore-post final-sema))
-
-(define (hash-keys ht)
-  (hash-map ht (λ (k v) k)))
-
-(define final-thread
-  (thread
-   (λ ()
-     (semaphore-wait final-sema)
-     (for-each kill-thread
-               (list* root-thread server-thread worker-threads))
-     (unless (invariant-output)
-       (newline)
-       (for ([kind-name 
-              (remove-duplicates 
-               (append
-                (hash-keys failure-ht)
-                (hash-keys success-ht)))])
-         (define fails (length (hash-ref failure-ht kind-name empty)))
-         (define succs (length (hash-ref success-ht kind-name empty)))
-         (define all (+ fails succs))
-         (unless (zero? all)
-           (printf "~S\n"
-                   `(,kind-name
-                     (#f ,fails)
-                     (#t ,succs)
-                     ,all))))
-       (newline)
-       (printf "~a tests passed\n" (length (hash-ref success-ht 'everything empty)))
-       
-       (let ([common-errors 
-              (sort (filter (λ (p) ((car p) . > . 10))
-                            (hash-map errors (λ (k v) (cons v k))))
-                    > #:key car)])
-         (unless (empty? common-errors)
-           (printf "Common Errors:\n")
-           (for ([p (in-list common-errors)])
-             (printf "~a:\n~a\n\n" (car p) (cdr p)))))))))
-
-(thread-wait final-thread)
-
-;; Test mode:
-(module test racket/base
-  (require syntax/location)
-  (parameterize ([current-command-line-arguments (vector "-I" "-S" "-t" "60" "-v" "-R")])
-    (dynamic-require (quote-module-path "..") #f)))
diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo.rkt
deleted file mode 100644
index 5c0b885223..0000000000
--- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket/base
-(require racket/pretty
-         compiler/zo-parse
-         compiler/zo-marshal
-         compiler/decompile)
-
-(define ex-mod1
-  '(module m racket
-     (begin-for-syntax
-      (define fs 10)
-      (list fs))
-     (define-syntax (m stx)
-       #'10)
-     (m)
-     (begin-for-syntax
-      (list fs))))
-
-(define ex-mod2
-  '(module m racket
-     (define t 8)
-     (define s 10)
-     (provide t (protect-out s))))
-
-(define ex-mod3
-  '(module m racket/base
-     (module* a racket/base
-       (provide a)
-       (define a 1)
-       (module* a+ racket/base
-         (define a+ 1.1)))
-     (module* b racket/base
-       (require (submod "." ".." a))
-       (provide b)
-       (define b (+ a 1)))))
-
-(define ex-mod4
-  '(module m racket/base
-     (module a racket/base
-       (provide a)
-       (define a 1)
-       (module a+ racket/base
-         (define a+ 1.1)))
-     (module b racket/base
-       (require (submod "." ".." a))
-       (provide b)
-       (define b (+ a 1)))))
-
-(define ex-mod5
-  '(module m racket/base
-     (module a racket/base
-       (provide a)
-       (define a 1)
-       (module* a+ racket/base
-         (define a+ 1.1)))
-     (module* b racket/base
-       (require (submod "." ".." a))
-       (provide b)
-       (define b (+ a 1)))))
-
-(define (check ex-mod)
-  (let ([c (parameterize ([current-namespace (make-base-namespace)])
-             (compile ex-mod))])
-    (let ([o (open-output-bytes)])
-      (write c o)
-      (let ([p (zo-parse (open-input-bytes (get-output-bytes o)))])
-        (let ([b (zo-marshal p)])
-          (let ([p2 (zo-parse (open-input-bytes b))]
-                [to-string (lambda (p)
-                             (let ([o (open-output-bytes)])
-                               (print p o)
-                               (get-output-string o)))])
-            (unless (equal? (to-string p) (to-string p2))
-              (error 'zo "failed on example: ~e" ex-mod))))))))
-
-(for-each check (list ex-mod1 ex-mod2 ex-mod3 ex-mod4 ex-mod5))
diff --git a/pkgs/compiler-pkgs/compiler/LICENSE.txt b/pkgs/compiler-pkgs/compiler/LICENSE.txt
deleted file mode 100644
index 5fdef4b767..0000000000
--- a/pkgs/compiler-pkgs/compiler/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-compiler
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/compiler-pkgs/compiler/info.rkt b/pkgs/compiler-pkgs/compiler/info.rkt
deleted file mode 100644
index 374ab02d83..0000000000
--- a/pkgs/compiler-pkgs/compiler/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("compiler-lib"))
-(define implies '("compiler-lib"))
-
-(define pkg-desc "Racket compilation tools, such as `raco exe'")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/contract-profile/LICENSE.txt b/pkgs/contract-profile/LICENSE.txt
deleted file mode 100644
index b61973bb03..0000000000
--- a/pkgs/contract-profile/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-contract-profile
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/contract-profile/boundary-view.rkt b/pkgs/contract-profile/boundary-view.rkt
deleted file mode 100644
index e96628dc53..0000000000
--- a/pkgs/contract-profile/boundary-view.rkt
+++ /dev/null
@@ -1,233 +0,0 @@
-#lang racket/base
-
-(require racket/list unstable/list racket/match racket/contract racket/string
-         racket/set racket/dict
-         profile/structs profile/utils
-         "utils.rkt" "dot.rkt")
-
-(provide boundary-view)
-
-;; Boundary View
-;; Shows contract costs associated with each each boundary (see definition
-;; below) and, when possible, which call edges cross contract boundaries.
-;; Because of the limitations of the profiler, some pieces of information
-;; are conservative / best effort.
-
-
-;; A boundary is, at a high-level, a profile node (contracted function) and a
-;; (potentially empty) set of profile edges (incoming call edges that cross the
-;; contract boundary).
-;; A given node can be part of multiple boundaries if it enters into contracts
-;; with multiple parties, in which case it is be part of one boundary per
-;; party, and the incoming edges all come from that party.
-;; Contract checking time can be assigned to boundaries, but not to individual
-;; edges (from our perspective, the edges in a boundary can't be distinguished)
-;; Edges are found by looking at the regular time profile for callers to the
-;; node that originate from the contract's other party. Due to limitations in
-;; the profiler (tail calls, mostly), the set of edges is an approximation
-;; (both over- and under-).
-(struct boundary (contracted-node edges blame time)
-        #:transparent) ;; TODO for debugging
-
-;; Rendering options.
-;; For large programs (e.g. Acquire), enabling module clustering when showing
-;; all functions (not just contracted ones) makes renderings undecipherable.
-;; Also, most non-dot Graphviz renderers cope poorly with our graphs. fdp is
-;; probably the next best one.
-;; This is less of a problem now that we never show non-contracted nodes.
-
-;; draw borders to group functions from the same module
-(define show-module-clustering? #t)
-
-(define boundary-graph-dot-file
-  (string-append output-file-prefix "boundary-graph.dot"))
-(define contract-key-file
-  (string-append output-file-prefix "contract-key.txt"))
-
-(define (boundary-view correlated)
-  (match-define (contract-profile
-                 total-time live-contract-samples all-blames regular-profile)
-    correlated)
-
-  (define all-contracts (remove-duplicates (map blame-contract all-blames)))
-
-  ;; On the graph, contracts are abbreviated with a key ([1], [2], etc.).
-  ;; The mapping from keys to actual contracts is printed separately.
-  ;; TODO only have keys for contracts that actually show up in the profile, and only show these
-  (define contracts->keys (map cons all-contracts (range (length all-contracts))))
-
-  ;; For each blame, find the edges (from the profile graph) that cross
-  ;; contract boundaries.
-  ;; Each blame may belong to multiple boundaries (multiple contracted
-  ;; functions from the same module called from the same other party).
-  (define no-profile-nodes
-    (make-hash)) ; we may want to re-use nodes for multiple blames
-  (define all-boundaries
-    (for/list ([b (in-list all-blames)])
-      ;; First, find the contracted function in the profile graph.
-      ;; Some functions are not in the profile graph. We create nodes for them,
-      ;; which won't be connected to the actual profile graph, but will show up
-      ;; in the output. (See no-profile-nodes above.)
-      (define contracted-function
-        (or (for/first ([n (in-list (profile-nodes regular-profile))]
-                        ;; Matching is overly permissive (relies only on
-                        ;; function name). If two functions in the same module
-                        ;; have the same name, results may be bogus.
-                        ;; TODO fix this
-                        ;; Refining results using source locations would be
-                        ;; tricky: blame struct contains location of the *id*
-                        ;; of where the *contract* is applied, which doesn't
-                        ;; tell us anything about where the function actually
-                        ;; *is*. (For `define/contract', it's the id of the
-                        ;; definition, but that for `provide/contract', it's
-                        ;; a location inside the `provide/contract'.) So can't
-                        ;; really use source locations for correlation.
-                        ;; The current matching won't work for contracted
-                        ;; anonymous functions. (Probably rare, though.)
-                        #:when (equal? (blame-value b) (node-id n)))
-              n)
-            ;; function is not in the profile. create a node for it (that will
-            ;; not be connected to the profile graph), or reuse an existing
-            ;; node if we created one for that id
-            (hash-ref! no-profile-nodes
-                       (blame-value b)
-                       (node (blame-value b)
-                             #f ; no source ; TODO could we find it?
-                             '(0) ; dummy thread-ids
-                             0 0 ; if not in the profile, no time is a safe bet
-                             '() '())))) ; no known callers or callees
-      ;; Out of the callers of contracted-function, look for the ones that are
-      ;; in the negative module. Those edges are the boundary edges.
-      (define caller-module (blame-negative b))
-      (define boundary-edges
-        (for*/list ([e   (node-callers contracted-function)]
-                    [src (in-value (node-src (edge-caller e)))]
-                    #:when (and src (equal? caller-module (srcloc-source src))))
-          e))
-      (define time-spent ; TODO probably more efficient to group ahead of time
-        (samples-time (for/list ([s (in-list live-contract-samples)]
-                                 #:when (equal? (car s) b))
-                        s)))
-      (boundary contracted-function boundary-edges b time-spent)))
-
-  (with-output-to-report-file
-   boundary-graph-dot-file
-   (render all-boundaries all-blames contracts->keys))
-  (render-dot boundary-graph-dot-file)
-  ;; print contract key
-  ;; TODO find a way to add to pdf
-  ;; TODO also to add to pdf: show proportion of time spent in contracts
-  ;;  otherwise we have no idea if we're looking at a case where contracts are
-  ;;  bottlenecks or not
-  (with-output-to-report-file contract-key-file
-                              (for ([contract+key (in-list contracts->keys)])
-                                (printf "[~a] = ~a\n"
-                                        (cdr contract+key)
-                                        (car contract+key)))))
-
-
-;; given a profile node, return all the boundaries centered there
-(define (node->boundaries node all-boundaries)
-  (for/list ([b (in-list all-boundaries)]
-             #:when (eq? node (boundary-contracted-node b)))
-    b))
-
-(define (node->module node) ; approximate. if no source info, useless
-  (define src (node-src node))
-  (and src (srcloc-source src)))
-
-(define (node-location node shortened-srcloc)
-  (define id (node-id node))
-  (define src (node-src node))
-  (format "~a~a~a"
-          (if id (format "~a" id) "")
-          (if (and id src) "\n" "")
-          (if src (format-source shortened-srcloc) "")))
-
-
-;; Inspired by ../render-graphviz.rkt
-(define (render all-boundaries all-blames contracts->keys)
-
-  (define total-contract-time
-    (max 1e-20 (for/sum ([b (in-list all-boundaries)]) (boundary-time b))))
-  (define max-self%
-    (/ (for/fold ([m 1e-20]) ([b (in-list all-boundaries)])
-         (max m (boundary-time b)))
-       total-contract-time))
-
-  ;; All boundary-related nodes, which includes both actual boundary nodes and
-  ;; callers that call boundary nodes across boundary edges.
-  (define nodes
-    (set->list
-     (for/fold ([nodes (set)])
-         ([b (in-list all-boundaries)])
-       (for/fold ([nodes* (set-add nodes (boundary-contracted-node b))])
-           ([e (in-list (boundary-edges b))])
-         (set-add nodes* (edge-caller e))))))
-  (define nodes->names (for/hash ([n nodes]) (values n (gensym))))
-  (define node->shortened-path
-    (make-srcloc-shortener (filter node-src nodes) ; nodes with paths only
-                           node-src))
-  (define party->shortened-path
-    (make-shortener (set-union (map blame-positive all-blames)
-                               (map blame-negative all-blames))))
-
-  (define (summarize-boundary b contracts->keys)
-    (define blame (boundary-blame b))
-    (format "\n[~a] @ ~a : ~ams"
-            ;; show the contract key
-            (dict-ref contracts->keys (blame-contract blame))
-            (party->shortened-path (blame-negative blame))
-            (boundary-time b)))
-
-  (printf "digraph Profile {\n")
-  (printf "splines=\"true\"\n") ; polyline kinda works too, maybe
-
-  ;; cluster nodes per module, to show boundaries
-  (for ([module-nodes (in-list (group-by node->module nodes))]
-        [cluster-idx  (in-naturals 1)])
-    (define known-module? (node->module (first module-nodes)))
-    ;; don't cluster nodes for which we have no module info
-    (when (and known-module? show-module-clustering?)
-      (printf "subgraph cluster_~a {\n" cluster-idx)
-      (printf "penwidth=3.0\n")
-      (printf "graph[shape=\"ellipse\"]\n"))
-
-    ;; render the cluster's nodes
-    (for ([node (in-list module-nodes)])
-      (define boundaries (node->boundaries node all-boundaries))
-      (define self% (/ (for/sum ([b (in-list boundaries)]) (boundary-time b))
-                       total-contract-time))
-      (define label
-        (format
-         "~a\n~ams~a"
-         (node-location node (node->shortened-path node))
-         (node-self node) ; raw running time (not contracts)
-         ;; Display a summary of each boundary, which includes which contract
-         ;; is used, the negative party and contract time spent.
-         (string-join
-          (for/list ([b (in-list boundaries)])
-            (summarize-boundary b contracts->keys))
-          "")))
-      (printf "~a [label=~s, style=filled" (dict-ref nodes->names node) label)
-      ;; Boundary nodes are boxes, caller nodes are ovals.
-      (unless (null? boundaries)
-        (printf ", shape=\"box\", fillcolor=\"1,~a,1\""
-                (/ self% max-self% 1.0)))
-      (printf "];\n"))
-
-    (when (and known-module? show-module-clustering?)
-      (printf "}\n")))
-
-  ;; draw edges
-  ;; needs to be done after the clusters, otherwise any node mentioned in an
-  ;; edge printed inside a cluster is considered to be in the cluster, which
-  ;; messes things up
-  (for* ([node     (in-list nodes)]
-         [boundary (in-list (node->boundaries node all-boundaries))]
-         [edge     (in-list (boundary-edges boundary))])
-    (printf "~a -> ~a;\n"
-            (dict-ref nodes->names (edge-caller edge))
-            (dict-ref nodes->names node)))
-
-  (printf "}\n"))
diff --git a/pkgs/contract-profile/dot.rkt b/pkgs/contract-profile/dot.rkt
deleted file mode 100644
index 9149083483..0000000000
--- a/pkgs/contract-profile/dot.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-
-;; Graphviz support
-;; inspired by redex/private/dot.rkt (can't use directly because it uses GUI)
-
-(require racket/system "utils.rkt")
-
-(provide render-dot)
-
-;; these paths are explicitly checked (when find-executable-path
-;; fails) because starting drracket from the finder (or the dock)
-;; under mac os x generally does not get the path right.
-(define dot-paths
-  '("/usr/bin"
-    "/bin"
-    "/usr/local/bin"
-    "/opt/local/bin/"))
-
-(define dot.exe (if (eq? (system-type) 'windows) "dot.exe" "dot"))
-(define dot
-  (with-handlers ([(lambda (e) ; may not have permission
-                     (and (exn:fail? e)
-                          (regexp-match "access denied" (exn-message e))))
-                   (lambda _ #f)])
-    (or (find-executable-path dot.exe)
-        (ormap (λ (x)
-                 (define candidate (build-path x dot.exe))
-                 (and (file-exists? candidate) candidate))
-               dot-paths))))
-
-(define (render-dot input-file)
-  (when (and dot (not (dry-run?)))
-    (system (format "~a -Tpdf -O ~a" (path->string dot) input-file))))
diff --git a/pkgs/contract-profile/info.rkt b/pkgs/contract-profile/info.rkt
deleted file mode 100644
index 79d6ae2672..0000000000
--- a/pkgs/contract-profile/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection "contract-profile")
-(define deps '("base"
-               "profile-lib"
-               "unstable-list-lib"))
-(define build-deps '("racket-doc"
-                     "scribble-lib"
-                     "rackunit-lib"
-                     "math-lib"))
-
-(define pkg-desc "Profiling tool for contracts")
-
-(define pkg-authors '(stamourv))
diff --git a/pkgs/contract-profile/main.rkt b/pkgs/contract-profile/main.rkt
deleted file mode 100644
index 734bcac354..0000000000
--- a/pkgs/contract-profile/main.rkt
+++ /dev/null
@@ -1,244 +0,0 @@
-#lang racket/base
-
-(require racket/list unstable/list racket/match racket/set racket/format
-         racket/contract racket/contract/private/blame
-         profile/sampler profile/utils profile/analyzer
-         "dot.rkt" "utils.rkt" "boundary-view.rkt")
-
-;; (listof (U blame? #f)) profile-samples -> contract-profile struct
-(define (correlate-contract-samples contract-samples* samples*)
-  ;; car of samples* is total time, car of each sample is thread id
-  ;; for now, we just assume a single thread. fix this eventually.
-  (define total-time (car samples*))
-  ;; reverse is there to sort samples in forward time, which get-times
-  ;; needs.
-  (define samples    (get-times (map cdr (reverse (cdr samples*)))))
-  (define contract-samples
-    (for/list ([c-s (in-list contract-samples*)])
-      ;; In some cases, blame information is missing a party, in which.
-      ;; case the contract system provides a pair of the incomplete blame
-      ;; and the missing party. We combine the two here.
-      (if (pair? c-s)
-          (blame-add-missing-party (car c-s) (cdr c-s))
-          c-s)))
-  ;; combine blame info and stack trace info. samples should line up
-  (define aug-contract-samples
-    ;; If the sampler was stopped after recording a contract sample, but
-    ;; before recording the corresponding time sample, the two lists may
-    ;; be of different lengths. That's ok, just drop the extra sample.
-    (for/list ([c-s (in-list contract-samples)]
-               [s   (in-list samples)])
-      (cons c-s s)))
-  (define live-contract-samples (filter car aug-contract-samples))
-  (define all-blames
-    (set->list (for/set ([b (in-list contract-samples)]
-                         #:when b)
-                 ;; An original blamed and its swapped version are the same
-                 ;; for our purposes.
-                 (if (blame-swapped? b)
-                     (blame-swap b) ; swap back
-                     b))))
-  (define regular-profile (analyze-samples samples*))
-  ;; all blames must be complete, otherwise we get bogus profiles
-  (for ([b (in-list all-blames)])
-    (unless (and (blame-positive b)
-                 (blame-negative b))
-      (error (string-append "contract-profile: incomplete blame:\n"
-                            (format-blame b)))))
-  (contract-profile
-   total-time live-contract-samples all-blames regular-profile))
-
-
-(define (analyze-contract-samples contract-samples samples*)
-  (define correlated (correlate-contract-samples contract-samples samples*))
-  (with-output-to-report-file cost-breakdown-file
-                              (print-breakdown correlated))
-  (module-graph-view correlated)
-  (boundary-view correlated))
-
-
-;;---------------------------------------------------------------------------
-;; Break down contract checking time by contract, then by callee and by chain
-;; of callers.
-
-(define cost-breakdown-file
-  (string-append output-file-prefix "cost-breakdown.txt"))
-
-(define (print-breakdown correlated)
-  (match-define (contract-profile
-                 total-time live-contract-samples all-blames regular-profile)
-    correlated)
-
-  (define total-contract-time (samples-time live-contract-samples))
-  (define contract-ratio (/ total-contract-time (max total-time 1) 1.0))
-  (printf "Running time is ~a% contracts\n"
-          (~r (* 100 contract-ratio) #:precision 2))
-  (printf "~a/~a ms\n\n"
-          (~r total-contract-time #:precision 0)
-          total-time)
-
-  (define shorten-source
-    (make-srcloc-shortener all-blames blame-source))
-  (define (print-contract/loc c)
-    (printf "~a @ ~a\n" (blame-contract c) (shorten-source c)))
-
-  (displayln "\nBY CONTRACT\n")
-  (define samples-by-contract
-    (sort (group-by (lambda (x) (blame-contract (car x)))
-                    live-contract-samples)
-          > #:key length #:cache-keys? #t))
-  (for ([c (in-list samples-by-contract)])
-    (define representative (caar c))
-    (print-contract/loc representative)
-    (printf "  ~a ms\n\n" (samples-time c)))
-
-  (displayln "\nBY CALLEE\n")
-  (for ([g (in-list samples-by-contract)])
-    (define representative (caar g))
-    (print-contract/loc representative)
-    (for ([x (sort
-              (group-by (lambda (x)
-                          (blame-value (car x))) ; callee source, maybe
-                        g)
-              > #:key length)])
-      (printf "  ~a\n  ~a ms\n"
-              (blame-value (caar x))
-              (samples-time x)))
-    (newline))
-
-  (define samples-by-contract-by-caller
-    (for/list ([g (in-list samples-by-contract)])
-      (sort (group-by cddr ; pruned stack trace
-                      (map sample-prune-stack-trace g))
-            > #:key length)))
-
-  (displayln "\nBY CALLER\n")
-  (for* ([g samples-by-contract-by-caller]
-         [c g])
-    (define representative (car c))
-    (print-contract/loc (car representative))
-    (for ([frame (in-list (cddr representative))])
-      (printf "  ~a @ ~a\n" (car frame) (cdr frame)))
-    (printf "  ~a ms\n" (samples-time c))
-    (newline)))
-
-;; Unrolls the stack until it hits a function on the negative side of the
-;; contract boundary (based on module location info).
-;; Will give bogus results if source location info is incomplete.
-(define (sample-prune-stack-trace sample)
-  (match-define (list blame timestamp stack-trace ...) sample)
-  (define caller-module (blame-negative blame))
-  (define new-stack-trace
-    (dropf stack-trace
-           (match-lambda
-            [(cons name loc)
-             (or (not loc)
-                 (not (equal? (srcloc-source loc) caller-module)))])))
-  (list* blame timestamp new-stack-trace))
-
-
-;;---------------------------------------------------------------------------
-;; Show graph of modules, with contract boundaries and contract costs for each
-;; boundary.
-;; Typed modules are in green, untyped modules are in red.
-
-(define module-graph-dot-file
-  (string-append output-file-prefix "module-graph.dot"))
-
-(define (module-graph-view correlated)
-  (match-define (contract-profile
-                 total-time live-contract-samples all-blames regular-profile)
-    correlated)
-
-  ;; first, enumerate all the relevant modules
-  (define-values (nodes edge-samples)
-    (for/fold ([nodes (set)] ; set of modules
-               ;; maps pos-neg edges (pairs) to lists of samples
-               [edge-samples (hash)])
-        ([s (in-list live-contract-samples)])
-      (match-define (list blame sample-time stack-trace ...) s)
-      (when (empty? stack-trace)
-        (log-warning "contract profiler: sample had empty stack trace"))
-      (define pos (blame-positive blame))
-      (define neg (blame-negative blame))
-      ;; We consider original blames and their swapped versions to be the same.
-      (define edge-key (if (blame-swapped? blame)
-                           (cons neg pos)
-                           (cons pos neg)))
-      (values (set-add (set-add nodes pos) neg) ; add all new modules
-              (hash-update edge-samples edge-key
-                           (lambda (ss) (cons s ss))
-                           '()))))
-
-  (define nodes->typed?
-    (for/hash ([n nodes]
-               ;; Needs to be either a file or a submodule.
-               ;; I've seen 'unit and 'not-enough-info-for-blame go by here,
-               ;; and we can't do anything with either.
-               #:when (or (path? n) (pair? n)))
-      ;; typed modules have a #%type-decl submodule
-      (define submodule? (not (path? n)))
-      (define filename (if submodule? (car n) n))
-      (define typed?
-        (with-handlers
-            ([(lambda (e)
-                (and (exn:fail:contract? e)
-                     (or (regexp-match "^dynamic-require: unknown module"
-                                       (exn-message e))
-                         (regexp-match "^path->string"
-                                       (exn-message e)))))
-              (lambda _ #f)])
-          (dynamic-require
-           (append (list 'submod (list 'file (path->string filename)))
-                   (if submodule? (cdr n) '())
-                   '(#%type-decl))
-           #f)
-          #t))
-      (values n typed?)))
-
-  ;; graphviz output
-  (with-output-to-report-file
-   module-graph-dot-file
-   (printf "digraph {\n")
-   (printf "rankdir=LR\n")
-   (define nodes->names (for/hash ([n nodes]) (values n (gensym))))
-   (define node->labels (make-shortener nodes))
-   (for ([n nodes])
-     (printf "~a[label=\"~a\"][color=\"~a\"]\n"
-             (hash-ref nodes->names n)
-             (node->labels n)
-             (if (hash-ref nodes->typed? n #f) "green" "red")))
-   (for ([(k v) (in-hash edge-samples)])
-     (match-define (cons pos neg) k)
-     (printf "~a -> ~a[label=\"~ams\"]\n"
-             (hash-ref nodes->names neg)
-             (hash-ref nodes->names pos)
-             (samples-time v)))
-   (printf "}\n"))
-  ;; render, if graphviz is installed
-  (render-dot module-graph-dot-file))
-
-
-;;---------------------------------------------------------------------------
-;; Entry point
-
-(provide (rename-out [contract-profile/user contract-profile])
-         contract-profile-thunk
-         analyze-contract-samples) ; for feature-specific profiler
-
-;; TODO have kw args for profiler, etc.
-;; TODO have kw args for output files
-(define-syntax-rule (contract-profile/user body ...)
-  (let ([sampler (create-sampler (current-thread) 0.005 (current-custodian)
-                                 (list contract-continuation-mark-key))])
-    (begin0 (begin body ...)
-      (let ()
-        (sampler 'stop)
-        (define samples (sampler 'get-snapshots))
-        (define contract-samples
-          (for/list ([s (in-list (sampler 'get-custom-snapshots))])
-            (and (not (empty? s)) (vector-ref (car s) 0))))
-        (analyze-contract-samples contract-samples samples)))))
-
-(define (contract-profile-thunk f)
-  (contract-profile/user (f)))
diff --git a/pkgs/contract-profile/scribblings/contract-profile.scrbl b/pkgs/contract-profile/scribblings/contract-profile.scrbl
deleted file mode 100644
index 0000a43c2e..0000000000
--- a/pkgs/contract-profile/scribblings/contract-profile.scrbl
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label racket/base racket/contract))
-
-@title[#:tag "contract-profiling"]{Contract Profiling}
-
-@defmodule[contract-profile]
-
-This module provides experimental support for contract profiling.
-
-@defform[(contract-profile body ...)]{
-
-Produces several reports about the performance costs related to contract
-checking in @racket[body]. Each of these reports is printed to a separate
-file.
-
-@itemlist[
-@item{
-  @emph{Cost Breakdown} (in @tt{tmp-contract-profile-cost-breakdown.txt}):
-  Displays the proportion of @racket[body]'s running time that was spent
-  checking contracts and breaks that time down by contract, then by contracted
-  function and finally by caller for each contracted function.
-}
-@item{
-  @emph{Module Graph View} (in @tt{tmp-contract-profile-module-graph.dot.pdf}):
-  Shows a graph of modules (nodes) and the contract boundaries (edges) between
-  them that were crossed while running @racket[body].
-
-  The weight on each contract boundary edge corresponds to the time spent
-  checking contracts applied at this boundary.
-  Modules written in Typed Racket are displayed in green and untyped modules
-  are displayed in red.
-
-  These graphs are rendered using Graphviz. The Graphviz source is available in
-  @tt{tmp-contract-profile-module-graph.dot}. The rendered version of the graph
-  is only available if the contract profiler can locate a Graphviz install.
-}
-@item{
-  @emph{Boundary View} (in @tt{tmp-contract-profile-boundary-graph.dot.pdf}):
-  Shows a detailed view of how contract checking costs are spread out across
-  contracted functions, broken down by contract boundary.
-
-  Contracted functions are shown as rectangular nodes colored according to the
-  cost of checking their contracts.
-  Edges represent function calls that cross contract boundaries and cause
-  contracts to be applied. These edges are extracted from profiling
-  information, and therefore represent incomplete information. Because of this,
-  the contract profiler sometimes cannot determine the callers of contracted
-  functions.
-  Non-contracted functions that call contracted functions across a boundary are
-  shown as gray ellipsoid nodes. @; TODO this explanation is not great
-  Nodes are clustered by module. @; TODO explain more
-
-
-  Each node reports its (non-contract-related) self time. In addition,
-  contracted function nodes list the contract boundaries the function
-  participates in, as well as the cost of checking the contracts associated
-  with each boundary. For space reasons, full contracts are not displayed on
-  the graph and are instead numbered. The mapping from numbers to contracts is
-  found in @tt{tmp-contract-profile-contract-key.txt}.
-
-  These graphs are rendered using Graphviz. The Graphviz source is available in
-  @tt{tmp-contract-profile-boundary-graph.dot}. The rendered version of the graph
-  is only available if the contract profiler can locate a Graphviz install.
-}
-]
-
-}
-
-@defproc[(contract-profile-thunk [thunk (-> any)]) any]{
-  Like @racket[contract-profile], but as a function which takes a thunk to
-  profile as argument.
-}
diff --git a/pkgs/contract-profile/scribblings/info.rkt b/pkgs/contract-profile/scribblings/info.rkt
deleted file mode 100644
index 0d79dbf174..0000000000
--- a/pkgs/contract-profile/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("contract-profile.scrbl" () (tool-library))))
diff --git a/pkgs/contract-profile/tests.rkt b/pkgs/contract-profile/tests.rkt
deleted file mode 100644
index fba151d086..0000000000
--- a/pkgs/contract-profile/tests.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang racket/base
-
-(require contract-profile
-         (only-in contract-profile/utils dry-run? make-shortener))
-
-(module+ test
-  (require rackunit)
-
-  (dry-run? #t) ; don't output to files
-
-  ;; reported by Greg Hendershott
-  (check-true (contract-profile #t))
-
-  (require math)
-  (let ()
-    (define dim 200)
-    (define big1 (build-matrix dim dim (lambda (i j) (random))))
-    (define big2 (build-matrix dim dim (lambda (i j) (random))))
-    (define (main) (matrix* big1 big2))
-    (check-true (matrix? (contract-profile (main)))))
-
-  ;; test path shortening
-  (define paths '("a/b/c.rkt" "a/b/d.rkt" ("a/b/e.rkt" f) (something else)))
-  (define shortener (make-shortener paths))
-  (check-equal? (map shortener paths)
-                (list (build-path "c.rkt")
-                      (build-path "d.rkt")
-                      (list (build-path "e.rkt") 'f)
-                      '(something else)))
-  )
diff --git a/pkgs/contract-profile/utils.rkt b/pkgs/contract-profile/utils.rkt
deleted file mode 100644
index e087535075..0000000000
--- a/pkgs/contract-profile/utils.rkt
+++ /dev/null
@@ -1,161 +0,0 @@
-#lang racket/base
-
-(require racket/port racket/contract racket/list setup/collects)
-
-(provide (except-out (all-defined-out) shorten-paths))
-
-(struct contract-profile
-  (total-time
-   ;; (pairof blame? profile-sample)
-   ;; samples taken while a contract was running
-   live-contract-samples
-   ;; (listof blame?)
-   ;; all the blames that were observed during sampling
-   all-blames
-   ;; profile?
-   ;; regular time profile
-   regular-profile))
-
-(define (samples-time samples)
-  (for/sum ([s (in-list samples)])
-    (cadr s)))
-
-(define output-file-prefix "tmp-contract-profile-")
-
-
-;; for testing. don't generate output files
-(define dry-run? (make-parameter #f))
-
-(define-syntax-rule (with-output-to-report-file file body ...)
-  (if (dry-run?)
-      (parameterize ([current-output-port (open-output-nowhere)])
-        body ...)
-      (with-output-to-file file
-        #:exists 'replace
-        (lambda () body ...))))
-
-;; for debugging
-(define (format-blame b)
-  (format (string-append "#<blame positive=~a\n"
-                         "        negative=~a\n"
-                         "        contract=~a\n"
-                         "        value=~a\n"
-                         "        source=~a>\n")
-          (blame-positive b) (blame-negative b)
-          (blame-contract b) (blame-value b) (blame-source b)))
-
-;; (listof (U path-string? submodule-path #f)) -> same
-(define (shorten-paths ps*)
-
-  ;; zeroth pass, remove non-paths
-  (define ps
-    (for/list ([p (in-list ps*)]
-               #:when (or (path-string? p)
-                          (and (list? p) ; submodule
-                               (not (empty? p))
-                               (path-string? (first p)))))
-      p))
-
-  ;; zeroth.5 pass, chop off submodule parts, to put back later
-  (define submodules ; (hashof path (U submodule-part #f))
-    (for/hash ([p ps])
-      (values p (and (list? p) (rest p)))))
-
-  ;; first pass, convert to collect relative paths if possible
-  (define w/o-submodules
-    (for/hash ([p ps])
-      (values p (path->module-path (if (list? p) (first p) p)))))
-
-  ;; second pass, make non-collect paths relative to their common ancestor
-  (define-values (collect-paths non-collect-paths)
-    (for/fold ([collect-paths     (hash)]
-               [non-collect-paths (hash)])
-        ([(k v) (in-hash w/o-submodules)])
-      (if (list? v) ; collect path?
-          (values (hash-set collect-paths k v)
-                  non-collect-paths)
-          (values collect-paths
-                  (values (hash-set non-collect-paths k v))))))
-  (define relative-paths
-    (cond
-     [(hash-empty? non-collect-paths) ; degenerate case
-      (hash)]
-     [else
-      ;; not using hash-keys and hash-values. need the orders to match
-      (define as-list (hash->list non-collect-paths))
-      (define origs   (map car as-list))
-      (define vs      (map cdr as-list))
-      ;; this transformation preserves order of paths
-      (define relative
-        (let loop ([paths (map explode-path vs)])
-          (define head-base (first (first paths)))
-          (if (and (for/and ([p (rest paths)]) (equal? (first p) head-base))
-                   (not (for/or ([p paths]) (empty? (rest p)))))
-              ;; all start with the same directory, drop it
-              ;; (and we're not dropping filenames)
-              (loop (map rest paths))
-              ;; not all the same, we're done
-              (for/list ([p paths]) (apply build-path p)))))
-      (for/hash ([o (in-list origs)]
-                 [v (in-list relative)])
-        (values o v))]))
-
-  ;; final pass, reassemble submodule parts
-  ;; start with collect paths
-  (define init-table
-    (for/hash ([(k v) (in-hash collect-paths)])
-      (define submodule-part (hash-ref submodules k #f))
-      (values k
-              (if submodule-part (cons v submodule-part) v))))
-  ;; then add non-collect paths
-  (for/fold ([table init-table])
-      ([(k v) (in-hash relative-paths)])
-    (define submodule-part (hash-ref submodules k #f))
-    (hash-set table
-              k
-              (if submodule-part (cons v submodule-part) v))))
-
-
-;; (sequenceof A) (A -> (U path-string? submodule-path #f)) -> (A -> (U ...))
-(define (make-shortener ps* [extract-path values])
-  ;; special-case things shorten-paths can't deal with
-  ;; these should just map to themselves
-  (define-values (ps bad)
-    (partition (lambda (p)
-                 (or (path-string? p)
-                     (and (list? p) ; submodule path
-                          (not (empty? p))
-                          (path-string? (first p)))))
-               ;; can be any kind of sequence, turn into a list
-               (for/list ([p ps*]) p)))
-  (define extracted (map extract-path ps))
-  (define shortened (shorten-paths extracted))
-  (define init-table
-    (for/hash ([p ps]
-               [e extracted])
-      (values p (hash-ref shortened e))))
-  ;; add bad "paths", mapping to themselves
-  (define table
-    (for/fold ([table init-table])
-        ([b (in-list bad)])
-      (hash-set table b b)))
-  (lambda (p)
-    (or (hash-ref table p #f)
-        (extract-path p))))
-
-(define (make-srcloc-shortener srcs [extract-srcloc values])
-  (define extracted
-    (for/list ([s srcs])
-      (srcloc-source (extract-srcloc s))))
-  (define shortened (shorten-paths extracted))
-  (define table
-    (for/hash ([p srcs]
-               [e extracted])
-      (values p (hash-ref shortened e (lambda () p)))))
-  (lambda (p)
-    (define target (hash-ref table p #f))
-    (if target
-        (struct-copy srcloc
-                     (extract-srcloc p)
-                     [source target])
-        (extract-srcloc p))))
diff --git a/pkgs/data-pkgs/data-doc/LICENSE.txt b/pkgs/data-pkgs/data-doc/LICENSE.txt
deleted file mode 100644
index a0a9a6b002..0000000000
--- a/pkgs/data-pkgs/data-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-data-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/data-pkgs/data-doc/data/info.rkt b/pkgs/data-pkgs/data-doc/data/info.rkt
deleted file mode 100644
index a6e7a9e3a6..0000000000
--- a/pkgs/data-pkgs/data-doc/data/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define scribblings
-  '(("scribblings/data.scrbl" (multi-page) (library))))
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/bit-vector.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/bit-vector.scrbl
deleted file mode 100644
index 32bf6919ef..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/bit-vector.scrbl
+++ /dev/null
@@ -1,184 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          (for-label data/bit-vector
-                     racket/contract
-                     racket/dict
-                     racket/base)
-          data/bit-vector)
-
-@title[#:tag "bit-vector"]{Bit Vectors}
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require data/bit-vector))
-@(the-eval '(require racket/dict))
-
-@defmodule[data/bit-vector]
-
-@author[@author+email["Jens Axel Søgaard" "soegaard@racket-lang.org"]]
-
-A @deftech{bit vector} is a mutable sequence whose elements 
-are booleans. A bit vector also acts as a dictionary (@racket[dict?]
-from @racketmodname[racket/dict]), where the keys are zero-based
-indexes and the values are the elements of the bit-vector. A bit-vector 
-has a fixed size.
-
-Two bit-vectors are @racket[equal?] if they contain the same number of
-elements and if they contain equal elements at each index.
-
-@defproc[(make-bit-vector [size exact-integer?] [fill boolean? #f])
-         bit-vector?]{
-
-Creates a new bit-vector of size @racket[size]. All elements
-are initialized to @racket[fill].
-
-@examples[#:eval the-eval
-(bit-vector-ref (make-bit-vector 3) 2)
-(bit-vector-ref (make-bit-vector 3 #t) 2)
-]
-}
-
-@defproc[(bit-vector [elem boolean?] ...)
-         bit-vector?]{
-
-Creates a new bit-vector containing each @racket[elem] in order.
-
-@examples[#:eval the-eval
-(bit-vector-ref (bit-vector #f #t #f) 1)
-]
-}
-
-@defproc[(bit-vector? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a bit-vector, @racket[#f] otherwise.
-}
-
-@defproc[(bit-vector-ref [bv bit-vector?]
-                         [index exact-nonnegative-integer?]
-                         [default any/c (error ....)])
-         any/c]{
-
-Returns the element at index @racket[index], if @racket[index] is less
-than @racket[(bit-vector-length bv)]. Otherwise, @racket[default] is
-invoked if it is a procedure, returned otherwise.
-
-@examples[#:eval the-eval
-(bit-vector-ref (bit-vector #f #t) 1)
-(bit-vector-ref (bit-vector #f #t) 5 'not-there)
-]
-}
-
-@defproc[(bit-vector-set! 
-          [bv bit-vector?]
-          [index (and/c exact-nonnegative-integer? 
-                        (</c (+ 1 (bit-vector-length vv))))]
-          [value boolean?])
-         void?]{
-
-Sets the value at index @racket[index] to be @racket[value]. 
-
-@examples[#:eval the-eval
-(define bv (bit-vector #f #t))
-(bit-vector-ref bv 0)
-(bit-vector-set! bv 0 #t)
-(bit-vector-ref bv 0)
-]
-}
-
-@defproc[(bit-vector-length [bv bit-vector?])
-         exact-nonnegative-integer?]{
-
-Returns the number of items in the bit-vector @racket[bv].
-}
-
-@defproc[(bit-vector-popcount [bv bit-vector?])
-         exact-nonnegative-integer?]{
-
-Returns the number of set bits in the bit-vector @racket[bv].
-
-@examples[#:eval the-eval
-(bit-vector-popcount (bit-vector #f #t #t))]
-}
-
-@defproc[(bit-vector-copy [bv bit-vector?]
-                          [start exact-nonnegative-integer? 0]
-                          [end exact-nonnegative-integer? (vector-length v)])
-         bit-vector?]{
-
-Creates a fresh bit-vector with the
-same elements as @racket[bv] from @racket[start] (inclusive)
-to @racket[end] (exclusive).
-}
-
-@defproc[(in-bit-vector [bv bit-vector?])
-         sequence?]{
-
-Returns a sequence whose elements are the elements of the bit-vector
-@racket[bv]. Mutation of @racket[bv] while the sequence is running
-changes the elements produced by the sequence. To obtain a sequence
-from a snapshot of @racket[bv], use @racket[(in-bit-vector
-(bit-vector-copy bv))] instead.
-
-@examples[#:eval the-eval
-(define bv (bit-vector #f #t #f))
-(for/list ([x (in-bit-vector bv)]) x)]
-}
-
-@defform/subs[(for/bit-vector maybe-length (for-clause ...) 
-                body-or-break ... body)
-              ([maybe-length (code:line)
-                             (code:line #:length length-expr)
-                             (code:line #:length length-expr #:fill fill-expr)])
-              #:contracts ([length-expr exact-nonnegative-integer?])]{
-
-Iterates like @racket[for/vector], but results are accumulated into
-a bit-vector instead of a vector. 
-
-If the optional @racket[#:length] clause is specified, the result of
-@racket[length-expr] determines the length of the result bit-vector. 
-In that case, the iteration can be performed more efficiently, and it
-terminates when the bit-vector is full or the requested number of
-iterations have been performed, whichever comes first. If
-@racket[length-expr] specifies a length longer than the number of
-iterations, then the remaining slots of the vector are initialized to
-the value of @racket[fill-expr], which defaults to @racket[#f] (i.e.,
-the default argument of @racket[make-bit-vector]).
-
-@examples[#:eval the-eval
-(bit-vector->list
- (for/bit-vector ([i '(1 2 3)]) (odd? i)))
-(bit-vector->list
- (for/bit-vector #:length 2 ([i '(1 2 3)]) (odd? i)))
-(bit-vector->list
- (for/bit-vector #:length 4 ([i '(1 2 3)]) (odd? i)))
-(bit-vector->list
- (for/bit-vector #:length 4 #:fill #t ([i '(1 2 3)]) (odd? i)))
-]
-
-The @racket[for/bit-vector] form may allocate a bit-vector and mutate it 
-after each iteration of @racket[body], which means that capturing a
-continuation during @racket[body] and applying it multiple times may
-mutate a shared bit-vector.}
-
-@defform[(for*/bit-vector maybe-length (for-clause ...)
-           body-or-break ... body)]{
-
-Like @racket[for/bit-vector] but with the implicit nesting of @racket[for*].
-}
-
-@deftogether[[
-@defproc[(bit-vector->list [bv bit-vector?]) (listof boolean?)]
-@defproc[(list->bit-vector [bits (listof boolean?)]) bit-vector?]
-@defproc[(bit-vector->string [bv bit-vector?]) (and/c string? #rx"^[01]*$")]
-@defproc[(string->bit-vector [s (and/c string? #rx"^[01]*$")]) bit-vector?]
-]]{
-
-Converts between bit-vectors and their representations as lists and
-strings.
-
-@examples[#:eval the-eval
-(bit-vector->list (string->bit-vector "100111"))
-(bit-vector->string (list->bit-vector '(#t #f #t #t)))
-]
-}
-
-@close-eval[the-eval]
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/data.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/data.scrbl
deleted file mode 100644
index 5817980154..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/data.scrbl
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang scribble/doc
-@(require scribble/base
-          scribble/manual
-          (for-syntax racket/base racket/path)
-          (for-label scribble/base))
-
-@title[#:tag "data"]{Data: Data Structures}
-
-@defmodule[data]
-
-This manual documents data structure libraries available in the
-@racketmodname[data] collection.
-
-@local-table-of-contents[#:style 'immediate-only]
-
-@;{--------}
-
-@include-section["queue.scrbl"]
-@include-section["gvector.scrbl"]
-@include-section["order.scrbl"]
-@include-section["splay-tree.scrbl"]
-@include-section["skip-list.scrbl"]
-@include-section["interval-map.scrbl"]
-@include-section["heap.scrbl"]
-@include-section["integer-set.scrbl"]
-@include-section["bit-vector.scrbl"]
-@include-section["union-find.scrbl"]
-@include-section["enumerate.scrbl"]
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/enumerate.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/enumerate.scrbl
deleted file mode 100644
index 894ff91e38..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/enumerate.scrbl
+++ /dev/null
@@ -1,732 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          (for-label data/enumerate
-                     data/enumerate/lib
-                     racket/math
-                     racket/contract
-                     racket/base))
-
-@title{Enumerations}
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require data/enumerate racket/string))
-
-@defmodule[data/enumerate]
-
-@author[@author+email["Max S. New" "maxsnew@gmail.com"]]
-
-This library defines @deftech{enumerations}. Enumerations are
-bijections between the natural numbers (or a prefix thereof) and a
-data-type. Most of the bijections defined in this library guarantee
-that the enumeration is efficient, meaning that the decoding a number
-is linear in the bits of the number.
-
-@; XXX explain fairness
-@; XXX add citations
-
-@defproc[(enum [size (or/c exact-nonnegative-integer? +inf.0)] 
-               [from (-> exact-nonnegative-integer? any/c)]
-               [to (-> any/c exact-nonnegative-integer?)])
-         enum?]{
-
-Constructs an @tech{enumeration} of size @racket[size] where
-@racket[from] is the decoding function and @racket[to] is the encoding
-function. }
-
-@defproc[(enum? [x any/c]) boolean?]{
-
-Identifies a value as an @tech{enumeration}.}
-
-@defproc[(size [e enum?]) (or/c exact-nonnegative-integer? +inf.0)]{
-
-Returns the size of an @tech{enumeration}.}
-
-@defproc[(from-nat [e enum?] [n exact-nonnegative-integer?]) any/c]{
-
-Uses @racket[e] to decode @racket[n].}
-
-@defproc[(to-nat [e enum?] [x any/c]) exact-nonnegative-integer?]{
-
-Uses @racket[e] to encode @racket[x].}
-
-@defthing[nat/e enum?]{
-
-An @tech{enumeration} of the natural numbers.
-   
-@examples[#:eval the-eval
-(from-nat nat/e 5)
-(to-nat nat/e 5)
-]}
-
-@defproc[(map/e [f (-> a ... b)]
-                [inv-f (-> b (values a ...))]
-                [e enum?] ...+) enum?]{
-
-Uses @racket[f] and @racket[inv-f] around the encoding and decoding
-functions of @racket[e].
-
-@examples[#:eval the-eval
-(define map-1/e
-  (map/e number->string string->number nat/e))
-(from-nat map-1/e 5)
-(to-nat map-1/e "5")
-(define map-2/e
-  (map/e (λ (x y) 
-           (string-join
-            (list (number->string x)
-                  (number->string y))))
-         (λ (x)
-           (apply values (map string->number (string-split x))))
-         nat/e nat/e))
-(from-nat map-2/e 5)
-(to-nat map-2/e "1 2")
-]}
-
-@defproc[(filter/e [e enum?] [p (-> any/c boolean?)]) enum?]{
-
-Returns an @tech{enumeration} identical to @racket[e] except that only
-elements where @racket[p] returns true are included. The encoding
-function and the size are wrong in the result and this is inefficient,
-so only use it for very small enumerations.
-
-@examples[#:eval the-eval
-(define filter-1/e
-  (filter/e nat/e even?))
-(from-nat filter-1/e 5)
-(to-nat filter-1/e 8)
-]}
-
-@defproc[(except/e [e enum?] [x any/c] ...) enum?]{
-
-Returns an @tech{enumeration} identical to @racket[e] except that all
-@racket[x] are not included in the decoding and cannot be encoded
-(converted to a natural number).
-
-@examples[#:eval the-eval
-(define except-1/e
-  (except/e nat/e 3))
-(from-nat except-1/e 5)
-(to-nat except-1/e 8)
-]}
-
-@defproc[(to-stream [e enum?]) stream?]{
-
-Returns a stream of the values in @racket[e].
-
-@examples[#:eval the-eval
-(to-stream map-2/e)
-]}
-
-@defproc[(approximate [e enum?] [n exact-nonnegative-integer?]) list?]{
-
-Returns a list of the first @racket[n] values in @racket[e].
-
-@examples[#:eval the-eval
-(approximate map-2/e 5)
-]}
-
-@defproc[(to-list [e enum?]) list?]{
-
-Returns a list of the @racket[n] values in @racket[e]. This will
-diverge if @racket[e] is infinite.
-
-@examples[#:eval the-eval
-(to-list (take/e map-2/e 5))
-]}
-
-@defproc[(take/e [e enum?] [n exact-nonnegative-integer?]) enum?]{
-
-Identical to @racket[e] but only includes the first @racket[n] values.
-
-@examples[#:eval the-eval
-(from-nat (take/e map-2/e 5) 3)
-(to-nat (take/e map-2/e 5) "1 1")
-]}
-
-@defproc[(slice/e [e enum?] [lo exact-nonnegative-integer?] [hi exact-nonnegative-integer?]) enum?]{
-
-Identical to @racket[e] but only includes the values between
-@racket[lo] and @racket[hi].
-
-@examples[#:eval the-eval
-(to-list (slice/e map-2/e 5 10))
-]}
-
-@defproc[(below/e [max exact-nonnegative-integer?]) enum?]{
-
-An @tech{enumeration} of the first @racket[max] naturals.
-
-@examples[#:eval the-eval
-(to-list (below/e 10))
-]}
-
-@defthing[empty/e enum?]{
-
-An empty @tech{enumeration}.
-
-@examples[#:eval the-eval
-(to-list empty/e)
-]}
-
-@defproc[(const/e [x any/c]) enum?]{
-
-An @tech{enumeration} of exactly @racket[x].
-
-@examples[#:eval the-eval
-(to-list (const/e 42))
-]}
-
-@defproc[(from-list/e [xs list?]) enum?]{
-
-An @tech{enumeration} of each @racket[eq?] value in
-@racket[xs]. @racket[xs] should not contain duplicates, but
-@racket[from-list/e] doesn't check.
-
-@examples[#:eval the-eval
-(to-list (from-list/e '("Brian" "Jenny" "Ki" "Ted")))
-]}
-
-@defproc[(fin/e [x any/c] ...) enum?]{
-
-An @tech{enumeration} of each @racket[x]. If a value is duplicated in
-the input, it is only in the enumeration once.
-
-@examples[#:eval the-eval
-(to-list (fin/e "Brian" "Jenny" "Ki" "Ted"))
-]}
-
-@defthing[int/e enum?]{
-
-An @tech{enumeration} of the integers.
-
-@examples[#:eval the-eval
-(approximate int/e 10)
-]}
-
-@defproc[(disj-sum/e [e-p (cons/c enum? (-> any/c boolean?))] ...) enum?]{
-
-An @tech{enumeration} of the disjoint sum of the enumerations given in
-@racket[e-p]. Each @racket[e-p] is a pair of an enumeration and a
-predicate identifying elements of it. Only one or zero predicates
-should return true on any value.
-
-@examples[#:eval the-eval
-(approximate (disj-sum/e (cons nat/e exact-nonnegative-integer?)
-                         (cons map-1/e string?))
-             10)
-]}
-
-@defproc[(disj-append/e [e-p (cons/c enum? (-> any/c boolean?))] ...+) enum?]{
-
-An @tech{enumeration} of the disjoint sum of the enumerations given in
-@racket[e-p] that fully enumerates each enumeration before enumerating
-the next. @racket[e-p] are formatted as in @racket[disj-sum/e]. All
-but the last enumeration should be finite.
-
-@examples[#:eval the-eval
-(approximate 
- (disj-append/e (cons (take/e nat/e 4) exact-nonnegative-integer?)
-                (cons map-1/e string?))
- 10)
-]}
-
-@defproc[(fin-cons/e [x enum?] [y enum?]) enum?]{
-
-An @tech{enumeration} of pairs of the values from @racket[x] and
-@racket[y]. Both enumerations should be finite.
-
-@examples[#:eval the-eval
-(approximate (fin-cons/e (take/e nat/e 4) (take/e nat/e 5)) 5)
-]}
-
-@defproc[(cons/e [x enum?] [y enum?]) enum?]{
-
-An @tech{enumeration} of pairs of the values from @racket[x] and
-@racket[y].
-
-@examples[#:eval the-eval
-(approximate (cons/e (take/e nat/e 4) (take/e nat/e 5)) 5)
-(approximate (cons/e nat/e (take/e nat/e 5)) 5)
-(approximate (cons/e (take/e nat/e 4) nat/e) 5)
-(approximate (cons/e nat/e nat/e) 5)
-]}
-
-@defproc[(elegant-cons/e [x enum?] [y enum?]) enum?]{
-
-An @tech{enumeration} of pairs of the values from @racket[x] and
-@racket[y]. The enumeration is in a different order than
-@racket[cons/e]. Both enumerations should be infinite.
-
-@examples[#:eval the-eval
-(approximate (elegant-cons/e nat/e nat/e) 5)
-]}
-
-@defproc[(traverse/e [f (-> any/c enum?)] [xs (listof any/c)]) enum?]{
-
-Constructs an @tech{enumeration} that simulatenously enumerates each
-of the enumerations returned by @racket[f] applied to each element of
-@racket[xs].
-
-@examples[#:eval the-eval
-(define traverse-1/e
-  (traverse/e (λ (x) (map/e (λ (n) (cons x n))
-                            (λ (y) (cdr y))
-                            nat/e))
-              '("Brian" "Jenny" "Ted" "Ki")))
-(approximate traverse-1/e 5)
-(to-nat traverse-1/e 
-        '(("Brian" . 11) ("Jenny" . 15) ("Ted" . 16) ("Ki" . 7)))
-]}
-
-@defproc[(hash-traverse/e [f (-> any/c enum?)] [xs (hash/c any/c any/c)]) enum?]{
-
-Constructs an @tech{enumeration} that simulatenously enumerates each
-of the enumerations returned by @racket[f] applied to each value of
-@racket[xs].
-
-@examples[#:eval the-eval
-(define hash-traverse-1/e
-  (hash-traverse/e (λ (n) (below/e n))
-                   (hash "Brian" 5 "Jenny" 15 "Ted" 25 "Ki" 30)))
-(approximate hash-traverse-1/e 5)
-(to-nat hash-traverse-1/e
-        '#hash(("Brian" . 4) ("Jenny" . 1) ("Ted" . 16) ("Ki" . 7)))
-]}
-
-@defproc[(dep/e [a enum?] [b (-> any/c enum?)]) enum?]{
-
-Constructs an @tech{enumeration} of pairs of values @racket[a] and
-@racket[(b a)].
-
-@examples[#:eval the-eval
-(define dep-1/e
-  (dep/e nat/e (λ (a) (below/e a))))
-(approximate dep-1/e 5)
-(to-nat dep-1/e (cons 17 10))
-]}
-
-@defproc[(dep2/e [n (or/c exact-nonnegative-integer? +inf.0)] [a enum?] [b (-> any/c enum?)]) enum?]{
-
-Like @racket[dep2/e] but requires the size of the resulting
-enumeration be given as @racket[n]. This is more efficient than
-@racket[dep/e], particularly when @racket[n] is finite.
-
-@examples[#:eval the-eval
-(define (! n)
-  (if (zero? n) 1 (* n (! (sub1 n)))))
-(define dep2-1/e
-  (dep2/e (+ (! 1) (! 2) (! 3) (! 4) (! 5))
-          (below/e 5)
-          (λ (a) (below/e a))))
-(approximate dep2-1/e 5)
-(to-nat dep2-1/e (cons 4 3))
-]}
-
-@defproc[(fold-enum [f (-> (listof a) b enum?)] [bs (listof b)]) enum?]{
-
-This is like @racket[foldr], but @racket[f] returns
-@tech{enumerations} of @racket[_a]s and assumes that the accumulator
-is initialized to @racket['()].
-
-@examples[#:eval the-eval
-(define fold-enum-1/e
-  (fold-enum (λ (as b)
-               (below/e (+ (foldr + 0 as) b)))
-             (list 1 2 3)))
-(approximate fold-enum-1/e 5)
-(to-nat fold-enum-1/e (list 0 1 1))
-]}
-
-@defproc[(range/e [lo exact-nonnegative-integer?] [hi exact-nonnegative-integer?]) enum?]{
-
-An @tech{enumeration} of the naturals between @racket[lo] and @racket[hi].
-
-@examples[#:eval the-eval
-(approximate (range/e 42 64) 5)
-]}
-
-@defproc[(thunk/e [size (or/c exact-nonnegative-integer? +inf.0)] [ep (-> enum?)]) enum?]{
-
-A delayed @tech{enumeration} identical to @racket[ep]. This is
-typically used with @racket[fix/e].
-
-@examples[#:eval the-eval
-(approximate (thunk/e +inf.0 (λ () nat/e)) 5)
-]}
-
-@defproc*[([(fix/e [f (-> enum? enum?)]) enum?]
-           [(fix/e [size (or/c exact-nonnegative-integer? +inf.0)] [f (-> enum? enum?)]) enum?])]{
-
-An @tech{enumeration} calculated as the fixed-point of @racket[f]. If
-@racket[size] is not given, it is assumed to be @racket[+inf.0].
-
-@examples[#:eval the-eval
-(approximate 
- (fix/e
-  +inf.0 
-  (λ (self) (disj-sum/e (cons (fin/e '()) null?)
-                        (cons (cons/e nat/e self) pair?))))
- 5)
-]}
-
-@defproc*[([(many/e [e enum?]) enum?]
-           [(many/e [e enum?] [n exact-nonnegative-integer?]) enum?])]{
-
-An @tech{enumeration} of lists of length @racket[n] of values
-enumerated by @racket[e]. If @racket[n] is not given, lists of any
-size are enumerated.
-
-@examples[#:eval the-eval
-(approximate (many/e nat/e) 5)
-(approximate (many/e nat/e 5) 5)
-]}
-
-@defproc[(many1/e [e enum?]) enum?]{
-
-An @tech{enumeration} of non-empty lists of values enumerated by
-@racket[e].
-
-@examples[#:eval the-eval
-(approximate (many1/e nat/e) 5)
-]}
-
-@defproc[(cantor-vec/e [e enum?] ...) enum?]{
-
-An @tech{enumeration} of vectors of values enumerated by the
-@racket[e].
-
-@examples[#:eval the-eval
-(approximate (cantor-vec/e (fin/e "Brian" "Jenny" "Ki" "Ted") 
-                           nat/e
-                           (fin/e "Terra" "Locke" "Edgar" "Mash"))
-             5)
-]}
-
-@defproc[(vec/e [e enum?] ...) enum?]{
-
-An @tech{enumeration} of vectors of values enumerated by the
-@racket[e].
-
-@examples[#:eval the-eval
-(approximate (vec/e (fin/e "Brian" "Jenny" "Ki" "Ted") 
-                    nat/e
-                    (fin/e "Terra" "Locke" "Edgar" "Mash"))
-             5)
-]}
-
-@defproc[(box-vec/e [e enum?] ...) enum?]{
-
-An @tech{enumeration} of vectors of values enumerated by the
-@racket[e].
-
-@examples[#:eval the-eval
-(approximate (box-vec/e (fin/e "Brian" "Jenny" "Ki" "Ted") 
-                        nat/e
-                        (fin/e "Terra" "Locke" "Edgar" "Mash"))
-             5)
-]}
-
-@defproc[(inf-fin-fair-list/e [e enum?] ...) enum?]{
-
-An @tech{enumeration} of lists of values enumerated by the
-@racket[e].
-
-@examples[#:eval the-eval
-(approximate (inf-fin-fair-list/e
-              (fin/e "Brian" "Jenny" "Ki" "Ted") 
-              nat/e
-              (fin/e "Terra" "Locke" "Edgar" "Mash"))
-             5)
-]}
-
-@defproc[(mixed-box-tuples/e [es (listof enum?)]) enum?]{
-
-An @tech{enumeration} of lists of values enumerated by the
-enumerations in @racket[es].
-
-@examples[#:eval the-eval
-(approximate (mixed-box-tuples/e
-              (list (fin/e "Brian" "Jenny" "Ki" "Ted") 
-                    nat/e
-                    (fin/e "Terra" "Locke" "Edgar" "Mash")))
-             5)
-]}
-
-@defproc[(inf-fin-cons/e [x enum?] [y enum?]) enum?]{
-
-An @tech{enumeration} of pairs of the values from @racket[x] and
-@racket[y]. One of the enumerations must be finite.
-
-@examples[#:eval the-eval
-(approximate (inf-fin-cons/e (take/e nat/e 4) (take/e nat/e 5)) 5)
-(approximate (inf-fin-cons/e nat/e (take/e nat/e 5)) 5)
-(approximate (inf-fin-cons/e (take/e nat/e 4) nat/e) 5)
-]}
-
-@defproc[(list/e [e enum?] ...) enum?]{
-
-An @tech{enumeration} of lists of values enumerated by the
-@racket[e].
-
-@examples[#:eval the-eval
-(approximate (list/e
-              (fin/e "Brian" "Jenny" "Ki" "Ted") 
-              nat/e
-              (fin/e "Terra" "Locke" "Edgar" "Mash"))
-             5)
-]}
-
-@defproc[(nested-cons-list/e [e enum?] ...) enum?]{
-
-An @tech{enumeration} of lists of values enumerated by the
-@racket[e].
-
-@examples[#:eval the-eval
-(approximate (nested-cons-list/e
-              (fin/e "Brian" "Jenny" "Ki" "Ted") 
-              nat/e
-              (fin/e "Terra" "Locke" "Edgar" "Mash"))
-             5)
-]}
-
-@defproc[(cantor-list/e [e enum?] ...) enum?]{
-
-An @tech{enumeration} of lists of values enumerated by the
-@racket[e].
-
-@examples[#:eval the-eval
-(approximate (cantor-list/e
-              (fin/e "Brian" "Jenny" "Ki" "Ted") 
-              nat/e
-              (fin/e "Terra" "Locke" "Edgar" "Mash"))
-             5)
-]}
-
-@defproc[(box-list/e [e enum?] ...) enum?]{
-
-An @tech{enumeration} of lists of values enumerated by the
-@racket[e].
-
-@examples[#:eval the-eval
-(approximate (box-list/e
-              (fin/e "Brian" "Jenny" "Ki" "Ted") 
-              nat/e
-              (fin/e "Terra" "Locke" "Edgar" "Mash"))
-             5)
-]}
-
-@defproc[(prime-length-box-list/e [es (listof enum?)]) enum?]{
-
-An @tech{enumeration} of lists of values enumerated by the
-enumerations in @racket[es].
-
-@examples[#:eval the-eval
-(approximate (prime-length-box-list/e
-              (list (fin/e "Brian" "Jenny" "Ki" "Ted") 
-                    nat/e
-                    (fin/e "Terra" "Locke" "Edgar" "Mash")))
-             5)
-]}
-
-@defproc[(box-tuples/e [k exact-nonnegative-integer?]) enum?]{
-
-An @tech{enumeration} of tuples of naturals of length @racket[k].
-
-@examples[#:eval the-eval
-(approximate (box-tuples/e 3)
-             5)
-]}
-
-@defproc[(bounded-list/e [k exact-nonnegative-integer?] [n exact-nonnegative-integer?]) enum?]{
-
-An @tech{enumeration} of tuples of naturals up to @racket[n] of length @racket[k].
-
-@examples[#:eval the-eval
-(approximate (bounded-list/e 3 2)
-             5)
-]}
-
-@defproc[(nat+/e [lo exact-nonnegative-integer?]) enum?]{
-
-An @tech{enumeration} of tuples of naturals of larger than @racket[lo].
-
-@examples[#:eval the-eval
-(approximate (nat+/e 42)
-             5)
-]}
-
-@defproc[(fail/e [e exn?]) enum?]{
-
-An @tech{enumeration} raises @racket[e] if @racket[from-nat] or
-@racket[to-nat] is called with it.
-
-@examples[#:eval the-eval
-(approximate 
- (fail/e
-  (exn:fail "Don't do that!"
-            (current-continuation-marks)))
- 5)
-]}
-
-@defthing[char/e enum?]{
-
-An @tech{enumeration} of characters.
-
-@examples[#:eval the-eval
-(approximate char/e 5)
-]}
-
-@defthing[string/e enum?]{
-
-An @tech{enumeration} of strings.
-
-@examples[#:eval the-eval
-(approximate string/e 5)
-]}
-
-@defthing[from-1/e enum?]{
-
-An @tech{enumeration} of naturals starting from @racket[1].
-
-@examples[#:eval the-eval
-(approximate from-1/e 5)
-]}
-
-@defthing[integer/e enum?]{
-
-An @tech{enumeration} of integers.
-
-@examples[#:eval the-eval
-(approximate integer/e 5)
-]}
-
-@defthing[float/e enum?]{
-
-An @tech{enumeration} of flonums.
-
-@examples[#:eval the-eval
-(approximate float/e 5)
-]}
-
-@defthing[real/e enum?]{
-
-An @tech{enumeration} of reals.
-
-@examples[#:eval the-eval
-(approximate real/e 5)
-]}
-
-@defthing[non-real/e enum?]{
-
-An @tech{enumeration} of non-real numbers.
-
-@examples[#:eval the-eval
-(approximate non-real/e 5)
-]}
-
-@defthing[num/e enum?]{
-
-An @tech{enumeration} of numbers.
-
-@examples[#:eval the-eval
-(approximate num/e 5)
-]}
-
-@defthing[bool/e enum?]{
-
-An @tech{enumeration} of booleans.
-
-@examples[#:eval the-eval
-(to-list bool/e)
-]}
-
-@defthing[symbol/e enum?]{
-
-An @tech{enumeration} of symbols.
-
-@examples[#:eval the-eval
-(approximate symbol/e 5)
-]}
-
-@defthing[base/e enum?]{
-
-An @tech{enumeration} of atomic Racket values.
-
-@examples[#:eval the-eval
-(approximate base/e 5)
-]}
-
-@defthing[any/e enum?]{
-
-An @tech{enumeration} of S-expressions.
-
-@examples[#:eval the-eval
-(approximate any/e 5)
-]}
-
-@section{Library Enumerations}
-@(the-eval '(require data/enumerate/lib))
-
-@defmodule[data/enumerate/lib]
-
-This library defines some library @tech{enumerations} built on
-@racketmodname[data/enumerate].
-
-@defproc[(random-index [e enum?])
-         exact-nonnegative-integer?]{
-
-Returns a random index into @racket[e]. This works regardless of the
-size of @racket[e], unlike @racket[(random (size e))].
-
-@examples[#:eval the-eval
-(random (size nat/e))
-(random (size (below/e 5000000000)))
-(random-index nat/e)
-(random-index (below/e 5000000000))
-]}
-
-@defproc[(permutations-of-n/e [n exact-nonnegative-integer?])
-         enum?]{
-
-Returns an @tech{enumeration} of the permutations of the natural
-numbers smaller than @racket[n].
-
-@examples[#:eval the-eval
-(approximate (permutations-of-n/e 3) 5)
-]}
-
-@defproc[(permutations/e [l list?])
-         enum?]{
-
-Returns an @tech{enumeration} of the permutations of @racket[l].
-
-@examples[#:eval the-eval
-(approximate (permutations/e '(Brian Jenny Ted Ki)) 5)
-]}
-
-@defproc[(infinite-sequence/e [e enum?])
-         enum?]{
-
-Returns an @tech{enumeration} of infinite sequences of elements of
-@racket[e]. (Unfortunately, @racket[encode] does not work on this
-@tech{enumeration}, for reasons you may be able to predict.)
-
-The infinite sequence corresponding to the natural number @racket[_n]
-is based on dividing the bits of @racket[(* (+ 1 _n) pi)] into chunks
-of bits where the largest value is @racket[(size e)]. Since
-@racket[(* (+ 1 _n) pi)] has infinite digits, there are infinitely
-many such chunks. Since @racket[*] is defined on all naturals, there
-are infinitely many such numbers. The generation of the sequence is
-efficient in the sense that the digits are generated incrementally
-without needing to go deeper. The generation of the sequence is
-inefficient in the sense that the approximation of @racket[(* (+ 1 _n)
-pi)] gets larger and larger as you go deeper into the sequence.
-
-@examples[#:eval the-eval
-(define bjtk/e (from-list/e '(Brian Jenny Ted Ki)))
-(define bjtks/e (infinite-sequence/e bjtk/e))
-(for ([e (from-nat bjtks/e 42)]
-      [i (in-range 10)])
-  (printf "~a = ~a\n" i e))]}
-
-@close-eval[the-eval]
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/gvector.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/gvector.scrbl
deleted file mode 100644
index f36c6598d7..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/gvector.scrbl
+++ /dev/null
@@ -1,137 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          (for-label data/gvector
-                     racket/contract
-                     racket/dict
-                     racket/base))
-
-@title[#:tag "gvector"]{Growable Vectors}
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require data/gvector))
-@(the-eval '(require racket/dict))
-
-@defmodule[data/gvector]
-
-@author[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-A growable vector (gvector) is a mutable sequence whose length can
-change over time. A gvector also acts as a dictionary (@racket[dict?]
-from @racketmodname[racket/dict]), where the keys are zero-based
-indexes and the values are the elements of the gvector. A gvector can
-be extended by adding an element to the end, and it can be shrunk by
-removing any element, although removal can take time linear in the
-number of elements in the gvector.
-
-Two gvectors are @racket[equal?] if they contain the same number of
-elements and if the contain equal elements at each index.
-
-Operations on gvectors are not thread-safe.
-
-@defproc[(make-gvector [#:capacity capacity exact-positive-integer? 10])
-         gvector?]{
-
-Creates a new empty gvector with an initial capacity of
-@racket[capacity].
-}
-
-@defproc[(gvector [elem any/c] ...)
-         gvector?]{
-
-Creates a new gvector containing each @racket[elem] in order.
-}
-
-@defproc[(gvector? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is a gvector, @racket[#f] otherwise.
-}
-
-@defproc[(gvector-ref [gv gvector?]
-                      [index exact-nonnegative-integer?]
-                      [default any/c (error ....)])
-         any/c]{
-
-Returns the element at index @racket[index], if @racket[index] is less
-than @racket[(gvector-count gv)]. Otherwise, @racket[default] is
-invoked if it is a procedure, returned otherwise.
-}
-
-@defproc[(gvector-add! [gv gvector?]
-                       [value any/c] ...)
-         void?]{
-
-Adds each @racket[value] to the end of the gvector @racket[gv].
-}
-
-@defproc[(gvector-set! [gv gvector?]
-                       [index (and/c exact-nonnegative-integer? 
-                                     (</c (+ 1 (gvector-count gv))))]
-                       [value any/c])
-         void?]{
-
-Sets the value at index @racket[index] to be @racket[value]. If
-@racket[index] is @racket[(gvector-count gv)]---that is, one more than
-the greatest used index---the effect is the same as
-@racket[(gvector-add! gv value)].
-}
-
-@defproc[(gvector-remove! [gv gvector?]
-                          [index (and/c exact-nonnegative-integer?
-                                        (</c (gvector-count gv)))])
-         void?]{
-
-Removes the item at @racket[index], shifting items at higher indexes
-down. Takes time proportional to @racket[(- (gvector-count gv)
-index)].
-}
-
-@defproc[(gvector-remove-last! [gv gvector?])
-         any/c]{
-Removes the element at the end and returns it.  Takes constant time.
-}
-
-
-@defproc[(gvector-count [gv gvector?])
-         exact-nonnegative-integer?]{
-
-Returns the number of items in @racket[gv].
-}
-
-@defproc[(gvector->vector [gv gvector?])
-         vector?]{
-
-Returns a vector of length @racket[(gvector-count gv)] containing the
-elements of @racket[gv] in order.
-}
-
-@defproc[(gvector->list [gv gvector?])
-         list?]{
-
-Returns a list of length @racket[(gvector-count gv)] containing the
-elements of @racket[gv] in order.
-}
-
-@defproc[(in-gvector [gv gvector?])
-         sequence?]{
-
-Returns a sequence whose elements are the elements of
-@racket[gv]. Mutation of @racket[gv] while the sequence is running
-changes the elements produced by the sequence. To obtain a sequence
-from a snapshot of @racket[gv], use @racket[(in-vector
-(gvector->vector gv))] instead.
-}
-
-@deftogether[[
-@defform[(for/gvector (for-clause ...) body ...+)]
-@defform[(for*/gvector (for-clause ...) body ...+)]]]{
-
-Analogous to @racket[for/list] and @racket[for*/list], but constructs
-a gvector instead of a list.
-
-Unlike @racket[for/list], the @racket[body] may return zero or
-multiple values; all returned values are added to the gvector, in
-order, on each iteration.
-}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/heap.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/heap.scrbl
deleted file mode 100644
index 29198df793..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/heap.scrbl
+++ /dev/null
@@ -1,202 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          (for-label data/heap
-                     racket/contract
-                     racket/base))
-
-@title{Binary Heaps}
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require data/heap))
-
-@defmodule[data/heap]
-
-@author[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-Binary heaps are a simple implementation of priority queues.
-
-Operations on binary heaps are not thread-safe.
-
-@defproc[(make-heap [<=? (-> any/c any/c any/c)])
-         heap?]{
-
-Makes a new empty heap using @racket[<=?] to order elements.
-
-@examples[#:eval the-eval
-  (define a-heap-of-strings (make-heap string<=?))
-  a-heap-of-strings
-  @code:comment{With structs:}
-  (struct node (name val))
-  (define (node<=? x y)
-    (<= (node-val x) (node-val y)))
-  (define a-heap-of-nodes (make-heap node<=?))
-  a-heap-of-nodes]
-}
-
-@defproc[(heap? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is a heap, @racket[#f] otherwise.
-
-@examples[#:eval the-eval
-  (heap? (make-heap <=))
-  (heap? "I am not a heap")]
-}
-
-@defproc[(heap-count [h heap?]) exact-nonnegative-integer?]{
-
-Returns the number of elements in the heap.
-@examples[#:eval the-eval
-  (define a-heap (make-heap <=))
-  (heap-add-all! a-heap '(7 3 9 1 13 21 15 31))
-  (heap-count a-heap)
-]
-}
-
-@defproc[(heap-add! [h heap?] [v any/c] ...) void?]{
-
-Adds each @racket[v] to the heap.
-
-@examples[#:eval the-eval
-  (define a-heap (make-heap <=))
-  (heap-add! a-heap 2009 1009)]
-}
-
-
-@defproc[(heap-add-all! [h heap?] [v (or/c list? vector? heap?)]) void?]{
-
-Adds each element contained in @racket[v] to the heap, leaving
-@racket[v] unchanged.
-
-@examples[#:eval the-eval
-  (define heap-1 (make-heap <=))
-  (define heap-2 (make-heap <=))
-  (define heap-12 (make-heap <=))
-  (heap-add-all! heap-1 '(3 1 4 1 5 9 2 6))
-  (heap-add-all! heap-2 #(2 7 1 8 2 8 1 8))
-  (heap-add-all! heap-12 heap-1)
-  (heap-add-all! heap-12 heap-2)
-  (heap-count heap-12)]
-}
-
-@defproc[(heap-min [h heap?]) any/c]{
-
-Returns the least element in the heap @racket[h], according to the
-heap's ordering. If the heap is empty, an exception is raised.
-
-@examples[#:eval the-eval
-  (define a-heap (make-heap string<=?))
-  (heap-add! a-heap "sneezy" "sleepy" "dopey" "doc"
-             "happy" "bashful" "grumpy")
-  (heap-min a-heap)
-
-  @code:comment{Taking the min of the empty heap is an error:}
-  (heap-min (make-heap <=))
-]
-}
-
-@defproc[(heap-remove-min! [h heap?]) void?]{
-
-Removes the least element in the heap @racket[h]. If the heap is
-empty, an exception is raised.
-
-@examples[#:eval the-eval
-  (define a-heap (make-heap string<=?))
-  (heap-add! a-heap "fili" "fili" "oin" "gloin" "thorin"
-                    "dwalin" "balin" "bifur" "bofur"
-                    "bombur" "dori" "nori" "ori")
-  (heap-min a-heap)
-  (heap-remove-min! a-heap)
-  (heap-min a-heap)]
-}
-
-@defproc[(heap-remove! [h heap?] [v any/c] [#:same? same? (-> any/c any/c any/c) equal?]) void?]{
-Removes @racket[v] from the heap @racket[h] if it exists. 
-@examples[#:eval the-eval
-  (define a-heap (make-heap string<=? string=?))
-  (heap-add! a-heap "a" "b" "c")
-  (heap-remove! a-heap "b")
-  (for/list ([a (in-heap a-heap)]) a)]
-}
-
-@defproc[(vector->heap [<=? (-> any/c any/c any/c)] [items vector?]) heap?]{
-
-Builds a heap with the elements from @racket[items]. The vector is not
-modified.
-@examples[#:eval the-eval
-  (struct item (val frequency))
-  (define (item<=? x y)
-    (<= (item-frequency x) (item-frequency y)))
-  (define some-sample-items 
-    (vector (item #\a 17) (item #\b 12) (item #\c 19)))
-  (define a-heap (vector->heap item<=? some-sample-items))
-]
-}
-
-@defproc[(heap->vector [h heap?]) vector?]{
-
-Returns a vector containing the elements of heap @racket[h] in the
-heap's order. The heap is not modified.
-
-@examples[#:eval the-eval
-  (define word-heap (make-heap string<=?))
-  (heap-add! word-heap "pile" "mound" "agglomerate" "cumulation")
-  (heap->vector word-heap)
-]
-}
-
-@defproc[(heap-copy [h heap?]) heap?]{
-
-Makes a copy of heap @racket[h].
-@examples[#:eval the-eval
-  (define word-heap (make-heap string<=?))
-  (heap-add! word-heap "pile" "mound" "agglomerate" "cumulation")
-  (define a-copy (heap-copy word-heap))
-  (heap-remove-min! a-copy)
-  (heap-count word-heap)
-  (heap-count a-copy)
-]
-}
-
-@defproc[(in-heap/consume! [heap heap?]) sequence?]{
-Returns a sequence equivalent to @racket[heap], maintaining the heap's ordering. 
-The heap is consumed in the process. Equivalent to repeated calling 
-@racket[heap-min], then @racket[heap-remove-min!].
-
-  @examples[#:eval the-eval
-            (define h (make-heap <=))
-            (heap-add-all! h '(50 40 10 20 30))
-
-            (for ([x (in-heap/consume! h)])
-              (displayln x))
-
-            (heap-count h)]
-}
-
-@defproc[(in-heap [heap heap?]) sequence?]{
-Returns a sequence equivalent to @racket[heap], maintaining the heap's ordering.
-Equivalent to @racket[in-heap/consume!] except the heap is copied first.
-
-  @examples[#:eval the-eval
-            (define h (make-heap <=))
-            (heap-add-all! h '(50 40 10 20 30))
-
-            (for ([x (in-heap h)])
-              (displayln x))
-
-            (heap-count h)]
-}
-
-@;{--------}
-
-@defproc[(heap-sort! [v (and/c vector? (not/c immutable?))] [<=? (-> any/c any/c any/c)]) void?]{
-
-Sorts vector @racket[v] using the comparison function @racket[<=?].
-
-@examples[#:eval the-eval
-  (define terms (vector "batch" "deal" "flock" "good deal" "hatful" "lot"))
-  (heap-sort! terms string<=?)
-  terms
-]
-}
-
-@close-eval[the-eval]
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/integer-set.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/integer-set.scrbl
deleted file mode 100644
index d5f712b612..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/integer-set.scrbl
+++ /dev/null
@@ -1,160 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          (for-label data/integer-set
-                     racket/contract
-                     (except-in racket/base
-                                foldr)))
-@(define (racket-tech pre)
-   (tech #:doc '(lib "scribblings/reference/reference.scrbl") pre))
-
-@title[#:tag "integer-set"]{Integer Sets}
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require data/integer-set))
-
-@defmodule[data/integer-set]
-
-This library provides functions for
-working with finite sets of integers.  This module is designed for
-sets that are compactly represented as groups of intervals, even when
-their cardinality is large.  For example, the set of integers from
-@math{-1000000} to @math{1000000} except for @math{0}, can be represented as
-@math{{[-1000000, -1], [1, 1000000]}}.  This data structure would not be
-a good choice for the set of all odd integers between @math{0} and
-@math{1000000}, which would be @math{{[1, 1], [3, 3], ... [999999,
-999999]}}.
-
-In addition to the @defterm{integer set} abstract type, a
-@defterm{well-formed set} is a list of pairs of exact integers, where
-each pair represents a closed range of integers, and the entire set is
-the union of the ranges.  The ranges must be disjoint and increasing.
-Further, adjacent ranges must have at least one integer between them.
-For example: @racket['((-1 . 2) (4 . 10))] is a well-formed-set as is
-@racket['((1 . 1) (3 . 3))], but @racket['((1 . 5) (6 . 7))],
-@racket['((1 . 5) (-3 . -1))], @racket['((5 . 1))], and @racket['((1
-. 5) (3 . 6))] are not.
-
-An integer set implements the @racket-tech{stream} and
-@racket-tech{sequence} generic interfaces.
-
-@defproc[(make-integer-set [wfs well-formed-set?]) integer-set?]{
-
-Creates an integer set from a well-formed set.}
-
-
-@defproc[(integer-set-contents [s integer-set?]) well-formed-set?]{
-
-Produces a well-formed set from an integer set.}
-
-
-@defproc[(set-integer-set-contents! [s integer-set?][wfs well-formed-set?]) void?]{
-
-Mutates an integer set.}
-
-
-@defproc[(integer-set? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is an integer set, @racket[#f]
-otherwise.}
-
-@defproc[(well-formed-set? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a well-formed set, @racket[#f]
-otherwise.}
-
-@defproc*[([(make-range) integer-set?]
-           [(make-range [elem exact-integer?]) integer-set?]
-           [(make-range [start exact-integer?]
-                        [end exact-integer?]) integer-set?])]{
-
-Produces, respectively, an empty integer set, an integer set
-containing only @racket[elem], or an integer set containing the
-integers from @racket[start] to @racket[end] inclusive, where
-@racket[(start . <= . end)].}
-
-
-@defproc[(intersect [x integer-set?][y integer-set?]) integer-set?]{
-
-Returns the intersection of the given sets.}
-
-
-@defproc[(subtract [x integer-set?][y integer-set?]) integer-set?]{
-
-Returns the difference of the given sets (i.e., elements in @racket[x]
-that are not in @racket[y]).}
-
-
-@defproc[(union [x integer-set?][y integer-set?]) integer-set?]{
-
-Returns the union of the given sets.}
-
-
-@defproc[(split [x integer-set?][y integer-set?])
-         (values integer-set? integer-set? integer-set?)]{
-
-Produces three values: the first is the intersection of @racket[x] and
-@racket[y], the second is the difference @racket[x] remove @racket[y],
-and the third is the difference @racket[y] remove @racket[x].}
-
-
-@defproc[(complement [s integer-set?]
-                     [start exact-integer?]
-                     [end exact-integer?]) integer-set?]{
-
-Returns a set containing the elements between @racket[start] to
-@racket[end] inclusive that are not in @racket[s], where
-@racket[(start-k . <= . end-k)].}
-
-
-@defproc[(symmetric-difference [x integer-set?][y integer-set?]) integer-set?]{
-
-Returns an integer set containing every member of @racket[x]
-and @racket[y] that is not in both sets.}
-
-
-@defproc[(member? [k exact-integer?][s integer-set?]) boolean?]{
-
-Returns @racket[#t] if @racket[k] is in @racket[s], @racket[#f]
-otherwise.}
-
-
-@defproc[(get-integer [set integer-set?]) (or/c exact-integer? #f)]{
-
-Returns a member of @racket[set], or @racket[#f] if @racket[set] is empty.}
-
-
-@defproc[(foldr [proc (exact-integer? any/c . -> . any/c)]
-                [base-v any/c]
-                [s integer-set?])
-         any/c]{
-
-Applies @racket[proc] to each member of @racket[s] in ascending order,
-where the first argument to @racket[proc] is the set member, and the
-second argument is the fold result starting with @racket[base-v]. For
-example, @racket[(foldr cons null s)] returns a list of all the
-integers in @racket[s], sorted in increasing order.}
-
-
-@defproc[(partition [s (listof integer-set?)]) (listof integer-set?)]{
-
-Returns the coarsest refinement of the sets in @racket[s] such that
-the sets in the result list are pairwise disjoint.  For example,
-partitioning the sets that represent @racket['((1 . 2) (5 . 10))] and
-@racket['((2 . 2) (6 . 6) (12 . 12))] produces the a list containing
-the sets for @racket['((1 . 1) (5 . 5) (7 . 10))] @racket['((2 . 2) (6
-. 6))], and @racket['((12 . 12))].}
-
-
-@defproc[(count [s integer-set?]) exact-nonnegative-integer?]{
-
-Returns the number of integers in the given integer set.}
-
-
-@defproc[(subset? [x integer-set?][y integer-set?]) boolean?]{
-
-Returns true if every integer in @racket[x] is also in
-@racket[y], otherwise @racket[#f].}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/interval-map.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/interval-map.scrbl
deleted file mode 100644
index 2db7b31cb7..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/interval-map.scrbl
+++ /dev/null
@@ -1,174 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          (for-label data/interval-map
-                     racket/contract
-                     racket/dict
-                     racket/base))
-
-@title[#:tag "interval-map"]{Interval Maps}
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require data/interval-map))
-@(the-eval '(require racket/dict))
-
-@defmodule[data/interval-map]
-
-@author[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-An interval-map is a mutable data structure that maps @emph{half-open}
-intervals of exact integers to values. An interval-map is queried at a
-discrete point, and the result of the query is the value mapped to the
-interval containing the point.
-
-Internally, interval-maps use a splay-tree
-(@racketmodname[data/splay-tree]) of intervals for efficient query and
-update, including efficient contraction and expansion of intervals.
-
-Interval-maps implement the dictionary (@racketmodname[racket/dict])
-interface to a limited extent. Only @racket[dict-ref] and the
-iteration-based methods (@racket[dict-iterate-first],
-@racket[dict-map], etc) are supported. For the iteration-based
-methods, the mapping's keys are considered the pairs of the start and
-end positions of the mapping's intervals.
-
-@examples[#:eval the-eval
-(define r (make-interval-map))
-(interval-map-set! r 1 5 'apple)
-(interval-map-set! r 6 10 'pear)
-(interval-map-set! r 3 7 'banana)
-(dict-map r list)
-]
-
-Operations on interval-maps are not thread-safe.
-
-@defproc[(make-interval-map [#:key-contract key-contract contract? any/c]
-                            [#:value-contract value-contract contract? any/c])
-         interval-map?]{
-
-Makes a new empty interval-map.
-}
-
-@defproc[(interval-map? [v any/c])
-         boolean?]{
-
-Returns @racket[#t] if @racket[v] is an interval-map, @racket[#f]
-otherwise.
-}
-
-@defproc[(interval-map-ref [interval-map interval-map?]
-                           [position exact-integer?]
-                           [default any/c (lambda () (error ....))])
-         any/c]{
-
-Return the value associated with @racket[position] in
-@racket[interval-map]. If no mapping is found, @racket[default] is
-applied if it is a procedure, or returned otherwise.
-}
-
-@defproc[(interval-map-set! [interval-map interval-map?]
-                            [start exact-integer?]
-                            [end exact-integer?]
-                            [value any/c])
-         void?]{
-
-Updates @racket[interval-map], associating every position in
-[@racket[start], @racket[end]) with @racket[value].
-
-Existing interval mappings contained in [@racket[start], @racket[end])
-are destroyed, and partly overlapping intervals are truncated. See
-@racket[interval-map-update*!] for an updating procedure that
-preserves distinctions within [@racket[start], @racket[end]).
-}
-
-@defproc[(interval-map-update*! [interval-map interval-map?]
-                                [start exact-integer?]
-                                [end exact-integer?]
-                                [updater (-> any/c any/c)]
-                                [default any/c (lambda () (error ....))])
-         void?]{
-
-Updates @racket[interval-map], associating every position in
-[@racket[start], @racket[end]) with the result of applying
-@racket[updater] to the position's previously associated value, or to
-the default value produced by @racket[default] if no mapping exists.
-
-Unlike @racket[interval-map-set!], @racket[interval-map-update*!]
-preserves existing distinctions within [@racket[start], @racket[end]).
-}
-
-@defproc[(interval-map-remove! [interval-map interval-map?]
-                               [start (or/c exact-integer? -inf.0)]
-                               [end (or/c exact-integer? +inf.0)])
-         void?]{
-
-Removes the value associated with every position in [@racket[start],
-@racket[end]).
-}
-
-@defproc[(interval-map-contract! [interval-map interval-map?]
-                                 [start exact-integer?]
-                                 [end exact-integer?])
-         void?]{
-
-Contracts @racket[interval-map]'s domain by removing all mappings on
-the interval [@racket[start], @racket[end]) and decreasing intervals
-initally after @racket[end] by @racket[(- end start)].
-
-If @racket[start] is not less than @racket[end], an exception is raised.
-}
-
-@defproc[(interval-map-expand! [interval-map interval-map?]
-                               [start exact-integer?]
-                               [end exact-integer?])
-         void?]{
-
-Expands @racket[interval-map]'s domain by introducing a gap
-[@racket[start], @racket[end]) and increasing intervals initially after
-@racket[start] by @racket[(- end start)].
-
-If @racket[start] is not less than @racket[end], an exception is raised.
-}
-
-@defproc[(interval-map-cons*! [interval-map interval-map?]
-                              [start any/c]
-                              [end any/c]
-                              [v any/c]
-                              [default any/c null])
-         void?]{
-
-Same as the following:
-@racketblock[
-(interval-map-update*! interval-map start end
-                       (lambda (old) (cons v old))
-                       default)
-]
-}
-
-
-@deftogether[[
-@defproc[(interval-map-iterate-first [interval-map interval-map?])
-         (or/c interval-map-iter? #f)]
-@defproc[(interval-map-iterate-next [interval-map interval-map?]
-                                    [iter interval-map-iter?])
-         (or/c interval-map-iter? #f)]
-@defproc[(interval-map-iterate-key [interval-map interval-map?]
-                                   [iter interval-map-iter?])
-         pair?]
-@defproc[(interval-map-iterate-value [interval-map interval-map?]
-                                     [iter interval-map-iter?])
-         any]]]{
-
-Implementations of @racket[dict-iterate-first],
-@racket[dict-iterate-next], @racket[dict-iterate-key], and
-@racket[dict-iterate-value], respectively.
-}
-
-@defproc[(interval-map-iter? [v any/c])
-         boolean?]{
-
-Returns @racket[#t] if @racket[v] represents a position in an
-interval-map, @racket[#f] otherwise.
-}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/order.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/order.scrbl
deleted file mode 100644
index d1ca17dfc9..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/order.scrbl
+++ /dev/null
@@ -1,258 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          (for-label data/order
-                     racket/contract
-                     racket/dict
-                     racket/base
-		     racket/generic))
-
-@title{Orders and Ordered Dictionaries}
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/dict data/order))
-
-@defmodule[data/order]
-
-@author[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-This library defines @deftech{orders} and the @deftech{ordered
-dictionary} generic interface.
-
-@defthing[ordering/c flat-contract?]{
-
-Contract for orderings, represented by the symbols @racket['=],
-@racket['<], and @racket['>].
-}
-
-@defthing[gen:ordered-dict any/c]{
-
-A generic interface for defining new ordered dictionary types.
-Methods can be attached to the @racket[gen:ordered-dict] interface
-using the @racket[#:methods] keyword in a structure type definition.
-Two ``extrema'' methods and four ``search'' methods should be
-implemented. The extrema methods must satisfy @racket[_e/c] and the search
-methods must satisfy @racket[_s/c]:
-
-@racketblock[
-_e/c = (->i ([d ordered-dict?])
-            [_ (d) (or/c #f (dict-iter-contract d))])
-_s/c = (->i ([d ordered-dict?]
-             [k (d) (dict-key-contract d)])
-            [_ (d) (or/c #f (dict-iter-contract d))])
-]
-
-The methods are implementations of the following generic functions:
-
-@itemize[
-@item{@racket[dict-iterate-least]}
-@item{@racket[dict-iterate-greatest]}
-@item{@racket[dict-iterate-least/>?]}
-@item{@racket[dict-iterate-least/>=?]}
-@item{@racket[dict-iterate-greatest/<?]}
-@item{@racket[dict-iterate-greatest/<=?]}
-]
-
-A struct type that implements @racket[gen:ordered-dict] must also
-implement @racket[gen:dict].
-}
-
-@defthing[prop:ordered-dict
-          (struct-type-property/c
-           (vectorof _e/c _e/c _s/c _s/c _s/c _s/c))]{
-  A deprecated structure type property used to defined custom
-  ordered dictionaries. Use @racket[gen:ordered-dict] instead.
-  Accepts a vector of 6 procedures with the same arguments as
-  the methods of @racket[gen:ordered-dict].
-}
-
-@defproc[(ordered-dict? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is an instance of a struct
-implementing the @tech{ordered dictionary} interface (via
-@racket[gen:ordered-dict]).
-}
-
-@deftogether[[
-@defproc[(dict-iterate-least [dict ordered-dict?])
-         (or/c (dict-iter-contract dict) #f)]
-@defproc[(dict-iterate-greatest [dict ordered-dict?])
-         (or/c (dict-iter-contract dict) #f)]]]{
-
-Returns the position of the least (greatest) key in the ordered
-dictionary @racket[dict]. If @racket[dict] is empty, @racket[#f] is
-returned.
-}
-
-@deftogether[[
-@defproc[(dict-iterate-least/>? [dict ordered-dict?] [key any/c])
-         (or/c (dict-iter-contract dict) #f)]
-@defproc[(dict-iterate-least/>=? [dict ordered-dict?] [key any/c])
-         (or/c (dict-iter-contract dict) #f)]
-@defproc[(dict-iterate-greatest/<? [dict ordered-dict?] [key any/c])
-         (or/c (dict-iter-contract dict) #f)]
-@defproc[(dict-iterate-greatest/<=? [dict ordered-dict?] [key any/c])
-         (or/c (dict-iter-contract dict) #f)]
-]]{
-
-Returns the position of the least key greater than @racket[key], the
-least key greater than or equal to @racket[key], the greatest key less
-than @racket[key], and the greatest key less than or equal to
-@racket[key], respectively. If no key satisfies the criterion,
-@racket[#f] is returned.
-}
-
-@defproc*[([(order [name symbol?] 
-                   [domain-contract contract?]
-                   [comparator (-> any/c any/c ordering/c)])
-            (and/c order? procedure?)]
-           [(order [name symbol?]
-                   [domain-contract contract?]
-                   [=? (-> any/c any/c boolean?)]
-                   [<? (-> any/c any/c boolean?)]
-                   [>? (-> any/c any/c boolean?)
-                       (lambda (x y) (<? y x))])
-            (and/c order? procedure?)])]{
-
-Produces a named order object encapsulating a domain contract and a
-comparator function. If a single procedure is given, it is used
-directly as the comparator. If two or three procedures are given, they
-are used to construct the comparator.
-
-The @racket[domain-contract] is not applied to the comparison
-function; rather, clients of the order are advised to incorporate the
-domain contracts into their own contracts. For example, when a
-splay-tree (see @racketmodname[data/splay-tree]) is constructed with
-an order, it applies the domain-contract to its keys. Thus the
-contract is checked once per dictionary procedure call, rather than on
-every comparison.
-
-An order object is applicable as a procedure; it behaves as its
-comparator.
-
-@examples[#:eval the-eval
-(define string-order (order 'string-order string? string=? string<?))
-(string-order "abc" "acdc")
-(string-order "x" 12)
-]
-}
-
-@defproc[(order? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is an order object, @racket[#f]
-otherwise.
-}
-
-@defproc[(order-comparator [ord order?])
-         (-> any/c any/c ordering/c)]{
-
-Extracts the comparator function from an order object.
-}
-
-@defproc[(order-domain-contract [ord order?]) contract?]{
-
-Extracts the domain contract from an order object.
-}
-
-@deftogether[[
-@defproc[(order-=? [ord order?]) (-> any/c any/c boolean?)]
-@defproc[(order-<? [ord order?]) (-> any/c any/c boolean?)]
-]]{
-
-Returns a procedure representing the order's equality relation or
-less-than relation, respectively.
-}
-
-@defthing[real-order order?]{
-
-The order of the real numbers. The domain of @racket[real-order]
-excludes @racket[+nan.0] but includes @racket[+inf.0] and
-@racket[-inf.0]. The standard numeric comparisons (@racket[=],
-@racket[<]) are used; exact @racket[1] is equal to inexact
-@racket[1.0].
-
-@examples[#:eval the-eval
-(real-order 1.0 1)
-(real-order 5 7)
-(real-order 9.0 3.4)
-(real-order 1 +inf.0)
-(real-order 5 -inf.0)
-]
-}
-
-@defthing[datum-order order?]{
-
-An ad hoc order that encompasses many built-in Racket data types as
-well as prefab structs and fully-transparent structs. The
-@racket[datum-order] comparator orders values of the same data type
-according to the data type's natural order: @racket[string=?],
-@racket[string<?] for strings, for example (but see the warning about
-numbers below). Different data types are ordered arbitrarily but
-contiguously; for example, all strings sort before all vectors, or
-vice versa. Prefab and fully-transparent structs are ordered according
-to their most specific struct type, and prefab structs are ordered
-first by their prefab struct keys. The ordering of struct types is
-independent of the struct type hierarchy; a struct type may sort
-before one of its subtypes but after another.
-
-Programs should not rely on the ordering of different data types,
-since it may change in future versions of Racket to improve comparison
-performance. The ordering of non-prefab struct types may change
-between one execution of a program and the next.
-
-The order is guaranteed, however, to lexicographically sort proper
-lists, vectors, prefab structs, and fully-transparent
-structs. Improper lists sort lexicographically considered as pairs,
-but the ordering of an improper list and its proper prefix, such as
-@racket['(a b . c)] and @racket['(a b)], is not specified.
-
-The @racket[datum-order] comparator does not perform cycle-detection;
-comparisons involving cyclic data may diverge.
-
-@bold{Warning:} @racket[datum-order] is not compatible with the
-standard numeric order; all exact numbers are ordered separately from
-all inexact numbers. Thus @racket[1] is considered distinct from
-@racket[1.0], for example.
-
-The following data types are currently supported: numbers, strings,
-bytes, keywords, symbols, booleans, characters, paths, null, pairs, vectors,
-boxes, prefab structs, and fully-transparent structs.
-
-The following example comparisons are specified to return the results
-shown:
-@interaction[#:eval the-eval
-(datum-order 1 2)
-(datum-order 8.0 5.0)
-(datum-order 'apple 'candy)
-(datum-order '(a #:b c) '(a #:c d c))
-(datum-order '(5 . 4) '(3 2 1))
-(datum-order '(a b . c) '(a b . z))
-(datum-order "apricot" "apple")
-(datum-order '#(1 2 3) '#(1 2))
-(datum-order '#(1 2 3) '#(1 3))
-(datum-order (box 'car) (box 'candy))
-(datum-order '#s(point a 1) '#s(point b 0))
-(datum-order '#s(A 1 2) '#s(Z 3 4 5))
-(struct fish (name) #:transparent)
-(datum-order (fish 'alewife) (fish 'sockeye))
-]
-
-The following example comparisons are unspecified but consistent within
-all executions of a single version of Racket:
-@racketblock[
-(datum-order 1 2.0)
-(datum-order 3+5i 3+2i)
-(datum-order 'apple "zucchini")
-(datum-order '(a b) '(a b . c))
-(datum-order 0 'zero)
-]
-
-The following example comparison is unspecified but consistent within
-a single execution of a program:
-@racketblock[
-(struct fowl (name) #:transparent)
-(datum-order (fish 'alewife) (fowl 'dodo))
-]
-}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/queue.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/queue.scrbl
deleted file mode 100644
index e9a8d3cb0f..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/queue.scrbl
+++ /dev/null
@@ -1,162 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval (for-label racket data/queue))
-@(define qeval (make-base-eval))
-@(qeval '(require data/queue))
-
-@title{Imperative Queues}
-
-@defmodule[data/queue]
-
-@author[@author+email["Carl Eastlund" "cce@racket-lang.org"]]
-
-This module provides a simple mutable queue representation,
-providing first-in/first-out semantics. 
-
-Operations on queues mutate it in a thread-unsafe way.
-
-@defproc[(make-queue) queue?]{
-  Produces an empty queue.
-}
-
-@defproc[(enqueue! [q queue?] [v any/c]) void?]{
-  Adds an element to the back of a queue.
-  
-  This takes constant time, independent of the number
-  of elements in @racket[q].
-}
-
-@defproc[(enqueue-front! [q queue?] [v any/c]) void?]{
-  Adds an element to the front of a queue.
-
-  This takes constant time, independent of the number
-  of elements in @racket[q].
-}
-
-@defproc[(dequeue! [q non-empty-queue?]) any/c]{
-  Removes an element from the front of a non-empty queue, and returns that
-  element.
-
-  This takes constant time, independent of the number
-  of elements in @racket[q].
-
-@defexamples[#:eval qeval
-    (define q (make-queue))
-    (enqueue! q 1)
-    (dequeue! q)
-    (enqueue! q 2)
-    (enqueue! q 3)
-    (dequeue! q)
-    (dequeue! q)
-    (enqueue! q 2)
-    (enqueue! q 1)
-    (enqueue-front! q 3)
-    (enqueue-front! q 4)
-    (queue->list q)]
-}
-
-@defproc[(queue-filter! [q queue?] [pred? (-> any/c any/c)]) void?]{
-  Applies @racket[pred?] to each element of the queue,
-  removing any where @racket[pred?] returns @racket[#f]. 
-  
-  This takes time proportional to the number of elements in @racket[q]
-  (assuming that @racket[pred?] takes constant time, independent
-   of the number of elements in @racket[q]). It does not allocate and
-   it calls @racket[pred?] exactly once for each element of @racket[q].
-  
-    @defexamples[#:eval qeval
-    (define q (make-queue))
-    (enqueue! q 1)
-    (enqueue! q 2)
-    (enqueue! q 3)
-    (enqueue! q 4)
-    (queue-filter! q even?)
-    (queue->list q)]
-}
-
-@defproc[(queue->list [queue queue?]) (listof any/c)]{
-  Returns an immutable list containing the elements of the queue
-  in the order the elements were added.
-
-  This takes time proportional to the number of elements in @racket[q].
-  
-  @defexamples[#:eval qeval
-    (define q (make-queue))
-    (enqueue! q 8)
-    (enqueue! q 9)
-    (enqueue! q 0)
-    (queue->list q)]
-}
-
-@defproc[(queue-length [queue queue?]) exact-nonnegative-integer?]{
-  Returns the number of elements in the queue.
-
-  This takes constant time, independent of the number
-  of elements in @racket[q].
-  
-  @defexamples[#:eval qeval
-    (define queue (make-queue))
-    (queue-length q)
-    (enqueue! q 5)
-    (enqueue! q 12)
-    (queue-length q)
-    (dequeue! q)
-    (queue-length q)]
-}
-
-@defproc[(queue-empty? [q queue?]) boolean?]{
-  Recognizes whether a queue is empty or not.
-  
-  This takes constant time, independent of the number
-  of elements in @racket[q].
-
-  @defexamples[#:eval qeval
-    (define q (make-queue))
-    (queue-empty? q)
-    (enqueue! q 1)
-    (queue-empty? q)
-    (dequeue! q)
-    (queue-empty? q)]
-}
-
-@defproc[(queue? [v any/c]) boolean?]{
-  This predicate recognizes queues.
-  
-  This takes constant time, independent of the 
-  size of the argument @racket[v].
-
-  @defexamples[#:eval qeval
-    (queue? (make-queue))
-    (queue? 'not-a-queue)]
-}
-
-@defproc[(non-empty-queue? [v any/c]) boolean?]{
-  This predicate recognizes non-empty queues.
-  
-  This takes constant time, independent of the 
-  size of the argument @racket[v].
-
-  @defexamples[#:eval qeval
-    (non-empty-queue? (let ([q (make-queue)])
-                        (enqueue! q 1)
-                        q))
-    (non-empty-queue? (make-queue))
-    (non-empty-queue? 'not-a-queue)]
-}
-
-@defproc[(in-queue [queue queue?])
-         sequence?]{
-
-Returns a sequence whose elements are the elements of
-@racket[queue].
-}
-
-@deftogether[(
-  @defthing[queue/c flat-contract?]
-  @defthing[nonempty-queue/c flat-contract?]
-)]{
- These are provided for backwards compatibility. They are
- identical to @racket[queue?] and @racket[non-empty-queue?],
- respectively.
-}
-
-@close-eval[qeval]
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/skip-list.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/skip-list.scrbl
deleted file mode 100644
index d7cf123abb..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/skip-list.scrbl
+++ /dev/null
@@ -1,181 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          (for-label data/skip-list
-                     data/order
-                     racket/contract
-                     racket/dict
-                     racket/base))
-
-@title[#:tag "skip-list"]{Skip Lists}
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/dict data/order data/skip-list))
-
-@defmodule[data/skip-list]
-
-@author[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-Skip lists are a simple, efficient data structure for mutable
-dictionaries with totally ordered keys. They were described in the
-paper ``Skip Lists: A Probabilistic Alternative to Balanced Trees'' by
-William Pugh in Communications of the ACM, June 1990, 33(6) pp668-676.
-
-A skip-list is an ordered dictionary (@racket[dict?] and
-@racket[ordered-dict?]). It also supports extensions of the dictionary
-interface for iterator-based search and mutation.
-
-Operations on skip-lists are not thread-safe. If a key in a skip-list
-is mutated, the skip-list's internal invariants may be violated,
-causings its behavior to become unpredictable.
-
-
-@defproc[(make-skip-list [ord order? datum-order]
-                         [#:key-contract key-contract contract? any/c]
-                         [#:value-contract value-contract contract? any/c])
-         skip-list?]{
-
-Makes a new empty skip-list. The skip-list uses @racket[ord] to order
-keys; in addition, the domain contract of @racket[ord] is combined
-with @racket[key-contract] to check keys.
-
-@examples[#:eval the-eval
-(define skip-list (make-skip-list real-order))
-(skip-list-set! skip-list 3 'apple)
-(skip-list-set! skip-list 6 'cherry)
-(dict-map skip-list list)
-(skip-list-ref skip-list 3)
-(skip-list-remove! skip-list 6)
-(skip-list-count skip-list)
-]
-}
-
-@defproc[(make-adjustable-skip-list
-           [#:key-contract key-contract contract? any/c]
-           [#:value-contract value-contract contract? any/c])
-         adjustable-skip-list?]{
-
-Makes a new empty skip-list that permits only exact integers as keys
-(in addition to any constraints imposed by @racket[key-contract]). The
-resulting skip-list answers true to @racket[adjustable-skip-list?]
-and supports key adjustment.
-}
-
-@defproc[(skip-list? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a skip-list, @racket[#f]
-otherwise.
-}
-
-@defproc[(adjustable-skip-list? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a skip-list that supports key
-adjustment; see @racket[skip-list-contract!] and
-@racket[skip-list-expand!].
-}
-
-@deftogether[[
-@defproc[(skip-list-ref [skip-list skip-list?]
-                        [key any/c]
-                        [default any/c (lambda () (error ....))])
-         any/c]
-@defproc[(skip-list-set! [skip-list skip-list?]
-                         [key any/c]
-                         [value any/c])
-         void?]
-@defproc[(skip-list-remove! [skip-list skip-list?]
-                            [key any/c])
-         void?]
-@defproc[(skip-list-count [skip-list skip-list?])
-         exact-nonnegative-integer?]
-@defproc[(skip-list-iterate-first [skip-list skip-list?])
-         (or/c skip-list-iter? #f)]
-@defproc[(skip-list-iterate-next [skip-list skip-list?]
-                                 [iter skip-list-iter?])
-         (or/c skip-list-iter? #f)]
-@defproc[(skip-list-iterate-key [skip-list skip-list?]
-                                [iter skip-list-iter?])
-         any/c]
-@defproc[(skip-list-iterate-value [skip-list skip-list?]
-                                  [iter skip-list-iter?])
-         any/c]]]{
-
-Implementations of @racket[dict-ref], @racket[dict-set!],
-@racket[dict-remove!], @racket[dict-count],
-@racket[dict-iterate-first], @racket[dict-iterate-next],
-@racket[dict-iterate-key], and @racket[dict-iterate-value],
-respectively.
-}
-
-@defproc[(skip-list-remove-range! [skip-list skip-list?]
-                                  [from any/c]
-                                  [to any/c])
-         void?]{
-
-Removes all keys in [@racket[from], @racket[to]); that is, all keys
-greater than or equal to @racket[from] and less than @racket[to].
-}
-
-@defproc[(skip-list-contract! [skip-list adjustable-skip-list?]
-                              [from exact-integer?]
-                              [to exact-integer?])
-         void?]{
-
-Like @racket[skip-list-remove-range!], but also decreases the value
-of all keys greater than or equal to @racket[to] by @racket[(- to
-from)].
-
-This operation takes time proportional to the number of elements with
-keys greater than or equal to @racket[to].
-}
-
-@defproc[(skip-list-expand! [skip-list adjustable-skip-list?]
-                            [from exact-integer?]
-                            [to exact-integer?])
-         void?]{
-
-Increases the value of all keys greater than or equal to @racket[from]
-by @racket[(- to from)].
-
-This operation takes time proportional to the number of elements with
-keys greater than or equal to @racket[from].
-}
-
-@deftogether[[
-@defproc[(skip-list-iterate-least/>? [skip-list skip-list?]
-                                        [key any/c])
-         (or/c skip-list-iter? #f)]
-@defproc[(skip-list-iterate-least/>=? [skip-list skip-list?]
-                                        [key any/c])
-         (or/c skip-list-iter? #f)]
-@defproc[(skip-list-iterate-greatest/<? [skip-list skip-list?]
-                                        [key any/c])
-         (or/c skip-list-iter? #f)]
-@defproc[(skip-list-iterate-greatest/<=? [skip-list skip-list?]
-                                        [key any/c])
-         (or/c skip-list-iter? #f)]
-@defproc[(skip-list-iterate-least [skip-list skip-list?])
-         (or/c skip-list-iter? #f)]
-@defproc[(skip-list-iterate-greatest [skip-list skip-list?])
-         (or/c skip-list-iter? #f)]]]{
-
-Implementations of @racket[dict-iterate-least],
-@racket[dict-iterate-greatest], @racket[dict-iterate-least/>?],
-@racket[dict-iterate-least/>=?], @racket[dict-iterate-greatest/<?],
-@racket[dict-iterate-greatest/<=?], @racket[dict-iterate-least], and
-@racket[dict-iterate-greatest], respectively.
-}
-
-@defproc[(skip-list-iter? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] represents a position in a
-skip-list, @racket[#f] otherwise.
-}
-
-@defproc[(skip-list->list [skip-list skip-list?]) (listof pair?)]{
-
-Returns an association list with the keys and values of
-@racket[skip-list], in order.
-}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/splay-tree.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/splay-tree.scrbl
deleted file mode 100644
index c8bc0a4058..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/splay-tree.scrbl
+++ /dev/null
@@ -1,184 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          (for-label data/splay-tree
-                     data/order
-                     racket/contract
-                     racket/dict
-                     racket/base))
-
-@title{Splay Trees}
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/dict data/order data/splay-tree))
-
-@defmodule[data/splay-tree]
-
-@author[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-Splay trees are an efficient data structure for mutable dictionaries
-with totally ordered keys. They were described in the paper
-``Self-Adjusting Binary Search Trees'' by Daniel Sleator and Robert
-Tarjan in Journal of the ACM 32(3) pp652-686.
-
-A splay-tree is a ordered dictionary (@racket[dict?] and
-@racket[ordered-dict?]).
-
-Operations on splay-trees are not thread-safe. If a key in a
-splay-tree is mutated, the splay-tree's internal invariants may be
-violated, causing its behavior to become unpredictable.
-
-
-@defproc[(make-splay-tree [ord order? datum-order]
-                          [#:key-contract key-contract contract? any/c]
-                          [#:value-contract value-contract contract? any/c])
-         splay-tree?]{
-
-Makes a new empty splay-tree. The splay tree uses @racket[ord] to
-order keys; in addition, the domain contract of @racket[ord] is
-combined with @racket[key-contract] to check keys.
-
-@examples[#:eval the-eval
-(define splay-tree
-  (make-splay-tree (order 'string-order string? string=? string<?)))
-(splay-tree-set! splay-tree "dot" 10)
-(splay-tree-set! splay-tree "cherry" 500)
-(dict-map splay-tree list)
-(splay-tree-ref splay-tree "dot")
-(splay-tree-remove! splay-tree "cherry")
-(splay-tree-count splay-tree)
-(splay-tree-set! splay-tree 'pear 3)
-]
-}
-
-@defproc[(make-adjustable-splay-tree
-           [#:key-contract key-contract contract? any/c]
-           [#:value-contract value-contract contract? any/c])
-         splay-tree?]{
-
-Makes a new empty splay-tree that permits only exact integers as keys
-(in addition to any constraints imposed by @racket[key-contract]). The
-resulting splay tree answers true to @racket[adjustable-splay-tree?]
-and supports efficient key adjustment.
-
-@examples[#:eval the-eval
-(define splay-tree (make-adjustable-splay-tree))
-(splay-tree-set! splay-tree 3 'apple)
-(splay-tree-set! splay-tree 6 'cherry)
-(dict-map splay-tree list)
-(splay-tree-ref splay-tree 3)
-(splay-tree-remove! splay-tree 6)
-(splay-tree-count splay-tree)
-]
-}
-
-@defproc[(splay-tree? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is a splay-tree, @racket[#f] otherwise.
-}
-
-@defproc[(adjustable-splay-tree? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is a splay-tree that supports key
-adjustment; see @racket[splay-tree-contract!] and
-@racket[splay-tree-expand!].
-}
-
-@deftogether[[
-@defproc[(splay-tree-ref [s splay-tree?]
-                         [key any/c]
-                         [default any/c (lambda () (error ....))])
-         any]
-@defproc[(splay-tree-set! [s splay-tree?]
-                          [key any/c]
-                          [value any/c])
-         void?]
-@defproc[(splay-tree-remove! [s splay-tree?]
-                             [key any/c])
-         void?]
-@defproc[(splay-tree-count [s splay-tree?]) exact-nonnegative-integer?]
-@defproc[(splay-tree-iterate-first [s splay-tree?])
-         (or/c #f splay-tree-iter?)]
-@defproc[(splay-tree-iterate-next [s splay-tree?] [iter splay-tree-iter?])
-         (or/c #f splay-tree-iter?)]
-@defproc[(splay-tree-iterate-key [s splay-tree?] [iter splay-tree-iter?])
-         any/c]
-@defproc[(splay-tree-iterate-value [s splay-tree?] [iter splay-tree-iter?])
-         any/c]]]{
-
-Implementations of @racket[dict-ref], @racket[dict-set!],
-@racket[dict-remove!], @racket[dict-count],
-@racket[dict-iterate-first], @racket[dict-iterate-next],
-@racket[dict-iterate-key], and @racket[dict-iterate-value],
-respectively.
-}
-
-@defproc[(splay-tree-remove-range! [s splay-tree?]
-                                   [from any/c]
-                                   [to any/c])
-         void?]{
-
-Removes all keys in [@racket[from], @racket[to]); that is, all keys
-greater than or equal to @racket[from] and less than @racket[to].
-
-This operation takes @italic{O(N)} time, or @italic{O(log N)} time if
-@racket[(adjustable-splay-tree? s)].
-}
-
-@defproc[(splay-tree-contract! [s adjustable-splay-tree?]
-                               [from exact-integer?] [to exact-integer?])
-         void?]{
-
-Like @racket[splay-tree-remove-range!], but also decreases the value
-of all keys greater than or equal to @racket[to] by @racket[(- to
-from)].
-
-This operation is only allowed on adjustable splay trees, and it takes
-@italic{O(log N)} time.
-}
-
-@defproc[(splay-tree-expand! [s adjustable-splay-tree?]
-                             [from exact-integer?] [to exact-integer?])
-         void?]{
-
-Increases the value of all keys greater than or equal to @racket[from]
-by @racket[(- to from)].
-
-This operation is only allowed on adjustable splay trees, and it takes
-@italic{O(log N)} time.
-}
-
-@deftogether[[
-@defproc[(splay-tree-iterate-least [s splay-tree])
-         (or/c #f splay-tree-iter?)]
-@defproc[(splay-tree-iterate-greatest [s splay-tree])
-         (or/c #f splay-tree-iter?)]
-@defproc[(splay-tree-iterate-least/>? [s splay-tree?] [key any/c])
-         (or/c #f splay-tree-iter?)]
-@defproc[(splay-tree-iterate-least/>=? [s splay-tree?] [key any/c])
-         (or/c #f splay-tree-iter?)]
-@defproc[(splay-tree-iterate-greatest/<? [s splay-tree?] [key any/c])
-         (or/c #f splay-tree-iter?)]
-@defproc[(splay-tree-iterate-greatest/<=? [s splay-tree?] [key any/c])
-         (or/c #f splay-tree-iter?)]
-]]{
-
-Implementations of @racket[dict-iterate-least],
-@racket[dict-iterate-greatest], @racket[dict-iterate-least/>?],
-@racket[dict-iterate-least/>=?], @racket[dict-iterate-greatest/<?],
-and @racket[dict-iterate-greatest/<=?], respectively.
-}
-
-@defproc[(splay-tree-iter? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] represents a position in a
-splay-tree, @racket[#f] otherwise.
-}
-
-@defproc[(splay-tree->list [s splay-tree?]) (listof pair?)]{
-
-Returns an association list with the keys and values of @racket[s], in
-order.
-}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/data-pkgs/data-doc/data/scribblings/union-find.scrbl b/pkgs/data-pkgs/data-doc/data/scribblings/union-find.scrbl
deleted file mode 100644
index 777994c727..0000000000
--- a/pkgs/data-pkgs/data-doc/data/scribblings/union-find.scrbl
+++ /dev/null
@@ -1,108 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          (for-label data/union-find
-                     racket/contract
-                     racket/base))
-
-@title[#:tag "union-find"]{Union-Find: Sets with only Canonical Elements}
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require data/union-find))
-
-@defmodule[data/union-find]
-
-The union-find algorithm and data structure provides
-an API for representing sets that contain a single,
-canonical element. The sets support an (imperative) union 
-operation (the library picks one of the canonical elements
-of the original sets to be the canonical element of the union),
-as well as getting and setting the canonical element.
-
-These operations are not thread-safe.
-
-@defproc[(uf-new [c any/c]) uf-set?]{
-
-Makes a new set with the canonical element @racket[c].
-
-This is a constant time operation.
-                                           
-@examples[#:eval the-eval
-                 (uf-new 'whale)
-                 (uf-new 'dwarf-lantern)]
-}
-
-
-@defproc[(uf-set? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] was created with @racket[uf-new],
-        and @racket[#f] otherwise.
-        
-This is a constant time operation.
-
-@examples[#:eval the-eval
-  (uf-set? (uf-new 'spiny-dogfish))
-  (uf-set? "I am not a uf-set")]
-}
-
-@defproc[(uf-find [a uf-set?]) any/c]{
-  Returns the canonical element of @racket[a].
-
-  This is an amortized (essentially) constant time operation.
-                                   
-  @examples[#:eval the-eval
-                   (uf-find (uf-new 'tasselled-wobbegong))]
-}
-
-@defproc[(uf-union! [a uf-set?] [b uf-set?]) void?]{
-
-Imperatively unifies @racket[a] and @racket[b], making
-them both have the same canonical element. Either
-of @racket[a] or @racket[b]'s  canonical elements may
-become the canonical element for the union.
-
-This is an amortized (essentially) constant time operation.
-
-@examples[#:eval the-eval
-  (define a (uf-new 'sand-devil))
-  (define b (uf-new 'pigeye))
-  (uf-union! a b)
-  (uf-find a)
-  (uf-find b)
-]
-}
-
-@defproc[(uf-same-set? [a uf-set?] [b uf-set?]) boolean?]{
-  Returns @racket[#t] if the sets @racket[a] and @racket[b]
-  have been unioned.
-
-This is an amortized (essentially) constant time operation.
-
-@examples[#:eval the-eval
-  (define a (uf-new 'finetooth))
-  (define b (uf-new 'speartooth))
-  (uf-same-set? a b)
-  (uf-union! a b)
-  (uf-same-set? a b)
-]
-
-  
-}
-
-@defproc[(uf-set-canonical! [a uf-set?] [c any/c]) void?]{
-  Changes @racket[a] to have a new canonical element.
-          
-This is an amortized (essentially) constant time operation.
-
- @examples[#:eval the-eval
-  (define a (uf-new 'sand-devil))
-  (uf-set-canonical! a 'lemon)
-  (uf-find a)
-  (define b (uf-new 'pigeye))
-  (uf-union! a b)
-  (uf-set-canonical! b 'sicklefin-lemon)
-  (uf-find a)
-]
-          
-}
-
-@close-eval[the-eval]
diff --git a/pkgs/data-pkgs/data-doc/info.rkt b/pkgs/data-pkgs/data-doc/info.rkt
deleted file mode 100644
index 020f182149..0000000000
--- a/pkgs/data-pkgs/data-doc/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "documentation part of \"data\"")
-
-(define pkg-authors '(ryanc))
-(define build-deps '("data-lib"
-                     "data-enumerate-lib"
-                     "racket-doc"
-                     "scribble-lib"))
-(define update-implies '("data-lib" "data-enumerate-lib"))
diff --git a/pkgs/data-pkgs/data-enumerate-lib/LICENSE.txt b/pkgs/data-pkgs/data-enumerate-lib/LICENSE.txt
deleted file mode 100644
index a1050d5d71..0000000000
--- a/pkgs/data-pkgs/data-enumerate-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-data-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/data-pkgs/data-enumerate-lib/data/enumerate.rkt b/pkgs/data-pkgs/data-enumerate-lib/data/enumerate.rkt
deleted file mode 100644
index 9f0fb432a7..0000000000
--- a/pkgs/data-pkgs/data-enumerate-lib/data/enumerate.rkt
+++ /dev/null
@@ -1,1736 +0,0 @@
-#lang racket/base
-(require racket/bool
-         racket/contract/base
-         racket/function
-         racket/list
-         racket/math
-         racket/match
-         racket/promise
-         racket/stream
-         racket/vector
-
-         data/gvector
-         
-         math/flonum
-         (only-in math/number-theory
-                  binomial
-                  integer-root
-                  factorize))
-
-(define nat? exact-nonnegative-integer?)
-(define extended-nat/c (or/c nat? +inf.0))
-
-(provide 
- (contract-out
-  [enum 
-   (-> extended-nat/c (-> nat? any/c) (-> any/c nat?)
-       enum?)]
-  [enum?
-   (-> any/c 
-       boolean?)]
-  [size
-   (-> enum?
-       extended-nat/c)]
-  [from-nat 
-   (-> enum? nat?
-       any/c)]
-  [to-nat
-   (-> enum? any/c
-       nat?)]
-  [map/e
-   (->* (procedure? procedure? enum?)
-        #:rest (listof enum?)
-        enum?)]
-  ;; very bad, only use for small enums
-  [filter/e
-   (-> enum? (-> any/c boolean?)
-       enum?)]
-  [except/e
-   (->* (enum?)
-        #:rest list?
-        enum?)]
-  [to-stream
-   (-> enum? 
-       stream?)]
-  [approximate
-   (-> enum? nat?
-       list?)]
-  [to-list
-   (-> enum?
-       list?)]
-  [take/e
-   (-> enum? nat?
-       enum?)]
-  [slice/e
-   (-> enum? nat? nat?
-       enum?)]
-  [below/e
-   (-> nat?
-       enum?)]
-  [empty/e enum?]
-  [const/e
-   (-> any/c
-       enum?)]
-  [from-list/e
-   (-> list?
-       enum?)]
-  [fin/e
-   (->* () #:rest list?
-       enum?)]
-  [nat/e enum?]
-  [int/e enum?]
-  [disj-sum/e
-   (->* () #:rest (listof (cons/c enum? (-> any/c boolean?)))
-        enum?)]
-  [disj-append/e
-   (->* ((cons/c enum? (-> any/c boolean?)))
-        #:rest (listof (cons/c enum? (-> any/c boolean?)))
-        enum?)]
-  [fin-cons/e
-   (-> enum? enum?
-       enum?)]
-  [cons/e
-   (-> enum? enum?
-       enum?)]
-  [elegant-cons/e
-   (-> enum? enum?
-       enum?)]
-  [traverse/e
-   (-> (-> any/c enum?)
-       (listof any/c)
-       enum?)]
-  [hash-traverse/e
-   (-> (-> any/c enum?) hash?
-       enum?)]
-  [dep/e
-   (-> enum? (-> any/c enum?)
-       enum?)]
-  [dep2/e
-   (-> extended-nat/c enum? (-> any/c enum?)
-       enum?)]
-  [fold-enum
-   (-> (-> list? any/c enum?)
-       list?
-       enum?)]
-  [flip-dep/e
-   (-> enum? (-> any/c enum?)
-       enum?)]
-  [range/e
-   (-> nat? nat?
-       enum?)]
-  [thunk/e
-   (-> extended-nat/c (-> enum?)
-       enum?)]
-  [fix/e
-   (case->
-    (-> (-> enum? enum?) 
-        enum?)
-    (-> extended-nat/c (-> enum? enum?)
-        enum?))]
-  [many/e
-   (case->
-    (-> enum?
-        enum?)
-    (-> enum? nat?
-        enum?))]
-  [many1/e
-   (-> enum? 
-       enum?)]
-  [cantor-vec/e
-   (->* () #:rest (listof enum?)
-        enum?)]
-  [vec/e
-   (->* () #:rest (listof enum?)
-        enum?)]
-  [box-vec/e
-   (->* () #:rest (listof enum?)
-        enum?)]
-  [inf-fin-fair-list/e
-   (->* () #:rest (listof enum?)
-        enum?)]
-  [mixed-box-tuples/e
-   (-> (listof enum?)
-       enum?)]
-  [inf-fin-cons/e
-   (-> enum? enum?
-       enum?)]
-  [list/e
-   (->* () #:rest (listof enum?)
-        enum?)]
-  [nested-cons-list/e
-   (->* () #:rest (listof enum?)
-        enum?)]
-  [cantor-list/e
-   (->* () #:rest (listof enum?)
-        enum?)]
-  [box-list/e
-   (->* () #:rest (listof enum?)
-        enum?)]
-  [prime-length-box-list/e
-   (-> (listof enum?)
-       enum?)]
-  [box-tuples/e
-   (-> nat?
-       enum?)]
-  [bounded-list/e
-   (-> nat? nat?
-       enum?)]
-  [nat+/e
-   (-> nat?
-       enum?)]
-  [fail/e
-   (-> exn?
-       enum?)]
-  [char/e enum?]
-  [string/e enum?]
-  [from-1/e enum?]
-  [integer/e enum?]
-  [float/e enum?]
-  [real/e enum?]
-  [non-real/e enum?]
-  [num/e enum?]
-  [bool/e enum?]
-  [symbol/e enum?]
-  [base/e enum?]
-  [any/e enum?]))
-
-(define enum-printing (make-parameter 0))
-;; an enum a is a struct of < Nat or +Inf, Nat -> a, a -> Nat >
-(struct enum (size from to)
-  #:methods gen:custom-write
-  [(define (write-proc enum port mode)
-     (define recur
-       (case mode
-         [(#t) write]
-         [(#f) display]
-         [else (lambda (p port) (print p port mode))]))
-     (display "#<enum" port)
-     (define the-size (enum-size enum))
-     (define more-to-go?
-       (parameterize ([enum-printing (+ (enum-printing) 1)])
-         (let loop ([i 0] [chars 0])
-           ;; chars is an approximation on how much
-           ;; we've printed so far.
-           (cond
-             [(not (< i the-size)) #f]
-             [(<= chars 20)
-              (define ele (from-nat enum i))
-              (define sp (open-output-string))
-              (recur ele sp)
-              (define s (get-output-string sp))
-              (cond
-                [(equal? s "")
-                 ;; if any enumeration values print as empty 
-                 ;; strings, then we just give up so as to avoid
-                 ;; 'i' never incrementing and never terminating
-                 #t]
-                [else
-                 (if (zero? i)
-                     (display ": " port)
-                     (display " " port))
-                 
-                 ;; only print twice up to depth 2 in order to avoid bad
-                 ;; algorithmic behavior (so enumerations of enumerations
-                 ;; of enumerations might look less beautiful in drracket)
-                 (cond
-                   [(<= (enum-printing) 2)
-                    (display s port)]
-                   [else
-                    (recur ele port)])
-                 
-                 (loop (+ i 1)
-                       (+ chars (string-length s) 1))])]
-             [else #t]))))
-     (if more-to-go?
-         (display "...>" port)
-         (display ">" port)))])
-
-;; size : enum a -> Nat or +Inf
-(define (size e)
-  (enum-size e))
-
-;; from-nat : enum a, Nat -> a
-(define (from-nat e n)
-  (if (and (< n (enum-size e))
-           (>= n 0))
-      ((enum-from e) n)
-      (error 'from-nat
-             (string-append "Index into enumerator out of range. "
-                            "Tried to decode ~s in an enum of size ~s")
-             n (size e))))
-
-;; to-nat : enum a, a -> Nat
-(define (to-nat e a)
-  ((enum-to e) a))
-
-;; Helper functions
-;; map/e : (a -> b), (b -> a), enum a -> enum b
-(define (map/e f inv-f e . es)
-  (cond [(empty? es)
-         (enum (size e)
-               (λ (x) 
-                  (f (from-nat e x)))
-               (λ (n)
-                  (to-nat e (inv-f n))))]
-        [else
-         (define es/e (apply list/e (cons e es)))
-         (map/e
-          (λ (xs)
-             (apply f xs))
-          (λ (ys)
-             (call-with-values (λ () (inv-f ys)) list))   
-          es/e)]))
-
-;; filter/e : enum a, (a -> bool) -> enum a
-;; xxx size won't be accurate!
-;; xxx to-nat is not accurate right now!
-(define (filter/e e p)
-  (enum (size e)
-        (λ (n)
-           (let loop ([i 0]
-                      [seen 0])
-             (let ([a (from-nat e i)])
-               (if (p a)
-                   (if (= seen n)
-                       a
-                       (loop (+ i 1) (+ seen 1)))
-                   (loop (+ i 1) seen)))))
-        (λ (x) (to-nat e x))))
-
-;; except/e : (enum a) a* -> (enum a)
-;; Everything inside e MUST be in the enumerator or you will get an error
-(define (except/e e . excepts)
-  (define (except1/e x e)
-    (cond [(= (size e) 0) e]
-          [else
-           (define xi (to-nat e x))
-           (define (from-nat2 n)
-             (cond [(< n xi) (from-nat e n)]
-                   [else (from-nat e (add1 n))]))
-           (define (to-nat2 y)
-             (define yi (to-nat e y))
-             (cond [(< yi xi) yi]
-                   [(> yi xi) (sub1 yi)]
-                   [else (error 'to-nat "attempted to encode an excepted value")]))
-           (enum (max 0 (sub1 (size e))) from-nat2 to-nat2)]))
-  (foldr except1/e
-         e
-         excepts))
-
-(define (to-stream e)
-  (define (loop n)
-    (cond [(n . >= . (size e))
-           empty-stream]
-          [else
-           (stream-cons (from-nat e n)
-                        (loop (add1 n)))]))
-  (loop 0))
-
-(define (approximate e n)
-  (for/list ([i (in-range n)])
-    (from-nat e i)))
-
-;; to-list : enum a -> listof a
-;; better be finite
-(define (to-list e)
-  (when (infinite? (size e))
-    (error 'to-list "cannot encode an infinite list"))
-  (map (enum-from e)
-       (build-list (size e)
-                   identity)))
-
-;; take/e : enum a, Nat -> enum a
-;; returns an enum of the first n parts of e
-;; n must be less than or equal to size e
-(define (take/e e n)
-  (unless (<= n (size e))
-    (error 'take/e "there aren't ~s elements in ~s" n e))
-  (enum n
-        (λ (k)
-           (from-nat e k))
-        (λ (x)
-           (let ([k (to-nat e x)])
-             (unless (< k n)
-               (error 'take/e "attempted to encode an element not in an enumerator"))
-             k))))
-
-(define (slice/e e lo hi)
-  (unless (and (lo . >= . 0)
-               (hi . <= . (size e))
-               (hi . >= . lo))
-    (error 'slice/e "bad range in slice/e: size: ~s, lo: ~s, hi: ~s" (size e) lo hi))
-  (enum (hi . - . lo)
-        (λ (n)
-           (from-nat e (n . + . lo)))
-        (λ (x)
-           (define n (to-nat e x))
-           (unless (and (n . >= . lo)
-                        (n . <  . hi))
-             (error 'slice/e
-                    (string-append
-                     "attempted to encode an element removed by slice/e:"
-                     " ~s was excepted, originally ~s, but sliced between ~s and ~s" x n lo hi)))
-           (n . - . lo))))
-
-;; below/e
-(define (below/e n)
-  (take/e nat/e n))
-
-(define empty/e
-  (enum 0
-        (λ (n)
-           (error 'from-nat "absurd"))
-        (λ (x)
-           (error 'to-nat "no elements in the enumerator"))))
-
-(define (const/e c)
-  (enum 1
-        (λ (n)
-           c)
-        (λ (x)
-           (if (equal? c x)
-               0
-               (error 'to-nat "value not in enumerator")))))
-
-;; from-list/e :: Listof a -> Gen a
-;; input list should not contain duplicates
-;; equality on eq?
-(define (from-list/e l)
-  (define rev-map
-    (for/hash ([i (in-naturals)]
-               [x (in-list l)])
-      (values x i)))
-  (if (empty? l)
-      empty/e
-      (enum (length l)
-            (λ (n)
-               (list-ref l n))
-            (λ (x)
-               (hash-ref rev-map x)))))
-
-(define (fin/e . args) (from-list/e (remove-duplicates args)))
-
-(define nat/e
-  (enum +inf.0
-        identity
-        identity))
-
-
-(define int/e
-  (enum +inf.0
-        (λ (n)
-           (if (even? n)
-               (* -1 (/ n 2))
-               (/ (+ n 1) 2)))
-        (λ (n)
-           (if (> n 0)
-               (- (* 2 n) 1)
-               (* 2 (abs n))))))
-
-(define (empty/e? e)
-  (= 0 (size e)))
-
-(define (exact-min . xs)
-  (define (exact-min-2 x y)
-    (if (x . <= . y)
-        x
-        y))
-  (foldl exact-min-2 +inf.0 xs))
-
-(struct fin-layer
-  (bound  ;; nat
-   enums) ;; Vectorof (Enum a, list-index)
-  #:transparent)
-
-(struct upper-bound
-  (total-bound      ;; Nat
-   individual-bound ;; Nat
-   enumerators      ;; Vectorof (Enum a, Nat)
-   )
-  #:transparent)
-
-(struct list-layer
-   ;; Nat = layer-size + prev-layer-max-index: This is the maximum index into decode for this layer
-  (max-index
-   ;; Nat, = min (map size inexhausteds): This is the maximum index in the tuple for encode
-   inexhausted-bound
-   exhausteds   ;; Vectorof (Enum a, Nat)
-   inexhausteds ;; Vectorof (Enum a, Nat)
-   )
-  #:transparent)
-
-(define (mk-fin-layers es)
-  (define (loop eis prev)
-    (define non-emptys (filter (negate (compose empty/e? car)) eis))
-    (match non-emptys
-      ['() '()]
-      [_
-       (define min-size
-         (apply exact-min (map (compose size car) non-emptys)))
-       (define (not-min-size? e)
-         (not (= (size (car e)) min-size)))
-       (define leftover
-         (filter not-min-size? non-emptys))
-       (define veis
-         (apply vector non-emptys))
-       (define cur-layer (fin-layer min-size veis))
-       (define remaining-layers
-         (loop leftover cur-layer))
-       (cons cur-layer
-             remaining-layers)]))
-  (define eis
-    (for/list [(i (in-naturals))
-               (e (in-list es))]
-      (cons e i)))
-  (loop eis (fin-layer 0 eis)))
-
-;; layers : Listof Enum -> Listof Upper-Bound
-(define (disj-sum-layers es)
-  (define fin-layers (mk-fin-layers es))
-  (define (loop fin-layers prev)
-    (match fin-layers
-      ['() '()]
-      [(cons (fin-layer cur-bound eis) rest-fin-layers)
-       (match-define (upper-bound prev-tb
-                                  prev-ib
-                                  _)
-                     prev)
-       (define min-size cur-bound)
-       (define diff-min-size
-         (min-size . - . prev-ib))
-       (define total-bound
-         (prev-tb . + . (diff-min-size . * . (vector-length eis))))
-       (define cur-layer
-         (upper-bound total-bound
-                      cur-bound
-                      eis))
-       (define rest-layers (loop rest-fin-layers cur-layer))
-       (cons cur-layer
-             rest-layers)]))
-  (define eis
-    (for/list [(i (in-naturals))
-               (e (in-list es))]
-      (cons e i)))
-  (apply vector (loop fin-layers (upper-bound 0 0 eis))))
-
-(define (mk-list-layers es)
-  (define eis
-    (for/list [(i (in-naturals))
-               (e (in-list es))]
-      (cons e i)))
-  (define (loop fin-layers prev-layer)
-    (match fin-layers
-      ['() '()]
-      [(cons (fin-layer cur-bound vec-cur-inexhausteds) rest-fins)
-       (match-define (list-layer prev-max-index
-                                 prev-bound
-                                 prev-exhausteds
-                                 prev-inexhausteds)
-                     prev-layer)
-       (define cur-inexhausteds (vector->list vec-cur-inexhausteds))
-       (define cur-exhausteds
-         (append (remove* cur-inexhausteds prev-inexhausteds)
-                 prev-exhausteds))
-       (define num-inexhausted
-         (length cur-inexhausteds))
-       (define max-index
-         (prev-max-index
-          . + . 
-          (apply *
-                 ((expt cur-bound num-inexhausted) . - . (expt prev-bound num-inexhausted))
-                 (map (compose size car) cur-exhausteds))))
-       (define cur-layer
-         (list-layer max-index
-                     cur-bound
-                     cur-exhausteds
-                     cur-inexhausteds))
-       (define rest-layers (loop rest-fins cur-layer))
-       (cons cur-layer rest-layers)]))
-  (loop (mk-fin-layers es)
-        (list-layer 0 0 '() eis)))
-
-;; find-dec-layer : Nat, Nonempty-Listof Upper-bound -> Upper-bound, Upper-bound
-;; Given an index, find the first layer 
-(define (find-dec-layer i layers)
-  (find-layer-by-size i
-                      upper-bound-total-bound
-                      (upper-bound 0 0 (vector))
-                      layers))
-
-(define (find-index x e-ps [cur-index 0])
-  (match e-ps
-    ['() (error 'to-nat "invalid term")]
-    [(cons (cons e in-e?)
-           more-e-ps)
-     (cond [(in-e? x)
-            (values (to-nat e x)
-                    cur-index)]
-           [else
-            (find-index x more-e-ps (add1 cur-index))])]))
-
-(define (find-enc-layer i e-i layers)
-  (define-values (prev cur)
-    (find-layer-by-size i
-                        upper-bound-individual-bound
-                        (upper-bound 0 0 (vector))
-                        layers))
-  (define/match (find-e-index l e-i)
-    [((upper-bound tb ib eis) e-i)
-     (define (loop low hi)
-       (when (> low hi)
-         (error 'to-nat "internal bin search bug"))
-       (define mid
-         (quotient (low . + . hi) 2))
-       (define cur
-         (cdr (vector-ref eis mid)))
-       (cond [(low . = . mid)
-              (unless (cur . = . e-i)
-                (error 'to-nat "internal binary search bug"))
-              mid]
-             [(cur . = . e-i) mid]
-             [(cur . < . e-i) (loop (add1 mid) hi)]
-             [else            (loop low mid)]))
-     (loop 0 (vector-length eis))])
-  (values prev
-          cur
-          (find-e-index cur e-i)))
-
-(define (find-layer-by-size i get-size zeroth ls)
-  ;; Find the lowest indexed elt that is still greater than i
-  (define (loop lo hi)
-    (define mid (quotient (lo . + . hi) 2))
-    (define cur (get-size (vector-ref ls mid)))
-    (cond [(i  . = . cur) (add1 mid)]
-          [(i  . > . cur) (loop (add1 mid) hi)]
-          [(lo . = . mid) lo]
-          [else           (loop lo         mid)]))
-  (define n (loop 0 (vector-length ls)))
-  (define prev
-    (cond [(n . > . 0) (vector-ref ls (sub1 n))]
-          [else        zeroth]))
-  (values prev (vector-ref ls n)))
-
-(define (find-list-dec-layer layers n eis)
-  (define-values (prev cur)
-    (find-layer-by-size n
-                        list-layer-max-index
-                        (list-layer 0 0 '() eis)
-                        (list->vector layers)))
-  (match-define (list-layer prev-max-index _ _ _) prev)
-  (match-define (list-layer _  tuple-bound exhs inexhs) prev)
-  (values prev-max-index tuple-bound exhs inexhs))
-
-;; fairly interleave a list of enumerations
-(define (disj-sum/e . e-ps)
-  (define layers
-    (disj-sum-layers (map car e-ps)))
-  (define (empty-e-p? e-p)
-    (= 0 (size (car e-p))))
-  (match (filter (negate empty-e-p?) e-ps)
-    ['() empty/e]
-    [`(,e-p) (car e-p)]
-    [_
-     (define (dec i)
-       (define-values (prev-up-bound cur-up-bound)
-         (find-dec-layer i layers))
-       (match-define (upper-bound so-far prev-ib _)  prev-up-bound)
-       (match-define (upper-bound ctb    cib     es) cur-up-bound)
-       (define this-i (i . - . so-far))
-       (define len (vector-length es))
-       (define-values (q r) (quotient/remainder this-i len))
-       (define this-e (car (vector-ref es r)))
-       (from-nat this-e (+ q prev-ib)))
-     (define (enc x)
-       (define-values (index which-e)
-         (find-index x e-ps))
-       (define-values (prev-up-bound cur-up-bound cur-e-index)
-         (find-enc-layer index which-e layers))
-       (match-define (upper-bound ptb pib pes) prev-up-bound)
-       (match-define (upper-bound ctb cib ces) cur-up-bound)
-       (+ ptb
-          cur-e-index
-          ((vector-length ces) . * . (index . - . pib))))
-     (enum (apply + (map (compose size car) e-ps))
-           dec
-           enc)]))
-
-;; Like disj-sum/e, but sequences the enumerations instead of interleaving
-(define (disj-append/e e-p . e-ps)
-  (define/match (disj-append2/e e-p1 e-p2)
-    [((cons e1 1?) (cons e2 2?))
-     (define s1 (size e1))
-     (define s2 (size e2))
-     (when (infinite? s1)
-       (error "Only the last enum in a call to disj-append/e can be infinite."))
-     (define (from-nat2 n)
-       (cond [(< n s1) (from-nat e1 n)]
-             [else (from-nat e2 (- n s1))]))
-     (define (to-nat2 x)
-       (cond [(1? x) (to-nat e1 x)]
-             [(2? x) (+ (to-nat e2 x) s1)]
-             [else (error 'to-nat "bad term")]))
-     (enum (+ s1 s2) from-nat2 to-nat2)])
-  (car
-   (foldr1 (λ (e-p1 e-p2)
-             (match* (e-p1 e-p2)
-                     [((cons e1 1?) (cons e2 2?))
-                      (cons (disj-append2/e e-p1
-                                            (cons e2 (negate 1?)))
-                            (λ (x)
-                               (or (1? x)
-                                   (2? x))))]))
-           (cons e-p e-ps))))
-
-(define (foldr1 f l)
-  (match l
-    [(cons x '()) x]
-    [(cons x  xs) (f x (foldr1 f xs))]))
-
-(define (fin-cons/e e1 e2)
-  (define s1 (enum-size e1))
-  (define s2 (enum-size e2))
-  (define size (* s1 s2))
-  (cond [(zero? size) empty/e]
-        [(or (not (infinite? s1))
-             (not (infinite? s2)))
-         (define-values (fst-smaller? min-size)
-           (cond [(s1 . <= . s2) (values #t s1)]
-                 [else          (values #f s2)]))
-         (define (dec n)
-           (define-values (q r)
-             (quotient/remainder n min-size))
-           (define-values (n1 n2)
-             (if fst-smaller?
-                 (values r q)
-                 (values q r)))
-           (cons (from-nat e1 n1)
-                 (from-nat e2 n2)))
-         (define/match (enc p)
-           [((cons x1 x2))
-            (define n1 (to-nat e1 x1))
-            (define n2 (to-nat e2 x2))
-            (define-values (q r)
-              (if fst-smaller?
-                  (values n2 n1)
-                  (values n1 n2)))
-            (+ (* min-size q)
-               r)])           
-         (enum size dec enc)]
-        [else
-         (error 'internal "fin-cons/e should only be called on finite enumerations")]))
-
-;; cons/e : enum a, enum b ... -> enum (cons a b ...)
-(define (cons/e e1 e2)
-  (map/e (λ (x)
-            (cons (first  x)
-                  (second x)))
-         (λ (x-y)
-            (list (car x-y) (cdr x-y)))
-         (list/e e1 e2)))
-
-(define (elegant-cons/e e1 e2)
-  (define s1 (size e1))
-  (define s2 (size e2))
-  (cond [(not (and (infinite? s1)
-                   (infinite? s2)))
-         (error 'finite-sets-are-inelegant)]
-        [else
-         (define (dec n)
-           (define fl-root (integer-sqrt n))
-           (define root-sq (fl-root . * . fl-root))
-           (define-values
-             (n1 n2)
-             (cond [((n . - . root-sq) . < . fl-root)
-                  (define n1 (n . - . root-sq))
-                  (define n2 fl-root)
-                  (values n1 n2)]
-                 [else
-                  (define n1 fl-root)
-                  (define n2 (- n root-sq fl-root))
-                  (values n1 n2)]))
-           (cons (from-nat e1 n1)
-                 (from-nat e2 n2)))
-         (define/match (enc p)
-           [((cons x1 x2))
-            (define n1 (to-nat e1 x1))
-            (define n2 (to-nat e2 x2))
-            (cond [(n1 . < . n2)
-                   ((n2 . * . n2) . + . n1)]
-                  [else
-                   (+ (n1 . * . n1) n1 n2)])])
-         (enum +inf.0 dec enc)]))
-
-;; Traversal (maybe come up with a better name
-;; traverse/e : (a -> enum b), (listof a) -> enum (listof b)
-(define (traverse/e f xs)
-  (apply list/e (map f xs)))
-
-;; Hash Traversal
-;; hash-traverse/e : (a -> enum b), (hash[k] -o> a) -> enum (hash[k] -o> b)
-(define (hash-traverse/e f ht)
-  ;; as-list : listof (cons k a)
-  (define as-list (hash->list ht))
-  ;; on-cdr : (cons k a) -> enum (cons k b)
-  (define/match (on-cdr pr)
-    [((cons k v))
-     (map/e (λ (x) (cons k x))
-            cdr
-            (f v))])
-  ;; enum (listof (cons k b))
-  (define assoc/e
-    (traverse/e on-cdr as-list))
-  (map/e make-immutable-hash
-         hash->list
-         assoc/e))
-
-;; the nth triangle number
-(define (tri n)
-  (/ (* n (+ n 1))
-     2))
-
-;; the floor of the inverse of tri
-;; returns the largest triangle number less than k
-;; always returns an integer
-(define (floor-untri k)
-  (let ([n (integer-sqrt (+ 1 (* 8 k)))])
-    (/ (- n 
-          (if (even? n)
-              2
-              1))
-       2)))
-
-;; dep/e : enum a (a -> enum b) -> enum (a, b)
-(define (dep/e e f)
-  (define (search-size sizes n)
-    (define (loop cur)
-      (let* ([lastSize (gvector-ref sizes (- cur 1))]
-             [e2 (f (from-nat e cur))]
-             [s  (+ lastSize (size e2))])
-        (gvector-add! sizes s)
-        (if (> s n)
-            cur
-            (loop (+ cur 1)))))
-    (loop (gvector-count sizes)))
-  ;; fill-table - find sizes[n], filling the table as it goes
-  ;; assumption: n >= (gvector-count sizes)
-  (define (fill-table sizes n)
-    (let loop ([cur (gvector-count sizes)])
-      (let* ([prevSize (gvector-ref sizes (- cur 1))]
-             [curE (f (from-nat e cur))]
-             [s (+ prevSize (size curE))])
-        (gvector-add! sizes s)
-        (if (= cur n)
-            s
-            (loop (+ cur 1))))))
-  (if (= 0 (size e))
-      empty/e
-      (let ([first (size (f (from-nat e 0)))])
-        (cond
-         [(not (infinite? first))
-          ;; memo table caches the size of the dependent enumerators
-          ;; sizes[n] = # of terms with left side index <= n
-          ;; sizes : gvector int
-          (let ([sizes (gvector first)])
-            (enum (if (infinite? (size e))
-                      +inf.0
-                      (foldl
-                       (λ (curSize acc)
-                          (let ([sum (+ curSize acc)])
-                            (gvector-add! sizes sum)
-                            sum))
-                       first (map (compose size f) (cdr (to-list e)))))
-                  (λ (n)
-                     (let* ([ind (or (find-size sizes n)
-                                     (search-size sizes n))]
-                            [l (if (= ind 0)
-                                   0
-                                   (gvector-ref sizes (- ind 1)))]
-                            [m (- n l)]
-                            [x (from-nat e ind)]
-                            [e2 (f x)]
-                            [y (from-nat e2 m)])
-                       (cons x y)))
-                  (λ (ab)
-                     (let* ([a (car ab)]
-                            [b (cdr ab)]
-                            [ai (to-nat e a)]
-                            [ei (f a)]
-                            [nextSize (size ei)]
-                            [sizeUpTo (if (= ai 0)
-                                          0
-                                          (or (gvector-ref sizes (- ai 1) #f)
-                                              (let ([sizeUp
-                                                     (fill-table sizes (- ai 1))])
-                                                (begin0
-                                                    sizeUp
-                                                  (gvector-add! sizes
-                                                                (+ nextSize
-                                                                   sizeUp))))))])
-                       (+ sizeUpTo
-                          (to-nat ei b))))))]
-         [(not (infinite? (size e)))
-          (enum +inf.0
-                (λ (n)
-                  (define-values (q r) (quotient/remainder n (size e)))
-                  (cons (from-nat e r)
-                        (from-nat (f (from-nat e r)) q)))
-                (λ (ab)
-                   (+ (* (size e) (to-nat (f (car ab)) (cdr ab)))
-                      (to-nat e (car ab)))))]
-         [else ;; both infinite, same as cons/e
-          (enum +inf.0               
-                (λ (n)
-                   (let* ([k (floor-untri n)]
-                          [t (tri k)]
-                          [l (- n t)]
-                          [m (- k l)]
-                          [a (from-nat e l)])
-                     (cons a
-                           (from-nat (f a) m))))
-                (λ (xs) ;; bijection from nxn -> n, inverse of previous
-                   ;; (n,m) -> (n+m)(n+m+1)/2 + n
-                   (unless (pair? xs)
-                     (error 'to-nat "not a pair"))
-                   (let ([l (to-nat e (car xs))]
-                         [m (to-nat (f (car xs)) (cdr xs))])
-                     (+ (/ (* (+ l m) (+ l m 1))
-                           2)
-                        l))))]))))
-
-;; find-size : gvector int, int -> either int #f
-;; binary search for the index of the smallest element of vec greater
-;; than n or #f if no such element exists
-(define (find-size vec n)
-  (define (bin-search min max)
-    (cond [(= min max) min]
-          [(= (- max min) 1)
-           (cond [(> (gvector-ref vec min) n)
-                  min]
-                 [else max])]
-          [else
-           (let ([mid (quotient (+ max min)
-                                2)])
-             (cond [(> (gvector-ref vec mid) n)
-                    (bin-search min mid)]
-                   [else
-                    (bin-search mid max)]))]))
-  (let ([size (gvector-count vec)])
-    (cond [(or (= size 0)
-               (<= (gvector-ref vec (- size 1))
-                   n))
-           #f]
-          [else (bin-search 0 (- size 1))])))
-
-;; dep2 : natural (enum a) (a -> enum b) -> enum (a,b)
-(define (dep2/e n e f)
-  (define (search-size sizes n)
-    (define (loop cur)
-      (let* ([lastSize (gvector-ref sizes (- cur 1))]
-             [e2 (f (from-nat e cur))]
-             [s  (+ lastSize (size e2))])
-        (gvector-add! sizes s)
-        (if (> s n)
-            cur
-            (loop (+ cur 1)))))
-    (loop (gvector-count sizes)))
-  ;; fill-table - find sizes[n], filling the table as it goes
-  ;; assumption: n >= (gvector-count sizes)
-  (define (fill-table sizes n)
-    (let loop ([cur (gvector-count sizes)])
-      (let* ([prevSize (gvector-ref sizes (- cur 1))]
-             [curE (f (from-nat e cur))]
-             [s (+ prevSize (size curE))])
-        (gvector-add! sizes s)
-        (if (= cur n)
-            s
-            (loop (+ cur 1))))))
-  (if (= 0 (size e))
-      empty/e
-      (cond
-       [(not (infinite? n))
-        ;; memo table caches the size of the dependent enumerators
-        ;; sizes[n] = # of terms with left side index <= n
-        ;; sizes : gvector int
-        (let* ([first (size (f (from-nat e 0)))]
-               [sizes (gvector first)])
-          (enum (if (infinite? (size e))
-                    +inf.0
-                    (foldl
-                     (λ (curSize acc)
-                        (let ([sum (+ curSize acc)])
-                          (gvector-add! sizes sum)
-                          sum))
-                     first (map (compose size f) (cdr (to-list e)))))
-                (λ (n)
-                   (let* ([ind (or (find-size sizes n)
-                                   (search-size sizes n))]
-                          [l (if (= ind 0)
-                                 0
-                                 (gvector-ref sizes (- ind 1)))]
-                          [m (- n l)]
-                          [x (from-nat e ind)]
-                          [e2 (f x)]
-                          [y (from-nat e2 m)])
-                     (cons x y)))
-                (λ (ab)
-                   (let* ([a (car ab)]
-                          [b (cdr ab)]
-                          [ai (to-nat e a)]
-                          [ei (f a)]
-                          [nextSize (size ei)]
-                          [sizeUpTo (if (= ai 0)
-                                        0
-                                        (or (gvector-ref sizes (- ai 1) #f)
-                                            (let ([sizeUp
-                                                   (fill-table sizes (- ai 1))])
-                                              (begin0
-                                                  sizeUp
-                                                (gvector-add! sizes
-                                                              (+ nextSize
-                                                                 sizeUp))))))])
-                     (+ sizeUpTo
-                        (to-nat ei b))))))]
-       [(not (infinite? (size e)))
-        (enum +inf.0
-              (λ (n)
-                (define-values (q r) (quotient/remainder n (size e)))
-                (cons (from-nat e r)
-                      (from-nat (f (from-nat e r)) q)))
-              (λ (ab)
-                 (+ (* (size e) (to-nat (f (car ab)) (cdr ab)))
-                    (to-nat e (car ab)))))]
-       [else ;; both infinite, same as cons/e
-        (enum +inf.0               
-              (λ (n)
-                 (let* ([k (floor-untri n)]
-                        [t (tri k)]
-                        [l (- n t)]
-                        [m (- k l)]
-                        [a (from-nat e l)])
-                   (cons a
-                         (from-nat (f a) m))))
-              (λ (xs) ;; bijection from nxn -> n, inverse of previous
-                 ;; (n,m) -> (n+m)(n+m+1)/2 + n
-                 (unless (pair? xs)
-                   (error 'to-nat "not a pair"))
-                 (let ([l (to-nat e (car xs))]
-                       [m (to-nat (f (car xs)) (cdr xs))])
-                   (+ (/ (* (+ l m) (+ l m 1))
-                         2)
-                      l))))])))
-
-;; fold-enum : ((listof a), b -> enum a), (listof b) -> enum (listof a)
-(define (fold-enum f l)
-  (map/e
-   reverse
-   reverse
-   (let loop ([l l]
-              [acc (const/e '())])
-     (cond [(empty? l) acc]
-           [else
-            (loop
-             (cdr l)
-             (flip-dep/e
-              acc
-              (λ (xs)
-                 (f xs (car l)))))]))))
-
-;; flip-dep/e : enum a (a -> enum b) -> enum (b,a)
-(define (flip-dep/e e f)
-  (map/e
-   (λ (ab)
-      (cons (cdr ab)
-            (car ab)))
-   (λ (ba)
-      (cons (cdr ba)
-            (car ba)))
-   (dep/e e f)))
-
-;; more utility enums
-;; nats of course
-(define (range/e low high)
-  (cond [(> low high) (error 'range/e "invalid range: ~s, ~s" low high)]
-        [(infinite? high)
-         (if (infinite? low)
-             int/e
-             (map/e
-              (λ (n)
-                 (+ n low))
-              (λ (n)
-                 (- n low))
-              nat/e))]
-        [(infinite? low)
-         (map/e
-          (λ (n)
-             (- high n))
-          (λ (n)
-             (+ high n))
-          nat/e)]
-        [else
-         (map/e (λ (n) (+ n low))
-                (λ (n) (- n low))
-                (take/e nat/e (+ 1 (- high low))))]))
-
-;; thunk/e : Nat or +-Inf, ( -> enum a) -> enum a
-(define (thunk/e s thunk)
-  (define promise/e (delay (thunk)))
-  (enum s
-        (λ (n)
-           (from-nat (force promise/e) n))
-        (λ (x)
-           (to-nat (force promise/e) x))))
-
-;; fix/e : [size] (enum a -> enum a) -> enum a
-(define fix/e
-  (case-lambda
-    [(f/e) (fix/e +inf.0 f/e)]
-    [(size f/e)
-     (define self (delay (f/e (fix/e size f/e))))
-     (enum size
-           (λ (n)
-             (from-nat (force self) n))
-           (λ (x)
-             (to-nat (force self) x)))]))
-
-;; many/e : enum a -> enum (listof a)
-;;       or : enum a, #:length natural -> enum (listof a)
-(define many/e
-  (case-lambda
-    [(e)
-     (define fix-size
-       (if (= 0 (size e))
-           1
-           +inf.0))
-     (fix/e fix-size
-            (λ (self)
-               (disj-sum/e (cons (fin/e '()) null?)
-                           (cons (cons/e e self) pair?))))]
-    [(e n)
-     (apply list/e (build-list n (const e)))]))
-
-;; many1/e : enum a -> enum (nonempty listof a)
-(define (many1/e e)
-  (except/e (many/e e) '()))
-
-(define (cantor-vec/e . es)
-  (map/e list->vector
-         vector->list
-         (apply cantor-list/e es)))
-
-;; vec/e : listof (enum any) -> enum (vectorof any)
-(define vec/e cantor-vec/e)
-
-(define (box-vec/e . es)
-  (map/e list->vector
-         vector->list
-         (apply box-list/e es)))
-
-(define (cantor-untuple k)
-  ;; Paul Tarau Deriving a Fast Inverse of the Generalized Cantor N-tupling Bijection
-  (λ (n)
-     (inc-set->list (combinatorial-number-decode k n))))
-
-(define (combinatorial-number-decode k n)
-  (define (loop k n acc)
-    (cond [(k . < . 0) (error 'combinatorial-number-decode-bug)]
-          [(k . = . 0) acc]
-          [else
-           (define k2 (sub1 k))
-           (define i  (k . + . n))
-           (define d
-             (let/ec kont
-               (for ([j (in-range k2 (add1 i))])
-                 (define b (binomial j k))
-                 (when (b . > . n)
-                   (kont (sub1 j))))
-               (error 'ididntfindit)))
-           (define n2 (n . - . (binomial d k)))
-           (loop k2 n2 (cons d acc))]))
-  (loop k n '()))
-
-(define (cantor-tuple k)
-  (λ (xs)
-     (unless ((length xs) . = . k)
-       (error 'bad-length-cantor-tuple))
-     ;; Section 6 of Tarau Cantor n-tupling inverse
-     (define sums
-       (list->inc-set xs))
-     (for/sum ([sum_i (in-list sums)]
-               [n     (in-naturals)])
-       (binomial sum_i (add1 n)))))
-
-(define (list->inc-set xs)
-  (define (loop xs count acc)
-    (match xs
-      ['() (reverse acc)]
-      [(cons hd tl)
-       (define acc-hd
-         (+ hd count 1))
-       (loop tl
-             acc-hd
-             (cons acc-hd acc))]))
-  (loop xs -1 '()))
-
-(define (inc-set->list xs)
-  (define (loop xs count acc)
-    (match xs
-      ['() (reverse acc)]
-      [(cons hd tl)
-       (define acc-hd
-         (- hd count 1))
-       (loop tl
-             hd
-             (cons acc-hd acc))]))
-  (loop xs -1 '()))
-
-(define (tuple-constructors infs fins)
-  (define inf?s (inf-slots (map cdr infs)
-                           (map cdr fins)))
-  (define (decon xs)
-    (let loop ([xs xs]
-               [inf-acc '()]
-               [fin-acc '()]
-               [inf?s   inf?s])
-      (match* (xs inf?s)
-              [('() '()) (cons (reverse inf-acc)
-                               (reverse fin-acc))]
-              [((cons x rest-xs) (cons inf? rest-inf?s))
-               (cond [inf?
-                      (loop rest-xs
-                            (cons x inf-acc)
-                            fin-acc
-                            rest-inf?s)]
-                     [else
-                      (loop rest-xs
-                            inf-acc
-                            (cons x fin-acc)
-                            rest-inf?s)])])))
-  (define (recon infs-fins)
-    (match-define (cons infs fins) infs-fins)
-    (let loop ([infs infs]
-               [fins fins]
-               [inf?s inf?s]
-               [acc '()])
-      (match inf?s
-        ['() (reverse acc)]
-        [(cons inf? rest)
-         (cond [inf?
-                (loop (cdr infs)
-                      fins
-                      rest
-                      (cons (car infs) acc))]
-               [else
-                (loop infs
-                      (cdr fins)
-                      rest
-                      (cons (car fins) acc))])])))
-  (values decon recon))
-
-;; Attempt at mixing finite and infinite pairing in a more principled way
-;; Slower than using inf-fin-cons/e as in list/e
-(define (inf-fin-fair-list/e . es)
-  (define nat/es
-    (for/list ([e (in-list es)])
-      (take/e nat/e (size e))))
-            
-  (map/e
-   (curry map from-nat es)
-   (curry map to-nat es)
-   (mixed-box-tuples/e nat/es)))
-
-(define (mixed-box-tuples/e es)
-  (match es
-    ['()  (const/e '())]
-    [(list e) (map/e list car (car es))]
-    [_
-     (cond [(for/or ([e (in-list es)])
-              (zero? (size e)))
-            empty/e]
-           [else
-            (define layers (mk-list-layers es))
-
-            (define eis
-              (for/list ([i (in-naturals)]
-                         [e (in-list es)])
-                (cons e i)))
-
-            (define prev-cur-layers 
-              (map cons
-                   (cons (list-layer 0 0 '() eis) (reverse (rest (reverse layers))))
-                   layers))
-
-            (define layer/es
-              (for/list ([prev-cur (in-list prev-cur-layers)])
-                (match-define (cons (list-layer prev-max
-                                                prev-tuple-max
-                                                prev-exhs
-                                                prev-inexhs)
-                                    (list-layer cur-max
-                                                cur-tuple-max
-                                                cur-exhs
-                                                cur-inexhs))
-                              prev-cur)
-
-                (define-values (decon recon)
-                  (tuple-constructors cur-inexhs cur-exhs))
-
-                (define k (length cur-inexhs))
-                (define inexhs-lo (expt prev-tuple-max k))
-                (define inexhs-hi (expt cur-tuple-max  k))
-
-                (define inxh-tups
-                  (for/list ([_ cur-inexhs])
-                    nat/e))
-
-                (define layer/e
-                  (map/e
-                   recon
-                   decon
-                   (fin-cons/e
-                    (slice/e (apply box-list/e inxh-tups)
-                             inexhs-lo
-                             inexhs-hi)
-                    (mixed-box-tuples/e (map car (sort cur-exhs < #:key cdr))))))
-                (list layer/e
-                      cur-max
-                      prev-max
-                      cur-tuple-max)))
-
-            (define (dec n)
-              (let/ec return
-                (for ([layer (in-list layer/es)])
-                  (match layer
-                    [(list e
-                           max-index
-                           min-index
-                           _)
-                     (when (n . < . max-index)
-                       (return (from-nat e (n . - . min-index))))]))))
-
-            (define (enc tup)
-              (define m (apply max tup))
-              (let/ec return
-                (for ([layer (in-list layer/es)])
-                  (match layer
-                    [(list e
-                           _
-                           min-index
-                           max-max)
-                     (when (m . < . max-max)
-                       (return (+ min-index (to-nat e tup))))]))))
-
-            (enum (apply * (map size es))
-                  dec
-                  enc)])]))
-
-(define (inf-slots infs fins)
-  (define sorted-infs (sort infs <))
-  (define sorted-fins (sort fins <))
-  (reverse
-   (let loop ([inf-is sorted-infs]
-              [fin-is sorted-fins]
-              [acc    '()])
-     (match* (inf-is fin-is)
-             [('() '()) acc]
-             [((cons _ _) '())
-              (append (for/list ([_ (in-list inf-is)]) #t) acc)]
-             [('() (cons _ _))
-              (append (for/list ([_ (in-list fin-is)]) #f) acc)]
-             [((cons ii rest-iis) (cons fi rest-fis))
-              (cond [(ii . < . fi)
-                     (loop rest-iis
-                           fin-is
-                           (cons #t acc))]
-                    [else
-                     (loop inf-is
-                           rest-fis
-                           (cons #f acc))])]))))
-
-(define (inf-fin-cons/e e1 e2)
-  (define s1 (size e1))
-  (define s2 (size e2))
-  (define fst-finite? (not (infinite? s1)))
-  (define fin-size
-    (cond [fst-finite? s1]
-          [else s2]))
-  (define (dec n)
-    (define-values (q r)
-      (quotient/remainder n fin-size))
-    (define x1 (from-nat e1 (if fst-finite? r q)))
-    (define x2 (from-nat e2 (if fst-finite? q r)))
-    (cons x1 x2))
-  (define/match (enc p)
-    [((cons x1 x2))
-     (define n1 (to-nat e1 x1))
-     (define n2 (to-nat e2 x2))
-     (define q (if fst-finite? n2 n1))
-     (define r (if fst-finite? n1 n2))
-     (+ (* fin-size q)
-        r)])
-  (enum (* s1 s2) dec enc))
-
-(define (list/e . es)
-  (define l (length es))
-  (cond
-   [(= l 0) (const/e '())]
-   [(= l 1) (map/e list car (car es))]
-   [(all-infinite? es) (apply box-list/e es)]
-   [(all-finite? es) (apply nested-cons-list/e es)]
-   [else
-    (define tagged-es
-      (for/list ([i (in-naturals)]
-                 [e (in-list es)])
-        (cons e i)))
-    (define-values (inf-eis fin-eis)
-      (partition (compose infinite?
-                          size
-                          car)
-                 tagged-es))
-    (define inf-es (map car inf-eis))
-    (define inf-is (map cdr inf-eis))
-    (define fin-es (map car fin-eis))
-    (define fin-is (map cdr fin-eis))
-    (define inf-slots
-      (reverse
-       (let loop ([inf-is inf-is]
-                  [fin-is fin-is]
-                  [acc '()])
-         (match* (inf-is fin-is)
-                 [('() '()) acc]
-                 [((cons _ _) '())
-                  (append (for/list ([_ (in-list inf-is)]) #t) acc)]
-                 [('() (cons _ _))
-                  (append (for/list ([_ (in-list fin-is)]) #f) acc)]
-                 [((cons ii rest-iis) (cons fi rest-fis))
-                  (cond [(ii . < . fi)
-                         (loop rest-iis
-                               fin-is
-                               (cons #t acc))]
-                        [else
-                         (loop inf-is
-                               rest-fis
-                               (cons #f acc))])]))))
-    (define/match (reconstruct infs-fins)
-      [((cons infs fins))
-       (let loop ([infs infs]
-                  [fins fins]
-                  [inf?s inf-slots]
-                  [acc '()])
-         (match inf?s
-           ['() (reverse acc)]
-           [(cons inf? rest)
-            (cond [inf?
-                   (loop (cdr infs)
-                         fins
-                         rest
-                         (cons (car infs) acc))]
-                  [else
-                   (loop infs
-                         (cdr fins)
-                         rest
-                         (cons (car fins) acc))])]))])
-    (define (deconstruct xs)
-      (let loop ([xs xs]
-                 [inf-acc '()]
-                 [fin-acc '()]
-                 [inf?s inf-slots])
-        (match* (xs inf?s)
-                [('() '()) (cons (reverse inf-acc)
-                                 (reverse fin-acc))]
-                [((cons x rest-xs) (cons inf? rest-inf?s))
-                 (cond [inf?
-                        (loop rest-xs
-                              (cons x inf-acc)
-                              fin-acc
-                              rest-inf?s)]
-                       [else
-                        (loop rest-xs
-                              inf-acc
-                              (cons x fin-acc)
-                              rest-inf?s)])])))
-    (map/e reconstruct
-           deconstruct
-           (inf-fin-cons/e (apply list/e inf-es)
-                   (apply list/e fin-es)))]))
-
-(define (nested-cons-list/e . es)
-  (define l (length es))
-  (define split-point (quotient l 2))
-  (define-values (left right) (split-at es split-point))
-  (map/e
-   (λ (pr) (append (car pr) (cdr pr)))
-   (λ (lst)
-      (define-values (left right) (split-at lst split-point))
-      (cons left right))
-   (fin-cons/e (apply list/e left) (apply list/e right))))
-
-(define (all-infinite? es)
-  (all-sizes-something? infinite? es))
-
-(define (all-finite? es)
-  (all-sizes-something? (negate infinite?) es))
-
-(define (all-sizes-something? p? es)
-  (for/and ([e (in-list es)])
-    (p? (size e))))
-
-;; Fair tupling via generalized cantor n-tupling
-;; ordering is monotonic in the sum of the elements of the list
-(define (cantor-list/e . es)
-  (define all-inf? (all-infinite? es))
-  (cond [(empty? es) (const/e '())]
-        [(not all-inf?)
-         (apply list/e es)]
-        [else
-         (define k (length es))
-         (define dec
-           (compose
-            (λ (xs) (map from-nat es xs))
-            (cantor-untuple k)))
-         (define enc
-           (compose
-            (cantor-tuple k)
-            (λ (xs) (map to-nat es xs))))
-         (enum +inf.0 dec enc)]))
-
-(define (prime-factorize k)
-  (apply append
-         (for/list ([d-e (in-list (factorize k))])
-           (define divisor (first d-e))
-           (define exponent (second d-e))
-           (for/list ([_ (in-range exponent)])
-             divisor))))
-(module+ test
-  (check-equal? (prime-factorize 14) '(2 7))
-  (check-equal? (prime-factorize 24) '(2 2 2 3)))
-(define (chunks-of l k)
-  (let loop ([l l]
-             [acc '()])
-    (cond [(empty? l) (reverse acc)]
-          [else
-           (define-values (chunk rest) (split-at l k))
-           (loop rest (cons chunk acc))])))
-(module+ test
-  (define 1-6 '(1 2 3 4 5 6))
-  (check-equal? (chunks-of 1-6 1) '((1) (2) (3) (4) (5) (6)))
-  (check-equal? (chunks-of 1-6 2) '((1 2) (3 4) (5 6)))
-  (check-equal? (chunks-of 1-6 3) '((1 2 3) (4 5 6)))
-  (check-equal? (chunks-of 1-6 6) '((1 2 3 4 5 6))))
-
-;; Fair tupling via generalized
-;; ordering is monotonic in the max of the elements of the list
-(define (box-list/e . es)
-  (define all-inf? (all-infinite? es))
-  (define k (length es))
-  (cond [(empty? es) (const/e '())]
-        [(= k 1) (map/e list car (car es))]
-        [(not all-inf?) (apply list/e es)]
-        [else
-         (define factors (prime-factorize k))
-         (let loop ([factors factors]
-                    [es es]
-                    [k k])
-           (match factors
-             [(cons factor '())
-              (prime-length-box-list/e es)]
-             [(cons factor factors)
-              (define chunk-size (/ k factor))
-              (define chunk/es
-                (for/list ([es (in-list (chunks-of es chunk-size))])
-                  (loop factors es chunk-size)))
-              (map/e
-               (λ (chunks)
-                  (apply append chunks))
-               (λ (xs)
-                  (chunks-of xs chunk-size))
-               (prime-length-box-list/e chunk/es))]))]))
-
-(define (prime-length-box-list/e es)
-  (map/e (curry map from-nat es)
-         (curry map to-nat es)
-         (box-tuples/e (length es))))
-
-(define (box-tuples/e k)
-  (enum +inf.0 (box-untuple k) (box-tuple k)))
-
-;; Tuples of length k with maximum bound
-(define (bounded-list/e len bound)
-  (define (loop len)
-    (match len
-      [0 (const/e '())]
-      [1 (const/e `(,bound))]
-      [_
-       (define smallers/e (loop (sub1 len)))
-       (define bounded/e (take/e nat/e (add1 bound)))
-       (define first-max/e
-         (map/e
-          (curry cons bound)
-          cdr
-          (apply list/e
-           (for/list ([_ (in-range (sub1 len))])
-             bounded/e))))
-       (define first-not-max/e
-         (match bound
-           [0 empty/e]
-           [_ (fin-cons/e (take/e nat/e bound)
-                          smallers/e)]))
-       (define (first-max? l)
-         ((first l) . = . bound))
-       (disj-append/e (cons first-not-max/e (negate first-max?))
-                      (cons first-max/e     first-max?))]))
-  (loop len))
-
-(define (box-tuple k)
-  (λ (xs)
-     (define layer (apply max xs))
-     (define smallest (expt layer k))
-     (define layer/e (bounded-list/e k layer))
-     (smallest . + . (to-nat layer/e xs))))
-
-(define (box-untuple k)
-  (λ (n)
-     (define layer (integer-root n k))
-     (define smallest (expt layer k))
-     (define layer/e (bounded-list/e k layer))
-     (from-nat layer/e (n . - . smallest))))
-
-(define (nat+/e n)
-  (map/e (λ (k)
-            (+ k n))
-         (λ (k)
-            (- k n))
-         nat/e))
-
-;; fail/e : exn -> enum ()
-;; returns an enum that calls a thunk
-(define (fail/e e)
-  (let ([t
-         (λ (_)
-            (raise e))])
-    (enum 1
-          t
-          t)))
-
-(module+ test
- (require rackunit)
- (provide check-bijection?
-          find-size
-          list->inc-set
-          inc-set->list)
- (define confidence 1000)
-
- (define-simple-check (check-bijection? e)
-   (let ([nums (build-list (if (<= (enum-size e) confidence)
-                               (enum-size e)
-                               confidence)
-                           identity)])
-     (andmap =
-             nums
-             (map (λ (n)
-                     (to-nat e (from-nat e n)))
-                  nums)))))
-;; Base Type enumerators
-(define (between? x low high)
-  (and (>= x low)
-       (<= x high)))
-(define (range-with-pred/e-p low high)
-  (cons (range/e low high)
-        (λ (n) (between? n low high))))
-(define low/e-p
-  (range-with-pred/e-p #x61 #x7a))
-(define up/e-p
-  (range-with-pred/e-p #x41 #x5a))
-(define bottom/e-p
-  (range-with-pred/e-p #x0 #x40))
-(define mid/e-p
-  (range-with-pred/e-p #x5b #x60))
-(define above1/e-p
-  (range-with-pred/e-p #x7b #xd7FF))
-(define above2/e-p
-  (range-with-pred/e-p #xe000 #x10ffff))
-
-(define char/e
-  (map/e
-   integer->char
-   char->integer
-   (disj-append/e low/e-p
-                  up/e-p
-                  bottom/e-p
-                  mid/e-p
-                  above1/e-p
-                  above2/e-p)))
-
-(define string/e
-  (map/e
-   list->string
-   string->list
-   (many/e char/e)))
-
-(define from-1/e
-  (map/e add1
-         sub1
-         nat/e))
-
-(define integer/e
-  (disj-sum/e (cons (const/e 0) zero?)
-              (cons from-1/e (λ (n) (> n 0)))
-              (cons (map/e - - from-1/e)
-                    (λ (n) (< n 0)))))
-
-(define weird-flonums/e-p
-  (cons (from-list/e '(+inf.0 -inf.0 +nan.0))
-        (λ (n)
-           (and (flonum? n)
-                (or (infinite? n)
-                    (nan? n))))))
-(define normal-flonums/e-p
-  (cons (take/e (map/e
-                 ordinal->flonum
-                 flonum->ordinal
-                 integer/e)
-                (+ 1 (* 2 9218868437227405311)))
-        (λ (n)
-           (and (flonum? n)
-                (nor (infinite? n)
-                     (nan? n))))))
-(define float/e
-  (disj-append/e weird-flonums/e-p
-                 normal-flonums/e-p))
-
-(define real/e
-  (disj-sum/e (cons integer/e exact-integer?)
-              (cons float/e flonum?)))
-
-(define non-real/e
-  (map/e make-rectangular
-         (λ (z)
-            (values (real-part z)
-                    (imag-part z)))
-         real/e
-         (except/e real/e 0 0.0)))
-
-(define num/e
-  (disj-sum/e (cons real/e real?)
-              (cons non-real/e complex?)))
-
-(define bool/e
-  (from-list/e '(#t #f)))
-
-(define symbol/e
-  (map/e
-   (compose string->symbol list->string)
-   (compose string->list symbol->string)
-   (many/e char/e)))
-
-(define base/e
-  (disj-sum/e (cons (const/e '()) null?)
-              (cons num/e number?)
-              (cons string/e string?)
-              (cons bool/e boolean?)
-              (cons symbol/e symbol?)))
-
-(define any/e
-  (fix/e +inf.0
-         (λ (any/e)
-            (disj-sum/e (cons base/e (negate pair?))
-                        (cons (cons/e any/e any/e) pair?)))))
diff --git a/pkgs/data-pkgs/data-enumerate-lib/data/enumerate/lib.rkt b/pkgs/data-pkgs/data-enumerate-lib/data/enumerate/lib.rkt
deleted file mode 100644
index 492754b4d4..0000000000
--- a/pkgs/data-pkgs/data-enumerate-lib/data/enumerate/lib.rkt
+++ /dev/null
@@ -1,199 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         data/enumerate
-         math/base         
-         math/distributions
-         math/number-theory
-         racket/generator)
-
-;; pick-an-index : ([0,1] -> Nat) ∩ (-> Nat)
-(define (random-natural-w/o-limit [prob-of-zero 0.01])
-  (max (random-natural/no-mean prob-of-zero)
-       (random-natural/no-mean prob-of-zero)
-       (random-natural/no-mean prob-of-zero)))
-
-;; random-natural/no-mean : [0,1] -> Nat
-(define (random-natural/no-mean prob-of-zero)
-  (define x (sample (geometric-dist prob-of-zero)))
-  (define m1 (expt 2 (exact-floor x)))
-  (define m0 (quotient m1 2))
-  (random-integer m0 m1))
-
-(define (random-index e)
-  (define k (size e))
-  (if (infinite? k)
-      (random-natural-w/o-limit)
-      (random-natural k)))
-
-(define (BPP-digits N)
-  (let loop ([8Pi -8])
-    (define 8i
-      (+ 8 8Pi))
-
-    (define (E k)
-      (/ 1 (+ 8i k)))
-
-    (define pi_i
-      (* N
-         (+ (* +4 (E 1))
-            (* -2 (E 4))
-            (* -1 (E 5))
-            (* -1 (E 6)))))
-
-    (for ([c (in-string (number->string pi_i))])
-      (unless (eq? #\/ c)
-        (yield (- (char->integer c) (char->integer #\0)))))
-
-    (loop 8i)))
-
-(define (bits-of k)
-  (/ (log k) (log 2)))
-
-;; XXX just subtract k if greater than k and then push the digit to
-;; left and go on
-(define (10-sequence->K-sequence k seq)
-  (cond
-   [(< k 10)
-    (10-sequence->sub10-sequence k seq)]
-   [(= k 10)
-    seq]
-   [else
-    (10-sequence->sup10-sequence k seq)]))
-
-(define (10-sequence->sub10-sequence k seq)
-  (in-generator
-   (for ([d seq])
-     (when (< d k)
-       (yield d)))))
-
-(define (10-sequence->sup10-sequence k seq)
-  (in-generator
-   (let loop ()
-     (define d
-       (for/sum ([i (in-range (ceiling (/ (log k) (log 10))))]
-                 [sub-d seq])
-         (* sub-d (expt 10 i))))
-     (yield (modulo d k))
-     (loop))))
-
-(module+ main
-  (define HOW-MANY 5000)
-
-  (define (test-seq K seq)
-    (define d->i (make-hasheq))
-    (for ([i (in-range HOW-MANY)]
-          [d seq])
-      (hash-update! d->i d add1 0))
-
-    (define total
-      (for/fold ([cnt 0]) ([i (in-range K)])
-        (define i-cnt (hash-ref d->i i 0))
-        (printf "\t~a => ~a" i i-cnt)
-        (when (and (= 4 (modulo i 5)) (not (= i (sub1 K)))) (newline))
-        (+ cnt i-cnt)))
-    (newline)
-
-    (unless (= HOW-MANY total)
-      (error 'digits "Missed some: ~a" total)))
-
-  (define (test-digits N)
-    (printf "BPP ~a\n" N)
-    (test-seq 10 (in-generator (BPP-digits N))))
-
-  (test-digits 1)
-  (test-digits 9)
-
-  (define (test-tetris K N)
-    (printf "BPP ~a -> ~a\n" N K)
-    (test-seq K (10-sequence->K-sequence K (in-generator (BPP-digits N)))))
-
-  (test-tetris 7 1)
-  (test-tetris 7 2)
-  (test-tetris 15 1)
-  (test-tetris 15 2)
-
-  (test-tetris 100 2))
-
-(define (infinite-sequence/e inner/e)
-  (define seed/e nat/e)
-  (define K (size inner/e))
-  (define (seed->seq N)
-    (define K-seq
-      (10-sequence->K-sequence K (in-generator (BPP-digits (+ 1 N)))))
-    (in-generator
-     (for ([k K-seq])
-       (yield (from-nat inner/e k)))))
-  (map/e seed->seq error seed/e))
-
-(module+ test
-  (define sevens/e (infinite-sequence/e (below/e 7)))
-  (define s (from-nat sevens/e 42))
-  (for ([e s]
-        [i (in-range 10)])
-    (printf "~a = ~a\n" i e)))
-
-(define PERMS (make-hasheq))
-(define (permutations-of-n/e n)
-  (hash-ref!
-   PERMS n
-   (λ ()
-     (cond
-      [(zero? n)
-       (const/e '())]
-      [else
-       (dep2/e
-        (factorial n)
-        (below/e n)
-        (λ (v)
-          (map/e
-           (λ (l)
-             (for/list ([i (in-list l)])
-               (if (= i v)
-                   (sub1 n)
-                   i)))
-           (λ (l)
-             (for/list ([i (in-list l)])
-               (if (= i (sub1 n))
-                   v
-                   i)))
-           (permutations-of-n/e (sub1 n)))))]))))
-
-(module+ test
-  (define perms/e (permutations-of-n/e 3))
-  (for ([i (in-range (size perms/e))])
-    (define l (from-nat perms/e i))
-    (printf "~a = ~a = ~a\n" i
-            l
-            (to-nat perms/e l))))
-
-(define (permutations/e l)
-  (define idx->e (list->vector l))
-  (define e->idx
-    (for/hash ([e (in-list l)]
-               [i (in-naturals)])
-      (values e i)))
-  (map/e
-   (λ (l)
-     (for/list ([idx (in-list l)])
-       (vector-ref idx->e idx)))
-   (λ (l)
-     (for/list ([e (in-list l)])
-       (hash-ref e->idx e)))
-   (permutations-of-n/e (vector-length idx->e))))
-
-(module+ test
-  (define abcds/e (permutations/e '(a b c d)))
-  (for ([i (in-range 10)])
-    (define l (from-nat abcds/e i))
-    (printf "~a = ~a = ~a\n" i l (to-nat abcds/e l))))
-
-(provide
- (contract-out
-  [random-index
-   (-> enum? exact-nonnegative-integer?)]
-  [infinite-sequence/e
-   (-> enum? enum?)]
-  [permutations/e
-   (-> list? enum?)]
-  [permutations-of-n/e
-   (-> exact-nonnegative-integer? enum?)]))
diff --git a/pkgs/data-pkgs/data-enumerate-lib/info.rkt b/pkgs/data-pkgs/data-enumerate-lib/info.rkt
deleted file mode 100644
index f74fb91f72..0000000000
--- a/pkgs/data-pkgs/data-enumerate-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-(define collection 'multi)
-(define deps '("base" "data-lib" "math-lib"))
-(define build-deps '("rackunit-lib"))
-
-(define pkg-desc "implementation (no documentation) of \"data/enumerate\"")
-
-(define pkg-authors '(maxsnew jay))
diff --git a/pkgs/data-pkgs/data-lib/LICENSE.txt b/pkgs/data-pkgs/data-lib/LICENSE.txt
deleted file mode 100644
index a1050d5d71..0000000000
--- a/pkgs/data-pkgs/data-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-data-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/data-pkgs/data-lib/data/gvector.rkt b/pkgs/data-pkgs/data-lib/data/gvector.rkt
deleted file mode 100644
index 20000fd81c..0000000000
--- a/pkgs/data-pkgs/data-lib/data/gvector.rkt
+++ /dev/null
@@ -1,257 +0,0 @@
-#lang racket/base
-;; written by ryanc
-(require (for-syntax racket/base
-                     unstable/wrapc
-                     syntax/for-body)
-         racket/contract/base
-         racket/dict
-         racket/vector)
-
-(define DEFAULT-CAPACITY 10)
-
-(define (make-gvector #:capacity [capacity DEFAULT-CAPACITY])
-  (gvector (make-vector capacity #f) 0))
-
-(define gvector*
-  (let ([gvector
-         (lambda init-elements
-           (let ([gv (make-gvector)])
-             (apply gvector-add! gv init-elements)
-             gv))])
-    gvector))
-
-(define (check-index who index n set-to-add?)
-  (unless (< index n)
-    (error who "index out of range ~a~a: ~s"
-           (let ([max-index (if set-to-add? (- n 2) (- n 1))])
-             (cond [(< max-index 0) "(empty)"]
-                   [else (format "[0,~s]" max-index)]))
-           (if set-to-add?
-               (format " or ~s to add" (- n 1))
-               "")
-           index)))
-
-(define (check-nonempty who n)
-  (unless (> n 0)
-    (error who "empty")))
-
-
-(define ((bad-index-error who index))
-  (raise-mismatch-error who "index out of range" index))
-
-(define (gvector-add! gv . items)
-  (let ([n (gvector-n gv)]
-        [v (gvector-vec gv)]
-        [item-count (length items)])
-    (cond [(<= (+ n item-count) (vector-length v))
-           (for ([index (in-naturals n)] [item (in-list items)])
-             (vector-set! v index item))
-           (set-gvector-n! gv (+ n item-count))]
-          [else
-           (let* ([nn (let loop ([nn (max DEFAULT-CAPACITY (vector-length v))])
-                        (if (<= (+ n item-count) nn) nn (loop (* 2 nn))))]
-                  [nv (make-vector nn #f)])
-             (vector-copy! nv 0 v)
-             (for ([index (in-naturals n)] [item (in-list items)])
-               (vector-set! nv index item))
-             (set-gvector-vec! gv nv)
-             (set-gvector-n! gv (+ n item-count)))])))
-
-;; Shrink when vector length is > SHRINK-ON-FACTOR * #elements
-(define SHRINK-ON-FACTOR 3)
-;; ... unless it would shrink to less than SHRINK-MIN
-(define SHRINK-MIN 10)
-
-;; Shrink by SHRINK-BY-FACTOR
-(define SHRINK-BY-FACTOR 2)
-
-;; SLOW!
-(define (gvector-remove! gv index)
-  (let ([n (gvector-n gv)]
-        [v (gvector-vec gv)])
-    (check-index 'gvector-remove! index n #f)
-    (cond [(and (>= (vector-length v) (* SHRINK-ON-FACTOR n))
-                (>= (quotient (vector-length v) SHRINK-BY-FACTOR) SHRINK-MIN))
-           (let ([nv (make-vector (max SHRINK-MIN (quotient (vector-length v) SHRINK-BY-FACTOR)) #f)])
-             (vector-copy! nv 0 v 0 index)
-             (vector-copy! nv index v (add1 index) n)
-             (set-gvector-n! gv (sub1 n))
-             (set-gvector-vec! gv nv))]
-          [else
-           (set-gvector-n! gv (sub1 n))
-           (vector-copy! v index v (add1 index) n)
-           (vector-set! v (sub1 n) #f)])))
-
-(define (gvector-remove-last! gv)
-  (let ([n (gvector-n gv)]
-        [v (gvector-vec gv)])
-    (check-nonempty 'gvector-remove-last! n)
-    (define last-val (vector-ref v (sub1 n)))
-    (gvector-remove! gv (sub1 n))
-    last-val))
-
-
-(define (gvector-count gv)
-  (gvector-n gv))
-
-(define (gvector-ref gv index
-                     [default (bad-index-error 'gvector-ref index)])
-  (unless (exact-nonnegative-integer? index)
-    (raise-type-error 'gvector-ref "exact nonnegative integer" index))
-  (if (< index (gvector-n gv))
-      (vector-ref (gvector-vec gv) index)
-      (if (procedure? default)
-          (default)
-          default)))
-
-;; gvector-set! with index = |gv| is interpreted as gvector-add!
-(define (gvector-set! gv index item)
-  (let ([n (gvector-n gv)])
-    (check-index 'gvector-set! index (add1 n) #t)
-    (if (= index n)
-        (gvector-add! gv item)
-        (vector-set! (gvector-vec gv) index item))))
-
-;; creates a snapshot vector
-(define (gvector->vector gv)
-  (vector-copy (gvector-vec gv) 0 (gvector-n gv)))
-
-(define (gvector->list gv)
-  (vector->list (gvector->vector gv)))
-
-;; Iteration methods
-
-;; A gvector position is represented as an exact-nonnegative-integer.
-
-(define (gvector-iterate-first gv)
-  (and (positive? (gvector-n gv)) 0))
-
-(define (gvector-iterate-next gv iter)
-  (check-index 'gvector-iterate-next iter (gvector-n gv) #f)
-  (let ([n (gvector-n gv)])
-    (and (< (add1 iter) n)
-         (add1 iter))))
-
-(define (gvector-iterate-key gv iter)
-  (check-index 'gvector-iterate-key iter (gvector-n gv) #f)
-  iter)
-
-(define (gvector-iterate-value gv iter)
-  (check-index 'gvector-iterate-value iter (gvector-n gv) #f)
-  (gvector-ref gv iter))
-
-(define (in-gvector gv)
-  (unless (gvector? gv)
-    (raise-type-error 'in-gvector "gvector" gv))
-  (in-dict-values gv))
-
-(define-sequence-syntax in-gvector*
-  (lambda () #'in-gvector)
-  (lambda (stx)
-    (syntax-case stx ()
-      [[(var) (in-gv gv-expr)]
-       (with-syntax ([gv-expr-c (wrap-expr/c #'gvector? #'gv-expr #:macro #'in-gv)])
-         (syntax/loc stx
-           [(var)
-            (:do-in ([(gv) gv-expr-c])
-                    (void) ;; outer-check; handled by contract
-                    ([index 0] [vec (gvector-vec gv)] [n (gvector-n gv)]) ;; loop bindings
-                    (< index n) ;; pos-guard
-                    ([(var) (vector-ref vec index)]) ;; inner bindings
-                    #t ;; pre-guard
-                    #t ;; post-guard
-                    ((add1 index) (gvector-vec gv) (gvector-n gv)))]))]
-      [[(var ...) (in-gv gv-expr)]
-       (with-syntax ([gv-expr-c (wrap-expr/c #'gvector? #'gv-expr #:macro #'in-gv)])
-         (syntax/loc stx
-           [(var ...) (in-gvector gv-expr-c)]))]
-      [_ #f])))
-
-(define-syntax (for/gvector stx)
-  (syntax-case stx ()
-    [(_ (clause ...) . body)
-     (with-syntax ([((pre-body ...) post-body) (split-for-body stx #'body)])
-       (quasisyntax/loc stx
-         (let ([gv (make-gvector)])
-           (for/fold/derived #,stx () (clause ...)
-            pre-body ...
-            (call-with-values (lambda () . post-body)
-              (lambda args (apply gvector-add! gv args) (values))))
-           gv)))]))
-
-(define-syntax (for*/gvector stx)
-  (syntax-case stx ()
-    [(_ (clause ...) . body)
-     (with-syntax ([((pre-body ...) post-body) (split-for-body stx #'body)])
-       (quasisyntax/loc stx
-         (let ([gv (make-gvector)])
-           (for*/fold/derived #,stx () (clause ...)
-            pre-body ...
-            (call-with-values (lambda () . post-body)
-              (lambda args (apply gvector-add! gv args) (values))))
-           gv)))]))
-
-(struct gvector (vec n)
-  #:mutable
-  #:property prop:dict/contract
-             (list (vector-immutable gvector-ref
-                                     gvector-set!
-                                     #f ;; set
-                                     gvector-remove!
-                                     #f ;; remove
-                                     gvector-count
-                                     gvector-iterate-first
-                                     gvector-iterate-next
-                                     gvector-iterate-key
-                                     gvector-iterate-value)
-                   (vector-immutable exact-nonnegative-integer?
-                                     any/c
-                                     exact-nonnegative-integer?
-                                     #f #f #f))
-  #:methods gen:equal+hash
-  [(define (equal-proc x y recursive-equal?)
-     (let ([vx (gvector-vec x)]
-           [vy (gvector-vec y)]
-           [nx (gvector-n x)]
-           [ny (gvector-n y)])
-       (and (= nx ny)
-            (for/and ([index (in-range nx)])
-              (recursive-equal? (vector-ref vx index)
-                                (vector-ref vy index))))))
-   (define (hash-code x hc)
-     (let ([v (gvector-vec x)]
-           [n (gvector-n x)])
-       (for/fold ([h 1]) ([i (in-range n)])
-         ;; FIXME: better way of combining hashcodes
-         (+ h (hc (vector-ref v i))))))
-   (define hash-proc  hash-code)
-   (define hash2-proc hash-code)]
-  #:property prop:sequence in-gvector)
-
-(provide/contract
- [gvector?
-  (-> any/c any)]
- [rename gvector* gvector
-  (->* () () #:rest any/c gvector?)]
- [make-gvector
-  (->* () (#:capacity exact-positive-integer?) gvector?)]
- [gvector-ref
-  (->* (gvector? exact-nonnegative-integer?) (any/c) any)]
- [gvector-set!
-  (-> gvector? exact-nonnegative-integer? any/c any)]
- [gvector-add!
-  (->* (gvector?) () #:rest any/c any)]
- [gvector-remove!
-  (-> gvector? exact-nonnegative-integer? any)]
- [gvector-remove-last!
-  (-> gvector? any)]
- [gvector-count
-  (-> gvector? any)]
- [gvector->vector
-  (-> gvector? vector?)]
- [gvector->list
-  (-> gvector? list?)])
-
-(provide (rename-out [in-gvector* in-gvector])
-         for/gvector
-         for*/gvector)
diff --git a/pkgs/data-pkgs/data-lib/data/heap.rkt b/pkgs/data-pkgs/data-lib/data/heap.rkt
deleted file mode 100644
index a903bc765b..0000000000
--- a/pkgs/data-pkgs/data-lib/data/heap.rkt
+++ /dev/null
@@ -1,284 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         racket/vector
-         racket/match)
-
-(define MIN-SIZE 4)
-
-(struct heap ([vec #:mutable] [count #:mutable] <=?))
-;; length(vec)/4 <= size <= length(vec), except size >= MIN-SIZE
-;; size = next available index
-
-;; A VT is a binary tree represented as a vector.
-
-;; VT Index functions
-
-(define (vt-root) 0)
-
-(define (vt-parent n) (quotient (sub1 n) 2))
-(define (vt-leftchild n) (+ (* n 2) 1))
-(define (vt-rightchild n) (+ (* n 2) 2))
-
-(define (vt-root? n) (zero? n))
-(define (vt-leftchild? n) (odd? n))
-(define (vt-rightchild? n) (even? n))
-
-
-;; Operations
-
-(define (heapify-up <=? vec n)
-  (unless (vt-root? n)
-    (let* ([parent (vt-parent n)]
-           [n-key (vector-ref vec n)]
-           [parent-key (vector-ref vec parent)])
-      (unless (<=? parent-key n-key)
-        (vector-set! vec parent n-key)
-        (vector-set! vec n parent-key)
-        (heapify-up <=? vec parent)))))
-
-(define (heapify-down <=? vec n size)
-  (let ([left (vt-leftchild n)]
-        [right (vt-rightchild n)]
-        [n-key (vector-ref vec n)])
-    (when (< left size)
-      (let ([left-key (vector-ref vec left)])
-        (let-values ([(child child-key)
-                      (if (< right size)
-                          (let ([right-key (vector-ref vec right)])
-                            (if (<=? left-key right-key)
-                                (values left left-key)
-                                (values right right-key)))
-                          (values left left-key))])
-          (unless (<=? n-key child-key)
-            (vector-set! vec n child-key)
-            (vector-set! vec child n-key)
-            (heapify-down <=? vec child size)))))))
-
-(define (subheap? <=? vec n size)
-  (let ([left (vt-leftchild n)]
-        [right (vt-rightchild n)])
-    (and (if (< left size)
-             (<=? (vector-ref vec n) (vector-ref vec left))
-             #t)
-         (if (< right size)
-             (<=? (vector-ref vec n) (vector-ref vec right))
-             #t))))
-
-(define (grow-vector v1 new-size-min)
-  (let ([new-size (let loop ([size (vector-length v1)])
-                    (if (>= size new-size-min)
-                        size
-                        (loop (* size 2))))])
-    (let ([v2 (make-vector new-size #f)])
-      (vector-copy! v2 0 v1 0)
-      v2)))
-
-(define (shrink-vector v1)
-  (let ([v2 (make-vector (quotient (vector-length v1) 2) #f)])
-    (vector-copy! v2 0 v1 0 (vector-length v2))
-    v2))
-
-;; Heaps
-
-(define (make-heap <=?)
-  (heap (make-vector MIN-SIZE #f) 0 <=?))
-
-(define (list->heap <=? lst)
-  (vector->heap <=? (list->vector lst)))
-
-(define (vector->heap <=? vec0 [start 0] [end (vector-length vec0)])
-  (define size (- end start))
-  (define len (let loop ([len MIN-SIZE]) (if (<= size len) len (loop (* 2 len)))))
-  (define vec (make-vector len #f))
-  ;; size <= length(vec)
-  (vector-copy! vec 0 vec0 start end)
-  (for ([n (in-range (sub1 size) -1 -1)])
-    (heapify-down <=? vec n size))
-  (heap vec size <=?))
-
-(define (heap-copy h)
-  (match h
-    [(heap vec count <=?)
-     (heap (vector-copy vec) count <=?)]))
-
-(define (heap-add! h . keys)
-  (heap-add-all! h (list->vector keys)))
-
-(define (heap-add-all! h keys)
-  (let-values ([(keys keys-size)
-                (cond [(list? keys)
-                       (let ([keys-v (list->vector keys)])
-                         (values keys-v (vector-length keys-v)))]
-                      [(vector? keys)
-                       (values keys (vector-length keys))]
-                      [(heap? keys)
-                       (values (heap-vec keys) (heap-count keys))])])
-    (match h
-      [(heap vec size <=?)
-       (let* ([new-size (+ size keys-size)]
-              [vec (if (> new-size (vector-length vec))
-                       (let ([vec (grow-vector vec new-size)])
-                         (set-heap-vec! h vec)
-                         vec)
-                       vec)])
-         (vector-copy! vec size keys 0 keys-size)
-         (for ([n (in-range size new-size)])
-           (heapify-up <=? vec n))
-         (set-heap-count! h new-size))])))
-
-(define (heap-min h)
-  (match h
-    [(heap vec size <=?)
-     (when (zero? size)
-       (error 'heap-min "empty heap"))
-     (vector-ref vec 0)]))
-
-(define (heap-remove-min! h)
-  (match h
-    [(heap vec size <=?)
-     (when (zero? size)
-       (error 'heap-remove-min! "empty heap"))
-     (heap-remove-index! h 0)]))
-
-(define (heap-remove-index! h index)
-  (match h
-    [(heap vec size <=?)
-     (unless (< index size)
-       (if (zero? size)
-           (error 'heap-remove-index!
-                  "empty heap: ~s" index)
-           (error 'heap-remove-index!
-                  "index out of bounds [0,~s]: ~s" (sub1 size) index)))
-     (define sub1-size (sub1 size))
-     (vector-set! vec index (vector-ref vec sub1-size))
-     (vector-set! vec sub1-size #f)
-     (cond
-       [(= sub1-size index)
-        ;; easy to remove the right-most leaf
-        (void)]
-       [(= index 0)
-        ;; can only go down when at the root
-        (heapify-down <=? vec index sub1-size)]
-       [else
-        (define index-parent (vt-parent index))
-        (cond
-          ;; if we are in the right relationship with our parent,
-          ;; try to heapify down
-          [(<=? (vector-ref vec index-parent) (vector-ref vec index))
-           (heapify-down <=? vec index sub1-size)]
-          [else
-           ;; otherwise we need to heapify up
-           (heapify-up <=? vec index)])])
-     (when (< MIN-SIZE size (quotient (vector-length vec) 4))
-       (set-heap-vec! h (shrink-vector vec)))
-     (set-heap-count! h sub1-size)]))
-
-(define (heap-get-index h v same?)
-  (match h
-    [(heap vec size <=?)
-     (and (not (eq? 0 size))
-          (let search ([n 0] [n-key (vector-ref vec 0)])
-            (cond
-             [(same? n-key v) n]
-             ;; The heap property ensures n-key <= all its children
-             [else
-              (define (search-right)
-                (define right (vt-rightchild n))
-                (and (< right size)
-                     (let ([right-key (vector-ref vec right)])
-                       (and (<=? right-key v)
-                            (search right right-key)))))
-              ;; Try going left if the left child is <= v
-              (define left (vt-leftchild n))
-              (and (< left size) ;; if no left, there can't be a right.
-                   (let ([left-key (vector-ref vec left)])
-                     ;; If left <= v, try left side.
-                     (if (<=? left-key v)
-                         (or (search left left-key) (search-right))
-                         (search-right))))])))]))
-
-(define (heap-remove! h v #:same? [same? equal?])
-  (match (heap-get-index h v same?)
-    [#f (void)]
-    [n (heap-remove-index! h n)]))
-
-(define (in-heap h)
-  (in-heap/consume! (heap-copy h)))
-
-(define (in-heap/consume! h)
-  (make-do-sequence
-   (lambda ()
-     (values (lambda (_) (heap-min h))
-             (lambda (_) (heap-remove-min! h) #t)
-             #t
-             (lambda (_) (> (heap-count h) 0))
-             (lambda _ #t)
-             (lambda _ #t)))))
-
-;; --------
-
-;; preferred order is (heap-sort vec <=?), but allow old order too
-(define (heap-sort! x y)
-  (cond [(and (vector? x) (procedure? y))
-         (heap-sort!* x y)]
-        [(and (vector? y) (procedure? x))
-         (heap-sort!* y x)]
-        [else
-         (unless (vector? x)
-           (raise-argument-error 'heap-sort! "vector?" x))
-         (raise-argument-error 'heap-sort! "procedure?" y)]))
-
-(define (heap-sort!* v <=?)
-  ;; to get ascending order, need max-heap, so reverse comparison
-  (define (>=? x y) (<=? y x))
-  (define size (vector-length v))
-  (for ([n (in-range (sub1 size) -1 -1)])
-    (heapify-down >=? v n size))
-  (for ([last (in-range (sub1 size) 0 -1)])
-    (let ([tmp (vector-ref v 0)])
-      (vector-set! v 0 (vector-ref v last))
-      (vector-set! v last tmp))
-    (heapify-down >=? v 0 last)))
-
-(define (heap->vector h)
-  (match h
-    [(heap vec size <=?)
-     (let ([v (vector-copy vec 0 size)])
-       (heap-sort!* v <=?)
-       v)]))
-
-;; --------
-
-(provide/contract
- [make-heap (-> (-> any/c any/c any/c) heap?)]
- [heap? (-> any/c boolean?)]
- [heap-count (-> heap? exact-nonnegative-integer?)]
- [heap-add! (->* (heap?) () #:rest list? void?)]
- [heap-add-all! (-> heap? (or/c list? vector? heap?) void?)]
- [heap-min (-> heap? any/c)]
- [heap-remove-min! (-> heap? void?)]
- [heap-remove! (->* (heap? any/c) [#:same? (-> any/c any/c any/c)] void?)]
-
- [vector->heap (-> (-> any/c any/c any/c) vector? heap?)]
- [heap->vector (-> heap? vector?)]
- [heap-copy (-> heap? heap?)]
-
- [in-heap (-> heap? sequence?)]
- [in-heap/consume! (-> heap? sequence?)])
-
-(provide heap-sort!)
-
-(module+ test-util
-  (provide valid-heap?)
-  (define (valid-heap? a-heap)
-    (match a-heap
-      [(heap vec size <=?)
-       (let loop ([i 0]
-                  [parent -inf.0])
-         (cond
-           [(< i size)
-            (define this (vector-ref vec i))
-            (and (<=? parent this)
-                 (loop (vt-leftchild i) this)
-                 (loop (vt-rightchild i) this))]
-           [else #t]))])))
diff --git a/pkgs/data-pkgs/data-lib/data/interval-map.rkt b/pkgs/data-pkgs/data-lib/data/interval-map.rkt
deleted file mode 100644
index 728ba552fc..0000000000
--- a/pkgs/data-pkgs/data-lib/data/interval-map.rkt
+++ /dev/null
@@ -1,288 +0,0 @@
-#lang racket/base
-;; owned by ryanc
-(require racket/contract/base
-         racket/promise
-         racket/dict
-         data/splay-tree)
-
-;; Interval-maps support only half-open exact-integer intervals.
-
-;; An interval-map is (interval-map adj-splay-tree)
-;; splay-tree maps Start => (cons End-Start Value)
-;; Invariant: intervals are disjoint (but the end of one interval
-;; can be the same as the start of the next, since half-open).
-
-(define (interval-map-ref im key [default (interval-map-error key)])
-  (let* ([s (interval-map-s im)]
-         [istart (splay-tree-iterate-greatest/<=? s key)])
-    (cond [istart
-           (let ([istartkey (splay-tree-iterate-key s istart)]
-                 [istartvalue (splay-tree-iterate-value s istart)])
-             (if (< (- key istartkey) (car istartvalue))
-                 (cdr istartvalue)
-                 (if (procedure? default) (default) default)))]
-          [else
-           (if (procedure? default) (default) default)])))
-
-(define ((interval-map-error x))
-  (error 'interval-map-ref "no mapping found for: ~e" x))
-
-;; (POST x) =
-;;   (if (start <= x < end)
-;;       (updater (PRE x default))
-;;       (PRE x))
-(define (interval-map-update*! im start end updater
-                               [default (error-for 'interval-map-update*!)])
-  (define updated-defaultp
-    (delay (updater (if (procedure? default) (default) default))))
-  (let ([s (interval-map-s im)])
-    (check-interval start end 'interval-map-update*!)
-    (split! s start)
-    (split! s end)
-    ;; Interval ix needs updating iff start <= key(ix) < end
-    ;; (Also need to insert missing intervals)
-    ;; Main loop:
-    (let loop ([start start] [ix (splay-tree-iterate-least/>=? s start)])
-      (let ([ixstart (and ix (splay-tree-iterate-key s ix))])
-        (cond [(and ix (< ixstart end))
-               ;; First do leading gap, [ start, key(ix) )
-               (when (< start ixstart)
-                 (splay-tree-set! s start
-                                 (cons (- ixstart start)
-                                       (force updated-defaultp))))
-               ;; Then interval, [ ixstart, end(ix) )
-               (let ([ixvalue (splay-tree-iterate-value s ix)])
-                 (splay-tree-set! s ixstart
-                                  (cons (car ixvalue)
-                                        (updater (cdr ixvalue))))
-                 (loop (+ ixstart (car ixvalue)) (splay-tree-iterate-next s ix)))]
-              [else
-               ;; Do gap, [ start, end )
-               (when (< start end)
-                 (splay-tree-set! s start
-                                 (cons (- end start)
-                                       (force updated-defaultp))))])))))
-
-(define (interval-map-cons*! im start end obj [default null])
-  (check-interval start end 'interval-map-cons*!)
-  (interval-map-update*! im start end (lambda (old) (cons obj old)) default))
-
-(define ((error-for who))
-  (error who "no mapping found"))
-
-;; (POST x) = (if (start <= x < end) value (PRE x))
-(define (interval-map-set! im start end value)
-  (check-interval start end 'interval-map-set!)
-  (interval-map-remove! im start end)
-  (interval-map-update*! im start end (lambda (old) value) #f))
-
-(define (interval-map-remove! im start end)
-  (let ([s (interval-map-s im)])
-    (check-interval start end 'interval-map-remove!)
-    (let ([start (norm s start 0)]
-          [end (norm s end 1)])
-      (when (and start end) ;; ie, s not empty
-        (split! s start)
-        (split! s end)
-        (splay-tree-remove-range! s start end)))))
-
-(define (interval-map-contract! im from to)
-  (check-interval from to 'interval-map-contract!)
-  (interval-map-remove! im from to)
-  (let* ([s (interval-map-s im)])
-    (splay-tree-contract! s from to)))
-
-(define (interval-map-expand! im from to)
-  (check-interval from to 'interval-map-expand!)
-  (let* ([s (interval-map-s im)])
-    (split! s from)
-    (splay-tree-expand! s from to)))
-
-(define (norm s pos adjust)
-  (cond [(= pos -inf.0)
-         (let ([iter (splay-tree-iterate-least s)])
-           (and iter (splay-tree-iterate-key s iter)))]
-        [(= pos +inf.0)
-         (let ([iter (splay-tree-iterate-greatest s)])
-           ;; add 1 to *include* max (recall, half-open intervals)
-           (and iter (+ 1 (splay-tree-iterate-key s iter))))]
-        [else pos]))
-
-;; split! 
-;; Ensures that if an interval contains x, it starts at x
-(define (split! s x)
-  (let* ([ix (splay-tree-iterate-greatest/<? s x)]
-         [ixstart (and ix (splay-tree-iterate-key s ix))])
-    ;; (ix = #f) or (key(ix) < x)
-    (cond [(eq? ix #f)
-           ;; x <= all existing intervals; that is, either
-           ;;   1) x starts its own interval (=), or
-           ;;   2) x < all existing intervals (<)
-           ;; Either way, nothing to split.
-           (void)]
-          [else
-           (let* ([ixvalue (splay-tree-iterate-value s ix)]
-                  [ixrun (car ixvalue)])
-             (cond [(< x (+ ixstart ixrun))
-                    ;; Split; adjust ix to end at x, insert [x, ixend)
-                    (splay-tree-set! s ixstart (cons (- x ixstart) (cdr ixvalue)))
-                    (splay-tree-set! s x (cons (- (+ ixstart ixrun) x) (cdr ixvalue)))]
-                   [else
-                    ;; x not in ix
-                    (void)]))])))
-
-(define (check-interval start end who)
-  (unless (< start end)
-    (error who "bad interval: start ~e not less than end ~e" start end)))
-
-;; Iteration
-
-(struct interval-map-iter (si))
-
-(define (interval-map-iterate-first im)
-  (cond [(splay-tree-iterate-first (interval-map-s im))
-         => interval-map-iter]
-        [else #f]))
-
-(define (interval-map-iterate-next im iter)
-  (cond [(splay-tree-iterate-next (interval-map-s im)
-                                 (interval-map-iter-si iter))
-         => interval-map-iter]
-        [else #f]))
-
-(define (interval-map-iterate-key im iter)
-  (let ([s (interval-map-s im)]
-        [is (interval-map-iter-si iter)])
-    (let ([key (splay-tree-iterate-key s is)])
-      (cons key (+ key (car (splay-tree-iterate-value s is)))))))
-
-(define (interval-map-iterate-value im iter)
-  (let ([s (interval-map-s im)]
-        [is (interval-map-iter-si iter)])
-    (cdr (splay-tree-iterate-value s is))))
-
-;; ============================================================
-
-;; Interval map
-
-(define dict-methods
-  (vector-immutable interval-map-ref
-                    #f ;; set!
-                    #f ;; set
-                    #f ;; remove!
-                    #f ;; remove
-                    (lambda (im) (error 'interval-map-count "not supported"))
-                    interval-map-iterate-first
-                    interval-map-iterate-next
-                    interval-map-iterate-key
-                    interval-map-iterate-value))
-
-;; Can't use prop:dict/contract, because we don't really
-;; follow the dict interface!
-
-(struct interval-map (s)
-        #:property prop:dict dict-methods)
-
-(struct interval-map* interval-map (key-c value-c)
-        #:property prop:dict dict-methods)
-
-(define (make-interval-map #:key-contract [key-contract any/c]
-                           #:value-contract [value-contract any/c])
-  (cond [(and (eq? key-contract any/c) (eq? value-contract any/c))
-         (interval-map (make-adjustable-splay-tree))]
-        [else
-         (interval-map* (make-adjustable-splay-tree) key-contract value-contract)]))
-
-;; ============================================================
-
-(define (key-c im)
-  (cond [(interval-map*? im)
-         (let ([c (interval-map*-key-c im)])
-           (if (eq? c any/c) exact-integer? (and/c exact-integer? c)))]
-        [else exact-integer?]))
-(define (val-c im)
-  (cond [(interval-map*? im)
-         (interval-map*-value-c im)]
-        [else any/c]))
-
-(provide/contract
- [make-interval-map
-  (->* ()
-       (#:key-contract contract? #:value-contract contract?)
-       interval-map?)]
- [interval-map?
-  (-> any/c boolean?)]
- [interval-map-ref
-  (->i ([im interval-map?] [k (im) (key-c im)]) ([d any/c]) any)]
- [interval-map-set!
-  (->i ([im interval-map?]
-        [start (im) (key-c im)]
-        [end (im) (key-c im)]
-        [v (im) (val-c im)])
-       [_r void?])]
- [interval-map-update*!
-  (->i ([im interval-map?]
-        [start (im) (key-c im)]
-        [end (im) (key-c im)]
-        [f (im) (-> (val-c im) (val-c im))])
-       ([default any/c]) ;; imprecise
-       [_r void?])]
- [interval-map-cons*!
-  (->i ([im interval-map?]
-        [start (im) (key-c im)]
-        [end (im) (key-c im)]
-        [v any/c]) ;; imprecise
-       ([d any/c]) ;; imprecise
-       [_r void?])]
- [interval-map-remove!
-  (->i ([im interval-map?]
-        [start (im) (or/c -inf.0 (key-c im))]
-        [end (im) (or/c +inf.0 (key-c im))])
-       [_r void?])]
- [interval-map-contract!
-  (->i ([im interval-map?]
-        [start (im) (key-c im)]
-        [end (im) (key-c im)])
-       [_r void?])]
- [interval-map-expand!
-  (->i ([im interval-map?]
-        [start (im) (key-c im)]
-        [end (im) (key-c im)])
-       [_r void?])]
-
- [interval-map-iterate-first
-  (-> interval-map?
-      (or/c interval-map-iter? #f))]
- [interval-map-iterate-next
-  (-> interval-map? interval-map-iter?
-      (or/c interval-map-iter? #f))]
- [interval-map-iterate-key
-  (->i ([im interval-map?] [i interval-map-iter?])
-       [_r (im) (let ([k (key-c im)]) (cons/c k k))])]
- [interval-map-iterate-value
-  (->i ([im interval-map?] [i interval-map-iter?])
-       [_r (im) (val-c im)])]
-
- [interval-map-iter?
-  (-> any/c boolean?)])
-
-#|
-;; Testing
-(define (dump im)
-  (dict-map (interval-map-s im) list))
-
-(define im (make-interval-map* = <))
-(interval-map-set! im 1 3 '(a))
-(interval-map-set! im 4 7 '(b))
-(dump im)
-;;(interval-map-remove! im 2 5)
-(interval-map-cons*! im 2 5 'c null)
-(dump im)
-|#
-
-#|
-(define sim (make-interval-map* string=? string<?))
-(interval-map-set! sim "apple" "orange" 'fruit)
-(interval-map-set! sim "banana" "guava" 'tropical-fruit)
-(dump sim)
-|#
diff --git a/pkgs/data-pkgs/data-lib/data/order.rkt b/pkgs/data-pkgs/data-lib/data/order.rkt
deleted file mode 100644
index 77bfd1c432..0000000000
--- a/pkgs/data-pkgs/data-lib/data/order.rkt
+++ /dev/null
@@ -1,363 +0,0 @@
-#lang racket/base
-(require racket/dict
-         racket/contract/base
-         racket/string
-         ffi/unsafe/atomic
-         racket/private/generic)
-
-(define ordering/c
-  (or/c '= '< '>))
-
-(provide ordering/c)
-
-;; we use the private version here because we need to
-;; provide a backwards compatible interface (just in case)
-;; i.e., exporting prop:ordered-dict as opposed to using a
-;;       generated hidden property.
-(define-primitive-generics
-  (ordered-dict gen:ordered-dict
-                prop:ordered-dict
-                ordered-methods
-                ordered-dict?
-                ordered-dict-implements?)
-  #:fast-defaults ()
-  #:defaults ()
-  #:fallbacks ()
-  #:derive-properties ()
-  (dict-iterate-least ordered-dict)
-  (dict-iterate-greatest ordered-dict)
-  (dict-iterate-least/>? ordered-dict key)
-  (dict-iterate-least/>=? ordered-dict key)
-  (dict-iterate-greatest/<? ordered-dict key)
-  (dict-iterate-greatest/<=? ordered-dict key))
-
-(define extreme-contract
-  (->i ([d ordered-dict?])
-       [_r (d) (or/c #f (dict-iter-contract d))]))
-
-(define search-contract
-  (->i ([d ordered-dict?]
-        [k (d) (dict-key-contract d)])
-       [_r (d) (or/c #f (dict-iter-contract d))]))
-
-(define prop:ordered-dict-contract
-  (let ([e (or/c extreme-contract #f)] ;; generics initializes with #f,
-                                        ; then sets the methods
-        [s (or/c search-contract #f)])
-    (vector/c e   ;; iterate-least
-              e   ;; iterate-greatest
-              s   ;; iterate-least/>?
-              s   ;; iterate-least/>=?
-              s   ;; iterate-greatest/<?
-              s)));; iterate-greatest/<=?
-
-;; --------
-
-(provide gen:ordered-dict)
-(provide/contract
- [prop:ordered-dict
-  (struct-type-property/c prop:ordered-dict-contract)]
- [ordered-dict? (-> any/c boolean?)]
- [dict-iterate-least extreme-contract]
- [dict-iterate-greatest extreme-contract]
- [dict-iterate-least/>? search-contract]
- [dict-iterate-least/>=? search-contract]
- [dict-iterate-greatest/<? search-contract]
- [dict-iterate-greatest/<=? search-contract])
-
-;; ============================================================
-
-(struct order (name domain-contract comparator =? <?)
-        #:property prop:procedure (struct-field-index comparator))
-
-(define order*
-  (let ([order
-         (case-lambda
-           [(name ctc cmp)
-            (order name ctc cmp
-                   (lambda (x y) (eq? (cmp x y) '=))
-                   (lambda (x y) (eq? (cmp x y) '<)))]
-           [(name ctc = <)
-            (order name ctc
-                   (lambda (x y)
-                     (cond [(= x y) '=]
-                           [(< x y) '<]
-                           [(< y x) '>]
-                           [else (incomparable name x y)]))
-                   = <)]
-           [(name ctc = < >)
-            (order name ctc
-                   (lambda (x y)
-                     (cond [(= x y) '=]
-                           [(< x y) '<]
-                           [(> x y) '>]
-                           [else (incomparable name x y)]))
-                   = <)])])
-    order))
-
-(define (incomparable name x y)
-  (error name "values are incomparable: ~e ~e" x y))
-
-(provide/contract
- [rename order* order
-  (->* (symbol? contract? procedure?) (procedure? procedure?)
-       order?)]
- [order? (-> any/c boolean?)]
- [order-comparator
-  (-> order? procedure?)]
- [order-<?
-  (-> order? procedure?)]
- [order-=?
-  (-> order? procedure?)]
- [order-domain-contract
-  (-> order? contract?)])
-
-;; ============================================================
-
-(define (real/not-NaN? x) (and (real? x) (not (eqv? x +nan.0))))
-
-(define real-order
-  (order* 'real-order real/not-NaN? = < >))
-
-(provide/contract
- [real-order order?])
-
-;; ============================================================
-
-#|
-natural-cmp : Comparator
-datum-cmp : Comparator
-
-comparators for (most) built-in values
-!! May diverge on cyclical input.
-
-natural-cmp:
-  * restriction to reals equiv to <,=
-
-    real (exact and inexact, #e1 = #i1, +nan.0 not allowed!)
-  < complex
-  < Other
-
-datum-cmp:
-  * restriction to reals NOT EQUIV to <,= (separates exact, inexact)
-
-    exact real
-  < inexact real (+nan.0 > +inf.0)
-  < complex
-  < Other
-
-Other:
-
-    string
-  < bytes
-  < keyword
-  < symbol
-  < bool
-  < char
-  < path
-  < null
-  < pair
-  < vector
-  < box
-  < prefab-struct
-  < fully-transparent-struct
-
-;; FIXME: What else to add? regexps (4 kinds?), syntax, ...
-
-|#
-
-;; not exported because I'm not sure it's a good idea and I'm not sure
-;; how to characterize it
-(define (natural-cmp x y)
-  (gen-cmp x y #t))
-
-(define (datum-cmp x y)
-  (gen-cmp x y #f))
-
-(define (gen-cmp x y natural?)
-  (define-syntax-rule (recur x* y*)
-    (gen-cmp x* y* natural?))
-  (cond [(eq? x y) '=]
-        #|
-        [(T? x) ...]
-         ;; at this point, Type(x) > T
-        [(T? y)
-         ;; Type(x) > T = Type(y), so:
-         '>]
-        Assumes arguments are legal.
-        |#
-        [(real? x)
-         (if (real? y)
-             (cond [natural?
-                    (cmp* < = x y)]
-                   [else ;; exact < inexact
-                    (cond [(and (exact? x) (exact? y))
-                           (cmp* < = x y)]
-                          [(exact? x) ;; inexact y
-                           '<]
-                          [(exact? y) ;; inexact x
-                           '>]
-                          [(and (eqv? x +nan.0) (eqv? y +nan.0))
-                           '=]
-                          [(eqv? x +nan.0)
-                           '>]
-                          [(eqv? y +nan.0)
-                           '<]
-                          [else ;; inexact x, inexact y
-                           (cmp* < = x y)])])
-             '<)]
-        [(real? y) '>]
-        [(complex? x)
-         (if (complex? y)
-             (lexico (recur (real-part x) (real-part y))
-                     (recur (imag-part x) (imag-part y)))
-             '<)]
-        [(complex? y) '>]
-        [(string? x)
-         (if (string? y)
-             (cmp* string<? string=? x y)
-             '<)]
-        [(string? y) '>]
-        [(bytes? x)
-         (if (bytes? y)
-             (cmp* bytes<? bytes=? x y)
-             '<)]
-        [(bytes? y) '>]
-        [(keyword? x)
-         (if (keyword? y)
-             (cmp* keyword<? eq? x y)
-             '<)]
-        [(keyword? y) '>]
-        [(symbol? x)
-         (if (symbol? y)
-             (cmp* symbol<? eq? x y)
-             '<)]
-        [(symbol? y) '>]
-        [(boolean? x)
-         (if (boolean? y)
-             (cond [(eq? x y) '=]
-                   [y '<]
-                   [else '>])
-             '<)]
-        [(boolean? y) '>]
-        [(char? x)
-         (if (char? y)
-             (cmp* char<? char=? x y)
-             '<)]
-        [(char? y)
-         '>]
-        [(path-for-some-system? x)
-         (if (path-for-some-system? y)
-             (cmp* bytes<? bytes=? (path->bytes x) (path->bytes y))
-             '<)]
-        [(path-for-some-system? y)
-         '>]
-        [(null? x)
-         (if (null? y)
-             '=
-             '<)]
-        [(null? y) '>]
-        [(pair? x)
-         (if (pair? y)
-             (lexico (recur (car x) (car y)) (recur (cdr x) (cdr y)))
-             '<)]
-        [(pair? y) '>]
-        [(vector? x)
-         (if (vector? y)
-             (vector-cmp x y 0 natural?)
-             '<)]
-        [(vector? y) '>]
-        [(box? x)
-         (if (box? y)
-             (recur (unbox x) (unbox y))
-             '<)]
-        [(box? y) '>]
-        [(prefab-struct-key x)
-         (if (prefab-struct-key y)
-             (lexico (recur (prefab-struct-key x) (prefab-struct-key y))
-                     ;; FIXME: use struct-ref to avoid allocation?
-                     (vector-cmp (struct->vector x) (struct->vector y) 1 natural?))
-             '<)]
-        [(prefab-struct-key y)
-         '>]
-        [(fully-transparent-struct-type x)
-         => (lambda (xtype)
-              (cond [(fully-transparent-struct-type y)
-                     => (lambda (ytype)
-                          ;; could also do another lexico with object-name first
-                          (lexico (object-cmp xtype ytype)
-                                  ;; FIXME: use struct-ref to avoid allocation?
-                                  (vector-cmp (struct->vector x) (struct->vector y)
-                                              1 natural?)))]
-                    [else '<]))]
-        [(fully-transparent-struct-type y)
-         '>]
-        [else
-         (raise-type-error
-          (if natural? 'natural-cmp 'datum-cmp)
-          (string-join '("number" "string" "bytes" "keyword" "symbol" "boolean" "character"
-                         "path" "null" "pair" "vector" "box"
-                         "prefab struct" "or fully-transparent struct")
-                       ", ")
-          0 x y)]))
-
-(define-syntax-rule (cmp* <? =? xe ye)
-  (let ([x xe] [y ye])
-    (if (=? x y) '= (if (<? x y) '< '>))))
-
-(define-syntax-rule (lexico c1 c2)
-  (case c1
-    ((<) '<)
-    ((=) c2)
-    ((>) '>)))
-
-(define (vector-cmp x y i natural?)
-  (cond [(< i (vector-length x))
-         (if (< i (vector-length y))
-             (lexico (gen-cmp (vector-ref x i) (vector-ref y i) natural?)
-                     (vector-cmp x y (add1 i) natural?))
-             '>)]
-        [(< i (vector-length y))
-         '<]
-        [else '=]))
-
-;; fully-transparent-struct-type : any -> struct-type or #f
-(define (fully-transparent-struct-type x)
-  (parameterize ((current-inspector weak-inspector))
-    (let-values ([(x-type x-skipped?) (struct-info x)])
-      (and (not x-skipped?) x-type))))
-
-;; weak inspector controls no struct types;
-;; so if it can inspect, must be transparent
-(define weak-inspector (make-inspector))
-
-;; Impose an arbitrary (but consistent) ordering on eq?-compared
-;; objects. Use eq? and eq-hash-code for common fast path. Fall back
-;; to table when comparing struct-types *same eq-hash-code* but *not
-;; eq?*. That should be rare.
-(define object-order-table (make-weak-hasheq))
-(define object-order-next 0)
-(define (object-cmp x y)
-  (cond [(eq? x y) '=]
-        [else
-         (lexico
-          (cmp* < = (eq-hash-code x) (eq-hash-code y))
-          (call-as-atomic
-           (lambda ()
-             (let ([xi (hash-ref object-order-table x #f)]
-                   [yi (hash-ref object-order-table y #f)])
-               (cond [(and xi yi)
-                      ;; x not eq? y, so xi != yi
-                      (if (< xi yi) '< '>)]
-                     [xi '<]
-                     [yi '>]
-                     [else ;; neither one is in table; we only need to add one
-                      (hash-set! object-order-table x object-order-next)
-                      (set! object-order-next (add1 object-order-next))
-                      '<])))))]))
-
-(define datum-order
-  (order* 'datum-order any/c datum-cmp))
-
-(provide/contract
- [datum-order order?])
diff --git a/pkgs/data-pkgs/data-lib/data/skip-list.rkt b/pkgs/data-pkgs/data-lib/data/skip-list.rkt
deleted file mode 100644
index 689fb206ab..0000000000
--- a/pkgs/data-pkgs/data-lib/data/skip-list.rkt
+++ /dev/null
@@ -1,503 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/contract/base
-         racket/dict
-         racket/generic
-         "order.rkt")
-;; owned by ryanc
-
-#|
-reference
-  Skip Lists: A Probabilistic Alternative to Balanced Trees
-  by William Pugh
-
-I take the "fix the dice" approach to avoiding level jumps.
-Levels are indexed starting at 1, as in the paper.
-|#
-
-#|
-(require (rename-in racket/unsafe/ops
-                    [unsafe-vector-length vector-length]
-                    [unsafe-vector-ref vector-ref]
-                    [unsafe-vector-set! vector-set!]))
-|#
-
-(define PROBABILITY-FACTOR 4)
-(define MAX-LEVEL 16)
-
-(define DATA-SLOTS 2)
-
-;; An Item is
-;;  - (vector key data Item/#f Item/#f ...)
-
-;; The Level of an Item is the number of next links it has (at least 1).
-;; The head is an Item with key and data #f (never examined)
-;; The end of the list is represented by #f
-
-(define (item? x) (vector? x))
-(define (item-level item)
-  (- (vector-length item) DATA-SLOTS))
-
-(define (item-key item)
-  (vector-ref item 0))
-(define (item-data item)
-  (vector-ref item 1))
-(define (item-next item level)
-  (vector-ref item (+ (+ level DATA-SLOTS) -1)))
-
-(define (set-item-key! item key)
-  (vector-set! item 0 key))
-(define (set-item-data! item data)
-  (vector-set! item 1 data))
-(define (set-item-next! item level next)
-  (vector-set! item (+ (+ level DATA-SLOTS) -1) next))
-
-(define (resize-item item level)
-  (define new-size (+ DATA-SLOTS level))
-  (define new-item (make-vector new-size #f))
-  (vector-copy! new-item 0 item 0 (min (vector-length item) new-size))
-  new-item)
-
-;; search : Item Nat Key Cmp Cmp -> Item/#f
-;; Returns item(R) s.t. key(R) =? key
-(define (search head level key =? <?)
-  (let* ([closest (closest head level key <?)]
-         [item (item-next closest 1)])
-    (and (item? item)
-         (=? key (item-key item))
-         item)))
-
-;; closest : Item Nat Key Cmp Cmp -> Item
-;; Returns greatest item R s.t. key(R) <? key.
-;; Pre: level(item) >= level, key(item) <? key OR item = head
-(define (closest item level key <?)
-  (if (zero? level)
-      item
-      (closest (advance item level key <?) (sub1 level) key <?)))
-
-;; advance : Item Nat Key Cmp -> Item
-;; Returns greatest item R s.t. key(R) <? key and level(R) >= level.
-;; Pre: level(item) >= level, key(item) <? key OR item = head
-(define (advance item level key <?)
-  (let ([next (item-next item level)])
-    (if (and next (<? (item-key next) key))
-        (advance next level key <?)
-        item)))
-
-;; pick-random-level : Nat -> Nat
-;; Returns number in [1, max] (with exp. prob. dist.)
-(define (pick-random-level max)
-  (let loop ([level 1])
-    (if (and (< level max) (zero? (random PROBABILITY-FACTOR)))
-        (loop (add1 level))
-        level)))
-
-;; update/insert : ... -> Item/#f
-;; Updates skip-list so that key |-> data
-;; Returns #f to indicate update (existing item changed);
-;; returns item to indicate insertion (context's links need updating)
-;; Pre: level(item) >= level, key(item) <? key OR item = head
-(define (update/insert item level key data =? <? max-level)
-  (cond [(positive? level)
-         (let* ([item (advance item level key <?)]
-                [result (update/insert item (sub1 level)
-                                       key data =? <? max-level)])
-           (when (and result (>= (item-level result) level))
-             (let ([link (item-next item level)])
-               (set-item-next! item level result)
-               (set-item-next! result level link)))
-           result)]
-        [else
-         (let ([next (item-next item 1)])
-           (cond [(and next (=? (item-key next) key))
-                  ;; Update!
-                  (set-item-data! next data)
-                  #f]
-                 [else
-                  ;; Insert!
-                  (let ([new-item
-                         (make-vector (+ DATA-SLOTS (pick-random-level max-level)) #f)])
-                    (set-item-key! new-item key)
-                    (set-item-data! new-item data)
-                    new-item)]))]))
-
-;; delete : ... -> Item/#f
-;; Returns item to indicate deletion (context's links need updating);
-;; returns #f if not found.
-;; Pre: level(item) >= level; key(item) <? key OR item = head
-(define (delete item level key =? <?)
-  (cond [(positive? level)
-         (let* ([item (advance item level key <?)]
-                [result (delete item (sub1 level) key =? <?)])
-           (when (and result (eq? (item-next item level) result))
-             (let ([link (item-next result level)])
-               (set-item-next! item level link)
-               (set-item-next! result level #f)))
-           result)]
-        [else
-         (let ([next (item-next item 1)])
-           (cond [(and next (=? (item-key next) key))
-                  ;; Delete!
-                  next]
-                 [else
-                  ;; Not found!
-                  #f]))]))
-
-;; delete-range : ... -> void
-;; Pre: level(*-item) >= level; key(*-item) <? *-key OR *-item = head
-(define (delete-range f-item t-item level f-key t-key <? contract!?)
-  (cond [(positive? level)
-         (let* ([f-item (advance f-item level f-key <?)]
-                [t-item (advance t-item level t-key <?)]
-                ;; t-item greatest s.t. key(t-item) <? t-key (at level)
-                [t-item* (item-next t-item level)]) ;; key(t-item*) >=? t-key
-           (set-item-next! f-item level t-item*)
-           (delete-range f-item t-item (sub1 level) f-key t-key <? contract!?))]
-        [else
-         ;; f-item is greatest s.t. key(item) <? f-key
-         ;; so f-item is greatest s.t. key(item) <? t-key,
-         ;; because deleted [f-key, t-key)
-         (when contract!?
-           (let ([delta (- t-key f-key)])
-             (let loop ([item (item-next f-item 1)])
-               (when item
-                 ;; key(item) >=? t-key
-                 (set-item-key! item (- (item-key item) delta))
-                 (loop (item-next item 1))))))]))
-
-;; expand! : ... -> void
-(define (expand! item level from to <?)
-  (let ([delta (- to from)]
-        [item (closest item level from <?)])
-    ;; item greatest s.t. key(item) <? from
-    (let loop ([item (item-next item 1)])
-      (when item
-        ;; key(item) >=? from
-        (set-item-key! item (+ (item-key item) delta))
-        (loop (item-next item 1))))))
-
-
-;; Skip list
-
-(define (skip-list-ref s key [default (skip-list-error key)])
-  (define head (skip-list-head s))
-  (define result
-    (search head (item-level head) key (skip-list-=? s) (skip-list-<? s)))
-  (cond [result (item-data result)]
-        [(procedure? default) (default)]
-        [else default]))
-
-(define ((skip-list-error x))
-  (error 'skip-list-ref "no mapping found for: ~e" x))
-
-(define (skip-list-set! s key data)
-  (define head (skip-list-head s))
-  (define =? (skip-list-=? s))
-  (define <? (skip-list-<? s))
-  (define max-level (max MAX-LEVEL (add1 (item-level head))))
-  (define result ;; new Item or #f
-    (update/insert head (item-level head) key data =? <? max-level))
-  (when result
-    (when (skip-list-num-entries s)
-      (set-skip-list-num-entries! s (add1 (skip-list-count s))))
-    (when (> (item-level result) (item-level head))
-      (let ([new-head (resize-item head (item-level result))])
-        (set-item-next! new-head (item-level result) result)
-        (set-skip-list-head! s new-head)))))
-
-(define (skip-list-remove! s key)
-  (define head (skip-list-head s))
-  (define =? (skip-list-=? s))
-  (define <? (skip-list-<? s))
-  (define deleted
-    (delete head (item-level head) key =? <?))
-  (when (and deleted (skip-list-num-entries s))
-    (set-skip-list-num-entries! s (sub1 (skip-list-count s))))
-  (unless (or (item? (item-next head (item-level head)))
-              (= 1 (item-level head)))
-    ;; Trim head
-    (let ([new-head (resize-item head (sub1 (item-level head)))])
-      (set-skip-list-head! s new-head))))
-
-(define (skip-list-remove-range! s from to)
-  (match s
-    [(skip-list head count =? <?)
-     (delete-range head head (item-level head) from to <? #f)
-     (set-skip-list-num-entries! s #f)]))
-
-(define (skip-list-contract! s from to)
-  (match s
-    [(adjustable-skip-list head count =? <?)
-     (delete-range head head (item-level head) from to <? #t)
-     (set-skip-list-num-entries! s #f)]))
-
-(define (skip-list-expand! s from to)
-  (match s
-    [(adjustable-skip-list head count =? <?)
-     (expand! head (item-level head) from to <?)]))
-
-;; Dict methods
-
-(define (skip-list-count s)
-  (let ([n (skip-list-num-entries s)])
-    (or n
-        (let loop ([n 0] [item (item-next (skip-list-head s) 1)])
-          (cond [item (loop (add1 n) (item-next item 1))]
-                [else
-                 (set-skip-list-num-entries! s n)
-                 n])))))
-
-(struct skip-list-iter (s item))
-
-(define (check-iter who s iter)
-  (unless (skip-list-iter? iter)
-    (raise-type-error who "skip-list-iter" iter))
-  (unless (eq? (skip-list-iter-s iter) s)
-    (raise-mismatch-error who "skip-list-iter does not match skip-list" iter)))
-
-(define (skip-list-iterate-first s)
-  (let ([next (item-next (skip-list-head s) 1)])
-    (and next (skip-list-iter s next))))
-
-(define (skip-list-iterate-next s iter)
-  (check-iter 'skip-list-iterate-next s iter)
-  (let ([next (item-next (skip-list-iter-item iter) 1)])
-    (and next (skip-list-iter s next))))
-
-(define (skip-list-iterate-key s iter)
-  (check-iter 'skip-list-iterate-key s iter)
-  (item-key (skip-list-iter-item iter)))
-
-(define (skip-list-iterate-value s iter)
-  (check-iter 'skip-list-iterate-key s iter)
-  (item-data (skip-list-iter-item iter)))
-
-;; Extensions
-
-;; Returns greatest/rightmost item s.t. key(item) < key
-(define (skip-list-iterate-greatest/<? s key)
-  (let* ([head (skip-list-head s)]
-         [<? (skip-list-<? s)]
-         [item (closest head (item-level head) key <?)])
-    (and (not (eq? item head)) (skip-list-iter s item))))
-
-;; Returns greatest/rightmost item s.t. key(item) <= key
-(define (skip-list-iterate-greatest/<=? s key)
-  (let* ([head (skip-list-head s)]
-         [<? (skip-list-<? s)]
-         [=? (skip-list-=? s)]
-         [item< (closest head (item-level head) key <?)]
-         [item1 (item-next item< 1)])
-    (cond [(and item1 (=? (item-key item1) key))
-           (skip-list-iter s item1)]
-          [(eq? item< head)
-           #f]
-          [else
-           (skip-list-iter s item<)])))
-
-;; Returns least/leftmost item s.t. key(item) > key
-(define (skip-list-iterate-least/>? s key)
-  (let* ([head (skip-list-head s)]
-         [<? (skip-list-<? s)]
-         [item< (closest head (item-level head) key <?)]
-         ;; If head, nudge forward one so comparisons are valid.
-         [item< (if (eq? item< head) (item-next item< 1) item<)])
-    (let loop ([item item<])
-      (and item
-           (if (<? key (item-key item))
-               (skip-list-iter s item)
-               (loop (item-next item 1)))))))
-
-;; Returns least/leftmost item s.t. key(item) >= key
-(define (skip-list-iterate-least/>=? s key)
-  (let* ([head (skip-list-head s)]
-         [<? (skip-list-<? s)]
-         [item (closest head (item-level head) key <?)]
-         [item (item-next item 1)])
-    (and item (skip-list-iter s item))))
-
-(define (skip-list-iterate-least s)
-  (let* ([head (skip-list-head s)]
-         [item (item-next head 1)])
-    (and item (skip-list-iter s item))))
-
-(define (skip-list-iterate-greatest s)
-  (let* ([head (skip-list-head s)]
-         [item (closest head (item-level head)
-                        ;; replace standard comparison with "always <",
-                        ;; so closest yields max item
-                        'unused
-                        (lambda (x y) #t))])
-    (and item (skip-list-iter s item))))
-
-(define (skip-list->list s)
-  (let loop ([item (item-next (skip-list-head s) 1)])
-    (if item
-        (cons (cons (item-key item) (item-data item))
-              (loop (item-next item 1)))
-        null)))
-
-;; ============================================================
-
-(define dict-methods
-  (vector-immutable skip-list-ref
-                    skip-list-set!
-                    #f ;; set
-                    skip-list-remove!
-                    #f ;; remove
-                    skip-list-count
-                    skip-list-iterate-first
-                    skip-list-iterate-next
-                    skip-list-iterate-key
-                    skip-list-iterate-value))
-
-(struct skip-list ([head #:mutable] [num-entries #:mutable] =? <?)
-        #:property prop:dict/contract
-        (list dict-methods
-              (vector-immutable any/c any/c skip-list-iter?
-                                #f #f #f))
-        #:methods gen:ordered-dict
-        [(define dict-iterate-least skip-list-iterate-least)
-         (define dict-iterate-greatest skip-list-iterate-greatest)
-         (define dict-iterate-least/>? skip-list-iterate-least/>?)
-         (define dict-iterate-least/>=? skip-list-iterate-least/>=?)
-         (define dict-iterate-greatest/<? skip-list-iterate-greatest/<?)
-         (define dict-iterate-greatest/<=? skip-list-iterate-greatest/<=?)])
-
-(struct skip-list* skip-list (key-c value-c)
-        #:property prop:dict/contract
-        (list dict-methods
-              (vector-immutable any/c any/c skip-list-iter?
-                                (lambda (s) (skip-list*-key-c s))
-                                (lambda (s) (skip-list*-value-c s))
-                                #f))
-        #:methods gen:ordered-dict
-        [(define dict-iterate-least skip-list-iterate-least)
-         (define dict-iterate-greatest skip-list-iterate-greatest)
-         (define dict-iterate-least/>? skip-list-iterate-least/>?)
-         (define dict-iterate-least/>=? skip-list-iterate-least/>=?)
-         (define dict-iterate-greatest/<? skip-list-iterate-greatest/<?)
-         (define dict-iterate-greatest/<=? skip-list-iterate-greatest/<=?)])
-
-(struct adjustable-skip-list skip-list ()
-        #:property prop:dict/contract
-        (list dict-methods
-              (vector-immutable exact-integer? any/c skip-list-iter?
-                                #f #f #f)))
-
-(struct adjustable-skip-list* adjustable-skip-list (key-c value-c)
-        #:property prop:dict/contract
-        (list dict-methods
-              (vector-immutable exact-integer? any/c skip-list-iter?
-                                (lambda (s) (adjustable-skip-list*-key-c s))
-                                (lambda (s) (adjustable-skip-list*-value-c s))
-                                #f))
-        #:methods gen:ordered-dict
-        [(define dict-iterate-least skip-list-iterate-least)
-         (define dict-iterate-greatest skip-list-iterate-greatest)
-         (define dict-iterate-least/>? skip-list-iterate-least/>?)
-         (define dict-iterate-least/>=? skip-list-iterate-least/>=?)
-         (define dict-iterate-greatest/<? skip-list-iterate-greatest/<?)
-         (define dict-iterate-greatest/<=? skip-list-iterate-greatest/<=?)])
-
-(define (make-skip-list [ord datum-order]
-                        #:key-contract [key-contract any/c]
-                        #:value-contract [value-contract any/c])
-  (let ([key-contract (and/c* (order-domain-contract ord) key-contract)]
-        [=? (order-=? ord)]
-        [<? (order-<? ord)])
-    (cond [(and (eq? key-contract any/c) (eq? value-contract any/c))
-           (skip-list (vector 'head 'head #f) 0 =? <?)]
-          [else
-           (skip-list* (vector 'head 'head #f) 0 =? <?
-                       key-contract value-contract)])))
-
-(define (make-adjustable-skip-list #:key-contract [key-contract any/c]
-                                   #:value-contract [value-contract any/c])
-  (cond [(and (eq? key-contract any/c) (eq? value-contract any/c))
-         (adjustable-skip-list (vector 'head 'head #f) 0 = <)]
-        [else
-         (adjustable-skip-list* (vector 'head 'head #f) 0 = <
-                                key-contract value-contract)]))
-
-
-(define (key-c s)
-  (cond [(skip-list*? s) (skip-list*-key-c s)]
-        [(adjustable-skip-list*? s)
-         (and/c* exact-integer? (adjustable-skip-list*-key-c s))]
-        [else any/c]))
-(define (val-c s)
-  (cond [(skip-list*? s) (skip-list*-value-c s)]
-        [(adjustable-skip-list*? s) (adjustable-skip-list*-value-c s)]
-        [else any/c]))
-
-(define (and/c* x y)
-  (cond [(eq? x any/c) y]
-        [(eq? y any/c) x]
-        [else (and/c x y)]))
-
-;; ============================================================
-
-(provide/contract
- [make-skip-list
-  (->* ()
-       (order? #:key-contract contract? #:value-contract contract?)
-       skip-list?)]
- [make-adjustable-skip-list
-  (->* ()
-       (#:key-contract contract? #:value-contract contract?)
-       adjustable-skip-list?)]
- [skip-list?
-  (-> any/c boolean?)]
- [adjustable-skip-list?
-  (-> any/c boolean?)]
-
- [skip-list-ref
-  (->i ([s skip-list?] [k (s) (key-c s)])
-       ([d any/c])
-       any)]
- [skip-list-set!
-  (->i ([s skip-list?] [k (s) (key-c s)] [v (s) (val-c s)]) [_r void?])]
- [skip-list-remove!
-  (->i ([s skip-list?] [k (s) (key-c s)]) [_r void?])]
- [skip-list-count
-  (-> skip-list? exact-nonnegative-integer?)]
-
- [skip-list-remove-range!
-  (->i ([s skip-list?] [from (s) (key-c s)] [to (s) (key-c s)])
-       [_r void?])]
- [skip-list-contract! 
-  (->i ([s adjustable-skip-list?] [from (s) (key-c s)] [to (s) (key-c s)])
-       [_r void?])]
- [skip-list-expand!
-  (->i ([s adjustable-skip-list?] [from (s) (key-c s)] [to (s) (key-c s)])
-       [_r void?])]
-
- [skip-list-iterate-first
-  (-> skip-list? (or/c skip-list-iter? #f))]
- [skip-list-iterate-next
-  (-> skip-list? skip-list-iter? (or/c skip-list-iter? #f))]
- [skip-list-iterate-key
-  (->i ([s skip-list?] [i skip-list-iter?]) [_r (s) (key-c s)])]
- [skip-list-iterate-value
-  (->i ([s skip-list?] [i skip-list-iter?]) [_r (s) (val-c s)])]
-
- [skip-list-iterate-greatest/<=?
-  (->i ([s skip-list?] [k (s) (key-c s)]) [_r (or/c skip-list-iter? #f)])]
- [skip-list-iterate-greatest/<?
-  (->i ([s skip-list?] [k (s) (key-c s)]) [_r (or/c skip-list-iter? #f)])]
- [skip-list-iterate-least/>=?
-  (->i ([s skip-list?] [k (s) (key-c s)]) [_r (or/c skip-list-iter? #f)])]
- [skip-list-iterate-least/>?
-  (->i ([s skip-list?] [k (s) (key-c s)]) [_r (or/c skip-list-iter? #f)])]
-
- [skip-list-iterate-least
-  (-> skip-list? (or/c skip-list-iter? #f))]
- [skip-list-iterate-greatest
-  (-> skip-list? (or/c skip-list-iter? #f))]
-
- [skip-list-iter?
-  (-> any/c any)]
-
- [skip-list->list
-  (-> skip-list? list?)])
diff --git a/pkgs/data-pkgs/data-lib/data/splay-tree.rkt b/pkgs/data-pkgs/data-lib/data/splay-tree.rkt
deleted file mode 100644
index 5d9df6e3b2..0000000000
--- a/pkgs/data-pkgs/data-lib/data/splay-tree.rkt
+++ /dev/null
@@ -1,1158 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     racket/syntax)
-         racket/match
-         racket/dict
-         racket/contract/base
-	 racket/generic
-         "order.rkt")
-
-#|
-This library contains two implementations of splay trees.
-
-node-splay-tree:
-  - nodes are separate structures
-  - bottom-up splay (no allocation)
-  - fast expand!/contract!/remove-range! via parent-relative keys
-  - specialized to integer keys
-
-compact-splay-tree:
-  - nodes packed in vector
-  - top-down splay (constant preallocated scratch node)
-  - 2-3x faster than *unspecialized* node-based splay-tree
-    - from vector packing, not from top-down splay
-
-If anyone wants to adapt the top-down splay algorithm to work with
-parent-relative keys, we can get rid of node-splay-tree entirely.
-|#
-
-
-
-;; ============================================================
-;; Common
-;; ============================================================
-
-(define not-given (gensym 'not-given))
-
-(struct splay-tree-iter (key))
-
-(define-syntax-rule (mkcmp <? =?)
-  (lambda (x y) (cond [(=? x y) '=] [(<? x y) '<] [else '>])))
-
-(define intcmp (mkcmp < =))
-
-
-;; ============================================================
-;; Node splay tree
-;; ============================================================
-
-(struct node (key value left right) #:mutable #:transparent)
-
-#|
-Bottom-up, zero-allocation splay
-
-The following notes sketch the derivation from the naive bottom-up
-splay algorithm.
-
-====
-
-SplayPath = null | (cons (Side,Node) SplayPath)
-In a SplayPath [...,(s1,n1),(s2,n2),...], then n1 = n2.s2.
-
-find : ... -> (Node, SplayPath)
-If find returns (s,x,[(s1,n1),...]), then x = n1.s1.
-
-splay : (Node, SplayPath) -> Node
-splayloop : (Node, SplayPath) -> (Node, SplayPath)
-
-====
-
-We always splay after find, so let's have find immediately call
-isplay (incremental splay) with just the new part of the splay
-path. But we can only splay when we have *two* splay path segments to
-work with.
-
-SplayPathBuf = Maybe (Side, Node)
-
-find' : ... -> (Node, SplayPathBuf)
-find' ... = ... isplay (find' ..., localSide, localNode) ...
-
-isplay : ((Node, SplayPathBuf), Side, Node) -> (Node, SplayPathBuf)
-
-And at the top there needs to be a finish function to handle
-zigs (odd-length SplayPaths => non-None final SplayPathBufs).
-
-finish : (Node, SplayPathBuf) -> Node
-
-====
-
-Actually, find returns Maybe Node. But we still want to splay the path
-and produce a new root, even if find failed. So if find'' initially
-returns None, isplay' takes the last node seen, sets that as the new
-root, and continues splaying. We introduce a status result that
-indicates whether the new root was actually the node sought (we also
-distinguish found vs added.)
-
-Status = Found | Added | Failed
-
-find'' : ... -> (Status, Maybe Node, SplayPathBuf)
-isplay : ((Status, Maybe Node, SplayPathBuf), Side, Node) -> (Status, Node, SplayPathBuf)
-
-finish' : (Status, Maybe Node, SplayPathBuf) -> (Status, Maybe Node)
-
-Note that isplay always returns a Node, never None (I'm taking some
-type liberties here). Of course, if the initial tree is empty, isplay
-is not called.
-
-====
-
-To avoid allocation, we flatten the types above and use multiple value
-return.
-
-<SPB> = Node/#f Node/#f
-SP = (values Status Node/#f <SPB>)
-   = (values Status Node/#f Side/#f Node/#f)
-Status = 'found | 'added | #f
-Side = 'left | 'right
-
-In (values status nroot pside pnode):
-  nroot is the new root (or #f)
-  if pside and pnode are both non-#f,
-    pnode is next node in splay path, overrides nroot as new root IF nroot = #f
-  if pside and pnode are both #f,
-    no pending rotation; add it and keep going...
-
-|#
-
-(define-syntax-rule (SPfinish expr)
-  (let-values ([(ok? x p-side p) expr])
-    (finish ok? x p-side p)))
-
-(define-syntax-rule (SPisplay x-expr gp-side gp)
-  (let-values ([(ok? x p-side p) x-expr])
-    (isplay! ok? x p-side p gp-side gp)))
-
-(define (SPunit x) (values 'found x #f #f))
-(define (SPunit/add x) (values 'added x #f #f))
-(define (SPfail) (values #f #f #f #f))
-
-;; --------
-
-;; find : ... -> (values status node/#f)
-;; If ok?, then node returned is one sought.
-(define (n:find k x add-v)
-  (SPfinish (findb k x #f #f add-v)))
-
-;; findb : ... -> SP
-(define (findb k x p-side p add-v)
-  (cond [x
-         (let ([k* (- k (node-key x))])
-           (cond [(= k (node-key x))
-                  (SPunit x)]
-                 [(< k (node-key x))
-                  (SPisplay (findb k* (node-left x)  'left  x add-v) 'left x)]
-                 [else
-                  (SPisplay (findb k* (node-right x) 'right x add-v) 'right x)]))]
-        [add-v
-         (let ([new-node (node k (car add-v) #f #f)])
-           ;; FIXME: link unnecessary? will be done in isplay/finish?
-           (when p (set-node-side! p p-side new-node))
-           (SPunit/add new-node))]
-        [else (SPfail)]))
-
-(define (n:find-min x)
-  (define (find-min-loop x)
-    (cond [(and x (node-left x))
-           (SPisplay (find-min-loop (node-left x)) 'left x)]
-          [x (SPunit x)]
-          [else (SPfail)]))
-  (SPfinish (find-min-loop x)))
-
-(define (n:find-max x)
-  (define (find-max-loop x)
-    (cond [(and x (node-right x))
-           (SPisplay (find-max-loop (node-right x)) 'right x)]
-          [x (SPunit x)]
-          [else (SPfail)]))
-  (SPfinish (find-max-loop x)))
-
-;; isplay! : ... -> SP
-;; incremental splay
-(define (isplay! ok? x p-side p gp-side gp)
-  (cond [(eq? x #f)
-         ;; Then p-side = #f, p = #f
-         ;; Overwrite new root with gp
-         (values ok? gp #f #f)]
-        [p-side ;; we have two splay path segments; splay
-         (set-node-side! p p-side x)
-         (cond [(eq? p-side gp-side)
-                ;; zig-zig
-                (rotate! p p-side)
-                (set-node-side! gp gp-side x)
-                (rotate! gp gp-side)
-                (values ok? x #f #f)]
-               [else
-                ;; zig-zag
-                (rotate! p p-side)
-                (set-node-side! gp gp-side x)
-                (rotate! gp gp-side)
-                (values ok? x #f #f)])]
-        [else
-         (values ok? x gp-side gp)]))
-
-(define (finish ok? x p-side p)
-  (cond [(eq? x #f)
-         ;; Then p-side = #f, p = #f
-         (values ok? #f)]
-        [p-side ;; one splay path segment left; perform zig
-         (set-node-side! p p-side x)
-         (rotate! p p-side)
-         (values ok? x)]
-        [else ;; no splay path segments left
-         (values ok? x)]))
-
-(define (set-node-side! n side v)
-  (case side
-    ((left) (set-node-left! n v))
-    ((right) (set-node-right! n v))))
-
-(define (rotate! x side)
-  (case side
-    ((left) (right! x))
-    ((right) (left! x))
-    ((#f) (void))))
-
-(define (right! p)
-  (match p
-    [(node Kp _ (and x (node Kx _ A B)) C)
-     (set-node-left! p B)
-     (set-node-right! x p)
-     (set-node-key! p (- 0 Kx))
-     (set-node-key! x (+ Kp Kx))
-     (when B
-       (set-node-key! B (+ (node-key B) Kx)))]))
-
-(define (left! p)
-  (match p
-    [(node Kp _ A (and x (node Kx _ B C)))
-     (set-node-right! p B)
-     (set-node-left! x p)
-     (set-node-key! p (- 0 Kx))
-     (set-node-key! x (+ Kp Kx))
-     (when B
-       (set-node-key! B (+ (node-key B) Kx)))]))
-
-;; --------
-
-;; if left is node, new root is max(left)
-(define (n:join-left left right)
-  (cond [(and left right)
-         (let-values ([(_ok? left*) (n:find-max left)])
-           ;; left* is node, left*.right = #f
-           (set-node-right! left* right)
-           (set-node-key! right (- (node-key right) (node-key left*)))
-           left*)]
-        [left left]
-        [else right]))
-
-;; if right is node, new root is min(right)
-(define (n:join-right left right)
-  (cond [(and left right)
-         (let-values ([(_ok? right*) (n:find-min right)])
-           ;; right* is node, right*.left = #f
-           (set-node-left! right* left)
-           (set-node-key! left (- (node-key left) (node-key right*)))
-           right*)]
-        [right right]
-        [else left]))
-
-(define (n:split/drop-root root)
-  (let ([left (node-left root)]
-        [right (node-right root)])
-    (when left
-      (set-node-key! left (+ (node-key left) (node-key root))))
-    (when right
-      (set-node-key! right (+ (node-key right) (node-key root))))
-    (values left right)))
-
-(define (n:split/root-to-left root)
-  (let ([right (node-right root)])
-    (when right
-      (set-node-key! right (+ (node-key right) (node-key root))))
-    (set-node-right! root #f)
-    (values root right)))
-
-(define (n:split/root-to-right root)
-  (let ([left (node-left root)])
-    (when left
-      (set-node-key! left (+ (node-key left) (node-key root))))
-    (set-node-left! root #f)
-    (values left root)))
-
-(define (n:delete-root root)
-  (let-values ([(left right) (n:split/drop-root root)])
-    (n:join-left left right)))
-
-(define (n:remove-range! root from to contract!?)
-  (let*-values ([(ok? from-node) (n:find from root (list #f))]
-                [(left-tree right-tree)
-                 (if (eq? ok? 'added)
-                     (n:split/drop-root from-node)
-                     (n:split/root-to-right from-node))]
-                [(ok? to-node) (n:find to right-tree (list #f))]
-                [(mid-tree right-tree)
-                 (if (eq? ok? 'added)
-                     (n:split/drop-root to-node)
-                     (n:split/root-to-right to-node))])
-    (when contract!?
-      (when right-tree
-        (set-node-key! right-tree (+ (node-key right-tree) (- from to)))))
-    (n:join-left left-tree right-tree)))
-
-(define (n:expand! root from to)
-  (let*-values ([(ok? from-node) (n:find from root (list #f))]
-                [(left-tree right-tree)
-                 (if (eq? ok? 'added)
-                     (n:split/drop-root from-node)
-                     (n:split/root-to-right from-node))])
-    (when right-tree
-      (set-node-key! right-tree (+ (node-key right-tree) (- to from))))
-    (n:join-left left-tree right-tree)))
-
-(define (n:find-prev root)
-  ;; PRE: root is node and root.left is node; ie, has-prev?
-  (let-values ([(left right) (n:split/root-to-right root)])
-    ;; join-left does max(left)
-    (n:join-left left right)))
-
-(define (n:find-next root)
-  ;; PRE: root is node and root.right is node; ie, has-next?
-  (let-values ([(left right) (n:split/root-to-left root)])
-    ;; join-right does min(right)
-    (n:join-right left right)))
-
-(define (n:has-prev? x) (and x (node-left x) #t))
-(define (n:has-next? x) (and x (node-right x) #t))
-
-;; ------------------------------------------------------------
-;; Splay tree operations
-;; ------------------------------------------------------------
-
-(define (n:splay-tree-ref s x [default not-given])
-  (match s
-    [(node-splay-tree root size)
-     (let-values ([(ok? root) (n:find x root #f)])
-       (set-node-splay-tree-root! s root)
-       (if ok?
-           (node-value root)
-           (cond [(eq? default not-given)
-                  (error 'splay-tree-ref "no value found for key: ~e" x)]
-                 [(procedure? default)
-                  (default)]
-                 [else default])))]))
-
-(define (n:splay-tree-set! s x v)
-  (match s
-    [(node-splay-tree root size)
-     (let-values ([(ok? root) (n:find x root (list v))])
-       (set-node-splay-tree-root! s root)
-       (when (and (eq? ok? 'added) size)
-         (set-node-splay-tree-size! s (add1 size)))
-       (unless (eq? (node-value root) v)
-         (set-node-value! root v)))]))
-
-(define (n:splay-tree-remove! s x)
-  (match s
-    [(node-splay-tree root size)
-     (let-values ([(ok? root) (n:find x root #f)])
-       (cond [ok? ;; => root is node to remove
-              (set-node-splay-tree-root! s (n:delete-root root))
-              (when size (set-node-splay-tree-size! s (sub1 size)))]
-             [else
-              (set-node-splay-tree-root! s root)]))]))
-
-(define (n:splay-tree-count s)
-  (let ([size (node-splay-tree-size s)])
-    (if size
-        size
-        (let ([size (let loop ([x (node-splay-tree-root s)] [n 0])
-                      (if x
-                          (loop (node-left x) (loop (node-right x) (add1 n)))
-                          n))])
-          (set-node-splay-tree-size! s size)
-          size))))
-
-(define (n:splay-tree-remove-range! s from to)
-  (match s
-    [(node-splay-tree root size)
-     (when (< from to)
-       (set-node-splay-tree-root! s (n:remove-range! root from to #f))
-       (set-node-splay-tree-size! s #f))]))
-
-(define (splay-tree-contract! s from to)
-  (match s
-    [(node-splay-tree root size)
-     (unless (< from to)
-       (error 'splay-tree-contract!
-              "bad range: ~s to ~s" from to))
-     (set-node-splay-tree-root! s (n:remove-range! root from to #t))
-     (set-node-splay-tree-size! s #f)]))
-
-(define (splay-tree-expand! s from to)
-  (match s
-    [(node-splay-tree root size)
-     (unless (< from to)
-       (error 'splay-tree-expand!
-              "bad range: ~s to ~s" from to))
-     (set-node-splay-tree-root! s (n:expand! root from to))]))
-
-;; ========
-
-#|
-Iteration in splay-trees is problematic.
- - any access to the splay-tree disturbs most notions of "position"
-   (other dictionaries, eg hashes, are only disturbed by *updates*)
- - parent-relative keys need parent chain to be interpreted
-
-Options
- 1) position = parent chain (very likely to get out of sync)
- 2) position = key (re-lookup each time)
- 3) snapshot as alist (more allocation than necessary, sometimes much more)
- 4) position = node (doesn't work with position-relative keys)
-
-(1,4) are no good. (3) is not very iterator-like.
-
-(2) seems to be the best compromise.
-|#
-
-(define (n:splay-tree-iterate-first s)
-  (match s
-    [(node-splay-tree root size)
-     (let-values ([(ok? root) (n:find-min root)])
-       (set-node-splay-tree-root! s root)
-       (if ok? (splay-tree-iter (node-key root)) #f))]))
-
-(define (n:splay-tree-iterate-next s pos)
-  (match pos
-    [(splay-tree-iter key)
-     (n:splay-tree-iterate-least/>? s key)]))
-
-(define (n:splay-tree-iterate-key s pos)
-  (match pos
-    [(splay-tree-iter key) key]))
-
-(define (n:splay-tree-iterate-value s pos)
-  (match pos
-    [(splay-tree-iter key) (n:splay-tree-ref s key #f)]))
-
-;; Order-based search
-
-(define (n:extreme s key cmp-result has-X? find-X)
-  (match s
-    [(node-splay-tree root size)
-     (let-values ([(ok? root)
-                   (n:extreme* root key cmp-result has-X? find-X)])
-       (set-node-splay-tree-root! s root)
-       (and ok? (splay-tree-iter (node-key root))))]))
-
-(define (n:extreme* root key cmp-result has-X? find-X)
-  (let-values ([(_ok? root) (n:find key root #f)])
-    ;; ok? is true if returned root satisfies search criteria
-    (cond [(and root (memq (intcmp (node-key root) key) cmp-result))
-           (values #t root)]
-          [(has-X? root)
-           (values #t (find-X root))]
-          [else
-           (values #f root)])))
-
-(define (n:splay-tree-iterate-greatest/<=? s key)
-  (n:extreme s key '(< =) n:has-prev? n:find-prev))
-(define (n:splay-tree-iterate-greatest/<? s key)
-  (n:extreme s key '(<) n:has-prev? n:find-prev))
-(define (n:splay-tree-iterate-least/>=? s key)
-  (n:extreme s key '(> =) n:has-next? n:find-next))
-(define (n:splay-tree-iterate-least/>? s key)
-  (n:extreme s key '(>) n:has-next? n:find-next))
-
-(define (n:splay-tree-iterate-least s)
-  (n:splay-tree-iterate-first s))
-(define (n:splay-tree-iterate-greatest s)
-  (match s
-    [(node-splay-tree root size)
-     (let-values ([(ok? root) (n:find-max root)])
-       (set-node-splay-tree-root! s root)
-       (if ok? (splay-tree-iter (node-key root)) #f))]))
-
-;; ========
-
-;; snapshot
-(define (n:splay-tree->list s)
-  (match s
-    [(node-splay-tree root size)
-     (let loop ([x root] [onto null] [k* 0])
-       (match x
-         [(node key value left right)
-          (let ([key (+ key k*)])
-            (loop left
-                  (cons (cons key value)
-                        (loop right onto key))
-                  key))]
-         [#f onto]))]))
-
-;; ------------------------------------------------------------
-;; Struct
-;; ------------------------------------------------------------
-
-(define n:dict-methods
-  (vector-immutable n:splay-tree-ref
-                    n:splay-tree-set!
-                    #f ;; set
-                    n:splay-tree-remove!
-                    #f ;; remove
-                    n:splay-tree-count
-                    n:splay-tree-iterate-first
-                    n:splay-tree-iterate-next
-                    n:splay-tree-iterate-key
-                    n:splay-tree-iterate-value))
-
-(struct node-splay-tree ([root #:mutable] [size #:mutable])
-        #:property prop:dict/contract
-        (list n:dict-methods
-              (vector-immutable exact-integer?
-                                any/c
-                                splay-tree-iter?
-                                #f #f #f))
-        #:methods gen:ordered-dict
-	[(define dict-iterate-least n:splay-tree-iterate-least)
-	 (define dict-iterate-greatest n:splay-tree-iterate-greatest)
-	 (define dict-iterate-least/>? n:splay-tree-iterate-least/>?)
-	 (define dict-iterate-least/>=? n:splay-tree-iterate-least/>=?)
-	 (define dict-iterate-greatest/<? n:splay-tree-iterate-greatest/<?)
-	 (define dict-iterate-greatest/<=? n:splay-tree-iterate-greatest/<=?)])
-
-(struct node-splay-tree* node-splay-tree (key-c value-c)
-        #:property prop:dict/contract
-        (list n:dict-methods
-              (vector-immutable any/c
-                                any/c
-                                splay-tree-iter?
-                                (lambda (s) (node-splay-tree*-key-c s))
-                                (lambda (s) (node-splay-tree*-value-c s))
-                                #f))
-        #:methods gen:ordered-dict
-        [(define dict-iterate-least n:splay-tree-iterate-least)
-	 (define dict-iterate-greatest n:splay-tree-iterate-greatest)
-	 (define dict-iterate-least/>? n:splay-tree-iterate-least/>?)
-	 (define dict-iterate-least/>=? n:splay-tree-iterate-least/>=?)
-	 (define dict-iterate-greatest/<? n:splay-tree-iterate-greatest/<?)
-	 (define dict-iterate-greatest/<=? n:splay-tree-iterate-greatest/<=?)])
-
-
-
-;; ============================================================
-;; Compact splay tree
-;; ============================================================
-
-;; Mem = vector: [key, value, left, right] ...
-;; Node = nat, multiple of NODE-SIZE
-
-;; First "node" of Mem is always Scratch
-;; (node-key Scratch) = size = next *fresh* node
-;; (node-value Scratch) = #f or free-list head (Node)
-
-;; If N in free-list:
-;;   (node-key N) = number of nodes in free-list here on (self included)
-;;   (node-value N) = #f or next node in free-list
-
-(define NODE-SIZE 4)
-
-;; min number of vector slots
-;; (ie, (MIN-SIZE / NODE-SIZE) - 1 is min number of data nodes
-(define MIN-SIZE 16)
-
-(define-syntax-rule (dvf [ref set offset] ...)
-  (begin (define (ref mem node)
-           (vector-ref mem (+ node offset))) ...
-         (define (set mem node v)
-           (vector-set! mem (+ node offset) v)) ...))
-(dvf [vnode-key set-vnode-key! 0]
-     [vnode-value set-vnode-value! 1]
-     [vnode-left set-vnode-left! 2]
-     [vnode-right set-vnode-right! 3])
-
-(define scratch 0)
-(define (v:next mem)
-  (vnode-key mem scratch))
-(define (v:set-next! mem v)
-  (set-vnode-key! mem scratch v))
-
-(define (v:free-list mem)
-  (vnode-value mem scratch))
-
-(define (v:push-free! mem n)
-  (let ([head (v:free-list mem)])
-    (set-vnode-value! mem n head)
-    (set-vnode-key! mem n
-                    (if head
-                        (add1 (vnode-key mem head))
-                        1)))
-  (set-vnode-value! mem scratch n))
-(define (v:pop-free! mem)
-  (let* ([head (v:free-list mem)]
-         [next (vnode-value mem head)])
-    (set-vnode-value! mem scratch next)
-    head))
-
-;; number of nodes (not including scratch)
-(define (v:size mem)
-  (let ([free (v:free-list mem)])
-    (- (sub1 (quotient (v:next mem) NODE-SIZE))
-       (if free
-           (vnode-key mem free) ;; size of free list
-           0))))
-
-(define (valloc! mem)
-  (if (vnode-value mem scratch) ;; free-list head
-      (v:pop-free! mem)
-      (let ([next (v:next mem)])
-        (v:set-next! mem (+ NODE-SIZE next))
-        next)))
-
-(define (vnode! mem key value left right)
-  (let ([node (valloc! mem)])
-    (set-vnode-key! mem node key)
-    (set-vnode-value! mem node value)
-    (set-vnode-left! mem node left)
-    (set-vnode-right! mem node right)
-    node))
-
-;; find : ... -> (values boolean node/#f)
-;; If ok?, then node returned is one sought.
-;; PRE: if add-v, then (size mem) + NODE-SIZE <= (vector-length mem)
-;;   that is, room for at least one node
-(define (v:find cmp k mem x add-v)
-  (v:findt cmp k mem x add-v))
-
-#|
-Top-down splay
-|#
-(define (v:findt cmp k mem x add-v)
-  (cond [x
-         (set-vnode-left! mem scratch #f)
-         (set-vnode-right! mem scratch #f)
-         (v:findt* cmp k mem x scratch scratch add-v)]
-        [add-v
-         (values 'added (vnode! mem k (car add-v) #f #f))]
-        [else
-         (values #f #f)]))
-
-(define (v:find-min mem x)
-  (if x
-      (let-values ([(_ok? root) (v:findt (lambda (x y) '<) 'dummy mem x #f)])
-        (values 'found root))
-      (values #f #f)))
-
-(define (v:find-max mem x)
-  (if x
-      (let-values ([(_ok? root) (v:findt (lambda (x y) '>) 'dummy mem x #f)])
-        (values 'found root))
-      (values #f #f)))
-
-(define (v:findt* cmp k mem t l r add-v)
-  (define-syntax-rule (finish! status t l r)
-    (assemble! status mem t scratch l r))
-  (define-syntax-rule (continue t l r)
-    (v:findt* cmp k mem t l r add-v))
-  (define-syntax-rule (rotate&link cmpresult rl l r
-                                   (vnode-A set-vnode-A!)
-                                   (vnode-B set-vnode-B!))
-    (let ([tA (vnode-A mem t)])
-      (cond [tA
-             (let ([c (cmp k (vnode-key mem tA))])
-               (case c
-                 ((cmpresult) ;; k should be on A-side of tA
-                  (set-vnode-A! mem t (vnode-B mem tA))
-                  (set-vnode-B! mem tA t)
-                  (let ([tAA (vnode-A mem tA)])
-                    (cond [tAA
-                           (set-vnode-A! mem rl tA)
-                           (let ([rl tA]) ;; shadows either l or r
-                             (continue tAA l r))]
-                          [add-v
-                           (let ([tAA (vnode! mem k (car add-v) #f #f)])
-                             (set-vnode-A! mem tA tAA)
-                             (set-vnode-A! mem rl tA)
-                             (let ([rl tA]) ;; shadows either l or r
-                               (finish! 'added tAA l r)))]
-                          [else
-                           (finish! #f tA l r)])))
-                 (else
-                  (set-vnode-A! mem rl t)
-                  (let ([rl t]) ;; shadows either l or r
-                    (continue tA l r)))))]
-            [add-v
-             (let ([tA (vnode! mem k (car add-v) #f #f)])
-               (set-vnode-A! mem t tA)
-               (set-vnode-A! mem rl t)
-               (let ([rl t]) ;; shadows either l or r
-                 (finish! 'added tA l r)))]
-            [else
-             (finish! #f t l r)])))
-  (case (cmp k (vnode-key mem t))
-    ((<)
-     (rotate&link < r l r (vnode-left set-vnode-left!) (vnode-right set-vnode-right!)))
-    ((>)
-     (rotate&link > l l r (vnode-right set-vnode-right!) (vnode-left set-vnode-left!)))
-    (else
-     (finish! 'found t l r))))
-
-(define (assemble! status mem t scratch l r)
-  (set-vnode-right! mem l (vnode-left mem t))
-  (set-vnode-left! mem r (vnode-right mem t))
-  (set-vnode-left! mem t (vnode-right mem scratch))
-  (set-vnode-right! mem t (vnode-left mem scratch))
-  (values status t))
-
-;; --------
-
-;; if left is node, new root is max(left)
-(define (v:join-left mem left right)
-  (cond [(and left right)
-         (let-values ([(_ok? left*) (v:find-max mem left)])
-           ;; left* is node, left*.right = #f
-           (set-vnode-right! mem left* right)
-           left*)]
-        [left left]
-        [else right]))
-
-;; if right is node, new root is min(right)
-(define (v:join-right mem left right)
-  (cond [(and left right)
-         (let-values ([(_ok? right*) (v:find-min mem right)])
-           ;; right* is node, right*.left = #f
-           (set-vnode-left! mem right* left)
-           right*)]
-        [right right]
-        [else left]))
-
-(define (v:split/drop-root mem root cmp)
-  (let ([root-key (vnode-key mem root)]
-        [left (vnode-left mem root)]
-        [right (vnode-right mem root)])
-    (v:push-free! mem root)
-    (values left right)))
-
-(define (v:split/root-to-left mem root)
-  (let ([right (vnode-right mem root)])
-    (set-vnode-right! mem root #f)
-    (values root right)))
-
-(define (v:split/root-to-right mem root)
-  (let ([left (vnode-left mem root)])
-    (set-vnode-left! mem root #f)
-    (values left root)))
-
-(define (v:delete-root mem root cmp)
-  (let-values ([(left right) (v:split/drop-root mem root cmp)])
-    (v:join-left mem left right)))
-
-#|
-(define (v:remove-range! mem root cmp from to)
-  (let loop ([root root])
-    (let-values ([(ok? root)
-                  (v:extreme* mem root cmp from '(> =) v:has-next? v:find-next)])
-      (if (and ok? (eq? (cmp (vnode-key mem root) to) '<))
-          (loop (v:delete-root mem root cmp))
-          root))))
-|#
-
-(define (v:remove-range! mem root cmp from to)
-  (let*-values ([(ok? from-node) ;; least >= from
-                 (v:extreme* mem root cmp from
-                             '(> =) v:has-next? v:find-next)]
-                [(left-tree mid+right-tree)
-                 (v:split/root-to-right mem from-node)]
-                [(ok? to-node) ;; least >= to
-                 (v:extreme* mem mid+right-tree cmp to
-                             '(> =) v:has-next? v:find-next)]
-                [(mid-tree right-tree)
-                 (v:split/root-to-right mem to-node)])
-    ;; Remove everything rooted at mid-tree.
-    (let loop ([n mid-tree])
-      (when n
-        (loop (vnode-left mem n))
-        (loop (vnode-right mem n))
-        (set-vnode-left! mem n #f) ;; not strictly necessary
-        (set-vnode-right! mem n #f)
-        (v:push-free! mem n))) ;; overwrites key, value
-    ;; Join left and right trees.
-    (v:join-left mem left-tree right-tree)))
-
-(define (v:find-prev mem root)
-  ;; PRE: root is node and root.left is node; ie, has-prev?
-  (let-values ([(left right) (v:split/root-to-right mem root)])
-    ;; join-left does max(left)
-    (v:join-left mem left right)))
-
-(define (v:find-next mem root)
-  ;; PRE: root is node and root.right is node; ie, has-next?
-  (let-values ([(left right) (v:split/root-to-left mem root)])
-    ;; join-right does min(right)
-    (v:join-right mem left right)))
-
-(define (v:has-prev? mem x) (and x (vnode-left mem x) #t))
-(define (v:has-next? mem x) (and x (vnode-right mem x) #t))
-
-;; ------------------------------------------------------------
-;; Splay tree operations
-;; ------------------------------------------------------------
-
-(define (v:splay-tree-ref s x [default not-given])
-  (match s
-    [(compact-splay-tree mem root cmp)
-     (let-values ([(ok? root) (v:find cmp x mem root #f)])
-       (set-compact-splay-tree-root! s root)
-       (if ok?
-           (vnode-value mem root)
-           (cond [(eq? default not-given)
-                  (error 'splay-tree-ref "no value found for key: ~e" x)]
-                 [(procedure? default)
-                  (default)]
-                 [else default])))]))
-
-(define (v:splay-tree-set! s x v)
-  (match s
-    [(compact-splay-tree mem root cmp)
-     (let ([mem
-            ;; ensure at least one free node
-            (cond [(v:free-list mem) mem]
-                  [(<= (+ NODE-SIZE (v:next mem)) (vector-length mem)) mem]
-                  [else ;; no free, can make simple copy
-                   (let ([mem* (make-vector (* (vector-length mem) 2) #f)])
-                     (vector-copy! mem* 0 mem)
-                     (set-compact-splay-tree-mem! s mem*)
-                     mem*)])])
-       (let-values ([(ok? root) (v:find cmp x mem root (list v))])
-         (set-compact-splay-tree-root! s root)
-         (unless (eq? (vnode-value mem root) v)
-           (set-vnode-value! mem root v))))]))
-
-(define (v:splay-tree-remove! s x)
-  (match s
-    [(compact-splay-tree mem root cmp)
-     (let-values ([(ok? root) (v:find cmp x mem root #f)])
-       (cond [ok? ;; => root is node to remove
-              (let ([root (v:delete-root mem root cmp)])
-                (set-compact-splay-tree-root! s root)
-                (v:check-size s mem root))]
-             [else
-              (set-compact-splay-tree-root! s root)]))]))
-
-(define (v:splay-tree-count s)
-  (match s
-    [(compact-splay-tree mem root cmp)
-     (v:size mem)]))
-
-(define (v:splay-tree-remove-range! s from to)
-  (match s
-    [(compact-splay-tree mem root cmp)
-     (when (eq? (cmp from to) '<)
-       (let ([root (v:remove-range! mem root cmp from to)])
-         (set-compact-splay-tree-root! s root)
-         (v:check-size s mem root)))]))
-
-(define (v:check-size s mem root)
-  (when (and (< (* 2 (v:size mem)) (quotient (vector-length mem) NODE-SIZE))
-             (>= (quotient (vector-length mem) 2) MIN-SIZE))
-    (let ([mem* (make-vector (quotient (vector-length mem) 2) #f)])
-      ;; condensing copy
-      (v:set-next! mem* NODE-SIZE)
-      (let loop ([n root])
-        (cond [n
-               (let ([n* (vnode! mem* (vnode-key mem n) (vnode-value mem n) #f #f)])
-                 (set-vnode-left! mem* n* (loop (vnode-left mem n)))
-                 (set-vnode-right! mem* n* (loop (vnode-right mem n)))
-                 n*)]
-              [else #f]))
-      (set-compact-splay-tree-root! s NODE-SIZE)
-      (set-compact-splay-tree-mem! s mem*))))
-
-;; ========
-
-(define (v:splay-tree-iterate-first s)
-  (match s
-    [(compact-splay-tree mem root cmp)
-     (let-values ([(ok? root) (v:find-min mem root)])
-       (set-compact-splay-tree-root! s root)
-       (if ok? (splay-tree-iter (vnode-key mem root)) #f))]))
-
-(define (v:splay-tree-iterate-next s pos)
-  (match pos
-    [(splay-tree-iter key)
-     (v:splay-tree-iterate-least/>? s key)]))
-
-(define (v:splay-tree-iterate-key s pos)
-  (match pos
-    [(splay-tree-iter key) key]))
-
-(define (v:splay-tree-iterate-value s pos)
-  (match pos
-    [(splay-tree-iter key) (v:splay-tree-ref s key #f)]))
-
-;; Order-based search
-
-(define (v:extreme s key cmp-result has-X? find-X)
-  (match s
-    [(compact-splay-tree mem root cmp)
-     (let-values ([(ok? root)
-                   (v:extreme* mem root cmp key cmp-result has-X? find-X)])
-       (set-compact-splay-tree-root! s root)
-       (and ok? (splay-tree-iter (vnode-key mem root))))]))
-
-(define (v:extreme* mem root cmp key cmp-result has-X? find-X)
-  (let*-values ([(_ok? root) (v:find cmp key mem root #f)])
-    ;; ok? is true when root returned satisfies search criteria
-    (cond [(and root (memq (cmp (vnode-key mem root) key) cmp-result))
-           (values #t root)]
-          [(has-X? mem root)
-           (values #t (find-X mem root))]
-          [else
-           (values #f root)])))
-
-(define (v:splay-tree-iterate-greatest/<=? s key)
-  (v:extreme s key '(< =) v:has-prev? v:find-prev))
-(define (v:splay-tree-iterate-greatest/<? s key)
-  (v:extreme s key '(<) v:has-prev? v:find-prev))
-(define (v:splay-tree-iterate-least/>=? s key)
-  (v:extreme s key '(> =) v:has-next? v:find-next))
-(define (v:splay-tree-iterate-least/>? s key)
-  (v:extreme s key '(>) v:has-next? v:find-next))
-
-(define (v:splay-tree-iterate-least s)
-  (v:splay-tree-iterate-first s))
-(define (v:splay-tree-iterate-greatest s)
-  (match s
-    [(compact-splay-tree mem root cmp)
-     (let-values ([(ok? root) (v:find-max mem root)])
-       (set-compact-splay-tree-root! s root)
-       (if ok? (splay-tree-iter (vnode-key mem root)) #f))]))
-
-;; ========
-
-;; snapshot
-(define (v:splay-tree->list s)
-  (match s
-    [(compact-splay-tree mem root cmp)
-     (let loop ([x root] [onto null])
-       (cond [x (loop (vnode-left mem x)
-                      (cons (cons (vnode-key mem x) (vnode-value mem x))
-                            (loop (vnode-right mem x) onto)))]
-             [else onto]))]))
-
-;; ------------------------------------------------------------
-;; Struct
-;; ------------------------------------------------------------
-
-(define v:dict-methods
-  (vector-immutable v:splay-tree-ref
-                    v:splay-tree-set!
-                    #f ;; set
-                    v:splay-tree-remove!
-                    #f ;; remove
-                    v:splay-tree-count
-                    v:splay-tree-iterate-first
-                    v:splay-tree-iterate-next
-                    v:splay-tree-iterate-key
-                    v:splay-tree-iterate-value))
-
-(define v:ordered-dict-methods
-  (vector-immutable v:splay-tree-iterate-least
-                    v:splay-tree-iterate-greatest
-                    v:splay-tree-iterate-least/>?
-                    v:splay-tree-iterate-least/>=?
-                    v:splay-tree-iterate-greatest/<?
-                    v:splay-tree-iterate-greatest/<=?))
-
-(struct compact-splay-tree ([mem #:mutable] [root #:mutable] cmp)
-        #:property prop:dict/contract
-        (list v:dict-methods
-              (vector-immutable any/c
-                                any/c
-                                splay-tree-iter?
-                                #f #f #f))
-        #:property prop:ordered-dict
-        v:ordered-dict-methods)
-
-(struct compact-splay-tree* compact-splay-tree (key-c value-c)
-        #:property prop:dict/contract
-        (list v:dict-methods
-              (vector-immutable any/c
-                                any/c
-                                splay-tree-iter?
-                                (lambda (s) (compact-splay-tree*-key-c s))
-                                (lambda (s) (compact-splay-tree*-value-c s))
-                                #f))
-        #:property prop:ordered-dict
-        v:ordered-dict-methods)
-
-
-
-;; ============================================================
-;; Constructors, predicates
-;; ============================================================
-
-(define (make-splay-tree [ord datum-order]
-                         #:key-contract [key-contract any/c]
-                         #:value-contract [value-contract any/c])
-  (*make-splay-tree (order-comparator ord)
-                    (and/c* (order-domain-contract ord) key-contract)
-                    value-contract))
-
-(define (make-adjustable-splay-tree #:key-contract [key-contract any/c]
-                                    #:value-contract [value-contract any/c])
-  (cond [(and (eq? key-contract any/c) (eq? value-contract any/c))
-         (node-splay-tree #f 0)]
-        [else
-         (node-splay-tree* #f 0 key-contract value-contract)]))
-
-(define (*make-splay-tree cmp key-contract value-contract)
-  (let ([mem (make-vector (* NODE-SIZE 4) #f)])
-    (set-vnode-key! mem scratch 4)
-    (cond [(and (eq? key-contract any/c) (eq? value-contract any/c))
-           (compact-splay-tree mem #f cmp)]
-          [else
-           (compact-splay-tree* mem #f cmp key-contract value-contract)])))
-
-(define (splay-tree? x)
-  (or (node-splay-tree? x) (compact-splay-tree? x)))
-
-(define (adjustable-splay-tree? s)
-  (node-splay-tree? s))
-
-(define (and/c* x y)
-  (cond [(eq? x any/c) y]
-        [(eq? y any/c) x]
-        [else (and/c x y)]))
-
-;; ============================================================
-;; Splay trees
-;; ============================================================
-
-(define (splay-tree-ref s x [default not-given])
-  (if (compact-splay-tree? s)
-      (v:splay-tree-ref s x default)
-      (n:splay-tree-ref s x default)))
-
-(define-syntax (defboth stx)
-  (syntax-case stx ()
-    [(defboth (f p0 p ...) ...)
-     (with-syntax ([(v:f ...) (map (lambda (f) (format-id f "v:~a" f))
-                                   (syntax->list #'(f ...)))]
-                   [(n:f ...) (map (lambda (f) (format-id f "n:~a" f))
-                                   (syntax->list #'(f ...)))])
-       #'(begin (define (f p0 p ...)
-                  (if (compact-splay-tree? p0)
-                      (v:f p0 p ...)
-                      (n:f p0 p ...)))
-                ...))]))
-
-(defboth
-  (splay-tree-set! s x v)
-  (splay-tree-remove! s x)
-  (splay-tree-count s)
-  (splay-tree-remove-range! s from to)
-  (splay-tree-iterate-first s)
-  (splay-tree-iterate-next s pos)
-  (splay-tree-iterate-key s pos)
-  (splay-tree-iterate-value s pos)
-  (splay-tree-iterate-greatest/<=? s key)
-  (splay-tree-iterate-greatest/<? s key)
-  (splay-tree-iterate-least/>=? s key)
-  (splay-tree-iterate-least/>? s key)
-  (splay-tree-iterate-least s)
-  (splay-tree-iterate-greatest s)
-  (splay-tree->list s))
-
-
-;; ============================================================
-;; provide/contract
-;; ============================================================
-
-(define (key-c s)
-  (cond [(compact-splay-tree*? s) (compact-splay-tree*-key-c s)]
-        [(node-splay-tree*? s)
-         (and/c* exact-integer? (node-splay-tree*-key-c s))]
-        [(node-splay-tree? s) exact-integer?]
-        [else any/c]))
-(define (val-c s)
-  (cond [(compact-splay-tree*? s) (compact-splay-tree*-value-c s)]
-        [(node-splay-tree*? s) (node-splay-tree*-value-c s)]
-        [else any/c]))
-
-(provide/contract
- [make-splay-tree
-  (->* ()
-       (order? #:key-contract contract? #:value-contract contract?)
-       splay-tree?)]
- [make-adjustable-splay-tree
-  (->* ()
-       (#:key-contract contract? #:value-contract contract?)
-       splay-tree?)]
- #|
- [make-datum-splay-tree
-  (->* ()
-       (#:key-contract contract? #:value-contract contract?)
-       splay-tree?)]
- |#
-
- [splay-tree? (-> any/c boolean?)]
- [adjustable-splay-tree? (-> any/c boolean?)]
-
- [splay-tree-ref
-  (->i ([s splay-tree?] [key (s) (key-c s)])
-       ([default any/c])
-       any)]
- [splay-tree-set!
-  (->i ([s splay-tree?] [key (s) (key-c s)] [v (s) (val-c s)]) [_r void?])]
- [splay-tree-remove!
-  (->i ([s splay-tree?] [key (s) (key-c s)]) [_r void?])]
- [splay-tree-remove-range!
-  (->i ([s splay-tree?] [from (s) (key-c s)] [to (s) (key-c s)]) [_r void?])]
- [splay-tree-count
-  (-> splay-tree? exact-nonnegative-integer?)]
- [splay-tree->list
-  (->i ([s splay-tree?]) [_r (s) (listof (cons/c (key-c s) (val-c s)))])]
-
- [splay-tree-contract!
-  (->i ([s adjustable-splay-tree?]
-        [from (s) (key-c s)] [to (s) (key-c s)])
-       [_r void?])]
- [splay-tree-expand!
-  (->i ([s adjustable-splay-tree?]
-        [from (s) (key-c s)] [to (s) (key-c s)])
-       [_r void?])]
-
- [splay-tree-iterate-first
-  (-> splay-tree? (or/c splay-tree-iter? #f))]
- [splay-tree-iterate-next
-  (-> splay-tree? splay-tree-iter? (or/c splay-tree-iter? #f))]
- [splay-tree-iterate-key
-  (->i ([s splay-tree?] [i splay-tree-iter?]) [_r (s) (key-c s)])]
- [splay-tree-iterate-value
-  (->i ([s splay-tree?] [i splay-tree-iter?]) [_r (s) (val-c s)])]
-
- [splay-tree-iterate-greatest/<=?
-  (->i ([s splay-tree?] [k (s) (key-c s)]) [_r (or/c splay-tree-iter? #f)])]
- [splay-tree-iterate-greatest/<?
-  (->i ([s splay-tree?] [k (s) (key-c s)]) [_r (or/c splay-tree-iter? #f)])]
- [splay-tree-iterate-least/>=?
-  (->i ([s splay-tree?] [k (s) (key-c s)]) [_r (or/c splay-tree-iter? #f)])]
- [splay-tree-iterate-least/>?
-  (->i ([s splay-tree?] [k (s) (key-c s)]) [_r (or/c splay-tree-iter? #f)])]
-
- [splay-tree-iterate-least
-  (-> splay-tree? (or/c splay-tree-iter? #f))]
- [splay-tree-iterate-greatest
-  (-> splay-tree? (or/c splay-tree-iter? #f))]
-
- [splay-tree-iter? (-> any/c boolean?)])
diff --git a/pkgs/data-pkgs/data-lib/data/union-find.rkt b/pkgs/data-pkgs/data-lib/data/union-find.rkt
deleted file mode 100644
index 06ae0cf4d9..0000000000
--- a/pkgs/data-pkgs/data-lib/data/union-find.rkt
+++ /dev/null
@@ -1,266 +0,0 @@
-#lang racket/base
-(require racket/contract)
-(provide uf-set? uf-new)
-(provide
- (contract-out
-  [uf-union! (-> uf-set? uf-set? void?)]
-  [uf-find (-> uf-set? any/c)]
-  [uf-set-canonical! (-> uf-set? any/c void?)]
-  [uf-same-set? (-> uf-set? uf-set? boolean?)]))
-
-(struct uf-set (x rank) #:mutable
-  #:methods gen:custom-write
-  [(define write-proc 
-     (λ (uf port mode)
-       (write-string "#<uf-set: " port)
-       (define recur
-         (case mode
-           [(#t) write]
-           [(#f) display]
-           [else (λ (p port) (print p port mode))]))
-       (recur (uf-find uf) port)
-       (write-string ">" port)))])
-
-(define (uf-new x) (uf-set (box x) 0))
-
-(define (uf-union! _a _b) 
-  (define a (uf-get-root _a))
-  (define b (uf-get-root _b))
-  (unless (eq? a b)
-    (define a-rank (uf-set-rank a))
-    (define b-rank (uf-set-rank b))
-    (cond
-      [(< a-rank b-rank)
-       (set-uf-set-x! a b)]
-      [else
-       (set-uf-set-x! b a)
-       (when (= a-rank b-rank)
-         (set-uf-set-rank! a (+ a-rank 1)))])))
-
-(define (uf-find a) (unbox (uf-get-box a)))
-
-(define (uf-set-canonical! a b)
-  (set-box! (uf-get-box a) b))
-
-(define (uf-same-set? a b)
-  (eq? (uf-get-box a) (uf-get-box b)))
-
-(define (uf-get-box a) (uf-set-x (uf-get-root a)))
-
-(define (uf-get-root a)
-  (let loop ([c a]
-             [p (uf-set-x a)])
-    (cond
-      [(box? p) c]
-      [else
-       (define fnd (loop p (uf-set-x p)))
-       (set-uf-set-x! c fnd)
-       fnd])))
-
-(module+ test
-  (require rackunit 
-           racket/pretty
-           racket/set)
-  
-  (check-equal? (uf-find (uf-new 1)) 1)
-  (check-equal? (let ([a (uf-new 1)]
-                      [b (uf-new 2)])
-                  (uf-union! a b)
-                  (uf-find a))
-                1)
-  (check-equal? (let ([a (uf-new 1)]
-                      [b (uf-new 2)])
-                  (uf-union! a b)
-                  (uf-find b))
-                1)
-  (check-equal? (let ([a (uf-new 1)]
-                      [b (uf-new 2)])
-                  (uf-union! a b)
-                  (uf-find a)
-                  (uf-find a))
-                1)
-  (check-equal? (let ([a (uf-new 1)]
-                      [b (uf-new 2)])
-                  (uf-union! a b)
-                  (uf-find b)
-                  (uf-find b))
-                1)
-  
-  (check-equal? (let ([a (uf-new 1)])
-                  (uf-union! a a)
-                  (uf-find a))
-                1)
-  
-  (check-equal? (uf-same-set? (uf-new 1) (uf-new 2)) #f)
-  (check-equal? (uf-same-set? (uf-new 1) (uf-new 1)) #f)
-  (check-equal? (let ([a (uf-new 1)]
-                      [b (uf-new 1)])
-                  (uf-union! a b) 
-                  (uf-same-set? a b))
-                #t)
-  (check-equal? (let ([sp (open-output-string)])
-                  (display (uf-new "x") sp)
-                  (get-output-string sp))
-                "#<uf-set: x>")
-  (check-equal? (let ([sp (open-output-string)])
-                  (write (uf-new "x") sp)
-                  (get-output-string sp))
-                "#<uf-set: \"x\">")
-  (check-equal? (let ([sp (open-output-string)])
-                  (print (uf-new "x") sp)
-                  (get-output-string sp))
-                "#<uf-set: \"x\">")
-  (check-equal? (let ([sp (open-output-string)])
-                  (define x (vector 1))
-                  (define a (uf-new x))
-                  (vector-set! x 0 a)
-                  (write x sp)
-                  (get-output-string sp))
-                "#0=#(#<uf-set: #0#>)")
-  (check-equal? (let ([sp (open-output-string)])
-                  (define a (uf-new #f))
-                  (uf-set-canonical! a a)
-                  (write a sp)
-                  (get-output-string sp))
-                "#0=#<uf-set: #0#>")
-  
-  
-  (let ([a (uf-new 1)]
-        [b (uf-new 2)]
-        [c (uf-new 3)]
-        [d (uf-new 4)]
-        [e (uf-new 5)])
-    (uf-union! a b)
-    (uf-union! c d)
-    (uf-union! b d)
-    (uf-union! c e)
-    (check-equal? (uf-find a)
-                  (uf-find e)))
-  
-  (let ([a (uf-new 1)]
-        [b (uf-new 2)]
-        [c (uf-new 3)]
-        [d (uf-new 4)]
-        [e (uf-new 5)])
-    (uf-union! a b)
-    (uf-union! c d)
-    (uf-union! a c)
-    (uf-union! c e)
-    (check-equal? (uf-find a)
-                  (uf-find e)))
-  
-  (let ([a (uf-new 1)]
-        [b (uf-new 2)]
-        [c (uf-new 3)]
-        [d (uf-new 4)]
-        [e (uf-new 5)])
-    (uf-union! a b)
-    (uf-union! c d)
-    (uf-union! a d)
-    (uf-union! c e)
-    (check-equal? (uf-find a)
-                  (uf-find e)))
-  
-  (let ([a (uf-new 1)]
-        [b (uf-new 2)]
-        [c (uf-new 3)]
-        [d (uf-new 4)]
-        [e (uf-new 5)])
-    (uf-union! a b)
-    (uf-union! c d)
-    (uf-union! b c)
-    (uf-union! c e)
-    (check-equal? (uf-find a)
-                  (uf-find e)))
-  
-  (check-equal? (let ([a (uf-new 1)]
-                      [b (uf-new 2)]
-                      [c (uf-new 3)]
-                      [d (uf-new 4)])
-                  (uf-union! a b)
-                  (uf-union! c d)
-                  (uf-union! a c)
-                  (max (uf-set-rank a)
-                       (uf-set-rank b)
-                       (uf-set-rank c)
-                       (uf-set-rank d)))
-                2)
-  
-  (let ((uf-sets (for/list ((x (in-range 8))) (uf-new x))))
-    (uf-union! (list-ref uf-sets 5) (list-ref uf-sets 7))
-    (uf-union! (list-ref uf-sets 1) (list-ref uf-sets 6))
-    (uf-union! (list-ref uf-sets 6) (list-ref uf-sets 5))
-    (uf-union! (list-ref uf-sets 4) (list-ref uf-sets 7))
-    (uf-union! (list-ref uf-sets 2) (list-ref uf-sets 0))
-    (uf-union! (list-ref uf-sets 2) (list-ref uf-sets 5))
-    (check-equal? (uf-find (list-ref uf-sets 4))
-                  (uf-find (list-ref uf-sets 7))))
-  
-  
-  (define (run-random-tests)
-    (define (make-random-sets num-sets)
-      (define uf-sets 
-        (for/list ([x (in-range num-sets)])
-          (uf-new x)))
-      (define edges (make-hash (build-list num-sets (λ (x) (cons x (set))))))
-      (define (add-edge a-num b-num)
-        (hash-set! edges a-num (set-add (hash-ref edges a-num) b-num)))
-      (define ops '())
-      (for ([op (in-range (random 10))])
-        (define a-num (random num-sets))
-        (define b-num (random num-sets))
-        (define a (list-ref uf-sets a-num))
-        (define b (list-ref uf-sets b-num))
-        (set! ops (cons `(uf-union! (list-ref uf-sets ,a-num)
-                                    (list-ref uf-sets ,b-num))
-                        ops))
-        (uf-union! a b)
-        (add-edge a-num b-num)
-        (add-edge b-num a-num))
-      (define code `(let ([uf-sets 
-                           (for/list ([x (in-range ,num-sets)])
-                             (uf-new x))])
-                      ,@(reverse ops)))
-      (values uf-sets edges code))
-    
-    (define (check-canonical-has-path uf-sets edges code)
-      (for ([set (in-list uf-sets)]
-            [i (in-naturals)])
-        (define canon (uf-find set))
-        (define visited (make-hash))
-        (define found?
-          (let loop ([node i])
-            (cond
-              [(= node canon) #t]
-              [(hash-ref visited node #f) #f]
-              [else
-               (hash-set! visited node #t)
-               (for/or ([neighbor (in-set (hash-ref edges node))])
-                 (loop neighbor))])))
-        (unless found?
-          (pretty-print code (current-error-port))
-          (error 'union-find.rkt "mismatch; expected a link from ~s to ~s, didn't find it"
-                 i canon))))
-    
-    (define (check-edges-share-canonical uf-sets edges code)
-      (for ([(src dests) (in-hash edges)])
-        (for ([dest (in-set dests)])
-          (define sc (uf-find (list-ref uf-sets src)))
-          (define dc (uf-find (list-ref uf-sets dest)))
-          (unless (= sc dc)
-            (pretty-print code (current-error-port))
-            (error 'union-find.rkt 
-                   "mismatch; expected sets ~s and ~s to have the same canonical element, got ~s and ~s"
-                   src dest
-                   sc dc)))))
-    
-    (for ([x (in-range 10000)])
-      (define-values (sets edges code) 
-        (make-random-sets (+ 2 (random (+ 1 (floor (/ x 100)))))))
-      (check-canonical-has-path sets edges code)
-      (check-edges-share-canonical sets edges code)))
-  
-  (run-random-tests)
-  
-  (random-seed 0)
-  (time (run-random-tests)))
diff --git a/pkgs/data-pkgs/data-lib/info.rkt b/pkgs/data-pkgs/data-lib/info.rkt
deleted file mode 100644
index 0e7419e678..0000000000
--- a/pkgs/data-pkgs/data-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-(define collection 'multi)
-(define deps '("base"))
-(define build-deps '("rackunit-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"data\"")
-
-(define pkg-authors '(ryanc))
diff --git a/pkgs/data-pkgs/data-test/LICENSE.txt b/pkgs/data-pkgs/data-test/LICENSE.txt
deleted file mode 100644
index 01b6ef48ad..0000000000
--- a/pkgs/data-pkgs/data-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-data-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/data-pkgs/data-test/info.rkt b/pkgs/data-pkgs/data-test/info.rkt
deleted file mode 100644
index c02cc9b9a7..0000000000
--- a/pkgs/data-pkgs/data-test/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "tests for \"data-lib\"")
-
-(define pkg-authors '(ryanc))
-(define build-deps '("data-enumerate-lib"
-                     "racket-index"
-                     "data-lib"
-                     "rackunit-lib"))
-(define update-implies '("data-lib"))
diff --git a/pkgs/data-pkgs/data-test/tests/data/bit-vector.rkt b/pkgs/data-pkgs/data-test/tests/data/bit-vector.rkt
deleted file mode 100644
index cad3112cdf..0000000000
--- a/pkgs/data-pkgs/data-test/tests/data/bit-vector.rkt
+++ /dev/null
@@ -1,156 +0,0 @@
-#lang racket/base
-(require data/bit-vector
-         racket/dict
-         rackunit
-         racket/set)
-
-(define (bit-vector->vector bv)
-  (for/vector ([b (in-bit-vector bv)])
-    b))
-
-(test-equal? "bit-vector"
-             (bit-vector->vector (bit-vector #t #f #t))
-             '#(#t #f #t))
-
-(test-equal? "make-bit-vector"
-             (make-bit-vector 3)
-             (bit-vector #f #f #f))
-
-(test-equal? "make-bit-vector"
-             (make-bit-vector 3 #t)
-             (bit-vector #t #t #t))
-
-(test-equal? "bit-vector-ref"
-             (let ([bv (bit-vector #t #f #t)])
-               ;; 3 valid refs + 1 not-found
-               (for/list ([index '(0 1 2)])
-                 (bit-vector-ref bv index)))
-             '(#t #f #t))
-
-(test-equal? "bit-vector-set!"
-             (let ([bv (bit-vector #t #t #t)])
-               (bit-vector-set! bv 1 #f)
-               (bit-vector->vector bv))
-             '#(#t #f #t))
-
-(test-equal? "bit-vector-length"
-             (bit-vector-length (bit-vector #t #f #t))
-             3)
-
-(test-equal? "in-bit-vector"
-             (let ([bv (bit-vector #t #f #t)])
-               (for/list ([x (in-bit-vector bv)]) x))
-             '(#t #f #t))
-
-(test-equal? "in-bit-vector expression form"
-             (let* ([bv (bit-vector #t #f #t)]
-                    [bv-sequence (in-bit-vector bv)])
-               (for/list ([x bv-sequence]) x))
-             '(#t #f #t))
-
-(test-equal? "bit-vector as sequence"
-             (let ([bv (bit-vector #t #f #t)])
-               (for/list ([x bv]) x))
-             '(#t #f #t))
-
-(test-case "bitvector, lots of sets"
-           (let ([bv (make-bit-vector 1000)])
-             (for ([i (in-range 0 1000)])
-               (bit-vector-set! bv i (odd? i)))
-             (for ([i (in-range 0 1000)])
-               (check-equal? (bit-vector-ref bv i) (odd? i)))))
-
-(test-equal? "bit-vector, dict-map"
-             (dict-map (bit-vector #t #f #t) list)
-             '((0 #t) (1 #f) (2 #t)))
-
-(test-equal? "bit-vector, dict-ref"
-             (dict-ref (bit-vector #t #f #t) 0)
-             #t)
-
-(test-equal? "bit-vector, dict-ref out of range"
-             (dict-ref (bit-vector #t #f #t) 5 'not-found)
-             'not-found)
-
-(test-case "bit-vector-copy"
-           (let ([bv (bit-vector #t #f #t #f #t)])
-             (check-equal? (bit-vector-copy bv) bv)))
-
-(test-case "bit-vector, hash-equal"
-           (check-equal? 
-            (equal-hash-code (bit-vector #t #f #t #f #t))
-            (equal-hash-code (bit-vector #t #f #t #f #t))))
-
-(test-case "bit-vector, hash-eq"
-           (check-equal? 
-            (= (eq-hash-code (bit-vector #t #f #t #f #t))
-               (eq-hash-code (bit-vector #t #f #t #f #t)))
-            #f))
-
-(test-case "bit-vector, equal-proc (via equal?)"
-           ;; Zero length bit-vectors are equal...
-           (equal? (make-bit-vector 0 #t)
-                   (make-bit-vector 0 #t))
-           ;; ...even if fill value differed, because it's N/A
-           (equal? (make-bit-vector 0 #t)
-                   (make-bit-vector 0 #f))
-           ;; Check a range of bit lengths spanning a few 8-bit bytes:
-           (for ([len (in-range 1 24)])
-             (check-equal?
-              (equal? (make-bit-vector len #t)
-                      (make-bit-vector len #t))
-              #t)
-             (check-equal?
-              (equal? (make-bit-vector len #t)
-                      (make-bit-vector len #f))
-              #f))
-           ;; Attempt to flush out potential bugs wrt to unused bits
-           ;; that might be set by a "fill" value (implementation
-           ;; detail we don't know for sure here), but should
-           ;; definitely be ignored by equal?.
-           (let ([x (make-bit-vector 1 #t)]  ;#t fill value
-                 [y (make-bit-vector 1 #f)]) ;#f fill value
-             ;; Set the only bit to #t in both
-             (bit-vector-set! x 0 #t)
-             (bit-vector-set! y 0 #t)
-             ;; Should be equal, regardless of different fill values
-             ;; in make-bit-vector:
-             (check-equal? (equal? x y) #t)))
-
-(test-case "for/bit-vector"
-           (check-equal? (for/bit-vector ([i 5]) (odd? i))
-                         (bit-vector #f #t #f #t #f))
-           (check-equal? (for/bit-vector #:length 4 ([i 2]) (odd? i))
-                         (bit-vector #f #t #f #f))
-           (check-equal? (for/bit-vector #:length 4 #:fill #t ([i 2]) (odd? i))
-                         (bit-vector #f #t #t #t))
-           (let ([bv (make-bit-vector 1000)])
-             (bit-vector-set! bv 400 #t)
-             (check-equal? bv (for/bit-vector ([i 1000]) (= i 400)))))
-
-(test-case "bit-vector-popcount"
-           (let ()
-             (define (test len)
-               (define fill (odd? (random 2)))
-               (define bv (make-bit-vector len fill))
-               (define ns (list->set (build-list 100 (λ (_) (random len)))))
-               (for ([n (in-set ns)]) (bit-vector-set! bv n (not fill)))
-               (define count 
-                 (if fill (- len (set-count ns)) (set-count ns)))
-               (check-equal? (bit-vector-popcount bv) count))
-             (for ([i (in-range 100)])
-               (test 1000))
-             ;; test multiples of possible word sizes
-             (for ([ws (in-list '(8 30 62))])
-               (for ([i (in-range 10)])
-                 (test (* ws 10))))))
-
-(test-case "bit-vector string->list"
-  (let ([bitstrings '("0" "1" "10" "11" "1010110011100011110000")])
-    (for ([s (in-list bitstrings)])
-      (check-equal? (bit-vector->string (string->bit-vector s)) s)
-      (let ([bitlist (for/list ([c (in-string s)]) (eqv? c #\1))])
-        (check-equal? (bit-vector->list (string->bit-vector s))
-                      bitlist)
-        (check-equal? (string->bit-vector s)
-                      (list->bit-vector bitlist))))))
diff --git a/pkgs/data-pkgs/data-test/tests/data/enumerate.rkt b/pkgs/data-pkgs/data-test/tests/data/enumerate.rkt
deleted file mode 100644
index 5d5823d250..0000000000
--- a/pkgs/data-pkgs/data-test/tests/data/enumerate.rkt
+++ /dev/null
@@ -1,487 +0,0 @@
-#lang racket/base
-(require rackunit
-         racket/function
-         racket/set
-         data/gvector
-         data/enumerate
-         (submod data/enumerate test))
-
-;; const/e tests
-(let ([e (const/e 17)])
-  (test-begin
-   (check-eq? (from-nat e 0) 17)
-   (check-exn exn:fail? 
-              (λ ()
-                 (from-nat e 1)))
-   (check-eq? (to-nat e 17) 0)
-   (check-exn exn:fail?
-              (λ ()
-                 (to-nat e 0)))
-   (check-bijection? e)))
-
-;; from-list/e tests
-(let ([e (from-list/e '(5 4 1 8))])
-  (test-begin
-   (check-eq? (from-nat e 0) 5)
-   (check-eq? (from-nat e 3) 8)
-   (check-exn exn:fail?
-              (λ () (from-nat e 4)))
-   (check-eq? (to-nat e 5) 0)
-   (check-eq? (to-nat e 8) 3)
-   (check-exn exn:fail?
-              (λ ()
-                 (to-nat e 17)))
-   (check-bijection? e)))
-
-;; map test
-(define nats+1 (nat+/e 1))
-
-(test-begin
- (check-equal? (size nats+1) +inf.0)
- (check-equal? (from-nat nats+1 0) 1)
- (check-equal? (from-nat nats+1 1) 2)
- (check-bijection? nats+1))
-;; encode check
-(test-begin
- (check-exn exn:fail?
-            (λ ()
-               (from-nat nat/e -1))))
-
-;; ints checks
-(test-begin
- (check-eq? (from-nat int/e 0) 0)         ; 0 -> 0
- (check-eq? (from-nat int/e 1) 1)         ; 1 -> 1
- (check-eq? (from-nat int/e 2) -1)        ; 2 -> 1
- (check-eq? (to-nat int/e 0) 0)
- (check-eq? (to-nat int/e 1) 1)
- (check-eq? (to-nat int/e -1) 2)
- (check-bijection? int/e))              ; -1 -> 2, -3 -> 4
-
-;; sum tests
-(define evens/e
-  (enum +inf.0
-        (λ (n)
-           (* 2 n))
-        (λ (n)
-           (if (and (zero? (modulo n 2))
-                    (>= n 0))
-               (/ n 2)
-               (error 'even)))))
-
-(define odds/e
-  (enum +inf.0
-        (λ (n)
-           (+ (* 2 n) 1))
-        (λ (n)
-           (if (and (not (zero? (modulo n 2)))
-                    (>= n 0))
-               (/ (- n 1) 2)
-               (error 'odd)))))
-
-(test-begin
- (define bool-or-num
-   (disj-sum/e (cons bool/e boolean?)
-               (cons (from-list/e '(0 1 2 3)) number?)))
- (define bool-or-nat
-   (disj-sum/e (cons bool/e boolean?)
-               (cons nat/e number?)))
- (define nat-or-bool
-   (disj-sum/e (cons nat/e number?)
-               (cons bool/e boolean?)))
- (define odd-or-even
-   (disj-sum/e (cons evens/e even?)
-               (cons odds/e odd?)))
-
-
- 
- (check-equal? (size bool-or-num) 6)
-   
- (check-equal? (from-nat bool-or-num 0) #t)
- (check-equal? (from-nat bool-or-num 1) 0)
- (check-equal? (from-nat bool-or-num 2) #f)
- (check-equal? (from-nat bool-or-num 3) 1)
- (check-equal? (from-nat bool-or-num 4) 2)
- (check-equal? (from-nat bool-or-num 5) 3)
-   
- (check-exn exn:fail?
-            (λ ()
-               (from-nat bool-or-num 6)))
- (check-bijection? bool-or-num)
-   
- (check-equal? (size bool-or-nat)
-               +inf.0)
- (check-equal? (from-nat bool-or-nat 0) #t)
- (check-equal? (from-nat bool-or-nat 1) 0)
- (check-bijection? bool-or-nat)
-   
- (check-equal? (size odd-or-even)
-               +inf.0)
- (check-equal? (from-nat odd-or-even 0) 0)
- (check-equal? (from-nat odd-or-even 1) 1)
- (check-equal? (from-nat odd-or-even 2) 2)
- (check-exn exn:fail?
-            (λ ()
-               (from-nat odd-or-even -1)))
- (check-equal? (to-nat odd-or-even 0) 0)   
- (check-equal? (to-nat odd-or-even 1) 1)
- (check-equal? (to-nat odd-or-even 2) 2)
- (check-equal? (to-nat odd-or-even 3) 3)
- (check-bijection? odd-or-even)
-
- (check-bijection? nat-or-bool)
-
- (define multi-layered
-   (disj-sum/e (cons (take/e string/e 5) string?)
-               (cons (from-list/e '(a b c d)) symbol?)
-               (cons nat/e number?)
-               (cons bool/e boolean?)
-               (cons (many/e bool/e) list?)))
-
- (define (test-multi-layered i x)
-   (check-equal? (from-nat multi-layered i) x))
- (map test-multi-layered
-      (for/list ([i (in-range 31)])
-        i)
-      ;; Please don't reformat this!
-      '(""   a 0 #t ()
-        "a"  b 1 #f (#t)
-        "b"  c 2    (#f)
-        "c"  d 3    (#t #t)
-        "d"    4    (#f #t)
-               5    (#t #f)
-               6    (#f #f)
-               7    (#t #t #t)
-               8    (#f #t #t)
-               9    (#t #f #t)))
- 
- (check-bijection? multi-layered))
-
-(test-begin
- (define bool-or-num
-   (disj-append/e (cons bool/e boolean?)
-                  (cons (from-list/e '(0 1 2 3)) number?)))
- (define bool-or-nat
-   (disj-append/e (cons bool/e boolean?)
-                  (cons nat/e number?)))
- (check-equal? (size bool-or-num) 6)
-   
- (check-equal? (from-nat bool-or-num 0) #t)
- (check-equal? (from-nat bool-or-num 1) #f)
- (check-equal? (from-nat bool-or-num 2) 0)
- (check-equal? (from-nat bool-or-num 3) 1)
- (check-equal? (from-nat bool-or-num 4) 2)
- (check-equal? (from-nat bool-or-num 5) 3)
-   
- (check-exn exn:fail?
-            (λ ()
-               (from-nat bool-or-num 6)))
- (check-bijection? bool-or-num)
-   
- (check-equal? (size bool-or-nat)
-               +inf.0)
- (check-equal? (from-nat bool-or-nat 0) #t)
- (check-equal? (from-nat bool-or-nat 1) #f)
- (check-equal? (from-nat bool-or-nat 2) 0)
- (check-bijection? bool-or-nat))
-
-;; cons/e tests
-(define bool*bool (cons/e bool/e bool/e))
-(define 1*b (cons/e (const/e 1) bool/e))
-(define b*1 (cons/e bool/e (const/e 1)))
-(define bool*nats (cons/e bool/e nat/e))
-(define nats*bool (cons/e nat/e bool/e))
-(define nats*nats (cons/e nat/e nat/e))
-(define ns-equal? (λ (ns ms)
-                     (and (= (car ns)
-                             (car ms))
-                          (= (cdr ns)
-                             (cdr ms)))))
-;; Make sure they are layered correctly, but don't care about the
-;; exact order
-
-;; prod tests
-(test-begin
-
- (check-equal? (size 1*b) 2)
- (check-equal? (from-nat 1*b 0) (cons 1 #t))
- (check-equal? (from-nat 1*b 1) (cons 1 #f))
- (check-bijection? 1*b)
- (check-bijection? b*1)
- (check-equal? (size bool*bool) 4)
- (check-bijection? bool*bool)
-
- (check-equal? (size bool*nats) +inf.0)
- (check-bijection? bool*nats)
-
- (check-equal? (size nats*bool) +inf.0)
- (check-bijection? nats*bool)
-
- (check-bijection? nats*nats)
- (check-bijection? (list/e integer/e integer/e))
- (check-bijection? (apply list/e
-                          (for/list ([i (in-range 24)])
-                            (map/e (curry cons i) cdr nat/e)))))
-
-
-;; fair product tests
-(define-simple-check (check-range? e l u approx)
-  (let ([actual (for/set ([i (in-range l u)])
-                  (from-nat e i))]
-        [expected (list->set approx)])
-    (equal? actual expected)))
-(test-begin
- (define n*n     (cantor-list/e nat/e nat/e))
- (check-range? n*n  0  1 '((0 0)))
- (check-range? n*n  1  3 '((0 1) (1 0)))
- (check-range? n*n  3  6 '((0 2) (1 1) (2 0)))
- (check-range? n*n  6 10 '((0 3) (1 2) (2 1) (3 0)))
- (check-range? n*n 10 15 '((0 4) (1 3) (2 2) (3 1) (4 0))))
-(test-begin
- (define n*n*n   (cantor-list/e nat/e nat/e nat/e))
- (define n*n*n*n (cantor-list/e nat/e nat/e nat/e nat/e))
- 
-
- (check-range? n*n*n  0  1 '((0 0 0)))
- (check-range? n*n*n  1  4 '((0 0 1) (0 1 0) (1 0 0)))
- (check-range? n*n*n  4 10 '((0 0 2) (1 1 0) (0 1 1) (1 0 1) (0 2 0) (2 0 0)))
- (check-range? n*n*n 10 20 '((0 0 3) (0 3 0) (3 0 0)
-                             (0 1 2) (1 0 2) (0 2 1) (1 2 0) (2 0 1) (2 1 0)
-                             (1 1 1))))
-
-(test-begin
- (check-bijection? (cantor-vec/e string/e nat/e real/e))
- (check-bijection? (cantor-list/e string/e nat/e real/e))
- (check-bijection? (cantor-list/e)))
-
-(test-begin
- (define n*n     (box-list/e nat/e nat/e))
- (check-range? n*n  0  1 '((0 0)))
- (check-range? n*n  1  4 '((0 1) (1 0) (1 1)))
- (check-range? n*n  4  9 '((0 2) (1 2) (2 1) (2 0) (2 2))))
-(test-begin
- (define n*n*n   (box-list/e nat/e nat/e nat/e))
-
- (check-range? n*n*n  0  1 '((0 0 0)))
- (check-range? n*n*n  1  8 '((0 0 1) (0 1 1) (0 1 0)
-                             
-                             (1 0 0) (1 0 1) (1 1 0) (1 1 1)))
- (check-range? n*n*n  8 27 '((0 0 2) (0 1 2) (0 2 2)
-                             (0 2 0) (0 2 1)
-
-                             (1 0 2) (1 1 2) (1 2 2)
-                             (1 2 0) (1 2 1)
-
-                             (2 0 0) (2 0 1) (2 0 2)
-                             (2 1 0) (2 1 1) (2 1 2)
-                             (2 2 0) (2 2 1) (2 2 2))))
-
-(test-begin
- (check-bijection? (box-vec/e string/e nat/e real/e))
- (check-bijection? (box-list/e string/e nat/e real/e))
- (check-bijection? (box-list/e)))
-
-;; helper
-(test-begin
- (check-equal? (list->inc-set '(2 0 1 2)) '(2 3 5 8))
- (check-equal? (inc-set->list '(2 3 5 8)) '(2 0 1 2)))
-
-;; multi-arg map/e test
-(define sums/e
-  (map/e
-   cons
-   (λ (x-y)
-      (values (car x-y) (cdr x-y)))
-   (from-list/e '(1 2))
-   (from-list/e '(3 4))))
-
-(test-begin
- (check-bijection? sums/e))
-
-;; dep/e tests
-(define (up-to n)
-  (below/e (add1 n)))
-(define 3-up
-  (dep/e
-   (from-list/e '(0 1 2))
-   up-to))
-
-(define from-3
-  (dep/e
-   (from-list/e '(0 1 2))
-   nat+/e))
-
-(define nats-to
-  (dep/e nat/e up-to))
-
-(define nats-up
-  (dep/e nat/e nat+/e))
-
-(test-begin
- (check-equal? (size 3-up) 6)
- (check-equal? (from-nat 3-up 0) (cons 0 0))
- (check-equal? (from-nat 3-up 1) (cons 1 0))
- (check-equal? (from-nat 3-up 2) (cons 1 1))
- (check-equal? (from-nat 3-up 3) (cons 2 0))
- (check-equal? (from-nat 3-up 4) (cons 2 1))
- (check-equal? (from-nat 3-up 5) (cons 2 2))
- (check-bijection? 3-up)
-
- (check-equal? (size from-3) +inf.0)
- (check-equal? (from-nat from-3 0) (cons 0 0))
- (check-equal? (from-nat from-3 1) (cons 1 1))
- (check-equal? (from-nat from-3 2) (cons 2 2))
- (check-equal? (from-nat from-3 3) (cons 0 1))
- (check-equal? (from-nat from-3 4) (cons 1 2))
- (check-equal? (from-nat from-3 5) (cons 2 3))
- (check-equal? (from-nat from-3 6) (cons 0 2))
- (check-bijection? from-3)
-
- (check-equal? (size nats-to) +inf.0)
- (check-equal? (from-nat nats-to 0) (cons 0 0))
- (check-equal? (from-nat nats-to 1) (cons 1 0))
- (check-equal? (from-nat nats-to 2) (cons 1 1))
- (check-equal? (from-nat nats-to 3) (cons 2 0))
- (check-equal? (from-nat nats-to 4) (cons 2 1))
- (check-equal? (from-nat nats-to 5) (cons 2 2))
- (check-equal? (from-nat nats-to 6) (cons 3 0))
- (check-bijection? nats-to)
-
- (check-equal? (size nats-up) +inf.0)
- (check-equal? (from-nat nats-up 0) (cons 0 0))
- (check-equal? (from-nat nats-up 1) (cons 0 1))
- (check-equal? (from-nat nats-up 2) (cons 1 1))
- (check-equal? (from-nat nats-up 3) (cons 0 2))
- (check-equal? (from-nat nats-up 4) (cons 1 2))
- (check-equal? (from-nat nats-up 5) (cons 2 2))
- (check-equal? (from-nat nats-up 6) (cons 0 3))
- (check-equal? (from-nat nats-up 7) (cons 1 3))
-
- (check-bijection? nats-up))
-
-;; find-size tests
-(check-equal? (find-size (gvector) 5) #f)
-(check-equal? (find-size (gvector 5) 4) 0)
-(check-equal? (find-size (gvector 1 5 7) 0) 0)
-(check-equal? (find-size (gvector 1 5 7) 1) 1)
-(check-equal? (find-size (gvector 1 5 7) 4) 1)
-(check-equal? (find-size (gvector 1 5 7) 5) 2)
-(check-equal? (find-size (gvector 1 5 7) 6) 2)
-(check-equal? (find-size (gvector 1 5 7) 7) #f) 
-
-;; depend/e tests
-;; same as dep unless the right side is finite
-(define 3-up-2
-  (dep/e
-   (from-list/e '(0 1 2))
-   up-to))
-
-(define nats-to-2
-  (dep/e nat/e up-to))
-
-(test-begin
- (check-equal? (size 3-up-2) 6)
- (check-equal? (from-nat 3-up-2 0) (cons 0 0))
- (check-equal? (from-nat 3-up-2 1) (cons 1 0))
- (check-equal? (from-nat 3-up-2 2) (cons 1 1))
- (check-equal? (from-nat 3-up-2 3) (cons 2 0))
- (check-equal? (from-nat 3-up-2 4) (cons 2 1))
- (check-equal? (from-nat 3-up-2 5) (cons 2 2))
- 
- (check-equal? (to-nat 3-up-2 (cons 0 0)) 0)
- (check-equal? (to-nat 3-up-2 (cons 1 0)) 1)
- (check-equal? (to-nat 3-up-2 (cons 1 1)) 2)
- (check-equal? (to-nat 3-up-2 (cons 2 0)) 3)
-
- (check-equal? (size nats-to-2) +inf.0)
- (check-equal? (to-nat nats-to-2 (cons 0 0)) 0)
- (check-equal? (to-nat nats-to-2 (cons 1 0)) 1)
- (check-equal? (to-nat nats-to-2 (cons 1 1)) 2)
- (check-equal? (to-nat nats-to-2 (cons 2 0)) 3)
- (check-equal? (to-nat nats-to-2 (cons 2 1)) 4)
- (check-equal? (to-nat nats-to-2 (cons 2 2)) 5)
- (check-equal? (to-nat nats-to-2 (cons 3 0)) 6)
-
- (check-equal? (from-nat nats-to-2 0) (cons 0 0))
- (check-equal? (from-nat nats-to-2 1) (cons 1 0))
- (check-equal? (from-nat nats-to-2 2) (cons 1 1))
- (check-equal? (from-nat nats-to-2 3) (cons 2 0))
- (check-equal? (from-nat nats-to-2 4) (cons 2 1))
- (check-equal? (from-nat nats-to-2 5) (cons 2 2))
- (check-equal? (from-nat nats-to-2 6) (cons 3 0)))
-
-;; take/e test
-(define to-2 (up-to 2))
-(test-begin
- (check-equal? (size to-2) 3)
- (check-equal? (from-nat to-2 0) 0)
- (check-equal? (from-nat to-2 1) 1)
- (check-equal? (from-nat to-2 2) 2)
- (check-bijection? to-2))
-
-;; slic/e test
-(test-begin
- (check-equal? (to-list (slice/e nat/e 3 5)) '(3 4))
- (check-bijection? (slice/e nat/e 3 5)))
-
-;; to-list test
-(test-begin
- (check-equal? (to-list (up-to 3))
-               '(0 1 2 3)))
-
-;; except/e test
-
-(define not-3 (except/e nat/e 3))
-(test-begin
- (check-equal? (from-nat not-3 0) 0)
- (check-equal? (from-nat not-3 3) 4)
- (check-bijection? not-3))
-
-;; fold-enum tests
-(define complicated
-  (fold-enum
-   (λ (excepts n)
-      (apply except/e (up-to n) excepts))
-   '(2 4 6)))
-(test-begin
- (check-bijection? complicated))
-
-;; many/e tests
-(define natss
-  (many/e nat/e))
-(test-begin
- (check-bijection? natss))
-
-(define emptys/e
-  (many/e empty/e))
-(test-begin
- (check-equal? (from-nat emptys/e 0) '())
- (check-bijection? emptys/e))
-
-
-(define (to-str e print?)
-  (define sp (open-output-string))
-  (if print?
-      (print e sp)
-      (write e sp))
-  (get-output-string sp))
-;; printer tests
-(check-equal? (to-str nat/e #t) "#<enum: 0 1 2 3 4 5 6 7 8 9 10...>")
-(check-equal? (to-str (cons/e nat/e nat/e) #t) "#<enum: '(0 . 0) '(0 . 1) '(1 . 0)...>")
-(check-equal? (to-str (cons/e nat/e nat/e) #f) "#<enum: (0 . 0) (0 . 1) (1 . 0)...>")
-(check-equal? (to-str (const/e 0) #t) "#<enum: 0>")
-
-;; just check that it doesn't crash when we get deep nesting
-;; (checks that we end up in the case that just uses the string
-;; in the implementation of the enumerator printer)
-(check-equal? (string? (to-str
-                        (map/e (λ (i)
-                                 (map/e (λ (j)
-                                          (map/e (λ (k) (+ i j k))
-                                                 (λ (_) (error 'ack))
-                                                 nat/e))
-                                        (λ (_) (error 'ack))
-                                        nat/e))
-                               (λ (_) (error 'ack))
-                               nat/e)
-                        #t))
-              #t)
diff --git a/pkgs/data-pkgs/data-test/tests/data/gvector.rkt b/pkgs/data-pkgs/data-test/tests/data/gvector.rkt
deleted file mode 100644
index d1ff5a8214..0000000000
--- a/pkgs/data-pkgs/data-test/tests/data/gvector.rkt
+++ /dev/null
@@ -1,170 +0,0 @@
-#lang racket/base
-(require data/gvector
-         racket/dict
-         rackunit)
-
-(test-equal? "gvector"
-             (gvector->vector (gvector 1 2 3))
-             '#(1 2 3))
-
-(test-equal? "gvector-add! (one)"
-             (gvector->vector
-              (let ([gv (make-gvector)])
-                (for ([x '(1 2 3)])
-                  (gvector-add! gv x))
-                gv))
-             '#(1 2 3))
-
-(test-equal? "gvector-add! (multi)"
-             (gvector->vector
-              (let ([gv (make-gvector)])
-                (gvector-add! gv 1 2 3)
-                gv))
-             '#(1 2 3))
-
-(test-equal? "gvector-add! (lots)"
-             (let ()
-               (define g (gvector))
-               (apply gvector-add! g (build-list 11 values))
-               (gvector->vector g))
-             (for/vector ([i 11]) i))
-
-(test-equal? "gvector-ref"
-             (let ([gv (gvector 1 2 3)])
-               ;; 3 valid refs + 1 not-found
-               (for/list ([index '(0 1 2 3)])
-                 (gvector-ref gv index #f)))
-             '(1 2 3 #f))
-
-(test-equal? "gvector-set! (in range)"
-             (let ([gv (gvector 1 2 3)])
-               (gvector-set! gv 1 'apple)
-               (gvector->vector gv))
-             '#(1 apple 3))
-
-(test-equal? "gvector-set! as add"
-             (let ([gv (gvector 1 2 3)])
-               (gvector-set! gv 3 4)
-               (gvector->vector gv))
-             '#(1 2 3 4))
-
-(test-equal? "gvector-remove! at end"
-             (let ([gv (gvector 1 2 3)])
-               (gvector-remove! gv 2)
-               (gvector->vector gv))
-             '#(1 2))
-
-(test-equal? "gvector-remove! at beginning"
-             (let ([gv (gvector 1 2 3)])
-               (gvector-remove! gv 0)
-               (gvector->vector gv))
-             '#(2 3))
-
-(test-equal? "gvector-remove-last!"
-             (let ([gv (gvector 1 2 3)])
-               (check-equal? (gvector-remove-last! gv) 3)
-               (check-equal? (gvector-remove-last! gv) 2)
-               (check-equal? (gvector-remove-last! gv) 1)
-               (gvector->vector gv))
-             '#())
-
-(test-equal? "gvector-add and gvector-remove-last!"
-             (let ([gv (gvector)])
-               (gvector-add! gv 'rock)
-               (gvector-add! gv 'paper)
-               (check-equal? (gvector-remove-last! gv) 'paper)
-               (gvector-add! gv 'scissor)
-               (check-equal? (gvector-remove-last! gv) 'scissor)
-               (check-equal? (gvector-remove-last! gv) 'rock)
-               (gvector->vector gv))
-             '#())
-
-(test-equal? "gvector-count"
-             (gvector-count (gvector 1 2 3))
-             3)
-
-(test-equal? "gvector-count / add"
-             (let ([gv (gvector 1 2 3)])
-               (gvector-add! gv 4 5 6)
-               (gvector-count gv))
-             6)
-
-(test-equal? "in-gvector"
-             (let ([gv (gvector 1 2 3)])
-               (for/list ([x (in-gvector gv)]) x))
-             '(1 2 3))
-
-(test-equal? "in-gvector expression form"
-             (let* ([gv (gvector 1 2 3)]
-                    [gv-sequence (in-gvector gv)])
-               (for/list ([x gv-sequence]) x))
-             '(1 2 3))
-
-(test-equal? "gvector as sequence"
-             (let ([gv (gvector 1 2 3)])
-               (for/list ([x gv]) x))
-             '(1 2 3))
-
-(test-equal? "for/gvector"
-             (gvector->vector (for/gvector ([x '(1 2 3)]) x))
-             '#(1 2 3))
-
-(test-case "gvector, lots of adds"
-  (let ([gv (make-gvector)])
-    (for ([x (in-range 0 1000)])
-      (gvector-add! gv x))
-    (for ([x (in-range 0 1000)])
-      (check-equal? (gvector-ref gv x) x))
-    (check-equal? (gvector-count gv) 1000)))
-
-(test-equal? "gvector, dict-map"
-             (dict-map (gvector 1 2 3) list)
-             '((0 1) (1 2) (2 3)))
-(test-equal? "gvector, dict-ref"
-             (dict-ref (gvector 1 2 3) 0)
-             1)
-
-(test-equal? "gvector, dict-ref out of range"
-             (dict-ref (gvector 1 2 3) 5 #f)
-             #f)
-
-(test-equal? "gvector, equals, empty"
-             (gvector)
-             (make-gvector #:capacity 50))
-
-(test-case "gvector, equals"
-  (let ([g1 (make-gvector)]
-        [g2 (make-gvector)])
-    (for ([x (in-range 1000)])
-      (check-equal? g1 g2)
-      (check-equal? (equal-hash-code g1) (equal-hash-code g2))
-      (gvector-add! g1 x)
-      (gvector-add! g2 x))))
-
-(test-case "gvector, equals, w cycles"
-  (let ([g1 (make-gvector)]
-        [g2 (make-gvector)])
-    (for ([x (in-range 10)])
-      (check-equal? g1 g2)
-      (check-equal? (equal-hash-code g1) (equal-hash-code g2))
-      (gvector-add! g1 (if (zero? (modulo x 2)) g1 g2))
-      (gvector-add! g2 (if (zero? (modulo x 3)) g1 g2)))))
-
-(test-case "gvector, not equal, same length"
-  (check-not-equal? (gvector 1) (gvector 2)))
-
-(test-case "gvector, not equal, extension"
-  (check-not-equal? (gvector 1) (gvector 1 2)))
-
-(test-case "gvector on large list"
-  (let ([g (apply gvector (for/list ([i 100]) i))])
-    (check-pred gvector? g)
-    (for ([i 100])
-      (check-equal? (gvector-ref g i) i))))
-
-(test-case "gvector remove all, shrinks"
-  (let ([g (make-gvector)])
-    (for ([i 100]) (gvector-add! g i))
-    (for ([i 100])
-      (gvector-remove-last! g))
-    (check-equal? g (gvector))))
diff --git a/pkgs/data-pkgs/data-test/tests/data/heap.rkt b/pkgs/data-pkgs/data-test/tests/data/heap.rkt
deleted file mode 100644
index dcfd95c231..0000000000
--- a/pkgs/data-pkgs/data-test/tests/data/heap.rkt
+++ /dev/null
@@ -1,239 +0,0 @@
-#lang racket
-(require rackunit
-         data/heap
-         (submod data/heap test-util))
-
-(define (mkheap) (vector->heap <= (vector 6 2 4 10 8)))
-
-(test-equal? "heap->vector"
-  (heap->vector (mkheap))
-  '#(2 4 6 8 10))
-
-(test-equal? "heap-add! min"
-  (let ([h (mkheap)])
-    (heap-add! h 0)
-    (heap->vector h))
-  '#(0 2 4 6 8 10))
-
-(test-equal? "heap-add! mid"
-  (let ([h (mkheap)])
-    (heap-add! h 5)
-    (heap->vector h))
-  '#(2 4 5 6 8 10))
-
-(test-equal? "heap-add! multi"
-  (let ([h (mkheap)])
-    (heap-add! h 0 5 12)
-    (heap->vector h))
-  '#(0 2 4 5 6 8 10 12))
-
-(test-equal? "heap-remove-min!"
-  (let ([h (mkheap)])
-    (heap-remove-min! h)
-    (heap->vector h))
-  '#(4 6 8 10))
-
-(test-equal? "heap-remove!"
-  (let ([h (mkheap)])
-    (heap-remove! h 4)
-    (heap->vector h))
-  '#(2 6 8 10))
-
-(define (rand-test range count1 count2 count3)
-  (let ([h (make-heap <=)]
-        [xs null]) ;; mutated
-    (define (fill! count)
-      (for ([i (in-range count)])
-        (let ([x (random range)])
-          (heap-add! h x)
-          (set! xs (cons x xs))))
-      (set! xs (sort xs <)))
-
-    (fill! count1)
-
-    ;; check equal (non-destructive)
-    (check-equal? (vector->list (heap->vector h))
-                  xs)
-
-    (for ([i (in-range count2)])
-      (let ([xl (car xs)]
-            [xh (heap-min h)])
-        (set! xs (cdr xs))
-        (heap-remove-min! h)))
-
-    (fill! count3)
-
-    (for ([x (in-list xs)])
-      (check-equal? (heap-min h) x)
-      (heap-remove-min! h))
-
-    (check-equal? (heap-count h) 0)))
-  
-(test-case "heap random sparse"
-  (rand-test 1000 100 50 100))
-
-(test-case "heap random dense"
-  (rand-test 20 100 50 100))
-
-(test-equal? "in-heap"
-  (for/list ([x (in-heap (mkheap))]) x)
-  '(2 4 6 8 10))
-(test-equal? "post in-heap count"
-   (let* ([h (mkheap)]
-          [lst (for/list ([x (in-heap h)]) x)])
-     (heap-count h))
-   (heap-count (mkheap)))
-(test-equal? "in-heap/consume!"
-  (for/list ([x (in-heap/consume! (mkheap))]) x)
-  '(2 4 6 8 10))
-(test-equal? "post in-heap/consume! count"
-   (let* ([h (mkheap)]
-          [lst (for/list ([x (in-heap/consume! h)]) x)])
-     (heap-count h))
-   0)
-
-(test-equal? "heap-sort"
-  (let ([v (vector 3 4 2 5 1)])
-    (heap-sort! v <=)
-    v)
-  '#(1 2 3 4 5))
-
-(test-equal? "heap-sort (old arg order)"
-  (let ([v (vector 3 4 2 5 1)])
-    (heap-sort! <= v)
-    v)
-  '#(1 2 3 4 5))
-
-(let* ([l (for/list ([i 1000]) (random 1000))]
-       [v (list->vector l)])
-  (test-equal? "heap-sort (random)"
-    (begin (heap-sort! v <=) (vector->list v))
-    (sort l <)))
-
-(define (heap-add!/v h v)
-  (heap-add! h v)
-  (unless (valid-heap? h) (error 'heap-add!/v "failed")))
-(define (heap-remove!/v h v)
-  (heap-remove! h v)
-  (unless (valid-heap? h) (error 'heap-remove!/v "post failed")))
-(define (heap-remove-min!/v h)
-  (heap-remove-min! h)
-  (unless (valid-heap? h) (error 'heap-remove-min!/v "post failed")))
-
-;; test case from PR14651
-(let ([h (make-heap <=)])
-  (heap-add!/v h 0)
-  (heap-add!/v h -5942)
-  (heap-add!/v h 8358)
-  (heap-add!/v h 569)
-  (heap-add!/v h 6723)
-  (heap-add!/v h -151)
-  (heap-add!/v h 6807)
-  (heap-add!/v h -1612)
-  (heap-remove-min!/v h)
-  (heap-add!/v h -1008)
-  (heap-add!/v h -7157)
-  (heap-add!/v h -1734)
-  (heap-add!/v h 6497)
-  (heap-add!/v h 1603)
-  (heap-add!/v h -7927)
-  (heap-remove!/v h -151)
-  (heap-add!/v h -349)
-  (heap-add!/v h -7570)
-  (heap-remove-min!/v h)
-  (heap-add!/v h 4008)
-  (heap-add!/v h 6101)
-  (heap-add!/v h -9013)
-  (heap-add!/v h -3447)
-  (heap-add!/v h -4294)
-  (heap-add!/v h 8187)
-  (heap-add!/v h 1465)
-  (heap-remove-min!/v h)
-  (heap-add!/v h -1598)
-  (heap-add!/v h 9730)
-  (heap-add!/v h -4429)
-  (heap-add!/v h -846)
-  (heap-add!/v h 4775)
-  (heap-add!/v h 3609)
-  (heap-add!/v h -3881)
-  (heap-add!/v h 6167)
-  (heap-add!/v h 6767)
-  (heap-remove-min!/v h)
-  (heap-add!/v h 2842)
-  (heap-add!/v h -4103)
-  (heap-add!/v h 154)
-  (heap-add!/v h 3748)
-  (heap-add!/v h -536)
-  (heap-add!/v h -5565)
-  (heap-add!/v h 4970)
-  (heap-add!/v h 4775)
-  (heap-add!/v h 4818)
-  (heap-add!/v h 5124)
-  (heap-add!/v h -8657)
-  (heap-add!/v h -6842)
-  (heap-remove-min!/v h)
-  (heap-add!/v h 2480)
-  (heap-add!/v h 8878)
-  (heap-add!/v h -1806)
-  (heap-remove-min!/v h)
-  (heap-add!/v h -8205)
-  (heap-remove!/v h 9730)
-  (heap-add!/v h -3164)
-  (heap-add!/v h 1589)
-  (heap-add!/v h 8444)
-  (heap-add!/v h -7839)
-  (heap-add!/v h -3810)
-  (heap-remove!/v h 4970)
-  ; -1612 out of position
-  (void))
-
-;; simpler test case from PR14651
-(let ([heap (make-heap <=)])
-  (heap-add!/v heap 43)
-  (heap-add!/v heap 1)
-  (heap-add!/v heap 37)
-  (heap-add!/v heap 81)
-  (heap-add!/v heap 94)
-  (heap-add!/v heap 4)
-  (heap-remove!/v heap 94))
-
-(define (random-test)
-  (define heap (make-heap <=))
-  (let loop ([ops '()]
-             [values '()])
-    (cond
-      [(not (valid-heap? heap))
-       (eprintf "crash! ~a ops\n" (length ops))
-       (pretty-write `(let ([heap (make-heap <=)]) ,@(reverse ops))
-                     (current-error-port))]
-      [(= (length ops) 50)
-       (void)]
-      [else
-       (define (do-an-add)
-         (define n (random 10))
-         (heap-add! heap n)
-         (loop (cons `(heap-add!/v heap ,n) ops)
-               (cons n values)))
-       (case (random 3)
-         [(0) (do-an-add)]
-         [(1)
-          (cond
-            [(null? values)
-             (do-an-add)]
-            [else
-             (define to-remove (list-ref values (random (length values))))
-             (heap-remove! heap to-remove)
-             (loop (cons `(heap-remove!/v heap ,to-remove) ops)
-                   (remove to-remove values))])]
-         [(2)
-          (cond
-            [(null? values)
-             (do-an-add)]
-            [else
-             (heap-remove-min! heap)
-             (define smallest (apply min values))
-             (loop (cons `(heap-remove-min!/v heap) ops)
-                   (remove smallest values))])])])))
-
-(for ([x (in-range 10000)])
-  (random-test))
diff --git a/pkgs/data-pkgs/data-test/tests/data/integer-set.rkt b/pkgs/data-pkgs/data-test/tests/data/integer-set.rkt
deleted file mode 100644
index b182fb5c0e..0000000000
--- a/pkgs/data-pkgs/data-test/tests/data/integer-set.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket/base
-(require data/integer-set
-         racket/stream
-         rackunit
-         racket/sequence)
-
-(test-equal? "integer-set"
-             (integer-set-contents (make-integer-set '((-1 . 2) (4 . 10))))
-             '((-1 . 2) (4 . 10)))
-
-(test-true "integer-set?"
-           (integer-set? (make-integer-set '((-1 . 2) (4 . 10)))))
-
-(test-equal? "set-integer-set-contents!"
-             (let ([s (make-integer-set '((-1 . 2) (4 . 10)))])
-               (set-integer-set-contents! s '((1 . 1) (3 . 3)))
-               (integer-set-contents s))
-             '((1 . 1) (3 . 3)))
-
-(test-true "well-formed-set? true"
-           (well-formed-set? '((-1 . 2) (4 . 10))))
-
-(test-false "well-formed-set? false"
-            (well-formed-set? '((1 . 5) (6 . 7))))
-
-(define s1 (make-integer-set '((-1 . 2) (4 . 10))))
-(define s2 (make-integer-set '((1 . 1) (3 . 3))))
-
-(check-true (member? 1 (intersect s1 s2)))
-(check-false (member? 3 (intersect s1 s2)))
-
-(check-true (member? 2 (union s1 s2)))
-(check-false (member? 15 (union s1 s2)))
-
-(check-true (member? 4 (subtract s1 s2)))
-(check-false (member? 1 (subtract s1 s2)))
-
-(check-true (member? 4 (symmetric-difference s1 s2)))
-(check-true (member? 3 (symmetric-difference s1 s2)))
-(check-false (member? 1 (symmetric-difference s1 s2)))
-
-(check-equal? (count s1) 11)
-(check-equal? (count s2) 2)
-
-(check-true (member? (get-integer s1) s1))
-(check-false (get-integer (make-integer-set '())))
-
-(check-equal? (partition (list (make-integer-set '((1 . 2) (5 . 10)))
-                               (make-integer-set '((2 . 2) (6 . 6) (12 . 12)))))
-              (list (make-integer-set '((2 . 2) (6 . 6)))
-                    (make-integer-set '((12 . 12)))
-                    (make-integer-set '((1 . 1) (5 . 5) (7 . 10)))))
-
-(check-true (subset? (make-integer-set '((1 . 1))) s2))
-
-;; check gen:stream
-(check-equal? (stream-first s1) -1)
-(check-equal? (stream-first (stream-rest s1)) 0)
-(check-equal? (stream-first (stream-rest s2)) 3)
-(check-true (stream-empty? (make-integer-set '())))
-(check-false (stream-empty? s1))
-(check-equal? (stream->list (stream-map add1 s2)) '(2 4))
-
-;; 2013-02-20: checks commit bd1141c670bfc7981761fbfb53f548c2abb1f12d
-;; (previous version results in contract error)
-(check-true (well-formed-set? (integer-set-contents (stream-rest (make-range 1 10)))))
-(check-true (well-formed-set? (integer-set-contents (sequence-tail (make-range 1 10) 1))))
diff --git a/pkgs/data-pkgs/data-test/tests/data/order.rkt b/pkgs/data-pkgs/data-test/tests/data/order.rkt
deleted file mode 100644
index 61f121501f..0000000000
--- a/pkgs/data-pkgs/data-test/tests/data/order.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang racket/base
-(require rackunit
-         data/order)
-
-;; for tests
-(struct fish (kind) #:transparent)
-(struct fowl (kind) #:transparent)
-
-;; datum-order tests
-
-(define-syntax-rule (t cmp x y)
-  (test-case (format "~s" '(t cmp x y))
-    (check-equal? (datum-order x y) 'cmp)))
-
-(t = 1 1)
-(t = +inf.0 +inf.0)
-(t = 8.0 8.0)
-(t = +nan.0 +nan.0)
-(t = +nan.0 (- +inf.0 +inf.0))
-(t = 'apple 'apple)
-(t = '(a #:b c) '(a #:b c))
-(t = "apricot" "apricot")
-(t = '#(1 2 3) '#(1 2 3))
-(t = (box 'car) (box 'car))
-(t = (box 'car) '#&car)
-(t = '#s(point a 1) '#s(point a 1))
-(t = (fish 'alewife) (fish 'alewife))
-
-(t < 1 2)
-(t > 8.0 5.0)
-(t < 'apple 'candy)
-(t < '(a #:b c) '(a #:c d c))
-(t > '(5 . 4) '(3 2 1))
-(t < '(a b . c) '(a b . z))
-(t > "apricot" "apple")
-(t > '#(1 2 3) '#(1 2))
-(t < '#(1 2 3) '#(1 3))
-(t > (box 'car) (box 'candy))
-(t < '#s(point a 1) '#s(point b 0))
-(t < '#s(A 1 2) '#s(Z 3 4 5))
-(t < (fish 'alewife) (fish 'sockeye))
-
-(define-syntax-rule (tc x y)
-  (test-case (format "~s" '(tc x y))
-    (let ([xy (datum-order x y)]
-          [xy2 (datum-order x y)]
-          [yx (datum-order y x)]
-          [xy3 (datum-order x y)])
-      ;; check consistency across multiple runs
-      (check-equal? xy xy2)
-      (check-equal? xy xy3)
-      ;; check oppositeness
-      (check member (list xy yx) '((< >) (> <))))))
-
-(tc 1 2.0)
-(tc 3+5i 3+2i)
-(tc 'apple "zucchini")
-(tc '(a b) '(a b . c))
-(tc 0 'zero)
-
-(tc (fish 'alewife) (fowl 'dodo))
-
-(tc (fish 'alewife)
-    (let ()
-      (struct fish (x))
-      (fish 'alewife)))
diff --git a/pkgs/data-pkgs/data-test/tests/data/ordered-dict.rkt b/pkgs/data-pkgs/data-test/tests/data/ordered-dict.rkt
deleted file mode 100644
index 6a463bd75c..0000000000
--- a/pkgs/data-pkgs/data-test/tests/data/ordered-dict.rkt
+++ /dev/null
@@ -1,283 +0,0 @@
-#lang racket/base
-(require rackunit
-         racket/contract
-         racket/dict
-         data/skip-list
-         data/splay-tree
-         data/order)
-
-;; Tests for ordered dictionaries
-;;   - skip-list
-;;   - splay-tree (both kinds)
-
-(define-syntax-rule (rand-test dicts ordered? idk?
-                               (-ref
-                                -set!
-                                -remove!
-                                -count
-                                -has-key?
-                                -iterate-key
-                                -iterate-least/>?
-                                -iterate-least/>=?
-                                -iterate-greatest/<?
-                                -iterate-greatest/<=?))
-  (let ([hash (make-hash)])
-    (for ([c (in-range 100)])
-      (let* ([k (- (random 2000) 1000)]
-             [v (- (random 2000) 1000)])
-        (hash-set! hash k v)
-        (for ([d dicts])
-          (-set! d k v))))
-
-    (for ([d dicts])
-      (check-equal? (hash-count hash)
-                    (-count d)))
-
-    ;; Sequential access
-    (for ([i (in-range -1000 1000)])
-      (for ([d dicts])
-        (let ([vh (hash-ref hash i 'not-there)]
-              [vd (-ref d i 'not-there)])
-          (check-equal? vh vd (format "dict ~e, key = ~s, value = ~s, expected = ~s"
-                                      d i vd vh)))))
-
-    ;; Random removal
-    (for ([i (in-range 500)])
-      (let ([k (- (random 2000) 1000)])
-        (for ([d dicts])
-          (hash-remove! hash k)
-          (-remove! d k)
-          (check-equal? (hash-count hash) (-count d)))))
-
-    (when ordered?
-      (for ([c (in-range 100)])
-        (let* ([k0 (- (random 2000) 1000)])
-          (for ([d dicts])
-            (let* ([has? (-has-key? d k0)]
-                   [l>i (-iterate-least/>? d k0)]
-                   [l>=i (-iterate-least/>=? d k0)]
-                   [g<i (-iterate-greatest/<? d k0)]
-                   [g<=i (-iterate-greatest/<=? d k0)]
-                   [l> (and l>i (-iterate-key d l>i))]
-                   [l>= (and l>=i (-iterate-key d l>=i))]
-                   [g< (and g<i (-iterate-key d g<i))]
-                   [g<= (and g<=i (-iterate-key d g<=i))])
-              (when has?
-                (check-equal? l>= g<= "has, should be same"))
-              (unless has?
-                (check-equal? l> l>= "not has, should be same")
-                (check-equal? g< g<= "not has, should be same"))
-              (when l> (check > l> k0))
-              (when l>= (check >= l>= k0))
-              (when g< (check < g< k0))
-              (when g<= (check <= g<= k0))
-              (when idk?
-                (for ([k (in-dict-keys d)])
-                  (when (and l> (and (> k k0) (< k l>))) (error "l>"))
-                  (when (and l>= (and (>= k k0) (< k l>=))) (error "l>="))
-                  (when (and g< (and (< k k0) (> k g<))) (error "g<"))
-                  (when (and g<= (and (<= k k0) (> k g<=))) (error "g<=")))))))))))
-
-;; Test dict interface
-
-(define (dict-test dicts ordered? [idk? #f])
-  (rand-test dicts ordered? idk?
-             (dict-ref
-              dict-set!
-              dict-remove!
-              dict-count
-              dict-has-key?
-              dict-iterate-key
-              dict-iterate-least/>?
-              dict-iterate-least/>=?
-              dict-iterate-greatest/<?
-              dict-iterate-greatest/<=?)))
-
-(test-case "skip-list, datum-order, dict interface"
-  (dict-test (list (make-skip-list)) #t #t))
-(test-case "skip-list, < = order, dict interface"
-  (dict-test (list (make-skip-list (order 'my-order any/c = <))) #t #t))
-(test-case "adjustable-skip-list, dict interface"
-  (dict-test (list (make-adjustable-skip-list)) #t #t))
-
-(test-case "splay-tree, datum-order, dict interface"
-  (dict-test (list (make-splay-tree)) #t #t))
-(test-case "splay-tree, < = order, dict interface"
-  (dict-test (list (make-splay-tree (order 'mine any/c = <))) #t #t))
-(test-case "adjustable-splay-tree, dict interface"
-  (dict-test (list (make-adjustable-splay-tree)) #t #t))
-
-(provide dict-test)
-
-;; Test splay-tree interface
-
-(define (splay-test dicts ordered? [idk? #f])
-  (rand-test dicts ordered? idk?
-             (splay-tree-ref
-              splay-tree-set!
-              splay-tree-remove!
-              splay-tree-count
-              dict-has-key?
-              splay-tree-iterate-key
-              splay-tree-iterate-least/>?
-              splay-tree-iterate-least/>=?
-              splay-tree-iterate-greatest/<?
-              splay-tree-iterate-greatest/<=?)))
-
-(test-case "splay-tree, datum-order, custom interface"
-  (splay-test (list (make-splay-tree)) #t #t))
-(test-case "splay-tree, < = order, custom interface"
-  (splay-test (list (make-splay-tree (order 'mine any/c = <))) #t #t))
-
-(test-case "adjustable-splay-tree, custom interface"
-  (splay-test (list (make-adjustable-splay-tree)) #t #t))
-
-(provide splay-test)
-
-;; Test skip-list interface
-
-(define (skip-test dicts ordered? [idk? #f])
-  (rand-test dicts ordered? idk?
-             (skip-list-ref
-              skip-list-set!
-              skip-list-remove!
-              skip-list-count
-              dict-has-key?
-              skip-list-iterate-key
-              skip-list-iterate-least/>?
-              skip-list-iterate-least/>=?
-              skip-list-iterate-greatest/<?
-              skip-list-iterate-greatest/<=?)))
-
-(test-case "skip-list, datum-order, custom interface"
-  (skip-test (list (make-skip-list)) #t #t))
-
-(test-case "skip-list, < = order, custom interface"
-  (skip-test (list (make-skip-list (order 'mine any/c = <))) #t #t))
-
-(test-case "adjustable-skip-list, custom interface"
-  (skip-test (list (make-adjustable-skip-list)) #t #t))
-
-(provide skip-test)
-
-;; Test hash interface
-;; for speed comparison only
-
-(define (hash-test dicts ordered?)
-  (when ordered?
-    (error 'hash-tests "ordered not supported"))
-  (rand-test dicts #f #f
-             (hash-ref
-              hash-set!
-              hash-remove!
-              hash-count
-              hash-has-key?
-              '-iterate-key
-              '-iterate-least/>?
-              '-iterate-least/>=?
-              '-iterate-greatest/<?
-              '-iterate-greatest/<=?)))
-
-(provide hash-test)
-
-;; ============================================================
-;; Performance tests
-;; ============================================================
-
-(define (p name testf mkd ordered?)
-  (collect-garbage)
-  (collect-garbage)
-  (let-values ([(_result cpu real gc)
-                (time-apply
-                 (lambda ()
-                   (for ([i (in-range 20)])
-                     (testf (list (mkd)) ordered?)))
-                 null)])
-    (printf "~a : ~s\n" name cpu)))
-
-(define (mksplay) (make-splay-tree))
-(define (mkadj) (make-adjustable-splay-tree))
-(define (mkcsplay) (make-splay-tree real-order))
-(define (mkskip) (make-skip-list))
-(define (mkcskip) (make-skip-list real-order))
-
-(define (performance)
-  (display "Using ordered-dict interface, w/ search\n")
-  (p "splay-tree" dict-test mksplay #t)
-  (p "adj splay " dict-test mkadj #t)
-  (p "skip-list " dict-test mkskip #t)
-  (p "splay w/ c" dict-test mkcsplay #t)
-  (p "skip w/ c " dict-test mkcskip #t)
-  (newline)
-  (display "Using custom interfaces, w/ search\n")
-  (p "splay-tree" splay-test mksplay #t)
-  (p "adj splay " splay-test mkadj #t)
-  (p "skip-list " skip-test mkskip #t)
-  (p "splay w/ c" splay-test mkcsplay #t)
-  (p "skip w/ c " skip-test mkcskip #t)
-  (newline)
-  (display "Using custom interfaces, w/o search\n")
-  (p "splay-tree" splay-test mksplay #f)
-  (p "adj splay " splay-test mksplay #f)
-  (p "skip-list " skip-test mkskip #f)
-  (p "splay w/ c" splay-test mkcsplay #f)
-  (p "skip w/ c " skip-test mkcskip #f)
-  (p "hash      " hash-test make-hash #f)
-  (newline))
-
-(provide performance)
-
-(define (deep-test [test 'splay] [count 100])
-  (let ([mk (case test
-              ((splay) mksplay)
-              ((adj) mkadj)
-              ((skip) mkskip))])
-    (for ([seed (in-range count)])
-      (random-seed seed)
-      (printf "seed = ~s\n" seed)
-      (p "test" dict-test mk #t))))
-
-(provide deep-test)
-
-#|
-Recent run:
-
-  Using ordered-dict interface, w/ search
-  splay-tree : 3745
-  adj-splay  : 3640
-  skip-list  : 3920
-  splay w/ c : 5884
-  skip w/ c  : 6297
-
-  Using custom interfaces, w/ search
-  splay-tree : 3140
-  adj-splay  : 3128
-  skip-list  : 3428
-  splay w/ c : 3277
-  skip w/ c  : 3624
-
-  Using custom interfaces, w/o search
-  splay-tree : 2732
-  adj-splay  : 2736
-  skip-list  : 2976
-  splay w/ c : 2809
-  skip w/ c  : 3076
-  hash       : 3456
-
-Recent run with dict contracts bypassed (impl and client):
-(Requires multiple changes to code, not easy to automate.)
-
-  Using ordered-dict interface, w/ search
-  splay-tree : 3368
-  adj-splay  : 3472
-  skip-list  : 3276
-  splay w/ c : 4729
-  skip w/ c  : 5104
-
-Conclusions:
-
-  - per-inst contracts using dict interface are expensive,
-    but per-inst contracts using custom interface not that bad
-    (why?)
-
-|#
diff --git a/pkgs/data-pkgs/data-test/tests/data/queue.rkt b/pkgs/data-pkgs/data-test/tests/data/queue.rkt
deleted file mode 100644
index 43d5eedbb9..0000000000
--- a/pkgs/data-pkgs/data-test/tests/data/queue.rkt
+++ /dev/null
@@ -1,146 +0,0 @@
-#lang racket/base
-
-(require rackunit rackunit/text-ui 
-         data/queue
-         racket/stream)
-
-(run-tests
- (test-suite "queue.rkt"
-             (test-suite "queue-empty?"
-                         (test-case "make-queue"
-                                    (check-true (queue-empty? (make-queue))))
-                         (test-case "enqueue! once"
-                                    (let* ([q (make-queue)])
-                                      (enqueue! q 1)
-                                      (check-false (queue-empty? q))))
-                         (test-case "enqueue! once / dequeue! once"
-                                    (let* ([q (make-queue)])
-                                      (enqueue! q 1)
-                                      (dequeue! q)
-                                      (check-true (queue-empty? q))))
-                         (test-case "enqueue! twice"
-                                    (let* ([q (make-queue)])
-                                      (enqueue! q 1)
-                                      (enqueue! q 2)
-                                      (check-false (queue-empty? q))))
-                         (test-case "enqueue! twice / dequeue! once"
-                                    (let* ([q (make-queue)])
-                                      (enqueue! q 1)
-                                      (enqueue! q 2)
-                                      (dequeue! q)
-                                      (check-false (queue-empty? q))))
-                         (test-case "enqueue! twice / dequeue! twice"
-                                    (let* ([q (make-queue)])
-                                      (enqueue! q 1)
-                                      (enqueue! q 2)
-                                      (dequeue! q)
-                                      (dequeue! q)
-                                      (check-true (queue-empty? q)))))
-             (test-suite "length"
-                         (test-case "length empty"
-                                    (let* ([queue (make-queue)])
-                                      (check-equal? (queue-length queue) 0)))
-                         (test-case "length enqueue once"
-                                    (let* ([queue (make-queue)])
-                                      (enqueue! queue 5)
-                                      (check-equal? (queue-length queue) 1)))
-                         (test-case "length enqueue thrice dequeue once"
-                                    (let* ([queue (make-queue)])
-                                      (enqueue! queue 5)
-                                      (enqueue! queue 9)
-                                      (enqueue! queue 12)
-                                      (dequeue! queue)
-                                      (check-equal? (queue-length queue) 2))))
-             (test-suite "dequeue!"
-                         (test-case "make-queue"
-                                    (check-exn exn:fail? (lambda () (dequeue! (make-queue)))))
-                         (test-case "enqueue! once"
-                                    (let* ([q (make-queue)])
-                                      (enqueue! q 1)
-                                      (check-equal? (dequeue! q) 1)
-                                      (check-exn exn:fail? (lambda () (dequeue! q)))))
-                         (test-case "enqueue! twice"
-                                    (let* ([q (make-queue)])
-                                      (enqueue! q 1)
-                                      (enqueue! q 2)
-                                      (check-equal? (dequeue! q) 1)
-                                      (check-equal? (dequeue! q) 2)
-                                      (check-exn exn:fail? (lambda () (dequeue! q)))))
-                         (test-case "don't leak last element"
-                                    (let* ([thing (box 'box-that-queue-should-not-hold-onto)]
-                                           [wb (make-weak-box thing)]
-                                           [q (make-queue)])
-                                      (enqueue! q thing)
-                                      (set! thing #f)
-                                      (dequeue! q)
-                                      (collect-garbage)
-                                      (check-false (weak-box-value wb))
-                                      ;; need a reference to 'q' after looking in the
-                                      ;; box or else the whole queue gets collected
-                                      (check-true (queue? q)))))
-             (test-suite "queue misc"
-                         (test-case "queue as a sequence"
-                                    (let ([queue (make-queue)])
-                                      (enqueue! queue 1)
-                                      (enqueue! queue 2)
-                                      (enqueue! queue 3)
-                                      (check-equal? '(1 2 3) (for/list ([item (in-queue queue)]) item)))
-                                    (check-equal? '() (for/list ([item (in-queue (make-queue))]) item)))
-                         (test-case "queue to empty list"
-                                    (let ([queue (make-queue)])
-                                      (check-equal? (queue->list queue) '())))
-                         (test-case "queue length"
-                                    (let ([queue (make-queue)])
-                                      (enqueue! queue 1)
-                                      (enqueue! queue 2)
-                                      (enqueue! queue 3)
-                                      (check-equal? (queue->list queue) '(1 2 3)))))))
-
-;; try 1000 random tests
-(for ([x (in-range 1000)])
-  (define lst '())
-  (define deq (make-queue))
-  (define ops '())
-  
-  ;; try 30 random ops per test
-  (for ([op-number (in-range 30)])
-    
-    (case (random 5)
-      [(0) 
-       (define ele (random 100000))
-       (set! lst (cons ele lst))
-       (enqueue-front! deq ele)
-       (set! ops (cons `(add-front ,ele) ops))]
-      [(1)
-       (define ele (random 100000))
-       (set! lst (reverse (cons ele (reverse lst))))
-       (enqueue! deq ele)
-       (set! ops (cons `(add-back ,ele) ops))]
-      [(2)
-       (unless (null? lst)
-         (dequeue! deq)
-         (set! lst (cdr lst))
-         (set! ops (cons `(pop) ops)))]
-      [(3)
-       (set! lst (filter even? lst))
-       (queue-filter! deq even?)
-       (set! ops (cons `(filter even?) ops))]
-      [(4)
-       (set! lst (filter odd? lst))
-       (queue-filter! deq odd?)
-       (set! ops (cons `(filter odd?) ops))])
-    
-    ;; check to make sure the list
-    ;; and queue version match up
-    ;; after each of the ops
-    (define qlst (queue->list deq))
-    (unless (equal? lst qlst)
-      (error 'queue.rkt
-             "test failure, elements different: ~s\n  => ~s (queue)\n  => ~s (list)"
-             ops 
-             qlst lst))
-    (unless (= (length lst) (queue-length deq))
-      (error 'queue.rkt
-             "test failure, lengths different: ~s\n  => ~s (queue)\n  => ~s (list)"
-             ops 
-             (length lst) (queue-length deq)))))
diff --git a/pkgs/data-pkgs/data-test/tests/data/test-docs-complete.rkt b/pkgs/data-pkgs/data-test/tests/data/test-docs-complete.rkt
deleted file mode 100644
index 7a2e3e1b73..0000000000
--- a/pkgs/data-pkgs/data-test/tests/data/test-docs-complete.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote data/splay-tree))
-(check-docs (quote data/skip-list))
-(check-docs (quote data/queue))
-(check-docs (quote data/order))
-(check-docs (quote data/interval-map))
-(check-docs (quote data/heap))
-(check-docs (quote data/gvector))
diff --git a/pkgs/data-pkgs/data/LICENSE.txt b/pkgs/data-pkgs/data/LICENSE.txt
deleted file mode 100644
index f726bac6bb..0000000000
--- a/pkgs/data-pkgs/data/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-data
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/data-pkgs/data/info.rkt b/pkgs/data-pkgs/data/info.rkt
deleted file mode 100644
index 8ff065ebb0..0000000000
--- a/pkgs/data-pkgs/data/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("data-lib" "data-enumerate-lib" "data-doc"))
-(define implies '("data-lib" "data-enumerate-lib" "data-doc"))
-
-(define pkg-desc "Data strucutures")
-
-(define pkg-authors '(ryanc))
diff --git a/pkgs/datalog/LICENSE.txt b/pkgs/datalog/LICENSE.txt
deleted file mode 100644
index d05aab08a1..0000000000
--- a/pkgs/datalog/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-datalog
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/datalog/ast.rkt b/pkgs/datalog/ast.rkt
deleted file mode 100644
index 6b632dfb85..0000000000
--- a/pkgs/datalog/ast.rkt
+++ /dev/null
@@ -1,120 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match)
-
-(define srcloc/c
-  (or/c #f
-        (list/c any/c
-                (or/c exact-positive-integer? #f)
-                (or/c exact-nonnegative-integer? #f)
-                (or/c exact-nonnegative-integer? #f)
-                (or/c exact-positive-integer? #f))))
-
-(define-struct predicate-sym (srcloc sym) #:prefab)
-(define datum/c (or/c string? symbol? predicate-sym?))
-(define (datum-equal? x y)
-  (match* (x y)
-    [((predicate-sym _ x) y)
-     (datum-equal? x y)]
-    [(x (predicate-sym _ y))
-     (datum-equal? x y)]
-    [(x y)
-     (equal? x y)]))
-
-(define-struct variable (srcloc sym) #:prefab)  
-(define (variable-equal? v1 v2)
-  (eq? (variable-sym v1) (variable-sym v2)))
-(define-struct constant (srcloc value) #:prefab)
-(define (constant-equal? v1 v2)
-  (equal? (constant-value v1) (constant-value v2)))
-
-(define term/c (or/c variable? constant?))
-(define (term-equal? t1 t2)
-  (cond
-    [(and (variable? t1) (variable? t2))
-     (variable-equal? t1 t2)]
-    [(and (constant? t1) (constant? t2))
-     (constant-equal? t1 t2)]
-    [else
-     #f]))
-
-(define (terms-equal? t1 t2)
-  (and (= (length t1)
-          (length t2))
-       (andmap term-equal? t1 t2)))
-
-(define-struct literal (srcloc predicate terms) #:prefab)
-(define (literal-equal? l1 l2)
-  (and (datum-equal? (literal-predicate l1)
-                     (literal-predicate l2))
-       (terms-equal? (literal-terms l1) (literal-terms l2))))
-
-(define-struct external (srcloc predicate-sym predicate arg-terms ans-terms) #:prefab)
-(define (external-equal? e1 e2)
-  (match-define (external _1 _s1 p1 ar1 an1) e1)
-  (match-define (external _2 _s2 p2 ar2 an2) e2)
-  (and (equal? p1 p2)
-       (terms-equal? ar1 ar2)
-       (terms-equal? an1 an2)))
-
-(define question/c (or/c literal? external?))
-(define (question-equal? q1 q2)
-  (or (and (literal? q1) (literal? q2)
-           (literal-equal? q1 q2))
-      (and (external? q1) (external? q2)
-           (external-equal? q1 q2))))
-
-(define-struct clause (srcloc head body) #:prefab)
-(define (clause-equal? c1 c2)
-  (and (literal-equal? (clause-head c1)
-                       (clause-head c2))
-       (= (length (clause-body c1))
-          (length (clause-body c2)))
-       (andmap question-equal?
-               (clause-body c1)
-               (clause-body c2))))
-
-(define-struct assertion (srcloc clause) #:prefab)
-(define-struct retraction (srcloc clause) #:prefab)
-(define-struct query (srcloc question) #:prefab)
-
-(define statement/c (or/c assertion? retraction? query?))
-(define program/c (listof statement/c))
-
-(provide/contract
- [srcloc/c contract?]
- [datum/c contract?]
- [datum-equal? (datum/c datum/c . -> . boolean?)]
- [struct predicate-sym ([srcloc srcloc/c] [sym symbol?])]
- [struct variable ([srcloc srcloc/c]
-                   [sym symbol?])]
- [variable-equal? (variable? variable? . -> . boolean?)]
- [struct constant ([srcloc srcloc/c]
-                   [value any/c])]
- [constant-equal? (constant? constant? . -> . boolean?)]
- [term/c contract?]
- [term-equal? (term/c term/c . -> . boolean?)]
- [struct literal ([srcloc srcloc/c]
-                  [predicate (or/c predicate-sym? string? symbol?)]
-                  [terms (listof term/c)])]
- [literal-equal? (literal? literal? . -> . boolean?)]
- [struct external ([srcloc srcloc/c]
-                   [predicate-sym any/c]
-                   [predicate procedure?]
-                   [arg-terms (listof term/c)]
-                   [ans-terms (listof term/c)])]
- [external-equal? (external? external? . -> . boolean?)]
- [question/c contract?]
- [question-equal? (question/c question/c . -> . boolean?)]
- [struct clause ([srcloc srcloc/c]
-                 [head literal?]
-                 [body (listof question/c)])]
- [clause-equal? (clause? clause? . -> . boolean?)]
- [struct assertion ([srcloc srcloc/c]
-                    [clause clause?])]
- [struct retraction ([srcloc srcloc/c]
-                     [clause clause?])]
- [struct query ([srcloc srcloc/c]
-                [question question/c])]
- [statement/c contract?]
- [program/c contract?])
diff --git a/pkgs/datalog/eval.rkt b/pkgs/datalog/eval.rkt
deleted file mode 100644
index a2c3ade358..0000000000
--- a/pkgs/datalog/eval.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/contract
-         "ast.rkt"
-         "pretty.rkt"
-         "runtime.rkt")
-
-(define current-theory (make-parameter (make-theory)))
-
-(define (assume-if-safe assume thy s)
-  (let ([c (assertion-clause s)])
-    (if (safe-clause? c)
-        (assume thy c)
-        (raise-syntax-error 'datalog
-                            "Unsafe clause in assertion"
-                            (datum->syntax #f (format-statement s) (assertion-srcloc s))))))
-
-(define (print-questions ls)
-  (displayln
-   (format-questions ls)))
-
-(define (eval-program p)
-  (for-each eval-top-level-statement p))
-
-(define (eval-top-level-statement s)
-  (define v (eval-statement s))
-  (unless (void? v)
-    (print-questions v)))
-
-(define (eval-statement s)
-  (cond
-    [(assertion? s)
-     (assume-if-safe assume! (current-theory) s)]
-    [(retraction? s)
-     (retract! (current-theory) (retraction-clause s))]
-    [(query? s)
-     (prove (current-theory) (query-question s))]))
-
-(provide/contract
- [current-theory (parameter/c theory/c)]
- [print-questions ((listof question/c) . -> . void)]
- [eval-program (program/c . -> . void)]
- [eval-top-level-statement (statement/c . -> . void)]
- [eval-statement (statement/c . -> . (or/c void (listof question/c)))])
diff --git a/pkgs/datalog/info.rkt b/pkgs/datalog/info.rkt
deleted file mode 100644
index 1ae2a485b9..0000000000
--- a/pkgs/datalog/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection "datalog")
-
-(define scribblings '(["scribblings/datalog.scrbl" (multi-page) (language)]))
-
-(define compile-omit-paths '("tests"))
-(define deps '("base"
-               "parser-tools-lib"))
-(define build-deps '("racket-doc"
-                     "scribble-lib"))
-
-(define pkg-desc "An implementation of the Datalog language")
-
-(define pkg-authors '(jay))
diff --git a/pkgs/datalog/lang/configure-runtime.rkt b/pkgs/datalog/lang/configure-runtime.rkt
deleted file mode 100644
index eb066a168b..0000000000
--- a/pkgs/datalog/lang/configure-runtime.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/base
-
-(define (configure data)
-  (current-read-interaction the-read))
-(provide configure)
-
-(require datalog/parse
-         datalog/private/compiler)
-
-(define (the-read src ip)
-  (cond
-    [(or (not (char-ready? ip))
-         (eof-object? (peek-char ip)))
-     eof]
-    [else
-     (compile-statement
-      (parameterize ([current-source-name src])
-        (parse-statement ip)))]))
diff --git a/pkgs/datalog/lang/lang-info.rkt b/pkgs/datalog/lang/lang-info.rkt
deleted file mode 100644
index de16fd3575..0000000000
--- a/pkgs/datalog/lang/lang-info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-
-(define (get-info data)
-  (λ (key default)
-    (case key
-      [(configure-runtime)
-       '(#(datalog/lang/configure-runtime configure #f))]
-      [else
-       default])))
-(provide get-info)
diff --git a/pkgs/datalog/lang/reader.rkt b/pkgs/datalog/lang/reader.rkt
deleted file mode 100644
index 1821176116..0000000000
--- a/pkgs/datalog/lang/reader.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-(module reader syntax/module-reader
-  #:language 'datalog/sexp/lang
-  #:read (lambda ([in (current-input-port)]) (this-read-syntax #f in))
-  #:read-syntax this-read-syntax
-  #:whole-body-readers? #t  
-  #:language-info
-  '#(datalog/lang/lang-info get-info #f)
-  #:info (lambda (key defval default)
-           ; XXX Should have different comment character key
-           (case key
-             [(drracket:default-filters) '(["Datalog Sources" "*.dl"])]
-             [(drracket:default-extension) "dl"]
-             [(drracket:submit-predicate)
-              (dynamic-require 'datalog/tool/submit 'repl-submit?)]
-             [(color-lexer)
-              (dynamic-require 'datalog/tool/syntax-color 'get-syntax-token)]
-             [else (default key defval)]))
-  (require datalog/parse
-           datalog/private/compiler)
-  
-  (define (this-read-syntax [src #f] [in (current-input-port)])
-    (compile-program
-     (parameterize ([current-source-name src])
-       (parse-program in)))))
diff --git a/pkgs/datalog/main.rkt b/pkgs/datalog/main.rkt
deleted file mode 100644
index bfb4500756..0000000000
--- a/pkgs/datalog/main.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require "runtime.rkt"
-         "serialize.rkt"
-         "stx.rkt")
-(provide make-theory
-         theory/c
-         (all-from-out "serialize.rkt")
-         (all-from-out "stx.rkt"))
diff --git a/pkgs/datalog/parse.rkt b/pkgs/datalog/parse.rkt
deleted file mode 100644
index 4861c2b896..0000000000
--- a/pkgs/datalog/parse.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang racket/base
-(require parser-tools/lex
-         parser-tools/yacc
-         racket/list
-         racket/contract
-         "private/lex.rkt"
-         "ast.rkt")
-
-(define current-source-name (make-parameter #f))
-
-(define (make-srcloc start-pos end-pos)
-  (list (current-source-name) 
-        (position-line start-pos)
-        (position-col start-pos)
-        (position-offset start-pos)
-        (- (position-offset end-pos) (position-offset start-pos))))
-
-(define-values
-  (program-parser statement-parser clause-parser literal-parser)
-  (apply
-   values
-   (parser
-    (start program statement clause literal)
-    (end EOF)
-    (tokens dtokens dpunct)
-    (src-pos)
-    (error
-     (lambda (tok-ok? tok-name tok-value start-pos end-pos)
-       (raise-syntax-error 'datalog
-                           (if tok-ok?
-                               (format "Unexpected token ~S" tok-name)
-                               (format "Invalid token ~S" tok-name))
-                           (datum->syntax #f tok-value (make-srcloc start-pos end-pos)))))
-    (grammar
-     (program [(statements) $1])
-     (statements [() empty]
-                 [(statement statements) (list* $1 $2)])
-     (statement [(assertion) $1]
-                [(query) $1]
-                [(retraction) $1])
-     (assertion [(clause DOT) (make-assertion (make-srcloc $1-start-pos $2-end-pos) $1)])
-     (retraction [(clause TILDE) (make-retraction (make-srcloc $1-start-pos $2-end-pos) $1)])
-     (query [(literal QMARK) (make-query (make-srcloc $1-start-pos $2-end-pos) $1)])
-     (clause [(literal TSTILE body) (make-clause (make-srcloc $1-start-pos $3-end-pos) $1 $3)]
-             [(literal) (make-clause (make-srcloc $1-start-pos $1-end-pos) $1 empty)])
-     (body [(literal COMMA body) (list* $1 $3)]
-           [(literal) (list $1)])
-     (literal [(predicate-sym LPAREN RPAREN) (make-literal (make-srcloc $1-start-pos $3-end-pos) $1 empty)]
-              [(predicate-sym LPAREN terms RPAREN) (make-literal (make-srcloc $1-start-pos $4-end-pos) $1 $3)]
-              [(predicate-sym) (make-literal (make-srcloc $1-start-pos $1-end-pos) $1 empty)]
-              [(term NEQUAL term) (make-literal (make-srcloc $1-start-pos $3-end-pos) '!= (list $1 $3))]
-              [(term EQUAL term) (make-literal (make-srcloc $1-start-pos $3-end-pos) '= (list $1 $3))])
-     (predicate-sym [(IDENTIFIER) (make-predicate-sym (make-srcloc $1-start-pos $1-end-pos) (string->symbol $1))]
-                    [(STRING) $1])
-     (terms [(term) (list $1)]
-            [(term COMMA terms) (list* $1 $3)])
-     (term [(VARIABLE) (make-variable (make-srcloc $1-start-pos $1-end-pos) (string->symbol $1))]
-           [(constant) (make-constant (make-srcloc $1-start-pos $1-end-pos) $1)])
-     (constant [(IDENTIFIER) (string->symbol $1)]
-               [(STRING) $1]))
-    
-    (suppress))))
-
-(define ((mk-parser which) ip)
-  (define (go)
-    (port-count-lines! ip)
-    (which (lambda () (dlexer ip))))
-  (if (current-source-name)
-      (go)
-      (parameterize ([current-source-name (object-name ip)]
-                     [file-path (object-name ip)])
-        (go))))  
-
-(define parse-literal (mk-parser literal-parser))
-(define parse-clause (mk-parser clause-parser))
-(define parse-statement (mk-parser statement-parser))
-(define parse-program (mk-parser program-parser))
-
-(provide/contract
- [current-source-name (parameter/c any/c)]
- [parse-literal (input-port? . -> . literal?)]
- [parse-clause (input-port? . -> . clause?)]
- [parse-statement (input-port? . -> . statement/c)]
- [parse-program (input-port? . -> . program/c)])
diff --git a/pkgs/datalog/pretty.rkt b/pkgs/datalog/pretty.rkt
deleted file mode 100644
index 255f0736a7..0000000000
--- a/pkgs/datalog/pretty.rkt
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/list
-         racket/contract
-         "private/pprint.rkt"
-         "ast.rkt")
-
-(define format-datum
-  (match-lambda
-   [(predicate-sym _ s)
-    (format-datum s)]
-   [(? symbol? s)
-    (text (symbol->string s))]
-   [(? string? s)
-    (text (format "~S" s))]
-   [(? number? s)
-    (text (format "~S" s))]))
-(define (format-variable v)
-  (format-datum (variable-sym v)))
-(define (format-constant c)
-  (format-datum (constant-value c)))
-(define format-term 
-  (match-lambda
-    [(? variable? t)
-     (format-variable t)]
-    [(? constant? t)
-     (format-constant t)]))
-(define (format-literal l)
-  (match l
-    [(struct literal (_ pred (list)))
-     (format-datum pred)]
-    [(struct literal (_ '= (list a b)))
-     (h-append (format-term a) space (text "=") space (format-term b))]
-    [(struct literal (_ pred terms))
-     (h-append (format-datum pred)
-               lparen
-               (v-concat/s (apply-infix ", " (map format-term terms)))
-               rparen)]))
-(define format-external
-  (match-lambda
-    [(external _ pred-sym pred args anss)
-     (h-append (format-datum pred-sym)
-               lparen
-               (v-concat/s (apply-infix ", " (map format-term args)))
-               rparen
-               (text " = ")
-               lparen
-               (v-concat/s (apply-infix ", " (map format-term anss)))
-               rparen)]))
-(define format-question
-  (match-lambda
-    [(? literal? l)
-     (format-literal l)]
-    [(? external? e)
-     (format-external e)]))
-(define (format-questions ls)
-  (v-concat
-   (map (lambda (l)
-          (h-append (format-question l) dot))
-        ls)))
-(define (format-clause c)
-  (if (empty? (clause-body c))
-      (format-literal (clause-head c))
-      (nest 4
-            (v-concat/s
-             (list* (h-append (format-literal (clause-head c)) space (text ":-") space)
-                    (apply-infix ", " (map format-literal (clause-body c))))))))
-(define (format-assertion a)
-  (h-append (format-clause (assertion-clause a))
-            dot))
-(define (format-retraction r)
-  (h-append (format-clause (retraction-clause r))
-            (char #\~)))
-(define (format-query q)
-  (h-append (format-question (query-question q))
-            (char #\?)))
-
-(define (format-statement s)
-  (cond
-    [(assertion? s) (format-assertion s)]
-    [(retraction? s) (format-retraction s)]
-    [(query? s) (format-query s)]))
-(define (format-program p)
-  (v-concat (map format-statement p)))
-
-(provide/contract
- [format-datum (datum/c . -> . doc?)]
- [format-variable (variable? . -> . doc?)]
- [format-constant (constant? . -> . doc?)]
- [format-term (term/c . -> . doc?)]
- [format-literal (literal? . -> . doc?)]
- [format-questions ((listof question/c) . -> . doc?)]
- [format-clause (clause? . -> . doc?)]
- [format-assertion (assertion? . -> . doc?)]
- [format-retraction (retraction? . -> . doc?)]
- [format-query (query? . -> . doc?)]
- [format-statement (statement/c . -> . doc?)]
- [format-program (program/c . -> . doc?)])
diff --git a/pkgs/datalog/private/compiler.rkt b/pkgs/datalog/private/compiler.rkt
deleted file mode 100644
index 78d2baedd4..0000000000
--- a/pkgs/datalog/private/compiler.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         datalog/ast
-         datalog/stx)
-(require (for-template datalog/stx))
-
-(provide/contract
- [compile-program (program/c . -> . (listof syntax?))]
- [compile-statement (statement/c . -> . syntax?)])
-
-(define (compile-program p)
-  (map compile-statement p))
-
-(define compile-statement
-  (match-lambda
-    [(assertion srcloc c)
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (quasisyntax/loc srcstx
-       (! #,(compile-clause c)))]
-    [(retraction srcloc c)
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (quasisyntax/loc srcstx
-       (~ #,(compile-clause c)))]
-    [(query srcloc l)
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (quasisyntax/loc srcstx
-       (? #,(compile-literal l)))]))
-
-(define compile-clause
-  (match-lambda
-    [(clause srcloc head (list))
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (compile-literal head)]
-    [(clause srcloc head body)
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (quasisyntax/loc srcstx
-       (:- #,@(map compile-literal (list* head body))))]))
-
-(define compile-literal
-  (match-lambda
-    [(literal srcloc '= (and ts (app length 2)))
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (quasisyntax/loc srcstx
-       (= #,@(map compile-term ts)))]
-    [(literal srcloc pred ts)
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (define pred-stx (if (predicate-sym? pred)
-                          (sym->original-syntax (predicate-sym-sym pred)
-                                                (predicate-sym-srcloc pred))
-                          pred))
-     (quasisyntax/loc srcstx
-       (#,pred-stx #,@(map compile-term ts)))]))
-
-(define compile-term
-  (match-lambda
-    [(variable srcloc sym)
-     (sym->original-syntax sym srcloc)]
-    [(constant srcloc sym)
-     (datum->syntax #f sym srcloc)]))
-
-(define (sym->original-syntax sym srcloc)
-  (define p (open-input-string (symbol->string sym)))
-  (port-count-lines! p)
-  (match-define (list source-name line column position span) srcloc)
-  (set-port-next-location! p line column position)
-  (read-syntax source-name p))
diff --git a/pkgs/datalog/private/env.rkt b/pkgs/datalog/private/env.rkt
deleted file mode 100644
index 018cbc4442..0000000000
--- a/pkgs/datalog/private/env.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         "../ast.rkt")
-
-(define env/c
-  (and/c hash? immutable?))
-(define (empty-env)
-  (make-immutable-hash empty))
-(define (lookup env var [def #f])
-  (hash-ref env var def))
-(define (extend env var val)
-  (hash-set env var val))
-
-(provide/contract
- [env/c contract?]
- [empty-env (-> env/c)]
- [lookup ((env/c symbol?) (term/c) . ->* . (or/c false/c term/c))]
- [extend (env/c symbol? term/c . -> . void)])
diff --git a/pkgs/datalog/private/lex.rkt b/pkgs/datalog/private/lex.rkt
deleted file mode 100644
index bca8b74531..0000000000
--- a/pkgs/datalog/private/lex.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket/base
-(require parser-tools/lex
-         (prefix-in : parser-tools/lex-sre))
-
-(define-tokens dtokens (VARIABLE IDENTIFIER STRING))
-(define-empty-tokens dpunct (LPAREN COMMA RPAREN TSTILE DOT EQUAL NEQUAL TILDE QMARK EOF))
-(define-lex-abbrev line-break #\newline)
-(define-lex-abbrev id-chars (char-complement (char-set "(,)=:.~?\"% \n")))
-(define-lex-abbrev variable-re (:: upper-case (:* (:or upper-case lower-case (char-set "0123456789_")))))
-(define-lex-abbrev identifier-re (:: id-chars (:* (:or upper-case id-chars))))
-(define-lex-abbrev comment-re (:: "%" (complement (:: any-string line-break any-string)) line-break))
-
-(define get-string-token
-  (lexer
-   [(:~ #\" #\\) (cons (car (string->list lexeme))
-                       (get-string-token input-port))]
-   [(:: #\\ #\\) (cons #\\ (get-string-token input-port))]
-   [(:: #\\ #\newline) (cons #\newline (get-string-token input-port))]
-   [(:: #\\ #\") (cons #\" (get-string-token input-port))]
-   [#\" null]))
-
-(define dlexer
-  (lexer-src-pos
-   [whitespace
-    (return-without-pos (dlexer input-port))]
-   [comment-re
-    (return-without-pos (dlexer input-port))]
-   [variable-re
-    (token-VARIABLE lexeme)]
-   [identifier-re
-    (token-IDENTIFIER lexeme)]
-   [":-" (token-TSTILE)]
-   [#\" (token-STRING (list->string (get-string-token input-port)))]
-   [#\( (token-LPAREN)]
-   [#\, (token-COMMA)]
-   [#\) (token-RPAREN)]
-   [#\. (token-DOT)]
-   [#\~ (token-TILDE)]
-   [#\? (token-QMARK)]
-   [#\= (token-EQUAL)]
-   ["!=" (token-NEQUAL)]
-   [(eof) (token-EOF)]))
-
-(provide dtokens dpunct
-         line-break id-chars variable-re identifier-re comment-re
-         dlexer)
diff --git a/pkgs/datalog/private/pprint.rkt b/pkgs/datalog/private/pprint.rkt
deleted file mode 100644
index 8d3051a62d..0000000000
--- a/pkgs/datalog/private/pprint.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket/base
-(require racket/list)
-(provide (all-defined-out))
-
-(define (text s) s)
-(define (h-append . ss) (apply string-append ss))
-(define (v-concat/s ss)
-  (apply string-append ss))
-(define (v-concat ss)
-  (apply string-append (add-between ss "\n")))
-(define (apply-infix d ds)
-  (add-between ds d))
-(define line "\n")
-(define comma ",")
-(define space " ")
-(define lparen "(")
-(define rparen ")")
-(define dot ".")
-(define (nest n d) d)
-(define char string)
-(define doc? string?)
diff --git a/pkgs/datalog/private/subst.rkt b/pkgs/datalog/private/subst.rkt
deleted file mode 100644
index 7c96b49026..0000000000
--- a/pkgs/datalog/private/subst.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/function
-         racket/contract
-         "../ast.rkt"
-         "env.rkt")
-
-(define (subst-term env t)
-  (match t
-    [(struct variable (_ var))
-     (lookup env var t)]
-    [_
-     t]))
-
-(define (subst-terms env ts)
-  (map (curry subst-term env) ts))
-
-(define (subst-literal env lit)
-  (struct-copy 
-   literal lit
-   [terms 
-    (subst-terms env (literal-terms lit))]))
-
-(define (subst-external env ext)
-  (struct-copy 
-   external ext
-   [arg-terms 
-    (subst-terms env (external-arg-terms ext))]
-   [ans-terms 
-    (subst-terms env (external-ans-terms ext))]))
-
-(define (subst-question env q)
-  (match q
-    [(? literal?) (subst-literal env q)]
-    [(? external?) (subst-external env q)]))
-
-(define (subst-clause env c)
-  (clause (clause-srcloc c)
-          (subst-literal env (clause-head c))
-          (map (curry subst-question env)
-               (clause-body c))))
-
-(define (shuffle-terms env terms)
-  (match terms
-    [(list) 
-     env]
-    [(list-rest (constant _ value) terms)
-     (shuffle-terms env terms)]
-    [(list-rest (variable srcloc var) terms)
-     (if (lookup env var)
-         (shuffle-terms env terms)
-         (shuffle-terms (extend env var (make-variable srcloc (gensym var)))
-                        terms))]))
-
-(define (shuffle env q)
-  (match q
-    [(external _ _ pred arg-terms ans-terms)
-     (shuffle-terms env (append arg-terms ans-terms))]
-    [(literal _ pred terms)
-     (shuffle-terms env terms)]))
-
-(define (rename-clause c)
-  (define env
-    (foldl (lambda (e a)
-             (shuffle a e))
-           (shuffle (empty-env) (clause-head c))
-           (clause-body c)))  
-  (subst-clause env c))  
-
-(define (rename-question q)
-  (subst-question (shuffle (empty-env) q) q))
-
-(provide/contract
- [subst-terms (env/c (listof term/c) . -> . (listof term/c))]
- [subst-term (env/c term/c . -> . term/c)]
- [subst-clause (env/c clause? . -> . clause?)]
- [rename-clause (clause? . -> . clause?)]
- [rename-question (question/c . -> . question/c)])
diff --git a/pkgs/datalog/private/unify.rkt b/pkgs/datalog/private/unify.rkt
deleted file mode 100644
index 92a5122078..0000000000
--- a/pkgs/datalog/private/unify.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/list
-         racket/contract
-         "../ast.rkt"
-         "env.rkt")
-
-(define (chase env t)
-  (match t
-    [(struct variable (_ var))
-     (cond
-       [(lookup env var)
-        => (lambda (term) (chase env term))]
-       [else t])]
-    [_ t]))
-
-(define (unify-term env t1 t2)
-  (define t1-p (chase env t1))
-  (define t2-p (chase env t2))
-  (if (term-equal? t1-p t2-p)
-      env
-      (match t1-p
-        [(struct variable (_ var))
-         (extend env var t2-p)]
-        [_
-         (match t2-p
-           [(struct variable (_ var))
-            (extend env var t1-p)]
-           [_
-            #f])])))
-
-(define (unify-terms env ts1 ts2)
-  (if (empty? ts1)
-      (if (empty? ts2)
-          env
-          #f)
-      (if (empty? ts2)
-          #f
-          (match (unify-term env (first ts1) (first ts2))
-            [#f #f]
-            [env (unify-terms env (rest ts1) (rest ts2))]))))      
-
-(define (unify l1 l2)
-  (or (and (literal? l1) (literal? l2)
-           (datum-equal? (literal-predicate l1)
-                         (literal-predicate l2))
-           (unify-terms (empty-env)
-                        (literal-terms l1)
-                        (literal-terms l2)))
-      (and (external? l1) (external? l2)
-           (equal? (external-predicate l1)
-                   (external-predicate l2))
-           (unify-terms (empty-env)
-                        (append (external-arg-terms l1)
-                                (external-ans-terms l1))
-                        (append (external-arg-terms l2)
-                                (external-ans-terms l2))))))
-
-(provide/contract
- [unify (question/c question/c . -> . (or/c false/c env/c))]
- [unify-terms (env/c (listof term/c) (listof term/c) . -> . (or/c false/c env/c))]
- [unify-term (env/c term/c term/c . -> . (or/c false/c env/c))])
diff --git a/pkgs/datalog/private/variant.rkt b/pkgs/datalog/private/variant.rkt
deleted file mode 100644
index 74cb799656..0000000000
--- a/pkgs/datalog/private/variant.rkt
+++ /dev/null
@@ -1,109 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/match
-         racket/contract
-         racket/dict
-         "../ast.rkt"
-         "env.rkt")
-
-; Variants
-(define (variant-terms env1 env2 ts1 ts2)
-  (if (empty? ts1)
-      (empty? ts2)
-      (and (not (empty? ts2))
-           (variant-term 
-            env1 env2 
-            (first ts1) (first ts2)
-            (rest ts1) (rest ts2)))))
-
-(define (variant-term env1 env2 t1 t2 ts1 ts2)
-  (or (and (variable? t1) (variable? t2)
-           (variant-var 
-            env1 env2
-            (variable-sym t1) (variable-sym t2)
-            ts1 ts2))
-      (and (term-equal? t1 t2)
-           (variant-terms env1 env2 ts1 ts2))))
-
-(define (variant-var env1 env2 v1 v2 ts1 ts2)
-  (match (cons (lookup env1 v1) (lookup env2 v2))
-    [(list-rest #f #f)
-     (variant-terms 
-      (extend env1 v1 (make-variable #f v2))
-      (extend env2 v2 (make-variable #f v1))
-      ts1 ts2)]
-    [(list (struct variable (_ v1-p)) (struct variable (_ v2-p)))
-     (and (datum-equal? v1-p v2)
-          (datum-equal? v2-p v1)
-          (variant-terms env1 env2 ts1 ts2))]
-    [_ #f]))
-
-(define (variant? l1 l2)
-  (or 
-   (and (literal? l1) (literal? l2)
-        (datum-equal? (literal-predicate l1)
-                      (literal-predicate l2))
-        (variant-terms 
-         (empty-env) (empty-env)
-         (literal-terms l1)
-         (literal-terms l2)))
-   (and (external? l1) (external? l2)
-        (equal? (external-predicate l1)
-                (external-predicate l2))
-        (variant-terms 
-         (empty-env) (empty-env)
-         (external-arg-terms l1)
-         (external-arg-terms l2))
-        (variant-terms 
-         (empty-env) (empty-env)
-         (external-ans-terms l1)
-         (external-ans-terms l2)))))
-
-(define (mem-literal lit ls)
-  (ormap (lambda (l) (variant? lit l)) ls))
-
-; Literal Tables modulo variant?
-(define (term-hash t recur-hash)
-  (cond
-    [(variable? t)
-     101]
-    [(constant? t)
-     (recur-hash (constant-value t))]))
-(define ((mk-literal-hash recur-hash) q)
-  (define-values
-    (code terms)
-    (match q
-      [(? literal? l)
-       (values (recur-hash (literal-predicate l))
-               (literal-terms l))]
-      [(? external? e)
-       (values (recur-hash (external-predicate e))
-               (append (external-arg-terms e)
-                       (external-ans-terms e)))]))
-  (let loop ([code code]
-             [i 0]
-             [terms terms])
-    (if (empty? terms)
-        code
-        (loop (+ code (term-hash (first terms) recur-hash) (* i -7))
-              (add1 i)
-              (rest terms)))))
-
-(define literal-tbl/c
-  (coerce-contract 'variant dict?))
-(define (make-literal-tbl)
-  (make-custom-hash 
-   variant? 
-   (mk-literal-hash equal-hash-code)
-   (mk-literal-hash equal-secondary-hash-code)))
-(define (literal-tbl-find ltbl s)
-  (dict-ref ltbl s #f))
-(define (literal-tbl-replace! ltbl s x)
-  (dict-set! ltbl s x))
-
-(provide/contract
- [literal-tbl/c contract?]
- [make-literal-tbl (-> literal-tbl/c)]
- [literal-tbl-find (literal-tbl/c question/c . -> . (or/c false/c any/c))]
- [literal-tbl-replace! (literal-tbl/c question/c any/c . -> . void)]
- [mem-literal (question/c (listof question/c) . -> . boolean?)])
diff --git a/pkgs/datalog/runtime.rkt b/pkgs/datalog/runtime.rkt
deleted file mode 100644
index 9e476e6e57..0000000000
--- a/pkgs/datalog/runtime.rkt
+++ /dev/null
@@ -1,156 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         racket/match
-         racket/function
-         "ast.rkt"
-         "private/env.rkt"
-         "private/subst.rkt"
-         "private/unify.rkt"
-         "private/variant.rkt")
-
-; A clause is safe if every variable in its head occurs in some literal in its body.
-(define (safe-clause? c)
-  (define head-vars (filter variable? (literal-terms (clause-head c))))
-  (andmap (lambda (v)
-            (ormap (lambda (l)
-                     (ormap (lambda (t) (term-equal? t v))
-                            (cond
-                              [(literal? l)
-                               (literal-terms l)]
-                              [(external? l)
-                               (append (external-arg-terms l)
-                                       (external-ans-terms l))])))
-                   (clause-body c)))
-          head-vars))
-
-(define theory/c (and/c hash? (not/c immutable?)))
-(define (literal-key l)
-  (format "~a/~a" (literal-predicate l) (length (literal-terms l))))
-(define (clause-key c)
-  (literal-key (clause-head c)))
-
-(define (make-theory)
-  (make-hash))
-
-(define ((mk-assume hash-update) thy c)
-  (hash-update
-   thy (clause-key c)
-   (lambda (clauses)
-     (list* c clauses))
-   empty))
-(define ((mk-retract hash-update) thy rc)  
-  (hash-update
-   thy (clause-key rc)
-   (lambda (clauses)
-     (filter (lambda (c)
-               (not (clause-equal? c rc)))
-             clauses))
-   empty))
-
-(define assume (mk-assume hash-update))
-(define retract (mk-retract hash-update))
-(define assume! (mk-assume hash-update!))
-(define retract! (mk-retract hash-update!))
-
-(define (get thy lit)
-  (hash-ref thy (literal-key lit) empty))
-
-(define-struct subgoal 
-  (question 
-   [facts #:mutable]
-   [waiters #:mutable]))
-
-(define (resolve c q)
-  (define body (clause-body c))
-  (and (not (empty? body))
-       (cond
-         [(unify (first body) (rename-question q))
-          => (lambda (env)
-               (subst-clause env (make-clause (clause-srcloc c) (clause-head c) (rest body))))]
-         [else #f])))
-
-(define (prove thy q)
-  (define subgoals (make-literal-tbl))
-  (define (fact! sg lit)
-    (unless (mem-literal lit (subgoal-facts sg))
-      (set-subgoal-facts! sg (list* lit (subgoal-facts sg)))
-      (for-each (lambda (w)
-                  (cond
-                    [(resolve (cdr w) lit)
-                     => (lambda (cs-p) (add-clause! (car w) cs-p))]))
-                (subgoal-waiters sg))))
-  (define (rule! sg1 c s)
-    (define sg2 (literal-tbl-find subgoals s))
-    (if sg2
-        (begin
-          (set-subgoal-waiters! sg2 (list* (cons sg1 c) (subgoal-waiters sg2)))
-          (for-each (lambda (fact)
-                      (cond
-                        [(resolve c fact)
-                         => (lambda (cs) (add-clause! sg1 cs))]))
-                    (subgoal-facts sg2)))
-        (let ([sg2 (make-subgoal s empty (list (cons sg1 c)))])
-          (literal-tbl-replace! subgoals s sg2)
-          (search! sg2))))
-  (define (add-clause! sg c)
-    (match c
-      [(struct clause (_ lit (list)))
-       (fact! sg lit)]
-      [(struct clause (_ _ (list-rest selected _)))
-       (rule! sg c selected)]))
-  (define (search-theory! sg)
-    (for-each 
-     (lambda (clause)
-       (define renamed (rename-clause clause))
-       (define selected (clause-head renamed))
-       (cond
-         [(unify (subgoal-question sg) selected)
-          => (lambda (env)
-               (add-clause! sg (subst-clause env renamed)))]))
-     (get thy (subgoal-question sg))))
-  (define (search! sg)
-    (match (subgoal-question sg)
-      [(external srcloc pred-sym pred args anss)
-       (and (andmap constant? args)
-            (call-with-values 
-             (λ ()
-               (apply pred (map constant-value args)))
-             (λ resolved-vals
-               (define resolved-anss
-                 (map (curry constant #f)
-                      resolved-vals))
-               (cond
-                 [(unify-terms (empty-env) anss resolved-anss)
-                  => (λ (env)
-                       (fact! sg (external srcloc pred-sym pred args (subst-terms env anss))))]))))]
-      [(struct literal (srcloc '= (list a b)))
-       (define (equal-test a b)
-         (when (term-equal? a b)
-           (fact! sg (make-literal srcloc '= (list a b)))))
-       (cond
-         [(unify-term (empty-env) a b)
-          => (lambda (env) (equal-test (subst-term env a) (subst-term env b)))]
-         [else (equal-test a b)])]
-      [(struct literal (srcloc '!= (list a b)))
-       (define (equal-test a b)
-         (unless (term-equal? a b)
-           (fact! sg (make-literal srcloc '!= (list a b)))))
-       (cond
-         [(unify-term (empty-env) a b)
-          => (lambda (env) (equal-test (subst-term env a) (subst-term env b)))]
-         [else (equal-test a b)])]
-      [_
-       (search-theory! sg)]))
-  (define sg (make-subgoal q empty empty))
-  (literal-tbl-replace! subgoals q sg)
-  (search! sg)
-  (subgoal-facts sg))
-
-(provide/contract
- [safe-clause? (clause? . -> . boolean?)]
- [theory/c contract?]
- [make-theory (-> theory/c)]
- [assume! (theory/c safe-clause? . -> . void)]
- [retract! (theory/c clause? . -> . void)]
- [prove (theory/c question/c . -> . (listof question/c))])
diff --git a/pkgs/datalog/scribblings/datalog.scrbl b/pkgs/datalog/scribblings/datalog.scrbl
deleted file mode 100644
index b539f2b229..0000000000
--- a/pkgs/datalog/scribblings/datalog.scrbl
+++ /dev/null
@@ -1,179 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          scribble/basic
-          scribble/bnf
-          "utils.rkt")
-
-@title[#:tag "top"]{Datalog: Deductive Database Programming}
-@author[(author+email "Jay McCarthy" "jay@racket-lang.org")]
-
-@link["http://en.wikipedia.org/wiki/Datalog"]{Datalog} is 
-@itemize[
- @item{a declarative logic language in which each
-formula is a function-free Horn clause, and every variable
-in the head of a clause must appear in the body of the clause.}
- @item{a lightweight deductive database system where queries and database updates are expressed
-       in the logic language.}
-]
-
-The use of Datalog syntax and an implementation based
-on tabling intermediate results ensures that all queries terminate.
-
-@table-of-contents[]
-
-@section[#:tag "datalog"]{Datalog Module Language}
-
-@defmodulelang[@racketmodname[datalog] #:module-paths (datalog/lang/reader)]
-
-In Datalog input, whitespace characters are ignored except when they separate adjacent tokens or when they occur in strings.
-Comments are also considered to be whitespace. The character @litchar["%"] introduces a comment, which extends to the next line break.
-Comments do not occur inside strings.
-
-A variable is a sequence of Unicode "Uppercase" and "Lowercase" letters, digits, and the underscore character. A variable must begin with a Unicode "Uppercase" letter.
-
-An identifier is a sequence of printing characters that does not contain any of the following characters: @litchar["("], @litchar["`"],
-@litchar["'"], @litchar[")"], @litchar["="], @litchar[":"], @litchar["."], @litchar["~"], @litchar["?"], @litchar["\""], @litchar["%"], and space.
-An identifier must not begin with a Latin capital letter. Note that the characters that start punctuation are forbidden in identifiers,
-but the hyphen character is allowed.
-
-A string is a sequence of characters enclosed in double quotes. Characters other than double quote, newline, and backslash may be directly
-included in a string. The remaining characters may be specified using escape characters, @litchar["\\\""], @litchar["\\\n"], and
-@litchar["\\\\"] respectively.
-
-A literal, is a predicate symbol followed by an optional parenthesized list of comma separated terms. A predicate symbol is either an identifier
-or a string. A term is either a variable or a constant. As with predicate symbols, a constant is either an identifier or a string. As a special case,
-two terms separated by @litchar["="] (@litchar["!="]) is a literal for the equality (inequality) predicate.
-The following are literals:
-@verbatim[#:indent 4 #<<END
-parent(john, douglas)
-zero-arity-literal
-"="(3,3)
-""(-0-0-0,&&&,***,"\00")
-END
-]
-
-A clause is a head literal followed by an optional body. A body is a comma separated list of literals. A clause without a body is called a @deftech{fact},
-and a rule when it has one. The punctuation @litchar[":-"] separates the head of a rule from its body. A clause is safe if every variable in its head
-occurs in some literal in its body. The following are safe clauses:
-
-@verbatim[#:indent 4 #<<END
-parent(john, douglas)
-ancestor(A, B) :-
-    parent(A, B)
-ancestor(A, B) :-
-    parent(A, C),
-    ancestor(C, B)
-END
-]
-
-A program is a sequence of zero or more statements. A statement is an assertion, a retraction, or a query. An assertion is a clause followed by
-a period, and it adds the clause to the database if it is safe. A retraction is a clause followed by a tilde, and it removes the clause from
-the database. A query is a literal followed by a question mark. 
-
-The following BNF describes the syntax of Datalog.
-
-@BNF[
- (list (nonterm "program")
-       (kleenestar (nonterm "statement")))
- (list (nonterm "statement")
-       (nonterm "assertion")
-       (nonterm "retraction")
-       (nonterm "query"))
- (list (nonterm "assertion")
-       (BNF-seq (nonterm "clause") (litchar ".")))
- (list (nonterm "retraction")
-       (BNF-seq (nonterm "clause") (litchar "~")))
- (list (nonterm "query")
-       (BNF-seq (nonterm "literal") (litchar "?")))
- (list (nonterm "clause")
-       (BNF-seq (nonterm "literal") (litchar ":-") (nonterm "body"))
-       (nonterm "literal"))
- (list (nonterm "body")
-       (BNF-seq (nonterm "literal") (litchar ",") (nonterm "body"))
-       (nonterm "literal"))
- (list (nonterm "literal")
-       (BNF-seq (nonterm "predicate-sym") (litchar "(") (litchar ")"))
-       (BNF-seq (nonterm "predicate-sym") (litchar "(") (nonterm "terms") (litchar ")"))
-       (nonterm "predicate-sym")
-       (BNF-seq (nonterm "term") (litchar "=") (nonterm "term"))
-       (BNF-seq (nonterm "term") (litchar "!=") (nonterm "term")))
- (list (nonterm "predicate-sym")
-       (nonterm "IDENTIFIER")
-       (nonterm "STRING"))
- (list (nonterm "terms")
-       (nonterm "term")
-       (BNF-seq (nonterm "term") (litchar ",") (nonterm "terms")))
- (list (nonterm "term")
-       (nonterm "VARIABLE")
-       (nonterm "constant"))
- (list (nonterm "constant")
-       (nonterm "IDENTIFIER")
-       (nonterm "STRING"))
-]
-
-The effect of running a Datalog program is to modify the database as directed
-by its statements, and then to return the literals designated by the query.
-The modified database is provided as @racket[theory].
-
-The following is a program:
-
-@verbatim[#:indent 4 #<<END
-     #lang datalog
-     edge(a, b). edge(b, c). edge(c, d). edge(d, a).
-     path(X, Y) :- edge(X, Y).
-     path(X, Y) :- edge(X, Z), path(Z, Y).
-     path(X, Y)?
-END
-]
-
-The Datalog REPL accepts new statements that are executed as if they were in the original program text.
-
-@include-section["tutorial.scrbl"]
-
-@section{Parenthetical Datalog Module Language}
-@(require (for-label datalog
-                     racket))
-
-@defmodulelang[datalog/sexp]
-
-The semantics of this language is the same as the normal Datalog language, except it uses the parenthetical syntax described in @secref{interop}.
-
-All identifiers in @racketmodname[racket/base] are available for use as predicate symbols or constant values. Top-level identifiers and datums are not otherwise allowed in the program. The program may contain @racket[require] expressions.
-
-The following is a program:
-@racketmod[datalog/sexp
-
-(! (edge a b))
-(! (edge b c))
-(! (edge c d))
-(! (edge d a))
-(! (:- (path X Y)
-       (edge X Y)))
-(! (:- (path X Y)
-       (edge X Z)
-       (path Z Y)))
-(? (path X Y))]
-
-This is also a program:
-@racketmod[datalog/sexp
-(require racket/math)
-
-(? (sqr 4 :- X))]
-
-The Parenthetical Datalog REPL accepts new statements that are executed as if they were in the original program text, except @racket[require] is not allowed.
-
-@include-section["racket.scrbl"]
-
-@section{Acknowledgments}
-
-This package was once structurally based on Dave Herman's @racketmodname[(planet dherman/javascript)] library and
-John Ramsdell's @link["http://www.ccs.neu.edu/home/ramsdell/tools/datalog/datalog.html"]{Datalog library}. 
-
-The package uses the tabled logic programming algorithm described in
-@link["http://scholar.google.com/scholar?q=author:%22Chen%22+intitle:%22Efficient+top-down+computation+of+queries+under+the+...%22+&oi=scholarr"]{Efficient Top-Down Computation of Queries under the Well-Founded Semantics} by W. Chen, T. Swift, and D. S. Warren.
-Another important reference is 
-@link["http://portal.acm.org/citation.cfm?id=227597"]{Tabled Evaluation with Delaying for General Logic Programs} by W. Chen and D. S. Warren.
-Datalog is described in 
-@link["http://doi.ieeecomputersociety.org/10.1109/69.43410"]{What You Always Wanted to Know About Datalog (And Never Dared to Ask)}
-by Stefano Ceri, Georg Gottlob, and Letizia Tanca.
diff --git a/pkgs/datalog/scribblings/racket.scrbl b/pkgs/datalog/scribblings/racket.scrbl
deleted file mode 100644
index c66517cdbb..0000000000
--- a/pkgs/datalog/scribblings/racket.scrbl
+++ /dev/null
@@ -1,125 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          scribble/basic
-          scribble/bnf
-          (for-label racket/base
-                     racket/contract
-                     "../main.rkt")
-          "utils.rkt")
-
-@title[#:tag "interop"]{Racket Interoperability}
-
-@defmodule[datalog]
-
-The Datalog database can be directly used by Racket programs through this API.
-
-@examples[#:eval the-eval
-          #:escape UNSYNTAX-NOT
-          (define family (make-theory))
-
-          (datalog family
-                   (! (parent joseph2 joseph1))
-                   (! (parent joseph2 lucy))
-                   (! (parent joseph3 joseph2)))
-
-          (datalog family
-                   (? (parent X joseph2)))
-
-          (datalog family
-                   (? (parent X (string->symbol "joseph2"))))
-
-          (let ([atom 'joseph2])
-            (datalog family
-                     (? (parent X #,atom))))
-
-          (let ([table 'parent])
-            (datalog family
-                     (? (#,table X joseph2))))
-
-          (datalog family
-                   (? (parent joseph2 X)))
-
-          (datalog family
-                   (? (parent joseph2 X))
-                   (? (parent X joseph2)))
-
-          (datalog family
-                   (! (:- (ancestor A B)
-                          (parent A B)))
-                   (! (:- (ancestor A B)
-                          (parent A C)
-                          (= D C) 
-                          (ancestor D B))))
- 
-          (datalog family
-                   (? (ancestor A B)))
- 
-          (let ([x 'joseph2])
-            (datalog family
-                     (? (parent x X))))
-
-          (datalog family
-                   (? (add1 1 :- X)))
-          (datalog family
-                   (? (add1 X :- 2)))
-          (datalog family
-                   (? (#,(λ (x) (+ x 1)) 1 :- X)))]
-
-@defthing[theory/c contract?]{ A contract for Datalog theories. }
-
-@defproc[(make-theory) theory/c]{ Creates a theory for use with @racket[datalog]. }
-
-@defproc[(write-theory [t theory/c]) void]{ Writes a theory to the current output port. Source location information is lost. }
-@defproc[(read-theory) theory/c]{ Reads a theory from the current input port. }
-
-@defform[(datalog thy-expr
-                  stmt ...)
-         #:contracts ([thy-expr theory/c])]{ Executes the statements on the theory given by @racket[thy-expr]. Returns the answers to the final query as a list of substitution dictionaries or returns @racket[empty]. }
-
-@defform[(datalog! thy-expr
-                  stmt ...)
-         #:contracts ([thy-expr theory/c])]{ Executes the statements on the theory given by @racket[thy-expr]. Prints the answers to every query in the list of statements. Returns @racket[(void)]. }     
-
-Statements are either assertions, retractions, or queries.
-
-@defform[(! clause)]{ Asserts the clause. }
-@defform[(~ clause)]{ Retracts the literal. }
-
-@defform[(:- literal question ...)]{ A conditional clause. }
-
-@defform[(? question)]{ Queries the literal and prints the result literals. }
-
-Questions are either literals or external queries.
-
-Literals are represented as @racket[identifier] or @racket[(table term ...)].
-
-A table is either an identifier or @RACKET[#,expr] where @racket[expr]
-evaluates to a symbol.
-
-External queries are represented as @racket[(ext-table term ... :-
-term ...)], where @racket[ext-table] is an identifier bound to a
-procedure or @RACKET[#,expr] where @racket[expr] evaluates to a
-procedure that when given the first set of terms as arguments returns
-the second set of terms as values.
-
-A term is either a non-capitalized identifiers for a constant symbol,
-a Racket expression for a constant datum, or a capitalized identifier
-for a variable symbol, or @RACKET[#,expr] where @racket[expr]
-evaluates to a constant datum. Bound identifiers in terms are treated
-as the datum they are bound to.
-
-External queries fail if any logic variable is not fully resolved to a
-datum on the Datalog side. In other words, unbound logic variables
-never flow to Racket.
-
-External queries invalidate Datalog's guaranteed termination. For
-example, this program does not terminate:
-
-@racketblock[
- (datalog (make-theory)
-          (! (:- (loop X)
-                 (add1 X :- Z)
-                 (loop Z)))
-          (? (loop 1)))
- ]
diff --git a/pkgs/datalog/scribblings/tutorial.scrbl b/pkgs/datalog/scribblings/tutorial.scrbl
deleted file mode 100644
index d49973e762..0000000000
--- a/pkgs/datalog/scribblings/tutorial.scrbl
+++ /dev/null
@@ -1,108 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          scribble/basic
-          scribble/bnf
-          (for-label racket/base
-                     racket/contract
-                     "../main.rkt")
-          "utils.rkt")
-
-@title{Tutorial}
-
-Start DrRacket and type
-
-@racketmod[datalog]
-
-in the Definitions window. Click @onscreen{Run}, then click in the REPL.
-
-@racketinput[]
-
-@tech{Facts} are stored in tables. If the name of the table is @litchar["parent"], and 
-@litchar["john"] is the parent of @litchar["douglas"], store the fact in the database with
-this:
-
-@racketinput[#,(tt "parent(john, douglas).")]
-
-Each item in the parenthesized list following the name of the table is called a @deftech{term}.
-A term can be either a logical @racket[variable] or a @racket[constant].
-Thus far, all the terms shown have been constant terms.
-
-A query can be used to see if a particular row is in a table. Type this to see if @litchar["john"]
-is the parent of @litchar["douglas"]:
-
-@racketinput[#,(tt "parent(john, douglas)?")]
-@racketblock[#,(racketresultfont (tt "parent(john, douglas)."))]
-
-Type this to see if @litchar["john"] is the parent of @litchar["ebbon"]:
-
-@racketinput[#,(tt "parent(john, ebbon)?")]
-
-The query produced no results because @litchar["john"] is not the parent of @litchar["ebbon"]. Let's add more rows.
-
-@racketinput[#,(tt "parent(bob, john).")]
-@racketinput[#,(tt "parent(ebbon, bob).")]
-
-Type the following to list all rows in the @litchar["parent"] table:
-
-@racketinput[#,(tt "parent(A, B)?")]
-@racketblock[#,(racketresultfont (tt "parent(john, douglas)."))]
-@racketblock[#,(racketresultfont (tt "parent(bob, john)."))]
-@racketblock[#,(racketresultfont (tt "parent(ebbon, bob)."))]
-
-Type the following to list all the children of @litchar["john"]:
-
-@racketinput[#,(tt "parent(john, B)?")]
-@racketblock[#,(racketresultfont (tt "parent(john, douglas)."))]
-
-A term that begins with a capital letter is a logical variable.When producing a set of answers, the
-Datalog interpreter lists all rows that match the query when each variable in the query is substituted
-for a constant. The following example produces no answers, as there are no substitutions for the variable
-@litchar["A"] that produce a fact in the database. This is because no one is the parent of oneself.
-
-@racketinput[#,(tt "parent(A, A)?")]
-
-A deductive database can use rules of inference to derive new facts. Consider the following rule:
-
-@racketinput[#,(tt "ancestor(A, B) :- parent(A, B).")]
-
-The rule says that if A is the parent of B, then A is an ancestor of B.
-The other rule defining an ancestor says that if A is the parent of C,
-C is an ancestor of B, then A is an ancestor of B.
-
-@racketinput[#,(tt "ancestor(A, B) :-")
-             #,(tt "  parent(A, C),")
-             #,(tt "  ancestor(C, B).")]
-
-In the interpreter, DrRacket knows that the clause is not complete, so by pressing Return, it doesn't interpret the line.
-
-Rules are used to answer queries just as is done for facts.
-
-@racketinput[#,(tt "ancestor(A, B)?")]
-@racketblock[#,(racketresultfont (tt "ancestor(ebbon, bob)."))]
-@racketblock[#,(racketresultfont (tt "ancestor(bob, john)."))]
-@racketblock[#,(racketresultfont (tt "ancestor(john, douglas)."))]
-@racketblock[#,(racketresultfont (tt "ancestor(bob, douglas)."))]
-@racketblock[#,(racketresultfont (tt "ancestor(ebbon, john)."))]
-@racketblock[#,(racketresultfont (tt "ancestor(ebbon, douglas)."))]
-@racketinput[#,(tt "ancestor(X,john)?")]
-@racketblock[#,(racketresultfont (tt "ancestor(bob, john)."))]
-@racketblock[#,(racketresultfont (tt "ancestor(ebbon, john)."))]
-
-A fact or a rule can be retracted from the database using tilde syntax:
-
-@racketinput[#,(tt "parent(bob, john)~")]
-@racketinput[#,(tt "parent(A, B)?")]
-@racketblock[#,(racketresultfont (tt "parent(john, douglas)."))]
-@racketblock[#,(racketresultfont (tt "parent(ebbon, bob)."))]
-@racketinput[#,(tt "ancestor(A, B)?")]
-@racketblock[#,(racketresultfont (tt "ancestor(ebbon, bob)."))]
-@racketblock[#,(racketresultfont (tt "ancestor(john, douglas)."))]
-
-Unlike Prolog, the order in which clauses are asserted is irrelevant. All queries terminate, and every possible answer is derived.
-
-@racketinput[#,(tt "q(X) :- p(X).")]
-@racketinput[#,(tt "q(a).")]
-@racketinput[#,(tt "p(X) :- q(X).")]
-@racketinput[#,(tt "q(X)?")]
-@racketblock[#,(racketresultfont (tt "q(a)."))]
diff --git a/pkgs/datalog/scribblings/utils.rkt b/pkgs/datalog/scribblings/utils.rkt
deleted file mode 100644
index 36503e1060..0000000000
--- a/pkgs/datalog/scribblings/utils.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-
-(require scribble/eval)
-
-(provide the-eval)
-
-(define the-eval
-  (let ([the-eval (make-base-eval)])
-    (the-eval `(require datalog))
-    the-eval))
diff --git a/pkgs/datalog/serialize.rkt b/pkgs/datalog/serialize.rkt
deleted file mode 100644
index 353e7872b3..0000000000
--- a/pkgs/datalog/serialize.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         racket/list
-         "runtime.rkt"
-         "ast.rkt")
-
-(define remove-paths
-  (match-lambda
-    [(? hash? ht)
-     (for/hash ([(k v) (in-hash ht)])
-       (values k (remove-paths v)))]
-    [(? cons? c)
-     (cons (remove-paths (car c))
-           (remove-paths (cdr c)))]
-    [(? prefab-struct-key s)
-     (apply make-prefab-struct
-            (prefab-struct-key s)
-            (remove-paths (rest (vector->list (struct->vector s)))))]
-    [(? path? s)
-     #f]
-    [x x]))
-
-(define (write-theory t)
-  (write (remove-paths t)))
-
-(define (hash->hash! ht)
-  (define ht! (make-hash))
-  (for ([(k v) (in-hash ht)])
-    (hash-set! ht! k v))
-  ht!)
-
-(define (read-theory)
-  (hash->hash! (read)))
-
-(provide/contract
- [write-theory (-> theory/c void)]
- [read-theory (-> theory/c)])
diff --git a/pkgs/datalog/sexp/lang.rkt b/pkgs/datalog/sexp/lang.rkt
deleted file mode 100644
index de078166f6..0000000000
--- a/pkgs/datalog/sexp/lang.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-(require (for-syntax syntax/parse
-                     racket/list
-                     racket/base)
-         racket/contract
-         datalog/stx
-         datalog/runtime)
-
-(define-for-syntax (partition-requires es)
-  (define-values (rs stmts)
-    (partition 
-     (λ (e-stx)
-       (syntax-parse
-        e-stx
-        #:literals (require)
-        [(require . r)
-         #t]
-        [_
-         #f]))
-     (syntax->list es)))
-  (list rs stmts))
-
-(define-syntax (module-begin stx)
-  (syntax-case stx ()
-    [(_ . es)
-     (with-syntax ([theory (datum->syntax #'es 'theory)]
-                   [((requires ...)
-                     (stmt ...))
-                    (partition-requires #'es)])
-       (syntax/loc stx
-         (#%module-begin 
-          requires ...
-          (define theory (make-theory))
-          (datalog! theory stmt ...)
-          (provide/contract
-           [theory theory/c]))))]))
-
-(define-syntax (top-interaction stx)
-  (syntax-case stx ()
-    [(_ . stmt)
-     (with-syntax ([theory (datum->syntax #'stmt 'theory)])
-       (syntax/loc stx
-         (datalog! theory stmt)))]))
-
-(provide (rename-out [top-interaction #%top-interaction]
-                     [module-begin #%module-begin])
-         (except-out (all-from-out racket/base)
-                     #%top-interaction
-                     #%module-begin)
-         ! ~ ? :-)
diff --git a/pkgs/datalog/sexp/lang/reader.rkt b/pkgs/datalog/sexp/lang/reader.rkt
deleted file mode 100644
index d2f4e0565d..0000000000
--- a/pkgs/datalog/sexp/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-(module reader syntax/module-reader
-  #:language 'datalog/sexp/lang)
diff --git a/pkgs/datalog/stx.rkt b/pkgs/datalog/stx.rkt
deleted file mode 100644
index 24741f11c4..0000000000
--- a/pkgs/datalog/stx.rkt
+++ /dev/null
@@ -1,236 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     syntax/parse
-                     racket/local
-                     racket/function
-                     racket/list)
-         racket/list
-         racket/match
-         datalog/ast
-         datalog/eval)
-
-(define-syntax (:- stx)
-  (raise-syntax-error ':- "only allowed inside ! and ~" stx))
-(define-syntax (! stx)
-  (raise-syntax-error '! "only allowed inside datalog" stx))
-(define-syntax (~ stx)
-  (raise-syntax-error '~ "only allowed inside datalog" stx))
-(define-syntax (? stx)
-  (raise-syntax-error '? "only allowed inside datalog" stx))
-
-(define (->substitutions sel ls)
-  (if (void? ls) empty
-      (map sel ls)))
-
-(define literal->sexp
-  (match-lambda
-    [(external _ pred-sym _ args anss)
-     `(,pred-sym ,@(map term->datum args)
-                 :-
-                 ,@(map term->datum anss))]
-    [(literal _ pred ts)
-     (list* (if '(predicate-sym? pred)
-                '(predicate-sym-sym pred)
-                pred)
-            (map term->datum ts))]))
-
-(define term->datum
-  (match-lambda
-    [(constant _ v)
-     v]))
-
-(define-syntax (datalog stx)
-  (syntax-case stx ()
-    [(_ thy-expr stmt ...)
-     (syntax/loc stx
-       (parameterize ([current-theory thy-expr])
-         (void)
-         (->substitutions
-          (datalog-stmt-var-selector stmt)
-          (eval-statement (datalog-stmt stmt)))
-         ...))]))
-
-(define-syntax (datalog! stx)
-  (syntax-case stx ()
-    [(_ thy-expr stmt ...)
-     (syntax/loc stx
-       (parameterize ([current-theory thy-expr])
-         (void)
-         (eval-top-level-statement (datalog-stmt stmt))
-         ...))]))
-
-(define-syntax (datalog-stmt stx)
-  (syntax-parse 
-   stx
-   #:literals (! ~ ?)
-   [(_ (~and tstx (! c)))
-    (quasisyntax/loc #'tstx
-      (assertion #,(srcloc-list #'tstx) (datalog-clause c)))]
-   [(_ (~and tstx (~ c)))
-    (quasisyntax/loc #'tstx
-      (retraction #,(srcloc-list #'tstx) (datalog-clause c)))]
-   [(_ (~and tstx (? l)))
-    (quasisyntax/loc #'tstx
-      (query #,(srcloc-list #'tstx) (datalog-literal/ref l)))]))
-
-(define-syntax (datalog-stmt-var-selector stx)
-  (syntax-parse 
-   stx
-   #:literals (! ~ ?)
-   [(_ (~and tstx (! c)))
-    (quasisyntax/loc #'tstx (λ (l) (hasheq)))]
-   [(_ (~and tstx (~ c)))
-    (quasisyntax/loc #'tstx (λ (l) (hasheq)))]
-   [(_ (~and tstx (? l)))
-    (quasisyntax/loc #'tstx (datalog-literal-var-selector l))]))
-
-(define-syntax (datalog-clause stx)
-  (syntax-parse 
-   stx
-   #:literals (:-)
-   [(_ (~and tstx (:- head body ...)))
-    (local [(define (datalog-literal-variables stx)
-              (syntax-parse 
-               stx
-               #:literals (:-)
-               [sym:id
-                empty]
-               [(~and tstx (sym:id arg ... :- ans ...))
-                (append-map datalog-term-variables
-                            (syntax->list #'(arg ... ans ...)))]
-               [(~and tstx (sym:id e ...))
-                (append-map datalog-term-variables
-                            (syntax->list #'(e ...)))]))
-            (define (datalog-term-variables stx)
-              (syntax-parse 
-               stx
-               [sym:id
-                (cond
-                  [(identifier-binding #'sym 0)
-                   empty]
-                  [(char-upper-case? (string-ref (symbol->string (syntax->datum #'sym)) 0))
-                   (list #'sym)]
-                  [else
-                   empty])]
-               [sym:expr
-                empty]))
-            (define head-vars (datalog-literal-variables #'head))
-            (define body-vars 
-              (append-map datalog-literal-variables (syntax->list #'(body ...))))
-            (define body-vars-in-head
-              (filter
-               (λ (bv)
-                 (findf (curry bound-identifier=? bv)
-                        head-vars))
-               body-vars))
-            (define fake-lam
-              (quasisyntax/loc #'tstx
-                (lambda #,head-vars
-                  (void #,@body-vars-in-head))))]
-      (syntax-local-lift-expression
-       fake-lam))
-    (quasisyntax/loc #'tstx
-      (clause #,(srcloc-list #'tstx) (datalog-literal/bind head) 
-              (list (datalog-literal/ref body) ...)))]
-   [(_ e)
-    (quasisyntax/loc #'e
-      (clause #,(srcloc-list #'e) (datalog-literal/bind e) empty))]))
-
-(define-syntax (datalog-literal/bind stx) (datalog-literal/b stx #t))
-(define-syntax (datalog-literal/ref stx) (datalog-literal/b stx #f))
-
-(begin-for-syntax
-  (define-syntax-class table-id
-    #:literals (unsyntax)
-    (pattern sym:id
-             #:attr ref #''sym
-             #:attr val #'sym)
-    (pattern (unsyntax sym:expr)
-             #:attr ref #'sym
-             #:attr val #'sym))
-  (define (datalog-literal/b stx binding?)
-    (syntax-parse 
-        stx
-      #:literals (:-)
-      [(_ sym:table-id)
-       (syntax-property 
-        (quasisyntax/loc #'sym
-          (literal #,(srcloc-list #'sym) sym.ref empty))
-        (if binding? 'disappeared-binding 'disappeared-use)
-        (syntax-local-introduce #'sym))]
-      [(_ (~and tstx (sym:table-id arg ... :- ans ...)))
-       (quasisyntax/loc #'tstx
-         (external #,(srcloc-list #'tstx) 'sym sym.val
-                   (list (datalog-term arg) ...)
-                   (list (datalog-term ans) ...)))]
-      [(_ (~and tstx (sym:table-id e ...)))
-       (syntax-property
-        (quasisyntax/loc #'tstx
-          (literal #,(srcloc-list #'tstx) sym.ref 
-                   (list (datalog-term e)
-                         ...)))
-        (if binding? 'disappeared-binding 'disappeared-use)
-        (syntax-local-introduce #'sym))])))
-
-(define-syntax (datalog-literal-var-selector stx)
-  (syntax-parse 
-   stx
-   #:literals (:-)
-   [(_ sym:table-id)
-    (quasisyntax/loc #'sym (λ (l) (hasheq)))]
-   [(_ (~and tstx (sym:table-id arg ... :- ans ...)))
-    (quasisyntax/loc #'tstx 
-      (match-lambda
-        [(external _srcloc _predsym _pred args anss)
-         (terms->hasheq (list (datalog-term arg) ...
-                              (datalog-term ans) ...)
-                        (append args anss))]))]
-   [(_ (~and tstx (sym:table-id e ...)))
-    (quasisyntax/loc #'tstx
-      (match-lambda
-        [(literal _srcloc _predsym ts)
-         (terms->hasheq (list (datalog-term e) ...)
-                        ts)]))]))
-
-(define (terms->hasheq src-ts res-ts)
-  (for/fold ([h (hasheq)])
-    ([src (in-list src-ts)]
-     [res (in-list res-ts)])
-    (if (variable? src)
-        (hash-set h (variable-sym src) (constant-value res))
-        h)))
-
-(define-syntax (datalog-term stx)
-  (syntax-parse 
-   stx
-   #:literals (unsyntax)
-   [(_ sym:id)
-    (cond
-      [(identifier-binding #'sym 0)
-       (quasisyntax/loc #'sym
-         (constant #,(srcloc-list #'sym) sym))]
-      [(char-upper-case? (string-ref (symbol->string (syntax->datum #'sym)) 0))
-       (quasisyntax/loc #'sym
-         (variable #,(srcloc-list #'sym) 'sym))]
-      [else
-       (quasisyntax/loc #'sym
-         (constant #,(srcloc-list #'sym) 'sym))])]
-   [(_ (unsyntax sym:expr))
-    (quasisyntax/loc #'sym
-      (constant #,(srcloc-list #'sym) sym))]
-   [(_ sym:expr)
-    (quasisyntax/loc #'sym
-      (constant #,(srcloc-list #'sym) sym))]))
-
-(define-for-syntax (srcloc-list stx)
-  (define src (syntax-source stx))
-  `(list ,(if (path? src)
-             `(bytes->path ,(path->bytes src))
-             `',src)
-         ',(syntax-line stx)
-         ',(syntax-column stx)
-         ',(syntax-position stx)
-         ',(syntax-span stx)))
-
-(provide datalog datalog!
-         :- ! ~ ?)
diff --git a/pkgs/datalog/tests/ast.rkt b/pkgs/datalog/tests/ast.rkt
deleted file mode 100644
index 06a5b8e8b4..0000000000
--- a/pkgs/datalog/tests/ast.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang racket
-(require rackunit
-         datalog/ast
-         racket/runtime-path)
-
-(provide ast-tests)
-
-(define-runtime-path ast.rkt "ast.rkt")
-(define sym1-srcloc (list ast.rkt 1 1 10 3))
-(define sym2-srcloc (list #f #f #f #f #f))
-(define lit1-srcloc (list ast.rkt #f #f 3000 3))
-(define cl1-srcloc sym2-srcloc)
-
-(define ast-tests
-  (test-suite
-   "ast"
-   
-   (test-suite
-    "datum-equal?"
-    (test-not-false "str/str" (datum-equal? "str" "str"))
-    (test-false "str/str" (datum-equal? "str1" "str2"))
-    (test-not-false "sym/sym" (datum-equal? 'sym1 'sym1))
-    (test-false "sym/sym" (datum-equal? 'sym1 'sym2))
-    (test-false "str/sym" (datum-equal? "str" 'sym))
-    (test-false "sym/str" (datum-equal? 'sym "str")))
-   
-   (test-suite
-    "variable-equal?"
-    (test-not-false "var/var" (variable-equal? (make-variable #f 'sym1) (make-variable #f 'sym1)))
-    (test-not-false "var/var" (variable-equal? (make-variable #f 'sym1) (make-variable sym1-srcloc 'sym1)))
-    (test-false "var/var" (variable-equal? (make-variable #f 'sym1) (make-variable #f 'sym2)))
-    (test-false "var/var" (variable-equal? (make-variable #f 'sym1) (make-variable sym2-srcloc 'sym2))))
-   
-   (test-suite
-    "constant-equal?"
-    (test-not-false "sym/sym" (constant-equal? (make-constant #f 'sym1) (make-constant #f 'sym1)))
-    (test-not-false "sym/sym" (constant-equal? (make-constant #f 'sym1) (make-constant sym1-srcloc 'sym1)))
-    (test-false "sym/sym" (constant-equal? (make-constant #f 'sym1) (make-constant sym1-srcloc 'sym2)))
-    (test-not-false "str/str" (constant-equal? (make-constant #f "sym1") (make-constant #f "sym1")))
-    (test-not-false "str/str" (constant-equal? (make-constant #f "sym1") (make-constant sym1-srcloc "sym1")))
-    (test-false "str/str" (constant-equal? (make-constant #f "sym1") (make-constant sym1-srcloc "sym2")))
-    (test-false "sym/str" (constant-equal? (make-constant #f 'sym1) (make-constant sym1-srcloc "sym2")))
-    (test-false "str/sym" (constant-equal? (make-constant sym1-srcloc "sym2") (make-constant #f 'sym1))))
-   
-   (test-suite
-    "term-equal?"
-    (test-not-false "var/var" (term-equal? (make-variable #f 'sym1) (make-variable #f 'sym1)))
-    (test-not-false "var/var" (term-equal? (make-variable #f 'sym1) (make-variable sym1-srcloc 'sym1)))
-    (test-false "var/var" (term-equal? (make-variable #f 'sym1) (make-variable #f 'sym2)))
-    (test-false "var/var" (term-equal? (make-variable #f 'sym1) (make-variable sym2-srcloc 'sym2)))
-    (test-not-false "sym/sym" (term-equal? (make-constant #f 'sym1) (make-constant #f 'sym1)))
-    (test-not-false "sym/sym" (term-equal? (make-constant #f 'sym1) (make-constant sym1-srcloc 'sym1)))
-    (test-false "sym/sym" (term-equal? (make-constant #f 'sym1) (make-constant sym1-srcloc 'sym2)))
-    (test-not-false "str/str" (term-equal? (make-constant #f "sym1") (make-constant #f "sym1")))
-    (test-not-false "str/str" (term-equal? (make-constant #f "sym1") (make-constant sym1-srcloc "sym1")))
-    (test-false "str/str" (term-equal? (make-constant #f "sym1") (make-constant sym1-srcloc "sym2")))
-    (test-false "sym/str" (term-equal? (make-constant #f 'sym1) (make-constant sym1-srcloc "sym2")))
-    (test-false "str/sym" (term-equal? (make-constant sym1-srcloc "sym2") (make-constant #f 'sym1)))    
-    (test-false "con/var" (term-equal? (make-constant sym1-srcloc "sym2") (make-variable #f 'sym1)))
-    (test-false "var/con" (term-equal? (make-variable #f 'sym1) (make-constant sym1-srcloc "sym2"))))
-   
-   (test-suite
-    "literal-equal?"
-    (test-not-false "lit" (literal-equal? (make-literal #f 'lit1 empty) (make-literal lit1-srcloc 'lit1 empty)))
-    (test-not-false "lit" (literal-equal? (make-literal #f 'lit1 (list (make-variable #f 'sym1)))
-                                          (make-literal lit1-srcloc 'lit1 (list (make-variable #f 'sym1)))))
-    (test-not-false "lit" (literal-equal? (make-literal #f 'lit1 (list (make-variable #f 'sym1)))
-                                          (make-literal lit1-srcloc 'lit1 (list (make-variable sym1-srcloc 'sym1)))))
-    (test-false "lit" (literal-equal? (make-literal #f 'lit1 empty) (make-literal lit1-srcloc 'lit2 empty)))
-    (test-false "lit" (literal-equal? (make-literal #f 'lit1 (list (make-variable #f 'sym1))) (make-literal lit1-srcloc 'lit2 empty)))
-    (test-false "lit" (literal-equal? (make-literal #f 'lit1 (list (make-variable #f 'sym1)))
-                                      (make-literal lit1-srcloc 'lit2 (list (make-variable sym1-srcloc 'sym2))))))
-   
-   (test-suite
-    "clause-equal?"
-    (test-not-false "lit" (clause-equal? (make-clause #f (make-literal #f 'lit1 empty) empty)
-                                         (make-clause #f (make-literal #f 'lit1 empty) empty)))
-    (test-not-false "lit" (clause-equal? (make-clause #f (make-literal #f 'lit1 empty) (list (make-literal #f 'lit1 empty)))
-                                         (make-clause #f (make-literal #f 'lit1 empty) (list (make-literal #f 'lit1 empty)))))
-    (test-not-false "lit" (clause-equal? (make-clause #f (make-literal #f 'lit1 empty) empty)
-                                         (make-clause cl1-srcloc (make-literal #f 'lit1 empty) empty)))
-    (test-false "lit" (clause-equal? (make-clause #f (make-literal #f 'lit1 empty) empty)
-                                     (make-clause #f (make-literal #f 'lit2 empty) empty)))
-    (test-false "lit" (clause-equal? (make-clause #f (make-literal #f 'lit1 empty) (list (make-literal #f 'lit1 empty)))
-                                     (make-clause #f (make-literal #f 'lit1 empty) empty)))
-    (test-false "lit" (clause-equal? (make-clause #f (make-literal #f 'lit1 empty) (list (make-literal #f 'lit1 empty)))
-                                     (make-clause #f (make-literal #f 'lit1 empty) (list (make-literal #f 'lit2 empty))))))))
diff --git a/pkgs/datalog/tests/eval.rkt b/pkgs/datalog/tests/eval.rkt
deleted file mode 100644
index bc80718065..0000000000
--- a/pkgs/datalog/tests/eval.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket
-(require rackunit
-         racket/runtime-path
-         datalog/parse
-         datalog/eval)
-
-(provide eval-tests)
-
-(define-runtime-path here ".")
-
-(define (test-examples examples-dir)
-  
-  (define (test-example t)
-    (define test-rkt (build-path examples-dir (format "~a.rkt" t)))
-    (define test-txt (build-path examples-dir (format "~a.txt" t)))
-    (test-equal? t
-                 (with-input-from-string
-                     (with-output-to-string
-                         (lambda () (dynamic-require test-rkt #f)))
-                   port->lines)
-                 (file->lines test-txt)))
-  
-  (define (test-files d)
-    (for ([f (in-list (directory-list d))]
-          #:when (regexp-match #rx"rkt$" (path->bytes f)))
-      (test-example (path->string (path-replace-suffix f #"")))))
-  
-  (test-suite
-   (path->string examples-dir)
-   
-   (test-files examples-dir)))
-
-(define eval-tests
-  (test-suite
-   "eval"
-   
-   (test-examples (build-path here "examples"))
-   (test-examples (build-path here "paren-examples"))))
diff --git a/pkgs/datalog/tests/examples/ancestor.rkt b/pkgs/datalog/tests/examples/ancestor.rkt
deleted file mode 100644
index d60fbb0cf6..0000000000
--- a/pkgs/datalog/tests/examples/ancestor.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang datalog
-% Equality test
-ancestor(A, B) :-
-    parent(A, B).
-ancestor(A, B) :-
-    parent(A, C),
-    D = C,      % Unification required
-    ancestor(D, B).
-parent(john, douglas).
-parent(bob, john).
-parent(ebbon, bob).
-ancestor(A, B)?
diff --git a/pkgs/datalog/tests/examples/ancestor.txt b/pkgs/datalog/tests/examples/ancestor.txt
deleted file mode 100644
index bed107f84b..0000000000
--- a/pkgs/datalog/tests/examples/ancestor.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ancestor(ebbon, bob).
-ancestor(bob, john).
-ancestor(john, douglas).
-ancestor(bob, douglas).
-ancestor(ebbon, john).
-ancestor(ebbon, douglas).
diff --git a/pkgs/datalog/tests/examples/bidipath.rkt b/pkgs/datalog/tests/examples/bidipath.rkt
deleted file mode 100644
index cb1393bdc2..0000000000
--- a/pkgs/datalog/tests/examples/bidipath.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang datalog
-% path test from Chen & Warren
-edge(a, b). edge(b, c). edge(c, d). edge(d, a).
-path(X, Y) :- edge(X, Y).
-path(X, Y) :- edge(X, Z), path(Z, Y).
-path(X, Y) :- path(X, Z), edge(Z, Y).
-path(X, Y)?
diff --git a/pkgs/datalog/tests/examples/bidipath.txt b/pkgs/datalog/tests/examples/bidipath.txt
deleted file mode 100644
index f10d340c6a..0000000000
--- a/pkgs/datalog/tests/examples/bidipath.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-path(a, a).
-path(a, d).
-path(a, c).
-path(a, b).
-path(b, b).
-path(b, a).
-path(b, d).
-path(b, c).
-path(c, c).
-path(c, b).
-path(c, a).
-path(c, d).
-path(d, d).
-path(d, c).
-path(d, b).
-path(d, a).
diff --git a/pkgs/datalog/tests/examples/empty.rkt b/pkgs/datalog/tests/examples/empty.rkt
deleted file mode 100644
index d5dba62e42..0000000000
--- a/pkgs/datalog/tests/examples/empty.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang datalog
diff --git a/pkgs/datalog/tests/examples/empty.txt b/pkgs/datalog/tests/examples/empty.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pkgs/datalog/tests/examples/laps.rkt b/pkgs/datalog/tests/examples/laps.rkt
deleted file mode 100644
index 56bac6624a..0000000000
--- a/pkgs/datalog/tests/examples/laps.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang datalog
-% Laps Test
-contains(ca, store, rams_couch, rams).
-contains(rams, fetch, rams_couch, will).
-contains(ca, fetch, Name, Watcher) :-
-    contains(ca, store, Name, Owner),
-    contains(Owner, fetch, Name, Watcher).
-trusted(ca).
-permit(User, Priv, Name) :-
-    contains(Auth, Priv, Name, User),
-    trusted(Auth).
-permit(User, Priv, Name)?
diff --git a/pkgs/datalog/tests/examples/laps.txt b/pkgs/datalog/tests/examples/laps.txt
deleted file mode 100644
index d87ea5fb54..0000000000
--- a/pkgs/datalog/tests/examples/laps.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-permit(rams, store, rams_couch).
-permit(will, fetch, rams_couch).
diff --git a/pkgs/datalog/tests/examples/long.rkt b/pkgs/datalog/tests/examples/long.rkt
deleted file mode 100644
index a8b9912662..0000000000
--- a/pkgs/datalog/tests/examples/long.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang datalog
-abcdefghi(z123456789,
-z1234567890123456789,
-z123456789012345678901234567890123456789,
-z1234567890123456789012345678901234567890123456789012345678901234567890123456789).
-
-this_is_a_long_identifier_and_tests_the_scanners_concat_when_read_with_a_small_buffer.
-this_is_a_long_identifier_and_tests_the_scanners_concat_when_read_with_a_small_buffer?
diff --git a/pkgs/datalog/tests/examples/long.txt b/pkgs/datalog/tests/examples/long.txt
deleted file mode 100644
index ebf5669da9..0000000000
--- a/pkgs/datalog/tests/examples/long.txt
+++ /dev/null
@@ -1 +0,0 @@
-this_is_a_long_identifier_and_tests_the_scanners_concat_when_read_with_a_small_buffer.
diff --git a/pkgs/datalog/tests/examples/path.rkt b/pkgs/datalog/tests/examples/path.rkt
deleted file mode 100644
index 694aaab53f..0000000000
--- a/pkgs/datalog/tests/examples/path.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang datalog
-% path test from Chen & Warren
-edge(a, b). edge(b, c). edge(c, d). edge(d, a).
-path(X, Y) :- edge(X, Y).
-path(X, Y) :- edge(X, Z), path(Z, Y).
-path(X, Y)?
diff --git a/pkgs/datalog/tests/examples/path.txt b/pkgs/datalog/tests/examples/path.txt
deleted file mode 100644
index c014bcabbd..0000000000
--- a/pkgs/datalog/tests/examples/path.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-path(a, a).
-path(a, d).
-path(a, c).
-path(a, b).
-path(b, a).
-path(b, d).
-path(b, c).
-path(b, b).
-path(c, a).
-path(c, d).
-path(c, c).
-path(c, b).
-path(d, b).
-path(d, c).
-path(d, d).
-path(d, a).
diff --git a/pkgs/datalog/tests/examples/pq.rkt b/pkgs/datalog/tests/examples/pq.rkt
deleted file mode 100644
index c5efcec2a0..0000000000
--- a/pkgs/datalog/tests/examples/pq.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang datalog
-% p q test from Chen & Warren
-q(X) :- p(X).
-q(a).
-p(X) :- q(X).
-q(X)?
diff --git a/pkgs/datalog/tests/examples/pq.txt b/pkgs/datalog/tests/examples/pq.txt
deleted file mode 100644
index 7526e512b1..0000000000
--- a/pkgs/datalog/tests/examples/pq.txt
+++ /dev/null
@@ -1 +0,0 @@
-q(a).
diff --git a/pkgs/datalog/tests/examples/revpath.rkt b/pkgs/datalog/tests/examples/revpath.rkt
deleted file mode 100644
index 15d8fe959a..0000000000
--- a/pkgs/datalog/tests/examples/revpath.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang datalog
-% path test from Chen & Warren
-edge(a, b). edge(b, c). edge(c, d). edge(d, a).
-path(X, Y) :- edge(X, Y).
-path(X, Y) :- path(X, Z), edge(Z, Y).
-path(X, Y)?
diff --git a/pkgs/datalog/tests/examples/revpath.txt b/pkgs/datalog/tests/examples/revpath.txt
deleted file mode 100644
index f10d340c6a..0000000000
--- a/pkgs/datalog/tests/examples/revpath.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-path(a, a).
-path(a, d).
-path(a, c).
-path(a, b).
-path(b, b).
-path(b, a).
-path(b, d).
-path(b, c).
-path(c, c).
-path(c, b).
-path(c, a).
-path(c, d).
-path(d, d).
-path(d, c).
-path(d, b).
-path(d, a).
diff --git a/pkgs/datalog/tests/examples/says.rkt b/pkgs/datalog/tests/examples/says.rkt
deleted file mode 100644
index 5ee12bb17a..0000000000
--- a/pkgs/datalog/tests/examples/says.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang datalog
-tpme(tpme1).
-ms(m1,'TPME',tpme1,ek,tp).
-says(TPME,M) :- tpme(TPME),ms(M,'TPME',TPME,A,B).
-says(A,B)?
diff --git a/pkgs/datalog/tests/examples/says.txt b/pkgs/datalog/tests/examples/says.txt
deleted file mode 100644
index 473484aa10..0000000000
--- a/pkgs/datalog/tests/examples/says.txt
+++ /dev/null
@@ -1 +0,0 @@
-says(tpme1, m1).
diff --git a/pkgs/datalog/tests/examples/student.rkt b/pkgs/datalog/tests/examples/student.rkt
deleted file mode 100644
index 3ef89213ad..0000000000
--- a/pkgs/datalog/tests/examples/student.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang datalog
-friend(arnold,arnold).
-student(arnold,arnold,arnold) :- friend(arnold,arnold).
-student(arnold,arnold,arnold)?
diff --git a/pkgs/datalog/tests/examples/student.txt b/pkgs/datalog/tests/examples/student.txt
deleted file mode 100644
index 573c7a300f..0000000000
--- a/pkgs/datalog/tests/examples/student.txt
+++ /dev/null
@@ -1 +0,0 @@
-student(arnold, arnold, arnold).
diff --git a/pkgs/datalog/tests/examples/sym.rkt b/pkgs/datalog/tests/examples/sym.rkt
deleted file mode 100644
index 407a96be4b..0000000000
--- a/pkgs/datalog/tests/examples/sym.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang datalog
-
-sym(a).
-sym(b).
-sym(c).
-perm(X,Y) :- sym(X), sym(Y), X != Y.
-
-perm(X,Y)?
diff --git a/pkgs/datalog/tests/examples/sym.txt b/pkgs/datalog/tests/examples/sym.txt
deleted file mode 100644
index b410824089..0000000000
--- a/pkgs/datalog/tests/examples/sym.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-perm(a, c).
-perm(a, b).
-perm(c, a).
-perm(b, a).
-perm(b, c).
-perm(c, b).
diff --git a/pkgs/datalog/tests/examples/true.rkt b/pkgs/datalog/tests/examples/true.rkt
deleted file mode 100644
index eed11d3683..0000000000
--- a/pkgs/datalog/tests/examples/true.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang datalog
-true.
-true?
diff --git a/pkgs/datalog/tests/examples/true.txt b/pkgs/datalog/tests/examples/true.txt
deleted file mode 100644
index 48eb7ed1a0..0000000000
--- a/pkgs/datalog/tests/examples/true.txt
+++ /dev/null
@@ -1 +0,0 @@
-true.
diff --git a/pkgs/datalog/tests/examples/tutorial.rkt b/pkgs/datalog/tests/examples/tutorial.rkt
deleted file mode 100644
index 5981f22c80..0000000000
--- a/pkgs/datalog/tests/examples/tutorial.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang datalog
-
-parent(john,douglas).
-parent(john,douglas)?
-% parent(john, douglas).
-
-parent(john,ebbon)?
-
-parent(bob,john).
-parent(ebbon,bob).
-parent(A,B)?
-% parent(john, douglas).
-% parent(bob, john).
-% parent(ebbon, bob).
-
-parent(john,B)?
-% parent(john, douglas).
-
-parent(A,A)?
-
-ancestor(A,B) :- parent(A,B).
-ancestor(A,B) :- parent(A,C), ancestor(C, B).
-ancestor(A, B)?
-% ancestor(ebbon, bob).
-% ancestor(bob, john).
-% ancestor(john, douglas).
-% ancestor(bob, douglas).
-% ancestor(ebbon, john).
-% ancestor(ebbon, douglas).
-
-ancestor(X,john)?
-% ancestor(bob, john).
-% ancestor(ebbon, john).
-
-parent(bob, john)~
-parent(A,B)?
-% parent(john, douglas).
-% parent(ebbon, bob).
-
-ancestor(A,B)?
-% ancestor(john, douglas).
-% ancestor(ebbon, bob).
diff --git a/pkgs/datalog/tests/examples/tutorial.txt b/pkgs/datalog/tests/examples/tutorial.txt
deleted file mode 100644
index 7171742106..0000000000
--- a/pkgs/datalog/tests/examples/tutorial.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-parent(john, douglas).
-
-parent(john, douglas).
-parent(bob, john).
-parent(ebbon, bob).
-parent(john, douglas).
-
-ancestor(ebbon, bob).
-ancestor(bob, john).
-ancestor(john, douglas).
-ancestor(bob, douglas).
-ancestor(ebbon, john).
-ancestor(ebbon, douglas).
-ancestor(bob, john).
-ancestor(ebbon, john).
-parent(john, douglas).
-parent(ebbon, bob).
-ancestor(ebbon, bob).
-ancestor(john, douglas).
diff --git a/pkgs/datalog/tests/main.rkt b/pkgs/datalog/tests/main.rkt
deleted file mode 100644
index 61214ab369..0000000000
--- a/pkgs/datalog/tests/main.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket
-(require racket/runtime-path
-         rackunit
-         rackunit/text-ui
-         "ast.rkt"
-         
-         "private/lex.rkt"
-         "tool/syntax-color.rkt"
-         "parse.rkt"         
-         
-         "pretty.rkt"
-         
-         "private/env.rkt"
-         "private/subst.rkt"
-         "private/unify.rkt"
-         "private/variant.rkt"
-         
-         "runtime.rkt"
-         "eval.rkt")
-
-(define-runtime-path racket-mod "racket.rkt")
-(define stdout (current-output-port))
-
-(run-tests
- (test-suite
-  "Datalog"
-  ast-tests
-  
-  lex-tests
-  syntax-color-tests
-  parse-tests  
-  
-  pretty-tests
-  
-  env-tests
-  subst-tests
-  unify-tests
-  variant-tests
-  
-  runtime-tests
-  eval-tests
-  
-  (test-case "Racket Interop"
-             (parameterize ([current-output-port stdout])
-               (dynamic-require racket-mod #f)))))
diff --git a/pkgs/datalog/tests/paren-examples/add1.rkt b/pkgs/datalog/tests/paren-examples/add1.rkt
deleted file mode 100644
index 0f70b792c8..0000000000
--- a/pkgs/datalog/tests/paren-examples/add1.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang datalog/sexp
-(? (add1 2 :- X))
-
-(! (:- (add2 X Y)
-       (add1 X :- Z)
-       (add1 Z :- Y)))
-
-(? (add2 1 3))
-
-(? (add1 X :- 1))
diff --git a/pkgs/datalog/tests/paren-examples/add1.txt b/pkgs/datalog/tests/paren-examples/add1.txt
deleted file mode 100644
index 70700ca3bd..0000000000
--- a/pkgs/datalog/tests/paren-examples/add1.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add1(2) = (3).
-add2(1, 3).
-
diff --git a/pkgs/datalog/tests/paren-examples/ancestor.rkt b/pkgs/datalog/tests/paren-examples/ancestor.rkt
deleted file mode 100644
index 290994b776..0000000000
--- a/pkgs/datalog/tests/paren-examples/ancestor.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang datalog/sexp
-; Equality test
-(! (:- (ancestor A B)
-       (parent A B)))
-(! (:- (ancestor A B)
-       (parent A C)
-       (= D C) ; Unification required
-       (ancestor D B)))
-(! (parent john douglas))
-(! (parent bob john))
-(! (parent ebbon bob))
-(? (ancestor A B))
diff --git a/pkgs/datalog/tests/paren-examples/ancestor.txt b/pkgs/datalog/tests/paren-examples/ancestor.txt
deleted file mode 100644
index bed107f84b..0000000000
--- a/pkgs/datalog/tests/paren-examples/ancestor.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ancestor(ebbon, bob).
-ancestor(bob, john).
-ancestor(john, douglas).
-ancestor(bob, douglas).
-ancestor(ebbon, john).
-ancestor(ebbon, douglas).
diff --git a/pkgs/datalog/tests/paren-examples/bidipath.rkt b/pkgs/datalog/tests/paren-examples/bidipath.rkt
deleted file mode 100644
index fa0440f13a..0000000000
--- a/pkgs/datalog/tests/paren-examples/bidipath.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang datalog/sexp
-; path test from Chen & Warren
-(! (edge a b))
-(! (edge b c))
-(! (edge c d))
-(! (edge d a))
-(! (:- (path X Y)
-       (edge X Y)))
-(! (:- (path X Y)
-       (edge X Z)
-       (path Z Y)))
-(! (:- (path X Y)
-       (path X Z)
-       (edge Z Y)))
-(? (path X Y))
diff --git a/pkgs/datalog/tests/paren-examples/bidipath.txt b/pkgs/datalog/tests/paren-examples/bidipath.txt
deleted file mode 100644
index f10d340c6a..0000000000
--- a/pkgs/datalog/tests/paren-examples/bidipath.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-path(a, a).
-path(a, d).
-path(a, c).
-path(a, b).
-path(b, b).
-path(b, a).
-path(b, d).
-path(b, c).
-path(c, c).
-path(c, b).
-path(c, a).
-path(c, d).
-path(d, d).
-path(d, c).
-path(d, b).
-path(d, a).
diff --git a/pkgs/datalog/tests/paren-examples/empty.rkt b/pkgs/datalog/tests/paren-examples/empty.rkt
deleted file mode 100644
index dcc61e9736..0000000000
--- a/pkgs/datalog/tests/paren-examples/empty.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang datalog/sexp
diff --git a/pkgs/datalog/tests/paren-examples/empty.txt b/pkgs/datalog/tests/paren-examples/empty.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pkgs/datalog/tests/paren-examples/laps.rkt b/pkgs/datalog/tests/paren-examples/laps.rkt
deleted file mode 100644
index 66b38a9828..0000000000
--- a/pkgs/datalog/tests/paren-examples/laps.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang datalog/sexp
-; Laps Test
-(! (contains ca store rams_couch rams))
-(! (contains rams fetch rams_couch will))
-(! (:- (contains ca fetch Name Watcher)
-       (contains ca store Name Owner)
-       (contains Owner fetch Name Watcher)))
-(! (trusted ca))
-(! (:- (permit User Priv Name)
-       (contains Auth Priv Name User)
-       (trusted Auth)))
-(? (permit User Priv Name))
-
diff --git a/pkgs/datalog/tests/paren-examples/laps.txt b/pkgs/datalog/tests/paren-examples/laps.txt
deleted file mode 100644
index d87ea5fb54..0000000000
--- a/pkgs/datalog/tests/paren-examples/laps.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-permit(rams, store, rams_couch).
-permit(will, fetch, rams_couch).
diff --git a/pkgs/datalog/tests/paren-examples/long.rkt b/pkgs/datalog/tests/paren-examples/long.rkt
deleted file mode 100644
index ad6ef3d758..0000000000
--- a/pkgs/datalog/tests/paren-examples/long.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang datalog/sexp
-(! (abcdefghi z123456789
-              z1234567890123456789
-              z123456789012345678901234567890123456789
-              z1234567890123456789012345678901234567890123456789012345678901234567890123456789))
-(! this_is_a_long_identifier_and_tests_the_scanners_concat_when_read_with_a_small_buffer)
-(? this_is_a_long_identifier_and_tests_the_scanners_concat_when_read_with_a_small_buffer)
-
diff --git a/pkgs/datalog/tests/paren-examples/long.txt b/pkgs/datalog/tests/paren-examples/long.txt
deleted file mode 100644
index ebf5669da9..0000000000
--- a/pkgs/datalog/tests/paren-examples/long.txt
+++ /dev/null
@@ -1 +0,0 @@
-this_is_a_long_identifier_and_tests_the_scanners_concat_when_read_with_a_small_buffer.
diff --git a/pkgs/datalog/tests/paren-examples/path.rkt b/pkgs/datalog/tests/paren-examples/path.rkt
deleted file mode 100644
index ba2768e2cc..0000000000
--- a/pkgs/datalog/tests/paren-examples/path.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang datalog/sexp
-; path test from Chen & Warren
-(! (edge a b))
-(! (edge b c))
-(! (edge c d))
-(! (edge d a))
-(! (:- (path X Y)
-       (edge X Y)))
-(! (:- (path X Y)
-       (edge X Z)
-       (path Z Y)))
-(? (path X Y))
diff --git a/pkgs/datalog/tests/paren-examples/path.txt b/pkgs/datalog/tests/paren-examples/path.txt
deleted file mode 100644
index c014bcabbd..0000000000
--- a/pkgs/datalog/tests/paren-examples/path.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-path(a, a).
-path(a, d).
-path(a, c).
-path(a, b).
-path(b, a).
-path(b, d).
-path(b, c).
-path(b, b).
-path(c, a).
-path(c, d).
-path(c, c).
-path(c, b).
-path(d, b).
-path(d, c).
-path(d, d).
-path(d, a).
diff --git a/pkgs/datalog/tests/paren-examples/pq.rkt b/pkgs/datalog/tests/paren-examples/pq.rkt
deleted file mode 100644
index fb0a3eccb6..0000000000
--- a/pkgs/datalog/tests/paren-examples/pq.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang datalog/sexp
-; p q test from Chen & Warren
-(! (:- (q X)
-       (p X)))
-(! (q a))
-(! (:- (p X)
-       (q X)))
-(? (q X))
diff --git a/pkgs/datalog/tests/paren-examples/pq.txt b/pkgs/datalog/tests/paren-examples/pq.txt
deleted file mode 100644
index 7526e512b1..0000000000
--- a/pkgs/datalog/tests/paren-examples/pq.txt
+++ /dev/null
@@ -1 +0,0 @@
-q(a).
diff --git a/pkgs/datalog/tests/paren-examples/req.rkt b/pkgs/datalog/tests/paren-examples/req.rkt
deleted file mode 100644
index 620005a69d..0000000000
--- a/pkgs/datalog/tests/paren-examples/req.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang datalog/sexp
-(require racket/math)
-
-(? (sqr 4 :- X))
diff --git a/pkgs/datalog/tests/paren-examples/req.txt b/pkgs/datalog/tests/paren-examples/req.txt
deleted file mode 100644
index 8cc557431d..0000000000
--- a/pkgs/datalog/tests/paren-examples/req.txt
+++ /dev/null
@@ -1 +0,0 @@
-sqr(4) = (16).
diff --git a/pkgs/datalog/tests/paren-examples/revpath.rkt b/pkgs/datalog/tests/paren-examples/revpath.rkt
deleted file mode 100644
index 15751f1fbb..0000000000
--- a/pkgs/datalog/tests/paren-examples/revpath.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang datalog/sexp
-; path test from Chen & Warren
-(! (edge a b))
-(! (edge b c))
-(! (edge c d))
-(! (edge d a))
-(! (:- (path X Y)
-       (edge X Y)))
-(! (:- (path X Y)
-       (path X Z)
-       (edge Z Y)))
-(? (path X Y))
diff --git a/pkgs/datalog/tests/paren-examples/revpath.txt b/pkgs/datalog/tests/paren-examples/revpath.txt
deleted file mode 100644
index f10d340c6a..0000000000
--- a/pkgs/datalog/tests/paren-examples/revpath.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-path(a, a).
-path(a, d).
-path(a, c).
-path(a, b).
-path(b, b).
-path(b, a).
-path(b, d).
-path(b, c).
-path(c, c).
-path(c, b).
-path(c, a).
-path(c, d).
-path(d, d).
-path(d, c).
-path(d, b).
-path(d, a).
diff --git a/pkgs/datalog/tests/paren-examples/says.rkt b/pkgs/datalog/tests/paren-examples/says.rkt
deleted file mode 100644
index 90c7f71e9b..0000000000
--- a/pkgs/datalog/tests/paren-examples/says.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang datalog/sexp
-(! (tpme tpme1))
-(! (ms m1 "TPME" tpme1 ek tp))
-(! (:- (says TPME M)
-       (tpme TPME)
-       (ms M "TPME" TPME A B)))
-(? (says A B))
diff --git a/pkgs/datalog/tests/paren-examples/says.txt b/pkgs/datalog/tests/paren-examples/says.txt
deleted file mode 100644
index 473484aa10..0000000000
--- a/pkgs/datalog/tests/paren-examples/says.txt
+++ /dev/null
@@ -1 +0,0 @@
-says(tpme1, m1).
diff --git a/pkgs/datalog/tests/paren-examples/sym.rkt b/pkgs/datalog/tests/paren-examples/sym.rkt
deleted file mode 100644
index c2b07774cd..0000000000
--- a/pkgs/datalog/tests/paren-examples/sym.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang datalog/sexp
-
-(! (sym a))
-(! (sym b))
-(! (sym c))
-(! (:- (perm X Y)
-       (sym X)
-       (sym Y)
-       (!= X Y)))
-
-(? (perm X Y))
diff --git a/pkgs/datalog/tests/paren-examples/sym.txt b/pkgs/datalog/tests/paren-examples/sym.txt
deleted file mode 100644
index b410824089..0000000000
--- a/pkgs/datalog/tests/paren-examples/sym.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-perm(a, c).
-perm(a, b).
-perm(c, a).
-perm(b, a).
-perm(b, c).
-perm(c, b).
diff --git a/pkgs/datalog/tests/paren-examples/true.rkt b/pkgs/datalog/tests/paren-examples/true.rkt
deleted file mode 100644
index 0bce7f8cb7..0000000000
--- a/pkgs/datalog/tests/paren-examples/true.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang datalog/sexp
-(! true)
-(? true)
diff --git a/pkgs/datalog/tests/paren-examples/true.txt b/pkgs/datalog/tests/paren-examples/true.txt
deleted file mode 100644
index 48eb7ed1a0..0000000000
--- a/pkgs/datalog/tests/paren-examples/true.txt
+++ /dev/null
@@ -1 +0,0 @@
-true.
diff --git a/pkgs/datalog/tests/paren-examples/tutorial.rkt b/pkgs/datalog/tests/paren-examples/tutorial.rkt
deleted file mode 100644
index 6d51ed6749..0000000000
--- a/pkgs/datalog/tests/paren-examples/tutorial.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang datalog/sexp
-(! (parent john douglas))
-(? (parent john douglas))
-
-(? (parent john ebbon))
-
-(! (parent bob john))
-(! (parent ebbon bob))
-(? (parent A B))
-
-(? (parent john B))
-
-(? (parent A A))
-
-(! (:- (ancestor A B)
-       (parent A B)))
-(! (:- (ancestor A B)
-       (parent A C)
-       (ancestor C B)))
-(? (ancestor A B))
-
-(? (ancestor X john))
-
-(~ (parent bob john))
-
-(? (parent A B))
-
-(? (ancestor A B))
diff --git a/pkgs/datalog/tests/paren-examples/tutorial.txt b/pkgs/datalog/tests/paren-examples/tutorial.txt
deleted file mode 100644
index 7171742106..0000000000
--- a/pkgs/datalog/tests/paren-examples/tutorial.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-parent(john, douglas).
-
-parent(john, douglas).
-parent(bob, john).
-parent(ebbon, bob).
-parent(john, douglas).
-
-ancestor(ebbon, bob).
-ancestor(bob, john).
-ancestor(john, douglas).
-ancestor(bob, douglas).
-ancestor(ebbon, john).
-ancestor(ebbon, douglas).
-ancestor(bob, john).
-ancestor(ebbon, john).
-parent(john, douglas).
-parent(ebbon, bob).
-ancestor(ebbon, bob).
-ancestor(john, douglas).
diff --git a/pkgs/datalog/tests/parse.rkt b/pkgs/datalog/tests/parse.rkt
deleted file mode 100644
index 4b69cdd54c..0000000000
--- a/pkgs/datalog/tests/parse.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang racket
-(require rackunit
-         datalog/ast
-         datalog/parse
-         "util.rkt")
-
-(provide parse-tests)
-
-(define (test-literal-parse str res)
-  (test-literal str (parse-literal (open-input-string str)) res))
-(define (test-clause-parse str res)
-  (test-clause str (parse-clause (open-input-string str)) res))
-
-(define parse-tests
-  (test-suite
-   "parse"
-   
-   (test-suite
-    "literal"
-    (test-literal-parse "parent(john, douglas)"
-                        (make-literal #f 'parent (list (make-constant #f 'john) (make-constant #f 'douglas))))
-    (test-literal-parse "1 = 2"
-                        (make-literal #f '= (list (make-constant #f '|1|) (make-constant #f '|2|))))
-    (test-literal-parse "1 != 2"
-                        (make-literal #f '!= (list (make-constant #f '|1|) (make-constant #f '|2|))))
-    (test-literal-parse "zero-arity-literal"
-                        (make-literal #f 'zero-arity-literal empty))
-    (test-literal-parse "zero-arity-literal()"
-                        (make-literal #f 'zero-arity-literal empty))
-    (test-literal-parse "\"=\"(3,3)"
-                        (make-literal #f "=" (list (make-constant #f '|3|) (make-constant #f '|3|))))
-    (test-literal-parse "\"\"(-0-0-0,&&&,***,\"\00\")"
-                        (make-literal #f "" (list (make-constant #f '-0-0-0)
-                                                  (make-constant #f '&&&)
-                                                  (make-constant #f '***)
-                                                  (make-constant #f "\00")))))
-   
-   (test-suite
-    "clause"
-    (test-clause-parse "parent(john, douglas)"
-                       (make-clause #f (make-literal #f 'parent (list (make-constant #f 'john) (make-constant #f 'douglas))) empty))
-    (test-clause-parse "ancestor(A, B) :- parent(A, B)"
-                       (make-clause #f (make-literal #f 'ancestor (list (make-variable #f 'A) (make-variable #f 'B)))
-                                    (list (make-literal #f 'parent (list (make-variable #f 'A) (make-variable #f 'B))))))
-    (test-clause-parse "ancestor(A, B) :- parent(A, C), ancestor(C, B)"
-                       (make-clause #f (make-literal #f 'ancestor (list (make-variable #f 'A) (make-variable #f 'B)))
-                                    (list (make-literal #f 'parent (list (make-variable #f 'A) (make-variable #f 'C)))
-                                          (make-literal #f 'ancestor (list (make-variable #f 'C) (make-variable #f 'B)))))))
-   
-   (test-suite
-    "statement"
-    (test-not-false "assertion" (assertion? (parse-statement (open-input-string "parent(john, douglas)."))))
-    (test-not-false "retraction" (retraction? (parse-statement (open-input-string "parent(john, douglas)~"))))
-    (test-not-false "query" (query? (parse-statement (open-input-string "parent(john, douglas)?")))))))
diff --git a/pkgs/datalog/tests/pretty.rkt b/pkgs/datalog/tests/pretty.rkt
deleted file mode 100644
index 43783586d5..0000000000
--- a/pkgs/datalog/tests/pretty.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket
-(require rackunit
-         datalog/parse
-         datalog/pretty)
-(provide pretty-tests)
-
-(define pretty-tests
-  (test-suite
-   "Pretty"
-   
-   (test-equal? "program"
-                (format-program
-                 (parse-program
-                  (open-input-string #<<END
-parent(john, douglas).
-parent(john, douglas)?
-parent(john, ebbon)?
-parent(bob, john).
-parent(ebbon, bob).
-parent(A, B)?
-parent(john, B)?
-parent(A, A)?
-ancestor(A, B) :- parent(A, B).
-ancestor(A, B) :- 
- parent(A, C),
- ancestor(C, B).
-ancestor(A, B)?
-parent(bob, john)~
-parent(A,B)?
-ancestor(A,B)?
-END
-                      )))
-                #<<END
-parent(john, douglas).
-parent(john, douglas)?
-parent(john, ebbon)?
-parent(bob, john).
-parent(ebbon, bob).
-parent(A, B)?
-parent(john, B)?
-parent(A, A)?
-ancestor(A, B) :- parent(A, B).
-ancestor(A, B) :- parent(A, C), ancestor(C, B).
-ancestor(A, B)?
-parent(bob, john)~
-parent(A, B)?
-ancestor(A, B)?
-END
-                )))
diff --git a/pkgs/datalog/tests/private/env.rkt b/pkgs/datalog/tests/private/env.rkt
deleted file mode 100644
index c7ab070faf..0000000000
--- a/pkgs/datalog/tests/private/env.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket
-(require rackunit
-         datalog/ast
-         datalog/private/env)
-
-(provide env-tests)
-
-(define t1 (make-constant #f 't1))
-(define t2 (make-constant #f 't2))
-
-(define env-tests
-  (test-suite
-   "env"
-   
-   (test-equal? "default" (lookup (empty-env) 'v) #f)
-   (test-equal? "default" (lookup (empty-env) 'v t1) t1)
-   (test-equal? "extend" (lookup (extend (empty-env) 'v1 t1) 'v1) t1)
-   (test-equal? "extend"
-                (lookup (extend (extend (empty-env) 'v1 t1)
-                                'v1 t1)
-                        'v1)
-                t1)))
diff --git a/pkgs/datalog/tests/private/lex.rkt b/pkgs/datalog/tests/private/lex.rkt
deleted file mode 100644
index 15d19da445..0000000000
--- a/pkgs/datalog/tests/private/lex.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket
-(require rackunit
-         parser-tools/lex
-         datalog/private/lex)
-
-(provide lex-tests)
-
-(define (test-lexer str tok-name [tok-value str])
-  (define pv (dlexer (open-input-string str)))
-  (define v (position-token-token pv))
-  (test-equal? (format "lexer: ~a: <~a,~a>" str tok-name tok-value)
-               (cons tok-name tok-value)
-               (cons (token-name v) (token-value v))))
-
-(define lex-tests
-  (test-suite
-   "lex"
-   
-   (test-lexer "=" 'EQUAL #f)
-   (test-lexer "!=" 'NEQUAL #f)
-   (test-lexer "?" 'QMARK #f)
-   (test-lexer "~" 'TILDE #f)
-   (test-lexer "." 'DOT #f)
-   (test-lexer ")" 'RPAREN #f)
-   (test-lexer "," 'COMMA #f)
-   (test-lexer "(" 'LPAREN #f)
-   (test-lexer "\"\"" 'STRING "")
-   (test-lexer "\"foo\"" 'STRING "foo")
-   (test-lexer "\"\\\"\"" 'STRING "\"")
-   (test-lexer ":-" 'TSTILE #f)
-   (test-lexer "" 'EOF #f)
-   (test-lexer "Va1_" 'VARIABLE)
-   (test-lexer "val_" 'IDENTIFIER)
-   (test-lexer "912Kadf" 'IDENTIFIER)
-   (test-lexer "    =" 'EQUAL #f)
-   (test-lexer "% 12453\n=" 'EQUAL #f)
-   
-   ))
diff --git a/pkgs/datalog/tests/private/subst.rkt b/pkgs/datalog/tests/private/subst.rkt
deleted file mode 100644
index d83e990778..0000000000
--- a/pkgs/datalog/tests/private/subst.rkt
+++ /dev/null
@@ -1,114 +0,0 @@
-#lang racket
-(require rackunit
-         datalog/private/subst
-         datalog/ast
-         datalog/private/env)
-(require/expose datalog/private/subst (subst-literal shuffle))
-
-(provide subst-tests)
-
-(define (gensym-var? v)
-  (define s (variable-sym v))
-  (not (eq? s (string->symbol (symbol->string s)))))
-
-(define subst-tests
-  (test-suite
-   "subst"
-   
-   (test-suite
-    "subst-term"
-    (test-equal? "con" 
-                 (subst-term (empty-env) (make-constant #f 'v1))
-                 (make-constant #f 'v1))
-    (test-equal? "var def" 
-                 (subst-term (empty-env) (make-variable #f 'v1))
-                 (make-variable #f 'v1))
-    (test-equal? "var" 
-                 (subst-term (extend (empty-env) 'v1 (make-constant #f 'v1)) (make-variable #f 'v1))
-                 (make-constant #f 'v1)))
-   
-   (test-suite
-    "subst-literal"
-    (test-equal? "con"
-                 (subst-literal (empty-env) (make-literal #f 'lit (list (make-constant #f 'v1))))
-                 (make-literal #f 'lit (list (make-constant #f 'v1))))
-    (test-equal? "var def"
-                 (subst-literal (extend (empty-env) 'v1 (make-constant #f 'v1)) (make-literal #f 'lit (list (make-variable #f 'v1))))
-                 (make-literal #f 'lit (list (make-constant #f 'v1))))
-    (test-equal? "var def"
-                 (subst-literal (extend (empty-env) 'v1 (make-constant #f 'v1)) (make-literal #f 'lit (list (make-variable #f 'v1))))
-                 (make-literal #f 'lit (list (make-constant #f 'v1)))))
-   
-   (test-suite
-    "subst-clause"
-    (test-equal? "con"
-                 (subst-clause (empty-env) (make-clause #f (make-literal #f 'lit (list (make-constant #f 'v1))) empty))
-                 (make-clause #f (make-literal #f 'lit (list (make-constant #f 'v1))) empty))
-    (test-equal? "var def"
-                 (subst-clause (extend (empty-env) 'v1 (make-constant #f 'v1)) 
-                               (make-clause #f (make-literal #f 'lit (list (make-variable #f 'v1))) empty))
-                 (make-clause #f (make-literal #f 'lit (list (make-constant #f 'v1))) empty))
-    (test-equal? "var def"
-                 (subst-clause (extend (empty-env) 'v1 (make-constant #f 'v1)) 
-                               (make-clause #f (make-literal #f 'lit (list (make-variable #f 'v1))) empty))
-                 (make-clause #f (make-literal #f 'lit (list (make-constant #f 'v1))) empty))
-    
-    (test-equal? "con"
-                 (subst-clause (empty-env) (make-clause #f (make-literal #f 'lit (list (make-constant #f 'v1))) 
-                                                        (list (make-literal #f 'lit (list (make-constant #f 'v1))))))
-                 (make-clause #f (make-literal #f 'lit (list (make-constant #f 'v1)))
-                              (list (make-literal #f 'lit (list (make-constant #f 'v1))))))
-    (test-equal? "var def"
-                 (subst-clause (extend (empty-env) 'v1 (make-constant #f 'v1)) 
-                               (make-clause #f (make-literal #f 'lit (list (make-variable #f 'v1))) 
-                                            (list (make-literal #f 'lit (list (make-variable #f 'v1))))))
-                 (make-clause #f (make-literal #f 'lit (list (make-constant #f 'v1)))
-                              (list (make-literal #f 'lit (list (make-constant #f 'v1))))))
-    (test-equal? "var def"
-                 (subst-clause (extend (empty-env) 'v1 (make-constant #f 'v1)) 
-                               (make-clause #f (make-literal #f 'lit (list (make-variable #f 'v1)))
-                                            (list (make-literal #f 'lit (list (make-variable #f 'v1))))))
-                 (make-clause #f (make-literal #f 'lit (list (make-constant #f 'v1)))
-                              (list (make-literal #f 'lit (list (make-constant #f 'v1)))))))
-   
-   (test-suite
-    "shuffle"
-    (test-equal? "con" 
-                 (shuffle (empty-env) (make-literal #f 'lit (list (make-constant #f 'v1))))
-                 (empty-env))
-    (test-equal? "var" 
-                 (shuffle (extend (empty-env) 'v1 (make-constant #f 'k1)) (make-literal #f 'lit (list (make-variable #f 'v1))))
-                 (extend (empty-env) 'v1 (make-constant #f 'k1)))
-    (test-not-false "var"
-                    (gensym-var? (lookup (shuffle (empty-env)
-                                                  (make-literal #f 'lit (list (make-variable #f 'v1))))
-                                         'v1))))
-   
-   (test-suite
-    "rename-question"
-    (test-equal? "l" (rename-question (make-literal #f 'lit (list (make-constant #f 'v1))))
-                 (make-literal #f 'lit (list (make-constant #f 'v1))))
-    (test-not-false "l"
-                    (gensym-var?
-                     (first
-                      (literal-terms
-                       (rename-question (make-literal #f 'lit (list (make-variable #f 'v1)))))))))
-   
-   (test-suite
-    "rename-clause"
-    (test-equal? "c" (rename-clause (make-clause #f (make-literal #f 'lit (list (make-constant #f 'v1))) empty))
-                 (make-clause #f (make-literal #f 'lit (list (make-constant #f 'v1))) empty))
-    (test-not-false "c"
-                    (gensym-var? 
-                     (first
-                      (literal-terms
-                       (clause-head 
-                        (rename-clause (make-clause #f (make-literal #f 'lit (list (make-variable #f 'v1))) empty)))))))
-    (test-not-false "c"
-                    (gensym-var? 
-                     (first
-                      (literal-terms
-                       (first
-                        (clause-body
-                         (rename-clause (make-clause #f (make-literal #f 'lit (list (make-constant #f 'v1)))
-                                                     (list (make-literal #f 'lit (list (make-variable #f 'v1)))))))))))))))
diff --git a/pkgs/datalog/tests/private/unify.rkt b/pkgs/datalog/tests/private/unify.rkt
deleted file mode 100644
index 7fbe37537b..0000000000
--- a/pkgs/datalog/tests/private/unify.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang racket
-(require rackunit
-         datalog/ast
-         datalog/private/env
-         datalog/private/unify)
-(require/expose datalog/private/unify (chase))
-
-(provide unify-tests)
-
-(define unify-tests
-  (test-suite
-   "unify"
-   
-   (test-suite
-    "chase"
-    (test-equal? "con" (chase (empty-env) (make-constant #f 'k1))
-                 (make-constant #f 'k1))
-    (test-equal? "var" (chase (empty-env) (make-variable #f 'v1))
-                 (make-variable #f 'v1))
-    (test-equal? "var->con"
-                 (chase (extend (empty-env) 'v1 (make-constant #f 'k1)) (make-variable #f 'v1))
-                 (make-constant #f 'k1))
-    (test-equal? "var->var->con"
-                 (chase (extend (extend (empty-env) 'v2 (make-constant #f 'k1))
-                                'v1 (make-variable #f 'v2))
-                        (make-variable #f 'v1))
-                 (make-constant #f 'k1)))
-   
-   (test-suite
-    "unify-term"
-    (test-equal? "con/con" (unify-term (empty-env) (make-constant #f 'k1) (make-constant #f 'k1))
-                 (empty-env))
-    (test-false "con/con" (unify-term (empty-env) (make-constant #f 'k1) (make-constant #f 'k2)))
-    (test-equal? "var/con" (unify-term (empty-env) (make-variable #f 'v1) (make-constant #f 'k2))
-                 (extend (empty-env) 'v1 (make-constant #f 'k2)))
-    (test-equal? "con/var" (unify-term (empty-env) (make-constant #f 'k2) (make-variable #f 'v1))
-                 (extend (empty-env) 'v1 (make-constant #f 'k2)))
-    (test-equal? "var/var" (unify-term (empty-env) (make-variable #f 'v1) (make-variable #f 'v2))
-                 (extend (empty-env) 'v1 (make-variable #f 'v2))))
-   
-   (test-suite
-    "unify-terms"
-    (test-equal? "con/con" (unify-terms (empty-env) (list (make-constant #f 'k1)) (list (make-constant #f 'k1)))
-                 (empty-env))
-    (test-false "con/con" (unify-terms (empty-env) (list (make-constant #f 'k1)) (list (make-constant #f 'k2))))
-    (test-false "/con" (unify-terms (empty-env) (list) (list (make-constant #f 'k2))))
-    (test-false "con/" (unify-terms (empty-env) (list (make-constant #f 'k2)) (list))))
-   
-   (test-suite
-    "unify"
-    (test-false "lit/lit" (unify (make-literal #f 'lit1 empty) (make-literal #f 'lit2 empty)))
-    (test-equal? "con/con" (unify (make-literal #f 'lit1 (list (make-constant #f 'k1)))
-                                  (make-literal #f 'lit1 (list (make-constant #f 'k1))))
-                 (empty-env)))))
diff --git a/pkgs/datalog/tests/private/variant.rkt b/pkgs/datalog/tests/private/variant.rkt
deleted file mode 100644
index f3b0e904aa..0000000000
--- a/pkgs/datalog/tests/private/variant.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket
-(require rackunit
-         datalog/ast
-         datalog/private/variant)
-(require/expose datalog/private/variant
-                (variant-terms variant-term variant-var variant? term-hash mk-literal-hash))
-
-(provide variant-tests)
-
-(define (test-not-equal? n v1 v2)
-  (test-case n (check-not-equal? v1 v2)))
-
-(define variant-tests
-  (test-suite
-   "variant"
-   
-   (test-suite 
-    "variant?"
-    (test-not-false "same" (variant? (make-literal #f 'lit1 empty) (make-literal #f 'lit1 empty)))
-    (test-false "dif lit" (variant? (make-literal #f 'lit1 empty) (make-literal #f 'lit2 empty)))
-    (test-not-false "same" (variant? (make-literal #f 'lit1 (list (make-constant #f 'k1))) 
-                                     (make-literal #f 'lit1 (list (make-constant #f 'k1)))))
-    (test-false "dif con" (variant? (make-literal #f 'lit1 (list (make-constant #f 'k1))) 
-                                    (make-literal #f 'lit1 (list (make-constant #f 'k2)))))
-    (test-false "dif var/con" (variant? (make-literal #f 'lit1 (list (make-variable #f 'v1))) 
-                                        (make-literal #f 'lit1 (list (make-constant #f 'k1)))))
-    (test-false "dif con/var" (variant? (make-literal #f 'lit1 (list (make-constant #f 'k1))) 
-                                        (make-literal #f 'lit1 (list (make-variable #f 'v1)))))
-    (test-not-false "same" (variant? (make-literal #f 'lit1 (list (make-variable #f 'v1))) 
-                                     (make-literal #f 'lit1 (list (make-variable #f 'v1)))))
-    
-    (test-not-false "var (dif name)" (variant? (make-literal #f 'lit1 (list (make-variable #f 'v2))) 
-                                               (make-literal #f 'lit1 (list (make-variable #f 'v1))))))
-   
-   (test-suite
-    "mem-literal"
-    (test-false "mt" (mem-literal (make-literal #f 'lit1 empty) empty))
-    (test-not-false "in" (mem-literal (make-literal #f 'lit1 empty) (list (make-literal #f 'lit1 empty))))
-    (test-not-false "var" (mem-literal (make-literal #f 'lit1 (list (make-variable #f 'v2))) 
-                                       (list (make-literal #f 'lit1 (list (make-variable #f 'v1)))))))
-   
-   (test-suite
-    "term-hash"
-    (test-equal? "var" (term-hash (make-variable #f (gensym)) equal-hash-code) 101)
-    (test-equal? "con" (term-hash (make-constant #f 'v2) equal-hash-code) (equal-hash-code 'v2)))
-   
-   (local [(define literal-hash (mk-literal-hash equal-hash-code))
-           (define (literal-hash-equal? l1 l2)
-             (equal? (literal-hash l1) (literal-hash l2)))]
-     (test-suite
-      "mk-literal-hash"
-      (test-not-false "same" (literal-hash-equal? (make-literal #f 'lit1 empty) (make-literal #f 'lit1 empty)))
-      (test-not-false "same" (literal-hash-equal? (make-literal #f 'lit1 (list (make-constant #f 'k1))) 
-                                                  (make-literal #f 'lit1 (list (make-constant #f 'k1)))))
-      (test-not-false "same" (literal-hash-equal? (make-literal #f 'lit1 (list (make-variable #f 'v1))) 
-                                                  (make-literal #f 'lit1 (list (make-variable #f 'v1)))))
-      
-      (test-not-false "var (dif name)" (literal-hash-equal? (make-literal #f 'lit1 (list (make-variable #f 'v2))) 
-                                                            (make-literal #f 'lit1 (list (make-variable #f 'v1)))))))))
diff --git a/pkgs/datalog/tests/racket.rkt b/pkgs/datalog/tests/racket.rkt
deleted file mode 100644
index 8d1ab3ac38..0000000000
--- a/pkgs/datalog/tests/racket.rkt
+++ /dev/null
@@ -1,126 +0,0 @@
-#lang racket
-(require datalog tests/eli-tester)
-
-(define parent (make-theory))
- 
-(test
- (datalog parent
-          (! (parent joseph2 joseph1))
-          (! (parent joseph2 lucy))
-          (! (parent joseph3 joseph2)))
- =>
- empty
- 
- (datalog parent
-          (? (parent X joseph2)))
- =>
- (list (hasheq 'X 'joseph3))
-
- (datalog parent
-          (? (parent X (string->symbol "joseph2"))))
- =>
- (list (hasheq 'X 'joseph3))
-
- (let ([atom 'joseph2])
-   (datalog parent
-            (? (parent X #,atom))))
- =>
- (list (hasheq 'X 'joseph3))
-
- (let ([table 'parent])
-   (datalog parent
-            (? (#,table X joseph2))))
- =>
- (list (hasheq 'X 'joseph3))
- 
- (datalog parent
-          (? (parent joseph2 X)))
- =>
- (list (hasheq 'X 'joseph1)
-       (hasheq 'X 'lucy))
- 
- (datalog parent
-          (? (parent joseph2 X))
-          (? (parent X joseph2)))
- =>
- (list (hasheq 'X 'joseph3))
- 
- (datalog parent
-          (! (:- (ancestor A B)
-                 (parent A B)))
-          (! (:- (ancestor A B)
-                 (parent A C)
-                 (= D C) ; Unification required
-                 (ancestor D B))))
- =>
- empty
- 
- (datalog parent
-          (? (ancestor A B)))
- =>
- (list (hasheq 'A 'joseph3 'B 'joseph2)
-       (hasheq 'A 'joseph2 'B 'lucy)
-       (hasheq 'A 'joseph2 'B 'joseph1)
-       (hasheq 'A 'joseph3 'B 'lucy)
-       (hasheq 'A 'joseph3 'B 'joseph1))
- 
- (let ([x 'joseph2])
-   (datalog parent
-            (? (parent x X))))
- =>
- (list (hasheq 'X 'joseph1)
-       (hasheq 'X 'lucy))
- 
- (datalog parent
-          (? (add1 1 :- X)))
- =>
- (list (hasheq 'X 2))
-
- (datalog parent
-          (? (add1 X :- 2)))
- =>
- (list)
-
- (datalog parent
-          (? (#,(λ (x) (+ x 1)) 1 :- X)))
- =>
- (list (hasheq 'X 2))
- 
- (let ()
-   (define new-parent
-     (with-input-from-bytes 
-         (with-output-to-bytes (λ () (write-theory parent)))
-       (λ () (read-theory))))
-   (test
-    (datalog new-parent
-             (? (ancestor A B)))
-    =>
-    (list (hasheq 'A 'joseph3 'B 'joseph2)
-          (hasheq 'A 'joseph2 'B 'lucy)
-          (hasheq 'A 'joseph2 'B 'joseph1)
-          (hasheq 'A 'joseph3 'B 'lucy)
-          (hasheq 'A 'joseph3 'B 'joseph1))))
- 
- (local [(local-require datalog/tests/examples/ancestor)]
-   (datalog theory
-            (? (ancestor A B))))
- =>
- (list (hasheq 'A 'ebbon 'B 'bob)
-       (hasheq 'A 'bob 'B 'john)
-       (hasheq 'A 'john 'B 'douglas)
-       (hasheq 'A 'bob 'B 'douglas)
-       (hasheq 'A 'ebbon 'B 'john)
-       (hasheq 'A 'ebbon 'B 'douglas))
- 
-  (local [(local-require datalog/tests/paren-examples/ancestor)]
-   (datalog theory
-            (? (ancestor A B))))
- =>
- (list (hasheq 'A 'ebbon 'B 'bob)
-       (hasheq 'A 'bob 'B 'john)
-       (hasheq 'A 'john 'B 'douglas)
-       (hasheq 'A 'bob 'B 'douglas)
-       (hasheq 'A 'ebbon 'B 'john)
-       (hasheq 'A 'ebbon 'B 'douglas))
- 
- )
diff --git a/pkgs/datalog/tests/runtime.rkt b/pkgs/datalog/tests/runtime.rkt
deleted file mode 100644
index d68fcdc820..0000000000
--- a/pkgs/datalog/tests/runtime.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket
-(require rackunit
-         datalog/parse
-         datalog/runtime
-         "util.rkt")
-
-(provide runtime-tests)
-
-(define pc (parse-clause (open-input-string "parent(john, douglas)")))
-(define pl (parse-literal (open-input-string "parent(john, douglas)")))
-
-(define runtime-tests
-  (test-suite
-   "runtime"
-   
-   (test-suite
-    "safe-clause?"
-    (test-not-false "safe" (safe-clause? pc))
-    (test-not-false "safe" (safe-clause? (parse-clause (open-input-string "ancestor(A, B) :- parent(A, B)"))))
-    (test-false "not safe" (safe-clause? (parse-clause (open-input-string "ancestor(A, B) :- parent(jay, B)"))))
-    (test-not-false "safe" (safe-clause? (parse-clause (open-input-string "ancestor(A, B) :- parent(A, C), ancestor(C, B)")))))
-   
-   (test-suite
-    "mut simple"
-    (test-equal? "empty" (prove (make-theory) pl) empty)
-    (test-literal "ass->prov" 
-                  (let ([thy (make-theory)])
-                    (assume! thy pc)
-                    (first (prove thy pl)))
-                  pl)
-    (test-equal? "ass->ret->prov" 
-                 (let ([thy (make-theory)])
-                   (assume! thy pc)
-                   (retract! thy pc)
-                   (prove thy pl))
-                 empty)
-    (test-equal? "ret->prov" 
-                 (let ([thy (make-theory)])
-                   (retract! thy pc)
-                   (prove thy pl))
-                 empty))
-   
-   ))
-
diff --git a/pkgs/datalog/tests/test-docs-complete.rkt b/pkgs/datalog/tests/test-docs-complete.rkt
deleted file mode 100644
index de9a6830b7..0000000000
--- a/pkgs/datalog/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote datalog))
diff --git a/pkgs/datalog/tests/tool/syntax-color.rkt b/pkgs/datalog/tests/tool/syntax-color.rkt
deleted file mode 100644
index 2b9cfd8b3e..0000000000
--- a/pkgs/datalog/tests/tool/syntax-color.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket
-(require rackunit
-         datalog/tool/syntax-color)
-
-(provide syntax-color-tests)
-
-(define (test-color str key)
-  (define-values (lex color b start end) (get-syntax-token (open-input-string str)))
-  (test-equal? (format "Syntax Color: ~a: ~a" key str) color key))
-
-(define syntax-color-tests
-  (test-suite
-   "syntax-color"
-   
-   (test-color " " 'whitespace)
-   (test-color "   " 'whitespace)
-   (test-color "\t" 'whitespace)
-   (test-color "\n" 'whitespace)
-   (test-color "% \n" 'comment)
-   (test-color "% 12 31 2 6\n" 'comment)
-   (test-color "Var" 'symbol)
-   (test-color "V124_3" 'symbol)
-   (test-color "var" 'identifier)
-   (test-color "123var" 'identifier)
-   (test-color "(" 'parenthesis)
-   (test-color ")" 'parenthesis)
-   (test-color "!=" 'parenthesis)
-   (test-color "=" 'parenthesis)
-   (test-color "?" 'parenthesis)
-   (test-color "~" 'parenthesis)
-   (test-color "." 'parenthesis)
-   (test-color "," 'parenthesis)
-   (test-color ":-" 'parenthesis)
-   (test-color "\"foo\"" 'string)
-   (test-color "\"fo\\\"o\"" 'string)
-   (test-color "\"fo\no\"" 'string)
-   (test-color "\"foo" 'error)
-   (test-color ":" 'error)))
diff --git a/pkgs/datalog/tests/util.rkt b/pkgs/datalog/tests/util.rkt
deleted file mode 100644
index 581c80c182..0000000000
--- a/pkgs/datalog/tests/util.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket
-(require rackunit
-         datalog/ast)
-
-(provide test-literal test-clause)
-
-(define (test-literal str l1 l2)
-  (test-case 
-   str (check literal-equal? l1 l2)))
-(define (test-clause str c1 c2)
-  (test-case 
-   str (check clause-equal? c1 c2)))
diff --git a/pkgs/datalog/tool/datalog.png b/pkgs/datalog/tool/datalog.png
deleted file mode 100644
index 6f55fb1d90..0000000000
Binary files a/pkgs/datalog/tool/datalog.png and /dev/null differ
diff --git a/pkgs/datalog/tool/submit.rkt b/pkgs/datalog/tool/submit.rkt
deleted file mode 100644
index 61db9bee64..0000000000
--- a/pkgs/datalog/tool/submit.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang racket/base
-
-(define (delimiter-pair? x y)
-  (and (char=? x #\() (char=? y #\))))
-
-(define (repl-submit? ip has-white-space?)
-  (let loop ([blank? #t]
-             [string-char #f]
-             [delimiter-stack null]
-             [closed? #f])
-    (let ([c (read-char ip)])
-      (if (eof-object? c)
-          (and closed?
-               (not blank?)
-               (not string-char)
-               (null? delimiter-stack))
-          (case c
-            [(#\. #\? #\~)
-             (if string-char
-                 (loop #f string-char delimiter-stack #f)
-                 (loop #f #f delimiter-stack #t))]
-            [(#\()
-             (if string-char
-                 (loop #f string-char delimiter-stack #f)
-                 (loop #f #f (cons c delimiter-stack) #f))]
-            [(#\))
-             (cond
-               [string-char
-                (loop #f string-char delimiter-stack #f)]
-               [(and (pair? delimiter-stack)
-                     (delimiter-pair? (car delimiter-stack) c))
-                (loop #f #f (cdr delimiter-stack) #f)]
-               [else
-                (loop #f #f delimiter-stack #f)])]
-            [(#\")
-             (cond
-               [(and string-char (char=? c string-char))
-                (loop #f #f delimiter-stack #f)]
-               [string-char
-                (loop #f string-char delimiter-stack #f)]
-               [else
-                (loop #f c delimiter-stack #f)])]
-            [(#\\)
-             (if string-char
-                 (begin (read-char ip)
-                        (loop #f string-char delimiter-stack #f))
-                 (loop #f string-char delimiter-stack #f))]
-            [else
-             (loop (and blank? (char-whitespace? c))
-                   string-char
-                   delimiter-stack
-                   closed?)])))))
-
-(provide repl-submit?)
diff --git a/pkgs/datalog/tool/syntax-color.rkt b/pkgs/datalog/tool/syntax-color.rkt
deleted file mode 100644
index ab41cd07c0..0000000000
--- a/pkgs/datalog/tool/syntax-color.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket/base
-(require parser-tools/lex
-         (prefix-in : parser-tools/lex-sre)
-         "../private/lex.rkt")
-
-(provide get-syntax-token)
-
-(define (syn-val lex a b c d)
-  (values lex a b (position-offset c) (position-offset d)))
-
-(define (colorize-string my-start-pos)
-  (define lxr
-    (lexer
-     [(:~ #\" #\\) (lxr input-port)]
-     [(:: #\\ #\\) (lxr input-port)]
-     [(:: #\\ #\newline) (lxr input-port)]
-     [(:: #\\ #\") (lxr input-port)]
-     [(eof) (syn-val "" 'error #f my-start-pos end-pos)]
-     [#\" (syn-val "" 'string #f my-start-pos end-pos)]))
-  lxr)
-
-(define get-syntax-token
-  (lexer
-   [(:+ whitespace)
-    (syn-val lexeme 'whitespace #f start-pos end-pos)]
-   [comment-re
-    (syn-val lexeme 'comment #f start-pos end-pos)]
-   [variable-re
-    (syn-val lexeme 'symbol #f start-pos end-pos)]
-   [identifier-re
-    (syn-val lexeme 'identifier #f start-pos end-pos)]
-   [(:or #\) #\() (syn-val lexeme 'parenthesis #f start-pos end-pos)]
-   [(:or "!=" #\= #\? #\~ #\. #\, ":-") (syn-val lexeme 'parenthesis #f start-pos end-pos)]
-   [(eof) (syn-val lexeme 'eof #f start-pos end-pos)]
-   [#\" ((colorize-string start-pos) input-port)]
-   [any-char (syn-val lexeme 'error #f start-pos end-pos)]
-   [(special) (syn-val lexeme 'error #f start-pos end-pos)]
-   [(special-comment) (syn-val lexeme 'error #f start-pos end-pos)]))
diff --git a/pkgs/db-pkgs/db-doc/LICENSE.txt b/pkgs/db-pkgs/db-doc/LICENSE.txt
deleted file mode 100644
index 5126bf62be..0000000000
--- a/pkgs/db-pkgs/db-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-db-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/db-pkgs/db-doc/db/info.rkt b/pkgs/db-pkgs/db-doc/db/info.rkt
deleted file mode 100644
index f8d62895fe..0000000000
--- a/pkgs/db-pkgs/db-doc/db/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define collection "db")
-(define scribblings '(("scribblings/db.scrbl" (multi-page))))
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/config.rkt b/pkgs/db-pkgs/db-doc/db/scribblings/config.rkt
deleted file mode 100644
index d14b4f1866..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/config.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang racket/base
-(require scribble/manual
-         scribble/eval
-         unstable/sandbox
-         (for-label racket/base
-                    racket/contract))
-(provide (all-defined-out)
-         (for-label (all-from-out racket/base)
-                    (all-from-out racket/contract)))
-
-(define (tech/reference . pre-flows)
-  (apply tech #:doc '(lib "scribblings/reference/reference.scrbl") pre-flows))
-
-(define (parheading . pre-flows)
-  (elem (apply bold pre-flows) (hspace 1)))
-
-(define (wplink path . pre-flows)
-  (apply hyperlink (string-append "http://en.wikipedia.org/wiki/" path) pre-flows))
-
-;; ----
-
-#|
-Whenever examples are changed, added, removed, or reordered, the
-example log files must be regenerated. To do so, set log-mode below to
-'record and run setup. Regenerating the logs require an environment
-that defines the DSN 'db-scribble-env as a PostgreSQL data source.
-
-Set log-mode back to 'replay before checking in the changes.
-
-Use one evaluator (and log file) per scribble file, so that when DrDr
-runs scribble files individually, they still work.
-|#
-
-(define log-mode 'replay)
-
-(define (make-pg-eval log-file init?)
-  (let ([ev (make-log-based-eval log-file log-mode)])
-    (ev '(require racket/class
-                  db
-                  db/util/postgresql
-                  db/util/datetime))
-    (when init?
-      (ev '(begin
-             ;; Must be kept in sync with beginning of using-db.scrbl
-             (define pgc (dsn-connect 'db-scribble-env))
-             (query-exec pgc "create temporary table the_numbers (n integer, d varchar(20))")
-             (query-exec pgc "insert into the_numbers values (0, 'nothing')")
-             (query-exec pgc "insert into the_numbers values (1, 'the loneliest number')")
-             (query-exec pgc "insert into the_numbers values (2, 'company')")
-             (query-exec pgc "insert into the_numbers values (3, 'a crowd')"))))
-    ev))
-
-#|
-The fake eval is for eg connection examples
-|#
-
-(define fake-eval (make-base-eval))
-(fake-eval '(begin (require racket/class)
-                   (define connection% (class object% (super-new)))))
-
-(define-syntax-rule (fake-examples [example result] ...)
-  (examples #:eval fake-eval (eval:alts example result) ...))
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/connect.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/connect.scrbl
deleted file mode 100644
index 0c2ce92e25..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/connect.scrbl
+++ /dev/null
@@ -1,765 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          scribble/struct
-          racket/sandbox
-          racket/runtime-path
-          "config.rkt"
-          (for-label db
-                     openssl))
-
-
-@(define-runtime-path log-file "log-for-connect.rktd")
-@(define the-eval (make-pg-eval log-file #t))
-
-@title[#:tag "connect"]{Connections}
-
-This section describes functions for creating connections as well as
-administrative functions for managing connections.
-
-@section[#:tag "creating-connections"]{Base Connections}
-
-@declare-exporting[db]
-
-There are four kinds of base connection, and they are divided into two
-groups: @deftech{wire-based connections} and @deftech{FFI-based
-connections}. PostgreSQL and MySQL connections are wire-based, and
-SQLite and ODBC connections are FFI-based. See also
-@secref["ffi-concurrency"].
-
-Base connections are made using the following functions.
-
-@defproc[(postgresql-connect [#:user user string?]
-                  [#:database database string?]
-                  [#:server server string? "localhost"]
-                  [#:port port exact-positive-integer? 5432]
-                  [#:socket socket (or/c path-string? 'guess #f) #f]
-                  [#:password password (or/c string? #f) #f]
-                  [#:allow-cleartext-password? allow-cleartext-password?
-                   boolean? #f]
-                  [#:ssl ssl (or/c 'yes 'optional 'no) 'no]
-                  [#:ssl-context ssl-context ssl-client-context?
-                   (ssl-make-client-context 'sslv3)]
-                  [#:notice-handler notice-handler
-                   (or/c 'output 'error output-port?
-                         (-> string? string? any))
-                   void]
-                  [#:notification-handler notification-handler
-                   (or/c 'output 'error output-port?
-                         (-> string? any))
-                   void])
-         connection?]{
-
-  Creates a connection to a PostgreSQL server. Only the
-  @racket[database] and @racket[user] arguments are mandatory.
-
-  By default, the connection is made via TCP to @racket["localhost"]
-  at port @racket[5432]. To make a different TCP connection, provide
-  one or both of the @racket[server] and @racket[port] arguments.
-
-  To connect via a local socket, specify the socket path as the
-  @racket[socket] argument. You must not supply the @racket[socket]
-  argument if you have also supplied either of the TCP arguments. See
-  also @secref{connecting-to-server} for notes on socket
-  paths. Supplying a @racket[socket] argument of @racket['guess] is
-  the same as supplying @racket[(postgresql-guess-socket-path)].
-  Sockets are only available under Linux (x86) and Mac OS X.
-
-  If the server requests password authentication, the
-  @racket[password] argument must be present; otherwise an exception
-  is raised. If the server does not request password authentication,
-  the @racket[password] argument is ignored and may be omitted.  A
-  connection normally only sends password hashes (using the @tt{md5}
-  authentication method). If the server requests a password sent as
-  cleartext (un-hashed), the connection is aborted unless
-  @racket[allow-cleartext-password?] is true.
-
-  If the @racket[ssl] argument is either @racket['yes] or
-  @racket['optional], the connection attempts to negotiate an SSL
-  connection. If the server refuses SSL, the connection raises an
-  exception if @racket[ssl] was set to @racket['yes] or continues with
-  an unencrypted connection if @racket[ssl] was set to
-  @racket['optional]. By default, SSL provides encryption but does not
-  verify the identity of the server (see
-  @hyperlink["http://www.postgresql.org/docs/9.0/static/libpq-ssl.html"]{this
-  explanation}). Host verification can be required via the
-  @racket[ssl-context] argument; see @racket[ssl-set-verify!]. Some
-  servers use SSL certificates to authenticate clients; see
-  @racket[ssl-load-certificate-chain!] and
-  @racket[ssl-load-private-key!]. SSL may only be used with TCP
-  connections, not with local sockets.
-
-  The @racket[notice-handler] is called on notice messages
-  received asynchronously from the server. A common example is notice
-  of an index created automatically for a table's primary key. The
-  @racket[notice-handler] function takes two string arguments: the
-  condition's SQLSTATE and a message. The
-  @racket[notification-handler] is called in response to an event
-  notification (see the @tt{LISTEN} and @tt{NOTIFY} statements); its
-  argument is the name of the event as a string. An output port may be
-  supplied instead of a procedure, in which case a message is printed
-  to the given port. Finally, the symbol @racket['output] causes the
-  message to be printed to the current output port, and
-  @racket['error] causes the message to be printed to the current
-  error port.
-
-  If the connection cannot be made, an exception is raised.
-
-  @fake-examples[
-    [(postgresql-connect #:server "db.mysite.com"
-                         #:port 5432
-                         #:database "webappdb"
-                         #:user "webapp"
-                         #:password "ultra5ecret")
-     (new connection%)]
-    [(postgresql-connect #:user "me"
-                         #:database "me"
-                         #:password "icecream")
-     (new connection%)]
-    [(postgresql-connect @code:comment{Typical socket path}
-                         #:socket "/var/run/postgresql/.s.PGSQL.5432"
-                         #:user "me"
-                         #:database "me")
-     (new connection%)]
-    [(postgresql-connect #:socket 'guess (code:comment "or (postgresql-guess-socket-path)")
-                         #:user "me"
-                         #:database "me")
-     (new connection%)]]
-}
-
-@defproc[(postgresql-guess-socket-path)
-         path-string?]{
-
-  Attempts to guess the path for the socket based on conventional
-  locations. This function returns the first such path that exists in
-  the filesystem. It does not check that the path is a socket file,
-  nor that the path is connected to a PostgreSQL server.
-
-  If none of the attempted paths exist, an exception is raised.
-}
-
-@defproc[(mysql-connect [#:user user string?]
-                  [#:database database (or/c string? #f) #f]
-                  [#:server server string? "localhost"]
-                  [#:port port exact-positive-integer? 3306]
-                  [#:socket socket (or/c path-string? #f) #f]
-                  [#:ssl ssl (or/c 'yes 'optional 'no) 'no]
-                  [#:ssl-context ssl-context ssl-client-context?
-                   (ssl-make-client-context 'tls)]
-                  [#:password password (or/c string? #f) #f]
-                  [#:notice-handler notice-handler
-                   (or/c 'output 'error output-port?
-                         (-> exact-nonnegative-integer? string? any))
-                   void])
-         connection?]{
-
-  Creates a connection to a MySQL server. If @racket[database] is
-  @racket[#f], the connection is established without setting the
-  current database; it should be subsequently set with the @tt{USE}
-  SQL command.
-
-  The meaning of the other keyword arguments is similar to those of
-  the @racket[postgresql-connect] function, except that the first
-  argument to a @racket[notice-handler] function is a MySQL-specific
-  integer code rather than a SQLSTATE string, and a @racket[socket]
-  argument of @racket['guess] is the same as supplying
-  @racket[(mysql-guess-socket-path)].
-
-  If the connection cannot be made, an exception is raised.
-
-  @fake-examples[
-    [(mysql-connect #:server "db.mysite.com"
-                    #:port 3306
-                    #:database "webappdb"
-                    #:user "webapp"
-                    #:password "ultra5ecret")
-     (new connection%)]
-    [(mysql-connect #:user "me"
-                    #:database "me"
-                    #:password "icecream")
-     (new connection%)]
-    [(mysql-connect @code:comment{Typical socket path}
-                    #:socket "/var/run/mysqld/mysqld.sock"
-                    #:user "me"
-                    #:database "me")
-     (new connection%)]
-    [(mysql-connect #:socket (mysql-guess-socket-path)
-                    #:user "me"
-                    #:database "me")
-     (new connection%)]]
-}
-
-@defproc[(mysql-guess-socket-path)
-         path-string?]{
-
-  Attempts to guess the path for the socket based on conventional
-  locations. This function returns the first such path that exists in
-  the filesystem. It does not check that the path is a socket file,
-  nor that the path is connected to a MySQL server.
-
-  If none of the attempted paths exist, an exception is raised.
-}
-
-@defproc[(sqlite3-connect
-                [#:database database (or/c path-string? 'memory 'temporary)]
-                [#:mode mode (or/c 'read-only 'read/write 'create) 'read/write]
-                [#:busy-retry-limit busy-retry-limit 
-                 (or/c exact-nonnegative-integer? +inf.0) 10]
-                [#:busy-retry-delay busy-retry-delay
-                 (and/c rational? (not/c negative?)) 0.1]
-                [#:use-place use-place boolean? #f])
-         connection?]{
-
-  Opens the SQLite database at the file named by @racket[database], if
-  @racket[database] is a string or path. If @racket[database] is
-  @racket['temporary], a private disk-based database is created. If
-  @racket[database] is @racket['memory], a private memory-based
-  database is created.
-
-  If @racket[mode] is @racket['read-only], the database is opened in
-  read-only mode. If @racket[mode] is @racket['read/write] (the
-  default), the database is opened for reading and writing (if
-  filesystem permissions permit). The @racket['create] mode is like
-  @racket['read/write], except that if the given file does not exist,
-  it is created as a new database.
-
-  SQLite uses @hyperlink["http://www.sqlite.org/lockingv3.html"]{coarse-grained
-  locking}, and many internal operations fail with the
-  @tt{SQLITE_BUSY} condition when a lock cannot be acquired. When an
-  internal operation fails because the database is busy, the
-  connection sleeps for @racket[busy-retry-delay] seconds and retries
-  the operation, up to @racket[busy-retry-limit] additional times. If
-  @racket[busy-retry-limit] is @racket[0], the operation is only
-  attempted once. If after @racket[busy-retry-limit] retries the
-  operation still does not succeed, an exception is raised.
-
-  If @racket[use-place] is true, the actual connection is created in
-  a distinct @tech/reference{place} for database connections and a
-  proxy is returned; see @secref["ffi-concurrency"].
-
-  If the connection cannot be made, an exception is raised.
-
-  @fake-examples[
-    [(sqlite3-connect #:database "/path/to/my.db")
-     (new connection%)]
-    [(sqlite3-connect #:database "relpath/to/my.db"
-                      #:mode 'create)
-     (new connection%)]]
-}
-
-
-@defproc[(sqlite3-available?) boolean?]{
-
-Reports whether the SQLite native library is found, in which case
-@racket[sqlite3-connect] works, otherwise it raises an exception.}
-
-
-@defproc[(odbc-connect [#:dsn dsn string?]
-                       [#:user user (or/c string? #f) #f]
-                       [#:password password (or/c string? #f) #f]
-                       [#:notice-handler notice-handler
-                        (or/c output-port? 'output 'error 
-                              (-> string? string? any))
-                        void]
-                       [#:strict-parameter-types? strict-parameter-types? boolean? #f]
-                       [#:character-mode character-mode
-                        (or/c 'wchar 'utf-8 'latin-1)
-                        'wchar]
-                       [#:use-place use-place boolean? #f])
-         connection?]{
-
-  Creates a connection to the ODBC Data Source named @racket[dsn]. The
-  @racket[user] and @racket[password] arguments are optional, since
-  that information may be incorporated into the data source
-  definition, or it might not be relevant to the data source's driver.
-  The @racket[notice-handler] argument behaves the same as in
-  @racket[postgresql-connect].
-
-  If @racket[strict-parameter-types?] is true, then the connection
-  attempts to determine and enforce specific types for query
-  parameters. See @secref["odbc-types"] for more details.
-
-  By default, connections use ODBC's @tt{SQL_C_WCHAR}-based character
-  encoding (as UTF-16) to send and receive Unicode character
-  data. Unfortunately, some drivers' support for this method is
-  buggy. To use @tt{SQL_C_CHAR} instead, set @racket[character-mode]
-  to @racket['utf-8] or @racket['latin-1], depending on which encoding
-  the driver uses.
-
-  See @secref["odbc-status"] for notes on specific ODBC drivers and
-  recommendations for connection options.
-
-  If @racket[use-place] is true, the actual connection is created in
-  a distinct @tech/reference{place} for database connections and a
-  proxy is returned; see @secref["ffi-concurrency"].
-
-  If the connection cannot be made, an exception is raised.
-}
-
-@defproc[(odbc-driver-connect [connection-string string?]
-                              [#:notice-handler notice-handler
-                               (or/c output-port? 'output 'error
-                                     (-> string? string? any))
-                               void]
-                              [#:strict-parameter-types? strict-parameter-types? boolean? #f]
-                              [#:character-mode character-mode
-                               (or/c 'wchar 'utf-8 'latin-1)
-                               'wchar]
-                              [#:use-place use-place boolean? #f])
-         connection?]{
-
-  Creates a connection using an ODBC connection string containing a
-  sequence of keyword and value connection parameters. The syntax of
-  connection strings is described in
-  @hyperlink["http://msdn.microsoft.com/en-us/library/ms715433%28v=VS.85%29.aspx"]{SQLDriverConnect}
-  (see Comments section); supported attributes depend on the
-  driver. The other arguments are the same as in @racket[odbc-connect].
-
-  If the connection cannot be made, an exception is raised.
-}
-
-@defproc[(odbc-data-sources)
-         (listof (list/c string? string?))]{
-
-  Returns a list of known ODBC Data Sources. Each data souce is
-  represented by a list of two strings; the first string is the name
-  of the data source, and the second is the name of its associated
-  driver.
-}
-
-@defproc[(odbc-drivers)
-         (listof (cons/c string? any/c))]{
-
-  Returns a list of known ODBC Drivers. Each driver is represented by
-  a list, the first element of which is the name of the driver. The
-  contents of the rest of each entry is currently undefined.
-}
-
-
-@;{============================================================}
-
-@section{Connection Pooling}
-
-@declare-exporting[db db/base #:use-sources (db/base)]
-
-Creating a database connection can be a costly operation; it may
-involve steps such as process creation and SSL negotiation. A
-@deftech{connection pool} helps reduce connection costs by reusing
-connections.
-
-@defproc[(connection-pool
-             [connect (-> connection?)]
-             [#:max-connections max-connections (or/c (integer-in 1 10000) +inf.0) +inf.0]
-             [#:max-idle-connections max-idle-connections (or/c (integer-in 1 10000) +inf.0) 10])
-         connection-pool?]{
-
-Creates a @tech{connection pool}. The pool consists of up to
-@racket[max-connections], divided between leased connections and up to
-@racket[max-idle-connections] idle connections. The pool uses
-@racket[connect] to create new connections when needed. The
-@racket[connect] function is called with the same
-@racket[current-custodian] value as when the connection pool was
-created, and it must return a fresh connection each time it is called.
-
-@examples[#:eval the-eval
-(eval:alts
- (define pool
-   (connection-pool
-    (lambda () (displayln "connecting!") (sqlite3-connect ....))
-    #:max-idle-connections 1))
- (define pool
-   (connection-pool
-    (lambda () (displayln "connecting!") (sqlite3-connect #:database 'memory)))))
-(define c1 (connection-pool-lease pool))
-(define c2 (connection-pool-lease pool))
-(disconnect c1)
-(code:line (define c3 (connection-pool-lease pool)) (code:comment "reuses actual conn. from c1"))
-]
-
-See also @racket[virtual-connection] for a mechanism that eliminates
-the need to explicitly call @racket[connection-pool-lease] and
-@racket[disconnect].
-}
-
-@defproc[(connection-pool? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is a connection pool, @racket[#f]
-otherwise.
-}
-
-@defproc[(connection-pool-lease
-             [pool connection-pool?]
-             [release (or/c evt? custodian?) (current-thread)])
-         connection?]{
-
-Obtains a connection from the connection pool, using an existing idle
-connection in @racket[pool] if one is available. If no idle connection
-is available and the pool contains fewer than its maximum allowed
-connections, a new connection is created; otherwise an exception is
-raised.
-
-Calling @racket[disconnect] on the connection obtained causes the
-connection to be released back to the connection pool. The connection
-is also released if @racket[release] becomes available, if it is a
-synchronizable event, or if @racket[release] is shutdown, if it is a
-custodian. The default for @racket[release] is the current thread, so
-the resulting connection is released when the thread that requested it
-terminates.
-
-When a connection is released, it is kept as an idle connection if
-@racket[pool]'s idle connection limit would not be exceeded;
-otherwise, it is disconnected. In either case, if the connection is in
-a transaction, the transaction is rolled back.
-}
-
-
-@;{========================================}
-
-@section{Virtual Connections}
-
-@declare-exporting[db db/base #:use-sources (db/base)]
-
-A @deftech{virtual connection} creates actual connections on demand and
-automatically releases them when they are no longer needed.
-
-@defproc[(virtual-connection
-             [connect (or/c (-> connection?) connection-pool?)]
-             #| [#:timeout timeout (and/c real? positive?) +inf.0] |#)
-         connection?]{
-
-Creates a @tech{virtual connection} that creates actual connections on
-demand using the @racket[connect] function, or by calling
-@racket[(connection-pool-lease connect)] if @racket[connect] is a
-@tech{connection pool}. If @racket[connect] is a function, it is
-called with the same @racket[current-custodian] value as when the
-virtual connection was created.
-
-A virtual connection encapsulates a mapping
-of threads to actual connections. When a query function is called with
-a virtual connection, the current thread's associated actual
-connection is used to execute the query. If there is no actual
-connection associated with the current thread, one is obtained by
-calling @racket[connect]. An actual connection is disconnected when
-its associated thread dies.
-
-Virtual connections are especially useful in contexts such as web
-servlets (see @secref["intro-servlets"]), where each request is
-handled in a fresh thread. A single global virtual connection can be
-defined, freeing each servlet request from explicitly opening and
-closing its own connections. In particular, a @tech{virtual
-connection} backed by a @tech{connection pool} combines convenience
-with efficiency:
-
-@racketblock[
-(define the-connection
-  (virtual-connection (connection-pool (lambda () ....))))
-]
-
-The resulting virtual connection leases a connection from the pool on
-demand for each servlet request thread and releases it when the thread
-terminates (that is, when the request has been handled).
-
-When given a connection produced by @racket[virtual-connection],
-@racket[connected?] indicates whether there is an actual connection
-associated with the current thread. Likewise, @racket[disconnect]
-causes the current actual connection associated with the thread (if
-there is one) to be disconnected, but the connection will be recreated
-if a query function is executed.
-
-@examples[#:eval the-eval
-(eval:alts
- (define c
-   (virtual-connection
-    (lambda ()
-      (printf "connecting!\n")
-      (postgresql-connect ....))))
- (define c
-   (virtual-connection
-    (lambda ()
-      (printf "connecting!\n")
-      (dsn-connect 'db-scribble-env)))))
-(connected? c)
-(query-value c "select 1")
-(connected? c)
-(void (thread (lambda () (displayln (query-value c "select 2")))))
-(disconnect c)
-(connected? c)
-(query-value c "select 3")
-]
-
-Connections produced by @racket[virtual-connection] may not be used
-with the @racket[prepare] function. However, they may still be used to
-execute parameterized queries expressed as strings or encapsulated via
-@racket[virtual-statement].
-
-@examples[#:eval the-eval
-(prepare c "select 2 + $1")
-(query-value c "select 2 + $1" 2)
-(define pst (virtual-statement "select 2 + $1"))
-(query-value c pst 3)
-]
-}
-
-@(the-eval '(begin (set! c #f) (set! pst #f)))
-
-@;{========================================}
-
-@section[#:tag "kill-safe"]{Kill-safe Connections}
-
-@declare-exporting[db db/base #:use-sources (db/base)]
-
-@defproc[(kill-safe-connection [c connection?]) 
-         connection?]{
-
-Creates a proxy for connection @racket[c]. All queries performed
-through the proxy are kill-safe; that is, if a thread is killed during
-a call to a query function such as @racket[query], the connection will
-not become locked or damaged. (Connections are normally thread-safe but
-not kill-safe.)
-
-Note: A kill-safe connection whose underlying connection uses ports to
-communicate with a database server is not protected from a custodian
-shutting down its ports.
-}
-
-@;{========================================}
-
-@section{Data Source Names}
-
-@declare-exporting[db db/base #:use-sources (db/base)]
-
-A DSN (data source name) is a symbol associated with a connection
-specification in a DSN file. They are inspired by, but distinct from,
-ODBC's DSNs.
-
-@defstruct*[data-source
-              ([connector (or/c 'postgresql 'mysql 'sqlite3 'odbc)]
-               [args list?]
-               [extensions (listof (list/c symbol? any/c))])
-            #:mutable]{
-
-  Represents a data source. The @racket[connector] field determines
-  which connection function is used to create the connection. The
-  @racket[args] field is a partial list of arguments passed to the
-  connection function; additional arguments may be added when
-  @racket[dsn-connect] is called. The @racket[extensions] field
-  contains additional information about a connection; for example,
-  this library's testing framework uses it to store SQL dialect
-  flags.
-
-  Data sources can also be created using the
-  @racket[postgresql-data-source], etc auxiliary functions.
-}
-
-@defproc[(dsn-connect [dsn (or/c symbol? data-source?)]
-                      [#:dsn-file dsn-file path-string? (current-dsn-file)]
-                      [arg any/c] ...
-                      [#:<kw> kw-arg any/c] ...)
-         connection?]{
-
-  Makes a connection using the connection information associated with
-  @racket[dsn] in @racket[dsn-file]. The given @racket[arg]s and
-  @racket[kw-arg]s are added to those specified by @racket[dsn] to
-  form the complete arguments supplied to the connect function.
-
-  If @racket[dsn-file] does not exist, or if it contains no entry
-  for @racket[dsn], an exception is raised. If @racket[dsn] is a
-  @racket[data-source], then @racket[dsn-file] is ignored.
-
-@fake-examples[
-[(put-dsn 'pg
-          (postgresql-data-source #:user "me"
-                                  #:database "mydb" 
-                                  #:password "icecream"))
- (void)]
-[(dsn-connect 'pg)
- (new connection%)]
-[(dsn-connect 'pg #:notice-handler (lambda (code msg) ....))
- (new connection%)]
-]
-}
-
-@defparam[current-dsn-file x path-string?]{
-
-  A parameter holding the location of the default DSN file. The
-  initial value is a file located immediately within
-  @racket[(find-system-path 'prefs-dir)].
-}
-
-@defproc[(get-dsn [dsn symbol?]
-                  [default any/c #f]
-                  [#:dsn-file dsn-file path-string? (current-dsn-file)])
-         (or/c data-source? any/c)]{
-
-  Returns the @racket[data-source] associated with @racket[dsn] in
-  @racket[dsn-file].
-
-  If @racket[dsn-file] does not exist, an exception is raised. If
-  @racket[dsn-file] does not have an entry for @racket[dsn],
-  @racket[default] is called if it is a function or returned
-  otherwise.
-}
-
-@defproc[(put-dsn [dsn symbol?]
-                  [ds (or/c data-source? #f)]
-                  [#:dsn-file dsn-file path-string? (current-dsn-file)])
-         void?]{
-
-  Associates @racket[dsn] with the given data source @racket[ds] in
-  @racket[dsn-file], replacing the previous association, if one
-  exists.
-}
-
-@(define absent @italic{absent})
-
-@deftogether[[
-@defproc[(postgresql-data-source
-           [#:user user string? @#,absent]
-           [#:database database string? @#,absent]
-           [#:server server string? @#,absent]
-           [#:port port exact-positive-integer? @#,absent]
-           [#:socket socket (or/c path-string? 'guess #f) @#,absent]
-           [#:password password (or/c string? #f) @#,absent]
-           [#:allow-cleartext-password? allow-cleartext-password? boolean? @#,absent]
-           [#:ssl ssl (or/c 'yes 'optional 'no) @#,absent]
-           [#:notice-handler notice-handler (or/c 'output 'error) @#,absent]
-           [#:notification-handler notification-handler (or/c 'output 'error) @#,absent])
-         data-source?]
-@defproc[(mysql-data-source
-           [#:user user string? @#,absent]
-           [#:database database (or/c string? #f) @#,absent]
-           [#:server server string? @#,absent]
-           [#:port port exact-positive-integer? @#,absent]
-           [#:socket socket (or/c path-string? 'guess #f) @#,absent]
-           [#:ssl ssl (or/c 'yes 'optional 'no) @#,absent]
-           [#:password password (or/c string? #f) @#,absent]
-           [#:notice-handler notice-handler (or/c 'output 'error) @#,absent])
-         data-source?]
-@defproc[(sqlite3-data-source
-           [#:database database (or/c path-string? 'memory 'temporary) @#,absent]
-           [#:mode mode (or/c 'read-only 'read/write 'create) @#,absent]
-           [#:busy-retry-limit busy-retry-limit 
-            (or/c exact-nonnegative-integer? +inf.0) @#,absent]
-           [#:busy-retry-delay busy-retry-delay
-            (and/c rational? (not/c negative?)) @#,absent]
-           [#:use-place use-place boolean? @#,absent])
-         data-source?]
-@defproc[(odbc-data-source
-           [#:dsn dsn (or/c string? #f) @#,absent]
-           [#:database database (or/c string? #f) @#,absent]
-           [#:user user (or/c string? #f) @#,absent]
-           [#:password password (or/c string? #f) @#,absent]
-           [#:notice-handler notice-handler (or/c 'output 'error) @#,absent]
-           [#:strict-parameter-types? strict-parameter-types? boolean? @#,absent]
-           [#:character-mode character-mode (or/c 'wchar 'utf-8 'latin-1) @#,absent])
-         data-source?]]]{
-
-  Analogues of @racket[postgresql-connect], @racket[mysql-connect],
-  @racket[sqlite3-connect], and @racket[odbc-connect], respectively,
-  that return a @racket[data-source] describing the (partial)
-  connection information. All arguments are optional, even those that
-  are mandatory in the corresponding connection function; the missing
-  arguments must be supplied when @racket[dsn-connect] is called.
-}
-
-
-@;{============================================================}
-
-@section[#:tag "managing-connections"]{Managing Connections}
-
-@declare-exporting[db db/base #:use-sources (db/base)]
-
-@defproc[(connection? [x any/c])
-         boolean?]{
-
-Returns @racket[#t] if @racket[x] is a connection, @racket[#f] otherwise.
-}
-
-@defproc[(disconnect [connection connection?])
-         void?]{
-Closes the connection.
-}
-
-@defproc[(connected? [connection connection?])
-         boolean?]{
-
-Returns @racket[#t] if @racket[connection] is connected, @racket[#f]
-otherwise.
-}
-
-@defproc[(connection-dbsystem [connection connection?])
-         dbsystem?]{
-
-Gets an object encapsulating information about the database system of
-@racket[connection].
-}
-
-@defproc[(dbsystem? [x any/c])
-         boolean?]{
-
-Predicate for objects representing database systems.
-}
-
-@defproc[(dbsystem-name [sys dbsystem?])
-         symbol?]{
-
-Returns a symbol that identifies the database system. Currently one of the
-following:
-@itemize[
-@item[@racket['postgresql]]
-@item[@racket['mysql]]
-@item[@racket['sqlite3]]
-@item[@racket['odbc]]
-]
-}
-
-@defproc[(dbsystem-supported-types [sys dbsystem?])
-         (listof symbol?)]{
-
-Returns a list of symbols identifying types supported by the database
-system. See @secref["db-types"].
-}
-
-
-@section{System-specific Modules}
-
-The @racketmodname[db] module exports all of the
-functions listed in this manual except those described in
-@secref["util"]. The database system-specific connection modules are
-loaded lazily to avoid unnecessary dependencies on foreign libraries.
-
-The following modules provide subsets of the bindings described in
-this manual.
-
-@defmodule*/no-declare[(db/base)]
-
-Provides all generic connection operations (those described in
-@secref{managing-connections} and @secref{query-api}) and SQL data
-support (@secref{sql-types}).
-
-@defmodule*/no-declare[(db/postgresql)]
-
-Provides only @racket[postgresql-connect] and
-@racket[postgresql-guess-socket-path].
-
-@defmodule*/no-declare[(db/mysql)]
-
-Provides only @racket[mysql-connect] and
-@racket[mysql-guess-socket-path].
-
-@defmodule*/no-declare[(db/sqlite3)]
-
-Provides @racket[sqlite3-connect] plus @racket[sqlite3-available?]. When
-the SQLite native library cannot be found, @racket[sqlite3-connect]
-raises an exception.
-
-@defmodule*/no-declare[(db/odbc)]
-
-Provides only @racket[odbc-connect], @racket[odbc-driver-connect],
-@racket[odbc-data-sources], and @racket[odbc-drivers]. In contrast to
-@racketmodname[db], this module immediately attempts to
-load the ODBC native library when required, and it raises an exception
-if it cannot be found.
-
-
-@(close-eval the-eval)
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/db.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/db.scrbl
deleted file mode 100644
index d817877302..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/db.scrbl
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/struct
-          scribble/eval
-          "config.rkt")
-
-@title{DB: Database Connectivity}
-@author[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@section-index["database"]
-
-@centered{@bold{@italic{A database interface for functional programmers.}}}
-
-@defmodule[db]
-
-This library provides a high-level interface to several database
-systems. The following database systems are currently supported:
-@itemlist[
-
-@item{@bold{@as-index{@hyperlink["http://www.postgresql.org"]{PostgreSQL}}
-versions 7.4 and later.} This library implements the PostgreSQL wire
-protocol, so no native client library is required.}
-
-@item{@bold{@as-index{@hyperlink["http://www.mysql.com"]{MySQL}} versions 5 and
-later.} This library implements the MySQL wire protocol, so no
-native client library is required.}
-
-@item{@bold{@as-index{@hyperlink["http://www.sqlite.org"]{SQLite}} version
-3.} The SQLite native client library is required; see
-@secref["sqlite3-requirements"].}
-
-@item{@bold{@as-index{ODBC}.} An ODBC Driver Manager and appropriate
-ODBC drivers are required; see @secref["odbc-requirements"]. The
-following database systems are known to work with this library via
-ODBC (see @secref["odbc-status"] for details):
-@bold{@as-index{@hyperlink["http://www.ibm.com/software/data/db2/"]{DB2}}},
-@bold{@as-index{@hyperlink["http://www.oracle.com"]{Oracle}}}, and
-@bold{@as-index{@hyperlink["http://www.microsoft.com/sqlserver/"]{SQL Server}}}.}
-]
-
-The query operations are functional in spirit: queries return results
-or raise exceptions rather than stashing their state into a cursor
-object for later navigation and retrieval. Query parameters and result
-fields are automatically translated to and from appropriate Racket
-values. Resources are managed automatically by the garbage collector
-and via custodians. Connections are internally synchronized, so
-multiple threads can use a connection simultaneously.
-
-@bold{Acknowledgments} Thanks to Dave Gurnell, Noel Welsh, Mike Burns,
-and Doug Orleans for contributions to @tt{spgsql}, the PostgreSQL-only
-predecessor of this library. The SQLite support is based in part on
-code from Jay McCarthy's @tt{sqlite} package.
-
-@include-section["using-db.scrbl"]
-@include-section["connect.scrbl"]
-@include-section["query.scrbl"]
-@include-section["sql-types.scrbl"]
-@include-section["util.scrbl"]
-@include-section["notes.scrbl"]
-
-@(close-eval fake-eval)
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/log-for-connect.rktd b/pkgs/db-pkgs/db-doc/db/scribblings/log-for-connect.rktd
deleted file mode 100644
index 916b0c8ecb..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/log-for-connect.rktd
+++ /dev/null
@@ -1,82 +0,0 @@
-;; This file was created by make-log-based-eval
-((require racket/class db db/util/postgresql db/util/datetime)
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((begin
-   (define pgc (dsn-connect 'db-scribble-env))
-   (query-exec
-    pgc
-    "create temporary table the_numbers (n integer, d varchar(20))")
-   (query-exec pgc "insert into the_numbers values (0, 'nothing')")
-   (query-exec
-    pgc
-    "insert into the_numbers values (1, 'the loneliest number')")
-   (query-exec pgc "insert into the_numbers values (2, 'company')")
-   (query-exec pgc "insert into the_numbers values (3, 'a crowd')"))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((define pool
-   (connection-pool
-    (lambda ()
-      (displayln "connecting!")
-      (sqlite3-connect #:database 'memory))))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((define c1 (connection-pool-lease pool))
- ((3) 0 () 0 () () (c values c (void)))
- #"connecting!\n"
- #"")
-((define c2 (connection-pool-lease pool))
- ((3) 0 () 0 () () (c values c (void)))
- #"connecting!\n"
- #"")
-((disconnect c1) ((3) 0 () 0 () () (c values c (void))) #"" #"")
-((define c3 (connection-pool-lease pool))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((define c
-   (virtual-connection
-    (lambda () (printf "connecting!\n") (dsn-connect 'db-scribble-env))))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((connected? c) ((3) 0 () 0 () () (q values #f)) #"" #"")
-((query-value c "select 1")
- ((3) 0 () 0 () () (q values 1))
- #"connecting!\n"
- #"")
-((connected? c) ((3) 0 () 0 () () (q values #t)) #"" #"")
-((void (thread (lambda () (displayln (query-value c "select 2")))))
- ((3) 0 () 0 () () (c values c (void)))
- #"connecting!\n2\n"
- #"")
-((disconnect c) ((3) 0 () 0 () () (c values c (void))) #"" #"")
-((connected? c) ((3) 0 () 0 () () (q values #f)) #"" #"")
-((query-value c "select 3")
- ((3) 0 () 0 () () (q values 3))
- #"connecting!\n"
- #"")
-((prepare c "select 2 + $1")
- ((3)
-  0
-  ()
-  0
-  ()
-  ()
-  (q exn "prepare: cannot prepare statement with virtual connection"))
- #""
- #"")
-((query-value c "select 2 + $1" 2) ((3) 0 () 0 () () (q values 4)) #"" #"")
-((define pst (virtual-statement "select 2 + $1"))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((query-value c pst 3) ((3) 0 () 0 () () (q values 5)) #"" #"")
-((begin (set! c #f) (set! pst #f))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/log-for-query.rktd b/pkgs/db-pkgs/db-doc/db/scribblings/log-for-query.rktd
deleted file mode 100644
index 08524d7355..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/log-for-query.rktd
+++ /dev/null
@@ -1,275 +0,0 @@
-;; This file was created by make-log-based-eval
-((require racket/class db db/util/postgresql db/util/datetime)
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((begin
-   (define pgc (dsn-connect 'db-scribble-env))
-   (query-exec
-    pgc
-    "create temporary table the_numbers (n integer, d varchar(20))")
-   (query-exec pgc "insert into the_numbers values (0, 'nothing')")
-   (query-exec
-    pgc
-    "insert into the_numbers values (1, 'the loneliest number')")
-   (query-exec pgc "insert into the_numbers values (2, 'company')")
-   (query-exec pgc "insert into the_numbers values (3, 'a crowd')"))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((define c pgc) ((3) 0 () 0 () () (c values c (void))) #"" #"")
-((query-exec pgc "insert into the_numbers values (42, 'the answer')")
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((query-exec pgc "delete from the_numbers where n = $1" 42)
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((query-rows pgc "select * from the_numbers where n = $1" 2)
- ((3) 0 () 0 () () (c values c (c (v! 2 (u . "company")))))
- #""
- #"")
-((query-rows c "select 17")
- ((3) 0 () 0 () () (c values c (c (v! 17))))
- #""
- #"")
-((query-list c "select n from the_numbers where n < 2")
- ((3) 0 () 0 () () (q values (0 1)))
- #""
- #"")
-((query-list c "select 'hello'")
- ((3) 0 () 0 () () (c values c (c (u . "hello"))))
- #""
- #"")
-((query-row pgc "select * from the_numbers where n = $1" 2)
- ((3) 0 () 0 () () (c values c (v! 2 (u . "company"))))
- #""
- #"")
-((query-row pgc "select min(n), max(n) from the_numbers")
- ((3) 0 () 0 () () (c values c (v! 0 3)))
- #""
- #"")
-((query-maybe-row pgc "select * from the_numbers where n = $1" 100)
- ((3) 0 () 0 () () (q values #f))
- #""
- #"")
-((query-maybe-row c "select 17")
- ((3) 0 () 0 () () (c values c (v! 17)))
- #""
- #"")
-((query-value pgc "select timestamp 'epoch'")
- ((3)
-  1
-  (((lib "db/private/generic/sql-data.rkt")
-    .
-    deserialize-info:sql-timestamp-v0))
-  0
-  ()
-  ()
-  (c values c (0 1970 1 1 0 0 0 0 #f)))
- #""
- #"")
-((query-value pgc "select d from the_numbers where n = $1" 3)
- ((3) 0 () 0 () () (c values c (u . "a crowd")))
- #""
- #"")
-((query-maybe-value pgc "select d from the_numbers where n = $1" 100)
- ((3) 0 () 0 () () (q values #f))
- #""
- #"")
-((query-maybe-value c "select count(*) from the_numbers")
- ((3) 0 () 0 () () (q values 4))
- #""
- #"")
-((for/list ((n (in-query pgc "select n from the_numbers where n < 2"))) n)
- ((3) 0 () 0 () () (q values (0 1)))
- #""
- #"")
-((call-with-transaction
-  pgc
-  (lambda ()
-    (for
-     (((n d)
-       (in-query pgc "select * from the_numbers where n < $1" 4 #:fetch 1)))
-     (printf "~a: ~a\n" n d))))
- ((3) 0 () 0 () () (c values c (void)))
- #"0: nothing\n1: the loneliest number\n2: company\n3: a crowd\n"
- #"")
-((for ((n (in-query pgc "select * from the_numbers"))) (displayln n))
- ((3)
-  0
-  ()
-  0
-  ()
-  ()
-  (q
-   exn
-   "in-query: query returned wrong number of columns\n  statement: \"select * from the_numbers\"\n  expected: 1\n  got: 2"))
- #""
- #"")
-((define vehicles-result
-   (rows-result
-    '(((name . "type")) ((name . "maker")) ((name . "model")))
-    `(#("car" "honda" "civic")
-      #("car" "ford" "focus")
-      #("car" "ford" "pinto")
-      #("bike" "giant" "boulder")
-      #("bike" "schwinn" ,sql-null))))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((group-rows vehicles-result #:group '(#("type")))
- ((3)
-  2
-  (((lib "db/private/generic/interfaces.rkt")
-    .
-    deserialize-info:rows-result-v0)
-   ((lib "db/private/generic/sql-data.rkt") . deserialize-info:sql-null-v0))
-  1
-  ("ford")
-  ()
-  (c
-   values
-   c
-   (0
-    (q
-     ((name . "type"))
-     ((name . "grouped") (grouped ((name . "maker")) ((name . "model")))))
-    (c
-     (v!
-      "car"
-      (c (v! "honda" "civic") c (v! (? . 0) "focus") c (v! (? . 0) "pinto")))
-     c
-     (v! "bike" (c (v! "giant" "boulder") c (v! "schwinn" (1))))))))
- #""
- #"")
-((group-rows
-  vehicles-result
-  #:group
-  '(#("type") #("maker"))
-  #:group-mode
-  '(list))
- ((3)
-  1
-  (((lib "db/private/generic/interfaces.rkt")
-    .
-    deserialize-info:rows-result-v0))
-  1
-  ((q name . "grouped"))
-  ()
-  (c
-   values
-   c
-   (0
-    (c
-     (q (name . "type"))
-     c
-     (c
-      (? . 0)
-      c
-      (c
-       grouped
-       c
-       (q (name . "maker"))
-       c
-       (c (? . 0) q (grouped ((name . "model")))))))
-    (c
-     (v! "car" (c (v! "honda" (q "civic")) c (v! "ford" (q "focus" "pinto"))))
-     c
-     (v! "bike" (c (v! "giant" (q "boulder")) c (v! "schwinn" ())))))))
- #""
- #"")
-((rows->dict vehicles-result #:key "model" #:value '#("type" "maker"))
- ((3)
-  1
-  (((lib "db/private/generic/sql-data.rkt") . deserialize-info:sql-null-v0))
-  3
-  ("car" "ford" "bike")
-  ()
-  (c
-   values
-   c
-   (h
-    -
-    (equal)
-    ((0) v! (? . 2) "schwinn")
-    ("civic" v! (? . 0) "honda")
-    ("pinto" v! (? . 0) (? . 1))
-    ("focus" v! (? . 0) (? . 1))
-    ("boulder" v! (? . 2) "giant"))))
- #""
- #"")
-((rows->dict
-  vehicles-result
-  #:key
-  "maker"
-  #:value
-  "model"
-  #:value-mode
-  '(list))
- ((3)
-  0
-  ()
-  0
-  ()
-  ()
-  (c
-   values
-   c
-   (h
-    -
-    (equal)
-    ("ford" q "focus" "pinto")
-    ("honda" q "civic")
-    ("giant" q "boulder")
-    ("schwinn"))))
- #""
- #"")
-((let* ((get-name-pst (prepare pgc "select d from the_numbers where n = $1"))
-        (get-name2 (bind-prepared-statement get-name-pst (list 2)))
-        (get-name3 (bind-prepared-statement get-name-pst (list 3))))
-   (list (query-value pgc get-name2) (query-value pgc get-name3)))
- ((3) 0 () 0 () () (c values c (c (u . "company") c (u . "a crowd"))))
- #""
- #"")
-((define pst
-   (virtual-statement
-    (lambda (dbsys)
-      (case (dbsystem-name dbsys)
-        ((postgresql) "select n from the_numbers where n < $1")
-        ((sqlite3) "select n from the_numbers where n < ?")
-        (else (error "unknown system"))))))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((query-list pgc pst 3) ((3) 0 () 0 () () (q values (0 1 2))) #"" #"")
-((query-list pgc pst 3) ((3) 0 () 0 () () (q values (0 1 2))) #"" #"")
-((with-handlers
-  ((exn:fail:sql? exn:fail:sql-info))
-  (query pgc "select * from nosuchtable"))
- ((3)
-  0
-  ()
-  0
-  ()
-  ()
-  (c
-   values
-   c
-   (c
-    (c severity u . "ERROR")
-    c
-    (c code u . "42P01")
-    c
-    (c message u . "relation \"nosuchtable\" does not exist")
-    c
-    (c position u . "15")
-    c
-    (c file u . "parse_relation.c")
-    c
-    (c line u . "857")
-    c
-    (c routine u . "parserOpenTable"))))
- #""
- #"")
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/log-for-sql-types.rktd b/pkgs/db-pkgs/db-doc/db/scribblings/log-for-sql-types.rktd
deleted file mode 100644
index 5613360bfb..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/log-for-sql-types.rktd
+++ /dev/null
@@ -1,146 +0,0 @@
-;; This file was created by make-log-based-eval
-((require racket/class db db/util/postgresql db/util/datetime)
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((begin
-   (define pgc (dsn-connect 'db-scribble-env))
-   (query-exec
-    pgc
-    "create temporary table the_numbers (n integer, d varchar(20))")
-   (query-exec pgc "insert into the_numbers values (0, 'nothing')")
-   (query-exec
-    pgc
-    "insert into the_numbers values (1, 'the loneliest number')")
-   (query-exec pgc "insert into the_numbers values (2, 'company')")
-   (query-exec pgc "insert into the_numbers values (3, 'a crowd')"))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((query-value pgc "select count(*) from the_numbers")
- ((3) 0 () 0 () () (q values 4))
- #""
- #"")
-((query-value pgc "select false") ((3) 0 () 0 () () (q values #f)) #"" #"")
-((query-value pgc "select 1 + $1" 2) ((3) 0 () 0 () () (q values 3)) #"" #"")
-((query-value pgc "select inet '127.0.0.1'")
- ((3)
-  0
-  ()
-  0
-  ()
-  ()
-  (q exn "query-value: unsupported type\n  type: inet\n  typeid: 869"))
- #""
- #"")
-((query-value pgc "select cast(inet '127.0.0.1' as varchar)")
- ((3) 0 () 0 () () (c values c (u . "127.0.0.1/32")))
- #""
- #"")
-((query-value pgc "select real '+Infinity'")
- ((3) 0 () 0 () () (q values +inf.0))
- #""
- #"")
-((query-value pgc "select numeric '12345678901234567890'")
- ((3) 0 () 0 () () (q values 12345678901234567890))
- #""
- #"")
-((query-value pgc "select 1 in (1, 2, 3)")
- ((3) 0 () 0 () () (q values #t))
- #""
- #"")
-((query-value
-  pgc
-  "select 1 = any ($1::integer[])"
-  (list->pg-array (list 1 2 3)))
- ((3) 0 () 0 () () (q values #t))
- #""
- #"")
-((query-value pgc "select 1 = any ($1)" (list 1 2 3))
- ((3) 0 () 0 () () (q values #t))
- #""
- #"")
-((query-value pgc "select $1::integer = any ($2)" 1 (list 1 2 3))
- ((3) 0 () 0 () () (q values #t))
- #""
- #"")
-((query-value pgc "select $1 = any ($2)" 1 (list 1 2 3))
- ((3)
-  0
-  ()
-  0
-  ()
-  ()
-  (q
-   exn
-   "query-value: cannot convert given value to SQL type\n  given: 1\n  type: string\n  expected: string?\n  dialect: PostgreSQL"))
- #""
- #"")
-((query-value pgc "select NULL")
- ((3)
-  1
-  (((lib "db/private/generic/sql-data.rkt") . deserialize-info:sql-null-v0))
-  0
-  ()
-  ()
-  (c values c (0)))
- #""
- #"")
-((sql-null->false "apple") ((3) 0 () 0 () () (q values "apple")) #"" #"")
-((sql-null->false sql-null) ((3) 0 () 0 () () (q values #f)) #"" #"")
-((sql-null->false #f) ((3) 0 () 0 () () (q values #f)) #"" #"")
-((false->sql-null "apple") ((3) 0 () 0 () () (q values "apple")) #"" #"")
-((false->sql-null #f)
- ((3)
-  1
-  (((lib "db/private/generic/sql-data.rkt") . deserialize-info:sql-null-v0))
-  0
-  ()
-  ()
-  (c values c (0)))
- #""
- #"")
-((query-value pgc "select date '25-dec-1980'")
- ((3)
-  1
-  (((lib "db/private/generic/sql-data.rkt") . deserialize-info:sql-date-v0))
-  0
-  ()
-  ()
-  (c values c (0 1980 12 25)))
- #""
- #"")
-((query-value pgc "select time '7:30'")
- ((3)
-  1
-  (((lib "db/private/generic/sql-data.rkt") . deserialize-info:sql-time-v0))
-  0
-  ()
-  ()
-  (c values c (0 7 30 0 0 #f)))
- #""
- #"")
-((query-value pgc "select timestamp 'epoch'")
- ((3)
-  1
-  (((lib "db/private/generic/sql-data.rkt")
-    .
-    deserialize-info:sql-timestamp-v0))
-  0
-  ()
-  ()
-  (c values c (0 1970 1 1 0 0 0 0 #f)))
- #""
- #"")
-((query-value pgc "select timestamp with time zone 'epoch'")
- ((3)
-  1
-  (((lib "db/private/generic/sql-data.rkt")
-    .
-    deserialize-info:sql-timestamp-v0))
-  0
-  ()
-  ()
-  (c values c (0 1970 1 1 0 0 0 0 0)))
- #""
- #"")
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/log-for-using-db.rktd b/pkgs/db-pkgs/db-doc/db/scribblings/log-for-using-db.rktd
deleted file mode 100644
index aa295d3815..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/log-for-using-db.rktd
+++ /dev/null
@@ -1,157 +0,0 @@
-;; This file was created by make-log-based-eval
-((require racket/class db db/util/postgresql db/util/datetime)
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((require db) ((3) 0 () 0 () () (c values c (void))) #"" #"")
-((define pgc (dsn-connect 'db-scribble-env))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((query-exec
-  pgc
-  "create temporary table the_numbers (n integer, d varchar(20))")
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((query-exec pgc "insert into the_numbers values (0, 'nothing')")
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((query-exec pgc "insert into the_numbers values (1, 'the loneliest number')")
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((query-exec pgc "insert into the_numbers values ($1, $2)" (+ 1 1) "company")
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((query pgc "insert into the_numbers values (3, 'a crowd')")
- ((3)
-  1
-  (((lib "db/private/generic/interfaces.rkt")
-    .
-    deserialize-info:simple-result-v0))
-  0
-  ()
-  ()
-  (c values c (0 (q (insert-id . #f) (affected-rows . 1)))))
- #""
- #"")
-((query pgc "select n, d from the_numbers where n % 2 = 0")
- ((3)
-  1
-  (((lib "db/private/generic/interfaces.rkt")
-    .
-    deserialize-info:rows-result-v0))
-  0
-  ()
-  ()
-  (c
-   values
-   c
-   (0
-    (c
-     (c (c name u . "n") q (typeid . 23) (type-size . 4) (type-mod . -1))
-     c
-     (c (c name u . "d") q (typeid . 1043) (type-size . -1) (type-mod . 24)))
-    (c (v! 0 (u . "nothing")) c (v! 2 (u . "company"))))))
- #""
- #"")
-((query-rows pgc "select n, d from the_numbers where n % 2 = 0")
- ((3)
-  0
-  ()
-  0
-  ()
-  ()
-  (c values c (c (v! 0 (u . "nothing")) c (v! 2 (u . "company")))))
- #""
- #"")
-((query-row pgc "select * from the_numbers where n = 0")
- ((3) 0 () 0 () () (c values c (v! 0 (u . "nothing"))))
- #""
- #"")
-((query-list pgc "select d from the_numbers order by n")
- ((3)
-  0
-  ()
-  0
-  ()
-  ()
-  (c
-   values
-   c
-   (c
-    (u . "nothing")
-    c
-    (u . "the loneliest number")
-    c
-    (u . "company")
-    c
-    (u . "a crowd"))))
- #""
- #"")
-((query-value pgc "select count(*) from the_numbers")
- ((3) 0 () 0 () () (q values 4))
- #""
- #"")
-((query-value pgc "select d from the_numbers where n = 5")
- ((3)
-  0
-  ()
-  0
-  ()
-  ()
-  (q
-   exn
-   "query-value: query returned wrong number of rows\n  statement: \"select d from the_numbers where n = 5\"\n  expected: 1\n  got: 0"))
- #""
- #"")
-((query-maybe-value pgc "select d from the_numbers where n = 5")
- ((3) 0 () 0 () () (q values #f))
- #""
- #"")
-((for
-  (((n d) (in-query pgc "select * from the_numbers where n < 4")))
-  (printf "~a: ~a\n" n d))
- ((3) 0 () 0 () () (c values c (void)))
- #"0: nothing\n1: the loneliest number\n2: company\n3: a crowd\n"
- #"")
-((for/fold
-  ((sum 0))
-  ((n (in-query pgc "select n from the_numbers")))
-  (+ sum n))
- ((3) 0 () 0 () () (q values 6))
- #""
- #"")
-((begin
-   (with-handlers
-    ((exn:fail? (lambda (e) (printf "~a~n" (exn-message e)))))
-    (query-value pgc "select NoSuchField from NoSuchTable"))
-   (query-value pgc "select 'okay to proceed!'"))
- ((3) 0 () 0 () () (c values c (u . "okay to proceed!")))
- #"query-value: relation \"nosuchtable\" does not exist\n  SQLSTATE: 42P01\n"
- #"")
-((query-value pgc "select d from the_numbers where n = $1" 2)
- ((3) 0 () 0 () () (c values c (u . "company")))
- #""
- #"")
-((query-list pgc "select n from the_numbers where n > $1 and n < $2" 0 3)
- ((3) 0 () 0 () () (q values (1 2)))
- #""
- #"")
-((define get-less-than-pst
-   (prepare pgc "select n from the_numbers where n < $1"))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((query-list pgc get-less-than-pst 1)
- ((3) 0 () 0 () () (q values (0)))
- #""
- #"")
-((query-list pgc (bind-prepared-statement get-less-than-pst '(2)))
- ((3) 0 () 0 () () (q values (0 1)))
- #""
- #"")
-((void) ((3) 0 () 0 () () (c values c (void))) #"" #"")
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/log-for-util.rktd b/pkgs/db-pkgs/db-doc/db/scribblings/log-for-util.rktd
deleted file mode 100644
index eedc717858..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/log-for-util.rktd
+++ /dev/null
@@ -1,49 +0,0 @@
-;; This file was created by make-log-based-eval
-((require racket/class db db/util/postgresql db/util/datetime)
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((begin
-   (define pgc (dsn-connect 'db-scribble-env))
-   (query-exec
-    pgc
-    "create temporary table the_numbers (n integer, d varchar(20))")
-   (query-exec pgc "insert into the_numbers values (0, 'nothing')")
-   (query-exec
-    pgc
-    "insert into the_numbers values (1, 'the loneliest number')")
-   (query-exec pgc "insert into the_numbers values (2, 'company')")
-   (query-exec pgc "insert into the_numbers values (3, 'a crowd')"))
- ((3) 0 () 0 () () (c values c (void)))
- #""
- #"")
-((sql-datetime->srfi-date (query-value pgc "select time '7:30'"))
- ((3)
-  1
-  (((lib "srfi/19/time.rkt") . deserialize-info:tm:date-v0))
-  0
-  ()
-  ()
-  (c values c (0 0 0 30 7 0 0 0 0)))
- #""
- #"")
-((sql-datetime->srfi-date (query-value pgc "select date '25-dec-1980'"))
- ((3)
-  1
-  (((lib "srfi/19/time.rkt") . deserialize-info:tm:date-v0))
-  0
-  ()
-  ()
-  (c values c (0 0 0 0 0 25 12 1980 0)))
- #""
- #"")
-((sql-datetime->srfi-date (query-value pgc "select timestamp 'epoch'"))
- ((3)
-  1
-  (((lib "srfi/19/time.rkt") . deserialize-info:tm:date-v0))
-  0
-  ()
-  ()
-  (c values c (0 0 0 0 0 1 1 1970 0)))
- #""
- #"")
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/notes.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/notes.scrbl
deleted file mode 100644
index c9fa1b35b1..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/notes.scrbl
+++ /dev/null
@@ -1,266 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          scribble/struct
-          racket/sandbox
-          "config.rkt"
-          (for-label db
-                     setup/dirs))
-
-@title[#:tag "notes"]{Notes}
-
-This section discusses issues related to specific database systems.
-
-
-@section[#:tag "connecting-to-server"]{Local Sockets for PostgreSQL and MySQL Servers}
-
-PostgreSQL and MySQL servers are sometimes configured by default to
-listen only on local sockets (also called ``unix domain
-sockets''). This library provides support for communication over local
-sockets on Linux (x86 and x86-64) and Mac OS X. If local socket
-communication is not available, the server must be reconfigured to
-listen on a TCP port.
-
-The socket file for a PostgreSQL server is located in the directory
-specified by the @tt{unix_socket_directory} variable in the
-@tt{postgresql.conf} server configuration file.  For example, on
-Ubuntu 11.04 running PostgreSQL 8.4, the socket directory is
-@tt{/var/run/postgresql} and the socket file is
-@tt{/var/run/postgresql/.s.PGSQL.5432}. Common socket paths may be
-searched automatically using the @racket[postgresql-guess-socket-path]
-function.
-
-The socket file for a MySQL server is located at the path specified by
-the @tt{socket} variable in the @tt{my.cnf} configuration file. For
-example, on Ubuntu 11.04 running MySQL 5.1, the socket is located at
-@tt{/var/run/mysqld/mysqld.sock}. Common socket paths for MySQL can be
-searched using the @racket[mysql-guess-socket-path] function.
-
-
-@section{PostgreSQL Database Character Encoding}
-
-In most cases, a database's character encoding is irrelevant, since
-the connect function always requests translation to Unicode (UTF-8)
-when creating a connection. If a PostgreSQL database's character
-encoding is @tt{SQL_ASCII}, however, PostgreSQL will not honor the
-connection encoding; it will instead send untranslated octets, which
-will cause corrupt data or internal errors in the client connection.
-
-To convert a PostgreSQL database from @tt{SQL_ASCII} to something
-sensible, @tt{pg_dump} the database, recode the dump file (using a
-utility such as @tt{iconv}), create a new database with the desired
-encoding, and @tt{pg_restore} from the recoded dump file.
-
-
-@section{PostgreSQL Authentication}
-
-PostgreSQL supports a large variety of
-@hyperlink["http://www.postgresql.org/docs/8.4/static/auth-pg-hba-conf.html"]{authentication
-mechanisms}, controlled by the @tt{pg_hba.conf} server configuration
-file. This library currently supports only cleartext and md5-hashed
-passwords, and it does not send cleartext passwords unless explicitly
-ordered to (see @racket[postgresql-connect]). These correspond to the
-@tt{md5} and @tt{password} authentication methods in the parlance of
-@tt{pg_hba.conf}, respectively. On Linux and Mac OS X, @tt{ident}
-authentication is automatically supported for local sockets (as of
-PostgreSQL 9.1, this authentication method has been renamed
-@tt{peer}). The @tt{gss}, @tt{sspi}, @tt{krb5}, @tt{pam}, and
-@tt{ldap} methods are not supported.
-
-@section[#:tag "postgresql-timestamp-tz"]{PostgreSQL Timestamps and Time Zones}
-
-PostgreSQL's @tt{timestamp with time zone} type is inconsistent with
-the SQL standard (probably), inconsistent with @tt{time with time
-zone}, and potentially confusing to PostgreSQL newcomers.
-
-A @tt{time with time zone} is essentially a @tt{time} structure with
-an additional field storing a time zone offset. In contrast, a
-@tt{timestamp with time zone} has no fields beyond those of
-@tt{timestamp}. Rather, it indicates that its datetime fields should
-be interpreted as a UTC time. Thus it represents an absolute point in
-time, unlike @tt{timestamp without time zone}, which represents local
-date and time in some unknown time zone (possibly---hopefully---known
-the the database designer, but unknown to PostgreSQL).
-
-When a @tt{timestamp with time zone} is created from a source without
-time zone information, the session's @tt{TIME ZONE} setting is used to
-adjust the source to UTC time. When the source contains time zone
-information, it is used to adjust the timestamp to UTC time. In either
-case, the time zone information is @emph{discarded} and only the UTC
-timestamp is stored. When a @tt{timestamp with time zone} is rendered
-as text, it is first adjusted to the time zone specified by the
-@tt{TIME ZONE} setting (or by
-@hyperlink["http://www.postgresql.org/docs/8.0/static/functions-datetime.html#FUNCTIONS-DATETIME-ZONECONVERT"]{@tt{AT
-TIME ZONE}}) and that offset is included in the rendered text.
-
-This library receives timestamps in binary format, so the time zone
-adjustment is not applied, nor is the session's @tt{TIME ZONE} offset
-included; thus all @racket[sql-timestamp] values in a query result
-have a @racket[tz] field of @racket[0] (for @tt{timestamp with time
-zone}) or @racket[#f] (for @tt{timestamp without time
-zone}). (Previous versions of this library sent and received
-timestamps as text, so they received timestamps with adjusted time
-zones.)
-
-
-@section{MySQL Authentication}
-
-As of version 5.5.7, MySQL supports
-@hyperlink["http://dev.mysql.com/doc/mysql-security-excerpt/5.5/en/pluggable-authentication.html"]{authentication
-plugins}. The only plugins currently supported by this library are
-@tt{mysql_native_password} (the default) and @tt{mysql_old_password},
-which corresponds to the password authentication mechanisms used since
-version 4.1 and before 4.1, respectively.
-
-
-@section[#:tag "sqlite3-requirements"]{SQLite Requirements}
-
-SQLite support requires the appropriate native library.
-
-@itemlist[
-
-@item{On Windows, the library is @tt{sqlite3.dll}. It is included in
-the Racket distribution.}
-
-@item{On Mac OS X, the library is @tt{libsqlite3.0.dylib}, which is
-included (in @tt{/usr/lib}) in Mac OS X version 10.4 onwards.}
-
-@item{On Linux, the library is @tt{libsqlite3.so.0}. It is included in
-the @tt{libsqlite3-0} package in Debian/Ubuntu and in the @tt{sqlite}
-package in Red Hat.}
-]
-
-
-@section[#:tag "ffi-concurrency"]{FFI-Based Connections and Concurrency}
-
-@tech{Wire-based connections} communicate using
-@tech/reference{ports}, which do not cause other Racket threads to
-block. In contrast, an FFI call causes all Racket threads to block
-until it completes, so @tech{FFI-based connections} can degrade the
-interactivity of a Racket program, particularly if long-running
-queries are performed using the connection. This problem can be
-avoided by creating the FFI-based connection in a separate
-@tech/reference{place} using the @racket[#:use-place] keyword
-argument. Such a connection will not block all Racket threads during
-queries; the disadvantage is the cost of creating and communicating
-with a separate @tech/reference{place}.
-
-
-@section[#:tag "odbc-requirements"]{ODBC Requirements}
-
-ODBC requires the appropriate driver manager native library as well as
-driver native libraries for each database system you want use ODBC to
-connect to.
-
-@itemlist[
-
-@item{On Windows, the driver manager is @tt{odbc32.dll}, which is
-included automatically with Windows.}
-
-@item{On Mac OS X, the driver manager is @tt{libiodbc.2.dylib}
-(@hyperlink["http://www.iodbc.org"]{iODBC}), which is included (in
-@tt{/usr/lib}) in Mac OS X version 10.2 onwards.}
-
-@item{On Linux, the driver manager is @tt{libodbc.so.1}
-(@hyperlink["http://www.unixodbc.org"]{unixODBC}---iODBC is not
-supported). It is available from the @tt{unixodbc} package in
-Debian/Ubuntu and in the @tt{unixODBC} package in Red Hat.}
-]
-
-In addition, you must install the appropriate ODBC Drivers and
-configure Data Sources. Refer to the ODBC documentation for the
-specific database system for more information.
-
-
-@section[#:tag "odbc-status"]{ODBC Status}
-
-ODBC support is experimental. The behavior of ODBC connections can
-vary widely depending on the driver in use and even the configuration
-of a particular data source.
-
-The following sections describe the configurations that this library
-has been tested with.
-
-Reports of success or failure on other platforms or with other drivers
-would be appreciated.
-
-@;{
-** There's no reason to actually use the following drivers. They're just
-** useful for testing ODBC support.
-
-@subsection{PostgreSQL ODBC Driver}
-
-The PostgreSQL ODBC driver version 09.00.0300 has been tested on
-@bold{win32} and @bold{linux}. 
-
-To get specific parameter type information, set the following Data
-Source options: @tt{Protocol = 7.4} and @tt{UserServerSidePrepare =
-1}, and use the @racket[#:strict-parameter-types?] connection option.
-
-Older versions of the driver, including version 08.03.0200, provided
-by Ubuntu 11.04, seem to have a bug in the character mode this library
-uses by default; use the @racket[#:character-mode 'utf-8] connection
-option as a workaround.
-
-@subsection{MySQL ODBC Driver}
-
-The MySQL ODBC driver version 5.1.6-1 has been tested on @bold{win32}
-and @bold{linux}.
-
-Avoid using the @racket[#:strict-parameter-types?] connection option,
-as the driver assigns all parameters the type @tt{varchar}. 
-
-@subsection{SQLite3 ODBC Driver}
-
-Avoid using the @racket[#:strict-parameter-types?] connection option,
-as the driver assigns all parameters the type @tt{longvarchar}.
-Furthermore, this driver interprets the declared types of columns
-strictly, replacing nonconforming values in query results with
-@tt{NULL}. All computed columns, even those with explicit @tt{CAST}s,
-seem to be returned as @tt{text}.
-}
-
-@subsection{DB2 ODBC Driver}
-
-The driver from IBM DB2 Express-C v9.7 has been tested on Ubuntu 11.04
-(32-bit only).
-
-For a typical installation where the instance resides at
-@tt{/home/db2inst1}, set the following option in the Driver
-configuration: @tt{Driver =
-/home/db2inst1/sqllib/lib32/libdb2.so}. (The path would presumably be
-different for a 64-bit installation.)
-
-The DB2 driver does not seem to accept a separate argument for the
-database to connect to; it must be the same as the Data Source name.
-
-@subsection{Oracle ODBC Driver}
-
-The driver from Oracle Database 10g Release 2 Express Edition has been
-tested on Ubuntu 11.04 (32-bit only).
-
-It seems the @tt{ORACLE_HOME} and @tt{LD_LIBRARY_PATH} environment
-variables must be set according to the @tt{oracle_env.{csh,sh}} script
-for the driver to work. 
-
-Columns of type @tt{TIME} can cause a memory error (ie, Racket
-crashes). This seems to be due to a
-@hyperlink["http://forums.oracle.com/forums/thread.jspa?threadID=572661"]{bug}
-in Oracle's ODBC driver, but I do not yet have a workaround.
-
-@;{
-Maybe Oracle bug? See:
-  http://forums.oracle.com/forums/thread.jspa?threadID=572661
-  http://stackoverflow.com/questions/38435/
-  http://forums.oracle.com/forums/thread.jspa?threadID=856713
-}
-
-@subsection{SQL Server ODBC Driver}
-
-Basic SQL Server support has been verified on Windows,
-but the automated test suite has not yet been adapted and run.
-
-The ``SQL Server'' driver refuses to accept @tt{NUMERIC} or
-@tt{DECIMAL} parameters, producing the error ``Invalid precision value
-(SQLSTATE: HY104).'' If possible, use the ``Native SQL Server''
-driver instead.
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/query.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/query.scrbl
deleted file mode 100644
index de90509531..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/query.scrbl
+++ /dev/null
@@ -1,855 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          scribble/struct
-          racket/sandbox
-          racket/runtime-path
-          "config.rkt"
-          "tabbing.rkt"
-          (for-label db db/util/geometry db/util/postgresql racket/dict))
-
-@(define-runtime-path log-file "log-for-query.rktd")
-@(define the-eval (make-pg-eval log-file #t))
-
-@;{ c - misc connection (alias to pgc)
-    myc - MySQL connection (???)
-    slc - SQLite connection (???)
-}
-@(the-eval '(define c pgc))
-
-@title[#:tag "query-api"]{Queries}
-
-@declare-exporting[db db/base #:use-sources (db/base)]
-
-This library provides a high-level functional query API,
-unlike many other database libraries, which present a stateful,
-iteration-based interface to queries. When a query function is
-invoked, it either returns a result or, if the query caused an error,
-raises an exception. Different query functions impose different
-constraints on the query results and offer different mechanisms for
-processing the results.
-
-@parheading{Errors} In most cases, a query error does not cause the
-connection to be disconnected. Specifically, the following kinds of
-errors should never cause a connection to be disconnected:
-@itemize[
-@item{SQL syntax errors, such as references to undefined tables,
-  columns, or operations, etc}
-@item{SQL runtime errors, such as integrity constraint violations}
-@item{violations of a specialized query function's expectations, such
-  as using @racket[query-value] with a query that returns multiple
-  columns}
-@item{supplying the wrong number or wrong types of parameters to a
-  prepared query, executing a prepared query with the wrong
-  connection, etc}
-]
-The following kinds of errors may cause a connection to be
-disconnected:
-@itemize[
-@item{changing communication settings, such as changing the
-  connection's character encoding}
-@item{communication failures and internal errors in the library}
-@item{a @seclink["breakhandler" #:doc '(lib "scribblings/reference/reference.scrbl")]{break} 
-  occurring during a connection operation}
-]
-See @secref["transactions"] for information on how errors can affect
-the transaction status.
-
-@parheading{Character encoding} This library is designed to interact with
-database systems using the UTF-8 character encoding. The connection
-functions attempt to negotiate UTF-8 communication at the beginning of
-every connection, but some systems also allow the character encoding
-to be changed via SQL commands (eg, @tt{SET NAMES}). If this happens,
-the client might be unable to reliably communicate with the database,
-and data might get corrupted in transmission. Avoid changing a
-connection's character encoding. When possible, the connection will
-observe the change and automatically disconnect with an error.
-
-@parheading{Synchronization} Connections are internally synchronized:
-it is safe to use a connection from different threads
-concurrently. Most connections are not kill-safe: killing a thread
-that is using a connection may leave the connection locked, causing
-future operations to block indefinitely. See also
-@secref["kill-safe"].
-
-
-@section[#:tag "query-statements"]{Statements}
-
-All query functions require both a connection and a
-@deftech{statement}, which is one of the following:
-@itemlist[
-@item{a string containing a single SQL statement}
-@item{a @tech{prepared statement} produced by @racket[prepare]}
-@item{a @tech{virtual statement} produced by
-  @racket[virtual-statement]}
-@item{a statement-binding value produced by
-  @racket[bind-prepared-statement]}
-@item{an instance of a struct type that implements @racket[prop:statement]}
-]
-
-A SQL statement may contain parameter placeholders that stand for SQL
-scalar values; such statements are called @deftech{parameterized
-queries}. The parameter values must be supplied when the statement is
-executed; the parameterized statement and parameter values are sent to
-the database back end, which combines them correctly and safely.
-
-Use parameters instead of Racket string operations (eg,
-@racket[format] or @racket[string-append]) to avoid
-@secref["dbsec-sql-injection"].
-
-The syntax of placeholders varies depending on the database
-system. For example:
-
-@centered{
-@tabbing{
-PostgreSQL:   @&  @tt{select * from the_numbers where n > $1;} @//
-MySQL, ODBC:  @&  @tt{select * from the_numbers where n > ?;} @//
-SQLite:       @&  supports both syntaxes (plus others)
-}
-}
-
-@defproc[(statement? [x any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[x] is a @tech{statement}, @racket[#f]
-  otherwise.
-}
-
-
-@section{Simple Queries}
-
-The simple query API consists of a set of functions specialized to
-various types of queries. For example, @racket[query-value] is
-specialized to queries that return exactly one row of exactly one
-column.
-
-If a statement takes parameters, the parameter values are given as
-additional arguments immediately after the SQL statement. Only a
-statement given as a string, @tech{prepared statement}, or
-@tech{virtual statement} can be given ``inline'' parameters; if the
-statement is a statement-binding, no inline parameters are permitted.
-
-The types of parameters and returned fields are described in
-@secref["sql-types"].
-
-@defproc[(query-exec [connection connection?]
-                     [stmt statement?]
-                     [arg any/c] ...)
-         void?]{
-
-  Executes a SQL statement for effect.
-
-@examples[#:eval the-eval
-(query-exec pgc "insert into the_numbers values (42, 'the answer')")
-(query-exec pgc "delete from the_numbers where n = $1" 42)
-]
-}
-
-@defproc[(query-rows [connection connection?]
-                     [stmt statement?]
-                     [arg any/c] ...
-                     [#:group groupings
-                      (let* ([field/c (or/c string? exact-nonnegative-integer?)]
-                             [grouping/c (or/c field/c (vectorof field/c))])
-                        (or/c grouping/c (listof grouping/c)))
-                      null]
-                     [#:group-mode group-mode
-                      (listof (or/c 'preserve-null 'list))
-                      null])
-         (listof vector?)]{
-
-  Executes a SQL query, which must produce rows, and returns the list
-  of rows (as vectors) from the query.
-
-@examples[#:eval the-eval
-(query-rows pgc "select * from the_numbers where n = $1" 2)
-(query-rows c "select 17")
-]
-
-  If @racket[groupings] is not empty, the result is the same as if
-  @racket[group-rows] had been called on the result rows.
-}
-
-@defproc[(query-list [connection connection?]
-                     [stmt statement?]
-                     [arg any/c] ...)
-         list?]{
-
-  Executes a SQL query, which must produce rows of exactly one
-  column, and returns the list of values from the query.
-
-@examples[#:eval the-eval
-(query-list c "select n from the_numbers where n < 2")
-(query-list c "select 'hello'")
-]
-}
-
-@defproc[(query-row [connection connection?]
-                    [stmt statement?]
-                    [arg any/c] ...)
-         vector?]{
-
-  Executes a SQL query, which must produce exactly one row, and
-  returns its (single) row result as a vector.
-
-@examples[#:eval the-eval
-(query-row pgc "select * from the_numbers where n = $1" 2)
-(query-row pgc "select min(n), max(n) from the_numbers")
-]
-}
-
-@defproc[(query-maybe-row [connection connection?]
-                          [stmt statement?]
-                          [arg any/c] ...)
-         (or/c vector? #f)]{
-
-  Like @racket[query-row], but the query may produce zero rows; in
-  that case, @racket[#f] is returned.
-
-@examples[#:eval the-eval
-(query-maybe-row pgc "select * from the_numbers where n = $1" 100)
-(query-maybe-row c "select 17")
-]
-}
-
-@defproc[(query-value [connection connection?]
-                      [stmt statement?]
-                      [arg any/c] ...)
-         any/c]{
-
-  Executes a SQL query, which must produce exactly one row of exactly
-  one column, and returns its single value result.
-
-@examples[#:eval the-eval
-(query-value pgc "select timestamp 'epoch'")
-(query-value pgc "select d from the_numbers where n = $1" 3)
-]
-}
-
-@defproc[(query-maybe-value [connection connection?]
-                            [stmt statement?]
-                            [arg any/c] ...)
-         (or/c any/c #f)]{
-
-  Like @racket[query-value], but the query may produce zero rows; in
-  that case, @racket[#f] is returned.
-
-@examples[#:eval the-eval
-(query-maybe-value pgc "select d from the_numbers where n = $1" 100)
-(query-maybe-value c "select count(*) from the_numbers")
-]
-}
-
-@defproc[(in-query [connection connection?]
-                   [stmt statement?]
-                   [arg any/c] ...
-                   [#:fetch fetch-size (or/c exact-positive-integer? +inf.0) +inf.0]
-                   [#:group groupings
-                    (let* ([field/c (or/c string? exact-nonnegative-integer?)]
-                           [grouping/c (or/c field/c (vectorof field/c))])
-                      (or/c grouping/c (listof grouping/c)))
-                    null]
-                   [#:group-mode group-mode
-                    (listof (or/c 'preserve-null 'list))
-                    null])
-         sequence?]{
-
-  Executes a SQL query, which must produce rows, and returns a
-  sequence. Each step in the sequence produces as many values as the
-  rows have columns. 
-
-  If @racket[fetch-size] is @racket[+inf.0], all rows are fetched when
-  the sequence is created. If @racket[fetch-size] is finite, a
-  @deftech{cursor} is created and @racket[fetch-size] rows are fetched
-  at a time, allowing processing to be interleaved with retrieval. On
-  some database systems, ending a transaction implicitly closes all
-  open cursors; attempting to fetch more rows may fail. On PostgreSQL,
-  a cursor can be opened only within a transaction.
-
-  If @racket[groupings] is not empty, the result is the same as
-  if @racket[group-rows] had been called on the result rows. If
-  @racket[groupings] is not empty, then @racket[fetch-size] must
-  be @racket[+inf.0]; otherwise, an exception is raised.
-
-@examples[#:eval the-eval
-(for/list ([n (in-query pgc "select n from the_numbers where n < 2")])
-  n)
-(call-with-transaction pgc
-  (lambda ()
-    (for ([(n d)
-           (in-query pgc "select * from the_numbers where n < $1" 4
-                     #:fetch 1)])
-      (printf "~a: ~a\n" n d))))
-]
-
-An @racket[in-query] application can provide better performance when
-it appears directly in a @racket[for] clause. In addition, it may
-perform stricter checks on the number of columns returned by the query
-based on the number of variables in the clause's left-hand side:
-
-@examples[#:eval the-eval
-(for ([n (in-query pgc "select * from the_numbers")])
-  (displayln n))
-]
-}
-
-
-@section{General Query Support}
-
-A general query result is either a @racket[simple-result] or a
-@racket[rows-result].
-
-@defstruct*[simple-result
-            ([info (listof (cons/c symbol? any/c))])]{
-
-Represents the result of a SQL statement that does not return a
-relation, such as an @tt{INSERT} or @tt{DELETE} statement.  
-
-The @racket[info] field is an association list, but its contents vary
-based on database system and may change in future versions of this
-library (even new minor versions). The following keys are supported for
-multiple database systems:
-
-@itemlist[
-
-@item{@racket['insert-id]: If the value is a positive integer, the
-statement was an @tt{INSERT} statement and the value is a
-system-specific identifier for the inserted row. For PostgreSQL, the
-value is the row's OID, if the table has OIDs (for an alternative, see
-the @tt{INSERT ... RETURNING} statement). For MySQL, the value is the
-same as the result of
-@hyperlink["http://dev.mysql.com/doc/refman/5.0/en/information-functions.html#function_last-insert-id"]{last_insert_id}
-function---that is, the value of the row's @tt{AUTO_INCREMENT}
-field. If there is no such field, the value is @racket[#f]. For
-SQLite, the value is the same as the result of the
-@hyperlink["http://www.sqlite.org/lang_corefunc.html#last_insert_rowid"]{last_insert_rowid}
-function---that is, the
-@hyperlink["http://www.sqlite.org/lang_createtable.html#rowid"]{ROWID}
-of the inserted row.}
-
-@item{@racket['affected-rows]: The number (a nonnegative integer) of
-rows inserted by an @tt{INSERT} statement, modified by an @tt{UPDATE}
-statement, or deleted by a @tt{DELETE} statement. Only directly
-affected rows are counted; rows affected because of triggers or
-integrity constraint actions are not counted.}
-]
-}
-
-@defstruct*[rows-result
-            ([headers (listof any/c)]
-             [rows (listof vector?)])]{
-
-Represents the result of SQL statement that results in a relation,
-such as a @tt{SELECT} query.
-
-The @racket[headers] field is a list whose length is the number of
-columns in the result rows. Each header is usually an association list
-containing information about the column, but do not rely on its
-contents; it varies based on the database system and may change in
-future version of this library (even new minor versions).
-}
-
-@defproc[(query [connection connection?]
-                [stmt statement?]
-                [arg any/c] ...)
-         (or/c simple-result? rows-result?)]{
-
-  Executes a query, returning a structure that describes the
-  results. Unlike the more specialized query functions, @racket[query]
-  supports both rows-returning and effect-only queries.
-}
-
-@defproc[(group-rows [result rows-result?]
-                     [#:group groupings
-                      (let* ([field/c (or/c string? exact-nonnegative-integer?)]
-                             [grouping/c (or/c field/c (vectorof field/c))])
-                        (or/c grouping/c (listof grouping/c)))]
-                     [#:group-mode group-mode
-                      (listof (or/c 'preserve-null 'list))
-                      null])
-         rows-result?]{
-
-If @racket[groupings] is a vector, the elements must be names of
-fields in @racket[result], and @racket[result]'s rows are regrouped
-using the given fields. Each grouped row contains N+1 fields; the
-first N fields are the @racket[groupings], and the final field
-is a list of ``residual rows'' over the rest of the fields. A residual
-row of all NULLs is dropped (for convenient processing of @tt{OUTER
-JOIN} results) unless @racket[group-mode] includes
-@racket['preserve-null]. If @racket[group-mode] contains
-@racket['list], there must be exactly one residual field, and its
-values are included without a vector wrapper (similar to
-@racket[query-list]).
-
-See also @secref["dbperf-n+1"].
-
-@examples[#:eval the-eval
-(define vehicles-result
-  (rows-result
-   '(((name . "type")) ((name . "maker")) ((name . "model")))
-   `(#("car"  "honda"   "civic")
-     #("car"  "ford"    "focus")
-     #("car"  "ford"    "pinto")
-     #("bike" "giant"   "boulder")
-     #("bike" "schwinn" ,sql-null))))
-(group-rows vehicles-result
-            #:group '(#("type")))
-]
-
-The grouped final column is given the name @racket["grouped"].
-
-The @racket[groupings] argument may also be a list of vectors;
-in that case, the grouping process is repeated for each set of
-grouping fields. The grouping fields must be distinct.
-
-@examples[#:eval the-eval
-(group-rows vehicles-result
-            #:group '(#("type") #("maker"))
-            #:group-mode '(list))
-]
-}
-
-@defproc[(rows->dict [result rows-result?]
-                     [#:key key-field/s
-                      (let ([field/c (or/c string? exact-nonnegative-integer?)])
-                        (or/c field/c (vectorof field/c)))]
-                     [#:value value-field/s
-                      (let ([field/c (or/c string? exact-nonnegative-integer?)])
-                        (or/c field/c (vectorof field/c)))]
-                     [#:value-mode value-mode
-                      (listof (or/c 'list 'preserve-null))
-                      null])
-         dict?]{
-         
-Creates a dictionary mapping @racket[key-field/s] to
-@racket[value-field/s]. If @racket[key-field/s] is a single field name
-or index, the keys are the field values; if @racket[key-field/s] is a
-vector, the keys are vectors of the field values. Likewise for
-@racket[value-field/s].
-
-If @racket[value-mode] contains @racket['list], a list of values is
-accumulated for each key; otherwise, there must be at most one value
-for each key. Values consisting of all @racket[sql-null?] values are
-dropped unless @racket[value-mode] contains
-@racket['preserve-null].
-
-@examples[#:eval the-eval
-(rows->dict vehicles-result 
-            #:key "model" #:value '#("type" "maker"))
-(rows->dict vehicles-result
-            #:key "maker" #:value "model" #:value-mode '(list))
-]
-}
-
-
-@section{Prepared Statements}
-
-A @deftech{prepared statement} is the result of a call to
-@racket[prepare].
-
-Any server-side or native-library resources associated with a prepared
-statement are released when the prepared statement is
-garbage-collected or when the connection that owns it is closed;
-prepared statements do not need to be (and cannot be) explicitly
-closed.
-
-@defproc[(prepare [connection connection?]
-                  [stmt (or/c string? virtual-statement?)])
-         prepared-statement?]{
-
-  Prepares a statement. The resulting @tech{prepared statement} is
-  tied to the connection that prepared it; attempting to execute it
-  with another connection will trigger an exception. The prepared
-  statement holds its connection link weakly; a reference to a
-  prepared statement will not keep a connection from being garbage
-  collected.
-}
-
-@defproc[(prepared-statement? [x any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[x] is a @tech{prepared statement}
-  created by @racket[prepare], @racket[#f] otherwise.
-}
-
-@defproc[(prepared-statement-parameter-types [pst prepared-statement?])
-         (listof (list/c boolean? (or/c symbol? #f) any/c))]{
-
-  Returns a list with one element for each of the prepared statement's
-  parameters. Each element is itself a list of the following form:
-
-  @racketblock[(list _supported? _type _typeid)]
-
-  The @racket[_supported?] field indicates whether the type is
-  supported by this library; the @racket[_type] field is a symbol
-  corresponding to an entry in one of the tables in
-  @secref["db-types"]; and the @racket[_typeid] field is a
-  system-specific type identifier. The type description list format
-  may be extended with additional information in future versions of
-  this library.
-}
-
-@defproc[(prepared-statement-result-types [pst prepared-statement?])
-         (listof (list/c boolean? (or/c symbol? #f) any/c))]{
-
-  If @racket[pst] is a rows-returning statement (eg, @tt{SELECT}),
-  returns a list of type descriptions as described above, identifying
-  the SQL types (or pseudo-types) of the result columns. If
-  @racket[pst] is not a rows-returning statement, the function returns
-  the empty list.
-}
-
-@defproc[(bind-prepared-statement
-            [pst prepared-statement?]
-            [params (listof any/c)])
-         statement-binding?]{
-
-  Creates a statement-binding value pairing @racket[pst] with
-  @racket[params], a list of parameter arguments. The result can be
-  executed with @racket[query] or any of the other query functions,
-  but it must be used with the same connection that created
-  @racket[pst].
-
-  @examples[#:eval the-eval
-    (let* ([get-name-pst
-            (prepare pgc "select d from the_numbers where n = $1")]
-           [get-name2
-            (bind-prepared-statement get-name-pst (list 2))]
-           [get-name3
-            (bind-prepared-statement get-name-pst (list 3))])
-      (list (query-value pgc get-name2)
-            (query-value pgc get-name3)))
-  ]
-
-  Most query functions perform the binding step implicitly.
-}
-
-@defproc[(statement-binding? [x any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[x] is a statement created by
-  @racket[bind-prepared-statement], @racket[#f] otherwise.
-}
-
-@defproc[(virtual-statement [gen (or/c string? (-> dbsystem? string?))])
-         virtual-statement?]{
-
-  Creates a @deftech{virtual statement}, @racket[_stmt], which
-  encapsulates a weak mapping of connections to prepared
-  statements. When a query function is called with @racket[_stmt] and
-  a connection, the weak hash is consulted to see if the statement has
-  already been prepared for that connection. If so, the prepared
-  statement is used; otherwise, the statement is prepared and stored
-  in the table.
-
-  The @racket[gen] argument must be either a SQL string or a function
-  that accepts a databse system object and produces a SQL string. The
-  function variant allows the SQL syntax to be dynamically customized
-  for the database system in use.
-
-@examples[#:eval the-eval
-(define pst
-  (virtual-statement
-   (lambda (dbsys)
-     (case (dbsystem-name dbsys)
-       ((postgresql) "select n from the_numbers where n < $1")
-       ((sqlite3) "select n from the_numbers where n < ?")
-       (else (error "unknown system"))))))
-(query-list pgc pst 3)
-(eval:alts (query-list slc pst 3)
-           (query-list pgc pst 3))
-]
-}
-
-@defproc[(virtual-statement? [x any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[x] is a @tech{virtual statement}
-  created by @racket[virtual-statement], @racket[#f] otherwise.
-}
-
-
-@section[#:tag "transactions"]{Transactions}
-
-The functions described in this section provide a consistent interface
-to transactions.
-
-A @deftech{managed transaction} is one created via either
-@racket[start-transaction] or @racket[call-with-transaction]. In
-contrast, an @deftech{unmanaged transaction} is one created by
-evaluating a SQL statement such as @tt{START TRANSACTION}. A
-@deftech{nested transaction} is a transaction created within the
-extent of an existing transaction. If a nested transaction is
-committed, its changes are promoted to the enclosing transaction,
-which may itself be committed or rolled back. If a nested transaction
-is rolled back, its changes are discarded, but the enclosing
-transaction remains open. Nested transactions are implemented via SQL
-@tt{SAVEPOINT}, @tt{RELEASE SAVEPOINT}, and @tt{ROLLBACK TO
-SAVEPOINT}.
-
-ODBC connections must use @tech{managed transactions} exclusively;
-using transaction-changing SQL may cause these functions to behave
-incorrectly and may cause additional problems in the ODBC driver. ODBC
-connections do not support @tech{nested transactions}.
-
-PostgreSQL, MySQL, and SQLite connections must not mix @tech[#:key
-"managed transaction"]{managed} and @tech[#:key "unmanaged
-transaction"]{unmanaged} transactions. For example, calling
-@racket[start-transaction] and then executing a @tt{ROLLBACK}
-statement is not allowed. Note that in MySQL, some SQL statements have
-@hyperlink["http://dev.mysql.com/doc/refman/5.0/en/implicit-commit.html"]{implicit
-transaction effects}. For example, in MySQL a @tt{CREATE TABLE}
-statement implicitly commits the current transaction. These statements
-also must not be used within @tech{managed transactions}. (In
-contrast, PostgreSQL and SQLite both support transactional DDL.)
-
-@parheading{Errors} Query errors may affect an open transaction in one of
-three ways:
-@itemlist[#:style 'ordered
-@item{the transaction remains open and unchanged}
-@item{the transaction is automatically rolled back}
-@item{the transaction becomes an @deftech{invalid transaction}; all
-subsequent queries will fail until the transaction is rolled back}
-]
-To avoid the silent loss of information, this library attempts to
-avoid behavior (2) completely by marking transactions as invalid
-instead (3). Invalid transactions can be identified using the
-@racket[needs-rollback?] function. The following list is a rough guide
-to what errors cause which behaviors:
-@itemlist[
-@item{All errors raised by checks performed by this library, such as
-  parameter arity and type errors, leave the transaction open and
-  unchanged (1).}
-@item{All errors originating from PostgreSQL cause the transaction to
-  become @tech[#:key "invalid transaction"]{invalid} (3).}
-@item{Most errors originating from MySQL leave the transaction open
-  and unchanged (1), but a few cause the transaction to become
-  @tech[#:key "invalid transaction"]{invalid} (3). In the latter
-  cases, the underlying behavior of MySQL is to roll back the
-  transaction but @emph{leave it open} (see
-  @hyperlink["http://dev.mysql.com/doc/refman/5.1/en/innodb-error-handling.html"]{the
-  MySQL documentation}). This library detects those cases and marks
-  the transaction @tech[#:key "invalid transaction"]{invalid}
-  instead.}
-@item{Most errors originating from SQLite leave the transaction open
-  and unchanged (1), but a few cause the transaction to become
-  @tech[#:key "invalid transaction"]{invalid} (3). In the latter
-  cases, the underlying behavior of SQLite is to roll back the
-  transaction (see
-  @hyperlink["http://www.sqlite.org/lang_transaction.html"]{the SQLite
-  documentation}). This library detects those cases and marks the
-  transaction @tech[#:key "invalid transaction"]{invalid} instead.}
-@item{All errors originating from an ODBC driver cause the transaction
-  to become @tech[#:key "invalid transaction"]{invalid} (3). The
-  underlying behavior of ODBC drivers varies widely, and ODBC provides
-  no mechanism to detect when an existing transaction has been rolled
-  back, so this library intercepts all errors and marks the
-  transaction @tech[#:key "invalid transaction"]{invalid} instead.}
-]
-If a nested transaction marked @tech[#:key "invalid
-transaction"]{invalid} is rolled back, the enclosing transaction is
-typically still valid.
-
-If a transaction is open when a connection is disconnected, it is
-implicitly rolled back.
-
-@defproc[(start-transaction [c connection?]
-                            [#:isolation isolation-level
-                             (or/c 'serializable
-                                   'repeatable-read
-                                   'read-committed
-                                   'read-uncommitted
-                                   #f)
-                             #f]
-                            [#:option option any/c #f])
-         void?]{
-
-  Starts a transaction with isolation @racket[isolation-level]. If
-  @racket[isolation-level] is @racket[#f], the isolation is
-  database-dependent; it may be a default isolation level or it may be
-  the isolation level of the previous transaction.
-
-  The behavior of @racket[option] depends on the database system:
-  @itemlist[
-  @item{PostgreSQL supports @racket['read-only] and @racket['read-write]
-    for the @hyperlink["http://www.postgresql.org/docs/9.0/static/sql-set-transaction.html"]{corresponding
-    transaction options}.}
-  @item{SQLite supports @racket['deferred], @racket['immediate], and
-    @racket['exclusive] for the @hyperlink["http://www.sqlite.org/lang_transaction.html"]{corresponding
-    locking modes}.} 
-  @item{MySQL and ODBC no not support any options.}
-  ]
-  If @racket[option] is not supported, an exception is raised.
-
-  If @racket[c] is already in a transaction, @racket[isolation-level]
-  and @racket[option] must both be @racket[#f], and a @tech{nested
-  transaction} is opened.
-
-  See also @secref["dbperf-concurrency"].
-}
-
-@defproc[(commit-transaction [c connection?]) void?]{
-
-  Attempts to commit the current transaction, if one is open. If the
-  transaction cannot be commited (for example, if it is @tech[#:key
-  "invalid transaction"]{invalid}), an exception is raised.
-
-  If the current transaction is a @tech{nested transaction}, the
-  nested transaction is closed, its changes are incorporated into the
-  enclosing transaction, and the enclosing transaction is resumed.
-
-  If no transaction is open, this function has no effect.
-}
-
-@defproc[(rollback-transaction [c connection?]) void?]{
-
-  Rolls back the current transaction, if one is open.
-
-  If the current transaction is a @tech{nested transaction}, the
-  nested transaction is closed, its changes are abandoned, and the
-  enclosing transaction is resumed.
-
-  If no transaction is open, this function has no effect.
-}
-
-@defproc[(in-transaction? [c connection?])
-         boolean?]{
-
-  Returns @racket[#t] if @racket[c] has an open transaction
-  (@tech[#:key "managed transaction"]{managed} or @tech[#:key
-  "unmanaged transaction"]{unmanaged}), @racket[#f] otherwise.
-}
-
-@defproc[(needs-rollback? [c connection?]) boolean?]{
-
-  Returns @racket[#t] if @racket[c] is in an @tech{invalid
-  transaction}. All queries executed using @racket[c] will fail until
-  the transaction is rolled back (either using
-  @racket[rollback-transaction], if the transaction was created with
-  @racket[start-transaction], or when the procedure passed to
-  @racket[call-with-transaction] returns).
-}
-
-@defproc[(call-with-transaction [c connection?]
-                                [proc (-> any)]
-                                [#:isolation isolation-level
-                                 (or/c 'serializable
-                                       'repeatable-read
-                                       'read-committed
-                                       'read-uncommitted
-                                       #f)
-                                 #f]
-                                [#:option option any/c #f])
-         any]{
-
-  Calls @racket[proc] in the context of a new transaction with
-  isolation level @racket[isolation-level]. If @racket[proc] completes
-  normally, the transaction is committed and @racket[proc]'s results
-  are returned. If @racket[proc] raises an exception (or if the
-  implicit commit at the end raises an exception), the transaction is
-  rolled back and the exception is re-raised.
-
-  If @racket[call-with-transaction] is called within a transaction,
-  @racket[isolation-level] must be @racket[#f], and it creates a
-  @tech{nested transaction}. Within the extent of a call to
-  @racket[call-with-transaction], transactions must be properly
-  nested. In particular:
-  @itemlist[
-  @item{Calling either @racket[commit-transaction] or
-  @racket[rollback-transaction] when the open transaction was
-  created by @racket[call-with-transaction] causes an exception to be
-  raised.}
-  @item{If a further nested transaction is open when @racket[proc]
-  completes (that is, created by an unmatched
-  @racket[start-transaction] call), an exception is raised and the
-  nested transaction created by @racket[call-with-transaction] is
-  rolled back.}
-  ]
-}
-
-@section{SQL Errors}
-
-SQL errors are represented by the @racket[exn:fail:sql] exception
-type.
-
-@defstruct[(exn:fail:sql exn:fail)
-           ([sqlstate (or/c string? symbol?)]
-            [info (listof (cons/c symbol? any/c))])]{
-
-  Represents a SQL error originating from the database server or
-  native library. The @racket[sqlstate] field contains the SQLSTATE
-  code (a five-character string) of the error for PostgreSQL, MySQL,
-  or ODBC connections or a symbol for SQLite connections. Refer to the
-  database system's documentation for the definitions of error codes:
-
-  @itemlist[
-  @item{@hyperlink["http://www.postgresql.org/docs/9.0/static/errcodes-appendix.html"]{
-    PostgreSQL SQLSTATE codes}}
-  @item{@hyperlink["http://dev.mysql.com/doc/refman/5.5/en/error-messages-server.html"]{
-    MySQL SQLSTATE codes}}
-  @item{@hyperlink["http://www.sqlite.org/c3ref/c_abort.html"]{
-    SQLite error codes}; errors are represented as a symbol based on
-  the error constant's name, such as @racket['busy] for @tt{SQLITE_BUSY}}
-  @item{ODBC: see the database system's documentation}
-  ]
-
-  The @racket[info] field contains all information available about the
-  error as an association list. The available keys vary, but the
-  @racket['message] key is typically present; its value is a string
-  containing the error message.
-
-@examples[#:eval the-eval
-(with-handlers ([exn:fail:sql? exn:fail:sql-info])
-  (query pgc "select * from nosuchtable"))
-]
-
-  Errors originating from the @racketmodname[db] library, such as
-  arity and contract errors, type conversion errors, etc, are not
-  represented by @racket[exn:fail:sql]. 
-}
-
-@section{Database Catalog Information}
-
-@defproc[(list-tables [c connection?]
-                      [#:schema schema
-                       (or/c 'search-or-current 'search 'current)
-                       'search-or-current])
-         (listof string?)]{
-
-Returns a list of unqualified names of tables (and views) defined in
-the current database.
-
-If @racket[schema] is @racket['search], the list contains all tables
-in the current schema search path (with the possible exception of
-system tables); if the search path cannot be determined, an exception
-is raised. If @racket[schema] is @racket['current], the list contains
-all tables in the current schema. If @racket[schema] is
-@racket['search-or-current] (the default), the search path is used if
-it can be determined; otherwise the current schema is used.
-The schema search path cannot be determined for ODBC-based
-connections.
-}
-
-@defproc[(table-exists? [c connection?]
-                        [table-name string?]
-                        [#:schema schema
-                         (or/c 'search-or-current 'search 'current)
-                         'search-or-current]
-                        [#:case-sensitive? case-sensitive? any/c #f])
-         boolean?]{
-
-Indicates whether a table (or view) named @racket[table-name]
-exists. The meaning of the @racket[schema] argument is the same as for
-@racket[list-tables], and the @racket[case-sensitive?] argument
-controls how table names are compared.
-}
-
-
-@section{Creating New Kinds of Statements}
-
-@defthing[prop:statement (struct-type-property/c
-                          (-> any/c connection? statement?))]{
-
-A struct type property for creating new kinds of statements. The
-property value is applied to the struct instance and a connection, and
-it must return a @tech{statement}.
-}
-
-
-@(close-eval the-eval)
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/sql-types.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/sql-types.scrbl
deleted file mode 100644
index 10a4c30f9a..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/sql-types.scrbl
+++ /dev/null
@@ -1,536 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          scribble/struct
-          racket/sandbox
-          racket/runtime-path
-          "config.rkt"
-          "tabbing.rkt"
-          (for-label db db/util/geometry db/util/postgresql
-                     json))
-
-@(define-runtime-path log-file "log-for-sql-types.rktd")
-@(define the-eval (make-pg-eval log-file #t))
-
-@title[#:tag "sql-types"]{SQL Types and Conversions}
-
-@declare-exporting[db db/base #:use-sources (db/base)]
-
-Connections automatically convert query results to appropriate Racket
-types. Likewise, query parameters are accepted as Racket values and
-converted to the appropriate SQL type.
-
-@examples[#:eval the-eval
-(query-value pgc "select count(*) from the_numbers")
-(query-value pgc "select false")
-(query-value pgc "select 1 + $1" 2)
-]
-
-If a query result contains a column with a SQL type not supported by
-this library, an exception is raised. As a workaround, cast the column
-to a supported type:
-
-@examples[#:eval the-eval
-(query-value pgc "select inet '127.0.0.1'")
-(query-value pgc "select cast(inet '127.0.0.1' as varchar)")
-]
-
-The exception for unsupported types in result columns is raised when
-the query is executed, not when it is prepared; for parameters it is
-raised when the parameter values are supplied. Thus even unexecutable
-prepared statements can be inspected using
-@racket[prepared-statement-parameter-types] and
-@racket[prepared-statement-result-types].
-
-
-@section[#:tag "db-types"]{SQL Type Conversions}
-
-This section describes the correspondences between SQL types and
-Racket types for the supported database systems. 
-
-@subsection[#:tag "postgresql-types"]{PostgreSQL Types}
-
-This section applies to connections created with
-@racket[postgresql-connect]. 
-
-The following table lists the PostgreSQL types known to this library,
-along with their corresponding Racket representations.
-
-@centered{
-@tabbing{
-  @bold{PostgreSQL type}  @& @bold{pg_type.typname}  @& @bold{Racket type} @//
-  @racket['boolean]       @& @tt{bool}               @& @racket[boolean?] @//
-  @racket['char1]         @& @tt{char}               @& @racket[char?] @//
-  @racket['smallint]      @& @tt{int2}               @& @racket[exact-integer?] @//
-  @racket['integer]       @& @tt{int4}               @& @racket[exact-integer?] @//
-  @racket['bigint]        @& @tt{int8}               @& @racket[exact-integer?] @//
-  @racket['real]          @& @tt{float4}             @& @racket[real?] @//
-  @racket['double]        @& @tt{float8}             @& @racket[real?] @//
-  @racket['decimal]       @& @tt{numeric}            @& @racket[rational?] or @racket[+nan.0] @//
-  @racket['character]     @& @tt{bpchar}             @& @racket[string?] @//
-  @racket['varchar]       @& @tt{varchar}            @& @racket[string?] @//
-  @racket['text]          @& @tt{text}               @& @racket[string?] @//
-  @racket['bytea]         @& @tt{bytea}              @& @racket[bytes?] @//
-  @racket['date]          @& @tt{date}               @& @racket[sql-date?] @//
-  @racket['time]          @& @tt{time}               @& @racket[sql-time?] @//
-  @racket['timetz]        @& @tt{timetz}             @& @racket[sql-time?] @//
-  @racket['timestamp]     @& @tt{timestamp}          @& @racket[sql-timestamp?]
-                                                        or @racket[-inf.0] or @racket[+inf.0] @//
-  @racket['timestamptz]   @& @tt{timestamptz}        @& @racket[sql-timestamp?] 
-                                                        or @racket[-inf.0] or @racket[+inf.0] @//
-  @racket['interval]      @& @tt{interval}           @& @racket[sql-interval?] @//
-  @racket['bit]           @& @tt{bit}                @& @racket[bit-vector?] @//
-  @racket['varbit]        @& @tt{varbit}             @& @racket[bit-vector?] @//
-
-  @racket['json]          @& @tt{json}               @& @racket[jsexpr?] @//
-  @racket['int4range]     @& @tt{int4range}          @& @racket[pg-range-or-empty?] @//
-  @racket['int8range]     @& @tt{int8range}          @& @racket[pg-range-or-empty?] @//
-  @racket['numrange]      @& @tt{numrange}           @& @racket[pg-range-or-empty?] @//
-  @racket['tsrange]       @& @tt{tsrange}            @& @racket[pg-range-or-empty?] @//
-  @racket['tstzrange]     @& @tt{tstzrange}          @& @racket[pg-range-or-empty?] @//
-  @racket['daterange]     @& @tt{daterange}          @& @racket[pg-range-or-empty?] @//
-
-  @racket['point]         @& @tt{point}              @& @racket[point?] @//
-  @racket['lseg]          @& @tt{lseg}               @& @racket[line?] @//
-  @racket['path]          @& @tt{path}               @& @racket[pg-path?] @//
-  @racket['box]           @& @tt{box}                @& @racket[pg-box?] @//
-  @racket['polygon]       @& @tt{polygon}            @& @racket[polygon?] @//
-  @racket['circle]        @& @tt{circle}             @& @racket[pg-circle?]
-}
-}
-
-The @racket['char1] type, written @tt{"char"} in PostgreSQL's SQL
-syntax (the quotation marks are significant), is one byte, essentially
-a tiny integer written as a character.
-
-A SQL value of type @tt{decimal} is converted to either an exact
-rational or @racket[+nan.0]. When converting Racket values to SQL
-@tt{decimal}, exact rational values representable by finite decimal
-strings are converted without loss of precision. (Precision may be
-lost, of course, if the value is then stored in a database field of
-lower precision.) Other real values are converted to decimals with a
-loss of precision. In PostgreSQL, @tt{numeric} and @tt{decimal} refer
-to the same type.
-
-@examples[#:eval the-eval
-(query-value pgc "select real '+Infinity'")
-(query-value pgc "select numeric '12345678901234567890'")
-]
-
-A SQL @tt{timestamp with time zone} is converted to a Racket
-@racket[sql-timestamp] in UTC---that is, with a @racket[tz] field of
-@racket[0]. If a Racket @racket[sql-timestamp] without a time zone
-(@racket[tz] is @racket[#f]) is given for a parameter of type
-@tt{timestamp with time zone}, it is treated as a timestamp in
-UTC. See also @secref["postgresql-timestamp-tz"].
-
-The geometric types such as @racket['point] are represented by
-structures defined in the @racketmodname[db/util/geometry] and
-@racketmodname[db/util/postgresql] modules.
-
-PostgreSQL user-defined @emph{domains} are supported in query results
-if the underlying type is supported. Recordset headers and
-@racket[prepared-statement-result-types] report them in terms of the
-underlying type. Parameters with user-defined domain types are not
-currently supported. As a workaround, cast the parameter to the
-underlying type. For example, if the type of @tt{$1} is a domain whose
-underlying type is @tt{integer}, then replace @tt{$1} with
-@tt{($1::integer)}.
-
-For each type in the table above, the corresponding
-@hyperlink["http://www.postgresql.org/docs/8.2/static/arrays.html"]{array
-type} is also supported, using the @racket[pg-array] structure. Use
-the
-@hyperlink["http://www.postgresql.org/docs/8.2/static/functions-comparisons.html#AEN14122"]{
-@tt{= ANY}} syntax with an array parameter instead of dynamically
-constructing a SQL @tt{IN} expression:
-
-@examples[#:eval the-eval
-(query-value pgc "select 1 in (1, 2, 3)")
-(query-value pgc "select 1 = any ($1::integer[])"
-             (list->pg-array (list 1 2 3)))
-]
-
-A list may be provided for an array parameter, in which case it is
-automatically converted using @racket[list->pg-array]. The type
-annotation can be dropped when the array type can be inferred from the
-left-hand side.
-
-@examples[#:eval the-eval
-(query-value pgc "select 1 = any ($1)" (list 1 2 3))
-(query-value pgc "select $1::integer = any ($2)"
-             1 (list 1 2 3))
-(query-value pgc "select $1 = any ($2)" (code:comment "what type are we using?")
-             1 (list 1 2 3))
-]
-
-PostgreSQL defines many other types, such as network addresses and row
-types. These are currently not supported, but support may be added in
-future versions of this library.
-
-
-@subsection[#:tag "mysql-types"]{MySQL Types}
-
-This section applies to connections created with
-@racket[mysql-connect].
-
-The following table lists the MySQL types known to this library, along
-with their corresponding Racket representations.
-
-@centered{
-@tabbing[#:spacing 8]{
-  @bold{MySQL type}            @& @bold{Racket type} @//
-  @racket['integer]            @& @racket[exact-integer?] @//
-  @racket['tinyint]            @& @racket[exact-integer?] @//
-  @racket['smallint]           @& @racket[exact-integer?] @//
-  @racket['mediumint]          @& @racket[exact-integer?] @//
-  @racket['bigint]             @& @racket[exact-integer?] @//
-  @racket['real]               @& @racket[real?] @//
-  @racket['double]             @& @racket[real?] @//
-  @racket['decimal]            @& @racket[exact?] @//
-  @racket['varchar]            @& @racket[string?] @//
-  @racket['date]               @& @racket[sql-date?] @//
-  @racket['time]               @& @racket[sql-time?] or @racket[sql-day-time-interval?] @//
-  @racket['datetime]           @& @racket[sql-timestamp?] @//
-
-  @racket['var-string]         @& @racket[string?] @//
-  @racket['text]               @& @racket[string?] @//
-
-  @racket['var-binary]         @& @racket[bytes?] @//
-  @racket['blob]               @& @racket[bytes?] @//
-
-  @racket['bit]                @& @racket[bit-vector?] @//
-  @racket['geometry]           @& @racket[geometry2d?]
-}
-}
-
-MySQL does not report specific parameter types for prepared queries,
-so they are instead assigned the pseudo-type @racket['any]. Conversion
-of Racket values to parameters accepts strings, numbers
-(@racket[rational?]---no infinities or NaN), bytes, SQL date/time
-structures (@racket[sql-date?], @racket[sql-time?],
-@racket[sql-timestamp?], and @racket[sql-day-time-interval?]), bits
-(@racket[bit-vector?]), and geometric values
-(@racket[geometry2d?]). Numbers are sent as 64-bit signed integers, if
-possible, or as double-precision floating point numbers otherwise.
-
-Fields of type @tt{CHAR} or @tt{VARCHAR} are typically reported as
-@racket['var-string], and fields of type @tt{BINARY} or @tt{VARBINARY}
-are typically reported as @racket['var-binary].
-
-The MySQL @tt{time} type represents time intervals, which may not
-correspond to times of day (for example, the interval may be negative
-or larger than 24 hours). In conversion from MySQL results to Racket
-values, those @tt{time} values that represent times of day are
-converted to @racket[sql-time] values; the rest are represented by
-@racket[sql-interval] values.
-
-The MySQL @tt{enum} and @tt{set} types are not supported. As a
-workaround, cast them to/from either integers or strings.
-
-
-@subsection[#:tag "sqlite-types"]{SQLite Types}
-
-This section applies to connections created with
-@racket[sqlite3-connect].
-
-The following table lists the SQLite types known to this library,
-along with their corresponding Racket representations.
-
-Unlike PostgreSQL and MySQL, SQLite does not enforce declared type
-constraints (with the exception of @tt{integer primary key}) on
-@emph{columns}. Rather, every SQLite @emph{value} has an associated
-``storage class''.
-
-@centered{
-@tabbing{
-  @bold{SQLite storage class}  @& @bold{Racket type} @//
-  @tt{integer}                 @& @racket[exact-integer?] @//
-  @tt{real}                    @& @racket[real?] @//
-  @tt{text}                    @& @racket[string?] @//
-  @tt{blob}                    @& @racket[bytes?]
-}
-}
-
-SQLite does not report specific parameter and result types for
-prepared queries. Instead, they are assigned the pseudo-type
-@racket['any]. Conversion of Racket values to parameters accepts
-strings, bytes, and real numbers.
-
-An exact integer that cannot be represented as a 64-bit signed integer
-is converted as @tt{real}, not @tt{integer}.
-
-@fake-examples[
-[(expt 2 80)
- (expt 2 80)]
-[(query-value slc "select ?" (expt 2 80))
- 1.2089258196146292e+24]
-]
-
-
-@subsection[#:tag "odbc-types"]{ODBC Types}
-
-This section applies to connections created with @racket[odbc-connect]
-or @racket[odbc-driver-connect].
-
-The following table lists the ODBC types known to this library,
-along with their corresponding Racket representations.
-
-@centered{
-@tabbing[#:spacing 8]{
-  @bold{ODBC type}        @& @bold{Racket type} @//
-  @racket['character]     @& @racket[string?] @//
-  @racket['varchar]       @& @racket[string?] @//
-  @racket['longvarchar]   @& @racket[string?] @//
-  @racket['numeric]       @& @racket[rational?] @//
-  @racket['decimal]       @& @racket[rational?] @//
-  @racket['integer]       @& @racket[exact-integer?] @//
-  @racket['tinyint]       @& @racket[exact-integer?] @//
-  @racket['smallint]      @& @racket[exact-integer?] @//
-  @racket['bigint]        @& @racket[exact-integer?] @//
-  @racket['float]         @& @racket[real?] @//
-  @racket['real]          @& @racket[real?] @//
-  @racket['double]        @& @racket[real?] @//
-  @racket['date]          @& @racket[sql-date?] @//
-  @racket['time]          @& @racket[sql-time?] @//
-  @racket['datetime]      @& @racket[sql-timestamp?] @//
-  @racket['timestamp]     @& @racket[sql-timestamp?] @//
-  @racket['binary]        @& @racket[bytes?] @//
-  @racket['varbinary]     @& @racket[bytes?] @//
-  @racket['longvarbinary] @& @racket[bytes?] @//
-  @racket['bit1]          @& @racket[boolean?]
-}
-}
-
-Not all ODBC drivers provide specific parameter type information for
-prepared queries. Some omit parameter type information entirely or,
-worse, assign all parameters a single type such as @tt{varchar}. To
-avoid enforcing irrelevant type constraints in the last case,
-connections only attempt to fetch and enforce parameter types when the
-connection is made using the @racket[#:strict-parameter-type?]
-option. Otherwise, the connection assigns all parameters the type
-@racket['unknown]. (The @racket['unknown] type is also used when
-specific parameter types are requested but are not available.)
-Conversion of Racket values to @racket['unknown] parameters accepts
-strings, bytes, numbers (@racket[rational?]---no infinities or NaN),
-booleans, and SQL date/time structures (@racket[sql-date?],
-@racket[sql-time?], and @racket[sql-timestamp?]).
-
-The ODBC type @racket['bit1] represents a single bit, unlike the
-standard SQL @tt{bit(N)} type.
-
-Interval types are not currently supported on ODBC.
-
-
-@;{----------------------------------------}
-
-@section[#:tag "sql-data"]{SQL Data}
-
-This section describes data types for representing various SQL types
-that have no existing appropriate counterpart in Racket.
-
-@subsection{SQL NULL}
-
-SQL @tt{NULL} is translated into the unique @racket[sql-null] value.
-
-@defthing[sql-null sql-null?]{
-
-  A special value used to represent @tt{NULL} values in query
-  results. The @racket[sql-null] value may be recognized using
-  @racket[eq?].
-
-@examples[#:eval the-eval
-(query-value pgc "select NULL")
-]
-}
-
-@defproc[(sql-null? [x any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[x] is @racket[sql-null]; @racket[#f]
-  otherwise.
-}
-
-@defproc[(sql-null->false [x any/c]) any/c]{
-
-  Returns @racket[#f] if @racket[x] is @racket[sql-null]; otherwise
-  returns @racket[x].
-
-@examples[#:eval the-eval
-(sql-null->false "apple")
-(sql-null->false sql-null)
-(sql-null->false #f)
-]
-}
-
-@defproc[(false->sql-null [x any/c]) any/c]{
-
-  Returns @racket[sql-null] if @racket[x] is @racket[#f]; otherwise
-  returns @racket[x].
-
-@examples[#:eval the-eval
-(false->sql-null "apple")
-(false->sql-null #f)
-]
-}
-
-
-@subsection{Dates and Times}
-
-The @tt{DATE}, @tt{TIME} (@tt{WITH TIME ZONE} and without),
-@tt{TIMESTAMP} (@tt{WITH TIME ZONE} and without), and @tt{INTERVAL}
-SQL types are represented by the following structures.
-
-See also @secref["datetime-util"] for more functions on datetime
-values.
-
-@defstruct*[sql-date
-            ([year exact-integer?]
-             [month (integer-in 0 12)]
-             [day (integer-in 0 31)])]{
-
-  Represents a SQL date.
-
-  Dates with zero-valued @racket[month] or @racket[day] components are
-  a MySQL extension.
-}
-
-@defstruct*[sql-time
-            ([hour exact-nonnegative-integer?]
-             [minute exact-nonnegative-integer?]
-             [second exact-nonnegative-integer?]
-             [nanosecond exact-nonnegative-integer?]
-             [tz (or/c exact-integer? #f)])]
-@defstruct*[sql-timestamp
-            ([year exact-nonnegative-integer?]
-             [month exact-nonnegative-integer?]
-             [day exact-nonnegative-integer?]
-             [hour exact-nonnegative-integer?]
-             [minute exact-nonnegative-integer?]
-             [second exact-nonnegative-integer?]
-             [nanosecond exact-nonnegative-integer?]
-             [tz (or/c exact-integer? #f)])]{
-
-  Represents SQL times and timestamps.
-
-  The @racket[tz] field indicates the time zone offset as the number
-  of seconds east of GMT (as in @racketmodname[srfi/19
-  #:indirect]). If @racket[tz] is @racket[#f], the time or timestamp
-  does not carry time zone information.
-
-  The @racket[sql-time] and @racket[sql-timestamp] structures store
-  fractional seconds to nanosecond precision for compatibility with
-  @racketmodname[srfi/19 #:indirect]. Note, however, that database
-  systems generally do not support nanosecond precision; PostgreSQL,
-  for example, only supports microsecond precision.
-
-@examples[#:eval the-eval
-(query-value pgc "select date '25-dec-1980'")
-(query-value pgc "select time '7:30'")
-(query-value pgc "select timestamp 'epoch'")
-(query-value pgc "select timestamp with time zone 'epoch'")
-]
-}
-
-@defstruct*[sql-interval
-            ([years exact-integer?]
-             [months exact-integer?]
-             [days exact-integer?]
-             [hours exact-integer?]
-             [minutes exact-integer?]
-             [seconds exact-integer?]
-             [nanoseconds exact-integer?])]{
-
-  Represents lengths of time. Intervals are normalized to satisfy the
-  following constraints:
-  @itemlist[
-  @item{@racket[years] and @racket[months] have the same sign}
-  @item{@racket[months] ranges from @racket[-11] to @racket[11]}
-  @item{@racket[days], @racket[hours], @racket[minutes],
-    @racket[seconds], and @racket[nanoseconds] all have the same sign}
-  @item{@racket[hours] ranges from @racket[-23] to @racket[23]}
-  @item{@racket[minutes] and @racket[seconds] range from @racket[-59]
-    to @racket[59]} 
-  @item{@racket[nanoseconds] ranges from
-    @racket[(- (sub1 #, @racketvalfont{#e1e9}))] to
-    @racket[(sub1 #, @racketvalfont{#e1e9})]}
-  ]
-
-  That is, an interval consists of two groups of components:
-  year-month and day-time, and normalization is done only within
-  groups. In fact, the SQL standard recognizes those two types of
-  intervals separately (see @racket[sql-year-month-interval?] and
-  @racket[sql-day-time-interval?], below), and does not permit
-  combining them. Intervals such as @tt{1 month 3 days} are a
-  PostgreSQL extension.
-}
-
-@defproc[(sql-year-month-interval? [x any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[x] is a @racket[sql-interval] value
-  where the @racket[days], @racket[hours], @racket[minutes],
-  @racket[seconds], and @racket[nanoseconds] fields are zero.
-}
-
-@defproc[(sql-day-time-interval? [x any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[x] is a @racket[sql-interval] value
-  where the @racket[years] and @racket[months] fields are zero.
-}
-
-@defproc[(sql-interval->sql-time [interval sql-interval?]
-                                 [failure any/c (lambda () (error ....))])
-         any]{
-
-  If @racket[interval] is a day-time interval that
-  represents a time of day, returns the corresponding
-  @racket[sql-time] value. In particular, the following must be true:
-  @itemlist[
-  @item{@racket[hours], @racket[minutes], @racket[seconds], and
-    @racket[nanoseconds] must all be non-negative}
-  @item{@racket[hours] must be between @racket[0] and @racket[23]}
-  ]
-  The corresponding constraints on @racket[minutes], etc are
-  enforced by the constructor.
-
-  If @racket[interval] is out of range, the @racket[failure] value is
-  called, if it is a procedure, or returned, otherwise.
-}
-
-@defproc[(sql-time->sql-interval [time sql-time?])
-         sql-day-time-interval?]{
-
-  Converts @racket[time] to an interval. If @racket[time] has
-  time-zone information, it is ignored.
-}
-
-
-@subsection{Bits}
-
-The @tt{BIT} and @tt{BIT VARYING} (@tt{VARBIT}) SQL types are
-represented by bit-vectors (@racketmodname[data/bit-vector]).
-
-The following functions are provided for backwards compatibility. They
-are deprecated and will be removed in a future release of Racket.
-
-@deftogether[[
-@defproc[(make-sql-bits [len exact-nonnegative-integer?]) 
-         sql-bits?]
-@defproc[(sql-bits? [v any/c]) boolean?]
-@defproc[(sql-bits-length [b sql-bits?])
-         exact-nonnegative-integer?]
-@defproc[(sql-bits-ref [b sql-bits?] [i exact-nonnegative-integer?])
-         boolean?]
-@defproc[(sql-bits-set! [b sql-bits?] 
-                        [i exact-nonnegative-integer?] 
-                        [v boolean?])
-         void?]
-@defproc[(sql-bits->list [b sql-bits?]) (listof boolean?)]
-@defproc[(sql-bits->string [b sql-bits?]) string?]
-@defproc[(list->sql-bits [lst (listof boolean?)]) sql-bits?]
-@defproc[(string->sql-bits [s string?]) sql-bits?]]]{
-
-Deprecated; use @racketmodname[data/bit-vector] instead.
-
-}
-
-@(close-eval the-eval)
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/tabbing.rkt b/pkgs/db-pkgs/db-doc/db/scribblings/tabbing.rkt
deleted file mode 100644
index 3db792f3cc..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/tabbing.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-(require scribble/struct
-         scribble/base)
-(provide & // tabbing)
-
-(define-struct tabbing-marker (kind) #:transparent)
-
-(define & (make-tabbing-marker '&))
-(define // (make-tabbing-marker '//))
-
-(define (tabbing #:spacing [spacing 4] . pres)
-  (define (loop pres cell row rows sep)
-    (cond [(null? pres)
-           (let* ([row (cons (reverse cell) row)]
-                  [rows (cons (reverse row) rows)])
-             (reverse rows))]
-          [(eq? (car pres) &)
-           (loop (cdr pres) null (list* sep (reverse cell) row) rows sep)]
-          [(eq? (car pres) //)
-           (let* ([row (cons (reverse cell) row)])
-             (loop (cdr pres) null null (cons (reverse row) rows) null))]
-          [else
-           (loop (cdr pres) (cons (car pres) cell) row rows sep)]))
-  (define rows (loop pres null null null (list (hspace spacing))))
-  (make-table #f (map layout-row rows)))
-
-(define (layout-row row)
-  (map layout-cell row))
-
-(define (layout-cell cell)
-  (make-flow (list (make-paragraph cell))))
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/using-db.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/using-db.scrbl
deleted file mode 100644
index 97461b8072..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/using-db.scrbl
+++ /dev/null
@@ -1,527 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          scribble/struct
-          racket/sandbox
-          racket/runtime-path
-          "config.rkt"
-          (for-label db db/util/testing racket/dict web-server/lang/web))
-
-@(define-runtime-path log-file "log-for-using-db.rktd")
-@(define the-eval (make-pg-eval log-file #f))
-
-@title[#:tag "using-db"]{Using Database Connections}
-
-This section introduces this library's basic features and covers some
-practical issues with database programming in general and with this
-library in particular.
-
-
-@section[#:tag "intro-basic"]{Introduction to Using Database Connections}
-
-The following annotated program demonstrates how to connect to a
-database and perform simple queries. Some of the SQL syntax used below
-is PostgreSQL-specific, such as the syntax of query parameters
-(@litchar{$1} rather than @litchar{?}).
-
-@interaction[#:eval the-eval
-(require db)
-]
-
-First we create a connection. Replace @racket[_user], @racket[_db],
-and @racket[_password] below with the appropriate values for your
-configuration (see @secref{creating-connections} for other connection examples):
-
-@interaction[#:eval the-eval
-(eval:alts
- (define pgc
-   (postgresql-connect #:user _user
-                       #:database _db
-                       #:password _password))
- (define pgc (dsn-connect 'db-scribble-env)))
-]
-
-Use @racket[query-exec] method to execute a SQL statement for effect.
-
-@;{ Keep these examples in sync with config.rkt }
-
-@interaction[#:eval the-eval
-(query-exec pgc
- "create temporary table the_numbers (n integer, d varchar(20))")
-(query-exec pgc
-  "insert into the_numbers values (0, 'nothing')")
-(query-exec pgc 
-  "insert into the_numbers values (1, 'the loneliest number')")
-]
-
-When a query contains a SQL value that isn't constant, refer to it
-through a ``query parameter'' rather than by dynamically computing the
-SQL query string (see also @secref["dbsec-sql-injection"]). Just
-provide the parameter values after the SQL statement in the query
-function call:
-
-@interaction[#:eval the-eval
-(query-exec pgc
-  "insert into the_numbers values ($1, $2)"
-  (+ 1 1)
-  "company")
-]
-
-Every standard query function accepts query parameters. The SQL syntax
-for query parameters depends on the database system (see
-@secref["query-statements"]). Other options for running parameterized
-queries are discussed below.
-
-The @racket[query] function is a more general way to execute a
-statement. It returns a structure encapsulating information about the
-statement's execution. (But some of that information varies from
-system to system and is subject to change.)
-
-@interaction[#:eval the-eval
-(query pgc "insert into the_numbers values (3, 'a crowd')")
-(query pgc "select n, d from the_numbers where n % 2 = 0")
-]
-
-When the query is known to return rows and when the field
-descriptions are not needed, it is more convenient to use the
-@racket[query-rows] function.
-
-@interaction[#:eval the-eval
-(query-rows pgc "select n, d from the_numbers where n % 2 = 0")
-]
-
-Use @racket[query-row] for queries that are known to return exactly
-one row.
-
-@interaction[#:eval the-eval
-(query-row pgc "select * from the_numbers where n = 0")
-]
-
-Similarly, use @racket[query-list] for queries that produce rows of
-exactly one column.
-
-@interaction[#:eval the-eval
-(query-list pgc "select d from the_numbers order by n")
-]
-
-When a query is known to return a single value (one row and one
-column), use @racket[query-value].
-
-@interaction[#:eval the-eval
-(query-value pgc "select count(*) from the_numbers")
-(query-value pgc "select d from the_numbers where n = 5")
-]
-
-When a query may return zero or one rows, as the last example, use
-@racket[query-maybe-row] or @racket[query-maybe-value] instead.
-
-@interaction[#:eval the-eval
-(query-maybe-value pgc "select d from the_numbers where n = 5")
-]
-
-The @racket[in-query] function produces a sequence that can be used
-with Racket's iteration forms:
-
-@interaction[#:eval the-eval
-(for ([(n d) (in-query pgc "select * from the_numbers where n < 4")])
-  (printf "~a: ~a\n" n d))
-(for/fold ([sum 0]) ([n (in-query pgc "select n from the_numbers")])
-  (+ sum n))
-]
-
-Errors in queries generally do not cause the connection to disconnect.
-
-@interaction[#:eval the-eval
-(begin (with-handlers [(exn:fail?
-                       (lambda (e)
-                         (printf "~a~n" (exn-message e))))]
-         (query-value pgc "select NoSuchField from NoSuchTable"))
-       (query-value pgc "select 'okay to proceed!'"))
-]
-
-Queries may contain parameters. The easiest way to execute a
-parameterized query is to provide the parameters ``inline'' after the
-SQL statement in the query function call.
-
-@interaction[#:eval the-eval
-(query-value pgc
- "select d from the_numbers where n = $1" 2)
-(query-list pgc
- "select n from the_numbers where n > $1 and n < $2" 0 3)
-]
-
-Alternatively, a parameterized query may be prepared in advance and
-executed later. @tech{Prepared statements} can be executed multiple
-times with different parameter values.
-
-@interaction[#:eval the-eval
-(define get-less-than-pst
-  (prepare pgc "select n from the_numbers where n < $1"))
-(query-list pgc get-less-than-pst 1)
-(query-list pgc (bind-prepared-statement get-less-than-pst '(2)))
-]
-
-When a connection's work is done, it should be disconnected.
-
-@;{ Don't actually disconnect; use this connection for the rest of the examples. }
-@interaction[#:eval the-eval
-(eval:alts (disconnect pgc) (void))
-]
-
-
-@section[#:tag "dbsec"]{Database Security}
-
-Database security requires both that the database back end be secured
-against unauthorized use and that authorized clients are not tricked
-or subverted into violating the database's security.
-
-Securing database back ends is mostly beyond the scope of this
-manual. In brief: choose sufficiently strong authentication methods
-and keep credentials secure, and follow the
-@wplink["Principle_of_least_privilege"]{principle of least privilege}:
-create and use roles that have the minimum permissions needed.
-
-The following is an incomplete list of security issues related to
-database @emph{client} programming.
-
-@;{Add section on db roles and ro/rw access?
-   eg, for servlet create two connections: one ro and one rw
-   (in pg/my/etc, backed by two roles; in sqlite, connection options) }
-
-@subsection[#:tag "dbsec-sql-injection"]{SQL Injection}
-
-@wplink["SQL_injection"]{SQL injection} happens when part of a SQL
-statement that was intended as SQL literal data is instead interpreted
-as SQL code---possibly @hyperlink["http://xkcd.com/327/"]{malicious}
-SQL code.
-
-Avoid dynamically creating SQL query strings by string concatenation
-or interpolation (eg, with @racket[string-append] or
-@racket[format]). In most cases, it is possible to use
-@tech{parameterized queries} instead. For example, instead of this
-
-@racketblock[
-(code:comment "WRONG! DANGER!")
-(query-exec c
-  (format "UPDATE users SET passwd='~a' WHERE user='~a'"
-          user new-passwd))
-]
-write one of the following instead (depending on SQL dialect):
-@racketblock[
-(code:comment "for PostgreSQL, SQLite")
-(query-exec c "UPDATE users SET passwd=$1 WHERE user=$2" user new-passwd)
-(code:comment "for MySQL, SQLite, ODBC")
-(query-exec c "UPDATE users SET passwd=? WHERE user=?" user new-passwd)
-]
-
-The first form would choke on names like @racket["Patrick O'Connor"].
-Worse, it would be susceptible to attack by malicious input like
-@racket["me' OR user='root'"], which yields the following SQL
-statement:
-
-@(element 'tt "UPDATE users SET passwd='whatever' WHERE user='me' OR user='root'")
-
-In contrast, using a @tech{parameterized query} causes the
-parameterized SQL and its arguments to be submitted to the back end
-separately; the back end then combines them safely.
-
-Only SQL literal values can be replaced with parameter placeholders; a
-SQL statement cannot be parameterized over a column name or a sort
-order, for example. In such cases, constructing the query dynamically
-may be the only feasible solution. But while the query construction
-may be influenced by external input, it should never directly
-incorporate external input without validation. That is, don't do the
-following:
-
-@racketblock[
-(code:comment "WRONG! DANGER!")
-(query-rows c
-  (format "SELECT name, ~a FROM contestants" column))
-(query-list c
-  (format "SELECT name FROM contestants ORDER BY score ~a" direction))
-]
-
-Instead, select the inserted SQL from known good alternatives:
-
-@racketblock[
-(code:comment "BETTER")
-(query-rows c
-  (format "SELECT name, ~a FROM contestants"
-          (cond [(member column '("wins" "losses")) column]
-                [else (error ....)])))
-(query-list c
-  (format "SELECT name FROM contestants ORDER BY score ~a" 
-          (if ascending? "ASC" "DESC")))
-]
-
-@;{ Discuss dynamic IN comparisons? }
-
-
-@subsection[#:tag "dbsec-xss"]{Cross-site Scripting (XSS)}
-
-@wplink["Cross-site_scripting"]{Cross-site scripting}---which should
-probably be called ``HTML injection'' or ``markup injection''---is
-when arbitrary text from an untrusted source is embedded without
-escaping into an HTML page. The @emph{unstructured text from the
-untrusted source} is reinterpreted as @emph{markup from the web
-server}; if the reinterpreted markup contains embedded Javascript
-code, it executes with the security privileges associated with the web
-server's domain.
-
-This issue has little to do with databases @emph{per se} except that
-such text is often stored in a database. This issue is mitigated by
-using structured markup representations like SXML or X-expressions
-(xexprs), since they automatically escape ``markup'' characters found
-in embedded text.
-
-
-@;{============================================================}
-
-@section[#:tag "dbperf"]{Database Performance}
-
-Achieving good database performance mostly consists of good database
-design and intelligent client behavior.
-
-On the database design side, most important are wise use of indexes
-and choosing appropriate data representations. As an example of the
-latter, a regexp-based search using @tt{LIKE} will probably be slower
-than a specialized
-@hyperlink["http://www.postgresql.org/docs/9.0/static/textsearch.html"]{full-text
-search} feature for large data sets. Consult your database back end's
-manual for additional performance advice.
-
-The following sections describe a few client-side aspects of
-performance.
-
-@subsection[#:tag "dbperf-n+1"]{The N+1 Selects Problem}
-
-@;{ per comments on http://stackoverflow.com/questions/97197/what-is-the-n1-selects-problem
-    Is N+1 actually a problem?
-    ie, Is communication overhead with db back end worse than 
-    grouping cost?  Should measure to see. }
-
-A common mistake is to fetch a large amount of data by running a query
-to get a set of initial records and then running another query inside
-a loop with an iteration for each of the initial records. This is
-sometimes called the ``n+1 selects problem.'' For example:
-
-@racketblock[
-(for/list ([(name id) (in-query c "SELECT name, id FROM contestants")])
-  (define wins
-    (query-list c "SELECT contest FROM contests WHERE winner = $1" id))
-  (make-contestant-record name wins))
-]
-
-The same information can be retrieved in a single query by performing
-a @tt{LEFT OUTER JOIN} and grouping the results:
-
-@racketblock[
-(for/list ([(name id wins)
-            (in-query c
-             (string-append "SELECT name, id, contest "
-                            "FROM contestants LEFT OUTER JOIN contests "
-                            "ON contestants.id = contests.winner")
-             #:group '(#("name" "id"))
-             #:group-mode '(list))])
-  (make-contestant-record name wins))
-]
-
-The one-query form will perform better when database communication has
-high latency. On the other hand, it may duplicate the contents of the
-non-key @tt{name} column, using more bandwidth. Another approach is to
-perform two queries:
-
-@racketblock[
-(let ([id=>name
-       (rows->dict #:key "id" #:value "name"
-        (query c "SELECT id, name FROM contestants"))])
-  (for/list ([(id wins)
-              (in-query c
-               (string-append "SELECT id, contest "
-                              "FROM contestants LEFT OUTER JOIN contests "
-                              "ON contestants.id = contests.winner")
-               #:group '(#("id"))
-               #:group-mode '(list))])
-    (make-contestant-record (dict-ref id=>name id) wins)))
-]
-
-Compared with the one-query form, the two-query form requires
-additional communication, but it avoids duplicating @tt{name} values
-in the @tt{OUTER JOIN} results. If additional non-key @tt{contestant}
-fields were to be retrieved, the bandwidth savings of this approach
-would be even greater.
-
-See also @secref["dbperf-testing"].
-
-
-@subsection[#:tag "dbperf-update-tx"]{Updates and Transactions}
-
-Using transactions can dramatically improve the performance of bulk
-database operations, especially @tt{UPDATE} and @tt{INSERT}
-statements. As an extreme example, on commodity hardware in 2012,
-SQLite is capable of executing thousands of @tt{INSERT} statements per
-second within a transaction, but it is capable of only dozens of
-single-@tt{INSERT} transactions per second.
-
-
-@subsection[#:tag "dbperf-pstcache"]{Statement Caching}
-
-Connections cache implicitly prepared statements (that is, statements
-given in string form directly to a query function). The effect of the
-cache is to eliminate an extra round-trip to the server (to send the
-statement and receive a prepared statement handle), leaving just a
-single round-trip (to send parameters and receive results) per
-execution.
-
-Currently, prepared statements are only cached within a
-transaction. The statement cache is flushed when entering or leaving a
-transaction and whenever a DDL statement is executed.
-
-@;{ virtual statements are mostly obsolete }
-
-
-@subsection[#:tag "dbperf-testing"]{Testing Performance of Database-Backed Programs}
-
-When testing the performance of database-backed programs, remember to
-test them in environments with realistic latency and
-bandwidth. High-latency environments may be roughly approximated with
-the @racket[high-latency-connection] function, but there's no
-substitute for the real thing.
-
-@subsection[#:tag "dbperf-concurrency"]{Transactions and Concurrency}
-
-Database systems use
-@hyperlink["http://en.wikipedia.org/wiki/Database_transaction"]{transactions}
-to guarantee properties such as
-@hyperlink["http://en.wikipedia.org/wiki/ACID"]{atomicity and
-isolation} while accommodating concurrent reads and writes by the
-database's clients. Within a transaction a client is insulated from
-the actions of other clients, but the transaction may be aborted and
-rolled back if the database system cannot reconcile it with other
-concurrent interactions. Some database systems are more adept at
-reconciling transactions than others, and most allow reconciliation to
-be tuned through the specification of @emph{isolation levels}.
-
-PostgreSQL supports
-@hyperlink["http://www.postgresql.org/docs/9.2/static/mvcc.html"]{very
-fine-grained reconciliation}: two transactions that both read and
-modify the same table concurrently might both be allowed to complete
-if they involve disjoint sets of rows. However, clients should be
-prepared to retry transactions that fail with a @racket[exn:fail:sql]
-exception with SQLSTATE matching @racket[#rx"^40...$"]---typically
-@racket["40001"], ``could not serialize access due to concurrent
-update.''
-
-MySQL's transaction behavior varies based on the storage drivers in
-use. Clients should be prepared to retry transactions that fail with a
-@racket[exn:fail:sql] exception with SQLSTATE matching
-@racket[#rx"^40...$"].@;{---typically @racket["40001"], ``Deadlock found
-when trying to get lock; try restarting transaction.''}
-
-SQLite enforces a
-@hyperlink["http://www.sqlite.org/lockingv3.html"]{very coarse-grained
-policy}: only one transaction is allowed to write to the database at a
-time, and thus concurrent writers are very likely to conflict. Clients
-should be prepared to retry transactions that fail with a
-@racket[exn:fail:sql] exception with SQLSTATE of @racket['busy].
-
-An alternative to retrying whole SQLite transactions is to start each
-transaction with the appropriate locking level, since a transaction
-usually fails when it is unable to upgrade its lock level. Start a
-transaction that only performs reads in the default mode, and start a
-transaction that may perform writes in @racket['immediate] mode (see
-@racket[start-transaction]). That converts the problem of retrying
-whole transactions into the problem of retrying the initial @tt{BEGIN
-TRANSACTION} statment, and this library already automatically retries
-individual statements that fail with @racket['busy] errors. Depending
-on the length and frequency of the transactions, you may need to
-adjust @racket[_busy-retry-limit] (see @racket[sqlite3-connect]).
-
-ODBC's behavior varies depending on the driver and back end. See the
-appropriate database system's documentation.
-
-
-@;{============================================================}
-
-@section[#:tag "intro-servlets"]{Databases and Web Servlets}
-
-Using database connections in a web servlet is more complicated than
-in a standalone program. A single servlet potentially serves many
-requests at once, each in a separate request-handling
-thread. Furthermore, the use of @racket[send/suspend],
-@racket[send/suspend/dispatch], etc means that there are many places
-where a servlet may start and stop executing to service a request.
-
-Why not use a single connection to handle all of a servlet's requests?
-That is, create the connection with the servlet instance and never
-disconnect it. Such a servlet would look something like the following:
-
-@racketmod[
-#:file "bad-servlet.rkt" 
-web-server
-(require db)
-(define db-conn (postgresql-connect ....))
-(define (serve req)
-  .... db-conn ....)
-]
-
-The main problem with using one connection for all requests is that
-multiple threads accessing the same connection are not properly
-@wplink["Isolation_%28database_systems%29"]{isolated}. For example, if
-one thread is accessing the connection within a transaction and
-another thread issues a query, the second thread may see invalid data
-or even disrupt the work of the first thread.
-
-A secondary problem is performance. A connection can only perform a
-single query at a time, whereas most database systems are capable of
-concurrent query processing.
-
-The proper way to use database connections in a servlet is to create a
-connection for each request and disconnect it when the request has
-been handled. But since a request thread may start and stop executing
-in many places (due to @racket[send/suspend], etc), inserting the code
-to connect and disconnect at the proper places can be challenging and
-messy.
-
-A better solution is to use a @tech{virtual connection}, which
-automatically creates a request-specific (that is, thread-specific)
-``actual connection'' by need and disconnects it when the request has
-been handled (that is, when the thread terminates). Different
-request-handling threads using the same virtual connection are
-assigned different actual connections, so the requests are properly
-isolated.
-
-@racketmod[
-#:file "better-servlet.rkt" 
-web-server
-(require db)
-(define db-conn
-  (virtual-connection
-   (lambda () (postgresql-connect ....))))
-(define (serve req)
-  .... db-conn ....)
-]
-
-This solution preserves the simplicity of the naive solution and fixes
-the isolation problem but at the cost of creating many short-lived
-database connections. That cost can be eliminated by using a
-@tech{connection pool}:
-
-@racketmod[
-#:file "best-servlet.rkt" 
-web-server
-(require db)
-(define db-conn
-  (virtual-connection
-   (connection-pool
-    (lambda () (postgresql-connect ....)))))
-(define (serve req)
-  .... db-conn ....)
-]
-
-By using a virtual connection backed by a connection pool, a servlet
-can achieve simplicity, isolation, and performance all at the same
-time.
-
-
-@(close-eval the-eval)
diff --git a/pkgs/db-pkgs/db-doc/db/scribblings/util.scrbl b/pkgs/db-pkgs/db-doc/db/scribblings/util.scrbl
deleted file mode 100644
index 83c3e798cf..0000000000
--- a/pkgs/db-pkgs/db-doc/db/scribblings/util.scrbl
+++ /dev/null
@@ -1,266 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          scribble/struct
-          racket/sandbox
-          racket/runtime-path
-          "config.rkt"
-          (for-label db db/util/datetime db/util/geometry db/util/postgresql db/util/testing))
-
-@(define-runtime-path log-file "log-for-util.rktd")
-@(define the-eval (make-pg-eval log-file #t))
-
-@title[#:tag "util"]{Utilities}
-
-The bindings described in this section are provided by the specific
-modules below, not by @racketmodname[db] or @racketmodname[db/base].
-
-@;{========================================}
-
-@section[#:tag "datetime-util"]{Datetime Type Utilities}
-
-@defmodule[db/util/datetime]
-
-@deftogether[[
-@defproc[(sql-datetime->srfi-date [t (or/c sql-date? sql-time? sql-timestamp?)])
-         srfi:date?]
-@defproc[(srfi-date->sql-date [d srfi:date?])
-         sql-date?]
-@defproc[(srfi-date->sql-time [d srfi:date?])
-         sql-time?]
-@defproc[(srfi-date->sql-time-tz [d srfi:date?])
-         sql-time?]
-@defproc[(srfi-date->sql-timestamp [d srfi:date?])
-         sql-timestamp?]
-@defproc[(srfi-date->sql-timestamp-tz [d srfi:date?])
-         sql-timestamp?]]]{
-
-  Converts between this library's date and time values and SRFI 19's
-  date values (see @racketmodname[srfi/19 #:indirect]). SRFI dates store more
-  information than SQL dates and times, so converting a SQL time to a
-  SRFI date, for example, puts zeroes in the year, month, and day
-  fields.
-
-@examples[#:eval the-eval
-(sql-datetime->srfi-date
- (query-value pgc "select time '7:30'"))
-(sql-datetime->srfi-date
- (query-value pgc "select date '25-dec-1980'"))
-(sql-datetime->srfi-date
- (query-value pgc "select timestamp 'epoch'"))
-]
-}
-
-@defproc[(sql-day-time-interval->seconds [interval sql-day-time-interval?])
-         rational?]{
-
-  Returns the length of @racket[interval] in seconds.
-}
-
-
-@;{========================================}
-
-@section[#:tag "geometry"]{Geometric Types}
-
-@defmodule[db/util/geometry]
-
-The following structures and functions deal with geometric values
-based on the OpenGIS (ISO 19125) model.
-
-@section-index{PostGIS}
-
-Note: Geometric columns defined using the PostGIS extension to
-PostgreSQL are not directly supported. Instead, data should be
-exchanged in the Well-Known Binary format; conversion of the following
-structures to and from WKB format is supported by the
-@racket[wkb->geometry] and @racket[geometry->wkb] functions.
-
-@defstruct*[point
-            ([x real?] [y real?])]{
-  Represents an OpenGIS @tt{Point}.
-}
-@defstruct*[line-string
-            ([points (listof point?)])]{
-  Represents an OpenGIS @tt{LineString}.
-}
-@defstruct*[polygon
-            ([exterior linear-ring?]
-             [interior (listof linear-ring?)])]{
-  Represents an OpenGIS @tt{Polygon}.
-}
-@defstruct*[multi-point ([elements (listof point?)])]{
-  Represents an OpenGIS @tt{MultiPoint}, a collection of points.
-}
-@defstruct*[multi-line-string ([elements (listof line-string?)])]{
-  Represents an OpenGIS @tt{MultiLineString}, a collection of line-strings.
-}
-@defstruct*[multi-polygon ([elements (listof polygon?)])]{
-  Represents an OpenGIS @tt{MultiPolygon}, a collection of polygons.
-}
-@defstruct*[geometry-collection ([elements (listof geometry2d?)])]{
-  Represents an OpenGIS @tt{GeometryCollection}, a collection of
-  arbitrary geometric values.
-}
-
-@defproc[(geometry2d? [x any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[x] is a @racket[point],
-  @racket[line-string], @racket[polygon], @racket[multi-point],
-  @racket[multi-line-string], @racket[multi-polygon], or
-  @racket[geometry-collection]; @racket[#f] othewise.
-}
-
-@defproc[(line? [x any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[x] is a @racket[line-string]
-  consisting of exactly two points (cf OpenGIS @tt{Line}); @racket[#f]
-  otherwise.
-}
-
-@defproc[(linear-ring? [x any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[x] is a @racket[line-string] whose
-  first and last points are equal (cf OpenGIS @tt{LinearRing});
-  @racket[#f] otherwise.
-}
-
-@defproc[(geometry->wkb [g geometry2d?]
-                        [#:big-endian? big-endian? (system-big-endian?)])
-         bytes?]{
-
-  Returns the Well-Known Binary (WKB) encoding of the geometric value
-  @racket[g]. The @racket[big-endian?] argument determines the byte
-  order used (the WKB format includes byte-order markers, so a robust
-  client should accept either encoding).
-}
-
-@defproc[(wkb->geometry [b bytes?])
-         geometry2d?]{
-
-  Decodes the Well-Known Binary (WKB) representation of a geometric
-  value.
-}
-
-@;{========================================}
-
-@section[#:tag "postgresql-ext"]{PostgreSQL-specific Types}
-
-@defmodule[db/util/postgresql]
-
-@defstruct*[pg-array
-            ([dimensions exact-nonnegative-integer?]
-             [dimension-lengths (listof exact-positive-integer?)]
-             [dimension-lower-bounds (listof exact-integer?)]
-             [contents vector?])]{
-
-Represents a PostrgreSQL array. The @racket[dimension-lengths] and
-@racket[dimension-lower-bounds] fields are both lists of
-@racket[dimensions] elements. By default, PostgreSQL array indexes
-start with 1 (not 0), so @racket[dimension-lower-bounds] is typically
-a list of @racket[1]s.
-}
-
-@defproc[(pg-array-ref [arr pg-array?] [index exact-integer?] ...+)
-         any/c]{
-
-Returns the element of @racket[arr] at the given position. There must
-be as many @racket[index] arguments as the dimension of
-@racket[arr]. Recall that PostgreSQL array indexes usually start with
-1, not 0.
-}
-
-@defproc[(pg-array->list [arr pg-array?])
-         list?]{
-
-Returns a list of @racket[arr]'s contents. The dimension of
-@racket[arr] must be 1; otherwise an error is raised.
-}
-
-@defproc[(list->pg-array [lst list?])
-         pg-array?]{
-
-Returns a @racket[pg-array] of dimension 1 with the contents of
-@racket[lst].
-}
-
-@defstruct*[pg-empty-range ()]{
-
-Represents an empty range.
-}
-
-@defstruct*[pg-range
-            ([lb _range-type]
-             [includes-lb? boolean?]
-             [ub _range-type]
-             [includes-ub? boolean?])]{
-
-Represents a range of values from @racket[lb] (lower bound) to
-@racket[ub] (upper bound). The @racket[includes-lb?] and
-@racket[includes-ub?] fields indicate whether each end of the range is
-open or closed.
-
-The @racket[lb] and @racket[ub] fields must have the same type; the
-permissible types are exact integers, real numbers, and
-@racket[sql-timestamp]s. Either or both bounds may also be
-@racket[#f], which indicates the range is unbounded on that end.
-}
-
-@defproc[(pg-range-or-empty? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a @racket[pg-range] or
-@racket[pg-empty-range] instance; otherwise, returns @racket[#f].
-}
-
-@deftogether[[
-@defstruct*[pg-box
-            ([ne point?] [sw point?])]
-
-@defstruct*[pg-path
-            ([closed? boolean?] [points (listof point?)])]
-
-@defstruct*[pg-circle
-            ([center point?] [radius real?])]
-]]{
-
-These structures represent certain of PostgreSQL's built-in geometric
-types that have no appropriate analogue in the OpenGIS model:
-@tt{box}, @tt{path}, and @tt{circle}. The @tt{point}, @tt{lseg}, and
-@tt{polygon} PostgreSQL built-in types are represented using
-@racket[point], @racket[line-string] (@racket[line?]), and
-@racket[polygon] structures.
-
-Note: PostgreSQL's built-in geometric types are distinct from those
-provided by the PostGIS extension library (see @secref["geometry"]).
-}
-
-@;{========================================}
-
-@section[#:tag "util-testing"]{Testing Database Programs}
-
-@defmodule[db/util/testing]
-
-This module provides utilities for testing programs that use database
-connections.
-
-@defproc[(high-latency-connection [connection connection?]
-                                  [latency (>=/c 0)]
-                                  [#:sleep-atomic? sleep-atomic? any/c #f])
-         connection?]{
-
-Returns a proxy connection for @racket[connection] that introduces
-@racket[latency] additional seconds of latency before operations that
-require communicating with the database back end---@racket[prepare],
-@racket[query], @racket[start-transaction], etc.
-
-Use this function in performance testing to roughly simulate
-environments with high-latency communication with a database back
-end.
-
-If @racket[sleep-atomic?] is true, then the proxy enters atomic mode
-before sleeping, to better simulate the effect of a long-running FFI
-call (see @secref["ffi-concurrency"]). Even so, it may not accurately
-simulate an ODBC connection that internally uses cursors to fetch data
-on demand, as each fetch would introduce additional latency.
-}
-
-@(close-eval the-eval)
diff --git a/pkgs/db-pkgs/db-doc/info.rkt b/pkgs/db-pkgs/db-doc/info.rkt
deleted file mode 100644
index e4abe7437d..0000000000
--- a/pkgs/db-pkgs/db-doc/info.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define build-deps '("data-doc"
-                     "srfi-lite-lib"
-                     "web-server-doc"
-                     "base"
-                     "scribble-lib"
-                     "sandbox-lib"
-                     "web-server-lib"
-                     "db-lib"
-                     "racket-doc"))
-(define update-implies '("db-lib"))
-
-(define pkg-desc "documentation part of \"db\"")
-
-(define pkg-authors '(ryanc))
diff --git a/pkgs/db-pkgs/db-lib/LICENSE.txt b/pkgs/db-pkgs/db-lib/LICENSE.txt
deleted file mode 100644
index 468f059884..0000000000
--- a/pkgs/db-pkgs/db-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-db-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/db-pkgs/db-lib/db/TODO b/pkgs/db-pkgs/db-lib/db/TODO
deleted file mode 100644
index 8ecf6fdc92..0000000000
--- a/pkgs/db-pkgs/db-lib/db/TODO
+++ /dev/null
@@ -1,40 +0,0 @@
-
-- postgresql: send no-arg queries without prepare step (?)
-
-- add under-the-hood doc section (eg, debugging, adjusting statement cache)
-
-- type annotations
-  - two modes: mandatory and opportunistic
-  - on result fields (eg sqlite, convert to date)
-  - on parameters ???
-  - per query or per connection? (or both?)
-  - either only well-known conversions, or must apply outside of lock
-
-- postgresql record type: docs, send
-- postgresql domain types, table record types, etc
-
-- for wrapped/managed connections, detect if underlying connection gets
-  disconnected by server (eg, times out after 10 minutes of inactivity)
-  - at least, pool should make sure connection is alive when gotten from idle list
-  - add {keepalive : -> boolean} method to connection<%> (?)
-
-- disconnect on custudian shutdown (?)
-
-- disconnect should always work, even on thread-damaged connections
-  - but might need version with timeout and/or rudely? flag, because
-    I can't think of a way to solve the lock problem that doesn't involve aux thread.
-
-- add recursive locking?
-  - cons: - considered by experts to be bad design, sloppy
-  - pros: - would simplify cleanup for one-shot pstmts
-          - would enable simple impl of user-level 'call-with-lock' for grouping 
-            multiple operations together
-            (but this could also be done by two locks: outer "ownership" lock 
-            and inner "invariant-protecting" lock)
-
-- make implementation notes section of docs
-  - explain nested tx impl
-
-- invalidate statement cache on query error
-
-- 2 call-with-transactions from separate threads can conflict
diff --git a/pkgs/db-pkgs/db-lib/db/base.rkt b/pkgs/db-pkgs/db-lib/db/base.rkt
deleted file mode 100644
index 5e1e0c6b75..0000000000
--- a/pkgs/db-pkgs/db-lib/db/base.rkt
+++ /dev/null
@@ -1,309 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     syntax/parse
-                     syntax/parse/experimental/template)
-         racket/dict
-         syntax/location
-         racket/contract/base)
-
-;; ============================================================
-
-(require db/private/generic/interfaces
-         db/private/generic/sql-data)
-
-(provide (struct-out simple-result)
-         (struct-out rows-result)
-         statement-binding?
-         (struct-out exn:fail:sql))
-
-(provide sql-null
-         sql-null?
-         sql-null->false
-         false->sql-null)
-
-(provide/contract
- [struct sql-date ([year exact-integer?]
-                   [month (integer-in 0 12)]
-                   [day (integer-in 0 31)])]
- [struct sql-time ([hour (integer-in 0 23)]
-                   [minute (integer-in 0 59)]
-                   [second (integer-in 0 61)] ;; leap seconds
-                   [nanosecond (integer-in 0 (sub1 #e1e9))]
-                   [tz (or/c #f exact-integer?)])]
- [struct sql-timestamp ([year exact-integer?]
-                        [month (integer-in 0 12)]
-                        [day (integer-in 0 31)]
-                        [hour (integer-in 0 23)]
-                        [minute (integer-in 0 59)]
-                        [second (integer-in 0 61)]
-                        [nanosecond (integer-in 0 (sub1 #e1e9))]
-                        [tz (or/c #f exact-integer?)])]
- [struct sql-interval ([years exact-integer?]
-                       [months exact-integer?]
-                       [days exact-integer?]
-                       [hours exact-integer?]
-                       [minutes exact-integer?]
-                       [seconds exact-integer?]
-                       [nanoseconds exact-integer?])]
-
- [sql-day-time-interval?
-  (-> any/c boolean?)]
- [sql-year-month-interval?
-  (-> any/c boolean?)]
- [sql-interval->sql-time
-  (->* (sql-interval?) (any/c)
-       any)]
- [sql-time->sql-interval
-  (-> sql-time? sql-day-time-interval?)]
-
- [make-sql-bits
-  (-> exact-nonnegative-integer? sql-bits?)]
- [sql-bits?
-  (-> any/c boolean?)]
- [sql-bits-length
-  (-> sql-bits? exact-nonnegative-integer?)]
- [sql-bits-ref
-  (-> sql-bits? exact-nonnegative-integer? boolean?)]
- [sql-bits-set!
-  (-> sql-bits? exact-nonnegative-integer? boolean? void?)]
- [sql-bits->list
-  (-> sql-bits? (listof boolean?))]
- [list->sql-bits
-  (-> (listof boolean?) sql-bits?)]
- [sql-bits->string
-  (-> sql-bits? string?)]
- [string->sql-bits
-  (-> string? sql-bits?)])
-
-;; ============================================================
-
-(require db/private/generic/functions)
-
-(define fetch-size/c
-  (or/c exact-positive-integer? +inf.0))
-
-(define grouping-field/c (or/c string? exact-nonnegative-integer?))
-(define group/c (or/c grouping-field/c (vectorof grouping-field/c)))
-(define grouping/c (or/c group/c (listof group/c)))
-
-(define group-mode/c
-  (listof (or/c 'list 'preserve-null)))
-
-(define-module-boundary-contract contracted-in-query
-  in-query
-  (->* (connection? statement?)
-       (#:fetch
-        fetch-size/c
-        #:group grouping/c
-        #:group-mode group-mode/c)
-       #:rest list?
-       sequence?))
-
-(define-sequence-syntax in-query*
-  (lambda () #'contracted-in-query)
-  (lambda (stx)
-    (syntax-parse stx
-      [[(var ...) (~and form
-                        (in-query (~or (~optional (~seq #:fetch fetch-size))
-                                       (~optional (~seq #:group grouping-fields))
-                                       (~optional (~seq #:group-mode group-mode))
-                                       (~between arg:expr 2 +inf.0))
-                                  ...))]
-       #:declare fetch-size (expr/c #'fetch-size/c #:context #'form) #:role "fetch size argument"
-       #:declare grouping-fields (expr/c #'grouping/c #:context #'form) #:role "grouping fields argument"
-       #:declare group-mode (expr/c #'group-mode/c #:context #'form) #:role "group mode argument"
-       #:with (c stmt q-arg ...) #'(arg ...)
-       #:declare c (expr/c #'connection? #:context #'form) #:role "connection argument"
-       #:declare stmt (expr/c #'statement? #:context #'form) #:role "statement argument"
-       (template
-        [(var ...) (in-query-helper (length '(var ...)) c.c stmt.c q-arg ...
-                                    (?? (?@ #:fetch fetch-size.c))
-                                    (?? (?@ #:group grouping-fields.c))
-                                    (?? (?@ #:group-mode group-mode.c)))])]
-      [_ #f])))
-
-(provide (rename-out [in-query* in-query]))
-
-(provide/contract
- [connection?
-  (-> any/c any)]
- [disconnect
-  (-> connection? any)]
- [connected?
-  (-> connection? any)]
- [connection-dbsystem
-  (-> connection? dbsystem?)]
- [dbsystem?
-  (-> any/c any)]
- [dbsystem-name
-  (-> dbsystem? symbol?)]
- [dbsystem-supported-types
-  (-> dbsystem? (listof symbol?))]
-
- [statement?
-  (-> any/c any)]
- [prepared-statement?
-  (-> any/c any)]
- [prepared-statement-parameter-types
-  (-> prepared-statement? (or/c list? #f))]
- [prepared-statement-result-types
-  (-> prepared-statement? (or/c list? #f))]
-
- [query-exec
-  (->* (connection? statement?) () #:rest list? any)]
- [query-rows
-  (->* (connection? statement?)
-       (#:group grouping/c
-        #:group-mode group-mode/c)
-       #:rest list? (listof vector?))]
- [query-list
-  (->* (connection? statement?) () #:rest list? list?)]
- [query-row
-  (->* (connection? statement?) () #:rest list? vector?)]
- [query-maybe-row
-  (->* (connection? statement?) () #:rest list? (or/c #f vector?))]
- [query-value
-  (->* (connection? statement?) () #:rest list? any)]
- [query-maybe-value
-  (->* (connection? statement?) () #:rest list? any)]
- [query
-  (->* (connection? statement?) () #:rest list? any)]
-
- [prepare
-  (-> connection? (or/c string? virtual-statement?) any)]
- [bind-prepared-statement
-  (-> prepared-statement? list? any)]
-
- [virtual-statement
-  (-> (or/c string? (-> dbsystem? string?))
-      virtual-statement?)]
- [virtual-statement?
-  (-> any/c boolean?)]
-
- [start-transaction
-  (->* (connection?)
-       (#:isolation (or/c 'serializable 'repeatable-read 'read-committed 'read-uncommitted #f)
-        #:option any/c)
-       void?)]
- [commit-transaction
-  (-> connection? void?)]
- [rollback-transaction
-  (-> connection? void?)]
- [in-transaction?
-  (-> connection? boolean?)]
- [needs-rollback?
-  (-> connection? boolean?)]
- [call-with-transaction
-  (->* (connection? (-> any))
-       (#:isolation (or/c 'serializable 'repeatable-read 'read-committed 'read-uncommitted #f)
-        #:option any/c)
-       any)]
-
- [prop:statement
-  (struct-type-property/c
-   (-> any/c connection?
-       statement?))]
-
- [list-tables
-  (->* (connection?)
-       (#:schema (or/c 'search-or-current 'search 'current))
-       (listof string?))]
- [table-exists?
-  (->* (connection? string?)
-       (#:schema (or/c 'search-or-current 'search 'current)
-        #:case-sensitive? any/c)
-       boolean?)]
-
- [group-rows
-  (->* (rows-result?
-        #:group grouping/c)
-       (#:group-mode (listof (or/c 'list 'preserve-null #|deprecated:|# 'preserve-null-rows)))
-       rows-result?)]
-
- [rows->dict
-  (->* (rows-result? #:key grouping/c #:value grouping/c)
-       (#:value-mode group-mode/c)
-       dict?)]
- )
-
-;; ============================================================
-
-(require "private/generic/connect-util.rkt")
-
-(provide/contract
- [kill-safe-connection
-  (-> connection? connection?)]
- [virtual-connection
-  (->* ((or/c (-> connection?) connection-pool?))
-       ()
-       connection?)]
- [connection-pool
-  (->* ((-> connection?))
-       (#:max-connections (or/c (integer-in 1 10000) +inf.0)
-        #:max-idle-connections (or/c (integer-in 1 10000) +inf.0))
-       connection-pool?)]
- [connection-pool?
-  (-> any/c boolean?)]
- [connection-pool-lease
-  (->* (connection-pool?)
-       ((or/c custodian? evt?))
-       connection?)])
-
-;; ============================================================
-
-(require "private/generic/dsn.rkt")
-
-(provide dsn-connect)   ;; can't express "or any kw at all" w/ ->* contract
-(provide/contract
- [struct data-source
-         ([connector connector?]
-          [args arglist?]
-          [extensions (listof (list/c symbol? writable-datum?))])]
- [current-dsn-file (parameter/c path-string?)]
- [get-dsn
-  (->* (symbol?) (any/c #:dsn-file path-string?) any)]
- [put-dsn
-  (->* (symbol? (or/c data-source? #f)) (#:dsn-file path-string?) void?)]
- [postgresql-data-source
-  (->* ()
-       (#:user string?
-        #:database string?
-        #:server string?
-        #:port exact-positive-integer?
-        #:socket (or/c string? 'guess)
-        #:password (or/c string? #f)
-        #:allow-cleartext-password? boolean?
-        #:ssl (or/c 'yes 'optional 'no)
-        #:notice-handler (or/c 'output 'error)
-        #:notification-handler (or/c 'output 'error)
-        #:debug? any/c)
-       data-source?)]
- [mysql-data-source
-  (->* ()
-       (#:user string?
-        #:database (or/c string? #f)
-        #:server string?
-        #:port exact-positive-integer?
-        #:socket (or/c string? 'guess)
-        #:password (or/c string? #f)
-        #:notice-handler (or/c 'output 'error)
-        #:debug? any/c)
-       data-source?)]
- [sqlite3-data-source
-  (->* ()
-       (#:database (or/c string? 'memory 'temporary)
-        #:mode (or/c 'read-only 'read/write 'create)
-        #:busy-retry-limit (or/c exact-nonnegative-integer? +inf.0)
-        #:busy-retry-delay (and/c rational? (not/c negative?))
-        #:use-place boolean?)
-       data-source?)]
- [odbc-data-source
-  (->* ()
-       (#:dsn string?
-        #:user string?
-        #:password string?
-        #:notice-handler (or/c 'output 'error)
-        #:strict-parameter-types? boolean?
-        #:character-mode (or/c 'wchar 'utf-8 'latin-1)
-        #:use-place boolean?)
-       data-source?)])
diff --git a/pkgs/db-pkgs/db-lib/db/info.rkt b/pkgs/db-pkgs/db-lib/db/info.rkt
deleted file mode 100644
index 5d5561ec3f..0000000000
--- a/pkgs/db-pkgs/db-lib/db/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang setup/infotab
-
-(define collection "db")
diff --git a/pkgs/db-pkgs/db-lib/db/main.rkt b/pkgs/db-pkgs/db-lib/db/main.rkt
deleted file mode 100644
index ee1074477f..0000000000
--- a/pkgs/db-pkgs/db-lib/db/main.rkt
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang racket/base
-(require racket/lazy-require
-         racket/contract/base
-         db/base)
-(provide (all-from-out db/base))
-
-(lazy-require
- ["private/postgresql/main.rkt"
-  (postgresql-connect
-   postgresql-guess-socket-path
-   postgresql-password-hash)]
- ["private/mysql/main.rkt"
-  (mysql-connect
-   mysql-guess-socket-path
-   mysql-password-hash)]
- ["private/sqlite3/place.rkt"
-  (sqlite3-connect
-   sqlite3-available?)]
- ["private/odbc/main.rkt"
-  (odbc-connect
-   odbc-driver-connect
-   odbc-data-sources
-   odbc-drivers)]
- [openssl
-  (ssl-client-context?)])
-
-(provide/contract
- ;; Duplicates contracts at postgresql.rkt
- [postgresql-connect
-  (->* (#:user string?
-        #:database string?)
-       (#:password (or/c string? (list/c 'hash string?) #f)
-        #:server (or/c string? #f)
-        #:port (or/c exact-positive-integer? #f)
-        #:socket (or/c path-string? 'guess #f)
-        #:allow-cleartext-password? boolean?
-        #:ssl (or/c 'yes 'no 'optional)
-        #:ssl-context ssl-client-context?
-        #:notice-handler (or/c 'output 'error output-port? procedure?)
-        #:notification-handler (or/c 'output 'error output-port? procedure?)
-        #:debug? any/c)
-       connection?)]
- [postgresql-guess-socket-path
-  (-> path-string?)]
- [postgresql-password-hash
-  (-> string? string? string?)]
-
- ;; Duplicates contracts at mysql.rkt
- [mysql-connect
-  (->* (#:user string?)
-       (#:database (or/c string? #f)
-        #:password (or/c string? (list/c 'hash string?) #f)
-        #:server (or/c string? #f)
-        #:port (or/c exact-positive-integer? #f)
-        #:socket (or/c path-string? 'guess #f)
-        #:ssl (or/c 'yes 'no 'optional)
-        #:ssl-context ssl-client-context?
-        #:notice-handler (or/c 'output 'error output-port? procedure?)
-        #:debug? any/c)
-       connection?)]
- [mysql-guess-socket-path
-  (-> path-string?)]
- [mysql-password-hash
-  (-> string? string?)]
-
- ;; Duplicates contracts at sqlite3.rkt
- [sqlite3-connect
-  (->* (#:database (or/c path-string? 'memory 'temporary))
-       (#:mode (or/c 'read-only 'read/write 'create)
-        #:busy-retry-limit (or/c exact-nonnegative-integer? +inf.0)
-        #:busy-retry-delay (and/c rational? (not/c negative?))
-        #:use-place boolean?
-        #:debug? any/c)
-       connection?)]
- [sqlite3-available?
-  (-> boolean?)]
-
- ;; Duplicates contracts at odbc.rkt
- [odbc-connect
-  (->* (#:dsn (or/c string? #f))
-       (#:user (or/c string? #f)
-        #:password (or/c string? #f)
-        #:notice-handler (or/c 'output 'error output-port? procedure?)
-        #:strict-parameter-types? boolean?
-        #:character-mode (or/c 'wchar 'utf-8 'latin-1)
-        #:use-place boolean?)
-       connection?)]
- [odbc-driver-connect
-  (->* (string?)
-       (#:notice-handler (or/c 'output 'error output-port? procedure?)
-        #:strict-parameter-types? boolean?
-        #:character-mode (or/c 'wchar 'utf-8 'latin-1)
-        #:use-place boolean?)
-       connection?)]
- [odbc-data-sources
-  (-> (listof (list/c string? string?)))]
- [odbc-drivers
-  (-> (listof (cons/c string? any/c)))])
diff --git a/pkgs/db-pkgs/db-lib/db/mysql.rkt b/pkgs/db-pkgs/db-lib/db/mysql.rkt
deleted file mode 100644
index 027c1e230f..0000000000
--- a/pkgs/db-pkgs/db-lib/db/mysql.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         openssl
-         db/base
-         "private/mysql/main.rkt")
-
-;; FIXME: Contracts duplicated at main.rkt
-(provide/contract
- [mysql-connect
-  (->* (#:user string?)
-       (#:database (or/c string? #f)
-        #:password (or/c string? (list/c 'hash string?) #f)
-        #:server (or/c string? #f)
-        #:port (or/c exact-positive-integer? #f)
-        #:socket (or/c path-string? 'guess #f)
-        #:ssl (or/c 'yes 'no 'optional)
-        #:ssl-context ssl-client-context?
-        #:notice-handler (or/c 'output 'error output-port? procedure?)
-        #:debug? any/c)
-       connection?)]
- [mysql-guess-socket-path
-  (-> path-string?)]
- [mysql-password-hash
-  (-> string? string?)])
diff --git a/pkgs/db-pkgs/db-lib/db/odbc.rkt b/pkgs/db-pkgs/db-lib/db/odbc.rkt
deleted file mode 100644
index 44e0b49f2d..0000000000
--- a/pkgs/db-pkgs/db-lib/db/odbc.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         db/base
-         "private/odbc/main.rkt")
-
-;; FIXME: Contracts duplicated at main.rkt
-(provide/contract
- [odbc-connect
-  (->* (#:dsn (or/c string? #f))
-       (#:user (or/c string? #f)
-        #:password (or/c string? #f)
-        #:notice-handler (or/c 'output 'error output-port? procedure?)
-        #:strict-parameter-types? boolean?
-        #:character-mode (or/c 'wchar 'utf-8 'latin-1)
-        #:use-place boolean?)
-       connection?)]
- [odbc-driver-connect
-  (->* (string?)
-       (#:notice-handler (or/c 'output 'error output-port? procedure?)
-        #:strict-parameter-types? boolean?
-        #:character-mode (or/c 'wchar 'utf-8 'latin-1)
-        #:use-place boolean?)
-       connection?)]
- [odbc-data-sources
-  (-> (listof (list/c string? string?)))]
- [odbc-drivers
-  (-> (listof (cons/c string? any/c)))])
diff --git a/pkgs/db-pkgs/db-lib/db/postgresql.rkt b/pkgs/db-pkgs/db-lib/db/postgresql.rkt
deleted file mode 100644
index 8f5924ec1a..0000000000
--- a/pkgs/db-pkgs/db-lib/db/postgresql.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         openssl
-         db/base
-         "private/postgresql/main.rkt")
-
-;; FIXME: Contracts duplicated at main.rkt
-(provide/contract
- [postgresql-connect
-  (->* (#:user string?
-        #:database string?)
-       (#:password (or/c string? (list/c 'hash string?) #f)
-        #:server (or/c string? #f)
-        #:port (or/c exact-positive-integer? #f)
-        #:socket (or/c path-string? 'guess #f)
-        #:allow-cleartext-password? boolean?
-        #:ssl (or/c 'yes 'no 'optional)
-        #:ssl-context ssl-client-context?
-        #:notice-handler (or/c 'output 'error output-port? procedure?)
-        #:notification-handler (or/c 'output 'error output-port? procedure?)
-        #:debug? any/c)
-       connection?)]
- [postgresql-guess-socket-path
-  (-> path-string?)]
- [postgresql-password-hash
-  (-> string? string? string?)])
diff --git a/pkgs/db-pkgs/db-lib/db/private/generic/connect-util.rkt b/pkgs/db-pkgs/db-lib/db/private/generic/connect-util.rkt
deleted file mode 100644
index 532aeec173..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/generic/connect-util.rkt
+++ /dev/null
@@ -1,387 +0,0 @@
-#lang racket/base
-(require racket/class
-         db/private/generic/interfaces
-         db/private/generic/common)
-(provide kill-safe-connection
-         virtual-connection
-         connection-pool
-         connection-pool?
-         connection-pool-lease)
-
-;; manager% implements kill-safe manager thread w/ request channel
-(define manager%
-  (class object%
-    ;; other-evt : (-> evt)
-    ;; generates other evt to sync on besides req-channel, eg timeouts
-    (init-field (other-evt (lambda () never-evt))
-                (alt-enabled? (lambda () #t)))
-    (super-new)
-
-    (define req-channel (make-channel))
-    (define alt-req-channel (make-channel))
-
-    (define mthread
-      (thread/suspend-to-kill
-       (lambda ()
-         (let loop ()
-           (sync (wrap-evt req-channel (lambda (p) (p)))
-                 (if (alt-enabled?)
-                     (wrap-evt alt-req-channel (lambda (p) (p)))
-                     never-evt)
-                 (other-evt))
-           (loop)))))
-
-    (define/public (call proc)
-      (call* proc req-channel #f))
-    (define/public (alt-call-evt proc)
-      (call* proc alt-req-channel #t))
-
-    (define/private (call* proc chan as-evt?)
-      (thread-resume mthread (current-thread))
-      (let* ([result #f]
-             [sema (make-semaphore 0)]
-             [proc (lambda ()
-                     (set! result
-                           (with-handlers ([(lambda (e) #t)
-                                            (lambda (e) (cons 'exn e))])
-                             (cons 'values (call-with-values proc list))))
-                     (semaphore-post sema))]
-             [handler
-              (lambda (_evt)
-                (semaphore-wait sema)
-                (case (car result)
-                  ((values) (apply values (cdr result)))
-                  ((exn) (raise (cdr result)))))])
-        (if as-evt?
-            (wrap-evt (channel-put-evt chan proc) handler)
-            (begin (channel-put chan proc)
-                   (handler #f)))))))
-
-;; ----
-
-;; Kill-safe wrapper
-
-;; Note: wrapper protects against kill-thread, but not from
-;; custodian-shutdown of ports, etc.
-
-(define kill-safe-connection%
-  (class* object% (connection<%>)
-    (init-private connection)
-
-    (define mgr (new manager%))
-    (define last-connected? #t)
-
-    (define-syntax-rule (define-forward (method arg ...) ...)
-      (begin
-        (define/public (method arg ...)
-          (send mgr call (lambda ()
-                           (begin0
-                               (send connection method arg ...)
-                             (set! last-connected? (send connection connected?))))))
-        ...))
-
-    (define/public (connected?) last-connected?)
-
-    (define-forward
-      (disconnect)
-      (get-dbsystem)
-      (query fsym stmt cursor?)
-      (prepare fsym stmt close-on-exec?)
-      (fetch/cursor fsym cursor fetch-size)
-      (get-base)
-      (free-statement stmt need-lock?)
-      (transaction-status fsym)
-      (start-transaction fsym isolation option cwt?)
-      (end-transaction fsym mode cwt?)
-      (list-tables fsym schema))
-
-    (super-new)))
-
-;; ----
-
-(define (kill-safe-connection connection)
-  (new kill-safe-connection%
-       (connection connection)))
-
-;; ========================================
-
-;; Virtual connection
-
-(define virtual-connection%
-  (class* object% (connection<%>)
-    (init-private connector     ;; called from client thread
-                  get-key)      ;; called from client thread
-    (super-new)
-
-    (define custodian (current-custodian))
-
-    ;; == methods called in manager thread ==
-
-    ;; key=>conn : hasheq[key => connection]
-    (define key=>conn (make-hasheq))
-
-    (define/private (get key)      ;; also called by client thread for connected?
-      (hash-ref key=>conn key #f))
-
-    (define/private (put! key c)
-      (hash-set! key=>conn key c))
-
-    (define/private (remove! key)
-      (let ([c (get key)])
-        (when c
-          (hash-remove! key=>conn key)
-          (send c disconnect))))
-
-    (define mgr
-      (new manager%
-           (other-evt
-            (lambda ()
-              (choice-evt
-               (let ([keys (hash-map key=>conn (lambda (k v) k))])
-                 (handle-evt (apply choice-evt keys)
-                             ;; Assignment to key has expired
-                             (lambda (key)
-                               (log-db-debug "virtual-connection: key expiration: ~e" key)
-                               (remove! key)))))))))
-
-    ;; == methods called in client thread ==
-
-    (define/private (get-connection create?)
-      (let* ([key (get-key)]
-             [c (send mgr call (lambda () (get key)))])
-        (cond [(and c (send c connected?)) c]
-              [create?
-               (log-db-debug
-                (if c
-                    "virtual-connection: refreshing connection (old is disconnected)"
-                    "virtual-connection: creating new connection"))
-               (let ([c* (parameterize ((current-custodian custodian))
-                           (connector))])
-                 (send mgr call
-                       (lambda ()
-                         (when c (remove! key))
-                         (put! key c*)))
-                 c*)]
-              [else
-               (when c ;; got a disconnected connection
-                 (send mgr call (lambda () (remove! key))))
-               #f])))
-
-    ;; ----
-
-    (define-syntax-rule (define-forward (req-con? no-con (method arg ...)) ...)
-      (begin (define/public (method arg ...)
-               (let ([c (get-connection req-con?)])
-                 (if c
-                     (send c method arg ...)
-                     no-con)))
-             ...))
-
-    (define-forward
-      (#t '_     (get-dbsystem))
-      (#t '_     (query fsym stmt cursor?))
-      (#t '_     (fetch/cursor fsym stmt fetch-size))
-      (#t '_     (start-transaction fsym isolation option cwt?))
-      (#f (void) (end-transaction fsym mode cwt?))
-      (#f #f     (transaction-status fsym))
-      (#t '_     (list-tables fsym schema)))
-
-    (define/public (get-base)
-      (get-connection #t))
-
-    (define/public (connected?)
-      (let ([c (get (get-key))])
-        (and c (send c connected?))))
-
-    (define/public (disconnect)
-      (let ([c (get-connection #f)]
-            [key (get-key)])
-        (when c
-          (send c disconnect)
-          (send mgr call (lambda () (remove! key)))))
-      (void))
-
-    (define/public (prepare fsym stmt close-on-exec?)
-      ;; FIXME: hacky way of supporting virtual-statement
-      (unless (or close-on-exec? (eq? fsym 'virtual-statement))
-        (error fsym "cannot prepare statement with virtual connection"))
-      (send (get-connection #t) prepare fsym stmt close-on-exec?))
-
-    (define/public (free-statement stmt need-lock?)
-      (error/internal 'free-statement "virtual connection does not own statements"))))
-
-;; ----
-
-(define (virtual-connection connector)
-  (let ([connector
-         (cond [(connection-pool? connector)
-                (lambda () (connection-pool-lease connector))]
-               [else connector])]
-        [get-key (lambda () (thread-dead-evt (current-thread)))])
-    (new virtual-connection%
-         (connector connector)
-         (get-key get-key))))
-
-;; ========================================
-
-;; Connection pool
-
-(define connection-pool%
-  (class* object% ()
-    (init-private connector              ;; called from manager thread
-                  max-connections
-                  max-idle-connections)
-    (super-new)
-
-    (define proxy-counter 1) ;; for debugging
-    (define actual-counter 1) ;; for debugging
-    (define actual=>number (make-weak-hasheq))
-
-    ;; == methods called in manager thread ==
-
-    ;; assigned-connections : nat
-    (define assigned-connections 0)
-
-    ;; proxy=>evt : hasheq[proxy-connection => evt]
-    (define proxy=>evt (make-hasheq))
-
-    ;; idle-list : (listof raw-connection)
-    (define idle-list null)
-
-    (define/private (lease* key)
-      (let* ([reused-c (try-take-idle)]
-             [raw-c (or reused-c (new-connection))]
-             [proxy-number (begin0 proxy-counter (set! proxy-counter (add1 proxy-counter)))]
-             [c (new proxy-connection% (pool this) (connection raw-c) (number proxy-number))])
-        (log-db-debug "connection-pool: leasing connection #~a (~a @~a)"
-                      proxy-number
-                      (if reused-c "idle" "new")
-                      (hash-ref actual=>number raw-c "???"))
-        (hash-set! proxy=>evt c (wrap-evt key (lambda (_e) c)))
-        (set! assigned-connections (add1 assigned-connections))
-        c))
-
-    (define/private (try-take-idle)
-      (and (pair? idle-list)
-           (let ([c (car idle-list)])
-             (set! idle-list (cdr idle-list))
-             (if (send c connected?)
-                 c
-                 (try-take-idle)))))
-
-    (define/private (release* proxy raw-c why)
-      (log-db-debug "connection-pool: releasing connection #~a (~a, ~a)"
-                    (send proxy get-number)
-                    (cond [(not raw-c) "no-op"]
-                          [(< (length idle-list) max-idle-connections) "idle"]
-                          [else "disconnect"])
-                    why)
-      (hash-remove! proxy=>evt proxy)
-      (when raw-c
-        (with-handlers ([exn:fail? void])
-          ;; If in tx, just disconnect (for simplicity; else must loop for nested txs)
-          (when (send raw-c transaction-status 'connection-pool)
-            (send raw-c disconnect)))
-        (cond [(and (< (length idle-list) max-idle-connections)
-                    (send raw-c connected?))
-               (set! idle-list (cons raw-c idle-list))]
-              [else (send raw-c disconnect)])
-        (set! assigned-connections (sub1 assigned-connections))))
-
-    (define/private (new-connection)
-      (let ([c (connector)]
-            [actual-number
-             (begin0 actual-counter
-               (set! actual-counter (add1 actual-counter)))])
-        (when (or (hash-ref proxy=>evt c #f) (memq c idle-list))
-          (error 'connection-pool "connect function did not produce a fresh connection"))
-        (hash-set! actual=>number c actual-number)
-        c))
-
-    (define mgr
-      (new manager%
-           (other-evt
-            (lambda ()
-              (let ([evts (hash-values proxy=>evt)])
-                (handle-evt (apply choice-evt evts)
-                            (lambda (proxy)
-                              (release* proxy
-                                        (send proxy release-connection)
-                                        "release-evt"))))))
-           (alt-enabled? (lambda () (< assigned-connections max-connections)))))
-
-    ;; == methods called in client thread ==
-
-    (define/public (lease-evt key)
-      (send mgr alt-call-evt (lambda () (lease* key))))
-
-    (define/public (release proxy)
-      (let ([raw-c (send proxy release-connection)])
-        (send mgr call (lambda () (release* proxy raw-c "proxy disconnect"))))
-      (void))))
-
-;; --
-
-(define proxy-connection%
-  (class* locking% (connection<%>)
-    (init-private connection
-                  pool
-                  number)
-    (inherit call-with-lock)
-    (super-new)
-
-    (define-syntax-rule (define-forward defmethod (method arg ...) ...)
-      (begin
-        (defmethod (method arg ...)
-          (call-with-lock 'method
-            (lambda ()
-              (let ([c connection])
-                (unless c (error/not-connected 'method))
-                (send c method arg ...)))))
-        ...))
-
-    (define-forward define/public
-      (get-dbsystem)
-      (query fsym stmt cursor?)
-      (prepare fsym stmt close-on-exec?)
-      (fetch/cursor fsym stmt fetch-size)
-      (get-base)
-      (free-statement stmt need-lock?)
-      (transaction-status fsym)
-      (start-transaction fsym isolation option cwt?)
-      (end-transaction fsym mode cwt?)
-      (list-tables fsym schema))
-
-    (define/override (connected?) (and connection (send connection connected?)))
-
-    (define/public (disconnect)
-      (send pool release this))
-
-    (define/public (get-number) number)
-
-    (define/public (release-connection)
-      (begin0 connection
-        (set! connection #f)))))
-
-;; ----
-
-(define (connection-pool connector
-                         #:max-connections [max-connections +inf.0]
-                         #:max-idle-connections [max-idle-connections 10])
-  (new connection-pool%
-       (connector connector)
-       (max-connections max-connections)
-       (max-idle-connections max-idle-connections)))
-
-(define (connection-pool? x)
-  (is-a? x connection-pool%))
-
-(define (connection-pool-lease pool [key (current-thread)])
-  (let* ([key
-          (cond [(thread? key) (thread-dead-evt key)]
-                [(custodian? key) (make-custodian-box key #t)]
-                [else key])]
-         [result (sync/timeout 0.1 (send pool lease-evt key))])
-    (unless result
-      (error 'connection-pool-lease "connection pool limit reached"))
-    result))
diff --git a/pkgs/db-pkgs/db-lib/db/private/generic/dsn.rkt b/pkgs/db-pkgs/db-lib/db/private/generic/dsn.rkt
deleted file mode 100644
index dd10a673e3..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/generic/dsn.rkt
+++ /dev/null
@@ -1,204 +0,0 @@
-#lang racket/base
-(require racket/lazy-require
-         syntax/parse/private/minimatch
-         racket/file
-         racket/list)
-(provide dsn-connect
-         (struct-out data-source)
-         connector?
-         arglist?
-         writable-datum?
-         current-dsn-file
-         get-dsn
-         put-dsn
-         postgresql-data-source
-         mysql-data-source
-         sqlite3-data-source
-         odbc-data-source)
-
-(lazy-require
- [db (postgresql-connect
-      mysql-connect
-      odbc-connect
-      sqlite3-connect)])
-
-#|
-DSN v0.1 format
-
-A DSN (prefs) file maps symbol => <data-source>
-
-<data-source> ::= (db <connector> <args> <extensions>)
-
-<connector> ::= postgresql | mysql | sqlite3 | odbc
-
-<args> ::= (<arg> ...)
-<arg>  ::= <datum> | { <kw> <datum> }
-
-<extensions> ::= ((<symbol> <datum>) ...)
-
-Extensions associate arbitrary extra information with a data-source (for
-example, SQL dialect information, testing flags, etc). Extension keys
-starting with 'dsn:', 'db:', 'racket:', and 'plt:' are
-reserved. Keys may occur multiple times, but the order should not be
-considered important.
-
-  db:description ::= <string>, short description
-  db:comment ::= <string>, or maybe <xexpr>
-
-|#
-
-(struct data-source (connector args extensions) #:transparent #:mutable)
-
-;; ----------------------------------------
-
-(define none (gensym 'none))
-
-(define (writable-datum? x)
-  (or (symbol? x)
-      (string? x)
-      (number? x)
-      (boolean? x)
-      (null? x)
-      (and (pair? x)
-           (writable-datum? (car x))
-           (writable-datum? (cdr x)))))
-
-(define (connector? x)
-  (memq x '(postgresql mysql sqlite3 odbc)))
-
-(define (parse-arglist x [default none])
-  (define (fail . args)
-    (cond [(eq? default none) (apply error 'parse-arglist args)]
-          [(procedure? default) (default)]
-          [else default]))
-  (if (list? x)
-      (let loop ([x x] [pargs null] [kwargs null])
-        (cond [(null? x)
-               (list (reverse pargs)
-                     (reverse kwargs))]
-              [(keyword? (car x))
-               (cond [(null? (cdr x)) (fail "keyword without argument: ~a" (car x))]
-                     [(writable-datum? (cadr x))
-                      (loop (cddr x) pargs (cons (list (car x) (cadr x)) kwargs))]
-                     [else
-                      (fail "expected readable datum: ~e" (cadr x))])]
-              [(writable-datum? (car x))
-               (loop (cdr x) (cons (car x) pargs) kwargs)]
-              [else (fail "expected readable datum: ~e" (car x))]))
-      (fail "expected list")))
-
-(define (arglist? x)
-  (and (parse-arglist x #f) #t))
-
-(define (parse-extensions x [default none])
-  (let/ec escape
-    (define (fail . args)
-      (cond [(eq? default none) (apply error 'parse-extensions args)]
-            [(procedure? default) (escape (default))]
-            [else (escape default)]))
-    (if (list? x)
-        (map (lambda (x)
-               (match x
-                 [(list (? symbol? key) (? writable-datum? value))
-                  x]
-                 [else (fail "expected extension entry: ~e" x)]))
-             x)
-        (fail "expected list: ~e" x))))
-
-(define (extensions? x)
-  (and (parse-extensions x #f) #t))
-
-(define (sexpr->data-source x)
-  (let/ec escape
-    (match x
-      [(list 'db (? connector? connector) (? arglist? args) (? extensions? exts))
-       (data-source connector args exts)]
-      [_ #f])))
-
-(define (data-source->sexpr x)
-  (match x
-    [(data-source connector args exts)
-     `(db ,connector ,args ,exts)]))
-
-;; ----------------------------------------
-
-(define current-dsn-file
-  (make-parameter (build-path (find-system-path 'pref-dir) "db-dsn-0.rktd")))
-
-(define (get-dsn name [default #f] #:dsn-file [file (current-dsn-file)])
-  (let* ([sexpr (get-preference name (lambda () #f) 'timestamp file)])
-    (or (and sexpr (sexpr->data-source sexpr))
-        (if (procedure? default) (default) default))))
-
-(define (put-dsn name value #:dsn-file [file (current-dsn-file)])
-  (let* ([sexpr (and value (data-source->sexpr value))])
-    (put-preferences (list name)
-                     (list sexpr)
-                     (lambda () (error 'put-dsn "DSN file locked"))
-                     file)))
-
-;; ----------------------------------------
-
-(define (get-connect x)
-  (case x
-    ((postgresql) postgresql-connect)
-    ((mysql) mysql-connect)
-    ((sqlite3) sqlite3-connect)
-    ((odbc) odbc-connect)))
-
-(define dsn-connect
-  (make-keyword-procedure
-   (lambda (kws kwargs name . pargs)
-     (let* ([kws (map list kws kwargs)]
-            [file-entry (assq '#:dsn-file kws)]
-            [kws* (if file-entry (remq file-entry kws) kws)]
-            [file (if file-entry (cdr file-entry) (current-dsn-file))])
-       (unless (or (symbol? name) (data-source? name))
-         (error 'dsn-connect
-                "expected symbol for first argument, got: ~e" name))
-       (unless (or (path-string? file) (not file))
-         (error 'dsn-connect
-                "expected path or string for #:dsn-file keyword, got: ~e"
-                file))
-       (let ([r (if (data-source? name) name (get-dsn name #f #:dsn-file file))])
-         (unless r
-           (error 'dsn-connect "cannot find data source named ~e" name))
-         (let* ([rargs (parse-arglist (data-source-args r))]
-                [rpargs (first rargs)]
-                [rkwargs (second rargs)]
-                [allpargs (append rpargs pargs)]
-                [allkwargs (sort (append rkwargs kws*) keyword<? #:key car)]
-                [connect (get-connect (data-source-connector r))])
-           (keyword-apply connect (map car allkwargs) (map cadr allkwargs) allpargs)))))))
-
-;; ----
-
-(define (mk-specialized name connector arity kws)
-  (procedure-rename
-   (procedure-reduce-keyword-arity
-    (make-keyword-procedure
-     (lambda (kws kwargs . pargs)
-       (data-source connector (apply append pargs (map list kws kwargs)) '())))
-    arity '() (sort kws keyword<?))
-   name))
-
-(define postgresql-data-source
-  (mk-specialized 'postgresql-data-source 'postgresql 0
-                  '(#:user #:database #:password #:server #:port #:socket
-                    #:allow-cleartext-password? #:ssl
-                    #:notice-handler #:notification-handler #:debug?)))
-
-(define mysql-data-source
-  (mk-specialized 'mysql-data-source 'mysql 0
-                  '(#:user #:database #:password #:server #:port #:socket #:ssl
-                    #:notice-handler #:debug?)))
-
-(define sqlite3-data-source
-  (mk-specialized 'sqlite3-data-source 'sqlite3 0
-                  '(#:database #:mode #:busy-retry-limit #:busy-retry-delay
-                    #:use-place #:debug?)))
-
-(define odbc-data-source
-  (mk-specialized 'odbc-data-source 'odbc 0
-                  '(#:dsn #:user #:password #:notice-handler
-                    #:strict-parameter-types? #:character-mode #:use-place)))
diff --git a/pkgs/db-pkgs/db-lib/db/private/generic/place-client.rkt b/pkgs/db-pkgs/db-lib/db/private/generic/place-client.rkt
deleted file mode 100644
index 239f95a599..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/generic/place-client.rkt
+++ /dev/null
@@ -1,118 +0,0 @@
-#lang racket/base
-(require racket/class
-         syntax/parse/private/minimatch
-         racket/place
-         racket/promise
-         racket/serialize
-         racket/runtime-path
-         (for-syntax (only-in racket/base quote))
-         ffi/unsafe/atomic
-         db/private/generic/interfaces
-         db/private/generic/common
-         db/private/generic/prepared)
-(provide place-connect
-         place-proxy-connection%)
-
-(define (pchan-put chan datum)
-  (place-channel-put chan (serialize datum)))
-(define (pchan-get chan)
-  (deserialize (place-channel-get chan)))
-
-(define-runtime-module-path-index _place-server
-  'db/private/generic/place-server)
-
-(define connection-server-channel
-  (delay/sync
-   (dynamic-place 'db/private/generic/place-server 'connection-server)))
-
-(define (place-connect connection-spec proxy%)
-  (let-values ([(channel other-channel) (place-channel)])
-    (place-channel-put (force connection-server-channel)
-                       (list 'connect other-channel connection-spec))
-    (match (pchan-get channel)
-      [(list 'ok)
-       (new proxy% (channel channel))]
-      [(list 'error message)
-       (raise (make-exn:fail message (current-continuation-marks)))])))
-
-(define place-proxy-connection%
-  (class* locking% (connection<%>)
-    (init-field channel)
-    (inherit call-with-lock
-             call-with-lock*)
-    (super-new)
-
-    (define/private (call method-name . args)
-      (call-with-lock method-name (lambda () (call* method-name args #t))))
-    (define/private (call/d method-name . args)
-      (call-with-lock* method-name (lambda () (call* method-name args #f)) #f #f))
-    (define/private (call* method-name args need-connected?)
-      (cond [channel
-             (pchan-put channel (cons method-name args))
-             (let* ([response (pchan-get channel)]
-                    [still-connected? (car response)])
-               (when (not still-connected?) (set! channel #f))
-               (match (cdr response)
-                 [(cons 'values vals)
-                  (apply values (for/list ([val (in-list vals)]) (sexpr->result val)))]
-                 [(list 'error message)
-                  (raise (make-exn:fail message (current-continuation-marks)))]))]
-            [need-connected?
-             (unless channel
-               (error/not-connected method-name))]
-            [else (void)]))
-
-    (define/override (connected?)
-      (and channel #t))
-
-    (define/public (disconnect)
-      (call/d 'disconnect)
-      (set! channel #f))
-
-    (define/public (get-dbsystem) (error 'get-dbsystem "not implemented"))
-    (define/public (get-base) this)
-
-    (define/public (query fsym stmt cursor?)
-      (call 'query fsym
-            (match stmt
-              [(? string?) (list 'string stmt)]
-              [(statement-binding pst params)
-               (list 'statement-binding (send pst get-handle) params)])
-            cursor?))
-    (define/public (prepare fsym stmt close-on-exec?)
-      (call 'prepare fsym stmt close-on-exec?))
-    (define/public (fetch/cursor fsym cursor fetch-size)
-      (call 'fetch/cursor fsym (cursor-result-extra cursor) fetch-size))
-    (define/public (transaction-status fsym)
-      (call 'transaction-status fsym))
-    (define/public (start-transaction fsym iso option cwt?)
-      (call 'start-transaction fsym iso option cwt?))
-    (define/public (end-transaction fsym mode cwt?)
-      (call 'end-transaction fsym mode cwt?))
-    (define/public (list-tables fsym schema)
-      (call 'list-tables fsym schema))
-
-    (define/public (free-statement pst need-lock?)
-      (start-atomic)
-      (let ([handle (send pst get-handle)])
-        (send pst set-handle #f)
-        (end-atomic)
-        (when channel
-          (call/d 'free-statement handle need-lock?))))
-
-    (define/private (sexpr->result x)
-      (match x
-        [(list 'simple-result y)
-         (simple-result y)]
-        [(list 'rows-result h rows)
-         (rows-result h rows)]
-        [(list 'cursor-result info handle)
-         (cursor-result info #f handle)]
-        [(list 'prepared-statement handle close-on-exec? param-typeids result-dvecs)
-         (new prepared-statement%
-              (handle handle)
-              (close-on-exec? close-on-exec?)
-              (param-typeids param-typeids)
-              (result-dvecs result-dvecs)
-              (owner this))]
-        [_ x]))))
diff --git a/pkgs/db-pkgs/db-lib/db/private/generic/place-server.rkt b/pkgs/db-pkgs/db-lib/db/private/generic/place-server.rkt
deleted file mode 100644
index a45e98538d..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/generic/place-server.rkt
+++ /dev/null
@@ -1,147 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/class
-         syntax/parse/private/minimatch
-         racket/place
-         racket/serialize
-         racket/lazy-require
-         db/private/generic/interfaces
-         db/private/generic/prepared)
-(provide connection-server)
-
-(define (pchan-put chan datum)
-  (place-channel-put chan (serialize datum)))
-(define (pchan-get chan)
-  (deserialize (place-channel-get chan)))
-
-#|
-Connection creation protocol
-
-client -> server on client-chan: (list 'connect conn-chan <connect-options>)
-server -> client on conn-chan:   (or (list 'ok)
-                                     (list 'error string))
-
-where <connect-spec> ::= (list 'sqlite3 path/sym mode-sym delay-num limit-num)
-                      |  (list 'odbc string string/#f string/#f boolean symbol)
-|#
-(define (connection-server client-chan)
-  (let loop ()
-    (serve client-chan)
-    (loop)))
-
-(lazy-require
- [db/private/sqlite3/main (sqlite3-connect)]
- [db/private/odbc/main (odbc-connect odbc-driver-connect)])
-
-(define (serve client-chan)
-  (match (place-channel-get client-chan)
-    [(list 'connect conn-chan connect-spec)
-     (with-handlers ([exn:fail?
-                      (lambda (e)
-                        (pchan-put conn-chan (list 'error (exn-message e))))])
-       (let* ([c
-               (match connect-spec
-                 [(list 'sqlite3 db mode busy-retry-delay busy-retry-limit)
-                  (sqlite3-connect #:database db
-                                   #:mode mode
-                                   #:busy-retry-delay busy-retry-delay
-                                   #:busy-retry-limit busy-retry-limit)]
-                 [(list 'odbc dsn user password strict-param? char-mode)
-                  (odbc-connect #:dsn dsn
-                                #:user user
-                                #:password password
-                                #:strict-parameter-types? strict-param?
-                                #:character-mode char-mode
-                                #:use-place #f)]
-                 [(list 'odbc-driver connection-string strict-param? char-mode)
-                  (odbc-driver-connect connection-string
-                                       #:strict-parameter-types? strict-param?
-                                       #:character-mode char-mode
-                                       #:use-place #f)])]
-              [p (new proxy-server% (connection c) (channel conn-chan))])
-         (pchan-put conn-chan (list 'ok))
-         (thread (lambda () (send p serve)))))]))
-
-#|
-Connection methods protocol
-
-client -> server: (list '<method-name> arg ...)
-server -> client: (or (list boolean 'values result ...)
-                      (list boolean 'error string))
-|#
-
-(define proxy-server%
-  (class object%
-    (init-field connection
-                channel)
-    (super-new)
-
-    ;; FIXME: need to collect cursors, too
-    (define table (make-hash)) ;; int => prepared-statement/cursor-result
-    (define counter 0)
-
-    (define/public (serve)
-      (serve1)
-      (when connection (serve)))
-
-    (define/private (still-connected?) (and connection (send connection connected?)))
-
-    (define/private (serve1)
-      (with-handlers ([exn?
-                       (lambda (e)
-                         (pchan-put channel (list (still-connected?) 'error (exn-message e))))])
-        (call-with-values
-            (lambda ()
-              (match (pchan-get channel)
-                [(list 'disconnect)
-                 (send connection disconnect)
-                 (set! connection #f)]
-                [(list 'free-statement pstmt-index need-lock?)
-                 (send connection free-statement (hash-ref table pstmt-index) need-lock?)
-                 (hash-remove! table pstmt-index)]
-                [(list 'query fsym stmt cursor?)
-                 (send connection query fsym (sexpr->statement stmt) cursor?)]
-                [(list 'fetch/cursor fsym cursor-index fetch-size)
-                 (send connection fetch/cursor fsym (hash-ref table cursor-index) fetch-size)]
-                [msg
-                 (define-syntax-rule (forward-methods (method arg ...) ...)
-                   (match msg
-                     [(list 'method arg ...)
-                      (send connection method arg ...)]
-                     ...))
-                 (forward-methods (connected?)
-                                  (prepare w s m)
-                                  (list-tables w s)
-                                  (start-transaction w m o c)
-                                  (end-transaction w m c)
-                                  (transaction-status w))]))
-          (lambda results
-            (let ([results (for/list ([result (in-list results)]) (result->sexpr result))])
-              (pchan-put channel (cons (still-connected?) (cons 'values results))))))))
-
-    (define/private (sexpr->statement x)
-      (match x
-        [(list 'string s) s]
-        [(list 'statement-binding pstmt-index args)
-         (statement-binding (hash-ref table pstmt-index) args)]))
-
-    (define/private (result->sexpr x)
-      (match x
-        [(simple-result y)
-         (list 'simple-result y)]
-        [(rows-result h rows)
-         (list 'rows-result h rows)]
-        [(cursor-result h pst extra)
-         (let ([index (begin (set! counter (add1 counter)) counter)])
-           (hash-set! table index x)
-           (list 'cursor-result h index))]
-        ;; FIXME: Assumes prepared-statement is concrete class, not interface.
-        [(? (lambda (x) (is-a? x prepared-statement%)))
-         (let ([index (begin (set! counter (add1 counter)) counter)])
-           (hash-set! table index x)
-           (list 'prepared-statement
-                 index
-                 (get-field close-on-exec? x)
-                 (get-field param-typeids x)
-                 (get-field result-dvecs x)))]
-        [_ x]))))
diff --git a/pkgs/db-pkgs/db-lib/db/private/generic/sql-convert.rkt b/pkgs/db-pkgs/db-lib/db/private/generic/sql-convert.rkt
deleted file mode 100644
index d813070490..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/generic/sql-convert.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-(require racket/math)
-
-(provide exact->decimal-string    ;; odbc, tests (?)
-         exact->scaled-integer    ;; pg, odbc
-         inexact->scaled-integer) ;; pg
-
-;; ========================================
-
-;; exact->decimal-string : exact -> string or #f
-;; always includes decimal point
-(define (exact->decimal-string n)
-  (let* ([whole-part (truncate n)]
-         [fractional-part (- (abs n) (abs whole-part))]
-         [scaled (exact->scaled-integer fractional-part)])
-    (and scaled
-         (let* ([ma (car scaled)]
-                [ex (cdr scaled)]
-                [ma-str (number->string ma)])
-           (if (zero? ex)
-               (number->string whole-part)
-               (string-append (number->string whole-part)
-                              "."
-                              (make-string (- ex (string-length ma-str)) #\0)
-                              ma-str))))))
-
-;; exact->scaled-integer : exact-rational -> (cons int int) or #f
-;; Given x, returns (cons M E) s.t. x = (M * 10^-E)
-(define (exact->scaled-integer n [trim-integers? #f])
-  (if (and trim-integers? (integer? n))
-      (let*-values ([(n* fives) (factor-out n 5)]
-                    [(n** twos) (factor-out n* 2)])
-        (let ([tens (min fives twos)])
-          (cons (/ n (expt 10 tens)) (- tens))))
-      (let* ([whole-part (truncate n)]
-             [fractional-part (- (abs n) (abs whole-part))]
-             [den (denominator fractional-part)])
-        (let*-values ([(den* fives) (factor-out den 5)]
-                      [(den** twos) (factor-out den* 2)])
-          (and (= 1 den**)
-               (let ([tens (max fives twos)])
-                 (cons (* n (expt 10 tens)) tens)))))))
-
-;; inexact->scaled-integer : inexact-rational -> (cons int int)
-;; Given x, returns (cons M E) s.t. x ~= (M * 10^-E)
-(define (inexact->scaled-integer x)
-  ;; FIXME: as a hacky alternative, could just parse result of number->string
-  (if (zero? x)
-      (cons 0 0)
-      ;; nonzero, inexact
-      ;; 16 digits ought to be enough (and not too much)
-      (let* ([E0 (order-of-magnitude x)]
-             ;; x = y * 10^E0 where y in [1,10)
-             [E1 (add1 E0)]
-             ;; x = y * 10^E1 where y in [0.1,1)
-             [E (- E1 16)]
-             ;; x ~= M * 10^E where M in [10^15,10^16)
-             [M (inexact->exact (truncate (* x (expt 10 (- E)))))]
-             ;; trim zeroes from M
-             [M*+E* (exact->scaled-integer M #t)]
-             [M* (car M*+E*)]
-             [E* (cdr M*+E*)])
-        (cons M* (- E* E)))))
-
-(define (factor-out-v1 n factor)
-  (define (loop n acc)
-    (let-values ([(q r) (quotient/remainder n factor)])
-      (if (zero? r)
-          (loop q (add1 acc))
-          (values n acc))))
-  (loop n 0))
-
-(define (factor-out n factor)
-  (define (loop n factor)
-    (if (<= factor n)
-        (let*-values ([(q n) (loop n (* factor factor))]
-                      [(q* r) (quotient/remainder q factor)])
-          (if (zero? r)
-              (values q* (+ n n 1))
-              (values q  (+ n n))))
-        (values n 0)))
-  (loop n factor))
diff --git a/pkgs/db-pkgs/db-lib/db/private/mysql/connection.rkt b/pkgs/db-pkgs/db-lib/db/private/mysql/connection.rkt
deleted file mode 100644
index 4c8810ea72..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/mysql/connection.rkt
+++ /dev/null
@@ -1,695 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/match
-         openssl
-         openssl/sha1
-         unstable/error
-         db/private/generic/interfaces
-         db/private/generic/common
-         db/private/generic/prepared
-         db/private/generic/sql-data
-         "message.rkt"
-         "dbsystem.rkt")
-(provide connection%
-         mysql-password-hash)
-
-(define MAX-ALLOWED-PACKET (expt 2 30))
-
-;; ========================================
-
-(define connection%
-  (class* statement-cache% (connection<%>)
-    (init-private notice-handler)
-    (define inport #f)
-    (define outport #f)
-
-    (inherit call-with-lock
-             call-with-lock*
-             add-delayed-call!
-             check-valid-tx-status
-             get-tx-status
-             set-tx-status!
-             check-statement/tx
-             dprintf
-             prepare1
-             check/invalidate-cache)
-
-    (super-new)
-
-    ;; ========================================
-
-    ;; == Communication
-
-    #|
-    During initial setup, okay to send and recv directly, since reference
-    to connection does not escape to user. In particular, no danger of trying
-    to start a new exchange on top of an incomplete failed one.
-
-    After initial setup, communication can only happen within lock, and any
-    error (other than exn:fail:sql) that occurs between sending the message
-    buffer (flush-message-buffer) and receiving the last message (recv)
-    must cause the connection to disconnect. Such errors include communication
-    errors and breaks.
-    |#
-
-    (define msg-buffer null)
-    (define next-msg-num 0)
-
-    (define/private (fresh-exchange)
-      (set! next-msg-num 0))
-
-    ;; buffer-message : message -> void
-    (define/private (buffer-message msg)
-      (dprintf "  >> ~s\n" msg)
-      (set! msg-buffer (cons (cons msg next-msg-num) msg-buffer))
-      (set! next-msg-num (add1 next-msg-num)))
-
-    ;; flush-message-buffer : -> void
-    (define/private (flush-message-buffer)
-      (for ([msg+num (in-list (reverse msg-buffer))])
-        (write-packet outport (car msg+num) (cdr msg+num)))
-      (set! msg-buffer null)
-      (flush-output outport))
-
-    ;; send-message : message -> void
-    (define/private (send-message msg)
-      (buffer-message msg)
-      (flush-message-buffer))
-
-    (define/private (call-with-sync fsym proc)
-      (with-handlers ([(lambda (e) #t)
-                       (lambda (e)
-                         ;; Anything but exn:fail:sql (raised by recv-message) indicates
-                         ;; a communication error.
-                         (unless (exn:fail:sql? e)
-                           (disconnect* #f))
-                         (raise e))])
-        (flush-message-buffer)
-        (proc)))
-
-    ;; recv : symbol/#f [(list-of symbol)] -> message
-    ;; Automatically handles asynchronous messages
-    (define/private (recv fsym expectation [field-dvecs #f])
-      (define r (recv* fsym expectation field-dvecs))
-      (when (error-packet? r)
-        (raise-backend-error fsym r))
-      r)
-
-    (define/private (recv* fsym expectation field-dvecs)
-      (define (advance . ss)
-        (unless (or (not expectation) 
-                    (null? ss)
-                    (memq expectation ss))
-          (error/comm fsym)))
-      (define (err packet)
-        (error/comm fsym))
-      (let-values ([(msg-num next) (parse-packet inport expectation field-dvecs)])
-        (set! next-msg-num (add1 msg-num))
-        (dprintf "  << ~s\n" next)
-        ;; Update transaction status (see Transactions below)
-        (when (ok-packet? next)
-          (set-tx-status! fsym (bitwise-bit-set? (ok-packet-server-status next) 0)))
-        (when (eof-packet? next)
-          (set-tx-status! fsym (bitwise-bit-set? (eof-packet-server-status next) 0)))
-        (when (error-packet? next)
-          (when (member (error-packet-errno next) '(1213 1205))
-            (when (get-tx-status)
-              (set-tx-status! fsym 'invalid))))
-        (match next
-          [(? handshake-packet?)
-           (advance 'handshake)]
-          [(? ok-packet?)
-           (advance)]
-          [(? change-plugin-packet?)
-           (advance 'auth)]
-          [(? error-packet?)
-           (advance)]
-          [(? result-set-header-packet?)
-           (advance 'result)]
-          [(? field-packet?)
-           (advance 'field)]
-          [(? row-data-packet?)
-           (advance 'data)]
-          [(? binary-row-data-packet?)
-           (advance 'binary-data)]
-          [(? ok-prepared-statement-packet?)
-           (advance 'prep-ok)]
-          [(? eof-packet?)
-           (advance 'field 'data 'binary-data)]
-          [(struct unknown-packet (expected contents))
-           (error/comm fsym expected)]
-          [else
-           (err next)])
-        next))
-
-    ;; ========================================
-
-    ;; Connection management
-
-    (define/override (disconnect* politely?)
-      (super disconnect* politely?)
-      (let ([outport* outport]
-            [inport* inport])
-        (when outport*
-          (when politely?
-            (fresh-exchange)
-            (send-message (make-command-packet 'quit "")))
-          (with-handlers ([exn:fail? void]) (close-output-port outport*))
-          (set! outport #f))
-        (when inport*
-          (with-handlers ([exn:fail? void]) (close-input-port inport*))
-          (set! inport #f))))
-
-    ;; connected? : -> boolean
-    (define/override (connected?)
-      (let ([outport outport])
-        (and outport (not (port-closed? outport)))))
-
-    (define/public (get-dbsystem)
-      dbsystem)
-
-    ;; ========================================
-
-    ;; == Connect
-
-    ;; attach-to-ports : input-port output-port -> void
-    (define/public (attach-to-ports in out)
-      (set! inport in)
-      (set! outport out))
-
-    ;; start-connection-protocol : string/#f string string/#f -> void
-    (define/public (start-connection-protocol dbname username password ssl ssl-context)
-      (fresh-exchange)
-      (let ([r (recv 'mysql-connect 'handshake)])
-        (match r
-          [(struct handshake-packet (pver sver tid scramble capabilities charset status auth))
-           (check-required-flags capabilities)
-           (unless (member auth '("mysql_native_password" #f))
-             (error* 'mysql-connect "back end requested unsupported authentication plugin"
-                     '("plugin" value) auth))
-           (define do-ssl?
-             (and (case ssl ((yes optional) #t) ((no) #f))
-                  (memq 'ssl capabilities)))
-           (when (and (eq? ssl 'yes) (not do-ssl?))
-             (error 'mysql-connect "back end refused SSL connection"))
-           (define wanted-capabilities (desired-capabilities capabilities do-ssl? dbname))
-           (when do-ssl?
-             (send-message (make-abbrev-client-auth-packet wanted-capabilities))
-             (let-values ([(sin sout)
-                           (ports->ssl-ports inport outport
-                                             #:mode 'connect
-                                             #:context ssl-context
-                                             #:close-original? #t)])
-               (attach-to-ports sin sout)))
-           (authenticate wanted-capabilities username password dbname
-                         (or auth "mysql_native_password") scramble)]
-          [_ (error/comm 'mysql-connect "during authentication")])))
-
-    (define/private (authenticate capabilities username password dbname auth-plugin scramble)
-      (let loop ([auth-plugin auth-plugin] [scramble scramble] [first? #t])
-        (define (auth data)
-          (if first?
-              (make-client-auth-packet capabilities MAX-ALLOWED-PACKET 'utf8-general-ci
-                                       username data dbname auth-plugin)
-              (make-auth-followup-packet data)))
-        (cond [(equal? auth-plugin "mysql_native_password")
-               (send-message (auth (scramble-password scramble password)))]
-              [(equal? auth-plugin "mysql_old_password")
-               (send-message (auth (bytes-append (old-scramble-password scramble password)
-                                                 (bytes 0))))]
-              [else (error* 'mysql-connect "back end does not support authentication plugin"
-                            '("plugin" value) auth-plugin)])
-        (match (recv 'mysql-connect 'auth)
-          [(struct ok-packet (_ _ status warnings message))
-           (after-connect)]
-          [(struct change-plugin-packet (plugin data))
-           ;; if plugin = #f, means "mysql_old_password"
-           (loop (or plugin "mysql_old_password") (or data scramble) #f)])))
-
-    (define/private (check-required-flags capabilities)
-      (for-each (lambda (rf)
-                  (unless (memq rf capabilities)
-                    (error* 'mysql-connect "server does not support required capability"
-                            "capability" rf)))
-                REQUIRED-CAPABILITIES))
-
-    (define/private (desired-capabilities capabilities ssl? dbname)
-      (append (if ssl?   '(ssl)             '())
-              (if dbname '(connect-with-db) '())
-              '(interactive)
-              (filter (lambda (c) (memq c DESIRED-CAPABILITIES)) capabilities)))
-
-    ;; Set connection to use utf8 encoding
-    (define/private (after-connect)
-      (query 'mysql-connect "set names 'utf8'" #f)
-      (void))
-
-    ;; ========================================
-
-    ;; == Query
-
-    ;; query : symbol Statement boolean -> QueryResult
-    (define/public (query fsym stmt cursor?)
-      (let ([result
-             (call-with-lock fsym
-               (lambda ()
-                 (check-valid-tx-status fsym)
-                 (let* ([stmt (check-statement fsym stmt cursor?)]
-                        [stmt-type
-                         (cond [(statement-binding? stmt)
-                                (send (statement-binding-pst stmt) get-stmt-type)]
-                               [(string? stmt)
-                                (classify-my-sql stmt)])])
-                   (check-statement/tx fsym stmt-type)
-                   (begin0 (query1 fsym stmt cursor? #t)
-                     (statement:after-exec stmt #f)))))])
-        (query1:process-result fsym result)))
-
-    ;; query1 : symbol Statement -> QueryResult
-    (define/private (query1 fsym stmt cursor? warnings?)
-      (let ([delenda (check/invalidate-cache stmt)])
-        (when delenda
-          (for ([(_sql pst) (in-hash delenda)])
-            (free-statement pst #f))))
-      (let ([wbox (and warnings? (box 0))])
-        (fresh-exchange)
-        (query1:enqueue stmt cursor?)
-        (begin0 (call-with-sync fsym
-                  (lambda () (query1:collect fsym stmt (not (string? stmt)) cursor? wbox)))
-          (when (and warnings? (not (zero? (unbox wbox))))
-            (fetch-warnings fsym)))))
-
-    ;; check-statement : symbol any boolean -> statement-binding
-    ;; For cursor, need to clone pstmt, because only one cursor can be
-    ;; open for a statement at a time. (Could delay clone until
-    ;; needed, but that seems more complicated.)
-    (define/private (check-statement fsym stmt cursor?)
-      (cond [(statement-binding? stmt)
-             (let ([pst (statement-binding-pst stmt)])
-               (send pst check-owner fsym this stmt)
-               (for ([typeid (in-list (send pst get-result-typeids))])
-                 (unless (supported-result-typeid? typeid)
-                   (error/unsupported-type fsym typeid)))
-               (cond [cursor?
-                      (let ([pst* (prepare1 fsym (send pst get-stmt) #f)])
-                        (statement-binding pst* (statement-binding-params stmt)))]
-                     [else stmt]))]
-            [(and (string? stmt) (force-prepare-sql? fsym stmt))
-             (let ([pst (prepare1 fsym stmt (not cursor?))])
-               (check-statement fsym (send pst bind fsym null) #f))]
-            [else stmt]))
-
-    ;; query1:enqueue : statement -> void
-    (define/private (query1:enqueue stmt cursor?)
-      (cond [(statement-binding? stmt)
-             (let* ([pst (statement-binding-pst stmt)]
-                    [id (send pst get-handle)]
-                    [params (statement-binding-params stmt)]
-                    [param-count (length params)]
-                    [null-map (map sql-null? params)]
-                    [flags (if cursor? '(cursor/read-only) '())])
-               ;; Assume max_packet_length = 16M = 2^24,
-               ;; overhead of 20 bytes for other packet fields.
-               ;; Oversimplified param size estimate:
-               ;;   - 20 bytes per param (fixed size <= 20, string length code <= 20)
-               ;;   - bytes-length for bytes, 4*string-length for strings
-               ;; Use long data for any param that takes more than its "fair share".
-               (define (param-size p)
-                 (cond [(string? p) (* 4 (string-length p))]
-                       [(bytes? p) (bytes-length p)]
-                       [else 0]))
-               (let* ([space (- (expt 2 24) 20 (* 20 param-count))]
-                      [var-param-size (for/sum ([p (in-list params)]) (param-size p))])
-                 (cond [(and (< var-param-size space))
-                        (buffer-message (make-execute-packet id flags null-map params))]
-                       [else
-                        (let* ([var-param-count
-                                (for/sum ([p (in-list params)]
-                                          #:when (or (string? p) (bytes? p)))
-                                  1)]
-                               [fair-share (floor (/ space (max 1 var-param-count)))]
-                               [param+evict-list
-                                (for/list ([p (in-list params)])
-                                  (cons p (> (param-size p) fair-share)))]
-                               [short-params
-                                (for/list ([p+e (in-list param+evict-list)])
-                                  (let ([p (car p+e)])
-                                    (if (cdr p+e)
-                                        (if (string? p) 'long-string 'long-binary)
-                                        p)))])
-                          (for ([p+e (in-list param+evict-list)]
-                                [param-id (in-naturals)]
-                                #:when (cdr p+e))
-                            (let* ([p (car p+e)]
-                                   [pb (if (string? p) (string->bytes/utf-8 p) p)]
-                                   [pblen (bytes-length pb)]
-                                   [CHUNK #e1e6])
-                              (let chunkloop ([sent 0])
-                                (when (< sent pblen)
-                                  (let ([next (min pblen (+ sent CHUNK))])
-                                    (buffer-message
-                                     (make-long-data-packet id param-id (subbytes pb sent next)))
-                                    (fresh-exchange)
-                                    (chunkloop next))))))
-                          (buffer-message (make-execute-packet id flags null-map short-params)))])))]
-            [else ;; string
-             (buffer-message (make-command-packet 'query stmt))]))
-
-    ;; query1:collect : symbol bool -> QueryResult stream
-    (define/private (query1:collect fsym stmt binary? cursor? wbox)
-      (let ([r (recv fsym 'result)])
-        (match r
-          [(struct ok-packet (affected-rows insert-id status warnings message))
-           (when wbox (set-box! wbox warnings))
-           (vector 'command `((affected-rows . ,affected-rows)
-                              (insert-id . ,(if (zero? insert-id) #f insert-id))
-                              (status . ,status)
-                              (message . ,message)))]
-          [(struct result-set-header-packet (fields extra))
-           (let* ([field-dvecs (query1:get-fields fsym binary?)])
-             (if cursor?
-                 (vector 'cursor field-dvecs (statement-binding-pst stmt))
-                 (vector 'rows
-                         field-dvecs
-                         (query1:get-rows fsym field-dvecs binary? wbox #f))))])))
-
-    (define/private (query1:get-fields fsym binary?)
-      (let ([r (recv fsym 'field)])
-        (match r
-          [(? field-packet?)
-           (cons (parse-field-dvec r) (query1:get-fields fsym binary?))]
-          [(struct eof-packet (warning status))
-           null])))
-
-    (define/private (query1:get-rows fsym field-dvecs binary? wbox end-box)
-      ;; Note: binary? should always be #t, unless force-prepare-sql? misses something.
-      (let ([r (recv fsym (if binary? 'binary-data 'data) field-dvecs)])
-        (match r
-          [(struct row-data-packet (data))
-           (cons data (query1:get-rows fsym field-dvecs binary? wbox end-box))]
-          [(struct binary-row-data-packet (data))
-           (cons data (query1:get-rows fsym field-dvecs binary? wbox end-box))]
-          [(struct eof-packet (warnings status))
-           (when wbox (set-box! wbox warnings))
-           (when (and end-box (bitwise-bit-set? status 7)) ;; 'last-row-sent
-             (set-box! end-box #t))
-           null])))
-
-    (define/private (query1:process-result fsym result)
-      (match result
-        [(vector 'rows field-dvecs rows)
-         (rows-result (map field-dvec->field-info field-dvecs) rows)]
-        [(vector 'command command-info)
-         (simple-result command-info)]
-        [(vector 'cursor field-dvecs pst)
-         (cursor-result (map field-dvec->field-info field-dvecs)
-                        pst
-                        (list field-dvecs (box #f)))]))
-
-    ;; == Cursor
-
-    (define/public (fetch/cursor fsym cursor fetch-size)
-      (let ([pst (cursor-result-pst cursor)]
-            [extra (cursor-result-extra cursor)])
-        (send pst check-owner fsym this pst)
-        (let ([field-dvecs (car extra)]
-              [end-box (cadr extra)])
-          (call-with-lock fsym
-            (lambda ()
-              (cond [(unbox end-box)
-                     #f]
-                    [else
-                     (let ([wbox (box 0)])
-                       (fresh-exchange)
-                       (buffer-message (make-fetch-packet (send pst get-handle) fetch-size))
-                       (begin0 (call-with-sync fsym
-                                 (lambda () (query1:get-rows fsym field-dvecs #t wbox end-box)))
-                         (when (not (zero? (unbox wbox)))
-                           (fetch-warnings fsym))))]))))))
-
-    ;; == Prepare
-
-    (define/override (classify-stmt sql) (classify-my-sql sql))
-
-    (define/override (prepare1* fsym stmt close-on-exec? stmt-type)
-      (fresh-exchange)
-      (buffer-message (make-command-packet 'statement-prepare stmt))
-      (call-with-sync fsym
-        (lambda ()
-          (let ([r (recv fsym 'prep-ok)])
-            (match r
-              [(struct ok-prepared-statement-packet (id fields params))
-               (let ([param-dvecs
-                      (if (zero? params) null (prepare1:get-field-descriptions fsym))]
-                     [field-dvecs
-                      (if (zero? fields) null (prepare1:get-field-descriptions fsym))])
-                 (new prepared-statement%
-                      (handle id)
-                      (close-on-exec? close-on-exec?)
-                      (param-typeids (map field-dvec->typeid param-dvecs))
-                      (result-dvecs field-dvecs)
-                      (stmt stmt)
-                      (stmt-type stmt-type)
-                      (owner this)))])))))
-
-    (define/private (prepare1:get-field-descriptions fsym)
-      (let ([r (recv fsym 'field)])
-        (match r
-          [(struct eof-packet (warning-count status))
-           null]
-          [(? field-packet?)
-           (cons (parse-field-dvec r) (prepare1:get-field-descriptions fsym))])))
-
-    (define/public (get-base) this)
-
-    (define/public (free-statement pst need-lock?)
-      ;; Important: *buffer* statement-close message, but do not send (ie, flush).
-      ;; That way, message included in same TCP packet as next query message, avoiding
-      ;; write-write-read TCP packet sequence, Nagle's algorithm & delayed ACK issue.
-      (define (do-free-statement)
-        (let ([id (send pst get-handle)])
-          (when (and id outport) ;; outport = connected?
-            (send pst set-handle #f)
-            (fresh-exchange)
-            (buffer-message (make-command:statement-packet 'statement-close id)))))
-      (if need-lock?
-          (call-with-lock* 'free-statement do-free-statement void #f)
-          (do-free-statement)))
-
-    ;; == Warnings
-
-    (define/private (fetch-warnings fsym)
-      (unless (eq? notice-handler void)
-        (let ([result (query1 fsym "SHOW WARNINGS" #f #f)])
-          (define (find-index name dvecs)
-            (for/or ([dvec (in-list dvecs)]
-                     [i (in-naturals)])
-              (and (equal? (field-dvec->name dvec) name) i)))
-          (match result
-            [(vector 'rows field-dvecs rows)
-             (let ([code-index (find-index "Code" field-dvecs)]
-                   [message-index (find-index "Message" field-dvecs)])
-               (for ([row (in-list rows)])
-                 (let ([code (string->number (vector-ref row code-index))]
-                       [message (vector-ref row message-index)])
-                   (add-delayed-call! (lambda () (notice-handler code message))))))]))))
-
-    ;; == Transactions
-
-    ;; MySQL: what causes implicit commit, when is transaction rolled back
-    ;;   http://dev.mysql.com/doc/refman/5.1/en/implicit-commit.html
-    ;;   http://dev.mysql.com/doc/refman/5.1/en/innodb-error-handling.html
-    ;;   http://dev.mysql.com/doc/refman/5.1/en/innodb-error-codes.html
-    ;;
-    ;; Sounds like MySQL rolls back transaction (but may keep open!) on
-    ;;   - transaction deadlock = 1213 (ER_LOCK_DEADLOCK)
-    ;;   - lock wait timeout (depends on config) = 1205 (ER_LOCK_WAIT_TIMEOUT)
-
-    (define/override (start-transaction* fsym isolation option)
-      (cond [(eq? isolation 'nested)
-             (let ([savepoint (generate-name)])
-               (query1 fsym (format "SAVEPOINT ~a" savepoint) #f #t)
-               savepoint)]
-            [else
-             (let ([isolation-level (isolation-symbol->string isolation)])
-               (when option
-                 ;; No options supported
-                 (raise-argument-error fsym "#f" option))
-               (when isolation-level
-                 (query1 fsym (format "SET TRANSACTION ISOLATION LEVEL ~a" isolation-level) #f #t))
-               (query1 fsym "START TRANSACTION" #f #t)
-               #f)]))
-
-    (define/override (end-transaction* fsym mode savepoint)
-      (case mode
-        ((commit)
-         (cond [savepoint
-                (query1 fsym (format "RELEASE SAVEPOINT ~a" savepoint) #f #t)]
-               [else
-                (query1 fsym "COMMIT" #f #t)]))
-        ((rollback)
-         (cond [savepoint
-                (query1 fsym (format "ROLLBACK TO SAVEPOINT ~a" savepoint) #f #t)
-                (query1 fsym (format "RELEASE SAVEPOINT ~a" savepoint) #f #t)]
-               [else
-                (query1 fsym "ROLLBACK" #f #t)])))
-      (void))
-
-    ;; name-counter : number
-    (define name-counter 0)
-
-    ;; generate-name : -> string
-    (define/private (generate-name)
-      (let ([n name-counter])
-        (set! name-counter (add1 name-counter))
-        (format "λmz_~a" n)))
-
-    ;; Reflection
-
-    (define/public (list-tables fsym schema)
-      (let* ([stmt
-              ;; schema is ignored; search = current
-              (string-append "SELECT table_name FROM information_schema.tables "
-                             "WHERE table_schema = schema()")]
-             [rows
-              (vector-ref (call-with-lock fsym (lambda () (query1 fsym stmt #f #t))) 2)])
-        (for/list ([row (in-list rows)])
-          (vector-ref row 0))))
-
-    ))
-
-;; ========================================
-
-;; mysql-password-hash : string -> string
-(define (mysql-password-hash password)
-  (bytes->hex-string (password-hash password)))
-
-;; scramble-password : bytes string -> bytes
-(define (scramble-password scramble password)
-  (and scramble password
-       (let* ([stage1 (cond [(string? password) (password-hash password)]
-                            [(pair? password) (hex-string->bytes (cadr password))])]
-              [stage2 (sha1-bytes (open-input-bytes stage1))]
-              [stage3 (sha1-bytes (open-input-bytes (bytes-append scramble stage2)))]
-              [reply (bytes-xor stage1 stage3)])
-         reply)))
-
-;; password-hash : string -> bytes
-(define (password-hash password)
-  (let* ([password (string->bytes/latin-1 password)]
-         [stage1 (sha1-bytes (open-input-bytes password))])
-    stage1))
-
-;; bytes-xor : bytes bytes -> bytes
-;; Assumes args are same length
-(define (bytes-xor a b)
-  (let ([c (make-bytes (bytes-length a))])
-    (let loop ([i 0])
-      (when (< i (bytes-length c))
-        (bytes-set! c i
-                    (bitwise-xor (bytes-ref a i) (bytes-ref b i)))
-        (loop (add1 i))))
-    c))
-
-;; =======================================
-
-(provide old-scramble-password
-         hash323
-         hash323->string)
-
-(define (old-scramble-password scramble password)
-  (define (xor a b) (bitwise-xor a b))
-  (define RMAX #x3FFFFFFF)
-  (and scramble password
-       (let* ([scramble (subbytes scramble 0 8)]
-              [password (string->bytes/utf-8 password)]
-              [hp (hash323 password)]
-              [hm (hash323 scramble)]
-              [r1 (modulo (xor (car hp) (car hm)) RMAX)]
-              [r2 (modulo (xor (cdr hp) (cdr hm)) RMAX)]
-              [out (make-bytes 8 0)])
-         (define (rnd)
-           (set! r1 (modulo (+ (* 3 r1) r2) RMAX))
-           (set! r2 (modulo (+ r1 r2 33) RMAX))
-           (/ (exact->inexact r1) (exact->inexact RMAX)))
-         (for ([i (in-range (bytes-length scramble))])
-           (let ([b (+ (inexact->exact (floor (* (rnd) 31))) 64)])
-             (bytes-set! out i b)
-             (values r1 r2)))
-         (let ([extra (inexact->exact (floor (* (rnd) 31)))])
-           (for ([i (in-range (bytes-length scramble))])
-             (bytes-set! out i (xor (bytes-ref out i) extra))))
-         out)))
-
-(define (hash323 bs)
-  (define (xor a b) (bitwise-xor a b))
-  (define-syntax-rule (normalize! var)
-    (set! var (bitwise-and var (sub1 (arithmetic-shift 1 64)))))
-  (let ([nr 1345345333]
-        [add 7]
-        [nr2 #x12345671])
-    (for ([i (in-range (bytes-length bs))]
-          #:when (not (memv (bytes-ref bs i) '(#\space #\tab))))
-      (let ([tmp (bytes-ref bs i)])
-        (set! nr  (xor nr
-                       (+ (* (+ (bitwise-and nr 63) add) tmp)
-                          (arithmetic-shift nr 8))))
-        (normalize! nr)
-        (set! nr2 (+ nr2
-                     (xor (arithmetic-shift nr2 8) nr)))
-        (normalize! nr2)
-        (set! add (+ add tmp))
-        (normalize! add)))
-    (cons (bitwise-and nr  (sub1 (arithmetic-shift 1 31)))
-          (bitwise-and nr2 (sub1 (arithmetic-shift 1 31))))))
-
-(define (hash323->string bs)
-  (let ([p (hash323 bs)])
-    (bytes-append (integer->integer-bytes (car p) 4 #f #f)
-                  (integer->integer-bytes (cdr p) 4 #f #f))))
-
-;; ========================================
-
-(define REQUIRED-CAPABILITIES
-  '(long-flag
-    connect-with-db
-    protocol-41
-    secure-connection))
-
-(define DESIRED-CAPABILITIES
-  '(long-password
-    long-flag
-    transactions
-    protocol-41
-    secure-connection
-    plugin-auth))
-
-;; raise-backend-error : symbol ErrorPacket -> raises exn
-(define (raise-backend-error who r)
-  (define code (error-packet-sqlstate r))
-  (define message (error-packet-message r))
-  (define props (list (cons 'errno (error-packet-errno r))
-                      (cons 'code code)
-                      (cons 'message message)))
-  (raise-sql-error who code message props))
-
-;; ========================================
-
-#|
-MySQL allows only certain kinds of statements to be prepared; the rest
-must go through the old execution path. See here:
-  http://dev.mysql.com/doc/refman/5.0/en/c-api-prepared-statements.html
-According to that page, the following statements may be prepared:
-
-  CALL, CREATE TABLE, DELETE, DO, INSERT, REPLACE, SELECT, SET, UPDATE,
-  and most SHOW statements
-
-On the other hand, we want to force all rows-returning statements
-through the prepared-statement path to use the binary data
-protocol. That would seem to be the following:
-
-  SELECT and SHOW
-|#
-
-(define (force-prepare-sql? fsym stmt)
-  (memq (classify-my-sql stmt) '(select show)))
diff --git a/pkgs/db-pkgs/db-lib/db/private/mysql/dbsystem.rkt b/pkgs/db-pkgs/db-lib/db/private/mysql/dbsystem.rkt
deleted file mode 100644
index f623c4b409..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/mysql/dbsystem.rkt
+++ /dev/null
@@ -1,153 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/match
-         db/private/generic/interfaces
-         db/private/generic/common
-         db/private/generic/sql-data
-         "../../util/private/geometry.rkt"
-         (only-in "message.rkt" field-dvec->typeid field-dvec->flags))
-(provide dbsystem
-         classify-my-sql)
-
-(define mysql-dbsystem%
-  (class* dbsystem-base% (dbsystem<%>)
-
-    (define/public (get-short-name) 'mysql)
-    (define/override (get-type-list) type-list)
-
-    (define/public (has-support? option)
-      (case option
-        ((real-infinities) #f)
-        ((numeric-infinities) #f)
-        (else #f)))
-
-    (define/public (get-parameter-handlers param-typeids)
-      ;; All params sent as binary data, so handled in message.rkt
-      ;; Just need to check params for legal values here
-      ;; FIXME: for now, only possible param type is var-string;
-      ;; when that changes, will need to refine check-param.
-      (map (lambda (param-typid) check-param)
-           param-typeids))
-
-    (define/public (field-dvecs->typeids dvecs)
-      (map field-dvec->typeid dvecs))
-
-    (define/public (describe-params typeids)
-      (for/list ([_typeid (in-list typeids)])
-        '(#t any #f)))
-
-    (define/public (describe-fields dvecs)
-      (for/list ([dvec (in-list dvecs)])
-        (let ([r (describe-typeid (field-dvec->typeid dvec))])
-          (match r
-            [(list supported? type typeid)
-             (let* ([binary? (memq 'binary (field-dvec->flags dvec))]
-                    [type* (case type
-                             ((tinyblob)   (if binary? type 'tinytext))
-                             ((blob)       (if binary? type 'text))
-                             ((mediumblob) (if binary? type 'mediumtext))
-                             ((longblob)   (if binary? type 'longtext))
-                             ((var-string) (if binary? 'var-binary type))
-                             (else         type))])
-               (if (eq? type* type)
-                   r
-                   (list supported? type* typeid)))]))))
-
-    (super-new)))
-
-(define dbsystem
-  (new mysql-dbsystem%))
-
-
-;; ========================================
-
-(define (check-param fsym param)
-  (unless (or (string? param)
-              (rational? param)
-              (bytes? param)
-              (sql-date? param)
-              (sql-time? param)
-              (sql-timestamp? param)
-              (sql-day-time-interval? param)
-              (sql-bits? param)
-              (geometry2d? param))
-    (error/no-convert fsym "MySQL" "parameter" param))
-  param)
-
-;; ========================================
-
-;; SQL "parsing"
-;; We care about:
-;;  - determining whether commands must be prepared (to use binary data)
-;;    see http://dev.mysql.com/doc/refman/5.0/en/c-api-prepared-statements.html
-;;  - determining what statements are safe for the statement cache
-;;  - detecting commands that affect transaction status (maybe implicitly)
-;;    see http://dev.mysql.com/doc/refman/5.0/en/implicit-commit.html
-
-;; classify-my-sql : string [nat] -> symbol/#f
-(define classify-my-sql
-  (make-sql-classifier #:hash-comments? #t
-   '(;; Must be prepared
-     ("SELECT"            select)
-     ("SHOW"              show)
-
-     ;; Do not invalidate statement cache
-     ("INSERT"            insert)
-     ("DELETE"            delete)
-     ("UPDATE"            update)
-
-     ;; Explicit transaction commands
-     ("ROLLBACK WORK TO"  rollback-savepoint)
-     ("ROLLBACK TO"       rollback-savepoint)
-     ("RELEASE SAVEPOINT" release-savepoint)
-     ("SAVEPOINT"         savepoint)
-     ("START TRANSACTION" start)
-     ("BEGIN"             start)
-     ("COMMIT"            commit)
-     ("ROLLBACK"          rollback) ;; Note: after ROLLBACK TO, etc
-     ("SET autocommit"    set-autocommit) ;; trouble
-     ;; Note: commit/rollback may immediately start new transaction
-
-     ;; Implicit commit
-     ("ALTER"             implicit-commit)
-     ("CREATE"            implicit-commit)
-     ("DROP"              implicit-commit)
-     ("RENAME"            implicit-commit)
-     ("TRUNCATE"          implicit-commit)
-     ("LOAD"              implicit-commit)
-     ("LOCK TABLES"       implicit-commit)
-     ("UNLOCK TABLES"     implicit-commit))))
-
-;; ========================================
-
-(define-type-table (type-list*
-                    typeid->type
-                    describe-typeid)
-
-  (newdecimal  decimal     0)
-  (tiny        tinyint     0)
-  (short       smallint    0)
-  (int24       mediumint   0)
-  (long        integer     0)
-  (longlong    bigint      0)
-  (float       real        0)
-  (double      double      0)
-  (newdate     date        0)
-  (time        time        0)
-  (datetime    datetime    0)
-  (varchar     varchar     0)
-  (string      character   0)
-  (var-string  var-string  0)
-  (tiny-blob   tinyblob    0)
-  (medium-blob mediumblob  0)
-  (long-blob   longblob    0)
-  (blob        blob        0)
-  (bit         bit         0)
-  (geometry    geometry    0))
-
-(define type-list
-  (append (map (lambda (t) (list t 0))
-               '(tinytext text mediumtext longtext var-binary))
-          type-list*))
-
-;; decimal, date typeids not used (?)
diff --git a/pkgs/db-pkgs/db-lib/db/private/mysql/main.rkt b/pkgs/db-pkgs/db-lib/db/private/mysql/main.rkt
deleted file mode 100644
index 39f1ae940b..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/mysql/main.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/tcp
-         openssl
-         db/private/generic/interfaces
-         db/private/generic/common
-         unstable/socket
-         "connection.rkt")
-(provide mysql-connect
-         mysql-guess-socket-path
-         mysql-password-hash)
-
-(define (mysql-connect #:user user
-                       #:database [database #f]
-                       #:password [password #f]
-                       #:server [server #f]
-                       #:port [port #f]
-                       #:socket [socket #f]
-                       #:ssl [ssl 'no]
-                       #:ssl-context [ssl-context
-                                      (case ssl
-                                        ((no) #f)
-                                        (else (ssl-make-client-context)))]
-                       #:notice-handler [notice-handler void]
-                       #:debug? [debug? #f])
-  (let ([connection-options
-         (+ (if (or server port) 1 0)
-            (if socket 1 0))])
-    (when (> connection-options 1)
-      (error 'mysql-connect "cannot give both server/port and socket arguments")))
-  (let* ([notice-handler
-          (cond [(procedure? notice-handler) notice-handler]
-                [else (make-print-notice notice-handler)])]
-         [c (new connection% (notice-handler notice-handler))])
-    (when debug? (send c debug #t))
-    (cond [socket
-           (let ([socket (if (eq? socket 'guess)
-                             (mysql-guess-socket-path)
-                             socket)])
-             (let-values ([(in out) (unix-socket-connect socket)])
-               (send c attach-to-ports in out)))]
-          [else
-           (let ([server (or server "localhost")]
-                 [port (or port 3306)])
-             (let-values ([(in out) (tcp-connect server port)])
-               (send c attach-to-ports in out)))])
-    (send c start-connection-protocol database user password ssl ssl-context)
-    c))
-
-;; make-print-notification : output-port -> number string -> void
-(define ((make-print-notice out) code condition)
-  (fprintf (case out
-             ((output) (current-output-port))
-             ((error) (current-error-port))
-             (else out))
-           "notice: ~a (MySQL code ~a)\n" condition code))
-
-(define socket-paths
-  (case (system-type)
-    ((unix) '("/var/run/mysqld/mysqld.sock"))
-    (else '())))
-
-(define (mysql-guess-socket-path)
-  (guess-socket-path/paths 'mysql-guess-socket-path socket-paths))
diff --git a/pkgs/db-pkgs/db-lib/db/private/mysql/message.rkt b/pkgs/db-pkgs/db-lib/db/private/mysql/message.rkt
deleted file mode 100644
index ef8f273093..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/mysql/message.rkt
+++ /dev/null
@@ -1,1076 +0,0 @@
-#|
-Based on protocol documentation here:
-  http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol
-|#
-
-#lang racket/base
-(require racket/match
-         racket/port
-         db/private/generic/sql-data
-         db/private/generic/interfaces
-         "../../util/private/geometry.rkt")
-(provide write-packet
-         parse-packet
-
-         packet?
-         (struct-out handshake-packet)
-         (struct-out change-plugin-packet)
-         (struct-out client-auth-packet)
-         (struct-out abbrev-client-auth-packet)
-         (struct-out auth-followup-packet)
-         (struct-out command-packet)
-         (struct-out command:statement-packet)
-         (struct-out command:change-user-packet)
-         (struct-out ok-packet)
-         (struct-out error-packet)
-         (struct-out result-set-header-packet)
-         (struct-out field-packet)
-         (struct-out eof-packet)
-         (struct-out row-data-packet)
-         (struct-out binary-row-data-packet)
-         (struct-out ok-prepared-statement-packet)
-         (struct-out long-data-packet)
-         (struct-out execute-packet)
-         (struct-out fetch-packet)
-         (struct-out unknown-packet)
-
-         supported-result-typeid?
-         parse-field-dvec
-         field-dvec->name
-         field-dvec->typeid
-         field-dvec->flags
-         field-dvec->field-info)
-
-;; MAX-PACKET-SIZE is the largest packet that the MySQL protocol can
-;; transmit. Longer data row "packets" can be split into multiple actual
-;; packets (see comments on data rows, below).
-(define MAX-PACKET-SIZE (sub1 (expt 2 24)))
-
-#|
-Note: There is also a max_allowed_packet server variable (and client connection
-variable???) that controls things like how long a data row can be and how long a
-computed string on the server can be. See also:
-
-  - http://bugs.mysql.com/bug.php?id=22853
-    (note, the "workaround" didn't work for me; data was still truncated)
-  - http://www.perlmonks.org/?node_id=150255
-|#
-
-;; WRITING FUNCTIONS
-
-(define (io:write-byte port byte)
-  (write-byte byte port))
-
-(define (io:write-bytes port bytes)
-  (write-bytes bytes port))
-
-(define (io:write-null-terminated-bytes port bytes)
-  (write-bytes bytes port)
-  (write-byte 0 port))
-
-(define (io:write-null-terminated-string port string)
-  (write-string string port)
-  (write-byte 0 port))
-
-(define (io:write-le-int16 port n [signed? #f])
-  (write-bytes (integer->integer-bytes n 2 signed? #f) port))
-
-(define (io:write-le-int24 port n)
-  (write-bytes (subbytes (integer->integer-bytes n 4 #f #f) 0 3)
-                       port))
-
-(define (io:write-le-int32 port n [signed? #f])
-  (write-bytes (integer->integer-bytes n 4 signed? #f) port))
-
-(define (io:write-le-int64 port n [signed? #f])
-  (write-bytes (integer->integer-bytes n 8 signed? #f) port))
-
-(define (io:write-le-intN port count n)
-  (let loop ([count count] [n n])
-    (when (positive? count)
-      (io:write-byte port (bitwise-and #xFF n))
-      (loop (sub1 count) (arithmetic-shift n -8)))))
-
-(define (io:write-length-code port n)
-  (cond [(<= n 250) (io:write-byte port n)]
-        [(<= n #xFFFF)
-         (io:write-byte port 252)
-         (io:write-le-int16 port n)]
-        [(<= n #xFFFFFF)
-         (io:write-byte port 253)
-         (io:write-le-int24 port n)]
-        [(<= n #xFFFFFFFF)
-         (io:write-byte port 253)
-         (io:write-le-int32 port n)]
-        [else
-         (io:write-byte port 254)
-         (io:write-le-int64 port n)]))
-
-(define (io:write-length-coded-bytes port b)
-  (io:write-length-code port (bytes-length b))
-  (io:write-bytes port b))
-
-(define (io:write-length-coded-string port s)
-  (io:write-length-coded-bytes port (string->bytes/utf-8 s)))
-
-;; READING
-
-(define (io:read-null-terminated-bytes port)
-  (let [(strport (open-output-bytes))]
-    (let loop ()
-      (let ([next (read-byte port)])
-        (cond [(eof-object? next)
-               (error/comm 'io:read-null-terminated-bytes "(unexpected EOF)")]
-              [(zero? next)
-               (get-output-bytes strport)]
-              [else
-               (write-byte next strport)
-               (loop)])))))
-
-(define (io:read-null-terminated-string port)
-  (bytes->string/utf-8 (io:read-null-terminated-bytes port)))
-
-(define (io:read-byte port)
-  (read-byte port))
-
-(define (io:read-bytes-as-bytes port n)
-  (read-bytes n port))
-
-(define (io:read-bytes-as-string port n)
-  (bytes->string/utf-8 (read-bytes n port)))
-
-(define (io:read-le-int16 port [signed? #f])
-  (integer-bytes->integer (read-bytes 2 port) signed? #f))
-
-(define (io:read-le-int24 port)
-  (io:read-le-intN port 3))
-
-(define (io:read-le-int32 port [signed? #f])
-  (integer-bytes->integer (read-bytes 4 port) signed? #f))
-
-(define (io:read-le-int64 port [signed? #f])
-  (integer-bytes->integer (read-bytes 8 port) signed? #f))
-
-(define (io:read-le-intN port count)
-  (case count
-    ((2) (io:read-le-int16 port))
-    ((4) (io:read-le-int32 port))
-    (else
-     (let ([b (read-bytes count port)])
-       (unless (and (bytes? b) (= count (bytes-length b)))
-         (error/internal 'io:read-le-intN "unexpected eof; got ~s" b))
-       (let loop ([pos 0])
-         (if (< pos count)
-             (+ (arithmetic-shift (loop (add1 pos)) 8)
-                (bytes-ref b pos))
-             0))))))
-
-(define (io:read-length-code port)
-  (let ([first (read-byte port)])
-    (cond [(<= first 250)
-           first]
-          [(= first 251)
-           ;; Indicates NULL record
-           #f]
-          [(= first 252)
-           (io:read-le-int16 port)]
-          [(= first 253)
-           (io:read-le-int24 port)]
-          [(= first 254)
-           (io:read-le-intN port 8)])))
-
-(define (io:read-length-coded-bytes port)
-  (let ([len (io:read-length-code port)])
-    (and len (read-bytes len port))))
-
-(define (io:read-length-coded-string port)
-  (let ([b (io:read-length-coded-bytes port)])
-    (and b (bytes->string/utf-8 b))))
-
-(define (io:read-bytes-to-eof port)
-  (let loop ([acc null])
-    (let ([next (read-bytes 1024 port)])
-      (if (eof-object? next)
-          (apply bytes-append (reverse acc))
-          (loop (cons next acc))))))
-
-;; ========================================
-
-(define-struct packet () #:transparent)
-
-(define-struct (handshake-packet packet)
-  (protocol-version
-   server-version
-   thread-id
-   scramble
-   server-capabilities
-   charset
-   server-status
-   auth)
-  #:transparent)
-
-(define-struct (client-auth-packet packet)
-  (client-flags
-   max-packet-length
-   charset
-   user
-   scramble
-   database
-   plugin)
-  #:transparent)
-
-(define-struct (abbrev-client-auth-packet packet)
-  (client-flags)
-  #:transparent)
-
-(define-struct (auth-followup-packet packet)
-  (data)
-  #:transparent)
-
-(define-struct (command-packet packet)
-  (command
-   argument)
-  #:transparent)
-
-(define-struct (command:statement-packet packet)
-  (command
-   argument)
-  #:transparent)
-
-(define-struct (command:change-user-packet packet)
-  (user
-   password
-   database
-   charset)
-  #:transparent)
-
-(define-struct (ok-packet packet)
-  (affected-rows
-   insert-id
-   server-status
-   warning-count
-   message)
-  #:transparent)
-
-(define-struct (error-packet packet)
-  (errno
-   sqlstate
-   message)
-  #:transparent)
-
-(define-struct (result-set-header-packet packet)
-  (field-count
-   extra)
-  #:transparent)
-
-(define-struct (field-packet packet)
-  (catalog
-   db
-   table
-   org-table
-   name
-   org-name
-   charset
-   length
-   type
-   flags
-   decimals
-   default)
-  #:transparent)
-
-(define-struct (eof-packet packet)
-  (warning-count
-   server-status)
-  #:transparent)
-
-(define-struct (row-data-packet packet)
-  (data)
-  #:transparent)
-
-(define-struct (binary-row-data-packet packet)
-  (data)
-  #:transparent)
-
-(define-struct (ok-prepared-statement-packet packet)
-  (statement-handler-id
-   result-count
-   parameter-count)
-  #:transparent)
-
-(define-struct (long-data-packet packet)
-  (statement-id
-   parameter-number
-   data)
-  #:transparent)
-
-(define-struct (execute-packet packet)
-  (statement-id
-   flags
-   null-map
-   params)
-  #:transparent)
-
-(define-struct (fetch-packet packet)
-  (statement-id
-   count)
-  #:transparent)
-
-(define-struct (change-plugin-packet packet)
-  (plugin
-   data)
-  #:transparent)
-
-(define-struct (unknown-packet packet)
-  (expected
-   contents)
-  #:transparent)
-
-(define (write-packet out p number)
-  (let ([o (open-output-bytes)])
-    (write-packet* o p)
-    (let ([b (get-output-bytes o)])
-      #| (printf "writing packet #~s, length ~s\n" number (bytes-length b)) |#
-      (io:write-le-int24 out (bytes-length b))
-      (io:write-byte out number)
-      (io:write-bytes out b))))
-
-(define (write-packet* out p)
-  (match p
-    [(struct abbrev-client-auth-packet (client-flags))
-     (io:write-le-int32 out (encode-server-flags client-flags))]
-    [(struct client-auth-packet (client-flags max-length charset user scramble database plugin))
-     (io:write-le-int32 out (encode-server-flags client-flags))
-     (io:write-le-int32 out max-length)
-     (io:write-byte out (encode-charset charset))
-     (io:write-bytes out (make-bytes 23 0))
-     (io:write-null-terminated-string out user)
-     (cond [(memq 'secure-connection client-flags)
-            (io:write-length-coded-bytes out (or scramble #""))]
-           [else ;; old-style scramble is *not* length-coded, but \0-terminated
-            (io:write-bytes out (or scramble (bytes 0)))])
-     (when (memq 'connect-with-db client-flags)
-       (io:write-null-terminated-string out database))
-     (when (memq 'plugin-auth client-flags)
-       (io:write-null-terminated-string out plugin))]
-    [(struct auth-followup-packet (data))
-     (io:write-bytes out data)]
-    [(struct command-packet (command arg))
-     (io:write-byte out (encode-command command))
-     (io:write-null-terminated-bytes out (string->bytes/utf-8 arg))]
-    [(struct command:statement-packet (command arg))
-     (io:write-byte out (encode-command command))
-     (io:write-le-int32 out arg)]
-    [(struct long-data-packet (statement-id parameter-number data))
-     (io:write-byte out (encode-command 'statement-send-long-data))
-     (io:write-le-int32 out statement-id)
-     (io:write-le-int16 out parameter-number)
-     (io:write-bytes out data)]
-    [(struct execute-packet
-             (statement-id flags null-map params))
-     (io:write-byte out (encode-command 'statement-execute))
-     (io:write-le-int32 out statement-id)
-     (io:write-byte out (encode-execute-flags flags))
-     (io:write-le-int32 out 1) ;; iterations = 1
-     (io:write-le-intN out
-                       (null-map-length null-map)
-                       (null-map->integer null-map))
-     (io:write-byte out 1) ;; first? = 1
-     (let ([param-types (map choose-param-type params)])
-       (for-each (lambda (pt) (io:write-le-int16 out (encode-type pt)))
-                 param-types)
-       (for-each (lambda (type param)
-                   (cond [(sql-null? param) (void)]
-                         [(eq? param 'long-string) (void)]
-                         [(eq? param 'long-binary) (void)]
-                         [else (write-binary-datum out type param)]))
-                 param-types params))]
-    [(struct fetch-packet (statement-id count))
-     (io:write-byte out (encode-command 'statement-fetch))
-     (io:write-le-int32 out statement-id)
-     (io:write-le-int32 out count)]))
-
-
-;; ----
-
-;; parse-packet : ... -> (values nat packet)
-;; In case of binary data row split over multiple packets, reads all packets for
-;; the data row, returns packet number of last packet as first return value.
-(define (parse-packet in expect field-dvecs)
-  (let* ([len (io:read-le-int24 in)]
-         [num (io:read-byte in)]
-         [bs (read-bytes len in)]
-         [inp (open-input-bytes bs)])
-    (let-values ([(msg-num msg) (parse-packet/1 num in inp expect len field-dvecs)])
-      (when (and (not (port-closed? inp)) (port-has-bytes? inp))
-        (error/internal* 'parse-packet "bytes left over after parsing packet"
-                         '("packet" value) msg
-                         '("leftover" value) (io:read-bytes-to-eof inp)))
-      (close-input-port inp)
-      (values num msg))))
-
-(define (port-has-bytes? p)
-  (not (eof-object? (peek-byte p))))
-
-(define (parse-packet/1 msg-num real-in in expect len field-dvecs)
-  (let ([first (peek-byte in)])
-    (if (eq? first #xFF)
-        (values msg-num (parse-error-packet in len))
-        (parse-packet/2 msg-num real-in in expect len field-dvecs))))
-
-(define (parse-packet/2 msg-num real-in in expect len field-dvecs)
-  (case expect
-    ((binary-data)
-     (if (and (eq? (peek-byte in) #xFE) (< len 9))
-         (values msg-num (parse-eof-packet in len))
-         (parse-binary-row-data-packet msg-num real-in in len field-dvecs)))
-    (else
-     (values msg-num
-             (case expect
-               ((handshake)
-                (parse-handshake-packet in len))
-               ((auth)
-                (case (peek-byte in)
-                  ((#x00) (parse-ok-packet in len))
-                  ((#xFE) (parse-change-plugin-packet in len))
-                  (else (parse-unknown-packet in len "(expected authentication ok packet)"))))
-               ((ok)
-                (case (peek-byte in)
-                  ((#x00) (parse-ok-packet in len))
-                  (else (parse-unknown-packet in len "(expected ok packet)"))))
-               ((result)
-                (case (peek-byte in)
-                  ((#x00) (parse-ok-packet in len))
-                  (else (parse-result-set-header-packet in len))))
-               ((field)
-                (if (and (eq? (peek-byte in) #xFE) (< len 9))
-                    (parse-eof-packet in len)
-                    (parse-field-packet in len)))
-               ((data)
-                (if (and (eq? (peek-byte in) #xFE) (< len 9))
-                    (parse-eof-packet in len)
-                    (parse-row-data-packet in len)))
-               ((prep-ok)
-                (case (peek-byte in)
-                  ((#x00) (parse-ok-prepared-statement-packet in len))
-                  (else (parse-unknown-packet in len "(expected ok for prepared statement packet)"))))
-               (else
-                (error/comm 'parse-packet (format "(bad expected packet type: ~s)" expect))))))))
-
-;; Individual parsers
-
-(define (parse-unknown-packet in len expected)
-  (make-unknown-packet expected (io:read-bytes-to-eof in)))
-
-(define (parse-handshake-packet in len)
-  (let* ([protocol-version (io:read-byte in)]
-         [server-version (io:read-null-terminated-string in)]
-         [thread-id (io:read-le-int32 in)]
-         [scramble1 (io:read-bytes-as-bytes in 8)]
-         [_ (io:read-byte in)] ;; always \0
-         [server-capabilities-lo (io:read-le-int16 in)]
-         [charset (decode-charset (io:read-byte in))]
-         [server-status (io:read-le-int16 in)]
-         [server-capabilities-hi (io:read-le-int16 in)]
-         [scramble-len
-          ;; total scramble size (both parts), including null terminator
-          ;;  - in 5.1.58, this byte is always 0 (so adjust to 21)
-          ;;  - in 5.5.12, usually 21 for mysql_native_password auth
-          ;; always >= 20 bytes
-          (let ([len (io:read-byte in)])
-            (cond [(zero? len) 21]
-                  [(>= len 21) len]
-                  [else (error/comm 'parse-handshake-packet
-                                    (format "(bad scramble length: ~s)" len))]))]
-         [_ (io:read-bytes-as-bytes in 10)] ;; always \0
-         [scramble2
-          (let* (;; subtract 8 for earlier part, subtract 1 for null-terminator byte
-                 [len (- scramble-len 8 1)]
-                 [scramble2 (io:read-bytes-as-bytes in len)])
-            (io:read-byte in) ;; always \0, at least for supported auth types
-            scramble2)]
-         [server-capabilities
-          (decode-server-flags (+ server-capabilities-lo
-                                  (arithmetic-shift server-capabilities-hi 16)))]
-         [auth
-          ;; IIUC, present iff (memq 'plugin-auth server-capabilities)
-          ;; (alternative: do peek-byte, test for eof)
-          ;;  - in 5.1.58, absent
-          ;;  - in 5.5.12, a null-terminated auth string
-          (cond [(memq 'plugin-auth server-capabilities)
-                 (io:read-null-terminated-string in)]
-                [else #f])]) ;; implicit "mysql_native_password"
-    (make-handshake-packet protocol-version
-                           server-version
-                           thread-id
-                           (bytes-append scramble1 scramble2)
-                           server-capabilities
-                           charset
-                           server-status
-                           auth)))
-
-(define (parse-ok-packet in len)
-  (let* ([_ (io:read-byte in)]
-         [affected-rows (io:read-length-code in)]
-         [insert-id (io:read-length-code in)]
-         [server-status (io:read-le-int16 in)]
-         [warning-count (io:read-le-int16 in)]
-         [message (io:read-bytes-to-eof in)])
-    (make-ok-packet affected-rows
-                    insert-id
-                    server-status
-                    warning-count
-                    (bytes->string/utf-8 message))))
-
-(define (parse-change-plugin-packet in len)
-  (let* ([_ (io:read-byte in)]
-         [plugin (and (port-has-bytes? in)
-                      (io:read-null-terminated-string in))]
-         [data (and (port-has-bytes? in)
-                    (io:read-bytes-to-eof in))])
-    ;; If plugin = #f, then changing to old password plugin.
-    (make-change-plugin-packet plugin data)))
-
-(define (parse-error-packet in len)
-  (let* ([_ (io:read-byte in)]
-         [errno (io:read-le-int16 in)]
-         [marker (peek-char in)]
-         [sqlstate
-          (and (eq? marker #\#)
-               (begin (io:read-byte in)
-                      (io:read-bytes-as-string in 5)))]
-         [message (io:read-bytes-to-eof in)])
-    (make-error-packet errno
-                       sqlstate
-                       (bytes->string/utf-8 message))))
-
-(define (parse-result-set-header-packet in len)
-  (let* ([field-count (io:read-length-code in)]
-         [extra (and (port-has-bytes? in)
-                     (io:read-length-code in))])
-    (make-result-set-header-packet field-count extra)))
-
-(define (parse-field-packet in len)
-  (let* ([catalog (io:read-length-coded-string in)]
-         [db (io:read-length-coded-string in)]
-         [table (io:read-length-coded-string in)]
-         [org-table (io:read-length-coded-string in)]
-         [name (io:read-length-coded-string in)]
-         [org-name (io:read-length-coded-string in)]
-         [_ (io:read-byte in)]
-         [charset (io:read-le-int16 in)]
-         [len (io:read-le-int32 in)]
-         [type (io:read-byte in)]
-         [flags (io:read-le-int16 in)]
-         [decimals (io:read-byte in)]
-         [_ (io:read-bytes-as-bytes in 2)]
-         [default (and (port-has-bytes? in)  (io:read-length-code in))])
-    (make-field-packet catalog
-                       db
-                       table
-                       org-table
-                       name
-                       org-name
-                       charset
-                       len
-                       (decode-type type)
-                       (decode-field-flags flags)
-                       decimals
-                       default)))
-
-(define (parse-eof-packet in len)
-  (let* ([_ (io:read-byte in)]
-         [warnings (io:read-le-int16 in)]
-         [status (io:read-le-int16 in)])
-    (make-eof-packet warnings status)))
-
-(define (parse-row-data-packet in len)
-  (make-row-data-packet
-   (list->vector
-    (let loop ()
-      (if (at-eof? in)
-          null
-          (let* ([datum (io:read-length-coded-string in)])
-            (cons (or datum sql-null)
-                  (loop))))))))
-
-(define (parse-ok-prepared-statement-packet in len)
-  (let* ([ok (io:read-byte in)]
-         [statement-handler-id (io:read-le-int32 in)]
-         [columns (io:read-le-int16 in)]
-         [params (io:read-le-int16 in)]
-         [warnings (and (>= len 12) (io:read-le-int16 in))]
-         [_ (io:read-bytes-to-eof in)])
-    (unless (zero? ok)
-      (error/comm 'parse-ok-prepared-statement-packet (format "(first byte was ~s)" ok)))
-    (make-ok-prepared-statement-packet statement-handler-id columns params)))
-
-(define (parse-binary-row-data-packet msg-num real-in in len field-dvecs)
-  (let* ([first (io:read-byte in)] ;; SKIP? seems to be always zero
-         [result-count (length field-dvecs)]
-         [null-map-length (quotient (+ 9 result-count) 8)]
-         [null-map (io:read-bytes-as-bytes in null-map-length)]
-         [is-null? (lambda (i)
-                     (let* ([i* (+ 2 i)] ;; skip first two bits
-                            [bytei (quotient i* 8)]
-                            [biti (remainder i* 8)])
-                       (bitwise-bit-set? (bytes-ref null-map bytei)
-                                         (if (system-big-endian?)
-                                             (- 7 biti)
-                                             biti))))]
-         [field-v (make-vector result-count)])
-    (let-values ([(msg-num* in*)
-                  (let loop ([len len] [ins null])
-                    ;; A data row is sent as zero or more packets of max length (2^24-1)
-                    ;; followed by one packet of less than max length.
-                    (cond [(= len MAX-PACKET-SIZE) ;; maximum packet length
-                           (let* ([next-len (io:read-le-int24 real-in)]
-                                  [next-num (io:read-byte real-in)]
-                                  [next-bs (read-bytes next-len real-in)]
-                                  [next-in (open-input-bytes next-bs)])
-                             (loop next-len (cons next-in ins)))]
-                          [else
-                           (values (+ msg-num (length ins))
-                                   (if (null? ins)
-                                       in
-                                       (apply input-port-append #t in (reverse ins))))]))])
-      (for ([i (in-range result-count)]
-            [field-dvec (in-list field-dvecs)])
-        (vector-set! field-v i
-                     (if (is-null? i)
-                         sql-null
-                         (read-binary-datum in* field-dvec))))
-      (when (port-has-bytes? in*)
-        (error/internal* 'parse-binary-row-data-packet "bytes left over after parsing packet"
-                         '("leftover" value) (io:read-bytes-to-eof in*)))
-      (close-input-port in*)
-      (values msg-num* (make-binary-row-data-packet field-v)))))
-
-(define (read-binary-datum in field-dvec)
-
-  ;; How to distinguish between character data and binary data?
-  ;; (Both are given type var-string.)
-  ;; (Also true for blob vs text; both given as type blob.)
-
-  ;; There seem to be two differences:
-  ;;  1) character data has charset 33 (utf8_general_ci)
-  ;;     binary data has charset 63 (binary)
-  ;;  2) binary data has binary flag, character data does not
-
-  ;; We'll try using #2.
-
-  (define type (field-dvec->typeid field-dvec))
-  (define flags (field-dvec->flags field-dvec))
-
-  (case type
-
-    ((tiny) (io:read-byte in)) ;; FIXME signed/unsigned
-    ((short) (io:read-le-int16 in (not (memq 'unsigned flags))))
-    ((int24) (io:read-le-int24 in)) ;; FIXME signed/unsigned
-    ((long) (io:read-le-int32 in (not (memq 'unsigned flags))))
-    ((longlong) (io:read-le-int64 in (not (memq 'unsigned flags))))
-    ((varchar string var-string blob tiny-blob medium-blob long-blob)
-     (if (memq 'binary flags)
-         (io:read-length-coded-bytes in)
-         (io:read-length-coded-string in)))
-
-    ((float)
-     (floating-point-bytes->real (io:read-bytes-as-bytes in 4) #f))
-    ((double)
-     (floating-point-bytes->real (io:read-bytes-as-bytes in 8) #f))
-
-    ((date datetime timestamp newdate) ;; ???
-     (let* ([bs (io:read-length-coded-bytes in)])
-       ;; format is YYMDhmsUUUU (U = microseconds)
-       ;; but trailing zeros can be dropped
-       ;; (Apparently, docs lie; get microseconds, not nanoseconds)
-       (define (get-int start len)
-         (if (<= (+ start len) (bytes-length bs))
-             (cond [(= len 1) (bytes-ref bs start)]
-                   [else (integer-bytes->integer bs #t #f start (+ start len))])
-             0))
-       (let ([year  (get-int 0 2)]
-             [month (get-int 2 1)]
-             [day   (get-int 3 1)]
-             [hour  (get-int 4 1)]
-             [min   (get-int 5 1)]
-             [sec   (get-int 6 1)]
-             [nsec  (* 1000 (get-int 7 4))])
-         (case type
-           ((date newdate)
-            (sql-date year month day))
-           ((datetime timestamp)
-            (sql-timestamp year month day hour min sec nsec #f))
-           ((time)
-            (sql-time hour min sec nsec #f))))))
-
-    ((time)
-     (let* ([bs (io:read-length-coded-bytes in)])
-       (define (get-int start len)
-         (if (<= (+ start len) (bytes-length bs))
-             (cond [(= len 1) (bytes-ref bs start)]
-                   [else (integer-bytes->integer bs #t #f start (+ start len))])
-             0))
-       ;; format is gDDDDhmsUUUU (g = sign, 0=pos, 1=neg; U = microseconds)
-       ;; (Apparently, docs lie; get microseconds, not nanoseconds)
-       (let* ([sg   (if (zero? (get-int 0 1)) + -)]
-              [days (sg (get-int 1 4))]
-              [hour (sg (get-int 5 1))]
-              [min  (sg (get-int 6 1))]
-              [sec  (sg (get-int 7 1))]
-              [nsec (* 1000 (sg (get-int 8 4)))])
-         (let ([iv (sql-interval 0 0 days hour min sec nsec)])
-           (sql-interval->sql-time iv iv)))))
-
-    ((year) (io:read-le-int16 in))
-
-    ((newdecimal)
-     (parse-decimal (io:read-length-coded-string in)))
-
-    ((bit)
-     (let ([l (field-dvec->length field-dvec)]
-           [bv (io:read-length-coded-bytes in)])
-       (make-sql-bits/bytes l bv (- 8 (modulo l 8)))))
-
-    ((geometry)
-     (bytes->geometry 'mysql-bytes->geometry
-                      (io:read-length-coded-bytes in)
-                      #:srid? #t))
-
-    ((decimal)
-     (error/internal* 'get-result "unimplemented decimal type" "type" type))
-    ((enum set)
-     (error/internal 'get-result "unimplemented type" "type" type))
-    (else
-     (error/internal 'get-result "unknown type" "type" type))))
-
-(define (parse-decimal s)
-  (cond [(equal? s "NaN") +nan.0]
-        [(regexp-match #rx"^-?([0-9]*)$" s)
-         ;; big integer
-         => (lambda (m)
-              (string->number s))]
-        [(regexp-match #rx"^(-)?([0-9]*)\\.([0-9]*)$" s)
-         => (lambda (m)
-              (* (if (cadr m) -1 1)
-                 (+ (string->number (caddr m))
-                    (parse-exact-fraction (cadddr m)))))]
-        [else
-         (error/internal* 'parse-decimal "cannot parse as decimal"
-                          '("string" value) s)]))
-
-(define (parse-exact-fraction s)
-  ;; eg: (parse-exact-fraction "12") = 12/100
-  (/ (string->number s)
-     (expt 10 (string-length s))))
-
-(define (supported-result-typeid? typeid)
-  (case typeid
-    ((tiny short int24 long longlong float double) #t)
-    ((varchar string var-string blob tiny-blob medium-blob long-blob) #t)
-    ((date datetime timestamp newdate time year) #t)
-    ((newdecimal bit geometry) #t)
-    ((null) #t)
-    (else #f)))
-
-(define (choose-param-type param)
-  (cond [(or (string? param)
-             (sql-null? param)
-             (eq? param 'long-string))
-         'var-string]
-        [(int64? param)
-         'longlong]
-        [(rational? param)
-         'double]
-        [(sql-date? param)
-         'date]
-        [(sql-timestamp? param)
-         'timestamp]
-        [(or (sql-time? param) (sql-day-time-interval? param))
-         'time]
-        [(or (bytes? param)
-             (eq? param 'long-binary))
-         'blob]
-        [(sql-bits? param)
-         'bit]
-        [(geometry2d? param)
-         'geometry]
-        [else
-         (error/internal* 'choose-param-type "bad parameter value"
-                          '("value" value) param)]))
-
-(define (write-binary-datum out type param)
-  (case type
-    ((var-string)
-     (io:write-length-coded-string out param))
-    ((longlong) (io:write-le-int64 out param #t))
-    ((double)
-     (io:write-bytes out (real->floating-point-bytes (exact->inexact param) 8)))
-    ((date)
-     (let ([bs (bytes-append (integer->integer-bytes (sql-date-year param) 2 #t #f)
-                             (bytes (sql-date-month param))
-                             (bytes (sql-date-day param)))])
-       (io:write-length-coded-bytes out bs)))
-    ((timestamp)
-     (let ([bs (bytes-append (integer->integer-bytes (sql-timestamp-year param) 2 #t #f)
-                             (bytes (sql-timestamp-month param))
-                             (bytes (sql-timestamp-day param))
-                             (bytes (sql-timestamp-hour param))
-                             (bytes (sql-timestamp-minute param))
-                             (bytes (sql-timestamp-second param))
-                             (integer->integer-bytes
-                              (quotient (sql-timestamp-nanosecond param) 1000)
-                              4 #t #f))])
-       (io:write-length-coded-bytes out bs)))
-    ((time)
-     (let* ([param (if (sql-time? param) (sql-time->sql-interval param) param)]
-            [days (sql-interval-days param)]
-            [hours (sql-interval-hours param)]
-            [minutes (sql-interval-minutes param)]
-            [seconds (sql-interval-seconds param)]
-            [nanoseconds (sql-interval-nanoseconds param)]
-            [neg? (ormap negative? (list days hours minutes seconds nanoseconds))]
-            [bs (bytes-append (bytes (if neg? 1 0))
-                              (integer->integer-bytes (abs days) 4 #t #f)
-                              (bytes (abs hours))
-                              (bytes (abs minutes))
-                              (bytes (abs seconds))
-                              (integer->integer-bytes
-                               (quotient (abs nanoseconds) 1000)
-                               4 #t #f))])
-       (io:write-length-coded-bytes out bs)))
-    ((blob)
-     (io:write-length-coded-bytes out param))
-    ((bit)
-     (let-values ([(len bv start) (align-sql-bits param 'right)])
-       (io:write-length-code out (- (bytes-length bv) start))
-       (write-bytes bv out start)))
-
-    ((geometry)
-     (io:write-length-coded-bytes
-      out
-      (geometry->bytes 'mysql-geometry->bytes param #:big-endian? #f #:srid? #t)))))
-
-;; ----
-
-(define (fetch key table function)
-  (let ([val (assq key table)])
-    (if val
-        (cdr val)
-        (error/internal* function "not found" '("key" value) key))))
-
-(define (encode-flags flags table function)
-  (apply bitwise-ior
-         (map (lambda (f) (fetch f table function))
-              flags)))
-
-(define (decode-flags n table function)
-  (let loop ([table table])
-    (cond [(null? table)
-           null]
-          [(positive? (bitwise-and (caar table) n))
-           (cons (cdar table) (loop (cdr table)))]
-          [else
-           (loop (cdr table))])))
-
-(define (invert-alist alist)
-  (map (lambda (p) (cons (cdr p) (car p))) alist))
-
-(define server-flags/decoding
-  '((#x1     . long-password)
-    (#x2     . found-rows)
-    (#x4     . long-flag)
-    (#x8     . connect-with-db)
-    (#x10    . no-schema)
-    (#x20    . compress)
-    (#x40    . odbc)
-    (#x80    . local-files)
-    (#x100   . ignore-space)
-    (#x200   . protocol-41)
-    (#x400   . interactive)
-    (#x800   . ssl)
-    (#x1000  . ignore-sigpipe)
-    (#x2000  . transactions)
-    (#x4000  . protocol-41-OLD)
-    (#x8000  . secure-connection)
-    (#x10000 . multi-statements)
-    (#x20000 . multi-results)
-    (#x40000 . ps-multi-statements) ;; ???
-    (#x80000 . plugin-auth)))
-(define server-flags/encoding
-  (invert-alist server-flags/decoding))
-
-(define server-status-flags/decoding
-  '((#x1     . in-transaction)
-    (#x2     . auto-commit)
-    (64      . cursor-exists)
-    (128     . last-row-sent)))
-
-(define commands/decoding
-  '((#x00 . sleep)
-    (#x01 . quit)
-    (#x02 . init-db)
-    (#x03 . query)
-    (#x04 . field-list)
-    (#x05 . create-db)      ;; deprecated
-    (#x06 . drop-db)        ;; deprecated
-    (#x07 . refresh)
-    (#x08 . shutdown)
-    (#x09 . statistics)
-    (#x0A . process-info)
-    (#x0B . connect)
-    (#x0C . process-kill)
-    (#x0D . debug)
-    (#x0E . ping)
-    (#x0F . time)
-    (#x10 . delayed-insert)
-    (#x11 . change-user)
-    (#x16 . statement-prepare)
-    (#x17 . statement-execute)
-    (#x18 . statement-send-long-data)
-    (#x19 . statement-close)
-    (#x1A . statement-reset)
-    (#x1B . set-option)
-    (#x1C . statement-fetch)))
-(define commands/encoding
-  (invert-alist commands/decoding))
-
-(define types/decoding
-  '((#x00 . decimal)
-    (#x01 . tiny)
-    (#x02 . short)
-    (#x03 . long)
-    (#x04 . float)
-    (#x05 . double)
-    (#x06 . null)
-    (#x07 . timestamp)
-    (#x08 . longlong)
-    (#x09 . int24)
-    (#x0A . date)
-    (#x0B . time)
-    (#x0C . datetime)
-    (#x0D . year)
-    (#x0E . newdate)
-    (#x0F . varchar)
-    (#x10 . bit)
-    (#xF6 . newdecimal)
-    (#xF7 . enum)
-    (#xF8 . set)
-    (#xF9 . tiny-blob)
-    (#xFA . medium-blob)
-    (#xFB . long-blob)
-    (#xFC . blob)
-    (#xFD . var-string)
-    (#xFE . string)
-    (#xFF . geometry)))
-(define types/encoding
-  (invert-alist types/decoding))
-
-(define field-flags/decoding
-  '((#x001 . not-null)
-    (#x002 . primary-key)
-    (#x004 . unique-key)
-    (#x008 . multiple-key)
-    (#x010 . blob)
-    (#x020 . unsigned)
-    (#x040 . zero-fill)
-    (#x080 . binary)
-    (#x100 . enum)
-    (#x200 . auto-increment)
-    (#x400 . timestamp)
-    (#x800 . set)))
-(define field-flags/encoding
-  (invert-alist field-flags/decoding))
-
-(define execute-flags/decoding
-  '((#x0 . cursor/no-cursor)
-    (#x1 . cursor/read-only)
-    (#x2 . cursor/for-update)
-    (#x4 . cursor/scrollable)))
-(define execute-flags/encoding
-  (invert-alist execute-flags/decoding))
-
-
-(define (encode-server-flags flags)
-  (encode-flags flags server-flags/encoding 'encode-server-flags))
-(define (decode-server-flags n)
-  (decode-flags n server-flags/decoding 'decode-server-flags))
-
-(define (decode-server-status-flags n)
-  (decode-flags n server-status-flags/decoding 'decode-server-status-flags))
-
-(define (encode-field-flags flags)
-  (encode-flags flags field-flags/encoding 'encode-field-flags))
-(define (decode-field-flags n)
-  (decode-flags n field-flags/decoding 'decode-field-flags))
-
-(define (encode-charset charset)
-  (case charset
-    ((utf8-general-ci) 33)
-    (else (error/internal* 'encode-charset "unknown charset" "charset" charset))))
-(define (decode-charset n)
-  (case n
-    ((33) 'utf8-general-ci)
-    (else 'unknown)))
-
-(define (encode-type type)
-  (fetch type types/encoding 'encode-type))
-(define (decode-type type)
-  (fetch type types/decoding 'decode-type))
-
-(define (encode-command command)
-  (fetch command commands/encoding 'encode-command))
-
-(define (encode-execute-flags flags)
-  (encode-flags flags execute-flags/encoding 'encode-execute-flags))
-(define (decode-execute-flags n)
-  (decode-flags n execute-flags/decoding 'decode-execute-flags))
-
-;; null-map-length : (list-of boolean) -> integer
-(define (null-map-length null-map)
-  (ceiling (/ (length null-map) 8)))
-
-;; null-map->integer : (list-of boolean) -> integer
-;; Least significant bit represents first boolean in list, etc
-(define (null-map->integer null-map)
-  (cond [(null? null-map)
-         0]
-        [(car null-map)
-         (+ 1 (arithmetic-shift (null-map->integer (cdr null-map)) 1))]
-        [else
-         (arithmetic-shift (null-map->integer (cdr null-map)) 1)]))
-
-(define (at-eof? in)
-  (eof-object? (peek-byte in)))
-
-(define (parse-field-dvec fp)
-  (match fp
-    [(struct field-packet (cat db tab otab name oname _ len type flags _ _))
-     (vector cat db tab otab name oname len type flags)]))
-
-(define (field-dvec->typeid dvec)
-  (vector-ref dvec 7))
-
-(define (field-dvec->name dvec)
-  (vector-ref dvec 4))
-
-(define (field-dvec->flags dvec)
-  (vector-ref dvec 8))
-
-(define (field-dvec->length dvec)
-  (vector-ref dvec 6))
-
-(define (field-dvec->field-info dvec)
-  (match dvec
-    [(vector cat db tab otab name oname len type flags)
-     `((catalog . ,cat)
-       (database . ,db)
-       (table . ,tab)
-       (original-table . ,otab)
-       (name . ,name)
-       (original-name . ,oname)
-       (length . ,len)
-       (typeid . ,type)
-       (flags . ,flags))]))
-
-(define (parse-field-info fp)
-  (field-dvec->field-info (parse-field-dvec fp)))
diff --git a/pkgs/db-pkgs/db-lib/db/private/odbc/connection.rkt b/pkgs/db-pkgs/db-lib/db/private/odbc/connection.rkt
deleted file mode 100644
index 2f8cfe9909..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/odbc/connection.rkt
+++ /dev/null
@@ -1,757 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/list
-         racket/math
-         ffi/unsafe
-         ffi/unsafe/atomic
-         unstable/error
-         db/private/generic/interfaces
-         db/private/generic/common
-         db/private/generic/prepared
-         db/private/generic/sql-data
-         db/private/generic/sql-convert
-         "ffi.rkt"
-         "ffi-constants.rkt"
-         "dbsystem.rkt")
-(provide connection%
-         handle-status*
-         dbsystem)
-
-;; == Connection
-
-;; ODBC connections do not use statement-cache%
-;;  - safety depends on sql dialect
-;;  - transaction interactions more complicated
-
-(define connection%
-  (class* transactions% (connection<%>)
-    (init-private db
-                  env
-                  notice-handler
-                  char-mode)
-    (init strict-parameter-types?)
-    (super-new)
-
-    (define statement-table (make-hasheq))
-
-    (define use-describe-param?
-      (and strict-parameter-types?
-           (let-values ([(status supported?) (SQLGetFunctions db SQL_API_SQLDESCRIBEPARAM)])
-             (handle-status 'odbc-connect status db)
-             supported?)))
-
-    (define dbms
-      (let-values ([(status result) (SQLGetInfo-string db SQL_DBMS_NAME)])
-        (handle-status 'odbc-connect status db)
-        result))
-
-    (inherit call-with-lock
-             call-with-lock*
-             add-delayed-call!
-             get-tx-status
-             set-tx-status!
-             check-valid-tx-status
-             check-statement/tx)
-
-    (define/public (get-db fsym)
-      (unless db
-        (error/not-connected fsym))
-      db)
-
-    (define/public (get-dbsystem) dbsystem)
-    (define/override (connected?) (and db #t))
-
-    (define/public (query fsym stmt cursor?)
-      (call-with-lock fsym
-        (lambda ()
-          (check-valid-tx-status fsym)
-          (query1 fsym stmt #t cursor?))))
-
-    (define/private (query1 fsym stmt check-tx? cursor?)
-      (let* ([stmt (check-statement fsym stmt cursor?)]
-             [pst (statement-binding-pst stmt)]
-             [params (statement-binding-params stmt)])
-        (when check-tx? (check-statement/tx fsym (send pst get-stmt-type)))
-        (let ([result-dvecs (send pst get-result-dvecs)])
-          (for ([dvec (in-list result-dvecs)])
-            (let ([typeid (field-dvec->typeid dvec)])
-              (unless (supported-typeid? typeid)
-                (error/unsupported-type fsym typeid)))))
-        (query1:inner fsym pst params cursor?)))
-
-    (define/private (check-statement fsym stmt cursor?)
-      (cond [(statement-binding? stmt)
-             (let ([pst (statement-binding-pst stmt)])
-               (send pst check-owner fsym this stmt)
-               (cond [cursor?
-                      (let ([pst* (prepare1 fsym (send pst get-stmt) #f)])
-                        (statement-binding pst* (statement-binding-params stmt)))]
-                     [else stmt]))]
-            [(string? stmt)
-             (let* ([pst (prepare1 fsym stmt (not cursor?))])
-               (send pst bind fsym null))]))
-
-    (define/private (query1:inner fsym pst params cursor?)
-      (let* ([db (get-db fsym)]
-             [stmt (send pst get-handle)])
-        (let* ([param-bufs
-                ;; Need to keep references to all bufs until after SQLExecute.
-                (for/list ([i (in-naturals 1)]
-                           [param (in-list params)]
-                           [param-typeid (in-list (send pst get-param-typeids))])
-                  (load-param fsym db stmt i param param-typeid))])
-          (handle-status fsym (SQLExecute stmt) stmt)
-          (strong-void param-bufs))
-        (define result-dvecs (send pst get-result-dvecs))
-        (set-result-descriptors stmt result-dvecs)
-        (define rows
-          (and (not cursor?)
-               (pair? result-dvecs)
-               (fetch* fsym stmt (map field-dvec->typeid result-dvecs) #f +inf.0)))
-        (unless cursor? (send pst after-exec #f))
-        (cond [(and (pair? result-dvecs) (not cursor?))
-               (rows-result (map field-dvec->field-info result-dvecs) rows)]
-              [(and (pair? result-dvecs) cursor?)
-               (cursor-result (map field-dvec->field-info result-dvecs)
-                              pst
-                              (list (map field-dvec->typeid result-dvecs)
-                                    (box #f)))]
-              [else (simple-result '())])))
-
-    (define/public (fetch/cursor fsym cursor fetch-size)
-      (let ([pst (cursor-result-pst cursor)]
-            [extra (cursor-result-extra cursor)])
-        (send pst check-owner fsym this pst)
-        (call-with-lock fsym
-          (lambda ()
-            (let ([typeids (car extra)]
-                  [end-box (cadr extra)])
-              (cond [(unbox end-box) #f]
-                    [else
-                     (begin0 (fetch* fsym (send pst get-handle) typeids end-box fetch-size)
-                       (when (unbox end-box)
-                         (send pst after-exec #f)))]))))))
-
-    (define/private (load-param fsym db stmt i param typeid)
-      ;; NOTE: param buffers must not move between bind and execute
-      ;; So use buffer utils from ffi.rkt (copy-buffer, etc)
-      (define (bind ctype sqltype buf [prec 0] [scale 0])
-        (let* ([lenbuf
-                (int->buffer (if buf (bytes-length buf) SQL_NULL_DATA))]
-               [status
-                (SQLBindParameter stmt i SQL_PARAM_INPUT ctype sqltype prec scale buf lenbuf)])
-          (handle-status fsym status stmt)
-          (if buf (cons buf lenbuf) lenbuf)))
-      ;; If the typeid is UNKNOWN, then choose appropriate type based on data,
-      ;; but respect typeid if known.
-      (define unknown-type? (= typeid SQL_UNKNOWN_TYPE))
-      (cond [(string? param)
-             (case char-mode
-               ((wchar)
-                (bind SQL_C_WCHAR (if unknown-type? SQL_WVARCHAR typeid)
-                      (case WCHAR-SIZE
-                        ((2) (cpstr2 param))
-                        ((4) (cpstr4 param)))))
-               ((utf-8)
-                (bind SQL_C_CHAR (if unknown-type? SQL_VARCHAR typeid)
-                      (copy-buffer (string->bytes/utf-8 param))))
-               ((latin-1)
-                (bind SQL_C_CHAR (if unknown-type? SQL_VARCHAR typeid)
-                      (copy-buffer (string->bytes/latin-1 param (char->integer #\?))))))]
-            [(bytes? param)
-             (bind SQL_C_BINARY (if unknown-type? SQL_BINARY typeid)
-                   (copy-buffer param))]
-            [(pair? param) ;; Represents numeric/decimal decomposed as scaled integer
-             (let* ([ma (car param)]
-                    [ex (cdr param)]
-                    ;; ODBC docs claim max precision is 15 ...
-                    [prec-byte (if (zero? ma) 1 (+ 1 (order-of-magnitude (abs ma))))]
-                    [sign-byte (if (negative? ma) 0 1)] ;; FIXME: negative is 2 in ODBC 3.5 ???
-                    [digits-bytess
-                     ;; 16 bytes of unsigned little-endian data (4 chunks of 4 bytes)
-                     (let loop ([i 0] [ma (abs ma)])
-                       (if (< i 4)
-                           (let-values ([(q r) (quotient/remainder ma (expt 2 32))])
-                             (cons (integer->integer-bytes r 4 #f #f)
-                                   (loop (add1 i) q)))
-                           null))]
-                    [numeric-bytes
-                     (apply bytes-append (bytes prec-byte ex sign-byte) digits-bytess)]
-                    [numeric-buffer (copy-buffer numeric-bytes)])
-               ;; Example: http://support.microsoft.com/kb/181254
-               ;; and: http://msdn.microsoft.com/en-us/library/ms712567%28v=vs.85%29.aspx
-               ;; Call bind first.
-               (bind SQL_C_NUMERIC typeid numeric-buffer prec-byte ex)
-               ;; Then set descriptor attributes.
-               (set-numeric-descriptors (SQLGetStmtAttr/HDesc stmt SQL_ATTR_APP_PARAM_DESC)
-                                        i prec-byte ex numeric-buffer))]
-            [(real? param)
-             (cond [(or (= typeid SQL_NUMERIC) (= typeid SQL_DECIMAL))
-                    (bind SQL_C_CHAR typeid
-                          (copy-buffer (marshal-decimal fsym i param)))]
-                   [(or (and unknown-type? (int32? param))
-                        (= typeid SQL_INTEGER)
-                        (= typeid SQL_SMALLINT)
-                        (= typeid SQL_BIGINT)
-                        (= typeid SQL_TINYINT))
-                    ;; Oracle errors without diagnostic record (!!) on BIGINT param
-                    ;; -> http://stackoverflow.com/questions/338609
-                    ;; FIXME: find a better solution, eg check driver for BIGINT support (?)
-                    (if (= typeid SQL_BIGINT)
-                        (bind SQL_C_SBIGINT SQL_BIGINT
-                              (copy-buffer (integer->integer-bytes param 8 #t)))
-                        (bind SQL_C_LONG (if unknown-type? SQL_INTEGER typeid)
-                              (copy-buffer (integer->integer-bytes param 4 #t))))]
-                   [else
-                    (bind SQL_C_DOUBLE (if unknown-type? SQL_DOUBLE typeid)
-                          (copy-buffer
-                           (real->floating-point-bytes (exact->inexact param) 8)))])]
-            [(boolean? param)
-             (bind SQL_C_LONG SQL_BIT
-                   (copy-buffer (int->buffer (if param 1 0))))]
-            [(sql-date? param)
-             (bind SQL_C_TYPE_DATE SQL_TYPE_DATE
-                   (copy-buffer
-                    (let* ([x param]
-                           [y (sql-date-year x)]
-                           [m (sql-date-month x)]
-                           [d (sql-date-day x)])
-                      (bytes-append (integer->integer-bytes y 2 #t)
-                                    (integer->integer-bytes m 2 #f)
-                                    (integer->integer-bytes d 2 #f)))))]
-            [(sql-time? param)
-             (bind SQL_C_TYPE_TIME SQL_TYPE_TIME
-                   (copy-buffer
-                    (let* ([x param]
-                           [h (sql-time-hour x)]
-                           [m (sql-time-minute x)]
-                           [s (sql-time-second x)])
-                      (bytes-append (integer->integer-bytes h 2 #f)
-                                    (integer->integer-bytes m 2 #f)
-                                    (integer->integer-bytes s 2 #f)))))]
-            [(sql-timestamp? param)
-             (bind SQL_C_TYPE_TIMESTAMP
-                   (if unknown-type? SQL_TYPE_TIMESTAMP typeid)
-                   (copy-buffer
-                    (let ([x param])
-                      (bytes-append
-                       (integer->integer-bytes (sql-timestamp-year x) 2 #f)
-                       (integer->integer-bytes (sql-timestamp-month x) 2 #f)
-                       (integer->integer-bytes (sql-timestamp-day x) 2 #f)
-                       (integer->integer-bytes (sql-timestamp-hour x) 2 #f)
-                       (integer->integer-bytes (sql-timestamp-minute x) 2 #f)
-                       (integer->integer-bytes (sql-timestamp-second x) 2 #f)
-                       (integer->integer-bytes (sql-timestamp-nanosecond x) 4 #f)))))]
-            [(sql-null? param)
-             (bind SQL_C_CHAR SQL_VARCHAR #f)]
-            [else (error/internal* fsym "cannot convert given value to SQL type"
-                                   '("given" value) param
-                                   "typeid" typeid)]))
-
-    (define/private (set-result-descriptors stmt dvecs)
-      (for ([i (in-naturals 1)]
-            [dvec (in-list dvecs)])
-        (define typeid (field-dvec->typeid dvec))
-        (cond [(or (= typeid SQL_DECIMAL)
-                   (= typeid SQL_NUMERIC))
-               (define hdesc (SQLGetStmtAttr/HDesc stmt SQL_ATTR_APP_ROW_DESC))
-               (define size (field-dvec->size dvec))
-               (define digits (field-dvec->digits dvec))
-               (set-numeric-descriptors hdesc i size digits #f)]
-              [else (void)])))
-
-    (define/private (set-numeric-descriptors hdesc i prec ex buf)
-      (SQLSetDescField/Int hdesc i SQL_DESC_TYPE SQL_C_NUMERIC)
-      (SQLSetDescField/Int hdesc i SQL_DESC_PRECISION prec)
-      (SQLSetDescField/Int hdesc i SQL_DESC_SCALE ex)
-      (when buf (SQLSetDescField/Ptr hdesc i SQL_DESC_DATA_PTR buf (bytes-length buf))))
-
-    (define/private (fetch* fsym stmt result-typeids end-box limit)
-      ;; scratchbuf: create a single buffer here to try to reduce garbage
-      ;; Don't make too big; otherwise bad for queries with only small data.
-      ;; Doesn't need to be large, since get-varbuf already smart for long data.
-      ;; MUST be at least as large as any int/float type (see get-num)
-      ;; SHOULD be at least as large as any structures (see uses of get-int-list)
-      (let ([scratchbuf (make-bytes 50)]) 
-        (let loop ([fetched 0])
-          (cond [(< fetched limit)
-                 (let ([c (fetch fsym stmt result-typeids scratchbuf)])
-                   (cond [c
-                          (cons c (loop (add1 fetched)))]
-                         [else
-                          (when end-box (set-box! end-box #t))
-                          (handle-status fsym (SQLFreeStmt stmt SQL_CLOSE) stmt)
-                          (handle-status fsym (SQLFreeStmt stmt SQL_RESET_PARAMS) stmt)
-                          null]))]
-                [else null]))))
-
-    (define/private (fetch fsym stmt result-typeids scratchbuf)
-      (let ([s (SQLFetch stmt)])
-        (cond [(= s SQL_NO_DATA) #f]
-              [(= s SQL_SUCCESS)
-               (let* ([column-count (length result-typeids)]
-                      [vec (make-vector column-count)])
-                 (for ([i (in-range column-count)]
-                       [typeid (in-list result-typeids)])
-                   (vector-set! vec i (get-column fsym stmt (add1 i) typeid scratchbuf)))
-                 vec)]
-              [else (handle-status fsym s stmt)])))
-
-    (define/private (get-column fsym stmt i typeid scratchbuf)
-      (define-syntax-rule (get-num size ctype convert convert-arg ...)
-        (let-values ([(status ind) (SQLGetData stmt i ctype scratchbuf 0)])
-          (handle-status fsym status stmt)
-          (cond [(= ind SQL_NULL_DATA) sql-null]
-                [else (convert scratchbuf convert-arg ... 0 size)])))
-      (define (get-int size ctype)
-        (get-num size ctype integer-bytes->integer     #t (system-big-endian?)))
-      (define (get-real ctype)
-        (get-num 8    ctype floating-point-bytes->real (system-big-endian?)))
-      (define (get-int-list sizes ctype)
-        (let* ([buflen (apply + sizes)]
-               [buf (if (<= buflen (bytes-length scratchbuf)) scratchbuf (make-bytes buflen))])
-          (let-values ([(status ind) (SQLGetData stmt i ctype buf 0)])
-            (handle-status fsym status stmt)
-            (cond [(= ind SQL_NULL_DATA) sql-null]
-                  [else (let ([in (open-input-bytes buf)])
-                          (for/list ([size (in-list sizes)])
-                            (case size
-                              ((1) (read-byte in))
-                              ((2) (integer-bytes->integer (read-bytes 2 in) #f))
-                              ((4) (integer-bytes->integer (read-bytes 4 in) #f))
-                              (else (error/internal
-                                     'get-int-list "bad size: ~e" size)))))]))))
-
-      (define (get-varbuf ctype ntlen convert)
-        ;; ntlen is null-terminator length (1 for char data, 0 for binary, ??? for wchar)
-
-        ;; null-terminator, there are 3 modes: binary, wchar=2, wchar=4
-        ;; - binary: all done in racket, no worries
-        ;; - wchar=4: passed to make_sized_char_string, so must explicitly leave ntlen \0 bytes
-        ;; - wchar=2: passed to utf16_to_ucs4 (which must add \0 space, see ffi.rkt)
-        ;; So for simplicity, add ntlen \0 bytes to buf (but do *not* add to data len)
-
-        ;; ODBC docs say len-or-ind is character count for char data, but wrong:
-        ;; always a byte count.
-
-        ;; It would be nice if we could call w/ empty buffer, get total length, then
-        ;; call again with appropriate buffer. But can't use NULL (works on unixodbc, but
-        ;; ODBC spec says illegal and Win32 ODBC rejects). Seems unsafe to use 0-length
-        ;; buffer (spec is unclear, DB2 docs say len>0...???).
-
-        ;; loop : bytes nat (listof bytes) -> any
-        ;; start is next place to write, but data starts at 0
-        ;; rchunks is reversed list of previous chunks (for data longer than scratchbuf)
-        ;; Small data done in one iteration; most long data done in two. Only long data
-        ;; without known size (???) should take more than two iterations.
-        (define (loop buf start rchunks)
-          (let-values ([(status len-or-ind) (SQLGetData stmt i ctype buf start)])
-            (handle-status fsym status stmt #:ignore-ok/info? #t)
-            (cond [(= len-or-ind SQL_NULL_DATA) sql-null]
-                  [(= len-or-ind SQL_NO_TOTAL)
-                   ;; didn't fit in buf, and we have no idea how much more there is
-                   ;; start = 0
-                   (let* ([data-end (- (bytes-length buf) ntlen)])
-                     (loop buf 0 (cons (subbytes buf 0 data-end) rchunks)))]
-                  [else
-                   (let ([len (+ start len-or-ind)])
-                     (cond [(<= 0 len (- (bytes-length buf) ntlen))
-                            ;; fit in buf
-                            (cond [(pair? rchunks)
-                                   ;; add ntlen bytes for null-terminator...
-                                   (let* ([chunk (subbytes buf 0 (+ len ntlen))]
-                                          [chunks (append (reverse rchunks) (list chunk))]
-                                          [complete (apply bytes-append chunks)])
-                                     ;; ... but compensate so len is correct
-                                     (convert complete (- (bytes-length complete) ntlen) #t))]
-                                  [else
-                                   ;; buf already null-terminated, len correct
-                                   (convert buf len #f)])]
-                           [else
-                            ;; didn't fit in buf, but we know how much more there is
-                            (let* ([len-got (- (bytes-length buf) ntlen)]
-                                   [newbuf (make-bytes (+ len ntlen))])
-                              (bytes-copy! newbuf 0 buf start len-got)
-                              (loop newbuf len-got rchunks))]))])))
-        (loop scratchbuf 0 null))
-
-      (define (get-string/latin-1)
-        (get-varbuf SQL_C_CHAR 1
-                    (lambda (buf len _fresh?)
-                      (bytes->string/latin-1 buf #f 0 len))))
-      (define (get-string/utf-8)
-        (get-varbuf SQL_C_CHAR 1
-                    (lambda (buf len _fresh?)
-                      (bytes->string/utf-8 buf #f 0 len))))
-      (define (get-string)
-        (case char-mode
-          ((wchar)
-           (get-varbuf SQL_C_WCHAR WCHAR-SIZE (case WCHAR-SIZE ((2) mkstr2) ((4) mkstr4))))
-          ((utf-8)
-           (get-string/utf-8))
-          ((latin-1)
-           (get-string/latin-1))))
-      (define (get-bytes)
-        (get-varbuf SQL_C_BINARY 0
-                    (lambda (buf len fresh?)
-                      ;; avoid copying long data twice:
-                      (if (and fresh? (= len (bytes-length buf)))
-                          buf
-                          (subbytes buf 0 len)))))
-
-      (cond [(or (= typeid SQL_CHAR)
-                 (= typeid SQL_VARCHAR)
-                 (= typeid SQL_LONGVARCHAR)
-                 (= typeid SQL_WCHAR)
-                 (= typeid SQL_WVARCHAR)
-                 (= typeid SQL_WLONGVARCHAR))
-             (get-string)]
-            [(or (= typeid SQL_DECIMAL)
-                 (= typeid SQL_NUMERIC))
-             (let ([fields (get-int-list '(1 1 1 4 4 4 4) SQL_ARD_TYPE)])
-               (cond [(list? fields)
-                      (let* ([precision (first fields)]
-                             [scale (second fields)]
-                             [sign (case (third fields) ((0) -1) ((1) 1))]
-                             [ma (let loop ([lst (cdddr fields)])
-                                   (if (pair? lst)
-                                       (+ (* (loop (cdr lst)) (expt 2 32))
-                                          (car lst))
-                                       0))])
-                        ;; (eprintf "numeric: ~s\n" fields)
-                        (* sign ma (expt 10 (- scale))))]
-                     [(sql-null? fields) sql-null]))]
-            [(or (= typeid SQL_SMALLINT)
-                 (= typeid SQL_INTEGER)
-                 (= typeid SQL_TINYINT))
-             (get-int 4 SQL_C_LONG)]
-            [(or (= typeid SQL_BIGINT))
-             (get-int 8 SQL_C_SBIGINT)]
-            [(or (= typeid SQL_REAL)
-                 (= typeid SQL_FLOAT)
-                 (= typeid SQL_DOUBLE))
-             (get-real SQL_C_DOUBLE)]
-            [(or (= typeid SQL_BIT))
-             (case (get-int 4 SQL_C_LONG)
-               ((0) #f)
-               ((1) #t)
-               (else 'get-column "internal error: SQL_BIT"))]
-            [(or (= typeid SQL_BINARY)
-                 (= typeid SQL_VARBINARY))
-             (get-bytes)]
-            [(= typeid SQL_TYPE_DATE)
-             (let ([fields (get-int-list '(2 2 2) SQL_C_TYPE_DATE)])
-               (cond [(list? fields) (apply sql-date fields)]
-                     [(sql-null? fields) sql-null]))]
-            [(= typeid SQL_TYPE_TIME)
-             (let ([fields (get-int-list '(2 2 2) SQL_C_TYPE_TIME)])
-               (cond [(list? fields) (apply sql-time (append fields (list 0 #f)))]
-                     [(sql-null? fields) sql-null]))]
-            [(= typeid SQL_TYPE_TIMESTAMP)
-             (let ([fields (get-int-list '(2 2 2 2 2 2 4) SQL_C_TYPE_TIMESTAMP)])
-               (cond [(list? fields) (apply sql-timestamp (append fields (list #f)))]
-                     [(sql-null? fields) sql-null]))]
-            [else (get-string)]))
-
-    (define/public (prepare fsym stmt close-on-exec?)
-      (call-with-lock fsym
-        (lambda ()
-          (check-valid-tx-status fsym)
-          (prepare1 fsym stmt close-on-exec?))))
-
-    (define/private (prepare1 fsym sql close-on-exec?)
-      ;; no time between prepare and table entry
-      (let* ([stmt
-              (let*-values ([(db) (get-db fsym)]
-                            [(status stmt) (SQLAllocHandle SQL_HANDLE_STMT db)])
-                (handle-status fsym status db)
-                (with-handlers ([(lambda (e) #t)
-                                 (lambda (e)
-                                   (SQLFreeHandle SQL_HANDLE_STMT stmt)
-                                   (raise e))])
-                  (let ([status (SQLPrepare stmt sql)])
-                    (handle-status fsym status stmt)
-                    stmt)))]
-             [param-typeids (describe-params fsym stmt)]
-             [result-dvecs (describe-result-columns fsym stmt)])
-        (let ([pst (new prepared-statement%
-                        (handle stmt)
-                        (close-on-exec? close-on-exec?)
-                        (param-typeids param-typeids)
-                        (result-dvecs result-dvecs)
-                        (stmt sql)
-                        (stmt-type (classify-odbc-sql sql))
-                        (owner this))])
-          (hash-set! statement-table pst #t)
-          pst)))
-
-    (define/private (describe-params fsym stmt)
-      (let-values ([(status param-count) (SQLNumParams stmt)])
-        (handle-status fsym status stmt)
-        (for/list ([i (in-range 1 (add1 param-count))])
-          (cond [use-describe-param?
-                 (let-values ([(status type size digits nullable)
-                               (SQLDescribeParam stmt i)])
-                   (handle-status fsym status stmt)
-                   type)]
-                [else SQL_UNKNOWN_TYPE]))))
-
-    (define/private (describe-result-columns fsym stmt)
-      (let-values ([(status result-count) (SQLNumResultCols stmt)]
-                   [(scratchbuf) (make-bytes 200)])
-        (handle-status fsym status stmt)
-        (for/list ([i (in-range 1 (add1 result-count))])
-          (let-values ([(status name type size digits nullable)
-                        (SQLDescribeCol stmt i scratchbuf)])
-            (handle-status fsym status stmt)
-            (vector name type size digits)))))
-
-    (define/override (disconnect* _politely?)
-      (super disconnect* _politely?)
-      (start-atomic)
-      (let ([db* db]
-            [env* env])
-        (set! db #f)
-        (set! env #f)
-        (end-atomic)
-        (when db*
-          (let ([statements (hash-map statement-table (lambda (k v) k))])
-            (for ([pst (in-list statements)])
-              (free-statement* 'disconnect pst))
-            (handle-status 'disconnect (SQLDisconnect db*) db*)
-            (handle-status 'disconnect (SQLFreeHandle SQL_HANDLE_DBC db*))
-            (handle-status 'disconnect (SQLFreeHandle SQL_HANDLE_ENV env*))
-            (void)))))
-
-    (define/public (get-base) this)
-
-    (define/public (free-statement pst need-lock?)
-      (define (go) (free-statement* 'free-statement pst))
-      (if need-lock? 
-          (call-with-lock* 'free-statement go go #f)
-          (go)))
-
-    (define/private (free-statement* fsym pst)
-      (start-atomic)
-      (let ([stmt (send pst get-handle)])
-        (send pst set-handle #f)
-        (end-atomic)
-        (when stmt
-          (handle-status 'free-statement (SQLFreeStmt stmt SQL_CLOSE) stmt)
-          (handle-status 'free-statement (SQLFreeHandle SQL_HANDLE_STMT stmt) stmt)
-          (hash-remove! statement-table pst)
-          (void))))
-
-    ;; Transactions
-
-    (define/override (start-transaction* fsym isolation option)
-      (when (eq? isolation 'nested)
-        (error* fsym "already in transaction"
-                #:continued "nested transactions not supported for ODBC connections"))
-      (when option
-        ;; No options supported
-        (raise-argument-error fsym "#f" option))
-      (let* ([db (get-db fsym)]
-             [ok-levels
-              (let-values ([(status value)
-                            (SQLGetInfo db SQL_TXN_ISOLATION_OPTION)])
-                (begin0 value (handle-status fsym status db)))]
-             [default-level
-               (let-values ([(status value)
-                             (SQLGetInfo db SQL_DEFAULT_TXN_ISOLATION)])
-                 (begin0 value (handle-status fsym status db)))]
-             [requested-level
-              (case isolation
-                ((serializable) SQL_TXN_SERIALIZABLE)
-                ((repeatable-read) SQL_TXN_REPEATABLE_READ)
-                ((read-committed) SQL_TXN_READ_COMMITTED)
-                ((read-uncommitted) SQL_TXN_READ_UNCOMMITTED)
-                (else
-                 ;; MySQL ODBC returns 0 for default level, seems no good.
-                 ;; So if 0, use serializable.
-                 (if (zero? default-level) SQL_TXN_SERIALIZABLE default-level)))])
-        (when (zero? (bitwise-and requested-level ok-levels))
-          (error* fsym "requested isolation level is not available"
-                  '("isolation level" value) isolation))
-        (let ([status (SQLSetConnectAttr db SQL_ATTR_TXN_ISOLATION requested-level)])
-          (handle-status fsym status db)))
-      (let ([status (SQLSetConnectAttr db SQL_ATTR_AUTOCOMMIT SQL_AUTOCOMMIT_OFF)])
-        (handle-status fsym status db)
-        (set-tx-status! fsym #t)
-        (void)))
-
-    (define/override (end-transaction* fsym mode _savepoint)
-      ;; _savepoint = #f, because nested transactions not supported on ODBC
-      (let ([db (get-db fsym)]
-            [completion-type
-             (case mode
-               ((commit) SQL_COMMIT)
-               ((rollback) SQL_ROLLBACK))])
-        (handle-status fsym (SQLEndTran db completion-type) db)
-        (let ([status (SQLSetConnectAttr db SQL_ATTR_AUTOCOMMIT SQL_AUTOCOMMIT_ON)])
-          (handle-status fsym status db)
-          ;; commit/rollback can fail; don't change status until possible error handled
-          (set-tx-status! fsym #f)
-          (void))))
-
-    ;; GetTables
-
-    (define/public (list-tables fsym schema)
-      (define (no-search)
-        (error fsym "schema search path cannot be determined for this DBMS"))
-      (let ([stmt
-             (cond
-              [(regexp-match? #rx"^DB2" dbms)
-               (let* ([schema-cond
-                       (case schema
-                         ((search-or-current current)
-                          "tabschema = CURRENT_SCHEMA")
-                         ((search)
-                          (no-search)))]
-                      [type-cond
-                       ;; FIXME: what table types to include? see docs for SYSCAT.TABLES
-                       "(type = 'T' OR type = 'V')"])
-                 (string-append "SELECT tabname FROM syscat.tables "
-                                "WHERE " type-cond " AND " schema-cond))]
-              [(equal? dbms "Oracle")
-               (let* ([schema-cond
-                       (case schema
-                         ((search-or-current current)
-                          "owner = sys_context('userenv', 'current_schema')")
-                         ((search)
-                          (no-search)))])
-                 (string-append "SELECT table_name AS name FROM sys.all_tables "
-                                "WHERE " schema-cond
-                                "UNION "
-                                "SELECT view_name AS name FROM sys.all_views "
-                                "WHERE " schema-cond))]
-              [else
-               (error fsym "not supported for this DBMS")])])
-        (let* ([result (query fsym stmt #f)]
-               [rows (rows-result-rows result)])
-          (for/list ([row (in-list rows)])
-            (vector-ref row 0)))))
-
-    #|
-    (define/public (get-tables fsym catalog schema table)
-      (define-values (dvecs rows)
-        (call-with-lock fsym
-          (lambda ()
-            (let* ([db (get-db fsym)]
-                   [stmt (let-values ([(status stmt) (SQLAllocHandle SQL_HANDLE_STMT db)])
-                           (handle-status fsym status db)
-                           stmt)]
-                   [_ (handle-status fsym (SQLTables stmt catalog schema table))]
-                   [result-dvecs (describe-result-columns fsym stmt)]
-                   [rows (fetch* fsym stmt (map field-dvec->typeid result-dvecs))])
-              (handle-status fsym (SQLFreeStmt stmt SQL_CLOSE) stmt)
-              (handle-status fsym (SQLFreeHandle SQL_HANDLE_STMT stmt) stmt)
-              (values result-dvecs rows)))))
-      ;; Layout is: #(catalog schema table table-type remark)
-      (rows-result (map field-dvec->field-info dvecs)
-                   rows))
-    |#
-
-    ;; Handler
-
-    (define/private (handle-status who s [handle #f]
-                                   #:ignore-ok/info? [ignore-ok/info? #f])
-      (define (handle-error e)
-        ;; On error, driver may rollback whole transaction, last statement, etc.
-        ;; Options:
-        ;;   1) if transaction was rolled back, set autocommit=true
-        ;;   2) automatically rollback on error
-        ;;   3) create flag: "transaction had error, please call rollback" (like pg)
-        ;; Option 1 would be nice, but as far as I can tell, there's
-        ;; no way to find out if the transaction was rolled back. And
-        ;; it would be very bad to leave autocommit=false, because
-        ;; that would be interpreted as "still in same transaction".
-        ;; Go with (3) for now, maybe support (2) as option later.
-        ;; FIXME: I worry about multi-statements like "<cause error>; commit"
-        ;; if the driver does one-statement rollback.
-        (let ([db db])
-          (when db
-            (when (get-tx-status)
-              (set-tx-status! who 'invalid))))
-        (raise e))
-      ;; Be careful: shouldn't do rollback before we call handle-status*
-      ;; just in case rollback destroys statement with diagnostic records.
-      (with-handlers ([exn:fail? handle-error])
-        (handle-status* who s handle
-                        #:ignore-ok/info? ignore-ok/info?
-                        #:on-notice (lambda (sqlstate msg)
-                                      (add-delayed-call!
-                                       (lambda () (notice-handler sqlstate msg)))))))
-
-    (register-finalizer this
-                        (lambda (obj)
-                          ;; Keep a reference to the class to keep all FFI callout objects
-                          ;; (eg, SQLDisconnect) used by its methods from being finalized.
-                          (let ([dont-gc this%])
-                            (send obj disconnect)
-                            ;; Dummy result to prevent reference from being optimized away
-                            dont-gc)))))
-
-;; ----------------------------------------
-
-(define (handle-status* who s [handle #f]
-                        #:ignore-ok/info? [ignore-ok/info? #f]
-                        #:on-notice [on-notice void])
-  (cond [(= s SQL_SUCCESS_WITH_INFO)
-         (when (and handle (not ignore-ok/info?))
-           (diag-info who handle 'notice on-notice))
-         s]
-        [(= s SQL_ERROR)
-         (when handle (diag-info who handle 'error #f))
-         (error who "unknown error (no diagnostic returned)")]
-        [else s]))
-
-(define (diag-info who handle mode on-notice)
-  (let ([handle-type
-         (cond [(sqlhenv? handle) SQL_HANDLE_ENV]
-               [(sqlhdbc? handle) SQL_HANDLE_DBC]
-               [(sqlhstmt? handle) SQL_HANDLE_STMT]
-               [else
-                (error/internal* 'diag-info "unknown handle type" '("handle" value) handle)])])
-    (let-values ([(status sqlstate native-errcode message)
-                  (SQLGetDiagRec handle-type handle 1)])
-      (case mode
-        ((error)
-         (raise-sql-error who sqlstate message
-                          `((code . ,sqlstate)
-                            (message . ,message)
-                            (native-errcode . ,native-errcode))))
-        ((notice)
-         (on-notice sqlstate message))))))
-
-;; ========================================
-
-(define (marshal-decimal f n)
-  (cond [(not (real? n))
-         (error/no-convert f #f "numeric" n)]
-        [(eqv? n +nan.0)
-         "NaN"]
-        [(or (eqv? n +inf.0) (eqv? n -inf.0))
-         (error/no-convert f #f "numeric" n)]
-        [(or (integer? n) (inexact? n))
-         (number->string n)]
-        [(exact? n)
-         ;; Bleah.
-         (or (exact->decimal-string n)
-             (number->string (exact->inexact n)))]))
-
-#|
-Historical note: I tried using ODBC async execution to avoid blocking
-all Racket threads for a long time.
-
-1) The postgresql, mysql, and oracle drivers don't even support async
-execution. Only DB2 (and probably SQL Server, but I didn't try it).
-
-2) Tests using the DB2 driver gave baffling HY010 (function sequence
-error). My best theory so far is that DB2 (or maybe unixodbc) requires
-poll call arguments to be identical to original call arguments, which
-means that I would have to replace all uses of (_ptr o X) with
-something stable across invocations.
-
-All in all, not worth it, especially given #:use-place solution.
-|#
diff --git a/pkgs/db-pkgs/db-lib/db/private/odbc/dbsystem.rkt b/pkgs/db-pkgs/db-lib/db/private/odbc/dbsystem.rkt
deleted file mode 100644
index 704b50874b..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/odbc/dbsystem.rkt
+++ /dev/null
@@ -1,198 +0,0 @@
-#lang racket/base
-(require racket/class
-         db/private/generic/interfaces
-         db/private/generic/common
-         db/private/generic/sql-data
-         db/private/generic/sql-convert)
-(provide dbsystem
-         field-dvec->field-info
-         field-dvec->typeid
-         field-dvec->size
-         field-dvec->digits
-         supported-typeid?
-         classify-odbc-sql)
-
-(define odbc-dbsystem%
-  (class* dbsystem-base% (dbsystem<%>)
-    (define/public (get-short-name) 'odbc)
-    (define/override (get-type-list) type-list)
-    (define/public (has-support? x) #f)
-
-    (define/public (get-parameter-handlers param-typeids)
-      (map get-check param-typeids))
-
-    (define/public (field-dvecs->typeids dvecs)
-      (map (lambda (dvec) (vector-ref dvec 1)) dvecs))
-
-    (define/public (describe-params typeids)
-      (map describe-typeid typeids))
-
-    (define/public (describe-fields dvecs)
-      (for/list ([dvec (in-list dvecs)])
-        (describe-typeid (field-dvec->typeid dvec))))
-
-    (super-new)))
-
-(define dbsystem
-  (new odbc-dbsystem%))
-
-;; ----
-
-(define (field-dvec->field-info dvec)
-  `((name . ,(vector-ref dvec 0))
-    (typeid . ,(vector-ref dvec 1))
-    (size . ,(vector-ref dvec 2))
-    (digits . ,(vector-ref dvec 3))))
-
-(define (field-dvec->typeid dvec)
-  (vector-ref dvec 1))
-(define (field-dvec->size dvec)
-  (vector-ref dvec 2))
-(define (field-dvec->digits dvec)
-  (vector-ref dvec 3))
-
-;; ----
-
-;; SQL "parsing"
-;; We just care about detecting commands that affect transaction status.
-
-;; Since we have no idea what the actual database system is, just cover
-;; standard commands and assume DDL is not transactional.
-
-;; classify-odbc-sql : string [nat] -> symbol/#f
-(define classify-odbc-sql
-  (make-sql-classifier #:hash-comments? #t
-   '(;; Explicit transaction commands
-     ("ROLLBACK TRANSACTION TO"  rollback-savepoint)
-     ("ROLLBACK WORK TO"  rollback-savepoint)
-     ("ROLLBACK TO"       rollback-savepoint)
-     ("RELEASE"           release-savepoint)
-     ("SAVEPOINT"         savepoint)
-     ("START"             start)
-     ("BEGIN"             start)
-     ("COMMIT"            commit)
-     ("END"               commit)
-     ("ROLLBACK"          rollback) ;; Note: after ROLLBACK TO, etc
-
-     ;; Implicit commit
-     ("ALTER"             implicit-commit)
-     ("CREATE"            implicit-commit)
-     ("DROP"              implicit-commit)
-     ("GRANT"             implicit-commit)
-     ("RENAME"            implicit-commit)
-     ("TRUNCATE"          implicit-commit))))
-
-;; ----
-
-(define-syntax-rule
-  (defchecks get-check [(typeid name pred ...) ...] [(*typeid *name *fun) ...])
-  (define get-check
-    (let ([name (mk-check typeid (lambda (z) (or (pred z) ...)) #:contract-parts '(pred ...))] ...
-          [*name *fun] ...)
-      (lambda (x)
-        (case x
-          ((typeid) name) ...
-          ((*typeid) *name) ...
-          (else
-           (lambda (fsym index param)
-             (error/unsupported-type fsym x))))))))
-
-(define (mk-check typeid pred #:contract-parts [ctc-parts #f])
-  (lambda (fsym param)
-    (unless (pred param)
-      (error/no-convert fsym "ODBC" (typeid->type typeid) param
-                        #:contract (cond [(= (length ctc-parts) 1)
-                                          (car ctc-parts)]
-                                         [else (cons 'or/c ctc-parts)])))
-    param))
-
-(define (check-numeric fsym param)
-  (define (bad note)
-    (error/no-convert fsym "ODBC" "numeric" param note))
-  (unless (rational? param) (bad ""))
-  (let ([scaled (exact->scaled-integer (inexact->exact param))])
-    (unless scaled (bad ""))
-    (let ([ma (car scaled)]
-          [ex (cdr scaled)])
-      ;; check (abs ma) fits in 16*8 bits, ex fits in char
-      (unless (<= -128 ex 127) (bad "(scale too large)"))
-      (unless (< (abs ma) (expt 2 (* 16 8))) (bad "(mantissa too long)"))
-      (cons ma ex))))
-
-(defchecks get-check
-  [(0  unknown        string? bytes? rational? boolean? sql-date? sql-time? sql-timestamp?)
-   (1  character      string?)
-   (4  integer        int32?)
-   (5  smallint       int16?)
-   (6  float          real?)
-   (7  real           real?)
-   (8  double         real?)
-   (9  datetime       sql-timestamp?)
-   (12 varchar        string?)
-   (91 date           sql-date?)
-   (92 time           sql-time?)
-   (93 timestamp      sql-timestamp?)
-   (-1 longvarchar    string?)
-   (-2 binary         bytes?)
-   (-3 varbinary      bytes?)
-   (-4 longvarbinary  bytes?)
-   (-5 bigint         int64?)
-   (-6 tinyint        int8?)
-   (-7 bit1           boolean?)
-   (-8 wcharacter     string?)
-   (-9 wvarchar       string?)
-   (-10 wlongvarchar  string?)]
-  [(2  numeric        check-numeric)
-   (3  decimal        check-numeric)])
-
-;; ----
-
-(define-type-table (type-list
-                    typeid->type
-                    describe-typeid)
-
-  (0  unknown        0)
-  (1  character      0)
-  (2  numeric        0)
-  (3  decimal        0)
-  (4  integer        0)
-  (5  smallint       0)
-  (6  float          0)
-  (7  real           0)
-  (8  double         0)
-  (9  datetime       0)
-  (12 varchar        0)
-  (91 date           0)
-  (92 time           0)
-  (93 timestamp      0)
-  (-1 longvarchar    0)
-  (-2 binary         0)
-  (-3 varbinary      0)
-  (-4 longvarbinary  0)
-  (-5 bigint         0)
-  (-6 tinyint        0)
-  (-7 bit1           0) ;; not bit(n), always single bit
-  (-8 wchar          0)
-  (-9 wvarchar       0)
-  (-10 wlongvarchar  0)
-
-  ;; Unsupported types
-
-  (101 interval-year          #f)
-  (102 interval-month         #f)
-  (103 interval-day           #f)
-  (104 interval-hour          #f)
-  (105 interval-minute        #f)
-  (106 interval-second        #f)
-  (107 interval-year-month    #f)
-  (108 interval-day-hour      #f)
-  (109 interval-day-minute    #f)
-  (110 interval-day-second    #f)
-  (111 interval-hour-minute   #f)
-  (112 interval-hour-second   #f)
-  (113 interval-minute-second #f))
-
-(define (supported-typeid? x)
-  (case x
-    ((0 1 2 3 4 5 6 7 8 9 12 91 92 93 -1 -2 -3 -4 -5 -6 -7 -8 -9 -10) #t)
-    (else #f)))
diff --git a/pkgs/db-pkgs/db-lib/db/private/odbc/ffi-constants.rkt b/pkgs/db-pkgs/db-lib/db/private/odbc/ffi-constants.rkt
deleted file mode 100644
index a53f524316..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/odbc/ffi-constants.rkt
+++ /dev/null
@@ -1,206 +0,0 @@
-#lang racket/base
-(provide (all-defined-out))
-
-;; ============================================================
-
-(define SQL_MAX_MESSAGE_LENGTH    512)
-(define SQL_MAX_NUMERIC_LEN       16)
-
-(define SQL_HANDLE_ENV            1)
-(define SQL_HANDLE_DBC            2)
-(define SQL_HANDLE_STMT           3)
-(define SQL_HANDLE_DESC           4)
-
-(define SQL_DRIVER_NOPROMPT       0)
-(define SQL_DRIVER_COMPLETE       1)
-(define SQL_DRIVER_PROMPT         2)
-(define SQL_DRIVER_COMPLETE_REQUIRED 3)
-
-(define SQL_IS_POINTER           -4)
-(define SQL_IS_UINTEGER          -5)
-(define SQL_IS_INTEGER           -6)
-(define SQL_IS_USMALLINT         -7)
-(define SQL_IS_SMALLINT          -8)
-
-(define SQL_ATTR_ODBC_VERSION   200)
-(define SQL_OV_ODBC2              2)
-(define SQL_OV_ODBC3              3)
-
-(define SQL_SUCCESS               0)
-(define SQL_SUCCESS_WITH_INFO     1)
-(define SQL_STILL_EXECUTING       2)
-(define SQL_ERROR                -1)
-(define SQL_INVALID_HANDLE       -2)
-(define SQL_NEED_DATA            99)
-(define SQL_NO_DATA             100)
-
-(define SQL_NULL_DATA            -1)
-(define SQL_DATA_AT_EXEC         -2)
-(define SQL_NO_TOTAL             -4)
-
-(define SQL_UNKNOWN_TYPE          0)
-(define SQL_CHAR                  1)
-(define SQL_NUMERIC               2)
-(define SQL_DECIMAL               3)
-(define SQL_INTEGER               4)
-(define SQL_SMALLINT              5)
-(define SQL_FLOAT                 6)
-(define SQL_REAL                  7)
-(define SQL_DOUBLE                8)
-(define SQL_DATETIME              9)
-(define SQL_VARCHAR              12)
-(define SQL_TYPE_DATE            91)
-(define SQL_TYPE_TIME            92)
-(define SQL_TYPE_TIMESTAMP       93)
-
-(define SQL_DATE                  9)
-(define SQL_TIME                 10)
-(define SQL_TIMESTAMP            11)
-(define SQL_LONGVARCHAR          -1)
-(define SQL_BINARY               -2)
-(define SQL_VARBINARY            -3)
-(define SQL_LONGVARBINARY        -4)
-(define SQL_BIGINT               -5)
-(define SQL_TINYINT              -6)
-(define SQL_BIT                  -7)
-
-(define SQL_WCHAR                -8)
-(define SQL_WVARCHAR             -9)
-(define SQL_WLONGVARCHAR        -10)
-
-(define SQL_CODE_YEAR             1)
-(define SQL_CODE_MONTH            2)
-(define SQL_CODE_DAY              3)
-(define SQL_CODE_HOUR             4)
-(define SQL_CODE_MINUTE           5)
-(define SQL_CODE_SECOND           6)
-(define SQL_CODE_YEAR_TO_MONTH    7)
-(define SQL_CODE_DAY_TO_HOUR      8)
-(define SQL_CODE_DAY_TO_MINUTE    9)
-(define SQL_CODE_DAY_TO_SECOND   10)
-(define SQL_CODE_HOUR_TO_MINUTE  11)
-(define SQL_CODE_HOUR_TO_SECOND  12)
-(define SQL_CODE_MINUTE_TO_SECOND 13)
-
-(define SQL_INTERVAL_YEAR               (+ 100 SQL_CODE_YEAR))
-(define SQL_INTERVAL_MONTH              (+ 100 SQL_CODE_MONTH))
-(define SQL_INTERVAL_DAY                (+ 100 SQL_CODE_DAY))
-(define SQL_INTERVAL_HOUR               (+ 100 SQL_CODE_HOUR))
-(define SQL_INTERVAL_MINUTE             (+ 100 SQL_CODE_MINUTE))
-(define SQL_INTERVAL_SECOND             (+ 100 SQL_CODE_SECOND))
-(define SQL_INTERVAL_YEAR_TO_MONTH      (+ 100 SQL_CODE_YEAR_TO_MONTH))
-(define SQL_INTERVAL_DAY_TO_HOUR        (+ 100 SQL_CODE_DAY_TO_HOUR))
-(define SQL_INTERVAL_DAY_TO_MINUTE      (+ 100 SQL_CODE_DAY_TO_MINUTE))
-(define SQL_INTERVAL_DAY_TO_SECOND      (+ 100 SQL_CODE_DAY_TO_SECOND))
-(define SQL_INTERVAL_HOUR_TO_MINUTE     (+ 100 SQL_CODE_HOUR_TO_MINUTE))
-(define SQL_INTERVAL_HOUR_TO_SECOND     (+ 100 SQL_CODE_HOUR_TO_SECOND))
-(define SQL_INTERVAL_MINUTE_TO_SECOND   (+ 100 SQL_CODE_MINUTE_TO_SECOND))
-
-(define SQL_DATE_LEN             10)
-(define SQL_TIME_LEN              8)
-(define SQL_TIMESTAMP_LEN        19)
-
-(define SQL_NULL_HENV             0)
-(define SQL_NULL_HDBC             0)
-(define SQL_NULL_HSTMT            0)
-(define SQL_NULL_HDESC            0)
-(define SQL_NULL_HANDLE           0)
-
-(define SQL_FETCH_NEXT            1)
-(define SQL_FETCH_FIRST           2)
-
-(define SQL_FETCH_LAST            3)
-(define SQL_FETCH_PRIOR           4)
-(define SQL_FETCH_ABSOLUTE        5)
-(define SQL_FETCH_RELATIVE        6)
-
-(define SQL_CLOSE                 0)
-(define SQL_DROP                  1)
-(define SQL_UNBIND                2)
-(define SQL_RESET_PARAMS          3)
-
-(define SQL_COMMIT                0)
-(define SQL_ROLLBACK              1)
-
-(define SQL_C_CHAR                SQL_CHAR)
-(define SQL_C_LONG                SQL_INTEGER)
-(define SQL_C_SHORT               SQL_SMALLINT)
-(define SQL_C_FLOAT               SQL_REAL)
-(define SQL_C_DOUBLE              SQL_DOUBLE)
-(define SQL_C_NUMERIC             SQL_NUMERIC)
-(define SQL_C_DEFAULT             99)
-(define SQL_ARD_TYPE              -99)
-
-(define SQL_C_DATE                SQL_DATE)
-(define SQL_C_TIME                SQL_TIME)
-(define SQL_C_TIMESTAMP           SQL_TIMESTAMP)
-(define SQL_C_BINARY              SQL_BINARY)
-(define SQL_C_BIT                 SQL_BIT)
-(define SQL_C_TINYINT             SQL_TINYINT)
-#|
-(define SQL_C_SLONG               (+ SQL_C_LONG SQL_SIGNED_OFFSET))
-(define SQL_C_SSHORT              (+ SQL_C_SHORT SQL_SIGNED_OFFSET))
-(define SQL_C_STINYINT            (+ SQL_TINYINT SQL_SIGNED_OFFSET))
-(define SQL_C_ULONG               (+ SQL_C_LONG SQL_UNSIGNED_OFFSET))
-(define SQL_C_USHORT              (+ SQL_C_SHORT SQL_UNSIGNED_OFFSET))
-(define SQL_C_UTINYINT            (+ SQL_TINYINT SQL_UNSIGNED_OFFSET))
-|#
-
-(define SQL_C_WCHAR               SQL_WCHAR)
-
-(define SQL_SIGNED_OFFSET         -20)
-(define SQL_UNSIGNED_OFFSET       -22)
-
-(define SQL_C_TYPE_DATE           SQL_TYPE_DATE)
-(define SQL_C_TYPE_TIME           SQL_TYPE_TIME)
-(define SQL_C_TYPE_TIMESTAMP      SQL_TYPE_TIMESTAMP)
-
-(define SQL_C_INTERVAL_YEAR       SQL_INTERVAL_YEAR)
-(define SQL_C_INTERVAL_MONTH      SQL_INTERVAL_MONTH)
-(define SQL_C_INTERVAL_DAY        SQL_INTERVAL_DAY)
-(define SQL_C_INTERVAL_HOUR       SQL_INTERVAL_HOUR)
-(define SQL_C_INTERVAL_MINUTE     SQL_INTERVAL_MINUTE)
-(define SQL_C_INTERVAL_SECOND     SQL_INTERVAL_SECOND)
-(define SQL_C_INTERVAL_YEAR_TO_MONTH      SQL_INTERVAL_YEAR_TO_MONTH)
-(define SQL_C_INTERVAL_DAY_TO_HOUR        SQL_INTERVAL_DAY_TO_HOUR)
-(define SQL_C_INTERVAL_DAY_TO_MINUTE      SQL_INTERVAL_DAY_TO_MINUTE)
-(define SQL_C_INTERVAL_DAY_TO_SECOND      SQL_INTERVAL_DAY_TO_SECOND)
-(define SQL_C_INTERVAL_HOUR_TO_MINUTE     SQL_INTERVAL_HOUR_TO_MINUTE)
-(define SQL_C_INTERVAL_HOUR_TO_SECOND     SQL_INTERVAL_HOUR_TO_SECOND)
-(define SQL_C_INTERVAL_MINUTE_TO_SECOND   SQL_INTERVAL_MINUTE_TO_SECOND)
-
-(define SQL_C_SBIGINT             (+ SQL_BIGINT SQL_SIGNED_OFFSET))
-(define SQL_C_UBIGINT             (+ SQL_BIGINT SQL_UNSIGNED_OFFSET))
-(define SQL_C_VARBOOKMARK         SQL_C_BINARY)
-
-(define SQL_TYPE_NULL             0)
-
-(define SQL_PARAM_TYPE_UNKNOWN    0)
-(define SQL_PARAM_INPUT           1)
-(define SQL_PARAM_INPUT_OUTPUT    2)
-(define SQL_RESULT_COL            3)
-(define SQL_PARAM_OUTPUT          4)
-(define SQL_RETURN_VALUE          5)
-
-(define SQL_API_SQLDESCRIBEPARAM 58)
-
-(define SQL_ATTR_AUTOCOMMIT     102)
-(define SQL_AUTOCOMMIT_OFF        0)
-(define SQL_AUTOCOMMIT_ON         1)
-
-(define SQL_DEFAULT_TXN_ISOLATION 26)
-(define SQL_TXN_ISOLATION_OPTION  72)
-(define SQL_ATTR_TXN_ISOLATION   108)
-(define SQL_TXN_READ_UNCOMMITTED #x1)
-(define SQL_TXN_READ_COMMITTED   #x2)
-(define SQL_TXN_REPEATABLE_READ  #x4)
-(define SQL_TXN_SERIALIZABLE     #x8)
-
-(define SQL_DBMS_NAME 17)
-
-(define SQL_ATTR_APP_PARAM_DESC 10011)
-(define SQL_ATTR_APP_ROW_DESC 10010)
-(define SQL_DESC_TYPE 1002)
-(define SQL_DESC_PRECISION 1005)
-(define SQL_DESC_SCALE 1006)
-(define SQL_DESC_DATA_PTR 1010)
diff --git a/pkgs/db-pkgs/db-lib/db/private/odbc/ffi.rkt b/pkgs/db-pkgs/db-lib/db/private/odbc/ffi.rkt
deleted file mode 100644
index e409940949..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/odbc/ffi.rkt
+++ /dev/null
@@ -1,453 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         "ffi-constants.rkt")
-(provide (all-from-out "ffi-constants.rkt"))
-(provide (protect-out (all-defined-out)))
-
-(define-cpointer-type _sqlhandle)
-
-(define-cpointer-type _sqlhenv)
-(define-cpointer-type _sqlhdbc)
-(define-cpointer-type _sqlhstmt)
-(define-cpointer-type _sqlhdesc)
-
-(define _sqllen _long)
-(define _sqlulen _ulong)
-
-(define _sqlsmallint _sshort)
-(define _sqlusmallint _ushort)
-(define _sqlinteger _sint)
-(define _sqluinteger _uint)
-(define _sqlreturn _sqlsmallint)
-
-(define-ffi-definer define-mz #f)
-
-(define-mz scheme_utf16_to_ucs4
-  (_fun (src srcstart srcend) ::
-        (src : _bytes)
-        (srcstart : _intptr)
-        (srcend : _intptr)
-        (#f : _pointer)   ;; No buffer so it'll allocate for us.
-        (0 : _intptr)
-        (clen : (_ptr o _intptr))
-        (1 : _intptr)
-        -> (out : _gcpointer)
-        -> (begin (ptr-set! out _int32 clen 0)
-                  (values out clen))))
-
-(define-mz scheme_ucs4_to_utf16
-  (_fun (src srcstart srcend) ::
-        (src : _string/ucs-4)
-        (srcstart : _intptr)
-        (srcend : _intptr)
-        (#f : _pointer)   ;; No buffer so it'll allocate for us.
-        (0 : _intptr)
-        (clen : (_ptr o _intptr))
-        (1 : _intptr)
-        -> (out : _gcpointer)
-        -> (begin (ptr-set! out _int16 clen 0)
-                  (values out clen))))
-
-(define-mz scheme_make_sized_char_string
-  (_fun (chars clen copy?) ::
-        (chars : _gcpointer)
-        (clen  : _intptr)
-        (copy? : _bool)
-        -> _racket))
-
-(define scheme_make_sized_byte_string/string
-  (get-ffi-obj 'scheme_make_sized_byte_string #f
-               (_fun (buf len) ::
-                     (buf : _string/ucs-4)
-                     (len  : _intptr)
-                     (#t : _bool)
-                     -> _racket)))
-
-;; For dealing with param buffers, which must not be moved by GC
-
-(define (copy-buffer buffer)
-  (let* ([buffer (if (string? buffer) (string->bytes/utf-8 buffer) buffer)]
-         [n (bytes-length buffer)]
-         [rawcopy (malloc (add1 n) 'atomic-interior)]
-         [copy (make-sized-byte-string rawcopy n)])
-    (memcpy copy buffer n)
-    (ptr-set! rawcopy _byte n 0)
-    copy))
-
-(define (int->buffer n)
-  (let ([copy (make-sized-byte-string (malloc 4 'atomic-interior) 4)])
-    (integer->integer-bytes n 4 #t (system-big-endian?) copy 0)
-    copy))
-
-(define (cpstr2 str)
-  (let-values ([(shorts slen) (scheme_ucs4_to_utf16 str 0 (string-length str))])
-    (let* ([n (* slen 2)]
-           [rawcopy (malloc (add1 n) 'atomic-interior)]
-           [copy (make-sized-byte-string rawcopy n)])
-      (memcpy copy shorts n)
-      (ptr-set! rawcopy _byte n 0)
-      copy)))
-
-(define (cpstr4 str)
-  (copy-buffer (scheme_make_sized_byte_string/string str (* (string-length str) 4))))
-
-(define (mkstr2 buf len fresh?)
-  (let-values ([(chars clen) (scheme_utf16_to_ucs4 buf 0 (quotient len 2))])
-    (scheme_make_sized_char_string chars clen #f)))
-
-(define (mkstr4 buf len fresh?)
-  (scheme_make_sized_char_string buf (quotient len 4) (not fresh?)))
-
-;; ========================================
-
-;; Used in connection.rkt; silly hack to keep optimizer from eliminating ref to
-;; things that shouldn't be GC'd. Depends on no cross-module inlining.
-(define (strong-void x) (void))
-
-;; ========================================
-
-#|
-Docs at http://msdn.microsoft.com/en-us/library/ms712628%28v=VS.85%29.aspx
-|#
-
-(define-values (odbc-lib WCHAR-SIZE)
-  (case (system-type)
-    ((windows)
-     ;; Windows ODBC defines wchar_t (thus WCHAR, thus SQLWCHAR) as 16-bit
-     (values (ffi-lib "odbc32.dll" #:fail (lambda () #f))
-             2))
-    ((macosx)
-     ;; Mac OS X uses iodbc, which defines SQLWCHAR as wchar_t, as 32-bit
-     (values (ffi-lib "libiodbc" '("2" #f) #:fail (lambda () #f))
-             4))
-    ((unix)
-     (cond [(member (path->string (system-library-subpath #f))
-                    '("i386-openbsd" "x86_64-openbsd"))
-            ;; OpenBSD uses iodbc
-            (values (ffi-lib "libiodbc" '("3.16" #f) #:fail (lambda () #f))
-                    4)]
-           [else
-            ;; Other unixes use unixodbc, which defines WCHAR as 16-bit
-            ;; for compat w/ Windows (even though Linux wchar_t is 32-bit)
-            (values (ffi-lib "libodbc" '("1" #f) #:fail (lambda () #f))
-                    2)]))))
-
-(define-ffi-definer define-odbc odbc-lib
-  #:default-make-fail make-not-available)
-
-(define (ok-status? n)
-  (or (= n SQL_SUCCESS)
-      (= n SQL_SUCCESS_WITH_INFO)))
-
-(define-odbc SQLAllocHandle
-  (_fun (type : _sqlsmallint)
-        (parent : _sqlhandle/null)
-        (handle : (_ptr o _sqlhandle/null))
-        -> (status : _sqlreturn)
-        -> (values status
-                   (cond [handle
-                          (cpointer-push-tag! handle
-                                              (cond [(= type SQL_HANDLE_ENV) sqlhenv-tag]
-                                                    [(= type SQL_HANDLE_DBC) sqlhdbc-tag]
-                                                    [(= type SQL_HANDLE_STMT) sqlhstmt-tag]
-                                                    [else sqlhandle-tag]))
-                          handle]
-                         [else handle]))))
-
-;; SQLSetEnvAttr
-;; must set odbc version env attr before making connection
-
-(define-odbc SQLSetEnvAttr
-  (_fun (env : _sqlhenv)
-        (attr : _sqlinteger)
-        (value-buf : _sqlinteger) ;; (the one case we care about takes int, not ptr)
-        (_sqlinteger = 0)
-        -> _sqlreturn))
-
-(define-odbc SQLGetInfo
-  (_fun (handle info) ::
-        (handle : _sqlhdbc)
-        (info : _sqlusmallint)
-        (value : (_ptr o _sqluinteger)) ;; the one case we care about is uint, not char
-        (0 : _sqlsmallint)
-        (#f : _pointer)
-        -> (status : _sqlreturn)
-        -> (values status value)))
-
-(define-odbc SQLGetInfo-string
-  (_fun (handle info) ::
-        (handle : _sqlhdbc)
-        (info : _sqlusmallint)
-        (value : _bytes = (make-bytes 250))
-        (250 : _sqlsmallint)
-        (len : (_ptr o _sqlsmallint))
-        -> (status : _sqlreturn)
-        -> (values status
-                   (and (ok-status? status)
-                        (bytes->string/utf-8 value #f 0 len))))
-  #:c-id SQLGetInfo)
-
-
-(define-odbc SQLGetFunctions
-  (_fun (handle : _sqlhdbc)
-        (function-id : _sqlusmallint)
-        (supported? : (_ptr o _sqlusmallint))
-        -> (status : _sqlreturn)
-        -> (values status (positive? supported?))))
-
-(define-odbc SQLConnect
-  (_fun (handle server user auth) ::
-        (handle : _sqlhdbc)
-        (server : _string)
-        ((string-utf-8-length server) : _sqlsmallint)
-        (user : _string)
-        ((if user (string-utf-8-length user) 0) : _sqlsmallint)
-        (auth : _string)
-        ((if auth (string-utf-8-length auth) 0) : _sqlsmallint)
-        -> _sqlreturn))
-
-(define-odbc SQLDriverConnect
-  (_fun (handle connection driver-completion) ::
-        (handle : _sqlhdbc)
-        (#f : _pointer)
-        (connection : _string)
-        ((if connection (string-utf-8-length connection) 0) : _sqlsmallint)
-        (#f : _bytes)
-        (0 : _sqlsmallint)
-        (out-length : (_ptr o _sqlsmallint))
-        (driver-completion : _sqlusmallint)
-        -> (status : _sqlreturn)
-        -> status))
-
-(define-odbc SQLBrowseConnect
-  (_fun (handle in-conn-string) ::
-        (handle : _sqlhdbc)
-        (in-conn-string : _string)
-        ((if in-conn-string (string-utf-8-length in-conn-string) 0) : _sqlsmallint)
-        (out-buf : _bytes = (make-bytes 1024))
-        ((bytes-length out-buf) : _sqlsmallint)
-        (out-len : (_ptr o _sqlsmallint))
-        -> (status : _sqlreturn)
-        -> (values status
-                   (and (ok-status? status)
-                        (bytes->string/utf-8 out-buf #f 0 out-len)))))
-
-(define-odbc SQLDataSources
-  (_fun (handle direction server-buf descr-buf) ::
-        (handle : _sqlhenv)
-        (direction : _sqlusmallint)
-        (server-buf : _bytes)
-        ((bytes-length server-buf) : _sqlsmallint)
-        (server-length : (_ptr o _sqlsmallint))
-        (descr-buf : _bytes)
-        ((bytes-length descr-buf) : _sqlsmallint)
-        (descr-length : (_ptr o _sqlsmallint))
-        -> (status : _sqlreturn)
-        -> (values status
-                   (and (ok-status? status)
-                        (bytes->string/utf-8 server-buf #f 0 server-length))
-                   (and (ok-status? status)
-                        (bytes->string/utf-8 descr-buf #f 0 descr-length)))))
-
-(define-odbc SQLDrivers
-  (_fun (handle direction driver-buf attrs-buf) ::
-        (handle : _sqlhenv)
-        (direction : _sqlusmallint)
-        (driver-buf : _bytes)
-        ((bytes-length driver-buf) : _sqlsmallint)
-        (driver-length : (_ptr o _sqlsmallint))
-        (attrs-buf : _bytes)
-        ((if attrs-buf (bytes-length attrs-buf) 0) : _sqlsmallint)
-        (attrs-length : (_ptr o _sqlsmallint))
-        -> (status : _sqlreturn)
-        -> (if (ok-status? status)
-               (values status
-                       (bytes->string/utf-8 driver-buf #f 0 driver-length)
-                       attrs-length)
-               (values status #f #f))))
-
-(define-odbc SQLPrepare
-  (_fun (handle stmt) ::
-        (handle : _sqlhstmt)
-        (stmt : _string)
-        ((string-utf-8-length stmt) : _sqlinteger)
-        -> _sqlreturn))
-
-(define-odbc SQLBindParameter
-  (_fun (handle param-num iomode c-type sql-type column-size digits value len-or-ind) ::
-        (handle : _sqlhstmt)
-        (param-num : _sqlusmallint)
-        (iomode : _sqlsmallint)
-        (c-type : _sqlsmallint)
-        (sql-type : _sqlsmallint)
-        (column-size : _sqlulen)
-        (digits : _sqlsmallint)
-        (value : _pointer) ;; must be pinned until after SQLExecute called
-        ((if (bytes? value) (bytes-length value) 0) : _sqllen) ;; ignored for fixed-length data
-        (len-or-ind : _pointer) ;; _sqllen-pointer)
-        -> _sqlreturn))
-
-(define-odbc SQLExecute
-  (_fun (handle : _sqlhstmt)
-        -> _sqlreturn))
-
-(define-odbc SQLNumParams
-  (_fun (handle : _sqlhstmt)
-        (count : (_ptr o _sqlsmallint))
-        -> (status : _sqlreturn)
-        -> (values status count)))
-
-(define-odbc SQLDescribeParam
-  (_fun (handle : _sqlhstmt)
-        (parameter : _sqlusmallint)
-        (data-type : (_ptr o _sqlsmallint))
-        (size : (_ptr o _sqlulen))
-        (digits : (_ptr o _sqlsmallint))
-        (nullable : (_ptr o _sqlsmallint))
-        -> (status : _sqlreturn)
-        -> (values status data-type size digits nullable)))
-
-(define-odbc SQLNumResultCols
-  (_fun (handle : _sqlhstmt)
-        (count : (_ptr o _sqlsmallint))
-        -> (status : _sqlreturn)
-        -> (values status count)))
-
-(define-odbc SQLDescribeCol
-  (_fun (handle column column-buf) ::
-        (handle : _sqlhstmt)
-        (column : _sqlusmallint)
-        (column-buf : _bytes)
-        (_sqlsmallint = (if column-buf (bytes-length column-buf) 0))
-        (column-len : (_ptr o _sqlsmallint))
-        (data-type : (_ptr o _sqlsmallint))
-        (size : (_ptr o _sqlulen))
-        (digits : (_ptr o _sqlsmallint))
-        (nullable : (_ptr o _sqlsmallint))
-        -> (status : _sqlreturn)
-        -> (values status
-                   (and (ok-status? status)
-                        column-buf
-                        (bytes->string/utf-8 column-buf #f 0 column-len))
-                   data-type size digits nullable)))
-
-(define-odbc SQLFetch
-  (_fun _sqlhstmt
-        -> _sqlreturn))
-
-(define-odbc SQLGetData
-  (_fun (handle column target-type buffer start) ::
-        (handle : _sqlhstmt)
-        (column : _sqlusmallint)
-        (target-type : _sqlsmallint)
-        ((ptr-add buffer start) : _gcpointer)
-        ((- (bytes-length buffer) start) : _sqllen)
-        (len-or-ind : (_ptr o _sqllen))
-        -> (status : _sqlreturn)
-        -> (values status len-or-ind)))
-
-(define-odbc SQLGetStmtAttr/HDesc
-  (_fun (handle attr) ::
-        (handle : _sqlhstmt)
-        (attr :   _sqlinteger)
-        (valptr : (_ptr o _sqlhdesc))
-        (buflen : _sqlinteger = 0)
-        (strlen : _pointer = #f)
-        -> (status : _sqlreturn)
-        -> (and (ok-status? status) valptr))
-  #:c-id SQLGetStmtAttr)
-
-(define-odbc SQLSetDescField/Int
-  (_fun (handle recno fieldid intval) ::
-        (handle  : _sqlhdesc)
-        (recno   : _sqlsmallint)
-        (fieldid : _sqlsmallint)
-        (intval  : _intptr)  ;; declared SQLPOINTER; cast
-        (buflen : _sqlinteger = 0)
-        -> (status : _sqlreturn))
-  #:c-id SQLSetDescField)
-
-(define-odbc SQLSetDescField/Ptr
-  (_fun (handle recno fieldid ptrval buflen) ::
-        (handle  : _sqlhdesc)
-        (recno   : _sqlsmallint)
-        (fieldid : _sqlsmallint)
-        (ptrval  : _pointer)  ;; declared SQLPOINTER; cast
-        (buflen : _sqlinteger)
-        -> (status : _sqlreturn))
-  #:c-id SQLSetDescField)
-
-(define-odbc SQLFreeStmt
-  (_fun (handle : _sqlhstmt)
-        (option : _sqlusmallint)
-        -> _sqlreturn))
-
-(define-odbc SQLCloseCursor
-  (_fun (handle : _sqlhstmt)
-        -> _sqlreturn))
-
-(define-odbc SQLDisconnect
-  (_fun (handle : _sqlhdbc)
-        -> _sqlreturn))
-
-(define-odbc SQLFreeHandle
-  (_fun (handle-type : _sqlsmallint)
-        (handle : _sqlhandle)
-        -> _sqlreturn))
-
-(define-odbc SQLGetDiagRec
-  (_fun (handle-type handle rec-number) ::
-        (handle-type : _sqlsmallint)
-        (handle : _sqlhandle)
-        (rec-number : _sqlsmallint)
-        (sql-state-buf : _bytes = (make-bytes 6))
-        (native-errcode : (_ptr o _sqlinteger))
-        (message-buf : _bytes = (make-bytes 1024))
-        ((bytes-length message-buf) : _sqlsmallint)
-        (message-len : (_ptr o _sqlsmallint))
-        -> (status : _sqlreturn)
-        -> (values status
-                   (and (ok-status? status)
-                        (bytes->string/utf-8 sql-state-buf #\? 0 5))
-                   native-errcode
-                   (and (ok-status? status)
-                        (bytes->string/utf-8 message-buf #\? 0 message-len)))))
-
-(define-odbc SQLEndTran
-  (_fun (handle completion-type) ::
-        (_sqlsmallint = SQL_HANDLE_DBC)
-        (handle : _sqlhandle)
-        (completion-type : _sqlsmallint)
-        -> _sqlreturn))
-
-(define-odbc SQLGetConnectAttr
-  (_fun (handle attr) ::
-        (handle : _sqlhdbc)
-        (attr : _sqlinteger)
-        (value : (_ptr o _sqluinteger)) ;; the attrs we care about have uint value
-        (buflen : _sqlinteger = 0) ;; ignored
-        (#f : _pointer)
-        -> (status : _sqlreturn)
-        -> (values status value)))
-
-(define-odbc SQLSetConnectAttr
-  (_fun (handle attr value) ::
-        (handle : _sqlhdbc)
-        (attr : _sqlinteger)
-        (value : _sqluinteger) ;; the attrs we care about have uint value
-        (_sqlinteger = 0)
-        -> _sqlreturn))
-
-(define-odbc SQLTables
-  (_fun (handle catalog schema table) ::
-        (handle : _sqlhstmt)
-        (catalog : _string)
-        (_sqlsmallint = (if catalog (string-utf-8-length catalog) 0))
-        (schema : _string)
-        (_sqlsmallint = (if schema (string-utf-8-length schema) 0))
-        (table : _string)
-        (_sqlsmallint = (if table (string-utf-8-length table) 0))
-        (_bytes = #f)
-        (_sqlsmallint = 0)
-        -> _sqlreturn))
diff --git a/pkgs/db-pkgs/db-lib/db/private/odbc/main.rkt b/pkgs/db-pkgs/db-lib/db/private/odbc/main.rkt
deleted file mode 100644
index f31a8e55b2..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/odbc/main.rkt
+++ /dev/null
@@ -1,131 +0,0 @@
-#lang racket/base
-(require racket/class
-         db/private/generic/interfaces
-         db/private/generic/common
-         db/private/generic/place-client
-         "connection.rkt"
-         "dbsystem.rkt"
-         "ffi.rkt")
-(provide odbc-connect
-         odbc-driver-connect
-         odbc-data-sources
-         odbc-drivers)
-
-(define (odbc-connect #:dsn dsn
-                      #:user [user #f]
-                      #:password [auth #f]
-                      #:notice-handler [notice-handler void]
-                      #:strict-parameter-types? [strict-parameter-types? #f]
-                      #:character-mode [char-mode 'wchar]
-                      #:use-place [use-place #f])
-  (cond [use-place
-         (place-connect (list 'odbc dsn user auth strict-parameter-types? char-mode)
-                        odbc-proxy%)]
-        [else
-         (let ([notice-handler (make-handler notice-handler "notice")])
-           (call-with-env 'odbc-connect
-             (lambda (env)
-               (call-with-db 'odbc-connect env
-                 (lambda (db)
-                   (let ([status (SQLConnect db dsn user auth)])
-                     (handle-status* 'odbc-connect status db)
-                     (new connection%
-                          (env env)
-                          (db db)
-                          (notice-handler notice-handler)
-                          (strict-parameter-types? strict-parameter-types?)
-                          (char-mode char-mode))))))))]))
-
-(define (odbc-driver-connect connection-string
-                             #:notice-handler [notice-handler void]
-                             #:strict-parameter-types? [strict-parameter-types? #f]
-                             #:character-mode [char-mode 'wchar]
-                             #:use-place [use-place #f])
-  (cond [use-place
-         (place-connect (list 'odbc-driver connection-string strict-parameter-types? char-mode)
-                        odbc-proxy%)]
-        [else
-         (let ([notice-handler (make-handler notice-handler "notice")])
-           (call-with-env 'odbc-driver-connect
-             (lambda (env)
-               (call-with-db 'odbc-driver-connect env
-                 (lambda (db)
-                   (let ([status (SQLDriverConnect db connection-string SQL_DRIVER_NOPROMPT)])
-                     (handle-status* 'odbc-driver-connect status db)
-                     (new connection%
-                          (env env)
-                          (db db)
-                          (notice-handler notice-handler)
-                          (strict-parameter-types? strict-parameter-types?)
-                          (char-mode char-mode))))))))]))
-
-(define (odbc-data-sources)
-  (define server-buf (make-bytes 1024))
-  (define descr-buf (make-bytes 1024))
-  (call-with-env 'odbc-data-sources
-    (lambda (env)
-      (begin0
-          (let loop ()
-            (let-values ([(status name description)
-                          (SQLDataSources env SQL_FETCH_NEXT server-buf descr-buf)])
-              (cond [(or (= status SQL_SUCCESS) (= status SQL_SUCCESS_WITH_INFO))
-                     (cons (list name description) (loop))]
-                    [else ;; SQL_NO_DATA
-                     null])))
-        (handle-status* 'odbc-data-sources (SQLFreeHandle SQL_HANDLE_ENV env))))))
-
-(define (odbc-drivers)
-  (define driver-buf (make-bytes 1000))
-  (define attr-buf (make-bytes 2000))
-  (call-with-env 'odbc-drivers
-   (lambda (env)
-     (let ([result
-            (let loop ()
-              (let-values ([(status name attrlen) ;; & writes to attr-buf
-                            (SQLDrivers env SQL_FETCH_NEXT driver-buf attr-buf)])
-                (cond [(or (= status SQL_SUCCESS) (= status SQL_SUCCESS_WITH_INFO))
-                       (cons (list name (parse-driver-attrs attr-buf attrlen))
-                             (loop))]
-                      [else null])))])  ;; SQL_NO_DATA
-       (handle-status* 'odbc-drivers (SQLFreeHandle SQL_HANDLE_ENV env))
-       result))))
-
-(define (parse-driver-attrs buf len)
-  (let* ([attrs (regexp-split #rx#"\0" buf 0 len)])
-    (filter values
-            (for/list ([p (in-list attrs)]
-                       #:when (positive? (bytes-length p)))
-              (let* ([s (bytes->string/utf-8 p)]
-                     [m (regexp-match-positions #rx"=" s)])
-                ;; Sometimes (eg iodbc on openbsd), returns ill-formatted attr-buf; just discard
-                (and m
-                     (let ([=-pos (caar m)])
-                       (cons (substring s 0 =-pos) (substring s (+ 1 =-pos))))))))))
-
-(define odbc-proxy%
-  (class place-proxy-connection%
-    (super-new)
-    (define/override (get-dbsystem) dbsystem)))
-
-;; ----
-
-;; Aux functions to free handles on error.
-
-(define (call-with-env fsym proc)
-  (let-values ([(status env) (SQLAllocHandle SQL_HANDLE_ENV #f)])
-    (with-handlers ([(lambda (e) #t)
-                     (lambda (e)
-                       (SQLFreeHandle SQL_HANDLE_ENV env)
-                       (raise e))])
-      (handle-status* fsym status env)
-      (handle-status* fsym (SQLSetEnvAttr env SQL_ATTR_ODBC_VERSION SQL_OV_ODBC3))
-      (proc env))))
-
-(define (call-with-db fsym env proc)
-  (let-values ([(status db) (SQLAllocHandle SQL_HANDLE_DBC env)])
-    (with-handlers ([(lambda (e) #t)
-                     (lambda (e)
-                       (SQLFreeHandle SQL_HANDLE_DBC db)
-                       (raise e))])
-      (handle-status* fsym status db)
-      (proc db))))
diff --git a/pkgs/db-pkgs/db-lib/db/private/postgresql/connection.rkt b/pkgs/db-pkgs/db-lib/db/private/postgresql/connection.rkt
deleted file mode 100644
index 5b3281a065..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/postgresql/connection.rkt
+++ /dev/null
@@ -1,713 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/match
-         file/md5
-         openssl
-         unstable/error
-         db/private/generic/interfaces
-         db/private/generic/common
-         db/private/generic/sql-data
-         db/private/generic/prepared
-         "message.rkt"
-         "dbsystem.rkt")
-(provide connection%
-         password-hash)
-
-;; ========================================
-
-;; connector<%>
-;; Manages making connections
-(define connector<%>
-  (interface ()
-    attach-to-ports              ;; input-port output-port -> void
-    start-connection-protocol))  ;; string string string/#f -> void
-
-(define connection-base%
-  (class* statement-cache% (connection<%> connector<%>)
-    (init-private notice-handler
-                  notification-handler
-                  allow-cleartext-password?)
-    (define inport #f)
-    (define outport #f)
-    (define process-id #f)
-    (define integer-datetimes? 'unknown)  ;; see connect:after-auth
-
-    (inherit call-with-lock
-             call-with-lock*
-             add-delayed-call!
-             get-tx-status
-             set-tx-status!
-             check-valid-tx-status
-             check-statement/tx
-             tx-state->string
-             dprintf
-             prepare1
-             check/invalidate-cache)
-
-    (super-new)
-
-    ;; ========================================
-
-    ;; == Communication
-    #|
-    During initial setup, okay to send and recv directly, since reference
-    to connection does not escape to user. In particular, no danger of trying
-    to start a new exchange on top of an incomplete failed one.
-
-    After initial setup, communication can only happen within lock, and any
-    error (other than exn:fail:sql) that occurs between sending the message
-    buffer (flush-message-buffer) and receiving the last message (recv-message)
-    must cause the connection to disconnect. Such errors include communication
-    errors and breaks.
-    |#
-
-    ;; message-buffer : reversed list of messages
-    (define message-buffer null)
-
-    ;; fresh-exchange : -> void
-    (define/private (fresh-exchange)
-      (set! message-buffer null))
-
-    ;; buffer-message : message -> void
-    (define/private (buffer-message msg)
-      (dprintf "  >> ~s\n" msg)
-      (set! message-buffer (cons msg message-buffer)))
-
-    ;; flush-message-buffer : -> void
-    (define/private (flush-message-buffer)
-      (for ([msg (in-list (reverse message-buffer))])
-        (write-message msg outport))
-      (set! message-buffer null)
-      (flush-output outport))
-
-    ;; send-message : message -> void
-    (define/private (send-message msg)
-      (buffer-message msg)
-      (flush-message-buffer))
-
-    (define/private (call-with-sync fsym proc)
-      (buffer-message (make-Sync))
-      (with-handlers ([(lambda (e) #t)
-                       (lambda (e)
-                         ;; Anything but exn:fail:sql (raised by recv-message) indicates
-                         ;; a communication error.
-                         ;; Alternative: could have check-ready-for-query set a done-reading flag.
-                         (unless (exn:fail:sql? e)
-                           (disconnect* #f))
-                         (raise e))])
-        (flush-message-buffer)
-        (begin0 (proc)
-          (check-ready-for-query fsym #f))))
-
-    ;; recv-message : symbol -> message
-    (define/private (recv-message fsym)
-      (let ([r (raw-recv)])
-        (cond [(ErrorResponse? r)
-               ;; No need to check for FATAL errors here and disconnect, because
-               ;; followed by EOF, handled by check-ready-for-query.
-               (check-ready-for-query fsym #t)
-               (raise-backend-error fsym r)]
-              [(or (NoticeResponse? r)
-                   (NotificationResponse? r)
-                   (ParameterStatus? r))
-               (handle-async-message fsym r)
-               (recv-message fsym)]
-              [else r])))
-
-    ;; raw-recv : -> message
-    (define/private (raw-recv)
-      (let ([r (parse-server-message inport)])
-        (dprintf "  << ~s\n" r)
-        r))
-
-    ;; check-ready-for-query : symbol -> void
-    (define/private (check-ready-for-query fsym or-eof?)
-      (let ([r (recv-message fsym)])
-        (cond [(ReadyForQuery? r)
-               ;; Update transaction status
-               (set-tx-status! fsym
-                               (case (ReadyForQuery-transaction-status r)
-                                 ((idle) #f)
-                                 ((transaction) #t)
-                                 ((failed) 'invalid)))]
-              [(and or-eof? (eof-object? r))
-               (disconnect* #f)]
-              [else (error/comm fsym "expecting ready-for-query")])))
-
-    ;; == Asynchronous messages
-
-    ;; handle-async-message : message -> void
-    (define/private (handle-async-message fsym msg)
-      (match msg
-        [(struct NoticeResponse (properties))
-         (let ([code (cdr (assq 'code properties))]
-               [message (cdr (assq 'message properties))])
-           (add-delayed-call! (lambda () (notice-handler code message))))]
-        [(struct NotificationResponse (pid condition info))
-         (add-delayed-call! (lambda () (notification-handler condition)))]
-        [(struct ParameterStatus (name value))
-         (cond [(equal? name "client_encoding")
-                (unless (equal? value "UTF8")
-                  (disconnect* #f)
-                  (error* fsym "client character encoding changed, disconnecting"
-                          '("new encoding" value) value))]
-               [(equal? name "integer_datetimes")
-                (set! integer-datetimes? (equal? value "on"))]
-               [else (void)])]))
-
-    ;; == Connection management
-
-    ;; disconnect* : boolean -> void
-    (define/override (disconnect* politely?)
-      (super disconnect* politely?)
-      (let ([outport* outport]
-            [inport* inport])
-        (when outport*
-          (when politely?
-            (send-message (make-Terminate)))
-          (close-output-port outport*)
-          (set! outport #f))
-        (when inport*
-          (close-input-port inport*)
-          (set! inport #f))))
-
-    ;; connected? : -> boolean
-    (define/override (connected?)
-      (let ([outport outport])
-        (and outport (not (port-closed? outport)))))
-
-    ;; == System
-
-    (define/public (get-dbsystem)
-      (if integer-datetimes?
-          dbsystem/integer-datetimes
-          dbsystem/floating-point-datetimes))
-
-    ;; ========================================
-
-    ;; == Connect
-
-    ;; attach-to-ports : input-port output-port -> void
-    (define/public (attach-to-ports in out)
-      (set! inport in)
-      (set! outport out))
-
-    ;; start-connection-protocol : string string string/#f -> void
-    (define/public (start-connection-protocol dbname username password)
-      (call-with-lock 'postgresql-connect
-        (lambda ()
-          (send-message
-           (make-StartupMessage
-            (list (cons "user" username)
-                  (cons "database" dbname)
-                  (cons "client_encoding" "UTF8")
-                  (cons "DateStyle" "ISO, MDY"))))
-          (connect:expect-auth username password))))
-
-    ;; connect:expect-auth : string/#f -> ConnectionResult
-    (define/private (connect:expect-auth username password)
-      (let ([r (recv-message 'postgresql-connect)])
-        (match r
-          [(struct AuthenticationOk ())
-           (connect:expect-ready-for-query)]
-          [(struct AuthenticationCleartextPassword ())
-           (unless (string? password)
-             (error/need-password 'postgresql-connect))
-           (unless allow-cleartext-password?
-             (error/no-support 'postgresql-connect "cleartext password"))
-           (send-message (make-PasswordMessage password))
-           (connect:expect-auth username password)]
-          [(struct AuthenticationCryptPassword (salt))
-           (error/no-support 'postgresql-connect "crypt()-encrypted password")]
-          [(struct AuthenticationMD5Password (salt))
-           (unless password
-             (error/need-password 'postgresql-connect))
-           (send-message (make-PasswordMessage (md5-password username password salt)))
-           (connect:expect-auth username password)]
-          [(struct AuthenticationKerberosV5 ())
-           (error/no-support 'postgresql-connect "KerberosV5 authentication")]
-          [(struct AuthenticationSCMCredential ())
-           (error/no-support 'postgresql-connect "SCM authentication")]
-          ;; ErrorResponse handled by recv-message
-          [_ (error/comm 'postgresql-connect "during authentication")])))
-
-    ;; connect:expect-ready-for-query : -> void
-    (define/private (connect:expect-ready-for-query)
-      (let ([r (recv-message 'postgresql-connect)])
-        (match r
-          [(struct ReadyForQuery (status))
-           (connect:after-auth)]
-          [(struct BackendKeyData (pid secret))
-           (set! process-id pid)
-           (connect:expect-ready-for-query)]
-          [_
-           (error/comm 'postgresql-connect "after authentication")])))
-
-    ;; connect:after-auth : -> void
-    (define/private (connect:after-auth)
-      (when (eq? integer-datetimes? 'unknown)
-        ;; According to http://www.postgresql.org/docs/8.4/static/libpq-status.html
-        ;; (see PQparameterStatus), versions of PostgreSQL before 8.0 do not send
-        ;; (or AFAICT even *have*) the "integer_datetimes" parameter on startup.
-        ;; Version 7.4.8 from Ubuntu 5.10 uses integer datetimes, no config var.
-        ;; Version 7.4.6 from Fedora Core 3 uses floating-point, no config var.
-        ;; So determine by trying query w/ integer; if wrong result, try float.
-        (dprintf "  ** testing datetime representation\n")
-        (let ([r (internal-query1 'postgresql-connect "select time '12:34:56'")])
-          (define (test-config)
-            (match (query1:process-result 'postgresql-connect r)
-              [(rows-result _ (list (vector (sql-time 12 34 56 0 #f)))) #t]
-              [_ #f]))
-          (set! integer-datetimes? #t)
-          (unless (test-config)
-            (set! integer-datetimes? #f)
-            (unless (test-config)
-              (error/internal 'postgresql-connect
-                              "unable to determine server datetime representation")))
-          (dprintf "  ** datetime representation = ~a\n"
-                   (if integer-datetimes? "integer" "floating-point")))))
-
-    ;; ============================================================
-
-    ;; == Query
-
-    ;; query : symbol Statement boolean -> QueryResult
-    (define/public (query fsym stmt cursor?)
-      (let ([result
-             (call-with-lock fsym
-               (lambda ()
-                 (check-valid-tx-status fsym)
-                 (let* ([stmt (check-statement fsym stmt cursor?)]
-                        [pst (statement-binding-pst stmt)]
-                        [stmt-type (send pst get-stmt-type)]
-                        [close-on-exec? (and (not cursor?) (send pst get-close-on-exec?))])
-                   (check-statement/tx fsym stmt-type)
-                   (when cursor?
-                     (unless (eq? (get-tx-status) #t)
-                       (error fsym "cursor allowed only within transaction")))
-                   (query1 fsym stmt close-on-exec? cursor?))))])
-        (query1:process-result fsym result)))
-
-    (define/private (query1 fsym stmt close-on-exec? cursor?)
-      ;; if stmt is string, must take no params & results must be binary-readable
-      (fresh-exchange)
-      (let* ([delenda (check/invalidate-cache stmt)]
-             [portal (query1:enqueue delenda stmt close-on-exec? cursor?)])
-        (call-with-sync fsym
-          (lambda ()
-            (query1:collect fsym delenda stmt portal (string? stmt) close-on-exec? cursor?)))))
-
-    ;; check-statement : symbol statement -> statement-binding
-    ;; Convert to statement-binding; need to prepare to get type information, used to
-    ;; choose result formats.
-    ;; FIXME: if text format eliminated, can skip prepare
-    ;; FIXME: can use classify-pg-sql to avoid preparing stmts with no results
-    (define/private (check-statement fsym stmt cursor?)
-      (cond [(statement-binding? stmt)
-             (let ([pst (statement-binding-pst stmt)])
-               (send pst check-owner fsym this stmt)
-               stmt)]
-            [(string? stmt)
-             (let ([pst (prepare1 fsym stmt (not cursor?))])
-               (send pst bind fsym null))]))
-
-    ;; query1:enqueue : Statement boolean boolean -> string
-    (define/private (query1:enqueue delenda stmt close-on-exec? cursor?)
-      (when delenda
-        (for ([(_sql pst) (in-hash delenda)])
-          (buffer-message (make-Close 'statement (send pst get-handle)))
-          (send pst set-handle #f)))
-      (let ([portal (if cursor? (generate-name) "")])
-        (cond [(statement-binding? stmt)
-               (let* ([pst (statement-binding-pst stmt)]
-                      [pst-name (send pst get-handle)]
-                      [params (statement-binding-params stmt)])
-                 (unless pst-name
-                   (error/internal* 'query1:enqueue "statement was deleted"
-                                    "statement" (send pst get-stmt)))
-                 (buffer-message (make-Bind portal pst-name
-                                            (map typeid->format (send pst get-param-typeids))
-                                            params
-                                            (map typeid->format (send pst get-result-typeids)))))]
-              [(string? stmt)
-               (buffer-message (make-Parse "" stmt '()))
-               (buffer-message (make-Bind portal "" '() '() '(1)))])
-        (buffer-message (make-Describe 'portal portal))
-        (unless cursor?
-          (buffer-message (make-Execute portal 0))
-          (buffer-message (make-Close 'portal portal))
-          (when close-on-exec?
-            (let ([pst (statement-binding-pst stmt)])
-              (buffer-message (make-Close 'statement (send pst get-handle)))
-              (send pst set-handle #f))))
-        portal))
-
-    (define/private (query1:collect fsym delenda stmt portal simple? close-on-exec? cursor?)
-      (when delenda
-        (for ([(_sql _pst) (in-hash delenda)])
-          (match (recv-message fsym)
-            [(struct CloseComplete ()) (void)]
-            [other-r (query1:error fsym other-r)])))
-      (when simple?
-        (match (recv-message fsym)
-          [(struct ParseComplete ()) (void)]
-          [other-r (query1:error fsym other-r)]))
-      (match (recv-message fsym)
-        [(struct BindComplete ()) (void)]
-        [other-r (query1:error fsym other-r)])
-      (match (recv-message fsym)
-        [(struct RowDescription (field-dvecs))
-         (cond [cursor?
-                (vector 'cursor field-dvecs stmt portal)]
-               [else
-                (let* ([rows (query1:data-loop fsym #f)])
-                  (query1:expect-close-complete fsym close-on-exec?)
-                  (vector 'rows field-dvecs rows))])]
-        [(struct NoData ())
-         (let* ([command (query1:expect-completion fsym)])
-           (query1:expect-close-complete fsym close-on-exec?)
-           (vector 'command command))]
-        [other-r (query1:error fsym other-r)]))
-
-    (define/private (query1:data-loop fsym end-box)
-      (match (recv-message fsym)
-        [(struct DataRow (row))
-         (cons row (query1:data-loop fsym end-box))]
-        [(struct CommandComplete (command))
-         (when end-box (set-box! end-box #t))
-         null]
-        [(struct PortalSuspended ())
-         null]
-        [other-r (query1:error fsym other-r)]))
-
-    (define/private (query1:expect-completion fsym)
-      (match (recv-message fsym)
-        [(struct CommandComplete (command)) command]
-        [(struct EmptyQueryResponse ()) '()]
-        [other-r (query1:error fsym other-r)]))
-
-    (define/private (query1:expect-close-complete fsym close-on-exec?)
-      (match (recv-message fsym)
-        [(struct CloseComplete ())
-         (when close-on-exec? (query1:expect-close-complete fsym #f))]
-        [other-r (query1:error fsym other-r)]))
-
-    (define/private (query1:error fsym r)
-      (match r
-        [(struct CopyInResponse (format column-formats))
-         (error/no-support fsym "COPY IN statements")]
-        [(struct CopyOutResponse (format column-formats))
-         (error/no-support fsym "COPY OUT statements")]
-        [_ (error/internal* fsym "unexpected message from back end"
-                            '("message" value) r)]))
-
-    (define/private (query1:process-result fsym result)
-      (match result
-        [(vector 'rows field-dvecs rows)
-         (let ([type-readers (query1:get-type-readers fsym field-dvecs)])
-           (parameterize ((use-integer-datetimes? integer-datetimes?))
-             (rows-result (map field-dvec->field-info field-dvecs)
-                          (map (lambda (data) (bytes->row data type-readers))
-                               rows))))]
-        [(vector 'cursor field-dvecs stmt portal)
-         (let ([pst (statement-binding-pst stmt)]
-               [type-readers (query1:get-type-readers fsym field-dvecs)])
-           (cursor-result (map field-dvec->field-info field-dvecs)
-                          pst
-                          (list portal type-readers (box #f))))]
-        [(vector 'command command)
-         (simple-result command)]))
-
-    (define/private (query1:get-type-readers fsym field-dvecs)
-      (map (lambda (dvec)
-             (let ([typeid (field-dvec->typeid dvec)])
-               (typeid->type-reader fsym typeid)))
-           field-dvecs))
-
-    ;; == Cursor
-
-    (define/public (fetch/cursor fsym cursor fetch-size)
-      (let ([pst (cursor-result-pst cursor)]
-            [extra (cursor-result-extra cursor)])
-        (send pst check-owner fsym this pst)
-        (let ([portal (car extra)]
-              [type-readers (cadr extra)]
-              [end-box (caddr extra)])
-          (let ([rows
-                 (call-with-lock fsym
-                   (lambda ()
-                     (cond [(unbox end-box) #f]
-                           [else
-                            (fresh-exchange)
-                            (buffer-message (make-Execute portal fetch-size))
-                            (let ([rows
-                                   (call-with-sync fsym
-                                     (lambda () (query1:data-loop fsym end-box)))])
-                              (when (unbox end-box)
-                                (cursor:close fsym pst portal))
-                              rows)])))])
-            (parameterize ((use-integer-datetimes? integer-datetimes?))
-              (and rows (map (lambda (data) (bytes->row data type-readers)) rows)))))))
-
-    (define/private (cursor:close fsym pst portal)
-      (let ([close-on-exec? (send pst get-close-on-exec?)])
-        (fresh-exchange)
-        (buffer-message (make-Close 'portal portal))
-        (when close-on-exec?
-          (buffer-message (make-Close 'statement (send pst get-handle)))
-          (send pst set-handle #f))
-        (call-with-sync fsym
-          (lambda () (query1:expect-close-complete fsym close-on-exec?)))))
-
-    ;; == Prepare
-
-    (define/override (classify-stmt sql) (classify-pg-sql sql))
-
-    (define/override (prepare1* fsym stmt close-on-exec? stmt-type)
-      ;; name generation within exchange: synchronized
-      (let ([name (generate-name)])
-        (fresh-exchange)
-        (prepare1:enqueue name stmt)
-        (call-with-sync fsym
-          (lambda () (prepare1:collect fsym stmt name close-on-exec? stmt-type)))))
-
-    (define/private (prepare1:enqueue name stmt)
-      (buffer-message (make-Parse name stmt null))
-      (buffer-message (make-Describe 'statement name)))
-
-    (define/private (prepare1:collect fsym stmt name close-on-exec? stmt-type)
-      (match (recv-message fsym)
-        [(struct ParseComplete ()) (void)]
-        [other-r (prepare1:error fsym other-r)])
-      (let* ([param-typeids (prepare1:describe-params fsym)]
-             [field-dvecs (prepare1:describe-result fsym)])
-        (new prepared-statement%
-             (handle name)
-             (close-on-exec? close-on-exec?)
-             (param-typeids param-typeids)
-             (result-dvecs field-dvecs)
-             (stmt stmt)
-             (stmt-type stmt-type)
-             (owner this))))
-
-    (define/private (prepare1:describe-params fsym)
-      (match (recv-message fsym)
-        [(struct ParameterDescription (param-typeids)) param-typeids]
-        [other-r (prepare1:error fsym other-r)]))
-
-    (define/private (prepare1:describe-result fsym)
-      (match (recv-message fsym)
-        [(struct RowDescription (field-dvecs)) field-dvecs]
-        [(struct NoData ()) null]
-        [other-r (prepare1:error fsym other-r)]))
-
-    (define/private (prepare1:error fsym r)
-      (error/comm fsym "during prepare"))
-
-    ;; name-counter : nat
-    (define name-counter 0)
-
-    ;; generate-name : -> string
-    (define/private (generate-name)
-      (let ([n name-counter])
-        (set! name-counter (add1 name-counter))
-        (format "rkt_~a_~a" process-id n)))
-
-    (define/public (get-base) this)
-
-    ;; free-statement : prepared-statement -> void
-    (define/public (free-statement pst need-lock?)
-      (define (do-free-statement)
-        (let ([name (send pst get-handle)])
-          (when (and name outport) ;; outport = connected?
-            (send pst set-handle #f)
-            (fresh-exchange)
-            (buffer-message (make-Close 'statement name))
-            (call-with-sync 'free-statement
-             (lambda ()
-               (let ([r (recv-message 'free-statement)])
-                 (cond [(CloseComplete? r) (void)]
-                       [else (error/comm 'free-statement)])))))))
-      (if need-lock?
-          (call-with-lock* 'free-statement
-                           do-free-statement
-                           void
-                           #f)
-          (do-free-statement)))
-
-    ;; == Internal query
-
-    (define/private (internal-query1 fsym sql)
-      (query1 fsym sql #f #f))
-
-    ;; == Transactions
-
-    (define/override (start-transaction* fsym isolation option)
-      (cond [(eq? isolation 'nested)
-             ;; FIXME: error if option != #f ?
-             (let ([savepoint (generate-name)])
-               (internal-query1 fsym (format "SAVEPOINT ~a" savepoint))
-               savepoint)]
-            [else
-             (let* ([isolation-part (isolation-symbol->string isolation)]
-                    [option-part
-                     (case option
-                       ((read-write) " READ WRITE")
-                       ((read-only) " READ ONLY")
-                       ((#f) #f)
-                       (else (raise-argument-error fsym "(or/c 'read-write 'read-only #f)" option)))]
-                    [stmt (string-append "BEGIN WORK"
-                                         (if isolation-part " ISOLATION LEVEL " "")
-                                         (or isolation-part "")
-                                         (or option-part ""))])
-               (internal-query1 fsym stmt)
-               #f)]))
-
-    (define/override (end-transaction* fsym mode savepoint)
-      (case mode
-        ((commit)
-         (cond [savepoint
-                (internal-query1 fsym (format "RELEASE SAVEPOINT ~a" savepoint))]
-               [else
-                (internal-query1 fsym "COMMIT WORK")]))
-        ((rollback)
-         (cond [savepoint
-                (internal-query1 fsym (format "ROLLBACK TO SAVEPOINT ~a" savepoint))
-                (internal-query1 fsym (format "RELEASE SAVEPOINT ~a" savepoint))]
-               [else
-                (internal-query1 fsym "ROLLBACK WORK")])))
-      (void))
-
-    ;; == Reflection
-
-    (define/public (list-tables fsym schema)
-      (let* ([stmt
-              (string-append
-               "SELECT table_name FROM information_schema.tables WHERE "
-               (case schema
-                 ((search search-or-current)
-                  "table_schema = SOME (current_schemas(false))")
-                 ((current)
-                  "table_schema = current_schema")))]
-             [result (call-with-lock fsym (lambda () (internal-query1 fsym stmt)))]
-             [rows (vector-ref result 2)]
-             [type-readers (list subbytes)])
-        (for/list ([row (in-list rows)])
-          (let ([row (bytes->row row type-readers)])
-            (bytes->string/utf-8 (vector-ref row 0))))))
-    ))
-
-;; ========================================
-
-;; ssl-connector-mixin
-;; Adds SSL connection support.
-(define ssl-connector-mixin
-  (mixin (connector<%>) ()
-    (super-new)
-
-    ;; attach-to-ports : input-port output-port -> void
-    (define/override (attach-to-ports in out [ssl 'no] [ssl-context #f])
-      (with-handlers ([(lambda _ #t)
-                       (lambda (e)
-                         (close-input-port in)
-                         (close-output-port out)
-                         (raise e))])
-        (case ssl
-          ((yes optional)
-           ;; Try negotiating SSL connection
-           (write-message (make-SSLRequest) out)
-           (flush-output out)
-           (let ([response (peek-byte in)])
-             (case (integer->char response)
-               ((#\S)
-                (void (read-byte in))
-                (let-values ([(sin sout)
-                              (ports->ssl-ports in out
-                                                #:mode 'connect
-                                                #:context ssl-context
-                                                #:close-original? #t)])
-                  ;; See comments below re buffering-output-port
-                  (super attach-to-ports sin (buffering-output-port sout))))
-               ((#\N)
-                ;; Backend gracefully declined
-                (void (read-byte in))
-                (unless (eq? ssl 'optional)
-                  (error 'postgresql-connect "server refused SSL connection"))
-                (super attach-to-ports in out))
-               ((#\E)
-                (let ([r (parse-server-message in)])
-                  (raise-backend-error 'postgresql-connect r)))
-               (else
-                (error/comm 'postgresql-connect "after SSL request")))))
-          ((no)
-           (super attach-to-ports in out)))))))
-
-;; SSL output ports currently seem to create one SSL record per port write.
-;; This causes an explosion in the amount of data sent, due to padding, HMAC,
-;; and other record overhead. So add an ad hoc buffering port around it.
-;; FIXME: This code is probably wrong in various ways related to concurrency,
-;; evts, and breaks.
-(define (buffering-output-port out)
-  (define-syntax-rule (DEBUG expr ...) (when #f expr ...))
-  (DEBUG (eprintf "** making buffered output port\n"))
-  (define tmp (open-output-bytes))
-  (define (write-out buf start end flush? eb?)
-    ;; This code just ignores the eb? (enable-break) argument.
-    ;; The 'flush-output' operation seems to trigger a zero-byte write; I haven't
-    ;; seen the flush? argument being used.
-    (DEBUG (eprintf "** write ~s bytes, flush?=~s, eb?=~s\n" (- end start) flush? eb?))
-    (begin0 (if (> end start) (write-bytes buf tmp start end) 0)
-      (when (or flush? (= end start)) (flush))))
-  (define (flush)
-    (define buf (get-output-bytes tmp #t))
-    (define end (bytes-length buf))
-    (DEBUG (eprintf "** flushing ~s bytes\n" end))
-    ;; SSL seems to have trouble accepting too much data at once, but breaking
-    ;; it up into 10MB chunks seems to work.
-    (for ([start (in-range 0 end #e1e7)])
-      (DEBUG (eprintf "-- flushing range [~s,~s)\n" start (min end (+ start #e1e7))))
-      (write-bytes buf out start (min end (+ start #e1e7)))
-      (flush-output out))
-    (when (zero? end) (flush-output out)))
-  (define (close)
-    (DEBUG (eprintf "** closing\n"))
-    (flush)
-    (close-output-port out))
-  (make-output-port (object-name out)
-                    always-evt
-                    write-out
-                    close))
-
-;; ========================================
-
-;; md5-password : string (U string (list 'hash string)) bytes -> string
-;; Compute the MD5 hash of a password in the form expected by the PostgreSQL 
-;; backend.
-(define (md5-password user password salt)
-  (let ([hash
-         (cond [(pair? password) (string->bytes/latin-1 (cadr password))]
-               [(string? password) (password-hash user password)])])
-    (bytes->string/latin-1
-     (bytes-append #"md5" (md5 (bytes-append hash salt))))))
-
-;; password-hash : string string -> bytes
-(define (password-hash user password)
-  (let ([user (string->bytes/latin-1 user)]
-        [password (string->bytes/latin-1 password)])
-    (md5 (bytes-append password user))))
-
-;; ========================================
-
-;; raise-backend-error : symbol ErrorResponse -> raises exn
-(define (raise-backend-error who r)
-  (define props (ErrorResponse-properties r))
-  (define code (cdr (assq 'code props)))
-  (define message (cdr (assq 'message props)))
-  (raise-sql-error who code message props))
-
-;; ========================================
-
-;; connection%
-(define connection%
-  (class (ssl-connector-mixin connection-base%)
-    (super-new)))
diff --git a/pkgs/db-pkgs/db-lib/db/private/postgresql/dbsystem.rkt b/pkgs/db-pkgs/db-lib/db/private/postgresql/dbsystem.rkt
deleted file mode 100644
index e4143b67f2..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/postgresql/dbsystem.rkt
+++ /dev/null
@@ -1,801 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/list
-         racket/match
-         (prefix-in srfi: srfi/19)
-         json
-         db/private/generic/interfaces
-         db/private/generic/common
-         db/private/generic/sql-data
-         db/private/generic/sql-convert
-         "../../util/datetime.rkt"
-         "../../util/geometry.rkt"
-         "../../util/postgresql.rkt"
-         (only-in "message.rkt" field-dvec->typeid))
-(provide dbsystem/integer-datetimes
-         dbsystem/floating-point-datetimes
-         typeid->type-reader
-         typeid->format
-         use-integer-datetimes?
-         classify-pg-sql)
-
-(define postgresql-dbsystem%
-  (class* dbsystem-base% (dbsystem<%>)
-    (init-field integer-datetimes?)
-
-    (define/public (get-short-name) 'postgresql)
-    (define/override (get-type-list) type-list)
-
-    (define/public (has-support? option)
-      (case option
-        ((real-infinities) #t)
-        ((numeric-infinities) #t)
-        (else #f)))
-
-    (define/public (get-parameter-handlers param-typeids)
-      (let ([writers (map typeid->type-writer param-typeids)])
-        (if integer-datetimes?
-            writers
-            (map (lambda (w)
-                   (lambda (f x)
-                     (parameterize ((use-integer-datetimes? #f))
-                       (w f x))))
-                 writers))))
-
-    (define/public (field-dvecs->typeids dvecs)
-      (map field-dvec->typeid dvecs))
-
-    (define/public (describe-params typeids)
-      (map describe-typeid typeids))
-
-    (define/public (describe-fields field-dvecs)
-      (for/list ([dvec (in-list field-dvecs)])
-        (describe-typeid (field-dvec->typeid dvec))))
-
-    (super-new)))
-
-(define dbsystem/integer-datetimes
-  (new postgresql-dbsystem% (integer-datetimes? #t)))
-(define dbsystem/floating-point-datetimes
-  (new postgresql-dbsystem% (integer-datetimes? #f)))
-
-;; ========================================
-
-;; SQL "parsing"
-
-;; We care about detecting:
-;;  - statements that affect transaction status
-;;  - statements that are safe for (vs invalidate) the statement cache
-
-;; classify-pg-sql : string [nat] -> symbol/#f
-(define classify-pg-sql
-  ;; Source: http://www.postgresql.org/docs/current/static/sql-commands.html
-  (make-sql-classifier
-   `(;; Statements that do not invalidate previously prepared statements
-     ("SELECT" select)
-     ("INSERT" insert)
-     ("UPDATE" update)
-     ("DELETE" delete)
-     ("WITH"   with)
-
-     ;; Transactional statements
-     ("ABORT"                        rollback)
-     ("BEGIN"                        start)
-     ;; COMMIT PREPARED itself is harmless.
-     ("COMMIT PREPARED"              #f) ;; Note: before COMMIT
-     ("COMMIT"                       commit)
-     ("DO"                           *do) ;; can do anything
-     ("END"                          commit)
-     ("EXECUTE"                      *execute) ;; can do anything
-     ;; PREPARE TRANSACTION is like shift: it saves and aborts current transaction.
-     ;; Perhaps all we care about is that it ends transaction, treat like commit/rollback.
-     ("PREPARE TRANSACTION"          prepare-transaction) ;; Note: before PREPARE
-     ("RELEASE SAVEPOINT"            release-savepoint)
-     ;; For ROLLBACK variants, ordered carefully and expanded optional words
-     ;; ROLLBACK PREPARED just deletes saved transaction
-     ("ROLLBACK PREPARED"            #f)
-     ("ROLLBACK WORK TO"             rollback-savepoint)
-     ("ROLLBACK TRANSACTION TO"      rollback-savepoint)
-     ("ROLLBACK TO"                  rollback-savepoint)
-     ("ROLLBACK"                     rollback)
-     ("SAVEPOINT"                    savepoint)
-     ("START TRANSACTION"            start)
-     )))
-
-;; ============================================================
-
-(define-syntax-rule (type-table (type-list typeid->type describe-typeid)
-                                (typeid->format typeid->type-reader typeid->type-writer)
-                      (typeid type since-version fmt reader writer) ...)
-  (begin (define-type-table (type-list typeid->type describe-typeid)
-           (typeid type since-version) ...)
-         (define (typeid->type-reader fsym tid)
-           (let ([result
-                  (case tid
-                    ((typeid) reader) ...
-                    (else #f))])
-             (or result (error/unsupported-type fsym tid (typeid->type tid)))))
-         (define (typeid->type-writer tid)
-           (let ([result
-                  (case tid
-                    ((typeid) writer) ...
-                    (else #f))])
-             (or result (make-unsupported-writer tid (typeid->type tid)))))
-         (define (typeid->format tid)
-           (case tid
-             ((typeid) fmt) ...
-             (else 0)))))
-
-(define (make-unsupported-writer x t)
-  (lambda (fsym . args)
-    (error/unsupported-type fsym x t)))
-
-;; ============================================================
-
-;; Derived from 
-;; http://www.postgresql.org/docs/current/static/datatype.html
-;; and
-;; result of "SELECT oid, typname, typelem FROM pg_type;"
-
-(type-table (type-list typeid->type describe-typeid)
-            (typeid->format typeid->type-reader typeid->type-writer)
-  (16   boolean      0   1  recv-boolean      send-boolean)
-  (17   bytea        0   1  recv-bytea        send-bytea)
-  (18   char1        0   1  recv-char1        send-char1)
-  (19   name         0   1  recv-string       send-string)
-  (20   bigint       0   1  recv-integer      send-int8)
-  (21   smallint     0   1  recv-integer      send-int2)
-  (23   integer      0   1  recv-integer      send-int4)
-  (25   text         0   1  recv-string       send-string)
-  (26   oid          0   1  recv-integer      send-int4)
-  (700  real         0   1  recv-float        send-float4)
-  (701  double       0   1  recv-float        send-float8)
-  (1042 character    0   1  recv-string       send-string)
-  (1043 varchar      0   1  recv-string       send-string)
-  (1082 date         0   1  recv-date         send-date)
-  (1083 time         0   1  recv-time         send-time)
-  (1114 timestamp    0   1  recv-timestamp    send-timestamp)
-  (1184 timestamptz  0   1  recv-timestamptz  send-timestamptz)
-  (1186 interval     0   1  recv-interval     send-interval)
-  (1266 timetz       0   1  recv-timetz       send-timetz)
-  (1700 decimal      0   1  recv-numeric      send-numeric)
-  (1560 bit          0   1  recv-bits         send-bits)
-  (1562 varbit       0   1  recv-bits         send-bits)
-  (114  json         9.2 1  recv-json         send-json)
-
-  (600  point        0   1  recv-point        send-point)
-  (601  lseg         0   1  recv-lseg         send-lseg)
-  (602  path         0   1  recv-path         send-path)
-  (603  box          0   1  recv-box          send-box)
-  (604  polygon      0   1  recv-polygon      send-polygon)
-  (718  circle       0   1  recv-circle       send-circle)
-
-  (3904 int4range    9.2 1  (recv-range 23)   (send-range 23))
-  (3926 int8range    9.2 1  (recv-range 20)   (send-range 20))
-  (3906 numrange     9.2 1  (recv-range 1700) (send-range 1700))
-  (3908 tsrange      9.2 1  (recv-range 1114) (send-range 1114))
-  (3910 tstzrange    9.2 1  (recv-range 1184) (send-range 1184))
-  (3912 daterange    9.2 1  (recv-range 1082) (send-range 1082))
-
-  ;; "string" literals have type unknown; just treat as string
-  (705 unknown       0   1  recv-string       send-string)
-
-  ;; Array types
-
-  (1000 boolean-array     0   1  recv-array (send-array 16))
-  (1001 bytea-array       0   1  recv-array (send-array 17))
-  (1002 char1-array       0   1  recv-array (send-array 18))
-  (1003 name-array        0   1  recv-array (send-array 19))
-  (1005 smallint-array    0   1  recv-array (send-array 21))
-  (1007 integer-array     0   1  recv-array (send-array 23))
-  (1009 text-array        0   1  recv-array (send-array 25))
-  (1028 oid-array         0   1  recv-array (send-array 26))
-  (1014 character-array   0   1  recv-array (send-array 1042))
-  (1015 varchar-array     0   1  recv-array (send-array 1043))
-  (1016 bigint-array      0   1  recv-array (send-array 20))
-  (1017 point-array       0   1  recv-array (send-array 600))
-  (1018 lseg-array        0   1  recv-array (send-array 601))
-  (1019 path-array        0   1  recv-array (send-array 602))
-  (1020 box-array         0   1  recv-array (send-array 603))
-  (1021 real-array        0   1  recv-array (send-array 700))
-  (1022 double-array      0   1  recv-array (send-array 701))
-  (1027 polygon-array     0   1  recv-array (send-array 604))
-  (719  circle-array      0   1  recv-array (send-array 718))
-  (1561 bit-array         0   1  recv-array (send-array 1560))
-  (1563 varbit-array      0   1  recv-array (send-array 1562))
-  (199  json-array        9.2 1  recv-array (send-array 114))
-
-  (1115 timestamp-array   0   1  recv-array (send-array 1114))
-  (1182 date-array        0   1  recv-array (send-array 1082))
-  (1183 time-array        0   1  recv-array (send-array 1083))
-  (1185 timestamptz-array 0   1  recv-array (send-array 1184))
-  (1187 interval-array    0   1  recv-array (send-array 1186))
-  (1231 decimal-array     0   1  recv-array (send-array 1700))
-  (1270 timetz-array      0   1  recv-array (send-array 1266))
-
-  (3905 int4range-array   9.2 1  recv-array (send-array 3904))
-  (3927 int8range-array   9.2 1  recv-array (send-array 3926))
-  (3907 numrange-array    9.2 1  recv-array (send-array 3906))
-  (3909 tsrange-array     9.2 1  recv-array (send-array 3908))
-  (3911 tstzrange-array   9.2 1  recv-array (send-array 3910))
-  (3913 daterange-array   9.2 1  recv-array (send-array 3912))
-
-  (2275 cstring           0   1 recv-string send-string)
-  ;; Receive but do not send
-  (2249 record            #f  1 recv-record #f)
-  (2287 record-array      #f  1 recv-array  #f)
-
-  ;; The following types are not supported.
-  ;; (But putting their names here yields better not-supported errors.)
-
-  (142  xml               #f 0 #f #f)
-  (143  xml-array         #f 0 #f #f)
-
-  (628  line              #f 0 #f #f)
-  (629  line-array        #f 0 #f #f)
-  (650  cidr              #f 0 #f #f)
-  (651  cidr-array        #f 0 #f #f)
-  (702  abstime           #f 0 #f #f)
-  (703  reltime           #f 0 #f #f)
-  (704  tinterval         #f 0 #f #f)
-  (790  money             #f 0 #f #f)
-  (829  macaddr           #f 0 #f #f)
-  (869  inet              #f 0 #f #f)
-  (791  money-array       #f 0 #f #f)
-  (1023 abstime-array     #f 0 #f #f)
-  (1024 reltime-array     #f 0 #f #f)
-  (1025 tinterval-array   #f 0 #f #f)
-  (1040 macaddr-array     #f 0 #f #f)
-  (1041 inet-array        #f 0 #f #f)
-  (2950 uuid              #f 0 #f #f)
-  (2951 uuid-array        #f 0 #f #f))
-
-;; ----------------------------------------
-
-#|
-BINARY DATA FORMAT
-
-We send and receive data in binary format only.
-
-Some datetime types (see below) have two binary formats: integer
-microseconds vs floating-point seconds since a particular point in
-time. The integer format is indicated by the server
-variable "integer_datetimes=on", the default since about 2008. If the
-variable is off or not present, use floats. The relevant send/recv
-functions depend on use-integer-datetimes? parameter.
-
-Domain typeids never seem to appear as result typeids, but do appear
-as parameter typeids.
-
-----
-
-Notes on binary formats, mostly from $PG/src/include/utils/*.[ch]
-
-bit, varbit = len:int4 byte* (0-padded on *left*)
-
-date = int4 (days since 2000-01-01)
-timestamp = (int8 or float8)
-timestamptz = (int8 or float8)
-time = (int8 or float8)
-timetz = (int8 or float8) zone-secs:int4
-interval = (usecs:int8 or secs:float8) days:int4 months:int4
-
-  (time*, timestamp*, interval depend on "integer_datetimes" parameter, but date does not)
-
-inet, cidr = family:byte bits:byte is_cidr:byte addrlen:byte addr:be-integer
-  is_cidr is ignored
-
-record = cols:int4 (typeoid:int4 len/-1:int4 data:byte^len)^cols 
-
-range = flags:byte (len:int4 data:byte^len)^{0..2}
-
-|#
-
-(define POSTGRESQL-JD-ADJUST 2451545) ;; from $PG/src/include/utils/datetime.h
-
-(define use-integer-datetimes? (make-parameter #t))
-
-;; ----------------------------------------
-
-;; Binary readers
-;; Take bytes, start offset, end offset (but most ignore end)
-
-(define (recv-bits buf start end)
-  (let* ([bitslen (integer-bytes->integer buf #t #t start (+ start 4))])
-    (make-sql-bits/bytes bitslen (subbytes buf (+ start 4) end) 0)))
-
-(define (recv-boolean buf start end)
-  (case (bytes-ref buf start)
-    ((0) #f)
-    ((1) #t)
-    (else (error/internal* 'recv-boolean "bad value"
-                           '("value" value) (bytes-ref buf start)))))
-
-(define (recv-char1 buf start end)
-  (integer->char (bytes-ref buf start)))
-
-(define (recv-bytea buf start end)
-  (subbytes buf start end))
-
-(define (recv-string buf start end)
-  (bytes->string/utf-8 buf #f start end))
-
-(define (recv-integer buf start end)
-  (integer-bytes->integer buf #t #t start end))
-
-(define (recv-unsigned-integer buf start end)
-  (integer-bytes->integer buf #f #t start end))
-
-(define (recv-float buf start end)
-  (floating-point-bytes->real buf #t start end))
-
-(define (get-double bs offset)
-  (floating-point-bytes->real bs #t offset (+ 8 offset)))
-(define (recv-point buf start end)
-  (point (get-double buf start) (get-double buf (+ start 8))))
-(define (recv-box buf start end)
-  (pg-box (recv-point buf start #f) (recv-point buf (+ start 16) #f)))
-(define (recv-circle buf start end)
-  (pg-circle (recv-point buf start #f) (get-double buf (+ start 16))))
-(define (recv-lseg buf start end)
-  (line-string (list (recv-point buf start #f) (recv-point buf (+ start 16) #f))))
-(define (recv-path buf start end)
-  (pg-path (not (zero? (bytes-ref buf start)))
-           (for/list ([i (integer-bytes->integer buf #t #t (+ start 1) (+ start 5))])
-             (recv-point buf (+ start 5 (* 16 i)) #f))))
-(define (recv-polygon buf start end)
-  (let* ([points0
-          (for/list ([i (in-range (integer-bytes->integer buf #t #t start (+ start 4)))])
-            (recv-point buf (+ start 4 (* 16 i)) #f))]
-         [points (append points0 (list (car points0)))])
-    (polygon (line-string points)
-             null)))
-
-(define (recv-date buf start end)
-  (let* ([jd (+ (integer-bytes->integer buf #t #t start (+ start 4)) POSTGRESQL-JD-ADJUST)]
-         [t (srfi:julian-day->date jd 0)]) ;; gives noon on the designated day
-    (srfi-date->sql-date t)))
-
-(define (get-usec buf start)
-  (cond [(use-integer-datetimes?)
-         (let ([usec (integer-bytes->integer buf #t #t start (+ start 8))])
-           (cond [(= usec (sub1 (expt 2 63))) +inf.0]
-                 [(= usec (- (expt 2 63))) -inf.0]
-                 [else usec]))]
-        [else
-         (let ([sec (floating-point-bytes->real buf #t start (+ start 8))])
-           (if (rational? sec)
-               (inexact->exact (round (* sec #i1e6)))
-               sec))]))
-
-(define (usec->hmsn usec)
-  (let*-values ([(sec usec) (quotient/remainder usec #e1e6)]
-                [(min sec) (quotient/remainder sec 60)]
-                [(hr min) (quotient/remainder min 60)])
-    (values hr min sec (* #e1e3 usec))))
-
-(define (recv-time buf start end)
-  (let-values ([(hr min sec nsec) (usec->hmsn (get-usec buf start))])
-    (make-sql-time hr min sec nsec #f)))
-
-(define (recv-timetz buf start end)
-  (let-values ([(hr min sec nsec) (usec->hmsn (get-usec buf start))]
-               [(tz) (integer-bytes->integer buf #t #t (+ start 8) (+ start 12))])
-    ;; FIXME: seem to need to invert timezone... why?
-    (make-sql-time hr min sec nsec (- tz))))
-
-(define (recv-timestamp* buf start end tz)
-  (define usec-in-day (* #e1e6 60 60 24))
-  (let ([usec (get-usec buf start)])
-    (cond [(rational? usec)
-           (let*-values ([(day usec) (quotient/remainder usec usec-in-day)]
-                         [(day usec) (if (negative? usec)
-                                         (values (sub1 day) (+ usec-in-day usec))
-                                         (values day usec))]
-                         [(jd) (+ day POSTGRESQL-JD-ADJUST)]
-                         [(hr min sec nsec) (usec->hmsn usec)]
-                         [(sd) (srfi:julian-day->date jd 0)])
-             (make-sql-timestamp (srfi:date-year sd)
-                                 (srfi:date-month sd)
-                                 (srfi:date-day sd)
-                                 hr min sec nsec tz))]
-          ;; Else +/-inf.0
-          [else usec])))
-
-(define (recv-timestamp buf start end)
-  (recv-timestamp* buf start end #f))
-(define (recv-timestamptz buf start end)
-  (recv-timestamp* buf start end 0))
-
-(define (recv-interval buf start end)
-  (let*-values ([(hr min sec nsec) (usec->hmsn (get-usec buf start))]
-                [(day) (integer-bytes->integer buf #t #t (+ start 8) (+ start 12))]
-                [(mon) (integer-bytes->integer buf #t #t (+ start 12) (+ start 16))]
-                [(yr mon) (quotient/remainder mon 12)])
-    (make-sql-interval yr mon day hr min sec nsec)))
-
-(define (recv-record buf start end)
-  (define (get-int signed?)
-    (begin0 (integer-bytes->integer buf signed? #t start (+ start 4))
-      (set! start (+ start 4))))
-  (define (recv-col)
-    (let* ([typeid (get-int #t)]
-           [len (get-int #t)])
-      (if (= len -1)
-          sql-null
-          (let* ([bin? (= (typeid->format typeid) 1)] ;; binary reader available
-                 [reader (and bin? (typeid->type-reader 'recv-record typeid))])
-            (if reader
-                (reader buf start (+ start (max 0 len)))
-                'unreadable)))))
-  (let* ([columns (get-int #t)]
-         [result (make-vector columns #f)])
-    (for ([i (in-range columns)])
-      (vector-set! result i (recv-col)))
-    result))
-
-(define (recv-array buf start end)
-  (define (get-int signed?)
-    (begin0 (integer-bytes->integer buf signed? #t start (+ start 4))
-      (set! start (+ start 4))))
-  (let* ([ndim (get-int #t)]
-         [flags (get-int #f)]
-         [elttype (get-int #f)]
-         [reader (typeid->type-reader 'recv-array elttype)]
-         [bounds
-          (for/list ([i (in-range ndim)])
-            (let* ([dim (get-int #t)]
-                   [lbound (get-int #t)])
-              (cons dim lbound)))]
-         [vals ;; (vector^ndim X)
-          (cond [(zero? ndim) '#()]
-                [else
-                 (let loop ([bounds bounds])
-                   (cond [(pair? bounds)
-                          (for/vector ([i (in-range (car (car bounds)))])
-                            (loop (cdr bounds)))]
-                         [else
-                          (let* ([len (get-int #t)])
-                            (cond [(= len -1) sql-null]
-                                  [else
-                                   (begin0 (reader buf start (+ start len))
-                                     (set! start (+ start len)))]))]))])])
-    (pg-array ndim (map car bounds) (map cdr bounds) vals)))
-
-(define (recv-numeric buf start end)
-  (define (get-int2 offset [signed? #t])
-    (integer-bytes->integer buf signed? #t (+ start offset) (+ start offset 2)))
-  (let* ([NBASE  #e1e4]
-         [NUMERIC_POS #x0000]
-         [NUMERIC_NEG #x4000]
-         [NUMERIC_NAN #xC000]
-         [digits (get-int2 0)]
-         [weight (get-int2 2)]
-         [sign   (get-int2 4 #f)]
-         [dscale (get-int2 6)]  ;; "display scale", can ignore
-         [unscaled-digits
-          (for/list ([offset (in-range 8 (+ 8 (* 2 digits)) 2)])
-            (get-int2 offset))]
-         [scaled-digits
-          (for/list ([unscaled-digit (in-list unscaled-digits)]
-                     [i (in-naturals)])
-            (* unscaled-digit (expt NBASE (- weight i))))]
-         [abs-number (apply + scaled-digits)])
-    (cond [(= sign NUMERIC_POS)
-           abs-number]
-          [(= sign NUMERIC_NEG)
-           (- abs-number)]
-          [(= sign NUMERIC_NAN)
-           +nan.0]
-          [else (error/internal 'recv-numeric "bad sign: ~e" sign)])))
-
-(define (recv-json buf start end)
-  (bytes->jsexpr (subbytes buf start end)))
-
-(define (recv-range elttype)
-  (define EMPTY  #x01)
-  (define LB_INC #x02)
-  (define UB_INC #x04)
-  (define LB_INF #x08)
-  (define UB_INF #x10)
-  (define reader (typeid->type-reader 'recv-range elttype))
-  (lambda (buf start end)
-    (let* ([flags (bytes-ref buf start)]
-           [is-empty? (not (zero? (bitwise-and flags EMPTY)))]
-           [has-lb? (and (not is-empty?) (zero? (bitwise-and flags LB_INF)))]
-           [has-ub? (and (not is-empty?) (zero? (bitwise-and flags UB_INF)))]
-           [includes-lb? (not (zero? (bitwise-and flags LB_INC)))]
-           [includes-ub? (not (zero? (bitwise-and flags UB_INC)))])
-      ;; get-bound : boolean nat -> (values datum nat)
-      (define (get-bound has? start)
-        (cond [has?
-               (let* ([len (integer-bytes->integer buf #t #t start (+ start 4))]
-                      [data-start (+ start 4)]
-                      [data-end (+ data-start len)]
-                      [data (reader buf data-start data-end)])
-                 (values data data-end))]
-              [else
-               (values #f start)]))
-      (let*-values ([(next-start) (+ start 1)]
-                    [(lb next-start) (get-bound has-lb? next-start)]
-                    [(ub next-start) (get-bound has-ub? next-start)])
-        ;; expect next-start = end
-        (if is-empty?
-            (pg-empty-range)
-            (pg-range lb includes-lb? ub includes-ub?))))))
-
-;; Binary writers
-
-(define (send-boolean f x)
-  (case x
-    ((#t) (bytes 1))
-    ((#f) (bytes 0))
-    (else (send-error f "boolean" x #:contract 'boolean?))))
-
-(define (send-bits f x)
-  (unless (sql-bits? x) (send-error f "bits" x #:contract 'sql-bits?))
-  (let-values ([(len bv start) (align-sql-bits x 'left)])
-    (bytes-append (integer->integer-bytes len 4 #t #t)
-                  (if (zero? start) bv (subbytes bv start)))))
-
-(define (send-char1 f x)
-  (let ([n (if (char? x) (char->integer x) x)])
-    (unless (uint8? n) (send-error f "char1" x))
-    (bytes n)))
-
-(define (send-bytea f x)
-  (unless (bytes? x) (send-error f "bytea" x #:contract 'bytes?))
-  x)
-
-(define (send-string f x)
-  (unless (string? x) (send-error f "string" x #:contract 'string?))
-  (string->bytes/utf-8 x))
-
-(define (send-int2 f n)
-  (unless (int16? n) (send-error f "int2" n #:contract 'int16?))
-  (integer->integer-bytes n 2 #t #t))
-
-(define (send-int4 f n)
-  (unless (int32? n) (send-error f "int4" n #:contract 'int32?))
-  (integer->integer-bytes n 4 #t #t))
-
-(define (send-int8 f n)
-  (unless (int64? n) (send-error f "int8" n #:contract 'int64?))
-  (integer->integer-bytes n 8 #t #t))
-
-(define (send-float* f n type size)
-  (unless (real? n) (send-error f type n #:contract 'real?))
-  (real->floating-point-bytes n size #t))
-
-(define (send-float4 f n)
-  (send-float* f n "float4" 4))
-
-(define (send-float8 f n)
-  (send-float* f n "float8" 8))
-
-(define (float8 x)
-  (real->floating-point-bytes x 8 #t))
-(define (send-point f x)
-  (unless (point? x) (send-error f "point" x #:contract 'point?))
-  (bytes-append (float8 (point-x x)) (float8 (point-y x))))
-(define (send-box f x)
-  (unless (pg-box? x) (send-error f "box" x #:contract 'pg-box?))
-  (bytes-append (send-point f (pg-box-ne x))
-                (send-point f (pg-box-sw x))))
-(define (send-circle f x)
-  (unless (pg-circle? x) (send-error f "circle" x #:contract 'pg-circle?))
-  (bytes-append (send-point f (pg-circle-center x))
-                (float8 (pg-circle-radius x))))
-(define (send-lseg f x)
-  (unless (line? x) (send-error f "lseg" x #:contract 'line?))
-  (let ([points (line-string-points x)])
-    (bytes-append (send-point f (car points))
-                  (send-point f (cadr points)))))
-(define (send-path f x)
-  (unless (pg-path? x) (send-error f "path" x #:contract 'pg-path?))
-  (apply bytes-append
-         (bytes (if (pg-path-closed? x) 1 0))
-         (integer->integer-bytes (length (pg-path-points x)) 4 #t #t)
-         (for/list ([p (in-list (pg-path-points x))])
-           (send-point f p))))
-(define (send-polygon f x)
-  (unless (polygon? x) (send-error f "polygon" x #:contract 'polygon?))
-  (let* ([points0 (line-string-points (polygon-exterior x))]
-         [points (drop-right points0 1)]) ;; drop closing copy of first point
-    (apply bytes-append
-           (integer->integer-bytes (length points) 4 #t #t)
-           (for/list ([p (in-list points)])
-             (send-point f p)))))
-
-(define (send-date f x)
-  (cond [(sql-date? x)
-         (let* ([d (sql-datetime->srfi-date x)]
-                ;; julian day starts at noon of date, so round up (ceiling)
-                [jd (ceiling (srfi:date->julian-day d))]
-                [jd* (- jd POSTGRESQL-JD-ADJUST)])
-           (integer->integer-bytes jd* 4 #t #t))]
-        [else (send-error f "date" x #:contract 'sql-date?)]))
-
-(define (hmsn->usec-bytes hr min sec nsec)
-  (let* ([min (+ min (* hr 60))]
-         [sec (+ sec (* min 60))]
-         [usec (+ (quotient nsec #e1e3) (* sec #e1e6))])
-    (cond [(use-integer-datetimes?)
-           (integer->integer-bytes usec 8 #t #t)]
-          [else
-           (let ([sec (/ usec #i1e6)])
-             (real->floating-point-bytes sec 8 #t))])))
-
-(define (send-time f x)
-  (match x
-    [(sql-time h m s ns _tz)
-     (hmsn->usec-bytes h m s ns)]
-    [_ (send-error f "time" x #:contract 'sql-time?)]))
-
-(define (send-timetz f x)
-  (match x
-    [(sql-time h m s ns (? values tz))
-     (bytes-append (hmsn->usec-bytes h m s ns)
-                   ;; FIXME: seem to need to invert timezone (see also recv-timetz)
-                   (integer->integer-bytes (- tz) 4 #t #t))]
-    [_ (send-error f "time with time zone" x
-                   #:contract '(and/c sql-time? sql-time-tz))]))
-
-(define (send-timestamp* f x tz?)
-  (match x
-    [(sql-timestamp yr mon day hr min sec nsec (? (if tz? values void) tz))
-     (let* ([sd (srfi:make-date 0 0 0 12 day mon yr 0)]
-            [jd (srfi:date->julian-day sd)]
-            [jd* (- jd POSTGRESQL-JD-ADJUST)]
-            [hr (+ hr (* jd* 24))]
-            [sec (- sec (or tz 0))])
-       (hmsn->usec-bytes hr min sec nsec))]
-    [+inf.0
-     (if (use-integer-datetimes?)
-         (integer->integer-bytes (sub1 (expt 2 63)) 8 #t #t)
-         (real->floating-point-bytes +inf.0 8 #t))]
-    [-inf.0
-     (if (use-integer-datetimes?)
-         (integer->integer-bytes (- (expt 2 63)) 8 #t #t)
-         (real->floating-point-bytes -inf.0 8 #t))]
-    [_
-     (let ([type (if tz? "timestamp with time zone" "timestamp without time zone")]
-           [ctc (if tz? '(and/c sql-timestamp? sql-timestamp-tz) 'sql-timestamp?)])
-       (send-error f type x #:contract ctc))]))
-
-(define (send-timestamp f x) (send-timestamp* f x #f))
-(define (send-timestamptz f x) (send-timestamp* f x #t))
-
-(define (send-interval f x)
-  (match x
-    [(sql-interval yr mon day hr min sec nsec)
-     (let ([mon (+ mon (* yr 12))])
-       (bytes-append (hmsn->usec-bytes hr min sec nsec)
-                     (integer->integer-bytes day 4 #t #t)
-                     (integer->integer-bytes mon 4 #t #t)))]
-    [_ (send-error f "interval" x #:contract 'sql-interval?)]))
-
-;; round-up-to : nat nat>0 -> nat
-;; round n up to the nearest multiple of m
-(define (round-up-to n m)
-  (let ([rem (remainder n m)])
-    (if (zero? rem) n (+ n (- m rem)))))
-
-;; numeric: digits:int2 weight:int2 sign:int2 dscale:int2 {digit:int2}^digits
-;;   (abs x) = <integer-from-digits> * NBASE^(digits-(weight+1))
-;;           = SUM {i in 0..} { digit_i * NBASE^(weight-i) }
-(define (send-numeric f x)
-  (define NBASE #e1e4)
-  (define NBASE_MAGN 4)
-  (define NUMERIC_POS #x0000)
-  (define NUMERIC_NEG #x4000)
-  (define NUMERIC_NAN #xC000)
-  (define (mkint2 n [signed? #t])
-    (integer->integer-bytes n 2 signed? #t))
-  (define (nat->bigits n)
-    (let loop ([n n] [tail null])
-      (cond [(zero? n) tail]
-            [else (let-values ([(rest bigit) (quotient/remainder n NBASE)])
-                    (loop rest (cons bigit tail)))])))
-  (define (make-numeric bigit-count weight neg? dscale bigits)
-    (let ([sign-part (if neg? NUMERIC_NEG NUMERIC_POS)])
-      (apply bytes-append
-             (map mkint2 (list* bigit-count weight sign-part dscale bigits)))))
-
-  (cond [(rational? x)
-         (let* ([orig-x x]
-                [neg? (negative? x)]
-                [x (abs x)]
-                [M+E
-                 (or (and (exact? x) (exact->scaled-integer x #t))
-                     (inexact->scaled-integer (exact->inexact x)))])
-           ;; x = M*10^-E
-           (let* ([M (car M+E)]
-                  [E (cdr M+E)]
-                  ;; round E up to multiple of NBASE_MAGN
-                  [E* (round-up-to E NBASE_MAGN)]
-                  [M* (* M (expt 10 (- E* E)))]
-                  [bigits (nat->bigits M*)]
-                  ;;    E* = #bigits - weight - 1
-                  ;; so weight = #bigits - E* - 1
-                  [bigit-count (length bigits)]
-                  [weight (- bigit-count (quotient E* NBASE_MAGN) 1)]
-                  [dscale (max 0 E)])
-             (make-numeric bigit-count weight neg? dscale bigits)))]
-        [(eqv? x +nan.0)
-         (let ([NUMERIC_NAN #xC000])
-           (bytes-append (mkint2 0)
-                         (mkint2 0)
-                         (mkint2 NUMERIC_NAN #f)
-                         (mkint2 0)))]
-        [else
-         (send-error f "numeric" x #:contract '(or/c rational? +nan.0))]))
-
-(define (send-array elttype)
-  ;; NOTE: elttype must have binary writer
-  (define writer (typeid->type-writer elttype))
-  (lambda (f x0)
-    (define x
-      (cond [(pg-array? x0) x0]
-            [(list? x0) (list->pg-array x0)]
-            [else (send-error f "pg-array" x0 #:contract '(or/c list? pg-array?))]))
-    (match x
-      [(pg-array ndim counts lbounds vals)
-       (let ([out (open-output-bytes)])
-         (write-bytes (integer->integer-bytes ndim 4 #t #t) out)
-         (write-bytes (integer->integer-bytes 0 4 #t #t) out)
-         (write-bytes (integer->integer-bytes elttype 4 #t #t) out)
-         (for ([count (in-list counts)]
-               [lbound (in-list lbounds)])
-           (write-bytes (integer->integer-bytes count 4 #t #t) out)
-           (write-bytes (integer->integer-bytes lbound 4 #t #t) out))
-         (unless (zero? ndim)
-           (let loop ([n ndim] [vals vals])
-             (cond [(zero? n)
-                    (cond [(sql-null? vals)
-                           (write-bytes (integer->integer-bytes -1 4 #t #t) out)]
-                          [else
-                           (let ([b (writer f vals)])
-                             (write-bytes (integer->integer-bytes (bytes-length b) 4 #t #t) out)
-                             (write-bytes b out))])]
-                   [else
-                    (for ([v (in-vector vals)])
-                      (loop (sub1 n) v))])))
-         (get-output-bytes out))])))
-
-(define (send-json f x)
-  (unless (jsexpr? x)
-    (send-error f "json" x #:contract 'jsexpr?))
-  (jsexpr->bytes x))
-
-(define (send-range elttype)
-  (define EMPTY  #x01)
-  (define LB_INC #x02)
-  (define UB_INC #x04)
-  (define LB_INF #x08)
-  (define UB_INF #x10)
-  (define writer (typeid->type-writer elttype))
-  (lambda (f x)
-    (match x
-      [(pg-range lb includes-lb? ub includes-ub?)
-       (let* ([flags (+ (if lb 0 LB_INF)
-                        (if ub 0 UB_INF)
-                        (if includes-lb? LB_INC 0)
-                        (if includes-ub? UB_INC 0))]
-              [lb-bytes (and lb (writer f lb))]
-              [ub-bytes (and ub (writer f ub))])
-         (bytes-append (bytes flags)
-                       (if lb-bytes
-                           (integer->integer-bytes (bytes-length lb-bytes) 4 #t #t)
-                           #"")
-                       (or lb-bytes #"")
-                       (if ub-bytes
-                           (integer->integer-bytes (bytes-length ub-bytes) 4 #t #t)
-                           #"")
-                       (or ub-bytes #"")))]
-      [(pg-empty-range)
-       (bytes 1)])))
-
-;; send-error : string datum -> (raises error)
-(define (send-error f type datum #:contract [ctc #f])
-  (error/no-convert f "PostgreSQL" type datum #:contract ctc))
diff --git a/pkgs/db-pkgs/db-lib/db/private/postgresql/main.rkt b/pkgs/db-pkgs/db-lib/db/private/postgresql/main.rkt
deleted file mode 100644
index 6fc4323eba..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/postgresql/main.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/tcp
-         openssl
-         db/private/generic/interfaces
-         db/private/generic/common
-         unstable/socket
-         "connection.rkt")
-(provide postgresql-connect
-         postgresql-guess-socket-path
-         postgresql-password-hash)
-
-(define (postgresql-connect #:user user
-                            #:database database
-                            #:password [password #f]
-                            #:server [server #f]
-                            #:port [port #f]
-                            #:socket [socket #f]
-                            #:allow-cleartext-password? [allow-cleartext-password? #f]
-                            #:ssl [ssl 'no]
-                            #:ssl-context [ssl-context
-                                           (case ssl
-                                             ((no) #f)
-                                             (else (ssl-make-client-context)))]
-                            #:notice-handler [notice-handler void]
-                            #:notification-handler [notification-handler void]
-                            #:debug? [debug? #f])
-  (let ([connection-options
-         (+ (if (or server port) 1 0)
-            (if socket 1 0))]
-        [notice-handler (make-handler notice-handler "notice")]
-        [notification-handler
-         (if (procedure? notification-handler)
-             notification-handler
-             (make-print-notification notification-handler))]
-        [socket
-         (if (eq? socket 'guess)
-             (postgresql-guess-socket-path)
-             socket)])
-    (when (> connection-options 1)
-      (error 'postgresql-connect "cannot give both server/port and socket arguments"))
-    (let ([c (new connection%
-                  (notice-handler notice-handler)
-                  (notification-handler notification-handler)
-                  (allow-cleartext-password? allow-cleartext-password?))])
-      (when debug? (send c debug #t))
-      (let-values ([(in out)
-                    (cond [socket (unix-socket-connect socket)]
-                          [else (let ([server (or server "localhost")]
-                                      [port (or port 5432)])
-                                  (tcp-connect server port))])])
-        (send c attach-to-ports in out ssl ssl-context)
-        (send c start-connection-protocol database user password)
-        c))))
-
-(define socket-paths
-  (case (system-type)
-    ((unix) '("/var/run/postgresql/.s.PGSQL.5432"))
-    (else '())))
-
-(define (postgresql-guess-socket-path)
-  (guess-socket-path/paths 'postgresql-guess-socket-path socket-paths))
-
-;; make-print-notification : output-port -> string -> void
-(define ((make-print-notification out) condition)
-  (fprintf (case out
-             ((output) (current-output-port))
-             ((error) (current-error-port))
-             (else out))
-           "notification: ~a\n" condition))
-
-(define (postgresql-password-hash user password)
-  (bytes->string/latin-1 (password-hash user password)))
diff --git a/pkgs/db-pkgs/db-lib/db/private/postgresql/message.rkt b/pkgs/db-pkgs/db-lib/db/private/postgresql/message.rkt
deleted file mode 100644
index 1d549d558e..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/postgresql/message.rkt
+++ /dev/null
@@ -1,562 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/match
-         db/private/generic/interfaces
-         db/private/generic/sql-data)
-(provide write-message
-         parse-server-message
-
-         (struct-out AuthenticationOk)
-         (struct-out AuthenticationKerberosV5)
-         (struct-out AuthenticationCleartextPassword)
-         (struct-out AuthenticationCryptPassword)
-         (struct-out AuthenticationMD5Password)
-         (struct-out AuthenticationSCMCredential)
-         (struct-out StartupMessage)
-         (struct-out SSLRequest)
-         (struct-out CancelRequest)
-         (struct-out ErrorResponse)
-         (struct-out NoticeResponse)
-         (struct-out BackendKeyData)
-         (struct-out Bind)
-         (struct-out BindComplete)
-         (struct-out Close)
-         (struct-out CloseComplete)
-         (struct-out CommandComplete)
-         (struct-out CopyInResponse)
-         (struct-out CopyOutResponse)
-         (struct-out DataRow)
-         (struct-out Describe)
-         (struct-out EmptyQueryResponse)
-         (struct-out Execute)
-         (struct-out Flush)
-         (struct-out NoData)
-         (struct-out NotificationResponse)
-         (struct-out ParameterDescription)
-         (struct-out ParameterStatus)
-         (struct-out Parse)
-         (struct-out ParseComplete)
-         (struct-out PasswordMessage)
-         (struct-out PortalSuspended)
-         (struct-out Query)
-         (struct-out ReadyForQuery)
-         (struct-out RowDescription)
-         (struct-out Sync)
-         (struct-out Terminate)
-         bytes->row
-         field-dvec->typeid
-         field-dvec->field-info)
-
-;; subport : input-port num -> input-port
-;; Reads len bytes from input, then returns input port
-;; containing only those bytes.
-;; Raises error if fewer than len bytes available in input.
-(define (subport in len)
-  (let ([bytes (io:read-bytes-as-bytes in len)])
-    (unless (and (bytes? bytes) (= (bytes-length bytes) len))
-      (error/internal* 'subport "truncated input; got fewer bytes than expected"
-                       "expected" len
-                       "got" (if (bytes? bytes) (bytes-length bytes) 0)))
-    (open-input-bytes bytes)))
-
-
-;; Integers are signed, network order (big-endian).
-
-;; WRITING FUNCTIONS
-
-;; write-int16 : port integer -> (void)
-;; Writes a 16-bit integer, network byte order
-(define (io:write-int16 port val)
-  (write-bytes (integer->integer-bytes val 2 #t #t) port))
-
-;; write-int32 : port integer -> void
-;; Writes a 32-bit integer, network byte order
-(define (io:write-int32 port val)
-  (write-bytes (integer->integer-bytes val 4 #t #t) port))
-
-;; write-byte : port byte -> void
-(define (io:write-byte port byte)
-  (write-byte byte port))
-
-;; write-byte/char : port char -> void
-(define (io:write-byte/char port char)
-  (write-byte (char->integer char) port))
-
-;; write-bytes : port bytes -> void
-(define (io:write-bytes port bytes)
-  (write-bytes bytes port))
-
-;; write-null-terminated-string : port string -> void
-(define (io:write-null-terminated-string port string)
-  (write-string string port)
-  (write-byte 0 port))
-
-;; READING
-
-;; read-int16 : port -> integer
-(define (io:read-int16 port)
-  (integer-bytes->integer (read-bytes 2 port) #t #t))
-
-;; read-int32 : port -> integer
-(define (io:read-int32 port)
-  (integer-bytes->integer (read-bytes 4 port) #t #t))
-
-;; read-null-terminated-string : port -> string
-(define (io:read-null-terminated-string port)
-  (let [(strport (open-output-bytes))]
-    (let loop ()
-      (let ([next (read-byte port)])
-        (cond [(zero? next)
-               (get-output-string strport)]
-              [else
-               (write-byte next strport)
-               (loop)])))))
-
-;; read-byte : port -> byte
-(define (io:read-byte port)
-  (read-byte port))
-
-;; read-byte : port-> char
-(define (io:read-byte/char port)
-  (integer->char (read-byte port)))
-
-;; read-bytes-as-bytes : port number -> bytes
-(define (io:read-bytes-as-bytes port n)
-  (read-bytes n port))
-
-;; ========================================
-
-(define-syntax-rule (with-length-in p c . body)
-  ;; header char read & discarded elsewhere
-  (let ([len (io:read-int32 p)])
-    (let ([p (subport p (- len 4))])
-      . body)))
-
-(define-syntax-rule (with-length-out p c . body)
-  (let ([bs (let ([p (open-output-bytes)])
-              (let () (begin . body) (void))
-              (get-output-bytes p))])
-    (when c (io:write-byte/char p c))
-    (io:write-int32 p (+ 4 (bytes-length bs)))
-    (write-bytes bs p)))
-
-;; ========================================
-;; The strange structures
-
-(define-struct AuthenticationOk () #:transparent)
-(define-struct AuthenticationKerberosV5 () #:transparent)
-(define-struct AuthenticationCleartextPassword () #:transparent)
-(define-struct AuthenticationCryptPassword (salt) #:transparent)
-(define-struct AuthenticationMD5Password (salt) #:transparent)
-(define-struct AuthenticationSCMCredential () #:transparent)
-(define (parse:Authentication p)
-  (with-length-in p #\R
-    (let* ([tag (io:read-int32 p)])
-      (case tag
-        ((0) (make-AuthenticationOk))
-        ((2) (make-AuthenticationKerberosV5))
-        ((3) (make-AuthenticationCleartextPassword))
-        ((4) (let ([salt (io:read-bytes-as-bytes p 2)])
-               (make-AuthenticationCleartextPassword salt)))
-        ((5) (let ([salt (io:read-bytes-as-bytes p 4)])
-               (make-AuthenticationMD5Password salt)))
-        ((6) (make-AuthenticationSCMCredential))
-        (else
-         (error/internal* 'authentication "back end requested unknown authentication method"
-                          "method code" tag))))))
-
-(define-struct StartupMessage (parameters) #:transparent)
-(define (write:StartupMessage p v)
-  (with-length-out p #f
-    (io:write-int32 p 196608)
-    (for-each (lambda (param)
-                (io:write-null-terminated-string p (car param))
-                (io:write-null-terminated-string p (cdr param)))
-              (StartupMessage-parameters v))
-    (io:write-byte p 0)))
-
-(define-struct SSLRequest () #:transparent)
-(define (write:SSLRequest p v)
-  (io:write-int32 p 8)
-  (io:write-int32 p 80877103))
-
-(define-struct CancelRequest (process-id secret-key) #:transparent)
-(define (write:CancelRequest p v)
-  (io:write-int32 p 16)
-  (io:write-int32 p 80877102)
-  (io:write-int32 p (CancelRequest-process-id v))
-  (io:write-int32 p (CancelRequest-secret-key v)))
-
-(define-struct ErrorResponse (properties) #:transparent)
-(define (parse:ErrorResponse p)
-  (with-length-in p #\E
-    (let* ([fields (parse-field-list p)])
-      (make-ErrorResponse fields))))
-
-(define-struct NoticeResponse (properties) #:transparent)
-(define (parse:NoticeResponse p)
-  (with-length-in p #\N
-    (let* ([fields (parse-field-list p)])
-      (make-NoticeResponse fields))))
-
-(define (parse-field-list p)
-  (let loop ()
-    (let ([next (peek-byte p)])
-      (cond [(zero? next)
-             (begin (read-byte p) null)]
-            [else
-             (let* ([tag (integer->char (io:read-byte p))]
-                    [value (io:read-null-terminated-string p)])
-               (cons (cons (char->message-tag tag) value)
-                     (loop)))]))))
-
-;; ========================================
-;; The normal structures
-
-(define-struct BackendKeyData (process-id secret-key) #:transparent)
-(define (parse:BackendKeyData p)
-  (with-length-in p #\K
-    (let* ([process-id (io:read-int32 p)]
-           [secret-key (io:read-int32 p)])
-      (make-BackendKeyData process-id secret-key))))
-
-(define-struct Bind (portal statement param-formats values result-formats) #:transparent)
-(define (write:Bind p v)
-  (match v
-    [(struct Bind (portal statement param-formats values result-formats))
-     (with-length-out p #\B
-       (io:write-null-terminated-string p portal)
-       (io:write-null-terminated-string p statement)
-       (io:write-int16 p (length param-formats))
-       (for ([param-format (in-list param-formats)])
-         (io:write-int16 p param-format))
-       (io:write-int16 p (length values))
-       (for ([value (in-list values)])
-         (cond [(bytes? value)
-                (io:write-int32 p (bytes-length value))
-                (io:write-bytes p value)]
-               [(string? value)
-                (let ([value (string->bytes/utf-8 value)])
-                  (io:write-int32 p (bytes-length value))
-                  (io:write-bytes p value))]
-               [(sql-null? value)
-                (io:write-int32 p -1)]))
-       (io:write-int16 p (length result-formats))
-       (for ([result-format (in-list result-formats)])
-         (io:write-int16 p result-format)))]))
-
-(define-struct BindComplete () #:transparent)
-(define (parse:BindComplete p)
-  (with-length-in p #\2
-    (make-BindComplete)))
-
-(define-struct Close (type name) #:transparent)
-(define (write:Close p v)
-  (match v
-    [(struct Close (type name))
-     (with-length-out p #\C
-       (io:write-byte/char p (statement/portal->char type))
-       (io:write-null-terminated-string p name))]))
-
-(define-struct CloseComplete () #:transparent)
-(define (parse:CloseComplete p)
-  (with-length-in p #\3
-    (make-CloseComplete)))
-
-(define-struct CommandComplete (command) #:transparent)
-(define (parse:CommandComplete p)
-  (with-length-in p #\C
-    (let* ([command (io:read-null-terminated-string p)])
-      (make-CommandComplete (string->command-alist command)))))
-
-(define-struct CopyInResponse (format column-formats) #:transparent)
-(define (parse:CopyInResponse p)
-  (with-length-in p #\G
-    (let* ([format (io:read-byte p)]
-           [column-formats
-            (for/list ([i (in-range (io:read-int16 p))])
-              (io:read-int16 p))])
-      (make-CopyInResponse format column-formats))))
-
-(define-struct CopyOutResponse (format column-formats) #:transparent)
-(define (parse:CopyOutResponse p)
-  (with-length-in p #\H
-    (let* ([format (io:read-byte p)]
-           [column-formats
-            (for/list ([i (in-range (io:read-int16 p))])
-              (io:read-int16 p))])
-      (make-CopyOutResponse format column-formats))))
-
-(define-struct DataRow (data) #:transparent)
-(define (parse:DataRow p)
-  (let ([len (io:read-int32 p)])
-    (make-DataRow (read-bytes (- len 4) p))))
-
-(define (bytes->row buf type-readers)
-  (let* ([columns (integer-bytes->integer buf #t #t 0 2)]
-         [row (make-vector columns)])
-    (let loop ([i 0] [type-readers type-readers] [start 2])
-      (when (< i columns)
-        (let ([len (integer-bytes->integer buf #t #t start (+ start 4))]
-              [start* (+ start 4)])
-          (vector-set! row i
-                       (if (= len -1)
-                           sql-null
-                           ((car type-readers) buf start* (+ start* len))))
-          (let ([next (+ start* (max 0 len))])
-            (loop (add1 i) (cdr type-readers) next)))))
-    row))
-
-(define-struct Describe (type name) #:transparent)
-(define (write:Describe p v)
-  (match v
-    [(struct Describe (type name))
-     (with-length-out p #\D
-       (io:write-byte/char p (statement/portal->char type))
-       (io:write-null-terminated-string p name))]))
-
-(define-struct EmptyQueryResponse () #:transparent)
-(define (parse:EmptyQueryResponse p)
-  (with-length-in p #\I
-    (make-EmptyQueryResponse)))
-
-(define-struct Execute (portal row-limit) #:transparent)
-(define (write:Execute p v)
-  (match v
-    [(struct Execute (portal row-limit))
-     (with-length-out p #\E
-       (io:write-null-terminated-string p portal)
-       (io:write-int32 p row-limit))]))
-
-(define-struct Flush () #:transparent)
-(define (write:Flush p v)
-  (with-length-out p #\H))
-
-(define-struct NoData () #:transparent)
-(define (parse:NoData p)
-  (with-length-in p #\n
-    (make-NoData)))
-
-(define-struct NotificationResponse (process-id condition info) #:transparent)
-(define (parse:NotificationResponse p)
-  (with-length-in p #\A
-    (let* ([process-id (io:read-int32 p)]
-           [condition (io:read-int32 p)]
-           [info (io:read-int32 p)])
-      (make-NotificationResponse process-id condition info))))
-
-(define-struct ParameterDescription (type-oids) #:transparent)
-(define (parse:ParameterDescription p)
-  (with-length-in p #\t
-    (let* ([type-oids
-            (for/list ([i (in-range (io:read-int16 p))])
-              (io:read-int32 p))])
-      (make-ParameterDescription type-oids))))
-
-(define-struct ParameterStatus (name value) #:transparent)
-(define (parse:ParameterStatus p)
-  (with-length-in p #\S
-    (let* ([name (io:read-null-terminated-string p)]
-           [value (io:read-null-terminated-string p)])
-      (make-ParameterStatus name value))))
-
-(define-struct Parse (name query type-oids) #:transparent)
-(define (write:Parse p v)
-  (match v
-    [(struct Parse (name query type-oids))
-     (with-length-out p #\P
-       (io:write-null-terminated-string p name)
-       (io:write-null-terminated-string p query)
-       (io:write-int16 p (length type-oids))
-       (for ([type-oid (in-list type-oids)])
-         (io:write-int32 p type-oid)))]))
-
-(define-struct ParseComplete () #:transparent)
-(define (parse:ParseComplete p)
-  (with-length-in p #\1
-    (make-ParseComplete)))
-
-(define-struct PasswordMessage (password) #:transparent)
-(define (write:PasswordMessage p v)
-  (match v
-    [(struct PasswordMessage (password))
-     (with-length-out p #\p
-       (io:write-null-terminated-string p password))]))
-
-(define-struct PortalSuspended () #:transparent)
-(define (parse:PortalSuspended p)
-  (with-length-in p #\s
-    (make-PortalSuspended)))
-
-(define-struct Query (query) #:transparent)
-(define (write:Query p v)
-  (match v
-    [(struct Query (query))
-     (with-length-out p #\Q
-       (io:write-null-terminated-string p query))]))
-
-(define-struct ReadyForQuery (transaction-status) #:transparent)
-(define (parse:ReadyForQuery p)
-  (with-length-in p #\Z
-    (let* ([transaction-status
-            (char->transaction-status (io:read-byte/char p))])
-      (make-ReadyForQuery transaction-status))))
-
-(define-struct RowDescription (fields) #:transparent)
-(define (parse:RowDescription p)
-  (with-length-in p #\T
-    (let* ([fields
-            (for/list ([i (in-range (io:read-int16 p))])
-              (let* ([name (io:read-null-terminated-string p)]
-                     [table-oid (io:read-int32 p)]
-                     [column-attid (io:read-int16 p)]
-                     [type-oid (io:read-int32 p)]
-                     [type-size (io:read-int16 p)]
-                     [type-mod (io:read-int32 p)]
-                     [format-code (io:read-int16 p)])
-                (vector name table-oid column-attid type-oid type-size type-mod format-code)))])
-      (make-RowDescription fields))))
-
-(define-struct Sync () #:transparent)
-(define (write:Sync p v)
-  (with-length-out p #\S))
-
-(define-struct Terminate () #:transparent)
-(define (write:Terminate p v)
-  (with-length-out p #\X))
-
-;; ========================================
-
-(define (write-message msg port)
-  (define-syntax (gen-cond stx)
-    (syntax-case stx ()
-      [(gen-cond type ...)
-       (with-syntax ([((pred write) ...)
-                      (for/list ([type (in-list (syntax->list #'(type ...)))])
-                        (list (datum->syntax type
-                                (string->symbol (format "~a?" (syntax-e type))))
-                              (datum->syntax type
-                                (string->symbol (format "write:~a" (syntax-e type))))))])
-         #'(cond [(pred msg) (write port msg)] ...
-                 [else
-                  (error/internal* 'write-message "unknown message type"
-                                   '("message" value) msg)]))]))
-  (gen-cond Sync
-            Parse
-            Describe
-            Bind
-            Execute
-            Flush
-            Query
-            Close
-            Terminate
-            StartupMessage
-            PasswordMessage
-            SSLRequest
-            CancelRequest))
-
-(define (parse-server-message p)
-  (let ([c (read-char p)])
-    (case c
-      ((#\R) (parse:Authentication p))
-      ((#\E) (parse:ErrorResponse p))
-      ((#\N) (parse:NoticeResponse p))
-      ((#\K) (parse:BackendKeyData p))
-      ((#\2) (parse:BindComplete p))
-      ((#\3) (parse:CloseComplete p))
-      ((#\C) (parse:CommandComplete p))
-      ((#\G) (parse:CopyInResponse p))
-      ((#\H) (parse:CopyOutResponse p))
-      ((#\D) (parse:DataRow p))
-      ((#\I) (parse:EmptyQueryResponse p))
-      ((#\n) (parse:NoData p))
-      ((#\A) (parse:NotificationResponse p))
-      ((#\t) (parse:ParameterDescription p))
-      ((#\S) (parse:ParameterStatus p))
-      ((#\1) (parse:ParseComplete p))
-      ((#\s) (parse:PortalSuspended p))
-      ((#\Z) (parse:ReadyForQuery p))
-      ((#\T) (parse:RowDescription p))
-      (else
-       (if (eof-object? c)
-           c
-           (error/internal* 'parse-server-message "unknown message header"
-                            '("header" value) c))))))
-
-;; ========================================
-;; Helpers
-
-(define (string/f->string/sql-null b)
-  (if b b sql-null))
-
-(define (string/sql-null->string/f b)
-  (if (sql-null? b) #f b))
-
-(define (char->message-tag c)
-  (case c
-    [(#\S) 'severity]
-    [(#\C) 'code]
-    [(#\M) 'message]
-    [(#\D) 'detail]
-    [(#\H) 'hint]
-    [(#\P) 'position]
-    [(#\p) 'internal-position]
-    [(#\q) 'internal-query]
-    [(#\W) 'where]
-    [(#\F) 'file]
-    [(#\L) 'line]
-    [(#\R) 'routine]))
-
-(define (char->statement/portal c)
-  (case c
-    [(#\S) 'statement]
-    [(#\P) 'portal]))
-(define (statement/portal->char sp)
-  (case sp
-    [(statement) #\S]
-    [(portal) #\P]))
-
-(define (char->transaction-status c)
-  (case c
-    [(#\I) 'idle]
-    [(#\T) 'transaction]
-    [(#\E) 'failed]))
-(define (transaction-status->char ts)
-  (case ts
-    [(idle) #\I]
-    [(transaction) #\T]
-    [(failed) #\E]))
-
-(define (string->command-alist s)
-  (cond [(regexp-match #rx"^INSERT ([0-9]*) ([0-9]*) *$" s)
-         => (lambda (m)
-              `((insert-id . ,(let ([oid (string->number (cadr m))])
-                                (if (zero? oid) #f oid)))
-                (affected-rows . ,(string->number (caddr m)))))]
-        [(regexp-match #rx"^DELETE ([0-9]*) *$" s)
-         => (lambda (m)
-              `((affected-rows . ,(string->number (cadr m)))))]
-        [(regexp-match #rx"^UPDATE ([0-9]*) *$" s)
-         => (lambda (m)
-              `((affected-rows . ,(string->number (cadr m)))))]
-        #|
-        [(regexp-match #rx"^SELECT *$" s) ...]
-        [(regexp-match #rx"^MOVE ([0-9]*) *$" s) ...]
-        [(regexp-match #rx"^FETCH ([0-9]*) *$" s) ...]
-        [(regexp-match #rx"^(CREATE|ALTER|DROP) ([A-Z]*) *$" s) ...]
-        |#
-        [else '()]))
-
-
-;; dvec layout is #(name table-oid col-oid typeid typelen typemod text/binary)
-
-(define (field-dvec->typeid dvec)
-  (vector-ref dvec 3))
-
-(define (field-dvec->field-info dvec)
-  (match dvec
-    [(vector name table column type-oid type-size type-mod format-code)
-     `((name . ,name)
-       (typeid . ,type-oid)
-       (type-size . ,type-size)
-       (type-mod . ,type-mod))]))
diff --git a/pkgs/db-pkgs/db-lib/db/private/sqlite3/place.rkt b/pkgs/db-pkgs/db-lib/db/private/sqlite3/place.rkt
deleted file mode 100644
index 1ebeb7af5e..0000000000
--- a/pkgs/db-pkgs/db-lib/db/private/sqlite3/place.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         racket/class
-         db/base
-         db/private/generic/place-client
-         (rename-in db/private/sqlite3/main
-                    [sqlite3-connect pre:sqlite3-connect])
-         db/private/sqlite3/dbsystem)
-
-(define (sqlite3-connect #:database path
-                         #:mode [mode 'read/write]
-                         #:busy-retry-delay [busy-retry-delay 0.1]
-                         #:busy-retry-limit [busy-retry-limit 10]
-                         #:debug? [debug? #f]
-                         #:use-place [use-place #f])
-  (cond [use-place
-         (place-connect (list 'sqlite3 path mode busy-retry-delay busy-retry-limit)
-                        sqlite-place-proxy%)]
-        [else
-         (pre:sqlite3-connect #:database path
-                              #:mode mode
-                              #:busy-retry-delay busy-retry-delay
-                              #:busy-retry-limit busy-retry-limit
-                              #:debug? debug?)]))
-
-(define sqlite-place-proxy%
-  (class place-proxy-connection%
-    (super-new)
-    (define/override (get-dbsystem) dbsystem)))
-
-(provide sqlite3-connect
-         sqlite3-available?)
diff --git a/pkgs/db-pkgs/db-lib/db/sqlite3.rkt b/pkgs/db-pkgs/db-lib/db/sqlite3.rkt
deleted file mode 100644
index c6c5260adc..0000000000
--- a/pkgs/db-pkgs/db-lib/db/sqlite3.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         db/base
-         db/private/sqlite3/place)
-
-;; FIXME: Contracts duplicated at main.rkt
-(provide/contract
- [sqlite3-connect
-  (->* (#:database (or/c path-string? 'memory 'temporary))
-       (#:mode (or/c 'read-only 'read/write 'create)
-        #:busy-retry-limit (or/c exact-nonnegative-integer? +inf.0)
-        #:busy-retry-delay (and/c rational? (not/c negative?))
-        #:use-place boolean?
-        #:debug? any/c)
-       connection?)]
- [sqlite3-available?
-  (-> boolean?)])
diff --git a/pkgs/db-pkgs/db-lib/db/util/datetime.rkt b/pkgs/db-pkgs/db-lib/db/util/datetime.rkt
deleted file mode 100644
index 3537eacf08..0000000000
--- a/pkgs/db-pkgs/db-lib/db/util/datetime.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         racket/match
-         (prefix-in srfi: srfi/19)
-         db/private/generic/sql-data)
-
-(define (sql-datetime->srfi-date datetime)
-  (match datetime
-    [(struct sql-date (year month day))
-     (srfi:make-date 0 0 0 0 day month year 0)]
-    [(struct sql-time (hour minute second nanosecond tz))
-     (srfi:make-date nanosecond second minute hour 0 0 0 (or tz 0))]
-    [(struct sql-timestamp (year month day hour minute second nanosecond tz))
-     (srfi:make-date nanosecond second minute hour day month year (or tz 0))]))
-
-(define (srfi-date->sql-date date)
-  (make-sql-date (srfi:date-year date)
-                 (srfi:date-month date)
-                 (srfi:date-day date)))
-
-(define (srfi-date->sql-time* date tz? ns)
-  (make-sql-time (srfi:date-hour date)
-                 (srfi:date-minute date)
-                 (srfi:date-second date)
-                 (or ns (srfi:date-nanosecond date))
-                 (and tz? (srfi:date-zone-offset date))))
-
-(define (srfi-date->sql-time date [ns #f])
-  (srfi-date->sql-time* date #f ns))
-
-(define (srfi-date->sql-time-tz date [ns #f])
-  (srfi-date->sql-time* date #t ns))
-
-(define (srfi-date->sql-timestamp* date tz? ns)
-  (make-sql-timestamp (srfi:date-year date)
-                      (srfi:date-month date)
-                      (srfi:date-day date)
-                      (srfi:date-hour date)
-                      (srfi:date-minute date)
-                      (srfi:date-second date)
-                      (or ns (srfi:date-nanosecond date))
-                      (and tz? (srfi:date-zone-offset date))))
-
-(define (srfi-date->sql-timestamp date [ns #f])
-  (srfi-date->sql-timestamp* date #f ns))
-
-(define (srfi-date->sql-timestamp-tz date [ns #f])
-  (srfi-date->sql-timestamp* date #t ns))
-
-(define (sql-day-time-interval->seconds x)
-  (+ (* (sql-interval-hours x) 60 60)
-     (* (sql-interval-minutes x) 60)
-     (sql-interval-seconds x)
-     (/ (sql-interval-nanoseconds x) #i1e9)))
-
-;; ============================================================
-
-;; Note: MySQL allows 0 month, 0 day, etc.
-
-(provide/contract
- [sql-datetime->srfi-date
-  (-> (or/c sql-date? sql-time? sql-timestamp?)
-      srfi:date?)]
- [srfi-date->sql-date
-  (-> srfi:date? sql-date?)]
- [srfi-date->sql-time
-  (->* (srfi:date?) ((or/c exact-nonnegative-integer? #f))
-       sql-time?)]
- [srfi-date->sql-time-tz
-  (->* (srfi:date?) ((or/c exact-nonnegative-integer? #f))
-       sql-time?)]
- [srfi-date->sql-timestamp
-  (->* (srfi:date?) ((or/c exact-nonnegative-integer? #f))
-       sql-timestamp?)]
- [srfi-date->sql-timestamp-tz
-  (->* (srfi:date?) ((or/c exact-nonnegative-integer? #f))
-       sql-timestamp?)]
-
- [sql-day-time-interval->seconds
-  (-> sql-day-time-interval? rational?)])
diff --git a/pkgs/db-pkgs/db-lib/db/util/geometry.rkt b/pkgs/db-pkgs/db-lib/db/util/geometry.rkt
deleted file mode 100644
index 5c69e6e659..0000000000
--- a/pkgs/db-pkgs/db-lib/db/util/geometry.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         "private/geometry.rkt")
-
-(provide/contract
- [struct point ([x real?] [y real?])]
- [struct line-string ([points (listof point?)])]
- [struct polygon ([exterior linear-ring?]
-                  [interiors (listof linear-ring?)])]
- [struct multi-point ([elements (listof point?)])]
- [struct multi-line-string ([elements (listof line-string?)])]
- [struct multi-polygon ([elements (listof polygon?)])]
- [struct geometry-collection ([elements (listof geometry2d?)])]
-
- [line? (-> any/c boolean?)]
- [linear-ring? (-> any/c boolean?)]
- [geometry2d? (-> any/c boolean?)]
-
- [geometry->wkb
-  (->* (geometry2d?)
-       (#:big-endian? any/c)
-       bytes?)]
- [wkb->geometry
-  (->* (bytes?)
-       (exact-nonnegative-integer?
-        exact-nonnegative-integer?)
-       geometry2d?)])
diff --git a/pkgs/db-pkgs/db-lib/db/util/postgresql.rkt b/pkgs/db-pkgs/db-lib/db/util/postgresql.rkt
deleted file mode 100644
index 9eabda3957..0000000000
--- a/pkgs/db-pkgs/db-lib/db/util/postgresql.rkt
+++ /dev/null
@@ -1,124 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         racket/serialize
-         racket/string
-         unstable/error
-         "geometry.rkt")
-
-#|
-inet, cidr = family:byte bits:byte is_cidr:byte addrlen:byte addr:be-integer
-  is_cidr is ignored
-
-box = x1 y1 x2 y2 (all float8)
-circle = x y rad (all float8)
-line = not yet implemented
-lseg = x1 y1 x2 y2 (all float8)
-path = closed?:byte #points:int4 (x y : float8)*
-point = x y (all float8)
-polygon = #points:int4 (x y : float8)*
-|#
-
-(serializable-struct pg-box (ne sw)
-        #:transparent
-        #:guard (lambda (ne sw _n)
-                  (let ([x1 (point-x ne)]
-                        [x2 (point-x sw)]
-                        [y1 (point-y ne)]
-                        [y2 (point-y sw)])
-                    (values (point (max x1 x2) (max y1 y2))
-                            (point (min x1 x2) (min y1 y2))))))
-
-(serializable-struct pg-circle (center radius)
-        #:transparent
-        #:guard (lambda (center radius _n)
-                  (values center (exact->inexact radius))))
-
-(serializable-struct pg-path (closed? points)
-        #:transparent
-        #:guard (lambda (closed? points _n)
-                  (values (and closed? #t)
-                          points)))
-
-(serializable-struct pg-array (dimensions dimension-lengths dimension-lower-bounds contents)
-        #:transparent
-        #:guard (lambda (ndim counts lbounds vals _n)
-                  (unless (= (length counts) ndim)
-                    (error* 'pg-array "list for dimension lengths has wrong length"
-                            "expected length" ndim
-                            '("got" value) counts))
-                  (unless (= (length lbounds) ndim)
-                    (error* 'pg-array "list for dimension lower bounds has wrong length"
-                            "expected length" ndim
-                            '("got" value) lbounds))
-                  (let loop ([counts* counts] [vals* vals])
-                    (when (pair? counts*)
-                      (unless (and (vector? vals*)
-                                   (= (vector-length vals*) (car counts*)))
-                        (error 'pg-array "bad array contents: ~e" vals))
-                      (for ([sub (in-vector vals*)])
-                        (loop (cdr counts*) sub))))
-                  (values ndim counts lbounds vals)))
-
-(define (pg-array-ref arr . indexes)
-  (unless (= (pg-array-dimensions arr) (length indexes))
-    (error* 'pg-array-ref "wrong number of indexes"
-            "expected number" (pg-array-dimensions arr)
-            '("got" value) indexes))
-  (let* ([counts (pg-array-dimension-lengths arr)]
-         [lbounds (pg-array-dimension-lower-bounds arr)]
-         [ubounds (map (lambda (c lb) (+ c lb -1)) counts lbounds)])
-    (unless (for/and ([index indexes] [lbound lbounds] [ubound ubounds])
-              (<= lbound index ubound))
-      (error* 'pg-array-ref "index out of range"
-              '("index" value) indexes
-              "valid range" (string-join (for/list ([lbound lbounds] [ubound ubounds])
-                                           (format "[~a,~a]" lbound ubound))
-                                         ", ")))
-    (let loop ([indexes (map - indexes lbounds)]
-               [vals (pg-array-contents arr)])
-      (cond [(pair? indexes)
-             (let ([index (car indexes)])
-               (loop (cdr indexes)
-                     (vector-ref vals index)))]
-            [else vals]))))
-
-(define (pg-array->list arr)
-  (unless (= (pg-array-dimensions arr) 1)
-    (raise-type-error 'pg-array->list "pg-array of dimension 1" arr))
-  (vector->list (pg-array-contents arr)))
-
-(define (list->pg-array lst)
-  (cond [(zero? (length lst))
-         (pg-array 0 '() '() '#())]
-        [else (pg-array 1 (list (length lst)) '(1) (list->vector lst))]))
-
-(serializable-struct pg-empty-range ()
-  #:transparent)
-(serializable-struct pg-range (lb includes-lb? ub includes-ub?)
-  #:transparent)
-
-(define (pg-range-or-empty? v)
-  (or (pg-empty-range? v) (pg-range? v)))
-
-(provide/contract
- [struct pg-box ([ne point?] [sw point?])]
- [struct pg-circle ([center point?] [radius (and/c real? (not/c negative?))])]
- [struct pg-path ([closed? any/c] [points (listof point?)])]
-
- [struct pg-array ([dimensions exact-nonnegative-integer?]
-                   [dimension-lengths (listof exact-positive-integer?)]
-                   [dimension-lower-bounds (listof exact-integer?)]
-                   [contents vector?])]
- [pg-array-ref
-  (->* (pg-array?) () #:rest (non-empty-listof exact-integer?) any)]
- [pg-array->list
-  (-> pg-array? list?)]
- [list->pg-array
-  (-> list? pg-array?)]
-
- [struct pg-empty-range ()]
- [struct pg-range ([lb any/c]
-                   [includes-lb? boolean?]
-                   [ub any/c]
-                   [includes-ub? boolean?])]
- [pg-range-or-empty? (-> any/c boolean?)])
diff --git a/pkgs/db-pkgs/db-lib/db/util/private/geometry.rkt b/pkgs/db-pkgs/db-lib/db/util/private/geometry.rkt
deleted file mode 100644
index 07617a7961..0000000000
--- a/pkgs/db-pkgs/db-lib/db/util/private/geometry.rkt
+++ /dev/null
@@ -1,189 +0,0 @@
-#lang racket/base
-(require racket/list)
-(provide (all-defined-out))
-
-#|
-Geometry according to mysql:
-abstract Geometry
-- Point = (x, y)
-- abstract Curve
-  - LineString = (list of points)
-    - predicate Line
-    - predicate LinearRing (closed and non-self-intersecting, bleh)
-- abstract Surface
-  - Polygon (defined by LinearRings, bleh)
-      = exterior ring, list of interior rings
-- GeometryCollection = (list of geometry values)
-  - MultiPoint = (list of points)
-  - abstract MultiCurve
-    - MultiLineString = (list of line strings)
-  - abstract MultiSurface
-    - MultiPolygon = (list of polygons)
-
-every geometric value has an associated Spacial Reference System (SRID), ignored by mysql
-
-Geometry according to postgis:
-
-same as above, but with coordinate variants: eg pointm = (x, y, m)
-|#
-
-(struct point (x y)
-        #:transparent
-        #:guard (lambda (x y _n)
-                  (values (exact->inexact x)
-                          (exact->inexact y))))
-
-(struct line-string (points)
-        #:transparent)
-
-(define (line? x)
-  (and (line-string? x)
-       (let ([points (line-string-points x)])
-         (and (= 2 (length points))
-              (not (equal? (first points) (second points)))))))
-
-(define (linear-ring? x)
-  (and (line-string? x)
-       (let ([points (line-string-points x)])
-         ;; FIXME: require at least ??? points
-         (equal? (first points) (last points)))))
-
-(struct polygon (exterior interiors)
-        #:transparent)
-
-(struct multi-point (elements)
-        #:transparent)
-
-(struct multi-line-string (elements)
-        #:transparent)
-
-(struct multi-polygon (elements)
-        #:transparent)
-
-(struct geometry-collection (elements)
-        #:transparent)
-
-(define (geometry2d? x)
-  (or (point? x)
-      (line-string? x)
-      (polygon? x)
-      (multi-point? x)
-      (multi-line-string? x)
-      (multi-polygon? x)
-      (geometry-collection? x)))
-
-;; ----------------------------------------
-
-;; Based on OGC 06-103r4
-
-(define (wkb->geometry b [start 0] [end (bytes-length b)])
-  (bytes->geometry 'wkb->geometry b start end #:srid? #f))
-
-(define (bytes->geometry who b [start 0] [end (bytes-length b)]
-                         #:srid? [srid? #f])
-  (define (get-byte)
-    (begin0 (bytes-ref b start)
-      (set! start (+ start 1))))
-  (define (get-uint be?)
-    (begin0 (integer-bytes->integer b #f be? start (+ start 4))
-      (set! start (+ start 4))))
-  (define (get-multi n get-X)
-    (for/list ([i (in-range n)]) (get-X)))
-  (define (get-geometry)
-    (let ([srid (and srid? (get-uint #f))] ;; FIXME: store srid
-          [be? (zero? (get-byte))])
-      (define (get-double)
-        (begin0 (floating-point-bytes->real b be? start (+ start 8))
-          (set! start (+ start 8))))
-      (define (get-point)
-        (let* ([x (get-double)]
-               [y (get-double)])
-          (point x y)))
-      (define (get-linear-ring)
-        (let ([len (get-uint be?)])
-          (line-string (get-multi len get-point))))
-      (let ([type (get-uint be?)])
-        (case type
-          ((1) (get-point))
-          ((2) (let ([points (get-multi (get-uint be?) get-point)])
-                 (line-string points)))
-          ((3) (let ([rings (get-multi (get-uint be?) get-linear-ring)])
-                 (when (null? rings)
-                   (error who "polygon with zero rings"))
-                 (polygon (car rings) (cdr rings))))
-          ((4 5 6 7) (let ([constructor
-                            (case type
-                              ((4) multi-point)
-                              ((5) multi-line-string)
-                              ((6) multi-polygon)
-                              ((7) geometry-collection))]
-                           [elements (get-multi (get-uint be?) get-geometry)])
-                       (constructor elements)))
-          (else
-           (error who "unsupported geometry type: ~s" type))))))
-  (begin0 (get-geometry)
-    (unless (= start end)
-      (error who "~s bytes left over" (- end start)))))
-
-;; ----
-
-(define (geometry->wkb g
-                       #:big-endian? [be? (system-big-endian?)])
-  (geometry->bytes 'geometry->wkb g
-                   #:big-endian? be?
-                   #:srid? #f))
-
-(define (geometry->bytes who g
-                         #:big-endian? [be? (system-big-endian?)]
-                         #:srid? [srid? #f])
-  (define out (open-output-bytes))
-  (define (put-uint n)
-    (write-bytes (integer->integer-bytes n 4 #f be?) out))
-  (define (put-double x)
-    (write-bytes (real->floating-point-bytes x 8 be?) out))
-  (define (put-point g)
-    (put-double (point-x g))
-    (put-double (point-y g)))
-  (define (put-line-string g)
-    (let ([points (line-string-points g)])
-      (put-uint (length points))
-      (for ([p (in-list points)])
-        (put-point p))))
-  (define (put-collection lst)
-    (put-uint (length lst))
-    (for ([g (in-list lst)])
-      (put-geometry g)))
-  (define (put-geometry g)
-    (when srid? (put-uint 0)) ;; FIXME
-    (write-byte (if be? 0 1) out)
-    (cond [(point? g)
-           (put-uint 1)
-           (put-point g)]
-          [(line-string? g)
-           (put-uint 2)
-           (put-line-string g)]
-          [(polygon? g)
-           (put-uint 3)
-           (let ([rings (cons (polygon-exterior g) (polygon-interiors g))])
-             (put-uint (length rings))
-             (for ([ring (in-list rings)])
-               (put-line-string ring)))]
-          [(multi-point? g)
-           (put-uint 4)
-           (put-collection (multi-point-elements g))]
-          [(multi-line-string? g)
-           (put-uint 5)
-           (put-collection (multi-line-string-elements g))]
-          [(multi-polygon? g)
-           (put-uint 6)
-           (put-collection (multi-polygon-elements g))]
-          [(geometry-collection? g)
-           (put-uint 7)
-           (put-collection (geometry-collection-elements g))]
-          [else
-           (error who "unsupported geometry type: ~e" g)]))
-  (put-geometry g)
-  (get-output-bytes out))
-
-;; FIXME: define WKT functions?
-;; FIXME: eventually, integrate with geos?
diff --git a/pkgs/db-pkgs/db-lib/db/util/testing.rkt b/pkgs/db-pkgs/db-lib/db/util/testing.rkt
deleted file mode 100644
index 12c3016f37..0000000000
--- a/pkgs/db-pkgs/db-lib/db/util/testing.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/class
-         ffi/unsafe/atomic
-         db/private/generic/interfaces
-         db/private/generic/common)
-
-(define high-latency-connection%
-  (class* locking% (connection<%>)
-    (init-private connection
-                  latency
-                  sleep-atomic?)
-    (inherit call-with-lock)
-    (super-new)
-
-    (define-syntax-rule (define-forward defmethod (sleep-factor method arg ...) ...)
-      (begin
-        (defmethod (method arg ...)
-          (call-with-lock 'method
-            (lambda ()
-              (let ([c connection])
-                (unless c (error/not-connected 'method))
-                (when (positive? sleep-factor)
-                  (if sleep-atomic?
-                      (call-as-atomic (lambda () (sleep (* sleep-factor latency))))
-                      (sleep (* sleep-factor latency))))
-                (send c method arg ...)))))
-        ...))
-
-    (define-forward define/public
-      (0 get-dbsystem)
-      (2 query fsym stmt cursor?) ;; 2 because may require implicit prepare
-      (1 prepare fsym stmt close-on-exec?)
-      (1 fetch/cursor fsym stmt fetch-size)
-      (0 get-base)
-      (0 free-statement stmt need-lock?)
-      (0 transaction-status fsym)
-      (1 start-transaction fsym isolation cwt?)
-      (1 end-transaction fsym mode cwt?)
-      (1 list-tables fsym schema))
-
-    (define/override (connected?) (and connection (send connection connected?)))
-
-    (define/public (disconnect)
-      (set! connection #f))))
-
-(define (high-latency-connection connection latency
-                                 #:sleep-atomic? [sleep-atomic? #f])
-  (new high-latency-connection%
-       [connection connection]
-       [latency latency]
-       [sleep-atomic? sleep-atomic?]))
-
-(provide/contract
- [high-latency-connection
-  (->* (connection? (>=/c 0))
-       (#:sleep-atomic? any/c)
-       connection?)])
diff --git a/pkgs/db-pkgs/db-lib/info.rkt b/pkgs/db-pkgs/db-lib/info.rkt
deleted file mode 100644
index 783b6a0355..0000000000
--- a/pkgs/db-pkgs/db-lib/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang setup/infotab
-
-(define collection 'multi)
-(define deps '("srfi-lite-lib"
-               "base"))
-
-(define pkg-desc "implementation (no documentation) part of \"db\"")
-
-(define pkg-authors '(ryanc))
diff --git a/pkgs/db-pkgs/db-test/LICENSE.txt b/pkgs/db-pkgs/db-test/LICENSE.txt
deleted file mode 100644
index 93b4acc538..0000000000
--- a/pkgs/db-pkgs/db-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-db-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/db-pkgs/db-test/info.rkt b/pkgs/db-pkgs/db-test/info.rkt
deleted file mode 100644
index e5aed3b70e..0000000000
--- a/pkgs/db-pkgs/db-test/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "db-lib"
-               "rackunit-lib"
-               "web-server-lib"))
-
-(define pkg-desc "tests for \"db\"")
-
-(define pkg-authors '(ryanc))
-(define build-deps '("srfi-lite-lib"))
-(define update-implies '("db-lib"))
diff --git a/pkgs/db-pkgs/db-test/tests/db/all-tests.rkt b/pkgs/db-pkgs/db-test/tests/db/all-tests.rkt
deleted file mode 100644
index 5918fc0af3..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/all-tests.rkt
+++ /dev/null
@@ -1,255 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/cmdline
-         racket/file
-         rackunit
-         rackunit/text-ui
-         racket/unit
-         db
-         "config.rkt"
-         (prefix-in db-
-                    (combine-in "db/connection.rkt"
-                                "db/query.rkt"
-                                "db/sql-types.rkt"
-                                "db/concurrent.rkt"))
-         (prefix-in gen-
-                    (combine-in "gen/misc.rkt"
-                                "gen/sql-types.rkt"
-                                "gen/query.rkt")))
-(provide (all-defined-out))
-
-#|
-
-RUNNING THE TESTS
------------------
-
-1) Default test configuration.
-
-To run the default tests (ie, the generic tests and sqlite3 tests),
-simply execute this file with no arguments:
-
-  racket -l tests/db/all-tests
-
-This is how DrDr runs the file---we assume the machine running DrDr
-has sqlite installed.
-
-2) Custom test configuration.
-
-First, set up the testing environment as described in the following
-subsections.
-
-Then, run the tests with the following command line:
-
-  racket -l tests/db/all-tests -- -g <label> ...
-
-Each <label> is either a <dsn> or a <confname>.
-
-== <dsn> ==
-
-A <dsn> is turned into a symbol and looked up using 'get-dsn'. The
-db-specific tests (which is most of them) are run using the resulting
-data source. The data source must conform to the following rules:
-
- - It must include all necessary connection arguments (including the
-   password, if one is required).
-
- - It should have an extension property named 'db:test whose value is
-   a list. The list should contain exactly one of the following
-   symbols, specifying the SQL dialect used by the data source: 'ispg,
-   'ismy, 'issl, 'isora, 'isdb2.
-
- - If either 'isora or 'isdb2 is set, the database should already be
-   populated with the "the_numbers" table (see config.rkt for definition
-   and test data). Otherwise, it is automatically created as a temporary
-   table for each test case.
-
-Running the tests on a new database system will almost certainly
-require changing the test suite to generate the correct SQL dialect
-and to selectively disable tests that can't run on a particular
-system.
-
-== <confname>: Defining testing configurations ==
-
-The "db-test.rktd" pref file (see definition of 'pref-file' below
-gives a mapping from <confnames> (ie, symbols) to <conf>s, which
-aggregate multiple testing data sources into a single profile.
-
-<conf> ::= (profile <conf> ...)
-         | (dsn <symbol>)
-         | (ref <symbol>)
-
-Testing profiles are flattened, not hierarchical.
-
-|#
-
-;; ----------------------------------------
-
-(define pref-file
-  (make-parameter (build-path (find-system-path 'pref-dir) "db-test.rktd")))
-
-(define (get-dbconf name)
-  (let ([conf (get-preference name (lambda () #f) 'timestamp (pref-file))])
-    (if conf
-        (parse-dbconf conf)
-        (let ([r (get-dsn name)])
-          (if r
-              (list (dbconf name r))
-              (error 'get-dbconf "no such dbconf: ~e" name))))))
-
-(struct dbconf (name dsn) #:transparent)
-
-(define-syntax-rule (expect name pred)
-  (unless (pred name) (error 'parse "bad ~a: ~e" 'name name)))
-
-;; parse-dbconf : sexpr -> (listof dbconf?)
-(define (parse-dbconf x)
-  (match x
-    [(list 'profile dbconfs ...)
-     (apply append (map parse-dbconf dbconfs))]
-    [(list 'ref conf-name)
-     (expect conf-name symbol?)
-     (get-dbconf conf-name)]
-    [(list 'dsn dsn-name)
-     (expect dsn-name symbol?)
-     (list (dbconf dsn-name (get-dsn dsn-name)))]))
-
-;; ----
-
-;; Set below by command-line parsing
-(define kill-safe? #f)
-
-(define (dbconf->unit x)
-  (match x
-    [(dbconf dbtestname (and r (data-source connector _args exts)))
-     (let* ([connect (lambda () (dsn-connect r))]
-            [dbsys (case connector ((odbc-driver) 'odbc) (else connector))]
-            [dbflags (cond [(assq 'db:test exts) => cadr]
-                           [else '()])])
-       (unit-from-context database^))]))
-
-(define (odbc-unit dbtestname dbflags dbargs)
-  (dbconf->unit
-   (dbconf dbtestname (data-source 'odbc dbargs `((db:test ,dbflags))))))
-
-(define sqlite-unit
-  (dbconf->unit
-   (dbconf "sqlite3, memory"
-           (data-source 'sqlite3
-                        '(#:database memory)
-                        '((db:test (issl)))))))
-
-(define sqlite/p-unit
-  (dbconf->unit
-   (dbconf "sqlite3, memory, with #:use-place=#t"
-           (data-source 'sqlite3
-                        '(#:database memory #:use-place #t)
-                        '((db:test (issl async)))))))
-
-;; ----
-
-(define-unit db-test@
-  (import database^
-          (tag connect (prefix connect: test^))
-          (tag query (prefix query: test^))
-          (tag sql-types (prefix sql-types: test^))
-          (tag concurrent (prefix concurrent: test^)))
-  (export test^)
-  (define test
-    (make-test-suite
-     (format "~a tests" dbtestname)
-     (list connect:test
-           query:test
-           sql-types:test
-           concurrent:test))))
-
-(define (specialize-test@ db@)
-  (compound-unit
-   (import)
-   (export DB-TEST)
-   (link (((DB : database^)) db@)
-         (((CONFIG : config^)) config@ DB)
-         (((CONNECT-TEST : test^)) db-connection@ CONFIG DB)
-         (((QUERY-TEST : test^)) db-query@ CONFIG DB)
-         (((SQL-TYPES-TEST : test^)) db-sql-types@ CONFIG DB)
-         (((CONCURRENT-TEST : test^)) db-concurrent@ CONFIG DB)
-         (((DB-TEST : test^)) db-test@
-                               DB
-                               (tag connect CONNECT-TEST)
-                               (tag query QUERY-TEST)
-                               (tag sql-types SQL-TYPES-TEST)
-                               (tag concurrent CONCURRENT-TEST)))))
-
-(define (specialize-test db@)
-  (define-values/invoke-unit (specialize-test@ db@) (import) (export test^))
-  test)
-
-(define (odbc-test dsn [flags null])
-  (specialize-test (odbc-unit dsn flags `(#:dsn ,dsn))))
-
-(define sqlite-test
-  (specialize-test sqlite-unit))
-
-(define sqlite/p-test
-  (specialize-test sqlite/p-unit))
-
-(define generic-test
-  (make-test-suite "Generic tests (no db)"
-    (list gen-misc:test
-          gen-sql-types:test
-          gen-query:test)))
-
-;; ----
-
-(define (make-all-tests label dbconfs)
-  (make-test-suite (format "All ~s tests" label)
-    (for/list ([dbconf (in-list dbconfs)])
-      (specialize-test (dbconf->unit dbconf)))))
-
-;; ----
-
-(define-syntax-rule (setup-debug db@ c)
-  (begin (define-values/invoke-unit db@ (import) (export database^))
-         (define-values/invoke-unit config@ (import database^) (export config^))
-         (define c (connect-and-setup))))
-
-;; ----------------------------------------
-
-(define gui? #f)
-(define include-generic? #f)
-(define include-sqlite? #f)
-
-;; If no labels given, run generic tests. If labels given, run generic
-;; tests only if -g option given.
-
-(command-line
- #:once-each
- [("--gui") "Run tests in RackUnit GUI" (set! gui? #t)]
- [("-k" "--killsafe") "Wrap with kill-safe-connection" (set! kill-safe? #t)]
- [("-g" "--generic") "Run generic tests" (set! include-generic? #t)]
- [("-s" "--sqlite3") "Run sqlite3 in-memory db tests" (set! include-sqlite? #t)]
- [("-f" "--config-file") file  "Use configuration file" (pref-file file)]
- #:args labels
- (let* ([no-labels?
-         (not (or include-generic? include-sqlite? (pair? labels)))]
-        [tests
-         (for/list ([label labels])
-           (cons label
-                 (make-all-tests label (get-dbconf (string->symbol label)))))]
-        [tests
-         (cond [(or include-sqlite? no-labels?)
-                (list* (cons "sqlite3, memory" sqlite-test)
-                       (cons "sqlite3, memory, #:use-place=#t" sqlite/p-test)
-                       tests)]
-               [else tests])]
-        [tests
-         (cond [(or include-generic? no-labels?)
-                (cons (cons "generic" generic-test) tests)]
-               [else tests])])
-   (cond [gui?
-          (let* ([test/gui (dynamic-require 'rackunit/gui 'test/gui)])
-            (apply test/gui #:wait? #t (map cdr tests)))]
-         [else
-          (for ([test tests])
-            (printf "Running ~s tests\n" (car test))
-            (time (run-tests (cdr test)))
-            (newline))])))
diff --git a/pkgs/db-pkgs/db-test/tests/db/config.rkt b/pkgs/db-pkgs/db-test/tests/db/config.rkt
deleted file mode 100644
index da69cbc88d..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/config.rkt
+++ /dev/null
@@ -1,112 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/unit
-         db/base)
-(provide database^
-         test^
-         config^
-         config@)
-
-(define-signature database^
-  (dbtestname
-   connect
-   dbsys
-   dbflags
-   kill-safe?))
-
-(define-signature test^ (test))
-(define-signature config^
-  (connect-for-test
-   connect-and-setup
-   call-with-connection
-   (define-syntaxes (with-connection)
-     (syntax-rules ()
-       [(with-connection c . body)
-        (call-with-connection (lambda (c) . body))]))
-   test-data
-   set-equal?
-   sql
-   select-val
-   dbsystem
-   NOISY?
-   TESTFLAGS
-   ANYFLAGS))
-
-(define-unit config@
-  (import database^)
-  (export config^)
-
-  (define NOISY? #f)
-
-  (define (connect-for-test)
-    (cond [kill-safe? (kill-safe-connection (connect))]
-          [else (connect)]))
-
-  (define test-data
-    '((0 "nothing")
-      (1 "unity")
-      (2 "the loneliest number since the number one")
-      (4 "four")
-      (5 "five")
-      (6 "half a dozen")))
-
-  (define (connect-and-setup)
-    (let [(cx (connect-for-test))]
-
-      ;; For now, we just assume Oracle, DB2 dbs are already set up.
-      (unless (ANYFLAGS 'isora 'isdb2)
-        (query-exec cx
-          "create temporary table the_numbers (N integer primary key, descr varchar(80))")
-        (for-each (lambda (p)
-                    (query-exec cx
-                                (format "insert into the_numbers values (~a, '~a')"
-                                        (car p) (cadr p))))
-                  test-data))
-      cx))
-
-  ;; set-equal? : ('a list) ('a list) -> boolean
-  (define (set-equal? a b)
-    (and (andmap (lambda (xa) (member xa b)) a)
-         (andmap (lambda (xb) (member xb a)) b)
-         #t))
-
-  (define (call-with-connection f)
-    (let [(c (connect-and-setup))]
-      (dynamic-wind void
-                    (lambda () (f c))
-                    (lambda () (disconnect c)))))
-
-  (define (sql str)
-    (case dbsys
-      ((postgresql) str)
-      ((mysql sqlite3 odbc) (regexp-replace* #rx"\\$[0-9]" str "?"))
-      (else (error 'sql "unsupported dbsystem: ~e" dbsys))))
-
-  (define (select-val str)
-    (cond [(TESTFLAGS 'isora)
-           (sql (string-append "select " str " from DUAL"))]
-          [(TESTFLAGS 'isdb2)
-           (sql (string-append "values (" str ")"))]
-          [else (sql (string-append "select " str))]))
-
-  (define dbsystem
-    (with-handlers ([(lambda (e) #t)
-                     (lambda (e) #f)])
-      (let* ([c (connect)]
-             [dbsystem (send c get-dbsystem)])
-        (disconnect c)
-        dbsystem)))
-
-  ;; Flags = dbflags U dbsys
-
-  ;; Returns #t if all are set.
-  (define (TESTFLAGS . xs)
-    (for/and ([x xs])
-      (or (eq? x dbsys)
-          (and (member x dbflags) #t))))
-
-  ;; Returns #t if any are set.
-  (define (ANYFLAGS . xs)
-    (for/or ([x xs])
-      (or (eq? x dbsys)
-          (and (member x dbflags) #t)))))
diff --git a/pkgs/db-pkgs/db-test/tests/db/db/concurrent.rkt b/pkgs/db-pkgs/db-test/tests/db/db/concurrent.rkt
deleted file mode 100644
index d866c8e99b..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/db/concurrent.rkt
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang racket/unit
-(require racket/class
-         rackunit
-         db/base
-         "../config.rkt")
-(import database^ config^)
-(export test^)
-
-(define (test-concurrency workers [threads? #t] [concurrent? #t])
-  ;; if threads?, use threads, else use thunks
-  ;; if serialize?, run threads one at a time, else run all at once
-  (unless (ANYFLAGS 'isora 'isdb2)
-    (test-case (format "lots of ~a (~s)"
-                       (cond [(and threads? concurrent?)
-                              "concurrent threads"]
-                             [threads?
-                              "serialized threads"]
-                             [else "sequential work"])
-                       workers)
-      (call-with-connection
-       (lambda (c)
-         (query-exec c "create temporary table play_numbers (n integer)")
-         ;; transaction speeds up test by a factor of 6 on postgresql
-         (query-exec c "begin")
-         (let ([exns null])
-           (parameterize ((uncaught-exception-handler
-                           (lambda (e) (set! exns (cons e exns)) ((error-escape-handler)))))
-             (let* ([workers (for/list ([i (in-range workers)]) (mk-worker c 100 i))]
-                    [tasks (for/list ([worker (in-list workers)])
-                             (cond [(and threads? concurrent?)
-                                    (let ([thd (thread worker)])
-                                      (lambda () (thread-wait thd)))]
-                                   [threads?
-                                    (lambda () (thread-wait (thread worker)))]
-                                   [else worker]))])
-               (for ([task (in-list tasks)]) (task))))
-           (when (pair? exns)
-             (raise (make-exn (string-append "exception in thread: " (exn-message (car exns)))
-                              (exn-continuation-marks (car exns)))))))))))
-
-(define ((mk-worker c iterations tid))
-  (define insert-pst
-    (prepare c (sql "insert into play_numbers (n) values ($1)")))
-  (define (insert x) (query-exec c insert-pst x))
-  (define (add-to-max n)
-    (let* ([m0 (query-value c "select max(n) from play_numbers")]
-           [m (if (string? m0) (string->number m0) m0)])
-      (insert (+ n m))))
-  (for-each insert (build-list iterations add1))
-  (for-each add-to-max (build-list iterations add1))
-  (when NOISY?
-    (printf "~s: ~s\n"
-            tid
-            (query-value c "select max(n) from play_numbers"))))
-
-(define (kill-safe-test proxy?)
-  (unless (ANYFLAGS 'isora 'isdb2)
-    (test-case
-     (format "kill-safe test~a" (if proxy? " (proxy)" ""))
-     (call-with-connection
-      (lambda (c0)
-        (let ([c (if proxy?
-                     (kill-safe-connection c0)
-                     c0)])
-          (query-exec c "create temporary table ks_numbers (n integer)")
-          (for ([i (in-range 1000)])
-            (query-exec c (sql "insert into ks_numbers (n) values ($1)") i))
-          (define (do-interactions)
-            (for ([i (in-range 10)])
-              (query-list c "select n from ks_numbers")))
-          (define threads (make-hasheq))
-
-          (for ([i (in-range 20)])
-            (let ([t (thread do-interactions)])
-              (hash-set! threads (thread do-interactions) #t)
-              (kill-thread t)))
-          (for ([t (in-hash-keys threads)])
-            (sync t))))))))
-
-(define (async-test)
-  (unless (ANYFLAGS 'isora 'isdb2)
-    (test-case "asynchronous execution"
-      (call-with-connection
-       (lambda (c)
-         ;; MySQL cannot use same temp table multiple times in one query,
-         ;; so create multiple temp tables.
-         (for ([table '("numsa" "numsb" "numsc" "numsd")])
-           (query-exec c (format "create temporary table ~a (n integer)" table))
-           (for ([i (in-range 40)])
-             (query-exec c (sql (format "insert into ~a (n) values ($1)" table)) i)))
-         (let* ([the-sql
-                 (string-append "select max(a.n * b.n *c.n * d.n) "
-                                "from numsa a, numsb b, numsc c, numsd d")]
-                [pst (prepare c the-sql)]
-                [sema (make-semaphore 0)]
-                [peek (semaphore-peek-evt sema)]
-                [counter 0]
-                [thd
-                 (thread (lambda ()
-                           (let loop ()
-                             (sync peek)
-                             (set! counter (add1 counter))
-                             (sleep 0.01)
-                             (loop))))])
-           (let ([start (current-inexact-milliseconds)])
-             (semaphore-post sema)
-             (query-value c pst)
-             (semaphore-wait sema)
-             (let ([end (current-inexact-milliseconds)])
-               (when (ANYFLAGS 'postgresql 'mysql 'async)
-                 (when #f
-                   (printf "counter = ~s\n" counter)
-                   (printf "time elapsed = ~s\n" (- end start)))
-                 ;; If c does not execute asynchronously, expect counter to be about 0.
-                 (check-pred positive? counter)
-                 (let ([expected-counter (/ (- end start) (* 0.01 1000))])
-                   (check > counter (* 0.5 expected-counter))))))))))))
-
-;; ----
-
-(define test
-  (test-suite "Concurrency"
-    (async-test)
-    ;; Tests whether connections are properly locked.
-    (test-concurrency 1)
-    (test-concurrency 2)
-    (test-concurrency 20 #t #t)
-    (test-concurrency 20 #t #f)
-    (test-concurrency 20 #f #f)
-    (kill-safe-test #t)))
diff --git a/pkgs/db-pkgs/db-test/tests/db/db/connection.rkt b/pkgs/db-pkgs/db-test/tests/db/db/connection.rkt
deleted file mode 100644
index b77fd31c6f..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/db/connection.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang racket/unit
-(require (for-syntax racket/base)
-         racket/class
-         rackunit
-         "../config.rkt"
-         db/base
-         (only-in db/private/generic/common locking%))
-(import config^ database^)
-(export test^)
-
-(define test
-  (test-suite "managing connections"
-    (test-case "connection?"
-      (call-with-connection
-       (lambda (c)
-         (check-true (connection? c)))))
-    (test-case "connected, disconnect"
-      (call-with-connection
-       (lambda (c)
-         (check-true (connected? c))
-         (disconnect c)
-         (check-false (connected? c)))))
-    (test-case "double disconnect okay"
-      (call-with-connection
-       (lambda (c)
-         (disconnect c)
-         (disconnect c))))
-    (test-case "dbsystem"
-      (call-with-connection
-       (lambda (c)
-         (let ([sys (connection-dbsystem c)])
-           (check-true (dbsystem? sys))
-           (check-pred symbol? (dbsystem-name sys))))))
-
-    (test-case "connected?, disconnect work w/ custodian damage"
-      (let ([c0 (current-custodian)]
-            [c1 (make-custodian)])
-        (let ([cx (parameterize ((current-custodian c1))
-                    (connect-for-test))])
-          ;; cx's ports (if applicable) are managed by c1
-          (check-true (connected? cx))
-          (custodian-shutdown-all c1)
-          (check-completes (lambda () (connected? cx)) "connected?")
-          (when (memq dbsys '(mysql postgresql))
-            ;; wire-based connection is disconnected; it had better know it
-            (check-false (connected? cx)))
-          (check-completes (lambda () (disconnect cx)) "disconnect")
-          (check-false (connected? cx)))))
-
-    (test-case "connected?, disconnect work w/ kill-thread damage"
-      (let ([cx (connect-for-test)])
-        (when (is-a? cx locking%)
-          (check-true (connected? cx))
-          (let ([thd
-                 (thread
-                  (lambda ()
-                    (send cx call-with-lock 'test (lambda () (sync never-evt)))))])
-            (kill-thread thd)
-            (check-completes (lambda () (connected? cx)) "connected?")
-            (check-completes (lambda () (disconnect cx)) "disconnect")
-            (check-false (connected? cx))))))
-    ))
-
-(define TIMEOUT 2) ;; seconds
-
-(define (check-completes thunk [msg #f])
-  (let ([t (thread thunk)])
-    (check-equal? (sync/timeout TIMEOUT (wrap-evt t (lambda _ 'completed)))
-                  'completed
-                  msg)))
diff --git a/pkgs/db-pkgs/db-test/tests/db/db/query.rkt b/pkgs/db-pkgs/db-test/tests/db/db/query.rkt
deleted file mode 100644
index 5b040977a1..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/db/query.rkt
+++ /dev/null
@@ -1,640 +0,0 @@
-#lang racket/unit
-(require racket/string
-         rackunit
-         "../config.rkt"
-         db/base)
-(import database^ config^)
-(export test^)
-
-(define-syntax-rule (with-connection c . body)
-  (call-with-connection (lambda (c) . body)))
-
-(define-syntax-rule (check-exn-fail expr)
-  (check-exn exn:fail? (lambda () expr)))
-
-;; prep-mode:
-;;   'string = query w/ string
-;;   'prepare = query w/ prepared
-;;   'bind = query w/ prepared+bound
-(define-syntax-rule (Q* prep-mode function obj stmt arg ...)
-  (Q** prep-mode function obj (sql stmt) (list arg ...)))
-(define (Q** prep-mode function obj stmt args)
-  (case prep-mode
-    ((string) (apply function obj stmt args))
-    ((prepare) (apply function obj (prepare obj stmt) args))
-    ((bind) (function obj (bind-prepared-statement (prepare obj stmt) args)))
-    ((gen) (apply function obj (virtual-statement stmt) args))
-    (else 'Q* "bad prep-mode: ~e" prep-mode)))
-
-(define (simple-tests prep-mode)
-
-  (define-syntax-rule (Q obj function stmt arg ...)
-    (Q* prep-mode function obj stmt arg ...))
-
-  (test-suite (format "simple (~a)" prep-mode)
-
-    (unless (ANYFLAGS 'isora 'isdb2) ;; table isn't temp, so don't tamper with it
-      (test-case "query-exec"
-        (with-connection c
-          (check-pred void? (Q c query-exec "insert into the_numbers values(-1, 'mysterious')"))
-          (check-equal? (Q c query-value "select descr from the_numbers where N = -1")
-                        "mysterious"))
-        (with-connection c
-          (check-pred void? (Q c query-exec "delete from the_numbers where N <> $1" 0))
-          (check-equal? (Q c query-value "select count(*) from the_numbers")
-                        (if (TESTFLAGS 'odbc 'issl) "1" 1))
-          (check-equal? (Q c query-list "select N from the_numbers")
-                        (list 0)))))
-
-    (test-case "query-rows"
-      (with-connection c
-        (check set-equal?
-               (Q c query-rows "select N, descr from the_numbers where N < 2")
-               '(#(0 "nothing") #(1 "unity")))
-        (check set-equal?
-               (Q c query-rows "select N, descr from the_numbers where N < $1" 2)
-               '(#(0 "nothing") #(1 "unity")))
-        (unless (ANYFLAGS 'isora 'isdb2)
-          (check-exn-fail
-           (Q c query-rows "insert into the_numbers values (13, 'baker')")))))
-
-    (test-case "query-list"
-      (with-connection c
-        (check set-equal?
-               (Q c query-list "select N from the_numbers")
-               (map car test-data))
-        (check set-equal?
-               (Q c query-list "select N from the_numbers where N < $1" 2)
-               '(0 1))
-        (check set-equal?
-               (Q c query-list "select N from the_numbers where N > $1 and N < $2" 1 4)
-               '(2))))
-
-    (test-case "query-row"
-      (with-connection c
-        (check-equal? (Q c query-row "select N, descr from the_numbers where N = 0")
-                      '#(0 "nothing"))
-        (check-equal? (Q c query-row "select N, descr from the_numbers where N = $1" 0)
-                      '#(0 "nothing"))
-        (check-exn-fail (Q c query-row "select N, descr from the_numbers where N = 100"))))
-
-    (test-case "query-maybe-row"
-      (with-connection c
-        (check-equal? (Q c query-maybe-row "select N, descr from the_numbers where N = 0")
-                      '#(0 "nothing"))
-        (check-equal? (Q c query-maybe-row "select N, descr from the_numbers where N = $1" 0)
-                      '#(0 "nothing"))
-        (check-equal? (Q c query-maybe-row "select N, descr from the_numbers where N = 100")
-                      #f)))
-
-    (test-case "query-value"
-      (with-connection c
-        (check-equal? (Q c query-value "select N from the_numbers where N < 6 and N > 4")
-                      5)
-        (check-equal? (Q c query-value "select N from the_numbers where N < $1 and N > $2" 6 4)
-                      5)
-        (check-exn-fail (Q c query-value "select N from the_numbers where N > 100"))
-        (check-exn-fail (Q c query-value "select N from the_numbers"))))
-
-    (test-case "query-maybe-value"
-      (with-connection c
-        (check-equal? (Q c query-maybe-value "select N from the_numbers where N < 6 and N > 4")
-                      5)
-        (check-equal? (Q c query-maybe-value
-                         "select N from the_numbers where N < $1 and N > $2" 6 4)
-                      5)
-        (check-equal? (Q c query-maybe-value "select N from the_numbers where N > 100")
-                      #f)
-        (check-exn-fail (Q c query-maybe-value "select N from the_numbers"))))
-
-    (test-case "in-query"
-      (with-connection c
-        (check set-equal?
-               (for/list ([(n d)
-                           (Q c in-query "select N, descr from the_numbers where N < 2")])
-                 (vector n d))
-               '(#(0 "nothing") #(1 "unity")))
-        (check set-equal?
-               (for/list ([(n d)
-                           (Q c in-query "select N, descr from the_numbers where N < $1" 2)])
-                 (vector n d))
-               '(#(0 "nothing") #(1 "unity")))
-        (unless (ANYFLAGS 'isora 'isdb2)
-          (check-exn-fail
-           (for ([x (Q c in-query "insert into the_numbers values ($1, 'baker')" 13)])
-             (void))))
-        (check-exn-fail
-         (let ([stmt (sql "select N from the_numbers where N < $1")])
-           (case prep-mode
-             ((string) (for ([(x y) (in-query c stmt 2)]) 0))
-             ((prepare) (for ([(x y) (in-query c (prepare c stmt) 2)]) 0))
-             ((bind)
-              (for ([(x y) (in-query c (bind-prepared-statement (prepare c stmt) (list 2)))])
-                0))
-             ((gen)
-              (for ([(x y) (in-query c (virtual-statement stmt) 2)]) 0)))))))
-    ))
-
-(define in-query-tests
-  (test-suite "in-query (cursor)"
-    ;; call-with-transaction necessary for postresql
-    (test-case "in-query w/ #:fetch"
-      (with-connection c
-        (for ([fs (in-range 1 10)])
-          (check equal?
-                 (call-with-transaction c
-                   (lambda ()
-                     (for/list ([n (in-query c "select N from the_numbers order by N asc" #:fetch fs)]) n)))
-                 (map car test-data)))
-        (check equal?
-               (call-with-transaction c
-                 (lambda ()
-                   (for/first ([n (in-query c "select N from the_numbers order by N asc" #:fetch 1)]) n)))
-               (for/first ([n (map car test-data)]) n))))
-    (test-case "in-query multiple different"
-      (with-connection c
-        (check equal?
-               (call-with-transaction c
-                 (lambda ()
-                   (for/list ([n (in-query c "select N from the_numbers order by N asc" #:fetch 1)]
-                              [m (in-query c "select N from the_numbers order by N desc" #:fetch 1)])
-                     (list n m))))
-               (let ([nums (map car test-data)])
-                 (map list nums (reverse nums))))))
-    (test-case "in-query multiple same"
-      (with-connection c
-        (let ([pst (prepare c "select N from the_numbers order by N asc")])
-          (check equal?
-                 (call-with-transaction c
-                   (lambda ()
-                     (for/list ([n (in-query c pst #:fetch 1)]
-                                [m (in-query c pst #:fetch 1)])
-                       (list n m))))
-                 (let ([nums (map car test-data)])
-                   (map list nums nums))))))
-    (test-case "in-query with interleaved queries"
-      (with-connection c
-        (check equal?
-               (call-with-transaction c
-                 (lambda ()
-                   (for/list ([n (in-query c "select N from the_numbers order by N asc" #:fetch 1)])
-                     (list n (query-value c (sql "select descr from the_numbers where N = $1") n)))))
-               test-data)))
-    ))
-
-(define low-level-tests
-  (test-suite "low-level"
-    (test-case "query - select"
-      (with-connection c
-        (let [(q (query c "select N from the_numbers"))]
-          (check-pred rows-result? q)
-          (check set-equal?
-                 (map vector (map car test-data))
-                 (rows-result-rows q)))))
-    (unless (ANYFLAGS 'isora 'isdb2)
-      (test-case "query - update"
-        (with-connection c
-          (let [(q (query c "update the_numbers set N = -1 where N = 1"))]
-            (check-pred simple-result? q)))))
-    (test-case "prepared-stmt inspection"
-      (with-connection c
-        (let ([pst (prepare c "select n, descr from the_numbers")])
-          (check-equal? (prepared-statement-parameter-types pst) '())
-          (check-equal? (map cadr (prepared-statement-result-types pst))
-                        (case dbsys
-                          ((postgresql) '(integer varchar))
-                          ((mysql) '(integer var-string))
-                          ((sqlite3) '(any any))
-                          ((odbc) '(integer varchar)))))
-        (let* ([pst (prepare c (sql "select n from the_numbers where n = $1"))]
-               [param-types (map cadr (prepared-statement-parameter-types pst))])
-          (case dbsys
-            ((postgresql) (check-equal? param-types '(integer)))
-            ((mysql) (check-equal? param-types '(any)))
-            ((sqlite3) (check-equal? param-types '(any)))
-            ((odbc) (check-equal? (length param-types) 1)))) ;; actual types may vary
-        (let* ([pst (prepare c (sql "insert into the_numbers values ($1, $2)"))]
-               [param-types (map cadr (prepared-statement-parameter-types pst))])
-          (case dbsys
-            ((postgresql) (check-equal? param-types '(integer varchar)))
-            ((mysql) (check-equal? param-types '(any any)))
-            ((sqlite3) (check-equal? param-types '(any any)))
-            ((odbc) (check-equal? (length param-types) 2))) ;; actual types may vary
-          (check-equal? (prepared-statement-result-types pst) '()))))))
-
-(define misc-tests
-  (test-suite "misc correctness"
-    (test-case "noninterference of nested queries"
-      (with-connection c
-        (define q
-          (for/list ([a (query-list c
-                           "select N from the_numbers where N > 0 and N < 3 order by N")])
-            (query-value c 
-             (format "select descr from the_numbers where N = ~s" a))))
-        (define q2 
-          (query-list c 
-             "select descr from the_numbers where N > 0 and N < 3 order by N"))
-        (check-equal? q q2)))
-    (test-case "continuation safety"
-      (call-with-connection
-       (lambda (c)
-         (let* [(search-id 1)
-                (k1 #f)
-                (k2 #f)
-                (todo (list 
-                       (lambda ()
-                         (set! search-id 4)
-                         (k1 #t))
-                       (lambda ()
-                         (set! search-id 2)
-                         (k2 #t))
-                       (lambda ()
-                         (set! search-id 6)
-                         (k1 #t))
-                       (lambda ()
-                         (set! search-id 5)
-                         (k2 #t))))
-                (q 
-                 (let/cc return
-                   (for-each
-                    (lambda (id)
-                      (let/cc k
-                        (set! k2 k1)
-                        (when NOISY? (printf "saw ~s~n" id))
-                        (when (= id search-id)
-                          (set! k1 k)
-                          (when NOISY? (printf "found ~s~n~n" id))
-                          (return id))))
-                    (query-list c "select N from the_numbers order by N asc"))
-                   (error 'search-failed "couldn't find ~s" search-id)))]
-           (unless (null? todo)
-             (let [(t (car todo))]
-               (set! todo (cdr todo))
-               (t)))))))
-
-    ;; Added 18 May 2003: Corrected a bug which incorrectly interleaved
-    ;; nulls with returned fields.
-    (unless (TESTFLAGS 'odbc 'issl)
-      (test-case "nulls arrive in correct order"
-        (with-connection c
-          ;; raw NULL has PostgreSQL type "unknown", not allowed
-          (define (clean . strs)
-            (select-val
-             (regexp-replace* #rx"NULL" (apply string-append strs)
-                              (case dbsys
-                                ((postgresql) "cast(NULL as integer)")
-                                (else "NULL")))))
-          (check-equal? (query-row c (clean "NULL, 1, NULL"))
-                        (vector sql-null 1 sql-null))
-          (check-equal? (query-row c (clean "1, NULL"))
-                        (vector 1 sql-null))
-          (check-equal? (query-row c (clean "NULL, 1"))
-                        (vector sql-null 1))
-          (check-equal?
-           (query-row c (clean "1, 2, 3, 4, NULL, 6, NULL, "
-                               "8, 9, 10, 11, 12, NULL, 14, 15, NULL, "
-                               "NULL, 18, 19, 20, NULL, "
-                               "NULL, " "NULL, " "NULL, " "NULL, " "NULL, "
-                               "27, 28, 29, 30, NULL, 32, 33, NULL, 35"))
-           (vector 1 2 3 4 sql-null 6 sql-null 8 9 10 11 12 sql-null 14 15 sql-null
-                   sql-null 18 19 20 sql-null sql-null sql-null sql-null sql-null
-                   sql-null 27 28 29 30 sql-null 32 33 sql-null 35)))))))
-
-(define tx-tests
-  (test-suite "transaction functions"
-    (test-case "start, commit"
-      (with-connection c
-        (check-pred void? (start-transaction c))
-        (check-equal? (in-transaction? c) #t)
-        (check-pred void? (commit-transaction c))
-        (check-equal? (in-transaction? c) #f)))
-    (test-case "start w/ option"
-      (with-connection c
-        (for ([option
-               (case dbsys
-                 ((postgresql) '(read-only read-write))
-                 ((sqlite3) '(deferred immediate exclusive))
-                 (else '()))])
-          (check-pred void? (start-transaction c #:option option))
-          (check-equal? (in-transaction? c) #t)
-          (check-pred void? (commit-transaction c))
-          (check-equal? (in-transaction? c) #f))
-        (check-exn #rx"^start-transaction: "
-                   (lambda () (start-transaction c #:option 'no-such-option)))))
-    (test-case "start, rollback"
-      (with-connection c
-        (check-pred void? (start-transaction c))
-        (check-equal? (in-transaction? c) #t)
-        (check-pred void? (rollback-transaction c))
-        (check-equal? (in-transaction? c) #f)))
-    (test-case "error on managed st, unmanaged end"
-      (with-connection c
-        (start-transaction c)
-        (check-exn #rx"statement not allowed in current transaction state.*statement type: ROLLBACK"
-                   (lambda () (query-exec c "ROLLBACK")))
-        (check-equal? (in-transaction? c) #t)
-        ;; SQLite-ODBC is unhappy with open tx on disconnect
-        (rollback-transaction c)))
-    (unless (ANYFLAGS 'odbc)
-      (test-case "unmanaged st, managed end ok"
-        (with-connection c
-          (query-exec c (cond [(ANYFLAGS 'ispg 'ismy) "START TRANSACTION"]
-                              [(ANYFLAGS 'issl) "BEGIN TRANSACTION"]))
-          (check-equal? (in-transaction? c) #t)
-          (rollback-transaction c)
-          (check-equal? (in-transaction? c) #f))))
-    (test-case "error on cwt, unmanaged end"
-      (with-connection c
-        (check-exn #rx"statement not allowed in current transaction state.*statement type: ROLLBACK"
-                   (lambda ()
-                     (call-with-transaction c
-                       (lambda () (query-exec c "ROLLBACK")))))
-        (check-equal? (in-transaction? c) #f)))
-    (when (and (ANYFLAGS 'ispg 'issl) (not (ANYFLAGS 'odbc)))
-      (test-case "transactional ddl"
-        (with-connection c
-          (start-transaction c)
-          (query-exec c "create table foo (n integer)")
-          (define exists1 (table-exists? c "foo"))
-          (rollback-transaction c)
-          (define exists2 (table-exists? c "foo"))
-          (when exists2 (query-exec c "drop table foo")) ;; shouldn't happen
-          (check-equal? exists1 #t)
-          (check-equal? exists2 #f))))
-    (when (ANYFLAGS 'ismy 'odbc)
-      (test-case "error on implicit-commit stmt"
-        (with-connection c
-          (start-transaction c)
-          (check-exn #rx"statement not allowed.*statement type: statement with implicit commit"
-                     (lambda () (query-exec c "create table foo (n integer)")))
-          ;; SQLite-ODBC is unhappy with open tx on disconnect
-          (rollback-transaction c))))
-    (when (ANYFLAGS 'odbc)
-      (test-case "error on repeated start"
-        (with-connection c
-          (start-transaction c)
-          (check-exn #rx"already in transaction"
-                     (lambda () (start-transaction c))))))
-    (unless (ANYFLAGS 'odbc)
-      (test-case "start, start"
-        (with-connection c
-          (check-pred void? (start-transaction c))
-          (check-pred void? (start-transaction c))
-          (check-equal? (in-transaction? c) #t)
-          (check-pred void? (commit-transaction c))
-          (check-equal? (in-transaction? c) #t)
-          (check-pred void? (commit-transaction c))
-          (check-equal? (in-transaction? c) #f))))
-    (when (ANYFLAGS 'odbc)
-      (test-case "start, start fails"
-        (with-connection c
-          (start-transaction c)
-          (check-exn #rx"already in transaction"
-                     (lambda () (start-transaction c)))))
-      (test-case "cwt, start fails"
-        (with-connection c
-          (start-transaction c)
-          (check-exn #rx"already in transaction"
-                     (lambda () (call-with-transaction c void))))))
-    (test-case "commit w/o start is no-op"
-      (with-connection c
-        (check-pred void? (commit-transaction c))))
-    (test-case "rollback w/o start is no-op"
-      (with-connection c
-        (check-pred void? (rollback-transaction c))))
-    (test-case "cwt normal"
-      (with-connection c
-        (check-equal? (call-with-transaction c
-                        (lambda () (query-value c (select-val "'abc'"))))
-                      "abc")))
-    (test-case "cwt w/ option"
-      (with-connection c
-        (for ([option
-               (case dbsys
-                 ((postgresql) '(read-only read-write))
-                 ((sqlite3) '(deferred immediate exclusive))
-                 (else '()))])
-          (check-equal? (call-with-transaction c #:option option
-                          (lambda () (query-value c (select-val "'abc'"))))
-                        "abc"))
-        (check-exn #rx"^call-with-transaction"
-                   (lambda ()
-                     (call-with-transaction c #:option 'no-such-option
-                       (lambda () (query-value c (select-val "'abc'"))))))))
-    (test-case "cwt w/ error"
-      (with-connection c
-        (check-exn exn:fail?
-                   (lambda ()
-                     (call-with-transaction c
-                       (lambda () (query-value c (select-val "foo"))))))
-        (check-equal? (in-transaction? c) #f)))
-    (test-case "cwt w/ caught error"
-      (with-connection c
-        (define (check-pg-exn proc)
-          (if (ANYFLAGS 'ispg 'odbc) (check-exn exn:fail? proc) (proc)))
-        (let ([ok? #f])
-          (check-pg-exn
-           (lambda ()
-             (call-with-transaction c
-               (lambda ()
-                 (with-handlers ([exn:fail? void?])
-                   (query-value c (select-val "foo")))
-                 (set! ok? (in-transaction? c))))))
-          (check-equal? ok? #t "still in tx after caught error")
-          (check-equal? (in-transaction? c) #f))))
-
-    (unless (ANYFLAGS 'odbc)
-      (test-case "cwt w/ unclosed tx"
-        (with-connection c
-          (check-exn #rx"unclosed nested tr.* .within .* call-with-transaction"
-                     (lambda ()
-                       (call-with-transaction c
-                         (lambda ()
-                           (start-transaction c)
-                           (query-value c (select-val "17"))))))
-          (check-equal? (in-transaction? c) #f)))
-      (test-case "cwt w/ unbalanced commit"
-        (with-connection c
-          (check-exn #rx"commit-tr.* start-tr.* .within .* call-with-transaction"
-                     (lambda ()
-                       (call-with-transaction c
-                         (lambda ()
-                           (commit-transaction c)))))
-          (check-equal? (in-transaction? c) #f)))
-      (test-case "cwt w/ unbalanced rollback"
-        (with-connection c
-          (check-exn #rx"rollback-tr.* start-tr.* .within .* call-with-transaction"
-                     (lambda ()
-                       (call-with-transaction c
-                         (lambda ()
-                           (rollback-transaction c)))))
-          (check-equal? (in-transaction? c) #f)))
-
-      ;; start-tx, then call-with-tx
-      (test-case "st, cwt normal"
-        (with-connection c
-          (start-transaction c)
-          (check-equal? (call-with-transaction c
-                          (lambda () (query-value c (select-val "17"))))
-                        17)
-          (check-equal? (in-transaction? c) #t)))
-      (test-case "st, cwt w/ error"
-        (with-connection c
-          (start-transaction c)
-          (check-exn exn:fail?
-                     (lambda ()
-                       (call-with-transaction c
-                         (lambda () (query-value c (select-val "foo"))))))
-          (check-equal? (in-transaction? c) #t)))
-      (test-case "st, cwt w/ caught error"
-        (with-connection c
-          (define (check-pg-exn proc)
-            (if (ANYFLAGS 'ispg) (check-exn exn:fail? proc) (proc)))
-          (let ([ok? #f])
-            (start-transaction c)
-            (check-pg-exn
-             (lambda ()
-               (call-with-transaction c
-                 (lambda ()
-                   (with-handlers ([exn:fail? void?])
-                     (query-value c (select-val "foo")))
-                   (set! ok? (in-transaction? c))))))
-            (check-equal? ok? #t "still in tx after caught error")
-            (check-equal? (in-transaction? c) #t))))
-      (test-case "st, cwt w/ unclosed tx"
-        (with-connection c
-          (start-transaction c)
-          (check-exn #rx"unclosed nested tr.* .within .* call-with-transaction"
-                     (lambda ()
-                       (call-with-transaction c
-                         (lambda ()
-                           (start-transaction c)
-                           (query-value c (select-val "17"))))))
-          (check-equal? (in-transaction? c) #t)))
-      (test-case "st, cwt w/ unbalanced commit"
-        (with-connection c
-          (start-transaction c)
-          (check-exn #rx"commit-tr.* start-tr.* .within .* call-with-transaction"
-                     (lambda ()
-                       (call-with-transaction c
-                         (lambda ()
-                           (commit-transaction c)))))
-          (check-equal? (in-transaction? c) #t)))
-      (test-case "cwt w/ unbalanced rollback"
-        (with-connection c
-          (start-transaction c)
-          (check-exn #rx"rollback-tr.* start-tr.* .within .* call-with-transaction"
-                     (lambda ()
-                       (call-with-transaction c
-                         (lambda ()
-                           (rollback-transaction c)))))
-          (check-equal? (in-transaction? c) #t))))
-
-    (test-case "cwt misc"
-      (with-connection c
-        (check-equal? (call-with-transaction c
-                        (lambda ()
-                          (check-equal? (in-transaction? c) #t)
-                          'ok))
-                      'ok)
-        (check-equal? (call-with-values
-                          (lambda () (call-with-transaction c (lambda () (values 1 2 3))))
-                        list)
-                      (list 1 2 3))))))
-
-(define error-tests
-  (test-suite "errors"
-    (test-case "query - not a statement"
-      (with-connection c
-        (check-exn exn:fail? (lambda () (query c 5)))))
-    (unless (or (TESTFLAGS 'odbc 'ispg) (ANYFLAGS 'isdb2))
-      (test-case "query - multiple statements in string"
-        (with-connection c
-          (check-exn exn:fail?
-                     (lambda ()
-                       (query c (string-append (select-val "3") ";"
-                                               (select-val "4") ";")))))))
-    (test-case "query - unowned prepared stmt"
-      (with-connection c1 
-        (with-connection c
-          (let ([pst (prepare c1 (select-val "5"))])
-            (let ([stmt (bind-prepared-statement pst null)])
-              (check-exn exn:fail? (lambda () (query c stmt))))))))
-    (test-case "query errors - nonfatal"
-      (with-connection c
-        (check-exn exn:fail? (lambda () (query-value c "select nonsuch from notthere")))
-        (check-equal? (query-value c (select-val "17"))
-                      (if (TESTFLAGS 'odbc 'issl) "17" 17))))))
-
-(define virtual-statement-tests
-  (let ()
-    (define (check-prep-once mk-connection)
-      (let* ([counter 0]
-             [c (mk-connection)]
-             [vstmt (virtual-statement
-                     (lambda (dbsys)
-                       (set! counter (add1 counter))
-                       (select-val "17")))])
-        (query-value c vstmt)
-        (check-equal? counter 1 "first query")
-        (query-value c vstmt)
-        (check-equal? counter 1 "second query")
-        (disconnect c)))
-    (test-suite "virtual-statements"
-      (test-case "prep once"
-        (check-prep-once connect-and-setup))
-      (test-case "prep once for virtual-connection"
-        (check-prep-once
-         (lambda () (virtual-connection connect-and-setup))))
-      (test-case "prep once for virtual-connection/pool"
-        (check-prep-once
-         (lambda () (virtual-connection (connection-pool connect-and-setup))))))))
-
-(define pool-tests
-  (test-suite "connection pools"
-    (test-case "lease, limit, release"
-      (let* ([counter 0]
-             [p (connection-pool (lambda () (set! counter (+ 1 counter)) (connect-for-test))
-                                 #:max-connections 2)]
-             [c1 (connection-pool-lease p)]
-             [c2 (connection-pool-lease p)])
-        ;; Two created
-        (check-equal? counter 2)
-        ;; Can't create new one yet
-        (check-exn exn:fail? (lambda () (connection-pool-lease p)))
-        ;; But if we free one...
-        (disconnect c2)
-        (check-equal? (connected? c2) #f)
-        (let ([c3 (connection-pool-lease p)])
-          (check-equal? counter 2 "not new") ;; used idle, not new connection
-          (check-equal? (connected? c3) #t))))
-    (test-case "release on evt"
-      (let* ([p (connection-pool connect-for-test #:max-connections 2)]
-             [sema (make-semaphore 0)]
-             [c1 (connection-pool-lease p sema)])
-        (check-equal? (connected? c1) #t)
-        ;; Closes when evt ready
-        (begin (semaphore-post sema) (sleep 0.1))
-        (check-equal? (connected? c1) #f)))
-    (test-case "release on custodian"
-      (let* ([p (connection-pool connect-for-test #:max-connections 2)]
-             [cust (make-custodian)]
-             [c1 (connection-pool-lease p cust)])
-        (check-equal? (connected? c1) #t)
-        ;; Closes when custodian shutdown
-        (begin (custodian-shutdown-all cust) (sleep 0.1))
-        (check-equal? (connected? c1) #f)))))
-
-(define test
-  (test-suite "query API"
-    (simple-tests 'string)
-    (simple-tests 'prepare)
-    (simple-tests 'bind)
-    (simple-tests 'gen)
-    in-query-tests
-    low-level-tests
-    tx-tests
-    misc-tests
-    virtual-statement-tests
-    pool-tests
-    error-tests))
diff --git a/pkgs/db-pkgs/db-test/tests/db/db/sql-types.rkt b/pkgs/db-pkgs/db-test/tests/db/db/sql-types.rkt
deleted file mode 100644
index 9fdd025a0c..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/db/sql-types.rkt
+++ /dev/null
@@ -1,786 +0,0 @@
-#lang racket/unit
-(require rackunit
-         racket/class
-         racket/list
-         racket/math
-         racket/match
-         racket/string
-         (prefix-in srfi: srfi/19)
-         db/base
-         db/util/datetime
-         db/util/geometry
-         db/util/postgresql
-         "../config.rkt")
-(import config^ database^)
-(export test^)
-
-(define current-type (make-parameter #f))
-
-(define-syntax-rule (type-test-case types . body)
-  (type-test-case* types (lambda () . body)))
-
-(define (type-test-case* types proc)
-  (let* ([known-types
-          (if (ANYFLAGS 'sqlite3)
-              '(bigint double text blob)
-              (send dbsystem get-known-types +inf.0))]
-         [type (for/or ([type types])
-                 (and (member type known-types) type))])
-    (when type
-      (test-case (format "~s" type)
-        (parameterize ((current-type type)) (proc))))))
-
-(define (check-timestamptz-equal? a b)
-  (cond [(and (sql-timestamp? a) (sql-timestamp? b))
-         (check srfi:time=?
-                (srfi:date->time-utc (sql-datetime->srfi-date a))
-                (srfi:date->time-utc (sql-datetime->srfi-date b)))]
-        [(and (pg-range? a) (pg-range? b))
-         (match (list a b)
-           [(list (pg-range alb ali? aub aui?) (pg-range blb bli? bub bui?))
-            (and (check-timestamptz-equal? alb blb)
-                 (check-equal? ali? bli?)
-                 (check-timestamptz-equal? aub bub)
-                 (check-equal? aui? bui?))])]
-        [else (check-equal? a b)]))
-
-(define (check-bits-equal? a b)
-  (check-equal? (sql-bits->string a) (sql-bits->string b)))
-
-(define (supported? option)
-  (send dbsystem has-support? option))
-
-(define (pg-type-name type)
-  (case type
-    ((double) 'float8)
-    ((char1) "\"char\"")
-    (else
-     (cond [(regexp-match #rx"^(.*)-array$" (format "~a" type))
-            => (lambda (m)
-                 (format "~a[]" (pg-type-name (string->symbol (cadr m)))))]
-           [else type]))))
-
-(define (check-roundtrip* c value check-equal?)
-  (cond [(ANYFLAGS 'postgresql 'ispg)
-         (let* ([tname (pg-type-name (current-type))]
-                [q (sql (format "select $1::~a" tname))])
-           (check-equal? (query-value c q value)
-                         value))]
-        [(ANYFLAGS 'mysql 'ismy)
-         ;; FIXME: can do better once prepare supports types
-         (let ([stmt
-                (case (current-type)
-                  ((varchar) "select ?") ;;  "select cast(? as char)" gives ODBC problems
-                  ((blob) "select cast(? as binary)") ;; ???
-                  ((integer) "select cast(? as signed integer)")
-                  ((real) "select (? * 1.0)")
-                  ((decimal numeric) "select cast(? as decimal(40,10))")
-                  ((date) "select cast(? as date)")
-                  ((time) "select cast(? as time)")
-                  ((datetime) "select cast(? as datetime)")
-                  ;; FIXME: more types
-                  (else #f))])
-           (when stmt
-             (check-equal? (query-value c stmt value) value)))]
-        [(eq? dbsys 'sqlite3) ;; no ODBC-sqlite3, too painful
-         (check-equal? (query-value c "select ?" value) value)]
-        [(ANYFLAGS 'isora 'isdb2)
-         (let ([stmt
-                (case (current-type)
-                  ((varchar)
-                   (cond [(ANYFLAGS 'isdb2)
-                          "cast(? as varchar(200) ccsid unicode)"]
-                         [(ANYFLAGS 'isora)
-                          "cast(? as varchar2(200))"]))
-                  ((blob) "cast(? as binary)") ;; ???
-                  ((integer) "cast(? as integer)")
-                  ((real) #f)
-                  ((numeric)
-                   (cond [(ANYFLAGS 'isdb2)
-                          "cast(? as decimal)"]
-                         [(ANYFLAGS 'isora)
-                          "cast(? as decimal(20,10))"]))
-                  ((date)
-                   (cond [(ANYFLAGS 'isdb2)
-                          "cast(? as date)"]
-                         [(ANYFLAGS 'isora)
-                          #f]))
-                  ((time)
-                   (cond [(ANYFLAGS 'isdb2)
-                          "cast(? as time)"]
-                         [(ANYFLAGS 'isora) ;; FIXME: bug?
-                          #f]))
-                  ((datetime) "cast(? as datetime)")
-                  ;; FIXME: more types
-                  (else #f))])
-           (when stmt
-             (check-equal? (query-value c (select-val stmt) value) value)))]))
-
-(define-check (check-roundtrip c value)
-  (check-roundtrip* c value check-equal?))
-
-;; FIXME: change to testing flag?
-(define (temp-table-ok?)
-  (ANYFLAGS 'postgresql 'mysql))
-
-(define (setup-temp-table c type)
-  (query-exec c (format "create temporary table testing_temp_table (v ~a)" type)))
-
-(define (check-roundtrip*/table c value check-equal?)
-  (query-exec c "delete from testing_temp_table")
-  (query-exec c (sql "insert into testing_temp_table (v) values ($1)") value)
-  (check-equal? (query-value c "select v from testing_temp_table") value))
-
-(define-check (check-roundtrip/table c value)
-  (check-roundtrip*/table c value check-equal?))
-
-(define (check-value/text* c val text check-val-equal? check-text-equal?)
-  (cond [(ANYFLAGS 'postgresql)
-         (let* ([tname (pg-type-name (current-type))]
-                [q-text->val (sql (format "select ($1::text)::~a" tname))]
-                [q-val->text (sql (format "select ($1::~a)::text" tname))])
-           (when check-val-equal?
-             (check-val-equal? (query-value c q-text->val text) val))
-           (when check-text-equal?
-             (check-text-equal? (query-value c q-val->text val) text)))]
-        ;; FIXME: mysql just test val->text since text->val irregular
-        [else (void)]))
-
-(define-check (check-value/text c val text)
-  (check-value/text* c val text check-equal? check-equal?))
-
-(define-check (check-varchar c str)
-  ;; Check roundtrip (only checks same when arrives back at client)
-  (check-roundtrip c str)
-  ;; Also must check correct on server side, so...
-  ;;  - check the string has the right length
-  (let ([len-fun (case dbsys
-                   ((postgresql sqlite3) "length")
-                   ((mysql) "char_length")
-                   ((odbc) (cond [(TESTFLAGS 'ispg) "length"]
-                                 [(TESTFLAGS 'ismy) "char_length"])))])
-    (when (string? len-fun)
-      (check-equal? (query-value c (sql (format "select ~a($1)" len-fun)) str)
-                    (string-length str)
-                    "check server-side length"))))
-
-(define-check (check-1char c str)
-  (check-varchar c str)
-  (when (= (string-length str) 1)
-    ;;  - if one char, check server-side char->int
-    (let ([ci-fun (case dbsys
-                    ((postgresql) "ascii") ;; yes, returns unicode code point too (if utf8)
-                    ((mysql sqlite3) #f) ;; ???
-                    ((odbc) (cond [(TESTFLAGS 'ispg) "ascii"])))])
-      (when (string? ci-fun)
-        (check-equal? (query-value c (sql (format "select ~a($1)" ci-fun)) str)
-                      (char->integer (string-ref str 0))
-                      "check server-side char->int")))
-    ;;  - if one char, check server-side int->char
-    (let ([ic-fmt (case dbsys
-                    ((postgresql) "select chr(~a)")
-                    ((mysql) "select char(~a using utf8)")
-                    ((sqlite3) #f)
-                    ((odbc) (cond [(TESTFLAGS 'ispg) "select chr(~a)"]
-                                  [(TESTFLAGS 'ismy) "select char(~a using utf8)"])))])
-      (when (string? ic-fmt)
-        (check-equal? (query-value c
-                        (format ic-fmt
-                                (if (ANYFLAGS 'mysql 'ismy)
-                                    (string-join
-                                     (map number->string
-                                          (bytes->list (string->bytes/utf-8 str)))
-                                     ", ")
-                                    (char->integer (string-ref str 0)))))
-                      str
-                      "check server-side int->char")))))
-
-(define-check (check-=any c elt lst in?)
-  (check-equal? (query-value c (format "select ~a = any ($1)" elt) (list->pg-array lst))
-                in?))
-
-(define-check (check-trim-string=? a b)
-  (check-equal? (string-trim a) (string-trim b)))
-
-(define some-dates
-  `((,(sql-date 1776 07 04) "1776-07-04")
-    (,(sql-date 2000 01 01) "2000-01-01")
-    (,(sql-date 2012 02 14) "2012-02-14")))
-
-(define some-times
-  `((,(sql-time 01 02 03 0 #f) "01:02:03")
-    (,(sql-time 12 34 56 0 #f) "12:34:56")
-    (,(sql-time 17 30 01 0 #f) "17:30:01")
-    (,(sql-time 01 02 03 #e4e7 #f) "01:02:03.04")
-    (,(sql-time 12 34 56 123456000 #f) "12:34:56.123456")))
-
-(define some-timetzs
-  `((,(sql-time 01 02 03 0 3600) "01:02:03+01")
-    (,(sql-time 12 34 56 0 3600) "12:34:56+01")
-    (,(sql-time 17 30 01 0 -7200) "17:30:01-02")
-    (,(sql-time 01 02 03 #e4e7 3600) "01:02:03.04+01")
-    (,(sql-time 12 34 56 123456000 3600) "12:34:56.123456+01")
-    (,(sql-time 12 34 56 123456000 -7200) "12:34:56.123456-02")))
-
-(define some-timestamps
-  `((,(sql-timestamp 2000 01 01 12 34 56 0 #f) "2000-01-01 12:34:56")
-    (,(sql-timestamp 1776 07 04 12 34 56 0 #f) "1776-07-04 12:34:56")
-    (,(sql-timestamp 2012 02 14 12 34 56 0 #f) "2012-02-14 12:34:56")
-    (,(sql-timestamp 2000 01 01 12 34 56 123456000 #f) "2000-01-01 12:34:56.123456")
-    (,(sql-timestamp 1776 07 04 12 34 56 123456000 #f) "1776-07-04 12:34:56.123456")
-    (,(sql-timestamp 2012 02 14 12 34 56 123456000 #f) "2012-02-14 12:34:56.123456")
-    (-inf.0 "-infinity")
-    (+inf.0 "infinity")))
-
-(define some-timestamptzs
-  `((,(sql-timestamp 2000 01 01 12 34 56 0 -14400) "2000-01-01 12:34:56-04")
-    (,(sql-timestamp 1776 07 04 12 34 56 0 -14400) "1776-07-04 12:34:56-04")
-    (,(sql-timestamp 2012 02 14 12 34 56 0 7200) "2012-02-14 12:34:56+02")
-    (,(sql-timestamp 2000 01 01 12 34 56 123456000 14400) "2000-01-01 12:34:56.123456+04")
-    (,(sql-timestamp 1776 07 04 12 34 56 123456000 -14400) "1776-07-04 12:34:56.123456-04")
-    (,(sql-timestamp 2012 02 14 12 34 56 123456000 -7200) "2012-02-14 12:34:56.123456-02")
-    (-inf.0 "-infinity")
-    (+inf.0 "infinity")))
-
-(define some-intervals
-  `((,(sql-interval 0 0 3 4 5 6 0) "3 days 04:05:06")
-    (,(sql-interval 87 1 0 0 0 0 0) "87 years 1 mon")
-    (,(sql-interval 1 2 3 4 5 6 45000) "1 year 2 mons 3 days 04:05:06.000045")
-    (,(sql-interval 0 0 -3 -4 -5 -6 0) "-3 days -04:05:06")
-    (,(sql-interval -87 -1 0 0 0 0 0) "-87 years -1 mons")
-    (,(sql-interval -1 -2 3 4 5 6 45000) "-1 years -2 mons +3 days 04:05:06.000045")))
-
-(define some-basic-strings
-  `("Az0"
-    "this is the time to remember"
-    "it's like that (and that's the way it is)"
-    ,(string #\\)
-    ,(string #\\ #\\)
-    ,(string #\')
-    ,(string #\\ #\')
-    "λ the ultimate"))
-(define some-intl-strings
-  `("αβψδεφγηιξκλμνοπρστθωςχυζ"
-    "अब्च्देघिज्क्ल्म्नोप्र्स्तुव्य्"
-    "شﻻؤيثبلاهتنمةىخحضقسفعرصءغئ"
-    "阿あでいおうわぁ"
-    "абцдефгхиклмнопљрстувњџзѕЋч"))
-
-(define test
-  (test-suite "SQL types (roundtrip, etc)"
-    (type-test-case '(bool boolean)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c #t)
-         (check-roundtrip c #f))))
-    (type-test-case '(bytea blob)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c #"this is the time to remember")
-         (check-roundtrip c #"that's the way it is")
-         (check-roundtrip c (list->bytes (build-list 256 values)))
-         (when (ANYFLAGS 'postgresql 'mysql 'sqlite3)
-           (check-roundtrip c (make-bytes #e1e6 (char->integer #\a)))
-           (check-roundtrip c (make-bytes #e1e7 (char->integer #\b)))
-           #| (check-roundtrip c (make-bytes #e1e8 (char->integer #\c))) |#)
-         (when (ANYFLAGS 'postgresql)
-           (let ([r (query-value c "select cast(repeat('a', 10000000) as bytea)")])
-             (check-pred bytes? r)
-             (check-equal? r (make-bytes 10000000 (char->integer #\a))))
-           (let ([r (query-value c "select cast(repeat('a', 100000000) as bytea)")])
-             (check-pred bytes? r)
-             (check-equal? r (make-bytes 100000000 (char->integer #\a)))))
-         (when (ANYFLAGS 'mysql)
-           ;; Test able to read large blobs
-           ;; (depends on max_allowed_packet, though)
-           (define max-allowed-packet (query-value c "select @@session.max_allowed_packet"))
-           (for ([N (in-list '(#e1e7 #e1e8))])
-             (when (<= N max-allowed-packet)
-               (let* ([q (format "select cast(repeat('a', ~s) as binary)" N)]
-                      [r (query-value c q)])
-                 (check-pred bytes? r)
-                 (check-equal? r (make-bytes N (char->integer #\a))))))))))
-    (type-test-case '(text)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c "")
-         (check-roundtrip c "abcde")
-         (check-roundtrip c (make-string #e1e6 #\a))
-         (check-roundtrip c (make-string #e1e7 #\b))
-         (check-roundtrip c (make-string #e1e8 #\c)))))
-    (type-test-case '(smallint)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c 5)
-         (check-roundtrip c -1)
-         (check-roundtrip c #x7FFF)
-         (check-roundtrip c #x-8000))))
-    (type-test-case '(integer)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c 5)
-         (check-roundtrip c -1)
-         (check-roundtrip c #x7FFFFFFF)
-         (check-roundtrip c #x-80000000))))
-    (type-test-case '(bigint)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c 5)
-         (check-roundtrip c -1)
-         (check-roundtrip c (sub1 (expt 2 63)))
-         (check-roundtrip c (- (expt 2 63))))))
-
-    (type-test-case '(real)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c 1.0)
-         (check-roundtrip c 1.5)
-         (check-roundtrip c -5.5)
-         (when (supported? 'real-infinities)
-           (check-roundtrip c +inf.0)
-           (check-roundtrip c -inf.0)
-           (check-roundtrip c +nan.0)))))
-    (type-test-case '(double)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c 1.0)
-         (check-roundtrip c 1.5)
-         (check-roundtrip c -5.5)
-         (check-roundtrip c 1.1)
-         (check-roundtrip c -5.8)
-         (when (supported? 'real-infinities)
-           (check-roundtrip c +inf.0)
-           (check-roundtrip c -inf.0)
-           (check-roundtrip c +nan.0)))))
-
-    (unless (ANYFLAGS 'isdb2) ;; "Driver not capable"
-      (type-test-case '(numeric decimal)
-        (call-with-connection
-         (lambda (c)
-           (check-roundtrip c 0)
-           (check-roundtrip c 10)
-           (check-roundtrip c -5)
-           (unless (TESTFLAGS 'odbc)
-             (check-roundtrip c 1234567890)
-             (check-roundtrip c -1234567890)
-             (check-roundtrip c #e12345.67809)
-             (check-roundtrip c #e-12345.67809)
-             (unless (TESTFLAGS 'mysql)
-               (check-roundtrip c 12345678901234567890)
-               (check-roundtrip c -12345678901234567890)
-               (check-roundtrip c #e1234567890.0987654321)
-               (check-roundtrip c #e-1234567890.0987654321))
-             (check-roundtrip c 1/2)
-             (check-roundtrip c 1/40)
-             (check-roundtrip c 1/10)
-             (check-roundtrip c -1/2)
-             (check-roundtrip c -1/40)
-             (check-roundtrip c -1/10)
-             (check-roundtrip c 1/400000))
-           (when (supported? 'numeric-infinities)
-             (check-roundtrip c +nan.0))))))
-
-    (type-test-case '(varchar)
-      (call-with-connection
-       (lambda (c)
-         (unless (ANYFLAGS 'isora) ;; Oracle treats empty string as NULL (?!)
-           (check-varchar c ""))
-         (for ([str some-basic-strings])
-           (check-varchar c str))
-         (for ([str some-intl-strings])
-           (check-varchar c str)
-           ;; and do the extra one-char checks:
-           (check-1char c (substring str 0 1)))
-         (unless (ANYFLAGS 'isora 'isdb2)
-           (check-varchar c (make-string 800 #\a)))
-         (unless (ANYFLAGS 'isora 'isdb2) ;; too long
-           (check-varchar c (apply string-append some-intl-strings)))
-         ;; one-char checks
-         (check-1char c (string #\λ))
-         (check-1char c (make-string 1 #\u2200))
-         (check-varchar c (make-string 20 #\u2200))
-         ;; check large strings
-         (unless (ANYFLAGS 'isora 'isdb2) ;; too long (???)
-           (check-varchar c (make-string 100 #\u2200)))
-         ;; Following might not produce valid string (??)
-         (unless (ANYFLAGS 'isora 'isdb2)
-           (check-varchar c
-                          (list->string
-                           (build-list 800
-                                       (lambda (n)
-                                         (integer->char (add1 n))))))))))
-
-    (type-test-case '(character)
-      (call-with-connection
-       (lambda (c)
-         (when (temp-table-ok?)
-           (setup-temp-table c "char(5)")
-           (check-roundtrip*/table c "" check-trim-string=?)
-           (check-roundtrip*/table c "abc" check-trim-string=?)
-           (check-roundtrip*/table c "abcde" check-trim-string=?)))))
-
-    (type-test-case '(date)
-      (call-with-connection
-       (lambda (c)
-         (for ([d+s some-dates])
-           (check-roundtrip c (car d+s))
-           (check-value/text c (car d+s) (cadr d+s))))))
-    (type-test-case '(time)
-      (call-with-connection
-       (lambda (c)
-         (for ([t+s some-times])
-           (unless (and (eq? dbsys 'odbc) (> (sql-time-nanosecond (car t+s)) 0))
-             ;; ODBC time has no fractional part
-             (check-roundtrip c (car t+s))
-             (check-value/text c (car t+s) (cadr t+s)))))))
-    (type-test-case '(timetz)
-      (call-with-connection
-       (lambda (c)
-         (for ([t+s some-timetzs])
-           (check-roundtrip c (car t+s))
-           (check-value/text c (car t+s) (cadr t+s))))))
-    (type-test-case '(timestamp datetime)
-      (call-with-connection
-       (lambda (c)
-         (for ([t+s some-timestamps])
-           (when (or (TESTFLAGS 'postgresql) (sql-timestamp? (car t+s)))
-             ;; Only postgresql supports +/-inf.0
-             (check-roundtrip c (car t+s))
-             (check-value/text c (car t+s) (cadr t+s)))))))
-    (type-test-case '(timestamptz)
-      (call-with-connection
-       (lambda (c)
-         (for ([t+s some-timestamptzs])
-           (check-roundtrip* c (car t+s) check-timestamptz-equal?)
-           (check-value/text* c (car t+s) (cadr t+s) check-timestamptz-equal? #f)))))
-
-    (type-test-case '(interval)
-      (call-with-connection
-       (lambda (c)
-         (for ([i+s some-intervals])
-           (when (or (memq dbsys '(postgresql))
-                     (sql-day-time-interval? i+s)
-                     (sql-year-month-interval? i+s))
-             (check-roundtrip c (car i+s))
-             (when (memq dbsys '(postgresql))
-               (check-value/text c (car i+s) (cadr i+s))))))))
-
-    (type-test-case '(varbit bit)
-      (call-with-connection
-       (lambda (c)
-         (for ([s (list "1011"
-                        "000000"
-                        (make-string 30 #\1)
-                        (string-append (make-string 10 #\1) (make-string 20 #\0)))])
-           (check-roundtrip* c (string->sql-bits s) check-bits-equal?)))))
-
-    (type-test-case '(point geometry)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (point 0 0))
-         (check-roundtrip c (point 1 2))
-         (check-roundtrip c (point (exp 1) pi)))))
-
-    (type-test-case '(line-string geometry)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (line-string (list (point 0 0) (point 1 1))))
-         (check-roundtrip c (line-string (list (point 0 0) (point 1 1) (point -5 7)))))))
-    
-    (type-test-case '(lseg geometry)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (line-string (list (point 0 0) (point 1 1)))))))
-
-    (type-test-case '(polygon geometry)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c
-          (polygon (line-string (list (point 0 0) (point 2 0) (point 1 1) (point 0 0))) '()))
-         (when (memq dbsys '(mysql))
-           (check-roundtrip c
-            (polygon (line-string (list (point 0 0) (point 4 0) (point 2 2) (point 0 0)))
-                     (list (line-string (list (point 1 1) (point 3 1)
-                                              (point 1.5 1.5) (point 1 1))))))))))
-
-    (when (ANYFLAGS 'postgresql) ;; "Driver not capable"
-      (type-test-case '(path)
-        (call-with-connection
-         (lambda (c)
-           (check-roundtrip c (pg-path #t (list (point 0 0) (point 1 1) (point -5 7))))
-           (check-roundtrip c (pg-path #f (list (point -1 -1) (point (exp 1) pi)))))))
-      (type-test-case '(box)
-        (call-with-connection
-         (lambda (c)
-           (check-roundtrip c (pg-box (point 10 10) (point 2 8))))))
-      (type-test-case '(circle)
-        (call-with-connection
-         (lambda (c)
-           (check-roundtrip c (pg-circle (point 1 2) 45))))))
-
-    (when (TESTFLAGS 'postgresql 'pg92)
-      (type-test-case '(json)
-        (call-with-connection
-         (lambda (c)
-           (define some-jsexprs
-             (list #t #f 0 1 -2 pi "" "hello" "good\nbye" 'null
-                   (hasheq 'a 1 'b 2 'c 'null)
-                   (list #t #f 'null "a" "b")))
-           (for ([j some-jsexprs])
-             (check-roundtrip c j)))))
-      (type-test-case '(int4range)
-        (call-with-connection
-         (lambda (c)
-           (check-roundtrip c (pg-empty-range))
-           ;; for now, only test things in canonical form... (FIXME)
-           (check-roundtrip c (pg-range 0 #t 5 #f))
-           (check-roundtrip c (pg-range #f #f -57 #f))
-           (check-roundtrip c (pg-range 1234 #t #f #f)))))
-      (type-test-case '(int8range)
-        (call-with-connection
-         (lambda (c)
-           (check-roundtrip c (pg-empty-range))
-           ;; for now, only test things in canonical form... (FIXME)
-           (check-roundtrip c (pg-range 0 #t 5 #f))
-           (check-roundtrip c (pg-range #f #f -57 #f))
-           (check-roundtrip c (pg-range 1234 #t #f #f))
-           (check-roundtrip c (pg-range (expt 2 60) #t (expt 2 61) #f)))))
-      ;; FIXME: numrange
-      (type-test-case '(daterange)
-        (call-with-connection
-         (lambda (c)
-           (define d1 (car (first some-dates)))
-           (define d2 (car (second some-dates)))
-           (define d3 (car (third some-dates)))
-           (check-roundtrip c (pg-empty-range))
-           ;; for now, only test things in canonical form... (FIXME?)
-           (check-roundtrip c (pg-range d1 #t d3 #f))
-           (check-roundtrip c (pg-range #f #f d2 #f))
-           (check-roundtrip c (pg-range d3 #t #f #f)))))
-      (type-test-case '(tsrange)
-        (call-with-connection
-         (lambda (c)
-           (define ts1 (car (second some-timestamps)))
-           (define ts2 (car (first some-timestamps)))
-           (define ts3 (car (third some-timestamps)))
-           (check-roundtrip c (pg-empty-range))
-           (check-roundtrip c (pg-range ts1 #t ts2 #t))
-           (check-roundtrip c (pg-range ts1 #f ts3 #f))
-           (check-roundtrip c (pg-range ts2 #f ts3 #t)))))
-      (type-test-case '(tstzrange)
-        (call-with-connection
-         (lambda (c)
-           (define ts1 (car (second some-timestamptzs)))
-           (define ts2 (car (first some-timestamptzs)))
-           (define ts3 (car (third some-timestamptzs)))
-           (check-roundtrip c (pg-empty-range))
-           (check-roundtrip* c (pg-range ts1 #t ts2 #t) check-timestamptz-equal?)
-           (check-roundtrip* c (pg-range ts1 #f ts3 #f) check-timestamptz-equal?)
-           (check-roundtrip* c (pg-range ts2 #f ts3 #t) check-timestamptz-equal?)))))
-
-    ;; --- Arrays ---
-    (type-test-case '(boolean-array)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list #t)))
-         (check-roundtrip c (list->pg-array (list #t #t #f)))
-         (check-roundtrip c (list->pg-array (list #t sql-null #f)))
-         (check-=any c "'t'::boolean" (list) #f)
-         (check-=any c "'t'::boolean" (list #f) #f)
-         (check-=any c "'t'::boolean" (list sql-null #t #f) #t))))
-
-    (type-test-case '(bytea-array)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list #"abc")))
-         (check-roundtrip c (list->pg-array (list #"a" #"bc" #"def")))
-         (check-roundtrip c (list->pg-array (list #"a" sql-null #"bc")))
-         (check-=any c "'abc'::bytea" (list) #f)
-         (check-=any c "'abc'::bytea" (list #"a" #"abc") #t)
-         (check-=any c "'abc'::bytea" (list #"a" sql-null #"abc") #t))))
-
-    (type-test-case '(char1-array)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list #\a)))
-         (check-roundtrip c (list->pg-array (list #\a #\z)))
-         (check-roundtrip c (list->pg-array (list #\a sql-null #\z)))
-         (check-=any c "'a'::\"char\"" (list) #f)
-         (check-=any c "'a'::\"char\"" (list #\a #\b) #t)
-         (check-=any c "'a'::\"char\"" (list #\a sql-null #\z) #t))))
-
-    (type-test-case '(smallint-array)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list 1)))
-         (check-roundtrip c (list->pg-array (list 1 2 3)))
-         (check-roundtrip c (list->pg-array (list 1 sql-null 3 4 5)))
-         (check-=any c "1::smallint" (list) #f)
-         (check-=any c "1::smallint" (list 1 2 3) #t)
-         (check-=any c "1::smallint" (list sql-null 1 2 3) #t))))
-
-    (type-test-case '(integer-array)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list 1)))
-         (check-roundtrip c (list->pg-array (list 1 2 3)))
-         (check-roundtrip c (list->pg-array (list 1 sql-null 3 4 5)))
-         (check-=any c "1" (list) #f)
-         (check-=any c "1" (list 1 2 3) #t)
-         (check-=any c "1" (list sql-null 1 2 3) #t))))
-
-    (type-test-case '(text-array)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list "abc")))
-         (check-roundtrip c (list->pg-array (list "a" "" "bc" "def" "")))
-         (check-roundtrip c (list->pg-array (list "a" sql-null "")))
-         (check-=any c "'abc'" (list) #f)
-         (check-=any c "'abc'" (list "abc" "def") #t)
-         (check-=any c "'abc'" (list "abc" "def" sql-null) #t))))
-
-    #|
-    (type-test-case '(character-array)
-      (call-with-connection
-       (lambda (c)
-         ;; NOTE: seems to infer an elt type of character(1)...
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list "abc")))
-         (check-roundtrip c (list->pg-array (list "a" "" "bc" "def" "")))
-         (check-roundtrip c (list->pg-array (list "a" sql-null "")))
-         (check-=any c "'abc'" (list) #f)
-         (check-=any c "'abc'" (list "abc" "def") #t)
-         (check-=any c "'abc'" (list "ab" "c" sql-null) #f))))
-    |#
-
-    (type-test-case '(varchar-array)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list "abc")))
-         (check-roundtrip c (list->pg-array (list "a" "" "bc" "def" "")))
-         (check-roundtrip c (list->pg-array (list "a" sql-null "")))
-         (check-=any c "'abc'" (list) #f)
-         (check-=any c "'abc'" (list "abc" "def") #t)
-         (check-=any c "'abc'" (list "abc" "def" sql-null) #t))))
-
-    (type-test-case '(bigint-array)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list 1)))
-         (check-roundtrip c (list->pg-array (list 1 2 3)))
-         (check-roundtrip c (list->pg-array (list 1 sql-null 3 4 5)))
-         (check-=any c "1::bigint" (list) #f)
-         (check-=any c "1::bigint" (list 1 2 3) #t)
-         (check-=any c "1::bigint" (list sql-null 1 2 3) #t))))
-
-    (type-test-case '(point-array)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list (point 1 2))))
-         (check-roundtrip c (list->pg-array (list (point 1 2) sql-null (point 3 4))))
-         #| ;; no op= for point ?!
-         (check-=any c "POINT (1,2)" (list (point 1 2)) #t)
-         (check-=any c "POINT (1,2)" (list (point 3 4)) #f)
-         (check-=any c "POINT (1,2)" (list sql-null (point 1 2) (point 3 4)) #t)
-         |#)))
-
-    (type-test-case '(real-array)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list 1.0)))
-         (check-roundtrip c (list->pg-array (list 1.0 2.0 3.0)))
-         (check-roundtrip c (list->pg-array (list 1.0 sql-null 3.0 4.0 +inf.0)))
-         (check-=any c "1.0::real" (list) #f)
-         (check-=any c "1.0::real" (list 1.0) #t)
-         (check-=any c "1.0::real" (list sql-null 1.0 2.0 +inf.0) #t))))
-
-    (type-test-case '(double-array)
-      (call-with-connection
-       (lambda (c)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list 1.0)))
-         (check-roundtrip c (list->pg-array (list 1.0 2.0 3.0)))
-         (check-roundtrip c (list->pg-array (list 1.0 sql-null 3.0 4.0 +inf.0)))
-         (check-=any c "1.0::float8" (list) #f)
-         (check-=any c "1.0::float8" (list 1.0) #t)
-         (check-=any c "1.0::float8" (list sql-null 1.0 2.0 +inf.0) #t))))
-
-    (type-test-case '(timestamp-array)
-      (call-with-connection
-       (lambda (c)
-         (define ts1 (sql-timestamp 1999 12 31 11 22 33 0 #f))
-         (define ts2 (sql-timestamp 2011 09 13 15 17 19 0 #f))
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list ts1)))
-         (check-roundtrip c (list->pg-array (list ts2 sql-null)))
-         (check-=any c "'1999-12-31 11:22:33'::timestamp" (list) #f)
-         (check-=any c "'1999-12-31 11:22:33'::timestamp" (list ts2) #f)
-         (check-=any c "'1999-12-31 11:22:33'::timestamp" (list ts1 sql-null ts2) #t))))
-
-    ;; FIXME: add timestamptz-array test (harder due to tz conversion)
-
-    (type-test-case '(date-array)
-      (call-with-connection
-       (lambda (c)
-         (define ts1 (sql-date 1999 12 31))
-         (define ts2 (sql-date 2011 09 13))
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list ts1)))
-         (check-roundtrip c (list->pg-array (list ts2 sql-null)))
-         (check-=any c "'1999-12-31'::date" (list) #f)
-         (check-=any c "'1999-12-31'::date" (list ts2) #f)
-         (check-=any c "'1999-12-31'::date" (list ts1 sql-null ts2) #t))))
-
-    (type-test-case '(time-array)
-      (call-with-connection
-       (lambda (c)
-         (define ts1 (sql-time 11 22 33 0 #f))
-         (define ts2 (sql-time 15 17 19 0 #f))
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list ts1)))
-         (check-roundtrip c (list->pg-array (list ts2 sql-null)))
-         (check-=any c "'11:22:33'::time" (list) #f)
-         (check-=any c "'11:22:33'::time" (list ts2) #f)
-         (check-=any c "'11:22:33'::time" (list ts1 sql-null ts2) #t))))
-
-    ;; FIXME: add timetz-array test
-    ;; FIXME: add interval-array test
-
-    (type-test-case '(interval-array)
-      (call-with-connection
-       (lambda (c)
-         (define i1 (sql-interval 0 0 3 4 5 6 0))
-         (define i2 (sql-interval 87 1 0 0 0 0 0))
-         (define i3 (sql-interval 1 2 3 4 5 6 45000))
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list i1)))
-         (check-roundtrip c (list->pg-array (list i2 sql-null i3)))
-         (check-=any c "'87 years 1 month'::interval" (list) #f)
-         (check-=any c "'87 years 1 month'::interval" (list i1 i3) #f)
-         (check-=any c "'87 years 1 month'::interval" (list i1 sql-null i2) #t))))
-
-    (type-test-case '(decimal-array)
-      (call-with-connection
-       (lambda (c)
-         (define d1 12345678901234567890)
-         (define d2 1/20)
-         (define d3 +nan.0)
-         (define d4 -100)
-         (check-roundtrip c (list->pg-array (list)))
-         (check-roundtrip c (list->pg-array (list d1)))
-         (check-roundtrip c (list->pg-array (list d2 sql-null d3 d4)))
-         (check-=any c "'0.05'::numeric" (list) #f)
-         (check-=any c "'0.05'::numeric" (list d1) #f)
-         (check-=any c "'0.05'::numeric" (list d1 sql-null d2 d3 d4) #t))))
-
-    ))
diff --git a/pkgs/db-pkgs/db-test/tests/db/gen/misc.rkt b/pkgs/db-pkgs/db-test/tests/db/gen/misc.rkt
deleted file mode 100644
index ca1747e2bb..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/gen/misc.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require rackunit
-         racket/class
-         "../config.rkt")
-
-(provide misc:test)
-
-(require db/private/generic/common)
-
-(define misc:test
-  (test-suite "Misc internal function tests"
-    (test-case "sql-skip-comments"
-      (define (eat s [hash? #f]) (substring s (sql-skip-comments s 0 #:hash-comments? hash?)))
-      (check-equal? (eat "/* blah ** blah */ insert")
-                    " insert")
-      (check-equal? (eat "-- blah\n  -- /* \nok")
-                    "ok")
-      (check-equal? (eat "#a\n# b c d\nok" #t)
-                    "ok"))))
diff --git a/pkgs/db-pkgs/db-test/tests/db/gen/query.rkt b/pkgs/db-pkgs/db-test/tests/db/gen/query.rkt
deleted file mode 100644
index a858816329..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/gen/query.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/base
-(require rackunit
-         racket/class
-         (prefix-in srfi: srfi/19)
-         db/base
-         "../config.rkt")
-
-(provide query:test)
-
-(define vehicles-result
-  (rows-result
-   '(((name . "type")) ((name . "maker")) ((name . "model")))
-   `(#("car"  "honda"   "civic")
-     #("car"  "ford"    "focus")
-     #("car"  "ford"    "pinto")
-     #("bike" "giant"   "boulder")
-     #("bike" "schwinn" ,sql-null))))
-
-(define query:test
-  (test-suite "Query utilities"
-    (test-suite "group-rows"
-      (test-case "single grouping"
-        (check-equal?
-         (rows-result-rows (group-rows vehicles-result #:group '#("type")))
-         `(#("car" (#("honda" "civic")
-                    #("ford" "focus")
-                    #("ford" "pinto")))
-           #("bike" (#("giant" "boulder")
-                     #("schwinn" ,sql-null))))))
-      (test-case "multiple groupings"
-        (check-equal?
-         (rows-result-rows
-          (group-rows vehicles-result #:group '(#("type") #("maker"))))
-         `(#("car" (#("honda" (#("civic")))
-                    #("ford"  (#("focus") #("pinto")))))
-           #("bike" (#("giant" (#("boulder")))
-                     #("schwinn" ()))))))
-      (test-case "multiple groupings, preserve null rows"
-        (check-equal?
-         (rows-result-rows
-          (group-rows vehicles-result
-                      #:group '(#("type") #("maker"))
-                      #:group-mode '(preserve-null-rows)))
-         `(#("car" (#("honda" (#("civic")))
-                    #("ford"  (#("focus") #("pinto")))))
-           #("bike" (#("giant" (#("boulder")))
-                     #("schwinn" (#(,sql-null))))))))
-      (test-case "multiple groupings, list"
-        (check-equal?
-         (rows-result-rows
-          (group-rows vehicles-result
-                      #:group '(#("type") #("maker"))
-                      #:group-mode '(list)))
-         `(#("car" (#("honda" ("civic"))
-                    #("ford"  ("focus" "pinto"))))
-           #("bike" (#("giant" ("boulder"))
-                     #("schwinn" ())))))))))
diff --git a/pkgs/db-pkgs/db-test/tests/db/gen/sql-types.rkt b/pkgs/db-pkgs/db-test/tests/db/gen/sql-types.rkt
deleted file mode 100644
index b61ca1bdc6..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/gen/sql-types.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/base
-(require rackunit
-         racket/class
-         racket/serialize
-         (prefix-in srfi: srfi/19)
-         db/base
-         db/private/generic/sql-convert
-         "../config.rkt")
-
-(provide sql-types:test)
-
-(define sql-types:test
-  (test-suite "SQL support utilities"
-    (test-case "exact->decimal-string"
-      (check-equal? (exact->decimal-string 12) "12")
-      (check-equal? (exact->decimal-string 1000) "1000")
-      (check-equal? (exact->decimal-string 1/2) "0.5")
-      (check-equal? (exact->decimal-string 1/4) "0.25")
-      (check-equal? (exact->decimal-string 1/10) "0.1")
-      (check-equal? (exact->decimal-string 1/20) "0.05")
-      (check-equal? (exact->decimal-string 1/3) #f))
-    (test-case "exact->scaled-integer"
-      (check-equal? (exact->scaled-integer 12) (cons 12 0))
-      ;; (check-equal? (exact->scaled-integer 1000) "1000")
-      (check-equal? (exact->scaled-integer 1/2) (cons 5 1))
-      (check-equal? (exact->scaled-integer 1/4) (cons 25 2))
-      (check-equal? (exact->scaled-integer 1/10) (cons 1 1))
-      (check-equal? (exact->scaled-integer 1/20) (cons 5 2))
-      (check-equal? (exact->scaled-integer 1/3) #f))
-    (test-case "sql-bits deserialization"
-      (check-equal? (deserialize 
-                     '((3)
-                       1
-                       (((lib "db/private/generic/sql-data.rkt") . deserialize-info:sql-bits-v0))
-                       0
-                       ()
-                       ()
-                       (0 0 (u . #"") 0)))
-                    (string->sql-bits ""))
-      (check-equal? (deserialize
-                     '((3)
-                       1
-                       (((lib "db/private/generic/sql-data.rkt") . deserialize-info:sql-bits-v0))
-                       0
-                       ()
-                       ()
-                       (0 4 (u . #"\260") 0)))
-                    (string->sql-bits "1011"))
-      (check-equal? (deserialize
-                     '((3)
-                       1
-                       (((lib "db/private/generic/sql-data.rkt") . deserialize-info:sql-bits-v0))
-                       0
-                       ()
-                       ()
-                       (0 30 (u . #"\377\377\360\0") 0)))
-                    (string->sql-bits (string-append (make-string 20 #\1) (make-string 10 #\0)))))))
diff --git a/pkgs/db-pkgs/db-test/tests/db/programs/memleak.rkt b/pkgs/db-pkgs/db-test/tests/db/programs/memleak.rkt
deleted file mode 100644
index 9dc02c3a7e..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/programs/memleak.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang racket/base
-(require (prefix-in db: db)
-         racket/match
-         racket/class)
-
-;; Test for db memory leaks
-
-;; FIXME: mysql quickly exhausts prepared statement limit
-
-(define the-dsn
-  (match (current-command-line-arguments)
-    [(vector x)
-     (string->symbol x)]
-    [_
-     (printf "No dsn argument given, exiting.\n")
-     (exit 0)]))
-
-;; 'tx, 'no
-(define start-tx-mode 'no)
-(define query-tx-mode 'no)
-
-;; boolean
-(define reconnect? #f)
-(define random-query? #f)
-
-;; ----
-
-(define (get-c)
-  (printf "-- connect\n")
-  (let ([c (db:dsn-connect the-dsn)])
-    (case start-tx-mode
-      ((tx) (db:start-transaction c))
-      ((no) (void)))
-    c))
-
-(define c #f)
-
-(define (c-test)
-  ;; Randomize to prevent statement caching
-  (define (go)
-    (db:query-value c (if random-query?
-                          (format "SELECT ~a" (random #e1e6))
-                          "SELECT 1")))
-  (case query-tx-mode
-    ((tx) (db:call-with-transaction c go))
-    ((no) (go))))
-
-(let loop ()
-  (collect-garbage)
-  (collect-garbage)
-  (when (or (not c) reconnect?)
-    (set! c (get-c)))
-  (displayln (quotient (current-memory-use) #e1e6))
-  (for ([i (in-range 10000)])
-    (c-test))
-  (loop))
diff --git a/pkgs/db-pkgs/db-test/tests/db/programs/sl-inserts.rkt b/pkgs/db-pkgs/db-test/tests/db/programs/sl-inserts.rkt
deleted file mode 100644
index ecb6e07f30..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/programs/sl-inserts.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket
-(require db)
-
-(define db (sqlite3-connect #:database 'memory))
-
-(query-exec
- db
- "CREATE TABLE IF NOT EXISTS
-        log_word_map(word TEXT, log_id INTEGER,
-            PRIMARY KEY (word, log_id)
-            ON CONFLICT FAIL)")
-
-(query-exec db "BEGIN TRANSACTION")
-
-(for ([x (in-range 20000)])
-  (query-exec db
-   "insert into log_word_map values (?, ?)"
-   (number->string x) 99))
-
-(query-exec db "COMMIT")
diff --git a/pkgs/db-pkgs/db-test/tests/db/programs/web-test.rkt b/pkgs/db-pkgs/db-test/tests/db/programs/web-test.rkt
deleted file mode 100644
index 1a3b413b65..0000000000
--- a/pkgs/db-pkgs/db-test/tests/db/programs/web-test.rkt
+++ /dev/null
@@ -1,116 +0,0 @@
-#lang racket/base
-(require web-server/servlet-env
-         web-server/dispatch
-         web-server/http
-         net/url
-         net/url-connect
-         racket/port
-         db)
-
-(module test racket/base)
-
-#|
-This program tests the combination of virtual connections and
-connection pools in the context of web servlets, where servlet threads
-may be killed unexpectedly if the client hangs up.
-
-Errors to watch for:
- - connection-pool-lease: cannot obtain connection; connection pool limit reached
-   Might mean a connection has become locked. Or could be a race condition, pool
-   connection not released in time. (Seen in 5.2.1, not near-5.3 versions.)
- - tcp-write: error writing (Broken pipe)
-   Probably okay, seems to come from web-server trying to write response.
- - TIMEOUT (and programs exits)
-   This would be bad; all connections are locked up. I haven't seen it happen.
-|#
-
-(define NOISY? #f)
-
-(define c (virtual-connection
-           (connection-pool
-            (lambda () (dsn-connect 'pg))
-            #:max-connections 12)))
-
-(unless (table-exists? c "foo")
-  (query-exec c "create table foo (n integer, s text)"))
-
-(define (add req n s)
-  (query-exec c "insert into foo (n, s) values ($1, $2)" n s)
-  (response/xexpr
-   `(html (body (p "Thanks, there are now "
-                   ,(format "~a" (query-value c "select count(s) from foo where n = $1" n))
-                   " values associated with " ,(number->string n) ".")))))
-
-(define (ask req n)
-  (response/xexpr
-   `(html (body (p "These are the strings associated with "
-                   ,(number->string n)
-                   ":")
-                (ol
-                 ,@(for/list ([s (in-query c "select s from foo where n = $1" n)])
-                     `(li ,(format "~a" s))))))))
-
-(define (find req ss)
-  (response/xexpr
-   `(html (body (p "These are the numbers containing "
-                   ,(format "~s" ss)
-                   ":")
-                (ol
-                 ,@(for/list ([n (query-list c "select n from foo where strpos(s, $1) > 0 order by n" ss)])
-                     `(li ,(format "~a" n))))))))
-
-(define-values (dispatch to-url0)
-  (dispatch-rules
-   [("ask" (integer-arg)) ask]
-   [("find" (string-arg)) find]
-   [("add" (integer-arg) (string-arg)) add]))
-
-(define (to-url . args)
-  (string->url
-   (string-append "http://localhost:10000" (apply to-url0 args))))
-
-(thread
- (lambda ()
-   (serve/servlet dispatch
-                  #:port 10000
-                  #:servlet-path "/ask/0"
-                  #:servlet-regexp #rx"")))
-
-(sleep 1)
-
-(define (random-letter _)
-  (integer->char (+ (char->integer #\a) (random 26))))
-
-(define (get url)
-  (let* ([c (make-custodian)]
-         [fast? (zero? (random 5))]
-         [t
-          (parameterize ((current-custodian c))
-            (thread
-             (lambda ()
-               (let* ([ts1 (current-milliseconds)]
-                      [result (call/input-url url get-pure-port port->string)]
-                      [ts2 (current-milliseconds)])
-                 (when NOISY? (eprintf "~s ms\n" (inexact->exact (floor (- ts2 ts1)))))))))])
-    (if fast?
-        (or (sync/timeout (+ 0.005 (* 0.001 (random 5))) t)
-            (begin (custodian-shutdown-all c)
-                   (when NOISY? (eprintf "fast timeout\n"))))
-        (or (sync/timeout 1 t)
-            (begin (custodian-shutdown-all c)
-                   (eprintf "TIMEOUT\n")
-                   (exit 1))))))
-
-(define workers
-  (for/list ([t 10])
-    (thread
-     (lambda ()
-       (for ([r 1000])
-         (case (random 3)
-           ((0) (get (to-url ask (random 10))))
-           ((1) (get (to-url find (build-string 3 random-letter))))
-           ((2) (get (to-url add (random 10) (build-string 40 random-letter))))))))))
-
-(for-each thread-wait workers)
-(eprintf "Whew, done.\n")
-(sleep 5)
diff --git a/pkgs/db-pkgs/db/LICENSE.txt b/pkgs/db-pkgs/db/LICENSE.txt
deleted file mode 100644
index e905414aab..0000000000
--- a/pkgs/db-pkgs/db/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-db
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/db-pkgs/db/info.rkt b/pkgs/db-pkgs/db/info.rkt
deleted file mode 100644
index 39416347a5..0000000000
--- a/pkgs/db-pkgs/db/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps
-  '("db-lib" "db-doc" "base"))
-(define implies
-  '("db-lib" "db-doc"))
-
-(define pkg-desc "Database connectivity")
-
-(define pkg-authors '(ryanc))
diff --git a/pkgs/deinprogramm/LICENSE.txt b/pkgs/deinprogramm/LICENSE.txt
deleted file mode 100644
index 6f18071dc7..0000000000
--- a/pkgs/deinprogramm/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-deinprogramm
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-advanced-reader.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-advanced-reader.rkt
deleted file mode 100644
index f557901444..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-advanced-reader.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scheme/base
-(require deinprogramm/DMdA-reader)
-(provide (rename-out (-read-syntax read-syntax))
-         (rename-out (-read read)))
-(define -read-syntax (make-read-syntax '(lib "DMdA-advanced.ss" "deinprogramm")))
-(define -read (make-read '(lib "DMdA-advanced.ss" "deinprogramm")))
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-advanced.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-advanced.rkt
deleted file mode 100644
index 1fb3b3fa6a..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-advanced.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang deinprogramm/DMdA
-
-(require syntax/docprovide "DMdA-deflam.rkt")
-(provide #%app #%top (rename-out (DMdA-module-begin #%module-begin)) #%datum #%top-interaction 
-	 require lib planet provide
-         let let* letrec lambda define
-	 cond if else begin and or set! quote
-         define-record-procedures define-record-procedures-2 
-	 define-record-procedures-parametric define-record-procedures-parametric-2
-         .. ... .... ..... ......
-	 check-expect check-within check-error check-member-of check-range
-	 check-property for-all ==> expect expect-within expect-member-of expect-range
-	 signature contract : define-contract -> mixed one-of predicate combined list-of
-	 number real rational integer natural boolean true false string symbol empty-list unspecific any property)
-(provide cons)
-(provide-and-document
- procedures
- (all-from advanced: deinprogramm/DMdA procedures))
-
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-advanced/lang/reader.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-advanced/lang/reader.rkt
deleted file mode 100644
index 76dcf1ba7b..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-advanced/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-deinprogramm/DMdA-advanced
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-assignments-reader.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-assignments-reader.rkt
deleted file mode 100644
index 32e23f80ed..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-assignments-reader.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scheme/base
-(require deinprogramm/DMdA-reader)
-(provide (rename-out (-read-syntax read-syntax))
-         (rename-out (-read read)))
-(define -read-syntax (make-read-syntax '(lib "DMdA-assignments.ss" "deinprogramm")))
-(define -read (make-read '(lib "DMdA-assignments.ss" "deinprogramm")))
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-assignments.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-assignments.rkt
deleted file mode 100644
index f432494745..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-assignments.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang deinprogramm/DMdA
-
-(require syntax/docprovide "DMdA-deflam.rkt")
-(provide #%app #%top (rename-out (DMdA-module-begin #%module-begin)) #%datum #%top-interaction 
-	 require lib planet provide
-         let let* letrec lambda define
-	 cond if else begin and or set!
-         define-record-procedures define-record-procedures-2 
-	 define-record-procedures-parametric define-record-procedures-parametric-2
-         .. ... .... ..... ......
-	 check-expect check-within check-error check-member-of check-range
-	 check-property for-all ==> expect expect-within expect-member-of expect-range
-	 signature contract : define-contract -> mixed one-of predicate combined list-of
-	 number real rational integer natural boolean true false string empty-list unspecific any property)
-(provide cons)
-(provide-and-document
- procedures
- (all-from-except assignments: deinprogramm/DMdA procedures
-		  quote
-		  symbol? string->symbol symbol->string))
-
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-assignments/lang/reader.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-assignments/lang/reader.rkt
deleted file mode 100644
index 58be60698f..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-assignments/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-deinprogramm/DMdA-assignments
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-beginner-reader.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-beginner-reader.rkt
deleted file mode 100644
index 5c3424e658..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-beginner-reader.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scheme/base
-(require deinprogramm/DMdA-reader)
-(provide (rename-out (-read-syntax read-syntax))
-         (rename-out (-read read)))
-(define -read-syntax (make-read-syntax '(lib "DMdA-beginner.rkt" "deinprogramm")))
-(define -read (make-read '(lib "DMdA-beginner.rkt" "deinprogramm")))
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-beginner.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-beginner.rkt
deleted file mode 100644
index 9472bb7b84..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-beginner.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang deinprogramm/DMdA
-
-(require syntax/docprovide)
-(provide #%app #%top (rename-out (DMdA-module-begin #%module-begin)) #%datum #%top-interaction
-	 require lib planet provide
-         define lambda cond if else and or
-         define-record-procedures define-record-procedures-parametric
-         .. ... .... ..... ......
-	 check-expect check-within check-error check-member-of check-range
-	 check-property for-all ==> expect expect-within expect-member-of expect-range
-	 signature contract : define-contract -> mixed one-of predicate combined
-	 number real rational integer natural boolean true false string empty-list any property)
-(provide cons list)
-(provide-and-document
- procedures
- (all-from-except beginner: deinprogramm/DMdA procedures
-		  set! define-record-procedures-2 eq? equal?
-		  quote
-		  make-pair pair? cons? first rest
-		  length map for-each reverse append list list-ref fold
-		  symbol? string->symbol symbol->string
-		  apply))
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-beginner/lang/reader.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-beginner/lang/reader.rkt
deleted file mode 100644
index efdbd32aa2..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-beginner/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-deinprogramm/DMdA-beginner
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-deflam.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-deflam.rkt
deleted file mode 100644
index b34f5f9d6e..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-deflam.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang deinprogramm/DMdA
-
-;; this file exists so there is a single file that exports
-;; identifiers named 'define' and 'lambda' that are the 
-;; assignments and advanced versions of 'define' and 'lambda',
-;; so that we can tell scribble about this file and then it
-;; can connect up the re-exports to the documentation properly.
-
-(provide (rename-out (DMdA-advanced-lambda lambda))
-	 (rename-out (DMdA-advanced-define define)))
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-reader.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-reader.rkt
deleted file mode 100644
index 186854cac7..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-reader.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang scheme/base
-
-  (require mzlib/etc)
-  (provide make-read-syntax
-           make-read)
-  
-  (define (make-read spec)
-    (let ([read
-           (opt-lambda ([port (current-input-port)])
-             (syntax->datum ((make-read-syntax spec) 'whatever port)))])
-      read))
-  
-  (define (get-all-exps source-name port)
-    (let loop ()
-      (let ([exp (read-syntax source-name port)])
-        (cond
-          [(eof-object? exp) null]
-          [else (cons exp (loop))]))))
-  
-  (define (lookup key table)
-    (let ([ans (assoc key table)])
-      (unless ans
-        (error 'special-reader "couldn't find ~s in table ~s"
-               key table))
-      (cadr ans)))
-  
-  (define (make-read-syntax spec)
-    (let ([read-syntax
-           (opt-lambda ([source-name #f]
-                        [port (current-input-port)])
-             (let* ([table (read port)]
-                    [path (object-name port)]
-                    [modname 
-                     (if (path-string? path)
-                         (let-values ([(base name dir) (split-path path)])
-                           (string->symbol (path->string (path-replace-suffix name #""))))
-                         (lookup 'modname table))])
-               (datum->syntax
-                #f
-                `(module ,modname ,spec
-                   ,@(map (lambda (x) `(require ,x))
-                          (lookup 'teachpacks table))
-                   ,@(parameterize ([read-case-sensitive (lookup 'read-case-sensitive table)])
-                       (get-all-exps source-name port))))))])
-      read-syntax))
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-vanilla-reader.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-vanilla-reader.rkt
deleted file mode 100644
index c84426c5d5..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-vanilla-reader.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module DMdA-vanilla-reader mzscheme
-  (require "DMdA-reader.rkt")
-  (provide (rename -read-syntax read-syntax)
-           (rename -read read))
-  (define -read-syntax (make-read-syntax '(lib "DMdA-vanilla.ss" "deinprogramm")))
-  (define -read (make-read '(lib "DMdA-vanilla.ss" "deinprogramm"))))
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-vanilla.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-vanilla.rkt
deleted file mode 100644
index ba8825cd05..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-vanilla.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang deinprogramm/DMdA
-
-(require syntax/docprovide)
-(provide #%app #%top (rename-out (DMdA-module-begin #%module-begin)) #%datum #%top-interaction
-	 require lib planet provide
-	 define let let* letrec lambda cond if else and or
-	 define-record-procedures define-record-procedures-parametric
-	 .. ... .... ..... ......
-	 check-expect check-within check-error check-member-of check-range
-	 check-property for-all ==> expect expect-within expect-member-of expect-range
-	 signature contract : define-contract -> mixed one-of predicate combined list-of
-	 number real rational integer natural boolean true false string empty-list any property)
-(provide cons)
-(provide-and-document
- procedures
- (all-from-except vanilla: deinprogramm/DMdA procedures
-		  quote eq? equal?
-		  set!
-		  define-record-procedures-2
-		  symbol? string->symbol symbol->string
-		  apply))
-
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA-vanilla/lang/reader.rkt b/pkgs/deinprogramm/deinprogramm/DMdA-vanilla/lang/reader.rkt
deleted file mode 100644
index 2a3d0fa8c7..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA-vanilla/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-deinprogramm/DMdA-vanilla
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA.rkt b/pkgs/deinprogramm/deinprogramm/DMdA.rkt
deleted file mode 100644
index 36cc91fbfc..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA.rkt
+++ /dev/null
@@ -1,1122 +0,0 @@
-#lang scheme/base
-
-(require syntax/docprovide)
-
-(require test-engine/scheme-tests
-	 (lib "test-info.scm" "test-engine")
-	 test-engine/scheme-tests
-	 scheme/class)
-
-(require deinprogramm/signature/module-begin
-	 (except-in deinprogramm/signature/signature signature-violation)
-	 (except-in deinprogramm/signature/signature-syntax property))
-
-(require (for-syntax scheme/base)
-	 (for-syntax stepper/private/syntax-property))
-
-(require deinprogramm/define-record-procedures)
-
-(require (only-in lang/private/teachprims define-teach teach-equal? beginner-equal~?))
-
-(require (for-syntax deinprogramm/syntax-checkers))
-
-(require (rename-in deinprogramm/quickcheck/quickcheck
-		    (property quickcheck:property)))
-
-(provide provide lib planet rename-out require #%datum #%module-begin #%top-interaction) ; so we can use this as a language
-
-(provide (all-from-out deinprogramm/define-record-procedures))
-(provide (all-from-out test-engine/scheme-tests))
-(provide signature define-contract :
-	 contract ; legacy
-	 -> mixed one-of predicate combined list-of)
-
-(provide number real rational integer natural
-	 boolean true false
-	 string symbol
-	 empty-list
-	 unspecific
-	 any
-	 property)
-
-(define-syntax provide/rename
-  (syntax-rules ()
-    ((provide/rename (here there) ...)
-     (begin
-       (provide (rename-out (here there))) ...))))
-
-(provide/rename
- (DMdA-define define)
- (DMdA-let let)
- (DMdA-let* let*)
- (DMdA-letrec letrec)
- (DMdA-lambda lambda)
- (DMdA-cond cond)
- (DMdA-if if)
- (DMdA-else else)
- (DMdA-begin begin)
- (DMdA-and and)
- (DMdA-or or)
- (DMdA-dots ..)
- (DMdA-dots ...)
- (DMdA-dots ....)
- (DMdA-dots .....)
- (DMdA-dots ......)
- (DMdA-app #%app)
- (DMdA-top #%top)
- (DMdA-set! set!)
- (module-begin DMdA-module-begin))
-
-(provide DMdA-advanced-lambda
-	 DMdA-advanced-define)
-
-(provide for-all ==>
-	 check-property
-	 expect expect-within expect-member-of expect-range)
-
-(provide quote)
-
-(provide-and-document
- procedures
- ("Zahlen"
-  (number? (any -> boolean)
-	   "feststellen, ob ein Wert eine Zahl ist")
-
-  (= (number number number ... -> boolean)
-     "Zahlen auf Gleichheit testen")
-  (< (real real real ... -> boolean)
-     "Zahlen auf kleiner-als testen")
-  (> (real real real ... -> boolean)
-     "Zahlen auf größer-als testen")
-  (<= (real real real ... -> boolean)
-      "Zahlen auf kleiner-gleich testen")
-  (>= (real real real ... -> boolean)
-      "Zahlen auf größer-gleich testen")
-  
-  (+ (number number number ... -> number)
-     "Summe berechnen")
-  (- (number number ... -> number)
-     "bei mehr als einem Argument Differenz zwischen der ersten und der Summe aller weiteren Argumente berechnen; bei einem Argument Zahl negieren")
-  (* (number number number ... -> number)
-     "Produkt berechnen")
-  (/ (number number number ... -> number)
-     "das erste Argument durch das Produkt aller weiteren Argumente berechnen")
-  (max (real real ... -> real)
-       "Maximum berechnen")
-  (min (real real ... -> real)
-       "Minimum berechnen")
-  (quotient (integer integer -> integer)
-	    "ganzzahlig dividieren")
-  (remainder (integer integer -> integer)
-	     "Divisionsrest berechnen")
-  (modulo (integer integer -> integer)
-	  "Divisionsmodulo berechnen")
-  (sqrt (number -> number)
-	"Quadratwurzel berechnen")
-  (expt (number number -> number)
-	"Potenz berechnen (erstes Argument hoch zweites Argument)")
-  (abs (real -> real)
-       "Absolutwert berechnen")
-  
-  ;; fancy numeric 
-  (exp (number -> number)
-       "Exponentialfunktion berechnen (e hoch Argument)")
-  (log (number -> number)
-       "natürlichen Logarithmus (Basis e) berechnen")
-  
-  ;; trigonometry
-  (sin (number -> number)
-       "Sinus berechnen (Argument in Radian)")
-  (cos (number -> number)
-       "Cosinus berechnen (Argument in Radian)")
-  (tan (number -> number)
-       "Tangens berechnen (Argument in Radian)")
-  (asin (number -> number)
-	"Arcussinus berechnen (in Radian)")
-  (acos (number -> number)
-	"Arcuscosinus berechnen (in Radian)")
-  (atan (number -> number)
-	"Arcustangens berechnen (in Radian)")
-  
-  (exact? (number -> boolean)
-	  "feststellen, ob eine Zahl exakt ist")
-  
-  (integer? (any -> boolean)
-	    "feststellen, ob ein Wert eine ganze Zahl ist")
-  (natural? (any -> boolean)
-	    "feststellen, ob ein Wert eine natürliche Zahl (inkl. 0) ist")
-  
-  (zero? (number -> boolean)
-	 "feststellen, ob eine Zahl Null ist") 
-  (positive? (number -> boolean)
-	     "feststellen, ob eine Zahl positiv ist")
-  (negative? (number -> boolean)
-	     "feststellen, ob eine Zahl negativ ist")
-  (odd? (integer -> boolean)
-	"feststellen, ob eine Zahl ungerade ist")
-  (even? (integer -> boolean)
-	 "feststellen, ob eine Zahl gerade ist")
-
-  (lcm (integer integer ... -> natural)
-       "kleinstes gemeinsames Vielfaches berechnen")
-  
-  (gcd (integer integer ... -> natural)
-       "größten gemeinsamen Teiler berechnen")
-  
-  (rational? (any -> boolean)
-	     "feststellen, ob eine Zahl rational ist")
-  
-  (numerator (rational -> integer)
-	     "Zähler eines Bruchs berechnen")
-  
-  (denominator (rational -> natural)
-	       "Nenner eines Bruchs berechnen")
-  
-  (inexact? (number -> boolean)
-	    "feststellen, ob eine Zahl inexakt ist")
-  
-  (real? (any -> boolean)
-	 "feststellen, ob ein Wert eine reelle Zahl ist")
-  
-  (floor (real -> integer)
-	 "nächste ganze Zahl unterhalb einer rellen Zahlen berechnen")
-  
-  (ceiling (real -> integer)
-	   "nächste ganze Zahl oberhalb einer rellen Zahlen berechnen")
-  
-  (round (real -> integer)
-	 "relle Zahl auf eine ganze Zahl runden")
-  
-  (complex? (any -> boolean)
-	    "feststellen, ob ein Wert eine komplexe Zahl ist")
-  
-  (make-polar (real real -> number)
-	      "komplexe Zahl aus Abstand zum Ursprung und Winkel berechnen")
-  
-  (real-part (number -> real)
-	     "reellen Anteil einer komplexen Zahl extrahieren")
-  
-  (imag-part (number -> real)
-	     "imaginären Anteil einer komplexen Zahl extrahieren")
-  
-  (magnitude (number -> real)
-	     "Abstand zum Ursprung einer komplexen Zahl berechnen")
-  
-  (angle (number -> real)
-	 "Winkel einer komplexen Zahl berechnen")
-  
-  (exact->inexact (number -> number)
-		  "eine Zahl durch eine inexakte Zahl annähern")
-  
-  (inexact->exact (number -> number)
-		  "eine Zahl durch eine exakte Zahl annähern")
-  
-  ;;    "Odds and ends"
-  
-  (number->string (number -> string)
-		  "Zahl in Zeichenkette umwandeln")
-
-  (string->number (string -> (mixed number false))
-		  "Zeichenkette in Zahl umwandeln, falls möglich")
-  
-  (random (natural -> natural)
-	  "eine natürliche Zufallszahl berechnen, die kleiner als das Argument ist")
-  
-  (current-seconds (-> natural)
-		   "aktuelle Zeit in Sekunden seit einem unspezifizierten Startzeitpunkt berechnen"))
-
- ("boolesche Werte" 
-  (boolean? (any -> boolean)
-	    "feststellen, ob ein Wert ein boolescher Wert ist")
-  
-  ((DMdA-not not) (boolean -> boolean)
-   "booleschen Wert negieren")
-
-  (boolean=? (boolean boolean -> boolean)
-	     "Booleans auf Gleichheit testen")
-
-  (true? (any -> boolean)
-	 "feststellen, ob ein Wert #t ist")
-  (false? (any -> boolean)
-	  "feststellen, ob ein Wert #f ist"))
-
- ("Listen"
-  (empty list "die leere Liste")
-  (make-pair (%a (list-of %a) -> (list-of %a))
-	     "erzeuge ein Paar aus Element und Liste")
-  ((DMdA-cons cons) (%a (list-of %a) -> (list-of %a))
-	     "erzeuge ein Paar aus Element und Liste")
-  (pair? (any -> boolean)
-	 "feststellen, ob ein Wert ein Paar ist")
-  (cons? (any -> boolean)
-	 "feststellen, ob ein Wert ein Paar ist")
-  (empty? (any -> boolean)
-	  "feststellen, ob ein Wert die leere Liste ist")
-  
-  (first ((list-of %a) -> %a)
-	 "erstes Element eines Paars extrahieren")
-  (rest ((list-of %a) -> (list-of %a))
-	"Rest eines Paars extrahieren")
-
-  (list (%a ... -> (list-of %a))
-	"Liste aus den Argumenten konstruieren")
-
-  (length ((list-of %a) -> natural)
-	  "Länge einer Liste berechnen")
-
-  (fold (%b (%a %b -> %b) (list-of %a) -> %b)
-	 "Liste einfalten.")
-  
-  ((DMdA-append append) ((list-of %a) ... -> (list-of %a))
-   "mehrere Listen aneinanderhängen")
-
-  (list-ref ((list-of %a) natural -> %a)
-	    "das Listenelement an der gegebenen Position extrahieren")
-  
-  (reverse ((list-of %a)  -> (list-of %a))
-	   "Liste in umgekehrte Reihenfolge bringen"))
-
- ("Computer"
-  (computer signature
-	    "Signatur für Computer")
-  (make-computer (string rational rational -> computer)
-		 "Computer aus Prozessorname, Arbeitsspeicher und Festplattenkapazität konstruieren")
-  (computer? (any -> boolean)
-	     "feststellen, ob Wert ein Computer ist")
-  (computer-processor (computer -> string)
-		      "Prozessorname aus Computer extrahieren")
-  (computer-ram (computer -> rational)
-		"Arbeitsspeicher aus Computer extrahieren")
-  (computer-hard-drive (computer -> rational)
-		       "Festplattenkapazität aus Computer extrahieren"))
-
- ("Schokokekse"
-  (chocolate-cookie signature
-		    "Signatur für Schokokekse")
-  (make-chocolate-cookie (number number -> chocolate-cookie)
-			 "Schokokeks aus Schoko- und Keks-Anteil konstruieren")
-  (chocolate-cookie? (any -> boolean)
-		     "feststellen, ob ein Wert ein Schokokeks ist")
-  (chocolate-cookie-chocolate (chocolate-cookie -> number)
-			      "Schoko-Anteil eines Schokokekses extrahieren")
-  (chocolate-cookie-cookie (chocolate-cookie -> number)
-			   "Keks-Anteil eines Schokokekses extrahieren"))
-
- ;; #### Zeichen sollten noch dazu, Vektoren wahrscheinlich auch
-
- ("Zeichenketten"
-  (string? (any -> boolean)
-	   "feststellen, ob ein Wert eine Zeichenkette ist")
-
-  (string=? (string string string ... -> boolean)
-	    "Zeichenketten auf Gleichheit testen")
-  (string<? (string string string ... -> boolean)
-	    "Zeichenketten lexikografisch auf kleiner-als testen")
-  (string>? (string string string ... -> boolean)
-	    "Zeichenketten lexikografisch auf größer-als testen")
-  (string<=? (string string string ... -> boolean)
-	     "Zeichenketten lexikografisch auf kleiner-gleich testen")
-  (string>=? (string string string ... -> boolean)
-	     "Zeichenketten lexikografisch auf größer-gleich testen")
-
-  (string-append (string string ... -> string)
-		 "Hängt Zeichenketten zu einer Zeichenkette zusammen")
-
-  (strings-list->string ((list string) -> string)
-			"Eine Liste von Zeichenketten in eine Zeichenkette umwandeln")
-
-  (string->strings-list (string -> (list string))
-			"Eine Zeichenkette in eine Liste von Zeichenketten mit einzelnen Zeichen umwandeln")
-
-  (string-length (string -> natural)
-		 "Liefert Länge einer Zeichenkette"))
-
- ("Symbole"
-  (symbol? (any -> boolean)
-	   "feststellen, ob ein Wert ein Symbol ist")
-  (symbol->string (symbol -> string)
-		  "Symbol in Zeichenkette umwandeln")
-  (string->symbol (string -> symbol)
-		  "Zeichenkette in Symbol umwandeln"))
- 
- ("Verschiedenes"
-  (equal? (%a %b -> boolean)
-	  "zwei Werte auf Gleichheit testen")
-  (eq? (%a %b -> boolean)
-       "zwei Werte auf Selbheit testen")
-  ((DMdA-write-string write-string) (string -> unspecific)
-   "Zeichenkette in REPL ausgeben")
-  (write-newline (-> unspecific)
-		 "Zeilenumbruch ausgeben")
-  (violation (string -> unspecific)
-	     "Programmm mit Fehlermeldung abbrechen")
-
-  (map ((%a -> %b) (list %a) -> (list %b))
-       "Prozedur auf alle Elemente einer Liste anwenden, Liste der Resultate berechnen")
-  (for-each ((%a -> %b) (list %a) -> unspecific)
-	    "Prozedur von vorn nach hinten auf alle Elemente einer Liste anwenden")
-  (apply (procedure (list %a) -> %b)
-	 "Prozedur auf Liste ihrer Argumente anwenden")
-  (read (-> any)
-	"Externe Repräsentation eines Werts in der REPL einlesen und den zugehörigen Wert liefern")))
-
-(define (make-pair f r)
-  (when (and (not (null? r))
-	     (not (pair? r)))
-    (raise
-     (make-exn:fail:contract
-      (string->immutable-string
-       (format "Zweites Argument zu make-pair ist keine Liste, sondern ~e" r))
-      (current-continuation-marks))))
-  (cons f r))
-
-(define (first l)
-  (when (not (pair? l))
-    (raise
-     (make-exn:fail:contract
-      (string->immutable-string
-       (format "Argument zu first kein Paar, sondern ~e" l))
-      (current-continuation-marks))))
-  (car l))
-
-(define (rest l)
-  (when (not (pair? l))
-    (raise
-     (make-exn:fail:contract
-      (string->immutable-string
-       (format "Argument zu rest kein Paar, sondern ~e" l))
-      (current-continuation-marks))))
-  (cdr l))
-
-(define empty '())
-
-(define (empty? obj)
-  (null? obj))
-
-(define (cons? obj)
-  (pair? obj))
-
-(define-teach DMdA cons
-  (lambda (f r)
-    (make-pair f r)))
-
-(define-teach DMdA append
-  (lambda args
-    (let loop ((args args)
-	       (seen-rev '()))
-      (when (not (null? args))
-	(let ((arg (car args)))
-	  (when (and (not (null? arg))
-		     (not (pair? arg)))
-	    (raise
-	     (make-exn:fail:contract
-	      (string->immutable-string
-	       (format "Argument zu append keine Liste, sondern ~e; restliche Argumente:~a"
-		       arg
-		       (apply string-append
-			      (map (lambda (arg)
-				     (format " ~e" arg))
-				   (append (reverse seen-rev)
-					   (list '<...>)
-					   (cdr args))))))
-	      (current-continuation-marks))))
-	  (loop (cdr args)
-		(cons arg seen-rev)))))
-  
-  (apply append args)))
-
-(define fold
-  (lambda (unit combine lis)
-    (cond
-      ((empty? lis) unit)
-      ((pair? lis) 
-       (combine (first lis)
-                (fold unit combine (rest lis))))
-      (else
-       (raise
-	(make-exn:fail:contract
-	 (string->immutable-string
-	  (format "Argument zu fold keine Liste, sondern ~e; andere Argumente: ~e ~e"
-		  lis
-		  unit combine))
-	 (current-continuation-marks)))))))
-
-;; This is copied from collects/lang/private/beginner-funs.rkt
-;; Test-suite support (require is really an effect
-;;  to make sure that it's loaded)
-(require "test-suite.rkt")
-
-(define-for-syntax (binding-in-this-module? b)
-  (and (list? b)
-       (module-path-index? (car b))
-       (let-values (((path base) (module-path-index-split (car b))))
-	 (and (not path) (not base)))))
-
-(define-for-syntax (transform-DMdA-define stx mutable?)
-  (unless (memq (syntax-local-context) '(module top-level))
-    (raise-syntax-error
-     #f "Define muss ganz außen stehen" stx))
-  (syntax-case stx ()
-    ((DMdA-define)
-     (raise-syntax-error
-      #f "Definition ohne Operanden" stx))
-    ((DMdA-define v)
-     (raise-syntax-error
-      #f "Define erwartet zwei Operanden, nicht einen" stx))
-    ((DMdA-define var expr)
-     (begin
-       (check-for-id!
-	(syntax var)
-	"Der erste Operand der Definition ist kein Bezeichner")
-       
-       (let ((binding (identifier-binding (syntax var))))
-	 (when binding
-	   (if (binding-in-this-module? binding)
-	       (raise-syntax-error
-		#f
-		"Zweite Definition für denselben Namen"
-		stx)
-	       (raise-syntax-error
-		#f
-		"Dieser Name gehört einer eingebauten Prozedur und kann nicht erneut definiert werden" (syntax var)))))
-       (if mutable?
-	   (with-syntax
-	       ((dummy-def (stepper-syntax-property
-			    (syntax (define dummy (lambda () (set! var 'dummy))))
-			    'stepper-skip-completely
-			    #t)))
-	     (syntax/loc stx
-			 (begin
-			   dummy-def
-			   (define var expr))))
-	   (syntax/loc stx (define var expr)))))
-    ((DMdA-define v e1 e2 e3 ...)
-     (raise-syntax-error
-      #f "Definition mit mehr als zwei Operanden" stx))))
-
-(define-syntax (DMdA-define stx)
-  (transform-DMdA-define stx #f))
-
-(define-syntax (DMdA-advanced-define stx)
-  (transform-DMdA-define stx #t))
-
-(define-syntax (DMdA-let stx)
-  (syntax-case stx ()
-    ((DMdA-let () body)
-     (syntax/loc stx body))
-    ((DMdA-let ((var expr) ...) body)
-     (begin
-       (check-for-id-list!
-	(syntax->list (syntax (var ...)))
-	"Kein Bezeichner in Let-Bindung")
-       (syntax/loc stx ((lambda (var ...) body) expr ...))))
-    ((DMdA-let ((var expr) ...) body1 body2 ...)
-     (raise-syntax-error
-      #f "Let-Ausdruck hat mehr als einen Ausdruck als Rumpf" stx))
-    ((DMdA-let expr ...)
-     (raise-syntax-error
-      #f "Let-Ausdruck erwartet eine Liste von Bindungen (Paare aus Name und Ausdruck) und einen Rumpf" stx))))
-
-(define-syntax (DMdA-let* stx)
-  (syntax-case stx ()
-    ((DMdA-let* () body)
-     (syntax/loc stx body))
-    ((DMdA-let* ((var1 expr1) (var2 expr2) ...) body)
-     (begin
-       (check-for-id!
-	(syntax var1)
-	"Kein Bezeichner in Let*-Bindung")
-       (syntax/loc stx ((lambda (var1)
-			  (DMdA-let* ((var2 expr2) ...) body))
-			expr1))))
-    ((DMdA-let* ((var expr) ...) body1 body2 ...)
-     (raise-syntax-error
-      #f "Let*-Ausdruck hat mehr als einen Ausdruck als Rumpf" stx))
-    ((DMdA-let* expr ...)
-     (raise-syntax-error
-      #f "Let*-Ausdruck erwartet eine Liste von Bindungen (Paare aus Name und Ausdruck) und einen Rumpf" stx))))
-
-(define-syntax (DMdA-letrec stx)
-  (syntax-case stx ()
-    ((DMdA-letrec ((var expr) ...) body)
-     (begin
-       (check-for-id-list!
-	(syntax->list (syntax (var ...)))
-	"Kein Bezeichner in letrec-Bindung")
-       (syntax/loc stx (letrec ((var expr) ...) body))))
-    ((DMdA-letrec ((var expr) ...) body1 body2 ...)
-     (raise-syntax-error
-      #f "Letrec hat mehr als einen Ausdruck als Rumpf" stx))))
-
-(define-syntax (DMdA-lambda stx)
-  (syntax-case stx ()
-    ((DMdA-lambda (var ...) body)
-     (begin
-       (check-for-id-list!
-	(syntax->list (syntax (var ...)))
-	"Kein Bezeichner als Parameter der Lambda-Abstraktion")
-       (syntax/loc stx (lambda (var ...) body))))
-    ((DMdA-lambda (var ...) body1 body2 ...)
-     (raise-syntax-error
-      #f "Lambda-Abstraktion hat mehr als einen Ausdruck als Rumpf" stx))
-    ((DMdA-lambda var body ...)
-     (identifier? (syntax var))
-     (raise-syntax-error
-      #f "Um die Parameter einer Lambda-Abstraktion gehören Klammern" (syntax var)))
-    ((DMdA-lambda var ...)
-     (raise-syntax-error
-      #f "Fehlerhafte Lambda-Abstraktion" stx))))
-
-(define-syntax (DMdA-advanced-lambda stx)
-  (syntax-case stx ()
-    ((DMdA-lambda (var ...) body)
-     (begin
-       (check-for-id-list!
-	(syntax->list (syntax (var ...)))
-	"Kein Bezeichner als Parameter der Lambda-Abstraktion")
-       (syntax/loc stx (lambda (var ...) body))))
-    ((DMdA-lambda (var ... . rest) body)
-     (begin
-       (check-for-id-list!
-	(syntax->list (syntax (var ...)))
-	"Kein Bezeichner als Parameter der Lambda-Abstraktion")
-       (check-for-id! 
-	(syntax rest)
-	"Kein Bezeichner als Restlisten-Parameter der Lambda-Abstraktion")
-       (syntax/loc stx (lambda (var ... . rest) body))))
-    ((DMdA-lambda (var ...) body1 body2 ...)
-     (raise-syntax-error
-      #f "Lambda-Abstraktion hat mehr als einen Ausdruck als Rumpf" stx))
-    ((DMdA-lambda var ...)
-     (raise-syntax-error
-      #f "Fehlerhafte Lambda-Abstraktion" stx))))
-
-(define-syntax (DMdA-begin stx)
-  (syntax-case stx ()
-    ((DMdA-begin)
-     (raise-syntax-error
-      #f "Begin-Ausdruck braucht mindestens einen Operanden" stx))
-    ((DMdA-begin expr1 expr2 ...)
-     (syntax/loc stx (begin expr1 expr2 ...)))))
-
-(define-for-syntax (local-expand-for-error stx ctx stops)
-  ;; This function should only be called in an 'expression
-  ;;  context. In case we mess up, avoid bogus error messages.
-  (when (memq (syntax-local-context) '(expression))
-    (local-expand stx ctx stops)))
-
-(define-for-syntax (ensure-expression stx k)
-  (if (memq (syntax-local-context) '(expression))
-      (k)
-      (stepper-syntax-property #`(begin0 #,stx) 'stepper-skipto skipto/second)))
-
-;; A consistent pattern for stepper-skipto:
-(define-for-syntax (stepper-ignore-checker stx)
-  (stepper-syntax-property stx 'stepper-skipto '(syntax-e cdr syntax-e cdr car)))
-
-;; Raise a syntax error:
-(define-for-syntax (teach-syntax-error form stx detail msg . args)
-  (let ([form (if (eq? form '|function call|) ; ####
-		  form
-		  #f)] ; extract name from stx
-	[msg (apply format msg args)])
-    (if detail
-	(raise-syntax-error form msg stx detail)
-	(raise-syntax-error form msg stx))))
-
-;; The syntax error when a form's name doesn't follow a "("
-(define-for-syntax (bad-use-error name stx)
-  (teach-syntax-error
-   name
-   stx
-   #f
-   "`~a' wurde an einer Stelle gefunden, die keiner offenen Klammer folgt"
-   name))
-
-;; Use for messages "expected ..., found <something else>"
-(define-for-syntax (something-else v)
-  (let ([v (syntax-e v)])
-    (cond
-     [(number? v) "eine Zahl"]
-     [(string? v) "eine Zeichenkette"]
-     [else "etwas anderes"])))
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; cond
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-syntax (DMdA-cond stx)
-  (ensure-expression
-   stx
-   (lambda ()
-     (syntax-case stx ()
-       [(_)
-	(teach-syntax-error
-	 'cond
-	 stx
-	 #f
-	 "Frage und eine Antwort nach `cond' erwartet, aber da ist nichts")]
-       [(_ clause ...)
-	(let* ([clauses (syntax->list (syntax (clause ...)))]
-	       [check-preceding-exprs
-		(lambda (stop-before)
-		  (let/ec k
-		    (for-each (lambda (clause)
-				(if (eq? clause stop-before)
-				    (k #t)
-				    (syntax-case clause ()
-				      [(question answer)
-				       (begin
-					 (unless (and (identifier? (syntax question))
-						      (free-identifier=? (syntax question) #'DMdA-else))
-					   (local-expand-for-error (syntax question) 'expression null))
-					 (local-expand-for-error (syntax answer) 'expression null))])))
-			      clauses)))])
-	  (let ([checked-clauses
-		 (map
-		  (lambda (clause)
-		    (syntax-case clause (DMdA-else)
-		      [(DMdA-else answer)
-		       (let ([lpos (memq clause clauses)])
-			 (when (not (null? (cdr lpos)))
-			   (teach-syntax-error
-			    'cond
-			    stx
-			    clause
-			    "`else'-Test gefunden, der nicht am Ende des `cond'-Ausdrucks steht"))
-			 (with-syntax ([new-test (stepper-syntax-property (syntax #t) 'stepper-else #t)])
-			   (syntax/loc clause (new-test answer))))]
-		      [(question answer)
-		       (with-syntax ([verified (stepper-ignore-checker (syntax (verify-boolean question 'cond)))])
-			 (syntax/loc clause (verified answer)))]
-		      [()
-		       (check-preceding-exprs clause)
-		       (teach-syntax-error
-			'cond
-			stx
-			clause
-			"Test und Ausdruck in Zweig erwartet, aber Zweig leer")]
-		      [(question?)
-		       (check-preceding-exprs clause)
-		       (teach-syntax-error
-			'cond
-			stx
-			clause
-			"Zweig mit Test und Ausdruck erwartet, aber Zweig enthält nur eine Form")]
-		      [(question? answer? ...)
-		       (check-preceding-exprs clause)
-		       (let ([parts (syntax->list clause)])
-			 ;; to ensure the illusion of left-to-right checking, make sure 
-			 ;; the question and first answer (if any) are ok:
-			 (unless (and (identifier? (car parts))
-				      (free-identifier=? (car parts) #'DMdA-else))
-			   (local-expand-for-error (car parts) 'expression null))
-			 (unless (null? (cdr parts))
-			   (local-expand-for-error (cadr parts) 'expression null))
-			 ;; question and answer (if any) are ok, raise a count-based exception:
-			 (teach-syntax-error
-			  'cond
-			  stx
-			  clause
-			  "Zweig mit Test und Ausdruck erwartet, aber Zweig enthält ~a Formen"
-			  (length parts)))]
-		      [_else
-		       (teach-syntax-error
-			'cond
-			stx
-			clause
-			"Zweig mit Test und Ausdruck erwartet, aber ~a gefunden"
-			(something-else clause))]))
-		  clauses)])
-	    ;; Add `else' clause for error (always):
-	    (let ([clauses (append checked-clauses 
-				   (list 
-				    (with-syntax ([error-call (syntax/loc stx (error 'cond "alle Tests ergaben #f"))])
-				      (syntax [else error-call]))))])
-	      (with-syntax ([clauses clauses])
-		(syntax/loc stx (cond . clauses))))))]
-       [_else (bad-use-error 'cond stx)]))))
-
-(define-syntax DMdA-else
-  (make-set!-transformer
-   (lambda (stx)
-     (define (bad expr)
-       (teach-syntax-error
-	'else
-	expr
-	#f
-	"hier nicht erlaubt, weil kein Test in `cond'-Zweig"))
-     (syntax-case stx (set! x)
-       [(set! e expr) (bad #'e)]
-       [(e . expr) (bad #'e)]
-       [e (bad stx)]))))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; if
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-syntax (DMdA-if stx)
-  (ensure-expression
-   stx
-   (lambda ()
-     (syntax-case stx ()
-       [(_ test then else)
-	(with-syntax ([new-test (stepper-ignore-checker (syntax (verify-boolean test 'if)))])
-	  (syntax/loc stx
-		      (if new-test
-			  then
-			  else)))]
-       [(_ . rest)
-	(let ([n (length (syntax->list (syntax rest)))])
-	  (teach-syntax-error
-	   'if
-	   stx
-	   #f
-	   "Test und zwei Ausdrücke erwartet, aber ~a Form~a gefunden"
-	   (if (zero? n) "keine" n)
-	   (if (= n 1) "" "en")))]
-       [_else (bad-use-error 'if stx)]))))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; or, and
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-syntaxes (DMdA-or DMdA-and)
-  (let ([mk
-	 (lambda (where)
-	   (let ([stepper-tag (case where
-				[(or) 'comes-from-or]
-				[(and) 'comes-from-and])])
-	     (with-syntax ([swhere where])
-	       (lambda (stx)
-		 (ensure-expression
-		  stx
-		  (lambda ()
-		    (syntax-case stx ()
-		      [(_ . clauses)
-		       (let ([n (length (syntax->list (syntax clauses)))])
-			 (let loop ([clauses-consumed 0]
-				    [remaining (syntax->list #`clauses)])
-			   (if (null? remaining)
-			       (case where
-				 [(or) #`#f]
-				 [(and) #`#t])
-			       (stepper-syntax-property
-				(stepper-syntax-property
-				 (quasisyntax/loc 
-				  stx
-				  (if #,(stepper-ignore-checker (quasisyntax/loc stx (verify-boolean #,(car remaining) 'swhere)))
-				      #,@(case where
-					   [(or) #`(#t
-						    #,(loop (+ clauses-consumed 1) (cdr remaining)))]
-					   [(and) #`(#,(loop (+ clauses-consumed 1) (cdr remaining))
-						     #f)])))
-				 'stepper-hint
-				 stepper-tag)
-				'stepper-and/or-clauses-consumed
-				clauses-consumed))))]
-		      [_else (bad-use-error where stx)])))))))])
-    (values (mk 'or) (mk 'and))))
-
-;; verify-boolean is inserted to check for boolean results:
-(define (verify-boolean b where)
-  (if (or (eq? b #t) (eq? b #f))
-      b
-      (raise
-       (make-exn:fail:contract
-	(string->immutable-string
-	 (format "~a: Testresultat ist nicht boolesch: ~e" where b))
-	(current-continuation-marks)))))
-
-(define-teach DMdA not
-  (lambda (b)
-    (verify-boolean b 'not)
-    (not b)))
-
-(define (boolean=? a b)
-  (verify-boolean a 'boolean=?)
-  (verify-boolean b 'boolean=?)
-  (eq? a b))
-
-(define-syntax (DMdA-app stx)
-  (syntax-case stx ()
-    ((_)
-     (raise-syntax-error
-      #f "Zusammengesetzte Form ohne Operator" (syntax/loc stx ())))
-    ((_ datum1 datum2 ...)
-     (let ((scm-datum (syntax->datum (syntax datum1))))
-       (or (number? scm-datum)
-	   (boolean? scm-datum)
-	   (string? scm-datum)
-	   (char? scm-datum)))
-     (raise-syntax-error #f "Operator darf kein Literal sein" (syntax datum1)))
-    ((_ datum1 datum2 ...)
-     (syntax/loc stx (#%app datum1 datum2 ...)))))
-
-(define-syntax (DMdA-top stx)
-  (syntax-case stx ()
-    ((_ . id)
-     ;; If we're in a module, we'll need to check that the name
-     ;;  is bound....
-     (if (and (not (identifier-binding #'id))
-	      (syntax-source-module #'id))
-	 ;; ... but it might be defined later in the module, so
-	 ;; delay the check.
-	 (stepper-ignore-checker 
-	  (syntax/loc stx (#%app values (DMdA-top-continue id))))
-	 (syntax/loc stx (#%top . id))))))
-
-(define-syntax (DMdA-top-continue stx)
-  (syntax-case stx ()
-    [(_ id)
-     ;; If there's still no binding, it's an "unknown name" error.
-     (if (not (identifier-binding #'id))
-	 (raise-syntax-error #f "Ungebundene Variable" (syntax/loc stx id))
-	 ;; Don't use #%top here; id might have become bound to something
-	 ;;  that isn't a value.
-	 #'id)]))
-
-(define-teach DMdA write-string
-  (lambda (s)
-    (when (not (string? s))
-      (error "Argument von write-string ist keine Zeichenkette"))
-    (display s)))
-
-(define (write-newline)
-  (newline))
-
-(define-record-procedures chocolate-cookie
-  make-chocolate-cookie chocolate-cookie?
-  (chocolate-cookie-chocolate chocolate-cookie-cookie))
-
-(define-record-procedures computer
-  make-computer computer?
-  (computer-processor
-   computer-ram
-   computer-hard-drive))
-
-(define (violation text)
-  (error text))
-
-(define (string->strings-list s)
-  (map (lambda (c) (make-string 1 c)) (string->list s)))
-
-(define (strings-list->string l)
-  (if (null? l)
-      ""
-      (string-append (car l) (strings-list->string (cdr l)))))
-
-(define integer (signature/arbitrary arbitrary-integer (predicate integer?)))
-(define number (signature/arbitrary arbitrary-real (predicate number?)))
-(define rational (signature/arbitrary arbitrary-rational (predicate rational?)))
-(define real (signature/arbitrary arbitrary-real (predicate real?)))
-
-(define (natural? x)
-  (and (integer? x)
-       (not (negative? x))))
-
-(define natural (signature/arbitrary arbitrary-natural (predicate natural?)))
-
-(define boolean (signature/arbitrary arbitrary-boolean (predicate boolean?)))
-
-(define (true? x)
-  (eq? x #t))
-
-(define (false? x)
-  (eq? x #f))
-
-(define true (signature (one-of #t)))
-(define false (signature (one-of #f)))
-
-(define string (signature/arbitrary arbitrary-printable-ascii-string (predicate string?)))
-(define symbol (signature/arbitrary arbitrary-symbol (predicate symbol?)))
-(define empty-list (signature (one-of empty)))
-
-(define unspecific (signature unspecific %unspecific))
-(define any (signature any %any))
-
-;; aus collects/lang/private/teach.rkt
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; dots (.. and ... and .... and ..... and ......)
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Syntax Identifier -> Expression
-;; Produces an expression which raises an error reporting unfinished code.
-(define-for-syntax (dots-error stx name)
-  (quasisyntax/loc stx
-		   (error (quote (unsyntax name))
-			  "Fertiger Ausdruck erwartet, aber da sind noch Ellipsen")))
-
-;; Expression -> Expression
-;; Transforms unfinished code (... and the like) to code
-;; raising an appropriate error.
-(define-syntax DMdA-dots
-  (make-set!-transformer
-   (lambda (stx)
-     (syntax-case stx (set!)
-       [(set! form expr) (dots-error stx (syntax form))]
-       [(form . rest) (dots-error stx (syntax form))]
-       [form (dots-error stx stx)]))))
-
-(define-syntaxes (DMdA-set! DMdA-set!-continue)
-  (let ((proc
-	 (lambda (continuing?)
-	   (lambda (stx)
-	     (ensure-expression
-	      stx
-	      (lambda ()
-		(syntax-case stx ()
-		  ((_ id expr)
-		   (identifier? (syntax id))
-		   (begin
-		     ;; Check that id isn't syntax, and not lexical.
-		     ((with-handlers ((exn:fail? (lambda (exn) void)))
-			;; First try syntax:
-			;; If it's a transformer binding, then it can take care of itself...
-			(if (set!-transformer? (syntax-local-value (syntax id)))
-			    void  ;; no lex check wanted
-			    (lambda ()
-			      (raise-syntax-error
-			       #f
-			       "Nach set! wird eine gebundene Variable erwartet, aber da ist ein Schlüsselwort."
-			       stx)))))
-		     ;; If we're in a module, we'd like to check here whether
-		     ;;  the identier is bound, but we need to delay that check
-		     ;;  in case the id is defined later in the module. So only
-		     ;;  do this in continuing mode:
-		     (when continuing?
-		       (when (and (not (identifier-binding #'id))
-				  (syntax-source-module #'id))
-			 (raise-syntax-error #f "Ungebundene Variable" #'id)))
-		     (if continuing?
-			 (syntax/loc stx (set! id expr))
-			 (stepper-ignore-checker (syntax/loc stx (#%app values (DMdA-set!-continue id expr)))))))
-		  ((_ id expr)
-		   (raise-syntax-error
-		    #f
-		    "Nach set! wird eine Variable aber da ist etwas anderes."
-		    #'id))
-		  ((_ id)
-		   (raise-syntax-error
-		    #f
-		    "Nach set! wird eine Variable und ein Ausdruck erwartet - der Ausdruck fehlt."
-		    stx))
-		  ((_)
-		   (raise-syntax-error
-		    #f
-		    "Nach set! wird eine Variable und ein Ausdruck erwartet, aber da ist nichts."
-		    stx))
-		  (_else 
-		   (raise-syntax-error
-		    #f
-		    "Inkorrekter set!-Ausdruck."
-		    stx)))))))))
-    (values (proc #f)
-	    (proc #t))))
-
-; QuickCheck
-
-(define-syntax (for-all stx)
-  (syntax-case stx ()
-    ((_ (?clause ...) ?body)
-     (with-syntax ((((?id ?arb) ...)
-		    (map (lambda (pr)
-			   (syntax-case pr ()
-			     ((?id ?signature)
-			      (identifier? #'?id)
-			      (with-syntax ((?error-call
-					     (syntax/loc #'?signature (error "Signatur hat keinen Generator"))))
-				#'(?id
-				   (or (signature-arbitrary (signature ?signature))
-				       ?error-call))))
-			     (_
-			      (raise-syntax-error #f "inkorrekte `for-all'-Klausel - sollte die Form (id contr) haben"
-						  pr))))
-			 (syntax->list #'(?clause ...)))))
-
-       (stepper-syntax-property #'(quickcheck:property 
-				   ((?id ?arb) ...) ?body)
-				'stepper-skip-completely
-				#t)))
-    ((_ ?something ?body)
-     (raise-syntax-error #f "keine Klauseln der Form (id contr)"
-			 stx))
-    ((_ ?thing1 ?thing2 ?thing3 ?things ...)
-     (raise-syntax-error #f "zuviele Operanden"
-			 stx))))
-
-(define-syntax (check-property stx)
-  (unless (memq (syntax-local-context) '(module top-level))
-    (raise-syntax-error
-     #f "`check-property' muss ganz außen stehen" stx))
-  (syntax-case stx ()
-    ((_ ?prop)
-     (stepper-syntax-property
-      (check-expect-maker stx #'check-property-error #'?prop '() 
-			  'comes-from-check-property)
-      'stepper-replace
-      #'#t))
-    (_ (raise-syntax-error #f "`check-property' erwartet einen einzelnen Operanden"
-			   stx))))
-
-(define (check-property-error test src-info test-info)
-  (let ((info (send test-info get-info)))
-    (send info add-check)
-    (with-handlers ((exn:fail?
-		     (lambda (e)
-		       (send info property-error e src-info)
-		       (raise e))))
-      (call-with-values
-	  (lambda ()
-	    (with-handlers
-		((exn:assertion-violation?
-		  (lambda (e)
-		    ;; minor kludge to produce comprehensible error message
-		    (if (eq? (exn:assertion-violation-who e) 'coerce->result-generator)
-			(raise (make-exn:fail (string-append "Wert muß Eigenschaft oder boolesch sein: "
-							     ((error-value->string-handler)
-							      (car (exn:assertion-violation-irritants e))
-							      100))
-					      (exn-continuation-marks e)))
-			(raise e)))))
-	      (quickcheck-results (test))))
-	(lambda (ntest stamps result)
-	  (if (check-result? result)
-	      (begin
-		(send info property-failed result src-info)
-		#f)
-	      #t))))))
-
-(define (expect v1 v2)
-  (quickcheck:property () (teach-equal? v1 v2)))
-
-(define (ensure-real who n val)
-  (unless (real? val)
-    (raise
-     (make-exn:fail:contract
-      (string->immutable-string
-       (format "~a Argument ~e zu `~a' keine reelle Zahl." n val who))
-      (current-continuation-marks)))))
-
-(define (expect-within v1 v2 epsilon)
-  (ensure-real 'expect-within "Drittes" epsilon)
-  (quickcheck:property () (beginner-equal~? v1 v2 epsilon)))
-
-(define (expect-range val min max)
-  (ensure-real 'expect-range "Erstes" val)
-  (ensure-real 'expect-range "Zweites" min)
-  (ensure-real 'expect-range "Drittes" max)
-  (quickcheck:property ()
-		       (and (<= min val)
-			    (<= val max))))
-
-(define (expect-member-of val . candidates)
-  (quickcheck:property () 
-		       (ormap (lambda (cand)
-				(teach-equal? val cand))
-			      candidates)))
-
-(define property (signature (predicate (lambda (x)
-					(or (boolean? x)
-					    (property? x))))))
-
diff --git a/pkgs/deinprogramm/deinprogramm/DMdA/lang/reader.rkt b/pkgs/deinprogramm/deinprogramm/DMdA/lang/reader.rkt
deleted file mode 100644
index 501df2a30b..0000000000
--- a/pkgs/deinprogramm/deinprogramm/DMdA/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-deinprogramm/DMdA
diff --git a/pkgs/deinprogramm/deinprogramm/convert-explicit.rkt b/pkgs/deinprogramm/deinprogramm/convert-explicit.rkt
deleted file mode 100644
index 757bf652f2..0000000000
--- a/pkgs/deinprogramm/deinprogramm/convert-explicit.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scheme/base
-(provide convert-explicit)
-
-(require mzlib/pretty
-	 mzlib/struct)
-
-(require deinprogramm/signature/signature-german)
-
-(require scheme/include)
-(include "convert-explicit.scm")
diff --git a/pkgs/deinprogramm/deinprogramm/convert-explicit.scm b/pkgs/deinprogramm/deinprogramm/convert-explicit.scm
deleted file mode 100644
index 7bdfd14049..0000000000
--- a/pkgs/deinprogramm/deinprogramm/convert-explicit.scm
+++ /dev/null
@@ -1,91 +0,0 @@
-; I HATE DEFINE-STRUCT!
-(define-struct/properties :empty-list ()
-  ((prop:custom-write
-    (lambda (r port write?)
-      (write-string "#<empty-list>" port))))
-  (make-inspector))
-
-;; essentially copied from define-record-procedures.scm
-(define (write-list l port write?)
-  (let ((pp? (and (pretty-printing)
-		  (number? (pretty-print-columns)))))
-
-    (write-string "#<" port)
-    (write-string "list" port)
-
-    (let-values (((ref-line ref-column ref-pos)
-		  (if pp?
-		      (port-next-location port)
-		      (values 0 -1 0)))) ; to compensate for space
-      (let ((do-element
-	     (if pp?
-		 (lambda (element)
-		   (let* ((max-column (- (pretty-print-columns) 1)) ; > terminator
-			  (tentative
-			   (make-tentative-pretty-print-output-port
-			    port
-			    max-column
-			    void)))
-		     (display " " tentative)
-		     ((if write? write display) element tentative)
-		     (let-values (((line column pos) (port-next-location tentative)))
-		       (if (< column max-column)
-			   (tentative-pretty-print-port-transfer tentative port)
-			   (begin
-			     (tentative-pretty-print-port-cancel tentative)
-			     (let ((count (pretty-print-newline port max-column)))
-			       (write-string (make-string (max 0 (- (+ ref-column 1) count)) #\space) 
-					     port)
-			       ((if write? write display) element port)))))))
-		 (lambda (element)
-		   (display " " port)
-		   ((if write? write display) element port)))))
-	(let loop ((elements (:list-elements l)))
-	  (cond
-	   ((pair? elements)
-	    (do-element (car elements))
-	    (loop (cdr elements)))
-	   ((not (null? elements))
-	    (write-string " ." port)
-	    (do-element elements))))))
-      
-    (write-string ">" port)))
-
-;; might be improper
-(define-struct/properties :list (elements)
-  ((prop:custom-write write-list))
-  (make-inspector))
-
-(define (convert-explicit v)
-  (let ((hash (make-hasheq)))
-    (let recur ((v v))
-      (cond
-       ((null? v) (make-:empty-list)) ; prevent silly printing of sharing
-       ((pair? v)
-	(make-:list
-	 (let list-recur ((v v))
-	   (cond
-	    ((null? v)
-	     v)
-	    ((not (pair? v))
-	     (recur v))
-	    (else
-	     (cons (recur (car v))
-		   (list-recur (cdr v))))))))
-       ((struct? v)
-	(or (hash-ref hash v #f)
-	    (let-values (((ty skipped?) (struct-info v)))
-	      (cond
-	       ((and ty (lazy-wrap? ty))
-		(let ((lazy-wrap-info (lazy-wrap-ref ty)))
-		  (let ((constructor (lazy-wrap-info-constructor lazy-wrap-info))
-			(raw-accessors (lazy-wrap-info-raw-accessors lazy-wrap-info)))
-		    (let ((val (apply constructor (map (lambda (raw-accessor)
-							 (recur (raw-accessor v)))
-						       raw-accessors))))
-		      (hash-set! hash v val)
-		      val))))
-	       (else v)))))
-       (else
-	v)))))
-
diff --git a/pkgs/deinprogramm/deinprogramm/define-record-procedures.rkt b/pkgs/deinprogramm/deinprogramm/define-record-procedures.rkt
deleted file mode 100644
index b349101e47..0000000000
--- a/pkgs/deinprogramm/deinprogramm/define-record-procedures.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang scheme/base
-
-(provide define-record-procedures
-	 define-record-procedures-parametric
-         define-record-procedures-2
-	 define-record-procedures-parametric-2)
-
-(require scheme/include
-	 scheme/promise
-	 mzlib/struct
-         mzlib/pconvert-prop
-         mzlib/pretty
-	 deinprogramm/signature/signature
-	 deinprogramm/signature/signature-german
-	 deinprogramm/signature/signature-syntax
-	 (only-in deinprogramm/quickcheck/quickcheck arbitrary-record arbitrary-one-of))
-
-(require (for-syntax scheme/base)
-         (for-syntax deinprogramm/syntax-checkers)
-         (for-syntax stepper/private/syntax-property))
-(include "define-record-procedures.scm")
diff --git a/pkgs/deinprogramm/deinprogramm/define-record-procedures.scm b/pkgs/deinprogramm/deinprogramm/define-record-procedures.scm
deleted file mode 100644
index 337854378d..0000000000
--- a/pkgs/deinprogramm/deinprogramm/define-record-procedures.scm
+++ /dev/null
@@ -1,598 +0,0 @@
-(define-syntax define-record-procedures*
-  
-  (let ()
-    (define (filter-map proc l)
-      (if (null? l)
-	  '()
-	  (let ((result (proc (car l))))
-	    (if result
-		(cons result (filter-map proc (cdr l)))
-		(filter-map proc (cdr l))))))
-    
-    
-    (define (syntax-member? thing stuff)
-      (cond
-       ((null? stuff) #f)
-       ((free-identifier=? thing (car stuff)) #t)
-       (else (syntax-member? thing (cdr stuff)))))
-
-    (define (map-with-index proc list)
-      (let loop ((i 0) (list list) (rev-result '()))
-	(if (null? list)
-	    (reverse rev-result)
-	    (loop (+ 1 i)
-		  (cdr list)
-		  (cons (proc i (car list)) rev-result)))))
-
-    (lambda (x)
-      (syntax-case x ()
-	((_ ?stx
-	    ?type-name
-	    ?mutable?
-	    ?signature-constructor-name
-	    ?constructor
-	    ?predicate
-	    (?field-spec ...))
-
-	 (with-syntax
-	     ((number-of-fields (length (syntax->list (syntax (?field-spec ...)))))
-	      ((accessor ...)
-	       (map (lambda (field-spec)
-		      (syntax-case field-spec ()
-			((accessor mutator) (syntax accessor))
-			(accessor (syntax accessor))))
-		    (syntax->list (syntax (?field-spec ...)))))
-	      ((mutator ...)
-	       (map (lambda (field-spec dummy-mutator)
-		      (syntax-case field-spec ()
-			((accessor mutator) (syntax mutator))
-			(accessor dummy-mutator)))
-		    (syntax->list (syntax (?field-spec ...)))
-		    (generate-temporaries (syntax (?field-spec ...))))))
-	   (with-syntax
-	       (((accessor-proc ...)
-		 (map-with-index
-		  (lambda (i accessor)
-		    (with-syntax ((i i)
-				  (tag accessor))
-		      (syntax-property (syntax/loc
-					accessor
-					(lambda (s)
-					  (when (not (raw-predicate s))
-					    (raise
-					     (make-exn:fail:contract
-					      (string->immutable-string
-					       (format "~a: Argument kein ~a: ~e" 
-						       'tag '?type-name s))
-					      (current-continuation-marks))))
-					  (raw-generic-access s i)))
-				       'inferred-name
-				       (syntax-e accessor))))
-		  (syntax->list #'(accessor ...))))
-		((our-accessor ...) (generate-temporaries #'(accessor ...)))
-		((mutator-proc ...)
-		 (map-with-index
-		  (lambda (i mutator)
-		    (with-syntax ((i i)
-				  (tag mutator))
-		      (syntax-property (syntax/loc
-					mutator
-					(lambda (s v)
-					  (when (not (raw-predicate s))
-					    (raise
-					     (make-exn:fail:contract
-					      (string->immutable-string
-					       (format "~a: Argument kein ~a: ~e" 
-						       'tag '?type-name s))
-					      (current-continuation-marks))))
-					  (raw-generic-mutate s i v)))
-				       'inferred-name
-				       (syntax-e mutator))))
-		  (syntax->list #'(mutator ...))))
-		(constructor-proc
-		 (syntax-property #'(lambda (accessor ...)
-				      (raw-constructor accessor ... #f))
-				  'inferred-name
-				  (syntax-e #'?constructor)))
-		(predicate-proc
-		 (syntax-property #'(lambda (thing)
-				     (raw-predicate thing))
-				  'inferred-name
-				  (syntax-e #'?predicate)))
-		((raw-accessor-proc ...)
-		 (map-with-index (lambda (i _)
-				   #`(lambda (r)
-				       (raw-generic-access r #,i)))
-				 (syntax->list #'(?field-spec ...))))
-		((raw-mutator-proc ...)
-		 (map-with-index (lambda (i _)
-				   #`(lambda (r val)
-				       (raw-generic-mutate r #,i val)))
-				 (syntax->list #'(?field-spec ...))))
-
-		(record-equal? #`(lambda (r1 r2 equal?)
-				   (and #,@(map-with-index (lambda (i field-spec)
-							     #`(equal? (raw-generic-access r1 #,i)
-								       (raw-generic-access r2 #,i)))
-							   (syntax->list #'(?field-spec ...)))))))
-
-				 
-	     (with-syntax
-		 ((struct-type-defs
-		   #'(define-values (type-descriptor
-				     raw-constructor
-				     raw-predicate
-				     raw-generic-access
-				     raw-generic-mutate)
-		       (make-struct-type
-			'?type-name #f (+ 1 number-of-fields) 0
-			#f
-			(list
-			 (cons prop:print-convert-constructor-name
-			       '?constructor)
-			 (cons prop:custom-write
-			       (lambda (r port write?)
-				 (custom-write-record '?type-name 
-						      (access-record-fields r raw-generic-access number-of-fields)
-						      port write?)))
-			 (cons prop:print-converter
-			       (lambda (r recur)
-				 (list '?constructor
-				       (recur (raw-accessor-proc r)) ...)))
-			 (cons prop:equal+hash
-			       (list record-equal?
-				     (make-equal-hash (lambda (r i) (raw-generic-access r i)) number-of-fields) 
-				     (make-equal2-hash (lambda (r i) (raw-generic-access r i)) number-of-fields)))
-			 (cons prop:lazy-wrap
-			       (make-lazy-wrap-info constructor-proc
-						    (list raw-accessor-proc ...)
-						    (list raw-mutator-proc ...)
-						    (lambda (r)
-						      (raw-generic-access r number-of-fields))
-						    (lambda (r val)
-						      (raw-generic-mutate r number-of-fields val)))))
-			(make-inspector))))
-		  (constructor-def #'(define ?constructor constructor-proc))
-		  (predicate-def #'(define-values (?predicate real-predicate)
-				     (values predicate-proc predicate-proc)))
-		  (accessor-defs #'(define-values (accessor ... our-accessor ...)
-				     (values accessor-proc ... accessor-proc ...)))
-		  (mutator-defs #'(define-values (mutator ...) (values mutator-proc ...)))
-		  (signature-def
-		   (with-syntax (((?param ...) (generate-temporaries #'(?field-spec ...))))
-		     (with-syntax (((component-signature ...)
-				    (map (lambda (accessor param)
-					   (with-syntax ((?accessor accessor)
-							 (?param param))
-					     #'(at ?param (property ?accessor ?param))))
-					 (syntax->list #'(our-accessor ...))
-					 (syntax->list #'(?param ...)))))
-		       (with-syntax ((base-signature
-				      (stepper-syntax-property
-				       #`(define ?type-name
-					   (let ((sig (signature ?type-name (predicate real-predicate))))
-					     #,(if (null? (syntax->list #'(?field-spec ...)))
-						   #'(set-signature-arbitrary-promise!
-						      sig
-						      (delay (arbitrary-one-of equal? (?constructor))))
-						   #'(begin))
-					     sig))
-				       'stepper-skip-completely 
-				       #t))
-				     (constructor-signature
-				      (stepper-syntax-property
-				       (if (syntax->datum #'?mutable?)
-					   ;; no lazy signatures
-					   #'(define (?signature-constructor-name ?param ...)
-					       (signature
-						(combined (at ?type-name (predicate real-predicate))
-							  component-signature ...)))
-					   ;; lazy signatures
-					   #'(define (?signature-constructor-name ?param ...)
-					       (let* ((sigs (list ?param ...))
-						      (sig
-						       (make-lazy-wrap-signature '?type-name #t
-										 type-descriptor raw-predicate
-										 sigs
-										 #'?type-name)))
-						 (set-signature-arbitrary-promise! 
-						  sig
-						  (delay
-						    (let ((arbs (map signature-arbitrary sigs)))
-						      (when (andmap values arbs)
-							(apply arbitrary-record
-							       ?constructor
-							       (list raw-accessor-proc ...)
-							       arbs)))))
-						 sig)))
-				       'stepper-skip-completely
-				       #t)))
-			 #'(begin
-			     ;; we use real-predicate to avoid infinite recursion if a signature
-			     ;; for ?type-name using ?predicate is inadvertently defined
-			     base-signature
-			     constructor-signature))))))
-	       ;; again, with properties
-	       (with-syntax ((struct-type-defs
-			      (stepper-syntax-property
-			       (syntax/loc x struct-type-defs) 'stepper-black-box-expr #'?stx))
-			     (constructor-def
-			      (stepper-syntax-property #'constructor-def 'stepper-skip-completely #t))
-			     (predicate-def
-			      (stepper-syntax-property #'predicate-def 'stepper-skip-completely #t))
-			     (accessor-defs
-			      (stepper-syntax-property #'accessor-defs 'stepper-skip-completely #t))
-			     (mutator-defs
-			      (stepper-syntax-property #'mutator-defs 'stepper-skip-completely #t)))
-		 #'(begin
-		     signature-def
-		     ;; the signature might be used in the definitions, hence this ordering
-		     struct-type-defs predicate-def constructor-def accessor-defs mutator-defs))))))
-      ((_ ?type-name
-	  ?signature-constructor-name
-	  ?constructor
-	  ?predicate
-	  rest)
-       (raise-syntax-error 
-	#f 
-	"Der vierte Operand ist illegal" (syntax rest)))
-      ((_ ?type-name
-	  ?signature-constructor-name
-	  ?constructor
-	  ?predicate
-	  rest1 rest2 ... (?field-spec ...))
-       (raise-syntax-error 
-	#f 
-	"Vor den Selektoren/Mutatoren steht eine Form zuviel" #'rest1))
-      ((_ ?type-name
-	  ?signature-constructor-name
-	  ?constructor
-	  ?predicate
-	  rest1 rest2 ...)
-       (raise-syntax-error 
-	#f 
-	"Zu viele Operanden für define-record-procedures*" x))
-      ((_ arg1 ...)
-       (raise-syntax-error 
-	#f 
-	"Zu wenige Operanden für define-record-procedures*" x))))))
-
-(define (access-record-fields rec acc count)
-  (let recur ((i 0))
-    (if (= i count)
-	'()
-	(cons (acc rec i)
-	      (recur (+ i 1))))))
-
-(define (make-equal-hash generic-access field-count)
-  (lambda (r recur)
-    (let loop ((i 0)
-	       (factor 1)
-	       (hash 0))
-      (if (= i field-count)
-	  hash
-	  (loop (+ 1 i)
-		(* factor 33)
-		(+ hash (* factor (recur (generic-access r i)))))))))
-
-(define (make-equal2-hash generic-access field-count)
-  (lambda (r recur)
-    (let loop ((i 0)
-	       (factor 1)
-	       (hash 0))
-      (if (= i field-count)
-	  hash
-	  (loop (+ 1 i)
-		(* factor 33)
-		(+ hash (* factor 
-			   (recur (generic-access r (- field-count i 1))))))))))
-
-#|
-(define-record-procedures :pare kons pare? (kar kdr))
-(kons 1 (kons 2 (kons 3 (kons 5 (kons 6 (kons 7 (kons 8 "asdjkfdshfdsjkf")))))))
-
-prints as:
-
-#<record:pare 1
-              #<record:pare 2
-                            #<record:pare 3
-                                          #<record:pare 5
-                                                        #<record:pare 6
-                                                                      #<record:pare 7 #<record:pare 8 "asdjkfdshfdsjkf">>>>>>>
-
-|#
-
-(define (custom-write-record name field-values port write?)
-  (let ((pp? (and (pretty-printing)
-		  (number? (pretty-print-columns)))))
-
-    (write-string "#<" port)
-    (write-string "record" port)
-    (let ((name (symbol->string name)))
-      (when (not (and (positive? (string-length name))
-		    (char=? #\: (string-ref name 0))))
-	  (write-char #\: port))
-      (write-string name port))
-
-    (let-values (((ref-line ref-column ref-pos)
-		  (if pp?
-		      (port-next-location port)
-		      (values 0 -1 0)))) ; to compensate for space
-      (for-each
-       (if pp?
-	   (lambda (field-value)
-	     (let* ((max-column (- (pretty-print-columns) 1)) ; > terminator
-		    (tentative
-		     (make-tentative-pretty-print-output-port
-		      port
-		      max-column
-		      void)))
-	       (display " " tentative)
-	       ((if write? write display) field-value tentative)
-	       (let-values (((line column pos) (port-next-location tentative)))
-		 (if (< column max-column)
-		     (tentative-pretty-print-port-transfer tentative port)
-		     (begin
-		       (tentative-pretty-print-port-cancel tentative)
-		       (let ((count (pretty-print-newline port max-column)))
-			 (write-string (make-string (max 0 (- (+ ref-column 1) count)) #\space) 
-				       port)
-			 ((if write? write display) field-value port)))))))
-	   (lambda (field-value)
-	       (display " " port)
-	       ((if write? write display) field-value port)))
-       field-values)
-      
-      (write-string ">" port))))
-
-;; (define-record-procedures :pare kons pare? (kar kdr))
-
-(define-syntax define-record-procedures
-  (lambda (x)
-    (syntax-case x ()
-      ((_ ?type-name
-          ?constructor
-          ?predicate
-          (accessor  ...))
-
-       (begin
-         (check-for-id!
-          (syntax ?type-name)
-          "Typ-Name ist kein Bezeichner")
-         
-         (check-for-id!
-          (syntax ?constructor)
-          "Konstruktor ist kein Bezeichner")
-         
-         (check-for-id!
-          (syntax ?predicate)
-          "Prädikat ist kein Bezeichner")
-         
-         (check-for-id-list! 
-          (syntax->list (syntax (accessor ...)))
-          "Selektor ist kein Bezeichner")
-
-         (with-syntax ((?stx x)
-		       ((dummy-mutator ...)
-                        (generate-temporaries (syntax (accessor ...)))))
-           (syntax
-            (define-record-procedures* ?stx ?type-name #f
-	      dummy-signature-constructor-name
-              ?constructor
-              ?predicate
-              ((accessor dummy-mutator) ...))))))
-
-       ((_ ?type-name
-           ?constructor
-           ?predicate
-           rest)
-        (raise-syntax-error 
-         #f 
-         "Der vierte Operand ist keine Liste von Selektoren" (syntax rest)))
-       ((_ ?type-name
-           ?constructor
-           ?predicate
-           rest1 rest2 ... (accessor ...))
-        (raise-syntax-error 
-         #f 
-         "Vor den Selektoren steht eine Form zuviel" #'rest1))
-       ((_ ?type-name
-           ?constructor
-           ?predicate
-           rest1 rest2 ...)
-        (raise-syntax-error 
-         #f 
-         "Zu viele Operanden für define-record-procedures" x))
-       ((_ arg1 ...)
-        (raise-syntax-error 
-         #f 
-         "Zu wenige Operanden für define-record-procedures" x))
-      )))
-
-(define-syntax define-record-procedures-parametric
-  (lambda (x)
-    (syntax-case x ()
-      ((_ ?type-name
-	  ?signature-constructor-name
-          ?constructor
-          ?predicate
-          (accessor  ...))
-
-
-       (begin
-	 (check-for-id!
-	  (syntax ?type-name)
-	  "Record-Name ist kein Bezeichner")
-
-	 (check-for-id!
-	  (syntax ?signature-constructor-name)
-	  "Signaturkonstruktor-Name ist kein Bezeichner")
-
-         (check-for-id!
-          (syntax ?constructor)
-          "Konstruktor ist kein Bezeichner")
-
-	 (check-for-id!
-	  (syntax ?predicate)
-	  "Prädikat ist kein Bezeichner")
-         
-	 (check-for-id-list! 
-	  (syntax->list (syntax (accessor ...)))
-	  "Selektor ist kein Bezeichner")
-
-	 (with-syntax ((?stx x)
-		       ((dummy-mutator ...)
-			(generate-temporaries (syntax (accessor ...)))))
-	   (syntax
-	    (define-record-procedures* ?stx ?type-name #f ?signature-constructor-name
-	      ?constructor
-	      ?predicate
-	      ((accessor dummy-mutator) ...))))))
-
-      ((_ ?type-name
-	  ?signature-constructor-name
-	  ?constructor
-	  ?predicate
-	  rest)
-       (raise-syntax-error 
-	#f 
-	"Der vierte Operand ist keine Liste von Selektoren" (syntax rest)))
-      ((_ ?type-name
-	  ?signature-constructor-name
-	  ?constructor
-	  ?predicate
-	  rest1 rest2 ...)
-       (raise-syntax-error 
-	#f 
-	"Zu viele Operanden für define-record-procedures-parametric" x))
-      ((_ arg1 ...)
-       (raise-syntax-error 
-	#f 
-	"Zu wenige Operanden für define-record-procedures-parametric" x))
-      )))
-
-;; (define-record-procedures-2 :pare kons pare? ((kar set-kar!) kdr))
-
-(define-syntax define-record-procedures-2
-  (lambda (x)
-    (syntax-case x ()
-      ((_ ?type-name
-	  ?constructor
-	  ?predicate
-	  (?field-spec ...))
-
-       (begin
-	 (check-for-id!
-	  (syntax ?type-name)
-	  "Record-Name ist kein Bezeichner")
-         
-	 (check-for-id!
-	  (syntax ?constructor)
-	  "Konstruktor ist kein Bezeichner")
-         
-	 (check-for-id!
-	  (syntax ?predicate)
-	  "Prädikat ist kein Bezeichner")
-	 
-	 (for-each (lambda (field-spec)
-		     (syntax-case field-spec ()
-		       ((accessor mutator)
-			(check-for-id! (syntax accessor)
-				       "Selektor ist kein Bezeichner")
-			(check-for-id! (syntax mutator)
-				       "Mutator ist kein Bezeichner"))
-		       (accessor
-			(check-for-id! (syntax accessor)
-				       "Selektor ist kein Bezeichner"))))
-		   (syntax->list (syntax (?field-spec ...))))
-
-	 (with-syntax ((?stx x))
-	   #'(define-record-procedures* ?stx ?type-name #t
-	       dummy-signature-constructor-name
-	       ?constructor
-	       ?predicate
-	       (?field-spec ...)))))
-      ((_ ?type-name
-	  ?constructor
-	  ?predicate
-	  rest)
-       (raise-syntax-error 
-	#f 
-	"Der vierte Operand ist illegal" (syntax rest)))
-      ((_ ?type-name
-	  ?constructor
-	  ?predicate
-	  rest1 rest2 ...)
-       (raise-syntax-error 
-	#f 
-	"Zu viele Operanden für define-record-procedures-2" x))
-      ((_ arg1 ...)
-       (raise-syntax-error 
-	#f 
-	"Zu wenige Operanden für define-record-procedures-2" x)))))
-
-(define-syntax define-record-procedures-parametric-2
-  (lambda (x)
-    (syntax-case x ()
-      ((_ ?type-name
-	  ?signature-constructor-name
-	  ?constructor
-	  ?predicate
-	  (?field-spec ...))
-
-       (begin
-	 (check-for-id!
-	  (syntax ?type-name)
-	  "Record-Name ist kein Bezeichner")
-
-	 (check-for-id!
-	  (syntax ?signature-constructor-name)
-	  "Signaturkonstruktor-Name ist kein Bezeichner")
-
-	 (check-for-id!
-	  (syntax ?constructor)
-	  "Konstruktor ist kein Bezeichner")
-         
-	 (check-for-id!
-	  (syntax ?predicate)
-	  "Prädikat ist kein Bezeichner")
-	 
-	 (for-each (lambda (field-spec)
-		     (syntax-case field-spec ()
-		       ((accessor mutator)
-			(check-for-id! (syntax accessor)
-				       "Selektor ist kein Bezeichner")
-			(check-for-id! (syntax mutator)
-				       "Mutator ist kein Bezeichner"))
-		       (accessor
-			(check-for-id! (syntax accessor)
-				       "Selektor ist kein Bezeichner"))))
-		   (syntax->list (syntax (?field-spec ...))))
-
-	 (with-syntax ((?stx x))
-	   #'(define-record-procedures* ?stx ?type-name #t ?signature-constructor-name
-	       ?constructor
-	       ?predicate
-	       (?field-spec ...)))))
-      ((_ ?type-name
-	  ?signature-constructor-name
-	  ?constructor
-	  ?predicate
-	  rest)
-       (raise-syntax-error 
-	#f 
-	"Der vierte Operand ist illegal" (syntax rest)))
-      ((_ ?type-name
-	  ?signature-constructor-name
-	  ?constructor
-	  ?predicate
-	  rest1 rest2 ...)
-       (raise-syntax-error 
-	#f 
-	"Zu viele Operanden für define-record-procedures-parametric-2" x))
-      ((_ arg1 ...)
-       (raise-syntax-error 
-	#f 
-	"Zu wenige Operanden für define-record-procedures-parametric-2" x)))))
-
-
diff --git a/pkgs/deinprogramm/deinprogramm/deinprogramm-langs.rkt b/pkgs/deinprogramm/deinprogramm/deinprogramm-langs.rkt
deleted file mode 100644
index 4eb8d0f2d7..0000000000
--- a/pkgs/deinprogramm/deinprogramm/deinprogramm-langs.rkt
+++ /dev/null
@@ -1,1258 +0,0 @@
-#lang scheme/base
-
-(require string-constants
-	 framework
-	 (prefix-in et: errortrace/stacktrace)
-	 (prefix-in tr: trace/stacktrace)
-	 mzlib/pretty
-	 (prefix-in pc: mzlib/pconvert)
-	 mzlib/file
-	 mzlib/unit
-	 mzlib/class
-	 mzlib/list
-	 racket/match
-	 racket/path
-         (only-in racket/list add-between last)
-         racket/contract
-	 mzlib/struct
-	 mzlib/compile
-	 drscheme/tool
-	 mred
-	 framework/private/bday
-	 syntax/moddep
-	 mrlib/cache-image-snip
-	 compiler/embed
-	 wxme/wxme
-	 setup/dirs
-	 setup/getinfo
-	 setup/collects
-
-	 lang/stepper-language-interface
-	 lang/debugger-language-interface
-	 lang/run-teaching-program
-	 lang/private/continuation-mark-key
-         lang/private/rewrite-error-message
-	 
-	 (only-in test-engine/scheme-gui make-formatter)
-	 test-engine/scheme-tests
-	 lang/private/tp-dialog
-	 (lib "test-display.scm" "test-engine")
-	 deinprogramm/signature/signature
-	 )
-
-
-  (require mzlib/pconvert-prop)
-
-  (require "convert-explicit.rkt")
-
-  (require (only-in mrlib/syntax-browser render-syntax/snip))
-  
-  (provide tool@)
-  
-  (define ellipses-cutoff 200)
-  
-  (define o (current-output-port))
-  (define (oprintf . args) (apply fprintf o args))
-  
-  (define generic-proc
-    (procedure-rename void '?))
-
-  ;; adapted from collects/drracket/private/main.rkt
-  (preferences:set-default 'drracket:deinprogramm:last-set-teachpacks/multi-lib
-                           '() 
-                           (lambda (x)
-                             (and (list? x)
-                                  (andmap (lambda (x)
-                                            (and (list? x)
-                                                 (pair? x)
-                                                 (eq? (car x) 'lib)
-                                                 (andmap string? (cdr x))))
-                                          x))))
-
-
-  (define tool@
-    (unit
-      (import drscheme:tool^)
-      (export drscheme:tool-exports^)
-      
-      (define drs-eventspace (current-eventspace))
-      
-      ;; writing-style : {explicit, datum}
-      ;; tracing? : boolean
-      ;; teachpacks : (listof require-spec)
-      (define-struct (deinprogramm-lang-settings drscheme:language:simple-settings)
-        (writing-style tracing? teachpacks))
-      (define deinprogramm-lang-settings->vector (make-->vector deinprogramm-lang-settings))
-      (define deinprogramm-teachpacks-field-index 
-        (+ (procedure-arity drscheme:language:simple-settings) 2))
-      
-      (define image-string "<image>")
-      
-      (define deinprogramm-language<%>
-        (interface ()
-          get-module
-          get-language-position
-          get-sharing-printing
-          get-abbreviate-cons-as-list
-          get-allow-sharing?
-          get-use-function-output-syntax?
-          get-accept-quasiquote?
-          get-read-accept-dot))
-      
-      ;; module-based-language-extension :    (implements drscheme:language:module-based-language<%>) 
-      ;;                                   -> (implements drscheme:language:module-based-language<%>)
-      ;; changes the default settings and sets a few more paramters during `on-execute'
-      (define (module-based-language-extension printing-style writing-style super%)
-        (class* super% ()
-          
-          (inherit get-sharing-printing get-abbreviate-cons-as-list)
-          
-          (define/override (default-settings)
-            (make-deinprogramm-lang-settings 
-             #f
-             printing-style
-             'repeating-decimal
-             (get-sharing-printing)
-             #t
-             'none
-	     writing-style
-             #f
-	     (preferences:get 'drracket:deinprogramm:last-set-teachpacks/multi-lib)))
-          
-          (define/override (default-settings? s)
-            (and (not (drscheme:language:simple-settings-case-sensitive s))
-		 (eq? (drscheme:language:simple-settings-printing-style s)
-		      printing-style)
-		 (eq? (drscheme:language:simple-settings-fraction-style s)
-		      'repeating-decimal)
-		 (eqv? (drscheme:language:simple-settings-show-sharing s)
-		       (get-sharing-printing))
-		 (drscheme:language:simple-settings-insert-newlines s)
-		 (eq? (drscheme:language:simple-settings-annotations s)
-		      'none)
-		 (eq? writing-style (deinprogramm-lang-settings-writing-style s))
-                 (not (deinprogramm-lang-settings-tracing? s))
-		 (null? (deinprogramm-lang-settings-teachpacks s))))
-          
-          (define/override (marshall-settings x)
-            (list (super marshall-settings x)
-		  (deinprogramm-lang-settings-writing-style x)
-                  (deinprogramm-lang-settings-tracing? x)
-		  (deinprogramm-lang-settings-teachpacks x)))
-          
-          (define/override (unmarshall-settings x)
-            (if (and (list? x)
-                     (= (length x) 4)
-		     (symbol? (list-ref x 1)) ; ####
-                     (boolean? (list-ref x 2))
-                     (list-of-require-specs? (list-ref x 3)))
-                (let ([drs-settings (super unmarshall-settings (first x))])
-                  (make-deinprogramm-lang-settings
-                   (drscheme:language:simple-settings-case-sensitive drs-settings)
-                   (drscheme:language:simple-settings-printing-style  drs-settings)
-                   (drscheme:language:simple-settings-fraction-style  drs-settings)
-                   (drscheme:language:simple-settings-show-sharing  drs-settings)
-                   (drscheme:language:simple-settings-insert-newlines  drs-settings)
-                   (drscheme:language:simple-settings-annotations drs-settings)
-                   (cadr x)
-                   (caddr x)
-		   (cadddr x)))
-                (default-settings)))
-
-          (define/private (list-of-require-specs? l)
-            (and (list? l)
-                 (andmap (lambda (x)
-                           (and (list? x)
-                                (andmap (lambda (x) (or (string? x) (symbol? x))) x)))
-                         l)))
-          
-          (inherit get-allow-sharing? get-use-function-output-syntax? 
-                   get-accept-quasiquote? get-read-accept-dot)
-          (define/override (config-panel parent)
-            (sharing/not-config-panel (get-allow-sharing?) (get-accept-quasiquote?) parent))
-          
-          (define/override (on-execute settings run-in-user-thread)
-            (let ([drs-namespace (current-namespace)]
-                  [scheme-test-module-name
-                   ((current-module-name-resolver) '(lib "test-engine/scheme-tests.rkt") #f #f #t)]
-                  [scheme-signature-module-name
-                   ((current-module-name-resolver) '(lib "deinprogramm/signature/signature-german.rkt") #f #f #t)]
-                  [tests-on? (preferences:get 'test-engine:enable?)])
-              (run-in-user-thread
-               (lambda ()
-		 (when (getenv "PLTDRHTDPNOCOMPILED") (use-compiled-file-paths '()))
-                 (read-accept-quasiquote (get-accept-quasiquote?))
-                 (ensure-drscheme-secrets-declared drs-namespace)
-                 (namespace-attach-module drs-namespace ''drscheme-secrets)
-                 (error-display-handler teaching-languages-error-display-handler)
-
-		 (current-eval (add-annotation (deinprogramm-lang-settings-tracing? settings) (current-eval)))
-
-                 (error-print-source-location #f)
-                 (read-decimal-as-inexact #t)
-                 (read-accept-dot (get-read-accept-dot))
-                 (namespace-attach-module drs-namespace scheme-test-module-name)
-                 (namespace-require scheme-test-module-name)
-
-                 (namespace-attach-module drs-namespace scheme-signature-module-name)
-                 (namespace-require scheme-signature-module-name)
-
-		 ;; hack: the test-engine code knows about the test~object name; we do, too
-		 (namespace-set-variable-value! 'test~object (build-test-engine))
-		 ;; record signature violations with the test engine
-		 (signature-violation-proc
-		  (lambda (obj signature message blame)
-		    (cond
-		     ((namespace-variable-value 'test~object #f (lambda () #f))
-		      => (lambda (engine)
-			   (send (send engine get-info) signature-failed
-				 obj signature message blame))))))
-                 (scheme-test-data (list (drscheme:rep:current-rep) drs-eventspace test-display%))
-                 (test-execute tests-on?)
-		 (signature-checking-enabled? (preferences:get 'signatures:enable-checking?))
-                 (test-format (make-formatter (lambda (v o)
-						(render-value/format (if (procedure? v)
-									 generic-proc
-									 v)
-								     settings o 40))))
-		 )))
-            (super on-execute settings run-in-user-thread)
-
-	    ;; DeinProgramm addition, copied from language.rkt
-	    (run-in-user-thread
-	     (lambda ()
-	       (global-port-print-handler
-		(lambda (value port)
-		  (let ([converted-value (simple-module-based-language-convert-value value settings)])
-		    (setup-printing-parameters 
-		     (lambda ()
-		       (parameterize ([pretty-print-columns 'infinity])
-			 (pretty-print converted-value port)))
-		     settings
-		     'infinity)))))))
-
-	  ;; set-printing-parameters : settings ( -> TST) -> TST
-	  ;; is implicitly exposed to the stepper.  watch out!  --  john
-          (define/public (set-printing-parameters settings thunk)
-            (parameterize ([pc:booleans-as-true/false #f]
-                           [pc:abbreviate-cons-as-list (get-abbreviate-cons-as-list)]
-                           [pretty-print-show-inexactness #f]
-                           [pretty-print-exact-as-decimal #f]
-                           [pc:use-named/undefined-handler
-                            (lambda (x)
-                              (and (get-use-function-output-syntax?)
-                                   (procedure? x)
-                                   (object-name x)))]
-                           [pc:named/undefined-handler
-                            (lambda (x)
-                              (string->symbol
-                               (format "function:~a" (object-name x))))])
-              (thunk)))
-          
-          (define/override (render-value/format value settings port width)
-            (set-printing-parameters
-             settings
-             (lambda ()
-	       (simple-module-based-language-render-value/format value settings port width))))
-          
-          (define/override (render-value value settings port)
-            (set-printing-parameters
-             settings
-             (lambda ()
-               (simple-module-based-language-render-value/format value settings port 'infinity))))
-          
-          (super-new)))
-
-      ;; this inspector should be powerful enough to see
-      ;; any structure defined in the user's namespace
-      (define drscheme-inspector (current-inspector))
-
-      ;; FIXME: brittle, mimics drscheme-secrets
-      ;; as declared in lang/htdp-langs.rkt.
-      ;; Is it even needed for DeinProgramm langs?
-      ;; Only used by htdp/hangman teachpack.
-      (define (ensure-drscheme-secrets-declared drs-namespace)
-        (parameterize ((current-namespace drs-namespace))
-          (define (declare)
-            (eval `(,#'module drscheme-secrets mzscheme
-                     (provide drscheme-inspector)
-                     (define drscheme-inspector ,drscheme-inspector)))
-            (namespace-require ''drscheme-secrets))
-          (with-handlers ([exn:fail? (lambda (e) (declare))])
-            ;; May have been declared by lang/htdp-langs tool, if loaded
-            (dynamic-require ''drscheme-secrets 'drscheme-inspector))
-          (void)))
-
-
-      ;; {
-      ;;   all this copied from collects/drracket/private/language.rkt
-
-      ;; stepper-convert-value : TST settings -> TST 
-     (define (stepper-convert-value value settings)
-        (define ((leave-snips-alone-hook sh) expr basic-convert sub-convert)
-          (if (or (is-a? expr snip%)
-                  ;; FIXME: internal in language.rkt (to-snip-value? expr)
-                  )
-            expr
-            (sh expr basic-convert sub-convert)))
-        ;; mflatt: MINOR HACK - work around temporary
-        ;;         print-convert problems
-        (define (stepper-print-convert v)
-          (or (and (procedure? v) (object-name v))
-              (pc:print-convert v)))
-
-        (case (drscheme:language:simple-settings-printing-style settings)
-          [(write)
-	   (let ((v (convert-explicit value)))
-	     (or (and (procedure? v) (object-name v))
-		 v))]
-          [(current-print) value]
-          [(constructor)
-           (parameterize
-               ([pc:constructor-style-printing #t]
-                [pc:show-sharing
-                 (drscheme:language:simple-settings-show-sharing settings)]
-                [pc:current-print-convert-hook
-                 (leave-snips-alone-hook (pc:current-print-convert-hook))])
-             (stepper-print-convert value))]
-          [(quasiquote)
-           (parameterize
-               ([pc:constructor-style-printing #f]
-                [pc:show-sharing
-                 (drscheme:language:simple-settings-show-sharing settings)]
-                [pc:current-print-convert-hook
-                 (leave-snips-alone-hook (pc:current-print-convert-hook))])
-             (stepper-print-convert value))]
-          [else (error "Internal stepper error: time to resync with simple-module-based-language-convert-value")]))
-
-      ;; set-print-settings ; settings ( -> TST) -> TST
-      (define (set-print-settings language simple-settings thunk)
-        (if (method-in-interface? 'set-printing-parameters (object-interface language))
-          (send language set-printing-parameters simple-settings thunk)
-          ;; assume that the current print-convert context is fine
-          ;; (error 'stepper-tool "language object does not contain set-printing-parameters method")
-          (thunk)))
-
-      ;; simple-module-based-language-render-value/format : TST settings port (union #f (snip% -> void)) (union 'infinity number) -> void
-      (define (simple-module-based-language-render-value/format value settings port width)
-        (if (eq? (drscheme:language:simple-settings-printing-style settings) 'current-print)
-            (parameterize ([current-output-port port])
-              ((current-print) value))
-            (let ([converted-value (simple-module-based-language-convert-value value settings)])
-              (setup-printing-parameters 
-               (lambda ()
-                 (cond
-                   [(drscheme:language:simple-settings-insert-newlines settings)
-                    (if (number? width)
-                        (parameterize ([pretty-print-columns width])
-                          (pretty-print converted-value port))
-                        (pretty-print converted-value port))]
-                   [else
-                    (parameterize ([pretty-print-columns 'infinity])
-                      (pretty-print converted-value port))
-                    (newline port)]))
-               settings
-               width))))
-      
-      ;; setup-printing-parameters : (-> void) -> void
-      (define (setup-printing-parameters thunk settings width)
-        (let ([use-number-snip?
-                   (lambda (x)
-                     (and (number? x)
-                          (exact? x)
-                          (real? x)
-                          (not (integer? x))))])
-          (parameterize (;; these three handlers aren't used, but are set to override the user's settings
-			 [pretty-print-print-line (lambda (line-number op old-line dest-columns) 
-						     (when (and (not (equal? line-number 0))
-								(not (equal? dest-columns 'infinity)))
-						       (newline op))
-						     0)]
-			 [pretty-print-pre-print-hook (lambda (val port) (void))]
-			 [pretty-print-post-print-hook (lambda (val port) (void))]
-			 
-
-			 [pretty-print-columns width]
-                         [pretty-print-size-hook
-                          (lambda (value display? port)
-                            (cond
-			      [(not (port-writes-special? port)) #f]
-                              [(is-a? value snip%) 1]
-                              [(use-number-snip? value) 1]
-                              [(syntax? value) 1]
-                              [(to-snip-value? value) 1]
-                              [else #f]))]
-                         [pretty-print-print-hook
-                          (lambda (value display? port)
-                            (cond
-                              [(is-a? value snip%)
-                               (write-special value port)
-                               1]
-                              [(use-number-snip? value)
-                               (write-special
-                                (case (drscheme:language:simple-settings-fraction-style settings)
-                                  [(mixed-fraction) 
-                                   (number-snip:make-fraction-snip value #f)]
-                                  [(mixed-fraction-e)
-                                   (number-snip:make-fraction-snip value #t)]
-                                  [(repeating-decimal)
-                                   (number-snip:make-repeating-decimal-snip value #f)]
-                                  [(repeating-decimal-e)
-                                   (number-snip:make-repeating-decimal-snip value #t)])
-                                port)
-                               1]
-                              [(syntax? value)
-                               (write-special (render-syntax/snip value) port)]
-                              [else (write-special (value->snip value) port)]))]
-                         [print-graph
-                          ;; only turn on print-graph when using `write' printing 
-                          ;; style because the sharing is being taken care of
-                          ;; by the print-convert sexp construction when using
-                          ;; other printing styles.
-                          (and (eq? (drscheme:language:simple-settings-printing-style settings) 'write)
-                               (drscheme:language:simple-settings-show-sharing settings))])
-            (thunk))))
-
-      ;; DeinProgramm changes in this procedure
-      ;; simple-module-based-language-convert-value : TST settings -> TST
-      (define (simple-module-based-language-convert-value value settings)
-        (case (drscheme:language:simple-settings-printing-style settings)
-          [(write)
-	   ;; THIS IS THE CHANGE
-	   (case (deinprogramm-lang-settings-writing-style settings)
-	     [(explicit) (convert-explicit value)]
-	     [(datum) value])]
-          [(current-print) value]
-          [(constructor)
-           (parameterize ([pc:constructor-style-printing #t]
-                          [pc:show-sharing (drscheme:language:simple-settings-show-sharing settings)]
-			  [pc:current-print-convert-hook (leave-snips-alone-hook (pc:current-print-convert-hook))])
-             (pc:print-convert value))]
-          [(quasiquote)
-           (parameterize ([pc:constructor-style-printing #f]
-                          [pc:show-sharing (drscheme:language:simple-settings-show-sharing settings)]
-			  [pc:current-print-convert-hook (leave-snips-alone-hook (pc:current-print-convert-hook))])
-             (pc:print-convert value))]))
-
-      ;; leave-snips-alone-hook : any? (any? -> printable) any? -> printable
-      (define ((leave-snips-alone-hook sh) expr basic-convert sub-convert)
-	(if (is-a? expr snip%)
-	    expr
-	    (sh expr basic-convert sub-convert)))
-
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;;  snip/value extensions
-      ;;
-      
-      (define to-snips null)
-      (define-struct to-snip (predicate? >value))
-      (define (add-snip-value predicate constructor)
-        (set! to-snips (cons (make-to-snip predicate constructor) to-snips)))
-      
-      (define (value->snip v)
-        (ormap (lambda (to-snip) (and ((to-snip-predicate? to-snip) v)
-                                      ((to-snip->value to-snip) v)))
-               to-snips))
-      (define (to-snip-value? v)
-        (ormap (lambda (to-snip) ((to-snip-predicate? to-snip) v)) to-snips))
-
-
-      ;; }
-
-      ;; sharing/not-config-panel :  boolean boolean parent -> (case-> (-> settings) (settings -> void))
-      ;; constructs the config-panel for a language without a sharing option.
-      (define (sharing/not-config-panel allow-sharing-config? accept-quasiquote? _parent)
-        (let* ([parent (make-object vertical-panel% _parent)]
-               
-               [input-panel (instantiate group-box-panel% ()
-                              (parent parent)
-                              (label (string-constant input-syntax))
-                              (alignment '(left center)))]
-               
-               [output-panel (instantiate group-box-panel% ()
-                               (parent parent)
-                               (label (string-constant output-syntax))
-                               (alignment '(left center)))]
-               
-               [tp-group-box (instantiate group-box-panel% ()
-                               (label (string-constant teachpacks))
-                               (parent parent)
-                               (alignment '(center top)))]
-               [tp-panel (new vertical-panel%
-                              [parent tp-group-box]
-                              [alignment '(center center)]
-                              [stretchable-width #f]
-                              [stretchable-height #f])]
-
-               [case-sensitive (make-object check-box%
-                                 (string-constant case-sensitive-label)
-                                 input-panel
-                                 void)]
-               [output-style (make-object radio-box%
-                               (string-constant output-style-label)
-                               (if accept-quasiquote?
-                                   (list (string-constant constructor-printing-style)
-                                         (string-constant quasiquote-printing-style)
-                                         (string-constant write-printing-style))
-                                   (list (string-constant constructor-printing-style)
-                                         (string-constant write-printing-style)))
-                               output-panel
-                               void)]
-               [writing-style (make-object radio-box%
-					   "write-Ausgabe"
-					   (list "explizit"
-						 "Datum")
-					   output-panel
-					   void)]
-               [fraction-style
-                (make-object radio-box% (string-constant fraction-style)
-                  (list (string-constant use-mixed-fractions)
-                        (string-constant use-repeating-decimals))
-                  output-panel
-                  void)]
-               [show-sharing #f]
-               [insert-newlines (make-object check-box%
-					     (string-constant use-pretty-printer-label)
-					     output-panel
-					     void)]
-	       
-               [tracing (new check-box%
-                             (parent output-panel)
-                             (label (string-constant tracing-enable-tracing))
-                             (callback void))]
-	       
-	       [tps '()])
-          
-          (when allow-sharing-config?
-            (set! show-sharing
-                  (instantiate check-box% ()
-                    (parent output-panel)
-                    (label (string-constant sharing-printing-label))
-                    (callback void))))
-          
-          ;; set the characteristics of the GUI
-          (send _parent set-alignment 'center 'center)
-          (send parent stretchable-height #f)
-          (send parent stretchable-width #f)
-          (send parent set-alignment 'center 'center)
-          
-          (case-lambda
-            [()
-             (make-deinprogramm-lang-settings
-              (send case-sensitive get-value)
-              (if accept-quasiquote?
-                  (case (send output-style get-selection)
-                    [(0) 'constructor]
-                    [(1) 'quasiquote]
-                    [(2) 'write])
-                  (case (send output-style get-selection)
-                    [(0) 'constructor]
-                    [(1) 'write]))
-              (case (send fraction-style get-selection)
-                [(0) 'mixed-fraction]
-                [(1) 'repeating-decimal])
-              (and allow-sharing-config? (send show-sharing get-value))
-              (send insert-newlines get-value)
-              'none
-              (case (send writing-style get-selection)
-                [(0) 'explicit]
-                [(1) 'datum])
-              (send tracing get-value)
-              tps)]
-	    [(settings)
-             (send case-sensitive set-value (drscheme:language:simple-settings-case-sensitive settings))
-             (send output-style set-selection
-		   (if accept-quasiquote?
-		       (case (drscheme:language:simple-settings-printing-style settings)
-			 [(constructor) 0]
-			 [(quasiquote) 1]
-			 [(write) 2]
-			 [(print) 2])
-		       (case (drscheme:language:simple-settings-printing-style settings)
-			 [(constructor) 0]
-			 [(quasiquote) 0]
-			 [(write) 1]
-			 [(print) 1])))
-             (send writing-style set-selection
-                   (case (deinprogramm-lang-settings-writing-style settings)
-                     [(explicit) 0]
-                     [(datum) 1]))
-             (send fraction-style set-selection
-                   (case (drscheme:language:simple-settings-fraction-style settings)
-                     [(mixed-fraction) 0]
-                     [(repeating-decimal) 1]))
-             (when allow-sharing-config?
-               (send show-sharing set-value (drscheme:language:simple-settings-show-sharing settings)))
-             (send insert-newlines set-value 
-                   (drscheme:language:simple-settings-insert-newlines settings))
-             (set! tps (deinprogramm-lang-settings-teachpacks settings))
-             (send tp-panel change-children (lambda (l) '()))
-             (if (null? tps)
-                 (new message%
-                      [parent tp-panel]
-                      [label (string-constant teachpacks-none)])
-                 (for-each
-                  (lambda (tp) (new message% 
-				    [parent tp-panel]
-				    [label (format "~s" tp)]))
-                  tps))
-             (send tracing set-value (deinprogramm-lang-settings-tracing? settings))
-             (void)])))
-      
-      (define simple-deinprogramm-language%
-        (class* drscheme:language:simple-module-based-language% (deinprogramm-language<%>)
-          (init-field sharing-printing
-                      abbreviate-cons-as-list
-                      allow-sharing?
-                      manual
-		      reader-module
-                      (use-function-output-syntax? #f)
-                      (accept-quasiquote? #t)
-                      (read-accept-dot #t) ;; #### should only be this in advanced mode
-                      (style-delta #f))
-          (define/public (get-sharing-printing) sharing-printing)
-          (define/public (get-abbreviate-cons-as-list) abbreviate-cons-as-list)
-          (define/public (get-allow-sharing?) allow-sharing?)
-          (define/public (get-manual) manual)
-          (define/public (get-use-function-output-syntax?) use-function-output-syntax?)
-          (define/public (get-accept-quasiquote?) accept-quasiquote?)
-          (define/public (get-read-accept-dot) read-accept-dot)
-          ;(define/override (get-one-line-summary) one-line-summary)
-          (define/public (get-deinprogramm-style-delta) style-delta)
-          
-          (super-instantiate ()
-            (language-url "http://www.deinprogramm.de/dmda/"))))
-      
-      (define (language-extension %)
-        (class %
-          (inherit get-manual)
-
-          (define/override (extra-repl-information settings port) 
-            (define welcome (drscheme:rep:get-welcome-delta))
-            (define (go str sd)
-              (let* ([s (make-object string-snip% str)]
-                     [sl (editor:get-standard-style-list)]
-                     [std (send sl find-named-style "Standard")]
-                     [style (send sl find-or-create-style std sd)])
-                (send s set-style style)
-                (write-special s port)))
-            
-            (define tps (deinprogramm-lang-settings-teachpacks settings))
-            
-            (unless (null? tps)
-              (go "Teachpack" welcome)
-              (cond
-                [(= 1 (length tps))
-                 (go ": " welcome)
-                 (go (tp-require->str (car tps)) (drscheme:rep:get-dark-green-delta))]
-                [(= 2 (length tps))
-                 (go "s: " welcome)
-                 (go (tp-require->str (car tps)) (drscheme:rep:get-dark-green-delta))
-                 (go " und " welcome)
-                 (go (tp-require->str (cadr tps)) (drscheme:rep:get-dark-green-delta))]
-                [else
-                 (go "s: " welcome)
-                 (go (tp-require->str (car tps)) (drscheme:rep:get-dark-green-delta))
-                 (let loop ([these-tps (cdr tps)])
-                   (cond
-                     [(null? (cdr these-tps))
-                      (go " und " welcome)
-                      (go (tp-require->str (car these-tps)) (drscheme:rep:get-dark-green-delta))]
-                     [else
-                      (go ", " welcome)
-                      (go (tp-require->str (car these-tps)) (drscheme:rep:get-dark-green-delta))
-                      (loop (cdr these-tps))]))])
-              (go "." welcome)
-              (newline port)))
-
-	  (define/private (tp-require->str tp)
-            (match tp
-              [`(lib ,x) 
-               (define m (regexp-match #rx"teachpack/deinprogramm/(.*)$" x))
-               (if m
-                   (list-ref m 1)
-                   (format "~s" tp))]
-              [_ (format "~s" tp)]))
-
-          (inherit get-module get-transformer-module get-init-code
-                   use-namespace-require/copy?)
-          (define/override (create-executable setting parent program-filename)
-            (let ([dist-filename
-		   (drscheme:language:put-executable
-		    parent program-filename
-		    'distribution 
-		    #t
-		    (string-constant save-a-mred-distribution))])
-              (when dist-filename
-                (drscheme:language:create-distribution-for-executable 
-                 dist-filename
-                 #t
-                 (lambda (exe-name)
-                   (create-embedding-executable 
-                    exe-name
-                    #:modules `((#f ,program-filename))
-                    #:cmdline `("-l" 
-                                "scheme/base"
-                                "-e"
-                                ,(format "~s" `(#%require ',(filename->require-symbol program-filename))))
-                    #:src-filter
-                    (lambda (path) (cannot-compile? path))
-                    #:get-extra-imports
-                    (lambda (path cm)
-                      (call-with-input-file path
-                        (lambda (port)
-                          (cond
-                            [(is-wxme-stream? port)
-                             (let-values ([(snip-class-names data-class-names)
-                                           (extract-used-classes port)])
-                               (list*
-                                '(lib "wxme/read.ss")
-                                '(lib "mred/mred.ss")
-                                reader-module
-                                (filter
-                                 values
-                                 (map (lambda (x) (string->lib-path x #t))
-                                      (append
-                                       snip-class-names
-                                       data-class-names)))))]
-                            [else
-                             '()]))))
-                    #:mred? #t))))))
-
-          (define/private (filename->require-symbol fn)
-            (let-values ([(base name dir) (split-path fn)])
-              (string->symbol
-               (path->string
-                (path-replace-suffix name #"")))))
-          
-          (define/private (symbol-append x y)
-            (string->symbol
-             (string-append
-              (symbol->string x)
-              (symbol->string y))))
-          
-          (inherit get-deinprogramm-style-delta)
-          (define/override (get-style-delta)
-            (get-deinprogramm-style-delta))
-          
-          (inherit get-reader set-printing-parameters)
-          
-          (define/override (front-end/complete-program port settings)
-	    (expand-teaching-program port  
-                                     (get-reader)
-                                     (get-module)
-                                     (deinprogramm-lang-settings-teachpacks settings)
-				     '#%deinprogramm))
-
-          (define/override (front-end/interaction port settings)
-            (let ([reader (get-reader)] ;; DeinProgramm addition:
-					;; needed for test boxes; see
-					;; the code in
-					;; collects/drracket/private/language.rkt
-		  [start? #t]
-                  [done? #f])
-              (λ ()
-                (cond
-		  [start?
-		   (set! start? #f)
-		   #'(#%plain-app reset-tests)]
-                  [done? eof]
-                  [else
-                   (let ([ans (reader (object-name port) port)])
-                     (cond
-                       [(eof-object? ans)
-                        (set! done? #t)
-                        #`(test)]
-                       [else
-                        ans]))]))))
-
-          (define/augment (capability-value key)
-            (case key
-              [(drscheme:teachpack-menu-items) deinprogramm-teachpack-callbacks]
-              [(drscheme:special:insert-lambda) #f]
-              [else (inner (drscheme:language:get-capability-default key) 
-                           capability-value
-                           key)]))
-
-          (define deinprogramm-teachpack-callbacks
-            (drscheme:unit:make-teachpack-callbacks
-             (lambda (settings) 
-               (map (lambda (x) (tp-require->str x)) (deinprogramm-lang-settings-teachpacks settings)))
-             (lambda (settings parent) 
-               (define old-tps (deinprogramm-lang-settings-teachpacks settings))
-	       (define tp-dirs (list "deinprogramm"))
-	       (define labels (list (string-constant teachpack-pre-installed)))
-	       (define tp-syms '(deinprogramm-teachpacks))
-               (define-values (tp-to-remove tp-to-add) (get-teachpack-from-user parent tp-dirs labels tp-syms old-tps))
-               (define new-tps (let ([removed (if tp-to-remove
-                                                  (remove tp-to-remove old-tps)
-                                                  old-tps)])
-                                 (if (or (not tp-to-add) (member tp-to-add old-tps))
-                                     removed
-                                     (append removed (list tp-to-add)))))
-
-	       (preferences:set 'drracket:deinprogramm:last-set-teachpacks/multi-lib new-tps)
-	       (make-deinprogramm-lang-settings
-		(drscheme:language:simple-settings-case-sensitive settings)
-		(drscheme:language:simple-settings-printing-style settings)
-		(drscheme:language:simple-settings-fraction-style settings)
-		(drscheme:language:simple-settings-show-sharing settings)
-		(drscheme:language:simple-settings-insert-newlines settings)
-		(drscheme:language:simple-settings-annotations settings)
-		(deinprogramm-lang-settings-writing-style settings)
-		(deinprogramm-lang-settings-tracing? settings)
-		new-tps))
-             (lambda (settings name) 
-               (let ([new-tps (filter (lambda (x) (not (equal? (tp-require->str x) name)))
-                                      (deinprogramm-lang-settings-teachpacks settings))])
-                 (preferences:set 'drracket:deinprogramm:last-set-teachpacks/multi-lib new-tps)
-                 (make-deinprogramm-lang-settings
-                  (drscheme:language:simple-settings-case-sensitive settings)
-                  (drscheme:language:simple-settings-printing-style settings)
-                  (drscheme:language:simple-settings-fraction-style settings)
-                  (drscheme:language:simple-settings-show-sharing settings)
-                  (drscheme:language:simple-settings-insert-newlines settings)
-                  (drscheme:language:simple-settings-annotations settings)
-		  (deinprogramm-lang-settings-writing-style settings)
-                  (deinprogramm-lang-settings-tracing? settings)
-                  new-tps)))
-             (lambda (settings) 
-               (preferences:set 'drracket:deinprogramm:last-set-teachpacks/multi-lib '())
-               (make-deinprogramm-lang-settings
-                (drscheme:language:simple-settings-case-sensitive settings)
-                (drscheme:language:simple-settings-printing-style settings)
-                (drscheme:language:simple-settings-fraction-style settings)
-                (drscheme:language:simple-settings-show-sharing settings)
-                (drscheme:language:simple-settings-insert-newlines settings)
-                (drscheme:language:simple-settings-annotations settings)
-		(deinprogramm-lang-settings-writing-style settings)
-                (deinprogramm-lang-settings-tracing? settings)
-                '()))))
-
-          (inherit-field reader-module)
-          (define/override (get-reader-module) reader-module)
-          (define/override (get-metadata modname settings)
-            (define parsed-tps 
-              (marshall-teachpack-settings
-               (deinprogramm-lang-settings-teachpacks settings)))
-            (string-append
-             ";; Die ersten drei Zeilen dieser Datei wurden von DrRacket eingefügt. Sie enthalten Metadaten\n"
-             ";; über die Sprachebene dieser Datei in einer Form, die DrRacket verarbeiten kann.\n"
-             (format "#reader~s~s\n"
-                     reader-module
-                     `((modname ,modname)
-                       (read-case-sensitive ,(drscheme:language:simple-settings-case-sensitive settings))
-                       (teachpacks ,parsed-tps)
-                       (deinprogramm-settings 
-                        ,(for/vector ([e (in-vector (deinprogramm-lang-settings->vector settings))]
-                                      [i (in-naturals)])
-                           (cond
-                             [(= i deinprogramm-teachpacks-field-index) parsed-tps]
-                             [else e])))))))
-          
-          (inherit default-settings)
-          (define/override (metadata->settings metadata)
-            (let* ([table (metadata->table metadata)] ;; extract the table
-                   [ssv (assoc 'deinprogramm-settings table)])
-              (if ssv
-                  (let ([settings-list (vector->list (cadr ssv))])
-                    (if (equal? (length settings-list)
-                                (procedure-arity make-deinprogramm-lang-settings))
-                        (apply make-deinprogramm-lang-settings 
-                               (for/list ([i (in-naturals)]
-                                          [e (in-list settings-list)])
-                                 (cond
-                                   [(= i deinprogramm-teachpacks-field-index)
-                                    (unmarshall-teachpack-settings e)]
-                                   [else e])))
-                        (default-settings)))
-                  (default-settings))))
-          
-          ;; these are used for the benefit of v5.3.6 and earlier drracket's
-          ;; specifically, those language doesn't work right with teachpack
-          ;; paths of the form (lib "a/b/c.rkt"), but they do with ones of the
-          ;; form (lib "c.rkt" "a" "b"), so we do that conversion here when
-          ;; sending out a file that might go into 5.3.6.
-          
-          (define/private (unmarshall-teachpack-settings obj)
-            (cond
-              [(list? obj)
-               (for/list ([obj (in-list obj)])
-                 (match obj
-                   [`(lib ,(? string? s1) ,(? string? s2) ...)
-                    `(lib ,(apply string-append (add-between (append s2 (list s1)) "/")))]
-                   [else obj]))]
-              [else obj]))
-          
-          (define/private (marshall-teachpack-settings obj)
-            (define (has-slashes? s) (regexp-match? #rx"/" s))
-            (cond
-              [(list? obj) 
-               (for/list ([obj (in-list obj)])
-                 (match obj
-                   [`(lib ,(? (and/c string? has-slashes?) s))
-                    (define split (regexp-split #rx"/" s))
-                    `(lib ,(last split) ,@(reverse (cdr (reverse split))))]
-                   [else obj]))]
-              [else obj]))
-          
-          (define/private (metadata->table metadata)
-            (let ([p (open-input-string metadata)])
-              (regexp-match #rx"\n#reader" p) ;; skip to reader
-              (read p) ;; skip module
-              (read p)))
-          
-          (define/override (get-metadata-lines) 3)
-
-          (super-new)))
-
-      ;; cannot-compile? : path -> boolean
-      ;; returns #t if the file cannot be compiled, #f otherwise
-      (define (cannot-compile? path)
-        (call-with-input-file path
-          (lambda (port) 
-            (let ([ok-to-compile-names 
-                   (map (lambda (x) (format "~s" x))
-                        '(wxtext
-                          (lib "comment-snip.ss" "framework")
-                          (lib "xml-snipclass.ss" "xml")
-                          (lib "scheme-snipclass.ss" "xml")
-			  (lib "test-case-box-snipclass.ss" "test-suite")))])
-              (and (is-wxme-stream? port)
-                   (let-values ([(snip-class-names data-class-names)
-                                 (extract-used-classes port)])
-                     (not (and (andmap
-                                (lambda (used-name) (member used-name ok-to-compile-names))
-                                snip-class-names)
-                               (andmap
-                                (lambda (used-name) (member used-name ok-to-compile-names))
-                                data-class-names)))))))))
-      
-      (define (stepper-settings-language %)
-        (if (implementation? % stepper-language<%>)
-            (class* % (stepper-language<%>)
-              (init-field stepper:supported)
-              (define/override (stepper:supported?) stepper:supported)
-              (define/override (stepper:show-inexactness?) #f)
-              (define/override (stepper:show-consumed-and/or-clauses?) #f)
-              (define/override (stepper:render-to-sexp val settings language-level)
-                (parameterize ([pc:current-print-convert-hook (make-print-convert-hook settings)])
-                  (set-print-settings
-                   language-level
-                   settings
-                   (lambda () 
-                     (stepper-convert-value val settings)))))
-              (super-new))
-            (class %
-              (init stepper:supported)
-              (super-new))))
-
-      (define (debugger-settings-language %)
-        (if (implementation? % debugger-language<%>)
-            (class* % (debugger-language<%>)
-              (init-field [debugger:supported #f])
-              (define/override (debugger:supported?) debugger:supported)
-              (super-new))
-            (class %
-              (init [debugger:supported #f])
-              (super-new))))
-
-      ;; make-print-convert-hook:
-      ;;   simple-settings -> (TST (TST -> TST) (TST -> TST) -> TST)
-      ;; this code copied from various locations in language.rkt and rep.rkt
-      (define (make-print-convert-hook simple-settings)
-	(lambda (exp basic-convert sub-convert)
-	  (cond
-	   [(is-a? exp snip%)
-	    (send exp copy)]
-	   [else (basic-convert exp)])))
-
-      ;; filter/hide-ids : syntax[list] -> listof syntax
-      (define (filter/hide-ids ids)
-        ;; When a `define-values' or `define-syntax' declaration
-        ;; is macro-generated, if the defined name also originates
-        ;; from a macro, then the name is hidden to anything
-        ;; that wasn't generated by the same macro invocation. This
-        ;; hiding relies on renaming at the symbol level, and it's
-        ;; exposed by the fact that `syntax-e' of the identifier 
-        ;; returns a different name than `identifier-binding'.
-        (filter
-         (lambda (id)
-           (let ([ib (identifier-binding id)])
-             ;; ib should always be a 4-elem list, but
-             ;; check, just in case:
-             (or (not (pair? ib)) 
-                 (eq? (syntax-e id)
-                      (cadr ib)))))
-         (syntax->list ids)))
-                 
-      
-      ;                                                               
-      ;                                                               
-      ;                                                               
-      ;                                                               
-      ;                                                               
-      ;                                 ;                             
-      ;    ;;;   ; ;  ; ;   ;;;    ; ; ;;;;  ; ;  ;;;     ;;;    ;;;  
-      ;   ;   ;  ;;   ;;   ;   ;   ;;   ;    ;;  ;   ;   ;   ;  ;   ; 
-      ;  ;    ;  ;    ;   ;     ;  ;    ;    ;       ;  ;      ;    ; 
-      ;  ;;;;;;  ;    ;   ;     ;  ;    ;    ;    ;;;;  ;      ;;;;;; 
-      ;  ;       ;    ;   ;     ;  ;    ;    ;   ;   ;  ;      ;      
-      ;   ;      ;    ;    ;   ;   ;    ;    ;   ;   ;   ;   ;  ;     
-      ;    ;;;;  ;    ;     ;;;    ;     ;;  ;    ;;;;;   ;;;    ;;;; 
-      ;                                                               
-      ;                                                               
-      ;                                                               
-	      
-      (define mf-note
-        (let ([bitmap
-               (make-object bitmap%
-                 (collection-file-path "mf.gif" "icons"))])
-          (and (send bitmap ok?)
-               (make-object image-snip% bitmap))))
-      
-      ;; teaching-languages-error-display-handler : 
-      ;;    (string (union TST exn) -> void) -> string exn -> void
-      ;; adds in the bug icon, if there are contexts to display
-      (define (teaching-languages-error-display-handler msg exn)
-          
-          (if (exn? exn)
-              (display (get-rewriten-error-message exn) (current-error-port))
-              (eprintf "uncaught exception: ~e" exn))
-          (eprintf "\n")
-
-          ;; need to flush here so that error annotations inserted in next line
-          ;; don't get erased if this output were to happen after the insertion
-          (flush-output (current-error-port))
-          
-          (let ([rep (drscheme:rep:current-rep)])
-            (when (and (is-a? rep drscheme:rep:text<%>)
-                       (eq? (send rep get-err-port) (current-error-port)))
-              (let ([to-highlight 
-                     (cond
-                       [(exn:srclocs? exn) 
-                        ((exn:srclocs-accessor exn) exn)]
-                       [(exn? exn) 
-                        (let ([cms (continuation-mark-set->list (exn-continuation-marks exn) teaching-languages-continuation-mark-key)])
-			  (cond
-			   ((not cms) '())
-			   ((findf (lambda (mark)
-				     (and mark
-					  (or (path? (car mark))
-					      (symbol? (car mark)))))
-				   cms)
-			    => (lambda (mark)
-				 (apply (lambda (source line col pos span)
-					  (list (make-srcloc source line col pos span)))
-					mark)))
-			   (else '())))]
-		       [else '()])])
-
-                (parameterize ([current-eventspace drs-eventspace])
-                  (queue-callback
-                   (lambda ()
-                     ;; need to make sure that the user's eventspace is still the same
-                     ;; and still running here?
-                     (send rep highlight-errors to-highlight #f))))))))
-      
-      ;; with-mark : syntax syntax exact-nonnegative-integer -> syntax
-      ;; a member of stacktrace-imports^
-      ;; guarantees that the continuation marks associated with teaching-languages-continuation-mark-key are
-      ;; members of the debug-source type
-      (define (with-mark source-stx expr phase)
-        (let ([source (syntax-source source-stx)]
-              [line (syntax-line source-stx)]
-              [col (syntax-column source-stx)]
-              [start-position (syntax-position source-stx)]
-              [span (syntax-span source-stx)])
-          (if (and (or (symbol? source) (path? source))
-                   (number? start-position)
-                   (number? span))
-              (with-syntax ([expr expr]
-                            [mark (list source line col start-position span)]
-                            [teaching-languages-continuation-mark-key teaching-languages-continuation-mark-key])
-                #`(with-continuation-mark 'teaching-languages-continuation-mark-key
-                    'mark
-                    expr))
-              expr)))
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;;  profiling infrastructure. Not used.
-      ;;
-      
-      (define profile-key (gensym))
-      (define (profiling-enabled) #f)
-      (define (initialize-profile-point . x) (void))
-      (define (register-profile-start . x) #f)
-      (define (register-profile-done . x) (void))
-      
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;;  test coverage
-      ;;
-      
-      ;; WARNING: much code copied from "collects/lang/htdp-langs.rkt"
-      
-      (define test-coverage-enabled (make-parameter #t))
-      (define current-test-coverage-info (make-thread-cell #f))
-      
-      (define (initialize-test-coverage-point expr)
-        (unless (thread-cell-ref current-test-coverage-info)
-          (let ([ht (make-hasheq)])
-            (thread-cell-set! current-test-coverage-info ht)
-            (let ([rep (drscheme:rep:current-rep)])
-              (when rep
-                (parameterize ([current-eventspace drs-eventspace])
-                  (queue-callback
-                   (lambda ()
-                     (let ([on-sd (make-object style-delta%)]
-                           [off-sd (make-object style-delta%)])
-                       (cond
-                         [(preferences:get 'framework:white-on-black?)
-                          (send on-sd set-delta-foreground "white")
-                          (send off-sd set-delta-background "lightblue")
-                          (send off-sd set-delta-foreground "black")]
-                         [else
-                          (send on-sd set-delta-foreground "black")
-                          (send off-sd set-delta-background "lightblue")
-                          (send off-sd set-delta-foreground "black")])
-                       (send rep set-test-coverage-info ht on-sd off-sd #f)))))))))
-        (let ([ht (thread-cell-ref current-test-coverage-info)])
-          (when ht
-            (hash-set! ht expr #;(box #f) (mcons #f #f)))))
-      
-      (define (test-covered expr)
-        (let* ([ht (or (thread-cell-ref current-test-coverage-info)
-                       (error 'deinprogramm-langs
-                              "internal-error: no test-coverage table"))]
-               [v (hash-ref ht expr
-                    (lambda ()
-                      (error 'deinprogramm-langs
-                             "internal-error: expression not found: ~.s"
-                             expr)))])
-          #; (lambda () (set-box! v #t))
-          (with-syntax ([v v]) #'(#%plain-app set-mcar! v #t))))
-      
-      (define-values/invoke-unit et:stacktrace@
-        (import et:stacktrace-imports^) (export (prefix et: et:stacktrace^)))
-
-      ;; add-annotation : boolean (sexp -> value) -> sexp -> value
-      ;; adds debugging and test coverage information to `sexp' and calls `oe'
-      (define (add-annotation tracing? oe)
-        (let ([teaching-language-eval-handler
-               (lambda (exp)
-                 (let* ([is-compiled? (compiled-expression? (if (syntax? exp) (syntax-e exp) exp))]
-                        [annotated
-                         (if is-compiled?
-                             exp
-                             (let* ([et-annotated (et:annotate-top (expand exp) 
-                                                                   (namespace-base-phase))]
-                                    [tr-annotated
-                                     (if tracing?
-                                         (drscheme:tracing:annotate (expand et-annotated))
-                                         et-annotated)])
-                               tr-annotated))])
-                   (oe annotated)))])
-          teaching-language-eval-handler))
-      
-
-      
-;                                                                                                                
-;                                                                                                                
-;                                                                                                                
-;                            ;                   ;   ;                                        ;                  
-;                                                ;   ;                                        ;                  
-;                   ;            ;               ;   ;       ;                           ;    ;                  
-;   ; ;;    ;   ;  ;;;;      ;  ;;;;      ;;;    ;   ;      ;;;;   ;;;     ;; ;    ;;;  ;;;;  ; ;;     ;;;   ; ; 
-;   ;;  ;   ;   ;   ;        ;   ;       ;   ;   ;   ;       ;    ;   ;   ;  ;;   ;   ;  ;    ;;  ;   ;   ;  ;;  
-;   ;    ;  ;   ;   ;        ;   ;           ;   ;   ;       ;   ;     ; ;    ;  ;    ;  ;    ;   ;  ;    ;  ;   
-;   ;    ;  ;   ;   ;        ;   ;        ;;;;   ;   ;       ;   ;     ; ;    ;  ;;;;;;  ;    ;   ;  ;;;;;;  ;   
-;   ;    ;  ;   ;   ;        ;   ;       ;   ;   ;   ;       ;   ;     ; ;    ;  ;       ;    ;   ;  ;       ;   
-;   ;;  ;   ;  ;;   ;        ;   ;       ;   ;   ;   ;       ;    ;   ;   ;  ;;   ;      ;    ;   ;   ;      ;   
-;   ; ;;     ;; ;    ;;      ;    ;;      ;;;;;  ;   ;        ;;   ;;;     ;; ;    ;;;;   ;;  ;   ;    ;;;;  ;   
-;   ;                                                                         ;                                  
-;   ;                                                                    ;    ;                                  
-;   ;                                                                     ;;;;                                   
-      
-      
-      ;; add-deinprogramm-language : (instanceof deinprogramm-language<%>) -> void
-      (define (add-deinprogramm-language o)
-        (drscheme:language-configuration:add-language
-         o
-         #:allow-executable-creation? #t))
-      
-      (define (phase1) (void))
-
-      ;; phase2 : -> void
-      (define (phase2)
-        (define (make-deinprogramm-language% printing-style writing-style)
-	  (debugger-settings-language
-	   (stepper-settings-language
-	    ((drscheme:language:get-default-mixin)
-	     (language-extension
-	      (drscheme:language:module-based-language->language-mixin
-	       (module-based-language-extension
-		printing-style writing-style
-		(drscheme:language:simple-module-based-language->module-based-language-mixin
-		 simple-deinprogramm-language%))))))))
-	  
-        (add-deinprogramm-language
-         (instantiate (make-deinprogramm-language% 'write 'explicit) ()
-	   (module '(lib "deinprogramm/DMdA-beginner.rkt"))
-           (manual #"DMdA-beginner")
-	   (language-position (list (string-constant teaching-languages)
-				    "DeinProgramm" "Die Macht der Abstraktion - Anfänger"))
-	   (language-id "DMdA:beginner")
-           (language-numbers '(-500 -300 3))
-           (sharing-printing #f)
-           (abbreviate-cons-as-list #t)
-           (allow-sharing? #f)
-	   (reader-module '(lib "DMdA-beginner-reader.ss" "deinprogramm"))
-	   (stepper:supported #t)))
-	
-	(add-deinprogramm-language
-         (instantiate (make-deinprogramm-language% 'write 'explicit) ()
-	   (module '(lib "deinprogramm/DMdA-vanilla.rkt"))
-           (manual #"DMdA-vanilla")
-	   (language-position (list (string-constant teaching-languages)
-				    "DeinProgramm" "Die Macht der Abstraktion"))
-	   (language-id "DMdA:vanilla")
-           (language-numbers '(-500 -300 4))
-           (sharing-printing #f)
-           (abbreviate-cons-as-list #t)
-           (allow-sharing? #f)
-	   (reader-module '(lib "DMdA-vanilla-reader.ss" "deinprogramm"))
-	   (stepper:supported #t)))
-
-        (add-deinprogramm-language
-         (instantiate (make-deinprogramm-language% 'write 'explicit) ()
-	   (module '(lib "deinprogramm/DMdA-assignments.rkt"))
-           (manual #"DMdA-assignments")
-	   (language-position (list (string-constant teaching-languages)
-				    "DeinProgramm" "Die Macht der Abstraktion mit Zuweisungen"))
-	   (language-id "DMdA:assignments")
-           (language-numbers '(-500 -300 5))
-           (sharing-printing #t)
-           (abbreviate-cons-as-list #t)
-           (allow-sharing? #t)
-	   (reader-module '(lib "DMdA-assignments-reader.ss" "deinprogramm"))
-	   (stepper:supported #f)
-	   (debugger:supported #t)))
-
-        (add-deinprogramm-language
-         (instantiate (make-deinprogramm-language% 'write 'datum) ()
-	   (module '(lib "deinprogramm/DMdA-advanced.rkt"))
-           (manual #"DMdA-advanced")
-	   (language-position (list (string-constant teaching-languages)
-				    "DeinProgramm" "Die Macht der Abstraktion - fortgeschritten"))
-	   (language-id "DMdA:advanced")
-           (language-numbers '(-500 -300 6))
-           (sharing-printing #t)
-           (abbreviate-cons-as-list #t)
-           (allow-sharing? #t)
-	   (reader-module '(lib "DMdA-advanced-reader.ss" "deinprogramm"))
-	   (stepper:supported #f)
-	   (debugger:supported #t))))))
diff --git a/pkgs/deinprogramm/deinprogramm/image.rkt b/pkgs/deinprogramm/deinprogramm/image.rkt
deleted file mode 100644
index b62d032304..0000000000
--- a/pkgs/deinprogramm/deinprogramm/image.rkt
+++ /dev/null
@@ -1,870 +0,0 @@
-#lang scheme/base
-
-#|
-
-The test suite for this code is in
-collects/tests/deinprogramm/image.rkt
-
-|#
-
-(require (except-in mred
-                    make-color)
-	   mzlib/class
-           mrlib/cache-image-snip
-           mzlib/math
-	   lang/prim
-	   lang/posn
-           lang/private/imageeq
-           htdp/error
-	   deinprogramm/signature/signature-syntax
-	   (only-in deinprogramm/DMdA integer natural))
-
-(provide ; #### -primitives doesn't work for us
-         image?
-	 image-width
-	 image-height
-
-	 empty-image
-
-	 overlay
-	 above
-	 beside
-	 
-	 clip
-	 pad
-
-	 rectangle
-	 circle
-	 ellipse
-	 triangle
-	 line
-	 text
-	 
-	 image-inside?
-	 find-image
-	 
-	 image->color-list
-	 color-list->image
-	 
-	 image->alpha-color-list
-	 alpha-color-list->image
-	 
-	 image-color?
-	 make-color
-	 color-red
-	 color-green
-	 color-blue
-	 color?
-	 make-alpha-color
-	 alpha-color-alpha
-	 alpha-color-red
-	 alpha-color-green
-	 alpha-color-blue
-	 alpha-color?
-
-	 octet rgb-color alpha-rgb-color mode image image-color
-	 h-place v-place h-mode v-mode)
-
-;; ----------------------------------------
-
-(define (color-list? l)
-  (and (list? l) (andmap image-color? l)))
-(define (alpha-color-list? l)
-  (and (list? l) (andmap alpha-color? l)))
-
-(define-struct color (red green blue) #:inspector (make-inspector))
-(define-struct alpha-color (alpha red green blue) #:inspector (make-inspector))
-
-;; ----------------------------------------
-
-(define (check name p? v desc arg-posn) (check-arg name (p? v) desc arg-posn v))
-
-(define (check-coordinate name val arg-posn) (check name finite-real? val "real" arg-posn))
-(define (check-integer-coordinate name val arg-posn) (check name nii? val "integer" arg-posn))
-(define (check-size name val arg-posn) (check name pos-real? val "positive real" arg-posn))
-(define (check-posi-size name val arg-posn) (check name pos-integer? val "positive integer" arg-posn))
-(define (check-size/0 name val arg-posn) (check name nn-real? val "non-negative real" arg-posn))
-(define (check-h-place name val arg-posn)
-  (check name h-place? val
-	 "non-negative exact integer or horizontal alignment position"
-	 arg-posn))
-(define (check-v-place name val arg-posn)
-  (check name v-place? val
-	 "non-negative exact integer or vertical alignment position"
-	 arg-posn))
-(define (check-image name val arg-posn) (check name image? val "image" arg-posn))
-(define (check-image-color name val arg-posn) 
-  (let ([simple-check (lambda (x) (or (string? x) (symbol? x) (color? x)))])
-    (check name simple-check val "image-color" arg-posn)
-    (unless (image-color? val)
-      (error name "~e is not a valid color name" val))))
-(define (check-mode name val arg-posn) (check name mode? val mode-str arg-posn))
-
-(define (pos-real? i) (and (real? i) (positive? i)))
-(define (pos-integer? i) (and (integer? i) (positive? i)))
-(define (nn-real? i) (and (real? i) (or (zero? i) (positive? i))))
-(define (nii? x) (and (integer? x) (not (= x +inf.0)) (not (= x -inf.0))))
-
-(define (finite-real? x) (and (real? x) (not (= x +inf.0)) (not (= x -inf.0))))
-
-(define (check-sizes who w h)
-  (unless (and (< 0 w 10000) (< 0 h 10000))
-    (error (format "cannot make ~a x ~a image" w h))))
-
-(define (mode? x)
-  (member x '(solid "solid" outline "outline")))
-
-(define mode-str "'solid \"solid\" 'outline or \"outline\"")
-
-(define (mode->brush-symbol m)
-  (cond
-   [(member m '(solid "solid"))
-    'solid]
-   [(member m '(outline "outline"))
-    'transparent]))
-
-(define (mode->pen-symbol m)
-  (cond
-   [(member m '(solid "solid")) 'transparent]
-   [(member m '(outline "outline")) 'solid]))
-
-(define (h-place? x)
-  (or (nn-real? x)
-      (h-mode? x)))
-
-(define (v-place? x)
-  (or (nn-real? x)
-      (v-mode? x)))
-
-(define (h-mode? x)
-  (member x '(left "left" right "right" "center")))
-
-(define (v-mode? x)
-  (member x '(top "top" bottom "bottom" center "center")))
-
-(define (make-color% c)
-  (cond
-   [(string? c) (send the-color-database find-color c)]
-   [(symbol? c) (send the-color-database find-color (symbol->string c))]
-   [(color? c) (make-object color%
-			    (color-red c)
-			    (color-green c)
-			    (color-blue c))]
-   [else #f]))
-
-(define (image-color? c) 
-  (cond
-   [(color? c) #t]
-   [(string? c) (and (send the-color-database find-color c) #t)]
-   [(symbol? c) (and (send the-color-database find-color (symbol->string c)) #t)]
-   [else #f]))
-
-(define (image-width a)
-  (check-image 'image-width a "first")
-  (let-values ([(w h) (snip-size a)])
-    (inexact->exact (ceiling w))))
-
-(define (image-height a)
-  (check-image 'image-height a "first")
-  (let-values ([(w h) (snip-size a)])
-    (inexact->exact (ceiling h))))
-
-(define (overlay a b h-place v-place)
-  (overlay-helper 'overlay a b h-place v-place))
-
-(define (overlay-helper name a b h-place v-place)
-  (check-image name a "first")
-  (check-image name b "second")
-  (check-h-place name h-place "third")
-  (check-v-place name v-place "fourth")
-  (let ((dx (h-place->delta-x h-place a b))
-	(dy (v-place->delta-y v-place a b)))
-    (real-overlay name
-		  a
-		  (inexact->exact (floor dx))
-		  (inexact->exact (floor dy))
-		  b)))
-
-(define (h-place->delta-x h-place a b)
-  (cond
-   ((real? h-place) (inexact->exact (floor h-place)))
-   ((member h-place '(left "left")) 0)
-   ((member h-place '(right "right"))
-    (- (image-width a) (image-width b)))
-   ((member h-place '(center "center"))
-    (- (quotient (image-width a) 2)
-       (quotient (image-width b) 2)))))
-
-(define (v-place->delta-y v-place a b)
-  (cond
-   ((real? v-place) (inexact->exact (floor v-place)))
-   ((member v-place '(top "top")) 0)
-   ((member v-place '(bottom "bottom"))
-    (- (image-height a) (image-height b)))
-   ((member v-place '(center "center"))
-    (- (quotient (image-height a) 2)
-       (quotient (image-height b) 2)))))
-
-(define (above a b h-mode)
-  (overlay-helper 'above a b h-mode (image-height a)))
-
-(define (beside a b v-mode)
-  (overlay-helper 'beside a b (image-width a) v-mode))
-
-(define (real-overlay name raw-a delta-x delta-y raw-b)
-  (let ([a (coerce-to-cache-image-snip raw-a)]
-	[b (coerce-to-cache-image-snip raw-b)])
-    (let-values ([(a-w a-h) (snip-size a)]
-		 [(b-w b-h) (snip-size b)])
-      (let* ([left (min 0 delta-x)]
-	     [top (min 0 delta-y)]
-	     [right (max (+ delta-x b-w) a-w)]
-	     [bottom (max (+ delta-y b-h) a-h)]
-	     [new-w (inexact->exact (ceiling (- right left)))]
-	     [new-h (inexact->exact (ceiling (- bottom top)))]
-	     [a-dx (inexact->exact (round (- left)))]
-	     [a-dy (inexact->exact (round (- top)))]
-	     [b-dx (inexact->exact (round (- delta-x left)))]
-	     [b-dy (inexact->exact (round (- delta-y top)))]
-	     [combine (lambda (a-f b-f)
-			(lambda (dc dx dy)
-			  (a-f dc (+ dx a-dx) (+ dy a-dy))
-			  (b-f dc (+ dx b-dx) (+ dy b-dy))))])
-	(check-sizes name new-w new-h)
-	(new cache-image-snip%
-	     [dc-proc (combine (send a get-dc-proc)
-			       (send b get-dc-proc))]
-	     [argb-proc (combine (send a get-argb-proc)
-				 (send b get-argb-proc))]
-	     [width new-w]
-	     [height new-h]
-	     ;; match what image=? expects, so we don't get false negatives
-	     [px (floor (/ new-w 2))]
-	     [py (floor (/ new-h 2))])))))
-
-;; ------------------------------------------------------------
-
-(define (clip raw-img delta-w delta-h width height)
-  (check-image 'clip raw-img "first")
-  (check-size/0 'clip delta-w "second")
-  (check-size/0 'clip delta-h "third")
-  (check-size/0 'clip width "fourth")
-  (check-size/0 'clip height "fifth")
-  (let ((delta-w (inexact->exact (floor delta-w)))
-	(delta-h (inexact->exact (floor delta-h)))
-	(width (inexact->exact (floor width)))
-	(height (inexact->exact (floor height))))
-    (let ([img (coerce-to-cache-image-snip raw-img)])
-      (let-values ([(i-width i-height) (send img get-size)])
-	(let* ([dc-proc (send img get-dc-proc)]
-	       [argb-proc (send img get-argb-proc)])
-	  (new cache-image-snip%
-	       [dc-proc (lambda (dc dx dy)
-			  (let ([clip (send dc get-clipping-region)]
-				[rgn (make-object region% dc)])
-			    (send rgn set-rectangle dx dy width height)
-			    (when clip
-			      (send rgn intersect clip))
-			    (send dc set-clipping-region rgn)
-			    (dc-proc dc (- dx delta-w) (- dy delta-h))
-			    (send dc set-clipping-region clip)))]
-	       [argb-proc (lambda (argb dx dy) (argb-proc argb (- dx delta-w) (- dy delta-h)))]
-	       [width width]
-	       [height height]
-	       ;; match what image=? expects, so we don't get false negatives
-	       [px (floor (/ width 2))] [py (floor (/ height 2))]))))))
-
-(define (pad raw-img left right top bottom)
-  (check-image 'pad raw-img "first")
-  (check-size/0 'pad left "second")
-  (check-size/0 'pad right "third")
-  (check-size/0 'pad top "fourth")
-  (check-size/0 'pad bottom "fifth")
-  (let ((left (inexact->exact (floor left)))
-	(right (inexact->exact (floor right)))
-	(top (inexact->exact (floor top)))
-	(bottom (inexact->exact (floor bottom))))
-    (let ([img (coerce-to-cache-image-snip raw-img)])
-      (let-values ([(i-width i-height) (send img get-size)])
-	(let ((width (+ left i-width right))
-	      (height (+ top i-height bottom)))
-	  (let* ([dc-proc (send img get-dc-proc)]
-		 [argb-proc (send img get-argb-proc)])
-	    (new cache-image-snip%
-		 [dc-proc (lambda (dc dx dy)
-			    (let ([clip (send dc get-clipping-region)]
-				  [rgn (make-object region% dc)])
-			      (send rgn set-rectangle dx dy width height)
-			      (when clip
-				(send rgn intersect clip))
-			      (send dc set-clipping-region rgn)
-			      (dc-proc dc (+ dx left) (+ dy top))
-			      (send dc set-clipping-region clip)))]
-		 [argb-proc (lambda (argb dx dy) (argb-proc argb (+ dx left) (+ dy top)))]
-		 [width width]
-		 [height height]
-		 ;; match what image=? expects, so we don't get false negatives
-		 [px (floor (/ width 2))] [py (floor (/ height 2))])))))))
-
-
-;; ------------------------------------------------------------
-
-;; test what happens when the line moves out of the box.
-(define (line width height pre-x1 pre-y1 pre-x2 pre-y2 color-in)
-  (check-size/0 'line width "first")
-  (check-size/0 'line height "second")
-  (check-coordinate 'line pre-x1 "third")
-  (check-coordinate 'line pre-y1 "fourth")
-  (check-coordinate 'line pre-x2 "fifth")
-  (check-coordinate 'line pre-y2 "sixth")
-  (check-image-color 'line color-in "seventh")
-  (let ((width (inexact->exact (floor width)))
-	(height (inexact->exact (floor height))))
-    (let-values ([(x1 y1 x2 y2)
-		  (if (<= pre-x1 pre-x2)
-		      (values pre-x1 pre-y1 pre-x2 pre-y2)
-		      (values pre-x2 pre-y2 pre-x1 pre-y1))])
-      (define do-draw
-	(lambda (dc dx dy)
-	  (let ([clip (send dc get-clipping-region)]
-		[rgn (make-object region% dc)])
-	    (send rgn set-rectangle dx dy width height)
-	    (when clip
-	      (send rgn intersect clip))
-	    (send dc set-clipping-region rgn)
-	    (send dc draw-line 
-		  (+ x1 dx) (+ y1 dy) (+ x2 dx) (+ y2 dy))
-	    (send dc set-clipping-region clip))))
-
-      (let ([draw-proc 
-	     (make-color-wrapper color-in 'transparent 'solid do-draw)]
-	    [mask-proc
-	     (make-color-wrapper 'black 'transparent 'solid do-draw)])
-	(make-simple-cache-image-snip width height draw-proc mask-proc)))))
-
-(define (text str size color-in)
-  (check 'text string? str "string" "first")
-  (check 'text (lambda (x) (and (integer? x) (<= 1 x 255))) size "integer between 1 and 255" "second")
-  (check-image-color 'text color-in "third")
-  (cond
-    [(string=? str "")
-     (let-values ([(tw th) (get-text-size size "dummyX")])
-       (rectangle 0 th 'solid 'black))]
-    [else
-     (let ([color (make-color% color-in)])
-       (let-values ([(tw th) (get-text-size size str)])
-	 (let ([draw-proc
-		(lambda (txt-color mode dc dx dy)
-		  (let ([old-mode (send dc get-text-mode)]
-			[old-fore (send dc get-text-foreground)]
-			[old-font (send dc get-font)])
-		    (send dc set-text-mode mode)
-		    (send dc set-text-foreground txt-color)
-		    (send dc set-font (get-font size))
-		    (send dc draw-text str dx dy)
-		    (send dc set-text-mode old-mode)
-		    (send dc set-text-foreground old-fore)
-		    (send dc set-font old-font)))])
-	   (new cache-image-snip%
-		[dc-proc (lambda (dc dx dy) (draw-proc color 'transparent dc dx dy))]
-		[argb-proc 
-		 (lambda (argb dx dy)
-		   (let ([bm-color
-			  (build-bitmap
-			   (lambda (dc)
-			     (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-			     (send dc set-brush (send the-brush-list find-or-create-brush color 'solid))
-			     (send dc draw-rectangle 0 0 tw th))
-			   tw
-			   th)]
-			 [bm-mask
-			  (build-bitmap
-			   (lambda (dc)
-			     (draw-proc 
-			      (send the-color-database find-color "black")
-			      'solid dc 0 0))
-			   tw
-			   th)])
-		     (overlay-bitmap argb dx dy bm-color bm-mask)))]
-		[width tw]
-		[height th]
-		;; match what image=? expects, so we don't get false negatives
-		[px (floor (/ tw 2))] [py (floor (/ th 2))]))))]))
-
-(define cached-bdc-for-text-size (make-thread-cell #f))
-(define (get-text-size size string)
-  (unless (thread-cell-ref cached-bdc-for-text-size)
-    (let* ([bm (make-object bitmap% 1 1)]
-	   [dc (make-object bitmap-dc% bm)])
-      (thread-cell-set! cached-bdc-for-text-size dc)))
-  (let ([dc (thread-cell-ref cached-bdc-for-text-size)])
-    (let-values ([(w h _1 _2) (send dc get-text-extent string (get-font size))])
-      (values (inexact->exact (ceiling w)) 
-	      (inexact->exact (ceiling h))))))
-
-(define (get-font size)
-  (send the-font-list find-or-create-font size
-	'default 'normal 'normal #f
-	(case (system-type)
-	  [(macosx) 'partly-smoothed]
-	  [else 'smoothed])))
-
-(define (a-rect/circ do-draw w h color brush pen)
-  (let* ([dc-proc (make-color-wrapper color brush pen do-draw)]
-	 [mask-proc (make-color-wrapper 'black brush pen do-draw)])
-    (make-simple-cache-image-snip w h dc-proc mask-proc)))
-
-(define (rectangle w h mode color)
-  (check-size/0 'rectangle w "first")
-  (check-size/0 'rectangle h "second")
-  (check-mode 'rectangle mode "third")
-  (check-image-color 'rectangle color "fourth")
-  (let ((w (inexact->exact (floor w)))
-	(h (inexact->exact (floor h))))
-    (a-rect/circ (lambda (dc dx dy) (send dc draw-rectangle dx dy w h))
-		 w h color (mode->brush-symbol mode) (mode->pen-symbol mode))))
-
-(define (ellipse w h mode color)
-  (check-size/0 'ellipse w "first")
-  (check-size/0 'ellipse h "second")
-  (check-mode 'ellipse mode "third")
-  (check-image-color 'ellipse color "fourth")
-  (let ((w (inexact->exact (floor w)))
-	(h (inexact->exact (floor h))))
-    (a-rect/circ (lambda (dc dx dy) (send dc draw-ellipse dx dy w h))
-		 w h color (mode->brush-symbol mode) (mode->pen-symbol mode))))
-
-(define (circle r mode color)
-  (check-size/0 'circle r "first")
-  (check-mode 'circle mode "second")
-  (check-image-color 'circle color "third")
-  (let ((r (inexact->exact (floor r))))
-    (a-rect/circ (lambda (dc dx dy) (send dc draw-ellipse dx dy (* 2 r) (* 2 r)))
-		 (* 2 r) (* 2 r) color (mode->brush-symbol mode) (mode->pen-symbol mode))))
-
-(define (triangle size mode color)
-  (check 'triangle
-	 (lambda (x) (and (real? x) (< 2 x 10000)))
-	 size 
-	 "positive real number bigger than 2"
-	 "first")
-  (check-mode 'triangle mode "second")
-  (check-image-color 'triangle color "third")
-  (let* ([size (inexact->exact (floor size))]
-	 [right (- size 1)]
-	 [bottom (inexact->exact (ceiling (* size (sin (* 2/3 pi)))))]
-	 [points (list (make-object point% 0 bottom)
-		       (make-object point% right bottom)
-		       (make-object point% (/ size 2) 0))])
-    (let ([draw (make-color-wrapper
-		 color (mode->brush-symbol mode) 'solid
-		 (lambda (dc dx dy)
-		   (send dc draw-polygon points dx dy)))]
-	  [mask-draw (make-color-wrapper
-		      'black (mode->brush-symbol mode) 'solid
-		      (lambda (dc dx dy)
-			(send dc draw-polygon points dx dy)))]
-	  [w size]
-	  [h (+ bottom 1)])
-      (make-simple-cache-image-snip w h draw mask-draw))))
-
-(define (make-simple-cache-image-snip w h dc-proc mask-proc)
-  (let ([w (inexact->exact (ceiling w))]
-	[h (inexact->exact (ceiling h))])
-    (let ([argb-proc 
-           (if (or (zero? w) (zero? h))
-               void
-	       (lambda (argb-vector dx dy)
-		 (let ([c-bm (build-bitmap (lambda (dc) (dc-proc dc 0 0)) w h)]
-		       [m-bm (build-bitmap (lambda (dc) (mask-proc dc 0 0)) w h)])
-		   (overlay-bitmap argb-vector dx dy c-bm m-bm))))])
-      (new cache-image-snip%
-	   [dc-proc dc-proc]
-	   [argb-proc argb-proc]
-	   [width w]
-	   [height h]
-	   ;; match what image=? expects, so we don't get false negatives
-	   [px (floor (/ w 2))] [py (floor (/ h 2))]))))
-
-(define (make-color-wrapper color-in brush pen rest)
-  (let ([color (make-color% color-in)])
-    (lambda (dc dx dy)
-      (let ([old-brush (send dc get-brush)]
-	    [old-pen (send dc get-pen)])
-	(send dc set-brush (send the-brush-list find-or-create-brush color brush))
-	(send dc set-pen (send the-pen-list find-or-create-pen color 1 pen))
-	(rest dc dx dy)
-	(send dc set-pen old-pen)
-	(send dc set-brush old-brush)))))
-
-;; ------------------------------------------------------------
-
-(define (image-inside? i a)
-  (and (locate-image 'image-inside? 
-		     (coerce-to-cache-image-snip i)
-		     (coerce-to-cache-image-snip a))
-       #t))
-
-(define (find-image i a)
-  (or (locate-image 'find-image 
-		    (coerce-to-cache-image-snip i)
-		    (coerce-to-cache-image-snip a))
-      (error 'find-image
-	     "the second image does not appear within the first image")))
-
-(define (locate-image who i a)
-  (check-image who i "first")
-  (check-image who a "second")
-  (let-values ([(iw ih) (snip-size i)]
-	       [(aw ah) (snip-size a)])
-    (and (iw . >= . aw)
-	 (ih . >= . ah)
-	 (let ([i-argb-vector (argb-vector (send i get-argb))]
-	       [a-argb-vector (argb-vector (send a get-argb))])
-	   (let ([al (let loop ([offset 0])
-		       (cond
-			[(= offset (* ah aw 4)) null]
-			[else (cons (subvector a-argb-vector offset (+ offset (* 4 aw)))
-				    (loop (+ offset (* 4 aw))))]))])
-	     (let yloop ([dy 0])
-	       (and (dy . <= . (- ih ah))
-		    (let xloop ([dx 0])
-		      (if (dx . <= . (- iw aw))
-			  (if (let loop ([al al][dd 0])
-				(or (null? al)
-				    (and (first-in-second?
-					  i-argb-vector 
-					  (car al)
-					  (* 4 (+ (* (+ dy dd) iw) dx)))
-					 (loop (cdr al) (add1 dd)))))
-			      (make-posn dx dy)
-			      (xloop (add1 dx)))
-			  (yloop (add1 dy)))))))))))
-
-(define (subvector orig i j)
-  (let ([v (make-vector (- j i) #f)])
-    (let loop ([x i])
-      (when (< x j)
-	(vector-set! v (- x i) (vector-ref orig x))
-	(loop (+ x 1))))
-    v))
-#|
-(initial inequalities thanks to Matthew (thanks!!))
-
-We know that, for a combination:
-  m3 = (m1+m2-m1*m2) and 
-  b3 = (m1*b1*(1-m2) + m2*b2)/m3
-
-So, we need to figure out what m1 & m2 might have been, 
-given the other values.
-
-Check m3:
-
-   m3 = m2 when m1 = 0
-   m3 = 1 when m1 = 1
-
-   [deriv of m3 with respect to m1 = 1 - m2, which is positive]
-
-    so check that m3 is between m2 and 1
-
-Then check m3*b3:
-
-   b3*m3 = m2*b2  when m1 = 0 or b1 = 0
-   b3*m3 = (1 - m2) + m2*b2 when m1 = b1 = 1
-
-   [deriv with respect to m1 is b1*(1-m2), which is positive]
-   [deriv with respect to b1 is m1*(1-m2), which is positive]
-
-    So check that m3*b3 is between m2*b2 and (1 - m2) + m2*b2
-
-This is all in alphas from 0 to 1 and needs to be from 255 to 0.
-Converting (but using the same names) for the alpha test, we get:
-
-(<= (- 1 (/ m2 255))
-    (- 1 (/ m3 255))
-    1)
-
-sub1 to each:
-
-(<= (- (/ m2 255))
-    (- (/ m3 255))
-    0)
-
-mult by 255:
-
-(<= (- m2)
-    (- m3)
-    0)
-
-negate and flip ineq:
-
-
-(>= m2 m3 0)
-
-flip ineq back:
-
-(<= 0 m3 m2)
-
-
-Here's the original scheme expression for the second check:
-
-(<= (* m2 b2) 
-    (* m3 b3)
-    (+ (- 1 m2) (* m2 b2))
-
-converting from the computer's coordinates, we get:
-
-
-(<= (* (- 1 (/ m2 255)) (- 1 (/ b2 255)))
-    (* (- 1 (/ m3 255)) (- 1 (/ b3 255)))
-    (+ (- 1 (- 1 (/ m2 255)))
-       (* (- 1 (/ m2 255)) (- 1 (/ b2 255)))))
-
-;; multiplying out the binomials:
-
-(<= (+ 1
-       (- (/ m2 255)) 
-       (- (/ b2 255)) 
-       (/ (* m2 b2) (* 255 255)))
-    (+ 1
-       (- (/ m3 255)) 
-       (- (/ b3 255)) 
-       (/ (* m3 b3) (* 255 255)))
-    (+ (- 1 (- 1 (/ m2 255)))
-       (+ 1
-          (- (/ m2 255)) 
-          (- (/ b2 255)) 
-          (/ (* m2 b2) (* 255 255)))))
-
-;; simplifying the last term
-  
-(<= (+ 1
-       (- (/ m2 255)) 
-       (- (/ b2 255)) 
-       (/ (* m2 b2) (* 255 255)))
-    (+ 1
-       (- (/ m3 255)) 
-       (- (/ b3 255)) 
-       (/ (* m3 b3) (* 255 255)))
-    (+ 1
-       (- (/ b2 255)) 
-       (/ (* m2 b2) (* 255 255))))
-  
-;; multiply thru by 255:
-
-(<= (+ 255
-       (- m2) 
-       (- b2) 
-       (* m2 b2 1/255))
-    (+ 255
-       (- m3)
-       (- b3)
-       (* m3 b3 1/255))
-    (+ 255
-       (- b2) 
-       (* m2 b2 1/255)))
-  
-;; subtract out 255 from each:
-
-(<= (+ (- m2) 
-       (- b2) 
-       (* m2 b2 1/255))
-    (+ (- m3)
-       (- b3)
-       (* m3 b3 1/255))
-    (+ (- b2) 
-       (* m2 b2 1/255)))
-
-;; negate them all, and reverse the inequality
-
-(>= (+ m2 b2 (* m2 b2 -1/255))
-    (+ m3 b3 (* m3 b3 -1/255))
-    (+ b2 (* m2 b2 -1/255)))
-
-;; aka
-
-(<= (+ b2 (* m2 b2 -1/255))
-    (+ m3 b3 (* m3 b3 -1/255))
-    (+ m2 b2 (* m2 b2 -1/255)))
-
-|#
-  
-;; in the above, m3 & b3 come from iv
-;; and m2 & b2 come from av
-(define (first-in-second? iv av xd)
-  (let loop ([i (vector-length av)])
-    (or (zero? i)
-	(let ([a (- i 4)]
-	      [r (- i 3)]
-	      [g (- i 2)]
-	      [b (- i 1)])
-	  (let* ([m2 (vector-ref av a)]
-		 [m3 (vector-ref iv (+ xd a))]
-		 [test
-		  (lambda (b2 b3)
-		    (<= (+ b2 (* m2 b2 -1/255))
-			(+ m3 b3 (* m3 b3 -1/255))
-			(+ m2 b2 (* m2 b2 -1/255))))])
-	    (and (<= 0 m3 m2)
-		 (test (vector-ref av r) (vector-ref iv (+ xd r)))
-		 (test (vector-ref av g) (vector-ref iv (+ xd g)))
-		 (test (vector-ref av b) (vector-ref iv (+ xd b)))
-		 (loop (- i 4))))))))
-
-;; ----------------------------------------
-
-(define (image->color-list i-raw)
-  (check-image 'image->color-list i-raw "first")
-  (let* ([cis (coerce-to-cache-image-snip i-raw)]
-         [i (send cis get-bitmap)])
-    (cond
-     [(not i) '()]
-     [else
-      (let* ([iw (send i get-width)]
-	     [ih (send i get-height)]
-	     [new-bitmap (make-object bitmap% iw ih)]
-	     [bdc (make-object bitmap-dc% new-bitmap)])
-	(send bdc clear)
-	(send bdc draw-bitmap i 0 0 'solid 
-	      (send the-color-database find-color "black")
-	      (send i get-loaded-mask))
-	(let ([is (make-bytes (* 4 iw ih))]
-	      [cols (make-vector (* iw ih))])
-	  (send bdc get-argb-pixels 0 0 iw ih is)
-	  (let yloop ([y 0][pos 0])
-	    (unless (= y ih)
-	      (let xloop ([x 0][pos pos])
-		(if (= x iw)
-		    (yloop (add1 y) pos)
-		    (begin
-		      (vector-set! cols (+ x (* y iw))
-				   (make-color (bytes-ref is (+ 1 pos))
-					       (bytes-ref is (+ 2 pos))
-					       (bytes-ref is (+ 3 pos))))
-		      (xloop (add1 x) (+ pos 4)))))))
-	  (send bdc set-bitmap #f)
-	  (vector->list cols)))])))
-
-(define (image->alpha-color-list i)
-  (check-image 'image->alpha-color-list i "first")
-  (let* ([argb (cond
-		[(is-a? i image-snip%) 
-		 (send (coerce-to-cache-image-snip i) get-argb)]
-		[(is-a? i cache-image-snip%) (send i get-argb)])]
-         [v (argb-vector argb)])
-    (let loop ([i (vector-length v)]
-               [a null])
-      (cond
-       [(zero? i) a]
-       [else (loop (- i 4)
-		   (cons (make-alpha-color
-			  (vector-ref v (- i 4))
-			  (vector-ref v (- i 3))
-			  (vector-ref v (- i 2))
-			  (vector-ref v (- i 1)))
-			 a))]))))
-
-(define (color-list->image cl in-w in-h)
-  (check 'color-list->image color-list? cl "list-of-colors" "first")
-  (check-size/0 'color-list->image in-w "second")
-  (check-size/0 'color-list->image in-h "third")
-  (let ([w (inexact->exact in-w)]
-        [h (inexact->exact in-h)])
-    (let ([px (floor (/ w 2))] [py (floor (/ h 2))])
-    
-      (unless (= (* w h) (length cl))
-	(error 'color-list->image
-	       "given width times given height is ~a, but the given color list has ~a items"
-	       (* w h) 
-	       (length cl)))
-    
-      (cond
-       [(or (equal? w 0) (equal? h 0))
-	(rectangle w h 'solid 'black)]
-       [else
-	(unless (and (< 0 w 10000) (< 0 h 10000))
-	  (error 'color-list->image "cannot make ~a x ~a image" w h))
-       
-	(let* ([bm (make-object bitmap% w h)]
-	       [mask-bm (make-object bitmap% w h)]
-	       [dc (make-object bitmap-dc% bm)]
-	       [mask-dc (make-object bitmap-dc% mask-bm)])
-	  (unless (send bm ok?)
-	    (error (format "cannot make ~a x ~a image" w h)))
-	  (let ([is (make-bytes (* 4 w h) 0)]
-		[mask-is (make-bytes (* 4 w h) 0)]
-		[cols (list->vector (map (lambda (x) 
-					     (or (make-color% x)
-						 (error 'color-list->image "color ~e is unknown" x)))
-					 cl))])
-	    (let yloop ([y 0][pos 0])
-	      (unless (= y h)
-		(let xloop ([x 0][pos pos])
-		  (if (= x w)
-		      (yloop (add1 y) pos)
-		      (let* ([col (vector-ref cols (+ x (* y w)))]
-			     [r (pk (send col red))]
-			     [g (pk (send col green))]
-			     [b (pk (send col blue))])
-			(bytes-set! is (+ 1 pos) r)
-			(bytes-set! is (+ 2 pos) g)
-			(bytes-set! is (+ 3 pos) b)
-			(when (= 255 r g b)
-			  (bytes-set! mask-is (+ 1 pos) 255)
-			  (bytes-set! mask-is (+ 2 pos) 255)
-			  (bytes-set! mask-is (+ 3 pos) 255))
-			(xloop (add1 x) (+ pos 4)))))))
-	    (send dc set-argb-pixels 0 0 w h is)
-	    (send mask-dc set-argb-pixels 0 0 w h mask-is))
-	  (send dc set-bitmap #f)
-	  (send mask-dc set-bitmap #f)
-	  (bitmaps->cache-image-snip bm mask-bm px py))]))))
-
-(define (pk col) (min 255 (max 0 col)))
-
-(define (alpha-color-list->image cl in-w in-h)
-  (check 'alpha-color-list->image alpha-color-list? cl "list-of-alpha-colors" "first")
-  (check-size/0 'alpha-color-list->image in-w "second")
-  (check-size/0 'alpha-color-list->image in-h "third")
-  (let ([w (inexact->exact in-w)]
-        [h (inexact->exact in-h)])
-    (let ([px (floor (/ w 2))] [py (floor (/ h 2))])
-      (unless (= (* w h) (length cl))
-	(error 'alpha-color-list->image
-	       "given width times given height is ~a, but the given color list has ~a items"
-	       (* w h) (length cl)))
-      (cond
-       [(or (equal? w 0) (equal? h 0))
-	(rectangle w h 'solid 'black)]
-       [else
-	(unless (and (< 0 w 10000) (< 0 h 10000))
-	  (error 'alpha-color-list->image format "cannot make ~a x ~a image" w h))
-	(let ([index-list (alpha-colors->ent-list cl)])
-	  (argb->cache-image-snip (make-argb (list->vector index-list) w h) px py))]))))
-
-;; alpha-colors->ent-list : (listof alpha-color) -> (listof number)
-(define (alpha-colors->ent-list cl)
-  (let loop ([cl cl])
-    (cond
-     [(null? cl) null]
-     [else 
-      (let ([ac (car cl)])
-	(list* (alpha-color-alpha ac)
-	       (alpha-color-red ac)
-	       (alpha-color-green ac)
-	       (alpha-color-blue ac)
-	       (loop (cdr cl))))])))
-
-(define empty-image
-  (make-simple-cache-image-snip 0 0 void void))
-
-(define octet (signature (combined natural (predicate (lambda (n) (<= n 255))))))
-(define rgb-color (signature (predicate color?)))
-(define alpha-rgb-color (signature (predicate alpha-color?)))
-(define mode (signature (one-of "solid" "outline")))
-(define image (signature (predicate image?)))
-(define image-color (signature (predicate image-color?)))
-(define h-place (signature (mixed integer (one-of "left" "right" "center"))))
-(define v-place (signature (mixed integer (one-of "top" "bottom" "center"))))
-(define h-mode (signature (one-of "left" "right" "center")))
-(define v-mode (signature (one-of "top" "bottom" "center")))
diff --git a/pkgs/deinprogramm/deinprogramm/info.rkt b/pkgs/deinprogramm/deinprogramm/info.rkt
deleted file mode 100644
index f8c974812e..0000000000
--- a/pkgs/deinprogramm/deinprogramm/info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang info
-
-(define name "DeinProgramm")
-
-(define tools '("deinprogramm-langs.rkt"))
-
-(define tool-icons '(("logo-small.png" "deinprogramm")))
-(define tool-names '("DeinProgramm"))
-(define tool-urls '("http://www.deinprogramm.de/dmda/"))
-
-(define compile-omit-paths
-  '("define-record-procedures.scm"
-    "convert-explicit.scm"
-    "line3d.scm"))
-
-(define get-textbook-pls
-  '("textbook-pls-spec.rkt" textbook-pls))
diff --git a/pkgs/deinprogramm/deinprogramm/line3d.rkt b/pkgs/deinprogramm/deinprogramm/line3d.rkt
deleted file mode 100644
index 3e4f7b8330..0000000000
--- a/pkgs/deinprogramm/deinprogramm/line3d.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-(module line3d mzscheme
-  (require "world.rkt"
-           "define-record-procedures.rkt")
-  (require (only "DMdA-vanilla.rkt"
-                 empty make-pair empty?
-                 first rest))
-  (provide make-vec3
-           vec3-x
-           vec3-y
-           vec3-z
-           add-vec3
-           sub-vec3
-           mult-vec3
-           div-vec3
-           dotproduct-vec3
-           normquad-vec3
-           norm-vec3
-           normalize-vec3
-           crossproduct-vec3
-           make-vec4
-           vec4-x
-           vec4-y
-           vec4-z
-           vec4-w
-           add-vec4
-           sub-vec4
-           mult-vec4
-           div-vec4
-           dotproduct-vec4
-           normquad-vec4
-           norm-vec4
-           normalize-vec4
-           expand-vec3
-           make-matrix4x4
-           create-matrix4x4
-           transpose-matrix4x4
-           multiply-matrix-vec4
-           transform-vec3
-           multiply-matrix
-           create-translation-matrix
-           create-rotation-x-matrix
-           create-rotation-y-matrix
-           create-rotation-z-matrix
-           print-vec4
-           print-matrix4x4 
-           create-lookat-matrix
-           create-projection-matrix
-           create-viewport-matrix
-           create-camera-matrix
-           make-line3d
-           line3d-a
-           line3d-b
-           line3d-color
-           create-box
-           transform-primitive-list
-           render-scene
-           )
-
-  (require mzlib/include)
-  (include "line3d.scm"))
diff --git a/pkgs/deinprogramm/deinprogramm/line3d.scm b/pkgs/deinprogramm/deinprogramm/line3d.scm
deleted file mode 100644
index dd729fb59f..0000000000
--- a/pkgs/deinprogramm/deinprogramm/line3d.scm
+++ /dev/null
@@ -1,510 +0,0 @@
-;; ###############################################
-;; ###############################################
-;;
-;;       Mini-3D-Engine
-;;
-;;  3D-Object are represented with line primitives
-;;  
-;;                 Martin Bokeloh, Sebastian Veith
-;; ###############################################
-;; ###############################################
-
-
-;; -----------------------------------
-;; some linear algebra tools
-;; -----------------------------------
-
-;; 3D-vector
-(define-record-procedures vec3
-  make-vec3 vec3?
-  (vec3-x
-   vec3-y
-   vec3-z))
-
-;; return a+b
-;; add-vec3 : vec3 vec3 -> vec3
-(define add-vec3
-  (lambda (a b)
-    (make-vec3
-     (+ (vec3-x a) (vec3-x b))
-     (+ (vec3-y a) (vec3-y b))
-     (+ (vec3-z a) (vec3-z b)))))
-
-;; return a-b
-;; sub-vec3 : vec3 vec3 -> vec3
-(define sub-vec3
-  (lambda (a b)
-    (make-vec3
-     (- (vec3-x a) (vec3-x b))
-     (- (vec3-y a) (vec3-y b))
-     (- (vec3-z a) (vec3-z b)))))
-
-;; return v*s
-;; mult-vec3 : vec3 number -> vec3
-(define mult-vec3
-  (lambda (v s)
-    (make-vec3
-     (* (vec3-x v) s)
-     (* (vec3-y v) s)
-     (* (vec3-z v) s))))
-
-;; return v/s
-;; div-vec3 : vec3 number -> vec3
-(define div-vec3
-  (lambda (v s)
-    (mult-vec3 v (/ 1 s))))
-
-;; return a*b
-;; dotproduct-vec3 : vec3 vec3 -> Number
-(define dotproduct-vec3
-  (lambda (a b)
-    (+
-     (* (vec3-x a) (vec3-x b))
-     (* (vec3-y a) (vec3-y b))
-     (* (vec3-z a) (vec3-z b)))))
-
-;; compute quadratic euclidian norm
-;; normquad-vec3 : vec3 -> Number
-(define normquad-vec3
-  (lambda (a)
-    (+
-     (* (vec3-x a) (vec3-x a))
-     (* (vec3-y a) (vec3-y a))
-     (* (vec3-z a) (vec3-z a)))))
-
-;; compute euclidian norm
-;; norm-vec3 : vec3 -> Number
-(define norm-vec3
-  (lambda (a)
-    (sqrt (normquad-vec3 a))))
-
-;; normalize vector
-;; normalize-vec3 : vec3 -> vec3
-(define normalize-vec3
-  (lambda (a)
-    (div-vec3 a (norm-vec3 a))))
-
-;; cross product (computes a vector perpendicular to both input vectors)
-;; crossproduct-vec3 : vec3 vec3 -> vec3
-(define crossproduct-vec3
-  (lambda (a b)
-    (make-vec3
-     (- (* (vec3-y a) (vec3-z b)) (* (vec3-z a) (vec3-y b)))
-     (- (* (vec3-z a) (vec3-x b)) (* (vec3-x a) (vec3-z b)))
-     (- (* (vec3-x a) (vec3-y b)) (* (vec3-y a) (vec3-x b))))))
-
-;; 4D-vector
-(define-record-procedures vec4
-  make-vec4 vec4?
-  (vec4-x
-   vec4-y
-   vec4-z
-   vec4-w))
-
-;; expands a 3d-vector to a 4d-vector (v,s)
-;; expand-vec3 : vec3 number -> vec4
-(define expand-vec3
-  (lambda (v s)
-    (make-vec4 (vec3-x v) (vec3-y v) (vec3-z v) s)))
-
-;; return a+b
-;; add-vec4 : vec4 vec4 -> vec4
-(define add-vec4
-  (lambda (a b)
-    (make-vec4
-     (+ (vec4-x a) (vec4-x b))
-     (+ (vec4-y a) (vec4-y b))
-     (+ (vec4-z a) (vec4-z b))
-     (+ (vec4-w a) (vec4-w b)))))
-
-;; return a-b
-;; sub-vec4 : vec4 vec4 -> vec4
-(define sub-vec4
-  (lambda (a b)
-    (make-vec4
-     (- (vec4-x a) (vec4-x b))
-     (- (vec4-y a) (vec4-y b))
-     (- (vec4-z a) (vec4-z b))
-     (- (vec4-w a) (vec4-w b)))))
-
-;; return v*s
-;; mult-vec4 : vec4 number -> vec4
-(define mult-vec4
-  (lambda (v s)
-    (make-vec4
-     (* (vec4-x v) s)
-     (* (vec4-y v) s)
-     (* (vec4-z v) s)
-     (* (vec4-w v) s))))
-
-;; return v/s
-;; div-vec4 : vec4 number -> vec4
-(define div-vec4
-  (lambda (v s)
-    (mult-vec4 v (/ 1 s))))
-
-;; return a*b
-;; dotproduct-vec4 : vec4 vec4 -> Number
-(define dotproduct-vec4
-  (lambda (a b)
-    (+
-     (* (vec4-x a) (vec4-x b))
-     (* (vec4-y a) (vec4-y b))
-     (* (vec4-z a) (vec4-z b))
-     (* (vec4-w a) (vec4-w b)))))
-
-;; compute quadratic euclidian norm
-;; normquad-vec4 : vec4 -> Number
-(define normquad-vec4
-  (lambda (a)
-    (+
-     (* (vec4-x a) (vec4-x a))
-     (* (vec4-y a) (vec4-y a))
-     (* (vec4-z a) (vec4-z a))
-     (* (vec4-w a) (vec4-w a)))))
-
-;; compute euclidian norm
-;; norm-vec4 : vec4 -> Number
-(define norm-vec4
-  (lambda (a)
-    (sqrt (normquad-vec4 a))))
-
-;; normalize vector
-;; normalize-vec4 : vec4 -> vec4
-(define normalize-vec4
-  (lambda (a)
-    (/ a (norm-vec4 a))))
-
-;; 4x4 matrix (implemented with 4 row vectors; vec4)
-(define-record-procedures matrix4x4
-  make-matrix4x4 matrix4x4?
-  (matrix4x4-1
-   matrix4x4-2
-   matrix4x4-3
-   matrix4x4-4))
-
-;; create 4x4 from 4 3d-vectors
-;; create-matrix4x4 : vec3 vec3 vec3 vec3 -> matrix4x4
-(define create-matrix4x4
-  (lambda (v1 v2 v3 v4)
-    (make-matrix4x4
-     (expand-vec3 v1 0 )
-     (expand-vec3 v2 0 )
-     (expand-vec3 v3 0 )
-     (expand-vec3 v4 1 ))))
-
-;; return a^T
-;; transpose-matrix4x4 : matrix4x4 -> matrix4x4
-(define transpose-matrix4x4 
-  (lambda (a)
-    (make-matrix4x4
-     (make-vec4 (vec4-x (matrix4x4-1 a))
-                (vec4-x (matrix4x4-2 a))
-                (vec4-x (matrix4x4-3 a))
-                (vec4-x (matrix4x4-4 a)))
-     (make-vec4 (vec4-y (matrix4x4-1 a))
-                (vec4-y (matrix4x4-2 a))
-                (vec4-y (matrix4x4-3 a))
-                (vec4-y (matrix4x4-4 a)))
-     (make-vec4 (vec4-z (matrix4x4-1 a))
-                (vec4-z (matrix4x4-2 a))
-                (vec4-z (matrix4x4-3 a))
-                (vec4-z (matrix4x4-4 a)))
-     (make-vec4 (vec4-w (matrix4x4-1 a))
-                (vec4-w (matrix4x4-2 a))
-                (vec4-w (matrix4x4-3 a))
-                (vec4-w (matrix4x4-4 a))))))
-
-;; multiply 4x4 matrix with vec4
-;; multiply-matrix-vec4 : matrix4x4 vec4 -> vec4
-(define multiply-matrix-vec4
-  (lambda (m v)
-    (make-vec4 (dotproduct-vec4 (matrix4x4-1 m) v)
-               (dotproduct-vec4 (matrix4x4-2 m) v)
-               (dotproduct-vec4 (matrix4x4-3 m) v)
-               (dotproduct-vec4 (matrix4x4-4 m) v))))
-
-;; multiply homogenous matrix with (vec3,1) and project onto plane w=1
-;; transform-vec3 : matrix4x4 vec3 -> vec3
-(define transform-vec3
-  (lambda (m v)
-    (let ((v4 (make-vec4 (vec3-x v) (vec3-y v) (vec3-z v) 1)))
-      (div-vec3 (make-vec3 (dotproduct-vec4 (matrix4x4-1 m) v4)
-                           (dotproduct-vec4 (matrix4x4-2 m) v4)
-                           (dotproduct-vec4 (matrix4x4-3 m) v4))
-                (dotproduct-vec4 (matrix4x4-4 m) v4)))))
-
-
-;; return a*b
-;; multiply-matrix : matrix4x4 matrix4x4 -> matrix4x4
-(define multiply-matrix
-  (lambda (a b)
-    (let ( (b^T (transpose-matrix4x4 b)) )
-      (make-matrix4x4
-       (make-vec4 (dotproduct-vec4 (matrix4x4-1 a) (matrix4x4-1 b^T))
-                  (dotproduct-vec4 (matrix4x4-1 a) (matrix4x4-2 b^T))
-                  (dotproduct-vec4 (matrix4x4-1 a) (matrix4x4-3 b^T))
-                  (dotproduct-vec4 (matrix4x4-1 a) (matrix4x4-4 b^T)))
-       (make-vec4 (dotproduct-vec4 (matrix4x4-2 a) (matrix4x4-1 b^T))
-                  (dotproduct-vec4 (matrix4x4-2 a) (matrix4x4-2 b^T))
-                  (dotproduct-vec4 (matrix4x4-2 a) (matrix4x4-3 b^T))
-                  (dotproduct-vec4 (matrix4x4-2 a) (matrix4x4-4 b^T)))
-       (make-vec4 (dotproduct-vec4 (matrix4x4-3 a) (matrix4x4-1 b^T))
-                  (dotproduct-vec4 (matrix4x4-3 a) (matrix4x4-2 b^T))
-                  (dotproduct-vec4 (matrix4x4-3 a) (matrix4x4-3 b^T))
-                  (dotproduct-vec4 (matrix4x4-3 a) (matrix4x4-4 b^T)))
-       (make-vec4 (dotproduct-vec4 (matrix4x4-4 a) (matrix4x4-1 b^T))
-                  (dotproduct-vec4 (matrix4x4-4 a) (matrix4x4-2 b^T))
-                  (dotproduct-vec4 (matrix4x4-4 a) (matrix4x4-3 b^T))
-                  (dotproduct-vec4 (matrix4x4-4 a) (matrix4x4-4 b^T)))))))
-
-;; create a matrix which translates (moves) by a 3d-vector
-;; create-translation-matrix: vec3 -> matrix4x4
-(define create-translation-matrix
-  (lambda (translation)
-    (make-matrix4x4
-     (make-vec4 1 0 0 (vec3-x translation))
-     (make-vec4 0 1 0 (vec3-y translation))
-     (make-vec4 0 0 1 (vec3-z translation))
-     (make-vec4 0 0 0 1))))
-
-;; create a matrix which rotates around the x-axis
-;; create-rotation-x-matrix: Number -> matrix4x4
-(define create-rotation-x-matrix
-  (lambda (angle)
-    (make-matrix4x4
-     (make-vec4 1 0 0 0)
-     (make-vec4 0 (cos angle) (sin angle) 0)
-     (make-vec4 0 (-(sin angle)) (cos angle) 0)
-     (make-vec4 0 0 0 1))))
-
-;; create a matrix which rotates around the y-axis
-;; create-rotation-y-matrix: Number -> matrix4x4
-(define create-rotation-y-matrix
-  (lambda (angle)
-    (make-matrix4x4
-     (make-vec4 (cos angle) 0 (sin angle) 0)
-     (make-vec4 0 1 0 0)
-     (make-vec4 (-(sin angle)) 0 (cos angle) 0)
-     (make-vec4 0 0 0 1))))
-
-;; create a matrix which rotates around the z-axis
-;; create-rotation-z-matrix: Number -> matrix4x4
-(define create-rotation-z-matrix
-  (lambda (angle)
-    (make-matrix4x4
-     (make-vec4 (cos angle) (sin angle) 0 0)
-     (make-vec4 (-(sin angle)) (cos angle) 0 0)
-     (make-vec4 0 0 1 0)
-     (make-vec4 0 0 0 1))))
-
-(define PI 3.14159265)
-(define PI/2 (/ PI 2))
-(define PI/4 (/ PI 4))
-
-; output a vector
-; print-vec4 : vec4 -> string
-(define print-vec4
-  (lambda (v)
-    (string-append (number->string (vec4-x v)) "\t"
-                   (number->string (vec4-y v)) "\t"
-                   (number->string (vec4-z v)) "\t"
-                   (number->string (vec4-w v)))))
-
-; output a matrix
-; print-matrix4x4 : matrix4x4 -> string
-(define print-matrix4x4 
-  (lambda (m)
-    (let ((m^T (transpose-matrix4x4 m)))
-      (string-append (print-vec4 (matrix4x4-1 m^T)) "\n"
-                     (print-vec4 (matrix4x4-2 m^T)) "\n"
-                     (print-vec4 (matrix4x4-3 m^T)) "\n"
-                     (print-vec4 (matrix4x4-4 m^T)) "\n"))))
-
-;; ---------------------------------------------
-;; camera and projection
-;; ---------------------------------------------
-
-; create a look-at modelview matrix
-; M = (v1 v2 v3 v4)
-;     (0  0  0  1 )
-; v1 = (lookat - position) x upvector
-; v2 = ((lookat - position) x upvector) x (lookat - position)
-; v3 = (lookat - position)
-; v4 = (0 0 0)
-; create-lookat-matrix : vec3 vec3 vec3 -> matrix4x4
-(define create-lookat-matrix
-  (lambda (position lookat upvector)
-    (let* ((viewdirection (normalize-vec3 (sub-vec3 position lookat)))
-           (normed-upvector (normalize-vec3 upvector))
-           (rightvector (crossproduct-vec3 viewdirection normed-upvector)))
-      (multiply-matrix
-       (create-matrix4x4
-        (normalize-vec3 rightvector)
-        (normalize-vec3 (crossproduct-vec3 rightvector viewdirection))
-        viewdirection
-        (make-vec3 0 0 0))
-       (create-translation-matrix (mult-vec3 position -1))))))
-
-; projection with a specified vertical viewing angle
-; create-projection-matrix :  number -> matrix4x4
-(define create-projection-matrix
-  (lambda (vertical-fov/2)
-    (let ((f (/ (cos vertical-fov/2) (sin vertical-fov/2))))
-      (make-matrix4x4
-       (make-vec4 f 0 0 0)
-       (make-vec4 0 f 0 0)
-       (make-vec4 0 0 0 0)
-       (make-vec4 0 0 1 0)))))
-
-; transforms camera-space into image-space
-; create-viewport-matrix : number number -> number
-(define create-viewport-matrix
-  (lambda (screenwidth screenheight)
-    (let ((screenwidth/2 (/ screenwidth 2))
-          (screenheight/2 (/ screenheight 2)))
-      (make-matrix4x4
-       (make-vec4 screenwidth/2 0 0 screenwidth/2)
-       (make-vec4 0 screenheight/2 0 screenheight/2)
-       (make-vec4 0 0 1/2 0)
-       (make-vec4 0 0 0 1)))))
-
-; create a complete camera matrix
-; create-camera-matrix : 
-(define create-camera-matrix
-  (lambda (position lookat vertical-fov screenwidth screenheight)
-    (multiply-matrix
-     (multiply-matrix
-      (create-viewport-matrix screenwidth screenheight)
-      (create-projection-matrix (* (/ vertical-fov 360) PI)))
-     (create-lookat-matrix position lookat (make-vec3 0 1 0)))))
-
-;; ----------------------------------------------
-;; scene
-;; ----------------------------------------------
-
-; defines a colored line between two points (3D)
-(define-record-procedures line3d
-  make-line3d line3d?
-  (line3d-a line3d-b line3d-color))
-
-; creates a box centered at (0,0,0) with the given dimensions.
-; create-box : number number number color -> list(line3d)
-(define create-box
-  (lambda (width height depth color)
-    (let ((corner1 (make-vec3 (- width) (- height) (- depth)))
-          (corner2 (make-vec3    width  (- height) (- depth)))
-          (corner3 (make-vec3    width     height  (- depth)))
-          (corner4 (make-vec3 (- width)    height  (- depth)))
-          (corner5 (make-vec3 (- width) (- height)    depth))
-          (corner6 (make-vec3    width  (- height)    depth))
-          (corner7 (make-vec3    width     height     depth))
-          (corner8 (make-vec3 (- width)    height     depth)))
-      (list
-       (make-line3d corner1 corner2 color)
-       (make-line3d corner2 corner3 color)
-       (make-line3d corner3 corner4 color)
-       (make-line3d corner4 corner1 color)
-       (make-line3d corner5 corner6 color)
-       (make-line3d corner6 corner7 color)
-       (make-line3d corner7 corner8 color)
-       (make-line3d corner8 corner5 color)
-       (make-line3d corner1 corner5 color)
-       (make-line3d corner1 corner5 color)
-       (make-line3d corner2 corner6 color)
-       (make-line3d corner3 corner7 color)
-       (make-line3d corner4 corner8 color)))))
-
-; apply transformation to every given line
-; transform-primitive-list: list(line3d) matrix4x4 -> list(line3d)
-(define transform-primitive-list
-  (lambda (l mat)
-    (cond
-      ((pair? l) (transform-primitive-list-helper l mat empty))
-      ((empty? l) empty))))
-
-; transform-primitive-list-helper : list(line3d) matrix4x4 list(line3d) -> list(line3d)
-(define transform-primitive-list-helper
-  (lambda (l mat result)
-    (cond
-      ((pair? l)
-       (transform-primitive-list-helper (rest l) mat 
-                                        (make-pair (make-line3d (transform-vec3 mat (line3d-a (first l)))
-                                                                (transform-vec3 mat (line3d-b (first l)))
-                                                                (line3d-color (first l))) result)))
-      ((empty? l) result))))
-
-;; ---------------------------------------------
-;; rendering
-;; ---------------------------------------------
-
-; w-clip epsilon
-(define clip-epsilon -0.1)
-
-;; clip line on plane w=clip-epsilon
-;; clipline: vec4 vec4 color -> image
-(define clipline
-  (lambda (screenWidth screenHeight inside outside color)
-    (let* ((delta-vec (sub-vec4 outside inside))
-           (f (/ (- clip-epsilon (vec4-w inside)) (- (vec4-w outside) (vec4-w inside))))
-           ; compute intersection with clipping plane
-           (clipped-point (add-vec4 inside (mult-vec4 delta-vec f))) 
-           ; project points by normalising to w=1
-           (inside-projected (div-vec4 inside (vec4-w inside)))
-           (clipped-point-projected (div-vec4 clipped-point (vec4-w clipped-point))))
-      (line screenWidth screenHeight (vec4-x inside-projected) (vec4-y inside-projected)
-            (vec4-x clipped-point-projected) (vec4-y clipped-point-projected) color))))
-
-
-; render line with clipping
-; render-clipped-line3d : N N vec4 vec4 matrix4x4 -> image
-(define render-clipped-line3d
-  (lambda (screenWidth screenHeight l camera-matrix)
-    (let* ((point-a (line3d-a l))
-           (point-b (line3d-b l))
-           (point-a-transformed (multiply-matrix-vec4 camera-matrix 
-                                                      (make-vec4 (vec3-x point-a) (vec3-y point-a) (vec3-z point-a) 1)))
-           (point-b-transformed (multiply-matrix-vec4 camera-matrix 
-                                                      (make-vec4 (vec3-x point-b) (vec3-y point-b) (vec3-z point-b) 1)))
-           (projected-point1 (transform-vec3 camera-matrix (line3d-a l)))
-           (projected-point2 (transform-vec3 camera-matrix (line3d-b l))))
-      (cond
-        ((and (< (vec4-w point-a-transformed) clip-epsilon)
-              (< (vec4-w point-b-transformed) clip-epsilon))
-         (line screenWidth screenHeight (vec3-x projected-point1) (vec3-y projected-point1)
-               (vec3-x projected-point2) (vec3-y projected-point2) (line3d-color l)))
-        ((and (>= (vec4-w point-a-transformed) clip-epsilon)
-              (< (vec4-w point-b-transformed) clip-epsilon))
-         (clipline screenWidth screenHeight point-b-transformed point-a-transformed (line3d-color l)))
-        ((and (>= (vec4-w point-b-transformed) clip-epsilon)
-              (< (vec4-w point-a-transformed) clip-epsilon))
-         (clipline screenWidth screenHeight point-a-transformed point-b-transformed (line3d-color l)))
-        (else (line screenWidth screenHeight -1 0 0 0 (line3d-color l)))))))
-
-; render line without clipping (not used anymore)
-; render-line3d : N N line3d matrix4x4 -> image
-(define render-line3d
-  (lambda (screenWidth screenHeight l camera-matrix)
-    (let ((projected-point1 (transform-vec3 camera-matrix (line3d-a l)))
-          (projected-point2 (transform-vec3 camera-matrix (line3d-b l))))
-      (line screenWidth screenHeight (vec3-x projected-point1) (vec3-y projected-point1)
-            (vec3-x projected-point2) (vec3-y projected-point2) (line3d-color l)))))
-
-; render scene into an image
-; render-scene: N N list(line3d) matrix4x4 -> image
-(define render-scene
-  (lambda (screenWidth screenHeight scene camera-matrix)
-    (cond
-      ((empty? scene)(line screenWidth screenHeight 0 0 0 0 "white"))
-      ((pair? scene)
-       (render-scene-helper screenWidth screenHeight (rest scene) camera-matrix 
-                            (render-clipped-line3d screenWidth screenHeight (first scene) camera-matrix))))))
-
-; render-scene-helper: list(line3d) matrix4x4 image -> image
-(define render-scene-helper
-  (lambda (screenWidth screenHeight scene camera-matrix screen)
-    (cond
-      ((empty? scene) screen)
-      ((pair? scene) (render-scene-helper screenWidth screenHeight (rest scene) camera-matrix 
-                                          (overlay screen
-                                                   (render-clipped-line3d screenWidth screenHeight (first scene) camera-matrix) 0 0))))))
diff --git a/pkgs/deinprogramm/deinprogramm/logo-small.png b/pkgs/deinprogramm/deinprogramm/logo-small.png
deleted file mode 100644
index d5ed30162a..0000000000
Binary files a/pkgs/deinprogramm/deinprogramm/logo-small.png and /dev/null differ
diff --git a/pkgs/deinprogramm/deinprogramm/logo-small@2x.png b/pkgs/deinprogramm/deinprogramm/logo-small@2x.png
deleted file mode 100644
index 35fb52f063..0000000000
Binary files a/pkgs/deinprogramm/deinprogramm/logo-small@2x.png and /dev/null differ
diff --git a/pkgs/deinprogramm/deinprogramm/quickcheck/info.rkt b/pkgs/deinprogramm/deinprogramm/quickcheck/info.rkt
deleted file mode 100644
index 5913c48491..0000000000
--- a/pkgs/deinprogramm/deinprogramm/quickcheck/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-(module info info
-  (define name "DeinProgramm - QuickCheck")
-
-  (define compile-omit-paths
-    '("examples.scm"
-      "packages.scm"
-      "quickcheck-test.scm"
-      "quickcheck.scm"
-      "random.scm")))
-
-
-  
diff --git a/pkgs/deinprogramm/deinprogramm/quickcheck/quickcheck.rkt b/pkgs/deinprogramm/deinprogramm/quickcheck/quickcheck.rkt
deleted file mode 100644
index 7f4338b9d4..0000000000
--- a/pkgs/deinprogramm/deinprogramm/quickcheck/quickcheck.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang scheme/base
-(provide check check-results make-config
-	 quickcheck quickcheck-results
-	 check-result? result-arguments-list
-	 choose-integer choose-real
-	 choose-ascii-char choose-ascii-letter choose-printable-ascii-char choose-char
-	 choose-list choose-vector choose-string choose-symbol
-	 generator-unit generator-bind generator-sequence
-	 sized choose-one-of choose-mixed choose-with-frequencies
-	 arbitrary-boolean arbitrary-char arbitrary-ascii-char arbitrary-printable-ascii-char
-	 arbitrary-integer arbitrary-natural arbitrary-rational arbitrary-real
-	 arbitrary-mixed arbitrary-one-of
-	 arbitrary-pair
-	 arbitrary-list
-	 arbitrary-vector
-	 arbitrary-tuple arbitrary-record
-	 arbitrary-string
-	 arbitrary-ascii-string arbitrary-printable-ascii-string
-	 arbitrary-symbol
-	 arbitrary-procedure
-	 property
-	 property?
-	 ==>
-	 label
-	 classify
-	 trivial
-	 collect
-	 )
-(require srfi/9
-	 racket/promise
-	 "random.rkt")
-
-(provide exn:assertion-violation?
-	 exn:assertion-violation-who
-	 exn:assertion-violation-irritants)
-
-(define-struct (exn:assertion-violation exn:fail) (who irritants) #:transparent)
-
-; exceptions
-(define (assertion-violation who msg . irritants)
-  (raise (make-exn:assertion-violation msg (current-continuation-marks) who irritants)))
-
-; extended-ports
-(define make-string-output-port open-output-string)
-(define string-output-port-output get-output-string)
-
-; sorting
-(define (list-sort < lis)
-  (sort lis <))
-
-(require scheme/include)
-(include "quickcheck.scm")
diff --git a/pkgs/deinprogramm/deinprogramm/quickcheck/quickcheck.scm b/pkgs/deinprogramm/deinprogramm/quickcheck/quickcheck.scm
deleted file mode 100644
index 8879b12e93..0000000000
--- a/pkgs/deinprogramm/deinprogramm/quickcheck/quickcheck.scm
+++ /dev/null
@@ -1,691 +0,0 @@
-; QuickCheck clone
-
-(define-record-type :generator
-  (make-generator proc)
-  generator?
-  ;; int(size) random-generator -> val
-  (proc generator-proc))
-
-; for transliteration from Haskell
-(define (return val)
-  (make-generator
-   (lambda (size rgen)
-     val)))
-
-(define (>>= m1 k)
-  (let ((proc1 (generator-proc m1)))
-    (make-generator
-     (lambda (size rgen)
-       (call-with-values
-	   (lambda ()
-	     (random-generator-split rgen))
-	 (lambda (rgen1 rgen2)
-	   (let ((gen (k (proc1 size rgen1))))
-	     ((generator-proc gen) size rgen2))))))))
-
-(define (sequence gens)
-  (if (null? gens)
-      (return '())
-      (>>= (car gens)
-	   (lambda (val)
-	     (>>= (sequence (cdr gens))
-		  (lambda (rest)
-		    (return (cons val rest))))))))
-
-; for export
-(define generator-unit return)
-(define generator-bind >>=)
-(define generator-sequence sequence)
-
-(define (lift->generator proc . gens)
-  (>>= (sequence gens)
-       (lambda (vals)
-	 (return (apply proc vals)))))
-
-; [lower, upper]
-(define (choose-integer lower upper)
-  (make-generator
-   (lambda (size rgen)
-     (call-with-values
-	 (lambda ()
-	   (random-integer rgen lower upper))
-       (lambda (n _)
-	 n)))))
-
-(define (choose-real lower upper)
-  (make-generator
-   (lambda (size rgen)
-     (call-with-values
-	 (lambda ()
-	   (random-real rgen lower upper))
-       (lambda (n _)
-	 n)))))
-
-(define choose-ascii-char
-  (lift->generator integer->char (choose-integer 0 127)))
-
-(define choose-ascii-letter
-  (lift->generator (lambda (i)
-		     (string-ref
-		      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" i))
-		   (choose-integer 0 51)))
-
-(define choose-printable-ascii-char
-  (lift->generator integer->char (choose-integer 32 127)))
-
-(define max-scalar-value #x10FFFF)
-(define gap-start #xD800)
-(define gap-end #xE000)
-(define gap-size (- gap-end gap-start))
-
-(define (choose-char lower upper)
-  (make-generator
-   (lambda (size rgen)
-     (call-with-values
-	 (lambda ()
-	   (random-integer rgen (char->integer lower)
-			   (min (char->integer upper)
-				(- max-scalar-value gap-size))))
-       (lambda (n _)
-	 (integer->char
-	  (if (< n gap-start)
-	      n
-	      (+ n gap-size))))))))
-
-; int (generator a) -> (generator a)
-(define (variant v gen)
-  (let ((proc (generator-proc gen)))
-    (make-generator
-     (lambda (size rgen)
-       (let loop ((v (+ 1 v))
-		  (rgen rgen))
-	 (if (zero? v)
-	     (proc size rgen)
-	     (call-with-values
-		 (lambda ()
-		   (random-generator-split rgen))
-	       (lambda (rgen1 rgen2)
-		 (loop (- v 1) rgen2)))))))))
-
-; int random-gen (generator a) -> a
-(define (generate n rgen gen)
-  (call-with-values
-      (lambda ()
-	(random-integer rgen 0 n))
-    (lambda (size nrgen)
-      ((generator-proc gen) size nrgen))))
-
-; (vals -> (generator b)) -> (generator (vals -> b))
-(define (promote proc)
-  (make-generator
-   (lambda (size rgen)
-     (lambda vals
-       (let ((g (apply proc vals)))
-	 ((generator-proc g) size rgen))))))
-
-; (int -> (generator a)) -> (generator a)
-(define (sized proc)
-  (make-generator
-   (lambda (size rgen)
-     (let ((g (proc size)))
-       ((generator-proc g) size rgen)))))
-
-; (list a) -> (generator a)
-(define (choose-one-of lis)
-  (lift->generator (lambda (n)
-		     (list-ref lis n))
-		   (choose-integer 0 (- (length lis) 1))))
-
-; vector from the paper
-; (generator a) int -> (generator (list a))
-(define (choose-list el-gen n)
-  (let recur ((n n))
-    (if (zero? n)
-	(return '())
-	(>>= el-gen
-	     (lambda (val)
-	       (>>= (recur (- n 1))
-		    (lambda (rest)
-		      (return (cons val rest)))))))))
-
-; (generator char) int -> (generator string)
-(define (choose-string char-gen n)
-  (lift->generator list->string (choose-list char-gen n)))
-
-(define (choose-symbol char-gen n)
-  (>>= (choose-string char-gen n)
-       (lambda (s)
-	 (return (string->symbol s)))))
-
-(define (choose-vector el-gen n)
-  (lift->generator list->vector (choose-list el-gen n)))
-
-; (list (promise (generator a))) -> (generator a)
-(define (choose-mixed gens)
-  (>>= (choose-one-of gens)
-       force))
-
-; (list (pair int (generator a))) -> (generator a)
-(define (choose-with-frequencies lis)
-  (>>= (choose-integer 1 (apply + (map car lis)))
-       (lambda (n)
-	 (pick n lis))))
-
-(define (pick n lis)
-  (let ((k (caar lis)))
-    (if (<= n k)
-	(cdar lis)
-	(pick (- n k) lis))))
-
-(define-record-type :arbitrary
-  (make-arbitrary generator transformer)
-  arbitrary?
-  ;; (generator a)
-  (generator arbitrary-generator)
-  ;; a (generator b) -> (generator b)
-  (transformer arbitrary-transformer))
-
-; class Arbitrary a where
-;    arbitrary   :: Gen a
-;    coarbitrary :: a -> Gen b -> Gen b
-
-(define (coarbitrary arb val gen)
-  ((arbitrary-transformer arb) val gen))
-
-(define arbitrary-boolean
-  (make-arbitrary (choose-one-of '(#t #f))
-		  (lambda (a gen)
-		    (variant (if a 0 1) gen))))
-
-(define arbitrary-integer
-  (make-arbitrary (sized
-		   (lambda (n)
-		     (choose-integer (- n) n)))
-		  (lambda (n gen)
-		    (variant (if (>= n 0)
-				 (* 2 n)
-				 (+ (* 2 (- n)) 1))
-			     gen))))
-
-(define arbitrary-natural
-  (make-arbitrary (sized
-		   (lambda (n)
-		     (choose-integer 0 n)))
-		  (lambda (n gen)
-		    (variant n gen))))
-
-(define arbitrary-ascii-char
-  (make-arbitrary choose-ascii-char
-		  (lambda (ch gen)
-		    (variant (char->integer ch) gen))))
-
-(define arbitrary-ascii-letter
-  (make-arbitrary choose-ascii-letter
-		  (lambda (ch gen)
-		    (variant (char->integer ch) gen))))
-
-(define arbitrary-printable-ascii-char
-  (make-arbitrary choose-printable-ascii-char
-		  (lambda (ch gen)
-		    (variant (char->integer ch) gen))))
-
-(define arbitrary-char
-  (make-arbitrary (sized
-		   (lambda (n)
-		     (choose-char (integer->char 0)
-				  (integer->char n))))
-		  (lambda (ch gen)
-		    (variant (char->integer ch) gen))))
-
-(define (make-rational a b)
-  (/ a
-     (+ 1 b)))
-
-(define arbitrary-rational
-  (make-arbitrary (lift->generator make-rational
-				   (arbitrary-generator arbitrary-integer)
-				   (arbitrary-generator arbitrary-natural))
-		  (lambda (r gen)
-		    (coarbitrary arbitrary-integer
-				 (numerator r)
-				 (coarbitrary arbitrary-integer
-					      (denominator r) gen)))))
-
-(define (fraction a b c)
-  (+ a
-     (exact->inexact (/ b
-			(+ (abs c) 1)))))
-
-(define arbitrary-real
-  (make-arbitrary (lift->generator fraction
-				   (arbitrary-generator arbitrary-integer)
-				   (arbitrary-generator arbitrary-integer)
-				   (arbitrary-generator arbitrary-integer))
-		  (lambda (r gen)
-		    (let ((fr (rationalize (inexact->exact r) 1/1000)))
-		      (coarbitrary arbitrary-integer
-				   (numerator fr)
-				   (coarbitrary arbitrary-integer
-						(denominator fr) gen))))))
-
-
-(define (arbitrary-mixed pred+arbitrary-promise-list)
-  (make-arbitrary (choose-mixed (map (lambda (p)
-				       (delay (arbitrary-generator (force (cdr p)))))
-				     pred+arbitrary-promise-list))
-		  (lambda (val gen)
-		    (let loop ((lis pred+arbitrary-promise-list) (n 0))
-		      (cond
-		       ((null? lis)
-			(assertion-violation 'arbitrary-mixed
-					     "value matches none of the predicates"
-					     val pred+arbitrary-promise-list))
-		       (((caar lis) val)
-			(variant n gen))
-		       (else
-			(loop (cdr lis) (+ 1 n))))))))
-
-(define (arbitrary-one-of eql? . vals)
-  (make-arbitrary (choose-one-of vals)
-		  (lambda (val gen)
-		    (let loop ((lis vals) (n 0))
-		      (cond
-		       ((null? lis)
-			(assertion-violation 'arbitrary-one-of
-					     "value is not in the list"
-					     val vals))
-		       ((eql? (car lis) val)
-			(variant n gen))
-		       (else
-			(loop (cdr lis) (+ 1 n))))))))
-		       
-(define (arbitrary-pair arbitrary-car arbitrary-cdr)
-  (make-arbitrary (lift->generator cons
-				   (arbitrary-generator arbitrary-car)
-				   (arbitrary-generator arbitrary-cdr))
-		  (lambda (p gen)
-		    (coarbitrary arbitrary-car
-				 (car p)
-				 (coarbitrary arbitrary-cdr
-					      (cdr p) gen)))))
-
-; a tuple is just a non-uniform list 
-(define (arbitrary-tuple . arbitrary-els)
-  (make-arbitrary (apply lift->generator
-			 list
-			 (map arbitrary-generator arbitrary-els))
-		  (lambda (lis gen)
-		    (let recur ((arbitrary-els arbitrary-els)
-				(lis lis))
-		      (if (null? arbitrary-els)
-			  gen
-			  ((arbitrary-transformer (car arbitrary-els))
-			   (car lis)
-			   (recur (cdr arbitrary-els)
-				  (cdr lis))))))))
-
-(define (arbitrary-record construct accessors . arbitrary-els)
-  (make-arbitrary (apply lift->generator
-			 construct
-			 (map arbitrary-generator arbitrary-els))
-		  (lambda (rec gen)
-		    (let recur ((arbitrary-els arbitrary-els)
-				(lis (map (lambda (accessor) (accessor rec)) accessors)))
-		      (if (null? arbitrary-els)
-			  gen
-			  ((arbitrary-transformer (car arbitrary-els))
-			   (car lis)
-			   (recur (cdr arbitrary-els)
-				  (cdr lis))))))))
-
-(define (arbitrary-sequence choose-sequence sequence->list arbitrary-el)
-  (make-arbitrary (sized
-		   (lambda (n)
-		     (>>= (choose-integer 0 n)
-			  (lambda (length)
-			    (choose-sequence (arbitrary-generator arbitrary-el) length)))))
-		  (lambda (seq gen)
-		    (let recur ((lis (sequence->list seq)))
-		      (if (null? lis)
-			  (variant 0 gen)
-			  ((arbitrary-transformer arbitrary-el) 
-			   (car lis)
-			   (variant 1 (recur (cdr lis)))))))))
-
-(define (arbitrary-list arbitrary-el)
-  (arbitrary-sequence choose-list values arbitrary-el))
-
-(define (arbitrary-vector arbitrary-el)
-  (arbitrary-sequence choose-vector vector->list arbitrary-el))
-
-(define arbitrary-ascii-string
-  (arbitrary-sequence choose-string string->list arbitrary-ascii-char))
-
-(define arbitrary-printable-ascii-string
-  (arbitrary-sequence choose-string string->list arbitrary-printable-ascii-char))
-
-(define arbitrary-string
-  (arbitrary-sequence choose-string string->list arbitrary-char))
-
-(define arbitrary-symbol
-  (arbitrary-sequence choose-symbol
-		      (lambda (symbol)
-			(string->list (symbol->string symbol)))
-		      arbitrary-ascii-letter))
-
-(define (arbitrary-procedure arbitrary-result . arbitrary-args)
-  (let ((arbitrary-arg-tuple (apply arbitrary-tuple arbitrary-args)))
-    (make-arbitrary (promote
-		     (lambda args
-		       ((arbitrary-transformer arbitrary-arg-tuple)
-			args
-			(arbitrary-generator arbitrary-result))))
-		    (lambda (proc gen)
-		      (>>= (arbitrary-generator arbitrary-arg-tuple)
-			   (lambda (args)
-			     ((arbitrary-transformer arbitrary-result)
-			      (apply proc args)
-			      gen)))))))
-
-
-(define-record-type :property
-  (make-property proc arg-names args)
-  property?
-  (proc property-proc)
-  (arg-names property-arg-names)
-  ;; (list (union arbitrary generator))
-  (args property-args))
-
-(define-syntax property
-  (syntax-rules ()
-    ((property ((?id ?gen) ...) ?body0 ?body1 ...)
-     (make-property (lambda (?id ...)
-		      ?body0 ?body1 ...)
-		    '(?id ...)
-		    (list ?gen ...)))))
-
-(define-record-type :result
-  (make-result ok stamp arguments-list)
-  check-result?
-  ;; () = unknown, #t, #f
-  (ok result-ok)
-  (stamp result-stamp) 
-  ;; (list (list (pair (union #f symbol) value)))
-  (arguments-list result-arguments-list))
-
-(define (result-with-ok res ok)
-  (make-result ok
-	       (result-stamp res)
-	       (result-arguments-list res)))
-
-(define (result-add-stamp res stamp)
-  (make-result (result-ok res)
-	       (cons stamp (result-stamp res))
-	       (result-arguments-list res)))
-
-; result (list (pair (union #f symbol) value)) -> result
-(define (result-add-arguments res args)
-  (make-result (result-ok res)
-	       (result-stamp res)
-	       (cons args (result-arguments-list res))))
-
-(define nothing
-  (make-result '() '() '()))
-
-; A testable value is one of the following:
-; - a :property object
-; - a boolean
-; - a result record
-; - a generator of a result record
-
-(define (coerce->result-generator thing)
-  (cond
-   ((property? thing)
-    (for-all/names (property-proc thing)
-		   (property-arg-names thing)
-		   (property-args thing)))
-   ((boolean? thing) (return (result-with-ok nothing thing)))
-   ((check-result? thing) (return thing))
-   ((generator? thing) thing)
-   (else
-    (assertion-violation 'coerce->result-generator 
-			 "cannot be coerced to a result generator"
-			 thing))))
-
-(define (coerce->generator thing)
-  (cond
-   ((generator? thing) thing)
-   ((arbitrary? thing) (arbitrary-generator thing))
-   (else
-    (assertion-violation 'coerce->generator
-			 "cannot be coerced to a generator" thing))))
-
-(define (for-all proc . args)
-  (>>= (sequence (map coerce->generator args))
-       (lambda (args)
-	 (>>= (coerce->result-generator (apply proc args))
-	      (lambda (res)
-		(return (result-add-arguments res
-					      (map (lambda (arg) (cons #f arg)) args))))))))
-
-(define (for-all/names proc arg-names args)
-  (>>= (sequence (map coerce->generator args))
-       (lambda (args)
-	 (>>= (coerce->result-generator (apply proc args))
-	      (lambda (res)
-		(return (result-add-arguments res (map cons arg-names args))))))))
-
-(define-syntax ==>
-  (syntax-rules ()
-    ((==> ?bool ?prop)
-     (if ?bool
-	 ?prop
-	 (return nothing)))))
-
-(define (label str testable)
-  (>>= (coerce->result-generator testable)
-       (lambda (res)
-	 (return (result-add-stamp res str)))))
-
-(define-syntax classify
-  (syntax-rules ()
-    ((classify ?really? ?str ?testable)
-     (let ((testable ?testable))
-       (if ?really?
-	   (label ?str testable)
-	   testable)))))
-
-(define-syntax trivial
-  (syntax-rules ()
-    ((trivial ?really? ?testable)
-     (classify ?really? "trivial" ?testable))))
-
-(define (collect lbl testable)
-  (label (external-representation lbl) testable))
- 
-(define (external-representation obj)
-  (let ((port (make-string-output-port)))
-    (write obj port)
-    (string-output-port-output port)))
-
-; Running the whole shebang
-
-(define-record-type :config
-  (make-config max-test max-fail size print-every)
-  config?
-  (max-test config-max-test)
-  (max-fail config-max-fail)
-  (size config-size)
-  (print-every config-print-every))
-
-(define quick
-  (make-config 100
-	       1000
-	       (lambda (n)
-		 (+ 3 (quotient n 2)))
-	       values))
-
-(define verbose
-  (make-config 100
-	       1000
-	       (lambda (n)
-		 (+ 3 (quotient n 2)))
-	       (lambda (n args)
-		 (display n)
-		 (display ":")
-		 (newline)
-		 (for-each (lambda (arg)
-			     (display arg)
-			     (newline))
-			   args))))
-
-(define (check-results config prop)
-  (let ((rgen (make-random-generator 0)))
-    (tests config (coerce->result-generator prop) rgen 0 0 '())))
-
-(define (check config prop)
-  (call-with-values
-      (lambda ()
-	(check-results config prop))
-    report-result))
-
-(define (quickcheck-results prop)
-  (check-results quick prop))
-
-(define (quickcheck prop)
-  (check quick prop))
-
-; returns three values:
-; - ntest
-; - stamps
-; - #t for success, #f for exhausted, result for failure
-
-(define (tests config gen rgen ntest nfail stamps)
-  (let loop ((rgen rgen)
-	     (ntest ntest)
-	     (nfail nfail)
-	     (stamps stamps))
-    (cond
-     ((= ntest (config-max-test config))
-      (values ntest stamps #t))
-     ((= ntest (config-max-fail config))
-      (values ntest stamps #f))
-     (else
-      (call-with-values
-	  (lambda ()
-	    (random-generator-split rgen))
-	(lambda (rgen1 rgen2)
-	  (let ((result (generate ((config-size config) ntest) rgen2 gen)))
-	    ((config-print-every config) ntest (result-arguments-list result))
-	    (case (result-ok result)
-	      ((()) (loop rgen1 ntest (+ 1 nfail) stamps))
-	      ((#t) (loop rgen1 (+ 1 ntest) nfail (cons (result-stamp result) stamps)))
-	      ((#f)
-	       (values ntest stamps result))))))))))
-
-(define (report-result ntest stamps maybe-result)
-  (case maybe-result
-    ((#t)
-     (done "OK, passed" ntest stamps))
-    ((#f)
-     (done "Arguments exhausted after" ntest stamps))
-    (else
-     (display "Falsifiable, after ")
-     (display ntest)
-     (display " tests:")
-     (newline)
-     (for-each write-arguments
-	       (result-arguments-list maybe-result)))))
-
-; (pair (union #f symbol) value)
-(define (write-argument arg)
-  (if (car arg)
-      (begin
-	(display (car arg))
-	(display " = "))
-      (values))
-  (write (cdr arg)))
-
-; (list (pair (union #f symbol) value))
-(define (write-arguments args)
-  (if (pair? args)
-      (begin
-	(write-argument (car args))
-	(for-each (lambda (arg)
-		    (display " ")
-		    (write-argument arg))
-		  (cdr args))
-	(newline))
-      (values)))
-		   
-(define (done mesg ntest stamps)
-  (display mesg)
-  (display " ")
-  (display ntest)
-  (display " tests")
-  (let* ((sorted (list-sort stamp<? (filter pair? stamps)))
-	 (grouped (group-sizes sorted))
-	 (sorted (list-sort (lambda (p1 p2)
-			      (< (car p1) (car p2)))
-			    grouped))
-	 (entries (map (lambda (p)
-			 (let ((n (car p))
-			       (lis (cdr p)))
-			 (string-append (number->string (quotient (* 100 n) ntest))
-					"% "
-					(intersperse ", " lis))))
-		       (reverse sorted))))
-    (cond
-     ((null? entries)
-      (display ".")
-      (newline))
-     ((null? (cdr entries))
-      (display " (")
-      (display (car entries))
-      (display ").")
-      (newline))
-     (else
-      (display ".") (newline)
-      (for-each (lambda (entry)
-		  (display entry)
-		  (display ".")
-		  (newline))
-		entries)))))
-
-(define (group-sizes lis)
-  (if (null? lis)
-      '()
-      (let loop ((current (car lis))
-		 (size 1)
-		 (lis (cdr lis))
-		 (rev '()))
-	(cond
-	 ((null? lis)
-	  (reverse (cons (cons size current) rev)))
-	 ((equal? current (car lis))
-	  (loop current (+ 1 size) (cdr lis) rev))
-	 (else
-	  (loop (car lis) 1 (cdr lis) (cons (cons size current) rev)))))))
-
-(define (stamp<? s1 s2)
-  (cond
-   ((null? s1)
-    (pair? s1))
-   ((null? s2)
-    #t)
-   ((string<? (car s1) (car s2))
-    #t)
-   ((string=? (car s1) (car s2))
-    (stamp<? (cdr s1) (cdr s2)))
-   (else #f)))
-
-
-(define (intersperse del lis)
-  (if (null? lis)
-      ""
-      (string-append (car lis)
-		     (let recur ((lis (cdr lis)))
-		       (if (null? lis)
-			   ""
-			   (string-append del
-					  (recur (cdr lis))))))))
diff --git a/pkgs/deinprogramm/deinprogramm/quickcheck/random.rkt b/pkgs/deinprogramm/deinprogramm/quickcheck/random.rkt
deleted file mode 100644
index 1c0c3eab66..0000000000
--- a/pkgs/deinprogramm/deinprogramm/quickcheck/random.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scheme/base
-
-(provide make-random-generator
-	 random-generator-next
-	 random-generator-split
-	 random-integer
-	 random-real)
-
-(require srfi/9)
-
-(define-syntax define-record-discloser
-  (syntax-rules ()
-    ((define-record-discloser ?:type ?discloser)
-     (values))))
-
-(require scheme/include)
-(include "random.scm")
diff --git a/pkgs/deinprogramm/deinprogramm/quickcheck/random.scm b/pkgs/deinprogramm/deinprogramm/quickcheck/random.scm
deleted file mode 100644
index fb26c6b2b4..0000000000
--- a/pkgs/deinprogramm/deinprogramm/quickcheck/random.scm
+++ /dev/null
@@ -1,109 +0,0 @@
-; This is a purely functional random generator, based on Lennart
-; Augustsson's generator shipped with Hugs.
-
-; Its comment says:
-
-; This implementation uses the Portable Combined Generator of L'Ecuyer
-; ["System.Random\#LEcuyer"] for 32-bit computers, transliterated by
-; Lennart Augustsson.  It has a period of roughly 2.30584e18.
-
-; This makes it not as good as Sebastian Egner's reference
-; implementation of SRFI 27, but much faster for applications that
-; need a pure random-number generator with a `split' operation.
-
-(define-record-type :random-generator
-  (really-make-random-generator s1 s2)
-  random-generator?
-  (s1 random-generator-s1)
-  (s2 random-generator-s2))
-
-(define-record-discloser :random-generator
-  (lambda (r)
-    (list 'random-generator
-	  (random-generator-s1 r)
-	  (random-generator-s2 r))))
-
-(define min-bound (- (expt 2 31)))
-(define max-bound (- (expt 2 31) 1))
-(define int-range (- max-bound min-bound))
-
-(define (make-random-generator s)
-  (if (negative? s)
-      (make-random-generator (- s))
-      (let ((q (quotient s 2147483562))
-	    (s1 (remainder s 2147483562)))
-	(let ((s2 (remainder q 2147483398)))
-	  (really-make-random-generator (+ 1 s1) (+ 1 s2))))))
-
-(define (random-generator-next rg)
-  (let ((s1 (random-generator-s1 rg))
-	(s2 (random-generator-s2 rg)))
-
-    (let ((k (quotient s1 53668))
-	  (k* (quotient s2 52774)))
-      (let ((s1*  (- (* 40014 (- s1 (* k 53668)))
-		     (* k 12211)))
-	    (s2* (- (* 40692 (- s2 (* k* 52774)))
-		    (* k* 3791))))
-	(let ((s1** (if (negative? s1*)
-			(+ s1* 2147483563)
-			s1*))
-	      (s2** (if (negative? s2*)
-			(+ s2* 2147483399)
-			s2*)))
-	  (let* ((z (- s1** s2**))
-		 (z* (if (< z 1)
-			 (+ z 2147483562)
-			 z)))
-	    (values z* (really-make-random-generator s1** s2**))))))))
-
-(define (random-generator-split rg)
-  (let ((s1 (random-generator-s1 rg))
-	(s2 (random-generator-s2 rg)))
-    (let ((new-s1 (if (= s1 2147483562)
-		      1
-		      (+ s1 1)))
-	  (new-s2 (if (= s2 1)
-		      2147483398
-		      (- s2 1))))
-      (call-with-values
-	  (lambda ()
-	    (random-generator-next rg))
-	(lambda (_ nrg)
-	  (values (really-make-random-generator new-s1
-						(random-generator-s2 nrg))
-		  (really-make-random-generator (random-generator-s1 nrg)
-						new-s2)))))))
-
-
-; The intervals are inclusive.
-
-(define (random-integer rg low high)
-  (let ((b 2147483561)
-	(k (+ (- high low) 1)))
-    (let loop ((n (ilogbase b k))
-	       (acc low)
-	       (rg rg))
-      (if (zero? n)
-	  (values (+ low (modulo acc k))
-		  rg)
-	  (call-with-values
-	      (lambda () (random-generator-next rg))
-	    (lambda (x rgn)
-	      (loop (- n 1) (+ x (* acc b)) rgn)))))))
-
-(define (random-real rg low high)
-  (call-with-values
-      (lambda ()
-	(random-integer rg min-bound max-bound))
-    (lambda (x nrg)
-      (let ((scaled-x (+ (/ (+ low high) 2)
-			 (* (/ (- high low) int-range)
-			    x))))
-	(values scaled-x nrg)))))
-
-(define (ilogbase b i)
-  (if (< i b)
-      1
-      (+ 1 (ilogbase b (quotient i b)))))
-
diff --git a/pkgs/deinprogramm/deinprogramm/run-dmda-code.rkt b/pkgs/deinprogramm/deinprogramm/run-dmda-code.rkt
deleted file mode 100644
index 54b8438be3..0000000000
--- a/pkgs/deinprogramm/deinprogramm/run-dmda-code.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-(module run-dmda-code mzscheme
-  (require mred/mred mzlib/class mzlib/match syntax/modread)
-
-  (define (run-dmda-file filename)
-    (let ((p (open-input-graphical-file/fixed filename))
-	  (expected-module-name
-	   (let-values (((base name dir) (split-path filename)))
-	     (string->symbol (path->string (path-replace-suffix name #""))))))
-      (dynamic-wind
-	  values
-	  (lambda ()
-	    (with-module-reading-parameterization
-	     (lambda ()
-	       (let* ((code (read-syntax filename p))
-		      (pimped-code
-		       (syntax-case code ()
-			 ((?module ?name ?language ?body ...)
-			  (syntax
-			   (?module ?name ?language 
-				    (require (lib "testing.rkt" "htdp"))
-				    ?body ...)))))
-		      (module-ized-code
-		       (check-module-form pimped-code expected-module-name filename)))
-		 (eval module-ized-code)
-		 (dynamic-require expected-module-name #f)))))
-	  (lambda ()
-	    (close-input-port p)))))
-
-;; The following definitions work around a bug in PLT 371.
-
-;; build-input-port : string -> (values input any)
-;; constructs an input port for the load handler. Also
-;; returns a value representing the source of code read from the file.
-  (define (build-input-port filename)
-    (let ([p (open-input-file filename)])
-      (port-count-lines! p)
-      (let ([p (cond
-		[(regexp-match-peek #rx#"^(?:#reader[(]lib\"read[.]ss\"\"wxme\"[)])?WXME01[0-9][0-9] ##[ \r\n]" p)
-		 (let ([t (make-object text%)])
-		   (send t insert-port p 'standard)
-		   (close-input-port p)
-		   (open-input-text-editor t 0 'end values filename))]
-		[else p])])
-	(port-count-lines! p)           ; in case it's new
-	(values p filename))))
-
-  (define (open-input-graphical-file/fixed filename)
-    (let-values ([(p name) (build-input-port filename)])
-      p))
-
-  (run-dmda-file
-   (vector-ref (current-command-line-arguments) 0))
-
-  (module test racket/base))
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-advanced.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-advanced.scrbl
deleted file mode 100644
index 30aa6516d3..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-advanced.scrbl
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang scribble/doc
-@(require scribblings/htdp-langs/common "std-grammar.rkt" "prim-ops.rkt"
-          (for-label deinprogramm/DMdA-assignments))
-
-@title[#:style 'toc #:tag "DMdA-advanced"]{Die Macht der Abstraktion fortgeschritten}
-
-This is documentation for the language level @italic{Die Macht der
-Abstraktion - fortgeschritten} that goes with the German textbook
-@italic{Die Macht der Abstraktion}.
-
-@declare-exporting[deinprogramm/DMdA-advanced]
-
-@racketgrammar*-DMdA[
-#:literals (define-record-procedures-2 set!)
-(
-  (define-record-procedures-2 id id id (field-spec ...))
-  (define-record-procedures-parametric-2 id id id id (field-spec ...))
-)
-(
-  [field-spec id (id id)]
-  [quoted id
-          number
-          string
-          character
-          (quoted ...)
-          @#,elem{@racketvalfont{'}@racket[quoted]}]
-)
-(
-  (set! id expr)
-  (code:line @#,elem{@racketvalfont{'}@racket[quoted]} (code:comment @#,seclink["advanced-quote"]{Quote-Literal}))
-)
-]
-
-@|prim-nonterms|
-
-@prim-ops['(lib "DMdA-advanced.rkt" "deinprogramm") #'here]
-
-@section[#:tag "advanced-quote"]{Quote-Literal}
-
-@deftogether[(
-@defform/none[(unsyntax @elem{@racketvalfont{'}@racket[quoted]})]
-@defform[(quote quoted)]
-)]{
-Der Wert eines Quote-Literals hat die gleiche externe Repräsentation wie @racket[quoted].
-}
-
-@section[#:tag "advanced-signatures"]{Signaturen}
-
-@defidform[symbol]{
-Signatur für Symbole.
-}
-
-@section[#:tag "advanced-prim-op"]{Primitive Operationen}
-
-@prim-op-defns['(lib "DMdA-advanced.rkt" "deinprogramm") #'here '()]
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-assignments.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-assignments.scrbl
deleted file mode 100644
index 16371e7047..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-assignments.scrbl
+++ /dev/null
@@ -1,108 +0,0 @@
-#lang scribble/doc
-@(require scribblings/htdp-langs/common "std-grammar.rkt" "prim-ops.rkt"
-          (for-label deinprogramm/DMdA-assignments
-                     (only-in deinprogramm/DMdA-beginner
-                              define-record-procedures-parametric)))
-
-@title[#:style 'toc #:tag "DMdA-assignments"]{Die Macht der Abstraktion mit Zuweisungen}
-
-This is documentation for the language level @italic{Die Macht der
-Abstraktion mit Zuweisungen} to go with the German textbook
-@italic{Die Macht der Abstraktion}.
-
-@declare-exporting[deinprogramm/DMdA-assignments]
-
-@racketgrammar*-DMdA[
-#:literals (define-record-procedures-2 define-record-procedures-parametric-2 set!)
-(
-  (define-record-procedures-2 id id id (field-spec ...))
-  (define-record-procedures-parametric-2 id id id id id (field-spec ...))
-)
-(
-  [field-spec id (id id)]
-)
-(
-  (set! id expr)
-)
-]
-
-@|prim-nonterms|
-
-@prim-ops['(lib "DMdA-assignments.rkt" "deinprogramm") #'here]
-
-@section{@racket[define-record-procedures-2]}
-
-@declare-exporting[deinprogramm/DMdA]
-
-@defform[(define-record-procedures-2 t c p (field-spec ...))]{
-Die @racket[define-record-procedures-2]-Form ist eine Definition für
-einen neuen Record-Typ. Dabei ist @racket[t] der Name der Record-Signatur,
-@racket[c] der Name des Konstruktors, @racket[p] der Name des
-Prädikats. Jedes @racket[field-spec] kann entweder der Name eines Selektors
-oder ein Paar @racket[(id id)] aus dem Namen eines Selektors und dem Namen eines
-Mutators sein.
-}
-
-@section{@racket[define-record-procedures-parametric-2]}
-
-@declare-exporting[deinprogramm/DMdA]
-
-@defform[(define-record-procedures-parametric-2 t cc c p (field-spec1 ...))]{
-Diese Form ist wie @racket[define-record-procedures-2], nur parametrisch 
-wie @racket[define-record-procedures-parametric].  Außerdem
-werden die Signaturen für die Feldinhalte, anders als bei
-@racket[define-record-procedures-parametric], sofort bei der
-Konstruktion überprüft und nicht erst beim Aufruf eines Selektors.
-}
-
-@section{@racket[begin]}
-
-@declare-exporting[deinprogramm/DMdA]
-
-@defform[(begin expr expr ...)]{
-Bei der Auswertung eines @racket[begin]-Ausdrucks werden nacheinander
-die Operanden ausgewertet. Der Wert des letzten Ausdrucks wird der
-Wert des @racket[begin]-Ausdrucks.
-}
-
-@section{@racket[set!]}
-
-@declare-exporting[deinprogramm/DMdA]
-
-@defform[(set! id expr)]{
-Ein @racket[set!]-Ausdruck ist eine Zuweisung, und ändert den Inhalt
-der Zelle, die an @racket[id] gebunden ist, auf den Wert von @racket[expr].
-}
-
-@section[#:tag "assignments-signatures"]{Signaturen}
-
-@declare-exporting[deinprogramm/DMdA]
-
-@defidform[unspecific]{
-Signatur für unspezifische Werte, die unwichtig sind - typischerweise für die 
-Rückgabewerte von Operationen, die nur Seiteneffekte haben wie @racket[set!]
-oder @racket[write-string].
-}
-
-@section[#:tag "advanced-definitions"]{Definitionen}
-@declare-exporting[deinprogramm/DMdA-deflam]
-
-@defform[(define id expr)]{Diese Form ist wie in den unteren
-Sprachebenen, mit dem Unterschied, dass an @racket[id] mit
-@racket[set!] zugewiesen werden kann.}
-
-@section[#:tag "advanced-lambda"]{@racket[lambda]}
-@declare-exporting[deinprogramm/DMdA-deflam]
-
-@defform[(lambda (id id ... . id) expr)]{Bei @racket[lambda] ist in
-dieser Sprachebene in einer Form zulässig, die es erlaubt, eine
-Prozedur mit einer variablen Anzahl von Paramern zu erzeugen: Alle
-Parameter vor dem Punkt funktionieren wie gewohnt und werden jeweils
-an die entsprechenden Argumente gebunden.  Alle restlichen Argumente
-werden in eine Liste verpackt und an den Parameter nach dem Punkt
-gebunden.}
-
-
-@section[#:tag "assignments-prim-op"]{Primitive Operationen}
-
-@prim-op-defns['(lib "DMdA-assignments.rkt" "deinprogramm") #'here '()]
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-beginner.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-beginner.scrbl
deleted file mode 100644
index ed17036623..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-beginner.scrbl
+++ /dev/null
@@ -1,444 +0,0 @@
-#lang scribble/doc
-@(require scribblings/htdp-langs/common scribble/struct
-          "std-grammar.rkt" "prim-ops.rkt"
-          (for-label deinprogramm/DMdA-beginner))
-
-@title[#:style 'toc #:tag "DMdA-beginner"]{Die Macht der Abstraktion - Anfänger}
-
-This is documentation for the language level @italic{Die Macht der
-Abstraktion - Anfänger} to go with the German textbook @italic{Die
-Macht der Abstraktion}.
-
-@declare-exporting[deinprogramm/DMdA-beginner #:use-sources (deinprogramm/DMdA deinprogramm/define-record-procedures)]
-
-@racketgrammar*-DMdA[
-#:literals ()
-() () ()
-]
-
-@|prim-nonterms|
-
-@prim-ops['(lib "DMdA-beginner.rkt" "deinprogramm") #'here]
-
-@; ----------------------------------------------------------------------
-
-@section{Definitionen}
-
-@defform[(define id expr)]{
-Diese Form ist eine Definition, und bindet @racket[id] als
-globalen Namen an den Wert von @racket[exp].}
-
-@section{Record-Typ-Definitionen}
-
-@defform[(define-record-procedures t c p (s1 ...))]{
-
-Die @racket[define-record-procedures]-Form ist eine Definition
-für einen neuen Record-Typ.  Dabei ist @racket[t] der Name der Record-Signatur,
-@racket[c] der Name des Konstruktors, @racket[p]
-der Name des Prädikats, und die @racket[si] sind die 
-Namen der Selektoren.}
-
-@section[#:tag "application"]{Prozedurapplikation}
-
-@defform/none[(expr expr ...)]{
-Dies ist eine Prozeduranwendung oder Applikation.
-Alle @racket[expr]s werden ausgewertet:
-Der Operator (also der erste Ausdruck) muß eine
-Prozedur ergeben, die genauso viele Argumente
-akzeptieren kann, wie es Operanden, also weitere @racket[expr]s gibt.
-Die Anwendung wird dann ausgewertet, indem der Rumpf
-der Applikation ausgewertet wird, nachdem die Parameter
-der Prozedur durch die Argumente, also die Werte der
-Operanden ersetzt wurden.}
-
-@; @defform[(#%app id expr expr ...)]{
-@; 
-@; Eine Prozedurapplikation kann auch mit @racket[#%app] geschrieben
-@; werden, aber das macht eigentlich niemand.}
-
-@section{@racket[#t] and @racket[#f]}
-
-@as-index{@litchar{#t}} ist das Literal für den booleschen Wert "wahr",
-@as-index{@litchar{#f}} das Literal für den booleschen Wert "falsch".
-
-@section{@racket[lambda]}
-
-@defform[(lambda (id ...) expr)]{
-Ein Lambda-Ausdruck ergibt bei der Auswertung eine neue Prozedur.}
-
-@section[#:tag "id"]{Bezeichner}
-
-@defform/none[id]{
-Eine Variable bezieht sich auf die, von innen nach
-außen suchend, nächstgelegene Bindung durch @racket[lambda], @racket[let], @racket[letrec], oder
-@racket[let*]. Falls es keine solche lokale Bindung gibt, muß es eine
-Definition oder eine eingebaute Bindung mit dem entsprechenden Namen
-geben. Die Auswertung des Namens ergibt dann den entsprechenden
-Wert. }
-
-@section{@racket[cond]}
-
-@defform[(cond (expr expr) ... (expr expr))]{
-Ein @racket[cond]-Ausdruck bildet eine Verzweigung, die aus mehreren
-Zweigen besteht. Jeder Zweig besteht
-aus einem Test und einem Ausdruck. Bei der Auswertung werden die
-Zweige nacheinander abgearbeitet. Dabei wird jeweils zunächst der Test
-ausgewertet, der jeweils einen booleschen Wert ergeben müssen. Beim
-ersten Test, der @racket[#t] ergibt, wird der Wert des Ausdrucks des Zweigs zum
-Wert der gesamten Verzweigung. Wenn kein Test @racket[#t] ergibt, wird das
-Programm mit einer Fehlermeldung abgebrochen.
-}
-
-@defform/none[#:literals (cond else)
-              (cond (expr expr) ... (else expr))]{
- Die Form des cond-Ausdrucks ist ähnlich zur vorigen, mit der
- Ausnahme, daß in dem Fall, in dem kein Test @racket[#t] ergibt, der Wert des
- letzten Ausdruck zum Wert der @racket[cond]-Form wird.
-}
-
-@defidform[else]{
-
-Das Schlüsselwort @racket[else] kann nur in @racket[cond] benutzt werden.}
-
-@; ----------------------------------------------------------------------
-
-@section{@racket[if]}
-
-@defform[(if expr expr expr)]{
-Eine @racket[if]-Form ist eine binäre Verzweigung. Bei der Auswertung wird
-zunächst der erste Operand ausgewertet (der Test), der einen
-booleschen Wert ergeben muß. Ergibt er @racket[#t], wird der Wert des zweiten
-Operanden (die Konsequente) zum Wert der @racket[if]-Form, bei @racket[#f] der Wert des
-dritten Operanden (die Alternative).
-}
-
-@; ----------------------------------------------------------------------
-
-@section{@racket[and]}
-
-@defform[(and expr ...)]{
-Bei der Auswertung eines @racket[and]-Ausdrucks werden nacheinander die
-Operanden (die boolesche Werte ergeben müssen) ausgewertet. Ergibt
-einer @racket[#f], ergibt auch der and-Ausdruck @racket[#f]; wenn alle
-Operanden @racket[#t] ergeben, ergibt auch der @racket[and]-Ausdruck
-@racket[#t].
-}
-
-@; ----------------------------------------------------------------------
-
-@section{@racket[or]}
-
-@defform[(or expr ...)]{
-Bei der Auswertung eines @racket[or]-Ausdrucks werden nacheinander die
-Operanden (die boolesche Werte ergeben müssen) ausgewertet. Ergibt
-einer @racket[#t], ergibt auch der or-Ausdruck @racket[#t]; wenn alle Operanden @racket[#f]
-ergeben, ergibt auch der @racket[or]-Ausdruck @racket[#f].
-}
-
-@section{Signaturen}
-
-Signaturen können statt der Verträge aus dem Buch geschrieben werden:
-Während Verträge reine Kommentare sind, überprüft DrRacket Signaturen 
-und meldet etwaige Verletzungen.
-
-@subsection{@racket[signature]}
-@defform[(signature sig)]{
-Diese Form liefert die Signatur mit der Notation @racket[sig].
-}
-
-@subsection{Signaturdeklaration}
-@defform[(: id sig)]{
-Diese Form erklärt @racket[sig] zur gültigen Signatur für @racket[id].
-}
-
-@subsection{Eingebaute Signaturen}
-
-@defidform[number]{
-Signatur für beliebige Zahlen.
-}
-
-@defidform[real]{
-Signatur für reelle Zahlen.
-}
-
-@defidform[rational]{
-Signatur für rationale Zahlen.
-}
-
-@defidform[integer]{
-Signatur für ganze Zahlen.
-}
-
-@defidform[natural]{
-Signatur für ganze, nichtnegative Zahlen.
-}
-
-@defidform[boolean]{
-Signatur für boolesche Werte.
-}
-
-@defidform[true]{
-Signatur für \scheme[#t].
-}
-
-@defidform[false]{
-Signatur für \scheme[#f].
-}
-
-@defidform[string]{
-Signatur für Zeichenketten.
-}
-
-@defidform[empty-list]{
-Signatur für die leere Liste.
-}
-
-@defidform[any]{
-Signatur, die auf alle Werte gültig ist.}
-
-@defform/none[signature]{
-Signatur für Signaturen.}
-
-@defidform[property]{
-Signatur für Eigenschaften.}
-
-@subsection{@racket[predicate]}
-@defform[(predicate expr)]{
-Bei dieser Signatur muß @racket[expr] als Wert ein Prädikat haben, also
-eine Prozedur, die einen beliebigen Wert akzeptiert und entweder @racket[#t]
-oder @racket[#f] zurückgibt.
-Die Signatur ist dann für einen Wert gültig, wenn das Prädikat, darauf angewendet,
-@racket[#t] ergibt.
-}
-
-@subsection{@racket[one-of]}
-@defform[(one-of expr ...)]{
-Diese Signatur ist für einen Wert gültig, wenn er gleich dem Wert eines
-der @racket[expr] ist.
-}
-
-@subsection{@racket[mixed]}
-@defform[(mixed sig ...)]{
-Diese Signatur ist für einen Wert gültig, wenn er für eine der Signaturen
-@racket[sig] gültig ist.
-}
-
-@subsection[#:tag "proc-signature"]{Prozedur-Signatur}
-@defidform[->]{
-@defform/none[(sig ... -> sig)]{
-Diese Signatur ist dann für einen Wert gültig, wenn dieser eine
-Prozedur ist.  Er erklärt außerdem, daß die Signaturen vor dem @racket[->]
-für die Argumente der Prozedur gelten und die Signatur nach dem @racket[->]
-für den Rückgabewert.
-}}
-}
-
-@subsection[#:tag "signature-variable"]{Signatur-Variablen} 
-@defform/none[%a]
-@defform/none[%b]
-@defform/none[%c]
-@defform/none[...]{
-Dies ist eine Signaturvariable: sie steht für eine Signatur, die für jeden Wert gültig ist.
-}
-
-@subsection{@racket[combined]}
-@defform[(combined sig ...)]{
-Diese Signatur ist für einen Wert gültig, wenn sie für alle der Signaturen
-@racket[sig] gültig ist.
-}
-
-@section{Testfälle}
-
-@defform[(check-expect expr expr)]{
-
-Dieser Testfall überprüft, ob der erste @racket[expr] den gleichen
-Wert hat wie der zweite @racket[expr], wobei das zweite @racket[expr]
-meist ein Literal ist.}
-
-@defform[(check-within expr expr expr)]{
-
-Wie @racket[check-expect], aber mit einem weiteren Ausdruck, 
-der als Wert eine Zahl @racket[_delta] hat. Der Testfall überprüft, daß jede Zahl im Resultat
-des ersten @racket[expr] maximal um @racket[_delta] 
-von der entsprechenden Zahl im zweiten @racket[expr] abweicht.}
-
-@defform[(check-member-of expr expr ...)]{
-
-Ähnlich wie @racket[check-expect]: Der Testfall überprüft, daß das Resultat
-des ersten Operanden gleich dem Wert eines der folgenden Operanden ist.}
-
-@defform[(check-range expr expr expr)]{
-
-Ähnlich wie @racket[check-expect]: Alle drei Operanden müssen 
-Zahlen sein.  Der Testfall überprüft, ob die erste Zahl zwischen der
-zweiten und der dritten liegt (inklusive).}
-
-@defform[(check-error expr expr)]{
-
-Dieser Testfall überprüft, ob der erste @racket[expr] einen Fehler produziert,
-wobei die Fehlermeldung der Zeichenkette entspricht, die der Wert des zweiten
-@racket[expr] ist.}
-
-@defform[(check-property expr)]{
-
-Dieser Testfall überprüft experimentell, ob die @tech{Eigenschaft}
-@racket[expr] erfüllt ist.  Dazu werden zufällige Werte für die mit
-@racket[for-all] quantifizierten Variablen eingesetzt: Damit wird
-überprüft, ob die Bedingung gilt.
-
-@emph{Wichtig:} @racket[check-property] funktioniert nur für
-Eigenschaften, bei denen aus den Signaturen sinnvoll Werte generiert
-werden können.  Dies ist für die meisten eingebauten Signaturen der
-Fall, aber nicht für Signaturvariablen und Signaturen, die mit
-@scheme[predicate] oder @scheme[define-record-procedures] definiert
-wurden - wohl aber für Signaturen, die mit dem durch
-@scheme[define-record-procedures-parametric] definierten
-Signaturkonstruktor erzeugt wurden.}
-
-@section{Parametrische Record-Typ-Definitionen}
-
-@defform[(define-record-procedures-parametric t cc c p (s1 ...))]{
-
-Die @racket[define-record-procedures-parametric] ist wie
-@racket[define-record-procedures].  Zusäzlich wird der Bezeichner
-@racket[cc] an einen Signaturkonstruktor gebunden: Dieser akzeptiert
-für jedes Feld eine Feld-Signatur und liefert eine Signatur, die nur
-Records des Record-Typs @racket[t] erfüllen, bei dem die Feldinhalte
-die Feld-Signaturen erfüllen.
-
-Beispiel:
-
-@racketblock[
-(define-record-procedures-parametric pare pare-of
-  make-pare pare?
-  (pare-one pare-two))
-]
-
-Dann ist @racket[(pare-of integer string)] die Signatur für
-@racket[pare]-Records, bei dem die Feldinhalte die Signaturen
-@racket[integer] bzw. @racket[string] erfüllen müssen.
-
-Die Signaturen für die Feldinhalte werden erst überprüft, wenn ein
-Selektor aufgerufen wird.
-}
-
-@; ----------------------------------------------------------------------
-
-@; @section{@racket[require]}
-@; 
-@; @defform[(require string)]{
-@; 
-@; Diese Form macht die Definitionen des durch @racket[string] spezifizierten Moduls
-@; verfügbar.  Dabei bezieht sich @racket[string] auf eine Datei relativ zu der Datei,
-@; in der die @racket[require]-Form steht.
-@; 
-@; Dabei ist @racket[string] leicht eingeschränkt, um Portabilitätsprobleme zu vermeiden:
-@; @litchar{/} ist der Separator für Unterverzeichnisse,, @litchar{.} bedeutet das aktuelle
-@; Verzeichnis, @litchar{..} meint das übergeordnete Verzeichnis, Pfadelemente 
-@; können nur @litchar{a} bis @litchar{z} (groß oder klein),
-@; @litchar{0} bis @litchar{9}, @litchar{-}, @litchar{_}
-@; und @litchar{.} enthalten, und die Zeichenkette kann nicht leer sein oder
-@; ein @litchar{/} am Anfang oder Ende enthalten.}
-@; 
-@; 
-@; @defform/none[#:literals (require)
-@;               (require module-id)]{
-@; 
-@; Diese Form macht eine eingebaute Library mit dem Namen @racket[module-id] verfügbar.}
-@;
-@; @defform/none[#:literals (require lib)
-@;               (require (lib string string ...))]{
-@; 
-@; Diese Form macht die Definitionen eines Moduls in einer installierten Bibliothek
-@; verfügbar.
-@; Der erste
-@; @racket[string] ist der Name der Datei des Moduls, und die restlichen
-@; @racket[string]s bezeichnen die Collection (und Sub-Collection undsoweiter),
-@; in der die Datei installiert ist. Jede @racket[string] ist ebenso eingeschränkt
-@; wie bei @racket[(require string)].}
-@; 
-@; 
-@; @defform/none[#:literals (require planet)
-@;               (require (planet string (string string number number)))]{
-@; 
-@; Diese Form macht ein Modul einer Bibliothek verfügbar, die aus PLaneT
-@; kommt.}
-
-@; ----------------------------------------
-
-@section{Eigenschaften}
-
-Eine @deftech{Eigenschaft} definiert eine Aussage über einen
-Scheme-Ausdruck, die experimentell überprüft werden kann.  Der
-einfachste Fall einer Eigenschaft ist ein boolescher Ausdruck.  Die
-folgende Eigenschaft gilt immer:
-
-@racketblock[
-(= 1 1)
-]
-
-Es ist auch möglich, in einer Eigenschaft Variablen zu verwenden, für
-die verschiedene Werte eingesetzt werden.  Dafür müssen die Variablen
-gebunden und @deftech{quantifiziert} werden, d.h. es muß festgelegt
-werden, welche Signatur die Werte der Variable erfüllen sollen.
-Eigenschaften mit Variablen werden mit der @racket[for-all]-Form erzeugt:
-
-@defform[(for-all ((id sig) ...) expr)]{
-Dies bindet die Variablen @racket[id] in der Eigenschaft
-@racket[expr].  Zu jeder Variable gehört eine Signatur
-@racket[sig], der von den Werten der Variable erfüllt werden
-muß.
-
-Beispiel:
-
-@racketblock[
-(for-all ((x integer))
-  (= x (/ (* x 2) 2)))
-]
-}
-
-@defform[(expect expr expr)]{
-
-Ein @racket[expect]-Ausdruck ergibt  eine Eigenschaft,  die dann gilt,
-wenn   die Werte von @racket[expr] und   @racket[expr] gleich sind, im
-gleichen Sinne wie bei @racket[check-expect].}
-
-
-@defform[(expect-within expr expr expr)]{
-
-Wie @racket[expect], aber entsprechend @racket[check-within] mit einem
-weiteren Ausdruck, der als Wert eine Zahl @racket[_delta] hat. Die
-resultierende Eigenschaft gilt, wenn jede Zahl im Resultat des ersten
-@racket[expr] maximal um @racket[_delta] von der entsprechenden Zahl
-im zweiten @racket[expr] abweicht.}
-
-@defform[(expect-member-of expr expr ...)]{
-
-Wie @racket[expect], aber entsprechend @racket[check-member-of] mit
-weiteren Ausdrücken, die mit dem ersten verglichen werden.  Die
-resultierende Eigenschaft gilt, wenn das erste Argument gleich 
-einem der anderen Argumente ist.}
-
-@defform[(expect-range expr expr expr)]{
-
-Wie @racket[expect], aber entsprechend @racket[check-range]: Die
-Argumente müssen Zahlen sein.  Die Eigenschaft gilt, wenn die erste Zahl
-zwischen der zweiten und dritten Zahl liegt (inklusive).}
-
-
-@defform[(==> expr expr)]{
-Der erste Operand ist ein boolescher Ausdruck, der zweite Operand eine
-Eigenschaft: @racket[(==> c p)] legt fest, daß die Eigenschaft
-@racket[p] nur erfüllt sein muß, wenn @racket[c] (die
-@emph{Bedingung}) @racket[#t] ergibt, also erfüllt ist.}
- 
-@racketblock[
-(for-all ((x integer))
-  (==> (even? x)
-       (= x (* 2 (/ x 2)))))
-]
-
-@section[#:tag "beginner-prim-ops"]{Primitive Operationen}
-
-@declare-exporting[deinprogramm/DMdA-beginner]
-@prim-op-defns['(lib "DMdA-beginner.rkt" "deinprogramm") #'here '()]
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-lib.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-lib.scrbl
deleted file mode 100644
index a115f11aa3..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-lib.scrbl
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-	  scribble/eval
-          (for-label scheme/base
-                     scheme/contract
-                     scheme/class
-                     scheme/gui/base
-                     lang/posn
-                     lang/imageeq
-                     lang/prim))
-
-@(define DMdA @italic{Die Macht der Abstraktion})
-@(define (DMdA-ref s) @secref[#:doc '(lib "deinprogramm/scribblings/deinprogramm.scrbl") s])
-
-Note: This is documentation for the language levels that go with the
-German textbook @italic{@link["http://www.deinprogramm.de/dmda/"]{Die
-Macht der Abstraktion}}.
-
-@title{@bold{DMdA}: Sprachen als Libraries}
-
-@; ------------------------------------------------------------
-@section{@italic{Die Macht der Abstraktion} - Anfänger}
-
-@defmodule[deinprogramm/DMdA-beginner]
-
-Das Modul @racketmodname[deinprogramm/DMdA-beginner] implementiert die
-Anfängersprache für @|DMdA|; siehe @DMdA-ref["DMdA-beginner"].
-
-@; ------------------------------------------------------------
-@section{@italic{Die Macht der Abstraktion}}
-
-@defmodule[deinprogramm/DMdA-vanilla]
-
-Das Modul @racketmodname[deinprogramm/DMdA-vanilla] implementiert die
-Standardsprache für @|DMdA|; siehe @DMdA-ref["DMdA-vanilla"].
-
-@; ------------------------------------------------------------
-@section{@italic{Die Macht der Abstraktion} mit Zuweisungen}
-
-@defmodule[deinprogramm/DMdA-assignments]
-
-Das Modul @racketmodname[deinprogramm/DMdA-assignments] implementiert
-die Sprachebene für @|DMdA| mit Zuweisungen und Mutationen; siehe
-@DMdA-ref["DMdA-assignments"].
-
-@; ------------------------------------------------------------
-@section{@italic{Die Macht der Abstraktion} - fortgeschritten}
-
-@defmodule[deinprogramm/DMdA-advanced]
-
-Das Modul @racketmodname[deinprogramm/DMdA-advanced] implementiert
-die fortgeschrittene Sprachebene für @|DMdA|; siehe
-@DMdA-ref["DMdA-advanced"].
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-vanilla.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-vanilla.scrbl
deleted file mode 100644
index 06f63465e4..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/DMdA-vanilla.scrbl
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang scribble/doc
-@(require scribblings/htdp-langs/common "std-grammar.rkt" "prim-ops.rkt"
-          (for-label deinprogramm/DMdA-vanilla
-                     (only-in deinprogramm/DMdA-beginner define)))
-
-@title[#:style 'toc #:tag "DMdA-vanilla"]{Die Macht der Abstraktion}
-
-This is documentation for the language level @italic{Die Macht der
-Abstraktion} to go with the German textbook @italic{Die Macht der
-Abstraktion}.
-
-@declare-exporting[deinprogramm/DMdA-vanilla #:use-sources (deinprogramm/DMdA)]
-
-@racketgrammar*-DMdA[
-#:literals ()
-() () ()
-]
-
-@|prim-nonterms|
-
-@prim-ops['(lib "DMdA-vanilla.rkt" "deinprogramm") #'here]
-
-@section[#:tag "signatures-vanilla"]{Signaturen}
-
-@subsection{@racket[list-of]} 
-@defform[(list-of sig)]{
-Diese Signatur ist dann für einen Wert gültig, wenn dieser eine Liste ist,
-für dessen Elemente @racket[sig] gültig ist.
-}
-
-@section{@racket[let], @racket[letrec] und @racket[let*]}
-
-@defform[(let ((id expr) ...) expr)]{
-
-Bei einem @racket[let]-Ausdruck werden zunächst die @racket[expr]s aus
-den @racket[(id expr)]-Paaren ausgewertet. Ihre Werte werden dann im
-Rumpf-@racket[expr] für die Namen @racket[id] eingesetzt. Dabei können
-sich die Ausdrücke nicht auf die Namen beziehen.
-
-@racketblock[
-(define a 3)
-(let ((a 16)
-      (b a))
-  (+ b a))
-=> 19]
-
-Das Vorkommen von @racket[a] in der Bindung von @racket[b] bezieht
-sich also auf das @racket[a] aus der Definition, nicht das @racket[a]
-aus dem @racket[let]-Ausdruck.
-}
-
-@defform[(letrec ((id expr) ...) expr)]{
-Ein @racket[letrec]-Ausdruck ist
-ähnlich zum entsprechenden @racket[let]-Ausdruck, mit dem Unterschied, daß sich
-die @racket[expr]s aus den Bindungen auf die gebundenen Namen beziehen
-dürfen.}
-
-@defform[(let* ((id expr) ...) expr)]{
-Ein @racket[let*]-Ausdruck ist ähnlich zum entsprechenden
-@racket[let]-Ausdruck, mit dem Unterschied, daß sich die @racket[expr]s
-aus den Bindungen auf die Namen beziehen dürfen, die jeweils vor dem
-@racket[expr] gebunden wurden. Beispiel:
-
-@racketblock[
-(define a 3)
-(let* ((a 16)
-       (b a))
-  (+ b a))
-=> 32]
-
-Das Vorkommen von @racket[a] in der Bindung von @racket[b] bezieht
-sich also auf das @racket[a] aus dem @racket[let*]-Ausdruck, nicht das
-@racket[a] aus der globalen Definition.
-}
-
-@section[#:tag "vanilla-prim-op"]{Primitive Operationen}
-
-@prim-op-defns['(lib "DMdA-vanilla.rkt" "deinprogramm") #'here '()]
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/deinprogramm.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/deinprogramm.scrbl
deleted file mode 100644
index 38ba574949..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/deinprogramm.scrbl
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label scheme))
-
-@title[#:style '(toc) #:tag "deinprogramm"]{Sprachebenen und Material zu @italic{Die Macht der Abstraktion}}
-
-Note: This is documentation for the teachpacks that go with the German
-textbook @italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht
-der Abstraktion}}.
-
-Das Material in diesem Handbuch ist für die Verwendung mit dem Buch
-the @italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht der
-Abstraktion}} gedacht.
-
-@table-of-contents[]
-
-@include-section["DMdA-beginner.scrbl"]
-@include-section["DMdA-vanilla.scrbl"]
-@include-section["DMdA-assignments.scrbl"]
-@include-section["DMdA-advanced.scrbl"]
-
-@include-section["ka.scrbl"]
-
-@include-section["image.scrbl"]
-@include-section["world.scrbl"]
-@include-section["turtle.scrbl"]
-@include-section["sound.scrbl"]
-@include-section["line3d.scrbl"]
-
-@include-section["DMdA-lib.scrbl"]
-
-@index-section[]
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/image.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/image.scrbl
deleted file mode 100644
index 84380a7307..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/image.scrbl
+++ /dev/null
@@ -1,250 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label scheme teachpack/deinprogramm/image))
-
-@teachpack["image"]{Bilder konstruieren}
-
-Note: This is documentation for the @filepath{image.rkt} teachpack that goes
-with the German textbook
-@italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht der
-Abstraktion}}.
-
-@declare-exporting[teachpack/deinprogramm/image #:use-sources (deinprogramm/image)]
-
-Dieses Teachpack definiert Prozeduren für die Konstruktion von Bildern.
-Einfache Bilder werden als geometrische Formen oder Bitmaps konstruiert.
-Zusätzliche Prozeduren erlauben die Komposition von Bildern.
-
-@;-----------------------------------------------------------------------------
-@section{Bilder}
-
-@defthing[image signature]{
-Ein @deftech{Bild} (Name: @racket[image]) ist die Repräsentation eines Bildes.
-} 
-
-@defthing[empty-image image]{
-Ein leeres Bild mit Breite und Höhe 0.
-}
-
-@defthing[image? (any -> boolean?)]{Der Aufruf @racket[(image? x)] stellt fest, ob @racket[x] ein Bild ist.}
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "modes-colors"]{Modi und Farben}
-
-@defthing[mode signature]{
-@racket[(one-of "solid" "outline")]
-
-Ein Modus (Name: @racket[mode]) legt fest, ob die Darstellung einer Form diese füllt
-oder nur einen Umriss zeichnet.}
-
-@defthing[octet signature]{
-@racket[(combined natural (predicate (lambda (n) (<= n 255))))]
-
-Ein Oktet (Name: @racket[octet]) ist eine natürliche Zahl zwischen 0 und 255.}
-
-@defthing[rgb-color signature]{
-Eine @deftech{RGB-Farbe} ist eine Farbe (Name: @racket[color], die vom
-Record-Konstruktor @racket[make-color] zurückgegeben wird:
-}
-
-@defthing[make-color (octet octet octet -> rgb-color)]{
-Eine @tech{RGB-Farbe} beschreibt eine Farbe mit den roten, blauen und grünen Anteilen,
-also z.B. @racket[(make-color 100 200 30)].}
-
-@defthing[color-red (color -> octet)]{
- liefert den Rot-Anteil einer RGB-Farbe.}
-@defthing[color-green (color -> octet)]{
- liefert den Grün-Anteil einer RGB-Farbe.}
-@defthing[color-blue (color -> octet)]{
- liefert den Blau-Anteil einer RGB-Farbe.}
-
-@defthing[color? (any -> boolean)]{
-stellt fest, ob ein Objekt eine @tech{RGB-Farbe} ist.}
-
-@defthing[image-color signature]{
-@racket[(mixed string rgb-color)] 
-
-Eine @deftech{Farbe} (Name: @racket[image-color]) ist eine Zeichenkette aus einer Farbbezeichnung
-(z.B. @racket["blue"]) oder eine @tech{RGB-Farbe}.}
-
-@defthing[image-color? (any -> boolean?)]{ stellt fest, ob ein Objekt
-eine @tech{Farbe} ist.}
-
-@defthing[alpha-rgb-color signature]{
-Eine @deftech{Alpha/RGB-Farbe} ist eine Farbe (Name: @racket[color], die vom
-Record-Konstruktor @racket[make-alpha-color] zurückgegeben wird:
-}
-
-@defthing[make-alpha-color (octet octet octet octet -> alpha-color)]{
-Eine @tech{Alpha/RGB-Farbe} beschreibt eine Farbe mit den Alpha-, roten,
-blaue und grünen Anteilen, also z.B. @racket[(make-color 50 100 200
-30)].  Der Alpha-Anteil beschreibt, wie durchsichtig die Farbe ist.}
-
-@defthing[alpha-color-red (color -> octet)]{
- liefert den Rot-Anteil einer RGB-Farbe.}
-@defthing[alpha-color-green (color -> octet)]{
- liefert den Grün-Anteil einer RGB-Farbe.}
-@defthing[alpha-color-blue (color -> octet)]{
- liefert den Blau-Anteil einer RGB-Farbe.}
-@defthing[alpha-color-alpha (color -> octet)]{
- liefert den Alpha-Anteil einer RGB-Farbe.}
-
-@defthing[alpha-color? (any -> boolean)]{
-stellt fest, ob ein Objekt eine @tech{Alpha/RGB-Farbe} ist.}
-
-
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "creational"]{Einfache geometrische Figuren}
-
-Die folgenden Prozeduren erzeugen Bilder mit einfachen geometrischen Formen:
-
-@defthing[rectangle (natural natural mode image-color -> image)]{
- Der Aufruf @racket[(rectangle w h m c)]
- erzeugt ein Rechteck mit Breite @racket[w] und Höhe @racket[h], gefüllt mit Modus
- @racket[m] und in Farbe @racket[c].}
-
-@defthing[circle (natural mode image-color -> image)]{
- Der Aufruf @racket[(circle r m c)]
- erzeugt einen Kreis oder eine Scheibe mit Radius @racket[r], gefüllt mit Modus
- @racket[m] und in Farbe @racket[c].}
-
-@defthing[ellipse (natural natural mode image-color -> image)]{
- Der Aufruf @racket[(ellipse w h m c)]
- erzeugt eine Ellipse mit Breite @racket[w] und Höhe @racket[h], gefüllt mit Modus
- @racket[m] und in Farbe @racket[c].}
-
-@defthing[triangle (integer mode image-color -> image)]{ 
- Der Aufruf @racket[(triangle s m c)]
- erzeugt ein nach oben zeigendes gleichseitiges Dreieck, wobei
- @racket[s] die Seitenlänge angibt, gefüllt mit Modus
- @racket[m] und in Farbe @racket[c].}
-
-@defthing[line (natural natural number number number number image-color -> image)]{
- Der Aufruf @racket[(line w h sx sy ex ey c)]
- erzeugt ein Bild mit einer farbigen Strecke, wobei @racket[w] die Breite und @racket[h] die Höhe des Bilds,
- sowie @racket[sx] die X- und @racket[sx] die Y-Koordinate des Anfangspunkts und 
- @racket[ex] die X- und @racket[ey] die Y-Koordinate des Endpunkts angeben, gefüllt mit Modus
- @racket[m] und in Farbe @racket[c].}
-
-@defthing[text (string natural image-color -> image)]{
- Der Aufruf @racket[(text s f c)]
- erzeugt ein Bild mit Text @racket[s],
- wobei die Buchstaben die Größe @racket[f] haben, in Farbe @racket[c]}
-
-Außerdem können beliebige Bitmap-Bilder in ein Scheme-Programm
-eingeklebt werden.
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "properties"]{Eigenschaften von Bildern}
-
-Zwei Eigenschaften von Bildern sind für ihre Manipulation nützlich,
-nämlich Breite und Höhe:
-
-@defthing[image-width (image -> natural)]{
- liefert die Breite von @racket[i] in Pixeln.}
-
-@defthing[image-height (image -> natural)]{
- liefert die Höhe von @racket[i] in Pixeln.}
-
-@defthing[image-inside? (image image -> boolean)]{
-Der Aufruf @racket[(image-inside? i1 i2)] stellt fest, ob das Bild
-@racket[i2] im Bild @racket[i1] enthalten ist.}
-
-@defthing[find-image (image image -> posn)]{
-Der Aufruf @racket[(find-image i1 i2)] findet die Position von @racket[i2]
-im Bild @racket[i1] (in dem es vorkommen muss).}
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "composition"]{Bilder zusammensetzen}
-
-The nächste Gruppe von Prozeduren baut aus Bildern neue Bilder:
-
-@defthing[h-place signature]{
-@racket[(mixed integer (one-of "left" "right" "center"))]
-
-Eine @deftech{horizontale Positionsangabe} (Name: @racket[h-place])
-gibt an, wie zwei Bilder horizontal zueinander positioniert werden
-
-Im ersten Fall, wenn es sich um eine Zahl @racket[x] handelt, wird das
-zweite  Bild  @racket[x] Pixel vom  linken  Rand auf das erste gelegt.
-Die drei Fälle mit Zeichenketten sagen,  daß die Bilder am linken Rand
-bzw. am rechten   Rand bündig plaziert werden,  bzw.  das zweite  Bild
-horizontal in die Mitte des ersten gesetzt wird.}
-
-@defthing[v-place signature]{
-@racket[(mixed integer (one-of "top" "bottom" "center"))]
-
-Eine @deftech{vertikale Positionsangabe} (Name: @racket[v-place]) 
-gibt an, wie zwei Bilder vertikal zueinander positioniert werden
-
-Im ersten Fall, wenn es sich um eine Zahl @racket[y] handelt, wird das
-zweite Bild @racket[y] Pixel vom oberen Rand auf das erste gelegt.
-Die drei Fälle mit Zeichenketten sagen, daß die Bilder am oberen Rand
-bzw. am unteren Rand bündig plaziert werden, bzw. das zweite Bild
-vertikal in die Mitte des ersten gesetzt wird.
-}
-
-@defthing[h-mode signature]{
-@racket[(one-of "left" "right" "center")]
-Eine @deftech{horizontale Justierungsangabe} (Name: @racket[h-mode]) 
-gibt an, ob zwei Bilder, die übereinander angeordnet werden, entlang der linken
-Kante, der rechten Kante oder der Mitte angeordnet werden.
-}
-
-@defthing[v-mode signature]{
-@racket[(one-of "top" "bottom" "center")]
-
-Eine @deftech{vertikale Justierungsangabe} (Name: @racket[V-mode])
-gibt an, ob zwei Bilder, die nebenander angeordnet werden, entlang der
-oberen Kante, der untern Kante oder der Mitte angeordnet werden.}
-
-@defthing[overlay (image image h-place v-place -> image)]{
- Der Aufruf @racket[(overlay img other h v)]
- legt zweite Bild @racket[other] auf das erste @racket[img].  Die beiden anderen Argumente geben an, wie
- die beiden Bilder zueinander positioniert werden.}
-
-@defthing[beside (image image v-mode -> image)]{
- Der Aufruf @racket[(beside img other v)]
- ordnet die beiden Bilder entsprechend des @racket[v]-Arguments
- nebeneinander an.}
-
-@defthing[above (image image h-mode -> image)]{
- Der Aufruf @racket[(img other h -> image)]
- ordnet die beiden Bilder entsprechend des @racket[h]-Arguments
- übereinander an.}
-
-@defthing[clip (image natural natural natural natural -> image)]{
- Der Aufruf @racket[(clip img x y w h)]
- liefert das Teilrechteck des Bildes @racket[img]
- bei (@racket[x], @racket[y]), Breite @racket[w] und Höhe @racket[h].}
-
-@defthing[pad (image natural natural natural natural -> image)]{
-  Der Aufruf @racket[(pad img l r t b)]
-  fügt an den Seiten von @racket[img] noch transparenten Leerraum an:
-  @racket[l] Pixel links, @racket[r] Pixel rechts, @racket[t] Pixel oben und
-  @racket[b] Pixel unten.}
-
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "from-pixels"]{Bilder aus Pixeln konstruieren}
-
-@defthing[color-list->image ((list-of color) natural natural -> image)]{
-  Der Aufruf @racket[(color-list->image lis w h)] stellt ein Bild mit
-  Breite @racket[w] und Höhe @racket[h] her, in dem die Pixel die
-  Farben aus der Liste @racket[lis] (welche die Länge @racket[(* w h)]
-  haben muß) haben.}
-
-@defthing[image->color-list (image -> (list-of rgb-color))]{
-  Diese Prozedur liefert eine Liste der RGB-Farben der Pixel eines Bildes.}
-
-@defthing[alpha-color-list->image ((list-of alpha-rgb-color) natural natural -> image)]{
-  Der Aufruf @racket[(color-list->image lis w h)] stellt ein Bild mit
-  Breite @racket[w] und Höhe @racket[h] her, in dem die Pixel die
-  Farben aus der Liste @racket[lis] (welche die Länge @racket[(* w h)]
-  haben muß) haben.}
-
-@defthing[image->alpha-color-list (image -> (list-of rgb-color))]{
-  Diese Prozedur liefert eine Liste der Alpha/RGB-Farben der Pixel
-  eines Bildes.}
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/info.rkt b/pkgs/deinprogramm/deinprogramm/scribblings/info.rkt
deleted file mode 100644
index b8c7a35ec6..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("deinprogramm.scrbl" (multi-page) (teaching -21))))
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/ka-style.tex b/pkgs/deinprogramm/deinprogramm/scribblings/ka-style.tex
deleted file mode 100644
index e9bbecbf4f..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/ka-style.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-% use
-% scribble --latex --style ka-style.tex ka.scrbl
-% to render the document
-\usepackage[utf8]{inputenc}
-\usepackage{german}
-\usepackage{a4}
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/ka.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/ka.scrbl
deleted file mode 100644
index ee211d46ac..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/ka.scrbl
+++ /dev/null
@@ -1,356 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-         scribble/basic
-         scribble/extract
-         scheme/class
-         scheme/contract)
-
-@title{Konstruktionsanleitungen 1 bis 10}
-
-This documents the design recipes of the German textbook @italic{Die
-Macht der Abstraktion}.
-
-@table-of-contents[]
-
-@section{Konstruktion von Prozeduren}
-  Gehen Sie bei der Konstruktion einer Prozedur in folgender Reihenfolge
-  vor:
-@itemize[
-  @item{@bold{Kurzbeschreibung} Schreiben Sie eine einzeilige Kurzbeschreibung.}
-  @item{@bold{Datenanalyse} Führen Sie eine Analyse der beteiligten Daten
-    durch. Stellen Sie dabei fest, zu welcher Sorte die Daten gehören, ob
-    Daten mit Fallunterscheidung vorliegen und ob zusammengesetzte
-    oder gemischte Daten vorliegen.}
-  @item{@bold{Signatur} (im Buch ``Vertrag'') Wählen Sie einen Namen und schreiben Sie eine Signatur für die Prozedur.}
-  @item{@bold{Testfälle}  Schreiben Sie einige Testfälle.}
-  @item{@bold{Gerüst} Leiten Sie direkt aus der Signatur das Gerüst der Prozedur her.}
-  @item{@bold{Schablone} Leiten Sie aus der Signatur und der Datenanalyse mit
-    Hilfe der Konstruktionsanleitungen eine Schablone her.}
-  @item{@bold{Rumpf} Vervollständigen Sie den Rumpf der Prozedur.}
-  @item{@bold{Test} Vergewissern Sie sich, daß die Tests erfolgreich laufen.}
-]
-
-@section{Fallunterscheidung}
-Wenn ein Argument einer Prozedur zu einer Fallunterscheidung gehört,
-die möglichen Werte also in feste Kategorien sortiert werden können,
-steht im Rumpf eine Verzweigung.  Die Anzahl der Zweige entspricht
-der Anzahl der Kategorien.
-
-Die Schablone für eine Prozedur @racket[proc], deren Argument zu einer Sorte gehört,
-die @italic{n} Kategorien hat, sieht folgendermaßen aus:
-
-@racketblock[
-(: proc (sig -> ...))
-(define proc
-  (lambda (a)
-    (cond
-      (#,(elem @racket[test] @subscript{1}) ...)
-      ...
-      (#,(elem @racket[test] @subscript{n}) ...))))
-]
-Dabei ist @racket[sig] die Signatur, den die Elemente der Sorte erfüllen müssen. 
-Die @elem[@racket[test] @subscript{i}]  müssen Tests sein, welche die einzelnen Kategorien
-erkennen.  Sie sollten alle Kategorien abdecken.
-Der letzte Zweig kann auch ein @racket[else]-Zweig sein, falls
-klar ist, daß @racket[a] zum letzten Fall gehört, wenn alle vorherigen
-@elem[@racket[test] @subscript{i}] @racket[#f] ergeben haben.
-Anschließend werden die Zweige vervollständigt.
-
-Bei Fallunterscheidungen mit zwei Kategorien kann auch @racket[if]
-statt @racket[cond] verwendet werden.
-
-@section{zusammengesetzte Daten}
-Wenn bei der Datenanalyse zusammengesetzte Daten vorkommen, stellen
-Sie zunächst fest, welche Komponenten zu welchen Sorten gehören.
-Schreiben Sie dann eine Datendefinition, die mit folgenden Worten
-anfängt:
-
-@racketblock[
-(code:comment @#,t{Ein @racket[x] besteht aus / hat:})
-(code:comment @#,t{- @racket[#,(elem @racket[Feld] @subscript{1})] @racket[(#,(elem @racket[sig] @subscript{1}))]})
-(code:comment @#,t{...})
-(code:comment @#,t{- @racket[#,(elem @racket[Feld] @subscript{n})] @racket[(#,(elem @racket[sig] @subscript{n}))]})
-]
-
-Dabei ist @racket[x] ein umgangssprachlicher Name für die Sorte
-(``Schokokeks''), die @elem[@racket[Feld] @subscript{i}] sind
-umgangssprachliche Namen und kurze Beschreibungen der Komponenten 
-und die @elem[@racket[sig] @subscript{i}] die dazugehörigen Signaturen.
-
-Übersetzen Sie die Datendefinition in eine Record-Definition, indem Sie
-auch Namen für die Record-Signatur @racket[sig], Konstruktor @racket[constr],
-Prädikat @racket[pred?] und die Selektoren @elem[@racket[select] @subscript{i}]
-wählen:
-@racketblock[
-(define-record-procedures sig
-  constr pred?
-  (#,(elem @racket[select] @subscript{1}) ... #,(elem @racket[select] @subscript{n})))
-]
-
-Schreiben Sie außerdem eine Signatur für den Konstruktor der
-Form:
-
-@racketblock[
-(: constr (#,(elem @racket[sig] @subscript{1}) ... #,(elem @racket[sig] @subscript{n}) -> sig))
-]
-
-Ggf. schreiben Sie außerdem Signaturen für das Prädikat und die Selektoren:
-
-@racketblock[
-(: pred? (any -> boolean))
-(: #,(elem @racket[select] @subscript{1}) (sig -> #,(elem @racket[sig] @subscript{1})))
-...
-(: #,(elem @racket[select] @subscript{n}) (sig -> #,(elem @racket[sig] @subscript{n})))
-]
-
-@section{zusammengesetzte Daten als Argumente}
-Wenn ein Argument einer Prozedur zusammengesetzt ist, stellen Sie
-zunächst fest, von welchen Komponenten des Records das Ergebnis der
-Prozeduren abhängt.
-
-Schreiben Sie dann für jede Komponente @racket[(select a)] in die
-Schablone, wobei @racket[select] der Selektor der Komponente und @racket[a] der Name
-des Parameters der Prozedur ist.
-
-Vervollständigen Sie die Schablone, indem Sie einen Ausdruck
-konstruieren, in dem die Selektor-Anwendungen vorkommen.
-
-@section{zusammengesetzte Daten als Ausgabe}
-Eine Prozedur, die einen neuen zusammengesetzten Wert zurückgibt,
-enthält einen Aufruf des Konstruktors des zugehörigen Record-Typs.
-
-@section{gemischte Daten}
-Wenn bei der Datenanalyse gemischte Daten auftauchen, schreiben Sie
-eine Datendefinition der Form:
-
-@racketblock[
-(code:comment @#,t{Ein @racket[x] ist eins der Folgenden:})
-(code:comment @#,t{- @elem[@racket[Sorte] @subscript{1}] (@elem[@racket[sig] @subscript{1}])})
-(code:comment @#,t{...})
-(code:comment @#,t{- @elem[@racket[Sorte] @subscript{n}] (@elem[@racket[sig] @subscript{n}])})
-(code:comment @#,t{Name: @racket[sig]})
-]
-
-Dabei sind die @elem[@racket[Sorte] @subscript{i}] umgangssprachliche Namen
-für die möglichen Sorten, die ein Wert aus diesen gemischten Daten
-annehmen kann.  Die @elem[@racket[sig] @subscript{i}] sind die zu den Sorten
-gehörenden Signaturen.  Der Name @racket[sig] ist für die Verwendung als
-Signatur.
-
-Aus der Datendefinition entsteht eine Signaturdefinition folgender Form:
-
-@racketblock[
-(define sig
-  (signature
-    (mixed #,(elem @racket[sig] @subscript{1})
-           ...
-           #,(elem @racket[sig] @subscript{n}))))
-]
-
-Wenn die Prädikate für die einzelnen Sorten @elem[@racket[pred?]
-@subscript{1}] ... @elem[@racket[pred?] @subscript{n}] heißen, hat die
-Schablone für eine Prozedur, die gemischte Daten konsumiert, die
-folgende Form:
-
-@racketblock[
-(: proc (sig -> ...))
-
-(define proc
-  (lambda (a)
-    (cond
-      ((#,(elem @racket[pred?] @subscript{1}) a) ...)
-      ...
-      ((#,(elem @racket[pred?] @subscript{n}) a) ...))))
-]
- 
-Die rechten Seiten der Zweige werden dann nach den
-Konstruktionsanleitungen der einzelnen Sorten ausgefüllt.
-
-@section{Listen}
-
-Eine Prozedur, die eine Liste konsumiert, hat die folgende
-Schablone:
-  
-@racketblock[
-(: proc ((list-of elem) -> ...))
-
-(define proc
-  (lambda (lis)
-    (cond
-      ((empty? lis) ...)
-      ((pair? lis)
-       ... (first lis)
-       ... (proc (rest lis)) ...))))
-]
-
-Dabei ist @racket[elem] die Signatur für die Elemente der Liste.  Dies
-kann eine Signaturvariable (@racket[%a], @racket[%b], ...) sein, falls
-die Prozedur unabhängig von der Signatur der Listenelemente ist.
-
-Füllen Sie in der Schablone zuerst den @racket[empty?]-Zweig aus.
-Vervollständigen Sie dann den anderen Zweig unter der Annahme, daß
-der rekursive Aufruf @racket[(proc (rest lis))] das gewünschte
-Ergebnis für den Rest der Liste liefert.
-
-Beispiel:
-
-@racketblock[
-(: list-sum ((list-of number) -> number))
-
-(define list-sum
-  (lambda (lis)
-    (cond
-      ((empty? lis) 0)
-      ((pair? lis)
-       (+ (first lis)
-          (list-sum (rest lis)))))))
-]
-
-@section{natürliche Zahlen}
-
-Eine Prozedur, die natürliche Zahlen konsumiert, hat die folgende
-Schablone:
-
-@racketblock[
-(: proc (natural -> ...))
-
-(define proc
-  (lambda (n)
-    (if (= n 0)
-        ...
-        ... (proc (- n 1)) ...)))
-]
-
-Füllen Sie in der Schablone zuerst den 0-Zweig aus.  Vervollständigen
-Sie dann den anderen Zweig unter der Annahme, daß der rekursive Aufruf
-@racket[(proc (- n 1))] das gewünschte Ergebnis für @racket[n]-1
-liefert.
-
-Beispiel:
-
-@racketblock[
-(: factorial (natural -> natural))
-
-(define factorial
-  (lambda (n)
-    (if (= n 0)
-        1
-        (* n (factorial (- n 1))))))
-]
-
-@section{Prozeduren mit Akkumulatoren}
-
-Eine Prozedur mit Akkumulator, die Listen konsumiert, hat die
-folgende Schablone:
-
-@racketblock[
-(: proc ((list-of elem) -> ...))
-
-(define proc
-  (lambda (lis)
-    (proc-helper lis z)))
-
-(: proc ((list-of elem) sig -> ...))
-
-(define proc-helper
-  (lambda (lis acc)
-    (cond
-      ((empty? lis) acc)
-      ((pair? lis)
-       (proc-helper (rest lis)
-                    (... (first lis) ... acc ...))))))
-]
-
-Hier ist @racket[proc] der Name der zu definierenden Prozedur und
-@racket[proc-helper] der Name der Hilfsprozedur mit Akkumulator.  Der
-Anfangswert für den Akkumulator ist der Wert von @racket[z].  Die Signatur @racket[sig]
-ist die Signatur für den Akkumulator.  Der
-Ausdruck @racket[(... (first lis) ... acc ...)] 
-macht aus dem alten Zwischenergebnis @racket[acc] das neue
-Zwischenergebnis.
-
-Beispiel:
-
-@racketblock[
-(: invert ((list-of %a) -> (list-of %a)))
-
-(define invert
-  (lambda (lis)
-    (invert-helper lis empty)))
-
-(: invert ((list-of %a) (list-of %a) -> (list-of %a)))
-
-(define invert-helper
-  (lambda (lis acc)
-    (cond
-      ((empty? lis) acc)
-      ((pair? lis)
-       (invert-helper (rest lis)
-                      (make-pair (first lis) acc))))))
-]
-
-Eine Prozedur mit Akkumulator, die natürliche Zahlen konsumiert, hat die
-folgende Schablone:
-
-@racketblock[
-(: proc (natural -> ...))
-
-(define proc
-  (lambda (n)
-    (proc-helper n z)))
-
-(define proc-helper
-  (lambda (n acc)
-    (if (= n 0)
-        acc
-        (proc-helper (- n 1) (... acc ...)))))
-]
-
-Dabei ist @racket[z] das gewünschte Ergebnis für @racket[n] = 0.  Der
-Ausdruck @racket[(... acc ...)] muß den neuen Wert für den
-Akkumulator berechnen.
-
-Beispiel:
-
-@racketblock[
-(: ! (natural -> natural))
-
-(define !
-  (lambda (n)
-    (!-helper n 1)))
-
-(define !-helper
-  (lambda (n acc)
-    (if (= n 0)
-        acc
-        (!-helper (- n 1) (* n acc)))))
-]
-
-@section{gekapselter Zustand}
-Falls ein Wert Zustand enthalten soll, schreiben Sie eine
-Datendefinition wie bei zusammengesetzten Daten.
-
-Schreiben Sie dann eine Record-Definition mit
-@racket[define-record-procedures-2] und legen Sie dabei fest, welche
-Bestandteile veränderbar sein sollen.  Geben Sie Mutatoren für die
-betroffenen Felder an.  Wenn der Selektor für das Feld @racket[select]
-heißt, sollte der Mutator i.d.R. @racket[set-select!] heißen.  Die Form
-sieht folgendermaßen aus, wobei an der Stelle @racket[k] ein
-veränderbares Feld steht:
-
-@racketblock[
-(define-record-procedures-2 sig
-  constr pred?
-  (#,(elem @racket[select] @subscript{1}) ... (#,(elem @racket[s] @subscript{k}) #,(elem @racket[mutate] @subscript{k})) ... #,(elem @racket[s] @subscript{n})))
-]
-
-In der Schablone für Prozeduren, die den Zustand eines Record-Arguments
-@racket[r] ändern, benutzen Sie den dazugehörigen Mutator
-@elem[@racket[mutate] @subscript{k}] Wenn @racket[a] der Ausdruck für
-den neuen Wert der Komponente ist, sieht der Aufruf folgendermaßen aus:
-@racket[(#,(elem @racket[mutate] @subscript{k}) r a)].
-
-Um mehrere Komponenten in einer Prozedur zu verändern, oder um einen
-sinnvollen Rückgabewert nach einer Mutation zu liefern, benutzen Sie
-@racket[begin].
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/line3d.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/line3d.scrbl
deleted file mode 100644
index da376790e5..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/line3d.scrbl
+++ /dev/null
@@ -1,240 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label scheme
-                     teachpack/deinprogramm/image
-                     teachpack/deinprogramm/line3d))
-
-@teachpack["line3d"]{3D-Liniengraphik}
-
-Note: This is documentation for the @filepath{line3d.rkt} teachpack that goes
-with the German textbook
-@italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht der
-Abstraktion}}.
-
-@declare-exporting[teachpack/deinprogramm/line3d #:use-sources (teachpack/deinprogramm/line3d)]
-
-Dieses teachpack definiert Prozeduren für lineare Algebra und 3D-Rendering:
-
-@;----------------------------------------------------------------------------------
-@section[#:tag "rendering"]{Szenen erzeugen}
-
-@declare-exporting[teachpack/deinprogramm/line3d]
-
-@defthing[render-scene (natural natural (list-of line3d) matrix4x4 -> image)]{
- Der Aufruf @racket[(render-scene width height scene camera-matrix)]erzeugt die Szene
- in ein Bild mit Breite @racket[width] und Höhe @racket[height]. Position,
- Orientierung und Projektion werden durch die @racket[camera-matrix] festgelegt.
-}
- 
-@defthing[create-camera-matrix (vec3 vec3 number natural natural -> matrix4x4)]{
- Der Aufruf @racket[(create-camera-matrix position lookat vertical-fov width height)]
- erzeugt eine 4x4 Matrix. Diese kodiert eine Kamera an der Position @racket[position], die 
- auf die Position @racket[lookat] schaut.
- @racket[vertical-fov] bezeichnet das @deftech{vertikale Feld} der Szene.
-}
-
-Zum Beispiel:
-
-@racketblock[
-(code:comment @#,t{scene-data (simple box example)})
-(define box
-  (create-box 1.0 1.0 1.0 "brown")) 
-(code:comment @#,t{screen})
-(define screenWidth 320)
-(define screenHeight 240) 
-(code:comment @#,t{camera})
-(define pos (make-vec3 5 5 3))
-(define lookat (make-vec3 0 0 0))
-(define camera
-  (create-camera-matrix pos lookat 70.0 screenWidth screenHeight))
-(code:comment @#,t{render image})
-(render-scene screenWidth screenHeight box camera)
-]
-
-@;-------------------------------------------------------------------------------------
-@section[#:tag "3Dvectors"]{3D-Vektoren}
-
-@defthing[vec3 signature]{
- Ein @deftech{3D-Vektor} (Name: @racket[vec3]) ist ein Record, der durch den Aufruf @racket[make-vec3] erstellt wird.
-}
-
-@defthing[make-vec3 (number number number -> vec3)]{
- @racket[(make-vec3 x y z)] erstellt einen Vektor (x,y,z).
-}
-
-@defthing[add-vec3 (vec3 vec3 -> vec3)]{
- @racket[(add-vec3 a b)] gibt die Summe von @racket[a] und @racket[b] zurück.
-}
-
-@defthing[sub-vec3 (vec3 vec3 -> vec3)]{
- @racket[(sub-vec3 a b)] gibt die Differenz zwischen @racket[a] und @racket[b] zurück.
-}
-
-@defthing[mult-vec3 (vec3 number -> vec3)]{
- @racket[(mult-vec3 a s)] gibt den das Produkt von @racket[a] und @racket[s] zurück.
-}
-
-@defthing[div-vec3 (vec3 number -> vec3)]{
- @racket[(div-vec3 a s)] gibt den das Produkt von @racket[a] und dem Kehrwert von @racket[s] zurück.
-}
-
-@defthing[dotproduct-vec3 (vec3 vec3 -> number)]{
- @racket[(dotproduct-vec3 a b)] gibt das Produkt von @racket[a] und @racket[b] zurück.
-}
-
-@defthing[normQuad-vec3 (vec3 -> number)]{
- @racket[(normQuad-vec3 a)] gibt die quadrierte Norm/Länge |@racket[a]|² eines Vektors @racket[a] zurück (Quadrat der Euklidischen Norm.)
-}
-
-@defthing[norm-vec3 (vec3 -> number)]{
- @racket[(norm-vec3 a)] gibt die Norm/Länge |@racket[a]| eines Vektors a zurück (Euklidische Norm.)
-}
-
-@defthing[normalize-vec3 (vec3 -> vec3)]{
- @racket[(normalize-vec3 a)] normalisiert @racket[a].
-}
-
-@defthing[crossproduct-vec3 (vec3 vec3-> vec3)]{
- @racket[(crossproduct-vec3 a b)] gibt das Kreuzprodukt von @racket[a]
-und @racket[b] zurück (einen Vektor der senkrecht auf @racket[a] und @racket[b] steht).
-}
-
-@;-------------------------------------------------------------------------------------
-@section[#:tag "4Dvectors"]{4D-Vektoren}
-
-@defthing[vec4 signature]{
- Ein @deftech{4D-Vektor} @racket[vec4] ist ein 4D-Vektor. Folgende Prozeduren werden bereitgestellt:
-}
-
-@defthing[make-vec4 (number number number number -> vec4)]{
- @racket[(make-vec4 a b c d)] erzeugt einen Vektor aus @racket[a], @racket[b], @racket[c] und @racket[d].
-}
-
-@defthing[add-vec4 (vec4 vec4 -> vec4)]{
-@racket[(add-vec4 a b)]  gibt die Summe von @racket[a] und @racket[b] zurück.
-}
-
-@defthing[sub-vec4 (vec4 vec4 -> vec4)]{
- @racket[(sub-vec4 a b)] gibt die Differenz zwischen @racket[a] und @racket[b] zurück.
-}
-
-@defthing[mult-vec4 (vec4 number -> vec4)]{
- @racket[(mult-vec4 a s)] gibt den das Produkt von @racket[a] und @racket[s] zurück.
-}
-
-@defthing[div-vec4 (vec4 number -> vec4)]{
- @racket[(div-vec4 a s)] gibt den das Produkt von @racket[a] und dem Kehrwert von @racket[s] zurück.
-}
-
-@defthing[dotproduct-vec4 (vec3 vec4 -> number)]{
- @racket[(dotproduct-vec4 a b)] gibt die quadrierte Norm/Länge |@racket[a]|² eines Vektors @racket[a] zurück (Quadrat der Euklidischen Norm.)
-}
-
-@defthing[normQuad-vec4 (vec4 -> number)]{
- @racket[(normQuad-vec4 a)] gibt die quadrierte Norm/Länge |@racket[a]|² eines Vektors @racket[a] zurück (Quadrat der Euklidischen Norm.)
-}
-
-@defthing[norm-vec4 (vec4 -> number)]{
- @racket[(norm-vec4 a)] gibt die Norm/Länge |a| eines Vektors a zurück (Euklidische Norm)
-}
-
-@defthing[normalize-vec4 (vec4 -> vec4)]{
- @racket[(normalize-vec4 a)] normalisiert @racket[a].
-}
-
-@defthing[expand-vec3 (vec3 number -> vec4)]{
- @racket[(expand-vec3 a s)] gibt den 4D-Vektor mit @racket[s] als letze Komponente zurück (erweitert @racket[a] mit @racket[s]).
-}
-
-@;-------------------------------------------------------------------------------------
-@section[#:tag "4x4matrix"]{4x4 Matrizen}
-
-@defthing[matrix4x4 signature]{
- Eine @deftech{Matrix} @racket[matrix4x4] ist ein Record, der durch den Aufruf @racket[make-matrix4x4] erstellt wird.
-}
-
-@defthing[make-matrix4x4 (vec4 vec4 vec4 vec4 -> matrix4x4)]{
- @racket[(make-matrix4x4 a b c d)] erstellt eine Matrix aus @racket[a], @racket[b], @racket[c] und @racket[d].
-}
-
-@defthing[create-matrix4x4 (vec3 vec3 vec3 vec3 -> matrix4x4)]{
- @racket[(create-matrix4x4 a b c d)] erweitert jeden Vektor in einen 4D-Vektor und kombiniert diese zu
- einer Matrix @racket[a], @racket[b], @racket[c] und @racket[d], wobei
- @racket[a], @racket[b], @racket[c] mit 0 und @racket[d] mit 1 erweitert wird, um eine homogene Matrix zu erzeugen.
-}
-
-@defthing[transpose-matrix4x4 (matrix4x4 -> matrix4x)]{
- @racket[(transpose-matrix4x4 m)] erstellt die transponierte Matrix @racket[m]^@racket[T].
-}
-
-@defthing[multiply-matrix-vec4 (matrix vec4 -> vec4)]{
- @racket[(multiply-matrix-vec4 m v)] gibt die Matrix @racket[m]@racket[v] zurück. Die @racket[w]-Komponente ist nicht normalisiert.
-}
-
-@defthing[transform-vec3 (matrix4x4 vec3 -> vec3)]{
- @racket[(transform-vec3 m v)] erweitert @racket[v] mit 1, multipliziert @racket[m] mit @racket[v] und dividiert das Ergebnis mit @racket[w].
-}
-
-@defthing[multiply-matrix (matrix4x4 matrix4x4 -> matrix4x4)]{
- @racket[(multiply-matrix a b)] gibt die Matrix @racket[a]*@racket[b] zurück.
-}
-
-@defthing[create-translation-matrix (vec3 -> matrix4x4)]{
- @racket[(create-translation-matrix v)] gibt die Translations-Matrix zurück.
-}
-
-@defthing[create-rotation-x-matrix (number -> matrix4x4)]{
- @racket[(create-rotation-x-matrix a)] gibt eine Rotations-Matrix zurück die um die X-Achse mit dem Winkel @racket[a] rotiert.
-}
-
-@defthing[create-rotation-y-matrix (number -> matrix4x4)]{
- @racket[(create-rotation-y-matrix a)] gibt eine Rotations-Matrix zurück die um die Y-Achse mit dem Winkel @racket[a] rotiert.
-}
-
-@defthing[create-rotation-z-matrix (number -> matrix4x4)]{
- @racket[(create-rotation-z-matrix a)] gibt eine Rotations-Matrix zurück die um die Z-Achse mit dem Winkel @racket[a] rotiert.
-}
-
-@defthing[create-lookat-matrix (vec3 vec3 vec3 -> matrix4x4)]{
- @racket[(create-lookat-matrix pos lookat up)] gibt eine Kameramatrix. Ursprungspunkt ist @racket[pos], die Z-Achse zeigt auf @racket[lookat].
-}
-
-@defthing[create-projection-matrix (number -> matrix4x4)]{
- @racket[(create-projection-matrix vertical-fov/2)] erzeugt eine Projektions-Matrix. @racket[vertical-fov]/2 gibt den vertikalen Winkel der Ansicht dividiert durch 2 an.
-}
-
-@defthing[create-viewport-matrix (natural natural -> matrix4x4)]{
- @racket[(create-viewport-matrix width height)] gibt einen Ausschnitt an.
-}
-
-@;-------------------------------------------------------------------------------------
-@section[#:tag "3dline"]{3d-Linien}
-
-
-@defthing[line3d signature]{
- Eine @deftech{3d-Linie} @racket[line3d] ist ein Record, der durch den Aufruf @racket[make-line3d] erstellt wird und eine farbige Linie zwischen zwei Punkten
-      im 3-dimensionalen Raum darstellt.
-}
-
-@defthing[make-line3d (vec3 vec3 color -> line3d)]{
- @racket[(make-line3d a b col)] erstellt eine 3D-Linie zwischen Punkt @racket[a] und Punkt @racket[b] mit der Farbe @racket[col].
-}
-
-@defthing[line3d-a (line3d -> vec3)]{
- extrahiert den Anfangspunkt einer 3D-Linie.}
-
-@defthing[line3d-b (line3d -> vec3)]{
- extrahiert den Endpunkt einer 3D-Linie.}
-
-@defthing[line3d-color (line3d -> color)]{
- extrahiert die Farbe einer 3D-Linie.}
-
-@defthing[create-box (number number number color -> (list-of line3d))]{
- @racket[(create-box width height depth color)] erstellt eine Box am Punkt (0,0,0) in den angebenen Ausmaßen.
-}
-
-@defthing[transform-primitive-list ((list-of line3d) matrix4x4 -> (list-of line3d))]{
- @racket[(transform-primitive-list scene transformationr)] wendet @racket[transformation] auf alle Punkte der Linien in @racket[scene] an und gibt 
-        diese zurück.
-}
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/p1.jpg b/pkgs/deinprogramm/deinprogramm/scribblings/p1.jpg
deleted file mode 100644
index 100685686c..0000000000
Binary files a/pkgs/deinprogramm/deinprogramm/scribblings/p1.jpg and /dev/null differ
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/p2.jpg b/pkgs/deinprogramm/deinprogramm/scribblings/p2.jpg
deleted file mode 100644
index 41a10e1a61..0000000000
Binary files a/pkgs/deinprogramm/deinprogramm/scribblings/p2.jpg and /dev/null differ
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/p3.jpg b/pkgs/deinprogramm/deinprogramm/scribblings/p3.jpg
deleted file mode 100644
index a416ba2336..0000000000
Binary files a/pkgs/deinprogramm/deinprogramm/scribblings/p3.jpg and /dev/null differ
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/p4.jpg b/pkgs/deinprogramm/deinprogramm/scribblings/p4.jpg
deleted file mode 100644
index f6b6c2af70..0000000000
Binary files a/pkgs/deinprogramm/deinprogramm/scribblings/p4.jpg and /dev/null differ
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/prim-ops.rkt b/pkgs/deinprogramm/deinprogramm/scribblings/prim-ops.rkt
deleted file mode 100644
index 32a6e62b00..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/prim-ops.rkt
+++ /dev/null
@@ -1,108 +0,0 @@
-#reader scribble/reader
-#lang scheme/base
-(require scribblings/htdp-langs/common
-         scribble/decode
-         scribble/struct
-         scribble/scheme
-         scheme/list
-         scheme/pretty
-         syntax/docprovide)
-
-(provide prim-ops
-         prim-op-defns)
-
-(define (maybe-make-table l t)
-  (if (paragraph? t)
-      (make-paragraph
-       (append l (cons " "
-                       (paragraph-content t))))
-      (make-table
-       "prototype"
-       (list (list (make-flow (list (make-paragraph l)))
-                   (make-flow (list t)))))))
-
-
-(define (typeset-type type)
-  (let-values ([(in out) (make-pipe)])
-    (parameterize ([pretty-print-columns 50])
-      (pretty-print type out))
-    (port-count-lines! in)
-    (read-syntax #f in)))
-
-(define (sort-category category)
-  (sort
-   (cadr category)
-   (lambda (x y)
-     (string<=? (symbol->string (car x))
-                (symbol->string (car y))))))
-
-
-(define (make-proto func ctx-stx)
-  (maybe-make-table
-   (list
-    (hspace 2)
-    (to-element (datum->syntax ctx-stx (car func)))
-    (hspace 1)
-    ":"
-    (hspace 1))
-   (to-paragraph
-    (typeset-type (cadr func)))))
-  
-(define (prim-ops lib ctx-stx)
-  (let ([ops (map (lambda (cat)
-                    (cons (car cat)
-                          (list (cdr cat))))
-                  (lookup-documentation lib 'procedures))])
-    (make-table
-     #f
-     (apply
-      append
-      (map (lambda (category)
-	     (cons
-	      (list (make-flow
-		     (list
-		      (make-paragraph (list (hspace 1)
-					    (bold (car category)))))))
-	      (map (lambda (func)
-		     (list
-		      (make-flow
-		       (list
-			(make-proto func ctx-stx)))))
-		   (sort-category category))))
-	   ops)))))
-
-
-(define (prim-op-defns lib ctx-stx not-in)
-  (make-splice
-   (let ([ops (map (lambda (cat)
-                     (cons (car cat)
-                           (list (cdr cat))))
-                   (lookup-documentation lib 'procedures))]
-         [not-in-ns (map (lambda (not-in-mod)
-                           (let ([ns (make-base-namespace)])
-                             (parameterize ([current-namespace ns])
-                               (namespace-require `(for-label ,not-in-mod)))
-                             ns))
-                         not-in)])
-     (apply
-      append
-      (map (lambda (category)
-             (filter values
-                     (map
-                      (lambda (func)
-                        (let ([id (datum->syntax ctx-stx (car func))])
-                          (and (not (ormap
-                                     (lambda (ns)
-                                       (free-label-identifier=?
-                                        id
-                                        (parameterize ([current-namespace ns])
-                                          (namespace-syntax-introduce (datum->syntax #f (car func))))))
-                                     not-in-ns))
-                               (let ([desc-strs (cddr func)])
-                                 (defthing/proc
-                                   (if (pair? (cadr func)) "function" "constant")
-                                   id
-                                   (to-paragraph (typeset-type (cadr func)))
-                                   desc-strs)))))
-                      (sort-category category))))
-           ops)))))
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/shared.rkt b/pkgs/deinprogramm/deinprogramm/scribblings/shared.rkt
deleted file mode 100644
index 75c1632401..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/shared.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scheme/base
-
-(require scribble/manual)
-
-(provide teachpack)
-
-(define (teachpack tp . name)
-  (apply title #:tag tp
-         `(,@name ": " ,(filepath (format "~a.ss" tp))
-           ,(index (format "~a-Teachpack" tp)))))
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/sound.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/sound.scrbl
deleted file mode 100644
index 3703bdf010..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/sound.scrbl
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual scribble/struct "shared.rkt"
-          (for-label scheme teachpack/deinprogramm/sound))
-
-@teachpack["sound"]{Abspielen von Audio-Dateien}
-
-Note: This is documentation for the @filepath{sound.rkt} teachpack that goes
-with the German textbook
-@italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht der
-Abstraktion}}.
-
-Dieses Teachpack definiert eine Prozedur zum Abspielen einer
-Audio-Datei.  Diese Prozedur ist je nach Plattform unterschiedlich
-realisiert, und funktioniert möglicherweise nicht auf jedem
-Rechner.
-
-@declare-exporting[teachpack/deinprogramm/sound]
-
-@defthing[play-sound-file (string -> unspecific)]{ 
-Der Aufruf
-@racket[(play-sound-file f)] spielt die Audio-Datei mit dem Namen
-@racket[f] ab.}
-
-@defthing[background-play-sound-file (string -> unspecific)]{ 
-Der Aufruf
-@racket[(background-play-sound-file f)] spielt die Audio-Datei mit dem Namen
-@racket[f] im Hintergrund ab, also ohne dass das Scheme-Programm anhält.}
-
-
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/std-grammar.rkt b/pkgs/deinprogramm/deinprogramm/scribblings/std-grammar.rkt
deleted file mode 100644
index 7c70e80cd4..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/std-grammar.rkt
+++ /dev/null
@@ -1,97 +0,0 @@
-#reader scribble/reader
-#lang scheme/base
-(require scribblings/htdp-langs/common
-         scribble/decode
-         (for-label deinprogramm/DMdA-beginner))
-
-(provide prim-nonterms
-         racketgrammar*-DMdA)
-
-(define ex-str "Dies ist eine Zeichenkette, die \" enthält.")
-
-(define-syntax-rule (racketgrammar*-DMdA
-                     #:literals (lit ...)
-                     (def-rule ...)
-                     (prod ...)
-                     (expr-rule ...))
-  (racketgrammar*
-   #:literals (define define-record-procedures lambda cond if and or let letrec let* begin 
-		#;require lib planet
-		check-expect check-within check-error
-		signature :
-		predicate one-of mixed list %a %b %c
-		lit ...)
-   (... [program (code:line def-or-expr ...)])
-   [def-or-expr definition
-     expr
-     test-case
-     #;library-require]
-   [definition @#,racket[(define id expr)]
-     @#,racket[(define-record-procedures id id id (id (... ...)))]
-     @#,racket[(define-record-procedures-parametric (id id (... ...)) id id (id (... ...)))]
-     @#,racket[(: id sig)]
-     def-rule ...]
-   prod ...
-   [expr @#,racket[(code:line (expr expr (... ...)) (code:comment @#,seclink["application"]{Prozedurapplikation}))]
-	 @#,racket[#t]
-	 @#,racket[#f]
-	 @#,racket[number]
-	 @#,racket[string]
-	 @#,racket[(lambda (id (... ...)) expr)]
-	 @#,racket[(code:line id (code:comment @#,seclink["id"]{Bezeichner}))]
-	 @#,racket[(cond (expr expr) (expr expr) (... ...))]
-	 @#,racket[(cond (expr expr) (... ...) (else expr))]
-	 @#,racket[(if expr expr)]
-	 @#,racket[(and expr (... ...))]
-	 @#,racket[(or expr (... ...))]
-	 @#,racket[(let ((id expr) (... ...)) expr)]
-	 @#,racket[(letrec ((id expr) (... ...)) expr)]
-	 @#,racket[(let* ((id expr) (... ...)) expr) ]
-	 @#,racket[(begin expr expr (... ...))]
-	 @#,racket[(signature sig)]
-	 @#,racket[(for-all ((id sig) (... ...)) expr)]
-	 @#,racket[(==> expr expr)]
-	 expr-rule ...]
-   [sig  id
-	      @#,racket[(predicate expr)]
-	      @#,racket[(one-of expr (... ...))]
-	      @#,racket[(mixed sig (... ...))]
-	      @#,racket[(code:line (sig (... ...) -> sig) (code:comment @#,seclink["proc-signature"]{Prozedur-Signatur}))]
-	      @#,racket[(list sig)]
-	      @#,racket[(code:line %a %b %c (code:comment @#,seclink["signature-variable"]{Signatur-Variable}))]
-	      @#,racket[(combined sig (... ...))]
-	      @#,racket[signature]
-   ]
-   [test-case @#,racket[(check-expect expr expr)]
-              @#,racket[(check-within expr expr expr)]
-	      @#,racket[(check-member-of expr expr (... ...))]
-	      @#,racket[(check-range expr expr expr)]
-              @#,racket[(check-error expr expr)]
-	      @#,racket[(check-property expr)]]
-   #;(...
-    [library-require @#,racket[(require string)]
-		     @#,racket[(require module-id)]
-                     @#,racket[(require (lib string string ...))]
-                     @#,racket[(require (planet string package))]])
-   #;(...
-    [package @#,racket[(string string number number)]])))
-
-(define prim-nonterms
-  (make-splice
-   (list
-
-@t{Ein @racket[_id] ist eine Folge von Zeichen, die weder Leerzeichen
-noch eins der folgenden Zeichen enthält:}
-
-@t{@hspace[2] @litchar{"} @litchar{,} @litchar{'} @litchar{`} 
-@litchar{(} @litchar{)} @litchar{[} @litchar{]} 
-@litchar["{"] @litchar["}"] @litchar{|} @litchar{;}
-@litchar{#}}
-
-@t{Ein @racket[_number] ist eine Zahl wie z.B. @racket[123], @racket[3/2] oder
-@racket[5.5].}
-
-@t{Ein @racket[_string] ist eine Zeichenkette, und durch ein Paar von @litchar{"} umschlossen. 
-So sind z.B. @racket["abcdef"],
-@racket["This is a string"] und @racket[#,ex-str] Zeichenketten.}
-)))
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/turtle.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/turtle.scrbl
deleted file mode 100644
index 9fa3cf5534..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/turtle.scrbl
+++ /dev/null
@@ -1,178 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual scribble/struct "shared.rkt"
-          (for-label scheme
-                     teachpack/deinprogramm/image
-                     teachpack/deinprogramm/turtle))
-
-@teachpack["turtle"]{Turtle-Grafik}
-
-Note: This is documentation for the @filepath{turtle.rkt} teachpack that goes
-with the German textbook
-@italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht der
-Abstraktion}}.
-
-@declare-exporting[teachpack/deinprogramm/turtle #:use-sources (teachpack/deinprogramm/turtle)]
-
-Turtle-Grafik ist eine Methode zum Erstellen von Computergrafiken. Das
-Zeichnen wird dabei durch das Bewegen einer virtuellen Schildkröte
-über den Zeichenbereich modelliert. Eine Schildkröte kann durch drei
-Befehle bewegt werden:
-
-@itemize[
- @item{@racket[(move n)] Bewegt die Schildkröte um @racket[n] Pixel ohne zu zeichnen.}
- @item{@racket[(draw n)] Bewegt die Schildkröte um @racket[n] Pixel und zeichnet dabei.}
- @item{@racket[(turn n)] Dreht die Schildkröte um n Grad im Uhrzeigersinn.}
-]
-
-Wir stellen jetzt ein Teachpack für DrRacket vor, mit dessen Hilfe
-solche Turtle-Grafiken erstellt werden können. 
-
-@section{Tutorial}
-
-Unser Ziel ist es, in diesem Tutorial ein Quadrat mithilfe der
-Prozeduren des Teachpacks zu zeichnen. Aus diesem Grund müssen wir
-zunächst mit der Prozedur @racket[draw] eine Linie nach rechts malen. Die
-initiale Ausgansposition der Turtle ist in der Bildmitte mit Blick
-nach rechts. Mit @racket[(draw 20)] bewegen wir die Turtle dann 20 Pixel nach
-rechts und zeichnen dabei. Um das resultierende Bild zu sehen ist,
-müssen wir die Turtle mittels der Prozedur run laufen lassen. Die
-restlichen Parameter für run sind die Höhe und die Breite des Bildes
-sowie die Farbe, in der gezeichnet werden soll. Geben Sie also
-folgenden Befehl in die REPL ein, um Ihre erste Turtle-Grafik zu
-erstellen:
-
-@racketblock[
-(run (draw 20) 100 100 "red")
-]
-
-Sie erhalten dann eine Ausgabe wie die folgende: 
-
-@image["p1.jpg"] 
-
-Nun vervollständigen wir die Linie zu einem rechten Winkel: wir drehen
-die Turtle um 90° nach rechts und zeichnen dann eine Line der Länge 20
-Pixel nach unten. Zum Drehen einer Turtle verwenden wir die Prozedur
-@racket[turn].
-
-Da wir ein Quadrat aus zwei rechten Winkeln zusammensetzen können,
-abstrahieren wir über das Zeichnen des rechten Winkels. Dazu schreiben
-wir eine Prozedur @racket[right-angle] die als Parameter eine Turtle
-erhält:
-
-@racketblock[
-(: right-angle (turtle -> turtle))
-(define right-angle 
-  (lambda (t1)
-    (let* ((t2 ((draw 20) t1))
-           (t3 ((turn -90) t2))
-           (t4 ((draw 20) t3)))
-      t4)))
-]
-
-Das Ergebnis sieht dann so aus: 
-
-@image["p2.jpg"]
-
-Um das Quadrat komplett zu zeichnen, sollen nun zwei rechte Winkel
-verwendet werden. Wir zeichnen also einen rechten Winkel, drehen uns
-um 90° nach rechts, und zeichnen einen zweiten rechten Winkel.
-
-@racketblock[
-(: square (turtle -> turtle))
-(define square  
-  (lambda (t1)
-    (let* ((t2 (right-angle t1))
-           (t3 ((turn -90) t2))
-           (t4 (right-angle t3)))
-      t4)))
-]
-
-So sieht das Ergebnis aus: 
-
-@image["p3.jpg"]
-
-@subsection{Verbesserungen}
-
-An dem Beispiel ist leicht zu sehen, dass es zum Zeichnen mit Hilfe
-von Turtle-Grafik oft erforderlich ist, Zwischenwerte wie @racket[t1],
-@racket[t2] etc., an die nächste Prozedur weiterzureichen, die Werte
-ansonsten aber nicht weiterverwendet werden. Beispielsweise werden in
-der obigen Definition von square die Variablen @racket[t1], ...,
-@racket[t4] nur gebraucht, um die Prozeduren @racket[right-angle],
-@racket[(turn -90)] und @racket[right-angle] hintereinander
-auszuführen.
-
-Um solche Fälle einfach programmieren zu können, enthält das
-Turtle-Teachpack die Prozedur @racket[sequence]. Damit können wir eine
-zu @racket[right-angle] äquivalente Version wesentlicher einfacher
-aufschreiben:
-
-@racketblock[
-(define right-angle2 
-  (sequence (draw 20) (turn -90) (draw 20)))
-]
-
-Ebenso wie @racket[right-angle] können wir square leichter schreiben als: 
-
-@racketblock[
-(define square2  
-  (sequence right-angle (turn -90) right-angle))
-]
-
-@section{Prozeduren}
-
-@declare-exporting[teachpack/deinprogramm/turtle]
-
-@defthing[turtle signature]{
-Dies ist die Signatur für Turtles.
-} 
-
-@defthing[set-color (color -> (turtle -> turtle))]{ Diese Prozedur ist
-eine Prozedurfabrik. Sie liefert als Ergebnis eine Prozedur, die auf
-eine Turtle anwendbar ist. Wendet man das Ergebnis auf eine Turtle an,
-so ändert dies die Farbe mit der gezeichnet wird.
-
-Folgender Code 
-
-@racketblock[
-(define square3
-  (sequence right-angle (turn -90) (set-color "blue") right-angle))
-]
-liefert dieses Bild: 
-
-@image["p4.jpg"]
-}
-
-@defthing[turn (number -> (turtle -> turtle))]{ Diese Prozedur ist
-eine Prozedurfabrik. Sie liefert als Ergebnis eine Prozedur, die auf
-eine Turtle anwendbar ist. Wendet man das Ergebnis auf eine Turtle an,
-so ändert sich die Blickrichtung der Turtle um die gegebene Gradzahl
-gegen den Uhrzeigersinn.
-}
-
-@defthing[draw (number -> (turtle -> turtle))]{ Diese Prozedur ist
-eine Prozedurfabrik. Sie liefert als Ergebnis eine Prozedur, die auf
-eine Turtle anwendbar ist. Wendet man das Ergebnis auf eine Turtle an,
-so bewegt sich die Schildkröte um die gegebene Anzahl von Pixel und
-zeichnet dabei eine Linie.}
-
-@defthing[move (number -> (turtle -> turtle))]{ Diese Prozedur ist eine
-Prozedurfabrik. Sie liefert als Ergebnis eine Prozedur, die auf ein
-Turtle anwendbar ist. Wendet man das Ergebnis auf eine Turtle an, so
-bewegt sich die Schildkröte um die gegebene Anzahl von Pixel, zeichnet
-dabei aber keine Linie.}
-
-@defthing[run ((turtle -> turtle) number number color -> image)]{
-Diese Prozedur wendet die übergebene Prozedur von Turtle nach Turtle
-auf die initiale Schildkröte an und zeigt das daraus resultierende
-Bild an. Der zweite Parameter ist die Höhe des Bilds, der dritte
-Parameter die Breite des Bilds und der vierte Parameter die Farbe, mit
-der gezeichnet wird.
-}
-
-@defthing[sequence ((turtle -> turtle) ... -> (turtle -> turtle))]{
-Diese Prozedur nimmt eine beliebige Anzahl von Turtle-Veränderungen
-(d.h. Prozeduren mit Signatur @racket[turtle -> turtle]) und erstellt
-eine neue Prozedur, die die Veränderungen der Reihe nach von links
-nach rechts abarbeitet.}
diff --git a/pkgs/deinprogramm/deinprogramm/scribblings/world.scrbl b/pkgs/deinprogramm/deinprogramm/scribblings/world.scrbl
deleted file mode 100644
index bf95c2a52d..0000000000
--- a/pkgs/deinprogramm/deinprogramm/scribblings/world.scrbl
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual scribble/struct "shared.rkt"
-          (for-label scheme
-                     teachpack/deinprogramm/image
-                     teachpack/deinprogramm/world))
-
-@teachpack["world"]{Animationen}
-
-Note: This is documentation for the @filepath{world.rkt} teachpack that goes
-with the German textbook
-@italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht der
-Abstraktion}}.
-
-Dieses Teachpack ermöglicht, kleine Animationen und Spiele zu programmieren.
-Es enthält alle Prozeduren aus dem 
-@seclink["image"]{image-Teachpack}.
-
-@declare-exporting[teachpack/deinprogramm/world #:use-sources (deinprogramm/world)]
-
-@defthing[world signature]{
-Eine @deftech{Welt} (Name: @racket[world]) ist die Repräsentation des Zustands,
-der durch die Animation abgebildet wird.
-}
-
-@defthing[mouse-event-kind signature]{
-@racket[(one-of "enter" "leave" "motion" "left-down" "left-up" "middle-down" "middle-up" "right-down" "right-up")]
-
-Eine @deftech{Mausereignis-Art} (Name: @racket[mouse-event-kind])
-bezeichnet die Art eines Maus-Ereignisses:
-
-@racket["enter"] bedeutet, daß der Mauszeiger gerade
-in das Fenster hinein bewegt wurde.  @racket["leave"] bedeutet, daß der
-Mauszeiger gerade aus dem Fenster heraus bewegt wurde.
-@racket["motion"] bedeutet, daß der Mauszeiger innerhalb des
-Fensters bewegt wurde.  Die anderen Zeichenketten bedeuten, daß der
-entsprechende Mausknopf gedrückt oder losgelassen wurde.}
-
-@defthing[big-bang (natural natural number world -> (one-of #t))]{
-Der Aufruf @racket[(big-bang w h n w)]
-erzeugt eine Leinwand mit Breite @racket[w] und Höhe
-@racket[h], startet die Uhr, die alle @racket[n] Sekunden
-tickt, und macht @racket[w] zur ersten Welt.}
-
-@defthing[on-tick-event ((world -> world) -> (one-of #t))]{
-Der Aufruf @racket[(on-tick-event tock)]
-meldet @racket[tock]
-als Prozedur an, die bei jedem Uhren-Tick aufgerufen wird, um aus
-der alten Welt eine neue zu machen.}
-
-@defthing[on-key-event ((world string -> world) -> (one-of #t))]{
-Der Aufruf @racket[(on-key-event change)]
-meldet @racket[change]
-als Prozedur an, die bei jedem Tastendruck aufgerufen wird, um aus
-der alten Welt eine neue zu machen.  Dabei wird als Argument eine
-Zeichenkette übergeben, welche die Taste darstellt, also
-@racket["a"] für die A-Taste etc., sowie @racket["up"],
-@racket["down"], @racket["left"], und @racket["right"]
-für die entsprechenden Pfeiltasten und @racket["wheel-up"] für die
-Bewegung des Mausrads nach oben und @racket["wheel-down"] für die
-Bewegung des Mausrads nach unten.}
-
-@defthing[on-mouse-event ((world natural natural mouse-event-kind -> world) -> (one-of #t))]{
-Der Aufruf @racket[(on-mouse-event change)]
-meldet @racket[change]
-als Prozedur an, die bei jedem Mausereignis aufgerufen wird, um aus
-der alten Welt eine neue zu machen.  Die @racket[change]-Prozedur
-wird als @racket[(change w x y k)] aufgerufen. Dabei ist @racket[w]
-die alte Welt, @racket[x] und @racket[y] die Koordinaten des
-Mauszeigers, und @racket[k] die Art des Mausereignisses.}
-
-@defthing[on-redraw ((world -> image) -> (one-of #t))]{
-Der Aufruf @racket[(world->image world->image)]
-meldet die
-Prozedur @racket[world->image] an, die aus einer Welt
-ein Bild macht, das auf der Leinwand dargestellt wird.}
-
-@defthing[end-of-time (string -> world)]{
-Diese Prozedur hält die Welt an und druckt ihr Argument in der REPL aus.}
-
diff --git a/pkgs/deinprogramm/deinprogramm/signature/info.rkt b/pkgs/deinprogramm/deinprogramm/signature/info.rkt
deleted file mode 100644
index 4db2a33255..0000000000
--- a/pkgs/deinprogramm/deinprogramm/signature/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang info
-
-(define name "DeinProgramm - Signatures")
-
-(define drracket-tools '("tool.rkt"))
-(define drracket-tool-names '("Signatures"))
diff --git a/pkgs/deinprogramm/deinprogramm/signature/module-begin.rkt b/pkgs/deinprogramm/deinprogramm/signature/module-begin.rkt
deleted file mode 100644
index 6727a123c0..0000000000
--- a/pkgs/deinprogramm/deinprogramm/signature/module-begin.rkt
+++ /dev/null
@@ -1,210 +0,0 @@
-#lang scheme/base
-
-(provide module-begin)
-
-(require deinprogramm/define-record-procedures
-	 deinprogramm/signature/signature
-	 deinprogramm/signature/signature-syntax)
-
-(require (for-syntax scheme/base)
-	 (for-syntax racket/list)
-	 (for-syntax syntax/boundmap)
-	 (for-syntax syntax/kerncase))
-
-(define-syntax (print-results stx)
-  (syntax-case stx ()
-    ((_ expr)
-     (not (or (syntax-property #'expr 'stepper-hide-completed)
-	      (syntax-property #'expr 'stepper-skip-completely)
-	      (syntax-property #'expr 'test-call)))
-     (syntax-property
-      (syntax-property
-       #'(#%app call-with-values (lambda () expr)
-		do-print-results)
-       'stepper-skipto 
-       '(syntax-e cdr cdr car syntax-e cdr cdr car))
-      'certify-mode
-      'transparent))
-    ((_ expr) #'expr)))
-
-(define (do-print-results . vs)
-  (for-each (current-print) vs)
-  ;; Returning 0 values avoids any further result printing
-  ;; (even if void values are printed)
-  (values))
-  
-(define-syntaxes (module-begin module-continue)
-  (let ()
-    ;; takes a list of syntax objects (the result of syntax-e) and returns all the syntax objects that correspond to
-    ;; a signature declaration. Syntax: (: id signature)
-    (define extract-signatures
-      (lambda (lostx) 
-	(let* ((table (make-bound-identifier-mapping))
-	       (non-signatures
-		(filter-map (lambda (maybe)
-			      (syntax-case maybe (:)
-				((: ?exp ?sig)
-				 (not (identifier? #'?exp))
-				 #'(apply-signature/blame (signature ?sig) ?exp))
-				((: ?id ?sig)
-				 (begin
-				   (cond
-				    ((bound-identifier-mapping-get table #'?id (lambda () #f))
-				     => (lambda (old-sig-stx)
-					  (unless (equal? (syntax->datum old-sig-stx)
-							  (syntax->datum #'?sig))
-					    (raise-syntax-error #f
-								"Zweite Signaturdeklaration für denselben Namen."
-								maybe))))
-				    (else
-				     (bound-identifier-mapping-put! table #'?id #'?sig)))
-				   #f))
-				((: ?id)
-				 (raise-syntax-error #f "Bei dieser Signaturdeklaration fehlt die Signatur" maybe))
-				((: ?id ?sig ?stuff0 ?stuff1 ...)
-				 (raise-syntax-error #f "In der :-Form werden ein Name und eine Signatur erwartet; da steht noch mehr"
-						     (syntax/loc #'?stuff0
-								 (?stuff0 ?stuff1 ...))))
-				(_ maybe)))
-			lostx)))
-	  (values table non-signatures))))
-
-    (define local-expand-stop-list 
-      (append (list #': #'define-contract)
-	      (kernel-form-identifier-list)))
-	
-    (define (expand-signature-expressions signature-table expressions)
-
-      (let loop ((exprs expressions))
-
-	(cond
-	 ((null? exprs)
-	  (bound-identifier-mapping-for-each signature-table
-					     (lambda (id thing)
-					       (when thing
-						 (if (identifier-binding id)
-						     (raise-syntax-error #f "Zu einer eingebauten Form kann keine Signatur deklariert werden" id)
-						     (raise-syntax-error #f "Zu dieser Signatur gibt es keine Definition" id)))))
-	  #'(begin))
-	 (else
-	  (let ((expanded (car exprs)))
-
-	    (syntax-case expanded (begin define-values)
-	      ((define-values (?id ...) ?e1)
-	       (with-syntax (((?enforced ...)
-			      (map (lambda (id)
-				     (cond
-				      ((bound-identifier-mapping-get signature-table id (lambda () #f))
-				       => (lambda (sig)
-					    (bound-identifier-mapping-put! signature-table id #f) ; check for orphaned signatures
-					    (with-syntax ((?id id)
-							  (?sig sig))
-					      #'(?id (signature ?sig)))))
-				      (else
-				       id)))
-				   (syntax->list #'(?id ...))))
-			     (?rest (loop (cdr exprs))))
-		 (with-syntax ((?defn
-				(syntax-track-origin
-				 #'(define-values/signature (?enforced ...)
-				     ?e1)
-				 (car exprs)
-				 (car (syntax-e expanded)))))
-
-		   (syntax/loc (car exprs)
-			       (begin
-				 ?defn
-				 ?rest)))))
-	      ((begin e1 ...)
-	       (loop (append (syntax-e (syntax (e1 ...))) (cdr exprs))))
-	      (else 
-	       (with-syntax ((?first expanded)
-			     (?rest (loop (cdr exprs))))
-		 (syntax/loc (car exprs)
-			     (begin
-			       ?first ?rest))))))))))
-    (values
-     ;; module-begin
-     (lambda (stx)
-       (syntax-case stx ()
-	 ((_ e1 ...)
-	  ;; module-begin-continue takes a sequence of expanded
-	  ;; exprs and a sequence of to-expand exprs; that way,
-	  ;; the module-expansion machinery can be used to handle
-	  ;; requires, etc.:
-	  #`(#%plain-module-begin
-	     (module-continue (e1 ...) () ())))))
-
-     ;; module-continue
-     (lambda (stx)
-       (syntax-case stx ()
-	 ((_ () (e1 ...) (defined-id ...))
-	  ;; Local-expanded all body elements, lifted out requires, etc.
-	  ;; Now process the result.
-	  (begin
-	    ;; The expansion for signatures breaks the way that beginner-define, etc.,
-	    ;;  check for duplicate definitions, so we have to re-check here.
-	    ;; A better strategy might be to turn every define into a define-syntax
-	    ;;  to redirect the binding, and then the identifier-binding check in
-	    ;;  beginner-define, etc. will work.
-	    (let ((defined-ids (make-bound-identifier-mapping)))
-	      (for-each (lambda (id)
-			  (when (bound-identifier-mapping-get defined-ids id (lambda () #f))
-			    (raise-syntax-error
-			     #f
-			     "Für diesen Namen gibt es schon eine Definition."
-			     id))
-			  (bound-identifier-mapping-put! defined-ids id #t))
-			(reverse (syntax->list #'(defined-id ...)))))
-	    ;; Now handle signatures:
-	    (let ((top-level (reverse (syntax->list (syntax (e1 ...))))))
-	      (let-values (((sig-table expr-list)
-			    (extract-signatures top-level)))
-		(expand-signature-expressions sig-table expr-list)))))
-	 ((frm e3s e1s def-ids)
-	  (let loop ((e3s #'e3s)
-		     (e1s #'e1s)
-		     (def-ids #'def-ids))
-	    (syntax-case e3s ()
-	      (()
-	       #`(frm () #,e1s #,def-ids))
-	      ((e2 . e3s)
-	       (let ((e2 (local-expand #'e2 'module local-expand-stop-list)))
-		 ;; Lift out certain forms to make them visible to the module
-		 ;;  expander:
-		 (syntax-case e2 (#%require #%provide #%declare
-				  define-syntaxes begin-for-syntax define-values begin
-				  define-record-procedures define-record-procedures-2
-				  define-record-procedures-parametric define-record-procedures-parametric-2
-				  define-contract :)
-		   ((#%require . __)
-		    #`(begin #,e2 (frm e3s #,e1s #,def-ids)))
-		   ((#%provide . __)
-		    #`(begin #,e2 (frm e3s #,e1s #,def-ids)))
-		   ((#%declare . __)
-		    #`(begin #,e2 (frm e3s #,e1s #,def-ids)))
-		   ((define-syntaxes (id ...) . _)
-		    #`(begin #,e2 (frm e3s #,e1s (id ... . #,def-ids))))
-		   ((begin-for-syntax . _)
-		    #`(begin #,e2 (frm e3s #,e1s #,def-ids)))
-		   ((begin b1 ...)
-		    (syntax-track-origin 
-		     (loop (append (syntax->list #'(b1 ...)) #'e3s) e1s def-ids)
-		     e2
-		     (car (syntax-e e2))))
-		   ((define-values (id ...) . _)
-		    (loop #'e3s (cons e2 e1s) (append (syntax->list #'(id ...)) def-ids)))
-		   ((define-contract id sig)
-		    (loop #'e3s (cons e2 e1s) def-ids))
-		   ((define-record-procedures id cns prd (spec ...))
-		    (loop #'e3s (cons e2 e1s) def-ids))
-		   ((define-record-procedures-2 id cns prd (spec ...))
-		    (loop #'e3s (cons e2 e1s) def-ids))
-		   ((define-record-procedures-parametric id cns prd (spec ...))
-		    (loop #'e3s (cons e2 e1s) def-ids))
-		   ((define-record-procedures-parametric-2 id cns prd (spec ...))
-		    (loop #'e3s (cons e2 e1s) def-ids))
-		   ((: stuff ...)
-		    (loop #'e3s (cons e2 e1s) def-ids))
-		   (_
-		    (loop #'e3s (cons #`(print-results #,e2) e1s) def-ids)))))))))))))
diff --git a/pkgs/deinprogramm/deinprogramm/signature/signature-english.rkt b/pkgs/deinprogramm/deinprogramm/signature/signature-english.rkt
deleted file mode 100644
index e69e2838b8..0000000000
--- a/pkgs/deinprogramm/deinprogramm/signature/signature-english.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scheme/base
-(require deinprogramm/signature/signature-unit
-	 racket/unit)
-
-(provide-signature-elements signatures^)
-
-(define recursive-signature-message "recursive signature")
-(define parameter-count-mismatch-message "wrong number of parameters")
-(define argument-count-mismatch-message "wrong number of arguments")
-
-(define-values/invoke-unit signatures@ 
-  (import signature-messages^)
-  (export signatures^))
-
diff --git a/pkgs/deinprogramm/deinprogramm/signature/signature-german.rkt b/pkgs/deinprogramm/deinprogramm/signature/signature-german.rkt
deleted file mode 100644
index 1557e3a9fe..0000000000
--- a/pkgs/deinprogramm/deinprogramm/signature/signature-german.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scheme/base
-(require deinprogramm/signature/signature-unit
-	 racket/unit)
-
-(provide-signature-elements signatures^)
-
-(define recursive-signature-message "rekursive Signatur")
-(define parameter-count-mismatch-message "falsche Anzahl von Parametern")
-(define argument-count-mismatch-message "falsche Anzahl von Argumenten")
-
-(define-values/invoke-unit signatures@ 
-  (import signature-messages^)
-  (export signatures^))
-
diff --git a/pkgs/deinprogramm/deinprogramm/signature/signature-syntax.rkt b/pkgs/deinprogramm/deinprogramm/signature/signature-syntax.rkt
deleted file mode 100644
index 1adbd9e1cc..0000000000
--- a/pkgs/deinprogramm/deinprogramm/signature/signature-syntax.rkt
+++ /dev/null
@@ -1,286 +0,0 @@
-#lang scheme/base
-
-(provide :
-	 signature signature/arbitrary
-	 define-contract contract ; legacy
-	 define/signature define-values/signature
-	 -> mixed one-of predicate combined property list-of)
-
-(require deinprogramm/signature/signature
-	 deinprogramm/signature/signature-german
-	 scheme/promise
-	 (for-syntax scheme/base)
-	 (for-syntax syntax/stx)
-	 (for-syntax stepper/private/syntax-property))
-
-(define-for-syntax (phase-lift stx)
-  (with-syntax ((?stx stx))
-    (with-syntax ((?stx1 (syntax/loc stx #'?stx))) ; attach the occurrence position to the syntax object
-      #'?stx1)))
-
-(define-for-syntax (parse-signature name stx)
-  (syntax-case* stx
-		(mixed one-of predicate list -> combined property reference at signature list-of)
-		module-or-top-identifier=?
-    ((mixed ?signature ...)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   ((?signature-expr ...) (map (lambda (sig)
-						(parse-signature #f sig))
-					      (syntax->list #'(?signature ...)))))
-       #'(make-mixed-signature '?name
-			      (list ?signature-expr ...)
-			      ?stx)))
-    ((one-of ?exp ...)
-     (with-syntax ((((?temp ?exp) ...) 
-		    (map list
-			 (generate-temporaries #'(?exp ...)) (syntax->list #'(?exp ...))))
-		   (?stx (phase-lift stx))
-		   (?name name))
-       (with-syntax (((?check ...) 
-		      (map (lambda (lis)
-			     (with-syntax (((?temp ?exp) lis))
-			       (with-syntax ((?raise
-					      (syntax/loc 
-					       #'?exp
-					       (error 'signatures "hier keine Signatur zulässig, nur normaler Wert"))))
-				 #'(when (signature? ?temp)
-				     ?raise))))
-			   (syntax->list #'((?temp ?exp) ...)))))
-         #'(let ((?temp ?exp) ...)
-	     ?check ...
-	     (make-case-signature '?name (list ?temp ...) equal? ?stx)))))
-    ((predicate ?exp)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name))
-       #'(make-predicate-signature '?name (delay ?exp) ?stx)))
-    ((list ?signature)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   (?signature-expr (parse-signature #f #'?signature)))
-       #'(make-list-signature '?name ?signature-expr ?stx)))
-    ((list ?signature1 ?rest ...)
-     (raise-syntax-error #f
-			 "list-Signatur darf nur einen Operanden haben."
-			 (syntax ?signature1)))
-    ((list-of ?signature)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   (?signature-expr (parse-signature #f #'?signature)))
-       #'(make-list-signature '?name ?signature-expr ?stx)))
-    ((list-of ?signature)
-     (raise-syntax-error #f
-			 "list-of-Signatur darf nur einen Operanden haben."
-			 (syntax ?signature1)))
-    ((?arg-signature ... -> ?return-signature)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   ((?arg-signature-exprs ...) (map (lambda (sig)
-						     (parse-signature #f sig))
-						   (syntax->list #'(?arg-signature ...))))
-		   (?return-signature-expr (parse-signature #f #'?return-signature)))
-       #'(make-procedure-signature '?name (list ?arg-signature-exprs ...) ?return-signature-expr ?stx)))
-    ((?arg-signature ... -> ?return-signature1 ?return-signature2 . ?_)
-     (raise-syntax-error #f
-			 "Nach dem -> darf nur eine Signatur stehen."
-			 (syntax ?return-signature2)))
-    ((at ?loc ?sig)
-     (with-syntax ((?sig-expr (parse-signature #f #'?sig)))
-       #'(signature-update-syntax ?sig-expr #'?loc)))
-    (signature
-     (with-syntax ((?stx (phase-lift stx)))
-       #'(signature-update-syntax signature/signature #'?loc)))
-    (?id
-     (identifier? #'?id)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name (or name (syntax->datum #'?id))))
-       (let ((name (symbol->string (syntax->datum #'?id))))
-	 (if (char=? #\% (string-ref name 0))
-	     #'(make-type-variable-signature '?name ?stx)
-	     (with-syntax
-		 ((?raise
-		   (syntax/loc #'?stx
-			       (error 'signatures "expected a signature, found ~e" ?id))))
-	       (with-syntax
-		   ((?sig
-		     #'(make-delayed-signature '?name
-					      (delay
-						(begin
-						  (when (not (signature? ?id))
-						    ?raise)
-						  ?id)))))
-		 ;; for local variables (parameters, most probably),
-		 ;; we want the value to determine the blame location
-		 (if (eq? (identifier-binding #'?id) 'lexical)
-		     #'?sig
-		     #'(signature-update-syntax ?sig #'?stx))))))))
-    ((combined ?signature ...)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   ((?signature-expr ...) (map (lambda (sig)
-						(parse-signature #f sig))
-					      (syntax->list #'(?signature ...)))))
-       #'(make-combined-signature '?name
-				 (list ?signature-expr ...)
-				 ?stx)))
-    ((property ?access ?signature)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   (?signature-expr (parse-signature #f #'?signature)))
-       #'(make-property-signature '?name
-				 ?access
-				 ?signature-expr
-				 ?stx)))
-    ((signature ?stuff ...)
-     (raise-syntax-error #f
-			 "`signature' als Operator ergibt keinen Sinn"
-			 stx))
-    ((?signature-abstr ?signature ...)
-     (identifier? #'?signature-abstr)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   ((?signature-expr ...) (map (lambda (sig)
-						(parse-signature #f sig))
-					      (syntax->list #'(?signature ...)))))
-
-       (with-syntax
-	   ((?call (syntax/loc stx (?signature-abstr ?signature-expr ...))))
-	 #'(make-call-signature '?name
-			       (delay ?call)
-			       (delay ?signature-abstr) (delay (list ?signature-expr ...))
-			       ?stx))))
-    (else
-     (raise-syntax-error #f
-			 "ungültige Signatur" stx))))
-
-; regrettable
-(define signature/signature
-  (make-predicate-signature 'signature
-			   (delay signature?)
-			   #f))
-			     
-
-(define-syntax signature
-  (lambda (stx)
-    (syntax-case stx ()
-      ((_ ?sig)
-       #'(signature #f ?sig))
-      ((_ ?name ?sig)
-       (stepper-syntax-property
-	(parse-signature (syntax->datum #'?name) #'?sig)
-	'stepper-skip-completely #t)))))
-
-(define-syntax contract
-  (lambda (stx)
-    (syntax-case stx ()
-      ((_ ?sig)
-       #'(signature #f ?sig))
-      ((_ ?name ?sig)
-       (stepper-syntax-property
-	(parse-signature (syntax->datum #'?name) #'?sig)
-	'stepper-skip-completely #t)))))
-
-(define-syntax signature/arbitrary
-  (lambda (stx)
-    (syntax-case stx ()
-      ((_ ?arb ?sig . ?rest)
-       #'(let ((sig (signature ?sig . ?rest)))
-	   (set-signature-arbitrary! sig ?arb)
-	   sig)))))
-
-; legacy
-(define-syntax define-contract
-  (lambda (stx)
-    (syntax-case stx ()
-      ((_ ?name ?sig)
-       (identifier? #'?name)
-       (stepper-syntax-property #'(define ?name (signature ?name ?sig))
-				'stepper-skip-completely
-				#t))
-      ((_ (?name ?param ...) ?sig)
-       (and (identifier? #'?name)
-	    (andmap identifier? (syntax->list #'(?param ...))))
-       (stepper-syntax-property #'(define (?name ?param ...) (signature ?name ?sig))
-				'stepper-skip-completely
-				#t)))))
-
-(define-syntax define/signature
-  (lambda (stx)
-    (syntax-case stx ()
-      ((_ ?name ?cnt ?expr)
-       (with-syntax ((?enforced
-		       (stepper-syntax-property #'(attach-name '?name (apply-signature/blame ?cnt ?expr))
-						'stepper-skipto/discard
-						;; apply-signature/blame takes care of itself
-						;; remember there's an implicit #%app
-						'(syntax-e cdr syntax-e cdr cdr car))))
-							   
-	 #'(define ?name ?enforced))))))
-
-(define-syntax define-values/signature
-  (lambda (stx)
-    (syntax-case stx ()
-      ((_ (?id ...) ?expr)
-       (andmap identifier? (syntax->list #'(?id ...)))
-       (syntax-track-origin
-	#'(define-values (?id ...) ?expr)
-	stx
-	(car (syntax-e stx))))
-      ((_ ((?id ?cnt)) ?expr)
-       (identifier? #'?id)
-       #'(define/signature ?id ?cnt ?expr)) ; works with stepper
-      ((_ (?bind ...) ?expr)
-       (let ((ids+enforced
-	      (map (lambda (bind)
-		     (syntax-case bind ()
-		       (?id
-			(identifier? #'?id)
-			(cons #'?id #'?id))
-		       ((?id ?cnt)
-			(identifier? #'?id)
-			(cons #'?id
-			      #'(attach-name '?id (apply-signature/blame ?cnt ?id))))))
-		   (syntax->list #'(?bind ...)))))
-	 (with-syntax (((?id ...) (map car ids+enforced))
-		       ((?enforced ...) (map cdr ids+enforced)))
-	   (stepper-syntax-property
-	    #'(define-values (?id ...)
-		(call-with-values
-		    (lambda () ?expr)
-		  (lambda (?id ...)
-		    (values ?enforced ...))))
-	    'stepper-skip-completely #t)))))))
-
-;; Matthew has promised a better way of doing this in the future.
-(define (attach-name name thing)
-  (if (procedure? thing)
-      (procedure-rename thing name)
-      thing))
-
-(define-syntax :
-  (syntax-rules ()
-    ((: ?id ?sig) (begin)))) ; probably never used, we're only interested in the binding for :
-
-(define-for-syntax (within-signature-syntax-error stx name)
-  (raise-syntax-error #f
-		      "darf nur in Signaturen vorkommen"
-		      name))
-
-;; Expression -> Expression
-;; Transforms unfinished code (... and the like) to code
-;; raising an appropriate error.
-(define-for-syntax within-signature-syntax-transformer
-  (make-set!-transformer
-   (lambda (stx)
-     (syntax-case stx (set!)
-       [(set! form expr) (within-signature-syntax-error stx (syntax form))]
-       [(form . rest) (within-signature-syntax-error stx (syntax form))]
-       [form (within-signature-syntax-error stx stx)]))))
-
-(define-syntax -> within-signature-syntax-transformer)
-(define-syntax mixed within-signature-syntax-transformer)
-(define-syntax one-of within-signature-syntax-transformer)
-(define-syntax predicate within-signature-syntax-transformer)
-(define-syntax combined within-signature-syntax-transformer)
-(define-syntax property within-signature-syntax-transformer)
-(define-syntax list-of within-signature-syntax-transformer)
diff --git a/pkgs/deinprogramm/deinprogramm/signature/signature-unit.rkt b/pkgs/deinprogramm/deinprogramm/signature/signature-unit.rkt
deleted file mode 100644
index aef3219d2a..0000000000
--- a/pkgs/deinprogramm/deinprogramm/signature/signature-unit.rkt
+++ /dev/null
@@ -1,729 +0,0 @@
-#lang scheme/base
-(provide signature-messages^ signatures^ signatures@)
-
-(require racket/unit)
-
-(require scheme/promise
-	 mzlib/struct
-         (only-in mzlib/list first rest)
-	 (for-syntax scheme/base)
-	 (for-syntax stepper/private/syntax-property))
-
-(require deinprogramm/signature/signature)
-
-(require deinprogramm/quickcheck/quickcheck)
-
-(define-signature signature-messages^
-  (recursive-signature-message
-   parameter-count-mismatch-message
-   argument-count-mismatch-message))
-
-(define-signature signatures^
-  (make-delayed-signature
-   make-call-signature
-   make-property-signature
-   make-predicate-signature
-   make-type-variable-signature
-   make-list-signature
-   make-vector-signature
-   make-mixed-signature
-   make-combined-signature
-   make-case-signature
-   make-procedure-signature
-   procedure-signature-info? 
-   procedure-signature-info-arg-signatures procedure-signature-info-return-signature
-   make-lazy-wrap-info lazy-wrap-info-constructor lazy-wrap-info-raw-accessors
-   prop:lazy-wrap lazy-wrap? lazy-wrap-ref
-   make-lazy-wrap-signature
-   check-lazy-wraps!
-   make-pair-signature checked-car checked-cdr checked-first checked-rest))
-
-(define-unit signatures@
-  (import signature-messages^)
-  (export signatures^)
-
-(define (make-delayed-signature name promise)
-  (make-signature name
-		 (lambda (self obj)
-		   ((signature-enforcer (force promise)) self obj))
-		 (delay (signature-syntax (force promise)))
-		 #:arbitrary-promise
-		 (delay
-		   (force (signature-arbitrary-promise (force promise))))
-		 #:info-promise
-		 (delay
-		   (force (signature-info-promise (force promise))))
-		 #:<=?-proc
-		 (lambda (this-info other-info)
-		   ((signature-<=?-proc (force promise)) this-info other-info))
-		 #:=?-proc
-		 (lambda (this-info other-info)
-		   ((signature-=?-proc (force promise)) this-info other-info))))
-
-; specialized version of the above, supports comparison
-; the promise must produce the result of (proc . args), but its passed separately
-; to give us the right location on backtrace
-(define (make-call-signature name promise proc-promise args-promise syntax)
-  (make-signature name
-		 (lambda (self obj)
-		   ((signature-enforcer (force promise)) self obj))
-		 (delay syntax)
-		 #:arbitrary-promise
-		 (delay
-		   (force (signature-arbitrary-promise (force promise))))
-		 #:info-promise
-		 (delay
-		   (make-call-info promise (force proc-promise) (force args-promise)))
-		 #:=?-proc
-		 (lambda (this-info other-info)
-		   (and (call-info? other-info)
-			(eqv? (force proc-promise) (call-info-proc other-info))
-			(equal? (force args-promise) (call-info-args other-info))))))
-
-(define-struct call-info (promise proc args) #:transparent)
-
-; klude to support mixed
-(define (real-signature-info sig)
-  (let ((raw-info (force (signature-info-promise sig))))
-    (if (call-info? raw-info)
-	(real-signature-info (force (call-info-promise raw-info)))
-	(force raw-info))))
-
-(define (make-property-signature name access signature syntax)
-  (let ((enforce (signature-enforcer signature)))
-    (make-signature name
-		    (lambda (self obj)
-		      (enforce self (access obj)) ; #### problematic: enforcement doesn't stick
-		      obj)
-		    (delay syntax))))
-
-(define (make-predicate-signature name predicate-promise syntax)
-  (make-signature
-   name
-   (lambda (self obj) ; dynamic binding because of syntax remapping via `signature-update-syntax'
-     (if ((force predicate-promise) obj)
-	 obj
-	 (begin
-	   (signature-violation obj self #f #f)
-	   obj)))
-   (delay syntax)
-   #:info-promise
-   (delay (make-predicate-info (force predicate-promise)))
-   #:=?-proc
-   (lambda (this-info other-info)
-     (and (predicate-info? other-info)
-	  (eq? (force predicate-promise)
-	       (predicate-info-predicate other-info))))))
-
-(define-struct predicate-info (predicate) #:transparent)
-
-(define (make-type-variable-signature name syntax)
-  (make-signature
-   name
-   (lambda (self obj) obj)
-   (delay syntax)
-   #:info-promise
-   (delay (make-type-variable-info))
-   #:=?-proc
-   (lambda (this-info other-info)
-     (type-variable-info? other-info))))
-
-; maps lists to pairs of signature, enforced value
-(define lists-table (make-weak-hasheq))
-
-(define (make-list-signature name arg-signature syntax)
-  (make-signature
-   name
-   (lambda (self obj)
-     ;;(eprintf "~s\n" (list 'list obj))
-     (let recur ((l obj))
-
-       (define (go-on)
-	 (let ((enforced (cons (apply-signature arg-signature (car l))
-			       (recur (cdr l)))))
-	   (hash-set! lists-table l (cons self enforced))
-	   (hash-set! lists-table enforced (cons self enforced))
-	   enforced))
-       
-       (cond
-	((null? l)
-	 l)
-	((not (pair? l))
-	 (signature-violation obj self #f #f)
-	 obj)
-	((hash-ref lists-table l #f)
-	 => (lambda (seen)
-	      ;;(eprintf "~s\n" (list 'seen seen (eq? self (car seen))))
-	      (if (eq? self (car seen))
-		  (cdr seen)
-		  (go-on))))
-	(else
-	 (go-on)))))
-   (delay syntax)
-   #:arbitrary-promise
-   (delay
-     (lift->arbitrary arbitrary-list arg-signature))
-   #:info-promise
-   (delay (make-list-info arg-signature))
-   #:=?-proc
-   (lambda (this-info other-info)
-     (and (list-info? other-info)
-	  (signature=? arg-signature (list-info-arg-signature other-info))))))
-
-(define-struct list-info (arg-signature) #:transparent)
-
-(define (lift->arbitrary proc . signatures)
-  (let ((arbitraries (map force (map signature-arbitrary-promise signatures))))
-    (if (andmap values arbitraries)
-	(apply proc arbitraries)
-	#f)))
-
-(define vectors-table (make-weak-hasheq)) ; #### ought to do ephemerons, too
-
-(define (make-vector-signature name arg-signature syntax)
-  (make-signature
-   name
-   (lambda (self obj)
-
-     (define (check old-sigs)
-       (let ((old-sigs (cons arg-signature old-sigs)))
-	 (hash-set! vectors-table obj old-sigs)
-	 (let* ((orig (vector->list obj))
-		(els (map (lambda (x)
-			    (apply-signature arg-signature x))
-			  orig)))
-	   (if (andmap eq? orig els)
-	       obj
-	       (let ((new (list->vector els)))
-		 (hash-set! vectors-table obj old-sigs)
-		 new)))))
-
-     (cond
-      ((not (vector? obj))
-       (signature-violation obj self #f #f)
-       obj)
-      ((hash-ref vectors-table obj #f)
-       => (lambda (old-sigs)
-	    (if (ormap (lambda (old-sig)
-			 (signature<=? old-sig arg-signature))
-		       old-sigs)
-		obj
-		(check old-sigs))))
-      (else
-       (check '()))))
-   (delay syntax)
-   #:arbitrary-promise
-   (delay
-     (lift->arbitrary arbitrary-vector arg-signature))
-   #:info-promise
-   (delay (make-vector-info arg-signature))
-   #:=?-proc
-   (lambda (this-info other-info)
-     (and (vector-info? other-info)
-	  (signature=? arg-signature (vector-info-arg-signature other-info))))))
-
-(define-struct vector-info (arg-signature) #:transparent)
-
-(define (make-mixed-signature name alternative-signatures syntax)
-  (letrec ((alternative-signatures-promise 
-	    (delay
-	      (normalize-mixed-signatures mixed-signature alternative-signatures)))
-	   (mixed-signature
-	    (make-signature
-	     name
-	     (lambda (self obj)
-	       (let loop ((alternative-signatures (force alternative-signatures-promise)))
-		 (cond
-		  ((null? alternative-signatures)
-		   (signature-violation obj self #f #f)
-		   obj)
-		  ((eq? (car alternative-signatures) self)
-		   (raise
-		    (make-exn:fail:contract
-		     (string->immutable-string
-		      (if name
-			  (format "~a: ~a" recursive-signature-message)
-			  recursive-signature-message))
-		     (current-continuation-marks))))
-		  (else
-		   (check-signature (car alternative-signatures)
-				    obj
-				    values
-				    (lambda () (loop (cdr alternative-signatures))))))))
-	     (delay syntax)
-	     #:info-promise
-	     (delay (make-mixed-info (force alternative-signatures-promise)))
-	     #:arbitrary-promise
-	     (delay
-	       (let* ((arbitrary-promises (map signature-arbitrary-promise alternative-signatures))
-		      (raising-promises
-		       (map (lambda (prm)
-			      (delay
-				(or (force prm)
-				    (error "Signatur hat keinen Generator")))) ; #### src location
-			    arbitrary-promises)))
-		 (arbitrary-mixed
-		  (map (lambda (sig arbp)
-			 (cons (signature->predicate sig)
-			       arbp))
-		       alternative-signatures raising-promises))))
-	     #:=?-proc
-	     (lambda (this-info other-info)
-	       (and (mixed-info? other-info)
-		    (andmap signature=? 
-			    (mixed-info-signatures this-info) 
-			    (mixed-info-signatures other-info))))
-	     #:<=?-proc
-	     (lambda (this-info other-info)
-	       (and (mixed-info? other-info)
-		    (mixed-signature<=? (mixed-info-signatures this-info) 
-					(mixed-info-signatures other-info)))))))
-    mixed-signature))
-
-(define (mixed-signature<=? sigs1 sigs2)
-  (andmap (lambda (sig1)
-	    (ormap (lambda (sig2)
-		     (signature<=? sig1 sig2))
-		   sigs2))
-	  sigs1))
-
-; Flatten out mixed signatures, and fold in in the lazy-wrap
-; signatures
-	
-(define (normalize-mixed-signatures mixed-signature sigs)
-  (fold-lazy-wrap-signatures mixed-signature (flatten-mixed-signatures sigs)))
-
-(define (flatten-mixed-signatures sigs)
-  (apply append
-	 (map (lambda (sig)
-		(let ((info (force (signature-info-promise sig))))
-		  (if (mixed-info? info)
-		      (mixed-info-signatures info)
-		      (list sig))))
-	      sigs)))
-
-(define-struct mixed-info (signatures) #:transparent)
-
-(define (check-signature sig val success fail)
-  ((let/ec exit
-     (let ((enforced
-	    (call-with-signature-violation-proc
-	     (lambda (signature syntax msg blame)
-	       (exit fail))
-	     (lambda ()
-	       (apply-signature sig val)))))
-       (lambda () (success enforced))))))
-
-(define (signature->predicate sig)
-  (lambda (val)
-    (check-signature sig val (lambda (_) #t) (lambda () #f))))
-
-(define (make-combined-signature name signatures syntax)
-  (make-signature
-   name
-   (lambda (self obj)
-     (let ((old-violation-proc (signature-violation-proc)))
-       ((let/ec exit
-	  (call-with-signature-violation-proc
-	   (lambda (signature syntax msg blame)
-	     (exit
-	      (lambda ()
-		(old-violation-proc signature syntax msg blame)
-		obj)))
-	   (lambda ()
-	     (let loop ((signatures signatures)
-			(obj obj))
-	       (if (null? signatures)
-		   (lambda () obj)
-		   (loop (cdr signatures)
-			 (apply-signature (car signatures) obj))))))))))
-   (delay syntax)))
-
-(define (make-case-signature name cases =? syntax)
-  (make-signature
-   name
-   (lambda (self obj)
-     (let loop ((cases cases))
-       (cond
-	((null? cases)
-	 (signature-violation obj self #f #f)
-	 obj)
-	((=? (car cases) obj)
-	 obj)
-	(else
-	 (loop (cdr cases))))))
-   (delay syntax)
-   #:arbitrary-promise
-   (delay (apply arbitrary-one-of =? cases))))
-
-(define signature-key (gensym 'signature-key))
-
-(define-struct procedure-signature-info (arg-signatures return-signature) #:transparent)
-
-(define (make-procedure-signature name arg-signatures return-signature syntax)
-  (let ((arg-count (length arg-signatures)))
-    (make-signature
-     name
-     (lambda (self thing)
-       (let-values (((proc blame-syntax)
-		     (if (procedure-to-blame? thing)
-			 (values (procedure-to-blame-proc thing)
-				 (procedure-to-blame-syntax thing))
-			 (values thing #f))))
-	 (cond
-	  ((not (procedure? proc))
-	   (signature-violation proc self #f #f)
-	   thing)
-	  ((not (procedure-arity-includes? proc arg-count)) ; #### variable arity
-	   (signature-violation proc self parameter-count-mismatch-message #f)
-	   thing)
-	  (else
-	   (attach-name
-	    (object-name proc)
-	    (procedure-reduce-arity
-	     (lambda args
-	       (call-with-immediate-continuation-mark
-		signature-key
-		(lambda (maybe)
-		  (if (not (= (length args) arg-count))
-		      (begin
-			(signature-violation proc self argument-count-mismatch-message #f)
-			(apply-signature return-signature (apply proc args)))
-		      (let* ((old-violation-proc (signature-violation-proc))
-			     (arg-violation? #f)
-			     (args
-			      (call-with-signature-violation-proc
-			       (lambda (obj signature message blame)
-				 (set! arg-violation? #t)
-				 (old-violation-proc obj signature message blame))
-			       (lambda ()
-				 (map apply-signature arg-signatures args)))))
-			(if (eq? maybe return-signature)
-			    (apply proc args)
-			    (let ((retval
-				   (with-continuation-mark 
-				    signature-key return-signature
-				    (apply proc args))))
-			      (if arg-violation?
-				  retval
-				  (call-with-signature-violation-proc
-				   (lambda (obj signature message _)
-				     ;; blame the procedure
-				     (old-violation-proc obj signature message blame-syntax))
-				   (lambda ()
-				     (apply-signature return-signature retval)))))))))))
-	     (procedure-arity proc)))))))
-     (delay syntax)
-     #:arbitrary-promise
-     (delay
-       (apply lift->arbitrary arbitrary-procedure return-signature arg-signatures))
-     #:info-promise
-     (delay
-       (make-procedure-signature-info arg-signatures return-signature)))))
-
-(define (attach-name name thing)
-  (if (and (procedure? thing)
-	   (symbol? name))
-      (procedure-rename thing name)
-      thing))
-
-; Lazy signature checking for structs
-
-;; This is attached prop:lazy-wrap property of struct types subject to
-;; lazy checking.
-(define-struct lazy-wrap-info
-  (constructor 
-   raw-accessors raw-mutators
-   ;; procedures for referencing or setting an additional field within the struct
-   ;; that field contains a list of lists of unchecked field signatures
-   ref-proc set!-proc))
-
-; value should be a lazy-wrap-info
-(define-values (prop:lazy-wrap lazy-wrap? lazy-wrap-ref)
-  (make-struct-type-property 'lazy-wrap))
-
-; The field accessed by ref-proc and set!-proc contains one of these:
-
-(define-struct lazy-wrap-log
-  ;; list of lazy-log-not-checked
-  (not-checked 
-  ;; list of lists of field signatures
-   checked)
-  #:transparent)
-
-; This situation makes trouble:
-; (make-mixed-signature (make-lazy-wrap-signature ...)  (make-lazy-wrap-signature ...) ...)
-
-; We need to push the `mixed' signature inside the lazy-wrap
-; signature, which is why the struct-map signature has an implicit
-; `mixed'.
-; To this end, a `lazy-log-not-checked' object tracks a list of
-; `mixed' alternatives.  The `mixed-signature' field tracks from which
-; `mixed' contract the mixture has originally come from.  
-; (It may be #f, in which case the `field-signatures-list' is a one-element list.)
-(define-struct lazy-log-not-checked
-  (mixed-signature field-signatures-list)
-  #:transparent)
-
-(define (make-lazy-wrap-signature name eager-checking? type-descriptor predicate field-signatures syntax)
-  (really-make-lazy-wrap-signature name eager-checking? 
-				   type-descriptor predicate #f (list field-signatures) syntax))
-
-; The lists of signatures in `field-signatures-list' form an implicit mixed signature.
-(define (really-make-lazy-wrap-signature name eager-checking? type-descriptor predicate
-					 mixed-signature field-signatures-list
-					 syntax)
-  (let ((lazy-wrap-info (lazy-wrap-ref type-descriptor))
-	(not-checked (make-lazy-log-not-checked mixed-signature field-signatures-list))
-	(lazy-wrap-signature-info
-	 (make-lazy-wrap-signature-info eager-checking? type-descriptor predicate field-signatures-list)))
-    (let ((constructor (lazy-wrap-info-constructor lazy-wrap-info))
-	  (raw-accessors (lazy-wrap-info-raw-accessors lazy-wrap-info))
-	  (wrap-ref (lazy-wrap-info-ref-proc lazy-wrap-info))
-	  (wrap-set! (lazy-wrap-info-set!-proc lazy-wrap-info)))
-      (make-signature
-       name
-       (lambda (self thing)
-	 (if (not (predicate thing))
-	     (signature-violation thing self #f #f)
-	     (begin
-	       (let ((log (wrap-ref thing)))
-		 (cond
-		  ((not log)
-		   (wrap-set! thing
-			      (make-lazy-wrap-log (list not-checked) '())))
-		  ((not (let ()
-			  (define (<=? sigs1 sigs2)
-			    (andmap signature<=? sigs1 sigs2))
-			  (define (check wrap-field-signatures)
-			    (ormap (lambda (field-signatures)
-				     (<=? wrap-field-signatures field-signatures))
-				   field-signatures-list))
-			  (or (ormap (lambda (wrap-not-checked)
-				       (andmap check 
-					       (lazy-log-not-checked-field-signatures-list wrap-not-checked)))
-				     (lazy-wrap-log-not-checked log))
-			      (ormap check (lazy-wrap-log-checked log)))))
-		   (wrap-set! thing
-			      (make-lazy-wrap-log (cons not-checked (lazy-wrap-log-not-checked log))
-						  (lazy-wrap-log-checked log))))))
-
-	       (when eager-checking?
-		 (check-lazy-wraps! type-descriptor thing))))
-       
-	 thing)
-       (delay syntax)
-       #:info-promise
-       (delay lazy-wrap-signature-info)
-       #:=?-proc
-       (lambda (this-info other-info)
-	 (and (lazy-wrap-signature-info? other-info)
-	      (lazy-wrap-signature-info-field-signatures-list other-info)
-	      (eq? type-descriptor (lazy-wrap-signature-info-descriptor other-info))
-	      (andmap (lambda (this-field-signatures)
-			(andmap (lambda (other-field-signatures)
-				  (andmap signature=? this-field-signatures other-field-signatures))
-				(lazy-wrap-signature-info-field-signatures-list other-info)))
-		      (lazy-wrap-signature-info-field-signatures-list this-info))))
-       #:<=?-proc
-       (lambda (this-info other-info)
-	 (and (lazy-wrap-signature-info? other-info)
-	      (lazy-wrap-signature-info-field-signatures-list other-info) 
-	      (eq? type-descriptor (lazy-wrap-signature-info-descriptor other-info))
-	      (andmap (lambda (this-field-signatures)
-			(ormap (lambda (other-field-signatures)
-				 (andmap signature<=? this-field-signatures other-field-signatures))
-			       (lazy-wrap-signature-info-field-signatures-list other-info)))
-		      (lazy-wrap-signature-info-field-signatures-list this-info))))))))
-
-(define-struct lazy-wrap-signature-info (eager-checking? descriptor predicate field-signatures-list) #:transparent)
-
-(define (check-lazy-wraps! descriptor thing)
-  (let ((lazy-wrap-info (lazy-wrap-ref descriptor)))
-
-    (let ((constructor (lazy-wrap-info-constructor lazy-wrap-info))
-	  (raw-accessors (lazy-wrap-info-raw-accessors lazy-wrap-info))
-	  (raw-mutators (lazy-wrap-info-raw-mutators lazy-wrap-info))
-	  (wrap-ref (lazy-wrap-info-ref-proc lazy-wrap-info))
-	  (wrap-set! (lazy-wrap-info-set!-proc lazy-wrap-info)))
-
-      (let ((log (wrap-ref thing)))
-	(when (and log (pair? (lazy-wrap-log-not-checked log)))
-	  (let loop ((field-vals (map (lambda (raw-accessor)
-					(raw-accessor thing))
-				      raw-accessors))
-		     (now-checked '())
-		     (not-checkeds (lazy-wrap-log-not-checked log)))
-	    (if (null? not-checkeds)
-		(begin
-		  (for-each (lambda (raw-mutator field-val)
-			      (raw-mutator thing field-val))
-			    raw-mutators field-vals)
-		  (wrap-set! thing
-			     (make-lazy-wrap-log '()
-						 (append now-checked
-							 (lazy-wrap-log-checked log)))))
-		(let ((not-checked (car not-checkeds)))
-		  (let ((field-signatures-list (lazy-log-not-checked-field-signatures-list not-checked))
-			(mixed-signature (lazy-log-not-checked-mixed-signature not-checked)))
-		    (if (not mixed-signature) ; one-element list
-			(loop (map apply-signature (car field-signatures-list) field-vals)
-			      (cons (car field-signatures-list) now-checked)
-			      (cdr not-checkeds))
-			(let inner ((field-signatures-list field-signatures-list)) ; implicit mixed
-			  (if (null? field-signatures-list)
-			      (signature-violation thing mixed-signature #f #f)
-			      (let map ((sigs (car field-signatures-list))
-					(field-vals field-vals)
-					(new-field-vals '()))
-				(if (null? sigs)
-				    (loop (reverse new-field-vals)
-					  (cons (car field-signatures-list) now-checked)
-					  (cdr not-checkeds))
-				    (check-signature (car sigs)
-						     (car field-vals)
-						     (lambda (new-val)
-						       (map (cdr sigs)
-							    (cdr field-vals)
-							    (cons new-val new-field-vals)))
-						     (lambda ()
-						       (inner (cdr field-signatures-list))))))))))))))))))
-
-; pushes down mixed contracts
-(define (fold-lazy-wrap-signatures mixed-signature sigs)
-  (let ((lazy-wrap-sigs (make-hasheq))) ; maps a type descriptor to signatures
-
-    (define (push-down-lazy-wrap-sigs)
-      (hash-map lazy-wrap-sigs
-		(lambda (type-desc signatures)
-		  (let* ((sig (car signatures))
-			 (info (real-signature-info (car signatures))))
-		    (really-make-lazy-wrap-signature 
-		     (signature-name sig) 
-		     (lazy-wrap-signature-info-eager-checking? info)
-		     type-desc 
-		     (lazy-wrap-signature-info-predicate info)
-		     mixed-signature
-		     (apply append
-			    (map (lambda (sig)
-				   (lazy-wrap-signature-info-field-signatures-list (real-signature-info sig)))
-				 signatures))
-		     (signature-syntax sig))))))
-  
-    (let loop ((sigs sigs)
-	       (vanilla-sigs '()))
-      (if (null? sigs)
-	  (append (push-down-lazy-wrap-sigs)
-		  (reverse vanilla-sigs))
-	  (let* ((sig (car sigs))
-		 (info (real-signature-info sig)))
-	    (if (lazy-wrap-signature-info? info)
-		(let ((type-desc (lazy-wrap-signature-info-descriptor info)))
-		  (hash-update! lazy-wrap-sigs
-				type-desc
-				(lambda (old)
-				  (cons sig old))
-				(lambda ()
-				  (list sig)))
-		  (loop (cdr sigs) vanilla-sigs))
-		(loop (cdr sigs) (cons sig vanilla-sigs))))))))
-
-(define checked-pair-table (make-weak-hasheq))
-
-(define-struct checked-pair
-  (car cdr log)
-  #:mutable)
-
-(define (checked-pair-access checked-access raw-access)
-  (lambda (p)
-    (cond
-     ((hash-ref checked-pair-table
-		p
-		(lambda () #f))
-      => (lambda (eph)
-	   (checked-access (ephemeron-value eph))))
-     (else (raw-access p)))))
-
-(define checked-raw-car   (checked-pair-access checked-pair-car car))
-(define checked-raw-cdr   (checked-pair-access checked-pair-cdr cdr))
-(define checked-raw-first (checked-pair-access checked-pair-car first))
-(define checked-raw-rest  (checked-pair-access checked-pair-cdr rest))
-
-(define (checked-raw-set! checked-set!)
-  (lambda (p new)
-    (cond
-     ((hash-ref checked-pair-table
-		p
-		(lambda () #f))
-      => (lambda (eph)
-	   (checked-set! (ephemeron-value eph) new)))
-     (else 
-      (let ((cp (make-checked-pair (car p) (cdr p) #f)))
-	(checked-set! cp new)
-	(hash-set! checked-pair-table p (make-ephemeron p cp)))))))
-
-(define checked-raw-set-car! (checked-raw-set! set-checked-pair-car!))
-(define checked-raw-set-cdr! (checked-raw-set! set-checked-pair-cdr!))
-
-(define (checked-pair-get-log p)
-  (cond
-   ((hash-ref checked-pair-table
-	      p
-	      (lambda () #f))
-    => (lambda (eph)
-	 (checked-pair-log (ephemeron-value eph))))
-   (else #f)))
-
-(define (checked-pair-set-log! p new)
-  (cond
-   ((hash-ref checked-pair-table
-	      p
-	      (lambda () #f))
-    => (lambda (eph)
-	 (set-checked-pair-log! (ephemeron-value eph) new)))
-   (else
-    (hash-set! checked-pair-table p 
-	       (make-ephemeron p
-			       (make-checked-pair (car p) (cdr p) new))))))
-
-(define checked-pair-lazy-wrap-info
-  (make-lazy-wrap-info cons
-		       (list checked-raw-car checked-raw-cdr)
-		       (list checked-raw-set-car! checked-raw-set-cdr!)
-		       checked-pair-get-log
-		       checked-pair-set-log!))
-
-(define checked-pair-descriptor
-  (call-with-values
-      (lambda ()
-	(make-struct-type 'dummy-checked-pair #f 0 0 #f
-			  (list
-			   (cons prop:lazy-wrap checked-pair-lazy-wrap-info))))
-    (lambda (desc . _)
-      desc)))
-
-(define (make-pair-signature eager-checking? car-sig cdr-sig)
-  (make-lazy-wrap-signature 'pair eager-checking? 
-			    checked-pair-descriptor pair? (list car-sig cdr-sig) #'pair))
-
-(define (checked-car p)
-  (car p)
-  (check-lazy-wraps! checked-pair-descriptor p)
-  (checked-raw-car p))
-
-(define (checked-cdr p)
-  (cdr p)
-  (check-lazy-wraps! checked-pair-descriptor p)
-  (checked-raw-cdr p))
-
-(define (checked-first p)
-  (first p)
-  (check-lazy-wraps! checked-pair-descriptor p)
-  (checked-raw-first p))
-
-(define (checked-rest p)
-  (rest p)
-  (check-lazy-wraps! checked-pair-descriptor p)
-  (checked-raw-rest p))
-
-)
diff --git a/pkgs/deinprogramm/deinprogramm/signature/signature.rkt b/pkgs/deinprogramm/deinprogramm/signature/signature.rkt
deleted file mode 100644
index 5849a87449..0000000000
--- a/pkgs/deinprogramm/deinprogramm/signature/signature.rkt
+++ /dev/null
@@ -1,163 +0,0 @@
-#lang scheme/base
-
-(provide make-signature signature?
-	 signature-name signature-syntax signature-enforcer
-	 signature-arbitrary-promise
-	 signature-<=?-proc signature-=?-proc
-	 signature-arbitrary set-signature-arbitrary! set-signature-arbitrary-promise!
-	 signature-info-promise
-	 signature-violation
-	 signature-violation-proc call-with-signature-violation-proc
-	 signature-update-syntax signature-update-info-promise
-	 apply-signature apply-signature/blame
-	 signature=? signature<=?
-	 make-procedure-to-blame
-	 procedure-to-blame?
-	 procedure-to-blame-proc procedure-to-blame-syntax
-	 make-type-variable-info type-variable-info?
-	 signature-checking-enabled?)
-
-(require scheme/promise
-	 mzlib/struct
-	 (for-syntax scheme/base)
-	 (for-syntax stepper/private/syntax-property))
-
-(require deinprogramm/quickcheck/quickcheck)
-
-(define (signature=? c1 c2)
-  (or (eq? c1 c2)
-      (eq? (signature-enforcer c1) (signature-enforcer c2))
-      (and (signature-=?-proc c1)
-	   ((signature-=?-proc c1)
-	    (force (signature-info-promise c1)) 
-	    (force (signature-info-promise c2))))))
-
-; name may be #f
-; enforcer: signature val -> val
-; 
-; syntax: syntax data from where the signature was defined
-
-(define-struct signature (name enforcer syntax-promise (arbitrary-promise #:mutable) info-promise <=?-proc =?-proc)
-  #:constructor-name really-make-signature
-  #:property prop:equal+hash
-  (list (lambda (c1 c2 equal?) (signature=? c1 c2)) ; #### use equal?
-	(lambda (r recur)
-	  (+ (recur (signature-name r))
-	     (* 33 (recur (signature-enforcer r)))))
-	(lambda (r recur)
-	  (+ (* 33 (recur (signature-name r)))
-	     (recur (signature-enforcer r)))))
-  #:property prop:custom-write
-  (lambda (r port write?)
-    (cond
-     ((signature-name r)
-      => (lambda (name)
-	   (display "#<signature " port)
-	   (display name port)
-	   (display ">" port)))
-     (else
-      (display "#<signature>" port)))))
-
-(define (make-signature name enforcer syntax-promise
-		       #:arbitrary-promise (arbitrary-promise (delay #f))
-		       #:info-promise (info-promise (delay #f))
-		       #:<=?-proc (<=?-proc
-				   (lambda (this-info other-info)
-				     #f))
-		       #:=?-proc (=?-proc
-                                  (lambda (this-info other-info)
-                                    #f)))
-  (really-make-signature name enforcer syntax-promise arbitrary-promise info-promise <=?-proc =?-proc))
-
-(define (signature-syntax sig)
-  (force (signature-syntax-promise sig)))
-
-(define (signature-arbitrary sig)
-  (force (signature-arbitrary-promise sig)))
-
-(define (set-signature-arbitrary! sig arb)
-  (set-signature-arbitrary-promise! sig (delay arb)))
-
-(define (signature-update-syntax sig stx)
-  (struct-copy signature sig (syntax-promise (delay stx))))
-
-;; it's a promise because of ordering constraints in the structs
-(define (signature-update-info-promise sig inf)
-  (struct-copy signature sig (info-promise inf)))
-
-; message may be #f
-(define signature-violation-proc (make-parameter (lambda (obj signature message blame)
-						  (raise (make-exn:fail:contract (or message
-										     (format "got ~e" obj))
-										 (current-continuation-marks))))))
-
-(define (signature-violation obj signature msg blame)
-  ((signature-violation-proc) obj signature msg blame))
-
-(define (call-with-signature-violation-proc proc thunk)
-  (parameterize ((signature-violation-proc proc))
-    (thunk)))
-
-(define (check-signature sig val success fail)
-  ((let/ec exit
-     (let ((enforced
-	    (call-with-signature-violation-proc
-	     (lambda (signature syntax msg blame)
-	       (exit fail))
-	     (lambda ()
-	       (apply-signature sig val)))))
-       (lambda () (success enforced))))))
-
-(define (signature->predicate sig)
-  (lambda (val)
-    (check-signature sig val (lambda (_) #t) (lambda () #f))))
-
-(define-struct procedure-to-blame (proc syntax)
-  #:property prop:procedure 0)
-	     
-; like apply-signature, but can track more precise blame into the signature itself
-(define-syntax apply-signature/blame
-  (lambda (stx)
-    (syntax-case stx ()
-      ((_ ?cnt-exp ?val-exp)
-       (syntax-case (local-expand #'?val-exp 'expression #f) (lambda #%plain-lambda)
-	 ((lambda ?params ?body0 ?body1 ...)
-	  (stepper-syntax-property
-	   ;; remember there's an implicit #%app
-	   #'(apply-signature ?cnt-exp
-			     (make-procedure-to-blame ?val-exp
-						      #'?val-exp))
-	   'stepper-skipto/discard
-	   '(syntax-e cdr syntax-e cdr cdr car
-		      syntax-e cdr syntax-e cdr car)))
-	 ((#%plain-lambda ?params ?body0 ?body1 ...)
-	  (stepper-syntax-property
-	   #'(apply-signature ?cnt-exp
-			     (make-procedure-to-blame ?val-exp
-						      #'?val-exp))
-	   'stepper-skipto/discard
-	   '(syntax-e cdr syntax-e cdr cdr car
-		      syntax-e cdr syntax-e cdr car)))
-	 (_
-	  (stepper-syntax-property
-	   #'(apply-signature ?cnt-exp ?val-exp)
-	   'stepper-skipto/discard
-	   '(syntax-e cdr syntax-e cdr cdr car))))))))
-
-(define signature-checking-enabled? (make-parameter #t))
-
-(define (apply-signature signature val)
-  (if (signature-checking-enabled?)
-      ((signature-enforcer signature) signature val)
-      val))
-
-(define-struct type-variable-info ())
-
-; "do the values that fulfill c1 also fulfill c2?"
-(define (signature<=? c1 c2)
-  (or (signature=? c1 c2)
-      (let ((i1 (force (signature-info-promise c1)))
-	    (i2 (force (signature-info-promise c2))))
-	(or (type-variable-info? i2) ; kludge, maybe dispatch should be on second arg
-	    (and i1 i2
-		 ((signature-<=?-proc c1) i1 i2))))))
diff --git a/pkgs/deinprogramm/deinprogramm/signature/tool.rkt b/pkgs/deinprogramm/deinprogramm/signature/tool.rkt
deleted file mode 100644
index c943c2af92..0000000000
--- a/pkgs/deinprogramm/deinprogramm/signature/tool.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang racket/base
-
-(require racket/file racket/class racket/unit racket/contract 
-	 drracket/tool 
-	 mred framework
-         string-constants)
-(provide tool@)
-
-(preferences:set-default 'signatures:enable-checking? #t boolean?)
-
-(define tool@
-  (unit (import drracket:tool^) (export drracket:tool-exports^)
-
-    (define (phase1) (void))
-    (define (phase2) (void))
-
-    (define (signatures-frame-mixin %)
-      (class* % ()
-        (inherit get-current-tab)
-
-        (inherit register-capability-menu-item get-language-menu)
-
-        (define/private (signatures-menu-init)
-          (let ([language-menu (get-language-menu)]
-                [enable-label (string-constant signature-enable-checks)]
-                [disable-label (string-constant signature-disable-checks)])
-                
-            (make-object separator-menu-item% language-menu)
-            (register-capability-menu-item 'signatures:signatures-menu language-menu)
-            (letrec ([enable-menu-item%
-                      (class menu:can-restore-menu-item%
-                        (define enabled? #t)
-                        (define/public (is-signature-checking-enabled?) enabled?)
-                        (define/public (set-signature-checking-enabled?! e) (set! enabled? e))
-			(inherit set-label)
-                        (define/public (enable-signature-checking)
-                          (unless enabled?
-                            (set! enabled? #t)
-                            (set-label disable-label)
-                            (preferences:set 'signatures:enable-checking? '#t)))
-                        (define/public (disable-signature-checking)
-                          (when enabled?
-                            (set! enabled? #f)
-                            (set-label enable-label)
-                            (preferences:set 'signatures:enable-checking? '#f)))
-                        (super-instantiate ()))]
-                     [enable? (preferences:get 'signatures:enable-checking?)]
-                     [enable-menu-item (make-object enable-menu-item%
-                                         (if enable? disable-label enable-label)
-                                         language-menu 
-                                         (lambda (_1 _2)
-                                           (if (send _1 is-signature-checking-enabled?)
-                                               (send _1 disable-signature-checking)
-                                               (send _1 enable-signature-checking))) #f)])
-              
-              (send enable-menu-item set-signature-checking-enabled?! enable?)
-              (register-capability-menu-item 'signatures:signatures-menu language-menu))))
-                
-        (unless (drracket:language:capability-registered? 'signatures:signatures-menu)
-          (drracket:language:register-capability 'signatures:signatures-menu (flat-contract boolean?) #f))
-        (super-instantiate ())
-        (signatures-menu-init)
-        ))
-
-    (drracket:get/extend:extend-unit-frame signatures-frame-mixin)
-    ))
diff --git a/pkgs/deinprogramm/deinprogramm/syntax-checkers.rkt b/pkgs/deinprogramm/deinprogramm/syntax-checkers.rkt
deleted file mode 100644
index bd83c3c622..0000000000
--- a/pkgs/deinprogramm/deinprogramm/syntax-checkers.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scheme/base
-
-(provide check-for-id!
-         check-for-id-list!)
-
-(define (check-for-id! arg error-msg)
-  (when (not (identifier? arg))
-      (raise-syntax-error #f error-msg arg)))
-
-(define (check-for-id-list! args error-msg)
-  (for-each (lambda (arg)
-              (check-for-id! arg error-msg))
-            args)
-  (cond ((check-duplicate-identifier args)
-         => (lambda (dup)
-              (raise-syntax-error 
-               #f 
-               "Bezeichner doppelt gebunden"
-               args dup)))
-        (else #t)))
diff --git a/pkgs/deinprogramm/deinprogramm/test-suite.rkt b/pkgs/deinprogramm/deinprogramm/test-suite.rkt
deleted file mode 100644
index 1407926fcb..0000000000
--- a/pkgs/deinprogramm/deinprogramm/test-suite.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scheme/base
-
-;; This is a dummy file, meant to be overwritten to install support
-;; for the test boxes, when a user installs the test-suite bundle from
-;; the DMdA web site.
diff --git a/pkgs/deinprogramm/deinprogramm/tests/image.rkt b/pkgs/deinprogramm/deinprogramm/tests/image.rkt
deleted file mode 100644
index 75c3ba3898..0000000000
--- a/pkgs/deinprogramm/deinprogramm/tests/image.rkt
+++ /dev/null
@@ -1,1038 +0,0 @@
-#lang scheme/base
-
-(provide all-image-tests)
-
-(require rackunit
-         deinprogramm/image
-         (only-in lang/private/imageeq image=?)
-         (except-in mred make-color make-pen)
-         mzlib/class
-         mrlib/cache-image-snip
-         lang/posn
-         htdp/error)
-
-
-(define-values (image-snip1 image-snip2)
-  (let ()
-    (define size 2)
-    
-    (define (do-draw c-bm m-bm)
-      (let ([bdc (make-object bitmap-dc% c-bm)])
-        (send bdc clear)
-        (send bdc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-        (send bdc set-brush (send the-brush-list find-or-create-brush "red" 'solid))
-        (send bdc draw-rectangle 0 0 size size)
-        (send bdc set-bitmap m-bm)
-        (send bdc clear)
-        (send bdc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-        (send bdc set-brush (send the-brush-list find-or-create-brush "black" 'solid))
-        (send bdc draw-rectangle 0 0 (/ size 2) size)
-        (send bdc set-bitmap #f)))
-    
-    (define image-snip1 
-      (let* ([c-bm (make-object bitmap% size size)]
-             [m-bm (make-object bitmap% size size #t)])
-        (do-draw c-bm m-bm)
-        (make-object image-snip% c-bm m-bm)))
-    
-    (define image-snip2 
-      (let* ([c-bm (make-object bitmap% size size)]
-             [m-bm (make-object bitmap% size size)])
-        (do-draw c-bm m-bm)
-        (send c-bm set-loaded-mask m-bm)
-        (make-object image-snip% c-bm)))
-    
-    (values image-snip1 image-snip2)))
-
-(define image-snip3 (make-object image-snip%))
-
-;; check-on-bitmap : symbol snip -> void
-;; checks on various aspects of the bitmap snips to make
-;; sure that they draw properly
-(define (check-on-bitmap snp)
-  (let-values ([(width height) (send snp get-size)])
-    (let ([bdc (make-object bitmap-dc%)]
-          [max-difference
-           (lambda (s1 s2)
-             (cond
-               [(and (zero? (bytes-length s1))
-                     (zero? (bytes-length s2)))
-                0]
-               [else
-                (apply max
-                       (map (lambda (x y) (abs (- x y))) 
-                            (bytes->list s1)
-                            (bytes->list s1)))]))])
-      
-      ;; test that no drawing is outside the snip's drawing claimed drawing area
-      (let* ([extra-space 100]
-             [bm-width (+ width extra-space)]
-             [bm-height (+ height extra-space)]
-             [bm-clip (make-object bitmap% bm-width bm-height)]
-             [bm-noclip (make-object bitmap% bm-width bm-height)]
-             [s-clip (make-bytes (* bm-width bm-height 4))]
-             [s-noclip (make-bytes (* bm-width bm-height 4))]
-             [s-trunc (make-bytes (* bm-width bm-height 4))])
-        (send bdc set-bitmap bm-clip)
-        (send bdc clear)
-        (send bdc set-clipping-rect (/ extra-space 2) (/ extra-space 2) width height) 
-        (send snp draw bdc (/ extra-space 2) (/ extra-space 2) 0 0 (+ width extra-space) (+ height extra-space) 0 0 #f)
-        (send bdc set-clipping-region #f)
-        (send bdc get-argb-pixels 0 0 (+ width extra-space) (+ height extra-space) s-clip)
-        
-        (send bdc set-bitmap bm-noclip)
-        (send bdc clear)
-        (send snp draw bdc (/ extra-space 2) (/ extra-space 2) 0 0 (+ width extra-space) (+ height extra-space) 0 0 #f)
-        (send bdc get-argb-pixels 0 0 (+ width extra-space) (+ height extra-space) s-noclip)
-        (send bdc set-bitmap #f)
-        
-        (check-equal? s-clip s-noclip)
-        
-        (send bdc set-bitmap bm-noclip)
-        (send bdc set-pen "black" 1 'transparent)
-        (send bdc set-brush "white" 'solid)
-        (send bdc draw-rectangle 0 0 (/ extra-space 2) bm-height)
-        (send bdc draw-rectangle (- bm-width (/ extra-space 2)) 0 (/ extra-space 2) bm-height)
-        (send bdc draw-rectangle 0 0 bm-width (/ extra-space 2))
-        (send bdc draw-rectangle 0 (- bm-height (/ extra-space 2)) bm-width (/ extra-space 2))
-        (send bdc get-argb-pixels 0 0 (+ width extra-space) (+ height extra-space) s-trunc)
-        
-        (check-equal? s-noclip s-trunc))
-        
-      (let ([bm-normal (make-object bitmap% (max 1 width) (max 1 height))]
-            [bm-bitmap (make-object bitmap% (max 1 width) (max 1 height))]
-            [s-normal (make-bytes (* (max 1 width) (max 1 height) 4))]
-            [s-bitmap (make-bytes (* (max 1 width) (max 1 height) 4))])
-        
-        (send bdc set-bitmap bm-normal)
-        (send bdc clear)
-        (send snp draw bdc 0 0 0 0 width height 0 0 #f)
-        (send bdc get-argb-pixels 0 0 width height s-normal)
-        (send bdc set-bitmap bm-bitmap)
-        (send bdc clear)
-        
-        ;; force the snip to switch over to bitmap mode
-        (send snp get-argb)
-        
-        (send snp draw bdc 0 0 0 0 width height 0 0 #f)
-        (send bdc get-argb-pixels 0 0 width height s-bitmap)
-        (send bdc set-bitmap #f)
-        (check-true (<= (max-difference s-normal s-bitmap) 2))))))
-
-(define red (make-color 255 0 0))
-(define blue (make-color 0 0 255))
-(define black (make-color 0 0 0))
-(define white (make-color 255 255 255))
-
-(define awhite (make-alpha-color 0 255 255 255))
-(define ablack (make-alpha-color 0 0 0 0))
-(define ared (make-alpha-color 0 255 0 0))
-(define aclr (make-alpha-color 255 0 0 0))
-
-(define-simple-check (check-image=? i1 i2)
-  (image=? i1 i2))
-
-(define-simple-check (check-not-image=? i1 i2)
-  (not (image=? i1 i2)))
-
-(define-simple-check (check-terminates val1)
-  #t)
-
-(define (add-line i x1 y1 x2 y2 color)
-  (overlay i
-           (line (image-width i)
-                 (image-height i) 
-                 x1 y1 x2 y2 color)
-           "left" "top"))
-
-(define (not-image-inside? i1 i2)
-  (not (image-inside? i1 i2)))
-
-;; tests that the expression
-;;  a) raises a teachpack exception record,
-;;  b) has the right argument position, and
-;;  c) has the right name.
-(define (tp-exn-pred name position)
-  (lambda (exn)
-    (and (exn:fail:contract? exn)
-         (let* ([msg (exn-message exn)]
-                [beg (format "~a:" name)]
-                [len (string-length beg)])
-           (and (regexp-match position msg)
-                ((string-length msg) . > . len)
-                (string=? (substring msg 0 len) beg))))))
-
-(define-syntax err/rt-name-test
-  (syntax-rules ()
-    [(_ (name . args) position)
-     (check-exn (tp-exn-pred 'name position)
-                (lambda ()
-                  (name . args)))]))
-
-(define all-image-tests
- (test-suite
-  "Tests for images"
-
-  (test-case
-   "image?"
-   (check-pred image? (rectangle 10 10 'solid 'blue))
-   (check-pred image? (rectangle 10 10 "solid" 'blue))
-   (check-pred image? (rectangle 10 10 'outline 'blue))
-   (check-pred image? (rectangle 10 10 "outline" 'blue))
-   (check-false (image? 5)))
-  
-  (test-case
-   "color-list"
-   (check-equal? (list red)
-                 (image->color-list (rectangle 1 1 'solid 'red)))
-   (check-equal? (list blue blue blue blue)
-                 (image->color-list (rectangle 2 2 'solid 'blue))))
-
-  (test-case
-   "colors-set-up-properly"
-   (check-equal? (list (list red) (list blue) (list black) (list white))
-                 (list (image->color-list (rectangle 1 1 'solid 'red))
-                       (image->color-list (rectangle 1 1 'solid 'blue))
-                       (image->color-list (rectangle 1 1 'solid 'black))
-                       (image->color-list (rectangle 1 1 'solid 'white)))))
-
-  (test-case
-   "color-list2"
-   (check-equal? (list blue blue blue
-                       blue blue blue
-                       blue blue blue)
-                 (image->color-list (rectangle 3 3 'solid 'blue)))
-   (check-equal? (list blue blue blue
-                       blue blue blue
-                       blue blue blue)
-                 (image->color-list (rectangle 3 3 "solid" 'blue)))
-   ;; Robby says:
-   ;; I think that this test just isn't one that the primitives guarantee to hold.
-   #;(check-equal? (list blue blue blue
-                       blue white blue
-                       blue blue blue)
-                 (image->color-list (rectangle 3 3 'outline 'blue))))
-
-
-  ;; Ditto.
-  #;(test-case
-   "color-list3"
-   (check-equal? (list blue blue blue
-                       blue white blue
-                       blue blue blue)
-                 (image->color-list (rectangle 3 3 "outline" 'blue))))
-
-  (test-case
-   "color-list4"
-   (check-image=? (color-list->image (list blue blue blue blue) 2 2)
-                  (rectangle 2 2 'solid 'blue)))
-  (test-case
-   "color-list5"
-   (check-not-image=? (color-list->image (list blue blue blue blue) 2 2)
-                      (rectangle 1 4 'solid 'blue)))
-
-  (test-case
-   "color-list6"
-   (check-image=? (color-list->image (list blue blue blue blue) 1 4)
-                  (rectangle 1 4 'solid 'blue)))
-  (test-case
-   "color-list7"
-   (check-image=? (color-list->image (list 'blue 'blue 'blue 'blue) 2 2)
-                  (rectangle 2 2 'solid 'blue)))
-
-  (test-case
-   "color-list8"
-   (check-equal? 10
-                 (image-width (color-list->image '() 10 0))))
-
-  (test-case
-   "color-list9"
-   (check-equal? 0
-                 (image-height (color-list->image '() 10 0))))
-
-  (test-case
-   "color-list10"
-   (check-equal?  0
-                  (image-width (color-list->image '() 0 10))))
-
-  (test-case
-   "color-list11"
-   (check-equal? 10
-                 (image-height (color-list->image '() 0 10))))
-
-  (test-case
-   "alpha-color-list1"
-   (check-equal? (make-alpha-color 0 255 0 0)
-                 (car (image->alpha-color-list (rectangle 1 1 'solid 'red)))))
-
-  (test-case
-   "alpha-color-list2"
-   (check-equal? (make-alpha-color 0 255 0 0)
-                 (car (image->alpha-color-list (rectangle 1 1 "solid" 'red)))))
-
-  (test-case
-   "alpha-color-list3"
-   (for-each
-    (lambda (x)
-      (check-equal? x (make-alpha-color 0 255 0 0)))
-    (image->alpha-color-list (rectangle 1 1 "solid" 'red))))
-
-  (test-case
-   "alpha-color-list4"
-   (for-each
-    (lambda (x)
-      (check-equal? x (make-alpha-color 0 255 0 0)))
-    (image->alpha-color-list (rectangle 1 1 'solid 'red))))
-
-  (test-case
-   "alpha-color-list5"
-   (check-equal? (make-alpha-color 0 0 255 0)
-                 (car (image->alpha-color-list (rectangle 1 1 'solid 'green)))))
-
-  (test-case
-   "alpha-color-list6"
-   (check-equal? (make-alpha-color 0 0 0 255)
-              (car (image->alpha-color-list (rectangle 1 1 'solid 'blue)))))
-
-  (test-case
-   "alpha-color-list7"
-   (check-equal? (image-width
-                  (alpha-color-list->image
-                   (list ared aclr ared
-                         aclr aclr aclr)
-                   3
-                   2))
-                 3))
-  (test-case
-   "alpha-color-list8"
-   (check-equal? (image-height
-                  (alpha-color-list->image
-                   (list ared aclr ared
-                         aclr aclr aclr)
-                   3
-                   2))
-                 2))
-
-  (test-case
-   "alpha-color-list9"
-   (check-equal? (image->color-list
-                  (alpha-color-list->image
-                   (list ared aclr ared
-                         aclr aclr aclr)
-                   3 2))
-                 (list red   white red
-                       white white white)))
-  (test-case
-   "alpha-color-list10"
-   (check-equal? (image->color-list
-                  (overlay
-                   (rectangle 3 3 'solid 'blue)
-                   (alpha-color-list->image
-                         (list ared aclr ared
-                               aclr aclr aclr
-                               ared aclr ared)
-                         3 3)
-                   "left" "top"))
-                 (list red  blue red
-                       blue blue blue
-                       red  blue red)))
-
-  (test-case
-   "alpha-color-list11"
-   (check-equal? 10 (image-width (alpha-color-list->image '() 10 0))))
-  
-  (test-case
-   "alpha-color-list12"
-   (check-equal? 0 (image-height (alpha-color-list->image '() 10 0))))
-
-  (test-case
-   "alpha-color-list13"
-   (check-equal? 0 (image-width (alpha-color-list->image '() 0 10))))
-
-  (test-case
-   "alpha-color-list14"
-   (check-equal? 10 (image-height (alpha-color-list->image '() 0 10))))
-
-  (test-case
-   "image=?1"
-   (check-image=? (alpha-color-list->image (list (make-alpha-color 200 100 150 175)) 1 1)
-                  (alpha-color-list->image (list (make-alpha-color 200 100 150 175)) 1 1)))
-
-  (test-case 
-   "image=?2"
-   (check-image=? (alpha-color-list->image (list (make-alpha-color 255 100 100 100)) 1 1)
-                  (alpha-color-list->image (list (make-alpha-color 255 200 200 200)) 1 1)))
-
-  (test-case
-   "image=?3"
-   (check-not-image=? (alpha-color-list->image (list (make-alpha-color 200 100 100 100)) 1 1)
-                      (alpha-color-list->image (list (make-alpha-color 200 200 200 200)) 1 1)))
-
-  (test-case
-   "image=?4"
-   (check-not-image=? (alpha-color-list->image (list (make-alpha-color 200 100 150 175)
-                                                     (make-alpha-color 200 100 150 175))
-                                               1
-                                               2)
-                      (alpha-color-list->image (list (make-alpha-color 200 100 150 175)
-                                                     (make-alpha-color 200 100 150 175)) 
-                                               2
-                                               1)))
-
-  ;; This one is broken because of a fundamental problem with the
-  ;; image primitives.
-  #;(test-case
-   "image=?5"
-   (check-not-image=? (rectangle 4 4 'outline 'black) 
-                      (overlay
-                       (rectangle 4 4 'outline 'black)
-                       (circle 1 'solid 'red)
-                       0 0)))
-
-  (test-case 
-   "overlay"
-   (check-image=? (color-list->image (list blue red blue red) 2 2)
-                  (overlay (rectangle 2 2 'solid 'red)
-                           (rectangle 1 2 'solid 'blue)
-                           "left" "top")))
-
-  (test-case
-   "overlay/multiple"
-   (check-image=? (overlay (rectangle 6 6 'solid 'red)
-                           (overlay (rectangle 4 4 'solid 'white)
-                                    (rectangle 2 2 'solid 'blue)
-                                    "center" "center")
-                           "center" "center")
-                  (overlay (overlay (rectangle 6 6 'solid 'red)
-                                    (rectangle 4 4 'solid 'white)
-                                    "center" "center")
-                           (rectangle 2 2 'solid 'blue)
-                           "center" "center")))
-
-  (test-case
-   "overlay/empty-spaces-are-unmasked"
-   (check-image=? (color-list->image (list red red red blue) 2 2)
-                  (overlay
-                   (rectangle 2 2 'solid 'blue)
-                   (overlay (rectangle 1 2 'solid 'red)
-                            (rectangle 2 1 'solid 'red)
-                            "left" "top")
-                   "left" "top")))
-  
-  (test-case
-   "overlay/xy1"
-   (check-image=? (color-list->image (list red blue red blue) 2 2)
-                  (overlay (rectangle 2 2 'solid 'red)
-                           (rectangle 1 2 'solid 'blue)
-                           1 0)))
-
-  (test-case
-   "overlay/xy2"
-   (check-image=? (color-list->image (list red red red blue) 2 2)
-                  (overlay (rectangle 2 2 'solid 'red)
-                           (rectangle 1 1 'solid 'blue)
-                           1 1)))
-
-  (test-case
-   "overlay/xy3"
-   (check-image=? (color-list->image (list red red blue blue) 2 2)
-                  (overlay (rectangle 2 1 'solid 'red)
-                           (rectangle 2 1 'solid 'blue)
-                           0 1)))
-
-  (test-case
-   "overlay/xy/white"
-   (check-image=? (alpha-color-list->image (list ablack ablack ablack
-                                                 ablack awhite ablack
-                                                 ablack ablack ablack)
-                                           3 3)
-                  (overlay (rectangle 3 3 'solid 'black)
-                           (rectangle 1 1 'solid 'white)
-                           1 1)))
-
-  (test-case
-   "color-list->image/white-in-mask"
-   (check-image=? (color-list->image (list black red   black
-                                           red   red   red
-                                           black red   black)
-                                     3 3)
-                  (overlay (rectangle 3 3 'solid 'red)
-                           (color-list->image (list black white black
-                                                    white white white
-                                                    black white black)
-                                              3 3)
-                           "left" "top")))
-
-
-  (test-case
-   "overlay"
-   (check-image=? (color-list->image (list red blue red red blue red) 3 2)
-               (overlay (rectangle 3 2 'solid 'red)
-                        (rectangle 1 2 'solid 'blue)
-                        1 0)))
-
-  (test-case
-   "image=?-zero1"
-   (check-image=? (rectangle 0 10 'solid 'red)
-                  (rectangle 0 10 'solid 'red)))
-  (test-case
-   "image=?-zero2"
-   (check-image=? (rectangle 0 10 'solid 'red)
-                  (rectangle 0 10 'solid 'blue)))
-  (test-case
-   "image=?-zero3"
-   (check-not-image=? (rectangle 0 5 'solid 'red)
-                      (rectangle 0 4'solid 'blue)))
-
-  (test-case
-   "image-inside?1"
-   (check image-inside?
-          (overlay (rectangle 3 2 'solid 'red)
-                   (rectangle 1 2 'solid 'blue)
-                   1 0)
-          (rectangle 1 2 'solid 'blue)))
-
-  (test-case
-   "image-inside?2"
-   (check not-image-inside?
-          (overlay (rectangle 3 2 'solid 'red)
-                   (rectangle 1 2 'solid 'blue)
-                   1 0)
-          (rectangle 1 2 'solid 'black)))
-
-  (test-case
-   "image-inside?3"
-   (check image-inside?
-          (overlay (rectangle 3 2 'solid 'red)
-                   (rectangle 1 2 'solid 'blue)
-                   1 0)
-          (rectangle 1 2 'solid 'red)))
-
-  (test-case
-   "image-inside?4"
-   (check not-image-inside?
-          (overlay (rectangle 3 2 'solid 'red)
-                   (rectangle 1 2 'solid 'blue)
-                   1 0)
-          (rectangle 2 1 'solid 'red)))
-
-  (test-case
-   "image-inside?5"
-   (check image-inside?
-          (alpha-color-list->image (list (make-alpha-color 0 255 0 0)) 1 1)
-          (alpha-color-list->image (list (make-alpha-color 255 0 0 0)) 1 1)))
-
-  (test-case
-   "image-inside?6"
-   (check not-image-inside?
-          (overlay (rectangle 3 2 'solid 'red)
-                   (rectangle 1 2 'solid 'blue)
-                   1 0)
-          (color-list->image (list blue white white) 
-                             3 1)))
-
-  (test-case
-   "image-inside?7"
-   (check image-inside?
-          (overlay (rectangle 16 16 'solid 'red)
-                   (ellipse 6 6 'outline 'blue)
-                   2 5)
-          (ellipse 6 6 'outline 'blue)))
-
-  (test-case
-   "image-inside?8"
-   (check image-inside?
-          (overlay (rectangle (image-width (text "x" 12 'red))
-                              (image-height (text "x" 12 'red))
-                              'solid 
-                              'white)
-                   (text "x" 12 'red)
-                   "center" "center")
-          (text "x" 12 'red)))
-
-  (test-case
-   "image-inside?9"
-   (check image-inside?
-          (text "y x y" 12 'red)
-          (text "x" 12 'red)))
-
-  (test-case
-   "find-image1"
-   (check-equal? (make-posn 2 5)
-                 (find-image (overlay (rectangle 16 16 'solid 'red)
-                                      (ellipse 6 6 'outline 'blue)
-                                      2 5)
-                             (ellipse 6 6 'outline 'blue))))
-
-  (test-case
-   "find-image2"
-   (check-equal? (make-posn 0 0)
-                 (find-image (rectangle 16 16 'solid 'blue)
-                             (ellipse 6 6 'outline 'blue))))
-
-  (test-case
-   "find-image3"
-   (check-equal? (make-posn 1 1)
-                 (find-image (overlay (rectangle 10 10 'solid 'blue)
-                                      (ellipse 5 5 'solid 'red)
-                                      1 1)
-                             (ellipse 5 5 'solid 'red))))
-
-  (test-case
-   "image-width"
-   (check-equal? 5 (image-width (rectangle 5 7 'solid 'red))))
-
-  (test-case
-   "image-height"
-   (check-equal? 7 (image-height (rectangle 5 7 'solid 'red))))
-
-  (test-case
-   "color-red"
-   (check-equal? 1 (color-red (make-color 1 2 3))))
-  
-  (test-case
-   "color-green" 
-   (check-equal? 2 (color-green (make-color 1 2 3))))
-
-  (test-case
-   "color-blue" 
-   (check-equal? 3 (color-blue (make-color 1 2 3))))
-
-  (test-case
-   "color?1"
-   (check-true (color? (make-color 1 2 3))))
-
-  (test-case
-   "color?2" 
-   (check-false (color? 10)))
-
-  (test-case
-   "image-color?1"
-   (check-pred image-color? (make-color 1 2 3)))
-
-  (test-case
-   "image-color?2"
-   (check-pred image-color? "blue"))
-
-  (test-case 
-   "image-color?3"
-   (check-pred image-color? 'blue))
-
-  (test-case 
-   "image-color?4"
-   (check-false (image-color? 10)))
-
-  (test-case
-   "image-color?5"
-   (check-false (image-color? "not-a-color")))
-
-  (test-case
-   "image-color?6" 
-   (check-false (image-color? 'not-a-color)))
-
-  (test-case
-   "line" 
-   (check image=? 
-          (line 5 1 0 0 4 0 'red)
-          (color-list->image (list red red red red red) 5 1))
-   (check image=?
-          (line 1 5 0 0 0 4 'red)
-          (color-list->image (list red red red red red) 1 5))
-
-   (check image=?
-          (line 1 5 0 4 0 0 'red)
-          (color-list->image (list red red red red red) 1 5))
-
-   (check image=?
-          (line 5 1 4 0 0 0 'red)
-          (color-list->image (list red red red red red) 5 1)))
-
-
-; note: next two tests may be platform-specific... I'm not sure.
-  ;; I developed them under macos x. -robby
-  ;; And sure enough, this one doesn't work anymore. -Mike
-  #;(test-case
-   "triangle1"
-   (check image=?
-          (triangle 3 'outline 'red)
-          (color-list->image 
-           (list white red   white
-                 white red   white
-                 red   white red
-                 red   red   red)
-           3
-           4)))
-
-  (test-case
-   "triangle2"
-   (check image=? 
-          (triangle 3 'solid 'red)
-          (color-list->image 
-           (list white red   white
-                 white red   white
-                 red   red   red
-                 red   red   red)
-           3
-           4)))
-
-  (test-case
-   "clipping-twice-clips-both-times" 
-   (check image=?
-          (overlay
-           (rectangle 11 11 'solid 'green)
-           (clip (rectangle 11 11 'solid 'red)
-                 5 5 1 1)
-           "center" "center")
-          (overlay
-           (rectangle 11 11 'solid 'green)
-           (clip (clip (rectangle 11 11 'solid 'red)
-                       3 3 2 2)
-                 2 2 1 1)
-           "center" "center")))
-
-  (test-case
-   "solid-rect"
-   (check-on-bitmap  (rectangle 2 2 'solid 'red)))
-
-  (test-case
-   "outline-rect"
-   (check-on-bitmap (rectangle 2 2 'outline 'red)))
-  (test-case
-   "solid-ellipse"
-   (check-on-bitmap (ellipse 2 4 'solid 'red)))
-  (test-case
-   "outline-ellipse"
-   (check-on-bitmap (ellipse 2 4 'outline 'red)))
-  (test-case
-   "solid-circle"
-   (check-on-bitmap (circle 4 'solid 'red)))
-  (test-case
-   "outline-circle"
-   (check-on-bitmap (circle 4 'outline 'red)))
-
-  (test-case
-   "0solid-rect1"
-   (check-on-bitmap (rectangle 0 2 'solid 'red)))
-  (test-case
-   "0solid-rect2"
-   (check-on-bitmap (rectangle 2 0 'solid 'red)))
-  (test-case
-   "0outline-rect1"
-   (check-on-bitmap (rectangle 2 0 'outline 'red)))
-  (test-case
-   "0outline-rect2"
-   (check-on-bitmap (rectangle 0 0 'outline 'red)))
-  (test-case
-   "0solid-ellipse1"
-   (check-on-bitmap (ellipse 0 3 'solid 'red)))
-  (test-case
-   "0solid-ellipse2"
-   (check-on-bitmap (ellipse 3 0 'solid 'red)))
-  (test-case
-   "0outline-ellipse1"
-   (check-on-bitmap (ellipse 0 4 'outline 'red)))
-  (test-case
-   "0outline-ellipse2"
-   (check-on-bitmap (ellipse 2 0 'outline 'red)))
-  (test-case
-   "0solid-circle"
-   (check-on-bitmap (circle 0 'solid 'red)))
-  (test-case
-   "0outline-circle"
-   (check-on-bitmap (circle 0 'outline 'red)))
-
-  (test-case
-   "solid-triangle"
-   (check-on-bitmap (triangle 10 'solid 'red)))
-  (test-case
-   "outline-triangle"
-   (check-on-bitmap (triangle 10 'outline 'red)))
-  (test-case
-   "line"
-   (check-on-bitmap (line 10 7 0 0 9 6 'red)))
-
-
-
-  ;; (check-on-bitmap 'text (text "XX" 12 'red)) ;; this test fails for reasons I can't control ... -robby
-  (test-case
-   "overlay1"
-   (check-on-bitmap (overlay (rectangle 1 4 'solid 'blue)
-                             (rectangle 4 1 'solid 'green)
-                             "left" "top")))
-  (test-case
-   "overlay2"
-   (check-on-bitmap (overlay (rectangle 4 4 'solid 'blue)
-                             (rectangle 4 4 'solid 'green)
-                             2 2)))
-  (test-case
-   "overlay3"
-   (check-on-bitmap (overlay image-snip1
-                             (rectangle (image-width image-snip1) 
-                                        (image-height image-snip1)
-                                        'outline
-                                        'red)
-                             "center" "center")))
-  (test-case
-   "alpha-color-list"
-   (check-on-bitmap
-    (overlay
-     (rectangle 3 3 'solid 'blue)
-     (alpha-color-list->image
-      (list ared aclr ared
-            aclr aclr aclr
-            ared aclr ared)
-      3
-      3)
-     "center" "center")))
-   (test-case
-    "add-line"
-    (check-on-bitmap
-     (overlay
-      (rectangle 100 100 'solid 'black)
-      (line 100 100 -10 -10 110 110 'red)
-      0 0)))
-
-   (test-case
-    "add-line1"
-    (check-on-bitmap
-     (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green) "center" "center")
-               -20 -20
-               0 0
-               'red)))
-   (test-case
-    "add-line2"
-    (check-on-bitmap
-     (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green) "center" "center")
-               -20 20
-               0 0
-               'red)))
-   (test-case
-    "add-line3"
-    (check-on-bitmap
-     (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green) "center" "center")
-               20 -20
-               0 0
-               'red)))
-   
-   (test-case
-    "add-line4"
-    (check-on-bitmap
-     (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green) "center" "center")
-               20 20
-               0 0
-               'red))) 
-
-   (test-case
-    "add-line5"
-    (check-on-bitmap
-     (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green) "center" "center")
-               0 0
-               -20 -20
-               'red)))
-
-   (test-case
-    "add-line6"
-    (check-on-bitmap
-     (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green) "center" "center")
-               0 0
-               -20 20
-               'red)))
-
-   (test-case
-    "add-line7"
-    (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green) "center" "center")
-              0 0
-              20 -20
-              'red))
-
-   (test-case
-    "add-line8"
-    (check-on-bitmap
-     (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green) "center" "center")
-               0 0
-               20 20
-               'red)))
-
-   (test-case
-    "shrink"
-    (check-on-bitmap
-     (clip (rectangle 11 11 'solid 'red)
-           5 5 1 1)))
-
-
-   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-   ;;
-   ;;  test images with zero width or zero height 
-   ;;  for various things
-   ;;
-   
-   (test-case
-    "zero-width/height"
-    (check-equal? 10 (image-width (rectangle 10 0 'solid 'red)))
-    (check-equal? 0 (image-height (rectangle 10 0 'solid 'red)))
-    (check-equal? 0 (image-width (rectangle 0 10 'solid 'red)))
-    (check-equal? 10 (image-height (rectangle 0 10 'solid 'red)))
-   
-    (check-equal? 0 (image-width (text "" 12 'black)))
-    (check > (image-height (text "" 12 'black)) 0)
-
-    (check-equal? '() (image->color-list (rectangle 0 10 'solid 'red)))
-    (check-equal? '() (image->color-list (rectangle 10 0 'solid 'red)))
-    (check-equal? '() (image->color-list (rectangle 0 0 'solid 'red)))
-
-    (check-equal? '() (image->alpha-color-list (rectangle 0 10 'solid 'red)))
-    (check-equal? '() (image->alpha-color-list (rectangle 10 0 'solid 'red)))
-    (check-equal? '() (image->alpha-color-list (rectangle 0 0 'solid 'red))))
-
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-   ;;
-   ;;  test that the image construction functions
-   ;;  accept non-integer values (and floor them)
-   ;;
-   
-   (test-case
-    "accept-non-integer"
-    (check-equal? (image->color-list (rectangle 2 2 'solid 'blue))
-                  (image->color-list (rectangle #e2.5 2.5 'solid 'blue)))
-    (check-equal? (image->color-list (ellipse 2 2 'solid 'blue))
-                  (image->color-list (ellipse #e2.5 2.5 'solid 'blue)))
-    (check-equal? (image->color-list (circle 2 'solid 'blue))
-                  (image->color-list (circle #e2.5 'solid 'blue)))
-    (check-equal? (image->color-list (triangle 12 'solid 'blue))
-                  (image->color-list (triangle 12.5 'solid 'blue)))
-    (check-equal? (image->color-list (line 10 12 0 0 9 11 'blue))
-                  (image->color-list (line 10 12 0 0 9.5 #e11.5 'blue)))
-    (check-equal? (image->color-list (clip (rectangle 10 10 'solid 'blue) 3 3 4 4))
-                  (image->color-list
-                   (clip (rectangle 10 10 'solid 'blue)
-                         3.1
-                         3.2
-                         #e4.3
-                         4.4)))
-    (check-equal? (image->color-list (add-line (rectangle 10 10 'solid 'blue)
-                                               0 0 2 2 'red))
-                  (image->color-list (add-line (rectangle 10 10 'solid 'blue)
-                                               0.1 #e.2 2.1 2.2 'red))))
-
-   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-   ;;
-   ;; The tests beginning with "bs-" ensure
-   ;; that the operations all can accept bitmap 
-   ;; snips as arguments
-   ;;
-   
-   (test-case
-    "accept-bitmap"
-    (check-pred image? image-snip1)
-    (check-pred image? image-snip2)
-    (check image=? image-snip1 (send image-snip1 copy))
-    (check-not-image=?
-     ;; They have different masks:
-     image-snip1 image-snip2)
-    (check-equal? 2 (image-width image-snip1))
-    (check-equal? 2 (image-width image-snip2))
-    (check-equal? 2 (image-height image-snip1))
-    (check-equal? 2 (image-height image-snip2))
-    (check image=? image-snip1 (overlay image-snip1 image-snip2 "center" "center"))
-    (check image=? image-snip1 (overlay image-snip1 image-snip2 "left" "top"))
-    (check image=?
-           (add-line image-snip1 0 0 10 10 'green)
-           (add-line image-snip2 0 0 10 10 'green))
-    (check image-inside? image-snip1 image-snip2)
-    (check image-inside? image-snip2 image-snip1)
-    (check-equal? (make-posn 0 0)
-                  (find-image image-snip1 image-snip2))
-    (check-equal? (make-posn 0 0)
-                  (find-image image-snip2 image-snip1))
-    (check-equal? (image->color-list image-snip1)
-                  (image->color-list image-snip2))
-    (check-equal? (image->alpha-color-list image-snip1)
-                  (image->alpha-color-list image-snip2)))
-
-
-   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-   ;;
-   ;; test image-snip that doesnt' have a bitmap
-   ;;
-   
-   (test-case
-    "image-snip-no-bitmap"
-    (check-equal? 20
-                  (image-width image-snip3))
-    (overlay image-snip3 image-snip3 10 10))
-
-
-   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-   ;;
-   ;; test color arguments
-   ;;
-   (test-case
-    "color-arguments"
-    (check-terminates (rectangle 10 10 'solid 'blue))
-    (check-terminates (rectangle 10 10 'solid "blue"))
-    (check-terminates (rectangle 10 10 'solid (make-color 0 0 255)))
-    (check-terminates (ellipse 10 10 'solid 'blue))
-    (check-terminates (ellipse 10 10 'solid "blue"))
-    (check-terminates (ellipse 10 10 'solid (make-color 0 0 255)))
-    (check-terminates (circle 10 'solid 'blue))
-    (check-terminates (circle 10 'solid "blue"))
-    (check-terminates (circle 10 'solid (make-color 0 0 255)))
-    (check-terminates (triangle 10 'solid 'blue))
-    (check-terminates (triangle 10 'solid "blue"))
-    (check-terminates (triangle 10 'solid (make-color 0 0 255)))
-    (check-terminates (line 10 10 0 0 9 9 'blue))
-    (check-terminates (line 10 10 0 0 9 9 "blue"))
-    (check-terminates (line 10 10 0 0 9 9 (make-color 0 0 255)))
-    (check-terminates (add-line (rectangle 1 1 'solid 'blue) 0 0 1 1 'blue))
-    (check-terminates (add-line (rectangle 1 1 'solid 'blue) 0 0 1 1 "blue"))
-    (check-terminates (add-line (rectangle 1 1 'solid 'blue) 0 0 1 1 (make-color 0 0 255)))
-    (check-terminates (text "abc" 12 'blue))
-    (check-terminates (text "abc" 12 "blue"))
-    (check-terminates (text "abc" 12 (make-color 0 0 255))))
-
-   (test-case
-    "error-message"
-    (err/rt-name-test (image-width 1) "first") 
-    (err/rt-name-test (image-height 1) "first")
-    (err/rt-name-test (overlay 1 2 "center" "center") "first")
-    (err/rt-name-test (overlay image-snip1 2 "center" "center") "second")
-    (err/rt-name-test (overlay 1 2 "center" "center") "first")
-    (err/rt-name-test (overlay image-snip1 image-snip2 "foo" "center") "third")
-    (err/rt-name-test (overlay image-snip1 image-snip2 "center" "foo") "fourth")
-    (err/rt-name-test (rectangle #f #f #f #f) "first")
-    (err/rt-name-test (rectangle 10 #f #f #f) "second")
-    (err/rt-name-test (rectangle 10 10 #f #f) "third")
-    (err/rt-name-test (rectangle 10 10 'solid #f) "fourth")
-    (err/rt-name-test (circle #f #f #f) "first")
-    (err/rt-name-test (circle 10 #f #f) "second")
-    (err/rt-name-test (circle 10 'solid #f) "third")
-    (err/rt-name-test (ellipse #f #f #f #f) "first")
-    (err/rt-name-test (ellipse 10 #f #f #f) "second")
-    (err/rt-name-test (ellipse 10 10 #f #f) "third")
-    (err/rt-name-test (ellipse 10 10 'solid #f) "fourth")
-    (err/rt-name-test (triangle #f #f #f) "first")
-    (err/rt-name-test (triangle 10 #f #f) "second")
-    (err/rt-name-test (triangle 10 'solid #f) "third")
-    (err/rt-name-test (line #f #f 0 0 0 0 #f) "first")
-    (err/rt-name-test (line 10 #f 0 0 0 0 #f) "second")
-    (err/rt-name-test (line 10 10 #f 0 0 0 #f) "third")
-    (err/rt-name-test (line 10 10 0 #f 0 0 #f) "fourth")
-    (err/rt-name-test (line 10 10 0 0 #f 0 #f) "fifth")
-    (err/rt-name-test (line 10 10 0 0 0 #f #f) "sixth")
-    (err/rt-name-test (line 10 10 0 0 0 0 #f) "seventh")
-    (err/rt-name-test (text #f #f #f) "first")
-    (err/rt-name-test (text "abc" #f #f) "second")
-    (err/rt-name-test (text "abc" 10 #f) "third")
-    (err/rt-name-test (image-inside? #f #f) "first")
-    (err/rt-name-test (image-inside? image-snip1 #f) "second")
-    (err/rt-name-test (find-image #f #f) "first")
-    (err/rt-name-test (find-image image-snip1 #f) "second")
-    (err/rt-name-test (image->color-list 1) "first")
-    (err/rt-name-test (color-list->image #f #f #f) "first")
-    (err/rt-name-test (color-list->image (list (make-color 0 0 0)) #f #f) "second")
-    (err/rt-name-test (color-list->image (list (make-color 0 0 0)) 1 #f) "third")
-    (err/rt-name-test (image->alpha-color-list #f) "first")
-    (err/rt-name-test (alpha-color-list->image #f #f #f) "first")
-    (err/rt-name-test (alpha-color-list->image (list (make-alpha-color 0 0 0 0)) #f #f) "second")
-    (err/rt-name-test (alpha-color-list->image (list (make-alpha-color 0 0 0 0)) 1 #f) "third"))
-))
diff --git a/pkgs/deinprogramm/deinprogramm/tests/run-image-test.rkt b/pkgs/deinprogramm/deinprogramm/tests/run-image-test.rkt
deleted file mode 100644
index f26ea8c57b..0000000000
--- a/pkgs/deinprogramm/deinprogramm/tests/run-image-test.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scheme/base
-
-(require rackunit/text-ui)
-(require deinprogramm/tests/image)
-
-(run-tests all-image-tests)
diff --git a/pkgs/deinprogramm/deinprogramm/tests/run-signature-tests.rkt b/pkgs/deinprogramm/deinprogramm/tests/run-signature-tests.rkt
deleted file mode 100644
index 53f9e74eeb..0000000000
--- a/pkgs/deinprogramm/deinprogramm/tests/run-signature-tests.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scheme/base
-
-(require rackunit/text-ui)
-(require deinprogramm/tests/signature)
-
-(run-tests all-signature-tests)
diff --git a/pkgs/deinprogramm/deinprogramm/tests/signature.rkt b/pkgs/deinprogramm/deinprogramm/tests/signature.rkt
deleted file mode 100644
index 1a52196007..0000000000
--- a/pkgs/deinprogramm/deinprogramm/tests/signature.rkt
+++ /dev/null
@@ -1,645 +0,0 @@
-#lang scheme/base
-
-(provide all-signature-tests)
-
-(require rackunit
-	 deinprogramm/define-record-procedures
-	 deinprogramm/signature/signature
-	 deinprogramm/signature/signature-german
-	 deinprogramm/signature/signature-syntax)
-
-(require scheme/promise)
-
-(define integer (make-predicate-signature 'integer integer? 'integer-marker))
-(define boolean (make-predicate-signature 'boolean boolean? 'boolean-marker))
-(define %a (make-type-variable-signature 'a 'a-marker))
-(define %b (make-type-variable-signature 'b 'b-marker))
-
-(define-syntax say-no
-  (syntax-rules ()
-    ((say-no ?body ...)
-     (let/ec exit
-       (call-with-signature-violation-proc
-	(lambda (obj signature message blame)
-	  (exit 'no))
-	(lambda ()
-	  ?body ...))))))
-
-(define-syntax failed-signature
-  (syntax-rules ()
-    ((say-no ?body ...)
-     (let/ec exit
-       (call-with-signature-violation-proc
-	(lambda (obj signature message blame)
-	  (exit signature))
-	(lambda ()
-	  ?body ...))))))
-
-(define signature-tests
-  (test-suite
-   "Tests for signature combinators"
-
-   (test-case
-    "flat"
-    (check-equal? (say-no (apply-signature integer 5)) 5)
-    (check-equal? (say-no (apply-signature integer "foo")) 'no))
-
-   (test-case
-    "list"
-    (define integer-list (make-list-signature 'integer-list integer #f))
-    (check-equal? (say-no (apply-signature integer-list '(1 2 3)))
-		  '(1 2 3))
-    (check-equal? (say-no (apply-signature integer-list '#f))
-		  'no)
-    (check-eq? (failed-signature (apply-signature integer-list '(1 #f 3)))
-	       integer))
-
-   (test-case
-    "list-cached"
-    (define integer-list (make-list-signature 'integer-list integer #f))
-    (define boolean-list (make-list-signature 'integer-list boolean #f))
-    (define l '(1 2 3))
-    (define foo "foo")
-    (define no '(1 #f 3))
-    (define no2 '(1 #f 3))
-    (define integer-list->bool (make-procedure-signature 'integer-list->bool (list integer-list) boolean 'int->bool-marker))
-
-    (check-equal? (say-no (apply-signature integer-list l))
-		  '(1 2 3))
-    (check-equal? (say-no (apply-signature integer-list l))
-		  '(1 2 3))
-    (check-equal? (say-no (apply-signature boolean-list l))
-		  'no)
-    (check-equal? (say-no (apply-signature integer-list foo))
-		  'no)
-    (check-equal? (say-no (apply-signature integer-list foo))
-		  'no)
-    (check-eq? (failed-signature (apply-signature integer-list no))
-	       integer)
-    (check-eq? (failed-signature (apply-signature integer-list no))
-	       integer)
-
-    (let ((proc (say-no (apply-signature integer-list->bool (lambda (l) (even? (car l)))))))
-      (check-equal? (say-no (proc no)) 'no)
-      (check-equal? (say-no (proc no)) 'no)
-      (check-equal? (say-no (proc no2)) 'no)
-      (check-equal? (say-no (proc no2)) 'no))
-    )
- 
-   (test-case
-    "vector"
-    (define integer-vector (make-vector-signature 'integer-vector integer #f))
-    (define a-vector (make-vector-signature 'a-vector %a #f))
-    (check-equal? (say-no (apply-signature integer-vector '#(1 2 3)))
-		  '#(1 2 3))
-    (check-equal? (say-no (apply-signature a-vector '#(1 2 3)))
-		  '#(1 2 3))
-    (check-equal? (say-no (apply-signature integer-vector '#f))
-		  'no)
-    (check-eq? (failed-signature (apply-signature integer-vector '#(1 #f 3)))
-	       integer))
-
-   (test-case
-    "vector/cached"
-    (let ((count 0))
-      (define counting-integer
-	(make-predicate-signature 'counting-integer 
-				  (lambda (obj)
-				    (set! count (+ 1 count))
-				    (integer? obj))
-				  'integer-marker))
-
-      (define integer-vector (make-vector-signature 'integer-list counting-integer #f))
-
-      (define v1 '#(1 2 3))
-
-      (check-eq? (say-no (apply-signature integer-vector v1))
-		 v1)
-      (check-equal? count 3)
-      (check-eq? (say-no (apply-signature integer-vector v1))
-		 v1)
-      (check-equal? count 3)))
-
-
-   (test-case
-    "mixed"
-    (define int-or-bool (make-mixed-signature 'int-or-bool
-					     (list integer
-						   boolean)
-					     'int-or-bool-marker))
-    (check-equal? (say-no (apply-signature int-or-bool #f))
-		  #f)
-    (check-equal? (say-no (apply-signature int-or-bool 17))
-		  17)
-    (check-equal? (say-no (apply-signature int-or-bool "foo"))
-		  'no))
-
-   (test-case
-    "combined"
-    (define octet (make-combined-signature
-		   'octet
-		   (list
-		    integer
-		    (make-predicate-signature '<256
-					     (delay (lambda (x)
-						      (< x 256)))
-					     '<256-marker)
-		    (make-predicate-signature 'non-negative
-					     (delay (lambda (x)
-						      (>= x 0)))
-					     'non-negative-marker))
-		   'octet-marker))
-    (check-equal? (say-no (apply-signature octet #f))
-		  'no)
-    (check-equal? (say-no (apply-signature octet 17))
-		  17)
-    (check-equal? (say-no (apply-signature octet 0))
-		  0)
-    (check-equal? (say-no (apply-signature octet -1))
-		  'no)
-    (check-equal? (say-no (apply-signature octet 255))
-		  255)
-    (check-equal? (say-no (apply-signature octet 256))
-		  'no)
-    (check-equal? (say-no (apply-signature octet "foo"))
-		  'no))
-
-   (test-case
-    "case"
-    (define foo-or-bar (make-case-signature 'foo-or-bar '("foo" "bar") equal? 'foo-or-bar-marker))
-    (check-equal? (say-no (apply-signature foo-or-bar #f))
-		  'no)
-    (check-equal? (say-no (apply-signature foo-or-bar "foo"))
-		    "foo")
-    (check-equal? (say-no (apply-signature foo-or-bar "bar"))
-		  "bar"))
-
-   (test-case
-    "procedure"
-    (define int->bool (make-procedure-signature 'int->bool (list integer) boolean 'int->bool-marker))
-    (check-equal? (say-no (apply-signature int->bool #f))
-		  'no)
-    (check-equal? (say-no (apply-signature int->bool (lambda () "foo")))
-		  'no)
-    (check-equal? (say-no (apply-signature int->bool (lambda (x y) "foo")))
-		  'no)
-    (let ((proc (say-no (apply-signature int->bool (lambda (x) (odd? x))))))
-      (check-pred procedure? proc)
-      (check-equal? (proc 15) #t)
-      (check-equal? (proc 16) #f)
-      (check-equal? (say-no (proc "foo")) 'no))
-    (let ((proc (say-no (apply-signature int->bool (lambda (x) (+ x 1))))))
-      (check-equal? (say-no (proc 12)) 'no)))
-
-   (test-case
-    "type variable - simple"
-    (check-equal? (say-no (apply-signature %a #f)) #f)
-    (check-equal? (say-no (apply-signature %a 15)) 15))
-   
-   (test-case
-    "type variable - list"
-    (define a-list (make-list-signature 'a-list %a #f))
-    (check-equal? (say-no (apply-signature a-list '(1 2 3)))
-		  '(1 2 3))
-    (check-equal? (say-no (apply-signature a-list '#f))
-		  'no)
-    (check-equal? (say-no (apply-signature a-list '(#f "foo" 5)))
-		  '(#f "foo" 5)))
-
-   (test-case
-    "apply-signature/blame"
-    (define int->bool (make-procedure-signature 'int->bool (list integer) boolean 'int->bool-marker))
-    (let ((proc (say-no (apply-signature/blame int->bool (lambda (x) (odd? x))))))
-      (check-pred procedure? proc)
-      (check-equal? (proc 15) #t)
-      (check-equal? (proc 16) #f)
-      (check-equal? (say-no (proc "foo")) 'no))
-    (let ((proc (say-no (apply-signature/blame int->bool (lambda (x) x)))))
-      (call-with-signature-violation-proc
-       (lambda (obj signature message blame)
-	 (check-true (syntax? blame)))
-       (lambda ()
-	 (proc 5)))))
-   ))
-
-(define signature-syntax-tests
-  (test-suite
-   "Tests for signature syntax"
-
-   (test-case
-    "predicate"
-    (define integer (signature (predicate integer?)))
-    (check-equal? (say-no (apply-signature integer 5)) 5)
-    (check-equal? (say-no (apply-signature integer "foo")) 'no))
-
-   (test-case
-    "list"
-    (check-equal? (say-no (apply-signature (signature x (list-of %a)) 5)) 'no)
-    (check-equal? (say-no (apply-signature (signature x (list-of %a)) '(1 2 3))) '(1 2 3))
-    (check-equal? (say-no (apply-signature (signature x (list-of (predicate integer?))) '(1 2 3))) '(1 2 3))
-    (check-equal? (say-no (apply-signature (signature x (list-of (predicate integer?))) '(1 #f 3))) 'no))
-
-   (test-case
-    "mixed"
-    (define int-or-bool (signature (mixed integer boolean)))
-    (check-equal? (say-no (apply-signature int-or-bool #f))
-		  #f)
-    (check-equal? (say-no (apply-signature int-or-bool 17))
-		  17)
-    (check-equal? (say-no (apply-signature int-or-bool "foo"))
-		  'no))
-
-   (test-case
-    "combined"
-    (define octet (signature (combined integer
-				      (predicate (lambda (x)
-						   (< x 256)))
-				      (predicate (lambda (x)
-						   (>= x 0))))))
-    (check-equal? (say-no (apply-signature octet #f))
-		  'no)
-    (check-equal? (say-no (apply-signature octet 17))
-		  17)
-    (check-equal? (say-no (apply-signature octet 0))
-		  0)
-    (check-equal? (say-no (apply-signature octet -1))
-		  'no)
-    (check-equal? (say-no (apply-signature octet 255))
-		  255)
-    (check-equal? (say-no (apply-signature octet 256))
-		  'no)
-    (check-equal? (say-no (apply-signature octet "foo"))
-		  'no))
-
-   (test-case
-    "procedure"
-    (define int->bool (signature int->bool ((predicate integer?) -> (predicate boolean?))))
-    (check-equal? (say-no (apply-signature int->bool #f))
-		  'no)
-    (check-equal? (say-no (apply-signature int->bool (lambda () "foo")))
-		  'no)
-    (check-equal? (say-no (apply-signature int->bool (lambda (x y) "foo")))
-		  'no)
-    (let ((proc (say-no (apply-signature int->bool (lambda (x) (odd? x))))))
-      (check-pred procedure? proc)
-      (check-equal? (proc 15) #t)
-      (check-equal? (proc 16) #f)
-      (check-equal? (say-no (proc "foo")) 'no))
-    (let ((proc (say-no (apply-signature int->bool (lambda (x) (+ x 1))))))
-      (check-equal? (say-no (proc 12)) 'no))) 
-
-
-   (test-case
-    "record-wrap"
-    (define-record-procedures-parametric pare pare-of kons pare? (kar kdr))
-    (define ctr (pare-of integer boolean))
-    (let ((obj (apply-signature ctr (kons 1 #t))))
-      (check-equal? (kar obj) 1)
-      (check-equal? (kdr obj) #t))
-    (check-equal? (say-no (apply-signature ctr (kons 1 2))) 'no)
-    )
-
-   (test-case
-    "record-wrap/lazy"
-    (define-struct pare (kar kdr extra)
-      #:mutable
-      #:property prop:lazy-wrap
-      (make-lazy-wrap-info
-       (lambda (kar kdr) (kons kar kdr))
-       (list (lambda (x) (pare-kar x)) (lambda (x) (pare-kdr x)))
-       (list (lambda (x v) (set-pare-kar! x v))
-	     (lambda (x v) (set-pare-kdr! x v)))
-       (lambda (x) (pare-extra x)) (lambda (x v) (set-pare-extra! x v))))
-    (define (kons kar kdr)
-      (make-pare kar kdr #f))
-    (define (kar p)
-      (check-lazy-wraps! struct:pare p)
-      (pare-kar p))
-    (define (kdr p)
-      (check-lazy-wraps! struct:pare p)
-      (pare-kdr p))
-    (define (pare-of kar-sig kdr-sig)
-      (make-lazy-wrap-signature 'pare #f 
-				struct:pare
-				pare?
-				(list kar-sig kdr-sig)
-				#f))
-    (define ctr (pare-of integer boolean))
-    (let ((obj (apply-signature ctr (kons 1 #t))))
-      (check-equal? (kar obj) 1)
-      (check-equal? (kdr obj) #t))
-    (let ((obj (apply-signature ctr (kons 1 2))))
-      (check-equal? (say-no (kar obj)) 'no))
-    )
-
-   (test-case
-    "record-wrap-2"
-    (let ((count 0))
-      (define counting-integer
-	(make-predicate-signature 'counting-integer 
-				  (lambda (obj)
-				    (set! count (+ 1 count))
-				    (integer? obj))
-				  'integer-marker))
-      (define-record-procedures-parametric pare pare-of kons pare? (kar kdr))
-      (define ctr (signature (pare-of counting-integer boolean)))
-      (let ((obj (apply-signature ctr (apply-signature ctr (kons 1 #t)))))
-	(check-equal? count 1)
-	(check-equal? (kar obj) 1)
-	(check-equal? count 1)
-	(check-equal? (kdr obj) #t)
-	(check-equal? count 1))))
-
-   (test-case
-    "record-wrap-2/lazy"
-    (let ((count 0))
-      (define counting-integer
-	(make-predicate-signature 'counting-integer 
-				  (lambda (obj)
-				    (set! count (+ 1 count))
-				    (integer? obj))
-				  'integer-marker))
-
-      (define-struct pare (kar kdr extra)
-	#:mutable
-	#:property prop:lazy-wrap
-	(make-lazy-wrap-info
-	 (lambda (kar kdr) (kons kar kdr))
-	 (list (lambda (x) (pare-kar x)) (lambda (x) (pare-kdr x)))
-	 (list (lambda (x v) (set-pare-kar! x v))
-	       (lambda (x v) (set-pare-kdr! x v)))
-	 (lambda (x) (pare-extra x)) (lambda (x v) (set-pare-extra! x v))))
-      (define (kons kar kdr)
-	(make-pare kar kdr #f))
-      (define (kar p)
-	(check-lazy-wraps! struct:pare p)
-	(pare-kar p))
-      (define (kdr p)
-	(check-lazy-wraps! struct:pare p)
-	(pare-kdr p))
-      (define (pare-of kar-sig kdr-sig)
-	(make-lazy-wrap-signature 'pare #f 
-				  struct:pare
-				  pare?
-				  (list kar-sig kdr-sig)
-				  #f))
-
-      (define ctr (signature (pare-of counting-integer boolean)))
-      (let ((obj (apply-signature ctr (apply-signature ctr (kons 1 #t)))))
-	(check-equal? count 0)
-	(check-equal? (kar obj) 1)
-	(check-equal? count 1)
-	(check-equal? (kdr obj) #t)
-	(check-equal? count 1))))
-
-   (test-case
-    "record-wrap-3"
-    (let ((count 0))
-      (define counting-integer
-	(make-predicate-signature 'counting-integer 
-				 (lambda (obj)
-				   (set! count (+ 1 count))
-				   (integer? obj))
-				 'integer-marker))
-
-      (define-record-procedures-parametric pare pare-of kons pare? (kar kdr))
-      (define ctr (signature (pare-of counting-integer boolean)))
-      (let ((obj (apply-signature ctr (apply-signature ctr (kons 1 #t)))))
-	(check-equal? count 1)
-	(check-equal? (kar obj) 1)
-	(check-equal? count 1)
-	(check-equal? (kdr obj) #t)
-	(check-equal? count 1)
-	;; after checking, the system should remember that it did so
-	(let ((obj-2 (apply-signature ctr obj)))
-	  (check-equal? count 1)
-	  (check-equal? (kar obj) 1)
-	  (check-equal? count 1)
-	  (check-equal? (kdr obj) #t)
-	  (check-equal? count 1)))))
-
-   (test-case
-    "record-wrap-3/lazy"
-    (let ((count 0))
-      (define counting-integer
-	(make-predicate-signature 'counting-integer 
-				 (lambda (obj)
-				   (set! count (+ 1 count))
-				   (integer? obj))
-				 'integer-marker))
-      (define-struct pare (kar kdr extra)
-	#:mutable
-	#:property prop:lazy-wrap
-	(make-lazy-wrap-info
-	 (lambda (kar kdr) (kons kar kdr))
-	 (list (lambda (x) (pare-kar x)) (lambda (x) (pare-kdr x)))
-	 (list (lambda (x v) (set-pare-kar! x v))
-	       (lambda (x v) (set-pare-kdr! x v)))
-	 (lambda (x) (pare-extra x)) (lambda (x v) (set-pare-extra! x v))))
-      (define (kons kar kdr)
-	(make-pare kar kdr #f))
-      (define (kar p)
-	(check-lazy-wraps! struct:pare p)
-	(pare-kar p))
-      (define (kdr p)
-	(check-lazy-wraps! struct:pare p)
-	(pare-kdr p))
-      (define (pare-of kar-sig kdr-sig)
-	(make-lazy-wrap-signature 'pare #f 
-				  struct:pare
-				  pare?
-				  (list kar-sig kdr-sig)
-				  #f))
-
-      (define ctr (signature (pare-of counting-integer boolean)))
-      (let ((obj (apply-signature ctr (apply-signature ctr (kons 1 #t)))))
-	(check-equal? count 0)
-	(check-equal? (kar obj) 1)
-	(check-equal? count 1)
-	(check-equal? (kdr obj) #t)
-	(check-equal? count 1)
-	;; after checking, the system should remember that it did so
-	(let ((obj-2 (apply-signature ctr obj)))
-	  (check-equal? count 1)
-	  (check-equal? (kar obj) 1)
-	  (check-equal? count 1)
-	  (check-equal? (kdr obj) #t)
-	  (check-equal? count 1)))))
-
-   (test-case
-    "double-wrap"
-    (let ((count 0))
-      (define counting-integer
-	(make-predicate-signature 'counting-integer 
-				 (lambda (obj)
-				   (set! count (+ 1 count))
-				   (integer? obj))
-				 'integer-marker))
-      (define-record-procedures-parametric pare pare-of raw-kons pare? (kar kdr))
-
-      (define empty-list (signature (predicate null?)))
-
-      (define my-list-of
-	(lambda (x)
-	  (signature (mixed empty-list
-			    (pare-of x (my-list-of x))))))
-      
-      (define/signature kons (signature (%a (my-list-of %a) -> (pare-of %a (my-list-of %a))))
-	raw-kons)
-      
-      (define/signature build-list (signature (integer -> (my-list-of counting-integer)))
-	(lambda (n)
-	  (if (= n 0)
-	      '()
-	      (kons n (build-list (- n 1))))))
-
-      (define/signature list-length (signature ((my-list-of counting-integer) -> integer))
-	(lambda (lis)
-	  (cond
-	   ((null? lis) 0)
-	   ((pare? lis)
-	    (+ 1 (list-length (kdr lis)))))))
-      
-      ;; one wrap each for (my-list-of %a), one for (my-list-of counting-integer)
-      (let  ((l1 (build-list 10)))
-	(check-equal? count 10)
-	(let ((len1 (list-length l1)))
-	  (check-equal? count 10)))))
-
-   (test-case
-    "double-wrap/lazy"
-    (let ((count 0))
-      (define counting-integer
-	(make-predicate-signature 'counting-integer 
-				 (lambda (obj)
-				   (set! count (+ 1 count))
-				   (integer? obj))
-				 'integer-marker))
-
-      (define-struct pare (kar kdr extra)
-	#:mutable
-	#:property prop:lazy-wrap
-	(make-lazy-wrap-info
-	 (lambda (kar kdr) (raw-kons kar kdr))
-	 (list (lambda (x) (pare-kar x)) (lambda (x) (pare-kdr x)))
-	 (list (lambda (x v) (set-pare-kar! x v))
-	       (lambda (x v) (set-pare-kdr! x v)))
-	 (lambda (x) (pare-extra x)) (lambda (x v) (set-pare-extra! x v))))
-      (define (raw-kons kar kdr)
-	(make-pare kar kdr #f))
-      (define (kar p)
-	(check-lazy-wraps! struct:pare p)
-	(pare-kar p))
-      (define (kdr p)
-	(check-lazy-wraps! struct:pare p)
-	(pare-kdr p))
-      (define (pare-of kar-sig kdr-sig)
-	(make-lazy-wrap-signature 'pare #f 
-				  struct:pare
-				  pare?
-				  (list kar-sig kdr-sig)
-				  #f))
-
-
-      (define empty-list (signature (predicate null?)))
-
-      (define my-list-of
-	(lambda (x)
-	  (signature (mixed empty-list
-			    (pare-of x (my-list-of x))))))
-      
-      (define/signature kons (signature (%a (my-list-of %a) -> (pare-of %a (my-list-of %a))))
-	raw-kons)
-      
-      (define/signature build-list (signature (integer -> (my-list-of counting-integer)))
-	(lambda (n)
-	  (if (= n 0)
-	      '()
-	      (kons n (build-list (- n 1))))))
-
-      (define/signature list-length (signature ((my-list-of counting-integer) -> integer))
-	(lambda (lis)
-	  (cond
-	   ((null? lis) 0)
-	   ((pare? lis)
-	    (+ 1 (list-length (kdr lis)))))))
-      
-      ;; one wrap each for (my-list-of %a), one for (my-list-of counting-integer)
-      (let  ((l1 (build-list 10)))
-	(check-equal? count 0)
-	(let ((len1 (list-length l1)))
-	  (check-equal? count 10)))))
-
-   (test-case
-    "mixed wrap"
-
-    (define-struct pare (kar kdr extra)
-      #:mutable
-      #:property prop:lazy-wrap
-      (make-lazy-wrap-info
-       (lambda (kar kdr) (raw-kons kar kdr))
-       (list (lambda (x) (pare-kar x)) (lambda (x) (pare-kdr x)))
-       (list (lambda (x v) (set-pare-kar! x v))
-	     (lambda (x v) (set-pare-kdr! x v)))
-       (lambda (x) (pare-extra x)) (lambda (x v) (set-pare-extra! x v))))
-    (define (raw-kons kar kdr)
-      (make-pare kar kdr #f))
-    (define (kar p)
-      (check-lazy-wraps! struct:pare p)
-      (pare-kar p))
-    (define (kdr p)
-      (check-lazy-wraps! struct:pare p)
-      (pare-kdr p))
-    (define (pare-of kar-sig kdr-sig)
-      (make-lazy-wrap-signature 'pare #f 
-				struct:pare
-				pare?
-				(list kar-sig kdr-sig)
-				#f))
-
-
-    (define sig1 (signature (pare-of integer boolean)))
-    (define sig2 (signature (pare-of boolean integer)))
-    (define sig (signature (mixed sig1 sig2)))
-    (define/signature x sig (raw-kons #t 15))
-    (define/signature y sig (raw-kons #t #t))
-    (check-equal? (kar x) #t)
-    (check-equal? (say-no (kar y)) 'no))
-
-   (test-case
-    "wrap equality"
-    (define-record-procedures-parametric pare pare-of raw-kons pare? (kar kdr))
-
-    (define empty-list (signature (predicate null?)))
-    
-    (define my-list-of
-      (lambda (x)
-	(signature (mixed empty-list
-			  (pare-of x (my-list-of x))))))
-    
-    (define/signature kons (signature (%a (my-list-of %a) -> (pare-of %a (my-list-of %a))))
-      raw-kons)
-
-    (check-equal? (raw-kons 1 '()) (raw-kons 1 '()))
-    (check-equal? (kons 1 '()) (kons 1 '()))
-    (check-equal? (kons 1 '()) (raw-kons 1 '()))
-    (check-equal? (raw-kons 1 '()) (kons 1 '())))
-
-   (test-case
-    "pair-wrap"
-    (define sig (make-pair-signature #f integer boolean))
-    (let ((obj (apply-signature sig (cons 1 #t))))
-      (check-equal? (checked-car obj) 1)
-      (check-equal? (checked-cdr obj) #t))
-    (let ((obj (apply-signature sig (cons 1 2))))
-      (check-equal? (say-no (checked-car obj)) 'no))
-    )
-
-))
-
-
-(define all-signature-tests
-  (test-suite
-   "all-signature-tests"
-   signature-tests
-   signature-syntax-tests))
diff --git a/pkgs/deinprogramm/deinprogramm/tests/test-docs-complete.rkt b/pkgs/deinprogramm/deinprogramm/tests/test-docs-complete.rkt
deleted file mode 100644
index b5cdb6a7c4..0000000000
--- a/pkgs/deinprogramm/deinprogramm/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-
-(check-docs (quote deinprogramm/world))
-(check-docs (quote deinprogramm/image))
-
-(check-docs (quote deinprogramm/DMdA-beginner) #:skip #rx"(^#%)|(^\\.\\.)|(^contract$)|(^define-contract$)")
-(check-docs (quote deinprogramm/DMdA-vanilla) #:skip #rx"(^#%)|(^\\.\\.)|(^contract$)|(^define-contract$)")
-(check-docs (quote deinprogramm/DMdA-advanced) #:skip #rx"(^#%)|(^\\.\\.)|(^contract$)|(^define-contract$)")
-(check-docs (quote deinprogramm/DMdA-assignments) #:skip #rx"(^#%)|(^\\.\\.)|(^contract$)|(^define-contract$)")
diff --git a/pkgs/deinprogramm/deinprogramm/textbook-pls-spec.rkt b/pkgs/deinprogramm/deinprogramm/textbook-pls-spec.rkt
deleted file mode 100644
index 6d8a5868a3..0000000000
--- a/pkgs/deinprogramm/deinprogramm/textbook-pls-spec.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-(require string-constants)
-
-(provide textbook-pls)
-
-(define textbook-pls
-  (list (list '("logo-small.png" "deinprogramm")
-              "DeinProgramm"
-              (string-constant teaching-languages)
-              "DeinProgramm"
-              "Die Macht der Abstraktion - Anfänger")))
diff --git a/pkgs/deinprogramm/deinprogramm/turtle.rkt b/pkgs/deinprogramm/deinprogramm/turtle.rkt
deleted file mode 100644
index 52ef073d17..0000000000
--- a/pkgs/deinprogramm/deinprogramm/turtle.rkt
+++ /dev/null
@@ -1,219 +0,0 @@
-#lang scheme
- 
-(require mzlib/math
-         (only-in deinprogramm/image rectangle line overlay image-color? image image-color)
-         (only-in lang/private/imageeq image?)
-         deinprogramm/signature/signature-syntax)
-
-(provide set-color 
-         turn
-         draw
-         move
-         run
-         sequence
-         turtle
-         image
-         image-color)
-
- ; used to convert angles 
- (define pi/180 (/ pi 180))
-
- ; convert angle value
- ; (: grad->rad (number -> number))
- (define grad->rad
-   (lambda (grad)
-     (* pi/180 grad)))
-
- (define turtle (signature
-		 (predicate (lambda (x)
-			      (and (vector? x)
-				   (= (vector-length x) 8)
-				   (number? (vector-ref x 0))
-				   (number? (vector-ref x 1))
-				   (number? (vector-ref x 2))
-				   (number? (vector-ref x 3))
-				   (number? (vector-ref x 4))
-				   (image? (vector-ref x 5))
-				   (image-color? (vector-ref x 6)))))))
-
- ; This function is only for internal use.
- ; (new-turtle-priv h w x y angle img color state)
- ; creates a new turtle with hight h, width w.
- ; The cursor is at position (x,y) and the view direction
- ; is defined by an angle value relative to the vector (1,0) .
- ; The two next componets represents the image and the
- ; color of the pen. The last component represents an abritary
- ; value, that allows to transport state with the turtle.
- (: new-turtle-priv (number number number number number image image-color %A -> turtle))
- (define new-turtle-priv 
-   (lambda (h w x y angle img color state)
-     (vector h w x y angle img color state)))
-
- 
- ; (new-turtle h w color)
- ; creates a new turtle with the pen color color and sets the
- ; width of the image to w and the hight to h.
- ; The background of the image is gray and the position of the
- ; cursor is (0,0) and the view direction is (1,0).
- (: new-turtle (number number image-color -> turtle))
- (define new-turtle 
-   (lambda (h w color)
-     (let ((x (floor (/ w 2)))
-           (y (floor (/ h 2))))
-       (new-turtle-priv h w x y 0 (rectangle w h "solid" "gray") color #f))))
-
- ; (new-turtle-complex h w color bgcolor x y angle)
- ; creates a new turtle with the pen color color and sets the
- ; width of the image to w and the hight to h.
- ; The background of the image is bgcolor and the position of the
- ; cursor is (x,y) and the view direction is (1,0) * e^(- i angle).
- (: new-turtle (number number image-color image-color number number number -> turtle))
- (define new-turtle-complex 
-   (lambda (h w color bgcolor x y angle)
-     (new-turtle-priv h w x y angle (rectangle w h "solid" bgcolor) color #f)))
-
- 
- ; For internal use only
- (: get-h (turtle -> number))
- (define get-h (lambda (t) (vector-ref t 0)))
- (: get-w (turtle -> number))
- (define get-w (lambda (t) (vector-ref t 1)))
- (: get-x (turtle -> number))
- (define get-x (lambda (t) (vector-ref t 2)))
- (: get-y (turtle -> number))
- (define get-y (lambda (t) (vector-ref t 3)))
- (: get-angle (turtle -> number))
- (define get-angle (lambda (t) (vector-ref t 4)))
- (: get-iamge (turtle -> image))
- (define get-image (lambda (t) (vector-ref t 5)))
- (: get-color (turtle -> image-color))
- (define get-color (lambda (t) (vector-ref t 6)))
- (: get-state (turtle -> %A))
- (define get-state (lambda (t) (vector-ref t 7)))
-
- ; (set-color color)
- ; returns a function of type turtle -> turtle.
- ; Use the result to change the color of the pen.
- (: set-color (image-color -> (turtle -> turtle)))
- (define set-color
-   (lambda (color)
-     (lambda (t)
-       (let* ((h (get-h t))
-              (w (get-w t))
-              (x (get-x t))
-              (y (get-y t))
-              (angle (get-angle t))
-              (image (get-image t)))
-         (new-turtle-priv h w x y angle image color #f)))))
- 
- ; (turn angle) 
- ; returns a function of type turtle -> turtle.
- ; Use the result to turn the view of the turtle (counter-clockwise).
- (: turn (number -> (turtle -> turtle)))
- (define turn
-   (lambda (grad)
-     (lambda (t)
-             (let* ((h (get-h t))
-                    (w (get-w t))
-                    (x (get-x t))
-                    (y (get-y t))
-                    (angle (get-angle t))
-                    (image (get-image t))
-                    (color (get-color t))
-                    (state (get-state t)))
-               (new-turtle-priv h w x y (- angle grad) image color state)))))
-     
- ; For internal use only
- ; (move-cursor turtle length)
- ; returns a new turtle where the cursor 
- ; is moved length steps along the view vector.
- (: move-cursor (turtle number -> turtle))
- (define move-cursor
-   (lambda (t length)
-     (let* ((h (get-h t))
-            (w (get-w t))
-            (x (get-x t))
-            (y (get-y t))
-            (angle (get-angle t))
-            (image (get-image t))
-            (color (get-color t))
-            (state (get-state t))
-            (newx (+ x (* length (cos (grad->rad angle)))))
-            (newy (+ y (* length (sin (grad->rad angle))))))
-       (new-turtle-priv h w newx newy angle image color state))))
-     
- ; (draw length)
- ; returns a function of type turtle -> turtle.
- ; The result can be used to move the turtle and draw a line.
- (: draw (number -> (turtle -> turtle)))
- (define draw
-   (lambda (length)
-     (lambda (t)
-       (let* ((h (get-h t))
-              (w (get-w t))
-              (x (get-x t))
-              (y (get-y t))
-              (angle (get-angle t))
-              (image (get-image t))
-              (color (get-color t))
-              (state (get-state t))
-              ; Compute new coordinats
-              (newx (+ x (* length (cos (grad->rad angle)))))
-              (newy (+ y (* length (sin (grad->rad angle))))))
-         (new-turtle-priv
-          h w 
-          newx newy angle 
-          ; Compute new image
-          (overlay image
-                   (line w h x y newx newy color) 0 0)
-          color state)))))
-
- ; (move length)
- ; returns a function of type turtle -> turtle.
- ; The result can be used to move the turtle without drawing a line.
- (: move (number -> (turtle -> turtle)))
- (define move
-   (lambda (length)
-     (lambda (t)
-       (move-cursor t length)))) 
- 
- ; runs a turtle function 
- (: run ((turtle -> turtle) number number image-color -> image))
- (define run 
-   (lambda (t->t h w color) 
-     (get-image (t->t (new-turtle h w color)))))
-
-;   ; runs a turtle function 
-;   ; (: run* ((turtle -> turtle) -> turtle -> image))
-;   (define run*
-;     (lambda (t->t h w color bgcolor x y angle) 
-;       (get-image (t->t (new-turtle h w color bgcolor x y angle)))))
-
- ; This function is only for internal use.
- (define comp_priv_2 
-   (lambda (f1 f2)
-     (lambda (t)
-       (f2 (f1 t)))))
- 
- ; This function is only for internal use.
- (define comp_priv
-   (lambda (l)
-     (cond 
-       ((null? l) (error "sequence erwartet mind. ein Argument"))
-       ((list? l) 
-        (let ((head (car l))
-              (tail (cdr l)))
-          (if (null? tail)
-              head 
-              (comp_priv_2 head (comp_priv tail))))))))
-
- ; This function allows to do a list of
- ; turtle -> turtle 
- ; functions into one new function, that do
- ; one action of the turtle, then later the rest.
- ; Define the type alias tip = turtle -> turtle.
- (define tip (signature (turtle -> turtle)))
- (: do (tip ... -> tip))
- (define sequence (lambda l (comp_priv l)))
-
-
diff --git a/pkgs/deinprogramm/deinprogramm/world.rkt b/pkgs/deinprogramm/deinprogramm/world.rkt
deleted file mode 100644
index fb7ec97718..0000000000
--- a/pkgs/deinprogramm/deinprogramm/world.rkt
+++ /dev/null
@@ -1,270 +0,0 @@
-#lang scheme/base
-
-;; Mon Mar 27 10:29:28 EST 2006: integrated Felix's mouse events
-;; Wed Jan 25 13:38:42 EST 2006: on-redraw: proc is now called on installation
-;; Tue Jan  3 11:17:50 EST 2006: changed add-line behavior in world.rkt
-;; Sat Dec 10 19:39:03 EST 2005: fixed name, changed interface to on-key-event
-;; Fri Dec  9 21:39:03 EST 2005: remoevd (update ... produce ...); added on-redraw 
-;; Thu Dec  1 17:03:03 EST 2005: fixed place-image; all coordinates okay now
-
-  (require
-   (except-in mred make-color)
-   mzlib/class
-   htdp/error
-   "image.rkt"
-   (prefix-in beg: lang/htdp-beginner)
-   lang/prim
-   deinprogramm/signature/signature-syntax)
-  
-  ;; --- provide ---------------------------------------------------------------
-  (provide (all-from-out "image.rkt"))
-  
-  (provide      ;; forall(World):
-   big-bang     ;; Number Number Number World -> true
-   end-of-time  ;; String u Symbol -> World
-   )
-  
-  (provide-higher-order-primitive
-   on-tick-event (tock) ;; (World -> World) -> true
-   )
-  
-  (provide-higher-order-primitive
-   on-redraw (world-image) ;; (World -> Image) -> true
-   )
-  
-  ;; KeyEvent is one of: 
-  ;; -- Char 
-  ;; -- Symbol 
-  
-  (provide-higher-order-primitive ;; (World KeyEvent -> World) -> true 
-   on-key-event 
-   (draw)
-   )
-  
-  ;; A MouseEventKind is one of:
-  ;; "enter" -- mouse pointer entered the window
-  ;; "leave" -- mouse pointer left the window
-  ;; "left-down" -- left mouse button pressed
-  ;; "left-up" -- left mouse button released
-  ;; "middle-down" -- middle mouse button pressed
-  ;; "middle-up" -- middle mouse button released
-  ;; "right-down" -- right mouse button pressed (Mac OS: click with control key pressed)
-  ;; "right-up" -- right mouse button released (Mac OS: release with control key pressed)
-  ;; "motion" -- mouse moved, with or without button(s) pressed
-
-  
-  (provide-higher-order-primitive ;; (World Number Number MouseEventKind -> World) -> true 
-   on-mouse-event 
-   (clack)
-   )
-
-  (provide mouse-event-kind)
- 
-  (define mouse-event-kind
-    (signature
-     (one-of "enter" "leave" "motion" "left-down" "left-up" "middle-down" "middle-up" "right-down" "right-up")))
-  
-  ;; ---------------------------------------------------------------------------
-  
-  ;; Symbol Any String -> Void
-  (define (check-pos tag c rank)
-    (check-arg tag (and (number? c) (integer? c) (>= c 0)) "positive integer" rank c))
-  
-  ;; ---------------------------------------------------------------------------
-  
-  ;; The One and Only Visible World
-  (define the-frame #f)
-  (define txt (new text%))
-  
-  ;; World (type parameter)
-  (define the-world0 (cons 1 1))
-  [define the-world the-world0]
-  
-  (define (check-world tag)
-    (when (eq? the-world0 the-world) (error tag SEQUENCE-ERROR)))
-  
-  ;; Number > 0
-  [define the-delta 1000]
-  
-  ;; Amount of space around the image in the world window:
-  (define INSET 5)
-  
-  ;; Number Number Number World -> true
-  ;; create the visible world (canvas)
-  (define (big-bang w h delta world)
-    (check-pos 'big-bang w "first")
-    (check-pos 'big-bang h "second")
-    (check-arg 'big-bang
-               (and (number? delta) (<= 0 delta 1000))
-               "number [of seconds] between 0 and 1000"
-               "first"
-               delta)
-    (when the-frame (error 'big-bang "big-bang already called once"))
-    (set! the-delta delta) 
-    (set! the-world world)
-    (set! the-frame
-          (new (class frame%
-                 (super-new)
-                 (define/augment (on-close)        
-                   ;; shut down the timer when the window is destroyed
-                   (send the-time stop)
-                   (inner (void) on-close)))
-               (label "DrRacket")
-               (stretchable-width #f)
-               (stretchable-height #f)
-               (style '(no-resize-border metal))))
-    (let ([c (new (class editor-canvas%
-		    (super-new)
-		    (define/override (on-char e)
-		      (on-char-proc (send e get-key-code)))
-		    (define/override (on-event e)
-		      (on-mouse-proc e)))
-                  (parent the-frame) 
-                  (editor txt)
-                  (style '(no-hscroll no-vscroll))
-                  (horizontal-inset INSET)
-                  (vertical-inset INSET))])
-      (send c min-client-width (+ w INSET INSET))
-      (send c min-client-height (+ h INSET INSET))
-      (send c focus))
-    (send txt set-cursor (make-object cursor% 'arrow))
-    (send txt hide-caret #t)
-    (send the-frame show #t)
-    #t)
-  
-  ;; --- time events 
-  [define the-time (new timer% [notify-callback (lambda () (timer-callback))])]
-  
-  ;; (World -> World)
-  [define timer-callback void]
-  
-  [define (on-tick-event f)
-    (check-proc 'on-tick-event f 1 "on-tick-event" "one argument")
-    (check-world 'on-tick-event)
-    (if (eq? timer-callback void)
-        (set! timer-callback 
-              (lambda ()
-                (with-handlers ([exn:break? break-handler]
-                                [exn? exn-handler])
-                  (set! the-world (f the-world))
-                  (on-redraw-proc))))          
-        (error 'on-tick "the timing action has been set already"))
-    (send the-time start
-          (let* ([w (ceiling (* 1000 the-delta))])
-            (if (exact? w) w (inexact->exact w))))
-    #t]
-  
-  ;; --- key and mouse events 
-  
-  ;; KeyEvent -> Void
-  [define on-char-proc void]
-  
-  [define (on-key-event f)
-    (check-proc 'on-key-event f 2 "on-key-event" "two arguments")
-    (check-world 'on-key-event)
-    (let ([esp (current-eventspace)])
-      (if (eq? on-char-proc void)
-          (begin 
-            (set! on-char-proc 
-                  (lambda (e)
-		    (cond
-		     ((event->string e)
-		      => (lambda (s)
-			   (parameterize ([current-eventspace esp])
-			     (queue-callback 
-			      (lambda ()
-				(with-handlers ([exn:break? break-handler]
-						[exn? exn-handler])
-				  (set! the-world (f the-world s))
-				  (on-redraw-proc))))))))
-		    #t))
-            #t)
-          (error 'on-event "the event action has been set already")))]
-
-  (define (event->string e)
-    (if (char? e)
-	(string e)
-	(case e
-	  ((left) "left")
-	  ((right) "right")
-	  ((up) "up")
-	  ((down) "down")
-	  ((wheel-up) "wheel-up")
-	  ((wheel-down) "wheel-down")
-	  (else #f))))
-  
-  [define (end-of-time s)
-    (printf "end of time: ~a\n" s)
-    (stop-it)
-    the-world]
-  
-  ;; MouseEvent -> Void
-  [define on-mouse-proc void]
-  
-  [define (on-mouse-event f)
-    (check-proc 'on-mouse-event f 4 "on-mouse-event" "four arguments")
-    (check-world 'on-mouse-event)
-    (let ([esp (current-eventspace)])
-      (if (eq? on-mouse-proc void)
-          (begin
-            (set! on-mouse-proc 
-                  (lambda (e)
-                    (parameterize ([current-eventspace esp])
-                      (queue-callback
-                       (lambda ()
-                         (with-handlers ([exn:break? break-handler]
-                                         [exn? exn-handler])
-                           (set! the-world (f the-world 
-                                              (send e get-x)
-                                              (send e get-y)
-					      (symbol->string (send e get-event-type))))
-                           (on-redraw-proc))))
-                      #t)))
-            #t)
-          (error 'on-mouse-event "the mouse event action has been set already")))]
-  
-  ;; --- library 
-  [define (exn-handler e)
-    (send the-time stop)
-    (set! on-char-proc void)
-    (set! timer-callback void)
-    (raise e)]
-  
-  [define (break-handler . _) 
-    (printf "animation stopped")
-    (stop-it)
-    the-world]
-  
-  ;; -> Void
-  (define (stop-it)
-    (send the-time stop)
-    (set! on-char-proc void)
-    (set! timer-callback void))
-  
-  (define on-redraw-proc void)
-  
-  (define (on-redraw f)
-    (check-proc 'on-redraw f 1 "on-redraw" "one argument")
-    (check-world 'on-redraw)
-    (if (eq? on-redraw-proc void)
-        (begin
-          (set! on-redraw-proc
-                (lambda ()
-                  (with-handlers ([exn:break? break-handler]
-                                  [exn? exn-handler])
-                    (define img (f the-world))
-                    (check-result 'on-redraw (lambda (x) (beg:image? x)) "image" img)
-                    (update-frame img)
-                    #t)))
-          (on-redraw-proc))
-        (error 'on-redraw "the redraw function has already been specified")))
-  
-  (define (update-frame pict)
-    (send txt begin-edit-sequence)
-    (send txt lock #f)
-    (send txt delete 0 (send txt last-position) #f)
-    (send txt insert (send pict copy) 0 0 #f)
-    (send txt lock #t)
-    (send txt end-edit-sequence))
-  
-  (define SEQUENCE-ERROR "evaluate (big-bang Number Number Number World) first")
diff --git a/pkgs/deinprogramm/info.rkt b/pkgs/deinprogramm/info.rkt
deleted file mode 100644
index a6d971351f..0000000000
--- a/pkgs/deinprogramm/info.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang info
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base"
-               "compatibility-lib"
-               "errortrace-lib"
-               "gui-lib"
-               "pconvert-lib"
-               "srfi-lib"
-               "string-constants-lib"
-               "trace"
-               "wxme-lib"
-               "drracket"
-               "htdp"))
-
-(define build-deps
-  '("racket-index"
-    "at-exp-lib"
-    "racket-doc"
-    "rackunit-lib"
-    "scribble-lib"))
-
-(define pkg-desc "Teaching languages for _Die Macht der Abstraktion_")
-
-(define pkg-authors '(sperber))
diff --git a/pkgs/deinprogramm/teachpack/deinprogramm/image.ss b/pkgs/deinprogramm/teachpack/deinprogramm/image.ss
deleted file mode 100644
index e6c29e7eff..0000000000
--- a/pkgs/deinprogramm/teachpack/deinprogramm/image.ss
+++ /dev/null
@@ -1,3 +0,0 @@
-(module image mzscheme
-  (require (lib "image.ss" "deinprogramm"))
-  (provide (all-from (lib "image.ss" "deinprogramm"))))
diff --git a/pkgs/deinprogramm/teachpack/deinprogramm/image2.ss b/pkgs/deinprogramm/teachpack/deinprogramm/image2.ss
deleted file mode 100644
index 4c34a784f4..0000000000
--- a/pkgs/deinprogramm/teachpack/deinprogramm/image2.ss
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(provide (all-from-out teachpack/2htdp/image)
-	 image)
-
-(require teachpack/2htdp/image)
-(require deinprogramm/signature/signature)
-(require deinprogramm/signature/signature-syntax)
-(require deinprogramm/signature/signature-german)
-
-(define image
-  (signature (predicate image?)))
-
-
diff --git a/pkgs/deinprogramm/teachpack/deinprogramm/info.rkt b/pkgs/deinprogramm/teachpack/deinprogramm/info.rkt
deleted file mode 100644
index d844a62514..0000000000
--- a/pkgs/deinprogramm/teachpack/deinprogramm/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define deinprogramm-teachpacks 'all)
-
diff --git a/pkgs/deinprogramm/teachpack/deinprogramm/line3d.ss b/pkgs/deinprogramm/teachpack/deinprogramm/line3d.ss
deleted file mode 100644
index 721d4cc77c..0000000000
--- a/pkgs/deinprogramm/teachpack/deinprogramm/line3d.ss
+++ /dev/null
@@ -1,3 +0,0 @@
-(module line3d  mzscheme
-  (provide (all-from (lib "line3d.ss" "deinprogramm")))
-  (require (lib "line3d.ss" "deinprogramm")))
diff --git a/pkgs/deinprogramm/teachpack/deinprogramm/sound.ss b/pkgs/deinprogramm/teachpack/deinprogramm/sound.ss
deleted file mode 100644
index f8d55bc99c..0000000000
--- a/pkgs/deinprogramm/teachpack/deinprogramm/sound.ss
+++ /dev/null
@@ -1,13 +0,0 @@
-(module sound mzscheme
-  (require (lib "mred.ss" "mred"))
-
-  (define (play-sound-file file)
-    (play-sound file #f)
-    (void))
-
-  (define (background-play-sound-file file)
-    (play-sound file #t)
-    (void))
-
-  (provide play-sound-file
-           background-play-sound-file))
diff --git a/pkgs/deinprogramm/teachpack/deinprogramm/turtle.ss b/pkgs/deinprogramm/teachpack/deinprogramm/turtle.ss
deleted file mode 100644
index 2b3c92fc6f..0000000000
--- a/pkgs/deinprogramm/teachpack/deinprogramm/turtle.ss
+++ /dev/null
@@ -1,3 +0,0 @@
-(module turtle  mzscheme
-  (provide (all-from (lib "turtle.ss" "deinprogramm")))
-  (require (lib "turtle.ss" "deinprogramm")))
diff --git a/pkgs/deinprogramm/teachpack/deinprogramm/universe.ss b/pkgs/deinprogramm/teachpack/deinprogramm/universe.ss
deleted file mode 100644
index 34dd9d540e..0000000000
--- a/pkgs/deinprogramm/teachpack/deinprogramm/universe.ss
+++ /dev/null
@@ -1,3 +0,0 @@
-(module universe mzscheme
-  (provide (all-from 2htdp/universe))
-  (require 2htdp/universe))
diff --git a/pkgs/deinprogramm/teachpack/deinprogramm/world.ss b/pkgs/deinprogramm/teachpack/deinprogramm/world.ss
deleted file mode 100644
index 7a2c4c4e0d..0000000000
--- a/pkgs/deinprogramm/teachpack/deinprogramm/world.ss
+++ /dev/null
@@ -1,3 +0,0 @@
-(module world mzscheme
-  (provide (all-from (lib "world.ss" "deinprogramm")))
-  (require (lib "world.ss" "deinprogramm")))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-doc/LICENSE.txt b/pkgs/distributed-places-pkgs/distributed-places-doc/LICENSE.txt
deleted file mode 100644
index daed067224..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-distributed-places-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/distributed-places-pkgs/distributed-places-doc/info.rkt b/pkgs/distributed-places-pkgs/distributed-places-doc/info.rkt
deleted file mode 100644
index bc4b9b3ab5..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-doc/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "distributed-places-lib"
-               "racket-doc"
-               "sandbox-lib"
-               "scribble-lib"))
-(define update-implies '("distributed-places-lib"))
-
-(define pkg-desc "documentation part of \"distributed-places\"")
-
-(define pkg-authors '(tewk))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-doc/scribblings/distributed-places/distributed-places.scrbl b/pkgs/distributed-places-pkgs/distributed-places-doc/scribblings/distributed-places/distributed-places.scrbl
deleted file mode 100644
index 07daff6301..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-doc/scribblings/distributed-places/distributed-places.scrbl
+++ /dev/null
@@ -1,913 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          scribble/struct
-          scribble/decode
-          racket/contract
-          racket/place/distributed
-          racket/sandbox
-          racket/class
-          (only-in scribblings/reference/mz guidealso)
-          (for-label (except-in racket/base log-message)
-                     racket/place/define-remote-server
-                     racket/place/distributed 
-                     racket/class
-                     racket/contract
-                     racket/place
-                     racket/place/private/async-bi-channel
-                     racket/place/define-remote-server))
-
-
-@(define evaler (make-base-eval))
-@(interaction-eval #:eval evaler (require racket/place/distributed
-                                          racket/class
-                                          racket/place/define-remote-server))
-
-
-@title[#:tag "distributed-places"]{Distributed Places}
-@author{Kevin Tew}
-
-@guidealso["distributed-places"]
-
-@defmodule[racket/place/distributed]
-
-Distributed places support programs whose computation may span
-physical machines. The design relies on machine @deftech{nodes} that
-perform computation.  The programmer configures a new distributed
-system using a declarative syntax and callbacks.  A node begins life
-with one initial place: the @deftech{message router}. @;{See
-@figure-ref["node-places"].} After a node has been configured, its
-message router is activated by calling the @racket[message-router]
-function. The message router listens on a TCP port for incoming
-connections from other nodes in the distributed system. Places can be
-spawned within the node by sending place-spawn request messages to the
-node's message router.
-
-The distributed places implementation relies on two assumptions:
-
-@itemlist[
-@item{The user's @filepath{.ssh/config} and
- @filepath{.ssh/authorized_keys} files are configured correctly to
- allow passwordless connection to remote hosts via public key authentication.}
-@item{Distributed places does not support the specification of ssh usernames.
- If a non-default ssh username is required the @filepath{.ssh/config} file
- should be used to specifiy the username.}
-@item{All machines run the same version of Racket.  Futures versions of distributed
- places may use the zo binary data format for serialization.}
-]
-
-The following example illustrates a configuration and use of
-distributed places that starts a new node on the current machine and
-passes it a @racket["Hello World"] string:
-
-
-@(begin
-#reader scribble/comment-reader
-[examples
-(module hello-world-example racket/base
-  (require racket/place/distributed
-           racket/place)
-
-  (provide hello-world)
-
-  (define (hello-world)
-    (place ch
-      (printf "hello-world received: ~a\n" (place-channel-get ch))
-      (place-channel-put ch "Hello World\n")
-      (printf "hello-world sent: Hello World\n" )))
-
-
-  (module+ main
-    ;; 1) spawns a node running at "localhost" and listenting on port
-    ;; 6344 for incomming connections.
-    ;; 2) connects to the node running at localhost:6344 and creates a
-    ;; place on that node by calling the hello-world procedure from
-    ;; the current module.
-    ;; 3) returns a remote-node% instance (node) and a
-    ;; remote-connection% instance (pl) for communicating with the
-    ;; new node and place
-    (define-values (node pl)
-      (spawn-node-supervise-place-at "localhost"
-                                     #:listen-port 6344
-                                     #:thunk #t
-                                     (quote-module-path "..")
-                                     'hello-world))
-
-    ;; starts a message router which adds three event-container<%>s to
-    ;; its list of events to handle: the node and two after-seconds
-    ;; event containers . Two seconds after the launch of the message-router, a
-    ;; message will be sent to the pl place.  After six seconds, the
-    ;; program and all spawned nodes and places will terminate.
-    (message-router
-      node
-      (after-seconds 2
-        (*channel-put pl "Hello")
-        (printf "message-router received: ~a\n" (*channel-get pl)))
-
-      (after-seconds 6
-        (exit 0)))))
-]
-)
-
-@defproc[(message-router [ec (is-a?/c event-container<%>)] ...+) void?]{
-  Waits in an endless loop for one of many events to become ready.  The
-  @racket[message-router] procedure constructs a @racket[node%]
-  instance to serve as the message router for the node. The
-  @racket[message-router] procedure then adds all the declared
-  @racket[event-container<%>]s to the @racket[node%] and finally calls
-  the never ending loop @method[node% sync-events] method, which handles
-  events for the node.
-}
-
-@defproc[(spawn-node-with-place-at
-           [hostname string?]
-           [instance-module-path module-path?]
-           [instance-place-function-name symbol?]
-           [#:listen-port port port-no? DEFAULT-ROUTER-PORT]
-           [#:initial-message initial-message any #f]
-           [#:racket-path racket-path string-path? (racket-path)]
-           [#:ssh-bin-path ssh-path string-path? (ssh-bin-path)]
-           [#:distributed-launch-path launcher-path string-path? (path->string distributed-launch-path)]
-           [#:restart-on-exit restart-on-exit any/c #f]
-           [#:named place-name (or/c #f symbol?) #f]
-           [#:thunk thunk (or/c #f #t) #f]) (is-a?/c remote-connection%)]{
-
-Spawns a new remote node at @racket[hostname] with one instance place specified by
-the @racket[instance-module-path] and @racket[instance-place-function-name].
-
-When @racket[thunk] is @racket[#f], the place is created as the result of the framework
-calling @racket[(dynamic-place instance-module-path instance-place-function-name)].
-in the new node.
-
-When @racket[thunk] is @racket[#t] the
-@racket[instance-place-function-name] function should use
-@racket[dynamic-place] or @racket[place] to create and return an
-initial place in the new node.
-
-When the @racket[place-name] symbol is present a named place is
-created.  The @racket[place-name] symbol is used to establish later
-connections to the named place.}
-
-The result is a @racket[remote-node%] instance, not a
-@racket[remote-connection%].  Use @method[remote-node%
-get-first-place] on the result to obtain a @racket[remote-connection%].
-
-The @racket[restart-on-exit] argument can be @racket[#t] to instruct
-the @racket[remote-connection%] instance to respawn the place on the
-remote node should it exit or terminate at any time. It can also be a
-procedure of zero arguments to implement the restart procedure, or it
-can be an object that support a @racket[restart] method that takes a
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{place}
-argument.}
-
-@defproc[(spawn-node-supervise-place-at
-           [hostname string?]
-           [instance-module-path module-path?]
-           [instance-place-function-name symbol?]
-           [#:listen-port port port-no? DEFAULT-ROUTER-PORT]
-           [#:initial-message initial-message any #f]
-           [#:racket-path racket-path string-path? (racket-path)]
-           [#:ssh-bin-path ssh-path string-path? (ssh-bin-path)]
-           [#:distributed-launch-path launcher-path string-path? (path->string distributed-launch-path)]
-           [#:restart-on-exit restart-on-exit any/c #f]
-           [#:named named (or/c #f string?) #f]
-           [#:thunk thunk (or/c #f #t) #f]) (values (is-a?/c remote-node%) (is-a?/c remote-connection%))]{
-
-Like @racket[spawn-node-with-dynamic-place-at], but the result is two values: the
-new @racket[remote-node%] and its @racket[remote-connection%] instance.}
-
-@defproc[(spawn-remote-racket-node
-           [hostname string?]
-           [#:listen-port port port-no? DEFAULT-ROUTER-PORT]
-           [#:racket-path racket-path string-path? (racket-path)]
-           [#:ssh-bin-path ssh-path string-path? (ssh-bin-path)]
-           [#:distributed-launch-path launcher-path string-path? (path->string distributed-launch-path)]
-           [#:use-current-ports use-current-ports #f])  (is-a?/c remote-node%)]{
-
-Spawns a new remote node at @racket[hostname] and returns a @racket[remote-node%] handle.}
-
-@defproc[(create-place-node
-           [hostname string?]
-           [#:listen-port port port-no? DEFAULT-ROUTER-PORT]
-           [#:racket-path racket-path string-path? (racket-path)]
-           [#:ssh-bin-path ssh-path string-path? (ssh-bin-path)]
-           [#:distributed-launch-path launcher-path string-path? (path->string distributed-launch-path)]
-           [#:use-current-ports use-current-ports boolean? #t])  (is-a?/c remote-node%)]{
-
-Like @racket[spawn-remote-racket-node], but the @racket[current-output-port] and @racket[current-error-port]
-are used as the standard ports for the spawned process instead of new pipe ports.}
-
-@defproc[(supervise-place-at
-           [remote-node (is-a?/c remote-node%)]
-           [instance-module-path module-path?]
-           [instance-place-function-name symbol?]
-           [#:restart-on-exit restart-on-exit any/c #f]
-           [#:named named (or/c #f symbol?) #f]
-           [#:thunk thunk (or/c #f #t) #f]) (is-a?/c remote-connection%)]{
-
-When @racket[thunk] is @racket[#f], creates a new place on @racket[remote-node] by using
-@racket[dynamic-place] to invoke
-@racket[instance-place-function-name] from the module
-@racket[instance-module-path].
-
-When @racket[thunk] is @racket[#t], creates a new place at @racket[remote-node] by executing the thunk
-exported as @racket[instance-place-function-name] from the module
-@racket[instance-module-path]. The function should use
-@racket[dynamic-place] or @racket[place] to create and return a place in the new
-node.
-
-When the @racket[place-name] symbol is present a named place is
-created.  The @racket[place-name] symbol is used to establish later
-connections to the named place.}
-
-@defproc[(supervise-process-at
-           [hostname string?]
-           [commandline-argument string?] ...+
-           [#:listen-port port port-no? DEFAULT-ROUTER-PORT]) (is-a?/c remote-process%)]{
-Spawns an attached external process at host @racket[hostname].
-}
-
-@defproc[(supervise-thread-at
-           [remote-node (is-a?/c remote-node%)]
-           [instance-module-path module-path?]
-           [instance-thunk-function-name symbol?]
-           [#:restart-on-exit restart-on-exit any/c #f]) (is-a?/c remote-connection%)]{
-Creates a new threadon the @racket[remote-node] by using
-@racket[dynamic-require] to invoke
-@racket[instance-place-function-name] from the module
-@racket[instance-module-path].}
-
-
-@defproc[(restart-every [seconds (number?)]
-                        [#:retry retry (or/c number? #f) #f]
-                        [#:on-final-fail on-final-fail (or/c #f (-> any/c)) #f])
-         (is-a/c respawn-and-fire%)]{
-
-Returns a @racket[restarter%] instance that should be supplied to a @racket[#:restart-on-exit] argument.
-}
-
-
-@defform[(every-seconds seconds-expr body ....)]{
-
-Returns a @racket[respawn-and-fire%] instance that should be supplied
-to a @racket[message-router].  The @racket[respawn-and-fire%] instance
-executes @racket[body]s once every @math{N} seconds,
-where @math{N} is the result of @racket[seconds-expr].}
-
-
-@defform[(after-seconds seconds-expr body ....)]{
-
-Returns a @racket[after-seconds%] instance that should be supplied to
-a @racket[message-router].  The @racket[after-seconds%] instance
-executes the @racket[body]s after a delay of @math{N} seconds from the
-start of the event loop, where @math{N} is the result of
-@racket[seconds-expr].}
-
-
-@defproc[(connect-to-named-place [node  (is-a?/c remote-node%)] [name symbol?]) (is-a?/c remote-connection%)]{
-Connects to a named place on the @racket[node] named @racket[name] and returns a @racket[remote-connection%] object.
-}
-
-@defproc[(log-message [severity (or/c 'fatal 'error 'warning 'info 'debug)] [msg string?]) 
-         void?]{
-
- Logs a message at the root node.}
-
-
-@definterface[event-container<%> ()]{
-  All objects that are supplied to the @racket[message-router] must
-  implement the @racket[event-container<%>] interface.  The
-  @racket[message-router] calls the @racket[register] method on each
-  supplied @racket[event-container<%>] to obtain a list of events
-  on which the event loop should wait.
-
-  @defmethod[(register [events (listof events?)]) (listof events?)]{
-    Returns the list of events inside the @racket[event-container<%>] that
-    should be waited on by the @racket[message-router].
-  }
-
-The following classes all implement @racket[event-container<%>] and
-can be supplied to a @racket[message-router]:
-@racket[spawned-process%], @racket[place-socket-bridge%],
-@racket[node%], @racket[remote-node%], @racket[remote-connection%],
-@racket[place%] @racket[connection%], @racket[respawn-and-fire%], and
-@racket[after-seconds%].
-
-}
-
-@defclass[spawned-process% object% (event-container<%>)
-  (defmethod (get-pid) exact-positive-integer?) ]{
-
-@defconstructor[([cmdline-list (listof (or/c string? path?))]
-                 [parent  (is-a?/c remote-node%) #f]
-                 )]{
-The @racket[cmdline-list] is a list of command line arguments of type @racket[string] and/or @racket[path].
-
-The @racket[parent] argument is a @racket[remote-node%] instance that will be notified when the process dies via
-a @racket[(send parent process-died this)] call.
-}
-}
-
-@;{@examples[ #:eval evaler
-(new spawned-process% [cmdline-list
-  (list (ssh-bin-path) "localhost" (racket-path) "-tm" distributed-launch-path "spawn" (->string 6340))])
-]
-}
-
-@defclass[place-socket-bridge% object% (event-container<%>)
-  (defmethod (get-sc-id) exact-positive-integer?) ]{
-
-  @defconstructor[([pch place-channel?]
-                   [sch (is-a?/c socket-connection%)]
-                   [id exact-positive-integer?]
-                   )]{
-    The @racket[pch] argument is a @racket[place-channel].  Messages
-    received on @racket[pch] are forwarded to the socket-connection%
-    @racket[sch] via a @racket[dcgm] message. e.g.
-    @racket[(sconn-write-flush sch (dcgm DCGM-TYPE-INTER-DCHANNEL id id msg))]
-    The @racket[id] is a @racket[exact-positive-integer] that identifies
-    the socket-connection subchannel for this inter-node place connection.
-  }
-}
-
-@defclass[socket-connection% object% (event-container<%>)]{
-  @defconstructor[([host (or/c string? #f) #f]
-                   [port (or/c port-no? #f) #f]
-                   [retry-times exact-nonnegative-integer? 30]
-                   [delay number? 1]
-                   [background-connect? any/c #f]
-                   [in (or/c input-port? #f) #f]
-                   [out (or/c output-port #f) #f]
-                   [remote-node (or/c (is-a?/c remote-node%) #f) #f]
-                   )]{
-    When a @racket[host] and @racket[port] are supplied a new tcp
-    connection is established.  If a @racket[input-port?] and
-    @racket[output-port?] are supplied as @racket[in] and @racket[out],
-    the ports are used as a connection to the remote host.  The
-    @racket[retry-times] argument specifies how many times to retry the
-    connection attempt should it fail to connect and defaults to 30 retry
-    attempts.  Often a remote node is still booting up when a connection
-    is attempted and the connection needs to be retried several times.
-    The @racket[delay] argument specifies how many seconds to wait between
-    retry attempts.  The @racket[background-connect?] argument defaults to
-    @racket[#t] and specifies that the constructor should retry
-    immediately and that connecion establishment should occur in the
-    background.  Finally, the @racket[remote-node] argument specifies the
-    @racket[remote-node%] instance that should be notified should the
-    connection fail.
-  }
-}
-
-@defclass[node% object% (event-container<%>)]{
-
-The @racket[node%] instance controls a distributed places node. It
-launches places and routes inter-node place messages in the
-distributed system.  The @racket[message-router] form constructs a
-@racket[node%] instance under the hood.  Newly spawned nodes also have
-a @racket[node%] instance in their initial place that serves as the
-node's message router.
-
-@defconstructor[([listen-port tcp-listen-port? #f])]{
- Constructs a @racket[node%] that will listen on @racket[listen-port] for inter-node connections.}
-
-@defmethod[(sync-events) void?]{
- Starts the never ending event loop for this distributed places node.
-}
-}
-
-@(define-syntax-rule (one-sided-note one-sided-place?)
-     (list
-      @t{The @racket[one-sided-place?] argument is an internal use
-      argument for launching remote places from within a place using
-      the old design pattern.}))
-
-@defclass[remote-node% object% (event-container<%>)]{
-
-  Like @racket[node%], but for the remote API to a distributed places
-  node. Instances of @racket[remote-node%] are returned by
-  @racket[create-place-node], @racket[spawn-remote-racket-node], and
-  @racket[spawn-node-supervise-place-at].
-
-  A @racket[remote-node%] is a @tech[#:doc '(lib
-  "scribblings/reference/reference.scrbl")]{place location} in the
-  sense of @racket[place-location?], which means that it can be
-  supplied as the @racket[#:at] argument to @racket[dynamic-place].
-
-  @defconstructor[([listen-port tcp-listen-port? #f]
-                   [restart-on-exit any/c #f])]{
-    Constructs a @racket[node%] that will listen on
-    @racket[listen-port] for inter-node connections.
-
-    When set to true the @racket[restart-on-exit] parameter causes the
-    specified node to be restarted when the ssh session spawning the node
-    dies.
-  }
-
-  @defmethod[(get-first-place) (is-a?/c remote-connection%)]{
-    Returns the @racket[remote-connection%] object instance for the first place spawned on this node.
-  }
-  @defmethod[(get-first-place-channel) place-channel?]{
-    Returns the communication channel for the first place spawned on this node.
-  }
-  @defmethod[(get-log-prefix) string?]{
-    Returns @racket[(format "PLACE ~a:~a" host-name listen-port)]
-  }
-
-  @defmethod[(launch-place
-               [place-exec list?]
-               [#:restart-on-exit restart-on-exit any/c #f]
-               [#:one-sided-place? one-sided-place? any/c #f]) (is-a?/c remote-connection%)]{
-    Launches a place on the remote node represented by this @racket[remote-node%] instance.
-
-    The @racket[place-exec] argument describes how the remote place should be launched,
-    and it should have one of the following shapes:
-      @itemize[@item{@racket[(list 'place _place-module-path _place-thunk)]}
-               @item{@racket[(list 'dynamic-place _place-module-path _place-func)]}]
-      The difference between these two launching methods is that
-      the @racket['place] version of @racket[place-exec] expects a
-      thunk to be exported by the module
-      @racket[place-module-path].  Executing the thunk is expected to
-      create a new place and return a place descriptor to the newly
-      created place. The @racket['dynamic-place] version of
-      @racket[place-exec] expects place-func to be a function taking a
-      single argument, the initial channel argument, and calls
-      @racket[dynamic-place] on behalf of the user and creates the new
-      place from the @racket[place-module-path] and
-      @racket[place-func].
-
-    The @racket[restart-on-exit] argument is treated in the same way
-    as for @racket[spawn-node-with-dynamic-place-at].
-
-    @one-sided-note[one-sided-place?]
-  }
-
-  @defmethod[(remote-connect [name string?]) remote-connection%]{
-    Connects to a named place on the remote node represented by this @racket[remote-node%] instance.
-  }
-
-  @defmethod[(send-exit) void?]{
-    Sends a message instructing the remote node represented by this
-    @racket[remote-node%] instance to exit immediately
-  }
-}
-
-@defproc[(node-send-exit [remote-node% node]) void?]{
-Sends @racket[node] a message telling it to exit immediately.
-}
-@defproc[(node-get-first-place [remote-node% node]) (is-a?/c remote-connection%)]{
-Returns the @racket[remote-connection%] instance of the first place spawned at this node
-}
-
-@defproc[(distributed-place-wait [remote-connection% place]) void?]{
-Waits for @racket[place] to terminate.}
-
-@defclass[remote-connection% object% (event-container<%>)]{
-
-The @racket[remote-connection%]
-instance provides a remote api to a place
-running on a remote distributed places node. It launches a
-places or connects to a named place and routes inter-node place messages to the remote place.
-
-@defconstructor[([node  (is-a?/c remote-node%)]
-                 [place-exec list?]
-                 [name string?]
-                 [restart-on-exit #f]
-                 [one-sided-place? #f]
-                 [on-channel #f])]{
- Constructs a @racket[remote-connection%] instance.
-
- The @racket[place-exec] argument describes how the remote place should be launched
- in the same way as for @xmethod[remote-node% launch-place].
-
- The @racket[restart-on-exit] argument is treated in the same way
- as for @racket[spawn-node-with-dynamic-place-at].
-
- @one-sided-note[one-sided-place?]
-
- See @racket[set-on-channel!] for description of @racket[on-channel] argument.
-}
-
-@defmethod[(set-on-channel! [callback (-> channel msg void?)]) void?]{
- Installs a handler function that handles messages from the remote place.
- The @racket[setup/distributed-docs] module uses this callback to handle job completion messages.
-}
-}
-
-
-@defclass[place% object% (event-container<%>)]{
-
-  The @racket[place%] instance represents a place launched on a
-  distributed places node at that node. It launches a compute places and
-  routes inter-node place messages to the place.
-
-  @defconstructor[([node (is-a?/c remote-connection%)]
-                 [place-exec list?]
-                 [ch-id exact-positive-integer?]
-                 [sc (is-a?/c socket-connection%)]
-                 [on-place-dead (-> event void?) default-on-place-dead])]{
-    Constructs a @racket[remote-connection%] instance.
-    The @racket[place-exec] argument describes how the remote place should be launched
-     in the same way as for @xmethod[remote-node% launch-place].
-    The @racket[ch-id] and @racket[sc] arguments are internally used to
-    establish routing between the remote node spawning this place and the
-    place itself.  The @racket[on-place-dead] callback handles the event
-    when the newly spawned place terminates.
-  }
-
- @defmethod[(wait-for-die) void?]{
-   Blocks and waits for the subprocess representing the @racket[remote-node%] to exit.
- }
-}
-
-@defclass[connection% object% (event-container<%>)]{
-
-The @racket[connection%] instance represents a connection to a
-named-place instance running on the current node. It routes inter-node
-place messages to the named place.
-
-@defconstructor[([node  (is-a?/c remote-node%)]
-                 [name string?]
-                 [ch-id exact-positive-integer?]
-                 [sc (is-a?/c socket-connection%)])]{
- Constructs a @racket[remote-connection%] instance.
- The @racket[place-exec] argument describes how the remote place should be launched
- in the same way as for @xmethod[remote-node% launch-place].
- The @racket[ch-id] and @racket[sc] arguments are internally used to
- establish routing between the remote node and this named-place.
- }
-}
-
-@defclass[respawn-and-fire% object% (event-container<%>)]{
-
- The @racket[respawn-and-fire%] instance represents a thunk that should
- execute every @racket[n] seconds.
-
-@defconstructor[([seconds (and/c real? (not/c negative?))]
-                 [thunk (-> void?)])]{
- Constructs a @racket[respawn-and-fire%] instance that when placed
- inside a @racket[message-router] construct causes the supplied
- thunk to execute every @racket[n] seconds.
-}
-}
-
-@defclass[after-seconds% object% (event-container<%>)]{
-
- The @racket[after-seconds%] instance represents a thunk that should
- execute after @racket[n] seconds.
-
-@defconstructor[([seconds (and/c real? (not/c negative?))]
-                 [thunk (-> void?)])]{
- Constructs an @racket[after-seconds%] instance that when placed
- inside a @racket[message-router] construct causes the supplied
- thunk to execute after @racket[n] seconds.
-}
-}
-
-@defclass[restarter% after-seconds% (event-container<%>)]{
-
- The @racket[restarter%] instance represents a restart strategy.
-
-@defconstructor[([seconds number?]
-                 [retry (or/c number? #f) #f]
-                 [on-final-fail (or/c #f (-> any/c)) #f])]{
- Constructs an @racket[restarter%] instance that when supplied to a
- @racket[#:restart-on-exit] argument, attempts to restart the process
- every @racket[seconds].  The @racket[retry] argument specifies how
- many time to attempt to restart the process before giving up.  If the
- process stays alive for @racket[(* 2 seconds)] the attempted retries
- count is reset to @racket[0].  The @racket[on-final-fail] thunk is
- called when the number of retries is exceeded
-}
-}
-
-@defthing[distributed-launch-path path?]{
-Contains the local path to the distributed places launcher.  The
-distributed places launcher is the bootsrap file that launches the
-message router on a new node.
-}
-
-@defproc[(ssh-bin-path) string?]{
-Returns the path to the ssh binary on the local system in string form.
-}
-@examples[ #:eval evaler
-(ssh-bin-path)
-]
-
-@defproc[(racket-path) path?]{
-Returns the path to the currently executing Racket binary on the local system.
-}
-
-@defproc[(build-distributed-launch-path [collects-path path-string?]) string?]{
-Returns the path to the distributed places launch file.
-The function can take an optional argument specifying the path to the collects directory.
-}
-
-@;{
-@defproc[(build-node-args . list?) list?]{
-Takes all the positional and keyword arguments pass to it and builds a 
-@racket[(list (list keywords ...) (list keyword-arguments ...) (list positional-args ...))] 
-suitable as an argument to  @racket[(lambda (x) (apply keyword-apply spawn-node-at x))].}
-}
-
-@defproc[(spawn-node-at [hostname string?] 
-           [#:listen-port port port-no? DEFAULT-ROUTER-PORT]
-           [#:racket-path racket-path string-path? (racket-path)]
-           [#:ssh-bin-path ssh-path string-path? (ssh-bin-path)]
-           [#:distributed-launch-path launcher-path string-path? (path->string distributed-launch-path)]) channel?]{
-  Spawns a node in the background using a Racket thread and returns a channel that becomes ready with a @racket[remote-node%]
-  once the node has spawned successfully 
-}
-
-@defproc[(spawn-nodes/join [nodes-descs list?]) void?]{
-Spawns a list of nodes by calling @racket[(lambda (x) (apply keyword-apply spawn-node-at x))] for each node description in
-@racket[nodes-descs] and then waits for each node to spawn.
-}
-
-
-@defproc[(*channel-put [ch (or/c place-channel? async-bi-channel? 
-                                 channel? (is-a?/c remote-connection%))] 
-                       [msg any]) 
-         void?]{
-Sends @racket[msg] over @racket[ch] channel.
-}
-
-@defproc[(*channel-get [ch (or/c place-channel? async-bi-channel? 
-                                 channel? (is-a?/c remote-connection%))]) 
-         any]{
-Returns a message received on @racket[ch] channel.
-}
-
-@defproc[(*channel? [v any/c]) boolean?]{
-Returns @racket[#t] if @racket[v] is one of @racket[place-channel?], @racket[async-bi-channel?],
-@racket[channel?], or @racket[(is-a?/c remote-connection%)].
-}
-
-
-@defproc[(send-new-place-channel-to-named-dest [ch *channel?] [src-id any] 
-                                               [dest-list (listof string? port-no? string?)])
-         place-channel?]{
-Creates and returns a new place channel connection to a named place at @racket[dest-list].
-The @racket[dest-list] argument is a list of a remote-hostname remote-port and named-place name.
-The channel @racket[ch] should be a connection to a @racket[message-router].
-}
-
-@defproc[(mr-spawn-remote-node [mrch *channel?] [host string?] [#:listen-port listen-port port-no? DEFAULT-ROUTER-PORT]
-                               [#:solo solo boolean? #f]) void?]{
-Sends a message to a message router over @racket[mrch] channel asking the message router to spawn a new node
-at @racket[host] listening on port @racket[listen-port].  If the @racket[#:solo] keyword argument is supplied
-the new node is not folded into the complete network with other nodes in the distributed system.
-}
-
-@defproc[(mr-supervise-named-dynamic-place-at [mrch *channel?] [dest (listof string? port-no?)] [name string?] [path string?] [func symbol?]) void?]{
-Sends a message to a message router over @racket[mrch] channel asking the message router to spawn
-a named place at @racket[dest] named @racket[name].  The place is spawned at the remote node by calling
-dynamic place with module-path @racket[path] and function @racket[func].  The @racket[dest] parameter should be a
-list of remote-hostname and remote-port.
-}
-
-@defproc[(mr-connect-to [mrch *channel?] [dest (listof string? port-no?)] [name string?]) void?]{
-Sends a message to a message router over @racket[mrch] channel asking the message router to create a new 
-connection to the named place named @racket[name] at @racket[dest].
-The @racket[dest] parameter should be a list of remote-hostname and remote-port.
-}
-
-@defproc[(start-message-router/thread [#:listen-port listen-port port-no? DEFAULT-ROUTER-PORT]
-                                      [#:nodes nodes list? null]) (values thread? channel?)]{
-Starts a message router in a Racket thread connected to @racket[nodes], listening on port @racket[listen-port], and 
-returns a @racket[channel?] connection to the message router.
-}
-
-@defproc[(port-no? [no (and/c exact-nonnegative-integer?  (integer-in 0 65535))]) boolean?]{
-Returns @racket[#t] if @racket[no] is a @racket[exact-nonnegative-integer?] between @racket[0] and @racket[65535].
-}
-
-@defthing[DEFAULT-ROUTER-PORT port-no?]{
-The default port for distributed places message router.
-}
-
-@defclass[named-place-typed-channel% object% () ]{
-
-  @defconstructor[([ch place-channel?])]{
-    The @racket[ch] argument is a @racket[place-channel].  
-  }
-  @defmethod[(get [type symbol?]) any]{
-    Returns the first message received on @racket[ch] that has the type @racket[type]. Messages are lists and their type is the first 
-item of the list which should be a @racket[symbol?].  Messages of other types that are received are queued for later @racket[get] requests.
-  }
-}
-
-@defproc[(tc-get [type symbol?] [ch place-channel?]) void?]{
-Gets a message of type @racket[type] from the @racket[named-place-typed-channel%] @racket[ch].
-}
-
-@;{@examples[ #:eval evaler
-(racket-path)
-]}
-
-@;{
-@defproc[(->string) string?]{
-Coerces strings, numbers, symbols, and paths to a string.
-}
-@examples[ #:eval evaler
-(->string "hello")
-(->string 1)
-(->string 'bye)
-(->string (build-path "ridge"))
-(->string #"bytes")
-]
-
-@defproc[(->number) number?]{
-Coerces strings, numbers, to a number.
-}
-@examples[ #:eval evaler
-(->number "100")
-(->number 1)
-]
-
-@defproc[(->path) path?]{
-Coerces paths and strings to a path.
-}
-@examples[ #:eval evaler
-(->path "/usr/bin")
-(->path (build-path "ridge"))
-]
-
-@defproc[(->length) path?]{
-Returns the length of strings, bytes, and lists.
-}
-@examples[ #:eval evaler
-(->length "Boo")
-(->length #"Woo")
-(->length (list 1 2 3 4))
-]
-}
-
-@defproc[(write-flush [datum any] [port port?]) void?]{
-Writes @racket[datum] to @racket[port] and then flushes @racket[port].
-}
-
-@defproc[(printf/f [format string?] [args any] ...) void?]{
-Calls @racket[printf] followed by a call to @racket[flush-output].
-}
-
-@defproc[(displayln/f [item any]) void?]{
-Calls @racket[displayln] followed by a call to @racket[flush-output].
-}
-
-@examples[ #:eval evaler
-(write-flush "Hello World" (current-output-port))
-]
-
-@;@include-section["define-remote-server.scrbl"]
-@section{Define Remote Server}
-
-@defmodule[racket/place/define-remote-server]
-
-@deftogether[(@defform[(define-remote-server [name identifier?] rpc-forms ...+)]
-              @defform[(define-named-remote-server [name identifier?] rpc-forms ...+)])]{
-The @racket[define-remote-server] and @racket[define-named-remote-server] forms
-are nearly identical.  The @racket[define-remote-server] form should be used
-with @racket[supervise-dynamic-place-at] to build a private rpc server, while
-the @racket[define-named-remote-server] form should be used with
-@racket[supervise-named-dynamic-place-at] to build a rpc server inside a named
-place.
-
-The @racket[define-named-remote-server] form takes an identifier and a
-list of custom expressions as its arguments.  From the identifier a
-function is created by prepending the @tt{make-} prefix. This
-procedure takes a single argument a @racket[place-channel]. In the
-example below, the @racket[make-tuple-server] identifier is the
-@racket[place-function-name] given to the
-@racket[supervise-named-dynamic-place-at] form to spawn an rpc server.
-The server created by the @racket[make-tuple-server] procedure sits in
-a loop waiting for rpc requests from the @racket[define-rpc] functions
-documented below.
-
-@defform[(define-state id value)]{
- Expands to a @@racket[define], which is closed over by the @racket[define-rpc] functions
- to form local state.
-}
-
-@defform[(define-rpc (id args ...) body ...)]{
- Expands to a client rpc function @tt{name-id} which sends @racket[id] and @racket[args ...] to
- the rpc server @racket[rpc-place] and waits for a response.
- @racket[(define (name-id rpc-place args ...) body)]
-}
-
-@defform[(define-cast (id args ...) body ...)]{
- Expands to a client rpc function @tt{name-id} which sends @racket[id] and @racket[args ...] to
- the rpc server @racket[rpc-place] but does not receive any response. A cast is a one-way communication
- technique.
- @racket[(define (name-id rpc-place args ...) body)]
-}
-
-The
-@racket[define-state] custom form translates into a simple
-@racket[define] form, which is closed over by the @racket[define-rpc]
-forms.
-
-The @racket[define-rpc] form is expanded into two parts. The first
-part is the client stubs that call the rpc functions. The client
-function name is formed by concatenating the
-@racket[define-named-remote-server] identifier, @tt{tuple-server},
-with the RPC function name @tt{set} to form @racket[tuple-server-set].
-The RPC client functions take a destination argument which is a
-@racket[remote-connection%] descriptor and then the RPC function
-arguments. The RPC client function sends the RPC function name,
-@racket[set], and the RPC arguments to the destination by calling an
-internal function @racket[named-place-channel-put]. The RPC client
-then calls @racket[named-place-channel-get] to wait for the RPC
-response.
-
-The second expansion part of @racket[define-rpc] is the server
-implementation of the RPC call.  The server is implemented by a match
-expression inside the @racket[make-tuple-server] function.  The match
-clause for @racket[tuple-server-set] matches on messages beginning
-with the @racket['set] symbol. The server executes the RPC call with
-the communicated arguments and sends the result back to the RPC
-client.
-
-The @racket[define-cast] form is similar to the @racket[define-rpc] form
-except there is no reply message from the server to client
-}
-
-@examples[ #:eval evaler
-(module tuple-server-example racket/base
-  (require racket/match
-           racket/place/define-remote-server)
-
-  (define-named-remote-server tuple-server
-    (define-state h (make-hash))
-    (define-rpc (set k v)
-      (hash-set! h k v)
-      v)
-    (define-rpc (get k)
-      (hash-ref h k #f))
-    (define-cast (hello)
-      (printf "Hello from define-cast\n")
-      (flush-output))))
-]
-
-@examples[ #:eval evaler
-(module bank-server-example racket/base
-  (require racket/match
-           racket/place/define-remote-server)
-
-  (define-remote-server bank
-    (define-state accounts (make-hash))
-    (define-rpc (new-account who)
-       (match (hash-has-key? accounts who)
-         [#t '(already-exists)]
-         [else
-           (hash-set! accounts who 0)
-           (list 'created who)]))
-    (define-rpc (remove who amount)
-       (cond
-         [(hash-ref accounts who (lambda () #f)) =>
-            (lambda (balance)
-              (cond [(<= amount balance)
-                     (define new-balance (- balance amount))
-                     (hash-set! accounts who new-balance)
-                     (list 'ok new-balance)]
-                    [else
-                      (list 'insufficient-funds balance)]))]
-         [else
-           (list 'invalid-account who)]))
-    (define-rpc (add who amount)
-      (cond
-         [(hash-ref accounts who (lambda () #f)) =>
-            (lambda (balance)
-              (define new-balance (+ balance amount))
-              (hash-set! accounts who new-balance)
-              (list 'ok new-balance))]
-         [else
-           (list 'invalid-account who)]))))
-]
-
-
-@defproc[(log-to-parent [msg string?] [#:severity severity symbol? 'info]) void?]{
-  The @racket[log-to-parent] procedure can be used inside a
-  @racket[define-remote-server] or @racket[define-named-remote-server] form to
-  send a logging message to the remote owner of the rpc server.
-}
-@section{Async Bidirectional Channels}
-
-@defmodule[racket/place/private/async-bi-channel]
-
-@defproc[(make-async-bi-channel) async-bi-channel?]{
-Creates and returns an opaque structure, which is the async bidirectional channel.
-}
-
-@defproc[(async-bi-channel? [ch any]) boolean?]{
-A predicate that returns @racket[#t] for async bidirectional channels.
-}
-
-@defproc[(async-bi-channel-get [ch async-bi-channel?]) any]{
-Returns the next available message from the async bidirectional channel @racket[ch].
-}
-
-@defproc[(async-bi-channel-put [ch async-bi-channel?] [msg any]) void?]{
-Sends message @racket[msg] to the remote end of the async bidirectional channel @racket[ch].
-}
-
-@(close-eval evaler)
-@include-section["rmpi.scrbl"]
diff --git a/pkgs/distributed-places-pkgs/distributed-places-doc/scribblings/distributed-places/info.rkt b/pkgs/distributed-places-pkgs/distributed-places-doc/scribblings/distributed-places/info.rkt
deleted file mode 100644
index d69a699607..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-doc/scribblings/distributed-places/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("distributed-places.scrbl" () (net-library))))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-doc/scribblings/distributed-places/rmpi.scrbl b/pkgs/distributed-places-pkgs/distributed-places-doc/scribblings/distributed-places/rmpi.scrbl
deleted file mode 100644
index cf1f6e0b37..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-doc/scribblings/distributed-places/rmpi.scrbl
+++ /dev/null
@@ -1,146 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          scribble/struct
-          scribble/decode
-          racket/contract
-          racket/place/distributed
-          racket/place/distributed/rmpi
-          racket/sandbox
-          racket/class)
-@(require (for-label (except-in racket/base log-message)
-                     racket/contract
-                     racket/class
-                     racket/place
-                     racket/place/distributed
-                     racket/place/distributed/rmpi
-                     racket/place/private/async-bi-channel))
-
-
-@(define evaler (make-base-eval))
-@(interaction-eval #:eval evaler (require racket/place/distributed
-                                          racket/class))
-
-
-@title[#:tag "distributed-places-MPI"]{Distributed Places MPI}
-
-@defmodule[racket/place/distributed/rmpi]
-
-@defstruct*[rmpi-comm ([id exact-nonnegative-integer?] [cnt exact-positive-integer?] [channels vector?])]{
-The communicator struct @racket[rmpi-comm] contains the rmpi process
-rank @racket[id], the quantity of processes in the communicator group,
-@racket[cnt], and a vector of place-channels, one for each process in
-the group.
-}
-
-@defproc[(rmpi-id [comm rmpi-comm?]) exact-nonnegative-integer? ]{
-  Takes a rmpi communicator structure, @racket[comm], and returns the node id of the RMPI
-  process.
-}
-
-@defproc[(rmpi-cnt [comm rmpi-comm?]) exact-positive-integer? ]{
-  Takes a rmpi communicator structure, @racket[comm], and returns the count of the RMPI
-  processes in the communicator group.
-}
-
-@defproc[(rmpi-send [comm rmpi-comm?] [dest exact-nonnegative-integer?] [val any]) void?]{
-  Sends @racket[val] to destination rmpi process number @racket[dest]
-  using the RMPI communicator structure @racket[comm].
-}
-
-@defproc[(rmpi-recv [comm rmpi-comm?] [src exact-nonnegative-integer?]) any]{
-  Receives a message from source rmpi process number @racket[src]
-  using the RMPI communicator structure @racket[comm].
-}
-
-@defproc[(rmpi-init [ch place-channel?]) (values rmpi-comm? (listof any) (is-a?/c named-place-typed-channel%))]{
-  Creates the @racket[rmpi-comm] structure instance using the named
-  place's original place-channel @racket[ch].  In addition to the
-  communicator structure, @racket[rmpi-init] returns a list of initial
-  arguments and the original place-channel @racket[ch] wrapped in a
-  @racket[named-place-typed-channel%].  The
-  @racket[named-place-typed-channel%] wrapper allows for the reception
-  of list messages typed by an initial symbol.
-}
-
-@defproc*[([(rmpi-broadcast [comm rmpi-comm?] [src exact-nonnegative-integer?]) any]
-           [(rmpi-broadcast [comm rmpi-comm?] [src exact-nonnegative-integer?] [val any]) any])]{
-  Broadcasts @racket[val] from @racket[src] to all rmpi processes in
-  the communication group using a hypercube algorithm.  Receiving
-  processes call @racket[(rmpi-broadcast comm src)].
-}
-
-@defproc[(rmpi-reduce [comm rmpi-comm?] [dest exact-nonnegative-integer?] [op procedure?] [val any]) any]{
-  Reduces @racket[val] using the @racket[op] operator to @racket[dest]
-  rmpi node using a hypercube algorithm.
-}
-
-@defproc[(rmpi-barrier [comm rmpi-comm?]) void?]{
-  Introduces a synchronization barrier for all rmpi processes in the
-  communcication group @racket[comm].
-}
-
-@defproc[(rmpi-allreduce [comm rmpi-comm?] [op procedure?] [val any]) any]{
-  Reduces @racket[val] using the @racket[op] operator to rmpi node
-  @racket[0] and then broadcasts the reduced value to all nodes in the
-  communication group.
-}
-
-@defproc[(rmpi-partition [comm rmpi-comm?] [num exact-nonnegative-integer?]) (values exact-nonnegative-integer? exact-nonnegative-integer?)]{
-  Partitions @racket[num] into @racket[rmpi-cnt] equal pieces and
-  returns the offset and length for the @racket[rmpi-id]th piece.
-}
-
-@defproc[(rmpi-build-default-config
-          [#:racket-path racket-path string?]
-          [#:distributed-launch-path distributed-launch-path string?]
-          [#:mpi-module mpi-module string?]
-          [#:mpi-func mpi-func symbol?]
-          [#:mpi-args mpi-args (listof any)]) hash?]{
-
-  Builds a hash from keywords to keyword arguments for use with the
-  @racket[rmpi-launch function].
-}
-
-@defproc[(rmpi-launch [default-node-config hash?] 
-                      [config (listof (list/c string? port-no? symbol? 
-                                              exact-nonnegative-integer?))]) 
-         void?]{
-  Launches distributed places nodes running @racket[#:mpi-func] in
-  @racket[#:mpi-module] with @racket[#:mpi-args].  The config is a
-  list of node configs, where each node config consists of a hostname,
-  port, named place symbol and rmpi id number, followed by and
-  optional hash of keyword @racket[#:racket-path],
-  @racket[#:distributed-launch-path], @racket[#:mpi-module],
-  @racket[#:mpi-func], and @racket[#:mpi-args] to keyword arguments.
-  Missing optional keyword arguments will be taken from the
-  @racket[default-node-config] hash of keyword arguments.
-}
-
-@defproc[(rmpi-finish [comm rmpi-comm?] [tc (is-a?/c named-place-typed-channel%)]) void?]{
-  Rendezvous with the @racket[rmpi-launch], using the @racket[tc]
-  returned by @racket[rmpi-launch], to indicate that the RMPI module
-  is done executing and that @racket[rmpi-launch] can return control
-  to its caller.
-}
-
-
-@examples[ #:eval evaler
-(eval:alts
-(rmpi-launch
-    (rmpi-build-default-config
-      #:racket-path "/tmp/mplt/bin/racket"
-      #:distributed-launch-path (build-distributed-launch-path 
-                                 "/tmp/mplt/collects")
-      #:mpi-module "/tmp/mplt/kmeans.rkt"
-      #:mpi-func   'kmeans-place
-      #:mpi-args    (list "/tmp/mplt/color100.bin" #t 100 
-                          9 10 0.0000001))
-
-    (list (list "nodea.example.com" 6340 'kmeans_0 0)
-          (list "nodeb.example.com" 6340 'kmeans_1 1)
-          (list "nodec.example.com" 6340 'kmeans_2 2)
-          (list "noded.example.com" 6340 'kmeans_3 3)))
-(void))
-]
-
-@(close-eval evaler)
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/LICENSE.txt b/pkgs/distributed-places-pkgs/distributed-places-lib/LICENSE.txt
deleted file mode 100644
index 59291fb6eb..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-distributed-places-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/info.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/info.rkt
deleted file mode 100644
index e1cfb4fc1d..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/info.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang info
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "implementation (no documentation) part of \"distributed-places\"")
-
-(define pkg-authors '(tewk))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/define-remote-server.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/define-remote-server.rkt
deleted file mode 100644
index acfa5ff989..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/define-remote-server.rkt
+++ /dev/null
@@ -1,156 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         (for-syntax syntax/stx)
-         racket/place
-         racket/place/private/th-place
-         racket/place/private/coercion
-         racket/place/private/async-bi-channel
-         racket/match
-         racket/class
-         racket/stxparam
-         (for-syntax racket/pretty)
-         racket/place/distributed)
-
-(define-syntax define/provide
-  (syntax-rules ()
-    [(_ (name x ...) body ...)
-     (begin (provide name)
-            (define (name x ...) body ...))]
-    [(_ name val)
-     (begin (provide name)
-            (define name val))]))
-
-(define (dplace/place-channel-get dest)
-  (cond
-    [(place-channel? dest) (place-channel-get dest)]
-    [(th-place-channel? dest) (th-place-channel-get dest)]
-    [(channel? dest) (channel-get dest)]
-    [(async-bi-channel? dest) (async-bi-channel-get dest)]
-    [else (send dest get-msg)]))
-
-(define (dplace/place-channel-put dest msg)
-  (cond
-    [(place-channel? dest) (place-channel-put dest msg)]
-    [(th-place-channel? dest) (th-place-channel-put dest msg)]
-    [(channel? dest) (channel-put dest msg)]
-    [(async-bi-channel? dest) (async-bi-channel-put dest msg)]
-    [else (send dest put-msg msg)]))
-
-
-(define-syntax-rule (define-syntax-parameter-error x)
-  (define-syntax-parameter x (lambda (stx) (raise-syntax-error 'x "only allowed inside define-*-remote-server definition" stx))))
-
-(define-syntax-parameter-error log-to-parent)
-
-(define-syntax (define-define-remote-server stx)
-  (syntax-case stx ()
-    [(_ form-name)
-      #;(printf "FORM_NAME ~a ~a ~a\n" #'form-name (syntax->datum #'form-name)
-              (equal? (syntax->datum #'form-name) 'define-named-remote-server))
-      (with-syntax ([receive-line
-                     (cond
-                       [(eq? (syntax->datum #'form-name) 'define-named-remote-server)
-                        #'(list (list fname-symbol args (... ...)) src)]
-                       [else
-                        #'(list fname-symbol args (... ...))])]
-                    [send-dest
-                     (cond
-                       [(eq? (syntax->datum #'form-name) 'define-named-remote-server)
-                        #'src]
-                       [else
-                        #'ch])])
-(define x
-#'(define-syntax (form-name stx)
-   (syntax-case stx ()
-    [(_ name forms (... ...))
-     (let ()
-
-      (define (is-id? id stx)
-        (equal? (syntax-e stx) id))
-      (define (define? stx) (is-id? 'define-state (stx-car stx)))
-
-      (define-values (states rpcs)
-        (for/fold ([states null]
-                   [rpcs   null]) ([f (syntax->list #'(forms (... ...)))])
-          (cond
-            [(define? f)
-             (values (append states (list f)) rpcs)]
-            [else
-             (values states (append rpcs (list f)))]
-            )))
-
-      (define (id->string x)
-        (symbol->string (syntax->datum x)))
-      (define (string->id stx x)
-        (datum->syntax stx (string->symbol x)))
-
-
-      (define trans-rpcs
-        (for/list ([f rpcs])
-          (syntax-case f ()
-            [(define-type (fname args (... ...)) body (... ...))
-             (with-syntax ([fname-symbol (string->id stx (format "~a-~a" (id->string  #'name) (id->string #'fname)))]
-                           [(receive (... ...))
-                             (cond
-                               [(is-id? 'define-rpc #'define-type) #'((dplace/place-channel-get dest))]
-                               [(is-id? 'define-cast #'define-type) #'()]
-                               [else (raise "Bad define in define-remote-server")])])
-
-               #'(define/provide (fname-symbol dest args (... ...))
-                     (dplace/place-channel-put dest (list (quote fname) args (... ...)))
-                     receive (... ...)))])))
-
-      (define trans-place
-        (with-syntax ([(states2 (... ...))
-                        (for/list ([s states])
-                          (syntax-case s ()
-                            [(_ rest (... ...))
-                             #'(define rest (... ...))]))]
-                      [(cases (... ...))
-                        (for/list ([r rpcs])
-                          (syntax-case r ()
-                            [(define-type (fname args (... ...)) body (... ...))
-                             (let ()
-                               (with-syntax ([fname-symbol #'(quote fname)]
-                                             [(send-line (... ...))
-                                              (cond
-                                                [(is-id? 'define-rpc #'define-type) #'((dplace/place-channel-put send-dest result))]
-                                                [(is-id? 'define-cast #'define-type) #'()]
-                                                [else (raise "Bad define in define-remote-server")])])
-                                 #'[receive-line
-                                    (define result
-                                      (let ()
-                                        body (... ...)))
-                                    send-line (... ...)
-                                    (loop)]))]))])
-          #`(lambda (ch)
-              (let ()
-                states2 (... ...)
-                (let loop ()
-                  (define msg (dplace/place-channel-get ch))
-                  (define (log-to-parent-real msg #:severity [severity 'info])
-                    (dplace/place-channel-put ch (log-message severity msg)))
-                  (syntax-parameterize ([log-to-parent (make-rename-transformer #'log-to-parent-real)])
-                    (match msg
-                      cases (... ...)))
-                  loop)))))
-      (with-syntax ([mkname (string->id stx (format "make-~a" (id->string #'name)))])
-        (define x
-          #`(begin
-              (require racket/place
-                       racket/match)
-              #,@trans-rpcs
-              (define/provide mkname #,trans-place)
-              (void)))
-        ;(pretty-print (syntax->datum x))
-        x))]))
-)
-;(pretty-print (syntax->datum x))
-x)]))
-
-(define-define-remote-server define-remote-server)
-(define-define-remote-server define-named-remote-server)
-
-(provide define-remote-server
-         define-named-remote-server
-         log-to-parent)
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed.rkt
deleted file mode 100644
index a8833cc43f..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed.rkt
+++ /dev/null
@@ -1,1682 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/match
-         racket/tcp
-         racket/place
-         racket/place/private/prop
-         racket/place/private/th-place
-         racket/place/private/coercion
-         racket/place/private/async-bi-channel
-         racket/class
-         racket/trait
-         racket/udp
-         racket/runtime-path
-         racket/date
-         racket/contract
-         syntax/location)
-
-(define-syntax define/provide
-  (syntax-rules ()
-    [(_ (name x ...) body ...)
-     (begin (provide name)
-            (define (name x ...) body ...))]
-    [(_ name val)
-     (begin (provide name)
-            (define name val))]))
-
-(provide ssh-bin-path
-         racket-path
-
-         DEFAULT-ROUTER-PORT
-
-         ;; New Design Pattern 2 API
-         message-router
-         spawn-node-supervise-place-at
-         spawn-node-with-place-at
-         supervise-place-at
-         supervise-thread-at
-
-         supervise-process-at
-         every-seconds
-         after-seconds
-         restart-every
-
-         connect-to-named-place
-
-         spawn-remote-racket-node
-         node-send-exit
-         node-get-first-place
-
-         ;; without message router api
-         create-place-node
-         distributed-place-wait
-
-         ;; low-level API
-         write-flush
-         printf/f
-         displayln/f
-         log-message
-         start-spawned-node-router ;not documented
-
-         ;; Old Design Pattern 1 API
-         ;; not documented
-         startup-config
-         (struct-out node-config)
-
-         ;v3 api
-         build-distributed-launch-path
-         #;build-node-args
-         *channel-get
-         *channel-put
-         send-new-place-channel-to-named-dest
-
-         mr-spawn-remote-node
-         mr-supervise-named-dynamic-place-at
-         mr-connect-to
-         start-message-router/thread
-         spawn-node-at
-         spawn-nodes/join
-         spawn-nodes/join/local
- 
-         ;classes
-         event-container<%>
-         spawned-process%
-         place-socket-bridge%
-         node%
-         socket-connection%
-         remote-node%
-         remote-connection%
-         place%
-         connection%
-         respawn-and-fire%
-         after-seconds%
-         restarter%
-
-         ;re-provides
-         quote-module-path
-         place-channel-get
-         place-channel-put
-
-         ;named-place-typed-channel
-         named-place-typed-channel%
-         tc-get
-
-         ;contracts
-         *channel?
-         port-no?
-         )
-
-;(define klogger displayln)
-(define klogger (lambda (x) (log-debug x)))
-
-(define in-message-router-mark (cons #f #f))
-(define (call-in-message-router thunk)
-  (with-continuation-mark in-message-router-mark #f
-                           (call-with-continuation-prompt thunk)))
-
-(define-runtime-path distributed-launch-path "distributed/launch.rkt")
-(define (build-distributed-launch-path [collects-path
-                                         (simplify-path (find-executable-path (find-system-path 'exec-file) 
-                                                                              (find-system-path 'collects-dir)))])
-   (path->string (build-path collects-path "racket/place/distributed/launch.rkt")))
-
-(define DEFAULT-ROUTER-PORT 6340)
-
-; returns the path to the current racket executable on the current machine.
-(define (racket-path)
-  (parameterize ([current-directory (find-system-path 'orig-dir)])
-    (find-executable-path (find-system-path 'exec-file) #f)))
-
-; find ssh-binary
-(define (ssh-bin-path)
-  (define (exists? paths)
-    (and paths
-         (for/or ([p paths]) (and (file-exists? p) p))))
-
-  (define (fallback-paths)
-    (exists?
-      (case (system-type 'os)
-        [(unix macosx)
-          (list "/usr/local/bin/ssh" "/usr/bin/ssh" "/bin/ssh" "/opt/local/bin/ssh" "/opt/bin/ssh")]
-        [(windows) #f])))
-
-  (define (which cmd)
-    (define path (getenv "PATH"))
-    (and path
-         (exists? (map (lambda (x) (build-path x cmd))
-                       (regexp-split (case (system-type 'os)
-                                       [(unix macosx) ":"]
-                                       [(windows) "#:;"])
-                                     path)))))
-  (or (which "ssh")
-      (fallback-paths)
-      (raise "ssh binary not found")))
-
-
-
-(define (write-flush msg [p (current-output-port)])
-;  (write msg (current-output-port))
-;  (newline)
-  (flush-output)
-  (write msg p)
-  (flush-output p))
-
-(define (printf/f . args)
-  (apply printf args)
-  (flush-output))
-
-(define (displayln/f . args)
-  (apply displayln args)
-  (flush-output))
-
-
-(define (tcp-connect/backoff rname rport #:times [times 4] #:start-seconds [start-seconds 1])
-  (let loop ([t 0]
-             [wait-time start-seconds])
-    (with-handlers ([exn? (lambda (e)
-                            (cond [(t . < . times)
-                                   (klogger (format "backing off ~a sec to ~a:~a" (expt 2 t) rname rport))
-                                   (sleep wait-time)
-                                   (loop (add1 t) (* 2 wait-time))]
-                                  [else (raise e)]))])
-      (tcp-connect rname (->number rport)))))
-
-(define (tcp-connect/retry rname rport #:times [times 10] #:delay [delay 1])
-  (let loop ([t 0])
-    (with-handlers ([exn? (lambda (e)
-                            (cond [(t . < . times)
-                                   (klogger (format "waiting ~a sec to retry connection to ~a:~a" delay rname rport))
-                                   (sleep delay)
-                                   (loop (add1 t))]
-                                  [else (raise e)]))])
-      (tcp-connect rname (->number rport)))))
-
-(define (format-log-message severity msg)
-  (define l (current-logger))
-  (when (log-level? l severity)
-    (log-message l severity (format "~a ~a" (date->string (current-date) #t) msg) #f)))
-
-;node configuration
-(struct node-config (node-name 
-                     node-port
-                     proc-count
-                     ssh-path
-                     racket-path
-                     distributed-path
-                     mod-path
-                     func-name
-                     conf-path
-                     conf-name) #:prefab)
-;distributed communication group message
-(struct dcgm (type src dest msg) #:prefab)
-
-;dcgm types
-(define DCGM-TYPE-NORMAL               0)
-(define DCGM-TYPE-DIE                  1)
-(define DCGM-TYPE-NEW-DCHANNEL         2)
-(define DCGM-TYPE-NEW-INTER-DCHANNEL   3)
-(define DCGM-TYPE-INTER-DCHANNEL       4)
-(define DCGM-TYPE-KILL-DPLACE          5)
-(define DCGM-TYPE-SPAWN-REMOTE-PROCESS 6)
-(define DCGM-DPLACE-DIED               7)
-(define DCGM-TYPE-LOG-TO-PARENT        8)
-(define DCGM-TYPE-NEW-PLACE            9)
-(define DCGM-TYPE-NEW-CONNECTION      10)
-(define DCGM-TYPE-SET-OWNER           11)
-
-(define DCGM-NEW-NODE-CONNECT         50)
-(define DCGM-NEW-PLACE-CHANNEL        51)
-
-(define DCGM-CONTROL-NEW-NODE        100)
-(define DCGM-CONTROL-NEW-PLACE       101)
-(define DCGM-CONTROL-NEW-CONNECTION  102)
-
-(define (send-new-place-channel-to-named-dest ch src-id dest-list)
-  (define-values (e1 e2) (place-channel))
-  (place-channel-put ch (dcgm DCGM-NEW-PLACE-CHANNEL (list 'new-place-channel src-id) dest-list e2))
-  e1)
-
-(define-syntax-rule (reduce-sum seq item body ...)
-  (for/fold ([sum 0]) ([item seq]) (+ sum (begin body ...))))
-
-(define (total-node-count conf) (reduce-sum conf item (node-config-proc-count item)))
-
-;; Contract: start-node-router : VectorOf[ (or/c place-channel socket-connection)] -> (void)
-;; Purpose: Forward messages between channels and build new point-to-point subchannels
-;; Example:
-(define (start-spawned-node-router listener)
-  (define nc (new node% [listen-port listener]))
-  (send nc sync-events))
-
-
-(define (start-node-router chan-vec)
-  (define nc (new node% [chan-vec chan-vec]))
-  (send nc sync-events))
-
-(define backlink
-  (trait->mixin
-    (trait
-      (field [router #f])
-      (define/public (remove-from-router)
-        (and router (send router remove-ec this)))
-      (define/public (get-router) router)
-      (define/public (backlink _router)
-        (set! router _router))
-      )))
-
-(define event-container<%>
-  (interface ()
-    register
-  ))
-
-(define place<%>
-  (interface* ()
-              ([prop:place
-                 (lambda (method obj . args)
-                   (case method
-                     [(place-channel-get)
-                      (*channel-get obj)]
-                     [(place-channel-put)
-                      (apply *channel-put obj args)]
-                     [(place-wait)
-                      (distributed-place-wait obj)]
-                     [(place-channel?) #t]
-                     [(place?) #t]
-                     [else
-                       (raise (format "Error in place<%> ~v ~v ~v" obj method args))]))])
-  ))
-
-(define event<%>
-  (interface* ()
-              ([prop:evt
-                 (lambda (x)
-                   (apply choice-evt (send x register null)))])))
-
-
-(define-syntax-rule (for/filter/fold/cons tail xs body ...)
-  (for/fold ([n tail]) xs
-    (define r (let () body ...))
-    (if r (cons r n) n)))
-
-(define (filter/list* . lst)
-  (define rl (reverse lst))
-  (for/filter/fold/cons (car rl) ([x (cdr rl)]) x))
-
-(define spawned-process%
-  (backlink
-    (class*
-      object% (event-container<%>)
-      (init-field cmdline-list)
-      (init-field [parent #f])
-      (init-field [s #f]
-                  [i #f]
-                  [o #f]
-                  [e #f])
-      (field [pid #f])
-
-      (let-values ([(_s _o _i _e) (apply subprocess o i e cmdline-list)])
-        (set! pid (subprocess-pid _s))
-        (set! s _s)
-        (set! o (box _o))
-        (set! i (box _i))
-        (set! e (box _e)))
-      (klogger (format"SPAWNED-PROCESS:~a ~a" pid cmdline-list))
-
-      (define (mk-handler _port desc)
-        (define port (unbox _port))
-        (if port
-          (wrap-evt port (lambda (e)
-            (define (print-out x) (klogger (format "SPAWNED-PROCESS ~a:~a:~a ~a" pid desc (->length x) x))
-              (flush-output))
-            (cond
-              [(not port) (print-out "IS #F")]
-              [else
-                (define bb (make-bytes 4096))
-                (define bbl (read-bytes-avail!* bb port))
-                (cond
-                  [(eof-object? bbl)
-                   (print-out "EOF")
-                   (set-box! _port #f)]
-                  [else
-                   (print-out (subbytes bb 0 bbl))])])))
-          #f))
-
-      (define/public (get-pid) pid)
-      (define/public (kill [force #t]) (subprocess-kill s force))
-      (define/public (wait-for-die) (subprocess-wait s))
-      (define/public (register nes)
-        (for/filter/fold/cons nes ([x (list s (list o "OUT") (list e "ERR"))])
-          (cond
-            [(subprocess? x) (wrap-evt s (lambda (e)
-                                             (klogger (format "SPAWNED-PROCESS ~a DIED" pid))
-                                             (and parent (send parent process-died this))))]
-            [(list? x) (apply mk-handler x)]
-            [else #f])))
-      (super-new)
-  )))
-
-(define place-socket-bridge%
-  (backlink
-    (class*
-      object% (event-container<%> event<%>)
-      (init-field pch
-                  sch
-                  id
-                  node)
-      (field [msg-queue null])
-
-      (define (queue-had-died-message?)
-        (for/or ([msg msg-queue])
-          (= (dcgm-type msg) DCGM-DPLACE-DIED)))
-
-      (define/public (register nes)
-        (cons
-          (wrap-evt
-            pch
-            (lambda (e)
-              (match e
-                [(dcgm #;8 (== DCGM-TYPE-LOG-TO-PARENT) _ _ (list severity msg))
-                  (send node log-from-child #:severity severity msg)]
-                [(dcgm #;51 (== DCGM-NEW-PLACE-CHANNEL) _ _ _)
-                  (send node forward-mesg e pch)]
-                [(dcgm #;102 (== DCGM-CONTROL-NEW-CONNECTION) dest -1 (list name ch))
-                  (send node forward-mesg e pch)]
-                [else (put-msg e)])))
-          nes))
-      (define/public (drain-place-channel)
-        (let loop ()
-          (when (apply sync/timeout/enable-break 0 (register null))
-            (loop))))
-      (define/public (get-sc-id) id)
-      (define/public (get-raw-msg)
-        (let loop ()
-          (define msg (send sch read-message))
-          (cond
-            [(eof-object? msg)
-              (printf "EOF from remote end during place-socket-bridge% get-raw-msg\n")
-              msg]
-            [(= (dcgm-type msg) DCGM-DPLACE-DIED)
-              (set! msg-queue (append msg-queue (list msg)))
-              (loop)]
-            [else
-              (dcgm-msg msg)])))
-      (define/public (wait-to-die)
-        (or
-          (queue-had-died-message?)
-          (let loop ()
-            (define msg (send sch read-message))
-            (unless (= (dcgm-type msg) DCGM-DPLACE-DIED)
-              (loop))))
-        (void))
-      (define/public (put-msg msg)
-        ;(printf/f "PSB3 ~a ~a ~a\n" sch id msg)
-        (sconn-write-flush sch (dcgm DCGM-TYPE-INTER-DCHANNEL id id msg)))
-      (super-new)
-  )))
-
-(define node%
-  (backlink
-    (class*
-      object% (event-container<%>)
-      (init-field [chan-vec #f])
-      (init-field [listen-port #f])
-      (init-field [socket-ports null])
-      (init-field [sub-ecs null])
-      (init-field [psbs null])
-      (init-field [spawned-nodes (make-hash)])
-      (init-field [solo-nodes (make-hash)])
-      (init-field [named-places (make-hash)])
-      (init-field [beacon #f])
-      (init-field [owner #f])
-      (init-field [nodes #f])
-      (field [id 0])
-
-      (define/public (nextid)
-        (set! id (add1 id))
-        id)
-      (define (add-socket-port pair)
-        (set! socket-ports (append socket-ports (list pair))))
-      (define/public (add-sub-ec ec)
-        (set! sub-ecs (append sub-ecs (list ec))))
-      (define (add-spawned-node key ec)
-        (hash-set! spawned-nodes key ec))
-      (define (find-spawned-node key)
-        (hash-ref spawned-nodes key #f))
-      (define (add-solo-node key ec)
-        (hash-set! solo-nodes key ec))
-      (define (find-solo-node key)
-        (hash-ref solo-nodes key #f))
-      (define (add-psb ec)
-        (set! psbs (append psbs (list ec))))
-      (define (add-named-place name np)
-        (hash-set! named-places (->string name) np))
-      (define (named-place-lookup name)
-        (hash-ref named-places (->string name) #f))
-      (define (add-place-channel-socket-bridge pch sch id)
-        (add-psb (new place-socket-bridge% [pch pch] [sch sch] [id id] [node this])))
-      (define/public (forward-mesg m src-channel)
-        ;(printf/f "FORWARD MESSAGE ~a ~a\n" src-channel m)
-        (match m
-          [(dcgm 1 #;(== DCGM-TYPE-DIE) src dest "DIE") (exit 1)]
-          [(dcgm 2 #;(== DCGM-TYPE-NEW-DCHANNEL) src dest pch)
-            (define d (vector-ref chan-vec dest))
-            (cond
-              [(is-a? d socket-connection%)
-               (define ch-id (nextid))
-               (sconn-add-subchannel d ch-id pch)
-               (add-place-channel-socket-bridge pch d ch-id)
-               (sconn-write-flush d (dcgm DCGM-TYPE-NEW-INTER-DCHANNEL src dest ch-id))]
-              [(or (place-channel? d) (place? d))
-               (place-channel-put d m)]
-              [else (raise (format "Unexpected channel type1 ~a" d))])]
-          [(dcgm 9 #;(== DCGM-TYPE-NEW-PLACE) -1 (and place-exec (list-rest type rest)) ch-id)
-           (match place-exec
-             [(list 'connect name)
-              (define np (named-place-lookup name))
-              (cond
-                [np
-                  (define nc (new connection%
-                                 [name-pl np]
-                                 [ch-id ch-id]
-                                 [sc src-channel]
-                                 [node this]))
-                  (add-sub-ec nc)]
-
-                [else
-                  (sconn-write-flush src-channel (dcgm DCGM-TYPE-INTER-DCHANNEL ch-id ch-id
-                                                       (format "ERROR: name not found ~a" name)))])]
-             [(list 'channel-connect name src-id)
-              (define np (named-place-lookup name))
-              (cond
-                [np
-                  (define nc (new connection%
-                                 [name-pl np]
-                                 [ch-id ch-id]
-                                 [sc src-channel]
-                                 [node this]
-                                 [channel-connection src-id]))
-                  (add-sub-ec nc)]
-
-                [else
-                  (sconn-write-flush src-channel (dcgm DCGM-TYPE-INTER-DCHANNEL ch-id ch-id
-                                                       (format "ERROR: name not found ~a" name)))])]
-             [else  
-              (with-handlers ([exn? (lambda (e) 
-                                      (printf/f "Error starting place command ~a ~a\n" place-exec e)
-                                      #;(raise e))])
-                (define np (new place%
-                             [place-exec place-exec]
-                             [ch-id ch-id]
-                             [sc src-channel]
-                             [node this]))
-                (match place-exec
-                  [(list _ _ _ name) (add-named-place name np)]
-                  [else (add-sub-ec np)]))])]
-          [(dcgm 3 #;(== DCGM-TYPE-NEW-INTER-DCHANNEL) src dest ch-id)
-            (define s src-channel)
-            (define d (vector-ref chan-vec dest))
-            (define-values (pch1 pch2) (place-channel))
-            (sconn-add-subchannel s ch-id pch1)
-            (add-place-channel-socket-bridge pch1 s ch-id)
-            (place-channel-put d (dcgm DCGM-TYPE-NEW-DCHANNEL src dest pch2))]
-          [(dcgm 4 #;(== DCGM-TYPE-INTER-DCHANNEL) _ ch-id msg)
-            (define pch (sconn-lookup-subchannel src-channel ch-id))
-            ;(printf/f "4 ~a ~a ~a ~a\n" src-channel ch-id pch msg)
-            (match pch
-              [#f (raise (format "Unknown channel ch-id ~a in message ~a" ch-id m))]
-              [else
-                (cond
-                  [(place-channel? pch)
-                    (place-channel-put pch msg)]
-                  [(is-a? pch connection%)
-                   (send pch forward msg)]
-                  [(th-place-channel? pch)
-                   (th-place-channel-put pch msg)]
-                  [else (raise (format "Unexpected channel type2 ~a" pch))])])]
-          [(dcgm 6 #;(== DCGM-TYPE-SPAWN-REMOTE-PROCESS) src (list node-name node-port mod-path funcname) ch1)
-           (define node (spawn-remote-racket-node node-name #:listen-port node-port))
-           (for ([x (in-hash-values spawned-nodes)])
-             (send x notify-of-new-node node-name node-port))
-           (add-spawned-node (list node-name node-port) node)
-           (send node launch-place
-                    (list 'dynamic-place mod-path funcname)
-                    ;#:initial-message initial-message
-                    #:one-sided-place? ch1
-                    ;#:restart-on-exit restart-on-exit
-                    )]
-          [(dcgm 7 #;(== DCGM-DPLACE-DIED) -1 -1 ch-id)
-            (klogger (format"PLACE ~a died" ch-id))]
-          [(dcgm 8 #;(== DCGM-TYPE-LOG-TO-PARENT) _ _ (list severity msg))
-            (log-from-child #:severity severity msg)]
-          [(dcgm 11 #;(== DCGM-TYPE-SET-OWNER) -1 -1 msg)
-            (klogger (format "RECV DCGM-TYPE-SET-OWNER ~a" src-channel))
-            (set! owner src-channel)]
-          [(dcgm #;50 (== DCGM-NEW-NODE-CONNECT) -1 -1 (list node-name node-port))
-            (define node (find-spawned-node (list node-name node-port)))
-            (unless node
-              (add-spawned-node (list node-name node-port) (new remote-node% [host-name node-name] [listen-port node-port])))]
-
-          [(dcgm #;51 (== DCGM-NEW-PLACE-CHANNEL) src-id (and dest (list host port name)) pch)
-            ;(printf/f "DCGM-NEW-PLACE-CHANNEL ~a ~a\n" src-id dest)
-            (define node (find-spawned-node (list host port)))
-            (unless node (raise (format "1DCGM-CONTROL-NEW-CONNECTION Node ~a not found in ~a" dest spawned-nodes)))
-            (send node connect-channel src-id name #:one-sided pch)]
-
-          [(dcgm #;100 (== DCGM-CONTROL-NEW-NODE) -1 solo (list node-name node-port))
-           (define node (spawn-remote-racket-node node-name #:listen-port node-port))
-           (cond
-             [solo
-               (add-solo-node (list node-name node-port) node)]
-             [else
-               (for ([x (in-hash-values spawned-nodes)])
-                 (send x notify-of-new-node node-name node-port))
-               (add-spawned-node (list node-name node-port) node)])]
-          [(dcgm #;101 (== DCGM-CONTROL-NEW-PLACE) dest -1 place-exec)
-           (define node (find-spawned-node dest))
-           (unless node (raise (format "2DCGM-CONTROL-NEW-PLACE Node ~a not found in ~a" dest spawned-nodes)))
-           (send node launch-place place-exec)]
-          [(dcgm #;102 (== DCGM-CONTROL-NEW-CONNECTION) dest -1 (list name ch))
-           (define node
-             (or (find-spawned-node dest)
-                 (let ()
-                   (define node (new remote-node% [host-name (first dest)] [listen-port (second dest)]))
-                   (add-spawned-node dest node)
-                   node)))
-           (send node remote-connect name #:one-sided ch)]
-
-          [(dcgm mtype srcs dest msg)
-;            (printf/f "DEFAULT ACTION ~a ~a ~a ~a\n" mtype srcs dest msg)
-            (define d (vector-ref chan-vec dest))
-            (cond
-              [(is-a? d socket-connection%)
-                (sconn-write-flush d m)]
-              [(or (place-channel? d) (place? d))
-                (place-channel-put d m)])]
-          [(? eof-object?)
-            (klogger (format "connection died"))
-            (flush-output)
-            (exit 1)
-            ]))
-
-      (define us-buffer (make-bytes 4096))
-      (define (register-beacon nes)
-        (cond
-          [(not beacon) nes]
-          [(equal? #t beacon)
-           (set! beacon (udp-open-socket))
-           (udp-bind! beacon "255.255.255.255" DEFAULT-ROUTER-PORT)
-           (wrap-evt (udp-receive!-evt beacon us-buffer)
-            (match-lambda
-              [(list count host port)
-              (void)]))]))
-
-      (define/public (log-from-child msg #:severity [severity 'info])
-        ;(printf "Received Log Message ~a ~a\n" severity msg)
-        (cond
-          [owner
-            ;(printf "Sent to owner\n")
-            (sconn-write-flush owner (log-message severity msg))]
-          [else (format-log-message severity msg)]))
-
-      (define/public (register nes)
-        (let*
-          ([nes
-            (if chan-vec
-              (for/fold ([n nes]) ([x (in-vector chan-vec)])
-                (cons
-                  (cond
-                    [(is-a? x socket-connection%)
-                     (sconn-build-forward-event x (lambda (e x) (forward-mesg e x)))]
-                    [(or (place-channel? x) (place? x))
-                     (wrap-evt x (lambda (e) (forward-mesg e x)))]
-                    [(channel? x)
-                     (wrap-evt x (lambda (e) (forward-mesg e x)))]
-                    [else (raise (format "Unexpected channel type3 ~a" x))])
-
-                  n))
-              nes)]
-           [nes
-            (if listen-port
-              (cons
-                (wrap-evt listen-port (lambda (e)
-                  (define-values (in out) (tcp-accept listen-port))
-                  (define-values (lh lp rh rp) (tcp-addresses in #t))
-                  (klogger (format "INCOMING CONNECTION ~a:~a <- ~a:~a" lh lp rh rp))
-                  (define sp (new socket-connection% [in in] [out out]))
-                  (add-socket-port sp)))
-                nes)
-              nes)]
-           [nes
-            (if socket-ports
-              (for/fold ([n nes]) ([x socket-ports])
-                (cons
-                  (cond
-                    [(is-a? x socket-connection%)
-                     (sconn-build-forward-event x (lambda (e x) (forward-mesg e x)))]
-                    [(or (place-channel? x) (place? x))
-                     (wrap-evt x (lambda (e)
-                                     ;(printf "SOCKET-PORT PLACE MESSAGE ~a\n" e)
-                                     (forward-mesg e x)))]
-                    [else (raise (format "Unexpected channel type4 ~a" x))])
-                  n))
-              nes)]
-           [nes
-            (if sub-ecs
-              (for/fold ([n nes]) ([x sub-ecs])
-                (send x register n))
-              nes)]
-           [nes
-            (if psbs
-              (for/fold ([n nes]) ([x psbs])
-                (send x register n))
-              nes)]
-           [nes
-            (if spawned-nodes
-              (for/fold ([n nes]) ([x (in-hash-values spawned-nodes)])
-                (send x register n))
-              nes)]
-           [nes
-            (if solo-nodes
-              (for/fold ([n nes]) ([x (in-hash-values solo-nodes)])
-                (send x register n))
-              nes)]
-           [nes (register-beacon nes)]
-           [nes
-            (cond
-              [named-places
-                (for/fold ([n nes]) ([x (in-hash-values named-places)])
-                  (send x register n))]
-              [else nes])])
-          nes))
-
-      (define/public (sync-events)
-        (let loop ()
-          (define l (register null))
-          (apply sync/enable-break l)
-
-          (loop )))
-
-      (when nodes
-        (for ([n nodes])
-          (define n-host-name (send n get-host-name))
-          (define n-port (send n get-listen-port))
-
-          (for ([sn (in-hash-values spawned-nodes)])
-            (send sn notify-of-new-node n-host-name n-port))
-          (add-spawned-node (list n-host-name n-port) n)))
-
-
-      (super-new)
-  )))
-
-
-;socket channel
-(define (sconn-add-subchannel s ch-id ch)     (send s add-subchannel ch-id ch))
-(define (sconn-lookup-subchannel s ch-id)     (send s lookup-subchannel ch-id))
-(define (sconn-write-flush s x)               (send s _write-flush x))
-(define (sconn-remove-subchannel s scid)      (send s remove-subchannel scid))
-(define (sconn-build-forward-event s forwarder) (send s build-forward-event forwarder))
-
-(define socket-connection%
-  (backlink
-    (class* object% (event-container<%>)
-      (init-field [host #f]
-                  [port #f]
-                  [retry-times 30]
-                  [delay 1]
-                  [background-connect? #t]
-                  [in #f]
-                  [out #f]
-                  [remote-node #f])
-      (field [subchannels null]
-             [connecting #f]
-             [ch #f])
-
-      (define (forward-mesg x) 
-        (raise (format "Getting forwarded ~a" x))
-        (void))
-
-      (define (tcp-connect/retry rname rport #:times [times 10] #:delay [delay 1])
-        (let loop ([t 0])
-          (with-handlers ([exn? (lambda (e)
-                        (cond [(t . < . times)
-                               (klogger (format "try ~a waiting ~a sec to retry connection to ~a:~a" t delay rname rport))
-                               (sleep delay)
-                               (loop (add1 t))]
-                              [else (raise e)]))])
-            (tcp-connect rname (->number rport)))))
-
-      (define (ensure-connected)
-        (when connecting
-          (match (channel-get ch)
-            [(list _in _out)
-             (set! in _in)
-             (set! out _out)
-             (set! connecting #f)])))
-
-      (define (handle-error e)
-        (cond
-          [remote-node => (lambda (n)
-                                      (send n tcp-connection-died host port e))]
-          [else (raise (format "TCP connection to ~a:~a failed ~a\n" host port e))]))
-
-      (define/public (add-subchannel id pch)
-        (set! subchannels (append subchannels (list (cons id pch)))))
-      (define/public (lookup-subchannel id)
-        (match (assoc id subchannels)
-          [(cons _id _pch) _pch]
-          [else #f]))
-      (define/public (_write-flush x)
-        (when (equal? out #f) (ensure-connected))
-        ;(printf/f "SC ~a ~a\n" x out)
-        (with-handlers ([exn:fail? handle-error])
-          (write-flush x out)))
-      (define/public (remove-subchannel id)
-        (set! subchannels (filter-map
-                            (lambda (x) (and (not (= (car x) id)) x))
-                            subchannels)))
-      (define/public (addresses) (tcp-addresses in #t))
-      (define/public (build-forward-event forwarder)
-        (when (equal? out #f) (ensure-connected))
-        (wrap-evt in (lambda (e)
-                       (forwarder
-                          (with-handlers ([exn:fail? handle-error])
-                            (define r (read in))
-                            ;(printf/f "SC IN ~a\n" r)
-                            r)
-                          this))))
-
-      (define/public (read-message)
-        (when (equal? out #f) (ensure-connected))
-        (define m (read in))
-        ;(printf/f "MESSAGE ~a\n" m)
-        m)
-      (define/public (register nes)
-        (raise "Not-implemented/needed")
-        (cons (wrap-evt in void) nes))
-
-      (when (and host port background-connect?)
-        (set! connecting #t)
-        (set! ch (make-channel))
-        (thread
-          (lambda ()
-            (channel-put
-              ch
-              (call-with-values
-                (lambda () (with-handlers ([exn:fail? (lambda (e)
-                                                        (raise (format "socket error connecting to ~a:~a" host port)))])
-                             (tcp-connect/retry host port #:times retry-times #:delay delay)))
-                list)))))
-      (when (and host port (not background-connect?))
-        (tcp-connect/retry host port #:times retry-times #:delay delay))
-      (super-new)
-  )))
-
-(define place-location<%>
-  (interface* 
-   ()
-   ([prop:place-location
-     (lambda (remote-node place-path place-func named)
-       (supervise-place-at remote-node place-path place-func
-                           #:named named))])))
-
-(define remote-node%
-  (backlink
-    (class* object% (event-container<%> event<%> place-location<%>)
-      (init-field host-name)
-      (init-field listen-port)
-      (init-field [cmdline-list #f])
-      (init-field [sc #f]) ;socket-connection
-      (init-field [restart-on-exit #f])
-      (init-field [use-current-ports #f])
-      (field [sp #f]) ;spawned-process
-      (field [id 0])
-      (field [remote-places null])
-
-      (define/public (get-host-name) host-name)
-      (define/public (get-listen-port) listen-port)
-      (define/public (nextid)
-        (set! id (add1 id))
-        id)
-
-      (define (add-remote-place rp)
-        (set! remote-places (append remote-places(list rp))))
-      (define (spawn-node)
-        (and cmdline-list
-          (set! sp 
-            (if use-current-ports
-              (new spawned-process% [cmdline-list cmdline-list] [parent this]
-                   [o (current-output-port)]
-                   [e (current-error-port)])
-              (new spawned-process% [cmdline-list cmdline-list] [parent this])))))
-      (define (setup-socket-connection)
-        (set! sc (new socket-connection% [host host-name] [port listen-port] [remote-node this]))
-        (sconn-write-flush sc (dcgm DCGM-TYPE-SET-OWNER -1 -1 "")))
-      (define (restart-node)
-        (spawn-node)
-        (setup-socket-connection))
-
-      (when (and cmdline-list (not sc))
-        (spawn-node))
-      (unless sc
-        (setup-socket-connection))
-
-      (define (find-place-by-sc-id scid)
-        (for/fold ([r #f]) ([rp remote-places])
-          (if (= (send rp get-sc-id) scid)
-            rp
-            r)))
-
-      (define (get-sp-pid)
-        (cond
-          [sp (send sp get-pid)]
-          [else 'failed-to-launch ]))
-
-      (define (on-socket-event it in-port)
-        (match it
-          [(dcgm 7 #;(== DCGM-DPLACE-DIED) -1 -1 ch-id)
-            (klogger (format "SPAWNED-PROCESS:~a PLACE DIED ~a:~a:~a" (get-sp-pid) host-name listen-port ch-id))
-            (cond
-              [(find-place-by-sc-id ch-id) => (lambda (rp)
-                                                (send rp place-died))]
-              [else (raise (format "remote-place for sc-id ~a not found\n" ch-id))])]
-          [(dcgm 4 #;(== DCGM-TYPE-INTER-DCHANNEL) _ ch-id msg)
-            (define pch (sconn-lookup-subchannel sc ch-id))
-            ;(printf/f "44 ~a ~a ~a ~a\n" in-port ch-id pch msg)
-            (match pch
-              [#f (raise (format "Unknown channel ch-id ~a in message ~a" ch-id it))]
-              [else
-                (cond
-                  [(place-channel? pch)
-                    (place-channel-put pch msg)]
-                  [(is-a? pch connection%)
-                   (send pch forward msg)]
-                  [(th-place-channel? pch)
-                   (th-place-channel-put pch msg)]
-                  [(async-bi-channel? pch)
-                   (async-bi-channel-put pch msg)]
-                  [else (raise (format "Unexpected channel type ~a" pch))])])]
-          [(dcgm 8 #;(== DCGM-TYPE-LOG-TO-PARENT) _ _ (list severity msg))
-            (define parent (send this get-router))
-            (cond
-              [parent
-                (send parent log-from-child #:severity severity msg)]
-              [else (format-log-message severity msg)])]
-
-          [(? eof-object?)
-           (define-values (lh lp rh rp) (send sc addresses))
-           (klogger (format "EOF on node socket connection pid to ~a ~a:~a CONNECTION ~a:~a -> ~a:~a" (get-sp-pid) host-name listen-port lh lp rh rp))
-           (set! sc #f)]
-
-          [else (klogger (format"received message ~a from ~a" it in-port))]))
-
-      (define/public (get-log-prefix) (format "PLACE ~a:~a" host-name listen-port))
-      (define/public (tcp-connection-died host port e)
-        (klogger (format "TCP connection ~a:~a died, ~a, restarting node/connection" host-name listen-port e))
-        (and sp (send sp kill))
-        (set! sp #f)
-        (cond
-          [cmdline-list (process-died null)]
-          [restart-on-exit
-            (if (equal? restart-on-exit #t)
-                (restart-node)
-                (send restart-on-exit restart restart-node))]
-          [else
-            (klogger (format "No restart condition for ~a" (get-log-prefix)))]))
-
-      (define/public (process-died child)
-        (klogger (format "Remote node pid ~a ~a:~a died" (get-sp-pid) host-name listen-port))
-        (set! sp #f)
-        (cond
-          [restart-on-exit
-            (cond
-              [cmdline-list
-                (if (equal? restart-on-exit #t)
-                    (restart-node)
-                    (send restart-on-exit restart restart-node))]
-              [else
-                (klogger (format "No restart cmdline arguments for ~a" (get-log-prefix)))])]
-          [else
-            (klogger (format "No restart condition for ~a" (get-log-prefix)))]))
-
-      (define/public (get-first-place)
-        (car remote-places))
-      (define/public (get-first-place-channel)
-        (send (car remote-places) get-channel))
-
-      (define/public (drop-sc-id scid)
-        (sconn-remove-subchannel sc scid))
-
-      (define/public (launch-place place-exec #:restart-on-exit [restart-on-exit #f] #:one-sided-place? [one-sided-place? #f])
-        (define rp (new remote-connection% [node this] [place-exec place-exec] [restart-on-exit restart-on-exit]
-                        [one-sided one-sided-place?]))
-        (add-remote-place rp)
-        rp)
-
-      (define/public (remote-connect name #:restart-on-exit [restart-on-exit #f] #:one-sided [one-sided #f])
-        (define rp (new remote-connection% [node this] [name name] [restart-on-exit restart-on-exit]
-                        [one-sided one-sided]))
-        (add-remote-place rp)
-        rp)
-
-      (define/public (connect-channel src-id name #:restart-on-exit [restart-on-exit #f] #:one-sided [one-sided #f])
-        (define rp (new remote-connection% [node this] [name name] [src-id src-id] [restart-on-exit restart-on-exit]
-                        [one-sided one-sided]))
-        (add-remote-place rp)
-        rp)
-
-      (define/public (spawn-remote-connection msg-gen dch)
-        (define ch-id (nextid))
-        (sconn-add-subchannel sc ch-id dch)
-        (sconn-write-flush sc (msg-gen ch-id))
-        (new place-socket-bridge% [pch dch] [sch sc] [id ch-id] [node this]))
-
-      (define/public (send-exit)
-        (sconn-write-flush sc (dcgm DCGM-TYPE-DIE -1 -1 "DIE")))
-
-      (define/public (wait-for-die)
-        (send sp wait-for-die))
-
-      (define/public (register es)
-        (let* ([es (if sp (send sp register es) es)]
-               [es (for/fold ([nes es]) ([rp remote-places])
-                             (send rp register nes))]
-               [es (if sc (cons (sconn-build-forward-event sc on-socket-event) es) es)]
-               [es (if (and restart-on-exit
-                            (not (equal? restart-on-exit #t)))
-                       (send restart-on-exit register es)
-                       es)])
-          es))
-
-      (define/public (notify-of-new-node node-name node-port)
-        (sconn-write-flush sc (dcgm DCGM-NEW-NODE-CONNECT -1 -1 (list node-name node-port))))
-
-      (super-new)
-      )))
-
-(define (node-send-exit node) (send node send-exit))
-(define (node-get-first-place node) (send node get-first-place))
-(define (distributed-place-wait p) (send p place-wait))
-
-(define remote-connection%
-  (backlink
-    (class*
-      object% (event-container<%> place<%> event<%>)
-      (init-field node)
-      (init-field [place-exec #f])
-      (init-field [name #f])
-      (init-field [src-id #f])
-      (init-field [one-sided #f])
-      (init-field [restart-on-exit #f])
-      (init-field [on-channel #f])
-      (init-field [on-channel/2 #f])
-      (field [psb #f])
-      (field [pc #f])
-      (field [rpc #f])
-      (field [running #f])
-      (field [k #f])
-
-      (unless (or place-exec name)
-        (raise "for new places place-exec must be set, for named-place connections the named argument must be supplied"))
-      (when (and place-exec name)
-        (raise "only one of the place-exec or the named arguements can be set at a time."))
-      (when (and name restart-on-exit)
-        (raise "named place connections that restart on exit are not possible"))
-
-      (cond
-        [one-sided
-          (set! rpc one-sided)]
-        [else
-          (define-values (pch1 pch2) (place-channel))
-          (set! rpc pch1)
-          (set! pc pch2)])
-
-      (set! psb
-        (send node spawn-remote-connection 
-              (cond
-                [place-exec (lambda (ch-id) (dcgm DCGM-TYPE-NEW-PLACE -1 place-exec ch-id))]
-                [src-id     (lambda (ch-id) (dcgm DCGM-TYPE-NEW-PLACE -1 (list 'channel-connect name src-id) ch-id))]
-                [else       (lambda (ch-id) (dcgm DCGM-TYPE-NEW-PLACE -1 (list 'connect name) ch-id))])
-              rpc))
-
-      (define (restart-place)
-        (send node drop-sc-id (send psb get-sc-id))
-        (set! psb (send node spawn-remote-connection (lambda (ch-id) (dcgm DCGM-TYPE-NEW-PLACE -1 place-exec ch-id)) rpc)))
-
-      (define/public (stop) (void))
-      (define/public (get-channel) pc)
-      (define/public (set-on-channel! proc) (set! on-channel proc))
-      (define/public (get-sc-id) (send psb get-sc-id))
-      (define/public (set-handle-channel! x) (set! on-channel x))
-      (define/public (place-died)
-        (cond
-          [restart-on-exit
-                (cond 
-                  [(equal? restart-on-exit #t) (restart-place)]
-                  [(procedure? restart-on-exit) (restart-on-exit)]
-                  [else (send restart-on-exit restart restart-place)])]
-          [else
-            (klogger (format "No restart condition for ~a:~a"
-                    (send node get-log-prefix)
-                    (send psb get-sc-id)))]))
-      (define (on-channel-event e)
-        (klogger (format "~a ~a" (send node get-log-prefix) e)))
-      (define/public (register es)
-        (let* ([es (if pc (cons (wrap-evt pc
-                                            (cond
-                                              [k
-                                               (lambda (e)
-                                                 (call-in-message-router (lambda ()
-                                                   (begin0
-                                                     (k e)
-                                                     (set! k #f)))))]
-                                              [on-channel/2
-                                                (lambda (e)
-                                                  (on-channel/2 pc e))]
-                                              [on-channel on-channel]
-                                              [else
-                                               on-channel-event])) es) es)]
-               [es (send psb register es)]
-               [es (if (and restart-on-exit
-                            (not (equal? restart-on-exit #t))
-                            (not (procedure? restart-on-exit)))
-                       (send restart-on-exit register es)
-                       es)])
-          es))
-      (define/public (set-continuation _k) (set! k _k))
-
-      (define/public (get-raw-msg) (send psb get-raw-msg))
-      (define/public (get-msg)
-        (call-with-composable-continuation
-          (lambda (_k)
-            (set! k _k)
-            (abort-current-continuation (default-continuation-prompt-tag) void))))
-      (define/public (put-msg msg) (send psb put-msg msg))
-      (define/public (place-wait)
-        (send psb wait-to-die))
-
-      (super-new)
-      )))
-
-(define place%
-  (backlink
-    (class*
-      object% (event-container<%>)
-      (init-field place-exec
-                  ch-id
-                  sc
-                  node)
-      (field [pd #f])
-      (field [psb #f])
-      (field [running #f])
-      (define (default-on-place-dead e)
-        (set! pd #f)
-        ;drain operation might be needed if sync returns dead place evt before ready place channel
-        ;(send psb drain-place-channel)
-        ;(set! psb #f)
-        (sconn-write-flush sc (dcgm DCGM-DPLACE-DIED -1 -1 ch-id))
-        (sconn-remove-subchannel sc ch-id))
-
-      (init-field [on-place-dead default-on-place-dead])
-
-      (set! pd
-        (match place-exec
-          ;place% is a named place
-          [(list 'dynamic-place place-path place-func name)
-            (dynamic-place (->module-path place-path) place-func)]
-          [(list 'place place-path place-func name)
-            ((dynamic-require (->module-path place-path) place-func))]
-          ;place% is a single connected place
-          [(list 'dynamic-place place-path place-func)
-            (dynamic-place (->module-path place-path) place-func)]
-          [(list 'place place-path place-func)
-            ((dynamic-require (->module-path place-path) place-func))]
-          [(list 'thread place-path place-func)
-           (define-values (ch1 ch2) (th-place-channel))
-           (define th
-             (thread
-               (lambda ()
-                 ((dynamic-require (->module-path place-path) place-func) ch1))))
-           (th-place th ch2 null)]))
-
-      (sconn-add-subchannel sc ch-id pd)
-      (set! psb (new place-socket-bridge% [pch pd] [sch sc] [id ch-id] [node node]))
-      (define/public (get-channel) pd)
-      (define/public (stop)
-        (cond
-          [(place? pd)
-            (place-kill pd)
-            (set! pd #f)]
-          [(th-place? pd)
-           (th-place-kill pd)]
-          [else (void)])) ;send place not running message
-
-      (define/public (register es)
-        (let* ([es (if pd (cons (wrap-evt
-                                  (cond
-                                    [(place? pd) (place-dead-evt pd)]
-                                    [(th-place? pd) (th-place-dead-evt pd)]) on-place-dead)
-                                es) es)]
-               [es (if psb (send psb register es) es)])
-          es))
-      (super-new)
-      )))
-
-(define connection%
-  (backlink
-    (class*
-      object% (event-container<%>)
-      (init-field name-pl
-                  ch-id
-                  sc
-                  node
-                  [channel-connection #f]
-                  [on-place-dead #f])
-      (field [psb #f])
-
-      (define-values (pch1 pch2) (place-channel))
-
-      (define forward-ch 
-        (if channel-connection
-            pch1
-            (send name-pl get-channel)))
-
-      (define control-ch 
-        (if channel-connection
-            (send name-pl get-channel)
-            #f))
-
-
-      (sconn-add-subchannel sc ch-id this)
-      (set! psb (new place-socket-bridge% [pch pch1] [sch sc] [id ch-id] [node node]))
-      
-      (when channel-connection
-        (place-channel-put control-ch (list channel-connection pch2)))
-
-      (define/public (forward msg)
-        (place-channel-put forward-ch 
-                           (if channel-connection
-                               msg
-                               (list msg pch2))))
-
-      (define/public (put msg)
-        (sconn-write-flush sc (dcgm DCGM-TYPE-INTER-DCHANNEL ch-id ch-id msg)))
-      (define/public (register es) (send psb register es))
-
-      (super-new)
-      )))
-
-(define respawn-and-fire%
-  (backlink
-    (class*
-      object% (event-container<%>)
-      (init-field seconds)
-      (init-field thunk)
-      (field [fire-time (current-inexact-milliseconds)])
-
-      (define/public (register es)
-        (if fire-time
-          (cons
-            (wrap-evt (alarm-evt fire-time)
-                        (lambda (x)
-                          (set! fire-time (+ (current-inexact-milliseconds) (* seconds 1000)))
-                          (call-in-message-router  thunk)))
-            es)
-          es))
-
-      (super-new)
-      )))
-
-(define after-seconds%
-  (backlink
-    (class*
-      object% (event-container<%>)
-      (init-field seconds)
-      (init-field thunk)
-      (init-field [fire-time (+ (current-inexact-milliseconds) (* seconds 1000))])
-
-      (define/public (register es)
-        (if fire-time
-          (cons
-            (wrap-evt (alarm-evt fire-time)
-                        (lambda (x)
-                          (set! fire-time #f)
-                          (call-in-message-router thunk)))
-            es)
-          es))
-
-      (super-new)
-      )))
-
-(define restarter%
-    (class*
-      after-seconds% (event-container<%>)
-      (inherit-field seconds thunk fire-time)
-      (init-field [retry #f])
-      (init-field [on-final-fail #f])
-      (super-new [fire-time #f] [thunk #f])
-      (init-field [retry-reset (* 2 seconds)])
-      (field [last-attempt 0])
-      (field [retries 0])
-      (define/public (restart restart-func)
-        (cond
-          [(and retry (>= retries retry))
-           (klogger (format "Already retried to restart ~a times" retry))
-           (and on-final-fail (on-final-fail))]
-          [(> (- (current-inexact-milliseconds) last-attempt) (* seconds 1000))
-           (when (> (- (current-inexact-milliseconds) last-attempt) (* retry-reset 1000))
-             (set! retries 0))
-           (set! last-attempt (current-inexact-milliseconds))
-           (set! retries (+ 1 retries))
-           (set! fire-time #f)
-           (restart-func)]
-          [else
-            (set! thunk (lambda () (restart restart-func)))
-            (set! fire-time (+ (current-inexact-milliseconds) (* seconds 1000)))]))
-      ))
-
-(define on-exit%
-  (class*
-    object% ()
-    (init-field thunk)
-    (define/public (restart restart-func)
-      (thunk))))
-
-
-
-(define (startup-config conf conf-idx)
-  (start-node-router
-    (cond
-      ;master
-      [(= 0 conf-idx)
-        (define t-n-c (total-node-count conf))
-        (define cv (make-vector t-n-c null))
-        (build-down (node-config-node-port (first conf)) cv conf 0)
-        cv]
-      ;slave
-      [else
-        (listen/init-channels (node-config-node-port (list-ref conf conf-idx)))])))
-
-;; Contract: build-down : port channel-vector conf conf-idx -> (void)
-;;
-;; Purpose: build up channel-vector by connecting to nodes greater than my-id
-;;
-;; Example: (build-down 6432 channel-vector conf 0)
-;;
-(define (build-down port cv conf conf-idx)
-  (define t-n-c (total-node-count conf))
-  (match-define (node-config node-name _ node-cnt _ _ _ modpath funcname config-path confname) (list-ref conf conf-idx))
-  (define (isself? rid) (equal? rid conf-idx))
-
-  (for/fold ([my-id #f]
-             [next-node-id 0])
-            ([item conf]
-             [curr-conf-idx (in-naturals)])
-    (match-define (node-config rname rport rcnt _ _ _ modpath funcname conf-path confname) item)
-
-    (define (loopit my-id)
-      (values my-id (+ next-node-id rcnt)))
-    (define (remote-spawn)
-      (define sp (new socket-connection% [host rname] [port rport]))
-      (define msg (list my-id node-name node-cnt curr-conf-idx next-node-id rname rcnt conf))
-      (sconn-write-flush sp msg)
-      (for ([i (in-range rcnt)])
-        (vector-set! cv (+ next-node-id i) sp))
-      (loopit my-id))
-    (define (local-spawn)
-      (for ([i (in-range rcnt)])
-        (define sp (dynamic-place (->path modpath) funcname))
-        (vector-set! cv (+ next-node-id i) sp)
-        (place-channel-put sp (list (+ next-node-id i) t-n-c)))
-      (loopit next-node-id))
-
-   (cond
-     [my-id  (remote-spawn)]
-     [(isself? curr-conf-idx) (local-spawn)]
-     [(not my-id) (loopit my-id)])))
-
-
-;; Contract: listen/init-channels : port -> VectorOf[ socket-connection%]
-;;
-;; Purpose: build up channel-vector by listening for connect requests for nodes less than
-;; myid. Spawn thread to build channel-vector by connecting to nodes greater than myid.
-;;
-;; Example: (listen/init-channels 6432)
-;;
-;; Node 1  Node 2  Node 3
-;; 1 2     3 4     5 6
-;;
-;;
-(define (listen/init-channels port)
-  (define listener (tcp-listen (->number port) 4 #t))
-  (let loop ([cnt #f]
-             [thr #f]
-             [cv #f])
-    (define-values (in out) (tcp-accept listener))
-    (define sp (new socket-connection% [in in] [out out]))
-    (match-define (list sid sname scnt myidx myid myname mycnt conf) (read in))
-    ;(printf "Listen ~a\n" (list sid sname scnt myidx myid myname mycnt conf))
-    (let*
-      ([cnt (or cnt (- myidx 1))]
-       [cv  (or cv  (make-vector (total-node-count conf) null))]
-       [thr (or thr (thread (lambda () (build-down port cv conf myidx))))])
-
-      (for ([i (in-range scnt)])
-        (vector-set! cv (+ sid i) sp))
-
-      (if (= 0 cnt)
-        (begin (thread-wait thr) cv)
-        (loop (sub1 cnt) thr cv)))))
-
-(define (supervise-process-at host
-                            #:listen-port [listen-port DEFAULT-ROUTER-PORT]
-                            #:restart-on-exit [restart-on-exit #f]
-                            . command-line-list)
-  (new spawned-process% [cmdline-list command-line-list]))
-
-(define (mk-place-creation-addr place-path place-func name thunk)
-  (list* (if thunk 'place 'dynamic-place) 
-         (->writeable-module-path place-path) 
-         place-func 
-         (if name (list (->string name)) null)))
-
-(define (spawn-node-with-place-at host place-path place-func #:listen-port [listen-port DEFAULT-ROUTER-PORT]
-                            #:initial-message [initial-message #f]
-                            #:racket-path [racketpath (racket-path)]
-                            #:ssh-bin-path [sshpath (ssh-bin-path)]
-                            #:distributed-launch-path [distributedlaunchpath #f]
-                            #:restart-on-exit [restart-on-exit #f]
-                            #:named [named #f]
-                            #:thunk [thunk #f])
-    (define-values (node pl)
-      (spawn-node-supervise-place-at/exec host 
-                            (mk-place-creation-addr (->writeable-module-path place-path) place-func #f thunk) 
-                            #:listen-port listen-port
-                            #:initial-message initial-message
-                            #:racket-path racketpath
-                            #:ssh-bin-path sshpath
-                            #:distributed-launch-path distributedlaunchpath
-                            #:restart-on-exit restart-on-exit))
-    node)
-
-(define (spawn-node-supervise-place-at host place-path place-func #:listen-port [listen-port DEFAULT-ROUTER-PORT]
-                            #:initial-message [initial-message #f]
-                            #:racket-path [racketpath (racket-path)]
-                            #:ssh-bin-path [sshpath (ssh-bin-path)]
-                            #:distributed-launch-path [distributedlaunchpath #f]
-                            #:restart-on-exit [restart-on-exit #f]
-                            #:named [named #f]
-                            #:thunk [thunk #f])
-    (spawn-node-supervise-place-at/exec host 
-                            (mk-place-creation-addr (->writeable-module-path place-path) place-func #f thunk) 
-                            #:listen-port listen-port
-                            #:initial-message initial-message
-                            #:racket-path racketpath
-                            #:ssh-bin-path sshpath
-                            #:distributed-launch-path distributedlaunchpath
-                            #:restart-on-exit restart-on-exit))
-
-(define (spawn-node-supervise-place-at/exec host place-exec #:listen-port [listen-port DEFAULT-ROUTER-PORT]
-                            #:initial-message [initial-message #f]
-                            #:racket-path [racketpath (racket-path)]
-                            #:ssh-bin-path [sshpath (ssh-bin-path)]
-                            #:distributed-launch-path [distributedlaunchpath #f]
-                            #:restart-on-exit [restart-on-exit #f])
-  (define node (spawn-remote-racket-node host
-                            #:listen-port listen-port
-                            #:racket-path racketpath
-                            #:ssh-bin-path sshpath
-                            #:distributed-launch-path distributedlaunchpath))
-  (define dp
-    (send node launch-place
-        place-exec
-        ;#:initial-message initial-message
-        #:restart-on-exit restart-on-exit
-        ))
-
-  (values node dp))
-
-(define (message-router #:node [_nc #f] #:listen-port [listen-port DEFAULT-ROUTER-PORT] . event-containers)
-  (define listener (tcp-listen listen-port 4 #t))
-  (define nc (or _nc (new node% [listen-port listener])))
-  (for ([ec event-containers])
-    (send nc add-sub-ec ec)
-    (send ec backlink nc))
-  (send nc sync-events))
-
-
-(define (spawn-remote-racket-node host #:listen-port [listen-port DEFAULT-ROUTER-PORT]
-                                       #:racket-path [racketpath (racket-path)]
-                                       #:ssh-bin-path [sshpath (ssh-bin-path)]
-                                       #:distributed-launch-path [distributedlaunchpath #f]
-                                       #:use-current-ports [use-current-ports #f])
-  (new remote-node%
-       [host-name host]
-       [listen-port listen-port]
-       [cmdline-list (if distributedlaunchpath
-                       (list sshpath host racketpath "-tm" distributedlaunchpath "spawn" (->string listen-port))
-                       (list sshpath host racketpath "-lm racket/place/distributed/launch spawn" (->string listen-port)))]
-       [use-current-ports use-current-ports]))
-
-(define (create-place-node host #:listen-port [listen-port DEFAULT-ROUTER-PORT]
-                                       #:racket-path [racketpath (racket-path)]
-                                       #:ssh-bin-path [sshpath (ssh-bin-path)]
-                                       #:distributed-launch-path [distributedlaunchpath #f]
-                                       #:use-current-ports [use-current-ports #t])
-  (spawn-remote-racket-node host
-                            #:listen-port listen-port
-                            #:racket-path racketpath
-                            #:ssh-bin-path sshpath
-                            #:distributed-launch-path distributedlaunchpath
-                            #:use-current-ports use-current-ports))
-
-(define (supervise-place-at remote-node place-path place-func
-                            ;;#:initial-message [initial-message #f]
-                            #:restart-on-exit [restart-on-exit #f]
-                            #:named [named #f]
-                            #:thunk [thunk #f])
-  
-  (send remote-node launch-place 
-        (mk-place-creation-addr place-path place-func named thunk)
-        #:restart-on-exit restart-on-exit
-        ;#:initial-message initial-message
-        ))
-
-(define (supervise-thread-at remote-node place-path place-func)
-  (send remote-node launch-place (list 'thread (->writeable-module-path place-path) place-func)))
-
-(define-syntax-rule (every-seconds _seconds _body ...)
-  (new respawn-and-fire% [seconds _seconds] [thunk (lambda () _body ...)]))
-
-(define-syntax-rule (after-seconds _seconds _body ...)
-  (new after-seconds% [seconds _seconds] [thunk (lambda () _body ...)]))
-
-;; -> node name -> 
-(define (connect-to-named-place node name)
-  (send node remote-connect name))
-
-(define (restart-every seconds #:retry [retry #f] #:on-fail-email [fail-email-address #f]
-                       #:on-final-fail [on-final-fail #f])
-  (new restarter% [seconds seconds] [retry retry]
-       [on-final-fail on-final-fail]))
-
-(define (on-place-exit thunk)
-  (new (on-exit% [thunk thunk])))
-
-(define (log-message severity msg)
-  (dcgm DCGM-TYPE-LOG-TO-PARENT -1 -1 (list severity msg)))
-
-;;
-;; API Version 3
-;;
-
-;;;(define (start-message-router/place #:listen-port [listen-port DEFAULT-ROUTER-PORT])
-;;;  (define mr
-;;;    (place ch
-;;;      (match (place-channel-get ch)
-;;;             [(list listen-port)
-;;;              (define listener (tcp-listen listen-port 4 #t))
-;;;              (define mrn (new node% [listen-port listener]
-;;;                                     [chan-vec (vector ch)]))
-;;;              (send mrn sync-events)])))
-;;;  (place-channel-put mr (list listen-port)))
-(define (*channel? ch)
-  (or (place-channel? ch)
-      (async-bi-channel? ch)
-      (channel? ch)
-      (is-a? ch remote-connection%)))
-
-(define (*channel-put ch msg)
-  (cond
-    [(is-a? ch remote-connection%) (send ch put-msg msg)]
-    [(place-channel? ch) (place-channel-put ch msg)]
-    [(async-bi-channel? ch) (async-bi-channel-put ch msg)]
-    [(channel? ch) (channel-put ch msg)]
-    [else (raise (format "unknown channel type ~a" ch))]))
-
-(define (*channel-get ch)
-  (cond
-    [(is-a? ch remote-connection%) 
-     (cond
-       [(continuation-mark-set-first #f in-message-router-mark)
-         (send ch get-msg)]
-       [else
-         (send ch get-raw-msg)])]
-    [(place-channel? ch) (place-channel-get ch)]
-    [(async-bi-channel? ch) (async-bi-channel-get ch)]
-    [(channel? ch) (channel-get ch)]
-    [else (raise (format "unknown channel type ~a" ch))]))
-
-(define/provide (mr-spawn-remote-node mrch host #:listen-port [listen-port DEFAULT-ROUTER-PORT]
-                                      #:solo [solo #f])
-  (*channel-put mrch (dcgm DCGM-CONTROL-NEW-NODE -1 solo (list host listen-port))))
-
-(define/provide (mr-supervise-named-dynamic-place-at mrch dest name path func)
-  (*channel-put mrch (dcgm DCGM-CONTROL-NEW-PLACE dest -1 (list 'dynamic-place path func name))))
-
-(define/provide (mr-connect-to mrch dest name)
-  (define-values (ch1 ch2)
-    (cond
-      [(channel? mrch) (make-async-bi-channel)]
-      [(place-channel? mrch) (place-channel)]
-      [else (raise (format "Unexpected channel type6 ~a" mrch))]))
-  (*channel-put mrch (dcgm DCGM-CONTROL-NEW-CONNECTION dest -1 (list name ch2)))
-  ch1)
-
-(define (port-no? x)  
-  (and (exact-nonnegative-integer? x)
-                ((integer-in 0 65535) x)))
-
-(define/provide (start-message-router/thread #:listen-port [listen-port DEFAULT-ROUTER-PORT]
-                                             #:nodes [nodes null])
-  (define ch (make-channel))
-  (define mr
-    (thread
-      (lambda ()
-        (define listener (tcp-listen listen-port 4 #t))
-        (define mrn (new node% [listen-port listener]
-                               [nodes nodes]
-                               [chan-vec (vector ch)]))
-        (send mrn sync-events))))
-  (values mr ch))
-
-(define (spawn-node-at host #:listen-port [listen-port DEFAULT-ROUTER-PORT]
-                            #:racket-path [racketpath (racket-path)]
-                            #:ssh-bin-path [sshpath (ssh-bin-path)]
-                            #:distributed-launch-path [distributedlaunchpath #f])
-
-  (define ch (make-channel))
-  (thread
-    (lambda () 
-      (with-handlers ([exn:fail? (lambda (e) (channel-put #f))])
-        (channel-put ch (spawn-remote-racket-node host #:listen-port listen-port
-                                                       #:racket-path racketpath
-                                                       #:ssh-bin-path sshpath
-                                                       #:distributed-launch-path distributedlaunchpath)))))
-  ch)
-
-(define/provide (spawn-nodes/join nodes-descs)
-  (for/list ([x
-               (for/list ([n nodes-descs])
-                 (apply keyword-apply spawn-node-at n))])
-    (unless x
-      (raise "Failed to connect to a remotely spawned node"))
-    (channel-get x)))
-
-#;(define build-node-args
-  (make-keyword-procedure (lambda (kws kw-args . rest)
-                            (list kws kw-args rest))))
-
-(define/provide (spawn-nodes/join/local nodes-descs)
-    (spawn-nodes/join
-      (for/list ([c nodes-descs])
-        (match-define (list-rest host port _rest) c)
-        (define rest 
-          (cond 
-            [(null? _rest)
-             (list (make-immutable-hash (list (cons "listen-port" port))))]
-            [else
-              (list
-                (hash-set (car _rest) "listen-port" port))]))
-        (define-values (k v) 
-          (let loop ([keys (list "racket-path" "listen-port" "distributed-launch-path")]
-                     [k null]
-                     [v null])
-            (cond 
-             [(pair? keys)
-              (cond
-                [(hash-ref (car rest) (car keys) #f) => (lambda (x) 
-                  (loop (cdr keys)
-                        (cons (string->keyword (car keys)) k)
-                        (cons x v)))]
-                [else
-                  (loop (cdr keys) k v)])]
-             [else
-               (values k v)])))
-        (list k v (list host)))))
-
-(define named-place-typed-channel%
-  (class*
-    object% ()
-    (init-field ch)
-    (field [msgs null])
-    (define/public (get-evt type)
-      (cond
-        [(has-type type) => (lambda (x)
-                              (wrap-evt always-evt (lambda (e) x)))]
-        [else
-          (wrap-evt ch (lambda (v)
-                         (set! msgs (append msgs (list v)))
-                         (cond 
-                           [(has-type type) => (lambda (x) x)]
-                           [else #f])))]))
-                     
-    (define (has-type type)
-      (let loop ([l msgs]
-                 [nl null])
-        (cond
-          [(null? l) #f]
-          [(equal? type (caaar l))
-           (set! msgs (append (reverse nl) (cdr l)))
-           (car l)]
-          [else
-           (loop (cdr l) (cons (car l) nl))])))
-
-    (define/public (get type)
-      (let loop ([l msgs]
-                 [nl null])
-        (cond
-          [(null? l)
-           (define nm (place-channel-get ch))
-           (set! msgs (append msgs (list nm)))
-           (loop msgs null)]
-          [(equal? type (caaar l))
-           (set! msgs (append (reverse nl) (cdr l)))
-           (car l)]
-          [else
-           (loop (cdr l) (cons (car l) nl))])))
-    (super-new)
-    ))
-
-(define (tc-get type ch) (send ch get type))
-
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/hello-world.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/hello-world.rkt
deleted file mode 100644
index 9e1ad97169..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/hello-world.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-(require racket/place/distributed
-         racket/place)
-
-(provide hello-world)
-
-(define (hello-world)
-  (place ch
-    (printf "hello-world received: ~a\n" 
-            (place-channel-get ch))
-    (define HW "Hello World")
-    (place-channel-put ch (format "~a\n" HW))
-    (printf "hello-world sent: ~a\n" HW)))
-
-
-(module+ main
-  (define-values (node pl)
-    (spawn-node-supervise-place-at 
-      "localhost"
-      #:listen-port 6344
-      (quote-module-path "..")
-      'hello-world
-      #:thunk #t))
-
-  (message-router
-    node
-    (after-seconds 2
-      (*channel-put pl "Hello")
-      (printf "message-router received: ~a\n" (*channel-get pl)))
-
-    (after-seconds 6 
-      (exit 0))))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/logging/bank.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/logging/bank.rkt
deleted file mode 100644
index 824416d9b3..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/logging/bank.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/place/define-remote-server)
-
-(define-remote-server
-  bank
-
-  (define-state accounts (make-hash))
-  (define-rpc (new-account who)
-     (match (hash-has-key? accounts who)
-       [#t '(already-exists)]
-       [else
-         (hash-set! accounts who 0)
-         (log-to-parent #:severity 'debug (format "Logging new account for ~a" who))
-         (list 'created who)]))
-  (define-rpc (removeM who amount)
-     (cond
-       [(hash-ref accounts who (lambda () #f)) =>
-          (lambda (balance)
-            (cond [(<= amount balance)
-                   (define new-balance (- balance amount))
-                   (hash-set! accounts who new-balance)
-                   (list 'ok new-balance)]
-                  [else
-                    (list 'insufficient-funds balance)]))]
-       [else
-         (list 'invalid-account who)]))
-  (define-rpc (add who amount)
-    (cond
-       [(hash-ref accounts who (lambda () #f)) =>
-          (lambda (balance)
-            (define new-balance (+ balance amount))
-            (hash-set! accounts who new-balance)
-            (list 'ok new-balance))]
-       [else
-         (list 'invalid-account who)])))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/logging/master.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/logging/master.rkt
deleted file mode 100644
index 1cec5bf0ef..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/logging/master.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-(require racket/place/distributed
-         racket/class
-         racket/place
-         racket/runtime-path
-         "bank.rkt"
-         "tuple.rkt")
-(define-runtime-path bank-path "bank.rkt")
-(define-runtime-path tuple-path "tuple.rkt")
-
-(provide main)
-
-(define (main)
-  (define remote-node (spawn-remote-racket-node "localhost" #:listen-port 6344))
-  (define tuple-place (supervise-place-at remote-node tuple-path 'make-tuple-server #:named 'tuple-server))
-  (define bank-place  (supervise-place-at remote-node bank-path 'make-bank))
-
-  (message-router
-    remote-node
-    (after-seconds 4
-      (displayln (bank-new-account bank-place 'user1))
-      (displayln (bank-add bank-place 'user1 10))
-      (displayln (bank-removeM bank-place 'user1 5)))
-
-    (after-seconds 2
-      (define c (connect-to-named-place remote-node 'tuple-server))
-      (define d (connect-to-named-place remote-node 'tuple-server))
-      (displayln (tuple-server-set c "user0" 100))
-      (displayln (tuple-server-set d "user2" 200))
-      (displayln (tuple-server-get c "user0"))
-      (displayln (tuple-server-get d "user2"))
-      (displayln (tuple-server-get d "user0"))
-      (displayln (tuple-server-get c "user2")))
-    (after-seconds 6
-      (node-send-exit remote-node))
-    (after-seconds 8
-      (exit 0))))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/logging/tuple.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/logging/tuple.rkt
deleted file mode 100644
index 41565682ab..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/logging/tuple.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/place/define-remote-server)
-
-(define-named-remote-server
- tuple-server
-
-  (define-state h (make-hash))
-  (define-rpc (set k v)
-    (hash-set! h k v)
-    (log-to-parent #:severity 'debug (format "~a set to ~a" k v))
-    v)
-  (define-rpc (get k)
-    (hash-ref h k #f)))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/bank.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/bank.rkt
deleted file mode 100644
index c1cef20b3f..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/bank.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/place/define-remote-server)
-
-(define-remote-server
-  bank
-
-  (define-state accounts (make-hash))
-  (define-rpc (new-account who)
-     (match (hash-has-key? accounts who)
-       [#t '(already-exists)]
-       [else
-         (hash-set! accounts who 0)
-         (list 'created who)]))
-  (define-rpc (removeM who amount)
-     (cond
-       [(hash-ref accounts who (lambda () #f)) =>
-          (lambda (balance)
-            (cond [(<= amount balance)
-                   (define new-balance (- balance amount))
-                   (hash-set! accounts who new-balance)
-                   (list 'ok new-balance)]
-                  [else
-                    (list 'insufficient-funds balance)]))]
-       [else
-         (list 'invalid-account who)]))
-  (define-rpc (add who amount)
-    (cond
-       [(hash-ref accounts who (lambda () #f)) =>
-          (lambda (balance)
-            (define new-balance (+ balance amount))
-            (hash-set! accounts who new-balance)
-            (list 'ok new-balance))]
-       [else
-         (list 'invalid-account who)])))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/master.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/master.rkt
deleted file mode 100644
index 5307cc6ee5..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/master.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-(require racket/place/distributed
-         racket/class
-         racket/place
-         racket/runtime-path
-         "bank.rkt"
-         syntax/location)
-
-
-(define-runtime-path bank-path "bank.rkt")
-(define-runtime-path place-worker-path "place-worker.rkt")
-(define-runtime-path process-worker-path "process-worker.rkt")
-
-(provide main
-         wait-place-thunk)
-
-(define (spawn-place-worker-at port message)
-  (spawn-node-with-place-at "localhost" #:listen-port port place-worker-path 'place-worker #:initial-message message #:restart-on-exit #f))
-
-(define (wait-place-thunk)
-  (place ch
-    (printf "BEGINING SLEEP\n")
-    (sleep 5)
-    (printf "SLEEP DONE\n")))
-
-
-(define (main)
-  (define bank-node (spawn-node-with-place-at "localhost" #:listen-port 6344 bank-path 'make-bank))
-  (define bank-place (send bank-node get-first-place))
-  (message-router
-    (spawn-place-worker-at 6341 "ONE")
-    (spawn-place-worker-at 6342 "TWO")
-    (spawn-place-worker-at 6343 "THREE")
-    bank-node
-    (spawn-node-with-place-at "localhost" #:listen-port 6345 #:thunk #t (quote-module-name) 'wait-place-thunk #:restart-on-exit #t)
-    (every-seconds 3.3 (printf "Hello from every-seconds\n") (flush-output))
-    (after-seconds 2
-      (displayln (bank-new-account bank-place 'user0))
-      (displayln (bank-add bank-place 'user0 10))
-      (displayln (bank-removeM bank-place 'user0 5)))
-    ))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/place-worker.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/place-worker.rkt
deleted file mode 100644
index b2ee4ce671..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/multiple/place-worker.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-(require racket/place)
-
-(provide place-worker
-         main)
-
-(define (place-worker ch)
-  (random-seed (current-seconds))
-  ;(define id (place-channel-get ch))
-  (define id "HI")
-  (for ([i (in-range (+ 5  (random 5)))])
-    (displayln (list (current-seconds) id i))
-    (flush-output)
-    (place-channel-put ch (list (current-seconds) id i))
-    (sleep 3)))
-
-;(define-values (p1 p2) (place-channel))
-;(place-worker p1)
-
-(define  (main . argv)
-  (define p
-    (place ch
-      (random-seed (current-seconds))
-      ;; (define id (place-channel-get ch))
-      (define id "HI")
-      (for ([i (in-range (+ 5  (random 5)))])
-        (displayln (list (current-seconds) id i))
-        (flush-output)
-        ;; (place-channel-put ch (list (current-seconds) id i))
-        #;(sleep 3))))
-  (sync (handle-evt (place-dead-evt p) (lambda (e) (printf "DEAD\n")))))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/named/bank.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/named/bank.rkt
deleted file mode 100644
index 632d6333fb..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/named/bank.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/place/define-remote-server)
-
-(define-remote-server bank
-  (define-state accounts (make-hash))
-  (define-rpc (new-account who)
-     (match (hash-has-key? accounts who)
-       [#t '(already-exists)]
-       [else
-         (hash-set! accounts who 0)
-         (list 'created who)]))
-  (define-rpc (removeM who amount)
-     (cond
-       [(hash-ref accounts who (lambda () #f)) =>
-          (lambda (balance)
-            (cond [(<= amount balance)
-                   (define new-balance (- balance amount))
-                   (hash-set! accounts who new-balance)
-                   (list 'ok new-balance)]
-                  [else
-                    (list 'insufficient-funds balance)]))]
-       [else
-         (list 'invalid-account who)]))
-  (define-rpc (add who amount)
-    (cond
-       [(hash-ref accounts who (lambda () #f)) =>
-          (lambda (balance)
-            (define new-balance (+ balance amount))
-            (hash-set! accounts who new-balance)
-            (list 'ok new-balance))]
-       [else
-         (list 'invalid-account who)])))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/named/master.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/named/master.rkt
deleted file mode 100644
index a0ebf221b3..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/named/master.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-(require racket/place/distributed
-         racket/class
-         racket/place
-         racket/runtime-path
-         "bank.rkt"
-         "tuple.rkt")
-(define-runtime-path bank-path "bank.rkt")
-(define-runtime-path tuple-path "tuple.rkt")
-
-(provide main)
-
-(define (main)
-  (define remote-node (spawn-remote-racket-node 
-                        "localhost" 
-                        #:listen-port 6344))
-  (define tuple-place (supervise-place-at 
-                        remote-node 
-                        #:named 'tuple-server 
-                        tuple-path 
-                        'make-tuple-server))
-  (define bank-place  (supervise-place-at 
-                        remote-node bank-path 
-                        'make-bank))
-
-  (message-router
-    remote-node
-    (after-seconds 4
-      (displayln (bank-new-account bank-place 'user0))
-      (displayln (bank-add bank-place 'user0 10))
-      (displayln (bank-removeM bank-place 'user0 5)))
-
-    (after-seconds 2
-      (define c (connect-to-named-place remote-node 
-                                        'tuple-server))
-      (define d (connect-to-named-place remote-node 
-                                        'tuple-server))
-      (tuple-server-hello c)
-      (tuple-server-hello d)
-      (displayln (tuple-server-set c "user0" 100))
-      (displayln (tuple-server-set d "user2" 200))
-      (displayln (tuple-server-get c "user0"))
-      (displayln (tuple-server-get d "user2"))
-      (displayln (tuple-server-get d "user0"))
-      (displayln (tuple-server-get c "user2"))
-      )
-    (after-seconds 8
-      (node-send-exit remote-node))
-    (after-seconds 10
-      (exit 0))))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/named/tuple.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/named/tuple.rkt
deleted file mode 100644
index 2a5e15e9b7..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/named/tuple.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/place/define-remote-server)
-
-(define-named-remote-server tuple-server
-  (define-state h (make-hash))
-  (define-rpc (set k v)
-    (hash-set! h k v)
-    v)
-  (define-rpc (get k)
-    (hash-ref h k #f))
-  (define-cast (hello)
-    (printf "Hello from define-cast\n")
-    (flush-output)))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/restart/master.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/restart/master.rkt
deleted file mode 100644
index 7c939b1587..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/restart/master.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-(require racket/place/distributed
-         racket/class
-         racket/place
-         syntax/location)
-
-(provide wait-place-thunk)
-(provide main)
-
-(define (wait-place-thunk)
-  (place ch
-    (printf "BEGINING SLEEP\n")
-    (sleep 5)
-    (printf "SLEEP DONE\n")))
-
-(define (main)
-  (message-router
-    (spawn-node-with-place-at "localhost" #:listen-port 6345 (quote-module-name) 'wait-place-thunk #:thunk #t #:restart-on-exit #t)
-    (after-seconds 50
-      (exit 0))))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/restart/restarter.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/restart/restarter.rkt
deleted file mode 100644
index 786d1a2014..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/restart/restarter.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require racket/place/distributed
-         racket/class
-         racket/place
-         syntax/location)
-
-(provide wait-place-thunk)
-(provide main)
-
-(define (wait-place-thunk)
-  (place ch
-    (printf "BEGINING SLEEP\n")
-    (sleep 1)
-    (printf "SLEEP DONE\n")))
-
-(define (main)
-  (message-router
-    (spawn-node-with-place-at "localhost" #:listen-port 6345 (quote-module-name) 'wait-place-thunk 
-                              #:thunk #t #:restart-on-exit (restart-every 5 #:retry 3))))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/thread/master.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/thread/master.rkt
deleted file mode 100644
index ae2fa00c0b..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/thread/master.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket/base
-(require racket/place/distributed
-         racket/class
-         racket/match
-         racket/place
-         racket/place/define-remote-server
-         racket/runtime-path
-         syntax/location)
-
-(define-remote-server
-  bank
-
-  (define-state accounts (make-hash))
-  (define-rpc (new-account who)
-     (match (hash-has-key? accounts who)
-       [#t '(already-exists)]
-       [else
-         (hash-set! accounts who 0)
-         (list 'created who)]))
-  (define-rpc (removeM who amount)
-     (cond
-       [(hash-ref accounts who (lambda () #f)) =>
-          (lambda (balance)
-            (cond [(<= amount balance)
-                   (define new-balance (- balance amount))
-                   (hash-set! accounts who new-balance)
-                   (list 'ok new-balance)]
-                  [else
-                    (list 'insufficient-funds balance)]))]
-       [else
-         (list 'invalid-account who)]))
-  (define-rpc (add who amount)
-    (cond
-       [(hash-ref accounts who (lambda () #f)) =>
-          (lambda (balance)
-            (define new-balance (+ balance amount))
-            (hash-set! accounts who new-balance)
-            (list 'ok new-balance))]
-       [else
-         (list 'invalid-account who)])))
-
-
-(provide main)
-
-(define (main)
-  (define remote-node (spawn-remote-racket-node "localhost" #:listen-port 6344))
-  (define bank-place  (supervise-thread-at remote-node (quote-module-name) 'make-bank))
-
-  (message-router
-    remote-node
-    (after-seconds 2
-      (displayln (bank-new-account bank-place 'user0))
-      (displayln (bank-add bank-place 'user0 10))
-      (displayln (bank-removeM bank-place 'user0 5)))
-
-    (after-seconds 6
-      (node-send-exit remote-node))
-    (after-seconds 8
-      (exit 0))))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/info.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/info.rkt
deleted file mode 100644
index b4cbbca8ed..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("examples"))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/launch.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/launch.rkt
deleted file mode 100644
index 5a4ef41acd..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/launch.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/tcp
-         racket/place/distributed
-         racket/place/private/coercion)
-
-(provide main)
-
-(define (main . args)
-  (match args
-    [(list "spawn" node-port)
-       (define listener (tcp-listen (->number node-port) 4 #t))
-       (printf/f "~a\n" (list (->number node-port)))
-       (start-spawned-node-router listener)]
-
-    ;; Used to launch Design Pattern 1, MPI style distributed system.
-    [(list "launch" mod-path conf-name i)
-       (startup-config (dynamic-require (->path mod-path) (string->symbol conf-name)) (->number i))]))
-
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/map-reduce.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/map-reduce.rkt
deleted file mode 100644
index f643195b41..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/map-reduce.rkt
+++ /dev/null
@@ -1,162 +0,0 @@
-#lang racket/base
-(require racket/place
-         racket/match
-         racket/list
-         racket/pretty
-         racket/place/distributed)
-
-
-(provide make-map-reduce-workers
-         map-reduce
-         map-reduce-worker
-         default-sorter)
-
-(define (map-coalesce-values kvl)
-  (let loop ([sl kvl]
-             [curk null]
-             [curv null]
-             [nl null])
-    (match sl
-      [(cons (cons slhk slhv) slt)
-       (if (null? curk)
-           (loop slt slhk (list slhv) nl)
-           (if (equal? slhk curk)
-               (loop slt curk (cons slhv curv) nl)
-               (loop sl null null (cons (cons curk (reverse curv)) nl))))]
-      [(list)
-       (reverse
-         (if (null? curk)
-             nl
-             (cons (cons curk (reverse curv)) nl)))])))
-
-(define (coalesce-values kvl kvl2 less-than)
-  (let loop ([sl (sort (append kvl kvl2) less-than)]
-             [curk null]
-             [curv null]
-             [nl null])
-    (match sl
-      [(cons (cons slhk slhv) slt)
-       (if (null? curk)
-           (loop slt slhk slhv nl)
-           (if (equal? slhk curk)
-               (loop slt curk (append curv slhv) nl)
-               (loop sl null null (cons (cons curk curv) nl))))]
-      [(list)
-       (reverse
-         (if (null? curk)
-             nl
-             (cons (cons curk curv) nl)))])))
-
-
-(define (->module-path x)
-  (match x
-    [(list 'file fn) (list 'file (bytes->string/locale fn))]
-    [(cons h t) (cons (->module-path h) (->module-path t))]
-    [(? bytes?) (bytes->path x)]
-    [else x]))
-
-(define (apply-dynamic-require lst)
-  (match-define (list mp sym) lst)
-  (dynamic-require (->module-path mp) sym))
-
-(define (map-reduce-worker ch)
-  (let loop ([map-vals null])
-    (define msg (place-channel-get ch))
-    (match msg
-      [(list (list 'map mapper key-less-than task) rch)
-        (define nmv1 ((apply-dynamic-require mapper) task))
-        (define less-than (apply-dynamic-require key-less-than))
-        (define nmv2 (sort nmv1 less-than))
-        (define nmv (map-coalesce-values nmv2))
-        (place-channel-put rch (list 'reduce-ready))
-        (loop (cons rch nmv))]
-      [(list (list 'reduce-to reducer sorter addr) rch)
-        (define reduce-ch (mr-connect-to ch (take addr 2) (third addr)))
-        (place-channel-put reduce-ch (list 'reduce reducer sorter (cdr map-vals)))
-        (place-channel-put rch (list 'reduce-done))
-        (loop null)]
-      [(list (list 'reduce reducer sorter kvs) rch)
-        (define less-than (apply-dynamic-require sorter))
-        (define nmvc (coalesce-values (cdr map-vals) kvs less-than))
-        (define nmv ((apply-dynamic-require reducer) nmvc))
-        (place-channel-put (car map-vals) (list 'reduce-ready))
-        (loop (cons (car map-vals) nmv))]
-      [(list (list 'get-results) rch)
-        (place-channel-put rch (list 'results (cdr map-vals)))
-        (loop null)]
-    )))
-
-(define (i->place-name i)
-  (string->symbol (string-append "mpw" (number->string i))))
-
-
-(define (make-map-reduce-workers config)
-  (define nodes (spawn-nodes/join/local config))
-  (for ([n nodes]
-        [i (in-naturals)])
-    (supervise-place-at n
-                        (->module-path (quote-module-path))
-                        'map-reduce-worker
-                        #:named (i->place-name)))
-  nodes)
-
-(define (default-sorter a b)
-  (cond
-    [(number? a) (< a b)]
-    [(string? a) (string<? a b)]
-    [(pair? a) (default-sorter (car a) (car b))]
-    [else (raise (format "Cannot sort ~a" a))]))
-
-(define (map-reduce nodes config tasks mapper reducer
-                    #:sorter [sorter (list (quote-module-path) 'default-sorter)]
-                    #:combiner [combiner #f]
-                    #:outputer [outputer #f])
-  (define-values (mrth ch)
-    (start-message-router/thread
-      #:nodes nodes))
-
-  (define simple-config
-    (for/list ([c config]
-               [i (in-naturals)])
-      (append c (list (i->place-name i)))))
-
-  (define connections
-    (for/list ([c simple-config])
-      (match-define (list-rest host port name rest) c)
-      (define npch (mr-connect-to ch (list host port) name))
-      (list c npch)))
-
-  (define result
-    (let loop ([ts tasks]
-               [idle-mappers connections]
-               [mapping null]
-               [ready-to-reduce null]
-               [reducing null])
-      ;; (printf "STATE\n")
-      ;; (pretty-print (list ts idle-mappers mapping ready-to-reduce reducing))
-      ;; (flush-output)
-      (match (list ts idle-mappers mapping ready-to-reduce reducing)
-        [(list (cons tsh tst) (cons imh imt) mapping rtr r)
-         (*channel-put (second imh) (list 'map mapper sorter (list tsh)))
-         (loop tst imt (cons imh mapping) rtr r)]
-        [(list ts im m (cons rtr1 (cons rtr2 rtrt)) r)
-         (*channel-put (second rtr1) (list 'reduce-to reducer sorter (first rtr2)))
-         (loop ts im m rtrt (cons rtr1 (cons rtr2 r)))]
-        [(list (list) im (list) (list rtr) (list))
-         (*channel-put (second rtr) (list 'get-results))
-         (second (*channel-get (second rtr)))]
-        [else ; wait
-         (apply sync/enable-break
-                (for/list ([m (append mapping reducing)])
-                  (wrap-evt (second m)
-                    (lambda (e)
-                      (match e
-                        [(list 'reduce-ready)
-                         (loop ts idle-mappers (remove m mapping) (cons m ready-to-reduce) (remove m reducing))]
-                        [(list 'reduce-done)
-                         (loop ts (cons m idle-mappers) mapping ready-to-reduce (remove m reducing))]
-                        [else
-                         (raise (format "Unknown response message ~a" e))])))))])))
-
-  (or (and outputer ((apply-dynamic-require outputer) result))
-      result))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/rmpi.rkt b/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/rmpi.rkt
deleted file mode 100644
index 6c02cae3e8..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/rmpi.rkt
+++ /dev/null
@@ -1,473 +0,0 @@
-#lang racket/base
-
-(require racket/place/distributed
-         racket/match
-         racket/list
-         racket/place
-         racket/class
-         racket/flonum
-         racket/fixnum
-         racket/vector)
-
-(provide rmpi-init
-         rmpi-send
-         rmpi-recv
-         rmpi-broadcast
-         rmpi-reduce
-         rmpi-gather
-         rmpi-allreduce
-         rmpi-allgather
-         rmpi-alltoall
-         rmpi-alltoallv
-         rmpi-barrier
-         rmpi-id
-         rmpi-cnt
-         rmpi-comm-split
-         rmpi-partition
-         rmpi-build-default-config
-         rmpi-make-localhost-config
-         rmpi-make-remote-config
-         rmpi-launch
-         rmpi-finish
-         (struct-out rmpi-comm))
-
-(struct rmpi-comm (id cnt channels) #:transparent)
-
-(define (rmpi-id comm) (rmpi-comm-id comm))
-(define (rmpi-cnt comm) (rmpi-comm-cnt comm))
-(define (rmpi-send comm dest val) (place-channel-put (vector-ref (rmpi-comm-channels comm) dest) val))
-(define (rmpi-recv comm src) (place-channel-get (vector-ref (rmpi-comm-channels comm) src)))
-
-(define (rmpi-init ch)
-  (define tc (new named-place-typed-channel% [ch ch]))
-  (match-define (list (list 'rmpi-id id config) return-ch) (tc-get 'rmpi-id tc))
-  (match-define (list (list 'args args) src-ch) (tc-get 'args tc))
-
-  (define mpi-comm-vector
-    (for/vector #:length (length config) ([c config])
-      (match-define (list dest dest-port dest-name dest-id) c)
-      (cond
-        [(< id dest-id)
-         (send-new-place-channel-to-named-dest ch id (list dest dest-port dest-name))]
-        [else null])))
-
-  (for ([i (length config)])
-    (when (> id i)
-      (match-define (list (list 'new-place-channel src-id) src-ch) (tc-get 'new-place-channel tc))
-      (vector-set! mpi-comm-vector src-id src-ch)))
-
-  (values
-    (rmpi-comm id (length config) mpi-comm-vector)
-    args
-    tc))
-
-
-(define rmpi-broadcast 
-  (case-lambda
-    [(comm src)
-     (rmpi-broadcast comm src (void))]
-    [(comm src val)
-     (match-define (rmpi-comm real-id cnt chs) comm)
-     (define offset (- cnt src))
-     (define id (modulo (+ real-id (- cnt src)) cnt))
-     (let loop ([i 0]
-                [val val])
-       (define round (arithmetic-shift 1 i))
-       (cond
-         [(< round cnt)
-           (loop 
-             (add1 i)
-             (cond
-               [(< id (arithmetic-shift round 1))
-                 (cond 
-                   [(not (= 0 (bitwise-and id round)))
-                    (define peer-id (- id round))
-                    (define real-peer-id (modulo (+ peer-id src) cnt))
-                    ;(printf "BRECV ~a ~a ~a ~a ~a ~a\n" round real-id id peer-id real-peer-id offset)
-                    (place-channel-get (vector-ref chs real-peer-id))
-                    ]
-                   [else
-                    (define peer-id (+ id round))
-                    (cond
-                      [(< peer-id cnt)
-                        (define real-peer-id (modulo (+ peer-id src) cnt))
-                        ;(printf "BSEND ~a ~a ~a ~a ~a ~a\n" round real-id id peer-id real-peer-id offset)
-                        (place-channel-put (vector-ref chs real-peer-id) val)])
-                    val])]
-               [else val]))]
-         [else val]))]))
-
-(define (fancy-reducer op recv-val val)
-  (cond 
-    [(or (number? recv-val)
-         (boolean? recv-val))
-     (op recv-val val)]
-    [(vector? recv-val)
-     (for/vector #:length (vector-length recv-val)
-                 ([a (in-vector recv-val)]
-                  [b (in-vector val)])
-       (fancy-reducer op a b))]
-    [(fxvector? recv-val)
-     (for/fxvector #:length (fxvector-length recv-val)
-                 ([a (in-fxvector recv-val)]
-                  [b (in-fxvector val)])
-       (fancy-reducer op a b))]
-    [(flvector? recv-val)
-     (for/flvector #:length (flvector-length recv-val)
-                 ([a (in-flvector recv-val)]
-                  [b (in-flvector val)])
-       (fancy-reducer op a b))]
-    [else (raise (format "fancy-reducer error on ~a ~a ~a" op recv-val val))]))
-
-(define (rmpi-reduce comm dest op val)
-  (match-define (rmpi-comm real-id cnt chs) comm)
-  (define i
-    (let loop ([i 0])
-      (if (>= (arithmetic-shift 1 i) cnt)
-        i
-        (loop (add1 i)))))
-
-
-  (define offset (- cnt dest))
-  (define (convert v) (modulo (+ v offset) cnt))
-  (define (pconvert v) (modulo (+ v dest) cnt))
-  (define id (convert real-id))
-  (let loop ([i i]
-             [val val])
-    (cond
-      [(> i 0)
-       (define round (arithmetic-shift 1 (sub1 i)))
-       (loop 
-         (sub1 i)
-         (cond
-           [(< id (arithmetic-shift round 1))
-             (cond 
-               [(not (= 0 (bitwise-and id round)))
-                (define peer-id (- id round))
-                (define real-peer-id (pconvert peer-id))
-                ;(printf/f "SEND ROUND ~a RID ~a RPID ~a ID ~a PID ~a OFF ~a\n" round real-id real-peer-id id peer-id offset)
-                (place-channel-put (vector-ref chs real-peer-id) val)
-                val
-                ]
-               [else
-                (define peer-id (+ id round))
-                (cond
-                  [(< peer-id cnt)
-                    (define real-peer-id (pconvert peer-id))
-                    ;(printf/f "RECV ROUND ~a RID ~a RPID ~a ID ~a PID ~a OFF ~a\n" round real-id real-peer-id id peer-id offset)
-                    (define recv-val (place-channel-get (vector-ref chs real-peer-id)))
-                    ;(printf/f "RECVVAL ~a ~a ~a ~a ~a ~a ~a\n" round real-id id peer-id real-peer-id offset recv-val)
-                    (fancy-reducer op recv-val val)]
-                  [else val])])]))]
-      [else val])))
-
-(define (rmpi-gather comm dest val)
-  (match-define (rmpi-comm real-id cnt chs) comm)
-  (define i
-    (let loop ([i 0])
-      (if (>= (arithmetic-shift 1 i) cnt)
-        i
-        (loop (add1 i)))))
-
-
-  (define offset (- cnt dest))
-  (define (convert v) (modulo (+ v offset) cnt))
-  (define (pconvert v) (modulo (+ v dest) cnt))
-  (define id (convert real-id))
-  (define retval
-    (let loop ([i i]
-               [val (vector val)])
-      (cond
-        [(> i 0)
-         (define round (arithmetic-shift 1 (sub1 i)))
-         (loop 
-           (sub1 i)
-           (cond
-             [(< id (arithmetic-shift round 1))
-               (cond 
-                 [(not (= 0 (bitwise-and id round)))
-                  (define peer-id (- id round))
-                  (define real-peer-id (pconvert peer-id))
-                  ;(printf/f "SEND ~a ~a ~a ~a ~a ~a\n" round real-id id peer-id real-peer-id offset)
-                  (place-channel-put (vector-ref chs real-peer-id) val)
-                  val
-                  ]
-                 [else
-                  (define peer-id (+ id round))
-                  (cond
-                    [(< peer-id cnt)
-                      (define real-peer-id (pconvert peer-id))
-                      ;(printf/f "RECV ~a ~a ~a ~a ~a ~a\n" round real-id id peer-id real-peer-id offset)
-                      (define recv-val (place-channel-get (vector-ref chs real-peer-id)))
-                      ;(printf/f "RECVVAL ~a ~a ~a ~a ~a ~a ~a\n" round real-id id peer-id real-peer-id offset recv-val)
-                      (define (order real-id val real-peer-id pval)
-                        (define vl (vector-length val))
-                        (define pvl (vector-length pval))
-                        (define new-val (make-vector (+ vl pvl)))
-                        (define v1 (if (< real-id real-peer-id) val pval))
-                        (define v2 (if (< real-id real-peer-id) pval val))
-                        (define v1l (if (< real-id real-peer-id) vl pvl))
-                        (define v2l (if (< real-id real-peer-id) pvl vl))
-                        (let loop ([i 0]
-                                   [j 0]
-                                   [ii 0])
-                          (cond 
-                            [(< i v1l)
-                              (vector-set! new-val ii (vector-ref v1 i))
-                              (cond 
-                                [(< j v2l)
-                                 (vector-set! new-val (+ 1 ii) (vector-ref v2 j))
-                                 (loop (+ 1 i) (+ 1 j) (+ 2 ii))]
-                                [else
-                                 (loop (+ 1 i) j (+ 1 ii))])]
-                             [(< j v2l)
-                              (vector-set! new-val (+ 1 ii) (vector-ref v2 j))
-                              (loop i (+ 1 j) (+ 1 ii))]
-                             [else
-                               new-val])))
-                      (order id val peer-id recv-val)]
-                    [else val])])]))]
-        [else val])))
-  (cond
-    [(and (not (zero? dest)) (= real-id dest))
-     (for/vector #:length cnt ([i cnt])
-       (vector-ref retval (modulo (+ i offset) cnt)))]
-    [else retval]))
-
-
-(define (rmpi-barrier comm)
-  (rmpi-reduce comm 0 + 1)
-  (rmpi-broadcast comm 0 1))
-
-(define (rmpi-allreduce comm op val)
-  (define rv (rmpi-reduce comm 0 op val))
-  (rmpi-broadcast comm 0 rv))
-
-(define (rmpi-allgather comm val)
-  (define rv (rmpi-gather comm 0 val))
-  (rmpi-broadcast comm 0 rv))
-
-(define (partit num cnt id)
-  (define-values (quo rem) (quotient/remainder num cnt))
-  (values (+ (* id quo) (if (< id rem) id rem))
-          (+ quo (if (< id rem) 1 0))))
-
-(define (rmpi-partition comm num)
-  (define id (rmpi-id comm))
-  (define cnt (rmpi-cnt comm))
-  (partit num cnt id))
-
-(define rmpi-build-default-config
-  (make-keyword-procedure
-   (lambda (kws kw-args . rest)
-     (for/hash ([kw kws]
-                [kwa kw-args])
-       ;; (displayln (keyword? kw))
-       (values kw kwa)))))
-
-(define (rmpi-launch default config #:no-wait [no-wait #f])
-  (define (lookup-config-value rest key-str)
-    (define key
-      (string->keyword key-str))
-    (cond
-      [(null? rest)
-        (hash-ref default key #f)]
-      [else
-        (hash-ref (car rest) key (lambda ()
-                                   (hash-ref default key #f)))]))
-
-;  (printf/f "~v\n" default)
-;  (exit 1)
-  (define nodes
-    (spawn-nodes/join
-      (for/list ([c config])
-        (match-define (list-rest host port name id _rest) c)
-        (define rest 
-          (cond 
-            [(null? _rest)
-             (list (make-immutable-hash (list (cons (string->keyword "listen-port") port))))]
-            [else
-              (list
-                (hash-set (car _rest) (string->keyword "listen-port") port))]))
-;        (printf/f "~a\n" rest)
-        (define-values (k v) 
-          (let loop ([keys (list "racket-path" "listen-port" "distributed-launch-path")]
-                     [k null]
-                     [v null])
-            (match keys
-             [(cons head tail)
-              (cond
-                [(lookup-config-value rest head) => (lambda (x) 
-                  (loop tail
-                        (cons (string->keyword head) k)
-                        (cons x v)))]
-                [else
-                  (loop (cdr keys) k v)])]
-             [(list)
-               (values k v)])))
-;        (printf/f "~a\n" (list k v (list host)))
-        (list k v (list host)))))
-
-  (for ([n nodes]
-        [c config])
-    (match-define (list-rest host port name id rest) c)
-    (supervise-place-at n 
-                        (lookup-config-value rest "mpi-module")
-                        (lookup-config-value rest "mpi-func")
-                        #:named name))
-
-  (define-values (mrth ch)
-    (start-message-router/thread
-      #:nodes nodes))
-
-  (define simple-config 
-    (for/list ([c config])
-      (match-define (list-rest host port name id rest) c)
-      (list host port name id)))
-
-  (for ([c config])
-    (match-define (list-rest host port name id rest) c)
-    (define npch (mr-connect-to ch (list host port) name))
-    (*channel-put npch (list 'rmpi-id id simple-config))
-    (*channel-put npch (list 'args (or (lookup-config-value rest "mpi-args") null))))
-
-  (cond
-    [no-wait
-      (for/first ([c config])
-        (match-define (list-rest host port name id rest) c)
-        (define npch (mr-connect-to ch (list host port) name))
-        (list npch))]
-    [else
-      (for/first ([c config])
-        (match-define (list-rest host port name id rest) c)
-        (define npch (mr-connect-to ch (list host port) name))
-        (*channel-put npch (list 'done?))
-        ;Wait for 'done message from mpi node id 0
-        (*channel-get npch))]))
-
-
-(define (rmpi-finish comm tc)
-  (when (= (rmpi-id comm) 0)
-        (place-channel-put (second (tc-get 'done? tc)) 'done)))
-
-(define (rmpi-make-localhost-config cnt start-port name)
-  (for/list ([i cnt])
-    (list "localhost" (+ start-port i) (string->symbol (format "~a_~a" (symbol->string name) (number->string i)))
-          i)))
-
-(define (rmpi-make-remote-config hostlist cnt start-port name)
-  (for/list ([i cnt]
-             [host hostlist])
-    (list host (+ start-port i) (string->symbol (format "~a_~a" (symbol->string name) (number->string i)))
-          i)))
-
-(define (rmpi-alltoall comm outvec)
-  (match-define (rmpi-comm id cnt chs) comm)
-  (define-values (v! vr mkv vcopy)
-    (cond 
-      [(vector? outvec) (values vector-set! vector-ref make-vector vector-copy)]
-      [(fxvector? outvec) (values fxvector-set! fxvector-ref make-fxvector fxvector-copy)]
-      [(flvector? outvec) (values flvector-set! flvector-ref make-flvector flvector-copy)]
-      [else (error (format "Unrecognized type of vector ~a" outvec))]))
-
-  (define invec (mkv cnt))
-  (v! invec id (vr outvec id)) 
-
-  (define n
-    (let loop ([i 0])
-      (if (>= (arithmetic-shift 1 i) cnt)
-        i
-        (loop (add1 i)))))
-
-  (for ([i (in-range 1 (arithmetic-shift 1 n))])
-    (define peer-id (bitwise-xor id i))
-    (when (< peer-id cnt)
-      (if (> id peer-id)
-        (begin
-          (place-channel-put (vector-ref chs peer-id) (vr outvec peer-id))
-          (v! invec peer-id (place-channel-get (vector-ref chs peer-id))))
-        (begin
-          (v! invec peer-id (place-channel-get (vector-ref chs peer-id)))
-          (place-channel-put (vector-ref chs peer-id) (vr outvec peer-id))))))
-
-   invec)
-
-
-(define (rmpi-alltoallv comm outvec send-count send-displ invec recv-count recv-displ)
-  (match-define (rmpi-comm real-id cnt chs) comm)
-  (define-values (v! vr mk-v in-v)
-    (cond 
-      [(vector? outvec) (values vector-set! vector-ref make-vector in-vector)]
-      [(fxvector? outvec) (values fxvector-set! fxvector-ref make-fxvector in-fxvector)]
-      [(flvector? outvec) (values flvector-set! flvector-ref make-flvector in-flvector)]
-      [else (error (format "Unrecognized type of vector ~a" outvec))]))
-
-  ;; convert from outvec to vector of outvectors 
-  (define outvv
-    (for/vector #:length (fxvector-length send-count) ([i (in-fxvector send-count)]
-                                                       [d (in-fxvector send-displ)])
-      (define vv (mk-v i))
-      (for ([ii (in-range d (fx+ d i))]
-            [iii (in-naturals)])
-        (v! vv iii (vr outvec ii)))
-      vv))
-
-  (define invv (rmpi-alltoall comm outvv))
-
-  ;; convert form vector of invectors to invector
-  (for ([v (in-vector invv)]
-        [i (in-fxvector recv-count)]
-        [d (in-fxvector recv-displ)])
-    (for ([x (in-v v)]
-          [ii (in-range d (fx+ d i))])
-      (v! invec ii x)))
-
-  invec)
-
-(define (rmpi-comm-split comm color key)
-  (match-define (rmpi-comm id cnt chs) comm)
-  (define r (rmpi-allgather comm (vector id color key)))
-  (match-define (vector nid nc nk) (vector-ref r id))
-  (define ncl 
-    (for/fold ([nl null]) ([x (in-vector r)])
-      (cond 
-        [(= nc (vector-ref x 1))
-         (cons x nl)]
-        [else nl])))
-  (define nchsl (length ncl))
-  (define nchs (make-vector nchsl))
-  (for ([x ncl])
-    (match-define (vector cid cc ck) x)
-    (when (>= ck nchsl)
-      (error "new key value ~a is >= new comm size ~a" ck ncl))
-    (when (not (= 0 (vector-ref nchs ck)))
-      (error "duplicate key value ~a" ck))
-    (cond
-        [(= nid cid)
-         (vector-set! nchs ck null)]
-        [else
-         (vector-set! nchs ck (vector-ref chs cid))]))
-
-  (define ncomm (rmpi-comm nk nchsl nchs))
-  #;(list id ncl ncomm)
-  ncomm)
-
-(module+ bcast-print-test
-  (rmpi-broadcast (rmpi-comm 0 8 (vector 0 1 2 3 4 5 6 7)) 0 "Hi")
-  (rmpi-broadcast (rmpi-comm 3 8 (vector 0 1 2 3 4 5 6 7)) 0)
-  (rmpi-broadcast (rmpi-comm 0 8 (vector 0 1 2 3 4 5 6 7)) 3)
-  )
-
-(module+ reduce-print-test
-  (rmpi-reduce (rmpi-comm 0 8 (vector 0 1 2 3 4 5 6 7)) 0 + 7)
-  (rmpi-reduce (rmpi-comm 3 8 (vector 0 1 2 3 4 5 6 7)) 0 + 7)
-  (rmpi-reduce (rmpi-comm 0 8 (vector 0 1 2 3 4 5 6 7)) 3 + 7)
-  )
-
-;Don't use eli-tester in the core, use rackunit
-#;(module+ test
-  (require tests/eli-tester)
-  (test 
-    (partit 10 3 0) => (values 0 4)
-    (partit 10 3 1) => (values 4 3)
-    (partit 10 3 2) => (values 7 3)))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-test/info.rkt b/pkgs/distributed-places-pkgs/distributed-places-test/info.rkt
deleted file mode 100644
index 8e1103d597..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-test/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang info
-(define deps '("distributed-places-lib" "base"))
-(define pkg-desc "tests for of \"distributed-places\"")
-(define update-implies '("distributed-places-lib"))
-
-(define pkg-authors '(tewk))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/bank.rkt b/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/bank.rkt
deleted file mode 100644
index c1cef20b3f..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/bank.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/place/define-remote-server)
-
-(define-remote-server
-  bank
-
-  (define-state accounts (make-hash))
-  (define-rpc (new-account who)
-     (match (hash-has-key? accounts who)
-       [#t '(already-exists)]
-       [else
-         (hash-set! accounts who 0)
-         (list 'created who)]))
-  (define-rpc (removeM who amount)
-     (cond
-       [(hash-ref accounts who (lambda () #f)) =>
-          (lambda (balance)
-            (cond [(<= amount balance)
-                   (define new-balance (- balance amount))
-                   (hash-set! accounts who new-balance)
-                   (list 'ok new-balance)]
-                  [else
-                    (list 'insufficient-funds balance)]))]
-       [else
-         (list 'invalid-account who)]))
-  (define-rpc (add who amount)
-    (cond
-       [(hash-ref accounts who (lambda () #f)) =>
-          (lambda (balance)
-            (define new-balance (+ balance amount))
-            (hash-set! accounts who new-balance)
-            (list 'ok new-balance))]
-       [else
-         (list 'invalid-account who)])))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/distributed.rkt b/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/distributed.rkt
deleted file mode 100644
index 2e4c637ce4..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/distributed.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang racket/base
-(require racket/place/distributed
-         racket/class
-         racket/place
-         racket/runtime-path
-         "bank.rkt"
-         "tuple.rkt")
-(define-runtime-path bank-path "bank.rkt")
-(define-runtime-path tuple-path "tuple.rkt")
-
-(provide main)
-
-(define (main)
-  (define (test expect fun . args)
-    (printf "~s ==> " (cons fun args))
-    (flush-output)
-    (let ([res (if (procedure? fun)
-                 (apply fun args)
-                 (car args))])
-      (printf "~s\n" res)
-      (let ([ok? (equal? expect res)])
-        (unless ok?
-          (printf "  BUT EXPECTED ~s\n" expect)
-          (eprintf "ERROR\n"))
-        ok?)))
-
-  (define remote-node (spawn-remote-racket-node "localhost" #:listen-port 6344))
-  (define tuple-place (supervise-place-at remote-node #:named 'tuple-server tuple-path 'make-tuple-server))
-  (define bank-place  (supervise-place-at remote-node bank-path 'make-bank))
-
-  (message-router
-    remote-node
-    (after-seconds 2
-      (define c (connect-to-named-place remote-node 'tuple-server))
-      (define d (connect-to-named-place remote-node 'tuple-server))
-      (tuple-server-hello c)
-      (tuple-server-hello d)
-      (test 100 tuple-server-set c "user0" 100)
-      (test 200 tuple-server-set d "user2" 200)
-      (test 100 tuple-server-get c "user0")
-      (test 200 tuple-server-get d "user2")
-      (test 100 tuple-server-get d "user0")
-      (test 200 tuple-server-get c "user2")
-      )
-    (after-seconds 4
-      (test '(created user1) bank-new-account bank-place 'user1)
-      (test '(ok 10) bank-add bank-place 'user1 10)
-      (test '(ok 5) bank-removeM bank-place 'user1 5)
-      )
-
-    (after-seconds 15
-      (node-send-exit remote-node))
-    (after-seconds 20
-      (exit 0))))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/restarter.rkt b/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/restarter.rkt
deleted file mode 100644
index 326bb9f1d7..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/restarter.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-(require racket/place/distributed
-         racket/class
-         racket/place
-         syntax/location)
-
-(provide wait-place-thunk)
-(provide main)
-
-(define (wait-place-thunk)
-  (place ch
-    (printf "BEGINING SLEEP\n")
-    (sleep 1)
-    (printf "SLEEP DONE\n")))
-
-(define (main)
-  (message-router
-    (spawn-node-with-place-at
-      "localhost"
-      #:listen-port 6345
-      (quote-module-name)
-      'wait-place-thunk
-      #:thunk #t
-      #:restart-on-exit (restart-every 5
-                                       #:retry 3
-                                       #:on-final-fail (lambda ()
-                                                         (printf "Failed 3 times exititing\n")
-                                                         (exit 1))))))
diff --git a/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/tuple.rkt b/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/tuple.rkt
deleted file mode 100644
index ca1179783f..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places-test/test/racket/place/distributed/tuple.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/place/define-remote-server)
-
-(define-named-remote-server
- tuple-server
-
-  (define-state h (make-hash))
-  (define-rpc (set k v)
-    (hash-set! h k v)
-    v)
-  (define-rpc (get k)
-    (hash-ref h k #f))
-  (define-cast (hello)
-    (printf "Hello from define-cast\n")(flush-output)))
diff --git a/pkgs/distributed-places-pkgs/distributed-places/LICENSE.txt b/pkgs/distributed-places-pkgs/distributed-places/LICENSE.txt
deleted file mode 100644
index a5085f28a8..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-distributed-places
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/distributed-places-pkgs/distributed-places/info.rkt b/pkgs/distributed-places-pkgs/distributed-places/info.rkt
deleted file mode 100644
index a36c51caee..0000000000
--- a/pkgs/distributed-places-pkgs/distributed-places/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("distributed-places-lib"
-               "distributed-places-doc"))
-(define implies '("distributed-places-lib"
-                  "distributed-places-doc"))
-
-(define pkg-desc "Libraries for distributed computations")
-
-(define pkg-authors '(tewk))
diff --git a/pkgs/draw-pkgs/draw-doc/LICENSE.txt b/pkgs/draw-pkgs/draw-doc/LICENSE.txt
deleted file mode 100644
index fdcf466975..0000000000
--- a/pkgs/draw-pkgs/draw-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-draw-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/draw-pkgs/draw-doc/info.rkt b/pkgs/draw-pkgs/draw-doc/info.rkt
deleted file mode 100644
index e9c55a47fb..0000000000
--- a/pkgs/draw-pkgs/draw-doc/info.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("gui-doc"
-                     "pict-doc"
-                     "at-exp-lib"
-                     "base"
-                     "gui-lib"
-                     "pict-lib"
-                     "scribble-lib"
-                     "draw-lib"
-                     "racket-doc"))
-(define update-implies '("draw-lib"))
-
-(define pkg-desc "documentation part of \"draw\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/bitmap-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/bitmap-class.scrbl
deleted file mode 100644
index f851f35b86..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/bitmap-class.scrbl
+++ /dev/null
@@ -1,377 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label (only-in ffi/unsafe cpointer?)))
-
-@defclass/title[bitmap% object% ()]{
-
-A @racket[bitmap%] object is a pixel-based image, either monochrome,
- color, or color with an alpha channel. See also @racket[make-bitmap],
- @racket[make-platform-bitmap], @racket[make-screen-bitmap] (from
- @racketmodname[racket/gui/base]), @xmethod[canvas% make-bitmap] (from
- @racketmodname[racket/gui/base]), and @secref["Portability"].
-
-A bitmap has a @deftech{backing scale}, which is the number of pixels
- that correspond to a drawing unit for the bitmap, either when the
- bitmap is used as a target for drawing or when the bitmap is drawn
- into another context.  For example, on Mac OS X when the main monitor
- is in Retina mode, @racket[make-screen-bitmap] returns a bitmap whose
- backing scale is @racket[2.0]. On Windows, the backing scale of a screen
- bitmap corresponds to the system-wide text scale (see @secref[#:doc '(lib
- "scribblings/gui/gui.scrbl") "display-resolution"]). A monochrome bitmap always
- has a backing scale of @racket[1.0].
-
-A bitmap is convertible to @racket['png-bytes] through the
-@racketmodname[file/convertible] protocol.
-
-
-@defconstructor*/make[(([width exact-positive-integer?]
-                        [height exact-positive-integer?]
-                        [monochrome? any/c #f]
-                        [alpha? any/c #f]
-                        [backing-scale (>/c 0.0) 1.0])
-                       ([in (or/c path-string? input-port?)]
-                        [kind (or/c 'unknown 'unknown/mask 'unknown/alpha
-                                    'gif 'gif/mask 'gif/alpha 
-                                    'jpeg 'jpeg/alpha
-                                    'png 'png/mask 'png/alpha
-                                    'xbm 'xbm/alpha 'xpm 'xpm/alpha
-                                    'bmp 'bmp/alpha)
-                              'unknown]
-                        [bg-color (or/c (is-a?/c color%) #f) #f]
-                        [complain-on-failure? any/c #f]
-                        [backing-scale (>/c 0.0) 1.0])
-                       ([bits bytes?]
-                        [width exact-positive-integer?]
-                        [height exact-positive-integer?]))]{
-
-The @racket[make-bitmap], @racket[make-monochrome-bitmap], and
- @racket[read-bitmap] functions create @racket[bitmap%] instances, but
- they are also preferred over using @racket[make-object] 
- with @racket[bitmap%] directly, because the functions are
- less overloaded and they enable alpha channels by default.
- See also @secref["Portability"].
- 
-When @racket[width] and @racket[height] are provided: Creates a new
- bitmap. If @racket[monochrome?] is true, the bitmap is monochrome; if
- @racket[monochrome?] is @racket[#f] and @racket[alpha?] is true, the
- bitmap has an alpha channel; otherwise, the bitmap is color without
- an alpha channel. The @racket[backing-scale] argument sets the
- bitmap's @tech{backing scale}, and it must be @racket[1.0] if
- @racket[monochrome] is true.
- The initial content of the bitmap is ``empty'': all white, and with
- zero alpha in the case of a bitmap with an alpha channel.
-
-When @racket[in] is provided: Creates a bitmap from a file format,
- where @racket[kind] specifies the format. See @method[bitmap%
- load-file] for details. The @racket[backing-scale] argument sets the
- bitmap's @tech{backing scale}, so that the bitmap's size (as reported
- by @method[bitmap% get-width] and @method[bitmap% get-height]) is the
- @racket[ceiling] of the bitmap's size from @racket[in] divided by
- @racket[backing-scale]; the backing scale must be @racket[1.0] if the
- bitmap is monocrhome or loaded with a mask.
-
-When a @racket[bits] byte string is provided: Creates a monochrome
- bitmap from an array of bit values, where each byte in @racket[bits]
- specifies eight bits, and padding bits are added so that each bitmap
- line starts on a character boundary. A @racket[1] bit value indicates
- black, and @racket[0] indicates white. If @racket[width] times
- @racket[height] is larger than 8 times the length of @racket[bits],
- @|MismatchExn|.
-
-@history[#:changed "1.1" @elem{Added the @racket[backing-scale]
-optional arguments.}]}
-
-@defmethod[(get-argb-pixels [x real?]
-                            [y real?]
-                            [width exact-nonnegative-integer?]
-                            [height exact-nonnegative-integer?]
-                            [pixels (and/c bytes? (not/c immutable?))]
-                            [just-alpha? any/c #f]
-                            [pre-multiplied? any/c #f]
-                            [#:unscaled? unscaled? any/c #f])
-           void?]{
-
-Produces the same result as @xmethod[bitmap-dc% get-argb-pixels] when
-@racket[unscaled?] is @racket[#f], but the bitmap does not have to be
-selected into the DC (and this method works even if the bitmap is
-selected into another DC, attached as a button label, etc.).
-
-If the bitmap has a @tech{backing scale} other than @racket[1.0] and
-@racket[unscaled?] is true, then the result corresponds to the
-bitmap's pixels ignoring the @tech{backing scale}. In that case,
-@racket[x], @racket[y], @racket[width], and @racket[height] are
-effectively in pixels instead of drawing units.
-
-@history[#:changed "1.1" @elem{Added the @racket[#:unscaled?]
-optional argument.}]}
-
-
-@defmethod[(get-backing-scale)
-           (>/c 0.0)]{
-
-Returns the bitmap's @tech{backing scale}.
-
-@history[#:added "1.1"]}
-
-
-@defmethod[(get-depth)
-           exact-nonnegative-integer?]{
-
-Gets the color depth of the bitmap, which is @racket[1] for a
-monochrome bitmap and @racket[32] for a color bitmap. See also
-@method[bitmap% is-color?].
-
-}
-
-
-@defmethod[(get-handle) cpointer?]{
-
-Returns a low-level handle to the bitmap content. Currently, on all
-platforms, a handle is a @tt{cairo_surface_t}. For a bitmap created
-with @racket[make-bitmap], the handle is specifically a Cairo
-image surface.}
-
-
-@defmethod[(get-height)
-           exact-positive-integer?]{
-
-Gets the height of the bitmap in drawing units (which is the same as
-pixels if the @tech{backing scale} is 1.0).}
-
-
-@defmethod[(get-loaded-mask)
-           (or/c (is-a?/c bitmap%) #f)]{
-
-Returns a mask bitmap that is stored with this bitmap.
-
-When a GIF file is loaded with @racket['gif/mask] or
- @racket['unknown/mask] and the file contains a transparent ``color,''
- a mask bitmap is generated to identify the transparent pixels. The
- mask bitmap is monochrome, with white pixels where the loaded bitmap
- is transparent and black pixels everywhere else.
-
-When a PNG file is loaded with @racket['png/mask] or
- @racket['unknown/mask] and the file contains a mask or alpha channel,
- a mask bitmap is generated to identify the mask or alpha channel.  If
- the file contains a mask or an alpha channel with only extreme
- values, the mask bitmap is monochrome, otherwise it is grayscale
- (representing the alpha channel inverted).
-
-When an XPM file is loaded with @racket['xpm/mask] or
- @racket['unknown/mask], a mask bitmap is generated to indicate which
- pixels are set.
-
-When @racket['unknown/alpha] and similar modes are used to load a
- bitmap, transparency information is instead represented by an alpha
- channel, not by a mask bitmap.
-
-Unlike an alpha channel, the mask bitmap is @italic{not} used
- automatically by drawing routines. The mask bitmap can be extracted
- and supplied explicitly as a mask (e.g., as the sixth argument to
- @method[dc<%> draw-bitmap]). The mask bitmap is used by
- @method[bitmap% save-file] when saving a bitmap as @racket['png] if
- the mask has the same dimensions as the saved bitmap. The mask bitmap
- is also used automatically when the bitmap is a control label.
-
-}
-
-@defmethod[(get-width)
-           exact-positive-integer?]{
-
-Gets the width of the bitmap in drawing units (which is the same as
-pixels of the @tech{backing scale} is 1.0).}
-
-
-@defmethod[(has-alpha-channel?)
-           boolean?]{
-
-Returns @racket[#t] if the bitmap has an alpha channel,
-@racket[#f] otherwise.
-
-}
-
-@defmethod[(is-color?)
-           boolean?]{
-
-Returns @racket[#f] if the bitmap is monochrome, @racket[#t] otherwise.
-
-}
-
-@defmethod[(load-file [in (or/c path-string? input-port?)]
-                      [kind (or/c 'unknown 'unknown/mask 'unknown/alpha
-                                  'gif 'gif/mask 'gif/alpha 
-                                  'jpeg 'jpeg/alpha
-                                  'png 'png/mask 'png/alpha
-                                  'xbm 'xbm/alpha 'xpm 'xpm/alpha
-                                  'bmp 'bmp/alpha)
-                            'unknown]
-                      [bg-color (or/c (is-a?/c color%) #f) #f]
-                      [complain-on-failure? any/c #f])
-           boolean?]{
-
-Loads a bitmap from a file format that read from @racket[in], unless
- the bitmap was produced by @racket[make-platform-bitmap], @racket[make-screen-bitmap],
- or @xmethod[canvas% make-bitmap] (in which case @|MismatchExn|).
- If the bitmap is in use by a
- @racket[bitmap-dc%] object or a control, the image data is not
- loaded. The bitmap changes its size and depth to match that of 
- the loaded image. If an error is encountered when reading the file format,
- an exception is raised only if @racket[complain-on-failure?] is true (which is
- @emph{not} the default).
-
-The @racket[kind] argument specifies the file's format:
-
-@itemize[
-
-@item{@racket['unknown] --- examine the file to determine its format; creates
-  either a monochrome or color bitmap without an alpha channel}
-@item{@racket['unknown/mask] --- like @racket['unknown], but see
-  @method[bitmap% get-loaded-mask]}
-@item{@racket['unknown/alpha] --- like @racket['unknown], but if the bitmap is
-  color, it has an alpha channel, and transparency in the image file is
-  recorded in the alpha channel}
-@item{@racket['gif] --- load a @as-index{GIF} bitmap file, creating a color
-  bitmap}
-@item{@racket['gif/mask] --- like @racket['gif], but see
-  @method[bitmap% get-loaded-mask]}
-@item{@racket['gif/alpha] --- like @racket['gif], but with an alpha channel}
-@item{@racket['jpeg] --- load a @as-index{JPEG} bitmap file, creating a color
-  bitmap}
-@item{@racket['jpeg/alpha] --- like @racket['jpeg], but with an alpha channel}
-@item{@racket['png] --- load a @as-index{PNG} bitmap file, creating a color or
-  monochrome bitmap}
-@item{@racket['png/mask] --- like @racket['png], but see
-  @method[bitmap% get-loaded-mask]}
-@item{@racket['png/alpha] --- like @racket['png], but always color and with an
-  alpha channel}
-@item{@racket['xbm] --- load an X bitmap (@as-index{XBM}) file; creates a
-  monochrome bitmap}
-@item{@racket['xbm/alpha] --- like @racket['xbm], but creates a color bitmap
-  with an alpha channel}
-@item{@racket['xpm] --- load an @as-index{XPM} bitmap file, creating a color
-  bitmap}
-@item{@racket['xpm/alpha] --- like @racket['xpm], but with an alpha channel}
-@item{@racket['bmp] --- load a Windows bitmap file, creating a color bitmap}
-@item{@racket['bmp/alpha] --- like @racket['bmp], but with an alpha channel}
-]
-
-An XBM image is always loaded as a monochrome bitmap. A 1-bit
- grayscale PNG without a mask or alpha channel is also loaded as a
- monochrome bitmap. An image in any other format is always loaded as a
- color bitmap.
-
-For PNG loading, if @racket[bg-color] is not @racket[#f], then it is
- combined with the file's alpha channel or mask (if any) while loading
- the image; in this case, no separate mask bitmap is generated and the
- alpha channel fills the bitmap, even if @racket['unknown/mask],
- @racket['png/mask] is specified for the format. If the format is
- specified as @racket['unknown] or @racket['png] and @racket[bg-color]
- is not specified, the PNG file is consulted for a background color to
- use for loading, and white is used if no background color is
- indicated in the file.
-
-@index["gamma correction"]{In} all PNG-loading modes, gamma correction
- is applied when the file provides a gamma value, otherwise gamma
- correction is not applied. The current display's gamma factor is
- determined by the @indexed-envvar{SCREEN_GAMMA} environment
- variable if it is defined. If the preference and environment variable
- are both undefined, a platform-specific default is used.
-
-After a bitmap is created, @method[bitmap% load-file] can be used
- only if the bitmap's @tech{backing scale} is @racket[1.0].}
-
-
-@defmethod[(make-dc)
-           (is-a?/c bitmap-dc%)]{
-
-Return @racket[(make-object bitmap-dc% this)].}
-
-
-@defmethod[(ok?)
-           boolean?]{
-
-Returns @racket[#t] if the bitmap is valid in the sense that an image
- file was loaded successfully. If @method[bitmap% ok?] returns
- @racket[#f], then drawing to or from the bitmap has no effect.
-
-}
-
-
-@defmethod[(save-file [name (or/c path-string? output-port?)]
-                      [kind (or/c 'png 'jpeg 'xbm 'xpm 'bmp)]
-                      [quality (integer-in 0 100) 75]
-                      [#:unscaled? unscaled? any/c #f])
-           boolean?]{
-
-Writes a bitmap to the named file or output stream.
-
-The @racket[kind] argument determined the type of file that is created,
- one of:
-
-@itemize[
-
- @item{@racket['png] --- save a @as-index{PNG} file}
-
- @item{@racket['jpeg] --- save a @as-index{JPEG} file}
-
- @item{@racket['xbm] --- save an X bitmap (@as-index{XBM}) file}
-
- @item{@racket['xpm] --- save an @as-index{XPM} bitmap file}
-
- @item{@racket['bmp] --- save a Windows bitmap file}
-
-]
-
-The @racket[quality] argument is used only for saving as @racket['jpeg], in
- which case it specifies the trade-off between image precision (high
- quality matches the content of the @racket[bitmap%] object more
- precisely) and size (low quality is smaller).
-
-When saving as @racket['png], if @method[bitmap% get-loaded-mask]
- returns a bitmap of the same size as this one, a grayscale version is
- included in the PNG file as the alpha channel.
-
-A monochrome bitmap saved as @racket['png] without a mask bitmap
- produces a 1-bit grayscale PNG file (which, when read with
- @method[bitmap% load-file], creates a monochrome @racket[bitmap%]
- object.)
-
-If the bitmap has a @tech{backing scale} other than 1.0, then it is
- effectively converted to a single pixel per drawing unit before
- saving unless @racket[unscaled?] is true.
-
-@history[#:changed "1.1" @elem{Added the @racket[#:unscaled?]
-optional argument.}]}
-
-
-@defmethod[(set-argb-pixels [x real?]
-                            [y real?]
-                            [width exact-nonnegative-integer?]
-                            [height exact-nonnegative-integer?]
-                            [pixels bytes?]
-                            [just-alpha? any/c #f]
-                            [pre-multiplied? any/c #f]
-                            [#:unscaled? unscaled? any/c #f])
-           void?]{
-
-The same as @xmethod[bitmap-dc% set-argb-pixels] when
-@racket[unscaled?] is @racket[#f], but the bitmap does not have to be
-selected into the DC.
-
-If the bitmap has a @tech{backing scale} other than @racket[1.0] and
-@racket[unscaled?] is true, then pixel values are installed ignoring
-the @tech{backing scale}. In that case, @racket[x], @racket[y],
-@racket[width], and @racket[height] are effectively in pixels instead
-of drawing units.
-
-@history[#:changed "1.1" @elem{Added the @racket[#:unscaled?]
-optional argument.}]}
-
-
-@defmethod[(set-loaded-mask [mask (is-a?/c bitmap%)])
-           void?]{
-
-See @method[bitmap% get-loaded-mask].
-
-}}
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/bitmap-dc-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/bitmap-dc-class.scrbl
deleted file mode 100644
index c7d0894f7c..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/bitmap-dc-class.scrbl
+++ /dev/null
@@ -1,196 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[bitmap-dc% object% (dc<%>)]{
-
-A @racket[bitmap-dc%] object allows drawing directly into a bitmap.  A
- @racket[bitmap%] object must be supplied at initialization or
- installed into a bitmap DC using @method[bitmap-dc% set-bitmap]
- before any other method of the DC is called, except @method[dc<%>
- get-text-extent], @method[dc<%> get-char-height], or @method[dc<%>
- get-char-width]. If any other @racket[bitmap-dc%] method is called
- before a bitmap is selected, the method call is ignored.
-
-Drawing to a @racket[bitmap-dc%] with a color bitmap is guaranteed to
- produce the same result as drawing into a @racket[canvas%] instance
- (with appropriate clipping and offsets). Thus, a @racket[bitmap-dc%]
- can be used for offscreen staging of canvas content.
-
-
-@defconstructor[([bitmap (or/c (is-a?/c bitmap%) #f)])]{
-
-Creates a new bitmap DC. If @racket[bitmap] is not @racket[#f], it is
- installed into the DC so that drawing commands on the DC draw to
- @racket[bitmap]. Otherwise, no bitmap is installed into the DC and
- @method[bitmap-dc% set-bitmap] must be called before any other method
- of the DC is called.
-
-}
-
-@defmethod[(draw-bitmap-section-smooth [source (is-a?/c bitmap%)]
-                                       [dest-x real?]
-                                       [dest-y real?]
-                                       [dest-width (and/c real? (not/c negative?))]
-                                       [dest-height (and/c real? (not/c negative?))]
-                                       [src-x real?]
-                                       [src-y real?]
-                                       [src-width (and/c real? (not/c negative?))]
-                                       [src-height (and/c real? (not/c negative?))]
-                                       [style (or/c 'solid 'opaque 'xor) 'solid]
-                                       [color (is-a?/c color%) (send the-color-database find-color "black")]
-                                       [mask (or/c (is-a?/c bitmap%) #f) #f])
-           boolean?]{
-
-The same as @method[dc<%> draw-bitmap-section], except that
- @racket[dest-width] and @racket[dest-height] cause the DC's
- transformation to be adjusted while drawing the bitmap so that the
- bitmap is scaled; and, if the DC's smoothing mode is
- @racket['unsmoothed], it is changed to @racket['aligned] while
- drawing.}
-
-@defmethod[(get-argb-pixels [x real?]
-                            [y real?]
-                            [width exact-nonnegative-integer?]
-                            [height exact-nonnegative-integer?]
-                            [pixels (and/c bytes? (not/c immutable?))]
-                            [just-alpha? any/c #f]
-                            [pre-multiplied? any/c #f])
-           void?]{
-
-Gets a rectangle of pixels in the bitmap, subject to the same rules
- and performance characteristics of @method[bitmap-dc% get-pixel],
- except that the block get is likely to be faster than the sequence of
- individual gets. Also, the @racket[bitmap%] class also provides the
- same method directly, so it is not necessary to select a bitmap into
- a DC to extracts its pixel values.
-
-The pixel RGB values and alphas are copied into @racket[pixels] 
- (or just alpha values if @racket[just-alpha?] is true). The first byte
- represents an alpha value of the pixel at (@racket[x], @racket[y]),
- the second byte represents a red value of the pixel at (@racket[x],
- @racket[y]), the third byte is the green value, etc. In this way, the
- first @math{@racket[width] * @racket[height] * 4} bytes of
- @racket[pixels] are set to reflect the current pixel values in the
- DC. The pixels are in row-major order, left to right then top to
- bottom.
-
-If the bitmap has an alpha channel, then the alpha value for each pixel
- is always set in @racket[pixels]. 
- If @racket[just-alpha?] is false and the bitmap does not have an alpha
- channel, then the alpha value for each pixel is set to 255. If
- @racket[just-alpha?] is true, then @italic{only} the alpha value is set
- for each pixel; if the bitmap has no alpha channel, then the alpha
- value is based on each pixel's inverted RGB average. Thus, when a
- bitmap has a separate mask bitmap, the same @racket[pixels] byte
- string is in general filled from two bitmaps: one (the main image)
- for the pixel values and one (the mask) for the alpha values.
-
-If @racket[pre-multiplied?] is true, @racket[just-alpha?] is false,
- and the bitmap has an alpha channel, then RGB values in the result
- are scaled by the corresponding alpha value (i.e., multiplied by the
- alpha value and then divided by 255).
-
-If the bitmap has a @tech{backing scale} other than @racket[1.0], the
- result of @method[bitmap-dc% get-argb-pixels] is as if the bitmap is
- drawn to a bitmap with a backing scale of @racket[1.0] and the pixels
- of the target bitmap are returned.}
-
-
-@defmethod[(get-bitmap)
-           (or/c (is-a?/c bitmap%) #f)]{
-
-Gets the bitmap currently installed in the DC, or @racket[#f] if no
- bitmap is installed. See @method[bitmap-dc% set-bitmap] for more
- information.
-
-}
-
-@defmethod[(get-pixel [x real?]
-                      [y real?]
-                      [color (is-a?/c color%)])
-           boolean?]{
-
-Fills @racket[color] with the color of the current pixel at position
-(@racket[x], @racket[y]) in the drawing context. If the color is
-successfully obtained, the return value is @racket[#t], otherwise the
-result is @racket[#f].
-
-}
-
-@defmethod[(set-argb-pixels [x real?]
-                            [y real?]
-                            [width exact-nonnegative-integer?]
-                            [height exact-nonnegative-integer?]
-                            [pixels bytes?]
-                            [just-alpha? any/c #f]
-                            [pre-multiplied? any/c #f])
-           void?]{
-
-Sets a rectangle of pixels in the bitmap, unless
- the DC's current bitmap was produced by @racket[make-screen-bitmap] or 
- @xmethod[canvas% make-bitmap] (in which case @|MismatchExn|).
-
-The pixel RGB values are taken from @racket[pixels]. The first byte
- represents an alpha value, the second byte represents a red value to
- used for the pixel at (@racket[x], @racket[y]), the third byte is a blue
- value, etc. In this way, the first
- @math{@racket[width] * @racket[height] * 4} bytes of @racket[pixels]
- determine the new pixel values in the DC. The pixels are in row-major
- order, left to right then top to bottom.
-
-If @racket[just-alpha?] is false, then the alpha value for each pixel is
- used only if the DC's current bitmap has an alpha channel. If 
- @racket[just-alpha?] is true and the bitmap has an alpha channel, then the
- bitmap is not modified. If
- @racket[just-alpha?] is true and the bitmap has no alpha channel, then each
- pixel is set based @italic{only} on the alpha value, but inverted to serve
- as a mask. Thus, when working with bitmaps that have an associated mask
- bitmap instead of an alpha channel, the same
- @racket[pixels] byte string is used with two bitmaps: one
- (the main image) for the pixel values and one (the mask) for the
- alpha values.
-
-If @racket[pre-multiplied?] is true, @racket[just-alpha?] is false,
- and the bitmap has an alpha channel, then RGB values in
- @racket[pixels] are interpreted as scaled by the corresponding alpha value
- (i.e., multiplied by the alpha value and then divided by 255). If an
- R, G, or B value is greater than its corresponding alpha value (which
- is not possible if the value is properly scaled), then it is effectively 
- reduced to the alpha value.
-
-If the bitmap has a @tech{backing scale} other than @racket[1.0], then
- @racket[pixels] are effectively scaled by the backing scale to obtain
- pixel values that are installed into the bitmap.}
-
-
-@defmethod[(set-bitmap [bitmap (or/c (is-a?/c bitmap%) #f)])
-           void?]{
-
-Installs a bitmap into the DC, so that drawing operations on the bitmap
- DC draw to the bitmap. A bitmap is removed from a DC by setting the
- bitmap to @racket[#f].
-
-A bitmap can be selected into at most one bitmap DC, and only when it
- is not used by a control (as a label) or in a @racket[pen%] or
- @racket[brush%] (as a stipple). If the argument to @method[bitmap-dc%
- set-bitmap] is already in use by another DC, a control, a
- @racket[pen%], or a @racket[brush%], @|MismatchExn|.
-
-}
-
-@defmethod[(set-pixel [x real?]
-                      [y real?]
-                      [color (is-a?/c color%)])
-           void?]{
-
-Sets a pixel in the bitmap.
-
-The current clipping region might not affect the pixel change.  Under
- X, interleaving drawing commands with @method[bitmap-dc% set-pixel]
- calls (for the same @racket[bitmap-dc%] object) incurs a substantial
- performance penalty, except for interleaved calls to
- @method[bitmap-dc% get-pixel], @method[bitmap-dc% get-argb-pixels],
- and @method[bitmap-dc% set-argb-pixels].
-
-}}
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/blurbs.rkt b/pkgs/draw-pkgs/draw-doc/scribblings/draw/blurbs.rkt
deleted file mode 100644
index 4ad6c565d4..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/blurbs.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#readerscribble/reader
-(module blurbs racket/base
-  (require scribble/struct
-           scribble/manual
-           scribble/scheme
-           scribble/decode
-           (for-label racket/draw
-                      racket/base)
-           (for-syntax racket/base))
-
-  (provide (all-defined-out))
-
-  (define (p . l)
-    (decode-paragraph l))
-
-  (define PrintNote
-    (make-splice
-     (list
-      @p{Be sure to use the following methods to start/end drawing:}
-      @itemize[@item{@method[dc<%> start-doc]}
-               @item{@method[dc<%> start-page]}
-               @item{@method[dc<%> end-page]}
-               @item{@method[dc<%> end-doc]}]
-      @p{Attempts to use a drawing method outside of an active page raises an exception.})))
-
-  (define reference-doc '(lib "scribblings/reference/reference.scrbl"))
-
-  (define SeeMzParam @elem{(see @secref[#:doc reference-doc "parameters"])})
-  
-  (define DrawSizeNote "")
-
-  (define MismatchExn @elem{an @racket[exn:fail:contract] exception is raised})
-
-  (define (colorName name name2 r g b)
-    (make-element #f
-                  (list (make-element `(bg-color ,r ,g ,b)
-                                      (list (hspace 5)))
-                        (hspace 1)
-                        (bytes->string/latin-1 name))))
-
-  (define (slant . s)
-    (make-element "slant" (decode-content s)))
-
-  (define (res-sym s)
-    (string->symbol (string-append "GRacket:" s)))
-
-  (define (boxisfill which what)
-    @elem{The @|which| box is filled with @|what|.})
-  (define (boxisfillnull which what)
-    @elem{The @|which| box is filled with @|what|, unless @|which| is @racket[#f].})
-
-  )
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/brush-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/brush-class.scrbl
deleted file mode 100644
index a604ab74d8..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/brush-class.scrbl
+++ /dev/null
@@ -1,214 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          scribble/eval
-          (for-label racket/draw/unsafe/brush
-                     (only-in ffi/unsafe cpointer?)))
-
-@(define class-eval (make-base-eval))
-@(interaction-eval #:eval class-eval (require racket/class racket/draw))
-@defclass/title[brush% object% ()]{
-
-A brush is a drawing tool with a color and a style that is used for
- filling in areas, such as the interior of a rectangle or ellipse.  In
- a monochrome destination, all non-white brushes are drawn as black.
-
-In addition to its color and style, a brush can have a @deftech{brush stipple} bitmap.
- Painting with a
- stipple brush is similar to calling @method[dc<%> draw-bitmap] with
- the stipple bitmap in the filled region.
-
-As an alternative to a color, style, and stipple, a brush can have a
- @deftech{gradient} that is a @racket[linear-gradient%] or
- @racket[radial-gradient%]. When a brush has a gradient and the target
- for drawing is not monochrome, then other brush settings are
- ignored. With a gradient, for each point in a drawing destination,
- the gradient associates a color to the point based on starting and
- ending colors and starting and ending lines (for a linear gradient)
- or circles (for a radial gradient); a gradient-assigned color is
- applied for each point that is touched when drawing with the brush.
-
-By default, coordinates in a stipple or gradient are transformed by the
- drawing context's transformation when the brush is used, but a brush
- can have its own @deftech{brush transformation} that is used, instead.
- A brush transformation has the same representation and meaning as for
- @xmethod[dc<%> get-transformation].
-
-A @deftech{brush style} is one of the following (but is ignored if the brush
- has a @tech{gradient} and the target is not monochrome):
-
-@itemize[
-
- @item{@indexed-racket['transparent] --- Draws with no effect (on the
-       interior of the drawn shape).}
-
- @item{@indexed-racket['solid] --- Draws using the brush's color. If a
-        monochrome @tech{brush stipple} is installed into the brush, black pixels
-        from the stipple are transferred to the destination using the
-        brush's color, and white pixels from the stipple are not
-        transferred.}
-
- @item{@indexed-racket['opaque] --- The same as @racket['solid] for a color
-        @tech{brush stipple}. For a monochrome stipple, white pixels from 
-        the stipple are
-        transferred to the destination using the destination's
-        background color.}
-
- @item{@indexed-racket['xor] --- The same as @racket['solid], accepted 
-        only for partial backward compatibility.}
-
- @item{@indexed-racket['hilite] --- Draws with black and a @racket[0.3] alpha.}
-
- @item{@indexed-racket['panel] --- The same as @racket['solid], accepted 
-        only for partial backward compatibility.}
-
- @item{The following modes correspond to built-in @tech{brush stipples} drawn in
-       @racket['solid] mode:
-
-  @itemize[
-  @item{@indexed-racket['bdiagonal-hatch] --- diagonal lines, top-left to bottom-right}
-  @item{@indexed-racket['crossdiag-hatch] --- crossed diagonal lines}
-  @item{@indexed-racket['fdiagonal-hatch] --- diagonal lines, top-right to bottom-left}
-  @item{@indexed-racket['cross-hatch] --- crossed horizontal and vertical lines}
-  @item{@indexed-racket['horizontal-hatch] --- horizontal lines}
-  @item{@indexed-racket['vertical-hatch] --- vertical lines}
-  ]
-
-        However, when a specific @tech{brush stipple} is installed into the brush,
-        the above modes are ignored and @racket['solid] is
-        used, instead.}
-
-]
-
-@index['("drawing" "outlines")]{To} draw outline shapes (such as
- unfilled boxes and ellipses), use the @racket['transparent] brush
- style.
-
-To avoid creating multiple brushes with the same characteristics, use
- the global @racket[brush-list%] object
- @indexed-racket[the-brush-list], or provide a color and style to
- @xmethod[dc<%> set-brush].
-
-See also @racket[make-brush].
-
-
-@defconstructor[([color (or/c string? (is-a?/c color%)) "black"]
-                 [style brush-style/c 'solid]
-                 [stipple (or/c #f (is-a?/c bitmap%))
-                          #f]
-                 [gradient (or/c #f 
-                                 (is-a?/c linear-gradient%)
-                                 (is-a?/c radial-gradient%))
-                           #f]
-                 [transformation (or/c #f (vector/c (vector/c real? real? real? 
-                                                              real? real? real?)
-                                                     real? real? real? real? real?))
-                                 #f])]{
-
-Creates a brush with the given color, @tech{brush style}, @tech{brush
- stipple}, @tech{gradient}, and @tech{brush transformation} (which is
- kept only if the gradient or stipple is non-@racket[#f]). For the
- case that the color is specified using a name, see
- @racket[color-database<%>] for information about color names; if the
- name is not known, the brush's color is black.}
-
-@defmethod[(get-color)
-           (is-a?/c color%)]{
-
-Returns the brush's color.
-
-}
-
-@defmethod[(get-gradient)
-           (or/c (is-a?/c linear-gradient%)
-                 (is-a?/c radial-gradient%)
-                 #f)]{
-
-Gets the @tech{gradient}, or @racket[#f] if the brush has no gradient.}
-
-
-@defmethod[(get-handle) (or/c cpointer? #f)]{
-
-Returns a low-level handle for the brush content, but only for brushes
-created with @racket[make-handle-brush]; otherwise, the result is @racket[#f].}
-
-
-@defmethod[(get-stipple)
-           (or/c (is-a?/c bitmap%) #f)]{
-
-Gets the @tech{brush stipple} bitmap, or @racket[#f] if the brush has no stipple.}
-
-
-@defmethod[(get-style)
-           brush-style/c]{
-
-Returns the @tech{brush style}. See @racket[brush%] for information about
-brush styles.}
-
-
-@defmethod[(get-transformation) (or/c #f (vector/c (vector/c real? real? real? real? real? real?)
-                                                   real? real? real? real? real?))]{
-
-Returns the brush's @tech{brush transformation}, if any.
-
-If a brush with a stipple or gradient also has a transformation, then the
-transformation applies to the stipple or gradient's coordinates instead of the
-target drawing context's transformation; otherwise, the target drawing
-context's transformation applies to stipple and gradient coordinates.}
-
-
-@defmethod[(is-immutable?)
-           boolean?]{
-
-Returns @racket[#t] if the brush object is immutable.
-
-}
-
-
-@defmethod*[([(set-color [color (is-a?/c color%)])
-              void?]
-             [(set-color [color-name string?])
-              void?]
-             [(set-color [red byte?] [green byte?] [blue byte?])
-              void?])]{
-
-Sets the brush's color.  A brush cannot be modified if it was obtained
- from a @racket[brush-list%] or while it is selected into a drawing
- context.
-
-For the case that the color is specified using a string, see
- @racket[color-database<%>] for information about color names.
-
-}
-
-@defmethod[(set-stipple [bitmap (or/c (is-a?/c bitmap%) #f)]
-                 [transformation (or/c #f (vector/c (vector/c real? real? real? 
-                                                              real? real? real?)
-                                                     real? real? real? real? real?))
-                                 #f])
-           void?]{
-
-Sets or removes the @tech{brush stipple} bitmap, where @racket[#f]
- removes the stipple. The @tech{brush transformation} is set at the
- same time to @racket[transformation]. See @racket[brush%] for
- information about drawing with stipples.
-
-If @racket[bitmap] is modified while is associated with a brush, the
- effect on the brush is unspecified. A brush cannot be modified if it
- was obtained from a @racket[brush-list%] or while it is selected into
- a drawing context.
-
-}
-
-@defmethod[(set-style [style brush-style/c])
-           void?]{
-
-Sets the @tech{brush style}. See
-@racket[brush%] for information about the possible styles.
-
-A brush cannot be modified if it was obtained from a
- @racket[brush-list%] or while it is selected into a drawing
- context.
-
-}}
-
-@(close-eval class-eval)
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/brush-list-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/brush-list-class.scrbl
deleted file mode 100644
index b2f25e9989..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/brush-list-class.scrbl
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[brush-list% object% ()]{
-
-A @racket[brush-list%] object maintains a list of @racket[brush%]
- objects to avoid creating brushes repeatedly. A @racket[brush%]
- object in a brush list cannot be mutated.
-
-A global brush list, @racket[the-brush-list], is created
- automatically.
-
-
-@defconstructor[()]{
-
-Creates an empty brush list.
-
-}
-
-@defmethod*[([(find-or-create-brush [color (is-a?/c color%)]
-                                    [style (or/c 'transparent 'solid 'opaque
-                                                 'xor 'hilite 'panel 
-                                                 'bdiagonal-hatch 'crossdiag-hatch 
-                                                 'fdiagonal-hatch 'cross-hatch 
-                                                 'horizontal-hatch 'vertical-hatch)])
-              (is-a?/c brush%)]
-             [(find-or-create-brush [color-name string?]
-                                    [style (or/c 'transparent 'solid 'opaque 
-                                                 'xor 'hilite 'panel 
-                                                 'bdiagonal-hatch 'crossdiag-hatch 
-                                                 'fdiagonal-hatch 'cross-hatch 
-                                                 'horizontal-hatch 'vertical-hatch)])
-              (or/c (is-a?/c brush%) #f)])]{
-
-Finds a brush of the given specification, or creates one and adds it
- to the list. See @racket[brush%] for a further explanation of the
- arguments, which are the same as @racket[brush%]'s initialization
- arguments.
-
-}}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/color-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/color-class.scrbl
deleted file mode 100644
index c681703821..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/color-class.scrbl
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[color% object% ()]{
-
-A color is an object representing a red-green-blue (RGB) combination
- of primary colors plus an ``alpha'' for opacity. Each red, green, or
- blue component of the color is an exact integer in the range 0 to
- 255, inclusive, and the alpha value is a real number between 0 and 1,
- inclusive.  For example, (0, 0, 0, 1.0) is solid black, (255, 255,
- 255, 1.0) is solid white, (255, 0, 0, 1.0) is solid red, and (255, 0,
- 0, 0.5) is translucent red.
-
-See @racket[color-database<%>] for information about obtaining a color
-object using a color name, and see also @racket[make-color].
-
-
-@defconstructor*/make[(()
-                       ([red byte?] [green byte?] [blue byte?]
-                                    [alpha (real-in 0 1) 1.0])
-                       ([color-name-or-obj (or/c string? (is-a?/c color%))]))]{
-
-  Creates a new color.
-
-  If three or four arguments are supplied to the constructor, the
-  color is created with those RGB and alpha values.
-
-  If a single @racket[color%] object is supplied, the color
-  is created with the same RGB and alpha values as the given
-  color.
-
-  If a string is supplied, then it is passed to the
-  @racket[color-database<%>]'s @method[color-database<%> find-color]
-  method to find a color (signaling an error if the color is not in
-  the @racket[color-database<%>]'s @method[color-database<%> get-names]
-  method's result).
-
-  If no arguments are supplied, the new color is black.
-}
-
-@defmethod[(red) byte?]{
-  Returns the red component of the color.}
-
-@defmethod[(green) byte?]{
-  Returns the green component of the color.}
-
-@defmethod[(blue) byte?]{
-  Returns the blue component of the color.}
-
-@defmethod[(alpha) (real-in 0 1)]{
-  Returns the alpha component (i.e., opacity) of the color.}
-
-@defmethod[(set [red byte?] [green byte?] [blue byte?]
-                [alpha (real-in 0 1) 1.0])
-           void?]{
-  Sets the four (red, green, blue, and alpha) component values of the color.}
-
-@defmethod[(copy-from [src (is-a?/c color%)]) (is-a?/c color%)]{
-  Copies the RGB values of another color object to this one, returning
-  this object as the result.}
-
-@defmethod[(is-immutable?) boolean?]{
-  Returns @racket[#t] if the color object is immutable.
-
-  See also @racket[make-color] and @xmethod[color-database<%> find-color].}
-
-@defmethod[(ok?) #t]{ 
-  Returns @racket[#t] to indicate that the color object is valid.
-
-  (Historically, the result could be @racket[#f], but color objects 
-  are now always valid.)}
-
-}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/color-database-intf.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/color-database-intf.scrbl
deleted file mode 100644
index f7707d9aac..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/color-database-intf.scrbl
+++ /dev/null
@@ -1,218 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[color-database<%> ()]{
-
-The global @indexed-racket[the-color-database] object is an instance of
- @racket[color-database<%>]. It maintains a database of standard RGB
- colors for a predefined set of named colors (such as ``black'' and
- ``light grey'').
-
-The following colors are in the database:
-
-@racketblock[
-@#,colorName[#"Orange Red" #"OrangeRed" 255 69 0]
-@#,colorName[#"OrangeRed" #"OrangeRed" 255 69 0]
-@#,colorName[#"Tomato" #"Tomato" 255 99 71]
-@#,colorName[#"DarkRed" #"DarkRed" 139 0 0]
-@#,colorName[#"Red" #"Red" 255 0 0]
-@#,colorName[#"Firebrick" #"Firebrick" 178 34 34]
-@#,colorName[#"Crimson" #"Crimson" 220 20 60]
-@#,colorName[#"DeepPink" #"DeepPink" 255 20 147]
-@#,colorName[#"Maroon" #"Maroon" 176 48 96]
-@#,colorName[#"Indian Red" #"IndianRed" 205 92 92]
-@#,colorName[#"IndianRed" #"IndianRed" 205 92 92]
-@#,colorName[#"Medium Violet Red" #"MediumVioletRed" 199 21 133]
-@#,colorName[#"MediumVioletRed" #"MediumVioletRed" 199 21 133]
-@#,colorName[#"Violet Red" #"VioletRed" 208 32 144]
-@#,colorName[#"VioletRed" #"VioletRed" 208 32 144]
-@#,colorName[#"LightCoral" #"LightCoral" 240 128 128]
-@#,colorName[#"HotPink" #"HotPink" 255 105 180]
-@#,colorName[#"PaleVioletRed" #"PaleVioletRed" 219 112 147]
-@#,colorName[#"LightPink" #"LightPink" 255 182 193]
-@#,colorName[#"RosyBrown" #"RosyBrown" 188 143 143]
-@#,colorName[#"Pink" #"Pink" 255 192 203]
-@#,colorName[#"Orchid" #"Orchid" 218 112 214]
-@#,colorName[#"LavenderBlush" #"LavenderBlush" 255 240 245]
-@#,colorName[#"Snow" #"Snow" 255 250 250]
-@#,colorName[#"Chocolate" #"Chocolate" 210 105 30]
-@#,colorName[#"SaddleBrown" #"SaddleBrown" 139 69 19]
-@#,colorName[#"Brown" #"Brown" 132 60 36]
-@#,colorName[#"DarkOrange" #"DarkOrange" 255 140 0]
-@#,colorName[#"Coral" #"Coral" 255 127 80]
-@#,colorName[#"Sienna" #"Sienna" 160 82 45]
-@#,colorName[#"Orange" #"Orange" 255 165 0]
-@#,colorName[#"Salmon" #"Salmon" 250 128 114]
-@#,colorName[#"Peru" #"Peru" 205 133 63]
-@#,colorName[#"DarkGoldenrod" #"DarkGoldenrod" 184 134 11]
-@#,colorName[#"Goldenrod" #"Goldenrod" 218 165 32]
-@#,colorName[#"SandyBrown" #"SandyBrown" 244 164 96]
-@#,colorName[#"LightSalmon" #"LightSalmon" 255 160 122]
-@#,colorName[#"DarkSalmon" #"DarkSalmon" 233 150 122]
-@#,colorName[#"Gold" #"Gold" 255 215 0]
-@#,colorName[#"Yellow" #"Yellow" 255 255 0]
-@#,colorName[#"Olive" #"Olive" 128 128 0]
-@#,colorName[#"Burlywood" #"Burlywood" 222 184 135]
-@#,colorName[#"Tan" #"Tan" 210 180 140]
-@#,colorName[#"NavajoWhite" #"NavajoWhite" 255 222 173]
-@#,colorName[#"PeachPuff" #"PeachPuff" 255 218 185]
-@#,colorName[#"Khaki" #"Khaki" 240 230 140]
-@#,colorName[#"DarkKhaki" #"DarkKhaki" 189 183 107]
-@#,colorName[#"Moccasin" #"Moccasin" 255 228 181]
-@#,colorName[#"Wheat" #"Wheat" 245 222 179]
-@#,colorName[#"Bisque" #"Bisque" 255 228 196]
-@#,colorName[#"PaleGoldenrod" #"PaleGoldenrod" 238 232 170]
-@#,colorName[#"BlanchedAlmond" #"BlanchedAlmond" 255 235 205]
-@#,colorName[#"Medium Goldenrod" #"MediumGoldenrod" 234 234 173]
-@#,colorName[#"MediumGoldenrod" #"MediumGoldenrod" 234 234 173]
-@#,colorName[#"PapayaWhip" #"PapayaWhip" 255 239 213]
-@#,colorName[#"MistyRose" #"MistyRose" 255 228 225]
-@#,colorName[#"LemonChiffon" #"LemonChiffon" 255 250 205]
-@#,colorName[#"AntiqueWhite" #"AntiqueWhite" 250 235 215]
-@#,colorName[#"Cornsilk" #"Cornsilk" 255 248 220]
-@#,colorName[#"LightGoldenrodYellow" #"LightGoldenrodYellow" 250 250 210]
-@#,colorName[#"OldLace" #"OldLace" 253 245 230]
-@#,colorName[#"Linen" #"Linen" 250 240 230]
-@#,colorName[#"LightYellow" #"LightYellow" 255 255 224]
-@#,colorName[#"SeaShell" #"SeaShell" 255 245 238]
-@#,colorName[#"Beige" #"Beige" 245 245 220]
-@#,colorName[#"FloralWhite" #"FloralWhite" 255 250 240]
-@#,colorName[#"Ivory" #"Ivory" 255 255 240]
-@#,colorName[#"Green" #"Green" 0 255 0]
-@#,colorName[#"LawnGreen" #"LawnGreen" 124 252 0]
-@#,colorName[#"Chartreuse" #"Chartreuse" 127 255 0]
-@#,colorName[#"Green Yellow" #"GreenYellow" 173 255 47]
-@#,colorName[#"GreenYellow" #"GreenYellow" 173 255 47]
-@#,colorName[#"Yellow Green" #"YellowGreen" 154 205 50]
-@#,colorName[#"YellowGreen" #"YellowGreen" 154 205 50]
-@#,colorName[#"Medium Forest Green" #"MediumForestGreen" 107 142 35]
-@#,colorName[#"OliveDrab" #"OliveDrab" 107 142 35]
-@#,colorName[#"MediumForestGreen" #"MediumForestGreen" 107 142 35]
-@#,colorName[#"Dark Olive Green" #"DarkOliveGreen" 85 107 47]
-@#,colorName[#"DarkOliveGreen" #"DarkOliveGreen" 85 107 47]
-@#,colorName[#"DarkSeaGreen" #"DarkSeaGreen" 143 188 139]
-@#,colorName[#"Lime" #"Lime" 0 255 0]
-@#,colorName[#"Dark Green" #"DarkGreen" 0 100 0]
-@#,colorName[#"DarkGreen" #"DarkGreen" 0 100 0]
-@#,colorName[#"Lime Green" #"LimeGreen" 50 205 50]
-@#,colorName[#"LimeGreen" #"LimeGreen" 50 205 50]
-@#,colorName[#"Forest Green" #"ForestGreen" 34 139 34]
-@#,colorName[#"ForestGreen" #"ForestGreen" 34 139 34]
-@#,colorName[#"Spring Green" #"SpringGreen" 0 255 127]
-@#,colorName[#"SpringGreen" #"SpringGreen" 0 255 127]
-@#,colorName[#"Medium Spring Green" #"MediumSpringGreen" 0 250 154]
-@#,colorName[#"MediumSpringGreen" #"MediumSpringGreen" 0 250 154]
-@#,colorName[#"Sea Green" #"SeaGreen" 46 139 87]
-@#,colorName[#"SeaGreen" #"SeaGreen" 46 139 87]
-@#,colorName[#"Medium Sea Green" #"MediumSeaGreen" 60 179 113]
-@#,colorName[#"MediumSeaGreen" #"MediumSeaGreen" 60 179 113]
-@#,colorName[#"Aquamarine" #"Aquamarine" 112 216 144]
-@#,colorName[#"LightGreen" #"LightGreen" 144 238 144]
-@#,colorName[#"Pale Green" #"PaleGreen" 152 251 152]
-@#,colorName[#"PaleGreen" #"PaleGreen" 152 251 152]
-@#,colorName[#"Medium Aquamarine" #"MediumAquamarine" 102 205 170]
-@#,colorName[#"MediumAquamarine" #"MediumAquamarine" 102 205 170]
-@#,colorName[#"Turquoise" #"Turquoise" 64 224 208]
-@#,colorName[#"LightSeaGreen" #"LightSeaGreen" 32 178 170]
-@#,colorName[#"Medium Turquoise" #"MediumTurquoise" 72 209 204]
-@#,colorName[#"MediumTurquoise" #"MediumTurquoise" 72 209 204]
-@#,colorName[#"Honeydew" #"Honeydew" 240 255 240]
-@#,colorName[#"MintCream" #"MintCream" 245 255 250]
-@#,colorName[#"RoyalBlue" #"RoyalBlue" 65 105 225]
-@#,colorName[#"DodgerBlue" #"DodgerBlue" 30 144 255]
-@#,colorName[#"DeepSkyBlue" #"DeepSkyBlue" 0 191 255]
-@#,colorName[#"CornflowerBlue" #"CornflowerBlue" 100 149 237]
-@#,colorName[#"Steel Blue" #"SteelBlue" 70 130 180]
-@#,colorName[#"SteelBlue" #"SteelBlue" 70 130 180]
-@#,colorName[#"LightSkyBlue" #"LightSkyBlue" 135 206 250]
-@#,colorName[#"Dark Turquoise" #"DarkTurquoise" 0 206 209]
-@#,colorName[#"DarkTurquoise" #"DarkTurquoise" 0 206 209]
-@#,colorName[#"Cyan" #"Cyan" 0 255 255]
-@#,colorName[#"Aqua" #"Aqua" 0 255 255]
-@#,colorName[#"DarkCyan" #"DarkCyan" 0 139 139]
-@#,colorName[#"Teal" #"Teal" 0 128 128]
-@#,colorName[#"Sky Blue" #"SkyBlue" 135 206 235]
-@#,colorName[#"SkyBlue" #"SkyBlue" 135 206 235]
-@#,colorName[#"Cadet Blue" #"CadetBlue" 96 160 160]
-@#,colorName[#"CadetBlue" #"CadetBlue" 95 158 160]
-@#,colorName[#"Dark Slate Gray" #"DarkSlateGray" 47 79 79]
-@#,colorName[#"DarkSlateGray" #"DarkSlateGray" 47 79 79]
-@#,colorName[#"LightSlateGray" #"LightSlateGray" 119 136 153]
-@#,colorName[#"SlateGray" #"SlateGray" 112 128 144]
-@#,colorName[#"Light Steel Blue" #"LightSteelBlue" 176 196 222]
-@#,colorName[#"LightSteelBlue" #"LightSteelBlue" 176 196 222]
-@#,colorName[#"Light Blue" #"LightBlue" 173 216 230]
-@#,colorName[#"LightBlue" #"LightBlue" 173 216 230]
-@#,colorName[#"PowderBlue" #"PowderBlue" 176 224 230]
-@#,colorName[#"PaleTurquoise" #"PaleTurquoise" 175 238 238]
-@#,colorName[#"LightCyan" #"LightCyan" 224 255 255]
-@#,colorName[#"AliceBlue" #"AliceBlue" 240 248 255]
-@#,colorName[#"Azure" #"Azure" 240 255 255]
-@#,colorName[#"Medium Blue" #"MediumBlue" 0 0 205]
-@#,colorName[#"MediumBlue" #"MediumBlue" 0 0 205]
-@#,colorName[#"DarkBlue" #"DarkBlue" 0 0 139]
-@#,colorName[#"Midnight Blue" #"MidnightBlue" 25 25 112]
-@#,colorName[#"MidnightBlue" #"MidnightBlue" 25 25 112]
-@#,colorName[#"Navy" #"Navy" 36 36 140]
-@#,colorName[#"Blue" #"Blue" 0 0 255]
-@#,colorName[#"Indigo" #"Indigo" 75 0 130]
-@#,colorName[#"Blue Violet" #"BlueViolet" 138 43 226]
-@#,colorName[#"BlueViolet" #"BlueViolet" 138 43 226]
-@#,colorName[#"Medium Slate Blue" #"MediumSlateBlue" 123 104 238]
-@#,colorName[#"MediumSlateBlue" #"MediumSlateBlue" 123 104 238]
-@#,colorName[#"Slate Blue" #"SlateBlue" 106 90 205]
-@#,colorName[#"SlateBlue" #"SlateBlue" 106 90 205]
-@#,colorName[#"Purple" #"Purple" 160 32 240]
-@#,colorName[#"Dark Slate Blue" #"DarkSlateBlue" 72 61 139]
-@#,colorName[#"DarkSlateBlue" #"DarkSlateBlue" 72 61 139]
-@#,colorName[#"DarkViolet" #"DarkViolet" 148 0 211]
-@#,colorName[#"Dark Orchid" #"DarkOrchid" 153 50 204]
-@#,colorName[#"DarkOrchid" #"DarkOrchid" 153 50 204]
-@#,colorName[#"MediumPurple" #"MediumPurple" 147 112 219]
-@#,colorName[#"Cornflower Blue" #"CornflowerBlue" 68 64 108]
-@#,colorName[#"Medium Orchid" #"MediumOrchid" 186 85 211]
-@#,colorName[#"MediumOrchid" #"MediumOrchid" 186 85 211]
-@#,colorName[#"Magenta" #"Magenta" 255 0 255]
-@#,colorName[#"Fuchsia" #"Fuchsia" 255 0 255]
-@#,colorName[#"DarkMagenta" #"DarkMagenta" 139 0 139]
-@#,colorName[#"Violet" #"Violet" 238 130 238]
-@#,colorName[#"Plum" #"Plum" 221 160 221]
-@#,colorName[#"Lavender" #"Lavender" 230 230 250]
-@#,colorName[#"Thistle" #"Thistle" 216 191 216]
-@#,colorName[#"GhostWhite" #"GhostWhite" 248 248 255]
-@#,colorName[#"White" #"White" 255 255 255]
-@#,colorName[#"WhiteSmoke" #"WhiteSmoke" 245 245 245]
-@#,colorName[#"Gainsboro" #"Gainsboro" 220 220 220]
-@#,colorName[#"Light Gray" #"LightGray" 211 211 211]
-@#,colorName[#"LightGray" #"LightGray" 211 211 211]
-@#,colorName[#"Silver" #"Silver" 192 192 192]
-@#,colorName[#"Gray" #"Gray" 190 190 190]
-@#,colorName[#"Dark Gray" #"DarkGray" 169 169 169]
-@#,colorName[#"DarkGray" #"DarkGray" 169 169 169]
-@#,colorName[#"Dim Gray" #"DimGray" 105 105 105]
-@#,colorName[#"DimGray" #"DimGray" 105 105 105]
-@#,colorName[#"Black" #"Black" 0 0 0]
-]
-
-The names are not case-sensitive.
-
-See also @racket[color%].
-
-
-
-
-@defmethod[(find-color [color-name string?])
-           (or/c (is-a?/c color%) #f)]{
-
-Finds a color by name (character case is ignored). If no color is
- found for the name, @racket[#f] is returned, otherwise the result
- is an immutable color object.}
-
-
-@defmethod[(get-names) (listof string?)]{
-
-Returns an alphabetically sorted list of case-folded color names for which
-@method[color-database<%> find-color] returns a @racket[color%] value.}
-
-}
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/common.rkt b/pkgs/draw-pkgs/draw-doc/scribblings/draw/common.rkt
deleted file mode 100644
index 24b05e9269..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/common.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-(module common racket/base
-  (require scribble/manual
-           scribble/basic
-           scribble/eval
-           racket/class
-           racket/contract
-           "blurbs.rkt"
-           (only-in scribblings/reference/mz AllUnix exnraise))
-  (provide (all-from-out scribble/manual)
-           (all-from-out scribble/basic)
-           (all-from-out scribble/eval)
-           (all-from-out racket/class)
-           (all-from-out racket/contract)
-           (all-from-out "blurbs.rkt")
-           (all-from-out scribblings/reference/mz))
-
-  (require (for-label racket/draw
-                      racket/gui/base
-                      racket/class
-                      racket/contract
-                      racket/base))
-  (provide (for-label (all-from-out racket/draw)
-                      (all-from-out racket/gui/base)
-                      (all-from-out racket/class)
-                      (all-from-out racket/contract)
-                      (all-from-out racket/base))))
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/dc-intf.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/dc-intf.scrbl
deleted file mode 100644
index 8e5fe6eec3..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/dc-intf.scrbl
+++ /dev/null
@@ -1,1231 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[dc<%> ()]{
-
-A @racket[dc<%>] object is a drawing context for drawing graphics and
- text.  It represents output devices in a generic way; e.g., a canvas
- has a drawing context, as does a printer.
-
-
-@defmethod[(cache-font-metrics-key)
-           exact-integer?]{
-
-Returns an integer that, if not @racket[0], corresponds to a
-particular kind of device and scaling factor, such that text-extent
-information (from @method[dc<%> get-text-extent], @method[dc<%>
-get-char-height], etc.) is the same. The key is valid across all
-@racket[dc<%>] instances, even among different classes.
-
-A @racket[0] result indicates that the current configuration of
-@this-obj[] does not fit into a common category, and so no key is
-available for caching text-extent information.}
-
-
-@defmethod[(clear)
-           void?]{
-
-Clears the drawing region (fills it with the current background color,
-as determined by @method[dc<%> get-background]). See also @method[dc<%> erase].
-
-}
-
-@defmethod[(copy [x real?]
-                 [y real?]
-                 [width (and/c real? (not/c negative?))]
-                 [height (and/c real? (not/c negative?))]
-                 [x2 real?]
-                 [y2 real?])
-           void?]{
-
-Copies the rectangle defined by @racket[x], @racket[y],
-@racket[width], and @racket[height] of the drawing context to the same
-drawing context at the position specified by @racket[x2] and
-@racket[y2].
-
-The result is undefined if the source and destination rectangles
-overlap.}
-
-
-@defmethod[(draw-arc [x real?]
-                     [y real?]
-                     [width (and/c real? (not/c negative?))]
-                     [height (and/c real? (not/c negative?))]
-                     [start-radians real?]
-                     [end-radians real?])
-           void?]{
-
-Draws a counter-clockwise circular arc, a part of the ellipse
- inscribed in the rectangle specified by @racket[x] (left), @racket[y]
- (top), @racket[width], and @racket[height]. The arc starts at the angle
- specified by @racket[start-radians] (@racket[0] is three o'clock and
- half-pi is twelve o'clock) and continues counter-clockwise to
- @racket[end-radians]. If @racket[start-radians] and @racket[end-radians] are
- the same, a full ellipse is drawn.
-
-The current pen is used for the arc. If the current brush is not
- transparent, it is used to fill the wedge bounded by the arc plus
- lines (not drawn) extending to the center of the inscribed ellipse.
- If both the pen and brush are non-transparent, the wedge is filled
- with the brush before the arc is drawn with the pen. 
-
-The wedge and arc meet so that no space is left between them, but the
- precise overlap between the wedge and arc is platform- and
- size-specific.  Typically, the regions drawn by the brush and pen
- overlap.  In unsmoothed or aligned mode, the path for the outline is
- adjusted by shrinking the bounding ellipse width and height by, after scaling, one
- drawing unit divided by the alignment scale.
-
-
-@|DrawSizeNote|
-
-}
-
-
-@defmethod[(draw-bitmap [source (is-a?/c bitmap%)]
-                        [dest-x real?]
-                        [dest-y real?]
-                        [style (or/c 'solid 'opaque 'xor) 'solid]
-                        [color (is-a?/c color%) (send the-color-database find-color "black")]
-                        [mask (or/c (is-a?/c bitmap%) #f) #f])
-           boolean?]{
-
-Displays the @racket[source] bitmap. The @racket[dest-x] and @racket[dest-y] arguments
- are in DC coordinates.
-
-For color bitmaps, the drawing style and color arguments are
- ignored. For monochrome bitmaps, @method[dc<%> draw-bitmap] uses the
- style and color arguments in the same way that a brush uses its style
- and color settings to draw a monochrome stipple (see @racket[brush%]
- for more information).
-
-If a @racket[mask] bitmap is supplied, it must have the same width and height
- as @racket[source], and its @method[bitmap% ok?] must return
- true, otherwise @|MismatchExn|. The @racket[source] bitmap and @racket[mask]
- bitmap can be the same object, but if the drawing context is a
- @racket[bitmap-dc%] object, both bitmaps must be distinct from the
- destination bitmap, otherwise @|MismatchExn|.
-
-The effect of @racket[mask] on drawing depends on the type of the
-@racket[mask] bitmap:
-@;
-@itemlist[
-
- @item{If the @racket[mask] bitmap is monochrome, drawing occurs in
-       the target @racket[dc<%>] only where the mask bitmap contains
-       black pixels (independent of @racket[style], which controls how
-       the white pixels of a monochrome @racket[source] are handled).}
-
- @item{If the @racket[mask] bitmap is color with an alpha channel, its
-       alpha channel is used as the mask for drawing @racket[source],
-       and its color channels are ignored.}
-
- @item{If the @racket[mask] bitmap is color without an alpha channel,
-       the color components of a given pixel are averaged to arrive at
-       an inverse alpha value for the pixel. In particular, if the
-       @racket[mask] bitmap is grayscale, then the blackness of each
-       mask pixel controls the opacity of the drawn pixel (i.e., the
-       mask acts as an inverted alpha channel).}
-
-]
-
-The current brush, current pen, and current text for the DC have no
- effect on how the bitmap is drawn, but the bitmap is scaled if the DC
- has a scale, and the DC's alpha setting determines the opacity of the
- drawn pixels (in combination with an alpha channel of @racket[source],
- any given @racket[mask], and the alpha component of @racket[color] 
- when @racket[source] is monochrome).
-
-For @racket[post-script-dc%] and @racket[pdf-dc%] output, opacity from
- an alpha channel in @racket[source], from @racket[mask], or from 
- @racket[color] is rounded to full transparency or opacity.
-
-The result is @racket[#t] if the bitmap is successfully drawn,
- @racket[#f] otherwise (possibly because the bitmap's @method[bitmap%
- ok?] method returns @racket[#f]).
-
-See also @method[dc<%> draw-bitmap-section].
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(draw-bitmap-section [source (is-a?/c bitmap%)]
-                                [dest-x real?]
-                                [dest-y real?]
-                                [src-x real?]
-                                [src-y real?]
-                                [src-width (and/c real? (not/c negative?))]
-                                [src-height (and/c real? (not/c negative?))]
-                                [style (or/c 'solid 'opaque 'xor) 'solid]
-                                [color (is-a?/c color%) (send the-color-database find-color "black")]
-                                [mask (or/c (is-a?/c bitmap%) #f) #f])
-           boolean?]{
-
-Displays part of a bitmap.
-
-The @racket[src-x], @racket[src-y], @racket[src-width], and
- @racket[src-height] arguments specify a rectangle in the source
- bitmap to copy into this drawing context.
-
-See @method[dc<%> draw-bitmap] for information about @racket[dest-x],
- @racket[dest-y], @racket[style], @racket[color], and @racket[mask].
-
-}
-
-@defmethod[(draw-ellipse [x real?]
-                         [y real?]
-                         [width (and/c real? (not/c negative?))]
-                         [height (and/c real? (not/c negative?))])
-           void?]{
-
-Draws an ellipse contained in a rectangle with the given top-left
- corner and size. The current pen is used for the outline, and the
- current brush is used for filling the shape. If both the pen and
- brush are non-transparent, the ellipse is filled with the brush
- before the outline is drawn with the pen.
-
-Brush filling and pen outline meet so that no space is left between
- them, but the precise overlap between the filling and outline is
- platform- and size-specific.  Thus, the regions drawn by the brush
- and pen may partially overlap. In unsmoothed or aligned mode, the
- path for the outline is adjusted by, after scaling, shrinking the
- ellipse width and height by one drawing unit divided by the
- @tech{alignment scale}.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(draw-line [x1 real?]
-                      [y1 real?]
-                      [x2 real?]
-                      [y2 real?])
-           void?]{
-
-Draws a line from one point to another.  The current pen is used for
- drawing the line.
-
-In unsmoothed mode, the points correspond to pixels, and the line
- covers both the start and end points. For a pen whose scaled width is
- larger than @racket[1], the line is drawn centered over the start and
- end points.
-
-See also @method[dc<%> set-smoothing] for information on the
-@racket['aligned] smoothing mode.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(draw-lines [points (or/c (listof (is-a?/c point%))
-                                     (listof (cons/c real? real?)))]
-                       [xoffset real? 0]
-                       [yoffset real? 0])
-           void?]{
-
-Draws lines using a list @racket[points] of points, adding @racket[xoffset]
- and @racket[yoffset] to each point. A pair is treated as a point where the
- @racket[car] of the pair is the x-value and the @racket[cdr] is the y-value.
- The current pen is used for
- drawing the lines.
-
-See also @method[dc<%> set-smoothing] for information on the
- @racket['aligned] smoothing mode.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(draw-path [path (is-a?/c dc-path%)]
-                      [xoffset real? 0]
-                      [yoffset real? 0]
-                      [fill-style (or/c 'odd-even 'winding) 'odd-even])
-           void?]{
-
-Draws the sub-paths of the given @racket[dc-path%] object, adding
- @racket[xoffset] and @racket[yoffset] to each point. (See
- @racket[dc-path%] for general information on paths and sub-paths.)
- The current pen is used for drawing the path as a line, and the
- current brush is used for filling the area bounded by the path.
-
-If both the pen and brush are non-transparent, the path is filled with
- the brush before the outline is drawn with the pen. The filling and
- outline meet so that no space is left between them, but the precise
- overlap between the filling and outline is platform- and
- size-specific.  Thus, the regions drawn by the brush and pen may
- overlap. More generally, the pen is centered over the path, rounding
- left and down in unsmoothed mode.
-
-The @racket[fill-style] argument specifies the fill rule:
- @racket['odd-even] or @racket['winding]. In @racket['odd-even] mode, a
- point is considered enclosed within the path if it is enclosed by an
- odd number of sub-path loops. In @racket['winding] mode, a point is
- considered enclosed within the path if it is enclosed by more or less
- clockwise sub-path loops than counter-clockwise sub-path loops.
-
-See also @method[dc<%> set-smoothing] for information on the
- @racket['aligned] smoothing mode.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(draw-point [x real?]
-                       [y real?])
-           void?]{
-
-Plots a single point using the current pen.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(draw-polygon [points (or/c (listof (is-a?/c point%))
-                                       (listof (cons/c real? real?)))]
-                         [xoffset real? 0]
-                         [yoffset real? 0]
-                         [fill-style (or/c 'odd-even 'winding) 'odd-even])
-           void?]{
-
-Draw a filled polygon using a list @racket[points] of points, adding
- @racket[xoffset] and @racket[yoffset] to each point. 
- A pair is treated as a point where the
- @racket[car] of the pair is the x-value and the @racket[cdr] is the y-value.
- The polygon is
- automatically closed, so the first and last point can be
- different. The current pen is used for drawing the outline, and the
- current brush for filling the shape.
-
-If both the pen and brush are non-transparent, the polygon is filled
- with the brush before the outline is drawn with the pen. The filling
- and outline meet so that no space is left between them, but the
- precise overlap between the filling and outline is platform- and
- shape-specific.  Thus, the regions drawn by the brush and pen may
- overlap. More generally, the pen is centered over the polygon lines,
- rounding left and down in unsmoothed mode.
-
-The @racket[fill-style] argument specifies the fill rule:
- @racket['odd-even] or @racket['winding]. In @racket['odd-even] mode, a
- point is considered enclosed within the polygon if it is enclosed by
- an odd number of loops. In @racket['winding] mode, a point is
- considered enclosed within the polygon if it is enclosed by more or
- less clockwise loops than counter-clockwise loops.
-
-See also @method[dc<%> set-smoothing] for information on the
- @racket['aligned] smoothing mode.
-
-@|DrawSizeNote|
-
-}
-
-
-@defmethod[(draw-rectangle [x real?]
-                           [y real?]
-                           [width (and/c real? (not/c negative?))]
-                           [height (and/c real? (not/c negative?))])
-           void?]{
-
-Draws a rectangle with the given top-left corner and size.  The
- current pen is used for the outline and the current brush for filling
- the shape. If both the pen and brush are non-transparent, the
- rectangle is filled with the brush before the outline is drawn with
- the pen.
-
-In unsmoothed or aligned mode, when the pen is size 0 or 1, the
- filling precisely overlaps the entire outline. More generally, in
- unsmoothed or aligned mode, the path for the outline is adjusted by
- shrinking the rectangle width and height by, after scaling, one
- drawing unit divided by the @tech{alignment scale}.
-
-See also @method[dc<%> set-smoothing] for information on the
-@racket['aligned] smoothing mode.
-
-@|DrawSizeNote|
-
-}
-
-
-@defmethod[(draw-rounded-rectangle [x real?]
-                                   [y real?]
-                                   [width (and/c real? (not/c negative?))]
-                                   [height (and/c real? (not/c negative?))]
-                                   [radius real? -0.25])
-           void?]{
-
-Draws a rectangle with the given top-left corner, and with the given
- size. The corners are quarter-circles using the given radius.  The
- current pen is used for the outline and the current brush for filling
- the shape. If both the pen and brush are non-transparent, the rectangle is filled
- with the brush before the outline is drawn with the pen.
-
-If @racket[radius] is positive, the value is used as the radius of the
- rounded corner. If @racket[radius] is negative, the absolute value is
- used as the @italic{proportion} of the smallest dimension of the
- rectangle.
-
-If @racket[radius] is less than @racket[-0.5] or more than half of
- @racket[width] or @racket[height], @|MismatchExn|.
-
-Brush filling and pen outline meet so that no space is left between
- them, but the precise overlap between the filling and outline is
- platform- and size-specific.  Thus, the regions drawn by the brush
- and pen may partially overlap. In unsmoothed or aligned mode, the
- path for the outline is adjusted by, after scaling, shrinking the
- rectangle width and height by one drawing unit divided by the
- @tech{alignment scale}.
-
-See also @method[dc<%> set-smoothing] for information on the
-@racket['aligned] smoothing mode.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(draw-spline [x1 real?]
-                        [y1 real?]
-                        [x2 real?]
-                        [y2 real?]
-                        [x3 real?]
-                        [y3 real?])
-           void?]{
-
-@index['("drawing curves")]{Draws} a spline from (@racket[x1],
- @racket[y1]) to (@racket[x3], @racket[y3]) using (@racket[x2],
- @racket[y2]) as the control point.
-
-See also @method[dc<%> set-smoothing] for information on the
- @racket['aligned] smoothing mode. See also @racket[dc-path%] and
- @method[dc<%> draw-path] for drawing more complex curves.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(draw-text [text string?]
-                      [x real?]
-                      [y real?]
-                      [combine? any/c #f]
-                      [offset exact-nonnegative-integer? 0]
-                      [angle real? 0])
-           void?]{
-
-Draws a text string at a specified point, using the current text font,
- and the current text foreground and background colors. For unrotated
- text, the specified point is used as the starting top-left point for
- drawing characters (e.g, if ``W'' is drawn, the point is roughly the
- location of the top-left pixel in the ``W''). Rotated text is rotated
- around this point.
-
-The @racket[text] string is drawn starting from the @racket[offset]
- character, and continuing until the end of @racket[text] or the first
- null character.
-
-If @racket[combine?] is @racket[#t], then @racket[text] may be
- measured with adjacent characters combined to ligature glyphs, with
- Unicode combining characters as a single glyph, with kerning, with
- right-to-left rendering of characters, etc. If @racket[combine?] is
- @racket[#f], then the result is the same as if each character is
- measured separately, and Unicode control characters are ignored.
-
-The string is rotated by @racket[angle] radians counter-clockwise. If
- @racket[angle] is not zero, then the text is always drawn in
- transparent mode (see @method[dc<%> set-text-mode]).
-
-The current brush and current pen settings for the DC have no effect
- on how the text is drawn.
-
-See @method[dc<%> get-text-extent] for information on the size of the
- drawn text.
-
-See also @method[dc<%> set-text-foreground], @method[dc<%>
- set-text-background], and @method[dc<%> set-text-mode].
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(end-doc)
-           void?]{
-
-Ends a document, relevant only when drawing to a printer, PostScript,
- PDF, or SVG device.
-
-For relevant devices, an exception is raised if
-@method[dc<%> end-doc] is called when the document is not started with
-@method[dc<%> start-doc], when a page is currently started by
-@method[dc<%> start-page] and not ended with @method[dc<%> end-page],
-or when the document has been ended already.
-
-}
-
-
-@defmethod[(end-page)
-           void?]{
-
-Ends a single page, relevant only when drawing to a printer,
- PostScript, PDF, or SVG device.
-
-For relevant devices, an exception is raised if
-@method[dc<%> end-page] is called when a page is not currently started by
-@method[dc<%> start-page].}
-
-
-@defmethod[(erase)
-           void?]{
-
-For a drawing context that has an alpha channel, @method[dc<%> erase]
-sets all alphas to zero. Similarly, for a transparent canvas,
-@method[dc<%> erase] erases all drawing to allow the background window
-to show through. For other drawing contexts that have no alpha channel
-or transparency, @method[dc<%> erase] fills the drawing context with
-white.}
-
-
-@defmethod[(flush) void?]{
-
-Calls the @xmethod[canvas<%> flush] method for
-@racket[canvas<%>] output, and has no effect for other kinds of
-drawing contexts.}
-
-
-
-@defmethod[(get-alpha)
-           (real-in 0 1)]{
-
-Gets the current opacity for drawing; see
-@method[dc<%> set-alpha].
-
-}
-
-@defmethod[(get-background)
-           (is-a?/c color%)]{
-
-Gets the color used for painting the background. See also
-@method[dc<%> set-background].
-
-}
-
-@defmethod[(get-brush)
-           (is-a?/c brush%)]{
-
-Gets the current brush. See also @method[dc<%> set-brush].
-
-}
-
-@defmethod[(get-char-height)
-           (and/c real? (not/c negative?))]{
-
-Gets the height of a character using the current font.
-
-Unlike most methods, this method can be called for a
- @racket[bitmap-dc%] object without a bitmap installed.
-
-}
-
-@defmethod[(get-char-width)
-           (and/c real? (not/c negative?))]{
-
-Gets the average width of a character using the current font.
-
-Unlike most methods, this method can be called for a
- @racket[bitmap-dc%] object without a bitmap installed.
-
-}
-
-@defmethod[(get-clipping-region)
-           (or/c (is-a?/c region%) #f)]{
-
-Gets the current clipping region, returning @racket[#f] if the drawing
- context is not clipped (i.e., the clipping region is the entire
- drawing region).
-
-}
-
-
-@defmethod[(get-device-scale)
-           (values (and/c real? (not/c negative?))
-                   (and/c real? (not/c negative?)))]{
-
-Gets an ``external'' scaling factor for drawing coordinates to the
-target device. For most DCs, the result is @racket[1.0] and
-@racket[1.0].
-
-A @racket[post-script-dc%] or @racket[pdf-dc%] object returns scaling
-factors determined via @xmethod[ps-setup% get-scaling] at the time
-that the DC was created. A @racket[printer-dc%] may also have a
-user-configured scaling factor.}
-
-
-@defmethod[(get-font)
-           (is-a?/c font%)]{
-
-Gets the current font. See also @method[dc<%> set-font].
-
-}
-
-@defmethod[(get-gl-context)
-           (or/c (is-a?/c gl-context<%>) #f)]{
-
-Returns a @racket[gl-context<%>] object for this drawing context
- if it supports OpenGL, @racket[#f] otherwise.
-
-See @racket[gl-context<%>] for more information.
-
-}
-
-@defmethod[(get-initial-matrix)
-           (vector/c real? real? real? real? real? real?)]{
-
-Returns a transformation matrix that converts logical coordinates to
- device coordinates. The matrix applies before additional origin
- offset, scaling, and rotation.
-
-The vector content corresponds to a transformation matrix in the
-following order:
-
-@itemlist[
-
- @item{@racket[_xx]: a scale from the logical @racket[_x] to the device @racket[_x]}
-
- @item{@racket[_xy]: a scale from the logical @racket[_x] added to the device @racket[_y]}
-
- @item{@racket[_yx]: a scale from the logical @racket[_y] added to the device @racket[_x]}
-
- @item{@racket[_yy]: a scale from the logical @racket[_y] to the device @racket[_y]}
-
- @item{@racket[_x0]: an additional amount added to the device @racket[_x]}
-
- @item{@racket[_y0]: an additional amount added to the device @racket[_y]}
-
-]
-
-See also @method[dc<%> set-initial-matrix] and @method[dc<%> get-transformation].
-
-}
-
-
-@defmethod[(get-origin)
-           (values real? real?)]{
-
-Returns the device origin, i.e., the location in device coordinates of
- @math{(0,0)} in logical coordinates. The origin offset applies after
- the initial transformation matrix, but before scaling and rotation.
-
-See also @method[dc<%> set-origin] and @method[dc<%> get-transformation].
-
-}
-
-
-@defmethod[(get-pen)
-           (is-a?/c pen%)]{
-
-Gets the current pen. See also @method[dc<%> set-pen].
-
-}
-                     
-                          
-@defmethod[(get-path-bounding-box [path (is-a?/c dc-path%)] 
-                                  [type (or/c 'path 'stroke 'fill)])
-           (values real? real? real? real?)]{
-Returns a rectangle that encloses the path’s points. 
-The return values are the left, top, width, and, height of the rectangle.
-The numbers are in logical coordinates.
-
-For the type @racket['stroke] the rectangle covers the area that would be affected (``inked'')
-when drawn with the current pen by draw-path in the drawing context (with a transparent brush). 
-If the pen width is zero, then an empty rectangle will be returned. The size and clipping of the 
-drawing context is ignored.
-
-For the type @racket['fill] the rectangle covers the area that would be affected (``inked'')
-by draw-path in the drawing context (with a non-transparent pen and brush). If the line width 
-is zero, then an empty rectangle will be returned. The size and clipping of the drawing
-context are ignored.
-
-For the type @racket['path] the rectangle covers the path, but the pen and brush are ignored.
-The size and clipping of the drawing context are also ignored.
-More precisely: The result is defined as the limit of the bounding boxes returned
-by the @racket['stroke] type for line widths approaching 0 with a round pen cap. The ``limit
-process'' stops when an empty rectangle is returned. This implies that zero-area segments 
-contributes to the rectangle.
-
-For all types if the path is empty, then an empty rectangle @racket[(values 0 0 0 0)] 
-will be returned.
-}
- 
-
-@defmethod[(get-rotation) real?]{
-
-Returns the rotation of logical coordinates in radians to device
-coordinates. Rotation applies after the initial transformation matrix,
-origin offset, and scaling.
-
-See also @method[dc<%> set-rotation] and @method[dc<%> get-transformation].
-
-}
-
-@defmethod[(get-scale)
-           (values real? real?)]{
-
-Returns the scaling factor that maps logical coordinates to device
-coordinates. Scaling applies after the initial transformation matrix
-and origin offset, but before rotation.
-
-See also @method[dc<%> set-scale] and @method[dc<%> get-transformation].
-
-}
-
-@defmethod[(get-size)
-           (values (and/c real? (not/c negative?))
-                   (and/c real? (not/c negative?)))]{
-
-Gets the size of the destination drawing area. For a @racket[dc<%>]
- object obtained from a @racket[canvas<%>], this is the (virtual
- client) size of the destination window; for a @racket[bitmap-dc%]
- object, this is the size of the selected bitmap (or 0 if no bitmap is
- selected); for a @racket[post-script-dc%] or @racket[printer-dc%]
- drawing context, this gets the horizontal and vertical size of the
- drawing area.
-
-}
-
-@defmethod[(get-smoothing)
-           (or/c 'unsmoothed 'smoothed 'aligned)]{
-
-Returns the current smoothing mode. See @method[dc<%> set-smoothing].
-
-}
-
-@defmethod[(get-text-background)
-           (is-a?/c color%)]{
-
-Gets the current text background color. See also @method[dc<%>
-set-text-background].
-
-}
-
-@defmethod[(get-text-extent [string string?]
-                            [font (or/c (is-a?/c font%) #f) #f]
-                            [combine? any/c #f]
-                            [offset exact-nonnegative-integer? 0])
-           (values (and/c real? (not/c negative?)) 
-                   (and/c real? (not/c negative?))
-                   (and/c real? (not/c negative?)) 
-                   (and/c real? (not/c negative?)))]{
-
-
-Returns the size of @racket[str] at it would be drawn in the drawing
- context, starting from the @racket[offset] character of @racket[str],
- and continuing until the end of @racket[str] or the first null
- character.  The @racket[font] argument specifies the font to use in
- measuring the text; if it is @racket[#f], the current font of the
- drawing area is used. (See also @method[dc<%> set-font].)
-
-The result is four real numbers:
-
-@itemize[
-
- @item{the total width of the text (depends on both the font and the
- text);}
-
- @item{the total height of the font (depends only on the font);}
-
- @item{the distance from the baseline of the font to the bottom of the
- descender (included in the height, depends only on the font); and}
-
- @item{extra vertical space added to the font by the font designer
- (included in the height, and often zero; depends only on the font).}
-
-]
-
-The returned width and height define a rectangle is that guaranteed to
- contain the text string when it is drawn, but the fit is not
- necessarily tight. Some undefined number of pixels on the left,
- right, top, and bottom of the drawn string may be ``whitespace,''
- depending on the whims of the font designer and the platform-specific
- font-scaling mechanism.
-
-If @racket[combine?] is @racket[#t], then @racket[text] may be drawn
- with adjacent characters combined to ligature glyphs, with Unicode
- combining characters as a single glyph, with kerning, with
- right-to-left ordering of characters, etc. If @racket[combine?] is
- @racket[#f], then the result is the same as if each character is
- drawn separately, and Unicode control characters are ignored.
-
-Unlike most methods, this method can be called for a
- @racket[bitmap-dc%] object without a bitmap installed.
-
-}
-
-
-@defmethod[(get-text-foreground)
-           (is-a?/c color%)]{
-
-Gets the current text foreground color. See also @method[dc<%>
-set-text-foreground].
-
-}
-
-
-@defmethod[(get-text-mode)
-           (or/c 'solid 'transparent)]{
-Reports how text is drawn; see
-@method[dc<%> set-text-mode].}
-
-
-@defmethod[(get-transformation)
-           (vector/c (vector/c real? real? real? real? real? real?)
-                     real? real? real? real? real?)]{
-
-Returns the current transformation setting of the drawing context in a
-form that is suitable for restoration via @method[dc<%>
-set-transformation].
-
-The vector content is as follows:
-
-@itemlist[
-
- @item{the initial transformation matrix; see @method[dc<%>
-       get-initial-matrix];}
-
- @item{the X and Y origin; see @method[dc<%> get-origin];}
-
- @item{the X and Y scale; see @method[dc<%> get-origin];}
-
- @item{a rotation; see @method[dc<%> get-rotation].}
-
-]}
-
-
-@defmethod[(glyph-exists? [c char?])
-           boolean?]{
-
-Returns @racket[#t] if the given character has a corresponding glyph
- for this drawing context, @racket[#f] otherwise.
-
-Due to automatic font substitution when drawing or measuring text, the
- result of this method does not depend on the given font, which merely
- provides a hint for the glyph search. If the font is @racket[#f], the
- drawing context's current font is used. The result depends on the
- type of the drawing context, but the result for @racket[canvas%]
- @racket[dc<%>] instances and @racket[bitmap-dc%] instances is always
- the same for a given platform and a given set of installed fonts.
-
-See also @method[font% screen-glyph-exists?] .
-
-}
-
-@defmethod[(ok?)
-           boolean?]{
-
-Returns @racket[#t] if the drawing context is usable.
-
-}
-
-
-@defmethod[(resume-flush) void?]{
-
-Calls the @xmethod[canvas<%> resume-flush] method for
-@racket[canvas<%>] output, and has no effect for other kinds of
-drawing contexts.}
-
-
-@defmethod[(rotate [angle real?]) void?]{
-
-Adds a rotation of @racket[angle] radians to the drawing context's
-current transformation.
-
-Afterward, the drawing context's transformation is represented in the
-initial transformation matrix, and the separate origin, scale, and
-rotation settings have their identity values.
-
-}
-
-@defmethod[(scale [x-scale real?]
-                  [y-scale real?])
-           void?]{
-
-Adds a scaling of @racket[x-scale] in the X-direction and
-@racket[y-scale] in the Y-direction to the drawing context's current
-transformation.
-
-Afterward, the drawing context's transformation is represented in the
-initial transformation matrix, and the separate origin, scale, and
-rotation settings have their identity values.
-
-}
-
-@defmethod[(set-alignment-scale [scale (>/c 0.0)])
-           void?]{
-
-Sets the drawing context's @deftech{alignment scale}, which determines
- how drawing coordinates and pen widths are adjusted for unsmoothed or
- aligned drawing (see @method[dc<%> set-smoothing]).
-
-The default @tech{alignment scale} is @racket[1.0], which means that
- drawing coorinates and pen sizes are aligned to integer values.
-
-An @tech{alignment scale} of @racket[2.0] aligns drawing coordinates
- to half-integer values. A value of @racket[2.0] could be suitable for
- a @racket[bitmap-dc%] whose destination is a bitmap with a
- @tech{backing scale} of @racket[2.0], since half-integer values
- coorespond to pixel boundaries. Even when a destinate context has a
- backing scale of @racket[2.0], however, an alignment scale of
- @racket[1.0] may be desirable to maintain consistency with drawing
- contexts that have a backing scale and alignment scale of
- @racket[1.0].
-
-@history[#:added "1.1"]}
-
-
-@defmethod[(set-alpha [opacity (real-in 0 1)])
-           void?]{
-
-Determines the opacity of drawing. A value of @racket[0.0] corresponds
-to completely transparent (i.e., invisible) drawing, and @racket[1.0]
-corresponds to completely opaque drawing. For intermediate values,
-drawing is blended with the existing content of the drawing context.
-A color (e.g. for a brush) also has an alpha value; it is combined
-with the drawing context's alpha by multiplying.}
-
-
-@defmethod*[([(set-background [color (is-a?/c color%)])
-              void?]
-             [(set-background [color-name string?])
-              void?])]{
-
-Sets the background color for drawing in this object (e.g., using
-@method[dc<%> clear] or using a stippled @racket[brush%] with the mode
-@racket['opaque]). For monochrome drawing, all non-black colors are
-treated as white.
-
-}
-
-@defmethod*[([(set-brush [brush (is-a?/c brush%)])
-              void?]
-             [(set-brush [color (is-a?/c color%)]
-                         [style (or/c 'transparent 'solid 'opaque 
-                                      'xor 'hilite 'panel 
-                                      'bdiagonal-hatch 'crossdiag-hatch
-                                      'fdiagonal-hatch 'cross-hatch 
-                                      'horizontal-hatch 'vertical-hatch)])
-              void?]
-             [(set-brush [color-name string?]
-                         [style (or/c 'transparent 'solid 'opaque 
-                                      'xor 'hilite 'panel
-                                      'bdiagonal-hatch 'crossdiag-hatch
-                                      'fdiagonal-hatch 'cross-hatch
-                                      'horizontal-hatch 'vertical-hatch)])
-              void?])]{
-
-Sets the current brush for drawing in this object.  While a brush is
- selected into a drawing context, it cannot be modified. When a color
- and style are given, the arguments are as for @xmethod[brush-list%
- find-or-create-brush].
-
-}
-
-
-@defmethod[(set-clipping-rect [x real?]
-                              [y real?]
-                              [width (and/c real? (not/c negative?))]
-                              [height (and/c real? (not/c negative?))])
-           void?]{
-
-Sets the clipping region to a rectangular region.
-
-See also @method[dc<%> set-clipping-region] and @method[dc<%>
-get-clipping-region].
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(set-clipping-region [rgn (or/c (is-a?/c region%) #f)])
-           void?]{
-
-Sets the clipping region for the drawing area, turning off all
- clipping within the drawing region if @racket[#f] is provided.
-
-The clipping region must be reset after changing a @racket[dc<%>]
- object's origin or scale (unless it is @racket[#f]); see
- @racket[region%] for more information.
-
-See also @method[dc<%> set-clipping-rect] and @method[dc<%>
- get-clipping-region].
-
-}
-
-@defmethod[(set-font [font (is-a?/c font%)])
-           void?]{
-
-Sets the current font for drawing text in this object.
-
-}
-
-@defmethod[(set-initial-matrix [m (vector/c real? real? real? real? real? real?)])
-           void?]{
-
-Set a transformation matrix that converts logical coordinates to
- device coordinates. The matrix applies before additional origin
- offset, scaling, and rotation.
-
-See @method[dc<%> get-initial-matrix] for information on the matrix as
- represented by a vector @racket[m].
-
-See also @method[dc<%> transform], which adds a transformation to the
- current transformation, instead of changing the transformation
- composition in the middle.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(set-origin [x real?]
-                       [y real?])
-           void?]{
-
-Sets the device origin, i.e., the location in device coordinates of
- @math{(0,0)} in logical coordinates. The origin offset applies after
- the initial transformation matrix, but before scaling and rotation.
-
-See also @method[dc<%> translate], which adds a translation to the
- current transformation, instead of changing the transformation
- composition in the middle.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod*[([(set-pen [pen (is-a?/c pen%)])
-              void?]
-             [(set-pen [color (is-a?/c color%)]
-                       [width (real-in 0 255)]
-                       [style (or/c 'transparent 'solid 'xor 'hilite
-                                    'dot 'long-dash 'short-dash 'dot-dash 
-                                    'xor-dot 'xor-long-dash 'xor-short-dash 
-                                    'xor-dot-dash)])
-              void?]
-             [(set-pen [color-name string?]
-                       [width (real-in 0 255)]
-                       [style (or/c 'transparent 'solid 'xor 'hilite 
-                                    'dot 'long-dash 'short-dash 'dot-dash 
-                                    'xor-dot 'xor-long-dash 'xor-short-dash 
-                                    'xor-dot-dash)])
-              void?])]{
-
-Sets the current pen for this object. When a color, width, and style
- are given, the arguments are as for @xmethod[pen-list%
- find-or-create-pen].
-
-The current pen does not affect text drawing; see also @method[dc<%>
- set-text-foreground].
-
-While a pen is selected into a drawing context, it cannot be modified.
-
-}
-
-@defmethod[(set-rotation [angle real?]) void?]{
-
-Set the rotation of logical coordinates in radians to device
-coordinates. Rotation applies after the initial transformation matrix,
-origin offset, and scaling.
-
-See also @method[dc<%> rotate], which adds a rotation to the current
- transformation, instead of changing the transformation composition.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(set-scale [x-scale real?]
-                      [y-scale real?])
-           void?]{
-
-Sets a scaling factor that maps logical coordinates to device
- coordinates.  Scaling applies after the initial transformation matrix
- and origin offset, but before rotation. Negative scaling factors have
- the effect of flipping.
-
-See also @method[dc<%> scale], which adds a scale to the current
- transformation, instead of changing the transformation composition in
- the middle.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(set-smoothing [mode (or/c 'unsmoothed 'smoothed 'aligned)])
-           void?]{
-
-Enables or disables anti-aliased smoothing for drawing. (Text
- smoothing is not affected by this method, and is instead controlled
- through the @racket[font%] object.)
-
-The smoothing mode is either @racket['unsmoothed], @racket['smoothed],
- or @racket['aligned]. Both @racket['aligned] and @racket['smoothed]
- are smoothing modes that enable anti-aliasing, while both
- @racket['unsmoothed] and @racket['aligned] adjust drawing coordinates
- to match pixel boundaries. For most applications that draw to the
- screen or bitmaps, @racket['aligned] mode is the best choice.
-
-Conceptually, integer drawing coordinates correspond to the boundary
- between pixels, and pen-based drawing is centered over a given line
- or curve. Thus, drawing with pen width @racket[1] from @math{(0, 10)}
- to @math{(10, 10)} in @racket['smoothed] mode draws a 2-pixel wide
- line with @math{50%} opacity.
-
-In @racket['unsmoothed] and @racket['aligned] modes, drawing
- coordinates are truncated based on the @tech{alignment scale} of the
- drawing context. Specifically, when the alignment scale is 1.0,
- drawing coordinates are truncated to integer coordinates. More
- generally, drawing coordinates are shifted toward zero so that the
- result multipled by the @tech{alignment scale} is integral. For line
- drawing, coordinates are further shifted based on the pen width and
- the alignment scale, where the shift corrsponds to half of the pen
- width (reduced to a value such that its multiplication times the
- alignment scale times two produces an integer). In addition, for pen
- drawing through @method[dc<%> draw-rectangle], @method[dc<%>
- draw-ellipse], @method[dc<%> draw-rounded-rectangle], and
- @method[dc<%> draw-arc], the given width and height are each
- decreased by @math{1.0} divided by the @tech{alignment scale}.}
-
-
-@defmethod*[([(set-text-background [color (is-a?/c color%)])
-              void?]
-             [(set-text-background [color-name string?])
-              void?])]{
-
-Sets the current text background color for this object. The text
- background color is painted behind text that is drawn with
- @method[dc<%> draw-text], but only for the @racket['solid] text mode
- (see @method[dc<%> set-text-mode]).
-
-For monochrome drawing, all non-white colors are treated as black.
-
-}
-
-@defmethod*[([(set-text-foreground [color (is-a?/c color%)])
-              void?]
-             [(set-text-foreground [color-name string?])
-              void?])]{
-
-Sets the current text foreground color for this object, used for
- drawing text with
-@method[dc<%> draw-text].
-
-For monochrome drawing, all non-black colors are treated as
- white.
-
-}
-
-@defmethod[(set-text-mode [mode (or/c 'solid 'transparent)])
-           void?]{
-
-Determines how text is drawn:
-
-@itemize[
-
- @item{@racket['solid] --- Before text is drawn, the destination area
-       is filled with the text background color (see @method[dc<%>
-       set-text-background]).}
-
- @item{@racket['transparent] --- Text is drawn directly over any
-       existing image in the destination, as if overlaying text
-       written on transparent film.}
-
-]
-
-}
-
-
-@defmethod[(set-transformation
-            [t (vector/c (vector/c real? real? real? real? real? real?)
-                         real? real? real? real? real?)])
-           void?]{
-
-Sets the draw context's transformation. See @method[dc<%>
-get-transformation] for information about @racket[t].}
-
-
-@defmethod[(start-doc [message string?])
-           void?]{
-
-Starts a document, relevant only when drawing to a printer,
- PostScript, PDF, or SVG device.  For some
- platforms, the @racket[message] string is displayed in a dialog until
- @method[dc<%> end-doc] is called.
-
-For relevant devices, an exception is raised if
- @method[dc<%> start-doc] has been called already (even if @method[dc<%>
- end-doc] has been called as well). Furthermore, drawing methods raise
- an exception if not called while a page is active as determined by
- @method[dc<%> start-doc] and @method[dc<%> start-page].
-
-}
-
-@defmethod[(start-page)
-           void?]{
-
-Starts a page, relevant only when drawing to a printer, PostScript,
- SVG, or PDF device.
-
-Relevant devices, an exception is raised if
- @method[dc<%> start-page] is called when a page is already started, or when
- @method[dc<%> start-doc] has not been called, or when @method[dc<%>
- end-doc] has been called already. In addition, in the case of
- PostScript output, Encapsulated PostScript (EPS) cannot contain
- multiple pages, so calling @racket[start-page] a second time for a
- @racket[post-script-dc%] instance raises an exception; to create
- PostScript output with multiple pages, supply @racket[#f] as the
- @racket[as-eps] initialization argument for @racket[post-script-dc%].
-
-}
-
-
-@defmethod[(suspend-flush) void?]{
-
-Calls the @xmethod[canvas<%> suspend-flush] method for
-@racket[canvas<%>] output, and has no effect for other kinds of
-drawing contexts.}
-
-
-@defmethod[(transform [m (vector/c real? real? real? real? real? real?)])
-           void?]{
-
-Adds a transformation by @racket[m] to the drawing context's current
-transformation. 
-
-See @method[dc<%> get-initial-matrix] for information on the matrix as
- represented by a vector @racket[m].
-
-Afterward, the drawing context's transformation is represented in the
-initial transformation matrix, and the separate origin, scale, and
-rotation settings have their identity values.
-
-}
-
-@defmethod[(translate [dx real?]
-                      [dy real?])
-           void?]{
-
-Adds a translation of @racket[dx] in the X-direction and @racket[dy] in
-the Y-direction to the drawing context's current transformation.
-
-Afterward, the drawing context's transformation is represented in the
-initial transformation matrix, and the separate origin, scale, and
-rotation settings have their identity values.
-
-}
-
-
-@defmethod[(try-color [try (is-a?/c color%)]
-                      [result (is-a?/c color%)])
-           void?]{
-
-Determines the actual color used for drawing requests with the given
- color. The @racket[result] color is set to the RGB values that are
- actually produced for this drawing context to draw the color
- @racket[try].
-
-}}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/dc-path-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/dc-path-class.scrbl
deleted file mode 100644
index 2cef36dee0..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/dc-path-class.scrbl
+++ /dev/null
@@ -1,289 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[dc-path% object% ()]{
-
-A path is a set of figures defined by curves. A path can be used with
-the @method[dc<%> draw-path] method of a @racket[dc<%>] object to draw
-the path's curves as lines, fill the region bounded by the path's
-curves, or both. A path can also be used with the @method[region%
-set-path] method of a @racket[region%] object to generate a region
-bounded by the path's curves.
-
-A path consists of zero or more @deftech{closed sub-paths}, and
- possibly one @deftech{open sub-path}. Some @racket[dc-path%] methods
- extend the open sub-path, some @racket[dc-path%] methods close the
- open sub-path, and some @racket[dc-path%] methods add closed
- sub-paths. This approach to drawing formulation is inherited from
- PostScript @cite["Adobe99"].
-
-When a path is drawn as a line, a closed sub-path is drawn as a closed
- figure, analogous to a polygon. An open sub-path is drawn with
- disjoint start and end points, analogous lines drawn with
- @xmethod[dc<%> draw-lines].
-
-When a path is filled or used as a region, the open sub-path (if any)
- is treated as if it were closed. The content of a path is determined
- either through the @racket['even-odd] rule or the @racket['winding]
- rule, as selected at the time when the path is filled or used to
- generate a region.
-
-A path is not connected to any particular @racket[dc<%>] object, so
- setting a @racket[dc<%>] origin or scale does not affect path
- operations. Instead, a @racket[dc<%>]'s origin and scale apply at the
- time that the path is drawn or used to set a region.
-
-@defconstructor[()]{
-
-Creates a new path that contains no sub-paths (and no @tech{open
-sub-path}).
-
-}
-
-
-@defmethod[(append [path (is-a?/c dc-path%)])
-           void?]{
-
-Adds the sub-paths of @racket[path] to @this-obj[]. @tech{Closed
- sub-paths} of @racket[path] are added as @tech{closed sub-paths} to
- @this-obj[]. If both paths have an @tech{open sub-path}, then this
- path's sub-path is extended by the given path's @tech{open sub-path},
- adding a line from this path's current ending point to the given
- path's starting point. If only one of the paths has an @tech{open
- sub-path}, then it becomes (or remains) this path's @tech{open
- sub-path}.
-
-}
-
-@defmethod[(arc [x real?]
-                [y real?]
-                [width real?]
-                [height real?]
-                [start-radians real?]
-                [end-radians real?]
-                [counter-clockwise? any/c #t])
-           void?]{
-
-Extends or starts the path's @tech{open sub-path} with a curve that
- corresponds to a section of an ellipse. If @racket[width] and @racket[height]
- are non-negative, the ellipse is the one
- bounded by a rectangle whose top-left corner is @math{(@racket[x],
- @racket[y])} and whose dimensions are @racket[width] by
- @racket[height]; if @racket[width] is negative, then
- the rectangle's right edge is @racket[x], and the ellipse
- width is @racket[(abs width)], while a negative @racket[height]
- similarly makes @racket[y] is the bottom edge of the ellipse and
- the height @racket[(abs height)].
- @margin-note*{Support for negative @racket[width] and @racket[height]
- helps avoid round-off problems for aligned drawing in an eventual 
- destination, since @method[dc-path% arc] reduces its input to a sequence of curves.
- In contrast, @xmethod[dc<%> draw-arc] can automatically correct for round off,
- since the drawing mode is known immediately.}
- The ellipse section starts a the angle
- @racket[start-radians] (@racket[0] is three o'clock and half-π is
- twelve o'clock) and continues to the angle @racket[end-radians]; if
- @racket[counter-clockwise?] is true, then the arc runs
- counter-clockwise from @racket[start-radians] to
- @racket[end-radians], otherwise it runs clockwise.
-
-If the path has no @tech{open sub-path}, a new one is started with the
- arc's starting point. Otherwise, the arc extends the existing
- sub-path, and the existing path is connected with a line to the arc's
- starting point.
-
-}
-
-@defmethod[(close)
-           void?]{
-
-Closes the path's @tech{open sub-path}. If the path has no @tech{open
- sub-path}, @|MismatchExn|.
-
-}
-
-@defmethod[(curve-to [x1 real?]
-                     [y1 real?]
-                     [x2 real?]
-                     [y2 real?]
-                     [x3 real?]
-                     [y3 real?])
-           void?]{
-
-Extends the path's @tech{open sub-path} with a Bezier curve to the
- given point @math{(@racket[x3],@racket[y3])}, using the points
- @math{(@racket[x1], @racket[y1])} and @math{(@racket[x2],
- @racket[y2])} as control points. If the path has no @tech{open
- sub-path}, @|MismatchExn|.
-
-}
-
-@defmethod[(ellipse [x real?]
-                    [y real?]
-                    [width (and/c real? (not/c negative?))]
-                    [height (and/c real? (not/c negative?))])
-           void?]{
-
-Closes the @tech{open sub-path}, if any, and adds a @tech{closed
- sub-path} that represents an ellipse bounded by a rectangle whose
- top-left corner is @math{(@racket[x], @racket[y])} and whose
- dimensions are @racket[width] by @racket[height]. (This convenience
- method is implemented in terms of @method[dc-path% close] and
- @method[dc-path% arc].)
-
-}
-
-@defmethod[(get-bounding-box)
-           (values real? real? real? real?)]{
-
-Returns a rectangle that encloses the path's points.  The return
- values are the left, top, width, and height of the rectangle.
-
-For curves within the path, the bounding box enclosed the two control
- points as well as the start and end points. Thus, the bounding box
- does not always tightly bound the path.
-
-}
-
-@defmethod[(line-to [x real?]
-                    [y real?])
-           void?]{
-
-Extends the path's @tech{open sub-path} with a line to the given
- point. If the path has no @tech{open sub-path}, @|MismatchExn|.
-
-}
-
-@defmethod[(lines [points (or/c (listof (is-a?/c point%))
-                                (listof (cons/c real? real?)))]
-                  [xoffset real? 0]
-                  [yoffset real? 0])
-           void?]{
-
-Extends the path's @tech{open sub-path} with a sequences of lines to
- the given points. A pair is treated as a point where the @racket[car]
- of the pair is the x-value and the @racket[cdr] is the y-value.
- If the path has no @tech{open sub-path},
- @|MismatchExn|.  (This convenience method is implemented in terms of
- @method[dc-path% line-to].)
-
-}
-
-@defmethod[(move-to [x real?]
-                    [y real?])
-           void?]{
-
-After closing the @tech{open sub-path}, if any, starts a new
- @tech{open sub-path} with the given initial point.}
-
-
-@defmethod[(open?)
-           boolean?]{
-
-Returns @racket[#t] if the path has an @tech{open sub-path},
-@racket[#f] otherwise.}
-
-
-@defmethod[(rectangle [x real?]
-                      [y real?]
-                      [width (and/c real? (not/c negative?))]
-                      [height (and/c real? (not/c negative?))])
-           void?]{
-
-Closes the @tech{open sub-path}, if any, and adds a closed path that
- represents a rectangle whose top-left corner is @math{(@racket[x],
- @racket[y])} and whose dimensions are @racket[width] by
- @racket[height]. (This convenience method is implemented in terms of
- @method[dc-path% close], @method[dc-path% move-to], and
- @method[dc-path% line-to].)}
-
-
-@defmethod[(reset)
-           void?]{
-
-Removes all sub-paths of the path.}
-
-
-@defmethod[(reverse)
-           void?]{
-
-Reverses the order of all points in all sub-paths. If the path has an
- @tech{open sub-path}, the starting point becomes the ending point,
- and extensions to the @tech{open sub-path} build on this new ending
- point. Reversing a @tech{closed sub-path} affects how it combines
- with other sub-paths when determining the content of a path in
- @racket['winding] mode.}
-
-
-@defmethod[(rotate [radians real?])
-           void?]{
-
-Adjusts all points within the path (including all sub-paths), rotating
- them @racket[radians] counter-clockwise around @math{(0, 0)}. Future
- additions to the path are not rotated by this call.}
-
-
-@defmethod[(rounded-rectangle [x real?]
-                              [y real?]
-                              [width (and/c real? (not/c negative?))]
-                              [height (and/c real? (not/c negative?))]
-                              [radius real? -0.25])
-           void?]{
-
-Closes the @tech{open sub-path}, if any, and adds a @tech{closed
- sub-path} that represents a round-cornered rectangle whose top-left
- corner is @math{(@racket[x] @racket[y])} and whose dimensions are
- @racket[width] by @racket[height]. (This convenience method is
- implemented in terms of @method[dc-path% close], @method[dc-path%
- move-to], @method[dc-path% arc], and @method[dc-path% line-to].)
-
-If @racket[radius] is positive, the value is used as the radius of the
- rounded corner. If @racket[radius] is negative, the absolute value is
- used as the @italic{proportion} of the smallest dimension of the
- rectangle.
-
-If @racket[radius] is less than @racket[-0.5] or more than half of
- @racket[width] or @racket[height], @|MismatchExn|.}
-
-
-@defmethod[(scale [x real?]
-                  [y real?])
-           void?]{
-
-@index['("paths" "flipping")]{Adjusts} all points within the path
- (including all sub-paths), multiplying each x-coordinate by
- @racket[x] and each y-coordinate by @racket[y]. Scaling by a negative
- number flips the path over the corresponding axis. Future additions
- to the path are not scaled by this call.}
-
-
-@defmethod[(text-outline [font (is-a?/c font%)]
-                         [str string?]
-                         [x real?]
-                         [y real?]
-                         [combine? any/c #f])
-           void?]{
-
-Closes the @tech{open sub-path}, if any, and adds a @tech{closed
- sub-path} to outline @racket[str] using @racket[font]. The
- top left of the text is positioned at @racket[x] and @racket[y]. The
- @racket[combine?] argument enables kerning and character combinations
- as for @xmethod[dc<%> draw-text].}
-
-
-@defmethod[(transform [m (vector/c real? real? real? real? real? real?)])
-           void?]{
-
-Adjusts all points within the path (including all sub-paths) by
-applying the transformation represented by @racket[m].
-
-See @method[dc<%> get-initial-matrix] for information on the matrix as
- represented by a vector @racket[m].}
-
-
-@defmethod[(translate [x real?]
-                      [y real?])
-           void?]{
-
-Adjusts all points within the path (including all sub-paths), shifting
- then @racket[x] to the right and @racket[y] down.  Future additions
- to the path are not translated by this call.}}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw-contracts.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw-contracts.scrbl
deleted file mode 100644
index 38b615705a..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw-contracts.scrbl
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{Drawing Contracts}
-
-@local-table-of-contents[]
-
-This page documents the contracts that are used to describe
-the specification of @racketmodname[racket/draw] objects
-and functions.
-
-@defthing[font-family/c flat-contract?]{
-  Recognizes font designations. Corresponds to the @racket[_family]
-  initialization argument of the @racket[font%] class.
-
-  Equivalent to the following definition:
-  @racketblock[
-    (or/c 'default 'decorative 'roman 'script 'swiss
-          'modern 'symbol 'system)]
-}
-
-@defthing[font-style/c flat-contract?]{
-  Recognizes font styles. Corresponds to the @racket[_style]
-  initialization argument of the @racket[font%] class.
-
-  Equivalent to the following definition:
-  @racketblock[(or/c 'normal 'italic 'slant)]
-}
-
-@defthing[font-weight/c flat-contract?]{
-  Recognizes font weights. Corresponds to the @racket[_weight]
-  initialization argument of the @racket[font%] class.
-
-  Equivalent to the following definition:
-  @racketblock[(or/c 'normal 'bold 'light)]
-}
-
-@defthing[font-smoothing/c flat-contract?]{
-  Recognizes a font smoothing amount.
-  Corresponds to the @racket[_smoothing]
-  initialization argument of the @racket[font%] class.
-
-  Equivalent to the following definition:
-  @racketblock[(or/c 'default 'partly-smoothed
-                     'smoothed 'unsmoothed)]
-}
-
-@defthing[font-hinting/c flat-contract?]{
-  Recognizes font hinting modes. Corresponds to the @racket[_hinting]
-  initialization argument of the @racket[font%] class.
-
-  Equivalent to the following definition:
-  @racketblock[(or/c 'aligned 'unaligned)]
-}
-
-@defthing[pen-style/c flat-contract?]{
-  Recognizes pen styles. Corresponds
-  to the @racket[_style] initialization argument of the
-  @racket[pen%] class.
-
-  Equivalent to the following definition:
-  @racketblock[
-  (or/c 'transparent 'solid 'xor 'hilite
-        'dot 'long-dash 'short-dash 'dot-dash
-        'xor-dot 'xor-long-dash 'xor-short-dash
-        'xor-dot-dash)]
-}
-
-@defthing[pen-cap-style/c flat-contract?]{
-  Recognizes pen cap styles. Corresponds
-  to the @racket[_cap] initialization argument of the
-  @racket[pen%] class.
-
-  Equivalent to the following definition:
-  @racketblock[(or/c 'round 'projecting 'butt)]
-}
-
-@defthing[pen-join-style/c flat-contract?]{
-  Recognizes pen join styles. Corresponds
-  to the @racket[_join] initialization argument of the
-  @racket[pen%] class.
-
-  Equivalent to the following definition:
-  @racketblock[(or/c 'round 'bevel 'miter)]
-}
-
-@defthing[brush-style/c flat-contract?]{
-  Recognizes brush styles. Corresponds
-  to the @racket[_style] initialization argument of the
-  @racket[brush%] class.
-
-  Equivalent to the following definition:
-  @racketblock[
-  (or/c 'transparent 'solid 'opaque
-        'xor 'hilite 'panel
-        'bdiagonal-hatch 'crossdiag-hatch
-        'fdiagonal-hatch 'cross-hatch
-        'horizontal-hatch 'vertical-hatch)]
-}
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw-funcs.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw-funcs.scrbl
deleted file mode 100644
index 0879a01721..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw-funcs.scrbl
+++ /dev/null
@@ -1,241 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{Drawing Functions}
-
-@local-table-of-contents[]
-
-@defparam[current-ps-setup pss (is-a?/c ps-setup%)]{
-
-A parameter that determines the current PostScript configuration
- settings. See @racket[post-script-dc%] and @racket[printer-dc%].}
-
-
-@defproc[(get-face-list [kind (or/c 'mono 'all) 'all]
-                        [#:all-variants? all-variants? any/c #f])
-         (listof string?)]{
-
-Returns a list of font face names available on the current system.  If
- @racket[kind] is @racket['mono], then only faces that are known to
- correspond to monospace fonts are included in the list.
-
-If @racket[all-variants?] is @racket[#f] (the default), then the
- result is in more standard terminology a list of font
- family names, which are combined with style and weight options to
- arrive at a face; if @racket[all-variants?] is true, then the result
- includes a string for each available face in the family.}
-
-
-@defproc[(get-family-builtin-face [family (or/c 'default 'decorative 'roman 'script 
-                                                'swiss 'modern 'symbol 'system)])
-         string?]{
-
-Returns the built-in default face mapping for a particular font
- family.
-
-See @racket[font%] for information about @racket[family].}
-
-
-@defproc[(make-bitmap [width exact-positive-integer?]
-                      [height exact-positive-integer?]
-                      [alpha? any/c #t]
-                      [#:backing-scale backing-scale (>/c 0.0) 1.0])
-         (is-a?/c bitmap%)]{
-
-Returns @racket[(make-object bitmap% width height #f alpha?
-backing-scale)], but this procedure is preferred because it defaults
-@racket[alpha?] in a more useful way.
-
-See also @racket[make-platform-bitmap] and @secref["Portability"].
-
-@history[#:changed "1.1" @elem{Added the @racket[#:backing-scale]
-optional argument.}]}
-
-
-@defproc[(make-brush
-          [#:color color (or/c string? (is-a?/c color%))  (make-color 0 0 0)]
-          [#:style style (or/c 'transparent 'solid 'opaque
-                               'xor 'hilite 'panel
-                               'bdiagonal-hatch 'crossdiag-hatch
-                               'fdiagonal-hatch 'cross-hatch
-                               'horizontal-hatch 'vertical-hatch)
-                   'solid]
-          [#:stipple stipple (or/c #f (is-a?/c bitmap%))
-                     #f]
-          [#:gradient gradient (or/c #f
-                                    (is-a?/c linear-gradient%)
-                                    (is-a?/c radial-gradient%))
-                      #f]
-          [#:transformation
-           transformation (or/c #f (vector/c (vector/c real? real? real?
-                                                       real? real? real?)
-                                              real? real? real? real? real?))
-                          #f]
-          [#:immutable? immutable? any/c #t])
-         (is-a?/c brush%)]{
-
-Creates a @racket[brush%] instance. This procedure provides a
-nearly equivalent interface compared to using
-@racket[make-object] with @racket[brush%], but it also supports
-the creation of immutable brushes (and creates immutable burshes by default).
-
-When @racket[stipple] is @racket[#f], @racket[gradient] is
-@racket[#f], @racket[transformation] is @racket[#f],
-@racket[immutable?] is true, and @racket[color] is either a
-@racket[color%] object or a string in @racket[the-color-database], the
-result brush is created via @method[brush-list% find-or-create-brush] of
-@racket[the-brush-list].}
-
-
-@defproc[(make-color [red byte?] [green byte?] [blue byte?]
-                     [alpha (real-in 0 1) 1.0])
-         (is-a?/c color%)]{
-
-Creates a @racket[color%] instance. This procedure provides a
-nearly equivalent interface compared to using
-@racket[make-object] with @racket[color%], but it creates
-an immutable @racket[color%] object.
-
-To create an immutable color based on a color string, use @method[color-database<%> find-color]
-or @racket[the-color-database].}
-
-
-@defproc[(make-font [#:size size (integer-in 1 1024) 12]
-                    [#:face face (or/c string? #f) #f]
-                    [#:family family (or/c 'default 'decorative 'roman 'script 
-                                           'swiss 'modern 'symbol 'system)
-                              'default]
-                    [#:style style (or/c 'normal 'italic 'slant) 'normal]
-                    [#:weight weight (or/c 'normal 'bold 'light) 'normal]
-                    [#:underlined? underlined? any/c #f]
-                    [#:smoothing smoothing (or/c 'default 'partly-smoothed 
-                                                 'smoothed 'unsmoothed) 
-                                 'default]
-                    [#:size-in-pixels? size-in-pixels? any/c #f]
-                    [#:hinting hinting (or/c 'aligned 'unaligned) 'aligned])
-         (is-a?/c font%)]{
-
-Creates a @racket[font%] instance. This procedure provides an
-equivalent but more convenient interface compared to using
-@racket[make-object] with @racket[font%].
-}
-
-
-@defproc[(make-monochrome-bitmap [width exact-positive-integer?]
-                                 [height exact-positive-integer?]
-                                 [bits (or/c bytes? #f) #f])
-         (is-a?/c bitmap%)]{
-
-Returns @racket[(make-object bitmap% width height #t)] if
-@racket[bits] is @racket[#f], or @racket[(make-object bitmap% bits
-width height)] otherwise. This procedure is preferred to using
-@racket[make-object] on @racket[bitmap%] because it is less
-overloaded.}
-
-
-@defproc[(make-pen
-          [#:color color (or/c string? (is-a?/c color%)) (make-color 0 0 0)]
-          [#:width width (real-in 0 255) 0]
-          [#:style style (or/c 'transparent 'solid 'xor 'hilite
-                               'dot 'long-dash 'short-dash 'dot-dash
-                               'xor-dot 'xor-long-dash 'xor-short-dash
-                               'xor-dot-dash)
-                   'solid]
-          [#:cap cap (or/c 'round 'projecting 'butt)
-                     'round]
-          [#:join join (or/c 'round 'bevel 'miter)
-                  'round]
-          [#:stipple stipple (or/c #f (is-a?/c bitmap%))
-                     #f]
-          [#:immutable? immutable? any/c #t])
-         (is-a?/c pen%)]{
-
-Creates a @racket[pen%] instance. This procedure provides a
-nearly equivalent interface compared to using
-@racket[make-object] with @racket[pen%], but it also supports
-the creation of immutable pens (and creates immutable pens by default).
-
-When @racket[stipple] is @racket[#f], @racket[immutable?] is true, and
-@racket[color] is either a @racket[color%] object or a string in
-@racket[the-color-database], the result pen is created via
-@method[pen-list% find-or-create-pen] of @racket[the-pen-list].}
-
-
-@defproc[(make-platform-bitmap [width exact-positive-integer?]
-                               [height exact-positive-integer?]
-                               [#:backing-scale backing-scale (>/c 0.0) 1.0])
-         (is-a?/c bitmap%)]{
-
-Creates a bitmap that uses platform-specific drawing operations
-as much as possible, which is different than a @racket[make-bitmap] result
-on Windows and Mac OS X. See @secref["Portability"] for more information.
-
-@history[#:changed "1.1" @elem{Added the @racket[#:backing-scale]
-optional argument.}]}
-                 
-
-@defproc[(read-bitmap [in (or path-string? input-port?)]
-                      [kind (or/c 'unknown 'unknown/mask 'unknown/alpha
-                                  'gif 'gif/mask 'gif/alpha 
-                                  'jpeg 'jpeg/alpha
-                                  'png 'png/mask 'png/alpha
-                                  'xbm 'xbm/alpha 'xpm 'xpm/alpha
-                                  'bmp 'bmp/alpha)
-                            'unknown/alpha]
-                      [bg-color (or/c (is-a?/c color%) #f) #f]
-                      [complain-on-failure? any/c #t]
-                      [#:backing-scale backing-scale (>/c 0.0) 1.0]
-                      [#:try-@2x? try-@2x? any/c #f])
-         (is-a?/c bitmap%)]{
-
-Returns @racket[(make-object bitmap% in kind bg-color
-complain-on-failure? backing-scale)], but this procedure is preferred
-because it defaults @racket[kind] and @racket[complain-on-failure?] in
-a more useful way.
-
-If @racket[try-@2x?] is true, @racket[in] is a path, and @racket[kind]
-is not one of the @racketidfont{/mask} symbols, then
-@racket[read-bitmap] checks whether a file exists matching @racket[in]
-but with @filepath{@"@"2x} added to the name (before the file suffix,
-if any). If the @filepath{@"@"2x} path exists, it is used instead of
-@racket[in], and @racket[backing-store] is multiplied by @racket[2].
-
-@history[#:changed "1.1" @elem{Added the @racket[#:backing-scale]
-and @racket[#:try-@2x?] optional arguments.}]}
-
-
-@defproc[(recorded-datum->procedure [datum any/c]) ((is-a?/c dc<%>) . -> . void?)]{
-
-Converts a value from @xmethod[record-dc% get-recorded-datum] to a drawing procedure.}
-
-
-@defthing[the-brush-list (is-a?/c brush-list%)]{
-
-See @racket[brush-list%].
-
-}
-
-@defthing[the-color-database (is-a?/c color-database<%>)]{
-
-See @racket[color-database<%>].
-
-}
-
-@defthing[the-font-list (is-a?/c font-list%)]{
-
-See @racket[font-list%].
-
-}
-
-@defthing[the-font-name-directory (is-a?/c font-name-directory<%>)]{
-
-See @racket[font-name-directory<%>].
-
-
-}
-
-@defthing[the-pen-list (is-a?/c pen-list%)]{
-
-See @racket[pen-list%].
-
-}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw-unit.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw-unit.scrbl
deleted file mode 100644
index a81a7a938c..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw-unit.scrbl
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label racket/draw/draw-unit racket/draw/draw-sig))
-
-@title{Signature and Unit}
-
-The @racketmodname[racket/draw/draw-sig] and
-@racketmodname[racket/draw/draw-unit] libraries define the
-@racket[draw^] signature and @racket[draw@] implementation.
-
-@section{Draw Unit}
-
-@defmodule[racket/draw/draw-unit]
-
-@defthing[draw@ unit?]{
-Re-exports all of the exports of @racketmodname[racket/draw].}
-
-
-@section{Draw Signature}
-
-@defmodule[racket/draw/draw-sig]
-
-@defsignature[draw^ ()]
-
-Includes all of the identifiers exported by @racketmodname[racket/draw].
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw.scrbl
deleted file mode 100644
index 563a5fd185..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/draw.scrbl
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{The Racket Drawing Toolkit}
-
-@author["Matthew Flatt" "Robert Bruce Findler" "John Clements"]
-
-@declare-exporting[racket/draw]
-
-@defmodule*/no-declare[(racket/draw)]{The
-@racketmodname[racket/draw] library provides all of the class,
-interface, and procedure bindings defined in this manual.}
-
-@table-of-contents[]
-
-@;------------------------------------------------------------------------
-
-@include-section["guide.scrbl"]
-@include-section["bitmap-class.scrbl"]
-@include-section["bitmap-dc-class.scrbl"]
-@include-section["brush-class.scrbl"]
-@include-section["brush-list-class.scrbl"]
-@include-section["color-class.scrbl"]
-@include-section["color-database-intf.scrbl"]
-@include-section["dc-intf.scrbl"]
-@include-section["dc-path-class.scrbl"]
-@include-section["font-class.scrbl"]
-@include-section["font-list-class.scrbl"]
-@include-section["font-name-directory-intf.scrbl"]
-@include-section["gl-config-class.scrbl"]
-@include-section["gl-context-intf.scrbl"]
-@include-section["linear-gradient-class.scrbl"]
-@include-section["pdf-dc-class.scrbl"]
-@include-section["pen-class.scrbl"]
-@include-section["pen-list-class.scrbl"]
-@include-section["point-class.scrbl"]
-@include-section["post-script-dc-class.scrbl"]
-@include-section["ps-setup-class.scrbl"]
-@include-section["radial-gradient-class.scrbl"]
-@include-section["record-dc-class.scrbl"]
-@include-section["region-class.scrbl"]
-@include-section["svg-dc-class.scrbl"]
-@include-section["draw-funcs.scrbl"]
-@include-section["draw-contracts.scrbl"]
-@include-section["draw-unit.scrbl"]
-@include-section["unsafe.scrbl"]
-@include-section["libs.scrbl"]
-
-@;------------------------------------------------------------------------
-
-@(bibliography
-
-  (bib-entry #:key "Adobe99"
-             #:author "Adobe Systems Incorporated"
-             #:title "PostScript Language Reference, third edition"
-             #:is-book? #t
-             #:url "http://partners.adobe.com/public/developer/en/ps/PLRM.pdf"
-             #:date "1999")
-
-  )
-
-@;------------------------------------------------------------------------
-
-@index-section[]
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/fire.png b/pkgs/draw-pkgs/draw-doc/scribblings/draw/fire.png
deleted file mode 100644
index 102b047c7b..0000000000
Binary files a/pkgs/draw-pkgs/draw-doc/scribblings/draw/fire.png and /dev/null differ
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/font-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/font-class.scrbl
deleted file mode 100644
index 9e22669458..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/font-class.scrbl
+++ /dev/null
@@ -1,235 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[font% object% ()]{
-
-A @defterm{font} is an object which determines the appearance of text,
- primarily when drawing text to a device context. A font is determined
- by seven properties:
-
-@itemize[
-
- @item{size --- The size of the text, either in points (the default)
-                or logical drawing units, depending on the
-                ``size-in-pixels?'' property (see below).}
-
- @item{family --- A platform- and device-independent font
-                  designation. The families are:
-
- @itemize[
- @item{@indexed-racket['default]}
- @item{@indexed-racket['decorative]}
- @item{@indexed-racket['roman]}
- @item{@indexed-racket['script]}
- @item{@indexed-racket['swiss]}
- @item{@indexed-racket['modern] (fixed width)}
- @item{@indexed-racket['symbol] (Greek letters and more)}
- @item{@indexed-racket['system] (similar to the font to draw control labels,
-                                 but see @racket[normal-control-font])}
- ]
-
- @margin-note{The terminology ``family'' and ``face'' is mangled
-              relative to its usual meaning. A @racket[font%] ``face''
-              is really used more like a font family in the usual
-              terminology or more generally as a face-description
-              string that is combined with other @racket[font%]
-              attributes to arrive at a face. A @racket[font%]
-              ``family'' is a kind of abstract font family that is
-              mapped to a particular font family on a given
-              platform.}}
-
- @item{face --- A string face name, such as @racket["Courier"]. The format
-                and meaning of a face name is platform- and
-                device-specific. If a font's face name is @racket[#f],
-                then the font's appearance depends only on the
-                family. If a face is provided but no mapping is
-                available for the face name (for a specific platform
-                or device), then the face name is ignored and the
-                family is used. See @racket[font-name-directory<%>]
-                for information about how face names are mapped for
-                drawing text.}
-
-@item{style --- The slant style of the font, one of:
- @itemize[
- @item{@indexed-racket['normal]}
- @item{@indexed-racket['slant] (a.k.a ``oblique'')}
- @item{@indexed-racket['italic]}
- ]}
-
-@item{weight --- The weight of the font, one of:
- @itemize[
- @item{@indexed-racket['normal]}
- @item{@indexed-racket['light]}
- @item{@indexed-racket['bold]}
- ]}
-
-@item{underline? --- @racket[#t] for underlined, @racket[#f] for plain.}
-
-@item{smoothing --- Amount of anti-alias smoothing, one of:
- @itemize[
- @item{@indexed-racket['default] (platform-specific, sometimes user-configurable)}
- @item{@indexed-racket['partly-smoothed] (gray anti-aliasing)}
- @item{@indexed-racket['smoothed] (sub-pixel anti-aliasing)}
- @item{@indexed-racket['unsmoothed]}
- ]}
-
-@item{size-in-pixels? --- @racket[#t] if the size of the font
- is in logical drawing units (i.e., pixels for an unscaled screen or
- bitmap drawing context), @racket[#f] if the size of the font is in
- ``points'', where a ``point'' is equal to 1 pixel on Max OS X and
- @racket[(/ 96 72)] pixels on Windows and Unix}
-
-@item{hinting --- Whether font metrics should be rounded to integers:
- @itemize[
-   @item{@indexed-racket['aligned] (the default) --- rounds to integers
-    to improve the consistency of letter spacing for pixel-based
-    targets, but at the expense of making metrics unscalable}
-   @item{@indexed-racket['unaligned] --- disables rounding}
- ]}
-
-]
-
-To avoid creating multiple fonts with the same characteristics, use
- the global @racket[font-list%] object @indexed-racket[the-font-list].
-
-See also
-@racket[font-name-directory<%>].
-
-@history[#:changed "1.2" @elem{Defined ``points'' as  @racket[(/ 96 72)] pixels on Windows,
-                               independent of the screen resolution.}]
-
-
-@defconstructor*/make[(()
-                       ([size (integer-in 1 1024)]
-                        [family font-family/c]
-                        [style font-style/c 'normal]
-                        [weight font-weight/c 'normal]
-                        [underline? any/c #f]
-                        [smoothing font-smoothing/c 'default]
-                        [size-in-pixels? any/c #f]
-                        [hinting font-hinting/c 'aligned])
-                       ([size (integer-in 1 1024)]
-                        [face string?]
-                        [family font-family/c]
-                        [style font-style/c 'normal]
-                        [weight font-weight/c 'normal]
-                        [underline? any/c #f]
-                        [smoothing font-smoothing/c 'default]
-                        [size-in-pixels? any/c #f]
-                        [hinting font-hinting/c 'aligned]))]{
-
-When no arguments are provided, creates an instance of the default
- font. If no face name is provided, the font is created without a face
- name.
-
-See @racket[font%] for information about @racket[family],
- @racket[style], @racket[weight], @racket[smoothing],
- @racket[size-in-pixels?], and @racket[hinting].
- @racket[font-name-directory<%>].
-
-See also @racket[make-font].
-
-}
-
-@defmethod[(get-face)
-           (or/c string? #f)]{
-
-Gets the font's face name, or @racket[#f] if none is specified.
-
-}
-
-@defmethod[(get-family) font-family/c]{
-
-Gets the font's family. See @racket[font%] for information about
-families.
-
-}
-
-@defmethod[(get-font-id)
-           exact-integer?]{
-
-Gets the font's ID, for use with a
-@racket[font-name-directory<%>]. The ID is determined by the font's
-face and family specifications, only.
-
-}
-
-@defmethod[(get-hinting) font-hinting/c]{
-
-Gets the font's hinting. See @racket[font%] for information about
-hinting.
-
-}
-
-@defmethod[(get-point-size)
-           (integer-in 1 1024)]{
-
-Gets the font's size (roughly the height). Despite the method name,
- the size may be in logical units instead of points, depending on the
- result of @method[font% get-size-in-pixels].
-
-Due to space included in a font by a font designer, a font tends to
- generate text that is slightly taller than the nominal size.
-
-}
-
-@defmethod[(get-size-in-pixels)
-           boolean?]{
-
-Returns @racket[#t] if the size reported by @method[font%
- get-point-size] is in logical drawing units, @racket[#f] if it is in
- points.
-
-For a size in points and a screen or bitmap drawing context, the
- logical height depends on the resolution of the screen.
-
-}
-
-@defmethod[(get-smoothing) font-smoothing/c]{
-
-Gets the font's anti-alias smoothing mode. See @racket[font%] for
- information about smoothing.
-
-}
-
-@defmethod[(get-style) font-style/c]{
-
-Gets the font's slant style. See @racket[font%] for information about
- styles.
-
-}
-
-@defmethod[(get-underlined)
-           boolean?]{
-
-Returns @racket[#t] if the font is underlined or @racket[#f]
-otherwise.
-
-}
-
-@defmethod[(get-weight) font-weight/c]{
-
-Gets the font's weight. See @racket[font%] for information about
- weights.
-
-}
-
-@defmethod[(screen-glyph-exists? [c char?]
-                                 [for-label? any/c #f])
-           boolean?]{
-
-Returns @racket[#t] if the given character has a corresponding glyph
- when drawing to the screen or a bitmap, @racket[#f] otherwise.
-
-If the second argument is true, the result indicates whether the glyph
- is available for control labels. Otherwise, it indicates whether the
- glyph is available for @racket[dc<%>] drawing.
-
-For @racket[dc<%>] drawing, due to automatic font substitution when
- drawing or measuring text, the result of this method does not depend
- on this font's attributes (size, face, etc.). The font's attributes
- merely provide a hint for the glyph search.
-
-See also @method[dc<%> glyph-exists?] .
-
-}}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/font-list-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/font-list-class.scrbl
deleted file mode 100644
index 4c8e4be202..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/font-list-class.scrbl
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[font-list% object% ()]{
-
-A @racket[font-list%] object maintains a list of @racket[font%]
- objects to avoid repeatedly creating fonts.
-
-A global font list, @racket[the-font-list], is created automatically.
-
-
-@defconstructor[()]{
-
-Creates an empty font list.
-
-}
-
-@defmethod*[([(find-or-create-font [size (integer-in 1 255)]
-                                   [family (or/c 'default 'decorative 'roman 'script 
-                                                 'swiss 'modern 'symbol 'system)]
-                                   [style (or/c 'normal 'italic 'slant)]
-                                   [weight (or/c 'normal 'bold 'light)]
-                                   [underline? any/c #f]
-                                   [smoothing (or/c 'default 'partly-smoothed 'smoothed 'unsmoothed) 'default]
-                                   [size-in-pixels? any/c #f]
-                                   [hinting (or/c 'aligned 'unaligned) 'aligned])
-              (is-a?/c font%)]
-             [(find-or-create-font [size (integer-in 1 255)]
-                                   [face string?]
-                                   [family (or/c 'default 'decorative 'roman 'script
-                                                 'swiss 'modern 'symbol 'system)]
-                                   [style (or/c 'normal 'italic 'slant)]
-                                   [weight (or/c 'normal 'bold 'light)]
-                                   [underline any/c #f]
-                                   [smoothing (or/c 'default 'partly-smoothed 'smoothed 'unsmoothed) 'default]
-                                   [size-in-pixels? any/c #f]
-                                   [hinting (or/c 'aligned 'unaligned) 'aligned])
-              (is-a?/c font%)])]{
-
-Finds an existing font in the list or creates a new one (that is
- automatically added to the list). The arguments are the same as for
- creating a @racket[font%] instance.
-
-}}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/font-name-directory-intf.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/font-name-directory-intf.scrbl
deleted file mode 100644
index 1d9ea80a10..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/font-name-directory-intf.scrbl
+++ /dev/null
@@ -1,154 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/bnf)
-
-@definterface/title[font-name-directory<%> ()]{
-
-There is one @racket[font-name-directory<%>] object:
- @racket[the-font-name-directory]. It implements a mapping from font
- specifications (face, family, style, and weight) to information for
- rendering text on a specific device. Programmers rarely need to
- directly invoke methods of @racket[the-font-name-directory]. It is
- used automatically when drawing text to a @racket[dc<%>]
- object. Nevertheless, @racket[the-font-name-directory] is available
- so that programmers can query or modify the mapping manually. A
- programmer may also need to understand how the face-and-family
- mapping works.
-
-To extract mapping information from @racket[the-font-name-directory],
- first obtain a @defterm{font ID}, which is an index based on a family
- and optional face string. Font IDs are returned by
- @method[font-name-directory<%> find-or-create-font-id] and
- @method[font-name-directory<%> get-font-id] . A Font ID can be
- combined with a weight and style to obtain a specific mapping value
- via @method[font-name-directory<%> get-screen-name] or
- @method[font-name-directory<%> get-post-script-name].
-
-For a family without a face string, the corresponding font ID has a
- useful built-in mapping for every platform and device. For a family with a
- face string, @racket[the-font-name-directory] interprets the string
- (in a platform-specific way) to generate a mapping for
- drawing (to a canvas's @racket[dc<%>], a @racket[bitmap-dc%], or a
- @racket[printer-dc%]).
-
-Currently, on all platforms, a face string is interpreted as a
- @hyperlink["http://www.pango.org"]{Pango} font description when it
- contains a comma, otherwise it is treated as a family name. A
- face can thus be just a family name such as @racket["Helvetica"], a family
- followed by a comma and font modifiers as in @racket["Helvetica, Bold"], or a sequence of comma-separated
- familie names followed by space-separated font options as an
- @racket["Helvetica, Arial, bold italic"]. Any size in a font
- description is overridden by a given @racket[font%]'s size. Any
- (slant) style or weight options in a font description are overridden
- by a non-@racket['normal] value for a given @racket[font%]'s style or
- weight, respectively.
-
-@defmethod[(find-family-default-font-id [family (or/c 'default 'decorative 'roman 'script 
-                                                      'swiss 'modern 'symbol 'system)])
-           exact-integer?]{
-
-Gets the font ID representing the default font for a family. See
-@racket[font%] for information about font families.
-
-}
-
-@defmethod[(find-or-create-font-id [name string?]
-                                   [family (or/c 'default 'decorative 'roman 'script 
-                                                 'swiss 'modern 'symbol 'system)])
-           exact-integer?]{
-
-Gets the face name for a font ID, initializing the mapping for
- the face name if necessary.
-
-Font ID are useful only as mapping indices for
- @indexed-racket[the-font-name-directory].
-
-}
-
-@defmethod[(get-face-name [font-id exact-integer?])
-           (or/c string? #f)]{
-
-Gets the face name for a font ID. If the font ID corresponds to
- the default font for a particular family, @racket[#f] is returned.
-
-}
-
-@defmethod[(get-family [font-id exact-integer?])
-           (or/c 'default 'decorative 'roman 'script 
-                 'swiss 'modern 'symbol 'system)]{
-
-Gets the family for a font ID. See
-@racket[font%] for information about font families.
-
-}
-
-@defmethod[(get-font-id [name string?]
-                        [family (or/c 'default 'decorative 'roman 'script 
-                                      'swiss 'modern 'symbol 'system)])
-           exact-integer?]{
-
-Gets the font ID for a face name paired with a default family. If the
- mapping for the given pair is not already initialized, @racket[0] is
- returned. See also @method[font-name-directory<%>
- find-or-create-font-id].
-
-Font ID are useful only as mapping indices for
- @indexed-racket[the-font-name-directory].
-
-}
-
-@defmethod[(get-post-script-name [font-id exact-integer?]
-                                 [weight (or/c 'normal 'bold 'light)]
-                                 [style (or/c 'normal 'italic 'slant)])
-           (or/c string? #f)]{
-
-Gets a PostScript font description for a font ID, weight, and style
- combination.
-
-See @racket[font%] for information about @racket[weight] and
- @racket[style].
-
-}
-
-@defmethod[(get-screen-name [font-id exact-integer?]
-                            [weight (or/c 'normal 'bold 'light)]
-                            [style (or/c 'normal 'italic 'slant)])
-           (or/c string? #f)]{
-
-Gets a platform-dependent screen font description (used for drawing to a
- canvas's @racket[dc<%>], a @racket[bitmap-dc%], or a
- @racket[printer-dc%]) for a font ID, weight, and style combination.
-
-See @racket[font%] for information about @racket[weight] and
-@racket[style].
-
-}
-
-@defmethod[(set-post-script-name [font-id exact-integer?]
-                                 [weight (or/c 'normal 'bold 'light)]
-                                 [style (or/c 'normal 'italic 'slant)]
-                                 [name string?])
-           void?]{
-
-Sets a PostScript font description for a font ID, weight, and style
- combination. See also @method[font-name-directory<%>
- get-post-script-name].
-
-See @racket[font%] for information about @racket[weight] and @racket[style].
-
-}
-
-@defmethod[(set-screen-name [font-id exact-integer?]
-                            [weight (or/c 'normal 'bold 'light)]
-                            [style (or/c 'normal 'italic 'slant)]
-                            [name string?])
-           void?]{
-
-Sets a platform-dependent screen font description (used for drawing to a
- canvas's @racket[dc<%>], a @racket[bitmap-dc%], or a
- @racket[printer-dc%]) for a font ID, weight, and style combination.
-
-See @racket[font%] for information about @racket[weight] and
- @racket[style].
-
-}}
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/gl-config-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/gl-config-class.scrbl
deleted file mode 100644
index 411648b5e3..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/gl-config-class.scrbl
+++ /dev/null
@@ -1,164 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[gl-config% object% ()]{
-
-A @racket[gl-config%] object encapsulates configuration information
- for an OpenGL drawing context. Use a @racket[gl-config%] object as an
- initialization argument for @racket[canvas%] or provide it to
- @racket[make-gl-bitmap].
-
-
-@defconstructor[()]{
-
-Creates a GL configuration that indicates legacy OpenGL, double
-buffering, a depth buffer of size one, no stencil buffer, no
-accumulation buffer, no multisampling, and not stereo.
-
-}
-
-@defmethod[(get-accum-size)
-           (integer-in 0 256)]{
-
-Reports the accumulation-buffer size (for each of red, green, blue,
- and alpha) that the configuration requests, where zero means no
- accumulation buffer is requested.
-
-}
-
-@defmethod[(get-depth-size)
-           (integer-in 0 256)]{
-
-Reports the depth-buffer size that the configuration requests, where
- zero means no depth buffer is requested.
-
-}
-
-@defmethod[(get-double-buffered)
-           boolean?]{
-
-Reports whether the configuration requests double buffering or not.
-
-}
-
-@defmethod[(get-multisample-size)
-           (integer-in 0 256)]{
-
-Reports the multisampling size that the configuration requests, where
- zero means no multisampling is requested.
-
-}
-
-@defmethod[(get-share-context)
-           (or/c #f (is-a?/c gl-context<%>))]{
-
-Returns a @racket[gl-context<%>] object that shares certain objects
-(textures, display lists, etc.) with newly created OpenGL drawing
-contexts, or @racket[#f] is none is set.
-
-See also @method[gl-config% set-share-context].
-
-}
-          
-
-@defmethod[(get-stencil-size)
-           (integer-in 0 256)]{
-
-Reports the stencil-buffer size that the configuration requests, where
- zero means no stencil buffer is requested.
-
-}
-
-@defmethod[(get-stereo)
-           boolean?]{
-
-Reports whether the configuration requests stereo or not.
-
-}
-
-@defmethod[(set-accum-size [on? (integer-in 0 256)])
-           void?]{
-
-Adjusts the configuration to request a particular accumulation-buffer
- size for every channel (red, green, blue, and alpha), where zero
- means no accumulation buffer is requested.
-
-}
-
-@defmethod[(set-depth-size [on? (integer-in 0 256)])
-           void?]{
-
-Adjusts the configuration to request a particular depth-buffer size,
- where zero means no depth buffer is requested.
-
-}
-
-@defmethod[(set-double-buffered [on? any/c])
-           void?]{
-
-Adjusts the configuration to request double buffering or not.
-
-}
-
-@defmethod[(set-multisample-size [on? (integer-in 0 256)])
-           void?]{
-
-Adjusts the configuration to request a particular multisample size,
- where zero means no multisampling is requested. If a multisampling
- context is not available, this request will be ignored.
-
-}
-
-@defmethod[(set-share-context [context (or/c #f (is-a?/c gl-context<%>))])
-           void?]{
-
-Determines a @racket[gl-context<%>] object that shares certain objects
-(textures, display lists, etc.) with newly created OpenGL drawing
-contexts, where @racket[#f] indicates
-that no sharing should occur.
-
-When a context @racket[_B] shares objects with context @racket[_A], it
-is also shares objects with every other context sharing with
-@racket[_A], and vice versa.
-
-If an OpenGL implementation does not support sharing, @racket[context]
-is effectively ignored when a new context is created.
-Sharing should be supported in all versions of Mac OS X.
-On Windows and Linux, sharing is provided by the presence of the
-@tt{WGL_ARB_create_context} and @tt{GLX_ARB_create_context} extensions,
-respectively (and OpenGL 3.2 requires both).
-
-}
-
-@defmethod[(set-stencil-size [on? (integer-in 0 256)])
-           void?]{
-
-Adjusts the configuration to request a particular stencil-buffer size,
- where zero means no stencil buffer is requested.
-
-}
-
-@defmethod[(set-stereo [on? any/c])
-           void?]{
-
-Adjusts the configuration to request stereo or not.
-
-}
-
-@defmethod[(get-legacy?)
-           boolean?]{
-
-Determines whether to use legacy, "Compatibility" OpenGL or "Core" OpenGL.
-Core OpenGL profiles are currently supported on OS X (versions 10.7 and up)
-and Linux (if the graphics drivers support them).
-@history[#:added "1.2"]
-}
-@defmethod[(set-legacy? [legacy? any/c])
-           void?]{
-
-Adjusts the configuration to request legacy or not.
-@history[#:added "1.2"]
-}
-
-
-}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/gl-context-intf.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/gl-context-intf.scrbl
deleted file mode 100644
index 76ade64df0..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/gl-context-intf.scrbl
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label (only-in ffi/unsafe cpointer?)))
-
-@definterface/title[gl-context<%> ()]{
-
-A @racket[gl-context<%>] object represents a context for drawing with
- @as-index{OpenGL} to a specific @racket[dc<%>] instance. To obtain a
- @racket[gl-context<%>] object, call @method[dc<%> get-gl-context] of
- the target drawing context.
-
-Only canvas @racket[dc<%>] and @racket[bitmap-dc%] objects containing
- a bitmap from @racket[make-gl-bitmap] support OpenGL (always on
- Windows and Mac OS X, sometimes on Unix).  Normal @racket[dc<%>]
- drawing and OpenGL drawing can be mixed in a @racket[bitmap-dc%], but
- a canvas that uses the @racket['gl] style to support OpenGL does not
- reliably support normal @racket[dc<%>] drawing; use a bitmap if you
- need to mix drawing modes, and use a canvas to maximize OpenGL
- performance.
-
-When the target bitmap for a @racket[bitmap-dc%] context is changed
- via @method[bitmap-dc% set-bitmap], the associated
- @racket[gl-context<%>] changes. Canvas contexts are normally double
- buffered, and bitmap contexts are single buffered.
-
-The @racketmodname[racket/gui/base] library provides no OpenGL
- routines. Instead, they must be obtained from a separate library,
- such as @racketmodname[sgl #:indirect]. The facilities in
- @racketmodname[racket/gui/base] merely manage the current OpenGL
- context, connecting it to windows and bitmaps.
-
-Only one OpenGL context can be active at a time across all threads and
- eventspaces. OpenGL contexts are not protected
- against interference among threads; that is, if a thread selects one
- of its OpenGL contexts, then other threads can write into the context
- via OpenGL commands. However, if all threads issue OpenGL commands
- only within a thunk passed to @method[gl-context<%> call-as-current],
- then drawing from the separate threads will not interfere, because
- @method[gl-context<%> call-as-current] uses a lock to serialize
- context selection across all threads in Racket.
-
-@defmethod[(call-as-current [thunk (-> any)]
-                            [alternate evt? never-evt]
-                            [enable-breaks? any/c #f])
-           any/c]{
-
-Calls a thunk with this OpenGL context as the current context for
- OpenGL commands.
-
-The method blocks to obtain a lock that protects the global OpenGL
- context, and it releases the lock when the thunk returns or
- escapes. The lock is re-entrant, so a nested use of the method in the
- same thread with the same OpenGL context does not obtain or release
- the lock.
-
-The lock prevents interference among OpenGL-using threads.  If a
- thread is terminated while holding the context lock, the lock is
- released. Continuation jumps into the thunk do not grab the lock or
- set the OpenGL context. See @racket[gl-context<%>] for more
- information on interference.
-
-The method accepts an alternate @tech[#:doc
- reference-doc]{synchronizable event} for use while blocking for the
- context lock; see also @racket[sync].
-
-The result of the method call is the result of the thunk if it is
- called, or the result of the alternate event if it is chosen instead
- of the context lock.
-
-If @method[gl-context<%> ok?] returns @racket[#f] at the time that
- this method is called, then @|MismatchExn|.
-
-If @racket[enable-breaks?] is true, then the method uses
- @racket[sync/enable-break] while blocking for the context-setting
- lock instead of @racket[sync].
-
-}
-
-@defmethod[(get-handle) cpointer?]{
-
-Returns a handle to the platform's underlying context. The value that the
-pointer represents depends on the platform:
-
-@itemize[
-@item{Windows: @tt{HGLRC}}
-@item{Mac OS X: @tt{NSOpenGLContext}}
-@item{Unix: @tt{GLXContext}}
-]
-
-Note that these values are not necessary the most ``low-level'' context objects,
-but are instead the ones useful to Racket. For example, a @tt{NSOpenGLContext}
-wraps a @tt{CGLContextObj}.
-}
-
-@defmethod[(ok?)
-           boolean?]{
-
-Returns @racket[#t] if this context is available OpenGL drawing,
- @racket[#f] otherwise.
-
-A context is unavailable if OpenGL support is disabled at compile time
- or run time, if the context is associated with a
- @racket[bitmap-dc%] with no selected bitmap or with a monochrome
- selected bitmap, if the context is for a canvas that no longer
- exists, or if there was a low-level error when preparing the context.
-
-}
-
-@defmethod[(swap-buffers)
-           void?]{
-
-Swaps the front (visible) and back (OpenGL-drawing) buffer for a
- context associated with a canvas, and has no effect on a bitmap
- context.
-
-This method implicitly uses @method[gl-context<%> call-as-current] to
- obtain the context lock. Since the lock is re-entrant, however, the
- @method[gl-context<%> swap-buffers] method can be safely used within
- a @method[gl-context<%> call-as-current] thunk.
-
-}}
-
-@defproc[(get-current-gl-context) gl-context<%>]{
-If within the dynamic extent of a @method[gl-context<%> call-as-current]
-method call, returns the current context; otherwise returns @racket[#f].
-This is possibly most useful for caching context-dependent state or data,
-such as extension strings. Create such caches using @racket[make-weak-hasheq].
-
-@history[#:added "1.3"]
-}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/guide.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/guide.scrbl
deleted file mode 100644
index e62764698e..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/guide.scrbl
+++ /dev/null
@@ -1,789 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/eval scribble/racket racket/runtime-path
-          "common.rkt"
-          (for-syntax racket/base)
-          (for-label racket/math))
-
-@(define draw-eval (make-base-eval))
-@interaction-eval[#:eval draw-eval (require racket/class
-                                            racket/draw)]
-@interaction-eval[#:eval draw-eval (define (copy-bitmap bm0)
-                                     (let ([w (send bm0 get-width)]
-                                           [h (send bm0 get-height)])
-                                       (let ([bm (make-bitmap w h)])
-                                         (let ([dc (send bm make-dc)])
-                                           (send dc draw-bitmap bm0 0 0)
-                                           (send dc set-bitmap #f))
-                                          bm)))]
-@interaction-eval[#:eval draw-eval (define (line-bitmap mode)
-                                     (let* ([bm (make-bitmap 30 4)]
-                                            [dc (send bm make-dc)])
-                                       (send dc set-smoothing mode)
-                                       (send dc draw-line 0 2 30 2)
-                                       (send dc set-bitmap #f)
-                                       (copy-bitmap bm)))]
-@interaction-eval[#:eval draw-eval (define (path-bitmap zee join brush?)
-                                     (let* ([bm (make-bitmap 40 40)]
-                                            [dc (new bitmap-dc% [bitmap bm])])
-                                       (send dc set-smoothing 'aligned)
-                                       (send dc set-pen (new pen% [width 5] [join join]))
-                                       (if brush?
-                                           (send dc set-brush blue-brush)
-                                           (send dc set-brush "white" 'transparent))
-                                       (send dc draw-path zee 5 5)
-                                       (send dc set-bitmap #f)
-                                       (copy-bitmap bm)))]
-
-@(define-syntax-rule (define-linked-method name interface)
-   (define-syntax name 
-     (make-element-id-transformer
-      (lambda (stx)
-        #'(method interface name)))))
-@(define-linked-method draw-line dc<%>)
-@(define-linked-method draw-rectangle dc<%>)
-@(define-linked-method set-pen dc<%>)
-@(define-linked-method set-font dc<%>)
-@(define-linked-method set-clipping-region dc<%>)
-@(define-linked-method set-alpha dc<%>)
-@(define-linked-method get-pen dc<%>)
-@(define-linked-method set-brush dc<%>)
-@(define-linked-method get-brush dc<%>)
-@(define-linked-method set-smoothing dc<%>)
-@(define-linked-method draw-path dc<%>)
-@(define-linked-method draw-ellipse dc<%>)
-@(define-linked-method draw-text dc<%>)
-@(define-linked-method draw-bitmap dc<%>)
-@(define-linked-method get-text-extent dc<%>)
-@(define-linked-method set-text-foreground dc<%>)
-@(define-linked-method draw-arc dc<%>)
-@(define-linked-method erase dc<%>)
-@(define-linked-method set-stipple brush%)
-@(define-linked-method line-to dc-path%)
-@(define-linked-method curve-to dc-path%)
-@(define-linked-method move-to dc-path%)
-@(define-linked-method append dc-path%)
-@(define-linked-method arc dc-path%)
-@(define-linked-method reverse dc-path%)
-@(define-linked-method ellipse dc-path%)
-@(define-linked-method translate dc<%>)
-@(define-linked-method scale dc<%>)
-@(define-linked-method rotate dc<%>)
-@(define-linked-method set-path region%)
-
-@title[#:tag "overview"]{Overview}
-
-The @racketmodname[racket/draw] library provides a drawing API that is
-based on the PostScript drawing model. It supports line drawing, shape
-filling, bitmap copying, alpha blending, and affine transformations
-(i.e., scale, rotation, and translation).
-
-@margin-note{See @secref["classes" #:doc '(lib
-"scribblings/guide/guide.scrbl")] for an introduction to classes and
-interfaces in Racket.}
-
-Drawing with @racketmodname[racket/draw] requires a @deftech{drawing context}
-(@deftech{DC}), which is an instance of the @racket[dc<%>]
-interface. For example, the @racket[post-script-dc%] class implements
-a @racket[dc<%>] for drawing to a PostScript file, while @racket[bitmap-dc%] 
-draws to a bitmap. When using the @racketmodname[racket/gui] library for GUIs,
-the @method[canvas<%> get-dc] method of a
-canvas returns a @racket[dc<%>] instance for drawing into the canvas
-window.
-
-@margin-note{See @secref["canvas-drawing" #:doc '(lib
-"scribblings/gui/gui.scrbl")] for an introduction to drawing 
-in a GUI window.}
-
-@; ------------------------------------------------------------
-@section{Lines and Simple Shapes}
-
-To draw into a bitmap, first create the bitmap with
-@racket[make-bitmap], and then create a @racket[bitmap-dc%] that draws
-into the new bitmap:
-
-@racketblock+eval[
-#:eval draw-eval
-(define target (make-bitmap 30 30)) (code:comment "A 30x30 bitmap")
-(define dc (new bitmap-dc% [bitmap target]))
-]
-
-Then, use methods like @method[dc<%> draw-line] on the @tech{DC} to draw
-into the bitmap. For example, the sequence
-
-@racketblock+eval[
-#:eval draw-eval
-(send dc draw-rectangle 
-      0 10   (code:comment @#,t{Top-left at (0, 10), 10 pixels down from top-left})
-      30 10) (code:comment @#,t{30 pixels wide and 10 pixels high})
-(send dc draw-line 
-      0 0    (code:comment @#,t{Start at (0, 0), the top-left corner})
-      30 30) (code:comment @#,t{and draw to (30, 30), the bottom-right corner})
-(send dc draw-line 
-      0 30   (code:comment @#,t{Start at (0, 30), the bottom-left corner})
-      30 0)  (code:comment @#,t{and draw to (30, 0), the top-right corner})
-]
-
-draws an ``X'' on top of a smaller rectangle into the bitmap @racket[target]. If
-you save the bitmap to a file with @racket[(send target #,(:: bitmap% save-file)
-"box.png" 'png)], the @filepath{box.png} contains the image
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap target)]}
-
-in PNG format.
-
-A line-drawing drawing operation like @racket[draw-line] uses the
-@tech{DC}'s current @defterm{pen} to draw the line. A pen has a color,
-line width, and style, where pen styles include @racket['solid],
-@racket['long-dash], and @racket['transparent]. Enclosed-shape
-operations like @racket[draw-rectangle] use both the current pen and
-the @tech{DC}'s current @deftech{brush}. A brush has a color and style,
-where brush styles include @racket['solid], @racket['cross-hatch], and
-@racket['transparent].
-
-@margin-note{In DrRacket, instead of saving @racket[target] to a file
-viewing the image from the file, you can use @racket[(require
-racket/gui)] and @racket[(make-object image-snip% target)] to view the
-bitmap in the DrRacket interactions window.}
-
-For example, set the brush and pen before the drawing operations to
-draw a thick, red ``X'' on a green rectangle with a thin, blue border:
-
-@racketblock+eval[
-#:eval draw-eval
-(send dc set-brush "green" 'solid)
-(send dc set-pen "blue" 1 'solid)
-(send dc draw-rectangle 0 10 30 10)
-(send dc set-pen "red" 3 'solid)
-(send dc draw-line 0 0 30 30)
-(send dc draw-line 0 30 30 0)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap target)]}
-
-To draw a filled shape without an outline, set the pen to
-@racket['transparent] mode (with any color and line width). For
-example,
-
-@racketblock+eval[
-#:eval draw-eval
-(send dc set-pen "white" 1 'transparent)
-(send dc set-brush "black" 'solid)
-(send dc draw-ellipse 5 5 20 20)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap target)]}
-
-By default, a @racket[bitmap-dc%] draws solid pixels without smoothing
-the boundaries of shapes. To enable smoothing, set the
-smoothing mode to either @racket['smoothed] or @racket['aligned]:
-
-@racketblock+eval[
-#:eval draw-eval
-(send dc set-smoothing 'aligned)
-(send dc set-brush "black" 'solid)
-(send dc draw-ellipse 4 4 22 22) (code:comment @#,t{a little bigger})
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap target)]}
-
-The difference between @racket['aligned] mode and @racket['smoothed]
-mode is related to the relatively coarse granularity of pixels in a
-bitmap. Conceptually, drawing coordinates correspond to the lines
-between pixels, and the pen is centered on the line. In
-@racket['smoothed] mode, drawing on a line causes the pen to draw at
-half strength on either side of the line, which produces the following
-result for a 1-pixel black pen:
-
-@centered[@interaction-eval-show[#:eval draw-eval (line-bitmap 'smoothed)]]
-
-but @racket['aligned] mode shifts drawing coordinates to make the pen
-fall on whole pixels, so a 1-pixel black pen draws a single line of
-pixels:
-
-@centered[@interaction-eval-show[#:eval draw-eval (line-bitmap 'aligned)]]
-
-@; ------------------------------------------------------------
-@section{Pen, Brush, and Color Objects}
-
-The @racket[set-pen] and @racket[set-brush] methods of a @tech{DC}
- accept @racket[pen%] and @racket[brush%] objects, which group
- together pen and brush settings.
-
-@racketblock+eval[
-#:eval draw-eval
-(require racket/math)
-
-(define no-pen (new pen% [style 'transparent]))
-(define no-brush (new brush% [style 'transparent]))
-(define blue-brush (new brush% [color "blue"]))
-(define yellow-brush (new brush% [color "yellow"]))
-(define red-pen (new pen% [color "red"] [width 2]))
-
-(define (draw-face dc) 
-  (send dc set-smoothing 'aligned)
-
-  (send dc set-pen no-pen) 
-  (send dc set-brush blue-brush) 
-  (send dc draw-ellipse 25 25 100 100) 
-
-  (send dc set-brush yellow-brush) 
-  (send dc draw-rectangle 50 50 10 10) 
-  (send dc draw-rectangle 90 50 10 10) 
-
-  (send dc set-brush no-brush) 
-  (send dc set-pen red-pen) 
-  (send dc draw-arc 37 37 75 75 (* 5/4 pi) (* 7/4 pi)))
-
-(define target (make-bitmap 150 150))
-(define dc (new bitmap-dc% [bitmap target]))
-
-(draw-face dc)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap target)]}
-
-The @racket[get-pen] and @racket[get-brush] methods return a
-@tech{DC}'s current pen and brush, so they can be restored after
-changing them temporarily for drawing.
-
-Besides grouping settings, a @racket[pen%] or @racket[brush%] object
-includes extra settings that are not available by using
-@racket[set-pen] or @racket[set-brush] directly. For example, a pen or
-brush can have a @deftech{stipple}, which is a bitmap that is used
-instead of a solid color when drawing. For example, if
-@filepath{water.png} has the image
-
-@;{We can't just use the runtime path for "water.png" because we need to 
-make the eval below work. }
-@(define-runtime-path here ".")
-@(define-runtime-path water "water.png")
-@(draw-eval `(current-directory ,here))
-
-@centered{@image[water]}
-
-then it can be loaded with @racket[read-bitmap] and installed as the
-stipple for @racket[blue-brush]:
-
-@racketblock+eval[
-#:eval draw-eval
-(send blue-brush set-stipple (read-bitmap "water.png"))
-(send dc erase)
-(draw-face dc)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap target)]}
-
-Along similar lines, a @racket[color%] object lets you specify a color
-through its red, green, and blue components instead of a built-in
-color name. Due to the way that @racket[color%] initialization is
-overloaded, use @racket[make-object] instead of @racket[new] to
-instantiate @racket[color%], or use the @racket[make-color] function:
-
-@racketblock+eval[
-#:eval draw-eval
-(define red-pen 
-  (new pen% [color (make-color 200 100 150)] [width 2]))
-(send dc erase)
-(draw-face dc)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap target)]}
-
-
-@; ------------------------------------------------------------
-@section{Transformations}
-
-Any coordinates or lengths supplied to drawing commends are
-transformed by a @tech{DC}'s current transformation matrix.  The
-transformation matrix can scale an image, draw it at an offset, or
-rotate all drawing. The transformation can be set directly, or the
-current transformation can be transformed further with methods like
-@racket[scale], @racket[translate], or @racket[rotate]:
-
-@racketblock+eval[
-#:eval draw-eval
-(send dc erase)
-(send dc scale 0.5 0.5)
-(draw-face dc)
-(send dc rotate (/ pi 2))
-(send dc translate 0 150)
-(draw-face dc)
-(send dc translate 0 -150)
-(send dc rotate (/ pi 2))
-(send dc translate 150 150)
-(draw-face dc)
-(send dc translate -150 -150)
-(send dc rotate (/ pi 2))
-(send dc translate 150 0)
-(draw-face dc)
-]
-
-Use the @method[dc<%> get-transformation] method to get a @tech{DC}'s
-current transformation, and restore a saved transformation (or any
-affine transformation) using @method[dc<%> set-transformation].
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap target)]}
-
-@; ------------------------------------------------------------
-@section{Drawing Paths}
-
-Drawing functions like @racket[draw-line] and @racket[draw-rectangle]
- are actually convenience functions for the more general
- @racket[draw-path] operation. The @racket[draw-path] operation takes
- a @deftech{path}, which describes a set of line segments and curves
- to draw with the pen and---in the case of closed set of lines and
- curves---fill with the current brush.
-
-An instance of @racket[dc-path%] holds a path. Conceptually, a path
- has a current pen position that is manipulated by methods like
- @racket[move-to], @racket[line-to], and @racket[curve-to]. The
- @racket[move-to] method starts a sub-path, and @racket[line-to] and
- @racket[curve-to] extend it. The @racket[close] method moves the pen
- from its current position in a straight line to its starting
- position, completing the sub-path and forming a closed path that can
- be filled with the brush. A @racket[dc-path%] object can have
- multiple closed sub-paths and one final open path, where the open
- path is drawn only with the pen.
-
-For example,
-
-@racketblock+eval[
-#:eval draw-eval
-(define zee (new dc-path%))
-(send zee move-to 0 0)
-(send zee line-to 30 0)
-(send zee line-to 0 30)
-(send zee line-to 30 30)
-]
-
-creates an open path. Drawing this path with a black pen of width 5
-and a transparent brush produces
-
-@centered{@interaction-eval-show[#:eval draw-eval (path-bitmap zee 'round #f)]}
-
-Drawing a single path with three line segments is not the same as
-drawing three separate lines. When multiple line segments are drawn at
-once, the corner from one line to the next is shaped according to the
-pen's join style. The image above uses the default @racket['round]
-join style. With @racket['miter], line lines are joined with sharp
-corners:
-
-@centered{@interaction-eval-show[#:eval draw-eval (path-bitmap zee 'miter #f)]}
-
-If the sub-path in @racket[zee] is closed with @racket[close], then
-all of the corners are joined, including the corner at the initial
-point:
-
-@racketblock+eval[
-#:eval draw-eval
-(send zee close)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (path-bitmap zee 'miter #f)]}
-
-Using @racket[blue-brush] instead of a transparent brush causes the
-interior of the path to be filled:
-
-@centered{@interaction-eval-show[#:eval draw-eval (path-bitmap zee 'miter #t)]}
-
-When a sub-path is not closed, it is implicitly closed for brush
-filling, but left open for pen drawing. When both a pen and brush are
-available (i.e., not transparent), then the brush is used first, so
-that the pen draws on top of the brush.
-
-At this point we can't resist showing an extended example using
-@racket[dc-path%] to draw the Racket logo:
-
-@racketblock+eval[
-#:eval draw-eval
-(define red-brush (new brush% [stipple (read-bitmap "fire.png")]))
-
-(define left-lambda-path
-  (let ([p (new dc-path%)])
-    (send p move-to 153 44)
-    (send p line-to 161.5 60)
-    (send p curve-to 202.5 49 230 42 245 61)
-    (send p curve-to 280.06 105.41 287.5 141 296.5 186)
-    (send p curve-to 301.12 209.08 299.11 223.38 293.96 244)
-    (send p curve-to 281.34 294.54 259.18 331.61 233.5 375)
-    (send p curve-to 198.21 434.63 164.68 505.6 125.5 564)
-    (send p line-to 135 572)
-    p))
-
-(define left-logo-path
-  (let ([p (new dc-path%)])
-    (send p append left-lambda-path)
-    (send p arc 0 0 630 630 (* 235/360 2 pi) (* 121/360 2 pi) #f)
-    p))
-
-(define bottom-lambda-path 
-  (let ([p (new dc-path%)])
-    (send p move-to 135 572)
-    (send p line-to 188.5 564)
-    (send p curve-to 208.5 517 230.91 465.21 251 420)
-    (send p curve-to 267 384 278.5 348 296.5 312)
-    (send p curve-to 301.01 302.98 318 258 329 274)
-    (send p curve-to 338.89 288.39 351 314 358 332)
-    (send p curve-to 377.28 381.58 395.57 429.61 414 477)
-    (send p curve-to 428 513 436.5 540 449.5 573)
-    (send p line-to 465 580)
-    (send p line-to 529 545)
-    p))
-
-(define bottom-logo-path
-  (let ([p (new dc-path%)])
-    (send p append bottom-lambda-path)
-    (send p arc 0 0 630 630 (* 314/360 2 pi) (* 235/360 2 pi) #f)
-    p))
-
-(define right-lambda-path
-  (let ([p (new dc-path%)])
-    (send p move-to 153 44)
-    (send p curve-to 192.21 30.69 233.21 14.23 275 20)
-    (send p curve-to 328.6 27.4 350.23 103.08 364 151)
-    (send p curve-to 378.75 202.32 400.5 244 418 294)
-    (send p curve-to 446.56 375.6 494.5 456 530.5 537)
-    (send p line-to 529 545)
-    p))
-
-(define right-logo-path
-  (let ([p (new dc-path%)])
-    (send p append right-lambda-path)
-    (send p arc 0 0 630 630 (* 314/360 2 pi) (* 121/360 2 pi) #t)    
-    p))
-
-(define lambda-path
-  (let ([p (new dc-path%)])
-    (send p append left-lambda-path)
-    (send p append bottom-lambda-path)
-    (let ([t (new dc-path%)])
-        (send t append right-lambda-path)
-        (send t reverse)
-        (send p append t))
-    (send p close)
-    p))
-
-(define (paint-racket dc)
-  (send dc set-pen "black" 0 'transparent)
-  (send dc set-brush "white" 'solid)
-  (send dc draw-path lambda-path)
-
-  (send dc set-pen "black" 4 'solid)
-
-  (send dc set-brush red-brush)
-  (send dc draw-path left-logo-path)
-  (send dc draw-path bottom-logo-path)
-
-  (send dc set-brush blue-brush)
-  (send dc draw-path right-logo-path))
-
-(define racket-logo (make-bitmap 170 170))
-(define dc (new bitmap-dc% [bitmap racket-logo]))
-
-(send dc set-smoothing 'smoothed)
-(send dc translate 5 5)
-(send dc scale 0.25 0.25)
-(paint-racket dc)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval racket-logo]}
-
-In addition to the core @racket[move-to], @racket[line-to],
-@racket[curve-to], and @racket[close] methods, a @racket[dc-path%]
-includes many convenience methods, such as @racket[ellipse] for adding
-a closed elliptical sub-path to the path.
-
-@; ------------------------------------------------------------
-@section{Text}
-
-Draw text using the @racket[draw-text] method, which takes a string to
-draw and a location for the top-left of the drawn text:
-
-@racketblock+eval[
-#:eval draw-eval
-(define text-target (make-bitmap 100 30))
-(define dc (new bitmap-dc% [bitmap text-target]))
-(send dc set-brush "white" 'transparent)
-
-(send dc draw-rectangle 0 0 100 30)
-(send dc draw-text "Hello, World!" 5 1)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap text-target)]}
-
-The font used to draw text is determined by the @tech{DC}'s current
-font.  A font is described by a @racket[font%] object and installed
-with @racket[set-font]. The color of drawn text which is separate from
-either the pen or brush, can be set using
-@racket[set-text-foreground].
-
-
-@racketblock+eval[
-#:eval draw-eval
-(send dc erase)
-(send dc set-font (make-font #:size 14 #:family 'roman 
-                             #:weight 'bold))
-(send dc set-text-foreground "blue")
-(send dc draw-rectangle 0 0 100 30)
-(send dc draw-text "Hello, World!" 5 1)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap text-target)]}
-
-To compute the size that will be used by drawn text, use
-@racket[get-text-extent], which returns four values: the total width,
-total height, difference between the baseline and total height, and
-extra space (if any) above the text in a line. For example, the result
-of @racket[get-text-extent] can be used to position text within the
-center of a box:
-
-@racketblock+eval[
-#:eval draw-eval
-(send dc erase)
-(send dc draw-rectangle 0 0 100 30)
-(define-values (w h d a) (send dc get-text-extent "Hello, World!"))
-(send dc draw-text "Hello, World!" (/ (- 100 w) 2) (/ (- 30 h) 2))
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap text-target)]}
-
-
-@; ------------------------------------------------------------
-@section{Alpha Channels and Alpha Blending}
-
-When you create or @racket[erase] a bitmap, the content is
-nothing. ``Nothing'' isn't the same as white; it's the absence of
-drawing. For example, if you take @racket[text-target] from the
-previous section and copy it onto another @tech{DC} using
-@racket[draw-bitmap], then the black rectangle and blue text is
-transferred, and the background is left alone:
-
-@racketblock+eval[
-#:eval draw-eval
-(define new-target (make-bitmap 100 30))
-(define dc (new bitmap-dc% [bitmap new-target]))
-(send dc set-pen "black" 1 'transparent)
-(send dc set-brush "pink" 'solid)
-
-(send dc draw-rectangle 0 0 100 30)
-(send dc draw-bitmap text-target 0 0)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap new-target)]}
-
-The information about which pixels of a bitmap are drawn (as opposed
-to ``nothing'') is the bitmap's @deftech{alpha channel}. Not all
-@tech{DC}s keep an alpha channel, but bitmaps created with
-@racket[make-bitmap] keep an alpha channel by default. Bitmaps loaded
-with @racket[read-bitmap] preserve transparency in the image file
-through the bitmap's alpha channel.
-
-An alpha channel isn't all or nothing. When the edges text is
-anti-aliased by @racket[draw-text], for example, the pixels are
-partially transparent. When the pixels are transferred to another
-@tech{DC}, the partially transparent pixel is blended with the target
-pixel in a process called @deftech{alpha blending}. Furthermore, a
-@tech{DC} has an alpha value that is applied to all drawing
-operations; an alpha value of @racket[1.0] corresponds to solid
-drawing, an alpha value of @racket[0.0] makes the drawing have no
-effect, and values in between make the drawing translucent.
-
-For example, setting the @tech{DC}'s alpha to @racket[0.25] before
-calling @racket[draw-bitmap] causes the blue and black of the ``Hello,
-World!'' bitmap to be quarter strength as it is blended with the
-destination image:
-
-@racketblock+eval[
-#:eval draw-eval
-(send dc erase)
-(send dc draw-rectangle 0 0 100 30)
-(send dc set-alpha 0.25)
-(send dc draw-bitmap text-target 0 0)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap new-target)]}
-
-@; ------------------------------------------------------------
-@section{Clipping}
-
-In addition to tempering the opacity of drawing operations, a
-@tech{DC} has a @deftech{clipping region} that constrains all drawing to
-inside the region. In the simplest case, a clipping region corresponds
-to a closed path, but it can also be the union, intersection,
-subtraction, or exclusive-or of two paths.
-
-For example, a clipping region could be set to three circles to clip
-the drawing of a rectangle (with the 0.25 alpha still in effect):
-
-@racketblock+eval[
-#:eval draw-eval
-(define r (new region%))
-(let ([p (new dc-path%)])
-  (send p ellipse 00 0 35 30)
-  (send p ellipse 35 0 30 30)
-  (send p ellipse 65 0 35 30)
-  (send r set-path p))
-(send dc set-clipping-region r)
-(send dc set-brush "green" 'solid)
-(send dc draw-rectangle 0 0 100 30)
-]
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap new-target)]}
-
-The clipping region can be viewed as a convenient alternative to path
-filling or drawing with stipples. Conversely, stippled drawing can be
-viewed as a convenience alternative to clipping repeated calls of
-@racket[draw-bitmap].
-
-Combining regions with @racket[pen%] objects that have gradients, however,
-is more than just a convenience, as it allows us to draw shapes in combinations
-we could not otherwise draw. To illustrate, here is some code that draws
-text with its reflection below it.
-
-@racketblock+eval[
-#:eval draw-eval
-(code:comment "First compute the size of the text we're going to draw,")
-(code:comment "using a small bitmap that we never draw into.")
-(define bdc (new bitmap-dc% [bitmap (make-bitmap 1 1)]))
-(define str "Racketeers, ho!")
-(define the-font (make-font #:size 24 #:family 'swiss 
-                            #:weight 'bold))
-(define-values (tw th)
-  (let-values ([(tw th ta td)
-                (send dc get-text-extent str the-font)])
-    (values (inexact->exact (ceiling tw))
-            (inexact->exact (ceiling th)))))
-
-(code:comment "Now we can create a correctly sized bitmap to")
-(code:comment "actually draw into and enable smoothing.")
-(send bdc set-bitmap (make-bitmap tw (* th 2)))
-(send bdc set-smoothing 'smoothed)
-
-(code:comment "next, build a path that contains the outline of the text")
-(define upper-path (new dc-path%))
-(send upper-path text-outline the-font str 0 0)
-
-(code:comment "next, build a path that contains the mirror image")
-(code:comment "outline of the text")
-(define lower-path (new dc-path%))
-(send lower-path text-outline the-font str 0 0)
-(send lower-path transform (vector 1 0 0 -1 0 0))
-(send lower-path translate 0 (* 2 th))
-
-(code:comment "This helper accepts a path, sets the clipping region")
-(code:comment "of bdc to be the path (but in region form), and then")
-(code:comment "draws a big rectangle over the whole bitmap.")
-(code:comment "The brush will be set differently before each call to")
-(code:comment "draw-path, in order to draw the text and then to draw")
-(code:comment "the shadow.")
-(define (draw-path path)
-  (define rgn (new region%))
-  (send rgn set-path path)
-  (send bdc set-clipping-region rgn)
-  (send bdc set-pen "white" 1 'transparent)
-  (send bdc draw-rectangle 0 0 tw (* th 2))
-  (send bdc set-clipping-region #f))
-
-(code:comment "Now we just draw the upper-path with a solid brush")
-(send bdc set-brush "black" 'solid)
-(draw-path upper-path)
-
-(code:comment "To draw the shadow, we set up a brush that has a")
-(code:comment "linear gradient over the portion of the bitmap")
-(code:comment "where the shadow goes")
-(define stops
-  (list (list 0 (make-color 0 0 0 0.4))
-        (list 1 (make-color 0 0 0 0.0))))
-(send bdc set-brush 
-      (new brush% 
-           [gradient 
-            (new linear-gradient% 
-                 [x0 0]
-                 [y0 th]
-                 [x1 0]
-                 [y1 (* th 2)]
-                 [stops stops])]))
-(draw-path lower-path)                 
-]
-
-And now the bitmap in @racket[bdc] has ``Racketeers, ho!'' with
-a mirrored version below it.
-
-@centered{@interaction-eval-show[#:eval draw-eval (copy-bitmap (send bdc get-bitmap))]}
-
-
-@; ------------------------------------------------------------
-@section[#:tag "Portability"]{Portability and Bitmap Variants}
-
-Drawing effects are not completely portable across platforms, across
-different classes that implement @racket[dc<%>], or different
-kinds of bitmaps. Fonts and text, especially, can vary across
-platforms and types of @tech{DC}, but so can the precise set of pixels
-touched by drawing a line.
-
-Different kinds of bitmaps can produce different results:
-
-@itemlist[
-
- @item{Drawing to a bitmap produced by @racket[make-bitmap] (or
-       instantiated from @racket[bitmap%]) draws in the most
-       consistent way across platforms.}
-
- @item{Drawing to a bitmap produced by @racket[make-platform-bitmap]
-       uses platform-specific drawing operations as much as possible.
-       On Windows, however, a bitmap produced by
-       @racket[make-platform-bitmap] has no alpha channel, and it uses
-       more constrained resources than one produced by
-       @racket[make-bitmap] (due to a system-wide, per-process GDI limit).
-
-       As an example of platform-specific difference, text is smoothed
-       by default with sub-pixel anti-aliasing on Mac OS X, while text
-       smoothing in a @racket[make-bitmap] result uses only grays.
-       Line or curve drawing may touch different pixels than in a
-       bitmap produced by @racket[make-bitmap], and bitmap scaling may
-       differ.
-
-       A possible approach to dealing with the GDI limit under Windows
-       is to draw into the result of a @racket[make-platform-bitmap]
-       and then copy the contents of the drawing into the result of a
-       @racket[make-bitmap]. This approach preserves the drawing
-       results of @racket[make-platform-bitmap], but it retains
-       constrained resources only during the drawing process.}
-
- @item{Drawing to a bitmap produced by @racket[make-screen-bitmap]
-       from @racketmodname[racket/gui/base] uses the same
-       platform-specific drawing operations as drawing into a
-       @racket[canvas%] instance. A bitmap produced by
-       @racket[make-screen-bitmap] uses the same platform-specific
-       drawing as @racket[make-platform-bitmap] on Windows or Mac OS
-       X, but possibly scaled, and it may be sensitive to the X11
-       server on Unix.
- 
-       On Mac OS X, when the main screen is in Retina mode (at the
-       time that the bitmap is created), the bitmap is also internally
-       scaled so that one drawing unit uses two pixels. Similarly, on
-       Windows, when the main display's text scale is configured at
-       the operating-system level (see @secref[#:doc '(lib
-       "scribblings/gui/gui.scrbl") "display-resolution"]), the bitmap
-       is internally scaled, where common configurations map a drawing
-       unit to @math{1.25}, @math{1.5}, or @math{2} pixels.
-
-       Use @racket[make-screen-bitmap] when drawing to a bitmap as an
-       offscreen buffer before transferring an image to the screen, or
-       when consistency with screen drawing is needed for some other
-       reason.}
-
- @item{A bitmap produced by @xmethod[canvas% make-bitmap] from
-       @racketmodname[racket/gui/base] is like a bitmap from
-       @racket[make-screen-bitmap], but on Mac OS X, the bitmap is
-       optimized for drawing to the screen (by taking advantage of
-       system APIs that can, in turn, take advantage of graphics
-       hardware).
-
-       Use @xmethod[canvas% make-bitmap] for similar purposes
-       as @racket[make-screen-bitmap], particularly when the bitmap
-       will be drawn later to a known target canvas.}
-
-]
-
-@close-eval[draw-eval]
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/info.rkt b/pkgs/draw-pkgs/draw-doc/scribblings/draw/info.rkt
deleted file mode 100644
index c2f8a8db68..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("draw.scrbl" (multi-page) (racket-core -21))))
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/libs.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/libs.scrbl
deleted file mode 100644
index 65d987d7d0..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/libs.scrbl
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "libs"]{Platform Dependencies}
-
-On Windows and Mac OS X, the Racket distribution includes all
-necessary libraries that are not part of a stock installation of the
-operating system, and the libraries are included in any distribution
-created with @exec{raco distribute} (see @secref[#:doc '(lib
-"scribblings/raco/raco.scrbl") "exe-dist"]).
-
-On Unix, the following system libraries must be installed. Numbers
-in square brackets indicate a version that is tried first, and if that
-fails, the name without the version is tried.
-
-@itemlist[
- @item{@filepath{libglib-2.0[.0]}}
- @item{@filepath{libgmodule-2.0[.0]}}
- @item{@filepath{libgobject-2.0[.0]}}
- @item{@filepath{libpango-1.0[.0]}}
- @item{@filepath{libpangocairo-1.0[.0]}}
- @item{@filepath{libcairo[.2]}}
- @item{@filepath{libjpeg[.{62,8,9}]}}
- @item{@filepath{libpng[{16[.16],15[.15],12[.0]]}}}
-]
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/linear-gradient-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/linear-gradient-class.scrbl
deleted file mode 100644
index eb1e9e7318..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/linear-gradient-class.scrbl
+++ /dev/null
@@ -1,105 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/eval
-          (for-label pict))
-
-@(define class-eval (make-base-eval))
-@(interaction-eval #:eval class-eval (require racket/class racket/draw pict))
-
-@defclass/title[linear-gradient% object% ()]{
-
-A @deftech{linear gradient} is used with a @racket[brush%] to fill
- areas with smooth color transitions.
- Color transitions are based on a line, where colors are assigned to
- stop points along the line, and colors for in-between points are
- interpolated from the stop-point colors. The color of a point on the
- gradient's line is propagated to all points in the drawing context
- that are touched by a line through the point and perpendicular to the
- gradient's line.
-
-
-@defconstructor[([x0 real?]
-                 [y0 real?]
-                 [x1 real?]
-                 [y1 real?]
-                 [stops (listof (list/c (real-in 0 1) (is-a?/c color%)))])]{
-
-Creates a linear gradient with a line from (@racket[x0], @racket[y0])
-to end point (@racket[x1], @racket[y1]). The @racket[stops] list
-assigns colors to stop points along the line, where @racket[0.0]
-corresponds to (@racket[x0], @racket[y0]), @racket[1.0] corresponds to
-(@racket[x1], @racket[y2]), and numbers in between correspond to
-points in between.
-
-Elements in @racket[stops] are implicitly sorted by point (i.e., by
-the number between @racket[0.0] and @racket[1.0]). Order is preserved
-for multiple elements for the same point, in which case the first
-element for a given point is treated infinitesimally before the point,
-and additional elements between the first and last for a stop point
-are effectively ignored.
-
-@examples[
-  #:eval class-eval
-(define ellipse-brush 
-  (new brush% 
-       [gradient
-        (new linear-gradient%
-             [x0 0] 
-             [y0 200]
-             [x1 200]
-             [y1 00]
-             [stops 
-              (list (list 0   (make-object color% 255 0 0))
-                    (list 0.5 (make-object color% 0 255 0))
-                    (list 1   (make-object color% 0 0 255)))])]))
-
-(define rectangle-brush
-  (new brush% 
-       [gradient
-        (new linear-gradient%
-             [x0 0]
-             [y0 100]
-             [x1 100]
-             [y1 0]
-             [stops 
-              (list (list 0   (make-object color% 255 0 0))
-                    (list 0.5 (make-object color% 0 255 0))
-                    (list 1   (make-object color% 0 0 255)))])]))
-
-(dc
- (λ (dc dx dy)
-   (define old-pen (send dc get-pen))
-   (define old-brush (send dc get-brush))
-   (define-values (ox oy) (send dc get-origin))
-   (send dc set-pen "black" 1 'transparent)
-   (send dc set-brush ellipse-brush)
-   
-   (send dc set-origin (+ ox dx 50) (+ oy dy 50))
-   (send dc draw-ellipse 0 0 200 200)
-   
-   (send dc set-brush rectangle-brush)
-   (send dc set-origin (+ ox dx 300) (+ oy dy 50))
-   (send dc draw-rectangle 0 0 200 200)
-   
-   (send dc set-pen old-pen)
-   (send dc set-brush old-brush)
-   (send dc set-origin ox oy))
- 550 300)
-]}
-
-
-@defmethod[(get-line)
-           (values real? real? real? real?)]{
-
-Returns the gradient's control line as @racket[_x0], @racket[_y0],
-@racket[_x1], and @racket[_y1].
-
-}
-
-@defmethod[(get-stops)
-           (listof (list/c (real-in/c 0 1) (is-a?/c color%)))]{
-
-Returns the gradient's list of color stops.
-
-}}
-
-@(close-eval class-eval)
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/pdf-dc-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/pdf-dc-class.scrbl
deleted file mode 100644
index 64cd010a92..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/pdf-dc-class.scrbl
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[pdf-dc% object% (dc<%>)]{
-
-Like @racket[post-script-dc%], but generates a PDF file instead of a
- PostScript file.
-
-@defconstructor[([interactive any/c #t]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                 [use-paper-bbox any/c #f]
-                 [as-eps any/c #t]
-                 [width (or/c (and/c real? (not/c negative?)) #f) #f]
-                 [height (or/c (and/c real? (not/c negative?)) #f) #f]
-                 [output (or/c path-string? output-port? #f) #f])]{
-
-See @racket[post-script-dc%] for information on the arguments. The
-@racket[as-eps] argument is allowed for consistency with
-@racket[post-script-dc%], but its value is ignored.}}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/pen-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/pen-class.scrbl
deleted file mode 100644
index 91b523f427..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/pen-class.scrbl
+++ /dev/null
@@ -1,291 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label pict))
-
-@(define pen-eval (make-base-eval))
-@(interaction-eval 
-  #:eval pen-eval 
-  (require racket/draw pict racket/class))
-
-@defclass/title[pen% object% ()]{
-
-A pen is a drawing tool with a color, width, and style. A pen draws
- lines and outlines, such as the outline of a rectangle. In a
- monochrome destination, all non-white pens are drawn as black.
-
-In addition to its color, width, and style, a pen can have a @deftech{pen stipple}
- bitmap. Drawing with a stipple pen is similar to
- calling @method[dc<%> draw-bitmap] with the stipple bitmap in region
- painted by the pen.
-
-A @deftech{pen style} is one of the following:
-
-@itemize[
-
- @item{@indexed-racket['transparent] --- Draws with no effect (on the
-       outline of the drawn shape).}
-
- @item{@indexed-racket['solid] --- Draws using the pen's color. If a
-        (monochrome) @tech{pen stipple} is installed into the pen, black pixels
-        from the stipple are transferred to the destination using the
-        brush's color, and white pixels from the stipple are not
-        transferred.}
-
- @item{@indexed-racket['xor] --- The same as @racket['solid], accepted 
-        only for partial backward compatibility.}
-
- @item{@indexed-racket['hilite] --- Draws with black and a @racket[0.3] alpha.}
-
- @item{The following special pen modes use the pen's color, and they only
-       apply when a @tech{pen stipple} is not used:
-    @itemize[
-  @item{@indexed-racket['dot]}
-  @item{@indexed-racket['long-dash]}
-  @item{@indexed-racket['short-dash]}
-  @item{@indexed-racket['dot-dash]}
-  @item{@indexed-racket['xor-dot]}
-  @item{@indexed-racket['xor-long-dash]}
-  @item{@indexed-racket['xor-short-dash]}
-  @item{@indexed-racket['xor-dot-dash]}
-  ]}
-
-]
-
-To avoid creating multiple pens with the same characteristics, use the
- global @racket[pen-list%] object @indexed-racket[the-pen-list], or
- provide a color, width, and style to @xmethod[dc<%> set-pen].
-
-When drawing in @racket['unsmoothed] or @racket['aligned] mode, a
- pen's size is truncated after scaling to size that is integral after
- multiplication by the drawing context's @tech{alignment scale}. A pen
- of size @racket[0] (after truncation, if applicable) uses a non-zero,
- scale-insensitive line size for the destination drawing context:
- @racket[1/4] unit (after scaling) for @racket[post-script-dc%] or
- @racket[pdf-dc%] contexts in @racket['smoothed] mode, or @racket[1]
- unit (after scaling) divided by the @tech{alignment scale} for any
- other context. For example, in unscaled canvas and bitmap contexts
- with an @tech{alignment scale} of @racket[1.0], a zero-width pen behaves the
- same as a pen of size @racket[1].
-
-See also @racket[make-pen].
-
-
-@defconstructor[([color (or/c string? (is-a?/c color%)) "black"]
-                 [width (real-in 0 255) 0]
-                 [style pen-style/c 'solid]
-                 [cap pen-cap-style/c 'round]
-                 [join pen-join-style/c 'round]
-                 [stipple (or/c #f (is-a?/c bitmap%)) 
-                          #f])]{
-
-Creates a pen with the given color, width, @tech{pen style}, @tech{cap style}, @tech{join style}, and
- @tech{pen stipple} bitmap.  For the case that the color is specified using a name, see
- @racket[color-database<%>] for information about color names; if the
- name is not known, the pen's color is black.
-
-}
-
-@defmethod[(get-cap) pen-cap-style/c]{
-
-Returns the pen @deftech{cap style}, which determines the shape of a line at
-each of its ending points when drawn by @method[dc<%> draw-line] or at the
-non-connecting ends of lines when drawn by @method[dc<%> draw-lines] or
-@method[dc<%> draw-path]. The default is @racket['round], which draws the
-end of a line as a semi-circle. The @racket['projecting] style draws a
-square in place of the semi-circle (i.e., past the point at which the
-line stops). The @racket['butt] style ends the line with a straight
-edge, instead of projecting past the ending point of the line.
-
-This code draws three diagonal lines, one with each of the possible caps
-(@racket['round], @racket['butt], and then @racket['projecting]) and puts
-a little red dot on the end points of the line.
-
-@examples[#:eval 
-          pen-eval
-          (define (plot-line dc x1 y1 x2 y2 cap)
-            (send dc set-pen 
-                  (send the-pen-list find-or-create-pen
-                        "black" 40 'solid cap))
-            (send dc draw-line x1 y1 x2 y2)
-            (send dc set-brush "red" 'solid)
-            (send dc set-pen "black" 1 'transparent)
-            (send dc draw-ellipse (- x1 4) (- y1 4) 8 8)
-            (send dc draw-ellipse (- x2 4) (- y2 4) 8 8))
-          
-          (dc
-           (λ (dc dx dy)
-             (define old-pen (send dc get-pen))
-             (define old-brush (send dc get-brush))
-             
-             (plot-line dc 20 30 80 90 'round)
-             (plot-line dc 100 30 160 90 'butt)
-             (plot-line dc 180 30 240 90 'projecting)
-             
-             (send dc set-pen old-pen)
-             (send dc set-brush old-brush))
-           270 120)]
-
-}
-
-@defmethod[(get-color)
-           (is-a?/c color%)]{
-
-Returns the pen's color object.
-
-}
-
-@defmethod[(get-join) pen-join-style/c]{
-
-Returns the pen @deftech{join style} that is used between multiple lines
-connected through @method[dc<%> draw-lines], @method[dc<%>
-draw-rectangle], @method[dc<%> draw-polygon], or @method[dc<%>
-draw-path].  The join style fills the space that would be left at the
-outside corner of two lines if they were draw separately with
-@racket['butt] line endings. The default join style is
-@racket['round], which fills under an arc that lines up with the
-outside of each of the two lines. The @racket['bevel] style fills in
-the gap without adding extra pixels (i.e., it makes a blunt
-corner). The @racket['miter] style fills the gap by adding pixels that
-would be covered by both lines if they were extended past the corner
-(i.e., it makes a sharp corner).
-
-This code shows the three join styles
-(@racket['round], @racket['bevel] and then @racket['miter])
-by drawing a sequence
-of lines, first with a sharp corner and then with a right-angle.
-Each of the end points of the lines i with a red dot.
-
-@examples[#:eval
-          pen-eval
-          (define points '((100 . 100)
-                           (0 . 0)
-                           (0 . 100)
-                           (40 . 100)))
-          
-          (define (connect-points dc dx dy join)
-            (send dc set-pen 
-                  (send the-pen-list find-or-create-pen
-                        "black" 40 'solid 'round join))
-            (send dc draw-lines points dx dy)
-            (send dc set-brush "red" 'solid)
-            (send dc set-pen "black" 1 'transparent)
-            (for ([pt (in-list points)])
-              (send dc draw-ellipse 
-                    (+ dx (car pt) -4) (+ dy (cdr pt) -4)
-                    8 8)))
-          
-          (dc
-           (λ (dc dx dy)
-             (define old-pen (send dc get-pen))
-             (define old-brush (send dc get-brush))
-             
-             (connect-points dc 20 50 'round)
-             (connect-points dc 180 50 'bevel)
-             (connect-points dc 340 50 'miter)
-             
-             (send dc set-pen old-pen)
-             (send dc set-brush old-brush))
-           460 170)]
-
-}
-
-
-@defmethod[(get-stipple)
-           (or/c (is-a?/c bitmap%) #f)]{
-
-Gets the current @tech{pen stipple} bitmap, or returns @racket[#f] if no stipple
- bitmap is installed.
-
-}
-
-@defmethod[(get-style) pen-style/c]{
-
-Returns the @tech{pen style}. See @racket[pen%] for information about
-possible styles.
-
-}
-
-@defmethod[(get-width)
-           (real-in 0 255)]{
-
-Returns the pen width.
-
-}
-
-@defmethod[(is-immutable?)
-           boolean?]{
-
-Returns @racket[#t] if the pen object is immutable.
-
-}
-
-@defmethod[(set-cap [cap-style pen-cap-style/c])
-           void?]{
-
-Sets the pen @tech{cap style}. See @method[pen% get-cap] for information about cap
- styles.
-
-A pen cannot be modified if it was obtained from a @racket[pen-list%]
- or while it is selected into a drawing context.
-
-}
-
-@defmethod*[([(set-color [color (is-a?/c color%)])
-              void?]
-             [(set-color [color-name string?])
-              void?]
-             [(set-color [red byte?] [green byte?] [blue byte?])
-              void?])]{
-
-Sets the pen color.
-
-A pen cannot be modified if it was obtained from a
- @racket[pen-list%] or while it is selected into a drawing context.
-
-}
-
-@defmethod[(set-join [join-style pen-join-style/c])
-           void?]{
-
-Sets the pen @tech{join style}. See @method[pen% get-join] for information about join
- styles.
-
-A pen cannot be modified if it was obtained from a
- @racket[pen-list%] or while it is selected into a drawing context.
-
-}
-
-@defmethod[(set-stipple [bitmap (or/c (is-a?/c bitmap%) #f)])
-           void?]{
-
-Sets the pen @tech{pen stipple} bitmap, where @racket[#f] turns off the stipple bitmap.
-
-If @racket[bitmap] is modified while is associated with a pen, the
- effect on the pen is unspecified. A pen cannot be modified if it was
- obtained from a @racket[pen-list%] or while it is selected into a
- drawing context.
-
-}
-
-@defmethod[(set-style [style pen-style/c])
-           void?]{
-
-Sets the @tech{pen style}. See @racket[pen%] for information about the
- possible styles.
-
-A pen cannot be modified if it was obtained from a
- @racket[pen-list%] or while it is selected into a drawing context.
-
-}
-
-@defmethod[(set-width [width (real-in 0 255)])
-           void?]{
-
-Sets the pen width.
-
-A pen cannot be modified if it was obtained from a
- @racket[pen-list%] or while it is selected into a drawing context.
-
-}}
-
-@close-eval[pen-eval]
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/pen-list-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/pen-list-class.scrbl
deleted file mode 100644
index a8900b5c79..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/pen-list-class.scrbl
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[pen-list% object% ()]{
-
-A @racket[pen-list%] object maintains a list of @racket[pen%]
- objects to avoid repeatedly creating pen objects. A @racket[pen%]
- object in a pen list cannot be mutated.
-
-A global pen list @indexed-racket[the-pen-list] is created automatically.
-
-
-@defconstructor[()]{
-
-Creates an empty pen list.
-
-
-}
-
-@defmethod*[([(find-or-create-pen [color (is-a?/c color%)]
-                                  [width (real-in 0 255)]
-                                  [style (or/c 'transparent 'solid 'xor 'hilite 
-                                               'dot 'long-dash 'short-dash 'dot-dash 
-                                               'xor-dot 'xor-long-dash 'xor-short-dash 
-                                               'xor-dot-dash)]
-                                  [cap (or/c 'round 'projecting 'butt) 'round]
-                                  [join (or/c 'round 'bevel 'miter) 'round])
-              (is-a?/c pen%)]
-             [(find-or-create-pen [color-name string?]
-                                  [width (real-in 0 255)]
-                                  [style (or/c 'transparent 'solid 'xor 'hilite 
-                                               'dot 'long-dash 'short-dash 'dot-dash 
-                                               'xor-dot 'xor-long-dash 'xor-short-dash 
-                                               'xor-dot-dash)]
-                                  [cap (or/c 'round 'projecting 'butt) 'round]
-                                  [join (or/c 'round 'bevel 'miter) 'round])
-              (or/c (is-a?/c pen%) #f)])]{
-
-Finds a pen of the given specification, or creates one and adds it to
-the list.  The arguments are the same as for creating a @racket[pen%]
-instance plus a cap and join style as for @method[pen% set-cap] and
-@method[pen% set-join]. When @racket[color-name] is provided, however, the return
-value is @racket[#f] when no color matching @racket[color-name] can be
-found in @racket[the-color-database].
-
-}}
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/point-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/point-class.scrbl
deleted file mode 100644
index 2522c5c40d..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/point-class.scrbl
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[point% object% ()]{
-
-A @racket[point%] is used for certain drawing commands. It
- encapsulates two real numbers.
-
-@defconstructor*/make[(()
-                       ([x real?]
-                        [y real?]))]{
-
-Creates a point. If @racket[x] and @racket[y] are not supplied, they
- are set to @racket[0].
-}
-
-@defmethod[(get-x)
-           real?]{
-Gets the point x-value.
-
-}
-
-@defmethod[(get-y)
-           real?]{
-Gets the point y-value.
-
-}
-
-@defmethod[(set-x [x real?])
-           void?]{
-Sets the point x-value.
-
-}
-
-@defmethod[(set-y [y real?])
-           void?]{
-
-Sets the point y-value.
-
-}}
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/post-script-dc-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/post-script-dc-class.scrbl
deleted file mode 100644
index 666fa97a1c..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/post-script-dc-class.scrbl
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[post-script-dc% object% (dc<%>)]{
-
-A @racket[post-script-dc%] object is a PostScript device context, that
- can write PostScript files on any platform. See also
- @racket[ps-setup%] and @racket[pdf-dc%].
-
-@|PrintNote|
-
-See also @racket[printer-dc%].
-
-
-@defconstructor[([interactive any/c #t]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                 [use-paper-bbox any/c #f]
-                 [as-eps any/c #t]
-                 [width (or/c (and/c real? (not/c negative?)) #f) #f]
-                 [height (or/c (and/c real? (not/c negative?)) #f) #f]
-                 [output (or/c path-string? output-port? #f) #f])]{
-
-If @racket[interactive] is true, the user is given a dialog for
- setting printing parameters (see @racket[get-ps-setup-from-user]);
- the resulting configuration is installed as the current
- configuration). If the user chooses to print to a file (the only
- possibility on Windows and Mac OS X), another dialog is given to
- select the filename.  If the user hits cancel in either of these
- dialogs, then @method[dc<%> ok?] returns @racket[#f].
-
-If @racket[parent] is not @racket[#f], it is used as the parent window of
- the configuration dialog.
-
-If @racket[interactive] is @racket[#f], then the settings returned by
- @racket[current-ps-setup] are used. A file dialog is still presented
- to the user if the @method[ps-setup% get-file] method returns
- @racket[#f] and @racket[output] is @racket[#f], and the user may 
- hit @onscreen{Cancel} in that case so that @method[dc<%> ok?] returns @racket[#f].
-
-If @racket[use-paper-bbox] is @racket[#f], then the PostScript
- bounding box for the output is determined by @racket[width] and
- @racket[height] (which are rounded upward using @racket[ceiling]). 
- If @racket[use-paper-bbox] is not @racket[#f], then
- the bounding box is determined by the current paper size (as
- specified by @racket[current-ps-setup]). When @racket[width] or
- @racket[height] is @racket[#f], then the corresponding dimension is
- determined by the paper size, even if @racket[use-paper-bbox] is
- @racket[#f].
-
-@index["Encapsulated PostScript (EPS)"]{If} @racket[as-eps] is
- @racket[#f], then the generated PostScript does not include an
- Encapsulated PostScript (EPS) header, and instead includes a generic
- PostScript header. The margin and translation factors specified by
- @racket[current-ps-setup] are used only when @racket[as-eps] is
- @racket[#f]. If @racket[as-eps] is true, then the generated
- PostScript includes a header that identifiers it as EPS.
-
-When @racket[output] is not @racket[#f], then file-mode output is
- written to @racket[output]. If @racket[output] is @racket[#f], then
- the destination is determined via @racket[current-ps-setup] or by
- prompting the user for a pathname. When @racket[output] is a port,
- then data is written to @racket[port] by a thread that is created
- with the @racket[post-script-dc%] instance; in case that writing
- thread's custodian is shut down, calling @method[dc<%> end-doc]
- resumes the port-writing thread with @racket[thread-resume]
- and @racket[(current-thread)] as the second argument.
-
-See also @racket[ps-setup%] and @racket[current-ps-setup]. The
-settings for a particular @racket[post-script-dc%] object are fixed to
-the values in the current configuration when the object is created
-(after the user has interactively adjusted them when
-@racket[interactive] is true).
-
-}}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/ps-setup-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/ps-setup-class.scrbl
deleted file mode 100644
index 0d0df98873..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/ps-setup-class.scrbl
+++ /dev/null
@@ -1,275 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[ps-setup% object% ()]{
-
-A @racket[ps-setup%] object contains configuration information for
- producing PostScript files using a @racket[post-script-dc%] object.
- To a lesser extent, it contains information for printing with a
- @racket[printer-dc%] object.
-
-When a @racket[post-script-dc%] object is created, its configuration
- is determined by the @racket[current-ps-setup] parameter's
- @racket[ps-setup%] value. After a @racket[post-script-dc%] object is
- created, it is unaffected by changes to the @racket[current-ps-setup]
- parameter or mutations to the @racket[ps-setup%] object.
-
-
-@defconstructor[()]{
-
-Creates a new @racket[ps-setup%] object with the (platform-specific)
- default configuration.
-
-}
-
-@defmethod[(copy-from [source (is-a?/c ps-setup%)]
-                      [copy-filename? any/c #f])
-           void?]{
-
-Copies the settings @racket[copy-from] to @this-obj[], excluding the
-filename unless @racket[copy-filename?] is true.
-
-}
-
-@defmethod[(get-command)
-           string?]{
-
-Historically, gets the printer command used to print a file on
- Unix. The default is @racket["lpr"]. This value is not currently used
- by any platforms.
-
-}
-
-@defmethod[(get-editor-margin [h-margin (box/c (and/c real? (not/c negative?)))]
-                              [v-margin (box/c (and/c real? (not/c negative?)))])
-           void?]{
-
-Returns the current settings for horizontal and vertical margins when
- printing an @racket[editor<%>]. See also @method[ps-setup%
- set-editor-margin].
-
-}
-
-@defmethod[(get-file)
-           (or/c path-string? #f)]{
-
-Gets the PostScript output filename. A @racket[#f] value (the default)
- indicates that the user should be prompted for a filename when a
- @racket[post-script-dc%] object is created.
-
-}
-
-@defmethod[(get-level-2)
-           boolean?]{
-
-Reports whether Level 2 commands are output in PostScript files.
-
-Currently, Level 2 commands are only needed to include color bitmap
- images in PostScript output (drawn with @method[dc<%> draw-bitmap]),
- or bitmap pen and brush stipples. When Level 2 commands are disabled,
- bitmaps are converted to grayscale images and stipples are not
- supported.
-
-}
-
-@defmethod[(get-margin [h-margin (box/c (and/c real? (not/c negative?)))]
-                       [v-margin (box/c (and/c real? (not/c negative?)))])
-           void?]{
-
-Returns the current settings for horizontal and vertical PostScript
- margins. See also @method[ps-setup% set-margin].
-
-}
-
-@defmethod[(get-mode)
-           (or/c 'preview 'file 'printer)]{
-
-Gets the printing mode that determines where output is sent:
- @racket['preview], @racket['file], or @racket['printer].  The default
- for X is @racket['preview]. The value in Windows and Mac OS X is
- always @racket['file].
-
-}
-
-@defmethod[(get-orientation)
-           (or/c 'portrait 'landscape)]{
-
-Gets the orientation: @racket['portrait] or @racket['landscape]. The
- default is @racket['portrait]. Unlike most other settings, this one
- affects native printing (via @racket[printer-dc%]) as well as
- PostScript output.
-
-Landscaped orientation affects the size of the drawing area as
- reported by @method[dc<%> get-size]: the horizontal and vertical
- sizes determined by the selected paper type are transposed and then
- scaled.
-
-}
-
-@defmethod[(get-paper-name)
-           string?]{
-
-Returns the name of the current paper type: @racket["A4 210 x 297 mm"], 
- @racket["A3 297 x 420 mm"], @racket["Letter 8 1/2 x 11 in"], or
- @racket["Legal 8 1/2 x 14 in"]. The default is @racket["Letter 8 1/2 x 11 in"].
-
-The paper name determines the size of the drawing area as reported by
- @method[dc<%> get-size] (along with landscape transformations from
- @method[ps-setup% get-orientation] and/or the scaling factors of
- @method[ps-setup% get-scaling]). It also determines the bounding box
- of PostScript output when a @racket[post-script-dc%] context is
- created with a true value for the @racket[use-paper-bbox?]
- initialization argument.
-
-}
-
-@defmethod[(get-preview-command)
-           string?]{
-
-Gets the command used to view a PostScript file for X. The default is
- @racket["gv"]. This value is not used by other platforms.
-
-}
-
-@defmethod[(get-scaling [x (box/c (and/c real? (not/c negative?)))]
-                        [y (box/c (and/c real? (not/c negative?)))])
-           void?]{
-
-Gets the scaling factor for PostScript output.  @boxisfill[@racket[x]
- @elem{the horizontal scaling factor}] @boxisfill[@racket[y] @elem{the
- vertical scaling factor}] The default is @racket[0.8] by
- @racket[0.8].
-
-This scale is in addition to a scale that can be set by @method[dc<%>
- set-scale] in a @racket[post-script-dc%] context. The size reported
- by @method[dc<%> get-size] is the size of the selected paper type
- (transposed for landscaped mode) divided by this scale.
-
-}
-
-@defmethod[(get-translation [x (box/c (and/c real? (not/c negative?)))]
-                            [y (box/c (and/c real? (not/c negative?)))])
-           void?]{
-
-Gets the translation (from the bottom left corner) for PostScript
- output.  @boxisfill[@racket[x] @elem{the horizontal offset}]
- @boxisfill[@racket[y] @elem{the vertical offset}] The default is
- @racket[0.0] and @racket[0.0].
-
-The translation is not scaled by the numbers returned from
- @method[ps-setup% get-scaling] and the translation does not affect
- the size of the drawing area.
-
-}
-
-@defmethod[(set-command [command string?])
-           void?]{
-
-Historically, sets the printer command that was used to print a file
- on Unix. See @method[ps-setup% get-command].
-
-}
-
-@defmethod[(set-editor-margin [h exact-nonnegative-integer?]
-                              [v exact-nonnegative-integer?])
-           void?]{
-
-Sets the horizontal and vertical margins used when printing an editor
- with the @method[editor<%> print] method. These margins are always
- used for printing, whether the drawing destination is a
- @racket[post-script-dc%] or @racket[printer-dc%].  The margins are in
- the units of the destination @racket[printer-dc%] or
- @racket[post-script-dc%].  In the case of @racket[post-script-dc%]
- printing, the editor margin is in addition to the PostScript margin
- that is determined by @method[ps-setup% set-margin].
-
-}
-
-@defmethod[(set-file [filename (or/c path-string? #f)])
-           void?]{
-
-Sets the PostScript output filename. See
- @method[ps-setup% get-file].
-
-}
-
-@defmethod[(set-level-2 [on? any/c])
-           void?]{
-
-Sets whether Level 2 commands are output in PostScript files.  See
- @method[ps-setup% get-level-2].
-
-}
-
-@defmethod[(set-margin [h (and/c real? (not/c negative?))]
-                       [v (and/c real? (not/c negative?))])
-           void?]{
-
-Sets the horizontal and vertical PostScript margins. When drawing to a
- @racket[post-script-dc%], the page size reported by @method[dc<%>
- get-size] subtracts these margins from the normal page area (before
- taking into account scaling affects). In addition, drawing into the
- @racket[post-script-dc%] produces PostScript output that is offset by
- the margins.
-
-When using the output of a @racket[post-script-dc%] as
- Encapsulated PostScript, the margin values are effectively
- irrelevant. Changing the margins moves the PostScript image in
- absolute coordinates, but it also moves the bounding box.
-
-The margins are in unscaled @racket[post-script-dc%] units, which
- are points. The default margins are 16 points.
-
-}
-
-@defmethod[(set-mode [mode (or/c 'preview 'file 'printer)])
-           void?]{
-
-Sets the printing mode controlling where output is sent. See
- @method[ps-setup% get-mode].
-
-On Windows and Mac OS X, if @racket['preview] or @racket['printer]
- is provided, @|MismatchExn|.
-
-}
-
-@defmethod[(set-orientation [orientation (or/c 'portrait 'landscape)])
-           void?]{
-
-Sets the orientation. See @method[ps-setup% get-orientation].
-
-}
-
-@defmethod[(set-paper-name [type string?])
-           void?]{
-
-Sets the name of the current paper type. See @method[ps-setup%
- get-paper-name].
-
-}
-
-@defmethod[(set-preview-command [command string?])
-           void?]{
-
-Sets the command used to view a PostScript file on Unix.  See
-@method[ps-setup% get-preview-command].
-
-}
-
-@defmethod[(set-scaling [x (and/c real? (not/c negative?))]
-                        [y (and/c real? (not/c negative?))])
-           void?]{
-
-Sets the scaling factor for PostScript output. See
- @method[ps-setup% get-scaling].
-
-}
-
-@defmethod[(set-translation [x real?]
-                            [y real?])
-           void?]{
-
-Sets the translation (from the bottom left corner) for PostScript
- output. See @method[ps-setup% get-translation].
-
-}}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/radial-gradient-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/radial-gradient-class.scrbl
deleted file mode 100644
index 4b3ee89241..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/radial-gradient-class.scrbl
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/eval (for-label pict))
-
-@(define class-eval (make-base-eval))
-@(interaction-eval #:eval class-eval (require racket/class racket/draw pict))
-
-@defclass/title[radial-gradient% object% ()]{
-
-A @deftech{radial gradient} is used with a @racket[brush%] to fill
- areas with smooth color transitions.
- Color transitions are based on two circles and the sequence of
- circles that ``morph'' from the starting circle to the ending
- circle. Normally, one of the two circles defining a gradient is
- nested within the other; in that case, points within the inner circle
- get the same color as the inner circle's edge, while points outside
- the outer circle get the same color as the outer circle's edge.
-
-@defconstructor[([x0 real?]
-                 [y0 real?]
-                 [r0 real?]
-                 [x1 real?]
-                 [y1 real?]
-                 [r1 real?]
-                 [stops (listof (list/c (real-in 0 1) (is-a?/c color%)))])]{
-
-Creates a radial gradient with the starting circle as the one with
-radius @racket[r0] centered at (@racket[x0], @racket[y0]) and the
-ending circle as the one with radius @racket[r1] centered at
-(@racket[x1], @racket[y1]). The @racket[stops] list assigns colors to
-circles, where @racket[0.0] corresponds to the starting circle,
-@racket[1.0] corresponds to the ending circle, and numbers in between
-correspond to circles in between.
-
-The order of elements within @racket[stops] and duplicate points are
-treated in the same way for as @racket[linear-gradient%].
-
-@examples[
-  #:eval class-eval
-(define ellipse-brush 
-  (new brush%
-       [gradient
-        (new radial-gradient% 
-             [x0 100] [y0 100] [r0 0]
-             [x1 100] [y1 100] [r1 100]
-             [stops
-              (list (list 0   (make-object color% 0 0 255))
-                    (list 0.5 (make-object color% 0 255 0))
-                    (list 1   (make-object color% 255 0 0)))])]))
-
-(define rectangle-brush
-  (new brush% 
-       [gradient
-        (new radial-gradient%
-             [x0 100] [y0 100] [r0 10] 
-             [x1 100] [y1 100] [r1 100]
-             [stops
-              (list (list 0   (make-object color% 255 0 0))
-                    (list 0.5 (make-object color% 0 255 0))
-                    (list 1   (make-object color% 0 0 255)))])]))
-
-(dc 
- (λ (dc dx dy)
-   (define old-pen (send dc get-pen))
-   (define old-brush (send dc get-brush))
-   (define-values (ox oy) (send dc get-origin))
-   
-   (send dc set-pen "black" 1 'transparent)
-   (send dc set-brush ellipse-brush)
-   (send dc set-origin (+ ox dx 50) (+ oy dy 50))
-   (send dc draw-ellipse 0 0 200 200)
-   
-   (send dc set-origin (+ ox dx 300) (+ oy dy 50))
-   (send dc set-brush rectangle-brush)
-   (send dc draw-rectangle 0 0 200 200)
-   
-   (send dc set-pen old-pen)
-   (send dc set-brush old-brush)
-   (send dc set-origin ox oy))
- 550 300)  
-]}
-
-@defmethod[(get-circles)
-           (values real? real? real? real? real? real?)]{
-
-Returns the gradient's boundary circles as @racket[_x0], @racket[_y0],
-@racket[_r0], @racket[_x1], @racket[_y1], and @racket[_r1].
-
-}
-
-@defmethod[(get-stops)
-           (listof (list/c (real-in 0 1) (is-a?/c color%)))]{
-
-Returns the gradient's list of color stops.
-
-}}
-
-
-@(close-eval class-eval)
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/record-dc-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/record-dc-class.scrbl
deleted file mode 100644
index 0a439e657b..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/record-dc-class.scrbl
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[record-dc% object% (dc<%>)]{
-
-A @racket[record-dc%] object records drawing actions for replay into
- another drawing context. The recorded drawing operations can be
- extracted as a procedure via @method[record-dc%
- get-recorded-procedure], or the actions can be extracted as a datum
- (that can be printed with @racket[write] and recreated with
- @racket[read]) via @method[record-dc% get-recorded-datum].
-
-When drawing recorded actions, the target drawing context's pen,
-brush, font, text, background, text background, and text foreground do
-not affect the recorded actions. The target drawing context's
-transformation, alpha, and clipping region compose with settings in
-the recorded actions (so that, for example, a recorded action to set
-the clipping region actually intersects the region with the drawing
-context's clipping region at the time that the recorded commands are
-replayed). After recoded commands are replayed, all settings in the
-target drawing context, such as its clipping region or current font,
-are as before the replay.
-
-
-@defconstructor[([width (>=/c 0) 640]
-                 [height (>=/c 0) 480])]{
-
-Creates a new recording DC. The optional @racket[width] and
- @racket[height] arguments determine the result of @method[dc<%>
- get-size] on the recording DC; the @racket[width] and
- @racket[height] arguments do not clip drawing.}
-
-
-@defmethod[(get-recorded-datum) any/c]{
-
-Extracts a recorded drawing to a value that can be printed with
-@racket[write] and re-read with @racket[read]. Use
-@racket[recorded-datum->procedure] to convert the datum to a drawing
-procedure.}
-
-
-@defmethod[(get-recorded-procedure) ((is-a?/c dc<%>) . -> . void?)]{
-
-Extracts a recorded drawing to a procedure that can be applied to
-another DC to replay the drawing commands to the given DC.
-
-The @method[record-dc% get-recorded-procedure] method can be more
-efficient than composing @method[record-dc% get-recorded-datum] and
-@racket[recorded-datum->procedure].}}
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/region-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/region-class.scrbl
deleted file mode 100644
index f62824b048..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/region-class.scrbl
+++ /dev/null
@@ -1,280 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[region% object% ()]{
-
-A @racket[region%] object specifies a portion of a drawing area
- (possibly discontinuous). It is normally used for clipping drawing
- operations.
-
-A @racket[region%] object can be associated to a particular
- @racket[dc<%>] object when the region is created. In that case, the
- region uses the drawing context's current transformation matrix,
- translation, scaling, and rotation, independent of the transformation
- that is in place when the region is installed. Otherwise, the region
- is transformed as usual when it is installed into a
- @racket[dc<%>]. For an auto-scrolled canvas, the canvas's current
- scrolling always applies when the region is used (and it does not
- affect the region's bounding box).
-
-Region combination with operations like @racket[region% union] are
- approximate, and they are implemented by combining paths. Certain
- combinations work only if the paths have a suitable fill mode, which
- can be either @racket['winding], @racket['even-odd], or a
- @deftech{flexible fill} mode. When a region is installed as a device
- context's clipping region, any subpath with a @tech{flexible fill}
- mode uses @racket['even-odd] mode if any other path uses
- @racket['even-odd] mode.
-
-See also @xmethod[dc<%> set-clipping-region] and @xmethod[dc<%>
- get-clipping-region].
-
-
-@defconstructor[([dc (or/c (is-a?/c dc<%>) #f)])]{
-
-Creates an empty region. If @racket[dc] is a @racket[dc<%>] object,
-the @racket[dc<%>]'s current transformation matrix is essentially
-recorded in the region.
-
-}
-
-@defmethod[(get-bounding-box)
-           (values real? real? real? real?)]{
-
-Returns a rectangle that approximately encloses the region.  The
- return values are the left, top, width, and height of the
- rectangle. If the region has an associated drawing context, the
- bounding box is in the drawing context's current logical coordinates.
-
-}
-
-@defmethod[(get-dc)
-           (or/c (is-a?/c dc<%>) #f)]{
-
-Returns the region's drawing context, if it was created for one.
-
-}
-
-@defmethod[(in-region? [x real?]
-                       [y real?])
-           boolean?]{
-
-Returns @racket[#t] if the given point is approximately within the
- region, @racket[#f] otherwise. If the region has an associated
- drawing context, the given point is effectively transformed according
- to the region's @racket[dc<%>]'s current transformation matrix.
-
-}
-
-@defmethod[(intersect [rgn (is-a?/c region%)])
-           void?]{
-
-Sets the region to the intersection of itself with the given region.
-
-The drawing context of @racket[rgn] and @this-obj[] must be the same,
- or they must both be unassociated to any drawing context.
-
-An intersect corresponds to clipping with this region's path, and then
- clipping with the given region's path.  Further combining sends to
- this region correspond to combination with the original path before
- initial clip, and further combination with this region as an argument
- correspond to a combination with the given path after the initial
- clip. Thus, an intersecting region is a poor input for
- @method[region% union], @method[region% subtract], or @method[region%
- xor], but it intersects properly in further calls to @method[region%
- intersect].
-
-}
-
-@defmethod[(is-empty?)
-           boolean?]{
-
-Returns @racket[#t] if the region is approximately empty, @racket[#f]
- otherwise, but only if the region is associated with a drawing context.
- If the region is unassociated to any drawing context, the
- @racket[exn:fail:contract] exception is raised.
-
-}
-
-@defmethod[(set-arc [x real?]
-                    [y real?]
-                    [width (and/c real? (not/c negative?))]
-                    [height (and/c real? (not/c negative?))]
-                    [start-radians real?]
-                    [end-radians real?])
-           void?]{
-
-Sets the region to the interior of the specified wedge.
-
-See also @xmethod[dc<%> draw-ellipse], since the region content is
- determined the same way as brush-based filling in a @racket[dc<%>].
-
-The region corresponds to a clockwise path with a @tech{flexible
- fill}. The region is also @tech{atomic} for the purposes of region
- combination.
-
-}
-
-@defmethod[(set-ellipse [x real?]
-                        [y real?]
-                        [width (and/c real? (not/c negative?))]
-                        [height (and/c real? (not/c negative?))])
-           void?]{
-
-Sets the region to the interior of the specified ellipse.
-
-See also @xmethod[dc<%> draw-ellipse], since the region content is
- determined the same way as brush-based filling in a @racket[dc<%>].
-
-The region corresponds to a clockwise path with a @tech{flexible
- fill}. The region is also @tech{atomic} for the purposes of region
- combination.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(set-path [path (is-a?/c dc-path%)]
-                     [xoffset real? 0]
-                     [yoffset real? 0]
-                     [fill-style (or/c 'odd-even 'winding) 'odd-even])
-           void?]{
-
-Sets the region to the content of the given path.
-
-See also @xmethod[dc<%> draw-path], since the region content is
- determined the same way as brush-based filling in a @racket[dc<%>].
-
-The fill style affects how well the region reliably combines with
- other regions (via @method[region% union], @method[region% xor], and
- @method[region% subtract]). The region is also @tech{atomic} for the
- purposes of region combination.
-
-}
-
-@defmethod[(set-polygon [points (or/c (listof (is-a?/c point%))
-                                      (listof (cons/c real? real?)))]
-                        [xoffset real? 0]
-                        [yoffset real? 0]
-                        [fill-style (or/c 'odd-even 'winding) 'odd-even])
-           void?]{
-
-Sets the region to the interior of the polygon specified by
- @racket[points]. A pair is treated as a point where the @racket[car]
- of the pair is the x-value and the @racket[cdr] is the y-value.
-
-See also @xmethod[dc<%> draw-polygon], since the region content is
- determined the same way as brush-based filling in a @racket[dc<%>].
-
-The fill style affects how well the region reliably combines with
- other regions (via @method[region% union], @method[region% xor], and
- @method[region% subtract]).  The region is also @tech{atomic} for the
- purposes of region combination.
-
-}
-
-@defmethod[(set-rectangle [x real?]
-                          [y real?]
-                          [width (and/c real? (not/c negative?))]
-                          [height (and/c real? (not/c negative?))])
-           void?]{
-
-Sets the region to the interior of the specified rectangle.
-
-The region corresponds to a clockwise path with a @tech{flexible
- fill}. The region is also @tech{atomic} for the purposes of region
- combination.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(set-rounded-rectangle [x real?]
-                                  [y real?]
-                                  [width (and/c real? (not/c negative?))]
-                                  [height (and/c real? (not/c negative?))]
-                                  [radius real? -0.25])
-           void?]{
-
-Sets the region to the interior of the specified rounded rectangle.
-
-See also @xmethod[dc<%> draw-rounded-rectangle], since the region
- content is determined the same way as brush-based filling in a
- @racket[dc<%>].
-
-The region corresponds to a clockwise path with a @tech{flexible
- fill}. The region is also @tech{atomic} for the purposes of region
- combination.
-
-@|DrawSizeNote|
-
-}
-
-@defmethod[(subtract [rgn (is-a?/c region%)])
-           void?]{
-
-Sets the region to the subtraction of itself minus the given region.
- In other words, a point is removed from the region if it is included
- in the given region. (The given region may contain points that are
- not in the current region; such points are ignored.)
-
-This region's drawing context and given region's drawing context must
- be the same, or they must both be unassociated to any drawing
- context.
-
-The result is consistent across platforms and devices, but it is never
- a true subtraction. A subtraction corresponds to combining the
- sub-paths of this region with the reversed sub-paths of the given
- region, then intersecting the result with this region. This fails as
- a true subtraction, because the boundary of loops (with either
- @racket['odd-even] or @racket['winding] filling) is ambiguous.
-
-}
-
-@defmethod[(union [rgn (is-a?/c region%)])
-           void?]{
-
-Sets the region to the union of itself with the given region.
-
-This region's drawing context and given region's drawing context must
- be the same, or they must both be unassociated to any drawing
- context.
-
-A union corresponds to combining the sub-paths of each region into one
- path, using an @racket['odd-even] fill if either of the region uses
- an @racket['odd-even] fill (otherwise using a @racket['winding]
- fill), a @racket['winding] fill in either region uses a
- @racket[winding] fill, or the fill remains a @tech{flexible fill}
- if both paths have a @tech{flexible fill}. Consequently, while the
- result is consistent across platforms and devices, it is a true union
- only for certain input regions. For example, it is a true union for
- non-overlapping @deftech{atomic} and union regions. It is also a true
- union for @tech{atomic} and union regions (potentially overlapping)
- that are all clockwise and use @racket['winding] fill or if the fills
- are all @tech{flexible fills}.
-
-}
-
-@defmethod[(xor [rgn (is-a?/c region%)])
-           void?]{
-
-Sets the region to the xoring of itself with the given region (i.e.,
- contains points that are enclosed by exactly one of the two regions).
-
-This region's drawing context and given region's drawing context must
- be the same, or they must both be unassociated to any drawing
- context.
-
-The result is consistent across platforms and devices, but it is not
- necessarily a true xoring. An xoring corresponds to combining the
- sub-paths of this region with the reversed sub-paths of the given
- region. The result uses an @racket['odd-even] fill if either of the
- region uses an @racket['odd-even] fill, a @racket['winding] fill in
- either region uses a @racket[winding] fill, or the fill remains a
- @tech{flexible fill} if both paths have a @tech{flexible
- fill}. Consequently, the result is a reliable xoring only for certain
- input regions. For example, it is reliable for @tech{atomic} and
- xoring regions that all use @racket['even-odd] fill.
-
-}}
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/svg-dc-class.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/svg-dc-class.scrbl
deleted file mode 100644
index f917d1d5d6..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/svg-dc-class.scrbl
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[svg-dc% object% (dc<%>)]{
-
-Similar to @racket[post-script-dc%], but generates a SVG (scalable
- vector graphics) file instead of a PostScript file.
-
-@|PrintNote|
-
-@defconstructor[([width (and/c real? (not/c negative?))]
-                 [height (and/c real? (not/c negative?))]
-                 [output (or/c path-string? output-port?)]
-                 [exists (or/c 'error 'append 'update 'can-update
-                               'replace 'truncate
-                               'must-truncate 'truncate/replace)
-                         'error])]{
-
-The @racket[width] and @racket[height] arguments determine the width
- and height of the generated image.
-
-The image is written to @racket[output]. If @racket[output] is a path
- and the file exists already, then @racket[exists] determines how
- the existing file is handled in the same way as for the @racket[#:exists]
- argument to @racket[open-output-file].}
-
-}
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/unsafe.scrbl b/pkgs/draw-pkgs/draw-doc/scribblings/draw/unsafe.scrbl
deleted file mode 100644
index a429a90e18..0000000000
--- a/pkgs/draw-pkgs/draw-doc/scribblings/draw/unsafe.scrbl
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label (except-in ffi/unsafe ->)
-                     racket/draw/unsafe/brush
-                     racket/draw/unsafe/cairo-lib))
-
-@title[#:tag "unsafe"]{Unsafe Libraries}
-
-The @racketmodname[racket/draw] library is currently implemented using Cairo
-and Pango. The @xmethod[bitmap% get-handle] method exposes the
-underlying Cairo surface for a @racket[bitmap%] object, while
-@racket[make-handle-brush] supports the creation of a brush from an
-existing Cairo surface. The representation of handles for these
-methods, however, is subject to change if the @racketmodname[racket/draw]
-library is implemented differently in the future.
-
-@section{Handle Brushes}
-
-@defmodule[racket/draw/unsafe/brush]
-
-@defproc[(make-handle-brush [handle cpointer?] 
-                            [width exact-nonnegative-integer?]
-                            [height exact-nonnegative-integer?]
-                            [transformation  (or/c #f (vector/c (vector/c real? real? real? 
-                                                                          real? real? real?)
-                                                                real? real? real? real? real?))]
-                            [#:copy? copy? any/c #t])
-         (is-a?/c brush%)]{
-
-Creates a brush given a @racket[handle] that (currently) is a
-@tt{cairo_surface_t}. If @racket[copy?] is true, then the surface is
-copied, so that it can be freed or modified after the brush is
-created; if @racket[copy?] is @racket[#f], the surface must remain available
-and unchanged as long as the brush can be used.
-
-The @racket[width] and @racket[height] arguments specify the surface
-bounds for use when the surface must be copied---even when
-@racket[copy?] is @racket[#f]. The surface may need to be converted to a
-stipple bitmap, for example, when drawing to a monochrome target.
-
-The given surface is treated much like a stipple bitmap: it is
-implicitly repeated, and the given @racket[transformation] (if any)
-determines the surface's alignment relative to the target drawing
-context.
-
-When the brush is used with a @racket[record-dc%] object, and if that
-object's @method[record-dc% get-recorded-datum] method is called, then the
-surface is effectively converted to a stipple bitmap for the result datum.}
-
-
-@section{Cairo Library}
-
-@defmodule[racket/draw/unsafe/cairo-lib]
-
-@defthing[cairo-lib (or/c ffi-lib? #f)]{
-
-A reference to the Cairo library for use with functions such as
-@racket[get-ffi-obj], or @racket[#f] if Cairo is unavailable.}
-
-
diff --git a/pkgs/draw-pkgs/draw-doc/scribblings/draw/water.png b/pkgs/draw-pkgs/draw-doc/scribblings/draw/water.png
deleted file mode 100644
index ec1b58c426..0000000000
Binary files a/pkgs/draw-pkgs/draw-doc/scribblings/draw/water.png and /dev/null differ
diff --git a/pkgs/draw-pkgs/draw-lib/LICENSE.txt b/pkgs/draw-pkgs/draw-lib/LICENSE.txt
deleted file mode 100644
index 167eb6b1d0..0000000000
--- a/pkgs/draw-pkgs/draw-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-draw-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/draw-pkgs/draw-lib/file/gif.rkt b/pkgs/draw-pkgs/draw-lib/file/gif.rkt
deleted file mode 100644
index 3b6d976683..0000000000
--- a/pkgs/draw-pkgs/draw-lib/file/gif.rkt
+++ /dev/null
@@ -1,428 +0,0 @@
-#|
-/******************************************************************************
- *   "Gif-Lib" - Yet another gif library.
- *
- * Written by:  Gershon Elber                Ver 1.1, Aug. 1990
- ******************************************************************************
- * The kernel of the GIF Encoding process can be found here.
- ******************************************************************************
- * History:
- * 14 Jun 89 - Version 1.0 by Gershon Elber.
- *  3 Sep 90 - Version 1.1 by Gershon Elber (Support for Gif89, Unique names).
- * 26 Jun 96 - Version 3.0 by Eric S. Raymond (Full GIF89 support)
- *  5 Jan 07 - Ported to MzScheme by Matthew
- *****************************************************************************/
-|#
-
-#lang racket/base
-
-(require racket/contract
-         (prefix-in octree: file/private/octree-quantize))
-
-(define LZ_MAX_CODE 4095)
-
-(define GifVersionPrefix #"GIF89a")
-
-(provide
- (contract-out
-  [gif-stream? (-> any/c boolean?)]
-  [image-ready-gif-stream? (-> any/c boolean?)]
-  [image-or-control-ready-gif-stream? (-> any/c boolean?)]
-  [empty-gif-stream? (-> any/c boolean?)]
-  [gif-colormap? (-> any/c boolean?)]
-  [color? (-> any/c boolean?)]
-  [dimension? (-> any/c boolean?)]))
-
-(define-struct gif-stream
-  (port SWidth SHeight SBackGroundColor SColorMap [FileState #:mutable]))
-
-(define (image-ready-gif-stream? g)
-  (and (gif-stream? g)
-       (memq (gif-stream-FileState g) '(init image-or-control image))))
-
-(define (image-or-control-ready-gif-stream? g)
-  (and (gif-stream? g)
-       (memq (gif-stream-FileState g) '(init image-or-control))))
-
-(define (empty-gif-stream? g)
-  (and (gif-stream? g)
-       (memq (gif-stream-FileState g) '(init))))
-
-(define color? byte?)
-(define (dimension? x) (and (exact? x) (integer? x) (<= 0 x #xFFFF)))
-
-(define (gif-colormap? l)
-  (and (list? l)
-       (member (length l) '(2 4 8 16 32 64 128 256))
-       (andmap (lambda (c)
-                 (and (vector? c)
-                      (= 3 (vector-length c))
-                      (color? (vector-ref c 0))
-                      (color? (vector-ref c 1))
-                      (color? (vector-ref c 2))))
-               l)))
-
-(define (color-map->bytes ColorMap)
-  (apply bytes (apply append (map vector->list ColorMap))))
-
-(define (bits-per-pixel ColorMap)
-  (case (length ColorMap)
-    [(2) 1] [(4) 2] [(8) 3] [(16) 4] [(32) 5] [(64) 6] [(128) 7] [(256) 8]
-    [else (error 'bits-per-pixel
-                 "strange colormap size: ~e"
-                 (length ColorMap))]))
-
-(define (WRITE g bytes)
-  (write-bytes bytes (gif-stream-port g)))
-
-(provide
- (contract-out
-  [gif-state (-> gif-stream? symbol?)]))
-(define (gif-state GifFile)
-  (gif-stream-FileState GifFile))
-
-;;/******************************************************************************
-;; * This routine should be called before any other EGif calls, immediately
-;; * follows the GIF file openning.
-;; *****************************************************************************/
-(provide
- (contract-out
-  [gif-start (-> output-port?
-                 dimension?
-                 dimension?
-                 color?
-                 (or/c gif-colormap? #f)
-                 gif-stream?)]))
-(define (gif-start port Width Height BackGround ColorMap)
-  (define GifFile
-    (make-gif-stream port Width Height BackGround ColorMap 'init))
-
-  (when ColorMap
-    (unless (BackGround . < . (length ColorMap))
-      (error 'gif-start
-             "background color ~a is out of range for the color map: ~e"
-             BackGround
-             ColorMap)))
-
-  (WRITE GifFile GifVersionPrefix)
-
-  ;;/*
-  ;; * Put the logical screen descriptor into the file:
-  ;; */
-  ;;/* Logical Screen Descriptor: Dimensions */
-  (EGifPutWord Width GifFile)
-  (EGifPutWord Height GifFile)
-
-  ;;/* Logical Screen Descriptor: Packed Fields */
-  ;;/* Note: We have actual size of the color table default to the largest
-  ;; * possible size (7+1 == 8 bits) because the decoder can use it to decide
-  ;; * how to display the files.
-  ;; */
-  (WRITE GifFile
-         (bytes (bitwise-ior
-                 (if ColorMap #x80 #x00)
-                 (arithmetic-shift #x7 4) ; /* Bits originally allocated to each primary color */
-                 (if ColorMap (sub1 (bits-per-pixel ColorMap)) #x07)) ; /* Actual size of the color table. */
-                BackGround ; /* Index into the ColorTable for background color */
-                0)) ; /* Pixel Aspect Ratio */
-
-  ;; /* If we have Global color map - dump it also: */
-  (when ColorMap
-    (WRITE GifFile (color-map->bytes ColorMap)))
-
-  GifFile)
-
-;;/******************************************************************************
-;; * This routine should be called before any attempt to dump an image - any
-;; * call to any of the pixel dump routines.
-;; *****************************************************************************/
-(provide
- (contract-out
-  [gif-add-image (-> image-ready-gif-stream?
-                     dimension?
-                     dimension?
-                     dimension?
-                     dimension?
-                     any/c
-                     (or/c gif-colormap? #f)
-                     bytes?
-                     void?)]))
-(define (gif-add-image GifFile Left Top Width Height Interlace ColorMap Line)
-
-  (unless ColorMap
-    (unless (gif-stream-SColorMap GifFile)
-      (error 'gif-add-image
-             "no color map for image")))
-
-  (unless (= (bytes-length Line)
-             (* Width Height))
-    (error 'gif-add-image
-           "bytes string size doesn't match width times height: ~e"
-           Line))
-
-  (unless (and ((+ Left Width) . <= . (gif-stream-SWidth GifFile))
-               ((+ Top Height) . <= . (gif-stream-SHeight GifFile)))
-    (error 'gif-add-image
-           "image extends beyond GIF virtual screen"))
-
-  (WRITE GifFile #",") ; /* Image seperator character. */
-  (EGifPutWord Left GifFile)
-  (EGifPutWord Top GifFile)
-  (EGifPutWord Width GifFile)
-  (EGifPutWord Height GifFile)
-  (WRITE GifFile
-         (bytes
-          (bitwise-ior
-           (if ColorMap #x80 #x00)
-           (if Interlace #x40 #x00)
-           (if ColorMap (sub1 (bits-per-pixel ColorMap)) #x00))))
-
-  ;; /* If we have local color map - dump it also: */
-  (when ColorMap
-    (WRITE GifFile (color-map->bytes ColorMap)))
-
-  (let* ([cmap (or ColorMap (gif-stream-SColorMap GifFile))])
-
-    (check-line-bytes (length cmap) Line)
-
-    (EGifCompress GifFile
-                  (max 2 ;; min code size of LZW is 2
-                       (bits-per-pixel cmap))
-                  Line))
-
-  (set-gif-stream-FileState! GifFile 'image-or-control))
-
-(define (check-line-bytes sz Line)
-  (let loop ([i (bytes-length Line)])
-    (unless (zero? i)
-      (let ([i (sub1 i)])
-        (unless ((bytes-ref Line i) . < . sz)
-          (error 'gif-add-image
-                 "out-of-range color index ~a in line: ~e"
-                 (bytes-ref Line i)
-                 Line))
-        (loop i)))))
-
-
-;;/******************************************************************************
-;; * This routine should be called to add graphic control before the next image
-;; *****************************************************************************/
-(provide
- (contract-out
-  [gif-add-control (-> image-or-control-ready-gif-stream?
-                       (or/c 'any 'keep 'restore-bg 'restore-prev)
-                       any/c
-                       dimension?
-                       (or/c color? #f)
-                       void?)]))
-
-(define (gif-add-control GifFile
-                         Disposal
-                         UserInput?
-                         Delay ; 1/100s of a second
-                         TransparentColor)
-  (WRITE GifFile #"\x21\xF9\x04")
-  (WRITE GifFile
-         (bytes (bitwise-ior
-                 (case Disposal
-                   [(any) 0]
-                   [(keep) #x4]
-                   [(restore-bg) #x8]
-                   [(restore-prev) #xC])
-                 (if UserInput? #x2 0)
-                 (if TransparentColor #x1 0))))
-  (EGifPutWord Delay GifFile)
-  (WRITE GifFile (bytes
-                  (or TransparentColor 0)
-                  0)) ; block terminator
-  (set-gif-stream-FileState! GifFile 'image))
-
-;;/******************************************************************************
-;; * This routine should be called to add the "loop" graphic control
-;;   before adding any images
-;; *****************************************************************************/
-(provide
- (contract-out
-  [gif-add-loop-control (-> empty-gif-stream? dimension? void?)]))
-(define (gif-add-loop-control GifFile
-                              Iterations)
-  (WRITE GifFile #"\x21\xFF\x0BNETSCAPE2.0\x03\x01")
-  (EGifPutWord Iterations GifFile)
-  (WRITE GifFile #"\x00")
-  (set-gif-stream-FileState! GifFile 'image-or-control))
-
-;;/******************************************************************************
-;; * This routine should be called to add arbitrary comment text
-;; *****************************************************************************/
-(provide
- (contract-out
-  [gif-add-comment (-> image-or-control-ready-gif-stream?
-                       bytes?
-                       void?)]))
-(define (gif-add-comment GifFile Str)
-  (WRITE GifFile #"\x21\xFE")
-  (let loop ([pos 0])
-    (when (pos . < . (bytes-length Str))
-      (let ([amt (min 255 (- (bytes-length Str) pos))])
-        (write-byte amt (gif-stream-port GifFile))
-        (write-bytes Str (gif-stream-port GifFile) pos (+ pos amt))
-        (loop (+ pos amt)))))
-  (WRITE GifFile #"\0")
-  (set-gif-stream-FileState! GifFile 'image-or-control))
-
-;;/******************************************************************************
-;; * This routine should be called last, to end GIF file.
-;; *****************************************************************************/
-(provide
- (contract-out 
-  [gif-end (-> image-or-control-ready-gif-stream?
-               void?)]))
-(define (gif-end GifFile)
-  (WRITE GifFile #";")
-  (set-gif-stream-FileState! GifFile 'done))
-
-;;/******************************************************************************
-;; * Put 2 bytes (word) into the given file:
-;; *****************************************************************************/
-(define (EGifPutWord Word GifFile)
-  (WRITE GifFile (integer->integer-bytes Word 2 #f #f)))
-
-;;/******************************************************************************
-;; * LZ compression output
-;; *****************************************************************************/
-(define (write-buffered-byte b buf port)
-  (let ([cnt (add1 (bytes-ref buf 0))])
-    (bytes-set! buf cnt b)
-    (bytes-set! buf 0 cnt)
-    (when (= cnt 255)
-      (write-bytes buf port)
-      (bytes-set! buf 0 0))))
-
-(define (CompressOutput port buf Code
-                        RunningBits RunningCode MaxCode1
-                        CrntShiftState CrntShiftDWord)
-  (let-values ([(CrntShiftState CrntShiftDWord)
-                (let loop ([CrntShiftDWord
-                            (bitwise-ior CrntShiftDWord
-                                         (arithmetic-shift Code CrntShiftState))]
-                           [CrntShiftState (+ CrntShiftState RunningBits)])
-                  (if (CrntShiftState . >= . 8)
-                    (begin
-                      (write-buffered-byte (bitwise-and CrntShiftDWord #xff) buf port)
-                      (loop (arithmetic-shift CrntShiftDWord -8)
-                            (- CrntShiftState 8)))
-                    (values CrntShiftState CrntShiftDWord)))])
-    (if (and (RunningCode . >= . MaxCode1)
-             (Code . <= . 4095))
-      (values (add1 RunningBits) (arithmetic-shift 1 (add1 RunningBits))
-              CrntShiftState CrntShiftDWord)
-      (values RunningBits MaxCode1
-              CrntShiftState CrntShiftDWord))))
-
-;;/******************************************************************************
-;; * LZ compression
-;; *****************************************************************************/
-(define (EGifCompress GifFile BitsPerPixel Line)
-
-  (WRITE GifFile (bytes BitsPerPixel))
-
-  (let* ([ClearCode (arithmetic-shift 1 BitsPerPixel)]
-         [EOFCode (add1 ClearCode)]
-         [RunningCode (add1 EOFCode)]
-         [RunningBits (add1 BitsPerPixel)];    /* Number of bits per code. */
-         [MaxCode1 (arithmetic-shift 1 RunningBits)];    /* Max. code + 1. */
-         [HashTable (make-hasheq)]
-         [CrntShiftState 0];    /* No information in CrntShiftDWord. */
-         [CrntShiftDWord 0]
-         [port (gif-stream-port GifFile)]
-         [len (bytes-length Line)]
-         [buf (make-bytes 256 0)])
-
-    (let-values ([(RunningBits MaxCode1 CrntShiftState CrntShiftDWord)
-                  (CompressOutput port buf ClearCode
-                                  RunningBits RunningCode MaxCode1
-                                  CrntShiftState CrntShiftDWord)])
-      (let loop ([CrntCode (bytes-ref Line 0)]
-                 [RunningCode RunningCode]
-                 [RunningBits RunningBits]
-                 [MaxCode1 MaxCode1]
-                 [CrntShiftState CrntShiftState]
-                 [CrntShiftDWord CrntShiftDWord]
-                 [HashTable HashTable]
-                 [i 1])
-        (if (= i len)
-          ;; Finish:
-          (let-values ([(RunningBits MaxCode1 CrntShiftState CrntShiftDWord)
-                        (CompressOutput port buf CrntCode
-                                        RunningBits RunningCode MaxCode1
-                                        CrntShiftState CrntShiftDWord)])
-            (let-values ([(RunningBits MaxCode1 CrntShiftState CrntShiftDWord)
-                          (CompressOutput port buf EOFCode
-                                          RunningBits RunningCode MaxCode1
-                                          CrntShiftState CrntShiftDWord)])
-              ;; Flush output:
-              (let loop ([CrntShiftState CrntShiftState]
-                         [CrntShiftDWord CrntShiftDWord])
-                (when (CrntShiftState . > . 0)
-                  (write-buffered-byte (bitwise-and CrntShiftDWord #xff)
-                                       buf port)
-                  (loop (arithmetic-shift CrntShiftDWord -8)
-                        (- CrntShiftState 8))))
-              (unless (zero? (bytes-ref buf 0))
-                (write-bytes buf port 0 (add1 (bytes-ref buf 0))))
-              (write-bytes #"\0" port)))
-          ;; /* Get next pixel from stream. */
-          (let ([Pixel (bytes-ref Line i)])
-            ;; /* Form a new unique key to search hash table for the code combines 
-            ;;  * CrntCode as Prefix string with Pixel as postfix char.
-            ;;  */
-            (let* ([NewKey (bitwise-ior (arithmetic-shift CrntCode 8) Pixel)]
-                   [NewCode (hash-ref HashTable NewKey #f)])
-              (if NewCode
-                ;;/* This Key is already there, or the string is old one, so
-                ;; * simple take new code as our CrntCode:
-                ;; */
-                (loop NewCode
-                      RunningCode RunningBits MaxCode1
-                      CrntShiftState CrntShiftDWord
-                      HashTable (add1 i))
-                ;;/* Put it in hash table, output the prefix code, and make our
-                ;; * CrntCode equal to Pixel. */
-                (let-values ([(RunningBits MaxCode1 CrntShiftState CrntShiftDWord)
-                              (CompressOutput port buf CrntCode
-                                              RunningBits RunningCode MaxCode1
-                                              CrntShiftState CrntShiftDWord)])
-                  (let ([CrntCode Pixel])
-                    ;; /* If however the HashTable if full, we send a clear first and
-                    ;;  * Clear the hash table. */
-                    (if (RunningCode . >= . LZ_MAX_CODE)
-                      ;; /* Time to do some clearance: */
-                      (let-values ([(RunningBits MaxCode1 CrntShiftState CrntShiftDWord)
-                                    (CompressOutput port buf ClearCode
-                                                    RunningBits RunningCode MaxCode1
-                                                    CrntShiftState CrntShiftDWord)])
-                        (loop CrntCode
-                              (add1 EOFCode) (add1 BitsPerPixel) (arithmetic-shift 1 (add1 BitsPerPixel))
-                              CrntShiftState CrntShiftDWord
-                              (make-hasheq) (add1 i)))
-                      ;; /* Put this unique key with its relative Code in hash table: */
-                      (begin
-                        (hash-set! HashTable NewKey RunningCode)
-                        (loop CrntCode
-                              (add1 RunningCode) RunningBits MaxCode1
-                              CrntShiftState CrntShiftDWord
-                              HashTable (add1 i))))))))))))))
-
-;;/******************************************************************************
-;; * color quantization utility
-;; *****************************************************************************/
-
-(provide
- (contract-out
-  [quantize
-   (-> (and/c bytes?
-              (lambda (bstr)
-                (zero? (remainder (bytes-length bstr) 4))))
-       (values bytes? gif-colormap? (or/c color? #f)))]))
-(define (quantize argb)
-  (octree:quantize argb))
diff --git a/pkgs/draw-pkgs/draw-lib/file/private/octree-quantize.rkt b/pkgs/draw-pkgs/draw-lib/file/private/octree-quantize.rkt
deleted file mode 100644
index 7678a5f89c..0000000000
--- a/pkgs/draw-pkgs/draw-lib/file/private/octree-quantize.rkt
+++ /dev/null
@@ -1,373 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/contract)
-
-;; This is an implementation of the Octree Quantization algorithm.  This implementation 
-;; follows the sketch in:
-;;
-;; Dean Clark.  Color Quantization using Octrees.  Dr. Dobbs Portal, January 1, 1996.
-;; http://www.ddj.com/184409805
-
-
-;; quantize: bytes (integer-in 1 255) -> (values bytes gif-colormap color)
-;; Adaptively quantizes 24-bit image data to fit within, at most, 256 colors
-;; (including the transparent color.)  The signature is meant to match the
-;; function provided by file/gif.
-(define (quantize argb #:palette [palette 255])
-  (let* ([an-octree (make-octree-from-argb argb palette)]
-         [len (bytes-length argb)]
-         [dest (make-bytes (/ len 4))])
-    (for ([i (in-range 0 len 4)])
-      (let ([a (bytes-ref argb i)]
-            [r (bytes-ref argb (+ i 1))]
-            [g (bytes-ref argb (+ i 2))]
-            [b (bytes-ref argb (+ i 3))]
-            [n (arithmetic-shift i -2)])
-        (cond
-          [(alpha-opaque? a)
-           (let ([palette-index (octree-lookup-index an-octree r g b)])
-             (bytes-set! dest n palette-index))]
-          [else
-           (bytes-set! dest n TRANSPARENT-INDEX)])))
-    (values dest (vector->list (octree-palette an-octree)) TRANSPARENT-INDEX)))
-
-
-;; make-octree-from-argb: bytes positive-number -> octree
-;; Constructs an octree ready to quantize the colors from an-argb.
-(define (make-octree-from-argb an-argb n)
-  (unless (> n 0)
-    (raise-type-error 'make-octree-from-argb "positive number" n))
-  (let ([an-octree (new-octree)]
-        [len (bytes-length an-argb)])
-    (let make-octree-loop ([i 0])
-      (when (< i len)
-        (let ([a (bytes-ref an-argb i)]
-              [r (bytes-ref an-argb (+ i 1))]
-              [g (bytes-ref an-argb (+ i 2))]
-              [b (bytes-ref an-argb (+ i 3))])
-          (when (alpha-opaque? a)
-            (octree-insert-color! an-octree r g b)
-            (let reduction-loop ()
-              (when (> (octree-leaf-count an-octree) n)
-                (octree-reduce! an-octree)
-                (reduction-loop)))))
-        (make-octree-loop (+ i 4))))
-    (octree-finalize! an-octree)
-    an-octree))
-
-
-;; alpha-opaque? byte -> boolean
-;; Returns true if the alpha value is considered opaque.
-(define (alpha-opaque? a)
-  (>= a 128))
-
-(define TRANSPARENT-INDEX 0)
-
-;; quantize-bitmap: bitmap positive-number -> bitmap
-;; Given a bitmap, returns a new bitmap quantized to, at most, n colors.
-#;
-(define (quantize-bitmap bm n)
-  (let* ([width (send bm get-width)]
-         [height (send bm get-height)]
-         [len (* width height 4)]
-         [source-buffer (make-bytes len)]
-         [_ (send bm get-argb-pixels 0 0 width height source-buffer)]
-         [an-octree (make-octree-from-argb source-buffer n)]
-         [dest-buffer (make-bytes len)])
-    (let quantize-bitmap-loop ([i 0])
-      (when (< i len)
-        (let* ([i+1 (+ i 1)]
-               [i+2 (+ i 2)]
-               [i+3 (+ i 3)]
-               [a (bytes-ref source-buffer i)]
-               [r (bytes-ref source-buffer i+1)]
-               [g (bytes-ref source-buffer i+2)]
-               [b (bytes-ref source-buffer i+3)])
-          (cond
-            [(alpha-opaque? a)
-             (let-values ([(new-r new-g new-b)
-                           (octree-lookup an-octree r g b)])
-               (bytes-set! dest-buffer i 255)
-               (bytes-set! dest-buffer i+1 new-r)
-               (bytes-set! dest-buffer i+2 new-g)
-               (bytes-set! dest-buffer i+3 new-b))]
-            [else
-             (bytes-set! dest-buffer i 0)
-             (bytes-set! dest-buffer i+1 0)
-             (bytes-set! dest-buffer i+2 0)
-             (bytes-set! dest-buffer i+3 0)]))
-        (quantize-bitmap-loop (+ i 4))))
-    (let* ([new-bm (make-object bitmap% width height)]
-           [dc (make-object bitmap-dc% new-bm)])
-      (send dc set-argb-pixels 0 0 width height dest-buffer)
-      (send dc set-bitmap #f)
-      new-bm)))
-
-;; The maximum level height of an octree.
-(define MAX-LEVEL 7)
-
-(define octet/c (integer-in 0 7))
-
-
-;; A color is a (vector byte byte byte)
-
-;; An octree is a:
-(define-struct octree (root            ; node
-                       leaf-count      ; number
-                       reduction-heads ; (vectorof (or/c node #f))
-                       palette)        ; (vectorof (or/c color #f))
-  #:mutable)
-;; reduction-heads is used to accelerate the search for a reduction candidate.
-
-
-;; A subtree node is a:
-(define-struct node (leaf?          ; bool
-                     npixels        ; number  -- number of pixels this subtree node represents
-                     redsum         ; number
-                     greensum       ; number
-                     bluesum        ; number
-                     children       ; (vectorof (or/c #f node))
-                     next           ; (or/c #f node)
-                     palette-index) ; (or/c #f byte?)
-  #:mutable)
-;; node-next is used to accelerate the search for a reduction candidate.
-
-
-;; new-octree: -> octree
-(define (new-octree)
-  (let* ([root-node (make-node #f ;; not a leaf
-                               0  ;; no pixels under us yet
-                               0  ;; red sum
-                               0  ;; green sum
-                               0  ;; blue sum
-                               (make-vector 8 #f) ;; no children so far
-                               #f ;; next
-                               #f ;; palette-index
-                               )]
-         [an-octree
-          (make-octree root-node
-                       0 ; no leaves so far
-                       (make-vector (add1 MAX-LEVEL) #f) ; no reductions so far
-                       (make-vector 256 #(0 0 0)))])        ; the palette
-    ;; Although we'll almost never reduce to this level, initialize the first
-    ;; reducible node to the root, for completeness sake.
-    (vector-set! (octree-reduction-heads an-octree) 0 root-node)
-    an-octree))
-
-
-;; rgb->index: natural-number byte byte byte -> octet
-;; Given a level and an (r,g,b) triplet, returns an octet that can be used
-;; as an index into our octree structure.
-(define (rgb->index level r g b)
-  (bitwise-ior (bitwise-and 4 (arithmetic-shift r (- level 5)))
-               (bitwise-and 2 (arithmetic-shift g (- level 6)))
-               (bitwise-and 1 (arithmetic-shift b (- level 7)))))
-
-
-;; octree-insert-color!: octree byte byte byte -> void
-;; Accumulates a new r,g,b triplet into the octree.
-(define (octree-insert-color! an-octree r g b)
-  (node-insert-color! (octree-root an-octree) an-octree r g b 0))
-
-
-;; node-insert-color!: node octree byte byte byte natural-number -> void
-;; Adds a color to the node subtree.  While we hit #f, we create new nodes.
-;; If we hit an existing leaf, we accumulate our color into it.
-(define (node-insert-color! a-node an-octree r g b level)
-  (let insert-color-loop ([a-node a-node]
-                          [level level])
-    (cond [(node-leaf? a-node)
-           ;; update the leaf with the new color
-           (set-node-npixels! a-node (add1 (node-npixels a-node)))
-           (set-node-redsum! a-node (+ (node-redsum a-node) r))
-           (set-node-greensum! a-node (+ (node-greensum a-node) g))
-           (set-node-bluesum! a-node (+ (node-bluesum a-node) b))]
-          [else
-           ;; create the child node if necessary
-           (let ([index (rgb->index level r g b)])
-             (unless (vector-ref (node-children a-node) index)
-               (let ([new-node (make-node (= level MAX-LEVEL) ; leaf?
-                                          0  ; npixels
-                                          0  ; redsum
-                                          0  ; greensum
-                                          0  ; bluesum
-                                          (make-vector 8 #f) ; no children yet
-                                          #f ; and no next node yet
-                                          #f ; or palette index
-                                          )])
-                 (vector-set! (node-children a-node) index new-node)
-                 (cond
-                   [(= level MAX-LEVEL)
-                    ;; If we added a leaf, mark it in the octree.
-                    (set-octree-leaf-count! an-octree
-                                            (add1 (octree-leaf-count an-octree)))]
-                   [else
-                    ;; Attach the node as a reducible node if it's interior.
-                    (set-node-next!
-                     new-node (vector-ref (octree-reduction-heads an-octree)
-                                          (add1 level)))
-                    (vector-set! (octree-reduction-heads an-octree) 
-                                 (add1 level)
-                                 new-node)])))
-             ;; and recur on the child node.
-             (insert-color-loop (vector-ref (node-children a-node) index) 
-                                (add1 level)))])))
-
-
-;; octree-reduce!: octree -> void
-;; Reduces one of the subtrees, collapsing the children into a single node.
-(define (octree-reduce! an-octree)
-  (node-reduce! (pop-reduction-candidate! an-octree) an-octree))
-
-
-;; node-reduce!: node octree -> void
-;; Reduces the interior node.
-(define (node-reduce! a-node an-octree)
-  (for ([child (in-vector (node-children a-node))]
-        #:when child)
-    (set-node-npixels! a-node (+ (node-npixels a-node)
-                                 (node-npixels child)))
-    (set-node-redsum! a-node (+ (node-redsum a-node)
-                                (node-redsum child)))
-    (set-node-greensum! a-node (+ (node-greensum a-node)
-                                  (node-greensum child)))
-    (set-node-bluesum! a-node (+ (node-bluesum a-node)
-                                 (node-bluesum child)))
-    (set-octree-leaf-count! an-octree (sub1 (octree-leaf-count an-octree))))
-  (set-node-leaf?! a-node #t)
-  (set-octree-leaf-count! an-octree (add1 (octree-leaf-count an-octree))))
-
-
-;; find-reduction-candidate!: octree -> node
-;; Returns a bottom-level interior node for reduction.  Also takes the
-;; candidate out of the conceptual queue of reduction candidates.
-(define (pop-reduction-candidate! an-octree)
-  (let loop ([i MAX-LEVEL])
-    (cond
-      [(vector-ref (octree-reduction-heads an-octree) i)
-       =>
-       (lambda (candidate-node)
-         (when (> i 0)
-           (vector-set! (octree-reduction-heads an-octree) i
-                        (node-next candidate-node)))
-         candidate-node)]
-      [else
-       (loop (sub1 i))])))
-
-
-;; octree-finalize!: octree -> void
-;; Finalization does a few things:
-;; * Walks through the octree and reduces any interior nodes with just one leaf child.
-;;   Optimizes future lookups.
-;; * Fills in the palette of the octree and the palette indexes of the leaf nodes.
-;; * Note: palette index 0 is always reserved for the transparent color.
-(define (octree-finalize! an-octree)
-  ;; Collapse one-leaf interior nodes.
-  (let loop ([a-node (octree-root an-octree)])
-    (for ([child (in-vector (node-children a-node))]
-          #:when (and child (not (node-leaf? child))))
-      (loop child)
-      (when (interior-node-one-leaf-child? a-node)
-        (node-reduce! a-node an-octree))))
-
-  ;; Attach palette entries.
-  (let ([current-palette-index 1])
-    (let loop ([a-node (octree-root an-octree)])
-      (cond [(node-leaf? a-node)
-             (let ([n (node-npixels a-node)])
-               (vector-set! (octree-palette an-octree) current-palette-index
-                            (vector (quotient (node-redsum a-node) n)
-                                    (quotient (node-greensum a-node) n)
-                                    (quotient (node-bluesum a-node) n)))
-               (set-node-palette-index! a-node current-palette-index)
-               (set! current-palette-index (add1 current-palette-index)))]
-            [else
-             (for ([child (in-vector (node-children a-node))]
-                   #:when child)
-               (loop child))]))))
-
-
-;; interior-node-one-leaf-child?: node -> boolean
-(define (interior-node-one-leaf-child? a-node)
-  (let ([child-list (filter values (vector->list (node-children a-node)))])
-    (and (= (length child-list) 1)
-         (node-leaf? (car child-list)))))
-
-
-;; octree-lookup: octree byte byte byte -> (values byte byte byte)
-;; Returns the palettized color.
-(define (octree-lookup an-octree r g b)
-  (let* ([index (node-lookup-index (octree-root an-octree) an-octree r g b 0)]
-         [vec (vector-ref (octree-palette an-octree) index)])
-    (values (vector-ref vec 0)
-            (vector-ref vec 1)
-            (vector-ref vec 2))))
-
-
-;; octree-lookup-index: octree byte byte byte -> byte
-;; Returns the paletized color as an index into the octree-palette vector.
-(define (octree-lookup-index an-octree r g b)
-  (node-lookup-index (octree-root an-octree) an-octree r g b 0))
-
-
-;; node-lookup-index: node byte byte byte natural-number -> byte
-;; Returns the palettized color index.
-(define (node-lookup-index a-node an-octree r g b level)
-  (let loop ([a-node a-node]
-             [level level])
-    (if (node-leaf? a-node)
-      (node-palette-index a-node)
-      (let ([child (vector-ref (node-children a-node) (rgb->index level r g b))])
-        (unless child
-          (error 'node-lookup-index
-                 "color (~a, ~a, ~a) not previously inserted"
-                 r g b))
-        (loop child (add1 level))))))
-
-
-(define color? byte?)
-
-(define (gif-colormap? l)
-  (and (list? l)
-       (member (length l) '(2 4 8 16 32 64 128 256))
-       (andmap (lambda (c)
-                 (and (vector? c)
-                      (= 3 (vector-length c))
-                      (color? (vector-ref c 0))
-                      (color? (vector-ref c 1))
-                      (color? (vector-ref c 2))))
-               l)))
-
-(define (argb-bytes? b)
-  (and (bytes? b)
-       (zero? (remainder (bytes-length b) 4))))
-
-
-(provide/contract
- [quantize ((argb-bytes?) (#:palette [integer-in 1 255])
-            . ->* . (values bytes? gif-colormap? color?))]
- #;
- [quantize-bitmap
-  ([is-a?/c bitmap%] natural-number/c . -> . [is-a?/c bitmap%])]
-
- [struct octree
-         ([root node?]
-          [leaf-count natural-number/c]
-          [reduction-heads (vectorof (or/c node? false/c))]
-          [palette (vectorof (vector/c byte? byte? byte?))])]
- [struct node
-         ([leaf? boolean?]
-          [npixels natural-number/c]
-          [redsum natural-number/c]
-          [greensum natural-number/c]
-          [bluesum natural-number/c]
-          [children (vectorof (or/c false/c node?))]
-          [next (or/c node? false/c)]
-          [palette-index byte?])]
- [new-octree (-> octree?)]
- [octree-insert-color! (octree? byte? byte? byte? . -> . any)]
- [octree-lookup
-  (octree? byte? byte? byte? . -> . (values byte? byte? byte?))]
- [octree-reduce! (octree? . -> . any)]
- [octree-finalize! (octree? . -> . any)]
- [rgb->index (natural-number/c byte? byte? byte? . -> . octet/c)])
diff --git a/pkgs/draw-pkgs/draw-lib/info.rkt b/pkgs/draw-pkgs/draw-lib/info.rkt
deleted file mode 100644
index 42871984b0..0000000000
--- a/pkgs/draw-pkgs/draw-lib/info.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps
-  '("base"
-    ("draw-i386-macosx-2" #:platform "i386-macosx")
-    ("draw-x86_64-macosx-2" #:platform "x86_64-macosx")
-    ("draw-ppc-macosx-2" #:platform "ppc-macosx")
-    ("draw-win32-i386-2" #:platform "win32\\i386")
-    ("draw-win32-x86_64-2" #:platform "win32\\x86_64")
-    ("draw-x86_64-linux-natipkg-2" #:platform "x86_64-linux-natipkg")
-    ("draw-x11-x86_64-linux-natipkg" #:platform "x86_64-linux-natipkg")
-    ("draw-ttf-x86_64-linux-natipkg" #:platform "x86_64-linux-natipkg")))
-
-(define pkg-desc "implementation (no documentation) part of \"draw\"")
-
-(define pkg-authors '(mflatt))
-
-(define version "1.3")
diff --git a/pkgs/draw-pkgs/draw-lib/net/gifwrite.rkt b/pkgs/draw-pkgs/draw-lib/net/gifwrite.rkt
deleted file mode 100644
index 724c957355..0000000000
--- a/pkgs/draw-pkgs/draw-lib/net/gifwrite.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require file/gif)
-(provide (all-from-out file/gif))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw.rkt
deleted file mode 100644
index ed7bf976af..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/contract/base
-         "draw/private/contract.rkt"
-	 "draw/private/color.rkt"
-         "draw/private/point.rkt"
-         "draw/private/font.rkt"
-         "draw/private/font-dir.rkt"
-         "draw/private/font-syms.rkt"
-         "draw/private/pen.rkt"
-         "draw/private/brush.rkt"
-         "draw/private/gradient.rkt"
-         "draw/private/region.rkt"
-         "draw/private/bitmap.rkt"
-         "draw/private/dc-path.rkt"
-         "draw/private/dc-intf.rkt"
-         "draw/private/bitmap-dc.rkt"
-         "draw/private/record-dc.rkt"
-         "draw/private/post-script-dc.rkt"
-         "draw/private/ps-setup.rkt"
-         "draw/private/svg-dc.rkt"
-         "draw/private/gl-config.rkt"
-         "draw/private/gl-context.rkt")
-
-(provide color-database<%>
-	 the-color-database
-         font-list% the-font-list make-font
-         font-name-directory<%> the-font-name-directory
-	 the-pen-list
-         the-brush-list
-         dc<%>
-         recorded-datum->procedure
-         ps-setup% current-ps-setup
-         get-face-list
-         get-family-builtin-face
-         gl-context<%>
-         get-current-gl-context
-         make-bitmap
-         make-platform-bitmap
-         read-bitmap
-         make-monochrome-bitmap
-
-         ;; predicates/contracts
-         brush-style/c
-         pen-cap-style/c
-         pen-join-style/c
-         pen-style/c
-         font-family/c
-         font-weight/c
-         font-style/c
-         font-smoothing/c
-         font-hinting/c)
-
-(provide/contract [color%            color%/c]
-                  [point%            point%/c]
-                  [font%             font%/c]
-                  [pen%              pen%/c]
-                  [pen-list%         pen-list%/c]
-                  [brush%            brush%/c]
-                  [brush-list%       brush-list%/c]
-                  [bitmap-dc%        bitmap-dc%/c]
-                  [post-script-dc%   post-script-dc%/c]
-                  [pdf-dc%           pdf-dc%/c]
-                  [svg-dc%           svg-dc%/c]
-                  [record-dc%        record-dc%/c]
-                  [linear-gradient%  linear-gradient%/c]
-                  [radial-gradient%  radial-gradient%/c]
-                  [region%           region%/c]
-                  [dc-path%          dc-path%/c]
-                  [gl-config%        gl-config%/c]
-                  [bitmap%           bitmap%/c]
-                  [make-color        make-color/c]
-                  [make-pen          make-pen/c]
-                  [make-brush        make-brush/c])
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/bmp.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/bmp.rkt
deleted file mode 100644
index 23c4d2f584..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/bmp.rkt
+++ /dev/null
@@ -1,277 +0,0 @@
-#lang racket/base
-(require racket/port)
-
-(provide read-bmp)
-
-(define BI_RGB 0)
-(define BI_RLE8 1)
-(define BI_RLE4 2)
-
-(define (read-byte* in)
-  (let ([c (read-byte in)])
-    (if (eof-object? c)
-        (error 'read-bmp "unexpected end of BMP stream: ~e" in)
-        c)))
-
-(define (int4 in)
-  (+ (read-byte* in)
-     (arithmetic-shift (read-byte* in) 8)
-     (arithmetic-shift (read-byte* in) 16)
-     (arithmetic-shift (read-byte* in) 24)))
-
-(define (int2 in)
-  (+ (read-byte* in)
-     (arithmetic-shift (read-byte* in) 8)))
-
-(define (make-rle8-port in)
-  (make-input-port/read-to-peek
-   (object-name in)
-   (let ([remaining 0]
-         [value 0]
-         [absolute 0]
-         [abs-skip? #f])
-     (lambda (bstr)
-       (cond
-        [(positive? absolute)
-         (let ([v (read-byte* in)])
-           (set! absolute (sub1 absolute))
-           (when (zero? absolute)
-             (when abs-skip?
-               (read-byte* in)))
-           (bytes-set! bstr 0 v)
-           1)]
-        [(zero? remaining)
-         (let ([r (read-byte in)])
-           (if (eof-object? r)
-               r
-               (if (zero? r)
-                   ;; special:
-                   (let ([c (read-byte* in)])
-                     (case c
-                       [(0) 0] ; end-of-line
-                       [(1) 0] ; end-of-bitmap
-                       [(2) (error 'read-bmp 
-                                   "RLE8 cursor command not supported in stream: ~e" 
-                                   in)]
-                       [else
-                        (set! absolute c)
-                        (set! abs-skip? (odd? c))
-                        0]))
-                   ;; normal encoding:
-                   (let ([v (read-byte* in)])
-                     (set! remaining (sub1 r))
-                     (set! value v)
-                     (bytes-set! bstr 0 v)
-                     1))))]
-        [else
-         (set! remaining (sub1 remaining))
-         (bytes-set! bstr 0 value)
-         1])))
-   #f
-   void))
-
-(define (make-rle4-port in)
-  (make-input-port/read-to-peek
-   (object-name in)
-   (let ([remaining 0]
-         [value 0]
-         [absolute 0]
-         [abs-skip? #f]
-         [nibble #f]) ; leftover half-byte to be delivered
-     (lambda (bstr)
-       (let ([nibbles
-              (cond
-               [(positive? absolute)
-                (let ([v (read-byte* in)])
-                  (set! absolute (- absolute 2))
-                  (when (absolute . < . 1)
-                    (when abs-skip?
-                      (read-byte* in)))
-                  (bytes-set! bstr 0 v)
-                  (if (absolute . < . 0)
-                      1
-                      2))]
-               [(zero? remaining)
-                (let ([r (read-byte in)])
-                  (if (eof-object? r)
-                      r
-                      (if (zero? r)
-                          ;; special:
-                          (let ([c (read-byte* in)])
-                            (case c
-                              [(0) 0] ; end-of-line
-                              [(1) 0] ; end-of-bitmap
-                              [(2) (error 'read-bmp 
-                                          "RLE8 cursor command not supported in stream: ~e" 
-                                          in)]
-                              [else
-                               (set! absolute c)
-                               (set! abs-skip? (positive? (bitwise-and c 3)))
-                               0]))
-                          ;; normal encoding:
-                          (let ([v (read-byte* in)])
-                            (set! remaining r)
-                            (set! value v)
-                            0))))]
-               [(= remaining 1)
-                (bytes-set! bstr 0 value)
-                1]
-               [else
-                (set! remaining (- remaining 2))
-                (bytes-set! bstr 0 value)
-                2])])
-         (cond
-          [(eof-object? nibbles)
-           (if nibble
-               (begin
-                 (bytes-set! bstr 0 (arithmetic-shift nibble 4))
-                 (set! nibble #f)
-                 1)
-               nibbles)]
-          [(zero? nibbles)
-           0]
-          [(and (not nibble) (= 2 nibbles))
-           1]
-          [(and (not nibble) (= 1 nibbles))
-           (set! nibble (bitwise-and (bytes-ref bstr 0) #xF0))
-           0]
-          [(and nibble (= 1 nibbles))
-           (bytes-set! bstr 0 (bitwise-ior nibble
-                                           (arithmetic-shift (bytes-ref bstr 0) -4)))
-           (set! nibble #f)
-           1]
-          [else ;; (and nibble (= 2 nibbles))
-           (let ([old nibble])
-             (set! nibble (arithmetic-shift (bitwise-and (bytes-ref bstr 0) #xF) 4))
-             (bytes-set! bstr 0 (bitwise-ior old
-                                             (arithmetic-shift (bytes-ref bstr 0) -4)))
-             1)]))))
-   #f
-   void))
-
-(define (read-bmp in)
-  (unless (and (= (read-byte* in) (char->integer #\B))
-               (= (read-byte* in) (char->integer #\M)))
-    (error 'read-bmp "not a BMP stream: ~e" in))
-  (let ([file-size (int4 in)]
-        [reserved1 (int2 in)]
-        [reserved2 (int2 in)]
-        [offset (int4 in)])
-    ;; Start DIB header
-    (let ([header-size (int4 in)])
-      (unless (or (= header-size 40)
-                  (= header-size 12))
-        (error 'read-bmp "expected a 12- or 40-byte DIB header, got ~a in stream: ~e" header-size in))
-      (let-values ([(width height bits-per-pixel compression color-count padded-rgb?)
-                    (case header-size
-                      [(40)
-                       (let ([width (int4 in)]
-                             [height (int4 in)]
-                             [planes (int2 in)]
-                             [bits-per-pixel (int2 in)]
-                             [compression (int4 in)]
-                             [image-size (int4 in)]
-                             [hres (int4 in)]
-                             [vres (int4 in)]
-                             [color-count (int4 in)]
-                             [colors-used (int4 in)])
-                         (unless (or (= compression BI_RGB)
-                                     (= compression BI_RLE4)
-                                     (= compression BI_RLE8))
-                           (error 'read-bmp "unsupported compression type ~a in stream: ~e" compression in))
-                         (values width height bits-per-pixel compression color-count #t))]
-                      [(12)
-                       (let ([width (int2 in)]
-                             [height (int2 in)]
-                             [planes (int2 in)]
-                             [bits-per-pixel (int2 in)])
-                         (values width height bits-per-pixel BI_RGB 0 #f))])])
-        (let* ([color-count (if (zero? color-count)
-                                (arithmetic-shift 1 bits-per-pixel)
-                                color-count)]
-               [colors
-                (if (bits-per-pixel . >= . 16)
-                    #f
-                    (let ([vec (make-vector color-count #"\0\0\0\xFF")])
-                      (for ([i (in-range color-count)])
-                        (let ([b (read-byte* in)]
-                              [g (read-byte* in)]
-                              [r (read-byte* in)])
-                          (when padded-rgb? (read-byte* in))
-                          (vector-set! vec i (bytes r g b 255))))
-                      vec))]
-               [current-pos (+ 14
-                               header-size
-                               (if colors (* color-count (if padded-rgb? 4 3)) 0))])
-          ;; Image data:
-          (read-bytes (- offset current-pos) in)
-          (let ([in (cond
-                     [(= compression BI_RLE4) (make-rle4-port in)]
-                     [(= compression BI_RLE8) (make-rle8-port in)]
-                     [else in])])
-            (values
-             width
-             height
-             (list->vector
-              (reverse
-               (for/list ([j (in-range height)])
-                 (let* ([row (make-bytes (* 4 width) 255)]
-                        [install-color!
-                         (lambda (i c)
-                           (if (c . < . color-count)
-                               (let ([col (vector-ref colors c)])
-                                 (bytes-set! row (* i 4) (bytes-ref col 0))
-                                 (bytes-set! row (+ 1 (* i 4)) (bytes-ref col 1))
-                                 (bytes-set! row (+ 2 (* i 4)) (bytes-ref col 2)))
-                               (error 'read-bmp "bad color table index ~a in stream: ~e" c in)))])
-                   (case bits-per-pixel
-                     [(32)
-                      (for ([i (in-range width)])
-                        (let ([b (read-byte* in)]
-                              [g (read-byte* in)]
-                              [r (read-byte* in)])
-                          (read-byte* in) ; discard
-                          (bytes-set! row (* i 4) r)
-                          (bytes-set! row (+ 1 (* i 4)) g)
-                          (bytes-set! row (+ 2 (* i 4)) b)))]
-                     [(24)
-                      (for ([i (in-range width)])
-                        (let ([b (read-byte* in)]
-                              [g (read-byte* in)]
-                              [r (read-byte* in)])
-                          (bytes-set! row (* i 4) r)
-                          (bytes-set! row (+ 1 (* i 4)) g)
-                          (bytes-set! row (+ 2 (* i 4)) b)))]
-                     [(16)
-                      (for ([i (in-range width)])
-                        (let ([col (bitwise-ior (read-byte* in)
-                                                (arithmetic-shift (read-byte* in) 8))])
-                          (bytes-set! row (* i 4) (arithmetic-shift (bitwise-and col #x7C00) -7))
-                          (bytes-set! row (+ 1 (* i 4)) (arithmetic-shift (bitwise-and col #x3E0) -2))
-                          (bytes-set! row (+ 2 (* i 4)) (arithmetic-shift (bitwise-and col #x1F) 3))))]
-                     [(8)
-                      (for ([i (in-range width)])
-                        (install-color! i (read-byte* in)))]
-                     [(4)
-                      (for/fold ([b 0]) ([i (in-range width)])
-                        (let ([b (if (zero? (bitwise-and i 1))
-                                     (read-byte* in)
-                                     (arithmetic-shift b 4))])
-                          (install-color! i (arithmetic-shift (bitwise-and b #xF0) -4))
-                          b))]
-                     [(1)
-                      (for/fold ([b 0]) ([i (in-range width)])
-                        (let ([b (if (zero? (bitwise-and i 7))
-                                     (read-byte* in)
-                                     (arithmetic-shift b 1))])
-                          (install-color! i (arithmetic-shift (bitwise-and b #x80) -7))
-                          b))]
-                     [else
-                      (error 'read-bmp "unsupported bits-per-pixel count ~a in stream: ~e"
-                             bits-per-pixel in)])
-                   ;; skip padding, if any:
-                   (when (= compression BI_RGB)
-                     (let ([n (modulo (ceiling (/ (* width bits-per-pixel) 8)) 4)])
-                       (unless (zero? n)
-                         (read-bytes (- 4 n) in))))
-                   row)))))))))))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/draw-sig.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/draw-sig.rkt
deleted file mode 100644
index 1daa535c24..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/draw-sig.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/signature
-
-bitmap%
-bitmap-dc%
-brush%
-brush-list%
-color%
-color-database<%>
-current-ps-setup
-dc<%>
-dc-path%
-font%
-font-list%
-font-name-directory<%>
-get-face-list
-get-family-builtin-face
-gl-config%
-gl-context<%>
-linear-gradient%
-make-bitmap
-make-platform-bitmap
-make-monochrome-bitmap
-pdf-dc%
-pen%
-pen-list%
-point%
-post-script-dc%
-ps-setup%
-radial-gradient%
-region%
-svg-dc%
-the-brush-list
-the-color-database
-the-font-list
-the-font-name-directory
-the-pen-list
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/draw-unit.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/draw-unit.rkt
deleted file mode 100644
index 84c8f76393..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/draw-unit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require racket/unit
-         racket/draw
-         "draw-sig.rkt")
-
-(provide draw@)
-(define-unit-from-context draw@ draw^)
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/gif.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/gif.rkt
deleted file mode 100644
index d1bab3a9ad..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/gif.rkt
+++ /dev/null
@@ -1,236 +0,0 @@
-#lang racket/base
-(require "private/lzw.rkt")
-
-(provide gif->rgba-rows
-         gif->all-rgba-rows)
-
-(define-syntax-rule (when-debugging expr ...) 
-  #;(begin expr ...)
-  (void))
-
-(define-struct lsd (width height gt? res sort? gt-size bg-idx ratio))
-(define-struct img-desc (left top width height lct? interlace? sort? lct-size))
-(define-struct image (desc data ct transparent))
-
-(define current-color-table
-  (make-parameter #f))
-
-(define (read-header p)
-  (unless (bytes=? (read-bytes 3 p) #"GIF")
-    (error "missing the GIF header"))
-  (let ([version (read-bytes 3 p)])
-    (cond
-      [(bytes=? version #"87a") 87]
-      [(bytes=? version #"89a") 89]
-      [else (error "unknown GIF version: ~a" version)])))
-
-(define (print-lsd l)
-  (printf "dimensions: ~a x ~a~n"
-          (lsd-width l) (lsd-height l))
-  (if (lsd-gt? l)
-      (printf "global color table of size ~a~n" (lsd-gt-size l))
-      (printf "no global color table~n"))
-  (printf "color res:~a~nsort?: ~a~n"
-          (lsd-res l) (lsd-sort? l))
-  (printf "bg-idx: ~a~naspect ratio:~a~n" 
-          (lsd-bg-idx l) (lsd-ratio l)))
-
-(define (read-lsd p)
-  (define block (read-bytes 7 p))
-  (unless (and (bytes? block)
-               (= (bytes-length block) 7))
-    (error "malformed Logical Screen Descriptor"))
-  (let ([packed-fields (bytes-ref block 4)])
-    (make-lsd (integer-bytes->integer block #f #f 0 2)
-              (integer-bytes->integer block #f #f 2 4)
-              (bitwise-bit-set? packed-fields 7)
-              (add1 (bitwise-bit-field packed-fields 4 7))
-              (bitwise-bit-set? packed-fields 3)
-              (expt 2 (add1 (bitwise-bit-field packed-fields 0 3)))
-              (bytes-ref block 5)
-              (bytes-ref block 6))))
-
-(define (read-ct size p)
-  (define res (make-bytes (* 3 size)))
-  (let ([n (read-bytes! res p)])
-    (unless (= n (* 3 size))
-      (error "Color Table unexpectedly ended")))
-  res)
-
-(define (print-argbs cs)
-  (define size (/ (bytes-length cs) 4))
-  (printf "size: ~a~n" size)
-  (for ([n (in-range size)])
-       (printf "color ~a: (~a, ~a, ~a, ~a)~n"
-               n
-               (bytes-ref cs (* 4 n))
-               (bytes-ref cs (+ 1 (* 4 n)))
-               (bytes-ref cs (+ 2 (* 4 n)))
-               (bytes-ref cs (+ 3 (* 4 n))))))
-
-(define (print-img-desc id)
-  (printf "pos: (~a, ~a)~n"
-          (img-desc-left id) (img-desc-top id))
-  (printf "dimensions: ~a x ~a~n"
-          (img-desc-width id) (img-desc-height id))
-  (if (img-desc-lct? id)
-      (printf "local color table of size ~a~n" (img-desc-lct-size id))
-      (printf "no local color table~n"))
-  (printf "interlaced?: ~a~nsort?: ~a~n"
-          (img-desc-interlace? id)
-          (img-desc-sort? id)))
-
-(define (read-img-desc p)
-  (define block (read-bytes 9 p))
-  (let ([packed-fields (bytes-ref block 8)])
-    (make-img-desc
-     (integer-bytes->integer block #f #f 0 2)
-     (integer-bytes->integer block #f #f 2 4)
-     (integer-bytes->integer block #f #f 4 6)
-     (integer-bytes->integer block #f #f 6 8)
-     (bitwise-bit-set? packed-fields 7)
-     (bitwise-bit-set? packed-fields 6)
-     (bitwise-bit-set? packed-fields 5)
-     (expt 2 (add1 (bitwise-bit-field packed-fields 0 3))))))
-
-(define (read-data-subblocks p)
-  (apply 
-   bytes-append
-   (let loop ([blocks null])
-     (let ([size (read-byte p)])
-       (cond
-         [(eof-object? size)
-          (error "Unexpected EOF")]
-         [(= size 0) (reverse blocks)]
-         [else
-          (loop (cons (read-bytes size p) blocks))])))))
-
-(define (read-image-table image-data p)
-  (define coding-bits (read-byte p))
-  (define lzw-data (read-data-subblocks p))
-  (lzw-decompress image-data coding-bits lzw-data))
-
-(define (read-image p transparent-color)
-  (define id (read-img-desc p))
-  (define data (make-bytes (* (img-desc-width id) (img-desc-height id))))
-  (when-debugging
-   (print-img-desc id))
-  (parameterize ([current-color-table 
-                  (if (img-desc-lct? id)
-                      (read-ct (img-desc-lct-size id) p)
-                      (current-color-table))])
-    (when-debugging
-     (when (img-desc-lct? id)
-       (print-argbs (current-color-table))))
-    (read-image-table data p)
-    (make-image id data (current-color-table) transparent-color)))
-
-(define (read-gif p just-one?)
-  (define version (read-header p))
-  (define lsd (read-lsd p))
-  (define global-table
-    (and (lsd-gt? lsd)
-         (read-ct (lsd-gt-size lsd) p)))
-  (when-debugging
-   (printf "version: ~a~n" version)
-   (print-lsd lsd)
-   (when global-table
-     (print-argbs global-table)))
-  (parameterize ([current-color-table global-table])
-    (define parsed-blocks
-      (let loop ([parsed-blocks null] [transparent-color #f])
-        (let ([id (read-byte p)])
-          (cond 
-            [(eof-object? id)
-             (error "Unexpected end of file")]
-            [(= id #x3b)
-             (reverse parsed-blocks)]
-            [(= id #x2c)
-             (let ([i (read-image p transparent-color)])
-               (if just-one?
-                   i
-                   (loop (cons i parsed-blocks) transparent-color)))]
-            [(= id #x21)
-             ;; Extension
-             (let ([ext (read-byte p)])
-               (cond
-                [(= ext #xF9)
-                 ;; Graphic control
-                 (read-byte p) ; size = 4
-                 (read-byte p) ; disposal
-                 (read-byte p) (read-byte p) ; delay time
-                 (let ([t (read-byte p)]) ; transparent color
-                   (read-byte p) ; 0-sized block
-                   (loop parsed-blocks t))]
-                [(or (= ext #xFE)
-                     (= ext #xFF))
-                 ;; comment block or app data
-                 (let loop ()
-                   (let ([size (read-byte p)])
-                     (unless (zero? size)
-                       (read-bytes size p)
-                       (loop))))
-                 (loop parsed-blocks transparent-color)]
-                [else
-                 (log-warning (format "gif: unhandled extension block type 0x~x in ~e" ext p))
-                 (loop parsed-blocks transparent-color)]))]
-            [else
-             (log-warning (format "gif: unhandled block type 0x~x in ~e" id p))
-             (loop parsed-blocks transparent-color)]))))
-    parsed-blocks))
-
-(define (gif->rgba-rows in)
-  (let ([i (read-gif in #t)])
-    (image->rgbs-rows i)))
-
-(define (gif->all-rgba-rows in)
-  (for/list ([i (in-list (read-gif in #f))])
-    (define-values (w h vec) (image->rgbs-rows i))
-    (vector w h vec)))
-
-(define (image->rgbs-rows i)
-    (let* ([data (image-data i)]
-           [len (bytes-length data)]
-           [ct (image-ct i)]
-           [w (img-desc-width (image-desc i))]
-           [h (img-desc-height (image-desc i))]
-           [t (let ([v (image-transparent i)])
-                (and v (* v 3)))]
-           [vec
-            ;; build vector of row byte strings
-            (list->vector
-             (for/list ([j (in-range h)])
-               (let ([bstr (make-bytes (* 4 w) 255)])
-                 (let ([yp (* w j)])
-                   (for ([i (in-range w)])
-                     (let ([pos (* 3 (bytes-ref data (+ yp i)))])
-                       (when (eq? pos t)
-                         ;; transparent
-                         (bytes-set! bstr (+ 3 (* i 4)) 0))
-                       (bytes-set! bstr (* i 4) (bytes-ref ct pos))
-                       (bytes-set! bstr (+ 1 (* i 4)) (bytes-ref ct (+ 1 pos)))
-                       (bytes-set! bstr (+ 2 (* i 4)) (bytes-ref ct (+ 2 pos))))))
-                 bstr)))]
-           [vec2
-            (if (img-desc-interlace? (image-desc i))
-                ;; reorder rows for interlace decoding
-                (let ([vec2 (make-vector h #f)])
-                  (for ([i (in-range h)])
-                    (let ([j (let ([count (quotient (- h 1) 8)])
-                               (if (i . <= . count) 
-                                   (* i 8)
-                                   (let ([i (- i (add1 count))]
-                                         [count (quotient (- h 5) 8)])
-                                     (if (i . <= . count)
-                                         (+ (* i 8) 4)
-                                         (let ([i (- i (add1 count))]
-                                               [count (quotient (- h 3) 4)])
-                                           (if (i . <= . count)
-                                               (+ (* i 4) 2)
-                                               (let ([i (- i (add1 count))])
-                                                 (+ (* i 2) 1))))))))])
-                      (vector-set! vec2 j (vector-ref vec i))))
-                  vec2)
-                ;; rows are already in order
-                vec)])
-      (values w h vec2)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/bitmap-dc.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/bitmap-dc.rkt
deleted file mode 100644
index b857bd9e8b..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/bitmap-dc.rkt
+++ /dev/null
@@ -1,202 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe/atomic
-         "syntax.rkt"
-         "../unsafe/cairo.rkt"
-         "color.rkt"
-         "bitmap.rkt"
-	 "dc.rkt"
-         "local.rkt")
-
-(provide bitmap-dc%
-         bitmap-dc-backend%)
-
-(define bitmap-dc-backend%
-  (class default-dc-backend%
-    (init [(_bm bitmap) #f])
-    (inherit reset-cr)
-
-    (define c #f)
-    (define bm #f)
-    (define b&w? #f)
-    
-    (when _bm
-      (do-set-bitmap _bm #f)
-      ;; Needed if the bitmap has a device scale:
-      (when c (init-cr-matrix c)))
-    
-    (define/override (init-cr-matrix cr)
-      (when bm
-        (define s (send bm get-cairo-device-scale))
-        (unless (= s 1)
-          (cairo_scale cr s s)))
-      (super init-cr-matrix cr))
-
-    (define/override (init-effective-matrix mx)
-      (when bm
-	(define s (send bm get-cairo-device-scale))
-	(unless (= s 1)
-          (cairo_matrix_scale mx s s))))
-
-    (define/override (ok?) (and c #t))
-
-    (define/private (do-set-bitmap v reset?)
-      (when c
-        (cairo_destroy c)
-        (set! c #f))
-      (set! bm v)
-      (when (and bm (send bm ok?))
-        (set! c (cairo_create (send bm get-cairo-target-surface)))
-        (set! b&w? (not (send bm is-color?)))))
-
-    (define/public (internal-set-bitmap v [direct? #f])
-      (if direct?
-          (do-set-bitmap v #t)
-          (call-as-atomic
-           (lambda ()
-             (do-set-bitmap v #t)
-             (when c (reset-cr c))))))
-
-    (define/public (internal-get-bitmap) bm)
-
-    (def/override (get-size)
-      (let ([bm bm])
-        (values (exact->inexact (send bm get-width))
-                (exact->inexact (send bm get-height)))))
-
-    (define/override (get-cr) c)
-    (define/override (release-cr cr) (when bm (send bm drop-alpha-s)))
-
-    (define/override (end-cr) (void))
-
-    (define/override (dc-adjust-smoothing s) 
-      (if b&w?
-          'unsmoothed
-          s))
-
-    (define/override (install-color cr c a bg?)
-      (if b&w?
-          (begin
-            (cairo_set_operator cr CAIRO_OPERATOR_SOURCE)
-            (if (or (zero? a)
-                    (zero? (color-alpha c)))
-                (super install-color cr c a bg?)
-                (if (if bg?
-                        ;; Background: all non-black to white
-                        (not (and (= (color-red c) 0)
-                                  (= (color-green c) 0)
-                                  (= (color-blue c) 0)
-                                  (= (color-alpha c) 1.0)))
-                        ;; Foreground: all non-white to black:
-                        (and (= (color-red c) 255)
-                             (= (color-green c) 255)
-                             (= (color-blue c) 255)
-                             (= (color-alpha c) 1.0)))
-                    (cairo_set_source_rgba cr 1.0 1.0 1.0 0.0)
-                    (cairo_set_source_rgba cr 0.0 0.0 0.0 1.0))))
-          (super install-color cr c a bg?)))
-
-    (define/override (collapse-bitmap-b&w?) b&w?)
-
-    (define/override (get-clear-operator)
-      (if (or b&w? (send bm has-alpha-channel?))
-          CAIRO_OPERATOR_CLEAR
-          CAIRO_OPERATOR_OVER))
-
-    (super-new)))
-
-(define black (send the-color-database find-color "black"))
-
-(define bitmap-dc%
-  (class (dc-mixin bitmap-dc-backend%)
-    (inherit draw-bitmap-section
-             internal-set-bitmap
-             internal-get-bitmap
-             get-size
-             get-transformation
-             set-transformation
-             get-smoothing
-             set-smoothing
-             scale
-             get-font)
-    
-    (super-new)
-
-    (def/override (get-gl-context)
-      (let ([bm (internal-get-bitmap)])
-        (and bm
-             (send bm get-bitmap-gl-context))))
-
-    (define/public (set-bitmap v)
-      (internal-set-bitmap v))
-
-    (def/public (get-bitmap)
-      (internal-get-bitmap))
-    
-    (define/public (set-pixel x y c)
-      (let ([s (bytes (inexact->exact (round (* 255 (color-alpha c))))
-                      (color-red c)
-                      (color-green c)
-                      (color-blue c))])
-        (set-argb-pixels x y 1 1 s)))
-
-    (define/public (get-pixel x y c)
-      (let-values ([(w h) (get-size)])
-        (let ([b (make-bytes 4)])
-          (get-argb-pixels x y 1 1 b)
-          (send c set (bytes-ref b 1) (bytes-ref b 2) (bytes-ref b 3)
-                (/ (bytes-ref b 0) 255))
-          (and (<= 0 x w) (<= 0 y h)))))
-
-    (define/public (set-argb-pixels x y w h bstr
-                                    [set-alpha? #f]
-                                    [pre-mult? #f])
-      (let ([bm (internal-get-bitmap)])
-        (when bm
-          (send bm set-argb-pixels x y w h bstr set-alpha? pre-mult?))))
-
-    (define/public (get-argb-pixels x y w h bstr
-                                    [get-alpha? #f]
-                                    [pre-mult? #f])
-      (let ([bm (internal-get-bitmap)])
-        (when bm
-          (send bm get-argb-pixels x y w h bstr get-alpha? pre-mult?))))
-
-    (define/public (draw-bitmap-section-smooth src dest-x dest-y
-                                               dest-w dest-h
-                                               src-x src-y
-                                               src-w src-h
-                                               [style 'solid]
-                                               [color black]
-                                               [mask #f])
-      (let ([sx (if (zero? src-w) 1.0 (/ dest-w src-w))]
-            [sy (if (zero? src-h) 1.0 (/ dest-h src-h))])
-        (let ([t (get-transformation)]
-              [s (get-smoothing)])
-          (scale sx sy)
-          (when (eq? s 'unsmoothed) (set-smoothing 'aligned))
-          (begin0
-           (draw-bitmap-section src (/ dest-x sx) (/ dest-y sy) src-x src-y src-w src-h style color mask)
-           (when (eq? s 'unsmoothed) (set-smoothing 'unsmoothed))
-           (set-transformation t)))))
-
-    (def/override (get-char-width)
-      (if (internal-get-bitmap)
-          (super get-char-width)
-          (send (get-temp-bitmap-dc) get-char-width)))
-
-    (def/override (get-char-height)
-      (if (internal-get-bitmap)
-          (super get-char-height)
-          (send (get-temp-bitmap-dc) get-char-height)))
-
-    (define temp-dc #f)
-    (define/private (get-temp-bitmap-dc)
-      (let ([dc (or (and temp-dc (weak-box-value temp-dc))
-                    (let ([dc (make-object bitmap-dc% (make-object bitmap% 1 1))])
-                      (set! temp-dc (make-weak-box dc))
-                      dc))])
-        (send dc set-font (get-font))
-        dc))))
-
-(install-bitmap-dc-class! bitmap-dc%)
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/bitmap.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/bitmap.rkt
deleted file mode 100644
index 44913d4384..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/bitmap.rkt
+++ /dev/null
@@ -1,1078 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/unsafe/ops
-         file/convertible
-         (for-syntax racket/base)
-         "syntax.rkt"
-         "hold.rkt"
-         "../unsafe/bstr.rkt"
-         "../unsafe/cairo.rkt"
-         "../unsafe/png.rkt"
-         "../unsafe/jpeg.rkt"
-         "../xbm.rkt"
-         "../xpm.rkt"
-         "../bmp.rkt"
-         "../gif.rkt"
-         "local.rkt"
-         "color.rkt"
-         "lock.rkt")
-
-(provide bitmap%
-         make-bitmap
-         make-platform-bitmap
-         read-bitmap
-         make-monochrome-bitmap
-         -bitmap-dc%
-         (protect-out make-alternate-bitmap-kind
-                      build-cairo-surface
-                      quartz-bitmap%
-                      win32-no-hwnd-bitmap%
-                      install-bitmap-dc-class!
-                      surface-flush))
-
-(define -bitmap-dc% #f)
-(define (install-bitmap-dc-class! v) (set! -bitmap-dc% v))
-
-;; FIXME: there must be some way to abstract over all many of the
-;; ARGB/RGBA/BGRA iterations.
-
-(define-struct alternate-bitmap-kind (width height scale))
-
-(define-local-member-name
-  get-alphas-as-mask
-  set-alphas-as-mask
-  surface-flush)
-
-(define (bitmap-file-kind-symbol? s)
-  (memq s '(unknown unknown/mask unknown/alpha
-                    gif gif/mask gif/alpha
-                    jpeg jpeg/alpha
-                    png png/mask png/alpha
-                    xbm xbm/alpha
-                    xpm xpm/alpha
-                    bmp bmp/alpha
-                    pict)))
-
-(define (bitmap-save-kind-symbol? s)
-  (memq s '(png jpeg gif xbm xpm bmp)))
-
-(define (quality-integer? i)
-  (and (exact-nonnegative-integer? i) (i . <= . 100)))
-
-(define (destroy s)
-  (cairo_surface_destroy s))
-
-(define (argb-indices)
-  (if (system-big-endian?)
-      (values 0 1 2 3)
-      (values 3 2 1 0)))
-
-(define (a-index)
-  (if (system-big-endian?) 0 3))
-
-(define (b-index)
-  (if (system-big-endian?) 3 0))
-
-(define fx+ unsafe-fx+)
-(define fx* unsafe-fx*)
-
-(define mult-table #f)
-(define unmult-table #f)
-
-(define (get-mult-table)
-  (atomically
-   (unless mult-table
-     (set! mult-table (make-bytes (* 256 256)))
-     (for ([a (in-range 256)])
-       (for ([v (in-range 256)])
-         (bytes-set! mult-table
-                     (fx+ (fx* a 256) v)
-                     (unsafe-fl->fx
-                      (unsafe-flround
-                       (unsafe-fl/
-                        (unsafe-fx->fl (fx* a v))
-                        255.0))))))))
-  mult-table)
-
-(define (get-unmult-table)
-  (atomically
-   (unless unmult-table
-     (set! unmult-table (make-bytes (* 256 256)))
-     (for ([a (in-range 256)])
-       (for ([v (in-range 256)])
-         (bytes-set! unmult-table
-                     (fx+ (fx* a 256) v)
-                     (if (unsafe-fx<= a v)
-                         255
-                         (unsafe-fl->fx
-                          (unsafe-flround
-                           (unsafe-fl/
-                            (unsafe-fx->fl (fx* 255 v))
-                            (unsafe-fx->fl a))))))))))
-  unmult-table)
-
-(define (alpha-mult al v)
-  (unsafe-fl->fx
-   (unsafe-flround
-    (unsafe-fl/
-     (unsafe-fx->fl (fx* al v))
-     255.0))))
-
-(define (alpha-unmult al v)
-  (if (zero? al)
-      255
-      (unsafe-fxmin 255
-                    (unsafe-fl->fx
-                     (unsafe-flround
-                      (unsafe-fl/
-                       (unsafe-fx->fl (fx* 255 v))
-                       (unsafe-fx->fl al)))))))
-
-
-(define png-convertible<%>
-  (interface* ()
-              ([prop:convertible
-                (lambda (bm format default)
-                  (case format
-                    [(png-bytes)
-                     (let ([s (open-output-bytes)])
-                       (send bm save-file s 'png)
-                       (get-output-bytes s))]
-                    [(png@2x-bytes)
-                     (if (= 2 (send bm get-backing-scale))
-                         (let ([s (open-output-bytes)])
-                           (send bm save-file s 'png #:unscaled? #t)
-                           (get-output-bytes s))
-                         default)]
-                    [else default]))])))
-
-(define (get-empty-surface)
-  (cairo_image_surface_create CAIRO_FORMAT_ARGB32 1 1))
-
-(define (*i x y) (inexact->exact (ceiling (* x y))))
-(define (/i x y) (inexact->exact (ceiling (/ x y))))
-
-(define bitmap%
-  (class* object% (png-convertible<%>)
-
-    ;; We support three kinds of bitmaps:
-    ;;  * Color with alpha channel;
-    ;;    when used as a mask, alpha channel is used;
-    ;;    this is the sensible one that works nicely with Cairo
-    ;;  * Black and white; alpha channel is opposite
-    ;;    of value, so either value or alpha can be
-    ;;    considered as mask;
-    ;;    we have to play some tricks to keep the value and mask
-    ;;    inverted, and to keep everything black & white (no gray)
-    ;;  * Color without alpha channel; when used as a mask,
-    ;;    value channel is used (i.e., inverted RGB average
-    ;;    is used as an alpha);
-    ;;    we have to play even worse tricks when this kind of bitmap
-    ;;    is used as a mask
-
-    (init-rest args)
-    (super-new)
-
-    (define/public (surface-flush)
-      (cairo_surface_flush s))
-
-    (define-values (alt? width height b&w? alpha-channel? s loaded-mask backing-scale)
-      (case-args
-       args
-       [([alternate-bitmap-kind? a])
-        (values #t
-                (alternate-bitmap-kind-width a)
-                (alternate-bitmap-kind-height a)
-                #f #t #f #f
-                (alternate-bitmap-kind-scale a))]
-       [([exact-positive-integer? w]
-         [exact-positive-integer? h]
-         [any? [b&w? #f]]
-         [any? [alpha? #f]]
-         [positive-real? [scale 1.0]])
-        (values
-         #f
-         w
-         h
-         (and b&w? #t)
-         (and alpha? (not b&w?))
-         (let ([s (cairo_image_surface_create CAIRO_FORMAT_ARGB32
-                                              (max (*i scale w) 1)
-                                              (max (*i scale h) 1))])
-           (cairo_surface_flush s)
-           (cond
-            [(not (zero? (cairo_surface_status s)))
-             #f]
-            [(cairo_image_surface_get_data s)
-             (cond
-              [b&w?
-               ;; Init transparent white:
-               (transparent-white! s w h)]
-              [alpha?
-               ;; Init transparent:
-               (bytes-fill! (cairo_image_surface_get_data s) 0)]
-              [else
-               ;; Init all white, 255 alpha:
-               (bytes-fill! (cairo_image_surface_get_data s) 255)])
-             (cairo_surface_mark_dirty s)
-             s]
-            [else
-             ;; bitmap creation failed
-             #f]))
-         #f
-         (* 1.0 scale))]
-       [([(make-alts path-string? input-port?) filename]
-         [bitmap-file-kind-symbol? [kind 'unknown]]
-         [(make-or-false color%) [bg-color #f]]
-         [any? [complain-on-failure? #f]]
-         [positive-real? [scale 1.0]])
-        (let-values ([(s b&w?) (do-load-bitmap filename kind bg-color complain-on-failure?)]
-                     [(alpha?) (memq kind '(unknown/alpha gif/alpha jpeg/alpha
-                                                          png/alpha xbm/alpha xpm/alpha
-                                                          bmp/alpha))]
-                     [(mask?) (memq kind '(unknown/mask gif/mask png/mask))])
-          (let ([mask-bm
-                 (and s
-                      (not alpha?)
-                      (not b&w?)
-                      (let ([w (cairo_image_surface_get_width s)]
-                            [h (cairo_image_surface_get_height s)]
-                            [row-width (cairo_image_surface_get_stride s)]
-                            [bstr (cairo_image_surface_get_data s)]
-                            [A (a-index)])
-                        (begin0
-                         (and mask?
-                              ;; Move alpha channel to a separate mask bitmap
-                              (let ([b&w? (for*/and ([j (in-range h)]
-                                                     [i (in-range w)])
-                                                    (let ([v (bytes-ref bstr (+ A (* 4 i) (* j row-width)))])
-                                                      (or (= v 0) (= v 255))))])
-                                (let ([mask-bm (make-object bitmap% w h b&w?)])
-                                  (send mask-bm set-alphas-as-mask 0 0 w h bstr row-width A w h)
-                                  mask-bm)))
-                         ;; Force all alpha values to 255
-                         (for* ([j (in-range h)]
-                                [i (in-range w)])
-                           (bytes-set! bstr (+ A (* 4 i) (* j row-width)) 255))
-                         (cairo_surface_mark_dirty s))))])
-            (if s
-                (values #f
-                        (/i (cairo_image_surface_get_width s) scale)
-                        (/i (cairo_image_surface_get_height s) scale)
-                        b&w?
-                        (and alpha? (not b&w?))
-                        s
-                        mask-bm
-                        (* 1.0 scale))
-                (values #f 0 0 #f #f #f #f (* 1.0 scale)))))]
-       [([bytes? bstr]
-         [exact-positive-integer? w]
-         [exact-positive-integer? h])
-        (let ([bw (quotient (+ w 7) 8)])
-          (unless ((bytes-length bstr) . >= . (* h bw))
-            (error (init-name 'bitmap%)
-                   "given byte string is too small for dimensions: ~s"
-                   bstr))
-          (let ([s (cairo_image_surface_create CAIRO_FORMAT_ARGB32 w h)])
-            (let ([rows (list->vector
-                         (for/list ([i (in-range h)])
-                           (let ([s (* i bw)])
-                             (subbytes bstr s (+ s bw)))))])
-              (install-bytes-rows s w h rows #t #f #f #t))
-            (values #f w h #t #f s #f 1.0)))]
-       (init-name 'bitmap%)))
-
-    (when (not (= backing-scale 1.0))
-      (when (or b&w? loaded-mask)
-        (error (init-name 'bitmap%)
-               (string-append
-                "~a must have a backing scale of 1.0\n"
-                "  given scale: ~a")
-               (if b&w?
-                   "black-and-white bitmap"
-                   "bitmap with mask")
-               backing-scale)))
-
-    ;; Use for non-alpha color bitmaps when they are used as a mask:
-    (define alpha-s #f)
-    (define alpha-s-up-to-date? #f)
-    (define/public (drop-alpha-s)
-      (set! alpha-s-up-to-date? #f)
-      (when alpha-s
-        (let ([s2 alpha-s])
-          (set! alpha-s #f)
-          (destroy s2))))
-
-    ;; Claim memory proportional to the size of the bitmap, which
-    ;; helps the GC see that we're using that much memory:
-    (define shadow (make-phantom-bytes (* width height 4)))
-
-    (def/public (get-width) (max 1 width))
-    (def/public (get-height) (max 1 height))
-    (def/public (get-depth) (if b&w? 1 32))
-    (def/public (is-color?) (not b&w?))
-    (def/public (has-alpha-channel?) (and alpha-channel? #t))
-
-    (define/private (check-alternate who)
-      (when alt?
-        (raise-mismatch-error (method-name 'bitmap% who)
-                              "not available in a canvas-compatible bitmap: "
-                              this)))
-
-    (def/public (get-loaded-mask) loaded-mask)
-    (def/public (set-loaded-mask [(make-or-false bitmap%) m])
-      (unless (= backing-scale 1)
-        (error (method-name 'bitmap% 'set-loaded-mask)
-               (string-append
-                "can only install a mask for a bitmap with backing scale of 1.0\n"
-                "  backing scale: ~a")
-               backing-scale))
-      (set! loaded-mask m))
-
-    (define/public (draw-bitmap-to cr sx sy dx dy w h alpha clipping)
-      #f)
-
-    (define/public (release-bitmap-storage)
-      (drop-alpha-s)
-      (when s
-        (let ([s2 s])
-          (set! s #f)
-          (destroy s2)
-          (set! shadow #f))))
-
-    (define/public (get-bitmap-gl-context)
-      #f)
-
-    (define/public (make-dc) (make-object -bitmap-dc% this))
-
-    (define/public (load-file in
-                              [kind 'unknown]
-                              [bg #f]
-                              [complain-on-failure? #f])
-      (check-alternate 'load-file)
-      (unless (= 1 backing-scale)
-        (error (method-name 'bitmap% 'load-file)
-               (string-append
-                "can only load a file in a bitmap with backing scale of 1.0\n"
-                "  backing scale: ~a")
-               backing-scale))
-      (release-bitmap-storage)
-      (set!-values (s b&w?) (do-load-bitmap in kind bg complain-on-failure?))
-      (set! width (if s (cairo_image_surface_get_width s) 0))
-      (set! height (if s (cairo_image_surface_get_height s) 0))
-      (set! shadow (make-phantom-bytes (* width height 4)))
-      (and s #t))
-
-    (define/private (do-load-bitmap in kind bg complain-on-failure?)
-      (if (path-string? in)
-          (with-handlers ([exn:fail? (lambda (exn)
-                                       (if complain-on-failure?
-                                           (raise exn)
-                                           (values #f #f)))])
-            (call-with-input-file*
-             in
-             (lambda (in) (do-load-bitmap in kind bg #f))))
-          (case kind
-           [(unknown unknown/mask unknown/alpha)
-            (let ([starts? (lambda (s)
-                             (equal? (peek-bytes (bytes-length s) 0 in) s))])
-              (cond
-               [(starts? #"\211PNG\r\n")
-                (do-load-bitmap in
-                                (if (eq? kind 'unknown/alpha)
-                                    'png/alpha
-                                    (if (eq? kind 'unknown/mask)
-                                        'png/mask
-                                        'png))
-                                bg
-                                complain-on-failure?)]
-               [(starts? #"\xFF\xD8\xFF")
-                (do-load-bitmap in 'jpeg bg complain-on-failure?)]
-               [(starts? #"GIF8")
-                (do-load-bitmap in 'gif bg complain-on-failure?)]
-               [(starts? #"BM")
-                (do-load-bitmap in 'bmp bg complain-on-failure?)]
-               [(starts? #"#define")
-                (do-load-bitmap in 'xbm bg complain-on-failure?)]
-               [(starts? #"/* XPM */")
-                (do-load-bitmap in 'xpm bg complain-on-failure?)]
-               [else
-                ;; unrecognized file type; try to parse as XBM
-                (do-load-bitmap in 'xbm bg complain-on-failure?)]))]
-           [(png png/mask png/alpha)
-            ;; Using the Cairo PNG support is about twice as fast, but we have
-            ;; less control, and there are problems making deallocation reliable
-            ;; (in case of exceptions or termination):
-            #;
-            (let ([proc (lambda (ignored bstr len)
-                          (read-bytes! (scheme_make_sized_byte_string bstr len 0) in)
-                          CAIRO_STATUS_SUCCESS)])
-              (with-holding
-               proc
-               (values (cairo_image_surface_create_from_png_stream proc) #f)))
-            ;; Using libpng directly:
-            (let-values ([(r w h b&w? alpha?) (create-png-reader
-                                               in
-                                               (memq kind '(png/mask png/alpha))
-                                               (and bg
-                                                    (list (send bg red)
-                                                          (send bg green)
-                                                          (send bg blue))))])
-              (let ([rows (read-png r)])
-                (destroy-png-reader r)
-                (let* ([s (cairo_image_surface_create CAIRO_FORMAT_ARGB32 w h)]
-                       [pre? (and alpha? (eq? kind 'png/alpha))])
-                  (install-bytes-rows s w h rows b&w? alpha? pre? #f)
-                  (values s b&w?))))]
-           [(jpeg jpeg/alpha)
-            (let ([d (create-decompress in)])
-              (dynamic-wind
-                  void
-                  (lambda ()
-                    (jpeg_read_header d #t)
-                    (jpeg_start_decompress d)
-                    (let ([w (jpeg_decompress_struct-output_width d)]
-                          [h (jpeg_decompress_struct-output_height d)]
-                          [c (jpeg_decompress_struct-output_components d)])
-                      (let-values ([(samps bstr) (create-jpeg-sample-array d (* w c))]
-                                   [(A R G B) (argb-indices)])
-                        (let* ([s (cairo_image_surface_create CAIRO_FORMAT_ARGB32 w h)]
-                               [dest (begin
-                                       (cairo_surface_flush s)
-                                       (cairo_image_surface_get_data s))]
-                               [dest-row-width (cairo_image_surface_get_stride s)])
-                          (for ([j (in-range h)])
-                            (jpeg_read_scanlines d samps 1)
-                            (let ([row (* dest-row-width j)])
-                              (for ([i (in-range w)])
-                                (let ([4i (fx+ row (fx* 4 i))]
-                                      [ci (fx* c i)])
-                                  (unsafe-bytes-set! dest (fx+ 4i A) 255)
-                                  (if (= c 1)
-                                      (let ([v (unsafe-bytes-ref bstr ci)])
-                                        (unsafe-bytes-set! dest (fx+ 4i R) v)
-                                        (unsafe-bytes-set! dest (fx+ 4i G) v)
-                                        (unsafe-bytes-set! dest (fx+ 4i B) v))
-                                      (begin
-                                        (unsafe-bytes-set! dest (fx+ 4i R) (unsafe-bytes-ref bstr ci))
-                                        (unsafe-bytes-set! dest (fx+ 4i G) (unsafe-bytes-ref bstr (fx+ ci 1)))
-                                        (unsafe-bytes-set! dest (fx+ 4i B) (unsafe-bytes-ref bstr (fx+ ci 2)))))))))
-                          (cairo_surface_mark_dirty s)
-                          (jpeg_finish_decompress d)
-                          (values s #f)))))
-                  (lambda ()
-                    (destroy-decompress d))))]
-           [(gif gif/mask gif/alpha)
-            (let-values ([(w h rows) (gif->rgba-rows in)])
-              (let* ([s (cairo_image_surface_create CAIRO_FORMAT_ARGB32 w h)]
-                     [alpha? #t]
-                     [pre? (and alpha? (eq? kind 'gif/alpha))]
-                     [b&w? #f])
-                (install-bytes-rows s w h rows b&w? alpha? pre? #f)
-                (values s b&w?)))]
-           [(xbm xbm/alpha)
-            (let-values ([(w h rows) (read-xbm in)])
-              (if rows
-                  (let ([s (cairo_image_surface_create CAIRO_FORMAT_ARGB32 w h)])
-                    (install-bytes-rows s w h rows #t #f #f #t)
-                    (values s #t))
-                  (values #f #f)))]
-           [(xpm xpm/alpha)
-            (let-values ([(w h rows) (read-xpm in)])
-              (if rows
-                  (let ([s (cairo_image_surface_create CAIRO_FORMAT_ARGB32 w h)]
-                        [alpha? #t])
-                    (install-bytes-rows s w h rows #f alpha? #t #f)
-                    (values s #f))
-                  (values #f #f)))]
-           [(bmp bmp/alpha)
-            (let-values ([(w h rows) (read-bmp in)])
-              (if rows
-                  (let ([s (cairo_image_surface_create CAIRO_FORMAT_ARGB32 w h)]
-                        [alpha? #t])
-                    (install-bytes-rows s w h rows #f alpha? #t #f)
-                    (values s #f))
-                  (values #f #f)))]
-           [else (values #f #f)])))
-
-    ;; s : Cairo bitmap surface
-    ;; w, h : width and height in pixels
-    ;; rows : a vector of `h' byte strings
-    ;; b&w? : each bit in a byte string is a pixel (so each byte
-    ;;        string in `rows' is `(/ w 8)' bytes long)
-    ;;        if not `backward?': low bit is first and 0 is black
-    ;;        if `backward?': high bit is first and 1 is black
-    ;; alpha? : relevant only if not `b&w?';
-    ;;          if true: each byte string has 4 bytes per pixel, RGBA
-    ;;          if false: each byte string has 3 bytes er pixel, RGB
-    ;; pre? : should be #f if not `alpha?', otherwise a #t value
-    ;;        means that the RGB values should be multiplied by A value
-    ;;        (i.e., the values are not already pre-multiplied)
-    ;; backward? : affects byte interpretation in `b&w?' mode; see above
-    (define/private (install-bytes-rows s w h rows b&w? alpha? pre? backward?)
-      (let* ([dest (begin
-                     (cairo_surface_flush s)
-                     (cairo_image_surface_get_data s))]
-             [dest-row-width (cairo_image_surface_get_stride s)]
-             [m (and pre? (get-mult-table))])
-        (let-values ([(A R G B) (argb-indices)])
-          (for ([r (in-vector rows)]
-                [j (in-naturals)])
-            (let ([row (* dest-row-width j)])
-              (if b&w?
-                  (for ([i (in-range w)])
-                    (let ([b (unsafe-fxquotient i 8)]
-                          [bit (if backward?
-                                   (unsafe-fxlshift 1 (unsafe-fxand i 7))
-                                   (unsafe-fxrshift 128 (unsafe-fxand i 7)))]
-                          [pos (fx+ row (fx* 4 i))])
-                      (let* ([v (if (zero? (unsafe-fxand bit (unsafe-bytes-ref r b)))
-                                    0
-                                    255)]
-                             [v (if backward? (- 255 v) v)])
-                        (unsafe-bytes-set! dest (fx+ pos A) (- 255 v))
-                        (unsafe-bytes-set! dest (fx+ pos 1) v)
-                        (unsafe-bytes-set! dest (fx+ pos 2) v)
-                        (unsafe-bytes-set! dest (fx+ pos B) v))))
-                  (for ([i (in-range w)])
-                    (let* ([4i (fx* 4 i)]
-                           [pos (fx+ row 4i)]
-                           [spos (if alpha?
-                                     (fx* 4 i)
-                                     (fx* 3 i))]
-                           [al (if alpha?
-                                   (unsafe-bytes-ref r (fx+ spos 3))
-                                   255)]
-                           [premult (lambda (al v)
-                                      (if m
-                                          (unsafe-bytes-ref m (fx+ (fx* al 256) v))
-                                          v))])
-                      (unsafe-bytes-set! dest (fx+ pos A) al)
-                      (unsafe-bytes-set! dest (fx+ pos R) (premult al (unsafe-bytes-ref r spos)))
-                      (unsafe-bytes-set! dest (fx+ pos G) (premult al (unsafe-bytes-ref r (fx+ spos 1))))
-                      (unsafe-bytes-set! dest (fx+ pos B) (premult al (unsafe-bytes-ref r (fx+ spos 2))))))))))
-        (cairo_surface_mark_dirty s)))
-
-    (define/private (call-with-alt-bitmap x y w h sc proc)
-      (let* ([bm (make-object bitmap% w h #f #t)]
-             [cr (cairo_create (send bm get-cairo-surface))])
-        (let ([p (cairo_get_source cr)])
-          (cairo_pattern_reference p)
-          (cairo_set_source_surface cr (get-cairo-surface) (- x) (- y))
-          (unless (= sc 1)
-            (let ([m (make-cairo_matrix_t 0.0 0.0 0.0 0.0 0.0 0.0)])
-              (cairo_matrix_init_translate m 0 0)
-              (cairo_matrix_scale m sc sc)
-              (cairo_matrix_translate m x y)
-              (cairo_pattern_set_matrix (cairo_get_source cr) m)))
-          (cairo_new_path cr)
-          (cairo_rectangle cr 0 0 w h)
-          (cairo_fill cr)
-          (cairo_set_source cr p)
-          (cairo_pattern_destroy p))
-        (cairo_destroy cr)
-        (proc bm)
-        (send bm release-bitmap-storage)))
-
-    (define/public (save-file out [kind 'unknown] [quality 75]
-                              #:unscaled? [unscaled? #f])
-      (and (ok?)
-           (begin
-             (if (or alt?
-                     (and (not unscaled?)
-                          (not (= backing-scale 1))))
-                 (call-with-alt-bitmap
-                  0 0 width height (if unscaled? 1 backing-scale)
-                  (lambda (bm)
-                    (send bm save-file out kind quality)))
-                 (do-save-file out kind quality))
-             #t)))
-
-    (define/private (do-save-file out kind quality)
-      (if (path-string? out)
-          (call-with-output-file*
-           out
-           #:exists 'truncate/replace
-           (lambda (out) (do-save-file out kind quality)))
-          (case kind
-            [(png)
-             (cond
-              [b&w?
-               ;; Write a 1-bit png
-               (let* ([b (ceiling (/ width 8))]
-                      [rows (build-vector height (lambda (i) (make-bytes b)))]
-                      [data (begin (surface-flush)
-                                   (cairo_image_surface_get_data s))]
-                      [row-width (cairo_image_surface_get_stride s)])
-                 (for ([j (in-range height)])
-                   (let ([row (vector-ref rows j)])
-                     (for ([bi (in-range b)])
-                       (bytes-set!
-                        row
-                        bi
-                        (let ([src (+ (* j row-width) (* (* bi 8) 4))])
-                          (for/fold ([v 0]) ([k (in-range 8)])
-                            (if ((+ (* 8 bi) k) . < . width)
-                                (if (zero? (bytes-ref data (+ src 3 (* 4 k))))
-                                    (bitwise-ior v (unsafe-fxrshift 128 k))
-                                    v)
-                                v)))))))
-                 (let ([w (create-png-writer out width height #t #f)])
-                   (write-png w rows)
-                   (destroy-png-writer w)))]
-              [else #;(and (not alpha-channel?)
-                           loaded-mask
-                           (= width (send loaded-mask get-width))
-                           (= height (send loaded-mask get-height)))
-               (let* ([width (*i width backing-scale)]
-                      [height (*i height backing-scale)]
-                      [bstr (make-bytes (* width height 4))])
-                 (get-argb-pixels 0 0 width height bstr #:unscaled? #t)
-                 (when loaded-mask
-                   (send loaded-mask get-argb-pixels 0 0 width height bstr #t))
-                 ;; PNG wants RGBA instead of ARGB...
-                 (let ([rows (build-vector height (lambda (i) (make-bytes (* 4 width))))])
-                   (for ([j (in-range height)]
-                         [dest-row (in-vector rows)])
-                     (let ([src-row (* j (* 4 width))])
-                       (for ([i (in-range width)])
-                         (let* ([4i (* 4 i)]
-                                [ri (+ src-row 4i)])
-                           (bytes-set! dest-row 4i (bytes-ref bstr (+ 1 ri)))
-                           (bytes-set! dest-row (+ 4i 1) (bytes-ref bstr (+ 2 ri)))
-                           (bytes-set! dest-row (+ 4i 2) (bytes-ref bstr (+ 3 ri)))
-                           (bytes-set! dest-row (+ 4i 3) (bytes-ref bstr ri))))))
-                   (let ([w (create-png-writer out width height #f #t)])
-                     (write-png w rows)
-                     (destroy-png-writer w))))]
-              #;
-              [else
-               ;; Use Cairo built-in support:
-               (let ([proc (lambda (ignored bstr len)
-                             (write-bytes (scheme_make_sized_byte_string bstr len 0) out)
-                             CAIRO_STATUS_SUCCESS)])
-                 (with-holding
-                  proc
-                  (cairo_surface_write_to_png_stream s proc)))])]
-            [(jpeg)
-             (let ([c (create-compress out)]
-                   [width (*i width backing-scale)]
-                   [height (*i height backing-scale)])
-               (dynamic-wind
-                   void
-                   (lambda ()
-                     (set-jpeg_compress_struct-image_width! c width)
-                     (set-jpeg_compress_struct-image_height! c height)
-                     (set-jpeg_compress_struct-input_components! c 3)
-                     (set-jpeg_compress_struct-in_color_space! c JCS_RGB)
-                     (jpeg_set_defaults c)
-                     (jpeg_set_quality c quality #t)
-                     (jpeg_start_compress c #t)
-                     (let-values ([(samps bstr) (create-jpeg-sample-array c (* width 3))]
-                                  [(A R G B) (argb-indices)])
-                       (cairo_surface_flush s)
-                       (let* ([dest (cairo_image_surface_get_data s)]
-                              [dest-row-width (cairo_image_surface_get_stride s)]
-                              [h height]
-                              [w width])
-                         (for ([j (in-range h)])
-                           (let ([row (* dest-row-width j)])
-                             (for ([i (in-range w)])
-                               (let ([4i (* 4 i)]
-                                     [ci (* 3 i)])
-                                 (bytes-set! bstr ci (bytes-ref dest (+ row (+ 4i R))))
-                                 (bytes-set! bstr (+ ci 1) (bytes-ref dest (+ row (+ 4i G))))
-                                 (bytes-set! bstr (+ ci 2) (bytes-ref dest (+ row (+ 4i B)))))))
-                           (jpeg_write_scanlines c samps 1))))
-                     (jpeg_finish_compress c))
-                   (lambda () (destroy-compress c))))]
-            [else (error (method-name 'bitmap% 'save-file)
-                         "kind saving not yet implemented: ~e"
-                         kind)])))
-
-    (def/public (ok?) (and s #t))
-
-    (define/public (get-cairo-surface) (or s (get-empty-surface)))
-    (define/public (get-cairo-target-surface) (get-cairo-surface))
-    (define/public (get-cairo-alpha-surface)
-      (or (if (or b&w? alpha-channel?)
-              s
-              (begin
-                (prep-alpha (*i width backing-scale) (*i height backing-scale))
-                alpha-s))
-          (get-empty-surface)))
-
-    (define/public (get-cairo-device-scale) backing-scale)
-
-    (define/public (get-backing-scale) (get-cairo-device-scale))
-
-    (define/public (get-handle) s)
-
-    (define/public (get-argb-pixels x y w h bstr
-                                    [get-alpha? #f]
-                                    [pre-mult? #f]
-                                    #:unscaled? [unscaled? #f])
-      (unless ((bytes-length bstr) . >=  . (* w h 4))
-        (raise-mismatch-error (method-name 'bitmap% 'get-argb-pixels)
-                              "byte string is too short: "
-                              bstr))
-      (when (ok?)
-        (unless (or (zero? w) (zero? h))
-          (if (or alt?
-                  (and (not unscaled?)
-                       (not (= backing-scale 1))))
-              (call-with-alt-bitmap
-               x y w h (if unscaled? 1 backing-scale)
-               (lambda (bm) (send bm get-argb-pixels 0 0 w h bstr get-alpha? pre-mult?)))
-              (do-get-argb-pixels x y w h bstr get-alpha? pre-mult?
-                                  (*i width backing-scale) (*i height backing-scale))))))
-
-    (define/private (do-get-argb-pixels x y w h bstr get-alpha? pre-mult? width height)
-      ;; Fill range that is beyond edge of picture:
-      (if get-alpha?
-          (for* ([i (in-range width (+ x w))]
-                 [j (in-range height (+ y h))])
-            (bytes-set! bstr (* 4 (+ i (* j w))) 255))
-          (for* ([i (in-range width (+ x w))]
-                 [j (in-range height (+ y h))])
-            (let ([p (* 4 (+ i (* j w)))])
-              (bytes-set! bstr p 255)
-              (bytes-set! bstr (+ p 1) 0)
-              (bytes-set! bstr (+ p 2) 0)
-              (bytes-set! bstr (+ p 3) 0))))
-      ;; Get pixels:
-      (when (not get-alpha?)
-        (let-values ([(A R G B) (argb-indices)])
-          (surface-flush)
-          (let ([data (cairo_image_surface_get_data s)]
-                [row-width (cairo_image_surface_get_stride s)]
-                [um (and (or (and alpha-channel? (not pre-mult?)) b&w?)
-                         (get-unmult-table))]
-                [set-alpha? alpha-channel?])
-            (let ([w2 (+ x (min (- width x) w))])
-              (for* ([j (in-range y (min (+ y h) height))])
-                (let* ([row (* j row-width)]
-                       [p (* 4 (* (- j y) w))]
-                       [ri-start (+ row (* 4 x))]
-                       [ri-end (+ row (* 4 w2))]
-                       [pi-start p]
-                       [pi-end (+ p (* 4 (- w2 x)))])
-                  (for ([ri (in-range ri-start ri-end 4)]
-                        [pi (in-range pi-start pi-end 4)])
-                    (let ([a (unsafe-bytes-ref data (+ ri A))])
-                      (let-syntax ([unmult
-                                    ;; Defined as a macro to copy the
-                                    ;; `unsafe-bytes-ref' to each branch,
-                                    ;; instead of binding a local variable
-                                    (syntax-rules ()
-                                      [(_ v)
-                                       (if um
-                                           (unsafe-bytes-ref um (fx+ (fx* a 256) v))
-                                           v)])])
-                        (when set-alpha?
-                          (unsafe-bytes-set! bstr pi a))
-                        (unsafe-bytes-set! bstr (+ pi 1) (unmult (unsafe-bytes-ref data (+ ri R))))
-                        (unsafe-bytes-set! bstr (+ pi 2) (unmult (unsafe-bytes-ref data (+ ri G))))
-                        (unsafe-bytes-set! bstr (+ pi 3) (unmult (unsafe-bytes-ref data (+ ri B)))))))))))))
-      (cond
-       [get-alpha?
-        (get-alphas-as-mask x y w h bstr width height)]
-       [(and (not get-alpha?) (not alpha-channel?))
-        ;; For non-alpha mode and no alpha channel; fill in 255s for alpha:
-        (for ([j (in-range 0 (min h (- height y)))])
-          (let ([row (* j (* 4 w))])
-            (for ([i (in-range 0 (min w (- width x)))])
-              (let ([p (+ (* 4 i) row)])
-                (bytes-set! bstr p 255)))))]))
-
-    (define/public (set-argb-pixels x y w h bstr
-                                    [set-alpha? #f]
-                                    [pre-mult? #f]
-                                    #:unscaled? [unscaled? #f])
-      (unless ((bytes-length bstr) . >=  . (* w h 4))
-        (raise-mismatch-error (method-name 'bitmap% 'set-argb-pixels)
-                              "byte string is too short: "
-                              bstr))
-      (check-alternate 'set-argb-pixels)
-      (cond
-       [(and (not unscaled?)
-             (not (= backing-scale 1)))
-        ;; scale input to match backing:
-        (define s backing-scale)
-        (define kw (max (*i 1 s) 1))
-        (define sw (+ kw (*i (sub1 w) s)))
-        (define sh (+ kw (*i (sub1 h) s)))
-        (define bstr2 (make-bytes (* sw sh 4)))
-        (for ([j (in-range h)])
-          (define sj (*i j s))
-          (for ([i (in-range w)])
-            (define si (*i i s))
-            (define p (+ (* j 4 w) (* i 4)))
-            (for* ([ik (in-range kw)]
-                   [jk (in-range kw)])
-              (define p2 (+ (* (+ sj jk) 4 sw) (* (+ si ik) 4)))
-              (bytes-set! bstr2 p2 (bytes-ref bstr p))
-              (bytes-set! bstr2 (+ p2 1) (bytes-ref bstr (+ p 1)))
-              (bytes-set! bstr2 (+ p2 2) (bytes-ref bstr (+ p 2)))
-              (bytes-set! bstr2 (+ p2 3) (bytes-ref bstr (+ p 3))))))
-        (set-argb-pixels (*i x s) (*i y s) sw sh bstr2 set-alpha? pre-mult? #:unscaled? 1)]
-       [(ok?)
-        ;; Set pixels:
-        (let-values ([(A R G B) (argb-indices)]
-                     [(width) (if unscaled? (*i width backing-scale) width)]
-                     [(height) (if unscaled? (*i height backing-scale) height)])
-          (when (not set-alpha?)
-            (surface-flush)
-            (let ([data (cairo_image_surface_get_data s)]
-                  [row-width (cairo_image_surface_get_stride s)]
-                  [m (and (not pre-mult?) (get-mult-table))])
-              (define-syntax-rule (set-loop body)
-                (let ([w2 (+ x (min (- width x) w))])
-                  (for ([j (in-range y (min (+ y h) height))]
-                        [dj (in-naturals)])
-                    (let ([row (* j row-width)]
-                          [p (* 4 (* dj w))])
-                      (for ([i (in-range x w2)])
-                        (let* ([4i (unsafe-fx* 4 i)]
-                               [pi (unsafe-fx+ p (unsafe-fx* 4 (unsafe-fx- i x)))]
-                               [ri (unsafe-fx+ row 4i)])
-                          (body pi ri)))))))
-              (cond
-               [b&w?
-                (set-loop
-                 (lambda (pi ri)
-                   (let ([v (if (and (= (unsafe-bytes-ref bstr (+ pi 1)) 255)
-                                     (= (unsafe-bytes-ref bstr (+ pi 2)) 255)
-                                     (= (unsafe-bytes-ref bstr (+ pi 3)) 255))
-                                255
-                                0)])
-                     (unsafe-bytes-set! data (unsafe-fx+ ri A) (- 255 v))
-                     (unsafe-bytes-set! data (unsafe-fx+ ri 1) v)
-                     (unsafe-bytes-set! data (unsafe-fx+ ri 2) v)
-                     (unsafe-bytes-set! data (unsafe-fx+ ri B) v))))]
-               [alpha-channel?
-                (define-syntax-rule (alpha-set-loop pm)
-                  (set-loop
-                   (lambda (pi ri)
-                     (let ([a (bytes-ref bstr pi)])
-                       (unsafe-bytes-set! data (unsafe-fx+ ri A) a)
-                       (unsafe-bytes-set! data (unsafe-fx+ ri R)
-                                          (pm a (unsafe-bytes-ref bstr (unsafe-fx+ pi 1))))
-                       (unsafe-bytes-set! data (unsafe-fx+ ri G)
-                                          (pm a (unsafe-bytes-ref bstr (unsafe-fx+ pi 2))))
-                       (unsafe-bytes-set! data (unsafe-fx+ ri B)
-                                          (pm a (unsafe-bytes-ref bstr (unsafe-fx+ pi 3))))))))
-                (if m
-                    (alpha-set-loop (lambda (a v)
-                                      (unsafe-bytes-ref m (unsafe-fx+ (unsafe-fx* a 256) v))))
-                    (alpha-set-loop (lambda (a v) (unsafe-fxmin a v))))]
-               [else
-                (set-loop
-                 (lambda (pi ri)
-                   (unsafe-bytes-set! data (unsafe-fx+ ri R)
-                                      (unsafe-bytes-ref bstr (unsafe-fx+ pi 1)))
-                   (unsafe-bytes-set! data (unsafe-fx+ ri G)
-                                      (unsafe-bytes-ref bstr (unsafe-fx+ pi 2)))
-                   (unsafe-bytes-set! data (unsafe-fx+ ri B)
-                                      (unsafe-bytes-ref bstr (unsafe-fx+ pi 3)))))]))
-            (cairo_surface_mark_dirty s)))
-        (cond
-         [(and set-alpha?
-               (not alpha-channel?))
-          ;; Set alphas:
-          (set-alphas-as-mask x y w h bstr (* 4 w) 0
-                              (if unscaled? (*i width backing-scale) width)
-                              (if unscaled? (*i height backing-scale) height))])
-        (drop-alpha-s)]))
-
-    (define/public (get-alphas-as-mask x y w h bstr width height)
-      (let ([data (cairo_image_surface_get_data (if (or b&w? alpha-channel?)
-                                                    (begin
-                                                      (surface-flush)
-                                                      s)
-                                                    (begin
-                                                      (prep-alpha width height)
-                                                      (cairo_surface_flush alpha-s)
-                                                      alpha-s)))]
-            [row-width (cairo_image_surface_get_stride s)]
-            [A (a-index)])
-        (for ([j (in-range y (min (+ y h) height))])
-          (let ([row (* j row-width)])
-            (for ([i (in-range x (min (+ x w) width))])
-              (let ([p (* 4 (+ (- i x) (* (- j y) w)))]
-                    [q (+ row (* i 4))])
-                (bytes-set! bstr p (bytes-ref data (+ q A)))))))))
-
-    (define/public (prep-alpha width height)
-      (when (and (not b&w?)
-                 (not alpha-channel?)
-                 s)
-        (unless alpha-s-up-to-date?
-          (unless alpha-s
-            (set! alpha-s (cairo_image_surface_create CAIRO_FORMAT_ARGB32
-                                                      width height)))
-          (surface-flush)
-          (cairo_surface_flush alpha-s)
-          (let ([data (cairo_image_surface_get_data s)]
-                [alpha-data (cairo_image_surface_get_data alpha-s)]
-                [row-width (cairo_image_surface_get_stride s)]
-                [A (a-index)]
-                [B (b-index)])
-            (for ([j (in-range height)])
-              (let ([row (* j row-width)])
-                (for ([i (in-range width)])
-                  (let ([q (+ row (* i 4))])
-                    (let ([v (quotient
-                              (+ (+ (bytes-ref data (+ q 1))
-                                    (bytes-ref data (+ q 2)))
-                                 (bytes-ref data (+ q B)))
-                              3)])
-                      (bytes-set! alpha-data (+ q A) (- 255 v))))))))
-          (cairo_surface_mark_dirty alpha-s)
-          (set! alpha-s-up-to-date? #t))))
-
-    (define/public (transparent-white! s width height)
-      (let ([bstr (cairo_image_surface_get_data s)]
-            [row-width (cairo_image_surface_get_stride s)]
-            [A (a-index)])
-        (bytes-fill! bstr 255)
-        (for ([j (in-range height)])
-          (let ([row (* j row-width)])
-            (for ([i (in-range width)])
-              (bytes-set! bstr (+ A (+ row (* i 4))) 0))))))
-
-    (define/public (set-alphas-as-mask x y w h bstr src-w src-A width height)
-      (when (or b&w? (and (not b&w?) (not alpha-channel?)))
-        (let ([data (cairo_image_surface_get_data s)]
-              [row-width (cairo_image_surface_get_stride s)]
-              [A (a-index)]
-              [B (b-index)])
-          (surface-flush)
-          (for ([j (in-range y (min (+ y h) height))])
-            (let ([row (* j row-width)]
-                  [src-row (* (- j y) src-w)])
-              (for ([i (in-range x (min (+ x w) width))])
-                (let* ([p (+ (* 4 (- i x)) src-row)]
-                       [q (+ (* 4 i) row)])
-                  (let* ([v (bytes-ref bstr (+ p src-A))]
-                         [vv (- 255 v)])
-                    (bytes-set! data (+ q B) vv)
-                    (bytes-set! data (+ q 1) vv)
-                    (bytes-set! data (+ q 2) vv)
-                    (bytes-set! data (+ q A) (if b&w? v 255)))))))
-          (cairo_surface_mark_dirty s))))))
-
-(define/top (make-bitmap [exact-positive-integer? w]
-                         [exact-positive-integer? h]
-                         [any? [alpha? #t]]
-                         #:backing-scale [nonnegative-real? [backing-scale 1.0]])
-  (make-object bitmap% w h #f alpha? backing-scale))
-
-(define/top (read-bitmap [(make-alts path-string? input-port?) given-filename]
-                         [bitmap-file-kind-symbol? [kind 'unknown/alpha]]
-                         [(make-or-false color%) [bg-color #f]]
-                         [any? [complain-on-failure? #t]]
-                         #:try-@2x? [any? [try-@2x? #f]]
-                         #:backing-scale [nonnegative-real? [given-backing-scale 1.0]])
-  (define-values (filename backing-scale)
-    (cond
-     [(and try-@2x?
-           (path? given-filename)
-           (not (memq kind '(unknown/mask gif/mask png/mask))))
-      (define new-filename (bytes->path
-                            (regexp-replace #rx"([.][^.]*|)$"
-                                            (path->bytes given-filename)
-                                            #"@2x\\1")))
-      (if (file-exists? new-filename)
-          (values new-filename (* 2 given-backing-scale))
-          (values given-filename given-backing-scale))]
-     [else (values given-filename given-backing-scale)]))
-  (make-object bitmap% filename kind bg-color complain-on-failure? backing-scale))
-
-(define/top (make-monochrome-bitmap [exact-positive-integer? w]
-                                    [exact-positive-integer? h]
-                                    [(make-or-false bytes?) [bits #f]])
-  (if bits
-      (make-object bitmap% bits w h)
-      (make-object bitmap% w h #t)))
-
-(define/top (make-platform-bitmap [exact-positive-integer? w]
-                                  [exact-positive-integer? h]
-                                  #:backing-scale [nonnegative-real? [backing-scale 1.0]])
-  (case (system-type)
-    [(macosx) (make-object quartz-bitmap% w h #t backing-scale)]
-    [(windows) (make-object win32-no-hwnd-bitmap% w h backing-scale)]
-    [(unix) (make-bitmap w h #:backing-scale backing-scale)]))
-
-(define-local-member-name build-cairo-surface)
-(define win32-no-hwnd-bitmap%
-  (class bitmap%
-    (init w h backing-scale)
-    (super-make-object (make-alternate-bitmap-kind w h backing-scale))
-
-    (define s (build-cairo-surface w h backing-scale))
-    ;; erase the bitmap
-    (let ([cr (cairo_create s)])
-      (cairo_set_source_rgba cr 1.0 1.0 1.0 1.0)
-      (cairo_paint cr)
-      (cairo_destroy cr))
-
-    (define/public (build-cairo-surface w h backing-scale)
-      (let ([sw (*i backing-scale w)]
-	    [sh (*i backing-scale h)])
-	(cairo_win32_surface_create_with_dib CAIRO_FORMAT_RGB24 sw sh)))
-
-    (define/override (ok?) #t)
-    (define/override (is-color?) #t)
-    (define/override (has-alpha-channel?) #f)
-
-    (define/override (get-cairo-surface) s)
-
-    (define/override (release-bitmap-storage)
-      (atomically
-       (cairo_surface_destroy s)
-       (set! s #f)))))
-
-(define quartz-bitmap%
-  (class bitmap%
-    (init w h [with-alpha? #t] [resolution 1.0] [dest-cg #f])
-    (super-make-object (make-alternate-bitmap-kind w h resolution))
-    
-    (define s
-      (let* ([sw (*i resolution w)]
-             [sh (*i resolution h)]
-             [s (if dest-cg
-                    (cairo_quartz_surface_create_for_cg_context dest-cg sw sh)
-                    (cairo_quartz_surface_create (if with-alpha?
-                                                     CAIRO_FORMAT_ARGB32
-                                                     CAIRO_FORMAT_RGB24)
-                                                 sw
-                                                 sh))])
-        ;; initialize bitmap to empty - needed?
-        (let ([cr (cairo_create s)])
-          (cairo_set_operator cr (if with-alpha?
-                                     CAIRO_OPERATOR_CLEAR
-                                     CAIRO_OPERATOR_SOURCE))
-          (cairo_set_source_rgba cr 1.0 1.0 1.0 1.0)
-          (cairo_paint cr)
-          (cairo_destroy cr))
-        s))
-
-    (define/override (ok?) (and s #t))
-
-    (define/override (is-color?) #t)
-
-    (define has-alpha? with-alpha?)
-    (define/override (has-alpha-channel?) has-alpha?)
-
-    (define/override (get-cairo-surface) s)
-    (define/override (get-cairo-alpha-surface)
-      (if has-alpha?
-          s
-          (super get-cairo-alpha-surface)))
-
-    (define/override (release-bitmap-storage)
-      (atomically
-       (when s
-         (cairo_surface_destroy s)
-         (set! s #f))))))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/brush.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/brush.rkt
deleted file mode 100644
index 1a47625c0d..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/brush.rkt
+++ /dev/null
@@ -1,243 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/atomic
-         "../unsafe/cairo.rkt"
-         "color.rkt"
-         "syntax.rkt"
-         "local.rkt"
-         "bitmap.rkt"
-         "gradient.rkt"
-         "transform.rkt")
-
-(provide brush%
-         make-brush
-         brush-list% the-brush-list
-         brush-style-symbol?)
-
-(define (brush-style-symbol? s)
-  (memq s '(transparent solid opaque
-                        xor hilite panel
-                        bdiagonal-hatch crossdiag-hatch
-                        fdiagonal-hatch cross-hatch
-                        horizontal-hatch vertical-hatch)))
-
-(define black (send the-color-database find-color "black"))
-
-(define-local-member-name 
-  s-set-key
-  set-surface-handle-info
-  set-immutable)
-
-(defclass brush% object%
-  (define key #f)
-  (define/public (s-set-key k) (set! key k))
-
-  (define color black)
-  (properties #:check-immutable check-immutable 
-              [[brush-style-symbol? style] 'solid])
-
-  (init [(_color color) black]
-        [(_style style) 'solid]
-        [(_stipple stipple) #f]
-        [(_gradient gradient) #f]
-        [(_transformation transformation) #f])
-
-  (set! color
-        (cond
-         [(string? _color) (or (send the-color-database find-color _color) black)]
-         [(color . is-a? . color%)
-          (color->immutable-color _color)]
-         [else
-          (raise-type-error (init-name 'brush%)
-                            "string or color%"
-                            _color)]))
-  
-  (set! style
-        (if (brush-style-symbol? _style)
-            _style
-            (raise-type-error (init-name 'brush%)
-                              "brush style symbol"
-                              _style)))
-
-  (define immutable? #f)
-  (define lock-count 0)
-  (define stipple #f)
-  (define gradient #f)
-  (define transformation #f)
-  (define surface-handle #f)
-
-  (when _gradient
-    (unless (or (_gradient . is-a? . linear-gradient%)
-                (_gradient . is-a? . radial-gradient%))
-      (raise-type-error (init-name 'brush%)
-                        "linear-gradient% object, radial-gradient% object, or #f"
-                        _gradient))
-    (set! gradient _gradient))
-
-  (when _stipple
-    (unless (_stipple . is-a? . bitmap%)
-      (raise-type-error (init-name 'brush%)
-                        "bitmap% or #f"
-                        _stipple)))
-
-  (when _transformation
-    (unless (transformation-vector? _transformation)
-      (raise-type-error (init-name 'brush%)
-                        "transformation-vector"
-                        _transformation))
-    (when (or _gradient _stipple)
-      (set! transformation (transformation-vector->immutable
-                            _transformation))))
-
-  (super-new)
-
-  (when _stipple
-    (set-stipple _stipple))
-
-  (define/public (set-immutable) (set! immutable? #t))
-  (define/public (is-immutable?) (or immutable? (positive? lock-count)))
-  (define/public (adjust-lock v) (set! lock-count (+ lock-count v)))
-
-  (define/private (check-immutable s)
-    (when (or immutable? (positive? lock-count))
-      (error (method-name 'brush% s) "object is ~a"
-             (if immutable? "immutable" "locked"))))
-
-  (define/public (set-color . args)
-    (check-immutable 'set-color)
-    (case-args
-     args
-     [([color% _color])
-      (set! color (color->immutable-color _color))]
-     [([string? _color])
-      (set! color (send the-color-database find-color _color))]
-     [([byte? r] [byte? g] [byte? b])
-      (let ([c (make-object color%  r g b)])
-        (send c set-immutable)
-        (set! color c))]
-     (method-name 'brush% 'set-color)))
-
-  (define/public (get-color) color)
-  (define/public (get-gradient) gradient)
-  (define/public (get-transformation) transformation)
-
-  (def/public (get-stipple) stipple)
-  (define/public (set-stipple s [t #f])
-    (check-immutable 'set-stipple)
-    (set! stipple s)
-    (set! transformation (and s t)))
-
-  (define/public (get-surface-handle-info) surface-handle) ; local
-  (def/public (get-handle) (and surface-handle
-                                (vector-ref surface-handle 0)))
-  (define/public (set-surface-handle-info h t)
-    (set! surface-handle h)
-    (set! transformation t)))
-
-;; color style stipple gradient transformation -> brush%
-;; produce an immutable brush% object
-(define (make-brush #:color [color black]
-                    #:style [style 'solid]
-                    #:stipple [stipple #f]
-                    #:gradient [gradient #f]
-                    #:transformation [transformation #f]
-                    #:immutable? [immutable? #t])
-  (or (and (not (or stipple gradient transformation (not immutable?)))
-           (send the-brush-list find-or-create-brush color style))
-      (let ()
-        (define brush (make-object brush% color style stipple gradient transformation))
-        (when immutable?
-          (send brush set-immutable))
-        brush)))
-
-;; unsafe (and so exported by `racket/draw/unsafe/brush'):
-(provide (protect-out make-handle-brush))
-(define (make-handle-brush handle width height [t #f]
-                           #:copy? [copy? #t])
-  ;; for argument checking:
-  (define/top (make-handle-brush [cpointer? handle]
-                                 [exact-nonnegative-integer? width]
-                                 [exact-nonnegative-integer? height]
-                                 [(make-or-false transformation-vector?) t])
-    'ok)
-  (make-handle-brush handle width height t)
-  ;; arguments are ok, so proceed:
-  (define s-in (cast handle _pointer _cairo_surface_t))
-  (define s
-    (if copy?
-        (let ()
-          (define s (cairo_surface_create_similar s-in CAIRO_CONTENT_COLOR_ALPHA width height))
-          (define cr (cairo_create s))
-          (let* ([p (cairo_pattern_create_for_surface s-in)])
-            (cairo_set_source cr p)
-            (cairo_pattern_destroy p)
-            (cairo_rectangle cr 0 0 width height)
-            (cairo_fill cr)
-            (cairo_destroy cr))
-          s)
-        s-in))
-  (define b (new brush%))
-  (send b set-surface-handle-info (vector s width height
-                                          ;; cache for bitmap version:
-                                          #f 
-                                          ;; retain original if not copied:
-                                          (if copy? #f handle)) 
-        t)
-  b)
-
-(provide (protect-out surface-handle-info->bitmap))
-(define (surface-handle-info->bitmap hi)
-  (or (vector-ref hi 3)
-      (let ()
-        (define width (vector-ref hi 1))
-        (define height (vector-ref hi 2))
-        (define bm (make-bitmap width height))
-        (define s (send bm get-cairo-surface))
-        (define cr (cairo_create s))
-        (let* ([p (cairo_pattern_create_for_surface (vector-ref hi 0))])
-          (cairo_set_source cr p)
-          (cairo_pattern_destroy p)
-          (cairo_rectangle cr 0 0 width height)
-          (cairo_fill cr)
-          (cairo_destroy cr))
-        (vector-set! hi 3 bm)
-        bm)))
-
-;; ----------------------------------------
-
-(defclass brush-list% object%
-  (define brushes (make-weak-hash))
-  (super-new)
-  (define/public (find-or-create-brush . args)
-    (let-values ([(col s)
-                  (case-args
-                   args
-                   [([color% _color]
-                     [brush-style-symbol? _style])
-                    (values (color->immutable-color _color) _style)]
-                   [([string? _color]
-                     [brush-style-symbol? _style])
-                    (values (or (send the-color-database find-color _color)
-                                black)
-                            _style)]
-                   (method-name 'find-or-create-brush 'brush-list%))])
-      (let ([key (vector (send col red) (send col green) (send col blue)
-                         (send col alpha)
-                         s)])
-        (start-atomic)
-        (begin0
-          (let ([e (hash-ref brushes key #f)])
-            (or (and e
-                     (ephemeron-value e))
-                (let* ([f (make-object brush% col s)]
-                       [e (make-ephemeron key f)])
-                  (send f set-immutable)
-                  (send f s-set-key key)
-                  (hash-set! brushes key e)
-                  f)))
-          (end-atomic))))))
-
-(define the-brush-list (new brush-list%))
-
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/color.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/color.rkt
deleted file mode 100644
index 6fa87b8a72..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/color.rkt
+++ /dev/null
@@ -1,312 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/contract/base
-         (except-in "syntax.rkt" real-in integer-in)
-         "lock.rkt")
-
-(provide color%
-         make-color
-         color-red
-         color-green
-         color-blue
-         color-alpha
-         color-database<%>
-         the-color-database
-         color->immutable-color)
-
-(define-local-member-name
-  r g b a
-  set-immutable
-  s-immutable?)
-
-(define color%
-  (class object%
-    (field [r 0]
-           [g 0]
-           [b 0]
-           [a 1.0])
-    (field [s-immutable? #f])
-
-    (init-rest args)
-    (super-new)
-    (case-args
-     args
-     [() (void)]
-     [([string? s])
-      (let ([v (hash-ref colors (string-foldcase s) #f)])
-        (if v
-            (begin
-              (set! r (vector-ref v 0))
-              (set! g (vector-ref v 1))
-              (set! b (vector-ref v 2)))
-            (error 'color% "unknown color name: ~e" (car args))))]
-     [([color% c])
-      (set! r (color-red c))
-      (set! g (color-green c))
-      (set! b (color-blue c))
-      (set! a (color-alpha c))]
-     [([byte? _r] [byte? _g] [byte? _b])
-      (set! r _r)
-      (set! g _g)
-      (set! b _b)]
-     [([byte? _r] [byte? _g] [byte? _b] [(real-in 0 1) _a])
-      (set! r _r)
-      (set! g _g)
-      (set! b _b)
-      (set! a (exact->inexact _a))]
-     (init-name 'color%))
-
-    (define/public (red) r)
-    (define/public (green) g)
-    (define/public (blue) b)
-    (define/public (alpha) a)
-
-    (define/public (set rr rg rb [ra 1.0])
-      (if s-immutable?
-          (error (method-name 'color% 'set) "object is immutable")
-          (begin
-            (set! r rr)
-            (set! g rg)
-            (set! b rb)
-            (set! a (exact->inexact ra)))))
-
-    (define/public (ok?) #t)
-    (define/public (is-immutable?) s-immutable?)
-    (define/public (set-immutable) (set! s-immutable? #t))
-
-    (define/public (copy-from c)
-      (if s-immutable?
-          (error (method-name 'color% 'copy-from) "object is immutable")
-          (begin (set (color-red c) (color-green c) (color-blue c) (color-alpha c))
-                 this)))))
-
-(define color-red (class-field-accessor color% r))
-(define color-green (class-field-accessor color% g))
-(define color-blue (class-field-accessor color% b))
-(define color-alpha (class-field-accessor color% a))
-(define color-is-immutable? (class-field-accessor color% s-immutable?))
-
-;; byte byte byte real -> color%
-;; produce an immutable color% object
-(define (make-color r g b [a 1.0])
-  (define color (make-object color% r g b a))
-  (send color set-immutable)
-  color)
-
-(define (color->immutable-color c)
-  (if (color-is-immutable? c)
-      c
-      (let ([c2 (new color%)])
-        (send c2 copy-from c)
-        (send c2 set-immutable)
-        c2)))
-
-(define color-objects (make-hash))
-
-(define color-database<%>
-  (interface ()
-    [find-color (->m string? (or/c (is-a?/c color%) #f))]
-    [get-names (->m (listof string?))]))
-
-(define color-database%
-  (class* object% (color-database<%>)
-    (super-new)
-    (define/public (find-color name)
-      (let ([name (string-downcase name)])
-        (or (atomically (hash-ref color-objects name #f))
-            (let ([v (hash-ref colors (string-foldcase name) #f)])
-              (if v
-                  (let ([c (new color%)])
-                    (send c set (vector-ref v 0) (vector-ref v 1) (vector-ref v 2))
-                    (send c set-immutable)
-                    (atomically (hash-set! color-objects name c))
-                    c)
-                  #f)))))
-    (define/public (get-names)
-      (sort (hash-map colors (lambda (k v) k)) string<?))))
-
-(define the-color-database (new color-database%))
-
-(define colors
-  #hash(("aliceblue" . #(240 248 255))
-        ("antiquewhite" . #(250 235 215))
-        ("aqua" . #(0 255 255))
-        ("azure" . #(240 255 255))
-        ("beige" . #(245 245 220))
-        ("bisque" . #(255 228 196))
-        ("blanchedalmond" . #(255 235 205))
-        ("blueviolet" . #(138 43 226))
-        ("burlywood" . #(222 184 135))
-        ("cadetblue" . #(95 158 160))
-        ("chartreuse" . #(127 255 0))
-        ("chocolate" . #(210 105 30))
-        ("cornflowerblue" . #(100 149 237))
-        ("cornsilk" . #(255 248 220))
-        ("crimson" . #(220 20 60))
-        ("darkblue" . #(0 0 139))
-        ("darkcyan" . #(0 139 139))
-        ("darkgoldenrod" . #(184 134 11))
-        ("darkgray" . #(169 169 169))
-        ("darkgreen" . #(0 100 0))
-        ("darkkhaki" . #(189 183 107))
-        ("darkmagenta" . #(139 0 139))
-        ("darkolivegreen" . #(85 107 47))
-        ("darkorange" . #(255 140 0))
-        ("darkorchid" . #(153 50 204))
-        ("darkred" . #(139 0 0))
-        ("darksalmon" . #(233 150 122))
-        ("darkseagreen" . #(143 188 139))
-        ("darkslateblue" . #(72 61 139))
-        ("darkslategray" . #(47 79 79))
-        ("darkturquoise" . #(0 206 209))
-        ("darkviolet" . #(148 0 211))
-        ("deeppink" . #(255 20 147))
-        ("deepskyblue" . #(0 191 255))
-        ("dimgray" . #(105 105 105))
-        ("dodgerblue" . #(30 144 255))
-        ("floralwhite" . #(255 250 240))
-        ("forestgreen" . #(34 139 34))
-        ("fuchsia" . #(255 0 255))
-        ("gainsboro" . #(220 220 220))
-        ("ghostwhite" . #(248 248 255))
-        ("greenyellow" . #(173 255 47))
-        ("honeydew" . #(240 255 240))
-        ("hotpink" . #(255 105 180))
-        ("indianred" . #(205 92 92))
-        ("indigo" . #(75 0 130))
-        ("ivory" . #(255 255 240))
-        ("lavender" . #(230 230 250))
-        ("lavenderblush" . #(255 240 245))
-        ("lawngreen" . #(124 252 0))
-        ("lemonchiffon" . #(255 250 205))
-        ("lightblue" . #(173 216 230))
-        ("lightcoral" . #(240 128 128))
-        ("lightcyan" . #(224 255 255))
-        ("lightgoldenrodyellow" . #(250 250 210))
-        ("lightgreen" . #(144 238 144))
-        ("lightgray" . #(211 211 211))
-        ("lightpink" . #(255 182 193))
-        ("lightsalmon" . #(255 160 122))
-        ("lightseagreen" . #(32 178 170))
-        ("lightskyblue" . #(135 206 250))
-        ("lightslategray" . #(119 136 153))
-        ("lightsteelblue" . #(176 196 222))
-        ("lightyellow" . #(255 255 224))
-        ("lime" . #(0 255 0))
-        ("limegreen" . #(50 205 50))
-        ("linen" . #(250 240 230))
-        ("mediumaquamarine" . #(102 205 170))
-        ("mediumblue" . #(0 0 205))
-        ("mediumorchid" . #(186 85 211))
-        ("mediumpurple" . #(147 112 219))
-        ("mediumseagreen" . #(60 179 113))
-        ("mediumslateblue" . #(123 104 238))
-        ("mediumspringgreen" . #(0 250 154))
-        ("mediumturquoise" . #(72 209 204))
-        ("mediumvioletred" . #(199 21 133))
-        ("midnightblue" . #(25 25 112))
-        ("mintcream" . #(245 255 250))
-        ("mistyrose" . #(255 228 225))
-        ("moccasin" . #(255 228 181))
-        ("navajowhite" . #(255 222 173))
-        ("oldlace" . #(253 245 230))
-        ("olive" . #(128 128 0))
-        ("olivedrab" . #(107 142 35))
-        ("orangered" . #(255 69 0))
-        ("palegoldenrod" . #(238 232 170))
-        ("palegreen" . #(152 251 152))
-        ("paleturquoise" . #(175 238 238))
-        ("palevioletred" . #(219 112 147))
-        ("papayawhip" . #(255 239 213))
-        ("peachpuff" . #(255 218 185))
-        ("peru" . #(205 133 63))
-        ("powderblue" . #(176 224 230))
-        ("rosybrown" . #(188 143 143))
-        ("royalblue" . #(65 105 225))
-        ("saddlebrown" . #(139 69 19))
-        ("sandybrown" . #(244 164 96))
-        ("seagreen" . #(46 139 87))
-        ("seashell" . #(255 245 238))
-        ("silver" . #(192 192 192))
-        ("skyblue" . #(135 206 235))
-        ("slateblue" . #(106 90 205))
-        ("slategray" . #(112 128 144))
-        ("snow" . #(255 250 250))
-        ("springgreen" . #(0 255 127))
-        ("steelblue" . #(70 130 180))
-        ("teal" . #(0 128 128))
-        ("tomato" . #(255 99 71))
-        ("whitesmoke" . #(245 245 245))
-        ("yellowgreen" . #(154 205 50))
-        
-        ("aquamarine" . #(112  216  144))
-        ("black" . #(0  0  0))
-        ("blue" . #(0  0  255))
-        ("blue violet" . #(138  43  226))
-        ("brown" . #(132  60  36))
-        ("cadet blue" . #(96  160  160))
-        ("coral" . #(255  127  80))
-        ("cornflower blue" . #(68  64  108))
-        ("cyan" . #(0  255  255))
-        ("dark gray" . #(169  169  169))
-        ("dark green" . #(0  100  0))
-        ("dark olive green" . #(85  107  47))
-        ("dark orchid" . #(153  50  204))
-        ("dark slate blue" . #(72  61  139))
-        ("dark slate gray" . #(47  79  79))
-        ("dark turquoise" . #(0  206  209))
-        ("dim gray" . #(105  105  105))
-        ("firebrick" . #(178  34  34))
-        ("forest green" . #(34  139  34))
-        ("gold" . #(255  215  0))
-        ("goldenrod" . #(218  165  32))
-        ("gray" . #(190  190  190))
-        ("green" . #(0  255  0))
-        ("green yellow" . #(173  255  47))
-        ("indian red" . #(205  92  92))
-        ("khaki" . #(240  230  140))
-        ("light blue" . #(173  216  230))
-        ("light gray" . #(211  211  211))
-        ("light steel blue" . #(176  196  222))
-        ("lime green" . #(50  205  50))
-        ("magenta" . #(255  0  255))
-        ("maroon" . #(176  48  96))
-        ("medium aquamarine" . #(102  205  170))
-        ("medium blue" . #(0  0  205))
-        ("medium forest green" . #(107  142  35))
-        ("mediumforestgreen" . #(107  142  35))
-        ("medium goldenrod" . #(234  234  173))
-        ("mediumgoldenrod" . #(234  234  173))
-        ("medium orchid" . #(186  85  211))
-        ("medium sea green" . #(60  179  113))
-        ("medium slate blue" . #(123  104  238))
-        ("medium spring green" . #(0  250  154))
-        ("medium turquoise" . #(72  209  204))
-        ("medium violet red" . #(199  21  133))
-        ("midnight blue" . #(25  25  112))
-        ("navy" . #(36  36  140))
-        ("orange" . #(255  165  0))
-        ("orange red" . #(255  69  0))
-        ("orchid" . #(218  112  214))
-        ("pale green" . #(152  251  152))
-        ("pink" . #(255  192  203))
-        ("plum" . #(221  160  221))
-        ("purple" . #(160  32  240))
-        ("red" . #(255  0  0))
-        ("salmon" . #(250  128  114))
-        ("sea green" . #(46  139  87))
-        ("sienna" . #(160  82  45))
-        ("sky blue" . #(135  206  235))
-        ("slate blue" . #(106  90  205))
-        ("spring green" . #(0  255  127))
-        ("steel blue" . #(70  130  180))
-        ("tan" . #(210  180  140))
-        ("thistle" . #(216  191  216))
-        ("turquoise" . #(64  224  208))
-        ("violet" . #(238  130  238))
-        ("violet red" . #(208  32  144))
-        ("violetred" . #(208  32  144))
-        ("wheat" . #(245  222  179))
-        ("white" . #(255  255  255))
-        ("yellow" . #(255  255  0))
-        ("yellow green" . #(154  205  50))))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/contract.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/contract.rkt
deleted file mode 100644
index 27e7859044..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/contract.rkt
+++ /dev/null
@@ -1,440 +0,0 @@
-#lang racket/base
-
-;; Contracts for racket/draw
-
-(require racket/contract/base
-         racket/class
-         "color.rkt"
-         "point.rkt"
-         "font.rkt"
-         "font-dir.rkt"
-         "font-syms.rkt"
-         "pen.rkt"
-         "brush.rkt"
-         "gradient.rkt"
-         "region.rkt"
-         "bitmap.rkt"
-         "dc-path.rkt"
-         "dc-intf.rkt"
-         "bitmap-dc.rkt"
-         "post-script-dc.rkt"
-         "ps-setup.rkt"
-         "svg-dc.rkt"
-         "gl-config.rkt"
-         "gl-context.rkt")
-
-(provide brush-style/c
-         pen-cap-style/c
-         pen-join-style/c
-         pen-style/c
-         font-family/c
-         font-weight/c
-         font-style/c
-         transformation-vector/c
-         make-color/c
-         make-brush/c
-         make-pen/c
-         color%/c
-         point%/c
-         font%/c
-         pen%/c
-         pen-list%/c
-         brush%/c
-         brush-list%/c
-         linear-gradient%/c
-         radial-gradient%/c
-         bitmap-dc%/c
-         post-script-dc%/c
-         pdf-dc%/c
-         svg-dc%/c
-         record-dc%/c
-         region%/c
-         dc-path%/c
-         gl-config%/c
-         bitmap%/c)
-
-;; dummy values to avoid cycles
-(define-values (frame% dialog%) (values object% object%))
-
-(define brush-style/c
-  (or/c 'transparent 'solid 'opaque
-        'xor 'hilite 'panel
-        'bdiagonal-hatch 'crossdiag-hatch
-        'fdiagonal-hatch 'cross-hatch
-        'horizontal-hatch 'vertical-hatch))
-
-(define pen-cap-style/c
-  (or/c 'round 'projecting 'butt))
-
-(define pen-join-style/c
-  (or/c 'round 'bevel 'miter))
-
-(define pen-style/c
-  (or/c 'transparent 'solid 'xor 'hilite
-        'dot 'long-dash 'short-dash 'dot-dash
-        'xor-dot 'xor-long-dash 'xor-short-dash
-        'xor-dot-dash))
-
-(define transformation-vector/c
-  (vector/c (vector/c real? real? real? real? real? real?)
-            real? real? real? real? real?))
-
-(define make-color/c
-  (->* (byte? byte? byte?)
-       ((real-in 0 1))
-       (is-a?/c color%)))
-
-(define make-brush/c
-  (->* ()
-       (#:color (or/c string? (is-a?/c color%))
-        #:style brush-style/c
-        #:stipple (or/c #f (is-a?/c bitmap%))
-        #:gradient (or/c #f
-                         (is-a?/c linear-gradient%)
-                         (is-a?/c radial-gradient%))
-        #:transformation (or/c #f transformation-vector/c)
-        #:immutable? any/c)
-       (is-a?/c brush%)))
-
-(define make-pen/c
-  (->* ()
-       (#:color (or/c string? (is-a?/c color%))
-        #:width (real-in 0 255)
-        #:style pen-style/c
-        #:cap pen-cap-style/c
-        #:join pen-join-style/c
-        #:stipple (or/c #f (is-a?/c bitmap%))
-        #:immutable? any/c)
-       (is-a?/c pen%)))
-
-(define color%/c
-  (class/c
-    (alpha (->m (real-in 0 1)))
-    (red  (->m byte?))
-    (blue (->m byte?))
-    (green (->m byte?))
-    (copy-from (->m (is-a?/c color%) (is-a?/c color%)))
-    (ok? (->m boolean?))
-    (set (->*m (byte? byte? byte?)
-               ((real-in 0 1))
-               void?))))
-
-(define point%/c
-  (class/c
-    (get-x (->m real?))
-    (get-y (->m real?))
-    (set-x (->m real? void?))
-    (set-y (->m real? void?))))
-
-(define font%/c
-  (class/c
-    (get-face (->m (or/c string? #f)))
-    (get-family (->m font-family/c))
-    (get-font-id (->m exact-integer?))
-    (get-hinting (->m font-hinting/c))
-    (get-point-size (->m (integer-in 1 255)))
-    (get-size-in-pixels (->m boolean?))
-    (get-smoothing (->m font-smoothing/c))
-    (get-style (->m font-style/c))
-    (get-underlined (->m boolean?))
-    (get-weight (->m font-weight/c))
-    (screen-glyph-exists? (->*m (char?) (any/c) boolean?))))
-
-(define pen%/c
-  (class/c
-    (get-cap (->m pen-cap-style/c))
-    (get-color (->m (is-a?/c color%)))
-    (get-join (->m pen-join-style/c))
-    (get-stipple (->m (or/c (is-a?/c bitmap%) #f)))
-    (get-style (->m pen-style/c))
-    (get-width (->m (real-in 0 255)))
-    (set-cap (->m pen-cap-style/c void?))
-    (set-color (case->m
-                 (-> (or/c (is-a?/c color%) string?) void?)
-                 (-> byte? byte? byte? void?)))
-    (set-join (->m pen-join-style/c void?))
-    (set-stipple (->m (or/c (is-a?/c bitmap%) #f) void?))
-    (set-style (->m pen-style/c void?))
-    (set-width (->m (real-in 0 255) void?))))
-
-(define pen-list%/c
-  (class/c
-    (find-or-create-pen
-      (->*m ((or/c (is-a?/c color%) string?)
-             real?
-             pen-style/c)
-            (pen-cap-style/c
-              pen-join-style/c)
-            (or/c (is-a?/c pen%) #f)))))
-
-(define brush%/c
-  (class/c
-    (get-color (->m (is-a?/c color%)))
-    (get-stipple (->m (or/c (is-a?/c bitmap%) #f)))
-    (get-style (->m brush-style/c))
-    (set-color (case->m
-                 (-> (or/c (is-a?/c color%) string?) void?)
-                 (-> byte? byte? byte? void?)))
-    (set-stipple (->*m ((or/c (is-a?/c bitmap%) #f))
-                       ((or/c transformation-vector/c #f))
-                       void?))
-    (set-style (->m brush-style/c void?))))
-
-(define brush-list%/c
-  (class/c
-    (find-or-create-brush
-      (->m (or/c (is-a?/c color%) string?)
-           brush-style/c
-           (or/c (is-a?/c brush%) #f)))))
-
-(define linear-gradient%/c
-  (class/c
-    (init
-      [x0 real?]
-      [y0 real?]
-      [x1 real?]
-      [y1 real?]
-      [stops (listof (list/c real? (is-a?/c color%)))])
-    [get-line (->m (values real? real? real? real?))]
-    [get-stops (->m (listof (list/c real? (is-a?/c color%))))]))
-
-(define radial-gradient%/c
-  (class/c
-    (init
-      [x0 real?]
-      [y0 real?]
-      [r0 real?]
-      [x1 real?]
-      [y1 real?]
-      [r1 real?]
-      [stops (listof (list/c real? (is-a?/c color%)))])
-    [get-circles (->m (values real? real? real? real? real? real?))]
-    [get-stops (->m (listof (list/c real? (is-a?/c color%))))]))
-
-(define bitmap-dc%/c
-  (class/c
-    (init [bitmap (or/c (is-a?/c bitmap%) #f)])
-    [draw-bitmap-section-smooth
-      (->*m ((is-a?/c bitmap%)
-             real? real?
-             (and/c real? (not/c negative?))
-             (and/c real? (not/c negative?))
-             real? real?
-             (and/c real? (not/c negative?))
-             (and/c real? (not/c negative?)))
-            ((or/c 'solid 'opaque 'xor)
-             (or/c (is-a?/c color%) #f)
-             (or/c (is-a?/c bitmap%) #f))
-           boolean?)]
-    [get-argb-pixels
-      (->*m (exact-nonnegative-integer?
-             exact-nonnegative-integer?
-             exact-nonnegative-integer?
-             exact-nonnegative-integer?
-             (and/c bytes? (not/c immutable?)))
-            (any/c any/c)
-            void?)]
-    [get-bitmap (->m (or/c (is-a?/c bitmap%) #f))]
-    [get-pixel (->m real? real? (is-a?/c color%) boolean?)]
-    [set-argb-pixels
-      (->*m (exact-nonnegative-integer?
-             exact-nonnegative-integer?
-             exact-nonnegative-integer?
-             exact-nonnegative-integer?
-             bytes?)
-            (any/c any/c)
-            void?)]
-    [set-bitmap (->m (or/c (is-a?/c bitmap%) #f) void?)]
-    [set-pixel (->m real? real? (is-a?/c color%) void?)]))
-
-(define post-script-dc%/c
-  (class/c
-    (init [interactive any/c]
-          [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f)]
-          [use-paper-bbox any/c]
-          [as-eps any/c]
-          [width (or/c (and/c real? (not/c negative?)) #f)]
-          [height (or/c (and/c real? (not/c negative?)) #f)]
-          [output (or/c path-string? output-port? #f)])))
-
-(define pdf-dc%/c
-  (class/c
-    (init [interactive any/c]
-          [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f)]
-          [use-paper-bbox any/c]
-          [as-eps any/c]
-          [width (or/c (and/c real? (not/c negative?)) #f)]
-          [height (or/c (and/c real? (not/c negative?)) #f)]
-          [output (or/c path-string? output-port? #f)])))
-
-(define svg-dc%/c
-  (class/c
-    (init [width (or/c (and/c real? (not/c negative?)) #f)]
-          [height (or/c (and/c real? (not/c negative?)) #f)]
-          [output (or/c path-string? output-port? #f)]
-          [exists (or/c 'error 'append 'update 'can-update
-                        'replace 'truncate
-                        'must-truncate 'truncate/replace)])))
-
-(define record-dc%/c
-  (class/c
-    (init [width (>=/c 0)]
-          [height (>=/c 0)])
-    [get-recorded-datum (->m any/c)]
-    [get-recorded-procedure (->m ((is-a?/c dc<%>) . -> . void?))]))
-
-(define region%/c
-  (class/c
-    (init [dc (or/c (is-a?/c dc<%>) #f)])
-    (get-bounding-box (->m (values real? real? real? real?)))
-    (get-dc (->m (is-a?/c dc<%>)))
-    (in-region? (->m real? real? boolean?))
-    (intersect (->m (is-a?/c region%) void?))
-    (is-empty? (->m boolean?))
-    (set-arc (->m real?
-                  real?
-                  (and/c real? (not/c negative?))
-                  (and/c real? (not/c negative?))
-                  real?
-                  real?
-                  void?))
-    (set-ellipse (->m real?
-                      real?
-                      (and/c real? (not/c negative?))
-                      (and/c real? (not/c negative?))
-                      void?))
-    (set-path (->*m ((is-a?/c dc-path%))
-                    (real?
-                     real?
-                     (or/c 'odd-even 'winding))
-                    void?))
-    (set-polygon (->*m ((or/c (listof (is-a?/c point%))
-                              (listof (cons/c real? real?))))
-                       (real?
-                        real?
-                        (or/c 'odd-even 'winding))
-                       void?))
-    (set-rectangle (->m real?
-                        real?
-                        (and/c real? (not/c negative?))
-                        (and/c real? (not/c negative?))
-                        void?))
-    (set-rounded-rectangle (->*m (real?
-                                  real?
-                                  (and/c real? (not/c negative?))
-                                  (and/c real? (not/c negative?)))
-                                 (real?)
-                                 void?))
-    (subtract (->m (is-a?/c region%) void?))
-    (union (->m (is-a?/c region%) void?))
-    (xor (->m (is-a?/c region%) void?))))
-
-(define dc-path%/c
-  (class/c
-    (append (->m (is-a?/c dc-path%) void?))
-    (arc (->*m (real?
-                real?
-                real?
-                real?
-                real?
-                real?)
-               (any/c)
-               void?))
-    (close (->m void?))
-    (curve-to (->m real? real? real? real? real? real? void?))
-    (ellipse (->m real?
-                  real?
-                  (and/c real? (not/c negative?))
-                  (and/c real? (not/c negative?))
-                  void?))
-    (get-bounding-box (->m (values real? real? real? real?)))
-    (line-to (->m real? real? void?))
-    (lines (->*m ((or/c (listof (is-a?/c point%))
-                        (listof (cons/c real? real?))))
-                 (real? real?)
-                 void?))
-    (move-to (->m real? real? void?))
-    (open? (->m boolean?))
-    (rectangle (->m real?
-                    real?
-                    (and/c real? (not/c negative?))
-                    (and/c real? (not/c negative?))
-                    void?))
-    (reset (->m void?))
-    (reverse (->m void?))
-    (rotate (->m real? void?))
-    (rounded-rectangle (->*m (real?
-                              real?
-                              (and/c real? (not/c negative?))
-                              (and/c real? (not/c negative?)))
-                             (real?)
-                             void?))
-    (scale (->m real? real? void?))
-    (text-outline (->*m ((is-a?/c font%)
-                         string?
-                         real? real?)
-                        (any/c)
-                        void?))
-    (transform (->m (vector/c real? real? real? real? real? real?)
-                    void?))
-    (translate (->m real? real? void?))))
-
-(define gl-config%/c
-  (class/c
-    (get-accum-size (->m (integer-in 0 256)))
-    (get-depth-size (->m (integer-in 0 256)))
-    (get-double-buffered (->m boolean?))
-    (get-multisample-size (->m (integer-in 0 256)))
-    (get-stencil-size (->m (integer-in 0 256)))
-    (get-stereo (->m boolean?))
-    (set-accum-size (->m (integer-in 0 256) void?))
-    (set-depth-size (->m (integer-in 0 256) void?))
-    (set-double-buffered (->m any/c void?))
-    (set-multisample-size (->m (integer-in 0 256) void?))
-    (set-stencil-size (->m (integer-in 0 256) void?))
-    (set-stereo (->m any/c void?))
-    (set-share-context (->m (or/c (is-a?/c gl-context%) #f) void?))
-    (get-legacy? (->m boolean?))
-    (set-legacy? (->m any/c void?))))
-
-(define bitmap%/c
-  (class/c
-    (get-argb-pixels (->*m
-                       (exact-nonnegative-integer?
-                        exact-nonnegative-integer?
-                        exact-nonnegative-integer?
-                        exact-nonnegative-integer?
-                        (and/c bytes? (not/c immutable?)))
-                       (any/c any/c #:unscaled? any/c)
-                       void?))
-    (get-depth (->m exact-nonnegative-integer?))
-    (get-height (->m exact-nonnegative-integer?))
-    (get-loaded-mask (->m (or/c (is-a?/c bitmap%) #f)))
-    (get-width (->m exact-nonnegative-integer?))
-    (has-alpha-channel? (->m boolean?))
-    (is-color? (->m boolean?))
-    (load-file (->*m ((or/c path-string? input-port?))
-                     ((or/c 'unknown 'unknown/mask 'unknown/alpha
-                            'gif 'gif/mask 'gif/alpha
-                            'jpeg 'jpeg/alpha
-                            'png 'png/mask 'png/alpha
-                            'xbm 'xbm/alpha 'xpm 'xpm/alpha
-                            'bmp 'bmp/alpha)
-                      (or/c (is-a?/c color%) #f)
-                      any/c)
-                     boolean?))
-    (ok? (->m boolean?))
-    (save-file (->*m ((or/c path-string? output-port?)
-                      (or/c 'png 'jpeg 'xbm 'xpm 'bmp))
-                     ((integer-in 0 100)
-                      #:unscaled? any/c)
-                     boolean?))
-    (set-argb-pixels (->*m
-                       (exact-nonnegative-integer?
-                        exact-nonnegative-integer?
-                        exact-nonnegative-integer?
-                        exact-nonnegative-integer?
-                        bytes?)
-                       (any/c any/c #:unscaled? any/c)
-                       void?))
-    (set-loaded-mask (->m (is-a?/c bitmap%) void?))))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/dc-intf.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/dc-intf.rkt
deleted file mode 100644
index a5ac721b2c..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/dc-intf.rkt
+++ /dev/null
@@ -1,179 +0,0 @@
-#lang racket/base
-
-;; drawing context interface
-
-(require "bitmap.rkt"
-         "brush.rkt"
-         "color.rkt"
-         "dc-path.rkt"
-         "font.rkt"
-         "gl-context.rkt"
-         "pen.rkt"
-         "point.rkt"
-         racket/class
-         racket/contract)
-
-(provide dc<%>)
-
-;; dummy value to avoid cycles via "region.rkt"
-(define region% object%)
-
-;; repeated here from "contract.rkt" to avoid cycles
-(define pen-style/c
-  (or/c 'transparent 'solid 'xor 'hilite
-        'dot 'long-dash 'short-dash 'dot-dash
-        'xor-dot 'xor-long-dash 'xor-short-dash
-        'xor-dot-dash))
-
-(define brush-style/c
-  (or/c 'transparent 'solid 'opaque
-        'xor 'hilite 'panel
-        'bdiagonal-hatch 'crossdiag-hatch
-        'fdiagonal-hatch 'cross-hatch
-        'horizontal-hatch 'vertical-hatch))
-
-(define dc<%>
-  (interface ()
-    [cache-font-metrics-key (->m exact-integer?)]
-    [clear (->m void?)]
-    [copy (->m real? real?
-               (and/c real? (not/c negative?))
-               (and/c real? (not/c negative?))
-               real? real?
-               void?)]
-    [draw-arc (->m real? real?
-                   (and/c real? (not/c negative?))
-                   (and/c real? (not/c negative?))
-                   real? real?
-                   void?)]
-    [draw-bitmap (->*m ((is-a?/c bitmap%)
-                        real? real?)
-                       ((or/c 'solid 'opaque 'xor)
-                        (is-a?/c color%)
-                        (or/c (is-a?/c bitmap%) #f))
-                       boolean?)]
-    [draw-bitmap-section (->*m ((is-a?/c bitmap%)
-                                real? real?
-                                real? real?
-                                (and/c real? (not/c negative?))
-                                (and/c real? (not/c negative?)))
-                               ((or/c 'solid 'opaque 'xor)
-                                (is-a?/c color%)
-                                (or/c (is-a?/c bitmap%) #f))
-                               boolean?)]
-    [draw-ellipse (->m real? real?
-                       (and/c real? (not/c negative?))
-                       (and/c real? (not/c negative?))
-                       void?)]
-    [draw-line (->m real? real?
-                    real? real?
-                    void?)]
-    [draw-lines (->*m ((or/c (listof (is-a?/c point%))
-                             (listof (cons/c real? real?))))
-                      (real? real?)
-                      void?)]
-    [draw-path (->*m ((is-a?/c dc-path%))
-                     (real? real? (or/c 'odd-even 'winding))
-                     void?)]
-    [draw-point (->m real? real? void?)]
-    [draw-polygon (->*m ((or/c (listof (is-a?/c point%))
-                               (listof (cons/c real? real?))))
-                        (real? real? (or/c 'odd-even 'winding))
-                        void?)]
-    [draw-rectangle (->m real? real?
-                         (and/c real? (not/c negative?))
-                         (and/c real? (not/c negative?))
-                         void?)]
-    [draw-rounded-rectangle (->*m (real? real?
-                                         (and/c real? (not/c negative?))
-                                         (and/c real? (not/c negative?)))
-                                  (real?)
-                                  void?)]
-    [draw-spline (->m real? real? real?
-                      real? real? real?
-                      void?)]
-    [draw-text (->*m (string? real? real?)
-                     (any/c exact-nonnegative-integer? real?)
-                     void?)]
-    [end-doc (->m void?)]
-    [end-page (->m void?)]
-    [erase (->m void?)]
-    [flush (->m void?)]
-    [get-alpha (->m real?)]
-    [get-background (->m (is-a?/c color%))]
-    [get-brush (->m (is-a?/c brush%))]
-    [get-char-height (->m (and/c real? (not/c negative?)))]
-    [get-char-width (->m (and/c real? (not/c negative?)))]
-    [get-clipping-region (->m (or/c (is-a?/c region%) #f))]
-    [get-device-scale (->m (values (and/c real? (not/c negative?))
-                                   (and/c real? (not/c negative?))))]
-    [get-font (->m (is-a?/c font%))]
-    [get-gl-context (->m (or/c (is-a?/c gl-context<%>) #f))]
-    [get-initial-matrix (->m (vector/c real? real? real?
-                                       real? real? real?))]
-    [get-origin (->m (values real? real?))]
-    [get-pen (->m (is-a?/c pen%))]
-    [get-rotation (->m real?)]
-    [get-scale (->m (values real? real?))]
-    [get-size (->m (values (and/c real? (not/c negative?))
-                           (and/c real? (not/c negative?))))]
-    [get-smoothing (->m (or/c 'unsmoothed 'smoothed 'aligned))]
-    [get-text-background (->m (is-a?/c color%))]
-    [get-text-extent (->*m (string?)
-                           ((or/c (is-a?/c font%) #f)
-                            any/c
-                            exact-nonnegative-integer?)
-                           (values
-                             (and/c real? (not/c negative?))
-                             (and/c real? (not/c negative?))
-                             (and/c real? (not/c negative?))
-                             (and/c real? (not/c negative?))))]
-    [get-text-foreground (->m (is-a?/c color%))]
-    [get-text-mode (->m (or/c 'solid 'transparent))]
-    [get-transformation (->m (vector/c (vector/c real? real? real?
-                                                 real? real? real?)
-                                       real? real? real? real? real?))]
-    [glyph-exists? (->m char? boolean?)]
-    [ok? (->m boolean?)]
-    [resume-flush (->m void?)]
-    [rotate (->m real? void?)]
-    [scale (->m real? real? void?)]
-    [set-alignment-scale (->m (>/c 0.0) void?)]
-    [set-alpha (->m real? void?)]
-    [set-background (->m (or/c (is-a?/c color%) string?) void?)]
-    [set-brush (case->m (-> (is-a?/c brush%) void?)
-                        (-> (or/c (is-a?/c color%) string?)
-                            brush-style/c
-                            void?))]
-    [set-clipping-rect (->m real? real?
-                            (and/c real? (not/c negative?))
-                            (and/c real? (not/c negative?))
-                            void?)]
-    [set-clipping-region (->m (or/c (is-a?/c region%) #f) void?)]
-    [set-font (->m (is-a?/c font%) void?)]
-    [set-initial-matrix (->m (vector/c real? real? real?
-                                       real? real? real?)
-                             void?)]
-    [set-origin (->m real? real? void?)]
-    [set-pen (case->m (-> (is-a?/c pen%) void?)
-                      (-> (or/c (is-a?/c color%) string?)
-                          real?
-                          pen-style/c
-                          void?))]
-    [set-rotation (->m real? void?)]
-    [set-scale (->m real? real? void?)]
-    [set-smoothing (->m (or/c 'unsmoothed 'smoothed 'aligned) void?)]
-    [set-text-background (->m (or/c (is-a?/c color%) string?) void?)]
-    [set-text-foreground (->m (or/c (is-a?/c color%) string?) void?)]
-    [set-text-mode (->m (or/c 'solid 'transparent) void?)]
-    [set-transformation (->m (vector/c (vector/c real? real? real?
-                                                 real? real? real?)
-                                       real? real? real? real? real?)
-                             void?)]
-    [start-doc (->m string? void?)]
-    [start-page (->m void?)]
-    [suspend-flush (->m void?)]
-    [transform (->m (vector/c real? real? real? real? real? real?)
-                    void?)]
-    [translate (->m real? real? void?)]
-    [try-color (->m (is-a?/c color%) (is-a?/c color%) void?)]))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/dc-path.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/dc-path.rkt
deleted file mode 100644
index 82818bf7e4..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/dc-path.rkt
+++ /dev/null
@@ -1,453 +0,0 @@
-#lang racket/base
-
-(require "syntax.rkt"
-         racket/math
-         racket/class
-         "../unsafe/cairo.rkt"
-         "fmod.rkt"
-         "point.rkt"
-         "transform.rkt"
-         "font.rkt"
-         (only-in racket/base [append r:append] [reverse r:reverse]))
-
-(provide dc-path%
-         (protect-out do-path
-                      set-text-to-path!
-                      
-                      get-closed-points
-                      get-open-points
-                      set-closed+open-points))
-
-(define-local-member-name
-  get-closed-points
-  get-open-points
-  set-closed+open-points
-  do-path)
-
-(define 2pi (* 2.0 pi))
-(define pi/2 (/ pi 2.0))
-
-(define text-to-path #f)
-(define (set-text-to-path! proc) (set! text-to-path proc))
-
-(define dc-path%
-  (class object%
-    ;; A path is a list of pairs and vectors:
-    ;;  * The pairs correspond to points on the path
-    ;;  * A vector must be between two pairs; it specifies
-    ;;    control points for a curve between the two points.
-
-    (define closed-points null)
-    (define rev-closed-points null)
-    (define open-points null)
-    (define rev-open-points null)
-
-    (define/private (flatten-open!)
-      (unless (null? rev-open-points)
-        (set! open-points (r:append open-points (r:reverse rev-open-points)))
-        (set! rev-open-points null)))
-
-    (define/private (flatten-closed!)
-      (unless (null? rev-closed-points)
-        (set! closed-points (r:append closed-points (r:reverse rev-closed-points)))
-        (set! rev-closed-points null)))
-    
-    (define/public (get-closed-points) (flatten-closed!) closed-points)
-    (define/public (get-open-points) (flatten-open!) open-points)
-
-    (define/public (set-closed+open-points c o)
-      (define (ok-points? l)
-        (let loop ([l l])
-          (cond
-           [(null? l) #t]
-           [(pair? l)
-            (let ([p (car l)])
-              (if (pair? p)
-                  (and (real? (car p))
-                       (real? (cdr p))
-                       (loop (cdr l)))
-                  (and (vector? p)
-                       (= (vector-length p) 4)
-                       (real? (vector-ref p 0))
-                       (real? (vector-ref p 1))
-                       (real? (vector-ref p 2))
-                       (real? (vector-ref p 3))
-                       (pair? (cdr l))
-                       (pair? (cadr l))
-                       (loop (cdr l)))))])))
-      (unless (and (andmap ok-points? c) (ok-points? o))
-        (error "invalid path points"))
-      (set! closed-points c)
-      (set! open-points o))
-
-    (define/private (do-points cr l align-x align-y)
-      (let loop ([l l] [first? #t])
-        (cond
-         [(null? l) (void)]
-         [else
-          (let ([p (car l)])
-            (if (pair? p)
-                (begin
-                  (if first?
-                      (cairo_move_to cr (align-x (car p)) (align-y (cdr p)))
-                      (cairo_line_to cr (align-x (car p)) (align-y (cdr p))))
-                  (loop (cdr l) #f))
-                (let ([p2 (cadr l)])
-                  (cairo_curve_to cr 
-                                  (align-x (vector-ref p 0)) (align-y (vector-ref p 1))
-                                  (align-x (vector-ref p 2)) (align-y (vector-ref p 3))
-                                  (align-x (car p2)) (align-y (cdr p2)))
-                  (loop (cddr l) #f))))])))
-
-    (define/public (do-path cr align-x align-y)
-      (flatten-closed!)
-      (flatten-open!)
-      (for ([cp (in-list closed-points)])
-        (do-points cr cp align-x align-y)
-        (cairo_close_path cr))
-      (do-points cr open-points align-x align-y))
-
-    (define/public (append path)
-      (flatten-closed!)
-      (flatten-open!)
-      (set! closed-points (r:append closed-points (send path get-closed-points)))
-      (set! open-points (r:append open-points (send path get-open-points))))
-
-    (def/public (reset)
-      (set! open-points null)
-      (set! closed-points null)
-      (set! rev-open-points null)
-      (set! rev-closed-points null))
-
-    (def/public (reverse)
-      (flatten-closed!)
-      (flatten-open!)
-      (let ([rev-one (lambda (l)
-                       (map (lambda (p)
-                              (if (pair? p)
-                                  p
-                                  (vector (vector-ref p 2) (vector-ref p 3)
-                                          (vector-ref p 0) (vector-ref p 1))))
-                            l))])
-        (set! open-points (rev-one (r:reverse open-points)))
-        (set! closed-points (map rev-one (map r:reverse closed-points)))))
-
-    (def/public (close)
-      (flatten-open!)
-      (unless (null? open-points)
-        (set! rev-closed-points (cons open-points rev-closed-points))
-        (set! open-points null)))
-
-    (def/public (open?)
-      (or (pair? open-points)
-          (pair? rev-open-points)))
-
-    (def/public (get-bounding-box)
-      (flatten-closed!)
-      (flatten-open!)
-      (if (and (null? closed-points)
-               (null? open-points))
-          (values 0.0 0.0 0.0 0.0)
-          (let-values ([(l t r b)
-                        (let loop ([l open-points])
-                          (if (null? l)
-                              (loop (car closed-points))
-                              (let ([p (car l)])
-                                (values (car p) (cdr p)
-                                        (car p) (cdr p)))))])
-            (let-values ([(l t r b)
-                          (for*/fold ([l l]
-                                      [t t]
-                                      [r r]
-                                      [b b])
-                              ([pts (in-list (cons open-points closed-points))]
-                               [p (in-list pts)])
-                            (cond
-                             [(pair? p) (values (min l (car p))
-                                                (min t (cdr p))
-                                                (max r (car p))
-                                                (max b (cdr p)))]
-                             [else (values (min l (vector-ref p 0) (vector-ref p 2))
-                                           (min t (vector-ref p 1) (vector-ref p 3))
-                                           (max r (vector-ref p 0) (vector-ref p 2))
-                                           (max b (vector-ref p 1) (vector-ref p 3)))]))])
-              (values l t (- r l) (- b t))))))
-    
-    (define/public (do-get-path-bounding-box cr type align-x align-y)
-      (flatten-closed!)
-      (flatten-open!)
-      (if (and (null? closed-points) 
-               (null? open-points)
-               (not cr))
-          (values 0. 0. 0. 0.)
-          (let ()
-            (define cairo_op
-              (cond
-                [(eq? type 'path)   cairo_path_extents]
-                [(eq? type 'fill)   cairo_fill_extents]
-                [(eq? type 'stroke) cairo_stroke_extents]
-                [else (error 'get-tight-binding-boc "expected 'path, 'fill, or, 'stroke")]))
-            (cairo_save cr)
-            (do-path cr align-x align-y)
-            (define-values (x1 y1 x2 y2) (cairo_op cr))
-            (cairo_restore cr)
-            (values x1 y1 (- x2 x1) (- y2 y1)))))
-      
-    (define/public (move-to x y)
-      (when (or (pair? open-points)
-                (pair? rev-open-points))
-        (close))
-      (do-move-to x y))
-
-    (define/private (do-move-to x y)
-      (set! rev-open-points (list (cons (exact->inexact x) (exact->inexact y)))))
-
-    (define/public (line-to x y)
-      (unless (or (pair? open-points)
-                  (pair? rev-open-points))
-        (error (method-name 'dc-path% 'line-to) "path not yet open"))
-      (do-line-to x y))
-    
-    (define/private (do-line-to x y)
-      (set! rev-open-points (cons (cons (exact->inexact x) (exact->inexact y)) rev-open-points)))
-
-    (define/public (lines pts [x 0.0] [y 0.0])
-      (unless (or (pair? open-points)
-                  (pair? rev-open-points))
-        (error (method-name 'dc-path% 'lines) "path not yet open"))
-      (for ([p (in-list pts)])
-        (if (pair? p)
-            (do-line-to (+ x (car p)) (+ y (cdr p)))
-            (do-line-to (+ x (point-x p)) (+ y (point-y p))))))
-
-    (define/public (curve-to x1 y1 x2 y2 x3 y3)
-      (unless (or (pair? open-points)
-                  (pair? rev-open-points))
-        (error (method-name 'dc-path% 'curve-to) "path not yet open"))
-      (do-curve-to x1 y1 x2 y2 x3 y3))
-
-    (define/private (do-curve-to x1 y1 x2 y2 x3 y3)
-      (set! rev-open-points (list* (cons (exact->inexact x3) 
-                                         (exact->inexact y3))
-                                   (vector (exact->inexact x1) 
-                                           (exact->inexact y1)
-                                           (exact->inexact x2) 
-                                           (exact->inexact y2))
-                                   rev-open-points)))
-
-    (define/public (arc x y w h start end [ccw? #t])
-      (do-arc x y w h start end ccw?))
-    
-    (define/private (do-arc x y w h start end ccw?)
-      (let-values ([(start end) (if (not ccw?)
-                                    (values end start)
-                                    (values start end))])
-        (let* ([delta (- end start)]
-               [delta (cond
-                       [(delta . > . 2pi) (fmod delta 2pi)]
-                       [(delta . < . 0) (+ (fmod delta 2pi) 2pi)]
-                       [else delta])])
-          ;; delta is positive and < 2pi
-          (let ([start (if (= delta 2pi) 0.0 start)])
-            ;; Change top-left to center:
-            (let ([x (+ x (/ w 2.0))]
-                  [y (+ y (/ h 2.0))]
-                  [w (abs w)]
-                  [h (abs h)]
-                  [pts null])
-              ;; make up to 4 curves to represent the arc:
-              (let loop ([start start]
-                         [delta delta])
-                (when (positive? delta)
-                  (let ([angle (if (delta . > . pi/2)
-                                   pi/2
-                                   delta)])
-                    ;; First generate points for an arc
-                    ;; of `angle' length from -angle/2 to
-                    ;; +angle/2:
-                    (let* ([x0 (cos (/ angle 2))]
-                           [y0 (sin (/ angle 2))]
-                           [x1 (/ (- 4 x0) 3)]
-                           [y1 (/ (* (- 1 x0) (- 3 x0)) (* 3 y0))]
-                           [x2 x1]
-                           [y2 (- y1)]
-                           [x3 x0]
-                           [y3 (- y0)])
-                      ;; Rotate to start:
-                      (let* ([rotate (+ start (/ angle 2))]
-                             [xx (cos rotate)]
-                             [xy (sin rotate)]
-                             [yy xx]
-                             [yx (- xy)]
-                             [rotate-xy (lambda (x y)
-                                          (values (+ (* xx x) (* xy y))
-                                                  (+ (* yy y) (* yx x))))]
-                             [w/2 (/ w 2.0)]
-                             [h/2 (/ h 2.0)])
-                        (let*-values ([(x0 y0) (rotate-xy x0 y0)]
-                                      [(x1 y1) (rotate-xy x1 y1)]
-                                      [(x2 y2) (rotate-xy x2 y2)]
-                                      [(x3 y3) (rotate-xy x3 y3)])
-                          ;; Scale and move to match ellipse:
-                          (let ([x0 (+ (* x0 w/2) x)]
-                                [x1 (+ (* x1 w/2) x)]
-                                [x2 (+ (* x2 w/2) x)]
-                                [x3 (+ (* x3 w/2) x)]
-                                [y0 (+ (* y0 h/2) y)]
-                                [y1 (+ (* y1 h/2) y)]
-                                [y2 (+ (* y2 h/2) y)]
-                                [y3 (+ (* y3 h/2) y)])
-                            (set! pts
-                                  (cons
-                                   (if (positive? angle)
-                                       (if ccw?
-                                           (vector x0 y0 x1 y1 x2 y2 x3 y3)
-                                           (vector x3 y3 x2 y2 x1 y1 x0 y0))
-                                       (if ccw?
-                                           (vector x0 y0 x3 y3)
-                                           (vector x3 y3 x0 y0)))
-                                   pts))
-                            (loop (+ start angle)
-                                  (- delta angle)))))))))
-              (for ([v (in-list (if ccw? (r:reverse pts) pts))])
-                (if (or (pair? open-points)
-                        (pair? rev-open-points))
-                    (do-line-to (vector-ref v 0) (vector-ref v 1))
-                    (do-move-to (vector-ref v 0) (vector-ref v 1)))
-                (if (= (vector-length v) 4)
-                    (do-line-to (vector-ref v 2) (vector-ref v 3))
-                    (do-curve-to (vector-ref v 2) (vector-ref v 3)
-                                 (vector-ref v 4) (vector-ref v 5)
-                                 (vector-ref v 6) (vector-ref v 7)))))))))
-
-    (define/public (ellipse x y w h)
-      (when (open?) (close))
-      (do-arc x y w h 0 2pi #f)
-      (close))
-
-    (define/public (text-outline font str x y [combine? #f])
-      (when (open?) (close))
-      (let ([p (text-to-path font str x y combine?)])
-        (for ([a (in-list p)])
-          (case (car a)
-            [(move) (move-to (cadr a) (caddr a))]
-            [(line) (line-to (cadr a) (caddr a))]
-            [(curve) (curve-to (cadr a) (caddr a)
-                               (list-ref a 3) (list-ref a 4)
-                               (list-ref a 5) (list-ref a 6))]
-            [(close) (close)])))
-      (close))
-
-    (define/public (scale x y)
-      (unless (and (= x 1.0) (= y 1.0))
-        (flatten-open!)
-        (flatten-closed!)
-        (set! open-points (scale-points open-points x y))
-        (set! closed-points
-              (for/list ([pts (in-list closed-points)])
-                (scale-points pts x y)))))
-    (define/private (scale-points pts x y)
-      (for/list ([p (in-list pts)])
-        (if (pair? p)
-            (cons (* (car p) x)
-                  (* (cdr p) y))
-            (vector (* (vector-ref p 0) x)
-                    (* (vector-ref p 1) y)
-                    (* (vector-ref p 2) x)
-                    (* (vector-ref p 3) y)))))
-  
-    (define/public (translate x y)
-      (unless (and (zero? x) (zero? y))
-        (flatten-open!)
-        (flatten-closed!)
-        (set! open-points (translate-points open-points x y))
-        (set! closed-points
-              (for/list ([pts (in-list closed-points)])
-                (translate-points pts x y)))))
-    (define/private (translate-points pts x y)
-      (for/list ([p (in-list pts)])
-        (if (pair? p)
-            (cons (+ (car p) x)
-                  (+ (cdr p) y))
-            (vector (+ (vector-ref p 0) x)
-                    (+ (vector-ref p 1) y)
-                    (+ (vector-ref p 2) x)
-                    (+ (vector-ref p 3) y)))))
-
-    (define/public (rotate th)
-      (flatten-open!)
-      (flatten-closed!)
-      (set! open-points (rotate-points open-points th))
-      (set! closed-points
-            (for/list ([pts (in-list closed-points)])
-              (rotate-points pts th))))
-    (define/private (rotate-points pts th)
-      (if (zero? th)
-          pts
-          (for/list ([p (in-list pts)])
-            (if (pair? p)
-                (let-values ([(x y) (rotate-point th (car p) (cdr p))])
-                  (cons x y))
-                (let-values ([(x2 y2) (rotate-point th (vector-ref p 0) (vector-ref p 1))]
-                             [(x3 y3) (rotate-point th (vector-ref p 2) (vector-ref p 3))])
-                  (vector x2 y2 x3 y3))))))
-    (define/private (rotate-point th x y)
-      (let* ([cx (make-rectangular x y)]
-             [cx (make-polar (magnitude cx) (+ (angle cx) (- th)))])
-        (values (real-part cx) (imag-part cx))))
-
-    (define/public (transform m)
-      (flatten-open!)
-      (flatten-closed!)
-      (set! open-points (transform-points open-points m))
-      (set! closed-points
-            (for/list ([pts (in-list closed-points)])
-              (transform-points pts m))))
-    (define/private (transform-points pts m)
-      (for/list ([p (in-list pts)])
-        (if (pair? p)
-            (let-values ([(x y) (transform-point m (car p) (cdr p))])
-              (cons x y))
-            (let-values ([(x2 y2) (transform-point m (vector-ref p 0) (vector-ref p 1))]
-                         [(x3 y3) (transform-point m (vector-ref p 2) (vector-ref p 3))])
-              (vector x2 y2 x3 y3)))))
-    (define/private (transform-point m x y)
-      (values (+ (* x (vector-ref m 0))
-                 (* y (vector-ref m 2))
-                 (vector-ref m 4))
-              (+ (* x (vector-ref m 1))
-                 (* y (vector-ref m 3))
-                 (vector-ref m 5))))
-
-    (define/public (rectangle x y w h)
-      (when (open?) (close))
-      (move-to x y)
-      (line-to (+ x w) y)
-      (line-to (+ x w) (+ y h))
-      (line-to x (+ y h))
-      (close))
-
-    (define/public (rounded-rectangle x y w h [radius -0.25])
-      (when (open?) (close))
-      (let ([dx (min (/ w 2)
-                     (if (negative? radius)
-                         (* (min w h) (- radius))
-                         radius))]
-            [dy (min (/ h 2)
-                     (if (negative? radius)
-                         (* (min w h) (- radius))
-                         radius))])
-        (move-to (+ x (- w dx)) y)
-        (arc (+ x w) y (* -2 dx) (* 2 dy) pi/2 0.0 #f)
-        (line-to (+ x w) (+ y dy))
-        (line-to (+ x w) (+ y (- h dy)))
-        (arc (+ x w) (+ y h) (* -2 dx) (* -2 dy) 0 (- pi/2) #f)
-        (line-to (+ x (- w dx)) (+ y h))
-        (line-to (+ x dx) (+ y h))
-        (arc x (+ y h) (* 2 dx) (* -2 dy) (- pi/2) (- pi) #f)
-        (line-to x (+ y (- h dy)))
-        (line-to x (+ y dy))
-        (arc x y (* 2 dx) (* 2 dy) pi pi/2 #f)
-        (close)))
-
-    (super-new)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/dc.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/dc.rkt
deleted file mode 100644
index 1cb5fb42a3..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/dc.rkt
+++ /dev/null
@@ -1,2020 +0,0 @@
-#lang racket/base
-
-(require "syntax.rkt"
-         ffi/unsafe/atomic
-         racket/flonum
-         ffi/unsafe
-         ffi/unsafe/atomic
-         racket/math
-         racket/class
-         "local.rkt"
-         "../unsafe/cairo.rkt"
-         "../unsafe/pango.rkt"
-         "color.rkt"
-         "pen.rkt"
-         "brush.rkt"
-         "gradient.rkt"
-         "font.rkt"
-         "bitmap.rkt"
-         "region.rkt"
-         "dc-intf.rkt"
-         "dc-path.rkt"
-         "point.rkt"
-         "transform.rkt"
-         "local.rkt")
-
-(provide dc-mixin
-         dc-backend<%>
-         default-dc-backend%
-         do-set-pen!
-         do-set-brush!)
-
-(define-local-member-name
-  do-set-pen!
-  do-set-brush!
-  text-path)
-
-(define 2pi (* 2 pi))
-
-(define black (send the-color-database find-color "black"))
-
-(define (copy-color c)
-  (if (string? c)
-      (or (send the-color-database find-color c)
-          black)
-      (color->immutable-color c)))
-
-;; dc-backend : interface
-;;
-;; This is the interface that the backend specific code must implement
-(define dc-backend<%>
-  (interface ()
-    ;; get-cr : -> cairo_t or #f
-    ;;
-    ;; Gets a cairo_t created in a backend specific manner.
-    ;; We assume that no one else is using this Cairo context
-    ;; or its surface (i.e., no state will change out from user us,
-    ;; and our state won't bother anyone else).
-    get-cr
-
-    ;; release-cr : cairo_t -> void
-    ;;
-    ;; Stops using a cairo_t obtained by a get-cr
-    release-cr
-
-    ;; Ends a document
-    end-cr
-
-    ;; Overriden here; to be called by a back-end when the Cairo
-    ;; context changes
-    reset-cr
-    
-    ;; method flush-cr : -> void
-    ;;
-    ;; Queues a flushes for the context to show drawing.
-    ;; May assume create-context has
-    ;; been called before any call to flush.
-    flush-cr
-
-    ;; method init-cr-matrix : cr -> void
-    ;;
-    ;; Initializes/resets the transformation matrix
-    init-cr-matrix
-
-    ;; method init-effective-matrix : matrix -> void
-    ;;
-    ;; Like init-cr-matrix, but given a matrix
-    init-effective-matrix
-
-    ;; method reset-clip : cr -> void
-    ;;
-    ;; Resets the clipping region
-    reset-clip
-
-    ;; method get-pango : -> pango_font_desc
-    ;; 
-    ;; Gets a Pango font description for a given font
-    get-pango
-
-    ;; method collapse-bitmap-b&w? : -> boolean
-    ;;
-    ;; triggers special handling of bitmap copies to a b&w target
-    collapse-bitmap-b&w?
-
-    ;; method get-font-metrics-key : real real -> integer
-    ;; 
-    ;; Gets a font-merics key for the current scale. 0 is always a 
-    ;; safe result, but the default is to return 1 for an unscaled
-    ;; dc.
-    get-font-metrics-key
-
-    ;; dc-adjust-smoothing
-    ;; 
-    ;; Used to keep smoothing disabled for b&w contexts
-    dc-adjust-smoothing
-
-    ;; dc-adjust-cap-shape
-    ;; 
-    ;; Adjusts cap shape, used to get more consistent drawing
-    ;; in bitmaps with small pens
-    dc-adjust-cap-shape
-
-    ;; get-hairline-width
-    ;;
-    ;; Gets the pen width to use in place of 0 in 'smoothed mode
-    get-hairline-width
-
-    ;; install-color : cairo_t color<%> alpha boolean? -> void
-    ;; 
-    ;; Installs a color, which a monochrome context might reduce
-    ;;  to black or white. The boolean argument indicates whether
-    ;;  the color is for a background.
-    install-color
-
-    ;; The public get-size & get-device-scale methods:
-    get-size
-    get-device-scale
-
-    ;; set-auto-scroll : real real -> void
-    ;;
-    ;; used by a back-end to install canvas scrolling
-    set-auto-scroll
-
-    ;; can-combine-text? : real -> bool
-    ;;
-    ;; Return #t if text at given font size (already scaled)
-    ;;  looks good when drawn all at once (which allows kerning,
-    ;;  but may be spaced weirdly)
-    ;; This method is not currently used, because consistent
-    ;;  kerning is needed for libraries like Slideshow
-    can-combine-text?
-
-    ;; can-mask-bitmap? : -> bool
-    ;;
-    ;; Return #t if bitmap drawing with a mask is supported.
-    ;; It's not supported for PostScirpt output, for example.
-    can-mask-bitmap?
-
-    ;; erase : -> void
-    ;; A public method: erases all drawing
-    erase
-
-    ;; get-clear-operator : -> int
-    ;;  Gets the Cairo operator used by the default
-    ;;  `clear' implementation
-    get-clear-operator))
-
-(define default-dc-backend%
-  (class* object% (dc-backend<%>)
-
-    (define/public (get-cr) #f)
-    (define/public (release-cr cr) (void))
-    (define/public (end-cr) (void))
-    (define/public (reset-cr) (void))
-    
-    (define/public (flush-cr) (void))
-
-    (define/public (init-cr-matrix cr) (void))
-    (define/public (init-effective-matrix mx) (void))
-
-    (define/public (reset-clip cr)
-      (cairo_reset_clip cr))
-
-    (define/public (get-pango font)
-      (send font get-pango))
-
-    (define/public (get-font-metrics-key sx sy)
-      (if (and (= sx 1.0) (= sy 1.0))
-          1
-          0))
-
-    (define/public (ok?) #t)
-
-    (define/public (dc-adjust-smoothing s) s)
-    (define/public (get-hairline-width sx) (/ 1 sx))
-    (define/public (dc-adjust-cap-shape shape sx pw)
-      (if ((* pw sx) . <= . 1.0)
-          'round
-          shape))
-
-    (define/public (install-color cr c a bg?)
-      (let ([norm (lambda (v) (/ v 255.0))])
-        (cairo_set_source_rgba cr
-                               (norm (color-red c))
-                               (norm (color-green c))
-                               (norm (color-blue c))
-                               (* a (color-alpha c)))))
-
-    (define/public (collapse-bitmap-b&w?) #f)
-
-    (define/public (get-size) (values 0.0 0.0))
-    (define/public (get-device-scale) (values 1.0 1.0))
-
-    (define/public (set-auto-scroll dx dy) (void))
-
-    (define/public (can-combine-text? sz)
-      (sz . > . 32.0))
-
-    (define/public (can-mask-bitmap?)
-      #t)
-
-    (define/public (erase)
-      (void))
-
-    (define/public (get-gl-context)
-      #f)
-
-    (define/public (get-clear-operator)
-      CAIRO_OPERATOR_CLEAR)
-
-    (super-new)))
-
-(define hilite-color (make-object color% 0 0 0 0.3))
-
-(define-local-member-name
-  draw-bitmap-section/mask-offset)
-
-;; We make different font map for each smoothing
-;; kind because the smoothing choice the first
-;; time a font is used in a given map seems to stick,
-;; at least for the Quartz and Win32 back-ends.
-;; (But we create the font maps on demand.)
-;; We fold hinting in, too, as an extra factor of 2.
-;; In the case of aligned hinting on Windows, the font map
-;; might further depend on the transformation, so for that
-;; platform and ramge each element of `font-maps` is
-;;  (vector font-map xform (hash xform -> font-map))
-;; where the first two elements of the vector act as
-;; a cache for the hash-table lookup.
-(define font-maps (make-vector 8 #f))
-
-(define UNALIGNED-INDEX 4)
-(define multi-font-map-boundary
-  (case (system-type)
-    [(windows) UNALIGNED-INDEX]
-    [else 0]))
-
-(define (dc-mixin backend%)
-  (defclass* dc% backend% (dc<%>)
-    (super-new)
-
-    (inherit flush-cr get-cr release-cr end-cr init-cr-matrix init-effective-matrix
-	     get-pango
-             install-color dc-adjust-smoothing get-hairline-width dc-adjust-cap-shape
-             reset-clip
-             collapse-bitmap-b&w?
-             ok? can-mask-bitmap? get-clear-operator)
-
-    ;; Using the global lock here is troublesome, becase
-    ;; operations involving paths, regions, and text can
-    ;; take arbitrarily long. Parts of the editor infrastructure,
-    ;; meanwhile, assume that the global lock can be taken
-    ;; around actions that use the editor-canvas dc. If we
-    ;; have a separate per-dc lock, we can hit deadlock due to
-    ;; lock order.
-
-    (define-syntax-rule (with-cr default cr . body)
-      ;; Faster:
-      (begin
-        (start-atomic)
-        (let ([cr (get-cr)])
-          (if cr 
-              (begin0
-                (begin . body)
-                (release-cr cr)
-                (end-atomic))
-              (begin
-                (end-atomic)
-                default))))
-      ;; Safer:
-      #;
-      (call-as-atomic
-       (lambda ()
-         (let ([cr (get-cr)])
-           (if cr 
-	       (dynamic-wind
-		   void
-		   (lambda () . body) 
-		   (lambda () (release-cr cr)))
-               default)))))
-
-    (define/public (in-cairo-context cb)
-      (with-cr (void) cr (cb cr)))
-
-    ;; pango contexts, one per smoothing kind:
-    (define contexts (make-vector (vector-length font-maps) #f))
-    (define desc-layoutss (make-vector (vector-length font-maps) #f))
-
-    (define pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-    (define brush (send the-brush-list find-or-create-brush "white" 'solid))
-    (define font (send the-font-list find-or-create-font 12 'default))
-    (define text-fg (send the-color-database find-color "black"))
-    (define text-bg (send the-color-database find-color "white"))
-    (define text-mode 'transparent)
-    (define bg (send the-color-database find-color "white"))
-    (define pen-stipple-s #f)
-    (define brush-stipple-s #f)
-
-    (define alignment-scale 1.0)
-    (def/public (set-alignment-scale [positive-real? v])
-      (unless (= v alignment-scale)
-        (set! alignment-scale v)
-        (reset-font-cache!)
-        (reset-effective!)
-        (reset-align!)))
-
-    (define x-align-delta 0.5)
-    (define y-align-delta 0.5)
-    (define/private (reset-align!)
-      (let ([w (send pen get-width)])
-        (if (zero? w)
-            (begin
-              (set! x-align-delta 0.5)
-              (set! y-align-delta 0.5))
-            (begin
-              (set! x-align-delta (/ (bitwise-and 1 (max 1 (inexact->exact (floor (* effective-scale-x w))))) 2.0))
-              (set! y-align-delta (/ (bitwise-and 1 (max 1 (inexact->exact (floor (* effective-scale-y w))))) 2.0))))))
-
-    (define/private (sub1w w)
-      (if (aligned? smoothing)
-          (max 0.0 (- w (/ effective-scale-x)))
-          w))
-    (define/private (sub1h h)
-      (if (aligned? smoothing)
-          (max 0.0 (- h (/ effective-scale-y)))
-          h))
-
-    (def/public (set-font [font% f])
-      (set! font f))
-
-    (def/public (get-font) font)
-
-    (define matrix (make-cairo_matrix_t 1 0 0 1 0 0))
-    (define origin-x 0.0)
-    (define origin-y 0.0)
-    (define scale-x 1.0)
-    (define scale-y 1.0)
-    (define rotation 0.0)
-
-    (define scroll-dx 0.0)
-    (define scroll-dy 0.0)
-
-    (define effective-scale-x alignment-scale)
-    (define effective-scale-y alignment-scale)
-    (define effective-origin-x 0.0)
-    (define effective-origin-y 0.0)
-
-    (define current-xform (vector 1.0 0.0 0.0 1.0 0.0 0.0))
-
-    (define/public (reset-config)
-      (start-atomic)
-      (set! matrix (make-cairo_matrix_t 1 0 0 1 0 0))
-      (set! origin-x 0.0)
-      (set! origin-y 0.0)
-      (set! scale-x 1.0)
-      (set! scale-y 1.0)
-      (set! rotation 0.0)
-      (set! effective-scale-x alignment-scale)
-      (set! effective-scale-y alignment-scale)
-      (set-effective-scale-font-cached?!)
-      (set! effective-origin-x 0.0)
-      (set! effective-origin-y 0.0)
-      (let* ([mx (make-cairo_matrix_t 1 0 0 1 0 0)])
-        (init-effective-matrix mx)
-	(set! current-xform (matrix->vector mx)))
-      (set! pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-      (set! brush (send the-brush-list find-or-create-brush "white" 'solid))
-      (set! font (send the-font-list find-or-create-font 12 'default))
-      (set! text-fg (send the-color-database find-color "black"))
-      (set! text-bg (send the-color-database find-color "white"))
-      (set! text-mode 'transparent)
-      (set! bg (send the-color-database find-color "white"))
-      (set! pen-stipple-s #f)
-      (set! brush-stipple-s #f)
-      (set! x-align-delta (/ alignment-scale 2.0))
-      (set! y-align-delta (/ alignment-scale 2.0))
-      (set! smoothing 'unsmoothed)
-      (set! current-smoothing #f)
-      (set! alpha 1.0)
-      (set! clipping-region #f)
-      (end-atomic))
-
-    (define/private (reset-effective!)
-      (let* ([mx (make-cairo_matrix_t 1 0 0 1 0 0)])
-        (init-effective-matrix mx)
-        (cairo_matrix_multiply mx mx matrix)
-        (cairo_matrix_translate mx origin-x origin-y)
-        (cairo_matrix_scale mx scale-x scale-y)
-        (cairo_matrix_rotate mx (- rotation))
-        (let ([ssq (lambda (a b) (sqrt (+ (* a a) (* b b))))])
-          (set! effective-scale-x (* alignment-scale
-                                     (ssq (cairo_matrix_t-xx mx)
-                                          (cairo_matrix_t-xy mx))))
-          (set! effective-scale-y (* alignment-scale
-                                     (ssq (cairo_matrix_t-yy mx)
-                                          (cairo_matrix_t-yx mx)))))
-        (set-effective-scale-font-cached?!)
-        (set! effective-origin-x (cairo_matrix_t-x0 mx))
-        (set! effective-origin-y (cairo_matrix_t-y0 mx))
-        (let ([v (matrix->vector mx)])
-          (unless (equal? v current-xform)
-            (set! current-xform v)))))
-
-    (define/private (matrix->vector mx)
-      (vector (cairo_matrix_t-xx mx)
-	      (cairo_matrix_t-yx mx)
-	      (cairo_matrix_t-xy mx)
-	      (cairo_matrix_t-yy mx)
-	      (cairo_matrix_t-x0 mx)
-	      (cairo_matrix_t-y0 mx)))
-
-    (define/override (set-auto-scroll dx dy)
-      (unless (and (= scroll-dx (- dx))
-                   (= scroll-dy (- dy)))
-        (set! scroll-dx (- dx))
-        (set! scroll-dy (- dy))
-        (reset-matrix)))
-
-    (def/public (set-scale [real? sx] [real? sy])
-      (unless (and (equal? scale-x sx)
-                   (equal? scale-y sy))
-        (set! scale-x sx)
-        (set! scale-y sy)
-        (reset-effective!)
-        (reset-align!)
-        (reset-matrix)))
-    (def/public (get-scale) (values scale-x scale-y))
-
-    (def/public (set-origin [real? ox] [real? oy])
-      (unless (and (equal? origin-x ox)
-                   (equal? origin-y oy))
-        (set! origin-x ox)
-        (set! origin-y oy)
-        (reset-effective!)
-        (reset-matrix)))
-    (def/public (get-origin) 
-      (values origin-x origin-y))
-
-    (def/public (set-rotation [real? th])
-      (unless (and (equal? rotation th))
-        (set! rotation th)
-        (reset-effective!)
-        (reset-matrix)))
-    (def/public (get-rotation) rotation)
-
-    (def/public (translate [real? ox] [real? oy])
-      (transform (vector 1 0 0 1 ox oy)))
-    (def/public (scale [real? sx] [real? sy])
-      (transform (vector sx 0 0 sy 0 0)))
-    (def/public (rotate [real? theta])
-      (let ([s (sin (- theta))]
-            [c (cos (- theta))])
-        (transform (vector c s (- s) c 0 0))))
-
-    (def/public (transform [matrix-vector? mi])
-      (let* ([m matrix]
-             [mx (make-cairo_matrix_t 1 0 0 1 0 0)]
-             [mx2 (make-cairo_matrix_t (vector-ref mi 0)
-                                       (vector-ref mi 1)
-                                       (vector-ref mi 2)
-                                       (vector-ref mi 3)
-                                       (vector-ref mi 4)
-                                       (vector-ref mi 5))])
-        (cairo_matrix_multiply mx mx m)
-        (cairo_matrix_translate mx origin-x origin-y)
-        (cairo_matrix_scale mx scale-x scale-y)
-        (cairo_matrix_rotate mx (- rotation))
-        (cairo_matrix_multiply mx mx2 mx)
-        (set! origin-x 0.0)
-        (set! origin-y 0.0)
-        (set! scale-x 1.0)
-        (set! scale-y 1.0)
-        (set! rotation 0.0)
-        (set! matrix mx)
-        (reset-effective!)
-        (reset-matrix)))
-
-    (define/private (vector->matrix m)
-      (make-cairo_matrix_t (vector-ref m 0)
-                           (vector-ref m 1)
-                           (vector-ref m 2)
-                           (vector-ref m 3)
-                           (vector-ref m 4)
-                           (vector-ref m 5)))
-
-    (def/public (set-initial-matrix [matrix-vector? m])
-      (set! matrix (vector->matrix m))
-      (reset-effective!)
-      (reset-align!)
-      (reset-matrix))
-
-    (def/public (get-initial-matrix)
-      (let ([m matrix])
-        (vector-immutable (cairo_matrix_t-xx m)
-                          (cairo_matrix_t-yx m)
-                          (cairo_matrix_t-xy m)
-                          (cairo_matrix_t-yy m)
-                          (cairo_matrix_t-x0 m)
-                          (cairo_matrix_t-y0 m))))
-
-    (def/public (get-transformation)
-      (vector-immutable (get-initial-matrix)
-                        origin-x origin-y
-                        scale-x scale-y
-                        rotation))
-
-    (def/public (set-transformation [transformation-vector? v])
-      (set-initial-matrix (vector-ref v 0))
-      (set-origin (vector-ref v 1) (vector-ref v 2))
-      (set-scale (vector-ref v 3) (vector-ref v 4))
-      (set-rotation (vector-ref v 5)))
-
-    (define/private (do-reset-matrix cr)
-      (cairo_identity_matrix cr)
-      (init-cr-matrix cr)
-      (cairo_translate cr scroll-dx scroll-dy)
-      (cairo_transform cr matrix)
-      (cairo_translate cr origin-x origin-y)
-      (cairo_scale cr scale-x scale-y)
-      (cairo_rotate cr (- rotation)))
-    
-    (define/private (reset-matrix)
-      (with-cr
-       (void)
-       cr
-       (do-reset-matrix cr)))
-
-    (inherit get-font-metrics-key)
-    (define/public (cache-font-metrics-key)
-      (get-font-metrics-key effective-scale-x effective-scale-y))
-
-    (define/override (reset-cr cr)
-      (set! contexts (make-vector (vector-length font-maps) #f))
-      (set! desc-layoutss (make-vector (vector-length font-maps) #f))
-      (do-reset-matrix cr)
-      (when clipping-region
-        (send clipping-region install-region cr scroll-dx scroll-dy
-              (lambda (x) (align-x x)) (lambda (y) (align-y y))
-              #:init-matrix (lambda (cr) (init-cr-matrix cr)))))
-
-    (define smoothing 'unsmoothed)
-
-    (define/private (aligned? s)
-      (not (eq? s 'smoothed)))
-
-    (def/public (set-smoothing [(symbol-in unsmoothed smoothed aligned) s])
-      (set! smoothing s))
-    (def/public (get-smoothing)
-      smoothing)
-    (define/private (align-x/delta x delta)
-      (if (aligned? smoothing)
-          (/ (- (+ (floor (+ (* x effective-scale-x) effective-origin-x)) delta) 
-                effective-origin-x) 
-             effective-scale-x)
-          x))
-    (define/private (align-x x)
-      (align-x/delta x x-align-delta))
-    (define/private (align-y/delta y delta)
-      (if (aligned? smoothing)
-          (/ (- (+ (floor (+ (* y effective-scale-y) effective-origin-y)) delta) 
-                effective-origin-y) 
-             effective-scale-y)
-          y))
-    (define/private (align-y y)
-      (align-y/delta y y-align-delta))
-
-    ;; No alignment in any smoothing mode for text:
-    (define/private (text-align-x/delta x delta) x)
-    (define/private (text-align-y/delta y delta) y)
-
-    (define current-smoothing #f)
-
-    (define (set-font-antialias context smoothing hinting)
-      (let ([o (pango_cairo_context_get_font_options context)]
-            [o2 (cairo_font_options_create)])
-        (when o
-          (cairo_font_options_copy o2 o))
-        (cairo_font_options_set_antialias
-         o2 
-         (case smoothing
-           [(default) (if (eq? (system-type) 'macosx)
-                          CAIRO_ANTIALIAS_SUBPIXEL
-                          CAIRO_ANTIALIAS_DEFAULT)]
-           [(unsmoothed) CAIRO_ANTIALIAS_NONE]
-           [(partly-smoothed) CAIRO_ANTIALIAS_GRAY]
-           [(smoothed) CAIRO_ANTIALIAS_SUBPIXEL]))
-        (case hinting
-          [(aligned)
-           (cairo_font_options_set_hint_metrics o2 CAIRO_HINT_METRICS_ON)
-           (cairo_font_options_set_hint_style o2 CAIRO_HINT_STYLE_DEFAULT)]
-          [(unaligned)
-           (cairo_font_options_set_hint_metrics o2 CAIRO_HINT_METRICS_OFF)
-           (cairo_font_options_set_hint_style o2 CAIRO_HINT_STYLE_NONE)])
-        (pango_cairo_context_set_font_options context o2)
-        (cairo_font_options_destroy o2)))
-
-    (define alpha 1.0)
-    (def/public (get-alpha) alpha)
-    (def/public (set-alpha [(real-in 0.0 1.0) n])
-      (set! alpha n))
-
-    (define/public (do-set-pen! p)
-      (set! pen-stipple-s #f)
-      (let ([o pen])
-        (send p adjust-lock 1)
-        (set! pen p)
-        (send o adjust-lock -1))
-      (reset-align!))
-
-    (define/public (set-pen . args)
-      (case-args
-       args
-       [([pen% p]) (do-set-pen! p)]
-       [([(make-alts string? color%) col]
-         [pen-width? width]
-         [pen-style-symbol? style])
-        (do-set-pen! (send the-pen-list find-or-create-pen col width style))]
-       (method-name 'dc<%> 'set-pen)))
-
-    (define/public (get-pen) pen)
-
-    (define/private (pen-draws?)
-      (not (eq? (send pen get-style) 'transparent)))
-
-    (define/public (do-set-brush! b)
-      (set! brush-stipple-s #f)
-      (let ([o brush])
-        (send b adjust-lock 1)
-        (set! brush b)
-        (send o adjust-lock -1)))
-
-    (define/public (set-brush . args)
-      (case-args
-       args
-       [([brush% b]) (do-set-brush! b)]
-       [([(make-alts string? color%) col]
-         [brush-style-symbol? style])
-        (do-set-brush! (send the-brush-list find-or-create-brush col style))]
-       (method-name 'dc<%> 'set-brush)))
-
-    (define/public (get-brush) brush)
-
-    (define/private (brush-draws?)
-      (not (eq? (send brush get-style) 'transparent)))
-
-    (def/public (set-text-foreground [(make-alts color% string?) c])
-      (set! text-fg (copy-color c)))
-    (def/public (set-text-background [(make-alts color% string?) c])
-      (set! text-bg (copy-color c)))
-    (def/public (set-background [(make-alts color% string?) c])
-      (set! pen-stipple-s #f)
-      (set! brush-stipple-s #f)
-      (set! bg (copy-color c)))
-
-    (def/public (get-text-foreground) text-fg)
-    (def/public (get-text-background) text-bg)
-    (def/public (get-background) bg)
-
-    (define/override (get-size)
-      (check-ok 'get-size)
-      (super get-size))
-
-    (define/override (get-device-scale)
-      (check-ok 'get-device-scale)
-      (super get-device-scale))
-
-    (def/public (suspend-flush) (void))
-    (def/public (resume-flush) (void))
-    (def/public (flush) (void))
-
-    (def/public (set-text-mode [(symbol-in solid transparent) mode])
-      (set! text-mode mode))
-    (def/public (get-text-mode) text-mode)
-
-    (def/public (try-color [color% c] [color% dest])
-      (check-ok 'try-color)
-      (if (collapse-bitmap-b&w?)
-          (let ([v (if (= 255
-                          (color-red c)
-                          (color-green c) 
-                          (color-blue c))
-                       255
-                       0)])
-            (send dest set v v v))
-          (send dest copy-from c))
-      (void))
-
-    (define clipping-region #f)
-
-    (def/public (get-clipping-region)
-      clipping-region)
-    (def/public (set-clipping-region [(make-or-false region%) r])
-      (do-set-clipping-region r))
-    (define/private (do-set-clipping-region r)
-      (with-cr
-       (void)
-       cr
-       (when clipping-region
-         (send clipping-region lock-region -1))
-       (set! clipping-region r)
-       (reset-clip cr)
-       (when clipping-region
-         (send clipping-region lock-region 1)
-         (send clipping-region install-region cr scroll-dx scroll-dy
-               (lambda (x) (align-x x)) (lambda (y) (align-y y))
-               #:init-matrix (lambda (cr) (init-cr-matrix cr))))))
-
-    (define/private (get-current-matrix)
-      (let* ([cm (make-cairo_matrix_t (cairo_matrix_t-xx matrix)
-                                      (cairo_matrix_t-yx matrix)
-                                      (cairo_matrix_t-xy matrix)
-                                      (cairo_matrix_t-yy matrix)
-                                      (cairo_matrix_t-x0 matrix)
-                                      (cairo_matrix_t-y0 matrix))])
-        (cairo_matrix_translate cm origin-x origin-y)
-        (cairo_matrix_scale cm scale-x scale-y)
-        (cairo_matrix_rotate cm (- rotation))
-        cm))
-    
-    (define/public (get-clipping-matrix)
-      (let* ([cm (get-current-matrix)])
-        (vector (cairo_matrix_t-xx cm)
-                (cairo_matrix_t-yx cm)
-                (cairo_matrix_t-xy cm)
-                (cairo_matrix_t-yy cm)
-                (cairo_matrix_t-x0 cm)
-                (cairo_matrix_t-y0 cm))))
-
-    (def/public (set-clipping-rect [real? x] 
-                                   [real? y] 
-                                   [nonnegative-real? w]
-                                   [nonnegative-real? h])
-      (let ([r (make-object region% this)])
-        (send r set-rectangle x y w h)
-        (do-set-clipping-region r)))
-
-    (define/private (check-ok who)
-      (unless (ok?)
-        (raise-mismatch-error (method-name 'dc<%> who) "drawing context is not ok: " this)))
-
-    (define/public (clear)
-      (with-cr
-       (check-ok 'erase)
-       cr
-       (install-color cr bg alpha #t)
-       (cairo_paint cr)))
-
-    (define/override (erase)
-      (with-cr
-       (check-ok 'erase)
-       cr
-       (cairo_set_operator cr (get-clear-operator))
-       (cairo_set_source_rgba cr 1.0 1.0 1.0 1.0)
-       (cairo_paint cr)
-       (cairo_set_operator cr CAIRO_OPERATOR_OVER)))
-
-    (def/public (copy [real? x] [real? y] [nonnegative-real? w] [nonnegative-real? h]
-                      [real? x2] [real? y2])
-      (with-cr
-       (check-ok 'copy)
-       cr
-       (cairo_set_source_surface cr
-                                 (cairo_get_target cr)
-                                 (- x2 x) (- y2 y))
-       (cairo_set_operator cr CAIRO_OPERATOR_SOURCE)
-       (cairo_new_path cr)
-       (cairo_rectangle cr x2 y2 w h)
-       (cairo_fill cr)
-       (cairo_set_operator cr CAIRO_OPERATOR_OVER)))
-
-    (define/private (make-pattern-surface cr col draw)
-      (let* ([s (cairo_surface_create_similar (cairo_get_target cr)
-                                              CAIRO_CONTENT_COLOR_ALPHA
-                                              12 12)]
-             [cr2 (cairo_create s)])
-        (install-color cr2 col alpha #f)
-        (cairo_set_line_width cr2 1)
-        (cairo_set_line_cap cr CAIRO_LINE_CAP_ROUND)
-        (cairo_set_antialias cr2 (case (dc-adjust-smoothing smoothing)
-                                   [(unsmoothed) CAIRO_ANTIALIAS_NONE]
-                                   [else CAIRO_ANTIALIAS_GRAY]))
-        (draw cr2)
-        (cairo_stroke cr2)
-        (cairo_destroy cr2)
-        (let* ([p (cairo_pattern_create_for_surface s)])
-          (cairo_surface_destroy s)
-          (cairo_pattern_set_extend p CAIRO_EXTEND_REPEAT)
-          (cairo_set_source cr p)
-          (cairo_pattern_destroy p))))
-
-    (define/private (install-transformation transformation cr)
-      (when transformation
-        (cairo_identity_matrix cr)
-        (init-cr-matrix cr)
-        (cairo_translate cr scroll-dx scroll-dy)        
-        (cairo_transform cr (vector->matrix (vector-ref transformation 0)))
-        (cairo_translate cr (vector-ref transformation 1) (vector-ref transformation 2))
-        (cairo_scale cr (vector-ref transformation 3) (vector-ref transformation 4))
-        (cairo_rotate cr (- (vector-ref transformation 5)))))
-
-    (define/private (make-gradient-pattern cr gradient transformation)
-      (define p 
-        (if (is-a? gradient linear-gradient%)
-            (call-with-values (lambda () (send gradient get-line)) cairo_pattern_create_linear)
-            (call-with-values (lambda () (send gradient get-circles)) cairo_pattern_create_radial)))
-      (for ([st (send gradient get-stops)])
-          (let* ([offset (car st)]
-                 [c (cadr st)]
-                 [norm (lambda (v) (/ v 255.0))]
-                 [r (norm (color-red c))]
-                 [g (norm (color-green c))]
-                 [b (norm (color-blue c))]
-                 [a (color-alpha c)])
-            (cairo_pattern_add_color_stop_rgba p offset r g b a)))
-      (install-transformation transformation cr)
-      (cairo_set_source cr p)
-      (when transformation
-        (do-reset-matrix cr))
-      (cairo_pattern_destroy p))
-
-    ;; Stroke, fill, and flush the current path
-    (define/private (draw cr brush? pen? [do? #t])
-      (define (install-stipple st col mode transformation get put)
-        (let ([s (cond
-                  [(get) => (lambda (s) s)]
-                  [(and (not (send st is-color?))
-                        (eq? mode 'solid)
-                        (and (= 0 (color-red col))
-                             (= 0 (color-green col))
-                             (= 0 (color-blue col))
-                             (= 1.0 (color-alpha col))))
-                   (put (send st get-cairo-surface))]
-                  [(collapse-bitmap-b&w?)
-                   (put (send (bitmap-to-b&w-bitmap 
-                               st 0 0 
-                               (send st get-width) (send st get-height) mode col
-                               #f
-                               #f)
-                              get-cairo-surface))]
-                  [(and (send st is-color?)
-                        (= alpha 1.0))
-                   (put (send st get-cairo-surface))]
-                  [else
-                   (put (send (bitmap-to-argb-bitmap 
-                               st 0 0 
-                               (send st get-width) (send st get-height) 
-                               0 0 mode col alpha #f)
-                              get-cairo-surface))])])
-          (install-surface s transformation)))
-      (define (install-surface s transformation)
-        (let* ([p (cairo_pattern_create_for_surface s)])
-          (cairo_pattern_set_extend p CAIRO_EXTEND_REPEAT)
-          (install-transformation transformation cr)
-          (cairo_set_source cr p)
-          (when transformation
-            (do-reset-matrix cr))
-          (cairo_pattern_destroy p)))
-      (cairo_set_antialias cr (case (dc-adjust-smoothing smoothing)
-                                [(unsmoothed) CAIRO_ANTIALIAS_NONE]
-                                [else CAIRO_ANTIALIAS_GRAY]))
-      (when brush?
-        (let ([s (send brush get-style)])
-          (unless (eq? 'transparent s)
-            (let ([st (send brush get-stipple)]
-                  [col (send brush get-color)]
-                  [gradient (send brush get-gradient)]
-                  [handle-info (send brush get-surface-handle-info)])
-              (cond
-               [handle-info
-                (if (collapse-bitmap-b&w?)
-                    ;; convert surface to a stipple:
-                    (install-stipple (surface-handle-info->bitmap handle-info) col s
-                                     (send brush get-transformation)
-                                     (lambda () brush-stipple-s)
-                                     (lambda (v) (set! brush-stipple-s v) v))
-                    ;; normal use of surface:
-                    (install-surface (vector-ref handle-info 0) 
-                                     (send brush get-transformation)))]
-               [(and gradient
-                     (not (collapse-bitmap-b&w?)))
-                (make-gradient-pattern cr gradient (send brush get-transformation))]
-               [st
-                (install-stipple st col s 
-                                 (send brush get-transformation)
-                                 (lambda () brush-stipple-s)
-                                 (lambda (v) (set! brush-stipple-s v) v))]
-               [else
-                (let ([horiz (lambda (cr2)
-                               (cairo_move_to cr2 0 3.5)
-                               (cairo_line_to cr2 12 3.5)
-                               (cairo_move_to cr2 0 7.5)
-                               (cairo_line_to cr2 12 7.5)
-                               (cairo_move_to cr2 0 11.5)
-                               (cairo_line_to cr2 12 11.5))]
-                      [vert (lambda (cr2)
-                              (cairo_move_to cr2 3.5 0)
-                              (cairo_line_to cr2 3.5 12)
-                              (cairo_move_to cr2 7.5 0)
-                              (cairo_line_to cr2 7.5 12)
-                              (cairo_move_to cr2 11.5 0)
-                              (cairo_line_to cr2 11.5 12))]
-                      [bdiag (lambda (cr2)
-                               (for ([i (in-range -2 3)])
-                                 (let ([y (* i 6)])
-                                   (cairo_move_to cr2 -1 (+ -1 y))
-                                   (cairo_line_to cr2 13 (+ 13 y)))))]
-                      [fdiag (lambda (cr2)
-                               (for ([i (in-range -2 3)])
-                                 (let ([y (* i 6)])
-                                   (cairo_move_to cr2 13 (+ -1 y))
-                                   (cairo_line_to cr2 -1 (+ 13 y)))))])
-                  
-                  (case s
-                    [(horizontal-hatch)
-                     (make-pattern-surface
-                      cr col
-                      horiz)]
-                    [(vertical-hatch)
-                     (make-pattern-surface
-                      cr col
-                      vert)]
-                    [(cross-hatch)
-                     (make-pattern-surface
-                      cr col
-                      (lambda (cr) (horiz cr) (vert cr)))]
-                    [(bdiagonal-hatch)
-                     (make-pattern-surface
-                      cr col
-                      bdiag)]
-                    [(fdiagonal-hatch)
-                     (make-pattern-surface
-                      cr col
-                      fdiag)]
-                    [(crossdiag-hatch)
-                     (make-pattern-surface
-                      cr col
-                      (lambda (cr) (bdiag cr) (fdiag cr)))]
-                    [else
-                     (install-color cr 
-                                    (if (eq? s 'hilite) hilite-color col)
-                                    alpha
-                                    #f)]))]))
-            (cairo_fill_preserve cr))))
-      (when pen?
-        (let ([s (send pen get-style)])
-          (unless (eq? 'transparent s)
-            (let ([st (send pen get-stipple)]
-                  [col (send pen get-color)])
-              (cond
-               [st
-                (install-stipple st col s
-                                 #f
-                                 (lambda () pen-stipple-s)
-                                 (lambda (v) (set! pen-stipple-s v) v))]
-               [else
-                (install-color cr 
-                               (if (eq? s 'hilite) hilite-color col)
-                               alpha
-                               #f)]))
-            (cairo_set_line_width cr (let* ([v (send pen get-width)]
-                                            [align? (aligned? smoothing)]
-                                            [v (if align?
-                                                   (/ (floor (* effective-scale-x v)) effective-scale-x)
-                                                   v)])
-                                       (if (zero? v)
-                                           (if align?
-                                               (/ 1 effective-scale-x)
-                                               (get-hairline-width effective-scale-x))
-                                           v)))
-            (unless (or (eq? s 'solid)
-                        (eq? s 'xor))
-              (cairo_set_dash cr
-                              (let ([vec (cond
-                                          [(eq? s 'long-dash)
-                                           #(4.0 2.0)]
-                                          [(eq? s 'short-dash)
-                                           #(2.0 2.0)]
-                                          [(eq? s 'dot)
-                                           #(1.0 2.0)]
-                                          [(eq? s 'dot-dash)
-                                           #(1.0 2.0 4.0 2.0)]
-                                          [else
-                                           #()])])
-                                (let ([w (send pen get-width)])
-                                  (if (w . > . 1.0)
-                                      (list->vector
-                                       (for/list ([a (in-vector vec)])
-                                         (* a w)))
-                                      vec)))
-                              (cond
-                               [(eq? s 'long-dash) 2]
-                               [(eq? s 'short-dash) 2]
-                               [(eq? s 'dot) 2]
-                               [(eq? s 'dot-dash) 4]
-                               [else 0])))
-            (cairo_set_line_cap cr
-                                (case (dc-adjust-cap-shape (send pen get-cap)
-                                                           effective-scale-x
-                                                           (send pen get-width))
-                                  [(butt) CAIRO_LINE_CAP_BUTT]
-                                  [(round) CAIRO_LINE_CAP_ROUND]
-                                  [(projecting) CAIRO_LINE_CAP_SQUARE]))
-            (cairo_set_line_join cr
-                                 (case (send pen get-join)
-                                   [(miter) CAIRO_LINE_JOIN_MITER]
-                                   [(round) CAIRO_LINE_JOIN_ROUND]
-                                   [(bevel) CAIRO_LINE_JOIN_BEVEL]))
-            (and do? (cairo_stroke cr))
-            (unless (or (eq? s 'solid) (eq? s 'xor))
-              (cairo_set_dash cr #() 0)))))
-      (and do? (flush-cr)))
-    
-    (define/private (do-draw-arc who 
-                                 x y
-                                 width height
-                                 start-radians end-radians)
-      (with-cr 
-       (check-ok who)
-       cr
-       (let ([draw-one (lambda (align-x align-y brush? pen? sub1w sub1h)
-                         (let* ([orig-x x]
-                                [orig-y y]
-                                [x (align-x x)]
-                                [y (align-y y)]
-                                [width (- (align-x (+ orig-x width)) x)]
-                                [width (sub1w width)]
-                                [height (- (align-y (+ orig-y height)) y)]
-                                [height (sub1h height)]
-                                [radius-x (/ width 2)]
-                                [radius-y (/ height 2)]
-                                [center-x (+ x radius-x)]
-                                [center-y (+ y radius-y)])
-                           ;; Cairo arcs go clockwise, while the dc goes counterclockwise
-                           (when (and (positive? radius-x)
-                                      (positive? radius-y))
-                             (cairo_new_path cr)
-                             (cairo_save cr)
-                             (cairo_translate cr center-x center-y)
-                             (cairo_scale cr radius-x radius-y)
-                             (when brush?
-                               (cairo_move_to cr 0 0))
-                             (cairo_arc_negative cr 0 0 1
-                                                 (- start-radians)
-                                                 (- end-radians))
-                             (when brush? 
-                               (cairo_close_path cr))
-                             (cairo_restore cr)
-                             (draw cr brush? pen?))))])
-         (when (brush-draws?)
-           (draw-one (lambda (x) x) (lambda (y) y) #t #f (lambda (x) x) (lambda (x) x)))
-         (when (pen-draws?)
-           (draw-one (lambda (x) (align-x x)) (lambda (y) (align-y y)) #f #t 
-                     (lambda (x) (sub1w x)) (lambda (x) (sub1h x)))))))
-
-    (def/public (draw-arc [real? x] [real? y] [nonnegative-real? width] [nonnegative-real? height]
-                          [real? start-radians] [real? end-radians])
-      (do-draw-arc 'draw-arc x y width height start-radians end-radians))
-
-    (def/public (draw-ellipse [real? x] [real? y] [nonnegative-real? width] [nonnegative-real? height])
-      (do-draw-arc 'draw-ellipse x y width height 0 2pi))
-
-    (def/public (draw-line [real? x1] [real? y1] [real? x2] [real? y2])
-      (let ([dot (if (and (= x1 x2) (= y1 y2))
-                     0.1
-                     0)])
-        (with-cr
-         (check-ok 'draw-line)
-         cr
-         (cairo_new_path cr)
-         (cairo_move_to cr (align-x x1) (align-y y1))
-         (cairo_line_to cr (+ (align-x x2) dot) (+ (align-y y2) dot))
-         (draw cr #f #t))))
-    
-    (def/public (draw-point [real? x] [real? y])
-      (with-cr
-       (check-ok 'draw-point)
-       cr
-       (cairo_new_path cr)
-       (let ([x (align-x x)]
-             [y (align-y y)])
-         (cairo_move_to cr x y)
-         (cairo_line_to cr (+ 0.1 x) (+ 0.1 y))
-       (draw cr #f #t))))
-
-    (def/public (draw-lines [(make-alts (make-list point%) list-of-pair-of-real?) pts]
-                            [real? [x 0.0]] [real? [y 0.0]])
-      (do-draw-lines 'draw-lines pts x y #f))
-
-    (def/public (draw-polygon [(make-alts (make-list point%) list-of-pair-of-real?) pts]
-                              [real? [x 0.0]] [real? [y 0.0]]
-                              [(symbol-in odd-even winding) [fill-style 'odd-even]])
-      (do-draw-lines 'draw-polygon pts x y fill-style))
-
-    (define/public (do-draw-lines who pts x y fill-style)
-      (if (or (null? pts)
-              (null? (cdr pts)))
-          (check-ok who)
-          (with-cr
-           (check-ok who)
-           cr
-           (cairo_new_path cr)
-           (if (pair? (car pts))
-               (cairo_move_to cr (align-x (+ x (caar pts))) (align-y (+ y (cdar pts))))
-               (cairo_move_to cr (align-x (+ x (point-x (car pts)))) (align-y (+ y (point-y (car pts))))))
-           (for ([p (in-list (cdr pts))])
-             (if (pair? p)
-                 (cairo_line_to cr (align-x (+ x (car p))) (align-y (+ y (cdr p))))
-                 (cairo_line_to cr (align-x (+ x (point-x p))) (align-y (+ y (point-y p))))))
-           (when fill-style
-             (cairo_close_path cr)
-             (cairo_set_fill_rule cr (if (eq? fill-style 'winding)
-                                         CAIRO_FILL_RULE_WINDING
-                                         CAIRO_FILL_RULE_EVEN_ODD)))
-           (draw cr fill-style #t))))
-    
-    (def/public (draw-rectangle [real? x] [real? y] [nonnegative-real? width] [nonnegative-real? height])
-      (with-cr
-       (check-ok 'draw-rectangle)
-       cr
-       ;; have to do pen separate from brush for 
-       ;; both alignment and height/width adjustment
-       (let ([ax (align-x x)]
-             [ay (align-y y)])
-         (cairo_new_path cr)
-         (cairo_rectangle cr x y width height)
-         (draw cr #t #f)
-         (let ([w2 (- (align-x (+ x (sub1w width))) ax)]
-               [h2 (- (align-y (+ y (sub1h height))) ay)])
-           (when (and (positive? w2)
-                      (positive? h2))
-             (cairo_new_path cr)
-             (cairo_rectangle cr ax ay w2 h2)
-             (draw cr #f #t))))))
-
-    (def/public (draw-rounded-rectangle [real? x] [real? y] [nonnegative-real? width] [nonnegative-real? height]
-                                        [real? [radius -0.25]])
-      (with-cr
-       (check-ok 'draw-rounded-rectangle)
-       cr
-       ;; have to do pen separate from brush for 
-       ;; both alignment and height/width adjustment
-       (let ([rounded-rect
-              (lambda (x y w h align-x align-y)
-                (let ([p (new dc-path%)])
-                  (send p rounded-rectangle x y w h radius)
-                  (cairo_new_path cr)
-                  (send p do-path cr align-x align-y)))])
-         (when (brush-draws?)
-           (rounded-rect x y width height (lambda (x) x) (lambda (y) y))
-           (draw cr #t #f))
-         (when (pen-draws?)
-           (rounded-rect x y (sub1w width) (sub1h height)
-                         (lambda (x) (align-x x)) (lambda (y) (align-y y)))
-           (draw cr #f #t)))))
-    
-    (define (bounding-box-type? o) (member o '(path fill stroke)))
-    
-    (def/public (get-path-bounding-box [dc-path% path] [bounding-box-type? type])
-      (with-cr
-        (values 0. 0. 0. 0.)
-        cr
-        (let ()
-          (cairo_save cr)
-          (draw cr #t #t #f)
-          (define-values (x y w h)
-            (send path do-get-path-bounding-box cr type 
-                  (lambda (x) (align-x x)) (lambda (y) (align-y y))))
-          (cairo_restore cr)
-          (values x y w h))))
-
-    (def/public (draw-spline [real? x1] [real? y1] [real? x2] [real? y2] [real? x3] [real? y3])
-      (with-cr
-       (check-ok 'draw-spline)
-       cr
-       (cairo_new_path cr)
-       (cairo_move_to cr (align-x x1) (align-y y1))
-       (let ([x21 (/ (+ x1 x2) 2)]
-             [y21 (/ (+ y1 y2) 2)])
-         (cairo_line_to cr (align-x x21) (align-y y21))
-         (let* ([x22 (/ (+ x2 x3) 2)]
-                [y22 (/ (+ y2 y3) 2)]
-                [xm1 (/ (+ x21 x2) 2)]
-                [ym1 (/ (+ y21 y2) 2)]
-                [xm2 (/ (+ x2 x22) 2)]
-                [ym2 (/ (+ y2 y22) 2)])
-           (cairo_curve_to cr 
-                           (align-x xm1) (align-y ym1)
-                           (align-x xm2) (align-y ym2)
-                           (align-x x22) (align-y y22)))
-         (cairo_line_to cr (align-x x3) (align-x y3)))
-       (draw cr #f #t)))
-
-    (def/public (draw-path [dc-path% path]
-                           [real? [dx 0]]
-                           [real? [dy 0]]
-                           [(symbol-in odd-even winding) [fill-style 'odd-even]])
-      (with-cr
-       (check-ok 'draw-path)
-       cr
-       (cairo_save cr)
-       (cairo_set_fill_rule cr (if (eq? fill-style 'winding)
-                                   CAIRO_FILL_RULE_WINDING
-                                   CAIRO_FILL_RULE_EVEN_ODD))
-       (cairo_new_path cr)
-       (if (aligned? smoothing)
-           (begin
-             (when (brush-draws?)
-               (send path do-path cr (lambda (x) (+ dx x)) (lambda (y) (+ dy y)))
-               (draw cr #t #f))
-             (cairo_new_path cr)
-             (when (pen-draws?)
-               (send path do-path cr (lambda (x) (align-x (+ dx x))) (lambda (y) (align-y (+ dy y))))
-               (draw cr #f #t)))
-           (begin
-             (send path do-path cr (lambda (x) (+ dx x)) (lambda (y) (+ dy y)))
-             (draw cr #t #t)))
-       (cairo_restore cr)))
-
-    (def/public (draw-text [string? s] [real? x] [real? y]
-                           [any? [combine? #f]]
-                           [exact-nonnegative-integer? [offset 0]]
-                           [real? [angle 0.0]])
-      (with-cr
-       (check-ok 'draw-text)
-       cr
-       (do-text cr 'draw s x y font combine? offset angle)
-       (flush-cr)))
-
-    (define/public (text-path s x y combine?)
-      (with-cr
-       (check-ok 'draw-text)
-       cr
-       (do-text cr 'path s x y font combine? 0 0.0)
-       (cairo_copy_path cr)))
-
-    (define size-cache (make-weak-hasheq))
-    (define effective-scale-font-cached? #t)
-
-    (define/private (get-size-cache desc)
-      (or (hash-ref size-cache desc #f)
-          (let ([h (make-hasheq)])
-            (hash-set! size-cache desc h)
-            h)))
-
-    (define/private (reset-font-cache!)
-      (when (positive? (hash-count size-cache))
-        (set! size-cache (make-weak-hasheq))))
-
-    (define/private (set-effective-scale-font-cached?!)
-      (set! effective-scale-font-cached?
-            (and (= effective-scale-x alignment-scale)
-                 (= effective-scale-y alignment-scale))))
-
-    (def/public (get-text-extent [string? s] 
-                                 [(make-or-false font%) [use-font font]]
-                                 [any? [combine? #f]]
-                                 [exact-nonnegative-integer? [offset 0]])
-      (check-ok 'get-text-extent)
-      (let ([use-font (or use-font font)])
-        ;; Try to used cached size info, first:
-        (let-values ([(w h d a)
-                      (if (or combine?
-                              (not effective-scale-font-cached?))
-                          (values #f #f #f #f)
-                          (let ([cache (get-size-cache (get-pango use-font))])
-                            (if (= offset (string-length s))
-                                ;; empty string, so measure space character for height
-                                (let ([v (hash-ref cache (char->integer #\space) #f)])
-                                  (if v
-                                      (values 0 (vector-ref v 1) (vector-ref v 2) (vector-ref v 3))
-                                      (values #f #f #f #f)))
-                                ;; iterate through string
-                                (let loop ([i offset] [w 0.0] [h 0.0] [d 0.0] [a 0.0])
-                                  (if (= i (string-length s))
-                                      (values w h d a)
-                                      (let ([ch (string-ref s i)])
-                                        (let ([v (hash-ref cache (char->integer ch) #f)])
-                                          (if v
-                                              (loop (add1 i)
-                                                    (+ w (vector-ref v 0)) 
-                                                    (max h (vector-ref v 1))
-                                                    (max d (vector-ref v 2))
-                                                    (max a (vector-ref v 3)))
-                                              (values #f #f #f #f)))))))))])
-          (if w
-              (values w h d a)
-              (with-cr
-               (values 1.0 1.0 0.0 0.0)
-               cr
-               (do-text cr #f s 0 0 use-font combine? offset 0.0))))))
-
-    (define/private (get-smoothing-index font)
-      (+ (case (dc-adjust-smoothing (send font get-smoothing))
-           [(default) 0]
-           [(unsmoothed) 1]
-           [(partly-smoothed) 2]
-           [(smoothed) 3])
-         (case (send font get-hinting)
-           [(aligned) 0]
-           [(unaligned) UNALIGNED-INDEX])))
-
-    (define/private (get-context cr smoothing-index font xform)
-      (or (let ([c (vector-ref contexts smoothing-index)])
-            (and c
-                 (begin
-                   (unless (equal? xform (vector-ref c 1))
-                     (pango_cairo_update_context cr (vector-ref c 0))
-                     (vector-set! c 1 xform)))
-                 (vector-ref c 0)))
-	  (let ([c (pango_font_map_create_context
-		    (get-font-map smoothing-index xform))])
-	    (pango_cairo_update_context cr c)
-	    (vector-set! contexts smoothing-index (vector c xform))
-	    (set-font-antialias c 
-                                (dc-adjust-smoothing (send font get-smoothing)) 
-                                (send font get-hinting))
-	    c)))
-
-    (define/private (get-font-map smoothing-index xform)
-      (cond
-       [(smoothing-index . < . multi-font-map-boundary)
-	(define old-fmv (vector-ref font-maps smoothing-index))
-	(define fmv (or old-fmv (vector #f #f #hash())))
-	(unless old-fmv
-	  (vector-set! font-maps smoothing-index fmv))
-	(or (and (equal? xform (vector-ref fmv 1))
-		 (vector-ref fmv 0))
-	    (let* ([fm (hash-ref (vector-ref fmv 2) xform #f)]
-		   [new-fm (or fm
-			       (pango_cairo_font_map_new))])
-	      (vector-set! fmv 0 new-fm)
-	      (vector-set! fmv 1 xform)
-	      (unless fm
-		(define ht (vector-ref fmv 2))
-		(define new-ht
-		  ;; Limit the number of font maps that we cache:
-		  (if ((hash-count ht) . < . 8)
-		      ht
-		      #hash()))
-		(vector-set! fmv 2 (hash-set new-ht xform new-fm)))
-	      new-fm))]
-       [else
-	(define fm (vector-ref font-maps smoothing-index))
-	(cond
-	 [fm fm]
-	 [else
-	  (define fm (pango_cairo_font_map_new))
-	  (vector-set! font-maps smoothing-index fm)
-	  fm])]))
-
-    (define/private (do-text cr draw-mode s x y font combine? offset angle)
-      (let* ([s (if (zero? offset) 
-                    s
-                    (substring s offset))]
-             [blank? (string=? s "")]
-             [s (if (and (not draw-mode) blank?) " " s)]
-             [s (if (for/or ([c (in-string s)])
-                      (or (eqv? c #\uFFFE) (eqv? c #\uFFFF)))
-                    ;; Since \uFFFE and \uFFFF are not supposed to be in any
-                    ;; interchange, we must replace them away before passing a
-                    ;; string to Pango:
-                    (regexp-replace* #rx"[\uFFFE\uFFFF]" s "\uFFFD")
-                    s)]
-             [rotate? (and draw-mode (not (zero? angle)))]
-             [smoothing-index (get-smoothing-index font)]
-             [context (get-context cr smoothing-index font current-xform)])
-        (when draw-mode
-          (when (eq? text-mode 'solid)
-            (unless rotate?
-              (let-values ([(w h d a) (do-text cr #f s 0 0 font combine? 0 0.0)])
-                (install-color cr text-bg alpha #f)
-                (cairo_new_path cr)
-                (cairo_rectangle cr x y w h)
-                (cairo_fill cr))))
-          (cairo_new_path cr) ; important for underline mode
-          (install-color cr text-fg alpha #f))
-        (when rotate?
-          (cairo_save cr)
-          (cairo_translate cr x y)
-          (cairo_rotate cr (- angle)))
-        (let ([desc (get-pango font)]
-              [attrs (font->pango-attrs font)]
-              [force-hinting (case (font->hinting font)
-                               [(aligned) round]
-                               [else values])]
-              [x (if rotate? 0.0 (exact->inexact x))]
-              [y (if rotate? 0.0 (exact->inexact y))])
-          ;; We have two ways to draw text:
-          ;;  - If `combine?' (to enable kerning etc.), then we create a Pango layout
-          ;;    and draw it. This is the slow but pretty way (but not used for editors,
-          ;;    where the text needs to draw the same if it's drawn all together or
-          ;;    in pieces).
-          ;;  - If not `combine?', then we draw character by character.
-          (if combine?
-              ;; This is combine mode. It has to be a little complicated, after all,
-              ;; because we may need to implement font substitution ourselves, which
-              ;; breaks the string into multiple layouts.
-              (let loop ([s s] [draw-mode draw-mode] [measured? #f] [unrotate? rotate?]
-                         [w 0.0] [h 0.0] [d 0.0] [a 0.0])
-                (cond
-                 [(or (not s)
-                      (equal? s "")) ; can happen if last char is substituted
-                  (when unrotate? (cairo_restore cr))
-                  (values w h d a)]
-                 [else
-                  (pango_cairo_update_context cr context)
-                  (let ([layout (pango_layout_new context)]
-                        [next-s #f])
-                    (pango_layout_set_font_description layout desc)
-                    (install-attributes! layout attrs)
-                    (pango_layout_set_text layout s)
-                    (let ([next-s
-                           (if (or (not substitute-fonts?)
-                                   (zero? (pango_layout_get_unknown_glyphs_count layout)))
-                               #f
-                               ;; look for the first character in the string without a glyph
-                               (let ([ok-count
-                                      (let ([len (string-length s)])
-                                        (let loop ([lo 0] [hi (sub1 len)] [i (quotient len 2)])
-                                          (cond
-                                           [(= lo hi) lo]
-                                           [else
-                                            (pango_layout_set_text layout (substring s lo i))
-                                            (if (zero? (pango_layout_get_unknown_glyphs_count layout))
-                                                ;; ok so far, so look higher
-                                                (if (= i lo)
-                                                    lo
-                                                    (loop i hi (+ i (quotient (- hi i) 2))))
-                                                ;; still not ok; look lower
-                                                (loop lo i (+ lo (quotient (- i lo) 2))))])))])
-                                 (pango_layout_set_text layout (substring s 0 (max 1 ok-count)))
-                                 (when (zero? ok-count)
-                                   ;; find a face that works for the long character:
-                                   (install-alternate-face (string-ref s 0) layout font desc attrs context))
-                                 (substring s (max 1 ok-count))))])
-                      (cond
-                       [(and draw-mode next-s (not measured?))
-                        ;; It's going to take multiple layouts, so first gather measurements.
-                        (let-values ([(w2 h d a) (loop s #f #f #f w h d a)])
-                          ;; draw again, supplying `h', `d', and `a' for the whole line
-                          (loop s draw-mode #t unrotate? w h d a))]
-                       [else
-                        (let ([logical (make-PangoRectangle 0 0 0 0)])
-                          (pango_layout_get_extents layout #f logical)
-                          (let ([nh (/ (PangoRectangle-height logical) (exact->inexact PANGO_SCALE))]
-                                [nd (/ (- (PangoRectangle-height logical)
-                                          (pango_layout_get_baseline layout))
-                                       (exact->inexact PANGO_SCALE))])
-                            (when draw-mode
-                              (let ([bl (if measured? (- h d) (- nh nd))])
-                                (pango_layout_get_extents layout #f logical)
-                                (cairo_move_to cr 
-                                               (text-align-x/delta (+ x w) 0) 
-                                               (text-align-y/delta (+ y bl) 0))
-                                ;; Draw the text:
-                                (let ([line (pango_layout_get_line_readonly layout 0)])
-                                  (if (eq? draw-mode 'draw)
-                                      (pango_cairo_show_layout_line cr line)
-                                      (pango_cairo_layout_line_path cr line)))))
-                            (cond
-                             [(and draw-mode (not next-s))
-                              (g_object_unref layout)
-                              (when unrotate? (cairo_restore cr))]
-                             [else
-                              (let ([nw (if blank?
-                                            0.0
-                                            (force-hinting
-                                             (/ (PangoRectangle-width logical) (exact->inexact PANGO_SCALE))))]
-                                    [na 0.0])
-                                (loop next-s draw-mode measured? unrotate?
-                                      (+ w nw) (max h nh) (max d nd) (max a na)))])))])))]))
-              ;; This is character-by-character mode. It uses a cached per-character+font layout
-              ;;  object.
-              (let ([cache (if (or combine?
-                                   (not effective-scale-font-cached?))
-                               #f
-                               (get-size-cache desc))]
-                    [layouts (let ([attr-layouts (or (hash-ref (let ([t (vector-ref desc-layoutss smoothing-index)])
-                                                                 (or t
-                                                                     (let ([t (make-weak-hasheq)])
-                                                                       (vector-set! desc-layoutss smoothing-index t)
-                                                                       t)))
-                                                               desc 
-                                                               #f)
-                                                     (let ([layouts (make-hasheq)])
-                                                       (hash-set! (vector-ref desc-layoutss smoothing-index) desc layouts)
-                                                       layouts))])
-                               (or (hash-ref attr-layouts attrs #f)
-                                   (let ([layouts (make-hasheq)])
-                                     (hash-set! attr-layouts attrs layouts)
-                                     layouts)))]
-                    [xform current-xform])
-                ;; First, ensure that all layout records are ready:
-                (for ([ch (in-string s)])
-                  (let* ([layout-info
-                          (or (hash-ref layouts (char->integer ch) #f)
-                              (let ([layout (pango_layout_new context)])
-                                (pango_layout_set_font_description layout desc)
-                                (install-attributes! layout attrs)
-                                (pango_layout_set_text layout (string ch))
-                                (unless (or (not substitute-fonts?)
-                                            (zero? (pango_layout_get_unknown_glyphs_count layout)))
-                                  ;; No good glyph; look for an alternate face
-                                  (install-alternate-face ch layout font desc attrs context))
-                                ;; layout-info vector is (vector _layout _xform _run _font _glyphs)
-                                (let ([layout-info (vector layout xform #f #f #f #f)])
-                                  (extract-only-run layout layout-info)
-                                  (hash-set! layouts (char->integer ch) layout-info)
-                                  layout-info)))]
-                         [layout (vector-ref layout-info 0)])
-                    (unless (equal? xform (vector-ref layout-info 1))
-                      (pango_cairo_update_layout cr layout)
-                      (vector-set! layout-info 1 xform)
-                      (extract-only-run layout layout-info))))
-                ;; At this point, we have two options for dealing with the layouts.
-                ;; If layouts all use the same font and a single glyph, then
-                ;; build a glyph string with the right offsets and draw all the
-                ;; characters at once. That's faster, but it only works if there
-                ;; are no font substitions or other fancy glyph transformations.
-                ;; We try the fast way, and bail out to the low way if it doesn't
-                ;; work. Also, we don't bother with the fast way if there's just one
-                ;; character or if we're just measuring text.
-                (begin0
-                 (unless (and
-                          (eq? draw-mode 'draw)
-                          cache
-                          (not attrs) ; fast path doesn't handle underline
-                          ((string-length s) . > . 1)
-                          (let ([len (string-length s)]
-                                [first-v (hash-ref cache (char->integer (string-ref s 0)) #f)]
-                                [pgi-size (ctype-sizeof _PangoGlyphInfo)])
-                            ;; Check whether the fast way applies. The speed of this
-                            ;; loop directly affects the responsiveness of the DrRacket
-                            ;; editor.
-                            (let ([glyph-infos (malloc len _PangoGlyphInfo 'raw)] ;; assuming atomic until `free' below
-                                  [first-font (vector-ref (hash-ref layouts (char->integer (string-ref s 0))) 3)]
-                                  [first-ascent (and first-v (fl- (vector-ref first-v 1) (vector-ref first-v 2)))])
-                              (and
-                               (let loop ([i 0])
-                                 (or (= i len)
-                                     (let* ([ch (string-ref s i)]
-                                            [chi (char->integer ch)]
-                                            [layout-info (hash-ref layouts chi)]
-                                            [font (vector-ref layout-info 3)]
-                                            [glyphs (vector-ref layout-info 4)]
-                                            [v (hash-ref cache chi #f)])
-                                       (and font
-                                            v
-                                            ;; Need the same font for all glyphs for the fast path:
-                                            (ptr-equal? first-font font)
-                                            ;; The slow path uses a top-left corner, this fast
-                                            ;; path uses a baseline, so only use the fast path
-                                            ;; if those two are consistent:
-                                            (fl= first-ascent (fl- (vector-ref v 1) (vector-ref v 2)))
-                                            ;; Assume that the rect of the characters will pan out,
-                                            ;; and start filling in the glyph-info array:
-                                            (memcpy glyph-infos i glyphs 1 _PangoGlyphInfo)
-                                            ;; Adjust width to be consistent with measured widths
-                                            ;; used when drawing individual characters.
-                                            ;; This is `set-PangoGlyphInfo-width!', but without
-                                            ;; computing an intermediate pointer:
-                                            (ptr-set! glyph-infos _uint32 'abs (+ (* i pgi-size) 4) (vector-ref v 5))
-                                            (loop (add1 i))))))
-                               ;; If we get here, we can use the fast way:
-                               (let ([glyph-string (make-PangoGlyphString len
-                                                                          glyph-infos
-                                                                          #f)])
-                                 ;; Move into position (based on the recorded Pango-units baseline)
-                                 ;; and draw the glyphs
-                                 (cairo_move_to cr 
-                                                (text-align-x/delta x 0) 
-                                                (text-align-y/delta (+ y (/ (vector-ref first-v 4) (->fl PANGO_SCALE))) 0))
-                                 (pango_cairo_show_glyph_string cr first-font glyph-string)
-                                 (free glyph-infos)
-                                 #t)))))
-                   ;; We use the slower, per-layout way:
-                   (let* ([query-and-cache
-                           (lambda (ch layout)
-                             (let ([logical (make-PangoRectangle 0 0 0 0)])
-                               (pango_layout_get_extents layout #f logical)
-                               (let ([baseline (pango_layout_get_baseline layout)]
-                                     [orig-h (PangoRectangle-height logical)])
-                                 (let ([lw (force-hinting
-                                            (/ (PangoRectangle-width logical) 
-                                               (exact->inexact PANGO_SCALE)))]
-                                       [flh (/ orig-h (exact->inexact PANGO_SCALE))]
-                                       [ld (exact->inexact (/ (- orig-h baseline) (exact->inexact PANGO_SCALE)))]
-                                       [la 0.0])
-                                   (let ([lh (ceiling flh)])
-                                     (when cache
-                                       (hash-set! cache (char->integer ch) 
-                                                  (vector lw lh ld la 
-                                                          ;; baseline in Pango units; for fast path
-                                                          baseline
-                                                          ;; rounded width in Pango units; for fast path
-                                                          (inexact->exact
-                                                           (floor (* lw (->fl PANGO_SCALE))))
-                                                          ;; unrounded height, for slow-path alignment
-                                                          flh)))
-                                     (values lw lh ld la flh))))))]
-                          [bl
-                           (if draw-mode
-                               ;; For drawing, need to compute baseline first:
-                               (for/fold ([h 0.0]) ([ch (in-string s)])
-                                 (let ([layout (vector-ref (hash-ref layouts (char->integer ch)) 0)])
-                                   (max (let ([v (and cache (hash-ref cache (char->integer ch) #f))])
-                                          (if v
-                                              ;; Used cached size:
-                                              (- (vector-ref v 6) (vector-ref v 2))
-                                              ;; Query and record size:
-                                              (let-values ([(lw lh ld la flh) (query-and-cache ch layout)])
-                                                (- flh ld))))
-                                        h)))
-                               0.0)])
-                     (for/fold ([w 0.0] [h 0.0] [d 0.0] [a 0.0]) 
-                         ([ch (in-string s)])
-                       (let ([layout (vector-ref (hash-ref layouts (char->integer ch)) 0)])
-                         (let-values ([(lw lh ld la flh)
-                                       (let ([v (and cache (hash-ref cache (char->integer ch) #f))])
-                                         (if v
-                                             ;; Used cached size:
-                                             (values (vector-ref v 0)
-                                                     (vector-ref v 1)
-                                                     (vector-ref v 2)
-                                                     (vector-ref v 3)
-                                                     (vector-ref v 6))
-                                             ;; Query and record size:
-                                             (query-and-cache ch layout)))])
-                           (when draw-mode
-                             (cairo_move_to cr 
-                                            (text-align-x/delta (+ x w) 0) 
-                                            (text-align-y/delta (+ y bl) 0))
-                             ;; Here's the draw command, which uses most of the time in this mode:
-                             (let ([line (pango_layout_get_line_readonly layout 0)])
-                               (if (eq? draw-mode 'draw)
-                                   (pango_cairo_show_layout_line cr line)
-                                   (pango_cairo_layout_line_path cr line))))
-                           (values (if blank? 0.0 (+ w lw)) (max h lh) (max d ld) (max a la)))))))
-                 (when rotate? (cairo_restore cr))))))))
-
-    (define/private (extract-only-run layout vec)
-      (let* ([iter (pango_layout_get_iter layout)]
-             [run (pango_layout_iter_get_run_readonly iter)]
-             [done? (or (not (pango_layout_iter_next_run iter))
-                        (and (not (pango_layout_iter_get_run_readonly iter))
-                             (not (pango_layout_iter_next_run iter))))])
-        (or (and run
-                 done?
-                 (= 1 (PangoGlyphString-num_glyphs (PangoGlyphItem-glyphs run)))
-                 (begin
-                   (vector-set! vec 2 run)
-                   (vector-set! vec 3 (PangoItem-font (PangoGlyphItem-item run)))
-                   (vector-set! vec 4 (PangoGlyphString-glyphs (PangoGlyphItem-glyphs run)))
-                   (vector-set! vec 5 iter)
-                   #t))
-            (let ([old-iter (vector-ref vec 5)])
-              (pango_layout_iter_free iter)
-              (when old-iter (pango_layout_iter_free old-iter))
-              (vector-set! vec 2 #f)
-              (vector-set! vec 3 #f)
-              (vector-set! vec 4 #f)
-              (vector-set! vec 5 #f)))))
-
-    (def/public (start-doc [string? desc])
-      (check-ok 'start-doc))
-    (def/public (end-doc)
-      (check-ok 'end-doc)
-      (end-cr))
-    (def/public (start-page)
-      (check-ok 'start-page))
-    (def/public (end-page)
-      (with-cr (check-ok 'end-page) cr (cairo_show_page cr)))
-
-    (def/public (draw-bitmap [bitmap% src]
-                             [real? dest-x]
-                             [real? dest-y]
-                             [(symbol-in solid opaque xor) [style 'solid]]
-                             [(make-or-false color%) [color black]]
-                             [(make-or-false bitmap%) [mask #f]])
-      (draw-bitmap-section/mask-offset 'draw-bitmap
-                                       src 
-                                       dest-x dest-y 
-                                       0 0
-                                       (send src get-width) (send src get-height)
-                                       0 0
-                                       style color mask))
-
-    (def/public (draw-bitmap-section [bitmap% src]
-                                     [real? dest-x]
-                                     [real? dest-y]
-                                     [real? src-x]
-                                     [real? src-y]
-                                     [nonnegative-real? src-w]
-                                     [nonnegative-real? src-h]
-                                     [(symbol-in solid opaque xor) [style 'solid]]
-                                     [(make-or-false color%) [color black]]
-                                     [(make-or-false bitmap%) [mask #f]])
-      (draw-bitmap-section/mask-offset 'draw-bitmap-section
-                                       src dest-x dest-y src-x src-y src-w src-h src-x src-y
-                                       style color mask))
-
-    (define/public (draw-bitmap-section/mask-offset who
-                                                    src dest-x dest-y src-x src-y src-w src-h msrc-x msrc-y
-                                                    style color mask)
-      (check-ok who)
-      (let-values ([(src src-x src-y use-alpha)
-                    (if (and (alpha . < . 1.0)
-                             (send src is-color?)
-                             (or mask (collapse-bitmap-b&w?)))
-                        ;; need a faded source
-                        (let* ([alpha-mask (make-object bitmap% (floor src-w) (floor src-h))]
-                               [adc (make-object -bitmap-dc% alpha-mask)])
-                          (send adc set-alpha alpha)
-                          (send adc set-brush "black" 'solid)
-                          (send adc set-pen "black" 1 'transparent)
-                          (send adc draw-rectangle 0 0 src-w src-h)
-                          (send adc set-bitmap #f)
-                          (let ([tmp-bm (bitmap-to-argb-bitmap src src-x src-y src-w src-h 0 0 
-                                                               style black 1.0 alpha-mask)])
-                            (values tmp-bm 0 0 1.0)))
-                        ;; no change to source
-                        (values src src-x src-y alpha))]
-                   [(clip-mask) (and mask 
-                                     (not (can-mask-bitmap?))
-                                     (let* ([bm-w (floor src-w)]
-                                            [bm-h (floor src-h)]
-                                            [bstr (make-bytes (* bm-w bm-h 4))])
-                                       (send mask get-argb-pixels 
-                                             (inexact->exact (floor msrc-x))
-                                             (inexact->exact (floor msrc-y))
-                                             bm-w
-                                             bm-h
-                                             bstr
-                                             #t)
-                                       bstr))]
-                   [(mask) (if mask
-                               (and (can-mask-bitmap?) mask)
-                               #f)])
-        (let ([black? (or (not color)
-                          (and (= 0 (color-red color))
-                               (= 0 (color-green color))
-                               (= 0 (color-blue color))
-                               (= 1.0 (color-alpha color))))])
-          (cond
-           [(and (collapse-bitmap-b&w?)
-                 (or (send src is-color?)
-                     mask))
-            ;; Need to ensure that the result is still B&W
-            (let-values ([(tmp-bm tmp-mask) (bitmap-to-b&w-bitmap src src-x src-y src-w src-h style color mask #t)])
-              (do-draw-bitmap-section tmp-bm dest-x dest-y 0 0 src-w src-h 0 0 'solid #f #t tmp-mask 
-                                      clip-mask CAIRO_OPERATOR_SOURCE 1.0))]
-           [(and mask
-                 (or (and (or (not black?) (eq? style 'opaque))
-                          (not (send src is-color?)))
-                     (use-alpha . < . 1.0)))
-            ;; mask plus color or alpha with a color bitmap
-            (let ([tmp-bm (bitmap-to-argb-bitmap src src-x src-y src-w src-h 0 0 style color use-alpha #f)])
-              (do-draw-bitmap-section tmp-bm dest-x dest-y 0 0 src-w src-h msrc-x msrc-y 'solid #f #t mask 
-                                      clip-mask #f 1.0))]
-           [else
-            ;; Normal combination...
-            (do-draw-bitmap-section src dest-x dest-y src-x src-y src-w src-h msrc-x msrc-y
-                                    style color black? mask clip-mask #f use-alpha)]))))
-
-    (define/public (do-draw-bitmap-section src dest-x dest-y src-x src-y src-w src-h msrc-x msrc-y 
-                                           style color black? mask clip-mask op use-alpha)
-      (with-cr
-       (void)
-       cr
-       (when clip-mask
-         ;; Implement mask by clipping, because masks are not supported by the
-         ;; dc. We treat an alpha of more than 128 as opaque, and less than 128
-         ;; as transparent.
-         (cairo_save cr)
-         (let ([bm-w (floor src-w)]
-               [bm-h (floor src-h)])
-           (cairo_new_path cr)
-           (for ([j (in-range 0 bm-h)])
-             (let ([start
-                    (for/fold ([start #f]) ([i (in-range 0 bm-w)])
-                      (let ([new-on? ((bytes-ref clip-mask (* 4 (+ (* bm-w j) i))) . > . 128)])
-                        (cond
-                         [(and new-on? start) start]
-                         [new-on? i]
-                         [start
-                          (cairo_rectangle cr (+ start dest-x) (+ j dest-y) (- i start) 1)
-                          #f]
-                         [else #f])))])
-               (when start
-                 (cairo_rectangle cr (+ start dest-x) (+ j dest-y) (- bm-w start) 1))))
-           (cairo_clip cr)))
-       (let* ([color (or color black)]
-              [a-dest-x (align-x/delta dest-x 0)]
-              [a-dest-y (align-y/delta dest-y 0)]
-              [a-dest-w (- (align-x/delta (+ dest-x src-w) 0) a-dest-x)]
-              [a-dest-h (- (align-y/delta (+ dest-y src-h) 0) a-dest-y)]
-              [a-src-x (floor src-x)]
-              [a-src-y (floor src-y)]
-              [a-msrc-x (floor msrc-x)]
-              [a-msrc-y (floor msrc-y)]
-              [adjust-pattern-filter
-               (lambda (s p)
-                 (when (and (eq? smoothing 'unsmoothed)
-                            (= s 1.0))
-                   (cairo_pattern_set_filter p CAIRO_FILTER_NEAREST)))]
-              [stamp-pattern
-               (lambda (src a-src-x a-src-y)
-                 (let ([p (cairo_pattern_create_for_surface (send src get-cairo-alpha-surface))]
-                       [m (make-cairo_matrix_t 0.0 0.0 0.0 0.0 0.0 0.0)])
-                   (cairo_matrix_init_translate m (- a-src-x a-dest-x) (- a-src-y a-dest-y))
-                   (cairo_pattern_set_matrix p m)
-                   (adjust-pattern-filter 1 (cairo_get_source cr))
-                   ;; clip to the section that we're supposed to draw:
-                   (cairo_save cr)
-                   (when op (cairo_set_operator cr op))
-                   (cairo_new_path cr)
-                   (cairo_rectangle cr a-dest-x a-dest-y a-dest-w a-dest-h)
-                   (cairo_clip cr)
-                   ;; draw:
-                   (cairo_mask cr p)
-                   ;; restore clipping:
-                   (cairo_restore cr)
-                   (cairo_pattern_destroy p)))])
-         (cond
-          [(send src draw-bitmap-to cr
-                 a-src-x a-src-y
-                 a-dest-x a-dest-y
-                 a-dest-w a-dest-h
-                 alpha
-                 clipping-region)
-           (void)]
-          [(or (send src is-color?)
-               (and (not (eq? style 'opaque))
-                    (= alpha 1.0)
-                    black?
-                    (not (collapse-bitmap-b&w?))))
-           (let ([s (cairo_get_source cr)])
-             (cairo_pattern_reference s)
-             (cairo_set_source_surface cr 
-                                       (send src get-cairo-surface)
-                                       (- a-dest-x a-src-x)
-                                       (- a-dest-y a-src-y))
-             (let ([sc (send src get-cairo-device-scale)])
-               (unless (= sc 1)
-                 (let ([m (make-cairo_matrix_t 0.0 0.0 0.0 0.0 0.0 0.0)])
-                   (cairo_matrix_init_translate m 0 0)
-                   (cairo_matrix_scale m sc sc)
-                   (cairo_matrix_translate m
-                                           (- (- a-dest-x a-src-x))
-                                           (- (- a-dest-y a-src-y)))
-                   (cairo_pattern_set_matrix (cairo_get_source cr) m)))
-               (adjust-pattern-filter sc (cairo_get_source cr)))
-             (cond
-              [mask
-               (stamp-pattern mask a-msrc-x a-msrc-y)]
-              [(or (and (= 0 src-x)
-                        (= 0 src-y)
-                        (= src-w (send src get-width))
-                        (= src-h (send src get-height)))
-                   (< use-alpha 1.0))
-               ;; cairo_paint may be faster than cairo_fill
-               ;; when drawing the whole source:
-               (cairo_paint_with_alpha cr use-alpha)]
-              [else
-               (cairo_new_path cr)
-               (cairo_rectangle cr a-dest-x a-dest-y a-dest-w a-dest-h)
-               (cairo_fill cr)])
-             (cairo_set_source cr s)
-             (cairo_pattern_destroy s))]
-          [else
-           (when (eq? style 'opaque)
-             (install-color cr bg alpha #f)
-             (cairo_new_path cr)
-             (cairo_rectangle cr a-dest-x a-dest-y a-dest-w a-dest-h)
-             (cairo_fill cr))
-           (install-color cr color alpha #f)
-           (stamp-pattern src a-src-x a-src-y)])
-         (when clip-mask
-           (cairo_restore cr))
-         (flush-cr)))
-      #t)
-
-    (define/private (bitmap-to-b&w-bitmap src src-x src-y src-w src-h style color mask result-mask?)
-      (let* ([bm-w (inexact->exact (ceiling src-w))]
-             [bm-h (inexact->exact (ceiling src-h))]
-             [tmp-bm (make-object bitmap% bm-w bm-h #f #t)]
-             [tmp-mask (and result-mask?
-                            (make-object bitmap% bm-w bm-h #f #t))]
-             [tmp-dc (make-object -bitmap-dc% tmp-bm)])
-        (send tmp-dc set-background bg)
-        (send tmp-dc draw-bitmap-section src 0 0 src-x src-y src-w src-h style color mask)
-        (send tmp-dc set-bitmap #f)
-        (let* ([bstr (make-bytes (* bm-w bm-h 4))]
-               [mask-bstr (if result-mask?
-                              (make-bytes (* bm-w bm-h 4))
-                              bstr)])
-          (send tmp-bm get-argb-pixels 0 0 bm-w bm-h bstr)
-          (for ([i (in-range 0 (bytes-length bstr) 4)])
-            (let ([v (if (= (bytes-ref bstr i) 255)
-                         (if (and (= 255 (bytes-ref bstr (+ i 1)))
-                                  (= 255 (bytes-ref bstr (+ i 2)))
-                                  (= 255 (bytes-ref bstr (+ i 3))))
-                             255
-                             0)
-                         255)])
-              (let ([old-v (bytes-ref bstr i)])
-                (bytes-set! bstr i (- 255 v))
-                (bytes-set! mask-bstr i (if (= old-v 255)
-                                            255
-                                            0)))
-              (bytes-set! bstr (+ i 1) v)
-              (bytes-set! bstr (+ i 2) v)
-              (bytes-set! bstr (+ i 3) v)))
-          (send tmp-bm set-argb-pixels 0 0 bm-w bm-h bstr)
-          (when result-mask?
-            (send tmp-mask set-argb-pixels 0 0 bm-w bm-h mask-bstr))
-          (if result-mask?
-              (values tmp-bm tmp-mask)
-              tmp-bm))))
-    
-    (define/private (bitmap-to-argb-bitmap src src-x src-y src-w src-h msrc-x msrc-y 
-                                           style color alpha mask) 
-      (let* ([bm-w (inexact->exact (ceiling src-w))]
-             [bm-h (inexact->exact (ceiling src-h))]
-             [tmp-bm (make-object bitmap% src-w src-h #f #t)]
-             [tmp-dc (make-object -bitmap-dc% tmp-bm)])
-        (send tmp-dc set-alpha alpha)
-        (send tmp-dc set-background bg)
-        (send tmp-dc draw-bitmap-section/mask-offset 'internal src 0 0 src-x src-y src-w src-h msrc-x msrc-y
-              style color mask)
-        (send tmp-dc set-bitmap #f)
-        tmp-bm))
-
-    (def/public (glyph-exists? [char? c])
-      (and
-       (not (eqv? c #\uFFFF))
-       (not (eqv? c #\uFFFE))
-       (with-cr
-        #f
-        cr
-        (let ([desc (get-pango font)]
-              [attrs (send font get-pango-attrs)]
-              [context (or (for/or ([c (in-vector contexts)])
-                             (and c (vector-ref c 0)))
-                           (pango_cairo_create_context cr))])
-          (let ([layout (pango_layout_new context)])
-            (pango_layout_set_font_description layout desc)
-            (pango_layout_set_text layout (string c))
-            (pango_cairo_update_layout cr layout)
-            (begin0
-             (or (zero? (pango_layout_get_unknown_glyphs_count layout))
-                 (and substitute-fonts?
-                      (install-alternate-face c layout font desc attrs context)
-                      (zero? (pango_layout_get_unknown_glyphs_count layout))))
-             (g_object_unref layout)))))))
-    
-    (def/public (get-char-width)
-      (or (with-cr
-           10.0
-           cr
-           (get-font-metric cr pango_font_metrics_get_approximate_char_width))
-          (let-values ([(w h d a) (get-text-extent "X")])
-            w)))
-
-    (def/public (get-char-height)
-      (or (with-cr
-           12.0
-           cr
-           (get-font-metric cr (lambda (m)
-                                 (+ (pango_font_metrics_get_ascent m)
-                                    (pango_font_metrics_get_descent m)))))
-          (let-values ([(w h d a) (get-text-extent "X")])
-            h)))
-
-    (define/private (get-font-metric cr sel)
-      (let* ([desc (get-pango font)]
-	     [attrs (send font get-pango-attrs)]
-	     [index (get-smoothing-index font)]
-	     [context (get-context cr index font current-xform)]
-	     [fontmap (get-font-map index current-xform)]
-	     [font (pango_font_map_load_font fontmap context desc)])
-          (and font ;; else font match failed
-               (let ([metrics (pango_font_get_metrics font (pango_language_get_default))])
-                 (let ([v (sel metrics)])
-                   (pango_font_metrics_unref metrics)
-                   (/ v (exact->inexact PANGO_SCALE)))))))
-
-    (void))
-
-  dc%)
-
-(set-text-to-path!
- (lambda (font str x y combine?)
-   (define tmp-bm (make-object bitmap% 10 10))
-   (define tmp-dc (make-object -bitmap-dc% tmp-bm))
-   (send tmp-dc set-font font)
-   (define path (send tmp-dc text-path str x y combine?))
-   (begin0
-    (cairo-path->list path)
-    (cairo_path_destroy path))))
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/define.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/define.rkt
deleted file mode 100644
index ea6b4303ae..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/define.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         ffi/unsafe)
-
-(provide define-definer
-         define-private-definer
-         define-enum
-         define/provide)
-
-(define-syntax define-enum
-  (syntax-rules ()
-    [(_ n) (begin)]
-    [(_ n id . ids) (begin
-                      (define id n)
-                      (provide id)
-                      (define-enum (+ n 1) . ids))]))
-(define-syntax-rule (define/provide id val)
-  (begin
-    (define id val)
-    (provide id)))
-
-(define-syntax-rule (skip id) (begin))
-
-(define-syntax-rule (define-definer LIB ffi-lib) 
-  (define-definer* LIB ffi-lib #t))
-(define-syntax-rule (define-private-definer LIB ffi-lib) 
-  (define-definer* LIB ffi-lib #f))
-
-(define (make-not-found id)
-  (lambda args
-    (error id "implementation not found; arguments where ~e" args)))
-
-(define (trace id proc)
-  proc
-  #;
-  (lambda args
-    (printf "~s\n" id)
-    (apply proc args)))
-
-(define-syntax (define-definer* stx)
-  (syntax-case stx ()
-    [(_ LIB ffi-lib p?)
-     (let ([make-id
-            (lambda (tmpl)
-              (datum->syntax #'LIB
-                             (string->symbol (format tmpl (syntax-e #'LIB)))
-                             #'LIB))])
-       (with-syntax ([define-LIB/private (make-id "define-~a/private")]
-                     [define-LIB (make-id "define-~a")]
-                     [PROVIDE (if (syntax-e #'p?)
-                                  #'provide
-                                  #'skip)])
-         #`(begin
-             (define-syntax define-LIB/private
-               (syntax-rules ()
-                 [(_ id c-id type fail #:wrap wrapper)
-                  (define id (trace 'c-id (wrapper (get-ffi-obj 'c-id ffi-lib type fail))))]
-                 [(_ id c-id type fail)
-                  (define-LIB/private id c-id type fail #:wrap values)]
-                 [(_ id type fail #:wrap wrapper)
-                  (define-LIB/private id id type fail #:wrap wrapper)]
-                 [(_ id type fail)
-                  (define-LIB/private id id type fail #:wrap values)]
-                 [(_ id type #:wrap wrapper)
-                  (define-LIB/private id id type (lambda () (make-not-found 'id)) #:wrap wrapper)]
-                 [(_ id type)
-                  (define-LIB/private id id type (lambda () (make-not-found 'id)) #:wrap values)]))
-
-             (define-syntax define-LIB
-               (syntax-rules ()
-                 [(_ id type default #:wrap wrapper)
-                  (begin
-                    (PROVIDE id)
-                    (define-LIB/private id id type (lambda () default) #:wrap wrapper))]
-                 [(_ id type #:wrap wrapper)
-                  (define-LIB id type (make-not-found 'id) #:wrap wrapper)]
-                 [(_ id type)
-                  (define-LIB id type (make-not-found 'id) #:wrap values)]
-                 [(_ id type default)
-                  (define-LIB id type default #:wrap values)])))))]))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/fmod.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/fmod.rkt
deleted file mode 100644
index 526b2b1d30..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/fmod.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require ffi/unsafe)
-
-(provide fmod)
-(define fmod (get-ffi-obj 'fmod #f (_fun _double _double -> _double)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/font-dir.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/font-dir.rkt
deleted file mode 100644
index de26f57173..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/font-dir.rkt
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/contract/base
-         "lock.rkt"
-         "font-syms.rkt")
-
-(provide font-name-directory<%>
-         the-font-name-directory
-         get-family-builtin-face)
-
-(define font-name-directory%
-  (class object%
-
-    (define table (make-hash))
-    (define reverse-table (make-hash))
-    (define ps-table (make-hash))
-    (define screen-table (make-hash))
-
-    (define/private (intern val)
-      (atomically
-       (hash-ref table val (lambda ()
-                             (let ([n (add1 (hash-count table))])
-                               (hash-set! table val n)
-                               (hash-set! reverse-table n val)
-                               n)))))
-
-    (for-each (lambda  (s) (intern s))
-              '(default decorative roman script
-                 swiss modern symbol system))
-
-    (define/public (find-family-default-font-id family)
-      (intern family))
-
-    (define/public (find-or-create-font-id name family)
-      (intern (cons name family)))
-
-    (define/public (get-face-name id)
-      (let ([v (atomically (hash-ref reverse-table id #f))])
-        (and v (pair? v) (car v))))
-    
-    (define/public (get-family id)
-      (let ([v (atomically (hash-ref reverse-table id #f))])
-        (or (and (pair? v) (cdr v))
-            (and (symbol? v) v)
-            'default)))
-
-    (define/public (get-font-id name family)
-      (atomically (hash-ref table (cons string family) 0)))
-
-    (define/private (default-font s)
-      (case s
-        [(modern) (case (system-type)
-                    [(windows macosx) "Courier New"]
-                    [else "Monospace"])]
-        [(roman) (case (system-type)
-                   [(windows) "Times New Roman"]
-                   [(macosx) "Times"]
-                   [else "Serif"])]
-        [(decorative swiss) (case (system-type)
-                              [(windows) "Arial"]
-                              [else "Helvetica"])]
-        [(script) (case (system-type)
-                    [(macosx) "Apple Chancery, Italic"]
-		    [(windows) "Palatino Linotype, Italic"]
-                    [else "Chancery"])]
-        [(symbol) "Symbol"]
-        [else (case (system-type)
-		[(windows) "Tahoma"]
-                [(macosx) "Lucida Grande"]
-                [else "Sans"])]))
-
-    (define/public (get-post-script-name id w s)
-      (let ([s (atomically
-                (or (hash-ref ps-table (list id w s) #f)
-                    (hash-ref reverse-table id #f)))])
-        (cond
-         [(pair? s) (car s)]
-         [(symbol? s) (default-font s)]
-         [else "Serif"])))
-
-    (define/public (get-screen-name id w s)
-      (let ([s (atomically
-                (or (hash-ref screen-table (list id w s) #f)
-                    (hash-ref reverse-table id #f)))])
-        (cond
-         [(pair? s) (car s)]
-         [(symbol? s) (default-font s)]
-         [else "Serif"])))
-
-    (define/public (set-post-script-name id w s name)
-      (atomically (hash-set! ps-table (list id w s) name)))
-
-    (define/public (set-screen-name id w s name)
-      (atomically (hash-set! screen-table (list id w s) name)))
-
-    (super-new)))
-
-(define font-name-directory<%>
-  (interface ()
-    [find-family-default-font-id (->m font-family/c exact-integer?)]
-    [fint-or-create-font-id (->m string? font-family/c exact-integer?)]
-    [get-face-name (->m exact-integer? (or/c string? #f))]
-    [get-family (->m exact-integer? font-family/c)]
-    [get-font-id (->m string? font-family/c exact-integer?)]
-    [get-post-script-name
-     (->m exact-integer? font-weight/c font-style/c (or/c string? #f))]
-    [get-screen-name
-     (->m exact-integer? font-weight/c font-style/c (or/c string? #f))]
-    [set-post-script-name
-     (->m exact-integer? font-weight/c font-style/c string? any)]
-    [set-screen-name
-     (->m exact-integer? font-weight/c font-style/c string? any)]))
-
-(define the-font-name-directory (new font-name-directory%))
-
-(define (get-family-builtin-face family)
-  (unless (memq family '(default decorative roman script swiss modern system symbol))
-    (raise-type-error 'get-family-builtin-face "family symbol" family))
-  (let ([id (send the-font-name-directory find-family-default-font-id family)])
-    (send the-font-name-directory get-screen-name id 'normal 'normal)))
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/font-syms.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/font-syms.rkt
deleted file mode 100644
index 2102a37bc1..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/font-syms.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket/base
-
-;; font utilities for contracts
-
-(require racket/contract/base)
-
-(provide family-symbol? style-symbol? weight-symbol? 
-         smoothing-symbol? hinting-symbol?
-         font-family/c font-weight/c font-style/c
-         font-smoothing/c font-hinting/c)
-
-(define (family-symbol? s)
-  (memq s '(default decorative roman script
-             swiss modern symbol system)))
-
-(define (style-symbol? s)
-  (memq s '(normal italic slant)))
-
-(define (weight-symbol? s)
-  (memq s '(normal bold light)))
-
-(define (smoothing-symbol? s)
-  (memq s '(default smoothed unsmoothed partly-smoothed)))
-
-(define (hinting-symbol? s)
-  (memq s '(aligned unaligned)))
-
-;; TODO: eventually once all old checks are converted to
-;;       contracts, the above can be removed
-(define font-family/c (or/c 'default 'decorative 'roman 'script 'swiss
-                            'modern 'symbol 'system))
-
-(define font-weight/c (or/c 'normal 'bold 'light))
-(define font-style/c  (or/c 'normal 'italic 'slant))
-(define font-smoothing/c (or/c 'default 'partly-smoothed
-                               'smoothed 'unsmoothed))
-(define font-hinting/c   (or/c 'aligned 'unaligned))
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/font.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/font.rkt
deleted file mode 100644
index a8f82daf4d..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/font.rkt
+++ /dev/null
@@ -1,363 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe/atomic
-         "syntax.rkt"
-         "../unsafe/pango.rkt"
-         "../unsafe/cairo.rkt"
-         "font-syms.rkt"
-         "font-dir.rkt"
-         "local.rkt"
-         "xp.rkt"
-         "lock.rkt")
-
-(provide font%
-         font-list% the-font-list
-         make-font
-         family-symbol? style-symbol? weight-symbol? smoothing-symbol? hinting-symbol?
-         get-pango-attrs
-         get-face-list
-         (protect-out substitute-fonts?
-                      install-alternate-face
-                      font->pango-attrs
-                      font->hinting
-                      install-attributes!))
-
-(define-local-member-name 
-  get-pango-attrs
-  s-pango-attrs
-  s-hinting)
-
-(define fallback-attrs (and (or xp? (eq? 'macosx (system-type)))
-			    (let ([l (pango_attr_list_new)])
-			      (pango_attr_list_insert l (pango_attr_fallback_new #f))
-			      l)))
-(define underlined-attrs (let ([l (pango_attr_list_new)])
-                           (pango_attr_list_insert l (pango_attr_underline_new
-                                                      PANGO_UNDERLINE_SINGLE))
-                           (when (eq? 'macosx (system-type))
-                             (pango_attr_list_insert l (pango_attr_fallback_new #f)))
-                           l))
-
-(define always-attrs (and (eq? 'macosx (system-type)) fallback-attrs))
-
-(define (install-attributes! layout attrs)
-  (cond
-   [attrs (pango_layout_set_attributes layout attrs)]
-   [always-attrs (pango_layout_set_attributes layout always-attrs)]))
-
-(define (size? v) (and (exact-positive-integer? v)
-                       (v . <= . 1024)))
-
-(define-local-member-name s-set-table-key)
-
-(define font-descs (make-weak-hash))
-(define ps-font-descs (make-weak-hash))
-(define keys (make-weak-hash))
-
-(define substitute-fonts? (memq (system-type) '(macosx windows)))
-(define substitute-mapping (make-hasheq))
-
-(define (install-alternate-face ch layout font desc attrs context)
-  (or
-   (for/or ([face (in-list 
-                   (let ([v (hash-ref substitute-mapping (char->integer ch) #f)])
-                     (cond
-                      [(string? v) 
-                       ;; found previously
-                       (list v)]
-                      [v 
-                       ;; failed to find previously
-                       null]
-                      [else
-                       ;; Hack: prefer a particular font for Mac OS X
-                       (cons "Arial Unicode MS" (get-face-list))])))])
-     (let ([desc (send (make-object font%
-                                    (send font get-point-size)
-                                    face
-                                    (send font get-family)
-                                    (send font get-style)
-                                    (send font get-weight)
-                                    (send font get-underlined)
-                                    (send font get-smoothing)
-                                    (send font get-size-in-pixels))
-                       get-pango)])
-       (and desc
-            (let ([attrs (send font get-pango-attrs)])
-              (pango_layout_set_font_description layout desc)
-              (install-attributes! layout attrs)
-              (and (zero? (pango_layout_get_unknown_glyphs_count layout))
-                   (begin
-                     (hash-set! substitute-mapping (char->integer ch) face)
-                     #t))))))
-   (begin
-     (hash-set! substitute-mapping (char->integer ch) #t)
-     ;; put old desc & attrs back
-     (pango_layout_set_font_description layout desc)
-     (install-attributes! layout attrs))))
-
-(define (has-screen-glyph? c font desc for-label?)
-  (let* ([s (cairo_image_surface_create CAIRO_FORMAT_ARGB32 1 1)]
-         [cr (cairo_create s)]
-         [context (pango_cairo_create_context cr)]
-         [layout (pango_layout_new context)]
-	 ;; Under Windows XP, there's no font 
-	 ;; fallback/substitution in control labels:
-	 [no-subs? (and xp? for-label?)])
-    (pango_layout_set_font_description layout desc)
-    (pango_layout_set_text layout (string c))
-    (when no-subs?
-      (pango_layout_set_attributes layout fallback-attrs))
-    (pango_cairo_update_layout cr layout)
-    (begin0
-     (or (zero? (pango_layout_get_unknown_glyphs_count layout))
-         (and substitute-fonts?
-	      (not no-subs?)
-              (install-alternate-face c layout font desc #f context)
-              (zero? (pango_layout_get_unknown_glyphs_count layout))))
-     (g_object_unref layout)
-     (g_object_unref context)
-     (cairo_destroy cr)
-     (cairo_surface_destroy s))))
-
-(define dpi-scale
-  ;; Hard-wire 96dpi for Windows and Linux, but 72 dpi for Mac OS X
-  ;; (based on historical defaults on those platforms).
-  ;; If the actual DPI for the screen is different, we'll handle
-  ;; that by scaling to and from the screen.
-  (if (eq? 'macosx (system-type))
-      1.0
-      (/ 96.0 72.0)))
-
-(defclass font% object%
-
-  (define table-key #f)
-  (define/public (s-set-table-key k) (set! table-key k))
-
-  (define cached-desc #f)
-  (define ps-cached-desc #f)
-  
-  (define/public (get-pango)
-    (create-desc #f 
-                 cached-desc
-                 font-descs
-                 (lambda (d) (set! cached-desc d))))
-
-  (define/public (get-ps-pango)
-    (create-desc #t
-                 ps-cached-desc
-                 ps-font-descs
-                 (lambda (d) (set! ps-cached-desc d))))
-
-  (define/private (create-desc ps? cached-desc font-descs install!)
-    (or cached-desc
-        (let ([desc (atomically (hash-ref font-descs key #f))])
-          (and desc
-               (install! desc)
-               desc))
-        (let* ([desc-str (if ps?
-                             (send the-font-name-directory
-                                   get-post-script-name
-                                   id
-                                   weight
-                                   style)
-                             (send the-font-name-directory
-                                   get-screen-name
-                                   id
-                                   weight
-                                   style))]
-               [desc (if (regexp-match #rx"," desc-str)
-                         ;; comma -> a font description
-                         (pango_font_description_from_string desc-str)
-                         ;; no comma -> a font family
-                         (let ([desc (pango_font_description_new)])
-                           (pango_font_description_set_family desc desc-str)
-                           desc))])
-          (unless (eq? style 'normal)
-            (pango_font_description_set_style desc (case style
-                                                     [(normal) PANGO_STYLE_NORMAL]
-                                                     [(italic) PANGO_STYLE_ITALIC]
-                                                     [(slant) PANGO_STYLE_OBLIQUE])))
-          (unless (eq? weight 'normal)
-            (pango_font_description_set_weight desc (case weight
-                                                      [(normal) PANGO_WEIGHT_MEDIUM]
-                                                      [(light) PANGO_WEIGHT_LIGHT]
-                                                      [(bold) PANGO_WEIGHT_BOLD])))
-          (let ([size (if size-in-pixels? size (* dpi-scale size))])
-            (pango_font_description_set_absolute_size desc (* size PANGO_SCALE)))
-          (install! desc)
-          (atomically (hash-set! font-descs key desc))
-          desc)))
-
-  (field [s-pango-attrs #f])
-  (define/public (get-pango-attrs)
-    s-pango-attrs)
-
-  (define face #f)
-  (def/public (get-face) face)
-
-  (define family 'default)
-  (def/public (get-family) family)
-
-  (define size 12)
-  (def/public (get-point-size) size)
-
-  (define size-in-pixels? #f)
-  (def/public (get-size-in-pixels) size-in-pixels?)
-
-  (define smoothing 'default)
-  (def/public (get-smoothing) smoothing)
-  
-  (field [s-hinting 'aligned])
-  (def/public (get-hinting) s-hinting)
-  
-  (define style 'normal)
-  (def/public (get-style) style)
-
-  (def/public (get-underlined) (and s-pango-attrs #t))
-
-  (define weight 'normal)
-  (def/public (get-weight) weight)
-
-  (def/public (get-font-id) id)
-  (def/public (get-font-key) key)
-
-  (define/public (screen-glyph-exists? c [for-label? #f])
-    (has-screen-glyph? c this (get-pango) for-label?))
-
-  (init-rest args)
-  (super-new)
-  (case-args 
-   args
-   [() (void)]
-   [([size? _size]
-     [family-symbol? _family]
-     [style-symbol? [_style 'normal]]
-     [weight-symbol? [_weight 'normal]]
-     [any? [_underlined? #f]]
-     [smoothing-symbol? [_smoothing 'default]]
-     [any? [_size-in-pixels? #f]]
-     [hinting-symbol? [_hinting 'aligned]])
-    (set! size _size)
-    (set! family _family)
-    (set! style _style)
-    (set! weight _weight)
-    (set! s-pango-attrs (and _underlined? underlined-attrs))
-    (set! smoothing _smoothing)
-    (set! size-in-pixels? _size-in-pixels?)
-    (set! s-hinting _hinting)]
-   [([size? _size]
-     [(make-or-false string?) _face]
-     [family-symbol? _family]
-     [style-symbol? [_style 'normal]]
-     [weight-symbol? [_weight 'normal]]
-     [any? [_underlined? #f]]
-     [smoothing-symbol? [_smoothing 'default]]
-     [any? [_size-in-pixels? #f]]
-     [hinting-symbol? [_hinting 'aligned]])
-    (set! size _size)
-    (set! face (and _face (string->immutable-string _face)))
-    (set! family _family)
-    (set! style _style)
-    (set! weight _weight)
-    (set! s-pango-attrs (and _underlined? underlined-attrs))
-    (set! smoothing _smoothing)
-    (set! size-in-pixels? _size-in-pixels?)
-    (set! s-hinting _hinting)]
-   (init-name 'font%))
-
-  (define id 
-    (if face
-        (send the-font-name-directory find-or-create-font-id face family)
-        (send the-font-name-directory find-family-default-font-id family)))
-  (define key
-    (let ([key (vector id size style weight (and s-pango-attrs #t) smoothing size-in-pixels? s-hinting)])
-      (let ([old-key (atomically (hash-ref keys key #f))])
-        (if old-key
-            (weak-box-value old-key)
-            (begin
-              (atomically (hash-set! keys key (make-weak-box key)))
-              key))))))
-
-(define font->pango-attrs (class-field-accessor font% s-pango-attrs))
-(define font->hinting (class-field-accessor font% s-hinting))
-
-;; ----------------------------------------
-
-(defclass font-list% object%
-  (define fonts (make-weak-hash))
-  (super-new)
-  (define/public (find-or-create-font . args)
-    (let ([key
-           (case-args 
-            args
-            [([size? size]
-              [family-symbol? family]
-              [style-symbol? [style 'normal]]
-              [weight-symbol? [weight 'normal]]
-              [any? [underlined? #f]]
-              [smoothing-symbol? [smoothing 'default]]
-              [any? [size-in-pixels? #f]]
-              [hinting-symbol? [hinting 'aligned]])
-             (vector size family style weight underlined? smoothing size-in-pixels? hinting)]
-            [([size? size]
-              [(make-or-false string?) face]
-              [family-symbol? family]
-              [style-symbol? [style 'normal]]
-              [weight-symbol? [weight 'normal]]
-              [any? [underlined? #f]]
-              [smoothing-symbol? [smoothing 'default]]
-              [any? [size-in-pixels? #f]]
-              [hinting-symbol? [hinting 'aligned]])
-             (vector size (and face (string->immutable-string face)) family
-                     style weight underlined? smoothing size-in-pixels? hinting)]
-            (method-name 'find-or-create-font 'font-list%))])
-      (atomically
-       (let ([e (hash-ref fonts key #f)])
-         (or (and e
-                  (ephemeron-value e))
-             (let* ([f (apply make-object font% (vector->list key))]
-                    [e (make-ephemeron key f)])
-               (send f s-set-table-key key)
-               (hash-set! fonts key e)
-               f)))))))
-
-(define the-font-list (new font-list%))
-
-(define (get-face-list [mode 'all] #:all-variants? [all-variants? #f])
-  (unless (or (eq? mode 'all) (eq? mode 'mono))
-    (raise-type-error get-face-list "'all or 'mono" mode))
-  (sort
-   (apply
-    append
-    (for/list ([fam (in-list
-                     (let ([fams (pango_font_map_list_families
-                                  (pango_cairo_font_map_get_default))])
-                       (if (eq? mode 'mono)
-                           (filter pango_font_family_is_monospace fams)
-                           fams)))])
-      (if (not all-variants?)
-          (list (pango_font_family_get_name fam))
-          (for/list ([face (in-list (pango_font_family_list_faces fam))])
-            (string-append
-             (pango_font_family_get_name fam)
-             ", "
-             (pango_font_face_get_face_name face))))))
-   string<?))
-
-(define (make-font #:size [size 12]
-                   #:face [face #f]
-                   #:family [family 'default]
-                   #:style [style 'normal]
-                   #:weight [weight 'normal]
-                   #:underlined? [underlined? #f]
-                   #:smoothing [smoothing 'default]
-                   #:size-in-pixels? [size-in-pixels? #f]
-                   #:hinting [hinting 'aligned])
-  (unless (size? size) (raise-type-error 'make-font "exact integer in [1, 1024]" size))
-  (unless (or (not face) (string? face)) (raise-type-error 'make-font "string or #f" face))
-  (unless (family-symbol? family) (raise-type-error 'make-font "family-symbol" family))
-  (unless (style-symbol? style) (raise-type-error 'make-font "style-symbol" style))
-  (unless (weight-symbol? weight) (raise-type-error 'make-font "weight-symbol" weight))
-  (unless (smoothing-symbol? smoothing) (raise-type-error 'make-font "smoothing-symbol" smoothing))
-  (unless (hinting-symbol? hinting) (raise-type-error 'make-font "hinting-symbol" hinting))
-  (make-object font% size face family style weight underlined? smoothing size-in-pixels? hinting))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/gl-config.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/gl-config.rkt
deleted file mode 100644
index 4ddadd3356..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/gl-config.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-(require racket/class
-         "syntax.rkt")
-
-(provide gl-config%)
-
-(defclass gl-config% object%
-  (super-new)
-
-  (define legacy? #t)
-  (define/public (get-legacy?) legacy?)
-  (define/public (set-legacy? v) (set! legacy? (and v #t)))
-
-  (define double-buffered? #t)
-  (define/public (get-double-buffered) double-buffered?)
-  (define/public (set-double-buffered v) (set! double-buffered? (and v #t)))
-
-  (define stereo? #f)
-  (define/public (get-stereo) stereo?)
-  (define/public (set-stereo v) (set! stereo? (and v #t)))
-
-  (define stencil-size 0)
-  (define/public (get-stencil-size) stencil-size)
-  (define/public (set-stencil-size s)
-    (set! stencil-size s))
-    
-  (define accum-size 0)
-  (define/public (get-accum-size) accum-size)
-  (define/public (set-accum-size s)
-    (set! accum-size s))
-
-  (define depth-size 1)
-  (define/public (get-depth-size) depth-size)
-  (define/public (set-depth-size s)
-    (set! depth-size s))
-
-  (define multisample-size 0)
-  (define/public (get-multisample-size) multisample-size)
-  (define/public (set-multisample-size s)
-    (set! multisample-size s))
-
-  (define share-context #f)
-  (define/public (get-share-context) share-context)
-  (define/public (set-share-context s)
-    (set! share-context s)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/gl-context.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/gl-context.rkt
deleted file mode 100644
index 9a80134e08..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/gl-context.rkt
+++ /dev/null
@@ -1,96 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/contract/base)
-
-(provide gl-context%
-         gl-context<%>
-         
-         do-call-as-current
-         do-swap-buffers
-         
-         get-current-gl-context)
-
-(define-local-member-name
-  do-call-as-current
-  do-swap-buffers)
-
-(define lock-ch (make-channel))
-(define lock-holder-ch (make-channel))
-(define (lock-manager)
-  (define none '#(#f #f #f))
-  (let loop ()
-    (sync (handle-evt
-           lock-ch
-           (lambda (p)
-             (let ([t (vector-ref p 0)]
-                   [ch (vector-ref p 2)])
-               (let waiting-loop ()
-                 (sync (handle-evt
-                        (thread-dead-evt t)
-                        (lambda (v) (loop)))
-                       (handle-evt
-                        ch
-                        (lambda (v) (loop)))
-                       (handle-evt
-                        (channel-put-evt lock-holder-ch p)
-                        (lambda (v) (waiting-loop))))))))
-          (handle-evt
-           (channel-put-evt lock-holder-ch none)
-           (lambda (v) (loop))))))
-(define manager-t (thread/suspend-to-kill lock-manager))
-
-(define gl-context<%>
-  (interface ()
-    [call-as-current (->*m [(-> any)] [evt? any/c] any)]
-    [ok? (->m boolean?)]
-    [swap-buffers (->m any)]
-    [get-handle (->m any)]))
-
-(define current-gl-context (make-thread-cell #f))
-(define (get-current-gl-context) (thread-cell-ref current-gl-context))
-
-;; Implemented by subclasses:
-(define gl-context%
-  (class* object% (gl-context<%>)
-    (define/private (with-gl-lock t alternate-evt enable-break?)
-      (thread-resume manager-t (current-thread))
-      (define current (channel-get lock-holder-ch))
-      (if (and (eq? (vector-ref current 0) (current-thread))
-               (eq? (vector-ref current 1) this))
-          (t)
-          ((if enable-break? sync/enable-break sync)
-           (let ([ch (make-channel)])
-             (handle-evt (channel-put-evt lock-ch (vector (current-thread) this ch))
-                         (lambda (val)
-                           (dynamic-wind
-                               (lambda ()
-                                 (thread-cell-set! current-gl-context this))
-                               t
-                               (lambda ()
-                                 (thread-cell-set! current-gl-context #f)
-                                 (channel-put ch #t))))))
-           alternate-evt)))
-
-    (define/public (get-handle)
-      #f)
-    
-    (define/public (call-as-current t [alternate-evt never-evt] [enable-breaks? #f])
-      (with-gl-lock
-       (lambda ()
-         (do-call-as-current t))
-       alternate-evt
-       enable-breaks?))
-
-    (define/public (swap-buffers)
-      (with-gl-lock
-       (lambda ()
-         (do-swap-buffers))
-       never-evt
-       #f))
-
-    (define/public (ok?) #t)
-
-    (define/public (do-call-as-current t) (t))
-    (define/public (do-swap-buffers t) (void))
-
-    (super-new)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/gradient.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/gradient.rkt
deleted file mode 100644
index e434556f8d..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/gradient.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang racket/base
-(require racket/class
-         "syntax.rkt"
-         "color.rkt")
-
-(provide linear-gradient%
-         radial-gradient%)
-
-(define (check-reals name lst)
-  (for ([x (in-list lst)])
-    (unless (real? x)
-      (raise-type-error (init-name name) "real number" x))))
-
-(define (check-radius name lst)
-  (for ([x (in-list lst)])
-    (unless (and (real? x) (not (negative? x)))
-      (raise-type-error (init-name name) "non-negative real number" x))))
-
-(define (check-stops name stops)
-  (unless (and (list? stops)
-               (for/and ([x (in-list stops)])
-                 (and (list? x)
-                      (= (length x) 2)
-                      (real? (car x))
-                      (<= 0.0 (car x) 1.0)
-                      (is-a? (cadr x) color%))))
-    (raise-type-error (init-name name) 
-                      "list of (list x c) where x is a real in [0,1] and c is a color%"
-                      stops)))
-    
-(define linear-gradient% 
-  (class object%
-    (init x0 y0 x1 y1 stops)
-    (define _x0 x0)
-    (define _y0 y0)
-    (define _x1 x1)
-    (define _y1 y1)
-    (define _stops stops)
-
-    (check-reals 'linear-gradient% (list x0 y0 x1 y1))
-    (check-stops 'linear-gradient% stops)
-
-    (super-new)
-
-    (define/public (get-line) (values _x0 _y0 _x1 _y1))
-    (define/public (get-stops) _stops)))
-
-(define radial-gradient% 
-  (class object%
-    (init x0 y0 r0 x1 y1 r1 stops)
-    (define _x0 x0)
-    (define _y0 y0)
-    (define _r0 r0)
-    (define _x1 x1)
-    (define _y1 y1)
-    (define _r1 r1)
-    (define _stops stops)
-
-    (check-reals  'radial-gradient% (list _x0 _y0 _x1 _y1))
-    (check-radius 'radial-gradient% (list _r0 _r1))
-    (check-stops  'radial-gradient% stops)
-
-    (super-new)
-
-    (define/public (get-circles) (values _x0 _y0 _r0 _x1 _y1 _r1))
-    (define/public (get-stops) _stops)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/hold.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/hold.rkt
deleted file mode 100644
index 22094d3a10..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/hold.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-
-(provide with-holding)
-
-(define-syntax-rule (with-holding v expr)
-  (let ([val v])
-    (begin0
-     expr
-     (done-with val))))
-
-;; Ensure no inline:
-(define done-with #f)
-(set! done-with void)
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/libs.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/libs.rkt
deleted file mode 100644
index 6e34659ba6..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/libs.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/runtime-path
-         ffi/winapi
-         (for-syntax racket/base
-                     ffi/winapi))
-
-(provide define-runtime-lib
-         win64?
-         (for-syntax win64?))
-
-(define-syntax define-runtime-lib
-  ;; the ids macosx unix windows don't appear to be bound here, but I added win32 and win64 anyways
-  (syntax-rules (macosx unix windows win32 win64 ffi-lib)
-    [(_ lib-id
-        [(unix) unix-lib]
-        [(macosx) (ffi-lib mac-lib) ...]
-        [(windows) (ffi-lib windows-lib) ...])
-     (begin
-       (define-runtime-path-list libs
-         (case (system-type)
-           [(macosx) '((so mac-lib) ...)]
-           [(unix) null]
-           [(windows) `((so windows-lib) ...)]))
-
-       (define lib-id
-         (if (null? libs)
-             unix-lib
-             (for/fold ([v #f]) ([lib (in-list libs)])
-               (ffi-lib lib)))))]
-    [(_ lib-id
-        [(unix) unix-lib]
-        [(macosx) (ffi-lib mac-lib) ...]
-        [(win32) (ffi-lib win32-lib) ...]
-        [(win64) (ffi-lib win64-lib) ...])
-     (begin
-       (define-runtime-path-list libs
-         (case (system-type)
-           [(macosx) '((so mac-lib) ...)]
-           [(unix) null]
-           [(windows)
-            (if win64?
-                `((so win64-lib) ...)
-                `((so win32-lib) ...))]))
-
-       (define lib-id
-         (if (null? libs)
-             unix-lib
-             (for/fold ([v #f]) ([lib (in-list libs)])
-               (ffi-lib lib)))))]))
-
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/local.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/local.rkt
deleted file mode 100644
index 24d29684da..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/local.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket/base
-(require racket/class)
-
-(provide (protect-out (all-defined-out)))
-
-(define-local-member-name
-  ;; various
-  adjust-lock
-
-  ;; bitmap%
-  get-cairo-surface
-  get-cairo-target-surface
-  get-cairo-alpha-surface
-  get-cairo-device-scale
-  release-bitmap-storage
-  get-bitmap-gl-context
-  drop-alpha-s
-  draw-bitmap-to
-
-  ;; bitmap-dc%
-  internal-get-bitmap
-  internal-set-bitmap
-
-  ;; dc%
-  in-cairo-context
-  get-clipping-matrix
-  reset-config
-
-  ;; region%
-  install-region
-  lock-region
-
-  ;; font% and dc-backend<%>
-  get-pango
-
-  ;; font%
-  get-ps-pango
-  get-font-key
-
-  ;; brush%
-  get-surface-handle-info
-
-  ;; dc-backend<%>
-  get-cr
-  release-cr
-  end-cr
-  reset-cr
-  flush-cr
-  init-cr-matrix
-  init-effective-matrix
-  get-font-metrics-key
-  install-color
-  dc-adjust-smoothing
-  dc-adjust-cap-shape
-  get-hairline-width
-  can-combine-text?
-  can-mask-bitmap?
-  reset-clip
-  get-clear-operator)
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/lock.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/lock.rkt
deleted file mode 100644
index 4f47d225f2..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/lock.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require ffi/unsafe/atomic)
-(provide atomically)
-(define-syntax-rule 
-  (atomically e1 e2 ...)
-  (begin (start-atomic)
-         (begin0 (let () e1 e2 ...)
-                 (end-atomic))))
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/lzw.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/lzw.rkt
deleted file mode 100644
index 1f1d86e88f..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/lzw.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang racket/base
-
-;;; Translated from Skippy for Common Lisp:
-;;;
-;;; Copyright (c) 2006 Zachary Beane, All Rights Reserved
-;;;
-;;; Redistribution and use in source and binary forms, with or without
-;;; modification, are permitted provided that the following conditions
-;;; are met:
-;;;
-;;;   * Redistributions of source code must retain the above copyright
-;;;     notice, this list of conditions and the following disclaimer.
-;;;
-;;;   * Redistributions in binary form must reproduce the above
-;;;     copyright notice, this list of conditions and the following
-;;;     disclaimer in the documentation and/or other materials
-;;;     provided with the distribution.
-;;;
-;;; THIS SOFTWARE IS PROVIDED BY THE AUTHOR 'AS IS' AND ANY EXPRESSED
-;;; OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-;;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-;;; ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-;;; DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-;;; DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-;;; GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-;;; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-;;; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-;;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-;;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-;;;
-;;;; Id: lzw.lisp,v 1.11 2007/01/03 22:01:10 xach Exp
-
-(provide lzw-decompress)
-
-(define (make-input-bitstream bstr)
-  (let ([pos 0]
-        [val 0]
-        [bits 0]
-        [limit (bytes-length bstr)])
-    (lambda (n)
-      (let loop ()
-        (cond
-         [(n . <= . bits)
-          (begin0
-           (bitwise-and val (sub1 (arithmetic-shift 1 n)))
-           (set! val (arithmetic-shift val (- n)))
-           (set! bits (- bits n)))]
-         [(= pos limit)
-          (add1 (arithmetic-shift 1 n))]
-         [else
-          (set! val (bitwise-ior (arithmetic-shift (bytes-ref bstr pos) 
-                                                   bits)
-                                 val))
-          (set! pos (add1 pos))
-          (set! bits (+ 8 bits))
-          (loop)])))))
-
-(define (read-bits n bstream)
-  (bstream n))
-
-(define (lzw-decompress result-bstr code-size bstr)
-  (let* ((entries (make-vector 4096 -1))
-         (preds (make-vector 4096 -1))
-         (clear-code (expt 2 code-size))
-         (end-of-input (+ clear-code 1))
-         (next-entry-index (+ clear-code 2))
-         (compression-size (add1 code-size))
-         (compression-threshold (* clear-code 2))
-         (pos 0)
-         (bitstream (make-input-bitstream bstr)))
-    (for ([i (in-range clear-code)])
-      (vector-set! entries i i))
-    (letrec ([reset-table 
-              (lambda ()
-                (vector-fill! preds -1)
-                (for ([i (in-range clear-code 4096)])
-                  (vector-set! entries i -1))
-                (set! next-entry-index (+ clear-code 2))
-                (set! compression-size (add1 code-size))
-                (set! compression-threshold (* clear-code 2)))]
-             [root-value 
-              (lambda (code)
-                (let loop ([code code])
-                  (let ([pred (vector-ref preds code)])
-                    (if (negative? pred)
-                        (vector-ref entries code)
-                        (loop pred)))))]
-             [increase-compression-size!
-              (lambda ()
-                (set! compression-size (min 12 (add1 compression-size)))
-                (set! compression-threshold (* compression-threshold 2)))]
-             [add-entry 
-              (lambda (entry pred)
-                (when (>= pred next-entry-index)
-                  (error "Corrupt data in LZW stream"))
-                (vector-set! preds next-entry-index pred)
-                (vector-set! entries next-entry-index entry)
-                (let ([result next-entry-index])
-                  (set! next-entry-index (add1 next-entry-index))
-                  (when (>= next-entry-index compression-threshold)
-                    (increase-compression-size!))
-                  result))]
-             [code-depth 
-              (lambda (code)
-                (let loop ([depth 0][code code])
-                  (let ([pred (vector-ref preds code)])
-                    (if (negative? pred)
-                        depth
-                        (loop (add1 depth) pred)))))]
-             [output-code-string 
-              (lambda (code)
-                (let ([j pos])
-                  (let ([i (+ pos (code-depth code))])
-                    (set! pos (add1 i))
-                    (if (>= i (bytes-length result-bstr))
-                        (log-warning "Too much input data for image, ignoring extra")
-                        (let loop ([code code]
-                                   [i i])
-                          ;; (printf "set ~a\n" (vector-ref entries code))
-                          (bytes-set! result-bstr i (vector-ref entries code))
-                          (when (i . > . j)
-                            (loop (vector-ref preds code)
-                                  (sub1 i))))))))])
-      (let loop ([last-code -1])
-        (let ([code (read-bits compression-size bitstream)])
-          ;; (printf "~s: ~s ~s ~s\n" compression-size code clear-code end-of-input)
-          (cond 
-           [(= code clear-code)
-            (reset-table)
-            (loop -1)]
-           [(= code end-of-input)
-            (void)]
-           [(= last-code -1)
-            (output-code-string code)
-            (loop code)]
-           [else
-            (let ([entry (vector-ref entries code)])
-              (if (negative? entry)
-                  (let ([root (root-value last-code)])
-                    (output-code-string (add-entry root last-code)))
-                  (let ([root (root-value code)])
-                    (add-entry root last-code)
-                    (output-code-string code))))
-            (loop code)]))))))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/page-dc.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/page-dc.rkt
deleted file mode 100644
index c37d180d54..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/page-dc.rkt
+++ /dev/null
@@ -1,109 +0,0 @@
-#lang racket/base
-(require racket/class
-         "syntax.rkt")
-
-(provide doc+page-check-mixin
-         multiple-pages-ok?)
-
-(define-local-member-name multiple-pages-ok?)
-
-(define-syntax check-page-active
-  (syntax-rules ()
-    [(_ check-page-status (id . args) ...) (begin (check-one-page-active check-page-status id args) ...)]))
-
-(define-syntax check-one-page-active
-  (syntax-rules ()
-    [(_ check-page-status id simple ... (arg ... [opt ...]))
-     (check-one-page-active 
-      check-page-status id 
-      simple ...
-      (arg ...)
-      (arg ... opt ...))]
-    [(_ check-page-status id (arg ...) ...)
-     (define/override id
-       (case-lambda
-        [(arg ...) (check-page-status 'id) (super id arg ...)]
-        ...))]))
-
-(define (doc+page-check-mixin % class-name)
-  (class %
-    (inherit multiple-pages-ok?)
-
-    (define status #f)
-    (define did-one-page? #f)
-
-    (define/override (start-doc s)
-      (when status
-        (raise-mismatch-error (method-name class-name 'start-doc)
-                              (case status
-                                [(done)
-                                 "document has already been ended: "]
-                                [else
-                                 "document has already been started: "])
-                              this))
-      (set! status 'doc)
-      (super start-doc s))
-
-    (define/override (end-doc)
-      (unless (eq? status 'doc)
-        (raise-mismatch-error (method-name class-name 'end-doc)
-                              (case status
-                                [(page)
-                                 "current page has not been ended: "]
-                                [(done)
-                                 "document is already ended: "]
-                                [(#f)
-                                 "document is not started: "])
-                              this))
-      (set! status 'done)
-      (super end-doc))
-
-    (define/override (start-page)
-      (unless (eq? status 'doc)
-        (raise-mismatch-error (method-name class-name 'start-page)
-                              (if (eq? status 'page)
-                                  "current page has not been ended: "
-                                  "document is not started (use the `start-doc' method): ")
-                              this))
-      (when did-one-page?
-        (unless (multiple-pages-ok?)
-          (raise-mismatch-error (method-name class-name 'start-page)
-                                "cannot create multiple pages for encapsulated output: "
-                                this)))
-      (set! status 'page)
-      (set! did-one-page? #t)
-      (super start-page))
-
-    (define/override (end-page)
-      (unless (eq? status 'page)
-        (raise-mismatch-error (method-name class-name 'end-page)
-                              "no page is currently started: "
-                              this))
-      (set! status 'doc)
-      (super end-page))
-
-    (define/private (check-page-status the-method-name)
-      (unless (eq? status 'page)
-        (raise-mismatch-error (method-name class-name the-method-name)
-                              "no page is currently started (use `start-doc' and `start-page' before drawing): "
-                              this)))
-
-    (check-page-active
-     check-page-status 
-     (draw-bitmap source dest-x dest-y [style [color [mask]]])
-     (draw-bitmap-section source dest-x dest-y src-x src-y src-width src-height [style [color [mask]]])
-     (draw-polygon pts [x [y [fill]]])
-     (draw-lines pts [x [y]])
-     (draw-path path [x [y [fill]]])
-     (draw-ellipse x y w h)
-     (draw-arc x y w h s e)
-     (draw-text txt x y [combine? [offset [angle]]])
-     (draw-spline x1 y1 x2 y2 x3 y3)
-     (draw-rounded-rectangle x y w h [r])
-     (draw-rectangle x y w h)
-     (draw-point x y)
-     (draw-line x1 y1 x2 y2)
-     (clear)
-     (erase))
-
-    (super-new)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/pen.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/pen.rkt
deleted file mode 100644
index 6386ee9f0c..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/pen.rkt
+++ /dev/null
@@ -1,197 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe/atomic
-         "color.rkt"
-         "syntax.rkt"
-         "local.rkt"
-         "bitmap.rkt")
-
-(provide pen%
-         make-pen
-         pen-list% the-pen-list
-         pen-width?
-         pen-style-symbol?)
-
-(define (pen-style-symbol? s)
-  (memq s '(transparent solid xor hilite
-                        dot long-dash short-dash dot-dash
-                        xor-dot xor-long-dash xor-short-dash
-                        xor-dot-dash)))
-
-(define (pen-cap-symbol? s)
-  (memq s '(round projecting butt)))
-
-(define (pen-join-symbol? s)
-  (memq s '(round bevel miter)))
-
-(define (pen-width? v)
-  (and (real? v)
-       (>= v 0)
-       (<= v 255)))
-
-(define black (send the-color-database find-color "black"))
-
-(define-local-member-name
-  s-set-key
-  set-immutable)
-
-(defclass pen% object%
-  (define key #f)
-  (define/public (s-set-key k) (set! key k))
-
-  (define immutable? #f)
-  (define lock-count 0)
-  (define stipple #f)
-
-  (define color black)
-  (properties #:check-immutable check-immutable 
-              [[pen-cap-symbol? cap] 'round]
-              [[pen-join-symbol? join] 'round]
-              [[pen-style-symbol? style] 'solid]
-              [[pen-width? width] 0])
-
-  (init [(_color color) black]
-        [(_width width) 0]
-        [(_style style) 'solid]
-        [(_cap cap) 'round]
-        [(_join join) 'round]
-        [(_stipple stipple) #f])
-
-  (set! color
-        (cond
-         [(string? _color) (or (send the-color-database find-color _color) black)]
-         [(color . is-a? . color%)
-          (color->immutable-color _color)]
-         [else
-          (raise-type-error (init-name 'pen%)
-                            "string or color%"
-                            _color)]))
-  (set! width
-        (if (pen-width? _width)
-            _width
-            (raise-type-error (init-name 'pen%)
-                              "real in [0, 255]"
-                              _width)))
-  
-  (set! style
-        (if (pen-style-symbol? _style)
-            _style
-            (raise-type-error (init-name 'pen%)
-                              "pen style symbol"
-                              _style)))
-    
-  (set! cap
-        (if (pen-cap-symbol? _cap)
-            _cap
-            (raise-type-error (init-name 'pen%)
-                              "pen cap symbol"
-                              _cap)))
-    
-  (set! join
-        (if (pen-join-symbol? _join)
-            _join
-            (raise-type-error (init-name 'pen%)
-                              "pen join symbol"
-                              _join)))
-
-  (when _stipple
-    (unless (_stipple . is-a? . bitmap%)
-      (raise-type-error (init-name 'pen%)
-                        "bitmap% or #f"
-                        _stipple)))
-
-  (super-new)
-
-  (when _stipple (set-stipple _stipple))
-
-  (define/public (set-immutable) (set! immutable? #t))
-  (define/public (is-immutable?) (or immutable? (positive? lock-count)))
-  (define/public (adjust-lock v) (set! lock-count (+ lock-count v)))
-
-  (define/private (check-immutable s)
-    (when (or immutable? (positive? lock-count))
-      (error (method-name 'pen% s) "object is ~a"
-             (if immutable? "immutable" "locked"))))
-
-  (define/public (set-color . args)
-    (check-immutable 'set-color)
-    (case-args
-     args
-     [([color% _color])
-      (set! color (color->immutable-color _color))]
-     [([string? _color])
-      (set! color (send the-color-database find-color _color))]
-     [([byte? r] [byte? g] [byte? b])
-      (let ([c (make-object color%  r g b)])
-        (send c set-immutable)
-        (set! color c))]
-     (method-name 'pen% 'set-color)))
-
-  (define/public (get-color) color)
-
-  (def/public (get-stipple) stipple)
-  (define/public (set-stipple s)
-    (check-immutable 'set-stipple)
-    (set! stipple s)))
-
-;; color width style cap join stipple -> pen%
-;; produce an immutable pen% object
-(define (make-pen #:color [color black]
-                  #:width [width 0]
-                  #:style [style 'solid]
-                  #:cap [cap 'round]
-                  #:join [join 'round]
-                  #:stipple [stipple #f]
-                  #:immutable? [immutable? #t])
-  (or (and (not (or stipple (not immutable?)))
-           (send the-pen-list find-or-create-pen color width style cap join))
-      (let ()
-        (define pen (make-object pen% color width style cap join stipple))
-        (when immutable?
-          (send pen set-immutable))
-        pen)))
-
-;; ----------------------------------------
-
-(defclass pen-list% object%
-  (define pens (make-weak-hash))
-  (super-new)
-  (define/public (find-or-create-pen . args)
-    (let-values ([(col w s c j)
-                  (case-args
-                   args
-                   [([color% _color]
-                     [pen-width? _width]
-                     [pen-style-symbol? _style]
-                     [pen-cap-symbol? [_cap 'round]]
-                     [pen-join-symbol? [_join 'round]])
-                    (values (color->immutable-color _color) 
-                            _width _style _cap _join)]
-                   [([string? _color]
-                     [pen-width? _width]
-                     [pen-style-symbol? _style]
-                     [pen-cap-symbol? [_cap 'round]]
-                     [pen-join-symbol? [_join 'round]])
-                    (values (or (send the-color-database find-color _color)
-                                black)
-                            _width _style _cap _join)]
-                   (method-name 'find-or-create-pen 'pen-list%))])
-      (let ([key (vector (send col red) (send col green) (send col blue)
-                         (send col alpha)
-                         w s c j)])
-        (start-atomic)
-        (begin0
-         (let ([e (hash-ref pens key #f)])
-           (or (and e
-                    (ephemeron-value e))
-               (let* ([f (make-object pen% col w s c j)]
-                      [e (make-ephemeron key f)])
-                 (send f set-immutable)
-                 (send f s-set-key key)
-                 (hash-set! pens key e)
-                 f)))
-         (end-atomic))))))
-
-(define the-pen-list (new pen-list%))
-
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/point.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/point.rkt
deleted file mode 100644
index c4ac09619b..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/point.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-(require racket/class
-         "syntax.rkt")
-
-(provide point% point-x point-y
-         list-of-pair-of-real?)
-
-(define-local-member-name x y)
-
-(define point%
-  (class object%
-    (init-field [x 0.0]
-                [y 0.0])
-    (define/public (get-x) x)
-    (define/public (get-y) y)
-    (define/public (set-x v) (set! x (exact->inexact v)))
-    (define/public (set-y v) (set! y (exact->inexact v)))
-    (super-new)))
-
-(define point-x (class-field-accessor point% x))
-(define point-y (class-field-accessor point% y))
-
-(define (list-of-pair-of-real? p)
-  (and (list? p)
-       (andmap (lambda (p) (and (pair? p)
-                                (real? (car p))
-                                (real? (cdr p))))
-               p)))
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/post-script-dc.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/post-script-dc.rkt
deleted file mode 100644
index ea22e3aa13..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/post-script-dc.rkt
+++ /dev/null
@@ -1,205 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/file
-         racket/path
-         racket/math
-         "syntax.rkt"
-         racket/gui/dynamic
-         "../unsafe/cairo.rkt"
-         "dc.rkt"
-         "local.rkt"
-         "ps-setup.rkt"
-         "page-dc.rkt"
-         "write-bytes.rkt")
-
-(provide post-script-dc%
-         pdf-dc%)
-
-(define (make-dc-backend pdf?)
-  (class default-dc-backend%
-    (init [interactive #t]
-          [parent #f]
-          [use-paper-bbox #f]
-          [as-eps #t]
-          [(init-w width) #f]
-          [(init-h height) #f]
-          [output #f])
-
-    (let ([get-name (lambda ()
-                      (init-name (if pdf? 'pdf-dc% 'post-script-dc%)))])
-      (unless (or (not init-w) 
-                  (and (real? init-w) (not (negative? init-w))))
-        (raise-type-error (get-name) "nonnegative real or #f" init-w))
-      (unless (or (not init-h) 
-                  (and (real? init-h) (not (negative? init-h))))
-        (raise-type-error (get-name) "nonnegative real or #f" init-h))
-      (unless (or (not output)
-                  (path-string? output)
-                  (output-port? output))
-        (raise-type-error (get-name) "path string, output port, or #f" output)))
-
-    (define-values (s port close-port? writer width height landscape?)
-      (let ([su (if interactive
-                    ((gui-dynamic-require 'get-ps-setup-from-user) #f parent)
-                    (current-ps-setup))])
-        (cond
-         [su 
-          (unless (eq? su (current-ps-setup))
-            (send (current-ps-setup) copy-from su))
-          (let* ([pss (current-ps-setup)]
-                 [to-file? (eq? (send pss get-mode) 'file)]
-                 [get-file (lambda (fn)
-                             ((gui-dynamic-require 'put-file)
-                              (if pdf?
-                                  "Save PDF As"
-                                  "Save PostScript As")
-                              parent
-                              (and fn (path-only fn))
-                              (and fn (file-name-from-path fn))
-                              (if pdf? "pdf" "ps")))]
-                 [fn (if to-file?
-                         (or output
-                             (if interactive
-                                 (get-file (send pss get-file))
-                                 (let ([fn (send pss get-file)])
-                                   (or fn (get-file #f)))))
-                         #f)])
-            (if (and to-file?
-                     (not fn))
-                (values #f #f #f #f #f #f #f)
-                (let* ([paper (assoc (send pss get-paper-name) paper-sizes)]
-                       [w (ceiling
-                           (if (or (not init-w) use-paper-bbox)
-                               (cadr paper)
-                               init-w))]
-                       [h (ceiling
-                           (if (or (not init-h) use-paper-bbox)
-                               (caddr paper)
-                               init-h))]
-                       [landscape? (eq? (send pss get-orientation) 'landscape)]
-                       [file (if (output-port? fn)
-                                 fn
-                                 (open-output-file
-                                  (or fn (make-temporary-file (if pdf?
-                                                                  "draw~a.pdf"
-                                                                  "draw~a.ps")))
-                                  #:exists 'truncate/replace))])
-                  (let-values ([(w h) (if (and pdf? landscape?)
-                                          (values h w)
-                                          (values w h))]
-                               [(writer proc) (make-port-writer file)])
-                    (values
-                     ((if pdf?
-                          cairo_pdf_surface_create_for_stream 
-                          cairo_ps_surface_create_for_stream)
-                      proc
-                      w
-                      h)
-                     file
-                     (not (output-port? fn))
-                     writer
-                     w
-                     h
-                     landscape?)))))]
-         [else
-          (values #f #f #f #f #f #f #f)])))
-
-    (define-values (margin-x margin-y)
-      (if as-eps
-          (values 0.0 0.0)
-          (let ([xb (box 0)] [yb (box 0.0)])
-            (send (current-ps-setup) get-margin xb yb)
-            (values (unbox xb) (unbox yb)))))
-    (define-values (scale-x scale-y)
-      (let ([xb (box 0)] [yb (box 0.0)])
-        (send (current-ps-setup) get-scaling xb yb)
-        (values (unbox xb) (unbox yb))))
-    (define-values (trans-x trans-y)
-      (if as-eps
-          (values 0.0 0.0)
-          (let ([xb (box 0)] [yb (box 0.0)])
-            (send (current-ps-setup) get-translation xb yb)
-            (values (unbox xb) (unbox yb)))))
-
-    (unless pdf?
-      (when (and s as-eps)
-        (cairo_ps_surface_set_eps s #t)
-        ;; Cairo writes a %%BoundingBox that covers only the drawn points,
-        ;; which arguably matches the EPS spec, but that isn't what we want.
-        ;; Fortunately, Cairo will suppress its own %%BoundingBox if we
-        ;; write one:
-        (cairo_ps_surface_dsc_comment s (format "%%BoundingBox: ~a ~a ~a ~a" 0 0 width height)))
-      (when (and s landscape?)
-        (cairo_ps_surface_dsc_comment s "%%Orientation: Landscape")))
-
-    (define c (and s (cairo_create s)))
-    
-    (when s (cairo_surface_destroy s))
-
-    (define/override (ok?) (and c #t))
-
-    (define/override (get-cr) c)
-
-    (def/override (get-size)
-      (let ([w (exact->inexact (/ (- width margin-x margin-x) scale-x))]
-            [h (exact->inexact (/ (- height margin-y margin-y) scale-y))])
-        (if (and (not pdf?) landscape?)
-            (values h w)
-            (values w h))))
-
-    (define/override (get-device-scale)
-      (values scale-x scale-y))
-
-    (define/override (end-cr)
-      (cairo_surface_finish s)
-      (cairo_destroy c)
-      (set! c #f)
-      (set! s #f)
-      (port-writer-wait writer)
-      (set! writer #f)
-      (when close-port?
-        (close-output-port port))
-      (set! port #f))
-
-    (define/override (init-cr-matrix c)
-      (cairo_translate c trans-x trans-y)
-      (if (and landscape? (not pdf?))
-          (begin
-            (cairo_translate c 0 height)
-            (cairo_rotate c (/ pi -2))
-            (cairo_translate c margin-y margin-x)
-            (cairo_scale c scale-y scale-x))
-          (begin
-            (cairo_translate c margin-x margin-y)
-            (cairo_scale c scale-x scale-y))))
-
-    (define/override (get-pango font)
-      (send font get-ps-pango))
-
-    (define/override (get-font-metrics-key sx sy)
-      (if (and (= sx 1.0) (= sy 1.0))
-          2
-          0))
-
-    (define/override (can-combine-text? sz)
-      #t)
-    
-    (define/override (can-mask-bitmap?)
-      #f)
-
-    (define/override (dc-adjust-cap-shape shape sx pw) shape)
-    (define/override (get-hairline-width cx) (/ 1.0 (* cx 4)))
-
-    (define is-eps? (and as-eps #t))
-    (define/public (multiple-pages-ok?) (not is-eps?))
-
-    (super-new)
-    
-    (when c (init-cr-matrix c))))
-
-(define post-script-dc% (class (doc+page-check-mixin (dc-mixin (make-dc-backend #f))
-                                                     'post-script-dc%)
-                          (super-new)))
-(define pdf-dc% (class (doc+page-check-mixin (dc-mixin (make-dc-backend #t))
-                                             'pdf-dc%)
-                  (super-new)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/ps-setup.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/ps-setup.rkt
deleted file mode 100644
index ec2769eab0..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/ps-setup.rkt
+++ /dev/null
@@ -1,119 +0,0 @@
-#lang racket/base
-(require racket/class
-         "syntax.rkt")
-
-(provide ps-setup%
-         current-ps-setup
-         paper-sizes
-         
-         get-native
-         get-native-copy
-         set-native)
-
-(define-local-member-name
-  get-native
-  get-native-copy
-  set-native
-  get-all-numerics)
-
-(define paper-sizes
-  '(("A4 210 x 297 mm" 595 842)
-    ("A3 297 x 420 mm" 842 1190)
-    ("Letter 8 1/2 x 11 in" 612 792)
-    ("Legal 8 1/2 x 14 in" 612 1008)))
-
-(define (paper-name-string? s)
-  (and (string? s)
-       (assoc s paper-sizes)))
-
-(define ps-setup%
-  (class object%
-    (properties
-     [[string? command] "lpr"]
-     [[(make-or-false path-string?) file] #f]
-     [[bool? level-2] #t]
-     [[(symbol-in preview file printer) mode] 'file]
-     [[(symbol-in portrait landscape) orientation] 'portrait]
-     [[paper-name-string? paper-name] "Letter 8 1/2 x 11 in"]
-     [[string? preview-command] "gv"])
-
-    (define editor-margin-x 20.0)
-    (define editor-margin-y 20.0)
-    (define margin-x 16.0)
-    (define margin-y 16.0)
-    (define scale-x 0.8)
-    (define scale-y 0.8)
-    (define trans-x 0.0)
-    (define trans-y 0.0)
-
-    (define native #f)
-    (define native-copier #f)
-    (define/public (get-native) native)
-    (define/public (get-native-copy) 
-      (values (and native (native-copier native))
-              native-copier))
-    (define/public (set-native n copier)
-      (set! native n)
-      (set! native-copier copier))
-
-    (def/public (copy-from [ps-setup% source]
-                           [any? [filename? #f]])
-      (set! command (send source get-command))
-      (when filename? (set! file (send source get-file)))
-      (set! level-2 (send source get-level-2))
-      (set! mode (send source get-mode))
-      (set! orientation (send source get-orientation))
-      (set! paper-name (send source get-paper-name))
-      (set! preview-command (send source get-preview-command))
-      (set!-values (native native-copier) (send source get-native-copy))
-      (set!-values (editor-margin-x editor-margin-y
-                                    margin-x margin-y
-                                    scale-x scale-y
-                                    trans-x trans-y)
-                   (send source get-all-numerics)))
-
-    (define/public (get-all-numerics)
-      (values editor-margin-x editor-margin-y
-              margin-x margin-y
-              scale-x scale-y
-              trans-x trans-y))
-     
-    (def/public (get-editor-margin [(make-box nonnegative-real?) x]
-                                   [(make-box nonnegative-real?) y])
-      (set-box! x editor-margin-x)
-      (set-box! y editor-margin-y))
-    (def/public (set-editor-margin [nonnegative-real? x]
-                                   [nonnegative-real? y])
-      (set! editor-margin-x x)
-      (set! editor-margin-y y))
-     
-    (def/public (get-margin [(make-box nonnegative-real?) x]
-                            [(make-box nonnegative-real?) y])
-      (set-box! x margin-x)
-      (set-box! y margin-y))
-    (def/public (set-margin [nonnegative-real? x]
-                            [nonnegative-real? y])
-      (set! margin-x x)
-      (set! margin-y y))
-
-    (def/public (get-scaling [(make-box nonnegative-real?) x]
-                             [(make-box nonnegative-real?) y])
-      (set-box! x scale-x)
-      (set-box! y scale-y))
-    (def/public (set-scaling [nonnegative-real? x]
-                             [nonnegative-real? y])
-      (set! scale-x x)
-      (set! scale-y y))
-
-    (def/public (get-translation [(make-box nonnegative-real?) x]
-                                 [(make-box nonnegative-real?) y])
-      (set-box! x trans-x)
-      (set-box! y trans-y))
-    (def/public (set-translation [nonnegative-real? x]
-                                 [nonnegative-real? y])
-      (set! trans-x x)
-      (set! trans-y y))
-
-    (super-new)))
-
-(define current-ps-setup (make-parameter (new ps-setup%)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/record-dc.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/record-dc.rkt
deleted file mode 100644
index b1a11255a7..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/record-dc.rkt
+++ /dev/null
@@ -1,798 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe/atomic
-         "../unsafe/cairo.rkt"
-         "local.rkt"
-         "syntax.rkt"
-         "dc.rkt"
-         "dc-intf.rkt"
-         "bitmap.rkt"
-         "bitmap-dc.rkt"
-         "color.rkt"
-         "point.rkt"
-         "pen.rkt"
-         "brush.rkt"
-         "font.rkt"
-         "region.rkt"
-         "dc-path.rkt"
-         "gradient.rkt"
-         (for-syntax racket/base))
-
-(provide record-dc%
-         recorded-datum->procedure
-         (protect-out record-dc-mixin
-                      get-recorded-command
-                      reset-recording
-                      set-recording-limit))
-
-(define-local-member-name
-  get-recorded-command
-  reset-recording
-  set-recording-limit
-  record-unconvert)
-
-(struct dc-state (;; values from the target dc:
-                  region 
-                  alpha
-                  transformation 
-                  ;; virtual vaules for the target dc:
-                  scale-x scale-y 
-                  origin-x origin-y
-                  rotation
-                  initial-matrix))
-
-(define black (send the-color-database find-color "black"))
-
-(define (clone-point p)
-  (if (pair? p)
-      p
-      (cons (point-x p) (point-y p))))
-
-(define (clone-points ps)
-  (map clone-point ps))
-
-(define (clone-color c)
-  (if (string? c)
-      (string->immutable-string c)
-      (color->immutable-color c)))
-
-(define (convert-color c)
-  (if (string? c)
-      (string->immutable-string c)
-      (list (color-red c) (color-green c) (color-blue c) (color-alpha c))))
-
-(define (unconvert-color c)
-  (if (string? c)
-      (string->immutable-string c)
-      (make-object color% (car c) (cadr c) (caddr c) (cadddr c))))
-
-(define (clone-pen p)
-  (let ([s (send p get-stipple)])
-    (if s
-        (let ([p (make-object pen% 
-                              (send p get-color)
-                              (send p get-width)
-                              (send p get-style)
-                              (send p get-cap)
-                              (send p get-join))])
-          (send p set-stipple (clone-bitmap s))
-          p)
-        (send the-pen-list find-or-create-pen
-              (send p get-color)
-              (send p get-width)
-              (send p get-style)
-              (send p get-cap)
-              (send p get-join)))))
-
-(define (convert-pen p)
-  (let ([s (send p get-stipple)])
-    (list (convert-color (send p get-color))
-          (send p get-width)
-          (send p get-style)
-          (send p get-cap)
-          (send p get-join)
-          (and s (convert-bitmap s)))))
-
-(define (unconvert-pen l)
-  (define-values (c width style cap join stipple)
-    (apply values l))
-  (define color (unconvert-color c))
-  (if stipple
-      (let ([p (make-object pen% color width style cap join)])
-        (send p set-stipple (unconvert-bitmap stipple))
-        p)
-      (send the-pen-list find-or-create-pen color width style cap join)))
-
-(define (clone-brush b)
-  (cond
-   [(send b get-surface-handle-info)
-    => (lambda (hi)
-         (make-handle-brush (vector-ref hi 0) #:copy? #f
-                            (vector-ref hi 1)
-                            (vector-ref hi 2)
-                            (send b get-transformation)))]
-   [(send b get-stipple)
-    => (lambda (s)
-         (let ([b (make-object brush% 
-                               (send b get-color)
-                               (send b get-style))]
-               [t (send b get-transformation)])
-           (send b set-stipple (clone-bitmap s) t)
-           b))]
-   [(send b get-gradient)
-    => (lambda (g)
-         (make-object brush% 
-                      (send b get-color)
-                      (send b get-style)
-                      #f
-                      g
-                      (send b get-transformation)))]
-   [else
-    (send the-brush-list find-or-create-brush
-          (send b get-color)
-          (send b get-style))]))
-
-(define (convert-brush b)
-  (cond
-   [(send b get-surface-handle-info)
-    => (lambda (hi)
-         ;; Flatten the surface into a bitmap:
-         (define bm (surface-handle-info->bitmap hi))
-         (let ([b (make-object brush% 
-                               (send b get-color)
-                               (send b get-style))]
-               [t (send b get-transformation)])
-           (send b set-stipple bm t)
-           (convert-brush b)))]
-   [else
-    (let ([s (send b get-stipple)]
-          [g (send b get-gradient)])
-      (list (convert-color (send b get-color))
-            (send b get-style)
-            (and s (convert-bitmap s))
-            (and g (convert-gradient g))
-            (send b get-transformation)))]))
-
-(define (unconvert-brush l)
-  (define-values (c style stipple gradient transformation)
-    (apply values l))
-  (define color (unconvert-color c))
-  (if stipple
-      (let ([b (make-object brush% color style)])
-        (send b set-stipple (unconvert-bitmap stipple) 
-              transformation)
-        b)
-      (if gradient
-          (make-object brush% 
-                       color
-                       style
-                       #f
-                       (unconvert-gradient gradient)
-                       transformation)
-          (send the-brush-list find-or-create-brush color style))))
-
-(define (convert-gradient g)
-  (if (g . is-a? . linear-gradient%)
-      (let-values ([(x1 y1 x2 y2) (send g get-line)])
-        (list x1 y1 x2 y2 (convert-stops (send g get-stops))))
-      (let-values ([(x1 y1 r1 x2 y2 r2) (send g get-circles)])
-        (list x1 y1 r1 x2 y2 r2 (convert-stops (send g get-stops))))))
-
-(define (unconvert-gradient l)
-  (if (= (length l) 5)
-      (make-object linear-gradient% 
-                   (car l) (cadr l) (caddr l) (cadddr l)
-                   (unconvert-stops (list-ref l 4)))
-      (make-object radial-gradient% 
-                   (car l) (cadr l) (caddr l) 
-                   (list-ref l 3) (list-ref l 4) (list-ref l 5)
-                   (unconvert-stops (list-ref l 6)))))
-
-(define (convert-stops s)
-  (for/list ([i (in-list s)]) (cons (car i) (convert-color (cadr i)))))
-(define (unconvert-stops s)
-  (for/list ([i (in-list s)]) (list (car i) (unconvert-color (cdr i)))))
-
-(define (region-maker r)
-  (if r
-      (if (send r internal-get-dc)
-          (let ([paths (send r get-paths)])
-            (values (lambda (dc state)
-                      (let ([new-r (make-object region% dc)])
-                        (send new-r set-paths! (transform-region-paths paths (dc-state-transformation state)))
-                        new-r))
-                    paths
-                    #t))
-          (let ([new-r (make-object region%)])
-            (send new-r union r)
-            (values (lambda (dc state) new-r)
-                    new-r
-                    #f)))
-      (values (lambda (dc state) #f)
-              #f
-              #f)))
-
-(define (transform-region-paths paths t)
-  (if (equal? t '#(1.0 0.0 0.0 1.0 0.0 0.0))
-      paths
-      ;; the paths in `path's have points that were transformed
-      ;; by the recording dc's transformation, but we need to prefix
-      ;; that with the transformation of the record action's target dc
-      (map (lambda (p)
-             (define old-p (car p))
-             (define new-p (new dc-path%))
-             (send new-p append old-p)
-             (send new-p transform t)
-             (cons new-p (cdr p)))
-           paths)))
-
-(define (convert-region paths/r has-dc?)
-  (and paths/r
-       (cons has-dc?
-             (map (lambda (s) (cons (convert-path (car s)) (cdr s)))
-                  (if (paths/r . is-a? . region%)
-                      (send paths/r get-paths)
-                      paths/r)))))
-
-(define (unconvert-region l)
-  (if l
-      (let ()
-        (define paths (map (lambda (p) (cons (unconvert-path (car p)) (cdr p)))
-                           (cdr l)))
-        (if (car l)
-            (lambda (dc state)
-              (let ([new-r (make-object region% (and (car l) dc))])
-                (send new-r set-paths! (transform-region-paths paths (dc-state-transformation state)))
-                new-r))
-            (let ([new-r (make-object region%)])
-              (send new-r set-paths! paths)
-              (lambda (dc state) new-r))))
-      (lambda (dc state) #f)))
-
-(define (combine-regions dc r1 r2)
-  (cond
-   [(not r1) r2]
-   [(not r2) r1]
-   [else 
-    (define dc1 (send r1 internal-get-dc))
-    (cond
-     [(eq? (not dc1)
-           (not (send r2 internal-get-dc)))
-      ;; regions have same dc-ness:
-      (define r (make-object region% dc1))
-      (send r union r1)
-      (send r intersect r2)
-      r]
-     [(not dc1)
-      (combine-regions dc r2 r1)]
-     [else
-      ;; r1 has dc, r2 doesn't; convert r2 to dc-attached region:
-      (define r (make-object region% dc))
-      (define paths (send r2 get-paths))
-      (send r set-paths! (transform-region-paths paths (send dc get-initial-matrix)))
-      (combine-regions dc r1 r)])]))
-
-(define (clone-path p)
-  (let ([new-p (make-object dc-path%)])
-    (send new-p append p)
-    p))
-
-(define (convert-path p)
-  (cons (send p get-closed-points)
-        (send p get-open-points)))
-
-(define (unconvert-path l)
-  (define p (new dc-path%))
-  (send p set-closed+open-points (car l) (cdr l))
-  p)
-
-(define (clone-bitmap b)
-  (and b
-       (let* ([new-b (make-object bitmap% 
-                                  (send b get-width) 
-                                  (send b get-height)
-                                  (not (send b is-color?))
-                                  (send b has-alpha-channel?)
-                                  (send b get-backing-scale))]
-              [dc (make-object bitmap-dc% new-b)])
-         (send dc draw-bitmap b 0 0)
-         (send dc set-bitmap #f)
-         new-b)))
-
-(define (convert-bitmap b)
-  (and b
-       (let ()
-         (define w (send b get-width))
-         (define h (send b get-height))
-         (define s (send b get-backing-scale))
-         (define (scale v) (inexact->exact (ceiling (* s v))))
-         (define sw (scale w))
-         (define sh (scale h))
-         (define bstr (make-bytes (* 4 sw sh)))
-         (send b get-argb-pixels 0 0 sw sh bstr #:unscaled? #t)
-         (define l (list w h
-                         (send b is-color?)
-                         (send b has-alpha-channel?)
-                         (bytes->immutable-bytes bstr)))
-         (if (= s 1)
-             l
-             (list* 'scale s l)))))
-
-(define (unconvert-bitmap l)
-  (and l
-       (let ()
-         (define-values (s w h color? alpha? bstr)
-           (apply values (if (eq? (car l) 'scale)
-                             (cdr l)
-                             (cons 1.0 l))))
-         (define bm (make-object bitmap% w h (not color?) alpha? s))
-         (define (scale v) (inexact->exact (ceiling (* s v))))
-         (send bm set-argb-pixels 0 0 (scale w) (scale h) bstr #:unscaled? #t)
-         bm)))
-
-(define (convert-font f)
-  (list (send f get-point-size)
-        (send f get-face)
-        (send f get-family)
-        (send f get-style)
-        (send f get-weight)
-        (send f get-underlined)
-        (send f get-smoothing)
-        (send f get-size-in-pixels)))
-
-(define (unconvert-font l)
-  (apply make-object font% l))
-
-(define (install-transform dc state)
-  (send dc set-transformation (vector (dc-state-transformation state) 0 0 1 1 0))
-  (send dc transform (dc-state-initial-matrix state))
-  (send dc translate (dc-state-origin-x state) (dc-state-origin-y state))
-  (send dc scale (dc-state-scale-x state) (dc-state-scale-y state))
-  (send dc rotate (dc-state-rotation state))
-  state)
-
-(define (record-dc-mixin %)
-  (class %
-    (super-new)
-
-    (inherit get-origin get-scale get-rotation get-initial-matrix 
-             get-pen get-brush get-font
-             get-smoothing get-text-mode 
-             get-background get-text-background get-text-foreground
-             get-alpha get-clipping-region
-             translate rotate scale)
-
-    (define record-limit +inf.0)
-    (define current-size 0)
-
-    (define/public (set-recording-limit amt)
-      (set! record-limit amt))
-    (define/private (continue-recording?)
-      (current-size . < . record-limit))
-
-    (define-syntax (define/record stx)
-      (syntax-case stx ()
-        [(_ (name arg ...))
-         (let ([args (syntax->list #'(arg ...))])
-           (with-syntax ([(arg-id ...)
-                          (map (lambda (arg)
-                                 (syntax-case arg ()
-                                   [([id def-val]) #'id]
-                                   [([id def-val] clone-id convert-id unconvert-id) #'id]
-                                   [(id clone-id convert-id unconvert-id) #'id]
-                                   [(id clone-id) #'id]
-                                   [else arg]))
-                               args)]
-                         [(arg-formal ...)
-                          (map (lambda (arg)
-                                 (syntax-case arg ()
-                                   [(id) #'id]
-                                   [(id clone-id convert-id unconvert-id) #'id]
-                                   [(id clone-id) #'id]
-                                   [else arg]))
-                               args)]
-                         [(arg-bind ...)
-                          (map (lambda (arg)
-                                 (syntax-case arg ()
-                                   [([id def-val])
-                                    #'[id id]]
-                                   [([id def-val] clone-id convert-id unconvert-id)
-                                    #'[id (clone clone-id id)]]
-                                   [(id clone-id convert-id unconvert-id)
-                                    #'[id (clone clone-id id)]]
-                                   [(id clone-id)
-                                    #'[id (clone clone-id id)]]
-                                   [id
-                                    #'[id id]]))
-                               args)]
-                         [((arg-convert ...) ...)
-                          (map (lambda (arg)
-                                 (syntax-case arg ()
-                                   [(formal clone-id convert-id unconvert-id)
-                                    #'(convert convert-id)]
-                                   [_ #'(values)]))
-                               args)])
-             #'(define/override (name arg-formal ...)
-                 (begin0
-                  (super name arg-id ...)
-                  (when (continue-recording?)
-                    (let (arg-bind ...)
-                      (record (lambda (dc) (send dc name arg-id ...))
-                              (lambda () (list 'name (arg-convert ... arg-id) ...)))))))))]))
-
-    (define-syntax (generate-record-unconvert stx)
-      (syntax-case stx ()
-        [(_ ([clause-tags clause-rhs] ...) (defn (name arg ...)) ...)
-         (with-syntax ([((arg-id ...) ...)
-                        (let ([names (syntax->list #'(name ...))]
-                              [argss (syntax->list #'((arg ...) ...))])
-                          (map (lambda (name args)
-                                 (map (lambda (arg)
-                                        (syntax-case arg ()
-                                          [([id def-val]) #'id]
-                                          [([id def-val] clone-id convert-id unconvert-id) #'id]
-                                          [(id clone-id convert-id unconvert-id) #'id]
-                                          [(id clone-id) #'id]
-                                          [else arg]))
-                                      (syntax->list args)))
-                               names
-                               argss))]
-                       [(((arg-bind ...) ...) ...)
-                        (let ([argss (syntax->list #'((arg ...) ...))])
-                          (map (lambda (args)
-                                 (map (lambda (arg)
-                                        (syntax-case arg ()
-                                          [([id def-val] clone-id convert-id unconvert-id)
-                                           #'([id (unconvert-id id)])]
-                                          [(id clone-id convert-id unconvert-id)
-                                           #'([id (unconvert-id id)])]
-                                          [_ #'()]))
-                                      (syntax->list args)))
-                               argss))])
-           #'(begin
-               (defn (name arg ...)) ...
-               (define/public (record-unconvert cmds)
-                 (for/list ([cmd (in-list cmds)])
-                   (define cmd-tag (car cmd))
-                   (define cmd-args (cdr cmd))
-                   (case cmd-tag
-                     [clause-tags (apply clause-rhs cmd-args)] ...
-                     [(name)
-                      (apply (lambda (arg-id ...)
-                               (let (arg-bind ... ...)
-                                 (lambda (dc) (send dc name arg-id ...))))
-                             cmd-args)]
-                     ...
-                     [else (error 'unconvert "bad datum: ~e" cmd-tag)])))))]))
-
-    (define procs null)
-    (define converts null)
-    (define/private (record proc convert)
-      (when (continue-recording?)
-        (start-atomic)
-        (set! current-size (add1 current-size))
-        (set! procs (cons proc procs))
-        (set! converts (cons convert converts))
-        (end-atomic)))
-
-    (define/public (get-recorded-command [serialize? #f])
-      (and (continue-recording?)
-           (if serialize?
-               (for/list ([convert (in-list (reverse converts))])
-                 (convert))
-               ((if (applies-to-default?) generate-drawer generate-drawer/restore)
-                (reverse procs)))))
-
-    (define/public (reset-recording)
-      (start-atomic)
-      (set! clones (make-hasheq))
-      (set! converteds (make-hasheq))
-      (set! procs null)
-      (set! converts null)
-      (set! current-size 0)
-      (end-atomic)
-      ;; install current configuration explicitly (so it gets recorded):
-      (let-values ([(ox oy) (get-origin)]
-                   [(sx sy) (get-scale)]
-                   [(r) (get-rotation)]
-                   [(m) (get-initial-matrix)]
-                   [(p) (get-pen)]
-                   [(b) (get-brush)]
-                   [(s) (get-smoothing)]
-                   [(f) (get-font)]
-                   [(tm) (get-text-mode)]
-                   [(bg) (get-background)]
-                   [(tbg) (get-text-background)]
-                   [(tfg) (get-text-foreground)]
-                   [(a) (get-alpha)]
-                   [(cr) (get-clipping-region)]
-                   [(to-default?) (applies-to-default?)])
-        (unless (and (zero? ox) (zero? oy)) (set-origin ox oy))
-        (unless (and (= 1 sx) (= 1 sy)) (set-scale sx sy))
-        (unless (zero? r) (set-rotation r))
-        (unless (equal? m '#(1.0 0.0 0.0 1.0 0.0 0.0)) (set-initial-matrix m))
-        (do-set-pen! p)
-        (do-set-brush! b)
-        (set-font f)
-        (unless (and to-default? (eq? s 'unsmoothed)) (set-smoothing s))
-        (unless (and to-default? (eq? tm 'transparent)) (set-text-mode tm))
-        (unless (and to-default? (= a 1.0)) (set-alpha a))
-        (unless (and to-default? (not cr)) (set-clipping-region cr))
-        (unless (and to-default? (and (= (color-red bg) 255)
-                                      (= (color-green bg) 255)
-                                      (= (color-blue bg) 255)))
-          (set-background bg))
-        (unless (and to-default? (and (= (color-red tbg) 255)
-                                      (= (color-green tbg) 255)
-                                      (= (color-blue tbg) 255)))
-          (set-text-background tbg))
-        (unless (and to-default? (and (= (color-red tfg) 0)
-                                      (= (color-green tfg) 0)
-                                      (= (color-blue tfg) 0)))
-          (set-text-foreground tfg))))
-
-    (define/public (applies-to-default?) #t)
-
-    (define clones (make-hasheq))
-    (define/private (clone clone-x x)
-      (or (let ([new-x (hash-ref clones x #f)])
-            (and new-x
-                 (equal? new-x x)
-                 new-x))
-          (let ([new-x (clone-x x)])
-            (when (equal? new-x x)
-              (hash-set! clones x new-x))
-            new-x)))
-
-    (define converteds (make-hasheq))
-    (define/private (convert convert-x x)
-      (or (hash-ref converteds x #f)
-          (let ([new-x (convert-x x)])
-            (hash-set! converteds x new-x)
-            new-x)))
-
-    (define/override (erase)
-      (super erase)
-      (reset-recording))
-
-    ;; For the compsable part of the DC, we write things out the long way.
-    ;; For everythign else, we use `define/record'.
-
-    (define/override (set-clipping-region r)
-      (do-set-clipping-region r))
-
-    (define/private (do-set-clipping-region r)
-      (super set-clipping-region r)
-      (when (continue-recording?)
-        (let-values ([(make-r paths has-dc?) (region-maker r)])
-          (record (lambda (dc state) 
-                    (send dc set-clipping-region (combine-regions dc
-                                                                  (dc-state-region state)
-                                                                  (make-r dc state)))
-                    state)
-                  (lambda () (list 'set-clipping-region (convert-region paths has-dc?)))))))
-
-    (def/override (set-clipping-rect [real? x] 
-                                     [real? y] 
-                                     [nonnegative-real? w]
-                                     [nonnegative-real? h])
-      (let ([r (make-object region% this)])
-        (send r set-rectangle x y w h)
-        (do-set-clipping-region r)))
-
-    (define/override (set-alpha a)
-      (super set-alpha a)
-      (record (lambda (dc state)
-                (send dc set-alpha (* a (dc-state-alpha state)))
-                state)
-              (lambda () `(set-alpha ,a))))
-
-    (define/override (set-scale sx sy)
-      (super set-scale sx sy)
-      (record (lambda (dc state)
-                (install-transform dc (struct-copy dc-state state [scale-x sx] [scale-y sy])))
-              (lambda () `(set-scale ,sx ,sy))))
-    (define/override (set-origin ox oy)
-      (super set-origin ox oy)
-      (record (lambda (dc state)
-                (install-transform dc (struct-copy dc-state state [origin-x ox] [origin-y oy])))
-              (lambda () `(set-origin ,ox ,oy))))
-    (define/override (set-rotation r)
-      (super set-rotation r)
-      (record (lambda (dc state)
-                (install-transform dc (struct-copy dc-state state [rotation r])))
-              (lambda () `(set-rotation ,r))))
-    (define/override (set-initial-matrix mi)
-      (super set-initial-matrix mi)
-      (let ([mi (vector->immutable-vector mi)])
-        (record (lambda (dc state)
-                  (install-transform dc (struct-copy dc-state state [initial-matrix mi])))
-                (lambda () `(set-initial-matrix ,mi)))))
-
-    (generate-record-unconvert
-     ([(set-clipping-region) (lambda (r) 
-                               (define make-r (unconvert-region r))
-                               (lambda (dc state)
-                                 (send dc set-clipping-region (combine-regions dc
-                                                                               (dc-state-region state)
-                                                                               (make-r dc state)))
-                                 state))]
-      [(set-clipping-rect) ;; backward compatibility for old datums
-       (lambda (x y w h)
-         (define r (make-object region% #f))
-         (send r set-rectangle x y w h)
-         (define make-r (unconvert-region (convert-region r #f)))
-         (lambda (dc state)
-           (send dc set-clipping-region (combine-regions dc
-                                                         (dc-state-region state)
-                                                         (make-r dc state)))
-           state))]
-      [(set-alpha) (lambda (a)
-                     (lambda (dc state)
-                       (send dc set-alpha (* a (dc-state-alpha state)))
-                       state))]
-      [(set-scale) (lambda (sx sy)
-                     (lambda (dc state)
-                       (install-transform dc (struct-copy dc-state state [scale-x sx] [scale-y sy]))))]
-      [(set-origin) (lambda (ox oy)
-                      (lambda (dc state)
-                        (install-transform dc (struct-copy dc-state state [origin-x ox] [origin-y oy]))))]
-      [(set-rotation) (lambda (r)
-                        (lambda (dc state)
-                          (install-transform dc (struct-copy dc-state state [rotation r]))))]
-      [(set-initial-matrix) (lambda (mi)
-                              (lambda (dc state)
-                                (install-transform dc (struct-copy dc-state state [initial-matrix mi]))))])
-     ;; remaining clauses are generated:
-
-     (define/record (transform [mi vector->immutable-vector]))
-
-     (define/record (set-smoothing s))
-
-     (define/record (set-font [f values convert-font unconvert-font]))
-
-     (define/record (do-set-pen! [p clone-pen convert-pen unconvert-pen]))
-
-     (define/record (do-set-brush! [b clone-brush convert-brush unconvert-brush]))
-
-     (define/record (set-text-foreground [c clone-color convert-color unconvert-color]))
-
-     (define/record (set-text-background [c clone-color convert-color unconvert-color]))
-     
-     (define/record (set-background [c clone-color convert-color unconvert-color]))
-     
-     (define/record (set-text-mode m))
-
-     (define/record (clear))
-     
-     (define/record (draw-arc x y width height start-radians end-radians))
-
-     (define/record (draw-ellipse x y w h))
-     
-     (define/record (draw-line x1 y1 x2 y2))
-
-     (define/record (draw-point x y))
-     
-     (define/record (draw-lines [pts clone-points] [[x 0.0]] [[y 0.0]]))
-
-     (define/record (draw-polygon [pts clone-points] [[x 0.0]] [[y 0.0]] [[fill-style 'odd-even]]))
-
-     (define/record (draw-rectangle x y w h))
-     
-     (define/record (draw-rounded-rectangle x y w h [[radius -0.25]]))
-
-     (define/record (draw-spline x1 y1 x2 y2 x3 y3))
-
-     (define/record (draw-path [path clone-path convert-path unconvert-path] 
-                               [[x 0.0]] [[y 0.0]] [[fill-style 'odd-even]]))
-     
-     (define/record (draw-text [s string->immutable-string] x y 
-                               [[combine? #f]] [[offset 0]] [[angle 0.0]]))
-     
-     (define/record (draw-bitmap [src clone-bitmap convert-bitmap unconvert-bitmap]
-                                 dx dy [[style 'solid]]
-                                 [[color black] clone-color convert-color unconvert-color]
-                                 [[mask #f] clone-bitmap convert-bitmap unconvert-bitmap]))
-     
-     (define/record (draw-bitmap-section [src clone-bitmap convert-bitmap unconvert-bitmap]
-                                         dx dy sx sy sw sh [[style 'solid]] 
-                                         [[color black] clone-color convert-color unconvert-color]
-                                         [[mask #f] clone-bitmap convert-bitmap unconvert-bitmap])))))
-
-;; ----------------------------------------
-
-(define record-dc-backend%
-  (class default-dc-backend%
-    (init [[-width width] 640]
-          [[-height height] 480])
-
-    (define-values (width height)
-      (case-args 
-       (list -width -height)
-       [([nonnegative-real? w]
-         [nonnegative-real? h])
-        (values w h)]
-       (init-name 'record-dc%)))
-
-    (define/override (ok?) #t)
-
-    ;; We need a cair context and surface to measure text:
-    (define c (cairo_create (cairo_image_surface_create CAIRO_FORMAT_ARGB32 1 1)))
-    (define/override (get-cr) c)
-
-    (def/override (get-size)
-      (values (exact->inexact width)
-              (exact->inexact height)))
-
-    (super-new)))
-
-(define record-dc%
-  (class (record-dc-mixin (dc-mixin record-dc-backend%))
-    (inherit reset-recording
-             get-recorded-command)
-
-    (define/public (get-recorded-procedure)
-      (get-recorded-command #f))
-
-    (define/public (get-recorded-datum)
-      (get-recorded-command #t))
-
-    (define/override (applies-to-default?) #f)
-    
-    (super-new)
-    (reset-recording)))
-
-(define (recorded-datum->procedure d)
-  (generate-drawer/restore (send (new record-dc%) record-unconvert d)))
-
-(define (generate-drawer procs)
-  (lambda (dc)
-    (define cr (send dc get-clipping-region))
-    (define a (send dc get-alpha))
-    (define t (send dc get-initial-matrix))
-    (for/fold ([state (dc-state cr a t 1.0 1.0 0.0 0.0 0.0 '#(1.0 0.0 0.0 1.0 0.0 0.0))]) ([proc (in-list procs)])
-      (if (procedure-arity-includes? proc 2)
-          (proc dc state)
-          (begin
-            (proc dc)
-            state)))))
-
-(define (generate-drawer/restore procs)
-  (lambda (dc)
-    (unless (dc . is-a? . dc<%>)
-      (raise-type-error 'recorded-datum->procedure "dc<%> object" dc))
-    ;; save all the existing state:
-    (define-values (ox oy) (send dc get-origin))
-    (define-values (sx sy) (send dc get-scale))
-    (define r (send dc get-rotation))
-    (define m (send dc get-initial-matrix))
-    (define p (send dc get-pen))
-    (define b (send dc get-brush))
-    (define s (send dc get-smoothing))
-    (define f (send dc get-font))
-    (define tm (send dc get-text-mode))
-    (define bg (send dc get-background))
-    (define tbg (send dc get-text-background))
-    (define tfg (send dc get-text-foreground))
-    (define a (send dc get-alpha))
-    (define cr (send dc get-clipping-region))
-    
-    (send dc translate 0 0) ; forces all transformation into the initial matrix
-    
-    ((generate-drawer procs) dc)
-    
-    ;; Restore the state:
-    (send dc set-origin ox oy)
-    (send dc set-scale sx sy)
-    (send dc set-rotation r)
-    (send dc set-initial-matrix m)
-    (send dc do-set-pen! p)
-    (send dc do-set-brush! b)
-    (send dc set-font f)
-    (send dc set-smoothing s)
-    (send dc set-text-mode tm)
-    (send dc set-background bg)
-    (send dc set-text-background tbg)
-    (send dc set-text-foreground tfg)
-    (send dc set-alpha a)
-    (send dc set-clipping-region cr)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/region.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/region.rkt
deleted file mode 100644
index 46862eccb0..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/region.rkt
+++ /dev/null
@@ -1,330 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe/atomic
-         "syntax.rkt"
-         "local.rkt"
-         "../unsafe/cairo.rkt"
-         "dc-path.rkt"
-         "dc-intf.rkt"
-         "point.rkt")
-
-(provide region%
-
-         get-paths
-         set-paths!
-         internal-get-dc)
-
-(define-local-member-name
-  get-paths
-  set-paths!
-  internal-get-dc)
-
-(define temp-cr #f)
-
-(define region%
-  (class object%
-
-    (init [(the-dc dc) #f])
-    (define dc the-dc)
-    (when dc
-      (unless (dc . is-a? . dc<%>)
-        (raise-type-error (init-name 'region%)
-                          "dc<%> instance or #f"
-                          dc)))
-
-    ;; Intersected paths, each as (cons <path> <fill-style>),
-    ;;  where <fill-style> is 'odd-even, 'winding, or 'any.
-    ;; A null path list corresponds to an empty region.
-    (define paths null)
-    (define/public (get-paths) paths)
-    (define/public (set-paths! p)
-      (set! paths p)
-      (set! empty-known? #f))
-
-    (define locked 0)
-    (define/public (lock-region delta) (set! locked (+ locked delta)))
-
-    (define my-key (gensym))
-
-    (define empty-known? #f) ; #t => `known-empty?' records `empty?' result
-    (define known-empty? #f)
-    (define/private (modifying who)
-      (when (positive? locked)
-        (error (method-name 'region% who)
-               "region is locked (installed into a dc<%>): "
-               this))
-      (set! empty-known? #f))
-
-    (define matrix (and dc (send dc get-clipping-matrix)))
-    
-    (def/public (get-dc) dc)
-    (define/public (internal-get-dc) dc)
-
-    (def/public (get-bounding-box)
-      (if (null? paths)
-          (values 0.0 0.0 0.0 0.0)
-          (let-values ([(l t w h) (send (caar paths) get-bounding-box)])
-            (let loop ([paths (cdr paths)]
-                       [l l]
-                       [t t]
-                       [r (+ l w)]
-                       [b (+ t h)])
-              (if (null? paths)
-                  (if matrix
-                      ;; Convert absolute coordinates back to the DC's
-                      ;;  logical space by inverting its transformation
-                      (let ([m (send dc get-clipping-matrix)])
-                        ;; Matrix is [ma mc 
-                        ;;            mb md]
-                        (let ([ma (vector-ref m 0)]
-                              [mb (vector-ref m 2)]
-                              [mc (vector-ref m 1)]
-                              [md (vector-ref m 3)]
-                              [dx (vector-ref m 4)]
-                              [dy (vector-ref m 5)])
-                          (let ([det (- (* ma md) (* mb mc))])
-                            (if (zero? det)
-                                ;; determinant is 0 => dc's matrix maps any area to 0
-                                (values 0.0 0.0 0.0 0.0)
-                                ;; tx and ty apply inverse matrix
-                                (let ([tx (lambda (x y)
-                                            (let ([x (- x dx)]
-                                                  [y (- y dy)])
-                                              (/ (- (* md x) (* mb y)) det)))]
-                                      [ty (lambda (x y)
-                                            (let ([x (- x dx)]
-                                                  [y (- y dy)])
-                                              (/ (- (* ma y) (* mc x)) det)))])
-                                  ;; unwind bound-box points to pre-transformed
-                                  (let ([l (tx l t)]
-                                        [t (ty l t)]
-                                        [r (tx r b)]
-                                        [b (ty r b)])
-                                    (values l t (- r l) (- b t))))))))
-                      ;; no dc un-transformation needed
-                      (values l t (- r l) (- b t)))
-                  (let-values ([(l2 t2 w2 h2) (send (caar paths) get-bounding-box)])
-                    (loop (cdr paths)
-                          (min l l2)
-                          (min t t2)
-                          (max r (+ l2 w2))
-                          (max b (+ t2 h2)))))))))
-
-    (define/public (install-region cr scroll-dx scroll-dy align-x align-y 
-                                   [init (void)] [install (lambda (cr v) (cairo_clip cr))]
-                                   #:init-matrix [init-matrix (lambda (cr) (void))])
-      (let ([default-fill-rule (if (ormap (lambda (pr) (eq? (cdr pr) 'odd-even)) paths)
-                                   CAIRO_FILL_RULE_EVEN_ODD
-                                   CAIRO_FILL_RULE_WINDING)]
-            [old-matrix (and matrix
-                             (let ([m (make-cairo_matrix_t 0 0 0 0 0 0)])
-                               (cairo_get_matrix cr m)
-                               m))])
-        (when old-matrix 
-          ;; each path is already transformed
-          (cairo_identity_matrix cr)
-          (init-matrix cr)
-          (cairo_transform cr (make-cairo_matrix_t 1 0 0 1 scroll-dx scroll-dy)))
-        (begin0
-         (if (null? paths)
-             (begin
-               (cairo_new_path cr)
-               (install cr init))
-             (for/fold ([v init]) ([pr (in-list paths)])
-               (cairo_new_path cr)
-               (send (car pr) do-path cr values values)
-               (cairo_set_fill_rule cr
-                                    (case (cdr pr)
-                                      [(odd-even) CAIRO_FILL_RULE_EVEN_ODD]
-                                      [(winding) CAIRO_FILL_RULE_WINDING]
-                                      [else default-fill-rule]))
-               (install cr v)))
-         (when old-matrix (cairo_set_matrix cr old-matrix)))))
-
-    (def/public (is-empty?)
-      (really-is-empty?))
-
-    (define/private (with-clipping who proc)
-      (unless dc
-        (raise-mismatch-error (method-name 'region% who) 
-                              "not allowed for a region without a drawing context: "
-                              this))
-      (send dc in-cairo-context 
-            (lambda (cr)
-              (cairo_save cr)
-              (install-region cr 0 0 values values)
-              (begin0
-               (proc cr)
-               (cairo_restore cr)))))
-
-    (define/private (really-is-empty?)
-      (or (null? paths)
-          (if empty-known?
-              known-empty?
-              (let ([v (with-clipping
-                        'is-empty?
-                        (lambda (cr)
-                          (let-values ([(x1 y1 x2 y2) (cairo_clip_extents cr)])
-                            (or (= x1 x2) (= y1 y2)))))])
-                (set! known-empty? v)
-                (set! empty-known? #t)
-                v))))
-    
-    (define/private (with-temp-cr proc)
-      (let ([cr (call-as-atomic
-                 (lambda ()
-                   (cond
-                    [temp-cr 
-                     (begin0 temp-cr (set! temp-cr #f))]
-                    [else
-                     (let ([s (cairo_image_surface_create CAIRO_FORMAT_A8 100 100)])
-                       (begin0
-                        (cairo_create s)
-                        (cairo_surface_destroy s)))])))])
-        (begin0
-         (proc cr)
-         (call-as-atomic
-          (lambda ()
-            (cond
-             [temp-cr (cairo_destroy cr)]
-             [else (set! temp-cr cr)]))))))
-    
-    (define/public (in-region? x y)
-      (with-temp-cr
-       (lambda (cr)
-        (let-values ([(x y)
-                      (if matrix
-                          ;; need to use the DC's current transformation
-                          (let ([m (send dc get-clipping-matrix)])
-                            (values (+ (* x (vector-ref m 0))
-                                       (* y (vector-ref m 2))
-                                       (vector-ref m 4))
-                                    (+ (* x (vector-ref m 1))
-                                       (* y (vector-ref m 3))
-                                       (vector-ref m 5))))
-                          ;; no transformation needed
-                          (values x y))])
-          (install-region cr 0 0 values values
-                          #t
-                          (lambda (cr v) (and v (cairo_in_fill cr x y))))))))
-
-    (define/public (set-arc x y width height start-radians end-radians)
-      (modifying 'set-arc)
-      (let ([p (new dc-path%)])
-        (send p move-to (+ x (/ width 2)) (+ y (/ height 2)))
-        (send p arc x y width height start-radians end-radians)
-        (send p close)
-        (when matrix (send p transform matrix))
-        (set! paths (list (cons p 'any)))))
-
-    (define/public (set-ellipse x y width height)
-      (modifying 'set-ellipse)
-      (let ([p (new dc-path%)])
-        (send p ellipse x y width height)
-        (when matrix (send p transform matrix))
-        (set! paths (list (cons p 'any)))))
-
-    (define/public (set-path path
-                             [x 0.0] [y 0.0]
-                             [fill-style 'odd-even])
-      (modifying 'set-path)
-      (let ([p (new dc-path%)])
-        (send p append path)
-        (send p translate x y)
-        (when matrix (send p transform matrix))
-        (set! paths (list (cons p fill-style)))))
-
-    (define/public (set-polygon pts
-                                [x 0.0] [y 0.0]
-                                [fill-style 'odd-even])
-      (modifying 'set-polygon)
-      (if (null? pts)
-          (set! paths null)
-          (let ([p (new dc-path%)])
-            (let ([i (car pts)])
-              (if (pair? i)
-                  (send p move-to (+ x (car i)) (+ y (cdr i)))
-                  (send p move-to (+ x (point-x i)) (+ y (point-y i)))))
-            (for ([i (in-list (cdr pts))])
-              (if (pair? i)
-                  (send p line-to (+ x (car i)) (+ y (cdr i)))
-                  (send p line-to (+ x (point-x i)) (+ y (point-y i)))))
-            (send p close)
-            (when matrix (send p transform matrix))
-            (set! paths (list (cons p fill-style))))))
-
-    (define/public (set-rectangle x y width height)
-      (modifying 'set-rectangle)
-      (let ([p (new dc-path%)])
-        (send p rectangle x y width height)
-        (when matrix (send p transform matrix))
-        (set! paths (list (cons p 'any)))))
-
-    (define/public (set-rounded-rectangle x y width height [radius -0.25])
-      (modifying 'set-rounded-rectangle)
-      (let ([p (new dc-path%)])
-        (send p rounded-rectangle x y width height radius)
-        (when matrix (send p transform matrix))
-        (set! paths (list (cons p 'any)))))
-
-    (define/private (check-compatible r who)
-      (unless (equal? dc (send r internal-get-dc))
-        (raise-mismatch-error (method-name 'region% who)
-                              "different built-in dc for given region: " 
-                              r)))
-
-    (define/public (intersect r)
-      (check-compatible r 'union)
-      (modifying 'intersect)
-      (set! paths (append paths (send r get-paths))))
-
-    (define/public (subtract r)
-      (check-compatible r 'subtract)
-      (unless (null? paths)
-        (let ([add-paths (send r get-paths)])
-          (unless (null? add-paths)
-            (let ([p paths])
-              (do-union 'subtract r  (lambda (p) (rev-paths p)))
-              (set! paths (append paths p)))))))
-
-    (define/public (union r)
-      (do-union 'union r values))
-
-    (define/public (xor r)
-      (do-union 'xor r (lambda (p) (rev-paths p))))
-
-    (define/private rev-paths
-      (lambda (paths)
-        (map (lambda (pr)
-               (let ([p (new dc-path%)])
-                 (send p append (car pr))
-                 (send p reverse)
-                 (cons p (cdr pr))))
-             paths)))
-
-    (define/private (do-union who r adjust)
-      (check-compatible r who)
-      (modifying who)
-      (let ([add-paths (send r get-paths)])
-        (unless (null? add-paths)
-          (if (null? paths)
-              (set! paths add-paths)
-              (let ([add-paths (adjust add-paths)])
-                (let ([a (car paths)]
-                      [b (car add-paths)])
-                  (set! paths 
-                        (cons (let ([p (new dc-path%)])
-                                (send p append (car a))
-                                (send p append (car b))
-                                (cons p (cond
-                                         [(or (eq? (cdr a) 'odd-even)
-                                              (eq? (cdr b) 'odd-even))
-                                          'odd-even]
-                                         [(or (eq? (cdr a) 'winding)
-                                              (eq? (cdr b) 'winding))
-                                          'winding]
-                                         [else 'any])))
-                              (append (cdr paths)
-                                      (cdr add-paths))))))))))
-
-    (super-new)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/svg-dc.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/svg-dc.rkt
deleted file mode 100644
index 6b2879b184..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/svg-dc.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang racket/base
-(require racket/class
-         "syntax.rkt"
-         "../unsafe/cairo.rkt"
-         "dc.rkt"
-         "local.rkt"
-         "page-dc.rkt"
-         "write-bytes.rkt")
-
-(provide svg-dc%)
-
-(define dc-backend%
-  (class default-dc-backend%
-    (init [(init-w width)]
-          [(init-h height)]
-          [(init-output output)]
-          [exists 'error])
-
-    (unless (and (real? init-w) (not (negative? init-w)))
-      (raise-type-error (init-name 'svg-dc%) "nonnegative real or #f" init-w))
-    (unless (and (real? init-h) (not (negative? init-h)))
-      (raise-type-error (init-name 'svg-dc%) "nonnegative real or #f" init-h))
-    (unless (or (output-port? init-output)
-                (path-string? init-output))
-      (raise-type-error (init-name 'svg-dc%) "path string or output port" init-output))
-    (unless (memq exists '(error append update can-update
-                                 replace truncate
-                                 must-truncate truncate/replace))
-      (raise-type-error (init-name 'svg-dc%) 
-                        "'error, 'append, 'update, 'can-update, 'replace, 'truncate, 'must-truncate, or 'truncate/replace"
-                        exists))
-
-    (define width init-w)
-    (define height init-h)
-    (define close-port? (path-string? init-output))
-
-    (define port
-      (if (output-port? init-output)
-          init-output
-          (open-output-file init-output #:exists exists)))
-    (define-values (s writer)
-      (let-values ([(writer proc) (make-port-writer port)])
-        (values (cairo_svg_surface_create_for_stream 
-                 proc
-                 width
-                 height)
-                writer)))
-
-    (define c (and s (cairo_create s)))    
-    (when s (cairo_surface_destroy s))
-
-    (define/override (ok?) (and c #t))
-
-    (define/override (get-cr) c)
-
-    (def/override (get-size)
-      (values width height))
-
-    (define/override (end-cr)
-      (cairo_surface_finish s)
-      (cairo_destroy c)
-      (set! c #f)
-      (set! s #f)
-      (port-writer-wait writer)
-      (set! writer #f)
-      (when close-port?
-        (close-output-port port))
-      (set! port #f))
-
-    (define/override (get-pango font)
-      (send font get-pango))
-
-    (define/override (get-font-metrics-key sx sy)
-      (if (and (= sx 1.0) (= sy 1.0))
-          3
-          0))
-
-    (define/override (can-combine-text? sz)
-      #t)
-
-    (define/public (multiple-pages-ok?) #t)
-
-    (super-new)))
-
-(define svg-dc% (class (doc+page-check-mixin (dc-mixin dc-backend%)
-                                             'svg-dc%)
-                  (super-new)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/syntax.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/syntax.rkt
deleted file mode 100644
index e301d67481..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/syntax.rkt
+++ /dev/null
@@ -1,340 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/stxparam
-         (for-syntax racket/base))
-
-(provide defclass defclass*
-         def/public def/pubment def/public-final def/override def/override-final define/top case-args
-         def/public-unimplemented define-unimplemented
-         maybe-box? any? bool? nonnegative-real? positive-real? make-or-false make-box make-list make-alts 
-         make-literal symbol-in integer-in real-in make-procedure
-         method-name init-name
-         let-boxes
-         properties field-properties init-properties
-         ->long
-         assert)
-
-(define-syntax-parameter class-name #f)
-
-(define-syntax-rule (defclass name super . body)
-  (defclass* name super () . body))
-(define-syntax-rule (defclass* name super intfs . body)
-  (define name
-    (syntax-parameterize ([class-name 'name])
-      (class* super intfs . body))))
-
-(define-syntax (def/public stx)
-  #`(def/thing define/public #,stx))
-(define-syntax (def/pubment stx)
-  #`(def/thing define/pubment #,stx))
-(define-syntax (def/public-final stx)
-  #`(def/thing define/public-final #,stx))
-(define-syntax (def/override stx)
-  #`(def/thing define/override #,stx))
-(define-syntax (def/override-final stx)
-  #`(def/thing define/override-final #,stx))
-(define-syntax (define/top stx)
-  #`(def/thing define #,stx))
-
-(define (method-name class method)
-  (string->symbol (format "~a in ~a" method class)))
-(define (init-name class)
-  (string->symbol (format "initialization for ~a" class)))
-
-(define-syntax just-id
-  (syntax-rules ()
-    [(_ [id default]) id]
-    [(_ id) id]))
-
-(define-struct named-pred (pred make-name)
-  #:property prop:procedure (struct-field-index pred))
-
-(define (apply-pred pred val)
-  (cond
-   [(procedure? pred) (pred val)]
-   [(class? pred) (val . is-a? . pred)]
-   [(interface? pred) (val . is-a? . pred)]
-   [else (error 'check-arg "unknown predicate type: ~e" pred)]))
-
-(define (make-or-false pred)
-  (make-named-pred (lambda (v)
-                     (or (not v) (apply-pred pred v)))
-                   (lambda ()
-                     (string-append (predicate-name pred)
-                                    " or #f"))))
-
-(define (make-box pred)
-  (make-named-pred (lambda (v)
-                     (and (box? v) (apply-pred pred (unbox v))))
-                   (lambda ()
-                     (string-append "boxed " (predicate-name pred)))))
-
-(define (make-list pred)
-  (make-named-pred (lambda (v)
-                     (and (list? v) (andmap (lambda (v) (apply-pred pred v)) v)))
-                   (lambda ()
-                     (string-append "list of " (predicate-name pred)))))
-
-(define (make-alts a b)
-  (make-named-pred (lambda (v)
-                     (or (apply-pred a v) (apply-pred b v)))
-                   (lambda ()
-                     (string-append (predicate-name a)
-                                    " or "
-                                    (predicate-name b)))))
-
-(define (make-literal lit)
-  (make-named-pred (lambda (v) (equal? v lit))
-                   (lambda () (if (symbol? lit)
-                                  (format "'~s" lit)
-                                  (format "~s" lit)))))
-
-(define (make-symbol syms)
-  (make-named-pred (lambda (v) (memq v syms))
-                   (lambda ()
-                     (let loop ([syms syms])
-                       (cond
-                        [(null? (cdr syms))
-                         (format "'~s" (car syms))]
-                        [(null? (cddr syms))
-                         (format "'~s, or '~s" (car syms) (cadr syms))]
-                        [else
-                         (format "'~s, ~a" (car syms) (loop (cdr syms)))])))))
-(define-syntax-rule (symbol-in sym ...)
-  (make-symbol '(sym ...)))
-
-(define (integer-in lo hi)
-  (make-named-pred (lambda (v) (and (exact-integer? v)
-                                    (<= lo v hi)))
-                   (lambda ()
-                     (format "exact integer in [~a, ~a]" lo hi))))
-(define (real-in lo hi)
-  (make-named-pred (lambda (v) (and (real? v)
-                                    (<= lo v hi)))
-                   (lambda ()
-                     (format "real in [~a, ~a]" lo hi))))
-
-(define (make-procedure arity)
-  (make-named-pred (lambda (p)
-                     (and (procedure? p)
-                          (procedure-arity-includes? p arity)))
-                   (lambda ()
-                     (format "procedure (arity ~a)" arity))))
-
-(define (check-arg val pred pos)
-  (if (apply-pred pred val)
-      #f
-      (cons (predicate-name pred)
-            (if (keyword? pos)
-                (list val)
-                pos))))
-
-(define (predicate-name pred)
-  (cond
-   [(named-pred? pred) ((named-pred-make-name pred))]
-   [(procedure? pred) (let ([s (symbol->string (object-name pred))])
-                        (substring s 0 (sub1 (string-length s))))]
-   [(or (class? pred) (interface? pred))
-    (format "~a instance" (object-name pred))]
-   [else "???"]))
-
-(define maybe-box? (make-named-pred (lambda (v) (or (not v) (box? v)))
-                                    (lambda () "box or #f")))
-(define (any? v) #t)
-(define (bool? v) #t)
-(define (nonnegative-real? v) (and (real? v) (v . >= . 0)))
-(define (positive-real? v) (and (real? v) (v . > . 0)))
-
-(define (method-of cls nam)
-  (if cls
-      (string->symbol (format "~a method of ~a" nam cls))
-      nam))
-
-(define-syntax (def/thing stx)
-  (syntax-case stx ()
-    [(_ define/orig (_ (id arg ...)))
-     (raise-syntax-error #f "missing body" stx)]
-    [(_ define/orig (_ (id orig-arg ...) . body))
-     (let ([extract (lambda (keep-kw? mode)
-                      (let loop ([args (syntax->list #'(orig-arg ...))]
-                                 [pos 0]
-                                 [prev-kw #f])
-                        (cond
-                         [(null? args) null]
-                         [(keyword? (syntax-e (car args)))
-                          (if keep-kw?
-                              (cons (car args) (loop (cdr args) pos (car args)))
-                              (loop (cdr args) pos (car args)))]
-                         [else (cons (syntax-case (car args) ()
-                                       [[arg-type arg] (case mode
-                                                         [(type) #'arg-type]
-                                                         [(arg) #'arg]
-                                                         [(id) (syntax-case #'arg ()
-                                                                 [[id val] #'id]
-                                                                 [_ #'arg])]
-                                                         [(pos) (or prev-kw pos)])])
-                                     (loop (cdr args) (if prev-kw pos (add1 pos)) #f))])))])
-       (with-syntax ([(arg-id ...) (extract #f 'id)]
-                     [(arg-rep ...) (extract #t 'id)]
-                     [(arg ...) (extract #t 'arg)]
-                     [(arg-type ...) (extract #f 'type)]
-                     [(pos ...) (extract #f 'pos)])
-         (with-syntax ([(_ _ orig-stx) stx]
-                       [cname (syntax-parameter-value #'class-name)])
-           (syntax/loc #'orig-stx
-             (define/orig (id arg ...)
-               (let ([bad (or (check-arg arg-id arg-type 'pos)
-                              ...)])
-                 (when bad
-                   (type-error (method-of 'cname 'id) (car bad) (cdr bad) arg-rep ...)))
-               (let ()
-                 . body))))))]))
-
-(define type-error
-  (make-keyword-procedure
-   (lambda (kws kw-args name expected pos . args)
-     (if (number? pos)
-         (apply raise-type-error name expected pos args)
-         (raise-type-error name expected (car pos))))))
-     
-
-(define-for-syntax lifted (make-hash))
-(define-syntax (lift-predicate stx)
-  (syntax-case stx ()
-    [(_ id) (identifier? #'id) #'id]
-    [(_ expr)
-     (let ([d (syntax->datum #'expr)])
-       (or (hash-ref lifted d #f)
-           (let ([id (syntax-local-lift-expression #'expr)])
-             (hash-set! lifted d id)
-             id)))]))
-
-(define-syntax (case-args stx)
-  (syntax-case stx ()
-    [(_ expr [([arg-type arg] ...) rhs ...] ... who)
-     (with-syntax ([((min-args-len . max-args-len) ...)
-                    (map (lambda (args)
-                           (let ([args (syntax->list args)])
-                             (cons (let loop ([args args])
-                                     (if (or (null? args)
-                                             (not (identifier? (car args))))
-                                         0
-                                         (add1 (loop (cdr args)))))
-                                   (length args))))
-                         (syntax->list #'((arg ...) ...)))])
-       #'(let* ([args expr]
-                [len (length args)])
-           (find-match
-            (lambda (next)
-              (if (and (len . >= . min-args-len)
-                       (len . <= . max-args-len))
-                  (apply
-                   (lambda (arg ...)
-                     (if (and (not (check-arg (just-id arg) (lift-predicate arg-type) 0)) ...)
-                         (lambda () rhs ...)
-                         next))
-                   args)
-                  next))
-            ...
-            (lambda (next)
-              (bad-args who args)))))]))
-
-(define (bad-args who args)
-  (error who "bad argument combination:~a"
-         (apply string-append (map (lambda (x) (format " ~e" x))
-                                   args))))
-
-(define-syntax find-match
-  (syntax-rules ()
-    [(_ proc)
-     ((proc #f))]
-    [(_ proc1 proc ...)
-     ((proc1 (lambda () (find-match proc ...))))]))
-
-(define-syntax-rule (let-boxes ([id init] ...)
-                               call
-                               body ...)
-  (let ([id (box init)] ...)
-    call
-    (let ([id (unbox id)] ...)
-      body ...)))
-
-(define-syntax (do-properties stx)
-  (syntax-case stx ()
-    [(_ define-base check-immutable [[type id] expr ...] ...)
-     (let ([ids (syntax->list #'(id ...))])
-       (with-syntax ([(getter ...)
-                      (map (lambda (id)
-                             (datum->syntax id
-                                            (string->symbol
-                                             (format "get-~a" (syntax-e id)))
-                                            id))
-                           ids)]
-                     [(setter ...)
-                      (map (lambda (id)
-                             (datum->syntax id
-                                            (string->symbol
-                                             (format "set-~a" (syntax-e id)))
-                                            id))
-                           ids)])
-         #'(begin
-             (define-base id expr ...) ...
-             (define/public (getter) id) ...
-             (def/public (setter [type v]) (check-immutable 'setter) (set! id (coerce type v))) ...)))]))
-
-(define-syntax coerce
-  (syntax-rules (bool?)
-    [(_ bool? v) (and v #t)]
-    [(_ _ v) v]))
-
-(define-syntax properties
-  (syntax-rules ()
-    [(_ #:check-immutable check-immutable . props)
-     (do-properties define check-immutable . props)]
-    [(_ . props)
-     (do-properties define void . props)]))
-(define-syntax field-properties
-  (syntax-rules ()
-    [(_ #:check-immutable check-immutable . props)
-     (do-properties define-field check-immutable . props)]
-    [(_ . props)
-     (do-properties define-field void . props)]))
-(define-syntax-rule (define-field id val) (field [id val]))
-(define-syntax init-properties
-  (syntax-rules ()
-    [(_ #:check-immutable check-immutable . props)
-     (do-properties define-init check-immutable . props)]
-    [(_ . props)
-     (do-properties define-init void . props)]))
-(define-syntax define-init
-  (syntax-rules ()
-    [(_ id val) (begin
-                  (init [(internal id) val])
-                  (define id internal))]
-    [(_ id) (begin
-              (init [(internal id)])
-              (define id internal))]))
-    
-
-(define (->long i) 
-  (cond
-   [(eqv? -inf.0 i) (- (expt 2 64))]
-   [(eqv? +inf.0 i) (expt 2 64)]
-   [(eqv? +nan.0 i) 0]
-   [else (inexact->exact (floor i))]))
-
-
-(define-syntax-rule (assert e) (void))
-; (define-syntax-rule (assert e) (unless e (error 'assert "failed: ~s" 'e)))
-
-(define (unimplemented c m args) (error (if c (method-name c m) m) "unimplemented; args were ~e"
-                                        args))
-
-(define-syntax (def/public-unimplemented stx)
-  (syntax-case stx ()
-    [(_ id)
-     (with-syntax ([cname (syntax-parameter-value #'class-name)])
-       #'(define/public (id . args) (unimplemented 'cname 'id args)))]))
-
-(define-syntax-rule (define-unimplemented id)
-  (define (id . args) (unimplemented #f 'id args)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/transform.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/transform.rkt
deleted file mode 100644
index 9aef8fe912..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/transform.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-
-(provide matrix-vector?
-         transformation-vector?
-         transformation-vector->immutable)
-
-(define (matrix-vector? m)
-  (and (vector? m)
-       (= 6 (vector-length m))
-       (for/and ([e (in-vector m)])
-         (real? e))))
-
-(define (transformation-vector? v)
-  (and (vector? v)
-       (= 6 (vector-length v))
-       (matrix-vector? (vector-ref v 0))
-       (real? (vector-ref v 1))
-       (real? (vector-ref v 2))
-       (real? (vector-ref v 3))
-       (real? (vector-ref v 4))
-       (real? (vector-ref v 5))))
-
-(define (transformation-vector->immutable v)
-  (if (and (immutable? v)
-           (immutable? (vector-ref v 0)))
-      v
-      (vector-immutable
-       (vector->immutable-vector (vector-ref v 0))
-       (vector-ref v 1)
-       (vector-ref v 2)
-       (vector-ref v 3)
-       (vector-ref v 4)
-       (vector-ref v 5))))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/utils.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/utils.rkt
deleted file mode 100644
index c87ca65c0a..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/utils.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-(require ffi/unsafe)
-
-(provide define-mz
-         define-enum
-         define/provide)
-
-(define-syntax-rule (define-mz id type)
-  (define id (get-ffi-obj 'id #f type)))
-
-(define-syntax define-enum
-  (syntax-rules ()
-    [(_ n) (begin)]
-    [(_ n id . ids) (begin
-                      (define id n)
-                      (provide id)
-                      (define-enum (+ n 1) . ids))]))
-
-(define-syntax-rule (define/provide id val)
-  (begin
-    (define id val)
-    (provide id)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/write-bytes.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/write-bytes.rkt
deleted file mode 100644
index 680b35888f..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/write-bytes.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-(require "../unsafe/cairo.rkt"
-         "../unsafe/bstr.rkt")
-
-(provide make-port-writer
-         port-writer-wait)
-
-(define (make-port-writer port) 
-  (let ([t (thread/suspend-to-kill
-            (lambda ()
-              (let loop ()
-                (let ([msg (thread-receive)])
-                  (when (bytes? msg)
-                    (write-bytes msg port)
-                    (loop))))))])
-    (values t
-            (lambda (bytes len)
-              (thread-send t (scheme_make_sized_byte_string bytes len 1) 
-                           void)
-              CAIRO_STATUS_SUCCESS))))
-
-(define (port-writer-wait t)
-  (thread-resume t)
-  (thread-send t eof void)
-  (thread-wait t))
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/private/xp.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/private/xp.rkt
deleted file mode 100644
index 1e11d87eae..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/private/xp.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-(require ffi/unsafe)
-
-;; Unfortunately, we sometimes need to do something different
-;;  under Windows XP
-
-(provide xp?)
-
-(define xp? 
-  (and (eq? 'windows (system-type))
-       (let* ([abi (and (equal? "win32\\i386" 
-				(path->string (system-library-subpath #f)))
-			'stdcall)]
-	      [GetVersion (get-ffi-obj 'GetVersion
-				       (ffi-lib "kernel32.dll")
-				       (_fun #:abi abi -> _int32))])
-	 (= 5 (bitwise-and #xFF (GetVersion))))))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/brush.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/brush.rkt
deleted file mode 100644
index 26baa13a09..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/brush.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-
-(require "../private/brush.rkt")
-(provide make-handle-brush)
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/bstr.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/bstr.rkt
deleted file mode 100644
index 3db7de6d5f..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/bstr.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require ffi/unsafe)
-
-(provide (protect-out scheme_make_sized_byte_string))
-
-
-(define scheme_make_sized_byte_string 
-  (get-ffi-obj 'scheme_make_sized_byte_string #f (_fun _pointer _long _int -> _scheme)))
-
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/cairo-lib.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/cairo-lib.rkt
deleted file mode 100644
index 556ad9e8eb..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/cairo-lib.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         ffi/unsafe/alloc
-         setup/dirs
-         "../private/libs.rkt"
-         "../private/utils.rkt")
-
-(define-runtime-lib fontconfig-lib
-  [(unix) (ffi-lib "libfontconfig" '("1" ""))]
-  [(macosx)
-   (ffi-lib "libpng16.16.dylib")
-   (ffi-lib "libexpat.1.dylib")
-   (ffi-lib "libfreetype.6.dylib")
-   (ffi-lib "libfontconfig.1.dylib")]
-  [(windows)
-   (ffi-lib "zlib1.dll")
-   (ffi-lib "libintl-8.dll")
-   (ffi-lib "libpng16-16.dll")
-   (ffi-lib "libexpat-1.dll")
-   (ffi-lib "libfreetype-6.dll")
-   (ffi-lib "libfontconfig-1.dll")])
-
-(define-runtime-lib cairo-lib
-  [(unix) (ffi-lib "libcairo" '("2" ""))]
-  [(macosx)
-   (ffi-lib "libpixman-1.0.dylib")
-   (ffi-lib "libcairo.2.dylib")]
-  [(windows)
-   (ffi-lib "libpixman-1-0.dll")
-   (ffi-lib "libcairo-2.dll")])
-
-;; A Racket-specific patch to Fontconfig defines FcSetFallbackDirs(),
-;; which lets us set default paths to point to a Racket-specific
-;; directory. If FcSetFallbackDirs() isn't defined, then we want
-;; the system-defined directories, anyway.
-(let ([FcSetFallbackDirs (get-ffi-obj 'FcSetFallbackDirs
-                                      fontconfig-lib
-                                      (_fun _path _path -> _void)
-                                      (lambda () #f))]
-      [FcSetConfigDir (get-ffi-obj 'FcSetConfigDir
-                                   fontconfig-lib
-                                      (_fun _path -> _void)
-                                      (lambda () #f))])
-  (when (and FcSetFallbackDirs
-             FcSetConfigDir)
-    (define share-dir (find-share-dir))
-    (when share-dir
-      (FcSetFallbackDirs (build-path share-dir "fonts")
-                         (build-path (find-system-path 'addon-dir) "font-cache"))
-      (FcSetConfigDir (build-path share-dir "fonts")))))
-
-(provide (protect-out cairo-lib))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/cairo.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/cairo.rkt
deleted file mode 100644
index d26f08f543..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/cairo.rkt
+++ /dev/null
@@ -1,552 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         ffi/unsafe/alloc
-         "cairo-lib.rkt"
-         "../private/libs.rkt"
-         "../private/utils.rkt")
-
-(define-ffi-definer define-cairo cairo-lib
-  #:provide provide-protected)
-
-(provide _cairo_t
-         _cairo_surface_t
-         _cairo_font_options_t)
-
-;; ALLOCATION NOTE: drawing to a Cairo surface might call back to
-;; Racket, because a drawing suface might be a PDF or SVG file
-;; that is written through a callback to Racket. Consequently,
-;; all GC-allocated arguments to Cairo functions must be allocated
-;; a 'atomic-interior, so that they do not move in case of a GC.
-
-(define _cairo_surface_t (_cpointer 'cairo_surface_t))
-(define _cairo_surface_t/null (_cpointer/null 'cairo_surface_t))
-(define _cairo_t (_cpointer 'cairo_t))
-(define _cairo_pattern_t (_cpointer 'cairo_pattern_t))
-(define _cairo_font_options_t (_cpointer/null 'cairo_font_options_t))
-(define _CGContextRef (_cpointer 'CGContextRef))
-
-(define-cstruct _cairo_matrix_t ([xx _double*]
-                                 [yx _double*]
-                                 [xy _double*]
-                                 [yy _double*]
-                                 [x0 _double*]
-                                 [y0 _double*])
-  #:malloc-mode 'atomic-interior)
-(provide (struct-out cairo_matrix_t))
-
-(define-cstruct _cairo_glyph_t ([index _long] [x _double*] [y _double*]))
-(provide make-cairo_glyph_t)
-
-(define-fun-syntax _ptr/immobile
-  (syntax-id-rules (_ptr/immobile o)
-    [(_ptr/immobile o t) (type: _pointer
-                                pre:  (malloc t 'atomic-interior)
-                                post: (x => (ptr-ref x t)))]))
- 
-;; Cairo is supposed to be thread-safe, but concurrent use seems
-;; to cause trouble right now. (Try rendering the "plot" document
-;; in multiple places at once.) For now, treat Cairo as non-thread
-;; safe. Use `_cfun' for Cairo functions and `_cbfun' for callbacks:
-(define-syntax-rule (_cfun . rest)
-  (_fun #:in-original-place? #t . rest))
-(define-syntax-rule (_cbfun . rest)
-  (_fun #:async-apply (lambda (f) (f)) . rest))
-
-(define-cairo cairo_destroy (_cfun _cairo_t -> _void) 
-  #:wrap (deallocator))
-
-(define-cairo cairo_surface_destroy (_cfun _cairo_surface_t -> _void)
-  #:wrap (deallocator))
-
-(define-cairo cairo_quartz_surface_create
-  (_cfun _int _uint _uint -> _cairo_surface_t)
-  #:make-fail make-not-available
-  #:wrap (allocator cairo_surface_destroy))
-(define-cairo cairo_quartz_surface_create_for_cg_context
-  (_cfun _CGContextRef _uint _uint -> _cairo_surface_t)
-  #:make-fail make-not-available
-  #:wrap (allocator cairo_surface_destroy))
-(define-cairo cairo_quartz_surface_get_cg_context
-  (_cfun _cairo_surface_t -> _CGContextRef)
-  #:make-fail make-not-available)
-
-(define-cairo cairo_win32_surface_create
-  (_cfun _pointer -> _cairo_surface_t)
-  #:make-fail make-not-available
-  #:wrap (allocator cairo_surface_destroy))
-(define-cairo cairo_win32_printing_surface_create
-  (_cfun _pointer -> _cairo_surface_t)
-  #:make-fail make-not-available
-  #:wrap (allocator cairo_surface_destroy))
-
-(define-cairo cairo_surface_create_similar
-  (_cfun _cairo_surface_t _int _int _int -> _cairo_surface_t))
-
-(define-cairo cairo_xlib_surface_create (_cfun _pointer ; Display*
-                                               _ulong   ; Drawable
-                                               _pointer ; Visual*
-                                               _int     ; width
-                                               _int     ; height
-                                               -> _cairo_surface_t)
-  #:make-fail make-not-available
-  #:wrap (allocator cairo_surface_destroy))
-
-(define-cairo cairo_win32_surface_create_with_dib 
-  (_cfun _int _int _int -> _cairo_surface_t)
-  #:make-fail make-not-available
-  #:wrap (allocator cairo_surface_destroy))
-(define-cairo cairo_win32_surface_create_with_ddb 
-  (_cfun _pointer _int _int _int -> _cairo_surface_t)
-  #:make-fail make-not-available
-  #:wrap (allocator cairo_surface_destroy))
-(define-cairo cairo_win32_surface_get_dc
-  (_cfun _cairo_surface_t -> _pointer)
-  #:make-fail make-not-available)
-
-(define-cairo cairo_create (_cfun _cairo_surface_t -> _cairo_t)
-  #:wrap (allocator cairo_destroy))
-
-(define-cairo cairo_get_target (_cfun _cairo_t -> _cairo_surface_t)) ;; not an allocator
-
-(define-cairo cairo_surface_status (_cfun _cairo_surface_t -> _int))
-
-(define-cairo cairo_surface_get_type (_cfun _cairo_surface_t -> _int))
-
-;; Context
-(define-cairo cairo_paint (_cfun _cairo_t -> _void))
-(define-cairo cairo_paint_with_alpha (_cfun _cairo_t _double* -> _void))
-(define-cairo cairo_fill (_cfun _cairo_t -> _void))
-(define-cairo cairo_fill_preserve (_cfun _cairo_t -> _void))
-(define-cairo cairo_stroke (_cfun _cairo_t -> _void))
-(define-cairo cairo_stroke_preserve (_cfun _cairo_t -> _void))
-(define-cairo cairo_save (_cfun _cairo_t -> _void))
-(define-cairo cairo_restore (_cfun _cairo_t -> _void))
-(define-cairo cairo_clip (_cfun _cairo_t -> _void))
-(define-cairo cairo_reset_clip (_cfun _cairo_t -> _void))
-
-(define-cairo cairo_in_fill (_cfun _cairo_t _double* _double* -> _bool))
-
-(define-cairo cairo_clip_extents (_cfun _cairo_t 
-                                       (x1 : (_ptr/immobile o _double)) 
-                                       (y1 : (_ptr/immobile o _double)) 
-                                       (x2 : (_ptr/immobile o _double)) 
-                                       (y2 : (_ptr/immobile o _double)) 
-                                       -> _void
-                                       -> (values x1 y1 x2 y2))
-  ;; cairo_clip_extents is in version 1.4 and later
-  #:fail (lambda ()
-           (let ([warned? #f])
-             (lambda (cr) 
-               (unless warned?
-                 (log-warning "cairo_clip_extents is unavailable; returning the empty rectangle")
-                 (set! warned? #t))
-               (values 0 0 0 0)))))
-
-(define-cstruct _cairo_rectangle_t ([x _double]
-                                    [y _double]
-                                    [width _double]
-                                    [height _double]))
-(define-cstruct _cairo_rectangle_list_t ([status _int]
-                                         [rectangles _cairo_rectangle_t-pointer/null]
-                                         [num_rectangles _int]))
-(provide (struct-out cairo_rectangle_t) _cairo_rectangle_t
-         (struct-out cairo_rectangle_list_t))
-(define-cairo cairo_rectangle_list_destroy (_cfun _cairo_rectangle_list_t-pointer -> _void)
-  #:wrap (deallocator)
-  ;; cairo_rectangle_list_destroy is in 1.4 and later
-  #:fail (lambda () (lambda (l) (void))))
-(define-cairo cairo_copy_clip_rectangle_list (_cfun _cairo_t -> _cairo_rectangle_list_t-pointer)
-  #:wrap (allocator cairo_rectangle_list_destroy)
-  ;; cairo_copy_clip_rectangle_list is in 1.4 and later
-  #:fail (lambda () (lambda (c) (make-cairo_rectangle_list_t -1 #f 0))))
-
-(define-cairo cairo_fill_extents (_cfun _cairo_t 
-                                        (x1 : (_ptr/immobile o _double)) 
-                                        (y1 : (_ptr/immobile o _double)) 
-                                        (x2 : (_ptr/immobile o _double)) 
-                                        (y2 : (_ptr/immobile o _double)) 
-                                        -> _void
-                                        -> (values x1 y1 x2 y2)))
-
-(define-cairo cairo_stroke_extents (_cfun _cairo_t 
-                                          (x1 : (_ptr/immobile o _double)) 
-                                          (y1 : (_ptr/immobile o _double)) 
-                                          (x2 : (_ptr/immobile o _double)) 
-                                          (y2 : (_ptr/immobile o _double)) 
-                                          -> _void
-                                          -> (values x1 y1 x2 y2)))
-
-;; Transforms
-(define-cairo cairo_translate (_cfun _cairo_t _double* _double* -> _void))
-(define-cairo cairo_scale (_cfun _cairo_t _double* _double* -> _void))
-(define-cairo cairo_rotate (_cfun _cairo_t _double* -> _void))
-(define-cairo cairo_transform (_cfun _cairo_t _cairo_matrix_t-pointer -> _void))
-(define-cairo cairo_identity_matrix (_cfun _cairo_t -> _void))
-(define-cairo cairo_get_matrix (_cfun _cairo_t _cairo_matrix_t-pointer -> _void))
-(define-cairo cairo_set_matrix (_cfun _cairo_t _cairo_matrix_t-pointer -> _void))
-
-(define-cairo cairo_matrix_init_translate (_cfun _cairo_matrix_t-pointer _double* _double* -> _void))
-(define-cairo cairo_matrix_init (_cfun _cairo_matrix_t-pointer _double* _double* _double* _double* _double* _double* -> _void))
-(define-cairo cairo_matrix_translate (_cfun _cairo_matrix_t-pointer _double* _double* -> _void))
-(define-cairo cairo_matrix_scale (_cfun _cairo_matrix_t-pointer _double* _double* -> _void))
-(define-cairo cairo_matrix_rotate (_cfun _cairo_matrix_t-pointer _double* -> _void))
-(define-cairo cairo_matrix_multiply (_cfun _cairo_matrix_t-pointer _cairo_matrix_t-pointer _cairo_matrix_t-pointer -> _void))
-
-;; Stroke & Fill
-(define-cairo cairo_set_source_rgb (_cfun _cairo_t _double* _double* _double* -> _void))
-(define-cairo cairo_set_source_rgba (_cfun _cairo_t _double* _double* _double* _double* -> _void))
-(define-cairo cairo_set_line_width (_cfun _cairo_t _double* -> _void))
-(define-cairo cairo_set_line_cap (_cfun _cairo_t _int -> _void))
-(define-cairo cairo_set_line_join (_cfun _cairo_t _int -> _void))
-(define-cairo cairo_set_dash (_cfun _cairo_t (v : (_vector i _double*)) [_int = (vector-length v)] _double* -> _void))
-(define-cairo cairo_set_antialias (_cfun _cairo_t _int -> _void))
-
-(define-cairo cairo_set_fill_rule (_cfun _cairo_t _int -> _void))
-
-(define-cairo cairo_get_operator (_cfun _cairo_t -> _int))
-(define-cairo cairo_set_operator (_cfun _cairo_t _int -> _void))
-
-;; Text
-(define-cairo cairo_font_options_destroy (_cfun _cairo_font_options_t -> _void)
-  #:wrap (deallocator))
-(define-cairo cairo_font_options_create (_cfun -> _cairo_font_options_t)
-  #:wrap (allocator cairo_font_options_destroy))
-(define-cairo cairo_font_options_copy (_cfun _cairo_font_options_t _cairo_font_options_t -> _void))
-(define-cairo cairo_get_font_options (_cfun _cairo_t _cairo_font_options_t -> _void))
-(define-cairo cairo_set_font_options (_cfun _cairo_t _cairo_font_options_t -> _void))
-(define-cairo cairo_font_options_set_antialias (_cfun _cairo_font_options_t _int -> _void))
-(define-cairo cairo_font_options_set_hint_metrics (_cfun _cairo_font_options_t _int -> _void))
-(define-cairo cairo_font_options_set_hint_style (_cfun _cairo_font_options_t _int -> _void))
-
-(define-cairo cairo_show_glyphs (_cfun _cairo_t
-                                       _cairo_glyph_t-pointer ; must be immobile
-                                       _int
-                                       -> _void))
-
-;; Paths
-(define-cairo cairo_rectangle (_cfun _cairo_t _double* _double* _double* _double* -> _void))
-(define-cairo cairo_move_to (_cfun _cairo_t _double* _double* -> _void))
-(define-cairo cairo_rel_move_to (_cfun _cairo_t _double* _double* -> _void))
-(define-cairo cairo_line_to (_cfun _cairo_t _double* _double* -> _void))
-(define-cairo cairo_rel_line_to (_cfun _cairo_t _double* _double* -> _void))
-(define-cairo cairo_arc (_cfun _cairo_t _double* _double* _double* _double* _double* -> _void))
-(define-cairo cairo_arc_negative (_cfun _cairo_t _double* _double* _double* _double* _double* -> _void))
-(define-cairo cairo_curve_to (_cfun _cairo_t _double* _double* _double* _double* _double* _double* -> _void))
-(define-cairo cairo_new_path (_cfun _cairo_t -> _void))
-(define-cairo cairo_close_path (_cfun _cairo_t -> _void))
-
-(define-cairo cairo_show_page (_cfun _cairo_t -> _void))
-
-;; Patterns
-(define-cairo cairo_set_source (_cfun _cairo_t _cairo_pattern_t -> _void))
-(define-cairo cairo_get_source (_cfun _cairo_t -> _cairo_pattern_t)) ;; not an allocator
-(define-cairo cairo_set_source_surface (_cfun _cairo_t _cairo_surface_t _double* _double* -> _void))
-(define-cairo cairo_mask (_cfun _cairo_t _cairo_pattern_t -> _void))
-(define-cairo cairo_mask_surface (_cfun _cairo_t _cairo_surface_t _double* _double* -> _void))
-(define-cairo cairo_pattern_destroy (_cfun _cairo_pattern_t -> _void)
-  #:wrap (deallocator))
-(define-cairo cairo_pattern_create_for_surface (_cfun _cairo_surface_t -> _cairo_pattern_t)
-  #:wrap (allocator cairo_pattern_destroy))
-(define-cairo cairo_pattern_reference (_cfun _cairo_pattern_t -> _void)
-  #:wrap (retainer cairo_pattern_destroy car))
-(define-cairo cairo_pattern_set_matrix (_cfun _cairo_pattern_t _cairo_matrix_t-pointer -> _void))
-(define-cairo cairo_pattern_set_extend (_cfun _cairo_pattern_t _int -> _void))
-
-;; Gradients
-(define-cairo cairo_pattern_add_color_stop_rgb (_cfun _cairo_pattern_t _double* _double* _double* _double* -> _void))
-(define-cairo cairo_pattern_add_color_stop_rgba (_cfun _cairo_pattern_t _double* _double* _double* _double* _double* -> _void))
-#; ; 1.4 and later:
-(define-cairo cairo_pattern_get_color_stop_count (_cfun _cairo_pattern_t (_ptr o _int)  -> _int)
-  #:make-fail make-not-available)
-#; ; 1.4 and later:
-(define-cairo cairo_pattern_get_color_stop_rgba (_cfun _cairo_pattern_t _int (_ptr o _double*) (_ptr o _double*) (_ptr o _double*) (_ptr o _double*) (_ptr o _double*) -> _int)
-  #:make-fail make-not-available)
-
-#; ; 1.4 and later:
-(define-cairo cairo_pattern_create_rgb (_cfun _double* _double* _double* -> _cairo_pattern_t)
-  #:wrap (allocator cairo_pattern_destroy))
-#; ; 1.4 and later:
-(define-cairo cairo_pattern_create_rgba (_cfun _double* _double* _double* _double* -> _cairo_pattern_t)
-  #:wrap (allocator cairo_pattern_destroy))
-#; ; 1.4 and later:
-(define-cairo cairo_pattern_get_rgba (_cfun _cairo_pattern_t (_ptr o _double*) (_ptr o _double*) (_ptr o _double*) (_ptr o _double*) -> _int)
-  #:make-fail make-not-available) ;; not an allocator
-#; ; 1.4 and later:
-(define-cairo cairo_pattern_get_surface (_cfun _cairo_pattern_t (_ptr o _cairo_surface_t) -> _int)
-  #:make-fail make-not-available) ;; not an allocator
-
-(define-cairo cairo_pattern_create_linear (_cfun _double* _double* _double* _double* -> _cairo_pattern_t)
-  #:wrap (allocator cairo_pattern_destroy))
-#; ; 1.4 and later:
-(define-cairo cairo_pattern_get_linear_points (_cfun _cairo_pattern_t (_ptr o _double*) (_ptr o _double*) (_ptr o _double*) (_ptr o _double*) -> _int)
-  #:make-fail make-not-available)
-(define-cairo cairo_pattern_create_radial (_cfun _double* _double* _double* _double* _double* _double* -> _cairo_pattern_t)
-  #:wrap (allocator cairo_pattern_destroy))
-#; ; 1.4 and later:
-(define-cairo cairo_pattern_get_radial_circles (_cfun _cairo_pattern_t (_ptr o _double*) (_ptr o _double*) (_ptr o _double*) (_ptr o _double*) (_ptr o _double*) (_ptr o _double*) -> _int)
-  #:make-fail make-not-available)
-(define-cairo cairo_pattern_status (_cfun _cairo_pattern_t -> _int))
-
-(define-cairo cairo_pattern_get_extend (_cfun _cairo_pattern_t -> _int))
-(define-cairo cairo_pattern_set_filter (_cfun _cairo_pattern_t _int -> _void))
-(define-cairo cairo_pattern_get_filter (_cfun _cairo_pattern_t -> _int))
-(define-cairo cairo_pattern_get_matrix (_cfun _cairo_pattern_t _cairo_matrix_t-pointer -> _void))
-(define-cairo cairo_pattern_get_type (_cfun _cairo_pattern_t -> _int))
-
-
-;; Surfaces
-(define-cairo cairo_surface_finish (_cfun _cairo_surface_t -> _void))
-(define-cairo cairo_surface_flush (_cfun _cairo_surface_t -> _void))
-(define-cairo cairo_surface_mark_dirty (_cfun _cairo_surface_t -> _void))
-(define-cairo cairo_image_surface_create (_cfun _int _int _int -> _cairo_surface_t)
-  #:wrap (allocator cairo_surface_destroy))
-(define-cairo cairo_ps_surface_create (_cfun _path _double* _double* -> _cairo_surface_t)
-  #:wrap (allocator cairo_surface_destroy))
-#; ; 1.2 and later:
-(define-cairo cairo_surface_set_fallback_resolution (_cfun _cairo_surface_t _double* _double* -> _void))
-#; ; 1.8 and later:
-(define-cairo cairo_surface_get_fallback_resolution (_cfun _cairo_surface_t (x : (_ptr o _double)) (y :  (_ptr o _double))
-                                                           -> _void
-                                                           -> (values x y)))
-
-;; Stream surfaces
-
-;;  The first argument to a stream-surface creation
-;;  function is a procedure, and we need the procedure to
-;;  live just as long as the surface. Implement that by
-;;  saving the closure via user data on the surface.
-;;  Externally, a stream-creation function takes
-;;  just a closure --- not a function and data.
-(define _cairo_write_func_t 
-  (_cbfun #:atomic? #t _pointer _pointer _uint -> _int))
-(define _stream-surface-proc 
-  (_cfun _cairo_write_func_t _pointer _double* _double* -> _cairo_surface_t))
-(define cell-key (malloc 1 'raw))
-(define stream-surface-allocator 
-  (lambda (p)
-    ((allocator cairo_surface_destroy)
-     (lambda (proc w h)
-       (let* ([new-proc (lambda (null bytes len)
-                          (proc bytes len))]
-              [free-cell-box (box #f)]
-              [s (p new-proc #f w h)]
-              [b (malloc-immobile-cell (cons new-proc free-cell-box))])
-         (parameterize ([current-sud-box free-cell-box])
-           (cairo_surface_set_user_data s cell-key b free-immobile-cell))
-         s)))))
-(define-cairo cairo_ps_surface_create_for_stream
-  _stream-surface-proc
-  #:wrap stream-surface-allocator)
-(define-cairo cairo_pdf_surface_create_for_stream 
-  _stream-surface-proc
-  #:wrap stream-surface-allocator)
-(define-cairo cairo_svg_surface_create_for_stream 
-  _stream-surface-proc
-  #:wrap stream-surface-allocator)
-
-(define current-sud-box (make-parameter #f))
-(define-cairo cairo_surface_set_user_data 
-  (_cfun _cairo_surface_t _pointer _pointer 
-        (_cbfun #:atomic? #t 
-                #:keep (lambda (v) (set-box! (current-sud-box) v))
-                _pointer -> _void)
-        -> _int))
-
-(define-cairo cairo_ps_surface_set_eps (_cfun _cairo_surface_t _bool -> _void)
-  #:fail (lambda ()
-	   ;; cairo_ps_surface_set_eps is in version 1.6 and later;
-	   ;; if it's not available, we just do without
-	   (lambda (s b) (void))))
-(define-cairo cairo_ps_surface_dsc_begin_setup (_cfun _cairo_surface_t -> _void))
-(define-cairo cairo_ps_surface_dsc_comment (_cfun _cairo_surface_t _string -> _void))
-(define-cairo cairo_image_surface_get_data (_cfun (s : _cairo_surface_t)
-                                                 -> (_bytes o
-                                                            (* (cairo_image_surface_get_height s)
-                                                               (cairo_image_surface_get_stride s)))))
-(define-cairo cairo_image_surface_get_width (_cfun _cairo_surface_t -> _int))
-(define-cairo cairo_image_surface_get_height (_cfun _cairo_surface_t -> _int))
-(define-cairo cairo_image_surface_get_stride (_cfun _cairo_surface_t -> _int))
-(define-cairo cairo_image_surface_get_format (_cfun _cairo_surface_t -> _int))
-
-;; Not recommended, because it's not registered as an allocator (can't
-;; call it in atomic mode):
-(define-cairo cairo_image_surface_create_from_png_stream (_cfun (_cbfun _pointer
-                                                                        (s : _pointer)
-                                                                        (len : _int) 
-                                                                        -> _int)
-                                                                (_pointer = #f)
-                                                                -> _cairo_surface_t/null))
-;; Not recommended, unless it makes sense to make the allback atomic:
-(define-cairo cairo_surface_write_to_png_stream (_cfun _cairo_surface_t
-                                                      (_cbfun _pointer
-                                                              (s : _pointer)
-                                                              (len : _int) 
-                                                              -> _int)
-                                                      (_pointer = #f)
-                                                      -> _int))
-
-(define-enum
-  0
-  CAIRO_OPERATOR_CLEAR
-
-  CAIRO_OPERATOR_SOURCE
-  CAIRO_OPERATOR_OVER
-  CAIRO_OPERATOR_IN
-  CAIRO_OPERATOR_OUT
-  CAIRO_OPERATOR_ATOP
-  
-  CAIRO_OPERATOR_DEST
-  CAIRO_OPERATOR_DEST_OVER
-  CAIRO_OPERATOR_DEST_IN
-  CAIRO_OPERATOR_DEST_OUT
-  CAIRO_OPERATOR_DEST_ATOP
-  
-  CAIRO_OPERATOR_XOR
-  CAIRO_OPERATOR_ADD
-  CAIRO_OPERATOR_SATURATE)
-
-(define-enum
-  0
-  CAIRO_LINE_CAP_BUTT
-  CAIRO_LINE_CAP_ROUND
-  CAIRO_LINE_CAP_SQUARE)
-
-(define-enum
-  0
-  CAIRO_LINE_JOIN_MITER
-  CAIRO_LINE_JOIN_ROUND
-  CAIRO_LINE_JOIN_BEVEL)
-
-(define-enum
-  0
-  CAIRO_FILL_RULE_WINDING
-  CAIRO_FILL_RULE_EVEN_ODD)
-
-(define-enum
-  0
-  CAIRO_ANTIALIAS_DEFAULT
-  CAIRO_ANTIALIAS_NONE
-  CAIRO_ANTIALIAS_GRAY
-  CAIRO_ANTIALIAS_SUBPIXEL)
-
-(define-enum
-  0
-  CAIRO_FORMAT_ARGB32
-  CAIRO_FORMAT_RGB24
-  CAIRO_FORMAT_A8
-  CAIRO_FORMAT_A1)
-
-(define-enum
-  0
-  CAIRO_STATUS_SUCCESS)
-
-(define-enum
-  0
-  CAIRO_EXTEND_NONE
-  CAIRO_EXTEND_REPEAT
-  CAIRO_EXTEND_REFLECT
-  CAIRO_EXTEND_PAD)
-
-(define-enum
-  0
-  CAIRO_HINT_METRICS_DEFAULT
-  CAIRO_HINT_METRICS_OFF
-  CAIRO_HINT_METRICS_ON)
-
-(define-enum
-  0
-  CAIRO_HINT_STYLE_DEFAULT
-  CAIRO_HINT_STYLE_NONE
-  CAIRO_HINT_STYLE_SLIGHT
-  CAIRO_HINT_STYLE_MEDIUM
-  CAIRO_HINT_STYLE_FULL)
-
-(define-enum
-  0
-  CAIRO_PATTERN_TYPE_SOLID
-  CAIRO_PATTERN_TYPE_SURFACE
-  CAIRO_PATTERN_TYPE_LINEAR
-  CAIRO_PATTERN_TYPE_RADIAL)
-
-(define-enum
-  0
-  CAIRO_FILTER_FAST
-  CAIRO_FILTER_GOOD
-  CAIRO_FILTER_BEST
-  CAIRO_FILTER_NEAREST
-  CAIRO_FILTER_BILINEAR
-  CAIRO_FILTER_GAUSSIAN)
-
-(define/provide CAIRO_CONTENT_COLOR_ALPHA #x3000)
-
-(define-enum 
-  6
-  CAIRO_SURFACE_TYPE_QUARTZ)
-
-;; ----------------------------------------
-
-(define-cstruct _cairo_path_data_t_header ([type _int]
-                                           [length _int]))
-(define-cstruct _cairo_path_data_t_point ([x _double]
-                                          [y _double]))
-
-(define _cairo_path_data_t (_union
-                            _cairo_path_data_t_header
-                            _cairo_path_data_t_point))
-
-(define-cstruct _cairo_path_t ([status _int]
-                               [data _pointer]
-                               [num_data _int]))
-
-(define-cairo cairo_path_destroy (_cfun _cairo_path_t-pointer -> _void)
-  #:wrap (deallocator))
-
-(define-cairo cairo_copy_path (_cfun _cairo_t -> _cairo_path_t-pointer)
-  #:wrap (allocator cairo_path_destroy))
-
-(define-cairo cairo_path_extents (_cfun _cairo_t 
-                                        (x1 : (_ptr o _double)) 
-                                        (y1 : (_ptr o _double)) 
-                                        (x2 : (_ptr o _double)) 
-                                        (y2 : (_ptr o _double)) 
-                                        -> _void
-                                        -> (values x1 y1 x2 y2))
-  ;; cairo_path_extents is in version 1.6 and later
-  #:fail (lambda ()
-           cairo_stroke_extents))
-
-(define-enum 0
-  CAIRO_PATH_MOVE_TO
-  CAIRO_PATH_LINE_TO
-  CAIRO_PATH_CURVE_TO
-  CAIRO_PATH_CLOSE_PATH)
-
-(provide cairo-path->list)
-
-(define (cairo-path->list path)
-  (define len (cairo_path_t-num_data path))
-  (define data (cairo_path_t-data path))
-  (let loop ([i 0])
-    (if (= i len)
-        null
-        (let ([h (union-ref (ptr-ref data _cairo_path_data_t i) 0)])
-          (cons (let ([t (cairo_path_data_t_header-type h)])
-                  (cond
-                   [(or (= t CAIRO_PATH_MOVE_TO)
-                        (= t CAIRO_PATH_LINE_TO))
-                    (define a (union-ref (ptr-ref data _cairo_path_data_t (add1 i)) 1))
-                    (list (if (= t CAIRO_PATH_MOVE_TO) 'move 'line)
-                          (cairo_path_data_t_point-x a)
-                          (cairo_path_data_t_point-y a))]
-                   [(= t CAIRO_PATH_CURVE_TO)
-                    (define a (union-ref (ptr-ref data _cairo_path_data_t (+ 1 i)) 1))
-                    (define b (union-ref (ptr-ref data _cairo_path_data_t (+ 2 i)) 1))
-                    (define c (union-ref (ptr-ref data _cairo_path_data_t (+ 3 i)) 1))
-                    (list 'curve
-                          (cairo_path_data_t_point-x a) (cairo_path_data_t_point-y a)
-                          (cairo_path_data_t_point-x b) (cairo_path_data_t_point-y b)
-                          (cairo_path_data_t_point-x c) (cairo_path_data_t_point-y c))]
-                   [(= t CAIRO_PATH_CLOSE_PATH)
-                    '(close)]))
-                (loop (+ i (cairo_path_data_t_header-length h))))))))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/glib.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/glib.rkt
deleted file mode 100644
index 0ca0d71393..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/glib.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         "../private/libs.rkt")
-
-(provide (protect-out
-          define-glib
-          define-gmodule
-          define-gobj))
-
-(define-runtime-lib glib-lib
-  [(unix) (ffi-lib "libglib-2.0" '("0" ""))]
-  [(macosx)
-   (ffi-lib "libintl.8.dylib")
-   (ffi-lib "libglib-2.0.0.dylib")]
-  [(windows)
-   (ffi-lib "libiconv-2.dll")
-   (ffi-lib "libintl-8.dll")
-   (ffi-lib "libglib-2.0-0.dll")])
-
-(define-runtime-lib gmodule-lib
-  [(unix) (ffi-lib "libgmodule-2.0" '("0" ""))]
-  [(macosx)
-   (ffi-lib "libgthread-2.0.0.dylib")
-   (ffi-lib "libgmodule-2.0.0.dylib")]
-  [(windows)
-   (ffi-lib "libgthread-2.0-0.dll")
-   (ffi-lib "libgmodule-2.0-0.dll")])
-
-(define-runtime-lib gobj-lib
-  [(unix) (ffi-lib "libgobject-2.0" '("0" ""))]
-  [(macosx)
-   (ffi-lib "libffi.6.dylib")
-   (ffi-lib "libgobject-2.0.0.dylib")]
-  [(windows) 
-   (ffi-lib "libffi-6.dll")
-   (ffi-lib "libgobject-2.0-0.dll")])
-
-(define-ffi-definer define-glib glib-lib)
-(define-ffi-definer define-gmodule gmodule-lib)
-(define-ffi-definer define-gobj gobj-lib)
-
-;; Route glib logging to Racket logging:
-(define-glib g_log_set_default_handler (_fun _fpointer _pointer -> _fpointer))
-(void (g_log_set_default_handler (get-ffi-obj 'scheme_glib_log_message #f _fpointer) #f))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/jpeg.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/jpeg.rkt
deleted file mode 100644
index 43ff042ea9..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/jpeg.rkt
+++ /dev/null
@@ -1,739 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         ffi/unsafe/alloc
-         "bstr.rkt"
-         "../private/utils.rkt"
-         "../private/libs.rkt")
-
-(define-runtime-lib jpeg-lib
-  [(unix) (ffi-lib "libjpeg" '("62" "8" "9" ""))]
-  [(macosx) (ffi-lib "libjpeg.9.dylib")]
-  [(windows) (ffi-lib "libjpeg-9.dll")])
-
-(define-ffi-definer define-jpeg jpeg-lib
-  #:provide provide)
-(define-ffi-definer define-jpeg/private jpeg-lib)
-
-(define _j_common_ptr _pointer)
-(define _size_t _intptr)
-(define _JDIMENSION _uint)
-(define _J_COLOR_SPACE _int)
-(define _J_DCT_METHOD _int)
-(define _J_DITHER_MODE _int)
-(define _J_COLOR_TRANSFORM _int)
-
-(define _jbool (if (eq? (system-type) 'windows)
-                   _stdbool
-                   _bool))
-(define-enum
-  0
-  JCS_UNKNOWN
-  JCS_GRAYSCALE
-  JCS_RGB
-  JCS_YCbCr
-  JCS_CMYK
-  JCS_YCCK)
-
-(define _pool_id _int)
-(define JPOOL_PERMANENT 0)
-(define JPOOL_IMAGE 1)
-(define JPOOL_NUMPOOLS 2)
-(define JMSG_LENGTH_MAX  200)
-
-(define-cstruct _jpeg_error_mgr ([error_exit _fpointer] ; (_fun _j_common_ptr -> _void)
-                                 [emit_message _pointer]
-                                 [output_message _pointer]
-                                 [format_message (_fun _j_common_ptr _pointer -> _void)]
-                                 ;; and more, including an inline character
-                                 ;; array that is a pain to handle here
-                                 ))
-(define sizeof_jpeg_error_mgr 1024)
-
-(define-cstruct _jpeg_memory_mgr ([alloc_small (_fun _j_common_ptr _pool_id _size_t -> _pointer)]
-                                  [alloc_large (_fun _j_common_ptr _pool_id _size_t -> _pointer)]
-                                  [alloc_sarray (_fun _j_common_ptr _pool_id _JDIMENSION _JDIMENSION -> _pointer)]
-                                  ;; and more
-                                  ))
-
-(define-cstruct _jpeg_any_struct ([err _jpeg_error_mgr-pointer]))
-
-(define (error-exit m) 
-  (let ([bstr (make-bytes JMSG_LENGTH_MAX)])
-    ((jpeg_error_mgr-format_message
-      (jpeg_any_struct-err (cast m _pointer _jpeg_any_struct-pointer)))
-     m
-     bstr)
-    (error 'jpeg "~a" (bytes->string/latin-1 (subbytes bstr 0 (let loop ([i 0])
-                                                                (if (zero? (bytes-ref bstr i))
-                                                                    i
-                                                                    (loop (add1 i)))))))))
-
-(define-jpeg/private jpeg_std_error (_fun _jpeg_error_mgr-pointer -> _jpeg_error_mgr-pointer))
-
-(define-jpeg/private jpeg_CreateDecompress/test (_fun _pointer _int _int -> _void)
-  #:c-id jpeg_CreateDecompress)
-
-;; jpeglib offers no way to get the library version number dynamically,
-;; so we hack it by intercepting an error from jpeg_CreateDecompress:
-(define JPEG_LIB_VERSION
-  (let ([dummy-size 4096])
-    (let ([m (cast (malloc dummy-size 'raw) _pointer _jpeg_any_struct-pointer)]
-          [e (cast (malloc sizeof_jpeg_error_mgr 'raw) _pointer _jpeg_error_mgr-pointer)])
-      (set-jpeg_any_struct-err! m (jpeg_std_error e))
-      (set-jpeg_error_mgr-error_exit! e (cast error-exit (_fun _j_common_ptr -> _void) _fpointer))
-      (let ([s (with-handlers ([exn:fail? (lambda (exn) (exn-message exn))])
-                 (jpeg_CreateDecompress/test m 0 dummy-size)
-                 "")])
-        (free m)
-        (free e)
-        (let ([m (regexp-match #rx"version: library is ([0-9]+)" s)])
-          (if m
-              (string->number (cadr m))
-              "unknown"))))))
-
-(unless (member JPEG_LIB_VERSION '(62 64 70 80 90))
-  (error 'jpeg "unsupported library version: ~e" JPEG_LIB_VERSION))
-
-(define-syntax-rule (cstruct-type/version elem ...)
-  (make-cstruct-type (flatten-type (list (cstruct-type/version-elem elem) ...))))
-
-(define-syntax cstruct-type/version-elem
-  (syntax-rules (unquote)
-    [(_ (unquote ([vers (elem ...)] ...)))
-     (case JPEG_LIB_VERSION
-       [vers (list (cstruct-type/version-elem elem) ...)]
-       ...)]
-    [(_ [name type]) type]))
-
-(define (flatten-type l)
-  (cond
-   [(null? l) null]
-   [(list? (car l))
-    (append (flatten-type (car l)) (flatten-type (cdr l)))]
-   [else
-    (cons (car l) (flatten-type (cdr l)))]))
-
-(define-cstruct _jpeg_decompress_struct ([err _jpeg_error_mgr-pointer]
-                                         [mem _jpeg_memory_mgr-pointer]
-                                         [progress _pointer] ; _jpeg_progress_mgr_pointer
-                                         [client_data _pointer]
-                                         [is_decompressor _jbool]
-                                         [global_state _int]
-                                         [src* _pointer] ; actually jpeg_source_mgr-pointer
-
-                                         [image_width _JDIMENSION]
-                                         [image_height _JDIMENSION]
-                                         [input_components _int]
-                                         [jpeg_color_space _J_COLOR_SPACE]
-                                         [out_color_space _J_COLOR_SPACE]
-
-                                         [scale_num _uint]
-                                         [scale_denom _uint]
-
-                                         [output_gamma _double]
-
-                                         [buffered_image _jbool]
-                                         [raw_data_out _jbool]
-
-                                         [dct_method _J_DCT_METHOD]
-                                         [do_fancy_upsampling _jbool]
-                                         [do_block_smoothing _jbool]
-
-                                         [quantize_colors _jbool]
-                                         [dither_mode _J_DITHER_MODE]
-                                         [two_pass_quantize _jbool]
-                                         [desired_number_of_colors _int]
-                                         [enable_1pass_quant _jbool]
-                                         [enable_external_quant _jbool]
-                                         [enable_2pass_quant _jbool]
-
-                                         [output_width _JDIMENSION]
-                                         [output_height _JDIMENSION] ; <-
-                                         [out_color_components _int]
-                                         [output_components _int]
-                                         [rec_outbuf_height _int]
-
-                                         [actual_number_of_colors _int]
-                                         [colormap _pointer]
-
-                                         ;; We don't need to refer to any of the remaining
-                                         ;; fields, and the specific set of fields depends
-                                         ;; on the version
-                                         [rest
-                                          (cstruct-type/version
-                                           [output_scanline _JDIMENSION]
-
-                                           [input_scan_number _int]
-                                           [input_iMCU_row _JDIMENSION]
-
-                                           [output_scan_number _int]
-                                           [output_iMCU_row _JDIMENSION]
-                                           
-                                           [coef_bits _pointer]
-                                           
-                                           [quant_tbl_ptrs_1 _pointer]
-                                           [quant_tbl_ptrs_2 _pointer]
-                                           [quant_tbl_ptrs_3 _pointer]
-                                           [quant_tbl_ptrs_4 _pointer]
-                                           
-                                           [dc_huff_tbl_ptrs_1 _pointer]
-                                           [dc_huff_tbl_ptrs_2 _pointer]
-                                           [dc_huff_tbl_ptrs_3 _pointer]
-                                           [dc_huff_tbl_ptrs_4 _pointer]
-                                           [ac_huff_tbl_ptrs_1 _pointer]
-                                           [ac_huff_tbl_ptrs_2 _pointer]
-                                           [ac_huff_tbl_ptrs_3 _pointer]
-                                           [ac_huff_tbl_ptrs_4 _pointer]
-
-                                           [data_precision _int]
-
-                                           [comp_info _pointer]
-
-                                           ,([(62 64 70) ()]
-                                             [else ([is_baseline _jbool])])
-                                           [progressive_mode _jbool]
-                                           [arith_code _jbool]
-
-                                           [arith_dc_L_1 _uint8]
-                                           [arith_dc_L_2 _uint8]
-                                           [arith_dc_L_3 _uint8]
-                                           [arith_dc_L_4 _uint8]
-                                           [arith_dc_L_5 _uint8]
-                                           [arith_dc_L_6 _uint8]
-                                           [arith_dc_L_7 _uint8]
-                                           [arith_dc_L_8 _uint8]
-                                           [arith_dc_L_9 _uint8]
-                                           [arith_dc_L_10 _uint8]
-                                           [arith_dc_L_11 _uint8]
-                                           [arith_dc_L_12 _uint8]
-                                           [arith_dc_L_13 _uint8]
-                                           [arith_dc_L_14 _uint8]
-                                           [arith_dc_L_15 _uint8]
-                                           [arith_dc_L_16 _uint8]
-
-                                           [arith_dc_U_1 _uint8]
-                                           [arith_dc_U_2 _uint8]
-                                           [arith_dc_U_3 _uint8]
-                                           [arith_dc_U_4 _uint8]
-                                           [arith_dc_U_5 _uint8]
-                                           [arith_dc_U_6 _uint8]
-                                           [arith_dc_U_7 _uint8]
-                                           [arith_dc_U_8 _uint8]
-                                           [arith_dc_U_9 _uint8]
-                                           [arith_dc_U_10 _uint8]
-                                           [arith_dc_U_11 _uint8]
-                                           [arith_dc_U_12 _uint8]
-                                           [arith_dc_U_13 _uint8]
-                                           [arith_dc_U_14 _uint8]
-                                           [arith_dc_U_15 _uint8]
-                                           [arith_dc_U_16 _uint8]
-
-                                           [arith_dc_K_1 _uint8]
-                                           [arith_dc_K_2 _uint8]
-                                           [arith_dc_K_3 _uint8]
-                                           [arith_dc_K_4 _uint8]
-                                           [arith_dc_K_5 _uint8]
-                                           [arith_dc_K_6 _uint8]
-                                           [arith_dc_K_7 _uint8]
-                                           [arith_dc_K_8 _uint8]
-                                           [arith_dc_K_9 _uint8]
-                                           [arith_dc_K_10 _uint8]
-                                           [arith_dc_K_11 _uint8]
-                                           [arith_dc_K_12 _uint8]
-                                           [arith_dc_K_13 _uint8]
-                                           [arith_dc_K_14 _uint8]
-                                           [arith_dc_K_15 _uint8]
-                                           [arith_dc_K_16 _uint8]
-
-                                           [restart_interval _uint]
-
-                                           [saw_JFIF_marker _jbool]
-                                           [JFIF_major_version _uint8]
-                                           [JFIF_minor_version _uint8]
-                                           [density_unit _uint8]
-                                           [X_density _uint16]
-                                           [Y_density _uint16]
-                                           [saw_Adobe_marker _jbool]
-                                           [Adobe_transform _uint8]
-
-                                           ,([(90) ([color_transform _J_COLOR_TRANSFORM])]
-                                             [else ()])
-
-                                           [CCIR601_sampling _jbool]
-
-                                           [marker_list _pointer]
-
-                                           [max_h_samp_factor _int]
-                                           [max_v_samp_factor _int]
-
-                                           ,([(62 64) ([min_DCT_scaled_size _int])]
-                                             [else ([min_DCT_h_scaled_size _int]
-                                                    [min_DCT_v_scaled_size _int])])
-
-                                           [total_iMCU_rows _JDIMENSION]
-                                           [sample_range_limit _pointer]
-
-                                           [comps_in_scan _int]
-
-                                           [cur_comp_info_1 _pointer]
-                                           [cur_comp_info_2 _pointer]
-                                           [cur_comp_info_3 _pointer]
-                                           [cur_comp_info_4 _pointer]
-
-                                           [MCUs_per_row _JDIMENSION]
-                                           [MCU_rows_in_scan _JDIMENSION]
-
-                                           [blocks_in_MCU _int]
-                                           
-                                           [MCU_membership_1 _int]
-                                           [MCU_membership_2 _int]
-                                           [MCU_membership_3 _int]
-                                           [MCU_membership_4 _int]
-                                           [MCU_membership_5 _int]
-                                           [MCU_membership_6 _int]
-                                           [MCU_membership_7 _int]
-                                           [MCU_membership_8 _int]
-                                           [MCU_membership_9 _int]
-                                           [MCU_membership_10 _int]
-
-                                           [Ss _int]
-                                           [Se _int]
-                                           [Ah _int]
-                                           [Al _int]
-                                           
-                                           ,([(62 64 70) ()]
-                                             [else
-                                              ([block_size _int]
-                                               [natural_order _pointer]
-                                               [lim_Se _int])])
-
-                                           [unread_marker _int]
-
-                                           [master _pointer]
-                                           [main _pointer]
-                                           [coef _pointer]
-                                           [post _pointer]
-                                           [inputctl _pointer]
-                                           [marker _pointer]
-                                           [entropy _pointer]
-                                           [idct _pointer]
-                                           [upsample _pointer]
-                                           [cconvert _pointer]
-                                           [cquantize _pointer])]))
-
-(define _j_decompress_ptr _jpeg_decompress_struct-pointer)
-
-(define-cstruct _jpeg_source_mgr ([next_input_byte _pointer] ;; /* => next byte to read from buffer */
-                                  [bytes_in_buffer _size_t]  ;; /* # of bytes remaining in buffer */
-                                  [init_source _fpointer] ; (_fun _j_decompress_ptr -> _void)
-                                  [fill_input_buffer _fpointer] ; (_fun _j_decompress_ptr -> _jbool)
-                                  [skip_input_data _fpointer] ; (_fun _j_decompress_ptr _long -> _void)
-                                  [resync_to_restart _fpointer] ; (_fun _j_decompress_ptr _int -> _jbool)
-                                  [term_source _fpointer] ; (_fun _j_decompress_ptr -> _void)
-                                  ;; extra fields specific to this binding:
-                                  [buffer _pointer]))
-
-(define (jpeg_decompress_struct-src m)
-  (ptr-cast (jpeg_decompress_struct-src* m) _jpeg_source_mgr-pointer))
-
-(define-cstruct _jpeg_compress_struct ([err _jpeg_error_mgr-pointer]
-                                       [mem _jpeg_memory_mgr-pointer]
-                                       [progress _pointer] ; _jpeg_progress_mgr_pointer
-                                       [client_data _pointer]
-                                       [is_decompressor _jbool]
-                                       [global_state _int]
-
-                                       [dest* _pointer] ; actually jpeg_destination_mgr-pointer
-
-                                       [image_width _JDIMENSION]
-                                       [image_height _JDIMENSION]
-                                       [input_components _int]
-                                       [in_color_space _J_COLOR_SPACE] ; <-
-  
-                                       [input_gamma _double]
-
-                                       ;; We don't need to refer to any of the remaining
-                                       ;; fields, and the specific set of fields depends
-                                       ;; on the version
-                                       [rest
-                                        (cstruct-type/version
-                                         ,([(62 64) ()]
-                                           [else
-                                            ([scale_num _uint]
-                                             [scale_denom _uint]
-                                             [jpeg_width _JDIMENSION]
-                                             [jpeg_height _JDIMENSION])])
-                                         
-                                         [data_precission _int]
-
-                                         [num_components _int]
-                                         [jpeg_color_space _J_COLOR_SPACE]
-
-                                         [comp_info _pointer]
-
-                                         [quant_tbl_ptrs_1 _pointer]
-                                         [quant_tbl_ptrs_2 _pointer]
-                                         [quant_tbl_ptrs_3 _pointer]
-                                         [quant_tbl_ptrs_4 _pointer]
-                                         
-                                         ,([(62 64) ()]
-                                           [else
-                                            ([q_scale_factor_1 _int]
-                                             [q_scale_factor_2 _int]
-                                             [q_scale_factor_3 _int]
-                                             [q_scale_factor_4 _int])])
-                                       
-                                         [dc_huff_tbl_ptrs_1 _pointer]
-                                         [dc_huff_tbl_ptrs_2 _pointer]
-                                         [dc_huff_tbl_ptrs_3 _pointer]
-                                         [dc_huff_tbl_ptrs_4 _pointer]
-                                         [ac_huff_tbl_ptrs_1 _pointer]
-                                         [ac_huff_tbl_ptrs_2 _pointer]
-                                         [ac_huff_tbl_ptrs_3 _pointer]
-                                         [ac_huff_tbl_ptrs_4 _pointer]
-
-                                         [arith_dc_L_1 _uint8]
-                                         [arith_dc_L_2 _uint8]
-                                         [arith_dc_L_3 _uint8]
-                                         [arith_dc_L_4 _uint8]
-                                         [arith_dc_L_5 _uint8]
-                                         [arith_dc_L_6 _uint8]
-                                         [arith_dc_L_7 _uint8]
-                                         [arith_dc_L_8 _uint8]
-                                         [arith_dc_L_9 _uint8]
-                                         [arith_dc_L_10 _uint8]
-                                         [arith_dc_L_11 _uint8]
-                                         [arith_dc_L_12 _uint8]
-                                         [arith_dc_L_13 _uint8]
-                                         [arith_dc_L_14 _uint8]
-                                         [arith_dc_L_15 _uint8]
-                                         [arith_dc_L_16 _uint8]
-
-                                         [arith_dc_U_1 _uint8]
-                                         [arith_dc_U_2 _uint8]
-                                         [arith_dc_U_3 _uint8]
-                                         [arith_dc_U_4 _uint8]
-                                         [arith_dc_U_5 _uint8]
-                                         [arith_dc_U_6 _uint8]
-                                         [arith_dc_U_7 _uint8]
-                                         [arith_dc_U_8 _uint8]
-                                         [arith_dc_U_9 _uint8]
-                                         [arith_dc_U_10 _uint8]
-                                         [arith_dc_U_11 _uint8]
-                                         [arith_dc_U_12 _uint8]
-                                         [arith_dc_U_13 _uint8]
-                                         [arith_dc_U_14 _uint8]
-                                         [arith_dc_U_15 _uint8]
-                                         [arith_dc_U_16 _uint8]
-
-                                         [arith_dc_K_1 _uint8]
-                                         [arith_dc_K_2 _uint8]
-                                         [arith_dc_K_3 _uint8]
-                                         [arith_dc_K_4 _uint8]
-                                         [arith_dc_K_5 _uint8]
-                                         [arith_dc_K_6 _uint8]
-                                         [arith_dc_K_7 _uint8]
-                                         [arith_dc_K_8 _uint8]
-                                         [arith_dc_K_9 _uint8]
-                                         [arith_dc_K_10 _uint8]
-                                         [arith_dc_K_11 _uint8]
-                                         [arith_dc_K_12 _uint8]
-                                         [arith_dc_K_13 _uint8]
-                                         [arith_dc_K_14 _uint8]
-                                         [arith_dc_K_15 _uint8]
-                                         [arith_dc_K_16 _uint8]
-                                         
-                                         [num_scans _int]
-                                         [scan_info _pointer]
-
-                                         [raw_data_in _jbool]
-                                         [arith_code _jbool]
-                                         [optimize_coding _jbool]
-                                         [CCIR601_sampling _jbool]
-                                         ,([(62 64) ()]
-                                           [else
-                                            ([do_fancy_downsampling _jbool])])
-
-                                         [smoothing_factor _int]
-                                         [dct_method _J_DCT_METHOD]
-
-                                         [restart_interval _uint]
-                                         [restart_in_rows _int]
-                                         
-                                         [write_JFIF_header _jbool]
-                                         [JFIF_major_version _uint8]
-                                         [JFIF_minor_version _uint8]
-                                         [density_unit _uint8]
-                                         [X_density _uint16]
-                                         [Y_density _uint16]
-                                         [write_Adobe_marker _jbool]
-                                         
-                                         ,([(90) ([color_transform _J_COLOR_TRANSFORM])]
-                                           [else ()])
-                                         
-                                         [next_scanline _JDIMENSION]
-                                         
-                                         [progressive_mode _jbool]
-                                         
-                                         [max_h_samp_factor _int]
-                                         [max_v_samp_factor _int]
-
-                                         ,([(62 64) ()]
-                                           [else ([min_DCT_h_scaled_size _int]
-                                                  [min_DCT_v_scaled_size _int])])
-
-                                         [total_iMCU_rows _JDIMENSION]
-
-                                         [comps_in_scan _int]
-                                         [cur_comp_info_1 _pointer]
-                                         [cur_comp_info_2 _pointer]
-                                         [cur_comp_info_3 _pointer]
-                                         [cur_comp_info_4 _pointer]
-                                       
-                                         [MCUs_per_row _JDIMENSION]
-                                         [MCU_rows_in_scan _JDIMENSION]
-                                         
-                                         [blocks_in_MCU _int]
-                                         
-                                         [MCU_membership_1 _int]
-                                         [MCU_membership_2 _int]
-                                         [MCU_membership_3 _int]
-                                         [MCU_membership_4 _int]
-                                         [MCU_membership_5 _int]
-                                         [MCU_membership_6 _int]
-                                         [MCU_membership_7 _int]
-                                         [MCU_membership_8 _int]
-                                         [MCU_membership_9 _int]
-                                         [MCU_membership_10 _int]
-
-                                         [Ss _int]
-                                         [Se _int]
-                                         [Ah _int]
-                                         [Al _int]
-                                         
-                                         ,([(62 64 70) ()]
-                                           [else
-                                            ([block_size _int]
-                                             [natural_order _pointer]
-                                             [lim_Se _int])])
-
-                                         [master _pointer]
-                                         [main _pointer]
-                                         [prep _pointer]
-                                         [coef _pointer]
-                                         [marker _pointer]
-                                         [cconvert _pointer]
-                                         [downsample _pointer]
-                                         [fdct _pointer]
-                                         [entropy _pointer]
-                                         [script_space _pointer]
-                                         [script_space_size _int])]))
-
-(define _j_compress_ptr _jpeg_compress_struct-pointer)
-
-(define-cstruct _jpeg_destination_mgr ([next_output_byte _pointer] ;; /* => next byte to write in buffer */
-                                       [free_in_buffer _size_t]  ;; /* # of byte spaces remaining in buffer */
-                                       [init_destination _fpointer] ; (_fun _j_compress_ptr -> _void)
-                                       [empty_output_buffer _fpointer] ; (_fun _j_compress_ptr -> _jbool)
-                                       [term_destination _fpointer] ; (_fun _j_compress_ptr -> _void)
-                                       ;; extra fields specific to this binding:
-                                       [buffer _pointer]))
-
-(define (jpeg_compress_struct-dest m)
-  (ptr-cast (jpeg_compress_struct-dest* m) _jpeg_destination_mgr-pointer))
-
-
-(define BUFFER-SIZE 4096)
-(define JPEG_EOI #xD9)
-
-(define (init-source m)
-  (void))
-
-(define (fill-input-buffer m)
-  (let* ([s (jpeg_decompress_struct-src m)]
-         [b (jpeg_source_mgr-buffer s)]
-         [bstr (scheme_make_sized_byte_string b BUFFER-SIZE 0)]
-         [in (car (ptr-ref (jpeg_decompress_struct-client_data m) _scheme))])
-    (let* ([len (read-bytes! bstr in)]
-           [len (if (zero? len)
-                    (begin
-                      (bytes-set! bstr 0 #xFF)
-                      (bytes-set! bstr 1 JPEG_EOI)
-                      2)
-                    len)])
-      (set-jpeg_source_mgr-next_input_byte! s b)
-      (set-jpeg_source_mgr-bytes_in_buffer! s len)
-      #t)))
-
-(define (skip-input-data m len)
-  (let* ([s (jpeg_decompress_struct-src m)]
-         [avail (jpeg_source_mgr-bytes_in_buffer s)])
-    (if (avail . >= . len)
-        (begin
-          (set-jpeg_source_mgr-next_input_byte! s (ptr-add (jpeg_source_mgr-next_input_byte s) len))
-          (set-jpeg_source_mgr-bytes_in_buffer! s (- avail len)))
-        (let ([in (car (ptr-ref (jpeg_decompress_struct-client_data m) _scheme))])
-          (read-bytes (- len avail) in)
-          (set-jpeg_source_mgr-next_input_byte! s #f)
-          (set-jpeg_source_mgr-bytes_in_buffer! s 0)
-          (void)))))
-
-(define (term-source m)
-  ;; Maybe add support to optionally close port as early as possible?
-  (when #f
-    (let ([in (car (ptr-ref (jpeg_decompress_struct-client_data m) _scheme))])
-      (close-input-port in))))
-
-(define (init-destination m)
-  (void))
-
-(define (do-empty-output-buffer m all?)
-  (let* ([d (jpeg_compress_struct-dest m)]
-         [b (jpeg_destination_mgr-buffer d)]
-         [bstr (scheme_make_sized_byte_string b 
-                                              (if all?
-                                                  BUFFER-SIZE
-                                                  (- BUFFER-SIZE (jpeg_destination_mgr-free_in_buffer d)))
-                                              0)]
-         [out (car (ptr-ref (jpeg_compress_struct-client_data m) _scheme))])
-    (write-bytes bstr out)
-    (set-jpeg_destination_mgr-next_output_byte! d b)
-    (set-jpeg_destination_mgr-free_in_buffer! d BUFFER-SIZE)
-    #t))
-
-(define (empty-output-buffer m)
-  (do-empty-output-buffer m #t))
-
-(define (term-destination m)
-  (do-empty-output-buffer m #f)
-  ;; Maybe add support to optionally close port as early as possible?
-  (when #f
-    (let ([in (car (ptr-ref (jpeg_decompress_struct-client_data m) _scheme))])
-      (close-input-port in))))
-
-(define (ptr-cast p t) (cast p _pointer t))
-
-(define destroy-decompress
-  ((deallocator)
-   (lambda (m)
-     (free (jpeg_source_mgr-buffer (jpeg_decompress_struct-src m)))
-     (free (jpeg_decompress_struct-err m))
-     (free (jpeg_decompress_struct-src m))
-     (free-immobile-cell (jpeg_decompress_struct-client_data m))
-     (free m))))
-
-(define create-decompress
-  ((allocator destroy-decompress)
-   (lambda (in)
-     (let ([m (ptr-cast (malloc _jpeg_decompress_struct 'raw) _jpeg_decompress_struct-pointer)]
-           [s (ptr-cast (malloc _jpeg_source_mgr 'raw) _jpeg_source_mgr-pointer)]
-           [e (ptr-cast (malloc sizeof_jpeg_error_mgr 'raw) _jpeg_error_mgr-pointer)]
-           [b (malloc 'raw BUFFER-SIZE)]
-           [funs (box null)])
-       (set-jpeg_decompress_struct-err! m (jpeg_std_error e))
-       (set-jpeg_error_mgr-error_exit! e (cast error-exit
-                                               (_fun #:keep funs _j_common_ptr -> _void)
-                                               _fpointer))
-       (jpeg_CreateDecompress m JPEG_LIB_VERSION (ctype-sizeof _jpeg_decompress_struct))
-       (set-jpeg_decompress_struct-src*! m s)
-       (set-jpeg_source_mgr-buffer! s b)
-       (set-jpeg_decompress_struct-client_data! m (malloc-immobile-cell (cons in funs)))
-       (set-jpeg_source_mgr-next_input_byte! s #f)
-       (set-jpeg_source_mgr-bytes_in_buffer! s 0)
-       (set-jpeg_source_mgr-init_source! s (cast init-source
-                                                 (_fun #:keep funs _j_decompress_ptr -> _void)
-                                                 _fpointer))
-       (set-jpeg_source_mgr-fill_input_buffer! s (cast fill-input-buffer
-                                                       (_fun #:keep funs _j_decompress_ptr -> _jbool)
-                                                       _fpointer))
-       (set-jpeg_source_mgr-skip_input_data! s (cast skip-input-data
-                                                     (_fun #:keep funs _j_decompress_ptr _long -> _void)
-                                                     _fpointer))
-       (set-jpeg_source_mgr-resync_to_restart! s jpeg_resync_to_restart)
-       (set-jpeg_source_mgr-term_source! s (cast term-source
-                                                 (_fun #:keep funs _j_decompress_ptr -> _void)
-                                                 _fpointer))
-       m))))
-
-(define destroy-compress
-  ((deallocator)
-   (lambda (m)
-     (free (jpeg_destination_mgr-buffer (jpeg_compress_struct-dest m)))
-     (free (jpeg_compress_struct-dest m))
-     (free (jpeg_compress_struct-err m))
-     (free-immobile-cell (jpeg_compress_struct-client_data m))
-     (free m))))
-
-(define create-compress
-  ((allocator destroy-compress)
-   (lambda (out)
-     (let ([m (ptr-cast (malloc _jpeg_compress_struct 'raw) _jpeg_compress_struct-pointer)]
-           [d (ptr-cast (malloc _jpeg_destination_mgr 'raw) _jpeg_destination_mgr-pointer)]
-           [e (ptr-cast (malloc sizeof_jpeg_error_mgr 'raw) _jpeg_error_mgr-pointer)]
-           [b (malloc 'raw BUFFER-SIZE)]
-           [funs (box null)])
-       (set-jpeg_compress_struct-err! m (jpeg_std_error e))
-       (set-jpeg_error_mgr-error_exit! e (cast error-exit
-                                               (_fun #:keep funs _j_common_ptr -> _void)
-                                               _fpointer))
-       (jpeg_CreateCompress m JPEG_LIB_VERSION (ctype-sizeof _jpeg_compress_struct))
-       (set-jpeg_compress_struct-dest*! m d)
-       (set-jpeg_destination_mgr-buffer! d b)
-       (set-jpeg_compress_struct-client_data! m (malloc-immobile-cell (cons out funs)))
-       (set-jpeg_destination_mgr-next_output_byte! d b)
-       (set-jpeg_destination_mgr-free_in_buffer! d BUFFER-SIZE)
-       (set-jpeg_destination_mgr-init_destination! d (cast init-destination
-                                                           (_fun #:keep funs _j_compress_ptr -> _void)
-                                                           _fpointer))
-       (set-jpeg_destination_mgr-empty_output_buffer! d (cast empty-output-buffer
-                                                              (_fun #:keep funs _j_compress_ptr -> _jbool)
-                                                              _fpointer))
-       (set-jpeg_destination_mgr-term_destination! d (cast term-destination
-                                                           (_fun #:keep funs _j_compress_ptr -> _void)
-                                                           _fpointer))
-       m))))
-
-(define (create-jpeg-sample-array m len)
-  (let ([samps ((jpeg_memory_mgr-alloc_sarray (if (jpeg_decompress_struct? m)
-                                                  (jpeg_decompress_struct-mem m)
-                                                  (jpeg_compress_struct-mem m)))
-                m
-                JPOOL_IMAGE
-                len
-                1)])
-    (values samps (scheme_make_sized_byte_string (ptr-ref samps _pointer) len 0))))
-
-(define-jpeg/private jpeg_CreateDecompress (_fun _j_decompress_ptr _int _int -> _void))
-(define-jpeg/private jpeg_resync_to_restart _fpointer) ; (_fun _j_decompress_ptr _int -> _jbool))
-(define-jpeg jpeg_read_header (_fun _j_decompress_ptr _jbool -> _void))
-(define-jpeg jpeg_start_decompress (_fun _j_decompress_ptr -> _void))
-(define-jpeg jpeg_read_scanlines (_fun _j_decompress_ptr _pointer _int -> _void))
-(define-jpeg jpeg_finish_decompress (_fun _j_decompress_ptr -> _int))
-
-(define-jpeg/private jpeg_CreateCompress (_fun _j_compress_ptr _int _int -> _void))
-(define-jpeg jpeg_set_defaults (_fun _j_compress_ptr -> _int))
-(define-jpeg jpeg_set_quality (_fun _j_compress_ptr _int _jbool -> _int))
-(define-jpeg jpeg_start_compress (_fun _j_compress_ptr _jbool -> _void))
-(define-jpeg jpeg_write_scanlines (_fun _j_compress_ptr _pointer _int -> _void))
-(define-jpeg jpeg_finish_compress (_fun _j_compress_ptr -> _int))
-
-(provide create-decompress
-         destroy-decompress
-
-         create-compress
-         destroy-compress
-
-         create-jpeg-sample-array
-
-         jpeg_decompress_struct-output_width
-         jpeg_decompress_struct-output_height
-         jpeg_decompress_struct-output_components
-         jpeg_decompress_struct-mem
-
-         set-jpeg_compress_struct-image_width!
-         set-jpeg_compress_struct-image_height!
-         set-jpeg_compress_struct-input_components!
-         set-jpeg_compress_struct-in_color_space!
-         
-         JPOOL_IMAGE)
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/pango.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/pango.rkt
deleted file mode 100644
index 9542e18815..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/pango.rkt
+++ /dev/null
@@ -1,325 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         ffi/unsafe/alloc
-         "glib.rkt"
-         "cairo.rkt"
-         "../private/utils.rkt"
-         "../private/libs.rkt")
-
-(define-runtime-lib pango-lib
-  [(unix) (ffi-lib "libpango-1.0" '("0" ""))]
-  [(macosx) (ffi-lib "libpango-1.0.0.dylib")]
-  [(windows) (ffi-lib "libpango-1.0-0.dll")])
-
-(define-runtime-lib pangowin32-lib
-  [(unix) #f]
-  [(macosx)]
-  [(windows)
-   (ffi-lib "libpangowin32-1.0-0.dll")])
-
-(define-runtime-lib pangocairo-lib
-  [(unix) (ffi-lib "libpangocairo-1.0" '("0" ""))]
-  [(macosx)
-   (ffi-lib "libharfbuzz.0.dylib")
-   (ffi-lib "libpangoft2-1.0.0.dylib")
-   (ffi-lib "libpangocairo-1.0.0.dylib")]
-  [(windows)
-   (ffi-lib "libintl-8.dll")
-   (ffi-lib "libpangowin32-1.0-0.dll")
-   (ffi-lib "libexpat-1.dll")
-   (ffi-lib "libfreetype-6.dll")
-   (ffi-lib "libfontconfig-1.dll")
-   (ffi-lib "libharfbuzz-0.dll")
-   (ffi-lib "libpangoft2-1.0-0.dll")
-   (ffi-lib "libpangocairo-1.0-0.dll")])
-
-(define-ffi-definer define-pango pango-lib
-  #:provide provide)
-(define-ffi-definer define-pangocairo pangocairo-lib
-  #:provide provide)
-(define-ffi-definer define-pangowin32 pangowin32-lib
-  #:provide provide)
-
-;; Pango's Core Text back-end can somehow go wrong if we're going to eventually
-;; use AppKit but don't load AppKit it before using functions such as
-;; `pango_cairo_font_map_get_default'. So, force AppKit now for the platform
-;; where the Core Text back-end is used:
-(when (equal? "x86_64-macosx/3m"
-              (path->string (system-library-subpath)))
-  (void (ffi-lib (format "/System/Library/Frameworks/AppKit.framework/AppKit"))))
-
-;; ALLOCATION NOTE: since Pango calls into Cairo, it has the same
-;; allocation constraints on arguments as Cairo functions; see
-;; "cairo.rkt".
-
-(define PangoContext (_cpointer 'PangoContext))
-(define PangoLayout (_cpointer 'PangoLayout))
-(define PangoFontDescription (_cpointer 'PangoFontDescription))
-(define PangoFontFamily (_cpointer 'PangoFontFamily))
-(define PangoFontFace (_cpointer 'PangoFontFace))
-(define PangoFont (_cpointer 'PangoFont))
-(define PangoFontMap (_cpointer 'PangoFontMap))
-(define PangoFontMetrics (_cpointer 'PangoFontMetrics))
-(define PangoAttrList (_cpointer 'PangoAttrList))
-(define PangoAttribute (_cpointer 'PangoAttribute))
-(define PangoLanguage (_cpointer 'PangoLanguage))
-(define PangoCoverage (_cpointer 'PangoCoverage))
-(define PangoLayoutIter (_cpointer 'PangoLayoutIter))
-(define PangoLayoutLine (_cpointer 'PangoLayoutLine))
-
-(define-cstruct _PangoRectangle ([x _int]
-                                 [y _int]
-                                 [width _int]
-                                 [height _int])
-  #:malloc-mode 'atomic-interior)
-(provide make-PangoRectangle
-         PangoRectangle-x
-         PangoRectangle-y
-         PangoRectangle-width
-         PangoRectangle-height)
-
-(define-cstruct _PangoItem
-  ([offset _int]
-   [length _int]
-   [num_chars _int]
-   ;; Inline PangoAnalysis:
-   [shape_engine _pointer]
-   [lang_engine _pointer]
-   [font (_or-null PangoFont)]
-   [level _uint8]
-   [gravity _uint8]
-   [flags _uint8]
-   [script _uint8]
-   [language _pointer]
-   [extra_attrs _pointer]))
-
-(provide (struct-out PangoItem)
-         _PangoItem _PangoItem-pointer)
-
-(define-cstruct _PangoGlyphInfo
-  ([glyph _uint32]
-   [width _uint32]
-   [dx _uint32]
-   [dy _uint32]
-   [is_cluster_start _uint]))
-
-(provide (struct-out PangoGlyphInfo)
-         _PangoGlyphInfo _PangoGlyphInfo-pointer)
-
-(define-cstruct _PangoGlyphString
-  ([num_glyphs _int]
-   [glyphs _pointer]
-   [log_clusters _pointer])
-  #:malloc-mode 'atomic-interior)
-
-(provide (struct-out PangoGlyphString)
-         _PangoGlyphString)
-
-(define-cstruct _PangoGlyphItem ([item _PangoItem-pointer]
-                                 [glyphs _PangoGlyphString-pointer]))
-(provide (struct-out PangoGlyphItem))
-
-;; As of Pango 1.28, Pango is not thread-safe at the C level, which
-;; means that it isn't place-safe in Racket. Also, for some reason,
-;; when parts of Pango are initialized in a non-main place under
-;; Windows, then font operations start to fail when that place exits.
-;; Run all Pango calls in the original place, which synchronizes them
-;; and avoids Windows problems.
-(define-syntax-rule (_pfun spec ...)
-  (_fun #:in-original-place? #t spec ...))
-
-(provide g_object_unref g_free)
-(define-gobj g_object_unref (_pfun _pointer -> _void)
-  #:wrap (deallocator))
-(define-glib g_free (_pfun _pointer -> _void)
-  #:wrap (deallocator))
-
-;; For working around a Win32 Pango bug (see `unref-font-map'):
-(define _GQueue (_cpointer 'GQueue))
-(define-cstruct _PangoWin32FontMap ([type-instance _pointer]
-				    [ref_count _uint]
-				    [qdata _pointer]
-				    [font_cache _pointer]
-				    [freed_fonts _GQueue]))
-(define-glib g_queue_foreach (_pfun _GQueue _fpointer #;(_fun _pointer -> _void) _pointer -> _void))
-(define-glib g_queue_free (_pfun _GQueue -> _void))
-(define-glib g_queue_new (_pfun -> _GQueue))
-(define-gobj raw_g_object_unref _fpointer #:c-id g_object_unref)
-
-(define-pangocairo pango_cairo_font_map_get_default (_pfun -> PangoFontMap)) ;; not an allocator
-(define-pangocairo pango_cairo_font_map_new (_pfun -> PangoFontMap)
-  #:wrap (allocator g_object_unref))
-
-(define-pango pango_context_new (_pfun -> PangoContext)
-  #:wrap (allocator g_object_unref))
-;; pango_font_map_create_context() is in 1.22 and later
-(provide pango_font_map_create_context)
-(define (pango_font_map_create_context fm)
-  (let ([c (pango_context_new)])
-    (pango_context_set_font_map c fm)
-    c))
-(define-pangocairo pango_cairo_update_context (_pfun _cairo_t PangoContext -> _void))
-
-;; The convenince function pango_cairo_create_context() is in 1.22 and later
-(provide pango_cairo_create_context)
-(define (pango_cairo_create_context cr)
-  (let ([ctx (pango_font_map_create_context
-              (pango_cairo_font_map_get_default))])
-    (pango_cairo_update_context cr ctx)
-    ctx))
-
-(define-pangocairo pango_cairo_create_layout (_pfun _cairo_t -> PangoLayout)
-  #:wrap (allocator g_object_unref))
-(define-pangocairo pango_cairo_update_layout (_pfun _cairo_t PangoLayout -> _void))
-(define-pango pango_layout_set_text (_pfun PangoLayout [s : _string] [_int = -1] -> _void))
-(define-pangocairo pango_cairo_show_layout (_pfun _cairo_t PangoLayout -> _void))
-(define-pangocairo pango_cairo_show_layout_line (_pfun _cairo_t PangoLayoutLine -> _void))
-(define-pangocairo pango_cairo_show_glyph_string (_pfun _cairo_t PangoFont _PangoGlyphString-pointer -> _void))
-(define-pangocairo pango_cairo_layout_line_path (_pfun _cairo_t PangoLayoutLine -> _void))
-
-(define-pango pango_layout_iter_free (_pfun PangoLayoutIter -> _void)
-  #:wrap (deallocator))
-(define-pango pango_layout_get_iter (_pfun PangoLayout -> PangoLayoutIter)
-  #:wrap (allocator pango_layout_iter_free))
-(define-pango pango_layout_iter_get_baseline (_pfun PangoLayoutIter -> _int))
-(define-pango pango_layout_iter_next_run (_pfun PangoLayoutIter -> _bool))
-(define-pango pango_layout_iter_get_run (_pfun PangoLayoutIter -> (_or-null _PangoGlyphItem-pointer)))
-(define-pango pango_layout_iter_get_run_readonly (_pfun PangoLayoutIter -> (_or-null _PangoGlyphItem-pointer))
-  #:fail (lambda () pango_layout_iter_get_run))
-
-(define-pango pango_layout_get_line (_pfun PangoLayout _int -> PangoLayoutLine))
-(define-pango pango_layout_get_line_readonly (_pfun PangoLayout _int -> PangoLayoutLine)
-  #:fail (lambda () pango_layout_get_line))
-
-(define-pango pango_layout_get_context (_pfun PangoLayout -> PangoContext)) ;; not an allocator
-(define-pango pango_layout_get_extents (_pfun PangoLayout  _pointer _PangoRectangle-pointer -> _void))
-(define-pango pango_layout_get_baseline (_pfun PangoLayout -> _int)
-  ;; The convenince function pango_layout_get_baseline() is in 1.22 and later
-  #:fail (lambda ()
-           (lambda (layout)
-             (let ([iter (pango_layout_get_iter layout)])
-               (begin0
-                (pango_layout_iter_get_baseline iter)
-                (pango_layout_iter_free iter))))))
-(define-pango pango_layout_get_spacing (_pfun PangoLayout -> _int))
-
-(define-pango pango_layout_new (_pfun PangoContext -> PangoLayout)
-  #:wrap (allocator g_object_unref))
-
-(define-pangocairo pango_cairo_context_get_font_options (_pfun PangoContext -> _cairo_font_options_t)) ;; not an allocator
-(define-pangocairo pango_cairo_context_set_font_options (_pfun PangoContext _cairo_font_options_t -> _void)) ;; makes a copy
-
-(define-pango pango_layout_set_font_description (_pfun PangoLayout PangoFontDescription -> _void)) ;; makes a copy
-(define-pango pango_context_get_font_map (_pfun PangoContext -> PangoFontMap)) ;; not an allocator
-(define-pango pango_context_set_font_map (_pfun PangoContext PangoFontMap -> _void))
-(define-pango pango_font_family_get_name (_pfun PangoFontFamily -> _string)) ;; not an allocator
-(define-pango pango_font_family_is_monospace (_pfun PangoFontFamily -> _bool))
-
-(define-pango pango_language_get_default (_pfun -> PangoLanguage)
-  ;; not available before 1.16
-  #:fail (lambda () (lambda () #f)))
-(define-pango pango_font_map_load_font (_pfun PangoFontMap PangoContext PangoFontDescription -> (_or-null PangoFont)))
-(define-pango pango_coverage_unref (_pfun PangoCoverage -> _void)
-  #:wrap (deallocator))
-(define-pango pango_font_get_coverage (_pfun PangoFont PangoLanguage -> PangoCoverage)
-  #:wrap (allocator pango_coverage_unref))
-(define-pango pango_coverage_get (_pfun PangoCoverage _int -> _int))
-
-(define-pango pango_font_metrics_unref (_pfun PangoFontMetrics -> _void)
-  #:wrap (deallocator))
-(define-pango pango_font_get_metrics (_pfun PangoFont (_or-null PangoLanguage) -> PangoFontMetrics)
-  #:wrap (allocator pango_font_metrics_unref))
-(define-pango pango_font_metrics_get_approximate_char_width (_pfun PangoFontMetrics -> _int))
-(define-pango pango_font_metrics_get_ascent (_pfun PangoFontMetrics -> _int))
-(define-pango pango_font_metrics_get_descent (_pfun PangoFontMetrics -> _int))
-
-(define-pango pango_layout_get_unknown_glyphs_count (_pfun PangoLayout -> _int)
-  ;; not available in old versions:
-  #:fail (lambda () (lambda (lo) 0)))
-
-(define-pango pango_attr_list_unref (_pfun PangoAttrList -> _void)
-  #:wrap (deallocator))
-(define-pango pango_attr_list_new (_pfun -> PangoAttrList)
-  #:wrap (allocator pango_attr_list_unref))
-(define-pango pango_attr_list_insert (_pfun PangoAttrList PangoAttribute -> _void)
-  ;; takes ownership of the attribute
-  #:wrap (deallocator cadr))
-
-(define-pango pango_attribute_destroy (_pfun PangoAttribute -> _void)
-  #:wrap (deallocator))
-(define-pango pango_attr_underline_new (_pfun _int -> PangoAttribute)
-  #:wrap (allocator pango_attribute_destroy))
-(define-pango pango_attr_fallback_new (_pfun _bool -> PangoAttribute)
-  #:wrap (allocator pango_attribute_destroy))
-
-(define-pango pango_layout_set_attributes (_pfun PangoLayout PangoAttrList -> _void))
-
-(define-pango pango_font_map_list_families (_pfun PangoFontMap
-                                                 (fams : (_ptr o _pointer))
-                                                 (len : (_ptr o _int))
-                                                 -> _void
-                                                 -> (begin0
-                                                      (for/list ([i (in-range len)])
-                                                        (ptr-ref fams PangoFontFamily i))
-                                                      (g_free fams))))
-(define-pango pango_font_family_list_faces (_pfun PangoFontFamily
-                                                  (faces : (_ptr o _pointer))
-                                                  (len : (_ptr o _int))
-                                                  -> _void
-                                                  -> (begin0
-                                                      (for/list ([i (in-range len)])
-                                                        (ptr-ref faces PangoFontFace i))
-                                                      (g_free faces))))
-(define-pango pango_font_face_get_face_name (_pfun PangoFontFace -> _string))
-
-(define-pango pango_font_description_free (_pfun PangoFontDescription -> _void)
-  #:wrap (deallocator))
-(define-pango pango_font_description_new (_pfun -> PangoFontDescription)
-  #:wrap (allocator pango_font_description_free))
-(define-pango pango_font_description_from_string (_pfun _string -> PangoFontDescription)
-  #:wrap (allocator pango_font_description_free))
-(define-pango pango_font_description_set_family (_pfun PangoFontDescription _string -> _void))
-(define-pango pango_font_description_set_style (_pfun PangoFontDescription _int -> _void))
-(define-pango pango_font_description_set_weight (_pfun PangoFontDescription _int -> _void))
-(define-pango pango_font_description_set_size (_pfun PangoFontDescription _int -> _void))
-(define-pango pango_font_description_set_absolute_size (_pfun PangoFontDescription _double* -> _void))
-(define-pango pango_font_description_get_family (_pfun PangoFontDescription ->  _string))
-
-(define _PangoWin32FontCache (_cpointer 'PangoWin32FontCache))
-(define _HFONT (_cpointer 'HFONT))
-(define _LOGFONT-pointer _pointer)
-(define-pangowin32 pango_win32_font_map_for_display (_pfun -> PangoFontMap)
-  #:make-fail make-not-available)
-(define-pangowin32 pango_win32_font_logfont (_pfun PangoFont -> _LOGFONT-pointer)
-  #:make-fail make-not-available
-  #:wrap (allocator g_free))
-(define-pangowin32 pango_win32_font_description_from_logfont (_pfun _LOGFONT-pointer -> PangoFontDescription)
-  #:make-fail make-not-available
-  #:wrap (allocator pango_font_description_free))
-(define-pangowin32 pango_win32_font_cache_unload (_pfun _PangoWin32FontCache _HFONT -> _void)
-  #:make-fail make-not-available)
-(define-pangowin32 pango_win32_font_cache_load (_pfun _PangoWin32FontCache _LOGFONT-pointer -> _HFONT)
-  #:make-fail make-not-available)
-(define-pangowin32 pango_win32_font_cache_new (_pfun -> _PangoWin32FontCache)
-  #:make-fail make-not-available)
-
-(define-enum
-  0
-  PANGO_STYLE_NORMAL
-  PANGO_STYLE_OBLIQUE
-  PANGO_STYLE_ITALIC)
-
-(define-enum
-  0
-  PANGO_UNDERLINE_NONE
-  PANGO_UNDERLINE_SINGLE
-  PANGO_UNDERLINE_DOUBLE
-  PANGO_UNDERLINE_LOW
-  PANGO_UNDERLINE_ERROR)
-
-(define/provide PANGO_WEIGHT_LIGHT 300)
-(define/provide PANGO_WEIGHT_MEDIUM 500)
-(define/provide PANGO_WEIGHT_BOLD 700)
-
-(define/provide PANGO_SCALE 1024)
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/png.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/png.rkt
deleted file mode 100644
index 495d14b7f7..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/unsafe/png.rkt
+++ /dev/null
@@ -1,383 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         ffi/unsafe/alloc
-         "bstr.rkt"
-         "../private/utils.rkt"
-         "../private/libs.rkt")
-
-(define-runtime-lib png-lib
-  [(unix)
-   ;; Most Linux distros supply "libpng12", while other Unix
-   ;; variants often have just "libpng", etc.
-   (let loop ([alts '(("libpng16" ("16" ""))
-                      ("libpng15" ("15" ""))
-                      ("libpng12" ("0" "")))])
-     (cond
-      [(null? alts) (ffi-lib "libpng")]
-      [else (apply ffi-lib (car alts)
-                   #:fail (lambda ()
-                            (loop (cdr alts))))]))]
-  [(macosx) (ffi-lib "libpng16.16.dylib")]
-  [(windows)
-   (ffi-lib "zlib1.dll")
-   (ffi-lib "libpng16-16.dll")])
-
-(define-ffi-definer define-png png-lib
-  #:provide provide)
-
-(define-png png_access_version_number (_fun -> _uint32))
-
-;; We support version 1.2 and 1.4... and (WARNING!) we'll optimisitically
-;;  assume that other versions are also ok
-(define PNG_LIBPNG_VER_STRING (string->bytes/latin-1
-                               (let ([v (png_access_version_number)])
-                                 (format "~s.~s~a"
-                                         (quotient v 10000)
-                                         (quotient (remainder v 10000) 100)
-                                         (if (zero? (remainder v 100))
-                                             ""
-                                             (format ".~a" (remainder v 100)))))))
-
-(define _png_structp (_cpointer 'png_structp))
-(define _png_infop (_cpointer 'png_infop))
-(define _png_end_infop (_cpointer 'png_end_infop))
-(define _png_size_t _long)
-
-(define-cstruct _png_color_16 ([index _byte]
-                               [red _uint16]
-                               [green _uint16]
-                               [blue _uint16]
-                               [gray _uint16]))
-
-(define-png png_create_read_struct
-  (_fun _bytes
-        _pointer
-        (_fun _png_structp _string -> _void)
-        (_fun _png_structp _string -> _void)
-        -> _png_structp))
-
-(define png_destroy_read_struct1
-  (get-ffi-obj 'png_destroy_read_struct
-               png-lib
-               (_fun (_ptr i _png_structp)
-                     (_pointer = #f)
-                     (_pointer = #f)
-                     -> _void)))
-(define png_destroy_read_struct2
-  (get-ffi-obj 'png_destroy_read_struct
-               png-lib
-               (_fun (_ptr i _png_structp)
-                     (_ptr i _png_infop)
-                     (_pointer = #f)
-                     -> _void)))
-
-(define-png png_create_write_struct
-  (_fun _bytes
-        _pointer
-        (_fun _png_structp _string -> _void)
-        (_fun _png_structp _string -> _void)
-        -> _png_structp))
-(define png_destroy_write_struct1
-  (get-ffi-obj 'png_destroy_write_struct
-               png-lib
-               (_fun (_ptr i _png_structp)
-                     (_pointer = #f)
-                     -> _void)))
-(define png_destroy_write_struct2
-  (get-ffi-obj 'png_destroy_write_struct
-               png-lib
-               (_fun (_ptr i _png_structp)
-                     (_ptr i _png_infop)
-                     -> _void)))
-
-(define-png png_create_info_struct (_fun _png_structp -> _png_infop))
-(define-png png_read_info (_fun _png_structp _png_infop -> _void))
-(define-png png_read_end (_fun _png_structp _png_infop -> _void))
-(define-png png_write_info (_fun _png_structp _png_infop -> _void))
-
-(define-png png_read_update_info (_fun _png_structp _png_infop -> _void))
-
-(define-png png_get_IHDR (_fun _png_structp
-                               _png_infop
-                               (w : (_ptr o _uint32))
-                               (h : (_ptr o _uint32))
-                               (depth : (_ptr o _int))
-                               (color-type : (_ptr o _int))
-                               (interlace-type : (_ptr o _int))
-                               (compression-type : (_ptr o _int))
-                               (filter-type : (_ptr o _int))
-                               -> _void
-                               -> (values w h depth
-                                          color-type
-                                          interlace-type
-                                          compression-type
-                                          filter-type)))
-
-(define-png png_set_IHDR (_fun _png_structp
-                               _png_infop
-                               _uint32
-                               _uint32
-                               _int
-                               _int _int _int _int
-                               -> _void))
-
-(define current-fun-keep (make-parameter #f))
-
-(define-png png_set_read_fn (_fun _png_structp
-                                  _pointer
-                                  (_fun #:keep (lambda (v) ((current-fun-keep) v))
-                                        _png_structp
-                                        _pointer
-                                        _png_size_t
-                                        -> _void)
-                                  -> _void))
-(define-png png_set_write_fn (_fun _png_structp
-                                   _pointer
-                                   (_fun #:keep (lambda (v) ((current-fun-keep) v))
-                                         _png_structp
-                                         _pointer
-                                         _png_size_t
-                                         -> _void)
-                                   (_fun #:keep (lambda (v) ((current-fun-keep) v))
-                                         _png_structp
-                                         -> _void)
-                                   -> _void))
-(define-png png_get_io_ptr (_fun _png_structp -> _pointer))
-
-(define-png png_get_rowbytes (_fun _png_structp _png_infop -> _uint32))
-(define-png png_read_rows (_fun _png_structp _pointer #;(_vector i _bytes) _pointer _uint32 -> _void))
-(define-png png_write_image (_fun _png_structp _pointer #;(_vector i _bytes) -> _void))
-
-(define-png png_write_end (_fun _png_structp _png_infop -> _void))
-
-(define-png png_get_valid (_fun _png_structp _png_infop _uint32 -> _uint32))
-(define-png png_get_bKGD (_fun _png_structp _png_infop (p : (_ptr o _png_color_16)) -> (r : _bool) -> (and r p)))
-(define-png png_set_background (_fun _png_structp _png_color_16-pointer _int _int _double* -> _bool))
-(define-png png_get_gAMA (_fun _png_structp _png_infop (g : (_ptr o _double))
-                               -> (ok? : _bool)
-                               -> (and ok? g)))
-(define-png png_set_gamma (_fun _png_structp _double* _double* -> _void))
-(define-png png_set_filler (_fun _png_structp _uint32 _int -> _void))
-
-(define-png png_set_invert_alpha (_fun _png_structp -> _void))
-(define-png png_set_palette_to_rgb (_fun _png_structp -> _void))
-(define-png png_set_gray_to_rgb (_fun _png_structp -> _void))
-(define-png png_set_tRNS_to_alpha (_fun _png_structp -> _void))
-(define-png png_set_strip_16 (_fun _png_structp -> _void))
-(define-png png_set_strip_alpha (_fun _png_structp -> _void))
-(define-png png_set_gray_1_2_4_to_8 (_fun _png_structp -> _void)
-  #:fail (lambda () #f))
-(define-png png_set_expand_gray_1_2_4_to_8 (_fun _png_structp -> _void)
-  #:fail (lambda () #f))
-(define-png png_set_interlace_handling (_fun _png_structp -> _int))
-
-(define/provide PNG_COLOR_MASK_PALETTE    1)
-(define/provide PNG_COLOR_MASK_COLOR      2)
-(define/provide PNG_COLOR_MASK_ALPHA      4)
-
-(define/provide PNG_COLOR_TYPE_GRAY 0)
-(define/provide PNG_COLOR_TYPE_PALETTE  (bitwise-ior PNG_COLOR_MASK_COLOR PNG_COLOR_MASK_PALETTE))
-(define/provide PNG_COLOR_TYPE_RGB      PNG_COLOR_MASK_COLOR)
-(define/provide PNG_COLOR_TYPE_RGB_ALPHA  (bitwise-ior PNG_COLOR_MASK_COLOR PNG_COLOR_MASK_ALPHA))
-(define/provide PNG_COLOR_TYPE_GRAY_ALPHA PNG_COLOR_MASK_ALPHA)
-
-(define/provide PNG_INTERLACE_NONE        0)
-(define/provide PNG_INTERLACE_ADAM7       1)
-
-(define/provide PNG_FILTER_TYPE_BASE      0)
-(define/provide PNG_INTRAPIXEL_DIFFERENCING 64)
-(define/provide PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE)
-
-(define/provide PNG_COMPRESSION_TYPE_BASE 0)
-(define/provide PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE)
-
-(define/provide PNG_BACKGROUND_GAMMA_UNKNOWN 0)
-(define/provide PNG_BACKGROUND_GAMMA_SCREEN  1)
-(define/provide PNG_BACKGROUND_GAMMA_FILE    2)
-(define/provide PNG_BACKGROUND_GAMMA_UNIQUE  3)
-
-(define/provide PNG_INFO_tRNS #x0010)
-
-(define PNG_FILLER_BEFORE 0)
-(define PNG_FILLER_AFTER  1)
-
-;; ----------------------------------------
-;; Reading
-
-(provide create-png-reader
-         read-png
-         destroy-png-reader)
-
-(define-struct reader ([png #:mutable] info ib num-passes w h))
-
-(define (error-esc v s)
-  (error 'png "~a" s))
-
-(define (read-png-bytes png p len)
-  (let ([bstr (scheme_make_sized_byte_string p len 0)])
-    (read-bytes! bstr (car (ptr-ref (png_get_io_ptr png) _scheme)))))
-
-(define free-cell ((deallocator) free-immobile-cell))
-(define make-cell ((allocator free-cell) malloc-immobile-cell))
-
-(define (create-png-reader in keep-alpha? bg-rgb)
-  (let* ([png (png_create_read_struct PNG_LIBPNG_VER_STRING #f error-esc void)]
-         [info (png_create_info_struct png)]
-         [funs (box null)]
-         [ib (make-cell (cons in funs))])
-    (parameterize ([current-fun-keep (lambda (v)
-                                       (set-box! funs (cons v (unbox funs))))])
-      (png_set_read_fn png ib read-png-bytes))
-    (png_read_info png info)
-    (let-values ([(w h depth color-type
-                     interlace-type compression-type filter-type)
-                  (png_get_IHDR png info)])
-      (let* ([tRNS? (positive? (png_get_valid png info PNG_INFO_tRNS))]
-             [b&w? (and (= depth 1)
-                        (= color-type PNG_COLOR_TYPE_GRAY)
-                        (not tRNS?))]
-             [alpha? (and keep-alpha?
-                          (not b&w?)
-                          (or tRNS?
-                              (positive? (bitwise-ior color-type PNG_COLOR_MASK_ALPHA))))])
-        (unless b&w?
-          ;; Normalize formal of returned rows:
-          (when (= color-type PNG_COLOR_TYPE_PALETTE)
-            (png_set_palette_to_rgb png))
-          (when (or (= color-type PNG_COLOR_TYPE_GRAY)
-                    (= color-type PNG_COLOR_TYPE_GRAY_ALPHA))
-            (png_set_gray_to_rgb png))
-          (when tRNS?
-            (png_set_tRNS_to_alpha png))
-          (when (= depth 16)
-            (png_set_strip_16 png))
-          ;; Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel
-          ((or png_set_gray_1_2_4_to_8 png_set_expand_gray_1_2_4_to_8) png))
-        (unless (or alpha? b&w?)
-          ;; Set the background color to draw transparent and alpha images over.
-          (let* ([deep (lambda (n)
-                         (if (= depth 16)
-                             (+ n (arithmetic-shift n 8))
-                             n))]
-                 [bg (make-png_color_16 0 (deep 255) (deep 255) (deep 255) (deep 255))])
-            (cond
-             [bg-rgb (set-png_color_16-red! bg (deep (car bg-rgb)))
-                     (set-png_color_16-green! bg (deep (cadr bg-rgb)))
-                     (set-png_color_16-blue! bg (deep (caddr bg-rgb)))
-                     (set-png_color_16-gray! bg (deep (floor (/ (apply + bg-rgb) 3))))]
-             [else (let ([c (png_get_bKGD png info)])
-                     (when c
-                       (memcpy bg c (ctype-sizeof _png_color_16))))])
-            (png_set_background png bg
-                                (if bg-rgb
-                                    PNG_BACKGROUND_GAMMA_SCREEN
-                                    PNG_BACKGROUND_GAMMA_FILE)
-                                0 1.0)))
-        (let ([gamma (png_get_gAMA png info)])
-          (when gamma
-            (let* ([s (getenv "SCREEN_GAMMA")]
-                   [screen-gamma (and s (string->number s))])
-              (png_set_gamma png (if (and (real? screen-gamma)
-                                          (<= 0.0 screen-gamma 10.0))
-                                     screen-gamma
-                                     (case (system-type)
-                                       [(macosx) 1.7]
-                                       [else 2.0]))
-                             gamma))))
-        (cond
-         [alpha?
-          ;; Make sure there's an alpha or filler byte (before each RGB triplet):
-          (png_set_filler png 255 PNG_FILLER_AFTER)]
-         [tRNS?
-          ;; Make sure there's no alpha channel:
-          (png_set_strip_alpha png)])
-        (let ([num-passes (png_set_interlace_handling png)])
-          (png_read_update_info png info)
-          (values (make-reader png info ib num-passes w h)
-                  w h
-                  b&w?
-                  alpha?))))))
-
-(define (malloc-rows h row-bytes)
-  (let* ([align (lambda (v) (if (positive? (remainder v 8))
-                                (+ v (- 8 (remainder v 8)))
-                                v))]
-         [table-size (align (* h (ctype-sizeof _pointer)))]
-         [row-size (align row-bytes)]
-         [memory (malloc (+ table-size (* row-size h))
-                         'atomic-interior)]
-         [rows memory])
-    (for ([i (in-range h)])
-      (ptr-set! rows _pointer i (ptr-add memory (+ table-size (* i row-size)))))
-    rows))
-
-(define (read-png reader)
-  (let* ([row-bytes (png_get_rowbytes (reader-png reader) (reader-info reader))]
-         [rows (malloc-rows (reader-h reader) row-bytes)])
-    (for ([i (in-range (reader-num-passes reader))])
-      (png_read_rows (reader-png reader) rows #f (reader-h reader)))
-    (png_read_end (reader-png reader) (reader-info reader))
-    (list->vector
-     (for/list ([i (in-range (reader-h reader))])
-       (let ([p (ptr-ref rows _gcpointer i)])
-         (scheme_make_sized_byte_string p row-bytes 1))))))
-
-(define (destroy-png-reader reader)
-  (when (reader-png reader)
-    (png_destroy_read_struct2 (reader-png reader)
-                              (reader-info reader))
-    (free-cell (reader-ib reader))
-    (set-reader-png! reader #f)))
-
-;; ----------------------------------------
-;; Writing
-
-(provide create-png-writer
-         write-png
-         destroy-png-writer)
-
-(define-struct writer (png info ob))
-
-(define (write-png-bytes png p len)
-  (let ([bstr (scheme_make_sized_byte_string p len 0)])
-    (write-bytes bstr (car (ptr-ref (png_get_io_ptr png) _scheme)))))
-
-(define (flush-png-bytes png)
-  (flush-output (car (ptr-ref (png_get_io_ptr png) _scheme))))
-
-(define (create-png-writer out w h b&w? alpha?)
-  (let* ([png (png_create_write_struct PNG_LIBPNG_VER_STRING #f error-esc void)]
-         [info (png_create_info_struct png)]
-         [funs (box null)]
-         [ob (make-cell (cons out funs))])
-    (parameterize ([current-fun-keep (lambda (v)
-                                       (set-box! funs (cons v (unbox funs))))])
-      (png_set_write_fn png ob write-png-bytes flush-png-bytes))
-    (png_set_IHDR png info w h (if b&w? 1 8)
-                  (cond
-                   [b&w? PNG_COLOR_TYPE_GRAY]
-                   [alpha? PNG_COLOR_TYPE_RGB_ALPHA]
-                   [else PNG_COLOR_TYPE_RGB])
-                  PNG_INTERLACE_NONE PNG_COMPRESSION_TYPE_DEFAULT
-                  PNG_FILTER_TYPE_DEFAULT)
-    (png_write_info png info)
-    (make-writer png info ob)))
-
-(define (write-png writer vector-of-rows)
-  (if (zero? (vector-length vector-of-rows))
-      (png_write_image (writer-png writer) #f)
-      (let* ([h (vector-length vector-of-rows)]
-             [w (bytes-length (vector-ref vector-of-rows 0))]
-             [rows (malloc-rows h w)])
-        (for/list ([i (in-range h)])
-          (memcpy (ptr-ref rows _gcpointer i)
-                  (vector-ref vector-of-rows i)
-                  w))
-        (png_write_image (writer-png writer) rows)))
-  (png_write_end (writer-png writer) (writer-info writer)))
-
-(define (destroy-png-writer writer)
-  (png_destroy_write_struct2 (writer-png writer)
-                             (writer-info writer))
-  (free-cell (writer-ob writer)))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/xbm.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/xbm.rkt
deleted file mode 100644
index 3cfcbd8bc9..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/xbm.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-
-(provide read-xbm)
-
-(define rx:define #rx#"#define[ \t]+[-A-Za-z0-9_]+[ \t]+([0-9]+)")
-(define rx:byte #rx#"0x([0-9a-fA-F][0-9a-fA-F])")
-
-(define (read-xbm in)
-  (let/ec esc
-    (let ([w (regexp-match rx:define in)]
-          [h (regexp-match rx:define in)])
-      (if (and w h)
-          (let ([w (string->number (bytes->string/latin-1 (cadr w)))]
-                [h (string->number (bytes->string/latin-1 (cadr h)))])
-            (if (and (exact-integer? w)
-                     (exact-integer? h)
-                     (positive? w)
-                     (positive? h))
-                (values
-                 w
-                 h
-                 (list->vector
-                  (for/list ([i (in-range h)])
-                    (list->bytes
-                     (for/list ([j (in-range (quotient (+ w 7) 8))])
-                       (let ([m (regexp-match rx:byte in)])
-                         (if m
-                             (string->number (bytes->string/latin-1 (cadr m)) 16)
-                             (esc #f #f #f))))))))
-                (values #f #f #f)))
-          (values #f #f #f)))))
diff --git a/pkgs/draw-pkgs/draw-lib/racket/draw/xpm.rkt b/pkgs/draw-pkgs/draw-lib/racket/draw/xpm.rkt
deleted file mode 100644
index 86b28e39d1..0000000000
--- a/pkgs/draw-pkgs/draw-lib/racket/draw/xpm.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-
-(provide read-xpm)
-
-(define rx:start ; maybe skip comments here?
-  #px#"^\\s*static\\s+char\\s*\\*\\s*[^][\\s]+\\s*\\[\\s*\\]\\s*=\\s*\\{")
-
-(define rx:get-string ; skips spaces, comments, commas
-  #rx#"^(?:[, \t\r\n]+|/\\*.*?\\*/)*\"([^\"\\]*)\"")
-
-(define rx:color-spec
-  ;; look for a simple `c' color, only `None' or `#hhhhhh', skip an `s' one
-  #px#"^(.)\\s*(?:s\\s*[^ ]+\\s*)?c\\s*(?i:(none)|#([0-9a-f]{6}))")
-
-(define (read-xpm in)
-  (define (err why) (error 'read-xpm (format "~a: ~v" why in)))
-  (define colors (make-hasheq)) ; byte -> RGBA as a 4-byte-string
-  (define (get-string)
-    (cond [(regexp-match rx:get-string in) => cadr]
-          [else (err "insufficient strings")]))
-  (define (bytes->int bs radix)
-    (string->number (bytes->string/utf-8 bs) radix))
-  (define (read-color)
-    (let ([s (regexp-match rx:color-spec (get-string))]
-          [b (make-bytes 4 0)])
-      (unless (caddr s) ; matched "none"
-        (let ([c (cadddr s)])
-          (bytes-set! b 0 (bytes->int (subbytes c 0 2) 16))
-          (bytes-set! b 1 (bytes->int (subbytes c 2 4) 16))
-          (bytes-set! b 2 (bytes->int (subbytes c 4 6) 16))
-          (bytes-set! b 3 #xFF)))
-      (hash-set! colors (bytes-ref (cadr s) 0) b)))
-  (define (read-meta)
-    (define m
-      (or (regexp-match
-           #px"^\\s*([0-9]+)\\s*([0-9]+)\\s*([0-9]+)\\s*1(?:\\s|$)"
-           (get-string))
-          (err "unrecognized format")))
-    (for ([i (in-range (bytes->int (cadddr m) 10))]) (read-color))
-    (values (bytes->int (cadr m) 10) (bytes->int (caddr m) 10)))
-  (unless (equal? "/* XPM */" (read-line in 'any)) (err "not an XPM file"))
-  (unless (regexp-match? rx:start in) (err "expected C prefix not found"))
-  (let*-values ([(width height) (read-meta)]
-                [(result) (make-vector height)]
-                [(buflen) (* width 4)])
-    (for/list ([row (in-range height)])
-      (let ([line (get-string)] [buf (make-bytes buflen)])
-        (unless (= width (bytes-length line)) (err "malformed pixels data"))
-        (for ([i (in-range width)])
-          (bytes-copy! buf (* 4 i) (hash-ref colors (bytes-ref line i))))
-        (vector-set! result row buf)))
-    (values width height result)))
diff --git a/pkgs/draw-pkgs/draw/LICENSE.txt b/pkgs/draw-pkgs/draw/LICENSE.txt
deleted file mode 100644
index f9cd82b376..0000000000
--- a/pkgs/draw-pkgs/draw/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-draw
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/draw-pkgs/draw/info.rkt b/pkgs/draw-pkgs/draw/info.rkt
deleted file mode 100644
index 24ab368aed..0000000000
--- a/pkgs/draw-pkgs/draw/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("draw-lib"
-               "draw-doc"))
-(define implies '("draw-lib"
-                  "draw-doc"))
-
-(define pkg-desc "Drawing libraries")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/drracket-pkgs/drracket-plugin-lib/LICENSE.txt b/pkgs/drracket-pkgs/drracket-plugin-lib/LICENSE.txt
deleted file mode 100644
index 280dfabfdd..0000000000
--- a/pkgs/drracket-pkgs/drracket-plugin-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-drracket-plugin-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/drracket-pkgs/drracket-plugin-lib/drracket/private/drsig.rkt b/pkgs/drracket-pkgs/drracket-plugin-lib/drracket/private/drsig.rkt
deleted file mode 100644
index 7b08bdbd2c..0000000000
--- a/pkgs/drracket-pkgs/drracket-plugin-lib/drracket/private/drsig.rkt
+++ /dev/null
@@ -1,435 +0,0 @@
-#lang racket/base
-(require racket/unit)
-
-(provide drracket:eval^
-         drracket:debug^
-         drracket:module-language^
-         drracket:module-language/int^
-         drracket:module-language-tools^
-         drracket:module-language-tools/int^
-         drracket:get-collection^
-         drracket:main^
-         drracket:init^
-         drracket:language-configuration^
-         drracket:language-configuration/internal^
-         drracket:tools^
-         drracket:tools-drs^
-         drracket:get/extend^
-         drracket:unit^
-         drracket:unit/int^
-         drracket:frame^
-         drracket:frame/int^
-         drracket:program^
-         drracket:text^
-         drracket:rep^
-         drracket:rep/int^
-         drracket:app^
-         drracket:draw-arrow^
-         drracket:help-desk^
-         drracket:language^
-         drracket:language/int^
-         drracket:multi-file-search^
-         drracket:module-overview^
-         drracket:font^
-         drracket:modes^
-         drracket:modes/int^
-         drracket:tracing^
-         drracket:tool-exports^
-         drracket:tool^
-         drracket:tool-cm^
-         drscheme:tool^
-         drscheme:tool-cm^
-         drracket:interface^)
-
-(define-signature drracket:modes-cm^
-  ())
-(define-signature drracket:modes^ extends drracket:modes-cm^
-  (add-mode
-   get-modes
-   (struct mode (name
-                 surrogate
-                 repl-submit
-                 matches-language
-                 intended-to-edit-programs?)
-     #:omit-constructor)))
-(define-signature drracket:modes/int^ extends drracket:modes^
-  (add-initial-modes))
-
-(define-signature drracket:font-cm^
-  ())
-(define-signature drracket:font^ extends drracket:font-cm^
-  (setup-preferences))
-
-(define-signature drracket:debug-cm^
-  (profile-definitions-text-mixin
-   profile-tab-mixin
-   profile-unit-frame-mixin
-   test-coverage-interactions-text-mixin
-   test-coverage-definitions-text-mixin
-   test-coverage-tab-mixin))
-(define-signature drracket:debug^ extends drracket:debug-cm^
-  (make-debug-error-display-handler
-   make-debug-eval-handler
-   error-display-handler/stacktrace
-   bug-info->ticket-url
-   test-coverage-enabled
-   profiling-enabled
-   
-   add-prefs-panel
-   
-   get-error-color
-   
-   hide-backtrace-window
-   show-backtrace-window
-   show-backtrace-window/edition-pairs
-   show-backtrace-window/edition-pairs/two
-   open-and-highlight-in-file
-   
-   small-planet-bitmap
-
-   srcloc->edition/pair
-   
-   test-coverage-on-style-name
-   test-coverage-off-style-name
-   
-   ;show-error-and-highlight
-   ;print-bug-to-stderr
-   ;display-srclocs-in-error
-   ;show-syntax-error-context
-   ))
-
-(define-signature drracket:module-language-cm^
-  (module-language<%>))
-(define-signature drracket:module-language^ extends drracket:module-language-cm^
-  (add-module-language
-   module-language-put-file-mixin))
-(define-signature drracket:module-language/int^ extends drracket:module-language^
-  (module-language-online-expand-text-mixin
-   module-language-online-expand-frame-mixin
-   module-language-online-expand-tab-mixin
-   module-language-online-expand-rep-mixin
-   module-language-big-defs/ints-interactions-text-mixin
-   module-language-big-defs/ints-definitions-text-mixin
-   initialize-prefs-panel
-   big-defs/ints-label<%>
-   
-   change-lang-surrogate-mixin
-   default-surrogate%
-   modes<%>
-   modes-mixin))
-
-(define-signature drracket:module-language-tools-cm^
-  (frame-mixin
-   tab-mixin
-   definitions-text-mixin))
-(define-signature drracket:module-language-tools^ extends drracket:module-language-tools-cm^
-  (add-opt-out-toolbar-button
-   add-online-expansion-handler
-   add-online-expansion-monitor
-   register-online-expansion-pref
-   done
-   done?
-   start
-   start?))
-(define-signature drracket:module-language-tools/int^ extends drracket:module-language-tools^
-  (get-online-expansion-pref-funcs
-   (struct online-expansion-handler (mod-path id local-handler monitor?))
-   get-online-expansion-handlers
-   no-more-online-expansion-handlers))
-
-(define-signature drracket:get-collection-cm^ ())
-(define-signature drracket:get-collection^ extends drracket:get-collection-cm^
-  (get-file/collection))
-
-(define-signature drracket:main-cm^ ())
-(define-signature drracket:main^ extends drracket:main-cm^ ())
-
-(define-signature drracket:init-cm^
-  ())
-(define-signature drracket:init^ extends drracket:init-cm^
-  (original-output-port
-   original-error-port
-   original-error-display-handler
-   primitive-eval
-   primitive-load
-   error-display-handler-message-box-title
-   system-logger
-   system-custodian
-   system-eventspace
-   system-namespace
-   system-security-guard
-   first-dir
-   get-last-N-errors))
-
-(define-signature drracket:language-configuration-cm^
-  ())
-(define-signature drracket:language-configuration^ extends drracket:language-configuration-cm^
-  (add-language
-   get-languages
-   (struct language-settings (language settings))
-   make-language-settings
-   get-settings-preferences-symbol
-   language-dialog
-   fill-language-dialog))
-
-(define-signature drracket:language-configuration/internal^ extends drracket:language-configuration^
-  (add-info-specified-languages
-   get-default-language-settings
-   settings-preferences-symbol
-   get-all-scheme-manual-keywords
-   get-all-manual-keywords
-   add-built-in-languages
-   not-a-language-language<%>
-   language-allows-executable-creation?))
-
-(define-signature drracket:tools-cm^
-  ())
-(define-signature drracket:tools^ extends drracket:tools-cm^
-  ((struct successful-tool (spec bitmap name url))
-   make-successful-tool
-   get-successful-tools
-   only-in-phase
-   load/invoke-all-tools
-   add-prefs-panel))
-
-(define-signature drracket:tools-drs-cm^
-  ())
-(define-signature drracket:tools-drs^ extends drracket:tools-drs-cm^
-  (invoke-drs-tool))
-
-(define-signature drracket:get/extend-cm^
-  ())
-(define-signature drracket:get/extend^ extends drracket:get/extend-cm^
-  (extend-tab
-   extend-interactions-text
-   extend-definitions-text
-   extend-interactions-canvas
-   extend-definitions-canvas
-   extend-unit-frame
-   get-tab
-   get-interactions-text
-   get-definitions-text
-   get-interactions-canvas
-   get-definitions-canvas
-   get-unit-frame
-   
-   allow-re-extension!
-   disallow-re-extension!))
-
-(define-signature drracket:unit-cm^
-  (tab%
-   frame% 
-   definitions-canvas%
-   get-definitions-text%
-   interactions-canvas%))
-(define-signature drracket:unit^ extends drracket:unit-cm^
-  (open-drscheme-window
-   find-symbol
-   get-program-editor-mixin
-   add-to-program-editor-mixin
-   (struct teachpack-callbacks (get-names add remove remove-all))
-   make-teachpack-callbacks
-   add-search-help-desk-menu-item))
-(define-signature drracket:unit/int^ extends drracket:unit^
-  (forget-saved-bug-report
-   record-saved-bug-report))
-
-(define-signature drracket:frame-cm^
-  (mixin
-   basics-mixin))
-(define-signature drracket:frame^ extends drracket:frame-cm^
-  ())
-(define-signature drracket:frame/int^ extends drracket:frame^
-  (create-root-menubar
-   add-keybindings-item
-   planet-spec?))
-
-(define-signature drracket:program-cm^
-  (frame%))
-(define-signature drracket:program^ extends drracket:program-cm^
-  ())
-
-(define-signature drracket:eval-cm^
-  ())
-(define-signature drracket:eval^ extends drracket:eval-cm^
-  (expand-program
-   expand-program/multiple
-   traverse-program/multiple
-   build-user-eventspace/custodian
-   set-basic-parameters
-   get-snip-classes))
-
-(define-signature drracket:text-cm^
-  (text<%>
-   text%))
-(define-signature drracket:text^ extends drracket:text-cm^
-  ())
-
-(define-signature drracket:setup-cm^
-  ())
-(define-signature drracket:setup^ extends drracket:setup-cm^ 
-  (do-setup))
-
-(define-signature drracket:rep-cm^
-  (drs-bindings-keymap-mixin
-   text%
-   text<%>))
-(define-signature drracket:rep^ extends drracket:rep-cm^
-  (current-rep
-   current-language-settings
-   current-value-port
-   after-expression
-   get-drs-bindings-keymap
-   get-error-delta
-   get-welcome-delta 
-   get-dark-green-delta))
-(define-signature drracket:rep/int^ extends drracket:rep^
-  (drs-autocomplete-mixin))
-
-(define-signature drracket:app-cm^
-  ())
-(define-signature drracket:app^ extends drracket:app-cm^
-  (about-drscheme
-   add-language-items-to-help-menu
-   add-important-urls-to-help-menu
-   switch-language-to))
-
-(define-signature drracket:draw-arrow-cm^
-  ())
-(define-signature drracket:draw-arrow^ extends drracket:draw-arrow-cm^
-  (draw-arrow))
-
-(define-signature drracket:help-desk-cm^
-  ())
-(define-signature drracket:help-desk^ extends drracket:help-desk-cm^
-  (help-desk
-   goto-plt-license))
-
-(define-signature drracket:language-cm^
-  (language<%>
-   module-based-language<%>
-   simple-module-based-language<%>
-   simple-module-based-language%
-   simple-module-based-language->module-based-language-mixin
-   module-based-language->language-mixin))
-(define-signature drracket:language^ extends drracket:language-cm^
-  (get-default-mixin
-   extend-language-interface
-   get-language-extensions
-   
-   create-module-based-launcher
-   create-module-based-stand-alone-executable
-   create-module-based-distribution
-   
-   create-distribution-for-executable
-   
-   create-executable-gui
-   put-executable
-   
-   ;(struct loc (source position line column span))
-   make-text/pos
-   (struct text/pos (text start end))
-   make-simple-settings
-   (struct simple-settings (case-sensitive 
-                            printing-style 
-                            fraction-style
-                            show-sharing
-                            insert-newlines
-                            annotations))
-   simple-settings->vector
-   
-   simple-module-based-language-convert-value
-   setup-printing-parameters
-   make-setup-printing-parameters
-   
-   add-snip-value
-   
-   register-capability
-   capability-registered?
-   get-capability-default
-   get-capability-contract))
-(define-signature drracket:language/int^ extends drracket:language^
-  (simple-module-based-language-config-panel
-   setup-setup-values))
-
-(define-signature drracket:multi-file-search-cm^
-  ())
-(define-signature drracket:multi-file-search^ extends drracket:multi-file-search-cm^
-  (multi-file-search
-   search-type-params
-   search-types))
-
-(define-signature drracket:module-overview-cm^
-  ())
-(define-signature drracket:module-overview^ extends drracket:module-overview-cm^
-  (module-overview
-   module-overview/file
-   make-module-overview-pasteboard
-   fill-pasteboard))
-
-(define-signature drracket:tracing-cm^
-  (tab-mixin
-   frame-mixin))
-(define-signature drracket:tracing^ extends drracket:tracing-cm^
-  (annotate))
-
-(define-signature drracket:interface^
-  (frame:basics<%>
-   frame:<%>
-   unit:frame<%>
-   unit:definitions-text<%>
-   unit:tab<%>
-   rep:context<%>
-   
-   module-language-tools:definitions-text<%>
-   module-language-tools:tab<%>
-   module-language-tools:frame<%>))
-
-(define-signature drracket:tool-exports-cm^
-  ())
-(define-signature drracket:tool-exports^ extends drracket:tool-exports-cm^
-  (phase1 
-   phase2))
-
-(define-signature no-prefix:tool-cm^
-  ((open (prefix debug: drracket:debug-cm^))
-   (open (prefix unit: drracket:unit-cm^))
-   (open (prefix rep: drracket:rep-cm^))
-   (open (prefix frame: drracket:frame-cm^))
-   (open (prefix get/extend: drracket:get/extend-cm^))
-   (open (prefix language-configuration: drracket:language-configuration-cm^))
-   (open (prefix language: drracket:language-cm^))
-   (open (prefix help-desk: drracket:help-desk-cm^))
-   (open (prefix eval: drracket:eval-cm^))
-   (open (prefix font: drracket:font-cm^))
-   (open (prefix modes: drracket:modes-cm^))
-   (open (prefix tracing: drracket:tracing-cm^))
-   (open (prefix module-language: drracket:module-language-cm^))
-   (open (prefix module-language-tools: drracket:module-language-tools-cm^))
-   (open drracket:interface^)))
-
-(define-signature drracket:tool-cm^
-  ((open (prefix drracket: no-prefix:tool-cm^))))
-(define-signature drscheme:tool-cm^
-  ((open (prefix drscheme: no-prefix:tool-cm^))))
-
-(define-signature no-prefix:tool^ 
-  ((open (prefix debug: drracket:debug^))
-   (open (prefix unit: drracket:unit^))
-   (open (prefix rep: drracket:rep^))
-   (open (prefix frame: drracket:frame^))
-   (open (prefix get/extend: drracket:get/extend^))
-   (open (prefix language-configuration: drracket:language-configuration^))
-   (open (prefix language: drracket:language^))
-   (open (prefix help-desk: drracket:help-desk^))
-   (open (prefix eval: drracket:eval^))
-   (open (prefix modes: drracket:modes^))
-   (open (prefix tracing: drracket:tracing^))
-   (open (prefix module-language: drracket:module-language^))
-   (open (prefix module-language-tools: drracket:module-language-tools^))
-   (open drracket:interface^)))
-
-(define-signature drracket:tool^
-  ((open (prefix drracket: no-prefix:tool^))))
-(define-signature drscheme:tool^
-  ((open (prefix drscheme: no-prefix:tool^))))
diff --git a/pkgs/drracket-pkgs/drracket-plugin-lib/drracket/tool.rkt b/pkgs/drracket-pkgs/drracket-plugin-lib/drracket/tool.rkt
deleted file mode 100644
index c30cdba52b..0000000000
--- a/pkgs/drracket-pkgs/drracket-plugin-lib/drracket/tool.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-(require "private/drsig.rkt")
-(provide drracket:tool^
-         drracket:tool-exports^
-         drscheme:tool^
-         (rename-out [drracket:tool-exports^ drscheme:tool-exports^]))
diff --git a/pkgs/drracket-pkgs/drracket-plugin-lib/drscheme/tool.rkt b/pkgs/drracket-pkgs/drracket-plugin-lib/drscheme/tool.rkt
deleted file mode 100644
index 50df191632..0000000000
--- a/pkgs/drracket-pkgs/drracket-plugin-lib/drscheme/tool.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require drracket/tool)
-(provide (all-from-out drracket/tool))
diff --git a/pkgs/drracket-pkgs/drracket-plugin-lib/info.rkt b/pkgs/drracket-pkgs/drracket-plugin-lib/info.rkt
deleted file mode 100644
index c9789f7695..0000000000
--- a/pkgs/drracket-pkgs/drracket-plugin-lib/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "DrRacket's plugin API")
-
-(define pkg-authors '(robby))
diff --git a/pkgs/drracket-pkgs/drracket-test/LICENSE.txt b/pkgs/drracket-pkgs/drracket-test/LICENSE.txt
deleted file mode 100644
index 1e848ca33b..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-drracket-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/drracket-pkgs/drracket-test/info.rkt b/pkgs/drracket-pkgs/drracket-test/info.rkt
deleted file mode 100644
index 6a7244a7a2..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/info.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "htdp"
-               "drracket"))
-(define build-deps '("racket-index"
-                     "scheme-lib"
-                     "at-exp-lib"
-                     "rackunit-lib"
-                     "compatibility-lib"
-                     "gui-lib"
-                     "htdp"
-                     "compiler-lib"
-                     "cext-lib"
-                     "string-constants-lib"))
-(define update-implies '("drracket"))
-
-(define pkg-desc "tests for \"drracket\"")
-
-(define pkg-authors '(robby))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/autosave-recovery-gui.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/autosave-recovery-gui.rkt
deleted file mode 100644
index 4d68b0a17b..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/autosave-recovery-gui.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang racket/base
-(require "private/drracket-test-util.rkt"
-         racket/class
-         racket/gui/base
-         framework)
-
-(let ([raw-autosave-contents
-       (if (file-exists? autosave:toc-path)
-           (call-with-input-file autosave:toc-path read)
-           '())])
-  (define autosave-contents 
-    (filter (λ (x) (file-exists? (bytes->path (list-ref x 1))))
-            raw-autosave-contents))
-  (unless (null? autosave-contents)
-    (error 'autosave-recovery-gui.rkt 
-           "there was a non-empty autosave toc when starting the test, so the test won't work right; contents:\n  ~s"
-           autosave-contents)))
-   
-(fire-up-drracket-and-run-tests 
- (λ ()
-   (define drs (wait-for-drracket-frame))
-   (define defs (send drs get-definitions-text))
-   
-   
-   (queue-callback/res (λ () 
-                         ;; insert something so the save file is out of date
-                         (send defs insert "\n1")
-                         
-                         ;; set the autosave delay to 1 second
-                         (preferences:set 'framework:autosave-delay 1)))
-   ;; wait for 2 seconds
-   (sleep 2)
-   (queue-callback
-    (λ () 
-      ((dynamic-require 'framework 'autosave:restore-autosave-files/gui))))
-   
-   (define new-frame (wait-for-new-frame drs))
-   (define new-label (send new-frame get-label))
-   (queue-callback/res (λ () (send defs undo)))
-   (unless (equal? "Recover Autosaved Files" new-label)
-     (error 'autosave-recovery-gui.rkt
-            "didn't get autosave file frame, title was ~s" new-label))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/easter-egg.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/easter-egg.rkt
deleted file mode 100644
index ec647e4006..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/easter-egg.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/date
-         "private/easter-egg-lib.rkt")
-
-(define (run-tests)
-  (start-up-on-day  2 14 "Valentine's Day")
-  (start-up-on-day  3  2 "Texas Indepenence Day")
-  (start-up-on-day  3 26 "Prince Kuhio Day")
-  (start-up-on-day  6 11 "King Kamehameha Day")
-  (start-up-on-day  7 30 "Eli's birthday")
-  (start-up-on-day 10 29 "Matthias's birthday")
-  (start-up-on-day 10 31 "Halloween")
-  (start-up-on-day 11  1 "Matthew's birthday")
-  (start-up-on-day 12 10 "Ada Lovelace's birthday")
-  (start-up-on-day 12 25 "Christmas")
-  
-  (define now (current-seconds))
-  (define week-day (date-week-day (seconds->date now)))
-  (define seconds-in-a-day (* 60 60 24))
-  (define sunday-secs (+ (* (- 7 week-day) seconds-in-a-day) now))
-  (define sunday (seconds->date sunday-secs))
-  (define monday (seconds->date (+ sunday-secs seconds-in-a-day)))
-  (start-up-on-day (date-month sunday)
-                   (date-day sunday)
-                   "Weekend")
-  (start-up-on-day (date-month monday)
-                   (date-day monday)
-                   "Weekday"))
-
-
-
-(run-tests)
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/errortrace-stacks.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/errortrace-stacks.rkt
deleted file mode 100644
index 37b2309afb..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/errortrace-stacks.rkt
+++ /dev/null
@@ -1,110 +0,0 @@
-#lang at-exp racket/base
-(require "private/drracket-test-util.rkt"
-         framework/test
-         racket/class
-         racket/gui/base)
-
-(define (setup-racket/base-raw) (setup/rb "No debugging or profiling"))
-(define (setup-racket/base-debug) (setup/rb "Debugging"))
-(define (setup-racket/base-profile) (setup/rb "Debugging and profiling"))
-(define (setup-racket/base-coverage) (setup/rb "Syntactic test suite coverage"))
-
-(define (setup/rb which-rb)
-  (set-module-language! #f)
-  (test:set-radio-box-item! which-rb)
-  (let ([f (test:get-active-top-level-window)])
-    (test:button-push "OK")
-    (wait-for-new-frame f)))
-
-(define (run errortrace-stack? setup-language)
-  (define drracket-frame (wait-for-drracket-frame))
-  
-  (define ints-text (queue-callback/res (λ () (send drracket-frame get-interactions-text))))
-  
-  (setup-language)
-  (clear-definitions drracket-frame)
-  (insert-in-definitions
-   drracket-frame
-   @string-append{
-    #lang racket/base
-    (define (f x)
-      (+ 1 (/ x)))
-
-    (define (g x)
-      (+ 1 (+ 1 (+ 1 (f x)))))
-
-    (g 0)})
-                  
-  (do-execute drracket-frame)
-  
-  (define ints-content (queue-callback/res (λ () (send ints-text get-text))))
-  (unless (regexp-match? #rx"division by zero" ints-content)
-    (error 'errortrace-stacks.rkt
-           "expected a division by zero error in the interactions window, got:\n~a"
-           ints-content))
-  
-  ;; try to find the stacktrace button in the interactions window
-  (define cb
-    (queue-callback/res
-     (λ ()
-       (let loop ([snip (send ints-text find-first-snip)])
-         (cond
-           [snip 
-            (define cb 
-              (with-handlers ([exn:fail? (λ (x) #f)])
-                ;; string snips will fail this
-                (send snip get-callback)))
-            (cond
-              [cb (λ () (cb snip))]
-              [else (loop (send snip next))])]
-           [else #f])))))
-
-  (unless cb
-    (error 'errortrace-stacks.rkt 
-           (string-append
-            "could not find the second clickable snip"
-            "in the interactions text, got: ~a")
-           ints-content))
-  
-  (queue-callback (λ () (cb)))
-  
-  (define stacks (wait-for-new-frame drracket-frame))
-
-  ;; #f => no tab panel in the frame
-  (define tab-panel-labels
-    (queue-callback/res
-     (λ ()
-       (let loop ([window stacks])
-         (cond
-           [(is-a? window tab-panel%)
-            (for/list ([i (in-range (send window get-number))])
-              (send window get-item-label i))]
-           [(is-a? window area-container<%>)
-            (for/or ([child (in-list (send window get-children))])
-              (loop child))]
-           [else #f])))))
-  
-  (define test-passed?
-    (cond
-      [errortrace-stack?
-       (equal? tab-panel-labels '("Errortrace" "Builtin"))]
-      [else
-       (equal? tab-panel-labels #f)]))
-  
-  (unless test-passed?
-    (error 'errortrace-stacks.rkt 
-           "errortrace-stack? ~s and tab-panel-labels ~s don't match up for ~s"
-           errortrace-stack? tab-panel-labels setup-language))
-  
-  ;; close the stacks window
-  (queue-callback/res (λ () (send stacks close)))
-  
-  ;; wait for it to close
-  (wait-for-new-frame stacks))
-
-(fire-up-drracket-and-run-tests
- (λ ()
-   (run #f setup-racket/base-raw)
-   (run #t setup-racket/base-debug)
-   (run #t setup-racket/base-profile)
-   (run #t setup-racket/base-coverage)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/example-tool.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/example-tool.rkt
deleted file mode 100644
index a2ba535067..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/example-tool.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-(require "private/drracket-test-util.rkt"
-         scribblings/tools/example-src
-         racket/unit
-         racket/gui/base
-         racket/file)
-
-(define new-collection-root 
-  #;
-  (string->path "C:\\tmp")
-  (make-temporary-file "drracket-test-example-tool~a"
-                       'directory))
-(define coll (build-path new-collection-root "coll"))
-(unless (directory-exists? coll) (make-directory coll))
-
-(for ([f (in-list sexp-files)])
-  (define fn (list-ref f 0))
-  (define lang-line (format "#lang ~a" (list-ref f 1)))
-  (define sexps (list-ref f 2))
-  (call-with-output-file (build-path coll fn)
-    (λ (port)
-      (fprintf port "~a\n" lang-line)
-      (for ([x (in-list sexps)])
-        (fprintf port "~s\n" x)))
-    #:exists 'truncate))
-
-(parameterize ([current-namespace (make-gui-namespace)]
-               [current-library-collection-paths
-                (cons
-                 new-collection-root
-                 (current-library-collection-paths))])
-  (namespace-require 'tests/drracket/private/run-example-tool)
-  (eval '(go)))
-
-(module+ test
-  (module config info
-    (define random? #t)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/follow-log.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/follow-log.rkt
deleted file mode 100644
index afbd0cc822..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/follow-log.rkt
+++ /dev/null
@@ -1,124 +0,0 @@
-#lang racket/base
-
-#|
-
-This file sets up a log receiver and then
-starts up DrRacket. It catches log messages and 
-organizes them on event boundaries, printing
-out the ones that take the longest
-(possibly dropping those where a gc occurs)
-
-The result shows, for each gui event, the
-log messages that occured during its dynamic
-extent as well as the number of milliseconds
-from the start of the gui event before the
-log message was reported.
-
-(This is not really a test suite, but instead
- a tool to help understand DrRacket's performance)
-
-|#
-
-(define start-right-away? #t) ;; only applies if the 'main' module is loaded
-(define script-drr? #t)
-
-(require racket/list
-         racket/class
-         racket/match
-         racket/pretty
-         racket/gui/base
-         framework/private/logging-timer
-         framework/private/follow-log)
-
-(define drr-eventspace (current-eventspace))
-(require tests/drracket/private/drracket-test-util
-         framework/test)
-
-(test:use-focus-table #t)
-
-;; running on controller-frame-eventspace handler thread
-(define (run-drracket-script)
-  (test:use-focus-table #t)
-  (test:current-get-eventspaces (λ () (list drr-eventspace)))
-  (define drr (wait-for-drracket-frame))
-  
-  (define (wait-until something)
-    (define chan (make-channel))
-    (let loop ()
-      (sleep 1)
-      (parameterize ([current-eventspace drr-eventspace])
-        (queue-callback
-         (λ () 
-           (channel-put chan (something)))))
-      (unless (channel-get chan)
-        (loop))))
-  
-  (define (online-syncheck-done)
-    (define-values (colors labels) (send (send drr get-current-tab) get-bkg-running))
-    (equal? colors '("forestgreen")))
-  
-  (define (syntax-coloring-done)
-    (send (send drr get-definitions-text) is-lexer-valid?))
-  
-  (sync
-   (thread
-    (λ ()
-      (current-eventspace drr-eventspace)
-      (test:current-get-eventspaces (λ () (list drr-eventspace)))
-      (test:use-focus-table #t)
-      (test:menu-select "View" "Hide Interactions")
-      (test:menu-select "Edit" "Find")
-      
-      (define s (make-semaphore))
-      (parameterize ([current-eventspace drr-eventspace])
-        (queue-callback
-         (λ () 
-           (define defs (send drr get-definitions-text))
-           (send defs load-file (collection-file-path "class-internal.rkt" "racket" "private"))
-           (define open-quote-pos (send defs find-string "\""))
-           (when open-quote-pos (send defs set-position open-quote-pos))
-           (send (send defs get-canvas) focus)
-           (semaphore-post s)))
-        #f)
-      (semaphore-wait s)
-
-      ;(wait-until online-syncheck-done)
-      
-      (for ([x (in-range 1)])
-        
-        
-        (let ([s "fdjafjdklafjkdalsfjdaklfjdkaslfdjafjdklafjkdalsfjdaklfjdkasl"])
-          (for ([c (in-string s)])
-            (test:keystroke c)
-            ;(test:keystroke #\return)
-            (sleep .3))
-          #;
-          (for ([c (in-string s)])
-            (test:keystroke #\backspace)
-            (test:keystroke #\backspace)))
-        #;
-        (begin
-          (test:keystroke #\")
-          (test:keystroke #\a)
-          (wait-until syntax-coloring-done)
-          (test:keystroke #\backspace)
-          (test:keystroke #\backspace)
-          (wait-until syntax-coloring-done))
-        ) 
-      '(sleep 10)))) ;; let everything finish
-  
-  (stop-and-dump)
-  (exit))
-    
-
-(module+ main
-  (when start-right-away?
-    (parameterize ([current-eventspace controller-frame-eventspace])
-      (queue-callback sb-callback)))
-  (dynamic-require 'drracket #f)
-  (when script-drr?
-    (parameterize ([current-eventspace controller-frame-eventspace])
-      (queue-callback
-       (λ () 
-         (run-drracket-script))))))
-
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/get-defs-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/get-defs-test.rkt
deleted file mode 100644
index dd34e4d354..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/get-defs-test.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang racket
-
-(require drracket/private/get-defs
-         racket/gui
-         string-constants)
-
-(define (get-definitions/string
-         string
-         #:define-prefix [define-prefix "(define"])
-  (define text (new text%))
-  (send text insert (make-object string-snip% string))
-  (get-definitions define-prefix #f text))
-
-(define-syntax (test-definitions stx)
-  (syntax-case stx ()
-    [(_ string ((name start end) ...))
-     #`(let ([actual (map (match-lambda [(defn _ n s e)
-                                         (list n s e)])
-                          (get-definitions/string string))]
-             [expected (list (list name start end) ...)])
-         (unless (equal? actual expected)
-           (eprintf "Test failure at ~a\nActual: ~s\nExpected: ~s\n"
-                    (format "~a:~a:~a"
-                            '(syntax-source #'stx)
-                            '(syntax-line #'stx)
-                            '(syntax-column #'stx))
-                    actual
-                    expected)))]))
-
-(test-definitions 
- #<<END
-(define x 1)
-(define (f x)
-  (define y x)
-  y)
-(define y 2)
-(define
-END
- (("x" 0 12)
-  ; The end positions for f and the inner y look wrong to me.
-  ; If they look wrong to you too (but you know what you're doing),
-  ; please change the tests.
-  ("f" 13 28) 
-  ("y" 29 46)
-  ("y" 47 59)
-  ((string-constant end-of-buffer-define) 60 67)))
-
-(test-definitions 
- #<<END
-(define-metafunction L
-  f : p -> q
-  [(f p) t])
-(define-metafunction L
-  [(g p) t])
-(define-metafunction/extension f L
-  h : p -> q
-  [(h p) t])
-(define-metafunction/extension f L
-  [(i p) t])
-(define-metafunction
-END
- (("f" 0 48)
-  ("g" 49 84)
-  ("h" 85 145)
-  ("i" 146 193)
-  ((string-constant end-of-buffer-define) 194 214)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/hangman.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/hangman.rkt
deleted file mode 100644
index 15e40a6d3a..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/hangman.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(require "private/drracket-test-util.rkt"
-         racket/class
-         racket/gui/base)
-
-(fire-up-drracket-and-run-tests 
- (λ ()
-   (define drs (wait-for-drracket-frame))
-   (define defs (send drs get-definitions-text))
-   (define rep (send drs get-interactions-text))
-   (set-language-level! (list #rx"Beginning Student$"))
-   (run-one/sync
-    (lambda ()
-       (send defs load-file (collection-file-path "hangman1.rkt" "htdp" "tests"))))
-   (do-execute drs)
-   (insert-in-interactions drs "(hangman make-word reveal symbol?)")
-   (alt-return-in-interactions drs)
-   (define (user-hangman-frame?)
-     (define windows (parameterize ([current-eventspace (send rep get-user-eventspace)])
-                       (get-top-level-windows)))
-     (define labels (map (λ (x) (send x get-label)) windows))
-     (member "Hangman" labels))
-   (poll-until user-hangman-frame?)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/image-and-comment-box.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/image-and-comment-box.rkt
deleted file mode 100644
index a3dd39feb6..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/image-and-comment-box.rkt
+++ /dev/null
@@ -1,476 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.1.2.3 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 44 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 106 0 1 #"\0"
-0 75 1 #"\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0 10 90 -1 90 -1 1 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 38
-#"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
-#"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 128 0 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 128 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 128 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 128 0 0 0 -1 -1 0 1
-#"\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0.0 10 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 200 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 160 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 160 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 90 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 90 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 90 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 160 0 0 0
-0 -1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 148 0 211 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-0.0 8 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-0.0 8 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 65 105 225 0
-0 0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 0 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-0.0 12 -1 -1 -1 -1 -1 -1 0 0 1 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-0.0 12 -1 -1 -1 -1 -1 -1 0 0 1 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1           0 18 0 4 3 85
-(
- #";; The first three lines of this file were inserted by DrRacket. The"
- #"y record metadata"
-) 0 0 4 29 1 #"\n"
-0 0 4 3 85
-(
- #";; about the language level of this file in a form that our tools ca"
- #"n easily process."
-) 0 0 4 29 1 #"\n"
-0 0 4 3 174
-(
- #"#reader(lib \"htdp-beginner-reader.ss\" \"lang\")((modname tmp-img) "
- #"(read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constru"
- #"ctor repeating-decimal #f #t none #f ())))"
-) 0 0 4 29 1 #"\n"
-0 7          13 4           0 0           0 1 0 20 3 1 #"1"
-0           0 0 0 4 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 4 3 1 #" "
-0 2          17 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0           3 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\0%\0\0\0?\b"
- #"\6\0\0\0g\323\1\376\0\0\0\6bKGD\0\377\0\377\0\377\240\275\247"
- #"\223\0\0\4\255IDATh\201\355\231OH\34w\24\307?\277\31\263\272\256"
- #"\177h\273\246\e\335\246J\215\233\320\4"
- #"EP\b\330\213\210\222kB\220\36z\222\340\301\266!-*\361\20\360 R\222"
- #"\322\213\347\"-x\364T(\24r\251\202\rx\310)(!\322\24\202\244F\245"
- #"\325L\235qg_\17\353nv\2633\273\263\316\272n\241_x,\363\366\367\347"
- #";\357\275\337\333\367~\213x\4 J"
- #"\251\274\2\310\375\373\367\275.\351\n\215"
- #"\nDE\222\252*4@)\225\226r\341\277i)7$c\337\273\276\30\24M"
- #"JD\250\257\255\346b\353\331\34\2\206"
- #"\361\232H\270\241\374\244\0\272:\232\371"
- #"\365\373/\301\266!\223\227mAk\367\351\220\2@\344H\336\326\371\346t<R"
- #"\311T\232!\351/\374\23\202\n=}"
- #"\25I\312\223\373r\217y\211\374\344\202"
- #"\202\244>\e\272\202\246\a\322\317\326\241"
- #"\315\345\217\"G\201uJ\244~\370\356\v\260M\220\4\240@\1v\2\16\16O"
- #"\217\24\227n%?\177\373\6\224~bD2Q\221\201\376?)\257\360\236\321\353"
- #"j\2221\245\200x\34\366\367I>d\3006Al\337\244\2248\324\32\213\213\213"
- #"\0\\\277~=\255\373\372\323O\0\205uh\21\213]\344\363;w \221\310N"
- #"\rbC\303y\250}\337\37+\267&!\237\364\365\3659\26\374\246i\212i\232"
- #"\276\e\207\34\367\371-{\227\227\227\351"
- #"\357\357\367>a\365[\260\217\336W\323\241\347\253\342\2]\3234Z[[io"
- #"ow\35\263\275\275\235U\327\273I\323;ul\3772\r\16F("
- #"\252t\t\6\203,--\21\215F]\307\244,\235\317\342\"\222<"
-) 500
-(
- #"\"\266\5q3\371\v\201\200\350\336I"
- #")\245\222\v\225\260\2439S\23\242\346\312044@\"ub\225wR\267\207"
- #"\373\270=\334\207a\36\22\371\363g\330\1\336\275\4\321>\3279N/ \"\351"
- #"\212\243\246\266\216`\363e\320r#(M*\237\25\"g\ei\375\370<\354\377"
- #"\3\346\16\30\a\20jv\34\233\3324\221H\344|7;;\313\330\330\30\226e"
- #"\241\353:\232\3!\200*O.\211'\300\212\203e'\23\250V\5\312y\301P"
- #"(DGG\a\301`0K\277\271\271Ioo/\365\365\365\5\267\363\26\350\n"
- #"\262\vr\367Zj``\200\365\365uO\313\272A\233\233\233cll,\377("
- #"]K\22K\304\223A\231\260\217\352\253"
- #"\23\202\210\310\326\326\226c\346N]\357"
- #"\264\204C\262\364\323\217\"\361W\"\177"
- #"\377!\362\327\357'\232\3215\200p8"
- #"\214\210p\357\336\275\34\322J)^\274"
- #"z\315\213\3753\240\277\a\365\37@\303"
- #"\207\216/\30\b\4\34\365\305\"+Z\247\247\247K\262\250_Tv=U\212l"
- #"mY\226\3575\300\203\245\344\4[)7\344\315S\"BOO\0177o\336\244"
- #"\263\263\263\\\234\336\24y\270\24t###\236\217rISB\312*.\244\313"
- #"`\232ld\271opp\20]\177\323p\32\206ASS\223\353\344\314\237\223X"
- #",\306\263g\317\210D\"\376\363\225\27"
- #"s\2\242\353zA\1\344\301\203\a\245s_!\330\266]P\0\36=z\304\223"
- #"'O|\31\312\261\305r\34X\202<\3465>\313\232\321\257^\275\312\344\344d"
- #"\341\201^\375L\201^\260\30\331\330\330"
- #"\310\273WY\335\227B8\34\246\266\266"
- #"\226\347\317\237;\357U\nR\243\243\243"
- #"\264\265\265qx\370\346\"M\3234\342\3618ssslmm\271"
- #"\316\235\232\232bff&[Y\n\367\355\356\356\272\316\353\357\357\317;"
-) 272
-(
- #"wjj*g\316\361/\367=\342\341\303\207Y\317^\302\340X\247O)E0"
- #"\30\244\272\272\332\363F\305\340X\244\206"
- #"\207\2071\f\203\203\203\3D\204\306\306"
- #"\306\323'\345\245w\363\3O\244\312\371"
- #"\257(T@\215\276\271\271\231\243\323\224R\f\r\r\001011\341x\227t\222"
- #"x\371\362e\216\356\304S\302\333\20\21"
- #"\326\327\3271M\223@ \300\352\352*]]]<~\374\270xR\261X\214s"
- #"\347\316\261\263\263\303\205\v\27|\21\213"
- #"F\243\354\355\355\21\n\205X[[C\327u\272\273\273\323\345OVF\37\37\37"
- #"w\315\274O\237>\365\232\374\v\342\356"
- #"\335\273\351u'''\3353\372\302\302\2mmm\314\317\317\347\334-\31\206A"
- #"$\22\361e\235L\334\270q\203\226\226"
- #"\26 Y\316\344 \305\16\220\225\225\225\222Y\303\17\262H]\273vMfff"
- #"\304\262\254\323\344\224]O\245\216\277\234B[\225\211\177\1\271"
- #"\224\v`\203\340\317\327\0\0\0\0IEND\256B`\202"
-) 0 0 22 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 20 3 1 #"1"
-0 0 4 29 1 #"\n"
-0           0
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/incremental-keybindings-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/incremental-keybindings-test.rkt
deleted file mode 100644
index 099b001d57..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/incremental-keybindings-test.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/base
-#|
-
-Adds the incremental-keybindings.rkt file (also shown in the docs)
-to DrRacket and then tries out the keystrokes.
-
-|#
-
-(require "private/drracket-test-util.rkt"
-         framework/test
-         racket/class)
-
-(fire-up-drracket-and-run-tests 
- (λ ()
-   (define drs-frame (wait-for-drracket-frame))
-   (define defs (queue-callback/res (λ () (send drs-frame get-definitions-text))))
-   (define (get-repl-contents)
-     (queue-callback/res
-      (λ () 
-        (define ints (send drs-frame get-interactions-text))
-        (send ints get-text
-              (send ints paragraph-start-position 2)
-              (send ints last-position)))))
-   
-   (use-get/put-dialog 
-    (λ ()
-      (test:menu-select "Edit" "Keybindings" "Add User-defined Keybindings..."))
-    (collection-file-path "incremental-keybindings.rkt" 
-                          "scribblings"
-                          "drracket"))
-   (insert-in-definitions drs-frame "#lang racket/base\n")
-   (do-execute drs-frame)
-   
-   (insert-in-definitions drs-frame "(+ 1 (+ 2 3))")
-   (queue-callback/res
-    (λ () 
-      (send defs set-position (+ (send defs paragraph-start-position 1) 5))))
-   (test:keystroke #\c '(control))
-   (test:keystroke #\e '(control))
-   (wait-for-computation drs-frame)
-   (test:keystroke 'right '(alt shift))
-   (test:keystroke #\c '(control))
-   (test:keystroke #\r '(control))
-   (wait-for-computation drs-frame)
-   (define got (get-repl-contents))
-   
-   (unless (equal? got "> (+ 1 (+ 2 3))\n6\n> (+ 2 3)\n5\n> ")
-     (error 'incremental-keybindings-test.rkt "failed-test.1; got ~s" got))
-   
-   
-   ;; test c:c;c:e when the insertion
-   ;; point is at the end of the editor
-   (do-execute drs-frame)
-   (queue-callback/res (λ () 
-                         (send (send defs get-canvas) focus)
-                         (send defs set-position (send defs last-position) (send defs last-position))))
-   (test:keystroke #\c '(control))
-   (test:keystroke #\e '(control))
-   (queue-callback/res void) 
-   (sync (system-idle-evt))
-   (wait-for-computation drs-frame)
-   (define got2 (get-repl-contents))
-   (unless (equal? got2 "6\n> (+ 1 (+ 2 3))\n6\n> ")
-     (error 'incremental-keybindings-test.rkt "failed-test.2; got ~s" got2))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/info.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/info.rkt
deleted file mode 100644
index f58bf49df2..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define tools '(("time-keystrokes.rkt")))
-(define tool-names '("Time Keystrokes"))
-(define compile-omit-paths '("snip" "image-and-comment-box.rkt"))
-
-(define test-responsibles '(("test-engine-test.rkt" sperber)
-                            ("teachpack.rkt" (robby matthias))
-                            ("teaching-lang-save-file.rkt" (robby matthias))
-                            ("teaching-lang-coverage.rkt" (robby matthias))
-                            ("language-test.rkt" (robby matthias))
-                            ("hangman.rkt" (robby matthias))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/insert-large-letters-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/insert-large-letters-test.rkt
deleted file mode 100644
index d15e614b91..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/insert-large-letters-test.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket
-
-(require tests/drracket/private/drracket-test-util
-         drracket/private/local-member-names
-         racket/gui/base
-         framework
-         rackunit
-         string-constants)
-
-(fire-up-drracket-and-run-tests 
- (λ ()
-   (define drr (wait-for-drracket-frame))
-   (queue-callback/res (λ () (send (send drr get-definitions-canvas) focus)))
-   (test:menu-select "Insert" "Insert Large Letters...")
-   (define insert-frame (wait-for-new-frame drr))
-   (for ([c (in-string "TR Rulez!")])
-     (test:keystroke c))
-   (test:button-push "OK")
-   (wait-for-new-frame insert-frame)
-   (define defs-content
-     (queue-callback/res
-      (λ () (send (send drr get-definitions-text) get-text))))
-   (define semis (for/sum ([i (in-string defs-content)])
-                   (if (equal? i #\;)
-                       1
-                       0)))
-   (define spaces (for/sum ([i (in-string defs-content)])
-                    (if (equal? i #\space)
-                        1
-                        0)))
-   (unless (and (< 20 spaces)
-                (< 20 semis))
-     (error 'insert-large-letters-test.rkt 
-            "expected more semis or spaces; definitions content was:\n~a"
-            defs-content))))
-
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/io.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/io.rkt
deleted file mode 100644
index 4cb0cfbaee..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/io.rkt
+++ /dev/null
@@ -1,237 +0,0 @@
-#lang scheme/base
-
-#|
-
-add this test:
-
-(let ()
-  (display "x")
-  (write-special (make-object string-snip% " in: "))
-  (display "y")
-  (flush-output))
-
-|#
-
-(require "private/drracket-test-util.rkt"
-         "private/gui.rkt"
-         mzlib/class
-         mzlib/pretty
-         mred
-         mrlib/text-string-style-desc)
-
-(define (check-output expression expected)
-  (begin
-    (clear-definitions drs-frame)
-    (type-in-definitions drs-frame expression)
-    (do-execute drs-frame)
-    (let ([got (get-annotated-output)])
-      (unless (and (= (length expected)
-                      (length got))
-                   (andmap (λ (exp got)
-                             (and (string=? (car exp) (car got))
-                                  (or (equal? (cadr exp) (cadr got))
-                                      (and (procedure? (cadr exp))
-                                           ((cadr exp) (cadr got))))))
-                           expected
-                           got))
-        (eprintf "expected ~s\n     got ~s\nfor ~s\n\n"
-                 expected
-                 got
-                 expression)))))
-
-(define (get-annotated-output)
-  (let ([chan (make-channel)])
-    (queue-callback
-     (λ ()
-       (let ([text (send drs-frame get-interactions-text)])
-         (channel-put chan 
-                      (get-string/style-desc text
-                                             (send text paragraph-start-position 2))))))
-    (channel-get chan)))
-
-
-(define (output-style x) (eq? x '|ports out|))
-(define (error-style x) (eq? x '|ports err|))
-(define (value-style x) (eq? x '|ports value|))
-
-(define prompt '("\n> " default-color))
-
-(define (output-err-port-checking)
-  ;; this test has to be first to test an uninitialized state of the port
-  (check-output "(port-next-location (current-input-port))" 
-                (list `("1\n0\n1\n" |ports value|)
-                      '("> " default-color)))
-  
-  (check-output "(display 1)" (list (list "1" output-style) prompt))
-  (check-output "(display 1 (current-output-port))" (list (list "1" output-style) prompt))
-  
-  (check-output "(display 1 (current-error-port))" (list (list "1" error-style) prompt))
-  (check-output "(display 1) (display 1 (current-error-port))" 
-                (list (list "1" output-style)
-                      (list "1" error-style)
-                      prompt))
-  (check-output "(display 1 (current-error-port)) (display 1)" 
-                (list (list "1" error-style)
-                      (list "1" output-style)
-                      prompt))
-  (check-output "(display 1) (display 1 (current-error-port)) (display 1)" 
-                (list (list "1" output-style)
-                      (list "1" error-style)
-                      (list "1" output-style)
-                      prompt))
-  (check-output "(display 1 (current-error-port)) (display 1) (display 1 (current-error-port))"
-                (list (list "1" error-style)
-                      (list "1" output-style)
-                      (list "1" error-style)
-                      prompt))
-  (check-output (format "~s" '(let ([s (make-semaphore)])
-                                (thread (lambda () (display 1) (semaphore-post s)))
-                                (semaphore-wait s)))
-                (list (list "1" output-style)
-                      prompt))
-  (check-output (format "~s" '(let ([s (make-semaphore)]) 
-                                (thread (lambda () 
-                                          (display 1 (current-output-port))
-                                          (semaphore-post s)))
-                                (semaphore-wait s)))
-                (list (list "1" output-style)
-                      prompt))
-  (check-output (format "~s" '(let ([s (make-semaphore)]) 
-                                (thread (lambda () 
-                                          (display 1 (current-error-port)) 
-                                          (semaphore-post s)))
-                                (semaphore-wait s)))
-                (list (list "1" error-style)
-                      prompt)))
-
-(define (long-io/execute-test)
-  (let ([string-port (open-output-string)])
-    (pretty-print
-     (let f ([n 7] [p null]) (if (= n 0) p (list (f (- n 1) (cons 'l p)) (f (- n 1)  (cons 'r p)))))
-     string-port)
-    (clear-definitions drs-frame)
-    (type-in-definitions
-     drs-frame
-     (format "~s" '(let f ([n 7] [p null])
-                     (if (= n 0) p 
-                         (list (f (- n 1) (cons 'l p)) 
-                               (f (- n 1)  (cons 'r p)))))))
-    (do-execute drs-frame)
-    (let ([got-output (fetch-output drs-frame)])
-      (clear-definitions drs-frame)
-      (do-execute drs-frame)
-      (unless (equal? "" (fetch-output drs-frame))
-        (error 'io.rkt "failed long io / execute test (extra io)"))
-      (unless (whitespace-string=?
-               (get-output-string string-port)
-               got-output)
-        (error 'io.rkt "failed long io / execute test (output doesn't match)")))))
-
-
-(define (reading-test)
-  (define (do-input-test program input expected-transcript [eof? #f])
-    (do-execute drs-frame)
-    (type-in-interactions drs-frame program)
-    (let ([before-newline-pos (send interactions-text last-position)])
-      (type-in-interactions drs-frame "\n")
-      (wait (λ ()
-              ;; the focus moves to the input box, so wait for that.
-              (send interactions-text get-focus-snip))
-            "input box didn't appear")
-      
-      (type-string input)
-      (when eof?
-        (queue-callback/res
-         (λ ()
-           (send interactions-text send-eof-to-box-in-port))))
-      (wait-for-computation drs-frame)
-      (let ([got-value
-             (fetch-output drs-frame 
-                           (queue-callback/res
-                            (λ ()
-                               ;; start after test expression
-                              (send interactions-text paragraph-start-position 3)))
-                           (queue-callback/res
-                            (λ ()
-                              (send interactions-text paragraph-end-position
-                                    (- (send interactions-text last-paragraph) 1)))))])
-        (unless (got-matches-expected? got-value expected-transcript)
-          (eprintf (string-append "FAILED: expected: ~s\n"
-                                  "             got: ~s\n"
-                                  "         program: ~s\n"
-                                  "           input: ~s\n")
-                   expected-transcript got-value program input)))))
-  
-  (define (got-matches-expected? got expected)
-    (cond
-      [(list? expected)
-       (for/or ([expected (in-list expected)])
-         (equal? expected got))]
-      [else
-       (equal? expected got)]))
-  
-  (clear-definitions drs-frame)
-  
-  (do-input-test "(read-char)" "a\n" "a\n#\\a")
-  (do-input-test "(read-char)" "λ\n" "λ\n#\\λ")
-  (do-input-test "(read-line)" "abcdef\n" "abcdef\n\"abcdef\"") 
-  (do-input-test "(list (read-char) (read-line))" "abcdef\n" "abcdef\n(#\\a \"bcdef\")")
-  
-  (do-input-test "(read)" "a\n" "a\na")
-  (do-input-test "(list (read) (read))" "a a\n" "a a\n(a a)")
-  (do-input-test "(list (read-char) (read))" "aa\n" "aa\n(#\\a a)")
-  
-  (do-input-test "(begin (read-char) (sleep 1) (read-char))" "ab\ncd\n" "ab\ncd\n#\\b")
-  (do-input-test "(list (read) (sleep 1) (read) (read))" "a b\nc d\n" "a b\nc d\n(a #<void> b c)")
-  
-  (do-input-test "(begin (display 1) (read))" "2\n" '("12\n2" "2\n12"))
-  
-  (do-input-test "(read-line)" "\n" "\n\"\"")
-  (do-input-test "(read-char)" "\n" "\n#\\newline")
-  
-  (do-input-test "(list (read) (printf \"1\\n\") (read) (printf \"3\\n\"))"
-                 "0 2\n"
-                 "0 2\n1\n3\n(0 #<void> 2 #<void>)")
-  
-  (do-input-test "(write (read))"
-                 "()\n"
-                 "()\n()")
-  
-  (do-input-test "(begin (write (read)) (flush-output) (write (read)))"
-                 "(1) (2)\n"
-                 "(1) (2)\n(1)(2)")
-  
-  (do-input-test "(let ([a (read)][b (read)]) (write a) (write b))"
-                 "(1)\n(2)\n"
-                 "(1)\n(2)\n(1)(2)")
-  
-  (do-input-test 
-   (string-append "(let ([b (read-byte)][bs0 (bytes 0)][bs1 (bytes 1)][bs2 (bytes 2)])"
-                  "(read-bytes-avail!* bs0)"
-                  "(read-bytes-avail!* bs1)"
-                  "(read-bytes-avail!* bs2)"
-                  "(list b bs0 bs1 bs2))\n")
-   "ab\n"
-   "ab\n(97 #\"b\" #\"\\n\" #\"\\2\")")
-  
-  (do-input-test "(read-char)" "" "#<eof>" #t)
-  (do-input-test "(read-char)(read-char)" "a" "a#\\a\n#<eof>" #t))
-
-(define drs-frame #f)
-(define interactions-text #f)
-
-(fire-up-drracket-and-run-tests
- (λ ()
-   (set! drs-frame (wait-for-drracket-frame))
-   (set! interactions-text (queue-callback/res (lambda () (send drs-frame get-interactions-text))))
-   (set-language-level! (list #rx"Pretty Big"))
-   (clear-definitions drs-frame)
-   (do-execute drs-frame)
-   
-   (output-err-port-checking) ;; must come first
-   ;;(long-io/execute-test)
-   (reading-test)))
-
-(module+ test
-  (module config info
-    (define timeout 500)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/language-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/language-test.rkt
deleted file mode 100644
index 380901ce43..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/language-test.rkt
+++ /dev/null
@@ -1,1585 +0,0 @@
-#lang scheme
-
-#|
-
-Make sure there are tests that cover these parameters:
-
- (read-case-sensitive #f) 
- (read-square-bracket-as-paren #f)  -- test: (symbol? '[])
- (read-curly-brace-as-paren #f)
- (print-vector-length #f)
-
-the settings above should match r5rs
-
-|#
-
-
-(require "private/drracket-test-util.rkt"
-         "private/gui.rkt"
-         mred
-         framework
-         (prefix-in fw: framework))
-
-(define language (make-parameter "<<not a language>>"))
-(define defs-prefix (make-parameter ""))
-
-;; set-language : boolean -> void
-(define (set-language close-dialog?)
-  (if (eq? (car (language)) 'module)
-      (set-module-language! close-dialog?)
-      (set-language-level! (language) close-dialog?)))
-
-
-;                                             
-;                                             
-;                                             
-;                                             
-;                        ;;         ;;        
-;                        ;;         ;;        
-;   ;;;;; ;;    ;;;   ;;;;;  ;; ;;  ;;   ;;;; 
-;   ;;;;;;;;;  ;;;;;  ;;;;;  ;; ;;  ;;  ;; ;;;
-;   ;; ;;  ;; ;;;  ;;;;; ;;  ;; ;;  ;; ;;;;;;;
-;   ;; ;;  ;; ;;;  ;;;;; ;;  ;; ;;  ;; ;;;    
-;   ;; ;;  ;;  ;;;;;  ;;;;;  ;;;;;  ;;  ;; ;; 
-;   ;; ;;  ;;   ;;;   ;;;;;  ;;;;;  ;;   ;;;; 
-;                                             
-;                                             
-;                                             
-;                                             
-
-(define (module-lang)
-  (parameterize ([language '(module "racket")]
-                 [defs-prefix "#lang racket\n"])
-    
-    (check-top-of-repl)
-
-    (test-setting
-     (lambda () (fw:test:set-check-box! "Enforce constant definitions (enables some inlining)" #f))
-     "enforce-module-constants -- #f"
-     "#lang racket/base\n(define x 1)\n"
-     #:interactions "(set! x 2)"
-     "> (set! x 2)")
-    (test-setting
-     (lambda () (fw:test:set-check-box! "Enforce constant definitions (enables some inlining)" #t))
-     "enforce-module-constants -- #t"
-     "#lang racket/base\n(define x 1)\n"
-     #:interactions "(set! x 2)"
-     #rx"cannot modify a constant")
-    
-    (prepare-for-test-expression)
-    
-    (test-expression "(print 'hello (current-output-port) 1)" "hello")
-    (test-expression "(print 'hello (current-output-port) 0)" "'hello")
-    (test-expression "(print '((x)) (current-output-port) 0)" "'((x))")
-    
-    (test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
-                     "{image}"
-                     "{image}")
-    
-    (test-expression "'|.|" "'|.|")
-    (test-expression '("(equal? (list " image ") (list " image "))") 
-                     "#t")
-    (test-expression "(define x 1)(define x 2)" #rx"duplicate definition for identifier in: x" "")
-    
-    (test-expression "(define-struct spider (legs))(make-spider 4)" 
-                     "#<spider>"
-                     #rx"define-values: assignment disallowed.*struct:spider")
-    
-    (test-expression "(sqrt -1)" "0+1i")
-    
-    (test-expression "class" (regexp "class: bad syntax in: class"))
-    (test-expression "shared" (regexp "shared: bad syntax in: shared"))
-    
-    (test-expression "(define (. x y) (* x y))" #rx"read: illegal use of `\\.'" "")
-    (test-expression "'(1 . 2)" "'(1 . 2)")
-    
-    (test-expression "(define (f define) 1)" "" #rx"define-values: assignment disallowed.*: f")
-    (test-expression "(define (f car) 1)" "" #rx"define-values: assignment disallowed.*: f")
-    (test-expression "(define (f empty) 1)" "" #rx"define-values: assignment disallowed.*: f")
-    
-    (test-expression "call/cc" "#<procedure:call-with-current-continuation>")
-    
-    (test-expression "(error 'a \"~a\" 1)" "{stop-multi.png} {stop-22x22.png} a: 1")
-    (test-expression "(error \"a\" \"a\")" "{stop-multi.png} {stop-22x22.png} a \"a\"")
-    
-    (test-expression "(time 1)" 
-                     #rx"cpu time: [0-9]+ real time: [0-9]+ gc time: [0-9]+\n1")
-    
-    (test-expression "true" "#t")
-    (test-expression "mred^" 
-                     #rx"unbound identifier in module in: mred\\^"
-                     #rx"mred\\^.*cannot reference undefined identifier")
-    (test-expression "(eq? 'a 'A)" "#f")
-    (test-expression "(set! x 1)" 
-                     #rx"set!: unbound identifier in module in: x"
-                     #rx"set!:.*cannot set undefined.*: x")
-    (test-expression "(define qqq 2) (set! qqq 1)" "")
-    (test-expression "(cond [(= 1 2) 3])" "")
-    (test-expression "(cons 1 2)" "'(1 . 2)")
-    (test-expression "(+ (list 1) 2)" #rx"[+]: contract violation.*given: '[(]1[)]")
-    (test-expression "'(1)" "'(1)")
-    (test-expression "(define shrd (box 1)) (list shrd shrd)"
-                     "'(#&1 #&1)"
-                     #rx"define-values: assignment disallowed.*: shrd")
-    (test-expression "(local ((define x x)) 1)" #rx"x: undefined;\n cannot use before initialization")
-    (test-expression "(letrec ([x x]) 1)" #rx"x: undefined;\n cannot use before initialization")
-    (test-expression "(if 1 1 1)" "1")
-    (test-expression "(+ 1)" "1")
-    
-    (test-expression "1.0" "1.0")
-    (test-expression "#i1.0" "1.0")
-    (test-expression "4/3" "{number 4/3 \"1 1/3\" mixed}")
-    (test-expression "1/3" "{number 1/3 \"1/3\" mixed}")
-    (test-expression "-4/3" "{number -4/3 \"-1 1/3\" mixed}")
-    (test-expression "-1/3" "{number -1/3 \"-1/3\" mixed}")
-    (test-expression "3/2" "{number 3/2 \"1 1/2\" mixed}")
-    (test-expression "1/2" "{number 1/2 \"1/2\" mixed}")
-    (test-expression "-1/2" "{number -1/2 \"-1/2\" mixed}")
-    (test-expression "-3/2" "{number -3/2 \"-1 1/2\" mixed}")
-    (test-expression "+1/3i" "0+1/3i")
-    (test-expression "+1/2i" "0+1/2i")
-    (test-expression "779625/32258" "{number 779625/32258 \"24 5433/32258\" mixed}")
-    (test-expression "(exact? 1.5)" "#f")
-    (test-expression "(print (floor (sqrt 2)))" "1.0")
-    
-    (test-expression "(let ([f (lambda (x) x)]) f)" "#<procedure:f>")
-    (test-expression ",1" "{stop-22x22.png} unquote: not in quasiquote in: (unquote 1)")
-    
-    (test-expression "(list 1)" "'(1)")
-    (test-expression "(car (list))" 
-                     #rx"{stop-multi.png} {stop-22x22.png} car: contract violation.*given: '[(][)]")
-    
-    (test-expression "(current-command-line-arguments)" "'#()")
-    (test-expression "(define-syntax app syntax-case)"
-                     "{stop-22x22.png} syntax-case: bad syntax in: syntax-case")
-    
-    (test-expression "#lang racket" #rx"read: #lang not enabled in the current context" "")
-    (test-expression (string-append "(define (f)\n"
-                                    "(+ (raise-user-error 'a \"b\")))\n"
-                                    "(if (zero? (random 1)) (void) (set! f void))\n"
-                                    "(f)")
-                     "a: b")
-    
-    (test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
-                     "{image}"
-                     "{image}")))
-
-
-;                                                                               
-;                                                                               
-;                                                                               
-;                                ;      ;               ;;;;        ;;          
-;                               ;;     ;;               ;;;;        ;;          
-;  ;;;;;;;   ;;; ;;;   ;;;    ;;;;;  ;;;;; ;;;  ;;;     ;;;;;;;         ;;;;;;; 
-;  ;;;;;;;;  ;;;;;;;  ;;;;;  ;;;;;; ;;;;;; ;;; ;;;;     ;;;;;;;;  ;;;; ;;;;;;;; 
-;  ;;;;;;;;; ;;;; ;; ;;;; ;;  ;;;;   ;;;;   ;;;;;;      ;;;;;;;;; ;;;; ;;; ;;;; 
-;  ;;;; ;;;; ;;;;    ;;;;;;;  ;;;;   ;;;;   ;;;;;;      ;;;; ;;;; ;;;; ;;;;;;;; 
-;  ;;;;;;;;; ;;;;    ;;;;;    ;;;;;  ;;;;;   ;;;;;      ;;;;;;;;; ;;;;  ;;;;;;; 
-;  ;;;;;;;;  ;;;;     ;;;;;;  ;;;;;  ;;;;;   ;;;;       ;;;;;;;;  ;;;; ;   ;;;; 
-;  ;;;;;;;   ;;;;      ;;;;    ;;;;   ;;;;   ;;;;       ;;;;;;;   ;;;; ;;;;;;;; 
-;  ;;;;                                     ;;;;                       ;;;;;;;; 
-;  ;;;;                                     ;;;;                        ;;;;;;  
-;                                                                               
-
-(define (pretty-big)
-  (parameterize ([language (list #rx"Pretty Big")])
-    
-    (check-top-of-repl)
-    
-    (generic-settings #f)
-    (generic-output #t #t #t #f)
-    
-    (test-hash-bang)
-    (test-error-after-definition)
-    
-    (prepare-for-test-expression)
-    
-    (test-expression "(print '((x)))" "((x))")
-    
-    (test-expression "'|.|" "|.|")
-    (test-expression '("(equal? (list " image ") (list " image "))") 
-                     "#t")
-    (test-expression "(define x 1)(define x 2)" "")
-    
-    (test-expression "(define-struct spider (legs))(make-spider 4)" "#<spider>")
-    
-    (test-expression "(sqrt -1)" "0+1i")
-    
-    (test-expression "class" (regexp "class: bad syntax in: class"))
-    (test-expression "shared" (regexp "shared: bad syntax in: shared"))
-    
-    (test-expression "(define (. x y) (* x y))" #rx"read: illegal use of `\\.'")
-    (test-expression "'(1 . 2)" "(1 . 2)")
-    
-    (test-expression "(define (f define) 1)" "")
-    (test-expression "(define (f car) 1)" "")
-    (test-expression "(define (f empty) 1)" "")
-    
-    (test-expression "call/cc" "#<procedure:call-with-current-continuation>")
-    
-    (test-expression "(error 'a \"~a\" 1)" "{stop-multi.png} {stop-22x22.png} a: 1")
-    (test-expression "(error \"a\" \"a\")" "{stop-multi.png} {stop-22x22.png} a \"a\"")
-    
-    (test-expression "(time 1)" 
-                     #rx"cpu time: [0-9]+ real time: [0-9]+ gc time: [0-9]+\n1")
-    
-    (test-expression "true" "#t")
-    (test-expression 
-     "mred^" 
-     #rx"{stop-multi.png} {stop-22x22.png} mred\\^.*cannot reference undefined identifier")
-    (test-expression "(eq? 'a 'A)" "#f")
-    (test-expression "(set! x 1)"
-                     #rx"{stop-multi.png} {stop-22x22.png} set!:.*cannot set undefined.*: x")
-    (test-expression "(define qqq 2) (set! qqq 1)" "")
-    (test-expression "(cond [(= 1 2) 3])" "")
-    (test-expression "(cons 1 2)" "(1 . 2)")
-    (test-expression "(+ (list 1) 2)"
-                     #rx"{stop-multi.png} {stop-22x22.png} [+]: contract violation.*given: [(]1[)]")
-    (test-expression "'(1)" "(1)")
-    (test-expression "(define shrd (box 1)) (list shrd shrd)"
-                     "(#&1 #&1)")
-    (test-expression "(local ((define x x)) 1)" #rx"x: undefined;\n cannot use before initialization")
-    (test-expression "(letrec ([x x]) 1)" #rx"x: undefined;\n cannot use before initialization")
-    (test-expression "(if 1 1 1)" "1")
-    (test-expression "(+ 1)" "1")
-    
-    (test-expression "1.0" "1.0")
-    (test-expression "#i1.0" "1.0")
-    (test-expression "4/3" "{number 4/3 \"1 1/3\" mixed}")
-    (test-expression "1/3" "{number 1/3 \"1/3\" mixed}")
-    (test-expression "-4/3" "{number -4/3 \"-1 1/3\" mixed}")
-    (test-expression "-1/3" "{number -1/3 \"-1/3\" mixed}")
-    (test-expression "3/2" "{number 3/2 \"1 1/2\" mixed}")
-    (test-expression "1/2" "{number 1/2 \"1/2\" mixed}")
-    (test-expression "-1/2" "{number -1/2 \"-1/2\" mixed}")
-    (test-expression "-3/2" "{number -3/2 \"-1 1/2\" mixed}")
-    (test-expression "+1/3i" "0+1/3i")
-    (test-expression "+1/2i" "0+1/2i")
-    (test-expression "779625/32258" "{number 779625/32258 \"24 5433/32258\" mixed}")
-    (test-expression "(exact? 1.5)" "#f")
-    (test-expression "(print (floor (sqrt 2)))" "1.0")
-    
-    (test-expression "(let ([f (lambda (x) x)]) f)" "#<procedure:f>")
-    (test-expression ",1" "{stop-22x22.png} unquote: not in quasiquote in: (unquote 1)")
-    
-    (test-expression "(list 1)" "(1)")
-    (test-expression "(car (list))"
-                     #rx"{stop-multi.png} {stop-22x22.png} car: contract violation.*given: [(][)]")
-    
-    (test-expression "(current-command-line-arguments)" "#()")
-    (test-expression "(define-syntax app syntax-case)"
-                     "{stop-22x22.png} syntax-case: bad syntax in: syntax-case")
-    
-    (test-expression "#lang racket"
-                     ""
-                     #rx"read: #lang not enabled in the current context")
-    (test-expression (string-append "(define (f)\n"
-                                    "(+ (raise-user-error 'a \"b\")))\n"
-                                    "(if (zero? (random 1)) (void) (set! f void))\n"
-                                    "(f)")
-                     "a: b")
-    
-    (test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
-                     "{image}"
-                     "{image}")))
-
-;                                      
-;                                      
-;  ;;;;;;;           ;;;;;;;    ;;;;;; 
-;   ;;   ;;           ;;   ;;  ;;   ;; 
-;   ;;   ;;    ;;;;;  ;;   ;;  ;;    ; 
-;   ;;   ;;    ;;;;;  ;;   ;;  ;;;;    
-;   ;;;;;;     ;      ;;;;;;    ;;;;;  
-;   ;; ;;      ;;;;   ;; ;;        ;;; 
-;   ;;  ;;        ;;  ;;  ;;   ;    ;; 
-;   ;;   ;;       ;;  ;;   ;;  ;;   ;; 
-;  ;;;;   ;;; ;;  ;; ;;;;   ;;;;;;;;;  
-;             ;;  ;;                   
-;              ;;;;                    
-;                                      
-
-
-(define (r5rs)
-  (parameterize ([language (list (regexp "R5RS"))])
-    
-    (check-top-of-repl)
-    
-    (generic-settings #f)
-    (generic-output #t #t #f #f)
-    
-    (test-hash-bang)
-    (test-error-after-definition)
-    
-    (prepare-for-test-expression)
-    
-    (test-expression "'|.|" "|.|")
-    (test-expression '("(equal? (list " image ") (list " image "))") 
-                     "#t")
-    (test-expression "(define x 1)(define x 2)" "")
-    
-    (test-expression 
-     "(define-struct spider (legs))(make-spider 4)" 
-     #rx"{stop-multi.png} {stop-22x22.png} define-struct:.*cannot reference undefined identifier")
-    
-    (test-expression "(sqrt -1)" "0+1i")
-    
-    (test-expression 
-     "class" 
-     #rx"{stop-multi.png} {stop-22x22.png} class:.*cannot reference undefined identifier")
-    (test-expression 
-     "shared"
-     #rx"{stop-multi.png} {stop-22x22.png} shared:.*cannot reference undefined identifier")
-    
-    (test-expression "(define (. x y) (* x y))" #rx"read: illegal use of `\\.'")
-    (test-expression "'(1 . 2)" "(1 . 2)")
-    
-    (test-expression "(define (f define) 1)" "")
-    (test-expression "(define (f car) 1)" "")
-    (test-expression "(define (f empty) 1)" "")
-    
-    (test-expression
-     "call/cc"
-     #rx"{stop-multi.png} {stop-22x22.png} call/cc:.*cannot reference undefined identifier")
-    
-    (test-expression 
-     "(error 'a \"~a\" 1)"
-     #rx"{stop-multi.png} {stop-22x22.png} error:.*cannot reference undefined identifier")
-    (test-expression 
-     "(error \"a\" \"a\")"
-     #rx"{stop-multi.png} {stop-22x22.png} error:.*cannot reference undefined identifier")
-    
-    (test-expression
-     "(time 1)" 
-     #rx"{stop-multi.png} {stop-22x22.png} time.*cannot reference undefined identifier")
-    
-    (test-expression 
-     "true"
-     #rx"{stop-multi.png} {stop-22x22.png} true.*cannot reference undefined identifier")
-    (test-expression 
-     "mred^"
-     #rx"{stop-multi.png} {stop-22x22.png} mred\\^.*cannot reference undefined identifier")
-    (test-expression "(eq? 'a 'A)" "#t")
-    (test-expression "(set! x 1)"
-                     #rx"{stop-multi.png} {stop-22x22.png} set!:.*cannot set undefined.*: x")
-    (test-expression "(define qqq 2) (set! qqq 1)" "")
-    (test-expression "(cond ((= 1 2) 3))" "")
-    (test-expression "(cons 1 2)" "(1 . 2)")
-    (test-expression "(+ (list 1) 2)"
-                     #rx"{stop-multi.png} {stop-22x22.png} [+]: contract violation.*given: [(]1[)]")
-    (test-expression "'(1)" "(1)")
-    (test-expression "(define shrd (cons 1 1)) (list shrd shrd)"
-                     "((1 . 1) (1 . 1))")
-    (test-expression 
-     "(local ((define x x)) 1)"
-     #rx"define: not allowed in an expression context")
-    (test-expression "(letrec ((x x)) 1)" #rx"x: undefined;\n cannot use before initialization")
-    (test-expression "(if 1 1 1)" "1")
-    (test-expression "(+ 1)" "1")
-    
-    (test-expression "1.0" "1.0")
-    (test-expression "#i1.0" "1.0")
-    (test-expression "4/3" "{number 4/3 \"1 1/3\" mixed}")
-    (test-expression "1/3" "{number 1/3 \"1/3\" mixed}")
-    (test-expression "-4/3" "{number -4/3 \"-1 1/3\" mixed}")
-    (test-expression "-1/3" "{number -1/3 \"-1/3\" mixed}")
-    (test-expression "3/2" "{number 3/2 \"1 1/2\" mixed}")
-    (test-expression "1/2" "{number 1/2 \"1/2\" mixed}")
-    (test-expression "-1/2" "{number -1/2 \"-1/2\" mixed}")
-    (test-expression "-3/2" "{number -3/2 \"-1 1/2\" mixed}")
-    (test-expression "+1/3i" "0+1/3i")
-    (test-expression "+1/2i" "0+1/2i")
-    (test-expression "779625/32258" "{number 779625/32258 \"24 5433/32258\" mixed}")
-    (test-expression "(exact? 1.5)" "#f")
-    (test-expression "(print (floor (sqrt 2)))" #rx"print:.*cannot reference undefined identifier")
-    
-    (test-expression "(let ((f (lambda (x) x))) f)" "#<procedure:f>")
-    (test-expression ",1" "{stop-22x22.png} unquote: not in quasiquote in: (unquote 1)")
-    
-    (test-expression "(list 1)" "(1)")
-    (test-expression "(car (list))"
-                     #rx"{stop-multi.png} {stop-22x22.png} mcar: contract violation.*given: [(][)]")
-    
-    (test-expression 
-     "argv"
-     #rx"{stop-multi.png} {stop-22x22.png} argv:.*cannot reference undefined identifier")
-    (test-expression 
-     "(define-syntax app syntax-case)" 
-     "{stop-22x22.png} macro-transformer: only a `syntax-rules' form is allowed in: syntax-case")
-    
-    (test-expression 
-     "#lang racket"
-     (regexp (regexp-quote "#%module-begin: illegal use (not a module body) in: (#%module-begin)"))
-     #rx"read: #lang not enabled in the current context")
-    (test-expression (string-append "(define (f)\n"
-                                    "(+ (raise-user-error 'a \"b\")))\n"
-                                    "(if (zero? (random 1)) (void) (set! f void))\n"
-                                    "(f)")
-                     #rx"cannot reference undefined identifier")
-    
-    (test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
-                     #rx"require: undefined"
-                     #rx"require: undefined")))
-
-
-;                                                             
-;  ;;;                    ;;                                  
-;   ;;                    ;;                                  
-;   ;;                                                        
-;   ;;;;;   ;;;;   ;;;;;;;;;  ;;; ;;   ;;; ;;    ;;;;  ;;; ;; 
-;   ;;  ;; ;;  ;; ;;  ;;  ;;   ;;; ;;   ;;; ;;  ;;  ;;  ;;;;; 
-;   ;;  ;; ;;  ;; ;;  ;;  ;;   ;;  ;;   ;;  ;;  ;;  ;;  ;;    
-;   ;;  ;; ;;;;;;  ;;;;   ;;   ;;  ;;   ;;  ;;  ;;;;;;  ;;    
-;   ;;  ;; ;;      ;      ;;   ;;  ;;   ;;  ;;  ;;      ;;    
-;   ;;  ;; ;;   ;  ;;;;;  ;;   ;;  ;;   ;;  ;;  ;;   ;  ;;    
-;   ;;;;;   ;;;;   ;;;;;;;;;; ;;;; ;;; ;;;; ;;;  ;;;;  ;;;;   
-;                 ;;   ;;                                     
-;                 ;;   ;;                                     
-;                  ;;;;;                                      
-
-(define (beginner)
-  (parameterize ([language (list #rx"Beginning Student(;|$)")])
-    (check-top-of-repl)
-    (generic-settings #t)
-    (generic-output #f #f #f #f)
-    (teaching-language-fraction-output)
-    
-    (test-hash-bang)
-    (test-error-after-definition)
-    
-    (prepare-for-test-expression)
-    
-    (test-expression "'|.|" 
-                     "'|.|"
-                     "'|.|")
-    (test-expression '("(equal? (list " image ") (list " image "))") 
-                     "#true"
-                     "#true")
-    
-    (test-expression "(define x 1)(define x 2)"
-                     "x: this name was defined previously and cannot be re-defined"
-                     "x: this name was defined previously and cannot be re-defined")
-    
-    (test-expression "(define-struct spider (legs))(make-spider 4)" 
-                     "(make-spider 4)"
-                     "spider: this name was defined previously and cannot be re-defined")
-    
-    (test-expression "(sqrt -1)" 
-                     "0+1i"
-                     "0+1i\n")
-    
-    (test-undefined-var "class") 
-    (test-undefined-var "shared")
-    (test-expression "(define (. x y) (* x y))" "read: illegal use of `.'")
-    (test-expression "'(1 . 2)"  "read: illegal use of `.'")
-    
-    (test-undefined-var "call/cc")
-    
-    (test-expression "(error 'a \"~a\" 1)" "a: ~a1")
-    (test-expression "(error \"a\" \"a\")" "aa")
-    
-    (test-undefined-fn "(time 1)" "time"))
-    
-    (test-expression "true" 
-                     "#true"
-                     "#true")
-    (test-undefined-var "mred^")
-    (test-expression "(eq? 'a 'A)" 
-                     "#false"
-                     "#false")
-    (test-undefined-fn "(set! x 1)" "set!")
-    (test-undefined-fn "(define qqq 2) (set! qqq 1)" "set!")
-    
-    (test-expression "(cond [(= 1 2) 3])"
-                     "cond: all question results were false")
-    (test-expression "(cons 1 2)" 
-                     "cons: second argument must be a list, but received 1 and 2")
-    (test-expression "(+ (list 1) 2)"
-                     "+: expects a number as 1st argument, given (cons 1 '())")
-    (test-expression "'(1)"
-                     "quote: expected the name of a symbol or () after the quote, but found a part")
-    (test-expression "(define shrd (list 1)) (list shrd shrd)"
-                     "(cons (cons 1 '()) (cons (cons 1 '()) '()))"
-                     "shrd: this name was defined previously and cannot be re-defined")
-  (test-expression 
-   "(local ((define x x)) 1)" 
-   "local: this function is not defined" 
-   "function call: expected a function after the open parenthesis, but found a part")
-  (test-expression 
-   "(letrec ([x x]) 1)" 
-   "letrec: this function is not defined"
-   "function call: expected a function after the open parenthesis, but found a part")
-    (test-expression "(if 1 1 1)" "if: question result is not true or false: 1")
-    (test-expression "(+ 1)" "+: expects at least 2 arguments, but found only 1")
-    
-    (test-expression "1.0" "1" "1")
-    (test-expression "#i1.0" "#i1.0" "#i1.0")
-    (test-expression "4/3" 
-                     "{number 4/3 \"1.3\" decimal}"
-                     "{number 4/3 \"1.3\" decimal}")
-    (test-expression "1/3"
-                     "{number 1/3 \"0.3\" decimal}"
-                     "{number 1/3 \"0.3\" decimal}")
-    (test-expression "-4/3" 
-                     "{number -4/3 \"-1.3\" decimal}"
-                     "{number -4/3 \"-1.3\" decimal}")
-    (test-expression "-1/3" 
-                     "{number -1/3 \"-0.3\" decimal}"
-                     "{number -1/3 \"-0.3\" decimal}")
-    (test-expression "3/2" 
-                     "{number 3/2 \"1.5\" decimal}"
-                     "{number 3/2 \"1.5\" decimal}")
-    (test-expression "1/2" 
-                     "{number 1/2 \"0.5\" decimal}"
-                     "{number 1/2 \"0.5\" decimal}")
-    (test-expression "-1/2" 
-                     "{number -1/2 \"-0.5\" decimal}"
-                     "{number -1/2 \"-0.5\" decimal}")
-    (test-expression "-3/2" 
-                     "{number -3/2 \"-1.5\" decimal}"
-                     "{number -3/2 \"-1.5\" decimal}")
-    (test-expression "+1/3i" 
-                     "0+1/3i"
-                     "0+1/3i")
-    (test-expression "+1/2i" 
-                     "0+0.5i"
-                     "0+0.5i")
-    (test-expression "779625/32258"
-                     "{number 779625/32258 \"24.1684233368466736933473866...\" decimal}"
-                     "{number 779625/32258 \"24.1684233368466736933473866...\" decimal}")
-    (test-expression "(exact? 1.5)" "#true")
-    (test-undefined-fn "(print (floor (sqrt 2)))" "print")
-    
-  (test-expression
-   "(let ([f (lambda (x) x)]) f)"
-   "let: this function is not defined"
-   "function call: expected a function after the open parenthesis, but found a part")
-    (test-expression ",1"
-                     "read: illegal use of comma")
-    
-    (test-expression "(list 1)" 
-                     "(cons 1 '())"
-                     "(cons 1 '())")
-    (test-expression "(car (list))" 
-                     "car: expects a pair, given '()")
-    
-    (test-undefined-var "argv")
-    (test-undefined-fn "(define-syntax app syntax-case)" "define-syntax")
-    
-    (test-expression "#lang racket"
-                     "read: #lang not enabled in the current context"
-                     "read: #lang not enabled in the current context")
-    (test-expression (string-append "(define (f)\n"
-                                    "(+ (raise-user-error 'a \"b\")))\n"
-                                    "(if (zero? (random 1)) (void) (set! f void))\n"
-                                    "(f)")
-                     "define: expected at least one variable after the function name, but found none"
-                     #rx"define: function definitions are not allowed in the interactions window")
-    
-    (test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
-                     "{image}"
-                     "{image}"))
-
-
-;                                                                            
-;  ;;;                                 ;;;     ;;;                           
-;   ;;                       ;          ;;      ;;                           
-;   ;;                       ;          ;;      ;;                           
-;   ;;;;;   ;;;;   ;;;;;;   ;   ;;;;    ;;;;;   ;;;;;  ;;; ;;  ;;;;  ;;; ;;; 
-;   ;;  ;; ;;  ;; ;;  ;;    ;      ;;   ;;  ;;  ;;  ;;  ;;;;; ;;  ;;  ;;  ;  
-;   ;;  ;; ;;  ;; ;;  ;;   ;       ;;   ;;  ;;  ;;  ;;  ;;    ;;  ;;  ;;  ;  
-;   ;;  ;; ;;;;;;  ;;;;    ;    ;;;;;   ;;  ;;  ;;  ;;  ;;    ;;;;;;   ;;;   
-;   ;;  ;; ;;      ;       ;   ;;  ;;   ;;  ;;  ;;  ;;  ;;    ;;       ;;;   
-;   ;;  ;; ;;   ;  ;;;;;  ;    ;;  ;;   ;;  ;;  ;;  ;;  ;;    ;;   ;   ;;;   
-;   ;;;;;   ;;;;   ;;;;;; ;     ;;;;;;  ;;;;;   ;;;;;  ;;;;    ;;;;     ;    
-;                 ;;   ;;;                                                   
-;                 ;;   ;;;                                                   
-;                  ;;;;;                                                     
-
-
-(define (beginner/abbrev)
-  (parameterize ([language (list #rx"Beginning Student with List Abbreviations(;|$)")])
-    (check-top-of-repl)
-    
-    (generic-settings #t)
-    (generic-output #t #f #f #f)
-    (teaching-language-fraction-output)
-    
-    (test-hash-bang)
-    
-    (test-error-after-definition)
-    
-    (prepare-for-test-expression)
-    
-    (test-expression "'|.|" 
-                     "'|.|"
-                     "'|.|")
-    (test-expression '("(equal? (list " image ") (list " image "))") 
-                     "#true"
-                     "#true")
-    
-    (test-expression "(define x 1)(define x 2)"
-                     "x: this name was defined previously and cannot be re-defined"
-                     "x: this name was defined previously and cannot be re-defined")
-    
-    (test-expression "(define-struct spider (legs))(make-spider 4)"
-                     "(make-spider 4)"
-                     "spider: this name was defined previously and cannot be re-defined")
-    
-    (test-expression "(sqrt -1)" 
-                     "0+1i"
-                     "0+1i")
-    
-    (test-undefined-var "class")
-    (test-undefined-var "shared")
-    
-    (test-expression "(define (. x y) (* x y))"  "read: illegal use of `.'")
-    (test-expression "'(1 . 2)"  "read: illegal use of `.'")
-    
-    (test-undefined-var "call/cc")
-    
-    (test-expression "(error 'a \"~a\" 1)" "a: ~a1")
-    (test-expression "(error \"a\" \"a\")" "aa")
-    
-    (test-undefined-fn "(time 1)" "time")
-    
-    (test-expression "true" 
-                     "#true"
-                     "#true")
-    (test-undefined-var "mred^")
-    (test-expression "(eq? 'a 'A)" 
-                     "#false"
-                     "#false")
-    (test-undefined-fn "(set! x 1)" "set!")
-    (test-undefined-fn "(define qqq 2) (set! qqq 1)" "set!")
-    (test-expression "(cond [(= 1 2) 3])" "cond: all question results were false")
-    (test-expression "(cons 1 2)" "cons: second argument must be a list, but received 1 and 2")
-    (test-expression "(+ (list 1) 2)" "+: expects a number as 1st argument, given (list 1)")
-    (test-expression "'(1)" 
-                     "(list 1)"
-                     "(list 1)")
-    (test-expression "(define shrd (list 1)) (list shrd shrd)"
-                     "(list (list 1) (list 1))"
-                     "shrd: this name was defined previously and cannot be re-defined")
-    (test-expression
-     "(local ((define x x)) 1)"
-     "local: this function is not defined"
-     "function call: expected a function after the open parenthesis, but found a part")
-    (test-expression
-     "(letrec ([x x]) 1)"
-     "letrec: this function is not defined"
-     "function call: expected a function after the open parenthesis, but found a part")
-    (test-expression "(if 1 1 1)" "if: question result is not true or false: 1")
-    (test-expression "(+ 1)" "+: expects at least 2 arguments, but found only 1")
-    
-    (test-expression "1.0" "1" "1")
-    (test-expression "#i1.0" "#i1.0" "#i1.0")
-    (test-expression "4/3" 
-                     "{number 4/3 \"1.3\" decimal}"
-                     "{number 4/3 \"1.3\" decimal}")
-    (test-expression "1/3" 
-                     "{number 1/3 \"0.3\" decimal}"
-                     "{number 1/3 \"0.3\" decimal}")
-    (test-expression "-4/3" 
-                     "{number -4/3 \"-1.3\" decimal}"
-                     "{number -4/3 \"-1.3\" decimal}")
-    (test-expression "-1/3" 
-                     "{number -1/3 \"-0.3\" decimal}"
-                     "{number -1/3 \"-0.3\" decimal}")
-    (test-expression "3/2" 
-                     "{number 3/2 \"1.5\" decimal}"
-                     "{number 3/2 \"1.5\" decimal}")
-    (test-expression "1/2" 
-                     "{number 1/2 \"0.5\" decimal}"
-                     "{number 1/2 \"0.5\" decimal}")
-    (test-expression "-1/2" 
-                     "{number -1/2 \"-0.5\" decimal}"
-                     "{number -1/2 \"-0.5\" decimal}")
-    (test-expression "-3/2" 
-                     "{number -3/2 \"-1.5\" decimal}"
-                     "{number -3/2 \"-1.5\" decimal}")
-    (test-expression "+1/3i" 
-                     "0+1/3i"
-                     "0+1/3i")
-    (test-expression "+1/2i" 
-                     "0+0.5i"
-                     "0+0.5i")
-    (test-expression "779625/32258"
-                     "{number 779625/32258 \"24.1684233368466736933473866...\" decimal}"
-                     "{number 779625/32258 \"24.1684233368466736933473866...\" decimal}")
-    (test-expression "(exact? 1.5)" "#true")
-    (test-undefined-fn "(print (floor (sqrt 2)))" "print")
-    
-    (test-expression 
-     "(let ([f (lambda (x) x)]) f)" 
-     "let: this function is not defined"
-     "function call: expected a function after the open parenthesis, but found a part")
-    (test-expression ",1"
-                     "unquote: misuse of a comma or unquote, not under a quasiquoting backquote")
-    
-    (test-expression "(list 1)" 
-                     "(list 1)"
-                     "(list 1)")
-    (test-expression "(car (list))" "car: expects a pair, given '()")
-    
-    (test-undefined-var "argv")
-    
-    (test-undefined-fn "(define-syntax app syntax-case)" "define-syntax")
-    
-    (test-expression "#lang racket"
-                     "read: #lang not enabled in the current context"
-                     "read: #lang not enabled in the current context")
-    (test-expression (string-append "(define (f)\n"
-                                    "(+ (raise-user-error 'a \"b\")))\n"
-                                    "(if (zero? (random 1)) (void) (set! f void))\n"
-                                    "(f)")
-                     "define: expected at least one variable after the function name, but found none"
-                     #rx"define: function definitions are not allowed in the interactions window")
-    
-    (test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
-                     "{image}"
-                     "{image}")))
-
-
-;                                                                                          
-;   ;;                                                      ;;;   ;;                       
-;   ;;            ;;                                         ;;   ;;           ;;          
-;                 ;;                                         ;;                ;;          
-;  ;;;  ;;; ;;   ;;;;;  ;;;;  ;;; ;; ;;; ;;  ;;    ;;;;   ;;;;;  ;;;   ;;;;   ;;;;;  ;;;;  
-;   ;;   ;;; ;;   ;;   ;;  ;;  ;;;;;  ;;; ;;; ;;  ;;  ;; ;;  ;;   ;;      ;;   ;;   ;;  ;; 
-;   ;;   ;;  ;;   ;;   ;;  ;;  ;;     ;;  ;;  ;;  ;;  ;; ;;  ;;   ;;      ;;   ;;   ;;  ;; 
-;   ;;   ;;  ;;   ;;   ;;;;;;  ;;     ;;  ;;  ;;  ;;;;;; ;;  ;;   ;;   ;;;;;   ;;   ;;;;;; 
-;   ;;   ;;  ;;   ;;   ;;      ;;     ;;  ;;  ;;  ;;     ;;  ;;   ;;  ;;  ;;   ;;   ;;     
-;   ;;   ;;  ;;   ;;   ;;   ;  ;;     ;;  ;;  ;;  ;;   ; ;;  ;;   ;;  ;;  ;;   ;;   ;;   ; 
-;  ;;;; ;;;; ;;;   ;;;  ;;;;  ;;;;   ;;;; ;;; ;;;  ;;;;   ;;;;;; ;;;;  ;;;;;;   ;;;  ;;;;  
-;                                                                                          
-;                                                                                          
-;                                                                                          
-
-
-(define (intermediate)
-  (parameterize ([language (list #rx"Intermediate Student(;|$)")])
-    (check-top-of-repl)
-    
-    (generic-settings #t)
-    (generic-output #t #f #f #f)
-    (teaching-language-fraction-output)
-    
-    (test-hash-bang)
-    (test-error-after-definition)
-    
-    (prepare-for-test-expression)
-    
-    (test-expression "'|.|" 
-                     "'|.|"
-                     "'|.|")
-    (test-expression '("(equal? (list " image ") (list " image "))") 
-                     "#true"
-                     "#true")
-    
-    (test-expression "(define x 1)(define x 2)"
-                     "x: this name was defined previously and cannot be re-defined"
-                     "x: this name was defined previously and cannot be re-defined")
-    
-    (test-expression "(define-struct spider (legs))(make-spider 4)"
-                     "(make-spider 4)"
-                     "spider: this name was defined previously and cannot be re-defined")
-    
-    (test-expression "(sqrt -1)" 
-                     "0+1i"
-                     "0+1i")
-    
-    (test-undefined-var "class")
-    (test-undefined-var "shared")
-    
-    (test-expression "(define (. x y) (* x y))"  "read: illegal use of `.'")
-    (test-expression "'(1 . 2)"  "read: illegal use of `.'")
-    
-    (test-undefined-var "call/cc")
-    
-    (test-expression "(error 'a \"~a\" 1)" "a: ~a1")
-    (test-expression "(error \"a\" \"a\")" "aa")
-    
-    (test-expression "(time 1)" 
-                     #rx"cpu time: [0-9]+ real time: [0-9]+ gc time: [0-9]+\n1")
-    
-    (test-expression "true" 
-                     "#true"
-                     "#true")
-    (test-undefined-var "mred^")
-    (test-expression "(eq? 'a 'A)" 
-                     "#false"
-                     "#false")
-    (test-undefined-fn "(set! x 1)" "set!")
-    (test-undefined-fn "(define qqq 2) (set! qqq 1)" "set!")
-    (test-expression "(cond [(= 1 2) 3])" "cond: all question results were false")
-    (test-expression "(cons 1 2)"   "cons: second argument must be a list, but received 1 and 2")
-    (test-expression "(+ (list 1) 2)" "+: expects a number as 1st argument, given (list 1)")
-    (test-expression "'(1)" 
-                     "(list 1)"
-                     "(list 1)")
-    (test-expression "(define shrd (list 1)) (list shrd shrd)"
-                     "(list (list 1) (list 1))"
-                     "shrd: this name was defined previously and cannot be re-defined")
-    (test-expression "(local ((define x x)) 1)" "local variable used before its definition: x")
-    (test-expression "(letrec ([x x]) 1)" "local variable used before its definition: x")
-    (test-expression "(if 1 1 1)" "if: question result is not true or false: 1")
-    (test-expression "(+ 1)" "1")
-    
-    (test-expression "1.0" "1" "1")
-    (test-expression "#i1.0" "#i1.0" "#i1.0")
-    (test-expression "4/3" 
-                     "{number 4/3 \"1.3\" decimal}"
-                     "{number 4/3 \"1.3\" decimal}")
-    (test-expression "1/3" 
-                     "{number 1/3 \"0.3\" decimal}"
-                     "{number 1/3 \"0.3\" decimal}")
-    (test-expression "-4/3" 
-                     "{number -4/3 \"-1.3\" decimal}"
-                     "{number -4/3 \"-1.3\" decimal}")
-    (test-expression "-1/3" 
-                     "{number -1/3 \"-0.3\" decimal}"
-                     "{number -1/3 \"-0.3\" decimal}")
-    (test-expression "3/2" 
-                     "{number 3/2 \"1.5\" decimal}"
-                     "{number 3/2 \"1.5\" decimal}")
-    (test-expression "1/2" 
-                     "{number 1/2 \"0.5\" decimal}"
-                     "{number 1/2 \"0.5\" decimal}")
-    (test-expression "-1/2" 
-                     "{number -1/2 \"-0.5\" decimal}"
-                     "{number -1/2 \"-0.5\" decimal}")
-    (test-expression "-3/2" 
-                     "{number -3/2 \"-1.5\" decimal}"
-                     "{number -3/2 \"-1.5\" decimal}")
-    (test-expression "+1/3i" 
-                     "0+1/3i"
-                     "0+1/3i")
-    (test-expression "+1/2i" 
-                     "0+0.5i"
-                     "0+0.5i")
-    (test-expression "779625/32258" 
-                     "{number 779625/32258 \"24.1684233368466736933473866...\" decimal}"
-                     "{number 779625/32258 \"24.1684233368466736933473866...\" decimal}")
-    (test-expression "(exact? 1.5)" "#true")
-    (test-undefined-fn "(print (floor (sqrt 2)))" "print")
-    
-    (test-expression "(let ([f (lambda (x) x)]) f)" 
-                     "function:f"
-                     "function:f")
-    (test-expression ",1"
-                     "unquote: misuse of a comma or unquote, not under a quasiquoting backquote")
-    
-    (test-expression "(list 1)" 
-                     "(list 1)"
-                     "(list 1)")
-    (test-expression "(car (list))" "car: expects a pair, given '()")
-    (test-undefined-var "argv")
-    
-    (test-undefined-fn "(define-syntax app syntax-case)" "define-syntax")
-    
-    (test-expression "#lang racket"
-                     "read: #lang not enabled in the current context"
-                     "read: #lang not enabled in the current context")
-    (test-expression
-     (string-append "(define (f)\n"
-                    "(+ (raise-user-error 'a \"b\")))\n"
-                    "(if (zero? (random 1)) (void) (set! f void))\n"
-                    "(f)")
-     "define: expected at least one variable after the function name, but found none"
-     #rx"define: expected at least one variable after the function name, but found none")
-    
-    (test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
-                     "{image}"
-                     "{image}")))
-
-
-
-;                                                                                    
-;                                                                                    
-;                                                                                    
-;    ;;               ;   ;;;;;;                        ;;;;           ;;;;          
-;    ;;              ;;   ;;;;;;                        ;;;;           ;;;;          
-;       ;;;; ;;;   ;;;;;  ;;;;;; ;;;;;;;  ;;;;;;; ;;;;  ;;;;;;;     ;;;;;;; ;;;;;;;  
-;  ;;;; ;;;;;;;;; ;;;;;;  ;;;;;; ;;;;;;;; ;;;;;;;;;;;;; ;;;;;;;;   ;;;;;;;; ;;;;;;;; 
-;  ;;;; ;;;; ;;;;  ;;;;   ;;;;;;     ;;;; ;;;; ;;; ;;;; ;;;;;;;;; ;;;;;;;;;     ;;;; 
-;  ;;;; ;;;; ;;;;  ;;;;  ;; ;;;;  ;;;;;;; ;;;; ;;; ;;;; ;;;; ;;;; ;;;; ;;;;  ;;;;;;; 
-;  ;;;; ;;;; ;;;;  ;;;;; ;; ;;;; ;;  ;;;; ;;;; ;;; ;;;; ;;;;;;;;; ;;;;;;;;; ;;  ;;;; 
-;  ;;;; ;;;; ;;;;  ;;;;; ;; ;;;; ;;;;;;;; ;;;; ;;; ;;;; ;;;;;;;;   ;;;;;;;; ;;;;;;;; 
-;  ;;;; ;;;; ;;;;   ;;;; ;; ;;;;  ;; ;;;; ;;;; ;;; ;;;; ;;;;;;;     ;;;;;;;  ;; ;;;; 
-;                        ;;                                                          
-;                                                                                    
-;                                                                                    
-
-
-(define (intermediate/lambda)
-  (parameterize ([language (list #rx"Intermediate Student with lambda(;|$)")])
-    (check-top-of-repl)
-    
-    (generic-settings #t)
-    (generic-output #t #f #f #f)
-    (teaching-language-fraction-output)
-    
-    (test-hash-bang)
-    (test-error-after-definition)
-    
-    (prepare-for-test-expression)
-    
-    (test-expression "'|.|"
-                     "'|.|"
-                     "'|.|")
-    (test-expression '("(equal? (list " image ") (list " image "))") 
-                     "#true"
-                     "#true")
-    (test-expression "(define x 1)(define x 2)"
-                     "x: this name was defined previously and cannot be re-defined"
-                     "x: this name was defined previously and cannot be re-defined")
-    
-    (test-expression "(define-struct spider (legs))(make-spider 4)"
-                     "(make-spider 4)"
-                     "spider: this name was defined previously and cannot be re-defined")
-    
-    (test-expression "(sqrt -1)" 
-                     "0+1i"
-                     "0+1i")
-    
-    (test-undefined-var "class")
-    (test-undefined-var "shared")
-    
-    (test-expression "(define (. x y) (* x y))" "read: illegal use of `.'")
-    (test-expression "'(1 . 2)" "read: illegal use of `.'")
-    
-    (test-undefined-var "call/cc")
-    
-    (test-expression "(error 'a \"~a\" 1)" "a: ~a1")
-    (test-expression "(error \"a\" \"a\")" "aa")
-    
-    (test-expression "(time 1)" 
-                     #rx"cpu time: [0-9]+ real time: [0-9]+ gc time: [0-9]+\n1")
-    
-    (test-expression "true" 
-                     "#true"
-                     "#true")
-    (test-undefined-var "mred^")
-    (test-expression "(eq? 'a 'A)" 
-                     "#false"
-                     "#false")
-    (test-undefined-fn "(set! x 1)" "set!")
-    (test-undefined-fn "(define qqq 2) (set! qqq 1)" "set!")
-    (test-expression "(cond [(= 1 2) 3])" "cond: all question results were false")
-    (test-expression "(cons 1 2)" "cons: second argument must be a list, but received 1 and 2")
-    (test-expression "(+ (list 1) 2)" "+: expects a number as 1st argument, given (list 1)")
-    (test-expression "'(1)" 
-                     "(list 1)"
-                     "(list 1)")
-    (test-expression "(define shrd (list 1)) (list shrd shrd)"
-                     "(list (list 1) (list 1))"
-                     "shrd: this name was defined previously and cannot be re-defined")
-    (test-expression "(local ((define x x)) 1)" "local variable used before its definition: x")
-    (test-expression "(letrec ([x x]) 1)" "local variable used before its definition: x")
-    (test-expression "(if 1 1 1)" "if: question result is not true or false: 1")
-    (test-expression "(+ 1)" "1")
-    
-    (test-expression "1.0" "1" "1")
-    (test-expression "#i1.0" "#i1.0" "#i1.0")
-    (test-expression "4/3" 
-                     "{number 4/3 \"1.3\" decimal}"
-                     "{number 4/3 \"1.3\" decimal}")
-    (test-expression "1/3" 
-                     "{number 1/3 \"0.3\" decimal}"
-                     "{number 1/3 \"0.3\" decimal}")
-    (test-expression "-4/3" 
-                     "{number -4/3 \"-1.3\" decimal}"
-                     "{number -4/3 \"-1.3\" decimal}")
-    (test-expression "-1/3" 
-                     "{number -1/3 \"-0.3\" decimal}"
-                     "{number -1/3 \"-0.3\" decimal}")
-    (test-expression "3/2" 
-                     "{number 3/2 \"1.5\" decimal}"
-                     "{number 3/2 \"1.5\" decimal}")
-    (test-expression "1/2" 
-                     "{number 1/2 \"0.5\" decimal}"
-                     "{number 1/2 \"0.5\" decimal}")
-    (test-expression "-1/2" 
-                     "{number -1/2 \"-0.5\" decimal}"
-                     "{number -1/2 \"-0.5\" decimal}")
-    (test-expression "-3/2" 
-                     "{number -3/2 \"-1.5\" decimal}"
-                     "{number -3/2 \"-1.5\" decimal}")
-    (test-expression "+1/3i" "0+1/3i" "0+1/3i")
-    (test-expression "+1/2i" "0+0.5i" "0+0.5i")
-    (test-expression "779625/32258" 
-                     "{number 779625/32258 \"24.1684233368466736933473866...\" decimal}"
-                     "{number 779625/32258 \"24.1684233368466736933473866...\" decimal}")
-    (test-expression "(exact? 1.5)" "#true")
-    (test-undefined-fn "(print (floor (sqrt 2)))" "print")
-    
-    (test-expression "(let ([f (lambda (x) x)]) f)" 
-                     "(lambda (a1) ...)"
-                     "(lambda (a1) ...)")
-    (test-expression ",1"
-                       "unquote: misuse of a comma or unquote, not under a quasiquoting backquote")
-    
-    (test-expression "(list 1)" 
-                     "(list 1)"
-                     "(list 1)")
-    (test-expression "(car (list))" "car: expects a pair, given '()")
-    (test-undefined-var "argv")
-    
-    (test-undefined-fn "(define-syntax app syntax-case)" "define-syntax")
-    
-    (test-expression "#lang racket"
-                     "read: #lang not enabled in the current context"
-                     "read: #lang not enabled in the current context")
-    (test-expression
-     (string-append "(define (f)\n"
-                    "(+ (raise-user-error 'a \"b\")))\n"
-                    "(if (zero? (random 1)) (void) (set! f void))\n"
-                    "(f)")
-     "define: expected at least one variable after the function name, but found none"
-     #rx"define: expected at least one variable after the function name, but found none")
-    
-    (test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
-                     "{image}"
-                     "{image}")))
-
-
-
-;                                                                           
-;                                                                           
-;                                                                           
-;                ;;;;                                                  ;;;; 
-;                ;;;;                                                  ;;;; 
-;  ;;;;;;;    ;;;;;;; ;;;  ;;; ;;;;;;;  ;;;; ;;;    ;;;;;   ;;;     ;;;;;;; 
-;  ;;;;;;;;  ;;;;;;;; ;;;  ;;; ;;;;;;;; ;;;;;;;;;  ;;;;;;  ;;;;;   ;;;;;;;; 
-;      ;;;; ;;;;;;;;;  ;;;;;;      ;;;; ;;;; ;;;; ;;;;;;; ;;;; ;; ;;;;;;;;; 
-;   ;;;;;;; ;;;; ;;;;  ;;;;;;   ;;;;;;; ;;;; ;;;; ;;;;    ;;;;;;; ;;;; ;;;; 
-;  ;;  ;;;; ;;;;;;;;;  ;;;;;;  ;;  ;;;; ;;;; ;;;; ;;;;;;; ;;;;;   ;;;;;;;;; 
-;  ;;;;;;;;  ;;;;;;;;   ;;;;   ;;;;;;;; ;;;; ;;;;  ;;;;;;  ;;;;;;  ;;;;;;;; 
-;   ;; ;;;;   ;;;;;;;   ;;;;    ;; ;;;; ;;;; ;;;;   ;;;;;   ;;;;    ;;;;;;; 
-;                                                                           
-;                                                                           
-;                                                                           
-
-
-(define (advanced)
-  (parameterize ([language (list #rx"Advanced Student(;|$)")])
-    (check-top-of-repl)
-    
-    (generic-settings #t)
-    (generic-output #t #t #t #f)
-    (teaching-language-fraction-output)
-    
-    (test-hash-bang)
-    (test-error-after-definition)
-    
-    (prepare-for-test-expression)
-    
-    (test-expression "'|.|" 
-                     "'|.|"
-                     "'|.|")
-    (test-expression '("(equal? (list " image ") (list " image "))") 
-                     "#true"
-                     "#true")
-    (test-expression "(define x 1)(define x 2)"
-                     "x: this name was defined previously and cannot be re-defined"
-                     "x: this name was defined previously and cannot be re-defined")
-    
-    (test-expression "(define-struct spider (legs))(make-spider 4)"
-                     "(make-spider 4)"
-                     "spider: this name was defined previously and cannot be re-defined")
-    
-    (test-expression "(sqrt -1)" 
-                     "0+1i"
-                     "0+1i")
-    
-    (test-undefined-var "class")
-    
-    (test-expression "shared" "shared: expected an open parenthesis before shared, but found none")
-    
-    (test-expression "(define (. x y) (* x y))"  "read: illegal use of `.'")
-    (test-expression "'(1 . 2)"  "read: illegal use of `.'")
-    
-    (test-undefined-var "call/cc")
-    
-    (test-expression "(error 'a \"~a\" 1)" "a: ~a1")
-    (test-expression "(error \"a\" \"a\")" "aa")
-    
-    (test-expression "(time 1)" 
-                     #rx"cpu time: [0-9]+ real time: [0-9]+ gc time: [0-9]+\n1")
-    
-    (test-expression "true" 
-                     "#true"
-                     "#true")
-    (test-undefined-var "mred^")
-    (test-expression "(eq? 'a 'A)" 
-                     "#false"
-                     "#false")
-    (test-expression "(set! x 1)"
-                     "x: this variable is not defined"
-                     "set!: cannot set variable before its definition: x")
-    (test-expression "(define qqq 2) (set! qqq 1)" 
-                     "(void)" 
-                     "qqq: this name was defined previously and cannot be re-defined")
-    (test-expression "(cond [(= 1 2) 3])" "cond: all question results were false")
-    (test-expression "(cons 1 2)"  "cons: second argument must be a list, but received 1 and 2")
-    (test-expression "(+ (list 1) 2)" "+: expects a number as 1st argument, given (list 1)")
-    (test-expression "'(1)" 
-                     "(list 1)"
-                     "(list 1)")
-    (test-expression "(define shrd (list 1)) (list shrd shrd)"
-                     "(shared ((-1- (list 1))) (list -1- -1-))"
-                     "shrd: this name was defined previously and cannot be re-defined")
-    (test-expression "(local ((define x x)) 1)" "local variable used before its definition: x")
-    (test-expression "(letrec ([x x]) 1)" "local variable used before its definition: x")
-    (test-expression "(if 1 1 1)" "if: question result is not true or false: 1")
-    (test-expression "(+ 1)" "1")
-    
-    (test-expression "1.0" "1" "1")
-    (test-expression "#i1.0" "#i1.0" "#i1.0")
-    (test-expression "4/3" 
-                     "{number 4/3 \"1.3\" decimal}"
-                     "{number 4/3 \"1.3\" decimal}")
-    (test-expression "1/3" 
-                     "{number 1/3 \"0.3\" decimal}"
-                     "{number 1/3 \"0.3\" decimal}")
-    (test-expression "-4/3" 
-                     "{number -4/3 \"-1.3\" decimal}"
-                     "{number -4/3 \"-1.3\" decimal}")
-    (test-expression "-1/3" 
-                     "{number -1/3 \"-0.3\" decimal}"
-                     "{number -1/3 \"-0.3\" decimal}")
-    (test-expression "3/2" 
-                     "{number 3/2 \"1.5\" decimal}"
-                     "{number 3/2 \"1.5\" decimal}")
-    (test-expression "1/2" 
-                     "{number 1/2 \"0.5\" decimal}"
-                     "{number 1/2 \"0.5\" decimal}")
-    (test-expression "-1/2" 
-                     "{number -1/2 \"-0.5\" decimal}"
-                     "{number -1/2 \"-0.5\" decimal}")
-    (test-expression "-3/2" 
-                     "{number -3/2 \"-1.5\" decimal}"
-                     "{number -3/2 \"-1.5\" decimal}")
-    (test-expression "+1/3i" 
-                     "0+1/3i"
-                     "0+1/3i")
-    (test-expression "+1/2i" 
-                     "0+0.5i"
-                     "0+0.5i")
-    (test-expression "779625/32258" 
-                     "{number 779625/32258 \"24.1684233368466736933473866...\" decimal}"
-                     "{number 779625/32258 \"24.1684233368466736933473866...\" decimal}")
-    (test-expression "(exact? 1.5)" "#true")
-    (test-expression "(print (floor (sqrt 2)))" "#i1.0")
-    
-    (test-expression "(let ([f (lambda (x) x)]) f)" 
-                     "(lambda (a1) ...)"
-                     "(lambda (a1) ...)")
-    (test-expression ",1"
-                     "unquote: misuse of a comma or unquote, not under a quasiquoting backquote")
-    
-    (test-expression "(list 1)" 
-                     "(list 1)"
-                     "(list 1)")
-    (test-expression "(car (list))" "car: expects a pair, given '()")
-    (test-undefined-var "argv")
-    
-    (test-undefined-fn "(define-syntax app syntax-case)" "define-syntax")
-    
-    (test-expression "#lang racket"
-                     "read: #lang not enabled in the current context"
-                     "read: #lang not enabled in the current context")
-    (test-expression (string-append "(define (f)\n"
-                                    "(+ (raise-user-error 'a \"b\")))\n"
-                                    "(if (zero? (random 1)) (void) (set! f void))\n"
-                                    "(f)")
-                     #rx"raise-user-error"
-                     #rx"raise-user-error")
-    
-    (test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
-                     "{image}"
-                     "{image}")))
-
-
-(define (prepare-for-test-expression)
-  (let ([drs (wait-for-drracket-frame)])
-    (clear-definitions drs)
-    (set-language #t)
-    (sleep 1) ;; this shouldn't be neccessary....
-    (do-execute drs)))
-
-;; test-setting : (-> void) string string string -> void
-;; opens the language dialog, runs `set-setting'
-;; closes the language dialog, executes,
-;; makes sure that `expression' produces
-;; `result'. `set-setting' is expected to click around
-;; in the language dialog.
-;; `setting-name' is used in the error message when the test fails.
-(define (test-setting set-setting setting-name expression result
-                      #:interactions [interactions-expr #f])
-  (set-language #f)
-  (set-setting)
-  (let ([f (test:get-active-top-level-window)])
-    (fw:test:button-push "OK")
-    (wait-for-new-frame f))
-  (let* ([drs (test:get-active-top-level-window)]
-         [interactions (send drs get-interactions-text)])
-    (clear-definitions drs)
-    (insert-in-definitions drs expression)
-    (do-execute drs)
-    (when interactions-expr
-      (insert-in-interactions drs interactions-expr)
-      (alt-return-in-interactions drs)
-      (wait-for-computation drs))
-    (let* ([got (fetch-output/should-be-tested drs)])
-      (unless (if (regexp? result)
-                  (regexp-match? result got)
-                  (string=? result got))
-        (eprintf "FAILED: ~s ~s ~s test\n expected: ~s\n      got: ~s\n"
-                 (language) setting-name expression result got)))))
-
-(define (test-hash-bang)
-  (let* ([expression "#!/bin/sh\n1"]
-         [result "1"]
-         [drs (test:get-active-top-level-window)]
-         [interactions (queue-callback (λ () (send drs get-interactions-text)))])
-    (clear-definitions drs)
-    (type-in-definitions drs expression)
-    (do-execute drs)
-    (let* ([got (fetch-output/should-be-tested drs)])
-      (unless (string=? "1" got)
-        (eprintf "FAILED: ~s ~a test\n expected: ~s\n     got: ~s\n"
-                 (language) expression result got)))))
-
-(define (fetch-output/should-be-tested . args)
-  (regexp-replace (regexp
-                   (string-append
-                    (regexp-quote "")
-                    "$"))
-                  (apply fetch-output args)
-                  ""))
-
-(define (check-top-of-repl)
-  (let ([drs (wait-for-drracket-frame)])
-    (set-language #t)
-    (with-handlers ([exn:fail? void])
-      (fw:test:menu-select "Testing" "Disable tests"))
-    (do-execute drs)
-    (let* ([interactions (send drs get-interactions-text)]
-           [short-lang (last (language))]
-           [get-line (lambda (n) 
-                       (queue-callback/res
-                        (λ ()
-                          (send interactions get-text 
-                                (send interactions paragraph-start-position n)
-                                (send interactions paragraph-end-position n)))))]
-           [line0-expect (format "Welcome to DrRacket, version ~a [~a]." 
-                                 (version:version)
-                                 (system-type 'gc))]
-           [line1-expect 
-            (if (string? short-lang)
-                (format "Language: ~a" short-lang)
-                short-lang)]
-           [line0-got (get-line 0)]
-           [line1-got (get-line 1)])
-      (unless (and (string=? line0-expect line0-got)
-                   (if (string? short-lang)
-                       (string=? line1-expect (substring line1-got
-                                                         0
-                                                         (min (string-length line1-expect)
-                                                              (string-length line1-got))))
-                       (regexp-match line1-expect line1-got)))
-        (eprintf "expected lines: \n  ~a\n  ~a\ngot lines:\n  ~a\n  ~a\n" 
-                 line0-expect line1-expect
-                 line0-got line1-got)
-        (eprintf "defs: ~s"
-                 (queue-callback/res (λ () (send (send drs get-definitions-text) get-text))))
-        (error 'language-test.rkt "failed get top of repl test")))))
-
-
-;; teaching-language-fraction-output
-;; tests that the teaching languages properly handle repeating decimals
-(define (teaching-language-fraction-output)
-  (test-setting
-   (lambda () (fw:test:set-radio-box! "Fraction Style" "Mixed fractions"))
-   "Fraction Style -- Mixed fractions"
-   "4/3"
-   "{number 4/3 \"1 1/3\" mixed}")
-  (test-setting
-   (lambda () (fw:test:set-radio-box! "Fraction Style" "Repeating decimals"))
-   "Fraction Style -- Repeating decimals"
-   "4/3"
-   "{number 4/3 \"1.3\" decimal}"))
-
-;; plt-language-fraction-output : -> void
-;; tests that the PLT languages properly handle repeating decimals
-(define (plt-language-fraction-output)
-  (test-setting
-   (lambda () (fw:test:set-check-box! "Use decimal notation for rationals" #f))
-   "Use decimal notation for rationals -- #f"
-   "4/3 1/2 -1/3"
-   "{number 4/3 \"1 1/3\" mixed}\n{number 1/2 \"1/2\" mixed}\n{number -1/3 \"- 1/3\" mixed}")
-  (test-setting
-   (lambda () (fw:test:set-check-box! "Use decimal notation for rationals" #t))
-   "Use decimal notation for rationals -- #t"
-   "4/3 1/2 -1/3"
-   (string-append
-    "{number 4/3 \"#e1.3\" decimal}\n"
-    "{number 1/2 \"#e0.5\" decimal}\n"
-    "{number -1/3 \"#e-0.3\" decimal}")))
-
-(define (generic-settings false/true?)
-  (test-setting
-   (lambda () (fw:test:set-check-box! "Case sensitive" #t))
-   "Case sensitive -- #t"
-   "(eq? 'g 'G)" 
-   (if false/true? "#false" "#f"))
-  (test-setting
-   (lambda () (fw:test:set-check-box! "Case sensitive" #f))
-   "Case sensitive -- #f"
-   "(eq? 'g 'G)" 
-   (if false/true? "#true" "#t")))
-
-(define (generic-output list? quasi-quote? has-sharing? has-print-printing?)
-  (define plain-print-style (if has-print-printing? "print" "write"))
-  (define drs (wait-for-drracket-frame))
-  (define expression "(define x (list 2))\n(list x x)")
-  (define (set-output-choice option show-sharing pretty?)
-    (set-language #f)
-    (fw:test:set-radio-box! "Output Style" option)
-    (when (and has-sharing? show-sharing)
-      (fw:test:set-check-box!
-       "Show sharing in values"
-       (if (eq? show-sharing 'on) #t #f)))
-    (fw:test:set-check-box!
-     "Insert newlines in printed values"
-     pretty?)
-    (let ([f (test:get-active-top-level-window)])
-      (fw:test:button-push "OK")
-      (wait-for-new-frame f)))
-  (define (shorten str)
-    (if ((string-length str) . <= . 45)
-        str
-        (string-append (substring str 0 45) "...")))
-  (define (test option show-sharing pretty? answer)
-    ;; answer must either be a string, or a procedure that accepts both zero and 1
-    ;; argument. When the procedure accepts 1 arg, the argument is `got' and
-    ;; the result must be a boolean indicating if the result was satisfactory.
-    ;; if the procedure receives no arguments, it must return a descriptive string
-    ;; for the error message
-    (set-output-choice option show-sharing pretty?)
-    (do-execute drs)
-    (define got (fetch-output/should-be-tested drs))
-    (unless (if (procedure? answer)
-                (answer got)
-                (whitespace-string=? answer got))
-      (eprintf "FAILED ~s ~a, sharing ~a \"Insert newlines in printed values\" ~a\n"
-               (language) option show-sharing pretty?)
-      (eprintf "     got ~s\n" (shorten got))
-      (eprintf "expected ~s\n" (if (procedure? answer) (answer) answer))))
-  
-  (clear-definitions drs)
-  (type-in-definitions drs expression)
-  
-  (test plain-print-style 'off #t "((2) (2))")
-  (when has-sharing?
-    (test plain-print-style 'on #t "(#0=(2) #0#)"))
-  (when quasi-quote?
-    (test "Quasiquote" 'off #t "`((2) (2))")
-    (when has-sharing?
-      (test "Quasiquote" 'on #t "(shared ((-1- `(2))) `(,-1- ,-1-))")))
-  
-  (test "Constructor" 'off #t
-        (if list?
-            "(list (list 2) (list 2))"
-            "(cons (cons 2 '()) (cons (cons 2 '()) '()))"))
-  (when has-sharing?
-    (test "Constructor" 'on #t
-          (if list?
-              "(shared ((-1- (list 2))) (list -1- -1-))"
-              "(shared ((-1- (cons 2 '()))) (cons -1- (cons -1- '())))")))
-  
-  ;; setup print / pretty-print difference
-  (clear-definitions drs)
-  (insert-in-definitions 
-   drs
-   "(define (f n)\n(cond ((zero? n) (list))\n(else (cons n (f (- n 1))))))\n(f 200)")
-  (test "Constructor" #f #f
-        (case-lambda
-          [(x) (not (member #\newline (string->list x)))]
-          [() "no newlines in result"]))
-  (test "Constructor" #f #t
-        (case-lambda
-          [(x) (member #\newline (string->list x))]
-          [() "newlines in result (may need to make the window smaller)"]))
-  (test plain-print-style #f #f
-        (case-lambda
-          [(x) (not (member #\newline (string->list x)))]
-          [() "no newlines in result"]))
-  (test plain-print-style #f #t
-        (case-lambda
-          [(x) (member #\newline (string->list x))]
-          [() "newlines in result (may need to make the window smaller)"]))
-  
-  (when has-print-printing?
-    (clear-definitions drs)
-    (insert-in-definitions drs "(print 'hello (current-output-port) 1)")
-    (test plain-print-style #f #t "hello")
-    (test plain-print-style #f #f "hello")))
-
-(define re:out-of-sync
-  (regexp
-   "WARNING: Interactions window is out of sync with the definitions window\\."))
-
-(define (test-error-after-definition)
-  (let* ([drs (wait-for-drracket-frame)]
-         [interactions-text (queue-callback/res (λ () (send drs get-interactions-text)))])
-    (clear-definitions drs)
-    (type-in-definitions drs "(define y 0) (define (f x) (/ x y)) (f 2)")
-    (do-execute drs)
-    (let ([last-para (queue-callback/res (λ () (send interactions-text last-paragraph)))])
-      (type-in-interactions drs "y\n")
-      (wait-for-computation drs)
-      (let ([got
-             (fetch-output/should-be-tested
-              drs
-              (queue-callback/res
-               (λ () (send interactions-text paragraph-start-position (+ last-para 1))))
-              (queue-callback/res
-               (λ ()
-                 (send interactions-text paragraph-end-position
-                       (- (send interactions-text last-paragraph) 1)))))])
-        (unless (equal? got "0")
-          (eprintf "FAILED: test-error-after-definition failed, expected 0, got ~s\n" got))))))
-
-
-;; test-expression : (union string 'xml 'image (listof (union string 'xml 'image)))
-;;                   (union string regexp (string -> boolean)) 
-;;                -> void
-;; types an expression in the definitions window, executes it and tests the output
-;; types an expression in the REPL and tests the output from the REPL.
-(define (test-expression expression defs-expected [repl-expected defs-expected])
-  (let* ([drs (wait-for-drracket-frame)]
-         [interactions-text (queue-callback/res (λ () (send drs get-interactions-text)))]
-         [definitions-text (queue-callback/res (λ () (send drs get-definitions-text)))]
-         [handle-insertion
-          (lambda (item)
-            (cond
-              [(eq? item 'image)
-               (use-get/put-dialog 
-                (lambda () (fw:test:menu-select "Insert" "Insert Image..."))
-                (simplify-path (build-path (collection-file-path "recycle.png" "icons"))))]
-              [(string? item)
-               (insert-in-definitions drs item)]
-              [(eq? item 'xml)
-               (fw:test:menu-select "Insert" "Insert XML Box")
-               (for-each fw:test:keystroke (string->list "<a><b>"))]
-              [else (error 'handle-insertion "unknown thing to insert ~s" item)]))]
-         [check-expectation
-          (lambda (expected got)
-            (cond
-              [(string? expected)
-               (whitespace-string=? expected got)]
-              [(regexp? expected)
-               (regexp-match expected got)]
-              [(procedure? expected)
-               (expected got)]))]
-         [make-err-msg
-          (lambda (expected)
-            (cond
-              [(string? expected)
-               "FAILED: ~s ~s expected ~s to produce:\n  ~s\ngot:\n  ~s\ninstead\n"]
-              [(regexp? expected)
-               "FAILED: ~s ~s expected ~s to match ~s, got ~s instead\n"]
-              [(procedure? expected)
-               "FAILED: ~s ~s expected ~s to pass predicate ~s, got ~s\n"]))])
-    (clear-definitions drs)
-    (insert-in-definitions drs (defs-prefix))
-    (cond
-      [(pair? expression) (for-each handle-insertion expression)]
-      [else (handle-insertion expression)])
-    (do-execute drs)
-    
-    (let ([got
-           (fetch-output
-            drs
-            (queue-callback/res (λ () (send interactions-text paragraph-start-position 2)))
-            (queue-callback/res
-             (λ ()
-               (send interactions-text paragraph-end-position
-                     (- (send interactions-text last-paragraph) 1)))))])
-      (when (regexp-match re:out-of-sync got)
-        (error 'text-expression "got out of sync message"))
-      (unless (check-expectation defs-expected got)
-        (eprintf (make-err-msg defs-expected)
-                 'definitions (language) expression defs-expected got)))
-    
-    (let ([dp (defs-prefix)])
-      (queue-callback/res
-       (λ ()
-         ;; select all except the defs-prefix
-         (send definitions-text set-position
-               (string-length dp)
-               (send definitions-text last-position))
-         
-         (send definitions-text copy)
-         (send interactions-text set-position
-               (send interactions-text last-position)
-               (send interactions-text last-position))
-         (send interactions-text paste))))
-    
-    (let ([last-para (queue-callback/res (λ () (send interactions-text last-paragraph)))])
-      (alt-return-in-interactions drs)
-      (wait-for-computation drs)
-      (let ([got
-             (fetch-output
-              drs
-              (queue-callback/res
-               (λ ()
-                 (send interactions-text paragraph-start-position (+ last-para 1))))
-              (queue-callback/res
-               (λ ()
-                 (send interactions-text paragraph-end-position
-                       (- (send interactions-text last-paragraph) 1)))))])
-        (when (regexp-match re:out-of-sync got)
-          (error 'text-expression "got out of sync message"))
-        (unless (check-expectation repl-expected got)
-          (eprintf (make-err-msg repl-expected)
-                   'interactions
-                   (language)
-                   expression repl-expected got))))))
-
-(define (test-undefined-var id)
-  (test-expression id (format "~a: this variable is not defined" id)))
-
-(define (test-undefined-fn exp id)
-  (test-expression exp (format "~a: this function is not defined" id)))
-
-(define-syntax (go stx)
-  (syntax-case stx ()
-    [(_ arg)
-     (identifier? (syntax arg))
-     (syntax (begin (flush-output)
-                    (printf ">> starting ~a\n" 'arg)
-                    (flush-output)
-                    (arg)
-                    (flush-output)
-                    (printf ">> finished ~a\n" 'arg)
-                    (flush-output)))]))
-
-(define (run-test)
-  (go module-lang)
-  (go pretty-big)
-  (go r5rs)
-  (go beginner)
-  (go beginner/abbrev)
-  (go intermediate)
-  (go intermediate/lambda)
-  (go advanced)
-  )
-
-(fire-up-drracket-and-run-tests run-test)
-
-(module+ test
-  (module config info
-    (define timeout 1500)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/memory-log.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/memory-log.rkt
deleted file mode 100644
index fcd6763f58..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/memory-log.rkt
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang racket/base
-(require "private/drracket-test-util.rkt"
-         racket/gui/base
-         racket/class
-         framework/test
-         framework/preferences
-         drracket/private/syncheck/local-member-names) ;; for the syncheck:arrows-visible? method
-
-(printf "The printouts below are designed to trick drdr into graphing them;\n")
-(printf "they aren't times, but memory usage. The first is starting up DrRacket,\n")
-(printf "the second is after the documentation index has been loaded (via check\n")
-(printf "syntax) and the third is after online check syntax has completed once (so\n")
-(printf "a place was created and the docs loaded there.\n")
-
-;; mem-cnt returns the amount of memory used, iterating (collect-garbage)
-;; until the delta is less than 10k or we've done it 20 times.
-(define (mem-cnt)
-  (let loop ([cmu (current-memory-use)]
-             [n 20])
-    (collect-garbage)
-    (let ([new-cmu (current-memory-use)])
-      (cond
-        [(or (< n 0)
-             (< (abs (- cmu new-cmu)) 
-                (* 10 1024)))
-         new-cmu]
-        [else
-         (loop new-cmu (- n 1))]))))
-    
-(void (putenv "PLTDRPLACEPRINT" "yes"))
-
-(define (wait-and-print)
-  (let ([s (make-semaphore 0)])
-    ;; let two rounds of pending events be handled. 
-    (queue-callback (λ () (queue-callback  (λ () (semaphore-post s)) #f)) #f)
-    (yield s)
-    
-    ;; print out memory use in a fake form to be tracked by drdr
-    (let ([n (mem-cnt)])
-      (printf "cpu time: ~a real time: ~a gc time: ~a\n"
-              n n n))))
-
-(fire-up-drracket-and-run-tests 
- (λ ()
-   (let ([drs-frame (wait-for-drracket-frame)])
-     
-     ;; initial startup memory use
-     (wait-and-print)
-     
-     ;; figure out the memory use after running check syntax once (and so the docs 
-     ;; have been loaded)
-     (queue-callback
-      (λ () (send (send drs-frame get-definitions-text) insert "#lang racket/base\n+")))
-     (set-module-language!)
-     (test:run-one (lambda () (send (send drs-frame syncheck:get-button) command)))
-     (wait-for-computation drs-frame)
-     (wait-and-print)
-     
-     ;; figure out the memory use after letting online check syntax run once
-     ;; (so a place has been created and the docs loaded again (in the other place
-     ;; this time))
-     
-     ; clear out the check synax results from before
-     (queue-callback/res (λ () (send (send drs-frame get-definitions-text) insert "\n")))
-     (poll-until
-      (λ ()
-        (not (send (send drs-frame get-definitions-text) syncheck:arrows-visible?))))
-     
-     ; enable online check syntax and wait for the results to appear
-     (queue-callback/res (λ () (preferences:set 'drracket:online-compilation-default-on #t)))
-     (poll-until
-      (λ ()
-        (send (send drs-frame get-definitions-text) syncheck:arrows-visible?)))
-     (wait-and-print))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-browser-test1.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-browser-test1.rkt
deleted file mode 100644
index 7bc35af1c4..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-browser-test1.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang racket/base
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-browser-test2.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-browser-test2.rkt
deleted file mode 100644
index ae38d8f1f8..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-browser-test2.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(module sub racket/base (require racket/list))
-(require (submod "." sub))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-browser.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-browser.rkt
deleted file mode 100644
index f5a8c10623..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-browser.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-(require racket/unit
-         racket/async-channel
-         drracket/private/module-browser
-         drracket/private/standalone-module-browser
-         rackunit)
-
-(define (fetch-files stx/fn)
-  (define progress-channel (make-async-channel))
-  (define connection-channel (make-async-channel))
-  (define-values/invoke-unit process-program-unit 
-    (import process-program-import^)
-    (export process-program-export^))
-  
-  (thread
-   (λ () 
-     (add-connections stx/fn)
-     (async-channel-put connection-channel #f)))
-  
-  (let loop ()
-    (define next (sync connection-channel))
-    (cond
-      [next (cons next (loop))]
-      [else '()])))
-
-
-(define r/b
-  (fetch-files 
-   (collection-file-path "module-browser-test1.rkt" "tests" "drracket")))
-(check-not-false (member (collection-file-path "base.rkt" "racket")
-                         (map car r/b)))
-(check-false (member (collection-file-path "list.rkt" "racket")
-                     (map car r/b)))
-
-(define r/b+submod
-  (fetch-files
-   (collection-file-path "module-browser-test2.rkt" "tests" "drracket")))
-(check-not-false (member (collection-file-path "base.rkt" "racket")
-                         (map car r/b+submod)))
-(check-not-false (member (collection-file-path "list.rkt" "racket")
-                         (map car r/b+submod)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-lang-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-lang-test.rkt
deleted file mode 100644
index 5d887318df..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-lang-test.rkt
+++ /dev/null
@@ -1,431 +0,0 @@
-#lang at-exp racket/base
-(require "private/module-lang-test-utils.rkt"
-         "private/drracket-test-util.rkt")
-(provide run-test)
-
-;; set up for tests that need external files
-(write-test-modules
- (module module-lang-test-tmp1 mzscheme
-   (provide (all-from-except mzscheme +)
-            x)
-   (define x 1))
- (module module-lang-test-tmp2 mzscheme
-   (provide e)
-   (define e #'1))
- (module module-lang-test-tmp3 mzscheme
-   (define-syntax (bug-datum stx)
-     (syntax-case stx ()
-       [(dat . thing)
-        (number? (syntax-e (syntax thing)))
-        (syntax/loc stx (#%datum . thing))]))
-   (provide #%module-begin [rename bug-datum #%datum]))
- (module module-lang-test-tmp4 racket/base
-   (/ 888 2)
-   (provide (except-out (all-from-out racket/base) #%top-interaction)))
- (module module-lang-test-syn-error racket/base
-   (lambda)))
-
-(test @t{}
-      #f
-      @rx{Module Language: There must be a valid module
-          Try starting your program with
-          Interactions disabled}
-      #t)
-(test @t{1}
-      #f
-      @rx{Module Language: only a module expression is allowed
-          Interactions disabled}
-      #t)
-(test @t{(module m racket) 1}
-      #f
-      @rx{Module Language: there can only be one expression in the definitions
-          Interactions disabled}
-      #t)
-(test @t{.}
-      #f
-      @rx{Module Language: invalid module text
-          read: illegal
-          Interactions disabled}
-      #t)
-(test @t{#lang mzscheme
-         (define x 1)}
-      @t{x}
-      "1")
-(test @t{#lang m-z-scheme
-         (define x 1)}
-      #f
-      @rx{Module Language: invalid module text
-          collection not found
-          Interactions disabled}
-      #t)
-(test @t{#lang racket
-         3}
-      #f
-      "3")
-(test @t{(module m racket (provide x) (define x 1))}
-      @t{x}
-      "1")
-(test @t{(module m racket (define x 1))}
-      @t{x}
-      "1")
-(test @t{(module m racket (define x 1) (define y 1) (provide y))}
-      @t{x}
-      "1")
-(test @t{(module m racket (define x 1) (define y 2) (provide y))}
-      @t{y}
-      "2")
-(test @t{(module m mzscheme (require mzlib/list))}
-      @t{foldl}
-      #rx"foldl")
-(test @t{(module m mzscheme (require (rename mzlib/list local-foldl foldl)))}
-      @t{local-foldl}
-      #rx"foldl>")
-(test @t{(module m mzscheme (require (all-except mzlib/list foldl)))}
-      @t{first}
-      #rx"first>")
-(test @t{(module m mzscheme (require (all-except mzlib/list foldl)))}
-      @t{foldl}
-      #rx"[.] [.] foldl:.*cannot reference an identifier before its definition")
-(test @t{(module m mzscheme (require (prefix mz: mzscheme)))}
-      @t{mz:+}
-      #rx"procedure:[+]")
-(test @t{(module n mzscheme (provide (all-from-except mzscheme +)))}
-      @t{+}
-      #rx"procedure:[+]")
-(test @t{(module m mzscheme
-           (require (prefix x: mzlib/list) mzlib/list))}
-      @t{foldl}
-      #rx"foldl>")
-(test @t{(module m mzscheme
-           (require (prefix x: mzlib/list) mzlib/list))}
-      @t{x:foldl}
-      #rx"foldl>")
-(test @t{(module m (file @in-here{module-lang-test-tmp1.rkt}) x)}
-      @t{x}
-      "1")
-;; + shouldn't be bound in the REPL because it isn't bound in the module.
-(test @t{(module m (file @in-here{module-lang-test-tmp1.rkt}) x)}
-      @t{+}
-      #rx"[.] [.] [+]:.*cannot reference an identifier before its definition")
-(test @t{(module m mzscheme (provide lambda))}
-      @t{(lambda (x) x)}
-      #rx"<procedure")
-(test @t{(module m mzscheme (define-syntax (m x) (syntax 1)) (provide m))}
-      @t{(m)}
-      "1")
-(test @t{(module m mzscheme (define-syntax s (syntax 1)) (provide s))}
-      @t{s}
-      ". s: illegal use of syntax in: s")
-(test @t{(module m mzscheme (define-syntax (x stx) #'(define a 10)) x x)}
-      @t{a}
-      #rx"[.] [.] a:.*cannot reference an identifier before its definition")
-(test @t{(module m mzscheme
-           (define-syntax (x stx) #'(define-syntax (a stx) #'10))
-           x
-           x)}
-      @t{a}
-      #rx"[.] [.] a:.*cannot reference an identifier before its definition")
-(test @t{(module m mzscheme
-           (define-syntax (x stx) #'(define a 10))
-           x
-           x
-           (define a 77))}
-      @t{a}
-      "77")
-(test @t{(module m mzscheme
-           (define-syntax (x stx) #'(define-syntax (a stx) #'10))
-           x
-           x
-           (define a 78))}
-      @t{a}
-      "78")
-(test @t{(module m mzscheme
-           (require-for-syntax (file @in-here{module-lang-test-tmp2.rkt}))
-           (provide s)
-           (define-syntax (s stx) e))}
-      @t{(require 'm) s}
-      @rx{[?]:.*literal data is not allowed.*no #%datum syntax transformer is bound in: 1$})
-(test @t{(module tmp mzscheme
-           (provide (rename app #%app)
-                    (rename -current-namespace current-namespace)
-                    (rename -module->namespace module->namespace))
-           (define x 2)
-           (define -current-namespace error)
-           (define -module->namespace error)
-           (define-syntax app (syntax-rules () ((app . x) '(app . x)))))}
-      @t{x}
-      "2")
-(test @t{#lang racket
-         (eval 'cons)}
-      #f
-      @rx{cons: unbound identifier.*no #%top syntax transformer is bound})
-(test @t{(module m (file @in-here{module-lang-test-tmp1.rkt}) 1 2 3)}
-      @t{1} ;; just make sure no errors.
-      "1")
-
-(test @t{#lang racket}
-      @t{(begin-for-syntax (+ 1 2))}
-      @t{})
-
-(test @t{#lang racket}
-      @t{(begin (struct s (x)) (struct t s (y)) (s-x (t 1 2)))}
-      "1")
-
-;; check that we have a working repl in the right language after
-;; syntax errors, unless it's a bad language
-(test @t{#lang racket
-         (define x 1)
-         (define y (/ 0))}
-      @t{(+ 122 x)}
-      @rx{. /: division by zero
-          123}
-      #t)
-(test @t{#lang racket
-         (define x 1)
-         (define y (/ 0))}
-      @t{(if x 123)}
-      @rx{/: division by zero.*if: missing an "else"}
-      #t)
-(test @t{#lang mzscheme
-         (define x 1)
-         (define y (/ 0))}
-      @t{(if x 123)}
-      @rx{. /: division by zero
-          123}
-      #t)
-(test @t{(module xx scheme/list
-           (define x 1)
-           (define y (/ 0)))}
-      #f
-      @rx{no #%module-begin binding in the module's language
-          Interactions disabled:
-          does not support a REPL \(no #%top-interaction\)}
-      #t)
-(test @t{(module xx (file @in-here{module-lang-test-tmp4.rkt})
-           (define x 1)
-           (* x 123))}
-      #f
-      @rx{444
-          123
-          Interactions disabled:
-          does not support a REPL \(no #%top-interaction\)
-          }
-      #t)
-(test @t{(module xx (file @in-here{this-file-does-not-exist})
-           (define x 1)
-           (* x 123))}
-      #f
-      @rx{cannot open module file
-          Module Language: invalid language specification
-          Interactions disabled}
-      #t)
-(test @t{#lang info}
-      #f
-      ;; test the complete buffer, to make sure that there is no error
-      ;; would be better if this said "lang" and not "setup/infotab" but
-      ;; leave it like this for now.
-      "\nInteractions disabled: setup/infotab does not support a REPL (no #%top-interaction)"
-      #t)
-
-;; test racket/load behavior
-(test @t{#lang racket/load
-         (module m mzscheme (provide x) (define x 2))
-         (require 'm)
-         (printf "~s\n" x)
-         (flush-output)}
-      #f
-      "2")
-(test @t{#lang racket/load
-         (module m mzscheme (provide x) (define x 2))
-         (module n racket/base (require 'm) (provide y) (define y (* x x)))
-         (require 'n)
-         (printf "~s\n" y)
-         (flush-output)}
-      #f
-      "4")
-
-(test @t{#lang racket
-         (define-syntax (f stx)
-           (syntax-case stx ()
-             [(f)
-              (raise (make-exn:fail:syntax "both" (current-continuation-marks) (list #'f stx)))]))}
-      @t{(f)}
-      (string-append "> (f)\n"
-                     ". both in:\n"
-                     "  f\n"
-                     "  (f)")
-      #t)
-
-(test @t{#lang racket/base}
-      @t{(begin (values) 1)}
-      "1")
-
-(test @t{#lang racket/base}
-      @t{    (eval '(values 1 2))}
-      @t{1@"\n"2})
-(test @t{#lang racket/base}
-      @t{    (eval '(list 1 2))}
-      @t{'(1 2)})
-(test @t{#lang racket/base}
-      @t{    (eval '(lambda ()))}
-      @t{lambda: bad syntax in: (lambda ())})
-(test @t{#lang racket/base}
-      @t{(expt 3 (void))}
-      @rx{expt: contract violation.*given: #<void>})
-(test @t{#lang racket/base}
-      @t{1 2 ( 3 4}
-      @t{1@"\n"2@"\n". read: expected a `)' to close `('})
-(test @t{#lang racket/base}
-      "1 2 . 3 4"
-      "1\n2\n. read: illegal use of `.'")
-(test @t{#lang racket/base}
-      "1 2 (lambda ()) 3 4"
-      "1\n2\n. lambda: bad syntax in: (lambda ())")
-(test @t{#lang racket/base}
-      "1 2 x 3 4"
-      #rx"1\n2\n[.] [.] x:.*cannot reference an identifier before its definition")
-(test @t{#lang racket/base}
-      "1 2 (raise 1) 3 4"
-      "1\n2\nuncaught exception: 1")
-(test @t{#lang racket/base}
-      "1 2 (raise #f) 3 4"
-      "1\n2\nuncaught exception: #f")
-(test @t{#lang racket/base}
-      "(current-namespace (make-empty-namespace)) if"
-      #rx". #%top-interaction: unbound identifier.*no #%app syntax transformer is bound")
-(test @t{#lang racket/base}
-      (string-append
-       "(let ([old (error-escape-handler)])\n"
-       "(+ (let/ec k\n(dynamic-wind\n"
-       "(lambda () (error-escape-handler (lambda () (k 5))))\n"
-       "(lambda () (expt 3 #f))\n"
-       "(lambda () (error-escape-handler old))))\n"
-       "10))")
-      #rx"[.] [.] expt: contract violation.*given: #f\n15")
-(test @t{#lang racket/base}
-      "(write (list (syntax x)))"
-      "(.)")
-(test @t{#lang racket/base}
-      "(parameterize ([current-output-port (open-output-string)]) (write #'1))"
-      "")
-(test @t{#lang racket/base}
-      "(write-special 1)"
-      "1#t")
-(test @t{#lang racket/gui}
-      (format "~s ~s ~s"
-              '(define s (make-semaphore 0))
-              '(queue-callback
-                (lambda ()
-                  (dynamic-wind
-                   void
-                   (lambda () (expt 3 #f))
-                   (lambda () (semaphore-post s)))))
-              '(begin (yield s) (void)))
-      #rx"[.] [.] expt: contract violation.*given: #f")
-(test @t{#lang racket/base}
-      (format "~s ~s" 
-              '(define x 1) 
-              '((λ (x y) y) (set! x (call/cc (lambda (x) x))) (x 3)))
-      #rx". . application:.*given: 3")
-(test @t{#lang racket/base}
-      (format "~s ~s ~s ~s"
-              '(begin (define k (call/cc (λ (x) x)))
-                      (define x 'wrong))
-              '(set! x 'right)
-              '(k 1)
-              'x)
-      "'right")
-(test @t{#lang racket/base}
-      (format "~s"
-              '(call-with-continuation-prompt
-                (lambda ()
-                  (eval '(begin (abort-current-continuation
-                                 (default-continuation-prompt-tag)
-                                 1 2 3)
-                                10)))
-                (default-continuation-prompt-tag)
-                list))
-      "'(1 2 3)")
-(test @t{#lang racket/gui}
-      "(vector (new snip%))"
-      "(vector .)")
-(test @t{#lang racket/base}
-      "(begin (thread (lambda () x)) (sleep 1/10))"
-      #rx"[.] [.] x:.*cannot reference an identifier before its definition")
-(test @t{#lang racket/base}
-      "(require texpict/utils)(disk 3)"
-      ".")
-(test @t{#lang racket/base}
-      (string-append
-       "(require mzlib/pretty)"
-       "(pretty-print-print-hook (lambda x (expt 3 #f)))"
-       "(list 1 2 3)")
-      "'(1 2 3)")
-
-;; test protection against user-code changing the namespace
-(test @t{#lang racket/base
-         (current-namespace (make-base-namespace))}
-      "(+ 1 2)"
-      "3")
-(test @t{#lang racket/base
-         (current-namespace (make-base-empty-namespace))}
-      "(+ 1 2)"
-      "3")
-(test @t{#lang racket/base}
-     @t{(parameterize ([current-directory "/does/not/exists/well/it/better/not/anwyays"])
-         (load @in-here{module-lang-test-syn-error.rkt}))}
-     ;; test to make sure that we don't get "exception raised by error display handler"
-     #rx"module-lang-test-syn-error.rkt:[0-9]+:[0-9]+: lambda: bad syntax in: \\(lambda\\)")
-
-(test @t{#lang racket
-(module+ main (printf "main\n"))
-(module+ test (printf "test\n"))
-(module+ other (printf "other\n"))}
-      #f
-      #rx"test\nmain")
-
-
-(test @t{#lang racket}
-      (format "~s" '(+ 1 (+ 1 (abort-current-continuation
-                               (default-continuation-prompt-tag)
-                               (lambda () 
-                                 (abort-current-continuation
-                                  (default-continuation-prompt-tag)
-                                  (λ () 0)))))))
-      "0")
-   
-(test @t{#lang racket}
-      (format "~s ~s ~s" 
-              '1
-              '(+ 1 (+ 1 (abort-current-continuation
-                          (default-continuation-prompt-tag)
-                          (lambda () 
-                            (abort-current-continuation
-                             (default-continuation-prompt-tag)
-                             (λ () 0))))))
-              '2)
-      "1\n0")
-
-(test @t{#lang racket}
-      (format "~s" 
-              '(begin
-                 1
-                 (+ 1 (+ 1 (abort-current-continuation
-                            (default-continuation-prompt-tag)
-                            (lambda () 
-                              (abort-current-continuation
-                               (default-continuation-prompt-tag)
-                               (λ () 0))))))
-                 2))
-      "0")
-
-(fire-up-drracket-and-run-tests run-test)
-
-;; Test mode:
-(module test racket/base
-  (require syntax/location)
-  (putenv "PLTDRTEST" "yes")
-  (eval-jit-enabled #f)
-  (dynamic-require (quote-module-path "..") #f)
-  (module config info
-    (define timeout 800)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/no-write-and-frame-leak.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/no-write-and-frame-leak.rkt
deleted file mode 100644
index 3051a1ebd5..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/no-write-and-frame-leak.rkt
+++ /dev/null
@@ -1,260 +0,0 @@
-#lang racket
-
-#|
-
-This test checks:
-
-  - if opening frames/tabs leaks,
-
-  - if DrRacket writes to the filesystem during startup or
-    while opening tabs/frames
-
-  - if there are any adjacent separators in the menus
-
-  - if there are any duplicate shortcuts in the menus
-
-  - that the logger GUI is not completely broken (checks
-    that it opens, that it catches a GC message, and that
-    it closes)
-
-  - that the reorder tabs method doesn't break
-
-|#
-
-(require "private/drracket-test-util.rkt"
-         drracket/private/local-member-names
-         racket/gui/base
-         framework
-	 rackunit
-         string-constants)
-
-(define (main)
-  (parameterize ([current-security-guard
-                  (make-security-guard
-                   (current-security-guard)
-                   (λ (who pth what)
-                     (when (member 'write what)
-                       (error who "Writing to the file system is not allowed"))
-                     (when (member 'delete what)
-                       (error who "Deleting files is not allowed")))
-                   void
-                   void)])
-    (fire-up-drracket-and-run-tests 
-     #:prefs '([plt:framework-pref:drracket:online-compilation-default-on #f]
-               [plt:framework-pref:framework:autosaving-on? #f]) 
-     (λ ()
-       (define drr (wait-for-drracket-frame))
-       (check-reorder-tabs drr)
-       (check-log-panel drr)
-       (check-menus drr)
-       
-       (try-to-find-leak "online compilation disabled:" void)
-       
-       (preferences:set 'drracket:online-compilation-default-on #t)
-       
-       (try-to-find-leak "online compilation enabled:" wait-for-online-compilation-to-finish)))))
-
-(define (wait-for-online-compilation-to-finish frame) 
-  (let loop ([i 0])
-    (define current-colors (send frame get-online-expansion-colors))
-    (unless (equal? current-colors '("forestgreen"))
-      (sleep 1)
-      (loop (+ i 1)))))
-
-(define (try-to-find-leak online-compilation-string extra-waiting)
-  (define drs-frame1 (wait-for-drracket-frame))
-  (sync (system-idle-evt))
-
-  (for ([tries (in-range 3)])
-    (test:menu-select "File" "New Tab")
-    (sync (system-idle-evt))
-    
-    (define drs-tabb (make-weak-box (send drs-frame1 get-current-tab)))
-    (define tab-nsb (make-weak-box (send (send (send drs-frame1 get-current-tab) get-ints)
-                                         get-user-namespace)))
-    
-    (test:menu-select "File" (if (eq? (system-type) 'unix) "Close" "Close Tab"))
-    (sync (system-idle-evt))
-    
-    (test:menu-select "File" "New")
-    (sync (system-idle-evt))
-    
-    (define drs-frame2b (make-weak-box (wait-for-new-frame drs-frame1)))
-    (define frame2-nsb (make-weak-box 
-                        (send (send (send (weak-box-value drs-frame2b) get-current-tab) get-ints) 
-                              get-user-namespace)))
-    
-    (queue-callback/res
-     (λ () (send (send (send (weak-box-value drs-frame2b) get-current-tab) get-defs) load-file
-                 (collection-file-path "rep.rkt" "drracket" "private"))))
-    (sleep 2)
-    (extra-waiting (weak-box-value drs-frame2b))
-    (sync (system-idle-evt))
-    
-    (test:menu-select "File" (if (eq? (system-type) 'unix) "Close" "Close Window"))
-    (sync (system-idle-evt))
-    
-    (let loop ([n 30])
-      (cond
-        [(zero? n) 
-         (when (weak-box-value drs-tabb)
-           (eprintf "~a tab leak!\n" online-compilation-string))
-         (when (weak-box-value drs-frame2b)
-           (eprintf "~a frame leak!\n" online-compilation-string))
-         (when (weak-box-value tab-nsb)
-           (eprintf "~a tab namespace leak!\n" online-compilation-string))
-         (when (weak-box-value frame2-nsb)
-           (eprintf "~a frame namespace leak!\n" online-compilation-string))]
-        [else
-         (collect-garbage) (sync (system-idle-evt))
-         (when (ormap weak-box-value 
-                      (list drs-tabb
-                            tab-nsb
-                            drs-frame2b
-                            frame2-nsb))
-           (loop (- n 1)))]))))
-  
-(define (check-menus frame)
-  
-  (define shortcuts (make-hash))
-  
-  (define (process-container container)
-    (define sub-items (send container get-items))
-    (unless (null? sub-items)
-      (record-shortcut (car sub-items))
-      (when (is-a? (car sub-items) menu-item-container<%>)
-        (process-container (car sub-items)))
-      (define printed? #f)
-      (for ([prev-item (in-list sub-items)]
-            [item (in-list (cdr sub-items))])
-        (record-shortcut item)
-        (when (and (is-a? prev-item separator-menu-item%)
-                   (is-a? item separator-menu-item%)
-                   (not printed?))
-          (set! printed? #t)
-          (eprintf "found two adjacent separator items in: ~s:\n" (get-names container))
-          (for ([item (in-list sub-items)])
-            (eprintf "  ~a\n" (get-lab item)))
-          (eprintf "\n"))
-        (when (is-a? item menu-item-container<%>)
-          (process-container item)))))
-  
-  (define (record-shortcut item)
-    (when (is-a? item selectable-menu-item<%>)
-      (when (send item get-shortcut)
-        (define k (append (sort (send item get-shortcut-prefix)
-                                string<=?
-                                #:key symbol->string)
-                          (list (send item get-shortcut))))
-        (hash-set! shortcuts 
-                   k
-                   (cons (send item get-label)
-                         (hash-ref shortcuts k '()))))))
-  
-  (define (get-lab item)
-    (cond
-      [(is-a? item labelled-menu-item<%>)
-       (send item get-label)]
-      [(is-a? item separator-menu-item%)
-       "---------"]
-      [else #f]))
-  
-  (define (get-names item)
-    (let loop ([item item])
-      (cond
-        [(is-a? item menu-item<%>)
-         (cons (get-lab item)
-               (loop (send item get-parent)))]
-        [else
-         '()])))
-  
-  (define (check-shortcuts)
-    (for ([(k v) (in-hash shortcuts)])
-      (unless (= 1 (length v))
-        (eprintf "found multiple menu items with the shortcut ~s: ~s\n"
-                 k v))))
-  
-  (process-container (send frame get-menu-bar))
-  (check-shortcuts))
-
-(define (check-reorder-tabs drr)
-  (test:menu-select "File" "New")
-  (define drr2 (wait-for-new-frame drr))
-
-  (send drr2 create-new-tab)
-  (send drr2 create-new-tab)
-  (define tabs (send drr2 get-tabs))
-
-  (send drr2 reorder-tabs (reverse (range (length tabs))))
-  (define new-tabs (send drr2 get-tabs))
-  (check-equal? new-tabs (reverse tabs))
-
-  (send drr2 reorder-tabs (reverse (range (length tabs))))
-  (define new-tabs2 (send drr2 get-tabs))
-  (check-equal? new-tabs2 tabs)
-
-  (cond
-    [(eq? (system-type) 'unix)
-     (for ([_ (in-range (length tabs))])
-       (test:menu-select "File" "Close"))]
-    [else
-     (test:menu-select "File" "Close Window")])
-
-  (wait-for-new-frame drr2))
-
-(define (check-log-panel drr)
-  
-  (define (find-log-messages-message)
-    (let loop ([p drr])
-      (cond
-        [(is-a? p area-container<%>)
-         (for/or ([c (in-list (send p get-children))])
-           (loop c))]
-        [(is-a? p message%)
-         (and (equal? (send p get-label) (string-constant log-messages))
-              p)]
-        [else #f])))
-  
-  (test:menu-select "View" "Show Log")
-  
-  ;; wait for the log window to show up.
-  (poll-until
-   (λ ()
-     (queue-callback/res find-log-messages-message)))
-  
-  (collect-garbage)
-  
-  (define logger-string
-    (poll-until
-     (λ ()
-       (define str
-         (queue-callback/res
-          (λ ()
-            (define msg (find-log-messages-message))
-            (define msg-parent-parent (send (send msg get-parent) get-parent))
-            (let loop ([p msg-parent-parent])
-              (cond
-                [(is-a? p area-container<%>)
-                 (for/or ([c (in-list (send p get-children))])
-                   (loop c))]
-                [(is-a? p editor-canvas%)
-                 (send (send p get-editor) get-text)]
-                [else #f])))))
-       (and str
-            
-            ;; wait for a log message that doesn't look like a minor GC
-            (for/or ([l (in-lines (open-input-string str))])
-              (not (regexp-match? #rx"^GC: [0-9]*:min" l)))
-            
-            str))))
-  
-  (unless (regexp-match #rx"GC: [0-9]+:MAJ" logger-string)
-    (error 'check-log-panel "didn't find GC log message: ~s" logger-string))
-  
-  (test:menu-select "View" "Hide Log")
-  
-  (poll-until
-   (λ ()
-     (not (queue-callback/res find-log-messages-message)))))
-
-(main)
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/online-compilation-zo-creation.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/online-compilation-zo-creation.rkt
deleted file mode 100644
index 61d468af4e..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/online-compilation-zo-creation.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-(require "private/drracket-test-util.rkt"
-         racket/file
-         drracket/private/local-member-names
-         racket/class
-         racket/path
-         (submod drracket/private/module-language oc-status-structs))
-(fire-up-drracket-and-run-tests 
- (λ ()
-   (define tmp-dir (make-temporary-file "online-compilation-zo-creation~a" 'directory))
-   (define x.rkt (build-path tmp-dir "x.rkt"))
-   (define y.rkt (build-path tmp-dir "y.rkt"))
-   (call-with-output-file x.rkt
-     (λ (port)
-       (fprintf port "#lang racket/base\n")
-       (fprintf port "~s\n" `(require "y.rkt")))
-     #:exists 'truncate)
-   (call-with-output-file y.rkt
-     (λ (port)
-       (fprintf port "#lang racket/base\n"))
-     #:exists 'truncate)
-   (define drs-frame (wait-for-drracket-frame))
-   (queue-callback/res
-    (λ ()
-      (send (send drs-frame get-definitions-text) load-file x.rkt)))
-   (poll-until
-    (λ ()
-      (queue-callback/res
-       (λ ()
-         (clean? (send (send drs-frame get-current-tab) get-oc-status))))))
-   
-   (define compiled-dir-files
-     (cond
-       [(directory-exists? (build-path tmp-dir "compiled"))
-        (for/list ([file (in-directory (build-path tmp-dir "compiled"))])
-          (path->string (find-relative-path tmp-dir file)))]
-       [else
-        '()]))
-   (define expected-file "compiled/drracket/errortrace/y_rkt.zo")
-   (unless (member expected-file compiled-dir-files)
-     (eprintf "expected to find ~s in compiled dir but it contained ~s\n"
-              expected-file compiled-dir-files))
-   
-   (delete-directory/files tmp-dir)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/populate-compiled.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/populate-compiled.rkt
deleted file mode 100644
index ff57fc3706..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/populate-compiled.rkt
+++ /dev/null
@@ -1,153 +0,0 @@
-#lang racket/base
-(require racket/file
-         racket/system
-         compiler/find-exe
-         pkg/lib)
-
-(module test racket/base) ; disable for DrDr
-
-(unless (eq? 'user (default-pkg-scope))
-  (error "Run this test with `user' default package scope"))
-
-(define dir (make-temporary-file "~a" 'directory))
-(define pkg-dir (build-path dir "popcomp-pkg"))
-(define coll-dir (build-path pkg-dir "popcomp"))
-(define pkg2-dir (build-path dir "popcomp2-pkg"))
-(define coll2-dir (build-path pkg2-dir "popcomp2"))
-
-(make-directory* coll-dir)
-(make-directory* coll2-dir)
-
-(call-with-output-file*
- (build-path pkg-dir "info.rkt")
- (λ (o)
-   (fprintf o "#lang info\n")
-   (write '(define collection 'multi) o)))
-
-(call-with-output-file*
- (build-path coll-dir "main.rkt")
- (lambda (o)
-   (fprintf o "#lang racket/base\n")
-   (write '(provide popcomp) o)
-   (write '(define popcomp (gensym 'popcomp)) o)))
-
-(call-with-output-file*
- (build-path pkg2-dir "info.rkt")
- (λ (o)
-   (fprintf o "#lang info\n")
-   (write '(define collection 'multi) o)))
-
-(call-with-output-file*
- (build-path coll2-dir "main.rkt")
- (lambda (o)
-   (fprintf o "#lang racket/base\n")
-   (write '(provide popcomp2) o)
-   (write '(define popcomp2 (gensym 'popcomp2)) o)))
-
-(call-with-output-file*
- (build-path dir "y.rkt")
- (lambda (o)
-   (fprintf o "#lang racket/base\n")
-   (write '(provide y) o)
-   (write '(define y (gensym 'y)) o)))
-
-(call-with-output-file*
- (build-path dir "x.rkt")
- (lambda (o)
-   (fprintf o "#lang racket/base\n")
-   (write '(require "y.rkt" popcomp popcomp2) o)))
-
-(define (system*/error . args)
-  (unless (apply system* args)
-    (error "failed")))
-
-(define addon-dir (build-path dir "addon"))
-(make-directory* addon-dir)
-(void (putenv "PLTADDONDIR" (path->string addon-dir)))
-
-(system*/error (find-exe) 
-               "-l" "raco" "pkg" "install" "--no-setup" "--link"
-               pkg-dir
-               pkg2-dir)
-(system*/error (find-exe) 
-               "-e" 
-               "(require (submod tests/drracket/populate-compiled go))"
-               (build-path dir "x.rkt"))
-
-(delete-directory/files dir)
-
-;; ----------------------------------------
-
-(module go racket/base
-  (require "private/drracket-test-util.rkt"
-           racket/gui/base
-           racket/class
-           racket/path
-           racket/file
-           framework/test)
-
-  (define (check-compiled compiled? path)
-    (unless (equal? compiled? (file-exists? path))
-      (error 'check-compiled
-             "expected ~acompiled: ~a"
-             (if compiled? "" "not ")
-             path)))
-  
-  (fire-up-drracket-and-run-tests 
-   (λ ()
-      (let ([drs (wait-for-drracket-frame)])
-        (define x (vector-ref (current-command-line-arguments) 0))
-        (define dir (path-only x))
-        
-        (do-execute drs)
-
-        (define popcomp-main-zo
-          (build-path dir "popcomp-pkg" "popcomp" "compiled" "drracket" "errortrace" "main_rkt.zo"))
-        (define popcomp2-main-zo
-          (build-path dir "popcomp2-pkg" "popcomp2" "compiled" "drracket" "errortrace" "main_rkt.zo"))
-
-        (check-compiled #t (build-path dir "compiled" "drracket" "errortrace" "y_rkt.zo"))
-        (check-compiled #f popcomp-main-zo)
-        (check-compiled #f popcomp2-main-zo)
-
-        ;; Create a broken ".zo" file where it should not be used:
-        (make-directory* (path-only popcomp-main-zo))
-        (call-with-output-file* 
-         popcomp-main-zo
-         (lambda (o)
-           (fprintf o "broken\n")))
-
-        (do-execute drs)
-        (let* ([got (fetch-output drs)])
-          (unless (string=? "" got)
-            (error 'check-output "wrong output: ~s" got)))
-
-        (delete-file popcomp-main-zo)
-
-        ;; Open "main.rkt" in "popcomp-pkg", so now it should be compiled
-        ;; when we run "x.rkt":
-
-        (test:menu-select "File" "New Tab")
-        (use-get/put-dialog (λ () 
-                               (test:menu-select "File" "Open..."))
-                            (build-path dir "popcomp-pkg" "popcomp" "main.rkt"))
-
-        (queue-callback/res (λ () (send drs change-to-tab (car (send drs get-tabs)))))
-
-        (do-execute drs)
-
-        (check-compiled #t popcomp-main-zo)
-        (check-compiled #f popcomp2-main-zo)
-
-        ;; But if the "popcomp-pkg" directory is not writable, then
-        ;; don't compile after all:
-
-        (delete-file popcomp-main-zo)
-        (file-or-directory-permissions (build-path dir "popcomp-pkg") #o555)
-        
-        (do-execute drs)
-
-        (check-compiled #f popcomp-main-zo)
-        (check-compiled #f popcomp2-main-zo)
-
-        (file-or-directory-permissions (build-path dir "popcomp-pkg") #o777)))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/drracket-test-util.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/drracket-test-util.rkt
deleted file mode 100644
index 2c996abb51..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/drracket-test-util.rkt
+++ /dev/null
@@ -1,763 +0,0 @@
-#lang racket/base
-
-(require (prefix-in fw: framework)
-         mrlib/hierlist
-         racket/gui/base
-         racket/class
-         racket/contract
-         "gui.rkt")
-
-  (provide/contract 
-   [use-get/put-dialog (-> (-> any) path? void?)]
-   [set-module-language! (->* () (boolean?) void?)])
-  
-  (provide queue-callback/res
-           fire-up-drracket-and-run-tests
-           fire-up-separate-drracket-and-run-tests
-           save-drracket-window-as
-           do-execute
-           test-util-error
-           poll-until
-           wait-for-computation
-           wait-for-drracket-frame
-           wait-for-new-frame
-           clear-definitions
-           type-in-definitions
-           type-in-interactions
-           insert-in-definitions
-           insert-in-interactions
-           type-string
-           wait
-           wait-pending
-           get-sub-panel
-           get-text-pos
-           wait-for-button
-           push-button-and-wait
-           set-language-level!
-           repl-in-edit-sequence?
-           fetch-output
-           has-error?
-           run-one/sync
-           alt-return-in-interactions)
-  
-  ;; save-drracket-window-as : string -> void
-  ;; use the "save as" dialog in drracket to save the definitions
-  ;; window to a file.
-  (define (save-drracket-window-as filename)
-    (not-on-eventspace-handler-thread 'save-drracket-window-as)
-    (use-get/put-dialog
-     (lambda ()
-       (fw:test:menu-select "File" "Save Definitions As..."))
-     filename))
-
-  ;; open-dialog is a thunk that should open the dialog
-  ;; filename is a string naming a file that should be typed into the dialog
-  (define (use-get/put-dialog open-dialog filename)
-    (not-on-eventspace-handler-thread 'use-get/put-dialog)
-    (let ([drs (wait-for-drracket-frame)])
-      (with-handlers ([(lambda (x) #t)
-		       (lambda (x)
-			 (fw:preferences:set 'framework:file-dialogs 'std)
-			 (raise x))])
-	(fw:preferences:set 'framework:file-dialogs 'common)
-	(open-dialog)
-	(let ([dlg (wait-for-new-frame drs)])
-	  (send (find-labelled-window "Filename:" #f (fw:test:get-active-top-level-window)) focus)
-	  (fw:test:keystroke #\a (list (case (system-type)
-					 [(windows) 'control]
-					 [(macosx macos) 'meta]
-					 [(unix) 'meta]
-                                         [else (error 'use-get/put-dialog "unknown platform: ~s\n"
-                                                      (system-type))])))
-	  (for-each fw:test:keystroke (string->list (path->string filename)))
-	  (fw:test:button-push "OK")
-	  (wait-for-new-frame dlg))
-	(fw:preferences:set 'framework:file-dialogs 'std))))
-
-  (define (test-util-error fmt . args)
-    (raise (make-exn (apply fmt args) (current-continuation-marks))))
-  
-  ;; poll-until : (-> alpha) number (-> alpha) -> alpha
-  ;; waits until pred return a true value and returns that.
-  ;; if that doesn't happen by `secs', calls fail and returns that.
-  (define (poll-until pred
-                      [secs 10]
-                      [fail (lambda ()
-                              (error 'poll-until 
-                                     "timeout after ~e secs, ~e never returned a true value"
-                                     secs pred))])
-    (let ([step 1/20])
-      (let loop ([counter secs])
-        (if (<= counter 0)
-            (fail)
-            (let ([result (pred)])
-              (or result
-                  (begin
-                    (sleep step)
-                    (loop (- counter step)))))))))
-  
-  (define (drracket-frame? frame)
-    (method-in-interface? 'get-execute-button (object-interface frame)))
-  
-  (define (wait-for-drracket-frame [print-message? #f])
-    (define (wait-for-drracket-frame-pred)
-      (define active (fw:test:get-active-top-level-window))
-      (if (and active
-               (drracket-frame? active))
-          active
-          #f))
-    (define drr-fr
-      (or (wait-for-drracket-frame-pred)
-          (begin
-            (when print-message?
-              (printf "Select DrRacket frame\n"))
-            (poll-until wait-for-drracket-frame-pred))))
-    (when drr-fr
-      (wait-for-events-in-frame-eventspace drr-fr))
-    drr-fr)
-  
-  ;; wait-for-new-frame : frame [(listof eventspace) = null] -> frame
-  ;; returns the newly opened frame, waiting until old-frame
-  ;; is no longer frontmost. Optionally checks other eventspaces
-  ;; waits until the new frame has a focus'd window, too. 
-  (define (wait-for-new-frame/proc old-frame old-frame-id-name [extra-eventspaces '()] [timeout 10])
-    (define (wait-for-new-frame-pred)
-      (define active (or (fw:test:get-active-top-level-window)
-                         (for/or ([eventspace (in-list extra-eventspaces)]) 
-                           (parameterize ([current-eventspace eventspace])
-                             (fw:test:get-active-top-level-window)))))
-      (if (and active
-               (not (eq? active old-frame)))
-          active
-          #f))
-    (define lab (send old-frame get-label))
-    (define fr (poll-until 
-                (procedure-rename wait-for-new-frame-pred
-                                  (string->symbol
-                                   (format "wait-for-new-frame-pred; old: ~s id: ~a"
-                                           lab old-frame-id-name)))
-                timeout))
-    (when fr (wait-for-events-in-frame-eventspace fr))
-    (sleep 1)
-    fr)
-
-(define-syntax-rule 
-  (wait-for-new-frame a b ...)
-  (wait-for-new-frame/proc a 'a b ...))
-  
-  (define (wait-for-events-in-frame-eventspace fr)
-    (define sema (make-semaphore 0))
-    (parameterize ([current-eventspace (send fr get-eventspace)])
-      (queue-callback
-       (λ () (semaphore-post sema))
-       #f))
-    (semaphore-wait sema))
-
-  ;; wait-for-computation : frame -> void
-  ;; waits until the drracket frame finishes some computation.
-  ;; uses the state of the execute button to indicate when the
-  ;; computations is finished. That is, waits for the execute
-  ;; button to dim, indicating a computation is running. Then,
-  ;; waits for it to be re-enabled, indicating that the computation
-  ;; is complete.
-  (define (wait-for-computation frame)
-    (not-on-eventspace-handler-thread 'wait-for-computation)
-    (queue-callback/res (λ () (verify-drracket-frame-frontmost 'wait-for-computation frame)))
-    (let* ([wait-for-computation-to-start
-	    (lambda ()
-	      (fw:test:reraise-error)
-	      (not (send (send frame get-execute-button) is-enabled?)))]
-           [wait-for-computation-to-finish
-	    (lambda ()
-	      (fw:test:reraise-error)
-	      (send (send frame get-execute-button) is-enabled?))])
-      ;(poll-until wait-for-computation-to-start 60) ;; hm.
-      (poll-until wait-for-computation-to-finish 60)
-      (sync (system-idle-evt))))
-
-  (define do-execute 
-    (case-lambda
-     [(frame)
-      (do-execute frame #t)]
-     [(frame wait-for-finish?)
-      (not-on-eventspace-handler-thread 'do-execute)
-      (queue-callback/res (λ () (verify-drracket-frame-frontmost 'do-execute frame)))
-      (let ([button (queue-callback/res (λ () (send frame get-execute-button)))])
-	(fw:test:run-one (lambda () (send button command)))
-	(when wait-for-finish?
-          (wait-for-computation frame)))]))
-  
-  (define (verify-drracket-frame-frontmost function-name frame)
-    (on-eventspace-handler-thread 'verify-drracket-frame-frontmost)
-    (let ([tl (fw:test:get-active-top-level-window)])
-      (unless (and (eq? frame tl)
-                   (drracket-frame? tl))
-        (error function-name "drracket frame not frontmost: ~e (found ~e)" frame tl))))
-  
-  (define (clear-definitions frame)
-    (queue-callback/res (λ () (verify-drracket-frame-frontmost 'clear-definitions frame)))
-    (fw:test:new-window (queue-callback/res (λ () (send frame get-definitions-canvas))))
-    (let ([window (queue-callback/res (λ () (send frame get-edit-target-window)))])
-      (let-values ([(cw ch) (queue-callback/res (λ () (send window get-client-size)))]
-                   [(w h) (queue-callback/res (λ () (send window get-size)))])
-        (fw:test:mouse-click 'left
-			     (inexact->exact (floor (+ cw (/ (- w cw) 2))))
-			     (inexact->exact (floor (+ ch (/ (- h ch) 2)))))))
-    (fw:test:menu-select "Edit" "Select All")
-    (fw:test:menu-select "Edit" (if (eq? (system-type) 'macos)
-				    "Clear"
-				    "Delete")))
-
-  (define (type-in-definitions frame str)
-    (not-on-eventspace-handler-thread 'type-in-definitions)
-    (put-in-frame (lambda (x) (send x get-definitions-canvas)) frame str #f 'type-in-definitions))
-  (define (type-in-interactions frame str)
-    (not-on-eventspace-handler-thread 'type-in-interactions)
-    (put-in-frame (lambda (x) (send x get-interactions-canvas)) frame str #f 'type-in-interactions))
-  (define (insert-in-definitions frame str)
-    (not-on-eventspace-handler-thread 'insert-in-definitions)
-    (put-in-frame (lambda (x) (send x get-definitions-canvas)) frame str #t 'insert-in-definitions))
-  (define (insert-in-interactions frame str)
-    (not-on-eventspace-handler-thread 'insert-in-interactions)
-    (put-in-frame (lambda (x) (send x get-interactions-canvas)) frame str #t 'insert-in-interactions))
-
-  (define (put-in-frame get-canvas frame str/sexp just-insert? who)
-    (not-on-eventspace-handler-thread 'put-in-frame)
-    (unless (and (object? frame) (is-a? frame top-level-window<%>))
-      (error who "expected a frame or a dialog as the first argument, got ~e" frame))
-    (let ([str (if (string? str/sexp)
-		   str/sexp
-		   (let ([port (open-output-string)])
-		     (parameterize ([current-output-port port])
-		       (write str/sexp port))
-		     (get-output-string port)))])
-      (queue-callback/res (λ () (verify-drracket-frame-frontmost who frame)))
-      (let ([canvas (queue-callback/res (λ () (get-canvas frame)))])
-	(fw:test:new-window canvas)
-	(let ([editor (queue-callback/res (λ () (send canvas get-editor)))])
-          (cond
-            [just-insert? 
-             (let ([s (make-semaphore 0)])
-               (queue-callback
-                (λ () 
-                  (send editor set-caret-owner #f)
-                  (send editor insert str)
-                  (semaphore-post s)))
-               (unless (sync/timeout 3 s)
-                 (error who "callback didn't run for 3 seconds; trying to insert ~s" str/sexp)))]
-            [else 
-             (queue-callback/res (λ () (send editor set-caret-owner #f)))
-             (type-string str)])))))
-  
-  (define (queue-callback/res thunk)
-    (not-on-eventspace-handler-thread 'queue-callback/res)
-    (let ([c (make-channel)])
-      (queue-callback (λ () (channel-put c (with-handlers ((exn:fail? values))
-                                             (call-with-values thunk list))))
-                      #f)
-      (define res (channel-get c))
-      (when (exn? res) (raise res))
-      (apply values res)))
-
-  (define (alt-return-in-interactions frame)
-    (not-on-eventspace-handler-thread 'alt-return-in-interactions)
-    (queue-callback/res (λ () (verify-drracket-frame-frontmost 'alt-return-in-interactions frame)))
-    (let ([canvas (send frame get-interactions-canvas)])
-      (fw:test:new-window canvas)
-      (let ([editor (send canvas get-editor)])
-        (send editor set-caret-owner #f)
-        (fw:test:keystroke #\return '(alt)))))
-        
-  ;; type-string : string -> void
-  ;; to call test:keystroke repeatedly with the characters
-  (define (type-string str)
-    (not-on-eventspace-handler-thread 'type-string)
-    (let ([len (string-length str)])
-      (let loop ([i 0])
-        (unless (>= i len)
-          (let ([c (string-ref str i)])
-            (fw:test:keystroke
-             (if (char=? c #\newline)
-                 #\return
-                 c)))
-          (loop (+ i 1))))))
-  
-  (define wait
-    (case-lambda 
-     [(test desc-string) (wait test desc-string 5)]
-     [(test desc-string time)
-      (let ([int 1/2])
-	(let loop ([sofar 0])
-	  (cond
-	    [(> sofar time) (error 'wait desc-string)]
-	    [(test) (void)]
-	    [else (sleep int)
-		  (loop (+ sofar int))])))]))
-  
-  (define (wait-pending)
-    (wait (lambda () (= 0 (fw:test:number-pending-actions)))
-	  "Pending actions didn't terminate")
-    (fw:test:reraise-error))
-  
-  
-;;; get-sub-panel takes 
-;;;    a list of integers describing the path from a frame to the desired panel
-;;;    the frame
-;;;    based on code by Mark Krentel
-  
-;;;    Examples:
-;;;    (get-sub-panel '() frame) gets the top-panel in frame
-;;;    (get-sub-panel '(2) frame) gets the 2nd child of the top-panel 
-;;;    (get-sub-panel '(2 0) frame) gets the 0th child of the 2nd child of the top-panel 
-  
-  (define (get-sub-panel path frame)
-    (on-eventspace-handler-thread 'get-sub-panel)
-    (letrec ([loop 
-	      (lambda (path panel)
-		(if (null? path)
-		    (if (is-a? panel panel%)
-			panel
-			(test-util-error "not a panel")) 
-		    (loop
-		     (cdr path)
-		     (list-ref (send panel get-children) (car path)))))])
-      (loop path frame)))
-  
-;;; get-text-pos returns the offset in an text buffer of the beginning
-;;; of the last line
-  
-  (define (get-text-pos text)
-    (on-eventspace-handler-thread 'get-text-pos)
-    (let* ([last-pos (send text last-position)]
-	   [last-line (send text position-line last-pos)])
-      (send text line-start-position last-line)))
-  
-  ; poll for enabled button
-  
-  (define (wait-for-button button)
-    (not-on-eventspace-handler-thread 'wait-for-button)
-    (poll-until
-     (let ([wait-for-button-pred
-	    (lambda ()
-              (queue-callback/res (λ () (send button is-enabled?))))])
-       wait-for-button-pred)))
-  
-  (define (push-button-and-wait button)
-    (not-on-eventspace-handler-thread 'push-button-and-wait)
-    (fw:test:button-push button)
-    (poll-until
-     (let ([button-push-and-wait-pred
-	    (lambda ()
-	      (fw:test:reraise-error)
-	      (= 0 (fw:test:number-pending-actions)))])
-       button-push-and-wait-pred))
-    (wait-for-button button))
-  
-  ;; set-language-level! : (cons (union regexp string) (listof (union regexp string))) boolean -> void
-  ;; set language level in the frontmost DrRacket frame (resets settings to defaults)
-  ;; If `close-dialog?' it #t,
-  (define set-language-level!
-    (lambda (in-language-spec [close-dialog? #t])
-      (unless (and (pair? in-language-spec)
-                   (list? in-language-spec)
-                   (andmap (lambda (x) (or string? regexp?)) in-language-spec))
-        (error 'set-language-level!
-               "expected a non-empty list of regexps and strings for language, got: ~e"
-               in-language-spec))
-      (not-on-eventspace-handler-thread 'set-language-level!)
-      (let ([drs-frame (fw:test:get-active-top-level-window)])
-        (fw:test:menu-select "Language" "Choose Language...")
-        (define language-dialog (wait-for-new-frame drs-frame))
-        (fw:test:set-radio-box-item! #rx"Other Languages")
-        (define language-choices (find-labelled-windows #f hierarchical-list%
-                                                        (fw:test:get-active-top-level-window)))
-        (define (click-on-snip snip)
-          (define-values (x y)
-            (queue-callback/res
-             (λ ()        
-               (define b1 (box 0))
-               (define b2 (box 0))
-               (define editor (send (send snip get-admin) get-editor))
-               (define between-threshold (send editor get-between-threshold))
-               (send editor get-snip-location snip b1 b2)
-               (define-values (gx gy) (send editor editor-location-to-dc-location
-                                            (unbox b1)
-                                            (unbox b2)))
-               (define x (inexact->exact (floor (+ gx between-threshold 1))))
-               (define y (inexact->exact (floor (+ gy between-threshold 1))))
-               (values x y))))
-          (fw:test:mouse-click 'left x y))
-          
-        (define found-language? #f)
-             
-        (for ([language-choice (in-list language-choices)])
-          (queue-callback/res (λ () (send language-choice focus)))
-          (let loop ([list-item language-choice]
-                     [language-spec in-language-spec])
-            (let* ([name (car language-spec)]
-                   [which 
-                    (queue-callback/res 
-                     (λ ()
-                       (filter (lambda (child)
-                                 (let* ([text (send (send child get-editor) get-text)]
-                                        [matches
-                                         (or (and (regexp? name)
-                                                  (regexp-match name text))
-                                             (and (string? name)
-                                                  (string=? name text)))])
-                                   (and matches
-                                        child)))
-                               (send list-item get-items))))])
-              (unless (null? which)
-                (unless (= 1 (length which))
-                  (error 'set-language-level! "couldn't find language: ~e, double match ~e"
-                         in-language-spec name))
-                (let ([next-item (car which)])
-                  (cond
-                    [(null? (cdr language-spec))
-                     (when (is-a? next-item hierarchical-list-compound-item<%>)
-                       (error 'set-language-level!
-                              "expected no more languages after ~e, but still are, input ~e"
-                              name in-language-spec))
-                     (set! found-language? #t)
-                     (click-on-snip (send next-item get-clickable-snip))]
-                    [else
-                     (unless (is-a? next-item hierarchical-list-compound-item<%>)
-                       (error 'set-language-level!
-                              "expected more languages after ~e, but got to end, input ~e"
-                              name in-language-spec))
-                     (unless (queue-callback/res (λ () (send next-item is-open?)))
-                       (click-on-snip (send next-item get-arrow-snip)))
-                     (loop next-item (cdr language-spec))]))))))
-        
-        (unless found-language?
-          (error 'set-language-level! "couldn't find language: ~e" in-language-spec))
-        
-        (with-handlers ([exn:fail? (lambda (x) (void))])
-          (fw:test:button-push "Show Details"))
-        
-        (fw:test:button-push "Revert to Language Defaults")
-        
-        (when close-dialog?
-          (fw:test:button-push "OK")
-          (let ([new-frame (wait-for-new-frame language-dialog)])
-            (unless (eq? new-frame drs-frame)
-              (error 'set-language-level! 
-                     "didn't get drracket frame back, got: ~s (drs-frame ~s)\n"
-                     new-frame
-                     drs-frame)))))))
-  
-  (define (set-module-language! [close-dialog? #t])
-    (not-on-eventspace-handler-thread 'set-module-language!)
-    (let ([drs-frame (fw:test:get-active-top-level-window)])
-      (fw:test:menu-select "Language" "Choose Language...")
-      (let* ([language-dialog (wait-for-new-frame drs-frame)])
-        (fw:test:set-radio-box-item! #rx"The Racket Language")
-        
-        (with-handlers ([exn:fail? (lambda (x) (void))])
-          (fw:test:button-push "Show Details"))
-        
-        (fw:test:button-push "Revert to Language Defaults")
-        
-        (when close-dialog?
-          (fw:test:button-push "OK")
-          (let ([new-frame (wait-for-new-frame language-dialog)])
-            (unless (eq? new-frame drs-frame)
-              (error 'set-language-level! 
-                     "didn't get drracket frame back, got: ~s (drs-frame ~s)\n"
-                     new-frame
-                     drs-frame)))))))
-  
-  (provide/contract [check-language-level ((or/c string? regexp?) . -> . void?)])
-  ;; checks that the language in the drracket window is set to the given one.
-  ;; clears the definitions, clicks execute and checks the interactions window.
-  (define (check-language-level lang-spec)
-    (not-on-eventspace-handler-thread 'check-language-level!)
-    (let* ([drs-frame (wait-for-drracket-frame)]
-           [interactions (send drs-frame get-interactions-text)]
-           [definitions-canvas (send drs-frame get-definitions-canvas)])
-      (fw:test:new-window definitions-canvas)
-      (fw:test:menu-select "Edit" "Select All")
-      (fw:test:menu-select "Edit" "Delete")
-      (do-execute drs-frame)
-      (let ([lang-line (queue-callback/res
-                        (λ ()
-                          (send interactions get-text
-                                (send interactions line-start-position 1)
-                                (send interactions line-end-position 1))))])
-        (unless (regexp-match lang-spec lang-line)
-          (error 'check-language-level "expected ~s to match ~s"
-                 lang-line lang-spec)))))
-  
-  
-  (define (repl-in-edit-sequence?)
-    (not-on-eventspace-handler-thread 'repl-in-edit-sequence?)
-    (let ([drr (wait-for-drracket-frame)])
-      (queue-callback/res
-       (λ ()
-         (send (send drr get-interactions-text) refresh-delayed?)))))
- 
-  ;; has-error? : frame -> (union #f string)
-  ;; returns the text of an error in the interactions window of the frame or #f if there is none.
-  ;; ensures that frame is front most.
-  (define (has-error? frame)
-    (not-on-eventspace-handler-thread 'repl-in-edit-sequence?)
-    (run-one/sync
-     (lambda ()
-       (verify-drracket-frame-frontmost 'had-error? frame)
-       (let* ([interactions-text (send frame get-interactions-text)]
-              [last-para (send interactions-text last-paragraph)])
-         (unless (>= last-para 2)
-           (error 'has-error? "expected at least 2 paragraphs in interactions window, found ~a"
-                  (+ last-para 1)))
-         (let ([start (send interactions-text paragraph-start-position 2)]
-               [end (send interactions-text paragraph-end-position
-                          (- (send interactions-text last-paragraph) 1))])
-           (send interactions-text split-snip start)
-           (send interactions-text split-snip end)
-           (let loop ([pos start])
-             (cond
-               [(<= end pos) #f]
-               [else
-                (let ([snip (send interactions-text find-snip pos 'after-or-none)])
-                  (cond
-                    [(not snip) #f]
-                    [else
-                     (let ([color (send (send snip get-style) get-foreground)])
-                       (if (and (= 255 (send color red))
-                                (= 0 (send color blue) (send color green)))
-                           
-                           ;; return the text of the entire line containing the red text
-                           (let ([para (send interactions-text position-paragraph pos)])
-                             (unless (exact-nonnegative-integer? para)
-                               (error 'has-error? 
-                                      "got back a bad result from position-paragraph: ~s ~s\n" 
-                                      para
-                                      (list pos (send interactions-text last-position))))
-                             (send interactions-text get-text
-                                   (send interactions-text paragraph-start-position para)
-                                   (send interactions-text paragraph-end-position para)))
-                           
-                           (loop (+ pos (send snip get-count)))))]))])))))))
-
-  (define fetch-output
-    (case-lambda
-      [(frame) (fetch-output frame #f #f)]
-      [(frame _start _end)
-       (not-on-eventspace-handler-thread 'fetch-output)
-       (run-one/sync
-        (lambda ()
-          (verify-drracket-frame-frontmost 'fetch-output frame)
-          (define-values (start end)
-            (if (and _start _end)
-                (values _start _end)
-                (let* ([interactions-text (send frame get-interactions-text)]
-                       [last-para (send interactions-text last-paragraph)])
-                  (unless (>= last-para 2)
-                    (error 'fetch-output 
-                           "expected at least 2 paragraphs in interactions window, found ~a"
-                           (+ last-para 1)))
-                  (values (send interactions-text paragraph-start-position 2)
-                          (send interactions-text paragraph-end-position
-                                (- (send interactions-text last-paragraph) 1))))))
-            (let ([interactions-text (send frame get-interactions-text)])
-              
-              (send interactions-text split-snip start)
-              (send interactions-text split-snip end)
-              
-              (let loop ([snip (send interactions-text find-snip end 'before)]
-                         [strings null])
-                (cond
-                  [(< (send interactions-text get-snip-position snip) start)
-                   (apply string-append strings)]
-                  [else 
-                   (cond
-                     [(is-a? snip string-snip%)
-                      (loop (send snip previous)
-                            (cons (send snip get-text 0 (send snip get-count)) strings))]
-                     [(is-a? snip editor-snip%)
-                      (let ([editor (send snip get-editor)])
-                        (cond
-                          [(is-a? editor pasteboard%)
-                           (loop (send snip previous)
-                                 (cons "<pasteboard>" strings))]
-                          [(is-a? editor text%)
-                           (loop (send snip previous)
-                                 (list* "{embedded \""
-                                        (send editor get-text)
-                                        "\"}"
-                                        strings))]))]
-                     [(is-a? snip image-snip%)
-                      (loop (send snip previous)
-                            (cons (with-handlers ([exn:fail? (lambda (x) "{image}")])
-                                    (format "{~a}" (send snip get-image-name)))
-                                  strings))]
-                     
-                     [;; this test is an approximation of
-                      ;; (is-a? snip drscheme:snip:number-snip%)
-                      (and (method-in-interface? 'get-fraction-view (object-interface snip)))
-                      (loop (send snip previous)
-                            (cons (format "{number ~s ~s ~s}"
-                                          (send snip get-number)
-                                          (send snip get-text 0 (send snip get-count))
-                                          (send snip get-fraction-view))
-                                  strings))]
-                     [;; this test is an approximation of
-                      ;; (is-a? snip pict-snip%) from drracket/private/pict-snip%
-                      (let ([sc (send snip get-snipclass)])
-                        (and sc (regexp-match #rx"pict-snip.rkt" (send sc get-classname))))
-                      (loop (send snip previous)
-                            (cons "{pict-snip}" strings))]
-                     
-                     [else
-                      (loop (send snip previous)
-                            (cons (format "{unknown snip: ~e}\n" snip)
-                                  strings))])])))))]))
-  
-  ;; run-one/sync : (-> A) -> A
-  ;; runs the thunk `f' as a test action, and
-  ;; waits for it to complete. Also propagates
-  ;; exceptions.
-  (define (run-one/sync f)
-    (not-on-eventspace-handler-thread 'run-one/sync)
-    (let ([s (make-semaphore 0)]
-          [raised-exn? #f]
-          [exn #f]
-          [anss #f])
-      (fw:test:run-one
-       (lambda ()
-         (with-handlers ([exn:fail? (lambda (-exn)
-                                      (set! raised-exn? #t)
-                                      (set! exn -exn))])
-           (call-with-values f (lambda x (set! anss x))))
-         (semaphore-post s)))
-      (semaphore-wait s)
-      (if raised-exn?
-          (raise exn)
-          (apply values anss))))
-  
-  ;; this is assumed to not open an windows or anything like that
-  ;; but just to print and return.
-  (define orig-display-handler (error-display-handler))
-  
-  (define (fire-up-drracket-and-run-tests
-           #:use-focus-table? [use-focus-table? #t] 
-           #:prefs [prefs '()]
-           run-test)
-    (on-eventspace-handler-thread 'fire-up-drracket-and-run-tests)
-    (let ()
-      (use-hash-for-prefs fw:preferences:low-level-get-preference
-                          fw:preferences:low-level-put-preferences
-                          fw:preferences:restore-defaults
-                          fw:preferences:set
-                          fw:preferences:default-set?
-                          prefs)
-      
-      (parameterize ([current-command-line-arguments #()])
-        (dynamic-require 'drracket #f))
-      
-      (fw:test:use-focus-table use-focus-table?)
-      
-      (thread (λ () 
-                (let ([orig-display-handler (error-display-handler)])
-                  (uncaught-exception-handler
-                   (λ (x)
-                     (if (exn? x)
-                         (orig-display-handler (exn-message x) x)
-                         (eprintf "uncaught exception ~s\n" x))
-                     (exit 1))))
-                (run-test)
-                (exit)))
-      (yield (make-semaphore 0))))
-  
-  ;; fire-up-separate-drracket-and-run-tests : (-> any) -> any
-  ;; creates a separate custodian, eventspace, namespace, etc to
-  ;; start up a new DrRacket. This has the advantage over fire-up-drracket-and-run-tests
-  ;; that a single test suite can start up DrRacket multiple times, but it has the 
-  ;; disadvantage that there is little sharing between the test suite implementation code and
-  ;; DrRacket, so writing the testing code is more painful
-  ;;
-  ;; the only things shared are mred/mred (and its dependencies).
-  (define (fire-up-separate-drracket-and-run-tests run-test)
-    (define c (make-custodian))
-    (define s (make-semaphore 0))
-    (define orig-ns (current-namespace))
-    (parameterize ([current-custodian c])
-      (parameterize ([exit-handler (λ (v) 
-                                     (semaphore-post s)
-                                     (custodian-shutdown-all c))]
-                     [current-namespace (make-empty-namespace)]
-                     [current-command-line-arguments #()])
-        (parameterize ([current-eventspace (make-eventspace)])
-          (namespace-attach-module orig-ns 'mred/mred)
-          
-          ;; do this now so that dynamically requiring framework
-          ;; exports during the call to 'run-test' is safe
-          (namespace-require 'framework)
-          
-          (queue-callback
-           (λ ()
-             (use-hash-for-prefs (dynamic-require 'framework 'preferences:low-level-get-preference)
-                                 (dynamic-require 'framework 'preferences:low-level-put-preferences)
-                                 (dynamic-require 'framework 'preferences:restore-defaults)
-                                 (dynamic-require 'framework 'preferences:set)
-                                 (dynamic-require 'framework 'preferences:default-set?)
-                                 '())
-             (dynamic-require 'drracket #f)
-             (thread (λ ()
-                       (run-test)
-                       (exit)))
-             (yield (make-semaphore 0)))))))
-    (semaphore-wait s))
-
-  (define (use-hash-for-prefs preferences:low-level-get-preference 
-                              preferences:low-level-put-preferences
-                              preferences:restore-defaults
-                              preferences:set
-                              preferences:default-set?
-                              prefs)
-    ;; change the preferences system so that it doesn't write to 
-    ;; a file; partly to avoid problems of concurrency in drdr
-    ;; but also to make the test suite easier for everyone to run.
-    (let ([prefs-table (make-hash)])
-      (preferences:low-level-put-preferences
-       (λ (names vals)
-         (for ([name (in-list names)]
-               [val (in-list vals)])
-           (hash-set! prefs-table name val))))
-      (preferences:low-level-get-preference 
-       (λ (name [fail (lambda () #f)])
-         (hash-ref prefs-table name fail)))
-      
-      ;; set all preferences to their defaults (some pref values may have
-      ;; been read by this point, but hopefully that won't affect the
-      ;; startup of drracket)
-      (preferences:restore-defaults)
-      
-      ;; initialize some preferences to simulate these
-      ;; being saved already in the user's prefs file 
-      ;; call preferences:set too since the prefs file
-      ;; may have been "read" already at this point
-      (for ([pref (in-list prefs)])
-        (define pref-key (list-ref pref 0))
-        (define pref-val (list-ref pref 1))
-        (define m (regexp-match #rx"^plt:framework-pref:(.*)$" (symbol->string pref-key)))
-        (cond
-          [m
-           (hash-set! prefs-table pref-key pref-val)
-           (define fw-pref-key (string->symbol (list-ref m 1)))
-           (when (preferences:default-set? fw-pref-key)
-             (preferences:set fw-pref-key pref-val))]
-          [else
-           ;; this currently doesn't happen, and it is easy to forget
-           ;; that prefix, so print a message here to remind 
-           (printf "WARNING: setting a preference that isn't set via the framework: ~s\n" 
-                   pref-key)]))))
-  
-(define (not-on-eventspace-handler-thread fn)
-  (when (eq? (current-thread) (eventspace-handler-thread (current-eventspace)))
-    (error fn "expected to be run on some thread other than the eventspace handler thread")))
-
-(define (on-eventspace-handler-thread fn)
-  (unless (eq? (current-thread) (eventspace-handler-thread (current-eventspace)))
-    (error fn "expected to be run on the eventspace handler thread")))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/easter-egg-lib.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/easter-egg-lib.rkt
deleted file mode 100644
index ea34f5545b..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/easter-egg-lib.rkt
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang racket/base
-
-(require (only-in "drracket-test-util.rkt"
-                  fire-up-separate-drracket-and-run-tests
-                  queue-callback/res)
-         racket/date
-         racket/class
-         racket/contract)
-
-(provide 
- (contract-out
-  [start-up-on-day
-   (-> (and/c integer? (between/c 0 12))
-       (and/c integer? (between/c 0 31))
-       string?
-       void?)]
-  [start-up-and-check-car (-> void?)]))
-
-(define (start-up-on-day month day what)
-  (define the-seconds (find-seconds 1 0 0
-                                    day month 
-                                    (date-year (seconds->date (current-seconds)))))
-  (printf "trying ~a, ~a/~a PLTDREASTERSECONDS=~a\n" what month day the-seconds)
-  (unless (putenv "PLTDREASTERSECONDS" (number->string the-seconds))
-    (error 'easter-egg-lib.rkt "putenv failed"))
-  (start-up-and-check-car)
-  
-  ;; start up with (an approximation to) broken image files
-  (unless (putenv "PLTDRBREAKIMAGES" "yes")
-    (error 'easter-egg-lib.rkt "putenv.2 failed"))
-  (printf "trying ~a, ~a/~a PLTDREASTERSECONDS=~a PLTDRBREAKIMAGES=yes\n" what month day the-seconds)
-  (start-up-and-check-car)
-  (environment-variables-set! (current-environment-variables)
-                              #"PLTDRBREAKIMAGES"	 
-                              #f))
-
-(define (start-up-and-check-car)
-  (fire-up-separate-drracket-and-run-tests
-   (λ ()
-     
-     (define-syntax-rule
-       (define/fw x)
-       (define x (dynamic-require 'framework 'x)))
-     
-     (define/fw test:keystroke)
-     (define/fw test:run-one)
-     (define/fw test:use-focus-table)
-     (define/fw test:get-active-top-level-window)
-     (define/fw test:menu-select)
-     (define/fw test:set-radio-box-item!)
-     (define/fw test:button-push)
-     (define current-eventspace (dynamic-require 'racket/gui/base 'current-eventspace))
-     
-     (define (main)
-       (queue-callback/res (λ () (test:use-focus-table #t)))
-       (test:use-focus-table #t)
-       (define drr-frame (wait-for-drracket-frame))
-       (set-module-language! drr-frame)
-       (queue-callback/res (λ () (send (send (send drr-frame get-definitions-text) get-canvas) focus)))
-       (for ([x (in-string "(car 'x)")])
-         (test:keystroke x))
-       (let ([button (queue-callback/res (λ () (send drr-frame get-execute-button)))])
-         (test:run-one (lambda () (send button command))))
-       (wait-for-run-to-finish drr-frame)
-       (define res 
-         (queue-callback/res (λ () (send (send drr-frame get-interactions-text) get-text))))
-       (unless (regexp-match #rx"contract violation.*expected: pair[?]" res)
-         (eprintf "easter-egg-lib.rkt: interactions looks wrong; got: ~s\n" res)))
-     
-     (define (set-module-language! drr-frame)
-       (test:menu-select "Language" "Choose Language...")
-       (define language-dialog (wait-for-new-frame drr-frame))
-       (test:set-radio-box-item! #rx"The Racket Language")
-       
-       (with-handlers ([exn:fail? (lambda (x) (void))])
-         (test:button-push "Show Details"))
-       
-       (test:button-push "Revert to Language Defaults")
-       
-       (test:button-push "OK")
-       (define new-frame (wait-for-new-frame language-dialog))
-       (unless (eq? new-frame drr-frame)
-         (error 'set-module-level! 
-                "didn't get drracket frame back, got: ~s (drr-frame ~s)\n"
-                new-frame
-                drr-frame)))
-     
-     (define (wait-for-run-to-finish drr-frame)
-       (define (run-finished)
-         (send (send drr-frame get-execute-button) is-enabled?))
-       (wait-for-something run-finished))
-     
-     (define (wait-for-drracket-frame)
-       (define (drracket-frame-frontmost)
-         (define active (test:get-active-top-level-window))
-         (and active 
-              (method-in-interface? 'get-execute-button (object-interface active))
-              active))
-       (wait-for-something drracket-frame-frontmost))
-     
-     (define (wait-for-new-frame old-frame)
-       (wait-for-something
-        (λ ()
-          (define active (test:get-active-top-level-window))
-          (and active 
-               (not (eq? active old-frame))
-               active))))
-     
-     (define (wait-for-something thing?)
-       (define total-time-to-wait 20) ;; in seconds
-       (define time-to-wait-in-one-iteration 1/10) ;; also in seconds
-       (let loop ([n (/ total-time-to-wait time-to-wait-in-one-iteration)])
-         (cond
-           [(thing?) => values]
-           [(zero? n)
-            (error 'wait-for-something "~s didn't happen" thing?)]
-           [else
-            (sleep time-to-wait-in-one-iteration)
-            (loop (- n 1))])))
-     
-     (main))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/gui.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/gui.rkt
deleted file mode 100644
index b4709ac1bb..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/gui.rkt
+++ /dev/null
@@ -1,125 +0,0 @@
-#lang racket/base
-
-  (require racket/gui/base
-           racket/class)
-  (provide find-labelled-window 
-           find-labelled-windows
-           whitespace-string=?)
-  
-  ;; whitespace-string=? : string string -> boolean
-  ;; determines if two strings are equal, up to their whitespace.
-  ;; each string is required to have whitespace in the same place,
-  ;; but not necessarily the same kinds or amount.
-  (define (whitespace-string=? string1 string2)
-    (let loop ([i 0]
-               [j 0]
-               [in-whitespace? #t])
-      (cond
-        [(= i (string-length string1)) (only-whitespace? string2 j)]
-        [(= j (string-length string2)) (only-whitespace? string1 i)]
-        [else (let ([c1 (string-ref string1 i)]
-                    [c2 (string-ref string2 j)])
-                (cond
-                  [in-whitespace?
-                   (cond
-                     [(whitespace? c1)
-                      (loop (+ i 1)
-                            j
-                            #t)]
-                     [(whitespace? c2)
-                      (loop i
-                            (+ j 1)
-                            #t)]
-                     [else (loop i j #f)])]
-                  [(and (whitespace? c1)
-                        (whitespace? c2))
-                   (loop (+ i 1)
-                         (+ j 1)
-                         #t)]
-                  [(char=? c1 c2)
-                   (loop (+ i 1)
-                         (+ j 1)
-                         #f)]
-                  [else #f]))])))
-  
-  ;; whitespace? : char -> boolean
-  ;; deteremines if `c' is whitespace
-  (define (whitespace? c)
-    (or (char=? c #\newline)
-        (char=? c #\space)
-        (char=? c #\tab)
-        (char=? c #\return)))
-  
-  ;; only-whitespace? : string number -> boolean
-  ;; returns true if string only contains whitespace, from index `i' onwards
-  (define (only-whitespace? str i)
-    (let loop ([n i])
-      (cond
-        [(= n (string-length str))
-         #t]
-        [(whitespace? (string-ref str n))
-         (loop (+ n 1))]
-        [else #f])))
-  
-  ;; whitespace-string=? tests
-  (module+ test
-    (require rackunit)
-    (check-equal? #t (whitespace-string=? "a" "a"))
-    (check-equal? #f (whitespace-string=? "a" "A"))
-    (check-equal? #f (whitespace-string=? "a" " "))
-    (check-equal? #f (whitespace-string=? " " "A"))
-    (check-equal? #t (whitespace-string=? " " " "))
-    (check-equal? #t (whitespace-string=? " " "  "))
-    (check-equal? #t (whitespace-string=? "  " "  "))
-    (check-equal? #t (whitespace-string=? "  " " "))
-    (check-equal? #t (whitespace-string=? "a a" "a a"))
-    (check-equal? #t (whitespace-string=? "a a" "a  a"))
-    (check-equal? #t (whitespace-string=? "a  a" "a a"))
-    (check-equal? #t (whitespace-string=? " a" "a"))
-    (check-equal? #t (whitespace-string=? "a" " a"))
-    (check-equal? #t (whitespace-string=? "a " "a"))
-    (check-equal? #t (whitespace-string=? "a" "a ")))
-
-  ;;; find-labelled-window : (union ((union #f string) -> window<%>)
-  ;;;                               ((union #f string) (union #f class) -> window<%>)
-  ;;;                               ((union #f string) (union class #f) area-container<%> -> window<%>))
-  ;;;;  may call error, if no control with the label is found
-  (define (find-labelled-window label 
-                                [class #f]
-                                [window (get-top-level-focus-window)]
-                                [failure (λ ()
-                                           (error 'find-labelled-window "no window labelled ~e in ~e~a"
-                                                  label
-                                                  window 
-                                                  (if class
-                                                      (format " matching class ~e" class)
-                                                      "")))])
-    (define windows (find-labelled-windows label class window))
-    (cond
-      [(null? windows) (failure)]
-      [else (car windows)]))
- 
-  (define (find-labelled-windows label [class #f] [window (get-top-level-focus-window)])
-    (unless (or (not label)
-                (string? label))
-      (error 'find-labelled-windows "first argument must be a string or #f, got ~e; other args: ~e ~e"
-             label class window))
-    (unless (or (class? class)
-                (not class))
-      (error 'find-labelled-windows "second argument must be a class or #f, got ~e; other args: ~e ~e"
-             class label window))
-    (unless (is-a? window area-container<%>)
-      (error 'find-labelled-windows "third argument must be a area-container<%>, got ~e; other args: ~e ~e"
-             window label class))
-    (let loop ([window window])
-      (cond
-        [(and (or (not class)
-                  (is-a? window class))
-              (let ([win-label (and (is-a? window window<%>)
-                                    (send window get-label))])
-                (equal? label win-label)))
-         (list window)]
-        [(is-a? window area-container<%>) (apply append (map loop (send window get-children)))]
-        [else '()])))
-  
-  
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/module-lang-test-utils.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/module-lang-test-utils.rkt
deleted file mode 100644
index 1ba6d5f786..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/module-lang-test-utils.rkt
+++ /dev/null
@@ -1,228 +0,0 @@
-#lang racket/base
-(require "drracket-test-util.rkt"
-         framework
-         racket/string
-         (for-syntax racket/base)
-         racket/class)
-
-(provide test t rx run-test 
-         in-here in-here/path write-test-modules)
-
-;; utilities to use with scribble/reader
-(define t string-append)
-(define (rx . strs)
-  (regexp (regexp-replace* #rx" *\n *" (string-append* strs) ".*")))
-
-(define-struct test (definitions   ; string
-                     interactions  ; (union #f string)
-                     result        ; (or/c string regexp)
-                     all?          ; boolean (#t => compare all of the text between the 3rd and n-1-st line)
-                     error-ranges  ; (or/c 'dont-test
-                                   ;       (-> (is-a?/c text)
-                                   ;           (is-a?/c text)
-                                   ;           (or/c #f (listof ...))))
-                                   ;    fn => called with defs & ints, result must match get-error-ranges method's result
-                      line)        ; number or #f: the line number of the test case
-                      
-  #:omit-define-syntaxes)
-
-(define (in-here/path file) (path->string (build-path (find-system-path 'temp-dir) file)))
-(define (in-here file) (format "~s" (in-here/path file)))
-
-(define tests '())
-(define-syntax (test stx)
-  (syntax-case stx ()
-    [(_  args ...)
-     (with-syntax ([line (syntax-line stx)])
-       #'(test/proc line args ...))]))
-(define (test/proc line definitions interactions results [all? #f] #:error-ranges [error-ranges 'dont-test])
-  (set! tests (cons (make-test (if (string? definitions) 
-                                   definitions 
-                                   (format "~s" definitions))
-                               interactions 
-                               results 
-                               all? 
-                               error-ranges
-                               line)
-                    tests)))
-
-(define temp-files '())
-(define init-temp-files void)
-
-(define (write-test-modules* name code)
-  (set! init-temp-files
-        (let ([old init-temp-files])
-          (λ ()
-            (let ([file (build-path (find-system-path 'temp-dir) (format "~a.rkt" name))])
-              (set! temp-files (cons file temp-files))
-              (with-output-to-file file #:exists 'truncate
-                (lambda () (printf "~s\n" code))))
-            (old)))))
-
-(define-syntax write-test-modules
-  (syntax-rules (module)
-    [(_ (module name lang x ...) ...)
-     (begin (write-test-modules* 'name '(module name lang x ...)) ...)]))
-
-(define (single-test test)
-  (let/ec k
-    (clear-definitions drs)
-    (insert-in-definitions drs (test-definitions test))
-    (do-execute drs)
-    
-    (define ints (test-interactions test))
-    
-    (define output-start-paragraph 2)
-    
-    (when ints
-      (let ([after-execute-output
-             (queue-callback/res
-              (λ ()
-                (send interactions-text
-                      get-text
-                      (send interactions-text paragraph-start-position 2)
-                      (send interactions-text paragraph-end-position 2))))])
-        (unless (or (test-all? test) (string=? "> " after-execute-output))
-          (eprintf "FAILED (line ~a): ~a\n        ~a\n        expected no output after execution, got: ~s\n"
-                   (test-line test)
-                   (test-definitions test)
-                   (or (test-interactions test) 'no-interactions)
-                   after-execute-output)
-          (k (void)))
-        (insert-in-interactions drs ints)
-        ;; set to be the paragraph right after the insertion.
-        (set! output-start-paragraph
-              (queue-callback/res
-               (λ () (+ (send interactions-text position-paragraph 
-                              (send interactions-text last-position))
-                        1))))
-        (test:keystroke #\return '(alt))
-        (wait-for-computation drs)))
-    
-    (define text
-      (queue-callback/res
-       (λ ()
-         (define para-before-prompt
-           (- (send interactions-text position-paragraph
-                    (send interactions-text last-position))
-              1))
-         (if (test-all? test)
-             (send interactions-text
-                   get-text
-                   (send interactions-text paragraph-start-position 2)
-                   (send interactions-text paragraph-end-position para-before-prompt))
-             (send interactions-text
-                   get-text
-                   (send interactions-text paragraph-start-position output-start-paragraph)
-                   (send interactions-text paragraph-end-position para-before-prompt))))))
-    (define stacks
-      (queue-callback/res 
-       (λ ()
-         (let loop ([snip (send interactions-text find-first-snip)])
-           (cond
-             [(not snip) '()]
-             [else
-              (cond
-                [(method-in-interface? 'get-stacks (object-interface snip))
-                 (define-values (s1 s2) (send snip get-stacks))
-                 (list* s1 s2 (loop (send snip next)))]
-                [else
-                 (loop (send snip next))])])))))
-    (define output-passed?
-      (let ([r (test-result test)])
-        ((cond [(string? r) string=?]
-               [(regexp? r) regexp-match?]
-               [else 'module-lang-test "bad test value: ~e" r])
-         r text)))
-    (unless output-passed?
-      (eprintf "FAILED (line ~a): ~a\n        ~a\n  expected: ~s\n       got: ~s\n"
-               (test-line test)
-               (test-definitions test)
-               (or (test-interactions test) 'no-interactions)
-               (test-result test)
-               text)
-      (unless (null? stacks)
-        (eprintf "stacks from error message:")
-        (for ([stack (in-list stacks)])
-          (when stack
-            (eprintf "\n----\n")
-            (for ([frame (in-list stack)])
-              (eprintf "  ~s\n" frame))
-            (eprintf "---\n")))))
-    (cond
-      [(eq? (test-error-ranges test) 'dont-test)
-       (void)]
-      [else
-       (let ([error-ranges-expected
-              ((test-error-ranges test) definitions-text interactions-text)])
-         (unless (equal? error-ranges-expected (send interactions-text get-error-ranges))
-           (eprintf "FAILED (line ~a; ranges): ~a\n  expected: ~s\n       got: ~s\n"
-                    (test-line test)
-                    (test-definitions test)
-                    error-ranges-expected
-                    (send interactions-text get-error-ranges))))])))
-
-(define drs 'not-yet-drs-frame)
-(define interactions-text 'not-yet-interactions-text)
-(define definitions-text 'not-yet-definitions-text)
-
-(define (run-test)
-  (set! drs (wait-for-drracket-frame))
-  (set! interactions-text  (send drs get-interactions-text))
-  (set! definitions-text (send drs get-definitions-text))
-  (init-temp-files)
-  (run-use-compiled-file-paths-tests)
-  (set-module-language! #f)
-  (test:set-radio-box-item! "Debugging")
-  (let ([f (queue-callback/res (λ () (test:get-active-top-level-window)))])
-    (test:button-push "OK")
-    (wait-for-new-frame f))
-  (for-each single-test (reverse tests))
-  (clear-definitions drs)
-  (queue-callback/res (λ () (send (send drs get-definitions-text) set-modified #f)))
-  (for ([file temp-files]) 
-    (when (file-exists? file)
-      (delete-file file))))
-
-(define (run-use-compiled-file-paths-tests)
-  (define (setup-dialog/run proc)
-    (set-module-language! #f)
-    (proc)
-    (let ([f (test:get-active-top-level-window)])
-      (test:button-push "OK")
-      (wait-for-new-frame f))
-    (do-execute drs)
-    (fetch-output drs))
-    
-  (define (run-one-test radio-box expected [no-check-expected #f])
-    (let ([got (setup-dialog/run (λ () (test:set-radio-box-item! radio-box)))])
-      (unless (spaces-equal? got (format "~s" expected))
-        (error 'r-u-c-f-p-t "got ~s expected ~s"
-               got
-               (format "~s" expected))))
-    
-    (when no-check-expected
-      (let ([got (setup-dialog/run 
-                  (λ () 
-                    (test:set-radio-box-item! radio-box)
-                    (test:set-check-box! "Populate \"compiled\" directories (for faster loading)" #f)))])
-        (unless (equal? got (format "~s" no-check-expected))
-          (error 'r-u-c-f-p-t.2 "got ~s expected ~s"
-                 got
-                 (format "~s" no-check-expected))))))
-
-  (define (spaces-equal? a b)
-    (equal? (regexp-replace* #rx"[\n\t ]+" a " ")
-            (regexp-replace* #rx"[\n\t ]+" b " ")))
-  
-  (define drs/compiled/et (build-path "compiled" "drracket" "errortrace"))
-  (define drs/compiled (build-path "compiled" "drracket"))
-  (define compiled/et (build-path "compiled" "errortrace"))
-  (define compiled (build-path "compiled"))
-  
-  (clear-definitions drs)
-  (insert-in-definitions drs "#lang scheme\n(use-compiled-file-paths)")
-  (run-one-test "No debugging or profiling" (list drs/compiled compiled) (list compiled))
-  (run-one-test "Debugging" (list drs/compiled/et compiled/et compiled) (list compiled/et compiled))
-  (run-one-test "Debugging and profiling" (list compiled))
-  (run-one-test "Syntactic test suite coverage" (list compiled)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/randomly-click.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/randomly-click.rkt
deleted file mode 100644
index 326fed3e3f..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/randomly-click.rkt
+++ /dev/null
@@ -1,173 +0,0 @@
-#lang scheme/gui
-(require framework)
-(provide go)
-
-(define numButtonsToPush 200)
-(define the-seed (+ 1 (modulo (current-seconds) (- (expt 2 31) 1))))
-(random-seed the-seed)
-
-;;find-all-actions: area -> (listof (-> void))
-(define (find-all-actions area)
-  (cond
-    [(is-a? area area-container<%>)
-     (apply append (map find-all-actions (send area get-children)))]
-    [(and (is-a? area button%)
-          (send area is-enabled?)
-          (send area is-shown?))
-     (list (case-lambda
-             [(x) (format "button ~s" (send area get-label))]
-             [() (test:button-push area)]))]
-    [(and (is-a? area check-box%)
-          (send area is-enabled?))
-     (let ([func
-            (λ (which-way)
-              (case-lambda 
-                [(x) (format "checkbox ~s" (send area get-label))]
-                [() (test:set-check-box! area which-way)]))])
-       (list (func #t) (func #f)))]
-    [(and (is-a? area radio-box%)
-          (send area is-enabled?))
-     (for/list ([i (in-range 0 (send area get-number))])
-       (case-lambda
-         [(x) (format "radiobox, item ~s" (send area get-item-label i))]
-         [() (test:set-radio-box! area i)]))]
-    [else '()]))
-
-;;find-random-button: area -> random element of the buttons in area
-;;return #f if there is no buttons in area
-(define (find-random-action area)
-  (define buttons (find-all-actions area))
-  (cond
-    ;;Area with no buttons
-    [(null? buttons) #f]
-    [else (list-ref buttons (random (length buttons)))]))
-
-;; Trace the path to the area back to a base-frame
-(define (trace-area area base-frame)
-  (cond
-    [(eq? area base-frame)
-     (list base-frame)]
-    [else
-     (append (trace-area (send area get-parent) base-frame) (list area))]
-    ))
-
-;;toy print-label function
-(define (print-label area)
-  (cond
-    [(is-a? area tab-panel%)
-     ;(send area get-item-label (send area get-selection))]
-     (send area get-item-label 0)]
-    [(is-a? area vertical-panel%)
-     "Vert-Panel"]
-    [(is-a? area horizontal-panel%)
-     "Hort-Panel"]
-    [(is-a? area vertical-pane%)
-     "Vert-Pane"]
-    [(is-a? area horizontal-pane%)
-     "Hort-Pane"]
-    [else
-     (send area get-label)]))
-
-(define (g open-dialog)
-  (let ((base-window (test:get-active-top-level-window)))
-    (open-dialog)
-    (wait-for-different-frame base-window)
-    (let loop ([n numButtonsToPush]
-               [actions '()])
-      (cond
-        [(zero? n) 
-         (printf "\n")
-         (exit 0)]
-        [else
-         
-         (printf "~a " n)
-         (when (= 1 (modulo n 10)) (printf "\n"))
-         (flush-output)
-         
-         (let ((window (test:get-active-top-level-window)))
-           (cond
-             ;; Back to base-window is not interesting, Reopen
-             [(eq? base-window window)
-              (open-dialog)
-              (wait-for-different-frame base-window)
-              (loop (- n 1) actions)]
-             
-             [(eq? window #f)
-              (sleep .1)
-              (loop (- n 1) actions)]
-             
-             [else
-              ;; print out the button before the button is pushed
-              ;; Using the toy print-label function
-              ;; because some of the parents may not be sent with get-label e.g. vertical-pane%
-              ;(print (map print-label (trace-area button window)))
-              (let ([action (find-random-action window)])
-                (cond
-                  [action
-                   (with-handlers ((exn:fail? (λ (x) 
-                                                (eprintf "\nExecution fail: transcript of ~a clicking follows with seed ~s\n"
-                                                         (send window get-label)
-                                                         the-seed)
-                                                (apply show-log (cons action actions))
-                                                (raise x))))
-                     ;; pause to make sure all events are flushed from the queue
-                     (let ([s (make-semaphore 0)])
-                       (queue-callback (λ () (semaphore-post s)) #f)
-                       (semaphore-wait s))
-                     ;; do the new thing.
-                     (action))
-                   (loop (- n 1) (cons action actions))]
-                  [else
-                   (eprintf "\nExists/Meets window with no button: Bug? seed ~s\n"
-                            the-seed)
-                   (apply show-log actions)
-                   (error 'randomly-click.rkt "giving up")]))]))]))))
-
-(define (show-log . actions)
-  (for ([action (in-list actions)])
-    (eprintf "   ~a\n" (action 'ignored))))
-
-;; the splash screen is in a separate eventspace so wont' show up.
-(define (wait-for-first-frame)
-  (let loop ()
-    (let ([tlw (test:get-active-top-level-window)])
-      (cond
-        [(not tlw)
-         (sleep 1/20)
-         (loop)]
-        [else tlw]))))
-
-
-(define (wait-for-different-frame win)
-  (let loop ([n 1000])
-    (cond
-      [(zero? n)
-       (error 'wait-for-different-frame "never got that new window, only this one: ~s" win)]
-      [else
-       (let ([tlw (test:get-active-top-level-window)])
-         (when (eq? win tlw)
-           (sleep 1/10)
-           (loop (- n 1))))])))
-
-(define orig-display-handler (error-display-handler))
-
-(define (go which-dialog)
-  (dynamic-require 'drscheme #f)
-  
-  ;; reset the uncaught exception handler to be sure we kill everything (drscheme sets it)
-  (uncaught-exception-handler
-   (λ (x)
-     (if (exn? x)
-         (orig-display-handler (exn-message x) x)
-         (eprintf "uncaught exception ~s\n" x))
-     (exit 1)))
-  
-  (void
-   (thread
-    (λ ()
-      (define drs (wait-for-first-frame))
-      (case which-dialog
-        [(language-dialog)
-         (g (λ () (test:menu-select "Language" "Choose Language...")))]
-        [(preferences-dialog)
-         (g (λ () (preferences:show-dialog)))])))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/repl-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/repl-test.rkt
deleted file mode 100644
index 94c315fc64..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/repl-test.rkt
+++ /dev/null
@@ -1,1453 +0,0 @@
-#lang racket
-
-;; NOTES: 
-;;  - (expt 3 #f) is likely to never be optimized, 
-;;    making the stack traces produced from it predictable
-
-#|
-
-This produces an ACK message
-
-#lang scheme
-(require scheme/sandbox)
-(make-evaluator '(file "/tmp/foo.rkt"))
-
-|#
-
-(require "drracket-test-util.rkt"
-         mred
-         framework)
-
-(provide/contract [run-test (-> (listof (or/c 'raw 'debug 'debug/profile 'misc)) any)])
-
-(define-struct loc (line col offset))
-;; loc = (make-loc number number number)
-;; all numbers in loc structs start at zero.
-
-(define-struct test 
-  (program
-   ;; : (union 
-   ;;    string 
-   ;;    'fraction-sum
-   ;;    (listof
-   ;;      (union string?  // typed in
-   ;;             'left    // left arrow key
-   ;;             (list string? string?)))) // menu item select
-   
-   
-   answer ;; : answer
-   ;; the answers for the various modes of the test, specifically:
-   ;;   with debugging enabled: execute, load with different filename, load with same filename
-   ;;   as in ordinary racket: execute, load with different filename, load with same filename
-   
-   source-location ;; (or/c 'interactions 'definitions (cons number number))
-   
-   breaking-test? ;; : boolean
-   
-   ;; setup is called before the test case is run.
-   setup ;; : -> void
-   ;; teardown is called after the test case is complete.
-   teardown ;; : -> void
-   ))
-
-(define-struct answer (debug-execute debug-load-fn debug-load raw-execute raw-load-fn raw-load))
-
-(define-syntax (mktest stx)
-  (syntax-case stx ()
-    [(_ program (a b c d e f) di breaking-test?)
-     #'(make-test program (make-answer a b c d e f) di breaking-test? void void)]
-    [(_ program (a b c d e f) di breaking-test? setup teardown)
-     #'(make-test program (make-answer a b c d e f) di breaking-test? setup teardown)]))
-
-(define syntax-regexp-prefix
-  (string-append
-   (regexp-quote "#<syntax:")
-   ".*"
-   (regexp-quote "tests/drracket/repl-test-tmp")
-   "3?"
-   (regexp-quote ".rkt")))
-
-
-(define (to-strings . args)
-  (apply string-append (map (λ (x) (format "~s\n" x)) args)))
-
-(define (add-load-handler-context str)
-  (regexp
-   (string-append (regexp-quote (string-append 
-                                 backtrace-image-string
-                                 " "
-                                 file-image-string
-                                 " .*rkt:"))
-                  "[0-9]+:[0-9]+: "
-                  (regexp-quote str))))
-
-(define test-data
-  (list
-   ;; basic tests
-   (mktest "1"
-           ("1"
-            "1"
-            "1"
-            "1"
-            "1"
-            "1")
-           'interactions
-           #f)
-   
-   (mktest "\"a\""
-           ("\"a\""
-            "\"a\""
-            "\"a\""
-            "\"a\""
-            "\"a\""
-            "\"a\"")
-           'interactions
-           #f)
-   
-   (mktest "1 2"
-           ("1\n2"
-            "2"
-            "2"
-            "1\n2"
-            "2"
-            "2")
-           'interactions
-           #f)
-   
-   (mktest "\"a\" \"b\""
-           ("\"a\"\n\"b\""
-            "\"b\""
-            "\"b\""
-            "\"a\"\n\"b\""
-            "\"b\""
-            "\"b\"")
-           'interactions
-           #f)
-   
-   (mktest 
-    "("
-    ("{stop-22x22.png} read: expected a `)' to close `('"
-     "{stop-multi.png} {stop-22x22.png} read: expected a `)' to close `('"
-     "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: read: expected a `)' to close `('"
-     "{stop-22x22.png} read: expected a `)' to close `('"
-     "{stop-22x22.png} read: expected a `)' to close `('"
-     "{stop-22x22.png} repl-test-tmp3.rkt:1:0: read: expected a `)' to close `('")
-    'definitions
-    #f)
-   
-   (mktest "."
-           ("{stop-22x22.png} read: illegal use of `.'"
-            "{stop-multi.png} {stop-22x22.png} read: illegal use of `.'"
-            "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: read: illegal use of `.'"
-            "{stop-22x22.png} read: illegal use of `.'"
-            "{stop-22x22.png} read: illegal use of `.'"
-            "{stop-22x22.png} repl-test-tmp3.rkt:1:0: read: illegal use of `.'")
-           'definitions
-           #f)
-   
-   (mktest "(lambda ())"
-           ("{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} repl-test-tmp3.rkt:1:0: lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} repl-test-tmp3.rkt:1:0: lambda: bad syntax in: (lambda ())")
-           'definitions
-           #f)
-   
-   ;; make sure only a single syntax error occurs when in nested begin situation
-   (mktest "(begin (lambda ()) (lambda ()))"
-           ("{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} repl-test-tmp3.rkt:1:7: lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} repl-test-tmp3.rkt:1:7: lambda: bad syntax in: (lambda ())")
-           'definitions
-           #f)
-   
-   (mktest "xx"
-           (#rx"{stop-multi.png} {stop-22x22.png} xx:.*cannot reference undefined identifier"
-            #rx"{stop-multi.png} {stop-22x22.png} xx:.*cannot reference undefined identifier"
-            #rx"{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: xx:.*cannot reference undefined identifier"
-            #rx"xx:.*cannot reference undefined identifier"
-            #rx"xx:.*cannot reference undefined identifier"
-            #rx"xx:.*cannot reference undefined identifier")
-           'definitions
-           #f)
-   
-   (mktest "(raise 1)"
-           ("uncaught exception: 1"
-            "uncaught exception: 1"
-            "uncaught exception: 1"
-            "uncaught exception: 1"
-            "uncaught exception: 1"
-            "uncaught exception: 1")
-           'interactions
-           #f)
-   
-   (mktest "(raise #f)"
-           ("uncaught exception: #f"
-            "uncaught exception: #f"
-            "uncaught exception: #f"
-            "uncaught exception: #f"
-            "uncaught exception: #f"
-            "uncaught exception: #f")
-           'interactions
-           #f)
-   
-   (mktest "(values 1 2)"
-           ("1\n2"
-            "1\n2"
-            "1\n2"
-            "1\n2"
-            "1\n2"
-            "1\n2")
-           'interactions
-           #f)
-   
-   (mktest "(list 1 2)"
-           ("(1 2)"
-            "(1 2)"
-            "(1 2)"
-            "(1 2)"
-            "(1 2)"
-            "(1 2)")
-           'interactions
-           #f)
-   
-   (mktest "(parameterize ([print-struct #t])(define-struct s (x) (make-inspector))(printf \"~s\\n\" (make-s 1)))"
-           ("#(struct:s 1)"
-            "#(struct:s 1)"
-            "#(struct:s 1)"
-            "#(struct:s 1)"
-            "#(struct:s 1)"
-            "#(struct:s 1)")
-           'interactions
-           #f)
-   
-   ;; top-level semantics test
-   (mktest "(define (f) (+ 1 1)) (define + -) (f)"
-           (#rx"define-values:.*cannot change constant.*: \\+"
-            #rx"define-values:.*cannot change constant.*: \\+"
-            #rx"define-values:.*cannot change constant.*: \\+"
-            #rx"define-values:.*cannot change constant.*: \\+"
-            #rx"define-values:.*cannot change constant.*: \\+"
-            #rx"define-values:.*cannot change constant.*: \\+")
-           'interactions
-           #f)
-   
-   (mktest "(begin (define-struct a ()) (define-struct (b a) ()))"
-           (""
-            ""
-            ""
-            ""
-            ""
-            "")
-           'interactions
-           #f)
-   
-   (mktest "(begin (values) 1)"
-           ("1"
-            "1"
-            "1"
-            "1"
-            "1"
-            "1")
-           'interactions
-           #f)
-   
-   (mktest "(begin xx (printf \"hi\\n\"))"
-           (#rx"{stop-multi.png} {stop-22x22.png} xx:.*cannot reference undefined identifier"
-            #rx"{stop-multi.png} {stop-22x22.png} xx:.*cannot reference undefined identifier"
-            #rx"{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:7: xx:.*cannot reference undefined identifier"
-            #rx"xx:.*cannot reference undefined identifier"
-            #rx"xx:.*cannot reference undefined identifier"
-            #rx"xx:.*cannot reference undefined identifier")
-           'definitions
-           #f)
-   
-   (mktest (string-append
-            "(module m mzscheme (provide e) (define e #'1))\n"
-            "(module n mzscheme (require-for-syntax 'm) (provide s) (define-syntax (s stx) e))\n"
-            "(require 'n)\n"
-            "s")
-           
-           (#rx"{stop-22x22.png} [?]: literal data is not allowed.*no #%datum syntax transformer is bound in: 1"
-            #rx"{stop-22x22.png} [?]: literal data is not allowed.*no #%datum syntax transformer is bound in: 1"
-            #rx"{stop-22x22.png} repl-test-tmp3.rkt:1:43: [?]: literal data is not allowed.*no #%datum syntax transformer is bound in: 1"
-            #rx"{stop-22x22.png} [?]: literal data is not allowed.*no #%datum syntax transformer is bound in: 1"
-            #rx"{stop-22x22.png} [?]: literal data is not allowed.*no #%datum syntax transformer is bound in: 1"
-            #rx"{stop-22x22.png} repl-test-tmp3.rkt:1:43: [?]: literal data is not allowed.*no #%datum syntax transformer is bound in: 1")
-           'definitions
-           #f)
-   
-   
-   ;; leading comment test
-   (mktest "#!/bin/sh\n1"
-           ("1"
-            "1"
-            "1"
-            "1"
-            "1"
-            "1")
-           'interactions
-           #f)
-   
-   (mktest "#!/bin/sh\nxx"
-           (#rx"{stop-multi.png} {stop-22x22.png} xx:.*cannot reference undefined identifier"
-            #rx"{stop-multi.png} {stop-22x22.png} xx:.*cannot reference undefined identifier"
-            #rx"{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:2:0: xx:.*cannot reference undefined identifier"
-            #rx"xx:.*cannot reference undefined identifier"
-            #rx"xx:.*cannot reference undefined identifier"
-            #rx"xx:.*cannot reference undefined identifier")
-           'definitions
-           #f)
-   
-   ;; eval tests
-   
-   (mktest "    (eval '(values 1 2))"
-           ("1\n2"
-            "1\n2"
-            "1\n2"
-            "1\n2"
-            "1\n2"
-            "1\n2")
-           'interactions
-           #f)
-   
-   (mktest "    (eval '(list 1 2))"
-           ("(1 2)"
-            "(1 2)"
-            "(1 2)"
-            "(1 2)"
-            "(1 2)"
-            "(1 2)")
-           'interactions
-           #f)
-   
-   (mktest "    (eval '(lambda ()))"
-           ("lambda: bad syntax in: (lambda ())"
-            "lambda: bad syntax in: (lambda ())"
-            "lambda: bad syntax in: (lambda ())"
-            "lambda: bad syntax in: (lambda ())"
-            "lambda: bad syntax in: (lambda ())"
-            "lambda: bad syntax in: (lambda ())")
-           'interactions
-           #f)
-   
-   (mktest "    (read (open-input-string \".\"))"
-           ("{stop-multi.png} read: illegal use of `.'"
-            "{stop-multi.png} read: illegal use of `.'"
-            "{stop-multi.png} read: illegal use of `.'"
-            "read: illegal use of `.'"
-            "read: illegal use of `.'"
-            "read: illegal use of `.'")
-           'interactions
-           #f)
-   
-   (mktest "    (eval 'x)"
-           (#rx"{stop-multi.png} {stop-22x22.png} x:.*cannot reference undefined identifier"
-            #rx"{stop-multi.png} {stop-22x22.png} x:.*cannot reference undefined identifier"
-            #rx"{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:4: x:.*cannot reference undefined identifier"
-            #rx"x:.*cannot reference undefined identifier"
-            #rx"x:.*cannot reference undefined identifier"
-            #rx"x:.*cannot reference undefined identifier")
-           'definitions
-           #f)
-   
-   (mktest "(eval (box 1))"
-           ("#&1"
-            "#&1"
-            "#&1"
-            "#&1"
-            "#&1"
-            "#&1")
-           'interactions
-           #f)
-   
-   (mktest "(eval '(box 1))"
-           ("#&1"
-            "#&1"
-            "#&1"
-            "#&1"
-            "#&1"
-            "#&1")
-           'interactions
-           #f)
-   
-   ; printer setup test
-   (mktest "(expt 3 (void))"
-           (#rx"{stop-multi.png} {stop-22x22.png} expt: contract violation.*given: #<void>"
-            #rx"{stop-multi.png} {stop-22x22.png} expt: contract violation.*given: #<void>"
-            #rx"{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0: expt: contract violation.*given: #<void>"
-            #rx"expt: contract violation.*given: #<void>"
-            #rx"expt: contract violation.*given: #<void>"
-            #rx"expt: contract violation.*given: #<void>")
-           'definitions
-           #f)
-   
-   ;; error in the middle
-   (mktest "1 2 ( 3 4"
-           ("1\n2\n{stop-22x22.png} read: expected a `)' to close `('"
-            "{stop-multi.png} {stop-22x22.png} read: expected a `)' to close `('"
-            "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:4: read: expected a `)' to close `('"
-            "1\n2\n{stop-22x22.png} read: expected a `)' to close `('"
-            "{stop-22x22.png} read: expected a `)' to close `('"
-            "{stop-22x22.png} repl-test-tmp3.rkt:1:4: read: expected a `)' to close `('")
-           'definitions
-           #f)
-   
-   (mktest "1 2 . 3 4"
-           ("1\n2\n{stop-22x22.png} read: illegal use of `.'"
-            "{stop-multi.png} {stop-22x22.png} read: illegal use of `.'"
-            "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:4: read: illegal use of `.'"
-            "1\n2\n{stop-22x22.png} read: illegal use of `.'"
-            "{stop-22x22.png} read: illegal use of `.'"
-            "{stop-22x22.png} repl-test-tmp3.rkt:1:4: read: illegal use of `.'")
-           'definitions
-           #f)
-   
-   (mktest "1 2 (lambda ()) 3 4"
-           ("1\n2\n{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} repl-test-tmp3.rkt:1:4: lambda: bad syntax in: (lambda ())"
-            "1\n2\n{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} lambda: bad syntax in: (lambda ())"
-            "{stop-22x22.png} repl-test-tmp3.rkt:1:4: lambda: bad syntax in: (lambda ())")
-           'definitions
-           #f)
-   
-   (mktest "1 2 x 3 4"
-           (#rx"1\n2\n{stop-multi.png} {stop-22x22.png} x:.*cannot reference undefined identifier"
-            #rx"{stop-multi.png} {stop-22x22.png} x:.*cannot reference undefined identifier"
-            #rx"{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:4: x:.*cannot reference undefined identifier"
-            #rx"1\n2\nx:.*cannot reference undefined identifier"
-            #rx".*cannot reference undefined identifier"
-            #rx".*cannot reference undefined identifier")
-           'definitions
-           #f)
-   
-   (mktest "1 2 (raise 1) 3 4"
-           ("1\n2\nuncaught exception: 1"
-            "uncaught exception: 1"
-            "uncaught exception: 1"
-            "1\n2\nuncaught exception: 1"
-            "uncaught exception: 1"
-            "uncaught exception: 1")
-           'interactions
-           #f)
-   
-   (mktest "1 2 (raise #f) 3 4"
-           ("1\n2\nuncaught exception: #f"
-            "uncaught exception: #f"
-            "uncaught exception: #f"
-            "1\n2\nuncaught exception: #f"
-            "uncaught exception: #f"
-            "uncaught exception: #f")
-           'interactions
-           #f)
-   
-   (mktest "(require lang/htdp-beginner)\n(cond [1 2 3 4])"
-           ("{stop-22x22.png} cond: expected a clause with a question and an answer, but found a clause with 4 parts in:\n  1\n  2\n  3\n  4"
-            "{stop-22x22.png} cond: expected a clause with a question and an answer, but found a clause with 4 parts in:\n  1\n  2\n  3\n  4"
-            "{stop-22x22.png} repl-test-tmp3.rkt:2:7: cond: expected a clause with a question and an answer, but found a clause with 4 parts in:\n  1\n  2\n  3\n  4"
-            "{stop-22x22.png} cond: expected a clause with a question and an answer, but found a clause with 4 parts in:\n  1\n  2\n  3\n  4"
-            "{stop-22x22.png} cond: expected a clause with a question and an answer, but found a clause with 4 parts in:\n  1\n  2\n  3\n  4"
-            "{stop-22x22.png} repl-test-tmp3.rkt:2:7: cond: expected a clause with a question and an answer, but found a clause with 4 parts in:\n  1\n  2\n  3\n  4")
-           'definitions
-           #f)
-   
-   ;; error across separate files
-   (mktest
-    "(load \"repl-test-tmp2.rkt\") (define (g) (+ 1 (expt 3 #f))) (f g)"
-    (#rx"{stop-multi.png} {stop-22x22.png} expt: contract violation.*given: #f"
-     #rx"{stop-multi.png} {stop-22x22.png} expt: contract violation.*given: #f"
-     #rx"{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:45: expt: contract violation.*given: #f"
-     #rx"{stop-multi.png} {stop-22x22.png} expt: contract violation.*given: #f"
-     #rx"{stop-multi.png} {stop-22x22.png} expt: contract violation.*given: #f"
-     #rx"{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:28: expt: contract violation.*given: #f")
-    'definitions
-    #f
-    (λ ()
-      (call-with-output-file (build-path tmp-load-directory "repl-test-tmp2.rkt")
-        (lambda (port)
-          (write '(define (f t) (+ 1 (t)))
-                 port))
-        #:exists 'truncate))
-    (λ () (delete-file (build-path tmp-load-directory "repl-test-tmp2.rkt"))))
-   
-   ;; new namespace test
-   (mktest "(current-namespace (make-namespace))\nif"
-           ("{stop-22x22.png} if: bad syntax in: if"
-            "{stop-22x22.png} if: bad syntax in: if"
-            "{stop-22x22.png} repl-test-tmp3.rkt:2:0: if: bad syntax in: if"
-            "{stop-22x22.png} if: bad syntax in: if"
-            "{stop-22x22.png} if: bad syntax in: if"
-            "{stop-22x22.png} repl-test-tmp3.rkt:2:0: if: bad syntax in: if")
-           'definitions
-           #f)
-   
-   (mktest "(current-namespace (make-namespace 'empty))\nif"
-           ("{stop-22x22.png} #%top-interaction: unbound identifier;\n also, no #%app syntax transformer is bound in: #%top-interaction"
-            "{stop-22x22.png} #%top-interaction: unbound identifier;\n also, no #%app syntax transformer is bound in: #%top-interaction"
-            "{stop-22x22.png} repl-test-tmp3.rkt:2:0: #%top-interaction: unbound identifier;\n also, no #%app syntax transformer is bound in: #%top-interaction"
-            "{stop-22x22.png} #%top-interaction: unbound identifier;\n also, no #%app syntax transformer is bound in: #%top-interaction"
-            "{stop-22x22.png} #%top-interaction: unbound identifier;\n also, no #%app syntax transformer is bound in: #%top-interaction"
-            "{stop-22x22.png} repl-test-tmp3.rkt:2:0: #%top-interaction: unbound identifier;\n also, no #%app syntax transformer is bound in: #%top-interaction")
-           'definitions
-           #f)
-   
-   ;; macro tests
-   (mktest "(define-syntax (c stx) (syntax-case stx () [(_ p q r) (syntax (+ p q r))]))"
-           (""
-            ""
-            ""
-            ""
-            ""
-            "")
-           'interactions
-           #f)
-
-   ;; error escape handler test
-   (mktest
-    (string-append "(let ([old (error-escape-handler)])\n"
-                   "(+ (let/ec k\n"
-                   "(dynamic-wind\n"
-                   "(lambda () (error-escape-handler (lambda () (k 5))))\n"
-                   "(lambda () (expt 3 #f))\n"
-                   "(lambda () (error-escape-handler old))))\n"
-                   "10))")
-    (#rx"{stop-multi.png} {stop-22x22.png} expt: contract violation.*given: #f\n15"
-     #rx"{stop-multi.png} {stop-22x22.png} expt: contract violation.*given: #f\n15"
-     #rx"{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:5:19: expt: contract violation.*given: #f\n15"
-     #rx"expt: contract violation.*given: #f\n15"
-     #rx"expt: contract violation.*given: #f\n15"
-     #rx"expt: contract violation.*given: #f\n15")
-    'definitions
-    #f)
-   
-   ; fraction snip test
-   ;; this test depends on the state of the 'framework:fraction-snip-style preference
-   ;; make sure this preference is set to the default when running this test.
-   (mktest 'fraction-sum
-           ("{number 5/6 \"5/6\" mixed}"
-            "{number 5/6 \"5/6\" mixed}"
-            "{number 5/6 \"5/6\" mixed}"
-            "{number 5/6 \"5/6\" mixed}"
-            "{number 5/6 \"5/6\" mixed}"
-            "{number 5/6 \"5/6\" mixed}")
-           'interactions
-           #f)
-   
-   ;; should produce a syntax object with a turn-down triangle.
-   (mktest "(write (list (syntax x)))" 
-           (#rx"({embedded \".#<syntax:.*repl-test-tmp.rkt:1:21.*>\"})"
-            #rx"({embedded \".#<syntax:.*repl-test-tmp.rkt:1:21.*>\"})"
-            #rx"({embedded \".#<syntax:.*repl-test-tmp3.rkt:1:21.*>\"})"
-            #rx"({embedded \".#<syntax:.*repl-test-tmp.rkt:1:21.*>\"})"
-            #rx"({embedded \".#<syntax:.*repl-test-tmp.rkt:1:21.*>\"})"
-            #rx"({embedded \".#<syntax:.*repl-test-tmp3.rkt:1:21.*>\"})")
-           'interactions
-           #f)
-
-   ;; make sure syntax objects only go into good ports
-   (mktest (string-append
-            "(define-syntax (foo stx)"
-            " (with-handlers ([exn:fail? (lambda (x) #'10)])"
-            " (syntax-local-value #'foot))) (foo)")
-           ("10"
-            "10"
-            "10"
-            "10"
-            "10"
-            "10")
-           'interactions
-           #f)
-   
-   ;; make sure syntax objects don't go into bad ports
-   (mktest "(parameterize ([current-output-port (open-output-string)]) (write #'1))"
-           (""
-            ""
-            ""
-            ""
-            ""
-            "")
-           'interactions
-           #f)
-   
-   (mktest (string-append
-            "(parameterize ([current-output-port (open-output-string)])"
-            " (fprintf (current-error-port) \"~e\" #'foot))")
-           (#rx"#<syntax:.*repl-test-tmp.rkt:1:96.*>"
-            #rx"#<syntax:.*repl-test-tmp.rkt:1:96.*>"
-            #rx"#<syntax:.*repl-test-tmp3.rkt:1:96.*>"
-            #rx"#<syntax:.*repl-test-tmp.rkt:1:96.*>"
-            #rx"#<syntax:.*repl-test-tmp.rkt:1:96.*>"
-            #rx"#<syntax:.*repl-test-tmp3.rkt:1:96.*>")
-           'interactions
-           #f)
-   
-   
-   (mktest "(write-special 1)"
-           ("1#t"
-            "1#t"
-            "1#t"
-            "1#t"
-            "1#t"
-            "1#t")
-           'interactions
-           #f)
-   
-   (mktest
-    ;; the begin/void combo is to make sure that no value printout
-    ;; comes and messes up the source location for the error.
-    (string-append
-     "(define s (make-semaphore 0))\n(queue-callback\n"
-     "(lambda ()\n"
-     "(dynamic-wind\n"
-     "void\n"
-     "(lambda () (expt 3 #f))\n"
-     "(lambda () (semaphore-post s)))))\n"
-     "(begin (yield s) (void))")
-    (#rx"expt: contract violation.*given: #f"
-     #rx"expt: contract violation.*given: #f"
-     #rx"expt: contract violation.*given: #f"
-     #rx"expt: contract violation.*given: #f"
-     #rx"expt: contract violation.*given: #f"
-     #rx"expt: contract violation.*given: #f")
-    'definitions
-    #f)
-   
-   
-   ;; breaking tests
-   (mktest "(semaphore-wait (make-semaphore 0))"
-           (#rx"user break"
-            #rx"user break"
-            #rx"user break"
-            #rx"user break"
-            #rx"user break"
-            #rx"user break")
-           'dont-care
-           #t)
-   
-   (mktest "(let l()(l))"
-           (#rx"user break"
-            #rx"user break"
-            #rx"user break"
-            #rx"user break"
-            #rx"user break"
-            #rx"user break")
-           'dont-care
-           #t)
-   
-   ;; continuation tests
-   (mktest "(define k (call/cc (lambda (x) x)))\n(k 17)\nk"
-           ("17"
-            "17"
-            "17"
-            "17"
-            "17"
-            "17")
-           'interactions
-           #f)
-   
-   (mktest "(define v (vector (call/cc (lambda (x) x))))\n((vector-ref v 0) 2)\nv"
-           ("#(2)"
-            "#(2)"
-            "#(2)"
-            "#(2)"
-            "#(2)"
-            "#(2)")
-           'interactions
-           #f)
-   
-   (mktest "(define v (vector (eval '(call/cc (lambda (x) x)))))\n((vector-ref v 0) 2)\nv"
-           ("#(2)"
-            "#(2)"
-            "#(2)"
-            "#(2)"
-            "#(2)"
-            "#(2)")
-           'interactions
-           #f)
-   
-   (mktest "(define x 1)\n((λ (x y) y) (set! x (call/cc (lambda (x) x)))\n(x 3))"
-           (#rx"{stop-multi.png} {stop-22x22.png} application:.*given: 3"
-            #rx"{stop-multi.png} {stop-22x22.png} application:.*given: 3"
-            #rx"{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:3:13: application:.*given: 3"
-            #rx"application:.*given: 3"
-            #rx"application:.*given: 3"
-            #rx"application:.*given: 3")
-           'definitions
-           #f)
-   
-   ;; top-level & continuation interaction test
-   (mktest "(begin (define k (call/cc (λ (x) x)))\n(define x 'wrong))\n(set! x 'right)\n(k 1)\nx"
-           ("right"
-            "right"
-            "right"
-            "right"
-            "right"
-            "right")
-           'interactions
-           #f)
-   
-   (mktest (format "~s"
-                   '(call-with-continuation-prompt
-                     (lambda ()
-                       (eval '(begin (abort-current-continuation
-                                      (default-continuation-prompt-tag)
-                                      1 2 3)
-                                     10)))
-                     (default-continuation-prompt-tag)
-                     list))
-           ("(1 2 3)"
-            "(1 2 3)"
-            "(1 2 3)"
-            "(1 2 3)"
-            "(1 2 3)"
-            "(1 2 3)")
-           'interactions
-           #f)
-   
-   (mktest "(new snip%)"
-           ("{unknown snip: (object:snip% ...)}\n"
-            "{unknown snip: (object:snip% ...)}\n"
-            "{unknown snip: (object:snip% ...)}\n"
-            "{unknown snip: (object:snip% ...)}\n"
-            "{unknown snip: (object:snip% ...)}\n"
-            "{unknown snip: (object:snip% ...)}\n")
-           'interactions
-           #f)
-
-   ;; graphical lambda tests
-   (mktest (list "((" '("Insert" "Insert λ") "(x) x) 1)")
-           ("1"
-            "1"
-            "1"
-            "1"
-            "1"
-            "1")
-           'interactions
-           #f)
-   
-   (mktest (list "(" '("Insert" "Insert λ") "())")
-           
-           ("{stop-22x22.png} λ: bad syntax in: (λ ())"
-            "{stop-22x22.png} λ: bad syntax in: (λ ())"
-            "{stop-22x22.png} repl-test-tmp3.rkt:1:0: λ: bad syntax in: (λ ())"
-            "{stop-22x22.png} λ: bad syntax in: (λ ())"
-            "{stop-22x22.png} λ: bad syntax in: (λ ())"
-            "{stop-22x22.png} repl-test-tmp3.rkt:1:0: λ: bad syntax in: (λ ())")
-           'definitions
-           #f)
-   
-   ;; thread tests
-   (mktest "(begin (thread (lambda () x)) (sleep 1/10))"
-           (#rx"{stop-multi.png} {stop-22x22.png} x:.*cannot reference undefined identifier"
-            #rx"{stop-multi.png} {stop-22x22.png} x:.*cannot reference undefined identifier"
-            (regexp
-             (string-append "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:26:"
-                            " x:.*cannot reference undefined identifier"))
-            #rx"x:.*cannot reference undefined identifier"
-            #rx"x:.*cannot reference undefined identifier"
-            #rx"x:.*cannot reference undefined identifier")
-           'definitions
-           #f)
-   
-   ;; brought down from above for comparison
-   (mktest
-    "xx"
-    (#rx"{stop-multi.png} {stop-22x22.png} xx:.*cannot reference undefined identifier"
-     #rx"{stop-multi.png} {stop-22x22.png} xx:.*cannot reference undefined identifier"
-     (regexp (string-append "{stop-multi.png} {stop-22x22.png} repl-test-tmp3.rkt:1:0:"
-                            " xx:.*cannot reference undefined identifier"))
-     #rx"xx:.*cannot reference undefined identifier"
-     #rx"xx:.*cannot reference undefined identifier"
-     #rx"xx:.*cannot reference undefined identifier")
-    'definitions
-    #f)
-
-   ;; setup of the namespaces for pict printing (from slideshow)
-
-   (mktest "(require texpict/utils)(disk 3)"
-           ("{pict-snip}"
-            "{pict-snip}"
-            "{pict-snip}"
-            "{pict-snip}"
-            "{pict-snip}"
-            "{pict-snip}")
-           'interactions
-           #f)
-   
-   ;; this test is kind of hokey in our current, module-based world
-   ;; we get images instead of snips because the image conversion code
-   ;; is in a library that's shared with the user, whereas the pict
-   ;; library isn't (I believe)
-   (mktest (to-strings
-            '(require texpict/utils)
-            '(let ()
-               (current-namespace (make-namespace))
-               (namespace-set-variable-value! 'd (disk 3)))
-            'd)
-           ("{image}"
-            "{image}"
-            "{image}"
-            "{image}"
-            "{image}"
-            "{image}")
-           'interactions
-           #f)
-   
-   (mktest (to-strings
-            '(let ([on (current-namespace)]
-                   [n ((current-module-name-resolver) 'mred #f #f #t)])
-               (current-namespace (make-namespace))
-               (namespace-attach-module on n))
-            '(require texpict/utils)
-            '(disk 3))
-           ("{pict-snip}"
-            "{pict-snip}"
-            "{pict-snip}"
-            "{pict-snip}"
-            "{pict-snip}"
-            "{pict-snip}")
-           'interactions
-           #f)
-
-   (mktest (string-append
-            "(require mzlib/pretty)"
-            "(pretty-print-print-hook (lambda x (expt 3 #f)))"
-            "(list 1 2 3)")
-           ("(1 2 3)"
-            "(1 2 3)"
-            "(1 2 3)"
-            "(1 2 3)"
-            "(1 2 3)"
-            "(1 2 3)")
-           'interactions
-           #f)
-   
-   (mktest (format "~s\n~s"
-                   `(require scheme/pretty)
-                   `(parameterize ((pretty-print-exact-as-decimal #t)) (display 1/4)))
-           ("1/4"
-            "1/4"
-            "1/4"
-            "1/4"
-            "1/4"
-            "1/4")
-           'interactions
-           #f)
-   
-   (mktest
-    (string-append
-     "(define p (open-output-string))\n"
-     "(parameterize ([current-error-port p])\n"
-     "(dynamic-wind\n"
-     "void\n"
-     "(lambda ()\n"
-     "((error-display-handler)\n"
-     "\"x\"\n"
-     "(with-handlers ((void values)) (eval '(lambda ())))))\n"
-     "(lambda ()\n"
-     "(display (get-output-string p)))))\n")
-    ("x in: (lambda ())"
-     "x in: (lambda ())"
-     "x in: (lambda ())"
-     "x in: (lambda ())"
-     "x in: (lambda ())"
-     "x in: (lambda ())")
-    'interactions
-    #f)
-  
-   (mktest
-    (format "~s" '(+ 1 (+ 1 (abort-current-continuation
-                             (default-continuation-prompt-tag)
-                             (lambda () 
-                               (abort-current-continuation
-                                (default-continuation-prompt-tag)
-                                (λ () 0)))))))
-    ("0" "0" "0" "0" "0" "0")
-    'interactions
-    #f)
-   
-   (mktest
-    (format "~s ~s ~s" 
-            '1
-            '(+ 1 (+ 1 (abort-current-continuation
-                        (default-continuation-prompt-tag)
-                        (lambda () 
-                          (abort-current-continuation
-                           (default-continuation-prompt-tag)
-                           (λ () 0))))))
-            '2)
-    ("1\n0" "0" "0" "1\n0" "0" "0")
-    'interactions
-    #f)
-   
-   (mktest
-    (format "~s" 
-            '(begin
-               1
-               (+ 1 (+ 1 (abort-current-continuation
-                          (default-continuation-prompt-tag)
-                          (lambda () 
-                            (abort-current-continuation
-                             (default-continuation-prompt-tag)
-                             (λ () 0))))))
-               2))
-    ("0" "0" "0" "0" "0" "0")
-    'interactions
-    #f)
-   
-   ;; this test case used to fail, but not by printing the wrong
-   ;; thing; instead the REPL just didn't return and Run didn't
-   ;; light up, etc.
-   (mktest
-    "(abort-current-continuation (default-continuation-prompt-tag))) 2"
-    (#rx"call-with-continuation-prompt: result arity mismatch"
-     #rx"call-with-continuation-prompt: result arity mismatch"
-     #rx"call-with-continuation-prompt: result arity mismatch"
-     #rx"call-with-continuation-prompt: result arity mismatch"
-     #rx"call-with-continuation-prompt: result arity mismatch"
-     #rx"call-with-continuation-prompt: result arity mismatch")
-    'interactions
-    #f)
-   
-   (mktest
-    (format "~s"
-            '(abort-current-continuation
-              (default-continuation-prompt-tag)
-              (λ ()
-                (abort-current-continuation
-                 (default-continuation-prompt-tag)))))
-    (#rx"call-with-continuation-prompt: result arity mismatch"
-     #rx"call-with-continuation-prompt: result arity mismatch"
-     #rx"call-with-continuation-prompt: result arity mismatch"
-     #rx"call-with-continuation-prompt: result arity mismatch"
-     #rx"call-with-continuation-prompt: result arity mismatch"
-     #rx"call-with-continuation-prompt: result arity mismatch")
-    'interactions
-    #f)
-
-   
-   ))
-
-;; these tests aren't used at the moment.
-#;
-(define xml-tests
-  (list
-   ;; XML tests
-   (mktest (list "#!/bin/sh\n" 
-                 '("Insert" "Insert XML Box")
-                 "<a>")
-           "(a ())"
-           "(a ())"
-           #f #f #f
-           'interactions
-           #f)
-   
-   (mktest
-    '(("Insert" "Insert XML Box")
-      "<a>")
-    "(a ())"
-    "(a ())"
-    #f
-    'interactions
-    #f
-    #f)
-   
-   (mktest
-    '(("Insert" "Insert XML Box")
-      "<a>"
-      ("Insert" "Insert Scheme Box")
-      "1")
-    "(a () 1)"
-    "(a () 1)"
-    #f
-    'interactions
-    #f
-    #f)
-   
-   (mktest
-    '(("Insert" "Insert XML Box")
-      "<a>"
-      ("Insert" "Insert Scheme Splice Box")
-      "'(1)")
-    "(a () 1)"
-    "(a () 1)"
-    #f
-    'interactions
-    #f
-    #f)
-   
-   (mktest
-    '(("Insert" "Insert XML Box")
-      "<a>"
-      ("Insert" "Insert Scheme Splice Box")
-      "1")
-    "scheme-splice-box: expected a list, found: 1"
-    "scheme-splice-box: expected a list, found: 1"
-    #t
-    'definitions
-    #f
-    #f)))
-
-(define backtrace-image-string "{stop-multi.png}")
-(define file-image-string "{stop-22x22.png}")
-
-(define tmp-load-directory (find-system-path 'temp-dir))
-
-(define tmp-load-short-filename "repl-test-tmp.rkt")
-(define tmp-load-filename (build-path tmp-load-directory tmp-load-short-filename))
-
-(define tmp-load3-short-filename "repl-test-tmp3.rkt")
-(define tmp-load3-filename (build-path tmp-load-directory tmp-load3-short-filename))
-
-(define (cleanup-tmp-files)
-  (when (file-exists? tmp-load-filename) (delete-file tmp-load-filename))
-  (when (file-exists? tmp-load3-filename) (delete-file tmp-load3-filename)))
-
-(define (run-test which-tests)
-    
-  (define drscheme-frame (wait-for-drracket-frame))
-  
-  (define ints-text (queue-callback/res (λ () (send drscheme-frame get-interactions-text))))
-  (define ints-canvas (queue-callback/res (λ () (send drscheme-frame get-interactions-canvas))))
-  (define defs-text (queue-callback/res (λ () (send drscheme-frame get-definitions-text))))
-  (define defs-canvas (queue-callback/res (λ () (send drscheme-frame get-definitions-canvas))))
-  (define execute-button (queue-callback/res (λ () (send drscheme-frame get-execute-button))))
-  
-  (define wait-for-execute (lambda () (wait-for-button execute-button)))
-  (define get-int-pos (lambda () (queue-callback/res (λ () (get-text-pos ints-text)))))
-  
-  
-  (define short-tmp-load-filename
-    (let-values ([(base name dir?) (split-path tmp-load-filename)])
-      (path->string name)))
-  
-  ;; setup-fraction-sum-interactions : -> void 
-  ;; clears the definitions window, and executes `1/2' to
-  ;; get a fraction snip in the interactions window.
-  ;; Then, copies that and uses it to construct the sum
-  ;; of the 1/2 image and 1/3.
-  (define (setup-fraction-sum-interactions)
-    (clear-definitions drscheme-frame)
-    (type-in-definitions drscheme-frame "1/2")
-    (do-execute drscheme-frame)
-    (queue-callback/res
-     (lambda ()
-       (let* ([start (send ints-text paragraph-start-position 2)]
-              ;; since the fraction is supposed to be one char wide, we just
-              ;; select one char, so that, if the regular number prints out,
-              ;; this test will fail.
-              [end (+ start 1)])
-         (send ints-text set-position start end))))
-    (test:menu-select "Edit" "Copy")
-    (clear-definitions drscheme-frame)
-    (type-in-definitions drscheme-frame "(+ ")
-    (test:menu-select "Edit" "Paste")
-    (type-in-definitions drscheme-frame " 1/3)"))
-
-  ; given a filename "foo", we perform two operations on the contents
-  ; of the file "foo.rkt".  First, we insert its contents into the REPL
-  ; directly, and second, we use the load command.  We compare the
-  ; results of these operations against expected results.
-  (define ((run-single-test execute-text-start escape language-cust) in-vector)
-    ;(printf "\n>> testing ~s\n" (test-program in-vector))
-    (let* ([program (test-program in-vector)]
-           [execute-answer (make-execute-answer in-vector language-cust)]
-           [source-location (test-source-location in-vector)]
-           [setup (test-setup in-vector)]
-           [teardown (test-teardown in-vector)]
-           [start-line (and (pair? source-location)
-                            (number->string (+ 1 (loc-line (car source-location)))))]
-           [start-col (and (pair? source-location)
-                           (number->string (loc-col (car source-location))))]
-           [start-pos (and (pair? source-location)
-                           (number->string (+ 1 (loc-offset (car source-location)))))]
-           [breaking-test? (test-breaking-test? in-vector)])
-      
-      (setup)
-      
-      (clear-definitions drscheme-frame)
-      ; load contents of test-file into the REPL, recording
-      ; the start and end positions of the text
-      
-      (wait-for-drracket-frame)
-      
-      (cond
-        [(string? program)
-         (insert-in-definitions/newlines drscheme-frame program)]
-        [(eq? program 'fraction-sum)
-         (setup-fraction-sum-interactions)]
-        [(list? program)
-         (for-each
-          (lambda (item)
-            (cond
-              [(string? item) (insert-in-definitions/newlines drscheme-frame item)]
-              [(eq? item 'left)
-               (queue-callback/res
-                (λ ()
-                  (send defs-text 
-                        set-position
-                        (- (send defs-text get-start-position) 1)
-                        (- (send defs-text get-start-position) 1))))]
-              [(pair? item) (apply test:menu-select item)]))
-          program)])
-      
-      (do-execute drscheme-frame #f)
-      
-      ;; make sure that the execute callback has really completed 
-      ;; (is this necc w/ test:run-one below?)
-      (queue-callback/res void)
-      
-      (when breaking-test?
-        (test:run-one (λ () (send (send drscheme-frame get-break-button) command))))
-      (wait-for-execute)
-      
-      (let* ([execute-text-end (max 0 (- (get-int-pos) 1))] ;; subtract one to skip last newline
-             [received-execute
-              (fetch-output drscheme-frame execute-text-start execute-text-end)])
-        
-        ; check focus and selection for execute test
-        (case language-cust
-          [(raw) (void)]
-          [else
-           (define edit-target 
-             (queue-callback/res (λ () (send drscheme-frame get-edit-target-window))))
-           (define defs-focus? (eq? edit-target defs-canvas))
-           (define ints-focus? (eq? edit-target ints-canvas))
-           (cond
-             [(eq? source-location 'dont-care)
-              (void)]
-             [(eq? source-location 'definitions)
-              (unless defs-focus?
-                (eprintf "FAILED execute test for ~s\n  expected definitions to have the focus\n"
-                         program))]
-             [(eq? source-location 'interactions)
-              (unless ints-focus?
-                (eprintf "FAILED execute test for ~s\n  expected interactions to have the focus\n"
-                         program))]
-             [defs-focus?
-               (let ([start (car source-location)]
-                     [finish (cdr source-location)])
-                 (let* ([error-ranges (queue-callback/res (λ () (send ints-text get-error-ranges)))]
-                        [error-range (and error-ranges
-                                          (not (null? error-ranges))
-                                          (car error-ranges))])
-                   (unless (and error-range
-                                (= (+ (srcloc-position error-range) -1) (loc-offset start))
-                                (= (+ (srcloc-position error-range) -1 (srcloc-span error-range)) 
-                                   (loc-offset finish)))
-                     (eprintf "FAILED execute test for ~s\n  error-range is ~s\n  expected ~s\n"
-                              program
-                              (and error-range
-                                   (list (+ (srcloc-position error-range) -1)
-                                         (+ (srcloc-position error-range) -1 
-                                            (srcloc-span error-range))))
-                              (list (loc-offset start)
-                                    (loc-offset finish))))))])])
-        
-        ; check text for execute test
-        (next-test)
-        (unless (cond
-                  [(string? execute-answer)
-                   (string=? execute-answer received-execute)]
-                  [(regexp? execute-answer)
-                   (regexp-match execute-answer received-execute)]
-                  [else #f])
-          (failure)
-          (eprintf "FAILED execute test for ~s (~a)\n  expected: ~s\n       got: ~s\n"
-                   program
-                   language-cust
-                   execute-answer received-execute))
-        
-        (test:new-window ints-canvas)
-        
-        ; save the file so that load is in sync
-        (test:menu-select "File" "Save Definitions")
-        
-        ; make sure that a prompt is available at end of the REPL
-        (unless (queue-callback/res
-                 (λ () 
-                   (and (char=? #\>
-                                (send ints-text get-character
-                                      (- (send ints-text last-position) 2)))
-                        (char=? #\space
-                                (send ints-text get-character
-                                      (- (send ints-text last-position) 1))))))
-          (test:keystroke #\return))
-        
-        (define (load-test short-filename load-answer)
-          ;; in order to erase the state in the namespace already, we clear (but don't save!)
-          ;; the definitions and click execute with the empty buffer
-          (test:new-window defs-canvas)
-          (test:menu-select "Edit" "Select All")
-          (test:menu-select "Edit" "Delete")
-          (do-execute drscheme-frame #f)
-          (wait-for-execute)
-          
-          ;; stuff the load command into the REPL 
-          (insert-in-interactions drscheme-frame (format "(load ~s)" short-filename))
-          
-          ;; record current text position, then stuff a CR into the REPL
-          (define load-text-start 
-            (+ 1 (queue-callback/res (λ () (send ints-text last-position)))))
-          
-          (test:keystroke #\return)
-          
-          (when breaking-test?
-            (test:run-one (λ () (send (send drscheme-frame get-break-button) command))))
-          (wait-for-execute)
-          
-          (let* ([load-text-end (- (get-int-pos) 1)] ;; subtract one to eliminate newline
-                 [received-load 
-                  (fetch-output drscheme-frame load-text-start load-text-end)])
-            
-            ;; check load text 
-            (next-test)
-            (unless (cond
-                      [(string? load-answer)
-                       (string=? load-answer received-load)]
-                      [(regexp? load-answer)
-                       (regexp-match load-answer received-load)]
-                      [else #f])
-              (failure)
-              (eprintf "FAILED load test ~a for ~s\n  expected: ~s\n       got: ~s\n"
-                       short-filename
-                       program load-answer received-load))))
-        (load-test tmp-load-short-filename (make-load-answer in-vector language-cust #f))
-        (when (file-exists? tmp-load3-filename)
-          (delete-file tmp-load3-filename))
-        (copy-file tmp-load-filename tmp-load3-filename)
-        (load-test tmp-load3-short-filename 
-                   (make-load-answer in-vector language-cust tmp-load3-short-filename))
-        
-        (teardown)
-        
-        ; check for edit-sequence
-        (when (repl-in-edit-sequence?)
-          (eprintf "FAILED: repl in edit-sequence")
-          (escape)))))
-  
-  (define tests 0)
-  (define failures 0)
-  (define (next-test) (set! tests (+ tests 1)))
-  (define (failure) (set! failures (+ failures 1)))
-  (define (reset) (set! tests 0) (set! failures 0))
-  (define (final-report)
-    (if (= 0 failures)
-        (printf "tests finished: all ~a tests passed\n" tests)
-        (eprintf "tests finished: ~a failed out of ~a total\n" failures tests)))
-  
-  (define (run-main-tests language-cust)
-    (random-seed-test)
-    
-    (test:new-window defs-canvas)
-    (clear-definitions drscheme-frame)
-    (do-execute drscheme-frame)
-    (let/ec escape 
-      (for-each (run-single-test (get-int-pos) escape language-cust) test-data)))
-  
-  (define kill-menu-item "Force the Program to Quit")
-  
-  (define (kill-tests)
-    
-    (next-test)
-    (clear-definitions drscheme-frame)
-    (do-execute drscheme-frame)
-    (test:menu-select "Racket" kill-menu-item)
-    (let ([win (wait-for-new-frame drscheme-frame)])
-      (test:button-push "OK")
-      (let ([drs2 (wait-for-new-frame win)])
-        (unless (eq? drs2 drscheme-frame)
-          (error 'kill-test1 "expected original drscheme frame to come back to the front"))))
-    
-    (next-test)
-    (type-in-definitions drscheme-frame "(kill-thread (current-thread))")
-    (do-execute drscheme-frame #f)
-    (let ([win (wait-for-new-frame drscheme-frame)])
-      (test:button-push "OK")
-      (let ([drs2 (wait-for-new-frame win)])
-        (unless (eq? drs2 drscheme-frame)
-          (error 'kill-test2 "expected original drscheme frame to come back to the front"))))
-    
-    (next-test)
-    (clear-definitions drscheme-frame)
-    (do-execute drscheme-frame)
-    (type-in-definitions
-     drscheme-frame
-     "(define (f) (queue-callback f) (error 'ouch)) (f)")
-    (do-execute drscheme-frame #f)
-    (sleep 1/2)
-    (test:menu-select "Racket" kill-menu-item)
-    (let ([win (wait-for-new-frame drscheme-frame null 360)])
-      (test:button-push "OK")
-      (let ([drs2 (wait-for-new-frame win)])
-        (unless (eq? drs2 drscheme-frame)
-          (error
-           'kill-test3
-           "expected original drscheme frame to come back to the front"))))
-    (when (send (send drscheme-frame get-interactions-text) local-edit-sequence?)
-      (error 'kill-test3 "in edit-sequence")))
-  
-  (define (callcc-test)
-    (next-test)
-    (clear-definitions drscheme-frame)
-    (type-in-definitions drscheme-frame "(define kont #f) (let/cc empty (set! kont empty))")
-    (do-execute drscheme-frame)
-    (wait-for-execute)
-    
-    (for-each test:keystroke (string->list "(kont)"))
-    (test:keystroke #\return)
-    (wait-for-execute)
-    
-    (for-each test:keystroke (string->list "x"))
-    (let ([start (+ 1 (queue-callback/res (λ () (send ints-text last-position))))])
-      (test:keystroke #\return)
-      (wait-for-execute)
-      
-      (let* ([end (- (get-int-pos) 1)]
-             [output (fetch-output drscheme-frame start end)]
-             [expected #rx"x:.*cannot reference undefined identifier"])
-        (unless (regexp-match expected output)
-          (failure)
-          (eprintf "callcc-test: expected something matching ~s, got ~s\n" expected output)))))
-  
-  (define (random-seed-test)
-    (define expression 
-      (format "~s" '(pseudo-random-generator->vector (current-pseudo-random-generator))))
-    (next-test)
-    (clear-definitions drscheme-frame)
-    (do-execute drscheme-frame)
-    (wait-for-execute)
-    
-    (insert-in-interactions drscheme-frame expression)
-    (let ([start1 (+ 1 (queue-callback/res (λ () (send ints-text last-position))))])
-      (test:keystroke #\return)
-      (wait-for-execute)
-      (let ([output1 (fetch-output drscheme-frame start1 (- (get-int-pos) 1))])
-        (insert-in-interactions drscheme-frame expression)
-        (let ([start2 (+ 1 (queue-callback/res (λ () (send ints-text last-position))))])
-          (test:keystroke #\return)
-          (wait-for-execute)
-          (let ([output2 (fetch-output drscheme-frame start2 (- (get-int-pos) 1))])
-            (unless (equal? output1 output2)
-              (failure)
-              (eprintf "random-seed-test: expected\n  ~s\nand\n  ~s\nto be the same"
-                       output1
-                       output2)))))))
-  
-  (define (top-interaction-test)
-    (clear-definitions drscheme-frame)
-    (do-execute drscheme-frame)
-    (wait-for-execute)
-    (let ([ints-just-after-welcome (queue-callback/res (λ () (+ 1 (send ints-text last-position))))])
-      
-      (type-in-definitions 
-       drscheme-frame
-       "(define-syntax #%top-interaction (syntax-rules () [(_ . e) 'e]))\n(+ 1 2)\n")
-      (test:menu-select "File" "Save Definitions")
-      
-      (clear-definitions drscheme-frame)
-      (do-execute drscheme-frame)
-      (wait-for-execute)
-      
-      (for-each test:keystroke (string->list (format "(load ~s)" tmp-load-short-filename)))
-      (let ([start (+ 1 (queue-callback/res (λ () (send ints-text last-position))))])
-        (test:keystroke #\return)
-        (wait-for-execute)
-        (let* ([end (- (get-int-pos) 1)]
-               [output (fetch-output drscheme-frame start end)]
-               [expected "(+ 1 2)"])
-          (unless (equal? output expected)
-            (error 'top-interaction-test "expected.1 ~s, got ~s" expected output))
-          (next-test)))
-      
-      (for-each test:keystroke (string->list "(+ 4 5)"))
-      (let ([start (+ 1 (queue-callback/res (λ () (send ints-text last-position))))])
-        (test:keystroke #\return)
-        (wait-for-execute)
-        (let* ([end (- (get-int-pos) 1)]
-               [output (fetch-output drscheme-frame start end)]
-               [expected "(+ 4 5)"])
-          (unless (equal? output expected)
-            (error 'top-interaction-test "expected.2 ~s, got ~s" expected output))
-          (next-test)))))
-  
-  (when (file-exists? tmp-load-filename)
-    (delete-file tmp-load-filename))
-  (save-drracket-window-as tmp-load-filename)
-  
-  ;; the debug and debug/profile tests should not differ in their output
-  ;; they are both run here because debug uses the automatic-compilation 
-  ;; stuff and debug/profile does not (so they use different instantiations
-  ;; of the stacktrace module.
-  
-  (define level (list #rx"Pretty Big"))
-  (when (memq 'raw which-tests)
-    (set-language-level! level #f)
-    (test:set-radio-box-item! "No debugging or profiling")
-    (let ([f (test:get-active-top-level-window)])
-      (test:button-push "OK")
-      (wait-for-new-frame f))
-    (run-main-tests 'raw))
-  (when (memq 'debug which-tests)
-    (set-language-level! level)
-    (run-main-tests 'debug))
-  (when (memq 'debug/profile which-tests)
-    (set-language-level! level #f)
-    (test:set-radio-box-item! "Debugging and profiling")
-    (let ([f (test:get-active-top-level-window)])
-      (test:button-push "OK")
-      (wait-for-new-frame f))
-    (run-main-tests 'debug/profile))
-  (when (memq 'misc which-tests)
-    (set-language-level! level #t)
-    (kill-tests)
-    (callcc-test)
-    (top-interaction-test))
-  
-  (final-report))
-
-(define (insert-in-definitions/newlines drs str)
-  (let loop ([strs (regexp-split #rx"\n" str)])
-    (insert-in-definitions drs (car strs))
-    (unless (null? (cdr strs))
-      (test:keystroke #\return)
-      (loop (cdr strs)))))
-
-(define (make-execute-answer test language-cust)
-  ((case language-cust
-     [(debug debug/profile)
-      answer-debug-execute]
-     [(raw)
-      answer-raw-execute]) 
-   (test-answer test)))
-
-(define (make-load-answer test language-cust src-file)
-  ((case language-cust
-     [(debug debug/profile)
-      (if src-file
-          answer-debug-load
-          answer-debug-load-fn)]
-     [(raw)
-      (if src-file
-          answer-raw-load
-          answer-raw-load-fn)])
-   (test-answer test)))
-
-(define (string/rx-append a b)
-  (if (regexp? b)
-      (regexp (string-append (regexp-quote a) (object-name b)))
-      (string-append a b)))
-
-
-(exit-handler
- (let ([eh (exit-handler)])
-   (λ (val)
-      (cleanup-tmp-files)
-      (eh val))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/run-example-tool.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/run-example-tool.rkt
deleted file mode 100644
index 06aa9b7a87..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/private/run-example-tool.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-(require "drracket-test-util.rkt"
-         setup/setup-unit
-         setup/option-sig
-         setup/option-unit
-         launcher/launcher-unit
-         launcher/launcher-sig
-         compiler/sig
-         compiler/compiler-unit
-         compiler/option-unit
-         dynext/compile-sig
-         dynext/compile-unit
-         dynext/link-sig
-         dynext/link-unit
-         dynext/file-sig
-         dynext/file-unit
-         racket/unit
-         racket/gui/base
-         racket/class
-         framework/test
-         mrlib/switchable-button)
-
-(provide go)
-
-(define (go)
-  
-  (define init-options@
-    (unit (import setup-option^)
-          (export)
-          (make-zo #f)
-          (make-launchers #f)
-          (make-docs #f)
-          (call-install #f)
-          (call-post-install #f)
-          (setup-program-name "raco setup")
-          (specific-collections '(("coll")))))
-  
-  (let ([c (make-custodian)])
-    (parameterize ([current-custodian c]
-                   [exit-handler 
-                    (λ (x)
-                      (custodian-shutdown-all c))])
-      (invoke-unit  
-       (compound-unit
-         (import)
-         (export)
-         (link 
-          [((OPTIONS : setup-option^)) setup:option@]
-          [() init-options@ OPTIONS]
-          [((LAUNCHER : launcher^)) launcher@]
-          [((COMPILER-OPTION : compiler:option^)) compiler:option@]
-          [((DYNEXT-COMPILE : dynext:compile^)) dynext:compile@]
-          [((DYNEXT-FILE : dynext:file^)) dynext:file@]
-          [((DYNEXT-LINK : dynext:link^)) dynext:link@]
-          [((COMPILER : compiler^)) compiler@ COMPILER-OPTION DYNEXT-FILE DYNEXT-COMPILE DYNEXT-LINK]
-          [() setup@ LAUNCHER OPTIONS COMPILER-OPTION COMPILER DYNEXT-FILE])))))
-  
-  (fire-up-drracket-and-run-tests
-   (λ () 
-     (define drs (wait-for-drracket-frame))
-     (queue-callback/res (λ () (send (send drs get-definitions-canvas) focus)))
-     (for ([x (in-string "egg\r1\r2\r3")])  
-       ;; need #\r to actually get newlines in the editor
-       ;; see test:keystroke docs
-       (test:keystroke x))
-     
-     (queue-callback/res
-      (λ ()
-        (define btn
-          (for/or ([x (in-list (send (send drs get-button-panel) get-children))])
-            (and (is-a? x switchable-button%)
-                 (equal? (send x get-button-label) "Reverse Definitions")
-                 x)))
-        (send btn command)))
-     
-     (define content 
-       (queue-callback/res (λ () (send (send drs get-definitions-text) get-text))))
-     (define expected (apply string (reverse (string->list "easter egg\n1\n2\n3"))))
-     (unless (equal? content expected)
-       (eprintf "example-tool.rkt: test failed;\nexpected ~s\n but got ~s"
-                expected
-                content)))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/randomly-click-language-dialog.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/randomly-click-language-dialog.rkt
deleted file mode 100644
index 3a761335e5..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/randomly-click-language-dialog.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require "private/randomly-click.rkt")
-(go 'language-dialog)
-
-(module test racket/base)
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/randomly-click-preferences.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/randomly-click-preferences.rkt
deleted file mode 100644
index d019c09769..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/randomly-click-preferences.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require "private/randomly-click.rkt")
-(go 'preferences-dialog)
-
-(module test racket/base)
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debug.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debug.rkt
deleted file mode 100644
index 7e8e44e331..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debug.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require "private/repl-test.rkt" "private/drracket-test-util.rkt")
-(fire-up-drracket-and-run-tests (λ () (run-test '(debug))))
-
-(module+ test
-  (module config info
-    (define timeout 300)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debugprofile.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debugprofile.rkt
deleted file mode 100644
index 73a290071a..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debugprofile.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require "private/repl-test.rkt" "private/drracket-test-util.rkt")
-(fire-up-drracket-and-run-tests (λ () (run-test '(debug/profile))))
-
-(module+ test
-  (module config info
-    (define timeout 300)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-misc.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-misc.rkt
deleted file mode 100644
index 5e6d0f11ae..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-misc.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require "private/repl-test.rkt" "private/drracket-test-util.rkt")
-(fire-up-drracket-and-run-tests (λ () (run-test '(misc))))
-
-(module+ test
-  (module config info
-    (define timeout 300)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-raw.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-raw.rkt
deleted file mode 100644
index df58fa5cce..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-raw.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require "private/repl-test.rkt" "private/drracket-test-util.rkt")
-(fire-up-drracket-and-run-tests (λ () (run-test '(raw))))
-
-(module+ test
-  (module config info
-    (define timeout 300)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/run.sh b/pkgs/drracket-pkgs/drracket-test/tests/drracket/run.sh
deleted file mode 100644
index 3e636809e9..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/run.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-## use 
-##   env RACKET=something ./run.sh
-## to use a racket not in the path
-
-files=`ls *.rkt | grep -v info.rkt | grep -v follow-log.rkt`
-
-if [ "$RACKET" == "" ]; then
-  RACKET=racket;
-fi
-
-for file in $files; do
-  echo STARTING $file
-  "$RACKET" $file 
-done
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/sample-solutions-one-window.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/sample-solutions-one-window.rkt
deleted file mode 100644
index a4b67ab58d..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/sample-solutions-one-window.rkt
+++ /dev/null
@@ -1,262 +0,0 @@
-
-(module sample-solutions-one-window mzscheme
-  (require "private/drracket-test-util.rkt"
-           "private/gui.rkt"
-           mzlib/class
-           mzlib/list
-           mzlib/file
-           mred
-           framework
-           (prefix fw: framework))
-  
-  (provide run-test)
-  
-  (define (section->language section)
-    (cond
-      [(section . <= . 12) '("Beginning Student")]
-      [(section . <= . 19) '("Intermediate Student")]
-      [(section . <= . 29) '("Intermediate Student with lambda")]
-      [else '("Advanced Student")]))
-
-  (define default-toc-entry '(#f ()))
-  
-  (define (filename->section labels filename)
-    (let* ([label (car (memf (lambda (x) (string=? (car x) filename)) labels))]
-           [section (car (cadr label))])
-      section))
-         
-  (define separator-sexp "should be")
-  
-  (define ((test-single-file labels sample-solutions-dir toc) filename)
-    (let* ([sample-solutions-teachpack-filename
-            (build-path (collection-file-path "sample-solutions-testsuite-tp.scm"
-                                              "tests"
-                                              "drracket"))]
-           [toc-entry (let ([lookup (assoc (string->symbol filename) toc)])
-                        (if lookup
-                            (cdr lookup)
-                            default-toc-entry))]
-           [section (filename->section labels filename)]
-           [language (section->language section)]
-           [errors-ok? (car toc-entry)]
-           [teachpacks (cadr toc-entry)])
-      (let* ([drs-frame (wait-for-drracket-frame)]
-             [definitions-text (send drs-frame get-definitions-text)]
-             [interactions-text (send drs-frame get-interactions-text)])
-        
-        (run-one/sync
-         (lambda ()
-           ;; update the program (cheat to hack around gc bug -- should really use file|open)
-           ;; (this is also much more efficient, tho)
-           (send definitions-text load-file (build-path sample-solutions-dir filename))))
-        ;; only bother changing the language dialog when necessary.
-        (unless (string=?
-                 (run-one/sync
-                  (lambda ()
-                    (send interactions-text get-text
-                          (send interactions-text paragraph-start-position 1)
-                          (send interactions-text paragraph-end-position 1))))
-                 (format "Language: ~a." (car (last-pair language))))
-          (set-language-level! language))
-        ;; only bother changing the teachpacks when necessary.
-        (let* ([get-full-path
-                (lambda (teachpack)
-                  (cond
-                    [(absolute-path? teachpack)
-                     (normal-case-path 
-                      (normalize-path
-                       teachpack))]
-                    [else
-                     (normal-case-path
-                      (normalize-path
-                       (build-path
-                        (collection-path "mzlib") 'up 'up
-                        "teachpack" "htdp" teachpack)))]))]
-               [teachpack-should-be
-                (apply string-append 
-                       (map (lambda (tp) (format "Teachpack: ~a.\n" (get-full-path tp)))
-                            (cons
-                             sample-solutions-teachpack-filename
-                             teachpacks)))]
-               [teachpack-is
-                (run-one/sync
-                  (lambda ()
-                    (send interactions-text get-text
-                          (send interactions-text paragraph-start-position 2)
-                          (send interactions-text paragraph-start-position 
-                                ;; add 1 for the always there teachpack
-                                (+ 2 (length teachpacks) 1)))))] 
-               [teachpacks-already-set? (string=? teachpack-should-be teachpack-is)])
-          (unless teachpacks-already-set?
-            (fw:test:menu-select "Language" "Clear All Teachpacks")
-            (use-get/put-dialog
-             (lambda ()
-               (fw:test:menu-select "Language" "Add Teachpack..."))
-             sample-solutions-teachpack-filename)
-            (for-each (lambda (teachpack)
-                        (use-get/put-dialog
-                         (lambda ()
-                           (fw:test:menu-select "Language" "Add Teachpack..."))
-                         (get-full-path teachpack)))
-                      teachpacks)))
-        (do-execute drs-frame)
-        
-        ;; kill the program, but only when it opens windows
-        (let ([open-user-windows?
-               (parameterize ([current-eventspace (send interactions-text get-user-eventspace)])
-                 (not (null? (get-top-level-windows))))])
-          (when #t #;open-user-windows?
-            (printf "killing\n")
-            (let ([cust (send interactions-text get-user-custodian)])
-              (run-one/sync
-               (lambda ()
-                 (custodian-shutdown-all cust))))
-            (let ([wait-for-kill-window
-                   (lambda ()
-                     (let ([f (test:get-active-top-level-window)])
-                       (and f (equal? (send f get-label)
-                                      "Evaluation Terminated"))))])
-              (poll-until wait-for-kill-window)
-              (fw:test:button-push "OK")
-              (wait-for-drracket-frame #f)
-              (printf "killed\n"))))
-        
-        (check-for-red-text filename drs-frame)
-        
-        ;; still check equal pairs when there is a sanctioned error.
-        (cond
-          [(and (not errors-ok?)
-                (has-error? drs-frame))
-           =>
-           (lambda (err-msg)
-             (printf (string-append "ERROR: ~a: found error, but should be no errors"
-                                    " (section ~a):\n  ~a\n  teachpacks: ~a\n")
-                     filename
-                     section
-                     err-msg
-                     teachpacks))]
-          [else
-           (let* ([output (fetch-output drs-frame)]
-                  [port (open-input-string output)])
-             (let loop ([last #f]
-                        [equal-count 1])
-               (let ([sexp (with-handlers ([(lambda (exn) #t)
-                                            (lambda (exn) exn)])
-                             (read port))])
-                 (unless (eof-object? sexp)
-                   (cond
-                     [(and (not last) (equal? sexp separator-sexp))
-                      (printf "ERROR: ~a: found = as first sexp\n" filename)]
-                     [(and last (equal? separator-sexp sexp))
-                      (let ([after (with-handlers ([(lambda (exn) #t)
-                                                    (lambda (exn) exn)])
-                                     (read port))])
-                        (unless (equal? after last)
-                          (printf (string-append
-                                   "ERROR: ~a: pair #~a mismatched."
-                                   "\n     got ~s\nexpected ~s\nteachpacks: ~a\n")
-                                  filename equal-count 
-                                  (if (exn? last) (exn-message last) last)
-                                  (if (exn? after) (exn-message after) after)
-                                  teachpacks))
-                        (loop after (+ equal-count 1)))]
-                     [else (loop sexp equal-count)])))))]))))
-  
-  (define (check-for-red-text filename drs-frame)
-    (when (run-one/sync
-           (lambda ()
-             (send drs-frame get-test-coverage-info-visible?)))
-      (printf "ERROR: ~a: test coverage shows uncovered code\n"
-              filename)))
-  
-  ;; has-test-coverage-annotations? : text -> (union (list ...) #f)
-  (define (has-test-coverage-annotations? definitions-text)
-    (let loop ([snip (send definitions-text find-first-snip)]
-               [black #f]
-               [red #f])
-      (cond
-        [snip
-         (let* ([style (send snip get-style)]
-                [foreground (send style get-foreground)])
-           (cond
-             [(black? foreground)
-              (if red
-                  (list (get-snip-info definitions-text snip) red)
-                  (loop (send snip next) (get-snip-info definitions-text snip) red))]
-             [(red? foreground)
-              (if black
-                  (list black (get-snip-info definitions-text snip))
-                  (loop (send snip next) black (get-snip-info definitions-text snip)))]
-             [else
-              (loop (send snip next) black red)]))]
-        [else #f])))
-  
-  (define (get-snip-info definitions-text snip)
-    (let* ([pos (send definitions-text get-snip-position snip)]
-           [para (send definitions-text position-paragraph pos)]
-           [para-start (send definitions-text paragraph-start-position para)])
-      (list (+ para 1)
-            (- pos para-start))))
-  
-  (define red-color (make-object color% "firebrick"))
-  (define (red? c)
-    (and (= (send c red) (send red-color red))
-         (= (send c green) (send red-color green))
-         (= (send c blue) (send red-color blue))))
-
-  (define (black? c)
-    (and (zero? (send c red))
-         (zero? (send c green))
-         (zero? (send c blue))))
-    
-  (define (run-test)
-    (define sample-solutions-dir
-      (let ([try1
-             (with-handlers ((exn:fail? (λ (x) #f)))
-               (collection-path "solutions"))]
-            [try2
-             (build-path (collection-path "mzlib")
-                         'up
-                         'up
-                         'up
-                         "robby"
-                         "collects"
-                         "solutions")])
-        (cond
-          [(and try1 (directory-exists? try1)) try1]
-          [else try2])))
-    
-    (define stupid-internal-definitions-syntax
-      (unless (directory-exists? sample-solutions-dir)
-        (error 'sample-solutions.rkt "expected directory ~s to exist" sample-solutions-dir)))
-    
-    (define stupid-internal-definitions-syntax2
-      (set! sample-solutions-dir (normalize-path sample-solutions-dir)))
-    
-    (define toc (call-with-input-file (build-path sample-solutions-dir "toc.rkt") read))
-
-
-    (define labels
-      (let* ([all-info (call-with-input-file (build-path (collection-path "solutions") 
-                                                         'up 'up "proj" "book" "solutions"
-                                                         "labels.scm")
-                         read)]
-             [ex-labels (filter (lambda (x) (and (string=? (substring (car x) 0 3) "ex:")
-                                                 (> (string-length (car x)) 3)))
-                                all-info)])
-        (map (lambda (x) 
-               (cons (string-append (substring (car x) 3 (string-length (car x))) ".scm")
-                     (cdr x)))
-             ex-labels)))
-    
-    (define sample-solutions
-      (sort
-       (filter (lambda (x)
-                 (and (> (string-length x) 3)
-                      (string=? "scm" (substring x (- (string-length x) 3) (string-length x)))
-                      (memf (lambda (y) (string=? (car y) x)) labels)))
-               (directory-list sample-solutions-dir))
-       (lambda (fx fy)
-         (< (filename->section labels fx) (filename->section labels fy)))))
-    
-    (for-each (test-single-file labels sample-solutions-dir toc) sample-solutions)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/sample-solutions-testsuite-tp.scm b/pkgs/drracket-pkgs/drracket-test/tests/drracket/sample-solutions-testsuite-tp.scm
deleted file mode 100644
index 2085e1b959..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/sample-solutions-testsuite-tp.scm
+++ /dev/null
@@ -1,38 +0,0 @@
-(module sample-solutions-testsuite-tp mzscheme
-  (provide require-library)
-  (require mzlib/include)
-  
-  (define-syntax require-library
-    (let ([cache null])
-      (lambda (stx)
-        (syntax-case stx ()
-          [(_ fn-stx lib-stx)
-           (let ([fn (syntax-object->datum (syntax fn-stx))]
-                 [lib (syntax-object->datum (syntax lib-stx))])
-             (unless (equal? lib "solutions")
-               (raise-syntax-error
-                #f
-                "expected `solutions' collection as second argument to require-library"
-                stx))
-             (unless (string? fn)
-               (raise-syntax-error
-                #f
-                "expected string constant as first argument to require-library"
-                stx))
-             (if (member fn cache)
-                 (syntax (void))
-                 (with-syntax ([full-fn 
-                                (bytes->string/utf-8
-                                 (path->bytes
-                                  (build-path 
-                                   (with-handlers ([exn:fail:filesystem?
-                                                    (lambda (x)
-                                                      (current-load-relative-directory))])
-                                     (collection-path "solutions"))
-                                   fn)))]
-                               [orig stx])
-                   (set! cache (cons fn cache))
-                   (syntax
-                    (begin
-                      (include-at/relative-to orig orig full-fn)
-                      (void))))))])))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/2htdpimage.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/2htdpimage.rkt
deleted file mode 100644
index a722ba4b9b..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/2htdpimage.rkt
+++ /dev/null
@@ -1,344 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.1.3.8 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 44 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 55 0 1 #"\0"
-0 75 1 #"\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 192 46 214 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 57 89 216 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-37 #"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-36 #"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-28 #"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-37 #"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-36 #"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1           0 42 0 27 3 17 #"#lang racket/base"
-0 0 4 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 4 3 1 #" "
-0 11           4 4 3752
-(
- #"(#(struct:translate -1.7763568394002505e-015 12.020815280171306 #(st"
- #"ruct:translate 12.020815280171309 8.881784197001252e-016 #(struct:fl"
- #"ip #f #(struct:bitmap #(#\"\\0\\377\\377\\377\\0\\377\\377\\377\\0\\"
- #"377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\23\\e^\\el\\37c\\37l\\37c\\37\\23\\e^\\e\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\0\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\23\\e^\\e\\340\\36d\\36\\377\\36d\\36\\37"
- #"7\\36d\\36\\340\\36d\\36\\23\\e^\\e\\0\\377\\377\\377\\0\\377\\377\\"
- #"377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\37"
- #"7\\377\\377\\0\\377\\377\\377l\\37c\\37\\377\\36d\\36;\\36c\\36;\\36"
- #"c\\36\\377\\36d\\36l\\37c\\37\\0\\377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\3772\\37f\\37v\\36c\\36\\21\\36i\\36\\0\\377\\377\\3"
- #"77l\\37c\\37\\377\\36d\\36;\\36c\\36;\\36c\\36\\377\\36d\\36l\\37c\\"
- #"37\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\377\\17\\\"f\\\"\\331\\37d\\3"
- #"7\\377\\36d\\36\\365\\36d\\36\\231"
- #"\\36d\\36\\223\\35e\\35\\377\\36d\\36\\377\\36d\\36\\377\\36d\\36\\3"
- #"40\\36d\\36\\23\\e^\\e\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\"
- #"377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\1\\0\\0\\0\\263\\36d\\"
- #"36\\371\\36d\\36`\\35e\\35\\231\\36d\\36\\367\\36d\\36\\377\\36d\\36"
- #"\\306\\36d\\36l\\37c\\37l\\37c\\37\\23\\e^\\e\\0\\377\\377\\377\\0\\"
- #"377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377c\\37d\\37\\377\\"
- #"36d\\36h\\35e\\35\\n\\32f\\32\\226"
- #"\\37d\\37\\376\\36d\\36\\373\\36d\\36\\352\\37d\\37P\\35c\\35\\237\\"
- #"36c\\36\\354\\36d\\36^\\36d\\36\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377!\\37d\\37_\\36c\\0365\\35e\\35\\330\\36d\\36\\37"
- #"5\\36d\\36\\211\\36e\\36=\\35d\\35"
- #"\\377\\36d\\36\\377\\36d\\36\\356\\36d\\36\\237\\36c\\36!\\37d\\37\\"
- #"0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\215\\37c\\37\\372\\36d\\36\\"
- #"340\\36d\\36?\\34e\\34\\0\\377\\377\\377\\0\\377\\377\\377q\\35c\\35"
- #"R\\37d\\37\\0053f3\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\3776\\34c\\34\\377\\36d\\36\\"
- #"377\\36d\\36\\342\\36d\\36\\204\\37d\\37%\\34g\\34\\0\\377\\377\\377"
- #"\\0\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377"
- #"\\377\\377\\265\\36d\\36\\352\\37d"
- #"\\37Z\\37c\\37\\264\\36e\\36\\373\\36d\\36\\377\\36d\\36q\\35c\\35\\"
- #"0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\37"
- #"7\\377\\0\\377\\377\\377P\\35c\\35\\376\\36d\\36v\\36c\\36\\0\\377\\"
- #"377\\377\\0\\377\\377\\377O\\35d\\35\\377\\36d\\36X\\35e\\35\\0\\377"
- #"\\377\\377\\0\\377\\377\\377\\0\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\"
- #"0\\377\\377\\3776\\34c\\34\\266\\35c\\35\\376\\36d\\36\\360\\36d\\36"
- #"\\v\\27]\\27\\0\\377\\377\\377\\0\\"
- #"377\\377\\377\\207\\36d\\36\\371\\36d\\36\\r'b'\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"71\\37c\\37\\266\\35c\\35\\376\\36d\\36\\352\\37d\\37v\\36c\\36\\v\\"
- #"27]\\27\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\327\\"
- #"36d\\36\\347\\36d\\36}\\37d\\37!\\"
- #"37d\\37\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\37"
- #"7\\377\\377t\\37c\\37\\377\\36d\\36\\252\\36d\\36\\v\\27]\\27\\0\\37"
- #"7\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\360\\36d\\36\\377"
- #"\\36d\\36\\375\\36d\\36^\\36d\\36\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\4\\0\\200\\0\\314\\36d\\36\\3"
- #"44\\36d\\36\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\0\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\0\\377\\377\\377\\\"\\36b\\36^\\36d\\36\\"
- #"0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377"
- #"\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\" 17 17) 315 1 1 #has"
- #"h())))) #(struct:bb 24.041630560342618 24.041630560342615 24.0416305"
- #"60342615) #f)"
-) 0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 14 3 7 #"require"
-0 0 4 3 1 #" "
-0 0 14 3 11 #"2htdp/image"
-0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"unless"
-0 0 4 3 1 #" "
-0 0 23 3 1 #"("
-0 0 14 3 1 #"="
-0 0 4 3 1 #" "
-0 0 23 3 1 #"("
-0 0 14 3 11 #"image-width"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 23 3 1 #")"
-0 0 4 3 1 #" "
-0 0 21 3 2 #"24"
-0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 2 #"  "
-0 0 23 3 1 #"("
-0 0 14 3 5 #"error"
-0 0 4 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 15 #"2htdp/image.rkt"
-0 0 4 3 1 #" "
-0 0 19 3 13 #"\"wrong width\""
-0 0 23 3 2 #"))"
-0 0 4 29 1 #"\n"
-0 0 25 29 1 #"\n"
-0           0
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/collapsed-nested.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/collapsed-nested.rkt
deleted file mode 100644
index 4c087e25c7..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/collapsed-nested.rkt
+++ /dev/null
@@ -1,313 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.1.3.8 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 44 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 93
-(
- #"((lib \"collapsed-snipclass.ss\" \"framework\") (lib \"collapsed-sni"
- #"pclass-wxme.ss\" \"framework\"))\0"
-) 0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 58 0 1 #"\0"
-0 75 1 #"\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 192 46 214 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 57 89 216 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-37 #"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-36 #"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-28 #"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-37 #"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-36 #"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 0 1
-#"\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 192 46 214 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 57 89 216 0
-0 0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1           0 43 0 27 3 12 #"#lang racket"
-0 0 4 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 4 3 1 #" "
-0 0 23 3 1 #"("
-0 0 14 3 1 #"f"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 2 #"  "
-0 8          84 4 2 #"(\0"
-2 #")\0"
-7 7 #"wxtext\0"
-3 1 #"("
-7 #"wxtext\0"
-3 1 #"+"
-7 #"wxtext\0"
-3 1 #" "
-7 #"wxtext\0"
-3 1 #"1"
-7 #"wxtext\0"
-3 1 #" "
-93
-(
- #"((lib \"collapsed-snipclass.ss\" \"framework\") (lib \"collapsed-sni"
- #"pclass-wxme.ss\" \"framework\"))\0"
-) 2 #"(\0"
-2 #")\0"
-8 7 #"wxtext\0"
-3 1 #"("
-7 #"wxtext\0"
-3 1 #"+"
-7 #"wxtext\0"
-3 1 #" "
-7 #"wxtext\0"
-3 1 #"1"
-7 #"wxtext\0"
-3 1 #" "
-7 #"wxtext\0"
-3 1 #"x"
-7 #"wxtext\0"
-3 1 #" "
-7 #"wxtext\0"
-3 1 #")"
-7 #"wxtext\0"
-3 1 #")"
-0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 14 3 2 #"if"
-0 0 4 3 1 #" "
-0 0 23 3 1 #"("
-0 0 14 3 1 #"="
-0 0 4 3 1 #" "
-0 0 23 3 1 #"("
-0 0 14 3 1 #"f"
-0 0 4 3 1 #" "
-0 0 21 3 1 #"4"
-0 0 23 3 1 #")"
-0 0 4 3 1 #" "
-0 0 21 3 1 #"6"
-0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 4 #"    "
-0 0 21 3 1 #"'"
-0 0 14 3 6 #"passed"
-0 0 4 29 1 #"\n"
-0 0 4 3 4 #"    "
-0 0 23 3 1 #"("
-0 0 14 3 5 #"error"
-0 0 4 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 6 #"failed"
-0 0 23 3 2 #"))"
-0 0 4 29 1 #"\n"
-0           0
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/collapsed.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/collapsed.rkt
deleted file mode 100644
index 53f8c3e669..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/collapsed.rkt
+++ /dev/null
@@ -1,323 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.1.3.7 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 44 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 67 0 1 #"\0"
-0 75 1 #"\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 192 46 214 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 57 89 216 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-37 #"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-36 #"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-28 #"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-37 #"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-36 #"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1 0 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 200 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 160 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 160 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 90 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 90 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 90 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 160 0 0 0 0 -1
--1 0 1 #"\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 192 46 214 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 57 89 216 0
-0 0 -1 -1           0 49 0 27 3 17 #"#lang racket/base"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 17 3 33 #";; test that collapsed snipclass "
-0 0 4 29 1 #"\n"
-0 0 17 3 30 #";; work when a file is loaded "
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 4 3 1 #" "
-0 0 23 3 1 #"("
-0 0 14 3 1 #"f"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 2 #"  "
-0 8          42 4 2 #"(\0"
-2 #")\0"
-7 7 #"wxtext\0"
-3 1 #"("
-7 #"wxtext\0"
-3 1 #"+"
-7 #"wxtext\0"
-3 1 #" "
-7 #"wxtext\0"
-3 1 #"1"
-7 #"wxtext\0"
-3 1 #" "
-7 #"wxtext\0"
-3 1 #"2"
-7 #"wxtext\0"
-3 1 #")"
-0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 14 3 2 #"if"
-0 0 4 3 1 #" "
-0 0 23 3 1 #"("
-0 0 14 3 1 #"="
-0 0 4 3 1 #" "
-0 0 23 3 1 #"("
-0 0 14 3 1 #"f"
-0 0 4 3 1 #" "
-0 0 21 3 1 #"2"
-0 0 23 3 1 #")"
-0 0 4 3 1 #" "
-0 0 21 3 1 #"3"
-0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 4 #"    "
-0 0 21 3 1 #"'"
-0 0 14 3 6 #"passed"
-0 0 4 29 1 #"\n"
-0 0 4 3 4 #"    "
-0 0 23 3 1 #"("
-0 0 14 3 5 #"error"
-0 0 4 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 6 #"failed"
-0 0 23 3 2 #"))"
-0 0 4 29 1 #"\n"
-0           0
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/collapsed2.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/collapsed2.rkt
deleted file mode 100644
index 970fe33a72..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/collapsed2.rkt
+++ /dev/null
@@ -1,284 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.1.3.7 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 44 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 93
-(
- #"((lib \"collapsed-snipclass.ss\" \"framework\") (lib \"collapsed-sni"
- #"pclass-wxme.ss\" \"framework\"))\0"
-) 0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 55 0 1 #"\0"
-0 75 1 #"\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 192 46 214 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 57 89 216 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-37 #"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-36 #"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-28 #"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-37 #"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-36 #"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1           0 43 0 27 3 12 #"#lang racket"
-0 0 4 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 4 3 1 #" "
-0 0 23 3 1 #"("
-0 0 14 3 1 #"f"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 2 #"  "
-0 8          42 4 2 #"(\0"
-2 #")\0"
-7 7 #"wxtext\0"
-3 1 #"("
-7 #"wxtext\0"
-3 1 #"+"
-7 #"wxtext\0"
-3 1 #" "
-7 #"wxtext\0"
-3 1 #"x"
-7 #"wxtext\0"
-3 1 #" "
-7 #"wxtext\0"
-3 1 #"1"
-7 #"wxtext\0"
-3 1 #")"
-0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 14 3 2 #"if"
-0 0 4 3 1 #" "
-0 0 23 3 1 #"("
-0 0 14 3 1 #"="
-0 0 4 3 1 #" "
-0 0 23 3 1 #"("
-0 0 14 3 1 #"f"
-0 0 4 3 1 #" "
-0 0 21 3 1 #"4"
-0 0 23 3 1 #")"
-0 0 4 3 1 #" "
-0 0 21 3 1 #"5"
-0 0 23 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 4 #"    "
-0 0 21 3 1 #"'"
-0 0 14 3 6 #"passed"
-0 0 4 29 1 #"\n"
-0 0 4 3 4 #"    "
-0 0 23 3 1 #"("
-0 0 14 3 5 #"error"
-0 0 4 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 6 #"failed"
-0 0 23 3 2 #"))"
-0 0 4 29 1 #"\n"
-0           0
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/commentbox.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/commentbox.rkt
deleted file mode 100644
index c963f65be8..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/commentbox.rkt
+++ /dev/null
@@ -1,258 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.1.3.8 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 44 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 55 0 1 #"\0"
-0 75 1 #"\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 192 46 214 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 57 89 216 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-37 #"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-36 #"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-28 #"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-37 #"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-36 #"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1           0 9 0 27 3 17 #"#lang racket/base"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 7         106 4           0 0           0 9 0 14 3 4 #"this"
-0 0 2 3 1 #" "
-0 0 14 3 2 #"is"
-0 0 2 3 1 #" "
-0 0 14 3 1 #"a"
-0 0 2 3 1 #" "
-0 0 14 3 8 #"comment."
-0 0 2 29 1 #"\n"
-0 7          49 2           0 0           0 7 0 14 3 4 #"With"
-0 0 2 3 1 #" "
-0 0 14 3 3 #"one"
-0 0 2 3 1 #" "
-0 0 14 3 6 #"inside"
-0 0 2 3 1 #" "
-0 0 14 3 3 #"..."
-0           0 0           0 0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 17 3 2 #"; "
-0 7          85 17           0 0           0 13 0 14 3 4 #"this"
-0 0 2 3 1 #" "
-0 0 14 3 2 #"is"
-0 0 2 3 1 #" "
-0 0 14 3 1 #"a"
-0 0 2 3 1 #" "
-0 0 14 3 9 #"commented"
-0 0 2 3 1 #" "
-0 0 14 3 3 #"out"
-0 0 2 3 1 #" "
-0 0 14 3 7 #"comment"
-0 0 2 3 1 #" "
-0 0 14 3 3 #"box"
-0           0 0 0 4 29 1 #"\n"
-0           0
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/image.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/image.rkt
deleted file mode 100644
index baaa9c9de1..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/image.rkt
+++ /dev/null
@@ -1,261 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.1.3.8 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 44 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 55 0 1 #"\0"
-0 75 1 #"\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 192 46 214 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 57 89 216 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-37 #"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-36 #"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-28 #"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-37 #"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-36 #"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1           0 4 0 27 3 17 #"#lang racket/base"
-0 0 4 29 1 #"\n"
-0 2          15 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0           2 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\0\21\0\0\0\21\b"
- #"\6\0\0\0;mG\372\0\0\0\6bKGD\0\377\0\377\0\377\240\275\247"
- #"\223\0\0\1\340IDAT8\215\235\220=hSa\30\205\237\363\345\266J\227"
- #"\16vP\222\233\253E\335\265R\24\334"
- #"t\260\320\241\203\bA\210\326\e:)\332Iq1\273:\212ht\260\226\n:"
- #"\210\3703\n\376\200U\250\203\203\240\16"
- #"\222k\252\24\321\202\240$i\356}]R\rrS\255\357\366~\357\371\36\3169"
- #"b\225\223-f\327y=^\1\240\265\324\2721?5\377E\253\5dz3s"
- #"@\320~\252\306\315x\310[\r\304\353"
- #"\361\n\206\5\30\273\1\20O\275\36\257\260\"$\230\b\266[l{\351\245\22]"
- #"\214\26\273\351\272\306\31\234\30\354\217\223"
- #"\370\205a[\201\37\300\264\311\2322\35"
- #"\355\220\255\30G\255\2445\rl4\331"
- #"\270L\273\200\242Lk\201g2\315\300\357b]j\214Rp\4\0305\331\361X"
- #"\361M\241\30X\3\264\2046'$5\303\2062\275\2317\371R\276\330\315\311C"
- #"\214\303\210\327^\342\2754l\v\342\254"
- #"\231\335\3\36K\272\r,b\334\221\364\244k'A\30\2347\3311\340c\242\344"
- #"P\255R{\4\340\207\376\244\223\253\16"
- #"\270\201\273s\227\347\226\240K\261\2710"
- #"7\354\344\236\267\327\17BSq&\276"
- #"V\273T{\227\246O\355\304\311\235\21"
- #"\372,\323A\304+\303N\272\330\275\365C\177\362\237 ~\350\217\1#fv\256"
- #"z\265:\23U\242Q\303\366\267\325\237"
- #"\322 \277\212\315\205\271a\241\262\244}"
- #"\300\267F\263qa\371&\264\23h\366\305}\367S\235\4a\260\315\17\375\aN"
- #"n\326\311\355\3008\325h4\262\v\327\27\276w\350\306\200\257uW?"
- #"\21\224\202MiN\366H\32A\334\252\327\353\343\177|^\236\r@\277"
-) 55
-(
- #"ae\240\n\274\357<\2122^\276\226"
- #"\237\5\326GW\242\\\232\335\277\215\243L\213\204\3\300\351\377\1\0"
- #"\374\4j\324\271\303\330j\324+\0\0\0\0IEND\256B`\202"
-) 0 0 4 29 1 #"\n"
-0           0
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/info.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/info.rkt
deleted file mode 100644
index 2cc324cea6..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-omit-paths '("collapsed.rkt"))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/number-snip.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/number-snip.rkt
deleted file mode 100644
index 07043ae760..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/number-snip.rkt
+++ /dev/null
@@ -1,236 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.3.0.16 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 29 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 93
-(
- #"((lib \"collapsed-snipclass.ss\" \"framework\") (lib \"collapsed-sni"
- #"pclass-wxme.ss\" \"framework\"))\0"
-) 0 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 88
-(
- #"((lib \"pict-snip.rkt\" \"drracket\" \"private\") (lib \"pict-snip.r"
- #"kt\" \"drracket\" \"private\"))\0"
-) 0 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 1 6 #"wxloc\0"
-          0 0 60 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 7 #"Monaco\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 38
-#"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
-#"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 37
-#"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1 0 1 #"\0"
-0 75 7 #"Monaco\0"
-0.0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-0.0 13 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-0.0 13 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 148 0 211 0 0 0 -1
--1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1           0 4 0 4 3 12 #"#lang racket"
-0 0 4 29 1 #"\n"
-0 6          10 4 4 #"5/6\0"
-3 #"#e\0"
-9 #"improper\0"
-2 #"1\0"
-0 0 4 29 1 #"\n"
-0           0
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/pict-snip.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/pict-snip.rkt
deleted file mode 100644
index 5c4b3145c5..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/pict-snip.rkt
+++ /dev/null
@@ -1,285 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.2.1.6 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 30 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 93
-(
- #"((lib \"collapsed-snipclass.ss\" \"framework\") (lib \"collapsed-sni"
- #"pclass-wxme.ss\" \"framework\"))\0"
-) 0 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 88
-(
- #"((lib \"pict-snip.rkt\" \"drracket\" \"private\") (lib \"pict-snip.r"
- #"kt\" \"drracket\" \"private\"))\0"
-) 0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 57 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 7 #"Monaco\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 192 46 214 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 57 89 216 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-37 #"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 102 102 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 249 148 40 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 51 174 51 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 60 194 57 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 151 69 43 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-36 #"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 163 255 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-28 #"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-37 #"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-36 #"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 166 0 255 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 192 203 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 50 205 50 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 240 230 140 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 255 255 0 0 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 205 92 92 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 255 255 0 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 200 0 0 0 0 0 -1 -1
-          0 5 0 27 3 17 #"#lang racket/base"
-0 0 4 29 1 #"\n"
-0 14           4 4 3820
-(
- #"(516.0 114.2421875 14.0 43.12109375 ((do-set-pen! ((0 0 0 1.0) 1 sol"
- #"id round round #f)) (do-set-brush! ((255 255 255 1.0) solid #f #f #f"
- #")) (set-font (12 #f default normal normal #f default #f)) (set-smoot"
- #"hing unsmoothed) (set-text-mode transparent) (set-alpha 1.0) (set-cl"
- #"ipping-region #f) (set-scale 4.0 4.0) (set-font (14 #f roman italic "
- #"normal #f default #t)) (draw-text \"e\" 0.0 0.2802734375 #t 0 0.0) ("
- #"set-font (12 #f default normal normal #f default #f)) (set-font (14 "
- #"#f roman normal normal #f default #t)) (draw-text \" ::= \" 6.0 0.28"
- #"02734375 #t 0 0.0) (set-font (12 #f default normal normal #f default"
- #" #f)) (set-font (14 #f roman normal normal #f default #t)) (draw-tex"
- #"t \"(\" 29.0 0.2802734375 #t 0 0.0) (set-font (12 #f default normal "
- #"normal #f default #f)) (set-font (14 #f roman italic normal #f defau"
- #"lt #t)) (draw-text \"e\" 34.0 0.2802734375 #t 0 0.0) (set-font (12 #"
- #"f default normal normal #f default #f)) (set-font (14 #f roman norma"
- #"l normal #f default #t)) (draw-text \" \" 40.0 0.2802734375 #t 0 0.0"
- #") (set-font (12 #f default normal normal #f default #f)) (set-font ("
- #"14 #f roman italic normal #f default #t)) (draw-text \"e\" 44.0 0.28"
- #"02734375 #t 0 0.0) (set-font (12 #f default normal normal #f default"
- #" #f)) (set-font (14 #f roman normal normal #f default #t)) (draw-tex"
- #"t \")\" 50.0 0.2802734375 #t 0 0.0) (set-font (12 #f default normal "
- #"normal #f default #f)) (set-font (14 #f roman normal normal #f defau"
- #"lt #t)) (draw-text \" | \" 55.0 0.2802734375 #t 0 0.0) (set-font (12"
- #" #f default normal normal #f default #f)) (set-font (14 #f roman ita"
- #"lic normal #f default #t)) (draw-text \"x\" 65.0 0.2802734375 #t 0 0"
- #".0) (set-font (12 #f default normal normal #f default #f)) (set-font"
- #" (14 #f roman normal normal #f default #t)) (draw-text \" | \" 71.0 "
- #"0.2802734375 #t 0 0.0) (set-font (12 #f default normal normal #f def"
- #"ault #f)) (set-font (14 #f roman normal normal #f default #t)) (draw"
- #"-text \"(\" 81.0 0.2802734375 #t 0 0.0) (set-font (12 #f default nor"
- #"mal normal #f default #f)) (set-font (14 #f swiss normal normal #f d"
- #"efault #t)) (draw-text \"\316\273\" 86.0 0.0 #t 0 0.0) (set-font (12"
- #" #f default normal normal #f default #f)) (set-font (14 #f roman nor"
- #"mal normal #f default #t)) (draw-text \" \" 94.0 0.2802734375 #t 0 0"
- #".0) (set-font (12 #f default normal normal #f default #f)) (set-font"
- #" (14 #f roman normal normal #f default #t)) (draw-text \"(\" 98.0 0."
- #"2802734375 #t 0 0.0) (set-font (12 #f default normal normal #f defau"
- #"lt #f)) (set-font (14 #f roman italic normal #f default #t)) (draw-t"
- #"ext \"x\" 103.0 0.2802734375 #t 0 0.0) (set-font (12 #f default norm"
- #"al normal #f default #f)) (set-font (14 #f roman normal normal #f de"
- #"fault #t)) (draw-text \")\" 109.0 0.2802734375 #t 0 0.0) (set-font ("
- #"12 #f default normal normal #f default #f)) (set-font (14 #f roman n"
- #"ormal normal #f default #t)) (draw-text \" \" 114.0 0.2802734375 #t "
- #"0 0.0) (set-font (12 #f default normal normal #f default #f)) (set-f"
- #"ont (14 #f roman italic normal #f default #t)) (draw-text \"e\" 118."
- #"0 0.2802734375 #t 0 0.0) (set-font (12 #f default normal normal #f d"
- #"efault #f)) (set-font (14 #f roman normal normal #f default #t)) (dr"
- #"aw-text \")\" 124.0 0.2802734375 #t 0 0.0) (set-font (12 #f default "
- #"normal normal #f default #f)) (set-font (14 #f roman normal normal #"
- #"f default #t)) (draw-text \" | \" 19.0 14.560546875 #t 0 0.0) (set-f"
- #"ont (12 #f default normal normal #f default #f)) (set-font (14 #f ro"
- #"man italic normal #f default #t)) (draw-text \"number\" 29.0 14.5605"
- #"46875 #t 0 0.0) (set-font (12 #f default normal normal #f default #f"
- #")) (set-font (14 #f roman normal n"
- #"ormal #f default #t)) (draw-text \" | \" 72.0 14.560546875 #t 0 0.0)"
- #" (set-font (12 #f default normal normal #f default #f)) (set-font (1"
- #"4 #f swiss normal normal #f default #t)) (draw-text \"add1\" 82.0 14"
- #".2802734375 #t 0 0.0) (set-font (12 #f default normal normal #f defa"
- #"ult #f)) (set-scale 1.0 1.0)))"
-) 0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0           0
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/run-all.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/run-all.rkt
deleted file mode 100644
index f1659153b2..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/run-all.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-(require racket/gui/base)
-(require racket/runtime-path)
-(define-runtime-path here ".")
-
-(define known-wxme-failures '("collapsed.rkt" "run-collapsed.rkt"))
-
-(define (record-failure exn)
-  (parameterize ([current-error-port (current-output-port)])
-    (set! failures (+ failures 1))
-    ((error-display-handler) (exn-message exn) exn)))
-
-(define failures 0)
-(define tried 0)
-
-(define on (current-namespace))
-
-(parameterize ([use-compiled-file-paths '()])
-  ;; setting the use-compiled-file-paths here is important
-  ;; so we don't "cheat" by using the wxme version to compile
-  ;; the file and then just avoid using the GUI version at all.
-  
-  (for ([f (in-list (sort (directory-list here) string<=? 
-                          #:key path->string))])
-    
-    (define gui-namespace (make-gui-namespace))
-    (define base-namespace (make-base-namespace))
-    
-    (define f-str (path->string f))
-    (unless (member f-str '("info.rkt" "run-all.rkt"))
-      (when (regexp-match #rx"[.]rkt$" f-str)
-        (parameterize ([current-namespace gui-namespace])
-          (set! tried (+ tried 1))
-          (printf "=== trying ~a with gui-namespace\n" f)
-          (with-handlers ((exn:fail? record-failure))
-            (dynamic-require (build-path here f) #f)))
-        
-        (unless (member f-str known-wxme-failures)
-          (parameterize ([current-namespace base-namespace])
-            (set! tried (+ tried 1))
-            (printf "=== trying ~a with base-namespace\n" f)
-            (with-handlers ((exn:fail? record-failure))
-              (dynamic-require (build-path here f) #f))))))))
-
-(printf "tried ~a files\n" tried)
-(unless (zero? failures)
-  (eprintf "~a attempt~a failed\n"
-           failures
-           (if (= failures 1) "" "s")))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/run-collapsed.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/run-collapsed.rkt
deleted file mode 100644
index 2b840517e6..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snip/run-collapsed.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require racket/gui/base)
-
-;; Using `racket/gui/base` installs the right load handler:
-(dynamic-require "collapsed.rkt" 0)
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snips.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snips.rkt
deleted file mode 100644
index fae1d1ce56..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snips.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-(require "private/drracket-test-util.rkt"
-         racket/class
-         racket/runtime-path
-         racket/file
-         racket/gui/base)
-(define-runtime-path snip "snip")
-
-(fire-up-drracket-and-run-tests
- (λ ()
-   
-   (define drs (wait-for-drracket-frame))
-   (define tmpdir (make-temporary-file "drracketsniptest~a" 'directory))
-   (define defs (queue-callback/res (λ () (send drs get-definitions-text))))
-   (for ([rfile (in-list (directory-list snip))])
-     (define file (build-path snip rfile))
-     (when (file-exists? file)  ;; skip subdirectories
-       (printf "  trying ~a\n" rfile)
-       (queue-callback/res 
-        (λ () (send defs load-file file)))
-       (save-drracket-window-as (build-path tmpdir rfile))
-       (define drs2 (wait-for-drracket-frame))
-       (unless (eq? drs drs2)
-         (error 'snips.rkt "lost drracket frame while saving ~s" rfile))))
-   
-   (delete-directory/files tmpdir)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/stepper-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/stepper-test.rkt
deleted file mode 100644
index 0790334649..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/stepper-test.rkt
+++ /dev/null
@@ -1,690 +0,0 @@
-
-(module stepper-test mzscheme
-  (require mred
-           mzlib/class
-           "private/drracket-test-util.rkt"
-           "private/gui.rkt"
-           framework
-           mzlib/pretty)
-  
-  (provide run-test)
-  
-  (define next-button-label "Step >")
-  (define no-more-steps-message "All of the definitions have been successfully evaluated.")
-  
-  ;; type contents = (listof (union snip string contents))
-  ;; type error = (make-error string)
-  ;; type step = (make-step contents contents (union error contents))
-  (define-struct step (definitions before after) (make-inspector))
-  (define-struct err (message) (make-inspector))
-
-  ;; type program-spec = (union string (make-file string))
-  (define-struct file (name))
-  
-  (define current-program-id (make-parameter 'current-program-id-unset))
-  (define failure-escape (make-parameter 'failure-escape-unset))
-  
-  (define sample-solutions-directory "/home/robby/unison/collects/solutions")
-  
-  (define to-skip-to "average-price.scm")
-  
-  (define (run-test)
-    (run-fully-specified-tests)
-    
-    #|
-    (set-language-level! (list "Beginning Student with List Abbreviations"))
-    (run-string-test "(define (f x) (* x 2))\n(+ 1 (f (+ 1 1)))")
-    (run-string-test "(sqrt 2)")
-    (run-string-test "(car)")
-    
-    (run-sample-solution-tests)
-    |#
-    )
- 
-  (define (run-fully-specified-tests)
-    (set-language-level! (list "Beginning Student"))
-    (beginner-tests/no-list)
-    (test-transcript '(cons 1 (cons 2 (list 3 4 5)))
-                     '(cons 1 (cons 2 (cons 3 (cons 4 (cons 5 empty))))))
-    
-    (set-language-level! (list "Beginning Student with List Abbreviations"))
-    (beginner-tests/no-list)
-    (test-transcript '(cons 1 (cons 2 (list 3 4 5)))
-                     '(cons 1 (list 2 3 4 5))
-                     '(list 1 2 3 4 5)))
-  
-  (define (beginner-tests/no-list)
-    (test-transcript '(+ 1 2) 3)
-    (test-transcript
-     '(cond [(= 1 1) (cond [(= 1 2) 3] [else 4])])
-     '(cond [true (cond [(= 1 2) 3] [else 4])])
-     '(cond [(= 1 2) 3] [else 4])
-     '(cond [false 3] [else 4])
-     '(cond [else 4])
-     '4)
-    (test-transcript
-     '(if (= 1 1) (if (= 1 2) 4 (if (= 1 1) 5 6)) 7)
-     '(if true (if (= 1 2) 4 (if (= 1 1) 5 6)) 7)
-     '(if (= 1 2) 4 (if (= 1 1) 5 6))
-     '(if false 4 (if (= 1 1) 5 6))
-     '(if (= 1 1) 5 6)
-     '(if true 5 6)
-     '5)
-    (test-transcript
-     '(and (or true false)
-           (or false false true)
-           (and true true)
-           false)
-     '(and true
-           (or false false true)
-           (and true true)
-           false)
-     '(and true
-           true
-           (and true true)
-           false)
-     '(and true
-           true
-           true
-           false)
-     'false)
-
-    (fully-specified-test
-     "(+ #i1.2 1)"
-     (make-step '() '("(+ #i1.2 1)") '("#i2.2"))
-     (make-step '("#i2.2") '() '()))
-    
-    (test-transcript/defns
-     (list '(define (f x) (+ x 1)))
-     '(f 1)
-     '(+ 1 1)
-     '2)
-
-    (test-transcript
-     '(+ 1 (posn-x (make-posn (+ 1 2) (+ 3 4))))
-     '(+ 1 (posn-x (make-posn 3 (+ 3 4))))
-     '(+ 1 (posn-x (make-posn 3 7)))
-     '(+ 1 3)
-     '4)
-    
-    (test-transcript/defns
-     (list '(define-struct s (a b)))
-     '(if (s? (make-s 'a 'b))
-          (s-a (make-s 'c 'd))
-          'ack)
-     '(if true
-          (s-a (make-s 'c 'd))
-          'ack)
-     '(s-a (make-s 'c 'd))
-     ''c)
-
-    (test-transcript/defns
-     (list '(define x 1))
-     '(+ x x)
-     '(+ 1 x)
-     '(+ 1 1)
-     '2)
-    
-    (test-transcript/defns
-     (list '(define-struct con (hd tl))
-           '(define-struct mt ())
-           '(define (sum l)
-              (cond
-                [(mt? l) 0]
-                [(con? l) (+ (con-hd l) (sum (con-tl l)))])))
-     '(sum (make-con 5 (make-con 6 (make-con 7 (make-mt)))))
-     '(cond
-        [(mt? (make-con 5 (make-con 6 (make-con 7 (make-mt))))) 0]
-        [(con? (make-con 5 (make-con 6 (make-con 7 (make-mt))))) 
-         (+ (con-hd (make-con 5 (make-con 6 (make-con 7 (make-mt)))))
-            (sum (con-tl (make-con 5 (make-con 6 (make-con 7 (make-mt)))))))])
-     '(cond
-        [false 0]
-        [(con? (make-con 5 (make-con 6 (make-con 7 (make-mt))))) 
-         (+ (con-hd (make-con 5 (make-con 6 (make-con 7 (make-mt)))))
-            (sum (con-tl (make-con 5 (make-con 6 (make-con 7 (make-mt)))))))])
-     '(cond
-        [(con? (make-con 5 (make-con 6 (make-con 7 (make-mt))))) 
-         (+ (con-hd (make-con 5 (make-con 6 (make-con 7 (make-mt)))))
-            (sum (con-tl (make-con 5 (make-con 6 (make-con 7 (make-mt)))))))])
-     '(cond
-        [true
-         (+ (con-hd (make-con 5 (make-con 6 (make-con 7 (make-mt)))))
-            (sum (con-tl (make-con 5 (make-con 6 (make-con 7 (make-mt)))))))])
-     '(+ (con-hd (make-con 5 (make-con 6 (make-con 7 (make-mt)))))
-         (sum (con-tl (make-con 5 (make-con 6 (make-con 7 (make-mt)))))))
-     '(+ 5
-         (sum (con-tl (make-con 5 (make-con 6 (make-con 7 (make-mt)))))))
-     '(+ 5
-         (sum (make-con 6 (make-con 7 (make-mt)))))
-     '(+ 5
-         (cond
-           [(mt? (make-con 6 (make-con 7 (make-mt)))) 0]
-           [(con? (make-con 6 (make-con 7 (make-mt)))) 
-            (+ (con-hd (make-con 6 (make-con 7 (make-mt))))
-               (sum (con-tl (make-con 6 (make-con 7 (make-mt))))))]))
-     '(+ 5
-         (cond
-           [false 0]
-           [(con? (make-con 6 (make-con 7 (make-mt)))) 
-            (+ (con-hd (make-con 6 (make-con 7 (make-mt))))
-               (sum (con-tl (make-con 6 (make-con 7 (make-mt))))))]))
-     '(+ 5
-         (cond
-           [(con? (make-con 6 (make-con 7 (make-mt)))) 
-            (+ (con-hd (make-con 6 (make-con 7 (make-mt))))
-               (sum (con-tl (make-con 6 (make-con 7 (make-mt))))))]))
-     '(+ 5
-         (cond
-           [true
-            (+ (con-hd (make-con 6 (make-con 7 (make-mt))))
-               (sum (con-tl (make-con 6 (make-con 7 (make-mt))))))]))
-     '(+ 5
-         (+ (con-hd (make-con 6 (make-con 7 (make-mt))))
-            (sum (con-tl (make-con 6 (make-con 7 (make-mt)))))))
-     '(+ 5
-         (+ 6
-            (sum (con-tl (make-con 6 (make-con 7 (make-mt)))))))
-     '(+ 5
-         (+ 6
-            (sum (make-con 7 (make-mt)))))
-     '(+ 5
-         (+ 6
-            (cond
-              [(mt? (make-con 7 (make-mt))) 0]
-              [(con? (make-con 7 (make-mt))) 
-               (+ (con-hd (make-con 7 (make-mt))) 
-                  (sum (con-tl (make-con 7 (make-mt)))))])))
-     '(+ 5
-         (+ 6
-            (cond
-              [false 0]
-              [(con? (make-con 7 (make-mt))) 
-               (+ (con-hd (make-con 7 (make-mt))) 
-                  (sum (con-tl (make-con 7 (make-mt)))))])))
-     '(+ 5
-         (+ 6
-            (cond
-              [(con? (make-con 7 (make-mt))) 
-               (+ (con-hd (make-con 7 (make-mt))) 
-                  (sum (con-tl (make-con 7 (make-mt)))))])))
-     '(+ 5
-         (+ 6
-            (cond
-              [true
-               (+ (con-hd (make-con 7 (make-mt))) 
-                  (sum (con-tl (make-con 7 (make-mt)))))])))
-     '(+ 5
-         (+ 6
-            (+ (con-hd (make-con 7 (make-mt))) 
-               (sum (con-tl (make-con 7 (make-mt)))))))
-     '(+ 5
-         (+ 6
-            (+ 7
-               (sum (con-tl (make-con 7 (make-mt)))))))
-     '(+ 5
-         (+ 6
-            (+ 7
-               (sum (make-mt)))))
-     '(+ 5
-         (+ 6
-            (+ 7
-               (cond
-                [(mt? (make-mt)) 0]
-                [(con? (make-mt)) (+ (con-hd (make-mt)) (sum (con-tl (make-mt))))]))))
-     '(+ 5
-         (+ 6
-            (+ 7
-               (cond
-                [true 0]
-                [(con? (make-mt)) (+ (con-hd (make-mt)) (sum (con-tl (make-mt))))]))))
-     '(+ 5 (+ 6 (+ 7 0)))
-     '(+ 5 (+ 6 7))
-     '(+ 5 13)
-     '18))
-     
-  (define (fully-specified-test init . steps)
-    (let ([actual (step-and-extract-program init)])
-      (unless (equal? actual steps)
-        (printf "FAILED: ~s\nexpected: ~s\n     got: ~s\n" init steps actual))))
-
-  (define (test-transcript/defns defns init . sexp-steps)
-    (let* ([str-defns (apply string-append (map (lambda (x) (string-append (to-string x) "\n")) defns))]
-           [actual-steps (step-and-extract-program (format "~a~a" str-defns (to-string init)))]
-           [failed
-            (lambda (msg . args)
-              (printf "FAILED: ~a\ndefns: ~s\nexpected: ~s\nactual: ~s\n\n" 
-                      (apply format msg args)
-                      defns
-                      (cons init sexp-steps)
-                      actual-steps))])
-      (let loop ([steps actual-steps]
-                 [last init]
-                 [sexps sexp-steps]
-                 [n 0])
-        (cond
-          [(and (null? sexps) 
-                (not (null? steps))
-                (null? (cdr steps)))
-           (let ([step (car steps)])
-             (unless (ws-equal? (stringify (step-definitions step))
-                                (string-append
-                                 str-defns
-                                 "\n"
-                                 (to-string last)))
-               (failed "mismatch at last step ~s and ~s"
-                       (step-definitions step)
-                       last))
-             (unless (and (equal? '() (step-before step))
-                          (equal? '() (step-after step)))
-               (failed "expected empty before and after steps in the last step")))]
-          [(or (null? steps) (null? sexps))
-           (failed "different length")]
-          [else
-           (let ([step (car steps)]
-                 [sexp (car sexps)])
-             (cond
-               [(not (ws-equal? (stringify (step-definitions step)) str-defns))
-                (failed "mismatch at ~a defnitions ~s and ~s" 
-                        n
-                        (stringify (step-definitions step))
-                        str-defns)]
-               [(not (ws-equal? (stringify (step-before step))
-                                (to-string last)))
-                (failed "mismatch at ~a before ~s and ~s"
-                        n
-                        (stringify (step-before step))
-                        last)]
-               [(not (ws-equal? (stringify (step-after step))
-                                (to-string sexp)))
-                (failed "mismatch at ~a after ~s and ~s"
-                        n
-                        (stringify (step-after step))
-                        sexp)]
-               [else
-                (loop (cdr steps)
-                      sexp
-                      (cdr sexps)
-                      (+ n 1))]))]))))
-
-  (define (to-string s)
-    (let ([sp (open-output-string)])
-      (parameterize ([pretty-print-columns 'infinity]
-                     [current-output-port sp])
-        (pretty-print s))
-      (get-output-string sp)))
-  
-  (define (stringify x)
-    (unless (andmap string? x)
-      (error 'stringify "cannot: ~s" x))
-    (apply string-append x))
-  
-  (define (test-transcript init . sexp-steps)
-    (apply test-transcript/defns '() init sexp-steps))
-  
-  (define (ws-equal? s1 s2)
-    (equal? (regexp-replace* "[ \t\n]+"
-                             (string-append " " s1 " ")
-                             " ")
-            (regexp-replace* "[ \t\n]+"
-                             (string-append " " s2 " ")
-                             " ")))
-                       
-  (define (run-sample-solution-tests)
-    (let ([found-it? #f])
-      (for-each
-       (lambda (file) 
-         (when (equal? file to-skip-to)
-           (set! found-it? #t))
-         (when found-it?
-           (run-file-test (build-path sample-solutions-directory file))))
-       (directory-list sample-solutions-directory))))
-  
-  ;; run-file-test : string -> void
-  (define (run-file-test filename)
-    (let/ec k
-      (parameterize ([current-program-id filename]
-                     [failure-escape k])
-        (check-steps
-         (make-file filename)
-         (step-and-extract-program (make-file filename))))))
-  
-  ;; run-string-test : string -> void
-  ;; runs the test in the string.
-  (define (run-string-test prog)
-    (let/ec k
-      (parameterize ([current-program-id prog]
-                     [failure-escape k])
-        (check-steps
-         prog
-         (step-and-extract-program prog)))))
-  
-  ;; simple-failure : (union #f step) string any ... -> beta
-  ;; indicates that this one test failed, but the stepper may still
-  ;; be steppable, so just jumps out of this one test.
-  (define (simple-failure step message . args)
-    (printf "FAILED TEST ~s:\n" (current-program-id))
-    (when step (printf "~s\n" step))
-    (printf "~a\n\n" (apply format message args))
-    ((failure-escape)))
-  
-  ;; check-steps : program-spec (listof step) -> void
-  ;; executes each of the steps in DrRacket and raises
-  ;; an exception if something doesn't match up.
-  (define (check-steps program steps)
-    (let* ([drs-frame (wait-for-drracket-frame)]
-           [defs-text (send drs-frame get-definitions-text)])
-      (let loop ([last-results #f]
-                 [steps steps])
-        (cond
-          [(null? steps)
-           (clear-definitions drs-frame)
-           (type-in-definitions drs-frame ";; full prog\n")
-           (set-definitions-to-program drs-frame program)
-           (do-execute drs-frame)
-           (let ([prog-results (fetch-output drs-frame)])
-             
-             ;; can only check subset here, since we may have stopped stepping early
-             (check-subset-results #f last-results prog-results))]
-          [else
-           (let ([step (car steps)])
-             (clear-definitions drs-frame)
-             (dynamic-wind
-              (lambda ()
-                (send defs-text begin-edit-sequence))
-              (lambda ()
-                (type-in-definitions drs-frame ";; before\n")
-                (insert-into-definitions drs-frame (step-definitions step))
-                (type-in-definitions drs-frame "\n")
-                (insert-into-definitions drs-frame (step-before step)))
-              (lambda ()
-                (send defs-text end-edit-sequence)))
-             (do-execute drs-frame)
-             (let ([before-results (fetch-output drs-frame)])
-               (when last-results
-                 (check-subset-results step last-results before-results))
-               (clear-definitions drs-frame)
-               (dynamic-wind
-                (lambda ()
-                  (send defs-text begin-edit-sequence))
-                (lambda ()
-                  (type-in-definitions drs-frame ";; after\n")
-                  (insert-into-definitions drs-frame (step-definitions step))
-                  (type-in-definitions drs-frame "\n")
-                  (unless (err? (step-after step))
-                    (insert-into-definitions drs-frame (step-after step))))
-                (lambda ()
-                  (send defs-text end-edit-sequence)))
-               (do-execute drs-frame)
-               (cond
-                 [(err? (step-after step))
-                  (let* ([pre-output (fetch-output drs-frame)]
-                         [add-newline? (and ((string-length pre-output) . >= . 1)
-                                            (not
-                                             (char=?
-                                              (string-ref pre-output 
-                                                          (- (string-length pre-output) 1))
-                                              #\newline)))]
-                         [after-results 
-                          (if add-newline?
-                              (string-append pre-output
-                                             "\n"
-                                             (err-message (step-after step)))
-                              (string-append pre-output
-                                             (err-message (step-after step))))])
-                    (check-same-results step before-results after-results)
-                    (unless (null? (cdr steps))
-                      (simple-failure #f "expected no more steps after an error, found ~s" (cdr steps)))
-                    (loop after-results null))]
-                 [else
-                  (let ([after-results (fetch-output drs-frame)])
-                    (check-same-results step before-results after-results)
-                    (loop after-results (cdr steps)))])))]))))
-
-  ;; insert-info-definitions : frame contents -> void
-  ;; technically, this function should probably type the
-  ;; contents into the definitions window, but that is
-  ;; considerably slower than just inserting it directly....
-  (define (insert-into-definitions drs-frame orig-contents)
-    (let ([defns (send drs-frame get-definitions-text)])
-      (let loop ([contents orig-contents])
-        (for-each
-         (lambda (content)
-           (cond
-             [(string? content)
-              (send defns insert content
-                    (send defns last-position)
-                    (send defns last-position))]
-             [(is-a? content snip%)
-              (send defns insert (send content copy)
-                    (send defns last-position)
-                    (send defns last-position))]
-             [(eq? content 'unknown)
-              (error 'insert-into-definitions "found unknown snip in ~e" orig-contents)]
-             [(list? content) 
-              ;; wrong thing. this flattens embedded editors
-              (loop content)]))
-         contents))))
-  
-  ;; check-subset-results : step string string -> void
-  ;; raises an error if s1 is not the beginning of s2.
-  (define (check-subset-results step s1 s2)
-    (unless (and (<= (string-length s1)
-                     (string-length s2))
-                 (string=? (substring s2 0 (string-length s1))
-                           s1))
-      (simple-failure step "expected\n  ~s\nto be the beginning of\n  ~s" s1 s2)))
-  
-  ;; check-same-results : step string string -> void
-  ;; raises an error if s1 is not s2.
-  (define (check-same-results step s1 s2)
-    (unless (string=? s1 s2)
-      (simple-failure step "expected\n  ~s\nto be the same as\n  ~s" s1 s2)))
-  
-  ;; step-and-extract-program : program-spec -> (listof step)
-  (define (step-and-extract-program program)
-    (let ([drs-frame (wait-for-drracket-frame)])
-      (clear-definitions drs-frame)
-      (set-definitions-to-program drs-frame program)
-      (let* ([stepper-frame (start-stepper drs-frame)]
-             [steps (get-all-steps stepper-frame)])
-        (test:menu-select "File" (if (eq? (system-type) 'unix) "Close" "Close Window"))
-        (let ([drs-frame1 (wait-for-new-frame stepper-frame)])
-          (unless (eq? drs-frame1 drs-frame)
-            (error 'step-and-extract "didn't get back to drscheme frame, got: ~e" drs-frame)))
-        steps)))
-
-  ;; set-definitions-to-program : program-spec -> void
-  (define (set-definitions-to-program drs-frame program)
-    (cond
-      [(string? program)
-       (type-in-definitions drs-frame program)]
-      [else
-       (let ([definitions-text (send drs-frame get-definitions-text)])
-         (send definitions-text load-file (file-name program))
-         (send definitions-text set-filename #f))]))
-
-  ;; start-stepper : frame -> frame
-  (define (start-stepper drs-frame)
-    (test:button-push (send drs-frame get-stepper-button))
-    (let ([stepper-frame (wait-for-new-frame drs-frame)])
-      stepper-frame))
-  
-  ;; get-all-steps : frame -> (listof step)
-  (define (get-all-steps stepper-frame)
-    (let* ([stepper-canvas (find-labelled-window #f editor-canvas% stepper-frame)]
-           [stepper-editor (poll-until (lambda () 
-                                         (let ([ed (send stepper-canvas get-editor)])
-                                           (if (and ed
-                                                    (not (send ed refresh-delayed?)))
-                                               ed
-                                               #f))))])
-      (cons (get-step stepper-frame stepper-editor)
-            (get-more-steps stepper-frame))))
-
-  ;; get-more-steps : stepper-frame -> (listof step)
-  ;; repeatedly push the next button to get out all of the steps
-  (define (get-more-steps stepper-frame)
-    (let ([next-button (find-labelled-window next-button-label button% stepper-frame)]
-          [stepper-canvas (find-labelled-window #f editor-canvas% stepper-frame)])
-      
-      ;; wait until we are in a "ready" state.
-      (poll-until (lambda () (send next-button is-enabled?))
-                  2
-                  void)
-      
-      ;; at most 200 steps
-      (let loop ([n 200])
-        (cond
-          [(zero? n) null]
-          [(send next-button is-enabled?)
-           (let* ([before-editor (poll-until (lambda () (send stepper-canvas get-editor)))]
-                  [new-step-available?
-                   ;; if there is a new editor and the next button is enabled,
-                   ;; we take that to mean that a new step has appeared.
-                   (lambda ()
-                     (let ([editor (send stepper-canvas get-editor)])
-                       (and editor
-                            (or (and (not (eq? before-editor editor))
-                                     (not (send editor refresh-delayed?))
-                                     (send next-button is-enabled?))
-                                (editor-has-stepper-done-message editor)))))])
-             (test:button-push next-button)
-             (poll-until new-step-available? 2 void)
-             (if (new-step-available?)
-                 (let ([step (get-step stepper-frame (send stepper-canvas get-editor))])
-                   (if step
-                       (cons step (loop (- n 1)))
-                       (loop (- n 1))))
-                 null))]
-          [else null]))))
-  
-  ;; editor-has-stepper-done-message : editor->boolean
-  (define (editor-has-stepper-done-message editor)
-    (string=? (send editor get-text 0 (send editor last-position))
-              no-more-steps-message))
-  
-  ;; get-step : frame editor -> (union step #f)
-  ;; extracts a step from the stepper window. Only returns #f for
-  ;; the "I'm done stepping" message that sometimes appears at the end.
-  (define (get-step stepper-frame stepper-editor)
-    (let ([canvas (find-labelled-window #f canvas% stepper-frame (lambda () #f))])
-      (when canvas
-        (error 'get-steps "stepper warning present!")))
-    (let* ([extraction (extract-from-editor stepper-editor)]
-           [step (separate-steps extraction)])
-      (unless step
-        (unless (equal? (list no-more-steps-message) extraction)
-          (error 'get-step "couldn't parse stepper window: ~s\n" extraction)))
-      step))
-      
-  ;; snips = (union (cons error snips) (cons snip snips) (cons snips snips) null)
-  ;; extract-from-editor : editor -> snips
-  (define (extract-from-editor editor)
-    (let loop ([snip (send editor find-first-snip)])
-      (cond
-        [(not snip)
-         null]
-        [(is-a? snip editor-snip%)
-         (let ([editor (send snip get-editor)])
-           (cons (cond
-                   [(not editor) '()]
-                   [(contains-error-message? editor)
-                    (let ([ans (extract-from-editor editor)])
-                      (unless (and (list? ans)
-                                   (andmap string? ans))
-                        (error 'extract-from-editor "couldn't parse error message: ~s" ans))
-                      (make-err (apply string-append ans)))]
-                   [else (extract-from-editor editor)])
-                 (loop (send snip next))))]
-        [(is-a? snip string-snip%)
-         (cons (send snip get-text 0 (send snip get-count) #t)
-               (loop (send snip next)))]
-        [(or (is-a? snip image-snip%)
-             (and (is-a? snip snip%)
-                  (method-in-interface? 'get-fraction-view (object-interface snip))))
-         (cons (send snip copy) (loop (send snip next)))]
-        [else (cons 'unknown
-                    (loop (send snip next)))])))
-  
-  ;; contains-error-message? : editor -> boolean
-  ;; returns #t if the editors contents look like an error message
-  (define (contains-error-message? editor)
-    (let ([snip (send editor find-first-snip)])
-      (and snip
-           (error-style? (send snip get-style)))))  
-  
-  ;; error-style? : style -> boolean
-  (define (error-style? style)
-    (let ([color (send style get-foreground)])
-      (and (color-equal? (send the-color-database find-color "red") color)
-           (memq (send style get-style) '(slant italic)))))
-  
-  ;; color-equal? : color color -> boolean
-  (define (color-equal? c1 c2)
-    (and (= (send c1 red) (send c2 red))
-         (= (send c1 green) (send c2 green))
-         (= (send c1 blue) (send c2 blue))))
-
-           
-  ;; separate-steps : snips -> (union step #f)
-  (define (separate-steps snips)
-    (let/ec k
-      (let ([program null]
-            [before null]
-            [after null]
-            [snips snips])
-        
-        (define (die which when)
-          (printf "~a: didn't find ~s\n  ~s\n  ~s\n  ~s\n  ~s\n" which when
-                  program
-                  before 
-                  after 
-                  snips))
-        
-        (define (hunt-for-list id)
-          (let loop ()
-            (cond
-              [(null? snips)
-               (die 'hunt-for-list.1 id)
-               (k #f)]
-              [(eq? 'unknown (car snips))
-               (die 'hunt-for-list.2 id)
-               (k #f)]
-              [(list? (car snips))
-               (begin0 (car snips)
-                       (set! snips (cdr snips)))]
-              [else (set! snips (cdr snips))
-                    (loop)])))
-        (define (hunt-for-list/error id)
-          (let loop ()
-            (cond
-              [(null? snips) 
-               (die 'hunt-for-list/error.1 id)
-               (k #f)]
-              [(eq? 'unknown (car snips)) 
-               (die 'hunt-for-list/error.2 id)
-               (k #f)]
-              [(or (err? (car snips)) (list? (car snips)))
-               (begin0 (car snips)
-                       (set! snips (cdr snips)))]
-              [else (set! snips (cdr snips))
-                    (loop)])))
-        (define (hunt-for-unknown id)
-          (let loop ()
-            (cond
-              [(null? snips) 
-               (die 'hunt-for-unknown id)
-               (k #f)]
-              [(eq? 'unknown (car snips)) (set! snips (cdr snips))]
-              [else (set! snips (cdr snips))
-                    (loop)])))
-        
-        ;(set! program (hunt-for-list 'program))
-        (set! before (hunt-for-list 'before))
-        (hunt-for-unknown 'between)
-        (set! after (hunt-for-list/error 'after))
-        
-        (make-step program
-                   before
-                   after)))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/syncheck-eval-compile-time.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/syncheck-eval-compile-time.rkt
deleted file mode 100644
index 0678db10e4..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/syncheck-eval-compile-time.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/base
-
-(require "private/drracket-test-util.rkt"
-         racket/class
-         framework)
-
-(define (main)
-  (fire-up-drracket-and-run-tests
-   (λ ()
-     (let ([drs (wait-for-drracket-frame)])
-       (set-module-language!)
-       (do-execute drs)
-       (queue-callback/res
-        (λ () 
-          (preferences:set 'framework:coloring-active #f)
-          (handler:edit-file (collection-file-path "map.rkt" "racket" "private"))))
-       
-       (click-check-syntax-and-check-errors drs "syncheck-eval-compile-time.rkt")))))
-
-
-;; copied from syncheck-test.rkt ....
-(define (click-check-syntax-and-check-errors drs test)
-  (click-check-syntax-button drs)
-  (wait-for-computation drs)
-  (when (queue-callback/res (λ () (send (send drs get-definitions-text) in-edit-sequence?)))
-    (error 'syncheck-test.rkt "still in edit sequence for ~s" test))
-  
-  (let ([err (queue-callback/res (λ () (send drs syncheck:get-error-report-contents)))]) 
-    (when err
-      (eprintf "FAILED ~s\n   error report window is visible:\n   ~a\n"
-               test
-               err))))
-(define (click-check-syntax-button drs)
-  (test:run-one (lambda () (send (send drs syncheck:get-button) command))))
-
-(main)
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/syncheck-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/syncheck-test.rkt
deleted file mode 100644
index 1edd450f1c..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/syncheck-test.rkt
+++ /dev/null
@@ -1,1695 +0,0 @@
-#lang racket/base
-
-  (require "private/drracket-test-util.rkt"
-           drracket/private/syncheck/local-member-names
-           drracket/syncheck-drracket-button
-           string-constants/string-constant
-           "private/gui.rkt"
-           racket/path
-           racket/class
-           racket/list
-           racket/file
-           racket/set
-           racket/pretty
-           racket/gui/base
-           framework
-           mrlib/text-string-style-desc
-           (for-syntax racket/base))
-  
-  (provide main)
-  
-  ;; type str/ann = (list (union symbol string) symbol)
-  ;; type test = (make-test string
-  ;;                        (or/c (-> any (listof str/ann)) 
-  ;;                              (listof str/ann))
-  ;;                               -- if proc, then pass in result of setup thunk
-  ;;                        (listof (cons (list number number) (listof (list number number)))))
-  ;;                        (listof (list number number) (listof string)))
-  ;;                        (-> any)
-  ;;                        (any -> void?)  -- argument is the result of the setup thunk
-  (define-struct test (line input expected arrows tooltips setup teardown extra-info?) #:transparent)
-  (define-struct (dir-test test) () #:transparent)
-  
-  (define-struct rename-test (line input pos old-name new-name output) #:transparent)
-  
-  (define build-test/proc
-    (λ (line input expected [arrow-table '()] #:tooltips [tooltips #f] 
-             #:setup [setup void] #:teardown [teardown void] #:extra-info? [extra-info? #f])
-      (make-test line input expected arrow-table tooltips setup teardown extra-info?)))
-  
-  (define-syntax (build-test stx)
-    (syntax-case stx ()
-      [(_ args ...)
-       (with-syntax ([line (syntax-line stx)])
-         #'(build-test/proc line args ...))]))
-  
-  (define-syntax (build-rename-test stx)
-    (syntax-case stx ()
-      [(_ args ...)
-       (with-syntax ([line (syntax-line stx)])
-         #'(rename-test line args ...))]))
-  
-  (define-syntax (build-dir-test stx)
-    (syntax-case stx ()
-      [(_ args ...)
-       (with-syntax ([line (syntax-line stx)])
-         ;; #f is for the tooltip portion of the test, just skip 'em
-         #'(make-dir-test line args ... #f void void #f))]))
-  
-  ;; tests : (listof test)
-  (define tests
-    (list
-
-     (build-test "12345"
-                '(("12345" constant)))
-     (build-test "'abcdef"
-                '(("'" imported-syntax)
-                  ("abcdef" constant)))
-     (build-test "(define f 1)"
-                '(("("      default-color)
-                  ("define" imported-syntax)
-                  (" "      default-color)
-                  ("f"      lexically-bound-variable)
-                  (" "      default-color)
-                  ("1"      constant)
-                  (")"      default-color)))
-     (build-test "(lambda (x) x)"
-                '(("("      default-color)
-                  ("lambda" imported-syntax)
-                  (" ("     default-color)
-                  ("x"      lexically-bound-variable)
-                  (") "     default-color)
-                  ("x"      lexically-bound-variable)
-                  (")"      default-color))
-                (list '((9 10) (12 13)))
-                #:tooltips '((9 10 "1 bound occurrence")))
-     (build-test "(lambda x x)"
-                '(("("      default-color)
-                  ("lambda" imported-syntax)
-                  (" "      default-color)
-                  ("x"      lexically-bound-variable)
-                  (" "      default-color)
-                  ("x"      lexically-bound-variable)
-                  (")"      default-color))
-                (list '((8 9) (10 11))))
-     (build-test "(lambda (x . y) x y)"
-                '(("("      default-color)
-                  ("lambda" imported-syntax)
-                  (" ("     default-color)
-                  ("x"      lexically-bound-variable)
-                  (" . "    default-color)
-                  ("y"      lexically-bound-variable)
-                  (") "     default-color)
-                  ("x"      lexically-bound-variable)
-                  (" "      default-color)
-                  ("y"      lexically-bound-variable)
-                  (")"      default-color))
-                (list '((9 10) (16 17))
-                      '((13 14) (18 19))))
-     
-     (build-test "(case-lambda [(x) x])"
-                 '(("("           default-color)
-                   ("case-lambda" imported-syntax)
-                   (" [("         default-color)
-                   ("x"           lexically-bound-variable)
-                   (") "          default-color)
-                   ("x"           lexically-bound-variable)
-                   ("])"          default-color))
-                 (list '((15 16) (18 19))))
-     
-     (build-test "(if 1 2 3)"
-                '(("("  default-color)
-                  ("if" imported-syntax)
-                  (" "  default-color)
-                  ("1"  constant)
-                  (" "  default-color)
-                  ("2"  constant)
-                  (" "  default-color)
-                  ("3"  constant)
-                  (")"  default-color)))
-     (build-test "(if 1 2)"
-                '(("("  default-color)
-                  ("if" imported-syntax)
-                  (" "  default-color)
-                  ("1"  constant)
-                  (" "  default-color)
-                  ("2"  constant)
-                  (")"  default-color)))
-     
-     (build-test "(begin 1 2)"
-                '(("("     default-color)
-                  ("begin" imported-syntax)
-                  (" "     default-color)
-                  ("1"     constant)
-                  (" "     default-color)
-                  ("2"     constant)
-                  (")"     default-color)))
-     (build-test "(begin0 1 2)"
-                '(("("      default-color)
-                  ("begin0" imported-syntax)
-                  (" "      default-color)
-                  ("1"      constant)
-                  (" "      default-color)
-                  ("2"      constant)
-                  (")"      default-color)))
-     (build-test "(let ([x x]) x)"
-                '(("("   default-color)
-                  ("let" imported-syntax)
-                  (" ([" default-color)
-                  ("x"   lexically-bound-variable)
-                  (" "   default-color)
-                  ("x"   free-variable)
-                  ("]) " default-color)
-                  ("x"   lexically-bound-variable)
-                  (")"   default-color))
-                (list '((7 8) (13 14))))
-     (build-test "(letrec ([x x]) x)"
-                '(("("      default-color)
-                  ("letrec" imported-syntax)
-                  (" (["    default-color)
-                  ("x"      lexically-bound-variable)
-                  (" "      default-color)
-                  ("x"      lexically-bound-variable)
-                  ("]) "    default-color)
-                  ("x"      lexically-bound-variable)
-                  (")"      default-color))
-                (list '((10 11) (12 13) (16 17))))
-     (build-test "(#%top . x)"
-                 '(("("     default-color) 
-                   ("#%top" imported-syntax)
-                   (" . "   default-color)
-                   ("x"     free-variable)
-                   (")"    default-color)))
-     (build-test "(set! x 1)"
-                '(("("    default-color)
-                  ("set!" imported-syntax)
-                  (" "    default-color)
-                  ("x"    free-variable)
-                  (" "    default-color)
-                  ("1"    constant)
-                  (")"    default-color)))
-     (build-test "(set! x 1) (define x 2)"
-                 '(("("      default-color)
-                   ("set!"   imported-syntax)
-                   (" "      default-color)
-                   ("x"      lexically-bound)
-                   (" "      default-color)
-                   ("1"      constant)
-                   (") ("    default-color)
-                   ("define" imported-syntax)
-                   (" "      default-color)
-                   ("x"      set!d)   ;; top-level doesn't help here ....
-                   (" 2)"    default-color))
-                 (list '((19 20) (6 7))))
-     (build-test "(let ([x 1]) (set! x 2))"
-                '(("("    default-color)
-                  ("let"   imported-syntax)
-                  (" (["   default-color)
-                  ("x"     set!d)
-                  (" "     default-color)
-                  ("1"     constant)
-                  ("]) ("  default-color)
-                  ("set!"  imported-syntax)
-                  (" "     default-color)
-                  ("x"     set!d)
-                  (" "     default-color)
-                  ("2"     constant)
-                  ("))"    default-color))
-                (list '((7 8) (19 20)))
-                #:tooltips '((7 8 "1 bound occurrence")
-                             (7 8 "set!’d variable")
-                             (19 20 "set!’d variable")))
-     
-     (build-test "object%"
-                '(("object%" imported-syntax))) ; used to be lexically-bound-variable
-     (build-test "unbound-id"
-                '(("unbound-id" free-variable)))
-     (build-test "(define bd 1) bd"
-                '(("("       default-color)
-                  ("define"  imported-syntax)
-                  (" "       default-color)
-                  ("bd"      lexically-bound-variable)
-                  (" "       default-color)
-                  ("1"       constant)
-                  (") "      default-color)
-                  ("bd"      lexically-bound-variable))
-                (list '((8 10) (14 16))))
-     (build-test "#'abc"
-                '(("#'"  imported-syntax)
-                  ("abc" constant)))
-     (build-test "(with-continuation-mark 1 2 3)"
-                '(("("                      default-color)
-                  ("with-continuation-mark" imported-syntax)
-                  (" "                      default-color)
-                  ("1"                      constant)
-                  (" "                      default-color)
-                  ("2"                      constant)
-                  (" "                      default-color)
-                  ("3"                      constant)
-                  (")"                      default-color)))
-     (build-test "(f x)"
-                '(("(" default-color)
-                  ("f" free-variable)
-                  (" " default-color)
-                  ("x" free-variable)
-                  (")" default-color)))
-     (build-test "(define-syntax (f stx) (syntax 1))"
-                '(("("             default-color)
-                  ("define-syntax" imported-syntax)
-                  (" ("            default-color)
-                  ("f"             lexically-bound-syntax)
-                  (" "             default-color)
-                  ("stx"           lexically-bound-variable)
-                  (") ("           default-color)
-                  ("syntax"        imported-syntax)
-                  (" "             default-color)
-                  ("1"             constant)
-                  ("))"            default-color)))
-     
-     (build-test "(define-for-syntax (f x) x)"
-                '(("("                 default-color)
-                  ("define-for-syntax" imported-syntax)
-                  (" ("                default-color)
-                  ("f"                 lexically-bound-syntax)
-                  (" "                 default-color)
-                  ("x"                 lexically-bound-variable)
-                  (") "                default-color)
-                  ("x"                 lexically-bound-variable)
-                  (")"                 default-color))
-                (list '((22 23) (25 26))))
-     (build-test "(define-syntax-rule (m x y z) (list (λ x y) (λ x z)))\n(m x x x)"
-                 '(("(" default-color)
-                   ("define-syntax-rule" imported)
-                   (" (" default-color)
-                   ("m" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (" " default-color)
-                   ("y" lexically-bound)
-                   (" " default-color)
-                   ("z" lexically-bound)
-                   (") (list (λ " default-color)
-                   ("x" lexically-bound)
-                   (" " default-color)
-                   ("y" lexically-bound)
-                   (") (λ " default-color)
-                   ("x" lexically-bound)
-                   (" " default-color)
-                   ("z" lexically-bound)
-                   (")))\n(" default-color)
-                   ("m" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound) 
-                   (")" default-color))
-                 (list '((21 22) (55 56)) 
-                       '((23 24) (39 40) (47 48))
-                       '((25 26) (41 42))
-                       '((27 28) (49 50))
-                       '((57 58) (59 60) (61 62)))
-                 #:tooltips '((21 22 "1 bound occurrence")
-                              (23 24 "2 bound occurrences")
-                              (25 26 "1 bound occurrence")
-                              (27 28 "1 bound occurrence")
-                              (57 58 "2 bound occurrences")))
-     
-     (build-test "(define-syntax-rule (m x y z) (list (λ y x) (λ z x)))\n(m w w w)"
-                 '(("(" default-color)
-                   ("define-syntax-rule" imported)
-                   (" (" default-color)
-                   ("m" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (" " default-color)
-                   ("y" lexically-bound)
-                   (" " default-color)
-                   ("z" lexically-bound)
-                   (") (list (λ " default-color)
-                   ("y" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (") (λ " default-color)
-                   ("z" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (")))\n(" default-color)
-                   ("m" lexically-bound)
-                   (" " default-color)
-                   ("w" lexically-bound)
-                   (" " default-color)
-                   ("w" lexically-bound)
-                   (" " default-color)
-                   ("w" lexically-bound) 
-                   (")" default-color))
-                 (list '((21 22) (55 56)) 
-                       '((23 24) (41 42) (49 50))
-                       '((25 26) (39 40))
-                       '((27 28) (47 48))
-                       '((61 62) (57 58))
-                       '((59 60) (57 58)))
-                 #:tooltips '((21 22 "1 bound occurrence")
-                              (23 24 "2 bound occurrences")
-                              (25 26 "1 bound occurrence")
-                              (27 28 "1 bound occurrence")
-                              (57 58 "2 binding occurrences")
-                              (59 60 "1 bound occurrence") 
-                              (61 62 "1 bound occurrence")))
-
-     (build-test "(module m mzscheme)"
-                '(("("            default-color)
-                  ("module"       imported-syntax)
-                  (" m mzscheme)" default-color)))
-     (build-test "(require-for-syntax mzscheme)"
-                '(("("                  default-color)
-                  ("require-for-syntax" imported-syntax)
-                  (" "          default-color)
-                  ("mzscheme"   unused-require)
-                  (")"          default-color)))
-     (build-test "(require mzlib/list)"
-                '(("("                   default-color)
-                  ("require"             imported-syntax)
-                  (" "                   default-color)
-                  ("mzlib/list"          unused-require)
-                  (")"                   default-color)))
-     (build-test "(module m mzscheme (provide x) (define x 1))"
-                '(("("             default-color)
-                  ("module"        imported-syntax)
-                  (" m mzscheme (" default-color)
-                  ("provide"       imported-syntax)
-                  (" "             default-color)
-                  ("x"             lexically-bound-variable)
-                  (") ("           default-color)
-                  ("define"        imported-syntax)
-                  (" "             default-color)
-                  ("x"             lexically-bound-variable)
-                  (" "             default-color)
-                  ("1"             constant)
-                  ("))"            default-color))
-                (list '((10 18) (20 27) (32 38))
-                      '((39 40) (28 29))))
-     
-     (build-test "(module m mzscheme (+ 1 2))"
-                '(("("             default-color)
-                  ("module"        imported-syntax)
-                  (" m mzscheme (" default-color)
-                  ("+"             imported-variable)
-		  (" "             default-color)
-		  ("1"             constant)
-		  (" "             default-color)
-		  ("2"             constant)
-                  ("))"            default-color))
-                (list '((10 18) (20 21))))
-     
-     (build-test "(module m mzscheme (require mzlib/list))"
-                '(("("                 default-color)
-                  ("module"            imported-syntax)
-                  (" m mzscheme ("     default-color)
-                  ("require"           imported-syntax)
-                  (" "                 default-color)
-                  ("mzlib/list"        unused-require)
-                  ("))"                default-color))
-                (list '((10 18) (20 27))))
-     
-     (build-test "(module m mzscheme (require-for-syntax mzlib/list) (define-syntax s foldl))"
-                '(("("                     default-color)
-                  ("module"                imported-syntax)
-                  (" m mzscheme ("         default-color)
-                  ("require-for-syntax"    imported-syntax)
-                  (" mzlib/list) ("        default-color)
-                  ("define-syntax"         imported-syntax)
-                  (" "                     default-color)
-                  ("s"                     lexically-bound-syntax)
-                  (" "                     default-color)
-                  ("foldl"                 imported-variable)
-                  ("))"                    default-color))
-                (list '((10 18) (20 38) (52 65))
-                      '((39 49) (68 73))))
-     
-     (build-test "(module m mzscheme (require-for-syntax mzlib/etc) (define-syntax s (rec f 1)))"
-                '(("("                     default-color)
-                  ("module"                imported-syntax)
-                  (" m mzscheme ("         default-color)
-                  ("require-for-syntax"    imported-syntax)
-                  (" mzlib/etc) ("         default-color)
-                  ("define-syntax"         imported-syntax)
-                  (" "                     default-color)
-                  ("s"                     lexically-bound-syntax)
-                  (" ("                    default-color)
-                  ("rec"                   imported-syntax)
-                  (" "                     default-color)
-                  ("f"                     lexically-bound-variable)
-                  (" "                     default-color)
-                  ("1"                     constant)
-                  (")))"                   default-color))
-                (list '((10 18) (20 38) (51 64))
-                      '((39 48) (68 71))))
-
-     (build-test "(define-for-syntax (f x) x) (define (f x) x) f (define-syntax (m x) (f x))"
-                 '(("(" default-color)
-                   ("define-for-syntax" imported)
-                   (" (" default-color)
-                   ("f" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (") " default-color)
-                   ("x" lexically-bound)
-                   (") (" default-color)
-                   ("define" imported)
-                   (" (" default-color)
-                   ("f" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (") " default-color)
-                   ("x" lexically-bound)
-                   (") " default-color)
-                   ("f" lexically-bound)
-                   (" (" default-color)
-                   ("define-syntax" imported)
-                   (" (" default-color)
-                   ("m" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (") (" default-color)
-                   ("f" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   ("))" default-color))
-                 '(((20 21) (69 70))
-                   ((22 23) (25 26))
-                   ((37 38) (45 46))
-                   ((39 40) (42 43))
-                   ((65 66) (71 72))))
-     
-     (build-test (string-append
-                  "(module m mzscheme (define-for-syntax (f x) x)"
-                  " (define (f x) x) f (define-syntax (m stx) (f stx)))")
-                 '(("(" default-color)
-                   ("module" imported)
-                   (" m mzscheme (" default-color)
-                   ("define-for-syntax" imported)
-                   (" (" default-color)
-                   ("f" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (") " default-color)
-                   ("x" lexically-bound)
-                   (") (" default-color)
-                   ("define" imported)
-                   (" (" default-color)
-                   ("f" lexically-bound)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (") " default-color)
-                   ("x" lexically-bound)
-                   (") " default-color)
-                   ("f" lexically-bound)
-                   (" (" default-color)
-                   ("define-syntax" imported)
-                   (" (" default-color)
-                   ("m" lexically-bound)
-                   (" " default-color)
-                   ("stx" lexically-bound)
-                   (") (" default-color)
-                   ("f" lexically-bound)
-                   (" " default-color)
-                   ("stx" lexically-bound)
-                   (")))" default-color))
-                 '(((10 18) (20 37) (48 54) (67 80))
-                   ((39 40) (90 91))
-                   ((41 42) (44 45))
-                   ((56 57) (64 65))
-                   ((58 59) (61 62))
-                   ((84 87) (92 95))))
-     
-     (build-test "(define-syntax s (lambda (stx) (syntax-case stx () (_ 123))))"
-                '(("("             default-color)
-                  ("define-syntax" imported-syntax)
-                  (" "             default-color)
-                  ("s"             lexically-bound-syntax)
-                  (" ("            default-color)
-                  ("lambda"        imported-syntax)
-                  (" ("            default-color)
-                  ("stx"           lexically-bound-variable)
-                  (") ("           default-color)
-                  ("syntax-case"   imported-syntax)
-                  (" "             default-color)
-                  ("stx"           lexically-bound-variable)
-                  (" () ("         default-color)
-                  ("_"             lexically-bound-syntax)
-                  (" "             default-color)
-                  ("123"           constant)
-                  ("))))"          default-color))
-                (list '((26 29) (44 47))))
-
-     (build-test "(require mzlib/list) first"
-                '(("("                    default-color)
-                  ("require"              imported-syntax)
-                  (" mzlib/list) "        default-color)
-                  ("first"                imported-variable))
-                (list '((9 19) (21 26))))
-
-     (build-test "(require mzlib/etc) (rec f 1)"
-                '(("("                    default-color)
-                  ("require"              imported-syntax)
-                  (" mzlib/etc) ("        default-color)
-                  ("rec"                  imported-syntax)
-                  (" "                    default-color)
-                  ("f"                    lexically-bound-variable)
-                  (" "                    default-color)
-                  ("1"                    constant)
-                  (")"                    default-color))
-                (list '((9 18) (21 24))))
-
-     (build-test "(define-struct s ())"
-                '(("("             default-color)
-                  ("define-struct" imported-syntax)
-                  (" "             default-color)
-                  ("s"             lexically-bound-syntax)
-                  (" ())"          default-color)))
-     
-     (build-test "(define-struct s ()) (define-struct (t s) ())"
-                '(("("             default-color)
-                  ("define-struct" imported-syntax)
-                  (" "             default-color)
-                  ("s"             lexically-bound-syntax)
-                  (" ()) ("        default-color)
-                  ("define-struct" imported-syntax)
-                  (" ("            default-color)
-                  ("t"             lexically-bound-syntax)
-                  (" "             default-color)
-                  ("s"             lexically-bound-syntax)
-                  (") ())"         default-color))
-                (list '((15 16) (39 40))))
-     
-     (build-test "(let () (define-struct s (x)) 1)"
-                 '(("("             default-color)
-                   ("let"           imported-syntax)
-                   (" () ("         default-color)
-                   ("define-struct" imported-syntax)
-                   (" "             default-color)
-                   ("s"             lexically-bound-syntax)
-                   (" (x)) "        default-color)
-                   ("1"             constant)
-                   (")"             default-color)))
-     
-     (build-test "(let ([x 12]) (define-struct s (x)) x)"
-                 '(("("             default-color)
-                   ("let"           imported-syntax)
-                   (" (["           default-color)
-                   ("x"             lexically-bound-variable)
-                   (" "             default-color)
-                   ("12"            constant)
-                   ("]) ("          default-color)
-                   ("define-struct" imported-syntax)
-                   (" "             default-color)
-                   ("s"             lexically-bound-syntax)
-                   (" (x)) "        default-color)
-                   ("x"             lexically-bound-variable)
-                   (")"             default-color))
-                 (list '((7 8) (36 37))))
-     
-     (build-test "`(1 ,x 2)"
-                '(("`"        imported-syntax)
-                  ("("        default-color)
-                  ("1"        constant)
-                  (" ,"       default-color)
-                  ("x"        free-variable)
-                  (" "        default-color)
-                  ("2"        constant)
-                  (")"        default-color)))
-
-     (build-test "`(a ,2 b c d)"
-                `(("`"  imported-syntax)
-                  ("("  default-color)
-                  ("a"  constant)
-                  (" ," default-color)
-                  ("2"  constant)
-                  (" "  default-color)
-                  ("b"  constant)
-                  (" "  default-color)
-                  ("c"  constant)
-                  (" "  default-color)
-                  ("d"  constant)
-                  (")"  default-color)))
-     
-     (build-test "#! /usr/bin/env"
-                '(("#! /usr/bin/env" default-color)))
-     
-     (build-test "#! /usr/bin/env\n"
-                '(("#! /usr/bin/env\n" default-color)))
-     
-     (build-test "#! /usr/bin/env\n1"
-                '(("#! /usr/bin/env\n" default-color)
-                  ("1"    constant)))
-     
-     (build-test "#! /usr/bin/env\n1\n1"
-                '(("#! /usr/bin/env\n" default-color)
-                  ("1"    constant)
-                  ("\n"   default-color)
-                  ("1"    constant)))
-     
-     (build-test "#! /usr/bin/env\n(lambda (x) x)"
-                 '(("#! /usr/bin/env\n("    default-color)
-                   ("lambda"  imported-syntax)
-                   (" ("      default-color)
-                   ("x"       lexically-bound-variable)
-                   (") "      default-color)
-                   ("x"       lexically-bound-variable)
-                   (")"       default-color))
-                 (list '((25 26) (28 29))))
-     
-     (build-test "(module m mzscheme (lambda (x) x) (provide))"
-                '(("("             default-color)
-                  ("module"        imported-syntax)
-                  (" m mzscheme (" default-color)
-                  ("lambda"        imported-syntax)
-                  (" ("            default-color)
-                  ("x"             lexically-bound-variable)
-                  (") "            default-color)
-                  ("x"             lexically-bound-variable)
-                  (") ("           default-color)
-                  ("provide"       imported-syntax)
-                  ("))"            default-color))
-                (list '((10 18) (20 26) (35 42))
-                      '((28 29) (31 32))))
-     
-     (build-test "(module m mzscheme (define-struct s (a)) s-a make-s s? set-s-a!)"
-                '(("("             default-color)
-                  ("module"        imported-syntax)
-                  (" m mzscheme (" default-color)
-                  ("define-struct" imported-syntax)
-                  (" "             default-color)
-                  ("s"             lexically-bound-syntax)
-                  (" (a)) "        default-color)
-                  ("s-a"           lexically-bound-variable)
-                  (" "             default-color)
-                  ("make-s"        lexically-bound-variable)
-                  (" "             default-color)
-                  ("s?"            lexically-bound-variable)
-                  (" "             default-color)
-                  ("set-s-a!"      lexically-bound-variable)
-                  (")"             default-color))
-                (list '((10 18) (20 33))
-                      '((37 38) (43 44) (61 62))
-                      '((34 35) (41 42) (50 51) (52 53) (59 60))))
-     
-     (build-test "(module m racket/base (struct s (a [b #:mutable])) s-a s-b s s? set-s-b!)"
-                '(("("                    default-color)
-                  ("module"               imported-syntax)
-                  (" m racket/base ("     default-color)
-                  ("struct"               imported-syntax)
-                  (" "                    default-color)
-                  ("s"                    lexically-bound-syntax)
-                  (" (a [b #:mutable])) " default-color)
-                  ("s-a"                  lexically-bound-variable)
-                  (" "                    default-color)
-                  ("s-b"                  lexically-bound-variable)
-                  (" "                    default-color)
-                  ("s"                    lexically-bound-variable)
-                  (" "                    default-color)
-                  ("s?"                   lexically-bound-variable)
-                  (" "                    default-color)
-                  ("set-s-b!"             lexically-bound-variable)
-                  (")"                    default-color))
-                (list '((10 21) (23 29))
-                      '((30 31) (51 52) (55 56) (59 60) (61 62) (68 69))
-                      '((33 34) (53 54))
-                      '((36 37) (57 58) (70 71))))
-     
-     (build-test "(let l () l l)"
-                '(("("    default-color)
-                  ("let"  imported-syntax)
-                  (" "    default-color)
-                  ("l"    lexically-bound-variable)
-                  (" () " default-color)
-                  ("l"    lexically-bound-variable)
-                  (" "    default-color)
-                  ("l"    lexically-bound-variable)
-                  (")"    default-color))
-                (list '((5 6) (10 11) (12 13))))
-     
-     (build-test "(class object% this)"
-                '(("("       default-color)
-                  ("class"   imported-syntax)
-                  (" "       default-color)
-                  ("object%" imported-syntax) ; was lexically-bound-variable
-                  (" "       default-color)
-                  ("this"    imported)
-                  (")"       default-color)))
-     
-     (build-test "(module m mzscheme (require mzlib/list) foldl)"
-                '(("("                    default-color)
-                  ("module"               imported-syntax)
-                  (" m mzscheme ("        default-color)
-                  ("require"              imported-syntax)
-                  (" mzlib/list) "        default-color)
-                  ("foldl"                imported-variable)
-                  (")"                    default-color))
-                (list '((10 18) (20 27))
-                      '((28 38) (40 45))))
-     (build-test "(module m lang/htdp-beginner empty)"
-                '(("("                        default-color)
-                  ("module"                   imported-syntax)
-                  (" m lang/htdp-beginner "   default-color)
-                  ("empty"                    imported-variable)
-                  (")"                        default-color))
-                (list '((10 28) (29 34))))
-     (build-test "(module m mzscheme (require (prefix x: mzlib/list)) x:foldl)"
-                '(("("                                default-color)
-                  ("module"                           imported-syntax)
-                  (" m mzscheme ("                    default-color)
-                  ("require"                          imported-syntax)
-                  (" (prefix x: mzlib/list)) "        default-color)
-                  ("x:foldl"                          imported-variable)
-                  (")"                                default-color))
-                (list '((10 18) (20 27))
-                      '((39 49) (52 59))))
-
-     (build-test "(module m mzscheme (require (prefix x: mzlib/list) mzlib/list) x:foldl foldl)"
-                '(("("                                    default-color)
-                  ("module"                               imported-syntax)
-                  (" m mzscheme ("                        default-color)
-                  ("require"                              imported-syntax)
-                  (" (prefix x: mzlib/list) mzlib/list) " default-color)
-                  ("x:foldl"                              imported-variable)
-                  (" "                                    default-color)
-                  ("foldl"                                imported-variable)
-                  (")"                                    default-color))
-                (list '((10 18) (20 27))
-                      '((39 49) (63 70))
-                      '((51 61) (71 76))))
-
-     (build-test (string-append
-                  "(module m mzscheme (require (only mzlib/list foldr)"
-                  " (only mzlib/list foldl)) foldl foldr)")
-                 '(("("                                                  default-color)
-                   ("module"                                             imported-syntax)
-                   (" m mzscheme ("                                      default-color)
-                   ("require"                                            imported-syntax)
-                   (" (only mzlib/list foldr) (only mzlib/list foldl)) " default-color)
-                   ("foldl"                                              imported-variable)
-                   (" "                                                  default-color)
-                   ("foldr"                                              imported-variable)
-                   (")"                                                  default-color))
-                 (list '((10 18) (20 27))
-                       '((34 44) (83 88))
-                       '((58 68) (77 82))))
-
-     (build-test "(module m mzscheme (require (prefix x: mzscheme)) x:+ +)"
-                 '(("("                                                  default-color)
-                   ("module"                                             imported-syntax)
-                   (" m mzscheme ("                                      default-color)
-                   ("require"                                            imported-syntax)
-                   (" (prefix x: mzscheme)) "                            default-color)
-                   ("x:+"                                                imported-variable)
-                   (" "                                                  default-color)
-                   ("+"                                                  imported-variable)
-                   (")"                                                  default-color))
-                 (list '((10 18) (20 27) (54 55))
-                       '((39 47) (50 53))))
-     
-     (build-test "(module m mzscheme (require mzlib/etc) (rec f 1))"
-                '(("("                     default-color)
-                  ("module"                imported-syntax)
-                  (" m mzscheme ("         default-color)
-                  ("require"               imported-syntax)
-                  (" mzlib/etc) ("         default-color)
-                  ("rec"                   imported-syntax)
-                  (" "                     default-color)
-                  ("f"                     lexically-bound-variable)
-                  (" "                     default-color)
-                  ("1"                     constant)
-                  ("))"                    default-color))
-                (list '((10 18) (20 27))
-                      '((28 37) (40 43))))
-
-     (build-test "(module m lang/htdp-intermediate (local ((define x x)) x))"
-                '(("("                           default-color)
-                  ("module"                      imported-syntax)
-                  (" m lang/htdp-intermediate (" default-color)
-                  ("local"                       imported-syntax)
-                  (" ((define "                  default-color)
-                  ("x"                           lexically-bound-variable)
-                  (" "                           default-color)
-                  ("x"                           lexically-bound-variable)
-                  (")) "                         default-color)
-                  ("x"                           lexically-bound-variable)
-                  ("))"                          default-color))
-                (list '((10 32) (34 39))
-                      '((49 50) (51 52) (55 56))))
-
-     (build-test "(module m mzscheme (define-syntax rename #f) (require (rename mzscheme ++ +)))"
-                 '(("("                         default-color)
-                   ("module"                    imported)
-                   (" m mzscheme ("             default-color)
-                   ("define-syntax"             imported)
-                   (" "                         default-color)
-                   ("rename"                    lexically-bound)
-                   (" #f) ("                    default-color)
-                   ("require"                   imported)
-                   (" (rename mzscheme ++ +)))" default-color))
-                 
-                 (list '((10 18) (20 33) (46 53))))
-     
-     (build-test "(module m mzscheme (define-syntax rename #f) (define f 1) (provide (rename f g)))"
-                 '(("("               default-color)
-                   ("module"          imported)
-                   (" m mzscheme ("   default-color)
-                   ("define-syntax"   imported)
-                   (" "               default-color)
-                   ("rename"          lexically-bound)
-                   (" #f) ("          default-color)
-                   ("define"          imported)
-                   (" "               default-color)
-                   ("f"               lexically-bound)
-                   (" 1) ("           default-color)
-                   ("provide"         imported)
-                   (" (rename "       default-color)
-                   ("f"               lexically-bound)
-                   (" g)))"           default-color))
-                 (list '((10 18) (20 33) (46 52) (59 66))
-                       '((53 54) (75 76))))
-     
-     (build-test "(module m mzscheme (define X 1) (provide (all-defined-except X)))"
-                 '(("("                     default-color)
-                   ("module"                imported)
-                   (" m mzscheme ("         default-color)
-                   ("define"                imported)
-                   (" "                     default-color)
-                   ("X"                     lexically-bound)
-                   (" 1) ("                 default-color)
-                   ("provide"               imported)
-                   (" (all-defined-except " default-color)
-                   ("X"                     lexically-bound)
-                   (")))"                   default-color))
-                 
-                 (list '((10 18) (20 26) (33 40))
-                       '((27 28) (61 62))))     
-     
-     (build-test (string-append "(module m mzscheme (require-for-syntax mzscheme)"
-                                " (require-for-template mzscheme) (quote-syntax +))")
-                 '(("("                    default-color)
-                   ("module"               imported)
-                   (" m mzscheme ("        default-color)
-                   ("require-for-syntax"   imported)
-                   (" mzscheme) ("         default-color)
-                   ("require-for-template" imported)
-                   (" mzscheme) ("         default-color)
-                   ("quote-syntax"         imported)
-                   (" +))"                 default-color))
-                 (list
-                  '((71 79) (95 96))
-                  '((10 18) (20 38) (50 70) (82 94) (95 96))
-                  '((39 47) (95 96))))
-     
-     (build-test (format "~s" '(module m racket (module n racket list) (module+ o list)))
-                 '(("(" default-color)
-                   ("module" imported)
-                   (" m racket (" default-color)
-                   ("module" imported)
-                   (" n racket " default-color)
-                   ("list" imported)
-                   (") (module+ o " default-color)
-                   ("list" imported)
-                   ("))" default-color))
-                 (list 
-                  '((10 16) (18 24) (51 55))
-                  '((27 33) (34 38))))
-     
-     ;; test case from Chongkai
-     (build-test (format "~s\n\n#reader'reader\n1\n"
-                         '(module reader mzscheme
-                            (provide (rename mrs read-syntax) read)
-                            (define (mrs sv p)
-                              (datum->syntax-object
-                               (read-syntax #f (open-input-string "a"))
-                               `(module f mzscheme
-                                  (provide x)
-                                  (define x 1))
-                               (list sv #f #f #f #f)))))
-                 '(("(" default-color)
-                   ("module" imported)
-                   (" reader mzscheme (" default-color)
-                   ("provide" imported)
-                   (" (rename " default-color)
-                   ("mrs" lexically-bound)
-                   (" read-syntax) " default-color)
-                   ("read" imported)
-                   (") (" default-color)
-                   ("define" imported)
-                   (" (" default-color)
-                   ("mrs" lexically-bound)
-                   (" " default-color)
-                   ("sv" lexically-bound)
-                   (" " default-color)
-                   ("p" lexically-bound)
-                   (") (" default-color)
-                   ("datum->syntax-object" imported)
-                   (" (" default-color)
-                   ("read-syntax" imported)
-                   (" #f (" default-color)
-                   ("open-input-string" imported)
-                   (" \"a\")) (" default-color)
-                   ("quasiquote" imported)
-                   (" (module f mzscheme (provide x) (define x 1))) (" default-color)
-                   ("list" imported)
-                   (" " default-color)
-                   ("sv" lexically-bound)
-                   (" #f #f #f #f))))\n\n#reader'reader\n1\n" default-color))
-                 
-                 (list '((15 23) (25 32) (58 62) (65 71) (84 104) (106 117)
-                                 (122 139) (147 157) (205 209))
-                       '((77 79) (210 212))
-                       '((73 76) (41 44))))
-     
-     (build-dir-test "(module m mzscheme (require \"~a\") first first)"
-                     '(("("             default-color)
-                       ("module"        imported-syntax)
-                       (" m mzscheme (" default-color)
-                       ("require"       imported-syntax)
-                       (" \""           default-color)
-                       (relative-path   default-color)
-                       ("\") "          default-color)
-                       ("first"         imported-variable)
-                       (" "             default-color)
-                       ("first"         imported-variable)
-                       (")"             default-color))
-                     #f)
-     
-     (build-test "#lang scheme/base\n(require scheme)\n(define-syntax m (lambda (x) #'1))"
-                 '(("#lang scheme/base\n(" default-color)
-                   ("require"              imported)
-                   (" scheme)\n("          default-color)
-                   ("define-syntax"        imported)
-                   (" "                    default-color)
-                   ("m"                    lexically-bound)
-                   (" ("                   default-color)
-                   ("lambda"               imported)
-                   (" ("                   default-color)
-                   ("x"                    lexically-bound)
-                   (") "                   default-color)
-                   ("#'"                   imported)
-                   ("1))"                  default-color))
-                 (list '((27 33) (19 26) (36 49) (53 59) (64 66))))
-     
-     (build-test (string-append
-                  "#lang racket (begin-for-syntax (require (for-syntax racket))"
-                  " (define x 1) (begin-for-syntax (define x 2) x))")
-                 '(("#lang racket (" default-color)
-                   ("begin-for-syntax" imported)
-                   (" (" default-color)
-                   ("require" imported)
-                   (" (for-syntax " default-color)
-                   ("racket" default-color)
-                   (")) (" default-color)
-                   ("define" imported)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (" 1) (" default-color)
-                   ("begin-for-syntax" imported)
-                   (" (" default-color)
-                   ("define" imported)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (" 2) " default-color)
-                   ("x" lexically-bound)
-                   ("))" default-color))
-                 (list '((6 12) (14 30) (32 39) (62 68) (75 91))
-                       '((52 58) (93 99))
-                       '((100 101) (105 106))))
-     
-     (build-test
-      "#lang racket (provide (contract-out [f (->i ((p? any/c)) (_ (p?) p?))])) (define (f a) 1)"
-      '(("#lang racket (" default-color)
-        ("provide" imported)
-        (" (contract-out [" default-color)
-        ("f" lexically-bound)
-        (" (" default-color)
-        ("->i" imported)
-        (" ((" default-color)
-        ("p?" lexically-bound)
-        (" " default-color)
-        ("any/c" imported)
-        (")) (_ (" default-color)
-        ("p?" lexically-bound)
-        (") " default-color)
-        ("p?" lexically-bound)
-        ("))])) (" default-color)
-        ("define" imported)
-        (" (" default-color)
-        ("f" lexically-bound)
-        (" " default-color)
-        ("a" lexically-bound)
-        (") 1)" default-color))
-      (list '((82 83) (37 38))
-            '((46 48) (61 63) (65 67))
-            '((6 12) (14 21) (40 43) (49 54) (74 80))))
-
-     (build-test "#lang racket/base\n(define red 1)\n(module+ test red)"
-                 '(("#lang racket/base\n(" default-color)
-                   ("define"               imported)
-                   (" "                    default-color)
-                   ("red"                  lexically-bound)
-                   (" 1)\n(module+ test "  default-color)
-                   ("red"                  imported)
-                   (")"                    default-color))
-                 '(((26 29) (47 50))
-                   ((6 17) (19 25))))
-     
-     (build-test "#lang racket/base\n(require '#%kernel)\npair?"
-                 '(("#lang racket/base\n(" default-color)
-                   ("require"              imported)
-                   (" '#%kernel)\n"        default-color)
-                   ("pair?"                imported))
-                 (list '((6 17) (19 26))
-                       '((27 36) (38 43))))
-
-     (build-test "#lang racket\n(begin-for-syntax (module m racket/base (let ([x 1]) x)))"
-                 '(("#lang racket\n(" default-color)
-                   ("begin-for-syntax" imported)
-                   (" (" default-color)
-                   ("module" imported)
-                   (" m racket/base (" default-color)
-                   ("let" imported)
-                   (" ([" default-color)
-                   ("x" lexically-bound)
-                   (" 1]) " default-color)
-                   ("x" lexically-bound)
-                   (")))" default-color))
-                 (list '((60 61) (66 67))
-                       '((6 12) (14 30) (32 38))))
-     
-     (build-test "#lang racket\n(define-for-syntax x 1)\n(begin-for-syntax (module* m #f x))"
-                 '(("#lang racket\n(" default-color)
-                   ("define-for-syntax" imported)
-                   (" " default-color)
-                   ("x" lexically-bound)
-                   (" 1)\n(" default-color)
-                   ("begin-for-syntax" imported)
-                   (" (" default-color)
-                   ("module*" imported)
-                   (" m #f " default-color)
-                   ("x" imported)
-                   ("))" default-color))
-                 (list '((6 12) (14 31) (38 54) (56 63))
-                       '((32 33) (69 70))))
-     
-     (build-test 
-      (λ (fn) 
-        (string-append
-         "#lang racket/base\n"
-         ;; 'values' is here so we get to the require 
-         ;; before attempting to expand 'm'
-         "(values\n"
-         " (m a-x\n"
-         "    a a a\n"
-         "    a-x a-x))\n"
-         ;; this is last because its length might change
-         (format "~s\n" `(require (file ,(path->string fn))))))
-      '(("#lang racket/base\n("    default-color)
-        ("values"                  imported)
-        ("\n ("                    default-color)
-        ("m"                       imported)
-        (" "                       default-color)
-        ("a-x"                     lexically-bound)
-        ("\n    "                  default-color)
-        ("a"                       lexically-bound)
-        (" "                       default-color)
-        ("a"                       lexically-bound)
-        (" "                       default-color)
-        ("a"                       lexically-bound)
-        ("\n    "                  default-color)
-        ("a-x"                     lexically-bound)
-        (" "                       default-color)
-        ("a-x"                     lexically-bound)
-        ("))\n("                   default-color)
-        ("require"                 imported)
-        (#rx" [(]file \"[^\"]*\"[)][)]\n" default-color))
-      `(((6 17) (19 25) (59 66))
-        ((30 33) (48 51) (52 55))
-        ((30 31) (38 39) (40 41) (42 43))
-        ((67 ,(λ (end-of-file) (- end-of-file 2))) (28 29)))
-      #:setup
-      (λ () 
-        (define fn (make-temporary-file "syncheck-test-~a.rkt"))
-        (call-with-output-file fn
-          (λ (port)
-            (fprintf port "#lang racket/base\n")
-            (pretty-write '(require (for-syntax racket/base)) port)
-            (pretty-write '(provide m) port)
-            (pretty-write
-             '(define-syntax (m stx)
-                (syntax-case stx ()
-                  [(_ a . rst)
-                   (let ()
-                     (define str (regexp-replace #rx"-.*$" (symbol->string (syntax-e #'a)) ""))
-                     (with-syntax ([a2 (datum->syntax #'a 
-                                                      (string->symbol str)
-                                                      (vector (syntax-source #'a)
-                                                              (syntax-line #'a)
-                                                              (syntax-column #'a)
-                                                              (syntax-position #'a)
-                                                              (string-length str))
-                                                      #'a)])
-                       #'(begin
-                           (let ([a 1][a2 1]) . rst))))]))
-             port))
-          #:exists 'truncate)
-        fn)
-      #:teardown (λ (fn) (delete-file fn)))
-     
-     (build-test 
-      (λ (fn) 
-        (string-append
-         "#lang racket/base\n"
-         ;; 'values' is here so we get to the require 
-         ;; before attempting to expand 'n'
-         "(values\n"
-         " (n e\n"
-         "    e_11111111111111\n"
-         "    e e e\n"
-         "    e_11111111111111 e_11111111111111))\n"
-         ;; this is last because its length might change
-         (format "~s\n" `(require (file ,(path->string fn))))))
-      '(("#lang racket/base\n(" default-color)
-        ("values" imported)
-        ("\n (" default-color)
-        ("n" imported)
-        (" " default-color)
-        ("e" lexically-bound)
-        ("\n    " default-color)
-        ("e_11111111111111" lexically-bound)
-        ("\n    " default-color)
-        ("e" lexically-bound)
-        (" " default-color)
-        ("e" lexically-bound)
-        (" " default-color)
-        ("e" lexically-bound)
-        ("\n    " default-color)
-        ("e_11111111111111" lexically-bound)
-        (" " default-color)
-        ("e_11111111111111" lexically-bound)
-        ("))\n(" default-color)
-        ("require" imported)
-        (#rx" [(]file \"[^\"]*\"[)][)]\n" default-color))
-      `(((6 17) (19 25) (104 111))
-        ((36 52) (67 83) (84 100))
-        ((30 31) (36 37) (57 58) (59 60) (61 62) (67 68) (84 85))
-        ((112 ,(λ (end-of-file) (- end-of-file 2))) (28 29)))
-      #:setup
-      (λ () 
-        (define fn (make-temporary-file "syncheck-test-~a.rkt"))
-        (call-with-output-file fn
-          (λ (port)
-            (fprintf port "#lang racket/base\n")
-            (pretty-write '(require (for-syntax racket/base)) port)
-            (pretty-write '(provide n) port)
-            (pretty-write
-             '(define-syntax (n stx)
-                (syntax-case stx ()
-                  [(_ b1 b2 . rst)
-                   (let ()
-                     (define str (regexp-replace #rx"-.*$" (symbol->string (syntax-e #'a)) ""))
-                     #`(let ([b1 1]
-                             [b2 1])
-                         #,(datum->syntax #'b1
-                                          (syntax-e #'b1)
-                                          (vector (syntax-source #'b2)
-                                                  (syntax-line #'b2)
-                                                  (syntax-column #'b2)
-                                                  (syntax-position #'b2)
-                                                  (string-length (symbol->string (syntax-e #'b1))))
-                                          #'b1)
-                         (let-syntax ([b2 (λ (x)
-                                            (unless (identifier? x)
-                                              (raise-syntax-error 'b2 "only ids"))
-                                            (datum->syntax 
-                                             x
-                                             'b1
-                                             (vector (syntax-source x)
-                                                     (syntax-line x)
-                                                     (syntax-column x)
-                                                     (syntax-position x)
-                                                     (string-length (symbol->string 'b1)))
-                                             x))])
-                           . 
-                           rst)))]))
-             port))
-          #:exists 'truncate)
-        fn)
-      #:teardown (λ (fn) (delete-file fn)))
-     
-     (build-rename-test "(lambda (x) x)"
-                        9
-                        "x"
-                        "y"
-                        "(lambda (y) y)")
-     
-     (build-rename-test "(lambda (x) x)"
-                        9
-                        "x"
-                        "yy"
-                        "(lambda (yy) yy)")
-     
-     (build-rename-test "(lambda (x) x)"
-                        9
-                        "x"
-                        "yxy"
-                        "(lambda (yxy) yxy)")
-     (build-rename-test "(lambda (x) x x)"
-                        9
-                        "x"
-                        "yxy"
-                        "(lambda (yxy) yxy yxy)")
-     (build-rename-test "(lambda (x) x x)"
-                        12
-                        "x"
-                        "yxy"
-                        "(lambda (yxy) yxy yxy)")
-     (build-rename-test "(lambda (x) x x)"
-                        14
-                        "x"
-                        "yxy"
-                        "(lambda (yxy) yxy yxy)")
-     
-     (build-rename-test "(define-syntax-rule (m x y) (λ (x) x y))(m z z)"
-                        43
-                        "z"
-                        "qq"
-                        "(define-syntax-rule (m x y) (λ (x) x y))(m qq qq)")
-     
-     (build-rename-test (string-append
-                         "#lang racket/base\n"
-                         "(require (for-syntax racket/base))\n"
-                         "(define-syntax-rule (m x)\n"
-                         "  (begin (λ (x) x) (define x 1) (λ (x) x)))\n"
-                         "(m x)\n"
-                         "x\n")
-                        126
-                        "x"
-                        "y"
-                        (string-append
-                         "#lang racket/base\n"
-                         "(require (for-syntax racket/base))\n"
-                         "(define-syntax-rule (m x)\n"
-                         "  (begin (λ (x) x) (define x 1) (λ (x) x)))\n"
-                         "(m y)\n"
-                         "y\n"))
-     
-     (build-rename-test (string-append
-                         "#lang racket"
-                         "\n"
-                         "(define player%\n"
-                         " (class object%\n"
-                         "   (init-field strategy player# tiles)\n"
-                         "   (field [score (set)])\n"
-                         "\n"
-                         "   (super-new)\n"
-                         "\n"
-                         "   (define/private (put t pl)\n"
-                         "     (set! tiles(remove t tiles)))))\n")
-                        80
-                        "tiles"
-                        "*tiles"
-                        (string-append
-                         "#lang racket"
-                         "\n"
-                         "(define player%\n"
-                         " (class object%\n"
-                         "   (init-field strategy player# *tiles)\n"
-                         "   (field [score (set)])\n"
-                         "\n"
-                         "   (super-new)\n"
-                         "\n"
-                         "   (define/private (put t pl)\n"
-                         "     (set! *tiles(remove t *tiles)))))\n"))
-     
-     (build-rename-test (string-append
-                         "#lang racket"
-                         "\n"
-                         "(define player%\n"
-                         " (class object%\n"
-                         "   (init-field strategy player# *tiles)\n"
-                         "   (field [score (set)])\n"
-                         "\n"
-                         "   (super-new)\n"
-                         "\n"
-                         "   (define/private (put t pl)\n"
-                         "     (set! *tiles(remove t *tiles)))))\n")
-                        80
-                        "*tiles"
-                        "tiles"
-                        (string-append
-                         "#lang racket"
-                         "\n"
-                         "(define player%\n"
-                         " (class object%\n"
-                         "   (init-field strategy player# tiles)\n"
-                         "   (field [score (set)])\n"
-                         "\n"
-                         "   (super-new)\n"
-                         "\n"
-                         "   (define/private (put t pl)\n"
-                         "     (set! tiles(remove t tiles)))))\n"))
-     
-     (build-rename-test 
-      (string-append
-       "#lang racket/base\n"
-       "(define (f y)\n"
-       "  y y y y y y y y y y y y y y y y y y y y y y y y\n"
-       "  y y y y y y y y y y y y y y y y y y y y y y y y\n"
-       "  y y y y y y y y y y y y y y y y y y y y y y y y\n"
-       "  y y y y y y y y y y y y y y y y y y y y y y y y\n"
-       "  y y y y y y y y y y y y y y y y y y y y y y y y\n"
-       "  y y y y y y y y y y y y y y y y y y y y y y y y\n"
-       "  y y y y y y y y y y y y y y y y y y y y y y y y\n"
-       "  y y y y y y y y y y y y y y y y y y y y y y y y)\n")
-      29
-      "y"
-      "x"
-      (string-append
-       "#lang racket/base\n"
-       "(define (f x)\n"
-       "  x x x x x x x x x x x x x x x x x x x x x x x x\n"
-       "  x x x x x x x x x x x x x x x x x x x x x x x x\n"
-       "  x x x x x x x x x x x x x x x x x x x x x x x x\n"
-       "  x x x x x x x x x x x x x x x x x x x x x x x x\n"
-       "  x x x x x x x x x x x x x x x x x x x x x x x x\n"
-       "  x x x x x x x x x x x x x x x x x x x x x x x x\n"
-       "  x x x x x x x x x x x x x x x x x x x x x x x x\n"
-       "  x x x x x x x x x x x x x x x x x x x x x x x x)\n"))
-     (build-rename-test
-      (string-append
-       "#lang racket\n"
-       "(let ([x 1])\n"
-       "  x`1\n"
-       "  `2)\n")
-      20
-      "x"
-      "y"
-      (string-append
-       "#lang racket\n"
-       "(let ([y 1])\n"
-       "  y`1\n"
-       "  `2)\n"))))
-                  
-  
-  (define (main)
-    (fire-up-drracket-and-run-tests
-     (λ ()
-       (let ([drs (wait-for-drracket-frame)])
-         ;(set-language-level! (list "Pretty Big"))
-         (begin
-           (set-language-level! (list "Pretty Big") #f)
-           (test:set-radio-box-item! "No debugging or profiling")
-           (let ([f (test:get-active-top-level-window)])
-             (test:button-push "OK")
-             (wait-for-new-frame f)))
-         (do-execute drs)
-         (let* ([defs (queue-callback/res (λ () (send drs get-definitions-text)))]
-                [filename (make-temporary-file "syncheck-test~a")])
-           (let-values ([(dir _1 _2) (split-path filename)])
-             (queue-callback/res (λ () (send defs save-file filename)))
-             (preferences:set 'framework:coloring-active #f)
-             (close-the-error-window-test drs)
-             (for-each (run-one-test (normalize-path dir)) tests)
-             (preferences:set 'framework:coloring-active #t)
-             (queue-callback/res
-              (λ () 
-                (send defs save-file) ;; clear out autosave
-                (send defs set-filename #f)))
-             (delete-file filename)
-             
-             (printf "Ran ~a tests.\n" total-tests-run)))))))
-  
-  (define (close-the-error-window-test drs)
-    (clear-definitions drs)
-    (insert-in-definitions drs "(")
-    (click-check-syntax-button drs #f)
-    (wait-for-computation drs)
-    (unless (queue-callback/res (λ () (send drs syncheck:error-report-visible?)))
-      (error 'close-the-error-window-test "error report window never appeared"))
-    (do-execute drs)
-    (when (queue-callback/res (λ () (send drs syncheck:error-report-visible?)))
-      (error 'close-the-error-window-test "error report window did not go away after clicking Run")))
-    
-  (define total-tests-run 0)
-  
-  (define ((run-one-test save-dir) test)
-    (set! total-tests-run (+ total-tests-run 1))
-    (let* ([drs (wait-for-drracket-frame)]
-           [defs (queue-callback/res (λ () (send drs get-definitions-text)))])
-      (clear-definitions drs)
-      (cond
-        [(test? test)
-         (let ([pre-input (test-input test)]
-               [expected (test-expected test)]
-               [arrows (test-arrows test)]
-               [tooltips (test-tooltips test)]
-               [relative (find-relative-path save-dir (collection-file-path "list.rkt" "racket"))]
-               [setup (test-setup test)]
-               [teardown (test-teardown test)]
-               [extra-info? (test-extra-info? test)])
-           (define setup-result (setup))
-           (define input (if (procedure? pre-input)
-                             (pre-input setup-result)
-                             pre-input))
-           (cond
-             [(dir-test? test)
-              (insert-in-definitions drs (format input (path->require-string relative)))]
-             [else (insert-in-definitions drs input)])
-           (click-check-syntax-and-check-errors drs test extra-info?)
-           
-           ;; need to check for syntax error here
-           (let ([got (get-annotated-output drs)]
-                 [got-arrows (queue-callback/res (λ () (send defs syncheck:get-bindings-table)))])
-             (when extra-info?
-               (printf "got-arrows\n")
-               (pretty-print got-arrows)
-               (newline)
-               
-               (printf "'drracket:syncheck:show-arrows? ~s\n"
-                       (preferences:get 'drracket:syncheck:show-arrows?)))
-             (compare-output (cond
-                               [(dir-test? test)
-                                (map (lambda (x)
-                                       (list (if (eq? (car x) 'relative-path)
-                                                 (path->require-string relative)
-                                                 (car x))
-                                             (cadr x)))
-                                     expected)]
-                               [else
-                                expected])
-                             got
-                             arrows 
-                             got-arrows
-                             input
-                             (test-line test)))
-           (when tooltips
-             (compare-tooltips (queue-callback/res (λ () (send defs syncheck:get-bindings-table #t)))
-                               tooltips
-                               (test-line test)))
-           
-           (teardown setup-result))]
-        [(rename-test? test)
-         (insert-in-definitions drs (rename-test-input test))
-         (click-check-syntax-and-check-errors drs test #f)
-         (define menu-item
-           (queue-callback/res
-            (λ ()
-              (define defs (send drs get-definitions-text))
-              (define menu (make-object popup-menu%))
-              (send defs syncheck:build-popup-menu menu (rename-test-pos test) defs)
-              (define item-name (format "Rename ~a" (rename-test-old-name test)))
-              (define menu-item
-                (for/or ([x (in-list (send menu get-items))])
-                  (and (is-a? x labelled-menu-item<%>)
-                       (equal? (send x get-label) item-name)
-                       x)))
-              (cond
-                [menu-item
-                 menu-item]
-                [else
-                 (eprintf "syncheck-test.rkt: rename test ~s didn't find menu item named ~s in ~s\n"
-                          test
-                          item-name
-                          (map (λ (x) (and (is-a? x labelled-menu-item<%>) (send x get-label)))
-                               (send menu get-items)))
-                 #f]))))
-         (when menu-item
-           (queue-callback (λ () (send menu-item command (make-object control-event% 'menu))))
-           (wait-for-new-frame drs)
-           (for ([x (in-string (rename-test-new-name test))])
-             (test:keystroke x))
-           (test:button-push "OK")
-           (define result
-             (queue-callback/res (λ () 
-                                   (define defs (send drs get-definitions-text))
-                                   (send defs get-text 0 (send defs last-position)))))
-           (unless (equal? result (rename-test-output test))
-             (eprintf "syncheck-test.rkt FAILED\n   test ~s\n  got ~s\n" 
-                      test
-                      result)))])))
-  
-  (define (path->require-string relative)
-    (define (p->string p)
-      (cond
-        [(eq? p 'up) ".."]
-        [else (path->string p)]))
-    (apply string-append (add-between (map p->string (explode-path relative)) "/"))) 
-  
-  
-  (define remappings
-    '((constant default-color)
-      (imported-syntax imported)
-      (imported-variable imported)
-      (lexically-bound-syntax lexically-bound)
-      (lexically-bound-variable lexically-bound)))
-  
-  (define (collapse-and-rename expected)
-    (let ([renamed
-           (map (lambda (ent)
-                  (let* ([str (car ent)]
-                         [id (cadr ent)]
-                         [matches (assoc id remappings)])
-                    (if matches
-                        (list str (cadr matches))
-                        ent)))
-                expected)])
-      (let loop ([ids renamed])
-        (cond
-          [(null? ids) null]
-          [(null? (cdr ids)) ids]
-          [else (let ([fst (car ids)]
-                      [snd (cadr ids)])
-                  (if (eq? (cadr fst) (cadr snd))
-                      (loop (cons (list (string-append (car fst) (car snd)) (cadr fst))
-                                  (cddr ids)))
-                      (cons fst (loop (cdr ids)))))]))))
-    
-  ;; compare-arrows : expression
-  ;;                  (or/c #f (listof (cons (list number-or-proc number-or-proc)
-  ;;                                         (listof (list number-or-proc number-or-proc)))))
-  ;;                  hash-table[(list text number number) -o> (setof (list text number number))]
-  ;;               -> void
-  (define (compare-arrows test-exp raw-expected raw-actual line)
-    (when raw-expected
-      ;; convert the number-or-proc's in raw-expected to be just numbers
-      (define expected 
-        (let loop ([stuff raw-expected])
-          (cond
-            [(list? stuff)
-             (for/list ([ele (in-list stuff)])
-               (loop ele))]
-            [(procedure? stuff)
-             (stuff (string-length test-exp))]
-            [else
-             stuff])))
-      (define already-checked (make-hash))
-      
-      (define actual-ht (make-hash))
-      (for ([(k v) (in-hash raw-actual)])
-        (hash-set! actual-ht (cdr k)
-                   (sort (map cdr (set->list v))
-                         (lambda (x y) (< (car x) (car y))))))
-      (define expected-ht (make-hash))
-      (for ([binding (in-list expected)])
-        (hash-set! expected-ht (car binding) (cdr binding)))
-      ;; binding-in-ht? : hash-table (list number number) (listof (list number number)) -> boolean
-      (define (test-binding expected? ht) ;; dont-care
-        (lambda (pr)
-          (let ([frm (car pr)]
-                [to (cdr pr)])
-            (hash-ref
-             already-checked
-             frm
-             (lambda ()
-               (hash-set! already-checked frm #t)
-               (define ht-ent (hash-ref ht frm 'nothing-there))
-               (unless (equal? ht-ent to)
-                 (eprintf (if expected?
-                              "FAILED arrow test line ~a ~s from ~s\n  expected ~s\n    actual ~s\n"
-                              "FAILED arrow test line ~a ~s from ~s\n    actual ~s\n  expected ~s\n")
-                          line
-                          test-exp
-                          frm
-                          ht-ent
-                          to)))))))
-        
-      (for-each (test-binding #t expected-ht) (hash-map actual-ht cons))
-      (for-each (test-binding #f actual-ht) (hash-map expected-ht cons))))
-  
-  (define (compare-output raw-expected got arrows arrows-got input line)
-    (let ([expected (collapse-and-rename raw-expected)])
-      (cond
-        [(not-matching-colors got expected)
-         =>
-         (λ (msg)
-           (eprintf "FAILED line ~a: ~s\n      expected: ~s\n           got: ~s\n   ~a\n"
-                    line input expected got msg))]
-        [else
-         (compare-arrows input arrows arrows-got line)])))
-  
-  (define (not-matching-colors got expected)
-    (let loop ([got got]
-               [expected expected]
-               [i 0])
-      (cond
-        [(and (pair? got) (pair? expected))
-         (or (not-matching-single-color i (car got) (car expected))
-             (loop (cdr got) (cdr expected) (+ i 1)))]
-        [(and (null? got) (null? expected))
-         #f]
-        [else
-         (format "lengths different by ~a" (abs (- (length got) (length expected))))])))
-  
-  (define (not-matching-single-color i got expected)
-    (define got-str (list-ref got 0))
-    (define got-color (list-ref got 1))
-    (define exp-str (list-ref expected 0))
-    (define exp-color (list-ref expected 1))
-    (or (cond
-          [(string? exp-str)
-           (if (equal? got-str exp-str)
-               #f
-               (format "strings at position ~a do not match; got ~s" i got-str))]
-          [(regexp? exp-str)
-           (if (regexp-match? exp-str got-str)
-               #f
-               (format "regexp at position ~a does not match actual string: ~s" i got-str))])
-        (if (equal? got-color exp-color)
-            #f
-            (format "colors at position ~a do not match; got ~s" i got-color))))
-  
-  (define (compare-tooltips got expected line)
-    (unless (equal? got expected)
-      (eprintf "FAILED TOOLTIPS: line ~s \n      expected: ~s\n           got: ~s\n"
-               line expected got)))
-  
-  ;; get-annotate-output : drscheme-frame -> (listof str/ann)
-  (define (get-annotated-output drs)
-    (queue-callback/res (λ () (get-string/style-desc (send drs get-definitions-text)))))
-  
-  (define (click-check-syntax-and-check-errors drs test extra-info?)
-    (click-check-syntax-button drs extra-info?)
-    (wait-for-computation drs)
-    (when (queue-callback/res (λ () (send (send drs get-definitions-text) in-edit-sequence?)))
-      (error 'syncheck-test.rkt "still in edit sequence for ~s" test))
-    
-    (let ([err (queue-callback/res (λ () (send drs syncheck:get-error-report-contents)))]) 
-      (when err
-        (eprintf "FAILED ~s\n   error report window is visible:\n   ~a\n"
-                 test
-                 err))))
-  
-  (define (click-check-syntax-button drs extra-info?)
-    (test:run-one (lambda () (send drs syncheck:button-callback #:print-extra-info? extra-info?))))
-
-(main)
-
-(module+ test
-  (module config info
-    (define timeout 200)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-coverage.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-coverage.rkt
deleted file mode 100644
index 6977d70afc..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-coverage.rkt
+++ /dev/null
@@ -1,123 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class
-         mrlib/text-string-style-desc
-         "private/drracket-test-util.rkt"
-         (for-syntax racket/base))
-
-;; Test suite for the coverage annotations in the teaching languages.
-;; Each test case specifies a teaching language (via a regexp), a string
-;; to put in the definitions window and a list of strings that correspond to
-;; maximal uncovered regions from the original program. Running this file
-;; will fire up a drracket, put the program in the definitions, run the 
-;; program, ensure that the output is only whitespace and numbers, and then 
-;; make sure the coverage is as expected.
-
-;; NB: the results of executing each of these tests (ie the stuff that shows up in the 
-;; interactions window when you run the program) should be whitespace and numbers only
-;; (well, plus the prompt)
-
-
-(struct test (lang-regexp program uncovered line))
-
-(define-syntax (t stx)
-  (syntax-case stx ()
-    [(t a b c)
-     (with-syntax ([line (syntax-line #'t)])
-       #'(test a b c line))]))
-
-(define tests
-  (list (t #rx"Beginning Student$"
-           "(define (f x) x)"
-           '("x"))
-        (t #rx"Beginning Student$"
-           "(define (f x) x) (f 1)"
-           '())
-        (t #rx"Beginning Student$"
-           "(define-struct s (a b))"
-           '())
-        (t #rx"Beginning Student$"
-           #<<--
-(define (f x)
-  (... (cond
-         [(null? x) ???]
-         [else      (first x)
-                    (f (rest x))])))
---
-           '())
-        
-        (t #rx"Intermediate Student$"
-           "(define-struct s (a b))"
-           '())
-        (t #rx"Advanced Student$"
-           #<<--
-(define-struct foo (x))
-;; ----------------------------------------------------
-;; MF: something broke about signatures 
-;; Shriram said at Dagstuhl that he doesn't use them,
-;; and I don't know of anyone else who uses them in *SL
-;; ----------------------------------------------------
-;; (: make-foo (Number -> foo))
-;; (: foo-x (foo -> Number))
-
-(define x (make-foo 5))
-(foo-x x)
---
-           '())))
-
-;; get-annotate-output : drscheme-frame -> (listof str/ann)
-(define (get-annotated-output drs)
-  (let ([chan (make-channel)])
-    (queue-callback
-     (λ ()
-       (channel-put chan (get-string/style-desc (send drs get-definitions-text)))))
-    (channel-get chan)))
-
-;; returns #t if an element of the result of get-string/style-desc
-;; corresponds to an uncovered region of the editor
-(define (is-uncovered? ele)
-  (let ([style (list-ref ele 1)])
-    (eq? style 'test-coverage-off)))
-
-;; find-uncovered-text : list[get-string/style-desc result] -> (listof string)
-;; returns strings containing the uncovered text in the editor (in the order they appear in the file)
-(define (find-uncovered-text string/style-desc)
-  (map car (filter is-uncovered? string/style-desc)))
-
-(fire-up-drracket-and-run-tests
- (λ ()
-   (let* ([drr-frame (wait-for-drracket-frame)]
-          [definitions-text (send drr-frame get-definitions-text)]
-          [interactions-text (send drr-frame get-interactions-text)])
-       
-     (let ([last-lang #f])
-       (for ([t (in-list tests)])
-         
-         
-         (let* ([this-lang (test-lang-regexp t)]
-                [same-last-time? (and (regexp? last-lang)
-                                      (equal? (object-name last-lang)
-                                              (object-name this-lang)))])
-           (unless same-last-time?
-             (set! last-lang this-lang)
-             (set-language-level! (list this-lang))))
-         
-         (clear-definitions drr-frame)
-         (insert-in-definitions drr-frame (test-program t))
-         (do-execute drr-frame)
-         
-         (let ([result (fetch-output
-                        drr-frame
-                        (send interactions-text paragraph-start-position 2)
-                        (send interactions-text last-position))])
-           (unless (regexp-match #rx"^[ \n\t0-9>]*$" result)
-             (eprintf "FAILED line ~a, got ~s for the output, but expected only digits and whitespace"
-                      (test-line t)
-                      result)))
-
-         (let ([got (find-uncovered-text (get-annotated-output drr-frame))])
-           (unless (equal? got (test-uncovered t))
-             (eprintf "FAILED line ~a\n     got: ~s\nexpected: ~s\n"
-                      (test-line t)
-                      got
-                      (test-uncovered t)))))))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-executable-creation.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-executable-creation.rkt
deleted file mode 100644
index 9cf21053ec..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-executable-creation.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-(require lang/private/create-htdp-executable
-         racket/file
-         racket/system)
-(define tmpfile (make-temporary-file "executable-creation-test~a"))
-
-(create-htdp-lang-executable (collection-file-path
-                              "image-and-comment-box.rkt"
-                              "tests"
-                              "drracket")
-                             tmpfile
-                             '(lib "htdp-beginner-reader.ss" "lang"))
-
-(define sp (open-output-string))
-(define res
-  (let/ec k
-    (parameterize ([error-escape-handler (λ () (k #f))])
-      (parameterize ([current-output-port sp]
-                     [current-error-port sp]
-                     [current-input-port (open-input-string "")])
-        (case (system-type)
-          [(macosx) 
-           (define-values (base name dir) (split-path tmpfile))
-           (system
-            (path->string
-             (build-path tmpfile "Contents" "MacOS" name)))]
-          [(unix)
-           (system (path->string tmpfile))]
-          [(windows)
-           (error 'teaching-lang-executable-creation.rkt "test not supported")])))))
-(delete-directory/files tmpfile)
-
-(define expected "1\n")
-(unless (and res (equal? (get-output-string sp) expected))
-  (eprintf "TEST FAILED; res ~s\n~a\n" res (get-output-string sp)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-save-file.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-save-file.rkt
deleted file mode 100644
index ca73cc9c13..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-save-file.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang scheme/base
-(require scheme/file
-         scheme/class
-         scheme/port
-         framework/test
-         framework/preferences)
-
-(require tests/drracket/private/drracket-test-util)
-
-(fire-up-drracket-and-run-tests
- (λ ()
-   (let* ([drr-frame (wait-for-drracket-frame)]
-          [fn (make-temporary-file "save-teaching-lang-test~a")])
-     (test:menu-select "File" "New Tab")
-     
-     (let ([definitions-text (send drr-frame get-definitions-text)]
-           [interactions-text (send drr-frame get-interactions-text)])
-       
-       (set-language-level! (list #rx"Beginning Student$"))
-       (clear-definitions drr-frame)
-       (queue-callback/res
-        (λ () 
-          (send definitions-text set-filename fn)
-          (send definitions-text insert "(define (f x) x)\n(f 1)\n")))
-       (test:menu-select "File" "Save Definitions")
-       (unless (call-with-input-file fn
-                 (λ (p) (regexp-match #rx";;[^\n]*metadata" p)))
-         
-         (eprintf "---- saved file, cut here ----\n")
-         (call-with-input-file fn (λ (p) (copy-port p (current-error-port))))
-         (eprintf "---- saved file, cut here ----\n")
-         (error 'save-teaching-lang-file.rkt
-                "expected the saved file to contain the word 'metadata' in a comment"))
-       (do-execute drr-frame)
-       (test:menu-select "File" (if (eq? (system-type) 'unix) "Close" "Close Tab"))
-       (use-get/put-dialog 
-        (λ () 
-          (test:menu-select "File" "Open..."))
-        fn)
-       (do-execute drr-frame)
-       (let ([result (fetch-output
-                      drr-frame
-                      (send interactions-text paragraph-start-position 2)
-                      (send interactions-text last-position))])
-         (test:menu-select "File" (if (eq? (system-type) 'unix) "Close" "Close Tab"))
-         (delete-file fn)
-         (unless (equal? result "1\n> ")
-           (error 'save-teaching-lang-file.rkt "expected the program to produce 1 (followed by the prompt), got ~s" result)))))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-sharing-modules.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-sharing-modules.rkt
deleted file mode 100644
index 21e3ee0a77..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-sharing-modules.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket
-(require "private/drracket-test-util.rkt")
-
-#|
-
-This test checks to see if the code that htdp-lang.rkt injects
-into the teaching languages relies only on modules that are
-shared between drracket's and the teaching languages's namespace.
-
-In practice when this test fails it means that some code in
-langs/htdp-lang.rkt has something like #'(f) for some function
-f that is intended to be eval'd in the teaching languages and 
-it should instead have #'(#%plain-app f). In that case, this
-test fails because the #'(f) is reall #'(#%app f) which uses
-the application form from racket/base and that #%app macro
-is not there in the teaching languages (since the modules
-implementing it are not being shared, you get a different instance
-of that macro, tho; one that triggers an error).
-
-Of course, other (similar) things can go wrong, too.
-
-|#
-
-(define things-to-try
-  (list '(check-expect 1 1)
-        '(check-within 1 1.01 2)
-        '(check-error (car))
-        '(check-error (error 'x "y") "x: y")
-        '(check-member-of 1 2 3 1 4)
-        '(check-range 1 0 2)))
-
-(define first-line-output (format "All ~a tests passed!" (length things-to-try)))
-
-(define (go)
-  (fire-up-drracket-and-run-tests
-   (λ ()
-     (putenv "PLTDRHTDPNOCOMPILED" "yes")
-     (define drs-frame (wait-for-drracket-frame))
-     (set-language-level! '("Beginning Student"))
-     (clear-definitions drs-frame)
-     (for ([exp (in-list things-to-try)])
-       (insert-in-definitions drs-frame (format "~s\n" exp)))
-     (do-execute drs-frame)
-     (let ([output (fetch-output drs-frame)])
-       (cond
-         [(equal? output first-line-output)
-          (try-interaction-test drs-frame)]
-         [else
-          (eprintf "teaching-lang-sharing-modules.rkt: got bad output from execute: ~s"
-                   output)])))))
-
-(define (try-interaction-test drs-frame)
-  (type-in-interactions drs-frame "1\n")
-  (wait-for-computation drs-frame)
-  (let ([interactions-output (fetch-output drs-frame)])
-    (unless (equal? interactions-output (format "~a\n> 1\n1" first-line-output))
-      (error 'teaching-language-sharing-modules.rkt
-             "got bad output from interaction: ~s\n" 
-             interactions-output))))
-
-(go)
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teachpack.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/teachpack.rkt
deleted file mode 100644
index 8bb2c5f78f..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teachpack.rkt
+++ /dev/null
@@ -1,280 +0,0 @@
-#lang racket/base
-
-(require "private/drracket-test-util.rkt"
-         racket/class
-         racket/path
-         racket/gui/base
-         framework
-         (prefix-in fw: framework))
-
-(provide run-test)
-
-(define drs-frame 'not-yet-drs-frame)
-(define interactions-text 'not-yet-interactions-text)
-
-(define good-teachpack-name "teachpack-tmp~a")
-
-(define (test-good-teachpack tp-exps dr-exp expected)
-  (clear-definitions drs-frame)
-  (type-in-definitions drs-frame dr-exp)
-  (fw:test:menu-select "Language" "Clear All Teachpacks")
-  
-  (let ([tp-names
-         (let loop ([tp-exps tp-exps]
-                    [n 0])
-           (cond
-             [(null? tp-exps) null]
-             [else
-              (let ([tp-name 
-                     (normal-case-path
-                      (normalize-path
-                       (collection-file-path
-                        (string-append
-                         (format good-teachpack-name n)
-                         ".ss")
-                        "tests" "drracket")))])
-                (call-with-output-file tp-name
-                  (lambda (port) (write (car tp-exps) port))
-                  'truncate)
-                (use-get/put-dialog
-                 (lambda ()
-                   (fw:test:menu-select "Language" "Add Teachpack..."))
-                 tp-name)
-                (cons tp-name (loop (cdr tp-exps) (+ n 1))))]))])
-    
-    (do-execute drs-frame)
-    
-    (let ([got (fetch-output drs-frame)]
-          [full-expectation 
-           (string-append
-            (apply string-append (map (lambda (x) (format "Teachpack: ~a.\n" x)) tp-names))
-            expected
-            "\nThis psorgram should be tested.")])
-      (unless (equal? got 
-                      full-expectation)
-        (printf 
-         "FAILED:       tp: ~s\n             exp: ~s\n        expected: ~s\n             got: ~s\n"
-         tp-exps
-         dr-exp
-         full-expectation
-         got)))))
-
-;; there are no more errors when the teachpack is loaded (for now...)
-(define (test-bad/load-teachpack tp-exp expected-error)
-  (fw:test:menu-select "Language" "Clear All Teachpacks")
-  (let ([tp-name (normal-case-path
-                  (normalize-path
-                   (build-path
-                    (collection-path "tests" "drracket")
-                    "teachpack-tmp.ss")))])
-    (call-with-output-file tp-name
-      (lambda (port) (display tp-exp port))
-      'truncate)
-    (use-get/put-dialog
-     (lambda ()
-       (fw:test:menu-select "Language" "Add Teachpack..."))
-     tp-name)
-    (let ([dialog
-           (with-handlers ([(lambda (x) #t)
-                            (lambda (x) #f)])
-             (wait-for-new-frame drs-frame))])
-      (cond
-        [dialog
-         (let ([got (send dialog get-message)])
-           (unless (string=? got expected-error)
-             (printf "FAILED:       tp: ~s\n        expected: ~s\n             got: ~s\n"
-                     tp-exp expected-error got))
-           (fw:test:button-push "Ok")
-           (wait-for-new-frame dialog))]
-        [else
-         (printf "FAILED: no error message appeared\n              tp: ~s\n        expected: ~s\n"
-                 tp-exp expected-error)]))))
-
-(define (test-bad/execute-teachpack tp-exp expected)
-  (fw:test:menu-select "Language" "Clear All Teachpacks")
-  (let ([tp-name (normal-case-path
-                  (normalize-path
-                   (build-path
-                    (collection-path "tests" "drracket")
-                    "teachpack-tmp.ss")))])
-    (call-with-output-file tp-name
-      (lambda (port) (display tp-exp port))
-      'truncate)
-    (use-get/put-dialog
-     (lambda ()
-       (fw:test:menu-select "Language" "Add Teachpack..."))
-     tp-name)
-    (do-execute drs-frame #f)
-    (let ([dialog
-           (with-handlers ([exn:fail? (lambda (x) #f)])
-             (let ([wait-for-error-pred
-                    (lambda ()
-                      (let ([active
-                             (or
-                              (test:get-active-top-level-window)
-                              (and (send interactions-text get-user-eventspace)
-                                   (parameterize ([current-eventspace
-                                                   (send interactions-text get-user-eventspace)])
-                                     (test:get-active-top-level-window))))])
-                        (if (and active (not (eq? active drs-frame)))
-                            active
-                            #f)))])
-               (poll-until wait-for-error-pred)))])
-      (cond
-        [dialog
-         (let ([got (send dialog get-message)]
-               [expected-error
-                (format "Invalid Teachpack: ~a\n~a" tp-name expected)])
-           (unless (string=? got expected-error)
-             (printf "FAILED:       tp: ~s\n        expected: ~s\n             got: ~s\n"
-                     tp-exp expected-error got))
-           (fw:test:button-push "Ok")
-           (wait-for-new-frame dialog))]
-        [else
-         (printf "FAILED: no error message appeared\n              tp: ~s\n        expected: ~s\n"
-                 tp-exp error)]))))
-
-(define (generic-tests)
-  (test-good-teachpack
-   (list
-    `(module ,(string->symbol (format good-teachpack-name 0)) mzscheme))
-   "1"
-   "1")
-  
-  (test-good-teachpack
-   (list `(module ,(string->symbol (format good-teachpack-name 0)) mzscheme
-            (provide not-a-primitive)
-            (define not-a-primitive 1)))
-   "not-a-primitive"
-   "1")
-  
-  (test-good-teachpack
-   (list `(module ,(string->symbol (format good-teachpack-name 0)) mzscheme
-            (provide not-a-primitive1)
-            (define not-a-primitive1 1))
-         `(module ,(string->symbol (format good-teachpack-name 1)) mzscheme
-            (provide not-a-primitive2)
-            (define not-a-primitive2 2)))
-   "(+ not-a-primitive1 not-a-primitive2)"
-   "3"))
-
-(define (good-tests)
-  (set-language-level! '("Beginning Student"))
-  (do-execute drs-frame)
-  (generic-tests))
-
-(define (bad-tests)
-  (set-language-level! '("Beginning Student"))
-  
-  (test-bad/execute-teachpack
-   "undefined-id"
-   "reference to undefined identifier: undefined-id")
-  
-  (test-bad/execute-teachpack
-   `(module teachpack-tmp mzscheme (car))
-   "car: expects argument of type <pair>; given: 1"))
-
-(define (get-string-from-file fn)
-  (call-with-input-file fn
-    (lambda (port)
-      (apply string-append
-             (let loop ()
-               (let ([l (read-line port)])
-                 (if (eof-object? l)
-                     null
-                     (list* l " " (loop)))))))
-    'text))
-
-;; doesn't test graphing.ss teachpack
-(define (test-built-in-teachpacks)
-  (clear-definitions drs-frame)
-  (type-in-definitions drs-frame "1")
-  (define (test-teachpack dir teachpack)
-    (when (or (equal? #"ss" (filename-extension teachpack))
-              (equal? #"scm" (filename-extension teachpack))
-              (equal? #"rkt" (filename-extension teachpack)))
-      (unless (or (equal? "graphing.ss" (path->string teachpack))
-                  (regexp-match #rx"^info[.][^.]*$" (path->string teachpack)))
-        (printf "  testing ~a\n" teachpack)
-        (fw:test:menu-select "Language" "Clear All Teachpacks")
-        (fw:test:menu-select "Language" "Add Teachpack...")
-        (wait-for-new-frame drs-frame)
-        (define tp-dialog (test:get-active-top-level-window))
-        (define choice 
-          (let-values ([(_1 parent-dir _2) (split-path dir)])
-            (find/select-relevant-choice tp-dialog 
-                                         (path->string parent-dir)
-                                         (path->string teachpack))))
-        (fw:test:button-push "OK")
-        (wait-for-new-frame tp-dialog)
-        (do-execute drs-frame)
-        
-        (define got (fetch-output drs-frame))
-        (define expected (format "Teachpack: ~a.\n1" (path->string teachpack)))
-        (unless (equal? got expected)
-          (printf "FAILED built in teachpack test: ~a\n" (path->string teachpack))
-          (printf "       got: ~s\n  expected: ~s\n" got expected)))))
-  (define (test-teachpacks an-image-tp)
-    (define-values (dir name dir?) (split-path an-image-tp))
-    (for ([file (in-list (directory-list dir))])
-      (test-teachpack dir file)))
-  (set-language-level! '("Advanced Student"))
-  (do-execute drs-frame)
-  (test-teachpacks (collection-file-path "image.rkt" "teachpack" "2htdp"))
-  (test-teachpacks (collection-file-path "image.rkt" "teachpack" "htdp")))
-
-(define (find/select-relevant-choice tp-dialog parent-dir tp-string)
-  (define-values (lb index)
-    (let loop ([p tp-dialog])
-      (cond
-        [(and (is-a? p list-box%)
-              (list-control-get-index p parent-dir tp-string))
-         =>
-         (λ (i)
-           (values p i))]
-        [(is-a? p area-container<%>)
-         (let c-loop ([children (send p get-children)])
-           (cond
-             [(null? children) (values #f #f)]
-             [else (define-values (tb index) (loop (car children)))
-                   (if tb
-                       (values tb index)
-                       (c-loop (cdr children)))]))]
-        [else (values #f #f)])))
-  (cond
-    [lb (fw:test:set-list-box! lb index)]
-    [else
-     (error 'find/select-relevant-choice "did not find ~s in any list-box%" tp-string)]))
-
-(define (list-control-get-index control parent-dir tp-string)
-  (let loop ([i 0])
-    (cond
-      [(< i (send control get-number))
-       (if (or (equal? (send control get-string i)
-                       tp-string)
-               (equal? (send control get-string i)
-                       (format "~a/~a" parent-dir tp-string)))
-           i
-           (loop (+ i 1)))]
-      [else #f])))
-
-(define (find-leftmost-choice frame)
-  (let loop ([p frame])
-    (cond
-      [(is-a? p list-box%) p]
-      [(is-a? p area-container<%>)
-       (ormap loop (send p get-children))]
-      [else #f])))
-
-(define (run-test)
-  (set! drs-frame (wait-for-drracket-frame))
-  (set! interactions-text (send drs-frame get-interactions-text))
-  ;(good-tests)
-  ;(bad-tests)
-  (test-built-in-teachpacks))
-
-(fire-up-drracket-and-run-tests run-test)
-
-(module+ test
-  (module config info
-    (define timeout 150)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/test-docs-complete.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/test-docs-complete.rkt
deleted file mode 100644
index 9165956312..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/test-docs-complete.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs 'drracket/check-syntax)
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/test-engine-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/test-engine-test.rkt
deleted file mode 100644
index a2a8f574e8..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/test-engine-test.rkt
+++ /dev/null
@@ -1,525 +0,0 @@
-#lang racket
-
-(require "private/drracket-test-util.rkt"
-         "private/gui.rkt"
-         mred
-         framework
-         (prefix-in fw: framework))
-
-(define language (make-parameter "<<not a language>>"))
-
-;; set-language : boolean -> void
-(define (set-language close-dialog?)
-  (set-language-level! (language) close-dialog?))
-
-(define (common-test-engine dmda?)
-  (test-expression "(check-expect 1 1)"
-                   "The test passed!"
-                   #:repl-expected "Both tests passed!")
-  
-  (test-expression "(check-within 1 1.1 0.5)"
-                   "The test passed!"
-                   #:repl-expected "Both tests passed!")
-  
-  (test-expression "(check-expect 1 2)"
-                   ""
-                   #:check-failures-expected
-                   (list (make-check-expect-failure "1" "2" 1 0))
-                   #:repl-check-failures-expected
-                   (list (make-check-expect-failure "1" "2" 3 2)))
-  
-  (unless dmda?
-    (test-expression (format "~s" '(check-error (first 212) "first: expects a non-empty list; given: 212"))
-                     "The test passed!"
-                     #:repl-expected "Both tests passed!"))
-  
-  (unless dmda?
-    (test-expression "(check-expect (car 0) 2)"
-                     "car: expects a pair, given 0"
-                     #:check-failures-expected
-                     (list (make-check-expect-error "2." ":: car: expects a pair, given 0" 1 0))
-                     #:repl-check-failures-expected
-                     (list (make-check-expect-error "2." ":: car: expects a pair, given 0" 4 2)))))
-
-(define (common-signatures-*sl)
-  (test-expression "(: foo Integer) (define foo 5)"
-		   ""
-		   #:repl-expected "foo: this name was defined previously and cannot be re-defined")
-  (test-expression "(: foo Integer) (define foo \"bar\")"
-		   ""
-		   #:repl-expected "foo: this name was defined previously and cannot be re-defined"
-		   #:signature-violations-expected
-		   (list (make-signature-violation "\"bar\"" 1 7)))
-  (test-expression "(: foo (Integer -> Integer)) (define (foo x) x) (foo \"foo\")"
-		   "\"foo\""
-		   #:repl-expected "foo: this name was defined previously and cannot be re-defined\n"
-		   #:signature-violations-expected
-		   (list (make-signature-violation "\"foo\" at line 1, column 48 " 1 8))
-		   #:repl-signature-violations-expected
-                   (list))
-  (test-expression "(: foo (Integer -> Integer)) (define foo (lambda (x) x))"
-		   ""
-		   #:repl-expression "(foo \"foo\")"
-		   #:repl-expected "\"foo\""
-		   #:repl-signature-violations-expected
-		   (list (make-signature-violation "\"foo\" at line 3, column 2 " 1 8))))
-
-(define (common-signatures-DMdA)
-  (test-expression "(: foo integer) (define foo 5)"
-		   ""
-		   #:repl-expected "define: Zweite Definition für denselben Namen")
-  (test-expression "(: foo integer) (define foo \"bar\")"
-		   ""
-		   #:repl-expected "define: Zweite Definition für denselben Namen"
-		   #:signature-violations-expected
-		   (list (make-signature-violation "\"bar\"" 1 7)))
-  (test-expression "(: foo (integer -> integer)) (define foo (lambda (x) x)) (foo \"foo\")"
-		   "\"foo\""
-                   #:repl-expected "define: Zweite Definition für denselben Namen"
-		   #:signature-violations-expected
-		   (list (make-signature-violation "\"foo\" at line 1, column 57 " 1 8))
-		   #:repl-signature-violations-expected
-		   (list))
-  (test-expression "(: foo (integer -> integer)) (define foo (lambda (x) x))"
-		   ""
-		   #:repl-expression "(foo \"foo\")"
-		   #:repl-expected "\"foo\""
-		   #:repl-signature-violations-expected
-		   (list (make-signature-violation "\"foo\" at line 3, column 2 " 1 8))))
-
-
-
-;                                                             
-;  ;;;                    ;;                                  
-;   ;;                    ;;                                  
-;   ;;                                                        
-;   ;;;;;   ;;;;   ;;;;;;;;;  ;;; ;;   ;;; ;;    ;;;;  ;;; ;; 
-;   ;;  ;; ;;  ;; ;;  ;;  ;;   ;;; ;;   ;;; ;;  ;;  ;;  ;;;;; 
-;   ;;  ;; ;;  ;; ;;  ;;  ;;   ;;  ;;   ;;  ;;  ;;  ;;  ;;    
-;   ;;  ;; ;;;;;;  ;;;;   ;;   ;;  ;;   ;;  ;;  ;;;;;;  ;;    
-;   ;;  ;; ;;      ;      ;;   ;;  ;;   ;;  ;;  ;;      ;;    
-;   ;;  ;; ;;   ;  ;;;;;  ;;   ;;  ;;   ;;  ;;  ;;   ;  ;;    
-;   ;;;;;   ;;;;   ;;;;;;;;;; ;;;; ;;; ;;;; ;;;  ;;;;  ;;;;   
-;                 ;;   ;;                                     
-;                 ;;   ;;                                     
-;                  ;;;;;                                      
-
-(define (beginner)
-  (parameterize ([language (list #rx"Beginning Student(;|$)")])
-    (prepare-for-test-expression)
-    (common-test-engine #f)))
-
-
-;                                                                            
-;  ;;;                                 ;;;     ;;;                           
-;   ;;                       ;          ;;      ;;                           
-;   ;;                       ;          ;;      ;;                           
-;   ;;;;;   ;;;;   ;;;;;;   ;   ;;;;    ;;;;;   ;;;;;  ;;; ;;  ;;;;  ;;; ;;; 
-;   ;;  ;; ;;  ;; ;;  ;;    ;      ;;   ;;  ;;  ;;  ;;  ;;;;; ;;  ;;  ;;  ;  
-;   ;;  ;; ;;  ;; ;;  ;;   ;       ;;   ;;  ;;  ;;  ;;  ;;    ;;  ;;  ;;  ;  
-;   ;;  ;; ;;;;;;  ;;;;    ;    ;;;;;   ;;  ;;  ;;  ;;  ;;    ;;;;;;   ;;;   
-;   ;;  ;; ;;      ;       ;   ;;  ;;   ;;  ;;  ;;  ;;  ;;    ;;       ;;;   
-;   ;;  ;; ;;   ;  ;;;;;  ;    ;;  ;;   ;;  ;;  ;;  ;;  ;;    ;;   ;   ;;;   
-;   ;;;;;   ;;;;   ;;;;;; ;     ;;;;;;  ;;;;;   ;;;;;  ;;;;    ;;;;     ;    
-;                 ;;   ;;;                                                   
-;                 ;;   ;;;                                                   
-;                  ;;;;;                                                     
-
-
-(define (beginner/abbrev)
-  (parameterize ([language (list #rx"Beginning Student with List Abbreviations(;|$)")])
-    (prepare-for-test-expression)
-    (common-test-engine #f)))
-
-
-;                                                                                          
-;   ;;                                                      ;;;   ;;                       
-;   ;;            ;;                                         ;;   ;;           ;;          
-;                 ;;                                         ;;                ;;          
-;  ;;;  ;;; ;;   ;;;;;  ;;;;  ;;; ;; ;;; ;;  ;;    ;;;;   ;;;;;  ;;;   ;;;;   ;;;;;  ;;;;  
-;   ;;   ;;; ;;   ;;   ;;  ;;  ;;;;;  ;;; ;;; ;;  ;;  ;; ;;  ;;   ;;      ;;   ;;   ;;  ;; 
-;   ;;   ;;  ;;   ;;   ;;  ;;  ;;     ;;  ;;  ;;  ;;  ;; ;;  ;;   ;;      ;;   ;;   ;;  ;; 
-;   ;;   ;;  ;;   ;;   ;;;;;;  ;;     ;;  ;;  ;;  ;;;;;; ;;  ;;   ;;   ;;;;;   ;;   ;;;;;; 
-;   ;;   ;;  ;;   ;;   ;;      ;;     ;;  ;;  ;;  ;;     ;;  ;;   ;;  ;;  ;;   ;;   ;;     
-;   ;;   ;;  ;;   ;;   ;;   ;  ;;     ;;  ;;  ;;  ;;   ; ;;  ;;   ;;  ;;  ;;   ;;   ;;   ; 
-;  ;;;; ;;;; ;;;   ;;;  ;;;;  ;;;;   ;;;; ;;; ;;;  ;;;;   ;;;;;; ;;;;  ;;;;;;   ;;;  ;;;;  
-;                                                                                          
-;                                                                                          
-;                                                                                          
-
-
-(define (intermediate)
-  (parameterize ([language (list #rx"Intermediate Student(;|$)")])
-    (prepare-for-test-expression)
-    (common-test-engine #f)))
-
-;                                                                                    
-;                                                                                    
-;                                                                                    
-;    ;;               ;   ;;;;;;                        ;;;;           ;;;;          
-;    ;;              ;;   ;;;;;;                        ;;;;           ;;;;          
-;       ;;;; ;;;   ;;;;;  ;;;;;; ;;;;;;;  ;;;;;;; ;;;;  ;;;;;;;     ;;;;;;; ;;;;;;;  
-;  ;;;; ;;;;;;;;; ;;;;;;  ;;;;;; ;;;;;;;; ;;;;;;;;;;;;; ;;;;;;;;   ;;;;;;;; ;;;;;;;; 
-;  ;;;; ;;;; ;;;;  ;;;;   ;;;;;;     ;;;; ;;;; ;;; ;;;; ;;;;;;;;; ;;;;;;;;;     ;;;; 
-;  ;;;; ;;;; ;;;;  ;;;;  ;; ;;;;  ;;;;;;; ;;;; ;;; ;;;; ;;;; ;;;; ;;;; ;;;;  ;;;;;;; 
-;  ;;;; ;;;; ;;;;  ;;;;; ;; ;;;; ;;  ;;;; ;;;; ;;; ;;;; ;;;;;;;;; ;;;;;;;;; ;;  ;;;; 
-;  ;;;; ;;;; ;;;;  ;;;;; ;; ;;;; ;;;;;;;; ;;;; ;;; ;;;; ;;;;;;;;   ;;;;;;;; ;;;;;;;; 
-;  ;;;; ;;;; ;;;;   ;;;; ;; ;;;;  ;; ;;;; ;;;; ;;; ;;;; ;;;;;;;     ;;;;;;;  ;; ;;;; 
-;                        ;;                                                          
-;                                                                                    
-;                                                                                    
-
-
-(define (intermediate/lambda)
-  (parameterize ([language (list #rx"Intermediate Student with lambda(;|$)")])
-    (prepare-for-test-expression)
-    (common-test-engine #f)))
-
-
-;                                                                           
-;                                                                           
-;                                                                           
-;                ;;;;                                                  ;;;; 
-;                ;;;;                                                  ;;;; 
-;  ;;;;;;;    ;;;;;;; ;;;  ;;; ;;;;;;;  ;;;; ;;;    ;;;;;   ;;;     ;;;;;;; 
-;  ;;;;;;;;  ;;;;;;;; ;;;  ;;; ;;;;;;;; ;;;;;;;;;  ;;;;;;  ;;;;;   ;;;;;;;; 
-;      ;;;; ;;;;;;;;;  ;;;;;;      ;;;; ;;;; ;;;; ;;;;;;; ;;;; ;; ;;;;;;;;; 
-;   ;;;;;;; ;;;; ;;;;  ;;;;;;   ;;;;;;; ;;;; ;;;; ;;;;    ;;;;;;; ;;;; ;;;; 
-;  ;;  ;;;; ;;;;;;;;;  ;;;;;;  ;;  ;;;; ;;;; ;;;; ;;;;;;; ;;;;;   ;;;;;;;;; 
-;  ;;;;;;;;  ;;;;;;;;   ;;;;   ;;;;;;;; ;;;; ;;;;  ;;;;;;  ;;;;;;  ;;;;;;;; 
-;   ;; ;;;;   ;;;;;;;   ;;;;    ;; ;;;; ;;;; ;;;;   ;;;;;   ;;;;    ;;;;;;; 
-;                                                                           
-;                                                                           
-;                                                                           
-
-
-(define (advanced)
-  (parameterize ([language (list #rx"Advanced Student(;|$)")])
-    (prepare-for-test-expression)
-    (common-test-engine #f)
-    (common-signatures-*sl)))
-
-
-(define (DMdA-beginner)
-  (parameterize ([language (list #rx"Die Macht der Abstraktion - Anfänger(;|$)")])
-    (prepare-for-test-expression)
-    (common-test-engine #t)
-    (common-signatures-DMdA)))
-
-(define (DMdA-vanilla)
-  (parameterize ([language (list #rx"Die Macht der Abstraktion(;|$)")])
-    (prepare-for-test-expression)
-    (common-test-engine #t)
-    (common-signatures-DMdA)))
-
-(define (DMdA-assignments)
-  (parameterize ([language (list #rx"Die Macht der Abstraktion mit Zuweisungen(;|$)")])
-    (prepare-for-test-expression)
-    (common-test-engine #t)
-    (common-signatures-DMdA)))
-
-(define (DMdA-advanced)
-  (parameterize ([language (list #rx"Die Macht der Abstraktion - fortgeschritten(;|$)")])
-    (prepare-for-test-expression)
-    (common-test-engine #t)
-    (common-signatures-DMdA)))
-
-(define (prepare-for-test-expression)
-  (let ([drs (wait-for-drracket-frame)])
-    (clear-definitions drs)
-    (set-language #t)
-    (sleep 1) ;; this shouldn't be neccessary....
-    (do-execute drs)))
-
-;; test-setting : (-> void) string string string -> void
-;; opens the language dialog, runs `set-setting'
-;; closes the language dialog, executes,
-;; makes sure that `expression' produces
-;; `result'. `set-setting' is expected to click around
-;; in the language dialog.
-;; `setting-name' is used in the error message when the test fails.
-(define (test-setting set-setting setting-name expression result)
-  (set-language #f)
-  (set-setting)
-  (let ([f (test:get-active-top-level-window)])
-    (fw:test:button-push "OK")
-    (wait-for-new-frame f))
-  (let* ([drs (test:get-active-top-level-window)]
-         [interactions (send drs get-interactions-text)])
-    (clear-definitions drs)
-    (insert-in-definitions drs expression)
-    (do-execute drs)
-    (let ([got (fetch-output/should-be-tested drs)])
-      (unless (string=? result got)
-        (eprintf "FAILED: ~s ~s ~s test\n expected: ~s\n      got: ~s\n"
-                 (language) setting-name expression result got)))))
-
-(define (fetch-output/should-be-tested . args)
-  (regexp-replace (regexp
-                   (string-append
-                    (regexp-quote "")
-                    "$"))
-                  (apply fetch-output args)
-                  ""))
-
-(define re:out-of-sync
-  (regexp
-   "WARNING: Interactions window is out of sync with the definitions window\\."))
-
-(define (parse-number txt)
-  (cond
-    ((string=? txt "No") 0)
-    ((string=? txt "One") 1)
-    ((string=? txt "Two") 2)
-    (else (string->number txt))))
-
-(define (parse-test-failure-header txt)
-  (cond
-    ((regexp-match #rx"^Ran ([NoOneTwo0-9]+) tests?.\n([NoOneTwo0-9]+) tests? passed.\n([NoOneTwo0-9]+) signature violations?."
-                          txt)
-     => (lambda (match)
-          (let-values (((_ test-count-text test-passed-count-text signature-violations-count-text)
-                        (apply values match)))
-            (values (parse-number test-count-text)
-                    (parse-number test-passed-count-text)
-                    (parse-number signature-violations-count-text)))))
-    ((regexp-match #rx"^This program must be tested!\n([NoOneTwo0-9]+) signature violations?." txt)
-     => (lambda (match)
-          (values 0 0 (parse-number (cadr match)))))
-    (else
-     (error 'parse-test-failure-header "bad test failure header" txt))))
-
-(define (parse-test-failures txt)
-  (let-values (((test-count test-passed-count signature-violations-count)
-                (parse-test-failure-header txt)))
-    (let ((check-failures
-           (cond
-             ((regexp-match #rx"Check failures:\n(.*)" txt)
-              => (lambda (res)
-                   (parse-check-failures (cadr res))))
-             (else '())))
-          (signature-violations
-           (cond
-             ((regexp-match #rx"Signature violations:\n(.*)" txt)
-              => (lambda (res)
-                   (parse-signature-violations (cadr res))))
-             (else '()))))
-      (values test-count test-passed-count signature-violations-count
-              check-failures
-              signature-violations))))
-
-(define-struct check-expect-failure
-  (actual expected line column)
-  #:transparent)
-
-(define-struct check-expect-error (value message line column) #:transparent)
-
-(define (parse-check-failures txt)
-  (cond
-    ((string=? txt "") '())
-    ((regexp-match #rx"^Signature violations:" txt)
-     '())
-    ((regexp-match #rx"^[ \t]*\n(.*)" txt)
-     => (lambda (match)
-          (parse-check-failures (cadr match))))
-    ((regexp-match #rx"^[ \t]+Actual value ([^\n]+) differs from ([^\n]+), the expected value.\nat line ([0-9]+), column ([0-9]+)(.*)"
-                   txt)
-     => (lambda (match)
-          (let-values (((_ actual expected line-text col-text rest) (apply values match)))
-            (cons
-             (make-check-expect-failure actual expected
-                                        (string->number line-text)
-                                        (string->number col-text))
-             (parse-check-failures rest)))))
-    ((regexp-match #rx"^[ \t]+check-expect encountered the following error instead of the expected value, ([^\n]*). *\n[ \t]*([^\n]*)\n[^\n]*line ([0-9]+), column ([0-9]+)[ ]*\n(.*)$"
-                   txt)
-     => (lambda (match)
-          (define-values (_ value message line-text col-text rest) (apply values match))
-          (cons
-           (make-check-expect-error value
-                                    message
-                                    (string->number line-text)
-                                    (string->number col-text))
-           (parse-check-failures rest))))
-    (else 
-     (error "unknown check failure" txt (string-ref txt 0)))))
-
-(define-struct signature-violation
-  (got line column)
-  #:transparent)
-
-(define (parse-signature-violations txt)
-  (cond
-    ((string=? txt "") '())
-    ((regexp-match #rx"^[ \t]*\n(.*)" txt)
-     => (lambda (match)
-          (parse-signature-violations (cadr match))))
-    ((regexp-match "got ([^\n]+), signature at line ([0-9]+), column ([0-9]+)(.*)"
-                   txt)
-     => (lambda (match)
-          (let-values (((_ got line-text col-text rest) (apply values match)))
-            (cons
-             (make-signature-violation got
-                                       (string->number line-text)
-                                       (string->number col-text))
-             (parse-signature-violations rest)))))
-    (else '())))
-  
-
-;; types an expression in the definitions window, executes it and tests the output
-;; types an expression in the REPL and tests the output from the REPL.
-(define (test-expression expression defs-expected 
-			 #:repl-expression (repl-expression expression)
-                         #:repl-expected (repl-expected defs-expected)
-			 #:check-failures-expected (check-failures-expected '())
-			 #:signature-violations-expected (signature-violations-expected '())
-			 #:repl-check-failures-expected (repl-check-failures-expected '())
-			 #:repl-signature-violations-expected (repl-signature-violations-expected '()))
-  (let* ([drs (wait-for-drracket-frame)]
-         [interactions-text (queue-callback/res (λ () (send drs get-interactions-text)))]
-         [definitions-text (queue-callback/res (λ () (send drs get-definitions-text)))]
-         [handle-definition-insertion
-          (lambda (item)
-	    (insert-in-definitions drs item))]
-         [handle-interaction-insertion
-          (lambda (item)
-	    (insert-in-interactions drs item))]
-         [check-expectation
-          (lambda (expected got)
-            (cond
-              [(string? expected)
-               (whitespace-string=? expected got)]
-              [(regexp? expected)
-               (regexp-match expected got)]
-              [(procedure? expected)
-               (expected got)]))]
-	 [check-failures
-	  (lambda (where signature-violations-expected check-failures-expected)
-	    (let ((text
-		   (cond
-		    ((send (send definitions-text get-tab) get-test-editor)
-		     => (lambda (test-editor)
-			  (let ((text (send test-editor get-text 0 'eof #t)))
-			    (if (string=? text "")
-				#f
-				text))))
-		    (else #f))))
-	   
-	      (cond
-	       ((and (null? signature-violations-expected)
-		     (null? check-failures-expected))
-		(when text
-		  (eprintf "FAILED: ~s ~s expected ~s to produce no check failures or signature violations:\ngot:\n~a\ninstead\n"
-			   where (language) expression text)))
-	       (text
-		(let-values (((test-count test-passed-count signature-violation-count check-failures signature-violations)
-			      (parse-test-failures text)))
-		  (when (not (equal? check-failures check-failures-expected))
-		    (eprintf "FAILED: ~s ~s expected ~s to produce check failures:\n~s\ngot:\n~s\ninstead\n"
-			     where (language) expression check-failures-expected check-failures))
-		  (when (not (equal? signature-violations signature-violations-expected))
-		    (eprintf "FAILED: ~s ~s expected ~s to produce signature violations:\n~s\ngot:\n~s\ninstead\n"
-			     where (language) expression signature-violations-expected signature-violations))))
-	       (else
-		(eprintf "expected ~a check failures and ~a signature violations but got none"
-			 (length check-failures-expected) (length signature-violations-expected))))))]
-
-         [make-err-msg
-          (lambda (expected)
-            (cond
-              [(string? expected)
-               "FAILED: ~s ~s expected ~s to produce:\n  ~s\ngot:\n  ~s\ninstead\n"]
-              [(regexp? expected)
-               "FAILED: ~s ~s expected ~s to match ~s, got ~s instead\n"]
-              [(procedure? expected)
-               "FAILED: ~s ~s expected ~s to pass predicate ~s, got ~s\n"]))])
-    (clear-definitions drs)
-    (cond
-      [(pair? expression) (for-each handle-definition-insertion expression)]
-      [else (handle-definition-insertion expression)])
-    (do-execute drs)
-
-    (let ([got
-           (fetch-output
-            drs
-            (queue-callback/res (λ () (send interactions-text paragraph-start-position 2)))
-            (queue-callback/res
-             (λ ()
-               (send interactions-text paragraph-end-position
-                     (- (send interactions-text last-paragraph) 1)))))])
-      (when (regexp-match re:out-of-sync got)
-        (error 'test-expression "got out of sync message"))
-      (unless (check-expectation defs-expected got)
-        (eprintf (make-err-msg defs-expected) 
-                 'definitions (language) expression defs-expected got)))
-    
-    (check-failures 'definitions signature-violations-expected check-failures-expected)
-    
-    (cond
-     [(pair? repl-expression) (for-each handle-interaction-insertion repl-expression)]
-     [else (handle-interaction-insertion repl-expression)])
-    
-    (let ([last-para (queue-callback/res (lambda () (send interactions-text last-paragraph)))])
-      (alt-return-in-interactions drs)
-      (wait-for-computation drs)
-      (let ([got
-             (fetch-output
-              drs
-              (queue-callback/res
-               (λ ()
-                 (send interactions-text paragraph-start-position (+ last-para 1))))
-              (queue-callback/res
-               (λ ()
-                 (send interactions-text paragraph-end-position
-                       (- (send interactions-text last-paragraph) 1)))))])
-        (when (regexp-match re:out-of-sync got)
-          (error 'test-expression "got out of sync message"))
-        (unless (check-expectation repl-expected got)
-          (eprintf (make-err-msg repl-expected) 'interactions (language) expression repl-expected got))))
-    
-    ;; the failures from the definition window stick around
-    (check-failures 'interactions
-                    (append signature-violations-expected repl-signature-violations-expected)
-		    (append check-failures-expected repl-check-failures-expected))))
-
-(define (test-disabling-tests)
-  (define drs (wait-for-drracket-frame))
-  
-  (parameterize ([language (list #rx"Beginning Student(;|$)")]) 
-    (prepare-for-test-expression)
-    (test:menu-select "Racket" "Disable Tests")
-    (test-expression "(check-expect 1 2)" "Tests disabled.")
-    (test:menu-select "Racket" "Enable Tests"))
-  
-  (parameterize ([language (list #rx"Die Macht der Abstraktion - Anfänger(;|$)")])
-    (prepare-for-test-expression)
-    (test:menu-select "Racket" "Disable Tests")
-    (test-expression "(check-expect 1 2)" "Tests disabled.")
-    (test:menu-select "Racket" "Enable Tests")))
-  
-(define-syntax (go stx)
-  (syntax-case stx ()
-    [(_ arg)
-     (identifier? (syntax arg))
-     (syntax (begin (printf ">> starting ~a\n" 'arg)
-                    (arg)
-                    (printf ">> finished ~a\n" 'arg)))]))
-
-(define (run-test)
-  (preferences:set 'test-engine:test-window:docked? #t)
-  (go beginner)
-  (go beginner/abbrev)
-  (go intermediate)
-  (go intermediate/lambda)
-  (go advanced)
-  (go DMdA-beginner)
-  (go DMdA-vanilla)
-  (go DMdA-assignments)
-  (go DMdA-advanced)
-  (go test-disabling-tests))
-
-(fire-up-drracket-and-run-tests run-test)
-
-(module+ test
-  (module config info
-    (define timeout 480)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/time-keystrokes.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/time-keystrokes.rkt
deleted file mode 100644
index 6980a475fd..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/time-keystrokes.rkt
+++ /dev/null
@@ -1,86 +0,0 @@
-(module time-keystrokes mzscheme
-  
-  (require drscheme/tool
-           mzlib/list
-           mzlib/unit
-           mzlib/class
-           mzlib/etc
-           mred
-           framework)
-  
-  (provide tool@)
-  
-  (define short-str "(abc)")
-  (define chars-to-test (build-string
-                         400
-                         (λ (i) (string-ref short-str (modulo i (string-length short-str))))))
-  
-  (define tool@
-    (unit 
-      (import drscheme:tool^)
-      (export drscheme:tool-exports^)
-      
-      (define (phase1) (void))
-      (define (phase2) (void))
-      
-      (define (tool-mixin super%)
-        (class super%
-          (inherit get-button-panel)
-          (super-new)
-          (let ([button (new button%
-                             (label "Time Keystrokes")
-                             (parent (get-button-panel))
-                             (callback
-                              (lambda (button evt) 
-                                (time-keystrokes this))))])
-            (send (get-button-panel) change-children
-                  (lambda (l)
-                    (cons button (remq button l)))))))
-      
-      (define (time-keystrokes frame)
-        (let loop ([n 10])
-          (when (zero? n)
-            (error 'time-keystrokes "could not find drscheme frame"))
-          (let ([front-frame (test:get-active-top-level-window)])
-            (unless (eq? front-frame frame)
-              (sleep 1/10)
-              (loop (- n 1)))))
-        (let ([win (send frame get-definitions-canvas)])
-          (send win focus)
-          (time (send-key-events win chars-to-test))))
-      
-      (define (send-key-events window chars)
-        (for-each (λ (char)
-                    (send-key-event window (new key-event% (key-code char))))
-                  (string->list chars)))
-      
-      
-      ;; copied from framework/test.rkt
-      (define (send-key-event window event)
-        (let loop ([l (ancestor-list window #t)])
-          (cond [(null? l)
-                 (cond
-                   [(method-in-interface? 'on-char (object-interface window))
-                    (send window on-char event)]
-                   [(is-a? window text-field%)
-                    (send (send window get-editor) on-char event)]
-                   [else 
-                    (error
-                     'send-key-event
-                     "focused window is not a text-field% and does not have on-char: ~s" window)])]
-                [(send (car l) on-subwindow-char window event) #f]
-                [else (loop (cdr l))])))
-      
-      ;; copied from framework/test.rkt
-      (define (ancestor-list window stop-at-top-level-window?)
-        (let loop ([w window] [l null])
-          (if (or (not w)
-                  (and stop-at-top-level-window?
-                       (is-a? w top-level-window<%>)))
-              l
-              (loop (send w get-parent) (cons w l)))))
-      
-      (when (getenv "PLTDRKEYS")
-        (printf "PLTDRKEYS: installing unit frame mixin\n")
-        (drscheme:get/extend:extend-unit-frame tool-mixin)))))
-
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/tool-lib-and-sig.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/tool-lib-and-sig.rkt
deleted file mode 100644
index 0964471d30..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/tool-lib-and-sig.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-
-#|
-
-This file will fail to compile if
-drracket/tool-lib and the contents of
-drracket:tool^ get out of sync.
-
-Running it will open up a DrRacket (not
-something we need to do for this test).
-
-|#
-
-
-;; comment out this test case as it makes 'raco setup'
-;; complain in its currently-broken state
-;; try again after PR 14093 is fixed.
-#;
-(module just-compile-me racket/base
-  (require drracket/tool
-           drracket/private/drsig
-           drracket/tool-lib
-           racket/unit)
-  
-  (define-values/invoke-unit 
-    (unit
-      (import drracket:tool^)
-      (export drracket:tool-exports^)
-      (define phase1 void)
-      (define phase2 void))
-    (import drracket:tool^)
-    (export drracket:tool-exports^)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/help/test-gui-docs-complete.rkt b/pkgs/drracket-pkgs/drracket-test/tests/help/test-gui-docs-complete.rkt
deleted file mode 100644
index be352619cc..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/help/test-gui-docs-complete.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote help/help))
-(check-docs (quote help/bug-report))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/jpr/README.TXT b/pkgs/drracket-pkgs/drracket-test/tests/jpr/README.TXT
deleted file mode 100644
index deadad3c6d..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/jpr/README.TXT
+++ /dev/null
@@ -1,6 +0,0 @@
-Some files to be checked for compatibility with new releases
-of PLT-Scheme, from 4.2.5.1
-
-Book : "Premiers Cours de Programmation avec (PLT) Scheme"
-Jean-Paul Roy, Sept. 2010, 410 pages, to be published.
-
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/jpr/balle-grav-frot.ss b/pkgs/drracket-pkgs/drracket-test/tests/jpr/balle-grav-frot.ss
deleted file mode 100644
index fdc94c9181..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/jpr/balle-grav-frot.ss
+++ /dev/null
@@ -1,48 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-advanced-reader.ss" "lang")((modname balle-grav-frot) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t write mixed-fraction #t #t none #f ())))
-;;; Language : advanced student
-
-(require "valrose.ss")
-
-(define (balle-avec-gravitation-et-frottement x0 y0 dx0 dy0)
-  (local [(define BALLE (bitmap "ballon.png"))
-          (define R (/ (image-width BALLE) 2))
-          (define SIZE 400)
-          (define FOND (place-image (text "Mouse or Space !" 18 "Blue") 200 80 (rectangle SIZE SIZE 'solid "yellow")))
-          (define-struct monde (x y dx dy))
-          (define INIT (make-monde x0 y0 dx0 dy0))
-          (define G #i1)
-          (define F #i0.95)
-          (define (suivant m)
-            (local [(define x (monde-x m))
-                    (define y (monde-y m))
-                    (define dx (monde-dx m))
-                    (define dy (monde-dy m))
-                    (define xs (+ x dx))
-                    (define ys (+ y dy))]
-              (cond ((> ys (- SIZE R)) (make-monde xs (- SIZE R) (* F dx) (+ (* F (- dy)) G)))
-                    ((< xs R) (make-monde R ys (* F (- dx)) (* F (+ dy G))))
-                    ((> (+ xs R) SIZE) (make-monde (- SIZE R) ys (* F (- dx)) (* F (+ dy G))))
-                    ((< ys R) (make-monde xs R dx (+ (* F (- dy)) G)))
-                    (else (make-monde xs ys dx (+ dy G))))))
-          (define (souris m x y evt)
-            (if (mouse=? evt "button-down")
-                (make-monde x y (monde-dx m) (monde-dy m))
-                m))
-          (define (clavier m key)
-            (if (key=? key " ")
-                (make-monde (+ R (random (- SIZE (* 2 R)))) (+ R (random (- SIZE (* 2 R)))) (monde-dx m) (monde-dy m))
-                m))
-          (define (dessiner m)
-            (place-image BALLE (monde-x m) (monde-y m) FOND))
-          (define (final? m)
-            (and (< (abs (- SIZE (monde-y m) R)) 1) (< (abs (monde-dx m)) 1) (< (abs (monde-dy m)) 1)))]
-    (big-bang INIT
-              (on-tick suivant)
-              (on-draw dessiner SIZE SIZE)
-              (on-mouse souris)
-              (on-key clavier)
-              (stop-when final?))))
-
-(balle-avec-gravitation-et-frottement 200 200 5 15)
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/jpr/ballon.png b/pkgs/drracket-pkgs/drracket-test/tests/jpr/ballon.png
deleted file mode 100644
index 3f615e55ca..0000000000
Binary files a/pkgs/drracket-pkgs/drracket-test/tests/jpr/ballon.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/jpr/dessine-arbre.ss b/pkgs/drracket-pkgs/drracket-test/tests/jpr/dessine-arbre.ss
deleted file mode 100644
index d7ad76f446..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/jpr/dessine-arbre.ss
+++ /dev/null
@@ -1,34 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-advanced-reader.ss" "lang")((modname dessine-arbre) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t write mixed-fraction #t #t none #f ())))
-;;; dessine-arbre.ss
-
-(require "valrose.ss")
-
-(define (objet->image x)    ; x est un operateur ou une feuille
-  (text (if (number? x) (number->string x) (symbol->string x))
-        18 "black"))
-
-(define (vert h) (rectangle 1 h 'solid "white"))
-(define (horiz w) (rectangle w 1 'solid "white"))
-
-(define (arbre->image A)    ; Arbre --> Image au niveau n
-  (if (feuille? A)
-      (objet->image A)
-      (local [(define ig (arbre->image (fg A)))
-              (define wg/2 (/ (image-width ig) 2))
-              (define id (arbre->image (fd A)))
-              (define wd/2 (/ (image-width id) 2))
-              (define igd (beside/align 'top ig (horiz 20) id))
-              (define wgd/2 (/ (image-width igd) 2))]
-        (above (objet->image (racine A))
-               (beside (horiz wg/2) 
-                       (line (- wg/2 wgd/2) 20 "black") 
-                       (line (- wgd/2 wd/2) 20 "black")
-                       (horiz wd/2))
-               (vert 5)
-               igd))))
-
-(arbre->image '(+ (* (+ (* x (- x y)) 2) (* (- a b) longueur)) (/ (* x 2) y)))
-
-
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/jpr/foo.ss b/pkgs/drracket-pkgs/drracket-test/tests/jpr/foo.ss
deleted file mode 100644
index ba773def0f..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/jpr/foo.ss
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang scheme
-(read-accept-reader #t) 
-
-(define (chercher-definition fonc f)    
-  (define (good-def? expr)
-    (and (pair? expr)
-         (equal? (car expr) 'define)
-         (or (equal? (cadr expr) fonc)                                ; (define fonc ...)
-             (and (pair? (cadr expr)) (equal? (caadr expr) fonc)))))  ; (define (fonc ...) ...)
-  (call-with-input-file f 
-    (lambda (p-in)
-      (car (filter good-def? (list-ref (read p-in) 3))))))   ; (module foo scheme (#%module-begin ...))
-
-(define (foo x y)   ; comment
-  (+ x y))
-
-(printf "The definition of the function foo in this file foo.ss is :\n")
-(chercher-definition 'foo "foo.ss")
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/jpr/info.rkt b/pkgs/drracket-pkgs/drracket-test/tests/jpr/info.rkt
deleted file mode 100644
index 9839cef5f1..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/jpr/info.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang info
-
-(define test-command-line-arguments
-  '(("dessine-arbre.ss" ())
-    ("foo.ss" ())
-    ("jeu-du-chaos.ss" ())
-    ("mon-script.ss" ())
-    ("streams.ss" ())
-    ("valrose.ss" ())))
-
-
-
-(define test-responsibles '((all mflatt)))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/jpr/jeu-du-chaos.ss b/pkgs/drracket-pkgs/drracket-test/tests/jpr/jeu-du-chaos.ss
deleted file mode 100644
index bc7010ebf3..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/jpr/jeu-du-chaos.ss
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang scheme
-(require graphics/graphics)
-
-(open-graphics)
-(define VIEW (open-viewport "Essai Graphics" 300 100))
-(define tr-segment (draw-line VIEW))  ; un traceur de segment
-(define tr-pixel (draw-pixel VIEW))   ; un traceur de pixel
-
-(define A (make-posn 150 10))
-(define B (make-posn 10 90))
-(define C (make-posn 290 90))
-
-(tr-segment A B "red")
-(tr-segment B C "red")
-(tr-segment C A "red")
-
-(define M-INIT (make-posn (random 300) (random 100)))
-
-(define (jeu-du-chaos)
-  (define (moyenne x y)
-    (/ (+ x y) 2))
-  (define (milieu A B)
-    (make-posn (moyenne (posn-x A) (posn-x B))
-               (moyenne (posn-y A) (posn-y B))))
-  (define (iter nb-fois M)   ; M est le dernier point courant affiche
-    (if (= nb-fois 0)
-      (void)
-      (let* ((S (case (random 3) ((0) A) ((1) B) ((2) C)))
-             (Msuiv (milieu M S)))
-        (tr-pixel Msuiv "blue")
-        (iter (- nb-fois 1) Msuiv))))
-  (tr-pixel M-INIT "blue")
-  (iter 4000 M-INIT))
-
-(jeu-du-chaos)
-
-;; For automatic testing, check that we can at least start,
-;; but exit soon after:
-(module+ test
-  (require racket/gui/base)
-  (void
-   (thread
-    (lambda ()
-      (sleep 1)
-      (queue-callback (lambda () (exit)) #f)))))
-
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/jpr/mon-script.ss b/pkgs/drracket-pkgs/drracket-test/tests/jpr/mon-script.ss
deleted file mode 100755
index b485c8beaf..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/jpr/mon-script.ss
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env  mzscheme
-#lang scheme
-;;; a Unix script but also a plain Scheme file...
-
-(define (get-scheme-files)      ; la A-liste ((fichier nb-defs) ...)
-  (map (lambda (f) (list f (nb-defs f)))
-       (filter (lambda (f)
-                 (and (file-exists? f) (regexp-match ".ss$" f)))
-               (map path->string (directory-list)))))
-
-(define (nb-defs f)              ; number of definitions in f
-  (define (is-def? x)            ; x is a definition ?
-    (and (pair? x) (equal? (car x) 'define)))
-  (call-with-input-file f
-    (lambda (p-in)
-      (let ((x (read p-in)))     ; is f a module ?
-        ;(printf "x=~s\n\n" x)
-        (if (and (pair? x) (equal? (car x) 'module))   ; yes
-            (length (filter is-def? (list-ref x 3)))   ; one only read is enough !
-            (do ((e (read p-in) (read p-in))           ; non
-                 (acc (if (is-def? x) 1 0) (if (is-def? e) (+ acc 1) acc)))
-            ((eof-object? e) acc)))))))
-
-(read-accept-reader #t)          ; for the #lang line
-(printf "Current directory is :\n   ~a\n" (current-directory))
-(define FILES (get-scheme-files))
-(printf "It contains ~a Scheme files. " (length FILES))
-(printf "Here they are, sorted by the number of definitions :\n")
-(printf "~s\n" (sort FILES (lambda (L1 L2) 
-                              (<= (second L1) (second L2)))))
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/jpr/monte-carlo.ss b/pkgs/drracket-pkgs/drracket-test/tests/jpr/monte-carlo.ss
deleted file mode 100644
index a8010ee705..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/jpr/monte-carlo.ss
+++ /dev/null
@@ -1,53 +0,0 @@
-;;; Simulation graphique a la Monte Carlo
-;;; ----> Some red points are outside the circle on the bottom right ???
-
-#lang scheme/gui
-
-(define RED-PEN (make-object pen% "red" 2 'solid))
-(define BLACK-PEN (make-object pen% "black" 2 'solid))
-(define BLUE-PEN (make-object pen% "blue" 2 'solid))
-(define YELLOW-BRUSH (make-object brush% "yellow" 'solid))
-
-(define FRAME 
-  (new frame% (label "Monte-Carlo") (stretchable-width #f) (stretchable-height #f)))
-
-(define VPANEL 
-  (new vertical-panel% (parent FRAME)))
-
-(define TEXT-FIELD 
-  (new text-field% (parent VPANEL) 
-       (label "Nombre de points N =") 
-       (init-value "5000")
-       (callback (lambda (t e)
-                   (when (eq? (send e get-event-type) 'text-field-enter)
-                     (send CANVAS refresh))))))
-
-(define MSG (new message% (parent VPANEL) (label "?") (min-width 50)))
-
-(define CANVAS 
-  (new canvas% (parent VPANEL) 
-       (min-width 300) (min-height 300) (style '(border))
-       (paint-callback 
-        (lambda (obj evt)   ; c est le canvas et e est l'evenement
-          (let ((dc (send obj get-dc)))
-            (send dc clear)
-            (send dc set-pen BLUE-PEN)          ; le bord du disque
-            (send dc set-brush YELLOW-BRUSH)    ; l'interieur du disque
-            (send dc draw-ellipse 0 0 299 299)
-            (let ((s 0) (N (string->number (send TEXT-FIELD get-value))))
-              (do ((i 0 (+ i 1)))
-                ((= i N) (send MSG set-label (number->string (* 4.0 (/ s N)))))
-                (let ((x (random 300)) (y (random 300)))
-                  (if (< (+ (sqr (- x 150)) (sqr (- y 150))) (sqr 150))
-                      (begin (send dc set-pen RED-PEN) (set! s (+ s 1)))
-                      (send dc set-pen BLACK-PEN))
-                  (send dc draw-point x y)))))))))
-
-(define BUTTON 
-  (new button% (parent VPANEL) (label "Go !")
-       (callback (lambda (obj evt)
-                   (send CANVAS on-paint)))))
-
-(send FRAME show #t)
-
-(module test racket/base)
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/jpr/streams.ss b/pkgs/drracket-pkgs/drracket-test/tests/jpr/streams.ss
deleted file mode 100644
index d9e46a72ca..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/jpr/streams.ss
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang scheme
-
-#|
-(define-syntax scons                                  ; SICP ==> ERROR (see Rationale of SRFI-41)
-  (syntax-rules ()
-    ((scons obj s) (cons obj (delay s)))))
-
-(define (scar s) (car s))
-(define (scdr s) (force (cdr s)))
-|#
-
-(define-syntax scons
-  (syntax-rules ()
-    ((scons obj s) (delay (cons obj (delay s))))))    ; from my book
-
-(define (scar s) (car (force s)))
-(define (scdr s) (force (cdr (force s))))
-
-; -------------------------------------------------------------------
-
-(define (element s k)          ; k-th element of s
-  (if (= k 1) 
-      (scar s)
-      (element (scdr s) (- k 1))))
-
-(define (smerge s1 s2)        ; s1 et s2 infinite ascending streams
-  (let ((x1 (scar s1)) (x2 (scar s2)))
-    (cond ((< x1 x2) (scons x1 (smerge (scdr s1) s2)))
-          ((> x1 x2) (scons x2 (smerge s1 (scdr s2))))
-          (else (scons x1 (smerge (scdr s1) (scdr s2)))))))
-
-(define (szoom x S)
-  (scons (* x (scar S)) (szoom x (scdr S))))
-
-(define H (scons 1 (smerge (szoom 2 H) (smerge (szoom 3 H) (szoom 5 H)))))   ; Hamming
-
-(time (element H 20000))
-
-;;; SRFI-41 bug
-
-(define (sfrom n step)
-  (scons n (sfrom (+ n step) step)))
-
-(define (smap f s)
-  (scons (f (scar s)) (smap f (scdr s))))
-
-(define (s->list n s)
-  (if (= n 0)
-      '()
-      (cons (scar s) (s->list (- n 1) (scdr s)))))
-
-(s->list 4 (smap / (sfrom 4 -1)))    ; error ou (1/4 1/3 1/2 1) ?
diff --git a/pkgs/drracket-pkgs/drracket-test/tests/jpr/valrose.ss b/pkgs/drracket-pkgs/drracket-test/tests/jpr/valrose.ss
deleted file mode 100644
index 76dfda623f..0000000000
--- a/pkgs/drracket-pkgs/drracket-test/tests/jpr/valrose.ss
+++ /dev/null
@@ -1,110 +0,0 @@
-;;; teachpack valrose.ss - jpr, Mars 2010
-
-#lang scheme
-
-(require 2htdp/image 2htdp/universe)                     ; images et animations, version 2
-
-(provide 
- (all-from-out 2htdp/image 2htdp/universe)
- show match                                             ; quelques utilitaires manquants
- arbre racine fg fd fdd feuille? operateur?             ; les arbres (2-3) d'expressions arithmetiques
- pile-vide pile-vide? empiler depiler sommet            ; les piles fonctionnelles
- atome? make-neg make-fbf2 connecteur arg1 arg2)        ; les FBF de la Logique d'ordre 0
-
-; petit utilitaire pour avoir les tests dans l'editeur avec echo au toplevel
-
-(define-syntax show
-  (syntax-rules ()
-    ((show e) (begin (printf "? ~s\n" 'e) (printf "--> ~s\n" e)))))
-
-; le type abstrait "arbre 2-3 d'expression algebrique". Toutes les operations sont O(1)
-
-(define (arbre r Ag . Lfils)    ; au moins un fils !
-  (cons r (cons Ag Lfils)))
-
-(define (racine A)
-  (if (feuille? A)
-      (error (format "pas de racine pour une feuille : ~a" A))
-      (first A)))
-
-(define (fg A)
-  (if (feuille? A)
-      (error (format "pas de fg pour une feuille : ~a" A))
-      (second A)))
-
-(define (fd A)
-  (if (feuille? A)
-      (error (format "pas de fd pour une feuille : ~a" A))
-      (third A)))
-
-(define (fdd A)
-  (if (or (feuille? A) (empty? (rest (rest (rest A)))))
-      (error (format "le fdd n'existe pas : ~a" A))
-      (fourth A)))
-
-(define (feuille? obj)
-  (or (number? obj) 
-      (boolean? obj)
-      (and (symbol? obj) (not (operateur? obj)))))
-
-(define (operateur? obj)
-  (if (member obj '(+ * - / < > <= >= =)) #t #f))
-
-; le type abstrait "pile fonctionnelle". Toutes les operations sont O(1)
-
-(define (pile-vide) 
-  empty)
-
-(define (pile-vide? pile) 
-  (empty? pile))
-
-(define (empiler x pile)
-  (cons x pile)) 
-
-(define (sommet pile)
-  (if (empty? pile)
-      (error "Pile vide !")
-      (first pile)))
-
-(define (depiler pile)
-  (if (empty? pile)
-      (error "Pile vide !")
-      (rest pile)))
-
-; le type abstrait "fbf en logique d'ordre 0"
-; un parametre F denote une fbf
-
-(define (atome? F)            ; le reconnaisseur d'atomes [symboles p, q, r...]
-  (symbol? F))
-
-(define (make-neg F)      ; le constructeur de molecule unaire (negation)
-  (cond ((atome? F) (list 'non F))
-        ((equal? (connecteur F) 'non) (arg1 F))   ; petite simplification au passage...
-        (else (list 'non F))))
-
-(define (make-fbf2 r Fg Fd)   ; le constructeur de molecule binaire (et, ou, =>)
-  (if (not (member r '(et ou =>)))
-      (error "Mauvais connecteur" r)
-      (list Fg r Fd)))          ; representation interne infixee
-
-(define (connecteur mol)      ; on suppose que mol est une molecule
-  (if (= (length mol) 2)
-      (first mol)             ; non
-      (second mol)))          ; et, ou, =>
-
-(define (arg1 mol)            ; mol est une molecule
-  (if (= (length mol) 2)
-      (second mol)
-      (first mol)))
-
-(define (arg2 mol)            ; mol est une molecule
-  (if (= (length mol) 2)
-      (error "Molecule unaire" mol)
-      (third mol)))
-
-;(printf "Module valrose : (show expr), (assoc x AL), (sleep n), (current-milliseconds), (gensym symb),
-(printf "Module valrose : 
-(show expr), (match expr clauses ...),
-(arbre r Ag Ad), (racine A), (fg A), (fd A), (fdd A), (feuille? A), (operateur? obj), 
-(pile-vide? P), (pile-vide), (empiler x P), (sommet P), (depiler P), 
-(atome? F), (make-neg F), (make-fbf2 r Fg Fd), (connecteur mol), (arg1 mol), (arg2 mol)\n")
diff --git a/pkgs/drracket-pkgs/drracket-tool-doc/info.rkt b/pkgs/drracket-pkgs/drracket-tool-doc/info.rkt
deleted file mode 100644
index 9b0b9e6934..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-doc/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base" "scribble-lib" "drracket-tool-lib"))
-(define build-deps '("racket-doc"))
-
-(define pkg-desc "Docs for the programmatic interface to some IDE tools that DrRacket supports")
-
-(define pkg-authors '(robby))
-
-(define version "1.0")
diff --git a/pkgs/drracket-pkgs/drracket-tool-doc/scribblings/drracket-tools/drracket-tools.scrbl b/pkgs/drracket-pkgs/drracket-tool-doc/scribblings/drracket-tools/drracket-tools.scrbl
deleted file mode 100644
index 61896e6663..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-doc/scribblings/drracket-tools/drracket-tools.scrbl
+++ /dev/null
@@ -1,357 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          (for-label drracket/check-syntax
-                     racket))
-@(define syncheck-example-eval (make-base-eval))
-@(begin 
-   (syncheck-example-eval
-    '(require drracket/check-syntax racket/class
-              setup/path-to-relative)))
-               
-
-@title{DrRacket Tools}
-@author{Robert Bruce Findler}
-
-This manual describes portions of DrRacket's functionality
-that are exposed via Racket APIs to be used with other editors.
-
-@table-of-contents[]
-
-@section{Accessing Check Syntax Programmatically}
-
-@defmodule[drracket/check-syntax]
-
-@defproc[(show-content [file-or-stx (or/c path-string?
-                                          (and/c syntax?
-                                                 (λ (x) (path-string? (syntax-source x)))))])
-         (listof vector?)]{
-
-This procedure composes the other pieces of this library together in a way that can be used
-for REPL-style experimentation with the results from Check Syntax, as shown in the example
-below. The list it returns has one vector for each call that would be made to the
-object in @racket[current-annotations]. Each vector's first element is a symbol naming
-a method in @racket[syncheck-annotations<%>] and the other elements of the vector are
-the arguments passed to the method.
-
-This doesn't work as well for use in a real tool, however, because it doesn't account for
-the callback procedures present in @method[syncheck-annotations<%> syncheck:add-arrow/name-dup]
-and @method[syncheck-annotations<%> syncheck:add-id-set] and the resulting vectors are probably less
-convenient to work with than direct method calls for most uses of this library. Nevertheless,
-it gives a quick feel for the results that can come back from Check Syntax.
-
-See @racket[annotations-mixin] for some example code to use the other parts of this library.
-
-Note that the paths in the example below have been replaced via @racket[make-paths-be-module-paths]
-in order to make the results be platform independent.
-
-  @interaction[#:eval
-               syncheck-example-eval
-               
-               (define (make-paths-be-module-paths x)
-                 (let loop ([x x])
-                   (cond
-                     [(pair? x) (cons (loop (car x)) (loop (cdr x)))]
-                     [(vector? x) (for/vector ([x (in-vector x)])
-                                    (loop x))]
-                     [(path? x) (path->relative-string/library x)]
-                     [else x])))
-               
-               (let ([example-module
-                      '(module m racket (λ (x) x))])
-                 (make-paths-be-module-paths
-                  (show-content 
-                   (read-syntax
-                    (build-path (current-directory) "dummy-file.rkt")
-                    (open-input-string (format "~s" example-module))))))]
-}
-
-@defproc[(make-traversal [namespace namespace?]
-                         [path (or/c #f path-string?)])
-         (values (->* (syntax?)
-                      ((-> any/c void?))
-                      void?)
-                 (-> void?))]{
-  This function creates some local state about a traversal of syntax objects
-  and returns two functions. The first one should be called with each of the
-  (fully expanded) syntax objects that make up a program (there will be only
-  one if the program is a module) and then the second one should be called to
-  indicate there are no more. 
-  
-  The optional argument to the first function is ignored.
-  It is left there for historical reasons. In the past it
-  was called for each sequence
-  of binding identifiers encountered in @racket[define-values], @racket[define-syntaxes],
-  and @racket[define-values-for-syntax].
-  
-  During the dynamic extent of the call to the two result functions, the value
-  of the @racket[current-annotations] parameter is consulted and various
-  methods are invoked in the corresponding object (if any), to indicate
-  what has been found in the syntax object. These methods will only be called
-  if the syntax objects have source locations.
-}
-
-@defparam[current-annotations ca (or/c #f (is-a?/c syncheck-annotations<%>))]{
-  The methods of the value of this parameter are invoked by the functions returned
-  from @racket[make-traversal]. 
-}
-
-@defparam[current-max-to-send-at-once m (or/c +inf.0 (and/c exact-integer? (>=/c 2)))]{
- No longer used.
-}
-
-@definterface[syncheck-annotations<%> ()]{
-
-  Classes implementing this interface are
-  accceptors of information about a traversal
-  of syntax objects. See @racket[make-traversal].
-  
-  Do not implement this interface directly, as it
-  is liable to change without warning. Instead, use
-  the @racket[annotations-mixin] and override
-  the methods you're interested in. The
-  @racket[annotations-mixin] will keep in sync
-  with this interface, providing methods that 
-  ignore their arguments. 
-
-  @defmethod[(syncheck:find-source-object [stx syntax?]) (or/c #f (not/c #f))]{
-    This should return @racket[#f] if the source of this syntax object is
-    uninteresting for annotations (if, for example, the only interesting
-    annotations are those in the original file and this is a syntax object
-    introduced by a macro and thus has a source location from some other file).
-    
-    Otherwise, it should return some (non-@racket[#f])
-    value that will then be passed to one of the other methods below as 
-    a @racket[_source-obj] argument.
-  }
-  
- @defmethod[(syncheck:add-background-color [source-obj (not/c #f)] 
-                                           [start exact-nonnegative-integer?]
-                                           [end exact-nonnegative-integer?]
-                                           [color string?])
-            void?]{
-   Called to indicate that the color @racket[color] should be drawn on the background of 
-   the given range in the editor, when the mouse moves over it. This method is typically
-   called in conjuction with some other method that provides some other annotation
-   on the source.
- }
- @defmethod[(syncheck:add-require-open-menu [source-obj (not/c #f)]
-                                            [start exact-nonnegative-integer?]
-                                            [end exact-nonnegative-integer?]
-                                            [file path-string?])
-            void?]{
-   Called to indicate that there is a @racket[require] at the location from 
-                                      @racket[start] to @racket[end],
-   and that it corresponds to @racket[file]. Check Syntax adds a popup menu.
- }
-
- @defmethod[(syncheck:add-docs-menu [source-obj (not/c #f)]
-                                    [start exact-nonnegative-integer?]
-                                    [end exact-nonnegative-integer?]
-                                    [id symbol?]
-                                    [label any/c]
-                                    [path any/c]
-                                    [tag any/c])
-            void?]{
-   Called to indicate that there is something that has documentation between the range
-   @racket[start] and @racket[end]. The documented identifier's name is given by @racket[id]
-   and the docs are found in the html file @racket[path] at the html tag @racket[tag].
-   The @racket[label] argument describes the binding for use in the menu item (although it may
-   be longer than 200 characters).
- }
-                  
- @defmethod[(syncheck:add-id-set [all-ids (listof (list/c (not/c #f) 
-                                                          exact-nonnegative-integer?
-                                                          exact-nonnegative-integer?))]
-                                 [new-name-interferes? (-> symbol boolean?)])
-            void?]{This method is no longer called by Check Syntax. It is here
-                   for backwards compatibility only. The information it provided
-                   must now be synthesized from the information supplied to
-                   @method[syncheck-annotations<%> syncheck:add-arrow/name-dup].}
-           
- @defmethod[(syncheck:add-arrow [start-source-obj (not/c #f)]
-                                [start-left exact-nonnegative-integer?]
-                                [start-right exact-nonnegative-integer?]
-                                [end-source-obj (not/c #f)]
-                                [end-left exact-nonnegative-integer?]
-                                [end-right exact-nonnegative-integer?]
-                                [actual? boolean?]
-                                [phase-level (or/c exact-nonnegative-integer? #f)])
-            void?]{
-    This function is not called directly anymore by Check Syntax. Instead
-    @method[syncheck-annotations<%> syncheck:add-arrow/name-dup] is.
-    
-    This method is invoked by the default implementation of 
-    @racket[_syncheck:add-arrow/name-dup] in 
-    @racket[annotations-mixin].
- }
- @defmethod[(syncheck:add-arrow/name-dup [start-source-obj (not/c #f)]
-                                         [start-left exact-nonnegative-integer?]
-                                         [start-right exact-nonnegative-integer?]
-                                         [end-source-obj (not/c #f)]
-                                         [end-left exact-nonnegative-integer?]
-                                         [end-right exact-nonnegative-integer?]
-                                         [actual? boolean?]
-                                         [phase-level (or/c exact-nonnegative-integer? #f)]
-                                         [require-arrow? boolean?]
-                                         [name-dup? (-> string? boolean?)])
-            void?]{
-   Called to indicate that there should be an arrow between the locations described by the first 
-   six arguments.
-   
-   The @racket[phase-level] argument indicates the phase of the binding and the 
-   @racket[actual?] argument indicates if the binding is a real one, or a predicted one from
-   a syntax template (predicted bindings are drawn with question marks in Check Syntax). 
-   
-   The @racket[require-arrow?] argument indicates if this arrow points from
-   an imported identifier to its corresponding @racket[require].
-   
-   The @racket[name-dup?] predicate returns @racket[#t]
-   in case that this variable (either the start or end), when replaced with the given string, would
-   shadow some other binding (or otherwise interfere with the binding structure of the program at
-   the time the program was expanded).
- }
- @defmethod[(syncheck:add-tail-arrow [from-source-obj (not/c #f)]
-                                     [from-pos exact-nonnegative-integer?]
-                                     [to-source-obj (not/c #f)]
-                                     [to-pos exact-nonnegative-integer?])
-            void?]{
-   Called to indicate that there are two expressions, beginning at 
-   @racket[from-pos] and @racket[to-pos]
-   that are in tail position with respect to each other.
- }
- @defmethod[(syncheck:add-mouse-over-status [source-obj (not/c #f)]
-                                            [pos-left exact-nonnegative-integer?]
-                                            [pos-right exact-nonnegative-integer?]
-                                            [str string?])
-            void?]{
-   Called to indicate that the message in @racket[str] should be shown when the mouse 
-                                          passes over the given position.
- }
- @defmethod[(syncheck:add-jump-to-definition [source-obj (not/c #f)] 
-                                             [start exact-nonnegative-integer?]
-                                             [end exact-nonnegative-integer?]
-                                             [id any/c]
-                                             [filename path-string?]
-                                             [submods (listof symbol?)])
-            void?]{
-   Called to indicate that there is some identifier at the given location (named @racket[id]) that
-   is defined in the @racket[submods] of the file @racket[filename] (where an empty list in
-   @racket[submods] means that the identifier is defined at the top-level module).
- }
-                  
- @defmethod[(syncheck:add-definition-target [source-obj (not/c #f)]
-                                            [start exact-nonnegative-integer?]
-                                            [finish exact-nonnegative-integer?]
-                                            [style-name any/c]) void?]{
-     
-  }
-                                                      
- @defmethod[(syncheck:color-range [source-obj (not/c #f)]
-                                  [start exact-nonnegative-integer?]
-                                  [finish exact-nonnegative-integer?]
-                                  [style-name any/c]
-                                  [mode any/c])
-            void?]{
-   Called to indicate that the given location should be colored according to the
-   style @racket[style-name] when in @racket[mode]. The mode either indicates regular
-   check syntax or is used indicate blame for potential contract violations 
-   (and still experimental).
- }
- @defmethod[(syncheck:add-rename-menu [id symbol?]
-                                      [all-ids (listof (list/c (not/c #f) 
-                                                               exact-nonnegative-integer?
-                                                               exact-nonnegative-integer?))]
-                                      [new-name-interferes? (-> symbol boolean?)])
-            void?]{
-    This method is listed only for backwards compatibility. It is not called
-    by Check Syntax anymore.
-  }
-}
-
-@defmixin[annotations-mixin () (syncheck-annotations<%>)]{
-  Supplies all of the methods in @racket[syncheck-annotations<%>]
-  with default behavior. Be sure to use this mixin to future-proof
-  your code and then override the methods you're interested in.
-  
-  By default:
-  @itemlist[@item{The @method[syncheck-annotations<%> syncheck:find-source-object] 
-                      method ignores its arguments and returns @racket[#f];}
-            @item{the @method[syncheck-annotations<%> syncheck:add-arrow/name-dup] method drops the
-                      @racket[_require-arrow?] and @racket[_name-dup?] arguments and calls
-                      @method[syncheck-annotations<%> syncheck:add-arrow]; and}
-            @item{all of the other methods ignore their arguments and return @racket[(void)].}]
-    
-  Here is an example showing how use this library to extract all
-  of the arrows that Check Syntax would draw from various
-  expressions. One subtle point: arrows are only included when
-  the corresponding identifiers are @racket[syntax-original?];
-  the code below manages this by copying the properties from
-  an identifier that is @racket[syntax-original?] in the
-  call to @racket[datum->syntax].
-  @interaction[#:eval
-               syncheck-example-eval
-               (define arrows-collector%
-                 (class (annotations-mixin object%)
-                   (super-new)
-                   (define/override (syncheck:find-source-object stx)
-                     stx)
-                   (define/override (syncheck:add-arrow/name-dup
-                                     start-source-obj start-left start-right
-                                     end-source-obj end-left end-right
-                                     actual? phase-level require-arrow? name-dup?)
-                     (set! arrows
-                           (cons (list start-source-obj end-source-obj)
-                                 arrows)))
-                   (define arrows '())
-                   (define/public (get-collected-arrows) arrows)))
-               (define (arrows form)
-                 (define base-namespace (make-base-namespace))
-                 (define-values (add-syntax done)
-                   (make-traversal base-namespace #f))
-                 (define collector (new arrows-collector%))
-                 (parameterize ([current-annotations collector]
-                                [current-namespace base-namespace])
-                   (add-syntax (expand form))
-                   (done))
-                 (send collector get-collected-arrows))
-               (define (make-id name pos orig?)
-                 (datum->syntax
-                  #f
-                  name
-                  (list #f #f #f pos (string-length (symbol->string name)))
-                  (and orig? #'is-orig)))
-               (arrows `(λ (,(make-id 'x 1 #t)) ,(make-id 'x 2 #t)))
-               (arrows `(λ (x) x))
-               (arrows `(λ (,(make-id 'x 1 #f)) ,(make-id 'x 2 #t)))
-               (arrows `(λ (,(make-id 'x 1 #t)) x))]
-}
-
-@(define-syntax-rule 
-   (syncheck-method-id x ...)
-   (begin @defidform[x]{Bound to an identifier created with
-                        @racket[define-local-member-name]
-                        that is used in @racket[syncheck-annotations<%>].}
-          ...))
-@syncheck-method-id[syncheck:find-source-object
-                    syncheck:add-background-color
-                    syncheck:add-require-open-menu
-                    syncheck:add-docs-menu
-                    syncheck:add-rename-menu
-                    syncheck:add-arrow
-                    syncheck:add-arrow/name-dup
-                    syncheck:add-tail-arrow
-                    syncheck:add-mouse-over-status
-                    syncheck:add-jump-to-definition
-                    syncheck:add-id-set 
-                    syncheck:color-range]
-
-@section{Module Browser}
-
-@defmodule[drracket/module-browser]
-
-@defproc[(module-browser [path path-string?]) void?]{
-  Opens a window containing the module browser for @racket[path].
-}
-
-
-@(close-eval syncheck-example-eval)
diff --git a/pkgs/drracket-pkgs/drracket-tool-doc/scribblings/drracket-tools/info.rkt b/pkgs/drracket-pkgs/drracket-tool-doc/scribblings/drracket-tools/info.rkt
deleted file mode 100644
index 1c26f80a64..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-doc/scribblings/drracket-tools/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("drracket-tools.scrbl" (multi-page) (tool -200))))
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/check-syntax.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/check-syntax.rkt
deleted file mode 100644
index 009f3aa8b3..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/check-syntax.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/class
-         syntax/modread
-         "private/syncheck/traversals.rkt"
-         "private/syncheck/syncheck-intf.rkt"
-         "private/syncheck/syncheck-local-member-names.rkt")
-
-(provide
- (contract-out
-  [show-content (-> (or/c path-string?
-                          (and/c syntax?
-                                 has-path-string-source?))
-                    (listof vector?))]
-  [make-traversal 
-   (-> namespace?
-       (or/c path-string? #f)
-       (values (->* (syntax?) ((-> any/c void?)) void?)
-               (-> void?)))]
-  
-  [current-max-to-send-at-once
-   (parameter/c (or/c +inf.0 (and/c exact-integer? (>=/c 2))))]
-  [syncheck-annotations<%>
-   interface?]
-  [current-annotations 
-   (parameter/c (or/c #f (is-a?/c syncheck-annotations<%>)))]
-  [annotations-mixin 
-   (and/c mixin-contract
-          (-> any/c (implementation?/c syncheck-annotations<%>)))]))
-
-(define (has-path-string-source? stx)
-  (path-string? (syntax-source stx)))
-
-;; methods in syncheck-annotations<%>
-(provide 
- syncheck:find-source-object
- syncheck:add-background-color
- syncheck:add-require-open-menu
- syncheck:add-docs-menu
- syncheck:add-id-set
- syncheck:add-rename-menu
- syncheck:add-arrow
- syncheck:add-arrow/name-dup
- syncheck:add-tail-arrow
- syncheck:add-mouse-over-status
- syncheck:add-jump-to-definition
- syncheck:color-range)
-
-(define (show-content file-or-stx)
-  (define ns (make-base-namespace))
-  (define src
-    (cond
-      [(path-string? file-or-stx)
-       file-or-stx]
-      [(syntax? file-or-stx)
-       (syntax-source file-or-stx)]))
-  (define o (new build-trace% [src src]))
-  
-  (parameterize ([current-annotations o])
-    (define-values (expanded-expression expansion-completed) 
-      (make-traversal ns src))
-    (cond
-      [(path-string? file-or-stx)
-       (parameterize ([current-namespace ns])
-         (expanded-expression
-          (expand
-           (call-with-input-file file-or-stx
-             (λ (port)
-               (with-module-reading-parameterization
-                (λ ()
-                  (read-syntax file-or-stx port))))))))]
-      [else 
-       (parameterize ([current-namespace ns])
-         (expanded-expression
-          (expand
-           file-or-stx)))])
-    (expansion-completed))
-  
-  (send o get-trace))
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/info.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/info.rkt
deleted file mode 100644
index f6a7850460..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/info.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang info
-
-(define raco-commands
-  (list (list "dependencies-graph"
-              'drracket/private/raco-module-browser
-              "opens a GUI window showing transitive module dependencies (aka `Module Browser')"
-              #f)))
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/module-browser.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/module-browser.rkt
deleted file mode 100644
index b8a90f6fc3..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/module-browser.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require "private/standalone-module-browser.rkt")
-(provide module-browser)
-(define (module-browser file)
-  (standalone-module-overview/file file))
\ No newline at end of file
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/raco-module-browser.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/raco-module-browser.rkt
deleted file mode 100644
index 7a6ca14efe..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/raco-module-browser.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require racket/cmdline racket/runtime-path)
-
-(define file (command-line #:args (file) file))
-
-(define-runtime-path module-browser.rkt "standalone-module-browser.rkt")
-(define standalone-module-overview/file 
-  (dynamic-require module-browser.rkt 'standalone-module-overview/file))
-
-(standalone-module-overview/file file)
-
-;; so 'raco test' doesn't try to run the module browser
-(module test racket/base)
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/rectangle-intersect.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/rectangle-intersect.rkt
deleted file mode 100644
index 5d9327f29a..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/rectangle-intersect.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang racket/base
-(provide rectangles-intersect?)
-
-(define (rectangles-intersect? l1 t1 r1 b1 l2 t2 r2 b2)
-  (or (rectangles-intersect-one-way? l1 t1 r1 b1 l2 t2 r2 b2)
-      (rectangles-intersect-one-way? l2 t2 r2 b2 l1 t1 r1 b1)))
-
-(define (rectangles-intersect-one-way? l1 t1 r1 b1 l2 t2 r2 b2)
-  (or (horizontal-segment-in-rectangle? l1 r1 t1 
-                                        l2 t2 r2 b2)
-      (horizontal-segment-in-rectangle? l1 r1 b1 
-                                        l2 t2 r2 b2)
-      (vertical-segment-in-rectangle?   l1 t1 b1
-                                        l2 t2 r2 b2)
-      (vertical-segment-in-rectangle?   r1 t1 b1
-                                        l2 t2 r2 b2)))
-
-(define (vertical-segment-in-rectangle? x y1 y2 l t r b)
-  (and (<= l x r)
-       (or (<= t y1 b)
-           (<= t y2 b)
-           (and (<= y1 t)
-                (<= b y2)))))
-
-(define (horizontal-segment-in-rectangle? x1 x2 y l t r b)
-  (and (<= t y b)
-       (or (<= l x1 r)
-           (<= l x2 r)
-           (and (<= x1 l)
-                (<= r x2)))))
-
-(module+ test
-  (require rackunit)
-  (check-equal? (rectangles-intersect? 0 0 10 10
-                                       2 2 8 8)
-                #t)
-  (check-equal? (rectangles-intersect? 2 2 8 8
-                                       0 0 10 10)
-                #t)
-  (check-equal? (rectangles-intersect? 0 0 10 10
-                                       0 0 10 10)
-                #t)
-  (check-equal? (rectangles-intersect? 10 10 20 20
-                                       0 15 30 17)
-                #t)
-  (check-equal? (rectangles-intersect? 0 15 30 17
-                                       10 10 20 20)
-                #t)
-  (check-equal? (rectangles-intersect? 0 0 10 10
-                                       20 20 40 40)
-                #f)
-  (check-equal? (rectangles-intersect? 0 0 10 10
-                                       25 0 27 10)
-                #f))
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/standalone-module-browser.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/standalone-module-browser.rkt
deleted file mode 100644
index 49965ebc0c..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/standalone-module-browser.rkt
+++ /dev/null
@@ -1,1200 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base
-         racket/class
-         racket/set
-         racket/contract
-         racket/list
-         syntax/moddep
-         syntax/toplevel
-         framework/preferences
-         string-constants
-         mrlib/graph
-         racket/unit
-         racket/async-channel
-         racket/match
-         setup/private/lib-roots
-         racket/port
-         drracket/private/rectangle-intersect)
-
-(define oprintf
-  (let ([op (current-output-port)])
-    (λ args
-      (apply fprintf op args))))
-
-(provide standalone-module-overview/file
-         module-overview/file
-         make-module-overview-pasteboard)
-
-(preferences:set-default 'drracket:module-overview:label-font-size 12 number?)
-(preferences:set-default 'drracket:module-overview:window-height 500 number?)
-(preferences:set-default 'drracket:module-overview:window-width 500 number?)
-(preferences:set-default 'drracket:module-browser:hide-paths '(lib)
-                         (λ (x)
-                           (and (list? x)
-                                (andmap symbol? x))))
-(preferences:set-default 'drracket:module-browser:name-length 1 
-                         (λ (x) (memq x '(0 1 2 3))))
-
-(define-struct req (r-mpi key))
-;; type req = (make-req [result from resolve-module-path-index] -- except only when it has a path
-;;                      (or/c symbol? #f))
-
-
-(provide process-program-unit
-         process-program-import^
-         process-program-export^
-         (struct-out req))
-
-(define adding-file (string-constant module-browser-adding-file))
-(define unknown-module-name "? unknown module name")
-
-;; probably, at some point, the module browser should get its
-;; own output ports or something instead of wrapping these ones
-(define original-output-port (current-output-port))
-(define original-error-port (current-error-port))
-
-(define filename-constant (string-constant module-browser-filename-format))
-(define font-size-gauge-label (string-constant module-browser-font-size-gauge-label))
-(define progress-label (string-constant module-browser-progress-label))
-(define laying-out-graph-label (string-constant module-browser-laying-out-graph-label))
-(define open-file-format (string-constant module-browser-open-file-format))
-(define lib-paths-checkbox-constant (string-constant module-browser-show-lib-paths))
-
-(define (set-box/f b v) (when (box? b) (set-box! b v)))
-
-(define (find-label-font size)
-  (send the-font-list find-or-create-font size 'decorative 'normal 'normal #f))
-
-(define module-overview-pasteboard<%>
-  (interface ()
-    set-label-font-size
-    get-label-font-size
-    get-hidden-paths
-    show-visible-paths
-    remove-visible-paths
-    set-name-length
-    get-name-length))
-
-(define boxed-word-snip<%>
-  (interface ()
-    get-filename
-    get-word
-    get-lines
-    is-special-key-child?
-    add-special-key-child
-    set-found!))
-
-(define/contract (render-phases s)
-  (-> (set/c (or/c exact-integer? #f)) string?)
-  (define for-doc (set-member? s #f))
-  (define lst (sort (filter number? (set->list s)) <))
-  (define joined-lst
-    (cond
-      [(null? lst) '()]
-      [else
-       (let loop ([lst (cdr lst)]
-                  [pending-low (car lst)]
-                  [pending-high (car lst)])
-         (cond
-           [(null? lst) (list (cons pending-low pending-high))]
-           [else
-            (define fst (car lst))
-            (cond
-              [(equal? (- fst 1) pending-high)
-               (loop (cdr lst)
-                     pending-low
-                     fst)]
-              [else
-               (cons (cons pending-low pending-high)
-                     (loop (cdr lst) fst fst))])]))]))
-  (cond
-    [(and (null? joined-lst) (not for-doc))
-     ""]
-    [(and (null? joined-lst) for-doc)
-     " (phase: for-label)"]
-    [else
-     (define plural? (not (= 1 (set-count s))))
-     (define strings 
-       (append (for/list ([joined (in-list joined-lst)])
-                 (cond
-                   [(= (car joined) (cdr joined))
-                    (format "~a" (car joined))]
-                   [else
-                    (format "~a–~a" (car joined) (cdr joined))]))
-               (if for-doc
-                   '("for-label")
-                   '())))
-     (apply string-append
-            (if plural? " (phases: " " (phase: ")
-            (append (add-between strings ", ")
-                    '(")")))]))
-
-(module+ test
-  (require rackunit)
-  (check-equal? (render-phases (set)) "")
-  (check-equal? (render-phases (set #f)) " (phase: for-label)")
-  (check-equal? (render-phases (set 1)) " (phase: 1)")
-  (check-equal? (render-phases (set -1 1)) " (phases: -1, 1)")
-  (check-equal? (render-phases (set -3 -2 -1 0 1 2 3)) " (phases: -3–3)")
-  (check-equal? (render-phases (set -3 -2 -1)) " (phases: -3–-1)")
-  (check-equal? (render-phases (set 1 3)) " (phases: 1, 3)")
-  (check-equal? (render-phases (set 1 2 3)) " (phases: 1–3)")
-  (check-equal? (render-phases (set 1 2 3 7 8 9)) " (phases: 1–3, 7–9)")
-  (check-equal? (render-phases (set #f 1 2 3 7 8 9)) " (phases: 1–3, 7–9, for-label)")
-  (check-equal? (render-phases (set 1 3 5 7 9)) " (phases: 1, 3, 5, 7, 9)")
-  (check-equal? (render-phases (set #f 1 3 5 7 9)) " (phases: 1, 3, 5, 7, 9, for-label)"))
-
-;                                                                                    
-;                                                                                    
-;                                                                                    
-;                                                                                    
-;                                                                                    
-;                                                                                    
-;   ; ;;    ; ;   ;;;     ;;;    ;;;    ;;;    ;;;       ; ;;    ; ;   ;;;     ;; ;  
-;   ;;  ;   ;;   ;   ;   ;   ;  ;   ;  ;      ;          ;;  ;   ;;   ;   ;   ;  ;;  
-;   ;    ;  ;   ;     ; ;      ;    ;  ;;     ;;         ;    ;  ;   ;     ; ;    ;  
-;   ;    ;  ;   ;     ; ;      ;;;;;;   ;;     ;;        ;    ;  ;   ;     ; ;    ;  
-;   ;    ;  ;   ;     ; ;      ;          ;      ;       ;    ;  ;   ;     ; ;    ;  
-;   ;;  ;   ;    ;   ;   ;   ;  ;         ;      ;       ;;  ;   ;    ;   ;   ;  ;;  
-;   ; ;;    ;     ;;;     ;;;    ;;;;  ;;;    ;;;        ; ;;    ;     ;;;     ;; ;  
-;   ;                                                    ;                        ;  
-;   ;                                                    ;                   ;    ;  
-;   ;                                                    ;                    ;;;;   
-
-
-(define-signature process-program-import^
-  (progress-channel connection-channel))
-
-(define-signature process-program-export^
-  (add-connections))
-
-(define-unit process-program-unit
-  (import process-program-import^)
-  (export process-program-export^)
-  
-  (define visited-hash-table (make-hash))
-  
-  ;; add-connections : (union syntax string[filename]) -> (union #f string)
-  ;; recursively adds a connections from this file and
-  ;; all files it requires
-  ;; returns a string error message if there was an error compiling
-  ;; the program
-  (define (add-connections filename/stx)
-    (cond
-      [(path-string? filename/stx)
-       (add-submod/filename-connections filename/stx)]
-      [(syntax? filename/stx)
-       (add-syntax-connections filename/stx)]))
-  
-  ;; add-syntax-connections : syntax -> void
-  (define (add-syntax-connections stx)
-    (define module-codes (map compile (expand-syntax-top-level-with-compile-time-evals/flatten stx)))
-    (for ([module-code (in-list module-codes)])
-      (when (compiled-module-expression? module-code)
-        (define name (extract-module-name stx))
-        (define base 
-          (build-module-filename
-           (if (regexp-match #rx"^," name)
-               (substring name 1 (string-length name))
-               (build-path (or (current-load-relative-directory) 
-                               (current-directory))
-                           name))
-           #f))
-        (add-module-code-connections base module-code))))
-  
-  (define (build-module-filename pth remove-extension?)
-    (define (try ext)
-      (define tst (bytes->path (bytes-append 
-                                (if remove-extension?
-                                    (regexp-replace #rx"[.][^.]*$" (path->bytes pth) #"")
-                                    (path->bytes pth))
-                                ext)))
-      (and (file-exists? tst)
-           tst))
-    (or (try #".rkt")
-        (try #".ss")
-        (try #".scm")
-        (try #"")
-        pth))
-  
-  ;; add-submod/filename-connections : string -> void
-  (define (add-submod/filename-connections fn/submod)
-    (match fn/submod
-      [(? path?) (add-module-code-connections fn/submod (get-module-code fn/submod))]
-      [`(submod ,filename ,sub-mods ...)
-       (add-module-code-connections 
-        fn/submod
-        (get-module-code filename #:submodule-path sub-mods))]))
-  
-  (define (add-module-code-connections module-name module-code)
-    (unless (hash-ref visited-hash-table module-name (λ () #f))
-      (async-channel-put progress-channel (format adding-file module-name))
-      (hash-set! visited-hash-table module-name #t)
-      (define import-assoc (module-compiled-imports module-code))
-      (for ([line (in-list import-assoc)])
-        (define level (car line))
-        (define mpis (cdr line))
-        (define requires (extract-filenames mpis module-name))
-        (for ([require (in-list requires)])
-          (add-connection module-name
-                          (req-r-mpi require)
-                          (req-key require)
-                          level)
-          (add-submod/filename-connections (req-r-mpi require))))))
-  
-  ;; add-connection : string string (union symbol #f) number -> void
-  ;; name-original and name-require and the identifiers for those paths and
-  ;; original-filename? and require-filename? are booleans indicating if the names
-  ;; are filenames.
-  (define (add-connection name-original name-require req-sym require-depth)
-    (async-channel-put connection-channel
-                       (list name-original name-require req-sym require-depth)))
-  
-  (define (extract-module-name stx)
-    (syntax-case stx ()
-      [(module m-name rest ...)
-       (and (eq? (syntax-e (syntax module)) 'module)
-            (identifier? (syntax m-name)))
-       (format "~a" (syntax->datum (syntax m-name)))]
-      [else unknown-module-name]))
-
-  ;; maps a path to the path of its "library" (see setup/private/lib-roots)
-  (define get-lib-root
-    (let ([t (make-hash)]) ; maps paths to their library roots
-      (lambda (path)
-        (hash-ref! t path (lambda () (path->library-root path))))))
-
-  ;; extract-filenames :
-  ;;   (listof (union symbol module-path-index)) 
-  ;;   result-of-resolve-module-path-index/but-with-simplified-paths
-  ;;   -> (listof req)
-  (define (extract-filenames direct-requires base/submod)
-    (define base
-      (match base/submod
-        [`(submod ,p ,_ ...) p]
-        [else base/submod]))
-    (define base-lib (get-lib-root base))
-    (for*/list ([dr (in-list direct-requires)]
-                [r-mpi (in-value (and (module-path-index? dr)
-                                      (resolve-module-path-index dr base)))]
-                #:when (to-path r-mpi))
-      (define path (build-module-filename (to-path r-mpi) #t))
-      (make-req (match r-mpi
-                  [(? path?) (simplify-path r-mpi)]
-                  [`(submod ,p ,submods) `(submod ,(simplify-path p) ,submods)])
-                (get-key dr base-lib path))))
-  
-  (define (to-path r-mpi)
-    (match r-mpi
-      [(? path? p) p]
-      [`(submod ,(? path? p) ,_ ...) p]
-      [_ #f]))
-
-  (define (get-key dr requiring-libroot required)
-    (and (module-path-index? dr)
-         ;; files in the same library => return #f as if the require
-         ;; is a relative one, so any kind of require from the same
-         ;; library is always displayed (regardless of hiding planet
-         ;; or lib links)
-         (not (equal? requiring-libroot (get-lib-root required)))
-         (let-values ([(a b) (module-path-index-split dr)])
-           (cond [(symbol? a) 'lib]
-                 [(pair? a) (and (symbol? (car a)) (car a))]
-                 [else #f])))))
-
-(define (standalone-module-overview/file filename)
-  (module-overview/file filename #f standalone-fill-pasteboard
-                        frame% editor-canvas% pasteboard%))
-  
-(define (module-overview/file filename parent fill-pasteboard 
-                              overview-frame% overview-editor-canvas% overview-pasteboard%
-                              #:on-boxed-word-double-click [on-boxed-word-double-click void])
-  (define progress-eventspace (make-eventspace))
-  (define progress-frame (parameterize ([current-eventspace progress-eventspace])
-                           (instantiate frame% ()
-                             (parent parent)
-                             (label progress-label)
-                             (width 600))))
-  (define progress-message (instantiate message% ()
-                             (label "")
-                             (stretchable-width #t)
-                             (parent progress-frame)))
-  
-  (define thd 
-    (thread
-     (λ ()
-       (sleep 2)
-       (parameterize ([current-eventspace progress-eventspace])
-         (queue-callback
-          (λ ()
-            (send progress-frame show #t)))))))
-  
-  
-  (define update-label void)
-  
-  (define (show-status str)
-    (parameterize ([current-eventspace progress-eventspace])
-      (queue-callback
-       (λ ()
-         (send progress-message set-label str)))))
-  
-  (define pasteboard (make-module-overview-pasteboard 
-                      #f
-                      (λ (x) (update-label x))
-                      overview-pasteboard%))
-  
-  (let ([success? (fill-pasteboard pasteboard filename show-status void)])
-    (kill-thread thd)
-    (parameterize ([current-eventspace progress-eventspace])
-      (queue-callback
-       (λ ()
-         (send progress-frame show #f))))
-    (when success?
-      (let ()
-        (define frame (new overview-frame%
-                           [label (string-constant module-browser)]
-                           [width (preferences:get 'drracket:module-overview:window-width)]
-                           [height (preferences:get 'drracket:module-overview:window-height)]
-                           [alignment '(left center)]))
-        (define vp (new vertical-panel%
-                        [parent (if (method-in-interface? 'get-area-container
-                                                          (object-interface frame))
-                                    (send frame get-area-container)
-                                    frame)]
-                        [alignment '(left center)]))
-        (define root-message (instantiate message% ()
-                               (label 
-                                (format (string-constant module-browser-root-filename)
-                                        filename))
-                               (parent vp)
-                               (stretchable-width #t)))
-        (define label-message (instantiate message% ()
-                                (label "")
-                                (parent vp)
-                                (stretchable-width #t)))
-        (define font/label-panel (new horizontal-panel%
-                                      [parent vp]
-                                      [stretchable-height #f]))
-        (define font-size-gauge
-          (instantiate slider% ()
-            (label font-size-gauge-label)
-            (min-value 1)
-            (max-value 72)
-            (init-value (preferences:get 'drracket:module-overview:label-font-size))
-            (parent font/label-panel)
-            (callback
-             (λ (x y)
-               (send pasteboard set-label-font-size (send font-size-gauge get-value))))))
-        (define module-browser-name-length-choice
-          (new choice%
-               (parent font/label-panel)
-               (label (string-constant module-browser-name-length))
-               (choices (list (string-constant module-browser-name-long)
-                              (string-constant module-browser-name-very-long)))
-               (selection (case (preferences:get 'drracket:module-browser:name-length)
-                            [(0) 0]
-                            [(1) 0]
-                            [(2) 0]
-                            [(3) 1]))
-               (callback
-                (λ (x y)
-                  ;; note: the preference drracket:module-browser:name-length is also used for 
-                  ;; the View|Show Module Browser version of the module browser
-                  ;; here we just treat any pref value except '3' as if it were for the long names.
-                  (let ([selection (send module-browser-name-length-choice get-selection)])
-                    (preferences:set 'drracket:module-browser:name-length (+ 2 selection))
-                    (send pasteboard set-name-length 
-                          (case selection
-                            [(0) 'long]
-                            [(1) 'very-long])))))))
-        
-        (define lib-paths-checkbox
-          (instantiate check-box% ()
-            (label lib-paths-checkbox-constant)
-            (parent vp)
-            (callback
-             (λ (x y)
-               (if (send lib-paths-checkbox get-value)
-                   (send pasteboard show-visible-paths 'lib)
-                   (send pasteboard remove-visible-paths 'lib))))))
-        
-        (define ec (make-object overview-editor-canvas% vp pasteboard))
-        
-        (define search-hp (new horizontal-panel% [parent vp] [stretchable-height #f]))
-        (define search-tf
-          (new text-field%
-               [label (string-constant module-browser-highlight)]
-               [parent search-hp]
-               [callback
-                (λ (tf evt)
-                  (define val (send tf get-value))
-                  (define reg (and (not (string=? val ""))
-                                   (regexp (regexp-quote (send tf get-value)))))
-                  (update-found-and-search-hits reg))]))
-        (define search-hits (new message% [parent search-hp] [label ""] [auto-resize #t]))
-        (define (update-found-and-search-hits reg)
-          (send pasteboard begin-edit-sequence)
-          (define count 0)
-          (define phases (set))
-          (let loop ([snip (send pasteboard find-first-snip)])
-            (when snip
-              (when (is-a? snip boxed-word-snip<%>)
-                (define fn (send snip get-filename))
-                (define found? 
-                  (and reg fn (regexp-match reg (path->string fn))))
-                (when (or (not reg) found?) 
-                  (for ([phase (in-list (send snip get-require-phases))])
-                    (set! phases (set-add phases phase)))
-                  (set! count (+ count 1)))
-                (send snip set-found! found?))
-              (loop (send snip next))))
-          
-          (send search-hits set-label 
-                (string-append
-                 (if reg
-                     (format "~a found" count)
-                     (format "~a total" count))
-                 (render-phases phases)))
-          (send pasteboard end-edit-sequence))
-        (update-found-and-search-hits #f) ;; only to initialize search-hits
-        
-        (send lib-paths-checkbox set-value
-              (not (memq 'lib (preferences:get 'drracket:module-browser:hide-paths))))
-        (set! update-label
-              (λ (s)
-                (if (and s (not (null? s)))
-                    (let* ([currently-over (car s)]
-                           [fn (send currently-over get-filename)]
-                           [lines (send currently-over get-lines)])
-                      (when (and fn lines)
-                        (send label-message set-label
-                              (format filename-constant fn lines))))
-                    (send label-message set-label ""))))
-        
-        (send pasteboard set-name-length 
-              (case (preferences:get 'drracket:module-browser:name-length)
-                [(0) 'long]
-                [(1) 'long]
-                [(2) 'long]
-                [(3) 'very-long]))          
-        ;; shouldn't be necessary here -- need to find callback on editor
-        (send pasteboard render-snips)
-        
-        (send frame show #t)))))
-
-;; make-module-overview-pasteboard : boolean
-;;                                   ((union #f snip) -> void)
-;;                                -> (union string pasteboard)
-;; string as result indicates an error message
-;; pasteboard as result is the pasteboard to show
-(define (make-module-overview-pasteboard vertical? mouse-currently-over 
-                                         overview-pasteboard%
-                                         #:on-boxed-word-double-click
-                                         [on-boxed-word-double-click #f])
-  
-  (define level-ht (make-hasheq))
-  
-  ;; snip-table : hash-table[sym -o> snip]
-  (define snip-table (make-hash))
-  (define label-font (find-label-font (preferences:get 'drracket:module-overview:label-font-size)))
-  (define text-color "blue")
-  
-  (define search-result-text-color "white")
-  (define search-result-background "forestgreen")
-  
-  (define dark-syntax-pen (send the-pen-list find-or-create-pen "darkorchid" 1 'solid))
-  (define dark-syntax-brush (send the-brush-list find-or-create-brush "darkorchid" 'solid))
-  (define light-syntax-pen (send the-pen-list find-or-create-pen "plum" 1 'solid))
-  (define light-syntax-brush (send the-brush-list find-or-create-brush "plum" 'solid))
-  
-  (define dark-template-pen (send the-pen-list find-or-create-pen "seagreen" 1 'solid))
-  (define dark-template-brush (send the-brush-list find-or-create-brush "seagreen" 'solid))
-  (define light-template-pen (send the-pen-list find-or-create-pen "springgreen" 1 'solid))
-  (define light-template-brush (send the-brush-list find-or-create-brush "springgreen" 'solid))
-  
-  (define dark-pen (send the-pen-list find-or-create-pen "blue" 1 'solid))
-  (define dark-brush (send the-brush-list find-or-create-brush "blue" 'solid))
-  (define light-pen (send the-pen-list find-or-create-pen "light blue" 1 'solid))
-  (define light-brush (send the-brush-list find-or-create-brush "light blue" 'solid))
-  
-  (define (module-overview-pasteboard-mixin %)
-    (class* % (module-overview-pasteboard<%>)
-      
-      (inherit get-snip-location
-               begin-edit-sequence
-               end-edit-sequence
-               insert
-               move-to
-               find-first-snip
-               dc-location-to-editor-location
-               find-snip
-               get-canvas)
-      
-      ;; require-depth-ht : hash[(list snip snip) -o> (listof integer)]
-      ;; maps parent/child snips (ie, those that match up to modules 
-      ;; that require each other) to phase differences
-      (define require-depth-ht (make-hash))
-      
-      (define name-length 'long)
-      (define/public (set-name-length nl)
-        (unless (eq? name-length nl)
-          (set! name-length nl)
-          (re-add-snips)
-          (render-snips)))
-      (define/public (get-name-length) name-length)
-      
-      (field [max-lines #f])
-      
-      ;; controls if the snips should be moved
-      ;; around when the font size is changed.
-      ;; set to #f if the user ever moves a
-      ;; snip themselves.
-      (define dont-move-snips #f)
-      
-      (field (label-font-size (preferences:get 'drracket:module-overview:label-font-size)))
-      (define/public (get-label-font-size) label-font-size)
-      (define/private (get-snip-hspace) (if vertical?
-                                            2
-                                            (* 2 label-font-size)))
-      (define/private (get-snip-vspace) (if vertical?
-                                            30
-                                            2))
-      (define snip-height #f)
-      
-      (define font-label-size-callback-running? #f)
-      (define new-font-size #f)
-      (define/public (set-label-font-size size-to-set)
-        (set! new-font-size size-to-set)
-        (unless font-label-size-callback-running?
-          (set! font-label-size-callback-running? #t)
-          (queue-callback
-           (λ ()
-             (set! label-font-size new-font-size)
-             (preferences:set 'drracket:module-overview:label-font-size 
-                              new-font-size)
-             (set! label-font (find-label-font label-font-size))
-             (begin-edit-sequence)
-             (let loop ([snip (find-first-snip)])
-               (when snip
-                 (let ([admin (send snip get-admin)])
-                   (when admin
-                     (send admin resized snip #t)))
-                 (loop (send snip next))))
-             (unless dont-move-snips
-               (render-snips))
-             (end-edit-sequence)
-             (set! new-font-size #f)
-             (set! font-label-size-callback-running? #f))
-           #f)))
-      
-      (define/public (begin-adding-connections)
-        (when max-lines
-          (error 'begin-adding-connections
-                 "already in begin-adding-connections/end-adding-connections sequence"))
-        (set! max-lines 0)
-        (begin-edit-sequence)
-        (let loop ()
-          (let ([s (find-first-snip)])
-            (when s
-              (send s release-from-owner)
-              (loop))))
-        (set! level-ht (make-hasheq))
-        (set! snip-table (make-hash)))
-      
-      (define/public (end-adding-connections)
-        (unless max-lines
-          (error 'end-adding-connections
-                 "not in begin-adding-connections/end-adding-connections sequence"))
-        
-        (unless (zero? max-lines)
-          (let loop ([snip (find-first-snip)])
-            (when snip
-              (when (is-a? snip word-snip/lines%)
-                (send snip normalize-lines max-lines))
-              (loop (send snip next)))))
-        
-        
-        (set! max-lines #f)
-        (compute-snip-require-phases)
-        (remove-specially-linked)
-        (render-snips)
-        (end-edit-sequence))
-      
-      (define/private (compute-snip-require-phases)
-        (let ([ht (make-hash)]) ;; avoid infinite loops 
-          (for ([snip (in-list (get-top-most-snips))])
-            (let loop ([parent snip]
-                       [depth 0])    ;; depth is either an integer or #f (indicating for-label)
-              (unless (hash-ref ht (cons parent depth) #f)
-                (hash-set! ht (cons parent depth) #t)
-                (send parent add-require-phase depth)
-                (for ([child (in-list (send parent get-children))])
-                  (for ([delta-depth (in-list (hash-ref require-depth-ht (list parent child)))])
-                    (loop child 
-                          (and depth delta-depth (+ delta-depth depth))))))))))
-      
-      ;; add-connection : path/string/submod path/string/submod (union symbol #f) number -> void
-      ;; name-original and name-require and the identifiers for those paths and
-      ;; original-filename? and require-filename? are booleans indicating if the names
-      ;; are filenames.
-      (define/public (add-connection name-original name-require path-key require-depth)
-        (unless max-lines
-          (error 'add-connection "not in begin-adding-connections/end-adding-connections sequence"))
-        (let* ([original-snip (find/create-snip name-original)]
-               [require-snip (find/create-snip name-require)]
-               [original-level (send original-snip get-level)]
-               [require-level (send require-snip get-level)])
-          (let ([require-depth-key (list original-snip require-snip)])
-            (hash-set! require-depth-ht 
-                       require-depth-key
-                       (cons require-depth (hash-ref require-depth-ht require-depth-key '())))) 
-          (case require-depth 
-            [(0)
-             (add-links original-snip require-snip
-                        dark-pen light-pen
-                        dark-brush light-brush)]
-            [else
-             (add-links original-snip require-snip 
-                        dark-syntax-pen light-syntax-pen
-                        dark-syntax-brush light-syntax-brush)])
-          (when path-key
-            (send original-snip add-special-key-child path-key require-snip))
-          (if (send original-snip get-level)
-              (fix-snip-level require-snip (+ original-level 1))
-              (fix-snip-level original-snip 0))))
-      
-      ;; fix-snip-level : snip number -> void
-      ;; moves the snip (and any children) to at least `new-level'
-      ;; doesn't move them if they are already past that level
-      (define/private (fix-snip-level snip new-min-level)
-        (let loop ([snip snip]
-                   [new-min-level new-min-level])
-          (let ([current-level (send snip get-level)])
-            (when (or (not current-level)
-                      (new-min-level . > . current-level))
-              (send snip set-level new-min-level)
-              (for-each
-               (λ (child) (loop child (+ new-min-level 1)))
-               (send snip get-children))))))
-      
-      ;; find/create-snip : (union path string) boolean? -> word-snip/lines
-      ;; finds the snip with this key, or creates a new
-      ;; ones. For the same key, always returns the same snip.
-      ;; uses snip-table as a cache for this purpose.
-      (define/private (find/create-snip name)
-        (define filename
-          (match name
-            [(? path-string?) (and (file-exists? name) name)]
-            [`(submod ,p ,_ ...) (and (file-exists? p) p)]
-            [else #f]))
-        (hash-ref
-         snip-table
-         name
-         (λ () 
-           (define snip
-             (new word-snip/lines%
-                  [lines (if filename (count-lines filename) #f)]
-                  [word 
-                   (if filename
-                       (let ([short-name (let-values ([(_1 name _2) (split-path filename)])
-                                           (path->string name))])
-                         (match name
-                           [(? path-string?) short-name]
-                           [`(submod ,p ,submods ...) 
-                            (format "~s" `(submod ,short-name ,@submods))]))
-                       (format "~a" name))]
-                  [pb this]
-                  [filename filename]))
-           (insert snip)
-           (hash-set! snip-table name snip)
-           snip)))
-      
-      ;; count-lines : string[filename] -> (union #f number)
-      ;; effect: updates max-lines
-      (define/private (count-lines filename)
-        (let ([lines
-               (call-with-input-file filename
-                 (λ (port)
-                   (let loop ([n 0])
-                     (let ([l (read-line port)])
-                       (if (eof-object? l)
-                           n
-                           (loop (+ n 1))))))
-                 #:mode 'text)])
-          (set! max-lines (max lines max-lines))
-          lines))
-      
-      ;; get-snip-width : snip -> number
-      ;; exracts the width of a snip
-      (define/private (get-snip-width snip)
-        (let ([lb (box 0)]
-              [rb (box 0)])
-          (get-snip-location snip lb #f #f)
-          (get-snip-location snip rb #f #t)
-          (- (unbox rb)
-             (unbox lb))))
-      
-      ;; get-snip-height : snip -> number
-      ;; exracts the width of a snip
-      (define/private (get-snip-height snip)
-        (let ([tb (box 0)]
-              [bb (box 0)])
-          (get-snip-location snip #f tb #f)
-          (get-snip-location snip #f bb #t)
-          (- (unbox bb)
-             (unbox tb))))
-      
-      (field [hidden-paths (preferences:get 'drracket:module-browser:hide-paths)])
-      (define/public (remove-visible-paths symbol)
-        (unless (memq symbol hidden-paths)
-          (set! hidden-paths (cons symbol hidden-paths))
-          (refresh-visible-paths)))
-      (define/public (show-visible-paths symbol)
-        (when (memq symbol hidden-paths)
-          (set! hidden-paths (remq symbol hidden-paths))
-          (refresh-visible-paths)))
-      (define/public (get-hidden-paths) hidden-paths)
-      
-      (define/private (refresh-visible-paths)
-        (begin-edit-sequence)
-        (re-add-snips)
-        (render-snips)
-        (end-edit-sequence))
-      
-      (define/private (re-add-snips)
-        (begin-edit-sequence)
-        (remove-specially-linked)
-        (end-edit-sequence))
-      
-      (define/private (remove-specially-linked)
-        (remove-currrently-inserted)
-        (cond
-          [(null? hidden-paths)
-           (add-all)]
-          [else
-           (let ([ht (make-hasheq)])
-             (for ([snip (in-list (get-top-most-snips))])
-               (insert snip)
-               (let loop ([snip snip])
-                 (unless (hash-ref ht snip #f)
-                   (hash-set! ht snip #t)
-                   (for ([child (in-list (send snip get-children))])
-                     (unless (ormap (λ (key) (send snip is-special-key-child?
-                                                   key child))
-                                    hidden-paths)
-                       (insert child)
-                       (loop child)))))))]))
-      
-      (define/private (remove-currrently-inserted)
-        (let loop ()
-          (let ([snip (find-first-snip)])
-            (when snip
-              (send snip release-from-owner)
-              (loop)))))
-      
-      (define/private (add-all)
-        (let ([ht (make-hasheq)])
-          (for-each
-           (λ (snip)
-             (let loop ([snip snip])
-               (unless (hash-ref ht snip (λ () #f))
-                 (hash-set! ht snip #t)
-                 (insert snip)
-                 (for-each loop (send snip get-children)))))
-           (get-top-most-snips))))
-      
-      (define/private (get-top-most-snips) (hash-ref level-ht 0 (λ () null)))
-      
-      ;; render-snips : -> void
-      (define/public (render-snips)
-        (begin-edit-sequence)
-        (let ([max-minor 0])
-          
-          ;; major-dim is the dimension that new levels extend along
-          ;; minor-dim is the dimension that snips inside a level extend along
-          
-          (hash-for-each
-           level-ht
-           (λ (n v)
-             (set! max-minor (max max-minor (apply + (map (if vertical?
-                                                              (λ (x) (get-snip-width x))
-                                                              (λ (x) (get-snip-height x)))
-                                                          v))))))
-          
-          (let ([levels (sort (hash-map level-ht list)
-                              (λ (x y) (<= (car x) (car y))))])
-            (let loop ([levels levels]
-                       [major-dim 0])
-              (cond
-                [(null? levels) (void)]
-                [else
-                 (let* ([level (car levels)]
-                        [n (car level)]
-                        [this-level-snips (cadr level)]
-                        [this-minor (apply + (map (if vertical? 
-                                                      (λ (x) (get-snip-width x))
-                                                      (λ (x) (get-snip-height x)))
-                                                  this-level-snips))]
-                        [this-major (apply max (map (if vertical? 
-                                                        (λ (x) (get-snip-height x))
-                                                        (λ (x) (get-snip-width x)))
-                                                    this-level-snips))])
-                   (let loop ([snips this-level-snips]
-                              [minor-dim (/ (- max-minor this-minor) 2)])
-                     (unless (null? snips)
-                       (let* ([snip (car snips)]
-                              [new-major-coord
-                               (+ major-dim
-                                  (floor
-                                   (- (/ this-major 2) 
-                                      (/ (if vertical? 
-                                             (get-snip-height snip)
-                                             (get-snip-width snip))
-                                         2))))])
-                         (if vertical?
-                             (move-to snip minor-dim new-major-coord)
-                             (move-to snip new-major-coord minor-dim))
-                         (loop (cdr snips)
-                               (+ minor-dim
-                                  (if vertical?
-                                      (get-snip-hspace)
-                                      (get-snip-vspace))
-                                  (if vertical?
-                                      (get-snip-width snip)
-                                      (get-snip-height snip)))))))
-                   (loop (cdr levels)
-                         (+ major-dim 
-                            (if vertical? 
-                                (get-snip-vspace)
-                                (get-snip-hspace))
-                            this-major)))]))))
-        (end-edit-sequence))
-      
-      (define/override (on-mouse-over-snips snips)
-        (mouse-currently-over snips))
-      
-      (define/override (on-double-click snip event)
-        (cond
-          [(is-a? snip boxed-word-snip<%>)
-           (when on-boxed-word-double-click
-             (on-boxed-word-double-click (send snip get-filename)))]
-          [else (super on-double-click snip event)]))
-      
-      (define/override (on-event evt)
-        (cond
-          [(and on-boxed-word-double-click (send evt button-down? 'right))
-           (let ([ex (send evt get-x)]
-                 [ey (send evt get-y)])
-             (let-values ([(x y) (dc-location-to-editor-location ex ey)])
-               (let ([snip (find-snip x y)]
-                     [canvas (get-canvas)])
-                 (let ([right-button-menu (make-object popup-menu%)])
-                   (when (and snip
-                              (is-a? snip boxed-word-snip<%>)
-                              canvas
-                              (send snip get-filename))
-                     (new menu-item%
-                          [label 
-                           (trim-string
-                            (format open-file-format
-                                    (path->string (send snip get-filename)))
-                            200)]
-                          [parent right-button-menu]
-                          [callback
-                           (λ (x y)
-                             (on-boxed-word-double-click
-                              (send snip get-filename)))]))
-                   (new menu-item%
-                        [label (string-constant module-browser-open-all)]
-                        [parent right-button-menu]
-                        [callback
-                         (λ (x y)
-                           (let loop ([snip (find-first-snip)])
-                             (when snip
-                               (when (is-a? snip boxed-word-snip<%>)
-                                 (let ([filename (send snip get-filename)])
-                                   (on-boxed-word-double-click filename)))
-                               (loop (send snip next)))))])
-                   (send canvas popup-menu
-                         right-button-menu
-                         (+ (send evt get-x) 1)
-                         (+ (send evt get-y) 1))))))]
-          [else (super on-event evt)]))
-      
-      (super-new)))
-  
-  (define (trim-string str len)
-    (cond
-      [(<= (string-length str) len) str]
-      [else (substring str (- (string-length str) len) (string-length str))]))
-  
-  (define (level-mixin %)
-    (class %
-      (field (level #f))
-      (define/public (get-level) level)
-      (define/public (set-level _l) 
-        (when level
-          (hash-set! level-ht level
-                     (remq this (hash-ref level-ht level))))
-        (set! level _l)
-        (hash-set! level-ht level 
-                   (cons this (hash-ref level-ht level (λ () null)))))
-      
-      (super-instantiate ())))
-  
-  (define (boxed-word-snip-mixin %)
-    (class* % (boxed-word-snip<%>)
-      (init-field word
-                  filename
-                  lines
-                  pb)
-      
-      (inherit get-admin)
-      
-      (define require-phases '())
-      (define/public (get-require-phases) require-phases)
-      (define/public (add-require-phase d)
-        (unless (member d require-phases)
-          (set! last-name #f)
-          (set! last-size #f)
-          (set! require-phases (sort (cons d require-phases) < #:key (λ (x) (or x +inf.0))))))
-      
-      (field [special-children (make-hasheq)])
-      (define/public (is-special-key-child? key child)
-        (let ([ht (hash-ref special-children key #f)])
-          (and ht (hash-ref ht child #f))))
-      (define/public (add-special-key-child key child)
-        (hash-set! (hash-ref! special-children key make-hasheq) child #t))
-      
-      (define/public (get-filename) filename)
-      (define/public (get-word) word)
-      (define/public (get-lines) lines)
-      
-      (field (lines-brush #f))
-      (define/public (normalize-lines n)
-        (if lines
-            (let* ([grey (inexact->exact (floor (- 255 (* 255 (sqrt (/ lines n))))))])
-              (set! lines-brush (send the-brush-list find-or-create-brush
-                                      (make-object color% grey grey grey)
-                                      'solid)))
-            (set! lines-brush (send the-brush-list find-or-create-brush
-                                    "salmon"
-                                    'solid))))
-      
-      (define snip-width 0)
-      (define snip-height 0)
-      
-      (define/override (get-extent dc x y wb hb descent space lspace rspace)
-        (cond
-          [(equal? (name->label) "")
-           (set! snip-width 15)
-           (set! snip-height 15)]
-          [else
-           (let-values ([(w h a d) (send dc get-text-extent (name->label) label-font)])
-             (set! snip-width (+ w 5))
-             (set! snip-height (+ h 5)))])
-        (set-box/f wb snip-width)
-        (set-box/f hb snip-height)
-        (set-box/f descent 0)
-        (set-box/f space 0)
-        (set-box/f lspace 0)
-        (set-box/f rspace 0))
-      
-      (define/public (set-found! fh?) 
-        (unless (eq? (and fh? #t) found-highlight?)
-          (set! found-highlight? (and fh? #t))
-          (let ([admin (get-admin)])
-            (when admin
-              (send admin needs-update this 0 0 snip-width snip-height)))))
-      (define found-highlight? #f)
-      
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (let ([old-font (send dc get-font)]
-              [old-text-foreground (send dc get-text-foreground)]
-              [old-brush (send dc get-brush)]
-              [old-pen (send dc get-pen)])
-          (send dc set-font label-font)
-          (cond
-            [found-highlight?
-             (send dc set-brush search-result-background 'solid)]
-            [lines-brush
-             (send dc set-brush lines-brush)])
-          (when (rectangles-intersect? left top right bottom
-                                       x y (+ x snip-width) (+ y snip-height))
-            (send dc draw-rectangle x y snip-width snip-height)
-            (send dc set-text-foreground (send the-color-database find-color 
-                                               (if found-highlight?
-                                                   search-result-text-color
-                                                   text-color)))
-            (send dc draw-text (name->label) (+ x 2) (+ y 2)))
-          (send dc set-pen old-pen)
-          (send dc set-brush old-brush)
-          (send dc set-text-foreground old-text-foreground)
-          (send dc set-font old-font)))
-      
-      ;; name->label : path -> string
-      ;; constructs a label for the little boxes in terms
-      ;; of the filename.
-      
-      (define last-name #f)
-      (define last-size #f)
-      
-      (define/private (name->label)
-        (let ([this-size (send pb get-name-length)])
-          (cond
-            [(eq? this-size last-size) last-name]
-            [else
-             (set! last-size this-size)
-             (set! last-name
-                   (case last-size
-                     [(short)
-                      (if (string=? word "")
-                          ""
-                          (string (string-ref word 0)))]
-                     [(medium)
-                      (let ([m (regexp-match #rx"^(.*)\\.[^.]*$" word)])
-                        (let ([short-name (if m (cadr m) word)])
-                          (if (string=? short-name "")
-                              ""
-                              (let ([ms (regexp-match* #rx"-[^-]*" short-name)])
-                                (cond
-                                  [(null? ms)
-                                   (substring short-name 0 (min 2 (string-length short-name)))]
-                                  [else
-                                   (apply string-append
-                                          (cons (substring short-name 0 1)
-                                                (map (λ (x) (substring x 1 2))
-                                                     ms)))])))))]
-                     [(long) word]
-                     [(very-long)  
-                      (string-append
-                       word
-                       ": "
-                       (format "~s" require-phases))]))
-             last-name])))
-      
-      (super-new)))
-  
-  (define word-snip/lines% (level-mixin (boxed-word-snip-mixin (graph-snip-mixin snip%))))
-  
-  (define draw-lines-pasteboard% (module-overview-pasteboard-mixin
-                                  (graph-pasteboard-mixin
-                                   overview-pasteboard%)))
-  (new draw-lines-pasteboard% [cache-arrow-drawing? #t]))
-
-(define (standalone-fill-pasteboard pasteboard filename show-status _void)
-  (define progress-channel (make-async-channel))
-  (define connection-channel (make-async-channel))
-  
-  (define-values/invoke-unit process-program-unit
-    (import process-program-import^)
-    (export process-program-export^))
-  
-  (define user-custodian (make-custodian))
-  (define error-str #f)
-  
-  (define init-dir (get-init-dir filename))
-  
-  (define (swallow-specials port)
-    (define-values (in out) (make-pipe-with-specials))
-    (thread
-     (λ ()
-       (let loop ()
-         (define c (read-char-or-special in))
-         (cond
-           [(char? c)
-            (display c out)
-            (loop)]
-           [(eof-object? c)
-            (close-output-port out)
-            (close-input-port in)]
-           [else
-            (loop)]))))
-    out)
-  
-  (define done-chan (make-channel))
-  
-  (define user-thread
-    (parameterize ([current-custodian user-custodian])
-      
-      ;; not that we expect anyone to really use this, but
-      ;; we make it here to avoid the expanded code from interfereing
-      ;; with the module browser
-      (parameterize ([current-eventspace (make-eventspace)])
-        
-        (thread
-         (λ ()
-           (moddep-current-open-input-file
-            (λ (filename)
-              (let* ([p (open-input-file filename)]
-                     [wxme? (regexp-match-peek #rx#"^WXME" p)])
-                (if wxme?
-                    (let ([t (new text%)])
-                      (close-input-port p)
-                      (send t load-file filename)
-                      (let ([prt (open-input-text-editor t)])
-                        (port-count-lines! prt)
-                        prt))
-                    p))))
-           (current-load-relative-directory #f)
-           (define relative? (eq? init-dir 'relative))
-           (unless relative? ; already there
-             (current-directory init-dir))
-           (define file-path (if (string? filename)
-                                 (string->path filename)
-                                 filename))
-           (add-connections
-            (if relative? (build-path (current-directory) file-path) file-path))
-           (channel-put done-chan #t))))))
-  
-  (send pasteboard begin-adding-connections)
-  (let ([evt
-         (choice-evt
-          (handle-evt progress-channel (λ (x) (cons 'progress x)))
-          (handle-evt connection-channel (λ (x) (cons 'connect x)))
-          (handle-evt done-chan (λ (x) (cons 'done #f)))
-          (handle-evt user-thread (λ (x) (cons 'died #f))))])
-    (let loop ()
-      (define evt-value (yield evt))
-      (define key (car evt-value))
-      (define val (cdr evt-value))
-      (case key
-        [(done) (void)]
-        [(died) (exit)]
-        [(progress) 
-         (show-status val)
-         (loop)]
-        [(connect)
-         (define name-original (list-ref val 0))
-         (define name-require (list-ref val 1))
-         (define path-key (list-ref val 2))
-         (define require-depth (list-ref val 3))
-         (send pasteboard add-connection name-original name-require path-key require-depth)
-         (loop)])))
-  (send pasteboard end-adding-connections)
-  
-  (custodian-shutdown-all user-custodian)
-  
-  (cond
-    [error-str
-     (message-box 
-      (string-constant module-browser)
-      (format (string-constant module-browser-error-expanding)
-              error-str))
-     #f]
-    [else
-     #t]))
-
-;; get-init-dir : (or/c path? #f) -> path?
-;; returns the initial directory for a program
-;; that is saved in 'path/f' (with #f indicating
-;; an unsaved file)
-(define (get-init-dir path/f)
-  (cond
-    [path/f
-     (let-values ([(base name dir?) (split-path path/f)])
-       base)]
-    [else
-     (find-system-path 'home-dir)]))
-
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/annotate.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/annotate.rkt
deleted file mode 100644
index f085735a87..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/annotate.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang racket/base
-(require racket/class
-         "syncheck-intf.rkt"
-         "syncheck-local-member-names.rkt")
-(provide color color-range
-         find-source-editor
-         find-source-editor/defs
-         add-mouse-over
-         add-mouse-over/loc)
-
-;; color : syntax[original] str -> void
-;; colors the syntax with style-name's style
-(define (color stx style-name)
-  (let ([source (find-source-editor stx)])
-    (when (and (syntax-position stx)
-               (syntax-span stx))
-      (let ([pos (- (syntax-position stx) 1)]
-            [span (syntax-span stx)])
-        (color-range source pos (+ pos span) style-name)))))
-
-;; color-range : text start finish style-name 
-;; colors a range in the text based on `style-name'
-(define (color-range source start finish style-name)
-  (define defs (current-annotations))
-  (when defs
-    (send defs syncheck:color-range source start finish style-name)))
-
-;; add-mouse-over : syntax[original] (or/c string (-> string?)) -> void
-;; registers the range in the editor so that a mouse over
-;; this area shows up in the status line.
-(define (add-mouse-over stx str/proc)
-  (define source (find-source-editor stx))
-  (define defs-text (current-annotations))
-  (when (and defs-text 
-             source
-             (syntax-position stx)
-             (syntax-span stx))
-    (define pos-left (- (syntax-position stx) 1))
-    (define pos-right (+ pos-left (syntax-span stx)))
-    (add-mouse-over/loc/proc defs-text source pos-left pos-right str/proc)))
-
-(define (add-mouse-over/loc source pos-left pos-right str/proc)
-  (define defs-text (current-annotations))
-  (when defs-text
-    (add-mouse-over/loc/proc defs-text source pos-left pos-right str/proc)))
-
-(define (add-mouse-over/loc/proc defs-text source pos-left pos-right str/proc)
-  (define str
-    (cond
-      [(procedure? str/proc) (str/proc)]
-      [else str/proc]))
-  (when (string? str)
-    (send defs-text syncheck:add-mouse-over-status
-          source pos-left pos-right str)))
-
-;; find-source-editor : stx -> editor or false
-(define (find-source-editor stx)
-  (let ([defs-text (current-annotations)])
-    (and defs-text 
-         (find-source-editor/defs stx defs-text))))
-
-;; find-source-editor : stx text -> editor or false
-(define (find-source-editor/defs stx defs-text)
-  (send defs-text syncheck:find-source-object stx))
-
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/colors.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/colors.rkt
deleted file mode 100644
index 0d01de5cca..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/colors.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang racket/base
-(provide (all-defined-out))
-
-(define cs-my-obligation-color "my obligations")
-(define cs-their-obligation-color "my assumptions")
-(define cs-both-obligation-color "both obligations")
-(define cs-unk-obligation-color "unknown obligations")
-
-(define lexically-bound-variable-style-pref 'drracket:check-syntax:lexically-bound)
-(define imported-variable-style-pref 'drracket:check-syntax:imported)
-(define set!d-variable-style-pref 'drracket:check-syntax:set!d)
-(define unused-require-style-pref 'drracket:check-syntax:unused-require)
-(define free-variable-style-pref 'drracket:check-syntax:free-variable)
-
-(define lexically-bound-variable-style-name (symbol->string lexically-bound-variable-style-pref))
-(define imported-variable-style-name (symbol->string imported-variable-style-pref))
-(define set!d-variable-style-name (symbol->string set!d-variable-style-pref))
-(define unused-require-style-name (symbol->string unused-require-style-pref))
-(define free-variable-style-name (symbol->string free-variable-style-pref))
-
-(define my-obligation-style-pref 'drracket:check-syntax:my-obligation-style-pref)
-(define their-obligation-style-pref 'drracket:check-syntax:their-obligation-style-pref)
-(define unk-obligation-style-pref 'drracket:check-syntax:unk-obligation-style-pref)
-(define both-obligation-style-pref 'drracket:check-syntax:both-obligation-style-pref)
-
-(define my-obligation-style-name (symbol->string my-obligation-style-pref))
-(define their-obligation-style-name (symbol->string their-obligation-style-pref))
-(define unk-obligation-style-name (symbol->string unk-obligation-style-pref))
-(define both-obligation-style-name (symbol->string both-obligation-style-pref))
-
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/contract-traversal.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/contract-traversal.rkt
deleted file mode 100644
index 40dd4e024f..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/contract-traversal.rkt
+++ /dev/null
@@ -1,245 +0,0 @@
-#lang racket/base
-(require "syncheck-intf.rkt"
-         "syncheck-local-member-names.rkt"
-         "annotate.rkt"
-         "colors.rkt"
-         syntax/boundmap
-         syntax/kerncase
-         string-constants)
-(provide annotate-contracts)
-
-(define (annotate-contracts stx low-binders binding-inits)
-  (define boundary-start-map (make-hash))
-  (define internal-start-map (make-hash))
-  (define domain-map (make-hash))
-  (define range-map (make-hash))
-  
-  ;; coloring-plans : hash[stx -o-> (listof color)]
-  (define coloring-plans (make-hash))
-  
-  (let loop ([stx stx])
-    (add-to-map stx 'racket/contract:contract-on-boundary boundary-start-map)
-    (add-to-map stx 'racket/contract:internal-contract internal-start-map)
-    (add-to-map stx 'racket/contract:negative-position domain-map)
-    (add-to-map stx 'racket/contract:positive-position range-map)
-    (syntax-case stx ()
-      [(a . b) (loop #'a) (loop #'b)]
-      [_ (void)]))
-  
-  ;; fill in the coloring-plans table for boundary contracts
-  (for ([(start-k start-val) (in-hash boundary-start-map)])
-    (for ([start-stx (in-list start-val)])
-      (do-contract-traversal start-stx #t
-                             coloring-plans
-                             low-binders binding-inits
-                             domain-map range-map
-                             #t)))
-  
-  ;; fill in the coloring-plans table for internal contracts
-  (for ([(start-k start-val) (in-hash internal-start-map)])
-    (for ([start-stx (in-list start-val)])
-      (do-contract-traversal start-stx #f
-                             coloring-plans
-                             low-binders binding-inits
-                             domain-map range-map
-                             #f)))
-  
-  ;; enact the coloring plans
-  (for ([(stx colors) (in-hash coloring-plans)])
-    (cond
-      [(and (member my-obligation-style-name colors)
-            (member their-obligation-style-name colors))
-       (add-mouse-over stx (string-constant cs-contract-both-obligation))]
-      [(member my-obligation-style-name colors)
-       (add-mouse-over stx (string-constant cs-contract-my-obligation))]
-      [(member their-obligation-style-name colors)
-       (add-mouse-over stx (string-constant cs-contract-their-obligation))]
-      [(member unk-obligation-style-name colors)
-       (add-mouse-over stx (string-constant cs-contract-unk-obligation))])))
-
-(define (do-contract-traversal start-stx boundary-contract?
-                               coloring-plans
-                               low-binders binding-inits domain-map range-map polarity)
-  (let ploop ([stx start-stx]
-              [polarity polarity])
-    
-    (define (call-give-up)
-      (give-up start-stx boundary-contract? coloring-plans))
-    
-    (let ([main-prop (syntax-property stx 'racket/contract:contract)])
-      (cond
-        [main-prop
-         ;; we've found a contract, now go color it and 
-         ;; continue with the sub-contract expressions (as indicated via the properties)
-         (let sloop ([prop main-prop])
-           (cond
-             [(pair? prop) (sloop (car prop)) (sloop (cdr prop))]
-             [(vector? prop)
-              (let ([id (vector-ref prop 0)]
-                    [to-color-pos (vector-ref prop 1)]
-                    [to-color-neg (vector-ref prop 2)])
-                (for ((stx (in-list to-color-pos)))
-                  (base-color stx polarity boundary-contract? coloring-plans))
-                (for ((stx (in-list to-color-neg)))
-                  (base-color stx (not polarity) boundary-contract? coloring-plans))
-                (for ((stx (in-list (hash-ref domain-map id '()))))
-                  (do-contract-traversal stx boundary-contract?
-                                         coloring-plans
-                                         low-binders binding-inits domain-map range-map (not polarity)))
-                (for ((stx (in-list (hash-ref range-map id '()))))
-                  (do-contract-traversal stx boundary-contract?
-                                         coloring-plans
-                                         low-binders binding-inits domain-map range-map polarity)))]))]
-        
-        [else
-         ;; we didn't find a contract, but we might find one in a subexpression
-         ;; so we need to go look for it (possibly giving up)
-         (kernel-syntax-case stx #f
-           [(#%expression expr)
-            (ploop #'expr polarity)]
-           [(module id name-id (#%plain-module-begin mod-level-form ...))
-            (call-give-up)]
-           [(begin tl-form ... last-one)
-            (ploop #'last-one polarity)]
-           [(#%provide pvd ...)
-            (call-give-up)]
-           [(#%declare decl ...)
-            (call-give-up)]
-           [(define-values (id ...) expr)
-            (call-give-up)]
-           [(define-syntaxes (id ...) expr)
-            (call-give-up)]
-           [(begin-for-syntax (id ...) expr)
-            (call-give-up)]
-           [(#%require rspec ...)
-            (call-give-up)]
-           [id
-            (identifier? #'id)
-            (if (known-predicate? #'id)
-                (base-color #'id polarity boundary-contract? coloring-plans)
-                (let ([binders (module-identifier-mapping-get low-binders #'id (λ () #f))])
-                  (if binders
-                      (begin
-                        (base-color #'id polarity boundary-contract? coloring-plans)
-                        (for ((binder (in-list binders)))
-                          (base-color binder polarity boundary-contract? coloring-plans)
-                          (for ((rhs (in-list (module-identifier-mapping-get binding-inits binder (λ () '())))))
-                            (ploop rhs polarity))))
-                      (call-give-up))))]
-           [const
-            (let ([val (syntax-e #'const)])
-              (or (boolean? val)
-                  (number? val)
-                  (string? val)
-                  (char? val)
-                  (regexp? val)))
-            (base-color stx polarity boundary-contract? coloring-plans)]
-           [(#%plain-lambda (id) expr ...)
-            (identifier? #'id)
-            (base-color stx polarity boundary-contract? coloring-plans)]
-           [(#%plain-lambda id expr ...)
-            (identifier? #'id)
-            (base-color stx polarity boundary-contract? coloring-plans)]
-           [(#%plain-lambda formals expr ...)
-            (call-give-up)]
-           [(case-lambda [formals expr] ...)
-            ;; this should really only happen when the arity of the case-lambda includes 1
-            ;; (otherwise we should call give-up)
-            (base-color stx polarity boundary-contract? coloring-plans)]
-           [(if a b c)
-            ;; these calls are questionable. 
-            ;; if we ultimately end up giving up in both
-            ;; branches, maybe we should actually be coloring the entire thing
-            ;; in the blank color, but we'll only color the then and else branches
-            ;; in that color with this code.
-            ;; on the other hand, recurring like this will mean that the two
-            ;; branches are considered separately and thus calling give-up
-            ;; on one side will not pollute the other side.
-            (do-contract-traversal #'b boundary-contract?
-                                   coloring-plans
-                                   low-binders binding-inits domain-map range-map polarity)
-            (do-contract-traversal #'c boundary-contract?
-                                   coloring-plans
-                                   low-binders binding-inits domain-map range-map polarity)]
-           ;; [(begin expr ...) (void)]
-           [(begin0 fst rst ...)
-            (ploop #'fst polarity)]
-           [(let-values bindings body ... last-one)
-            (ploop #'last-one polarity)]
-           [(letrec-values bindings body ... last-one)
-            (ploop #'last-one polarity)]
-           [(set! a b)
-            (call-give-up)]
-           [(quote stuff)
-            (base-color stx polarity boundary-contract? coloring-plans)]
-           [(quote-syntax stuff)
-            (call-give-up)]
-           [(with-continuation-mark a b c)
-            (ploop #'c polarity)]
-           [(#%plain-app f args ...)
-            (call-give-up)]
-           [(#%top . id)
-            (call-give-up)]
-           [(#%variable-reference ignored ...)
-            (call-give-up)]
-           [_ 
-            (begin
-              #;(error 'contract-traversal.rkt "unknown thing: ~s\n" stx)
-              (call-give-up))
-              ])]))))
-
-;; add-to-map : syntax any hash[any -> (listof stx)]
-;; looks at stx's property prop and updates map,
-;; using the value of the property as the key
-(define (add-to-map stx prop map)
-  (let loop ([val (syntax-property stx prop)])
-    (cond
-      [(symbol? val)
-       (hash-set! map val (cons stx (hash-ref map val '())))]
-      [(pair? val)
-       (loop (car val))
-       (loop (cdr val))])))
-
-;; returns #t if the result is known to be a predicate that should correspond to a
-;; complete obligation for the contract. If it is some unknown variable, this variable
-;; may refer to some other contract with nested obligations, so we have to return #f here.
-;; approximate this by just asking 'did this identifier come from the core?' (which is known
-;; to not bind any contracts (I hope))
-(define (known-predicate? id)
-  (let ([ib (identifier-binding id)])
-    (and (list? ib)
-         (let ([src (list-ref ib 0)])
-           (let-values ([(base rel) (module-path-index-split src)])
-             (member base '('#%kernel racket racket/base scheme scheme/base)))))))
-
-(define (give-up stx boundary-contract? coloring-plans)
-  (let loop ([stx stx])
-    (when (syntax-original? stx)
-      (blank-color stx boundary-contract? coloring-plans))
-    
-    (let oloop ([origin (syntax-property stx 'origin)])
-      (cond
-        [(pair? origin) (oloop (car origin)) (oloop (cdr origin))]
-        [(syntax? origin) 
-         (when (syntax-original? origin)
-           (blank-color origin boundary-contract? coloring-plans))]))
-    
-    (syntax-case stx ()
-      [(a . b) (loop #'a) (loop #'b)]
-      [_ (void)])))
-
-(define (base-color stx polarity boundary-contract? coloring-plans)
-  (make-a-coloring-plan
-   stx
-   (if polarity my-obligation-style-name their-obligation-style-name)
-   coloring-plans))
-
-(define (blank-color stx boundary-contract? coloring-plans)
-  (make-a-coloring-plan stx unk-obligation-style-name coloring-plans))
-
-(define (make-a-coloring-plan stx plan coloring-plans)
-  (hash-set! coloring-plans
-             stx
-             (cons 
-              plan
-              (hash-ref coloring-plans stx '()))))
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/syncheck-intf.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/syncheck-intf.rkt
deleted file mode 100644
index 1e03ec8372..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/syncheck-intf.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang racket/base
-(require racket/class
-         "syncheck-local-member-names.rkt")
-
-(define syncheck-annotations<%>
-  (interface ()
-    syncheck:find-source-object
-    syncheck:add-background-color
-    syncheck:add-require-open-menu
-    syncheck:add-docs-menu
-    syncheck:add-id-set
-    syncheck:add-arrow
-    syncheck:add-arrow/name-dup
-    syncheck:add-tail-arrow
-    syncheck:add-mouse-over-status
-    syncheck:add-jump-to-definition
-    syncheck:add-definition-target
-    syncheck:color-range
-    
-    syncheck:add-rename-menu))
-
-;; use this to communicate the frame being
-;; syntax checked w/out having to add new
-;; parameters to all of the functions
-(define current-annotations (make-parameter #f))
-
-(define annotations-mixin
-  (mixin () (syncheck-annotations<%>)
-    (define/public (syncheck:find-source-object stx) #f)
-    (define/public (syncheck:add-background-color source start end color) (void))
-    (define/public (syncheck:add-require-open-menu source start end key) (void))
-    (define/public (syncheck:add-id-set all-ids new-name-intereferes?) (void))
-    (define/public (syncheck:add-rename-menu sym all-ids new-name-intereferes?) (void))
-    (define/public (syncheck:add-docs-menu text start-pos end-pos
-                                           key
-                                           the-label
-                                           path
-                                           definition-tag
-                                           tag)
-      (void))
-    (define/public (syncheck:add-arrow start-text start-pos-left start-pos-right
-                                       end-text end-pos-left end-pos-right
-                                       actual? level)
-      (void))
-    (define/public (syncheck:add-arrow/name-dup start-text start-pos-left start-pos-right
-                                                end-text end-pos-left end-pos-right
-                                                actual? level require-arrow? name-dup?)
-      (syncheck:add-arrow start-text start-pos-left start-pos-right
-                          end-text end-pos-left end-pos-right
-                          actual? level))
-    (define/public (syncheck:add-tail-arrow from-text from-pos to-text to-pos) (void))
-    (define/public (syncheck:add-mouse-over-status text pos-left pos-right str) (void))
-    (define/public (syncheck:add-jump-to-definition text start end id filename submods) (void))
-    (define/public (syncheck:add-definition-target source pos-left pos-right id mods) (void))
-    (define/public (syncheck:color-range source start finish style-name) (void))
-    (super-new)))
-
-(provide syncheck-annotations<%>
-         current-annotations
-         annotations-mixin)
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/syncheck-local-member-names.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/syncheck-local-member-names.rkt
deleted file mode 100644
index 57a4cae8bb..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/syncheck-local-member-names.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-(require racket/class)
-(provide (all-defined-out))
-
-(define-local-member-name
-  syncheck:find-source-object
-  syncheck:add-background-color
-  syncheck:add-docs-menu
-  syncheck:color-range
-  syncheck:add-require-open-menu
-  syncheck:add-id-set
-  syncheck:add-arrow
-  syncheck:add-arrow/name-dup
-  syncheck:add-rename-menu
-  syncheck:add-tail-arrow
-  syncheck:add-mouse-over-status
-  syncheck:add-jump-to-definition)
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/traversals.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/traversals.rkt
deleted file mode 100644
index d87aec2429..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/traversals.rkt
+++ /dev/null
@@ -1,1352 +0,0 @@
-#lang racket/base
-
-(require "colors.rkt"
-         "syncheck-intf.rkt"
-         "syncheck-local-member-names.rkt"
-         "annotate.rkt"
-         "contract-traversal.rkt"
-         "xref.rkt"
-         string-constants
-         racket/unit
-         racket/match
-         racket/set
-         racket/class
-         racket/list
-         racket/contract
-         racket/pretty
-         syntax/boundmap
-         scribble/manual-struct
-         (for-syntax racket/base))
-
-(define-logger check-syntax)
-
-(provide make-traversal
-         current-max-to-send-at-once
-         build-trace%)
-
-(define current-max-to-send-at-once (make-parameter +inf.0))
-
-
-    ;; make-traversal : namespace string[directory] -> (values (syntax (union #f syntax) -> void)
-    ;;                                                         (-> void))
-    ;; returns a pair of functions that close over some state that
-    ;; represents the top-level of a single program. The first value
-    ;; is called once for each top-level expression and the second
-    ;; value is called once, after all expansion is complete.
-    (define (make-traversal user-namespace user-directory [print-extra-info? #f])
-      (let* ([tl-phase-to-binders (make-hash)]
-             [tl-phase-to-varrefs (make-hash)]
-             [tl-phase-to-varsets (make-hash)]
-             [tl-phase-to-tops (make-hash)]
-             [tl-binding-inits (make-id-set)]
-             [tl-templrefs (make-id-set)]
-             [tl-module-lang-requires (make-hash)]
-             [tl-phase-to-requires (make-hash)]
-             [tl-sub-identifier-binding-directives (make-hash)]
-             [expanded-expression
-              (λ (sexp [ignored void])
-                (parameterize ([current-directory (or user-directory (current-directory))]
-                               [current-load-relative-directory user-directory])
-                  (let ([is-module? (syntax-case sexp (module)
-                                      [(module . rest) #t]
-                                      [else #f])])
-                    (cond
-                      [is-module?
-                       (let ([phase-to-binders (make-hash)]
-                             [phase-to-varrefs (make-hash)]
-                             [phase-to-varsets (make-hash)]
-                             [phase-to-tops (make-hash)]
-                             [phase-to-requires (make-hash)]
-                             [binding-inits (make-id-set)]
-                             [templrefs (make-id-set)]
-                             [module-lang-requires (make-hash)]
-                             [requires (make-hash)]
-                             [require-for-syntaxes (make-hash)]
-                             [require-for-templates (make-hash)]
-                             [require-for-labels (make-hash)]
-                             [sub-identifier-binding-directives (make-hash)])
-                          (annotate-basic sexp
-                                          user-namespace user-directory
-                                          phase-to-binders
-                                          phase-to-varrefs
-                                          phase-to-varsets
-                                          phase-to-tops
-                                          binding-inits
-                                          templrefs
-                                          module-lang-requires
-                                          phase-to-requires
-                                          sub-identifier-binding-directives)
-                         (annotate-variables user-namespace
-                                             user-directory
-                                             phase-to-binders
-                                             phase-to-varrefs
-                                             phase-to-varsets
-                                             phase-to-tops
-                                             templrefs
-                                             module-lang-requires
-                                             phase-to-requires
-                                             sub-identifier-binding-directives)
-                         (annotate-contracts sexp 
-                                             (hash-ref phase-to-binders 0 (λ () (make-id-set)))
-                                             binding-inits)
-                         (when print-extra-info?
-                           (print-extra-info (list (list 'phase-to-binders phase-to-binders)
-                                                   (list 'phase-to-varrefs phase-to-varrefs)
-                                                   (list 'phase-to-varsets phase-to-varsets)
-                                                   (list 'phase-to-tops phase-to-tops)
-                                                   (list 'phase-to-requires phase-to-requires)
-                                                   (list 'binding-inits binding-inits)
-                                                   (list 'templrefs templrefs)
-                                                   (list 'module-lang-requires module-lang-requires)
-                                                   (list 'requires requires)
-                                                   (list 'require-for-syntaxes require-for-syntaxes)
-                                                   (list 'require-for-templates require-for-templates)
-                                                   (list 'require-for-labels require-for-templates)
-                                                   (list 'sub-identifier-binding-directives
-                                                         sub-identifier-binding-directives)))
-                           (define vars (set))
-                           (let loop ([thing (list phase-to-varrefs phase-to-binders)])
-                             (cond
-                               [(pair? thing) (loop (car thing)) (loop (cdr thing))]
-                               [(hash? thing) (for ([(k v) (in-hash thing)])
-                                                (loop k)
-                                                (loop v))]
-                               [(free-identifier-mapping? thing)
-                                (free-identifier-mapping-for-each
-                                 thing
-                                 (λ (k v) (loop v)))]
-                               [(syntax? thing) (set! vars (set-add vars thing))]))
-                           (printf "--- vars\n")
-                           (for ([x (in-set vars)])
-                             (for ([y (in-set vars)])
-                               (printf "  ~s\n  ~s\n  ~s\n" x y (free-identifier=? x y))))
-                           (printf "--- vars\n\n")))]
-                      [else
-                       (annotate-basic sexp
-                                       user-namespace user-directory
-                                       tl-phase-to-binders
-                                       tl-phase-to-varrefs
-                                       tl-phase-to-varsets
-                                       tl-phase-to-tops
-                                       tl-binding-inits
-                                       tl-templrefs
-                                       tl-module-lang-requires
-                                       tl-phase-to-requires
-                                       tl-sub-identifier-binding-directives)]))))]
-             [expansion-completed
-              (λ ()
-                (parameterize ([current-directory (or user-directory (current-directory))]
-                               [current-load-relative-directory user-directory])
-                  (when print-extra-info?
-                    (print-extra-info (list (list 'tl-phase-to-binders tl-phase-to-binders)
-                                            (list 'tl-phase-to-varrefs tl-phase-to-varrefs)
-                                            (list 'tl-phase-to-varsets tl-phase-to-varsets)
-                                            (list 'tl-phase-to-tops tl-phase-to-tops)
-                                            (list 'tl-templrefs tl-templrefs)
-                                            (list 'tl-module-lang-requires tl-module-lang-requires)
-                                            (list 'tl-phase-to-requires tl-module-lang-requires)
-                                            (list 'tl-sub-identifier-binding-directives 
-                                                  tl-sub-identifier-binding-directives))))
-                  (annotate-variables user-namespace
-                                      user-directory
-                                      tl-phase-to-binders
-                                      tl-phase-to-varrefs
-                                      tl-phase-to-varsets
-                                      tl-phase-to-tops
-                                      tl-templrefs
-                                      tl-module-lang-requires
-                                      tl-phase-to-requires
-                                      tl-sub-identifier-binding-directives)))])
-        (values expanded-expression expansion-completed)))
-    
-    
-(define (print-extra-info stuff)
-  (for ([info (in-list stuff)])
-    (printf "~s\n" (car info))
-    (pretty-print
-     (let loop ([info (cadr info)])
-       (cond
-         [(hash? info)
-          (for/hash ([(k v) (in-hash info)])
-            (values (loop k) (loop v)))]
-         [(free-identifier-mapping? info)
-          (free-identifier-mapping-map
-           info
-           (λ (k v) (list (loop k) '=> (loop v))))]
-         [(pair? info) (cons (loop (car info)) (loop (cdr info)))]
-         [else info])))
-    (newline)))
-
-    ;; type req/tag = (make-req/tag syntax sexp boolean)
-    (define-struct req/tag (req-stx req-sexp used?))
-    
-    ;; annotate-basic : syntax 
-    ;;                  namespace
-    ;;                  string[directory]
-    ;;                  id-set (8 of them)
-    ;;                  hash-table[require-spec -> syntax] (three of them)
-    ;;               -> void
-    (define (annotate-basic stx-obj
-                            user-namespace user-directory
-                            phase-to-binders
-                            phase-to-varrefs
-                            phase-to-varsets
-                            phase-to-tops
-                            binding-inits
-                            templrefs
-                            module-lang-requires
-                            phase-to-requires
-                            sub-identifier-binding-directives)
-      
-      (let level+tail+mod-loop ([stx-obj stx-obj]
-                                [level 0]
-                                [level-of-enclosing-module 0]
-                                [tail-parent-src #f]
-                                [tail-parent-pos #f]
-                                ;; mods: (or/c #f   ; => outside a module
-                                ;;             '()  ; => inside the main module in this file
-                                ;;             '(name names ...) ; => inside some submodules 
-                                ;;                                    named by name & names
-                                [mods #f])
-          (define-values (next-tail-parent-src next-tail-parent-pos)
-            (let ([child-src (find-source-editor stx-obj)]
-                  [child-pos (syntax-position stx-obj)]
-                  [defs-text (current-annotations)])
-              (cond
-                [(and child-src child-pos defs-text)
-                 (when (and tail-parent-src tail-parent-pos)
-                   (unless (and (eq? tail-parent-src child-src)
-                                (equal? tail-parent-pos child-pos))
-                     (send defs-text syncheck:add-tail-arrow
-                           tail-parent-src (- tail-parent-pos 1)
-                           child-src (- child-pos 1))))
-                 (values child-src child-pos)]
-                [else
-                 (values tail-parent-src tail-parent-pos)])))
-          (define (sub-mods mod) (if mods (cons mod mods) '()))
-          (let* ([level-loop (λ (sexp level) (level+tail+mod-loop sexp level level-of-enclosing-module
-                                                                  #f #f
-                                                                  mods))]
-                 [tail-loop (λ (sexp) (level+tail+mod-loop sexp level level-of-enclosing-module
-                                                           next-tail-parent-src next-tail-parent-pos
-                                                           mods))]
-                 [mod-loop (λ (sexp mod) (level+tail+mod-loop sexp 0
-                                                              (+ level level-of-enclosing-module)
-                                                              #f #f
-                                                              (if mod 
-                                                                  (sub-mods mod)
-                                                                  mods)))]
-                 [loop (λ (sexp) (level+tail+mod-loop sexp level level-of-enclosing-module
-                                                      #f #f mods))]
-                 [varrefs (lookup-phase-to-mapping phase-to-varrefs
-                                                   (list (+ level level-of-enclosing-module) mods))]
-                 [varsets (lookup-phase-to-mapping phase-to-varsets
-                                                   (+ level level-of-enclosing-module))]
-                 [binders (lookup-phase-to-mapping phase-to-binders
-                                                   (+ level level-of-enclosing-module))]
-                 [tops (lookup-phase-to-mapping phase-to-tops (+ level level-of-enclosing-module))]
-                 [requires (hash-ref! phase-to-requires 
-                                      (list (+ level level-of-enclosing-module) mods)
-                                      (λ () (make-hash)))]
-                 [collect-general-info
-                  (λ (stx)
-                    (add-origins stx varrefs level-of-enclosing-module)
-                    (add-disappeared-bindings stx binders varrefs level-of-enclosing-module)
-                    (add-disappeared-uses stx varrefs level-of-enclosing-module)
-                    (add-mouse-over-tooltips stx)
-                    (add-sub-range-binders stx 
-                                           sub-identifier-binding-directives
-                                           level
-                                           level-of-enclosing-module
-                                           mods))])
-            (collect-general-info stx-obj)
-            
-            (define (list-loop/tail-last bodies)
-              (unless (null? bodies)
-                (let body-loop ([fst (car bodies)]
-                                [bodies (cdr bodies)])
-                  (cond
-                    [(null? bodies)
-                     (tail-loop fst)]
-                    [else
-                     (loop fst)
-                     (body-loop (car bodies) (cdr bodies))]))))
-            
-            (define (add-module-lang-require stx) 
-              (define key (list (syntax-source stx)
-                                (syntax-position stx)
-                                (syntax-span stx)))
-              (hash-set! module-lang-requires key #t))
-            (syntax-case* stx-obj (#%plain-lambda case-lambda if begin begin0 let-values letrec-values
-                                                  set! quote quote-syntax with-continuation-mark
-                                                  #%plain-app #%top #%plain-module-begin
-                                                  define-values define-syntaxes begin-for-syntax
-                                                  module module*
-                                                  #%require #%provide #%declare #%expression)
-              (λ (x y) (free-identifier=? x y level 0))
-              [(#%plain-lambda args bodies ...)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (add-binders (syntax args) binders #f #f level-of-enclosing-module)
-                 (list-loop/tail-last (syntax->list (syntax (bodies ...)))))]
-              [(case-lambda [argss bodiess ...]...)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (for-each
-                  (λ (args bodies)
-                    (add-binders args binders #f #f level-of-enclosing-module)
-                    (list-loop/tail-last (syntax->list bodies)))
-                  (syntax->list (syntax (argss ...)))
-                  (syntax->list (syntax ((bodiess ...) ...)))))]
-              [(if test then else)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (loop (syntax test))
-                 (tail-loop (syntax then))
-                 (tail-loop (syntax else)))]
-              [(begin bodies ...)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (list-loop/tail-last (syntax->list (syntax (bodies ...)))))]
-              
-              ;; treat a single body expression specially, since this has
-              ;; different tail behavior.
-              [(begin0 body)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (tail-loop (syntax body)))]
-              
-              [(begin0 bodies ...)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (for-each loop (syntax->list (syntax (bodies ...)))))]
-              
-              [(let-values (bindings ...) bs ...)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (for-each collect-general-info (syntax->list (syntax (bindings ...))))
-                 (with-syntax ([(((xss ...) es) ...) (syntax (bindings ...))])
-                   (for-each (λ (x es) (add-binders x binders binding-inits es 
-                                                    level-of-enclosing-module))
-                             (syntax->list (syntax ((xss ...) ...)))
-                             (syntax->list (syntax (es ...))))
-                   (for-each loop (syntax->list (syntax (es ...))))
-                   (list-loop/tail-last (syntax->list (syntax (bs ...))))))]
-              [(letrec-values (bindings ...) bs ...)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (for-each collect-general-info (syntax->list (syntax (bindings ...))))
-                 (with-syntax ([(((xss ...) es) ...) (syntax (bindings ...))])
-                   (for-each (λ (x es) (add-binders x binders binding-inits es
-                                                    level-of-enclosing-module))
-                             (syntax->list (syntax ((xss ...) ...)))
-                             (syntax->list (syntax (es ...))))
-                   (for-each loop (syntax->list (syntax (es ...))))
-                   (list-loop/tail-last (syntax->list (syntax (bs ...))))))]
-              [(set! var e)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 
-                 ;; tops are used here because a binding free use of a set!'d variable
-                 ;; is treated just the same as (#%top . x).
-                 (add-id varsets (syntax var) level-of-enclosing-module)
-                 (if (identifier-binding (syntax var) 0)
-                     (add-id varrefs (syntax var) level-of-enclosing-module)
-                     (add-id tops (syntax var) level-of-enclosing-module))
-                 
-                 (loop (syntax e)))]
-              [(quote datum)
-               (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)]
-              [(quote-syntax datum)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (let loop ([stx #'datum])
-                   (cond [(identifier? stx)
-                          (add-id templrefs stx level-of-enclosing-module)]
-                         [(syntax? stx)
-                          (loop (syntax-e stx))]
-                         [(pair? stx)
-                          (loop (car stx))
-                          (loop (cdr stx))]
-                         [(vector? stx)
-                          (for-each loop (vector->list stx))]
-                         [(box? stx)
-                          (loop (unbox stx))]
-                         [else (void)])))]
-              [(with-continuation-mark a b c)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (loop (syntax a))
-                 (loop (syntax b))
-                 (tail-loop (syntax c)))]
-              [(#%plain-app pieces ...)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (for-each loop (syntax->list (syntax (pieces ...)))))]
-              [(#%top . var)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (add-id tops (syntax var) level-of-enclosing-module))]
-              [(define-values vars b)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (add-binders (syntax vars) binders binding-inits #'b level-of-enclosing-module)
-                 (add-definition-target (syntax vars) mods)
-                 (loop (syntax b)))]
-              [(define-syntaxes names exp)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (add-binders (syntax names) binders binding-inits #'exp level-of-enclosing-module)
-                 (add-definition-target (syntax names) mods)
-                 (level-loop (syntax exp) (+ level 1)))]
-              [(begin-for-syntax exp ...)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (for ([e (in-list (syntax->list (syntax (exp ...))))])
-                   (level-loop e (+ level 1))))]
-              [(module m-name lang (#%plain-module-begin bodies ...))
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (add-module-lang-require (syntax lang))
-                 (annotate-require-open user-namespace user-directory (syntax lang))
-                 (define module-name (syntax-e #'m-name))
-                 (define sub-requires
-                   (hash-ref! phase-to-requires 
-                              (list (+ level level-of-enclosing-module) (sub-mods module-name))
-                              (λ () (make-hash))))
-                 (hash-cons! sub-requires (syntax->datum (syntax lang)) (syntax lang))
-                 (for ([body (in-list (syntax->list (syntax (bodies ...))))])
-                   (mod-loop body module-name)))]
-              [(module* m-name lang (#%plain-module-begin bodies ...))
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (define module-name (syntax-e #'m-name))
-                 (when (syntax-e #'lang)
-                   (add-module-lang-require (syntax lang))
-                   (annotate-require-open user-namespace user-directory (syntax lang))
-                   (define sub-requires
-                     (hash-ref! phase-to-requires 
-                                (list (+ level level-of-enclosing-module) (sub-mods module-name))
-                                (λ () (make-hash))))
-                   (hash-cons! sub-requires (syntax->datum (syntax lang)) (syntax lang)))
-                 
-                 (for ([body (in-list (syntax->list (syntax (bodies ...))))])
-                   (if (syntax-e #'lang)
-                       (mod-loop body module-name)
-                       (mod-loop body #f))))]
-              
-              
-              ; top level or module top level only:
-              [(#%require raw-require-specs ...)
-               (let ()
-                 (define (handle-raw-require-spec spec)
-                   (let loop ([spec spec]
-                              [level level])
-                     (define (add-to-level n) (and n level (+ n level)))
-                     (syntax-case* spec (for-meta for-syntax for-template for-label just-meta)
-                       symbolic-compare?
-                       [(for-meta phase specs ...)
-                        (for ([spec (in-list (syntax->list #'(specs ...)))])
-                          (loop spec (add-to-level (syntax-e #'phase))))]
-                       [(for-syntax specs ...)
-                        (for ([spec (in-list (syntax->list #'(specs ...)))])
-                          (loop spec (add-to-level 1)))]
-                       [(for-template specs ...)
-                        (for ([spec (in-list (syntax->list #'(specs ...)))])
-                          (loop spec (add-to-level -1)))]
-                       [(for-label specs ...)
-                        (for ([spec (in-list (syntax->list #'(specs ...)))])
-                          (loop spec #f))]
-                       [(just-meta phase specs ...)
-                        (for ([spec (in-list (syntax->list #'(specs ...)))])
-                          (handle-phaseless-spec spec (add-to-level (syntax-e #'phase))))]
-                       [else
-                        (handle-phaseless-spec spec level)])))
-                 (define (handle-phaseless-spec stx level)
-                   (define adjusted-level (and level (+ level level-of-enclosing-module)))
-                   (define require-ht (hash-ref! phase-to-requires
-                                                 (list adjusted-level mods)
-                                                 (λ () (make-hash))))
-                   (define raw-module-path (phaseless-spec->raw-module-path stx))
-                   (annotate-require-open user-namespace user-directory raw-module-path)
-                   (when (original-enough? raw-module-path)
-                     (define key (syntax->datum raw-module-path))
-                     (hash-set! require-ht
-                                key
-                                (cons stx (hash-ref require-ht key '())))))
-                 
-                 (for ([spec (in-list (syntax->list #'(raw-require-specs ...)))])
-                   (handle-raw-require-spec spec)))]
-              
-              ; module top level only:
-              [(#%provide provide-specs ...)
-               (let ([provided-varss (map extract-provided-vars
-                                          (syntax->list (syntax (provide-specs ...))))])
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (for ([provided-vars (in-list provided-varss)])
-                   (for ([provided-var (in-list provided-vars)])
-                     (add-id varrefs provided-var level-of-enclosing-module))))]
-
-              ; module top level only:
-              [(#%declare declare-specs ...)
-               (void)]
-              
-              [(#%expression arg)
-               (begin
-                 (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
-                 (tail-loop #'arg))]
-              [id
-               (identifier? (syntax id))
-               (add-id varrefs stx-obj level-of-enclosing-module)]
-              [_
-               (begin
-                 #;
-                 (printf "unknown stx: ~.s datum: ~e source: ~e\n"
-                         sexp
-                         (and (syntax? sexp)
-                              (syntax->datum sexp))
-                         (and (syntax? sexp)
-                              (syntax-source sexp)))
-                 (void))]))))
-    
-    (define (hash-cons! ht k v)
-      (hash-set! ht k (cons v (hash-ref ht k '()))))
-
-    (define sub-range-binder-prop?
-      (vector/c #:flat? #t
-                syntax? exact-nonnegative-integer? exact-nonnegative-integer?
-                syntax? exact-nonnegative-integer? exact-nonnegative-integer?))
-    (define (add-sub-range-binders stx 
-                                   sub-identifier-binding-directives 
-                                   level
-                                   level-of-enclosing-module
-                                   mods)
-      (let loop ([prop (syntax-property stx 'sub-range-binders)])
-        (cond
-          [(pair? prop)
-           (loop (car prop))
-           (loop (cdr prop))]
-          [(sub-range-binder-prop? prop) 
-           (define new-entry
-             (vector (syntax-shift-phase-level (vector-ref prop 0) level-of-enclosing-module)
-                     (vector-ref prop 1)
-                     (vector-ref prop 2)
-                     (syntax-shift-phase-level (vector-ref prop 3) level-of-enclosing-module)
-                     (vector-ref prop 4)
-                     (vector-ref prop 5)))
-           (define key (list level mods)) 
-           (hash-set! sub-identifier-binding-directives
-                      key
-                      (cons new-entry
-                            (hash-ref sub-identifier-binding-directives key '())))]
-          [(vector? prop)
-           (log-check-syntax-debug
-            "found a vector in a 'sub-range-binders property that is ill-formed ~s"
-            prop)])))
-
-(define mouse-over-tooltip-prop?
-  (vector/c #:flat? #t syntax? exact-nonnegative-integer? exact-nonnegative-integer?
-            (or/c string?
-                  ;; don't check the range here, since we want a predicate, not really a contract
-                  (-> any))))
-(define (add-mouse-over-tooltips stx)
-  (let loop ([prop (syntax-property stx 'mouse-over-tooltips)])
-    (cond
-      [(pair? prop)
-       (loop (car prop))
-       (loop (cdr prop))]
-      [(mouse-over-tooltip-prop? prop)
-       (add-mouse-over/loc (find-source-editor (vector-ref prop 0))
-                           (vector-ref prop 1)
-                           (vector-ref prop 2)
-                           (vector-ref prop 3))])))
-
-    ;; add-disappeared-bindings : syntax id-set integer -> void
-    (define (add-disappeared-bindings stx binders disappaeared-uses level-of-enclosing-module)
-      (let ([prop (syntax-property stx 'disappeared-binding)])
-        (when prop
-          (let loop ([prop prop])
-            (cond
-              [(pair? prop)
-               (loop (car prop))
-               (loop (cdr prop))]
-              [(identifier? prop)
-               (add-origins prop disappaeared-uses level-of-enclosing-module)
-               (add-id binders prop level-of-enclosing-module)])))))
-    
-    ;; add-disappeared-uses : syntax id-set integer -> void
-    (define (add-disappeared-uses stx id-set level-of-enclosing-module)
-      (let ([prop (syntax-property stx 'disappeared-use)])
-        (when prop
-          (let loop ([prop prop])
-            (cond
-              [(pair? prop)
-               (loop (car prop))
-               (loop (cdr prop))]
-              [(identifier? prop)
-               (add-id id-set prop level-of-enclosing-module)])))))
-    
-    ;; annotate-variables : namespace directory string id-set[four of them] 
-    ;;                      (listof syntax) (listof syntax) 
-    ;;                      hash[phase -o> sub-identifier-binding-directive]
-    ;;                   -> void
-    ;; colors in and draws arrows for variables, according to their classifications
-    ;; in the various id-sets
-    (define (annotate-variables user-namespace
-                                user-directory
-                                phase-to-binders
-                                phase-to-varrefs
-                                phase-to-varsets
-                                phase-to-tops
-                                templrefs
-                                module-lang-requires
-                                phase-to-requires
-                                sub-identifier-binding-directives)
-      
-      (define unused/phases (make-hash))
-
-      ;; hash[(list (list src pos pos) (list src pos pos)) -o> #t
-      ;;       above indicates if this arrow has been recorded
-      ;;       below indicates the number of defs and uses at this spot
-      ;;      (list src pos pos) -o> (cons number number)]
-      (define connections (make-hash))
-
-      (for ([(level+mods requires) (in-hash phase-to-requires)])
-        (define new-hash (make-hash))
-        (hash-set! unused/phases level+mods new-hash)
-        (for ([(k v) (in-hash requires)])
-          (hash-set! new-hash k #t)))
-      
-      (for ([(level binders) (in-hash phase-to-binders)])
-        (for ([vars (in-list (get-idss binders))])
-          (for ([var (in-list vars)])
-            (define varset (lookup-phase-to-mapping phase-to-varsets level))
-            (color-variable var 0 varset)
-            (document-variable var 0))))
-      
-      (for ([(level+mods varrefs) (in-hash phase-to-varrefs)])
-        (define level (list-ref level+mods 0))
-        (define mods (list-ref level+mods 1))
-        (define binders (lookup-phase-to-mapping phase-to-binders level))
-        (define varsets (lookup-phase-to-mapping phase-to-varsets level)) 
-        (for ([vars (in-list (get-idss varrefs))])
-          (for ([var (in-list vars)])
-            (color-variable var level varsets)
-            (document-variable var level)
-            (connect-identifier var
-                                mods
-                                binders
-                                unused/phases
-                                phase-to-requires
-                                level
-                                user-namespace 
-                                user-directory
-                                #t
-                                connections))))
-      
-      
-      ;; build a set of all of the known phases
-      (define phases (set))
-      (define all-mods (set))
-      (for ([(phase _) (in-hash phase-to-binders)])
-        (set! phases (set-add phases phase)))
-      (for ([(phase+mod _) (in-hash phase-to-requires)])
-        (define phase (list-ref phase+mod 0))
-        (define mod (list-ref phase+mod 1))
-        (set! phases (set-add phases phase))
-        (set! all-mods (set-add all-mods mod)))
-      
-      (for ([vars (in-list (get-idss templrefs))])
-        (for ([var (in-list vars)])
-          
-          ;; connect every identifier inside a quote-syntax to
-          ;; each binder, at any phase, in any submodule
-          (for* ([phase (in-set phases)]
-                 [mod (in-set all-mods)])
-            (document-variable var phase)
-            (connect-identifier var
-                                mod
-                                (lookup-phase-to-mapping phase-to-binders phase)
-                                unused/phases
-                                phase-to-requires
-                                phase
-                                user-namespace
-                                user-directory
-                                #f
-                                connections))))
-      
-      (for ([(level tops) (in-hash phase-to-tops)])
-        (define binders (lookup-phase-to-mapping phase-to-binders level))
-        (for ([vars (in-list (get-idss tops))])
-          (for ([var (in-list vars)])
-            (color/connect-top user-namespace user-directory binders var connections))))
-      
-      (for ([(phase+mods require-hash) (in-hash phase-to-requires)])
-        (define unused-hash (hash-ref unused/phases phase+mods))
-        (color-unused require-hash unused-hash module-lang-requires))
-      
-      (annotate-counts connections)
-      
-      (for ([(level+mods directives) (in-hash sub-identifier-binding-directives)])
-        (define phase-level (list-ref level+mods 0))
-        (define mods (list-ref level+mods 1))
-        (for ([directive (in-list directives)])
-          (match-define (vector binding-id to-start to-span new-binding-id from-start from-span)
-            directive)
-          (define all-varrefs (lookup-phase-to-mapping phase-to-varrefs (list phase-level mods)))
-          (define all-binders (lookup-phase-to-mapping phase-to-binders phase-level))
-          (define varrefs (get-ids all-varrefs binding-id))
-          (when varrefs
-            (for ([varref (in-list varrefs)])
-              (connect-syntaxes new-binding-id varref #t all-binders 
-                                (id-level phase-level new-binding-id)
-                                connections #f
-                                #:from-start from-start #:from-width from-span
-                                #:to-start to-start #:to-width to-span))))))
-    
-    ;; color-unused : hash-table[sexp -o> syntax] hash-table[sexp -o> #f] hash-table[syntax -o> #t]
-    ;;             -> void
-    (define (color-unused requires unused module-lang-requires)
-      (for ([(k v) (in-hash unused)])
-        (define requires-stxes
-          (hash-ref requires k
-                    (λ ()
-                      (error 'syncheck/traversals.rkt 
-                             "requires doesn't have a mapping for ~s"
-                             k))))
-        (for ([stx (in-list requires-stxes)])
-          (unless (hash-ref module-lang-requires (list (syntax-source stx)
-                                                       (syntax-position stx)
-                                                       (syntax-span stx)) #f)
-            (define defs-text (current-annotations))
-            (define source-editor (find-source-editor stx))
-            (when (and defs-text source-editor)
-              (define pos (syntax-position stx))
-              (define span (syntax-span stx))
-              (when (and pos span)
-                (define start (- pos 1))
-                (define fin (+ start span))
-                (send defs-text syncheck:add-background-color
-                      source-editor start fin "firebrick")))
-            (color stx unused-require-style-name)))))
-    
-    ;; id-level : integer-or-#f-or-'lexical identifier -> symbol
-    (define (id-level phase-level id)
-      (let ([binding (identifier-binding id phase-level)])
-        (cond [(list? binding)
-               (if (self-module? (car binding))
-                   'top-level
-                   'imported)]
-              [(eq? binding 'lexical) 'lexical]
-              [else 'top-level])))
-    
-    (define (self-module? mpi)
-      (let-values ([(a b) (module-path-index-split mpi)])
-        (and (not a) (not b))))
-    
-    ;; connect-identifier : syntax
-    ;;                      (or/c #f (listof symbol)) -- name of enclosing sub-modules
-    ;;                      id-set 
-    ;;                      (union #f hash-table)
-    ;;                      (union #f hash-table)
-    ;;                      (union identifier-binding identifier-transformer-binding)
-    ;;                      boolean
-    ;;                      connections-table (see its defn)
-    ;;                   -> void
-    ;; adds the arrows that correspond to binders/bindings
-    (define (connect-identifier var mods all-binders unused/phases phase-to-requires
-                                phase-level user-namespace user-directory actual?
-                                connections)
-      (define binders (get-ids all-binders var))
-      (when binders
-        (for ([x (in-list binders)])
-          (connect-syntaxes x var actual? all-binders (id-level phase-level x) connections #f)))
-      
-      (when (and unused/phases phase-to-requires)
-        (define req-path/pr (get-module-req-path var phase-level))
-        (define source-req-path/pr (get-module-req-path var phase-level #:nominal? #f))
-        (when (and req-path/pr source-req-path/pr)
-          (define req-path (list-ref req-path/pr 0))
-          (define id (list-ref req-path/pr 1))
-          (define source-req-path (list-ref source-req-path/pr 3))
-          (define source-id (list-ref source-req-path/pr 1))
-          (define req-phase-level (list-ref req-path/pr 2))
-          (define require-hash-key (list req-phase-level mods))
-          (define require-ht (hash-ref phase-to-requires require-hash-key #f))
-          (when require-ht
-            (define req-stxes (hash-ref require-ht req-path #f))
-            (when req-stxes
-              (define unused (hash-ref unused/phases require-hash-key #f))
-              (when unused (hash-remove! unused req-path))
-              (for ([req-stx (in-list req-stxes)])
-                (when (id/require-match? (syntax->datum var)
-                                         id
-                                         (syntax->datum req-stx))
-                  (when id
-                    (define-values (filename submods) 
-                      (get-require-filename source-req-path user-namespace user-directory))
-                    (when filename
-                      (add-jump-to-definition
-                       var
-                       source-id
-                       filename
-                       submods)))
-                  (define raw-module-path (phaseless-spec->raw-module-path req-stx))
-                  (add-mouse-over var
-                                  (format
-                                   (string-constant cs-mouse-over-import)
-                                   (syntax-e var)
-                                   req-path))
-                  (connect-syntaxes (if (syntax-source raw-module-path)
-                                        raw-module-path
-                                        req-stx)
-                                    var actual? all-binders
-                                    (id-level phase-level var)
-                                    connections
-                                    #t))))))))
-             
-    (define (id/require-match? var id req-stx)
-      (match req-stx
-        [`(only ,_ . ,ids)
-         (and (memq id ids)
-              (eq? var id))]
-        [`(prefix ,prefix ,_)
-         (equal? (format "~a~a" prefix id)
-                 (symbol->string var))]
-        [`(all-except ,_ . ,ids)
-         (and (eq? var id)
-              (not (member var ids)))]
-        [`(prefix-all-except ,prefix ,_ . ,rest)
-         (and (not (memq id rest))
-              (equal? (format "~a~a" prefix id)
-                      (symbol->string var)))]
-        [`(rename ,_ ,local-id ,exported-id)
-         (eq? local-id var)]
-        [else (eq? var id)]))
-    
-    (define (phaseless-spec->raw-module-path stx)
-      (syntax-case* stx (only prefix all-except prefix-all-except rename) symbolic-compare?
-        [(only raw-module-path id ...) #'raw-module-path]
-        [(prefix prefix-id raw-module-path) #'raw-module-path]
-        [(all-except raw-module-path id ...) #'raw-module-path]
-        [(prefix-all-except prefix-id raw-module-path id ...) #'raw-module-path]
-        [(rename raw-module-path local-id exported-id) #'raw-module-path]
-        [_ stx]))
-    
-    
-    ;; get-module-req-path : identifier number [#:nominal? boolean] 
-    ;;                    -> (union #f (list require-sexp sym ?? module-path))
-    (define (get-module-req-path var phase-level #:nominal? [nominal-source-path? #t])
-      (define binding (identifier-binding var phase-level))
-      (and (pair? binding)
-           (or (not (number? phase-level))
-               (= phase-level
-                  (+ (list-ref binding 5)
-                     (list-ref binding 6))))
-           (let ([mod-path (if nominal-source-path? (list-ref binding 2) (list-ref binding 0))])
-             (cond
-               [(module-path-index? mod-path)
-                (let-values ([(base offset) (module-path-index-split mod-path)])
-                  (list base
-                        (if nominal-source-path? (list-ref binding 3) (list-ref binding 1))
-                        (list-ref binding 5)
-                        mod-path))]
-               [(symbol? mod-path)
-                (list mod-path 
-                      (if nominal-source-path? (list-ref binding 3) (list-ref binding 1))
-                      (list-ref binding 5)
-                      mod-path)]
-               [else #f]))))
-    
-    ;; color/connect-top : namespace directory id-set syntax connections[see defn for ctc] -> void
-    (define (color/connect-top user-namespace user-directory binders var connections)
-      (let ([top-bound?
-             (or (get-ids binders var)
-                 (parameterize ([current-namespace user-namespace])
-                   (let/ec k
-                     (namespace-variable-value (syntax-e var) #t (λ () (k #f)))
-                     #t)))])
-        (cond
-          [top-bound?
-           (color var lexically-bound-variable-style-name)]
-          [else
-           (add-mouse-over var (format "~s is a free variable" (syntax-e var)))
-           (color var free-variable-style-name)])
-        (connect-identifier var #f binders #f #f 0 user-namespace user-directory #t connections)))
-    
-    ;; annotate-counts : connections[see defn] -> void
-    ;; this function doesn't try to show the number of uses at
-    ;; a use site, as it is not obvious how to compute that.
-    ;; in particular, you could think of following arrows from
-    ;; the use site back to the definition and then counting
-    ;; the number of arrows originating there, but consider this example:
-    ;; (define-syntax-rule (m x y z)
-    ;;   (list (let ([y 1]) x x)
-    ;;         (let ([z 1]) x)))
-    ;; (m w w w)
-    ;; if you do that here, then which def site do you pick?
-    ;; and note that picking both of them leads to double counting
-    ;; it seems possible to have a different datastructure (one that
-    ;; records the src locs of each 'end' position of each arrow)
-    ;; to do this, but maybe lets leave that for another day.
-    (define (annotate-counts connections)
-      (for ([(key val) (in-hash connections)])
-        (when (pair? val) 
-          (define start (car val))
-          (define end (cdr val))
-          (define (show-starts)
-            (add-mouse-over/loc (list-ref key 0) (list-ref key 1) (list-ref key 2)
-                                (cond
-                                  [(zero? start)
-                                   (string-constant cs-zero-varrefs)]
-                                  [(= 1 start)
-                                   (string-constant cs-one-varref)]
-                                  [else
-                                   (format (string-constant cs-n-varrefs) start)])))
-          (define (show-ends)
-            (unless (= 1 end)
-              (add-mouse-over/loc (list-ref key 0) (list-ref key 1) (list-ref key 2)
-                                  (format (string-constant cs-binder-count) end))))
-          (cond
-            [(zero? end)   ;; assume this is a binder, show uses
-             (show-starts)]
-            [(zero? start) ;; assume this is a use, show bindings (usually just one, so do nothing)
-             (show-ends)]
-            [else          ;; crazyness, show both
-             (show-starts)
-             (show-ends)]))))
-    
-    ;; color-variable : syntax phase-level identifier-mapping -> void
-    (define (color-variable var phase-level varsets)
-      (define b (identifier-binding var phase-level))
-      (define lexical? (is-lexical? b))
-      (cond
-        [(get-ids varsets var)
-         (add-mouse-over var (string-constant cs-set!d-variable))
-         (color var set!d-variable-style-name)]
-        [lexical? (color var lexically-bound-variable-style-name)]
-        [(pair? b) (color var imported-variable-style-name)]))
-    
-    (define (is-lexical? b)
-      (or (not b)
-          (eq? b 'lexical)
-          (and (pair? b)
-               (let ([path (caddr b)])
-                 (and (module-path-index? path)
-                      (self-module? path))))))
-    
-    ;; connect-syntaxes : syntax[original] syntax[original] boolean symbol connections -> void
-    ;; adds an arrow from `from' to `to', unless they have the same source loc. 
-    (define (connect-syntaxes from to actual? all-binders level connections require-arrow?
-                              #:from-start [from-start 0] 
-                              #:from-width [from-width (syntax-span from)]
-                              #:to-start [to-start 0] 
-                              #:to-width [to-width (syntax-span to)])
-      (let ([from-source (find-source-editor from)] 
-            [to-source (find-source-editor to)]
-            [defs-text (current-annotations)])
-        (when (and from-source to-source defs-text)
-          (let ([pos-from (syntax-position from)]
-                [span-from (syntax-span from)]
-                [pos-to (syntax-position to)]
-                [span-to (syntax-span to)])
-            (when (and pos-from span-from pos-to span-to)
-              (let* ([from-pos-left (+ (syntax-position from) -1 from-start)]
-                     [from-pos-right (+ from-pos-left from-width)]
-                     [to-pos-left (+ (syntax-position to) -1 to-start)]
-                     [to-pos-right (+ to-pos-left to-width)])
-                (unless (= from-pos-left to-pos-left)
-                  (define connections-start (list from-source from-pos-left from-pos-right))
-                  (define connections-end (list to-source to-pos-left to-pos-right))
-                  (define connections-key (list connections-start connections-end))
-                  (unless (hash-ref connections connections-key #f)
-                    (hash-set! connections connections-key #t)
-                    (define start-before (or (hash-ref connections connections-start #f) (cons 0 0)))
-                    (define end-before (or (hash-ref connections connections-end #f) (cons 0 0)))
-                    (hash-set! connections connections-start (cons (+ (car start-before) 1) 
-                                                                   (cdr start-before)))
-                    (hash-set! connections connections-end (cons (car end-before)
-                                                                 (+ 1 (cdr end-before)))))
-                  (define (name-dup? str)
-                    (define sym (string->symbol str))
-                    (define id1 (datum->syntax from sym))
-                    (define id2 (datum->syntax to sym)) ;; do I need both?
-                    (define ans #f)
-                    (for-each-ids 
-                     all-binders
-                     (λ (ids)
-                       (set! ans (or ans
-                                     (for/or ([id (in-list ids)])
-                                       (or (free-identifier=? id1 id)
-                                           (free-identifier=? id2 id)))))))
-                    ans)
-                  (send defs-text syncheck:add-arrow/name-dup
-                        from-source from-pos-left from-pos-right
-                        to-source to-pos-left to-pos-right
-                        actual? level require-arrow? name-dup?))))))))
-    
-    ;; add-jump-to-definition : syntax symbol path -> void
-    ;; registers the range in the editor so that the
-    ;; popup menu in this area allows the programmer to jump
-    ;; to the definition of the id.
-    (define (add-jump-to-definition stx id filename submods)
-      (let ([source (find-source-editor stx)]
-            [defs-text (current-annotations)])
-        (when (and source 
-                   defs-text
-                   (syntax-position stx)
-                   (syntax-span stx))
-          (let* ([pos-left (- (syntax-position stx) 1)]
-                 [pos-right (+ pos-left (syntax-span stx))])
-            (send defs-text syncheck:add-jump-to-definition
-                  source
-                  pos-left
-                  pos-right
-                  id
-                  filename
-                  submods)))))
-    
-    ;; annotate-require-open : namespace string -> (stx -> void)
-    ;; relies on current-module-name-resolver, which in turn depends on
-    ;; current-directory and current-namespace
-    (define (annotate-require-open user-namespace user-directory require-spec)
-      (when (original-enough? require-spec)
-        (define source (find-source-editor require-spec))
-        (when (and source
-                   (syntax-position require-spec)
-                   (syntax-span require-spec))
-          (define defs-text (current-annotations))
-          (when defs-text
-            (define start (- (syntax-position require-spec) 1))
-            (define end (+ start (syntax-span require-spec)))
-            (define-values (file submods)
-              (get-require-filename (syntax->datum require-spec)
-                                    user-namespace
-                                    user-directory))
-            (when file
-              (send defs-text syncheck:add-require-open-menu
-                    source start end file))))))
-    
-    ;; get-require-filename : sexp-or-module-path-index namespace string[directory] -> filename or #f
-    ;; finds the filename corresponding to the require in stx
-    (define (get-require-filename datum user-namespace user-directory)
-      (parameterize ([current-namespace user-namespace]
-                     [current-directory (or user-directory (current-directory))]
-                     [current-load-relative-directory user-directory])
-        (define mpi
-          (with-handlers ([exn:fail? (λ (x) #f)])
-            (cond
-              [(module-path-index? datum)
-               (module-path-index-resolve datum)]
-              [else
-               ((current-module-name-resolver) datum #f #f #t)])))
-        (define rkt-path/mod-path (and mpi (resolved-module-path-name mpi)))
-        (define rkt-path/f (cond
-                             [(path? rkt-path/mod-path) rkt-path/mod-path]
-                             [(and (pair? rkt-path/mod-path)
-                                   (path? (car rkt-path/mod-path)))
-                              (car rkt-path/mod-path)]
-                             [else #f]))
-        (define rkt-submods (cond
-                              [(not rkt-path/mod-path) #f]
-                              [(or (symbol? rkt-path/mod-path) (path? rkt-path/mod-path)) '()]
-                              [(pair? rkt-path/mod-path) (cdr rkt-path/mod-path)]))
-        (define cleaned-up-path
-          (let/ec k
-            (unless (path? rkt-path/f) (k rkt-path/f))
-            (when (file-exists? rkt-path/f) (k rkt-path/f))
-            (let* ([bts (path->bytes rkt-path/f)]
-                   [len (bytes-length bts)])
-              (unless (and (len . >= . 4) 
-                           (bytes=? #".rkt" (subbytes bts (- len 4))))
-                (k rkt-path/f))
-              (let ([ss-path (bytes->path (bytes-append (subbytes bts 0 (- len 4)) #".ss"))])
-                (unless (file-exists? ss-path)
-                  (k rkt-path/f))
-                ss-path))))
-        (values cleaned-up-path rkt-submods)))
-    
-    ;; possible-suffixes : (listof string)
-    ;; these are the suffixes that are checked for the reverse
-    ;; module-path mapping.
-    (define possible-suffixes '(".rkt" ".ss" ".scm" ""))
-    
-    ;; module-name-sym->filename : symbol -> (union #f string)
-    (define (module-name-sym->filename sym)
-      (let ([str (symbol->string sym)])
-        (and ((string-length str) . > . 1)
-             (char=? (string-ref str 0) #\,)
-             (let ([fn (substring str 1 (string-length str))])
-               (ormap (λ (x)
-                        (let ([test (string->path (string-append fn x))])
-                          (and (file-exists? test)
-                               test)))
-                      possible-suffixes)))))
-    
-    ;; add-origins : sexp id-set integer -> void
-    (define (add-origins sexp id-set level-of-enclosing-module)
-      (let ([origin (syntax-property sexp 'origin)])
-        (when origin
-          (let loop ([ct origin])
-            (cond
-              [(pair? ct)
-               (loop (car ct))
-               (loop (cdr ct))]
-              [(syntax? ct)
-               (add-id id-set ct level-of-enclosing-module)]
-              [else (void)])))))
-    
-    ;; FIXME: handle for-template and for-label
-    ;; extract-provided-vars : syntax -> (listof syntax[identifier])
-    (define (extract-provided-vars stx)
-      (syntax-case* stx (rename struct all-from all-from-except all-defined-except) symbolic-compare?
-        [identifier
-         (identifier? (syntax identifier))
-         (list (syntax identifier))]
-        
-        [(rename local-identifier export-identifier)
-         (list (syntax local-identifier))]
-        
-        ;; why do I even see this?!?
-        [(struct struct-identifier (field-identifier ...))
-         null]
-        
-        [(all-from module-name) null]
-        [(all-from-except module-name identifier ...)
-         null]
-        [(all-defined-except identifier ...)
-         (syntax->list #'(identifier ...))]
-        [_
-         null]))
-    
-    
-    ;; trim-require-prefix : syntax -> syntax
-    (define (trim-require-prefix require-spec)
-      (syntax-case* require-spec (only prefix all-except prefix-all-except rename just-meta) 
-        symbolic-compare?
-        [(only module-name identifier ...)
-         (syntax module-name)]
-        [(prefix identifier module-name)
-         (syntax module-name)]
-        [(all-except module-name identifier ...)
-         (syntax module-name)]
-        [(prefix-all-except module-name identifier ...)
-         (syntax module-name)]
-        [(rename module-name local-identifier exported-identifier)
-         (syntax module-name)]
-        [_ require-spec]))
-    
-    (define (symbolic-compare? x y) (eq? (syntax-e x) (syntax-e y)))
-    
-    ;; add-binders : syntax id-set (or/c #f id-set) (or/c #f syntax) integer -> void
-    ;; transforms an argument list into a bunch of symbols/symbols
-    ;; and puts them into the id-set
-    ;; effect: colors the identifiers
-    (define (add-binders stx id-set binding-to-init init-exp level-of-enclosing-module)
-      (let loop ([stx stx])
-        (let ([e (if (syntax? stx) (syntax-e stx) stx)])
-          (cond
-            [(cons? e)
-             (let ([fst (car e)]
-                   [rst (cdr e)])
-               (if (syntax? fst)
-                   (begin
-                     (when binding-to-init
-                       (add-init-exp binding-to-init fst init-exp))
-                     (add-id id-set fst level-of-enclosing-module)
-                     (loop rst))
-                   (loop rst)))]
-            [(null? e) (void)]
-            [else
-             (when binding-to-init
-               (add-init-exp binding-to-init stx init-exp))
-             (add-id id-set stx level-of-enclosing-module)]))))
-    
-    ;; add-definition-target : syntax[(sequence of identifiers)] (listof symbol) -> void
-    (define (add-definition-target stx mods)
-      (when mods
-        (define defs-text (current-annotations))
-        (for ([id (in-list (syntax->list stx))])
-          (define source (syntax-source id))
-          (when (and source
-                     defs-text
-                     (syntax-position id)
-                     (syntax-span id))
-            (let* ([pos-left (- (syntax-position id) 1)]
-                   [pos-right (+ pos-left (syntax-span id))])
-              (send defs-text syncheck:add-definition-target
-                    source
-                    pos-left
-                    pos-right
-                    (syntax-e id)
-                    mods))))))
-    
-    ;; annotate-raw-keyword : syntax id-map integer -> void
-    ;; annotates keywords when they were never expanded. eg.
-    ;; if someone just types `(λ (x) x)' it has no 'origin
-    ;; field, but there still are keywords.
-    (define (annotate-raw-keyword stx id-map level-of-enclosing-module)
-      (let ([lst (syntax-e stx)])
-        (when (pair? lst)
-          (let ([f-stx (car lst)])
-            (when (identifier? f-stx)
-              (add-id id-map f-stx level-of-enclosing-module))))))
-    
-;                                                                                             
-;                                                                                             
-;       ;                                                                                     
-;       ;                                                                   ;                 
-;       ;                                             ;             ;                         
-;    ;; ;   ;;;    ;;;;  ;   ; ; ;; ;;  ;;;   ; ;;   ;;;;;  ;;;;   ;;;;;  ;;;     ;;;   ; ;;  
-;   ;  ;;  ;   ;  ;      ;   ; ;; ;; ; ;   ;  ;;  ;   ;         ;   ;       ;    ;   ;  ;;  ; 
-;   ;   ;  ;   ;  ;      ;   ; ;  ;  ; ;   ;  ;   ;   ;         ;   ;       ;    ;   ;  ;   ; 
-;   ;   ;  ;   ;  ;      ;   ; ;  ;  ; ;;;;;  ;   ;   ;      ;;;;   ;       ;    ;   ;  ;   ; 
-;   ;   ;  ;   ;  ;      ;   ; ;  ;  ; ;      ;   ;   ;     ;   ;   ;       ;    ;   ;  ;   ; 
-;   ;  ;;  ;   ;  ;      ;  ;; ;  ;  ; ;      ;   ;   ;     ;  ;;   ;       ;    ;   ;  ;   ; 
-;    ;; ;   ;;;    ;;;;   ;; ; ;  ;  ;  ;;;;  ;   ;    ;;;   ;;  ;   ;;;    ;     ;;;   ;   ; 
-;                                                                                             
-;                                                                                             
-;                                                                                             
-
-    
-    ;; document-variable : stx[identifier,original] phase-level -> void
-    (define (document-variable stx phase-level)
-      (define defs-text (current-annotations))
-      (when defs-text
-        (define binding-info (identifier-binding stx phase-level))
-        (when (and (pair? binding-info)
-                   (syntax-position stx)
-                   (syntax-span stx))
-          (define start (- (syntax-position stx) 1))
-          (define fin (+ start (syntax-span stx)))
-          (define source-editor (find-source-editor stx))
-          (when source-editor
-            (define info (get-index-entry-info binding-info))
-            (when info
-              (define-values (entry-desc path definition-tag tag) (apply values info))
-              (send defs-text syncheck:add-background-color
-                    source-editor start fin 
-                    "palegreen")
-              (send defs-text syncheck:add-docs-menu
-                    source-editor
-                    start 
-                    fin 
-                    (syntax-e stx)
-                    (build-docs-label entry-desc)
-                    path
-                    definition-tag
-                    tag))))))
-    
-    (define (build-docs-label entry-desc)
-      (let ([libs (exported-index-desc-from-libs entry-desc)])
-        (cond
-          [(null? libs)
-           (format
-            (string-constant cs-view-docs)
-            (exported-index-desc-name entry-desc))]
-          [else
-           (format
-            (string-constant cs-view-docs-from)
-            (format 
-             (string-constant cs-view-docs)
-             (exported-index-desc-name entry-desc))
-            (apply string-append 
-                   (add-between 
-                    (map (λ (x) (format "~s" x)) libs) 
-                    ", ")))])))
-
-    
-    ;                                            
-    ;                                            
-    ;                                            
-    ;   ;       ;                                
-    ;           ;                                
-    ;           ;                     ;          
-    ;   ;    ;; ;        ;;;    ;;;  ;;;;   ;;;  
-    ;   ;   ;  ;;       ;      ;   ;  ;    ;     
-    ;   ;  ;    ;       ;;    ;    ;  ;    ;;    
-    ;   ;  ;    ;        ;;   ;;;;;;  ;     ;;   
-    ;   ;  ;    ;          ;  ;       ;       ;  
-    ;   ;   ;  ;;          ;   ;      ;       ;  
-    ;   ;    ;; ;       ;;;     ;;;;   ;;  ;;;   
-    ;                                            
-    ;                                            
-    ;                                            
-    
-    
-    (define (lookup-phase-to-mapping phase-to n)
-      (hash-ref! phase-to n (λ () (make-id-set))))
-    
-    ;; make-id-set : -> id-set
-    (define (make-id-set) (make-free-identifier-mapping))
-    
-    ;; add-init-exp : id-set identifier stx -> void
-    (define (add-init-exp mapping id init-exp)
-      (when (original-enough? id)
-        (let* ([old (free-identifier-mapping-get mapping id (λ () '()))]
-               [new (cons init-exp old)])
-          (free-identifier-mapping-put! mapping id new))))
-    
-    ;; add-id : id-set identifier -> void
-    (define (add-id mapping id level-of-enclosing-module)
-      (when (original-enough? id)
-        (let* ([id (syntax-shift-phase-level id level-of-enclosing-module)]
-               [old (free-identifier-mapping-get mapping id (λ () '()))]
-               [new (cons id old)])
-          (free-identifier-mapping-put! mapping id new))))
-    
-    (define (original-enough? x)
-      (or (syntax-original? x)
-          (syntax-property x 'original-for-check-syntax)))
-    
-    ;; get-idss : id-set -> (listof (listof identifier))
-    (define (get-idss mapping)
-      (free-identifier-mapping-map mapping (λ (x y) y)))
-    
-    ;; get-ids : id-set identifier -> (union (listof identifier) #f)
-    (define (get-ids mapping var)
-      (free-identifier-mapping-get mapping var (λ () #f)))
-    
-    ;; for-each-ids : id-set ((listof identifier) -> void) -> void
-    (define (for-each-ids mapping f)
-      (free-identifier-mapping-for-each mapping (λ (x y) (f y))))
-
-
-
-
-(define build-trace%
-  (class (annotations-mixin object%)
-    (init-field src)
-    (define trace '())
-
-    (define/override (syncheck:find-source-object stx)
-      (and (equal? src (syntax-source stx))
-           src))
-    
-    ;; send over the non _ variables in the message to the main drracket place
-    (define-syntax (log stx)
-      (syntax-case stx ()
-        [(_ name args ...)
-         (with-syntax ([(wanted-args ...)
-                        (filter (λ (x) (not (regexp-match #rx"^_" (symbol->string (syntax-e x)))))
-                                (syntax->list #'(args ...)))])
-           #'(define/override (name args ...)
-               (add-to-trace (vector 'name wanted-args ...))))]))
-
-    (log syncheck:add-tail-arrow _from-text from-pos _to-text to-pos)
-    (log syncheck:add-arrow/name-dup
-         _start-text start-pos-left start-pos-right
-         _end-text end-pos-left end-pos-right
-         actual? level require-arrow? name-dup?)
-    (log syncheck:add-mouse-over-status _text pos-left pos-right str)
-    (log syncheck:add-background-color _text color start fin)
-    (log syncheck:add-jump-to-definition _text start end id filename submods)
-    (log syncheck:add-definition-target _text start-pos end-pos id mods)
-    (log syncheck:add-require-open-menu _text start-pos end-pos file)
-    (log syncheck:add-docs-menu _text start-pos end-pos key the-label path definition-tag tag)
-    (log syncheck:add-id-set to-be-renamed/poss dup-name?)
-    
-    (define/public (get-trace) (reverse trace))
-    (define/public (add-to-trace thing) 
-      (set! trace (cons thing trace)))
-    (super-new)))
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/xref.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/xref.rkt
deleted file mode 100644
index 7ada4e0cd6..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/drracket/private/syncheck/xref.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-(require setup/xref 
-         scribble/xref)
-(provide get-index-entry-info)
-
-(define xref (load-collections-xref))
-
-(define req-chan (make-channel))
-
-(define thd
-  (thread
-   (λ ()
-     (let loop ()
-       (define-values (binding-info cd resp-chan nack-evt) (apply values (channel-get req-chan)))
-       (define resp
-         (parameterize ([current-directory cd])
-           (and xref
-                (let ([definition-tag (xref-binding->definition-tag xref binding-info #f)])
-                  (and definition-tag
-                       (let-values ([(path tag) (xref-tag->path+anchor xref definition-tag)])
-                         (and path
-                              (let ([index-entry (xref-tag->index-entry xref definition-tag)])
-                                (and index-entry
-                                     (list (entry-desc index-entry)
-                                           path
-                                           definition-tag
-                                           tag))))))))))
-       (thread
-        (λ ()
-          (sync (channel-put-evt resp-chan resp)
-                nack-evt)))
-       (loop)))))
-
-;; this function is called from a thread that might be killed
-;; (but the body of this module is run in a context where it is
-;; guaranteed that that custodian doesn't get shut down)
-(define (get-index-entry-info binding-info)
-  (and (not (thread-dead? thd))
-       (sync
-        (nack-guard-evt
-         (λ (nack-evt)
-           (define resp-chan (make-channel))
-           (channel-put req-chan (list binding-info (current-directory) resp-chan nack-evt))
-           resp-chan)))))
diff --git a/pkgs/drracket-pkgs/drracket-tool-lib/info.rkt b/pkgs/drracket-pkgs/drracket-tool-lib/info.rkt
deleted file mode 100644
index b6a7d9ae60..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-lib/info.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base" 
-               "scribble-lib"
-               "string-constants-lib"
-               "scribble-lib"
-               "racket-index"
-               "gui-lib"))
-(define build-deps '("at-exp-lib"
-                     "rackunit-lib"))
-
-(define pkg-desc "Code implementing programmatic interfaces to some IDE tools that DrRacket supports")
-
-(define pkg-authors '(robby))
-
-(define version "1.0")
diff --git a/pkgs/drracket-pkgs/drracket-tool-test/info.rkt b/pkgs/drracket-pkgs/drracket-tool-test/info.rkt
deleted file mode 100644
index a4582c42b1..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-test/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "rackunit-lib"
-               "drracket-tool-lib"))
-(define build-deps '())
-
-(define pkg-desc "Tests for IDE tools that DrRacket supports")
-
-(define pkg-authors '(robby))
-
-(define version "1.0")
diff --git a/pkgs/drracket-pkgs/drracket-tool-test/tests/check-syntax/contract-check-syntax.rkt b/pkgs/drracket-pkgs/drracket-tool-test/tests/check-syntax/contract-check-syntax.rkt
deleted file mode 100644
index 8212197599..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-test/tests/check-syntax/contract-check-syntax.rkt
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang racket
-
-(require drracket/check-syntax
-         rackunit
-         (for-syntax setup/path-to-relative)
-         setup/path-to-relative)
-
-(define-syntax (identifier stx)
-  (syntax-case stx ()
-    [(_ x)
-     (identifier? #'x)
-     #`(let ([p (open-input-string (format "~s" 'x))])
-         (port-count-lines! p)
-         (set-port-next-location! 
-          p
-          #,(syntax-line #'x)
-          #,(syntax-column #'x)
-          #,(syntax-position #'x))
-         (read-syntax '#,(and (path? (syntax-source #'x))
-                              (path->relative-string/library (syntax-source #'x)))
-                      p))]))
-
-(define (source stx)
-  (list (and (path? (syntax-source stx))
-             (path->relative-string/library (syntax-source stx)))
-        (syntax-line stx)
-        (syntax-column stx)))
-
-(define collector%
-  (class (annotations-mixin object%)
-    (super-new)
-    (define/override (syncheck:find-source-object stx)
-      stx)
-    (define/override (syncheck:add-arrow start-source-obj
-                                         start-left
-                                         start-right
-                                         end-source-obj
-                                         end-left
-                                         end-right
-                                         actual?
-                                         phase-level)
-      (set! arrows 
-            (set-add arrows 
-                     (list (source start-source-obj)
-                           (source end-source-obj)))))
-    (define arrows (set))
-    (define/public (collected-arrows) arrows)))
-
-(define-namespace-anchor module-anchor)
-(define module-namespace 
-  (namespace-anchor->namespace module-anchor))
-
-(let ([annotations (new collector%)])
-  (define-values (add-syntax done)
-    (make-traversal module-namespace #f))
-  
-  (define x1 (identifier x))
-  (define x2 (identifier x))
-  (define x3 (identifier x))
-  (define y1 (identifier y))
-  (define y2 (identifier y))
-  (define z1 (identifier z))
-  
-  (parameterize ([current-annotations annotations]
-                 [current-namespace module-namespace])
-    (add-syntax
-     (expand #`(->i ([#,x1 any/c]
-                     [#,y1 (#,x2) any/c]
-                     [#,z1 (#,x3 #,y2) any/c])
-                    any)))
-    (done))
-  
-  (check-equal? (send annotations collected-arrows)
-                (set (list (source x1) (source x2))
-                     (list (source x1) (source x3))
-                     (list (source y1) (source y2)))))
-
-(let ([annotations (new collector%)])
-  (define-values (add-syntax done)
-    (make-traversal module-namespace #f))
-  
-  (define x1 (identifier x))
-  (define x2 (identifier x))
-  (define x3 (identifier x))
-  (define y1 (identifier y))
-  (define y2 (identifier y))
-  (define z1 (identifier z))
-  
-  (parameterize ([current-annotations annotations]
-                 [current-namespace module-namespace])
-    (add-syntax
-     (expand #`(->i ([#,x1 any/c])
-                    [r (#,x2) #,x3])))
-    (done))
-  
-  (check-equal? (send annotations collected-arrows)
-                (set (list (source x1) (source x2))
-                     (list (source x1) (source x3)))))
diff --git a/pkgs/drracket-pkgs/drracket-tool-test/tests/check-syntax/syncheck-direct.rkt b/pkgs/drracket-pkgs/drracket-tool-test/tests/check-syntax/syncheck-direct.rkt
deleted file mode 100644
index 5bf87cf21c..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool-test/tests/check-syntax/syncheck-direct.rkt
+++ /dev/null
@@ -1,152 +0,0 @@
-#lang racket/base
-
-(require drracket/check-syntax
-         racket/class
-         rackunit)
-
-(check-true
- (let ()
-   (define add-arrow-called? #f)
-   
-   (define annotations
-     (new (class (annotations-mixin object%)
-            (super-new)
-            (define/override (syncheck:find-source-object stx)
-              (if (eq? 'the-source (syntax-source stx))
-                  'yep
-                  #f))
-            (define/override (syncheck:add-arrow . args)
-              (set! add-arrow-called? #t)))))
-   
-   (define-values (add-syntax done)
-     (make-traversal (make-base-namespace)
-                     (current-directory)))
-   
-   (parameterize ([current-annotations annotations]
-                  [current-namespace (make-base-namespace)])
-     (add-syntax (expand
-                  (read-syntax
-                   'the-source
-                   (open-input-string
-                    (format "~s"
-                            `(module m racket/base
-                               (define x 4)
-                               x
-                               (let ([y 1]) y)))))))
-     (done))
-   add-arrow-called?))
-
-(check-true
- (let ()
-   (define add-arrow-called? #f)
-   
-   (define annotations
-     (new (class (annotations-mixin object%)
-            (super-new)
-            (define/override (syncheck:find-source-object stx)
-              (if (eq? 'the-source (syntax-source stx))
-                  'yep
-                  #f))
-            (define/override (syncheck:add-arrow . args)
-              (set! add-arrow-called? #t)))))
-   
-   (define-values (add-syntax done)
-     (make-traversal (make-base-namespace) #f))
-   
-   (parameterize ([current-annotations annotations]
-                  [current-namespace (make-base-namespace)])
-     (add-syntax (expand
-                  (read-syntax
-                   'the-source
-                   (open-input-string
-                    (format "~s"
-                            `(module m racket/base
-                               (define x 4)
-                               x
-                               (let ([y 1]) y)))))))
-     (done))
-   add-arrow-called?))
-
-(check-not-exn
- (λ ()
-   (define annotations
-     (new (class (annotations-mixin object%)
-            (super-new)
-            (define/override (syncheck:find-source-object stx)
-              stx))))
-   
-   (define base-namespace (make-base-namespace))
-   (define-values (add-syntax done)
-     (make-traversal base-namespace #f))
-   
-   (parameterize ([current-annotations annotations]
-                  [current-namespace base-namespace])
-     (eval '(require (for-syntax racket/base)))
-     (add-syntax
-      (expand
-       '(let-syntax ([m (λ (_) #`(let ([x 1]) x))])
-          (m))))
-     (done))))
-
-
-;                                                                       
-;                                                                       
-;                                                                       
-;                                                                       
-;    ;          ;;; ;;;                                                 
-;  ;;;              ;;;                                                 
-;  ;;;;  ;;;;;  ;;; ;;;      ;;;;;  ;;; ;;;; ;; ;;;   ;;; ;;; ;;; ;;;;  
-;  ;;;; ;;;;;;; ;;; ;;;     ;;;;;;; ;;;;;;;;;; ;;;;;  ;;; ;;; ;;;;;; ;; 
-;  ;;;  ;;  ;;; ;;; ;;;     ;;  ;;; ;;;  ;;;  ;;; ;;;  ;;;;;;;;; ;;;    
-;  ;;;    ;;;;; ;;; ;;;       ;;;;; ;;;  ;;;  ;;; ;;;  ;;;; ;;;;  ;;;;  
-;  ;;;  ;;; ;;; ;;; ;;;     ;;; ;;; ;;;  ;;;  ;;; ;;;  ;;;; ;;;;    ;;; 
-;  ;;;; ;;; ;;; ;;; ;;;     ;;; ;;; ;;;  ;;;   ;;;;;    ;;   ;;  ;; ;;; 
-;   ;;;  ;;;;;; ;;; ;;;      ;;;;;; ;;;  ;;;    ;;;     ;;   ;;   ;;;;  
-;                                                                       
-;                                                                       
-;                                                                       
-;                                                                       
-
-
-(define (get-tail-arrows str)
-   (define tail-arrows '())
-   
-   (define annotations
-     (new (class (annotations-mixin object%)
-            (super-new)
-            (define/override (syncheck:find-source-object stx)
-              (if (eq? 'the-source (syntax-source stx))
-                  'yep
-                  #f))
-            (define/override (syncheck:add-tail-arrow parent-src parent-pos child-src child-pos)
-              (set! tail-arrows (cons (list parent-pos child-pos) tail-arrows))))))
-   
-   (define-values (add-syntax done)
-     (make-traversal (make-base-namespace) #f))
-   
-  (parameterize ([current-annotations annotations]
-                  [current-namespace (make-base-namespace)])
-     (add-syntax (expand
-                  (parameterize ([read-accept-reader #t])
-                    (read-syntax 'the-source (open-input-string str)))))
-     (done))
-  (reverse tail-arrows))
-
-(check-equal? (get-tail-arrows "#lang racket/base\n(if 1 2 3)")
-              '((18 24) (18 26)))
-(check-equal? (get-tail-arrows "#lang racket/base\n(λ (x) 1 2)")
-              '((18 29)))
-(check-equal? (get-tail-arrows "#lang racket/base\n(case-lambda [(x) 1 2][(y z) 3 4 5 6])")
-              '((18 38) (18 53)))
-(check-equal? (get-tail-arrows "#lang racket/base\n(let ([x 3]) (#%expression (begin 1 2)))")
-              '((18 45) (45 54)))
-(check-equal? (get-tail-arrows "#lang racket/base\n(begin0 1)")
-              '((18 26)))
-(check-equal? (get-tail-arrows "#lang racket/base\n(begin0 1 2)")
-              '())
-(check-equal? (get-tail-arrows "#lang racket/base\n(letrec ([x (lambda (y) x)]) (x 3))")
-              '((30 42) (18 47)))
-(check-equal? (get-tail-arrows "#lang racket/base\n(with-continuation-mark 1 2 3)")
-              '((18 46)))
-(check-equal? (get-tail-arrows "#lang racket\n(define (f x) (match 'x ['x (f x)]))")
-              '((13 27) (27 41)))
diff --git a/pkgs/drracket-pkgs/drracket-tool/info.rkt b/pkgs/drracket-pkgs/drracket-tool/info.rkt
deleted file mode 100644
index 983e290dc4..0000000000
--- a/pkgs/drracket-pkgs/drracket-tool/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("drracket-tool-lib"
-               "drracket-tool-doc"))
-(define implies '("drracket-tool-lib"
-                  "drracket-tool-doc"))
-
-(define pkg-desc "Programmatic interface to some IDE tools that DrRacket supports")
-
-(define pkg-authors '(robby))
diff --git a/pkgs/drracket-pkgs/drracket/LICENSE.txt b/pkgs/drracket-pkgs/drracket/LICENSE.txt
deleted file mode 100644
index 44661e2584..0000000000
--- a/pkgs/drracket-pkgs/drracket/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-drracket
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/drracket-pkgs/drracket/browser/browser-sig.rkt b/pkgs/drracket-pkgs/drracket/browser/browser-sig.rkt
deleted file mode 100644
index c8ebc91d00..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/browser-sig.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket
-(require racket/unit
-         "private/sig.rkt")
-
-(provide browser^)
-
-(define-signature browser^
-  ((open hyper^)
-   (open html-export^)
-   (open bullet-export^)))
diff --git a/pkgs/drracket-pkgs/drracket/browser/browser-unit.rkt b/pkgs/drracket-pkgs/drracket/browser/browser-unit.rkt
deleted file mode 100644
index 74de985909..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/browser-unit.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#lang racket/base
-(require racket/unit
-         mred/mred-sig
-         setup/plt-installer-sig
-         net/tcp-sig
-         net/url-sig
-         net/url-unit
-         "browser-sig.rkt"
-         "private/bullet.rkt"
-         "private/html.rkt"
-         "private/hyper.rkt"
-         "private/sig.rkt")
-
-(provide browser@)
-
-(define-unit-from-context bullet@ bullet-export^)
-
-(define-compound-unit/infer pre-browser@
-  (import setup:plt-installer^
-          mred^
-          url^)
-  (export hyper^ html-export^ bullet-export^)
-  (link html@ hyper@ bullet@))
-
-(define-unit/new-import-export browser@
-  (import setup:plt-installer^
-          mred^
-          url^)
-  (export browser^)
-  ((hyper^ html-export^ bullet-export^) 
-   pre-browser@
-   setup:plt-installer^
-   mred^
-   url^))
\ No newline at end of file
diff --git a/pkgs/drracket-pkgs/drracket/browser/browser.rkt b/pkgs/drracket-pkgs/drracket/browser/browser.rkt
deleted file mode 100644
index 0a86c066f7..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/browser.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket
-(require racket/unit
-         racket/gui
-         mred/mred-sig
-         setup/plt-installer-sig
-         setup/plt-installer
-         net/tcp-sig
-         net/url-sig
-         net/url
-         "browser-sig.rkt"
-         "browser-unit.rkt")
-
-(provide-signature-elements browser^)
-
-(define-values/invoke-unit/infer browser@)
diff --git a/pkgs/drracket-pkgs/drracket/browser/browser.scrbl b/pkgs/drracket-pkgs/drracket/browser/browser.scrbl
deleted file mode 100644
index c5b0b52d1a..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/browser.scrbl
+++ /dev/null
@@ -1,619 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-        (for-label browser
-                   browser/browser-unit
-                   browser/browser-sig
-                   browser/htmltext
-                   browser/external
-                   browser/tool
-                   racket/base
-                   racket/contract
-                   racket/class
-                   racket/gui/base
-                   net/url
-                   framework/framework))
-
-@(define-syntax-rule (def-ext id)
-  (begin
-    (require (for-label net/sendurl))
-    (define id (racket send-url))))
-@(def-ext net-send-url)
-
-
-@title{Browser: Simple HTML Rendering}
-
-The @racketmodname[browser] library provides the following procedures
-and classes for parsing and viewing HTML files.  The
-@racketmodname[browser/htmltext] library provides a simplified interface
-for rendering to a subclass of the GRacket @racket[text%] class.  The
-@racketmodname[browser/external] library provides utilities for
-launching an external browser (such as Firefox).
-
-@section[#:tag "browser"]{Browser}
-
-@defmodule*/no-declare[(browser)]
-@declare-exporting[browser/browser browser]
-
-The browser supports basic HTML commands, plus special Racket hyperlinks
-of the form @litchar{<A RACKET=sexpr>...</A>}.  When the user clicks
-on such a link, the string @racket[sexpr] is parsed as a Racket program
-and evaluated.  Since @racket[sexpr] is likely to contain Racket
-strings, and since escape characters are difficult for people to read, a
-@litchar{|} character in @racket[sexpr] is converted to a @litchar{"}
-character before it is parsed.  Thus,
-
-@verbatim[#:indent 2]{
-  <A RACKET="|This goes nowhere.|">Nowhere</A>
-}
-
-creates a ``Nowhere'' hyperlink, which executes the Racket program
-
-@racketblock[
-  "This goes nowhere."
-]
-
-The value of that program is a string.  When a Racket hyperlink returns
-a string, it is parsed as a new HTML document.  Thus, where the use
-clicks on ``Nowhere,'' the result is a new page that says ``This goes
-nowhere.''
-
-The browser also treats comment forms containing
-@litchar{RACKET=sexpr} specially.   Whereas the
-@litchar{<A RACKET=sexpr>...</A>} form executes the expression when
-the user clicks, the @litchar{RACKET} expression in a comment is
-executed immediately during HTML rendering.  If the result is a string,
-the comment is replaced in the input HTML stream with the content of the
-string.  Thus,
-
-@verbatim[#:indent 2]{
-  <!-- RACKET="(format |<B>Here</B>: ~a| (current-directory))" -->
-}
-
-inserts the path of the current working directory into the containing
-document (and ``Here'' is boldfaced).  If the result is a snip instead
-of a string, it replaces the comment in the document.  Other types of
-return values are ignored.
-
-If the html file is being accessed as a @litchar{file:} url, the
-@racket[current-load-relative-directory] parameter is set to the
-directory during the evaluation of the Racket code (in both
-examples).  The Racket code is executed through @racket[eval].
-
-The @litchar{RACKET} forms are disabled unless the web page is a
-@litchar{file:} url that points into the @racket[doc] collection.
-
-@defproc[(open-url [url (or/c url? string? input-port?)]) (is-a?/c hyper-frame%)]{
-  Opens the given url in a vanilla browser frame and returns the
-  frame.  The frame is an instance of @racket[hyper-frame%].
-}
-
-@defboolparam[html-img-ok ok?]{
-  A parameter that determines whether the browser attempts to download
-  and render images.
-}
-
-@defboolparam[html-eval-ok ok?]{
-  A parameter that determines whether @litchar{RACKET=} tags are
-  evaluated.
-}
-
-@; ----------------------------------------------------------------------
-
-@definterface[hyper-frame<%> ()]{
-  @defmethod[(get-hyper-panel%) (subclass?/c panel%)]{
-    Returns the class that is instantiated when the frame is created.
-    Must be a panel with hyper-panel-mixin mixed in.  Defaults to just
-    returning @racket[hyper-panel%].
-  }
-
-  @defmethod[(get-hyper-panel) (is-a?/c panel%)]{
-    Returns the hyper panel in this frame.
-  }
-}
-
-@; ----------------------------------------------------------------------
-
-@defmixin[hyper-frame-mixin (frame%) (hyper-frame<%>)]{
-
-  @defconstructor/auto-super[([url (or/c url? string? input-port?)])]{
-    Shows the frame and visits @racket[url].
-  }
-
-}
-
-@; ----------------------------------------------------------------------
-
-@defclass[hyper-no-show-frame%
-          (hyper-frame-mixin (frame:status-line-mixin frame:basic%))
-          ()]
-
-@; ----------------------------------------------------------------------
-
-@defmixin[hyper-no-show-frame-mixin (frame%) ()]{
-  The same as the @racket[hyper-frame-mixin], except that it doesn't
-  show the frame and the initialization arguments are unchanged.
-}
-
-@; ----------------------------------------------------------------------
-
-@defclass[hyper-frame%
-          (hyper-no-show-frame-mixin (frame:status-line-mixin frame:basic%))
-          ()]
-
-@; ----------------------------------------------------------------------
-
-@definterface[hyper-text<%> ()]{
-  @defmethod[(url-allows-evalling? [url (or/c port? url?)]) boolean?]{
-    Determines if @litchar{RACKET} annotations are actually evaluated,
-    for a given url.
-  }
-}
-@; ----------------------------------------------------------------------
-
-@defmixin[hyper-text-mixin (text%) (hyper-text<%>)]{
-
-  An instance of a @racket[hyper-text-mixin]-extended class should be
-  displayed only in an instance of a class created with
-  @racket[hyper-canvas-mixin].
-
-  @defconstructor/auto-super[([url (or/c url? string? input-port?)]
-                              [status-frame
-                               (or/c (is-a?/c top-level-window<%>) false/c)]
-                              [post-data (or/c false/c bytes?)])]{
-    The @racket[url] is loaded into the @racket[text%] object (using the
-    @method[hyper-text-mixin reload] method), a top-level window for
-    status messages and dialogs, a progress procedure used as for
-    @racket[get-url], and either @racket[#f] or a post string to be sent
-    to a web server (technically changing the GET to a POST).
-
-    Sets the autowrap-bitmap to @racket[#f].
-  }
-
-  @defmethod[(map-shift-style [start exact-nonnegative-integer?]
-                              [end exact-nonnegative-integer?]
-                              [shift-style style<%>])
-             void?]{
-    Maps the given style over the given range.
-  }
-
-  @defmethod[(make-link-style [start exact-nonnegative-integer?]
-                              [end exact-nonnegative-integer?])
-             void?]{
-    Changes the style for the given range to the link style.
-  }
-
-  @defmethod[(get-url) (or/c url? string? input-port? false/c)]{
-    Returns the URL displayed by the editor, or @racket[#f] if there is
-    none.
-  }
-
-  @defmethod[(get-title) string?]{
-    Gets the page's title.
-  }
-
-  @defmethod[(set-title [str string?]) void?]{
-    Sets the page's title.
-  }
-
-  @defmethod[(hyper-delta) style-delta%]{
-    Override this method to set the link style.
-  }
-
-  @defmethod[(add-tag [name string?] [pos exact-nonnegative-integer?]) void?]{
-    Installs a tag.
-  }
-
-  @defmethod[(find-tag [name/number (or/c string? exact-nonnegative-integer?)])
-             (or/c exact-nonnegative-integer? false/c)]{
-    Finds the location of a tag in the buffer (where tags are installed
-    in HTML with @litchar{<A NAME="name">}) and returns its position.
-    If @racket[name] is a number, the number is returned (assumed to be
-    an offset rather than a tag).  Otherwise, if the tag is not found,
-    @racket[#f] is returned.
-  }
-
-  @defmethod[(remove-tag [name string?]) void?]{
-    Removes a tag.
-  }
-
-  @defmethod[(post-url [url (or/c string? url?)]
-                       [post-data-bytes (or/c bytes? false/c) #f]) void?]{
-    Follows the link, optionally with the given post data.
-  }
-
-  @defmethod[(add-link [start exact-nonnegative-integer?]
-                       [end exact-nonnegative-integer?]
-                       [url (or/c url? string?)])
-             void?]{
-    Installs a hyperlink.
-  }
-
-  @defmethod[(add-racket-callback [start exact-nonnegative-integer?]
-                                  [end exact-nonnegative-integer?]
-                                  [racket-expr string?])
-             void?]{
-    Installs a Racket evaluation hyperlink.
-  }
-
-  @defmethod[(add-thunk-callback [start exact-nonnegative-integer?]
-                                 [end exact-nonnegative-integer?]
-                                 [thunk (-> any)])
-             void?]{
-    Installs a thunk-based hyperlink.
-  }
-
-  @defmethod[(eval-racket-string [str string?]) any]{
-    Called to handle the @litchar{<A RACKET="expr">...</A>} tag and
-    @litchar{<! RACKET="expr">} comments (see above).  Evaluates the
-    string; if the result is a string, it is opened as an HTML page.
-  }
-
-  @defmethod[(reload) void?]{
-    Reloads the current page.
-
-    By default, the text uses the basic style named
-    @racket["Html Standard"] in the editor (if it exists).
-  }
-
-  @defmethod[(remap-url [url (or/c url? string?)]) (or/c url? string?)]{
-    When visiting a new page, this method is called to remap the url.
-    The remapped url is used in place of the original url.  If this
-    method returns @racket[#f], the page doesn't go anywhere.
-
-    This method may be killed (if the user clicks the ``stop'' button).
-  }
-
-  @defmethod[(get-hyper-keymap) (is-a?/c keymap%)]{
-    Returns a keymap suitable for frame-level handling of events to
-    redirect page-up, @|etc| to the browser canvas.
-  }
-
-}
-
-@defclass[hyper-canvas% (hyper-canvas-mixin canvas:basic%) ()]{}
-
-
-@; ----------------------------------------------------------------------
-
-@defclass[hyper-text% (hyper-text-mixin text:keymap%) ()]{
-
-  Extends the @racket[text:keymap%] class to support standard key
-  bindings in the browser window.
-
-}
-
-@; ----------------------------------------------------------------------
-
-@defmixin[hyper-canvas-mixin (editor-canvas%) ()]{
-
-  A @racket[hyper-can-mixin]-extended canvas's parent should be an
-  instance of a class derived with @racket[hyper-panel-mixin].
-
-  @defconstructor/auto-super[()]{
-  }
-
-  @defmethod[(get-editor%) (subclass?/c text%)]{
-
-    Returns the class used to implement the editor in the browser
-    window.  It should be derived from @racket[hyper-text%] and should
-    pass on the initialization arguments to @racket[hyper-text%].
-
-    The dynamic extent of the initialization of this editor is called on
-    a thread that may be killed (via a custodian shutdown).  In that
-    case, the editor in the browser's editor-canvas may not be an
-    instance of this class.
-  }
-
-  @defmethod[(current-page) any/c]{
-    Returns a representation of the currently displayed page, which
-    includes a particular editor and a visible range within the editor.
-  }
-
-  @defmethod[(goto-url [url (or/c url? string?)]
-                       [relative-to-url (or/c url? string? false/c)]
-                       [progress-proc (boolean? . -> . any) void]
-                       [post-data (or/c bytes? false/c) #f])
-             void?]{
-    Changes to the given url, loading it by calling the
-    @racket[make-editor] method.  If @racket[relative-to-url] is not
-    @racket[#f], it must be a URL for resolving @racket[url] as a
-    relative URL.  @racket[url] may also be a port, in which case,
-    @racket[relative-to-url] must be @racket[#f].
-
-    The @racket[progress-proc] procedure is called with a boolean at the
-    point where the URL has been resolved and enough progress has been
-    made to dismiss any message that the URL is being resolved.  The
-    procedure is called with @racket[#t] if the URL will be loaded into
-    a browser window, @racket[#f] otherwise (e.g., the user will save
-    the URL content to a file).
-
-    If @racket[post-data-bytes] is a byte string instead of false, the
-    URL GET is changed to a POST with the given data.
-  }
-
-  @defmethod[(set-page [page any/c] [notify? any/c]) void?]{
-    Changes to the given page.  If @racket[notify?] is not @racket[#f],
-    the canvas's parent is notified about the change by calling its
-    @racket[leaving-page] method.
-  }
-
-  @defmethod[(after-set-page) void?]{
-    Called during @racket[set-page].  Does nothing by default.
-  }
-}
-
-@; ----------------------------------------------------------------------
-
-@definterface[hyper-panel<%> ()]{
-}
-
-@; ----------------------------------------------------------------------
-
-@defmixin[hyper-panel-mixin (area-container<%>) (hyper-panel<%>)]{
-
-  @defconstructor/auto-super[([info-line? any/c])]{
-    Creates controls and a hyper text canvas.  The controls permit a
-    user to move back and forth in the hypertext history.
-
-    The @racket[info-line?] argument indicates whether the browser
-    should contain a line to display special @litchar{DOCNOTE} tags in a
-    page.  Such tags are used primarily by the PLT documentation.
-  }
-
-  @defmethod[(make-canvas [container (is-a?/c area-container<%>)]) void?]{
-    Creates the panel's hypertext canvas, an instance of a class derived
-    using @racket[hyper-canvas-mixin].  This method is called during
-    initialization.
-  }
-
-  @defmethod[(get-canvas%) (subclass?/c editor-canvas%)]{
-    Returns the class instantiated by make-canvas.  It must be derived
-    from @racket[hyper-canvas-mixin].
-  }
-
-  @defmethod[(make-control-bar-panel [container (is-a?/c area-container<%>)])
-             any/c]{
-    Creates the panel's sub-container for the control bar containing the
-    navigation buttons.  If @racket[#f] is returned, the panel will have
-    no control bar.  The default method instantiates
-    @racket[horizontal-panel%].
-  }
-
-  @defmethod[(rewind) void?]{
-    Goes back one page, if possible.
-  }
-
-  @defmethod[(forward) void?]{
-    Goes forward one page, if possible.
-  }
-
-  @defmethod[(get-canvas) (is-a?/c editor-canvas%)]{
-    Gets the hypertext canvas.
-  }
-
-  @defmethod[(on-navigate) void?]{
-    Callback that is invoked any time the displayed hypertext page
-    changes (either by clicking on a link in the canvas or by
-    @racket[rewind] or @racket[forward] calls).
-  }
-
-  @defmethod[(leaving-page [page any/c] [new-page any/c])
-             any]{
-    This method is called by the hypertext canvas to notify the panel
-    that the hypertext page changed.  The @racket[page] is @racket[#f]
-    if @racket[new-page] is the first page for the canvas.  See also
-    @racket[page->editor].
-  }
-
-  @defmethod[(filter-notes [notes (listof string?)])
-             (listof string?)]{
-    Given the notes from a page as a list of strings (where each string
-    is a note), returns a single string to print above the page.
-  }
-
-  @defmethod[(reload) void?]{
-    Reloads the currently visible page by calling the @racket[reload]
-    method of the currently displayed hyper-text.
-  }
-}
-
-@; ----------------------------------------------------------------------
-
-@defclass[hyper-panel% (hyper-panel-mixin vertical-panel%) ()]
-
-@; ----------------------------------------------------------------------
-
-@defproc[(editor->page [editor (is-a?/c text%)]) any/c]{
-  Creates a page record for the given editor, suitable for use with the
-  @racket[set-page] method of @racket[hyper-canvas-mixin].
-}
-
-@defproc[(page->editor [page any/c]) (is-a?/c text%)]{
-  Extracts the editor from a page record.
-}
-
-@defparam[bullet-size n exact-nonnegative-integer?]{
-  Parameter controlling the point size of a bullet.
-}
-
-@defclass[image-map-snip% snip% ()]{
-  Instances of this class behave like @racket[image-snip%] objects,
-  except they have a @litchar{<map> ... </map>} associated with them and
-  when clicking on them (in the map) they will cause their init arg text
-  to follow the corresponding link.
-
-  @defconstructor[([html-text (is-a?/c html-text<%>)])]{
-  }
-
-  @defmethod[(set-key [key string?]) void?]{
-    Sets the key for the image map (eg, @racket["#key"]).
-  }
-
-  @defmethod[(get-key) string?]{
-    Returns the current key.
-  }
-
-  @defmethod[(add-area [shape string?]
-                       [region (listof number?)]
-                       [href string?])
-             void?]{
-    Registers the shape named by @racket[shape] whose coordinates are
-    specified by @racket[region] to go to @racket[href] when that region
-    of the image is clicked on.
-  }
-}
-
-@defstruct[(exn:cancelled exn) ()]{
-  This exception may be raised by the
-  @method[hyper-text-mixin reload] method.
-}
-
-@defstruct[(exn:file-saved-instead exn) ([pathname path-string?])]{
-  This exception may be raised by the
-  @method[hyper-text-mixin reload] method.
-}
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "browser-unit"]{Browser Unit}
-
-@defmodule[browser/browser-unit]
-
-@defthing[browser@ unit?]{
-  Imports @racket[mred^], @racket[tcp^], and @racket[url^], and exports
-  @racket[browser^].
-}
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "browser-sig"]{Browser Signature}
-
-@defmodule[browser/browser-sig]
-
-@defsignature[browser^ ()]{
-  Includes all of the bindings of the @racketmodname[browser] library.
-}
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "html-text"]{HTML As Text Editor}
-
-@defmodule[browser/htmltext]
-
-@definterface[html-text<%> (text%)]{
-
-  @defmethod[(get-url) (or/c url? string? false/c)]{
-    Returns a base URL used for building relative URLs, or @racket[#f]
-    if no base is available.
-  }
-
-  @defmethod[(set-title [str string?]) void?]{
-    Registers the title @racket[str] for the rendered page.
-  }
-
-  @defmethod[(add-link [start exact-nonnegative-integer?]
-                       [end exact-nonnegative-integer?]
-                       [url (or/c url? string?)])
-             void?]{
-    Registers a hyperlink for the given region in rendered page.
-  }
-
-  @defmethod[(add-tag [name string?] [pos exact-nonnegative-integer?]) void?]{
-    Installs a tag.
-  }
-
-  @defmethod[(make-link-style [start exact-nonnegative-integer?]
-                              [end exact-nonnegative-integer?])
-             void?]{
-    Changes the style for the given range to the link style.
-  }
-
-  @defmethod[(add-racket-callback [start exact-nonnegative-integer?]
-                                  [end exact-nonnegative-integer?]
-                                  [racket-expr string?])
-             void?]{
-    Installs a Racket evaluation hyperlink.
-  }
-
-  @defmethod[(add-thunk-callback [start exact-nonnegative-integer?]
-                                 [end exact-nonnegative-integer?]
-                                 [thunk (-> any)])
-             void?]{
-    Installs a thunk-based hyperlink.
-  }
-
-  @defmethod[(post-url [url (or/c string? url?)]
-                       [post-data-bytes (or/c bytes? false/c) #f]) void?]{
-    Follows the link, optionally with the given post data.
-  }
-}
-
-
-@defmixin[html-text-mixin (text%) ()]{
-  Extends the given @racket[text%] class with implementations of the
-  @racket[html-text<%>] methods.  Hyperlinks are attached to clickbacks
-  that use @net-send-url from @racketmodname[net/sendurl].
-}
-
-@defproc[(render-html-to-text [in input-port?]
-                              [dest (is-a? html-text<%>)]
-                              [load-img? any/c]
-                              [eval-rkt? any/c])
-         void?]{
-  Reads HTML from @racket[in] and renders it to @racket[dest].  If
-  @racket[load-img?] is @racket[#f], then images are rendered as Xed-out
-  boxes.  If @racket[eval-rkt?] is @racket[#f], then @litchar{RACKET}
-  hyperlink expressions and comments are not evaluated.
-
-  Uses the style named @racket["Html Standard"] in the editor's
-  style-list (if it exists) for all of the inserted text's default
-  style.
-}
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "external"]{Launching an External Browser}
-
-@defmodule[browser/external]
-
-@defproc[(send-url [str null] [separate-window? void #t]) null]{
-  Like @net-send-url from @racket[net/sendurl], but on Unix, the user
-  is prompted for a browser to use if none is recorded in the
-  preferences file.
-}
-
-@defproc[(browser-preference? [v any/c]) boolean?]{
-  Returns @racket[#t] if @racket[v] is a valid browser preference.
-}
-
-@defproc[(update-browser-preference [url (or/c string? false/c)]) void?]{
-  On Unix, prompts the user for a browser preference and records the
-  user choice as a framework preference (even if one is already
-  recorded).  If @racket[url] is not @racket[#f], it is used in the
-  dialog to explain which URL is to be opened; if it is @racket[#f], the
-  @racket['internal] will be one of the options for the user.
-}
-
-@defproc[(install-help-browser-preference-panel) void?]{
-  Installs a framework preference panel for ``Browser'' options.
-}
-
-@defproc[(add-to-browser-prefs-panel [proc ((is-a?/c panel%) . -> . any)])
-         void?]{
-  The @racket[proc] is called when the ``Browser'' panel is constructed
-  for preferences.  The supplied argument is the panel, so @racket[proc]
-  can add additional option controls.  If the panel is already created,
-  @racket[proc] is called immediately.
-}
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "tool"]{DrRacket Browser Preference Panel}
-
-@defmodule[browser/tool]
-
-@defthing[tool@ unit?]{
-  A unit that implements a DrRacket tool to add the ``Browser''
-  preference panel.
-}
diff --git a/pkgs/drracket-pkgs/drracket/browser/bullet-snip.rkt b/pkgs/drracket-pkgs/drracket/browser/bullet-snip.rkt
deleted file mode 100644
index 2dd054e88d..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/bullet-snip.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(require "private/bullet.rkt")
-(provide (rename-out (bullet-snip-class snip-class)))
diff --git a/pkgs/drracket-pkgs/drracket/browser/external.rkt b/pkgs/drracket-pkgs/drracket/browser/external.rkt
deleted file mode 100644
index 2fba812991..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/external.rkt
+++ /dev/null
@@ -1,304 +0,0 @@
-#lang racket/base
-  (require string-constants
-           racket/gui
-           racket/class
-           racket/file
-           racket/list
-           racket/match
-           (prefix-in raw: net/sendurl)
-           net/url
-           (prefix-in fw: framework))
-  (provide send-url
-           (rename-out [raw:browser-preference? browser-preference?])
-           update-browser-preference
-           install-help-browser-preference-panel
-           add-to-browser-prefs-panel)
-
-  ; : -> bool
-  (define (unix-browser?)
-    (eq? (system-type) 'unix))
-
-  (fw:preferences:set-default
-   'external-browser
-   (let ([pref (get-preference 'external-browser 
-                               (lambda () #f)
-                               #:timeout-lock-there (lambda (path) #f))])
-     (and (raw:browser-preference? pref) pref))
-   raw:browser-preference?)
-
-  (define http-proxy-preference 'plt:http-proxy)
-
-  ;; proxy-pref? : any -> boolean
-  ;; determines if the input is a valid setting for the
-  ;; http-proxy-preference pref
-  (define (proxy-pref? x)
-    (match x
-      [#f #t]
-      [`("http" ,(? string?) ,(? integer?)) #t]
-      [else #f]))
-
-  ;; sync-current-proxy-servers : proxy-pref -> void
-  ;; syncs current-proxy-servers parameter with the proxy-pref-val
-  (define (sync-current-proxy-servers pref-val)
-    (let* ([ops (current-proxy-servers)]
-           [removed (remove-all-proxies "http" ops)])
-      (current-proxy-servers
-       (if pref-val (cons pref-val removed) removed))))
-
-  (define (remove-all-proxies scheme proxies)
-    (filter (lambda (x) (and (pair? x) (not (equal? (car x) scheme))))
-            proxies))
-
-  (fw:preferences:set-default http-proxy-preference #f proxy-pref?)
-  (sync-current-proxy-servers (fw:preferences:get http-proxy-preference))
-  (void (fw:preferences:add-callback http-proxy-preference (lambda (p v) (sync-current-proxy-servers v))))
-
-  (define send-url
-    (if (unix-browser?)
-      (lambda (url . args)
-        (when (or (get-preference 'external-browser (lambda () #f))
-                  ;; either the preference doesn't exist or is #f
-                  (update-browser-preference url))
-          (apply raw:send-url url args)))
-      raw:send-url))
-
-  ; : str -> void
-  ; to prompt the user for a browser preference and update the preference
-  (define (update-browser-preference url)
-    (or (not (unix-browser?))
-        (choose-browser url)))
-
-  ; : (U symbol #f) -> void
-  ; to set the default browser
-  (define (set-browser! browser)
-    (fw:preferences:set 'external-browser browser))
-
-  ;; Tries to put low-level prefs three times, sleeping a bit in
-  ;; between, then gives up.
-  (define (try-put-preferences names vals)
-    (let loop ([tries 0])
-      (unless (= tries 3)
-        (put-preferences names vals
-                         (lambda (lock-file)
-                           (sleep 0.2)
-                           (loop (add1 tries)))))))
-
-  (define unix-browser-names
-    (map (lambda (s)
-           (string-titlecase (regexp-replace* #rx"-" (symbol->string s) " ")))
-         raw:unix-browser-list))
-
-  ;; : (U str #f) -> (U symbol #f)
-  ;; to prompt the user for a browser preference
-  ;;  #f for the URL indicates a pre-emptive request by Help Desk,
-  ;;  and in that case, the user can choose to use the internal
-  ;;  broswer.
-  (define (choose-browser url)
-    (let* ([title (string-constant choose-browser)]
-           [d (make-object dialog% title)]
-           [main-pane (make-object vertical-pane% d)]
-           [internal-ok? (not url)]
-           [ok? #f]
-           [orig-external (fw:preferences:get 'external-browser)])
-      (make-object message% title main-pane)
-      ;; No need to show the URL (it can be very long)
-      ;; (when url
-      ;;   (make-object message% (format "URL: ~a" url) main-pane))
-      (let-values ([(panel callbacks) (make-help-browser-preference-panel internal-ok? #f (lambda (f) (f main-pane)))])
-        (let*-values ([(button-pane) (instantiate horizontal-panel% (main-pane)
-                                                  (alignment '(right center)))]
-                      [(ok-button cancel-button)
-                       (fw:gui-utils:ok/cancel-buttons
-                        button-pane
-                        (lambda (b e) (set! ok? #t) (send d show #f))
-                        (lambda (b e)
-                          (fw:preferences:set 'external-browser orig-external)
-                          (send d show #f)))]
-                      [(enable-button) (lambda (_n _v)
-                                         (queue-callback
-                                          (lambda ()
-                                            (send ok-button enable (fw:preferences:get 'external-browser)))))])
-          (send ok-button enable #f)
-          (set! callbacks
-                (cons
-                 (fw:preferences:add-callback 'external-browser enable-button)
-                 callbacks)))
-        (send d show #t)
-        (map (lambda (f) (f)) callbacks)
-        ok?)))
-
-  (define panel-installed? #f)
-  (define prefs-panel #f)
-  (define synchronized? #f)
-  (define additions null)
-
-  (define (install-help-browser-preference-panel)
-    (unless panel-installed?
-      (set! panel-installed? #t)
-      (make-help-browser-preference-panel
-       #t #t
-       (lambda (f) (fw:preferences:add-panel
-                    (string-constant browser)
-                    (lambda (parent)
-                      (let-values ([(panel cbs) (f parent)])
-                        (set! prefs-panel panel)
-                        (map (lambda (f) (f panel)) additions)
-                        (set! additions null)
-                        panel)))))))
-
-  (define (add-to-browser-prefs-panel proc)
-    (if prefs-panel
-      (proc prefs-panel)
-      (set! additions (append additions (list proc)))))
-
-  (define (make-help-browser-preference-panel set-help? ask-later? mk)
-    (mk
-     (lambda (parent)
-       (define callbacks null)
-       (let ([pref-panel (instantiate vertical-panel% ()
-                                      [parent parent]
-                                      [alignment '(left center)])])
-
-         ;; -------------------- external browser for Unix --------------------
-         (when (unix-browser?)
-           (unless synchronized?
-             ;; Keep 'external-browser in sync
-             (fw:preferences:add-callback 'external-browser
-               (lambda (name browser)
-                 (try-put-preferences (list 'external-browser) (list browser)))))
-
-           (letrec ([v-panel (instantiate group-box-panel% ()
-                                          (parent pref-panel)
-                                          (alignment '(right center))
-                                          (stretchable-height #f)
-                                          (label (string-constant external-browser-choice-title)))]
-                    [h-panel (instantiate horizontal-panel% ()
-                                          (parent v-panel)
-                                          (alignment '(center bottom)))]
-                    [none-index (length raw:unix-browser-list)]
-                    [custom-index (add1 none-index)]
-                    [r (instantiate radio-box% ()
-                                    (label #f)
-                                    (choices (append unix-browser-names
-                                                     (list (string-constant no-browser)
-                                                           (string-constant browser-command-line-label))))
-                                    (parent h-panel)
-                                    (callback
-                                     (lambda (radio event)
-                                       (let ([n (send radio get-selection)])
-                                         (set-browser!
-                                          (cond
-                                            [(= n none-index) #f]
-                                            [(= n custom-index) (get-custom)]
-                                            [else (list-ref raw:unix-browser-list n)]))))))]
-                    [select-custom
-                     (lambda (_ __)
-                       (send r set-selection custom-index)
-                       (set-browser! (get-custom)))]
-                    [get-custom
-                     (lambda () (cons (send pre get-value) (send post get-value)))]
-                    [template-panel (instantiate horizontal-panel% (h-panel)
-                                                 (spacing 0)
-                                                 (stretchable-height #f))]
-                    [pre (instantiate text-field% ()
-                                      (label #f) (parent template-panel) (callback select-custom)
-                                      (horiz-margin 0))]
-                    [mess (instantiate message% () (label "<URL>") (parent template-panel)
-                                       (horiz-margin 0))]
-                    [post (instantiate text-field% ()
-                                       (label #f) (parent template-panel) (callback select-custom)
-                                       (horiz-margin 0))]
-                    [note1 (instantiate message% ((string-constant browser-cmdline-expl-line-1)
-                                                  v-panel))]
-                    [note2 (instantiate message% ((string-constant browser-cmdline-expl-line-2)
-                                                  v-panel))]
-                    [refresh-controls (lambda (pref)
-                                        (if (pair? pref)
-                                          (begin
-                                            (send r set-selection custom-index)
-                                            (send pre set-value (car pref))
-                                            (send post set-value (cdr pref)))
-                                          (let init ([x raw:unix-browser-list] [n 0])
-                                            (cond
-                                              [(null? x) (send r set-selection n)]
-                                              [else (if (eq? pref (car x))
-                                                      (send r set-selection n)
-                                                      (init (cdr x) (add1 n)))]))))])
-
-             (unless ask-later?
-               (send r enable none-index #f))
-
-             (refresh-controls (fw:preferences:get 'external-browser))
-             (set! callbacks
-                   (cons (fw:preferences:add-callback 'external-browser
-                           (lambda (name browser) (refresh-controls browser)))
-                    callbacks))))
-
-         ;; -------------------- proxy for doc downloads --------------------
-         (when set-help?
-           (letrec ([p (instantiate group-box-panel% ()
-                                    [label (string-constant http-proxy)]
-                                    [parent pref-panel]
-                                    [stretchable-height #f]
-                                    [alignment '(left top)])]
-                    [rb (make-object radio-box%
-                                     #f (list (string-constant proxy-direct-connection)
-                                              (string-constant proxy-use-proxy))
-                                     p
-                                     (lambda (r e)
-                                       (let ([proxy? (= 1 (send r get-selection))])
-                                         (send proxy-spec enable proxy?)
-                                         (if proxy?
-                                             (update-proxy)
-                                             (fw:preferences:set http-proxy-preference #f)))))]
-                    [proxy-spec (instantiate horizontal-panel% (p)
-                                             [stretchable-width #f]
-                                             [stretchable-height #f]
-                                             [alignment '(left center)])]
-                    [update-proxy (lambda ()
-                                    (let ([host (send host get-value)]
-                                          [port (send port get-value)])
-                                      (let ([ok? (and (regexp-match? #rx"^[-0-9a-zA-Z.]+$" host)
-                                                      (regexp-match? #rx"^[0-9]+$" port)
-                                                      (string->number port)
-                                                      (<= 1 (string->number port) 65535))])
-                                        (when ok?
-                                          (fw:preferences:set
-                                           http-proxy-preference
-                                           (list "http" host (string->number port))))
-                                        (send bad-host show (not ok?)))))]
-                    [host (make-object text-field%
-                                       (string-constant proxy-host)
-                                       proxy-spec (lambda (x y) (update-proxy))
-                                       "www.someplacethatisaproxy.domain.com")]
-                    [port (make-object text-field%
-                                       (string-constant proxy-port)
-                                       proxy-spec (lambda (x y) (update-proxy)) "65535")]
-                    [bad-host (make-object message%
-                                           (string-constant proxy-bad-host)
-                                           p)]
-                    [update-gui
-                     (lambda (proxy-val)
-                       (send bad-host show #f)
-                       (if proxy-val
-                           (begin
-                             (send rb set-selection 1)
-                             (send proxy-spec enable #t)
-                             (unless (string=? (cadr proxy-val) (send host get-value))
-                               (send host set-value (cadr proxy-val)))
-                             (unless (equal? (caddr proxy-val) (string->number (send port get-value)))
-                               (send port set-value (number->string (caddr proxy-val)))))
-                           (begin
-                             (send rb set-selection 0)
-                             (send proxy-spec enable #f)
-                             (send host set-value "")
-                             (send port set-value ""))))])
-
-             (fw:preferences:add-callback http-proxy-preference
-                                          (lambda (name val)
-                                            (update-gui val)))
-             (update-gui (fw:preferences:get http-proxy-preference))
-             (send bad-host show #f)))
-
-         (set! synchronized? #t)
-         (values pref-panel callbacks)))))
diff --git a/pkgs/drracket-pkgs/drracket/browser/htmltext.rkt b/pkgs/drracket-pkgs/drracket/browser/htmltext.rkt
deleted file mode 100644
index a56820477d..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/htmltext.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang racket/base
-(require racket/unit
-         racket/class
-         "browser-sig.rkt"
-         "private/sig.rkt"
-         "private/html.rkt"
-         "private/bullet.rkt"
-         net/url
-         net/url-sig
-         racket/gui/base
-         mred/mred-unit
-         mred/mred-sig
-         browser/external)
-
-(define-unit-from-context url@ url^)
-
-(define-values/invoke-unit 
-  (compound-unit/infer (import) (export html^)
-                       (link standard-mred@ url@ html@))
-  (import)
-  (export html^))
-
-(define html-text<%>
-  (interface ((class->interface text%))
-    get-url
-    set-title
-    add-link
-    add-tag
-    make-link-style
-    add-racket-callback
-    add-thunk-callback
-    post-url))
-
-(define url-delta (make-object style-delta% 'change-underline #t))
-(void (send url-delta set-delta-foreground "blue"))
-
-(define html-text-mixin
-  (mixin ((class->interface text%)) (html-text<%>)
-    (inherit change-style set-clickback)
-    
-    (define/public (get-url) #f)
-    (define/public (set-title s) (void))
-    (define/public (add-link pos end-pos url-string)
-      (set-clickback pos end-pos (lambda (e start-pos eou-pos)
-                                   (send-url url-string))))
-    (define/public (add-tag label pos) (void))
-    (define/public (make-link-style pos endpos) 
-      (change-style url-delta pos endpos))
-    (define/public (add-racket-callback pos endpos racket) (void))
-    (define/public (add-thunk-callback pos endpos thunk)
-      (set-clickback pos endpos (lambda (e start-pos eou-pos)
-                                  (thunk))))
-    (define/public (post-url url post-data)
-      (message-box "HTML" 
-                   (format "Cannot perform post: ~e"
-                           post-data)
-                   #f
-                   '(stop ok)))
-    (super-new)))
-
-(define (render-html-to-text port text%-obj img-ok? eval-ok?)
-  (unless (input-port? port)
-    (raise-type-error 'render-html-to-text "input port" 0 (list port text%-obj)))
-  (unless (text%-obj . is-a? . html-text<%>)
-    (raise-type-error 'render-html-to-text "html-text<%> object" 0 (list port text%-obj)))
-  (parameterize ([html-eval-ok eval-ok?]
-                 [html-img-ok img-ok?])
-    (dynamic-wind
-     (lambda () (send text%-obj begin-edit-sequence #f))
-     (lambda () (html-convert port text%-obj))
-     (lambda () (send text%-obj end-edit-sequence)))))
-
-(provide html-text<%>
-         html-text-mixin
-         render-html-to-text)
-
diff --git a/pkgs/drracket-pkgs/drracket/browser/info.rkt b/pkgs/drracket-pkgs/drracket/browser/info.rkt
deleted file mode 100644
index cc17ad561a..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define drracket-tools (list (list "tool.rkt")))
-(define drracket-tool-names (list "Browser"))
-(define scribblings '(("browser.scrbl" () (gui-library))))
diff --git a/pkgs/drracket-pkgs/drracket/browser/main.rkt b/pkgs/drracket-pkgs/drracket/browser/main.rkt
deleted file mode 100644
index 456451fdd1..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/main.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "browser.rkt")
-(provide (all-from-out "browser.rkt"))
diff --git a/pkgs/drracket-pkgs/drracket/browser/private/btree.rkt b/pkgs/drracket-pkgs/drracket/browser/private/btree.rkt
deleted file mode 100644
index 07d08c5ae5..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/private/btree.rkt
+++ /dev/null
@@ -1,220 +0,0 @@
-#lang racket/unit
-
-(require "sig.rkt")
-
-;; Implements a red-black tree with relative indexing along right
-;; splines. This allows the usual O(log(n)) operations, plus a
-;; O(log(n)) shift operation.
-
-;; (This is the same data structure as used for lines by GRacket's text%
-;; class, but that one is implemented in C++.)
-(import)
-(export (rename relative-btree^
-                (create-btree make-btree)))
-
-(struct btree (root) #:mutable)
-
-(struct node (pos data parent left right color) #:mutable)
-
-(define (adjust-offsets n new-child)
-  (when new-child
-    (set-node-pos! new-child (- (node-pos new-child)
-                                (node-pos n)))))
-
-(define (deadjust-offsets n old-child)
-  (when old-child
-    (set-node-pos! old-child (+ (node-pos old-child)
-                                (node-pos n)))))
-
-(define (rotate-left n btree)
-  (let ([old-right (node-right n)])
-    (deadjust-offsets n old-right)
-    
-    (let ([r (node-left old-right)])
-      (set-node-right! n r)
-      (when r
-        (set-node-parent! r n)))
-    
-    (let ([p (node-parent n)])
-      (set-node-parent! old-right p)
-      (cond
-       [(not p) (set-btree-root! btree old-right)]
-       [(eq? n (node-left p)) (set-node-left! p old-right)]
-       [else                 (set-node-right! p old-right)]))
-    
-    (set-node-left! old-right n)
-    (set-node-parent! n old-right)))
-
-(define (rotate-right n btree)
-  (let ([old-left (node-left n)])
-    (adjust-offsets old-left n)
-    
-    (let ([l (node-right old-left)])
-      (set-node-left! n l)
-      (when l
-        (set-node-parent! l n)))
-    
-    (let ([p (node-parent n)])
-      (set-node-parent! old-left p)
-      (cond
-       [(not p) (set-btree-root! btree old-left)]
-       [(eq? n (node-left p)) (set-node-left! p old-left)]
-       [else                 (set-node-right! p old-left)]))
-    
-    (set-node-right! old-left n)
-    (set-node-parent! n old-left)))
-
-
-(define (insert before? n btree pos data)
-  (let ([new (node pos data #f #f #f 'black)])
-    (if (not (btree-root btree))
-        (set-btree-root! btree new)
-        
-        (begin
-          
-          (set-node-color! new 'red)
-          
-                                        ; Insert into tree
-          (if before?
-              
-              (if (not (node-left n))
-                  (begin
-                    (set-node-left! n new)
-                    (set-node-parent! new n))
-                  
-                  (let loop ([node (node-left n)])
-                    (if (node-right node)
-                        (loop (node-right node))
-                        (begin
-                          (set-node-right! node new)
-                          (set-node-parent! new node)))))
-              
-              (if (not (node-right n))
-                  (begin
-                    (set-node-right! n new)
-                    (set-node-parent! new n))
-                  
-                  (let loop ([node (node-right n)])
-                    (if (node-left node)
-                        (loop (node-left node))
-                        (begin
-                          (set-node-left! node new)
-                          (set-node-parent! new node))))))
-          
-                                        ; Make value in new node relative to right-hand parents
-          (let loop ([node new])
-            (let ([p (node-parent node)])
-              (when p
-                (when (eq? node (node-right p))
-                  (adjust-offsets p new))
-                (loop p))))
-          
-                                        ; Balance tree
-          (let loop ([node new])
-            (let ([p (node-parent node)])
-              (when (and (not (eq? node (btree-root btree)))
-                         (eq? 'red (node-color p)))
-                (let* ([recolor-k
-                        (lambda (y)
-                          (set-node-color! p 'black)
-                          (set-node-color! y 'black)
-                          (let ([pp (node-parent p)])
-                            (set-node-color! pp 'red)
-                            (loop pp)))]
-                       [rotate-k
-                        (lambda (rotate node)
-                          (let ([p (node-parent node)])
-                            (set-node-color! p 'black)
-                            (let ([pp (node-parent p)])
-                              (set-node-color! pp 'red)
-                              (rotate pp btree)
-                              (loop pp))))]
-                       [k
-                        (lambda (node-y long-rotate always-rotate)
-                          (let ([y (node-y (node-parent p))])
-                            (if (and y (eq? 'red (node-color y)))
-                                (recolor-k y)
-                                (let ([k (lambda (node)
-                                           (rotate-k always-rotate node))])
-                                  (if (eq? node (node-y p))
-                                      (begin
-                                        (long-rotate p btree)
-                                        (k p))
-                                      (k node))))))])
-                  (if (eq? p (node-left (node-parent p)))
-                      (k node-right rotate-left rotate-right)
-                      (k node-left rotate-right rotate-left))))))
-          
-          (set-node-color! (btree-root btree) 'black)))))
-
-(define (find-following-node btree pos)
-  (let ([root (btree-root btree)])
-    (let loop ([n root]
-               [so-far root]
-               [so-far-pos (and root (node-pos root))]
-               [v 0])
-      (if (not n) 
-          (values so-far so-far-pos)
-          (let ([npos (+ (node-pos n) v)])
-            (cond
-             [(<= pos npos)
-              (loop (node-left n) n npos v)]
-             [(or (not so-far-pos)
-                  (> npos so-far-pos))
-              (loop (node-right n) n npos npos)]
-             [else
-              (loop (node-right n) so-far so-far-pos npos)]))))))
-
-(define (create-btree)
-  (btree #f))
-
-(define (btree-get btree pos)
-  (let-values ([(n npos) (find-following-node btree pos)])
-    (and n
-         (= npos pos)
-         (node-data n))))
-
-(define (btree-put! btree pos data)
-  (let-values ([(n npos) (find-following-node btree pos)])
-    (if (and n (= npos pos))
-        (set-node-data! n data)
-        (insert (and n (< pos npos))
-                n btree pos data))))
-
-(define (btree-shift! btree start delta)
-  (let loop ([n (btree-root btree)]
-             [v 0])
-    (when n
-      (let ([npos (node-pos n)])
-        (cond
-         [(< start (+ v npos))
-          (set-node-pos! n (+ npos delta))
-          (loop (node-left n) v)]
-         [else
-          (loop (node-right n) (+ v npos))])))))
-
-(define (btree-for-each btree f)
-  (when (btree-root btree)
-    (let loop ([n (btree-root btree)]
-               [v 0])
-      (when (node-left n)
-        (loop (node-left n) v))
-      (f (+ v (node-pos n)) (node-data n))
-      (when (node-right n)
-        (loop (node-right n)
-              (+ v (node-pos n)))))))
-
-(define (btree-map btree f)
-  (reverse
-   (let loop ([n (btree-root btree)]
-              [v 0]
-              [a null])
-     (if (not n)
-         a
-         (let* ([pre (loop (node-left n) v a)]
-                [here (cons (f (+ v (node-pos n))
-                               (node-data n))
-                            pre)])
-           (loop (node-right n)
-                 (+ v (node-pos n))
-                 here))))))
diff --git a/pkgs/drracket-pkgs/drracket/browser/private/bullet.rkt b/pkgs/drracket-pkgs/drracket/browser/private/bullet.rkt
deleted file mode 100644
index 3ec5281980..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/private/bullet.rkt
+++ /dev/null
@@ -1,94 +0,0 @@
-#lang racket
-(require racket/gui
-         racket/class)
-
-(provide bullet-snip%
-         get-bullet-width
-         bullet-size
-         bullet-snip-class)
-
-(define snip-class-name "(lib \"bullet-snip.rkt\" \"browser\")")
-
-(define bullet-size 
-  (make-parameter
-   (let ([s (send (send (send (make-object text%) get-style-list) basic-style)
-                  get-size)])
-     (max 7 (quotient s 2)))))
-
-(define (get-bullet-width)
-  (* 2 (bullet-size)))
-
-(define transparent-brush (send the-brush-list find-or-create-brush "WHITE" 'transparent))
-
-(define bullet-snip%
-  (class snip% 
-    (init-field depth)
-    (inherit set-snipclass set-count get-style)
-    (define bsize (bullet-size))
-    (define/private (zero b) (when b (set-box! b 0)))
-    [define/private get-height
-      (lambda (dc)
-        (let ([s (get-style)])
-          (max bsize (- (send s get-text-height dc)
-                        (send s get-text-descent dc)))))]
-    
-    [define/override get-extent
-      (lambda (dc x y wbox hbox descentbox spacebox
-                  lspacebox rspacebox)
-        (when hbox
-          (set-box! hbox (get-height dc)))
-        (when wbox
-          (set-box! wbox (* 2 bsize)))
-        (zero descentbox)
-        (zero spacebox)
-        (zero rspacebox)
-        (zero lspacebox))]
-    [define/override draw
-      (lambda (dc x y . other)
-        (let ([y (+ y (ceiling (/ (- (get-height dc) bsize) 2)))])
-          (let-values ([(draw solid?)
-                        (case depth
-                          [(0) (values (lambda (x y w h) (send dc draw-ellipse x y w h)) #t)]
-                          [(1) (values (lambda (x y w h) (send dc draw-ellipse x y w h)) #f)]
-                          [else (values (lambda (x y w h) (send dc draw-rectangle x y w h)) #f)])])
-            (let ([b (send dc get-brush)])
-              (send dc set-brush
-                    (if solid?
-                        (send the-brush-list
-                              find-or-create-brush
-                              (send (send dc get-pen) get-color)
-                              'solid)
-                        transparent-brush))
-              (draw x y bsize bsize)
-              (send dc set-brush b)))))]
-    [define/override copy
-      (lambda ()
-        (make-object bullet-snip% depth))]
-    [define/override write
-      (lambda (stream)
-        (send stream put depth))]
-    [define/override get-text
-      (lambda (offset num flattened?)
-        (if (< num 1)
-            ""
-            (if flattened?
-                "* "
-                "*")))]
-    (super-new)
-    (set-snipclass bullet-snip-class)
-    (set-count 1)))
-
-(define bullet-snip-class
-  (make-object 
-      (class snip-class%
-        (inherit set-classname)
-        [define/override read
-          (lambda (stream)
-            (let ([d-box (box 0)])
-              (send stream get d-box)
-              (make-object bullet-snip% (unbox d-box))))]
-        (super-new)
-        (set-classname snip-class-name))))
-
-(send (get-the-snip-class-list) add bullet-snip-class)
-
diff --git a/pkgs/drracket-pkgs/drracket/browser/private/entity-names.rkt b/pkgs/drracket-pkgs/drracket/browser/private/entity-names.rkt
deleted file mode 100644
index 0095cff995..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/private/entity-names.rkt
+++ /dev/null
@@ -1,261 +0,0 @@
-#lang racket
-(provide entity-name->integer)
-
-(define table 
-  #hasheq((nbsp . 160)
-          (iexcl . 161)
-          (cent . 162)
-          (pound . 163)
-          (curren . 164)
-          (yen . 165)
-          (brvbar . 166)
-          (sect . 167)
-          (uml . 168)
-          (copy . 169)
-          (ordf . 170)
-          (laquo . 171)
-          (not . 172)
-          (shy . 173)
-          (reg . 174)
-          (macr . 175)
-          (deg . 176)
-          (plusmn . 177)
-          (sup2 . 178)
-          (sup3 . 179)
-          (acute . 180)
-          (micro . 181)
-          (para . 182)
-          (middot . 183)
-          (cedil . 184)
-          (sup1 . 185)
-          (ordm . 186)
-          (raquo . 187)
-          (frac14 . 188)
-          (frac12 . 189)
-          (frac34 . 190)
-          (iquest . 191)
-          (Agrave . 192)
-          (Aacute . 193)
-          (Acirc . 194)
-          (Atilde . 195)
-          (Auml . 196)
-          (Aring . 197)
-          (AElig . 198)
-          (Ccedil . 199)
-          (Egrave . 200)
-          (Eacute . 201)
-          (Ecirc . 202)
-          (Euml . 203)
-          (Igrave . 204)
-          (Iacute . 205)
-          (Icirc . 206)
-          (Iuml . 207)
-          (ETH . 208)
-          (Ntilde . 209)
-          (Ograve . 210)
-          (Oacute . 211)
-          (Ocirc . 212)
-          (Otilde . 213)
-          (Ouml . 214)
-          (times . 215)
-          (Oslash . 216)
-          (Ugrave . 217)
-          (Uacute . 218)
-          (Ucirc . 219)
-          (Uuml . 220)
-          (Yacute . 221)
-          (THORN . 222)
-          (szlig . 223)
-          (agrave . 224)
-          (aacute . 225)
-          (acirc . 226)
-          (atilde . 227)
-          (auml . 228)
-          (aring . 229)
-          (aelig . 230)
-          (ccedil . 231)
-          (egrave . 232)
-          (eacute . 233)
-          (ecirc . 234)
-          (euml . 235)
-          (igrave . 236)
-          (iacute . 237)
-          (icirc . 238)
-          (iuml . 239)
-          (eth . 240)
-          (ntilde . 241)
-          (ograve . 242)
-          (oacute . 243)
-          (ocirc . 244)
-          (otilde . 245)
-          (ouml . 246)
-          (divide . 247)
-          (oslash . 248)
-          (ugrave . 249)
-          (uacute . 250)
-          (ucirc . 251)
-          (uuml . 252)
-          (yacute . 253)
-          (thorn . 254)
-          (yuml . 255)
-          (fnof . 402)
-          (Alpha . 913)
-          (Beta . 914)
-          (Gamma . 915)
-          (Delta . 916)
-          (Epsilon . 917)
-          (Zeta . 918)
-          (Eta . 919)
-          (Theta . 920)
-          (Iota . 921)
-          (Kappa . 922)
-          (Lambda . 923)
-          (Mu . 924)
-          (Nu . 925)
-          (Xi . 926)
-          (Omicron . 927)
-          (Pi . 928)
-          (Rho . 929)
-          (Sigma . 931)
-          (Tau . 932)
-          (Upsilon . 933)
-          (Phi . 934)
-          (Chi . 935)
-          (Psi . 936)
-          (Omega . 937)
-          (alpha . 945)
-          (beta . 946)
-          (gamma . 947)
-          (delta . 948)
-          (epsilon . 949)
-          (zeta . 950)
-          (eta . 951)
-          (theta . 952)
-          (iota . 953)
-          (kappa . 954)
-          (lambda . 955)
-          (mu . 956)
-          (nu . 957)
-          (xi . 958)
-          (omicron . 959)
-          (pi . 960)
-          (rho . 961)
-          (sigmaf . 962)
-          (sigma . 963)
-          (tau . 964)
-          (upsilon . 965)
-          (phi . 966)
-          (chi . 967)
-          (psi . 968)
-          (omega . 969)
-          (thetasym . 977)
-          (upsih . 978)
-          (piv . 982)
-          (bull . 8226)
-          (hellip . 8230)
-          (prime . 8242)
-          (Prime . 8243)
-          (oline . 8254)
-          (frasl . 8260)
-          (weierp . 8472)
-          (image . 8465)
-          (real . 8476)
-          (trade . 8482)
-          (alefsym . 8501)
-          (larr . 8592)
-          (uarr . 8593)
-          (rarr . 8594)
-          (darr . 8595)
-          (harr . 8596)
-          (crarr . 8629)
-          (lArr . 8656)
-          (uArr . 8657)
-          (rArr . 8658)
-          (dArr . 8659)
-          (hArr . 8660)
-          (forall . 8704)
-          (part . 8706)
-          (exist . 8707)
-          (empty . 8709)
-          (nabla . 8711)
-          (isin . 8712)
-          (notin . 8713)
-          (ni . 8715)
-          (prod . 8719)
-          (sum . 8721)
-          (minus . 8722)
-          (lowast . 8727)
-          (radic . 8730)
-          (prop . 8733)
-          (infin . 8734)
-          (ang . 8736)
-          (and . 8743)
-          (or . 8744)
-          (cap . 8745)
-          (cup . 8746)
-          (int . 8747)
-          (there4 . 8756)
-          (sim . 8764)
-          (cong . 8773)
-          (asymp . 8776)
-          (ne . 8800)
-          (equiv . 8801)
-          (le . 8804)
-          (ge . 8805)
-          (sub . 8834)
-          (sup . 8835)
-          (nsub . 8836)
-          (sube . 8838)
-          (supe . 8839)
-          (oplus . 8853)
-          (otimes . 8855)
-          (perp . 8869)
-          (sdot . 8901)
-          (lceil . 8968)
-          (rceil . 8969)
-          (lfloor . 8970)
-          (rfloor . 8971)
-          (lang . 9001)
-          (rang . 9002)
-          (loz . 9674)
-          (spades . 9824)
-          (clubs . 9827)
-          (hearts . 9829)
-          (diams . 9830)
-          (quot . 34)
-          (amp . 38)
-          (lt . 60)
-          (gt . 62)
-          (OElig . 338)
-          (oelig . 339)
-          (Scaron . 352)
-          (scaron . 353)
-          (Yuml . 376)
-          (circ . 710)
-          (tilde . 732)
-          (ensp . 8194)
-          (emsp . 8195)
-          (thinsp . 8201)
-          (zwnj . 8204)
-          (zwj . 8205)
-          (lrm . 8206)
-          (rlm . 8207)
-          (ndash . 8211)
-          (mdash . 8212)
-          (lsquo . 8216)
-          (rsquo . 8217)
-          (sbquo . 8218)
-          (ldquo . 8220)
-          (rdquo . 8221)
-          (bdquo . 8222)
-          (dagger . 8224)
-          (Dagger . 8225)
-          (permil . 8240)
-          (lsaquo . 8249)
-          (rsaquo . 8250)
-          (euro . 8364)))
-
-(define (entity-name->integer s)
-  (hash-ref table s (lambda () #f)))
-
-
diff --git a/pkgs/drracket-pkgs/drracket/browser/private/html.rkt b/pkgs/drracket-pkgs/drracket/browser/private/html.rkt
deleted file mode 100644
index 0f97992d78..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/private/html.rkt
+++ /dev/null
@@ -1,1258 +0,0 @@
-#lang racket/unit
-
-(require "sig.rkt"
-         mred/mred-sig
-         racket/file
-         racket/port
-         net/url-sig
-         (only-in html read-html-as-xml read-html-comments use-html-spec)
-         (except-in xml read-comments)
-         racket/class
-         "bullet.rkt"
-         "option-snip.rkt"
-         "entity-names.rkt")
-
-
-(import mred^ url^)
-(export html^)
-(init-depend mred^)    
-
-;; CACHE
-(define NUM-CACHED 10)
-(define cached (make-vector 10 'no-image))
-(define cached-name (make-vector 10 #f)) ; string or #f
-(define cached-use (make-vector 10 0))
-
-(define html-status-handler
-  (make-parameter
-   void
-   (lambda (f)
-     (unless (and (procedure? f)
-                  (procedure-arity-includes? f 1))
-       (raise-type-error 'html-status-handler
-                         "procedure of arity 1"
-                         f))
-     f)))
-
-(define (status . args)
-  ((html-status-handler) (apply format args)))
-
-(define status-stack (make-parameter null))
-
-;; load-status : boolean string (union #f url) -> void
-(define (load-status push? what url)
-  (let ([s (format "Loading ~a ~a..." 
-                   what 
-                   (if url
-                       (trim 150 (url->string url))
-                       "unknown url"))])
-    (status-stack (cons s (if push? (status-stack) null)))
-    (status "~a" s)))
-
-(define (pop-status)
-  (status-stack (cdr (status-stack)))
-  (status "~a" (car (status-stack))))
-(define (trim len s)
-  (if ((string-length s) . <= . len)
-      s
-      (string-append (substring s 0 (- len 4)) " ...")))
-
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Imap maps
-;;
-
-(define-struct image-map-rect (href left top right bottom))
-
-(define finger-cursor (make-object cursor% 'arrow))
-
-(define image-map-snip%
-  (class image-snip%
-    
-    (init-field html-text)
-    
-    (field [key "#key"])
-    (define/public (set-key k) (set! key k))
-    (define/public (get-key) key)
-    
-    (field [rects null])
-    
-    (define/public (set-rects rs) (set! rects rs))
-    
-    (inherit get-admin)
-    
-    (define/private (find-rect x y)
-      (let loop ([rects rects])
-        (cond
-         [(null? rects) #f]
-         [else
-          (let ([rect (car rects)])
-            (if (and (<= (image-map-rect-left rect) x (image-map-rect-right rect))
-                     (<= (image-map-rect-top rect) y (image-map-rect-bottom rect)))
-                rect
-                (loop (cdr rects))))])))
-    
-    ;; add-area : string (listof number) string -> void
-    ;; currently only supports rect shapes
-    (define/public (add-area shape coords href)
-      (when (and (equal? shape "rect")
-                 (= 4 (length coords)))
-        (let ([x1 (car coords)]
-              [y1 (cadr coords)]
-              [x2 (caddr coords)]
-              [y2 (cadddr coords)])
-          (set! rects (cons (make-image-map-rect
-                             href
-                             (min x1 x2)
-                             (min y1 y2)
-                             (max x1 x2)
-                             (max y1 y2))
-                            rects)))))
-    
-    (define/override (on-event dc x y editor-x editor-y evt)
-      (when (send evt button-up?)
-        (let* ([snipx (- (send evt get-x) x)]
-               [snipy (- (send evt get-y) y)]
-               [rect (find-rect snipx snipy)])
-          (when rect
-            (send html-text post-url (image-map-rect-href rect)))))
-      (super on-event dc x y editor-x editor-y evt))
-    
-    (define/override (adjust-cursor dc x y editor-x editor-y evt)
-      (let ([snipx (- (send evt get-x) x)]
-            [snipy (- (send evt get-y) y)])
-        (if (find-rect snipx snipy)
-            finger-cursor
-            #f)))
-
-    ;; warning: buggy. This doesn't actually copy the bitmap
-    ;; over because there's no get-bitmap method for image-snip%
-    ;; at the time of this writing.
-    (define/override (copy)
-      (let ([cp (new image-map-snip% (html-text html-text))])
-        (send cp set-key key)
-        (send cp set-rects rects)))
-    
-    (super-make-object)
-    
-    (inherit set-flags get-flags)
-    (set-flags (cons 'handles-events (get-flags)))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Hardwired Racket colorization; should come from a .css file
-;;
-
-(define (make-racket-color-delta col)
-  (let ([d (make-object style-delta%)])
-    (send d set-delta-foreground col)
-    d))
-
-(define racket-code-delta (make-racket-color-delta "brown"))
-(define racket-code-delta/keyword
-  (let ([d (make-racket-color-delta (make-object color% #x99 0 0))])
-    (send d set-weight-on 'bold)
-    d))
-(define racket-code-delta/variable (make-racket-color-delta "navy"))
-(define racket-code-delta/global (make-racket-color-delta "purple"))
-(define racket-code-delta/selfeval (make-racket-color-delta "forest green"))
-(define racket-code-delta/comment (make-racket-color-delta "cornflower blue"))
-(define navigation-delta (let ([d (make-racket-color-delta "red")])
-                           (send d set-style-on 'italic)
-                           d))
-
-(define current-style-class (make-parameter null))
-
-(define (lookup-class-delta class)
-  (let ([class-path (cons class (current-style-class))])
-    (cond
-     [(sub-path? class-path '("racket")) racket-code-delta]
-     [(sub-path? class-path '("keyword" "racket")) racket-code-delta/keyword]
-     [(sub-path? class-path '("variable" "racket")) racket-code-delta/variable]
-     [(sub-path? class-path '("global" "racket")) racket-code-delta/global]
-     [(or (sub-path? class-path '("selfeval" "racket"))
-          (sub-path? class-path '("racketresponse"))) racket-code-delta/selfeval]
-     [(sub-path? class-path '("comment" "racket")) racket-code-delta/comment]
-     [(sub-path? class-path '("navigation")) navigation-delta]
-     [else #f])))
-
-(define (sub-path? a b)
-  (cond
-   [(null? b) #t]
-   [(null? a) #f]
-   [else (and (equal? (car a) (car b))
-              (sub-path? (cdr a) (cdr b)))]))
-
-(define (with-style-class class thunk)
-  (if class
-      (parameterize ([current-style-class (cons class (current-style-class))])
-        (thunk))
-      (thunk)))
-
-(define (lookup-span-class-delta class) (lookup-class-delta class))
-
-(define re:hexcolor 
-  (regexp "^#([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$"))
-
-(define color-string->color
-  (lambda (str)
-    (let ([m (regexp-match re:hexcolor str)])
-      (if m
-          (make-object color%
-                       (string->number (cadr m) 16)
-                       (string->number (caddr m) 16)
-                       (string->number (cadddr m) 16))
-          (send the-color-database find-color str)))))
-
-(define html-eval-ok (make-parameter #t))
-(define html-img-ok (make-parameter #t))
-
-(define (get-bitmap-from-url url)
-  (if (html-img-ok)
-      (let ([tmp-filename (make-temporary-file "rktguiimg~a")])
-        (load-status #t "image" url)
-        (call-with-output-file* tmp-filename
-                                (lambda (op)
-                                  (with-handlers ([exn:fail? 
-                                                   (lambda (x)
-                                                     (printf "exn.9 ~s\n" (and (exn? x)
-                                                                               (exn-message x)))
-                                                     (void))])
-                                    (call/input-url 
-                                     url
-                                     get-pure-port
-                                     (lambda (ip)
-                                       (copy-port ip op)))))
-                                #:exists 'truncate)
-        (pop-status)
-        (let ([bitmap (make-object bitmap% tmp-filename)])
-          (with-handlers ([exn:fail?
-                           (lambda (x)
-                             (message-box "Warning"
-                                          (format "Could not delete file ~s\n\n~a"
-                                                  tmp-filename
-                                                  (if (exn? x)
-                                                      (exn-message x)
-                                                      x))))])
-            (delete-file tmp-filename))
-          (if (send bitmap ok?)
-              bitmap
-              #f)))
-      #f))
-
-;; cache-bitmap : string -> (is-a?/c bitmap%)
-(define (cache-bitmap url)
-  (let ([url-string (url->string url)])
-    (let loop ([n 0])
-      (cond
-       [(= n NUM-CACHED)
-        ;; Look for item to uncache
-        (vector-set! cached-use 0 (max 0 (sub1 (vector-ref cached-use 0))))
-        (let ([m (let loop ([n 1][m (vector-ref cached-use 0)])
-                   (if (= n NUM-CACHED)
-                       m
-                       (begin
-                         (vector-set! cached-use n (max 0 (sub1 (vector-ref cached-use n))))
-                         (loop (add1 n) (min m (vector-ref cached-use n))))))])
-          (let loop ([n 0])
-            (if (= (vector-ref cached-use n) m)
-                (let ([bitmap (get-bitmap-from-url url)])
-                  (cond
-                   [bitmap
-                    (vector-set! cached n bitmap)
-                    (vector-set! cached-name n url-string)
-                    (vector-set! cached-use n 5)
-                    bitmap]
-                   [else #f]))
-                (loop (add1 n)))))]
-       [(equal? url-string (vector-ref cached-name n))
-        (vector-set! cached-use n (min 10 (add1 (vector-ref cached-use n))))
-        (vector-ref cached n)]
-       [else
-        (loop (add1 n))]))))
-
-(define (update-image-maps image-map-snips image-maps)
-  (for-each
-   (lambda (image-map-snip)
-     (let ([image-map-key (send image-map-snip get-key)])
-       (let loop ([image-maps image-maps])
-         (cond
-          [(null? image-maps) (void)]
-          [else
-           (let* ([image-map (car image-maps)]
-                  [name (get-field image-map 'name)])
-             (if (and name 
-                      (equal? (format "#~a" name)
-                              (send image-map-snip get-key)))
-                 (find/add-areas image-map-snip image-map)
-                 (loop (cdr image-maps))))]))))
-   image-map-snips))
-
-(define (find/add-areas image-map-snip image-map)
-  (let loop ([sexp image-map])
-    (cond
-     [(and (pair? sexp)
-           (eq? (car sexp) 'area)
-           (pair? (cdr sexp)))
-      (add-area image-map-snip (cadr sexp))
-      (loop (cddr sexp))]
-     [(pair? sexp)
-      (loop (car sexp))
-      (loop (cdr sexp))]
-     [else (void)])))
-
-;; add-area : snip (listof (list sym string))[assoc] -> void
-;; the second arg type is actually `any', but if it
-;; matches the above, it is interprted propoerly;
-;; otherwise silently nothing happens.
-(define (add-area image-map-snip sexp)
-  (let ([shape #f]
-        [coords #f]
-        [href #f])
-    (let loop ([sexp sexp])
-      (cond
-       [(pair? sexp)
-        (let ([fst (car sexp)])
-          (when (and (pair? fst)
-                     (symbol? (car fst))
-                     (pair? (cdr fst))
-                     (string? (cadr fst)))
-            (case (car fst)
-              [(shape) (set! shape (cadr fst))]
-              [(coords) (set! coords (cadr fst))]
-              [(href) (set! href (cadr fst))]
-              [else (void)]))
-          (loop (cdr sexp)))]
-       [else (void)]))
-    (when (and shape coords href)
-      (let ([p-coords (parse-coords coords)])
-        (when p-coords
-          (send image-map-snip add-area shape p-coords href))))))
-
-;; parse-coords : string -> (listof number)
-;; separates out a bunch of comma separated numbers in a string
-;; into a list of racket numbers
-(define (parse-coords str)
-  (let loop ([str str])
-    (cond
-     [(regexp-match #rx"^[ \t\n]*([0-9]+)[ \t\n]*,(.*)$" str)
-      =>
-      (lambda (m)
-        (let ([num (cadr m)]
-              [rst (caddr m)])
-          (cons (string->number num)
-                (loop rst))))]
-     [(regexp-match #rx"^[ \t\n]*([0-9]+)[ \t\n]*" str)
-      =>
-      (lambda (m)
-        (list (string->number (cadr m))))]
-     [else null])))
-
-(define (make-get-field str)
-  (let ([s (apply
-            string-append
-            (map
-             (lambda (c)
-               (format "[~a~a]"
-                       (char-upcase c)
-                       (char-downcase c)))
-             (string->list str)))]
-        [spc (string #\space #\tab #\newline #\return #\vtab)])
-    (let ([re:plain (regexp (format "(^|[~a])~a[~a]*=[~a]*([^~a]*)" spc s spc spc spc))]
-          [re:quote (regexp (format "(^|[~a])~a[~a]*=[~a]*\"([^\"]*)\"" spc s spc spc))])
-      (lambda (args)
-        (let ([m (or (regexp-match re:quote args)
-                     (regexp-match re:plain args))])
-          (and m (caddr m)))))))
-
-(define (get-field e name)
-  (let ([a (assq name (cadr e))])
-    (and a (cadr a))))
-
-(define get-racket-arg
-  (let ([get-rkt (make-get-field "racket")])
-    (lambda (str)
-      (let ([v (get-rkt str)])
-        (and v (filter-racket v))))))
-
-(define filter-racket 
-  (lambda (v)
-    (regexp-replace* "[|]" v "\"")))
-
-(define face-list #f)
-
-(define default-font (make-object font% 12 'default))
-
-(define re:quot (regexp "[&][qQ][uU][oO][tT][;]"))
-(define re:amp (regexp "[&][aA][mM][pP][;]"))
-
-(define re:empty (regexp (format "^[ ~c]*$" (integer->char 160))))
-
-(define-struct form (action target method [parts #:mutable] [active-select #:mutable]))
-(define (protect-chars s)
-  (apply string-append 
-         (map (lambda (c)
-                (if (or (char-alphabetic? c)
-                        (char-numeric? c))
-                    (string c)
-                    (format "%~a"
-                            (let ([s (format "0~x" (or (char->integer c) 65))])
-                              (substring s (- (string-length s) 2) (string-length s))))))
-              (string->list s))))
-
-(define re:true (regexp-quote "true" #f))
-(define (true? s) (regexp-match re:true s))
-
-(define verbatim-tags '(listing xmp plaintext))
-(define preformatted-tags '(pre))
-(define exact-whitespace-tags (append verbatim-tags
-                                      preformatted-tags))
-(define comment-tags '(script))
-(define atomic-tags '(p br hr li dd dt img html meta link input))
-(define enum-tags '(ul dl ol menu))
-
-(define space-eating-tags '(title p div center br h1 h2 h3 h4
-                                  li dt dd
-                                  ul ol dl menu
-                                  samp kbd pre blockquote
-                                  table tr td))
-
-(define whitespace-string "[ \t\n\r\v\f]+")
-(define re:whitespace (regexp whitespace-string))
-(define re:starting-whitespace (regexp (format "^~a" whitespace-string)))
-(define re:ending-whitespace (regexp (format "~a$" whitespace-string)))
-(define re:leading-newline (regexp "^(\r|\n|(\r\n))"))
-
-(define (remove-leading-newline c)
-  (cond
-   [(string? c)
-    (let ([s (regexp-match-positions re:leading-newline c)])
-      (cond
-       [(and s (= (cdar s) (length s)))
-        ;; It's all newline:
-        (values "" #t)]
-       [s (values (substring c (cdar s) (string-length c)) #t)]
-       [else (values c #t)]))]
-   [(pair? c)
-    (let loop ([b (cddr c)][accum null])
-      (if (null? b)
-          (values (list* (car c) (cadr c) (reverse accum)) #f)
-          (let-values ([(d done?) (remove-leading-newline (car b))])
-            (if done?
-                (values (list* (car c) (cadr c) (append (reverse accum)
-                                                        (list d)
-                                                        (cdr b)))
-                        #t)
-                (loop (cdr b) (cons d accum))))))]
-   [else (values c #f)]))
-
-(define (fixup-whitespace c leading-ok?)
-  (cond
-   [(string? c)
-    (let ([s (regexp-match-positions re:starting-whitespace c)]
-          [e (regexp-match-positions re:ending-whitespace c)])
-      (if (and s e
-               (= (caar s) (caar e)))
-          ;; It's all whitespace:
-          (if leading-ok?
-              (values " " #f)
-              (values "" #f))
-          ;; Normal case:
-          (values
-           (string-append
-            (if (and s leading-ok?) " " "")
-            (regexp-replace* re:whitespace
-                             (substring c 
-                                        (if s
-                                            (cdar s)
-                                            0)
-                                        (if e
-                                            (caar e)
-                                            (string-length c)))
-                             " ")
-            (if e " " ""))
-           (not e))))]
-   [(symbol? c) (values c #t)]
-   [(number? c) (values c #t)]
-   [(comment? c)
-    (let ([code (get-racket-arg (comment-text c))])
-      (if code
-          (let ([s (with-handlers ([exn:fail?
-                                    (lambda (exn)
-                                      (format
-                                       "<font color=\"red\">Error during &lt;!-- RACKET=... --&gt;: <i>~a</i></font>"
-                                       (if (exn? exn)
-                                           (exn-message exn)
-                                           (format "~s" exn))))])
-                     (if (html-eval-ok)
-                         (eval (read (open-input-string code)))
-                         (error "disabled")))])
-            (if (string? s)
-                (let ([content (read-html (open-input-string s))])
-                  (fixup-whitespace content leading-ok?))
-                (values "" leading-ok?)))
-          (values "" leading-ok?)))]
-   [(p-i? c) (values "" leading-ok?)] ;; processing instruction
-   [else (let ([tag (car c)])
-           (if (memq tag exact-whitespace-tags)
-               (let-values ([(s done?) (remove-leading-newline c)])
-                 (values s #f))
-               (let-values ([(body leading-ok?)
-                             (let loop ([l (cddr c)][leading-ok? 
-                                                     (and leading-ok?
-                                                          (not (memq tag space-eating-tags)))])
-                               (if (null? l)
-                                   (values null leading-ok?)
-                                   (let*-values ([(f l-ok?)
-                                                  (fixup-whitespace (car l) leading-ok?)]
-                                                 [(r l-ok?)
-                                                  (loop (cdr l) l-ok?)])
-                                     (values (cons f r) l-ok?))))])
-                 (values
-                  (list*
-                   tag
-                   (cadr c) ; attributes
-                   body)
-                  (and leading-ok?
-                       (not (memq tag space-eating-tags)))))))]))
-
-(define (read-html a-port)
-  (let* ([xml (parameterize ([read-html-comments #t]
-                             [use-html-spec #f])
-                (read-html-as-xml a-port))]
-         [xexpr `(html () ,@(map xml->xexpr xml))])
-    xexpr))
-
-(define (parse-html a-port)
-  (let ([raw (read-html a-port)])
-    (let-values ([(v ?) (fixup-whitespace raw #f)])
-      v)))
-
-(define html-convert
-  (lambda (a-port a-text)
-    (let ([content (parse-html a-port)])
-      (with-method ([a-text-insert (a-text insert)]
-                    [current-pos (a-text last-position)]
-                    [delete (a-text delete)]
-                    [get-character (a-text get-character)]
-                    [change-style (a-text change-style)])
-                   (letrec ([image-map-snips null]
-                            [image-maps null]
-                            
-                            [html-basic-style
-                             (let ([sl (send a-text get-style-list)])
-                               (or (send sl find-named-style "Html Standard")
-                                   (send sl find-named-style "Standard")
-                                   (send sl find-named-style "Basic")))]
-                            
-                            ;; inserts 
-                            [insert 
-                             (λ (what)
-                                (let ([pos-before (current-pos)])
-                                  (a-text-insert what pos-before)
-                                  (let ([pos-after (current-pos)])
-                                    (change-style html-basic-style pos-before pos-after))))]
-                            
-                            [insert-newlines
-                             (lambda (num forced-lines para-base)
-                               (let ([num (max num forced-lines)])
-                                 (unless (zero? num)
-                                   (let loop ([pos (current-pos)][num num])
-                                     (unless (or (zero? num) (<= pos para-base))
-                                       (let ([c (get-character (sub1 pos))])
-                                         (if (eq? c #\newline)
-                                             (loop (sub1 pos) (sub1 num))
-                                             (insert (make-string num #\newline)))))))))]
-                            
-                            [backover-newlines
-                             (lambda (pos base)
-                               (if (= pos base)
-                                   base
-                                   (let ([c (get-character (sub1 pos))])
-                                     (if (eq? c #\newline)
-                                         (backover-newlines (sub1 pos) base)
-                                         pos))))]
-                            
-                            [whitespaces (string #\space #\tab #\newline #\return)]
-                            
-                            [delta:fixed (make-object style-delta% 'change-family 'modern)]
-                            [delta:default-face (make-object style-delta% 'change-family 'default)]
-                            [delta:bold (make-object style-delta% 'change-bold)] 
-                            [delta:underline (make-object style-delta% 'change-underline #t)]
-                            [delta:italic (make-object style-delta% 'change-italic)]
-                            [delta:h1 (let ([d (make-object style-delta% 'change-bold)])
-                                        (send d set-size-mult 2.0)
-                                        d)]
-                            [delta:h2 (let ([d (make-object style-delta% 'change-bold)])
-                                        (send d set-size-mult 1.5)
-                                        d)]
-                            [delta:h3 (let ([d (make-object style-delta% 'change-bold)])
-                                        (send d set-size-mult 1.2)
-                                        d)]
-                            [delta:h4 (make-object style-delta% 'change-bold)]
-                            [delta:subscript (let ([d (make-object style-delta%)])
-                                               (send d set-alignment-on 'bottom)
-                                               (send d set-size-mult 0.8)
-                                               d)]
-                            [delta:superscript (let ([d (make-object style-delta%)])
-                                                 (send d set-alignment-on 'top)
-                                                 (send d set-size-mult 0.8)
-                                                 d)]
-                            [delta:small (let ([d (make-object style-delta%)])
-                                           (send d set-size-mult 0.75)
-                                           d)]
-                            
-                            [delta:center (make-object style-delta% 'change-alignment 'center)]
-                            [delta:symbol (make-object style-delta% 'change-family 'symbol)]
-                            
-                            [html-error
-                             (lambda args
-                               (when #f ; treat them all as ignored warnings
-                                 (apply error 'html args)))]
-                            
-                            [re:transparent #rx"[Tt][Rr][Aa][Nn][Ss][Pp][Aa][Rr][Ee][Nn][Tt]"]
-                            
-                            [parse-image-source
-                             (lambda (s)
-                               (let ([src (get-field s 'src)]
-                                     [base-url (send a-text get-url)])
-                                 (and src
-                                      (with-handlers ([exn:fail? (lambda (x) #f)])
-                                        (if base-url
-                                            (combine-url/relative base-url src)
-                                            (string->url src))))))]
-                            
-                            [unescape 
-                             (lambda (s)
-                               (apply string-append 
-                                      (map (lambda (x)
-                                             (if (pcdata? x)
-                                                 (pcdata-string x)
-                                                 ""))
-                                           (read-html-as-xml 
-                                            (open-input-string s)))))]
-                            [parse-href
-                             (let ([href-error
-                                    (lambda (s)
-                                      (html-error "bad reference in ~s" s))])
-                               (lambda (s)
-                                 (let* ([url-string
-                                         (cond 
-                                          [(get-field s 'href)
-                                           => (lambda (str)
-                                                (if (string=? str "")
-                                                    (begin (href-error s)
-                                                           #f)
-                                                    (unescape str)))]
-                                          [else #f])]
-                                        [label (get-field s 'name)]
-                                        [racket (let ([v (get-field s 'racket)])
-                                                  (and v (filter-racket v)))])
-                                   (values url-string label racket))))]
-                            
-                            [parse-font
-                             (let ([face-regexp (regexp "([^,]*), *(.*)")])
-                               (lambda (args)
-                                 (let ([size-string (get-field args 'size)]
-                                       [face-string (get-field args 'face)]
-                                       [color-string (get-field args 'color)]
-                                       [bg-color-string (get-field args 'bgcolor)])
-                                   (let ([size
-                                          (and size-string
-                                               (let* ([n (string->number size-string)])
-                                                 (and n
-                                                      (integer? n)
-                                                      (<= -127 n 127)
-                                                      (cond
-                                                       [(char=? #\+ (string-ref size-string 0))
-                                                        (make-object style-delta% 'change-bigger n)]
-                                                       [(negative? n)
-                                                        (make-object style-delta% 'change-smaller (- n))]
-                                                       [else
-                                                        (cond
-                                                         [(n . < . 2)
-                                                          (make-object style-delta% 'change-smaller (- 2 n))]
-                                                         [(n . > . 2)
-                                                          (make-object style-delta% 'change-bigger (- n 2))]
-                                                         [else #f])]))))]
-                                         [face (and face-string
-                                                    (or
-                                                     (and (string=? face-string "monospace")
-                                                          (make-object style-delta% 'change-family 'modern))
-                                                     (let ([f (let loop ([f face-string])
-                                                                (let ([m (regexp-match face-regexp f)]
-                                                                      [try-face (lambda (s)
-                                                                                  (unless face-list
-                                                                                    (set! face-list (get-face-list)))
-                                                                                  (ormap
-                                                                                   (lambda (s-norm)
-                                                                                     (and (string-ci=? s s-norm)
-                                                                                          s-norm))
-                                                                                   face-list))])
-                                                                  (if m
-                                                                      (or (try-face (cadr m))
-                                                                          (loop (caddr m)))
-                                                                      (try-face f))))])
-                                                       (and f
-                                                            (let ([d (make-object style-delta%)])
-                                                              (send d set-delta-face f))))))]
-                                         [color (let ([clr (and color-string (color-string->color color-string))])
-                                                  (and clr
-                                                       (let ([d (make-object style-delta%)])
-                                                         (send d set-delta-foreground clr))))]
-                                         [bg-color (let ([bg-clr (and bg-color-string
-                                                                      (color-string->color bg-color-string))])
-                                                     (and bg-clr
-                                                          (let ([d (make-object style-delta%)])
-                                                            (send d set-delta-background bg-clr))))])
-                                     (let loop ([delta #f][l (list size face color bg-color)])
-                                       (cond
-                                        [(null? l) delta]
-                                        [(not (car l)) (loop delta (cdr l))]
-                                        [else (if delta
-                                                  (loop (begin
-                                                          (send delta collapse (car l))
-                                                          delta)
-                                                        (cdr l))
-                                                  (loop (car l) (cdr l)))]))))))]
-                            
-                            [make-unsupported
-                             (lambda (tag args)
-                               (let ([name (get-field args 'name)]
-                                     [type (get-field args 'type)])
-                                 (if (and (eq? tag 'input) type (string=? type "hidden"))
-                                     "" ; hidden input
-                                     (format "[~a~a NOT SUPPORTED]"
-                                             (if name
-                                                 (format "~a " name)
-                                                 "")
-                                             (case tag
-                                               [(select) "POPUP MENU"]
-                                               [(textarea) "TEXT AREA"]
-                                               [(input) (if type
-                                                            (case (string->symbol type)
-                                                              [(text) "TEXT FIELD"]
-                                                              [else "BUTTON"])
-                                                            "BUTTON")])))))]
-                            
-                            [heading (lambda (delta forced-lines rest para-base)
-                                       (insert-newlines 2 forced-lines para-base)
-                                       (let-values ([(start-pos) (current-pos)]
-                                                    [(r rfl) (rest)]
-                                                    [(end-pos) (current-pos)])
-                                         (insert-newlines 2 rfl para-base)
-                                         (values
-                                          (lambda ()
-                                            (change-style delta start-pos end-pos)
-                                            (r))
-                                          rfl)))]
-                            
-                            [styler (lambda (delta rest [drop-empty? #f])
-                                      (let*-values ([(start-pos) (current-pos)]
-                                                    [(r rfl) (rest)]
-                                                    [(end-pos) (current-pos)])
-                                        (if (and drop-empty?
-                                                 (regexp-match re:empty (send a-text get-text start-pos end-pos)))
-                                            (begin
-                                              (delete start-pos end-pos)
-                                              (values void rfl))
-                                            (values
-                                             (lambda ()
-                                               (change-style delta start-pos end-pos)
-                                               (r))
-                                             rfl))))]
-                            
-                            [maybe-bg-color (lambda (e rest drop-empty?)
-                                              (let* ([c (get-field e 'bgcolor)]
-                                                     [color (and c (color-string->color c))])
-                                                (cond
-                                                 [color
-                                                  (styler (let ([d (make-object style-delta%)])
-                                                            (send d set-delta-background color)
-                                                            d)
-                                                          rest
-                                                          drop-empty?)]
-                                                 [drop-empty?
-                                                  (let*-values ([(start-pos) (current-pos)]
-                                                                [(r rfl) (rest)]
-                                                                [(end-pos) (current-pos)])
-                                                    (values (if (regexp-match re:empty (send a-text get-text start-pos end-pos))
-                                                                void
-                                                                r)
-                                                            rfl))]
-                                                 [else
-                                                  (rest)])))]
-                            
-                            [para-aligner (lambda (alignment delta rest)
-                                            (let*-values ([(start-pos) (current-pos)]
-                                                          [(r rfl) (rest)]
-                                                          [(end-pos) (current-pos)])
-                                              (values
-                                               (lambda ()
-                                                 (let ([last-para (send a-text position-paragraph 
-                                                                        (backover-newlines end-pos start-pos))])
-                                                   (let loop ([para (send a-text position-paragraph start-pos)])
-                                                     (if (eq? alignment 'left-outdent)
-                                                         (begin
-                                                           (send a-text set-paragraph-alignment para 'left)
-                                                           (send a-text set-paragraph-margins para 0 (* 2 (get-bullet-width)) 0))
-                                                         (send a-text set-paragraph-alignment para alignment))
-                                                     (when delta
-                                                       (change-style delta start-pos end-pos))
-                                                     (unless (= para last-para)
-                                                       (loop (add1 para)))))
-                                                 (r))
-                                               rfl)))]
-                            
-                            ;; translate-number : number -> void
-                            [translate-number
-                             (lambda (e)
-                               (cond
-                                [(and (not (= e #xFFFF))
-                                      (not (= e #xFFFE))
-                                      (not (<= #xD800 e #xDFFF))
-                                      (send default-font screen-glyph-exists? (integer->char e)))
-                                 (insert (integer->char e))
-                                 void]
-                                [(<= 913 e 969)
-                                 (let ([lp (current-pos)])
-                                   (insert (integer->char (+ (- e 913) (char->integer #\A))))
-                                   (lambda ()
-                                     (change-style delta:symbol lp (+ lp 1))))]
-                                
-                                ;; poor ascii approximations. probably these
-                                ;; (and other) characters exist somewhere,
-                                ;; but I don't know where.
-                                [(= e 160) (insert " ") void]
-                                [(= e 338) (insert "OE") void]
-                                [(= e 339) (insert "oe") void]
-                                [(= e 732) (insert "~") void]
-                                [(= e 710) (insert "^") void]
-                                [(= e 8242) (insert "'") void]
-                                [(= e 8243) (insert "''") void]
-                                [(= e 8260) (insert "/") void]
-                                [(= e 8722) (insert "-") void]
-                                [(= e 8727) (insert "*") void]
-                                [(= e 8764) (insert "~") void]
-                                [(= e 8804) (insert "<") void]
-                                [(= e 8805) (insert ">") void]
-                                [(= e 8211) (insert "--") void]
-                                [(= e 8212) (insert "---") void]
-                                
-                                [else (insert (format "&#~a;" e))
-                                      void]))]
-                            
-                            ;; ========================================
-                            ;; This is the main formatting function.
-                            ;; It consumes:
-                            ;;   e : xexpr - the HTML content
-                            ;;   para-base : num - a marker for a paragraph start (e.g.,
-                            ;;                     the bullet for <li>), though the actual
-                            ;;                     paragraph start may be later
-                            ;;   enum-depth : num - current depth of enumerations
-                            ;; The result is a function of no arguments that finalizes
-                            ;;  the region for `e', which normally means applying font changes.
-                            ;;  (The changes have to be applied outside-in, so that local
-                            ;;  specifications override enclosing ones.)
-                            ;; Translate must not modify any existing text, and the
-                            ;;  result function must not move any items.
-                            [translate
-                             (lambda (e para-base enum-depth forced-lines form)
-                               (cond
-                                [(string? e) 
-                                 (let ([lp (current-pos)])
-                                   (insert e)
-                                   ;; we change the style here directly
-                                   ;; since we want this style to only appear
-                                   ;; if the style is overridden by the context
-                                   (change-style delta:default-face 
-                                                 lp
-                                                 (+ lp (string-length e)))
-                                   (values void
-                                           0))]
-                                [(symbol? e) 
-                                 (let ([a (entity-name->integer e)])
-                                   (if a
-                                       (values (translate-number a) 0)
-                                       (begin
-                                         (insert (format "&~a;" e))
-                                         (values void 0))))]
-                                [(number? e) 
-                                 (values (translate-number e) 0)]
-                                [(or (comment? e) (p-i? e)) (values void forced-lines)]
-                                [else (let* ([tag (car e)]
-                                             [rest/base/depth/form/fl
-                                              (lambda (para-base enum-depth form forced-lines)
-                                                (let* ([p (foldl (lambda (x p) 
-                                                                   (let-values ([(f fl) (translate x para-base enum-depth (car p) form)])
-                                                                     (cons fl (cons f (cdr p)))))
-                                                                 (cons forced-lines null)
-                                                                 (cddr e))]
-                                                       [l (reverse (cdr p))])
-                                                  (values (lambda ()
-                                                            (map (lambda (f) (f)) l))
-                                                          (car p))))]
-                                             [rest/base/depth
-                                              (lambda (para-base enum-depth)
-                                                (rest/base/depth/form/fl para-base enum-depth form forced-lines))]
-                                             [rest/form (lambda (form) (rest/base/depth/form/fl para-base enum-depth form forced-lines))]
-                                             [rest/form (lambda (form) (rest/base/depth/form/fl para-base enum-depth form forced-lines))]
-                                             [rest (lambda () (rest/base/depth/form/fl para-base enum-depth form forced-lines))]
-                                             [rest/fl (lambda (fl) (rest/base/depth/form/fl para-base enum-depth form fl))])
-                                        (case tag
-                                          [(title)
-                                           (let ([pos (current-pos)])
-                                             ;; Render content
-                                             (rest)
-                                             (send a-text set-title (send a-text get-text pos (current-pos)))
-                                             (delete pos (current-pos)))
-                                           (values void forced-lines)]
-                                          [(a)
-                                           (let-values ([(url-string label racket) (parse-href e)])
-                                             (let* ([style (get-field e 'style)]
-                                                    [pos (current-pos)])
-                                               (let-values ([(r rfl) (rest)])
-                                                 (let ([end-pos (current-pos)])
-                                                   (cond
-                                                    [url-string
-                                                     (send a-text add-link pos end-pos (regexp-replace* re:amp url-string "\\&"))
-                                                     ;; might have a label, too:
-                                                     (when label
-                                                       (send a-text add-tag label pos))
-                                                     (values
-                                                      (lambda ()
-                                                        (when (or (not style)
-                                                                  (not (regexp-match re:transparent style)))
-                                                          (send a-text make-link-style pos end-pos))
-                                                        (r))
-                                                      rfl)]
-                                                    [label
-                                                     (send a-text add-tag label pos)
-                                                     (values r rfl)]
-                                                    [racket
-                                                     (send a-text add-racket-callback pos end-pos racket)
-                                                     (values
-                                                      (lambda ()
-                                                        (when (or (not style)
-                                                                  (not (regexp-match re:transparent style)))
-                                                          (send a-text make-link-style pos end-pos))
-                                                        (r))
-                                                      rfl)]
-                                                    [else (values r rfl)])))))]
-                                          [(style) (values void forced-lines)]
-                                          [(h1) (heading delta:h1 forced-lines rest para-base)]
-                                          [(h2) (heading delta:h2 forced-lines rest para-base)]
-                                          [(h3) (heading delta:h3 forced-lines rest para-base)]
-                                          [(h4) (heading delta:h4 forced-lines rest para-base)]
-                                          [(b strong) (styler delta:bold rest)]
-                                          [(i em var dfn cite) (styler delta:italic rest)]
-                                          [(u) (styler delta:underline rest)]
-                                          [(sup) (styler delta:superscript rest)]
-                                          [(sub) (styler delta:subscript rest)]
-                                          [(small) (styler delta:small rest)]
-                                          [(font)
-                                           (let ([delta (parse-font e)])
-                                             (if delta
-                                                 (styler delta rest)
-                                                 (rest)))]
-                                          [(li dd dt)
-                                           (insert-newlines 1 forced-lines para-base)
-                                           (let ([pos (current-pos)]
-                                                 [bullet? (eq? tag 'li)])
-                                             (when bullet?
-                                               (let ([before (current-pos)])
-                                                 (insert (make-object bullet-snip% (sub1 enum-depth)))
-                                                 (change-style (send (send a-text get-style-list) find-named-style "Standard")
-                                                               before
-                                                               (+ before 1))))
-                                             (let*-values ([(r rfl) (rest/base/depth (add1 pos) enum-depth)]
-                                                           [(end-pos) (current-pos)])
-                                               (values
-                                                (lambda ()
-                                                  (let ([end-para (send a-text position-paragraph 
-                                                                        (backover-newlines end-pos pos))]
-                                                        [left-margin (* 2 (get-bullet-width) enum-depth)])
-                                                    (let loop ([para (send a-text position-paragraph pos)]
-                                                               [first? #t])
-                                                      (send a-text set-paragraph-margins
-                                                            para
-                                                            (if first?
-                                                                (max 0 (- left-margin
-                                                                          (if bullet?
-                                                                              (get-bullet-width)
-                                                                              0)))
-                                                                left-margin)
-                                                            left-margin
-                                                            0)
-                                                      (unless (= para end-para)
-                                                        (loop (add1 para) #f))))
-                                                  (r))
-                                                rfl)))]
-                                          [(ul menu ol dl)
-                                           (insert-newlines (if (zero? enum-depth) 2 1) forced-lines para-base)
-                                           (let-values ([(r rfl)
-                                                         (rest/base/depth para-base (add1 enum-depth))])
-                                             (insert-newlines (if (zero? enum-depth) 2 1) rfl para-base)
-                                             (values r rfl))]
-                                          [(p)
-                                           (insert-newlines 2 forced-lines para-base)
-                                           (let-values ([(r rfl) (rest)])
-                                             (insert-newlines 2 rfl para-base)
-                                             (values r rfl))]
-                                          [(blockquote)
-                                           (insert-newlines 2 forced-lines para-base)
-                                           (let*-values ([(pos) (current-pos)]
-                                                         [(r rfl) (rest/base/depth para-base (add1 enum-depth))]
-                                                         [(end-pos) (current-pos)])
-                                             (begin0
-                                              (values
-                                               (lambda ()
-                                                 (let ([end-para (send a-text position-paragraph 
-                                                                       (backover-newlines end-pos pos))]
-                                                       [left-margin (* 2 (get-bullet-width) (add1 enum-depth))])
-                                                   (let loop ([para (send a-text position-paragraph pos)])
-                                                     (send a-text set-paragraph-margins
-                                                           para
-                                                           left-margin
-                                                           left-margin
-                                                           left-margin)
-                                                     (unless (= para end-para)
-                                                       (loop (add1 para)))))
-                                                 (r))
-                                               rfl)
-                                              (insert-newlines 2 rfl para-base)))]
-                                          [(center)
-                                           (insert-newlines 2 forced-lines para-base)
-                                           (let-values ([(r rfl)
-                                                         (para-aligner 'center #f rest)])
-                                             (insert-newlines 2 rfl para-base)
-                                             (values r rfl))]
-                                          [(div)
-                                           (insert-newlines 1 forced-lines para-base)
-                                           (let* ([align (get-field e 'align)]
-                                                  [class (get-field e 'class)]
-                                                  [delta (and class (lookup-class-delta class))])
-                                             (with-style-class
-                                              class
-                                              (lambda ()
-                                                (let-values ([(r rfl)
-                                                              (cond
-                                                               [(and (string? align) (string-ci=? align "center"))
-                                                                (para-aligner 'center delta rest)]
-                                                               [(and (string? align) (string-ci=? align "left"))
-                                                                (para-aligner 'left delta rest)]
-                                                               [(and (string? align) (string-ci=? align "left-outdent"))
-                                                                (para-aligner 'left-outdent delta rest)]
-                                                               [(or (and (string? align) (string-ci=? align "right"))
-                                                                    (and (string? class) (string-ci=? class "navigation")))
-                                                                (para-aligner 'right delta rest)]
-                                                               [delta
-                                                                (styler delta rest)]
-                                                               [else (rest)])])
-                                                  (insert-newlines 1 rfl para-base)
-                                                  (values r rfl)))))]
-                                          [(br)
-                                           (insert-newlines 1 (+ 1 forced-lines) para-base)
-                                           (rest/fl (+ forced-lines 1))]
-                                          [(table)
-                                           (insert-newlines 1 forced-lines para-base)
-                                           (let-values ([(r rfl)
-                                                         (maybe-bg-color e rest #t)])
-                                             (insert-newlines 1 rfl para-base)
-                                             (values r (max 1 rfl)))]
-                                          [(tr)
-                                           (insert-newlines 1 forced-lines para-base)
-                                           (let-values ([(r rfl)
-                                                         (maybe-bg-color e rest #t)])
-                                             (insert-newlines 1 rfl para-base)
-                                             (values r rfl))]
-                                          [(td)
-                                           (maybe-bg-color e rest #t)]
-                                          [(map) 
-                                           (set! image-maps (cons e image-maps))
-                                           (rest)]
-                                          [(img)
-                                           (let* ([url (parse-image-source e)]
-                                                  [alt (get-field e 'alt)]
-                                                  [bitmap (and url (cache-bitmap url))]
-                                                  [usemap (get-field e 'usemap)])
-                                             (cond
-                                              [(and bitmap usemap)
-                                               (let ([pos (current-pos)]
-                                                     [image-map-snip (make-object image-map-snip% a-text)])
-                                                 (send image-map-snip set-bitmap bitmap)
-                                                 (send image-map-snip set-key usemap)
-                                                 (insert image-map-snip)
-                                                 (set! image-map-snips (cons image-map-snip image-map-snips))
-                                                 (change-style delta:center pos (add1 pos)))]
-                                              [bitmap
-                                               (let ([pos (current-pos)])
-                                                 (insert (make-object image-snip% bitmap))
-                                                 (change-style delta:center pos (add1 pos)))]
-                                              [alt
-                                               (insert alt)]
-                                              [else
-                                               (let ([pos (current-pos)])
-                                                 (insert (new image-snip%))
-                                                 (change-style delta:center pos (add1 pos)))])
-                                             (rest))]
-                                          [(form)
-                                           (rest/form (make-form (get-field e 'action) (get-field e 'target) (get-field e 'method) null #f))]
-                                          [(input select textarea)
-                                           (let ([unsupported (make-unsupported tag e)]
-                                                 [pos (current-pos)]
-                                                 [type (let ([t (get-field e 'type)])
-                                                         (and t (string->symbol t)))]
-                                                 [send-form (lambda (add-self?)
-                                                              (let ([post-string
-                                                                     (apply 
-                                                                      string-append
-                                                                      (map (lambda (v)
-                                                                             (if (car v)
-                                                                                 (format "~a=~a&"
-                                                                                         (car v)
-                                                                                         (protect-chars (or ((cdr v))
-                                                                                                            "?")))
-                                                                                 ""))
-                                                                           (form-parts form)))])
-                                                                (send a-text post-url
-                                                                      (form-action form)
-                                                                      (string->bytes/utf-8
-                                                                       (if add-self?
-                                                                           ;; Add this button
-                                                                           (format "~a~a=~a" 
-                                                                                   post-string 
-                                                                                   (get-field e 'name) 
-                                                                                   (protect-chars (get-field e 'value)))
-                                                                           ;; remove trailing &
-                                                                           (substring post-string 
-                                                                                      0 
-                                                                                      (max 0 (sub1 (string-length post-string)))))))))])
-                                             (let-values ([(name cb get-val)
-                                                           (cond
-                                                            [(eq? tag 'select)
-                                                             (let ([select (make-object option-snip%)])
-                                                               (set-form-active-select! form select)
-                                                               (insert select)
-                                                               (values (get-field e 'name)
-                                                                       #f
-                                                                       (lambda () 
-                                                                         (send select get-value))))]
-                                                            [(or (and (eq? tag 'input)
-                                                                      (or (not type) (eq? type 'text)))
-                                                                 (eq? tag 'textarea))
-                                                             (let* ([text (make-object text%)]
-                                                                    [snip (make-object editor-snip% text)]
-                                                                    [size (get-field e 'size)]
-                                                                    [val (get-field e 'value)])
-                                                               (let ([km (send text get-keymap)])
-                                                                 ((current-text-keymap-initializer) km)
-                                                                 (unless (eq? tag 'textarea)
-                                                                   (send km add-function "send-form"
-                                                                         (lambda (t e)
-                                                                           (send-form #f)))
-                                                                   (send km map-function "enter" "send-form")))
-                                                               (let ([width (* 10 (or (and size (string->number size))
-                                                                                      25))])
-                                                                 (send text set-min-width width)
-                                                                 (send text set-max-width width))
-                                                               (when val
-                                                                 (send text insert val))
-                                                               (insert snip)
-                                                               (values
-                                                                (get-field e 'name)
-                                                                #f
-                                                                (lambda () (send text get-text))))]
-                                                            [(and (eq? tag 'input)
-                                                                  (eq? type 'submit))
-                                                             (insert (get-field e 'value))
-                                                             (values
-                                                              #f ; because we leave out this button when it's not pushed
-                                                              (lambda ()
-                                                                (send-form #t))
-                                                              #f)]
-                                                            [(and (eq? tag 'input)
-                                                                  (eq? type 'checkbox))
-                                                             (let ([cb (make-object checkbox-snip% (true? (or (get-field e 'value) "false")))])
-                                                               (insert cb)
-                                                               (values
-                                                                (get-field e 'name)
-                                                                #f
-                                                                (lambda () (if (send cb get-value)
-                                                                               "true"
-                                                                               "false"))))]
-                                                            [(and (eq? tag 'input)
-                                                                  (eq? type 'hidden))
-                                                             (values
-                                                              (get-field e 'name)
-                                                              #f
-                                                              (lambda () (regexp-replace* re:quot (get-field e 'value) "\"")))]
-                                                            [else
-                                                             (insert unsupported)
-                                                             (values #f #f #f)])])
-                                               (set-form-parts! form
-                                                                (cons (cons name
-                                                                            (or get-val
-                                                                                (lambda ()
-                                                                                  (get-field e 'value))))
-                                                                      (form-parts form)))
-                                               (let-values ([(r rfl) (rest)]
-                                                            [(end-pos) (current-pos)])
-                                                 (set-form-active-select! form #f)
-                                                 (values
-                                                  (lambda ()
-                                                    (cond
-                                                     [cb
-                                                      (send a-text make-link-style pos end-pos)
-                                                      (send a-text add-thunk-callback pos end-pos cb)]
-                                                     [else
-                                                      (change-style delta:default-face pos end-pos)])
-                                                    (r))
-                                                  rfl))))]
-                                          [(option)
-                                           (let-values ([(pos) (current-pos)]
-                                                        [(r rfl) (rest)]
-                                                        [(val) (get-field e 'value)]
-                                                        [(selected?) (true? (or (get-field e 'selected) 
-                                                                                "false"))]
-                                                        [(end-pos) (current-pos)])
-                                             (let ([str (send a-text get-text pos end-pos)]
-                                                   [select (form-active-select form)])
-                                               (delete pos end-pos)
-                                               (when select
-                                                 (send select add-option str (or val str))
-                                                 (when selected?
-                                                   (send select set-value val)))
-                                               (values r rfl)))]
-                                          [(tt code samp kbd pre)
-                                           (when (memq tag '(pre))
-                                             (insert-newlines 2 forced-lines para-base))
-                                           (let-values ([(r rfl)
-                                                         (let* ([class (get-field e 'class)]
-                                                                [delta (and class (lookup-class-delta class))])
-                                                           (with-style-class
-                                                            class
-                                                            (lambda ()
-                                                              (styler (if delta
-                                                                          (let ([d (make-object style-delta% 'change-nothing)])
-                                                                            (send d copy delta)
-                                                                            (send d collapse delta:fixed)
-                                                                            d)
-                                                                          delta:fixed)
-                                                                      rest))))])
-                                             (when (memq tag '(pre))
-                                               (insert-newlines 2 rfl para-base))
-                                             (values r rfl))]
-                                          [(span)
-                                           (let* ([class (get-field e 'class)]
-                                                  [delta (and class (lookup-class-delta class))])
-                                             (if delta
-                                                 (styler delta rest)
-                                                 (rest)))]
-                                          [else (rest)]))]))])
-                     (load-status #f "page" (send a-text get-url))
-                     (let-values ([(f fl) (translate content 0 0 0 (make-form #f #f #f null #f))])
-                       (f))
-                     (send a-text add-tag "top" 0)
-                     (update-image-maps image-map-snips image-maps)
-                     (send a-text set-position 0))))))
diff --git a/pkgs/drracket-pkgs/drracket/browser/private/hyper.rkt b/pkgs/drracket-pkgs/drracket/browser/private/hyper.rkt
deleted file mode 100644
index 9738091ab4..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/private/hyper.rkt
+++ /dev/null
@@ -1,1155 +0,0 @@
-#| 
-A test case:
-
-#lang racket
-   (require racket/gui browser framework)
-   
-   (define f%
-     (frame:status-line-mixin 
-      frame:basic%))
-   
-   (define f (new f%
-                  (label "My Frame")
-                  (width 400)
-                  (height 300)))
-   (define browser (new hyper-panel% 
-                        (info-line? #f)
-                        (parent (send f get-area-container))))
-   (send f show #t)
-   
-   (send (send browser get-canvas)
-	 goto-url
-	 ;; The starting URL:
-	 "http://www.htdp.org/";
-	 ;; #f means not a relative URL:
-	 #f)
-|#
-
-#lang racket/unit
-
-(require racket/class
-         (only-in racket/list last-pair)
-         "sig.rkt"
-         racket/path
-         racket/file
-         net/url-sig
-         net/url-structs
-         net/head
-         mred/mred-sig
-         framework
-         string-constants
-         setup/plt-installer-sig)
-
-  (import html^
-        mred^
-        setup:plt-installer^
-        url^)
-  (export hyper^)
-  (init-depend mred^)
-
-(struct exn:file-saved-instead exn (pathname))
-(struct exn:cancelled exn ())
-(struct exn:tcp-problem exn ())
-
-(define history-limit 20)
-
-(struct hyperlink (anchor-start anchor-end url-string))
-
-(struct hypertag (name position))
-
-(define (same-page-url? a b)
-  (or (eq? a b)
-      (and (url? a) (url? b)
-           ;; fragment can be different
-           (equal? (url-scheme a) (url-scheme b))
-           (equal? (url-host a) (url-host b))
-           
-           ;; assume that url-paths are all strings 
-           ;; (other wise the pages are treated as different)
-           (equal? (map path/param-path (url-path a)) 
-                   (map path/param-path (url-path b)))
-           
-           (equal? (url-query a) (url-query b)))))
-
-
-(define hyper-text<%>
-  (interface ()
-    init-browser-status-line
-    update-browser-status-line
-    close-browser-status-line
-    url-allows-evaling?))
-
-(define hyper-text-mixin
-  (mixin ((class->interface text%) editor:keymap<%>) (hyper-text<%>)
-         (inherit begin-edit-sequence end-edit-sequence lock erase clear-undos
-                  change-style
-                  set-modified auto-wrap
-                  find-snip get-snip-position set-clickback get-canvas
-                  insert last-position hide-caret
-                  get-end-position set-autowrap-bitmap)
-         
-         (init-field url top-level-window)
-         (init progress)
-         (init-field [post-data #f])
-         
-         (define/pubment (url-allows-evaling? url)
-           (cond
-            [(port? url) #f]
-            [(and (url? url)
-                  (equal? "file" (url-scheme url)))
-             (with-handlers ([exn:fail:filesystem? (lambda (x) #f)])
-               (path-below?
-                (normal-case-path (normalize-path (build-path (collection-path "racket") 
-                                                              'up
-                                                              'up)))
-                (normal-case-path (normalize-path (apply build-path 
-                                                         (map path/param-path (url-path url)))))))]
-            [else (inner #f url-allows-evaling? url)]))
-         
-         (define doc-notes null)
-         (define title #f)
-         (define htmling? #f)
-         (define redirection #f)
-         (define hypertags-list (list (hypertag "top" 0)))
-         (define hyper-delta (make-object style-delta% 'change-underline #t))
-         (let ([mult (send hyper-delta get-foreground-mult)]
-               [add (send hyper-delta get-foreground-add)])
-           (send mult set 0 0 0)
-           (send add set 0 0 255))
-         
-         (define/override (get-keymaps) (list* space-page-keymap hyper-keymap (super get-keymaps)))
-         (define/public (get-hyper-keymap) hyper-keymap)
-         
-         (define/augment (after-set-position)
-           (unless (zero? (get-end-position))
-             (hide-caret #f))
-           (inner (void) after-set-position))          
-
-         ;; get-redirection : -> (union false? url?)
-         ;; #f indicates no redirection, url is where it redirects to
-         (define/public (get-redirection) redirection)
-         
-         (define/public (add-document-note note)
-           (set! doc-notes (append doc-notes (list note))))
-         (define/public (get-document-notes) doc-notes)
-         
-         (define/public (make-link-style start end) (change-style hyper-delta start end))
-         (define/public (get-url) (and (url? url) url))
-         
-         (define/public post-url
-           (lambda (url-string [post-data #f])
-             (on-url-click
-              (lambda (url-string post-data)
-                (send (get-canvas) goto-url url-string (get-url) void post-data))
-              url-string
-              post-data)))
-         
-         (define/public (on-url-click f x post-data) 
-           (let ([c (get-canvas)])
-             (if c
-                 (send c on-url-click f x post-data)
-                 (f x post-data))))
-         (define/public (get-title) (or title (and (url? url) (url->string url))))
-         (define/public (set-title t) (set! title t))
-         
-         (define/public (add-tag name pos)
-           (for-each (lambda (tag) 
-                       (when (string=? name (hypertag-name tag))
-                         (remove-tag  name)))
-                     hypertags-list)
-           (let ([new-tag (hypertag name pos)])
-             (set! hypertags-list
-                   (let insert-loop ([tags-left hypertags-list])
-                     (cond [(null? tags-left)(cons new-tag '())]
-                           [(> pos (hypertag-position (car tags-left)))
-                            (cons new-tag tags-left)]
-                           [else (cons (car tags-left)
-                                       (insert-loop (cdr tags-left)))])))))
-         
-         (define/public (find-tag name)
-           (if (and (integer? name) (positive? name))
-               name
-               (and (string? name)
-                    (ormap (lambda (x) 
-                             (and (string=? name (hypertag-name x)) 
-                                  (hypertag-position x)))
-                           hypertags-list))))
-         (define/public (remove-tag name)
-           (set! hypertags-list
-                 (filter (lambda (x) (not (string=? name (hypertag-name x))))
-                         hypertags-list)))
-         (define/public (add-link start end url-string)
-           (let* ([new-link (hyperlink start end url-string)])
-             (set-clickback start end 
-                            (lambda (x y z)
-                              (post-url url-string)))))
-         
-         ;; remember the directory when the callback is added (during parsing)
-         ;; and restore it during the evaluation of the callback.
-         (define/public (add-racket-callback start end racket-string)
-           (let ([dir (current-load-relative-directory)])
-             (set-clickback 
-              start end 
-              (lambda (edit start end)
-                (if (url-allows-evaling? url)
-                    (parameterize ([current-load-relative-directory dir])
-                      (eval-racket-string racket-string))
-                    (message-box (string-constant help-desk)
-                                 "<A RACKET= ...> disabled"))))))
-         (define/public (add-thunk-callback start end thunk)
-           (set-clickback 
-            start end 
-            (lambda (edit start end)
-              (thunk))))
-         
-         (define/public (eval-racket-string s)
-           (let ([v 
-                  (dynamic-wind
-                      begin-busy-cursor
-                      (lambda () 
-                        (with-handlers ([exn:fail? (build-html-error-message s)])
-                          (eval (read (open-input-string s)))))
-                      end-busy-cursor)])
-             (when (string? v)
-               (send (get-canvas) goto-url
-                     (open-input-string v)
-                     (get-url)))))
-
-         (define/public (init-browser-status-line top-level-window)
-           (send top-level-window open-status-line 'browser:hyper.rkt))
-         (define/public (update-browser-status-line top-level-window s)
-           (send top-level-window update-status-line 'browser:hyper.rkt s))
-         (define/public (close-browser-status-line top-level-window)
-           (send top-level-window close-status-line 'browser:hyper.rkt))
-
-         (define/public reload
-           ;; The reload function is called in a non-main thread,
-           ;;  since this class is instantiated in a non-main thread.
-           (lambda ([progress void])
-             (when url
-               (let ([s (make-semaphore)]
-                     [closer-t #f]
-                     [this-t (current-thread)])
-                 (when top-level-window
-                   (queue-callback
-                    (lambda ()
-                      (init-browser-status-line top-level-window)
-                      (update-browser-status-line 
-                       top-level-window 
-                       (format "Visiting ~a"
-                               (cond
-                                [(url? url) (url->string url)]
-                                [else "page"])))
-                      ;; Yikes! We need to ensure that the browser status
-                      ;;  line is closed, even if the reload thread dies.
-                      ;; We use the usual trick of setting up a watcher
-                      ;;  thread and then killing it off if its work
-                      ;;  is not needed.
-                      (set! closer-t 
-                            (thread (lambda ()
-                                      (sync (thread-dead-evt this-t))
-                                      (queue-callback
-                                       (lambda ()
-                                         (close-browser-status-line top-level-window))))))
-                      (semaphore-post s)))
-                   (yield s))
-                 (let ([headers (get-headers/read-from-port progress)])
-                   ;; Page is a redirection?
-                   (let ([m (regexp-match "^HTTP/[^ ]+ 30[12] " headers)])
-                     (when m
-                       (let ([loc (extract-field "location" headers)])
-                         (when loc
-                           (set! redirection 
-                                 (cond
-                                  [(url? url)
-                                   (combine-url/relative url loc)]
-                                  [else
-                                   (string->url loc)])))))))
-                 (when top-level-window
-                   (queue-callback
-                    (lambda ()
-                      (kill-thread closer-t)
-                      (close-browser-status-line top-level-window)
-                      (semaphore-post s)))
-                   (yield s))))))
-         
-         (define/private (get-headers/read-from-port progress)
-           (cond
-            [(port? url) 
-             (read-from-port url empty-header progress)
-             empty-header]
-            [else
-             (let* ([busy? #t]
-                    [stop-busy (lambda ()
-                                 (when busy?
-                                   (set! busy? #f)))])
-               (with-handlers ([(lambda (x) (and (exn:fail? x) busy?))
-                                (lambda (x) 
-                                  (call/input-url 
-                                   url
-                                   (if post-data 
-                                       (case-lambda
-                                        [(u) (post-pure-port u post-data)]
-                                        [(u s) (post-pure-port u post-data s)])
-                                       get-pure-port)
-                                   (lambda (p)
-                                     (stop-busy)
-                                     (read-from-port p empty-header progress)
-                                     empty-header)))])
-                 (call/input-url 
-                  url 
-                  (if post-data 
-                      (case-lambda
-                       [(u) (post-impure-port u post-data)]
-                       [(u s) (post-impure-port u post-data s)])
-                      get-impure-port)
-                  (lambda (p)
-                    (let ([headers (purify-port p)])
-                      (stop-busy)
-                      (read-from-port p headers progress)
-                      headers)))))]))
-         
-         (define/private (read-from-port p mime-headers progress)
-           (let ([wrapping-on? #t])
-             (dynamic-wind
-                 (lambda ()
-                   (lock #f)
-                   (begin-edit-sequence #f)
-                   (set! htmling? #t))
-                 (lambda ()
-                   (erase)
-                   (clear-undos)
-                   (let* ([mime-type (extract-field "content-type" mime-headers)]
-                          [path-extension (and (not mime-type)
-                                               (url? url)
-                                               (let ([p (url-path url)])
-                                                 (and (not (null? p))
-                                                      (regexp-match #rx"[.][^.]*$"
-                                                                    (path/param-path (car (last-pair p)))))))]
-                          [html? (or (and mime-type (regexp-match #rx"text/html" mime-type))
-                                     (member path-extension '(".html" ".htm")))]
-                          [text? (or (and mime-type (regexp-match #rx"text/plain" mime-type))
-                                     (member path-extension '(".txt"))
-                                     (and (url? url)
-                                          (equal? (url-scheme url) "file")))])
-                     (cond
-                      [(or (and mime-type (regexp-match #rx"application/" mime-type))
-                           (and (url? url)
-                                (not (null? (url-path url)))
-                                (not text?)
-                                        ; document-not-found produces HTML:
-                                (not html?)))
-                                        ; Save the file
-                       (progress #f)
-                       (let* ([orig-name (and (url? url)
-                                              (let ([p (url-path url)])
-                                                (and (not (null? p))
-                                                     (let ([lp (path/param-path (car (last-pair p)))])
-                                                       (and (not (string=? "" lp))
-                                                            lp)))))]
-                              [size (let ([s (extract-field "content-length" mime-headers)])
-                                      (and s (let ([m (regexp-match #rx"[0-9]+" s)])
-                                               (and m (string->number (car m))))))]
-                              [install?
-                               (and (and orig-name (regexp-match #rx"[.]plt$" orig-name))
-                                    (let ([d (make-object dialog% (string-constant install?))]
-                                          [d? #f]
-                                          [i? #f])
-                                      (make-object message%
-                                                   (string-constant you-have-selected-an-installable-package)
-                                                   d)
-                                      (make-object message% 
-                                                   (string-constant do-you-want-to-install-it?) d)
-                                      (when size
-                                        (make-object message%
-                                                     (format (string-constant paren-file-size) size) d))
-                                      (let ([hp (make-object horizontal-panel% d)])
-                                        (send hp set-alignment 'center 'center)
-                                        (send (make-object button% 
-                                                           (string-constant download-and-install)
-                                                           hp
-                                                           (lambda (b e)
-                                                             (set! i? #t)
-                                                             (send d show #f))
-                                                           '(border))
-                                              focus)
-                                        (make-object button% (string-constant download) hp
-                                                     (lambda (b e)
-                                                       (set! d? #t)
-                                                       (send d show #f)))
-                                        (make-object button% (string-constant cancel) hp
-                                                     (lambda (b e)
-                                                       (send d show #f))))
-                                      (send d center)
-                                      (send d show #t)
-                                      (unless (or d? i?)
-                                        (raise (exn:cancelled
-                                                "Package Cancelled"
-                                                (current-continuation-marks))))
-                                      i?))]
-                              [tmp-plt-filename
-                               (if install?
-                                   (make-temporary-file "tmp~a.rkt")
-                                   (put-file 
-                                    (if size
-                                        (format 
-                                         (string-constant save-downloaded-file/size)
-                                         size)
-                                        (string-constant save-downloaded-file))
-                                    #f ; should be calling window!
-                                    #f
-                                    orig-name))])
-                         (when tmp-plt-filename
-                           (let* ([d (make-object dialog% (string-constant downloading) top-level-window)]
-                                  [message (make-object message% 
-                                                        (string-constant downloading-file...)
-                                                        d)]
-                                  [gauge (if size
-                                             (make-object gauge% #f 100 d)
-                                             #f)]
-                                  [exn #f]
-                                        ; Semaphores to avoid race conditions:
-                                  [wait-to-start (make-semaphore 0)]
-                                  [wait-to-break (make-semaphore 0)]
-                                        ; Thread to perform the download:
-                                  [t (thread
-                                      (lambda ()
-                                        (semaphore-wait wait-to-start)
-                                        (with-handlers ([void
-                                                         (lambda (x)
-                                                           (when (not (exn:break? x))
-                                                             (set! exn x)))])
-                                          (semaphore-post wait-to-break)
-                                          (with-output-to-file tmp-plt-filename
-                                            (lambda ()
-                                              (let loop ([total 0])
-                                                (when gauge
-                                                  (send gauge set-value 
-                                                        (inexact->exact
-                                                         (floor (* 100 (/ total size))))))
-                                                (let ([bts (read-bytes 1024 p)])
-                                                  (unless (eof-object? bts)
-                                                    (write-bytes bts)
-                                                    (loop (+ total (bytes-length bts)))))))
-                                            'binary 'truncate))
-                                        (send d show #f)))])
-                             (send d center)
-                             (make-object button% (string-constant &stop)
-                                          d (lambda (b e)
-                                              (semaphore-wait wait-to-break)
-                                              (set! tmp-plt-filename #f)
-                                              (send d show #f)
-                                              (break-thread t)))
-                                        ; Let thread run only after the dialog is shown
-                             (queue-callback (lambda () (semaphore-post wait-to-start)))
-                             (send d show #t)
-                             (when exn 
-                               (raise (exn:tcp-problem (exn-message exn) (current-continuation-marks)))))
-                           (let ([sema (make-semaphore 0)])
-                             (when (and tmp-plt-filename install?)
-                               (run-installer tmp-plt-filename
-                                              (lambda ()
-                                                (semaphore-post sema)))
-                               (yield sema))))
-                         (raise
-                          (if tmp-plt-filename
-                              (exn:file-saved-instead
-                               (if install?
-                                   (string-constant package-was-installed)
-                                   (string-constant download-was-saved))
-                               (current-continuation-marks)
-                               tmp-plt-filename)
-                              (exn:cancelled "The download was cancelled."
-                                                  (current-continuation-marks)))))]
-                      [(or (and (url? url)
-                                (not (null? (url-path url)))
-                                (regexp-match #rx"[.]html?$"
-                                              (path/param-path (car (last-pair (url-path url))))))
-                           (port? url)
-                           html?)
-                                        ; HTML
-                       (progress #t)
-                       (let* ([directory
-                               (or (if (and (url? url)
-                                            (string=? "file" (url-scheme url)))
-                                       (let ([path (apply build-path (map path/param-path (url-path url)))])
-                                         (let-values ([(base name dir?) (split-path path)])
-                                           (if (string? base)
-                                               base
-                                               #f)))
-                                       #f)
-                                   (current-load-relative-directory))])
-                         (parameterize ([html-status-handler 
-                                         (lambda (s)
-                                           (when top-level-window
-                                             (let ([t (current-thread)]
-                                                   [sema (make-semaphore)])
-                                               (queue-callback
-                                                (lambda ()
-                                                  (when (thread-running? t)
-                                                    ;; Since t is running, the status line hasn't been
-                                                    ;;  closed by the watcher thread (and there's no
-                                                    ;;  race, because it can only be closed in the
-                                                    ;;  handler thread)
-                                                    (update-browser-status-line top-level-window s))
-                                                  (semaphore-post sema)))
-                                               (yield sema))))]
-                                        [current-load-relative-directory directory]
-                                        [html-eval-ok (url-allows-evaling? url)])
-                           (html-convert p this)))]
-                      [else
-                                        ; Text
-                       (progress #t)
-                       (begin-edit-sequence)
-                       (let loop ()
-                         (let ([r (read-line p 'any)])
-                           (unless (eof-object? r)
-                             (insert r)
-                             (insert #\newline)
-                             (loop))))
-                       (change-style (make-object style-delta% 'change-family 'modern)
-                                     0 (last-position))
-                       (set! wrapping-on? #f)
-                       (end-edit-sequence)])))
-                 (lambda ()
-                   (end-edit-sequence)
-                   (set! htmling? #f)
-                   (set-modified #f)
-                   (auto-wrap wrapping-on?)
-                   (set-autowrap-bitmap #f)
-                   (lock #t)
-                   (close-input-port p)))))
-         
-         (inherit find-position get-snip-location
-                  get-dc get-between-threshold
-                  editor-location-to-dc-location
-                  dc-location-to-editor-location)
-         ;; use on-event rather than on-default-event since we want
-         ;; to override the caret handling snip in the case that
-         ;; an image-map-snip is there.
-         (define/override (on-event event)
-           (let* ([edge-close-b (box 0)]
-                  [on-it-b (box #f)]
-                  [dc-event-x (send event get-x)]
-                  [dc-event-y (send event get-y)])
-             (let-values ([(editor-event-x editor-event-y) 
-                           (dc-location-to-editor-location dc-event-x dc-event-y)])
-               (let ([pos (find-position editor-event-x editor-event-y #f on-it-b edge-close-b)])
-                 (cond
-                  [(and (unbox on-it-b)
-                        (not (<= (abs (unbox edge-close-b))
-                                 (get-between-threshold))))
-                   (let ([snip (find-snip pos 'after-or-none)])
-                     (cond
-                      [(and snip (is-a? snip image-map-snip%))
-                       (let ([bsnip-left (box 0)]
-                             [bsnip-top (box 0)]
-                             [bsnip-right (box 0)]
-                             [bsnip-bot (box 0)])
-                         (get-snip-location snip bsnip-left bsnip-top #f)
-                         (get-snip-location snip bsnip-right bsnip-bot #t)
-                         (let ([snip-left (unbox bsnip-left)]
-                               [snip-top (unbox bsnip-top)]
-                               [snip-right (unbox bsnip-right)]
-                               [snip-bot (unbox bsnip-bot)])
-                           (cond
-                            [(and (<= snip-left editor-event-x snip-right)
-                                  (<= snip-top editor-event-y snip-bot))
-                             (let-values ([(x y) (editor-location-to-dc-location snip-left snip-top)])
-                               (send snip on-event (get-dc) x y snip-left snip-top event))]
-                            [else (super on-event event)])))]
-                      [else (super on-event event)]))]
-                  [else (super on-event event)])))))
-         
-         (super-new)
-         
-         ;; load url, but the user might break:
-         (with-handlers ([exn:break? void])
-                                        ;(printf "url: ~a\n" (if (url? url) (url->string url) url)) ;; handy for debugging help desk
-           (reload progress))))
-
-;; build-html-error-message : exn -> string[html]
-(define ((build-html-error-message str) exn)
-  (string-append
-   "<html><head><title>Error Evaluating Racket</title></head>"
-   "<body>"
-   "<h2>Error Evaluating Racket Code</h2>"
-   (format "<pre>\n~a\n</pre>" str)
-   "<p><p>"
-   (format "<font color=\"red\">~a</font>" 
-           (regexp-replace* #rx"<" (regexp-replace* #rx">" (exn-message exn) "&lt;") "&gt;"))
-   "</body></html>"))
-
-(define hyper-text% (hyper-text-mixin text:keymap%))
-
-(define space-page-keymap (make-object keymap%))
-(add-text-keymap-functions space-page-keymap)
-(send space-page-keymap map-function "space" "next-page")
-(send space-page-keymap map-function "s:space" "previous-page")
-
-(define hyper-keymap (make-object keymap%))
-(send hyper-keymap add-function "rewind" 
-      (lambda (txt evt)
-        (call-with-hyper-panel
-         txt
-         (lambda (panel)
-           (send panel rewind)))))
-(send hyper-keymap add-function "forward" 
-      (lambda (txt evt)
-        (call-with-hyper-panel
-         txt
-         (lambda (panel)
-           (send panel forward)))))
-(send hyper-keymap add-function "do-wheel" 
-      (lambda (txt evt)
-        ;; Redirect the event to the canvas, which should
-        ;;  handle the event
-        (send (send txt get-canvas) on-char evt)))
-(add-text-keymap-functions hyper-keymap)
-(send hyper-keymap map-function "d:[" "rewind")
-(send hyper-keymap map-function "a:[" "rewind")
-(send hyper-keymap map-function "c:[" "rewind")
-(send hyper-keymap map-function "d:left" "rewind")
-(send hyper-keymap map-function "a:left" "rewind")
-(send hyper-keymap map-function "c:left" "rewind")
-(send hyper-keymap map-function "~c:m:left" "rewind")
-(send hyper-keymap map-function "d:]" "forward")
-(send hyper-keymap map-function "a:]" "forward")
-(send hyper-keymap map-function "c:]" "forward")
-(send hyper-keymap map-function "d:right" "forward")
-(send hyper-keymap map-function "a:right" "forward")
-(send hyper-keymap map-function "c:right" "forward")
-(send hyper-keymap map-function "~c:m:right" "forward")
-(send hyper-keymap map-function "wheelup" "do-wheel")
-(send hyper-keymap map-function "pageup" "previous-page")
-(send hyper-keymap map-function "wheeldown" "do-wheel")
-(send hyper-keymap map-function "pagedown" "next-page")
-
-;; call-with-hyper-panel : object ((is-a?/c hyper-panel<%>) -> void) -> void
-(define (call-with-hyper-panel text f)
-  (when (is-a? text hyper-text<%>)
-    (let ([canvas (send text get-canvas)])
-      (when canvas
-        (let ([tlw (send canvas get-top-level-window)])
-          (when (is-a? tlw hyper-frame<%>)
-            (f (send tlw get-hyper-panel))))))))
-
-;; path-below? : string[normalized-path] string[normalized-path] -> boolean
-;; returns #t if subpath points to a place below top
-(define (path-below? top longer)
-  (let loop ([top (explode-path top)]
-             [longer (explode-path longer)])
-    (cond
-     [(null? top) #t]
-     [(null? longer) #f]
-     [(equal? (car top) (car longer))
-      (loop (cdr top) (cdr longer))]
-     [else #f])))
-
-(keymap:add-to-right-button-menu/before
- (let ([old (keymap:add-to-right-button-menu/before)])
-   (lambda (menu editor event)
-     (when (is-a? editor hyper-text<%>)
-       (let* ([panel (let ([canvas (send editor get-canvas)])
-                       (and canvas
-                            (send (send canvas get-top-level-window) get-hyper-panel)))]
-              [back
-               (instantiate menu-item% ()
-                            (label (string-append "< " (string-constant rewind-in-browser-history)))
-                            (parent menu)
-                            (callback
-                             (lambda (_1 _2)
-                               (when panel
-                                 (send panel rewind)))))]
-              [forward
-               (instantiate menu-item% ()
-                            (label (string-append (string-constant forward-in-browser-history) " >"))
-                            (parent menu)
-                            (callback
-                             (lambda (_1 _2)
-                               (when panel
-                                 (send panel forward)))))])
-         (send back enable (send panel can-rewind?))
-         (send forward enable (send panel can-forward?))
-         (instantiate separator-menu-item% ()
-                      (parent menu))))
-     (old menu editor event))))
-
-(define hyper-canvas-mixin
-  (mixin ((class->interface editor-canvas%)) ()
-         (inherit get-editor set-editor refresh get-parent get-top-level-window)
-         
-         (define/public (get-editor%) hyper-text%)
-         
-         (define/public (current-page)
-           (let ([e (get-editor)])
-             (and e 
-                  (let ([sbox (box 0)]
-                        [ebox (box 0)])
-                    (send e get-visible-position-range sbox ebox)
-                    (list e (unbox sbox) (unbox ebox))))))
-         (define/public (on-url-click k url post-data)
-           (send (get-parent) on-url-click k url post-data))
-         (define/public goto-url
-           (lambda (in-url relative [progress void] [post-data #f])
-             (let ([tlw (get-top-level-window)])
-               (when (and tlw
-                          (is-a? tlw hyper-frame<%>))
-                 (let* ([pre-url (cond
-                                  [(url? in-url) in-url]
-                                  [(port? in-url) in-url]
-                                  [(string? in-url)
-                                   (if relative
-                                       (combine-url/relative relative in-url)
-                                       (string->url in-url))]
-                                  [else (error 'goto-url "unknown url ~e\n" in-url)])]
-                        [killable-cust (make-custodian)]
-                        [hyper-panel (send tlw get-hyper-panel)]
-                        [result
-                         (let ([e-now (get-editor)])
-                           (cond
-                            [(and e-now
-                                  (not post-data)
-                                  (same-page-url? pre-url (send e-now get-url)))
-                             (progress #t)
-                             (cons e-now pre-url)]
-                            [else
-                             (send hyper-panel set-stop-callback 
-                                   (lambda ()
-                                     (custodian-shutdown-all killable-cust)))
-                             (send hyper-panel enable-browsing #f)
-                             (begin0
-                              (make-editor/setup-kill killable-cust 
-                                                      (get-editor%)
-                                                      tlw
-                                                      pre-url
-                                                      progress
-                                                      post-data
-                                                      (lambda (x) (remap-url x)))
-                              (send hyper-panel set-stop-callback void)
-                              (send hyper-panel enable-browsing #t))]))])
-                   (cond
-                    [(pair? result)
-                     (let* ([e (car result)]
-                            [url (cdr result)]
-                            [tag-pos (send e find-tag (and (url? url) (url-fragment url)))])
-                       (unless (and tag-pos (positive? tag-pos))
-                         (send e hide-caret #t))
-                       (set-page (list e (or tag-pos 0) (send e last-position)) #t)
-                       (when tag-pos (send e set-position tag-pos)))]
-                    [(exn? result) 
-                     (message-box (string-constant drracket)
-                                  (exn-message result)
-                                  tlw)]
-                    [else (void)]))))))
-         
-         ;; remap-url : url? -> (union #f url?)
-         ;; this method is intended to be overridden so that derived classes can change
-         ;; the behavior of the browser. Calls to this method may be killed.
-         (define/public (remap-url url)
-           url)
-         
-         (define/public (after-set-page) (void))
-         (define/public (set-page page notify?)
-           (let ([e (car page)]
-                 [spos (cadr page)]
-                 [epos (caddr page)]
-                 [curr (get-editor)]
-                 [current (current-page)])
-                                        ; Pre-size the editor to avoid visible reflow
-             (when curr
-               (let ([wbox (box 0)])
-                 (send curr get-view-size wbox (box 0))
-                 (when (send e auto-wrap)
-                   (send e set-max-width (unbox wbox)))))
-             (send e begin-edit-sequence)
-             (when notify?
-               (send (get-parent) leaving-page current (list e 0 0)))
-             (set-editor e (and current (zero? (cadr current)) (zero? spos)))
-             (send e scroll-to-position spos #f epos 'start)
-             (send e end-edit-sequence)
-             (after-set-page)
-             (when (or (positive? spos) (not current) (positive? (cadr current)))
-               (refresh))))
-         (super-new)))
-
-;; make-editor/setup-kill : custodian editor-class frame%-instance 
-;;                          url (boolean??? -> void) ??? (url -> (union port #f url))
-;;                       -> (union (cons editor (union #f url)) exn #f)
-;; if cust is shutdown, the url will stop being loaded and a dummy editor is returned.
-(define (make-editor/setup-kill cust html-editor% tlw init-url progress post-data remap-url)
-  (let* ([c (make-channel)]
-         [progs (make-channel)]
-         [sent-prog? #f]
-         [t (parameterize ([current-custodian cust])
-              (thread
-               (lambda ()
-                 (with-handlers ([exn? (lambda (exn)
-                                         (channel-put c exn))])
-                   (channel-put
-                    c
-                    (make-editor/follow-redirections html-editor%
-                                                     tlw
-                                                     init-url
-                                                     (lambda (v)
-                                                       (channel-put progs v))
-                                                     post-data
-                                                     remap-url))))))]
-         [ans #f])
-    (let loop ()
-      (yield
-       (choice-evt
-        (handle-evt c (lambda (x) (set! ans x)))
-        (handle-evt progs (lambda (v)
-                            (set! sent-prog? #t)
-                            (progress v)
-                            (loop)))
-        (handle-evt (thread-dead-evt t)
-                    (lambda (_)
-                      (let ([t (new hyper-text% 
-                                    (url #f)
-                                    (top-level-window #f)
-                                    (progress void))])
-                        (send t insert "Stopped.")
-                        (set! ans (cons t #f))))))))
-    (unless sent-prog?
-      (progress #f))
-    ans))
-
-;; make-editor/follow-redirections : editor-class frame%-instance
-;;                                   url (boolean??? -> void) ??? (url -> (union port #f url))
-;;                                -> (cons (union #f editor) (union #f url))
-;; builds an html editor using make-editor and follows any redictions,
-;; but stops after 10 redirections (just in case there are too many
-;; of these things, give the user a chance to stop)
-(define (make-editor/follow-redirections html-editor% tlw init-url progress post-data remap-url)
-  (with-handlers ([(lambda (x) 
-                     (or (exn:file-saved-instead? x)
-                         (exn:cancelled? x)
-                         (exn:tcp-problem? x)))
-                   values])
-    (let loop ([n 10]
-               [unmapped-url init-url])
-      (let ([url (if (url? unmapped-url)
-                     (let ([rurl (remap-url unmapped-url)])
-                       (unless (or (url? rurl)
-                                   (input-port? rurl)
-                                   (not rurl))
-                         (error 'remap-url
-                                "expected a url struct, an input-port, or #f, got ~e"
-                                rurl))
-                       rurl)
-                     unmapped-url)])
-        (if url
-            (let ([html-editor (new html-editor%
-                                    [url url]
-                                    [top-level-window tlw]
-                                    [progress progress]
-                                    [post-data post-data])])
-              (cond
-               [(zero? n) 
-                (cons html-editor url)]
-               [(send html-editor get-redirection)
-                =>
-                (lambda (new-url) (loop (- n 1) new-url))]
-               [else
-                (cons html-editor url)]))
-            #f)))))
-
-(define hyper-canvas% (hyper-canvas-mixin canvas:basic%))
-
-(define info-canvas%
-  (class canvas%
-    (inherit min-client-height get-dc stretchable-height
-             get-parent enable refresh show)
-    (field
-     [text ""])
-    [define/override on-paint
-      (lambda ()
-        (let ([dc (get-dc)])
-          (send dc clear)
-          (send dc draw-text text 4 2)))]
-    [define/public erase-info (lambda ()
-                                (unless (string=? text "")
-                                  (set! text "")
-                                  (let ([dc (get-dc)])
-                                    (send dc clear))))]
-    [define/public set-info (lambda (t)
-                              (set! text t)
-                              (if (string=? t "")
-                                  (show #f)
-                                  (let ([dc (get-dc)])
-                                    (send dc clear)
-                                    (show #t)
-                                    (refresh))))]
-    (super-instantiate ())
-    (stretchable-height #f)
-    (enable #f)
-    (show #f)
-    (let ([font (make-object font% (send normal-control-font get-point-size) 
-                             'default 'normal 'normal)]
-          [dc (get-dc)])
-      (send dc set-font font)
-      (send dc set-text-foreground (make-object color% "FOREST GREEN"))
-      (let-values ([(w h d a) (send dc get-text-extent "X" font)])
-        (min-client-height (+ 4 (inexact->exact (ceiling h))))))))
-
-(define hyper-panel<%>
-  (interface ()
-    current-page
-    rewind
-    forward
-    can-rewind?
-    can-forward?
-    get-canvas%
-    make-canvas
-    make-control-bar-panel
-    
-    set-init-page
-    goto-init-page
-    
-    on-navigate
-    filter-notes
-    get-canvas
-    on-url-click 
-    reload
-    leaving-page
-    get-stop-button
-    set-stop-callback
-    
-    enable-browsing))
-
-(define hyper-panel-mixin
-  (mixin (area-container<%>) (hyper-panel<%>)
-         (init info-line?)
-         (inherit reflow-container)
-         (super-new)
-         
-         (define browsing-on? #t)
-         (define/public (enable-browsing on?)
-           (set! browsing-on? on?)
-           (cond
-            [on?
-             (send stop-button enable #f)
-             (when choice (send choice enable #t))
-             (update-buttons)]
-            [else 
-             (send stop-button enable #t)
-             (when home (send home enable #f))
-             (when forw (send forw enable #f))
-             (when back (send back enable #f))
-             (when choice (send choice enable #f))]))
-         
-         (define/private (clear-info)
-           (when info 
-             (send info erase-info)))
-         (define/private (update-info page)
-           (when (and info page)
-             (let ([notes (send (page->editor page) get-document-notes)])
-               (send info set-info
-                     (filter-notes notes (send (page->editor page) get-url))))))
-         (define/private (go page)
-           (clear-info)
-           (send c set-page page #f)
-           (update-info page)
-           (update-buttons/set-page page)
-           (on-navigate))
-         
-         (define/public (current-page) (send c current-page))
-         (define/public (rewind)
-           (unless (null? past)
-             (let ([page (car past)])
-               (set! future (cons (send c current-page) future))
-               (set! past (cdr past))
-               (go page))))
-         (define/public (forward)
-           (unless (null? future)
-             (let ([page (car future)])
-               (set! past (cons (send c current-page) past))
-               (set! future (cdr future))
-               (go page))))
-         (define/public (can-forward?) (and browsing-on? (not (null? future))))
-         (define/public (can-rewind?) (and browsing-on? (not (null? past))))
-         [define/public get-canvas% (lambda () hyper-canvas%)]
-         [define/public make-canvas (lambda (f) (make-object (get-canvas%) f))]
-         [define/public make-control-bar-panel (lambda (f) (make-object horizontal-panel% f))]
-         (field
-          [past null]
-          [future null] 
-          
-          
-          ;; (union #f                             -- no init page
-          ;;         string                        -- delayed init page
-          ;;         url                           -- delayed init page
-          ;;         (list editor number numer))   -- forced init page
-          [init-page #f]
-
-          [hp (make-control-bar-panel this)]
-          [control-bar? (is-a? hp area-container<%>)]
-          [back (and control-bar?
-                     (make-object button%
-                                  (string-append "< " (string-constant rewind-in-browser-history))
-                                  hp
-                                  (lambda (b ev) 
-                                    (rewind))))]
-          [forw (and control-bar?
-                     (make-object button% 
-                                  (string-append (string-constant forward-in-browser-history) " >")
-                                  hp
-                                  (lambda (b ev) 
-                                    (forward))))])
-         
-         (define/private (home-callback)
-           (cond
-            [(or (url? init-page)
-                 (string? init-page))
-             
-                                        ; handle stopping when loading the home page
-             (with-handlers ([exn:break? 
-                              (lambda (x) (void))])
-               (send c goto-url init-page #f)
-               (update-buttons))]
-            [else 
-             (send c set-page init-page #t)]))
-         (field
-          [home (and control-bar?
-                     (make-object button% (string-constant home) hp
-                                  (lambda (b ev)
-                                    (home-callback))))])
-         
-         (define the-page #f)
-         (define/private (update-buttons/set-page page)
-           (unless init-page
-             (set! init-page page))
-           (set! the-page page)
-           (update-buttons))
-         (define/private (update-buttons)
-           (when control-bar?
-             (send home enable (or (url? init-page) (string? init-page)))
-             (send back enable (pair? past))
-             (send forw enable (pair? future))
-             
-             (send choice clear)
-             (for-each
-              (lambda (p)
-                (send choice append 
-                      (let ([s (send (car p) get-title)])
-                        (if s 
-                            (gui-utils:trim-string s 200)
-                            (string-constant untitled)))))
-              (append (reverse future)
-                      (if the-page (list the-page) null)
-                      past))
-             (let ([c (send choice get-number)])
-               (unless (zero? c)
-                 (send choice set-selection (length future))))))
-         (field
-          [choice (and control-bar?
-                       (make-object choice% #f null hp
-                                    (lambda (ch e)
-                                      (let* ([l (append (reverse past)
-                                                        (list (send c current-page))
-                                                        future)]
-                                             [pos (- (send choice get-number) (send choice get-selection) 1)])
-                                        (let loop ([l l][pre null][pos pos])
-                                          (cond
-                                           [(zero? pos)
-                                            (set! past pre)
-                                            (set! future (cdr l))
-                                            (go (car l))]
-                                           [else (loop (cdr l)
-                                                       (cons (car l) pre)
-                                                       (sub1 pos))]))))))]
-          [stop-callback void]
-          [stop-button
-           (and control-bar?
-                (new button%
-                     (label (string-constant stop))
-                     (parent hp)
-                     (callback (lambda (x y) (stop-callback)))))])
-         (define/public (get-stop-button) stop-button)
-         (define/public (set-stop-callback bc) (set! stop-callback bc))
-         (when stop-button (send stop-button enable #f))
-         
-         (field
-          [info (and info-line?
-                     (make-object info-canvas% this))]
-          [c (make-canvas this)])
-         
-         ;; set-init-page : (union string url) -> void
-         [define/public set-init-page
-           (lambda (p)
-             (set! init-page p))]
-         [define/public goto-init-page
-           (lambda ()
-             (home-callback))]
-         
-         [define/public on-navigate (lambda () (void))]
-         [define/public filter-notes (lambda (l) (apply string-append l))]
-         [define/public get-canvas (lambda () c)]
-         [define/public on-url-click (lambda (k url post-data) (k url post-data))]
-         
-         [define/public reload
-           (lambda ()
-             (let ([c (get-canvas)])
-               (and c 
-                    (let ([e (send c get-editor)])
-                      (and e
-                           (send e reload))))))]
-         
-         (define/public (leaving-page page new-page)
-           (set! future null)
-           (when page
-             (set! past (cons page past)))
-           (when (> (length past) history-limit)
-             (set! past
-                   (let loop ([l past])
-                     (if (null? (cdr l))
-                         null
-                         (cons (car l) (loop (cdr l)))))))
-           (clear-info)
-           (update-buttons/set-page new-page)
-           (update-info new-page))
-         (when control-bar?
-           (send choice stretchable-width #t)
-           (send hp stretchable-height #f))
-         (update-buttons/set-page #f)))
-
-(define hyper-panel% (hyper-panel-mixin vertical-panel%))
-
-(define hyper-frame<%>
-  (interface ()
-    get-hyper-panel
-    get-hyper-panel%))
-
-(define hyper-no-show-frame-mixin
-  (mixin (frame:status-line<%>) (hyper-frame<%>)
-         (field [p #f])
-         (define/public get-hyper-panel% (lambda () hyper-panel%))
-         (define/public get-hyper-panel (lambda () p))
-         (inherit show get-area-container)
-         (super-instantiate ())
-         (set! p (make-object (get-hyper-panel%) #f (get-area-container)))))
-
-(define hyper-frame-mixin
-  (let ([m (mixin (hyper-frame<%> top-level-window<%>) ()
-                  (init start-url)
-                  (inherit show get-hyper-panel)
-                  (super-instantiate ())
-                  (show #t)
-                  (send (send (get-hyper-panel) get-canvas) goto-url start-url #f))])
-    (lambda (%)
-      (m (hyper-no-show-frame-mixin %)))))
-
-(define hyper-frame% (hyper-frame-mixin (frame:status-line-mixin frame:basic%)))
-(define hyper-no-show-frame% (hyper-no-show-frame-mixin (frame:status-line-mixin frame:basic%)))
-
-(define (editor->page e) (list e 0 0))
-(define (page->editor e) (car e))
-
-(define (same-page? a b)
-  (eq? (car a) (car b)))
-
-(define (open-url file)
-  (make-object hyper-frame% file (string-constant browser) #f 500 450))
-
diff --git a/pkgs/drracket-pkgs/drracket/browser/private/option-snip.rkt b/pkgs/drracket-pkgs/drracket/browser/private/option-snip.rkt
deleted file mode 100644
index c857ae12e3..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/private/option-snip.rkt
+++ /dev/null
@@ -1,199 +0,0 @@
-#lang racket
-(require racket/gui)
-
-(provide option-snip%
-         checkbox-snip%)
-
-(define inset 2)
-(define arrow-sep 5)
-(define arrow-height 5)
-
-(define arrow (list (make-object point% 0 0)
-                    (make-object point% arrow-height arrow-height)
-                    (make-object point% (* 2 arrow-height) 0)))
-
-(define arrow-cursor (make-object cursor% 'arrow))
-
-(define option-snip%
-  (class snip%
-    (inherit get-admin set-snipclass set-count get-style get-flags set-flags)
-    (init-field [options null])
-    (define w #f)
-    (define h #f)
-    (define d #f)
-    (define current-option #f)
-    (define look-for-option #f) ; a box when we're looking (in case we're looking for #f)
-    
-    (define/public (add-option o v)
-      (set! options (append options (list (cons o v))))
-      (when (and look-for-option
-                 (equal? v (unbox look-for-option)))
-        (set! current-option (cons o v)))
-      (set! w #f)
-      (set! h #f)
-      (let ([a (get-admin)])
-        (when a
-          (send a resized this #t))))
-    
-    (define/public (get-value)
-      (with-handlers ([exn:fail? (lambda (x) #f)])
-        (cdr (or current-option
-                 (car options)))))
-    
-    (define/public (set-value v)
-      (let ([o (ormap (lambda (o) (and (equal? v (cdr o)) o)) options)])
-        (if o
-            (set! current-option o)
-            (set! look-for-option (box v)))))
-    
-    (override*
-     [get-extent  ; called by an editor to get the snip's size
-      (lambda (dc x y wbox hbox descentbox spacebox lspacebox rspacebox)
-        (unless w
-          (let ([font (send (get-style) get-font)])
-            (let ([w+h+ds
-                   (map (lambda (o)
-                          (let-values ([(tw th td ta) (send dc get-text-extent (car o) font)])
-                            (list tw th td)))
-                        options)])
-              (if (null? w+h+ds)
-                  (begin
-                    (set! w 10)
-                    (set! h 10)
-                    (set! d 2))
-                  (begin
-                    (set! w (+ (* 2 inset) arrow-sep 2 (* 2 arrow-height) (apply max (map car w+h+ds))))
-                    (set! h (+ (* 2 inset) 1 (apply max arrow-height (map cadr w+h+ds))))
-                    (set! d (+ inset 1 (apply max (map caddr w+h+ds)))))))))
-        (when hbox
-          (set-box! hbox h))
-        (when wbox
-          (set-box! wbox w))
-        (when descentbox
-          (set-box! descentbox d))
-        (when spacebox
-          (set-box! spacebox 0))
-        (when rspacebox
-          (set-box! rspacebox 0))
-        (when lspacebox
-          (set-box! lspacebox 0)))]
-     [draw  ; called by an editor to draw the snip
-      (lambda (dc x y . other)
-        (unless w
-          (get-extent dc x y #f #f #f #f #f #f))
-        (send dc draw-rectangle x y (sub1 w) (sub1 h))
-        (send dc draw-line (+ x 1) (+ y h -1) (+ x w -1) (+ y h -1))
-        (send dc draw-line (+ x w -1) (+ y 1) (+ x w -1) (+ y h -1))
-        (let ([pen (send dc get-pen)]
-              [brush (send dc get-brush)])
-          (send dc set-brush (send the-brush-list find-or-create-brush (send pen get-color) 'solid))
-          (send dc draw-polygon arrow 
-                (+ x (- w 2 inset (* 2 arrow-height)))
-                (+ y (/ (- h arrow-height) 2)))
-          (send dc set-brush brush))
-        (unless (null? options)
-          (send dc draw-text (car (or current-option (car options))) (+ x inset) (+ y inset))))]
-     [copy
-      (lambda ()
-        (make-object option-snip% options))]
-     [size-cache-invalid
-      (lambda () (set! w #f) (set! h #f))]
-     [on-event (lambda (dc x y editorx editory event)
-                 (when (send event button-down?)
-                   (let ([popup (make-object popup-menu%)])
-                     (for-each (lambda (o)
-                                 (make-object menu-item% (car o) popup
-                                   (lambda (i e)
-                                     (set! current-option o)
-                                     (let ([a (get-admin)])
-                                       (when a
-                                         (send a needs-update this 0 0 w h))))))
-                               options)
-                     (let ([a (get-admin)])
-                       (when a
-                         (send a popup-menu popup this 0 0))))))]
-     [adjust-cursor (lambda (dc x y editorx editory event)
-                      arrow-cursor)])
-    (super-instantiate ())
-    (set-flags (cons 'handles-events (get-flags)))
-    (set-count 1)))
-
-(define cb-width 12)
-(define cb-height 12)
-
-(define checkbox-snip%
-  (class snip%
-    (inherit get-admin set-snipclass set-count get-style get-flags set-flags)
-    (init-field [checked? #f])
-    (define tracking? #f)
-    (define hit? #f)
-    (define w cb-width)
-    (define h cb-height)
-    
-    (define/public (get-value) checked?)
-    
-    (override*
-     [get-extent  ; called by an editor to get the snip's size
-      (lambda (dc x y wbox hbox descentbox spacebox lspacebox rspacebox)
-        (when hbox
-          (set-box! hbox h))
-        (when wbox
-          (set-box! wbox w))
-        (when descentbox
-          (set-box! descentbox 0))
-        (when spacebox
-          (set-box! spacebox 0))
-        (when rspacebox
-          (set-box! rspacebox 0))
-        (when lspacebox
-          (set-box! lspacebox 0)))]
-     [draw  ; called by an editor to draw the snip
-      (lambda (dc x y . other)
-        (send dc draw-rectangle x y w h)
-        (when tracking?
-          (send dc draw-rectangle (+ x 1) (+ y 1) (- w 2) (- h 2)))
-        (when (or (and (not hit?) checked?)
-                  (and hit? (not checked?)))
-          (send dc draw-line x y (+ x w -1) (+ y h -1))
-          (send dc draw-line x (+ y h -1) (+ x w -1) y)))]
-     [copy
-      (lambda ()
-        (make-object checkbox-snip% checked?))]
-     [on-event (lambda (dc x y editorx editory event)
-                 (when (send event button-down?)
-                   (set! tracking? #t)
-                   (refresh)
-                   (set! hit? #f))
-                 (if (or (send event button-down?)
-                         (and tracking? (send event dragging?))
-                         (and tracking? (send event button-up?)))
-                     (if (and (<= 0 (- (send event get-x) x))
-                              (<= 0 (- (send event get-y) y)))
-                         (when (not hit?)
-                           (set! hit? #t)
-                           (refresh))
-                         (when hit?
-                           (set! hit? #f)
-                           (refresh)))
-                     (when tracking?
-                       (set! tracking? #f)
-                       (set! hit? #f)
-                       (refresh)))
-                 (when (and tracking?
-                            (and tracking? (send event button-up?)))
-                   (set! tracking? #f)
-                   (when hit?
-                     (set! hit? #f)
-                     (set! checked? (not checked?)))
-                   (refresh)))]
-     [adjust-cursor (lambda (dc x y editorx editory event)
-                      arrow-cursor)])
-    
-    (define/private (refresh)
-      (let ([a (get-admin)])
-        (when a
-          (send a needs-update this 0 0 w h))))
-    
-    (super-instantiate ())
-    (set-flags (cons 'handles-events (get-flags)))
-    (set-count 1)))
diff --git a/pkgs/drracket-pkgs/drracket/browser/private/sig.rkt b/pkgs/drracket-pkgs/drracket/browser/private/sig.rkt
deleted file mode 100644
index f0a1fa52de..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/private/sig.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket
-(require racket/unit)
-
-(provide relative-btree^
-         bullet-export^
-         hyper^
-         html-export^
-         html^)
-
-(define-signature html-export^
-  (html-img-ok
-   html-eval-ok
-   image-map-snip%))
-
-(define-signature html^ extends html-export^
-  (html-convert
-   html-status-handler))
-
-(define-signature bullet-export^
-  (bullet-size))
-
-(define-signature hyper^
-  (open-url
-   (struct exn:file-saved-instead (pathname) #:omit-constructor)
-   (struct exn:cancelled () #:omit-constructor)
-   
-   hyper-text<%>
-   hyper-text-mixin
-   hyper-text%
-   
-   hyper-canvas-mixin
-   hyper-canvas%
-   
-   hyper-panel<%>
-   hyper-panel-mixin
-   hyper-panel%
-   
-   hyper-frame<%>
-   hyper-frame-mixin
-   hyper-frame%
-   
-   hyper-no-show-frame-mixin
-   hyper-no-show-frame%
-   
-   editor->page
-   page->editor))
-
-(define-signature relative-btree^
-  (make-btree
-   
-   btree-get
-   btree-put!
-   
-   btree-shift!
-   
-   btree-for-each
-   btree-map))
diff --git a/pkgs/drracket-pkgs/drracket/browser/tests/test-docs-complete.rkt b/pkgs/drracket-pkgs/drracket/browser/tests/test-docs-complete.rkt
deleted file mode 100644
index d46571b10a..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote browser))
-(check-docs (quote browser/htmltext))
-(check-docs (quote browser/external))
-(check-docs (quote browser/bullet-snip)  #:skip '(snip-class))
-(check-docs (quote browser/browser))
-(check-docs (quote browser/browser-unit))
-(check-docs (quote browser/browser-sig))
diff --git a/pkgs/drracket-pkgs/drracket/browser/tool.rkt b/pkgs/drracket-pkgs/drracket/browser/tool.rkt
deleted file mode 100644
index 40d350d79b..0000000000
--- a/pkgs/drracket-pkgs/drracket/browser/tool.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket
-(require (only-in "external.rkt" install-help-browser-preference-panel)
-         racket/unit
-         drracket/tool)
-(provide tool@)
-
-;; to add a preference pannel to drracket that sets the browser preference
-(define tool@
-  (unit
-    (import drracket:tool^)
-    (export drracket:tool-exports^)
-  
-    (define (phase1) (void))
-    (define (phase2) (void))
-    
-    (install-help-browser-preference-panel)))
\ No newline at end of file
diff --git a/pkgs/drracket-pkgs/drracket/drracket/HISTORY.txt b/pkgs/drracket-pkgs/drracket/drracket/HISTORY.txt
deleted file mode 100644
index fce79861d0..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/HISTORY.txt
+++ /dev/null
@@ -1,1849 +0,0 @@
-------------------------------
-       Version 6.1.2
-------------------------------
-
-  . change the teaching languages to use #true, #false, and '()
-    for true, false, and empty
-
-------------------------------
-       Version 6.1.1
-------------------------------
-
-  . added support for hiding the content of ellipsis-labelled sections
-    in error messages
-
-  . remove 'print' mode from the Pretty Big language
-
-  . improve support for tooltips in Check Syntax
-
-  . DrRacket: drop numpad Enter treatment as force-evaluation
-    (see commit a41cc0c3c0 for details)
-
-  . macro expansion that exhausts memory no longer breaks DrRacket's
-    online expansion & check syntax
-
-------------------------------
-       Version 6.1
-------------------------------
-
-  . added better spell-checking support: DrRacket can suggest
-    corrections and has a keystroke to jump the next misspelling.
-
-  . changed the online expansion handler machinery so that
-    the handlers receive exceptions when expansion raises one
-
-  . made the memory log and the () highlighter's computation status
-    visible in released versions of DrRacket (previously they were
-    visible only in git-based versions and nightly builds)
-
-  . improved DrRacket .plt installation functionality so that it
-    prints out the start of the contents of the file it tried to
-    unpack when it fails
-
-  . Mac OS X: added full screen support
-
-  . added a re-indent paragraph key binding (esc;q) for Scribble
-    mode. Thanks to Lei Wang for implementing this.
-
-------------------------------
-       Version 6.0
-------------------------------
-
-  . Internal errors are now stashed away and included in future bug
-    reports (even unrelated bug reports).
-
-  . Added a GUI package manager
-
-  . Added keybindings for the items in the Check Synax popup menu,
-    notably c:x;m to rename a variable, c:x;d to just to the
-    definition of an imported variable, c:x;n to go to the next
-    occurence of a variable, and c:x;b to go to the binding occurrence
-    of a variable.
-
-  . Improved how Check Syntax handles variables bound by
-    define-struct, struct, and Redex's pattern variables
-
-  . Check Syntax now allows macros to declare certain identifiers as
-    original via the 'original-for-syntax syntax property.
-
-  . Online expansion no longer puts status messages in the place where
-    errors go (just watch the colored bubble in the bottom right to
-    see what it is doing)
-
-  . Online check syntax now works even in the presence of type errors
-    in typed racket; and the results may come back in parallel to type
-    checking
-
-  . Added <menukey>-shift-o to facilitate opening files that are in
-    collections.
-
-  . Improved support for (user-defined) color schemes
-
-  . Added a splash screen to commemorate Ada Lovelace's birthday
-    (December 10th)
-
-  . Under Unix/X, the .desktop-based launcher now uses single-instance
-    mode
-
-  . Added the ability to move tabs around in a frame; change the
-    <menukey>-9 shortcut to always go to the last tab, not the 9th one
-
-  . Improved the usability of the teaching language teachpack dialog 
-
-  . Packages can now add teachpacks to the teachpack dialog via
-    info.rkt declarations.
-
-  . DrRacket allows the language (via the #lang line-specified
-    read-language) to provide a mode specification which, in turn,
-    lets the language make arbitrary adjustments to the editor editing
-    the definitions window. (No languages are using this yet, tho.)
-
-  . Improved auto-parens mode behavior, e.g. typing a double quote in
-    a string now works better. Thanks to Nadeem Abdul Hamid.
-
-  . DrRacket now saves the font size and window position preferences
-    on a per-monitor-configuration basis (so when you plugin your
-    laptop to an external display, the font size will change to the
-    size it last was on that display)
-
-  . DrRacket now saves tabbing and square brack preferences is a
-    defaults-sensitive manner, so that if the defaults get more
-    entries, your DrRacket will pick up the new entries
-
-  . An "info.rkt" spec for `textbook-pls' is appended with the results
-    for `get-textbook-pls' to allow access to `string-constants'. The
-    same is true for `drscheme-language-positions' and
-    `get-drscheme-language-positions'.
-
-  . The compile-enforce-module-constants parameter's initial value in
-    The Racket Language is now configurable via the language dialog.
-
-  . The autosave delay defaults to 30 seconds now (instead of 5
-    minutes, as before)
-
-  . Bug fixes, notably esc;y (paste previously copied text) now works
-    properly
-
-------------------------------
-       Version 5.3.4
-------------------------------
-
-  . Check Syntax no longer calls the syncheck:add-id-set method (and
-    thus neither the syncheck:add-rename-menu method).
-
-  . Added a column width guide that defaults to 102 columns, but
-    is also disabled by default
-
-------------------------------
-       Version 5.3.3
-------------------------------
-
-  . added the ability to dynamically add new mixins to the DrRacket
-    classes and to start up a REPL to evaluate expressions to change
-    DrRacket's behavior.
-
-  . added a simple "install package" tool via a menu
-
-  . more improvements to DrRacket's responsiveness
-
-------------------------------
-       Version 5.3.3
-------------------------------
-
-  . added esc;h key binding (to the interactions window) that shows
-    the history of expressions evaluated
-
-------------------------------
-       Version 5.3.2
-------------------------------
-
-  . fixed a flaw in interactions between
-    the contour window and highlighting
-
-------------------------------
-       Version 5.3.2
-------------------------------
-
-  . Removed 'Create Executable...' functionality from DrRacket,
-    except in the "The Racket Language" (#lang-based) language
-    and the teaching languages (HtDP and DMdA).
-
-  . DrRacket is more responsive when editing
-
-  . The language dialog has been revamped to encourage people even
-    more to use the #lang language (unless they are using the teaching
-    languages)
-
-  . Automatic-parenthesis mode improvements 
-    (thanks to Nadeem Abdul Hamid)
-
-      - Added some "smart-skip" behavior to insert-close-paren,
-        described in the documentation.
-        - When auto-parens mode is enabled,
-          the existing "balance-parens" keybinding invokes
-          insert-close-paren with a smart-skip argument of
-          'adjacent
-        - A new "balance-parens-forward" keybinding invokes
-          insert-close-paren with a smart-skip argument of
-          'forward (whether or not auto-parens mode is
-                          enabled)
-  
-      - Some basic smart-skip behavior is also enabled for
-        strings ("...") and |...| pairs, specifically, typing
-        a double-quote or bar character when the cursor
-        immediately precedes one causes the cursor to simply
-        skip over the existing one
-  
-      - Tweaked insertion of block comment pairs in
-        auto-parens mode
-  
-      - In strings and line/block comments, auto-parens mode
-        no longer has any effect (you can still use the M+..
-        keybindings to force insertion of a particular brace
-        pair)
-  
-      - Detect when a character constant is being typed, and
-        don't insert brace pairs if so
-  
-  . DrRacket's window can now be substantially narrower
-
-  . DrRacket's frame preferences are now remembered on a
-    per-montior-configuration basis and, if there is only one frame
-    open, it will move itself around automatically when the monitor
-    configuration changes
-
-  . DrRacket's paren highlighting uses alpha-blending to avoid having
-    the highlight disappear completely when completely inside an
-    error.
-
-  . Improved the log message gui
-
-------------------------------
-       Version 5.3.1
-------------------------------
-
-  . Enable online check syntax by default (it has been
-    available in the last two releases, but was disabled by
-    default)
-
-  . Check Syntax now shows the blue boxes from the
-    documentation in the definitions window
-
-  . Add a spell checker for string constants; use
-    <menukey>-shift-c to turn it off or on
-
-  . Change the "Variables" pane of the debugger so that it
-    does not do word-wrapping (this avoids some performance
-    problems when very large values are rendered there)
-
-  . Adjust the Install .plt File dialog so that it cleans up
-    after the end of an installation (specifically, it shuts
-    down the custodian that was running the installation
-    process), which also causes the Abort button to be
-    disabled.
-
-------------------------------
-       Version 5.3
-------------------------------
-
-  . Added the Optimization Coach (see the 'View' menu)
-
-  . Adjusted Check Syntax so that set!'d variables and 
-    contract obligations are now in tooltips
-
-  . DrRacket's toolbar buttons now have numbers associated with them
-    to control what order they appear in.
-
-  . Ditto for the View menu items; also, cleaned up the View menu
-
-  . The framework's color:text%'s token-sym->style init argument (also
-    the same as the color:text%'s start-colorer method's argument of
-    the same name) is a function that now might be passed 'white-space.
-
-  . record errors coming from user language implementations via log-debug
-
-------------------------------
-       Version 5.2.1
-------------------------------
-
-  . The keybindings window is no longer a modal dialog (and its contents
-    will change to reflect where the keyboard focus currently is)
-
-  . The initial current-directory for unsaved programs in DrRacket is
-    now the user's home directory, instead of whatever the
-    current-directory was for the underlying OS process.
-
-  . The current-load-relative-directory is now set to #f initially in
-    DrRacket (to better match what Racket does).
-
-  . DrRacket no longer shows a stacktrace for syntax errors in the REPL.
-
-  . The preference that makes a single "(" keystroke insert "()" (and
-    similarly for [ { " and |) now only takes effect in Racket mode,
-    instead of taking effect in all of the modes, as it used to. This
-    change is in service to a bugfix that makes the automatic opening
-    parentheses adjustment cooperate with the automatic balancing.
-
-  . The scheme:text-mixin now requires input classes that implement
-    the editor:keymap<%> interface.
-
-------------------------------
-        Version 5.2
-------------------------------
-
-  . changed three menu keybindings:
-      "New Tab" is now <menukey>-t
-      "Run" is now <menukey>-r
-      "Replace" is now <menukey>-shift-f
-
-    The Keyboard Shortcuts section in the manual has a sample
-    keybindings file a checkbox that restores the old behavior of
-    the first two.
-
-  . Under Windows, DrRacket now saves files, in some situations,
-    with LF terminators. Previously, under windows, all files
-    were saved with CRLF terminators. Now, a file is saved with
-    CRLF terminators when every line in the file ends with CRLF.
-    In there is any one line that ends with just LF, then the
-    file is saved with LF's for each line. Also, newly created
-    files are also saved with LFs instead of CRLFs.
-
-    There is a preference in the Edit|General preferences panel
-    to go back to the behavior of previous versions of DrRacket.
-
-  . added online expansion and check syntax
-
-  . removed the "open here" functionality (both from
-    the DrRacket app and from the framework library)
-
-  . 2htdp/image:
-     - shrunk the size of saved files that contain 2htdp/image bitmaps
-       (you can get these by copying and pasting from the REPL; using
-        "insert image" isn't affected)
-
-     - use the pre-multiplied alphas when doing image comparsion
-
-     - sped up rotation and flipping of bitmaps
-
-  . improved the way the scribble-language buttons (render html and
-    render pdf) work; they now basically do what 'Run' does, plus the
-    extra work of rendering the document; before they had their own error
-    handling and sandboxing code, which was less integrated with DrRacket
-
-  . improved the preference handling for the frame's location
-    (specifically for the multiple-monitors case)
-
-  . check syntax no longer turns the module in the #lang line red
-
-  . improved the handling of the 'Open Recent' menu item; specifically it
-    discards duplicates in a smarter way.
-
-  . adjust DrRacket to be more accomodating to hostile filesystems; specifically
-    it no longer fails if it cannot read the preference system and it no longer
-    writes anywhere to the filesystem during startup except the prefs (and if that
-    fails, it survives in a less annoying manner)
-
-  . DrRacket no longer locks the definitions text while evaluating the program
-    (it makes a copy of the definitions text and uses that copy now)
-
-  . cleaned up the Close/Close Window/Close Tab menu items to match
-    the platform-specific conventions
-
-------------------------------
-        Version 5.1.2
-------------------------------
-
-   . The EoPL language is no longer available via the Language
-     dialog in DrRacket; use 
-
-       #lang eopl
-
-     and the 'language declared in the source' language in DrRacket.
-
-   . Minor bug fixes
-
-------------------------------
-        Version 5.1.1
-------------------------------
-
-   . Removed the "DrScheme" compatability program.
-
-   . Improved the speed of the module browser drawing
-
-   . Added search to the standalone module browser window
-
-   . Minor bug fixes
-
-------------------------------
-        Version 5.1
-------------------------------
-
-   . same (the game) has a new scoring system and different graphics
-
-   . Added image->color-list and color-list->bitmap to 
-     2htdp/image
-
-   . The "language in the source" language now automatically
-     compiles more files (with the default options). Specifically,
-     files that are in a collections directory are now compiled,
-     unless they are the main system collection (as reported
-     by (find-system-path 'collects-dir).
-
-   . minor bug fixes
-
-------------------------------
-        Version 5.0.1
-------------------------------
-
-   . Check Syntax now reports obligation information 
-     (via a new item in the "View" menu)
-   . added file-horizontal and flip-vertical to 2htdp/image
-
-------------------------------
-        Version 5.0
-------------------------------
-
-   . Scheme => Racket in many places
-   . minor bug fixes
-
-------------------------------
-        Version 4.2.5
-------------------------------
-
-  . a few more improvements to 2htdp/image
-  . new language dialog, designed to encourage 
-    people to use the module language
-  . the module browser shows the phases in
-    which each module is invoked (in a new
-    "long name" mode)
-  . added alt-1 thru alt-9 as shortcuts to swap
-    around between tabs
-
-------------------------------
-        Version 4.2.4
-------------------------------
-
-  . the 2htdp/image library changed:
-    - changed how equality works (it is now based on how the 
-      images draw, instead of on an underlying algebra
-      of images)
-    - added cropping and curves
-    - overlay, beside, and above now line things up on
-      centers, rather than upper lefts
-    - added scene-related funtions (place-image, scene+line, etc)
-    - added support for drawing with various kinds of pens
-
-------------------------------
-        Version 4.2.3
-------------------------------
-
-  . minor bug fixes
-  . added first draft of the 2htdp/image library
-
-------------------------------
-        Version 4.2.2
-------------------------------
-
-  . DrScheme now (by default) automatically compiles your source
-    files, saving them in the compiled/drscheme/ subdirectory.
-
-  . Syntax coloring now works for languages using the @-reader
-    (ie, Scribble) 
-
-  . The yellow message in the interactions window is now moved to be
-    part of the DrScheme frame.
-
-  . The module browser now shows the phases that each given module 
-    is invoked in.
-
-  . Check Syntax colors set!'d variables in dark red.
-
-------------------------------
-        Version 4.2.1
-------------------------------
-
-  . (Eli) The module browser used to treat any non-string require as
-    "libraries", where they can all be hidden or not.  Now this does
-    not include requires from the same "package", where a package is
-    defined as a toplevel collection or a planet collection.  This
-    means that requiring a file from your own collection is just as
-    convenient to do (wrt the module browser) using the normal
-    symbolic form.
-
-------------------------------
-        Version 4.2
-------------------------------
-
-  . Minor bug fixes
-
-------------------------------
-        Version 4.1.5
-------------------------------
-
-  . DrScheme now has a status line that shows what PLaneT is up to (in
-    broad strokes)
-
-  . Added logging support to DrScheme; it now monitors the logs via
-    the "View | Show Log" menu item.
-
-  . PLaneT now logs what it is doing at the 'info' level.
-
-
-------------------------------
-        Version 4.1.4
-------------------------------
-
-  . got rid of drscheme:debug:profiling-enabled
-    in favor of errortrace/errortrace-lib's
-    profiling-enabled
-
-  . minor bug fixes
-
-------------------------------
-        Version 4.1.3
-------------------------------
-
-  . improved the way extensions are handled when saving files.
-
-  . minor bug fixes
-
-------------------------------
-        Version 4.1.2
-------------------------------
-
-  . contract library's function contract 
-    combinatiors now preserve tail recursion.
-
-  . keybindings lang is now based on scheme, not mzscheme
-
-------------------------------
-        Version 4.1
-------------------------------
-
-  . get-text-to-search is now a public-final
-    method. Searching now works by the to-be-searched
-    text notifying the frame (instead of the frame asking
-    which text should be searched) so probably you can 
-    just remove the overridden method.
-
-  . The optional arguments to highlight-range have changed.
-    (If you did not supply any optional arguments you code
-    works as before.)
-
-  . removed edit-menu:find-again (& related) menu items
-    changed edit-menu:replace-and-find-again to edit-menu:replace-and-find
-    added a few edit-menu menu items as well.
-
-  . removed from frame:searchable<%> interface:
-    move-to-search-or-back, replace, toggle-search-focus
-    move-to-search-or-reverse-search, and search-again
-
-  . changed the is-hidden? method of frame:searchable to search-hidden?
-
-------------------------------
-        Version 4.0.2
-------------------------------
-
-  . fixed a bug in profj that triggered bad behavior when planet
-    packages were installed via drscheme
-
-------------------------------
-        Version 4.0.1
-------------------------------
-
-  . fixed a bug so that user-defined teachpacks can now be
-    added
-
-  . fixed a bug in PLaneT
-
-------------------------------
-        Version 4.0
-------------------------------
-
-  . renamed "(module ...)" language to "Module"
-
-  . dropped "MzScheme" and "MrEd" as separate languages;
-    try `#lang scheme/load' with the "Module" language
-
-  . changed the "Pretty Big" and "R5RS" to assume by default
-    that pre-defined names will not be redefined
-
-  . renamed the get-special-menu method to get-insert-menu
-
-  . drscheme:debug:show-backtrace-window
-    now accepts srcloc structures.
-
-  . removed help-desk:help-desk from the tools interface.
-    Use the help collection instead.
-
-  . removed drscheme:debug:show-error-and-highlight from
-    the tools interface. Use drscheme:debug:error-display-handler/stacktrace
-    instead.
-
-  . current-print's behavior is different in DrScheme. It
-    now prints to a separate port (the same on the REPL
-    printer uses, namely with blue output) and the style of
-    printing that it uses is controlled by the language
-    dialog (which means that the `current-print' option is
-    now gone from the language dialog)
-
-  . drscheme:language:language-dialog and
-    drscheme:language:fill-language-dialog no longer accepts
-    the manuals? argument
-
-  . The order-manuals method is gone.
-
-------------------------------
-        Version 372
-------------------------------
-
-  . added auto-completion (only gets completions from 
-    the documentation, not the lexical context).
-
-  . minor bug fixes
-
-------------------------------
-        Version 371
-------------------------------
-
-  . bug fixes from 370p1 & 370p2, plus misc other small bugfixes
-
-------------------------------
-        Version 370
-------------------------------
-
-  . changed teachpack support so that it is now
-    language-specific and languages no longer support
-    teachpacks by default.
-
-  . interface changes, related to teachpacks:
-
-    . create-executable method in
-      drscheme:language:language<%> no longer takes the
-      teachpack argument
-
-    . the get-init-code in
-      drscheme:language:simple-module-based-language no
-      longer accepts teachpacks as an argument.
-
-    . got rid of all drscheme:teachpack names
-
-    . front-end/complete-program and front-end/interaction
-      no longer accept a teachpack argument
-
-  . changed image.ss teachpack so that it accepts both exact
-    an inexact numbers (not just exact integers) for a
-    number of the primitives (it floors the numbers).
-
-  . changed the save format for color preferences. Due to a
-    bug in earlier versions, this means that color
-    preferences saved in earlier versions of DrScheme will
-    not be copied forward to this version. 
-
-    These functions are renamed:
-
-      color-prefs:marshall-style => color-prefs:marshall-style-delta
-      color-prefs:unmarshall-style => color-prefs:unmarshall-style-delta
-      color-prefs:register-color-pref => color-prefs:register-color-preference
-
-    If you used those functions before, do not use the new
-    ones with the same preference symbol as you used in old
-    versions, or else the old version of your app (or
-    drscheme) will fail to start up.
-
-  . changed the frame:editor-mixin, frame:text-mixin and
-    frame:pasteboard-mixin slightly so that one can supply
-    the editor class as an initialization argument
-    (overriding the get-editor% method still works, but now
-    that method defaults to the initialization argument)
-
-  . added an extra, mandatory argument to calc-button-sizes
-    and draw-button-label in mrlib's name-message.ss. Use
-    small-control-font to get the old behavior.
-
-  . added a new, optional, argument to the initializer of
-    name-message%. 
-
-  . The teaching languages now add a #reader wrapper to
-    saved files. Although the content of the file, when
-    viewed in drscheme, does not change, this does mean that
-    drscheme "remembers" which language was used for each
-    file, even if you change languages when editing other
-    files.
-
-  . added get-reader-module, get-metadata,
-    metadata->settings, and get-metadata-lines methods to
-    the drscheme:language:language<%> interface
-
-  . the framework preferences library now saves prefs each
-    time any one of them is changed, and works better when
-    multiple apps are both using the library. As a
-    consequence of this, preferences:save is no longer in
-    the library. Just remove any calls to it and your code
-    should work fine.
-
-  . split the preferences library out from the framework, so
-    it does not have to depend on mred
-
-  . removed (from the framework): exn:struct:exn,
-    exn:make-exn, and exn:exn?
-
-  . added preferences:restore-prefs-snapshot,
-  preferences:get-prefs-snapshot, and preferences:snaphot?
-
-------------------------------
-        Version 353
-------------------------------
-
-  . right clicking on the line/column offset display in the
-    bottom part of drscheme's window lets you toggle between
-    character offsets (from the beginning of the buffer) and
-    line/column counts.   
-
-  . user-defined keybindings can now be loaded directly from
-    PLaneT, via a new menu item in the Edit menu.
-
-  . the keybindings now have access to the same stuff as the
-    tools, via the require line:
-
-      (require (lib "tool-lib.ss" "drscheme"))
-
-  . in the non-debug languages, drscheme now trims its own
-    stack frames from the top of the stack before showing
-    them in the REPL.
-
-  . the get-language-numbers method in
-    drscheme:language:language<%> now requires its results
-    to be completely unique, wrt to other languages (until
-    now, the last number didn't have to be unique)
-
-------------------------------
-        Version 351
-------------------------------
-
-  . the or/c contract now accepts multiple higher-order
-    contracts, as long as they can be distinguished by some
-    first-order property (for example, the arity of the
-    function).
-
-  . failures of the first-order aspects of contracts are now
-    checked in the module that provides, not just the
-    requiring module. This means that this module:
-
-    (module m mzscheme 
-      (require (lib "contract.ss"))
-      (provide/contact [f (-> integer? integer?)])
-      (define (f x y) x))
-
-    will signal an error as soon as it is required, rather
-    than waiting for a variable reference to `f' (as it used
-    to).
-
-  . rewrote some of the internals of the contract library to
-    get a factor of 2 speedup for tight loops that do a lot
-    of contract checking (FWIW, I had introduced this
-    slowdown a few months ago in an attempt to optimize ...)
-
-------------------------------
-        Version 350
-------------------------------
-
-  [ The top three in this list were in 350, but weren't
-    listed in the release notes at the time of the
-    release. oops. ]
-
-  . contract-violation->string parameter: now takes one fewer
-    argument. It is no longer passed the `other-party'. Similarly,
-    raise-contract-error no longer accepts the other party argument.
-
-  . added one-of/c to contract library
-
-  . remap [ to be ``smart'' (ie often but not always change the square
-    bracket to a paren)
-
-  . Added two new keybindings to DrScheme (in Scheme mode):
-
-    c-c; c-o move-sexp-out: the sexpression following the insertion
-    point is put in place of its containing sexpression.
-
-    c-c; c-l insert-let-binding: wraps a let around the sexpression
-    following the insertion point and puts a printf in at that point
-    (useful for debugging)
-
-  . Case-insensitivity is now available in DrScheme's search box,
-    courtesy of Jens Axel Sogaard. Thanks!
-
-  . The image.ss teachpack now uses smoothed images.
-
-  . drscheme-language-positions and
-    drscheme-language-readers now allows relative paths for
-    language module specifications.
-
-  . Added `this', implicitly bound in ->r and ->pp contracts
-    when used inside `object-contract'
-
-  . union is now deprecated in favor of or/c. It's the same
-    combinator, but it matches other names in the contract library.
-
-  . Added `this', implicitly bound in ->r and ->pp contracts
-    when used inside `object-contract'
-
-  . Help Desk's font size is now independently configurable
-    (from Drscheme's font size).
-
-  . Help Desk no longer asks about non-http urls; it always
-    just ships them off to the OS to handle.
-
-  . Various url struct changes to fix bugs related to
-    mailto: url handling and handling of multiple params in
-    a path segment.
-
-    . the scheme and host are now always lowercased by
-      string->url
-
-    . the library no longer adds an empty path to the end of
-      urls like "http://www.drscheme.org", meaning that the
-      url-path can sometimes now be an empty list (the
-      contract always allowed this, but it didn't happen
-      before).
-
-    . added path-absolute? field to url struct, following
-      rfc 3986's nomenclature -- when #t, it means the path
-      portion of the url began with a slash and when #f it
-      means that it didn't.
-
-    . more care is taken when quoting path portions of the url
-      and when turning urls into strings
-
-    . path segments are now always path/param structs and
-      the param part of a path/param struct is now a list of
-      strings
-
-    . add 'up and 'same as possible path segments (in the
-      path field of a path/param struct), in addition to
-      strings (as before).
-
-
-------------------------------
-        Version 300
-------------------------------
-
- - Added support for user-definable keybindings. See the new
-   menus at the bottom of the Edit menu (and their
-   documentation) for details.
-
- - DrScheme's background color for the definitions and
-   interactions window is now configurable.
-
- - The regular expression language for the lexer has changed.
-   See doc.txt in the parser-tools collection.
-   (This isn't a DrScheme change per se.)
-
- - Check syntax can (when using modules) go to the
-   definition site of an imported variable.
-
- - the PLTDRDEBUG environment variable now works much
-   better. Thanks to improvements in cm, setting it now
-   builds .zos with errortrace and should make porting tools
-   to v300 much easier.
-
- - set the PLTDRBREAK environment variable to get a window
-   with two buttons that are useful for debugging deadlocks
-   & infinite loops. The buttons break drscheme's
-   eventspace's main thread and all threads started by
-   drscheme (and tools) resp. Useful in combination with
-   PLTDRDEBUG
-
- - tool & framework interface changes:
-
-   . remove exn:locs; this functionality is now in
-     mzscheme itself.
-
-   . removed drscheme:unit:make-bitmap. Use
-     (lib "bitmap-label.ss" "mrlib") instead.
-
-   . contract name changes (overall, removed all of the /f,
-     /p, and ? suffixes in favor of the /c suffix)
-
-      not/f => not/c
-      box/p => box/c
-      cons/p => cons/c
-      vector/p => vector/c
-      list/p => list/c
-      any? => any/c
-      printable? => printable/c
-      false? => false/c
-      natural-number? => natural-number/c
-
-
-   . The framework still probhits editing of files that are
-     read-only, but rather than using the editor<%>'s lock
-     method, it overrides can-insert? and can-delete? in
-     text%. Accordingly, several and interfaces are now gone
-     and the functionality has moved into existing
-     mixins. These are now gone:
-
-       frame:file<%>
-       frame:file-mixin
-       frame:text-info-file%
-
-   . can-close? in editor:basic is now an augmentable method.
-
-   . render-value and render-value/format no longer take the
-     put-snip argument. Use write-special on the port
-     instead.
-
-   . order-manuals in
-     drscheme:tool:language-configuration<%> now accepts
-     (and returns) lists of bytes, not lists of strings.
-
-   . front-end/complete-program and front-end/interaction
-     methods now accept a port, instead of an `input'.
-
-   . added an extra argument to create-executable in
-     drscheme:language:language<%> and get-init-code in
-     drscheme:language:module-based-language<%>
-
- - errortrace internal interface has changed (see docs for
-   details)
-
- - added ->r contract combinator
-
-------------------------------
-        Version 209
-------------------------------
-
-* Several small errors in the ProfessorJ compiler have been corrected.
-  Additionally, the native method interface has been updated to
-  provide more access to class members by the native method.
-
-* The interfaces and implementations for several HtDP and HtDCH
-  teachpacks have changed:
-  + the World class for HtDCH now supplies 'draw' and 'erase' methods
-  + its event callbacks are guaranteed to call erase before and draw
-    after handling a tick or keyboard event
-  + the world.ss teachpack provides a nw:rectangle function for
-    creating rectangles whose pinhole is in the northwest corner.
-
-* Oleg Kiselyov's SSAX/SXML is included in the distribution.
-
-  The SSAX/SXML libraries provides functions for reading, writing and
-  manipulating XML data.  In addition, the package supports the
-  definition of XML languages and exports machinery for transforming
-  XML documents based on concise specifications.  SSAX/SXML is the
-  foundation for a variety of other XML packages in Scheme.  For more
-  information, see http://ssax.sourceforge.net/ and the documentation
-  in the "ssax" collection.
-
-* Swindle is now included and maintained with PLT Scheme.
-
-  Swindle is an extension of PLT Scheme.  The main feature is a
-  CLOS-like object system based on Tiny-CLOS from Xerox.  Additional
-  syntactic extensions include: :keyword values and optional CL-style
-  argument lists; syntactic sugar for `define's and `let's; generic
-  `set!'; `defsubst' & `letsubst' for defining simple macros,
-  `letsyntax', `letsubst' and `letmacro' than can bind identifier
-  macros; a list-comprehension macro `list-of' with an extensive
-  generic version `collect'; an `echo' mechanism for complex output
-  formatting including list iterations; customizing printings via a
-  `print-object' generic; `amb', adopted from Dorai's TYSiFD, and
-  more.
-
-  Like Scheme in DrScheme, Swindle has several language levels.  It is
-  also possible to use its features on a selective basis.
-
-  Those extensions that are not directly related to Tiny CLOS are
-  likely to migrate into MzLib.
-
-------------------------------
-        Version 207
-------------------------------
-
- - Wizards for ProfessorJ added 
-   + union wizard
-   + class wizard 
-
-------------------------------
-        Version 206p1
-------------------------------
-
- - Check Syntax disabled in professorJ languages. 
-
-------------------------------
-        Version 206
-------------------------------
-
- - Help Desk searching is now language-sensitive.
-
- - Check syntax is now integrated (better) with the syntax
-   colorer.
-
- - Check Syntax now distinguishes between require'd
-   and locally defined identifiers.
-
- - added the ability to specify a command-line to the module
-   language.
-
- - Help Desk's status messages are now in the frame and
-   its break button is also in the frame (no more modal
-   dialog)
-
- - Check Syntax now does a better job of navigating amoung
-   occurrences of a single variable. The popup menu lets you
-   go from a bound occurrence to a binding occurrence and
-   from a binding occurrence to the next binding occurrence.
-
-   Also added two keystrokes: c-x;n to go to the next bound
-   occurrence and c-x;b to to the binding occurrence.
-
- - show menu => view menu, added show/hide for the toolbar
-
- - multi file search works much better
-
-------------------------------
-        Version 205
-------------------------------
-
-  - the teaching languages color the portion of the program
-    that has not been tested in dark red (using a simple
-    syntactic coverage criterion -- dark red means untested,
-    but not dark red doesn't mean fully tested, of course).
-
-  - added a test coverage annotation for other languages in
-    the "details" portion of the languages dialog; run the
-    program and it colors the code that was executed in
-    green and code that wasn't executed in red.
-
-  - fixed up help desk fonts, so that the font size in help
-    desk is now linked to the font size in drscheme proper.
-
-  - added support for editor modes to drscheme.
-
-  - drscheme shows the stack via arrows on the program text
-    when an error occurs (and debugging is on)
-
-  - added to special menu item: "insert delta" (to mean
-    define) in parallel to the insert lambda menu item.
-
-  - framework's scheme-mode font changed to be in an editor
-    mixin.
-
-  - macos: drscheme doesn't quit when all windows are closed
-    anymore.
-
-------------------------------
-        Version 204
-------------------------------
-
-  - contract -> supports multiple values using this syntax:
-
-   (-> integer? (values integer? integer?))
-
-  - parenthesis highlight color is now configurable
-
-  - integrated the module browser into the main drscheme
-    window. Use the show menu to open a panel on the lhs of
-    the drscheme window containing a DAG representing the
-    modules that are required (only works for programs in
-    modules).
-
-  - integrated Bruce Hauman's rewrite of the match.ss
-    library (ongoing).
-
-  - added arrows to check syntax that show the (syntactic)
-    tail structure of the program.
-
-  - fixed many many problems with Help Desk. Some of the
-    more interesting ones:
-    - manual downloading now works.
-    - bug report form is a mred window now.
-    - doc.txt highlighting is in the right place now
-    - doc.txt search restults now go to the right place
-    - servlets are now modules (with no more free vars)
-    - browser menus work properly
-    - urls outside of our documentation use an external browser
-    - eliminated many (now unecessary) redirections
-    - various responsiveness improvements 
-
-  - help desk as a standalone web server isn't supported
-    anymore.
-
-  - added a status line class to the framework, which is
-    used for check syntax and the module browser. both show
-    status as the check the program and show information on
-    mouse-over. Also, the contour window shows you the line
-    under the mouse in a status line on mouse over.
-
-  - added an extra level of hierarchy to the language
-    dialog, but without the turn-down triangles. this helps
-    organize the language dialog somewhat.
-
-  - the top level function declarations in algol60 are now
-    available in the REPL and in the test suite tool
-
-  - Removed `Windows' menu from windows and unix versions.
-
-  - Windows installer generates Program menu shortcuts for
-    all users
-
-------------------------------
-        Version 203
-------------------------------
-
-GENERAL
--------
-
-- added test suite support for use with the How to Design
-  Programs
-
-- added support for recovering autosave files when DrScheme
-  crashes
-
-- the draw.ss teachpack now provides the function 
-
-     get-key-event : -> Key 
-
-   This function enables programmers who use the draw.ss
-   teachpack to write interactive drawing games.
-   Warning: The function fails intermittently on Mac OS X. We intend 
-   to fix this problem in a future release.
-
-- Help Desk users can choose whether they wish to use a
-  frame-based version.  A toggle switch for this choice (in the
-  form of a link) appears on the Help Desk home page.  It can
-  also be changed in the Help Desk configuration.
-
-- Help Desk users can once again use the PLT internal browser;
-  look for the browser preference in DrScheme's preferences panel
-
-- removed an error in MrEd for Windows that was a frequent source of 
-  instability
-
-------------------------------
-        Version 202
-------------------------------
-
-GENERAL
--------
-
-- improved the comment boxes
-
-- interaction between Help Desk and the external browser
-  should be much better
-
-------------------------------
-        Version 201
-------------------------------
-
-GENERAL
--------
-
-- many misc bug fixes
-
-- improved the create executable interface
-
-- got rid of the "text box" and added in "comment"
-  boxes. commenting out code now uses those comment boxes.
-
-- Help Desk now uses an external browser
-
-FRAMEWORK AND TOOLS
--------------------
-
-- contracts have moved from
-
-   (lib "specs.ss" "framework")
-
-to
-
-  (lib "contracts.ss")
-
-- The create-executable method of
-  drscheme:language:language<%> has changed. It no longer
-  receives the filename for the executable; instead the
-  method must prompt the user. See either
-  `drscheme:language:put-executable-file' or
-  `drscheme:language:create-executable-gui' for two methods
-  of getting a filename from the user. 
-
-
-------------------------------
-        Version 200
-------------------------------
-
-THINGS MISSING (as compared to 103)
-
-- project manager (use `module' instead)
-
-GENERAL
-
-- added profiling support. DrScheme colors your program text
-  based on the time spent in each portion of the code.
-
-- Added support for other natural languages for DrScheme's
-  GUI. French and Spanish are most up to date; German and
-  Danish are also included (but incomplete).
-
-- added a module browser for seeing the entire program and
-  dependencies among modules in a single window.
-
-- added XML boxes (a quasi-quote/unquote feature for XML
-  using embedded editors). See the DrScheme manual for
-  details.
-
-- added a code ``contour'' window that is
-  visible along the rhs of the drscheme
-  window. Use the `show' menu to make 
-  it visible.
-
-- drscheme's new version window is now a 
-  modified version of the language dialog
-
-- the language settings are now frame-specific.
-  If you change the language in one
-  window, it won't affect execute in another window;
-  the most recently set language is what is
-  used for newly created windows.
-
-- added "Open recent" menu item
-
-- added a preference called "Reuse existing DrScheme frame"
-  that, when opening new files, causes DrScheme to replace
-  the existing frame.
-
-- bug reports now go to the new bugs.plt-scheme.org
-  server (and to bugs@plt-scheme.org)
-
-- error messages output improved
-
-- added a mechanism for collapsing and expanding
-  sexpressions to drscheme. right-click to collapse the
-  enclosing sexpression to something like (...) and right
-  click on that to expand it back to the previous text.
-
-- added an emacs-like c-x c-b feature to drscheme.
-  Type <menukey>-j to popup a window of the open frames
-  and choose one without using the mouse by typing.
-
-- added <menukey>-minus and <menukey>-plus as shortcuts to
-  move to the next and previous menus
-
-- The enter key now submits the interaction in the REPL,
-  even if the cursor isn't at the end of a sexpression.
-
-- It is possible to switch the interface language of
-  DrSheme's GUI. The mechanism is in place, in any
-  case. The translations aren't yet, so you probably
-  don't want to try to switch. Also, you will see
-  funny warnings when starting up DrScheme to that
-  effect. Ignore them unless you are working on
-  the translation.
-
-- drscheme constructor and quasiquote printers
-  now shows syntax's structure, and module-path-index
-  structure.
-
-- DrScheme's quasiquote printer now works a little bit
-  better for expressions like '('a 'a).
-  It used to show `((,'quote a) (,'quote a)), but
-  now it shows `('a 'a).
-
-- The portion of space between the definitions and
-  interactions window is now interactively changeable.
-
-- the bug report form now connects to bugs.drscheme.org
-  instead of cs.rice.edu directly, so earthlink users
-  should be able to submit PRs via Help Desk.
-
-- adding splitting of the definitions and interactions
-  canvases, to be able to see two different parts of the
-  buffer simultaneously
-
-- when saving or executing, 
-  if the file has been overwritten in the filesystem, 
-  drscheme prompts you to make sure you want to overwrite
-  or execute the file.
-   
-- added Teach Youself Scheme in Fixnum Days to 
-  DrScheme's documentation.
-
-- implicit sequencing has been eliminated from the advanced language 
-  level in order to give better error messages. Use an explicit `begin' 
-  for sequencing. (this change was made between 102 and
-  103, but we forgot to put it into the release notes)
-
-- teachpacks finally support macro definitions.
- 
-- there is now a little eof icon next to the input box when
-  input is expected. you can click it send an eof. It closes
-  the input port until execute is next clicked.
-
-- many minor improvements to the Help Desk html renderer.
-
-- the filename button (in the top right of the drs frame)
-  now pops up a menu of the directories
-  that contain the saved file's directories. Choose one
-  to open a `get-file' dialog in that directory.
- 
-- (without checking the syntax) the right click context-sensitive menu
-  has an entry to search based either on the selection, or on the text
-  that was clicked on.
-
-- DrScheme now prints exact real numbers as graphical fractions
-  (instead of the (+ 1 1/2) notation). These are also valid as
-  input, but you have to copy and paste to get them into your
-  program.
-
-- Added an "insert fraction" menu item to the edit menu for
-  inserting fractions directly into the program.
-
-FRAMEWORK and TOOLS
--------------------
-
-- added HO function contracts.
-
-- it is now possible to add languages to DrScheme,
-  as tools.
-
-- changed many filenames to match the new -unit.ss, and -sig.ss
-  convention instead of the old r.ss and s.ss convention.
-
-- changed guiutils.ss to gui-utils.ss in framework collection.
-
-- tools are now specified in info.ss files in top-level
-  collections, rather than in a subcollection of the
-  drscheme collection (see the tools manual for details).
-
-- added gui-utils:alphabetic-list-box% to framework
-
-- added `expand-program' to tools interface for
-  tools that process program text.
-  
-- exit:exit and exit:can-exit? now accept optional 
-  booleans that specify if the user should be asked
-  about quitting.
-
-- the splash screen now only allows a single
-  splash screen (per namespace).
-
-Version 103:
-
-General
--------
-
- - typing characters in to the definitions and interactions window
-   should be more responsive now (it was noticeably slow on slower
-   machines)
-
- - files added to projects are now stored as relative files, 
-   by default. (use project menu to change the default)
-
- - project files are saved using a platform-independent syntax for
-   paths now.
-
- - Using file|open and choosing a project file (based on contents) will open
-   the project file. (this only will work with project files saved in this
-   version -- old project files won't be recognized until they are
-   saved once.)
-
- - Opening or a .plt file will install the .plt file, after querying the user.
-
- - added break button to project windows 
-   (does the same thing as the break menu item always did)
-
- - added save button and little "full name" thingy to project
-   frames
-
- - DrScheme permits the use of "." (period) as an identifier in the
-   student language levels.
-
- - implicit sequencing has been eliminated from the advanced language
-   level in order to give better error messages. Use an explicit `begin'
-   for sequencing.
-
-Version 102:
-
-General
--------
-
- - the help desk language level specific documentation has been
-   integrated into drscheme.
-
- - errortrace-like facility is now available in drscheme debug
-   language levels. Click on the bug next to an error message to see
-   a trace of the continuation of the error.
-
- - drscheme-jr now supports teachpacks 
-   (those that don't use GUIs, like htdp/dir.ss)
-
- - launchers can now be run from any directory.
-   They do not need to be saved in a particular place (this has been
-   true for some time, but it is officially true now.).
-
- - the debug full scheme languages now allow loading of files
-   that contain graphics.
-
- - #! is treated like a comment when executing the defintions window,
-   if it is the first two characters in the definitions window.
-
- - rarely used save menu items relegated to sub-menu.
-
- - added a "keymap" menu to the edit menu (shortcut: k)
-   that opens a window where you can see all of the key
-   bindings' names and short cuts, and you can choose one
-   to invoke.
-
- - added a "Kill" menu item that kills all computation and reclaims
-   all resources from the program that drscheme is executing.
-   This is useful for multi-threaded apps that get out of hand.
-
- - meta-control-d, meta-control-u, meta-shift-control-d, meta-shift-control-u
-   keybindings all restored.
-
- - drscheme now has a little button on the bar that lets you hop
-   around between definitions in the program. It is approximate in
-   that it doesn't really know every detail about the lexical
-   structure of scheme, but it should still be quite useful. 
-
- - interactions window now shows the names of the teachpacks that
-   were installed at last execute.
-
- - drscheme now allows multiple teachpacks.
-
- - teachpack names are not in the area with the execute button, instead
-   they are now shown in the language menu.
-
- - repl errors that are in some loaded file have little clickable
-   icons that open the file and show the error's source location in
-   the file.
-   
- - Only the platform-specific dialogs are used in drscheme now, on
-   all platforms. The preference has been removed from the dialog.
-
- - project files are `load'able. That is, if you have the right
-   language settings, you can do 
-   
-           mzscheme -qmvr myproj.proj
-
-   and have the same effect as clicking execute on the project
-   window. For mred, you will need to do something like this:
-
-           mred -qmvr myproj.proj -e "(yield (make-semaphore 0))"
-
-   so that mred doesn't quit automatically.
-
- - Help Desk now has a "feeling lucky" option ala google (menu
-   shortcut: l). It goes directly to the first item that would have
-   been found in a regular search.
-
- - Clicking on an error message link in drscheme now uses the "feeling
-   lucky" style search in help desk.
-
- - clicking on the name in the topleft of the drscheme frame opens a
-   little window with the full path.
-
- - check syntax now shows its syntax errors in a separate window.
-
- - the teaching languages now come with:
-
-     make-posn, posn-x, posn-y, and posn?
-
-   by default (no library required).
-
- - teaching levels print exact numbers whose denominators are evenly
-   disivible by 2 and 5 as decimals.
-
- - teaching levels treat input decimals as exact numbers.
-
- - in the main help-desk window, space does pgdn and backspace does
-   pgup, ala netscape. Also, typing return or enter while the cursor
-   is on a link follows the link.
-
- - added class/d macro. It's syntax is like that for a unit, but it
-   defines a class. Roughly:
-
-   (class/d
-    super-expresion
-    init-args
-    ((public var ...)
-     (override var ...)
-     (inherit var ...)
-     (rename (var var) ...))
- 
-     definitions-and-expressions ...)
-
-    This a new part of macro.ss in the mzlib library
-
-Tools and Framework
--------------------
-
- - drscheme:rep:process-text/zodiac and
-   drscheme:rep:process-text/no-zodiac
-   are now called drscheme:load-handler:process-text/zodiac and
-   drscheme:load-handler:process-text/no-zodiac.
-
- - added a slew of -on-demand methods to frame:standard-menus-mixin
-
- - the framework now imports a definition of the preferences
-   file location. Use this to have a separate preferences file
-   for each different application.
-
- - do not use 'drscheme:settings anymore to get the current
-   language settings from drscheme. Now, use
-
-      drscheme:language:settings-preferences-symbol
-
-   (which is bound to the right symbol) instead.
-
- - setup plt's ``clean'' info.ss flag does not recur
-   into subdirectories anymore.
-
- - the graphics library (sometimes known as sixlib) no longer 
-   accepts any scaling arguments. 
-
- - the framework's preferences system now requires you to
-   set the marshall/unmarshalling functions (if any) before
-   setting the default preference.
-
- - drscheme now supports site-specific default preferences.
-   To use, create a file prefs.ss in the defaults collection
-   that is a copy of the preferences file that you want to 
-   be the defaults. Then, if the user-specific preferences file
-   doesn't exist (or the preferences in it are from an old version),
-   the contents of the prefs.ss file in the defaults collection is
-   used as the preferences.
-
- - drscheme now wraps uses with-handlers so that if a tool 
-   signals an error when it is loaded or invoked, it just
-   puts a window with the error message and continues, instead
-   of keeping drscheme from starting up.
-
- - the .plt installer no longer automatically deletes compiled
-   files when installing a .plt file. 
-
- - setup-plt now uses the 'clean flag in info.ss to determine
-   the files to be deleted when --clean-ing a collection. It
-   defaults to the files in the "compiled" sub-collection of a
-   collection.
-
- - setup-plt no longer automatically runs --clean when installing
-   a .plt file.
-
- - framework:
-   - added canonicalize-keybinding-string
-   - added aug-keymap%, aug-keymap<%>
-   - editor:basic now sets its keymap to an
-     aug-keymap<%> during initialization.
-
- - the framework's info frame mixins no longer require frame:editor<%> 
-   as an input. Also, they are moved lower in the hierarchy of the
-   instantiated mixin classes in the framework. This affects all of the
-   frame:XX% classes.
-
- tools:
-   - ensure-interactions-shown is now ensure-rep-shown
-   - do-many-buffer-evals is now do-many-text-evals
-
- - clever-file-format now symmetrically changes the file's format to
-   'standard. It used to rever the file format to 'text when there
-   were no more images in it. Now, it also changes back to non-'text
-   when images (and other non-string-snips) are added back.
-
- - the framework's gui-utils:get-snips/chars-from-buffer is now
-   gui-utils:get-snips/chars-from-text
-
- - zodiac now supports graphical expressions. If a snip implements
-   zodiac's expand<%> interface, zodiac calls a method of the snip to
-   expand it. 
-   
- - the drscheme:get/extend:extend-* functions no longer haver %s at
-   the end of their names.
-
-
-PRS
----
-
-  1507: thread error freezes repl
-  1506: Help Desk exits gracelessly when interrupted
-  1503: Launcher prints debug info
-  1502: (define's hard to find
-  1499: text mode display auto-wraps
-  1490: alt-tduring execution has different binding
-  1484: cannot paste in search box on macos
-  1480: default launcher name is "Save A Launcher"
-  1478: parity reversed in Dr Jr command line flag
-  1461: Kill menu problems
-  1460: Help Desk has empty preferences
-  1459: search menu items work on empty search text
-  1456: teachpacks don't add
-  1455: project windows never leave `Windows' menu
-  1437:
-  1428: setup -c deletes files for all platforms
-  1424: long (list ...) displays don't display correctly
-  1405: memory usage box should be read only
-  1398: Downloading doc files requires restart
-  1377: replacing by empty string loops
-  1341:
-  1334:
-  1330: killing repl, then check-syntax hangs
-  1306:
-  1297:
-  1235:
-  1171:
-  1144: match docs not setup right in Help Desk
-   737: mred:preferences library too global
-   599: mac: can't double click to open files while mred starts up
-   406: bad error message for sixlib op
-
-  1274, 1280, 1264, 1260, 1239, 1225, 1220, 1268, 1209, 1208,
-  1196, 1180, 1096, 1088, 1043, 771, 752, 846
-
-  1358, 1344, 1341, 1329, 1322, 1242 (docs not yet built), 1235 
-
-
-Version 101:
-
-General
--------
-
- - The teaching libraries are now called teachpacks. See the teachpack
-   release notes for more information.
-
- - DrScheme's languages have changed (again). The languages are now:
-
-   - Beginning Student
-   - Intermediate Student
-   - Advanced Student
-   - Full Scheme, which contains:
-     - Graphical Full Scheme (with and without debugging), and
-     - Textual Full Scheme (with and without debugging)
-
- - Help Desk now supports bug report submissions. Please use it in
-   favor of the web based form. To submit a bug, follow the "Sumbit a
-   Bug" link near the bottom of Help Desk's front page
-
- - On European keyboards, the backslash character
-   may not work properly in DrScheme.  If you 
-   experience this problem, comment out this line:
-
-        (map-meta "\\" "remove-space")
-
-   in PLTHOME/collects/framework/keymap.ss.
-
- - For tools, invoke-library is now called invoke-teachpack.
-
- - Renamed two files in the graphics collection:
-    graphic.ss is now graphics.ss
-    graphics.ss is now graphicss.ss
-
- - DrScheme's print menu now inserts the time, date and filename in the
-   header of the file to be printed.
-
- - comment/uncomment is improved. Now, it blindly adds a semicolon to the 
-   front of each line (and doesn't add extra semicolons on following lines)
-   and aways removes one semicolon (if present) from the front of each line.
-
- - Parenthesis highlighting now turns unmatched parens red
-   in addition to turning matched parenthesis regions grey.
-   Also (now that the caret flashes) if the caret is between two
-   parens, both before and after parens will be highlighted,
-   not just the ones before.
-   
-   Thus, every time the cursor is next to an uncommented
-   paren, the programmer sees some feedback about the paren.
-
-Version 100:
-
-General
--------
-
- - DrScheme's languages have changed. The new languages are:
-
-    - Beginner
-    - Intermediate
-    - Advanced
-    - MzScheme
-    - MrEd
-
-   The first three languages are essentially the same as in version
-   53, except that graphics primitives have been removed. (Instead,
-   domain-specific graphics commands can be loaded as libraries.) The
-   turtles remain in the advanced language.
-
-   The MzScheme and MrEd languages match exactly the languages
-   provided by the MzScheme and MrEd executables.
-
- - A simple algebraic stepper, dubbed The Foot, is now available.  The
-   Foot permits users to construct a source-level evaluation trace for
-   programs written in the Beginner language. It will be expanded in
-   future releases.
-
- - DrScheme's Help Desk provides online help for DrScheme, its
-   languages, and its libraries.
-
- - Graphics functions were removed from the teaching languages
-   (Beginner, Intermediate, and Advanced), except Turtles in
-   Advanced. To use graphics functions, you must select a library (and
-   the teaching libraries are not yet updated).
-
- - The old viewport-based graphics library can be loaded into the MrEd
-   Debug language via (require-library "graphic.ss" "graphics").
-
- - I/O within DrScheme is substantially improved.
-
- - The library and tool interfaces for extended DrScheme have
-   changed.
-
-
-Version 53:
-
-General
--------
-
- - view menu items now have accelerators
-
- - (<= exp) isn't allowed in beginner. (same for <, >, and >=)
-
- - print primitive is now setup correctly to print based on the language level
-
- - paren-matching in semi-colon comments is disabled
-
- - info panel "running" message is now aligned correctly 
- 
- - The check synatax and analyze buttons are now disabled during evaluation
-
- - library directory now starts in "MZLIB_COLLECTS_DIR/../../lib"
-   which is our best approximation to "PLTHOME/lib"
- 
- - elevator library can now select more than one floor at a time
-
-
-Version 52:
-
-General
--------
-
-- The words "running" or "not running" at the bottom of the
-  DrScheme frame indicate whether or not work is happening in the 
-  user's program. 
-
-- a "Windows" menu has been added which keeps track of the currently
-  open drscheme windows.
-
-- the source locations for "load"ed files now match the numbers 
-  in the bottom of the drscheme window.
-
-- the thread that evaluations (including execution) take place on is
-  the same as the eventspace's main thread, unless the evaluation
-  thread is killed. In that case, the eventspace's main thread is
-  re-generated, but the execution thread does not.
-
-- The REPL implementation has been cleaned up.
-
-- the turtles window does not survive across executions anymore
-
-- the Quasi-R4RS language level has been renamed to R4RS+
-
-DrScheme Tools/Libraries
-------------------------
-
-- new methods on rep:edit%: report-exception-error accepts an exception and
-  prints the error message in the console.
-
-- send-scheme is outdated. Use run-in-evaluation-thread instead
-
-- the drscheme:tool^ signature has changed. A new subunit, "basis" has
-  been aded and the process-finish struct is now in that subunit. So,
-  drscheme:language:process-finish? becomes
-  drscheme:basis:process-finish?, etc.
-  
-  The process-finish structure no longer has a boolean indicating sucess. 
-  Instead, an exception is raised.
-
-
-- the settings for the language have been re-aranged
-  - there are two new parameters, exported from the basis
-    subunit of drscheme:export^, current-setting and current-vocabulary
-    - current-vocabulary contains the vocabulary that zodiac uses to
-      perform macro expansion
-    - current-setting is bound to a setting struct, which encapsulates
-      all of the information about the language level
-  - the process-*/zodiac and process-*/no-zodiac proceudres
-    are no longer methods and their arguments have changed
-
-
-Version 51:
-
-General 
--------
-- fixed error message for "eq?" and "cons" at beginner level.
-
-- check syntax does not work with an unitialized repl when:
-  the source contains define-macro. (won't be fixed in the release)
-
-- eval no longer loops forever in mred vocabulary 
-
-- searching keybindings have changed. There are four distinct actions:
-   action1: move keyboard focus to the searching window, opening it if necessary, 
-            or if already there search forward
-   action2: move keyboard focus to the searching window, opening it if necessary, 
-            or if already there search backward.
-   action3: search again, in the same direction
-   action4: move the focus between the main window, searching window and replacment window
-   action5: hide the searching window
-
-The actions are mapped to different keys, based on the platform. 
-
-On unix:
- action1 => control-s, meta-%
- action2 => control-r
- action3 => f3
- action4 => control-i
- action5 => control-g
-
-On the macintosh:
-  action1 => command-f
-  action2 => command-r
-  action3 => command-g
-  action4 => command-o
-  action5 => command-.
-
-On windows:
- action1 => control-f
- action2 => control-r
- action3 => f3, control-g
- action4 => control-i
- action5 => escape
-
-- turned off the file name printouts on splash screen
-
-  evaluate: 
-  (wx:write-resource "mred" "splashMessages" 1 (wx:find-path 'setup-file))
-  to turn them back on.
-
-- fixed a bug that caused error messages to be displayed in message
-  boxes more often than neccessary. (as opposed to printing in the
-  repl)
-
-- parenthesis matching is improved
-
-- The empty list is now called "empty" instead of "null" with the
-  constructor style printer.
-
-- The analyze button puts up a dialog saying "please wait, loading",
-  now.
-
-- the fonts dialog now shows previews of the selected fonts. You
-  still need to restart to see the changes, unfortunately.
-
-DrScheme Tools/Libraries
-------------------------
-
-- tools must now import wx names explicitly, as a new first import.
-
-- the parameters interface has changed. Instead getting and setting
-  the class, the tool programmer must register a function that
-  accepts a class and returns a class. See the manual for more
-  details.
-
-- process/zodiac-finish has been renamed to process-finish
diff --git a/pkgs/drracket-pkgs/drracket/drracket/acks.rkt b/pkgs/drracket-pkgs/drracket/drracket/acks.rkt
deleted file mode 100644
index 2f4cab1ece..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/acks.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-(require acks/acks)
-
-(provide get-general-acks
-         get-translating-acks
-         get-authors)
-
-(define (get-translating-acks)
-  (string-append
-   "Thanks to "
-   "Sung Gyeong Bae, "
-   "Ian Barland, "
-   "Yujeong Cho, "
-   "Jae sung Chung, "
-   "Biep Durieux, "
-   "Tim Hanson, "
-   "Jieung Kim, "
-   "Chihiro Kuraya, "
-   "Philippe Meunier, "
-   "Irina Mintiy, "
-   "Sergey Semerikov, "
-   "Francisco Solsona, "
-   "Mike Sperber, "
-   "Jens Axel Søgaard, "
-   "Reini Urban, "
-   "ChongKai Zhu, "
-   "and "
-   "Paolo Zoppetti "
-   "for their help translating DrRacket's GUI to other languages."))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/arrow.rkt b/pkgs/drracket-pkgs/drracket/drracket/arrow.rkt
deleted file mode 100644
index 46e43236ec..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/arrow.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-
-(require unstable/arrow)
-
-(provide draw-arrow)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/default-code-style.rkt b/pkgs/drracket-pkgs/drracket/drracket/default-code-style.rkt
deleted file mode 100644
index 971c64d4bc..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/default-code-style.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-  (provide color-default-code-styles
-           bw-default-code-styles
-           code-style-color
-           code-style-slant?
-           code-style-bold?
-           code-style-underline?)
-  
-  (define-struct code-style (color slant? bold? underline?))
-  ;; code-style = (make-code-style (union (list number number number) string) bolean boolean)
-  
-  ;; bw-default-code-styles : (listof (list symbol code-style
-  (define bw-default-code-styles
-    (list (list 'lexically-bound-variable (make-code-style "black" #f #f #t))
-          (list 'lexically-bound-syntax (make-code-style "black" #f #f #t))
-          (list 'imported-variable (make-code-style "black" #f #f #t))
-          (list 'imported-syntax (make-code-style "black" #f #f #t))
-          (list 'unbound-variable (make-code-style "black" #t #f #f))
-          (list 'constant (make-code-style '(51 135 39) #f #f #f))))
-  
-  ;; color-default-code-styles : (listof (list symbol code-style))
-  (define color-default-code-styles
-    (list (list 'keyword (make-code-style '(40 25 15) #f #f #f))
-          (list 'unbound-variable (make-code-style "red" #f #f #f))
-          (list 'bound-variable (make-code-style "navy" #f #f #f))
-          (list 'primitive (make-code-style "navy" #f #f #f))
-          (list 'constant (make-code-style '(51 135 39) #f #f #f))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/doc.icns b/pkgs/drracket-pkgs/drracket/drracket/doc.icns
deleted file mode 100644
index 7d726a4974..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/drracket/doc.icns and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/drracket/doc.ico b/pkgs/drracket-pkgs/drracket/drracket/doc.ico
deleted file mode 100644
index a3bd511658..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/drracket/doc.ico and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/drracket/drracket.1 b/pkgs/drracket-pkgs/drracket/drracket/drracket.1
deleted file mode 100644
index b5dba11182..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/drracket.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.\" dummy line
-.TH DRRACKET 1 "May 2010"
-.UC 4
-.SH NAME
-drracket \- the Racket programming environment
-.SH SYNOPSIS
-.B drracket
-[
-.I Xoption ...
-]
-[
-.I file ...
-]
-.SH DESCRIPTION
-DrRacket
-is the Racket
-programming environment.
-.PP
-The
-.B drracket
-program treats non-switch command-line arguments as files to open.
-
-.SH X OPTIONS
-When running in X11, DrRacket accepts the following standard
-.IR Xoption s:
-.B -display
-.IR disp ,
-.B -geometry
-.IR geom ,
-.B -bg
-.IR color ,
-.B -background
-.IR color ,
-.B -fg
-.IR color ,
-.B -foreground
-.IR color ,
-.B -fn
-.IR font ,
-.B -font
-.IR font ,
-.BR -iconic ,
-.B -name
-.IR name ,
-.BR -rv ,
-.BR -reverse ,
-.BR +rv ,
-.B -selectionTimeout
-.IR time ,
-.BR -synchronous ,
-.B -title
-.IR name ,
-.B -xnllanguage
-.IR lang ,
-.B -xrm
-.IR file .
-.PP
-In addition, the option
-.B -singleInstance
-is treated like an X option (it must appear before all other
-options), and it runs DrRacket in single-instance mode.
-In single-instance mode, when an existing instance
-is running with the same host and executable name, all non-option
-arguments are treated as file names and sent to the 
-existing instance.
-
-.SH MORE INFORMATION
-.PP
-
-For further information, run
-.PP
-   raco docs
-.PP
-to open installed documentation in your web browser.
-
-.PP
-Alternately, consult the on-line
-documentation and other information available at
-.PP
-.ce 1
-http://racket-lang.org/
-
-.SH AUTHOR
-.I DrRacket
-was implemented by PLT.
-.SH SEE ALSO
-.BR raco(1),
-.BR racket(1),
-.BR gracket(1)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/drracket.creator b/pkgs/drracket-pkgs/drracket/drracket/drracket.creator
deleted file mode 100644
index 8e31ad43ae..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/drracket.creator
+++ /dev/null
@@ -1,2 +0,0 @@
-DrSc
-(This code is registered with Apple.)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/drracket.desktop b/pkgs/drracket-pkgs/drracket/drracket/drracket.desktop
deleted file mode 100644
index 048f59621a..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/drracket.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=DrRacket
-GenericName=IDE for Racket
-Comment=DrRacket is an interactive, integrated, graphical programming environment for the Racket programming languages.
-Terminal=false
-Type=Application
-Categories=Development;Education;
-Exec=drracket -singleInstance %F
diff --git a/pkgs/drracket-pkgs/drracket/drracket/drracket.extreg b/pkgs/drracket-pkgs/drracket/drracket/drracket.extreg
deleted file mode 100644
index 7029437066..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/drracket.extreg
+++ /dev/null
@@ -1,5 +0,0 @@
-(("Racket Document"
-  "Racket.Document"
-  ("rkt" "rktl" "rktd" "ss" "scm" "scrbl")
-  "doc.ico"
-  "\"%1\""))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/drracket.filetypes b/pkgs/drracket-pkgs/drracket/drracket/drracket.filetypes
deleted file mode 100644
index 10bd9130b5..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/drracket.filetypes
+++ /dev/null
@@ -1,30 +0,0 @@
-((("CFBundleTypeName"
-   "Racket Source")
-  ("CFBundleTypeIconFile"
-   "doc")
-  ("CFBundleTypeRole"
-   "Editor")
-  ("CFBundleTypeOSTypes"
-   (array "TEXT" "WXME"))
-  ("CFBundleTypeExtensions"
-   (array "rkt" "rktd" "rktl" "scrbl" "scm" "ss")))
- (("CFBundleTypeName"
-   "Package")
-  ("CFBundleTypeIconFile"
-   "pltdoc")
-  ("CFBundleTypeRole"
-   "Viewer")
-  ("CFBundleTypeOSTypes"
-   (array "PLT_" "WXME"))
-  ("CFBundleTypeExtensions"
-   (array "plt")))
- (("CFBundleTypeName"
-   "Racket Doc Source")
-  ("CFBundleTypeIconFile"
-   "doc")
-  ("CFBundleTypeRole"
-   "Viewer")
-  ("CFBundleTypeOSTypes"
-   (array "TEXT" "WXME"))
-  ("CFBundleTypeExtensions"
-   (array "scrbl"))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/drracket.png b/pkgs/drracket-pkgs/drracket/drracket/drracket.png
deleted file mode 100644
index c91a432e98..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/drracket/drracket.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/drracket/drracket.rkt b/pkgs/drracket-pkgs/drracket/drracket/drracket.rkt
deleted file mode 100644
index 2adf3e99b9..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/drracket.rkt
+++ /dev/null
@@ -1,166 +0,0 @@
-#lang racket/base
-(require racket/gui/base "private/key.rkt")
-
-(module test racket/base)
-
-(define debugging? (getenv "PLTDRDEBUG"))
-(define profiling? (getenv "PLTDRPROFILE"))
-
-(define first-parallel? (getenv "PLTDRPAR"))
-
-(define repl (getenv "PLTDRREPL"))
-
-(define install-cm? (and (not debugging?)
-                         (getenv "PLTDRCM")))
-
-(define cm-trace? (or (equal? (getenv "PLTDRCM") "trace")
-                      (equal? (getenv "PLTDRDEBUG") "trace")
-                      (equal? (getenv "PLTDRPAR") "trace")))
-
-;; the flush is only here to ensure that the output is 
-;; appears when running in cygwin under windows.
-(define (flprintf fmt . args)
-  (apply printf fmt args)
-  (flush-output))
-
-(define (run-trace-thread)
-  (let ([evt (make-log-receiver (current-logger) 'info)])
-    (void
-     (thread
-      (λ ()
-        (let loop ()
-          (define vec (sync evt))
-          (define str (vector-ref vec 1))
-          (when (regexp-match #rx"^cm: *compil(ing|ed)" str)
-            (display str)
-            (newline))
-          (loop)))))))
-
-(cond
-  [debugging?
-   (flprintf "PLTDRDEBUG: loading CM to load/create errortrace zos\n")
-   (let-values ([(zo-compile
-                  make-compilation-manager-load/use-compiled-handler)
-                 (parameterize ([current-namespace (make-base-empty-namespace)]
-                                [use-compiled-file-paths '()])
-                   (values
-                    (dynamic-require 'errortrace/zo-compile 'zo-compile)
-                    (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)))])
-     (flprintf "PLTDRDEBUG: installing CM to load/create errortrace zos\n")
-     (current-compile zo-compile)
-     (use-compiled-file-paths (list (build-path "compiled" "errortrace")))
-     (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
-     (error-display-handler (dynamic-require 'errortrace/errortrace-lib
-                                             'errortrace-error-display-handler))
-     (when cm-trace?
-       (flprintf "PLTDRDEBUG: enabling CM tracing\n")
-       (run-trace-thread)))]
-  [install-cm?
-   (flprintf "PLTDRCM: loading compilation manager\n")
-   (let ([make-compilation-manager-load/use-compiled-handler
-          (parameterize ([current-namespace (make-base-empty-namespace)])
-            (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler))])
-     (flprintf "PLTDRCM: installing compilation manager\n")
-     (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))
-     (when cm-trace?
-       (flprintf "PLTDRCM: enabling CM tracing\n")
-       (run-trace-thread)))]
-  [first-parallel?
-   (flprintf "PLTDRPAR: loading compilation manager\n")
-   (define tools? (not (getenv "PLTNOTOOLS")))
-   (define (files-in-coll coll)
-     (define dir (collection-path coll))
-     (map (λ (x) (build-path dir x)) 
-          (filter
-           (λ (x) (regexp-match #rx"rkt$" (path->string x)))
-           (directory-list dir))))
-   (define (randomize lst)
-     (define vec (make-vector (length lst) #f))
-     (let loop ([i 0]
-                [lst lst])
-       (cond
-         [(= i (vector-length vec)) (void)]
-         [else
-          (define index (random (- (vector-length vec) i)))
-          (define ele (list-ref lst index))
-          (vector-set! vec i ele)
-          (loop (+ i 1) (remq ele lst))]))
-     (vector->list vec))
-   
-   (define (tool-files id)
-     (apply 
-      append
-      (map
-       (λ (x)
-         (define proc (get-info/full x))
-         (if proc
-             (map (λ (dirs)
-                    (apply build-path 
-                           x
-                           (if (list? dirs)
-                               dirs
-                               (list dirs))))
-                  (proc id (λ () '())))
-             '()))
-       (find-relevant-directories (list id)))))
-   
-   (define make-compilation-manager-load/use-compiled-handler
-     (parameterize ([current-namespace (make-base-empty-namespace)])
-       (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)))
-   (when cm-trace?
-     (flprintf "PLTDRPAR: enabling CM tracing\n")
-     (run-trace-thread))
-   (flprintf "PLTDRPAR: loading setup/parallel-build\n")
-   (define-values (parallel-compile-files get-info/full find-relevant-directories)
-     (parameterize ([current-load/use-compiled (make-compilation-manager-load/use-compiled-handler)])
-       (values (dynamic-require 'setup/parallel-build 'parallel-compile-files)
-               (and tools? (dynamic-require 'setup/getinfo 'get-info/full))
-               (and tools? (dynamic-require 'setup/getinfo 'find-relevant-directories)))))
-   (if tools?
-       (flprintf "PLTDRPAR: parallel compile of framework, drracket, and tools\n")
-       (flprintf "PLTDRPAR: parallel compile of framework and drracket\n"))
-   
-   (parallel-compile-files (randomize (append (files-in-coll "drracket") 
-                                              (files-in-coll "framework")
-                                              (if tools?
-                                                  (append (tool-files 'drracket-tools)
-                                                          (tool-files 'tools))
-                                                  '())))
-                           #:handler
-                           (λ (handler-type path msg out err)
-                             (case handler-type
-                               [(done) 
-                                (when cm-trace?
-                                  (printf "PLTDRPAR: made ~a\n" path))]
-                               [else
-                                (printf "~a\n" msg)
-                                (printf "stdout from compiling ~a:\n~a\n" path out)
-                                (flush-output)
-                                (eprintf "stderr from compiling ~a:\n~a\n" path err)])))
-   (flprintf "PLTDRPAR: installing compilation manager\n")
-   (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))])
-
-(when profiling?
-  (flprintf "PLTDRPROFILE: installing profiler\n")
-  ;; NOTE that this might not always work.
-  ;; it creates a new custodian and installs it, but the
-  ;; original eventspace was created on the original custodian
-  ;; and this code does not create a new eventspace. 
-  (let ([orig-cust (current-custodian)]
-        [orig-eventspace (current-eventspace)]
-        [new-cust (make-custodian)])
-    (current-custodian new-cust)
-    ((dynamic-require 'drracket/private/profile-drs 'start-profile) orig-cust)))
-
-(dynamic-require 'drracket/private/drracket-normal #f)
-
-(when repl
-  (printf "Welcome to DrRacket, v~a\n" (version))
-  (namespace-require 'racket)
-  (namespace-require 'drracket/tool-lib)
-  (unless (equal? repl "-q")
-    (define init-file (find-system-path 'init-file))
-    (when (file-exists? init-file)
-      (load init-file)))
-  (void (thread read-eval-print-loop)))
-
diff --git a/pkgs/drracket-pkgs/drracket/drracket/drracket.startmenu b/pkgs/drracket-pkgs/drracket/drracket/drracket.startmenu
deleted file mode 100644
index bcd452df43..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/drracket.startmenu
+++ /dev/null
@@ -1,6 +0,0 @@
-10
-Existence of this file puts DrRacket in the Windows Start menu.
-The fact that it starts with a number requests that the
-installer offers to run DrRacket as its final action, and the
-value of the number is a predence for that request relative
-to other requests.
diff --git a/pkgs/drracket-pkgs/drracket/drracket/drracket.utiexports b/pkgs/drracket-pkgs/drracket/drracket/drracket.utiexports
deleted file mode 100644
index fb64a67946..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/drracket.utiexports
+++ /dev/null
@@ -1,30 +0,0 @@
-((("UTTypeConformsTo"
-   (array
-    "public.text"
-    "public.plain-text"))
-  ("UTTypeDescription"
-   "Racket program source")
-  ("UTTypeIdentifier"
-   "org.racket-lang.source")
-  ("UTTypeTagSpecification"
-   (dict
-    (assoc-pair "com.apple.ostype"
-                "TEXT")
-    (assoc-pair "public.filename-extension"
-                (array "rkt"
-                       "ss"
-                       "scm")))))
- (("UTTypeConformsTo"
-    (array
-     "public.text"
-     "public.plain-text"))
-   ("UTTypeDescription"
-    "Racket documentation source")
-   ("UTTypeIdentifier"
-    "org.racket-lang.scribble")
-   ("UTTypeTagSpecification"
-    (dict
-     (assoc-pair "com.apple.ostype"
-                 "TEXT")
-     (assoc-pair "public.filename-extension"
-                 (array "scrbl"))))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/drracket.wmclass b/pkgs/drracket-pkgs/drracket/drracket/drracket.wmclass
deleted file mode 100644
index 68981e54b4..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/drracket.wmclass
+++ /dev/null
@@ -1 +0,0 @@
-DrRacket
diff --git a/pkgs/drracket-pkgs/drracket/drracket/info.rkt b/pkgs/drracket-pkgs/drracket/drracket/info.rkt
deleted file mode 100644
index 54bdff5c60..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/info.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang info
-
-;(define tools      '("sprof.rkt"))
-;(define tool-names '("Sampling Profiler"))
-
-(define drracket-tools      '("syncheck.rkt"))
-(define drracket-tool-names '("Check Syntax"))
-
-(define gracket-launcher-names     '("DrRacket"))
-(define gracket-launcher-libraries '("drracket.rkt"))
-
-(define release-note-files (list (list "DrRacket" "HISTORY.txt")))
-
-(define copy-man-pages '("drracket.1"))
-
-(define binary-keep-files '("private/launcher-mred-bootstrap.rkt"
-                            "private/launcher-mz-bootstrap.rkt"))
-
-;; color-blind friendly palette from Paul Tol:
-;; http://www.sron.nl/~pault/
-;; using his Scheme for Marking Text colors
-(define light-blue #(#x90 #xb3 #xff))
-(define light-cyan #(#xcc #xee #xff))
-(define light-green #(#xcc #xdd #xaa))
-(define light-tan #(#xee #xee #xbb))
-(define light-pink #(#xff #xcc #xcc))
-(define light-grey #(#xdd #xdd #xdd))
-(define dark-blue #(#x22 #x22 #x77))
-(define dark-plum #(#x77 #x22 #x77))
-(define dark-green #(#x22 #x77 #x22))
-(define dark-olive #(#x66 #x66 #x33))
-(define dark-red #(#x88 #x11 #x11))
-(define sea-green #(#x00 #xb2 #xb2))
-(define burnt-orange #(181 102 51))
-
-(define tol-bow-error-color dark-red)
-(define tol-bow-constants dark-green)
-(define tol-black-on-white-colors
-  `((framework:paren-match-color ,light-tan)
-    (framework:syntax-color:scheme:comment ,dark-plum)
-    (framework:syntax-color:scheme:constant ,tol-bow-constants)
-    (framework:syntax-color:scheme:error ,tol-bow-error-color)
-    (framework:syntax-color:scheme:hash-colon-keyword ,tol-bow-constants)
-    (framework:syntax-color:scheme:keyword ,dark-blue)
-    (framework:syntax-color:scheme:string ,tol-bow-constants)
-    (framework:syntax-color:scheme:text ,tol-bow-constants)
-    (framework:syntax-color:scheme:other ,dark-blue)
-    (framework:syntax-color:scheme:parenthesis ,sea-green)
-    (framework:syntax-color:scheme:symbol ,dark-blue)
-    (drracket:read-eval-print-loop:error-color ,tol-bow-error-color)
-    (drracket:read-eval-print-loop:out-color ,tol-bow-constants)
-    (drracket:read-eval-print-loop:value-color ,dark-blue) 
-    (drracket:check-syntax:free-variable ,tol-bow-error-color)
-    (drracket:check-syntax:set!d ,tol-bow-error-color)
-    (drracket:check-syntax:unused-require ,tol-bow-error-color)))
-
-(define tol-wob-constants light-blue)
-(define tol-wob-error light-pink)
-(define tol-white-on-black-colors
-  `((framework:paren-match-color ,dark-blue)
-    (framework:syntax-color:scheme:comment ,light-green)
-    (framework:syntax-color:scheme:constant ,tol-wob-constants)
-    (framework:syntax-color:scheme:error ,tol-wob-error)
-    (framework:syntax-color:scheme:hash-colon-keyword ,tol-wob-constants)
-    (framework:syntax-color:scheme:keyword ,light-blue)
-    (framework:syntax-color:scheme:string ,tol-wob-constants)
-    (framework:syntax-color:scheme:text ,tol-wob-constants)
-    (framework:syntax-color:scheme:other ,light-blue)
-    (framework:syntax-color:scheme:parenthesis ,dark-plum)
-    (framework:syntax-color:scheme:symbol ,light-blue)
-    (drracket:read-eval-print-loop:error-color ,tol-wob-error)
-    (drracket:read-eval-print-loop:out-color ,dark-green)
-    (drracket:read-eval-print-loop:value-color ,light-blue) 
-    (drracket:check-syntax:free-variable ,tol-wob-error)
-    (drracket:check-syntax:set!d ,tol-wob-error)
-    (drracket:check-syntax:unused-require ,tol-wob-error)))
-
-(define framework:color-schemes 
-  (list 
-   (hash 
-    'name 'modern-color-scheme
-    'colors
-    '((framework:syntax-color:scheme:string #(211 72 255))
-      (framework:syntax-color:scheme:constant #(211 72 255))
-      (framework:syntax-color:scheme:comment #(194 158 31))
-      (framework:syntax-color:scheme:parenthesis #(0 150 255))))
-   (hash
-    'name "Tol's Color-blind-safe"
-    'colors tol-black-on-white-colors)
-   (hash
-    'name "Tol's White on Black"
-    'white-on-black-base? #t
-    'colors tol-white-on-black-colors)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/installer.rkt b/pkgs/drracket-pkgs/drracket/drracket/installer.rkt
deleted file mode 100644
index 25e8192bc8..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/installer.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require launcher)
-(provide installer)
-
-(define (installer plthome)
-  (do-installation)
-  (set! do-installation void))
-
-(define (do-installation)
-  (for-each install-variation (available-mred-variants)))
-
-(define (install-variation variant)
-  (parameterize ([current-launcher-variant variant])
-    (make-mred-launcher
-     (list "-ZmvqL" "drracket.rkt" "drracket")
-     (mred-program-launcher-path "DrScheme")
-     (cons
-      `(exe-name . "DrRacket")
-      (build-aux-from-path (build-path (collection-path "drracket") "drracket"))))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/main.rkt b/pkgs/drracket-pkgs/drracket/drracket/main.rkt
deleted file mode 100644
index b86a29bd96..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require "drracket.rkt")
-
-(module test racket/base)
\ No newline at end of file
diff --git a/pkgs/drracket-pkgs/drracket/drracket/pltdoc.icns b/pkgs/drracket-pkgs/drracket/drracket/pltdoc.icns
deleted file mode 100644
index c90a814c94..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/drracket/pltdoc.icns and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/ada.png b/pkgs/drracket-pkgs/drracket/drracket/private/ada.png
deleted file mode 100644
index d6c27628f8..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/drracket/private/ada.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/ada.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/ada.rkt
deleted file mode 100644
index 2455f7f4a8..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/ada.rkt
+++ /dev/null
@@ -1,171 +0,0 @@
-#lang racket/base
-(require pict
-         racket/gui/base 
-         racket/class
-         racket/list
-         racket/runtime-path
-         (for-syntax racket/base))
-(provide ada-size draw-splash-ada)
-
-(module+ test (require rackunit))
-
-(define-runtime-path ada.png (if (getenv "PLTDRBREAKIMAGES")
-                                 "ada-broken.png"
-                                 "ada.png"))
-
-#|
-code for Bernoulli numbers taken from Wikipedia: 
-  http://en.wikipedia.org/wiki/Bernoulli_number#Algorithmic_description
-|#
-
-(define-syntax-rule
-  (for-from-by-to-do var start step end body ...)
-  (for ([var (in-range start (+ end step) step)])
-    body ...))
-
-(define-syntax-rule 
-  (in-range/including-end start end step)
-  (in-range start (+ end step) step))
-
-(define (bernoulli-number n)
-  (define A (make-vector (+ n 1)))
-  (for ([m (in-range/including-end 0 n 1)])
-   (vector-set! A m (/ 1 (+ m 1)))
-    (for ([j (in-range/including-end m 1 -1)])
-      (vector-set! A
-                   (- j 1) 
-                   (* j (- (vector-ref A (- j 1))
-                           (vector-ref A j))))))
-  (vector-ref A 0))
-
-(module+ test
-  (check-equal? 
-   (build-list 9 bernoulli-number)
-   '(1 1/2 1/6 0 -1/30 0 1/42 0 -1/30)))
-
-#|
-
-Code for making a pict out of the
-bernoulli sequence
-
-|#
-
-(define (make-bernoulli-sequence-pict n)
-  (apply hc-append
-         (add-between
-          (for/list ([x (in-range n)])
-            (number->pict (bernoulli-number x)))
-          (tt ",  "))))
-
-(define (tt str)
-  (text str 'roman 24))
-
-(define (number->pict num)
-  (cond
-    [(integer? num) (tt (integer->string num))]
-    [else
-     (define n (tt (integer->string (abs (numerator num)))))
-     (define d (tt (integer->string (denominator num))))
-     (define line (frame (blank (max (pict-width d) (pict-width n)) 0)))
-     (define abs-frac (vc-append 2 n line d))
-     (cond
-       [(negative? num)
-        (hc-append 4 (tt "-") abs-frac)]
-       [else
-        abs-frac])]))
-       
-(define (integer->string n)
-  (define s (format "~a" n))
-  (cond
-    [(<= (string-length s) 3) s]
-    [else
-     (remove-leading-comma
-      (reverse-string
-       (regexp-replace* #rx"[0-9][0-9][0-9]" 
-                        (reverse-string s)
-                        "\\0,")))]))
-
-(define (reverse-string s) (list->string (reverse (string->list s))))
-(define (remove-leading-comma s) (regexp-replace #rx"^," s ""))
-
-(module+ test
-  (check-equal? (integer->string 0) "0")
-  (check-equal? (integer->string 1) "1")
-  (check-equal? (integer->string 100) "100")
-  (check-equal? (integer->string 1000) "1,000")
-  (check-equal? (integer->string 1234) "1,234")
-  (check-equal? (integer->string 1000000) "1,000,000")
-  (check-equal? (integer->string 100000) "100,000"))
-
-#|
-
-Code for sliding a wide pict by
-
-|#
-
-;; 0 <= n <= 1
-(define (sliding-sequence n width pict)
-  (define bw (pict-width pict))
-  (define starting-x (* (- bw width) n))
-  (inset/clip pict
-              (- starting-x)
-              0 
-              (+ (- bw) starting-x width)
-              0))
-
-#|
-
-Put things together into a function
-that actually does drawing in a window.
-
-|#
-
-(define ada-bmp (and (file-exists? ada.png)
-                     (read-bitmap ada.png)))
-(define ada-w (if ada-bmp (send ada-bmp get-width) 300))
-(define ada-h (if ada-bmp (send ada-bmp get-height) 300))
-(define ada-size (+ 32 (max ada-w ada-h)))
-
-(define (draw-ada dc point-in-time cw ch [sequence-on-top? #f])
-  (define p (sliding-sequence 
-             point-in-time
-             cw
-             bernoulli-sequence-pict))
-  (draw-pict p dc 0 0)
-  (when ada-bmp
-    (send dc draw-bitmap 
-          ada-bmp
-          (- (/ cw 2) (/ ada-w 2))
-          (- (/ ch 2) (/ ada-h 2)))))
-
-(define bernoulli-sequence-pict (make-bernoulli-sequence-pict 50))
-(define (draw-splash-ada dc current max width height)
-  (send dc clear)
-  (draw-ada dc (/ current max) width height) #t)
-
-(module+ main
-  
-  (define bmp (read-bitmap ada.png))
-  (define point-in-time 0)
-  (define δ #e0.0002)
-  
-  (define (draw c dc)
-    (define-values (cw ch) (send c get-client-size))
-    (draw-ada dc point-in-time cw ch))
-  
-  (void (new timer%
-             [notify-callback
-              (λ () 
-                (set! point-in-time (+ point-in-time δ))
-                (send c refresh))]
-             [interval 50]))
-  
-  
-  
-  (define f (new frame% [label ""]))
-  (define c (new canvas% 
-                 [parent f] 
-                 [paint-callback draw]
-                 [min-width ada-size]
-                 [min-height ada-size]))
-  (send f show #t))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/app.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/app.rkt
deleted file mode 100644
index 590d678755..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/app.rkt
+++ /dev/null
@@ -1,421 +0,0 @@
-#lang racket/unit
-
-(require racket/class
-         string-constants
-         racket/gui/base
-         framework
-         browser/external
-         setup/getinfo
-         drracket/private/drsig
-         "../acks.rkt")
-
-(import [prefix drracket:unit: drracket:unit^]
-        [prefix drracket:frame: drracket:frame^]
-        [prefix drracket:language-configuration: drracket:language-configuration/internal^]
-        [prefix help-desk: drracket:help-desk^]
-        [prefix drracket:tools: drracket:tools^])
-(export drracket:app^)
-
-(define about-frame%
-  (class (drracket:frame:basics-mixin (frame:standard-menus-mixin frame:basic%))
-    (init-field main-text)
-    (inherit close)
-    (define/override (on-subwindow-char receiver event)
-      (cond
-        [(equal? (send event get-key-code) 'escape)
-         (close)]
-        [else
-         (super on-subwindow-char receiver event)]))
-    (define/private (edit-menu:do const)
-      (send main-text do-edit-operation const))
-    [define/override file-menu:create-revert? (λ () #f)]
-    [define/override file-menu:create-save? (λ () #f)]
-    [define/override file-menu:create-save-as? (λ () #f)]
-    [define/override file-menu:between-close-and-quit (λ (x) (void))]
-    [define/override edit-menu:between-redo-and-cut (λ (x) (void))]
-    [define/override edit-menu:between-select-all-and-find (λ (x) (void))]
-    [define/override edit-menu:copy-callback (λ (menu evt) (edit-menu:do 'copy))]
-    [define/override edit-menu:select-all-callback (λ (menu evt) (edit-menu:do 'select-all))]
-    [define/override edit-menu:create-find? (λ () #f)]
-    (super-new
-     (label (string-constant about-drscheme-frame-title)))))
-
-
-(define (same-widths items)
-  (let ([max-width (apply max (map (λ (x) (send x get-width)) items))])
-    (for-each (λ (x) (send x min-width max-width)) items)))
-
-(define (same-heights items)
-  (let ([max-height (apply max (map (λ (x) (send x get-height)) items))])
-    (for-each (λ (x) (send x min-height max-height)) items)))
-
-(define wrap-edit% 
-  (class text:hide-caret/selection%
-    (inherit begin-edit-sequence end-edit-sequence
-             get-max-width find-snip position-location)
-    (define/augment (on-set-size-constraint)
-      (begin-edit-sequence)
-      (let ([snip (find-snip 1 'after-or-none)])
-        (when (is-a? snip editor-snip%)
-          (send (send snip get-editor) begin-edit-sequence)))
-      (inner (void) on-set-size-constraint))
-    (define/augment (after-set-size-constraint)
-      (inner (void) after-set-size-constraint)
-      (let ([width (get-max-width)]
-            [snip (find-snip 1 'after-or-none)])
-        (when (is-a? snip editor-snip%)
-          (let ([b (box 0)])
-            (position-location 1 b #f #f #t)
-            (let ([new-width (- width 4 (unbox b))])
-              (when (> new-width 0)
-                (send snip resize new-width
-                      17) ; smallest random number
-                (send snip set-max-height 'none))))
-          (send (send snip get-editor) end-edit-sequence)))
-      (end-edit-sequence))
-    (super-new)))
-
-(define (get-plt-bitmap)
-  (read-bitmap
-   (build-path (collection-file-path
-                (if (< (get-display-depth) 8)
-                    "pltbw.gif"
-                    "plt-logo-red-shiny.png")
-                "icons"))
-   #:try-@2x? #t))
-
-
-
-
-
-
-;                                                              
-;                                                              
-;                                                              
-;          ;                                     ;             
-;          ;                                     ;             
-;          ;                       ;             ;             
-;    ;;;   ; ;;;    ;;;;   ;    ; ;;;;       ;;; ;  ; ;;  ;;;; 
-;   ;   ;  ;;   ;  ;    ;  ;    ;  ;        ;   ;;  ;;   ;     
-;       ;  ;    ;  ;    ;  ;    ;  ;        ;    ;  ;    ;     
-;    ;;;;  ;    ;  ;    ;  ;    ;  ;        ;    ;  ;     ;;;  
-;   ;   ;  ;    ;  ;    ;  ;    ;  ;        ;    ;  ;        ; 
-;   ;   ;  ;;   ;  ;    ;  ;   ;;  ;        ;   ;;  ;        ; 
-;    ;;;;; ; ;;;    ;;;;    ;;; ;   ;;       ;;; ;  ;    ;;;;  
-;                                                              
-;                                                              
-;                                                              
-
-
-(define (about-drscheme)
-  (let* ([e (make-object wrap-edit%)]
-         [main-text (make-object wrap-edit%)]
-         [plt-bitmap (get-plt-bitmap)]
-         [plt-icon (if (send plt-bitmap ok?)
-                       (make-object image-snip% plt-bitmap)
-                       (let ([i (make-object string-snip%)]
-                             [label "[lambda]"])
-                         (send i insert label (string-length label) 0)
-                         i))]
-         [editor-snip (make-object editor-snip% e #f)]
-         [f (make-object about-frame% main-text)]
-         [main-panel (send f get-area-container)]
-         [editor-canvas (make-object editor-canvas% main-panel)]
-         [button-panel (make-object horizontal-panel% main-panel)]
-         [top (make-object style-delta% 'change-alignment 'top)]
-         [d-usual (make-object style-delta% 'change-family 'decorative)]
-         [d-dr (make-object style-delta%)]
-         [d-http (make-object style-delta%)]
-         
-         [insert/clickback
-          (λ (str clickback)
-            (send e change-style d-http)
-            (let* ([before (send e get-start-position)]
-                   [_ (send e insert str)]
-                   [after (send e get-start-position)])
-              (send e set-clickback before after 
-                    (λ (a b c) (clickback))
-                    d-http))
-            (send e change-style d-usual))]
-         
-         [insert-url/external-browser
-          (λ (str url)
-            (insert/clickback str (λ () (send-url url))))])
-    
-    (send* d-http 
-      (copy d-usual)
-      (set-delta-foreground "BLUE")
-      (set-delta 'change-underline #t))
-    (send* d-usual 
-      (set-delta-foreground "BLACK")
-      (set-delta 'change-underline #f))
-    
-    (send* d-dr (copy d-usual) (set-delta 'change-bold))
-    (send d-usual set-weight-on 'normal)
-    (send* editor-canvas
-      (set-editor main-text)
-      (stretchable-width #t)
-      (stretchable-height #t))
-    
-    (if (send plt-bitmap ok?)
-        (send* editor-canvas
-          (min-width (floor (+ (* 5/2 (send plt-bitmap get-width)) 50)))
-          (min-height (+ (send plt-bitmap get-height) 50)))
-        (send* editor-canvas
-          (min-width 500)
-          (min-height 400)))
-    
-    (send* e 
-      (change-style d-dr)
-      (insert (format (string-constant welcome-to-drscheme-version/language) 
-                      (version:version)
-                      (this-language)))
-      (change-style d-usual))
-    
-    (send e insert " by ")
-    
-    (insert-url/external-browser "PLT" "http://racket-lang.org/")
-    
-    (send* e
-      (insert ".\n\n")
-      (insert (get-authors))
-      (insert "\n\nFor licensing information see "))
-    
-    (insert/clickback "our software license"
-                      (λ () (help-desk:goto-plt-license)))
-    
-    (send* e
-      (insert ".\n\nBased on:\n  ")
-      (insert (banner)))
-    
-    (let ([tools (sort (drracket:tools:get-successful-tools)
-                       (lambda (a b)
-                         (string<? (path->string (drracket:tools:successful-tool-spec a))
-                                   (path->string (drracket:tools:successful-tool-spec b)))))])
-      (unless (null? tools)
-        (let loop ([actions1 '()] [actions2 '()] [tools tools])
-          (if (pair? tools)
-              (let* ([successful-tool (car tools)]
-                     [name (drracket:tools:successful-tool-name successful-tool)]
-                     [spec (drracket:tools:successful-tool-spec successful-tool)]
-                     [bm   (drracket:tools:successful-tool-bitmap successful-tool)]
-                     [url  (drracket:tools:successful-tool-url successful-tool)])
-                (define (action)
-                  (send e insert "  ")
-                  (when bm
-                    (send* e
-                      (insert (make-object image-snip% bm))
-                      (insert #\space)))
-                  (let ([name (or name (format "~a" spec))])
-                    (cond [url  (insert-url/external-browser name url)]
-                          [else (send e insert name)]))
-                  (send e insert #\newline))
-                (if name
-                    (loop (cons action actions1) actions2 (cdr tools))
-                    (loop actions1 (cons action actions2) (cdr tools))))
-              (begin (send e insert "\nInstalled tools:\n")
-                     (for-each (λ (act) (act)) (reverse actions1))
-                     ;; (send e insert "Installed anonymous tools:\n")
-                     (for-each (λ (act) (act)) (reverse actions2)))))))
-    
-    (send e insert "\n")
-    (send e insert (get-translating-acks))
-    
-    (let* ([docs-button (new button% 
-                             [label (string-constant help-desk)]
-                             [parent button-panel]
-                             [callback (λ (x y) (help-desk:help-desk))])])
-      (send docs-button focus))
-    (send button-panel stretchable-height #f)
-    (send button-panel set-alignment 'center 'center)
-    
-    (send* e
-      (auto-wrap #t)
-      (set-autowrap-bitmap #f))
-    (send* main-text 
-      (set-autowrap-bitmap #f)
-      (auto-wrap #t)
-      (insert plt-icon)
-      (insert editor-snip)
-      (change-style top 0 2)
-      (hide-caret #t))
-    
-    (send f reflow-container)
-    
-    (send* main-text
-      (set-position 1)
-      (scroll-to-position 0)
-      (lock #t))
-    
-    (send* e
-      (set-position 0)
-      (scroll-to-position 0)
-      (lock #t))
-    
-    (when (eq? (system-type) 'macosx)
-      ;; otherwise, the focus is the tour button, as above
-      (send editor-canvas focus))
-    
-    (send f show #t)
-    f))
-
-
-
-;                                       
-;                                       
-;                                       
-;                ;   ;   ;              
-;                    ;                  
-;           ;        ;       ;          
-;   ;    ; ;;;;  ;   ;   ;  ;;;; ;     ;
-;   ;    ;  ;    ;   ;   ;   ;    ;   ; 
-;   ;    ;  ;    ;   ;   ;   ;    ;   ; 
-;   ;    ;  ;    ;   ;   ;   ;     ;  ; 
-;   ;    ;  ;    ;   ;   ;   ;     ; ;  
-;   ;   ;;  ;    ;   ;   ;   ;      ;;  
-;    ;;; ;   ;;  ;   ;   ;    ;;    ;   
-;                                   ;   
-;                                   ;   
-;                                  ;    
-
-
-;; switch-language-to : (is-a?/c top-level-window<%>) symbol -> void
-;; doesn't return if the language changes
-(define (switch-language-to parent other-language)
-  (define-values (other-are-you-sure other-cancel other-accept-and-quit)
-    (let loop ([languages (all-languages)]
-               [are-you-sures (string-constants are-you-sure-you-want-to-switch-languages)]
-               [cancels (string-constants cancel)]
-               [accept-and-quits (if (eq? (system-type) 'windows)
-                                     (string-constants accept-and-exit)
-                                     (string-constants accept-and-quit))])
-      (cond
-        [(null? languages) (error 'app.rkt ".1")]
-        [(equal? other-language (car languages))
-         (values (car are-you-sures)
-                 (car cancels)
-                 (car accept-and-quits))]
-        [else (loop (cdr languages)
-                    (cdr are-you-sures)
-                    (cdr cancels)
-                    (cdr accept-and-quits))])))
-  (define dialog (make-object dialog% (string-constant drscheme) parent 400))
-  (define (make-section are-you-sure cancel-label quit-label)
-    (define text (make-object text:hide-caret/selection%))
-    (define ec (instantiate editor-canvas% ()
-                 (parent dialog)
-                 (editor text)
-                 (style '(no-hscroll))))
-    (define bp (instantiate horizontal-panel% ()
-                 (parent dialog)
-                 (alignment '(right center))))
-    (define-values (quit cancel)
-      (gui-utils:ok/cancel-buttons
-       bp
-       (λ (x y)
-         (set! cancelled? #f)
-         (send dialog show #f))
-       (λ (x y)
-         (send dialog show #f))
-       quit-label
-       cancel-label))
-    (send ec set-line-count 3)
-    (send text auto-wrap #t)
-    (send text set-autowrap-bitmap #f)
-    (send text insert are-you-sure)
-    (send text set-position 0 0))
-  (define cancelled? #t)
-  
-  (make-section other-are-you-sure
-                other-cancel
-                other-accept-and-quit)
-  
-  (make-section (string-constant are-you-sure-you-want-to-switch-languages)
-                (string-constant cancel)
-                (if (eq? (system-type) 'windows)
-                    (string-constant accept-and-exit)
-                    (string-constant accept-and-quit)))
-  
-  (send dialog show #t)
-  
-  (unless cancelled?
-    (let ([set-language? #t])
-      (exit:insert-on-callback 
-       (λ ()
-         (when set-language?
-           (set-language-pref other-language))))
-      (exit:exit)
-      (set! set-language? #f))))
-
-(define (add-important-urls-to-help-menu help-menu additional)
-  (let* ([important-urls
-          (instantiate menu% ()
-            (parent help-menu)
-            (label (string-constant web-materials)))]
-         [tool-urls-menu
-          (instantiate menu% ()
-            (parent help-menu)
-            (label (string-constant tool-web-sites)))]
-         [add
-          (λ (name url . parent)
-            (instantiate menu-item% ()
-              (label name)
-              (parent (if (null? parent) important-urls (car parent)))
-              (callback
-               (λ (x y)
-                 (send-url url)))))])
-    (add (string-constant plt-homepage) "http://racket-lang.org/")
-    (add (string-constant pbd-homepage) "http://programbydesign.org/")
-    (add (string-constant how-to-design-programs) "http://htdp.org/")
-
-    (for-each (λ (tool)
-                (cond [(drracket:tools:successful-tool-url tool) 
-                       =>
-                       (λ (url)
-                         (add (drracket:tools:successful-tool-name tool) url tool-urls-menu))]))
-              (drracket:tools:get-successful-tools))
-    
-    (let loop ([additional additional])
-      (cond
-        [(pair? additional)
-         (let ([x (car additional)])
-           (when (and (pair? x)
-                      (pair? (cdr x))
-                      (null? (cddr x))
-                      (string? (car x))
-                      (string? (cadr x)))
-             (add (car x) (cadr x))))
-         (loop (cdr additional))]
-        [else (void)]))))
-
-(define (add-language-items-to-help-menu help-menu)
-  (let ([added-any? #f])
-    (for-each (λ (native-lang-string language)
-                (unless (equal? (this-language) language)
-                  (unless added-any?
-                    (make-object separator-menu-item% help-menu)
-                    (set! added-any? #t))
-                  (instantiate menu-item% ()
-                    (label native-lang-string)
-                    (parent help-menu)
-                    (callback (λ (x1 x2) (switch-language-to #f language))))))
-              good-interact-strings 
-              languages-with-good-labels)))
-
-(define-values (languages-with-good-labels good-interact-strings)
-  (let loop ([langs (all-languages)]
-             [strs (string-constants interact-with-drscheme-in-language)]
-             [good-langs '()]
-             [good-strs '()])
-    (cond
-      [(null? strs) (values (reverse good-langs)
-                            (reverse good-strs))]
-      [else (let ([str (car strs)]
-                  [lang (car langs)])
-              (if (andmap (λ (char) (send normal-control-font screen-glyph-exists? char #t))
-                          (string->list str))
-                  (loop (cdr langs) 
-                        (cdr strs)
-                        (cons lang good-langs)
-                        (cons str good-strs))
-                  (loop (cdr langs) (cdr strs) good-langs good-strs)))])))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/auto-language.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/auto-language.rkt
deleted file mode 100644
index 9697e012ae..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/auto-language.rkt
+++ /dev/null
@@ -1,85 +0,0 @@
-#lang typed/racket
-
-(require typed/framework/framework 
-	 typed/mred/mred
-         racket/class)
-
-(provide pick-new-language looks-like-module?)
-
-(define-type (Language:Language% Settings)
-  (Class [get-reader-module (-> Sexp)]
-         [get-metadata-lines (-> Number)]
-         [metadata->settings (String -> Settings)]))
-
-(define-type (Language:Object Settings)
-  (Instance (Class)))
-
-(: pick-new-language (All (S)
-                          ((Instance Text%) 
-                           (Listof (Instance (Language:Language% S)))
-                           (U #f (Language:Object S)) (U #f S)
-                           -> 
-                           (values (U #f (Language:Object S))
-                                   (U #f S)))))
-(define (pick-new-language text all-languages module-language module-language-settings)
-  (with-handlers ([exn:fail:read? (λ (x) (values #f #f))])
-    (let: ([found-language? : (U #f (Language:Object S)) #f]
-           [settings : (U #f S) #f])
-      
-      (for-each
-       (λ: ([lang : (Instance (Language:Language% S))])
-         (let ([lang-spec (send lang get-reader-module)])
-           (when lang-spec
-             (let* ([lines (send lang get-metadata-lines)]
-                    [str (send text get-text
-                               0
-                               (send text paragraph-end-position (- lines 1)))]
-                    [sp (open-input-string str)])
-               (when (regexp-match #rx"#reader" sp)
-                 (let ([spec-in-file (read sp)])
-                   (when (equal? lang-spec spec-in-file)
-                     (set! found-language? lang)
-                     (set! settings (send lang metadata->settings str))
-                     (send text while-unlocked
-                           (λ () 
-                             (send text delete 0 (send text paragraph-start-position lines)))))))))))
-       all-languages)
-      
-      ;; check to see if it looks like the module language.
-      (unless found-language?
-        (when module-language
-          (when (looks-like-module? text)
-            (set! found-language? module-language)
-            (set! settings module-language-settings))))
-      
-      (values found-language?
-              settings))))
-
-(: looks-like-module? ((Instance Text%) -> Boolean))
-(define (looks-like-module? text)
-  (or (looks-like-new-module-style? text)
-      (looks-like-old-module-style? text)
-      (with-handlers ((exn:fail? (λ (x) #f)))
-        (begin
-         (read-language (open-input-text-editor text 0 'end (λ (x) x) text #f) 
-                        (λ () #f))
-         #t))))
-
-(: looks-like-old-module-style? ((Instance Text%) -> Boolean))
-(define (looks-like-old-module-style? text)
-  (with-handlers ((exn:fail:read? (λ (x) #f)))
-    (let* ([tp (open-input-text-editor text 0 'end (lambda (s) s) text #t)]
-           [r1 (parameterize ([read-accept-reader #f]) (read tp))]
-           [r2 (parameterize ([read-accept-reader #f]) (read tp))])
-      (and (eof-object? r2)
-           (pair? r1)
-           (eq? (car r1) 'module)))))
-
-(: looks-like-new-module-style? ((Instance Text%) -> Boolean))
-(define (looks-like-new-module-style? text)
-  (let* ([tp (open-input-text-editor text 0 'end (lambda (s) s) text #t)]
-         [l1 (with-handlers ([exn:fail? (lambda (exn) eof)])
-               ;; If tp contains a snip, read-line fails.
-               (read-line tp))])
-    (and (string? l1)
-         (regexp-match? #rx"#lang .*$" l1))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/bindings-browser.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/bindings-browser.rkt
deleted file mode 100644
index 855ae8b940..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/bindings-browser.rkt
+++ /dev/null
@@ -1,302 +0,0 @@
-#lang racket/base
-#|
-
-CODE COPIED (with permission ...) from syntax-browser.rkt
-desperately seeking abstraction.
-
-Marshalling (and hence the 'read' method of the snipclass omitted for fast prototyping
-                 
-|#
-
-
-  (require racket/pretty
-           racket/class
-           racket/gui/base
-           racket/contract)
-  
-  (provide render-bindings/snip)
-
-  (define (render-bindings/snip stx) (make-object bindings-snip% stx))
-  
-  (define bindings-snipclass%
-    (class snip-class%
-      
-      ; not overriding read
-      (super-instantiate ())))
-  
-  (define bindings-snipclass (make-object bindings-snipclass%))
-  (send bindings-snipclass set-version 1)
-  (send bindings-snipclass set-classname "drscheme:bindings-snipclass%")
-  (send (get-the-snip-class-list) add bindings-snipclass)
-  
-  (define bindings-snip%
-    (class editor-snip%
-      (init-field bindings)
-      
-      (unless ((flat-contract-predicate (listof (list/c syntax? any/c))) bindings)
-        (error 'bindings-snip% "expected bindings association list, given ~v" bindings))
-      
-      (define/public (get-bindings) bindings)
-      
-      (define/override (copy) (make-object bindings-snip% bindings))
-      (define/override (write stream)
-        (error 'bindings-snip "'write' not implemented for bindings-snip"))
-      
-      (define output-text (make-object text%))
-      (define output-port (make-text-port output-text))
-      
-      (define/private (make-modern text)
-        (send text change-style
-              (make-object style-delta% 'change-family 'modern)
-              0
-              (send text last-position)))
-      
-      (begin (parameterize ([current-output-port output-port]
-                            [pretty-print-columns 30])
-               (for-each
-                (λ (binding-pair)
-                  (let* ([stx (car binding-pair)]
-                         [value (cadr binding-pair)])
-                    ; this totally destroys the 'output-port' abstraction.  I don't know
-                    ; how to enrich the notion of an output-port to get 'bold'ing to 
-                    ; work otherwise...
-                    (let* ([before (send output-text last-position)])
-                      (pretty-print (syntax->datum stx))
-                      (let* ([post-newline (send output-text last-position)])
-                        (send output-text delete post-newline) ; delete the trailing \n. yuck!
-                        (send output-text insert " ")
-                        (send output-text change-style 
-                              (make-object style-delta% 'change-bold)
-                              before (- post-newline 1)))
-                      (pretty-print value))))
-                bindings))
-             (send output-text delete (send output-text last-position))  ; delete final trailing \n
-             (make-modern output-text))
-    
-      (define outer-t (make-object text%))
-      
-      (super-new
-       (editor outer-t)
-       (with-border? #f)
-       (left-margin 3)
-       (top-margin 0)
-       (right-margin 0)
-       (bottom-margin 0)
-       (left-inset 1)
-       (top-inset 0)
-       (right-inset 0)
-       (bottom-inset 0))
-      
-      (define inner-t (make-object text%))
-      (define inner-es (instantiate editor-snip% ()
-                         (editor inner-t)
-                         (with-border? #f)
-                         (left-margin 0)
-                         (top-margin 0)
-                         (right-margin 0)
-                         (bottom-margin 0)
-                         (left-inset 0)
-                         (top-inset 0)
-                         (right-inset 0)
-                         (bottom-inset 0)))
-      
-      (define details-shown? #t)
-      
-      (inherit show-border set-tight-text-fit)
-      (define/private (hide-details)
-        (when details-shown?
-          (send outer-t lock #f)
-          (show-border #f)
-          (set-tight-text-fit #t)
-          (send outer-t release-snip inner-es)
-          (send outer-t delete (send outer-t last-position))
-          (send outer-t lock #t)
-          (set! details-shown? #f)))
-      
-      (define/private (show-details)
-        (unless details-shown?
-          (send outer-t lock #f)
-          (show-border #t)
-          (set-tight-text-fit #f)
-          (send outer-t insert #\newline
-                (send outer-t last-position)
-                (send outer-t last-position))
-          (send outer-t insert inner-es
-                (send outer-t last-position)
-                (send outer-t last-position))
-          (send outer-t lock #t)
-          (set! details-shown? #t)))
-      
-      (send outer-t insert (make-object turn-snip% 
-                             (λ () (hide-details))
-                             (λ () (show-details))))
-      (send outer-t insert (format "bindings\n"))
-      (send outer-t insert inner-es)
-      (make-modern outer-t)
-      
-      (send inner-t insert (instantiate editor-snip% ()
-                             (editor output-text)
-                             (with-border? #f)
-                             (left-margin 0)
-                             (top-margin 0)
-                             (right-margin 0)
-                             (bottom-margin 0)
-                             (left-inset 0)
-                             (top-inset 0)
-                             (right-inset 0)
-                             (bottom-inset 0)))
-      (send inner-t change-style (make-object style-delta% 'change-alignment 'top) 0 2)
-
-      (send output-text hide-caret #t)
-      (send inner-t hide-caret #t)
-      (send outer-t hide-caret #t)
-      (send output-text lock #t)
-      (send inner-t lock #t)
-      (send outer-t lock #t)
-      
-      (hide-details)
-      
-      (inherit set-snipclass)
-      (set-snipclass bindings-snipclass)))
-  
-  (define black-style-delta (make-object style-delta% 'change-normal-color))
-  (define green-style-delta (make-object style-delta%))
-  (void (send green-style-delta set-delta-foreground "forest green"))
-
-  (define turn-snip%
-    (class snip%
-      
-      (init-field on-up on-down)
-      
-      ;; state : (union 'up 'down 'up-click 'down-click))
-      (init-field [state 'up])
-      
-      (define/override (copy)
-        (instantiate turn-snip% ()
-          (on-up on-up)
-          (on-down on-down)
-          (state state)))
-      
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (let ([bitmap (case state
-                        [(up) up-bitmap]
-                        [(down) down-bitmap]
-                        [(up-click) up-click-bitmap]
-                        [(down-click) down-click-bitmap])])
-          (cond
-            [(send bitmap ok?)
-             (send dc draw-bitmap bitmap x y)]
-            [(send dc draw-rectangle x y 10 10)
-             (send dc drawline x y 10 10)])))
-             
-
-      (define/override (get-extent dc x y w h descent space lspace rspace)
-        (set-box/f! descent 0)
-        (set-box/f! space 0)
-        (set-box/f! lspace 0)
-        (set-box/f! rspace 0)
-        (set-box/f! w arrow-snip-width)
-        (set-box/f! h arrow-snip-height))
-      
-      (define/override (on-event dc x y editorx editory evt)
-        (let ([snip-evt-x (- (send evt get-x) x)]
-              [snip-evt-y (- (send evt get-y) y)])
-          (cond
-            [(send evt button-down? 'left)
-             (set-state (case state
-                          [(up) 'up-click]
-                          [(down) 'down-click]
-                          [else 'down-click]))]
-            [(and (send evt button-up? 'left)
-                  (<= 0 snip-evt-x arrow-snip-width)
-                  (<= 0 snip-evt-y arrow-snip-height))
-             (set-state (case state
-                          [(up up-click) 
-                           (on-down)
-                           'down]
-                          [(down down-click)
-                           (on-up)
-                           'up]
-                          [else 'down]))]
-            [(send evt button-up? 'left)
-             (set-state (case state
-                          [(up up-click) 'up]
-                          [(down down-click) 'down]
-                          [else 'up]))]
-            [(and (send evt get-left-down)
-                  (send evt dragging?)
-                  (<= 0 snip-evt-x arrow-snip-width)
-                  (<= 0 snip-evt-y arrow-snip-height))
-             (set-state (case state
-                          [(up up-click) 'up-click]
-                          [(down down-click) 'down-click]
-                          [else 'up-click]))]
-            [(and (send evt get-left-down)
-                  (send evt dragging?))
-             (set-state (case state
-                          [(up up-click) 'up]
-                          [(down down-click) 'down]
-                          [else 'up-click]))]
-            [else
-             (super on-event dc x y editorx editory evt)])))
-
-      (inherit get-admin)
-      (define/private (set-state new-state)
-        (unless (eq? state new-state)
-          (set! state new-state)
-          (let ([admin (get-admin)])
-            (when admin
-              (send admin needs-update this 0 0 arrow-snip-width arrow-snip-height)))))
-      
-      (define/override (adjust-cursor dc x y editorx editory event) arrow-snip-cursor)
-      
-      (super-instantiate ())
-      
-      (inherit get-flags set-flags)
-      (set-flags (cons 'handles-events (get-flags)))))
-  
-  (define (set-box/f! b v) (when (box? b) (set-box! b v)))
-  
-  (define down-bitmap (make-object bitmap% (collection-file-path "turn-down.png" "icons")))
-  (define up-bitmap (make-object bitmap% (collection-file-path "turn-up.png" "icons")))
-  (define down-click-bitmap (make-object bitmap% (collection-file-path "turn-down-click.png" "icons")))
-  (define up-click-bitmap (make-object bitmap% (collection-file-path "turn-up-click.png" "icons")))
-  (define arrow-snip-height
-    (max 10
-         (send up-bitmap get-height)
-         (send down-bitmap get-height)
-         (send up-click-bitmap get-height)
-         (send down-click-bitmap get-height)))
-  (define arrow-snip-width
-    (max 10
-         (send up-bitmap get-width)
-         (send down-bitmap get-width)
-         (send up-click-bitmap get-width)
-         (send down-click-bitmap get-width)))
-  (define arrow-snip-cursor (make-object cursor% 'arrow))
-  
-  ;; make-text-port : text -> port
-  ;; builds a port from a text object.  
-  (define (make-text-port text)
-    (make-output-port #f
-                      always-evt
-                      (λ (s start end flush?) 
-                        (send text insert (substring s start end)
-                              (send text last-position)
-                              (send text last-position))
-                        (- end start))
-                      void))
-
-; one trivial test case:
-;
-;(require bindings-browser)
-;
-;(let ([es (render-bindings/snip `((,#`a 3) (,#`b 4) (,#`c (1 3 4))))])
-;  (define f (make-object frame% "frame" #f 850 500))
-;  (define mb (make-object menu-bar% f))
-;  (define edit-menu (make-object menu% "Edit" mb))
-;  (define t (make-object text%))
-;  (define ec (make-object editor-canvas% f t))
-;  (append-editor-operation-menu-items edit-menu)
-;  (send t insert es)
-;  (send f show #t))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/bitmap-message.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/bitmap-message.rkt
deleted file mode 100644
index c6489ac30a..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/bitmap-message.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base racket/class)
-(provide bitmap-message%)
-
-(define bitmap-message%
-  (class canvas%
-    (inherit min-width min-height get-dc refresh)
-    (define bm #f)
-    (define/override (on-paint)
-      (when bm
-        (let ([dc (get-dc)])
-          (send dc draw-bitmap bm 0 0))))
-    (define/public (set-bm b)
-      (set! bm b)
-      (min-width (if bm (send bm get-width) 0))
-      (min-height (if bm (send bm get-height) 0))
-      (refresh))
-    (super-new (stretchable-width #f)
-               (stretchable-height #f)
-               (style '(no-focus)))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/colored-errors.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/colored-errors.rkt
deleted file mode 100644
index 4d8a33da70..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/colored-errors.rkt
+++ /dev/null
@@ -1,340 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         racket/list
-         racket/string
-         racket/contract
-         racket/match
-         parser-tools/lex
-         (prefix-in : parser-tools/lex-sre)
-         unstable/contract)
-
-(define-syntax (test stx) #'(begin)) ;; TODO: convert my test into DrRacket's test framework
-
-;; An error message has many fragments. The fragments will be concatenated
-;; before being presented to the user. Some fragment are simply string.
-(struct msg-fragment:str (str) #:transparent)
-
-;; Some fragment are arbitrary values. They will be turned into snips if the error message display
-;; context supports them. Otherwise, they will be turned into a string.
-(struct msg-fragment:v (v) #:transparent)
-
-;; colored-msg-fragment represent a fragment of text in the error message that refers (in English) 
-;; to a particular piece of the code. DrRacket will highlight both the fragment text of the error message
-;; and the piece with the same color.
-;; 
-;; locs      : which srcloc to highlight, one or many
-;; frags     : which fragments of text to highlight. (nested coloring in the error test is not allowed)
-;; important : when true, the srcloc corresponding to this fragment will be highlighted even in contexts 
-;;             that do not support highlighting of the error message text.
-;; color     : if false, DrRacket will assign a color to each fragment, from left to right order of the 
-;;             messag text. Otherwise it should be a symbolic color (TBA).
-(struct colored-msg-fragment (locs frags important color) #:transparent)
-
-;; msg-fragment? : Returns true if v is a fragment.
-(define (msg-fragment? v) (or (msg-fragment:str v) (msg-fragment:v v) (colored-msg-fragment v)))
-
-;; srcloc-syntax/c : Contract for specifications of code piece to highlight.
-(define srcloc-syntax/c (rename-contract (or/c srcloc? syntax? (listof (or/c srcloc? syntax?))) 'srcloc-syntax/c))
-
-;; additional-highligts can specify their color
-(define additional-highlights/c (listof (or/c srcloc-syntax/c (list/c srcloc-syntax/c symbol?))))
-(define color/c (or/c #f symbol?))
-
-;; colored-error-message : Exceptions that support highlighting contain a colored-error-message
-;; in addition to a string. The string message is automatically generated from 
-;; the colored-error-message for backward compatibility.
-;; A colored-error-message has a list of fragments (some of which will be highlighted) and a list 
-;; of additional source locations. These additional location will also be highlighted in the code,
-;; even though they do not correspond to any section of the text of the error message.
-(struct colored-error-message (fragments additional-highlights) #:transparent)
-(provide/contract [struct colored-error-message
-                          ([fragments (listof msg-fragment?)]
-                           [additional-highlights additional-highlights/c])]
-                  [struct msg-fragment:str ([str string?])]
-                  [struct msg-fragment:v ([v any/c])]
-                  [struct colored-msg-fragment ([locs srcloc-syntax/c]
-                                                [frags (listof (or/c msg-fragment:str? msg-fragment:v?))]
-                                                [important boolean?]
-                                                [color color/c])])
-
-;; prop:exn:colored-message : The property of exceptions that contain colored-message information.
-;;     The property's value is a function that when given an exception, returns the colored-error-message.
-(provide prop:exn:colored-message exn:colored-message? exn:colored-message-accessor)
-(define-values (prop:exn:colored-message
-                exn:colored-message?
-                exn:colored-message-accessor)
-  (make-struct-type-property
-   'colored-message
-   (lambda (v str-info)
-     (contract (exn? . -> . colored-error-message?) v
-               'struct-definition 'color-error-accessor))))
-
-;; get-error-message/color : When given an exception, if that exception contains coloring information,
-;;    returns it, otherwise, returns a colored-error-message that capture the information provided by
-;;    by field message and the srclocs property (if any) of the exception.
-(provide/contract [get-error-message/color (exn? . -> . colored-error-message?)])
-(define (get-error-message/color exn)
-  (cond [(exn:colored-message? exn) ((exn:colored-message-accessor exn) exn)]
-        [(exn:srclocs? exn)
-         (colored-error-message (list (msg-fragment:str (exn-message exn)))
-                                ((exn:srclocs-accessor exn) exn))]
-        [else
-         (colored-error-message (list (msg-fragment:str (exn-message exn))) empty)]))
-
-(provide/contract [get-error-colored-srclocs (exn? . -> . (listof (list/c srcloc-syntax/c color/c)))])
-(define (get-error-colored-srclocs exn)
-  (get-message-colored-srclocs (get-error-message/color exn)))
-
-(provide/contract [get-message-colored-srclocs (colored-error-message? . -> . (listof (list/c srcloc-syntax/c color/c)))])
-(define (get-message-colored-srclocs msg)
-  (define (promote srcloc) (if (list? srcloc) srcloc (list srcloc #f)))
-  (map promote
-       (append
-        (append*
-         (filter-map (λ (x) (match x [(colored-msg-fragment locs _ _ c)
-                                      (map (λ (x) (list x c)) (if (list? locs) locs (list locs)))] [_ #f]))
-                     (colored-error-message-fragments msg)))
-        (colored-error-message-additional-highlights msg))))
-
-(define lex (lexer
-             [(eof) empty]
-             ["~|" (cons 'TildaPipe (lex input-port))]
-             ["|~" (cons 'PipeTilda (lex input-port))]
-             ["~v" (cons 'TildaV (lex input-port))]
-             [(:or any-char "~~")
-              (begin
-                (define rst (lex input-port))
-                (match rst
-                  [(list (? string? str) tail ...)
-                   (cons (string-append lexeme str) tail)]
-                  [_ (cons lexeme rst)]))]))
-
-(test 'lex (check-equal? (lex (open-input-string "~~foo ~| ~~| bar ~v|~ foo ~ "))
-                         '("~~foo " TildaPipe " ~~| bar " TildaV PipeTilda " foo ~ ")))
-
-(define-syntax (match? stx)
-  (syntax-case stx ()
-    [(_ v pattern) (syntax/loc stx
-                     (match v [pattern #t] [_ #f]))]))
-
-(define (check-tildas-are-paired parsed)
-  (let loop ([tildas (filter (λ (x) (match? x (or 'TildaPipe 'PipeTilda))) parsed)] [i 1])
-    (match tildas
-      [(list) (void)]
-      [(list 'PipeTilda rst ...)
-       (error 'colored-format "The ~ath tilda-pipe is an unexpected close" i)]
-      [(list one) (error 'colored-format "There is an dangling ~a" one)]
-      [(list 'TildaPipe 'TildaPipe rst ...)
-       (error 'colored-format "The ~ath tilda-pipe is an unexpected open" (add1 i))]
-      [(list 'TildaPipe 'PipeTilda rst ...)
-       (loop rst (+ 2 i))])))
-
-(test 'check-tildas-are-paired
-      (define (go str) (check-tildas-are-paired (lex (open-input-string str))))
-      (check-exn-msg exn:fail? "dangling" (lambda () (go "~| |~ ~|")))
-      (check-exn-msg exn:fail? #rx"3.*close" (lambda () (go "~| |~ |~ |~")))
-      (check-exn-msg exn:fail? #rx"6.*open" (lambda () (go "~| |~ ~| |~ ~| ~|")))
-      (check-exn-msg exn:fail? #rx"2.*open" (lambda () (go "~| ~| |~ |~")))
-      (check-exn-msg exn:fail? #rx"3.*close" (lambda () (go "~| ~~| |~ |~"))))
-
-(define (count-tildas fmt)
-  (- (length (regexp-match* #rx"~" fmt))
-     (* 2 (length (regexp-match* #rx"~~" fmt)))))
-
-(define (check-arg who args n)
-  (when (< (length args) n)
-    (error 'colored-error-message "Missing arguments for ~a" who)))
-
-(define (colored-format:v args)
-  (check-arg "~v" args 1)
-  (values (msg-fragment:v (first args))
-          (rest args)))
-
-(define (colored-format:str fmt args)
-  (define n (count-tildas fmt))
-  (check-arg fmt args n)
-  (values (msg-fragment:str (apply format fmt (take args n)))
-          (drop args n)))
-
-(define (colored-format:str-or-v fmt-or-v args)
-  (if (eq? fmt-or-v 'TildaV)
-      (colored-format:v args)
-      (colored-format:str fmt-or-v args)))
-
-(define (colored-format:TildaPipe fragments args)
-  (check-arg "~|" args 1)
-  (define-values (sub rest-args)
-    (let loop ([fragments fragments] [args (rest args)])
-      (if (empty? fragments)
-          (values empty args)
-          (let ()
-            (define-values (f rest-args) (colored-format:str-or-v (first fragments) args))
-            (define-values (rest-fs rest-rest-args) (loop (rest fragments) rest-args))
-            (values (cons f rest-fs) rest-rest-args)))))
-  (define the-arg (first args))
-  (match the-arg
-    [(list loc imp col other ..1)
-     (error 'colored-format "Extraneous arguments to TildaPipe: ~a" other)]
-    [_ (void)])
-  
-  (contract (or/c srcloc-syntax/c
-                  (list/c srcloc-syntax/c boolean?)
-                  (list/c srcloc-syntax/c symbol?)
-                  (list/c srcloc-syntax/c boolean? symbol?)
-                  (list/c srcloc-syntax/c symbol? boolean?))
-            the-arg 'caller 'TildaPipe)
-  
-  (define is-important (and (list? the-arg) (findf (λ (x) (eq? x #t)) the-arg)))
-  (define color (and (list? the-arg) (findf symbol? the-arg)))
-  (values (colored-msg-fragment (if (list? the-arg) (first the-arg) the-arg) sub is-important color) rest-args))
-
-(define colored-format/c (([fmt string?]) (#:additional-highlights [additional-highlights additional-highlights/c]) #:rest [_ any/c]
-                                                   . ->i . [_ colored-error-message?]))
-(provide/contract [colored-format colored-format/c])
-
-;; colored-format : Takes a format string and a number of arguments, and produces a string where each
-;;                  format marker has been replaced by their corresponding argument. This function support 
-;;                  all the formatting option of fprintf, plus:
-;;
-;;    ~| ...  |~  : The text between ~| and |~ will be highlighted with the same color as the corresponding piece
-;;                  of code. Arbitrary text and formatting options can occur between ~| and |~, but not another ~| |~
-;;                  (there is no nesting of ~| |~).
-;;                  The argument is either a srcloc-syntax/c, or a list contain a srcloc-syntax/c in first position and
-;;                  then one or two of (in either order): a boolean indicating whether this highlight is important
-;;                                                        a symbol, indication the highlight color
-;;                  The argument to ~| |~ should be given first, before the arguments for the formatting options appearing
-;;                  between ~| and |~.
-;;
-;;     ~v         : Inserts an arbitrary value in this position. If the value can be converted to a snip, it will be,
-;;                  otherwise ~v is equivalent to ~a. 
-;;
-(define (colored-format fmt #:additional-highlights [additional-highlights empty] . args)
-  (define parsed (lex (open-input-string fmt)))
-
-  (check-tildas-are-paired parsed)
-  
-  (define fragments
-    (let loop ([parsed parsed] [args args])
-      (match parsed
-        [(list) (unless (empty? args)
-                  (error 'colored-format "There are ~a unused arguments" (length args)))
-                empty]
-        [(list 'TildaPipe tail ...)
-         (define-values (left right) (splitf-at tail (λ (x) (match? x 'PipeTilda))))
-         (define-values (result rest-args) (colored-format:TildaPipe left args))
-         (cons result (loop (rest right) rest-args))]
-        [(list f tail ...)
-         (define-values (result rest-args) (colored-format:str-or-v f args))
-         (cons result (loop tail rest-args))])))
-  
-  (colored-error-message fragments additional-highlights))
-
-(test 'colored-format
-      (check-equal? (colored-format "  ") (colored-error-message (list (msg-fragment:str "  ")) empty))
-      (check-equal? (colored-format "--~a--" 5)
-                    (colored-error-message (list (msg-fragment:str "--5--")) empty))
-      (check-match (colored-format "~|--~a--|~ foo" #'here 5)
-                   (colored-error-message (list (colored-msg-fragment (app syntax-e 'here) (list (msg-fragment:str "--5--")) #f #f) (msg-fragment:str " foo")) empty))
-      
-      (check-match (colored-format "~|--~a--~v--~a--|~ foo ~v bar ~||~ ~a" #'first 1 "inserted" 2 'inserted-too (list #'second 'red) 3 #:additional-highlights '(a b))
-                   (colored-error-message (list (colored-msg-fragment
-                                                 (app syntax-e 'first)
-                                                 (list (msg-fragment:str "--1--")
-                                                       (msg-fragment:v "inserted")
-                                                       (msg-fragment:str "--2--")) #f #f)
-                                                (msg-fragment:str " foo ")
-                                                (msg-fragment:v 'inserted-too)
-                                                (msg-fragment:str " bar ")
-                                                (colored-msg-fragment (app syntax-e 'second) empty #f 'red)
-                                                (msg-fragment:str " 3"))
-                                          '(a b)))
-      (check-match (colored-format " ~~ ~a ~a ~a ~a ~||~~~|" 1 2 3 4 #'here)
-                   (colored-error-message (list (msg-fragment:str " ~ 1 2 3 4 ")
-                                                (colored-msg-fragment (app syntax-e 'here) empty #f #f)
-                                                (msg-fragment:str "~|")) empty))
-      (check-exn-msg exn:fail? #rx"2.*unused" (lambda () (colored-format " ~a " 1 2 3))))
-
-(define (uncolor-message msg)
-  (let loop ([f (colored-error-message-fragments msg)])
-    (match f
-      [(msg-fragment:str str) str]
-      [(msg-fragment:v v) (format "~a" v)]
-      [(colored-msg-fragment locs frags imp col) (loop frags)]
-      [(? list?) (string-append* (map loop f))])))
-
-(define (important-srclocs msg)
-  (append
-   (flatten
-    (filter-map (λ (x) (match x [(colored-msg-fragment locs _ #t _) locs] [_ #f]))
-                (colored-error-message-fragments msg)))
-   (colored-error-message-additional-highlights msg)))
-
-(struct exn:fail:colored:syntax exn:fail:syntax (colored-message)
-        #:transparent
-        #:property prop:exn:colored-message (lambda (v)
-                                              (define vec (struct->vector v))
-                                              (vector-ref vec (sub1 (vector-length vec)))))
-
-;; raise-colored-syntax-error : Formats the message string with colored-format, then raises a exn:fail:colored:syntax error. 
-;;                              The message and srcloc fields of the exception are populated from the information 
-;;                              in the fmt. additional-highlights specifies srclocs that should be highlighted, in addition
-;;                              to the highlights used to explicate the correspondance between the text and the piece of codes.
-(provide/contract [raise-colored-syntax-error colored-format/c])
-(define (raise-colored-syntax-error fmt #:additional-highlights [additional-highlights empty] . args)
-  (define formatted (apply colored-format fmt #:additional-highlights additional-highlights args))
-  (raise (exn:fail:colored:syntax (uncolor-message formatted)
-                                  (current-continuation-marks)
-                                  (important-srclocs formatted)
-                                  formatted)))
-
-(define (catch-the-error thunk) (with-handlers ([void (lambda (e) e)]) (thunk)))
-
-(test 'raise-colored-syntax-error
-      (check-exn-msg exn:fail:colored:syntax? #rx"only one part"
-                     (lambda () (raise-colored-syntax-error "~|cond|~: expected a clause with a question and answer, but found a clause with only ~|one part|~"
-                                                            #'stx #'question)))
-      
-      (check-match (get-error-message/color (catch-the-error (lambda () (raise-colored-syntax-error "~|cond|~: expected a clause with a question and answer, but found a clause with only ~|one part|~"
-                                                                                                    #'stx #'question))))
-                   (colored-error-message (list (colored-msg-fragment
-                                                 (? syntax?)
-                                                 (list (msg-fragment:str "cond")) #f #f)
-                                                (msg-fragment:str ": expected a clause with a question and answer, but found a clause with only ")
-                                                (colored-msg-fragment (? syntax?) (list (msg-fragment:str "one part")) #f #f))
-                                          empty)))
-
-
-(test 'get-error-messages/color
-      (check-equal? (get-error-message/color (exn:fail:colored:syntax "ah!" (current-continuation-marks) (list #'here) (colored-error-message 1 2)))
-                    (colored-error-message 1 2))
-      
-      (check-match (important-srclocs (colored-format "~|1|~" (list #'first #t) #:additional-highlights '(a b)))
-                   (list (app syntax-e 'first) a b))
-      (check-match (get-error-colored-srclocs (catch-the-error (lambda () (raise-colored-syntax-error "~|1|~ ~||~" (list #'first #t) (list #'second 'red) #:additional-highlights (list #'a #'b)))))
-                   (list (list (app syntax-e 'first) #f) (list (app syntax-e 'second) 'red) (list (app syntax-e 'a) #f) (list (app syntax-e 'b) #f))))
-
-#|
-(provide insert-colored-message)
-(define (insert-colored-message msg repl clickback)
-  (send repl begin-edit-sequence)
-  (define port (send repl get-err-port))
-  (let loop ([fragments (colored-error-message-fragments msg)])
-    (for ([f fragments])
-      (match f
-        [(msg-fragment:str str) (display str port)]
-        [(msg-fragment:v v) (write v port)]
-        [(colored-msg-fragment locs frags imp col)
-         (define start (send repl get-insertion-point))
-         (for-each loop frags)
-         (define end (send repl get-insertion-point))
-         (send repl higlight-range start end col #t)
-         (send repl set-clickback start end (lambda () (clickback f)))])))
-  (send repl highlight-errors (get-message-colored-srclocs msg))
-  
-  ;; need to flush here so that error annotations inserted in next line
-  ;; don't get erased if this output were to happen after the insertion
-  (flush-output (send repl get-err-port))
-  
-  (send repl end-edit-sequence))
-|#
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/debug.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/debug.rkt
deleted file mode 100644
index 2e3a9203aa..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/debug.rkt
+++ /dev/null
@@ -1,2512 +0,0 @@
-#lang racket/base
-
-#|
-
-profile todo:
-  - use origin fields
-  - sort out various ways of clearing out the profiling information
-
-|#
-
-(require errortrace/errortrace-key
-         racket/unit
-         racket/contract
-         errortrace/stacktrace
-         racket/class
-         racket/path
-         racket/bool
-         racket/gui/base
-         string-constants
-         framework
-         framework/private/bday
-         "embedded-snip-utils.rkt"
-         drracket/private/drsig
-         "bindings-browser.rkt"
-         "stack-checkpoint.rkt"
-         "ellipsis-snip.rkt"
-         net/sendurl
-         net/url
-         racket/match
-         mrlib/include-bitmap
-         images/compile-time
-         pkg/lib
-         pkg/gui
-         (for-syntax images/icons/misc images/icons/style images/icons/control images/logos)
-         (for-syntax racket/base)
-         (submod "frame.rkt" install-pkg))
-
-(define orig (current-output-port))
-(define (oprintf . args) (apply fprintf orig args))
-
-(define base-phase
-  (variable-reference->module-base-phase (#%variable-reference)))
-
-(provide debug@)
-(define-unit debug@
-  (import [prefix drracket:rep: drracket:rep^]
-          [prefix drracket:frame: drracket:frame^]
-          [prefix drracket:unit: drracket:unit/int^]
-          [prefix drracket:language: drracket:language^]
-          [prefix drracket:language-configuration: drracket:language-configuration/internal^]
-          [prefix drracket:init: drracket:init^]
-          [prefix drracket: drracket:interface^])
-  (export drracket:debug^)
-  
-  ;                                                          
-  ;                                                          
-  ;   ;                                                      
-  ;   ;                             ;                        
-  ;   ;                                                      
-  ;   ; ;;   ;   ;   ;; ;         ;;;     ;;;;   ;;;   ; ;;  
-  ;   ;;  ;  ;   ;  ;  ;;           ;    ;      ;   ;  ;;  ; 
-  ;   ;   ;  ;   ;  ;   ;           ;    ;      ;   ;  ;   ; 
-  ;   ;   ;  ;   ;  ;   ;           ;    ;      ;   ;  ;   ; 
-  ;   ;   ;  ;   ;  ;   ;           ;    ;      ;   ;  ;   ; 
-  ;   ;;  ;  ;  ;;  ;  ;;           ;    ;      ;   ;  ;   ; 
-  ;   ; ;;    ;; ;   ;; ;           ;     ;;;;   ;;;   ;   ; 
-  ;                     ;                                    
-  ;                  ;;;                                     
-  ;                                                          
-  
-  ;; type debug-source = (union symbol (instanceof editor<%>))
-  
-  ;; original-output-port : output-port
-  ;; for debugging -- be sure to print to here, not the current output port
-  (define original-output-port (current-output-port))
-  
-  ;; cms->srclocs : continuation-marks -> (listof srcloc)
-  (define (cms->srclocs cms)
-    (map 
-     (λ (x) (make-srcloc (list-ref x 1)
-                         (list-ref x 2)
-                         (list-ref x 3)
-                         (list-ref x 4)
-                         (list-ref x 5)))
-     (continuation-mark-set->list cms errortrace-key)))
-  
-  ;; error-delta : (instanceof style-delta%)
-  (define error-delta (make-object style-delta% 'change-style 'italic))
-  (send error-delta set-delta-foreground (make-object color% 255 0 0))
-  
-  ;; get-error-color : -> (instanceof color%)
-  (define get-error-color
-    (let ([w-o-b (make-object color% 63 0 0)]
-          [b-o-w (make-object color% "PINK")])
-      (λ ()
-        (if (preferences:get 'framework:white-on-black?)
-            w-o-b
-            b-o-w))))
-  
-  (define arrow-cursor (make-object cursor% 'arrow))
-  (define (clickable-snip-mixin snip%)
-    (class snip%
-      (init-rest args)
-      (inherit get-flags set-flags get-admin get-extent)
-      
-      (define callback void)
-      (define/public (set-callback cb) (set! callback cb))
-      (define/public (get-callback) callback)
-      
-      (define grabbed? #f)
-      (define in-bounds? #f)
-      
-      (define (set-clicked new-grabbed? new-in-bounds? dc)
-        (define needs-invalidate?
-          (or (not (equal? grabbed? new-grabbed?))
-              (not (equal? new-in-bounds? in-bounds?))))
-        (set! grabbed? new-grabbed?)
-        (set! in-bounds? new-in-bounds?)
-        (when needs-invalidate?
-          (invalidate dc)))
-      
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (super draw dc x y left top right bottom dx dy draw-caret)
-        (when (and in-bounds? grabbed?)
-          (let ([brush (send dc get-brush)]
-                [pen (send dc get-pen)])
-            (let-values ([(w h) (get-w/h dc)])
-              (send dc set-brush (send the-brush-list find-or-create-brush "black" 'hilite))
-              (send dc set-pen (send the-pen-list find-or-create-pen "white" 1 'transparent))
-              (send dc draw-rectangle x y w h)
-              (send dc set-pen pen)
-              (send dc set-brush brush)))))
-      
-      (define/override (on-event dc x y editorx editory evt)
-        (define-values (w h) (get-w/h dc))
-        (define in-bounds? (and (<= (- (send evt get-x) x) w)
-                                (<= (- (send evt get-y) y) h)))
-        (cond
-          [(send evt button-down? 'left)
-           (set-clicked #t in-bounds? dc)]
-          [(send evt button-up? 'left)
-           (let ([admin (send this get-admin)])
-             (when admin
-               (send (send admin get-editor) set-caret-owner #f 'global)))
-           (when (and grabbed? in-bounds?)
-             (callback this))
-           (set-clicked #f in-bounds? dc)]
-          [else
-           (set-clicked grabbed? in-bounds? dc)]))
-      
-      (define/private (invalidate dc)
-        (let ([admin (get-admin)])
-          (when admin
-            (let-values ([(w h) (get-w/h dc)])
-              (send admin needs-update this 0 0 w h)))))
-      
-      (define/private (get-w/h dc)
-        (let ([wb (box 0)]
-              [hb (box 0)])
-          ;; know that the snip is the same size everywhere, 
-          ;; so just use (0,0) for its position
-          (get-extent dc 0 0 wb hb #f #f #f #f)
-          (values (unbox wb)
-                  (unbox hb))))
-      
-      (define/override (adjust-cursor dc x y editorx editory event)
-        arrow-cursor)
-      
-      (apply super-make-object args)
-      (set-flags (cons 'handles-events (get-flags)))))
-  
-  (define clickable-image-snip%  (clickable-snip-mixin image-snip%))
-  (define clickable-string-snip%
-    (class (clickable-snip-mixin snip%)
-      (define/override (get-extent dc x y wb hb db sb lb rb)
-        (define-values (w h d a) (send dc get-text-extent str))
-        (set-box/f wb w)
-        (set-box/f hb h)
-        (set-box/f db d)
-        (set-box/f sb a)
-        (set-box/f lb 0)
-        (set-box/f rb 0))
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (define font (send dc get-font))
-        (send dc set-font (send the-font-list find-or-create-font
-                                (send font get-point-size)
-                                (send font get-face)
-                                (send font get-family)
-                                (send font get-style)
-                                (send font get-weight)
-                                #t
-                                (send font get-smoothing)
-                                #f
-                                (send font get-hinting)))
-        (send dc draw-text str x y)
-        (send dc set-font font))
-      
-      (inherit get-callback set-callback)
-      (init-field str)
-      (define/override (copy)
-        (let ([n (new clickable-string-snip% [str str])])
-          (send n set-callback (get-callback))
-          n))
-      (define/override (write f)
-        (define bts (string->bytes/utf-8 str))
-        (send f put (bytes-length bts) bts))
-      (super-new)
-      (inherit set-snipclass)
-      (set-snipclass clickable-string-snipclass)))
-  (define (set-box/f b v) (when (box? b) (set-box! b v)))
-  (define clickable-string-snipclass
-    (new (class snip-class%
-           (define/override (read f)
-             (define str (bytes->string/utf-8 (or (send f get-unterminated-bytes) #"")))
-             (new clickable-string-snip% [str str]))
-           (super-new))))
-  (send clickable-string-snipclass set-classname "drclickable-string-snipclass")
-  (send clickable-string-snipclass set-version 0)
-  (send (get-the-snip-class-list) add clickable-string-snipclass)
-  
-  ;; make-note% : string -> (union class #f)
-  (define (make-note% filename bitmap)
-    (and (send bitmap ok?)
-         (letrec ([note%
-                   (class clickable-image-snip%
-                     (inherit get-callback)
-                     (define/public (get-image-name) filename)
-                     (define stack1 #f)
-                     (define stack2 #f)
-                     (define/public (set-stacks s1 s2) (set! stack1 s1) (set! stack2 s2))
-                     (define/public (get-stacks) (values stack1 stack2))
-                     (define/override (copy) 
-                       (let ([n (new note%)])
-                         (send n set-callback (get-callback))
-                         (send n set-stacks stack1 stack2)
-                         n))
-                     (super-make-object bitmap))])
-           note%)))
-  
-  (define file-note%
-    (make-note% "stop-22x22.png" (compiled-bitmap (stop-sign-icon #:color halt-icon-color))))
-  (define bug-note%
-    (make-note% "stop-multi.png" (compiled-bitmap (stop-signs-icon #:color halt-icon-color))))
-  
-  (define mf-note% (make-note% "mf.gif" (include-bitmap (lib "icons/mf.gif") 'gif)))
-  (define small-planet-bitmap (compiled-bitmap (planet-logo #:height (default-icon-height))))
-  (define planet-note% (make-note% "small-planet.png" small-planet-bitmap))
-  (define install-note% 
-    (class clickable-image-snip%
-      (inherit get-callback)
-      (define/override (copy) 
-        (let ([n (new install-note%)])
-          (send n set-callback (get-callback))
-          n))
-      (super-new)))
-  
-  ;; display-stats : (syntax -> syntax)
-  ;; count the number of syntax expressions & number of with-continuation-marks in an 
-  ;; expanded expression ... except that it counts keywords, too.
-  ;; returns its argument.
-  ;(define (display-stats stx)
-  ;  (let ([exps 0]
-  ;        [wcms 0])
-  ;    (let loop ([stx stx])
-  ;      (kernel-syntax-case stx ()
-  ;        [(#%with-continuation-mark key mark body)
-  ;         (set! wcms (+ wcms 1))
-  ;         (loop #`body)]
-  ;        [(subexps ...)
-  ;         (set! exps (+ exps 1))
-  ;         (for-each loop (syntax->list stx))]
-  ;        [exp
-  ;         (set! exps (+ exps 1))]))
-  ;    (eprintf "exps: ~v\nwcms: ~v\n" exps wcms))
-  ;  stx)
-  
-  ;; make-debug-eval-handler : (sexp -> value) -> sexp -> value
-  ;; adds debugging information to `sexp' and calls `oe'
-  (define (make-debug-eval-handler oe)
-    (let ([debug-tool-eval-handler
-           (λ (orig-exp)
-             (if (compiled-expression? (if (syntax? orig-exp)  
-                                           (syntax-e orig-exp)  
-                                           orig-exp))
-                 (oe orig-exp)
-                 (let loop ([exp (if (syntax? orig-exp)
-                                     orig-exp
-                                     (namespace-syntax-introduce
-                                      (datum->syntax #f orig-exp)))])
-                   (let ([top-e (expand-syntax-to-top-form exp)]) 
-                     (syntax-case top-e (begin) 
-                       [(begin expr ...)
-                        ;; Found a `begin', so expand/eval each contained 
-                        ;; expression one at a time 
-                        (let i-loop ([exprs (syntax->list #'(expr ...))]
-                                     [last-one (list (void))])
-                          (cond
-                            [(null? exprs) 
-                             (apply values last-one)]
-                            [else 
-                             (i-loop (cdr exprs)
-                                     (call-with-values 
-                                      (λ () 
-                                        (call-with-continuation-prompt
-                                         (λ () (loop (car exprs)))
-                                         (default-continuation-prompt-tag)
-                                         (λ args
-                                           (apply
-                                            abort-current-continuation 
-                                            (default-continuation-prompt-tag)
-                                            args))))
-                                      list))]))]
-                       [_else 
-                        ;; Not `begin', so proceed with normal expand and eval 
-                        (let* ([annotated (annotate-top (expand-syntax top-e)
-                                                        (namespace-base-phase))])
-                          (oe annotated))])))))])
-      debug-tool-eval-handler))
-  
-  ;; make-debug-error-display-handler : 
-  ;;    (string (union TST exn) -> void) -> string (union TST exn) -> void
-  ;; adds in the bug icon, if there are contexts to display
-  (define (make-debug-error-display-handler orig-error-display-handler)
-    (define (debug-error-display-handler msg exn)
-      (let ([rep (drracket:rep:current-rep)])
-        (cond
-          [rep
-           (error-display-handler/stacktrace 
-            msg
-            exn 
-            (and (exn? exn) 
-                 (continuation-mark-set? (exn-continuation-marks exn))
-                 (cms->srclocs (exn-continuation-marks exn))))]
-          [else 
-           (orig-error-display-handler msg exn)])))
-    debug-error-display-handler)
-  
-  ;; error-display-handler/stacktrace : string any (listof srcloc) -> void
-  ;; =User=
-  (define (error-display-handler/stacktrace 
-           msg exn 
-           [pre-stack #f]
-           #:interactions-text [ints (drracket:rep:current-rep)]
-           #:definitions-text [defs (let ([rep (drracket:rep:current-rep)])
-                                      (and rep
-                                           (send rep get-definitions-text)))])
-    (let* ([stack1 (or pre-stack '())]
-           [stack2 (if (exn? exn)
-                       (map cdr (filter cdr (cut-stack-at-checkpoint exn)))
-                       '())]
-           [port-name-matches-cache (make-hasheq)]
-           [stack1-editions (map (λ (x) (srcloc->edition/pair defs ints x port-name-matches-cache))
-                                 stack1)]
-           [stack2-editions (map (λ (x) (srcloc->edition/pair defs ints x port-name-matches-cache))
-                                 stack2)]
-           [src-locs (cond
-                       [(exn:srclocs? exn)
-                        ((exn:srclocs-accessor exn) exn)]
-                       [(pick-first-defs port-name-matches-cache defs stack1) => list]
-                       [(pick-first-defs port-name-matches-cache defs stack2) => list]
-                       [(pair? stack1)
-                        (list (car stack1))]
-                       [(pair? stack2)
-                        (list (car stack2))]
-                       [else '()])]
-           [src-locs-edition 
-            (and (pair? src-locs)
-                 (srcloc->edition/pair defs ints (car src-locs) port-name-matches-cache))])
-
-      (print-planet-icon-to-stderr exn)
-      (unless (exn:fail:user? exn)
-        (unless (exn:fail:syntax? exn)
-          (unless (and (null? stack1) (null? stack2))
-            (print-bug-to-stderr msg stack1 stack1-editions stack2 stack2-editions defs ints)))
-        (display-srclocs-in-error src-locs src-locs-edition))
-      (display-error-message exn msg)
-      (when (exn:fail:syntax? exn)
-        (unless (error-print-source-location)
-          (show-syntax-error-context (current-error-port) exn)))
-      (print-pkg-icon-to-stderr exn)
-      (newline (current-error-port))
-      (flush-output (current-error-port))
-      (when (and ints
-                 (eq? (current-error-port) 
-                      (send ints get-err-port)))
-        (parameterize ([current-eventspace drracket:init:system-eventspace])
-          (queue-callback
-           (λ ()
-             ;; need to make sure that the user's eventspace is still the same
-             ;; and still running here?
-             (send ints highlight-errors src-locs (if (null? stack1)
-                                                      stack2
-                                                      stack1))))))))
-  
-  (define (render-message lines)
-    (define collected (collect-hidden-lines lines))
-    (for ([x (in-list collected)]
-          [i (in-naturals)])
-      (unless (zero? i) (newline (current-error-port)))
-      (cond
-        [(string? x)
-         (display x (current-error-port))]
-        [(pair? x)
-         (define line (list-ref x 0))
-         (define to-show-later (list-ref x 1))
-         (write-string line (current-error-port) 0 (- (string-length line) 4))
-         (write-special (new ellipsis-snip% [extra to-show-later]) (current-error-port))
-         (display ":" (current-error-port))])))
-  
-  (define (display-error-message exn msg)
-    (cond
-      [(exn:fail? exn)
-       (define lines (regexp-split #rx"\n" msg))
-       (cond
-         [(ellipsis-candidate? lines)
-          (render-message lines)]
-         [else
-          (display msg (current-error-port))])]
-      [else 
-       (display msg (current-error-port))]))
-    
-  (define (ellipsis-candidate? lines)
-    (and ((length lines) . > . 1)
-         (for/or ([x (in-list (cdr lines))])
-           (regexp-match ellipsis-error-message-field x))))
-  
-  (define (srcloc->edition/pair defs ints srcloc [port-name-matches-cache #f])
-    (let ([src (srcloc-source srcloc)])
-      (cond
-        [(and (or (symbol? src)
-                  (path? src))
-              ints
-              (port-name-matches?/use-cache ints src port-name-matches-cache))
-         (cons (make-weak-box ints) (send ints get-edition-number))]
-        [(and (or (symbol? src)
-                  (path? src))
-              defs
-              (port-name-matches?/use-cache defs src port-name-matches-cache))
-         (cons (make-weak-box defs) (send defs get-edition-number))]
-        [(path? src)
-         (let ([frame (send (group:get-the-frame-group) locate-file src)])
-           (and frame
-                (is-a? frame drracket:unit:frame<%>)
-                (cons (make-weak-box (send frame get-definitions-text))
-                      (send (send frame get-definitions-text) get-edition-number))))]
-        [else #f])))
-  
-  (define (pick-first-defs port-name-matches-cache defs stack)
-    (for/or ([srcloc (in-list stack)])
-      (and (srcloc? srcloc)
-           (port-name-matches?/use-cache defs (srcloc-source srcloc) port-name-matches-cache)
-           srcloc)))
-  
-  (define (port-name-matches?/use-cache txt src port-name-matches-cache)
-    (if port-name-matches-cache
-        (hash-ref! port-name-matches-cache (cons txt src) (λ () (send txt port-name-matches? src)))
-        (send txt port-name-matches? src)))
-  
-  ;; =User=
-  (define (print-planet-icon-to-stderr exn)
-    (when (exn:fail:contract:blame? exn)
-      (let ([table (parse-gp exn
-                             (blame-positive
-                              (exn:fail:contract:blame-object exn)))])
-        (when table
-          (let ([gp-url (bug-info->ticket-url table)])
-            (when planet-note%
-              (when (port-writes-special? (current-error-port))
-                (let ([note (new planet-note%)])
-                  (send note set-callback (λ (snp) 
-                                            ;; =Kernel= =Handler=
-                                            (drracket:unit:forget-saved-bug-report table)
-                                            (send-url (url->string gp-url))))
-                  (parameterize ([current-eventspace drracket:init:system-eventspace])
-                    (queue-callback
-                     (λ ()
-                       (drracket:unit:record-saved-bug-report table))))
-                  (write-special note (current-error-port))
-                  (display #\space (current-error-port))))))))))
-  
-  
-  ;; =Kernel= =User=
-  (define (bug-info->ticket-url table)
-    (make-url 
-     "http"
-     #f
-     "planet.racket-lang.org"
-     #f
-     #t
-     (list (make-path/param "trac" '())
-           (make-path/param "newticket" '()))
-     table
-     #f))
-  
-  ;; =User=
-  (define (parse-gp exn gp)
-    (match gp
-      [`(planet ,fn (,user ,package ,planet-version ...))
-       (list (cons 'component (format "~a/~a" user package))
-             (cons 'keywords "contract violation")
-             (cons 'pltversion (version))
-             (cons 'planetversion
-                   (cond
-                     [(null? planet-version) ""]
-                     [(null? (cdr planet-version))
-                      (format "~s" `(,(car planet-version) ?))]
-                     [else
-                      (format "~s" `(,(car planet-version) ,(cadr planet-version)))]))
-             (cons 'description (exn->trace exn)))]
-      [else #f]))
-  
-  ;; =User=
-  (define (print-pkg-icon-to-stderr exn)
-    (when (exn:missing-module? exn)
-      (define mod ((exn:missing-module-accessor exn) exn))
-      (define pkgs (pkg-catalog-suggestions-for-module mod))
-      (define update-pkgs-node (new clickable-string-snip% [str "[update catalog]"]))
-      (define (get-tlw snp)
-        (define admin (send snp get-admin))
-        (define canvas (and admin (send (send admin get-editor) get-canvas)))
-        (and canvas (send canvas get-top-level-window)))
-      (send update-pkgs-node set-callback 
-            (λ (snp)
-              (pkg-catalog-update-local/simple-status-dialog
-               #:parent (get-tlw snp))))
-      (cond
-        [(null? pkgs)
-         (when (port-writes-special? (current-error-port))
-           (display "\n  no packages suggestions are available " (current-error-port))
-           (write-special update-pkgs-node (current-error-port)))]
-        [else
-         (display "\n  packages that provide the missing module:" (current-error-port))
-         (when (port-writes-special? (current-error-port))
-           (display " " (current-error-port))
-           (write-special update-pkgs-node (current-error-port)))
-         (for ([pkg (in-list pkgs)])
-           (eprintf "\n    ~a" pkg)
-           (when (port-writes-special? (current-error-port))
-             (define note (new clickable-string-snip% [str "[install]"]))
-             (send note set-callback 
-                   (λ (snp) 
-                     ;; =Kernel= =Handler=
-                     (define tlw (get-tlw snp))
-                     (install-pkg
-                      tlw
-                      (lambda (thunk)
-                        (parameterize ([error-display-handler 
-                                        drracket:init:original-error-display-handler])
-                          (thunk)))
-                      #:package-to-offer pkg)))
-             (eprintf "  ")
-             (write-special note (current-error-port))))])))
-  
-  ;; =User=
-  (define (exn->trace exn)
-    (let ([sp (open-output-string)])
-      (parameterize ([current-error-port sp])
-        (drracket:init:original-error-display-handler (exn-message exn) exn))
-      (get-output-string sp)))
-  
-  ;; =User=
-  (define (print-bug-to-stderr msg cms1 editions1 cms2 editions2 defs ints)
-    (when (port-writes-special? (current-error-port))
-      (let ([note% (if (mf-bday?) mf-note% bug-note%)])
-        (when note%
-          (let ([note (new note%)])
-            (send note set-stacks cms1 cms2)
-            (send note set-callback
-                  (λ (snp) (show-backtrace-window/edition-pairs/two msg 
-                                                                    cms1 editions1
-                                                                    cms2 editions2
-                                                                    defs ints)))
-            (write-special note (current-error-port))
-            (display #\space (current-error-port)))))))
-  
-  ;; display-srclocs-in-error : (listof src-loc) -> void
-  ;; prints out the src location information for src-to-display
-  ;; as it would appear in an error message
-  (define (display-srclocs-in-error srcs-to-display edition-pair)
-    (unless (null? srcs-to-display)
-      (let ([src-to-display (car srcs-to-display)])
-        (let* ([src (srcloc-source src-to-display)]
-               [line (srcloc-line src-to-display)]
-               [col (srcloc-column src-to-display)]
-               [pos (srcloc-position src-to-display)]
-               [do-icon
-                (λ ()
-                  (when file-note%
-                    (when (port-writes-special? (current-error-port))
-                      (let ([note (new file-note%)])
-                        (send note set-callback 
-                              (λ (snp) (open-and-highlight-in-file srcs-to-display edition-pair)))
-                        (write-special note (current-error-port))
-                        (display #\space (current-error-port))))))]
-               [do-src
-                (λ ()
-                  (cond
-                    [(path? src)
-                     (define-values (n-cd n-src)
-                       (with-handlers ([exn:fail? (λ (x) (values (current-directory) src))])
-                         (values (normalize-path (current-directory)) (normalize-path src))))
-                     (display (path->string (find-relative-path n-cd n-src))
-                              (current-error-port))]
-                    [else
-                     (display "<unsaved editor>" (current-error-port))]))]
-               [do-line/col (λ () (eprintf ":~a:~a" line col))]
-               [do-pos (λ () (eprintf "::~a" pos))]
-               [src-loc-in-defs/ints?
-                (let ([rep (drracket:rep:current-rep)])
-                  (and rep
-                       (is-a? rep drracket:rep:text<%>)
-                       (let ([defs (send rep get-definitions-text)])
-                         (or (send rep port-name-matches? src)
-                             (eq? rep src)
-                             (send defs port-name-matches? src)
-                             (eq? defs src)))))])
-          (cond
-            [(and src line col)
-             (do-icon)
-             (unless src-loc-in-defs/ints?
-               (do-src)
-               (do-line/col)
-               (display ": " (current-error-port)))]
-            [(and src pos)
-             (do-icon)
-             (unless src-loc-in-defs/ints?
-               (do-src)
-               (do-pos)
-               (display ": " (current-error-port)))])))))
-  
-  ;; find-src-to-display : exn (union #f (listof srcloc))
-  ;;                    -> (listof srclocs)
-  ;; finds the source location to display, choosing between
-  ;; the stack trace and the exception record.
-  (define (find-src-to-display exn cms)
-    (let ([has-info?
-           (λ (srcloc)
-             (ormap (λ (f) (f srcloc))
-                    (list srcloc-column
-                          srcloc-line
-                          srcloc-position
-                          srcloc-source
-                          #;srcloc-span)))])  ;; don't consider span alone to count as `info'
-      (cond
-        [(and (exn:srclocs? exn)
-              (ormap has-info? ((exn:srclocs-accessor exn) exn)))
-         ((exn:srclocs-accessor exn) exn)]
-        [(pair? cms) (list (car cms))]
-        [else '()])))
-  
-  ;; show-syntax-error-context : 
-  ;; display the source information associated with a syntax error (if present)
-  (define (show-syntax-error-context port exn)
-    (let ([error-text-style-delta (make-object style-delta%)]
-          [send-out
-           (λ (msg f) 
-             (if (port-writes-special? (current-error-port))
-                 (let ([snp (make-object string-snip% msg)])
-                   (f snp)
-                   (write-special snp (current-error-port)))
-                 (display msg (current-error-port))))])
-      (send error-text-style-delta set-delta-foreground (make-object color% 200 0 0))
-      (define (show-one expr)
-        (display " " (current-error-port))
-        (send-out (format "~s" (syntax->datum expr))
-                  (λ (snp)
-                    (send snp set-style
-                          (send (editor:get-standard-style-list) find-or-create-style
-                                (send (editor:get-standard-style-list) find-named-style "Standard")
-                                error-text-style-delta)))))
-      (define exprs (exn:fail:syntax-exprs exn))
-      (define (show-in)
-        (send-out " in:"
-                  (λ (snp)
-                    (send snp set-style
-                          (send (editor:get-standard-style-list) find-named-style "Standard")))))
-      (cond
-        [(null? exprs) (void)]
-        [(null? (cdr exprs))
-         (show-in)
-         (show-one (car exprs))]
-        [else
-         (show-in)
-         (for-each (λ (expr)
-                     (display "\n " (current-error-port))
-                     (show-one expr))
-                   exprs)])))
-  
-  
-  ;; insert/clickback : (instanceof text%) (union string (instanceof snip%)) (-> void)
-  ;; inserts `note' and a space at the end of `rep'
-  ;; also sets a clickback on the inserted `note' (but not the space).
-  (define (insert/clickback rep note clickback)
-    (let ([before (send rep last-position)])
-      (send rep insert (if (string? note)
-                           note
-                           (send note copy))
-            before before)
-      (let ([after (send rep last-position)])
-        (send rep insert #\space after after)
-        (send rep set-clickback before after
-              (λ (txt start end)
-                (clickback))))))
-  
-  ;; with-mark : mark-stx syntax (any? -> syntax) -> syntax
-  ;; a member of stacktrace-imports^
-  ;; This uses the following format for continuation marks:
-  ;;    (cons Dummy srcloc-list)
-  ;; where Dummy is always ignored.
-  
-  ;; Note that this is not necessarily the same format used by `make-st-mark`
-  ;; which is unspecified.
-  (define (with-mark src-stx expr phase)
-    (let ([source (cond
-                    [(path? (syntax-source src-stx))
-                     (syntax-source src-stx)]
-                    [(is-a? (syntax-source src-stx) editor<%>)
-                     (syntax-source src-stx)]
-                    [else 
-                     (let* ([rep (drracket:rep:current-rep)])
-                       (and
-                        rep
-                        (let ([defs (send rep get-definitions-text)])
-                          (cond
-                            [(send rep port-name-matches? (syntax-source src-stx))
-                             rep]
-                            [(send defs port-name-matches? (syntax-source src-stx))
-                             defs]
-                            [else #f]))))])]
-          [position (or (syntax-position src-stx) 0)]
-          [span (or (syntax-span src-stx) 0)]
-          [line (or (syntax-line src-stx) 0)]
-          [column (or (syntax-column src-stx) 0)])
-      (if source
-          (with-syntax ([expr expr]
-                        [mark (list 'dummy-thing source line column position span)]
-                        [wcm (syntax-shift-phase-level #'with-continuation-mark phase)]
-                        [errortrace-key errortrace-key] ; a symbol
-                        [qte (syntax-shift-phase-level #'quote phase)])
-            (syntax
-             (wcm (qte errortrace-key)
-                  (qte mark)
-                  expr)))
-          expr)))
-  
-  ;; current-backtrace-window : (union #f (instanceof frame:basic<%>))
-  ;; the currently visible backtrace window, or #f, if none
-  (define current-backtrace-window #f)
-  
-  ;; reset-backtrace-window : -> void
-  ;; effect: updates current-backtrace-window
-  ;; closes the current backtrace window and creates a new (unshown) one
-  (define (reset-backtrace-window)
-    (when current-backtrace-window
-      (send current-backtrace-window close)
-      (set! current-backtrace-window #f))
-    
-    (set! current-backtrace-window 
-          (make-object backtrace-frame%
-            (string-constant backtrace-window-title)
-            #f
-            (preferences:get 'drracket:backtrace-window-width)
-            (preferences:get 'drracket:backtrace-window-height)
-            (preferences:get 'drracket:backtrace-window-x)
-            (preferences:get 'drracket:backtrace-window-y))))
-  
-  ;; hide-backtrace-window : -> void
-  (define (hide-backtrace-window)
-    (when current-backtrace-window
-      (send current-backtrace-window close)
-      (set! current-backtrace-window #f)))
-  
-  ;; backtrace-frame% : (extends frame:basic<%>)
-  (define backtrace-frame%
-    (class (drracket:frame:basics-mixin (frame:standard-menus-mixin frame:basic%))
-      (define/override (on-size x y)
-        (preferences:set 'drracket:backtrace-window-width x)
-        (preferences:set 'drracket:backtrace-window-height y)
-        (super on-size x y))
-      (define/override (on-move x y)
-        (preferences:set 'drracket:backtrace-window-x x)
-        (preferences:set 'drracket:backtrace-window-y y)
-        (super on-move x y))
-      (define/override (edit-menu:between-find-and-preferences edit-menu) (void))
-      (define/override (edit-menu:between-select-all-and-find edit-menu) (void))
-      (define/override (file-menu:between-save-as-and-print file-menu) (void))
-      (define/augment (on-close) 
-        (set! current-backtrace-window #f)
-        (inner (void) on-close))
-      (super-new)))
-  
-  ;; show-backtrace-window : string
-  ;;                         (listof srcloc?)
-  ;;                         -> 
-  ;;                         void
-  (define (show-backtrace-window error-text dis/exn [rep #f] [defs #f])
-    (let ([dis (if (exn? dis/exn)
-                   (cms->srclocs (exn-continuation-marks dis/exn))
-                   dis/exn)])
-      (show-backtrace-window/edition-pairs error-text dis (map (λ (x) #f) dis) defs rep)))
-  
-  (define (show-backtrace-window/edition-pairs error-text dis editions defs ints)
-    (show-backtrace-window/edition-pairs/two error-text dis editions '() '() defs ints))
-  
-  (define (show-backtrace-window/edition-pairs/two error-text dis1 editions1 dis2 editions2 defs ints)
-    (reset-backtrace-window)
-    (when (mf-bday?)
-      (new message%
-           [label (string-constant happy-birthday-matthias)]
-           [parent (send current-backtrace-window get-area-container)]))
-    (define tab-panel 
-      (if (and (pair? dis1) (pair? dis2))
-          (new tab-panel% 
-               [choices (list "Errortrace" "Builtin")]
-               [parent (send current-backtrace-window get-area-container)]
-               [callback
-                (λ (a b) 
-                  (send tab-panel change-children
-                        (λ (l) (if (zero? (send tab-panel get-selection))
-                                   (list ec1)
-                                   (list ec2)))))])
-          (new vertical-panel% [parent (send current-backtrace-window get-area-container)])))
-    (define ec1 (add-ec/text dis1 editions1 defs ints tab-panel error-text))
-    (define ec2 (add-ec/text dis2 editions2 defs ints tab-panel error-text))
-    (when (and (pair? dis1) (pair? dis2))
-      (send tab-panel change-children (λ (l) (list ec1)))))
-  
-  (define (add-ec/text dis1 editions1 defs ints tab-panel error-text)
-    (cond
-      [(pair? dis1)
-       (define text1 (new (text:wide-snip-mixin text:hide-caret/selection%)))
-       (define ec1 (new (canvas:color-mixin canvas:wide-snip%)
-                        [parent tab-panel]
-                        [editor text1]))
-       (add-one-set-to-frame text1 ec1 error-text dis1 editions1 defs ints)
-       ec1]
-      [else #f]))
-  
-  (define (add-one-set-to-frame text ec error-text dups-dis dups-editions defs ints)
-    (define-values (dis editions skips) (remove-adjacent-duplicates dups-dis dups-editions))
-    (letrec ([di-vec (list->vector dis)]
-             [editions-vec (list->vector editions)]
-             [skip-counts (list->vector skips)]
-             [index 0]
-             [how-many-at-once 15]
-             [show-next-dis
-              (λ ()
-                (let ([start-pos (send text get-start-position)]
-                      [end-pos (send text get-end-position)])
-                  (send text begin-edit-sequence)
-                  (send text set-position (send text last-position))
-                  (let loop ([n index])
-                    (cond
-                      [(and (< n (vector-length di-vec))
-                            (< n (+ index how-many-at-once)))
-                       (show-frame ec text (vector-ref di-vec n) 
-                                   (vector-ref editions-vec n)
-                                   (vector-ref skip-counts n)
-                                   defs ints)
-                       (loop (+ n 1))]
-                      [else
-                       (set! index n)]))
-                  
-                  ;; add 'more frames' link
-                  (when (< index (vector-length di-vec))
-                    (let ([end-of-current (send text last-position)])
-                      (send text insert #\newline)
-                      (let ([hyper-start (send text last-position)])
-                        (send text insert 
-                              (let* ([num-left
-                                      (- (vector-length di-vec)
-                                         index)]
-                                     [num-to-show
-                                      (min how-many-at-once
-                                           num-left)])
-                                (if (= num-left 1)
-                                    (string-constant last-stack-frame)
-                                    (format (if (num-left . <= . num-to-show)
-                                                (string-constant last-stack-frames)
-                                                (string-constant next-stack-frames))
-                                            num-to-show))))
-                        (let ([hyper-end (send text last-position)])
-                          (send text change-style (gui-utils:get-clickback-delta
-                                                   (preferences:get 'framework:white-on-black?))
-                                hyper-start hyper-end)
-                          (send text set-clickback
-                                hyper-start hyper-end
-                                (λ x
-                                  (send text begin-edit-sequence)
-                                  (send text lock #f)
-                                  (send text delete end-of-current (send text last-position))
-                                  (show-next-dis)
-                                  (send text set-position 
-                                        (send text last-position)
-                                        (send text last-position))
-                                  (send text lock #t)
-                                  (send text end-edit-sequence)))
-                          
-                          (send text insert #\newline)
-                          (send text set-paragraph-alignment (send text last-paragraph) 'center)))))
-                  
-                  (send text set-position start-pos end-pos)
-                  (send text end-edit-sequence)))])
-      (send current-backtrace-window set-alignment 'center 'center)
-      (send current-backtrace-window reflow-container)
-      (send text auto-wrap #t)
-      (send text set-autowrap-bitmap #f)
-      (send text insert error-text)
-      (send text insert "\n\n")
-      (send text change-style error-delta 0 (- (send text last-position) 1))
-      (show-next-dis)
-      (send text set-position 0 0)
-      (send text lock #t)
-      (send text hide-caret #t)
-      (send current-backtrace-window show #t)))
-  
-  (define (remove-adjacent-duplicates dis editions)
-    (cond
-      [(null? dis) (values '() '() '())]
-      [else
-       (let loop ([di (car dis)]
-                  [edition (car editions)]
-                  [dis (cdr dis)]
-                  [editions (cdr editions)])
-         (cond
-           [(null? dis) (values (list di) (list edition) (list 0))]
-           [else
-            (define di2 (car dis))
-            (define edition2 (car editions))
-            (define-values (res-dis res-editions skip-counts)
-              (loop di2 edition2 (cdr dis) (cdr editions)))
-            (if (equal? di di2)
-                (values res-dis res-editions (cons (+ (car skip-counts) 1) (cdr skip-counts)))
-                (values (cons di res-dis)
-                        (cons edition res-editions)
-                        (cons 0 skip-counts)))]))]))
-  
-  (let ()
-    (define (check dis-in editions-in dis-expected editions-expected skip-expected)
-      (define-values (dis-got editions-got skip-got) (remove-adjacent-duplicates dis-in editions-in))
-      (unless (and (equal? dis-got dis-expected)
-                   (equal? editions-got editions-expected)
-                   (equal? skip-got skip-expected))
-        (eprintf "~s =\n  ~s, but expected\n  ~s\n\n"
-                 `(remove-adjacent-duplicates ',dis-in ',editions-in)
-                 `(values ',dis-got ',editions-got ',skip-got)
-                 `(values ',dis-expected ',editions-expected ',skip-expected))))
-    (check '() '() '() '() '())
-    (check '(1) '(2) '(1) '(2) '(0))
-    (check '(1 2 3) '(4 5 6) '(1 2 3) '(4 5 6) '(0 0 0))
-    (check '(1 1) '(2 3) '(1) '(3) '(1))
-    (check '(1 2) '(3 3) '(1 2) '(3 3) '(0 0))
-    (check '(1 2 2 3 4 4 3) '(a b c d e f g)
-           '(1 2 3 4 3) '(a c d f g) '(0 1 0 1 0))
-    (check '(1 2 2 2 2 2 3) '(a b c d e f g)
-           '(1 2 3) '(a f g) '(0 4 0)))
-    
-                 
-  
-  ;; show-frame : (instanceof editor-canvas%)
-  ;;              (instanceof text%) 
-  ;;              st-mark   // see format description at `with-mark`
-  ;;              def ints  // definitions and interactions texts
-  ;;              -> 
-  ;;              void 
-  ;; shows one frame of the continuation
-  (define (show-frame editor-canvas text di edition skip-count defs ints)
-    (let* ([debug-source (srcloc-source di)]
-           [fn (get-filename debug-source)]
-           [line (srcloc-line di)]
-           [column (srcloc-column di)]
-           [start (srcloc-position di)]
-           [span (srcloc-span di)]
-           [start-pos (send text last-position)])
-      
-      ;; make hyper link to the file
-      (send text insert (format "~a: ~a:~a" fn line column))
-      (let ([end-pos (send text last-position)])
-        (send text insert " ")
-        (send text change-style 
-              (gui-utils:get-clickback-delta (preferences:get 'framework:white-on-black?))
-              start-pos 
-              end-pos)
-        (send text set-clickback
-              start-pos end-pos
-              (λ (ed start end)
-                (open-and-highlight-in-file (list di) edition))))
-      
-      (unless (zero? skip-count)
-        (send text insert " skipped ")
-        (send text insert (number->string skip-count))
-        (send text insert " duplicate frame")
-        (unless (= skip-count 1)
-          (send text insert "s"))
-        (send text insert #\newline))
-      
-      (when (and start span)
-        (insert-context editor-canvas text debug-source start span defs ints)
-        (send text insert #\newline))))
-  
-  ;; insert-context : (instanceof editor-canvas%)
-  ;;                  (instanceof text%)
-  ;;                  debug-info
-  ;;                  number
-  ;;                  defs ints // definitions and interactions texts
-  ;;                  -> 
-  ;;                  void
-  (define (insert-context editor-canvas text file start span defs ints)
-    (define-values (from-text close-text)
-      (cond
-        [(and ints (send ints port-name-matches? file))
-         (values ints void)]
-        [(and defs (send defs port-name-matches? file))
-         (values defs void)]
-        [(path? file)
-         (define normalized-file
-           (with-handlers ((exn:fail? (λ (x) #f)))
-             (normal-case-path (normalize-path file))))
-         (cond
-           [(not normalized-file) (values #f void)]
-           [(send (group:get-the-frame-group)
-                  locate-file
-                  normalized-file)
-            =>
-            (λ (frame)
-              (cond
-                [(is-a? frame drracket:unit:frame%)
-                 (let loop ([tabs (send frame get-tabs)])
-                   (cond
-                     [(null? tabs) (values #f void)]
-                     [else
-                      (let* ([tab (car tabs)]
-                             [defs (send tab get-defs)])
-                        (if (with-handlers ((exn:fail? (λ (x) #f)))
-                              (equal? 
-                               (normalize-path (normal-case-path (send defs get-filename)))
-                               normalized-file))
-                            (values defs void)
-                            (loop (cdr tabs))))]))]
-                [(is-a? frame frame:editor<%>)
-                 (values (send frame get-editor) void)]
-                [else (values #f void)]))]
-           [(path? normalized-file)
-            (let ([text (new text:basic%)])
-              (if (send text load-file normalized-file)
-                  (values text 
-                          (λ () (send text on-close)))
-                  (values #f (λ () (void)))))]
-           [else
-            (values #f void)])]
-        [(is-a? file editor<%>)
-         (values file void)]
-        [else (values #f void)]))
-    (when from-text
-      (let* ([finish (+ start span -1)]
-             [context-text (copy/highlight-text from-text start finish)])
-        (send context-text lock #t)
-        (send context-text hide-caret #t)
-        (send text insert "  ")
-        (let ([snip (make-object editor-snip% context-text)])
-          (send snip use-style-background #t)
-          (send editor-canvas add-wide-snip snip)
-          (let ([p (send text last-position)])
-            (send text insert snip p p)
-            (send text insert #\newline)
-            (when (preferences:get 'framework:white-on-black?)
-              (send text change-style white-on-black-style p (+ p 1))))))
-      (close-text)))
-  
-  (define white-on-black-style (make-object style-delta%))
-  (define stupid-internal-define-syntax1 (send white-on-black-style set-delta-foreground "white"))
-  
-  ;; copy/highlight-text : text number number -> text
-  ;; copies the range from `start' to `finish', including the entire paragraph at
-  ;; each end and highlights the characters corresponding the original range,
-  ;; in the resulting text
-  (define (copy/highlight-text from-text start finish)
-    (let* ([to-text (new text:standard-style-list%)]
-           [para-start-pos (send from-text paragraph-start-position 
-                                 (send from-text position-paragraph start))]
-           [para-end-pos (send from-text paragraph-end-position
-                               (send from-text position-paragraph 
-                                     finish))]
-           [from-start (- start para-start-pos)]
-           [from-end (+ from-start (- finish start))])
-      (send from-text split-snip para-start-pos)
-      (send from-text split-snip para-end-pos)
-      (let loop ([snip (send from-text find-snip para-start-pos 'after-or-none)])
-        (when (and snip
-                   (< (send from-text get-snip-position snip) para-end-pos))
-          (send to-text insert (send snip copy))
-          (loop (send snip next))))
-      (send to-text highlight-range (max 0 (- from-start 1)) from-end (get-error-color) #f 'high)
-      to-text))
-  
-  ;; get-filename : debug-source -> string
-  (define (get-filename file)
-    (cond
-      [(symbol? file) (symbol->string file)]
-      [(path? file) (path->string file)]
-      [(is-a? file editor<%>)
-       (get-filename-from-editor file)]))
-  
-  ;; get-filename-from-editor : (is-a?/c editor<%>) -> string
-  (define (get-filename-from-editor editor)
-    (let* ([untitled (string-constant unknown-debug-frame)]
-           [canvas (send editor get-canvas)]
-           [frame (and canvas (send canvas get-top-level-window))])
-      (if (is-a? frame drracket:unit:frame%)
-          (let ([filename (send (send frame get-definitions-text) get-filename)])
-            (cond
-              [(and filename (eq? editor (send frame get-interactions-text)))
-               (format (string-constant files-interactions) filename)]
-              [(eq? editor (send frame get-interactions-text))
-               (string-constant current-interactions)]
-              [filename filename]
-              [else (string-constant current-definitions)]))
-          (or (send editor get-filename) 
-              untitled))))
-  
-  ;; open-and-highlight-in-file : (or/c srcloc (listof srcloc)) -> void
-  (define (open-and-highlight-in-file raw-srcloc [edition-pair #f])
-    (let* ([srclocs (if (srcloc? raw-srcloc) (list raw-srcloc) raw-srcloc)]
-           [sources (filter values (map srcloc-source srclocs))])
-      (unless (null? sources)
-        (let* ([debug-source (car sources)]
-               [same-src-srclocs
-                (filter (λ (x) (eq? debug-source (srcloc-source x)))
-                        srclocs)]
-               [frame (cond
-                        [(path? debug-source) (handler:edit-file debug-source)]
-                        [(and (symbol? debug-source)
-                              (text:lookup-port-name debug-source))
-                         =>
-                         (lambda (editor)
-                           (get-enclosing-editor-frame editor))]
-                        [else #f])]
-               [editor (cond
-                         [(path? debug-source)
-                          (cond
-                            [(and frame (is-a? frame drracket:unit:frame%))
-                             (send frame get-definitions-text)]
-                            [(and frame (is-a? frame frame:editor<%>))
-                             (send frame get-editor)]
-                            [else #f])]
-                         [(and (symbol? debug-source)
-                               (text:lookup-port-name debug-source))
-                          =>
-                          values]
-                         [else #f])]
-               [rep (and (is-a? frame drracket:unit:frame%)
-                         (send frame get-interactions-text))])
-          (when frame
-            (send frame show #t))
-          (when (and edition-pair
-                     (let ([wbv (weak-box-value (car edition-pair))])
-                       (and wbv (eq? editor wbv))))
-            (unless (= (cdr edition-pair) (send editor get-edition-number))
-              (message-box (string-constant drscheme)
-                           (string-constant editor-changed-since-srcloc-recorded)
-                           frame
-                           '(ok caution)
-                           #:dialog-mixin frame:focus-table-mixin)))
-          (when (and rep editor)
-            (when (is-a? editor text:basic<%>)
-              (send rep highlight-errors same-src-srclocs '())
-              (send editor set-caret-owner #f 'global)))))))
-  
-  
-  
-  
-  ;                                                                                      
-  ;                                                                                      
-  ;                                                                                      
-  ;                                                                                      
-  ;                                                                                      
-  ;   ;                  ;                                                               
-  ;  ;;;;   ;;;    ;;;  ;;;;       ;;;    ;;;   ;     ;  ;;;   ; ;  ;;;     ;; ;    ;;;  
-  ;   ;    ;   ;  ;      ;        ;   ;  ;   ;   ;   ;  ;   ;  ;;  ;   ;   ;  ;;   ;   ; 
-  ;   ;   ;    ;  ;;     ;       ;      ;     ;  ;   ; ;    ;  ;       ;  ;    ;  ;    ; 
-  ;   ;   ;;;;;;   ;;    ;       ;      ;     ;   ; ;  ;;;;;;  ;    ;;;;  ;    ;  ;;;;;; 
-  ;   ;   ;          ;   ;       ;      ;     ;   ; ;  ;       ;   ;   ;  ;    ;  ;      
-  ;   ;    ;         ;   ;        ;   ;  ;   ;     ;    ;      ;   ;   ;   ;  ;;   ;     
-  ;    ;;   ;;;;  ;;;     ;;       ;;;    ;;;      ;     ;;;;  ;    ;;;;;   ;; ;    ;;;; 
-  ;                                                                            ;         
-  ;                                                                       ;    ;         
-  ;                                                                        ;;;;          
-  
-  
-  (define test-coverage-enabled (make-parameter #f))
-  
-  (define current-test-coverage-info (make-thread-cell #f))
-  
-  (define (initialize-test-coverage-point expr)
-    (unless (hash? (thread-cell-ref current-test-coverage-info))
-      (let ([rep (drracket:rep:current-rep)])
-        (when rep
-          (let ([ut (eventspace-handler-thread (send rep get-user-eventspace))])
-            (when (eq? ut (current-thread))
-              (let ([ht (make-hasheq)])
-                (thread-cell-set! current-test-coverage-info ht)
-                (send rep set-test-coverage-info ht)))))))
-    (let ([ht (thread-cell-ref current-test-coverage-info)])
-      (when (hash? ht)
-        ;; if rep isn't around, we don't do test coverage...
-        ;; this can happen when check syntax expands, for example
-        (hash-set! ht expr #;(box #f) (mcons #f #f)))))
-  
-  (define (test-covered expr)
-    (let ([ht (thread-cell-ref current-test-coverage-info)])
-      (and (hash? ht) ;; as in the `when' test in `initialize-test-coverage-point'
-           (let ([v (hash-ref ht expr #f)])
-             ;; (and v (λ () (set-box! v #t)))
-             (and v (with-syntax ([v v]) #'(#%plain-app set-mcar! v #t)))))))
-  
-  (define test-coverage-interactions-text<%>
-    (interface ()
-      set-test-coverage-info
-      get-test-coverage-info))
-  
-  (define test-coverage-tab<%>
-    (interface ()
-      show-test-coverage-annotations ;; hash-table (union #f style) (union #f style) boolean -> void
-      get-test-coverage-info-visible?
-      ask-about-clearing-test-coverage?))
-  
-  (define test-coverage-interactions-text-mixin
-    (mixin (drracket:rep:text<%> text:basic<%>) (test-coverage-interactions-text<%>)
-      (inherit get-context)
-      (field [test-coverage-info #f]
-             [test-coverage-on-style #f]
-             [test-coverage-off-style #f]
-             [ask-about-reset? #f])
-      (define/public set-test-coverage-info
-        (λ (ht [on-style #f] [off-style #f] [ask? #t])
-          (set! test-coverage-info ht)
-          (set! test-coverage-on-style on-style)
-          (set! test-coverage-off-style off-style)
-          (set! ask-about-reset? ask?)))
-      (define/public (get-test-coverage-info) 
-        test-coverage-info)
-      
-      (inherit get-top-level-window)
-      (define/augment (after-many-evals)
-        (when test-coverage-info
-          (send (get-context) show-test-coverage-annotations
-                test-coverage-info
-                test-coverage-on-style
-                test-coverage-off-style
-                ask-about-reset?))
-        (inner (void) after-many-evals))
-      
-      (super-new)))
-  
-  (define test-coverage-definitions-text-mixin
-    (mixin ((class->interface text%) drracket:unit:definitions-text<%>) ()
-      (inherit get-canvas get-tab)
-      
-      (define/private (clear-test-coverage?)
-        (if (preferences:get 'drracket:test-coverage-ask-about-clearing?)
-            (let ([msg-box-result
-                   (message-box/custom
-                    (string-constant drscheme)
-                    (string-constant test-coverage-clear?)
-                    (string-constant yes)
-                    (string-constant no)
-                    (string-constant test-coverage-clear-and-do-not-ask-again)
-                    (send (get-canvas) get-top-level-window)
-                    '(default=1)
-                    2
-                    #:dialog-mixin frame:focus-table-mixin)])
-              (case msg-box-result
-                [(1) #t]
-                [(2) #f]
-                [(3)
-                 (preferences:set 'drracket:test-coverage-ask-about-clearing? #f)
-                 #t]))
-            #t))
-      
-      (define/public (clear-test-coverage)
-        (let ([tab (get-tab)])
-          (when (send tab get-test-coverage-info-visible?)
-            (send tab clear-test-coverage-display)
-            (let ([it (send tab get-ints)])
-              (when (is-a? it test-coverage-interactions-text<%>)
-                (send it set-test-coverage-info #f))))))
-      
-      (define/private (can-clear-coverage?)
-        (let ([tab (get-tab)])
-          (or (not tab)
-              (not (send tab get-test-coverage-info-visible?))
-              (not (send tab ask-about-clearing-test-coverage?))
-              (clear-test-coverage?))))
-      
-      (define/augment (can-insert? x y)
-        (and (inner #t can-insert? x y)
-             (can-clear-coverage?)))
-      
-      (define/augment (can-delete? x y)
-        (and (inner #t can-delete? x y)
-             (can-clear-coverage?)))
-      
-      (define/augment (after-insert x y)
-        (inner (void) after-insert x y)
-        (clear-test-coverage))
-      
-      (define/augment (after-delete x y)
-        (inner (void) after-delete x y)
-        (clear-test-coverage))
-      
-      (super-new)))
-  
-  (define test-coverage-on-style-name "plt:module-language:test-coverage-on")
-  (define test-coverage-off-style-name "plt:module-language:test-coverage-off")
-  
-  (define erase-test-coverage-style-delta (make-object style-delta% 'change-normal-color))
-  (send erase-test-coverage-style-delta set-transparent-text-backing-on #t)
-  
-  (define test-coverage-tab-mixin
-    (mixin (drracket:rep:context<%> drracket:unit:tab<%>) (test-coverage-tab<%>)
-      
-      (field [internal-clear-test-coverage-display #f])
-      
-      (define/public (clear-test-coverage-display)
-        (when internal-clear-test-coverage-display
-          (internal-clear-test-coverage-display)
-          (set! internal-clear-test-coverage-display #f)))
-      
-      (field [ask-about-reset? #t])
-      (define/public (ask-about-clearing-test-coverage?) ask-about-reset?)
-      
-      (define/public (get-test-coverage-info-visible?)
-        (not (not internal-clear-test-coverage-display)))
-      
-      (define/public (show-test-coverage-annotations ht on-style off-style ask?)
-        (set! ask-about-reset? ask?)
-        (let* ([edit-sequence-ht (make-hasheq)]
-               [locked-ht (make-hasheq)]
-               [already-frozen-ht (make-hasheq)]
-               [actions-ht (make-hash)]
-               
-               [port-name-cache (make-hasheq)]
-               
-               ;; can-annotate : (listof (list boolean srcloc))
-               ;; boolean is #t => code was run
-               ;;            #f => code was not run
-               ;; remove those that cannot be annotated
-               [can-annotate
-                (filter values
-                        (hash-map ht
-                          (λ (stx covered?)
-                            (and (syntax? stx)
-                                 (let ([src (syntax-source stx)]
-                                       [pos (syntax-position stx)]
-                                       [span (syntax-span stx)])
-                                   (and pos
-                                        span
-                                        (hash-ref! port-name-cache src
-                                                   (λ () (send (get-defs) port-name-matches? src)))
-                                        (list (mcar covered?)
-                                              (make-srcloc (get-defs) #f #f pos span))))))))]
-               
-               ;; filtered : (listof (list boolean srcloc))
-               ;; remove redundant expressions
-               [filtered
-                (let (;; actions-ht : (list src number number) -> (list boolean syntax)
-                      [actions-ht (make-hash)])
-                  (for-each
-                   (λ (pr)
-                     (let* ([on? (list-ref pr 0)]
-                            [key (list-ref pr 1)]
-                            [old (hash-ref actions-ht key 'nothing)])
-                       (cond
-                         [(eq? old 'nothing) (hash-set! actions-ht key on?)]
-                         [old ;; recorded as executed
-                          (void)]
-                         [(not old) ;; recorded as unexected
-                          (when on?
-                            (hash-set! actions-ht key #t))])))
-                   can-annotate)
-                  (hash-map actions-ht (λ (k v) (list v k))))])
-          
-          ;; if everything is covered *and* no coloring has been done, do no coloring.
-          (unless (and (andmap car filtered)
-                       (not (get-test-coverage-info-visible?)))
-            
-            (let (;; sorted : (listof (list boolean srcloc))
-                  ;; sorting predicate:
-                  ;;  x < y if
-                  ;;    x's span is bigger than y's (ie, do larger expressions first)
-                  ;;    unless x and y are the same source location.
-                  ;;    in that case, color red first and then green
-                  [sorted
-                   (sort
-                    filtered
-                    (λ (x y)
-                      (let* ([x-on (list-ref x 0)]
-                             [y-on (list-ref y 0)]
-                             [x-srcloc (list-ref x 1)]
-                             [y-srcloc (list-ref y 1)]
-                             [x-pos (srcloc-position x-srcloc)]
-                             [y-pos (srcloc-position y-srcloc)]
-                             [x-span (srcloc-span x-srcloc)]
-                             [y-span (srcloc-span y-srcloc)])
-                        (cond
-                          [(and (= x-pos y-pos)
-                                (= x-span x-span))
-                           (or y-on
-                               (not x-on))]
-                          [else (>= x-span y-span)]))))])
-              
-              ;; turn on edit-sequences in all editors to be touched by new annotations
-              ;; also fill in the edit-sequence-ht
-              (for-each
-               (λ (pr)
-                 (let ([src (srcloc-source (list-ref pr 1))])
-                   (hash-ref 
-                    edit-sequence-ht
-                    src
-                    (λ ()
-                      (hash-set! edit-sequence-ht src #f)
-                      (send src begin-edit-sequence #f #f)
-                      (when (send src is-locked?)
-                        (hash-set! locked-ht src #t)
-                        (send src lock #f))))))
-               sorted)
-              
-              ;; clear out old annotations (and thaw colorers)
-              (when internal-clear-test-coverage-display
-                (internal-clear-test-coverage-display)
-                (set! internal-clear-test-coverage-display #f))
-              
-              ;; freeze the colorers, but avoid a second freeze (so we can avoid a second thaw)
-              (hash-for-each
-               edit-sequence-ht
-               (λ (src _)
-                 (if (send src is-frozen?)
-                     (hash-set! already-frozen-ht src #t)
-                     (send src freeze-colorer))))
-              
-              ;; set new annotations
-              (for-each
-               (λ (pr)
-                 (let ([on? (list-ref pr 0)]
-                       [srcloc (list-ref pr 1)])
-                   (let* ([src (srcloc-source srcloc)]
-                          [pos (srcloc-position srcloc)]
-                          [span (srcloc-span srcloc)])
-                     (send src change-style
-                           (if on?
-                               (or on-style 
-                                   (send (editor:get-standard-style-list)
-                                         find-named-style 
-                                         test-coverage-on-style-name))
-                               (or off-style 
-                                   (send (editor:get-standard-style-list)
-                                         find-named-style 
-                                         test-coverage-off-style-name)))
-                           (- pos 1)
-                           (+ (- pos 1) span)
-                           #f))))
-               sorted)
-              
-              ;; relock editors
-              (hash-for-each 
-               locked-ht
-               (λ (txt _) (send txt lock #t)))
-              
-              ;; end edit sequences
-              (hash-for-each 
-               edit-sequence-ht
-               (λ (txt _) (send txt end-edit-sequence)))
-              
-              ;; save thunk to reset these new annotations
-              (set! internal-clear-test-coverage-display
-                    (λ ()
-                      (hash-for-each
-                       edit-sequence-ht
-                       (λ (txt _) 
-                         (send txt begin-edit-sequence #f #f)))
-                      (hash-for-each
-                       edit-sequence-ht
-                       (λ (txt _) 
-                         (let ([locked? (send txt is-locked?)])
-                           (when locked? (send txt lock #f))
-                           (send txt change-style 
-                                 erase-test-coverage-style-delta
-                                 0
-                                 (send txt last-position)
-                                 #f)
-                           (when locked? (send txt lock #t)))))
-                      (hash-for-each
-                       edit-sequence-ht
-                       (λ (txt _) 
-                         (unless (hash-ref already-frozen-ht txt #f)
-                           (let ([locked? (send txt is-locked?)])
-                             (when locked? (send txt lock #f))
-                             (send txt thaw-colorer)
-                             (when locked? (send txt lock #t))))
-                         (send txt end-edit-sequence)))))))))
-      
-      (inherit get-defs)
-      (define/augment (clear-annotations)
-        (inner (void) clear-annotations)
-        (send (get-defs) clear-test-coverage))
-      
-      (super-new)))
-  
-  
-  
-  
-  
-  ;                                                                 
-  ;                                                                 
-  ;                           ;;;        ;;;                        
-  ;                          ;      ;      ;      ;                 
-  ;                          ;             ;                        
-  ;   ; ;;   ; ;;;   ;;;   ;;;;;; ;;;      ;    ;;;    ; ;;    ;; ; 
-  ;   ;;  ;  ;;  ;  ;   ;    ;      ;      ;      ;    ;;  ;  ;  ;; 
-  ;   ;   ;  ;      ;   ;    ;      ;      ;      ;    ;   ;  ;   ; 
-  ;   ;   ;  ;      ;   ;    ;      ;      ;      ;    ;   ;  ;   ; 
-  ;   ;   ;  ;      ;   ;    ;      ;      ;      ;    ;   ;  ;   ; 
-  ;   ;;  ;  ;      ;   ;    ;      ;      ;      ;    ;   ;  ;  ;; 
-  ;   ; ;;   ;       ;;;     ;      ;      ;      ;    ;   ;   ;; ; 
-  ;   ;                                                           ; 
-  ;   ;                                                        ;;;  
-  ;                                                                 
-  
-  
-  (define profile-key (gensym))
-  
-  ;; prof-info =
-  ;; (make-prof-info
-  ;;    boolean ;; protect against nested calls
-  ;;    number[number of calls]
-  ;;    number[time spent in all calls]
-  ;;   (union #f symbol) 
-  ;;   expression)
-  (define-struct prof-info (nest num time name expr) #:mutable)
-  
-  ;; copy-prof-info : prof-info -> prof-info
-  (define (copy-prof-info prof-info)
-    (make-prof-info (prof-info-nest prof-info)
-                    (prof-info-num prof-info)
-                    (prof-info-time prof-info)
-                    (prof-info-name prof-info)
-                    (prof-info-expr prof-info)))
-  
-  ;; any-info? : prof-info -> boolean
-  (define (any-info? prof-info)
-    (or (not (zero? (prof-info-num prof-info)))
-        (not (zero? (prof-info-time prof-info)))))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; profiling runtime support
-  
-  ;; parameter
-  ;; imported into errortrace
-  (define profiling-enabled (make-parameter #f))
-  
-  ;; holds a hash-table for the profiling information
-  (define current-profile-info (make-thread-cell #f))
-  
-  
-  ;; initialize-profile-point : sym syntax syntax -> void
-  ;; called during compilation to register this point as
-  ;; a profile point. 
-  ;; =User=
-  ;; imported into errortrace
-  (define (initialize-profile-point key name expr)
-    (unless (thread-cell-ref current-profile-info)
-      (let ([rep (drracket:rep:current-rep)])
-        (when rep
-          (let ([ut (eventspace-handler-thread (send rep get-user-eventspace))])
-            (when (eq? ut (current-thread))
-              (let ([ht (make-hasheq)])
-                (thread-cell-set! current-profile-info ht)
-                (send (send rep get-context) add-profile-info ht)))))))
-    (let ([profile-info (thread-cell-ref current-profile-info)])
-      (when profile-info
-        (hash-set! profile-info
-                   key 
-                   (make-prof-info #f 0 0 (and (syntax? name) (syntax-e name)) expr))))
-    (void))
-  
-  ;; register-profile-start : sym -> (union #f number)
-  ;; =User=
-  ;; imported into errortrace
-  (define (register-profile-start key)
-    (let ([ht (thread-cell-ref current-profile-info)])
-      (when ht
-        (let ([info (hash-ref ht key)])
-          (set-prof-info-num! info (+ (prof-info-num info) 1))
-          (if (prof-info-nest info)
-              #f
-              (begin
-                (set-prof-info-nest! info #t)
-                (current-process-milliseconds)))))))
-  
-  ;; register-profile-done : sym (union #f number) -> void
-  ;; =User=
-  ;; imported into errortrace
-  (define (register-profile-done key start)
-    (when start
-      (let ([ht (thread-cell-ref current-profile-info)])
-        (when ht
-          (let ([info (hash-ref ht key)])
-            (set-prof-info-nest! info #f)
-            (set-prof-info-time! info
-                                 (+ (- (current-process-milliseconds) start)
-                                    (prof-info-time info)))))))
-    (void))
-  
-  (define (get-color-value/pref val max-val 
-                                drracket:profile:low-color
-                                drracket:profile:high-color
-                                drracket:profile:scale)
-    (let* ([adjust
-            (case drracket:profile:scale
-              [(sqrt) sqrt]
-              [(square) (λ (x) (* x x))]
-              [(linear) (λ (x) x)])]
-           [factor (adjust (if (zero? max-val) 0 (/ val max-val)))]
-           [get-rgb-value
-            (λ (sel)
-              (let ([small (sel drracket:profile:low-color)]
-                    [big (sel drracket:profile:high-color)])
-                (inexact->exact (floor (+ (* factor (- big small)) small)))))])
-      (make-object color% 
-        (get-rgb-value (λ (x) (send x red)))
-        (get-rgb-value (λ (x) (send x green)))
-        (get-rgb-value (λ (x) (send x blue))))))
-  
-  ;; get-color-value : number number -> (is-a?/c color%)
-  ;; returns the profiling color
-  ;; for `val' if `max-val' is the largest
-  ;; of any profiling amount.
-  (define (get-color-value val max-val)
-    (get-color-value/pref val 
-                          max-val
-                          (preferences:get 'drracket:profile:low-color)
-                          (preferences:get 'drracket:profile:high-color)
-                          (preferences:get 'drracket:profile:scale)))
-  
-  ;; extract-maximum : (listof prof-info) -> number
-  ;; gets the maximum value of the currently preferred profiling info.
-  (define (extract-maximum infos)
-    (let ([max-value 0]
-          [sel (if (eq? (preferences:get 'drracket:profile-how-to-count) 'time)
-                   prof-info-time
-                   prof-info-num)])
-      (for-each
-       (λ (val)
-         (set! max-value (max max-value (sel val))))
-       infos)
-      max-value))
-  
-  ;; profile-definitions-mixin : mixin
-  (define profile-definitions-text-mixin
-    (mixin ((class->interface text%) drracket:unit:definitions-text<%>) ()
-      (inherit get-canvas get-tab)
-      
-      (define/augment (can-insert? x y)
-        (and (inner #t can-insert? x y)
-             (can-reset-profile?)))
-      
-      (define/augment (can-delete? x y)
-        (and (inner #t can-delete? x y)
-             (can-reset-profile?)))
-      
-      (define/augment (on-insert x y)
-        (inner (void) on-insert x y)
-        (do-reset-profile))
-      
-      (define/augment (on-delete x y)
-        (inner (void) on-delete x y)
-        (do-reset-profile))
-      
-      (define/private (can-reset-profile?)
-        (let ([canvas (get-canvas)])
-          (or (not canvas)
-              (let ([frame (send canvas get-top-level-window)])
-                (or (not (send frame get-profile-info-visible?))
-                    (eq? (message-box (string-constant drscheme)
-                                      (string-constant profiling-clear?)
-                                      frame
-                                      '(yes-no)
-                                      #:dialog-mixin frame:focus-table-mixin)
-                         'yes))))))
-      
-      (define/private (do-reset-profile)
-        (send (get-tab) reset-profile))
-      
-      (super-new)))
-  
-  (define profile-interactions-tab<%>
-    (interface ()
-      add-profile-info))
-  
-  (define-local-member-name 
-    
-    ;; tab methods
-    reset-profile  ;; erases profile display & information
-    hide-profile  ;; hides profiling info, but it is still here to be shown again
-    show-profile  ;; shows the profile info, if there is any to show
-    refresh-profile ;; shows current info in profile window
-    get-profile-info-text
-    can-show-profile?
-    get-sort-mode ;; indicates if the results are currently shown sorted by time, or not
-    set-sort-mode ;; updates the sort mode flag (only called by the gui control callback)
-    
-    ;; frame methods
-    hide-profile-gui
-    show-profile-gui
-    
-    ;; frame and tab methods
-    get-profile-info-visible?
-    ; on frame, indicates if the gui stuff shows up currently
-    ; on tab, indicates if the user has asked for the gui to show up.
-    )
-  
-  (define profile-tab-mixin
-    (mixin (drracket:unit:tab<%>) (profile-interactions-tab<%>)
-      (define profile-info-visible? #f)
-      (define/public (get-profile-info-visible?) profile-info-visible?)
-      
-      (define sort-mode (preferences:get 'drracket:profile-how-to-count))
-      (define/public (get-sort-mode) sort-mode)
-      (define/public (set-sort-mode mode) (set! sort-mode mode))
-      
-      (inherit get-frame is-current-tab? get-defs)
-      ;; profile-info : (listof hashtable[symbol -o> prof-info])
-      (define profile-info '())
-      (define/public (add-profile-info ht) (set! profile-info (cons ht profile-info)))
-      
-      (define/public (show-profile)
-        (unless profile-info-visible?
-          (set! profile-info-visible? #t)
-          (send (get-frame) show-profile-gui)))
-      
-      (define/public (hide-profile)
-        (when profile-info-visible?
-          (set! profile-info-visible? #f)
-          (send profile-info-text clear-profile-display)
-          (when (is-current-tab?)
-            (send (get-frame) hide-profile-gui))))
-      
-      (define/public (reset-profile)
-        (hide-profile)
-        (set! profile-info '()))
-      
-      (define/public (refresh-profile) 
-        (send profile-info-text refresh-profile profile-info (get-defs)))
-      
-      ;; can-show-profile? : -> boolean
-      ;; indicates if there is any profiling information to be shown.
-      (define/public (can-show-profile?)
-        (let/ec esc-k
-          (for-each
-           (λ (ht)
-             (hash-for-each
-              ht
-              (λ (key v)
-                (when (any-info? v)
-                  (esc-k #t)))))
-           profile-info)
-          #f))
-      
-      (define profile-info-text (new profile-text% (tab this)))
-      (define/public (get-profile-info-text) profile-info-text)
-      
-      (define/augment (clear-annotations)
-        (inner (void) clear-annotations)
-        (reset-profile))
-      
-      (super-new)))
-  
-  ;; profile-unit-frame-mixin : mixin
-  ;; adds profiling to the unit frame
-  (define profile-unit-frame-mixin
-    (mixin (drracket:unit:frame<%> drracket:frame:<%>) ()
-      
-      (inherit get-interactions-text get-current-tab set-show-menu-sort-key)
-      
-      ;; update-shown : -> void
-      ;; updates the state of the profile item's show menu
-      (define/override (update-shown)
-        (super update-shown)
-        (send show-profile-menu-item set-label
-              (if profile-info-visible?
-                  (string-constant profiling-hide-profile)
-                  (string-constant profiling-show-profile))))
-      
-      ;; add-show-menu-items : menu -> void
-      ;; adds the show profile menu item
-      (define/override (add-show-menu-items show-menu)
-        (super add-show-menu-items show-menu)
-        (set! show-profile-menu-item 
-              (instantiate menu:can-restore-menu-item% ()
-                (label (string-constant profiling-hide-profile))
-                (parent show-menu)
-                (callback
-                 (λ (x y)
-                   (show-profile-menu-callback)))))
-        (set-show-menu-sort-key show-profile-menu-item 207))
-      
-      (define show-profile-menu-item #f)
-      (define profile-gui-constructed? #f)
-      
-      ;; get-profile-info-visible? : -> boolean
-      ;; returns #t when the profiling information is visible in the frame.
-      (define/public (get-profile-info-visible?) profile-info-visible?)
-      
-      (field [profile-info-outer-panel #f])
-      (define/override (make-root-area-container % parent)
-        (set! profile-info-outer-panel
-              (super make-root-area-container
-                     panel:vertical-dragable%
-                     parent))
-        (make-object % profile-info-outer-panel))
-      
-      (define/private (show-profile-menu-callback)
-        (cond
-          [profile-info-visible?
-           (send (get-current-tab) hide-profile)]
-          [(send (get-current-tab) can-show-profile?)
-           (send (get-current-tab) show-profile)
-           (send (get-current-tab) refresh-profile)]
-          [else
-           (message-box (string-constant drscheme)
-                        (string-constant profiling-no-information-available)
-                        #:dialog-mixin frame:focus-table-mixin)]))
-      
-      (define/public (hide-profile-gui)
-        (when profile-gui-constructed?
-          (when profile-info-visible?
-            (send profile-info-outer-panel change-children
-                  (λ (l)
-                    (remq profile-info-panel l)))
-            (set! profile-info-visible? #f)
-            (update-shown))))
-      
-      (define/public (show-profile-gui)
-        (unless profile-info-visible?
-          (construct-profile-gui)
-          (send profile-info-outer-panel change-children
-                (λ (l)
-                  (append (remq profile-info-panel l)
-                          (list profile-info-panel))))
-          (set! profile-info-visible? #t)
-          (send profile-info-editor-canvas set-editor (send (get-current-tab) get-profile-info-text))
-          (send (get-current-tab) refresh-profile)
-          ;; set to a small percentage so it gets the minimum height
-          (send profile-info-outer-panel set-percentages '(9/10 1/10))
-          (update-shown)))
-      
-      (field (profile-info-visible? #f))
-      
-      (define/augment (on-tab-change from-tab to-tab)
-        (inner (void) on-tab-change from-tab to-tab)
-        (cond
-          [(and (not profile-info-visible?)
-                (send to-tab get-profile-info-visible?))
-           (show-profile-gui)]
-          [(and profile-info-visible?
-                (not (send to-tab get-profile-info-visible?)))
-           (hide-profile-gui)])
-        (when profile-choice
-          (send profile-choice set-selection
-                (profile-mode->selection
-                 (send to-tab get-sort-mode))))
-        (when profile-info-editor-canvas
-          (send profile-info-editor-canvas set-editor 
-                (and (send to-tab can-show-profile?)
-                     (send to-tab get-profile-info-text)))))
-      
-      (super-new)
-      
-      (define profile-info-panel #f)
-      (define profile-info-editor-canvas #f)
-      (define profile-choice #f)
-      
-      (inherit begin-container-sequence end-container-sequence)
-      (define/private (construct-profile-gui)
-        (unless profile-gui-constructed?
-          (set! profile-gui-constructed? #t)
-          (begin-container-sequence)
-          (set! profile-info-panel (instantiate horizontal-panel% ()
-                                     (parent profile-info-outer-panel)
-                                     (stretchable-height #f)))
-          (define profile-left-side (instantiate vertical-panel% (profile-info-panel)))
-          (set! profile-info-editor-canvas 
-                (new canvas:basic% 
-                     (parent profile-info-panel)
-                     (editor (send (get-current-tab) get-profile-info-text))))
-          (define profile-message (instantiate message% ()
-                                    (label (string-constant profiling))
-                                    (parent profile-left-side)))
-          (set! profile-choice (new radio-box%
-                                    (label #f)
-                                    (parent profile-left-side)
-                                    (callback
-                                     (λ (x y)
-                                       (define mode
-                                         (profile-selection->mode 
-                                          (send profile-choice get-selection)))
-                                       (preferences:set 'drracket:profile-how-to-count mode)
-                                       (send (get-current-tab) set-sort-mode mode)
-                                       (send (get-current-tab) refresh-profile)))
-                                    (choices (list (string-constant profiling-time)
-                                                   (string-constant profiling-number)))))
-          (send profile-choice set-selection
-                (case (preferences:get 'drracket:profile-how-to-count)
-                  [(time) 0]
-                  [(count) 1]))
-          (define update-profile-button
-            (instantiate button% ()
-              (label (string-constant profiling-update))
-              (parent profile-left-side)
-              (callback
-               (λ (x y)
-                 (send (get-current-tab) refresh-profile)))))
-          (define hide-profile-button 
-            (instantiate button% ()
-              (label (string-constant profiling-hide-profile))
-              (parent profile-left-side)
-              (callback
-               (λ (x y)
-                 (send (get-current-tab) hide-profile)))))
-          (send profile-choice set-selection 
-                (profile-mode->selection (preferences:get 'drracket:profile-how-to-count)))
-          
-          (send profile-left-side stretchable-width #f)
-          
-          (let ([wid (max (send update-profile-button get-width)
-                          (send hide-profile-button get-width)
-                          (send profile-choice get-width)
-                          (send profile-message get-width))])
-            (send update-profile-button min-width wid)
-            (send hide-profile-button min-width wid)
-            (send profile-choice min-width wid))
-          (send profile-left-side set-alignment 'left 'center)
-            
-          ;; hide profiling info initially, but reflow the container
-          ;; so that the invisible children get the right size.
-          (send this reflow-container)
-          (send profile-info-outer-panel change-children
-                (λ (l)
-                  (remq profile-info-panel l)))
-          (end-container-sequence)))))
-  
-  (define (profile-selection->mode sel)
-    (case sel
-      [(0) 'time]
-      [(1) 'count]))
-  
-  (define (profile-mode->selection mode)
-    (case mode
-      [(time) 0]
-      [(count) 1]))
-  
-  ;; profile-text% : extends text:basic%
-  ;; this class keeps track of a single thread's
-  ;; profiling information. these methods are not
-  ;; to be called directly, but only by the frame class, since
-  ;; they do not completely implement the abstraction for the
-  ;; GUI. They only manage the profiling information reported
-  ;; in the bottom window
-  (define profile-text% 
-    (class text:line-spacing%
-      (init-field tab)
-      
-      ;; clear-profile-display : -> void
-      ;; clears out the GUI showing the profile results
-      (define/public (clear-profile-display)
-        (begin-edit-sequence #t #f)
-        (let ([locked? (is-locked?)])
-          (lock #f)
-          (clear-old-results)
-          (erase)
-          (lock locked?)
-          (end-edit-sequence)))
-      
-      (inherit lock is-locked?
-               get-canvas hide-caret get-snip-location
-               begin-edit-sequence end-edit-sequence 
-               erase insert)
-      
-      ;; clear-old-results : -> void
-      ;; removes the profile highlighting
-      (field [clear-old-results void])
-      
-      ;; refresh-profile : (listof hashtable[...]) text% -> void
-      ;; does the work to erase any existing profile info
-      ;; and make new profiling info.
-      (define/public (refresh-profile profile-info definitions-text)
-        (begin-edit-sequence #t #f)
-        (lock #f)
-        (erase)
-        (clear-old-results)
-        (define infos '())
-        (let loop ([profile-info profile-info])
-          (cond
-            [(null? profile-info) (void)]
-            [else 
-             (let ([ht (car profile-info)])
-               (hash-for-each
-                ht
-                (λ (key val)
-                  (when (any-info? val)
-                    (set! infos (cons (copy-prof-info val) infos))))))
-             (loop (cdr profile-info))]))
-        
-        ;; each editor that gets some highlighting is put
-        ;; into this table and an edit sequence is begun for it.
-        ;; after all ranges are updated, the edit sequences are all closed.
-        (define in-edit-sequence (make-hasheq))
-        (define clear-highlight void)
-        (define max-value (extract-maximum infos))
-        
-        (define port-name-matches-cache (make-hasheq))
-        (define (show-highlight info)
-          (define expr (prof-info-expr info))
-          (define src 
-            (and (syntax-source expr)
-                 definitions-text
-                 (hash-ref! port-name-matches-cache
-                            (syntax-source expr)
-                            (λ () (send definitions-text port-name-matches? (syntax-source expr))))))
-          (define pos (syntax-position expr))
-          (define span (syntax-span expr))
-          (when (and (is-a? src text:basic<%>)
-                     (number? pos)
-                     (number? span))
-            (unless (hash-ref in-edit-sequence src (λ () #f))
-              (hash-set! in-edit-sequence src #t)
-              (send src begin-edit-sequence #t #f))
-            (let* ([color (get-color-value 
-                           (if (eq? (preferences:get 'drracket:profile-how-to-count) 'time)
-                               (prof-info-time info)
-                               (prof-info-num info))
-                           max-value)]
-                   [clr (send src highlight-range (- pos 1) (+ pos span -1) color)])
-              (let ([old-thnk clear-highlight])
-                (set! clear-highlight
-                      (λ ()
-                        (clr)
-                        (old-thnk)))))))
-        (define (smaller-range? x y)
-          (let ([x-span (syntax-span (prof-info-expr x))]
-                [y-span (syntax-span (prof-info-expr y))])
-            (if (and x-span y-span)
-                (< x-span y-span)
-                #f)))
-        
-        (define (show-line info newline? highlight-line?)
-          (let* ([expr (prof-info-expr info)]
-                 [expr-src (syntax-source expr)]
-                 [count (prof-info-num info)]
-                 [time (prof-info-time info)]
-                 [name (prof-info-name info)])
-            (when newline? (send src-loc-editor insert "\n"))
-            (when highlight-line? (small-blank-line src-loc-editor))
-            (let ([before (send src-loc-editor last-position)])
-              (insert-profile-src-loc src-loc-editor expr name)
-              (let ([after (send src-loc-editor last-position)])
-                (cond
-                  [(string? expr-src)
-                   (send src-loc-editor change-style (gui-utils:get-clickback-delta) before after)
-                   (let ([after (send src-loc-editor last-position)])
-                     (send src-loc-editor set-clickback 
-                           before after 
-                           (λ (text start end)
-                             (open-file-and-goto-position expr-src (syntax-position expr)))))]
-                  [(is-a? expr-src editor:basic<%>)
-                   (send src-loc-editor change-style (gui-utils:get-clickback-delta) before after)
-                   (send src-loc-editor set-clickback
-                         before after
-                         (λ (text start end)
-                           (let ([window (send expr-src get-top-level-window)]
-                                 [pos (syntax-position expr)])
-                             (when window (send window show #t))
-                             (when pos (send expr-src set-position (- pos 1)))
-                             (send expr-src set-caret-owner #f 'global))))]
-                  [else (void)])))
-            
-            (when newline? (send time-editor insert "\n"))
-            (when highlight-line? (small-blank-line time-editor))
-            (send time-editor insert (format "~a" time))
-            (send time-editor set-paragraph-alignment (send time-editor last-paragraph) 'right)
-            
-            (when newline? (send count-editor insert "\n")) 
-            (when highlight-line? (small-blank-line count-editor))
-            (send count-editor insert (format "~a" count))
-            (send count-editor set-paragraph-alignment (send count-editor last-paragraph) 'right)))
-        
-        (define (bigger-value? x y)
-          (let ([sel (if (eq? 'count (preferences:get 'drracket:profile-how-to-count))
-                         prof-info-num
-                         prof-info-time)])
-            (> (sel x) (sel y))))
-        
-        (define (cleanup-editor ed)
-          (let* ([ed-admin (send ed get-admin)]
-                 [snip (send ed-admin get-snip)]
-                 [bl (box 0)]
-                 [br (box 0)])
-            (get-snip-location snip bl #f #f)
-            (get-snip-location snip br #f #t)
-            (let ([w (+ (- (unbox br) (unbox bl)) 4)])
-              (send ed set-max-width w)
-              (send ed set-min-width w)))
-          (send ed hide-caret #t)
-          (send ed lock #t))
-        
-        (define top-infos (top 100 (sort infos bigger-value?)))
-        (for-each show-highlight top-infos)
-        (initialize-editors)
-        (let loop ([infos top-infos]
-                   [newline? #f]
-                   [highlight-counter 0])
-          (cond
-            [(null? infos) (void)]
-            [else 
-             (show-line (car infos) newline? (and newline? (zero? highlight-counter)))
-             (loop (cdr infos) #t (modulo (+ highlight-counter 1) 2))]))
-        (cleanup-editor count-editor)
-        (cleanup-editor time-editor)
-        (cleanup-editor src-loc-editor)
-        
-        (hash-for-each
-         in-edit-sequence
-         (λ (key val)
-           (send key end-edit-sequence)))
-        (set! clear-old-results 
-              (λ ()
-                (hash-for-each
-                 in-edit-sequence
-                 (λ (key val) (send key begin-edit-sequence #t #f)))
-                (clear-highlight)
-                (hash-for-each
-                 in-edit-sequence
-                 (λ (key val) (send key end-edit-sequence)))
-                (set! clear-old-results void)))
-        (lock #t)
-        (end-edit-sequence)
-        (let ([canvas (get-canvas)])
-          (when canvas
-            (send canvas scroll-to 0 0 1 1 #t 'start))))
-      
-      
-      ;; top : number (listof X) -> (listof X)
-      ;; extracts the first `n' elements from a list.
-      (define/private (top n lst)
-        (let loop ([n n]
-                   [lst lst])
-          (cond
-            [(null? lst) null]
-            [(= 0 n) null]
-            [else (cons (car lst) (loop (- n 1) (cdr lst)))])))
-      
-      (field (src-loc-editor #f)
-             (time-editor #f)
-             (count-editor #f))
-      (define/private (clear-editors)
-        (set! src-loc-editor #f)
-        (set! time-editor #f)
-        (set! count-editor #f))
-      (define/private (initialize-editors)
-        (set! src-loc-editor (instantiate text% ()))
-        (set! time-editor (instantiate text% ()))
-        (set! count-editor (instantiate text% ()))
-        (send src-loc-editor set-styles-sticky #f)            
-        (send time-editor set-styles-sticky #f)
-        (send count-editor set-styles-sticky #f)
-        (insert (instantiate editor-snip% (time-editor)))
-        (insert (instantiate editor-snip% (count-editor)))
-        (insert (instantiate editor-snip% (src-loc-editor)))
-        (insert-title (string-constant profiling-col-function) src-loc-editor)
-        (insert-title (string-constant profiling-col-time-in-msec) time-editor)
-        (insert-title (string-constant profiling-col-calls) count-editor))
-      
-      (define/private (insert-title str txt)
-        (send txt insert str)
-        (send txt insert "\n")
-        (send txt change-style bold-delta 0 (- (send txt last-position) 1))
-        (send txt set-paragraph-alignment 0 'center))
-      
-      (super-new)
-      (hide-caret #t)))
-  
-  ;; format-percentage : number[0 <= n <= 1] -> string
-  ;; formats the number as a percentage string with trailing zeros,
-  ;; to 3 decimal places.
-  (define (format-percentage n)
-    (let* ([number-of-places 3]
-           [whole-part (floor (* n 100))]
-           [decimal-part (- (* n 100) whole-part)]
-           [truncated/moved-decimal-part (floor (* (expt 10 number-of-places) decimal-part))]
-           [pad
-            (λ (str)
-              (if ((string-length str) . < . number-of-places)
-                  (string-append (make-string (- number-of-places (string-length str)) #\0) 
-                                 str)
-                  str))])
-      (string-append (format "~a" whole-part)
-                     "."
-                     (pad (format "~a" truncated/moved-decimal-part)))))
-  
-  (define (small-blank-line txt)
-    (let ([before (send txt last-position)])
-      (send txt insert "\n")
-      (let ([after (send txt last-position)])
-        (send txt change-style small-font-style before after))))
-  
-  (define small-font-style (make-object style-delta% 'change-size 6))
-  
-  ;; bold-delta : style-delta
-  (define bold-delta (make-object style-delta% 'change-bold))
-  
-  ;; insert-profile-src-loc : syntax name -> string
-  (define (insert-profile-src-loc editor stx name)
-    (cond
-      [name
-       (let ([before (send editor last-position)])
-         (send editor insert (format "~a" name)))]
-      [else
-       (let* ([src (syntax-source stx)]
-              [filename 
-               (cond
-                 [(string? src) src]
-                 [(is-a? src editor<%>) (get-filename-from-editor src)]
-                 [else (string-constant profiling-unknown-src)])]
-              [col (syntax-column stx)]
-              [line (syntax-line stx)]
-              [pos (syntax-position stx)]
-              [span (syntax-span stx)]
-              [src
-               (cond
-                 [(and col line)
-                  (format "~a: ~a.~a" filename line col)]
-                 [pos
-                  (format "~a: ~a" filename pos)]
-                 [else 
-                  filename])])
-         (send editor insert src))]))
-  
-  ;; open-file-and-goto-position : string (union #f number) -> void
-  (define (open-file-and-goto-position filename pos)
-    (let ([frame (handler:edit-file filename)])
-      (when (and frame
-                 pos
-                 (is-a? frame drracket:unit:frame%))
-        (let ([defs (send frame get-definitions-text)])
-          (send defs set-position (- pos 1))))))
-  
-  ;; get-src-filename : tst -> (union #f string)
-  (define (get-src-filename src)
-    (cond
-      [(string? src) src]
-      [(is-a? src text%)
-       (send src get-filename)]
-      [else #f]))
-  
-  ;; get-src-loc : syntax -> string
-  (define (get-src-loc expr)
-    (cond
-      [(and (number? (syntax-line expr))
-            (number? (syntax-column expr))
-            (number? (syntax-span expr)))
-       (format " ~a.~a [~a]" 
-               (syntax-line expr) 
-               (syntax-column expr)
-               (syntax-span expr))]
-      [(and (number? (syntax-position expr))
-            (number? (syntax-span expr)))
-       (format " ~a-~a" 
-               (syntax-position expr)
-               (syntax-span expr))]
-      [else ""]))
-  
-  (define (add-prefs-panel)
-    (preferences:add-panel
-     (string-constant profiling)
-     (λ (s-parent)
-       (letrec ([parent (make-object vertical-panel% s-parent)]
-                [msg (make-object message% 
-                       (string-constant profiling-color-config) 
-                       parent)]
-                [hp (make-object horizontal-pane% parent)]
-                [low (make-object button% (string-constant profiling-low-color) hp 
-                       (λ (x y) (color-callback #t)))]
-                [color-bar (make-object color-bar% hp)]
-                [high (make-object button% (string-constant profiling-high-color) hp
-                        (λ (x y) (color-callback #f)))]
-                
-                [scale (instantiate radio-box% ()
-                         (label (string-constant profiling-scale))
-                         (parent parent)
-                         (callback (λ (x y) (scale-callback)))
-                         (choices
-                          (list (string-constant profiling-sqrt)
-                                (string-constant profiling-linear)
-                                (string-constant profiling-square))))]
-                
-                [color-callback
-                 (λ (low?)
-                   (let ([color (get-color-from-user 
-                                 (if low?
-                                     (string-constant profiling-choose-low-color)
-                                     (string-constant profiling-choose-high-color))
-                                 #f
-                                 (preferences:get
-                                  (if low?
-                                      'drracket:profile:low-color
-                                      'drracket:profile:high-color)))])
-                     (when color
-                       (preferences:set 
-                        (if low? 'drracket:profile:low-color 'drracket:profile:high-color)
-                        color))))]
-                [scale-callback
-                 (λ ()
-                   (preferences:set 
-                    'drracket:profile:scale
-                    (case (send scale get-selection)
-                      [(0) 'sqrt]
-                      [(1) 'linear]
-                      [(2) 'square])))])
-         (preferences:add-callback
-          'drracket:profile:scale
-          (λ (p v)
-            (send scale set-selection
-                  (case v
-                    [(sqrt) 0]
-                    [(linear) 1]
-                    [(square) 2]))))
-         (send parent set-alignment 'left 'center)
-         (send hp stretchable-height #f)
-         parent))))
-  
-  (define color-bar%
-    (class canvas%
-      (inherit get-client-size get-dc)
-      (field [pen (make-object pen% "black" 1 'solid)]
-             [in-on-paint? #f])
-      (define/override (on-paint)
-        (set! in-on-paint? #t)
-        (let* ([dc (get-dc)]
-               [dummy-pen (send dc get-pen)]
-               [drracket:profile:low-color (preferences:get 'drracket:profile:low-color)]
-               [drracket:profile:high-color (preferences:get 'drracket:profile:high-color)]
-               [drracket:profile:scale (preferences:get 'drracket:profile:scale)])
-          (let-values ([(w h) (get-client-size)])
-            (let loop ([n 0])
-              (when (n . <= . w)
-                (send pen set-color 
-                      (get-color-value/pref n w 
-                                            drracket:profile:low-color
-                                            drracket:profile:high-color
-                                            drracket:profile:scale))
-                (send dc set-pen pen)
-                (send dc draw-line n 0 n h)
-                (send dc set-pen dummy-pen)
-                (loop (+ n 1))))
-            (let-values ([(tw th ta td) (send dc get-text-extent 
-                                              (string-constant profiling-example-text))])
-              (send dc draw-text
-                    (string-constant profiling-example-text)
-                    (floor (- (/ w 2) (/ tw 2)))
-                    (floor (- (/ h 2) (/ th 2)))))))
-        (set! in-on-paint? #f))
-      
-      ;; queue callbacks here so that the preferences
-      ;; values are actually set by the time on-paint
-      ;; is called.
-      (preferences:add-callback
-       'drracket:profile:scale
-       (λ (p v)
-         (unless in-on-paint?
-           (queue-callback
-            (λ ()
-              (on-paint))))))
-      (preferences:add-callback
-       'drracket:profile:low-color
-       (λ (p v)
-         (unless in-on-paint?
-           (queue-callback
-            (λ ()
-              (on-paint))))))
-      (preferences:add-callback
-       'drracket:profile:high-color
-       (λ (p v)
-         (unless in-on-paint?
-           (queue-callback
-            (λ ()
-              (on-paint))))))
-      
-      (super-instantiate ())))
-
-
-  (define-values/invoke-unit/infer stacktrace@))
-
-(define ellipsis-error-message-field #rx"  [^ ].*[.][.][.]:$")
-
-(define (collect-hidden-lines lines)
-  (let loop ([lines lines]
-             [ellipsis-line #f]
-             [collection #f])
-    (cond
-      [(null? lines)
-       (cond
-         [ellipsis-line
-          (list (list ellipsis-line collection))]
-         [else
-          '()])]
-      [else
-       (define line (car lines))
-       (cond
-         [ellipsis-line
-          (cond
-            [(regexp-match #rx"^   " line)
-             (loop (cdr lines) ellipsis-line (cons line collection))]
-            [else
-             (cons (list ellipsis-line collection)
-                   (loop lines #f #f))])]
-         [else
-          (cond
-            [(regexp-match ellipsis-error-message-field line)
-             (loop (cdr lines) line '())]
-            [else
-             (cons line (loop (cdr lines) #f #f))])])])))
-
-(module+ test
-  (require rackunit)
-  (check-equal?
-   (collect-hidden-lines
-    '("car: arity mismatch;"
-      " the expected number of arguments does not match the given number"
-      "  expected: 1"
-      "  given: 3"
-      "  arguments...:"
-      "   1"
-      "   2"
-      "   3"))
-   '("car: arity mismatch;"
-     " the expected number of arguments does not match the given number"
-     "  expected: 1"
-     "  given: 3"
-     ("  arguments...:" ("   3" "   2" "   1"))))
-  
-  (check-equal?
-   (collect-hidden-lines
-    '("car: arity mismatch;"
-      " the expected number of arguments does not match the given number"
-      "  expected: 1"
-      "  given: 3"
-      "  arguments...:"
-      "   1"
-      "   2"
-      "   3"
-      "  another field:"))
-   '("car: arity mismatch;"
-     " the expected number of arguments does not match the given number"
-     "  expected: 1"
-     "  given: 3"
-     ("  arguments...:" ("   3" "   2" "   1"))
-     "  another field:"))
-  
-  (check-equal?
-   (collect-hidden-lines
-    '("car: arity mismatch;"
-      " the expected number of arguments does not match the given number"
-      "  expected: 1"
-      "  given: 3"
-      "  arguments...:"
-      "   1"
-      "   2"
-      "   3"
-      "  arguments...:"
-      "   1"
-      "   2"
-      "   3"))
-   '("car: arity mismatch;"
-     " the expected number of arguments does not match the given number"
-     "  expected: 1"
-     "  given: 3"
-     ("  arguments...:" ("   3" "   2" "   1"))
-     ("  arguments...:" ("   3" "   2" "   1"))))
-  
-  (check-equal?
-   (collect-hidden-lines
-    '("car: arity mismatch;"
-      " the expected number of arguments does not match the given number"
-      "  expected: 1"
-      "  given: 3"
-      "  arguments...:"
-      "   1"
-      "   2"
-      "   3"
-      "  a different field:"
-      "  arguments...:"
-      "   1"
-      "   2"
-      "   3"))
-   '("car: arity mismatch;"
-     " the expected number of arguments does not match the given number"
-     "  expected: 1"
-     "  given: 3"
-     ("  arguments...:" ("   3" "   2" "   1"))
-     "  a different field:"
-     ("  arguments...:" ("   3" "   2" "   1")))))
-
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/dock-icon.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/dock-icon.rkt
deleted file mode 100644
index 9f685dd5ea..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/dock-icon.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(provide set-dock-tile-bitmap)
-(require ffi/unsafe/objc
-         ffi/unsafe/atomic
-         mred/private/wx/cocoa/image
-         mred/private/wx/cocoa/utils)
-
-(module test racket/base)
-
-(import-class NSApplication
-              NSImageView)
-
-(define (set-dock-tile-bitmap bm)
-  (unless old-cocoa?
-    (define dock-tile (tell (tell NSApplication sharedApplication) dockTile))
-    (start-atomic)
-    (define view (tell (tell NSImageView alloc) init))
-    (tellv view setImage: (bitmap->image bm))
-    
-    (tellv dock-tile setContentView: view)
-    (tellv dock-tile display)
-    (tellv view release)
-    (end-atomic)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/drracket-normal.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/drracket-normal.rkt
deleted file mode 100644
index 1299c0e7a8..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/drracket-normal.rkt
+++ /dev/null
@@ -1,239 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base
-         racket/class
-         racket/cmdline
-         racket/list
-         framework/private/bday
-         framework/splash
-         racket/runtime-path
-         racket/file
-	 (for-syntax racket/base)
-         "frame-icon.rkt"
-         "eb.rkt")
-
-(module test racket/base)
-
-(define-runtime-path doc-icon.rkt "dock-icon.rkt")
-
-(define files-to-open (command-line #:args filenames filenames))
-
-(define startup-date 
-  (seconds->date
-   (let ([ssec (getenv "PLTDREASTERSECONDS")])
-     (if ssec
-         (string->number ssec)
-         (current-seconds)))))
-
-(define-syntax (def-imgs stx)
-  (syntax-case stx ()
-    [(_ img ...)
-     (with-syntax ([(str ...) (map (compose symbol->string syntax-e)
-                                   (syntax->list #'(img ...)))])
-       #'(begin (define img str) ...
-                (when (getenv "PLTDRBREAKIMAGES")
-                  (set! img (string-append "PLTDRBREAKIMAGES-dne-" img)) ...)))]))
-
-(def-imgs 
-  plt-logo-red-shiny.png
-  plt-logo-red-diffuse.png
-  heart.png
-  texas-plt-bw.gif
-  PLT-pumpkin.png
-  PLT-206-larval.png
-  PLT-206-mars.jpg)
-
-;; updates the command-line-arguments with only the files
-;; to open. See also main.rkt.
-(current-command-line-arguments (apply vector files-to-open))
-
-(define (weekend-date? date)
-  (define dow (date-week-day date))
-  (or (= dow 6) (= dow 0)))
-
-(define (valentines-date? date)
-  (and (= 2 (date-month date))
-       (= 14 (date-day date))))
-
-(define (icon-state date)
-  (cond
-    [(valentines-date? date) 'valentines]
-    [(weekend-date? date) 'weekend]
-    [else 'normal]))
-
-(define-values (texas-independence-day? 
-                prince-kuhio-day? kamehameha-day? halloween?
-                ada-lovelace-bday?)
-  (let* ([month (date-month startup-date)]
-         [day (date-day startup-date)]
-         [dow (date-week-day startup-date)])
-    (values (and (= 3 month) (= 2 day))
-            (and (= 3 month) (= 26 day))
-            (and (= 6 month) (= 11 day))
-            (and (= 10 month) (= 31 day))
-            (and (= 12 month) (= 10 day)))))
-
-(define special-state #f)
-
-(define (icons-bitmap name)
-  (make-object bitmap% (collection-file-path name "icons")))
-
-(define-struct magic-image (chars filename [bitmap #:mutable]))
-
-(define (magic-img str img)
-  (make-magic-image (reverse (string->list str)) img #f))
-
-;; magic strings and their associated images.  There should not be a string
-;; in this list that is a prefix of another.
-(define magic-images
-  (list #;(magic-img "larval" PLT-206-larval.png)
-        (magic-img "mars"   PLT-206-mars.jpg)))
-
-(define (load-magic-images)
-  (set! load-magic-images void) ; run only once
-  (for-each (λ (magic-image)
-              (unless (magic-image-bitmap magic-image)
-                (set-magic-image-bitmap!
-                 magic-image
-                 (icons-bitmap (magic-image-filename magic-image)))))
-            magic-images))
-
-(define longest-magic-string
-  (apply max (map (λ (s) (length (magic-image-chars s))) magic-images)))
-
-(define key-codes null)
-
-(define (find-magic-image)
-  (define (prefix? l1 l2)
-    (or (null? l1)
-        (and (pair? l2)
-             (eq? (car l1) (car l2))
-             (prefix? (cdr l1) (cdr l2)))))
-  (ormap (λ (i) (and (prefix? (magic-image-chars i) key-codes) i))
-         magic-images))
-
-(define (add-key-code new-code)
-  (set! key-codes (cons new-code key-codes))
-  (when ((length key-codes) . > . longest-magic-string)
-    (set! key-codes (take key-codes longest-magic-string))))
-
-(define (drracket-splash-char-observer evt)
-  (let ([ch (send evt get-key-code)])
-    (when (and (eq? ch #\q)
-               (send evt get-control-down))
-      (exit))
-    (when (and the-splash-bitmap (char? ch))
-      ;; as soon as something is typed, load the bitmaps
-      (load-magic-images)
-      (add-key-code ch)
-      (let ([match (find-magic-image)])
-        (when match
-          (set! key-codes null)
-          (set-splash-bitmap
-           (if (eq? special-state match)
-               (begin (set! special-state #f) the-splash-bitmap)
-               (begin (set! special-state match)
-                      (magic-image-bitmap match))))
-          (refresh-splash))))))
-
-(when (eb-bday?) (install-eb))
-
-(define weekend-bitmap-spec (collection-file-path plt-logo-red-shiny.png "icons" #:fail (λ (x) plt-logo-red-shiny.png)))
-(define normal-bitmap-spec (collection-file-path plt-logo-red-diffuse.png "icons" #:fail (λ (x) plt-logo-red-diffuse.png)))
-(define valentines-days-spec (collection-file-path heart.png "icons" #:fail (λ (x) heart.png)))
-
-(define the-bitmap-spec
-  (cond
-    [(valentines-date? startup-date)
-     valentines-days-spec]
-    [(or prince-kuhio-day? kamehameha-day?)
-     (set-splash-progress-bar?! #f)
-     (let ([size ((dynamic-require 'drracket/private/palaka 'palaka-pattern-size) 4)])
-       (vector (dynamic-require 'drracket/private/honu-logo 'draw-honu) 
-               size 
-               size))]
-    [ada-lovelace-bday?
-     (set-splash-progress-bar?! #f)
-     (let ([size (dynamic-require 'drracket/private/ada 'ada-size)])
-       (vector (dynamic-require 'drracket/private/ada 'draw-splash-ada) 
-               size 
-               size))]
-    [texas-independence-day?
-     (collection-file-path texas-plt-bw.gif "icons")]
-    [halloween?
-     (collection-file-path PLT-pumpkin.png "icons")]
-    [(weekend-date? startup-date)
-     weekend-bitmap-spec]
-    [else normal-bitmap-spec]))
-
-(define (read-bitmap/no-crash fn)
-  (with-handlers ((exn:fail? (λ (x) (make-object bitmap% "dne.png"))))
-    (read-bitmap fn #:try-@2x? #t)))
-
-(define the-splash-bitmap (and (path? the-bitmap-spec)
-                               (read-bitmap/no-crash the-bitmap-spec)))
-(set-splash-char-observer drracket-splash-char-observer)
-
-(when (eq? (system-type) 'macosx)
-  (define initial-state (icon-state startup-date))
-  (define weekend-bitmap (if (equal? the-bitmap-spec weekend-bitmap-spec)
-                             the-splash-bitmap
-                             #f))
-  (define weekday-bitmap (if (equal? the-bitmap-spec normal-bitmap-spec)
-                             the-splash-bitmap
-                             #f))
-  (define valentines-bitmap (if (equal? the-bitmap-spec valentines-days-spec)
-                                the-splash-bitmap
-                                #f))
-  (define set-doc-tile-bitmap (dynamic-require doc-icon.rkt 'set-dock-tile-bitmap))
-  (define (set-icon state)
-    (case state
-      [(valentines) 
-       (unless valentines-bitmap (set! valentines-bitmap (read-bitmap/no-crash valentines-days-spec)))
-       (set-doc-tile-bitmap valentines-bitmap)]
-      [(weekend)
-       (unless weekend-bitmap (set! weekend-bitmap (read-bitmap/no-crash weekend-bitmap-spec)))
-       (set-doc-tile-bitmap weekend-bitmap)]
-      [(normal) 
-       (unless weekday-bitmap (set! weekday-bitmap (read-bitmap/no-crash normal-bitmap-spec)))
-       (set-doc-tile-bitmap weekday-bitmap)]))
-  (set-icon initial-state)
-  (void
-   (thread
-    (λ ()
-      (let loop ([last-state initial-state])
-        (sleep 10)
-        (define next-state (icon-state (seconds->date (current-seconds))))
-        (unless (equal? last-state next-state)
-          (set-icon next-state))
-        (loop next-state))))))
-
-(start-splash (or the-splash-bitmap
-                  the-bitmap-spec)
-              (format "DrRacket ~a" (version))
-              700
-              #:allow-funny? #t
-              #:frame-icon todays-icon)
-
-(when (getenv "PLTDRBREAK")
-  (printf "PLTDRBREAK: creating break frame\n") (flush-output)
-  (let ([to-break (eventspace-handler-thread (current-eventspace))])
-    (parameterize ([current-eventspace (make-eventspace)])
-      (let* ([f (new frame% (label "Break DrRacket"))]
-             [b (new button% 
-                     (label "Break Main Thread")
-                     (callback
-                      (λ (x y)
-                        (break-thread to-break)))
-                     (parent f))]
-             [b (new button% 
-                     (label "Break All Threads")
-                     (callback
-                      (λ (x y)
-                        ((dynamic-require 'drracket/private/key 'break-threads))))
-                     (parent f))])
-        (send f show #t)))))
-
-(dynamic-require 'drracket/tool-lib #f)
-(shutdown-splash)
-(close-splash)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/eb.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/eb.rkt
deleted file mode 100644
index e62d22cf0c..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/eb.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang racket/base
-(require racket/class
-         framework/splash
-         racket/gui/base)
-
-(provide install-eb)
-(define (install-eb)
-  (define main-size 260)
-  (define pi (atan 0 -1))
-  
-  (define eli (make-object bitmap% (collection-file-path "eli-purple.jpg" "icons")))
-  (define bitmap (make-object bitmap% main-size main-size))
-  (define bdc (make-object bitmap-dc% bitmap))
-  
-  (define outer-color (send the-color-database find-color "darkorange"))
-  (define inner-color (send the-color-database find-color "green"))
-  (define omega-str "(λ (x) (x x)) (λ (x) (x x)) ")
-  (define hebrew-str "  ףוס ןיא  ףוס ןיא")
-  
-  (define (draw-letter dc cx cy angle radius letter color)
-    (let ([x (+ cx (* (cos angle) radius))]
-          [y (- cy (* (sin angle) radius))])
-      (send bdc set-text-foreground color)
-      (send dc draw-text letter x y #f 0 (- angle (/ pi 2)))))
-  
-  (define (draw-single-loop str dc offset cx cy radius font-size color)
-    (send dc set-font (send the-font-list find-or-create-font font-size 'modern))
-    (for ([i (in-range 0 (string-length str))])
-      (draw-letter dc
-                   cx
-                   cy
-                   (normalize-angle
-                    (+ (- (* 2 pi) (* (* 2 pi) (/ (- i 1) (string-length str))))
-                       (/ pi 2)
-                       offset))
-                   radius
-                   (substring str i (+ i 1))
-                   color)))
-  
-  (define (normalize-angle angle)
-    (cond
-      [(<= 0 angle (* 2 pi)) angle]
-      [(< angle 0) (normalize-angle (+ angle (* 2 pi)))]
-      [else (normalize-angle (- angle (* 2 pi)))]))
-  
-  (define splash-canvas (get-splash-canvas))
-  (define (draw-single-step offset)
-    (send bdc draw-bitmap eli 0 0)
-    (draw-single-loop omega-str bdc offset (/ main-size 2) (/ main-size 2) 120 32 outer-color)
-    (draw-single-loop hebrew-str bdc (+ (- (* 2 pi) offset) (* 2 pi)) (/ main-size 2) (/ main-size 2) 70 20 inner-color)
-    (refresh-splash))
-  
-  (define gc-b
-    (with-handlers ([exn:fail? (lambda (x)
-                                 (printf "~s\n" (exn-message x))
-                                 #f)])
-      (let ([b (make-object bitmap% (collection-file-path "recycle.png" "icons"))])
-        (cond
-          [(send b ok?)
-           (let ([gbdc (make-object bitmap-dc% b)]
-                 [ebdc (make-object bitmap-dc% eli)]
-                 [color1 (make-object color%)]
-                 [color2 (make-object color%)]
-                 [avg (lambda (x y) (floor (* (/ x 255) y)))]
-                 [ox (floor (- (/ main-size 2) (/ (send b get-width) 2)))]
-                 [oy (floor (- (/ main-size 2) (/ (send b get-height) 2)))])
-             (let loop ([i (send b get-width)])
-               (unless (zero? i)
-                 (let loop ([j (send b get-height)])
-                   (unless (zero? j)
-                     (let ([x (- i 1)]
-                           [y (- j 1)])
-                       (send gbdc get-pixel x y color1)
-                       (send ebdc get-pixel (+ x ox) (+ y oy) color2)
-                       (send color1 set 
-                             (avg (send color1 red) (send color2 red))
-                             (avg (send color1 green) (send color2 green))
-                             (avg (send color1 blue) (send color2 blue)))
-                       (send gbdc set-pixel x y color1)
-                       (loop (- j 1)))))
-                 (loop (- i 1))))
-             (send gbdc set-bitmap #f)
-             (send ebdc set-bitmap #f)
-             b)]
-          [else #f]))))
-  
-  
-  (define (eli-paint dc)
-    (send dc draw-bitmap bitmap 0 0))
-  (define (eli-event evt)
-    (cond
-      [(send evt leaving?)
-       (set-splash-paint-callback orig-paint)
-       (when gc-b
-         (unregister-collecting-blit splash-canvas))
-       (send splash-canvas refresh)
-       (when draw-thread
-         (kill-thread draw-thread)
-         (set! draw-thread #f))]
-      [(send evt entering?)
-       (set-splash-paint-callback eli-paint)
-       (when gc-b
-         (register-collecting-blit splash-canvas 
-                                   (floor (- (/ main-size 2)
-                                             (/ (send gc-b get-width) 2)))
-                                   (floor (- (/ main-size 2)
-                                             (/ (send gc-b get-height) 2)))
-                                   (send gc-b get-width)
-                                   (send gc-b get-height)
-                                   gc-b gc-b))
-       (send splash-canvas refresh)
-       (unless draw-thread
-         (start-thread))]))
-  
-  (define splash-eventspace (get-splash-eventspace))
-  (define draw-next-state
-    (let ([o 0])
-      (lambda ()
-        (let ([s (make-semaphore 0)])
-          (parameterize ([current-eventspace splash-eventspace])
-            (queue-callback 
-             (λ () 
-               (draw-single-step o)
-               (semaphore-post s))))
-          (semaphore-wait s))
-        (let ([next (+ o (/ pi 60))])
-          (set! o (if (< next (* 2 pi))
-                      next
-                      (- next (* 2 pi))))))))
-  
-  (define draw-thread #f)
-  (define (start-thread)        
-    (set! draw-thread
-          (thread
-           (λ ()
-             (let loop ()
-               (draw-next-state)
-               (sleep .01)
-               (loop))))))
-  (define orig-paint (get-splash-paint-callback))
-  
-  (draw-next-state)
-  (set-splash-event-callback eli-event)
-  (send splash-canvas refresh))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/ellipsis-snip-wxme.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/ellipsis-snip-wxme.rkt
deleted file mode 100644
index 3c540032db..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/ellipsis-snip-wxme.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require racket/class wxme)
-(provide reader)
-(define reader
-  (class* object% (snip-reader<%>)
-    (define/public (read-header) (void))
-    (define/public (read-snip text-only? version stream)
-      (send stream read-raw-bytes 'ellipsis-snip) ;; discard the 'extra' info
-      #"...")
-    (super-new)))
\ No newline at end of file
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/ellipsis-snip.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/ellipsis-snip.rkt
deleted file mode 100644
index 9aaad3a5bd..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/ellipsis-snip.rkt
+++ /dev/null
@@ -1,101 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/contract
-         racket/class
-         (prefix-in r: racket/base)
-         framework)
-(provide ellipsis-snip%)
-
-(define ellipsis-snip%
-  (class snip%
-    (init-field extra [insertion-done? #f])
-    (inherit get-style)
-    (define str "...")
-    (define/override (get-extent dc x y wb hb db sb lb rb)
-      (set-box/f! lb 0)
-      (set-box/f! rb 0)
-      (define-values (w h d a) (send dc get-text-extent str (send (get-style) get-font)))
-      (set-box/f! wb w)
-      (set-box/f! hb h)
-      (set-box/f! db d)
-      (set-box/f! sb a))
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (send dc draw-text str x y))
-    
-    (define/override (on-goodbye-event dc x y editorx editory event)
-      (handle-event dc x y editorx editory event #t))
-    (define/override (on-event dc x y editorx editory event)
-      (handle-event dc x y editorx editory event #f))
-    (define/private (handle-event dc x y editorx editory event goodbye?)
-      (unless insertion-done?
-        (define admin (get-admin))
-        (when admin
-          (define ed (send admin get-editor))
-          (define the-cursor-to-use (if goodbye? #f arrow-cursor))
-          (when (send event button-up? 'left)
-            (unless goodbye?
-              (do-insertion)
-              (set! insertion-done? #t)
-              (set! the-cursor-to-use #f)))
-          (send ed set-cursor the-cursor-to-use))))
-    
-    (define/private (do-insertion)
-      (define admin (get-admin))
-      (define ed (send admin get-editor))
-      (when (is-a? ed text:ports<%>)
-        (define pos (send ed get-snip-position this))
-        (when pos
-          (send ed begin-edit-sequence)
-          (define insertion-pos (+ pos 2))
-          (let loop ([strs extra])
-            (cond
-              [(null? strs) (void)]
-              [else
-               (define str (car strs))
-               (send ed insert/io str insertion-pos (send ed get-err-style-delta))
-               (send ed insert/io "\n" insertion-pos (send ed get-err-style-delta))
-               (loop (cdr strs))]))
-          (send ed end-edit-sequence))))
-    (define/override (copy) (new ellipsis-snip% 
-                                 [extra extra]
-                                 [insertion-done? insertion-done?]))
-    (define/override (write f)
-      (define bp (open-output-bytes))
-      (r:write (list insertion-done? extra) bp)
-      (define b (get-output-bytes bp))
-      (send f put (bytes-length b) b))
-    (super-new)
-    (inherit set-flags get-flags get-admin set-snipclass)
-    (set-flags (cons 'handles-all-mouse-events (get-flags)))
-    (set-snipclass snipclass)))
-
-(define arrow-cursor (make-object cursor% 'arrow))
-
-(define (set-box/f! b v) (when (box? b) (set-box! b v)))
-
-(provide snipclass)
-(define valid-data? (list/c boolean? (listof string?)))
-(define snipclass
-  (new (class snip-class%
-         (define/override (read f)
-           (define data (r:read (open-input-bytes (send f get-unterminated-bytes))))
-           (cond
-             [(valid-data? data)
-              (new ellipsis-snip% 
-                   [insertion-done? (list-ref data 0)]
-                   [extra (list-ref data 1)])]
-             [else
-              (new ellipsis-snip% [extra '()])]))
-         (super-new))))
-(send snipclass set-version 2)
-(send snipclass set-classname 
-      (format "~s" '((lib "ellipsis-snip.rkt" "drracket" "private")
-                     (lib "ellipsis-snip-wxme.rkt" "drracket" "private"))))
-(send (get-the-snip-class-list) add snipclass)
-
-(module+ main
-  (define f (new frame% [label ""] [width 100] [height 100]))
-  (define t (new text%))
-  (send t insert (new ellipsis-snip% [extra '("a" "b" "c")]))
-  (define ec (new editor-canvas% [parent f] [editor t]))
-  (send f show #t))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/embedded-snip-utils.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/embedded-snip-utils.rkt
deleted file mode 100644
index 45d7636383..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/embedded-snip-utils.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base)
-
-(provide get-enclosing-editor-frame)
-
-;; get-enclosing-editor-frame: editor<%> -> (or/c frame% #f)
-;; Returns the enclosing frame of an-editor, or #f if we can't find it.
-(define (get-enclosing-editor-frame an-editor)
-  (define (topwin)
-    (let ([canvas (send an-editor get-canvas)])
-      (and canvas (send canvas get-top-level-window))))
-  (let ([admin (send an-editor get-admin)])
-    (if (and admin (is-a? admin editor-snip-editor-admin<%>))
-        (let ([enclosing-editor-snip (send admin get-snip)])
-          (if (get-snip-outer-editor enclosing-editor-snip)
-              (get-enclosing-editor-frame (get-snip-outer-editor
-                                           enclosing-editor-snip))
-              (topwin)))
-        (topwin))))
-
-;; get-snip-outer-editor: snip% -> (or/c editor<%> #f)
-;; Returns the immediate outer editor enclosing the snip, or false if we
-;; can't find it.
-(define (get-snip-outer-editor a-snip)
-  (let ([admin (send a-snip get-admin)])
-    (and admin (send admin get-editor))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/eval-helpers-and-pref-init.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/eval-helpers-and-pref-init.rkt
deleted file mode 100644
index 09b56cffa7..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/eval-helpers-and-pref-init.rkt
+++ /dev/null
@@ -1,168 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         racket/list
-         racket/set
-         compiler/cm
-         setup/dirs
-         planet/config
-         pkg/lib
-         framework/preferences
-         (prefix-in *** '#%foreign) ;; just to make sure it is here
-         )
-
-(provide set-basic-parameters/no-gui
-         set-module-language-parameters
-         (struct-out prefab-module-settings)
-         transform-module
-         get-init-dir)
-
-(preferences:set-default 'drracket:child-only-memory-limit
-                         (* 1024 1024 128)
-                         (λ (x) (or (not x)
-                                    (and (exact-integer? x)
-                                         (x . >= . (* 1024 1024 8))))))
-
-;; get-init-dir : (or/c path? #f) -> path?
-;; returns the initial directory for a program
-;; that is saved in 'path/f' (with #f indicating
-;; an unsaved file)
-(define (get-init-dir path/f)
-  (cond
-    [path/f
-     (let-values ([(base name dir?) (split-path path/f)])
-       base)]
-    [else
-     (find-system-path 'home-dir)]))
-
-(struct prefab-module-settings
-  (command-line-args
-   collection-paths
-   compilation-on?
-   full-trace?
-   annotations
-   enforce-module-constants)
-  #:prefab)
-
-(define orig-namespace (current-namespace))
-
-(define (set-basic-parameters/no-gui)
-  (let ([cust (current-custodian)])
-    (define (drracket-plain-exit-handler arg)
-      (custodian-shutdown-all cust))
-    (exit-handler drracket-plain-exit-handler))
-  (current-thread-group (make-thread-group))
-  (current-command-line-arguments #())
-  (current-pseudo-random-generator (make-pseudo-random-generator))
-  (current-evt-pseudo-random-generator (make-pseudo-random-generator))
-  (read-curly-brace-as-paren #t)
-  (read-square-bracket-as-paren #t)
-  (error-print-width 250)
-  (current-ps-setup (make-object ps-setup%))
-  (current-namespace (make-base-empty-namespace))
-  ;; is this wise?
-  #;(namespace-attach-module orig-namespace ''#%foreign))
-  
-
-(define (set-module-language-parameters settings 
-                                        module-language-parallel-lock-client
-                                        currently-open-files
-                                        #:use-use-current-security-guard? [use-current-security-guard? #f])
-  (current-command-line-arguments (prefab-module-settings-command-line-args settings))
-  (let* ([default (current-library-collection-paths)]
-         [cpaths (append-map (λ (x) (if (symbol? x) default (list x)))
-                             (prefab-module-settings-collection-paths settings))])
-    (when (null? cpaths)
-      (eprintf "WARNING: your collection paths are empty!\n"))
-    (current-library-collection-paths cpaths))
-  
-  (compile-context-preservation-enabled (prefab-module-settings-full-trace? settings))
-  (compile-enforce-module-constants (prefab-module-settings-enforce-module-constants settings))
-  (define path->pkg-cache (make-hash))
-  (when (prefab-module-settings-compilation-on? settings)
-    (define pkg-directory-cache (make-hash))
-    (define (pkg-directory/use-cache pkg)
-      (cond
-        [(hash-ref pkg-directory-cache pkg #f)
-         =>
-         values]
-        [else
-         (define ans (pkg-directory pkg))
-         (hash-set! pkg-directory-cache pkg ans)
-         ans]))
-    
-    (define open-pkgs
-      (for/fold ([s (set)]) ([path (in-list currently-open-files)])
-        (define pkg (path->pkg path #:cache path->pkg-cache))
-        (if (and pkg
-                 (memq 'write
-                       (file-or-directory-permissions (pkg-directory/use-cache pkg))))
-            (set-add s pkg)
-            s)))
-    (for ([pkg (in-set open-pkgs)])
-      (log-info "DrRacket: enabling bytecode-file compilation for package ~s" pkg))
-    
-    (define skip-path?
-      (let* ([cd (find-collects-dir)]
-             [sd (find-share-dir)]
-             [no-dirs (append
-                       (list (CACHE-DIR))
-                       (if cd (list cd) null)
-                       (if sd (list sd) null))])
-        (λ (p) (or (file-stamp-in-paths p no-dirs)
-                   (let ([pkg (path->pkg p #:cache path->pkg-cache)])
-                     (and pkg
-                          (not (set-member? open-pkgs pkg))
-                          (file-stamp-in-paths p (list (pkg-directory/use-cache pkg)))))))))
-    
-    (define extra-compiled-file-path
-      (case (prefab-module-settings-annotations settings)
-        [(none) (build-path "compiled" "drracket")]
-        [(debug) (build-path "compiled" "drracket" "errortrace")]
-        [else #f]))
-    (when extra-compiled-file-path
-      ;; Add extra compiled-file path:
-      (use-compiled-file-paths
-       (cons extra-compiled-file-path
-             (use-compiled-file-paths)))
-      ;; If we ever skip a file, then don't use the extra compiled-file
-      ;; path for the skipped file's dependencies (because modules
-      ;; compiled against the non-DrRacket-generated bytecode might not
-      ;; work with any DrRacket-generated bytecode that is sitting around):
-      (current-load/use-compiled
-       (let ([orig (current-load/use-compiled)])
-         (lambda (path mod-name)
-           (if (and (member extra-compiled-file-path (use-compiled-file-paths))
-                    (skip-path? path))
-               (parameterize ([use-compiled-file-paths
-                               (remove extra-compiled-file-path 
-                                       (use-compiled-file-paths))])
-                 (orig path mod-name))
-               (orig path mod-name))))))
-    ;; Install the compilation manager:
-    (parallel-lock-client module-language-parallel-lock-client)
-    (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler 
-                                #t
-                                #:security-guard (and use-current-security-guard?
-                                                      (current-security-guard))))
-    (manager-skip-file-handler skip-path?)))
-
-(define (transform-module filename stx raise-hopeless-syntax-error)
-  (define-values (mod name lang body)
-    (syntax-case stx ()
-      [(module name lang . body)
-       (eq? 'module (syntax-e #'module))
-       (values #'module #'name #'lang #'body)]
-      [_ (raise-hopeless-syntax-error
-          (string-append "only a module expression is allowed, either\n"
-                         "    #lang <language-name>\n or\n"
-                         "    (module <name> <language> ...)\n")
-          stx)]))
-  (define name* (syntax-e name))
-  (unless (symbol? name*)
-    (raise-hopeless-syntax-error "bad syntax in name position of module"
-                                 stx name))
-  (let* (;; rewrite the module to use the racket/base version of `module'
-         [mod  (datum->syntax #'here 'module mod)]
-         [expr (datum->syntax stx `(,mod ,name ,lang . ,body) stx stx)])
-    (values name lang expr)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/eval.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/eval.rkt
deleted file mode 100644
index abf47f1abd..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/eval.rkt
+++ /dev/null
@@ -1,229 +0,0 @@
-#lang racket/base
-
-  (require mred
-           racket/unit
-           racket/port
-           racket/class
-           syntax/toplevel
-           framework
-           "eval-helpers-and-pref-init.rkt"
-           "local-member-names.rkt"
-           drracket/private/drsig)
-  
-  ;; to ensure this guy is loaded (and the snipclass installed)
-  ;; in the drracket namespace & eventspace
-  ;; these things are for effect only!
-  (require mrlib/cache-image-snip
-           (prefix-in image-core: mrlib/image-core))
-  
-  (define op (current-output-port))
-  (define (oprintf . args) (apply fprintf op args))
-  
-  (provide eval@)
-  (define-unit eval@
-    (import [prefix drracket:language-configuration: drracket:language-configuration/internal^]
-            [prefix drracket:rep: drracket:rep^]
-            [prefix drracket:init: drracket:init^]
-            [prefix drracket:language: drracket:language^]
-            [prefix drracket:unit: drracket:unit^])
-    (export drracket:eval^)
-    
-    (define (traverse-program/multiple language-settings
-                                       init
-                                       kill-termination
-                                       #:gui-modules? [gui-modules? #t])
-      (let-values ([(eventspace custodian) 
-                    (build-user-eventspace/custodian
-                     language-settings
-                     init
-                     kill-termination
-                     #:gui-modules? gui-modules?)])
-        (let ([language (drracket:language-configuration:language-settings-language
-                         language-settings)]
-              [settings (drracket:language-configuration:language-settings-settings
-                         language-settings)])
-          (λ (input iter complete-program?)
-            (define port
-              (cond
-                [(input-port? input) input]
-                [else (let* ([text (drracket:language:text/pos-text input)]
-                             [start (drracket:language:text/pos-start input)]
-                             [end (drracket:language:text/pos-end input)]
-                             [text-port (open-input-text-editor text start end values
-                                                                (send text get-port-name))])
-                        (port-count-lines! text-port)
-                        (let* ([line (send text position-paragraph start)]
-                               [column (- start (send text paragraph-start-position line))]
-                               [relocated-port (relocate-input-port text-port 
-                                                                    (+ line 1)
-                                                                    column
-                                                                    (+ start 1))])
-                          (port-count-lines! relocated-port)
-                          relocated-port))]))
-            (parameterize ([current-eventspace eventspace])
-              (queue-callback
-               (λ ()
-                 (let ([read-thnk 
-                        (if complete-program?
-                          (send language front-end/complete-program port settings)
-                          (send language front-end/interaction port settings))])
-                   (let loop ()
-                     (let ([in (read-thnk)])
-                       (cond
-                         [(eof-object? in)
-                          (iter in (λ () (void)))]
-                         [else
-                          (iter in (λ () (loop)))])))))))))))
-    
-    (define (expand-program/multiple language-settings
-                                     eval-compile-time-part? 
-                                     init
-                                     kill-termination
-                                     #:gui-modules? [gui-modules? #t])
-      (let ([res (traverse-program/multiple language-settings init kill-termination #:gui-modules? gui-modules?)])
-        (λ (input iter complete-program?)
-          (let ([expanding-iter
-                 (λ (rd cont)
-                   (cond
-                     [(eof-object? rd) (iter rd cont)]
-                     [eval-compile-time-part? 
-                      (iter (expand-top-level-with-compile-time-evals rd) cont)]
-                     [else (iter (expand rd) cont)]))])
-            (res input 
-                 expanding-iter
-                 complete-program?)))))
-    
-    (define (expand-program input
-                            language-settings
-                            eval-compile-time-part? 
-                            init
-                            kill-termination
-                            iter
-                            #:gui-modules? [gui-modules? #t])
-      ((expand-program/multiple 
-        language-settings
-        eval-compile-time-part? 
-        init
-        kill-termination
-        #:gui-modules? gui-modules?)
-       input
-       iter
-       #t))
-    
-    
-    (define (build-user-eventspace/custodian language-settings init kill-termination #:gui-modules? [gui-modules? #t])
-      (let* ([user-custodian (make-custodian)]
-             [eventspace (parameterize ([current-custodian user-custodian])
-                           (make-eventspace))]
-             [language (drracket:language-configuration:language-settings-language
-                        language-settings)]
-             [settings (drracket:language-configuration:language-settings-settings
-                        language-settings)]
-             [eventspace-main-thread #f]
-             [run-in-eventspace
-              (λ (thnk)
-                (parameterize ([current-eventspace eventspace])
-                  (let ([sema (make-semaphore 0)]
-                        [ans #f])
-                    (queue-callback
-                     (λ ()
-                       (let/ec k
-                         (parameterize ([error-escape-handler
-                                         (let ([drscheme-expand-program-error-escape-handler
-                                                (λ () (k (void)))])
-                                           drscheme-expand-program-error-escape-handler)])
-                           (set! ans (thnk))))
-                       (semaphore-post sema)))
-                    (semaphore-wait sema)
-                    ans)))]
-             [drs-snip-classes (get-snip-classes)])
-        (run-in-eventspace
-         (λ ()
-           (current-custodian user-custodian)
-           (set-basic-parameters drs-snip-classes #:gui-modules? gui-modules?)
-           (drracket:rep:current-language-settings language-settings)))
-        (send language on-execute settings run-in-eventspace)
-        (run-in-eventspace
-         (λ ()
-           (set! eventspace-main-thread (current-thread))
-           (init)
-           (break-enabled #t)))
-        (thread
-         (λ ()
-           (thread-wait eventspace-main-thread)
-           (kill-termination)))
-        (values eventspace user-custodian)))
-    
-    ;; get-snip-classes : -> (listof snipclass)
-    ;; returns a list of the snip classes in the current eventspace
-    (define (get-snip-classes)
-      (let loop ([n (send (get-the-snip-class-list) number)])
-        (if (zero? n)
-            null
-            (cons (send (get-the-snip-class-list) nth (- n 1))
-                  (loop (- n 1))))))
-    
-    ;; set-basic-parameters : (listof (is-a/c? snipclass%)) -> void
-    ;; sets the parameters that are shared between the repl's initialization
-    ;; and expand-program
-    (define (set-basic-parameters snip-classes #:gui-modules? [gui-modules? #t])
-      (for-each (λ (snip-class) (send (get-the-snip-class-list) add snip-class))
-                snip-classes)
-      (set-basic-parameters/no-gui)
-      (for-each (λ (x) (namespace-attach-module drracket:init:system-namespace x))
-                to-be-copied-module-names)
-      (when gui-modules?
-        (for-each (λ (x) (namespace-attach-module drracket:init:system-namespace x))
-                  to-be-copied-gui-module-names)))
-    
-    (define to-be-copied-gui-module-specs
-      (list '(lib "mred/mred.rkt")
-            '(lib "mrlib/cache-image-snip.rkt")
-            '(lib "mrlib/image-core.rkt")
-            '(lib "mrlib/matrix-snip.rkt")))
-    
-    ;; these module specs are copied over to each new user's namespace 
-    (define to-be-copied-module-specs
-      (list ''#%foreign
-            '(lib "mzlib/pconvert-prop.rkt")
-            '(lib "planet/terse-info.rkt")
-            ;; preserve the invariant that:
-            ;;   if a module is shared, so 
-            ;;   are all of its submodules
-            '(submod racket/base reader)
-            '(submod scheme/base reader)))
-    
-    ;; ensure that they are all here.
-    (for-each (λ (x) (dynamic-require x #f)) to-be-copied-module-specs)
-    (for-each (λ (x) (dynamic-require x #f)) to-be-copied-gui-module-specs)
-    ;; get the names of those modules.
-    (define-values (to-be-copied-module-names to-be-copied-gui-module-names)
-      (let ([get-name
-             (λ (spec)
-               (if (symbol? spec)
-                   spec
-                   ((current-module-name-resolver) spec #f #f #t)))])
-        (values (map get-name to-be-copied-module-specs)
-                (map get-name to-be-copied-gui-module-specs))))
-    
-    ;; build-input-port : string[file-exists?] -> (values input any)
-    ;; constructs an input port for the load handler. Also
-    ;; returns a value representing the source of code read from the file.
-    (define (build-input-port filename)
-      (let* ([p (open-input-file filename)]
-             [chars (list (read-char p)
-                          (read-char p)
-                          (read-char p)
-                          (read-char p))])
-        (close-input-port p)
-        (cond
-          [(equal? chars (string->list "WXME"))
-           (let ([text (make-object text%)])
-             (send text load-file filename)
-             (let ([port (open-input-text-editor text)])
-               (port-count-lines! port)
-               (values port text)))]
-          [else
-           (let ([port (open-input-file filename)])
-             (port-count-lines! port)
-             (values port filename))]))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/expanding-place.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/expanding-place.rkt
deleted file mode 100644
index 5701079fa8..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/expanding-place.rkt
+++ /dev/null
@@ -1,430 +0,0 @@
-#lang racket/base
-(require racket/place
-         racket/port
-         racket/list
-         "eval-helpers-and-pref-init.rkt"
-         compiler/cm
-         framework/preferences
-         syntax/readerr)
-(provide start)
-
-(struct exn-info (str src-vecs exn-stack missing-mods) #:prefab)
-
-(struct job (cust working-thd stop-watching-abnormal-termination))
-
-;; key : any (used by equal? for comparision, but back in the main place)
-;; monitor-pc : (or/c #f place-channel)
-;;     -- #f means a "end of expansion" notification,
-;;     -- place-channel means to notify at the beginning
-(struct handler (key monitor-pc proc) #:transparent)
-(define handlers '())
-
-(define module-language-parallel-lock-client
-  'uninitialized-module-language-parallel-lock-client)
-
-(define old-registry-chan (make-channel))
-
-(define expanding-place-logger (make-logger 
-                                'drracket-background-compilation
-                                (current-logger)))
-(define-syntax-rule
-  (ep-log-info expr)
-  (when (log-level? expanding-place-logger 'info)
-    (log-message expanding-place-logger
-                 'info
-                 expr
-                 (current-continuation-marks))))
-
-(define (start p)
-  ;; get the module-language-compile-lock in the initial message
-  (set! module-language-parallel-lock-client
-        (compile-lock->parallel-lock-client
-         (place-channel-get p)
-         (current-custodian)))
-  
-  ;; get the handlers in a second message
-  (set! handlers 
-        (filter
-         values
-         (for/list ([lst (place-channel-get p)])
-           (define file (list-ref lst 0))
-           (define id (list-ref lst 1))
-           (define monitor-pc (list-ref lst 2))
-           (handler (list file id) monitor-pc (dynamic-require file id)))))
-  
-  (let loop ([current-job #f]
-             ;; the old-registry argument holds on to the namespace-module-registry
-             ;; from a previous run in order to keep entries in the bytecode cache
-             [old-registry #f])
-    (sync
-     (handle-evt 
-      old-registry-chan
-      (λ (reg) (loop current-job reg)))
-     (handle-evt
-      p
-      (λ (message)
-        (cond
-          [(eq? message 'abort)
-           (when current-job (abort-job current-job))
-           (loop #f old-registry)]
-          [(vector? message)
-           (when current-job (abort-job current-job))
-           (define program-as-string (vector-ref message 0))
-           (define path (vector-ref message 1))
-           (define response-pc (vector-ref message 2))
-           (define settings (vector-ref message 3))
-           (define pc-status-expanding-place (vector-ref message 4))
-           (define currently-open-files (vector-ref message 5))
-           (loop (new-job program-as-string path response-pc settings pc-status-expanding-place)
-                 old-registry)]))))))
-
-(define (abort-job job)
-  (when (log-level? expanding-place-logger 'info)
-    (define stack (continuation-mark-set->context
-                   (continuation-marks 
-                    (job-working-thd job))))
-    (ep-log-info (format "expanding-place.rkt: kill; worker-thd stack (size ~a) dead? ~a:" 
-                         (length stack)
-                         (thread-dead? (job-working-thd job))))
-    (for ([x (in-list stack)])
-      (ep-log-info (format "  ~s" x))))
-  ((job-stop-watching-abnormal-termination job))
-  (custodian-shutdown-all (job-cust job)))
-
-(struct exn:access exn:fail ())
-
-(define (new-job program-as-string path response-pc settings pc-status-expanding-place)
-  (define custodian-limit
-    (and (custodian-memory-accounting-available?)
-         (preferences:get 'drracket:child-only-memory-limit)))
-  (define cust-parent (make-custodian))
-  (define cust (parameterize ([current-custodian cust-parent])
-                 (make-custodian)))
-  (when custodian-limit
-    (custodian-limit-memory cust-parent custodian-limit cust-parent))
-  (define memory-killed-cust-box (make-custodian-box cust-parent #t))
-  (define exn-chan (make-channel))
-  (define extra-exns-chan (make-channel))
-  (define result-chan (make-channel))
-  (define normal-termination (make-channel))
-  (define abnormal-termination (make-channel))
-  (define the-source (or path "unsaved editor"))
-  (define orig-cust (current-custodian))
-  (define (stop-watching-abnormal-termination) 
-    (channel-put normal-termination #t))
-  
-  (define working-thd
-    (parameterize ([current-custodian cust])
-      (thread
-       (λ ()
-         
-         (ep-log-info "expanding-place.rkt: 00 starting monitors")
-         (for ([handler (in-list handlers)])
-           (define pc (handler-monitor-pc handler))
-           (when pc 
-             (define (failed x)
-               (eprintf "starting monitor ~s failed:\n" (handler-key handler))
-               ((error-display-handler) (exn-message x) x))
-             (with-handlers ([exn:fail? failed])
-               (define (send-back val)
-                 (place-channel-put 
-                  response-pc
-                  (vector 'monitor-message
-                          (handler-key handler)
-                          val)))
-               ((handler-proc handler) send-back path the-source orig-cust))))
-         
-         (ep-log-info "expanding-place.rkt: 01 starting thread")
-         (define sema (make-semaphore 0))
-         (ep-log-info "expanding-place.rkt: 02 setting basic parameters")
-         (set-basic-parameters/no-gui)
-         
-         (define loaded-paths '())
-         (define original-path (make-parameter #f))
-         (current-load/use-compiled
-          (let ([ol (current-load/use-compiled)])
-            (λ (path mod-name)
-              (parameterize ([original-path path])
-                (ol path mod-name)))))
-         (current-load
-          (let ([cl (current-load)])
-            (λ (path mod-name)
-              (set! loaded-paths
-                    (cons (or (current-module-declare-source)
-                              (original-path)
-                              path)
-                          loaded-paths))
-              (cl path mod-name))))
-         
-         (ep-log-info "expanding-place.rkt: 03 setting module language parameters")
-         (set-module-language-parameters settings
-                                         module-language-parallel-lock-client
-                                         null
-                                         #:use-use-current-security-guard? #t)
-         (ep-log-info "expanding-place.rkt: 04 setting directories")
-         (let ([init-dir (get-init-dir path)])
-           (current-directory init-dir)
-           (current-directory-for-user init-dir))
-         (current-load-relative-directory #f)
-         (define sp (open-input-string program-as-string))
-         (port-count-lines! sp)
-         (ep-log-info "expanding-place.rkt: 05 installing security guard")
-         (install-security-guard) ;; must come after the call to set-module-language-parameters
-         (ep-log-info "expanding-place.rkt: 06 setting uncaught-exception-handler")
-         (error-display-handler
-          (let ([e-d-h (error-display-handler)])
-            (λ (msg exn)
-              (channel-put extra-exns-chan exn)
-              (e-d-h msg exn))))
-         (uncaught-exception-handler
-          (λ (exn)
-            (parameterize ([current-custodian orig-cust])
-              (thread
-               (λ ()
-                 (stop-watching-abnormal-termination)
-                 (semaphore-post sema)
-                 (channel-put exn-chan (list exn loaded-paths)))))
-            (semaphore-wait sema)
-            ((error-escape-handler))))
-         (ep-log-info "expanding-place.rkt: 07 starting read-syntax")
-         (define stx
-           (parameterize ([read-accept-reader #t])
-             (read-syntax the-source sp)))
-         (ep-log-info "expanding-place.rkt: 08 read")
-         (when (eof-object? stx) 
-           (define-values (line col pos) (port-next-location sp))
-           (raise-read-eof-error "no program to process"
-                                 the-source
-                                 1 0 1 pos))
-         (define-values (name lang transformed-stx)
-           (transform-module path
-                             (namespace-syntax-introduce stx)
-                             raise-hopeless-syntax-error))
-         (ep-log-info "expanding-place.rkt: 09 starting expansion")
-         (define log-io? (log-level? expanding-place-logger 'warning))
-         (define-values (in out) (if log-io? 
-                                     (make-pipe)
-                                     (values #f (open-output-nowhere))))
-         (define io-sema (make-semaphore 0))
-         (when log-io?
-           (thread (λ () (catch-and-log in io-sema))))
-         (define expanded 
-           (parameterize ([current-output-port out]
-                          [current-error-port out])
-             (expand transformed-stx)))
-         (when log-io?
-           (close-output-port out)
-           (semaphore-wait io-sema))
-         (channel-put old-registry-chan 
-                      (namespace-module-registry (current-namespace)))
-         (place-channel-put pc-status-expanding-place 'finished-expansion)
-         (ep-log-info "expanding-place.rkt: 10 expanded")
-         (define handler-results
-           (for/list ([handler (in-list handlers)]
-                      #:unless (handler-monitor-pc handler))
-             (define proc-res
-               ((handler-proc handler) expanded
-                                       path
-                                       the-source
-                                       orig-cust))
-             (list (handler-key handler) proc-res)))
-         (ep-log-info "expanding-place.rkt: 11 handlers finished")
-         
-         (parameterize ([current-custodian orig-cust])
-           (thread
-            (λ ()
-              (stop-watching-abnormal-termination)
-              (semaphore-post sema)
-              (channel-put result-chan (list handler-results loaded-paths)))))
-         (semaphore-wait sema)
-         (ep-log-info "expanding-place.rkt: 12 finished")))))
-  
-  (thread
-   (λ ()
-     (let loop ([watch-dead? #t])
-       (sync 
-        (handle-evt 
-         normal-termination
-         (λ (x) (loop #f)))
-        (if watch-dead?
-            (handle-evt 
-             (thread-dead-evt working-thd)
-             (λ (x) 
-               (ep-log-info "expanding-place.rkt: abnormal termination")
-               (channel-put abnormal-termination #t)
-               (loop #f)))
-            never-evt)))))
-  
-  (thread
-   (λ ()
-     (let loop ([extra-exns '()])
-       (sync
-        (handle-evt
-         abnormal-termination
-         (λ (val) 
-           (place-channel-put pc-status-expanding-place
-                              'abnormal-termination)
-           (place-channel-put 
-            response-pc
-            (vector 'abnormal-termination 
-                    ;; note: this message is not used directly, a string 
-                    ;; constant is used back in the drracket place; but
-                    ;; this is checked to see if it was an out of memory error
-                    (if (custodian-box-value memory-killed-cust-box)
-                        "Expansion thread terminated unexpectedly"
-                        "Expansion thread terminated unexpectedly (out of memory)")
-                    '()
-                    
-                    ;; give up on dep paths in this case:
-                    '()))))
-        (handle-evt
-         result-chan
-         (λ (val+loaded-paths)
-           (place-channel-put response-pc (vector 'handler-results 
-                                                  (list-ref val+loaded-paths 0)
-                                                  (list-ref val+loaded-paths 1)))))
-        (handle-evt extra-exns-chan (λ (exn) (loop (cons exn extra-exns))))
-        (handle-evt
-         exn-chan
-         (λ (exn+loaded-paths)
-           (place-channel-put pc-status-expanding-place 'exn-raised)
-           (define main-exn (list-ref exn+loaded-paths 0))
-           
-           ;; inform the handlers that an exn has been raised
-           (when (exn? main-exn)
-             (for ([handler (in-list handlers)]
-                   #:unless (handler-monitor-pc handler))
-               ((handler-proc handler) main-exn path the-source orig-cust)))
-           
-           (define exn-type
-             (cond
-               [(exn:access? main-exn)
-                'access-violation]
-               [(and (exn:fail:read? main-exn)
-                     (andmap (λ (srcloc) (equal? (srcloc-source srcloc) the-source))
-                             (exn:fail:read-srclocs main-exn)))
-                'reader-in-defs-error]
-               [(and (exn? main-exn)
-                     (regexp-match #rx"expand: unbound identifier" (exn-message main-exn)))
-                'exn:variable]
-               [else 'exn]))
-           
-           (define (format-srcloc srcloc)
-             (define pos
-               (cond
-                 [(and (srcloc-line srcloc)
-                       (srcloc-column srcloc))
-                  (format ":~a:~a" (srcloc-line srcloc) (srcloc-column srcloc))]
-                 [(srcloc-line srcloc)
-                  (format ":~a" (srcloc-line srcloc))]
-                 [(srcloc-position srcloc)
-                  (format "::~a" (srcloc-position srcloc))]
-                 [else ""]))
-             (format "~a~a" (srcloc-source srcloc) pos))
-             
-           (define (srcloc->srcinfo a-srcloc)
-             (cond
-               [(and (srcloc? a-srcloc)
-                     (equal? the-source (srcloc-source a-srcloc))
-                     (srcloc-position a-srcloc)
-                     (srcloc-span a-srcloc))
-                (vector (srcloc-position a-srcloc)
-                        (srcloc-span a-srcloc))]
-               [else #f]))
-           
-           (define exn-infos
-             (for/list ([an-exn (in-list (cons main-exn extra-exns))])
-               (exn-info 
-                (trim-message
-                 (if (exn? an-exn) 
-                     (regexp-replace* #rx"[ \t]*\n[ \t]*" (exn-message an-exn) " ") 
-                     (format "uncaught exn: ~s" an-exn)))
-                (cond
-                  [(exn:srclocs? an-exn)
-                   (sort
-                    (for/list ([srcloc ((exn:srclocs-accessor an-exn) an-exn)]
-                               #:when (srcloc->srcinfo srcloc))
-                      (srcloc->srcinfo srcloc))
-                    <
-                    #:key (λ (x) (vector-ref x 0)))]
-                  [(exn? an-exn)
-                   (define marks (continuation-mark-set->context
-                                  (exn-continuation-marks an-exn)))
-                   (define info
-                     (for/or ([mark-pr (in-list marks)])
-                       (srcloc->srcinfo (cdr mark-pr))))
-                   (cond
-                     [info (list info)]
-                     [else '()])]
-                  [else '()])
-                (if (exn? an-exn)
-                    (let ([ctxt 
-                           (continuation-mark-set->context
-                            (exn-continuation-marks an-exn))])
-                      (for/list ([ctxt-elem (if (< (length ctxt) 100)
-                                                ctxt
-                                                (take ctxt 100))])
-                        (define name (car ctxt-elem))
-                        (define loc (cdr ctxt-elem))
-                        (cond
-                          [(not name) (format-srcloc loc)]
-                          [(not loc) (format "~a" name)]
-                          [else (format "~a:~a" (format-srcloc loc) name)])))
-                    '())
-                (and (exn:missing-module? an-exn)
-                     ((exn:missing-module-accessor an-exn) an-exn)))))
-           (place-channel-put 
-            response-pc
-            (vector 
-             exn-type
-             exn-infos
-             (list-ref exn+loaded-paths 1)))))))))
-  
-  (job cust working-thd stop-watching-abnormal-termination))
-
-(define (catch-and-log port sema)
-  (let loop ()
-    (sync
-     (handle-evt (read-line-evt port 'linefeed)
-                 (λ (l)
-                   (cond
-                     [(eof-object? l)
-                      (semaphore-post sema)]
-                     [else
-                      (log-warning (format "online comp io: ~a" l))
-                      (loop)]))))))
-
-(define (raise-hopeless-syntax-error . args)
-  (apply raise-syntax-error '|Module Language| args))
-
-(define (install-security-guard)
-  (current-security-guard
-   (make-security-guard
-    (current-security-guard)
-    (λ (prim path whats)
-      (when (or (member 'write whats)
-                (member 'execute whats)
-                (member 'delete whats))
-        (raise (exn:access (format "~a: forbidden ~a access to ~a" prim whats path)
-                           (current-continuation-marks)))))
-    (λ (prim target port what)
-      (raise (exn:access (format "~a: forbidden ~a access to ~a:~a" prim what target port)
-                         (current-continuation-marks))))
-    (λ (prim path1 path2)
-      (raise (exn:access (format "~a: forbidden to link ~a to ~a" prim path1 path2)
-                         (current-continuation-marks)))))))
-
-;; trim-message : string -> string[200 chars max]
-(define (trim-message str)
-  (cond
-    [(<= (string-length str) 200)
-     str]
-    [else
-     (define prefix-len 99)
-     (define suffix-len 98)
-     (define middle "...")
-     
-     ;; (+ prefix-len suffix-len (string-length middle)) must be 200 (or less)
-     (string-append (substring str 0 prefix-len)
-                    middle
-                    (substring str (- (string-length str) suffix-len) (string-length str)))]))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/find-completions.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/find-completions.rkt
deleted file mode 100644
index fed6ac7d96..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/find-completions.rkt
+++ /dev/null
@@ -1,280 +0,0 @@
-#lang racket/base
-
-(require racket/contract/base
-         racket/system
-         racket/port)
-
-(define lcl/c
-  (listof (or/c #f
-                (and/c path? complete-path?)
-                (hash/c (or/c (and/c symbol? module-path?) #f)
-                        (listof (and/c path? complete-path?))
-                        #:flat? #t))))
-(define lcp/c
-  (listof (and/c path? complete-path?)))
-
-(provide
- (contract-out
-  [alternate-racket-clcl/clcp (-> path-string? (values lcl/c lcp/c))]
-  [find-completions (->* (string? path-string?)
-                         (#:alternate-racket (or/c #f 
-                                                   path-string?
-                                                   (list/c lcl/c lcp/c)))
-                         (listof (list/c string? path?)))]))
-
-(define (ignore? x) 
-  (or (member x '("compiled"))
-      (if (equal? (system-type) 'windows)
-          (regexp-match #rx"[.]bak$" x)
-          (regexp-match #rx"~$" x))))
-
-(define (find-completions str the-current-directory #:alternate-racket [alternate-racket #f])
-  (cond
-    [(and (not (equal? str "")) (equal? (string-ref str 0) #\"))
-     (define no-quotes-string 
-       (cond
-         [(equal? (string-ref str (- (string-length str) 1)) #\")
-          (define no-last-quote (substring str 0 (- (string-length str) 1)))
-          (cond
-            [(equal? "" no-last-quote)
-             no-last-quote]
-            [else
-             (substring no-last-quote 1 (string-length no-last-quote))])]
-         [else
-          (substring str 1 (string-length str))]))
-     (define segments (regexp-split #rx"/" no-quotes-string))
-     (find-completions/internal segments
-                                (list (list "" the-current-directory))
-                                directory-list
-                                directory-exists?)]
-    [else
-     (find-completions-collection/internal str
-                                           (find-all-collection-dirs alternate-racket)
-                                           directory-list
-                                           directory-exists?)]))
-
-(define (find-completions-collection/internal string collection-dirs dir->content is-dir?)
-  (define segments (regexp-split #rx"/" string))
-  (define first-candidates
-    (cond
-      [(null? segments) '()]
-      [else
-       (define reg (regexp (string-append "^" (regexp-quote (car segments)))))
-       (filter (λ (line) (regexp-match reg (list-ref line 0)))
-               collection-dirs)]))
-  (find-completions/internal (cdr segments) first-candidates dir->content is-dir?))
-
-(define (find-completions/internal segments first-candidates dir->content is-dir?)
-  (define unsorted
-    (let loop ([segments segments]
-               [candidates first-candidates])
-      (cond
-        [(null? segments) candidates]
-        [else
-         (define reg (regexp (string-append "^" (regexp-quote (car segments)))))
-         (define nexts
-           (for*/list ([key+candidate (in-list candidates)]
-                       [candidate (in-value (list-ref key+candidate 1))]
-                       #:when (is-dir? candidate)
-                       [ent (in-list (dir->content candidate))]
-                       [ent-str (in-value (path->string ent))]
-                       #:unless (ignore? ent-str)
-                       #:when (regexp-match reg ent-str))
-             (list ent-str (build-path candidate ent))))
-         (loop (cdr segments) nexts)])))
-  (sort unsorted string<=? #:key (λ (x) (path->string (list-ref x 1)))))
-
-;; -> (listof (list string? path?))
-;; returns a list of all of the directories that are being treated as collections,
-;; (together with the names of the collections)
-(define (find-all-collection-dirs alternate-racket)
-  (define-values (library-collection-links library-collection-paths)
-    (cond
-      [(list? alternate-racket)
-       (values (list-ref alternate-racket 0)
-               (list-ref alternate-racket 1))]
-      [else
-       (alternate-racket-clcl/clcp alternate-racket)]))
-  ;; link-content : (listof (list (or/c 'root 'static-root string?) path?))
-  (define link-content 
-    (apply
-     append
-     (for/list ([link (in-list library-collection-links)])
-       (cond
-         [link 
-          (define-values (base name dir?) (split-path link))
-          (cond
-            [(file-exists? link)
-             (define link-ents (with-handlers ([exn:fail? (λ (x) '())])
-                                 (call-with-input-file link read)))
-             (for/list ([link-ent (if (list? link-ents)
-                                      link-ents
-                                      '())]
-                        #:when (if (and (list? link-ent) (= 3 (length link-ent)))
-                                   (and (regexp? (list-ref link-ent 2))
-                                        (regexp-match (list-ref link-ent 2) (version)))
-                                   #t))
-               `(,(list-ref link-ent 0)
-                 ,(simplify-path 
-                   (if (relative-path? (list-ref link-ent 1))
-                       (build-path base (list-ref link-ent 1))
-                       (list-ref link-ent 1)))))]
-            [else '()])]
-         [else
-          (for/list ([clp (in-list library-collection-paths)])
-            `(root ,(simplify-path clp)))]))))
-  
-  (apply
-   append
-   (for/list ([just-one (in-list link-content)])
-     (define-values (what pth) (apply values just-one))
-     (cond
-       [(string? what)
-        (list just-one)]
-       [else
-        (cond
-          [(directory-exists? pth)
-           (for/list ([dir (in-list (directory-list pth))]
-                      #:when (directory-exists? (build-path pth dir)))
-             (list (path->string dir) (build-path pth dir)))]
-          [else '()])]))))
-
-(define (alternate-racket-clcl/clcp alternate-racket) 
-  (define (use-current-racket n)
-    (values (current-library-collection-links)
-            (current-library-collection-paths)))
-  (cond
-    [alternate-racket
-     (cond
-       [(file-exists? alternate-racket)
-        (define result-port (open-output-string))
-        (define success?
-          (parameterize ([current-output-port result-port]
-                         [current-error-port (open-output-nowhere)]
-                         [current-input-port (open-input-string "")])
-            (system* alternate-racket 
-                     "-l" "racket/base"
-                     "-e" 
-                     (format "~s" `(write 
-                                    (let loop ([exp
-                                                (list (current-library-collection-links)
-                                                      (current-library-collection-paths))])
-                                      (cond
-                                        [(pair? exp) (cons (loop (car exp)) (loop (cdr exp)))]
-                                        [(hash? exp) (for/hash ([(k v) (in-hash exp)])
-                                                       (values (loop k)
-                                                               (loop v)))]
-                                        [(path? exp) `#s(pth ,(path->string exp))]
-                                        [else exp])))))))
-        (cond
-          [success?
-           (struct pth (p) #:prefab)
-           (define (convert-back exp)
-             (let loop ([exp exp])
-               (cond
-                 [(pth? exp) (string->path (pth-p exp))]
-                 [(pair? exp) (cons (loop (car exp)) (loop (cdr exp)))]
-                 [(hash? exp) (for/hash ([(k v) (in-hash exp)])
-                                (values (loop k)
-                                        (loop v)))]
-                 [else exp])))
-           (define ip (open-input-string (get-output-string result-port)))
-           (define links/paths 
-             (convert-back
-              (with-handlers ([exn:fail:read? (λ (x) #f)])
-                (read ip))))
-           (define okay-values? (list/c lcl/c lcp/c))
-           (cond
-             [(okay-values? links/paths)
-              (values (list-ref links/paths 0)
-                      (list-ref links/paths 1))]
-             [else (use-current-racket 0)])]
-          [else (use-current-racket 1)])]
-       [else (use-current-racket 2)])]
-    [else (use-current-racket 3)]))
-
-(module+ test
-  (require rackunit
-           racket/list
-           racket/contract
-           racket/match)
-  
-  (define/contract find-completions/c
-    (-> string? (listof (list/c string? path?)) (-> path? (listof path?)) (-> path? boolean?)
-        (listof (list/c string? path?)))
-    find-completions-collection/internal)
-  
-  (define coll-table
-    `(("racket" ,(string->path "/plt/pkgs/compatibility-pkgs/compatibility-lib/racket"))
-      ("racket" ,(string->path "/plt/pkgs/draw-pkgs/draw-lib/racket"))
-      ("racket" ,(string->path "/plt/racket/collects/racket"))
-      ("rackunit" ,(string->path "plt/pkgs/gui-pkgs/gui-lib/rackunit"))))
-  
-  (define (dir-list d)
-    (match (path->string d)
-      ["/plt/racket/collects/racket"
-       (map string->path '("list.rkt" "info.rkt" "include.rkt" "init.rkt" "gui"))]
-      ["/plt/racket/collects/racket/gui"
-       (map string->path '("dynamic.rkt"))]
-      ["/plt/pkgs/draw-pkgs/draw-lib/racket"
-       (map string->path '("gui"))]
-      ["/plt/pkgs/draw-pkgs/draw-lib/racket/gui"
-       (map string->path '("draw.rkt"))]
-      ["plt/pkgs/gui-pkgs/gui-lib/rackunit"
-       (map string->path '("something.rkt"))]
-      [_ '()]))
-  
-  (define (dir-exists? d)
-    (not (regexp-match #rx"rkt$" (path->string d))))
-  
-  (check-equal?
-   (find-completions/c "rack/" coll-table dir-list dir-exists?)
-   `(("gui" ,(string->path "/plt/pkgs/draw-pkgs/draw-lib/racket/gui"))
-     ("gui" ,(string->path "/plt/racket/collects/racket/gui"))
-     ("include.rkt" ,(string->path "/plt/racket/collects/racket/include.rkt"))
-     ("info.rkt" ,(string->path "/plt/racket/collects/racket/info.rkt"))
-     ("init.rkt" ,(string->path "/plt/racket/collects/racket/init.rkt"))
-     ("list.rkt" ,(string->path "/plt/racket/collects/racket/list.rkt"))
-     ("something.rkt" ,(string->path "plt/pkgs/gui-pkgs/gui-lib/rackunit/something.rkt"))))
-  
-  (check-equal?
-   (find-completions/c "racke/" coll-table dir-list dir-exists?)
-   `(("gui" ,(string->path "/plt/pkgs/draw-pkgs/draw-lib/racket/gui"))
-     ("gui" ,(string->path "/plt/racket/collects/racket/gui"))
-     ("include.rkt" ,(string->path "/plt/racket/collects/racket/include.rkt"))
-     ("info.rkt" ,(string->path "/plt/racket/collects/racket/info.rkt"))
-     ("init.rkt" ,(string->path "/plt/racket/collects/racket/init.rkt"))
-     ("list.rkt" ,(string->path "/plt/racket/collects/racket/list.rkt"))))
-  
-  (check-equal?
-   (find-completions/c "rack" coll-table dir-list dir-exists?)
-   coll-table)
-  
-  (check-equal?
-   (find-completions/c "racku" coll-table dir-list dir-exists?)
-   (list (last coll-table)))
-  
-  (check-equal?
-   (find-completions/c "racket/i" coll-table dir-list dir-exists?)
-   (list (list "include.rkt" (string->path "/plt/racket/collects/racket/include.rkt"))
-         (list "info.rkt" (string->path "/plt/racket/collects/racket/info.rkt"))
-         (list "init.rkt" (string->path "/plt/racket/collects/racket/init.rkt"))))
-  
-  (check-equal?
-   (find-completions/c "racket/" coll-table dir-list dir-exists?)
-   (list (list "gui" (string->path "/plt/pkgs/draw-pkgs/draw-lib/racket/gui"))
-         (list "gui" (string->path "/plt/racket/collects/racket/gui"))
-         (list "include.rkt" (string->path "/plt/racket/collects/racket/include.rkt"))
-         (list "info.rkt" (string->path "/plt/racket/collects/racket/info.rkt"))
-         (list "init.rkt" (string->path "/plt/racket/collects/racket/init.rkt"))
-         (list "list.rkt" (string->path "/plt/racket/collects/racket/list.rkt"))))
-  
-  (check-equal?
-   (find-completions/c "racket/g" coll-table dir-list dir-exists?)
-   (list (list "gui" (string->path "/plt/pkgs/draw-pkgs/draw-lib/racket/gui"))
-         (list "gui" (string->path "/plt/racket/collects/racket/gui"))))
-  
-  (check-equal?
-   (find-completions/c "racket/gui/d" coll-table dir-list dir-exists?)
-   (list (list "draw.rkt" (string->path "/plt/pkgs/draw-pkgs/draw-lib/racket/gui/draw.rkt"))
-         (list "dynamic.rkt" (string->path "/plt/racket/collects/racket/gui/dynamic.rkt")))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/font.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/font.rkt
deleted file mode 100644
index 4a43633767..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/font.rkt
+++ /dev/null
@@ -1,211 +0,0 @@
-#lang racket/base
-(require racket/unit
-         racket/class
-         racket/gui/base
-         drracket/private/drsig
-         framework
-         string-constants)
-
-(define sc-smoothing-label (string-constant font-smoothing-label))
-(define sc-smoothing-none (string-constant font-smoothing-none))
-(define sc-smoothing-some (string-constant font-smoothing-some))
-(define sc-smoothing-all (string-constant font-smoothing-all))
-(define sc-smoothing-default (string-constant font-smoothing-default))
-
-(provide font@)
-
-(define-unit font@
-  (import [prefix drracket:language-configuration: drracket:language-configuration/internal^])
-  (export drracket:font^)
-  
-  (define (setup-preferences)
-    (preferences:add-panel
-     (list (string-constant font-prefs-panel-title))
-     (λ (panel)
-       (define main (make-object vertical-panel% panel))
-       (define min-size 1)
-       (define max-size 72)
-       (define options-panel (make-object horizontal-panel% main))
-       (define size-panel (new group-box-panel%
-                               (parent options-panel)
-                               (label (string-constant font-size))))
-       (define (adjust-font-size f)
-         (editor:set-current-preferred-font-size
-          (f (editor:get-current-preferred-font-size))))
-       (define size-slider
-         (new slider%
-              (label #f)
-              (min-value min-size)
-              (max-value max-size)
-              (parent size-panel)
-              (callback
-               (λ (size evt)
-                 (adjust-font-size
-                  (λ (old-size)
-                    (send size get-value)))))
-              (init-value
-               (editor:get-current-preferred-font-size))))
-       (define size-hp (new horizontal-pane% (parent size-panel)))
-       (define (mk-size-button label chng)
-         (new button%
-              (parent size-hp)
-              (stretchable-width #t)
-              (callback
-               (λ (x y)
-                 (adjust-font-size
-                  (λ (old-size)
-                    (min max-size (max min-size (chng old-size)))))))
-              (label label)))
-       (define size-sub1 (mk-size-button "-1" sub1))
-       (define size-add1 (mk-size-button "+1" add1))
-       
-       (define mono-list 'mono-list-not-yet-computed)
-       (define choice-panel 
-         (new (class vertical-panel%
-                (define/private (force-cache receiver)
-                  (when (eq? receiver font-name-control)
-                    (when (symbol? mono-list)
-                      (begin-busy-cursor)
-                      (set! mono-list (sort (get-face-list 'mono) string-ci<=?))
-                      (send font-name-control clear)
-                      (for-each
-                       (λ (x) (send font-name-control append x))
-                       (append mono-list (list (string-constant other...))))
-                      (define pref (preferences:get 'framework:standard-style-list:font-name))
-                      (cond 
-                        [(member pref mono-list)
-                         (send font-name-control set-string-selection pref)]
-                        [else
-                         (send font-name-control set-selection (length mono-list))])
-                      (end-busy-cursor))))
-                (define/override (on-subwindow-event receiver evt)
-                  (unless (or (send evt moving?)
-                              (send evt entering?)
-                              (send evt leaving?))
-                    (force-cache receiver))
-                  (super on-subwindow-event receiver evt))
-                (define/override (on-subwindow-char receiver evt)
-                  (force-cache receiver)
-                  (super on-subwindow-char receiver evt))
-                (super-new [parent options-panel]))))
-       (define font-name-control
-         (new choice%
-              [label (string-constant font-name)]
-              [choices (list (preferences:get 'framework:standard-style-list:font-name))]
-              [parent choice-panel]
-              [stretchable-width #t]
-              [callback
-               (λ (font-name evt)
-                 (define selection (send font-name get-selection))
-                 (cond
-                   [(< selection (length mono-list))
-                    (preferences:set 
-                     'framework:standard-style-list:font-name
-                     (list-ref mono-list selection))]
-                   [else
-                    (define all-faces (get-face-list))
-                    (define init (preferences:get 'framework:standard-style-list:font-name))
-                    (define init-choices
-                      (let loop ([faces all-faces]
-                                 [num 0])
-                        (cond
-                          [(null? faces) null]
-                          [else 
-                           (define face (car faces))
-                           (if (equal? init face)
-                               (list num)
-                               (loop (cdr faces) (+ num 1)))])))
-                    (define choice
-                      (get-choices-from-user
-                       (string-constant select-font-name)
-                       (string-constant select-font-name)
-                       all-faces
-                       #f
-                       init-choices))
-                    (when choice
-                      (preferences:set 
-                       'framework:standard-style-list:font-name 
-                       (list-ref all-faces (car choice))))]))]))
-       (define (set-choice-selection font-name)
-         (cond
-           [(send font-name-control find-string font-name)
-            (send font-name-control set-string-selection font-name)]
-           [else
-            (send font-name-control set-selection (- (send font-name-control get-number) 1))]))
-       (preferences:add-callback
-        'framework:standard-style-list:font-name
-        (λ (p v)
-          (set-choice-selection v)))
-       (set-choice-selection (preferences:get 'framework:standard-style-list:font-name))
-       (define smoothing-contol
-         (new choice%
-              (label sc-smoothing-label)
-              (choices (list sc-smoothing-none
-                             sc-smoothing-some
-                             sc-smoothing-all
-                             sc-smoothing-default))
-              (parent choice-panel)
-              (stretchable-width #t)
-              (selection (case (preferences:get 'framework:standard-style-list:smoothing)
-                           [(unsmoothed) 0]
-                           [(partly-smoothed) 1]
-                           [(smoothed) 2]
-                           [(default) 3]))
-              (callback (λ (x y) 
-                          (preferences:set 
-                           'framework:standard-style-list:smoothing
-                           (case (send x get-selection)
-                             [(0) 'unsmoothed]
-                             [(1) 'partly-smoothed]
-                             [(2) 'smoothed]
-                             [(3) 'default]))))))
-       
-       (define text (new (text:foreground-color-mixin
-                          (editor:standard-style-list-mixin 
-                           text:line-spacing%))))
-       (define ex-panel (new horizontal-panel% [parent main]))
-       (define msg (new message% 
-                        [label (string-constant example-text)]
-                        [parent ex-panel]))
-       (define canvas (make-object canvas:color% main text))
-       (define (update-text setting)
-         (send text begin-edit-sequence)
-         (send text lock #f)
-         (send text erase)
-         (send text insert 
-               (format
-                ";; howmany : list-of-numbers -> number~
-               \n;; to determine how many numbers are in `a-lon'~
-               \n(define (howmany a-lon)~
-               \n  (cond~
-               \n    [(empty? a-lon) 0]~
-               \n    [else (+ 1 (howmany (rest a-lon)))]))~
-               \n~
-               \n;; examples as tests~
-               \n(howmany empty)~
-               \n\"should be\"~
-               \n0~
-               \n~
-               \n(howmany (cons 1 (cons 2 (cons 3 empty))))~
-               \n\"should be\"~
-               \n3"))
-         (send text set-position 0 0)
-         (send text lock #t)
-         (send text end-edit-sequence))
-       (preferences:add-callback
-        'framework:standard-style-list:font-size
-        (λ (p v) (send size-slider set-value 
-                       (editor:font-size-pref->current-font-size
-                        v))))
-       (preferences:add-callback
-        drracket:language-configuration:settings-preferences-symbol
-        (λ (p v)
-          (update-text v)))
-       (update-text (preferences:get drracket:language-configuration:settings-preferences-symbol))
-       (send ex-panel set-alignment 'left 'center)
-       (send ex-panel stretchable-height #f)
-       (send canvas allow-tab-exit #t)
-       (send options-panel stretchable-height #f)
-       (send options-panel set-alignment 'center 'top)
-       (send text lock #t)
-       main))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/frame-icon.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/frame-icon.rkt
deleted file mode 100644
index cf9281228a..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/frame-icon.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket/base
-(require racket/class racket/draw)
-(provide todays-icon)
-
-(define todays-icon
-  (and (eq? (system-type) 'unix)
-       (let ()
-         ;; avoid building the mask unless we use it
-         (define todays-icon
-           (make-object bitmap% 
-             (collection-file-path 
-              (case (date-week-day (seconds->date (current-seconds)))
-                [(6 0) "plt-logo-red-shiny.png"]
-                [else "plt-logo-red-diffuse.png"])
-              "icons")
-             'png/mask))
-         
-         (define todays-icon-bw-mask 
-           (and (send todays-icon ok?)
-                (send todays-icon get-loaded-mask)
-                (let* ([w (send todays-icon get-width)]
-                       [h (send todays-icon get-height)]
-                       [bm (make-object bitmap% w h #t)]
-                       [color-mask (send todays-icon get-loaded-mask)]
-                       [src-bytes (make-bytes (* w h 4) 0)]
-                       [dest-bits (make-bytes (* w h 4) 255)]
-                       [bdc (make-object bitmap-dc% bm)]
-                       [black (send the-color-database find-color "black")]
-                       [white (send the-color-database find-color "white")])
-                  (send color-mask get-argb-pixels 0 0 w h src-bytes #t)
-                  (for ([i (in-range 0 w)])
-                    (for ([j (in-range 0 h)])
-                      (let ([b (= (bytes-ref src-bytes (* 4 (+ i (* j h)))) 0)])
-                        (send bdc set-pixel i j (if b white black)))))
-                  (send bdc set-bitmap #f)
-                  bm)))
-         
-         (when todays-icon-bw-mask
-           (send todays-icon set-loaded-mask todays-icon-bw-mask))
-         todays-icon)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/frame.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/frame.rkt
deleted file mode 100644
index 71e7daa726..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/frame.rkt
+++ /dev/null
@@ -1,1082 +0,0 @@
-#lang racket/base
-
-(module install-pkg racket/base
-  (require racket/class
-           pkg/gui)
-  (provide install-pkg
-           pkg-manager)
-
-  (define pkg-gui #f)
-  
-  (define (pkg-manager wrap-terminal-action)
-    (if pkg-gui
-        (send pkg-gui show #t)
-        (set! pkg-gui (make-pkg-gui #:wrap-terminal-action wrap-terminal-action))))
-  
-  (define (install-pkg parent wrap-terminal-action 
-                       #:package-to-offer [package-to-offer #f])
-    (make-pkg-installer #:parent parent 
-                        #:wrap-terminal-action wrap-terminal-action
-                        #:package-to-offer package-to-offer)))
-
-(module add-racket-to-macosx-path racket/base
-  (require string-constants 
-           racket/system
-           racket/gui/base
-           racket/class
-           setup/dirs)
-  
-  (provide add-menu-macosx-path-item)
-  
-  (define authopen "/usr/libexec/authopen")
-  (define paths.d "/etc/paths.d") 
-  
-  (define (add-menu-macosx-path-item menu)
-    (when (equal? (system-type) 'macosx)
-      (define bin-dir (find-console-bin-dir))
-      (when bin-dir
-        (when (file-exists? authopen)
-          (when (directory-exists? paths.d)
-            (define paths.d/racket (build-path paths.d "racket"))
-            (define (add-racket/bin-to-path)
-              (define sp (open-output-string))
-              (define succeeded?
-                (parameterize ([current-input-port 
-                                (open-input-string 
-                                 (format "~a\n" bin-dir))]
-                               [current-output-port sp]
-                               [current-error-port sp])
-                  (system* authopen "-c" "-w" (path->string paths.d/racket))))
-              (define output (get-output-string sp))
-              (define basic-success-message
-                (format (string-constant added-racket/bin-to-path)
-                        paths.d/racket
-                        bin-dir
-                        paths.d/racket))
-              (cond
-                [(and (equal? output "") succeeded?)
-                 (message-box (string-constant drracket)
-                              basic-success-message)]
-                [succeeded?
-                 (message-box (string-constant drracket)
-                              (string-append
-                               basic-success-message
-                               "\n\n" output))]
-                [else
-                 (message-box (string-constant drracket)
-                              (string-append
-                               (format (string-constant adding-racket/bin-to-path-failed)
-                                       (if (equal? output "")
-                                           ""
-                                           (string-append "\n\n" output "\n\n"))
-                                       paths.d/racket
-                                       bin-dir)))])
-              (void))
-            (new menu-item% 
-                 [label (string-constant add-racket/bin-to-path)]
-                 [parent menu]
-                 [callback (λ (x y) (add-racket/bin-to-path))])))))))
-
-(module key-bindings racket/base
-  
-  (require racket/class
-           racket/gui/base
-           racket/contract
-           framework)
-  
-  (provide
-   (contract-out
-    [get-sorted-keybindings
-     (-> (or/c #f (is-a?/c text%))
-         (is-a?/c frame%)
-         (listof (list/c symbol? string?)))]))
-  
-  (define (get-sorted-keybindings edit-object frame)
-    (define keymap (and edit-object (send edit-object get-keymap)))
-    (define menu-names (get-menu-bindings frame))
-    (define bindings (if (is-a? keymap keymap:aug-keymap<%>)
-                         (hash-map (send keymap get-map-function-table) list) 
-                         '()))
-    (define w/menus 
-      (append (hash-map menu-names list)
-              (filter (λ (binding) (not (bound-by-menu? binding menu-names)))
-                      bindings)))
-    (sort
-     (sort
-      w/menus
-      symbol<?
-      #:key car)
-     string-ci<?
-     #:key cadr))
-
-  (define (bound-by-menu? binding menu-table)
-    (ormap (λ (constituent)
-             (hash-ref menu-table (string->symbol constituent) (λ () #f)))
-           (regexp-split #rx";" (symbol->string (car binding)))))
-  
-  (define (get-menu-bindings frame)
-    (define name-ht (make-hasheq))
-    (define mb (send frame get-menu-bar))
-    (when mb
-      (let loop ([menu-container mb])
-        (for ([item (in-list (send menu-container get-items))])
-          (when (is-a? item selectable-menu-item<%>)
-            (define short-cut (send item get-shortcut))
-            (when short-cut
-              (define keyname
-                (string->symbol
-                 (keymap:canonicalize-keybinding-string
-                  (string-append
-                   (menu-item->prefix-string item)
-                   (case short-cut
-                     [(#\;) "semicolon"]
-                     [(#\:) "colon"]
-                     [(#\space) "space"]
-                     [else 
-                      (cond
-                        [(symbol? short-cut) (symbol->string short-cut)]
-                        [(char? short-cut) (string short-cut)])])))))
-              (hash-set! name-ht keyname (send item get-plain-label))))
-          (when (is-a? item menu-item-container<%>)
-            (loop item))))
-      (when (member (system-type) '(unix windows))
-        (for ([top-level-menu (in-list (send mb get-items))])
-          (when (is-a? top-level-menu menu%)
-            (define amp-key
-              (let loop ([str (send top-level-menu get-label)])
-                (cond
-                  [(regexp-match #rx"[^&]*[&](.)(.*)" str)
-                   =>
-                   (λ (m)
-                     (define this-amp (list-ref m 1))
-                     (define rest (list-ref m 2))
-                     (cond
-                       [(equal? this-amp "&")
-                        (loop rest)]
-                       [else 
-                        (string-downcase this-amp)]))]
-                  [else #f])))
-            (when amp-key
-              (hash-set! name-ht 
-                         (string->symbol (format "m:~a" amp-key))
-                         (format "~a menu" (send top-level-menu get-plain-label)))
-              (when (equal? (system-type) 'windows)
-                (hash-set! name-ht 
-                           (string->symbol (format "m:s:~a" amp-key))
-                           (format "~a menu" (send top-level-menu get-plain-label)))))))))
-    name-ht)
-  
-  (define (menu-item->prefix-string item)
-    (apply
-     string-append
-     (map (λ (prefix)
-            (case prefix
-              [(alt) (if (eq? (system-type) 'windows)
-                         "m:"
-                         "a:")]
-              [(cmd) "d:"]
-              [(meta) "m:"]
-              [(ctl) "c:"]
-              [(shift) "s:"]
-              [(opt option) "a:"]
-              [else (error 'menu-item->prefix-string "unknown prefix ~s\n" prefix)]))
-          (send item get-shortcut-prefix)))))
-
-(require string-constants
-         racket/match
-         racket/class
-         racket/string
-         racket/file
-         racket/math
-         racket/unit
-         drracket/private/drsig
-         racket/gui/base
-         framework
-         net/url
-         net/head
-         setup/plt-installer
-         help/bug-report
-         setup/unpack
-         mrlib/terminal
-         (submod "." install-pkg)
-         "get-module-path.rkt")
-(provide frame@)
-(define-unit frame@  
-  (import [prefix drracket:unit: drracket:unit/int^]
-          [prefix drracket:app: drracket:app^]
-          [prefix help: drracket:help-desk^]
-          [prefix drracket:multi-file-search: drracket:multi-file-search^]
-          [prefix drracket:init: drracket:init^]
-          [prefix drracket: drracket:interface^])
-  (export (rename drracket:frame/int^
-                  [-mixin mixin]))
-  
-  (define last-keybindings-planet-attempt "")
-  
-  (define basics-mixin
-    (mixin (frame:standard-menus<%>) (drracket:frame:basics<%>)
-      
-      (define/override (on-subwindow-focus win on?)
-        (when the-keybindings-frame
-          (when on? 
-            (send the-keybindings-frame set-bindings
-                  (if (can-show-keybindings?)
-                      (get-keybindings-to-show)
-                      '())))))
-      
-      (define/override (on-subwindow-char receiver event)
-        (define user-key? (send (keymap:get-user)
-                                handle-key-event
-                                (if (is-a? receiver editor-canvas%)
-                                    (send receiver get-editor)
-                                    receiver)
-                                event))
-        ;; (printf "user-key? ~s\n" user-key?)
-        (or user-key?
-            (super on-subwindow-char receiver event)))
-      
-      (inherit get-edit-target-window get-edit-target-object get-menu-bar)
-      
-            
-      (define/private (can-show-keybindings?)
-        (define edit-object (get-edit-target-object))
-        (and edit-object
-             (is-a? edit-object editor<%>)
-             (let ([keymap (send edit-object get-keymap)])
-               (is-a? keymap keymap:aug-keymap<%>))))
-      
-      ;; pre: (can-show-keybindings?) = #t
-      (define/private (get-keybindings-to-show)
-        (get-sorted-keybindings (get-edit-target-object) this))
-      
-      (define/private (show-keybindings)
-        (if (can-show-keybindings?)
-            (show-keybindings-to-user (get-keybindings-to-show) this)
-            (bell)))
-      
-      (define/override (help-menu:before-about help-menu)
-        (make-help-desk-menu-item help-menu))
-      
-      (define/override (help-menu:about-callback item evt) (drracket:app:about-drscheme))
-      (define/override (help-menu:about-string) (string-constant about-drscheme))
-      (define/override (help-menu:create-about?) #t)
-      
-      (define/public (get-additional-important-urls) '())
-      (define/override (help-menu:after-about menu)
-        (drracket-help-menu:after-about menu this))
-      
-      (define/override (file-menu:new-string) (string-constant new-menu-item))
-      (define/override (file-menu:create-new?) #t)
-      (define/override (file-menu:open-string) (string-constant open-menu-item))
-      (define/override (file-menu:create-open?) #t)
-      (define/override (file-menu:create-open-recent?) #t)
-      
-      (define/override (file-menu:between-open-and-revert file-menu) 
-        (new menu-item% 
-             [label (string-constant install-plt-file-menu-item...)]
-             [parent file-menu]
-             [callback (λ (item evt)
-                         (install-plt-file this))])
-        (new menu-item% 
-             [label (string-constant install-pkg-menu-item...)]
-             [parent file-menu]
-             [callback
-              (λ (item evt) 
-                 (install-pkg this
-                              (lambda (thunk)
-                                (parameterize ([error-display-handler 
-                                                drracket:init:original-error-display-handler])
-                                  (thunk)))))])
-        (new separator-menu-item% [parent file-menu])
-        (new menu-item% 
-             [label (string-constant pkg-manager-menu-item)]
-             [parent file-menu]
-             [callback
-              (λ (item evt) 
-                (pkg-manager (lambda (thunk)
-                               (parameterize ([error-display-handler 
-                                               drracket:init:original-error-display-handler])
-                                 (thunk)))))])
-        (super file-menu:between-open-and-revert file-menu))
-      
-      (define/override (file-menu:between-print-and-close menu)
-        (super file-menu:between-print-and-close menu)
-        (instantiate menu-item% ()
-          (label (string-constant mfs-multi-file-search-menu-item))
-          (parent menu)
-          (callback
-           (λ (_1 _2)
-             (drracket:multi-file-search:multi-file-search))))
-        (new separator-menu-item% (parent menu)))
-      
-      (define/override (edit-menu:between-find-and-preferences menu)
-        (super edit-menu:between-find-and-preferences menu)
-        (when (current-eventspace-has-standard-menus?)
-          (new separator-menu-item% [parent menu]))
-        (define (keybindings-on-demand menu-item)
-          (define last-edit-object (get-edit-target-window))
-          (send menu-item enable (can-show-keybindings?)))
-        (new menu%
-             (label (string-constant keybindings-menu-item))
-             (parent menu)
-             (demand-callback
-              (λ (keybindings-menu)
-                (for-each (λ (old) (send old delete)) 
-                          (send keybindings-menu get-items))
-                (new menu-item%
-                     (parent keybindings-menu)
-                     (label (string-constant keybindings-show-active))
-                     (callback (λ (x y) (show-keybindings)))
-                     (help-string (string-constant keybindings-info))
-                     (demand-callback keybindings-on-demand))
-                (new menu-item%
-                     (parent keybindings-menu)
-                     (label (string-constant keybindings-add-user-defined-keybindings))
-                     (callback
-                      (λ (x y)
-                        (with-handlers ([exn? (λ (x)
-                                                (printf "~a\n" (exn-message x)))])
-                          (let ([filename (finder:get-file
-                                           #f
-                                           (string-constant keybindings-choose-user-defined-file)
-                                           #f
-                                           ""
-                                           this)])
-                            (when filename
-                              (add-keybindings-item/update-prefs filename)))))))
-                (new menu-item%
-                     (parent keybindings-menu)
-                     (label (string-constant keybindings-add-user-defined-keybindings/planet))
-                     (callback
-                      (λ (x y)
-                        (define planet-spec
-                          (get-text-from-user (string-constant drscheme)
-                                              (string-constant keybindings-type-planet-spec)
-                                              this
-                                              last-keybindings-planet-attempt))
-                        (when planet-spec
-                          (set! last-keybindings-planet-attempt planet-spec)
-                          (cond
-                            [(planet-string-spec? planet-spec)
-                             =>
-                             (λ (planet-sexp-spec)
-                               (add-keybindings-item/update-prefs planet-sexp-spec))]
-                            [else
-                             (message-box (string-constant drscheme)
-                                          (format (string-constant keybindings-planet-malformed-spec)
-                                                  planet-spec)
-                                          #:dialog-mixin frame:focus-table-mixin)])))))
-                (define ud (preferences:get 'drracket:user-defined-keybindings))
-                (unless (null? ud)
-                  (new separator-menu-item% (parent keybindings-menu))
-                  (for ([item (in-list ud)])
-                    (new menu-item%
-                         (label (format (string-constant keybindings-menu-remove)
-                                        (if (path? item)
-                                            (path->string item)
-                                            (format "~s" item))))
-                         (parent keybindings-menu)
-                         (callback
-                          (λ (x y) (remove-keybindings-item item)))))))))
-        (unless (current-eventspace-has-standard-menus?)
-          (make-object separator-menu-item% menu)))
-      
-      (super-new)))
-  
-  (define (add-keybindings-item/update-prefs item)
-    (when (add-keybindings-item item)
-      (preferences:set 'drracket:user-defined-keybindings
-                       (cons item
-                             (preferences:get 'drracket:user-defined-keybindings)))))
-  
-  (define (planet-string-spec? p)
-    (let ([sexp
-           (with-handlers ([exn:fail:read? (λ (x) #f)])
-             (read (open-input-string p)))])
-      (and sexp
-           (planet-spec? sexp)
-           sexp)))
-  
-  (define (planet-spec? p)
-    (match p
-      [`(planet ,(? string?) (,(? string?) ,(? string?) ,(? number?))) #t]
-      [`(planet ,(? string?) (,(? string?) ,(? string?) ,(? number?) ,(? number?))) #t]
-      [else #f]))
-  
-  ;; add-keybindings-item : keybindings-item[path or planet spec] -> boolean
-  ;; boolean indicates if the addition happened sucessfully
-  (define (add-keybindings-item item)
-    (with-handlers ([exn:fail?
-                     (λ (x)
-                       (message-box (string-constant drscheme)
-                                    (format (string-constant keybindings-error-installing-file)
-                                            (if (path? item)
-                                                (path->string item)
-                                                (format "~s" item))
-                                            (exn-message x))
-                                    #:dialog-mixin frame:focus-table-mixin)
-                       #f)])
-      (keymap:add-user-keybindings-file item)
-      #t))
-  
-  (define (remove-keybindings-item item)
-    (keymap:remove-user-keybindings-file item)
-    (preferences:set
-     'drracket:user-defined-keybindings
-     (remove item
-             (preferences:get 'drracket:user-defined-keybindings))))
-  
-  ;; install-plt-file : (union #f dialog% frame%) -> void
-  ;; asks the user for a .plt file, either from the web or from
-  ;; a file on the disk and installs it.
-  (define (install-plt-file parent)
-    (define pref (preferences:get 'drracket:install-plt-dialog))
-    (define dialog
-      (new dialog% [parent parent]
-           [label (string-constant install-plt-file-dialog-title)]
-           [alignment '(left center)]))
-    (define tab-panel
-      (new tab-panel% [parent dialog]
-           [callback (λ (x y) (update-panels))]
-           [choices (list (string-constant install-plt-web-tab)
-                          (string-constant install-plt-file-tab))]))
-    (define outer-swapping-panel
-      (new horizontal-panel% [parent tab-panel]
-           [stretchable-height #f]))
-    (define spacing-panel
-      (new horizontal-panel% [parent outer-swapping-panel]
-           [stretchable-width #f]
-           [min-width 20]))
-    (define swapping-panel
-      (new panel:single% [parent outer-swapping-panel]
-           [alignment '(left center)]
-           [stretchable-width #t] [stretchable-height #f]))
-    (define file-panel
-      (new horizontal-panel% [parent swapping-panel]
-           [stretchable-width #t] [stretchable-height #f]))
-    (define url-panel
-      (new horizontal-panel% [parent swapping-panel]
-           [stretchable-height #f]))
-    (define button-panel
-      (new horizontal-panel% [parent dialog]
-           [stretchable-height #f] [alignment '(right center)]))
-    (define file-text-field
-      (keymap:call/text-keymap-initializer
-       (λ ()
-         (new text-field% [parent file-panel]
-              [callback void] [min-width 300] [stretchable-width #t]
-              [init-value (caddr pref)]
-              [label (string-constant install-plt-filename)]))))
-    (define file-button
-      (new button% [parent file-panel]
-           [callback (λ (x y) (browse))]
-           [label (string-constant browse...)]))
-    (define url-text-field
-      (keymap:call/text-keymap-initializer
-       (λ ()
-         (new text-field% [parent url-panel]
-              [min-width 300] [stretchable-width #t] [callback void]
-              [init-value (cadr pref)]
-              [label (string-constant install-plt-url)]))))
-    (define-values (ok-button cancel-button)
-      (gui-utils:ok/cancel-buttons
-       button-panel
-       (λ (x y) (set! cancel? #f) (send dialog show #f))
-       (λ (x y) (send dialog show #f))))
-    ;; browse : -> void
-    ;; gets the name of a file from the user and updates file-text-field
-    (define (browse)
-      (let ([filename (parameterize ([finder:default-extension "plt"]
-                                     [finder:default-filters
-                                      (if (eq? (system-type) 'macosx)
-                                          (finder:default-filters)
-                                          '(("PLT Files" "*.plt")
-                                            ("Any" "*.*")))])
-                        (finder:get-file #f "" #f "" dialog))])
-        (when filename
-          (send file-text-field set-value (path->string filename)))))
-    ;; from-web? : -> boolean
-    ;; returns #t if the user has selected a web address
-    (define (from-web?)
-      (zero? (send tab-panel get-selection)))
-    (define cancel? #t)
-    (define (update-panels)
-      (define w? (from-web?))
-      (define t  (if w? url-text-field file-text-field))
-      (send swapping-panel active-child (if w? url-panel file-panel))
-      (send t focus)
-      (send (send t get-editor) set-position
-            0 (string-length (send t get-value))))
-    ;; initialize
-    (send tab-panel set-selection (if (car pref) 0 1))
-    (update-panels)
-    (send dialog show #t)
-    (preferences:set 'drracket:install-plt-dialog
-                     (list (from-web?)
-                           (send url-text-field get-value)
-                           (send file-text-field get-value)))
-    (cond
-      [cancel? (void)]
-      [(from-web?)
-       (install-plt-from-url
-        (let* ([url (send url-text-field get-value)]
-               ;; trim whitespaces
-               [url (regexp-replace #rx"^ +" url "")]
-               [url (regexp-replace #rx" +$" url "")])
-          (if (regexp-match? #rx"^(?:[^/:]*://|$)" url)
-            url
-            (string-append "http://" url)))
-        parent)]
-      [else (parameterize ([error-display-handler
-                            drracket:init:original-error-display-handler])
-              (run-installer
-               (string->path (send file-text-field get-value))))]))
-
-  ;; install-plt-from-url : string (union #f dialog%) -> void
-  ;; downloads and installs a .plt file from the given url
-  (define (install-plt-from-url s-url parent)
-    (define url (string->url s-url))
-    (define-values (port header) 
-      (with-handlers ([exn:fail? (λ (x) (values #f x))])
-        (get-pure-port/headers url #:redirections 5)))
-    (cond
-      [port
-       (define size
-         (let* ([content-header (extract-field "content-length" header)]
-                [m (and content-header
-                        (regexp-match "[0-9]+" content-header))])
-           (and m (string->number (car m)))))
-       (define tmp-filename (make-temporary-file "tmp~a.plt"))
-       (define d (make-object dialog% (string-constant downloading) parent))
-       (define message (make-object message% (string-constant downloading-file...) d))
-       (define gauge (if size 
-                         (make-object gauge% #f 100 d) 
-                         #f))
-       (define exn #f)
-       ; Semaphores to avoid race conditions: 
-       (define wait-to-start (make-semaphore 0))
-       (define wait-to-break (make-semaphore 0))
-       ; Thread to perform the download: 
-       (define t
-         (thread 
-          (λ () 
-            (semaphore-wait wait-to-start) 
-            (with-handlers ([exn:fail?
-                             (λ (x) 
-                               (set! exn x))] 
-                            [exn:break? ; throw away break exceptions 
-                             void])
-              (semaphore-post wait-to-break) 
-              (with-output-to-file tmp-filename 
-                (λ () 
-                  (let loop ([total 0]) 
-                    (when gauge 
-                      (send gauge set-value  
-                            (inexact->exact 
-                             (floor (* 100 (/ total size)))))) 
-                    (let ([s (read-string 1024 port)]) 
-                      (unless (eof-object? s) 
-                        (unless (eof-object? s) 
-                          (display s) 
-                          (loop (+ total (string-length s))))))))
-                #:mode 'binary #:exists 'truncate))
-            (send d show #f))))
-       (send d center) 
-       (make-object button% (string-constant &stop)
-         d
-         (λ (b e) 
-           (semaphore-wait wait-to-break) 
-           (set! tmp-filename #f) 
-           (send d show #f) 
-           (break-thread t))) 
-       ; Let thread run only after the dialog is shown 
-       (queue-callback (λ () (semaphore-post wait-to-start))) 
-       (send d show #t) 
-       (when exn (raise exn))
-       (define unpack-err (open-output-string))
-       (cond
-         [(with-handlers ((exn:fail? values))
-            (parameterize ([error-display-handler drracket:init:original-error-display-handler]
-                           [current-error-port unpack-err])
-              (fold-plt-archive tmp-filename void void void void void))
-            #f)
-          =>
-          (λ (exn)
-            (delete-file tmp-filename)
-            (message-box (string-constant drscheme)
-                         (string-append 
-                          (string-constant install-plt-error-header)
-                          "\n\n"
-                          (exn-message exn)
-                          "\n\n"
-                          (get-output-string unpack-err))
-                         #:dialog-mixin frame:focus-table-mixin))]
-         [else
-          (parameterize ([error-display-handler drracket:init:original-error-display-handler])
-            (run-installer tmp-filename
-                           (λ ()
-                             (delete-file tmp-filename))))])]
-      [else
-       (define exn header)
-       (define sp (open-output-string))
-       (parameterize ([current-error-port sp])
-         (drracket:init:original-error-display-handler (exn-message exn) exn))
-       (message-box (string-constant drracket)
-                    (string-append
-                     (string-constant install-plt-error-downloading)
-                     (get-output-string sp)))]))
-  
-  (define keybindings-frame%
-    (class frame%
-      (init-field bindings)
-      
-      (define/override (on-size w h)
-        (preferences:set 'drracket:keybindings-window-size (cons w h))
-        (super on-size w h))
-
-      (super-new)
-  
-      (define/public (set-bindings _bindings)
-        (set! bindings _bindings)
-        (update-bindings))
-      
-      (define bp (make-object horizontal-panel% this))
-      (define search-field 
-        (keymap:call/text-keymap-initializer
-         (λ ()
-           (new text-field% 
-                [parent this]
-                [label (string-constant mfs-search-string)]
-                [callback (λ (a b) (update-bindings))]))))
-      (define b-name (new button%
-                          [label (string-constant keybindings-sort-by-name)]
-                          [parent bp]
-                          [callback
-                           (λ x 
-                             (set! by-key? #f)
-                             (update-bindings))]))
-      (define b-key (new button%
-                         [label (string-constant keybindings-sort-by-key)]
-                         [parent bp]
-                         [callback (λ x 
-                                     (set! by-key? #t)
-                                     (update-bindings))]))
-      (define lb (new list-box% [parent this] [label #f] [choices '()]))
-      (define by-key? #f)
-      (define bp2 (make-object horizontal-panel% this))
-      (define cancel (make-object button% (string-constant close)
-                       bp2 (λ x (send this show #f))))
-
-      (define/private (update-bindings)
-        (let ([format-binding/name
-               (λ (b) (format "~a (~a)" (cadr b) (car b)))]
-              [format-binding/key
-               (λ (b) (format "~a (~a)" (car b) (cadr b)))]
-              [predicate/key
-               (λ (a b) (string-ci<=? (format "~a" (car a))
-                                      (format "~a" (car b))))]
-              [predicate/name
-               (λ (a b) (string-ci<=? (cadr a) (cadr b)))])
-          (send lb set
-                (if by-key?
-                    (map format-binding/key (sort (filter-search bindings) predicate/key))
-                    (map format-binding/name (sort (filter-search bindings) predicate/name))))))
-      
-      (define/private (filter-search bindings)
-        (let ([str (send search-field get-value)])
-          (if (equal? str "")
-              bindings
-              (let ([reg (regexp (regexp-quote str #f))])
-                (filter (λ (x) (or (regexp-match reg (cadr x))
-                                   (regexp-match reg (format "~a" (car x)))))
-                        bindings)))))
-      (send search-field focus)
-      (send bp stretchable-height #f)
-      (send bp set-alignment 'center 'center)
-      (send bp2 stretchable-height #f)
-      (send bp2 set-alignment 'right 'center)
-      (update-bindings)))
-
-  (define the-keybindings-frame #f)
-  
-  (define (show-keybindings-to-user bindings frame)
-    (unless the-keybindings-frame
-      (set! the-keybindings-frame
-            (new keybindings-frame% 
-                 [label (string-constant keybindings-frame-title)]
-                 [width (car (preferences:get 'drracket:keybindings-window-size))]
-                 [height (cdr (preferences:get 'drracket:keybindings-window-size))]
-                 [bindings bindings])))
-    (send the-keybindings-frame show #t))
-  
-  (define -mixin
-    (mixin (frame:editor<%> frame:text-info<%> drracket:frame:basics<%>) (drracket:frame:<%>)
-      (inherit get-editor get-menu% get-menu-bar)
-      (define show-menu #f)
-      (define/public get-show-menu (λ () show-menu))
-      (define/public update-shown (λ () (void)))
-      (define/public (add-show-menu-items show-menu) (void))
-      (define sort-menu-sort-keys (make-hasheq))
-      (define/public (set-show-menu-sort-key item val)
-        (cond
-          [sort-menu-sort-keys 
-           (for ([(k v) (in-hash sort-menu-sort-keys)])
-             (when (eq? k item)
-               (error 'set-show-menu-sort-key
-                      "set menu item ~s twice, to ~s and ~s"
-                      (send item get-label)
-                      v val))
-             (when (= v val)
-               (error 'set-show-menu-sort-key
-                      "two menu items have the same val: ~s and ~s"
-                      (send k get-label)
-                      (send item get-label))))
-           (hash-set! sort-menu-sort-keys item val)]
-          [else
-           (error 'set-show-menu-sort-key 
-                  "the sort menu has already been created and its order has been set")]))
-      (super-new)
-      (set! show-menu (make-object (get-menu%) (string-constant view-menu-label)
-                        (get-menu-bar)))
-      (add-show-menu-items show-menu)
-      (sort-show-menu-items show-menu sort-menu-sort-keys)
-      (set! sort-menu-sort-keys #f)))
-  
-  (define (sort-show-menu-items show-menu show-menu-sort-keys)
-    (define items (send show-menu get-items))
-    (for ([itm (in-list items)])
-      (send itm delete))
-    (define (get-key item)
-      (hash-ref show-menu-sort-keys item 
-                (λ () 
-                  (define lab
-                    (cond
-                      [(is-a? item labelled-menu-item<%>)
-                       (send item get-label)]
-                      [else ""]))
-                  (cond 
-                    [(regexp-match #rx"^Show (.*)$" lab)
-                     => (λ (x) (list-ref x 1))]
-                    [(regexp-match #rx"^Hide (.*)$" lab)
-                     => (λ (x) (list-ref x 1))]
-                    [else lab]))))
-    (define (cmp item-x item-y)
-      (define x (get-key item-x))
-      (define y (get-key item-y))
-      (cond
-        [(and (number? x) (number? y)) (< x y)]
-        [(and (string? x) (string? y)) (string<=? x y)]
-        [(and (number? x) (string? y)) #t]
-        [(and (string? x) (number? y)) #f]))
-    (define sorted-items (sort items cmp))
-    
-    (define (different-slots? item-key next-item-key)
-      (or (not (= (quotient item-key 100)
-                  (quotient next-item-key 100)))
-          (not (= (sgn item-key)
-                  (sgn next-item-key)))))
-    
-    (for ([item (in-list sorted-items)]
-          [next-item (in-list (append (cdr sorted-items) (list #f)))])
-      (define item-key (get-key item))
-      (define next-item-key (and next-item (get-key next-item)))
-      (define add-sep?
-        (cond
-          [(and (number? item-key) (number? next-item-key))
-           (different-slots? item-key next-item-key)]
-          [(or (and (string? item-key) (string? next-item-key))
-               (not next-item-key))
-           #f]
-          [else #t]))
-      (send item restore)  
-      (when add-sep?
-        (new separator-menu-item% [parent show-menu]))))
-  
-  
-  (define (create-root-menubar)
-    (define mb (new menu-bar% (parent 'root)))
-    (define file-menu (new menu% 
-                           (label (string-constant file-menu))
-                           (parent mb)))
-    (define help-menu (new menu% 
-                           (label (string-constant help-menu))
-                           (parent mb)))
-    (new menu-item%
-         (label (string-constant new-menu-item))
-         (parent file-menu)
-         (shortcut #\n)
-         (callback
-          (λ (x y)
-            (handler:edit-file #f)
-            #t)))
-    (new menu-item%
-         (label (string-constant open-menu-item))
-         (parent file-menu)
-         (shortcut #\o)
-         (callback
-          (λ (x y)
-            (handler:open-file)
-            #t)))
-    (new menu-item%
-         [label (string-constant open-require-path)]
-         [shortcut #\o]
-         [shortcut-prefix (cons 'shift (get-default-shortcut-prefix))]
-         [parent file-menu]
-         [callback
-          (λ (x y)
-            (define pth
-              (get-module-path-from-user
-               #:init (preferences:get 'drracket:open-module-path-last-used)
-               #:pref 'drracket:open-module-path-last-used))
-            (when pth (handler:edit-file pth)))])
-    (new menu%
-         (label (string-constant open-recent-menu-item))
-         (parent file-menu)
-         (demand-callback
-          (λ (menu)
-            (handler:install-recent-items menu))))
-    (new menu-item%
-         [label (string-constant mfs-multi-file-search-menu-item)]
-         [parent file-menu]
-         [callback
-          (λ (_1 _2)
-            (drracket:multi-file-search:multi-file-search))])
-    (unless (current-eventspace-has-standard-menus?)
-      (new separator-menu-item% (parent file-menu))
-      (new menu-item%
-           (label (string-constant quit-menu-item-others))
-           (parent file-menu)
-           (shortcut #\q)
-           (callback
-            (λ (x y)
-              (when (exit:user-oks-exit)
-                (exit:exit))
-              #t))))
-    (make-help-desk-menu-item help-menu)
-    (drracket-help-menu:after-about help-menu #f))
-  
-  (define (make-help-desk-menu-item help-menu)
-    (define (docs-menu-item label)
-      (new menu-item%
-           [label label]
-           [parent help-menu]
-           [callback (λ (item evt) (help:help-desk) #t)]))
-    (docs-menu-item (string-constant racket-documentation))
-    (new separator-menu-item% [parent help-menu])
-    (docs-menu-item (string-constant help-desk)))
-
-  (define (drracket-help-menu:after-about menu dlg-parent)
-    (drracket:app:add-important-urls-to-help-menu menu '())
-    (new menu-item%
-         [label (string-constant bug-report-submit-menu-item)]
-         [parent menu]
-         [callback
-          (λ (x y)
-            (define saved (saved-bug-report-titles/ids))
-            (cond
-              [(null? saved)
-               (help-desk:report-bug #f #:frame-mixin basics-mixin)]
-              [else
-               (define which #f)
-               (define (done the-one)
-                 (set! which the-one)
-                 (send dlg show #f))
-               (define dlg (new dialog% 
-                                [label (string-constant drscheme)]
-                                [parent dlg-parent]))
-               (define btn1 (new button% 
-                                 [parent dlg]
-                                 [label (string-constant new-bug-report)]
-                                 [callback (λ (x y) (done #f))]))
-               (new message% [parent dlg] [label (string-constant saved-unsubmitted-bug-reports)])
-               (define btns
-                 (cons btn1
-                       (for/list ([a-brinfo (in-list saved)])
-                         (new button%
-                              [parent dlg]
-                              [label (brinfo-title a-brinfo)]
-                              [callback
-                               (λ (x y) (done (brinfo-id a-brinfo)))]))))
-               (define width (apply max (map (λ (x) (let-values ([(w h) (send x get-client-size)]) w))
-                                             btns)))
-               (for ([x (in-list btns)])
-                 (send x min-width width))
-               (send btn1 focus)
-               (send dlg show #t)
-               (help-desk:report-bug which #:frame-mixin basics-mixin)]))])
-    (new menu%
-         [label (string-constant saved-bug-reports-menu-item)]
-         [parent menu]
-         [demand-callback
-          (let ([last-time (gensym)]) ;;  a unique thing to guarantee the menu is built the first time
-            (λ (saved-bug-reports-menu)
-              (define this-time (saved-bug-report-titles/ids))
-              (unless (equal? last-time this-time)
-                (set! last-time this-time)
-                (for ([x (in-list (send saved-bug-reports-menu get-items))])
-                  (send x delete))
-                (cond
-                  [(null? this-time)
-                   (send (new menu-item%
-                              [parent saved-bug-reports-menu]
-                              [label (string-constant no-saved-bug-reports)]
-                              [callback void])
-                         enable #f)]
-                  [else
-                   (for ([a-brinfo (in-list this-time)])
-                     (new menu-item%
-                          [parent saved-bug-reports-menu]
-                          [label (brinfo-title a-brinfo)]
-                          [callback
-                           (λ (x y)
-                             (help-desk:report-bug (brinfo-id a-brinfo) 
-                                                   #:frame-mixin basics-mixin))]))
-                   (new separator-menu-item% [parent saved-bug-reports-menu])
-                   (new menu-item%
-                        [parent saved-bug-reports-menu]
-                        [label (string-constant disacard-all-saved-bug-reports)]
-                        [callback (λ (x y) (discard-all-saved-bug-reports))])]))))])
-    (add-menu-macosx-path-item menu)
-    (drracket:app:add-language-items-to-help-menu menu)))
-
-
-(require (submod "." add-racket-to-macosx-path)
-         (submod "." key-bindings))
-
-
-(module test racket/base
-  (require rackunit
-           racket/class
-           racket/gui/base
-           framework
-           (submod ".." key-bindings))
-
-  (check-equal? (get-sorted-keybindings #f (new frame% [label ""]))
-                '())
-  (check-equal? (get-sorted-keybindings (new text%) (new frame% [label ""]))
-                '())
-  
-  (let ()
-    (define k (new keymap%))
-    (define t (new text%))
-    (send t set-keymap k)
-    
-    (check-equal? 
-     (get-sorted-keybindings t (new frame% [label ""]))
-     '()))
-  
-  (let ()
-    (define k (new keymap:aug-keymap%))
-    (send k add-function "x" void)
-    (send k map-function "c:x" "x")
-    (define t (new text%))
-    (send t set-keymap k)
-  
-    (check-equal? 
-     (get-sorted-keybindings t (new frame% [label ""]))
-     '((c:x "x"))))
-  
-  (let ()
-    (define k (new keymap:aug-keymap%))
-    (send k add-function "x" void)
-    (send k map-function "c:x" "x")
-    (define t (new text%))
-    (send t set-keymap k)
-    
-    (define f (new frame% [label ""]))
-    (define mb (new menu-bar% [parent f]))
-    (define m (new menu% [label "Edit"] [parent mb]))
-    (define mi (new menu-item% [label "Cut"] [shortcut #\x] [parent m] [callback void]))
-    
-    (check-equal? 
-     (get-sorted-keybindings t f)
-     (case (system-type)
-       [(macosx) 
-        '((d:x "Cut") (c:x "x"))]
-       [(windows unix)
-        '((c:x "Cut"))])))
-  
-  (let ()
-    (define k (new keymap:aug-keymap%))
-    (send k add-function "x" void)
-    (send k map-function "c:x" "x")
-    (define t (new text%))
-    (send t set-keymap k)
-    
-    (define f (new frame% [label ""]))
-    (define mb (new menu-bar% [parent f]))
-    (define m (new menu% [label "&Edit"] [parent mb]))
-    (define mi (new menu-item% [label "Cu&t"] [shortcut #\x] [parent m] [callback void]))
-    
-    (check-equal? 
-     (get-sorted-keybindings t f)
-     (case (system-type)
-       [(macosx)
-        '((d:x "Cut")
-          (c:x "x"))]
-       [(windows)
-        '((c:x "Cut")
-          (m:e "Edit menu")
-          (m:s:e "Edit menu"))]
-       [(unix)
-        '((c:x "Cut")
-          (m:e "Edit menu"))])))
-  
-  (let ()
-    (define k (new keymap:aug-keymap%))
-    (send k add-function "x" void)
-    (send k map-function "m:e" "x")
-    (define t (new text%))
-    (send t set-keymap k)
-    
-    (define f (new frame% [label ""]))
-    (define mb (new menu-bar% [parent f]))
-    (define m (new menu% [label "&Edit"] [parent mb]))
-    (define mi (new menu-item% [label "Cu&t"] [parent m] [callback void]))
-    
-    (check-equal? 
-     (get-sorted-keybindings t f)
-     (case (system-type)
-       [(macosx)
-        '()]
-       [(windows)
-        '((m:e "Edit menu")
-          (m:s:e "Edit menu"))]
-       [(unix)
-        '((m:e "Edit menu"))])))
-  
-  
-  (let ()
-    (define k (new keymap:aug-keymap%))
-    (send k add-function "x" void)
-    (send k add-function "y" void)
-    (send k map-function "c:x" "x")
-    (send k map-function "m:x" "y")
-    (define t (new text%))
-    (send t set-keymap k)
-    
-    (define f (new frame% [label ""]))
-    (define mb (new menu-bar% [parent f]))
-    (define m (new menu% [label "Edit"] [parent mb]))
-    (define mi (new menu-item% [label "Cu&t"] [parent m] [callback void]))
-    
-    (check-equal? 
-     (get-sorted-keybindings t f)
-     (case (system-type)
-       [(macosx) '((c:x "x"))]
-       [(unix windows)
-        '((c:x "x")
-          (m:x "y"))])))
-  
-  (let ()
-    (define k (new keymap:aug-keymap%))
-    (send k add-function "y" void)
-    (send k map-function "~c:m:x" "y")
-    (define t (new text%))
-    (send t set-keymap k)
-  
-    (check-equal? 
-     (get-sorted-keybindings t (new frame% [label ""]))
-     (if (equal? (system-type) 'macosx)
-         '()
-         '((~c:m:x "y"))))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/get-defs.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/get-defs.rkt
deleted file mode 100644
index 826530392b..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/get-defs.rkt
+++ /dev/null
@@ -1,138 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/function
-         racket/list
-         string-constants)
-
-(provide (struct-out defn)
-         get-definitions)
-
-;; defn = (make-defn number string number number)
-(define-struct defn (indent name start-pos end-pos) #:mutable)
-
-;; get-definitions : string boolean text -> (listof defn)
-(define (get-definitions tag-string indent? text)
-  (let* ([min-indent 0]
-         [defs (let loop ([pos 0])
-                 (let ([defn-pos (send text find-string tag-string 'forward pos 'eof #t #f)])
-                   (cond
-                     [(not defn-pos) null]
-                     [(in-semicolon-comment? text defn-pos)
-                      (loop (+ defn-pos (string-length tag-string)))]
-                     [else
-                      (let ([indent (get-defn-indent text defn-pos)]
-                            [name (get-defn-name text (+ defn-pos (string-length tag-string)))])
-                        (set! min-indent (min indent min-indent))
-                        (cons (make-defn indent name defn-pos defn-pos)
-                              (loop (+ defn-pos (string-length tag-string)))))])))])
-    
-    ;; update end-pos's based on the start pos of the next defn
-    (unless (null? defs)
-      (let loop ([first (car defs)]
-                 [defs (cdr defs)])
-        (cond
-          [(null? defs) 
-           (set-defn-end-pos! first (send text last-position))]
-          [else (set-defn-end-pos! first (max (- (defn-start-pos (car defs)) 1)
-                                              (defn-start-pos first)))
-                (loop (car defs) (cdr defs))])))
-    
-    (when indent?
-      (for-each (λ (defn)
-                  (set-defn-name! defn
-                                  (string-append
-                                   (apply string
-                                          (vector->list
-                                           (make-vector 
-                                            (- (defn-indent defn) min-indent) #\space)))
-                                   (defn-name defn))))
-                defs))
-    defs))
-
-;; in-semicolon-comment: text number -> boolean
-;; returns #t if `define-start-pos' is in a semicolon comment and #f otherwise
-(define (in-semicolon-comment? text define-start-pos)
-  (let* ([para (send text position-paragraph define-start-pos)]
-         [start (send text paragraph-start-position para)])
-    (let loop ([pos start])
-      (cond
-        [(pos . >= . define-start-pos) #f]
-        [(char=? #\; (send text get-character pos)) #t]
-        [else (loop (+ pos 1))]))))
-
-;; get-defn-indent : text number -> number
-;; returns the amount to indent a particular definition
-(define (get-defn-indent text pos)
-  (let* ([para (send text position-paragraph pos)]
-         [para-start (send text paragraph-start-position para #t)])
-    (let loop ([c-pos para-start]
-               [offset 0])
-      (if (< c-pos pos)
-          (let ([char (send text get-character c-pos)])
-            (cond
-              [(char=? char #\tab)
-               (loop (+ c-pos 1) (+ offset (- 8 (modulo offset 8))))]
-              [else
-               (loop (+ c-pos 1) (+ offset 1))]))
-          offset))))
-
-;; whitespace-or-paren?
-(define (whitespace-or-paren? char)
-  (or (char=? #\) char)
-      (char=? #\( char)
-      (char=? #\] char)
-      (char=? #\[ char)
-      (char-whitespace? char)))
-
-;; skip : text number (char -> bool) -> number
-;; Skips characters recognized by `skip?'
-(define (skip text pos skip?)
-  (let loop ([pos pos])
-    (if (>= pos (send text last-position))
-        (send text last-position)
-        (let ([char (send text get-character pos)])
-          (cond
-            [(skip? char)
-             (loop (+ pos 1))]
-            [else pos])))))
-
-;; skip-to-whitespace/paren : text number -> number
-;; skips to the next parenthesis or whitespace after `pos', returns that position.
-(define (skip-to-whitespace/paren text pos)
-  (skip text pos (negate whitespace-or-paren?)))
-
-;; skip-whitespace/paren : text number -> number
-;; skips past any parenthesis or whitespace
-(define (skip-whitespace/paren text pos)
-  (skip text pos whitespace-or-paren?))
-
-;; skip-past-non-whitespace : text number -> number
-;; skips to the first whitespace character after the first non-whitespace character
-(define (skip-past-non-whitespace text pos)
-  (skip text (skip text pos char-whitespace?) (negate char-whitespace?)))
-
-;; get-defn-name : text number -> string
-;; returns the name of the definition starting at `define-pos',
-;; assuming that the bound name is the first symbol to appear
-;; after the one beginning at `define-pos'. This heuristic 
-;; usually finds the bound name, but it breaks for Redex
-;; metafunction definitions (thus the hack below).
-(define (get-defn-name text define-pos)
-  (let* ([end-suffix-pos (skip-to-whitespace/paren text define-pos)]
-         [suffix (send text get-text define-pos end-suffix-pos)]
-         [end-header-pos 
-          (cond [(regexp-match #rx"^-metafunction(/extension)?$" suffix)
-                 => (λ (m)
-                      (let ([extension? (second m)])
-                        (skip-past-non-whitespace
-                         text
-                         (if extension?
-                             (skip-past-non-whitespace text end-suffix-pos)
-                             end-suffix-pos))))]
-                [else end-suffix-pos])]
-         [start-name-pos (skip-whitespace/paren text end-header-pos)]
-         [end-name-pos (skip-to-whitespace/paren text start-name-pos)])
-    (if (>= end-suffix-pos (send text last-position))
-        (string-constant end-of-buffer-define)
-        (send text get-text start-name-pos end-name-pos))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/get-extend.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/get-extend.rkt
deleted file mode 100644
index f3b2568da9..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/get-extend.rkt
+++ /dev/null
@@ -1,141 +0,0 @@
-#lang racket/unit
-
-(require racket/class
-         drracket/private/drsig
-         framework/private/logging-timer)
-
-(import [prefix drracket:unit: drracket:unit^]
-        [prefix drracket:frame: drracket:frame^]
-        [prefix drracket:rep: drracket:rep^]
-        [prefix drracket:debug: drracket:debug^]
-        [prefix drracket:tracing: drracket:tracing^]
-        [prefix drracket:module-language: drracket:module-language/int^]
-        [prefix drracket:module-language-tools: drracket:module-language-tools^])
-(export drracket:get/extend^)
-
-(define re-extension-allowed? #f)
-(define (allow-re-extension!) (set! re-extension-allowed? #t))
-(define (disallow-re-extension!) (set! re-extension-allowed? #f))
-
-(define (make-extender get-base% name [final-mixin values])
-  (define extend-name (string->symbol (format "extend-~a" name)))
-  (define names-for-changes '())
-  (define extensions '())
-  (define built-yet? #f)
-  (define built #f)
-  (define ((verify f) %)
-    (define new% (f %))
-    (if (and (class? new%)
-             (subclass? new% %))
-        new%
-        (error extend-name
-               "expected output of extension to create a subclass of its input, got: ~a"
-               new%)))
-  (define (add-extender extension [before? #t] #:name-for-changes [name-for-changes #f])
-    (cond
-      [(and (symbol? name-for-changes) (member name-for-changes names-for-changes))
-       (cond
-         [re-extension-allowed?
-          (set! extensions
-                (for/list ([e-extension (in-list extensions)]
-                           [e-name (in-list names-for-changes)])
-                  (if (equal? e-name name-for-changes) 
-                      extension
-                      e-extension)))
-          (set! built-yet? #f)
-          (set! built #f)]
-         [else
-          (error extend-name 
-                 "attempted to use name ~s multiple times without first enabling re-extensions" 
-                 name-for-changes)])]
-      [else
-       (when built-yet?
-         (cond
-           [re-extension-allowed? 
-            (set! built-yet? #f)
-            (set! built #f)]
-           [else
-            (error extend-name 
-                   "cannot build a new extension of ~a after initialization"
-                   name-for-changes)]))
-       (set! extensions 
-             (if before?
-                 (cons (verify extension) extensions)
-                 (append extensions (list (verify extension)))))
-       (set! names-for-changes
-             (if before?
-                 (cons name-for-changes names-for-changes)
-                 (append names-for-changes (list name-for-changes))))]))
-  (define (get-built)
-    (unless built-yet?
-      (set! built-yet? #t)
-      (set! built (final-mixin ((apply compose extensions) (get-base%)))))
-    built)
-  (values
-   (procedure-rename add-extender extend-name)
-   (procedure-rename get-built (string->symbol (format "get-~a" name)))))
-
-(define (get-base-tab%)
-  (drracket:module-language:module-language-online-expand-tab-mixin
-   (drracket:module-language-tools:tab-mixin
-    (drracket:tracing:tab-mixin
-     (drracket:debug:test-coverage-tab-mixin
-      (drracket:debug:profile-tab-mixin
-       drracket:unit:tab%))))))
-
-(define-values (extend-tab get-tab) (make-extender get-base-tab% 'tab%))
-
-(define (get-base-interactions-canvas%)
-  drracket:unit:interactions-canvas%)
-
-(define-values (extend-interactions-canvas get-interactions-canvas)
-  (make-extender get-base-interactions-canvas% 'interactions-canvas%))
-
-(define (get-base-definitions-canvas%)
-  drracket:unit:definitions-canvas%)
-
-(define-values (extend-definitions-canvas get-definitions-canvas)
-  (make-extender get-base-definitions-canvas% 'definitions-canvas%))  
-
-(define (get-base-unit-frame%) 
-  (drracket:module-language-tools:frame-mixin
-   (drracket:tracing:frame-mixin
-    (drracket:debug:profile-unit-frame-mixin
-     drracket:unit:frame%))))
-
-(define-values (extend-unit-frame get-unit-frame)
-  (make-extender get-base-unit-frame% 'drracket:unit:frame))
-
-(define (get-base-interactions-text%)
-  (drracket:module-language:module-language-online-expand-rep-mixin
-   (drracket:module-language:module-language-big-defs/ints-interactions-text-mixin
-    (drracket:debug:test-coverage-interactions-text-mixin
-     drracket:rep:text%))))
-
-(define-values (extend-interactions-text get-interactions-text)
-  (make-extender get-base-interactions-text% 'interactions-text%))
-
-(define (get-base-definitions-text%)
-  (drracket:module-language:module-language-online-expand-text-mixin
-   (drracket:module-language-tools:definitions-text-mixin
-    (drracket:module-language:module-language-big-defs/ints-definitions-text-mixin
-     (drracket:debug:test-coverage-definitions-text-mixin
-      (drracket:debug:profile-definitions-text-mixin
-       (drracket:module-language:modes-mixin
-        (drracket:unit:get-definitions-text%))))))))
-
-(define-values (extend-definitions-text get-definitions-text)
-  (make-extender
-   get-base-definitions-text%
-   'definitions-text%
-   (let ([add-on-paint-logging
-          (λ (%)
-            (class %
-              (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-                (log-timeline 
-                 (format "on-paint method of ~a area: ~a"
-                         (object-name this)
-                         (* (- right left) (- bottom top)))
-                 (super on-paint before? dc left top right bottom dx dy draw-caret)))
-              (super-new)))])
-     add-on-paint-logging)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/get-module-path.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/get-module-path.rkt
deleted file mode 100644
index 4255781aa2..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/get-module-path.rkt
+++ /dev/null
@@ -1,381 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/contract
-         racket/gui/base
-         string-constants
-         setup/path-to-relative
-         framework
-         "find-completions.rkt")
-
-(provide
- (contract-out
-  [get-module-path-from-user
-   (->i ()
-        (#:init [init string?] 
-         #:pref [pref symbol?]
-         #:dir? [dir? boolean?]
-         #:current-directory [current-directory (or/c path-string? #f)])
-        [res (dir?)
-             (if (or (not dir?)
-                     (unsupplied-arg? dir?))
-                 (or/c path? #f)
-                 (or/c (listof path?) #f))])]))
-
-(define (get-module-path-from-user #:init [init-value ""] 
-                                   #:pref [pref-sym #f]
-                                   #:dir? [dir? #f]
-                                   #:current-directory 
-                                   [_the-current-directory #f])
-  (define the-current-directory (or _the-current-directory (current-directory)))
-  (define dlg%
-    (class dialog%
-      (define/override (on-subwindow-char receiver event)
-        (cond
-          [(member (send event get-key-code) '(up down))
-           (up/down-callback (send event get-key-code))]
-          [else (super on-subwindow-char receiver event)]))
-      (define/public (new-clcl/clcp clcl/clcp)
-        (update-list-of-paths))
-      (define/override (on-size w h)
-        (preferences:set 'drracket:get-module-path-from-user-size (list w h)))
-      (super-new)))
-  
-  (define dlg (new dlg%
-                   [style '(resize-border)]
-                   [label (string-constant drracket)]
-                   [width (car (preferences:get 'drracket:get-module-path-from-user-size))]
-                   [height (cadr (preferences:get 'drracket:get-module-path-from-user-size))]))
-  (define tf (new text-field% [parent dlg] [label #f]
-                  [init-value init-value]
-                  [callback (λ (tf evt) (tf-callback))]))
-  (send (send tf get-editor) set-position 0 (send (send tf get-editor) last-position))
-  (define lb (new list-box% 
-                  [style (if dir? '(extended) '(single))]
-                  [parent dlg] [choices '()] [label #f]
-                  [callback (λ (lb evt)
-                              (cond
-                                [(equal? (send evt get-event-type) 'list-box-dclick)
-                                 (handle-list-box-double-click)]
-                                [else
-                                 (update-buttons)]))]))
-                  
-  (define different-racket-panel
-    (new vertical-panel% 
-         [parent dlg]
-         [stretchable-height #f]
-         [alignment '(left center)]))
-  (define racket-path-cb
-    (new check-box%
-         [label (string-constant use-a-different-racket)]
-         [value (list-ref (preferences:get racket-binary-pref) 0)]
-         [callback (λ (_1 _2) (racket-path-cb-callback))]
-         [parent different-racket-panel]))
-  (define racket-path-tf
-    (new text-field% 
-         [parent different-racket-panel]
-         [label (string-constant path-to-racket-binary)]
-         [init-value (list-ref (preferences:get racket-binary-pref) 1)]
-         [callback (λ (_1 _2) (racket-path-tf-callback))]))
-
-  (define bp (new horizontal-panel% 
-                  [parent dlg]
-                  [stretchable-height #f]
-                  [alignment '(right center)]))
-  
-  (define enter-sub-button 
-    (and (not dir?)
-         (new button% 
-              [parent bp]
-              [style '(border)]
-              [label (string-constant enter-subcollection)]
-              [callback (λ (_1 _2) (enter-sub))])))
-  
-  (define-values (ok-button cancel-button) 
-    (gui-utils:ok/cancel-buttons 
-     bp 
-     (λ (_1 _2) (ok))
-     (λ (_1 _2) (cancel))))
-  
-  (new grow-box-spacer-pane% [parent bp])
-  
-  (define (tf-callback)
-    (when pref-sym
-      (preferences:set pref-sym (send tf get-value)))
-    (update-list-of-paths))
-  
-  (define (up/down-callback key)
-    (define up? (equal? key 'up))
-    (define old-sel (send lb get-selection))
-    (define dir (if up? -1 1))
-    (unless (= 0 (send lb get-number))
-      (send lb set-selection 
-            (cond
-              [old-sel 
-               (modulo (+ old-sel dir)
-                       (send lb get-number))]
-              [up?
-               (- (send lb get-number) 1)]
-              [else
-               0])))
-    (update-buttons))
-  
-  (define (racket-path-tf-callback)
-    (preferences:set racket-binary-pref 
-                     (list (list-ref (preferences:get racket-binary-pref) 0)
-                           (send racket-path-tf get-value)))
-    (update-list-of-paths)
-    (maybe-turn-racket-path-pink)
-    (new-alternate-racket (send racket-path-tf get-value) dlg))
-  
-  (define (racket-path-cb-callback)
-    (define nv (send racket-path-cb get-value))
-    (preferences:set racket-binary-pref
-                     (list nv (list-ref (preferences:get racket-binary-pref) 1)))
-    (update-different-racket-gui)
-    (update-list-of-paths)
-    (when nv
-      (send racket-path-tf focus)))
-  
-  (define (update-list-of-paths)
-    (adjust-lb)
-    (update-buttons))
-  
-  (define p->r-s/l-cache (make-hash))
-  (define (path->rel-string p alt-racket-info)
-    (if alt-racket-info
-        (path->string p)
-        (path->relative-string/library p #:cache p->r-s/l-cache)))
-  
-  (define (adjust-lb)
-    (send lb clear)
-    (unless (equal? (send tf get-value) "")
-      (define alt-racket-info 
-        (and (send racket-path-cb get-value)
-             (get-clcl/clcp)))
-      (define the-completions 
-        (find-completions (send tf get-value) 
-                          the-current-directory
-                          #:alternate-racket alt-racket-info))
-      (for ([i (in-list (if dir?
-                            (filter (λ (i) (directory-exists? (list-ref i 1)))
-                                    the-completions)
-                            the-completions))]
-            [n (in-naturals)])
-        (send lb append (path->rel-string (list-ref i 1) alt-racket-info))
-        ;; data holds a path => open the file
-        ;; data holds a string => add that past the last / in 'tf'
-        ;; when dir?=#t, then data always holds a path
-        (cond
-          [(or dir? (file-exists? (list-ref i 1)))
-           (send lb set-data n (list-ref i 1))]
-          [else
-           (send lb set-data n (list-ref i 0))]))
-      (when (= 1 (send lb get-number))
-        (send lb set-selection 0))))
-  
-  (define (maybe-turn-racket-path-pink)
-    (define pth (send racket-path-tf get-value))
-    (define bkg
-      (cond
-        [(and (path-string? pth)
-              (file-exists? pth) 
-              (member 'execute (file-or-directory-permissions pth)))
-         "white"]
-        [else "yellow"]))
-    (send racket-path-tf set-field-background 
-          (send the-color-database find-color bkg)))
-  
-  (define (update-different-racket-gui)
-    (send different-racket-panel
-          change-children
-          (λ (l)
-            (if (list-ref (preferences:get racket-binary-pref) 0)
-                (list racket-path-cb racket-path-tf)
-                (list racket-path-cb)))))
-  
-  (define (forward-new-alternate-racket)
-    (cond
-      [(send racket-path-cb get-value)
-       (define s (send racket-path-tf get-value))
-       (and (not (equal? s ""))
-            (not (regexp-match? #rx"\0" s))
-            s)]
-      [else #f]))
-  
-  (define cancelled? #t)
-  
-  (define (ok) 
-    (set! cancelled? #f)
-    (send dlg show #f))
-  (define (cancel) (send dlg show #f))
-  (define (enter-sub)
-    (define item-to-act-on (get-item-to-act-on))
-    (define mtch (regexp-match #rx"(^.*/)[^/]*$" (send tf get-value)))
-    (define prefix 
-      (if mtch
-          (list-ref mtch 1)
-          ""))
-
-    (send tf set-value (string-append prefix
-                                      (send lb get-data item-to-act-on)
-                                      "/"))
-    (update-list-of-paths))
-  
-  (define (update-buttons)
-    (cond
-      [dir?
-       (send ok-button enable #t)]
-      [else
-       (define item-to-act-on (get-item-to-act-on))
-       (cond
-         [item-to-act-on
-          (define datum (send lb get-data item-to-act-on))
-          (cond
-            [(path? datum)
-             (send ok-button enable #t)
-             (send enter-sub-button enable #f)]
-            [(string? datum)
-             (send ok-button enable #f)
-             (send enter-sub-button enable #t)])]
-         [else
-          (send ok-button enable #f)
-          (send enter-sub-button enable #f)])]))
-  
-  (define (handle-list-box-double-click)
-    (cond
-      [dir?
-       (ok)]
-      [else
-       (define item-to-act-on (get-item-to-act-on))
-       (cond
-         [item-to-act-on 
-          (define datum (send lb get-data item-to-act-on))
-          (cond
-            [(path? datum)
-             (ok)]
-            [(string? datum)
-             (enter-sub)])]
-         [else
-          (void)])]))
-  
-  (define (get-item-to-act-on)
-    (or (send lb get-selection)
-        (and (<= 1 (send lb get-number))
-             0)))
-    
-  (update-list-of-paths)
-  (update-different-racket-gui)
-  (maybe-turn-racket-path-pink)
-  (send tf focus)
-  (send dlg show #t)
-  (cond
-    [cancelled? #f]
-    [dir?
-     (define selections (send lb get-selections))
-     (for/list ([i (if (null? selections)
-                       (in-range (send lb get-number))
-                       (in-list selections))])
-       (send lb get-data i))]
-    [else (send lb get-data (get-item-to-act-on))]))
-
-(define racket-binary-pref 'drracket:different-racket-for-open-collection-path)
-(preferences:set-default racket-binary-pref (list #f "") (list/c boolean? string?))
-
-
-;; the thread always holds the value of the clcp/clcf
-;; for (list-ref (preferences:get racket-binary-pref) 1),
-;; even if (list-ref (preferences:get racket-binary-pref) 0)
-;; is #f (in which case, no one asks for the value inside the thread)
-
-(define (new-alternate-racket str dlg)
-  (init-alternate-racket-thread)
-  (channel-put new-alternate-racket-chan (list str dlg)))
-(define new-alternate-racket-chan (make-channel))
-
-(define (get-clcl/clcp)
-  (init-alternate-racket-thread)
-  (channel-get current-alternate-racket-chan))
-(define current-alternate-racket-chan (make-channel))
-
-(define (init-alternate-racket-thread)
-  (unless thd
-    (define pref-val (preferences:get racket-binary-pref))
-    (set! thd
-          (thread (alternate-racket-thread-loop (list-ref pref-val 1))))))
-(define thd #f)
-
-(define (fire-off-alternate-racket-call str+dlg)
-  (define new-clcl-thread-pending-chan (make-channel))
-  (thread
-   (λ () 
-     (define-values (a b) 
-       (if (path-string? (list-ref str+dlg 0))
-           (alternate-racket-clcl/clcp (list-ref str+dlg 0))
-           (values (current-library-collection-links)
-                   (current-library-collection-paths))))
-     (channel-put new-clcl-thread-pending-chan
-                  (list (list a b)
-                        (list-ref str+dlg 1)))))
-  new-clcl-thread-pending-chan)
-
-(define (alternate-racket-thread-loop initial-alternate-racket)
-  (λ ()
-    (let loop ([clcl-thread-pending-chan #f]
-               
-               ;; (cons/c string? (is-a?/c dialog%))
-               [pending-str+dlg #f]
-               [clcl/clcp (if (path-string? initial-alternate-racket)
-                              (let-values ([(a b) (alternate-racket-clcl/clcp 
-                                                   initial-alternate-racket)])
-                                (list a b))
-                              (list (current-library-collection-links)
-                                    (current-library-collection-paths)))])
-      (sync
-       (handle-evt 
-        new-alternate-racket-chan
-        (λ (str+dlg)
-          (cond
-            [clcl-thread-pending-chan
-             (loop clcl-thread-pending-chan
-                   str+dlg
-                   clcl/clcp)]
-            [else
-             (define new-clcl-thread-pending-chan 
-               (fire-off-alternate-racket-call str+dlg))
-             (loop new-clcl-thread-pending-chan
-                   #f
-                   clcl/clcp)])))
-       (handle-evt 
-        (channel-put-evt current-alternate-racket-chan clcl/clcp)
-        (λ (c)
-          (loop clcl-thread-pending-chan 
-                pending-str+dlg
-                clcl/clcp)))
-       (if clcl-thread-pending-chan
-           (handle-evt
-            clcl-thread-pending-chan
-            (λ (new-clcl/clcp+dlg)
-              (cond
-                [pending-str+dlg
-                 (loop (fire-off-alternate-racket-call pending-str+dlg)
-                       #f
-                       clcl/clcp)]
-                [else
-                 (define new-clcl/clcp (list-ref new-clcl/clcp+dlg 0))
-                 (define dlg (list-ref new-clcl/clcp+dlg 1))
-                 (parameterize ([current-eventspace (send dlg get-eventspace)])
-                   (queue-callback
-                    (λ ()
-                      (send dlg new-clcl/clcp new-clcl/clcp))))
-                 (loop #f
-                       #f  
-                       new-clcl/clcp)])))
-           never-evt)))))
-
-(preferences:set-default 'drracket:get-module-path-from-user-size 
-                         (list 600 600)
-                         (list/c exact-nonnegative-integer? exact-nonnegative-integer?))
-
-
-(module+ main
-  (get-module-path-from-user))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/help-desk.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/help-desk.rkt
deleted file mode 100644
index 2ae7fdfc56..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/help-desk.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang racket/unit
-
-(require racket/gui/base
-         browser/external
-         framework
-         racket/class
-         net/url
-         setup/dirs
-         setup/materialize-user-docs
-         help/search
-         help/private/buginfo
-         drracket/private/drsig
-         string-constants
-         "local-member-names.rkt")
-
-(import [prefix drracket:frame: drracket:frame^]
-        [prefix drracket:language-configuration: drracket:language-configuration/internal^]
-        [prefix drracket:init: drracket:init^])
-(export drracket:help-desk^)
-
-(define (-add-help-desk-font-prefs b) '(add-help-desk-font-prefs b))
-
-;; : -> string
-(define (get-computer-language-info)
-  (let* ([language/settings (preferences:get 
-                             drracket:language-configuration:settings-preferences-symbol)]
-         [language (drracket:language-configuration:language-settings-language
-                    language/settings)]
-         [settings (drracket:language-configuration:language-settings-settings
-                    language/settings)])
-    (format
-     "~s"
-     (list
-      (send language get-language-position)
-      (send language marshall-settings settings)))))
-
-(set-bug-report-info! "Computer Language" get-computer-language-info)
-(set-bug-report-info! "Recent Internal Errors" 
-                      (λ ()
-                        (define errs (drracket:init:get-last-N-errors))
-                        (define sp (open-output-string))
-                        (unless (null? errs) 
-                          (fprintf sp "Saved ~a internal error~a:\n\n"
-                                   (length errs)
-                                   (if (= 1 (length errs)) "" "s")))
-                        (parameterize ([current-error-port sp])
-                          (define first? #t)
-                          (for ([err (in-list errs)])
-                            (if first? 
-                                (set! first? #f)
-                                (eprintf "\n\n"))
-                            (drracket:init:original-error-display-handler
-                             (list-ref err 0)
-                             (list-ref err 1))))
-                        (get-output-string sp))
-                      100)
-
-(define lang-message%
-  (class canvas%
-    (init-field button-release font)
-    (define/override (on-event evt)
-      (when (send evt button-up?)
-        (button-release)))
-    (field [msg ""])
-    (define/public (set-msg l) (set! msg l) (on-paint))
-    (inherit get-dc get-client-size)
-    (define/override (on-paint)
-      (let ([dc (get-dc)]
-            [dots "..."])
-        (let-values ([(tw th _1 _2) (send dc get-text-extent msg)]
-                     [(dw dh _3 _4) (send dc get-text-extent dots)]
-                     [(cw ch) (get-client-size)])
-          (send dc set-brush (send the-brush-list find-or-create-brush (get-panel-background) 'panel))
-          (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-          (send dc set-font font)
-          (send dc draw-rectangle 0 0 cw ch)
-          (cond
-            [(tw . <= . cw)
-             (send dc draw-text msg 0 (- (/ ch 2) (/ th 2)))]
-            [(cw . <= . dw)  ;; just give up if there's not enough room to draw the dots
-             (void)]
-            [else
-             (send dc set-clipping-rect 0 0 (- cw dw 2) ch)
-             (send dc draw-text msg 0 (- (/ ch 2) (/ th 2)))
-             (send dc set-clipping-region #f)
-             (send dc draw-text dots (- cw dw) (- (/ ch 2) (/ th 2)))]))))
-    (super-new)))
-
-(define (goto-plt-license)
-  (send-main-page #:sub "license/index.html"))
-
-(define (maybe-try-to-materialize-docs)
-  ;; under mac os x, the basic installation is put into a 'com.apple.quarantine'
-  ;; which has the strange effect of making osascript drop the query parameters
-  ;; for urls when they are sent to the browser. To work around this,
-  ;; we materialize the documentation indicies in a user-specific place the
-  ;; first time someone tries to read the docs with a specific query
-  ;; the 'drracket:tried-materialize-user-docs pref is initialized to #t
-  ;; on non-mac os x platforms so that we don't try at all there.
-  (unless (preferences:get 'drracket:tried-materialize-user-docs)
-    (preferences:set 'drracket:tried-materialize-user-docs #t)
-    (define sp (open-output-string))
-    (define succeeded? #t)
-    (materialize-user-docs (λ (go)
-                             (set! succeeded? #f)
-                             (parameterize ([current-output-port sp]
-                                            [current-error-port sp])
-                               (set! succeeded? (go)))))
-    (unless succeeded?
-      (message-box (string-constant drracket)
-                   (string-append
-                    "Attempting to materialize user docs failed:\n\n"
-                    (get-output-string sp))))))
-
-(define (help-desk [key #f] [context #f])
-  (when key (maybe-try-to-materialize-docs))
-  (if key (perform-search key context) (send-main-page)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/honu-logo.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/honu-logo.rkt
deleted file mode 100644
index e41a7a6306..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/honu-logo.rkt
+++ /dev/null
@@ -1,529 +0,0 @@
-#lang racket/base
-(provide draw-honu)
-
-(require racket/class
-         racket/gui/base
-         "palaka.rkt")
-
-(define pi (atan 0 -1))
-
-(define body-path (make-object dc-path%))
-
-(define (find-arc-spot x y w h end)
-  (let ([ce (cos end)]
-        [se (- (sin end))])
-    (values (+ x (* w 1/2) (* w 1/2 ce))
-            (+ y (* h 1/2) (* h 1/2 se)))))
-
-(define weighted-arc 
-  (lambda (path x y w h start end ccw? [dx1 0.0] [dy1 0.2] [dx2 dx1] [dy2 (- dy1)])
-    (let ([sweep (let loop ([s (if ccw? (- end start) (- start end))])
-		   (if (< s 0)
-		       (loop (+ s (* 2 pi)))
-		       s))])
-      (if (> sweep pi)
-	  (let ([halfway ((if ccw? + -) start (/ sweep 2))])
-	    (weighted-arc path x y w h start halfway ccw? dx1 dy1 dx2 dy2)
-	    (weighted-arc path x y w h halfway end ccw? dx2 (- dy2) dx1 (- dy1)))
-	  (let ([p (new dc-path%)])
-	    ;; Set p to be the arc for a unit circle,
-	    ;;  centered on the X-axis:
-	    (let* ([x0 (cos (/ sweep 2))]
-		   [y0 (sin (/ sweep 2))]
-		   [x1 (/ (- 4 x0) 3)]
-		   [y1 (/ (* (- 1 x0) (- 3 x0)) (* 3 y0))]
-		   [x2 x1]
-		   [y2 (- y1)]
-		   [x3 x0]
-		   [y3 (- y0)]
-		   [sw (/ w 2)]
-		   [sh (/ h 2)])
-	      (send p move-to x0 y0)
-	      (send p curve-to 
-		    (+ x1 dx1) (+ y1 dy1)
-		    (+ x2 dx2) (+ y2 dy2)
-		    x3 y3)
-	      ;; Rotate to match start:
-	      (send p rotate (+ (if ccw? start end) (/ sweep 2)))
-	      ;; Scale to match width and height:
-	      (send p scale (/ w 2) (/ h 2))
-	      ;; Translate to match x and y
-	      (send p translate (+ x (/ w 2)) (+ y (/ h 2)))
-	      (unless ccw?
-		(send p reverse)))
-	    (send path append p))))))
-
-(define overall-rotation (- (* pi 1/2 3/8)))
-
-(define body-width 100)
-(define body-height 110)
-(define body-thickness 12)
-(define angle-offset (* pi 1/10))
-
-(define big-fin-curve-top-offset 0)
-(define big-fin-curve-bottom-offset 4)
-(define big-fin-top-angle (* pi 3/12))
-(define big-fin-bottom-angle (* pi 2/12))
-(define big-fin-size 60)
-(define big-fin-right-edge (+ body-width big-fin-size))
-
-(define little-fin-top-angle (- (* pi (/ 3.5 12))))
-(define little-fin-bottom-angle (- (* pi (/ 4.5 12))))
-(define little-fin-size 20)
-(define little-fin-far-y (+ body-height little-fin-size))
-
-(define pointy-tip-offset 8)
-
-(define head-angle-span (* pi 1/6))
-
-(define head-cx (/ body-width 2))
-(define head-cy -8)
-
-(define head-width 30)
-(define head-height 40)
-
-(define acos-arg
-  (* (/ 2 head-width) (- (* (cos (- (/ pi 2) (/ head-angle-span 2)))
-                            (/ body-width 2)))))
-
-(define head-theta-start (- (acos acos-arg)))
-(define head-theta-end (- pi head-theta-start))
-
-(define-values (head-attach-left-x head-attach-left-y)
-  (find-arc-spot 0 0 body-width body-height (+ (/ pi 2) (/ head-angle-span 2))))
-(define-values (head-attach-right-x head-attach-right-y)
-  (find-arc-spot 0 0 body-width body-height (- (/ pi 2) (/ head-angle-span 2))))
-
-(define right-edge-of-center-line (+ (/ body-width 2) (/ body-thickness 2)))
-(define left-edge-of-center-line (- (/ body-width 2) (/ body-thickness 2)))  
-
-(define-values (big-fin-top-x big-fin-top-y)
-  (find-arc-spot 0 0 body-width body-height big-fin-top-angle))
-(define-values (big-fin-bottom-x big-fin-bottom-y)
-  (find-arc-spot 0 0 body-width body-height big-fin-bottom-angle))
-
-(define-values (left-little-fin-top-x left-little-fin-top-y)
-  (find-arc-spot 0 0 body-width body-height (- pi little-fin-top-angle)))
-(define-values (left-little-fin-bottom-x left-little-fin-bottom-y)
-  (find-arc-spot 0 0 body-width body-height (- pi little-fin-bottom-angle)))
-
-(define-values (little-fin-top-x little-fin-top-y)
-  (find-arc-spot 0 0 body-width body-height little-fin-top-angle))
-(define-values (little-fin-bottom-x little-fin-bottom-y)
-  (find-arc-spot 0 0 body-width body-height little-fin-bottom-angle))
-
-(define-values (inner-right-arc-top-x inner-right-arc-top-y)
-  (find-arc-spot 
-   body-thickness 
-   body-thickness 
-   (- body-width body-thickness body-thickness)
-   (- body-height body-thickness body-thickness)
-   (- (* pi 1/2) angle-offset)))
-
-(define-values (inner-right-arc-bottom-x inner-right-arc-bottom-y)
-  (find-arc-spot
-   body-thickness 
-   body-thickness 
-   (- body-width body-thickness body-thickness)
-   (- body-height body-thickness body-thickness)
-   (+ (* pi 3/2) angle-offset)))
-
-(define (add-big-fin-top add)
-  (let ([fin-width (- big-fin-right-edge big-fin-top-x)])
-    (add big-fin-top-x
-         big-fin-top-y
-         
-         (+ big-fin-top-x (* 1/3 fin-width))
-         big-fin-curve-top-offset
-         
-         (+ big-fin-top-x (* 2/3 fin-width))
-         big-fin-curve-top-offset
-         
-         big-fin-right-edge
-	 (+ big-fin-bottom-y 10))))
-
-(define (add-big-fin-bottom add)
-  (let ([fin-width (- big-fin-right-edge big-fin-bottom-x)])
-    (add 
-     (+ big-fin-bottom-x fin-width)
-     (+ big-fin-bottom-y 10)
-     
-     (+ big-fin-bottom-x (* 1/3 fin-width))
-     (- (/ (+ big-fin-bottom-y big-fin-top-y) 2)
-        big-fin-curve-bottom-offset)
-     
-     (+ big-fin-bottom-x (* 1/5 fin-width))
-     (/ (+ big-fin-bottom-y big-fin-top-y) 2)
-     
-     big-fin-bottom-x
-     big-fin-bottom-y)))
-
-(define (add-little-fin-top add)
-  (add
-   little-fin-top-x
-   little-fin-top-y
-   
-   (+ little-fin-top-x (* (- little-fin-top-x little-fin-bottom-x) 2/3))
-   (+ little-fin-top-y (* (- little-fin-far-y little-fin-top-y) 1/3))
-   
-   (+ little-fin-top-x (* (- little-fin-top-x little-fin-bottom-x) 1/3))
-   (+ little-fin-top-y (* (- little-fin-far-y little-fin-top-y) 2/3))
-   
-   little-fin-top-x
-   little-fin-far-y))
-
-(define (add-little-fin-bottom add)
-  (add 
-   little-fin-top-x
-   little-fin-far-y
-   
-   (+ little-fin-top-x (* (- little-fin-bottom-x little-fin-top-x) 2/3))
-   (+ little-fin-top-y (* (- little-fin-far-y little-fin-top-y) 1/3))
-   
-   (+ little-fin-top-x (* (- little-fin-bottom-x little-fin-top-x) 2/3))
-   (+ little-fin-top-y (* (- little-fin-far-y little-fin-top-y) 1/3))
-   
-   little-fin-bottom-x 
-   little-fin-bottom-y))
-
-(define (add-dot path x y)
-  (let ([p (new dc-path%)])
-    (send p ellipse (- x 2) (- y 2) 4 4)
-    (send path append p)))
-
-(define (same-side-add x1 y1 x2 y2 x3 y3 x4 y4) 
-  (send body-path curve-to x2 y2 x3 y3 x4 y4))
-
-(define (same-side-add/dot x1 y1 x2 y2 x3 y3 x4 y4) 
-  (send body-path line-to x1 y1)
-  (add-dot body-path x1 y1)
-  (send body-path line-to x2 y2)
-  (add-dot body-path x2 y2)
-  (send body-path line-to x3 y3)
-  (add-dot body-path x3 y3))
-
-(define (opposite-side-add x1 y1 x2 y2 x3 y3 x4 y4)
-  (let ([conv (lambda (x y) (values (+ (- x) body-width) y))])
-    (let-values ([(cx1 cy1) (conv x1 y1)]
-                 [(cx2 cy2) (conv x2 y2)]
-                 [(cx3 cy3) (conv x3 y3)])
-      (send body-path curve-to cx3 cy3 cx2 cy2 cx1 cy1))))
-
-(define (opposite-side-add/dot x1 y1 x2 y2 x3 y3 x4 y4)
-  (let ([conv (lambda (x y) (values (+ (- x) body-width) y))])
-    (let-values ([(cx1 cy1) (conv x1 y1)]
-                 [(cx2 cy2) (conv x2 y2)]
-                 [(cx3 cy3) (conv x3 y3)])
-      (send body-path line-to cx3 cy3)
-      (add-dot body-path cx3 cy3)
-      (send body-path line-to cx2 cy2)
-      (add-dot body-path cx2 cy2)
-      (send body-path line-to cx1 cy1)
-      (add-dot body-path cx1 cy1))))
-
-(define side-perturb-y 0.0)
-(define side-perturb-x -0.1)
-
-(weighted-arc body-path 0 0 body-width body-height big-fin-bottom-angle little-fin-top-angle #f 
-	      side-perturb-x side-perturb-y)
-(add-little-fin-top same-side-add)
-(add-little-fin-bottom same-side-add)
-
-(send body-path line-to
-      little-fin-bottom-x
-      little-fin-bottom-y)
-
-(send body-path line-to
-      (/ body-width 2)
-      (+ body-height pointy-tip-offset))
-
-(send body-path line-to
-      left-little-fin-bottom-x
-      left-little-fin-bottom-y)
- 
-(add-little-fin-bottom opposite-side-add)
-(add-little-fin-top opposite-side-add)
-
-(weighted-arc body-path 0 0 body-width body-height
-	      (- pi little-fin-top-angle)
-	      (- pi big-fin-bottom-angle)
-	      #f
-	      side-perturb-x side-perturb-y)
-
-(add-big-fin-bottom opposite-side-add)
-(add-big-fin-top opposite-side-add)
-
-(weighted-arc body-path 0 0 body-width body-height (- pi big-fin-top-angle) (+ (/ pi 2) (/ head-angle-span 2)) #f 0 0)
-
-
-(weighted-arc body-path
-	      (- head-cx (/ head-width 2))
-	      (- head-cy (/ head-height 2))
-	      head-width
-	      head-height
-	      head-theta-start
-	      head-theta-end
-	      #f 0 0 0 -0.2)
-
-(weighted-arc body-path 0 0 body-width body-height (- (/ pi 2) (/ head-angle-span 2)) big-fin-top-angle #f 0 0)
-
-(add-big-fin-top same-side-add)
-(add-big-fin-bottom same-side-add)
-(send body-path close)
-
-(define (make-right-hole-path)
-  (let ([right-hole-path (make-object dc-path%)])
-
-    (define arc/end 
-      (lambda (x y w h start end [cc? #t] [dx1 0] [dy1 0.2] [dx2 0] [dy2 -0.2])
-        (weighted-arc right-hole-path x y w h start end cc? dx1 dy1 dx2 dy2)
-        (find-arc-spot x y w h end)))
-    
-    (define-values (arc1x arc1y)
-      (arc/end body-thickness 
-	       body-thickness 
-	       (- body-width body-thickness body-thickness)
-	       (- body-height body-thickness body-thickness)
-	       (- (* pi 1/2) angle-offset)
-	       (+ (* pi 3/2) angle-offset)
-	       #f -0.2 0.2 0 -0.2))
-    
-    (define little-arc-size (* 2 (- inner-right-arc-bottom-x right-edge-of-center-line)))
-    
-    (define-values (arc2x arc2y)
-      (arc/end
-       right-edge-of-center-line
-       (- inner-right-arc-bottom-y little-arc-size)
-       little-arc-size
-       little-arc-size
-       (* 3/2 pi)
-       pi
-       #f
-       0 0 0 0))
-    
-    (let ([arc2y (- body-height arc2y)])
-      (send right-hole-path curve-to 
-	    
-            (+ (/ (+ (* 2 arc1x) (* 1 arc2x)) 3) -4)
-            (/ (+ (* 2 arc1y) (* 1 arc2y)) 3)
-	    
-            (+ (/ (+ (* 1 arc1x) (* 2 arc2x)) 3) -4)
-            (/ (+ (* 1 arc1y) (* 2 arc2y)) 3)
-	    
-            arc2x arc2y))
-    
-    (weighted-arc right-hole-path
-		  right-edge-of-center-line
-		  inner-right-arc-top-y
-		  little-arc-size
-		  little-arc-size
-		  pi
-		  (* 1/2 pi)
-		  #f
-                  0 0 0 0)
-      
-    (send right-hole-path close)
-    
-    right-hole-path))
-
-(define (make-left-hole-path)
-  (let ([left-hole-path (make-right-hole-path)])
-    (send left-hole-path scale -1 1)
-    (send left-hole-path translate 
-          (+ right-edge-of-center-line left-edge-of-center-line) 0)
-    left-hole-path))
-
-(define right-hole-path (make-right-hole-path))
-(define left-hole-path (make-left-hole-path))
-
-(define (adjust-path path)
-  (send path translate (+ (- big-fin-right-edge body-width) 1) (+ (- head-cy) (/ head-height 2) 2))
-  (send path rotate overall-rotation))
-
-(adjust-path body-path)
-(adjust-path left-hole-path)
-(adjust-path right-hole-path)
-
-(define pale-red-color (make-object color% 242 183 183))
-(define pale-blue-color (make-object color% 183 202 242))
-(define pale-background-color (make-object color% 209 220 248))
-
-(define current-body-path body-path)
-(define current-left-hole-path left-hole-path)
-(define current-right-hole-path right-hole-path)
-
-(define (draw dc main-pen-color main-color left-pen-color left-color right-pen-color right-color dx dy)
-  (send dc set-brush main-color 'solid)
-  (send dc set-pen main-pen-color 1 'solid)
-  (send dc draw-path current-body-path dx dy)
-  (draw-holes dc left-pen-color left-color right-pen-color right-color dx dy))
-
-(define (draw-holes dc left-pen-color left-color right-pen-color right-color dx dy)
-  (send dc set-brush left-color 'solid)
-  (send dc set-pen left-pen-color 1 'solid)
-  (send dc draw-path current-left-hole-path dx dy)
-  (send dc set-brush right-color 'solid)
-  (send dc set-pen right-pen-color 1 'solid)
-  (send dc draw-path current-right-hole-path dx dy))
-
-(define base-width 260)
-(define base-height 240)
-
-(define dark-x 80)
-(define dark-y -20)
-(define current-dark-x dark-x)
-(define current-dark-y dark-y)
-
-(define light-x 350)
-(define light-y dark-y)
-(define current-light-x light-x)
-(define current-light-y light-y)
-
-(define (rescale w h)
-  (let ([scale (min (/ w base-width) (/ h base-height))])
-    (set! current-body-path (new dc-path%))
-    (send current-body-path append body-path)
-    (send current-body-path scale scale scale)
-    (set! current-left-hole-path (new dc-path%))
-    (send current-left-hole-path append left-hole-path)
-    (send current-left-hole-path scale scale scale)
-    (set! current-right-hole-path (new dc-path%))
-    (send current-right-hole-path append right-hole-path)
-    (send current-right-hole-path scale scale scale)
-    (set! current-light-x (* light-x scale))
-    (set! current-light-y (* light-y scale))
-    (set! current-dark-x (* dark-x scale))
-    (set! current-dark-y (* dark-y scale))))
-
-(define my-canvas%
-  (class canvas%
-    (define/override (on-size w h)
-      (rescale w h))
-    (super-new)))
-
-
-(define (vector-map f v)
-  (build-vector (vector-length v)
-                (λ (i) (f (vector-ref v i)))))
-
-(define color-series
-  (vector-map (λ (l) (vector-map (λ (x) (send the-color-database find-color x)) l))
-              '#(#("red" "blue")
-                 #("red" "blue")
-                 #("Magenta" "MediumOrchid")
-                 #("MediumOrchid" "Magenta")
-                 #("blue" "red"))))
-
-    
-    (define black-honu-bitmap 'not-yet-the-bitmap)
-    (define black-honu-bdc (make-object bitmap-dc%))
-    
-    (define (do-draw dc left-body-color right-body-color) 
-      (send dc draw-bitmap black-honu-bitmap 0 0)
-      (send dc set-smoothing 'aligned)
-      (draw-holes dc left-body-color left-body-color right-body-color right-body-color 
-                  current-dark-x
-                  current-dark-y))
-    
-    (define (set-size w h)
-      ;; update the bitmap if the size has changed
-      (unless (and (is-a? black-honu-bitmap bitmap%)
-                   (equal? w (send black-honu-bitmap get-width))
-                   (equal? h (send black-honu-bitmap get-height)))
-        (rescale w h)
-        (set! black-honu-bitmap (make-object bitmap% w h))
-        (recalc-bitmap)))
-    
-    (define (recalc-bitmap)
-      (send black-honu-bdc set-bitmap black-honu-bitmap)
-      (send black-honu-bdc set-smoothing 'aligned)
-      (draw-palaka black-honu-bdc (send black-honu-bitmap get-width) (send black-honu-bitmap get-height))
-      (draw black-honu-bdc
-            "black" "black" "black" "black" "black" "black"
-            current-dark-x
-            current-dark-y)
-      (send black-honu-bdc set-bitmap #f))
-    
-    (define (set-val val left-body-color right-body-color)
-      (cond
-        [(and (<= 0 val)
-              (< val 1))
-         (let* ([scaled-val (* val (- (vector-length color-series) 1))]
-                [set (floor scaled-val)]
-                [in-set-val (- scaled-val set)]
-                [before-colors (vector-ref color-series set)]
-                [after-colors (vector-ref color-series (+ set 1))])
-           (linear-color-combination (vector-ref before-colors 0)
-                                     (vector-ref after-colors 0)
-                                     in-set-val
-                                     left-body-color)
-           (linear-color-combination (vector-ref before-colors 1)
-                                     (vector-ref after-colors 1)
-                                     in-set-val
-                                     right-body-color))]
-        [else
-         (let ([set (vector-ref color-series (- (vector-length color-series) 1))])
-           (send left-body-color copy-from (vector-ref set 0))
-           (send right-body-color copy-from (vector-ref set 1)))]))
-    
-    (define (linear-color-combination xc yc val uc)
-      (send uc set
-            (linear-combination (send xc red) (send yc red) val)
-            (linear-combination (send xc green) (send yc green) val)
-            (linear-combination (send xc blue) (send yc blue) val)))
-    
-    (define (linear-combination x y val)
-      (floor (+ x (* val (- y x)))))
-    
-(define draw-honu
-  (let ()
-    ;; colors
-    (define left-body-color (make-object color% 0 0 0))
-    (define right-body-color (make-object color% 0 0 0))
-    
-    (λ (dc val range w h)
-      (set-size w h)
-      (set-val (/ val range) left-body-color right-body-color)
-      (do-draw dc left-body-color right-body-color))))
-
-#;
-(let ()
-  (define f (new frame% (label "")))
-  (define c2 (new canvas% [parent f]
-                  [min-width 200]
-                  [min-height 200]
-                  [style '(no-autoclear)]
-                  [paint-callback
-                   (λ (c dc)
-                     (let-values ([(w h) (send c get-client-size)])
-                       (draw-honu dc 
-                                  (send slider get-value)
-                                  100
-                                  w
-                                  h)))]))
-  (define slider (new slider% 
-                      [label #f]
-                      [min-value 0]
-                      [max-value 100]
-                      [parent f]
-                      [callback 
-                       (λ (a b) 
-                         (send c2 refresh))]))
-  (define b (new button%
-                 [label "animate"]
-                 [parent f]
-                 [callback
-                  (λ (x y)
-                    (thread
-                     (λ ()
-                       (let loop ([i 0])
-                         (queue-callback
-                          (λ ()
-                            (send slider set-value i)
-                            (send c2 refresh)))
-                         (unless (= i 100)
-                           (sleep 1/20)
-                           (loop (+ i 1)))))))]))
-  
-  (send f show #t))  
-
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/init.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/init.rkt
deleted file mode 100644
index b35cf56d4f..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/init.rkt
+++ /dev/null
@@ -1,139 +0,0 @@
-#lang racket/unit
-  (require string-constants
-           drracket/private/drsig
-           racket/gui/base
-           racket/list
-           racket/class
-           framework)
-  
-  (import [prefix drracket: drracket:interface^]
-          [prefix drracket:rep: drracket:rep^])
-  (export drracket:init^)
-  
-  (define original-output-port (current-output-port))
-  (define original-error-port (current-error-port))
-  
-  (define primitive-eval (current-eval))
-  (define primitive-load (current-load))
-  
-  (define system-logger (current-logger))
-  
-  (define system-custodian (current-custodian))
-  (define system-eventspace (current-eventspace))
-  (define system-thread (current-thread))
-  (define system-namespace (current-namespace))
-  (define first-dir (current-directory))
-  
-  (define error-display-eventspace (make-eventspace))
-  
-  (define original-error-display-handler (error-display-handler))
-  
-  (define error-display-handler-message-box-title
-    (make-parameter (string-constant drscheme-internal-error)))
-  
-  (define system-security-guard (current-security-guard))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;;  internal error display support
-  ;;
-  
-  (define error-display-chan (make-channel))
-  (define get-last-N-errors-chan (make-channel))
-  (define number-of-errors-to-save 5)
-  (thread
-   (λ () 
-     (define-struct recent (msg when))
-     (define currently-visible-chan (make-channel))
-     (let loop ([recently-seen-errors/unfiltered '()]
-                [last-N-errors '()]
-                [currently-visible #f])
-       (sync
-        (handle-evt
-         error-display-chan
-         (λ (msg+exn)
-           (define recently-seen-errors 
-             ;; recent errors are ones less than 5 minutes old
-             (let ([now (current-seconds)])
-               (filter (λ (x) (<= (+ (recent-when x) (* 60 5)) now))
-                       recently-seen-errors/unfiltered)))
-           (define new-last-N-errors (cons msg+exn 
-                                           (take last-N-errors 
-                                                 (min (- number-of-errors-to-save 1)
-                                                      (length last-N-errors)))))
-           (define-values (msg exn) (apply values msg+exn))
-           (cond
-             [currently-visible 
-              ;; drop errors when we have one waiting to be clicked on
-              (loop recently-seen-errors new-last-N-errors #t)]
-             [(ormap (λ (x) (equal? msg (recent-msg x))) 
-                     recently-seen-errors)
-              ;; drop the error if we've seen it recently
-              (loop recently-seen-errors new-last-N-errors #f)]
-             [else
-              ;; show the error
-              (define title (error-display-handler-message-box-title))
-              (define text (let ([p (open-output-string)])
-                             (parameterize ([current-error-port p]
-                                            [current-output-port p])
-                               (original-error-display-handler msg exn))
-                             (get-output-string p)))
-              
-              (parameterize ([current-eventspace error-display-eventspace]
-                             [current-custodian system-custodian])
-                (thread
-                 (λ () 
-                   (message-box title text #f '(stop ok) #:dialog-mixin frame:focus-table-mixin)
-                   (channel-put currently-visible-chan #f))))
-              (loop (cons (make-recent msg (current-seconds)) recently-seen-errors)
-                    new-last-N-errors
-                    #t)])))
-        (handle-evt
-         get-last-N-errors-chan
-         (λ (c)
-           (channel-put c last-N-errors)
-           (loop
-            (loop recently-seen-errors/unfiltered
-                  last-N-errors
-                  currently-visible))))
-        (handle-evt
-         currently-visible-chan
-         (λ (val) 
-           (loop recently-seen-errors/unfiltered last-N-errors #f)))))))
-  
-  (define (get-last-N-errors)
-    (define c (make-channel))
-    (channel-put get-last-N-errors-chan c)
-    (channel-get c))
-  
-  ;; override error-display-handler to duplicate the error
-  ;; message in both the standard place (as defined by the
-  ;; current error-display-handler) and in a message box
-  ;; identifying the error as a drracket internal error.
-  (error-display-handler
-   (λ (msg exn)
-     ;; this  may raise an exception if the port is gone.
-     (with-handlers ([exn:fail? (λ (x) (void))])
-       (original-error-display-handler msg exn))
-     (channel-put error-display-chan (list msg exn))
-     
-     ;; try to end any unclosed edit-sequences in any definitions
-     ;; texts or interactions texts. That is, we try to recover a
-     ;; little bit from errors that are raised in the dynamic 
-     ;; extent of an edit-sequence.
-     (when (eq? (current-thread) (eventspace-handler-thread system-eventspace))
-       (for ([f (in-list (get-top-level-windows))])
-         (when (is-a? f drracket:unit:frame<%>)
-           (let loop ([o f])
-             (cond
-               [(is-a? o editor-canvas%)
-                (define t (send o get-editor))
-                (when (or (is-a? t drracket:unit:definitions-text<%>)
-                          (is-a? t drracket:rep:text<%>))
-                  (let loop ()
-                    (when (send t in-edit-sequence?)
-                      (send t end-edit-sequence)
-                      (loop))))]
-               [(is-a? o area-container<%>)
-                (for ([c (in-list (send o get-children))])
-                  (loop c))])))))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/insert-large-letters.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/insert-large-letters.rkt
deleted file mode 100644
index 6676d12e21..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/insert-large-letters.rkt
+++ /dev/null
@@ -1,202 +0,0 @@
-#lang typed/racket
-
-(require typed/mred/mred
-         typed/framework/framework
-         typed/racket/class
-         string-constants)
-
-(require/typed framework
-               [frame:focus-table-mixin
-                (-> Dialog% Dialog%)])
-
-(define-type Bitmap-Message%
-  (Class (init [parent (Instance Horizontal-Panel%)])
-         [set-bm ((U (Instance Bitmap%) #f) -> Void)]))
-
-(require/typed "bitmap-message.rkt"
-               [bitmap-message% Bitmap-Message%])
-
-(provide insert-large-letters)
-
-(: insert-large-letters (String Char (Instance Text:Basic%) Any -> Void))
-(define (insert-large-letters comment-prefix comment-character edit parent)
-  (let ([str (make-large-letters-dialog comment-prefix comment-character #f)])
-    (when (and str
-               (not (equal? str "")))
-      (render-large-letters comment-prefix comment-character (get-chosen-font) str edit)
-      (void))))
-
-(: get-default-font (-> (Instance Font%)))
-(define (get-default-font)
-  (send (send (editor:get-standard-style-list)
-              find-named-style
-              "Standard")
-        get-font))
-
-(: get-chosen-font (-> (Instance Font%)))
-(define (get-chosen-font)
-  (let ([pref-val (preferences:get 'drracket:large-letters-font)])
-    (cond
-      [pref-val
-       (let ([candidate (send the-font-list find-or-create-font (cdr pref-val) (car pref-val) 'default 'normal 'normal)])
-         (if (equal? (send candidate get-face) (car pref-val))
-             candidate
-             (get-default-font)))]
-      [else
-       (get-default-font)])))
-
-(define columns-string "~a columns")
-
-;; make-large-letters-dialog : string char top-level-window<%> -> void
-(: make-large-letters-dialog (String Char Any -> (Option String)))
-(define (make-large-letters-dialog comment-prefix comment-character parent)
-  (define dlg (new (frame:focus-table-mixin dialog%)
-                   [parent parent] 
-                   [width 700]
-                   [label (string-constant large-semicolon-letters)]))
-  (define: text-field : (Instance Text-Field%) 
-    (new text-field% 
-         [parent dlg] 
-         [label (string-constant text-to-insert)]
-         [callback (λ: ([x : Any] [y : Any]) (update-txt (send text-field get-value)))]))
-  (: info-bar (Instance Horizontal-Panel%))
-  (define info-bar (new horizontal-panel%
-                        [parent dlg]
-                        [stretchable-height #f]))
-  (define: font-choice : (Instance Choice%)
-    (let ([tmp-bdc (new bitmap-dc% [bitmap (make-bitmap 1 1 #f)])])
-      (new choice%
-           [label (string-constant fonts)]
-           [parent info-bar]
-           [choices (get-face-list)]
-           [callback
-            (λ: ([x : Any] [y : Any])
-                (let ([old (preferences:get 'drracket:large-letters-font)]
-                      [choice (send font-choice get-selection)])
-                  (when choice
-                    (preferences:set 'drracket:large-letters-font
-                                     (cons (list-ref (get-face-list)
-                                                     choice)
-                                           (if old
-                                               (cdr old)
-                                               (send (get-default-font) get-point-size))))
-                    (update-txt (send text-field get-value)))))])))
-  
-  (: count (Instance Message%))
-  (define count (new message% [label (format columns-string 1000)] [parent info-bar]))
-  (: pane1 (Instance Horizontal-Pane%))
-  (define pane1 (new horizontal-pane% (parent info-bar)))
-  (: dark-msg (Instance Bitmap-Message%))
-  (define dark-msg (new bitmap-message% [parent info-bar]))
-  (: pane2 (Instance Horizontal-Pane%))
-  (define pane2 (new horizontal-pane% (parent info-bar)))
-                                
-  (: txt (Instance Text:Basic%))
-  (define txt (new racket:text%))
-  (: ec (Instance Editor-Canvas%))
-  (define ec (new editor-canvas% [parent dlg] [editor txt]))
-  (: button-panel (Instance Horizontal-Panel%))
-  (define button-panel (new horizontal-panel%
-                            [parent dlg]
-                            [stretchable-height #f]
-                            [alignment '(right center)]))
-  (define: ok? : Boolean #f)
-  (: ok Any)
-  (: cancel Any)
-  (define-values (ok cancel)
-    (gui-utils:ok/cancel-buttons button-panel
-                                 (λ: ([x : Any] [y : Any]) (set! ok? #t) (send dlg show #f))
-                                 (λ: ([x : Any] [y : Any]) (send dlg show #f))))
-  (: update-txt (String -> Any))
-  (define (update-txt str)
-    (send txt begin-edit-sequence)
-    (send txt lock #f)
-    (send txt delete 0 (send txt last-position))
-    (let ([bm (render-large-letters comment-prefix comment-character (get-chosen-font) str txt)])
-      (send ec set-line-count (+ 1 (send txt last-paragraph)))
-      (send txt lock #t)
-      (send txt end-edit-sequence)
-      (send count set-label (format columns-string (get-max-line-width txt)))
-      (send dark-msg set-bm (if (equal? str "") #f bm))))
-  
-  
-  ;; CHANGE - get-face can return #f
-  (let ([face (send (get-chosen-font) get-face)])
-    (when face
-      (let loop ([i 0]
-                 [faces (get-face-list)])
-        (cond
-          [(null? faces) (void)]
-          [else (cond
-                  [(equal? face (car faces))
-                   (send font-choice set-selection i)]
-                  [else
-                   (loop (+ i 1) (cdr faces))])]))))
-  
-  (send txt auto-wrap #f)
-  (update-txt "")
-  (send text-field focus)
-  (send dlg show #t)
-  (and ok? (send text-field get-value)))
-
-(: get-max-line-width ((Instance Text:Basic%) -> Real))
-(define (get-max-line-width txt)
-  (let loop ([i (+ (send txt last-paragraph) 1)]
-             [#{m : Integer} 0])
-    (cond
-      [(zero? i) m]
-      [else (loop (sub1 i)
-                  (max m (- (send txt paragraph-end-position (- i 1))
-                            (send txt paragraph-start-position (- i 1)))))])))
-      
-
-(: render-large-letters (String Char (Instance Font%) String (Instance Text:Basic%) -> (Instance Bitmap%)))
-(define (render-large-letters comment-prefix comment-character the-font str edit)
-  (define bdc (new bitmap-dc% [bitmap (make-bitmap 1 1 #t)]))
-  (define-values (tw raw-th td ta) (send bdc get-text-extent str the-font))
-  (define th (let-values ([(_1 h _2 _3) (send bdc get-text-extent "X" the-font)])
-               (max raw-th h)))
-  (define tmp-color (make-object color%))
-  
-  (: get-char (Real Real -> Char))
-  (define (get-char x y)
-    (send bdc get-pixel x y tmp-color)
-    (let ([red (send tmp-color red)])
-      (if (= red 0)
-          comment-character
-          #\space)))  
-  (define bitmap
-    (make-object bitmap%
-      (max 1 (exact-floor tw))
-      (assert (exact-floor th) positive?)
-      #t))
-  
-  (: fetch-line (Real -> String))
-  (define (fetch-line y)
-    (let: loop : String ([x : Real (send bitmap get-width)]
-                         [chars : (Listof Char) null])
-      (cond
-        [(zero? x) (apply string chars)]
-        [else (loop (- x 1) (cons (get-char (- x 1) y) chars))])))
-  
-  (send bdc set-bitmap bitmap)
-  (send bdc clear)
-  (send bdc set-font the-font)
-  (send bdc draw-text str 0 0)
-  
-  (send edit begin-edit-sequence)
-  (let ([start (send edit get-start-position)]
-        [end (send edit get-end-position)])
-    (send edit delete start end)
-    (send edit insert "\n" start start)
-    (let loop ([y (send bitmap get-height)])
-      (unless (zero? y)
-        (send edit insert (fetch-line (- y 1)) start start)
-        (send edit insert comment-prefix start start)
-        (send edit insert "\n" start start)
-        (loop (- y 1)))))
-  (send edit end-edit-sequence)
-  (send bdc set-bitmap #f)
-  bitmap)
-
-;(make-large-letters-dialog ";" #\; #f)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/interface.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/interface.rkt
deleted file mode 100644
index e97d2ee5ec..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/interface.rkt
+++ /dev/null
@@ -1,134 +0,0 @@
-#lang racket/unit
-#|
-
-This file has names with partial prefixes built into them
-because the interfaces here used to be in other files, but
-that was causing circular dependencies; the interfaces
-were moved here to break the cycle, but the names should
-remain the same for tools that use them.
-
-|#
-
-(require drracket/private/drsig
-         "local-member-names.rkt"
-         racket/class 
-         framework)
-(import)
-(export drracket:interface^)
-
-(define frame:basics<%> (interface (frame:standard-menus<%>)))
-(define frame:<%>
-  (interface (frame:editor<%> frame:basics<%> frame:text-info<%>)
-    get-show-menu
-    update-shown
-    add-show-menu-items
-    set-show-menu-sort-key))
-
-(define unit:frame<%>
-  (interface (frame:<%>
-              frame:searchable-text<%>
-              frame:delegate<%>)
-    get-insert-menu
-    get-special-menu
-    get-interactions-text
-    get-definitions-text
-    get-interactions-canvas
-    get-definitions-canvas
-    get-button-panel
-    execute-callback
-    get-current-tab
-    open-in-new-tab
-    create-new-tab
-    close-current-tab
-    on-tab-change
-    enable-evaluation
-    disable-evaluation
-    get-definitions/interactions-panel-parent
-    register-capability-menu-item
-    
-    ensure-rep-shown
-    ensure-rep-hidden
-    ensure-defs-shown
-    
-    
-    get-language-menu
-    register-toolbar-button
-    register-toolbar-buttons
-    unregister-toolbar-button
-    sort-toolbar-buttons-panel
-    get-tabs))
-
-(define unit:definitions-text<%> 
-  (interface ()
-    begin-metadata-changes
-    end-metadata-changes
-    get-tab
-    get-next-settings
-    after-set-next-settings
-    set-needs-execution-message))
-
-(define rep:context<%>
-  (interface ()
-    ensure-rep-shown   ;; (interactions-text -> void)
-    ;; make the rep visible in the frame
-    
-    repl-submit-happened ;; (-> boolean)
-    ;; notify the context that an evaluation is about to
-    ;; happen in the REPL (so it can show a warning about
-    ;; the language/etc is out of sync if neccessary).
-    
-    enable-evaluation  ;; (-> void)
-    ;; make the context enable all methods of evaluation
-    ;; (disable buttons, menus, etc)
-    
-    disable-evaluation ;; (-> void)
-    ;; make the context disable all methods of evaluation
-    ;; (disable buttons, menus, etc)
-    
-    set-breakables ;; (union thread #f) (union custodian #f) -> void
-    ;; the context might initiate breaks or kills to
-    ;; the thread passed to this function
-    
-    get-breakables ;; -> (values (union thread #f) (union custodian #f))
-    ;; returns the last values passed to set-breakables.
-    
-    reset-offer-kill ;; (-> void)
-    ;; the next time the break button is pushed, it will only
-    ;; break. (if the break button is clicked twice without
-    ;; this method being called in between, it will offer to
-    ;; kill the user's program)
-    
-    update-running        ;; (boolean -> void)
-    ;; a callback to indicate that the repl may have changed its running state
-    ;; use the repls' get-in-evaluation? method to find out what the current state is.
-    
-    clear-annotations  ;; (-> void)
-    ;; clear any error highlighting context
-    
-    get-directory      ;; (-> (union #f string[existing directory]))
-    ;; returns the directory that should be the default for
-    ;; the `current-directory' parameter in the repl.
-    ))
-
-(define unit:tab<%>
-  (interface (rep:context<%>)
-    get-frame
-    get-defs
-    get-ints
-    get-visible-defs
-    set-visible-defs
-    set-visible-ints
-    set-focus-d/i
-    get-i
-    set-i
-    break-callback
-    is-current-tab?
-    get-enabled
-    on-close
-    can-close?
-    toggle-log))
-
-(define module-language-tools:definitions-text<%> (interface () move-to-new-language))
-(define module-language-tools:tab<%> (interface ()))
-(define module-language-tools:frame<%> (interface ()))
-
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/key.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/key.rkt
deleted file mode 100644
index 0df77cdffc..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/key.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-  (provide break-threads)
-  (define super-cust (current-custodian))
-  (define first-child (make-custodian))
-  (current-custodian first-child)
-  
-  
-  (define (break-threads)
-    (parameterize ([current-custodian super-cust])
-      (thread
-       (λ ()
-         (let loop ([super-cust super-cust]
-                    [current-cust first-child])
-           (for-each (λ (man)
-                       (when (thread? man)
-                         (break-thread man))
-                       (when (custodian? man)
-                         (loop current-cust man)))
-                     (custodian-managed-list current-cust super-cust)))))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/label-frame-mred.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/label-frame-mred.rkt
deleted file mode 100644
index 842153fcb7..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/label-frame-mred.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-  (require racket/gui/base
-           racket/class)
-  (provide (except-out (all-from-out racket/gui/base) frame%)
-           (rename-out [registering-frame% frame%])
-           lookup-frame-name)
-  
-  (define (lookup-frame-name frame)
-    (semaphore-wait label-sema)
-    (begin0
-      (hash-ref label-ht frame (λ () #f))
-      (semaphore-post label-sema)))
-  
-  (define label-sema (make-semaphore 1))
-  (define label-ht (make-weak-hasheq))
-  
-  (define registering-frame%
-    (class frame%
-      (define/override (set-label x)
-        (semaphore-wait label-sema)
-        (hash-set! label-ht this x)
-        (semaphore-post label-sema)
-        (super set-label x))
-      (inherit get-label)
-      (super-instantiate ())
-      (semaphore-wait label-sema)
-      (hash-set! label-ht this (get-label))
-      (semaphore-post label-sema)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/language-configuration.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/language-configuration.rkt
deleted file mode 100644
index bc4f23a6f5..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/language-configuration.rkt
+++ /dev/null
@@ -1,2568 +0,0 @@
-#lang racket/base
-(require racket/unit
-         mrlib/hierlist
-         racket/class
-         racket/contract
-         racket/string
-         racket/list
-         racket/gui/base
-         drracket/private/drsig
-         "tooltip.rkt"
-         "local-member-names.rkt"
-         string-constants
-         framework
-         setup/getinfo
-         setup/xref
-         scribble/xref
-         scribble/tag
-         net/url
-         syntax/toplevel
-         browser/external
-         (only-in mzlib/struct make-->vector)
-
-         ;; ensure that this module is always loaded since it is shared below for pretty big
-         (prefix-in : mred/mred))
-
-  (define original-output (current-output-port))
-  (define (oprintf . args) (apply fprintf original-output args))
-  
-  (define-values (sc-use-language-in-source 
-                  sc-use-teaching-language
-                  sc-choose-a-language
-                  mouse-event-uses-shortcut-prefix?)
-    (let* ([shortcut-prefix (get-default-shortcut-prefix)]
-           [menukey-string 
-            (apply string-append
-                   (map (λ (x)
-                          (case x
-                            [(cmd) "⌘"]
-                            [else (format "~a-" x)]))
-                        shortcut-prefix))])
-      (define (mouse-event-uses-shortcut-prefix? evt)
-        (andmap (λ (prefix)
-                  (case prefix
-                    [(alt) (case (system-type)
-                             [(windows) (send evt get-meta-down)]
-                             [else (send evt get-alt-down)])]
-                    [(cmd) (send evt get-meta-down)]
-                    [(meta) (send evt get-meta-down)]
-                    [(ctl) (send evt get-control-down)]
-                    [(shift) (send evt get-shiftdown)]
-                    [(option) (send evt get-alt-down)]))
-                shortcut-prefix))
-      (values (string-append (string-constant the-racket-language)
-                             (format " (~aR)" menukey-string))
-              (string-append (string-constant teaching-languages)
-                             (format " (~aT)" menukey-string))
-              (string-append (string-constant other-languages)
-                             (format " (~aO)" menukey-string))
-              mouse-event-uses-shortcut-prefix?)))
-  
-  (provide language-configuration@)
-  
-  (define-unit language-configuration@
-    (import [prefix drracket:unit: drracket:unit^]
-            [prefix drracket:rep: drracket:rep^]
-            [prefix drracket:init: drracket:init^]
-            [prefix drracket:language: drracket:language/int^]
-            [prefix drracket:app: drracket:app^]
-            [prefix drracket:tools: drracket:tools^]
-            [prefix drracket:help-desk: drracket:help-desk^]
-            [prefix drracket:module-language: drracket:module-language/int^]
-            [prefix drracket: drracket:interface^])
-    (export drracket:language-configuration/internal^)
-    
-    (define struct:language-settings struct:drracket:language-configuration:language-settings)
-    (define language-settings? drracket:language-configuration:language-settings?)
-    (define language-settings-language drracket:language-configuration:language-settings-language)
-    (define language-settings-settings drracket:language-configuration:language-settings-settings)
-    (define make-language-settings drracket:language-configuration:language-settings)
-    (define language-settings make-language-settings)
-    
-    ;; settings-preferences-symbol : symbol
-    ;; this pref used to depend on `version', but no longer does.
-    (define settings-preferences-symbol 'drracket:language-settings)
-    
-    ;; get-settings-preferences-symbol : -> symbol
-    (define (get-settings-preferences-symbol) settings-preferences-symbol)
-    
-    ;; default-language-position : (listof string)
-    ;; if a language is registered with this position, it is
-    ;; considered the default language
-    (define initial-language-position
-      (list (string-constant initial-language-category)
-            (string-constant no-language-chosen)))
-    
-    ;; languages : (listof (instanceof language<%>))
-    ;; all of the languages supported in DrRacket
-    (define languages null)
-    
-    (define languages-allowing-executable-creation '())
-    (define (language-allows-executable-creation? candidate-lang)
-      (define candidates-positions (send candidate-lang get-language-position))
-      (for/or ([allowed-lang (in-list languages-allowing-executable-creation)])
-        (equal? (send allowed-lang get-language-position)
-                candidates-positions)))
-    
-    ;; add-language : (instanceof language%) -> void
-    ;; only allows addition on phase2
-    ;; effect: updates `languages'
-    (define (add-language language [front? #f]
-                          #:allow-executable-creation? [allow-executable-creation? #f])
-      
-      (drracket:tools:only-in-phase 'drracket:language:add-language 'phase2)
-      (for-each
-       (λ (i<%>)
-         (unless (is-a? language i<%>)
-           (error 'drracket:language:add-language
-                  (string-append
-                   "expected language ~e to implement ~e,"
-                   " forgot to use `drracket:language:get-default-mixin'?")
-                  language i<%>)))
-       (drracket:language:get-language-extensions))
-      
-      (ensure-no-duplicate-numbers language languages)
-      (when allow-executable-creation?
-        (set! languages-allowing-executable-creation
-              (cons language languages-allowing-executable-creation)))
-      (set! languages 
-            (if front? 
-                (cons language languages)
-                (append languages (list language)))))
-    
-    (define (ensure-no-duplicate-numbers l1 languages)
-      (for-each
-       (λ (l2)
-         (when (equal? (send l1 get-language-numbers)
-                       (send l2 get-language-numbers))
-           (error 'drracket:language-configuration:add-language
-                  "found two languages with the same result from get-language-numbers: ~s, ~s and ~s"
-                  (send l1 get-language-numbers)
-                  (send l1 get-language-position)
-                  (send l2 get-language-position))))
-       languages))
-    
-    ;; get-languages : -> (listof languages)
-    (define (get-languages) 
-      (drracket:tools:only-in-phase
-       'drracket:language-configuration:get-languages
-       'init-complete)
-      languages)
-    
-    ;; get-default-language-settings : -> language-settings
-    ;; uses `default-language-position' to find the default language.
-    ;; if that language is not available, just takes the first language.
-    ;; if there are no languages defined yet, signal an error -- drscheme is in trouble.
-    (define (get-default-language-settings)
-      (when (null? languages)
-        (error 'get-default-language-settings "no languages registered!"))
-      (let ([lang (or (ormap (λ (x)
-                               (and (equal? (send x get-language-position)
-                                            initial-language-position)
-                                    x))
-                             (get-languages))
-                      (list-ref (get-languages) 0))])
-        (language-settings lang (send lang default-settings))))
-    
-    
-    
-
-;                                                              
-;                                                              
-;                                                              
-;                                                              
-;  ;;;                                                         
-;  ;;;                                                         
-;  ;;;  ;;;;;  ;;; ;;   ;; ;;; ;;; ;;;  ;;;;;   ;; ;;;   ;;;;  
-;  ;;; ;;;;;;; ;;;;;;; ;;;;;;; ;;; ;;; ;;;;;;; ;;;;;;;  ;; ;;; 
-;  ;;; ;;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;  ;;; ;;; ;;; ;;; ;;; 
-;  ;;;   ;;;;; ;;; ;;; ;;; ;;; ;;; ;;;   ;;;;; ;;; ;;; ;;;;;;; 
-;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;;     
-;  ;;; ;;; ;;; ;;; ;;; ;;;;;;; ;;;;;;; ;;; ;;; ;;;;;;;  ;;;;;; 
-;  ;;;  ;;;;;; ;;; ;;;  ;; ;;;  ;; ;;;  ;;;;;;  ;; ;;;   ;;;;  
-;                          ;;;                     ;;;         
-;                      ;;;;;;                  ;;;;;;          
-;                                                              
-;                                                              
-;                                          
-;                                          
-;                                          
-;                                          
-;      ;;; ;;;         ;;;                 
-;      ;;;             ;;;                 
-;   ;; ;;; ;;;  ;;;;;  ;;;   ;;;    ;; ;;; 
-;  ;;;;;;; ;;; ;;;;;;; ;;;  ;;;;;  ;;;;;;; 
-;  ;;; ;;; ;;; ;;  ;;; ;;; ;;; ;;; ;;; ;;; 
-;  ;;; ;;; ;;;   ;;;;; ;;; ;;; ;;; ;;; ;;; 
-;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; 
-;  ;;;;;;; ;;; ;;; ;;; ;;;  ;;;;;  ;;;;;;; 
-;   ;; ;;; ;;;  ;;;;;; ;;;   ;;;    ;; ;;; 
-;                                      ;;; 
-;                                  ;;;;;;  
-;                                          
-;                                          
-    
-    
-    ;; language-dialog : (boolean language-setting -> (union #f language-setting))
-    ;;                   (boolean language-setting (union #f (instanceof top-level-window%))
-    ;;                    -> 
-    ;;                    (union #f language-setting))
-    ;; allows the user to configure their language. The input language-setting is used
-    ;; as the defaults in the dialog and the output language setting is the user's choice
-    ;; todo: when button is clicked, ensure language is selected
-    (define language-dialog
-      (λ (show-welcome? language-settings-to-show [parent #f])
-        (define ret-dialog%
-          (class (frame:focus-table-mixin dialog%)
-            (define/override (on-subwindow-char receiver evt)
-              (case (send evt get-key-code)
-                [(escape) (cancel-callback)]
-                [(#\return numpad-enter) (enter-callback)]
-                [else
-                 (or (key-pressed receiver evt)
-                     (super on-subwindow-char receiver evt))]))
-            (super-new)))
-        
-        (define dialog (instantiate ret-dialog% ()
-                         (label (if show-welcome?
-                                    (string-constant welcome-to-drscheme)
-                                    (string-constant language-dialog-title)))
-                         (parent parent)
-                         (style '(resize-border))))
-        (define welcome-before-panel (instantiate horizontal-pane% ()
-                                       (parent dialog)
-                                       (stretchable-height #f)))
-        (define language-dialog-meat-panel (make-object vertical-pane% dialog))
-        
-        (define welcome-after-panel (instantiate vertical-pane% () 
-                                      (parent dialog)
-                                      (stretchable-height #f)))
-        
-        (define button-panel (instantiate horizontal-pane% ()
-                               (parent dialog)
-                               (stretchable-height #f)))
-        
-        ;; initialized below
-        (define ok-button #f)
-        (define cancel-button #f)
-        
-        ;; cancelled? : boolean
-        ;; flag that indicates if the dialog was cancelled.
-        (define cancelled? #t)
-        
-        ;; enter-callback : -> bool
-        ;; returns #f if no language is selected (so the event will be
-        ;; processed by the hierlist widget, which will toggle subtrees)
-        (define (enter-callback)
-          (cond [(get-selected-language)
-                 (set! cancelled? #f)
-                 (send dialog show #f)
-                 #t]
-                [else #f]))
-        
-        ;; ok-callback : -> void
-        ;; similar to the above, but shows an error dialog if no language os
-        ;; selected
-        (define (ok-callback)
-          (unless (enter-callback)
-            (message-box (string-constant drscheme)
-                         (string-constant please-select-a-language)
-                         #:dialog-mixin frame:focus-table-mixin)))
-        
-        ;; cancel-callback : -> void
-        (define (cancel-callback)
-          (send dialog show #f))
-        
-        ;; a handler for "ok"-related stuff
-        (define ok-handler
-          ;; this is called before the buttons are made: keep track of state
-          ;; in that case
-          (let ([enabled? #t])
-            (define (enable! state)
-              (set! enabled? state)
-              (when ok-button (send ok-button enable state)))
-            (λ (msg)
-              (case msg
-                [(disable)     (enable! #f)]
-                [(enable)      (enable! #t)]
-                [(enable-sync) (enable! enabled?)]
-                [(execute)     (enter-callback) (void)]
-                [else (error 'ok-handler "internal error (~e)" msg)]))))
-        
-        (define-values (get-selected-language get-selected-language-settings key-pressed)
-          (fill-language-dialog language-dialog-meat-panel
-                                button-panel
-                                language-settings-to-show
-                                #f
-                                ok-handler
-                                (and (is-a? parent drracket:unit:frame<%>)
-                                     (send parent get-definitions-text))))
-        
-        ;; create ok/cancel buttons
-        (make-object horizontal-pane% button-panel)
-        (set!-values (ok-button cancel-button)
-                     (gui-utils:ok/cancel-buttons button-panel
-                                                  (λ (x y) (ok-callback))
-                                                  (λ (x y) (cancel-callback))))
-        (ok-handler 'enable-sync) ; sync enable status now
-        (make-object grow-box-spacer-pane% button-panel)
-        
-        (when show-welcome?
-          (add-welcome dialog welcome-before-panel welcome-after-panel))
-        
-        (send dialog stretchable-width #f)
-        (send dialog stretchable-height #f)
-        
-        (unless parent
-          (send dialog center 'both))
-        (send dialog show #t)
-        (if cancelled?
-            #f
-            (language-settings
-             (get-selected-language)
-             (get-selected-language-settings)))))
-    
-    ;; fill-language-dialog :
-    ;;    (vertical-panel panel language-setting -> language-setting)
-    ;;    (union dialog #f) [...more stuff...]
-    ;; -> (-> (union #f language<%>)) (-> settings[corresponding to fst thnk result])
-    ;; allows the user to configure their language. The input language-setting is used
-    ;; as the defaults in the dialog and the output language setting is the user's choice
-    ;; if re-center is a dialog, when the show details button is clicked, the dialog is recenterd.
-    (define fill-language-dialog
-      (λ (parent show-details-parent language-settings-to-show
-                 [re-center #f]
-                 [ok-handler void]
-                 [definitions-text #f]) ; en/disable button, execute it
-        
-        (define-values (language-to-show settings-to-show)
-          (let ([request-lang-to-show (language-settings-language language-settings-to-show)])
-            (cond
-              [(equal? initial-language-position (send request-lang-to-show get-language-position))
-               (values (list-ref (get-languages) 0)
-                       (send (list-ref (get-languages) 0) default-settings))
-               (values #f #f)]
-              [else (values request-lang-to-show
-                            (language-settings-settings language-settings-to-show))])))
-        
-        ;; hier-list items that implement this interface correspond to
-        ;; actual language selections
-        (define hieritem-language<%>
-          (interface (hierarchical-list-item<%>)
-            get-language
-            selected))
-        
-        (define selectable-hierlist%
-          (class hierarchical-list%
-            (init parent)
-            
-            (inherit get-selected
-                     client->screen
-                     get-editor)
-            (define/override (on-char evt)
-              (let ([code (send evt get-key-code)])
-                (case code
-                  [(up)   (select-next sub1)]
-                  [(down) (select-next add1)]
-                  ;; right key is fine, but nicer to close after a left
-                  [(left) (super on-char evt)
-                          (cond [(get-selected)
-                                 => (λ (i)
-                                      (when (is-a? i hierarchical-list-compound-item<%>)
-                                        (send i close)))])]
-                  [else (super on-char evt)])))
-            
-            (inherit get-items)
-            
-            ;; select-next : (num -> num) -> void
-            ;; finds the next/prev leaf after the selected child on the open
-            ;; fringe using `inc' for a direction.
-            (define/private (select-next inc)
-              (define current (get-selected))
-              (define (choose item)
-                (when current (send current select #f))
-                (send item select #t)
-                ;; make it visible
-                (let loop ([item item])
-                  (let ([parent (send item get-parent)])
-                    (if parent
-                        (loop parent)
-                        (send item scroll-to))))
-                (send item scroll-to))
-              (define (selectable? item)
-                (and (send item get-allow-selection?)
-                     ;; opened all the way to the top
-                     (let loop ([p (send item get-parent)])
-                       (or (not p)
-                           (and (send p is-open?)
-                                (loop (send p get-parent)))))))
-              (let* ([fringe     (get-fringe)]
-                     [fringe-len (vector-length fringe)]
-                     [n (if current
-                            (let loop ([i (sub1 (vector-length fringe))])
-                              (cond [(< i 0) (error 'select-next "item not found in fringe")]
-                                    [(eq? current (vector-ref fringe i))
-                                     (min (sub1 fringe-len) (max 0 (inc i)))]
-                                    [else (loop (sub1 i))]))
-                            (modulo (inc fringe-len) (add1 fringe-len)))])
-                ;; need to choose item n, but go on looking for one that is
-                ;; selectable and open
-                (let loop ([n n])
-                  (when (< -1 n fringe-len)
-                    (let ([item (vector-ref fringe n)])
-                      (if (selectable? item)
-                          (choose item)
-                          (loop (inc n))))))))
-            
-            (define cached-fringe #f)
-            (define/public (clear-fringe-cache) (set! cached-fringe #f))
-            (define (get-fringe)
-              (unless cached-fringe
-                (let ([fringe
-                       (let loop ([items (get-items)])
-                         (apply append
-                                (map (λ (item)
-                                       (if (is-a? item hierarchical-list-compound-item<%>)
-                                           (cons item
-                                                 (loop (send item get-items)))
-                                           (list item)))
-                                     items)))])
-                  (set! cached-fringe (list->vector fringe))))
-              cached-fringe)
-            
-            (define/override (on-select i)
-              (cond
-                [(and i (is-a? i hieritem-language<%>))
-                 (define pos (send (send i get-language) get-language-position))
-                 (if (eq? this teaching-languages-hier-list)
-                     (preferences:set 'drracket:language-dialog:teaching-hierlist-default pos)
-                     (preferences:set 'drracket:language-dialog:hierlist-default pos))
-                 (if (eq? this teaching-languages-hier-list)
-                     (set! most-recent-teaching-languages-hier-list-selection pos)
-                     (set! most-recent-languages-hier-list-selection pos))
-                 (something-selected this i)]
-                [else
-                 (non-language-selected)]))
-            ;; this is used only because we set `on-click-always'
-            (define/override (on-click i)
-              (when (and i (is-a? i hierarchical-list-compound-item<%>))
-                (send i toggle-open/closed)))
-            ;; double-click selects a language
-            (define/override (on-double-select i)
-              (when (and i (is-a? i hieritem-language<%>))
-                (something-selected this i)
-                (ok-handler 'execute)))
-            
-            (define tooltip-timer 
-              (new timer%
-                   [notify-callback (λ () (show-tooltip))]))
-            (define tooltip-frame #f)
-            (define hieritem-language-to-show-in-tooltip #f)
-            (define hieritem-tooltip-x #f)
-            (define hieritem-tooltip-y #f)
-            (define hieritem-tooltip-w #f)
-            (define hieritem-tooltip-h #f)
-            (define/override (on-event evt)
-              (super on-event evt)
-              (cond
-                [(or (send evt entering?)
-                     (send evt moving?))
-                 (define-values (ex ey) (send (get-editor) dc-location-to-editor-location
-                                              (send evt get-x) 
-                                              (send evt get-y)))
-                 (define-values (_to-show-in-tooltip _x _y _w _h)
-                   (find-snip ex ey))
-                 (unless (equal? _to-show-in-tooltip
-                                 hieritem-language-to-show-in-tooltip)
-                   (set! hieritem-language-to-show-in-tooltip _to-show-in-tooltip)
-                   (set! hieritem-tooltip-x _x)
-                   (set! hieritem-tooltip-y _y)
-                   (set! hieritem-tooltip-w _w)
-                   (set! hieritem-tooltip-h _h)
-                   (when tooltip-frame (send tooltip-frame show #f))
-                   (send tooltip-timer stop)
-                   (when hieritem-language-to-show-in-tooltip (send tooltip-timer start 200 #t)))]
-                [(send evt leaving?)
-                 (set! hieritem-language-to-show-in-tooltip #f)
-                 (send tooltip-timer stop)]))
-            (define bl (box 0))
-            (define bt (box 0))
-            (define br (box 0))
-            (define bb (box 0))
-            (define/private (find-snip x y)
-              (let loop ([snip (send (get-editor) find-first-snip)]
-                         [editor (get-editor)]
-                         [x x]
-                         [y y])
-                (cond
-                  [(not snip) (values #f #f #f #f #f)]
-                  [else 
-                   (send editor get-snip-location snip bl bt #f)
-                   (send editor get-snip-location snip br bb #t)
-                   (cond
-                     [(and (is-a? snip hierarchical-item-snip%)
-                           (is-a? (send snip get-item) hieritem-language<%>)
-                           (<= (unbox bl) x (unbox br))
-                           (<= (unbox bt) y (unbox bb)))
-                      (define w (- (unbox br) (unbox bl)))
-                      (define h (- (unbox bb) (unbox bt)))
-                      (send editor local-to-global bl bt)
-                      (define-values (x y) (client->screen
-                                            (inexact->exact (round (unbox bl)))
-                                            (inexact->exact (round (unbox bt)))))
-                      (define-values (dl dt) (get-display-left-top-inset))
-                      (values (send snip get-item)
-                              (- x dl)
-                              (- y dt)
-                              (inexact->exact (round w))
-                              (inexact->exact (round h)))]
-                     [(is-a? snip editor-snip%)
-                      (define-values (es ex ey ew eh)
-                        (loop (send (send snip get-editor) find-first-snip)
-                              (send snip get-editor)
-                              (- x (unbox bl))
-                              (- y (unbox bt))))
-                      (if es
-                          (values es ex ey ew eh)
-                          (loop (send snip next) editor x y))]
-                     [else
-                      (loop (send snip next) editor x y)])])))
-            (define/private (show-tooltip)
-              (when hieritem-language-to-show-in-tooltip
-                (define msg (send (send hieritem-language-to-show-in-tooltip get-language)
-                                  get-one-line-summary))
-                (when msg
-                  (unless tooltip-frame
-                    (set! tooltip-frame (new tooltip-frame%
-                                             [frame-to-track
-                                              (let loop ([w this])
-                                                (cond
-                                                  [(is-a? w top-level-window<%>)
-                                                   w]
-                                                  [(is-a? w area<%>)
-                                                   (loop (send w get-parent))]
-                                                  [else #f]))])))
-                  (send tooltip-frame set-tooltip (list msg))
-                  (send tooltip-frame show-over 
-                        (+ hieritem-tooltip-x hieritem-tooltip-w 4)
-                        hieritem-tooltip-y
-                        0 
-                        0))))
-                 
-            (define/public (hide-tooltip)
-              (when tooltip-frame
-                (send tooltip-frame show #f)))
-            
-            (super-new [parent parent])
-            ;; do this so we can expand/collapse languages on a single click
-            (inherit on-click-always allow-deselect)
-            (on-click-always #t)
-            (allow-deselect #t)))
-        
-        (define outermost-panel (new horizontal-panel% 
-                                     [parent parent]
-                                     [alignment '(left top)]))
-        (define languages-choice-panel (new vertical-panel%
-                                            [parent outermost-panel]
-                                            [stretchable-height #f]
-                                            [alignment '(left top)]))
-        
-        (define the-racket-language-panel (new vertical-panel%
-                                               [parent languages-choice-panel]
-                                               [alignment '(left top)]
-                                               [stretchable-height #f]))
-        
-        (define use-language-in-source-rb
-          (new radio-box% 
-               [label #f]
-               [choices (list sc-use-language-in-source)]
-               [parent the-racket-language-panel]
-               [callback
-                (λ (rb evt)
-                  (use-language-in-source-rb-callback))]))
-        (define (use-language-in-source-rb-callback)
-          (module-language-selected)
-          (send use-chosen-language-rb set-selection #f)
-          (send use-teaching-language-rb set-selection #f))
-        (define in-source-discussion-panel (new horizontal-panel% 
-                                                [parent the-racket-language-panel]
-                                                [stretchable-height #f]))
-        (define in-source-discussion-spacer (new horizontal-panel% 
-                                                 [parent in-source-discussion-panel]
-                                                 [stretchable-width #f]
-                                                 [min-width 32]))
-        (define in-source-discussion-editor-canvas 
-          (add-discussion in-source-discussion-panel 
-                          definitions-text
-                          use-language-in-source-rb-callback))
-        (define most-recent-languages-hier-list-selection
-          (preferences:get 'drracket:language-dialog:hierlist-default))
-        (define most-recent-teaching-languages-hier-list-selection 
-          (preferences:get 'drracket:language-dialog:teaching-hierlist-default))
-        
-        (define use-teaching-language-rb
-          (new radio-box% 
-               [label #f]
-               [choices (list sc-use-teaching-language)]
-               [parent languages-choice-panel]
-               [callback
-                (λ (rb evt)
-                  (use-teaching-language-rb-callback))]))
-        (define (use-teaching-language-rb-callback)
-          (cond
-            [most-recent-teaching-languages-hier-list-selection
-             (select-a-language-in-hierlist teaching-languages-hier-list
-                                            (cdr most-recent-teaching-languages-hier-list-selection))]
-            [else
-             (select-first-language-in-hierlist teaching-languages-hier-list)])
-          (send use-chosen-language-rb set-selection #f)
-          (send use-language-in-source-rb set-selection #f)
-          (send use-teaching-language-rb set-selection 0)
-          (send other-languages-hier-list select #f)
-          (send teaching-languages-hier-list focus))
-        
-        (define teaching-languages-hier-list-panel
-          (new horizontal-panel% [parent languages-choice-panel] [stretchable-height #f]))
-        (define teaching-languages-hier-list-spacer
-          (new horizontal-panel% 
-               [parent teaching-languages-hier-list-panel]
-               [stretchable-width #f]
-               [min-width 16]))
-        
-        (define teaching-languages-hier-list 
-          (new selectable-hierlist% 
-               [parent teaching-languages-hier-list-panel]
-               [style '(no-border no-hscroll auto-vscroll transparent)]))
-        
-        (define use-chosen-language-rb
-          (new radio-box%
-               [label #f]
-               [choices (list sc-choose-a-language)]
-               [parent languages-choice-panel]
-               [callback
-                (λ (this-rb evt)
-                  (use-chosen-language-rb-callback))]))
-        (define (use-chosen-language-rb-callback)
-          (show-other-languages)
-          (when most-recent-languages-hier-list-selection
-            (select-a-language-in-hierlist other-languages-hier-list
-                                           most-recent-languages-hier-list-selection))
-          (send use-language-in-source-rb set-selection #f)
-          (send use-teaching-language-rb set-selection #f)
-          (send teaching-languages-hier-list select #f)
-          (send other-languages-hier-list focus))
-        (define (show-other-languages)
-          (when (member ellipsis-spacer-panel (send languages-hier-list-panel get-children))
-            (send languages-hier-list-panel change-children
-                  (λ (l)
-                    (list languages-hier-list-spacer other-languages-hier-list)))))
-        
-        (define languages-hier-list-panel (new horizontal-panel% 
-                                               [parent languages-choice-panel] 
-                                               [stretchable-height #f]))
-        (define ellipsis-spacer-panel (new horizontal-panel% 
-                                           [parent languages-hier-list-panel]
-                                           [stretchable-width #f]
-                                           [min-width 32]))
-        (define ellipsis-message 
-          (new (class canvas%
-                 (define/override (on-paint)
-                   (define dc (get-dc))
-                   (send dc set-font normal-control-font)
-                   (send dc draw-text "..." 0 0))
-                 (define/override (on-event evt)
-                   (when (send evt button-up?)
-                     (show-other-languages)))
-                 (inherit get-dc min-width min-height)
-                 (super-new [style '(transparent)]
-                            [parent languages-hier-list-panel]
-                            [stretchable-width #f]
-                            [stretchable-height #t])
-                 (let ()
-                   (define dc (get-dc))
-                   (define-values (w h _1 _2) (send dc get-text-extent "..." normal-control-font))
-                   (min-width (inexact->exact (ceiling w)))
-                   (min-height (inexact->exact (ceiling h)))))))
-        
-        (define languages-hier-list-spacer (new horizontal-panel% 
-                                                [parent languages-hier-list-panel]
-                                                [stretchable-width #f]
-                                                [min-width 16]))
-        
-        (define other-languages-hier-list 
-          (new selectable-hierlist% 
-               [parent languages-hier-list-panel]
-               [style '(no-border no-hscroll auto-vscroll transparent)]))
-        (define details-outer-panel (make-object vertical-pane% outermost-panel))
-        (define details/manual-parent-panel (make-object vertical-panel% details-outer-panel))
-        (define details-panel (make-object panel:single% details/manual-parent-panel))
-        
-        (define no-details-panel (make-object vertical-panel% details-panel))
-        
-        (define languages-table (make-hasheq))
-        (define languages (get-languages))
-        
-        ;; selected-language : (union (instanceof language<%>) #f)
-        ;; invariant: selected-language and get/set-selected-language-settings
-        ;;            match the user's selection in the languages-hier-list.
-        ;;            or #f if the user is not selecting a language.
-        (define selected-language #f)
-        ;; get/set-selected-language-settings (union #f (-> settings))
-        (define get/set-selected-language-settings #f)
-        
-        (define details-computed? #f)
-        
-        ;; language-mixin : (implements language<%>) 
-        ;;                  (-> (implements area-container<%>))
-        ;;                  get/set 
-        ;;                  ->
-        ;;                  ((implements hierlist<%>) -> (implements hierlist<%>))
-        ;; a mixin that responds to language selections and updates the details-panel
-        (define (language-mixin language get-language-details-panel get/set-settings)
-          (λ (%)
-            (class* % (hieritem-language<%>)
-              (init-rest args)
-              (define/public (get-language) language)
-              (define/public (selected)
-                (update-gui-based-on-selected-language language
-                                                       get-language-details-panel
-                                                       get/set-settings))
-              (apply super-make-object args))))
-        
-        (define (update-gui-based-on-selected-language language
-                                                       get-language-details-panel
-                                                       get/set-settings)
-          (let ([ldp (get-language-details-panel)])
-            (when ldp
-              (send details-panel active-child ldp)))
-          (send revert-to-defaults-button enable #t)
-          (set! get/set-selected-language-settings get/set-settings)
-          (set! selected-language language))
-        
-        (define (module-language-selected)
-          ;; need to deselect things in the languages-hier-list at this point.
-          (send other-languages-hier-list select #f)
-          (send teaching-languages-hier-list select #f)
-          (send use-language-in-source-rb set-selection 0)
-          (send use-chosen-language-rb set-selection #f)
-          (send use-teaching-language-rb set-selection #f)
-          (ok-handler 'enable)
-          (send details-button enable #t)
-          (update-gui-based-on-selected-language module-language*language
-                                                 module-language*get-language-details-panel
-                                                 module-language*get/set-settings))
-        
-        ;; no-language-selected : -> void
-        ;; updates the GUI for the situation where no language at all selected, and
-        ;; and thus none of the radio buttons should be selected. 
-        ;; this generally happens when there is no preference setting for the language
-        ;; (ie the user has just started drracket for the first time)
-        (define (no-language-selected)
-          (non-language-selected)
-          (send use-language-in-source-rb set-selection #f)
-          (send use-chosen-language-rb set-selection #f)
-          (send use-teaching-language-rb set-selection #f))
-        
-        (define module-language*language 'module-language*-not-yet-set)
-        (define module-language*get-language-details-panel 'module-language*-not-yet-set)
-        (define module-language*get/set-settings 'module-language*-not-yet-set)
-        
-        ;; non-language-selected : -> void
-        ;; updates the GUI and selected-language and get/set-selected-language-settings
-        ;; for when some non-language is selected in the hierlist
-        (define (non-language-selected)
-          (send revert-to-defaults-button enable #f)
-          (send details-panel active-child no-details-panel)
-          (set! get/set-selected-language-settings #f)
-          (set! selected-language #f)
-          (ok-handler 'disable)
-          (send details-button enable #f))
-        
-        ;; something-selected : item -> void
-        (define (something-selected hierlist item)
-          (send use-language-in-source-rb set-selection #f)
-          (cond
-            [(eq? hierlist other-languages-hier-list)
-             (send use-teaching-language-rb set-selection #f)
-             (send use-chosen-language-rb set-selection 0)
-             (send teaching-languages-hier-list select #f)]
-            [else 
-             (send use-teaching-language-rb set-selection 0)
-             (send use-chosen-language-rb set-selection #f)
-             (send other-languages-hier-list select #f)])
-          (ok-handler 'enable)
-          (send details-button enable #t)
-          (send item selected))
-        
-        ;; construct-details : (union (-> void) #f)
-        (define construct-details void)
-        
-        (define any-teaching-language-added? #f)
-        
-        ;; add-language-to-dialog : (instanceof language<%>) -> void
-        ;; adds the language to the dialog
-        ;; opens all of the turn-down tags
-        ;; when `language' matches language-to-show, update the settings
-        ;;   panel to match language-to-show, otherwise set to defaults.
-        (define (add-language-to-dialog language)
-          (define positions (send language get-language-position))
-          (define numbers (send language get-language-numbers))
-          (define teaching-language? (and (pair? positions)
-                                          (equal? (car positions)
-                                                  (string-constant teaching-languages))))
-          
-          (when teaching-language? (set! any-teaching-language-added? #t))
-          
-          ;; don't show the initial language ...
-          (unless (equal? positions initial-language-position)
-            (unless (and (list? positions)
-                         (list? numbers)
-                         (pair? positions)
-                         (pair? numbers)
-                         (andmap number? numbers)
-                         (andmap string? positions)
-                         (= (length positions) (length numbers))
-                         ((length numbers) . >= . 1))
-              (error 'drracket:language
-                     (string-append
-                      "languages position and numbers must be lists of strings and numbers,"
-                      " respectively, must have the same length, and must each contain at"
-                      " least one element, got: ~e ~e")
-                     positions numbers))
-            
-            (when (null? (cdr positions))
-              (unless (equal? positions (list (string-constant module-language-name)))
-                (error 'drracket:language
-                       (string-append
-                        "Only the module language may be at the top level."
-                        " Other languages must have at least two levels"))))
-            
-            (send other-languages-hier-list clear-fringe-cache)
-            (send teaching-languages-hier-list clear-fringe-cache)
-            
-            #|
-              
-              inline the first level of the tree into just items in the hierlist
-              keep track of the starting (see call to sort method below) by
-              adding a second field to the second level of the tree that indicates
-              what the sorting number is for its level above (in the second-number mixin)
-              
-              |#
-            (let add-sub-language ([ht languages-table]
-                                   [hier-list (if teaching-language?
-                                                  teaching-languages-hier-list
-                                                  other-languages-hier-list)]
-                                   [positions (if teaching-language?
-                                                  (cdr positions)
-                                                  positions)]
-                                   [numbers (if teaching-language?
-                                                (cdr numbers)
-                                                numbers)]
-                                   [first? #t]
-                                   
-                                   ;; only non-#f during the second iteration
-                                   ;; in which case it is the first iterations number
-                                   [second-number #f])
-              (cond
-                [(null? (cdr positions))
-                 (let* ([language-details-panel #f]
-                        [real-get/set-settings 
-                         (case-lambda
-                           [() 
-                            (cond
-                              [(and language-to-show 
-                                    settings-to-show
-                                    (equal? (send language-to-show get-language-position)
-                                            (send language get-language-position)))
-                               settings-to-show]
-                              [else
-                               (send language default-settings)])]
-                           [(x) (void)])]
-                        [get-language-details-panel (lambda () language-details-panel)]
-                        [get/set-settings (lambda x (apply real-get/set-settings x))]
-                        [position (car positions)]
-                        [number (car numbers)])
-                   
-                   (set! construct-details
-                         (let ([old construct-details])
-                           (lambda ()
-                             (old)
-                             (let-values ([(language-details-panel-real get/set-settings)
-                                           (make-details-panel language)])
-                               (set! language-details-panel language-details-panel-real)
-                               (set! real-get/set-settings get/set-settings))
-                             
-                             (let-values ([(vis-lang vis-settings)
-                                           (cond
-                                             [(and (not selected-language)
-                                                   (eq? language-to-show language))
-                                              (values language-to-show settings-to-show)]
-                                             [(eq? selected-language language)
-                                              (values language 
-                                                      (if (eq? language language-to-show)
-                                                          settings-to-show
-                                                          (send language default-settings)))]
-                                             [else (values #f #f)])])
-                               (cond
-                                 [(and vis-lang
-                                       (equal? (send vis-lang get-language-position)
-                                               (send language get-language-position)))
-                                  (get/set-settings vis-settings)
-                                  (send details-panel active-child language-details-panel)]
-                                 [else
-                                  (get/set-settings (send language default-settings))])))))
-                   
-                   (cond
-                     [(equal? positions (list (string-constant module-language-name)))
-                      (set! module-language*language language)
-                      (set! module-language*get-language-details-panel get-language-details-panel)
-                      (set! module-language*get/set-settings get/set-settings)]
-                     [else
-                      (let* ([mixin (compose
-                                     number-mixin
-                                     (language-mixin language 
-                                                     get-language-details-panel
-                                                     get/set-settings))]
-                             [item
-                              (send hier-list new-item
-                                    (if second-number
-                                        (compose second-number-mixin mixin)
-                                        mixin))]
-                             [text (send item get-editor)]
-                             [delta (send language get-style-delta)])
-                        (send item set-number number)
-                        (when second-number
-                          (send item set-second-number second-number))
-                        (send text insert position)
-                        (when delta
-                          (cond
-                            [(list? delta)
-                             (for-each (λ (x)
-                                         (send text change-style 
-                                               (car x)
-                                               (cadr x)
-                                               (caddr x)))
-                                       delta)]
-                            [(is-a? delta style-delta%)
-                             (send text change-style 
-                                   (send language get-style-delta)
-                                   0
-                                   (send text last-position))])))]))]
-                [else
-                 (let* ([position (car positions)]
-                        [number (car numbers)]
-                        [sub-ht/sub-hier-list
-                         (hash-ref
-                          ht
-                          (string->symbol position)
-                          (λ ()
-                            (if first?
-                                (let* ([item (send hier-list new-item number-mixin)]
-                                       [x (list (make-hasheq) hier-list item)])
-                                  (hash-set! ht (string->symbol position) x)
-                                  (send item set-number number)
-                                  (send item set-allow-selection #f)
-                                  (let* ([editor (send item get-editor)]
-                                         [pos (send editor last-position)])
-                                    (send editor insert "\n")
-                                    (send editor insert position)
-                                    (send editor change-style small-size-delta pos (+ pos 1))
-                                    (send editor change-style section-style-delta 
-                                          (+ pos 1) (send editor last-position)))
-                                  x)
-                                (let* ([new-list (send hier-list new-list
-                                                       (if second-number
-                                                           (compose second-number-mixin number-mixin)
-                                                           number-mixin))]
-                                       [x (list (make-hasheq) new-list #f)])
-                                  (send new-list set-number number)
-                                  (when second-number
-                                    (send new-list set-second-number second-number))
-                                  (send new-list set-allow-selection #t)
-                                  (send new-list open)
-                                  (send (send new-list get-editor) insert position)
-                                  (hash-set! ht (string->symbol position) x)
-                                  x))))])
-                   (cond
-                     [first? 
-                      (unless (= number (send (caddr sub-ht/sub-hier-list) get-number))
-                        (error 'add-language "language ~s; expected number for ~e to be ~e, got ~e"
-                               (send language get-language-name)
-                               position
-                               (send (caddr sub-ht/sub-hier-list) get-number)
-                               number))]
-                     [else
-                      (unless (= number (send (cadr sub-ht/sub-hier-list) get-number))
-                        (error 'add-language "language ~s; expected number for ~e to be ~e, got ~e"
-                               (send language get-language-name)
-                               position
-                               (send (cadr sub-ht/sub-hier-list) get-number)
-                               number))])
-                   (add-sub-language (car sub-ht/sub-hier-list)
-                                     (cadr sub-ht/sub-hier-list)
-                                     (cdr positions)
-                                     (cdr numbers)
-                                     #f
-                                     (if first? number #f)))]))))
-        
-        (define number<%>
-          (interface ()
-            get-number
-            set-number))
-        
-        (define second-number<%>
-          (interface ()
-            get-second-number
-            set-second-number))
-        
-        ;; number-mixin : (extends object%) -> (extends object%)
-        ;; adds the get/set-number methods to this class
-        (define (number-mixin %)
-          (class* % (number<%>)
-            (field (number 0))
-            (define/public (get-number) number)
-            (define/public (set-number _number) (set! number _number))
-            (super-instantiate ())))
-        
-        ;; second-number-mixin : (extends object%) -> (extends object%)
-        ;; adds the get/set-second-number methods to this class
-        (define (second-number-mixin %)
-          (class* % (second-number<%>)
-            (field (second-number 0))
-            (define/public (get-second-number) second-number)
-            (define/public (set-second-number _second-number) (set! second-number _second-number))
-            (super-instantiate ())))
-        
-        ;; make-details-panel : (instanceof language<%>) 
-        ;;                   -> (values panel (case-> (-> settings) (settings -> void)))
-        ;; adds a details panel for `language', using
-        ;; the language's default settings, unless this is
-        ;; the to-show language.
-        (define (make-details-panel language)
-          (let ([panel (instantiate vertical-panel% ()
-                         (parent details-panel)
-                         (stretchable-width #f)
-                         (stretchable-height #f))])
-            (values
-             panel
-             (send language config-panel panel))))
-        
-        ;; close-all-languages : -> void
-        ;; closes all of the tabs in the language hier-list.
-        (define (close-all-languages)
-          (define (close-children list)
-            (for-each close-this-one (send list get-items)))
-          (define (close-this-one item)
-            (cond
-              [(is-a? item hierarchical-list-compound-item<%>)
-               (send item close)
-               (close-children item)]
-              [else (void)]))
-          (close-children other-languages-hier-list)
-          (close-children teaching-languages-hier-list))
-        
-        ;; open-current-language : -> void
-        ;; opens the tabs that lead to the current language
-        ;; and selects the current language
-        (define (open-current-language)
-          
-          ;; set the initial selection in the hierlists
-          (let ([hier-default (preferences:get 'drracket:language-dialog:hierlist-default)])
-            (when hier-default
-              (select-a-language-in-hierlist other-languages-hier-list hier-default)))
-          (let ([hier-default (preferences:get 'drracket:language-dialog:teaching-hierlist-default)])
-            (when hier-default
-              (select-a-language-in-hierlist teaching-languages-hier-list (cdr hier-default))))
-          
-          (send languages-hier-list-panel change-children
-              (λ (l)
-                (list ellipsis-spacer-panel ellipsis-message)))
-          
-          (cond
-            [(not (and language-to-show settings-to-show))
-             (no-language-selected)]
-            [(is-a? language-to-show drracket:module-language:module-language<%>)
-             ;; the above changes the radio button selections,
-             ;; so do it before calling module-language-selected
-             (module-language-selected)]
-            [else
-             (define position (send language-to-show get-language-position))
-             (cond
-               [(and (pair? position)
-                     (equal? (car position) 
-                             (string-constant teaching-languages)))
-                (select-a-language-in-hierlist teaching-languages-hier-list (cdr position))
-                (send use-teaching-language-rb set-selection 0)
-                (send use-chosen-language-rb set-selection #f)
-                (send teaching-languages-hier-list focus)]
-               [else
-                (send languages-hier-list-panel change-children
-                      (λ (l)
-                        (list languages-hier-list-spacer other-languages-hier-list)))
-                (select-a-language-in-hierlist other-languages-hier-list position)
-                (send use-teaching-language-rb set-selection #f)
-                (send use-chosen-language-rb set-selection 0)
-                (send other-languages-hier-list focus)])
-             (send use-language-in-source-rb set-selection #f)]))
-        
-        (define (select-a-language-in-hierlist hier-list language-position)
-          (cond
-            [(null? (cdr language-position))
-             ;; nothing to open here
-             (send (car (send hier-list get-items)) select #t)]
-            [else
-             (let loop ([hi hier-list]
-                        
-                        ;; skip the first position, since it is flattened into the dialog
-                        [first-pos (cadr language-position)]
-                        [position (cddr language-position)])
-               (let ([matching-children
-                      (filter (λ (x)
-                                (equal? (send (send x get-editor) get-text)
-                                        first-pos))
-                              (send hi get-items))])
-                 (cond
-                   [(null? matching-children) 
-                    (void)]
-                   [else
-                    (let ([child (car matching-children)])
-                      (cond
-                        [(null? position)
-                         (send child select #t)]
-                        [else
-                          ;; test can fail when prefs are bad
-                         (when (is-a? child hierarchical-list-compound-item<%>)
-                           (send child open)
-                           (loop child (car position) (cdr position)))]))])))]))
-        
-        (define (select-first-language-in-hierlist hier-list)
-          (let loop ([hi hier-list])
-            (for/or ([child (in-list (send hi get-items))])
-              (cond
-                [(is-a? child hierarchical-list-compound-item<%>)
-                 (send child open)
-                 (loop child)]
-                [(is-a? child hieritem-language<%>)
-                 (send child select #t)
-                 #t]
-                [else 
-                 #f]))))
-        
-        ;; docs-callback : -> void
-        (define (docs-callback)
-          (void))
-        
-        ;; details-shown? : boolean
-        ;; indicates if the details are currently visible in the dialog
-        (define details-shown? (and language-to-show
-                                    settings-to-show 
-                                    (not (send language-to-show default-settings? settings-to-show))))
-        
-        ;; details-callback : -> void
-        ;; flips the details-shown? flag and resets the GUI
-        (define (details-callback)
-          (do-construct-details)
-          (set! details-shown? (not details-shown?))
-          (when re-center
-            (send re-center begin-container-sequence))
-          (update-show/hide-details)
-          (when re-center
-            (send re-center center 'both)
-            (send re-center end-container-sequence)))
-        
-        ;; do-construct-details : -> void
-        ;; construct the details panels, if they have not been constructed
-        (define (do-construct-details)
-          (when construct-details
-            (send details-button enable #f)
-            (construct-details)
-            (set! construct-details #f)
-            (send details-button enable #t)))
-        
-        ;; show/hide-details : -> void
-        ;; udpates the GUI based on the details-shown? flag
-        (define (update-show/hide-details)
-          (send details-button set-label 
-                (if details-shown? hide-details-label show-details-label))
-          (send parent begin-container-sequence)
-          (send revert-to-defaults-outer-panel change-children
-                (λ (l)
-                  (if details-shown? (list revert-to-defaults-button) null)))
-          (send details-outer-panel change-children
-                (λ (l)
-                  (if details-shown? (list details/manual-parent-panel) null)))
-          (send parent end-container-sequence))
-        
-        ;; revert-to-defaults-callback : -> void
-        (define (revert-to-defaults-callback)
-          (when selected-language
-            (get/set-selected-language-settings 
-             (send selected-language default-settings))))
-        
-        (define show-details-label (string-constant show-details-button-label))
-        (define hide-details-label (string-constant hide-details-button-label))
-        (define details-button (make-object button% 
-                                 (if (show-details-label . system-font-space->= . hide-details-label)
-                                     show-details-label
-                                     hide-details-label)
-                                 show-details-parent
-                                 (λ (x y)
-                                   (details-callback))))
-        
-        (define revert-to-defaults-outer-panel (make-object horizontal-panel% show-details-parent))
-        (define revert-to-defaults-button (make-object button% 
-                                            (string-constant revert-to-language-defaults)
-                                            revert-to-defaults-outer-panel
-                                            (λ (_1 _2)
-                                              (revert-to-defaults-callback))))
-        
-        (send revert-to-defaults-outer-panel stretchable-width #f)
-        (send revert-to-defaults-outer-panel stretchable-height #f)
-        
-        (for-each add-language-to-dialog languages)
-        
-        (unless any-teaching-language-added?
-          (send languages-choice-panel change-children
-                (λ (l)
-                  (remove* (list teaching-languages-hier-list-panel use-teaching-language-rb)
-                           l))))
-        
-        (define (hier-list-sort-predicate x y)
-          (cond
-            [(and (x . is-a? . second-number<%>)
-                  (y . is-a? . second-number<%>))
-             (cond
-               [(= (send x get-second-number)
-                   (send y get-second-number))
-                (< (send x get-number) (send y get-number))]
-               [else
-                (< (send x get-second-number)
-                   (send y get-second-number))])]
-            [(and (x . is-a? . number<%>)
-                  (y . is-a? . second-number<%>))
-             (cond
-               [(= (send x get-number)
-                   (send y get-second-number))
-                #t]
-               [else
-                (< (send x get-number)
-                   (send y get-second-number))])]
-            [(and (x . is-a? . second-number<%>)
-                  (y . is-a? . number<%>))
-             (cond
-               [(= (send x get-second-number)
-                   (send y get-number))
-                #f]
-               [else (< (send x get-second-number)
-                        (send y get-number))])]
-            [(and (x . is-a? . number<%>)
-                  (y . is-a? . number<%>))
-             (< (send x get-number) (send y get-number))]
-            [else #f]))
-        (send other-languages-hier-list sort hier-list-sort-predicate)
-        (send teaching-languages-hier-list sort hier-list-sort-predicate)
-        
-        ;; remove the newline at the front of the first inlined category (if there)
-        ;; it won't be there if the module language is at the top.
-        (for ([hier-list (in-list (list other-languages-hier-list teaching-languages-hier-list))])
-          (define items (send hier-list get-items))
-          (unless (null? items)
-            (define t (send (car items) get-editor))
-            (when (equal? "\n" (send t get-text 0 1))
-              (send t delete 0 1))))
-        
-        (send details-outer-panel stretchable-width #f)
-        (send details/manual-parent-panel change-children 
-              (λ (l)
-                (list details-panel)))
-        
-        (define (config-hier-list hier-list) 
-          (send hier-list stretchable-width #t)
-          (send hier-list stretchable-height #t)
-          (send hier-list accept-tab-focus #t)
-          (send hier-list allow-tab-exit #t))
-        (config-hier-list other-languages-hier-list)
-        (config-hier-list teaching-languages-hier-list)
-        (send parent reflow-container)
-        (close-all-languages)
-        (open-current-language)
-        (define (set-min-sizes hier-list)
-          (send hier-list min-client-width (text-width (send hier-list get-editor)))
-          (send hier-list min-client-height (text-height (send hier-list get-editor))))
-        (set-min-sizes other-languages-hier-list)
-        (set-min-sizes teaching-languages-hier-list)
-        (when details-shown?
-          (do-construct-details))
-        (update-show/hide-details)
-        (when get/set-selected-language-settings
-          ;; this call to get/set-selected-language-settings has to come after the call
-          ;; to do-construct-details above because do-construct-details sets all of the
-          ;; controls to the language's default settings
-          (get/set-selected-language-settings settings-to-show))
-        (size-discussion-canvas in-source-discussion-editor-canvas)
-        (values
-         (λ () selected-language)
-         (λ () 
-           (and get/set-selected-language-settings
-                (get/set-selected-language-settings)))
-         (λ (receiver evt)
-           (case (send evt get-key-code)
-             [(#\r) 
-              (if (mouse-event-uses-shortcut-prefix? evt)
-                  (begin (send use-language-in-source-rb set-selection 0)
-                         (use-language-in-source-rb-callback)
-                         #t)
-                  #f)]
-             [(#\t)
-              (if (mouse-event-uses-shortcut-prefix? evt)
-                  (begin 
-                    (send use-teaching-language-rb set-selection 0)
-                    (use-teaching-language-rb-callback)
-                    #t)
-                  #f)]
-             [(#\o)
-              (if (mouse-event-uses-shortcut-prefix? evt)
-                  (begin 
-                    (send use-chosen-language-rb set-selection 0)
-                    (use-chosen-language-rb-callback)
-                    #t)
-                  #f)]
-             [else #f])))))
-    
-    (define (add-discussion p definitions-text use-language-in-source-rb-callback)
-      (define t (new (text:hide-caret/selection-mixin text:standard-style-list%)))
-      (define c (new editor-canvas%
-                     [stretchable-width #t]
-                     [horizontal-inset 0]
-                     [vertical-inset 0]
-                     [parent p]
-                     [style '(no-border no-vscroll no-hscroll transparent)]
-                     [editor t]))
-      (send t set-styles-sticky #f)
-      (send t set-autowrap-bitmap #f)
-      (define size-sd (make-object style-delta%
-                        'change-size
-                        (send normal-control-font get-point-size)))
-      (define (do-insert str tt-style?)
-        (define before (send t last-position))
-        (send t insert str before before)
-        (cond
-          [tt-style?
-           (send t change-style 
-                 (send (send t get-style-list) find-named-style "Standard")
-                 before (send t last-position))]
-          [else
-           (send t change-style 
-                 (send (send t get-style-list) basic-style)
-                 before (send t last-position))])
-        (send t change-style size-sd before (send t last-position)))
-      (when (send normal-control-font get-size-in-pixels)
-        (send size-sd set-size-in-pixels-on #t))
-      (let loop ([strs (regexp-split #rx"#lang" (string-constant racket-language-discussion))])
-        (do-insert (car strs) #f)
-        (unless (null? (cdr strs))
-          (do-insert "#lang" #t)
-          (loop (cdr strs))))
-      
-      (define spacer-snips '())
-      (define spacer-poses '())
-      
-      (for ([lang (in-list '(racket racket/base typed/racket scribble/base))])
-        (define the-lang-line (format "#lang ~a" lang))
-        (do-insert "  " #t)
-        (define before-lang (send t last-position))
-        (do-insert the-lang-line #t)
-        (define after-lang (send t last-position))
-        (define spacer (new spacer-snip%))
-        (define spacer-pos (send t last-position))
-        (set! spacer-snips (cons spacer spacer-snips))
-        (set! spacer-poses (cons spacer-pos spacer-poses))
-        (send t insert spacer spacer-pos spacer-pos)
-        (do-insert "  [" #f)
-        (define before-docs (send t last-position))
-        (do-insert "docs" #f)
-        (define after-docs (send t last-position))
-        (do-insert "]\n" #f)
-        (send t set-clickback before-lang after-lang
-              (λ (t start end)
-                (use-language-in-source-rb-callback)
-                (define-values (current-line-start current-line-end) 
-                  (if definitions-text
-                      (find-language-position definitions-text)
-                      (values #f #f)))
-                (define existing-lang-line 
-                  (and current-line-start
-                       (send definitions-text get-text current-line-start current-line-end)))
-                (case (message-box/custom
-                       (string-constant drscheme)
-                       (string-append
-                        (string-constant racket-dialect-in-buffer-message)
-                        "\n\n"
-                        (cond
-                          [(and existing-lang-line
-                                (equal? existing-lang-line the-lang-line))
-                           (format (string-constant racket-dialect-already-same-#lang-line) 
-                                   existing-lang-line)]
-                          [existing-lang-line
-                           (format (string-constant racket-dialect-replace-#lang-line) 
-                                   existing-lang-line
-                                   the-lang-line)]
-                          [else
-                           (format (string-constant racket-dialect-add-new-#lang-line)
-                                   the-lang-line)]))
-                       (cond
-                         [(and existing-lang-line
-                               (equal? existing-lang-line the-lang-line))
-                          (string-constant ok)]
-                         [existing-lang-line
-                          (string-constant replace-#lang-line)]
-                         [else
-                          (string-constant add-#lang-line)])
-                       (and (not (equal? existing-lang-line the-lang-line))
-                            (string-constant cancel))
-                       #f #f
-                       '(default=1))
-                  [(1) 
-                   (cond
-                     [current-line-start
-                      (send definitions-text begin-edit-sequence)
-                      (send definitions-text delete current-line-start current-line-end)
-                      (send definitions-text insert 
-                            the-lang-line
-                            current-line-start
-                            current-line-start)
-                      (send definitions-text end-edit-sequence)]
-                     [else
-                      (send definitions-text begin-edit-sequence)
-                      (send definitions-text insert "\n" 0 0)
-                      (send definitions-text insert the-lang-line 0 0)
-                      (send definitions-text end-edit-sequence)])]
-                  [else (void)])))
-        (send t set-clickback before-docs after-docs 
-              (λ (t start end)
-                (define-values (path tag) (xref-tag->path+anchor (load-collections-xref) 
-                                                                 (make-module-language-tag lang)))
-                (define url (path->url path))
-                (define url2 (if tag
-                                 (make-url (url-scheme url)
-                                           (url-user url)
-                                           (url-host url)
-                                           (url-port url)
-                                           (url-path-absolute? url)
-                                           (url-path url)
-                                           (url-query url)
-                                           tag)
-                                 url))
-                (send-url (url->string url2)))))
-      
-      (do-insert (string-constant racket-language-discussion-end) #f)
-      
-      (define kmp (send t set-keymap (keymap:get-editor)))
-      
-      (send (send c get-parent) reflow-container)
-      
-      (define xb (box 0))
-      (define max-spacer-pos
-        (for/fold ([m 0]) ([spacer-pos (in-list spacer-poses)])
-          (send t position-location spacer-pos xb #f)
-          (max m (unbox xb))))
-      (for ([spacer-pos (in-list spacer-poses)]
-            [spacer-snip (in-list spacer-snips)])
-        (send t position-location spacer-pos xb #f)
-        (send spacer-snip set-width (- max-spacer-pos (unbox xb))))
-      
-      (send t hide-caret #t)
-      (send t auto-wrap #t)
-      (send t lock #t)
-      (send c accept-tab-focus #f)
-      (send c allow-tab-exit #t)
-
-      c)
-    
-    (define (find-language-position definitions-text)
-      (define prt (open-input-text-editor definitions-text))
-      (port-count-lines! prt)
-      (define l (with-handlers ((exn:fail? (λ (x) #f)))
-                  (read-language prt)
-                  #t))
-      (cond
-        [l
-         (define-values (line col pos) (port-next-location prt))
-         (define hash-lang-start (send definitions-text find-string "#lang" 'backward pos 0 #f))
-         (if hash-lang-start
-             (values hash-lang-start (- pos 1))
-             (values #f #f))]
-        [else
-         (values #f #f)]))
-    
-    (define spacer-snip%
-      (class snip%
-        (inherit get-admin)
-        (define width 0)
-        (define/public (set-width w) 
-          (set! width w)
-          (define admin (get-admin))
-          (when admin 
-            (send admin resized this #t)))
-        (define/override (get-text [start 0] [end 'eof] [flattened? #f] [force-cr? #f])
-          "")
-        (define/override (get-extent dc x y wb hb db ab lb sp)
-          (super get-extent dc x y wb hb db ab lb sp)
-          (when (box? wb) (set-box! wb width)))
-        (super-new)
-        (inherit set-snipclass)
-        (set-snipclass spacer-sc)))
-    (define spacer-sc (new snip-class%))
-    (send spacer-sc set-classname "drracket:spacer-snipclass")
-    (send spacer-sc set-version 0)
-    (send (get-the-snip-class-list) add spacer-sc)
-    
-    (define (size-discussion-canvas canvas)
-      (define t (send canvas get-editor))
-      (define by (box 0))
-      (send t position-location 
-            (send t line-end-position (send t last-line))
-            #f
-            by)
-      (send canvas min-height (+ (ceiling (inexact->exact (unbox by))) 24)))
-    
-    (define section-style-delta (make-object style-delta% 'change-bold))
-    (send section-style-delta set-delta-foreground "medium blue")
-    (define small-size-delta (make-object style-delta% 'change-size 9))
-    
-    (define (add-welcome dialog welcome-before-panel welcome-after-panel)
-      (let* ([outer-pb%
-              (class pasteboard%
-                (define/override (can-interactive-move? evt)
-                  #f)
-                (super-instantiate ()))]
-             [outer-pb (make-object outer-pb%)]
-             [bitmap 
-              (make-object bitmap%
-                (build-path (collection-file-path "plt-small-shield.gif" "icons")))]
-             [image-snip
-              (make-object image-snip% 
-                (collection-file-path "plt-small-shield.gif" "icons"))]
-             [before-text (make-object text%)]
-             [before-snip (make-object editor-snip% before-text #f)]
-             [before-ec%
-              (class editor-canvas% 
-                (inherit get-client-size)
-                (define/private (update-size)
-                  (let-values ([(cw ch) (get-client-size)])
-                    (unless (or (zero? cw)
-                                (zero? ch))
-                      (let ([image-l-box (box 0)]
-                            [image-r-box (box 0)])
-                        (send before-text get-snip-location image-snip image-l-box #f #f)
-                        (send before-text get-snip-location image-snip image-r-box #f #t)
-                        (let* ([image-w (send bitmap get-width)]
-                               [before-snip-space (- cw image-w)]
-                               [before-snip-w (- before-snip-space
-                                                 5 5 ;; space before and after inside snip 
-                                                 2   ;; space at end of outer editor
-                                                 1   ;; space at beginning of outer editor
-                                                 1   ;; space between image and snip
-                                                 -5  ;; unknown space
-                                                 )])
-                          (send before-text set-max-width (max 0 before-snip-w)))))))
-                (define/override (on-superwindow-show shown?)
-                  (update-size)
-                  (super on-superwindow-show shown?))
-                (define/override (on-size w h)
-                  (update-size)
-                  (super on-size w h))
-                (super-instantiate ()))]
-             [before-ec (instantiate before-ec% ()
-                          (parent welcome-before-panel)
-                          (editor outer-pb)
-                          (stretchable-height #f)
-                          (style '(no-vscroll no-hscroll)))]
-             [first-line-style-delta (make-object style-delta% 'change-bold)])
-        (send first-line-style-delta set-delta-foreground (make-object color% 150 0 150))
-        (send before-ec min-width 550)
-        
-        (let-values ([(cw ch) (send before-ec get-client-size)]
-                     [(w h) (send before-ec get-size)])
-          (send before-ec min-height 
-                (+ (send bitmap get-height) 
-                   8  ;; pasteboards apparently want some space here....
-                   (- h ch))))
-        
-        (send outer-pb insert image-snip)
-        (send outer-pb insert before-snip)
-        (send outer-pb move image-snip 0 0)
-        (send outer-pb move before-snip (send bitmap get-width) 0)
-        (send outer-pb set-selection-visible #f)
-        (send outer-pb lock #t)
-        
-        ;(send before-snip set-align-top-line #t)
-        (send before-text insert 
-              (format (string-constant welcome-to-drscheme-version/language)
-                      (version:version)
-                      (this-language)))
-        (send before-text insert #\newline)
-        (send before-text insert (string-constant introduction-to-language-dialog))
-        (send before-text change-style 
-              first-line-style-delta
-              0
-              (send before-text paragraph-end-position 0))
-        (send before-text auto-wrap #t)
-        
-        (send before-text lock #t)
-        (send before-text hide-caret #t)
-        
-        (for-each (λ (native-lang-string language)
-                    (unless (equal? (this-language) language)
-                      (instantiate button% ()
-                        (label native-lang-string)
-                        (parent welcome-after-panel)
-                        (stretchable-width #t)
-                        (callback (λ (x1 x2) (drracket:app:switch-language-to dialog language))))))
-                  (string-constants is-this-your-native-language)
-                  (all-languages))))
-    
-    ;; system-font-space->= : string string -> boolean
-    ;; determines which string is wider, when drawn in the system font
-    (define (x . system-font-space->= . y)
-      (let ([bdc (make-object bitmap-dc%)])
-        (send bdc set-bitmap (make-object bitmap% 1 1 #t))
-        (send bdc set-font (send the-font-list find-or-create-font
-                                 12 'system 'normal 'normal))
-        (let-values ([(wx _1 _2 _3) (send bdc get-text-extent x)]
-                     [(wy _4 _5 _6) (send bdc get-text-extent y)])
-          (wx . >= . wy))))
-    
-    ;; text-width : (isntanceof text%) -> exact-integer
-    ;; calculates the width of widest line in the
-    ;; editor. This only makes sense if auto-wrap
-    ;; is turned off. Otherwise, you could just use
-    ;; the admin's width.
-    (define (text-width text)
-      (let loop ([n (+ (send text last-line) 1)]
-                 [current-max-width 0])
-        (cond
-          [(zero? n)
-           (+
-            10 ;; this should be some magic small constant (hopefully less than 10 on all platforms)
-            (floor (inexact->exact current-max-width)))]
-          [else (let* ([line-number (- n 1)]
-                       [box (box 0.0)]
-                       [eol-pos (send text line-end-position line-number)]
-                       [eol-snip (send text find-snip eol-pos 'before)])
-                  (when eol-snip
-                    (send text get-snip-location eol-snip box #f #t))
-                  (loop (- n 1)
-                        (max current-max-width (unbox box))))])))
-    
-    ;; text-height : (is-a?/c text% -> exact-integer
-    (define (text-height text)
-      (let ([y-box (box 0)])
-        (send text position-location 
-              (send text last-position)
-              #f
-              y-box
-              #f
-              #f
-              #t)
-        (+ 16 ;; upper bound on some space I don't know how to get.
-           (floor (inexact->exact (unbox y-box))))))
-    
-
-
-;                                             
-;                                             
-;                                             
-;                                             
-;  ;;;          ;;;;                          
-;              ;;;                            
-;  ;;; ;;; ;;  ;;;;   ;;;        ;;;;   ;;;;  
-;  ;;; ;;;;;;; ;;;;  ;;;;;      ;;; ;; ;;; ;; 
-;  ;;; ;;; ;;; ;;;  ;;; ;;;     ;;;    ;;;    
-;  ;;; ;;; ;;; ;;;  ;;; ;;;      ;;;;   ;;;;  
-;  ;;; ;;; ;;; ;;;  ;;; ;;; ;;;    ;;;    ;;; 
-;  ;;; ;;; ;;; ;;;   ;;;;;  ;;; ;; ;;; ;; ;;; 
-;  ;;; ;;; ;;; ;;;    ;;;   ;;;  ;;;;   ;;;;  
-;                                             
-;                                             
-;                                             
-;                                             
-;                                                                     
-;                                                                     
-;                                                                     
-;                                                                     
-;  ;;;                                                                
-;  ;;;                                                                
-;  ;;;  ;;;;;  ;;; ;;   ;; ;;; ;;; ;;;  ;;;;;   ;; ;;;   ;;;;   ;;;;  
-;  ;;; ;;;;;;; ;;;;;;; ;;;;;;; ;;; ;;; ;;;;;;; ;;;;;;;  ;; ;;; ;;; ;; 
-;  ;;; ;;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;  ;;; ;;; ;;; ;;; ;;; ;;;    
-;  ;;;   ;;;;; ;;; ;;; ;;; ;;; ;;; ;;;   ;;;;; ;;; ;;; ;;;;;;;  ;;;;  
-;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;;        ;;; 
-;  ;;; ;;; ;;; ;;; ;;; ;;;;;;; ;;;;;;; ;;; ;;; ;;;;;;;  ;;;;;; ;; ;;; 
-;  ;;;  ;;;;;; ;;; ;;;  ;; ;;;  ;; ;;;  ;;;;;;  ;; ;;;   ;;;;   ;;;;  
-;                          ;;;                     ;;;                
-;                      ;;;;;;                  ;;;;;;                 
-;                                                                     
-;                                                                     
-    
-    (define (add-info-specified-languages)
-      (for-each add-info-specified-language
-                (find-relevant-directories '(drscheme-language-positions
-                                             get-drscheme-language-positions))))
-    
-    (define (add-info-specified-language directory)
-      (let ([info-proc (get-info/full directory)])
-        (when info-proc
-          (let* ([lang-positions 
-                  (append
-                   (info-proc 'drscheme-language-positions (λ () null))
-                   (indirect-info-field info-proc 'get-drscheme-language-positions directory))]
-                 [lang-modules (info-proc 'drscheme-language-modules (λ () null))]
-                 [numberss (info-proc 'drscheme-language-numbers 
-                                      (λ ()
-                                        (map (λ (lang-position)
-                                               (map (λ (x) 0) lang-position))
-                                             lang-positions)))]
-                 [summaries (info-proc 'drscheme-language-one-line-summaries 
-                                       (λ ()
-                                         (map (λ (lang-position) "")
-                                              lang-positions)))]
-                 [urls      (info-proc 'drscheme-language-urls 
-                                       (λ ()
-                                         (map (λ (lang-position) "")
-                                              lang-positions)))]
-                 [reader-specs
-                  (info-proc 'drscheme-language-readers
-                             (λ ()
-                               (map (λ (lang-position) #f)
-                                    lang-positions)))])
-            (cond
-              [(and (list? lang-positions)
-                    (andmap (λ (lang-position numbers)
-                              (and (list? lang-position)
-                                   (pair? lang-position)
-                                   (andmap string? lang-position)
-                                   (list? numbers)
-                                   (andmap number? numbers)
-                                   (= (length numbers)
-                                      (length lang-position))))
-                            lang-positions
-                            numberss)
-                    (list? lang-modules)
-                    (andmap (λ (x)
-                              (or (string? x)
-                                  (and (list? x)
-                                       (andmap string? x))))
-                            lang-modules)
-                    (list? summaries)
-                    (andmap string? summaries)
-                    
-                    (list? urls)
-                    (andmap string? urls)
-                    
-                    (list? reader-specs)
-                    (andmap (λ (x)
-                              ;; approximation (no good test, really)
-                              ;; since it depends on the value of a mz
-                              ;; parameter to interpret the module spec
-                              (or (string? x) (eq? x #f) (symbol? x) (pair? x)))
-                            reader-specs)
-                    
-                    (= (length lang-positions)
-                       (length lang-modules)
-                       (length summaries)
-                       (length urls)
-                       (length reader-specs)))
-                               
-               (for ([lang-module (in-list lang-modules)]
-                     [lang-position (in-list lang-positions)]
-                     [lang-numbers (in-list numberss)]
-                     [one-line-summary (in-list summaries)]
-                     [url (in-list urls)]
-                     [reader-spec (in-list reader-specs)])
-                 (define %
-                   ((drracket:language:get-default-mixin)
-                    (drracket:language:module-based-language->language-mixin
-                     (drracket:language:simple-module-based-language->module-based-language-mixin
-                      drracket:language:simple-module-based-language%))))
-                 (define reader
-                   (if reader-spec
-                       (with-handlers ([exn:fail?
-                                        (λ (x)
-                                          (message-box (string-constant drscheme)
-                                                       (if (exn? x)
-                                                           (exn-message x)
-                                                           (format "uncaught exception: ~s" x))
-                                                       #:dialog-mixin frame:focus-table-mixin)
-                                          read-syntax/namespace-introduce)])
-                         (contract
-                          (->* ()
-                               (any/c port?)
-                               (or/c syntax? eof-object?))
-                          (dynamic-require
-                           (cond
-                             [(string? reader-spec)
-                              (build-path
-                               directory 
-                               (platform-independent-string->path reader-spec))]
-                             [else reader-spec])
-                           'read-syntax)
-                          (string->symbol (format "~s" lang-position))
-                          'drscheme))
-                       read-syntax/namespace-introduce))
-                 (add-language (new %
-                                    [module (if (string? lang-module)
-                                                (build-path
-                                                 directory 
-                                                 (platform-independent-string->path lang-module))
-                                                `(lib ,@lang-module))]
-                                    [language-position lang-position]
-                                    [language-id (format "plt:lang-from-module: ~s" lang-module)]
-                                    [language-numbers lang-numbers]
-                                    [one-line-summary one-line-summary]
-                                    [language-url url]
-                                    [reader reader])))]
-              [else
-               (message-box
-                (string-constant drscheme)
-                (format
-                 (string-append
-                  "The drscheme-language-position, drscheme-language-modules,"
-                  " drscheme-language-numbers, and drscheme-language-readers specifications"
-                  " aren't correct. Expected (listof (cons string (listof string))),"
-                  " (listof (listof string)), (listof (listof number)), (listof string),"
-                  " (listof string), and (listof module-spec) respectively, where the lengths"
-                  " of the outer lists are the same. Got ~e, ~e, ~e, ~e, ~e, and ~e")
-                 lang-positions
-                 lang-modules
-                 numberss
-                 summaries
-                 urls
-                 reader-specs)
-                #:dialog-mixin frame:focus-table-mixin)])))))
-    
-    (define (indirect-info-field proc name info-dir)
-      (let ([mp (proc name (λ () #f))])
-        (if (not mp)
-            null
-            (if (and (list? mp)
-                     (= 2 (length mp))
-                     (module-path? (car mp))
-                     (symbol? (cadr mp)))
-                (parameterize ([current-load-relative-directory info-dir])
-                  (dynamic-require (car mp) (cadr mp)))
-                (error
-                 name
-                 "expected either #f or a list containing a module path and symbol, bot ~e"
-                 mp)))))
-    
-    (define (platform-independent-string->path str)
-      (apply
-       build-path
-       (map (λ (x) 
-              (cond
-                [(string=? ".." x) 'up]
-                [(string=? "." x) 'same]
-                [else x]))
-            (regexp-split #rx"/" str))))
-    
-    (define read-syntax/namespace-introduce
-      (λ (source-name-v [input-port (current-input-port)])
-        (let ([v (read-syntax source-name-v input-port)])
-          (if (syntax? v)
-              (namespace-syntax-introduce v)
-              v))))
-    
-    
-
-;             
-;                                               
-;                                               
-;                                               
-;                                               
-;  ;;;             ;;; ;;;   ;      ;;;         
-;  ;;;                 ;;; ;;;                  
-;  ;;; ;;  ;;; ;;; ;;; ;;; ;;;;     ;;; ;;; ;;  
-;  ;;;;;;; ;;; ;;; ;;; ;;; ;;;;     ;;; ;;;;;;; 
-;  ;;; ;;; ;;; ;;; ;;; ;;; ;;;      ;;; ;;; ;;; 
-;  ;;; ;;; ;;; ;;; ;;; ;;; ;;;  ;;;;;;; ;;; ;;; 
-;  ;;; ;;; ;;; ;;; ;;; ;;; ;;;  ;;;;;;; ;;; ;;; 
-;  ;;;;;;; ;;;;;;; ;;; ;;; ;;;;     ;;; ;;; ;;; 
-;  ;;; ;;   ;; ;;; ;;; ;;;  ;;;     ;;; ;;; ;;; 
-;                                               
-;                                               
-;                                               
-;                                               
-;                                                                     
-;                                                                     
-;                                                                     
-;                                                                     
-;  ;;;                                                                
-;  ;;;                                                                
-;  ;;;  ;;;;;  ;;; ;;   ;; ;;; ;;; ;;;  ;;;;;   ;; ;;;   ;;;;   ;;;;  
-;  ;;; ;;;;;;; ;;;;;;; ;;;;;;; ;;; ;;; ;;;;;;; ;;;;;;;  ;; ;;; ;;; ;; 
-;  ;;; ;;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;  ;;; ;;; ;;; ;;; ;;; ;;;    
-;  ;;;   ;;;;; ;;; ;;; ;;; ;;; ;;; ;;;   ;;;;; ;;; ;;; ;;;;;;;  ;;;;  
-;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;;        ;;; 
-;  ;;; ;;; ;;; ;;; ;;; ;;;;;;; ;;;;;;; ;;; ;;; ;;;;;;;  ;;;;;; ;; ;;; 
-;  ;;;  ;;;;;; ;;; ;;;  ;; ;;;  ;; ;;;  ;;;;;;  ;; ;;;   ;;;;   ;;;;  
-;                          ;;;                     ;;;                
-;                      ;;;;;;                  ;;;;;;                 
-;                                                                     
-;                                                                     
-     
-   
-    
-    ;; add-expand-to-front-end : mixin
-    ;; overrides front-end to make the language a language that expands its arguments
-    (define (add-expand-to-front-end %)
-      (class %
-        (define/override (front-end/complete-program input settings)
-          (wrap-front-end (super front-end/complete-program input settings)))
-        (define/override (front-end/interaction input settings)
-          (wrap-front-end (super front-end/interaction input settings)))
-        (define/private (wrap-front-end thnk)
-          (λ ()
-            (let ([res (thnk)])
-              (cond
-                [(syntax? res) (with-syntax ([res res]
-                                             [expand-syntax-top-level-with-compile-time-evals
-                                              expand-syntax-top-level-with-compile-time-evals])
-                                 #'(expand-syntax-top-level-with-compile-time-evals
-                                    (quote-syntax res)))]
-                [(eof-object? res) res]
-                [else `(expand ',res)]))))
-        (super-instantiate ())))
-    
-    (define-struct (simple-settings+assume drracket:language:simple-settings) (no-redef?))
-    (define simple-settings+assume->vector (make-->vector simple-settings+assume))
-
-    (define (macro-stepper-mixin %)
-      (class %
-        (super-new)
-        (define/augment (capability-value key)
-          (cond
-            [(eq? key 'macro-stepper:enabled) #t]
-            [else (inner (drracket:language:get-capability-default key)
-                         capability-value key)]))))
-
-    (define (assume-mixin %)
-      (class %
-        (define/override (default-settings) 
-          (extend-simple-settings (super default-settings) #t))
-
-        (define/override (marshall-settings settings)
-          (simple-settings+assume->vector settings))
-
-        (define/override (unmarshall-settings printable)
-          (and (vector? printable)
-               (= (vector-length printable) 7)
-               (let ([base
-                      (super unmarshall-settings
-                             (list->vector
-                              (reverse
-                               (cdr (reverse (vector->list printable))))))])
-                 (and base
-                      (extend-simple-settings
-                       base
-                       (and (vector-ref printable 6) #t))))))
-
-        (define/override (config-panel parent)
-          (define p (new vertical-panel% [parent parent]))
-          (define base-config (super config-panel p))
-          (define assume-cb (new check-box%
-                                 [parent
-                                  (new group-box-panel%
-                                       [parent p]
-                                       [label (string-constant enforce-primitives-group-box-label)]
-                                       [stretchable-height #f]
-                                       [stretchable-width #f])]
-                                 [label (string-constant enforce-primitives-check-box-label)]))
-          (case-lambda
-            [() (extend-simple-settings (base-config)
-                                        (send assume-cb get-value))]
-            [(c)
-             (base-config c)
-             (send assume-cb set-value (simple-settings+assume-no-redef? c))]))
-
-        (define/override (default-settings? x)
-          (equal? (simple-settings+assume->vector x)
-                  (simple-settings+assume->vector (default-settings))))
-
-        (define/private (extend-simple-settings s no-redef?)
-          (make-simple-settings+assume (drracket:language:simple-settings-case-sensitive s)
-                                       (drracket:language:simple-settings-printing-style s)
-                                       (drracket:language:simple-settings-fraction-style s)
-                                       (drracket:language:simple-settings-show-sharing s)
-                                       (drracket:language:simple-settings-insert-newlines s)
-                                       (drracket:language:simple-settings-annotations s)
-                                       no-redef?))
-
-        (define/override (use-namespace-require/copy-from-setting? s)
-          (not (simple-settings+assume-no-redef? s)))
-
-        (super-new)))
-
-    (define (add-errortrace-key-mixin %)
-      (class %
-        (define/override (on-execute setting run-in-user-thread)
-          (super on-execute setting run-in-user-thread)
-          (run-in-user-thread
-           (λ ()
-             (namespace-require 'errortrace/errortrace-key)
-             (namespace-require '(for-syntax errortrace/errortrace-key)))))
-        (super-new)))
-  
-    (define (r5rs-mixin %)
-      (class %
-        (define/override (on-execute setting run-in-user-thread)
-          (super on-execute setting run-in-user-thread)
-          (run-in-user-thread
-           (λ ()
-             (read-square-bracket-as-paren #f)
-             (read-curly-brace-as-paren #f)
-             (read-accept-infix-dot #f)
-             (print-mpair-curly-braces #f)
-             (print-vector-length #f))))
-        (define/override (get-transformer-module) #f)
-
-        (define/override (default-settings) 
-          (make-simple-settings+assume #f 'trad-write 'mixed-fraction-e #f #t 'debug #t))
-
-        (super-new)))
-  
-    (define (pretty-big-mixin %)
-      (class %
-        ;; since check syntax no longer shares the gui libraries, 
-        ;; we always share it explicitly here
-        (define/override (on-execute settings run-in-user-thread)
-          (let ([mred-name ((current-module-name-resolver) 'mred/mred #f #f #t)])
-            (run-in-user-thread
-             (λ ()
-               (namespace-attach-module drracket:init:system-namespace mred-name))))
-          (super on-execute settings run-in-user-thread))
-        (define/override (default-settings)
-          (let ([s (super default-settings)])
-            (make-simple-settings+assume (drracket:language:simple-settings-case-sensitive s)
-                                         'trad-write
-                                         (drracket:language:simple-settings-fraction-style s)
-                                         (drracket:language:simple-settings-show-sharing s)
-                                         (drracket:language:simple-settings-insert-newlines s)
-                                         (drracket:language:simple-settings-annotations s)
-                                         (simple-settings+assume-no-redef? s))))
-        (super-new)))
-    
-    (define (pretty-big-config-panel-mixin %)
-      (class %
-        (define/override (config-panel parent)
-          (drracket:language:simple-module-based-language-config-panel
-           parent
-           #:include-print-mode? #f))
-        (super-new)))
-    
-    (define get-all-scheme-manual-keywords
-      (let ([words #f])
-        (λ ()
-          (unless words
-            (set! words (text:get-completions/manuals '(racket/base racket/contract))))
-          words)))
-    
-    (define get-all-manual-keywords
-      (let ([words #f])
-        (λ ()
-          (unless words
-            (set! words (text:get-completions/manuals #f)))
-          words)))
-    
-    ;; add-built-in-languages : -> void
-    (define (add-built-in-languages)
-      (let* ([words #f]
-             [extras-mixin
-              (λ (mred-launcher? one-line-summary)
-                (λ (%)
-                  (class* % (drracket:language:language<%>)
-                    (define/override (get-one-line-summary) one-line-summary)
-                    (inherit get-module get-transformer-module get-init-code
-                             use-namespace-require/copy-from-setting?)
-                    (define/override (front-end/interaction port settings)
-                      (let ([t (super front-end/interaction port settings)])
-                        (λ ()
-                          (parameterize ([read-accept-lang #f])
-                            (t)))))
-                    (define/augment (capability-value key)
-                      (cond
-                        [(eq? key 'drscheme:autocomplete-words) 
-                         (get-all-manual-keywords)]
-                        [else (inner
-                               (drracket:language:get-capability-default key)
-                               capability-value key)]))
-                    (super-new))))]
-             [make-simple
-              (λ (module id position numbers mred-launcher? one-line-summary extra-mixin)
-                (define %
-                  (extra-mixin
-                   ((extras-mixin mred-launcher? one-line-summary)
-                    ((drracket:language:get-default-mixin)
-                     (drracket:language:module-based-language->language-mixin
-                      (drracket:language:simple-module-based-language->module-based-language-mixin
-                       drracket:language:simple-module-based-language%))))))
-                (new % 
-                     (module module)
-                     (language-id id)
-                     (language-position position)
-                     (language-numbers numbers)))])
-        (add-language
-         (make-simple '(lib "lang/plt-pretty-big.rkt")
-                      "plt:pretty-big"
-                      (list (string-constant legacy-languages)
-                            (string-constant pretty-big-scheme))
-                      (list -200 3)
-                      #t
-                      (string-constant pretty-big-scheme-one-line-summary)
-                      (λ (%) (pretty-big-mixin
-                              (macro-stepper-mixin
-                               (assume-mixin
-                                (pretty-big-config-panel-mixin
-                                 (add-errortrace-key-mixin %))))))))
-        (add-language
-         (make-simple '(lib "r5rs/lang.rkt")
-                      "plt:r5rs"
-                      (list (string-constant legacy-languages)
-                            (string-constant r5rs-language-name))
-                      (list -200 -1000)
-                      #f
-                      (string-constant r5rs-one-line-summary)
-                      (lambda (%) (r5rs-mixin
-                                   (macro-stepper-mixin
-                                    (assume-mixin (add-errortrace-key-mixin %)))))))
-        
-        (add-language
-         (make-simple 'racket/base
-                      "plt:no-language-chosen"
-                      (list (string-constant initial-language-category)
-                            (string-constant no-language-chosen))
-                      (list 10000 1000)
-                      #f
-                      "Helps the user choose an initial language"
-                      not-a-language-extra-mixin))))
-    
-    (define (not-a-language-extra-mixin %)
-      (class* % (not-a-language-language<%>)
-        (define/override (get-style-delta) (drracket:rep:get-error-delta))
-        
-        (define/override (first-opened) 
-          (not-a-language-message)
-          (eprintf "\n"))
-        
-        (define/override (front-end/interaction input settings)
-          (not-a-language-message)
-          (λ () eof))
-        (define/override (front-end/complete-program input settings)
-          (not-a-language-message)
-          (λ () eof))
-        
-        (define/augment (capability-value v)
-          (case v
-            [(drscheme:define-popup) #f]
-            [(gui-debugger:debug-button) #f]
-            [(macro-stepper:enabled) #f]
-            [(drscheme:check-syntax-button) #f]
-            [else (inner (drracket:language:get-capability-default v)
-                         capability-value v)]))
-        
-        (super-new)))
-    
-    ;; used for identification only
-    (define not-a-language-language<%>
-      (interface ()))
-    
-    
-
-
-;                                                                                                   
-;                                                                                                   
-;                                                                                                   
-;                                                                                                   
-;                    ;                  ;;;                                                         
-;                  ;;;                  ;;;                                                         
-;  ;;; ;;    ;;;   ;;;;      ;;;;;      ;;;  ;;;;;  ;;; ;;   ;; ;;; ;;; ;;;  ;;;;;   ;; ;;;   ;;;;  
-;  ;;;;;;;  ;;;;;  ;;;;     ;;;;;;;     ;;; ;;;;;;; ;;;;;;; ;;;;;;; ;;; ;;; ;;;;;;; ;;;;;;;  ;; ;;; 
-;  ;;; ;;; ;;; ;;; ;;;      ;;  ;;;     ;;; ;;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;  ;;; ;;; ;;; ;;; ;;; 
-;  ;;; ;;; ;;; ;;; ;;;  ;;;;  ;;;;; ;;;;;;;   ;;;;; ;;; ;;; ;;; ;;; ;;; ;;;   ;;;;; ;;; ;;; ;;;;;;; 
-;  ;;; ;;; ;;; ;;; ;;;  ;;;;;;; ;;; ;;;;;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;;     
-;  ;;; ;;;  ;;;;;  ;;;;     ;;; ;;;     ;;; ;;; ;;; ;;; ;;; ;;;;;;; ;;;;;;; ;;; ;;; ;;;;;;;  ;;;;;; 
-;  ;;; ;;;   ;;;    ;;;      ;;;;;;     ;;;  ;;;;;; ;;; ;;;  ;; ;;;  ;; ;;;  ;;;;;;  ;; ;;;   ;;;;  
-;                                                               ;;;                     ;;;         
-;                                                           ;;;;;;                  ;;;;;;          
-;                                                                                                   
-;                                                                                                   
-    
-    
-    (define (not-a-language-message)
-      (define (main)
-        (when (language-still-unchanged?)
-          (o (green-snip (string-constant must-choose-language)))
-          (o "\n")
-          (o (green-snip (string-constant get-guidance-before)))
-          (o (new link-snip%
-                  [words (string-constant get-guidance-during)]
-                  [callback (lambda (snip)
-                              (not-a-language-dialog (find-parent-from-snip snip)))]))
-          (o (green-snip (string-constant get-guidance-after)))))
-      
-      (define (green-snip str)
-        (let ([snp (make-object string-snip% str)])
-          (send snp set-style green-style)
-          snp))
-      
-      (define green-style
-        (let ([list (editor:get-standard-style-list)]
-              [green-style-delta (make-object style-delta% 'change-family 'default)])
-          (send green-style-delta set-delta-foreground "DarkViolet")
-          (send green-style-delta set-delta 'change-italic)
-          (send list
-                find-or-create-style
-                (send list find-named-style "Standard")
-                green-style-delta)))
-      
-      (define (language-still-unchanged?)
-        (let ([rep (drracket:rep:current-rep)])
-          (cond
-            [rep 
-             (let* ([next-settings (send (send rep get-definitions-text) get-next-settings)]
-                    [next-lang (language-settings-language next-settings)])
-               (is-a? next-lang not-a-language-language<%>))]
-            
-            ;; if we cannot get the REP
-            ;; (because a tool is processing the progrm like check syntax)
-            ;; then just assume it has not changed.
-            [else #t])))
-      
-      (define o
-        (case-lambda
-          [(arg) (cond [(string? arg) (eprintf arg)]
-                       [(is-a? arg snip%) (write-special arg (current-error-port))])]
-          [args (apply eprintf args)]))
-      
-      (define arrow-cursor (make-object cursor% 'arrow))
-      
-      (define link-snip%
-        (class editor-snip%
-          (init-field words callback)
-          
-          (define/override (adjust-cursor dc x y editorx editory event) arrow-cursor)
-          
-          (define/override (on-event dc x y editorx editory event)
-            (when (send event button-up?)
-              (callback this)))
-          
-          (define/override (copy)
-            (new link-snip% [words words] [callback callback]))
-          
-          (define txt (new text:standard-style-list%))
-          
-          (super-new [editor txt] [with-border? #f]
-                     [left-margin 0]
-                     [right-margin 0]
-                     [top-margin 0]
-                     [bottom-margin 0])
-          (inherit get-flags set-flags set-style)
-          (set-flags (cons 'handles-events (get-flags)))
-          
-          (send txt insert words)
-          (send txt change-style link-sd 0 (send txt last-position))))
-      
-      (define link-sd (make-object style-delta% 'change-underline #t))
-      (send link-sd set-delta-foreground "blue")
-      (send link-sd set-family 'default)
-      
-      (main))
-    
-    (define (not-a-language-dialog drs-frame)
-      (define dialog (new dialog%
-                          (parent drs-frame)
-                          (label (string-constant drscheme))))
-      (define top-hp (new horizontal-pane% [parent dialog]))
-      (define qa-panel (new vertical-panel% 
-                            [style '(border)]
-                            [parent top-hp] 
-                            [stretchable-width #f]))
-      (define racketeer-panel (new vertical-panel% 
-                                   [style '(border)]
-                                   [parent top-hp]
-                                   [alignment '(center center)]
-                                   [stretchable-width #f]))
-      (define button-panel (new horizontal-pane% 
-                                (parent dialog) 
-                                (stretchable-height #f)
-                                (alignment '(right center))))
-      
-      (define cancel (new button%
-                          (parent button-panel)
-                          (callback (lambda (x y) (send dialog show #f)))
-                          (label (string-constant cancel))))
-      
-      (define language-chosen? #f)
-      
-      (define (main)
-        (insert-text-pls)
-        (display-racketeer)
-        (space-em-out)
-        (fix-msg-sizes)
-        (send dialog show #t))
-      
-      (define (insert-red-message)
-        (new canvas-message% 
-             (parent qa-panel)
-             (font (get-font #:style 'italic))
-             (label (string-constant must-choose-language))
-             (color (send the-color-database find-color "red"))))
-      
-      (define (space-em-out)
-        (send qa-panel change-children
-              (lambda (l)
-                (cond
-                  [(null? l) l]
-                  [else
-                   (let loop ([x (car l)]
-                              [r (cdr l)])
-                     (cond
-                       [(null? r) (list x)]
-                       [else (list* x
-                                    (new vertical-pane%
-                                         (parent qa-panel)
-                                         (min-height 5)
-                                         (stretchable-height #f))
-                                    (loop (car r)
-                                          (cdr r)))]))]))))
-      
-      (define (insert-text-pls)
-        (for-each
-         display-text-pl
-         (sort
-          (apply append 
-                 (map get-text-pls 
-                      (find-relevant-directories '(textbook-pls get-textbook-pls))))
-          (λ (x y)
-            (cond
-              [(string=? (cadr x) (string-constant how-to-design-programs))
-               #t]
-              [(string=? (string-constant how-to-design-programs) (cadr y))
-               #f]
-              [else
-               (string<=? (cadr x) (cadr y))])))))
-      
-      (define (display-racketeer)
-        (new canvas-message% 
-             (parent racketeer-panel)
-             (label (string-constant racketeer?)))
-        (new canvas-message% 
-             [label (read-bitmap (collection-file-path "plt-logo-red-shiny.png" "icons"))]
-             [parent racketeer-panel]
-             [callback (λ () (change-current-lang-to
-                              (λ (x) (is-a? x drracket:module-language:module-language<%>))))])
-        (new canvas-message%
-             (parent racketeer-panel) 
-             (label (string-constant use-language-in-source))
-             (color (send the-color-database find-color "blue"))
-             (callback (λ () (change-current-lang-to
-                              (λ (x) (is-a? x drracket:module-language:module-language<%>)))))
-             (font (get-font #:underlined #t))))
-      
-      (define (display-text-pl lst)
-        (let ([icon-lst (car lst)]
-              [text-name (cadr lst)]
-              [lang (cddr lst)]
-              [using-before (string-constant using-a-textbook-before)]
-              [using-after (string-constant using-a-textbook-after)])
-          (question/answer (lambda (parent)
-                             (new canvas-message%
-                                  (parent parent)
-                                  (label using-before))
-                             (new canvas-message%
-                                  (parent parent)
-                                  (font (get-font #:style 'italic))
-                                  (label text-name))
-                             (new canvas-message%
-                                  (parent parent)
-                                  (label using-after)))
-                           (default-line2 (last lang) lang)
-                           icon-lst)))
-      
-      (define default-font (send the-font-list find-or-create-font
-                                 12
-                                 'default
-                                 'normal
-                                 'normal))
-      
-      (define (get-font #:point-size [point-size (send default-font get-point-size)]
-                        #:family (family (send default-font get-family))
-                        #:style (style (send default-font get-style))
-                        #:weight (weight (send default-font get-weight))
-                        #:underlined (underlined (send default-font get-underlined))
-                        #:smoothing (smoothing (send default-font get-smoothing)))
-        (send the-font-list find-or-create-font
-              point-size
-              family
-              style
-              weight
-              underlined
-              smoothing))
-      
-      (define canvas-message%
-        (class canvas%
-          (init-field label
-                      [font (get-font)]
-                      [callback void]
-                      [color (send the-color-database find-color "black")])
-          
-          (define/override (on-event evt)
-            (cond
-              [(send evt button-up?)
-               (callback)]
-              [else 
-               (super on-event evt)]))
-          
-          (define/override (on-paint)
-            (define dc (get-dc))
-            (cond
-              [(string? label)
-               (define old-font (send dc get-font))
-               (define old-tf (send dc get-text-foreground))
-               (send dc set-text-foreground color)
-               (send dc set-font font)
-               (send dc draw-text label 0 0 #t)
-               (send dc set-font old-font)
-               (send dc set-text-foreground old-tf)]
-              [(is-a? label bitmap%)
-               (send dc draw-bitmap label 0 0)]))
-          
-          (super-new [stretchable-width #f]
-                     [stretchable-height #f]
-                     [style '(transparent)])
-          
-          (inherit min-width min-height get-dc)
-          (cond
-            [(string? label)
-             (define-values (w h _1 _2) (send (get-dc) get-text-extent label font #t))
-             (min-width (inexact->exact (ceiling w)))
-             (min-height (inexact->exact (ceiling h)))]
-            [(is-a? label bitmap%)
-             (min-width (inexact->exact (ceiling (send label get-width))))
-             (min-height (inexact->exact (ceiling (send label get-height))))])))
-      
-      (define (question/answer line1 line2 icon-lst)
-        (display-two-line-choice 
-         icon-lst
-         (λ (panel1 panel2)
-           (line1 panel1)
-           (line2 panel2))))
-      
-      (define ((default-line2 lang-name lang) panel2)
-        (new canvas-message% (parent panel2) (label (string-constant start-with-before)))
-        (new canvas-message%
-             (parent panel2) 
-             (label lang-name)
-             (color (send the-color-database find-color "blue"))
-             (callback (λ () (change-current-lang-to lang)))
-             (font (get-font #:underlined #t)))
-        (new canvas-message% (parent panel2) (label (string-constant start-with-after))))
-      
-      ;; get-text-pls : path -> (listof (list* string string (listof string))
-      ;; gets the questions from an info.rkt file.
-      (define (get-text-pls info-dir)
-        (define (check-text-pls qs)
-          (unless (list? qs)
-            (error 'textbook-pls "expected a list, got ~e" qs))
-          (for-each 
-           (lambda (pr)
-             (unless (and (pair? pr)
-                          (pair? (cdr pr))
-                          (pair? (cddr pr))
-                          (list? (cdddr pr))
-                          (let ([icon-lst (car pr)])
-                            (and (list? icon-lst)
-                                 (not (null? icon-lst))
-                                 (andmap string? icon-lst)))
-                          (andmap string? (cdr pr)))
-               (error 
-                'textbook-pls
-                (string-append
-                 "expected a list of lists, with each inner list being at least three elements long"
-                 " and the first element of the inner list being a list of strings and the rest of"
-                 " the elements being strings, got ~e")
-                pr)))
-           qs)
-          qs)
-        (let ([proc (get-info/full info-dir)])
-          (if proc
-              (append
-               (check-text-pls (proc 'textbook-pls (λ () '())))
-               (check-text-pls
-                (indirect-info-field proc 'get-textbook-pls info-dir)))
-              '())))
-      
-      (define msgs '())
-      (define (fix-msg-sizes)
-        (let ([w (apply max (map (λ (x) (send x get-width)) msgs))])
-          (for-each (λ (b) (send b min-width w))
-                    msgs)))
-      
-      (define (display-two-line-choice icon-lst proc)
-        (let* ([hp (new horizontal-pane% 
-                        (parent qa-panel)
-                        (alignment '(center top))
-                        (stretchable-height #f))]
-               [msg (new message%
-                         (label (make-object bitmap%
-                                  (apply collection-file-path icon-lst)
-                                  'unknown/mask))
-                         (parent hp))]
-               [vp (new vertical-pane% 
-                        (parent hp)
-                        (alignment '(left top))
-                        (stretchable-height #f))])
-          (set! msgs (cons msg msgs))
-          (proc (new horizontal-pane% (parent vp))
-                (new horizontal-pane% (parent vp)))))
-      
-      ;; change-current-lang-to : (or/c (-> any/c boolean?) (listof string)) -> void
-      ;; closed the guidance dialog and opens the language dialog
-      (define (change-current-lang-to lang-strings/predicate)
-        (send dialog show #f)
-        (let* ([predicate (if (procedure? lang-strings/predicate)
-                              lang-strings/predicate
-                              (λ (x) (equal? lang-strings/predicate (send x get-language-position))))]
-               [lang (ormap (λ (x) (and (predicate x) x))
-                            (get-languages))])
-          (unless lang
-            (error 'change-current-lang-to "unknown language! ~s" lang-strings/predicate))
-          
-          (let ([new-lang
-                 (language-dialog #f
-                                  (language-settings lang
-                                                     (send lang default-settings))
-                                  drs-frame)])
-            (when new-lang
-              (set! language-chosen? #t)
-              (preferences:set settings-preferences-symbol new-lang)
-              (send (send drs-frame get-definitions-text) set-next-settings new-lang)))))
-      
-      (main))
-    
-    ;; find-parent-from-editor : editor -> (union frame #f)
-    (define (find-parent-from-editor ed)
-      (cond
-        [(send ed get-canvas)
-         =>
-         (λ (c) (send c get-top-level-window))]
-        [else
-         (let ([admin (send ed get-admin)])
-           (and (is-a? admin editor-snip-editor-admin<%>)
-                (find-parent-from-snip (send admin get-snip))))]))
-    
-    ;; find-parent-from-snip : snip -> (union frame #f)
-    (define (find-parent-from-snip snip)
-      (let* ([admin (send snip get-admin)]
-             [ed (send admin get-editor)])
-        (find-parent-from-editor ed))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/language-object-contract.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/language-object-contract.rkt
deleted file mode 100644
index 98878f154c..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/language-object-contract.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         scribble/srcdoc
-         racket/class
-         racket/gui/base
-         racket/contract
-         "recon.rkt")
-(require/doc racket/base scribble/manual)
-
-(require (for-meta 2 racket/base))
-
-(provide language-object-abstraction)
-
-(define-syntax (language-object-abstraction stx)
-  (syntax-case stx ()
-    [(_ id provide?)
-     (let-syntax ([save-srcloc
-                   (λ (s)
-                     (define-struct sloc (inside loc) #:prefab)
-                     (syntax-case s ()
-                       [(_ arg)
-                        (with-syntax ([ans
-                                       (let loop ([s #'arg])
-                                         (cond
-                                           [(syntax? s) 
-                                            (let ([loc (vector (syntax-source s)
-                                                               (syntax-line s)
-                                                               (syntax-column s)
-                                                               (syntax-position s)
-                                                               (syntax-span s))])
-                                              (make-sloc (loop (syntax-e s)) loc))]
-                                           [(pair? s) (cons (loop (car s)) (loop (cdr s)))]
-                                           [else s]))])
-                          #'ans)]))])
-       (let* ([ctc
-               (save-srcloc
-                (object-contract
-                 (config-panel (-> (is-a?/c area-container<%>)
-                                   (case-> (-> any/c void?)
-                                           (-> any/c))))
-                 (create-executable (-> any/c
-                                        (or/c (is-a?/c dialog%) (is-a?/c frame%))
-                                        path?
-                                        void?))
-                 (default-settings (-> any/c))
-                 (default-settings? (-> any/c boolean?))
-                 (front-end/complete-program (-> input-port?
-                                                 any/c
-                                                 (-> any/c)))
-                 (front-end/interaction (-> input-port?
-                                            any/c
-                                            (-> any/c)))
-                 (get-language-name (-> string?))
-                 (get-language-numbers (-> (cons/c number? (listof number?))))
-                 (get-language-position (-> (cons/c string? (listof string?))))
-                 (get-language-url (-> (or/c false/c string?)))
-                 (get-one-line-summary (-> (or/c #f string?)))
-                 (get-comment-character (-> (values string? char?)))
-                 (get-style-delta 
-                  (-> (or/c false/c
-                            (is-a?/c style-delta%)
-                            (listof 
-                             (list/c (is-a?/c style-delta%)
-                                     number?
-                                     number?)))))
-                 (marshall-settings (-> any/c printable/c))
-                 (on-execute (-> any/c (-> (-> any) any) any))
-                 (render-value (-> any/c 
-                                   any/c
-                                   output-port?
-                                   void?))
-                 (render-value/format (-> any/c 
-                                          any/c
-                                          output-port?
-                                          (or/c number? (symbols 'infinity))
-                                          any))
-                 (unmarshall-settings (-> printable/c any))
-                 
-                 (capability-value 
-                  (->i ([s (and/c symbol? 
-                                  drracket:language:capability-registered?)])
-                       [res (s) (drracket:language:get-capability-contract s)]))))])
-           #`(begin
-               (define id (reconstitute #,ctc provide?))
-               #,@(if (syntax-e #'provide?)
-                      (list 
-                       #`(require/doc drracket/private/recon)
-                       #`(provide/doc
-                          (thing-doc id
-                                     contract?
-                                     ((reconstitute (racketblock #,ctc) provide?)))))
-                      '()))))]))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/language.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/language.rkt
deleted file mode 100644
index 9aa117d8b2..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/language.rkt
+++ /dev/null
@@ -1,1432 +0,0 @@
-#lang racket/unit
-
-(require drracket/private/drsig
-         string-constants
-         
-         ;; NOTE: this module instantiates stacktrace itself, so we have
-         ;; to be careful to not mix that instantiation with the one
-         ;; drracket/private/debug.rkt does. errortrace-lib's is for the
-         ;; compilation handling, DrRacket's is for profiling and test coverage
-         ;; (which do not do compilation)
-         (prefix-in el: errortrace/errortrace-lib) 
-         
-         (prefix-in image-core: mrlib/image-core)
-         
-         mzlib/pconvert
-         racket/pretty
-         mzlib/struct
-         racket/class
-         racket/file
-         racket/list
-         compiler/embed
-         launcher
-         mred
-         framework
-         mrlib/syntax-browser
-         compiler/distribute
-         compiler/bundle-dist
-         (prefix-in file: file/convertible)
-         "rep.rkt"
-         "local-member-names.rkt"
-         (prefix-in pict-snip: "pict-snip.rkt"))
-  
-  (import [prefix drracket:debug: drracket:debug^]
-          [prefix drracket:tools: drracket:tools^]
-          [prefix drracket:rep: drracket:rep^]
-          [prefix drracket:init: drracket:init^]
-          [prefix drracket:help-desk: drracket:help-desk^])
-  (export drracket:language/int^)
-  
-  (define original-output-port (current-output-port))
-  (define (oprintf . args) (apply fprintf original-output-port args)) 
-
-(define text/pos-text drracket:language:text/pos-text)
-(define text/pos-start drracket:language:text/pos-start)
-(define text/pos-end drracket:language:text/pos-end)
-(define make-text/pos make-drracket:language:text/pos)
-(define text/pos? drracket:language:text/pos?)
-(define struct:text/pos struct:drracket:language:text/pos)
-(define text/pos make-text/pos)
-
-  (define language<%>
-    (interface ()
-      marshall-settings
-      unmarshall-settings
-      default-settings
-      default-settings?
-      
-      front-end/complete-program
-      front-end/finished-complete-program
-      front-end/interaction
-      config-panel
-      on-execute
-      extra-repl-information
-      
-      first-opened
-      render-value/format
-      render-value
-      
-      capability-value
-      
-      create-executable
-      
-      get-reader-module
-      get-metadata
-      metadata->settings
-      get-metadata-lines
-      
-      get-language-position
-      get-language-name
-      get-style-delta
-      get-language-numbers
-      get-one-line-summary
-      get-language-url
-      get-comment-character))
-  
-  (define module-based-language<%>
-    (interface ()
-      marshall-settings
-      unmarshall-settings
-      default-settings
-      default-settings?
-      
-      get-module
-      get-transformer-module
-      use-namespace-require/copy?
-      use-namespace-require/copy-from-setting?
-      config-panel
-      
-      get-reader
-      
-      on-execute
-      get-init-code
-      use-mred-launcher
-      
-      render-value/format
-      render-value
-      
-      get-language-position 
-      get-language-numbers
-      get-one-line-summary
-      get-language-url))
-  
-  (define simple-module-based-language<%>
-    (interface ()
-      get-module
-      get-language-position
-      get-language-numbers
-      get-one-line-summary
-      get-language-url
-      get-reader))
-  
-  
-  (define simple-module-based-language%
-    (class* object% (simple-module-based-language<%>)
-      (init-field module
-                  language-position
-                  (language-numbers (map (λ (x) 0) language-position))
-                  (one-line-summary #f)
-                  (language-url #f)
-                  (documentation-reference #f)
-                  (reader (λ (src port)
-                            (let ([v (parameterize ([read-accept-reader #t])
-                                        (with-stack-checkpoint
-                                         (read-syntax src port)))])
-                              (if (eof-object? v)
-                                  v
-                                  (namespace-syntax-introduce v)))))
-                  (language-id (if (pair? language-position)
-                                   (car (last-pair language-position))
-                                   (error 'simple-module-based-language<%>
-                                          "expected non-empty list of strings, got ~e" language-position))))
-      (define/public (get-module) module)
-      (define/public (get-language-position) language-position)
-      (define/public (get-language-numbers) language-numbers)
-      (define/public (get-one-line-summary) one-line-summary)
-      (define/public (get-language-url) language-url)
-      (define/public (get-reader) reader)
-      (super-new)))
-  
-  
-  
-  ;; simple-module-based-language->module-based-language : module-based-language<%>
-  ;; transforms a simple-module-based-language into a module-based-language<%>
-  (define simple-module-based-language->module-based-language-mixin
-    (mixin (simple-module-based-language<%>) (module-based-language<%>)
-      (define/public (get-transformer-module) 'mzscheme)
-      (define/public (use-namespace-require/copy?) #f)
-      (define/public (use-namespace-require/copy-from-setting? setting)
-        (use-namespace-require/copy?))
-      (define/public (use-mred-launcher) #t)
-      
-      (inherit get-module)
-      (define/public (marshall-settings settings)
-        (simple-settings->vector settings))
-      (define/public (unmarshall-settings printable)
-        (and (vector? printable)
-             (= (vector-length printable)
-                (procedure-arity make-simple-settings))
-             (boolean? (vector-ref printable 0))
-             (memq (vector-ref printable 1) '(constructor quasiquote write trad-write print))
-             (memq (vector-ref printable 2) 
-                   '(mixed-fraction 
-                     mixed-fraction-e
-                     repeating-decimal 
-                     repeating-decimal-e))
-             (boolean? (vector-ref printable 3))
-             (boolean? (vector-ref printable 4))
-             (memq (vector-ref printable 5) '(none debug debug/profile test-coverage))
-             (apply make-simple-settings (vector->list printable))))
-      (define/public (default-settings) 
-        (make-simple-settings #t 'print 'mixed-fraction-e #f #t 'debug))
-      (define/public (default-settings? x)
-        (equal? (simple-settings->vector x)
-                (simple-settings->vector (default-settings))))
-      (define/public (config-panel parent)
-        (simple-module-based-language-config-panel parent))
-      
-      (define/public (on-execute setting run-in-user-thread)
-        (initialize-simple-module-based-language setting run-in-user-thread))
-      (define/public (get-init-code setting)
-        (simple-module-based-language-get-init-code setting))
-      
-      (define/public (render-value/format value settings port width)
-        (simple-module-based-language-render-value/format value settings port width))
-      (define/public (render-value value settings port)
-        (simple-module-based-language-render-value/format value settings port 'infinity))
-      (super-new)))
-  
-(define simple-settings-case-sensitive drracket:language:simple-settings-case-sensitive)
-(define simple-settings-fraction-style drracket:language:simple-settings-fraction-style)
-(define simple-settings-show-sharing drracket:language:simple-settings-show-sharing)
-(define simple-settings-insert-newlines drracket:language:simple-settings-insert-newlines)
-(define simple-settings-annotations drracket:language:simple-settings-annotations)
-(define simple-settings-printing-style drracket:language:simple-settings-printing-style)
-(define struct:simple-settings struct:drracket:language:simple-settings)
-(define simple-settings? drracket:language:simple-settings?)
-(define make-simple-settings make-drracket:language:simple-settings)
-(define simple-settings make-simple-settings)
-
-  (define simple-settings->vector (make-->vector drracket:language:simple-settings))
-  
-  ;; simple-module-based-language-config-panel :
-  ;;   parent [#:case-sensitive (union #f #t '?)]
-  ;;     -> (case-> (-> settings) (settings -> void))
-  (define (simple-module-based-language-config-panel
-           _parent
-           #:case-sensitive [*case-sensitive '?]
-           #:dynamic-panel-extras [dynamic-panel-extras void]
-           #:get-debugging-radio-box [get-debugging-radio-box void]
-           #:debugging-radio-box-callback [debugging-radio-box-callback void]
-           #:include-print-mode? [include-print-mode? #t])
-    (letrec ([parent (instantiate vertical-panel% ()
-                       (parent _parent)
-                       (alignment '(center center)))]
-             
-             [input-panel (and (eq? *case-sensitive '?)
-                               (instantiate group-box-panel% ()
-                                 (label (string-constant input-syntax))
-                                 (parent parent)
-                                 (alignment '(left center))))]
-             
-             [dynamic-panel (instantiate group-box-panel% ()
-                              (label (string-constant dynamic-properties))
-                              (parent parent)
-                              (alignment '(left center)))]
-             
-             [output-panel (instantiate group-box-panel% ()
-                             (label (string-constant output-syntax))
-                             (parent parent)
-                             (alignment '(left center)))]
-             
-             [case-sensitive (and input-panel
-                                  (make-object check-box%
-                                    (string-constant case-sensitive-label)
-                                    input-panel
-                                    void))]
-             [debugging-panel (new horizontal-panel%
-                                   [parent dynamic-panel]
-                                   [stretchable-height #f]
-                                   [alignment '(left center)])]
-             [debugging-left (new radio-box%
-                                  (label #f)
-                                  (choices 
-                                   (list (string-constant no-debugging-or-profiling)
-                                         (string-constant debugging)))
-                                  (parent debugging-panel)
-                                  (callback
-                                   (λ (a b)
-                                     (send debugging-right set-selection #f)
-                                     (debugging-radio-box-callback a b))))]
-             [debugging-right (new radio-box%
-                                   (label #f)
-                                   (choices 
-                                    (list (string-constant debugging-and-profiling)
-                                          (string-constant test-coverage)))
-                                   (parent debugging-panel)
-                                   (callback
-                                    (λ (a b)
-                                      (send debugging-left set-selection #f)
-                                      (debugging-radio-box-callback a b))))]
-             [output-style (make-object radio-box%
-                             (string-constant output-style-label)
-                             (flatten
-                              (list (string-constant constructor-printing-style)
-                                    (string-constant quasiquote-printing-style)
-                                    (string-constant write-printing-style)
-                                    (if include-print-mode?
-                                        (string-constant print-printing-style)
-                                        '())))
-                             output-panel
-                             (λ (rb evt) (enable-fraction-style))
-                             '(horizontal vertical-label))]
-             [enable-fraction-style 
-              (lambda ()
-                (let ([on? (member (send output-style get-selection) '(0 1))])
-                  (send fraction-style enable on?)))]
-             [show-sharing (make-object check-box%
-                             (string-constant sharing-printing-label)
-                             output-panel
-                             void)]
-             [insert-newlines (make-object check-box%
-                                (string-constant use-pretty-printer-label)
-                                output-panel
-                                void)]
-             [fraction-style
-              (make-object check-box% (string-constant decimal-notation-for-rationals)
-                output-panel
-                void)])
-      (get-debugging-radio-box debugging-left debugging-right)
-      (dynamic-panel-extras dynamic-panel)
-      
-      (case-lambda
-        [()
-         (make-simple-settings
-          (if case-sensitive
-            (send case-sensitive get-value)
-            (and *case-sensitive #t))
-          (case (send output-style get-selection)
-            [(0) 'constructor]
-            [(1) 'quasiquote]
-            [(2) 'trad-write]
-            [(3) (if include-print-mode? 'print 'trad-write)])
-          (if (send fraction-style get-value)
-              'repeating-decimal-e
-              'mixed-fraction-e)
-          (send show-sharing get-value)
-          (send insert-newlines get-value)
-          (case (send debugging-left get-selection)
-            [(0) 'none]
-            [(1) 'debug]
-            [(#f)
-             (case (send debugging-right get-selection)
-               [(0) 'debug/profile]
-               [(1) 'test-coverage])]))]
-        [(settings)
-         (when case-sensitive
-           (send case-sensitive set-value
-                 (simple-settings-case-sensitive settings)))
-         (send output-style set-selection
-               (case (simple-settings-printing-style settings)
-                 [(constructor) 0]
-                 [(quasiquote) 1]
-                 [(write trad-write) 2]
-                 [(print) (if include-print-mode? 3 2)]))
-         (enable-fraction-style)
-         (send fraction-style set-value (eq? (simple-settings-fraction-style settings)
-                                             'repeating-decimal-e))
-         (send show-sharing set-value (simple-settings-show-sharing settings))
-         (send insert-newlines set-value (simple-settings-insert-newlines settings))
-         (case (simple-settings-annotations settings)
-           [(none) (send debugging-right set-selection #f) (send debugging-left set-selection 0)]
-           [(debug) (send debugging-right set-selection #f) (send debugging-left set-selection 1)]
-           [(debug/profile) (send debugging-left set-selection #f) (send debugging-right set-selection 0)]
-           [(test-coverage) (send debugging-left set-selection #f) (send debugging-right set-selection 1)])])))
-  
-  ;; simple-module-based-language-render-value/format : TST settings port (union #f (snip% -> void)) (union 'infinity number) -> void
-  (define (simple-module-based-language-render-value/format value settings port width)
-    (let-values ([(converted-value write?)
-                  (call-with-values
-                      (lambda ()
-                        (simple-module-based-language-convert-value value settings))
-                    (case-lambda
-                     [(converted-value) (values converted-value #t)]
-                     [(converted-value write?) (values converted-value write?)]))])
-      (let ([pretty-out (if write? pretty-write pretty-print)])
-        (setup-printing-parameters 
-         (λ ()
-            (cond
-             [(simple-settings-insert-newlines settings)
-              (if (number? width)
-                  (parameterize ([pretty-print-columns width])
-                    (pretty-out converted-value port))
-                  (pretty-out converted-value port))]
-             [else
-              (parameterize ([pretty-print-columns 'infinity])
-                (pretty-out converted-value port))
-              (newline port)]))
-         settings
-         width))))
-  
-  (define default-pretty-print-current-style-table (pretty-print-current-style-table))
-  
-  
-  (define (setup-printing-parameters thunk settings width) ((make-setup-printing-parameters) thunk settings width))
-  
-  ;; make-setup-printing-parameters : -> (-> (-> void) simple-settings number void)
-  (define (make-setup-printing-parameters)
-    (define-syntax-rule 
-      (dyn name)
-      (define name (if gave-up?
-                       (string->symbol (format "~a-gave-up" 'name))
-                       (dynamic-require 'pict 'name))))
-    (define gave-up? #f)
-    (define pict:convertible?
-      (with-handlers ((exn:fail? (λ (exn)
-                                   (set! gave-up? #t)
-                                   (log-error (exn-message exn))
-                                   (λ (val) #f))))
-        (dynamic-require 'pict/convert 'pict-convertible?)))
-    (define pict-convert (if gave-up?
-                             'pict-convert-gave-up
-                             (dynamic-require 'pict/convert 'pict-convert)))
-    (dyn pict-width)
-    (dyn pict-height)
-    (dyn pict-ascent)
-    (dyn pict-descent)
-    (dyn draw-pict)
-      
-    (define (mk-pict-snip convertible)
-      (define pict (pict-convert convertible))
-      (define w (pict-width pict))
-      (define h (pict-height pict))
-      (define a (pict-ascent pict))
-      (define d (pict-descent pict))
-      (define rdc (new record-dc%))
-      (send rdc set-smoothing 'aligned)
-      (send rdc set-clipping-rect 0 0 w h)
-      (draw-pict pict rdc 0 0)
-      (define recorded-datum (send rdc get-recorded-datum))
-      (new pict-snip:pict-snip% [w w] [h h] [d d] [a a] [recorded-datum recorded-datum]))
-    (λ (thunk settings width)
-      
-      (let ([use-number-snip?
-             (λ (x)
-               (and (number? x)
-                    (exact? x)
-                    (real? x)
-                    (not (integer? x))))])
-        (define convert-table (make-hasheq))
-        (parameterize ([pretty-print-pre-print-hook (λ (val port) (void))]
-                       [pretty-print-post-print-hook (λ (val port) (void))]
-                       [pretty-print-exact-as-decimal #f]
-                       [pretty-print-depth #f]
-                       [pretty-print-.-symbol-without-bars #f]
-                       [pretty-print-show-inexactness #f]
-                       [pretty-print-abbreviate-read-macros #t]
-                       [pretty-print-current-style-table default-pretty-print-current-style-table]
-                       [pretty-print-remap-stylable (λ (x) #f)]
-                       [pretty-print-print-line
-                        (lambda (line port offset width)
-                          (when (and (number? width)
-                                     (not (eq? 0 line)))
-                            (newline port))
-                          0)]
-                       
-                       [pretty-print-columns width]
-                       [pretty-print-size-hook
-                        (let ([oh (pretty-print-size-hook)])
-                          (λ (value display? port)
-                            (cond
-                              [(not (port-writes-special? port)) (oh value display? port)]
-                              [(is-a? value snip%) 1]
-                              [(pict:convertible? value) 1]
-                              [(use-number-snip? value) 1]
-                              [(syntax? value) 1]
-                              [(to-snip-value? value) 1]
-                              [(hash-ref convert-table value #f) 
-                               ;; this handler can be called multiple times per value
-                               ;; avoid building the png bytes more than once
-                               1]
-                              [(and (file:convertible? value)
-                                    (file:convert value 'png@2x-bytes #f))
-                               =>
-                               (λ (converted)
-                                 (hash-set! convert-table value (list 2 converted))
-                                 1)]
-                              [(and (file:convertible? value)
-                                    (file:convert value 'png-bytes #f))
-                               =>
-                               (λ (converted)
-                                 (hash-set! convert-table value (list 1 converted))
-                                 1)]
-                              [else (oh value display? port)])))]
-                       [pretty-print-print-hook
-                        (let ([oh (pretty-print-print-hook)])
-                          (λ (value display? port)
-                            (cond
-                              [(not (port-writes-special? port)) (oh value display? port)]
-                              [(is-a? value snip%)
-                               (cond
-                                 [(image-core:image? value)
-                                  
-                                  ;; do this computation here so that any failures
-                                  ;; during drawing happen under the user's custodian
-                                  (image-core:compute-image-cache value) 
-                                  (write-special (send value copy) port)
-                                  1]
-                                 [else
-                                  (write-special (send value copy) port)
-                                  1])]
-                              [(pict:convertible? value)
-                               (write-special (mk-pict-snip value))]
-                              [(use-number-snip? value)
-                               (write-special
-                                (case (simple-settings-fraction-style settings)
-                                  [(mixed-fraction) 
-                                   (number-snip:make-fraction-snip value #f)]
-                                  [(mixed-fraction-e)
-                                   (number-snip:make-fraction-snip value #t)]
-                                  [(repeating-decimal)
-                                   (number-snip:make-repeating-decimal-snip value #f)]
-                                  [(repeating-decimal-e)
-                                   (number-snip:make-repeating-decimal-snip value #t)])
-                                port)
-                               1]
-                              [(syntax? value)
-                               (write-special (render-syntax/snip value) port)]
-                              [(to-snip-value? value)
-                               (write-special (value->snip value) port)]
-                              [(hash-ref convert-table value #f)
-                               =>
-                               (λ (backing-scale+bytes)
-                                 (write-special
-                                  (make-object image-snip%
-                                    (read-bitmap (open-input-bytes (cadr backing-scale+bytes))
-                                                 #:backing-scale (car backing-scale+bytes)))
-                                  port))]
-                              [else (oh value display? port)])))]
-                       [print-graph
-                        ;; only turn on print-graph when using `write' or `print' printing 
-                        ;; style, because the sharing is being taken care of
-                        ;; by the print-convert sexp construction when using
-                        ;; other printing styles.
-                        (and (memq (simple-settings-printing-style settings)
-                                   '(trad-write write print))
-                             (simple-settings-show-sharing settings))])
-          (thunk)))))
-      
-  ;; drscheme-inspector : inspector
-  (define drscheme-inspector (current-inspector))
-  
-  ;; simple-module-based-language-convert-value : TST settings -> TST
-  (define (simple-module-based-language-convert-value value settings)
-    (case (simple-settings-printing-style settings)
-      [(print) (values value #f)]
-      [(write trad-write) value]
-      [(constructor)
-       (parameterize ([constructor-style-printing #t]
-                      [show-sharing (simple-settings-show-sharing settings)]
-                      [current-print-convert-hook (leave-snips-alone-hook (current-print-convert-hook))])
-         (print-convert value))]
-      [(quasiquote)
-       (parameterize ([constructor-style-printing #f]
-                      [show-sharing (simple-settings-show-sharing settings)]
-                      [current-print-convert-hook (leave-snips-alone-hook (current-print-convert-hook))])
-         (print-convert value))]))
-  
-  ;; leave-snips-alone-hook : any? (any? -> printable) any? -> printable
-  (define ((leave-snips-alone-hook sh) expr basic-convert sub-convert)
-    (if (or (is-a? expr snip%)
-            (is-a? expr bitmap%)
-            (to-snip-value? expr))
-        expr
-        (sh expr basic-convert sub-convert)))
-  
-  ;; initialize-simple-module-based-language : setting ((-> void) -> void)
-  (define (initialize-simple-module-based-language setting run-in-user-thread)
-    (run-in-user-thread
-     (λ ()
-       
-       (let ([annotations (simple-settings-annotations setting)])
-         (case annotations
-           [(debug)
-            (current-compile (el:make-errortrace-compile-handler))
-            (error-display-handler 
-             (drracket:debug:make-debug-error-display-handler
-              (error-display-handler)))
-            (use-compiled-file-paths
-             (cons (build-path "compiled" "errortrace")
-                   (use-compiled-file-paths)))]
-           
-           [(debug/profile)
-            (drracket:debug:profiling-enabled #t)
-            (error-display-handler 
-             (drracket:debug:make-debug-error-display-handler
-              (error-display-handler)))
-            (current-eval (drracket:debug:make-debug-eval-handler (current-eval)))]
-           
-           [(test-coverage)
-            (drracket:debug:test-coverage-enabled #t)
-            (error-display-handler 
-             (drracket:debug:make-debug-error-display-handler
-              (error-display-handler)))
-            (current-eval (drracket:debug:make-debug-eval-handler (current-eval)))]))
-       
-       (define my-setup-printing-parameters (make-setup-printing-parameters))
-       (global-port-print-handler
-        (λ (value port [depth 0])
-          (let-values ([(converted-value write?)
-                        (call-with-values 
-                            (lambda () (simple-module-based-language-convert-value value setting))
-                          (case-lambda
-                           [(converted-value) (values converted-value #t)]
-                           [(converted-value write?) (values converted-value write?)]))])
-            (my-setup-printing-parameters 
-             (λ ()
-               (parameterize ([pretty-print-columns 'infinity])
-                 (if write?
-                     (pretty-write converted-value port)
-                     (pretty-print converted-value port depth))))
-             setting
-             'infinity))))
-       (current-inspector (make-inspector))
-       (read-case-sensitive (simple-settings-case-sensitive setting)))))
-  
-  ;; simple-module-based-language-get-init-code : setting -> sexp[module]
-  (define (simple-module-based-language-get-init-code setting)
-    `(module mod-name mzscheme
-       (require mzlib/pconvert
-                mzlib/pretty)
-       
-       (provide init-code)
-       
-       (define (executable-error-value->string-handler val size)
-         (let ([o (open-output-string)])
-           (render-value val o)
-           (let ([s (get-output-string o)])
-             (if ((string-length s) . <= . size)
-                 s
-                 (string-append
-                  (substring s 0 (- size 3))
-                  "...")))))
-       
-       (define (render-value value port)
-         (parameterize ([pretty-print-columns 'infinity])
-           ,(case (simple-settings-printing-style setting)
-              [(print) `(pretty-print value port)]
-              [(write trad-write) `(pretty-write value port)]
-              [(constructor)
-               `(parameterize ([constructor-style-printing #t]
-                               [show-sharing ,(simple-settings-show-sharing setting)])
-                  (pretty-write (print-convert value) port))]
-              [(quasiquote)
-               `(parameterize ([constructor-style-printing #f]
-                               [show-sharing ,(simple-settings-show-sharing setting)])
-                  (pretty-write (print-convert value) port))])))
-         
-       ,(if (memq (simple-settings-annotations setting) '(debug debug/profile test-coverage))
-            `(require errortrace)
-            `(void))
-       
-       (define (init-code)
-         (current-inspector (make-inspector))
-         (error-value->string-handler executable-error-value->string-handler)
-         (read-case-sensitive ,(simple-settings-case-sensitive setting)))))
-  
-  
-  ;; module-based-language->language : module-based-language -> language<%>
-  ;; given a module-based-language, implements a language
-  (define module-based-language->language-mixin
-    (mixin (module-based-language<%>) (language<%>)
-      (inherit get-module get-transformer-module use-namespace-require/copy-from-setting?
-               get-init-code use-mred-launcher get-reader)
-      
-      (define/public (front-end/finished-complete-program settings) (void))
-      (define/public (module-based-language->language-mixin settings) (void))
-      
-      (define/pubment (capability-value s) 
-        (inner (get-capability-default s) capability-value s))
-      
-      (define/public (first-opened) (void))
-      (define/public (get-comment-character) (values ";  " #\;))
-      
-      (inherit get-language-position)
-      (define/public (get-language-name)
-        (let ([pos (get-language-position)])
-          (if (null? pos)
-              "<<unknown>>"
-              (car (last-pair pos)))))
-      (define/public (get-style-delta) #f)
-      (define/override (on-execute setting run-in-user-thread)
-        (super on-execute setting run-in-user-thread)
-        (initialize-module-based-language (use-namespace-require/copy-from-setting? setting)
-                                          (get-module)
-                                          (get-transformer-module)
-                                          run-in-user-thread))
-      (define/public (front-end/complete-program port settings)
-        (module-based-language-front-end port (get-reader)))
-      (define/public (front-end/interaction port settings)
-        (module-based-language-front-end port (get-reader)))
-      (define/public (create-executable setting parent program-filename) (void))
-      (define/public (extra-repl-information _1 _2) (void))
-      (define/public (get-reader-module) #f)
-      (define/public (get-metadata a b) #f)
-      (define/public (metadata->settings m) #f)
-      (define/public (get-metadata-lines) #f)
-      
-      (super-new)))
-  
-  ;; create-module-based-language-executable :  
-  ;; (is-a?/c area-container<%>) string (or #f module-spec) module-spec sexp (union boolean? 'ask) boolean?
-  ;;  -> void
-  (define (create-module-based-language-executable parent
-                                                   program-filename
-                                                   module-language-spec
-                                                   transformer-module-language-spec
-                                                   init-code
-                                                   mred-launcher
-                                                   use-copy?)
-    (let ([executable-specs (create-executable-gui parent
-                                                   program-filename
-                                                   #t 
-                                                   (if (boolean? mred-launcher)
-                                                       (if mred-launcher
-                                                           'mred
-                                                           'mzscheme)
-                                                       #t))])
-      (when executable-specs
-        (let* ([type (car executable-specs)]
-               [base (cadr executable-specs)]
-               [executable-filename (caddr executable-specs)]
-               [aux (cadddr executable-specs)]
-               [create-executable
-                (case type
-                  [(launcher) create-module-based-launcher]
-                  [(stand-alone) create-module-based-stand-alone-executable]
-                  [(distribution) create-module-based-distribution])])
-          (with-handlers ((exn:fail? (λ (msg)
-                                       (define sp (open-output-string))
-                                       (parameterize ([current-error-port sp])
-                                         (drracket:init:original-error-display-handler
-                                          (exn-message exn)
-                                          exn))
-                                       (message-box 
-                                        (string-constant drscheme)
-                                        (string-append
-                                         (string-constant error-creating-executable)
-                                         "\n\n"
-                                         (get-output-string sp))))))
-            (create-executable
-             program-filename
-             executable-filename
-             module-language-spec
-             transformer-module-language-spec
-             init-code
-             (if (boolean? mred-launcher)
-                 mred-launcher
-                 (eq? base 'mred))
-             use-copy?))))))
-  
-  
-  ;; create-executable-gui : (union #f (is-a?/c top-level-area-container<%>))
-  ;;                         (union #f string?)
-  ;;                         (union #t 'launcher 'stand-alone 'distribution)
-  ;;                         (union #t 'mzscheme 'mred)
-  ;;                      -> (union #f (list (union 'no-show 'launcher 'stand-alone 'distribution)
-  ;;                                         (union 'no-show 'mzscheme 'mred)
-  ;;                                         string[filename]
-  ;;                                         (listof (cons/c symbol? any/c))))
-  (define (create-executable-gui parent program-filename show-type show-base)
-    (define dlg (make-object dialog% (string-constant create-executable-title) parent))
-    (define filename-panel (make-object horizontal-panel% dlg))
-    (define filename-text-field (new text-field% 
-                                     [label (string-constant filename)]
-                                     [parent filename-panel]
-                                     [init-value (path->string 
-                                                  (default-executable-filename 
-                                                    program-filename 
-                                                    (if (eq? show-type #t) 'launcher show-type)
-                                                    #f))]
-                                     [min-width 400]
-                                     [callback void]))
-    (define filename-browse-button (instantiate button% ()
-                                     (label (string-constant browse...))
-                                     (parent filename-panel)
-                                     (callback
-                                      (λ (x y) (browse-callback)))))
-    (define type/base-panel (instantiate vertical-panel% ()
-                              (parent dlg)
-                              (stretchable-width #f)))
-    (define type-panel (make-object horizontal-panel% type/base-panel))
-    (define type-rb (and (boolean? show-type)
-                         (instantiate radio-box% ()
-                           (label (string-constant executable-type))
-                           (choices (list (string-constant launcher-explanatory-label)
-                                          (string-constant stand-alone-explanatory-label)
-                                          (string-constant distribution-explanatory-label)))
-                           (parent type-panel)
-                           (callback (lambda (rb e) 
-                                       (preferences:set 'drracket:create-executable-gui-type
-                                                        (case (send rb get-selection)
-                                                          [(0) 'launcher]
-                                                          [(1) 'stand-alone]
-                                                          [(2) 'distribution]))
-                                       (reset-filename-suffix))))))
-    (define base-panel (make-object horizontal-panel% type/base-panel))
-    (define base-rb (and (boolean? show-base)
-                         (instantiate radio-box% ()
-                           (label (string-constant executable-base))
-                           (choices (list "Racket" "GRacket"))
-                           (parent base-panel)
-                           (callback (lambda (rb e)
-                                       (preferences:set 'drracket:create-executable-gui-base
-                                                        (case (send rb get-selection)
-                                                          [(0) 'racket]
-                                                          [(1) 'gracket]))
-                                       (reset-filename-suffix))))))
-    
-    (define aux-panel (new group-box-panel%
-                           [label ""]
-                           [parent type/base-panel]))
-    (define aux-paths (new (class list-box%
-                             (inherit append)
-                             (super-new)
-                             (define/override (on-drop-file p)
-                               (add-aux p)))
-                           [parent aux-panel]
-                           [label (string-constant files-for-icons-etc)]
-                           [choices '()]
-                           [style '(vertical-label multiple)]
-                           [min-height 80]
-                           [callback (lambda (p e) (enable-minus))]))
-    (send aux-paths accept-drop-files #t)
-    (define aux-button-panel (new horizontal-pane%
-                                  [parent aux-panel]
-                                  [alignment '(center center)]
-                                  [stretchable-height #f]))
-    (new button%
-         [parent aux-button-panel]
-         [label "+"]
-         [callback (lambda (b e)
-                     (define p (get-file-list #f dlg))
-                     (when p
-                       (for-each add-aux p)))])
-    (define (add-aux p)
-      (define v (extract-aux-from-path p))
-      (send aux-paths append 
-            (format "~a: ~a"
-                    (if (null? v)
-                        "???"
-                        (caar v))
-                    p)
-            p))
-    (define minus-button
-      (new button%
-           [parent aux-button-panel]
-           [label "-"]
-           [callback (lambda (b e)
-                       (for ([i (in-list (sort (send aux-paths get-selections) >))])
-                         (send aux-paths delete i))
-                       (enable-minus))]))
-    (define (enable-minus)
-      (send minus-button enable (pair? (send aux-paths get-selections))))
-    (enable-minus)
-    
-    (define (reset-filename-suffix)
-      (let ([s (send filename-text-field get-value)])
-        (unless (string=? s "")
-          (let ([new-s (default-executable-filename 
-                         (string->path s)
-                         (current-mode)
-                         (not (currently-mzscheme-binary?)))])
-            (send filename-text-field set-value (path->string new-s))))))
-    
-    (define button-panel (instantiate horizontal-panel% ()
-                           (parent dlg)
-                           (alignment '(right center))))
-    
-    (define-values (ok-button cancel-button)
-      (gui-utils:ok/cancel-buttons
-       button-panel
-       (λ (x y)
-         (when (check-filename)
-           (set! cancelled? #f)
-           (send dlg show #f)))
-       (λ (x y) (send dlg show #f))
-       (string-constant create)
-       (string-constant cancel)))
-    
-    (define (browse-callback)
-      (let ([ftf (send filename-text-field get-value)])
-        (let-values ([(base name _) 
-                      (if (path-string? ftf)
-                          (split-path ftf)
-                          (values (current-directory) "" #f))])
-          (let* ([mzscheme? (currently-mzscheme-binary?)]
-                 [mode (current-mode)]
-                 [filename 
-                  (put-executable/defaults
-                   dlg
-                   base
-                   name
-                   mode
-                   (not mzscheme?)
-                   (case mode
-                     [(launcher)
-                      (if mzscheme?
-                          (string-constant save-a-mzscheme-launcher)
-                          (string-constant save-a-mred-launcher))]
-                     [(stand-alone)
-                      (if mzscheme?
-                          (string-constant save-a-mzscheme-stand-alone-executable)
-                          (string-constant save-a-mred-stand-alone-executable))]
-                     [(distribution)
-                      (if mzscheme?
-                          (string-constant save-a-mzscheme-distribution)
-                          (string-constant save-a-mred-distribution))]))])
-            (when filename
-              (send filename-text-field set-value (path->string filename)))))))
-    
-    (define (currently-mzscheme-binary?)
-      (cond
-        [base-rb
-         (= 0 (send base-rb get-selection))]
-        [else (eq? show-base 'mzscheme)]))
-    
-    (define (current-mode)
-      (cond
-        [type-rb
-         (let ([s (send type-rb get-item-label (send type-rb get-selection))])
-           (cond
-             [(equal? s (string-constant launcher-explanatory-label)) 'launcher]
-             [(equal? s (string-constant stand-alone-explanatory-label)) 'stand-alone]
-             [(equal? s (string-constant distribution-explanatory-label)) 'distribution]))]
-        [else show-type]))
-    
-    (define (check-filename)
-      (let ([filename-str (send filename-text-field get-value)]
-            [mred? (not (currently-mzscheme-binary?))]
-            [mode (current-mode)])
-        (let-values ([(extension style filters)
-                      (mode->put-file-extension+style+filters mode mred?)])
-          (cond
-            [(string=? "" filename-str)
-             (message-box (string-constant drscheme)
-                          (string-constant please-specify-a-filename)
-                          dlg
-                          #:dialog-mixin frame:focus-table-mixin)
-             #f]
-            [(not (users-name-ok? mode extension dlg (string->path filename-str)))
-             #f]
-            [(or (directory-exists? filename-str)
-                 (file-exists? filename-str))
-             (ask-user-can-clobber? filename-str)]
-            [else #t]))))
-    
-    ;; ask-user-can-clobber-directory? : (is-a?/c top-level-window<%>) string -> boolean
-    (define (ask-user-can-clobber? filename)
-      (eq? (message-box (string-constant drscheme)
-                        (format (string-constant are-you-sure-replace?) filename)
-                        dlg
-                        '(yes-no)
-                        #:dialog-mixin frame:focus-table-mixin)
-           'yes))
-    
-    (define cancelled? #t)
-    (when type-rb
-      (send type-rb set-selection
-            (case (preferences:get 'drracket:create-executable-gui-type)
-              [(launcher) 0]
-              [(stand-alone) 1]
-              [(distribution) 2])))
-    (when base-rb
-      (send base-rb set-selection
-            (case (preferences:get 'drracket:create-executable-gui-base)
-              [(racket) 0]
-              [(gracket) 1])))
-    (reset-filename-suffix)
-    (send dlg show #t)
-    (cond
-      [cancelled? #f]
-      [else
-       (list
-        (if type-rb
-            (current-mode)
-            'no-show)
-        (if base-rb
-            (case (send base-rb get-selection)
-              [(0) 'mzscheme]
-              [(1) 'mred])
-            'no-show)
-        (send filename-text-field get-value)
-        (apply append
-               (for/list ([i (in-range (send aux-paths get-number))])
-                 (extract-aux-from-path (send aux-paths get-data i)))))]))
-  
-  (define (normalize-mode mode)
-    (case mode
-      [(launcher stand-alone distribution) mode]
-      ;; Backward compatibility: interpret a boolean
-      [else (if mode 'launcher 'stand-alone)]))
-  
-  ;; put-executable : parent string (union boolean 'launcher 'stand-alone 'distribution) boolean -> (union false? string)
-  ;; invokes the put-file dialog with arguments specific to building executables
-  (define (put-executable parent program-filename mode mred? title)
-    (let-values ([(base name dir) (split-path program-filename)])
-      (let ([mode (normalize-mode mode)])
-        (let ([default-name (default-executable-filename name mode mred?)])
-          (put-executable/defaults
-           parent
-           base
-           default-name
-           mode
-           mred? 
-           title)))))
-  
-  ;; put-executable/defaults : parent string string symbol boolean -> (union false? string)
-  (define (put-executable/defaults parent default-dir default-name mode mred? title)
-    (let-values ([(extension style filters)
-                  (mode->put-file-extension+style+filters mode mred?)])
-      (let* ([dir? (case mode
-                     [(launcher)
-                      (if mred?
-                          (mred-launcher-is-directory?)
-                          (mzscheme-launcher-is-directory?))]
-                     [(stand-alone)
-                      (embedding-executable-is-directory? mred?)]
-                     [(distribution) #f])]
-             [users-name
-              (if dir?
-                  (get-directory title
-                                 parent
-                                 default-dir
-                                 style)
-                  (put-file title
-                            parent
-                            default-dir
-                            default-name
-                            extension
-                            style
-                            filters))])
-        (and users-name
-             (users-name-ok? mode extension parent users-name)
-             (or (not dir?)
-                 (gui-utils:get-choice
-                  (format (string-constant warning-directory-will-be-replaced)
-                          users-name)
-                  (string-constant yes)
-                  (string-constant no)
-                  (string-constant drscheme)
-                  #f
-                  parent))
-             users-name))))
-  
-  ;; users-name-ok? : symbol string (union #f frame% dialog%) path? -> boolean
-  ;; returns #t if the string is an acceptable name for
-  ;; a saved executable, and #f otherwise.
-  (define (users-name-ok? mode extension parent name)
-    (or (not extension)
-        (let ([suffix-m (regexp-match #rx"[.][^.]*$" (path->string name))])
-          (or (and suffix-m
-                   (string=? (substring (car suffix-m) 1) extension))
-              (and
-               (message-box (string-constant drscheme)
-                            (format
-                             (string-constant ~a-must-end-with-~a)
-                             (case mode
-                               [(launcher) (string-constant launcher)]
-                               [(stand-alone) (string-constant stand-alone)]
-                               [(distribution) (string-constant distribution)])
-                             name
-                             extension)
-                            parent
-                            #:dialog-mixin frame:focus-table-mixin)
-               #f)))))
-  
-  ;; default-executable-filename : path symbol boolean -> path
-  (define (default-executable-filename program-filename mode mred?)
-    (let ([ext (let-values ([(extension style filters)
-                             (mode->put-file-extension+style+filters mode mred?)])
-                 (if extension
-                     (string->bytes/utf-8 (string-append "." extension))
-                     #""))])
-      (path-replace-suffix program-filename ext)))
-  
-  (define (mode->put-file-extension+style+filters mode mred?)
-    (case mode
-      [(launcher)
-       (if mred?
-           (mred-launcher-put-file-extension+style+filters)
-           (mzscheme-launcher-put-file-extension+style+filters))]
-      [(stand-alone)
-       (embedding-executable-put-file-extension+style+filters mred?)]
-      [(distribution)
-       (bundle-put-file-extension+style+filters)]))
-  
-  ;; create-module-based-stand-alone-executable : ... -> void (see docs)
-  (define (create-module-based-stand-alone-executable program-filename 
-                                                      executable-filename
-                                                      module-language-spec
-                                                      transformer-module-language-spec
-                                                      init-code
-                                                      gui?
-                                                      use-copy?)
-    
-    (with-handlers ([(λ (x) #f) ;exn:fail?
-                     (λ (x)
-                       (message-box 
-                        (string-constant drscheme)
-                        (format "~a" (exn-message x))
-                        #:dialog-mixin frame:focus-table-mixin)
-                       (void))])
-      (define init-code-tmp-filename (make-temporary-file "drs-standalone-exectable-init~a"))
-      (define bootstrap-tmp-filename (make-temporary-file "drs-standalone-exectable-bootstrap~a"))
-      (let ([init-code-mod-name
-             (let-values ([(base name dir?) 
-                           (split-path init-code-tmp-filename)])
-               (string->symbol (path->string name)))])
-        
-        (call-with-output-file bootstrap-tmp-filename
-          (λ (port)
-            (write `(let () ;; cannot use begin, since it gets flattened to top-level (and re-compiled!)
-                      ,@(if module-language-spec
-                            (if use-copy?
-                                (list 
-                                 `(namespace-require/copy ',module-language-spec))
-                                (list
-                                 `(namespace-require/constant ',module-language-spec)))
-                            '())
-                      ,@(if transformer-module-language-spec
-                            (list `(namespace-require `(for-syntax ,transformer-module-language-spec)))
-                            (list))
-                      ((dynamic-require ',init-code-mod-name 'init-code)))
-                   port))
-          #:exists 'truncate
-          #:mode 'text)
-        
-        (let ([new-init-code 
-               (list*
-                (car init-code)
-                init-code-mod-name
-                (cddr init-code))])
-          (call-with-output-file init-code-tmp-filename
-            (λ (port)
-              (write new-init-code port))
-            #:exists 'truncate #:mode 'text)))
-      
-      (let* ([pre-to-be-embedded-module-specs0
-              (cond
-                [(and module-language-spec transformer-module-language-spec)
-                 (if (equal? module-language-spec transformer-module-language-spec)
-                     (list module-language-spec)
-                     (list module-language-spec transformer-module-language-spec))]
-                [module-language-spec 
-                 (list module-language-spec)]
-                [transformer-module-language-spec
-                 (list transformer-module-language-spec)]
-                [else '()])]
-             [pre-to-be-embedded-module-specs1
-              (if gui?
-                  (cons '(lib "mred/mred.rkt")
-                        pre-to-be-embedded-module-specs0)
-                  pre-to-be-embedded-module-specs0)]
-             [pre-to-be-embedded-module-specs2
-              (cons `(file ,(path->string init-code-tmp-filename))
-                    pre-to-be-embedded-module-specs1)]
-             [pre-to-be-embedded-module-specs3
-              (filter (λ (x) (not (eq? x 'mzscheme)))
-                      pre-to-be-embedded-module-specs2)]
-             [to-be-embedded-module-specs
-              (map (λ (x) (list #f x))
-                   pre-to-be-embedded-module-specs3)])
-        
-        (create-embedding-executable 
-         executable-filename
-         #:mred? gui?
-         #:verbose? #f ;; verbose?
-         #:modules to-be-embedded-module-specs
-         #:literal-files (list 
-                          bootstrap-tmp-filename
-                          program-filename)
-         #:cmdline (if gui?
-                       (list "-mvqZ")
-                       (list "-mvq"))))
-      (delete-file init-code-tmp-filename)
-      (delete-file bootstrap-tmp-filename)
-      (void)))
-  
-  ;; create-module-based-distribution : ... -> void (see docs)
-  (define (create-module-based-distribution program-filename 
-                                            distribution-filename
-                                            module-language-spec
-                                            transformer-module-language-spec
-                                            init-code
-                                            gui?
-                                            use-copy?)
-    (create-distribution-for-executable
-     distribution-filename
-     gui?
-     (lambda (exe-name)
-       (create-module-based-stand-alone-executable program-filename 
-                                                   exe-name
-                                                   module-language-spec
-                                                   transformer-module-language-spec
-                                                   init-code
-                                                   gui?
-                                                   use-copy?))))
-  
-  ;; create-distribution-for-executable : ... -> void (see docs)
-  (define (create-distribution-for-executable distribution-filename
-                                              gui?
-                                              make-executable)
-    ;; Delete old file, if it exists:
-    (when (file-exists? distribution-filename)
-      (delete-file distribution-filename))
-    ;; Figure out base name, and create working temp directory:
-    (let* ([base-name (let-values ([(base name dir?) (split-path distribution-filename)])
-                        (path-replace-suffix name #""))]
-           [temp-dir
-            (make-temporary-file "drscheme-tmp-~a" 'directory)]
-           [c (make-custodian)]
-           [dialog (new dialog%
-                        [label (string-constant distribution-progress-window-title)]
-                        [width 400])]
-           [status-message
-            (new message%
-                 [label (string-constant creating-executable-progress-status)]
-                 [parent dialog]
-                 [stretchable-width #t])]
-           [pane (new vertical-pane%
-                      [parent dialog])]
-           [abort-button
-            (new button%
-                 [parent pane]
-                 [label (string-constant abort)]
-                 [callback (lambda (_1 _2)
-                             (custodian-shutdown-all c))])]
-           
-           [exn #f]
-           
-           [worker-thread
-            (parameterize ([current-custodian c])
-              (thread
-               (λ ()
-                 (with-handlers ([exn? (λ (e) (set! exn e))])
-                   ;; Build the exe:
-                   (make-directory (build-path temp-dir "exe"))
-                   (let ([exe-name (build-path temp-dir "exe" (default-executable-filename base-name 'stand-alone gui?))])
-                     (make-executable exe-name)
-                     (when (or (file-exists? exe-name)
-                               (directory-exists? exe-name))
-                       (let ([dist-dir (build-path temp-dir base-name)])
-                         ;; Assemble the bundle directory:
-                         (queue-callback 
-                          (λ ()
-                            (send status-message set-label (string-constant assembling-distribution-files-progress-status))))
-                         (assemble-distribution dist-dir (list exe-name))
-                         ;; Pack it:
-                         (queue-callback
-                          (λ ()
-                            (send status-message set-label (string-constant packing-distribution-progress-status))))
-                         (bundle-directory distribution-filename dist-dir #t))))))))])
-      
-      ;; create a thread that will trigger hiding the dialog and the return from `show'
-      ;; when things are done (no matter if there was a kill, or just normal terminiation)
-      (thread
-       (λ ()
-         (thread-wait worker-thread)
-         (queue-callback (λ () (send dialog show #f)))))
-      
-      (send dialog show #t)
-      
-      ;; Clean up:
-      (custodian-shutdown-all c)
-      (delete-directory/files temp-dir)
-      
-      (when exn
-        (raise exn))))
-  
-  
-  (define (condense-scheme-code-string s)
-    (let ([i (open-input-string s)]
-          [o (open-output-string)])
-      (let loop ()
-        (let ([c (read-char i)])
-          (unless (eof-object? c)
-            (let ([next (λ ()
-                          (display c o)
-                          (loop))])
-              (case c
-                [(#\space)
-                 (if (char=? #\( (peek-char i))
-                     (loop)
-                     (next))]
-                [(#\))
-                 (if (eq? #\space (peek-char i))
-                     (begin
-                       (display #\) o)
-                       (read-char i)
-                       (loop))
-                     (next))]
-                [(#\\)
-                 (begin
-                   (display #\\ o)
-                   (display (read-char i) o)
-                   (loop))]
-                [(#\" #\|)
-                 (display c o)
-                 (let loop ()
-                   (let ([v (read-char i)])
-                     (cond
-                       [(eq? v c) (next)]
-                       [(eq? v #\\)
-                        (display v o)
-                        (display (read-char i) o)
-                        (loop)]
-                       [else (display v o)
-                             (loop)])))]
-                [else (next)])))))
-      (get-output-string o)))
-  
-  (define (create-module-based-launcher program-filename 
-                                        executable-filename
-                                        module-language-spec
-                                        transformer-module-language-spec
-                                        init-code
-                                        gui?
-                                        use-copy?)
-    
-    (with-handlers ([(λ (x) #f) ;exn:fail?
-                     (λ (x)
-                       (message-box 
-                        (string-constant drscheme)
-                        (format "~a" (exn-message x))
-                        #:dialog-mixin frame:focus-table-mixin)
-                       (void))])
-      
-      ((if gui? make-mred-launcher make-mzscheme-launcher)
-       (list
-        (path->string
-         (collection-file-path (if gui? 
-                                   "launcher-mred-bootstrap.rkt"
-                                   "launcher-mz-bootstrap.rkt")
-                               "drracket" "private"))
-        (condense-scheme-code-string (format "~s" init-code))
-        (path->string program-filename)
-        (format "~s" module-language-spec)
-        (format "~s" transformer-module-language-spec)
-        (format "~s" use-copy?))
-       (if (path? executable-filename)
-           (path->string executable-filename)
-           executable-filename))))
-  
-  ;; initialize-module-based-language : boolean (or #f module-spec) module-spec ((-> void) -> void)
-  (define (initialize-module-based-language use-copy?
-                                            module-spec
-                                            transformer-module-spec
-                                            run-in-user-thread)
-    (run-in-user-thread
-     (λ ()
-       (with-handlers ([(λ (x) #t)
-                        (λ (x)
-                          (display (if (exn? x) 
-                                       (exn-message x) 
-                                       (format "~s" x)))
-                          (newline))])
-         (when module-spec
-           (if use-copy?
-               (namespace-require/copy module-spec)
-               (namespace-require/constant module-spec)))
-         (when transformer-module-spec
-           (namespace-require `(for-syntax ,transformer-module-spec)))))))
-  
-  ;; module-based-language-front-end : (port reader -> (-> (union sexp syntax eof)))
-  ;; type reader = type-spec-of-read-syntax (see mz manual for details)
-  (define (module-based-language-front-end port reader)
-    (λ () 
-      (let ([s (reader (object-name port) port)])
-        (if (syntax? s)
-            (namespace-syntax-introduce
-             (datum->syntax 
-              #f 
-              (cons '#%top-interaction s)
-              s))
-            s))))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;;  snip/value extensions
-  ;;
-  
-  (define to-snips null)
-  (define-struct to-snip (predicate? >value setup-thunk))
-  (define add-snip-value
-    (lambda (predicate constructor [setup-thunk void])
-      (set! to-snips (cons (make-to-snip predicate constructor setup-thunk) to-snips))))
-  
-  (define (value->snip v)
-    (ormap (λ (to-snip) (and ((to-snip-predicate? to-snip) v)
-                             ((to-snip->value to-snip) v)))
-           to-snips))
-  (define (to-snip-value? v)
-    (ormap (λ (to-snip) ((to-snip-predicate? to-snip) v)) to-snips))
-  (define (setup-setup-values) 
-    (for-each (λ (t) ((to-snip-setup-thunk t))) to-snips))
-  
-  
-  (define capabilities '())
-  (define (capability-registered? x) (and (assoc x capabilities) #t))
-  (define (register-capability name contract default)
-    (when (capability-registered? name)
-      (error 'register-capability "already registered capability ~s" name))
-    (set! capabilities (cons (list name default contract) capabilities)))
-  (define (get-capability-default name)
-    (let ([l (assoc name capabilities)])
-      (unless l
-        (error 'get-capability-default "name not bound ~s" name))
-      (cadr l)))
-  (define (get-capability-contract name)
-    (let ([l (assoc name capabilities)])
-      (unless l
-        (error 'get-capability-contract "name not bound ~s" name))
-      (caddr l)))
-  
-
-;                                                                        
-;                                                                        
-;  ;;;;;;                                       ;                        
-;   ;   ;          ;                                                     
-;   ; ;   ;;  ;;  ;;;;;   ;;;  ;; ;;    ;;;;  ;;;     ;;;  ;; ;;    ;;;; 
-;   ;;;    ;  ;    ;     ;   ;  ;;  ;  ;   ;    ;    ;   ;  ;;  ;  ;   ; 
-;   ; ;     ;;     ;     ;;;;;  ;   ;   ;;;     ;    ;   ;  ;   ;   ;;;  
-;   ;       ;;     ;     ;      ;   ;      ;    ;    ;   ;  ;   ;      ; 
-;   ;   ;  ;  ;    ;   ; ;      ;   ;  ;   ;    ;    ;   ;  ;   ;  ;   ; 
-;  ;;;;;; ;;  ;;    ;;;   ;;;; ;;; ;;; ;;;;   ;;;;;   ;;;  ;;; ;;; ;;;;  
-;                                                                        
-;                                                                        
-;                                                                        
-;                                                                        
-  
-  
-  
-  (define language-extensions null)
-  (define (get-language-extensions) 
-    (drracket:tools:only-in-phase
-     'drracket:language:get-default-mixin
-     'phase2)
-    language-extensions)
-  
-  (define (default-mixin x) x)
-  (define (get-default-mixin)
-    (drracket:tools:only-in-phase
-     'drracket:language:get-default-mixin
-     'phase2)
-    default-mixin)
-  
-  (define (extend-language-interface extension<%> default-impl)
-    (drracket:tools:only-in-phase
-     'drracket:language:extend-language-interface
-     'phase1)
-    (set! default-mixin (compose default-impl default-mixin))
-    (set! language-extensions (cons extension<%> language-extensions)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/launcher-bootstrap.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/launcher-bootstrap.rkt
deleted file mode 100644
index 36074c81e3..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/launcher-bootstrap.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-
-(provide startup)
-
-(require racket/file)
-
-(define (read-from-string s) (read (open-input-string s)))
-
-(define (startup)
-  (define argv (current-command-line-arguments))
-  ;; skip first six
-  (define program-argv (list->vector (cddr (cddddr (vector->list argv)))))
-  
-  (define init-code (read-from-string (vector-ref argv 0)))
-  (define program-filename (vector-ref argv 1))
-  (define language-module-spec (read-from-string (vector-ref argv 2)))
-  (define transformer-module-spec (read-from-string (vector-ref argv 3)))
-  (define use-require/copy? (read-from-string (vector-ref argv 4)))
-  
-  (define init-code-tmp-filename (make-temporary-file "drs-launcher-init~a"))
-  (define-values (_1 init-code-mod-name _2) (split-path init-code-tmp-filename))
-  
-  (define stupid-internal-define-syntax2
-    (set! init-code (cons (car init-code)
-                          (cons (string->symbol (path->string init-code-mod-name))
-                                (cddr init-code)))))
-  
-  (define stupid-internal-define-syntax1
-    (call-with-output-file init-code-tmp-filename
-      (λ (port)
-        (write init-code port))
-      #:exists 'truncate #:mode 'text))
-  
-  (define init-code-proc (dynamic-require init-code-tmp-filename 'init-code))
-  
-  (namespace-set-variable-value! 'argv program-argv)
-  (current-command-line-arguments program-argv)
-  (when language-module-spec
-    (namespace-require language-module-spec))
-  (when use-require/copy?
-    (namespace-require/copy language-module-spec))
-  (when transformer-module-spec
-    (namespace-require `(for-syntax ,transformer-module-spec)))
-  
-  (init-code-proc)
-  
-  ;; safe to do this earlier?
-  (delete-file init-code-tmp-filename)
-  
-  (load program-filename))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/launcher-mred-bootstrap.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/launcher-mred-bootstrap.rkt
deleted file mode 100644
index b4e50b8bd8..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/launcher-mred-bootstrap.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(module test racket/base)
-
-(require racket/gui/base "launcher-bootstrap.rkt")
-
-(current-namespace (make-gui-empty-namespace))
-(namespace-require 'racket/gui/base)
-(namespace-require 'racket/class)
-
-(startup)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/launcher-mz-bootstrap.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/launcher-mz-bootstrap.rkt
deleted file mode 100644
index cce65b567b..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/launcher-mz-bootstrap.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-
-(module test racket/base)
-
-(require "launcher-bootstrap.rkt")
-
-(current-namespace (make-base-empty-namespace))
-(namespace-require 'racket/base)
-
-(startup)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/link.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/link.rkt
deleted file mode 100644
index 1f04819c2d..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/link.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang racket/base
-(require racket/unit
-         "modes.rkt"
-         "font.rkt"
-         "eval.rkt"
-         "module-browser.rkt"
-         "multi-file-search.rkt"
-         "debug.rkt"
-         "module-language.rkt"
-         "tools.rkt"
-         "tools-drs.rkt"
-         "language.rkt"
-         "language-configuration.rkt"
-         drracket/private/drsig
-         "init.rkt"
-         "text.rkt"
-         "app.rkt"
-         "main.rkt"
-         "rep.rkt"
-         "frame.rkt"
-         "unit.rkt"
-         "tracing.rkt"
-         "get-extend.rkt"
-         "help-desk.rkt"
-         "module-language-tools.rkt"
-         "interface.rkt")
-
-(provide drracket@ drscheme/drracket:tool^)
-
-(define-compound-unit/infer drracket-unit@
-  (import)
-  (export drracket:debug^
-          drracket:unit^
-          drracket:rep^
-          drracket:frame^
-          drracket:get/extend^
-          drracket:language-configuration^
-          drracket:language^
-          drracket:help-desk^
-          drracket:eval^
-          drracket:modes^
-          drracket:tracing^
-          drracket:module-language/int^
-          drracket:module-language-tools^
-          drracket:interface^)
-  (link interface@ init@ tools@ tools-drs@ modes@ text@ eval@ frame@ rep@ language@
-        module-overview@ module-language@ unit@ debug@ multi-file-search@ get-extend@
-        language-configuration@ font@ module-language-tools@
-        help-desk@ tracing@ app@
-        main@))
-
-(define-signature drscheme/drracket:tool^
-  ((open drracket:tool^)
-   (open drscheme:tool^)))
-
-(define-unit/new-import-export drracket@
-  (import) 
-  (export drscheme/drracket:tool^)
-  (((prefix drracket:debug: drracket:debug^)
-    (prefix drracket:unit: drracket:unit^)
-    (prefix drracket:rep: drracket:rep^)
-    (prefix drracket:frame: drracket:frame^)
-    (prefix drracket:get/extend: drracket:get/extend^)
-    (prefix drracket:language-configuration: drracket:language-configuration^)
-    (prefix drracket:language: drracket:language^)
-    (prefix drracket:help-desk: drracket:help-desk^)
-    (prefix drracket:eval: drracket:eval^)
-    (prefix drracket:modes: drracket:modes^)
-    (prefix drracket:tracing: drracket:tracing^)
-    (prefix drracket:module-language: drracket:module-language/int^)
-    (prefix drracket:module-language-tools: drracket:module-language-tools^)
-    (prefix drracket: drracket:interface^)
-    
-    (prefix drscheme:debug: drracket:debug^)
-    (prefix drscheme:unit: drracket:unit^)
-    (prefix drscheme:rep: drracket:rep^)
-    (prefix drscheme:frame: drracket:frame^)
-    (prefix drscheme:get/extend: drracket:get/extend^)
-    (prefix drscheme:language-configuration: drracket:language-configuration^)
-    (prefix drscheme:language: drracket:language^)
-    (prefix drscheme:help-desk: drracket:help-desk^)
-    (prefix drscheme:eval: drracket:eval^)
-    (prefix drscheme:modes: drracket:modes^)
-    (prefix drscheme:tracing: drracket:tracing^)
-    (prefix drscheme:module-language: drracket:module-language/int^)
-    (prefix drscheme:module-language-tools: drracket:module-language-tools^)
-    (prefix drscheme: drracket:interface^))
-   drracket-unit@))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/local-member-names.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/local-member-names.rkt
deleted file mode 100644
index a413a31402..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/local-member-names.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang racket/base
-(require racket/class)
-
-(define-syntax-rule
-  (define/provide-local-member-name x ...)
-  (begin
-    (define-local-member-name x ...)
-    (provide x ...)))
-
-(define/provide-local-member-name
-  get-visible-defs
-  set-visible-defs
-  set-focus-d/i
-  get-i
-  set-i
-  insert-auto-text)
-
-;; from module-language-tools.rkt
-(define/provide-local-member-name
-  when-initialized
-  ;move-to-new-language
-  get-in-module-language?)
-
-;; for keybindings (otherwise private)
-(define/provide-local-member-name
-  jump-to-previous-error-loc
-  jump-to-next-error-loc)
-
-;; defined in module-language.rkt
-(define/provide-local-member-name
-  set-lang-wants-big-defs/ints-labels?)
-
-;; used by the test suite to tell when the
-;; online check syntax has finished
-(define/provide-local-member-name
-  get-online-expansion-colors)
-
-;; used by the module language
-(define/provide-local-member-name
-  frame-show-bkg-running
-  set-bottom-bar-most-recent-jumped-to-loc
-  set-expand-error/status
-  update-frame-expand-error
-  expand-error-next
-  expand-error-prev
-  hide-module-language-error-panel
-  fetch-data-to-send
-  clear-old-error
-  set-bottom-bar-status
-  
-  get-oc-status
-  set-oc-status
-  
-  set-dep-paths
-  set-dirty-if-dep)
-
-;; mode changing definitions text mixin
-(define-local-member-name 
-  maybe-change-language
-  change-mode-to-match
-  get-current-mode)
-
-
-(provide (struct-out drracket:language-configuration:language-settings))
-;; type language-settings = (language-settings (instanceof language<%>) settings)
-(define-struct drracket:language-configuration:language-settings (language settings))
-
-(provide (struct-out drracket:unit:teachpack-callbacks))
-(define-struct drracket:unit:teachpack-callbacks (get-names add remove remove-all))
-
-(provide (struct-out drracket:language:simple-settings))
-(define-struct drracket:language:simple-settings (case-sensitive 
-                                                  printing-style
-                                                  fraction-style
-                                                  show-sharing
-                                                  insert-newlines
-                                                  annotations))
-
-(provide (struct-out drracket:language:text/pos))
-(define-struct drracket:language:text/pos (text start end))
-  
-
-(provide (struct-out drracket:modes:mode))
-(struct drracket:modes:mode (name surrogate repl-submit matches-language intended-to-edit-programs?))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/main.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/main.rkt
deleted file mode 100644
index 29ddfda461..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/main.rkt
+++ /dev/null
@@ -1,858 +0,0 @@
-#lang racket/unit
-
-(require string-constants
-         racket/contract
-         racket/class
-         racket/pretty
-         drracket/private/drsig
-         "frame-icon.rkt"
-         "local-member-names.rkt"
-         mred
-         framework
-         racket/list
-         racket/path
-         racket/file
-         racket/dict
-         racket/set
-         browser/external
-         setup/plt-installer
-         
-         scribble/tag
-         setup/xref
-         scribble/xref
-         net/url)
-
-(import [prefix drracket:app: drracket:app^]
-        [prefix drracket:unit: drracket:unit^]
-        [prefix drracket:get/extend: drracket:get/extend^]
-        [prefix drracket:language-configuration: drracket:language-configuration/internal^]
-        [prefix drracket:language: drracket:language^]
-        [prefix drracket:module-language: drracket:module-language/int^]
-        [prefix drracket:tools: drracket:tools^]
-        [prefix drracket:debug: drracket:debug^]
-        [prefix drracket:frame: drracket:frame/int^]
-        [prefix drracket:font: drracket:font^]
-        [prefix drracket:modes: drracket:modes/int^]
-        [prefix drracket:help-desk: drracket:help-desk^]
-        [prefix drracket:multi-file-search: drracket:multi-file-search^])
-(export)
-
-(define (drr:set-default name val predicate)
-  (preferences:set-default 
-   name val predicate 
-   #:aliases (list (string->symbol (regexp-replace #rx"^drracket:" 
-                                                   (symbol->string name)
-                                                   "drscheme:")))))
-
-(frame:current-icon todays-icon)
-  
-(define file-opened-via-application-file-handler? #f)
-(application-file-handler
- (let ([default (application-file-handler)])
-   (λ (name)
-     (set! file-opened-via-application-file-handler? #t)
-     (if (null? (get-top-level-windows))
-         (handler:edit-file name)
-         (default name)))))
-
-(application-quit-handler
- (let ([default (application-quit-handler)])
-   (λ ()
-     (if (null? (get-top-level-windows))
-         (when (exit:user-oks-exit)
-           (exit:exit))
-         (default)))))
-
-(application-about-handler
- (λ ()
-   (drracket:app:about-drscheme)))
-
-(drracket:modes:add-initial-modes)
-
-(finder:default-filters
- `(["Racket Sources" "*.rkt;*.scrbl;*.rktl;*.rktd;*.ss;*.scm"]
-   ,@(finder:default-filters)))
-
-(application:current-app-name (string-constant drscheme))
-
-(preferences:set-default 'drracket:tried-materialize-user-docs
-                         (not (equal? (system-type) 'macosx))
-                         boolean?)
-
-(preferences:set-default 'drracket:open-module-path-last-used "" string?)
-
-(preferences:set-default 'drracket:logger-receiver-string "error debug@GC debug@PLaneT" string?)
-(preferences:set-default 'drracket:logger-scroll-to-bottom? #t boolean?)
-
-(preferences:set-default 'drracket:submodules-to-choose-from 
-                         '((test) (main)) 
-                         (cons/c (list/c 'test)
-                                 (cons/c (list/c 'main)
-                                         (listof (listof symbol?)))))
-(preferences:set-default 'drracket:defs/ints-labels #t boolean?)
-
-(drr:set-default 'drracket:language-dialog:hierlist-default #f 
-                 (λ (x) (or (not x) (and (list? x) (andmap string? x)))))
-(preferences:set-default 'drracket:language-dialog:teaching-hierlist-default #f
-                         (λ (x) (or (not x) (and (list? x) (andmap string? x)))))
-
-(drr:set-default 'drracket:create-executable-gui-type 'stand-alone 
-                 (λ (x) (memq x '(launcher stand-alone distribution))))
-(drr:set-default 'drracket:create-executable-gui-base 'racket (λ (x) (memq x '(racket gracket))))
-
-(drr:set-default 'drracket:logger-gui-tab-panel-level 0 (λ (x) (and (exact-integer? x) (<= 0 x 5)))) 
-
-(drr:set-default 'drracket:saved-bug-reports 
-                         '() 
-                         (λ (ll) 
-                           (and (list? ll)
-                                (andmap
-                                 (λ (l)
-                                   (and (list? l)
-                                        (andmap (λ (x) (and (pair? x)
-                                                            (symbol? (car x))
-                                                            (string? (cdr x))))
-                                                l)))
-                                 ll))))
-
-(drr:set-default 'drracket:module-language-first-line-special? #t boolean?)
-
-(drr:set-default 'drracket:defns-popup-sort-by-name? #f boolean?)
-(drr:set-default 'drracket:show-line-numbers? #f boolean?)
-
-(drr:set-default 'drracket:toolbar-state 
-                 '(#f . top)
-                 (λ (x) (and (pair? x)
-                             (boolean? (car x))
-                             (memq (cdr x) '(left top top-no-label right)))))
-
-;; call this 'multi-lib' because older versions of Racket didn't
-;; allow (lib "a/b/x.rkt") in the teaching languages, but instead
-;; insisted on (lib "x.rkt" "a" "b"). (We use the more compact
-;; form now because that's what lower-level primitives return to us)
-(preferences:set-default 'drracket:htdp:last-set-teachpacks/multi-lib
-                         '() 
-                         (listof (cons/c 'lib (listof string?))))
-(drr:set-default 'drracket:defs/ints-horizontal #f boolean?)
-
-(drr:set-default 'drracket:recent-language-names 
-                         null 
-                         (λ (x) 
-                           (and (list? x) 
-                                (andmap 
-                                 (λ (x)
-                                   (and (pair? x)
-                                        (string? (car x))))
-                                 x))))
-(drr:set-default 'drracket:show-interactions-on-execute #t boolean?)
-(drr:set-default 'drracket:open-in-tabs #f boolean?)
-(drr:set-default 'drracket:toolbar-shown #t boolean?)
-(drr:set-default 'drracket:user-defined-keybindings
-                         '()
-                         (λ (x) (and (list? x) 
-                                     (andmap (λ (x) (or (path? x) (drracket:frame:planet-spec? x)))
-                                             x))))
-(drr:set-default 'drracket:install-plt-dialog
-                         '(#t "" "") ; url-selected?, url string, file string
-                         (λ (x) (and (list? x) (= 3 (length x))
-                                     (boolean? (car x))
-                                     (andmap string? (cdr x)))))
-
-(preferences:set-un/marshall 
- 'drracket:user-defined-keybindings
- (λ (in) (map (λ (x) (if (path? x) (path->bytes x) x))
-              in))
- (λ (ex) (if (list? ex)
-             (map (λ (x) (if (bytes? x) (bytes->path x) x)) ex)
-             '())))
-
-(let ([number-between-zero-and-one?
-       (λ (x) (and (number? x) (<= 0 x 1)))])
-  (drr:set-default 'drracket:unit-window-size-percentage 
-                           1/2 
-                           number-between-zero-and-one?)
-  (drr:set-default 'drracket:module-browser-size-percentage
-                           1/5
-                           number-between-zero-and-one?)
-  (drr:set-default 'drracket:logging-size-percentage
-                           3/4
-                           number-between-zero-and-one?))
-
-(let ([frame-width 600]
-      [frame-height 650]
-      [window-trimming-upper-bound-width 20]
-      [window-trimming-upper-bound-height 50])
-  (let-values ([(w h) (get-display-size)])
-    (set! frame-width (min frame-width (- w window-trimming-upper-bound-width)))
-    (set! frame-height (min frame-height (- h window-trimming-upper-bound-height))))
-  (frame:setup-size-pref 'drracket:window-size 
-                         frame-width
-                         frame-height 
-                         #:position-preferences
-                         'drracket:window-position))
-
-(drr:set-default 'drracket:backtrace-window-width 400 number?)
-(drr:set-default 'drracket:backtrace-window-height 300 number?)
-(drr:set-default 'drracket:backtrace-window-x 0 number?)
-(drr:set-default 'drracket:backtrace-window-y 0 number?)
-
-(drr:set-default 'drracket:profile-how-to-count 'time
-                         (λ (x)
-                           (memq x '(time count))))
-(drr:set-default 'drracket:profile:low-color
-                         (make-object color% 150 255 150)
-                         (λ (x) (is-a? x color%)))
-(drr:set-default 'drracket:profile:high-color
-                         (make-object color% 255 150 150)
-                         (λ (x) (is-a? x color%)))
-(drr:set-default 'drracket:profile:scale
-                         'linear
-                         (λ (x) (memq x '(sqrt linear square))))
-
-(drr:set-default 'drracket:test-coverage-ask-about-clearing? #t boolean?)
-
-;; size is in editor positions
-(drr:set-default 'drracket:repl-buffer-size 
-                         '(#t . 1000)
-                         (λ (x)
-                           (and (pair? x)
-                                (boolean? (car x))
-                                (integer? (cdr x))
-                                (<= 1 (cdr x) 10000))))
-
-(let ([marshall-color 
-       (λ (c)
-         (list (send c red) (send c green) (send c blue)))]
-      [unmarshall-color
-       (λ (l)
-         (if (and (list? l) 
-                  (= 3 (length l))
-                  (andmap (λ (x) (and number? (<= 0 x 255)))
-                          l))
-             (make-object color% (car l) (cadr l) (caddr l))
-             (make-object color% 0 0 0)))])
-  (preferences:set-un/marshall 
-   'drracket:profile:low-color
-   marshall-color
-   unmarshall-color)
-  (preferences:set-un/marshall 
-   'drracket:profile:high-color
-   marshall-color
-   unmarshall-color))
-
-(drr:set-default 
- 'drracket:keybindings-window-size
- (cons 400 600)
- (λ (x) (and (pair? x)
-             (number? (car x))
-             (number? (cdr x)))))
-
-(drr:set-default
- 'drracket:execute-warning-once
- #f
- (λ (x)
-   (or (eq? x #t)
-       (not x))))
-
-(drr:set-default 'drracket:switch-to-module-language-automatically? #t boolean?)
-
-(drr:set-default
- 'drracket:default-tools-configuration
- 'load
- (lambda (p)
-   (memq p '(load skip))))
-
-(drr:set-default
- 'drracket:tools-configuration
- null
- list?)
-
-(drracket:font:setup-preferences)
-(color-prefs:add-color-scheme-preferences-panel
- #:extras
- (λ (parent)
-   (define hp (new horizontal-panel% 
-                   [alignment '(center center)]
-                   [parent parent]
-                   [stretchable-height #f]))
-   (new button% 
-        [label (string-constant design-your-own-color-schemes)]
-        [callback 
-         (λ args
-           
-           (define xref (load-collections-xref))
-           (define-values (path tag)
-             (xref-tag->path+anchor
-              xref
-              (make-section-tag "color-scheme"
-                                #:doc '(lib "scribblings/drracket/drracket.scrbl"))))
-           (define url (path->url path))
-           (define url2 (if tag
-                            (make-url (url-scheme url)
-                                      (url-user url)
-                                      (url-host url)
-                                      (url-port url)
-                                      (url-path-absolute? url)
-                                      (url-path url)
-                                      (url-query url)
-                                      tag)
-                            url))
-           (send-url (url->string url2)))]
-        [parent hp])
-   (new button% 
-        [label (string-constant style-and-color-names)]
-        [callback 
-         (λ args
-           (define sp (open-output-string))
-           (define-values (color-names style-names) (color-prefs:get-color-scheme-names))
-           (fprintf sp "color names:\n")
-           (pretty-write (sort (set->list color-names) symbol<?) sp)
-           (fprintf sp "style names:\n")
-           (pretty-write (sort (set->list style-names) symbol<?) sp)
-           (message-box (string-constant drracket)
-                        (get-output-string sp)))]
-        [parent hp])))
-(color-prefs:add-background-preferences-panel)
-(racket:add-preferences-panel)
-(racket:add-coloring-preferences-panel)
-(preferences:add-editor-checkbox-panel)
-(preferences:add-warnings-checkbox-panel)
-(preferences:add-scheme-checkbox-panel)
-(preferences:add-general-checkbox-panel)
-
-(let ([make-check-box
-       (λ (pref-sym string parent [extra-functionality #f])
-         (let ([q (make-object check-box%
-                    string
-                    parent
-                    (λ (checkbox evt)
-                      (define value (send checkbox get-value))
-                      (preferences:set pref-sym value)
-                      (when extra-functionality
-                        (extra-functionality value))))])
-           (preferences:add-callback pref-sym (λ (p v) (send q set-value v)))
-           (send q set-value (preferences:get pref-sym))))])
-  (preferences:add-to-general-checkbox-panel
-   (λ (editor-panel)
-     (make-check-box 'drracket:open-in-tabs 
-                     (string-constant open-files-in-tabs)
-                     editor-panel)
-     
-
-     (make-check-box 'drracket:show-interactions-on-execute 
-                     (string-constant show-interactions-on-execute)
-                     editor-panel)
-     
-     (make-check-box 'drracket:switch-to-module-language-automatically?
-                     (string-constant switch-to-module-language-automatically)
-                     editor-panel)
-     
-     (make-check-box 'drracket:defs/ints-horizontal
-                     (string-constant interactions-beside-definitions)
-                     editor-panel)
-
-     (make-check-box 'drracket:module-language-first-line-special?
-                     (string-constant ml-always-show-#lang-line)
-                     editor-panel)))
-  
-  (preferences:add-to-editor-checkbox-panel
-   (λ (editor-panel)
-     (make-check-box 'drracket:show-line-numbers?
-                     (string-constant show-line-numbers)
-                     editor-panel)
-     
-     (make-check-box 'drracket:defs/ints-labels
-                     (string-constant show-defs/ints-label)
-                     editor-panel)
-     
-     ;; come back to this one.
-     #;
-     (letrec ([hp (new horizontal-panel% 
-                       (parent editor-panel)
-                       (alignment '(left top))
-                       (stretchable-height #f))]
-              [cb (new check-box%
-                       (label (string-constant limit-interactions-size))
-                       (parent hp)
-                       (callback (λ (cb v) (cb-callback))))]
-              [sl (new slider% 
-                       (label #f)
-                       (parent hp)
-                       (min-value 1)
-                       (max-value 10000)
-                       (callback
-                        (λ (sl _) (sl-callback))))]
-              [cb-callback
-               (λ ()
-                 (preferences:set 'drracket:repl-buffer-size
-                                  (cons (send cb get-value)
-                                        (cdr (preferences:get 'drracket:repl-buffer-size)))))]
-              [sl-callback
-               (λ ()
-                 (preferences:set 'drracket:repl-buffer-size
-                                  (cons (car (preferences:get 'drracket:repl-buffer-size))
-                                        (send sl get-value))))]
-              [update-controls
-               (λ (v)
-                 (let ([on? (car v)])
-                   (send sl enable on?)
-                   (send cb set-value on?)
-                   (send sl set-value (cdr v))))])
-       (preferences:add-callback 'drracket:repl-buffer-size (λ (p v) (update-controls v)))
-       (update-controls (preferences:get 'drracket:repl-buffer-size)))))
-  
-  (preferences:add-to-warnings-checkbox-panel
-   (λ (warnings-panel)
-     (make-check-box 'drracket:execute-warning-once 
-                     (string-constant only-warn-once)
-                     warnings-panel)
-     (make-check-box 'drracket:test-coverage-ask-about-clearing?
-                     (string-constant test-coverage-ask?)
-                     warnings-panel)
-     (make-check-box 'drracket:show-killed-dialog
-                     (string-constant show-evaluation-terminated-dialog)
-                     warnings-panel))))
-
-(drracket:debug:add-prefs-panel)
-(install-help-browser-preference-panel)
-(drracket:tools:add-prefs-panel)
-
-(drracket:language:register-capability 'drscheme:tabify-menu-callback 
-                                       (or/c false/c (-> (is-a?/c text%) number? number? void?))
-                                       (λ (t a b) (send t tabify-selection a b)))
-(drracket:language:register-capability 'drscheme:autocomplete-words (listof string?) '())
-(drracket:language:register-capability 'drscheme:define-popup
-                                       (or/c (cons/c string? string?) 
-                                             (list/c string? string? string?)
-                                             #f)
-                                       (list "(define" "(define ...)" "δ"))
-
-;; The default is #f to keep whatever the user chose as their context.
-;; If it's "", then we will kill the user's choice.
-(drracket:language:register-capability 'drscheme:help-context-term
-                                       (or/c false/c string?)
-                                       #f)
-
-(drracket:language:register-capability 'drscheme:special:insert-fraction boolean? #t)
-(drracket:language:register-capability 'drscheme:special:insert-large-letters boolean? #t)
-(drracket:language:register-capability 'drscheme:special:insert-lambda boolean? #t)
-(drracket:language:register-capability 'drscheme:special:insert-image boolean? #t)
-(drracket:language:register-capability 'drscheme:special:insert-comment-box boolean? #t)
-(drracket:language:register-capability 'drscheme:language-menu-title 
-                                       (flat-contract string?)
-                                       (string-constant scheme-menu-name))
-
-(drracket:language:register-capability 'drscheme:teachpack-menu-items
-                                       (or/c #f (flat-contract drracket:unit:teachpack-callbacks?))
-                                       #f)
-
-(handler:current-create-new-window
- (let ([drscheme-current-create-new-window
-        (λ (filename)
-          (drracket:unit:open-drscheme-window filename))])
-   drscheme-current-create-new-window))
-
-;; add a catch-all handler to open drscheme files
-(handler:insert-format-handler 
- "Units"
- (λ (filename) #t)
- drracket:unit:open-drscheme-window)
-
-;; add a handler to open .plt files.
-(handler:insert-format-handler
- "PLT Files"
- (λ (filename)
-   (and (regexp-match? #rx"^(?i:plt)$"
-                       (or (filename-extension filename) #""))
-        (gui-utils:get-choice
-         (format (string-constant install-plt-file) filename)
-         (string-constant install-plt-file/yes)
-         (string-constant install-plt-file/no))))
- (λ (filename)
-   (run-installer filename)
-   #f))
-
-;; trim old console-previous-exprs preferences to compenstate 
-;; for a bug that let it grow without bound
-(let* ([max-len 30]
-       [trim (λ (exprs save)
-               (when (list? exprs)
-                 (let ([len (length exprs)])
-                   (when (> len max-len)
-                     (save (drop exprs (- len max-len)))))))])
-  (let ([framework-prefs (get-preference 'plt:framework-prefs #:timeout-lock-there (λ (x) #f))])
-    (when (and (list? framework-prefs)
-               (andmap pair? framework-prefs))
-      (let ([exprs-pref (assq 'drscheme:console-previous-exprs framework-prefs)])
-        (when exprs-pref
-          (trim (second exprs-pref)
-                (λ (trimmed)
-                  (put-preferences
-                   (list 'plt:framework-prefs)
-                   (list (dict-set framework-prefs 'drscheme:console-previous-exprs (list trimmed)))
-                   void)))))))
-  (trim (get-preference 'plt:framework-pref:drscheme:console-previous-exprs
-                        #:timeout-lock-there
-                        (λ (x) #f))
-        (λ (trimmed)
-          (put-preferences (list 'plt:framework-pref:drscheme:console-previous-exprs)
-                           (list trimmed)
-                           void))))
-
-(drracket:tools:load/invoke-all-tools
- (λ () (void))
- (λ () 
-   (drracket:language-configuration:add-built-in-languages)
-   (drracket:module-language:add-module-language)
-   (drracket:language-configuration:add-info-specified-languages)))
-
-;; no more extension after this point
-(drracket:get/extend:get-interactions-canvas)
-(drracket:get/extend:get-definitions-canvas)
-(drracket:get/extend:get-unit-frame)
-(drracket:get/extend:get-interactions-text)
-(drracket:get/extend:get-definitions-text)
-(drracket:language-configuration:get-languages)
-
-;; this default can only be set *after* the
-;; languages have all be registered by tools
-(drr:set-default
- drracket:language-configuration:settings-preferences-symbol
- (drracket:language-configuration:get-default-language-settings)
- drracket:language-configuration:language-settings?)
-
-;; if the unmarshaller returns #f, that will fail the
-;; test for this preference, reverting back to the default.
-;; In that case, the default is specified in the pref.rkt file
-;; of the default collection and may not be the default
-;; specified above (of course).
-(preferences:set-un/marshall
- drracket:language-configuration:settings-preferences-symbol
- (λ (x)
-   (let ([lang (drracket:language-configuration:language-settings-language x)]
-         [settings (drracket:language-configuration:language-settings-settings x)])
-     (list (send lang get-language-numbers)
-           (send lang marshall-settings settings))))
- (λ (x)
-   (and (list? x)
-        (= 2 (length x))
-        (let* ([lang-nums (first x)]
-               [marshalled-settings (second x)]
-               [lang (ormap
-                      (λ (x)
-                        (and (or (equal? (send x get-language-numbers) lang-nums)
-                                 
-                                 ;; this second branch of the `or' corresdponds
-                                 ;; to preferences saved from earlier versions of
-                                 ;; drscheme, for a sort of backwards compatibility
-                                 (equal? (send x get-language-position) lang-nums))
-                             x))
-                      (drracket:language-configuration:get-languages))])
-          (and lang
-               (let ([settings (send lang unmarshall-settings marshalled-settings)])
-                 (drracket:language-configuration:language-settings
-                  lang
-                  (or settings (send lang default-settings)))))))))
-
-  (preferences:set-default 'drracket:online-compilation-default-on #t boolean?)
-  (preferences:set-default 'drracket:online-expansion:read-in-defs-errors 
-                           'margin
-                           (or/c 'margin 'gold))
-  (preferences:set-default 'drracket:online-expansion:variable-errors 
-                           'margin
-                           (or/c 'margin 'gold))
-  (preferences:set-default 'drracket:online-expansion:other-errors
-                           'margin
-                           (or/c 'margin 'gold))
-  
-  (preferences:set-default 'drracket:show-killed-dialog #t boolean?)
-  
-  
-  (drr:set-default 'drracket:large-letters-font #f (λ (x)
-                                                       (or (and (pair? x)
-                                                                (string? (car x))
-                                                                (let ([i (cdr x)])
-                                                                  (and (integer? i)
-                                                                       (<= 1 i 255))))
-                                                           (not x))))
-  (drr:set-default 'drracket:module-language:auto-text "#lang racket\n" string?)
-
-(let ([drs-handler-recent-items-super%
-       (class (drracket:frame:basics-mixin
-               (frame:standard-menus-mixin
-                frame:basic%))
-         (define/override (edit-menu:between-select-all-and-find menu)
-           (void))
-         (super-new))])
-  (handler:set-recent-items-frame-superclass drs-handler-recent-items-super%))
-
-(cond
-  [(current-eventspace-has-menu-root?)
-   (drracket:frame:create-root-menubar)
-   (preferences:set 'framework:exit-when-no-frames #f)]
-  [else
-   (preferences:set 'framework:exit-when-no-frames #t)]) 
-
-
-(define repl-error-pref 'drracket:read-eval-print-loop:error-color)
-(define repl-out-pref 'drracket:read-eval-print-loop:out-color)
-(define repl-value-pref 'drracket:read-eval-print-loop:value-color)
-(color-prefs:add-color-scheme-entry repl-value-pref
-                                    #:style "text:ports value"
-                                    (make-object color% 0 0 175)
-                                    (make-object color% 57 89 216))
-(color-prefs:add-color-scheme-entry repl-error-pref
-                                    #:style "text:ports err"
-                                    (make-object color% 255 0 0)
-                                    (make-object color% 255 0 0)
-                                    #:italic? #t)
-(color-prefs:add-color-scheme-entry repl-out-pref
-                                    #:style "text:ports out"
-                                    (make-object color% 150 0 150)
-                                    (make-object color% 192 46 214))
-(color-prefs:add-to-preferences-panel 
- (string-constant repl-colors)
- (λ (parent)
-   (color-prefs:build-color-selection-panel parent
-                                            repl-value-pref
-                                            "text:ports value"
-                                            (string-constant repl-value-color))
-   (color-prefs:build-color-selection-panel parent
-                                            repl-error-pref
-                                            "text:ports err"
-                                            (string-constant repl-error-color))
-   (color-prefs:build-color-selection-panel parent
-                                            repl-out-pref
-                                            "text:ports out"
-                                            (string-constant repl-out-color))))
-
-
-(define test-coverage-on-style-pref (string->symbol drracket:debug:test-coverage-on-style-name))
-(define test-coverage-off-style-pref (string->symbol drracket:debug:test-coverage-off-style-name))
-
-(color-prefs:add-color-scheme-entry test-coverage-on-style-pref
-                                    #:style drracket:debug:test-coverage-on-style-name
-                                    "black"
-                                    "white")
-(color-prefs:add-color-scheme-entry test-coverage-off-style-pref
-                                    #:style drracket:debug:test-coverage-off-style-name
-                                    "orange"
-                                    "indianred"
-                                    #:background "black")
-(color-prefs:add-to-preferences-panel 
- "Module Language"
- (λ (parent)
-   (color-prefs:build-color-selection-panel parent
-                                            test-coverage-on-style-pref
-                                            drracket:debug:test-coverage-on-style-name
-                                            (string-constant test-coverage-on))
-   (color-prefs:build-color-selection-panel parent
-                                            test-coverage-off-style-pref
-                                            drracket:debug:test-coverage-off-style-name
-                                            (string-constant test-coverage-off)
-                                            #:background? #t)))
-
-(drracket:module-language:initialize-prefs-panel)
-
-(editor:set-change-font-size-when-monitors-change? #t)
-
-(let* ([find-frame
-        (λ (item)
-          (let loop ([item item])
-            (cond
-              [(is-a? item top-level-window<%>)
-               (and (is-a? item drracket:unit:frame%)
-                    item)]
-              [(is-a? item menu-item<%>)
-               (loop (send item get-parent))]
-              [(is-a? item menu-bar%)
-               (loop (send item get-frame))]
-              [else #f])))]
-       [dc
-        (λ (item)
-          (let ([frame (find-frame item)])
-            (send item enable (and frame (> (length (send frame get-tabs)) 1)))))])
-  (group:add-to-windows-menu
-   (λ (windows-menu)
-     (define shortcut? (not (equal? 'shift (get-default-shortcut-prefix))))
-     (define sprefix (if (eq? (system-type) 'windows)
-                         (cons 'shift (get-default-shortcut-prefix))
-                         (get-default-shortcut-prefix)))
-     (new menu-item%
-          [parent windows-menu]
-          [label (string-constant prev-tab)]
-          [shortcut (and shortcut? #\[)]
-          [shortcut-prefix (if shortcut? sprefix (get-default-shortcut-prefix))]
-          [demand-callback dc]
-          [callback (λ (item _) 
-                      (let ([frame (find-frame item)])
-                        (when frame
-                          (send frame prev-tab))))])
-     (new menu-item% 
-          [parent windows-menu]
-          [label (string-constant next-tab)]
-          [shortcut #\]]
-          [shortcut-prefix sprefix]
-          [demand-callback dc]
-          [callback (λ (item _) 
-                      (let ([frame (find-frame item)])
-                        (when frame
-                          (send frame next-tab))))])
-     
-     (define-values (mprefix use-shortcut?)
-       (case (system-type)
-         [(windows unix)
-          (if (equal? (get-default-shortcut-prefix) (list 'ctl))
-              (values (list* 'alt 'shift (get-default-shortcut-prefix)) #t)
-              (values (get-default-shortcut-prefix) #f))]
-         [(macosx)
-          (values (cons 'option (get-default-shortcut-prefix)) #t)]))
-
-     (new menu-item% 
-          [parent windows-menu]
-          [label (string-constant move-current-tab-right)]
-          [demand-callback dc]
-          [shortcut-prefix mprefix]
-          [shortcut (and use-shortcut? #\])]
-          [callback (λ (item _) 
-                      (let ([frame (find-frame item)])
-                        (when frame
-                          (send frame move-current-tab-right))))])
-     
-     (new menu-item% 
-          [parent windows-menu]
-          [label (string-constant move-current-tab-left)]
-          [demand-callback dc]
-          [shortcut-prefix mprefix]
-          [shortcut (and shortcut? #\[)]
-          [callback (λ (item _) 
-                      (let ([frame (find-frame item)])
-                        (when frame
-                          (send frame move-current-tab-left))))])
-     
-     (define frame (find-frame windows-menu))
-     (when frame
-       (define tab-count (send frame get-tab-count))
-       (unless (eq? (system-type) 'macosx)
-         (new separator-menu-item% [parent windows-menu]))
-       (for ([i (in-range 1 10)])
-         (define sc (integer->char (+ (char->integer #\0) i)))
-         (cond
-           [(or (< tab-count i) (= 1 tab-count))
-            (send (new menu-item% 
-                       [parent windows-menu]
-                       [label (format (string-constant tab-i/no-name) i)]
-                       [shortcut sc]
-                       [callback void])
-                  enable #f)]
-           [(= i 9)
-            (new menu-item% 
-                 [parent windows-menu]
-                 [label (format (string-constant tab-i)
-                                i
-                                (send frame get-tab-filename (- tab-count 1)))]
-                 [shortcut sc]
-                 [callback
-                  (λ (a b)
-                    (send frame change-to-nth-tab (- tab-count 1)))])]
-           [else
-            (new menu-item% 
-                 [parent windows-menu]
-                 [label (format (string-constant tab-i)
-                                i
-                                (send frame get-tab-filename (- i 1)))]
-                 [shortcut sc]
-                 [callback
-                  (λ (a b)
-                    (send frame change-to-nth-tab (- i 1)))])])))
-     (when (eq? (system-type) 'macosx)
-       (new separator-menu-item% [parent windows-menu])))))
-
-;; this needs to happen after all of the earlier preferences setup
-;; so that the color-prefs knowns about all the new colors names
-(color-prefs:register-info-based-color-schemes)
-
-;; Check for any files lost last time.
-;; Ignore the framework's empty frames test, since
-;;   the autosave information window may appear and then
-;;   go away (leaving no frames temporarily) but we are
-;;   not going to be exiting yet.
-(autosave:restore-autosave-files/gui)
-
-;; the initial window doesn't set the 
-;; unit object's state correctly, yet.
-(define (make-basic)
-  (let* ([frame (drracket:unit:open-drscheme-window)]
-         [interactions-edit (send frame get-interactions-text)]
-         [definitions-edit (send frame get-interactions-text)]
-         [filename (send definitions-edit get-filename)])
-    (unless filename
-      (send frame update-shown)
-      (send (send frame get-interactions-canvas) focus))
-    (send frame show #t)))
-
-;; FIXME: get this from racket/list ?
-(define (remove-duplicates files)
-  (let loop ([files files])
-    (cond
-      [(null? files) null]
-      [else (if (member (car files) (cdr files))
-                (loop (cdr files))
-                (cons (car files) (loop (cdr files))))])))
-
-;; Queue a callback here to open the first frame
-;; and install the user's keybindings so that the modules
-;; that are being loaded by drracket are all finished.
-;; This makes sure that drracket exports
-;; are all set up a) in case a user keybinding file uses
-;; them, and b) before we trigger the dynamic 
-;; requires that can happen when the module language looks
-;; at the #lang line (which can end up loading drracket itself
-;; in a bad way leading to errors like this:
-;;   link: reference (phase 0) to a variable in module: ...
-;;   that is uninitialized (phase level 0); 
-;;   reference appears in module: ...)
-
-;; we also do this as a low-priority callback since work above
-;; (specifically the call to editor:set-change-font-size-when-monitors-change?)
-;; may have triggered other low-priority callbacks that we
-;; want to complete before we open up that first DrRacket window.
-
-(queue-callback
- (λ ()
-   
-   ;; install user's keybindings
-   (for-each drracket:frame:add-keybindings-item 
-             (preferences:get 'drracket:user-defined-keybindings))
-   
-   ;; NOTE: drscheme-normal.rkt sets current-command-line-arguments to
-   ;; the list of files to open, after parsing out flags like -h
-   (let* ([files-to-open 
-           (if (preferences:get 'drracket:open-in-tabs)
-               (vector->list (current-command-line-arguments))
-               (reverse (vector->list (current-command-line-arguments))))]
-          [normalized/filtered
-           (let loop ([files files-to-open])
-             (cond
-               [(null? files) null]
-               [else (let ([file (car files)])
-                       (if (file-exists? file)
-                           (cons (normalize-path file) (loop (cdr files)))
-                           (begin
-                             (message-box
-                              (string-constant drscheme)
-                              (format (string-constant cannot-open-because-dne) file))
-                             (loop (cdr files)))))]))]
-          [no-dups (remove-duplicates normalized/filtered)]
-          [frames
-           (map (λ (f) (handler:edit-file
-                        f
-                        (λ () (drracket:unit:open-drscheme-window f))))
-                no-dups)])
-     (when (and (null? (filter (λ (x) x) frames)) 
-                (not file-opened-via-application-file-handler?))
-       (make-basic))
-     (when (and (preferences:get 'drracket:open-in-tabs)
-                (not (null? no-dups)))
-       (handler:edit-file (car no-dups)))))
- #f)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/modes.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/modes.rkt
deleted file mode 100644
index 39a3df96a2..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/modes.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang racket/unit
-(require string-constants
-         racket/class
-         racket/list
-         framework
-         racket/gui/base
-         drracket/private/drsig
-         "local-member-names.rkt")
-
-(import [prefix drracket:module-language: drracket:module-language/int^])
-(export drracket:modes/int^)
-
-(define mode? drracket:modes:mode?)
-(define mode-name drracket:modes:mode-name)
-(define mode-surrogate drracket:modes:mode-surrogate)
-(define mode-repl-submit drracket:modes:mode-repl-submit)
-(define mode-matches-language drracket:modes:mode-matches-language)
-(define mode-intended-to-edit-programs? drracket:modes:mode-intended-to-edit-programs?)
-(define struct:mode struct:drracket:modes:mode)
-
-(define modes (list))
-
-(define (get-modes) modes)
-
-(define (add-mode name surrogate repl-submit matches-language
-                  #:intended-to-edit-programs? [intended-to-edit-programs? #t])
-  (define new-mode
-    (drracket:modes:mode name 
-                         surrogate
-                         repl-submit
-                         matches-language
-                         intended-to-edit-programs?))
-  (for ([old-mode (in-list modes)])
-    (when (equal? (mode-name old-mode) name)
-      (raise-argument-error
-       'drracket:modes:add-mode
-       "name that is not already used by any other mode"
-       0
-       name surrogate repl-submit matches-language)))
-  (set! modes (cons new-mode modes))
-  new-mode)
-
-(define (not-a-language-language? l)
-  (and (not (null? l))
-       (equal? (last l)
-               (string-constant no-language-chosen))))
-
-
-(define (add-initial-modes)
-  
-  ;; must be added first, to make it last in mode list,
-  ;; since predicate matches everything
-  (add-mode 
-   (string-constant scheme-mode)
-   (new racket:text-mode%)
-   (λ (text prompt-position) (racket:text-balanced? text prompt-position))
-   (λ (l) #t))
-  
-  (add-mode 
-   (string-constant racket-mode)
-   (new drracket:module-language:default-surrogate%)
-   (λ (text prompt-position) (racket:text-balanced? text prompt-position))
-   (λ (l) (member (string-constant module-language-name) l)))
-  
-  (add-mode 
-   (string-constant text-mode)
-   #f
-   (λ (text prompt-position) #t)
-   (λ (l) 
-     (and l
-          (or (not-a-language-language? l)
-              (ormap (λ (x) (regexp-match #rx"Algol" x)) l))))
-   #:intended-to-edit-programs? #f))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/module-browser.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/module-browser.rkt
deleted file mode 100644
index 240fc9ccc3..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/module-browser.rkt
+++ /dev/null
@@ -1,259 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base
-         racket/class
-         racket/set
-         racket/contract
-         racket/list
-         syntax/moddep
-         syntax/toplevel
-         framework
-         string-constants
-         mrlib/graph
-         drracket/private/drsig
-         "eval-helpers-and-pref-init.rkt"
-         racket/unit
-         racket/async-channel
-         racket/match
-         setup/private/lib-roots
-         racket/port
-         drracket/private/rectangle-intersect
-         drracket/private/standalone-module-browser)
-
-(provide module-overview@)
-
-(define adding-file (string-constant module-browser-adding-file))
-(define unknown-module-name "? unknown module name")
-
-;; probably, at some point, the module browser should get its
-;; own output ports or something instead of wrapping these ones
-(define original-output-port (current-output-port))
-(define original-error-port (current-error-port))
-
-(define filename-constant (string-constant module-browser-filename-format))
-(define font-size-gauge-label (string-constant module-browser-font-size-gauge-label))
-(define progress-label (string-constant module-browser-progress-label))
-(define laying-out-graph-label (string-constant module-browser-laying-out-graph-label))
-(define open-file-format (string-constant module-browser-open-file-format))
-(define lib-paths-checkbox-constant (string-constant module-browser-show-lib-paths))
-
-(define (set-box/f b v) (when (box? b) (set-box! b v)))
-
-(define-unit module-overview@
-  (import [prefix drracket:frame: drracket:frame^]
-          [prefix drracket:eval: drracket:eval^]
-          [prefix drracket:language-configuration: drracket:language-configuration/internal^]
-          [prefix drracket:language: drracket:language^])
-  (export (rename drracket:module-overview^ 
-                  [_module-overview/file module-overview/file]
-                  [_make-module-overview-pasteboard make-module-overview-pasteboard]))
-  
-  (define (module-overview parent)
-    (let ([filename (get-file #f parent)])
-      (when filename
-        (module-overview/file filename parent fill-pasteboard
-                              overview-frame% canvas:basic% pasteboard:basic%))))
-  
-
-  (define (_module-overview/file filename parent) 
-    (module-overview/file filename parent fill-pasteboard
-                          overview-frame% canvas:basic% pasteboard:basic%))
-  (define (_make-module-overview-pasteboard vertical? mouse-currently-over)
-    (make-module-overview-pasteboard vertical? mouse-currently-over
-                                     pasteboard:basic%
-                                     #:on-boxed-word-double-click
-                                     (λ (fn)
-                                       (when fn
-                                         (handler:edit-file fn)))))
-  
-  ;                                                                
-  ;                                                                
-  ;                                                                
-  ;    ;;;                                      ;;;;   ;     ;  ;  
-  ;   ;                                        ;    ;  ;     ;  ;  
-  ;   ;                                       ;        ;     ;  ;  
-  ;  ;;;;  ; ;  ;;;    ; ;;  ;;     ;;;       ;        ;     ;  ;  
-  ;   ;    ;;  ;   ;   ;;  ;;  ;   ;   ;      ;        ;     ;  ;  
-  ;   ;    ;       ;   ;   ;   ;  ;    ;      ;        ;     ;  ;  
-  ;   ;    ;    ;;;;   ;   ;   ;  ;;;;;;      ;     ;  ;     ;  ;  
-  ;   ;    ;   ;   ;   ;   ;   ;  ;           ;     ;  ;     ;  ;  
-  ;   ;    ;   ;   ;   ;   ;   ;   ;           ;    ;  ;     ;  ;  
-  ;   ;    ;    ;;;;;  ;   ;   ;    ;;;;        ;;;;;   ;;;;;   ;  
-  ;                                                                
-  ;                                                                
-  ;                                                                
-  
-  
-  (define (fill-pasteboard pasteboard filename-or-text/pos show-status send-user-thread/eventspace)
-    
-    (define text/pos 
-      (if (drracket:language:text/pos? filename-or-text/pos)
-          filename-or-text/pos
-          (let ([t (make-object text:basic%)])
-            (send t load-file filename-or-text/pos)
-            (drracket:language:text/pos
-             t
-             0
-             (send t last-position)))))
-    
-    (define progress-channel (make-async-channel))
-    (define connection-channel (make-async-channel))
-    
-    (define-values/invoke-unit process-program-unit
-      (import process-program-import^)
-      (export process-program-export^))
-    
-    ;; =user thread=
-    (define (iter sexp continue)
-      (cond
-        [(eof-object? sexp) 
-         (custodian-shutdown-all user-custodian)]
-        [else
-         (add-connections sexp)
-         (continue)]))
-    (define init-complete (make-semaphore 0))
-    
-    (define user-custodian #f)
-    (define user-thread #f)
-    (define error-str #f)
-    
-    (define init-dir
-      (let* ([bx (box #f)]
-             [filename (send (drracket:language:text/pos-text text/pos) get-filename bx)])
-        (get-init-dir 
-         (and (not (unbox bx)) filename))))
-    
-    (define (init)
-      (set! user-custodian (current-custodian))
-      (set! user-thread (current-thread))
-      (moddep-current-open-input-file
-       (λ (filename)
-         (let* ([p (open-input-file filename)]
-                [wxme? (regexp-match-peek #rx#"^WXME" p)])
-           (if wxme?
-               (let ([t (new text%)])
-                 (close-input-port p)
-                 (send t load-file filename)
-                 (let ([prt (open-input-text-editor t)])
-                   (port-count-lines! prt)
-                   prt))
-               p))))
-      (current-output-port (swallow-specials original-output-port))
-      (current-error-port (swallow-specials original-error-port))
-      (current-load-relative-directory #f)
-      (current-directory init-dir)
-      (error-display-handler (λ (str exn) 
-                               (set! error-str str)
-                               (when (exn? exn)
-                                 (set! error-str
-                                       (apply
-                                        string-append
-                                        error-str
-                                        (for/list ([x (in-list (continuation-mark-set->context 
-                                                                (exn-continuation-marks exn)))])
-                                          (format "\n  ~s" x)))))))
-      
-      ;; instead of escaping when there's an error on the user thread,
-      ;; we just shut it all down. This kills the event handling loop
-      ;; for the eventspace and wakes up the thread below
-      ;; NOTE: we cannot set this directly in `init' since the call to `init'
-      ;; is wrapped in a parameterize of the error-escape-handler
-      (queue-callback
-       (λ ()
-         (error-escape-handler
-          (λ () (custodian-shutdown-all user-custodian)))
-         (semaphore-post init-complete))))
-    
-    (define (swallow-specials port)
-      (define-values (in out) (make-pipe-with-specials))
-      (thread
-       (λ ()
-         (let loop ()
-           (define c (read-char-or-special in))
-           (cond
-             [(char? c)
-              (display c out)
-              (loop)]
-             [(eof-object? c)
-              (close-output-port out)
-              (close-input-port in)]
-             [else
-              (loop)]))))
-      out)
-    
-    (define (kill-termination) (void))
-    (define complete-program? #t)
-
-    ((drracket:eval:traverse-program/multiple
-      (preferences:get (drracket:language-configuration:get-settings-preferences-symbol))
-      init
-      kill-termination)
-     text/pos
-     iter
-     complete-program?)
-    
-    (semaphore-wait init-complete)
-    (send-user-thread/eventspace user-thread user-custodian)
-    
-    ;; this thread puts a "cap" on the end of the connection-channel
-    ;; so that we know when we've gotten to the end.
-    ;; this ensures that we can completely flush out the
-    ;; connection-channel.
-    (thread
-     (λ ()
-       (sync (thread-dead-evt user-thread))
-       (async-channel-put connection-channel 'done)))
-    
-    (send pasteboard begin-adding-connections)
-    (let ([evt
-           (choice-evt
-            (handle-evt progress-channel (λ (x) (cons 'progress x)))
-            (handle-evt connection-channel (λ (x) (cons 'connect x))))])
-      (let loop ()
-        (let* ([evt-value (yield evt)]
-               [key (car evt-value)]
-               [val (cdr evt-value)])
-          (case key
-            [(progress) 
-             (show-status val)
-             (loop)]
-            [(connect)
-             (unless (eq? val 'done)
-               (let ([name-original (list-ref val 0)]
-                     [name-require (list-ref val 1)]
-                     [path-key (list-ref val 2)]
-                     [require-depth (list-ref val 3)])
-                 (send pasteboard add-connection name-original name-require path-key require-depth))
-               (loop))]))))
-    (send pasteboard end-adding-connections)
-    
-    (custodian-shutdown-all user-custodian)
-    
-    (cond
-      [error-str
-       (message-box 
-        (string-constant module-browser)
-        (format (string-constant module-browser-error-expanding)
-                error-str))
-       #f]
-      [else
-       #t]))
-  
-  (define overview-frame%
-    (class (drracket:frame:basics-mixin
-            frame:standard-menus%)
-      (define/override (edit-menu:between-select-all-and-find menu) (void))
-      (define/override (edit-menu:between-redo-and-cut menu) (void))
-      (define/override (edit-menu:between-find-and-preferences menu) (void))
-      
-      (define/override (edit-menu:create-cut?) #f)
-      (define/override (edit-menu:create-copy?) #f)
-      (define/override (edit-menu:create-paste?) #f)
-      (define/override (edit-menu:create-clear?) #f)
-      (define/override (edit-menu:create-select-all?) #f)
-      
-      (define/override (on-size w h)
-        (preferences:set 'drracket:module-overview:window-width w)
-        (preferences:set 'drracket:module-overview:window-height h)
-        (super on-size w h))
-      (super-new))))
\ No newline at end of file
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/module-language-tools.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/module-language-tools.rkt
deleted file mode 100644
index 7c861199d7..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/module-language-tools.rkt
+++ /dev/null
@@ -1,435 +0,0 @@
-#lang racket/base
-(provide module-language-tools@)
-(require mrlib/switchable-button 
-         mrlib/bitmap-label
-         racket/contract
-         racket/place
-         framework
-         racket/unit
-         racket/class
-         racket/gui/base
-         drracket/private/drsig
-         "local-member-names.rkt"
-         framework/private/logging-timer)
-
-(define op (current-output-port))
-(define (oprintf . args) (apply fprintf op args))
-
-(define-unit module-language-tools@
-  (import [prefix drracket:unit: drracket:unit^]
-          [prefix drracket:module-language: drracket:module-language/int^]
-          [prefix drracket:language: drracket:language^]
-          [prefix drracket:language-configuration: drracket:language-configuration^]
-          [prefix drracket: drracket:interface^])
-  (export drracket:module-language-tools/int^)
-
-  (define-struct opt-out-toolbar-button (make-button id number) #:transparent)
-  (define opt-out-toolbar-buttons '())
-  
-  (define (add-opt-out-toolbar-button make-button id #:number [number #f]) 
-    (set! opt-out-toolbar-buttons
-          (cons (make-opt-out-toolbar-button make-button id number)
-                opt-out-toolbar-buttons)))
-    
-  (define-local-member-name
-    set-lang-toolbar-buttons
-    get-lang-toolbar-buttons
-    get-online-expansion-monitor-pcs
-    with-language-specific-default-extensions-and-filters)
-    
-  (define tab-mixin
-    (mixin (drracket:unit:tab<%>) (drracket:module-language-tools:tab<%>)
-      (inherit get-frame)
-      (define toolbar-buttons '())
-      (define/public (get-lang-toolbar-buttons) toolbar-buttons)
-      (define/public (set-lang-toolbar-buttons bs ns)
-        (for-each
-         (λ (old-button) (send (get-frame) remove-toolbar-button old-button))
-         toolbar-buttons)
-        (set! toolbar-buttons bs)
-        (send (get-frame) register-toolbar-buttons toolbar-buttons #:numbers ns)
-        (send (get-frame) when-initialized
-              (λ ()
-                (send (send (get-frame) get-toolbar-button-panel) change-children
-                      (λ (l) toolbar-buttons))))
-        (send (get-frame) sort-toolbar-buttons-panel))
-      (super-new)))
-  
-  (define frame-mixin
-    (mixin (drracket:unit:frame<%>) (drracket:module-language-tools:frame<%>)
-      (inherit unregister-toolbar-button 
-               get-definitions-text
-               sort-toolbar-buttons-panel)
-      
-      (define toolbar-button-panel #f)
-      (define/public (when-initialized thunk) 
-        (cond
-          [toolbar-button-panel
-           (thunk)]
-          [else
-           (set! after-initialized 
-                 (let ([old-after-initialized after-initialized])
-                   (λ () 
-                     (old-after-initialized) 
-                     (thunk))))]))
-      (define after-initialized void)
-      (define/public (get-toolbar-button-panel) toolbar-button-panel)
-      (define/public (remove-toolbar-button button)
-        (send toolbar-button-panel change-children (λ (l) (remq button l)))
-        (unregister-toolbar-button button)
-        (sort-toolbar-buttons-panel))
-      (define/augment (on-tab-change old-tab new-tab)
-        (inner (void) on-tab-change old-tab new-tab)
-        (when toolbar-button-panel
-          (send toolbar-button-panel change-children
-                (λ (l) (send new-tab get-lang-toolbar-buttons)))
-          (sort-toolbar-buttons-panel)))
-      
-      (define/override (file-menu:open-callback menu evt)
-        (send (get-definitions-text) with-language-specific-default-extensions-and-filters
-              (λ ()
-                (super file-menu:open-callback menu evt))))
-      
-      (super-new)
-      (inherit get-button-panel)
-      (set! toolbar-button-panel (new panel:horizontal-discrete-sizes% 
-                                      [parent (get-button-panel)]
-                                      [alignment '(right center)]
-                                      [stretchable-width #t]))
-      (after-initialized)
-      (set! after-initialized void)
-      
-      (define/public (initialize-module-language)
-        (let ([defs (get-definitions-text)])
-          (when (send defs get-in-module-language?)
-            (send defs move-to-new-language))))))
-  
-  (define-logger drracket-language)
-  
-  (define definitions-text-mixin
-    (mixin (text:basic<%> 
-            drracket:unit:definitions-text<%>
-            drracket:module-language:big-defs/ints-label<%>)
-           (drracket:module-language-tools:definitions-text<%>)
-      (inherit get-next-settings
-               get-filename
-               set-lang-wants-big-defs/ints-labels?
-               get-tab)
-      (define in-module-language? #f)      ;; true when we are in the module language
-      (define hash-lang-last-location #f)  ;; non-false when we know where the hash-lang line ended
-      (define hash-lang-language #f)       ;; non-false is the string that was parsed for the language
-      (define/public (get-in-module-language?) in-module-language?)
-      (define/augment (after-insert start len)
-        (inner (void) after-insert start len)
-        (modification-at start))
-      (define/augment (after-delete start len)
-        (inner (void) after-delete start len)
-        (modification-at start))
-      
-      (define last-filename #f)
-      (define/augment (after-save-file success?)
-        (inner (void) after-save-file success?)
-        (define this-filename (get-filename))
-        (unless (equal? last-filename this-filename)
-          (set! last-filename this-filename)
-          (modification-at #f)))
-      
-      (define timer #f)
-      
-      ;; modification-at : (or/c #f number) -> void
-      ;; checks to see if the lang line has changed when start
-      ;; is in the region of the lang line, or when start is #f, or
-      ;; when there is no #lang line known.
-      (define/private (modification-at start)
-        (send (send (get-tab) get-frame) when-initialized
-              (λ ()
-                (when in-module-language?
-                  (when (or (not start)
-                            (not hash-lang-last-location)
-                            (<= start hash-lang-last-location))
-                    
-                    (unless timer
-                      (set! timer (new logging-timer% 
-                                       [notify-callback
-                                        (λ () 
-                                          (when in-module-language?
-                                            (move-to-new-language)))]
-                                       [just-once? #t])))
-                    (send timer stop)
-                    (send timer start 200 #t))))))
-
-      (define/private (update-in-module-language? new-one)
-        (unless (equal? new-one in-module-language?)
-          (set! in-module-language? new-one)
-          (cond
-            [in-module-language? 
-             (move-to-new-language)]
-            [else
-             (set! hash-lang-language #f)
-             (set! hash-lang-last-location #f)
-             (clear-things-out)])))
-      
-      (define/public (move-to-new-language)
-        (define port (open-input-text-editor this))
-        
-        (define (fallback)
-          ;; fall back to whatever #lang racket does if
-          ;; we don't have a #lang line present in the file
-          (log-drracket-language-debug "falling back to using #lang racket's read-language for ~a"
-                                       (or (send this get-filename) "<<unsaved file>>"))
-          (vector (read-language (open-input-string "#lang racket"))))
-        
-        ;; info-result : 
-        ;;  (or/c #f   [#lang without a known language]
-        ;;        (vector <get-info-proc>) 
-        ;;                [no #lang line, so we use the '#lang racket' info proc]
-        ;;        <get-info-proc>) [the get-info proc for the program in the definitions]
-        (define info-result 
-          (with-handlers ([exn:fail? 
-                           (λ (x)
-                             (log-drracket-language-debug
-                              (format
-                               "DrRacket: error duing call to read-language for ~a:\n  ~a"
-                               (or (send this get-filename) "<<unsaved file>>")
-                               (regexp-replace* #rx"\n(.)" (exn-message x) "\n\\1  ")))
-                             #f)])
-            (or (read-language port fallback)
-                (fallback))))
-        
-        ; sometimes I get eof here, but I don't know why and can't seem to 
-        ;; make it happen outside of DrRacket
-        (when (eof-object? info-result)
-          (eprintf "file ~s produces eof from read-language\n"
-                   (send this get-filename))
-          (eprintf "  port-next-location ~s\n"
-                   (call-with-values (λ () (port-next-location port)) list))
-          (eprintf "  str ~s\n"
-                   (let ([s (send this get-text)])
-                     (substring s 0 (min 100 (string-length s)))))
-          (set! info-result #f))
-        (define-values (line col pos) (port-next-location port))
-        (unless (equal? (get-text 0 pos) hash-lang-language)
-          (set! hash-lang-language (get-text 0 pos))
-          (set! hash-lang-last-location pos)
-          (clear-things-out)
-          (define info-proc 
-            (if (vector? info-result)
-                (vector-ref info-result 0)
-                info-result))
-          (define (ctc-on-info-proc-result ctc res)
-            (contract ctc 
-                      res
-                      (if (vector? info-result)
-                          'hash-lang-racket
-                          (get-lang-name pos))
-                      'drracket/private/module-language-tools))
-          
-          (define lang-wants-big-defs/ints-labels?
-            (and info-proc (info-proc 'drracket:show-big-defs/ints-labels #f)))
-          (set-lang-wants-big-defs/ints-labels? lang-wants-big-defs/ints-labels?)
-          (send (send (get-tab) get-ints) set-lang-wants-big-defs/ints-labels?
-                lang-wants-big-defs/ints-labels?)
-          
-          (set! extra-default-filters
-                (if info-result
-                    (or (ctc-on-info-proc-result
-                         (or/c #f (listof (list/c string? string?)))
-                         (info-proc 'drracket:default-filters #f))
-                        '())
-                    '()))
-          
-          (set! default-extension
-                (if info-result
-                    (or (ctc-on-info-proc-result
-                         (or/c #f (and/c string? (not/c #rx"[.]")))
-                         (info-proc 'drracket:default-extension #f))
-                        "")
-                    ""))
-          
-          (when info-result
-            (register-new-buttons
-             (ctc-on-info-proc-result 
-              (or/c #f (listof (or/c (list/c string?
-                                             (is-a?/c bitmap%)
-                                             (-> (is-a?/c drracket:unit:frame<%>) any))
-                                     (list/c string?
-                                             (is-a?/c bitmap%)
-                                             (-> (is-a?/c drracket:unit:frame<%>) any)
-                                             (or/c real? #f)))))
-              (or (info-proc 'drracket:toolbar-buttons #f)
-                  (info-proc 'drscheme:toolbar-buttons #f)))
-             (ctc-on-info-proc-result 
-              (or/c #f (listof symbol?))
-              (or (info-proc 'drracket:opt-out-toolbar-buttons '())
-                  (info-proc 'drscheme:opt-out-toolbar-buttons '())))))))
-      
-      
-      (define/private (register-new-buttons buttons opt-out-ids)
-        ;; cleaned-up-buttons : (listof (list/c string?
-        ;;                                      (is-a?/c bitmap%) 
-        ;;                                      (-> (is-a?/c drracket:unit:frame<%>) any) 
-        ;;                                      (or/c real? #f)))
-        (define cleaned-up-buttons
-          (cond
-            [(not buttons) '()]
-            [else
-             (for/list ([button (in-list buttons)])
-               (if (= 3 (length button))
-                   (append button (list #f))
-                   button))]))
-        (define tab (get-tab))
-        (define frame (send tab get-frame))
-        (send frame when-initialized
-              (λ ()
-                (send frame begin-container-sequence)
-                
-                ;; avoid any time with both sets of buttons in the
-                ;; panel so the window doesn't get too wide
-                (send (send frame get-toolbar-button-panel) change-children (λ (prev) '()))
-                
-                (define directly-specified-buttons
-                  (map (λ (button-spec)
-                         (new switchable-button%
-                              [label (list-ref button-spec 0)]
-                              [bitmap (list-ref button-spec 1)]
-                              [parent (send frame get-toolbar-button-panel)]
-                              [callback
-                               (lambda (button)
-                                 ((list-ref button-spec 2) frame))]))
-                       cleaned-up-buttons))
-                (define directly-specified-button-numbers 
-                  (map (λ (button-spec) (list-ref button-spec 3)) 
-                       cleaned-up-buttons))
-                (define opt-out-buttons+numbers
-                  (cond
-                    [(eq? opt-out-ids #f) '()]
-                    [else
-                     (for/list ([opt-out-toolbar-button (in-list opt-out-toolbar-buttons)]
-                                #:unless (member 
-                                          (opt-out-toolbar-button-id opt-out-toolbar-button) 
-                                          opt-out-ids))
-                       (list ((opt-out-toolbar-button-make-button opt-out-toolbar-button) 
-                              frame
-                              (send frame get-toolbar-button-panel))
-                             (opt-out-toolbar-button-number opt-out-toolbar-button)))]))
-                (send tab set-lang-toolbar-buttons
-                      (append directly-specified-buttons
-                              (map (λ (x) (list-ref x 0)) opt-out-buttons+numbers))
-                      (append directly-specified-button-numbers
-                              (map (λ (x) (list-ref x 1)) opt-out-buttons+numbers)))
-                (send frame end-container-sequence))))
-      
-      (inherit get-text)
-      (define/private (get-lang-name pos)
-        (cond
-          [(zero? pos) '<<unknown>>]
-          [else
-           (let ([str (get-text 0 pos)])
-             (if (char-whitespace? (string-ref str (- (string-length str) 1)))
-                 (substring str 0 (- (string-length str) 1))
-                 str))]))
-
-      ;; removes language-specific customizations
-      (define/private (clear-things-out)
-        (send (get-tab) set-lang-toolbar-buttons '() '()))
-      
-      
-      ;; online-expansion-monitor-table : hash[(cons mod-path id) -o> (cons/c local-pc remote-pc)]
-      (define online-expansion-monitor-table (make-hash))
-      (define/public (get-online-expansion-monitor-pcs an-online-expansion-handler)
-        (define key (cons (online-expansion-handler-mod-path an-online-expansion-handler)
-                          (online-expansion-handler-id an-online-expansion-handler)))
-        (define old (hash-ref online-expansion-monitor-table key #f))
-        (cond
-          [old
-           (values (car old) (cdr old))]
-          [else
-           (define-values (local-pc remote-pc) (place-channel))
-           (hash-set! key (cons local-pc remote-pc))
-           (values local-pc remote-pc)]))
-      
-      (define/augment (after-set-next-settings settings)
-        (update-in-module-language?
-         (is-a? (drracket:language-configuration:language-settings-language settings)
-                drracket:module-language:module-language<%>))
-        (inner (void) after-set-next-settings settings))
-      
-      (define/override (put-file dir default-name)
-        (with-language-specific-default-extensions-and-filters
-         (λ ()
-           (super put-file dir default-name))))
-      (define/override (get-file dir)
-        (with-language-specific-default-extensions-and-filters
-         (λ ()
-           (super get-file dir))))
-      
-      (define extra-default-filters '())
-      (define default-extension "")
-      (define/public (with-language-specific-default-extensions-and-filters t)
-        (parameterize ([finder:default-extension default-extension]
-                       [finder:default-filters 
-                        (append extra-default-filters (finder:default-filters))])
-          (t)))
-        
-      
-      (super-new)
-      (set! in-module-language? 
-            (is-a? (drracket:language-configuration:language-settings-language (get-next-settings))
-                   drracket:module-language:module-language<%>))))
-  
-  
-  (define no-more-online-expansion-handlers? #f)
-  (define (no-more-online-expansion-handlers) (set! no-more-online-expansion-handlers? #t))
-  (define-values (done done?)
-    (let ()
-      (struct done ())
-      (values (done) done?)))
-  (define-values (start start?)
-    (let ()
-      (struct start ())
-      (values (start) start?)))
-  ;; mod-path : module-path?
-  ;; id : symbol?
-  ;; local-handler : ... -> ...
-  (struct online-expansion-handler (mod-path id local-handler monitor?))
-  (define online-expansion-handlers '())
-  (define (get-online-expansion-handlers)
-    (cond
-      [no-more-online-expansion-handlers?
-       online-expansion-handlers]
-      [else
-       (error 'get-online-expansion-handlers 
-              "online-expansion-handlers can still be registered")]))
-  (define (add-online-expansion-handler mod-path id local-handler)
-    (check-bad-registration 'add-online-expansion-handler mod-path id local-handler)
-    (set! online-expansion-handlers
-          (cons (online-expansion-handler mod-path id local-handler #f)
-                online-expansion-handlers)))
-  
-  (define (add-online-expansion-monitor mod-path id local-handler)
-    (check-bad-registration 'add-online-expansion-monitor mod-path id local-handler)
-    (set! online-expansion-handlers
-          (cons (online-expansion-handler mod-path id local-handler #t)
-                online-expansion-handlers)))
-      
-  (define (check-bad-registration who mod-path id local-handler)
-    (when no-more-online-expansion-handlers?
-      (error who 
-             "no more online-expansion-handlers can be registered; got ~e ~e ~e"
-             mod-path id local-handler))
-    (for ([handler (in-list online-expansion-handlers)])
-      (when (and (equal? (online-expansion-handler-mod-path handler) mod-path)
-                 (equal? (online-expansion-handler-id handler) id))
-        (error who
-               (string-append
-                "already registered a handler with the same mod-path and id\n"
-                " mod-path: ~e\n"
-                " id: ~e")
-               mod-path
-               id))))
-  
-  (define online-expansion-pref-funcs '())
-  (define (get-online-expansion-pref-funcs) online-expansion-pref-funcs)
-    (define online-expansion-prefs '())
-  (define (register-online-expansion-pref func)
-    (set! online-expansion-pref-funcs (cons func online-expansion-pref-funcs))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/module-language.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/module-language.rkt
deleted file mode 100644
index 876b7d8250..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/module-language.rkt
+++ /dev/null
@@ -1,2742 +0,0 @@
-#lang racket/base
-
-(provide module-language@)
-(require racket/unit
-         racket/class
-         racket/list
-         racket/contract
-         racket/sandbox
-         racket/runtime-path
-         racket/math
-         racket/match
-         racket/set
-         racket/place
-         racket/gui/base
-         compiler/embed
-         compiler/cm
-         launcher
-         framework
-         string-constants
-         racket/place
-         mrlib/close-icon
-         mrlib/name-message
-         "tooltip.rkt"
-         drracket/private/drsig
-         "rep.rkt"
-         "eval-helpers-and-pref-init.rkt"
-         "local-member-names.rkt"
-         drracket/private/rectangle-intersect
-         pkg/lib
-         pkg/gui
-         framework/private/logging-timer
-         (submod "frame.rkt" install-pkg))
-
-(struct exn-info (str src-vecs exn-stack missing-mods) #:prefab)
-
-;; submodule to make these accessible to the test suite
-(module oc-status-structs racket/base
-  ;; the online compilation state for individual tabs
-  ;; oc-state is either:
-  ;;   (clean (or/c symbol? #f)
-  ;;          (or/c (non-empty-listof 
-  ;;                 (exn-info string? 
-  ;;                           (listof (vector number? number?))
-  ;;                           (listof string?)
-  ;;                           (or/c #f module-path?)))
-  ;;                #f))
-  ;;   (dirty boolean?)
-  ;;   (running symbol? string?)
-  (struct clean (error-type error-messages+locs) #:transparent)
-  (struct dirty (timer-pending?) #:transparent)
-  (struct running (sym str) #:transparent)
-  
-  (provide (struct-out clean)
-           (struct-out dirty)
-           (struct-out running)))
-
-(require (submod "." oc-status-structs))
-
-#|
-;; this code tracks which lines have been executed 
-;; for use while (manually) testing the oc state machine
-(require (for-syntax racket/base) racket/set)
-(define candidate-lines (set))
-(define touched-lines (set))
-(define-syntax (line-of-interest stx)
-  (with-syntax ([line (syntax-line stx)])
-    (syntax-local-lift-expression #'(set! candidate-lines (set-add candidate-lines line)))
-    #'(visited line)))
-(define (visited line)
-  (unless (set-member? touched-lines line)
-    (set! touched-lines (set-add touched-lines line))
-    (printf "~s\n" (sort (set->list (set-subtract candidate-lines touched-lines)) >))))
-|#
-(define-syntax-rule (line-of-interest) (void))
-
-(define-runtime-path expanding-place.rkt "expanding-place.rkt")
-
-(define sc-online-expansion-running (string-constant online-expansion-running))
-(define sc-only-raw-text-files-supported 
-  (string-constant online-expansion-only-raw-text-files-supported))
-(define sc-abnormal-termination (string-constant online-expansion-abnormal-termination))
-(define sc-abnormal-termination-out-of-memory 
-  (string-constant online-expansion-abnormal-termination-out-of-memory))
-(define sc-jump-to-error (string-constant jump-to-error))
-(define sc-finished-successfully (string-constant online-expansion-finished-successfully))
-
-(define op (current-output-port))
-(define (oprintf . args) (apply fprintf op args))
-
-(define-unit module-language@
-  (import [prefix drracket:language-configuration: drracket:language-configuration/internal^]
-          [prefix drracket:language: drracket:language/int^]
-          [prefix drracket:unit: drracket:unit^]
-          [prefix drracket:rep: drracket:rep^]
-          [prefix drracket:init: drracket:init^]
-          [prefix drracket:module-language-tools: drracket:module-language-tools/int^]
-          [prefix drracket:modes: drracket:modes^]
-          [prefix drracket: drracket:interface^])
-  (export drracket:module-language/int^)
-  
-  (define module-language<%>
-    (interface ()
-      get-users-language-name
-      get-language-info))
-  
-  ;; add-module-language : -> void
-  ;; adds the special module-only language to drracket
-  (define (add-module-language)
-    (define module-language%
-      (module-mixin
-       ((drracket:language:get-default-mixin)
-        (drracket:language:module-based-language->language-mixin
-         (drracket:language:simple-module-based-language->module-based-language-mixin
-          drracket:language:simple-module-based-language%)))))
-    (drracket:language-configuration:add-language
-     (new module-language%)
-     #:allow-executable-creation? #t))
-  
-  ;; collection-paths : (listof (union 'default string))
-  ;; command-line-args : (vectorof string)
-  ;; auto-text : string
-  (define-struct (module-language-settings drracket:language:simple-settings)
-    (collection-paths command-line-args auto-text compilation-on? full-trace? submodules-to-run
-                      enforce-module-constants))
-  
-  (define (module-language-settings->prefab-module-settings settings)
-    (prefab-module-settings (module-language-settings-command-line-args settings)
-                            (module-language-settings-collection-paths settings)
-                            (module-language-settings-compilation-on? settings)
-                            (module-language-settings-full-trace? settings)
-                            (drracket:language:simple-settings-annotations settings)
-                            (module-language-settings-enforce-module-constants settings)))
-  
-  (define default-compilation-on? #t)
-  (define default-full-trace? #t)
-  (define default-submodules-to-run (list '(test) '(main)))
-  (define default-enforce-module-constants #t)
-  (define (get-default-auto-text) (preferences:get 'drracket:module-language:auto-text))
-  
-  
-  ;; module-mixin : (implements drracket:language:language<%>)
-  ;;             -> (implements drracket:language:language<%>)
-  (define (module-mixin %)
-    (class* % (drracket:language:language<%> module-language<%>)
-      
-      (define language-info #f) ;; a result from module-compiled-language-info
-      (define sandbox #f)       ;; a sandbox for querying the language-info
-      (define/public (get-language-info key default)
-        (init-sandbox)
-        (cond
-          [(and language-info sandbox)
-           (let ([mp (vector-ref language-info 0)]
-                 [name (vector-ref language-info 1)]
-                 [val (vector-ref language-info 2)])
-             (call-in-sandbox-context
-              sandbox
-              (λ ()
-                (parameterize ([current-security-guard drracket:init:system-security-guard])
-                  (((dynamic-require mp name) val) key default)))))]
-          [else default]))
-      (define/private (init-sandbox)
-        (unless sandbox
-          (when language-info
-            ;; creating a sanbox can fail in strange ways so we just
-            ;; swallow the failures so as to not wreck DrRacket
-            (with-handlers ((exn:fail? (λ (x) 
-                                         (log-error "DrRacket:module-language:sandbox exn: ~a" 
-                                                    (exn-message x))
-                                         (for ([x (in-list (continuation-mark-set->context
-                                                            (exn-continuation-marks x)))])
-                                           (log-error (format "  ~s" x))))))
-              (set! sandbox (make-evaluator 'racket/base))))))
-      
-      (define/override (first-opened settings)
-        (define ns (with-handlers ([exn:fail? 
-                                    (λ (x) 
-                                      (log-error 
-                                       "DrRacket:module-language.rkt:first-opened exn: ~a" 
-                                       (exn-message x))
-                                      (for ([x (in-list (continuation-mark-set->context
-                                                         (exn-continuation-marks x)))])
-                                        (log-error (format "  ~s" x)))
-                                      #f)])
-                     ;; get-ns can fail in all kinds of strange ways;
-                     ;; just give up if it does, since an error here
-                     ;; means drracket won't start up.
-                     (get-ns (get-auto-text settings))))
-        (when ns (current-namespace ns)))
-      
-      (define/private (get-ns str)
-        (define ev (parameterize ([sandbox-path-permissions (list (list 'exists #rx#""))])
-                     (make-evaluator 'racket/base)))
-        (ev `(current-inspector ,(current-inspector)))
-        (ev `(parameterize ([read-accept-reader #t])
-               (define stx (read-syntax "here" (open-input-string ,str)))
-               (define modname
-                 (syntax-case stx ()
-                   [(module name . stuff)
-                    `',(syntax->datum #'name)]
-                   [_ #f]))
-               (and modname
-                    (eval stx)
-                    (namespace-require modname)
-                    (module->namespace modname)))))
-      
-      (inherit get-language-name)
-      (define/public (get-users-language-name defs-text)
-        (define defs-port (open-input-text-editor defs-text))
-        (port-count-lines! defs-port)
-        (define read-successfully?
-          (with-handlers ((exn:fail? (λ (x) #f)))
-            (read-language defs-port (λ () #f))
-            #t))
-        (cond
-          [read-successfully?
-           (define-values (_line _col port-pos) (port-next-location defs-port))
-           (define str (send defs-text get-text 0 (- port-pos 1)))
-           (define pos (regexp-match-positions #rx"#(?:!|lang )" str))
-           (cond
-             [(not pos)
-              (get-language-name)]
-             [else
-              ;; newlines can break things (ie the language text won't 
-              ;; be in the right place in the interactions window, which
-              ;; at least makes the test suites unhappy), so get rid of 
-              ;; them from the name. Otherwise, if there is some weird formatting,
-              ;; so be it.
-              (regexp-replace* #rx"[\r\n]+"
-                               (substring str (cdr (car pos)) (string-length str))
-                               " ")])]
-          [else
-           (get-language-name)]))
-                
-      (define/override (use-namespace-require/copy?) #f)
-      
-      (define/augment (capability-value key)
-        (cond
-          [(eq? key 'drscheme:autocomplete-words)
-           (drracket:language-configuration:get-all-manual-keywords)]
-          [else (drracket:language:get-capability-default key)]))
-      
-      ;; config-panel : as in super class
-      ;; uses drracket:language:simple-module-based-language-config-panel
-      ;; and adds a collection paths configuration to it.
-      (define/override (config-panel parent)
-        (module-language-config-panel parent))
-      
-      ;; NOTE: this method is also used in the super class's implementation
-      ;; of default-settings?, which is why the super call is appropriate
-      ;; there, even tho these settings are not the same as the defaults
-      ;; in other languages (here 'none is the default annotations,
-      ;; there you get errortrace annotations).
-      (define/override (default-settings)
-        (let ([super-defaults (super default-settings)])
-          (make-module-language-settings
-           #t 'print 'mixed-fraction-e #f #t 'debug;; simple settings defaults 
-           
-           '(default)
-           #()
-           (get-default-auto-text)
-           default-compilation-on?
-           default-full-trace?
-           default-submodules-to-run
-           default-enforce-module-constants)))
-      
-      ;; default-settings? : -> boolean
-      (define/override (default-settings? settings)
-        
-        (and (super default-settings? settings)
-             
-             (equal? (module-language-settings-collection-paths settings)
-                     '(default))
-             (equal? (module-language-settings-command-line-args settings)
-                     #())
-             ;; Never show that this is a "custom" language because of the
-             ;; auto-text
-             ;; (equal? (module-language-settings-auto-text settings)
-             ;;         default-auto-text)
-             (equal? (module-language-settings-compilation-on? settings)
-                     default-compilation-on?)
-             (equal? (module-language-settings-full-trace? settings)
-                     default-full-trace?)
-             (equal? (module-language-settings-submodules-to-run settings)
-                     default-submodules-to-run)
-             (equal? (module-language-settings-enforce-module-constants settings)
-                     default-enforce-module-constants)))
-      
-      (define/override (marshall-settings settings)
-        (let ([super-marshalled (super marshall-settings settings)])
-          (list super-marshalled
-                (module-language-settings-collection-paths settings)
-                (module-language-settings-command-line-args settings)
-                (module-language-settings-auto-text settings)
-                (module-language-settings-compilation-on? settings)
-                (module-language-settings-full-trace? settings)
-                (module-language-settings-submodules-to-run settings)
-                (module-language-settings-enforce-module-constants settings))))
-      
-      (define/override (unmarshall-settings marshalled)
-        (and (list? marshalled)
-             (let ([marshalled-len (length marshalled)])
-               ;; older formats had no auto-text or compilation disabling
-               (and (<= 3 marshalled-len)
-                    (let ([collection-paths (list-ref marshalled 1)]
-                          [command-line-args (list-ref marshalled 2)]
-                          [auto-text (if (<= marshalled-len 3)
-                                         (get-default-auto-text)
-                                         (list-ref marshalled 3))]
-                          [compilation-on? (if (<= marshalled-len 4)
-                                               default-compilation-on?
-                                               (list-ref marshalled 4))]
-                          [full-trace? (if (<= marshalled-len 5)
-                                           default-full-trace?
-                                           (list-ref marshalled 5))]
-                          [submodules-to-run (if (<= marshalled-len 6)
-                                                 default-submodules-to-run
-                                                 (list-ref marshalled 6))]
-                          [enforce-module-constants (if (<= marshalled-len 7)
-                                                        default-enforce-module-constants
-                                                        (list-ref marshalled 7))])
-                      (and (list? collection-paths)
-                           (andmap (λ (x) (or (string? x) (symbol? x)))
-                                   collection-paths)
-                           (vector? command-line-args)
-                           (andmap string? (vector->list command-line-args))
-                           (string? auto-text)
-                           (boolean? compilation-on?)
-                           ((listof (listof symbol?)) submodules-to-run)
-                           (boolean? enforce-module-constants)
-                           (let ([super (super unmarshall-settings 
-                                               (let ([p (car marshalled)])
-                                                 ;; Convert 'write to 'print:
-                                                 (if (eq? (vector-ref p 1) 'write)
-                                                     (list->vector 
-                                                      (list* (vector-ref p 0)
-                                                             'print
-                                                             (cddr (vector->list p))))
-                                                     p)))])
-                             (and super
-                                  (apply 
-                                   make-module-language-settings
-                                   (append
-                                    (vector->list (drracket:language:simple-settings->vector super))
-                                    (list collection-paths
-                                          command-line-args
-                                          auto-text
-                                          
-                                          ;; current versions of drracket do not allow this 
-                                          ;; combination in the first place (compilation is only
-                                          ;; allowed in 'none and 'debug mode), but older
-                                          ;; versions might.
-                                          (and (memq 
-                                                (drracket:language:simple-settings-annotations super) 
-                                                '(none debug))
-                                               compilation-on?)
-                                          
-                                          full-trace?
-                                          submodules-to-run
-                                          enforce-module-constants)))))))))))
-      
-      (define/override (on-execute settings run-in-user-thread)
-        (super on-execute settings run-in-user-thread)
-        
-        ;; reset the language info so that if the module is illformed, 
-        ;; we don't save the language info from the last run
-        (set! language-info #f)
-        (set! sandbox #f)
-        
-        (let ([currently-open-files (get-currently-open-files)])
-          (run-in-user-thread
-           (λ ()
-             (set-module-language-parameters 
-              (module-language-settings->prefab-module-settings settings)
-              module-language-parallel-lock-client
-              currently-open-files)))))
-      
-      (define/override (get-one-line-summary)
-        (string-constant module-language-one-line-summary))
-      
-      (define/public (get-auto-text settings)
-        (module-language-settings-auto-text settings))
-      
-      ;; utility for the front-end method: return a function that will return
-      ;; each of the given syntax values on each call, executing thunks when
-      ;; included; when done with the list, send eof.
-      (define (expr-getter . exprs/thunks)
-        (define (loop)
-          (if (null? exprs/thunks)
-            eof
-            (let ([x (car exprs/thunks)])
-              (set! exprs/thunks (cdr exprs/thunks))
-              (if (procedure? x) (begin (x) (loop)) x))))
-        loop)
-      
-      (inherit get-reader)
-      (define repl-init-thunk (make-thread-cell #f))
-      
-      (define/override (front-end/complete-program port settings)
-        (define (super-thunk) 
-          (define reader (get-reader))
-          (reader (object-name port) port))
-        (define path
-          (cond [(get-filename port) => (compose simplify-path cleanse-path)]
-                [else #f]))
-        (define resolved-modpath (and path (module-path-index-resolve
-                                            (module-path-index-join
-                                             path
-                                             #f))))
-        (define-values (name lang module-expr)
-          (let ([expr
-                 ;; just reading the definitions might be a syntax error,
-                 ;; possibly due to bad language (eg, no foo/lang/reader)
-                 (with-handlers ([exn:fail? (λ (e)
-                    ;; [Eli] FIXME: use `read-language' on `port' after calling
-                    ;; `file-position' to reset it to the beginning (need to
-                    ;; make sure that it's always a seekable port), then see
-                    ;; the position that we're left at, re-read that part of
-                    ;; the port (a second reset), construct a string holding
-                    ;; the #lang, and read from it an empty module, and extract
-                    ;; the base module from it (ask Matthew about this).
-                                              (raise-hopeless-exception
-                                               e "invalid module text"))])
-                   (super-thunk))])
-            (when (eof-object? expr)
-              (raise-hopeless-syntax-error (string-append
-                                            "There must be a valid module in the\n"
-                                            "definitions window.  Try starting your program with\n"
-                                            "\n"
-                                            "  #lang racket\n"
-                                            "\n"
-                                            "and clicking ‘Run’.")))
-            (let ([more (super-thunk)])
-              (unless (eof-object? more)
-                (raise-hopeless-syntax-error
-                 "there can only be one expression in the definitions window"
-                 more)))
-            (transform-module path expr raise-hopeless-syntax-error)))
-        (define modspec (or path `',(syntax-e name)))
-        (define (check-interactive-language)
-          (unless (memq '#%top-interaction (namespace-mapped-symbols))
-            (raise-hopeless-exception
-             #f #f ; no error message, just a suffix
-             (format "~s does not support a REPL (no #%top-interaction)"
-                     (syntax->datum lang)))))
-        ;; We're about to send the module expression to drracket now, the rest
-        ;; of the setup is done in `front-end/finished-complete-program' below,
-        ;; so use `repl-init-thunk' to store an appropriate continuation for
-        ;; this setup.  Once we send the expression, we'll be called again only
-        ;; if it was evaluated (or expanded) with no errors, so begin with a
-        ;; continuation that deals with an error, and if we're called again,
-        ;; change it to a continuation that initializes the repl for the
-        ;; module.  So the code is split among several thunks that follow.
-        (define (*pre)
-          (thread-cell-set! repl-init-thunk *error)
-          (current-module-declare-name resolved-modpath)
-          (current-module-declare-source path))
-        (define (*post)
-          (current-module-declare-name #f)
-          (current-module-declare-source #f)
-          (when path ((current-module-name-resolver) resolved-modpath #f))
-          (thread-cell-set! repl-init-thunk *init))
-        (define (*error)
-          (current-module-declare-name #f)
-          (current-module-declare-source #f)
-          ;; syntax error => try to require the language to get a working repl
-          (with-handlers ([void (λ (e)
-                                  (raise-hopeless-syntax-error
-                                   "invalid language specification"
-                                   lang))])
-            (namespace-require lang))
-          (check-interactive-language))
-        (define (*init)
-          (parameterize ([current-namespace (current-namespace)])
-            ;; the prompt makes it continue after an error
-            (call-with-continuation-prompt
-             (λ () (with-stack-checkpoint 
-                    (begin
-                      (*do-module-specified-configuration)
-                      (namespace-require modspec)
-                      (for ([submod (in-list (module-language-settings-submodules-to-run settings))])
-                        (define submod-spec `(submod ,modspec ,@submod))
-                        (when (module-declared? submod-spec)
-                          (dynamic-require submod-spec #f))))))))
-          (current-namespace (module->namespace modspec))
-          (check-interactive-language))
-        (define (*do-module-specified-configuration)
-          (let ([info (module->language-info modspec #t)])
-            (parameterize ([current-eventspace drracket:init:system-eventspace])
-              (queue-callback
-               (λ () (set! language-info info))))
-            (when info
-              (let ([get-info
-                     ((dynamic-require (vector-ref info 0)
-                                       (vector-ref info 1))
-                      (vector-ref info 2))])
-                (let ([configs (get-info 'configure-runtime '())])
-                  (for ([config (in-list configs)])
-                    ((dynamic-require (vector-ref config 0)
-                                      (vector-ref config 1))
-                     (vector-ref config 2)))))))
-          (let ([cr-submod `(submod ,modspec configure-runtime)])
-            (when (module-declared? cr-submod)
-              (dynamic-require cr-submod #f))))
-        ;; here's where they're all combined with the module expression
-        (expr-getter *pre module-expr *post))
-      
-      (define/override (front-end/finished-complete-program settings)
-        (cond [(thread-cell-ref repl-init-thunk)
-               => (λ (t) (thread-cell-set! repl-init-thunk #f) (t))]))
-      
-      (define/override (front-end/interaction port settings)
-        (λ ()
-          (let ([v (parameterize ([read-accept-reader #t]
-                                  [read-accept-lang #f])
-                     (with-stack-checkpoint
-                      ((current-read-interaction) 
-                       (object-name port)
-                       port)))])
-            (if (eof-object? v)
-                v
-                (let ([w (cons '#%top-interaction v)])
-                  (if (syntax? v)
-                      (namespace-syntax-introduce
-                       (datum->syntax #f w v))
-                      v))))))
-      
-      ;; printer settings are just ignored here.
-      (define/override (create-executable setting parent program-filename)
-        (let* ([executable-specs (drracket:language:create-executable-gui
-                                  parent program-filename #t #t)])
-          (when executable-specs
-            (let ([executable-type (list-ref executable-specs 0)]
-                  [gui? (eq? 'mred (list-ref executable-specs 1))]
-                  [executable-filename (list-ref executable-specs 2)]
-                  [aux (list-ref executable-specs 3)])
-              (with-handlers ([(λ (x) #f) ;exn:fail?
-                               (λ (x)
-                                 (message-box
-                                  (string-constant drscheme)
-                                  (if (exn? x)
-                                      (format "~a" (exn-message x))
-                                      (format "uncaught exception: ~s" x))))])
-                (let ([call-create-embedding-executable
-                       (λ (exe-name)
-                         (let ([short-program-name
-                                (let-values ([(base name dir) (split-path program-filename)])
-                                  (path-replace-suffix name #""))])
-                           (create-embedding-executable
-                            exe-name
-                            #:gracket? gui?
-                            #:aux aux
-                            #:verbose? #f
-                            #:modules (list (list #f program-filename))
-                            #:configure-via-first-module? #t
-                            #:literal-expression
-                            (parameterize ([current-namespace (make-base-empty-namespace)])
-                              (namespace-require 'racket/base)
-                              (compile
-                               `(namespace-require
-                                 '',(string->symbol (path->string short-program-name)))))
-                            #:cmdline '("-U" "--"))))])
-                  
-                  (case executable-type
-                    [(launcher)
-                     (let ([make-launcher (if gui? make-mred-launcher make-mzscheme-launcher)])
-                       (make-launcher (list "-qt-" (path->string program-filename))
-                                      executable-filename))]
-                    [(distribution)
-                     (drracket:language:create-distribution-for-executable
-                      executable-filename
-                      gui?
-                      call-create-embedding-executable)]
-                    [(stand-alone)
-                     (define c (make-custodian))
-                     (define d (new dialog% 
-                                    [parent parent] 
-                                    [label (string-constant create-executable-title)]))
-                     (new message% 
-                          [parent d]
-                          [label (string-constant creating-executable-progress-status)])
-                     (new button%
-                          [parent d]
-                          [label (string-constant abort)]
-                          [callback (lambda (_1 _2)
-                                      (custodian-shutdown-all c))])
-                     (define thd
-                       (parameterize ([current-custodian c])
-                         (thread
-                          (λ ()
-                            (call-create-embedding-executable executable-filename)))))
-                     (thread
-                      (λ ()
-                        (thread-wait thd)
-                        (queue-callback (λ () (send d show #f)))))
-                     (send d show #t)])))))))
-      
-      (super-new
-       [module #f]
-       [language-position (list (string-constant module-language-name))]
-       [language-numbers (list -32768)])))
-  
-  ;; can be called with #f to just kill the repl (in case we want to kill it
-  ;; but keep the highlighting of a previous error)
-  (define (raise-hopeless-exception exn [prefix #f] [suffix #f])
-    (define rep (drracket:rep:current-rep))
-    ;; Throw an error as usual if we don't have the drracket rep, then we just
-    ;; raise the exception as normal.  (It can happen in some rare cases like
-    ;; having a single empty scheme box in the definitions.)
-    (unless rep (if exn (raise exn) (error "\nInteractions disabled")))
-    (when prefix 
-      (display "Module Language: " (current-error-port))
-      (display prefix (current-error-port))
-      (display "\n" (current-error-port)))
-    (when exn ((error-display-handler) (exn-message exn) exn))
-    ;; these are needed, otherwise the warning can appear before the output
-    (flush-output (current-output-port))
-    (flush-output (current-error-port))
-    ;; do the rep-related work carefully -- using drracket's eventspace, and
-    ;; wait for it to finish before we continue.
-    (let ([s (make-semaphore 0)]
-          [msg (string-append "\nInteractions disabled"
-                              (if suffix (string-append ": " suffix) "."))])
-      (parameterize ([current-eventspace drracket:init:system-eventspace])
-        (queue-callback
-         (λ ()
-           (send rep call-without-reset-highlighting
-             (λ ()
-               (send* rep (insert-warning msg)
-                          (set-show-no-user-evaluation-message? #f))))
-           (semaphore-post s))))
-      (semaphore-wait s))
-    (custodian-shutdown-all (send rep get-user-custodian)))
-  
-  (define (raise-hopeless-syntax-error . error-args)
-    (with-handlers ([exn:fail? raise-hopeless-exception])
-      (apply raise-syntax-error '|Module Language|
-             error-args)))
-    
-  ;; module-language-config-panel : panel -> (case-> (-> settings) (settings -> void))
-  (define (module-language-config-panel parent)
-    (define new-parent
-      (new vertical-panel%
-           [parent parent]
-           [alignment '(center center)]
-           [stretchable-height #f]
-           [stretchable-width #f]))
-    (define compilation-on-check-box #f)
-    (define enforce-module-constants-checkbox #f)
-    (define compilation-on? #t)
-    (define save-stacktrace-on-check-box #f)
-    (define run-submodules-choice #f)
-    (define left-debugging-radio-box #f)
-    (define right-debugging-radio-box #f)
-    (define submodules-to-run #f)
-    
-    (define (set-submodules-to-run l)
-      (define ht (make-hash))
-      (for ([submod (in-list (preferences:get 'drracket:submodules-to-choose-from))]
-            [x (in-naturals)])
-        (hash-set! ht submod x))
-      
-      ;; there may be a submodule in this list that is no longer choosable from
-      ;; the preferences (if the user edits their prefs or the defaults change)
-      ;; make sure the sort below doesn't crash by putting in an +inf.0
-      ;; (also, rely on sort's stability)
-      (set! submodules-to-run (sort l < 
-                                    #:key (λ (x) (hash-ref ht x +inf.0)))))
-    
-    (define simple-case-lambda
-      (drracket:language:simple-module-based-language-config-panel
-       new-parent
-       #:case-sensitive #t
-       
-       #:get-debugging-radio-box (λ (rb-l rb-r) 
-                                   (set! left-debugging-radio-box rb-l)
-                                   (set! right-debugging-radio-box rb-r))
-       
-       #:debugging-radio-box-callback
-       (λ (debugging-radio-box evt)
-         (update-compilation-checkbox left-debugging-radio-box right-debugging-radio-box))
-
-       #:dynamic-panel-extras
-       (λ (dynamic-panel)
-         (set! compilation-on-check-box
-               (new check-box%
-                    [label (string-constant automatically-compile)]
-                    [parent dynamic-panel]
-                    [callback
-                     (λ (_1 _2) (set! compilation-on? (send compilation-on-check-box get-value)))]))
-         (set! save-stacktrace-on-check-box 
-               (new check-box%
-                    [label (string-constant preserve-stacktrace-information)]
-                    [parent dynamic-panel]))
-         (set! enforce-module-constants-checkbox
-               (new check-box%
-                    [label (string-constant enforce-module-constants-checkbox-label)]
-                    [parent dynamic-panel]))
-         (set! run-submodules-choice 
-               (new (class name-message%
-                      (define/override (fill-popup menu reset)
-                        (for ([item (in-list (preferences:get 'drracket:submodules-to-choose-from))]
-                              [x (in-naturals)])
-                          (new checkable-menu-item%
-                               [label 
-                                (apply string-append (add-between (map symbol->string item) " "))]
-                               [checked (member item submodules-to-run)]
-                               [callback 
-                                (λ (a b)
-                                  (if (member item submodules-to-run)
-                                      (set-submodules-to-run (remove item submodules-to-run))
-                                      (set-submodules-to-run (cons item submodules-to-run))))]
-                               [parent menu]))
-                        (new separator-menu-item% [parent menu])
-                        (new menu-item% 
-                             [parent menu]
-                             [callback 
-                              (λ (a b)
-                                (define new-submod (add-another-possible-submodule parent))
-                                (when new-submod
-                                  (set-submodules-to-run (cons new-submod submodules-to-run))))]
-                             [label (string-constant add-submodule)]))
-                      (super-new
-                       [font normal-control-font]
-                       [parent dynamic-panel]
-                       [label (string-constant submodules-to-run)])))))))
-    (define (update-compilation-checkbox left-debugging-radio-box right-debugging-radio-box)
-      (case (send left-debugging-radio-box get-selection)
-        [(0 1)
-         (send compilation-on-check-box enable #t)
-         (send compilation-on-check-box set-value compilation-on?)]
-        [(#f)
-         (send compilation-on-check-box enable #f)
-         (send compilation-on-check-box set-value #f)]))
-    
-    (define cp-panel (new group-box-panel%
-                          [parent new-parent]
-                          [label (string-constant ml-cp-collection-paths)]))
-    
-    (define args-panel (new group-box-panel%
-                            [parent new-parent]
-                            [label (string-constant ml-command-line-arguments)]))
-    (define args-text-box (new text-field%
-                               [parent args-panel]
-                               [label #f]
-                               [init-value "#()"]
-                               [callback void]))
-    (define auto-text-panel (new group-box-panel%
-                                 [parent new-parent]
-                                 [label (string-constant module-language-auto-text)]))
-    (define auto-text-text-box (new text-field%
-                                    [parent auto-text-panel]
-                                    [label #f]
-                                    [init-value ""]
-                                    [callback 
-                                     (λ (tf evt)
-                                       (preferences:set 'drracket:module-language:auto-text
-                                                        (get-auto-text)))]))
-    
-    ;; data associated with each item in listbox : boolean
-    ;; indicates if the entry is the default paths.
-    (define collection-paths-lb (new list-box%
-                                     [parent cp-panel]
-                                     [choices '("a" "b" "c")]
-                                     [label #f]
-                                     [callback (λ (x y) (update-buttons))]))
-    (define button-panel (new horizontal-panel%
-                              [parent cp-panel]
-                              [alignment '(center center)]
-                              [stretchable-height #f]))
-    (define add-button
-      (make-object button% (string-constant ml-cp-add) button-panel
-        (λ (x y) (add-callback))))
-    (define add-default-button
-      (make-object button% (string-constant ml-cp-add-default) button-panel
-        (λ (x y) (add-default-callback))))
-    (define remove-button
-      (make-object button% (string-constant ml-cp-remove) button-panel
-        (λ (x y) (remove-callback))))
-    (define raise-button
-      (make-object button% (string-constant ml-cp-raise) button-panel
-        (λ (x y) (move-callback -1))))
-    (define lower-button
-      (make-object button% (string-constant ml-cp-lower) button-panel
-        (λ (x y) (move-callback +1))))
-    
-    (define (update-buttons)
-      (let ([lb-selection (send collection-paths-lb get-selection)]
-            [lb-tot (send collection-paths-lb get-number)])
-        (send remove-button enable lb-selection)
-        (send raise-button enable (and lb-selection (not (= lb-selection 0))))
-        (send lower-button enable
-              (and lb-selection (not (= lb-selection (- lb-tot 1)))))))
-    
-    (define (add-callback)
-      (let ([dir (get-directory (string-constant ml-cp-choose-a-collection-path)
-                                (send parent get-top-level-window))])
-        (when dir
-          (send collection-paths-lb append (path->string dir) #f)
-          (update-buttons))))
-    
-    (define (add-default-callback)
-      (cond [(has-default?)
-             (message-box (string-constant drscheme)
-                          (string-constant ml-cp-default-already-present)
-                          (send parent get-top-level-window))]
-            [else
-             (send collection-paths-lb append (string-constant ml-cp-default-collection-path) #t)
-             (update-buttons)]))
-    
-    ;; has-default? : -> boolean
-    ;; returns #t if the `default' entry has already been added
-    (define (has-default?)
-      (let loop ([n (send collection-paths-lb get-number)])
-        (cond [(= n 0) #f]
-              [(send collection-paths-lb get-data (- n 1)) #t]
-              [else (loop (- n 1))])))
-    
-    (define (remove-callback)
-      (let ([to-delete (send collection-paths-lb get-selection)])
-        (send collection-paths-lb delete to-delete)
-        (unless (zero? (send collection-paths-lb get-number))
-          (send collection-paths-lb set-selection
-                (min to-delete (- (send collection-paths-lb get-number) 1))))
-        (update-buttons)))
-    
-    (define (move-callback d)
-      (let* ([sel (send collection-paths-lb get-selection)]
-             [vec (get-lb-vector)]
-             [new (+ sel d)]
-             [other (vector-ref vec new)])
-        (vector-set! vec new (vector-ref vec sel))
-        (vector-set! vec sel other)
-        (set-lb-vector vec)
-        (send collection-paths-lb set-selection new)
-        (update-buttons)))
-    
-    (define (get-lb-vector)
-      (list->vector (for/list ([n (in-range (send collection-paths-lb get-number))])
-                              (cons (send collection-paths-lb get-string n)
-                                    (send collection-paths-lb get-data n)))))
-    
-    (define (set-lb-vector vec)
-      (send collection-paths-lb clear)
-      (for ([x (in-vector vec)] [n (in-naturals)])
-           (send collection-paths-lb append (car x))
-           (send collection-paths-lb set-data n (cdr x))))
-    
-    (define (get-collection-paths)
-      (for/list ([n (in-range (send collection-paths-lb get-number))])
-                (let ([data (send collection-paths-lb get-data n)])
-                  (if data 'default (send collection-paths-lb get-string n)))))
-    
-    (define (install-collection-paths paths)
-      (send collection-paths-lb clear)
-      (for ([cp paths])
-           (if (symbol? cp)
-               (send collection-paths-lb append (string-constant ml-cp-default-collection-path) #t)
-               (send collection-paths-lb append cp #f))))
-    
-    (define (get-command-line-args)
-      (let* ([str (send args-text-box get-value)]
-             [read-res (parameterize ([read-accept-graph #f])
-                         (with-handlers ([exn:fail:read? (λ (x) #())])
-                           (read (open-input-string str))))])
-        (if (and (vector? read-res) (andmap string? (vector->list read-res)))
-            read-res
-            #())))
-    
-    (define (install-command-line-args vec)
-      (send args-text-box set-value
-            (parameterize ([print-vector-length #f])
-              (format "~s" vec))))
-    
-    (define (get-auto-text)
-      (let ([str (send auto-text-text-box get-value)])
-        (cond
-          [(equal? str "") ""]
-          [else (string-append str "\n")])))
-    
-    (define (install-auto-text str)
-      (send auto-text-text-box set-value (regexp-replace #rx"\n$" str "")))
-    
-    (install-collection-paths '(default))
-    (update-buttons)
-    (install-auto-text (get-default-auto-text))
-    (update-compilation-checkbox left-debugging-radio-box right-debugging-radio-box)
-
-    (case-lambda
-      [()
-       (let ([simple-settings (simple-case-lambda)])
-         (apply make-module-language-settings
-                (append 
-                 (vector->list (drracket:language:simple-settings->vector simple-settings))
-                 (list (get-collection-paths)
-                       (get-command-line-args)
-                       (get-auto-text)
-                       (case (send left-debugging-radio-box get-selection)
-                         [(0 1) compilation-on?]
-                         [(#f) #f])
-                       (send save-stacktrace-on-check-box get-value)
-                       submodules-to-run
-                       (send enforce-module-constants-checkbox get-value)))))]
-      [(settings)
-       (simple-case-lambda settings)
-       (install-collection-paths (module-language-settings-collection-paths settings))
-       (install-command-line-args (module-language-settings-command-line-args settings))
-       (install-auto-text (module-language-settings-auto-text settings))
-       (set! compilation-on? (module-language-settings-compilation-on? settings))
-       (send compilation-on-check-box set-value (module-language-settings-compilation-on? settings))
-       (update-compilation-checkbox left-debugging-radio-box right-debugging-radio-box)
-       (send save-stacktrace-on-check-box set-value (module-language-settings-full-trace? settings))
-       (set-submodules-to-run (module-language-settings-submodules-to-run settings))
-       (send enforce-module-constants-checkbox set-value
-             (module-language-settings-enforce-module-constants settings))
-       (update-buttons)]))
-  
-  (define (add-another-possible-submodule parent)
-    (define (get-sexp x)
-      (with-handlers ((exn:fail:read? (λ (x) #f)))
-        (define p (open-input-string (string-append "(" x ")")))
-        (define sexp (read p))
-        (and (eof-object? (read-char p))
-             (list? sexp)
-             (andmap symbol? sexp)
-             sexp)))
-    (define msg (get-text-from-user (string-constant add-submodule-title) 
-                                    "submodule"
-                                    (let loop ([parent parent])
-                                      (define p (send parent get-parent))
-                                      (if p
-                                          (loop p)
-                                          parent))
-                                    #:validate (λ (x) (get-sexp x))))
-    (define submods
-      (and msg
-           (get-sexp msg)))
-    (cond
-      [submods
-       (preferences:set 'drracket:submodules-to-choose-from
-                        (append (preferences:get 'drracket:submodules-to-choose-from)
-                                (list submods)))
-       submods]
-      [else #f]))
-  
-  ;; get-filename : port -> (union string #f)
-  ;; extracts the file the definitions window is being saved in, if any.
-  (define (get-filename port)
-    (let ([source (object-name port)])
-      (cond
-        [(path? source) source]
-        [(is-a? source text%)
-         (let ([canvas (send source get-canvas)])
-           (and canvas
-                (let ([frame (send canvas get-top-level-window)])
-                  (and (is-a? frame drracket:unit:frame%)
-                       (let* ([b (box #f)]
-                              [filename (send (send frame get-definitions-text)
-                                              get-filename
-                                              b)])
-                         (if (unbox b)
-                             #f
-                             filename))))))]
-        [else #f])))
-  
-  (define online-expansion-logger (make-logger 'online-expansion-state-machine (current-logger)))
-  (define-syntax-rule
-    (define/oc-log (id . args) . body)
-    (define (id . args)
-      (log-oel 'id (list . args))
-      (begin0 (let () . body)
-              (log-oel 'id #f))))
-  
-  (define-syntax-rule
-    (log-oel id args)
-    (when (log-level? online-expansion-logger 'info)
-      (log-oel/proc id args)))
-  
-  (define (log-oel/proc id args)
-    (define-values (running-tab dirty/pending-tab dirty-tabs clean-tabs) (get-current-oc-state))
-    (define (val->str t)
-      (cond
-        [(is-a? t drracket:unit:tab<%>)
-         (define fn (send (send t get-defs) get-filename))
-         (if fn
-             (let-values ([(base name path?) (split-path fn)])
-               (path->string name))
-             "untitled")]
-        [(vector? t) (format "~s" (vector (vector-ref t 0) '...))]
-        [(not t) "#f"]
-        [else "?"]))
-    (log-message online-expansion-logger
-                 'info
-                 (format "~a: ~a\n     running ~a dirty/pending ~a dirty-tabs ~a clean-tabs ~a" 
-                         id
-                         (if args
-                             (map val->str args)
-                             (if oc-timer-running?
-                                 "return: timer running"
-                                 "return: timer stopped"))
-                         (val->str running-tab)
-                         (val->str dirty/pending-tab)
-                         (map val->str dirty-tabs)
-                         (map val->str clean-tabs))
-                 (current-continuation-marks))
-    (unless args
-      ;; the invariant is not always true when the call is made
-      ;; but it should be true when the call returns
-      (oc-check-invariant id)))
-  
-  (define module-language-online-expand-tab-mixin
-    (mixin (drracket:unit:tab<%>) ()
-      (inherit get-frame get-defs get-ints)
-      
-      (define/augment (on-close) 
-        (oc-remove-tab this)
-        (inner (void) on-close))
-      
-      ;; (or/c clean? dirty? running?)
-      (define running-status (clean #f #f))
-      (define our-turn? #f)
-      
-      (define/public (set-oc-status s) 
-        (unless (equal? running-status s)
-          (set! running-status s)
-          (update-gui)))
-      (define/public (get-oc-status) running-status)
-      
-      (define/private (update-gui)
-        (update-little-dot)
-        (update-bottom-bar)
-        (update-error-in-defs))
-      
-      (define/private (update-error-in-defs)
-        (send (get-defs) begin-edit-sequence #f #f)
-        (send (get-defs) clear-old-error)
-        (when (clean? running-status)
-          (match-define (clean error-type error-messages+locs) running-status)
-          (when error-messages+locs
-            (define pref-key
-              (case error-type
-                [(exn access-violation abnormal-termination) 'drracket:online-expansion:other-errors]
-                [(exn:variable) 'drracket:online-expansion:variable-errors]
-                [(reader-in-defs-error) 'drracket:online-expansion:read-in-defs-errors]
-                [else (error 'module-language.rkt "unknown clean status: ~s" running-status)]))
-            (case (preferences:get pref-key)
-              [(margin) 
-               (send (get-defs) set-margin-error-ranges
-                     (set->list
-                      (for*/set ([error-message+loc (in-list error-messages+locs)]
-                                 [range (in-list (exn-info-src-vecs error-message+loc))])
-                        (define pos (vector-ref range 0))
-                        (define span (vector-ref range 1))
-                        (error-range (- pos 1) (+ pos span -1) #f))))]
-              [(gold) 
-               (send (get-defs) set-gold-highlighted-errors 
-                     (remove-duplicates
-                      (apply append (map exn-info-src-vecs error-messages+locs))))])
-            (send (get-ints) set-error-ranges 
-                  (set->list
-                   (for*/set ([error-message+loc (in-list error-messages+locs)]
-                              [range (in-list (exn-info-src-vecs error-message+loc))])
-                     (define pos (vector-ref range 0))
-                     (define span (vector-ref range 1))
-                     (srcloc (get-defs) #f #f pos span))))))
-        (send (get-defs) end-edit-sequence))
-      
-      (define/private (update-bottom-bar)
-        (cond
-          [(running? running-status)
-           (set-bottom-bar-status/blank)]
-          [(and (dirty? running-status) our-turn?)
-           (set-bottom-bar-status/blank)]
-          [(and (dirty? running-status) (not our-turn?))
-           (send (get-defs) set-bottom-bar-status (list (exn-info "" '() '() #f)) #f #f)]
-          [(clean? running-status)
-           (if (clean-error-messages+locs running-status)
-               (send (get-defs) set-bottom-bar-status 
-                     (clean-error-messages+locs running-status)
-                     #t #t)
-               (set-bottom-bar-status/blank))]))
-      
-      (define/private (set-bottom-bar-status/blank)
-        (send (get-defs) set-bottom-bar-status
-              (list (exn-info "" '() '() #f))
-              #f
-              #f))
-      
-      (define/public (update-little-dot)
-        (when (eq? this (send (get-frame) get-current-tab))
-          (send (get-frame) frame-show-bkg-running (get-colors) (get-label))))
-      
-      (define/private (get-colors)
-        (cond
-          [(running? running-status)
-           (case (running-sym running-status)
-             [(running) (list "blue")]
-             [(finished-expansion) (list "purple")])]
-          [(dirty? running-status)
-           (if (null? bkg-colors)
-               #f
-               (map (λ (x) (list-ref x 1)) bkg-colors))]
-          [(clean? running-status)
-           (if (clean-error-messages+locs running-status)
-               (list "red")
-               (if (null? bkg-colors)
-                   (list "forestgreen")
-                   (map (λ (x) (list-ref x 1)) bkg-colors)))]))
-      
-      (define/private (get-label)
-        (cond
-          [(running? running-status)
-           (list (running-str running-status))]
-          [(dirty? running-status)
-           (if (null? bkg-colors)
-               #f
-               (map (λ (x) (list-ref x 2)) bkg-colors))]
-          [(clean? running-status)
-           (if (clean-error-messages+locs running-status)
-               (for/list ([pr (clean-error-messages+locs running-status)])
-                 (exn-info-str pr))
-               (list sc-finished-successfully))]))
-
-      (define bkg-colors '())
-      
-      (define/public (add-bkg-running-color id color label)
-        (set! bkg-colors
-              (sort
-               (cons (list id color label) bkg-colors)
-               string<=? #:key (compose symbol->string car)))
-        (update-little-dot))
-      
-      (define/public (remove-bkg-running-color id)
-        (set! bkg-colors (filter (λ (x) (not (eq? (car x) id))) bkg-colors))
-        (update-little-dot))
-      
-      (define dep-paths (set))
-      (define error-dep-paths (set))
-      (define/public (set-dep-paths d error?)
-        (cond
-          [error?
-           (set! error-dep-paths d)]
-          [else
-           (set! dep-paths d)
-           (set! error-dep-paths (set))]))
-      (define/public (set-dirty-if-dep path)
-        (when (or (set-member? dep-paths path)
-                  (set-member? error-dep-paths path))
-          (oc-set-dirty this)))
-      
-      (super-new)))
-  
-  (define module-language-online-expand-text-mixin 
-    (mixin (text:basic<%> 
-            drracket:unit:definitions-text<%>
-            drracket:module-language-tools:definitions-text<%>) ()
-      (inherit last-position find-first-snip get-top-level-window get-filename
-               get-tab get-canvas invalidate-bitmap-cache 
-               set-position get-start-position get-end-position
-               highlight-range dc-location-to-editor-location
-               begin-edit-sequence end-edit-sequence in-edit-sequence?)
-      
-      
-      (define/public (fetch-data-to-send)
-        (define str (make-string (last-position) #\space))
-        (let/ec k
-          (let loop ([s (find-first-snip)]
-                     [i 0])
-            (cond
-              [(not s) (void)]
-              [(is-a? s string-snip%)
-               (define size (send s get-count))
-               (send s get-text! str 0 size i)
-               (loop (send s next) (+ i size))]
-              [else
-               (k #f i)]))
-          (define fn (let* ([b (box #f)]
-                            [n (get-filename b)])
-                       (and (not (unbox b))
-                            n)))
-          (values str fn)))
-      
-      ;; the state of the bottom bar (when this definitions text is
-      ;; in the current tab)
-      ; if the bar is hidden entirely 
-      (define error/status-message-hidden? #t) 
-      ; a list of triples (in a vector of size 3) of strings, srclocs, and stackframes (as strings)
-      ; that show up in the bar and control the "jump to error" / next prev buttons
-      (define error/status-message-strs+srclocs (list (exn-info "" '() '() #f)))
-      (define error/status-index 0)
-      
-      ; if the string should be red/italic or just normal font
-      (define error/status-message-err? #f)
-      
-      (define bottom-bar-most-recent-jumped-to-loc #f)
-      (define/public (set-bottom-bar-most-recent-jumped-to-loc loc)
-        (set! bottom-bar-most-recent-jumped-to-loc loc)
-        (update-frame-expand-error))
-      
-      (define/public (set-bottom-bar-status new-error/status-message-strs+srclocs
-                                            message-err?
-                                            force-visible?)
-        (define new-error/status-message-str 
-          (exn-info-str (car new-error/status-message-strs+srclocs)))
-        (define srclocs (exn-info-src-vecs (car new-error/status-message-strs+srclocs)))
-        (unless (string? new-error/status-message-str)
-          (error 'set-bottom-bar-status "expected a string, got ~s" new-error/status-message-str))
-        (when (or (not (and (equal? error/status-message-strs+srclocs 
-                                    new-error/status-message-strs+srclocs)
-                            (equal? error/status-message-err? message-err?)))
-                  (and force-visible?
-                       error/status-message-hidden?))
-          (set! error/status-message-strs+srclocs new-error/status-message-strs+srclocs)
-          (unless (< error/status-index (length new-error/status-message-strs+srclocs))
-            ;; try to preserve the error/status-index in the case
-            ;; that the error messages didn't change much.
-            ;; not sure this is a good idea (or if the test above is the right test)
-            (set! error/status-index 0))
-          (set! error/status-message-err? message-err?)
-          (when force-visible? 
-            (set! error/status-message-hidden? #f))
-          (update-frame-expand-error)))
-      (define/public (update-frame-expand-error)
-        (when (eq? (get-tab) (send (send (get-tab) get-frame) get-current-tab))
-          (define (matching-srcloc error/status-message-str+srcloc)
-            (for/or ([pos+span-vec (exn-info-src-vecs error/status-message-str+srcloc)])
-              (define pos (vector-ref pos+span-vec 0))
-              (define span (vector-ref pos+span-vec 1))
-              (and (equal? (send (get-tab) get-defs)
-                           (srcloc-source bottom-bar-most-recent-jumped-to-loc))
-                   (equal? (srcloc-position bottom-bar-most-recent-jumped-to-loc)
-                           pos)
-                   (equal? (srcloc-span bottom-bar-most-recent-jumped-to-loc)
-                           span))))
-          (define msgs
-            (cond
-              [bottom-bar-most-recent-jumped-to-loc
-               (for/list ([error/status-message-str+srcloc
-                           (in-list error/status-message-strs+srclocs)]
-                          #:when (matching-srcloc error/status-message-str+srcloc))
-                 (exn-info-str error/status-message-str+srcloc))]
-              [else
-               (list (exn-info-str (list-ref error/status-message-strs+srclocs
-                                             error/status-index)))]))
-          (define install-suggestions
-            (apply 
-             append
-             (for/list ([error/status-message-str+srcloc (in-list error/status-message-strs+srclocs)]
-                        #:when (exn-info-missing-mods error/status-message-str+srcloc))
-               (define missing-mods (exn-info-missing-mods error/status-message-str+srcloc))
-               (with-handlers ([exn:fail? (λ (x) '())])
-                 (pkg-catalog-suggestions-for-module missing-mods)))))
-          (define has-missing-mods?
-            (for/or ([error/status-message-str+srcloc (in-list error/status-message-strs+srclocs)]
-                     #:when (exn-info-missing-mods error/status-message-str+srcloc))
-              (define missing-mods (exn-info-missing-mods error/status-message-str+srcloc))
-              (not (null? missing-mods))))
-            
-          (define (combine-msg vec)
-            (define msg (exn-info-str vec))
-            (define stack (exn-info-src-vecs vec))
-            (apply
-             string-append
-             (cons
-              msg
-              (for/list ([stack stack])
-                (format "\n  ~a" stack)))))
-          (define copy-msg
-            (cond
-              [bottom-bar-most-recent-jumped-to-loc
-               (for/list ([error/status-message-str+srcloc 
-                           (in-list error/status-message-strs+srclocs)]
-                          #:when (matching-srcloc error/status-message-str+srcloc))
-                 (combine-msg error/status-message-str+srcloc))]
-              [else
-               (combine-msg (list-ref error/status-message-strs+srclocs error/status-index))]))
-          (send (send (get-tab) get-frame) set-expand-error/status
-                error/status-message-hidden?
-                msgs
-                copy-msg
-                error/status-message-err?
-                (cond
-                  [(null? error/status-message-strs+srclocs) 0]
-                  [(null? (cdr error/status-message-strs+srclocs))
-                   (length (exn-info-src-vecs (car error/status-message-strs+srclocs)))]
-                  [else
-                   (for/sum ([error/status-message-str+srcloc
-                              (in-list error/status-message-strs+srclocs)])
-                     (max 1 (length (exn-info-src-vecs error/status-message-str+srcloc))))])
-                (and has-missing-mods? install-suggestions))))
-      (define/public (hide-module-language-error-panel)
-        (set! error/status-message-hidden? #t)
-        (update-frame-expand-error))
-
-      (define/public (expand-error-next) 
-        (define current-srclocs 
-          (exn-info-src-vecs (list-ref error/status-message-strs+srclocs error/status-index)))
-        (define candidates (filter (λ (error-message-srcloc) 
-                                     (> (- (vector-ref error-message-srcloc 0) 1) 
-                                        (get-end-position)))
-                                   current-srclocs))
-        (cond
-          [(null? candidates)
-           (jump-to-new-index (modulo (+ error/status-index 1) 
-                                      (length error/status-message-strs+srclocs))
-                              first)]
-          [else
-           (jump-to (car candidates))]))
-      
-      (define/public (expand-error-prev) 
-        (define current-srclocs 
-          (exn-info-src-vecs (list-ref error/status-message-strs+srclocs error/status-index)))
-        (define candidates (filter (λ (error-message-srcloc) 
-                                     (< (+ (vector-ref error-message-srcloc 0)
-                                           (vector-ref error-message-srcloc 1)
-                                           -1)
-                                        (get-start-position)))
-                                   current-srclocs))
-        (cond
-          [(null? candidates)
-           (jump-to-new-index (modulo (- error/status-index 1) 
-                                      (length error/status-message-strs+srclocs))
-                              last)]
-          [else
-           (jump-to (last candidates))]))
-      
-      (define/private (jump-to-new-index new-error/status-index which)
-        (set! error/status-index new-error/status-index)
-        (define current-srclocs 
-          (exn-info-src-vecs (list-ref error/status-message-strs+srclocs error/status-index)))
-        (unless (null? current-srclocs) (jump-to (which current-srclocs)))
-        (update-frame-expand-error))
-      
-      (define/private (jump-to vec)
-        (set-position (- (vector-ref vec 0) 1))
-        (define cnvs (get-canvas))
-        (when cnvs (send cnvs focus)))
-      
-      (define online-error-ranges '())
-      (define online-highlighted-errors '())
-      
-      (define/public (set-gold-highlighted-errors ranges)
-        (set! online-highlighted-errors 
-              (for/list ([range (in-list ranges)]) 
-                (define pos (vector-ref range 0))
-                (define span (vector-ref range 1))
-                (highlight-range (- pos 1) (+ pos span -1) "gold"))))
-      
-      (define/public (set-margin-error-ranges rngs)
-        (unless (equal? online-error-ranges rngs)
-          (invalidate-online-error-ranges)
-          (set! online-error-ranges rngs)
-          (invalidate-online-error-ranges)))
-      
-      (define/public (clear-old-error)
-        (begin-edit-sequence #f #f)
-        (for ([cleanup-thunk (in-list online-highlighted-errors)])
-          (cleanup-thunk))
-        (for ([an-error-range (in-list online-error-ranges)])
-          (when (error-range-clear-highlight an-error-range)
-            ((error-range-clear-highlight an-error-range))
-            (set-error-range-clear-highlight! an-error-range #f)))
-        (invalidate-online-error-ranges)
-        (set-margin-error-ranges '())        
-        (end-edit-sequence))
-      
-      (define/private (invalidate-online-error-ranges)
-        (when (get-admin)
-          ;; invalidate-online-error-ranges can be called at strange times
-          ;; because it is invoked via a queue-callback thunk; specifically
-          ;; the tab may have changed in drracket, which means that there is
-          ;; no admin and thus there is no reason to invalidate any drawing
-          (for ([an-error-range (in-list online-error-ranges)])
-            (define-values (x y w h) (get-box an-error-range))
-            (invalidate-bitmap-cache x y 'display-end h))))
-      
-      (define byt (box 0.0))
-      (define byb (box 0.0))
-      (define vbx (box 0.0))
-      (define vby (box 0.0))
-      (define vbw (box 0.0))
-      (define vbh (box 0.0))
-    
-      (inherit position-location get-admin)
-      
-      (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-        (unless (null? online-error-ranges)
-          (unless before?
-            
-            (define path (new dc-path%))
-            (define found-something-to-draw? #f)
-            
-            (for ([an-error-range (in-list online-error-ranges)])
-              (define-values (x y w h) (get-box an-error-range))
-              (when (rectangles-intersect? x y (+ x w) (+ y h)
-                                           left top right bottom)
-                (set! found-something-to-draw? #t)
-                (send path move-to (+ dx x) (+ dy y))
-                (send path line-to (+ dx x w) (+ dy y))
-                (send path line-to (+ dx x w) (+ dy y h))
-                (send path arc (+ dx x) (+ dy y) (* w 2/3) h (* pi 3/2) (* pi 1/2))
-                (send path close)))
-            
-            (when found-something-to-draw?
-              (define saved-brush (send dc get-brush))
-              (define saved-pen (send dc get-pen))
-              (define smoothing (send dc get-smoothing))
-              (send dc set-smoothing 'smoothed)
-              
-              (send dc set-brush "red" 'solid)
-              (send dc set-pen "red" 1 'transparent)
-              (send dc set-alpha 
-                    (if (preferences:get 'framework:white-on-black?)
-                        .5
-                        .25))
-              
-              (send dc draw-path path)
-              (send dc set-alpha 1)
-              (send dc set-brush saved-brush)
-              (send dc set-pen saved-pen)
-              (send dc set-smoothing smoothing))))
-        (super on-paint before? dc left top right bottom dx dy draw-caret))
-      
-      (define/override (on-event evt)
-        (define-values (mx my) 
-          (dc-location-to-editor-location 
-           (send evt get-x)
-           (send evt get-y)))
-        (cond
-          [(or (send evt moving?)
-               (send evt entering?))
-           (for ([an-error-range (in-list online-error-ranges)])
-             (define-values (x y w h) (get-box an-error-range))
-             (cond
-               [(and (<= x mx (+ x w))
-                     (<= y my (+ y h)))
-                (unless (error-range-clear-highlight an-error-range)
-                  (set-error-range-clear-highlight! 
-                   an-error-range
-                   (highlight-range (error-range-start an-error-range)
-                                    (error-range-end an-error-range)
-                                    "pink")))]
-               [else
-                (when (error-range-clear-highlight an-error-range)
-                  ((error-range-clear-highlight an-error-range))
-                  (set-error-range-clear-highlight! an-error-range #f))]))
-           (super on-event evt)]
-          [(send evt leaving?)
-           (for ([an-error-range (in-list online-error-ranges)])
-             (when (error-range-clear-highlight an-error-range)
-               ((error-range-clear-highlight an-error-range))
-               (set-error-range-clear-highlight! an-error-range #f)))
-           (super on-event evt)]
-          [(send evt button-down? 'left)
-           (define used-click? #f)
-           (for ([an-error-range (in-list online-error-ranges)])
-             (define-values (x y w h) (get-box an-error-range))
-             (when (and (<= x mx (+ x w))
-                        (<= y my (+ y h)))
-               (set! used-click? #t)
-               (set-position (error-range-start an-error-range))))
-           (unless used-click?
-             (super on-event evt))]
-          [else
-           (super on-event evt)]))
-      
-      ;; pre: get-admin does not return #f
-      (define/private (get-box an-error-range)
-        (define start-pos (error-range-start an-error-range))
-        (define end-pos (error-range-end an-error-range))
-        (position-location start-pos #f byt)
-        (position-location end-pos #f byb #f)
-        (send (get-admin) get-view vbx vby vbw vbh)
-        
-        (define x (+ (unbox vbx)
-                     (unbox vbw)
-                     (- online-compilation-error-pen-width)
-                     (- online-compilation-error-pen-width)))
-        (define y (unbox byt))
-        (define w (* online-compilation-error-pen-width 2))
-        (define h (- (unbox byb) (unbox byt)))
-        
-        (values x y w h))
-        
-      (define need-to-dirty? #f)
-      
-      (define/augment (after-insert start end) 
-        (if (in-edit-sequence?)
-            (set! need-to-dirty? #t)
-            (oc-set-dirty (get-tab)))
-        (inner (void) after-insert start end))
-      
-      (define/augment (after-delete start end) 
-        (if (in-edit-sequence?)
-            (set! need-to-dirty? #t)
-            (oc-set-dirty (get-tab)))
-        (inner (void) after-delete start end))
-      
-      (define/augment (after-edit-sequence)
-        (when need-to-dirty?
-          (set! need-to-dirty? #f)
-          (oc-set-dirty (get-tab)))
-        (inner (void) after-edit-sequence))
-      
-      (define/augment (after-load-file success?)
-        (when success? 
-          (oc-set-dirty (get-tab)))
-        (inner (void) after-load-file success?))
-      
-      (define/augment (after-set-next-settings new-settings)
-        (oc-language-change (get-tab))
-        (inner (void) after-set-next-settings new-settings))
-      
-      (define/augment (after-save-file success?)
-        (when success?
-          (define bx (box #f))
-          (define path (get-filename bx))
-          (when (and path
-                     (not (unbox bx)))
-            (for ([frame (in-list (send (group:get-the-frame-group) get-frames))])
-              (when (is-a? frame drracket:unit:frame%)
-                (for ([tab (in-list (send frame get-tabs))])
-                  (send tab set-dirty-if-dep path))))))
-        (inner (void) after-save-file success?))
-      
-      (super-new)))
-  
-  (define module-language-online-expand-rep-mixin
-    (mixin (drracket:rep:text<%>) ()
-      (inherit get-definitions-text)
-      (define/override (on-highlighted-errors loc/s)
-        (send (get-definitions-text) set-bottom-bar-most-recent-jumped-to-loc
-              (and (not (list? loc/s)) loc/s))
-        (super on-highlighted-errors loc/s))
-      (super-new)))
-  
-  (define module-language-online-expand-frame-mixin
-    (mixin (frame:basic<%> frame:info<%> drracket:unit:frame<%>) ()
-      (inherit get-info-panel get-current-tab)
-      
-      (define expand-error-parent-panel #f)
-      (define expand-error-panel #f)
-      (define expand-error-message #f)
-      (define expand-error-button-parent-panel #f)
-      (define expand-error-install-suggestions-panel #f)
-      (define expand-error-single-child #f)
-      (define expand-error-multiple-child #f)
-      (define expand-error-zero-child #f)
-      
-      ;; colors : (or/c #f (listof string?))
-      (define colors #f)
-      (define tooltip-labels #f)
-      (define/public (get-online-expansion-colors) colors)
-      
-      (super-new)
-      
-      (define/override (make-root-area-container cls parent)
-        (set! expand-error-parent-panel
-              (super make-root-area-container vertical-panel% parent))
-        (define root (make-object cls expand-error-parent-panel))
-        (set! expand-error-panel
-              (new horizontal-panel% 
-                   [stretchable-height #f]
-                   [parent expand-error-parent-panel]))
-        
-        (set! expand-error-message (new error-message%
-                                        [parent expand-error-panel]
-                                        [stretchable-width #t]
-                                        [msgs '("hi")]
-                                        [err? #f]))
-        (set! expand-error-button-parent-panel
-              (new horizontal-panel%
-                   [stretchable-width #f]
-                   [stretchable-height #f]
-                   [parent expand-error-panel]))
-        (set! expand-error-install-suggestions-panel
-              (new horizontal-panel%
-                   [stretchable-width #f]
-                   [stretchable-height #f]
-                   [parent expand-error-panel]))
-        (set! expand-error-single-child
-              (new button% 
-                   [parent expand-error-button-parent-panel]
-                   [stretchable-width #t]
-                   [label sc-jump-to-error]
-                   [font small-control-font]
-                   [callback (λ (b evt) (send (send (get-current-tab) get-defs) expand-error-next))]))
-        (set! expand-error-multiple-child
-              (new horizontal-panel% [parent expand-error-button-parent-panel]))
-        (set! expand-error-zero-child
-              (new horizontal-panel% [parent expand-error-button-parent-panel]))
-        (new button% 
-             [label "<"]
-             [font small-control-font]
-             [callback (λ (b evt) (send (send (get-current-tab) get-defs) expand-error-prev))]
-             [parent expand-error-multiple-child])
-        (new message% 
-             [parent expand-error-multiple-child]
-             [label sc-jump-to-error])
-        (new button% 
-             [label ">"]
-             [font small-control-font]
-             [callback (λ (b evt) (send (send (get-current-tab) get-defs) expand-error-next))]
-             [parent expand-error-multiple-child])
-        (new close-icon% 
-             [parent expand-error-panel]
-             [callback (λ () (send (send (get-current-tab) get-defs)
-                                   hide-module-language-error-panel))])
-        
-        ;; this canvas makes sure that the expand-error-panel always has the same height,
-        ;; even when the contents of expand-error-button-parent-panel change. At this
-        ;; point in the construction of the frame, everything is in there so we can
-        ;; see how tall that is and then the spacer will insist it stays that high.
-        (send expand-error-panel reflow-container)
-        (define the-height (send expand-error-panel get-height))
-        (define spacer-canvas (new (class panel%
-                                     (define/override (container-size info)
-                                       (values 0 the-height))
-                                     (super-new 
-                                      [stretchable-width #f]
-                                      [stretchable-height #f]
-                                      [parent expand-error-panel]))))
-        
-        (send expand-error-parent-panel change-children (λ (l) (remq expand-error-panel l)))
-        root)
-      
-      (define expand-error-msgs #f)
-      (define expand-error-msgs+stack "")
-      (define expand-error-msg-is-err? #f)
-      (define expand-error-srcloc-count 0)
-      (define expand-error-hidden? #f)
-      (define expand-error-install-suggestions '())
-      
-      (define/public (set-expand-error/status hidden? msgs msgs+stacks err?
-                                              srcloc-count install-suggestions)
-        (unless (and (equal? expand-error-hidden? hidden?)
-                     (equal? expand-error-msgs msgs)
-                     (equal? expand-error-msgs+stack msgs+stacks)
-                     (equal? expand-error-msg-is-err? err?)
-                     (equal? expand-error-srcloc-count srcloc-count))
-          (set! expand-error-hidden? hidden?)
-          (set! expand-error-msgs msgs)
-          (set! expand-error-msgs+stack msgs+stacks)
-          (set! expand-error-msg-is-err? err?)
-          (set! expand-error-srcloc-count srcloc-count)
-          (set! expand-error-install-suggestions install-suggestions)
-          (when expand-error-message
-            (send expand-error-parent-panel change-children
-                  (λ (l) (if hidden?
-                             (if (memq expand-error-panel l)
-                                 (remq expand-error-panel l)
-                                 l)
-                             (if (memq expand-error-panel l)
-                                 l
-                                 (append l (list expand-error-panel))))))
-            (send expand-error-message set-msgs 
-                  expand-error-msgs expand-error-msg-is-err? expand-error-msgs+stack)
-            (send expand-error-install-suggestions-panel change-children (λ (l) '()))
-            (when expand-error-install-suggestions
-              (cond
-                [(null? expand-error-install-suggestions) 
-                 (new button% 
-                      [parent expand-error-install-suggestions-panel]
-                      [callback 
-                       (λ (_1 _2)
-                         (pkg-catalog-update-local/simple-status-dialog 
-                          #:parent
-                          (send expand-error-install-suggestions-panel get-top-level-window)))]
-                      [font small-control-font]
-                      [label (string-constant update-catalog)])]
-                [else
-                 (for ([suggestion-pkg (in-list expand-error-install-suggestions)])
-                   (new button% 
-                        [parent expand-error-install-suggestions-panel]
-                        [callback 
-                         (λ (_1 _2)
-                           (install-pkg
-                            (send expand-error-install-suggestions-panel get-top-level-window)
-                            (lambda (thunk)
-                              (parameterize ([error-display-handler 
-                                              drracket:init:original-error-display-handler])
-                                (thunk)))
-                            #:package-to-offer suggestion-pkg))]
-                        [font small-control-font]
-                        [label (format (string-constant install-package-button) 
-                                       suggestion-pkg)]))]))
-            (send expand-error-button-parent-panel change-children
-                  (λ (l)
-                    (list (cond
-                            [(not err?) expand-error-zero-child]
-                            [(= srcloc-count 0) expand-error-zero-child]
-                            [(= srcloc-count 1) expand-error-single-child]
-                            [else expand-error-multiple-child])))))))
-      
-      (define/augment (on-tab-change from-tab to-tab)
-        (oc-new-active)
-        (send (send to-tab get-defs) update-frame-expand-error)
-        (send to-tab update-little-dot)
-        (inner (void) on-tab-change from-tab to-tab))
-
-      (define/override (on-activate active?)
-        (oc-new-active)
-        (super on-activate active?))
-      
-      (define/public (frame-show-bkg-running new-colors labels)
-        (unless (equal? tooltip-labels labels)
-          (set! tooltip-labels labels)
-          (update-tooltip))
-        (unless (equal? new-colors colors)
-          (set! colors new-colors)
-          (send running-canvas refresh)))
-     
-      (define tooltip-frame #f)
-      (define/private (show-tooltip)
-        (define tooltip-labels-to-show
-          (if (preferences:get 'drracket:online-compilation-default-on)
-              tooltip-labels
-              (list (string-constant online-expansion-is-disabled))))
-        (cond
-          [tooltip-labels-to-show
-           (unless tooltip-frame
-             (set! tooltip-frame (new tooltip-frame%)))
-           (send tooltip-frame set-tooltip tooltip-labels-to-show)
-           (define-values (rx ry) (send running-canvas client->screen 0 0))
-           (define-values (cw ch) (send running-canvas get-client-size))
-           (send tooltip-frame show-over rx ry cw ch #:prefer-upper-left? #t)]
-          [else
-           (when tooltip-frame
-             (send tooltip-frame show #f))]))
-      
-      (define/private (update-tooltip)
-        (when tooltip-frame
-          (cond
-            [(or tooltip-labels
-                 (not (preferences:get 'drracket:online-compilation-default-on)))
-             (when (send tooltip-frame is-shown?)
-               ;; just call this, as it updates the tooltip label already
-               (show-tooltip))]
-            [else
-             (send tooltip-frame show #f)])))
-      
-      (define/private (hide-tooltip)
-        (when tooltip-frame
-          (send tooltip-frame show #f)))
-
-      (define parens-mismatch-str "())")
-      (define ball-size 10)
-      (define parens-mismatch-font
-        (send the-font-list find-or-create-font
-              (send small-control-font get-point-size)
-              (send small-control-font get-face)
-              (send small-control-font get-family)
-              (send small-control-font get-style)
-              'bold
-              (send small-control-font get-underlined)
-              (send small-control-font get-smoothing)
-              (send small-control-font get-size-in-pixels)))
-              
-      (define running-canvas
-        (let ([tlw this])
-          (new (class canvas%
-                 (inherit get-dc popup-menu refresh get-client-size)
-                 (define/override (on-paint)
-                   (let ([dc (get-dc)])
-                     (define colors-to-draw
-                       (cond
-                         [(not (in-module-language tlw)) #f]
-                         [(preferences:get 'drracket:online-compilation-default-on)
-                          colors]
-                         [else (list "red")]))
-                     (when colors-to-draw
-                       (send dc set-smoothing 'aligned)
-                       (send dc set-pen "black" 1 'transparent)
-                       (send dc set-text-foreground "darkred")
-                       (send dc set-font parens-mismatch-font)
-                       (define-values (tw th td ta) (send dc get-text-extent parens-mismatch-str))
-                       (define-values (cw ch) (get-client-size))
-                       (when (list? colors-to-draw)
-                         (define len (length colors-to-draw))
-                         (for ([color (in-list colors-to-draw)]
-                               [i (in-naturals)])
-                           (if color
-                               (send dc set-brush color 'solid)
-                               (send dc set-brush "black" 'transparent))
-                           (send dc draw-arc 
-                                 (- (/ cw 2) (/ ball-size 2))
-                                 (- (/ ch 2) (/ ball-size 2))
-                                 ball-size ball-size
-                                 (+ (* pi 1/2) (* 2 pi (/ i len)))
-                                 (+ (* pi 1/2) (* 2 pi (/ (+ i 1) len)))))))))
-                 (define cb-proc (λ (sym new-val)
-                                   (set! colors #f)
-                                   (refresh)))
-                 (preferences:add-callback 'drracket:online-compilation-default-on cb-proc #t)
-                 (define/override (on-event evt) 
-                   (cond
-                     [(not (in-module-language tlw)) (void)]
-                     [(send evt button-down?)
-                      (define menu (new popup-menu%))
-                      (define on? (preferences:get 'drracket:online-compilation-default-on))
-                      (new menu-item% 
-                           [parent menu]
-                           [label (if on?
-                                      (string-constant disable-online-expansion)
-                                      (string-constant enable-online-expansion))]
-                           [callback
-                            (λ args
-                              (preferences:set 'drracket:online-compilation-default-on (not on?)))])
-                      (popup-menu menu (send evt get-x) (send evt get-y))]
-                     [(send evt entering?)
-                      (show-tooltip)]
-                     [(send evt leaving?)
-                      (hide-tooltip)]))
-                 (super-new [style '(transparent)]
-                            [parent (get-info-panel)]
-                            [stretchable-width #f]
-                            [stretchable-height #f]
-                            [min-width 10]
-                            [min-height 10])
-                 
-                 (inherit min-width min-height)
-                 (let ([dc (get-dc)])
-                   (send dc set-font parens-mismatch-font)
-                   (define-values (w h d a) (send dc get-text-extent parens-mismatch-str))
-                   (min-width (ceiling (inexact->exact (max w ball-size))))
-                   (min-height (ceiling (inexact->exact (max h ball-size)))))))))))
-  
-  (define error-message%
-    (class canvas%
-      (init-field msgs err? [copy-msg ""])
-      (inherit refresh get-dc get-client-size popup-menu)
-      (define/public (set-msgs _msgs _err? _copy-msg) 
-        (set! msgs _msgs)
-        (set! err? _err?)
-        (set! copy-msg _copy-msg)
-        (set-the-height/dc-font (editor:get-current-preferred-font-size))
-        (refresh))
-      (define/override (on-event evt)
-        (cond
-          [(and (send evt button-down?) err?)
-           (define m (new popup-menu%))
-           (define itm (new menu-item% 
-                            [label (string-constant copy-menu-item)]
-                            [parent m]
-                            [callback
-                             (λ (itm evt)
-                               (send the-clipboard set-clipboard-string 
-                                     copy-msg
-                                     (send evt get-time-stamp)))]))
-           (popup-menu m 
-                       (+ (send evt get-x) 1)
-                       (+ (send evt get-y) 1))]
-          [else
-           (super on-event evt)]))
-      (define/override (on-paint)
-        (define dc (get-dc))
-        (define-values (cw ch) (get-client-size))
-        (send dc set-text-foreground (if err? "firebrick" "black"))
-        (define tot-th
-          (for/sum ([msg (in-list msgs)])
-            (define-values (tw th td ta) (send dc get-text-extent msg))
-            th))
-        (for/fold ([y (- (/ ch 2) (/ tot-th 2))]) ([msg (in-list msgs)])
-          (define-values (tw th td ta) (send dc get-text-extent msg))
-          (send dc draw-text msg 2 y)
-          (+ y th)))
-      (super-new [style '(transparent)])
-      
-      ;; need object to hold onto this function, so this is
-      ;; intentionally a private field, not a method
-      (define (font-size-changed-callback _ new-prefs)
-        (define new-size (editor:font-size-pref->current-font-size new-prefs))
-        (set-the-height/dc-font new-size)
-        (refresh))
-      (preferences:add-callback
-       'framework:standard-style-list:font-size
-       font-size-changed-callback
-       #t)
-      
-      (define/private (set-the-height/dc-font font-size)
-        (define dc (get-dc))
-        (send dc set-font 
-              (send the-font-list find-or-create-font
-                    font-size
-                    (send normal-control-font get-family)
-                    (if err? 
-                        'italic
-                        (send normal-control-font get-style))
-                    (send normal-control-font get-weight)
-                    (send normal-control-font get-underlined)
-                    (send normal-control-font get-smoothing)))
-        (define tot-th
-          (for/sum ([msg (in-list msgs)])
-            (define-values (tw th td ta) (send dc get-text-extent msg))
-            th))
-        (min-height (inexact->exact (ceiling tot-th))))
-      
-      (inherit min-height)
-      (set-the-height/dc-font
-       (editor:get-current-preferred-font-size))))
-  
-  (define yellow-message%
-    (class canvas%
-      (inherit get-dc refresh get-client-size
-               min-width min-height
-               get-parent)
-      (define labels '(""))
-      (define/public (set-lab _ls) 
-        (unless (equal? labels _ls)
-          (set! labels _ls)
-          (update-size)
-          (refresh)))
-      (define/private (update-size)
-        (define dc (get-dc))
-        (send dc set-font small-control-font)
-        (define-values (w h _1 _2) (send dc get-text-extent (car labels)))
-        (send (get-parent) begin-container-sequence)
-        (min-width (+ 5 (inexact->exact (ceiling w))))
-        (min-height (+ 5 (* (length labels) (inexact->exact (ceiling h)))))
-        (send (get-parent) end-container-sequence)
-        (send (get-parent) reflow-container))
-      (define/override (on-paint)
-        (define dc (get-dc))
-        (send dc set-font small-control-font)
-        (define-values (w h) (get-client-size))
-        (define-values (tw th _1 _2) (send dc get-text-extent (car labels)))
-        (send dc set-pen "black" 1 'transparent)
-        (send dc set-brush "LemonChiffon" 'solid)
-        (send dc set-pen "black" 1 'solid)
-        (send dc draw-rectangle 0 0 (- w 1) (- h 1))
-        (for ([label (in-list labels)]
-              [i (in-naturals)])
-          (send dc draw-text label 2 (+ 2 (* i th)))))
-      (super-new [stretchable-width #f] [stretchable-height #f])))
-
-  
-  ;; get-current-oc-state : -> (or/c tab #f) (or/c tab #f) (listof tab) (listof tab)
-  ;; the tabs in the results are only those that are in the module language
-  (define (get-current-oc-state)
-    (define running-tab #f)
-    (define dirty/pending-tab #f)
-    (define dirty-tabs '())
-    (define clean-tabs '())
-    (for ([frame (in-list (send (group:get-the-frame-group) get-frames))])
-      (when (is-a? frame drracket:unit:frame<%>)
-        (for ([tab (in-list (send frame get-tabs))])
-          (define ts (send tab get-oc-status))
-          (when (tab-in-module-language tab)
-            (cond
-              [(dirty? ts)
-               (cond
-                 [(dirty-timer-pending? ts)
-                  (when dirty/pending-tab 
-                    (error 'get-current-oc-state "found multiple dirty/pending tabs"))
-                  (set! dirty/pending-tab tab)]
-                 [else
-                  (set! dirty-tabs (cons tab dirty-tabs))])]
-              [(running? ts)
-               (when running-tab (error 'get-current-oc-state "found multiple running tabs"))
-               (set! running-tab tab)]
-              [(clean? ts)
-               (set! clean-tabs (cons tab clean-tabs))])))))
-    (values running-tab dirty/pending-tab dirty-tabs clean-tabs))
-  
-  (define (oc-check-invariant id)
-    (define-values (running-tab dirty/pending-tab dirty-tabs clean-tabs) (get-current-oc-state))
-    
-    (define (tab->fn tab/f)
-      (and (is-a? tab/f drracket:unit:tab%)
-           (let ([fn (send (send tab/f get-defs) get-filename)])
-             (if fn
-                 (let-values ([(base name dir?) (split-path fn)])
-                   (path->string name))
-                 "untitled"))))
-    (define (die str)
-      (error 'oc-check-invariant "just after call to ~a: ~a"
-             id
-             str))
-    
-    (for ([frame (in-list (send (group:get-the-frame-group) get-frames))])
-      (when (is-a? frame drracket:unit:frame<%>)
-        (for ([tab (in-list (send frame get-tabs))])
-          (define ts (send tab get-oc-status))
-          (cond
-            [(running? ts)
-             (unless (eq? running-tab tab)
-               (die (format "running-tab (~a) not the same as a tab with running status (~a)"
-                            (tab->fn running-tab)
-                            (tab->fn tab))))]
-            [(and (dirty? ts)
-                  (dirty-timer-pending? ts))
-             (unless (eq? dirty/pending-tab tab)
-               (die
-                (format "dirty/pending-tab (~a) not the same as a tab with timer-pending status (~a)"
-                        (tab->fn running-tab)
-                        (tab->fn tab))))])))))
-          
-
-  
-  (define (oc-maybe-start-something)
-    (define-values (running-tab dirty/pending-tab dirty-tabs clean-tabs) (get-current-oc-state))
-    (cond
-      [running-tab
-       (line-of-interest)
-       (void)]
-      [dirty/pending-tab 
-       (line-of-interest)
-       (void)]
-      [else
-       (define focus-tab (get-focus-tab))
-       (define tab-to-start
-         (cond
-           [(member focus-tab dirty-tabs)
-            (line-of-interest)
-            focus-tab]
-           [(null? dirty-tabs)
-            (line-of-interest)
-            #f]
-           [else
-            (line-of-interest)
-            (argmax (λ (tab) (send tab get-last-touched)) 
-                    dirty-tabs)]))
-       (when tab-to-start
-         (send tab-to-start set-oc-status (dirty #t))
-         (postpone-oc-timer))]))
-  
-  ;; oc-stop-improper-tabs : -> void
-  ;; if the focused tab is dirty, then stop anything that might
-  ;; be pending or running in preparation to run the focused tab
-  (define (oc-stop-improper-tabs)
-    (define-values (running-tab dirty/pending-tab dirty-tabs clean-tabs) (get-current-oc-state))
-    (define focus-tab (get-focus-tab))
-    (line-of-interest)
-    (when (and focus-tab (dirty? (send focus-tab get-oc-status)))
-      (cond
-        [running-tab
-         (line-of-interest)
-         (unless (eq? running-tab focus-tab)
-           (line-of-interest)
-           (stop-place-running)
-           (send running-tab set-oc-status (dirty #f)))]
-        [dirty/pending-tab 
-         (line-of-interest)
-         (unless (eq? dirty/pending-tab focus-tab)
-           (line-of-interest)
-           (send dirty/pending-tab set-oc-status (dirty #f))
-           (send oc-timer stop))])))
-    
-  (define/oc-log (oc-remove-tab tab)
-    (define-values (running-tab dirty/pending-tab dirty-tabs clean-tabs) (get-current-oc-state))
-    (cond
-      [(eq? tab running-tab)
-       (line-of-interest)
-       (stop-place-running)
-       (send tab set-oc-status (clean #f #f))]
-      [(eq? tab dirty/pending-tab)
-       (line-of-interest)
-       (send oc-timer stop)
-       (send tab set-oc-status (clean #f #f))]
-      [else
-       (line-of-interest)
-       (void)])
-    (oc-maybe-start-something))
-  
-  (define/oc-log (oc-pref-set new-val)
-    (cond
-      [new-val
-       (line-of-interest)
-       (oc-maybe-start-something)]
-      [else
-       (define-values (running-tab dirty/pending-tab dirty-tabs clean-tabs) (get-current-oc-state))
-       (when running-tab
-         (line-of-interest)
-         (stop-place-running)
-         (send running-tab set-oc-status (dirty #f)))
-       (when dirty/pending-tab
-         (line-of-interest)
-         (send dirty/pending-tab set-oc-status (dirty #f))
-         (send oc-timer stop))]))
-  
-  (preferences:add-callback 
-   'drracket:online-compilation-default-on
-   (λ (_ new-val) (queue-callback (λ () (oc-pref-set new-val)))))
-  
-  (define/oc-log (oc-set-dirty tab)
-    (when (preferences:get 'drracket:online-compilation-default-on)
-      (when (tab-in-module-language tab)
-        (define-values (running-tab dirty/pending-tab dirty-tabs clean-tabs) (get-current-oc-state))
-        (cond
-          [(eq? running-tab tab)
-           (line-of-interest)
-           (stop-place-running)
-           (send tab set-oc-status (dirty #f))
-           (oc-maybe-start-something)]
-          [(eq? dirty/pending-tab tab)
-           (line-of-interest)
-           (postpone-oc-timer)]
-          [else
-           (line-of-interest)
-           (send tab set-oc-status (dirty #f))
-           (oc-stop-improper-tabs)
-           (oc-maybe-start-something)]))))
-  
-  (define/oc-log (oc-new-active)
-    (when (preferences:get 'drracket:online-compilation-default-on)
-      (line-of-interest)
-      (oc-stop-improper-tabs)
-      (oc-maybe-start-something)))
-  
-  (define/oc-log (oc-language-change tab)
-    (when (preferences:get 'drracket:online-compilation-default-on)
-      (cond
-        [(tab-in-module-language tab) 
-         (line-of-interest)
-         (send tab set-oc-status (dirty #f))
-         (oc-stop-improper-tabs)
-         (oc-maybe-start-something)]
-        [else
-         (line-of-interest)
-         (define ts (send tab get-oc-status)) 
-         (cond
-           [(running? ts)
-            (line-of-interest)
-            (stop-place-running)
-            (send tab set-oc-status (dirty #f))]
-           [(and (dirty? ts)
-                 (dirty-timer-pending? ts))
-            (line-of-interest)
-            (send tab set-oc-status (dirty #f))
-            (send oc-timer stop)]
-           [else
-            (send tab set-oc-status (dirty #f))])
-         (oc-maybe-start-something)])))
-
-  (define/oc-log (oc-timer-expired)
-    (define-values (running-tab dirty/pending-tab dirty-tabs clean-tabs) (get-current-oc-state))
-    (when dirty/pending-tab
-      (define-values (editor-contents filename/loc) 
-        (send (send dirty/pending-tab get-defs) fetch-data-to-send))
-      (cond
-        [editor-contents
-         (line-of-interest)
-         (when running-tab
-           (line-of-interest)
-           (stop-place-running)
-           (send running-tab set-oc-status (dirty #f)))
-         (send dirty/pending-tab set-oc-status (running 'running sc-online-expansion-running))
-         (define settings (tab-in-module-language dirty/pending-tab))
-         (send-to-place editor-contents
-                        filename/loc
-                        (module-language-settings->prefab-module-settings settings)
-                        (λ (res) (oc-finished res))
-                        (λ (a b) (oc-status-message a b))
-                        (λ (key val) (oc-monitor-value key val))
-                        (get-currently-open-files)
-                        (send dirty/pending-tab get-defs))]
-        [else
-         (line-of-interest)
-         (send dirty/pending-tab set-oc-status
-               (clean 'exn
-                      (list (exn-info sc-only-raw-text-files-supported
-                                      (list (vector (+ filename/loc 1) 1))
-                                      '()
-                                      #f))))
-         (oc-maybe-start-something)])))
-
-  (define/oc-log (oc-finished res)    
-    (define-values (running-tab dirty/pending-tab dirty-tabs clean-tabs) (get-current-oc-state))
-    (when running-tab
-      (cond
-        [(eq? (vector-ref res 0) 'handler-results)
-         (line-of-interest)
-         ;; inform the installed handlers that something has come back
-         (for ([key-val (in-list (vector-ref res 1))])
-           (define that-key (list-ref key-val 0))
-           (define val (list-ref key-val 1))
-           (for ([o-e-h (in-list (drracket:module-language-tools:get-online-expansion-handlers))])
-             (define this-key 
-               (list (drracket:module-language-tools:online-expansion-handler-mod-path o-e-h)
-                     (drracket:module-language-tools:online-expansion-handler-id o-e-h)))
-             (when (equal? this-key that-key)
-               (cond
-                 [(drracket:module-language-tools:online-expansion-handler-monitor? o-e-h)
-                  ((drracket:module-language-tools:online-expansion-handler-local-handler o-e-h)
-                   (send running-tab get-defs)
-                   drracket:module-language-tools:done)]
-                 [else
-                  ((drracket:module-language-tools:online-expansion-handler-local-handler o-e-h) 
-                   (send running-tab get-defs)
-                   val)]))))
-         
-         (send running-tab set-oc-status (clean #f #f))
-         (send running-tab set-dep-paths (list->set (vector-ref res 2)) #f)]
-        [else
-         (line-of-interest)
-         (send running-tab set-oc-status
-               (clean (vector-ref res 0)
-                      (if (equal? (vector-ref res 0) 'abnormal-termination)
-                          (list (exn-info (if (regexp-match #rx"memory" (vector-ref res 1))
-                                              sc-abnormal-termination-out-of-memory
-                                              sc-abnormal-termination)
-                                          '() '() #f))
-                          (vector-ref res 1))))
-         (send running-tab set-dep-paths (list->set (vector-ref res 2)) #t)])
-      (oc-maybe-start-something)))
-  
-  (define/oc-log (oc-status-message sym str)
-    (define-values (running-tab dirty/pending-tab dirty-tabs clean-tabs) (get-current-oc-state))
-    (when running-tab
-      (line-of-interest)
-      (send running-tab set-oc-status (running sym str))))
-  
-  (define/oc-log (oc-monitor-value key val)
-    (define-values (running-tab dirty/pending-tab dirty-tabs clean-tabs) (get-current-oc-state))
-    (when running-tab
-      (line-of-interest)
-      (for ([handler (in-list (drracket:module-language-tools:get-online-expansion-handlers))])
-        (when (equal? (list (drracket:module-language-tools:online-expansion-handler-mod-path handler)
-                            (drracket:module-language-tools:online-expansion-handler-id handler))
-                      key)
-          (line-of-interest)
-          ((drracket:module-language-tools:online-expansion-handler-local-handler handler)
-           (send running-tab get-defs)
-           val)))))
-  
-  ;; get-focus-tab : -> (or/c tab #f)
-  (define (get-focus-tab)
-    (define tlw (get-top-level-focus-window))
-    (and (is-a? tlw drracket:unit:frame<%>)
-         (send tlw get-current-tab)))
-
-  (define oc-timer-running? #f)
-  (define oc-timer (new (class timer%
-                          (define/override (start msec just-once?)
-                            (set! oc-timer-running? #t)
-                            (super start msec just-once?))
-                          (define/override (stop)
-                            (set! oc-timer-running? #f)
-                            (super stop))
-                          (super-new [notify-callback (lambda () 
-                                                        (set! oc-timer-running? #f)
-                                                        (oc-timer-expired))]))))
-  (define (postpone-oc-timer)
-    (send oc-timer stop)
-    (send oc-timer start 250 #t))
-  
-  (define expanding-place #f)
-  (define pending-thread #f)
-  (define pending-tell-the-tab-show-bkg-running #f)
-  (define (set-pending-thread tttsbr pt) 
-    (set! pending-thread pt)
-    (set! pending-tell-the-tab-show-bkg-running tttsbr))
-  
-  (define (send-to-place editor-contents 
-                         filename 
-                         prefab-module-settings 
-                         show-results 
-                         tell-the-tab-show-bkg-running
-                         monitor-status
-                         currently-open-files
-                         defs)
-    (unless expanding-place
-      (set! expanding-place (dynamic-place expanding-place.rkt 'start))
-      (place-channel-put expanding-place module-language-compile-lock)
-      (place-channel-put
-       expanding-place 
-       (for/list ([o-e-h (in-list (drracket:module-language-tools:get-online-expansion-handlers))])
-         (list (drracket:module-language-tools:online-expansion-handler-mod-path o-e-h)
-               (drracket:module-language-tools:online-expansion-handler-id o-e-h)
-               (drracket:module-language-tools:online-expansion-handler-monitor? o-e-h)))))
-    
-    (for ([o-e-h (in-list (drracket:module-language-tools:get-online-expansion-handlers))])
-      (when (drracket:module-language-tools:online-expansion-handler-monitor? o-e-h)
-        ((drracket:module-language-tools:online-expansion-handler-local-handler o-e-h)
-         defs
-         drracket:module-language-tools:start)))
-    
-    (set-pending-thread
-     tell-the-tab-show-bkg-running
-     (thread (λ () 
-               (define-values (pc-in pc-out) (place-channel))
-               (define-values (pc-status-drracket-place pc-status-expanding-place) (place-channel))
-               (define to-send
-                 (vector-immutable editor-contents
-                                   filename
-                                   pc-in 
-                                   prefab-module-settings
-                                   pc-status-expanding-place
-                                   currently-open-files))
-               (place-channel-put expanding-place to-send)
-               (define us (current-thread))
-               (thread (λ () 
-                         (define got-status-update (place-channel-get pc-status-drracket-place))
-                         ;; when got-status-update isn't 'finished-expansion, then
-                         ;; that means that expansion won't ever finish (due to
-                         ;; an error or an aborted job)
-                         (when (equal? got-status-update 'finished-expansion)
-                           (queue-callback
-                            (λ ()
-                              (when (and (eq? us pending-thread)
-                                         pending-tell-the-tab-show-bkg-running)
-                                (pending-tell-the-tab-show-bkg-running
-                                 'finished-expansion
-                                 sc-online-expansion-running)))))))
-               
-               ;; this loop catches all responses but handles the monitor response
-               ;; response here and keeps waiting for the actual result in that case.
-               (let loop ()
-                 (define res (place-channel-get pc-out))
-                 (cond
-                   [(equal? (vector-ref res 0) 'monitor-message)
-                    (queue-callback
-                     (λ ()
-                       (when (getenv "PLTDRPLACEPRINT")
-                         (printf "PLTDRPLACEPRINT: got monitor result back from the place\n"))
-                       (monitor-status (vector-ref res 1) (vector-ref res 2))))
-                    (loop)]
-                   [else
-                    (queue-callback
-                     (λ ()
-                       (when (eq? us pending-thread)
-                         (set-pending-thread #f #f))
-                       (when (getenv "PLTDRPLACEPRINT")
-                         (printf "PLTDRPLACEPRINT: got results back from the place\n"))
-                       (show-results res)))]))))))
-  
-  (define (stop-place-running)
-    (when expanding-place
-      (when pending-thread
-        (place-channel-put expanding-place 'abort)
-        (set-pending-thread #f #f))))
-  
-  (struct error-range (start end [clear-highlight #:mutable]))
-  
-  (define online-compilation-error-pen-width 8)
-    
-  (define module-language-put-file-mixin
-    (mixin (text:basic<%>) ()
-      (inherit get-text last-position get-character get-top-level-window)
-
-      (define/override (put-file directory default-name)
-        (let ([tlw (get-top-level-window)])
-          (if (in-module-language tlw)
-              (let ([module-default-filename (get-module-filename)])
-                (super put-file directory module-default-filename))
-              (super put-file directory default-name))))
-      
-      ;; returns the name after "(module " suffixed with .scm
-      ;; in the beginning of the editor
-      ;; or #f if the beginning doesn't match "(module "
-      (define/private (get-module-filename)
-        (let ([open-paren (skip-whitespace 0)])
-          (or (match-paren open-paren "(")
-              (match-paren open-paren "[")
-              (match-paren open-paren "{"))))
-      
-      (define/private (match-paren open-paren paren)
-        (and (matches open-paren paren)
-             (let ([module (skip-whitespace (+ open-paren 1))])
-               (and (matches module "module")
-                    (let* ([end-module (+ module (string-length "module"))]
-                           [filename-start (skip-whitespace end-module)]
-                           [filename-end (skip-to-whitespace filename-start)])
-                      (and (not (= filename-start end-module))
-                           (string-append (get-text filename-start filename-end)
-                                          ".rkt")))))))
-      
-      
-      (define/private (matches start string)
-        (let ([last-pos (last-position)])
-          (let loop ([i 0])
-            (cond
-              [(and (i . < . (string-length string))
-                    ((+ i start) . < . last-pos))
-               (and (char=? (string-ref string i)
-                            (get-character (+ i start)))
-                    (loop (+ i 1)))]
-              [(= i (string-length string)) #t]
-              [else #f]))))
-      
-      (define/private (skip-whitespace start)
-        (let ([last-pos (last-position)])
-          (let loop ([pos start])
-            (cond
-              [(pos . >= . last-pos) last-pos]
-              [else
-               (let ([char (get-character pos)])
-                 (cond
-                   [(char-whitespace? char)
-                    (loop (+ pos 1))]
-                   [else pos]))]))))
-      
-      (define/private (skip-to-whitespace start)
-        (let ([last-pos (last-position)])
-          (let loop ([pos start])
-            (cond 
-              [(pos . >= . last-pos)
-               last-pos]
-              [(char-whitespace? (get-character pos))
-               pos]
-              [else
-               (loop (+ pos 1))]))))
-      
-      (super-new)))
-  
-  (define defs/ints-font 
-    (send the-font-list find-or-create-font 72 'swiss 'normal 'normal))
-  
-  (define big-defs/ints-label<%>
-    (interface ()
-      set-lang-wants-big-defs/ints-labels?))
-  
-  (define (mk-module-language-text-mixin id)
-    (mixin (editor<%>) (big-defs/ints-label<%>)
-      (inherit get-admin invalidate-bitmap-cache get-dc
-               dc-location-to-editor-location)
-      (define inside? #f)
-      (define recently-typed? #f)
-      (define fade-amount 1)
-      (define lang-wants-big-defs/ints-labels? #f)
-
-      (define recently-typed-timer 
-        (new logging-timer%
-             [notify-callback
-              (λ ()
-                (update-recently-typed #f)
-                (unless (equal? fade-amount 1)
-                  (cond
-                    [inside? 
-                     (set! fade-amount (+ fade-amount 1/10))
-                     (send recently-typed-timer start 100 #t)]
-                    [else
-                     (set! fade-amount 1)])
-                  (invalidate-bitmap-cache 0 0 'display-end 'display-end)))]))
-      
-      (define/public (set-lang-wants-big-defs/ints-labels? w?) 
-        (unless (equal? lang-wants-big-defs/ints-labels? w?)
-          (set! lang-wants-big-defs/ints-labels? w?)
-
-          (send recently-typed-timer stop)  ;; reset the recently-typed timer so
-          (set! fade-amount 1)              ;; that changing the language makes the
-          (set! recently-typed? #f)         ;; labels appear immediately
-          
-          (invalidate-bitmap-cache 0 0 'display-end 'display-end)))
-      
-      (define/override (on-char evt)
-        (when inside?
-          (update-recently-typed #t)
-          (set! fade-amount 0)
-          (send recently-typed-timer stop)
-          (when (and lang-wants-big-defs/ints-labels?
-                     (preferences:get 'drracket:defs/ints-labels))
-            (send recently-typed-timer start 10000 #t)))
-        (super on-char evt))
-      
-      (define/private (update-recently-typed nv)
-        (unless (equal? recently-typed? nv)
-          (set! recently-typed? nv)
-          (invalidate-bitmap-cache 0 0 'display-end 'display-end)))
-      
-      (define/override (on-event evt)
-        (define new-inside?
-          (cond
-            [(send evt leaving?) #f]
-            [else (preferences:get 'drracket:defs/ints-labels)]))
-        (unless (equal? new-inside? inside?)
-          (set! inside? new-inside?)
-          (when lang-wants-big-defs/ints-labels?
-            (invalidate-bitmap-cache 0 0 'display-end 'display-end)))
-        (cond
-          [(and lang-wants-big-defs/ints-labels?
-                (preferences:get 'drracket:defs/ints-labels)
-                (send evt button-down?)
-                (get-admin))
-           (define admin (get-admin))
-           (define dc (get-dc))
-           (define-values (tw th _1 _2) (send dc get-text-extent id defs/ints-font))
-           (define-values (mx my) (dc-location-to-editor-location 
-                                   (send evt get-x) (send evt get-y)))
-           (send admin get-view bx by bw bh)
-           (cond
-             [(and (<= (- (unbox bw) tw) mx (unbox bw))
-                   (<= (- (unbox bh) th) my (unbox bh)))
-              (define menu (new popup-menu%))
-              (new menu-item% 
-                   [label (string-constant hide-defs/ints-label)]
-                   [parent menu]
-                   [callback (λ (x y)
-                               (preferences:set 'drracket:defs/ints-labels #f))])
-              (send admin popup-menu menu (+ (send evt get-x) 1) (+ (send evt get-y) 1))]
-             [else
-              (super on-event evt)])]
-          [else (super on-event evt)]))
-      
-      (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-        (super on-paint before? dc left top right bottom dx dy draw-caret)
-        (unless before?
-          (when (and inside?
-                     (not recently-typed?)
-                     lang-wants-big-defs/ints-labels?)
-            (define admin (get-admin))
-            (when admin
-              (send admin get-view bx by bw bh)
-              (define α (send dc get-alpha))
-              (define fore (send dc get-text-foreground))
-              (send dc set-font defs/ints-font)
-              (define-values (tw th _1 _2) (send dc get-text-extent id))
-              (define tx (+ (unbox bx) (- (unbox bw) tw)))
-              (define ty (+ (unbox by) (- (unbox bh) th)))
-              (when (rectangles-intersect?
-                     left top right bottom
-                     tx ty (+ tx tw) (+ ty th))
-                (send dc set-text-foreground "black")
-                (send dc set-alpha (* fade-amount .5))
-                (send dc draw-text id (+ dx tx) (+ dy ty))
-                (send dc set-alpha α)
-                (send dc set-text-foreground fore))
-              (send dc set-font defs/ints-font)))))
-      (super-new)))
-  
-  (define bx (box 0))
-  (define by (box 0))
-  (define bw (box 0))
-  (define bh (box 0))
-  
-  (define module-language-big-defs/ints-interactions-text-mixin
-    (mk-module-language-text-mixin (string-constant interactions-window-label)))
-  (define module-language-big-defs/ints-definitions-text-mixin
-    (mk-module-language-text-mixin (string-constant definitions-window-label)))
-  
-  (define module-language-compile-lock (make-compile-lock))
-  
-  (define module-language-parallel-lock-client
-    (compile-lock->parallel-lock-client
-     module-language-compile-lock
-     (current-custodian)))
-  
-  ;; in-module-language : (or/c top-level-window<%> #f) -> module-language-settings or #f
-  (define (in-module-language tlw)
-    (and tlw
-         (is-a? tlw drracket:unit:frame<%>)
-         (tab-in-module-language (send tlw get-current-tab))))
-  
-  ;; in-module-language : tab -> module-language-settings or #f
-  (define (tab-in-module-language tab)
-    (define defs (send tab get-defs))
-    (define settings (send defs get-next-settings))
-    (define mode (send defs get-current-mode))
-    (and (is-a? (drracket:language-configuration:language-settings-language settings)
-                module-language<%>)
-         (drracket:modes:mode-intended-to-edit-programs? mode)
-         (drracket:language-configuration:language-settings-settings settings)))
-  
-  (define (initialize-prefs-panel)
-    (preferences:add-panel
-     (string-constant online-expansion)
-     (λ (parent)
-       (define parent-vp (new vertical-panel% 
-                              [parent parent]
-                              [alignment '(center top)]))
-       (new vertical-panel% [parent parent-vp])
-       (define vp (new vertical-panel% 
-                       [parent parent-vp]
-                       [stretchable-width #f]
-                       [stretchable-height #f]
-                       [alignment '(left center)]))
-       (new vertical-panel% [parent parent-vp])
-       
-       (define ((make-callback pref-sym) choice evt)
-         (preferences:set pref-sym (index->pref (send choice get-selection))))
-       (preferences:add-check (new horizontal-panel% 
-                                   [parent vp]
-                                   [stretchable-height #f]
-                                   [alignment '(center center)])
-                              'drracket:online-compilation-default-on
-                              (string-constant enable-online-expansion))
-       (new vertical-panel% [parent vp] [stretchable-height #f] [min-height 20])
-       (define read-choice
-         (new choice% 
-              [parent vp]
-              [label (string-constant online-expansion-show-read-errors-as)]
-              [callback (make-callback 'drracket:online-expansion:read-in-defs-errors)]
-              [choices (list (string-constant online-expansion-error-margin)
-                             (string-constant online-expansion-error-gold-highlight))]))
-       (define var-choice
-         (new choice% 
-              [parent vp]
-              [label (string-constant online-expansion-show-variable-errors-as)]
-              [callback (make-callback 'drracket:online-expansion:variable-errors)]
-              [choices (list (string-constant online-expansion-error-margin)
-                             (string-constant online-expansion-error-gold-highlight))]))
-       (define other-choice
-         (new choice% 
-              [parent vp]
-              [label (string-constant online-expansion-show-other-errors-as)]
-              [callback (make-callback 'drracket:online-expansion:other-errors)]
-              [choices (list (string-constant online-expansion-error-margin)
-                             (string-constant online-expansion-error-gold-highlight))]))
-       (define (connect-to-prefs choice pref-sym)
-         (preferences:add-callback 
-          pref-sym
-          (λ (pref-sym nv) (send choice set-selection (pref->index nv))))
-         (send choice set-selection (pref->index (preferences:get pref-sym))))
-       (define (index->pref n)
-         (case n
-           [(0) 'margin]
-           [(1) 'gold]))
-       (define (pref->index p)
-         (case p
-           [(margin) 0]
-           [(gold) 1]))
-       (connect-to-prefs read-choice 'drracket:online-expansion:read-in-defs-errors)
-       (connect-to-prefs var-choice 'drracket:online-expansion:variable-errors)
-       (connect-to-prefs other-choice 'drracket:online-expansion:other-errors)
-       (for ([f (in-list (drracket:module-language-tools:get-online-expansion-pref-funcs))])
-         (f vp))
-       parent-vp)))
-  
-  (define (get-currently-open-files)
-    (for*/list ([frame (in-list
-                        (send (group:get-the-frame-group) get-frames))]
-                #:when (frame . is-a? . drracket:unit:frame%)
-                [tab (in-list (send frame get-tabs))]
-                [v (in-value (send (send tab get-defs) get-filename))]
-                #:when v)
-      v))
-  
-  (define modes<%> (interface () 
-                     maybe-change-language
-                     change-mode-to-match))
-  
-  (define modes-mixin
-    (mixin ((class->interface text%)
-            mode:host-text<%>
-            drracket:unit:definitions-text<%>)
-      (modes<%>)
-          
-      (inherit get-surrogate set-surrogate 
-               get-next-settings get-tab)
-      
-      (define/augment (after-set-next-settings next-settings)
-        (change-mode-to-match)
-        (inner (void) after-set-next-settings next-settings))
-      
-      (define current-mode #f)
-      
-      (define/public (get-current-mode) current-mode)
-      (define/public (set-current-mode mode)
-        (set! current-mode mode)
-        (define surrogate (drracket:modes:mode-surrogate mode))
-        (cond
-          [(is-a? surrogate default-surrogate%)
-           (update-surrogate)]
-          [else
-           (set-surrogate surrogate)])
-        (define interactions-text (send (get-tab) get-ints))
-        (when interactions-text
-          (send interactions-text set-surrogate surrogate)
-          (send interactions-text set-submit-predicate
-                (drracket:modes:mode-repl-submit mode))))
-      
-      (define/public (is-current-mode? mode)
-        (and current-mode
-             (equal? (drracket:modes:mode-name current-mode) 
-                     (drracket:modes:mode-name mode))))
-      
-      (define/public (change-mode-to-match)
-        (let* ([language-settings (get-next-settings)]
-               [language-name 
-                (and language-settings
-                     (send (drracket:language-configuration:language-settings-language
-                            language-settings)
-                           get-language-position))])
-          (let loop ([modes (drracket:modes:get-modes)])
-            (cond
-              [(null? modes) (error 'change-mode-to-match
-                                    "didn't find a matching mode")]
-              [else (let ([mode (car modes)])
-                      (if ((drracket:modes:mode-matches-language mode) language-name)
-                          (unless (is-current-mode? mode)
-                            (set-current-mode mode))
-                          (loop (cdr modes))))]))))
-      
-      (define current-surrogate-mod #f)
-      (define current-language-end #f)
-      
-      ;; called by the surrogate-mixin to see if the surrogate needs changing if
-      ;; the mode is not the racket language mode, then this doesn't get called.
-      (define/public (maybe-change-language start)
-        (when (or (not current-language-end)
-                  (< start current-language-end))
-          (update-surrogate)))
-      
-      (define/private (update-surrogate)
-        (define defs-port (open-input-text-editor this))
-        ;; need this to count chars, not bytes (in case of non-ASCII
-        ;; in defs before #lang line)
-        (port-count-lines! defs-port)
-        (define get-info
-          (with-handlers ([exn:fail? (λ (x) #f)])
-            (read-language defs-port (λ () #f))))
-        (define-values (line col pos) (port-next-location defs-port))
-        (define new-surrogate-mod
-          (and get-info
-               (get-info 'definitions-text-surrogate #f)))
-        (set! current-language-end pos)
-        (unless (and current-surrogate-mod
-                     (equal? current-surrogate-mod new-surrogate-mod))
-          (set! current-surrogate-mod new-surrogate-mod)
-          (define new-surrogate
-            (and new-surrogate-mod
-                 (with-handlers ([exn:fail? 
-                                  (λ (x)
-                                    (log-error
-                                     (format "Error while loading surrogate; expected to be in ~s\n~a"
-                                             new-surrogate-mod
-                                             (exn-message x)))
-                                    #f)])
-                   (dynamic-require new-surrogate-mod 'surrogate%))))
-          (set-surrogate (new (if new-surrogate
-                                  (change-lang-surrogate-mixin
-                                   new-surrogate)
-                                  default-surrogate%)))))
-      
-      (super-new)))
-  
-  (define change-lang-surrogate-mixin
-    (mixin (mode:surrogate-text<%>) ()
-      (define/override (after-insert ths supr start len)
-        (super after-insert ths supr start len)
-        (when (is-a? ths modes<%>)
-          (send ths maybe-change-language start)))
-      
-      (define/override (after-delete ths supr start len)
-        (super after-delete ths supr start len)
-        (when (is-a? ths modes<%>)
-          (send ths maybe-change-language start)))
-      
-      (super-new)))
-  
-  (define default-surrogate%
-    (change-lang-surrogate-mixin
-     racket:text-mode%)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/multi-file-search.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/multi-file-search.rkt
deleted file mode 100644
index 6feecfaa45..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/multi-file-search.rkt
+++ /dev/null
@@ -1,872 +0,0 @@
-#lang racket/base
-
-(require framework
-         racket/class
-         racket/contract
-         racket/unit
-         racket/path
-         racket/list
-         racket/gui/base
-         mzlib/async-channel
-         string-constants
-         drracket/private/drsig
-         mrlib/close-icon
-         "get-module-path.rkt")
-
-(define sc-browse-collections "Browse\nCollections")
-(define sc-add-another-directory "Add Another Directory")
-
-(provide multi-file-search@)
-
-;; search-type = (make-search-type string make-searcher (listof (cons string boolean)))
-;; the param strings are the labels for checkboxes
-;; the param booleans are the default values for the checkboxes
-;; these are the available searches
-(define-struct search-type (label make-searcher params) #:transparent)
-
-;; search-info = (make-search-info (listof string) boolean (union #f regexp) search-type string)
-;; the search-string field is only informative; not used for actual searching
-(define-struct search-info (dirs recur? filter searcher search-string) #:transparent)
-
-;; search-types : (listof search-type)
-(define search-types
-  (list (make-search-type
-         (string-constant mfs-string-match/graphics)
-         (λ (info search-string) (exact-match-searcher info search-string))
-         (list (cons (string-constant mfs-case-sensitive-label) #f)))
-        (make-search-type
-         (string-constant mfs-regexp-match/no-graphics)
-         (λ (info search-string) (regexp-match-searcher info search-string))
-         (list))))
-
-;; search-entry = (make-search-entry string string number number number)
-(define-struct search-entry (base-dir filename line-string line-number col-number match-length) 
-  #:transparent)
-
-;; to make these available to be defined in the unit with the right names.
-(define _search-types search-types)
-(define _search-type-params search-type-params)
-
-(define-unit multi-file-search@
-  (import [prefix drracket:frame: drracket:frame^]
-          [prefix drracket:unit: drracket:unit^]
-          [prefix drracket: drracket:interface^])
-  (export drracket:multi-file-search^)
-  
-  (define search-type-params _search-type-params)
-  (define search-types _search-types)
-  
-  ;; multi-file-search : -> void
-  ;; opens a dialog to configure the search and initiates the search
-  (define (multi-file-search)
-    (let ([search-info  (configure-search)])
-      (when search-info
-        (open-search-window search-info))))
-  
-  ;; searcher = (string (string int int int -> void) -> void)
-  ;; this performs a single search.
-  ;; the first argument is the filename to be searched
-  ;; the second argument is called for each match.
-  ;;     the arguments are: line-string line-number col-number match-length
-  
-  ;; open-search-window : search-info -> void
-  ;; thread: eventspace main thread
-  ;; opens a window and creates the thread that does the search
-  (define (open-search-window search-info)
-    (define frame (new search-size-frame%
-                       [name 
-                        (let ([fmt-s (string-constant mfs-drscheme-multi-file-search-title)])
-                          (format 
-                           fmt-s
-                           (gui-utils:trim-string (search-info-search-string search-info)
-                                                  (- 200 (string-length fmt-s)))))]))
-    (define panel (make-object saved-vertical-resizable% (send frame get-area-container)))
-    (define button-panel (new horizontal-panel%
-                              [parent (send frame get-area-container)]
-                              [alignment '(right center)]
-                              [stretchable-height #f]))
-    (define open-button (make-object button% (string-constant mfs-open-file) button-panel
-                          (λ (x y) (open-file-callback))))
-    (define stop-button (make-object button% (string-constant mfs-stop-search) button-panel
-                          (λ (x y) (stop-callback))))
-    (define grow-box-pane (make-object grow-box-spacer-pane% button-panel))
-    
-    (define zoom-text (make-object racket:text%))
-    (define results-text (make-object results-text% zoom-text))
-    (define results-ec (instantiate searching-canvas% ()
-                         (parent panel)
-                         (editor results-text)
-                         (frame frame)))
-    (define zoom-ec (instantiate searching-canvas% ()
-                      (parent panel)
-                      (editor zoom-text)
-                      (frame frame)))
-    
-    (define (open-file-callback)
-      (send results-text open-file))
-    
-    ;; sometimes, breaking the other thread puts
-    ;; the break message in the channel behind
-    ;; many many requests. Rather than show those,
-    ;; we use the `broken?' flag as a shortcut.
-    (define broken? #f)
-    (define (stop-callback)
-      (break-thread search-thd)
-      (set! broken? #t)
-      (send stop-button enable #f))
-    
-    ;; channel : async-channel[(union 'done search-entry)]
-    (define channel (make-async-channel 100))
-    (define search-thd (thread (λ () (do-search search-info channel))))
-    
-    (send frame set-text-to-search results-text) ;; just to initialize it to something.
-    (send results-text lock #t)
-    (send frame reflow-container)
-    (send panel set-percentages (preferences:get 'drracket:multi-file-search:percentages))
-    (send frame show #t)
-    
-    (let loop ()
-      (let ([match (yield channel)])
-        (yield)
-        (cond
-          [(eq? match 'done)
-           (send results-text search-complete)
-           (send stop-button enable #f)]
-          [(or broken? (eq? match 'break))
-           (send results-text search-interrupted)]
-          [else
-           (send results-text add-match
-                 (search-entry-base-dir match)
-                 (search-entry-filename match)
-                 (search-entry-line-string match)
-                 (search-entry-line-number match)
-                 (search-entry-col-number match)
-                 (search-entry-match-length match))
-           (loop)]))))
-  
-  (define results-super-text% 
-    (text:hide-caret/selection-mixin
-     (text:line-spacing-mixin
-      (text:basic-mixin
-       (editor:standard-style-list-mixin 
-        (editor:basic-mixin
-         text%))))))
-  
-  ;; results-text% : derived from text%
-  ;; init args: zoom-text
-  ;;   zoom-text : (instance-of text%)
-  ;; public-methods:
-  ;;   add-match : string string int int int int -> void
-  ;;      adds a match to the text
-  ;;   search-interrupted : -> void
-  ;;      inserts a message saying "search interrupted".
-  ;;      search-complete is not expected to be called if this method is called.
-  ;;   search-complete : -> void
-  ;;      inserts a message saying "no matches found" if none were reported
-  (define results-text%
-    (class results-super-text%
-      (init-field zoom-text)
-      (inherit insert last-paragraph erase
-               paragraph-start-position paragraph-end-position
-               last-position change-style
-               set-clickback set-position
-               end-edit-sequence begin-edit-sequence
-               lock)
-      
-      [define filename-delta (make-object style-delta% 'change-bold)]
-      [define match-delta (let ([d (make-object style-delta%)])
-                            (send d set-delta-foreground
-                                  (make-object color%
-                                    0
-                                    160
-                                    0))
-                            d)]
-      [define hilite-line-delta (make-object style-delta% 'change-style 'italic)]
-      [define unhilite-line-delta (make-object style-delta% 'change-style 'normal)]
-      [define widest-filename #f]
-      [define/private indent-all-lines
-        ;; indent-all-lines : number -> void
-        ;; inserts `offset' spaces to the beginning of each line,
-        ;; except the last one. Must be at least one such line in the text.
-        (λ (offset)
-          (let ([spaces (make-string offset #\space)])
-            (let loop ([para (- (last-paragraph) 1)])
-              (let ([para-start (paragraph-start-position para)])
-                (insert spaces para-start para-start)
-                (change-style filename-delta para-start (+ para-start offset)))
-              (unless (zero? para)
-                (loop (- para 1))))))]
-      
-      ;; match-shown? : boolean
-      ;; indicates if a match has ever been shown.
-      ;; if not, need to clean out the "searching" message
-      ;; and show a match. Done in `add-match'
-      [define match-shown? #f]
-      
-      ;; current-file : (union #f string)
-      ;; the name of the currently viewed file, if one if viewed.
-      ;; line-in-current-file and col-in-current-file are linked
-      [define current-file #f]
-      [define line-in-current-file #f]
-      [define col-in-current-file #f]
-      
-      [define old-line #f]
-      [define/private hilite-line
-        (λ (line)
-          (begin-edit-sequence)
-          (lock #f)
-          (when old-line
-            (change-style unhilite-line-delta
-                          (paragraph-start-position old-line)
-                          (paragraph-end-position old-line)))
-          (when line
-            (change-style hilite-line-delta
-                          (paragraph-start-position line)
-                          (paragraph-end-position line)))
-          (set! old-line line)
-          (lock #t)
-          (end-edit-sequence))]
-      
-      [define/public (open-file)
-        (when current-file
-          (let ([f (handler:edit-file current-file)])
-            (when (and f
-                       (is-a? f drracket:unit:frame<%>))
-              (let* ([t (send f get-definitions-text)]
-                     [pos (+ (send t paragraph-start-position line-in-current-file)
-                             col-in-current-file)])
-                (send t set-position pos)))))]
-      
-      (define/public (add-match base-filename full-filename line-string line col match-length)
-        (lock #f)
-        (define new-line-position (last-position))
-        (define short-filename 
-          (path->string
-           (find-relative-path 
-            (normalize-path base-filename)
-            (normalize-path full-filename))))
-        (define this-match-number (last-paragraph))
-        (define len (string-length short-filename))
-        (define insertion-start #f)
-        (define (show-this-match)
-          (set! match-shown? #t)
-          (set! current-file full-filename)
-          (set! line-in-current-file line)
-          (set! col-in-current-file col)
-          (set-position new-line-position new-line-position)
-          (send zoom-text begin-edit-sequence)
-          (send zoom-text lock #f)
-          (unless (really-same-file? full-filename (send zoom-text get-filename))
-            (send zoom-text load-file/gui-error full-filename))
-          (send zoom-text set-position (send zoom-text paragraph-start-position line))
-          (let ([start (+ (send zoom-text paragraph-start-position line)
-                          col)])
-            (send zoom-text change-style match-delta start (+ start match-length)))
-          (send zoom-text lock #t)
-          (send zoom-text set-caret-owner #f 'global)
-          (hilite-line this-match-number)
-          (send zoom-text end-edit-sequence))
-        (unless match-shown?
-          (erase))
-        (unless widest-filename
-          (set! widest-filename len))
-        (if (<= len widest-filename)
-            (begin
-              (set! insertion-start (last-position))
-              (insert (make-string (- widest-filename len) #\space) 
-                      (last-position) (last-position)))
-            (begin
-              (indent-all-lines (- len widest-filename))
-              (set! insertion-start (last-position))
-              (set! widest-filename len)))
-        (let ([filename-start (last-position)])
-          (insert short-filename (last-position) (last-position))
-          (insert ": " (last-position) (last-position))
-          (change-style filename-delta insertion-start (last-position))
-          (let ([line-start (last-position)])
-            (insert line-string (last-position) (last-position))
-            (change-style match-delta
-                          (+ line-start col)
-                          (+ line-start col match-length)))
-          (set-clickback filename-start (last-position)
-                         (λ (_1 _2 _3)
-                           (show-this-match)))
-          (insert #\newline (last-position) (last-position))
-          
-          (unless match-shown?
-            (show-this-match)))
-        (lock #t))
-      
-      (define/public (search-interrupted)
-        (lock #f)
-        (insert #\newline (last-position) (last-position))
-        (insert (string-constant mfs-search-interrupted) (last-position) (last-position))
-        (lock #t))
-      
-      (define/public (search-complete)
-        (unless match-shown?
-          (lock #f)
-          (insert #\newline (last-position) (last-position))
-          (insert (string-constant mfs-no-matches-found) (last-position) (last-position))
-          (lock #t)))
-      
-      (inherit get-style-list set-style-list set-styles-sticky)
-      (super-new)
-      (send zoom-text lock #t)
-      (set-styles-sticky #f)
-      (insert (string-constant mfs-searching...))))
-  
-  (define (really-same-file? fn1 fn2)
-    (define p1 (with-handlers ((exn:fail? (λ (x) #f))) (open-input-file fn1)))
-    (define p2 (with-handlers ((exn:fail? (λ (x) #f))) (open-input-file fn2)))
-    (cond
-      [(and p1 p2)
-       (begin0
-         (= (port-file-identity p1) (port-file-identity p2))
-         (close-input-port p1)
-         (close-input-port p2))]
-      [else
-       (when p1 (close-input-port p1))
-       (when p2 (close-input-port p2))
-       #f]))
-  
-  ;; collaborates with search-size-frame%
-  (define searching-canvas%
-    (class canvas:basic%
-      (init-field frame)
-      (inherit get-editor)
-      (define/override (on-focus on?)
-        (when on?
-          (send frame set-text-to-search (get-editor)))
-        (super on-focus on?))
-      (super-new)))
-  
-  ;; thread: eventspace main thread
-  (define search-size-frame%
-    (class (drracket:frame:basics-mixin 
-            (frame:searchable-mixin
-             frame:standard-menus%))
-      (init-field name)
-      (define/override (on-size w h)
-        (preferences:set 'drracket:multi-file-search:frame-size (cons w h))
-        (super on-size w h))
-      (let ([size (preferences:get 'drracket:multi-file-search:frame-size)])
-        (super-new [label name]
-                   [width (car size)]
-                   [height (cdr size)]))))
-  
-  
-  ;; this vertical-resizable class just remembers the percentage between the
-  ;; two panels
-  ;; thread: eventspace main thread
-  (define saved-vertical-resizable%
-    (class panel:vertical-dragable%
-      (inherit get-percentages)
-      (define/augment (after-percentage-change)
-        (let ([ps (get-percentages)])
-          (when (= (length ps) 2)
-            (preferences:set 'drracket:multi-file-search:percentages ps)))
-        (inner (void) after-percentage-change))
-      (super-new)))
-  
-  
-  ;; do-search : search-info text -> void
-  ;; thread: searching thread
-  ;; called in a new thread that may be broken (to indicate a stop)
-  (define (do-search search-info channel)
-    (define filter (search-info-filter search-info))
-    (define searcher (search-info-searcher search-info))
-    (with-handlers ([exn:break? (λ (x) (async-channel-put channel 'break))])
-      (for ([dir (in-list (search-info-dirs search-info))])
-        (define get-filenames (if (search-info-recur? search-info)
-                                  (build-recursive-file-list dir filter)
-                                  (build-flat-file-list dir filter)))
-        (let loop ()
-          (let ([filename (get-filenames)])
-            (when filename
-              (searcher filename
-                        (λ (line-string line-number col-number match-length)
-                          (async-channel-put
-                           channel
-                           (make-search-entry
-                            dir
-                            filename
-                            line-string
-                            line-number
-                            col-number
-                            match-length))))
-              (loop)))))
-      (async-channel-put channel 'done)))
-  
-  ;; build-recursive-file-list : string (union regexp #f) -> (-> (union string #f))
-  ;; thread: search thread
-  (define (build-recursive-file-list dir filter)
-    (letrec ([touched (make-hash)]
-             [next-thunk (λ () (process-dir dir (λ () #f)))]
-             [process-dir
-              ; string[dirname] (listof string[filename]) -> (listof string[filename])
-              (λ (dir k)
-                (let* ([key (normalize-path dir)]
-                       [traversed? (hash-ref touched key (λ () #f))])
-                  (if traversed? 
-                      (k)
-                      (begin
-                        (hash-set! touched key #t)
-                        (process-dir-contents 
-                         (map (λ (x) (build-path dir x))
-                              (directory-list dir))
-                         k)))))]
-             [process-dir-contents
-              ; string[dirname] (listof string[filename]) -> (listof string[filename])
-              (λ (contents k)
-                (cond
-                  [(null? contents) 
-                   (k)]
-                  [else 
-                   (let ([file/dir (car contents)])
-                     (cond
-                       [(and (file-exists? file/dir)
-                             (or (not filter)
-                                 (regexp-match filter (path->string file/dir))))
-                        (set! next-thunk
-                              (λ ()
-                                (process-dir-contents (cdr contents) k)))
-                        file/dir]
-                       [(directory-exists? file/dir)
-                        (process-dir-contents 
-                         (cdr contents)
-                         (λ ()
-                           (process-dir file/dir k)))]
-                       [else 
-                        (process-dir-contents (cdr contents) k)]))]))])
-      (λ () (next-thunk))))
-  
-  ;; build-flat-file-list : path (union #f regexp) -> (-> (union string #f))
-  ;; thread: searching thread
-  (define (build-flat-file-list dir filter)
-    (let ([contents (map (λ (x) (build-path dir x)) (directory-list dir))])
-      (λ ()
-        (let loop ()
-          (cond
-            [(null? contents)
-             #f]
-            [(and filter (regexp-match filter (path->string (car contents))))
-             (begin0
-               (car contents)
-               (set! contents (cdr contents)))]
-            [else
-             (set! contents (cdr contents))
-             (loop)]))))))
-
-;; configure-search : -> (union #f search-info)
-;; thread: eventspace main thread
-;; configures the search
-(define (configure-search)
-  (keymap:call/text-keymap-initializer
-   (λ ()
-     (define dialog (new dialog%
-                         [label (string-constant mfs-configure-search)]
-                         [width 500]
-                         [style '(resize-border)]
-                         [stretchable-height #f]))
-     (define outer-files-panel (make-object vertical-panel% dialog '(border)))
-     (define outer-method-panel (make-object vertical-panel% dialog '(border)))
-     (define button-panel (new horizontal-panel% 
-                               [parent dialog]
-                               [alignment '(right center)]
-                               [stretchable-height #f]))
-     (define files-label (make-object message% (string-constant mfs-files-section) 
-                           outer-files-panel))
-     (define files-inset-outer-panel (make-object horizontal-panel% outer-files-panel))
-     (define files-inset-panel (make-object horizontal-panel% files-inset-outer-panel))
-     (define files-panel (make-object vertical-panel% files-inset-outer-panel))
-     (define method-label (make-object message% (string-constant mfs-search-section) 
-                            outer-method-panel))
-     (define method-inset-outer-panel (make-object horizontal-panel% outer-method-panel))
-     (define method-inset-panel (make-object horizontal-panel% method-inset-outer-panel))
-     (define method-panel (make-object vertical-panel% method-inset-outer-panel))
-     
-     (define multi-dir+browse-collections-panel (new horizontal-panel% 
-                                                     [alignment '(center top)]
-                                                     [stretchable-height #f]
-                                                     [parent files-panel]))
-     (define multi-dir-panel (new vertical-panel% [parent multi-dir+browse-collections-panel]))
-     (define dir-fields '())
-     (define (add-a-dir-field init-value)
-       (send dialog begin-container-sequence)
-       (define need-to-add-closers? (and (pair? dir-fields) (null? (cdr dir-fields))))
-       (define dir-panel (new horizontal-panel%
-                              [parent multi-dir-panel]
-                              [stretchable-height #f]))
-       (define dir-field
-         (new combo-field%
-              [parent dir-panel] 
-              [label (string-constant mfs-dir)] 
-              [choices (preferences:get 'drracket:multi-file-search:directories)]
-              [init-value init-value]
-              [stretchable-width #t] 
-              [stretchable-height #f]
-              [callback (λ (x y) (update-directory-prefs))]))
-     
-       (define dir-button (new button% 
-                               [label (string-constant browse...)]
-                               [parent dir-panel]
-                               [callback (λ (x y) (dir-button-callback))]))
-       (define (dir-button-callback) 
-         (define old-d (string->path (send dir-field get-value)))
-         (define new-d (get-directory #f 
-                                      #f 
-                                      (and (directory-exists? old-d)
-                                           old-d)))
-         (when (and new-d
-                    (directory-exists? new-d))
-           (define str (path->string new-d))
-           (send dir-field set-value str)
-           (update-directory-prefs)))
-       (set! dir-fields (cons dir-field dir-fields))
-       (update-directory-prefs)
-       (cond
-         [(null? (cdr dir-fields))
-          ;; len=1 : add to none of them
-          (void)]
-         [(null? (cddr dir-fields))
-          ;; len=2 : add to all of them
-          (for ([dir-panel (in-list (send multi-dir-panel get-children))])
-            (add-a-closer dir-panel))]
-         [else
-          ;; len>2 : add to this one
-          (add-a-closer dir-panel)])
-       (send dialog end-container-sequence))
-       
-     (define (add-a-closer dir-panel)
-       (define ci
-         (new close-icon%
-              [parent dir-panel]
-              [callback
-               (λ () (remove-a-dir-panel dir-panel))]))
-       (send dir-panel change-children
-             (λ (l)
-               (append (remove ci l) (list ci)))))
-     
-     (define (remove-a-dir-panel dir-panel)
-       (define dir-field (for/or ([child (in-list (send dir-panel get-children))])
-                           (and (is-a? child combo-field%)
-                                child)))
-       (set! dir-fields (remove dir-field dir-fields))
-       (send multi-dir-panel change-children (λ (l) (remove dir-panel l)))
-       (update-directory-prefs)
-       (when (and (pair? dir-fields)
-                  (null? (cdr dir-fields)))
-         ;; only one dir field left, get rid of the close-icon
-         (let loop ([parent multi-dir-panel])
-           (for ([child (in-list (send parent get-children))])
-             (cond
-               [(is-a? child close-icon%) 
-                (send parent change-children (λ (l) (remove child l)))]
-               [(is-a? child area-container<%>) (loop child)])))))
-     
-     (define (update-directory-prefs)
-       (define new-pref
-         (for/list ([dir-field (in-list dir-fields)])
-           (define dfv (send dir-field get-value))
-           (and (path-string? dfv) dfv)))
-       (when (andmap values new-pref)
-         (preferences:set 'drracket:multi-file-search:directory new-pref)))
-     
-     (define browse-collections-button 
-       (new button%
-            [label sc-browse-collections]
-            [parent multi-dir+browse-collections-panel]
-            [callback (λ (x y) 
-                        (define paths (get-module-path-from-user #:dir? #t))
-                        (when paths
-                          (define delta-dirs (- (length dir-fields) (length paths)))
-                          (cond
-                            [(< delta-dirs 0)
-                             (for ([x (in-range (- delta-dirs))])
-                               (add-a-dir-field ""))]
-                            [(> delta-dirs 0)
-                             (for ([x (in-range delta-dirs)]
-                                   [dir-field (in-list (send multi-dir-panel get-children))])
-                               (remove-a-dir-panel dir-field))])
-                          (for ([path (in-list paths)]
-                                [dir-field (in-list dir-fields)])
-                            (send dir-field set-value (path->string path)))
-                          (update-directory-prefs)))]))
-     (define recur+another-parent (new horizontal-panel%
-                                       [parent files-panel]
-                                       [stretchable-height #f]))
-     (define recur-check-box (new check-box% 
-                                  [label (string-constant mfs-recur-over-subdirectories)]
-                                  [parent recur+another-parent]
-                                  [callback (λ (x y) (recur-check-box-callback))]))
-     (new horizontal-panel% [parent recur+another-parent]) ;; spacer
-     (define another-dir-button (new button%
-                                     [label sc-add-another-directory]
-                                     [parent recur+another-parent]
-                                     [callback (λ (x y) (add-a-dir-field ""))]))
-     
-     (define filter-panel (make-object horizontal-panel% files-panel))
-     (define filter-check-box (make-object check-box% 
-                                (string-constant mfs-regexp-filename-filter) 
-                                filter-panel
-                                (λ (x y) (filter-check-box-callback))))
-     (define filter-text-field (make-object text-field% #f filter-panel 
-                                 (λ (x y) (filter-text-field-callback))))
-     
-     (define methods-choice (make-object choice%
-                              #f (map search-type-label search-types) method-panel 
-                              (λ (x y) (methods-choice-callback))))
-     (define search-text-field (make-object text-field% 
-                                 (string-constant mfs-search-string) method-panel
-                                 (λ (x y) (search-text-field-callback))))
-     (define active-method-panel (make-object panel:single% method-panel))
-     (define methods-check-boxess
-       (let ([pref (preferences:get 'drracket:multi-file-search:search-check-boxes)])
-         (map
-          (λ (search-type prefs-settings)
-            (let ([p (make-object vertical-panel% active-method-panel)]
-                  [params (search-type-params search-type)])
-              (send p set-alignment 'left 'center)
-              (map (λ (flag-pair prefs-setting)
-                     (let ([cb (make-object check-box% 
-                                 (car flag-pair)
-                                 p
-                                 (λ (evt chk) (method-callback chk)))])
-                       (send cb set-value prefs-setting)
-                       cb))
-                   params
-                   (if (= (length params) (length prefs-settings))
-                       prefs-settings
-                       (map (λ (x) #f) params)))))
-          search-types
-          (if (= (length search-types) (length pref))
-              pref
-              (map (λ (x) '()) search-types)))))
-     (define-values (ok-button cancel-button)
-       (gui-utils:ok/cancel-buttons
-        button-panel
-        (λ (x y) (ok-button-callback))
-        (λ (x y) (cancel-button-callback))))
-     (define spacer (make-object grow-box-spacer-pane% button-panel))
-     
-     ;; initialized to a searcher during the ok button callback
-     ;; so the user can be informed of an error before the dialog
-     ;; closes.
-     (define searcher #f)
-     
-     ;; initialized to a regexp if the user wants to filter filenames,
-     ;; during the ok-button-callback, so errors can be signaled.
-     (define filter #f)
-     
-     ;; title for message box that signals error messages
-     (define message-box-title (string-constant mfs-drscheme-multi-file-search))
-     
-     (define (ok-button-callback)
-       (define dirs (for/list ([df (in-list dir-fields)])
-                      (send df get-value)))
-       (define dont-exist
-         (for/list ([dir (in-list dirs)]
-                    #:unless 
-                    (with-handlers ([exn:fail:filesystem? (λ (x) #f)])
-                      (and (path-string? dir)
-                           (directory-exists? dir))))
-           dir))
-         
-       (cond
-         [(null? dont-exist)
-          (define new-l (append dirs
-                                (remove* dirs
-                                         (preferences:get
-                                          'drracket:multi-file-search:directories))))
-          (preferences:set 'drracket:multi-file-search:directories
-                           (take new-l (min (length new-l) 10)))
-          
-          (define _searcher
-            ((search-type-make-searcher (list-ref search-types (send methods-choice get-selection)))
-             (map (λ (cb) (send cb get-value))
-                  (send (send active-method-panel active-child) get-children))
-             (send search-text-field get-value)))
-          (if (string? _searcher)
-              (message-box message-box-title _searcher dialog)
-              (let ([regexp (with-handlers ([(λ (x) #t)
-                                             (λ (exn)
-                                               (format "~a" (exn-message exn)))])
-                              (and (send filter-check-box get-value)
-                                   (regexp (send filter-text-field get-value))))])
-                (if (string? regexp)
-                    (message-box message-box-title regexp dialog)
-                    (begin (set! searcher _searcher)
-                           (set! filter regexp)
-                           (set! ok? #t)
-                           (send dialog show #f)))))]
-         [else
-          (message-box message-box-title
-                       (format (string-constant mfs-not-a-dir)
-                               (car dont-exist))
-                       dialog)]))
-     (define (cancel-button-callback)
-       (send dialog show #f))
-     
-     (define (method-callback chk)
-       (preferences:set
-        'drracket:multi-file-search:search-check-boxes
-        (let loop ([methods-check-boxess methods-check-boxess])
-          (cond
-            [(null? methods-check-boxess) null]
-            [else
-             (cons (let loop ([methods-check-boxes (car methods-check-boxess)])
-                     (cond
-                       [(null? methods-check-boxes) null]
-                       [else (cons (send (car methods-check-boxes) get-value)
-                                   (loop (cdr methods-check-boxes)))]))
-                   (loop (cdr methods-check-boxess)))]))))
-     
-     (define (filter-check-box-callback) 
-       (preferences:set 'drracket:multi-file-search:filter? (send filter-check-box get-value))
-       (send filter-text-field enable (send filter-check-box get-value)))
-     (define (filter-text-field-callback)
-       (preferences:set 'drracket:multi-file-search:filter-regexp
-                        (send filter-text-field get-value)))
-     
-     (define (recur-check-box-callback)
-       (preferences:set 'drracket:multi-file-search:recur? (send recur-check-box get-value)))
-     (define (methods-choice-callback)
-       (define which (send methods-choice get-selection))
-       (preferences:set 'drracket:multi-file-search:search-type which) 
-       (set-method which))
-     (define (set-method which)
-       (send active-method-panel active-child
-             (list-ref (send active-method-panel get-children)
-                       which)))
-     (define (search-text-field-callback)
-       (preferences:set 'drracket:multi-file-search:search-string
-                        (send search-text-field get-value)))
-     
-     (define ok? #f)
-     
-     (send outer-files-panel stretchable-height #f)
-     (send outer-files-panel set-alignment 'left 'center)
-     (send files-inset-panel min-width 20)
-     (send files-inset-panel stretchable-width #f)
-     (send files-panel set-alignment 'left 'center)
-     
-     (send recur-check-box set-value (preferences:get 'drracket:multi-file-search:recur?))
-     (send filter-check-box set-value (preferences:get 'drracket:multi-file-search:filter?))
-     (send search-text-field set-value (preferences:get 'drracket:multi-file-search:search-string))
-     (send filter-text-field set-value (preferences:get 'drracket:multi-file-search:filter-regexp))
-     (for ([pth/f (in-list (preferences:get 'drracket:multi-file-search:directory))])
-       (define pth (or pth/f (path->string (car (filesystem-root-list)))))
-       (add-a-dir-field pth))
-     
-     (send outer-method-panel stretchable-height #f)
-     (send outer-method-panel set-alignment 'left 'center)
-     (send method-inset-panel min-width 20)
-     (send method-inset-panel stretchable-width #f)
-     (send method-panel set-alignment 'left 'center)
-     (send filter-panel stretchable-height #f)
-     
-     (send methods-choice set-selection (preferences:get 'drracket:multi-file-search:search-type))
-     (set-method (preferences:get 'drracket:multi-file-search:search-type)) 
-     
-     (send search-text-field focus)
-     (let ([t (send search-text-field get-editor)])
-       (send t set-position 0 (send t last-position)))
-     (send dialog show #t)
-     
-     (and
-      ok?
-      (make-search-info
-       (for/list ([dir-field (in-list dir-fields)])
-         (send dir-field get-value))
-       (send recur-check-box get-value)
-       (and (send filter-check-box get-value)
-            (regexp (send filter-text-field get-value)))
-       searcher
-       (send search-text-field get-value))))))
-
-
-
-
-
-;; exact-match-searcher : make-searcher
-(define (exact-match-searcher params key)        ;; thread: main eventspace thread
-  (let ([case-sensitive? (car params)])
-    (λ (filename add-entry)                 ;; thread: searching thread
-      (let ([text (make-object text:line-spacing%)])
-        (send text load-file filename)
-        (let loop ([pos 0])
-          (let ([found (send text find-string key 'forward pos 'eof #t case-sensitive?)])
-            (when found
-              (let* ([para (send text position-paragraph found)]
-                     [para-start (send text paragraph-start-position para)]
-                     [line-string (send text get-text para-start
-                                        (send text paragraph-end-position para))]
-                     [line-number para]
-                     [col-number (- found para-start)]
-                     [match-length (string-length key)])
-                (add-entry line-string line-number col-number match-length)
-                (loop (+ found 1))))))))))
-
-;; regexp-match-searcher : make-searcher
-;; thread: searching thread
-(define (regexp-match-searcher parmas key)       ;; thread: main eventspace thread
-  (let ([re:key (with-handlers ([(λ (x) #t)
-                                 (λ (exn)
-                                   (format "~a" (exn-message exn)))])
-                  (regexp key))])
-    (if (string? re:key)
-        re:key
-        (λ (filename add-entry)             ;; thread: searching thread
-          (call-with-input-file filename
-            (λ (port)
-              (let loop ([line-number 0])
-                (let ([line (read-line port)])
-                  (cond
-                    [(eof-object? line) (void)]
-                    [else
-                     (let ([match (regexp-match-positions re:key line)])
-                       (when match
-                         (let ([pos (car match)])
-                           (add-entry line line-number 
-                                      (car pos)
-                                      (- (cdr pos) (car pos))))))
-                     (loop (+ line-number 1))]))))
-            #:mode 'text)))))
-
-
-(preferences:set-default 'drracket:multi-file-search:directories 
-                         '()
-                         (lambda (x) (and (list? x) (andmap string? x))))
-;; drracket:mult-file-search:search-check-boxes : (listof (listof boolean))
-(preferences:set-default 'drracket:multi-file-search:search-check-boxes 
-                         (map (λ (x) (map cdr (search-type-params x))) search-types)
-                         (listof (listof boolean?)))
-(preferences:set-default 'drracket:multi-file-search:recur? #t boolean?)
-(preferences:set-default 'drracket:multi-file-search:filter? #t boolean?)
-(preferences:set-default 'drracket:multi-file-search:filter-regexp
-                         "\\.(rkt[^~]?|scrbl|ss|scm)$" string?)
-(preferences:set-default 'drracket:multi-file-search:search-string "" string?)
-(preferences:set-default 'drracket:multi-file-search:search-type
-                         1
-                         (λ (x) 
-                           (and (exact-nonnegative-integer? x)
-                                (< x (length search-types)))))
-
-(preferences:set-default 'drracket:multi-file-search:percentages
-                         '(1/3 2/3)
-                         (and/c (listof (between/c 0 1))
-                                (λ (x) (= 1 (apply + x)))))
-
-(preferences:set-default 'drracket:multi-file-search:frame-size '(300 . 400) 
-                         (cons/c dimension-integer? dimension-integer?))
-(preferences:set-default 'drracket:multi-file-search:directory 
-                         ;; #f means the filesystem root, but that's
-                         ;; expensive to compute under windows so we
-                         ;; delay the computation until the dialog
-                         ;; is opened.
-                         '(#f)
-                         (non-empty-listof (or/c #f (and/c string? path-string?))))
-
-
-(module+ main (configure-search))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/named-undefined.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/named-undefined.rkt
deleted file mode 100644
index 8ee3693a3b..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/named-undefined.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-
-(provide (rename-out [-drr-undefined drr-undefined])
-         drr-named-undefined
-         drr-undefined?)
-
-(struct drr-undefined (name) 
-  #:methods gen:custom-write
-  [(define (write-proc s p mode)
-     (cond
-       [(drr-undefined-name s)
-        (display "#<drr's undefined: " p)
-        (display (drr-undefined-name s) p)
-        (display ">" p)]
-       [else
-        (display "#<drr's undefined>" p)]))])
-(define -drr-undefined (drr-undefined #f))
-(define (drr-named-undefined name)
-  (unless (symbol? name)
-    (raise-argument-error 'named-undefined "string?" name))
-  (drr-undefined name))
-(define-values (struct:undef make-undef undef? undef-ref undef-set!)
-  (make-struct-type 'undefined #f 0 0))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/number-snip.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/number-snip.rkt
deleted file mode 100644
index 22803031e2..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/number-snip.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-  (require mred
-           racket/class
-           framework)
-  
-  (provide snip-class)
-  (define snip-class (make-object number-snip:snip-class%))
-  (send snip-class set-classname (format "~s" `(lib "number-snip.ss" "drracket" "private")))
-  (send (get-the-snip-class-list) add snip-class)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/palaka.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/palaka.rkt
deleted file mode 100644
index f10c0e9f9f..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/palaka.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang racket/base
-(require racket/class racket/gui/base)
-(provide draw-palaka palaka-pattern-size)
-
-(define scale 1)
-(define palaka-color (send the-color-database find-color "lightsteelblue"))
-
-(define stripe-width (* scale 6))
-(define stripe-gap (* scale 2))
-(define blank-space-between-stripe-sets (* stripe-width 5))
-(define ε 0)
-(define vert-stripe-percent (- 1/2 ε))
-(define horiz-stripe-percent (+ 1/4 ε))
-(define quadrant-size (+ (* stripe-width 4)
-                         (* stripe-gap 3)
-                         blank-space-between-stripe-sets))
-(define-syntax-rule 
-  (four-times i e1 e ...)
-  (let loop ([i 0])
-    (when (< i 4)
-      e1 e ...
-      (loop (+ i 1)))))
-
-(define (draw-palaka dc w h)
-  (let ([alpha (send dc get-alpha)])
-    (send dc set-pen palaka-color 1 'transparent)
-    (let loop ([dx (- (/ quadrant-size 2))])
-      (when (< dx w)
-        (let loop ([dy (- (/ quadrant-size 2))])
-          (when (< dy h)
-            (send dc set-alpha 1)
-            (send dc set-brush palaka-color 'solid)
-            (send dc draw-rectangle dx dy quadrant-size quadrant-size)
-            (send dc set-brush "white" 'solid)
-            (draw-one-palaka dc dx dy)
-            (loop (+ dy quadrant-size))))
-        (loop (+ dx quadrant-size))))
-    (send dc set-alpha alpha)))
-
-(define (draw-one-palaka dc dx dy)
-  (four-times 
-   i
-   (send dc set-alpha vert-stripe-percent)
-   (send dc draw-rectangle 
-         (+ dx (* i (+ stripe-width stripe-gap)))
-         dy
-         stripe-width
-         quadrant-size)
-   (send dc set-alpha horiz-stripe-percent)
-   (send dc draw-rectangle
-         dx
-         (+ dy (* i (+ stripe-width stripe-gap)))
-         quadrant-size
-         stripe-width)))
-
-(define (palaka-pattern-size i) (+ (* quadrant-size i) blank-space-between-stripe-sets))
-
-#;
-(begin
-  (define f (new frame% [label "Palaka"]))
-  (define c (new canvas%
-                 [parent f]
-                 [min-width (palaka-pattern-size 4)]
-                 [min-height (palaka-pattern-size 4)]
-                 [paint-callback
-                  (λ (c dc) 
-                    (let-values ([(cw ch) (send c get-client-size)])
-                      (send dc set-smoothing 'aligned)
-                      (draw-palaka dc cw ch)))]))
-  (send f show #t))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/parse-logger-args.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/parse-logger-args.rkt
deleted file mode 100644
index 55d941766c..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/parse-logger-args.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket/base
-
-(provide parse-logger-args)
-
-(define (parse-logger-args str)
-  (define levels '(none fatal error warning info debug))
-  (define arglist
-    (let loop ([args (regexp-split #rx" +" str)]
-               [first? #t]
-               [result '()])
-      (cond
-        [(null? args) result]
-        [(equal? (car args) "") (loop (cdr args) first? result)]
-        [else
-         (define arg (car args))
-         (cond
-           [(and first? (member (string->symbol arg) levels))
-            (loop (cdr args) #f (list* (string->symbol arg) #f result))]
-           [(regexp-match #rx"^(.*)@([^@]*)$" arg)
-            =>
-            (λ (m)
-              (define level (string->symbol (list-ref m 1)))
-              (define name (string->symbol (list-ref m 2)))
-              (cond
-                [(member level levels) 
-                 (loop (cdr args) #f (list* level name result))]
-                [else #f]))]
-           [else #f])])))
-  (if (null? arglist)
-      #f
-      arglist))
-
-(module+ test 
-  (require rackunit)
-  (check-equal? (parse-logger-args "") #f)
-  (check-equal? (parse-logger-args "    ") #f)
-  (check-equal? (parse-logger-args "info") '(info #f))
-  (check-equal? (parse-logger-args "debug") '(debug #f))
-  (check-equal? (parse-logger-args " info ") '(info #f))
-  (check-equal? (parse-logger-args " info ") '(info #f))
-  (check-equal? (parse-logger-args "info debug@GC") '(debug GC info #f))
-  (check-equal? (parse-logger-args "info   debug@GC  ") '(debug GC info #f))
-  (check-equal? (parse-logger-args "info   debug@GC@  ") #f)
-  (check-equal? (parse-logger-args "info   debug@GC none@GC@  ") #f)
-  (check-equal? (parse-logger-args "info   debug@GC none@GC  ") '(none GC debug GC info #F))
-  (check-equal? (parse-logger-args " debug@GC  ") '(debug GC)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/pict-snip.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/pict-snip.rkt
deleted file mode 100644
index a85a1b3ee7..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/pict-snip.rkt
+++ /dev/null
@@ -1,115 +0,0 @@
-#lang racket/base
-(require racket/snip
-         racket/class
-         racket/match
-         racket/draw
-         file/convertible
-         wxme
-         (prefix-in r: racket/base))
-
-(provide pict-snip% snip-class reader)
-
-(define convertible<%>
-  (interface* () ([prop:convertible (lambda (v r d)
-                                      (send v convert r d))])
-              convert))
-
-;; this snip is created on the user's space,
-;; but its callbacks are invoked on DrRacket's.
-(define pict-snip%
-  (class* snip% (convertible<%>)
-    (init-field w h d a recorded-datum)
-    (define/override (get-extent dc x y [wb #f] [hb #f] [descent #f] [space #f] [lspace #f] [rspace #f])
-      (set-box/f lspace 0)
-      (set-box/f rspace 0)
-      (set-box/f wb w)
-      (set-box/f hb h)
-      (set-box/f descent d)
-      (set-box/f space a))
-    (define proc #f)
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (unless proc
-        (set! proc (with-handlers ((exn:fail? mk-error-drawer))
-                     (recorded-datum->procedure recorded-datum))))
-      (define-values (ox oy) (send dc get-origin))
-      (send dc set-origin (+ ox x) (+ oy y))
-      (proc dc)
-      (send dc set-origin ox oy))
-    (define/override (copy) (new pict-snip% [w w] [h h] [d d] [a a] 
-                                 [recorded-datum recorded-datum]))
-    
-    (define/override (write f) 
-      (define prt (open-output-bytes))
-      (r:write (list w h d a recorded-datum) prt)
-      (define bytes (get-output-bytes prt))
-      (send f put (bytes-length bytes) bytes))
-    (super-new)
-    (inherit set-snipclass)
-    (set-snipclass snip-class)
-
-    (define/public (convert r d)
-      (case r
-        [(png-bytes)
-         (define bm (make-bitmap (inexact->exact (ceiling w))
-                                 (inexact->exact (ceiling h))))
-         (define dc (send bm make-dc))
-         (draw dc 0 0 0 0 w h 0 0 #f)
-         (define b (open-output-bytes))
-         (send bm save-file b 'png)
-         (get-output-bytes b)]
-        [(pdf-bytes)
-         (define b (open-output-bytes))
-         (define dc (new pdf-dc% 
-                         [interactive #f]
-                         [width w] [height h]
-                         [output b]))
-         (send dc start-doc "pict")
-         (send dc start-page)
-         (draw dc 0 0 0 0 w h 0 0 #f)
-         (send dc end-page)
-         (send dc end-doc)
-         (get-output-bytes b)]
-        [else d]))))
-
-(define (set-box/f b v) (when (box? b) (set-box! b v)))
-
-(define ((mk-error-drawer exn) dc)
-  (define clr (send dc get-text-foreground))
-  (send dc set-text-foreground "red")
-  (send dc draw-text (exn-message exn) 0 0)
-  (send dc set-text-foreground clr))
-
-(define snip-class 
-  (new (class snip-class%
-         (define/override (read f)
-           (parse-pict-snip-from-bytes
-            (send f get-unterminated-bytes)))
-         (super-new))))
-
-(send snip-class set-classname (format "~s" (list '(lib "pict-snip.rkt" "drracket" "private")
-                                                  '(lib "pict-snip.rkt" "drracket" "private"))))
-(send (get-the-snip-class-list) add snip-class)
-
-(define reader
-  (new (class* object% (snip-reader<%>)
-         (define/public (read-header version stream) (void))
-         (define/public (read-snip text-only? version stream)
-           (define bytes (send stream read-raw-bytes 'pict-snip))
-           (if text-only?
-               #"#<pict-snip>"
-               (or (parse-pict-snip-from-bytes bytes) 
-                   (error 'pict-snip.rkt "could not read pict-snip from stream"))))
-         (super-new))))
-
-;; parse-pict-snip-from-bytes : bytes -> (or/c (is-a?/c pict-snip%) #f)
-(define (parse-pict-snip-from-bytes bytes)
-  (let/ec escape
-    (define prt (open-input-bytes bytes))
-    (define sexp (with-handlers ((exn:fail:read? (λ (x) (escape #f))))
-                   (read prt)))
-    (match sexp
-      [`(,(? real? w) ,(? real? h) ,(? real? d) ,(? real? a) ,recorded-datum)
-       (new pict-snip% [w w] [h h] [d d] [a a] 
-            [recorded-datum recorded-datum])]
-      [else
-       #f])))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/profile-drs.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/profile-drs.rkt
deleted file mode 100644
index acc03aaea3..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/profile-drs.rkt
+++ /dev/null
@@ -1,122 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class
-         profile/sampler
-         profile/render-text
-         profile/analyzer
-         framework/preferences)
-
-#|
-
-This file is loaded early in drscheme's startup when the PLTDRPROFILE
-environment variable is setup. It sets up a profiler to examine drscheme
-itself.
-
-|#
-
-(provide start-profile)
-
-(define (start-profile super-custodian)
-  (define drs-custodian (current-custodian))
-  (define drs-main-thread (current-thread))
-  (define profile-eventspace
-    (parameterize ([current-custodian super-custodian])
-      (make-eventspace)))
-  (define frame (parameterize ([current-eventspace profile-eventspace])
-                  (new frame% [label "Profiling"] [width 500] [height 550])))
-  (define t (let ([t (new text%)])
-              (send t lock #t)
-              t))
-  (define ec (new editor-canvas% [parent frame] [editor t]))
-  (define bp (new horizontal-panel% [parent frame] [stretchable-height #f]))
-  (define pause-b (new button% [label "Pause"] [parent bp] [callback (λ (a b) (pause))] [stretchable-width #t]))
-  (define resume-b (new button% [label "Resume"] [parent bp] [callback (λ (a b) (resume))] [stretchable-width #t]))
-  (define start-stop-b (new button% [label "Stop"] [parent bp] [callback (λ (a b) (start-stop))] [stretchable-width #t]))
-  (define choice (new choice% [label #f] [choices '("12" "9")] [parent bp] [callback (λ (a b) (font-size))]))
-
-  
-  (define mb (new menu-bar% [parent frame]))
-  (define edit-menu (new menu% [label "&Edit"] [parent mb]))
-  (define sa (new menu-item% 
-                  [parent edit-menu]
-                  [label "Select al&l"]
-                  [shortcut #\a] 
-                  [callback (λ (x y) 
-                              (send ec focus)
-                              (send t set-position 0 (send t last-position)))]))
-  (define copy (new menu-item%
-                    [parent edit-menu]
-                    [label "&Copy"]
-                    [shortcut #\c]
-                    [callback (λ (x y) (send t copy))]))
-  
-  (define (font-size)
-    (let ([n (send choice get-string-selection)])
-      (when n
-        (send sd set-delta 'change-size (string->number n))
-        (update-profile-report))))
-  
-  (define (update-buttons)
-    (send resume-b enable (and current-sampler (not running?)))
-    (send pause-b enable (and current-sampler running?))
-    (send start-stop-b set-label (if current-sampler "Stop" "Start")))
-  
-  (define running? #f)
-  (define current-sampler #f)
-  (define (start-sampler)
-    (let ([s (create-sampler (list drs-custodian drs-main-thread) 
-                             #e0.05
-                             super-custodian)])
-      (set! current-sampler s)))
-  (define (stop-sampler)
-    (current-sampler 'stop)
-    (set! current-sampler #f)
-    (set! running? #f))
-
-  (define sd (let ([sd (make-object style-delta%)])
-               (send sd set-delta 'change-size 12)
-               (send sd set-family 'modern)
-               sd))
-  
-  (define updating-thread 
-    (parameterize ([current-custodian super-custodian]
-                   [current-eventspace profile-eventspace])
-      (thread (λ ()
-                (let loop ()
-                  (queue-callback update-profile-report)
-                  (sleep 5) 
-                  (loop))))))
-  
-  (define (update-profile-report)
-    (when current-sampler
-      (send t begin-edit-sequence)
-      (send t lock #f)
-      (send t erase)
-      (parameterize ([current-output-port (open-output-text-editor t)])
-        (render (analyze-samples (current-sampler 'get-snapshots))))
-      (send t change-style sd 0 (send t last-position))
-      (send t set-position 0)
-      (send t lock #t)
-      (send t end-edit-sequence)))
-  
-  (define (resume) 
-    (set! running? #t)
-    (current-sampler 'resume)
-    (update-buttons))
-  (define (pause) 
-    (set! running? #f)
-    (current-sampler 'pause)
-    (update-buttons)
-    (update-profile-report))
-  (define (start-stop) 
-    (cond
-      [current-sampler (stop-sampler)]
-      [else 
-       (start-sampler)
-       (set! running? #t)])
-    (update-profile-report)
-    (update-buttons))
-
-  (update-buttons)
-  (send ec focus)
-  (send frame show #t))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/recon.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/recon.rkt
deleted file mode 100644
index 3d7c37ce91..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/recon.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-(provide reconstitute)
-
-(begin-for-syntax
-  (define-struct sloc (inside loc) #:omit-define-syntaxes #:prefab))
-
-(define-syntax (reconstitute orig-stx)
-  (syntax-case orig-stx ()
-    [(_ arg src)
-     (let loop ([stx #'arg])
-       (cond
-         [(syntax? stx) (datum->syntax stx (loop (syntax-e stx)))]
-         [(pair? stx) (cons (loop (car stx)) (loop (cdr stx)))]
-         [(sloc? stx) 
-          (datum->syntax #'src
-                         (loop (syntax-e (sloc-inside stx)))
-                         (syntax->datum (sloc-loc stx)))]
-         [else stx]))]))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/rep.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/rep.rkt
deleted file mode 100644
index 61bb84b72c..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/rep.rkt
+++ /dev/null
@@ -1,2321 +0,0 @@
-#lang racket/base
-
-#|
-
-TODO
-- should a GC should happen on each execution? (or perhaps better, each kill?)
-- front-end methods have new signature
-
-
-|#
-; =Kernel= means in DrRacket's thread and parameterization
-; 
-; =User= means the user's thread and parameterization
-; 
-; =Handler= means in the handler thread of some eventspace; it must
-;  be combined with either =Kernel= or =User=
-
-(require racket/class
-         racket/path
-         racket/pretty
-         racket/unit
-         racket/list
-         racket/port
-         racket/set
-         
-         string-constants
-         setup/xref
-         racket/gui/base
-         framework
-         browser/external
-         drracket/private/drsig
-         "local-member-names.rkt"
-         "stack-checkpoint.rkt"
-         "parse-logger-args.rkt"
-         
-         ;; the dynamic-require below loads this module, 
-         ;; so we make the dependency explicit here, even
-         ;; tho nothing is used from this module.
-         planet/terse-info)
-
-(provide rep@ with-stack-checkpoint)
-
-(define orig-output-port (current-output-port))
-(define (oprintf . args) (apply fprintf orig-output-port args))
- 
-(define no-breaks-break-parameterization
-  (parameterize-break #f (current-break-parameterization)))
-
-(define-unit rep@
-  (import [prefix drracket:init: drracket:init^]
-          [prefix drracket:language-configuration: drracket:language-configuration/internal^]
-          [prefix drracket:language: drracket:language/int^]
-          [prefix drracket:app: drracket:app^]
-          [prefix drracket:frame: drracket:frame^]
-          [prefix drracket:unit: drracket:unit^]
-          [prefix drracket:text: drracket:text^]
-          [prefix drracket:help-desk: drracket:help-desk^]
-          [prefix drracket:debug: drracket:debug^]
-          [prefix drracket:eval: drracket:eval^]
-          [prefix drracket:module-language: drracket:module-language/int^]
-          [prefix drracket: drracket:interface^])
-  (export (rename drracket:rep/int^
-                  [-text% text%]
-                  [-text<%> text<%>]))
-  
-  (define -text<%>
-    (interface ((class->interface text%)
-                text:ports<%>
-                editor:file<%>
-                racket:text<%>
-                color:text<%>)
-      reset-highlighting
-      highlight-errors
-      highlight-errors/exn
-      on-highlighted-errors
-      
-      get-user-custodian
-      get-user-eventspace
-      get-user-thread
-      get-user-namespace
-      
-      get-definitions-text
-      
-      kill-evaluation
-      
-      display-results
-      
-      run-in-evaluation-thread
-      after-many-evals
-      on-execute
-      
-      shutdown
-      
-      get-error-ranges
-      reset-error-ranges
-      
-      reset-console
-      
-      copy-prev-previous-expr
-      copy-next-previous-expr
-      copy-previous-expr
-      
-      
-      initialize-console
-      
-      get-prompt
-      insert-prompt
-      get-context))
-  
-  (define sized-snip<%>
-    (interface ((class->interface snip%))
-      ;; get-character-width : -> number
-      ;; returns the number of characters wide the snip is,
-      ;; for use in pretty printing the snip.
-      get-character-width))
-  
-  ;; current-language-settings : (parameter language-setting)
-  ;; set to the current language and its setting on the user's thread.
-  (define current-language-settings (make-parameter #f))
-  
-  ;; current-rep : (parameter (union #f (instanceof rep:text%)))
-  ;; the repl that controls the evaluation in this thread.
-  (define current-rep (make-parameter #f))
-  
-  ;; a port that accepts values for printing in the repl
-  (define current-value-port (make-parameter #f))
-  
-  ;; drracket-error-display-handler : (string (union #f exn) -> void
-  ;; =User=
-  ;; the timing is a little tricky here. 
-  ;; the file icon must appear before the error message in the text, so that happens first.
-  ;; the highlight must be set after the error message, because inserting into the text resets
-  ;;     the highlighting.
-  (define (drracket-error-display-handler msg exn)
-    (drracket:debug:error-display-handler/stacktrace msg exn))
-  
-  (define (main-user-eventspace-thread?)
-    (let ([rep (current-rep)])
-      (and rep
-           (eq? (eventspace-handler-thread (send rep get-user-eventspace))
-                (current-thread)))))
-  
-  (define drs-bindings-keymap (make-object keymap:aug-keymap%))
-  (define drs-binding-alt-as-meta-keymap (make-object keymap:aug-keymap%))
-
-  (let* ([get-frame
-          (λ (obj)
-            (and (is-a? obj editor<%>)
-                 (let ([canvas (send obj get-canvas)])
-                   (and canvas
-                        (let ([frame (send canvas get-top-level-window)])
-                          (and (is-a? frame drracket:unit:frame%)
-                               frame))))))]
-         [add-drs-function
-          (λ (name f)
-            (define (fn obj evt) (cond [(get-frame obj) => f]))
-            (send drs-bindings-keymap add-function name fn)
-            (send drs-binding-alt-as-meta-keymap add-function name fn))]
-         [map-drs-function
-          (λ (key f)
-            (send drs-bindings-keymap map-function key f)
-            (send drs-binding-alt-as-meta-keymap map-function key f))]
-         [map-meta-drs-function
-          (λ (key f)
-            (keymap:send-map-function-meta 
-             drs-bindings-keymap key f #t
-             #:alt-as-meta-keymap drs-binding-alt-as-meta-keymap))]
-         [show-tab
-          (λ (i)
-            (λ (fr)
-              (and fr
-                   (is-a? fr drracket:unit:frame<%>)
-                   (< i (send fr get-tab-count))
-                   (begin (send fr change-to-nth-tab i)
-                          #t))))])
-    (for ([i (in-range 1 10)])
-      (add-drs-function (format "show-tab-~a" i) (show-tab (- i 1))))
-    (add-drs-function
-     "search-help-desk"
-     (λ (frame)
-       (define obj (send frame get-focus-object))
-       (cond
-         [(is-a? obj text%)
-          (define start (send obj get-start-position))
-          (define end (send obj get-end-position))
-          (define str (if (= start end)
-                          (drracket:unit:find-symbol obj start)
-                          (send obj get-text start end)))
-          (cond
-            [(or (not str) (equal? "" str))
-             (drracket:help-desk:help-desk)]
-            [else
-             (let* ([l (send obj get-canvas)]
-                    [l (and l (send l get-top-level-window))]
-                    [l (and l (is-a? l drracket:unit:frame<%>) (send l get-definitions-text))]
-                    [l (and l (send l get-next-settings))]
-                    [l (and l (drracket:language-configuration:language-settings-language l))]
-                    [ctxt (and l (send l capability-value 'drscheme:help-context-term))]
-                    [name (and l (send l get-language-name))])
-               (drracket:help-desk:help-desk
-                str (and ctxt (list ctxt name))))])]
-         [else
-          (drracket:help-desk:help-desk)])))
-    
-    ;; keep this in case people use it in their keymaps
-    (add-drs-function "execute"  (λ (frame) (send frame execute-callback)))
-    
-    (add-drs-function "run"  (λ (frame) (send frame execute-callback)))
-    (add-drs-function "next-tab" (λ (frame) (send frame next-tab)))
-    (add-drs-function "prev-tab" (λ (frame) (send frame prev-tab)))
-    (add-drs-function "move-current-tab-left" (λ (frame) (send frame move-current-tab-left)))
-    (add-drs-function "move-current-tab-right" (λ (frame) (send frame move-current-tab-right)))
-    (add-drs-function "collapse" (λ (frame) (send frame collapse)))
-    (add-drs-function "split"    (λ (frame) (send frame split)))
-    
-    (add-drs-function "jump-to-previous-error-loc"
-                      (λ (frame) (send frame jump-to-previous-error-loc)))
-    (add-drs-function "jump-to-next-error-loc"
-                      (λ (frame) (send frame jump-to-next-error-loc)))
-    
-    (add-drs-function "send-toplevel-form-to-repl" (λ (frame) (send frame send-toplevel-form-to-repl #f)))
-    (add-drs-function "send-selection-to-repl" (λ (frame) (send frame send-selection-to-repl #f)))
-    (add-drs-function "send-toplevel-form-to-repl-and-go" (λ (frame) (send frame send-toplevel-form-to-repl #t)))
-    (add-drs-function "send-selection-to-repl-and-go" (λ (frame) (send frame send-selection-to-repl #t)))
-    (add-drs-function "move-to-interactions" (λ (frame) (send frame move-to-interactions)))
-    
-    (map-meta-drs-function "p" "jump-to-previous-error-loc")
-    (map-meta-drs-function "n" "jump-to-next-error-loc")
-    (map-drs-function "c:x;`" "jump-to-next-error-loc")
-    
-    (map-drs-function "f5" "run")
-    (map-drs-function "f1" "search-help-desk")
-    (map-drs-function "c:tab" "next-tab")
-    (map-drs-function "c:s:tab" "prev-tab")
-    (map-drs-function "c:pagedown" "next-tab")
-    (map-drs-function "c:pageup" "prev-tab")
-    (map-drs-function "c:s:pagedown" "move-current-tab-right")
-    (map-drs-function "c:s:pageup" "move-current-tab-left")
-    
-    (map-drs-function "c:x;0" "collapse")
-    (map-drs-function "c:x;2" "split")
-    
-    (map-drs-function "c:c;c:z" "move-to-interactions")
-    
-    (for ([i (in-range 1 10)])
-      (map-drs-function (format "a:~a" i) 
-                        (format "show-tab-~a" i))
-      (map-drs-function (format "~~c:m:~a" i) 
-                        (format "show-tab-~a" i))))
-  
-  (define (get-drs-bindings-keymap) drs-bindings-keymap)
-  
-  ;; drs-bindings-keymap-mixin :
-  ;;   ((implements editor:keymap<%>) -> (implements editor:keymap<%>))
-  ;;   for any x that is an instance of the resulting class,
-  ;;     (is-a? (send (send x get-canvas) get-top-level-frame) drracket:unit:frame%)
-  (define drs-bindings-keymap-mixin
-    (mixin (editor:keymap<%>) (editor:keymap<%>)
-      (define/override (get-keymaps)
-        (editor:add-after-user-keymap drs-bindings-keymap (super get-keymaps)))
-      (super-new)))
-  
-  ;; Max length of output queue (user's thread blocks if the
-  ;; queue is full):
-  (define output-limit-size 2000)
-  
-  (define (setup-racket-interaction-mode-keymap keymap alt-as-meta-keymap)
-    (define (add-fn name f)
-      (send keymap add-function name f)
-      (send alt-as-meta-keymap add-function name f))
-    (define (map-meta-fn key f)
-      (keymap:send-map-function-meta keymap key f #t
-                                     #:alt-as-meta-keymap alt-as-meta-keymap))
-    (define (map-fn key f)
-      (send keymap map-function key f)
-      (send alt-as-meta-keymap map-function key f))
-      
-    (add-fn "put-previous-sexp"
-            (λ (text event) (send text copy-prev-previous-expr)))
-    (add-fn "put-next-sexp"
-            (λ (text event) (send text copy-next-previous-expr)))
-    (add-fn "show-interactions-history"
-            (λ (text event) (send text show-interactions-history)))
-    
-    (map-meta-fn "p" "put-previous-sexp")
-    (map-meta-fn "n" "put-next-sexp")
-    (map-fn "c:up" "put-previous-sexp")
-    (map-fn "c:down" "put-next-sexp")
-    (map-meta-fn "h" "show-interactions-history"))
-  
-  (define racket-interaction-mode-keymap (make-object keymap:aug-keymap%))
-  (define racket-alt-as-meta-interaction-mode-keymap (make-object keymap:aug-keymap%))
-  (setup-racket-interaction-mode-keymap racket-interaction-mode-keymap
-                                        racket-alt-as-meta-interaction-mode-keymap)
-  
-  (define (adjust-alt-as-meta on?)
-    (send racket-interaction-mode-keymap remove-chained-keymap 
-          racket-alt-as-meta-interaction-mode-keymap)
-    (send drs-bindings-keymap remove-chained-keymap 
-          drs-binding-alt-as-meta-keymap)
-    (when on?
-      (send racket-interaction-mode-keymap chain-to-keymap
-            racket-alt-as-meta-interaction-mode-keymap #f)
-      (send drs-bindings-keymap chain-to-keymap
-            drs-binding-alt-as-meta-keymap #f)))
-  (preferences:add-callback 'framework:alt-as-meta
-                            (λ (p v) (adjust-alt-as-meta v)))
-  (adjust-alt-as-meta (preferences:get 'framework:alt-as-meta))
-  
-  (define drs-font-delta (make-object style-delta% 'change-family 'decorative))
-  
-  (define output-delta (make-object style-delta%)) ; used to be 'change-weight 'bold
-  (define result-delta (make-object style-delta%)) ; used to be 'change-weight 'bold
-  (define error-delta (make-object style-delta%
-                        'change-style
-                        'italic))
-  (send error-delta set-delta-foreground (make-object color% 255 0 0))
-  (define (get-error-delta) error-delta)
-  (send result-delta set-delta-foreground (make-object color% 0 0 175))
-  (send output-delta set-delta-foreground (make-object color% 150 0 150))
-  
-  (define error-text-style-delta (make-object style-delta%))
-  (send error-text-style-delta set-delta-foreground (make-object color% 200 0 0))
-  
-  (define grey-delta (make-object style-delta%))
-  (send grey-delta set-delta-foreground "GREY")
-  
-  (define welcome-delta (make-object style-delta% 'change-family 'decorative))
-  (define click-delta (gui-utils:get-clickback-delta))
-  (define red-delta (make-object style-delta%))
-  (define dark-green-delta (make-object style-delta%))
-  (send* red-delta
-    (copy welcome-delta)
-    (set-delta-foreground "RED"))  
-  (send* dark-green-delta
-    (copy welcome-delta)
-    (set-delta-foreground "dark green"))
-  (define warning-style-delta (make-object style-delta% 'change-bold))
-  (send* warning-style-delta
-    (set-delta-foreground "BLACK")
-    (set-delta-background "YELLOW"))
-  (define (get-welcome-delta) welcome-delta)
-  (define (get-dark-green-delta) dark-green-delta)
-  
-  ;; is-default-settings? : language-settings -> boolean
-  ;; determines if the settings in `language-settings'
-  ;; correspond to the default settings of the language.
-  (define (is-default-settings? language-settings)
-    (send (drracket:language-configuration:language-settings-language language-settings)
-          default-settings?
-          (drracket:language-configuration:language-settings-settings language-settings)))
-  
-  (define (extract-language-name language-settings defs-text)
-    (cond
-      [(is-a? (drracket:language-configuration:language-settings-language language-settings)
-              drracket:module-language:module-language<%>)
-       (send (drracket:language-configuration:language-settings-language language-settings)
-             get-users-language-name defs-text)]
-      [else
-       (send (drracket:language-configuration:language-settings-language language-settings)
-             get-language-name)]))
-  (define (extract-language-style-delta language-settings)
-    (send (drracket:language-configuration:language-settings-language language-settings)
-          get-style-delta))
-  (define (extract-language-url language-settings)
-    (send (drracket:language-configuration:language-settings-language language-settings)
-          get-language-url))
-  
-  (define-struct sexp (left right prompt))
-  
-  (let* ([list-of? (λ (p?)
-                     (λ (l)
-                       (and (list? l)
-                            (andmap p? l))))]
-         [snip/string? (λ (s) (or (is-a? s snip%) (string? s)))]
-         [list-of-snip/strings? (list-of? snip/string?)]
-         [list-of-lists-of-snip/strings? (list-of? list-of-snip/strings?)])
-    (preferences:set-default
-     'drracket:console-previous-exprs
-     null
-     list-of-lists-of-snip/strings?))
-  (define (marshall-previous-exprs lls)
-    (for/list ([ls (in-list lls)])
-      (simplify-history-element ls #t)))
-  (let ([unmarshall-previous-exprs (λ (x) x)])
-    (preferences:set-un/marshall 'drracket:console-previous-exprs
-                                 marshall-previous-exprs 
-                                 unmarshall-previous-exprs))
-  
-  
-  (define color? ((get-display-depth) . > . 8))
-  
-  ;; instances of this interface provide a context for a rep:text%
-  ;; its connection to its graphical environment (ie frame) for
-  ;; error display and status infromation is all mediated
-  ;; through an instance of this interface.
-  
-  (define file-icon
-    (let ([bitmap
-           (make-object bitmap%
-             (collection-file-path "file.gif" "icons"))])
-      (if (send bitmap ok?)
-          (make-object image-snip% bitmap)
-          (make-object string-snip% "[open file]"))))
-  
-  
-  ;; insert/delta : (instanceof text%) (union snip string) (listof style-delta%) *-> (values number number)
-  ;; inserts the string/snip into the text at the end and changes the
-  ;; style of the newly inserted text based on the style deltas.
-  (define (insert/delta text s . deltas)
-    (define before (send text last-position))
-    (send text insert s before before #f)
-    (define after (send text last-position))
-    (for ([delta (in-list deltas)])
-      (when (is-a? delta style-delta%)
-        (send text change-style delta before after)))
-    (values before after))
-  
-  (define log-max-size 1000)
-  (define log-entry-max-size 1000)
-  
-  (define after-expression (make-parameter #f))
-  
-  (define do-dance (make-parameter #f))
-  
-  (define text-mixin
-    (mixin ((class->interface text%)
-            text:ports<%>
-            editor:file<%>
-            racket:text<%>
-            color:text<%>
-            text:ports<%>)
-      (-text<%>)
-      (init-field context)
-      (inherit auto-wrap
-               begin-edit-sequence
-               change-style
-               clear-box-input-port
-               clear-undos
-               clear-input-port
-               clear-output-ports
-               delete
-               delete/io
-               end-edit-sequence
-               erase
-               find-snip
-               find-string
-               freeze-colorer
-               get-active-canvas
-               get-admin
-               get-can-close-parent
-               get-canvases
-               get-character
-               get-end-position
-               get-err-port
-               get-extent
-               get-focus-snip
-               get-in-port
-               get-in-box-port
-               get-insertion-point
-               get-out-port
-               get-regions
-               get-snip-position
-               get-start-position
-               get-styles-fixed
-               get-style-list
-               get-text
-               get-top-level-window
-               get-unread-start-point
-               get-value-port
-               in-edit-sequence?
-               insert
-               insert-before
-               insert-between
-               is-locked?
-               last-position
-               line-location
-               lock
-               paragraph-start-position
-               position-line
-               position-paragraph
-               port-name-matches?
-               release-snip
-               reset-input-box
-               reset-regions
-               run-after-edit-sequence
-               scroll-to-position
-               send-eof-to-in-port 
-               set-allow-edits
-               set-caret-owner
-               set-clickback
-               set-insertion-point
-               set-position
-               set-styles-sticky
-               set-styles-fixed
-               set-unread-start-point
-               split-snip
-               thaw-colorer)
-      
-      (define definitions-text 'not-yet-set-definitions-text)
-      (define/public (set-definitions-text dt) (set! definitions-text dt))
-      (define/public (get-definitions-text) definitions-text)
-      
-      (unless (is-a? context drracket:rep:context<%>)
-        (error 'drracket:rep:text% 
-               "expected an object that implements drracket:rep:context<%> as initialization argument, got: ~e"
-               context))
-      
-      (define/public (get-context) context)
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;;                                          ;;;
-      ;;;            User -> Kernel                ;;;
-      ;;;                                          ;;;
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      
-      ;; =User= (probably doesn't matter)
-      (define/private queue-system-callback
-        (λ (ut thunk [always? #f])
-          (parameterize ([current-eventspace drracket:init:system-eventspace])
-            (queue-callback 
-             (λ ()
-               (when (or always? (eq? ut (get-user-thread)))
-                 (thunk)))
-             #f))))
-      
-      ;; =User=
-      (define/private queue-system-callback/sync
-        (λ (ut thunk)
-          (let ([s (make-semaphore 0)])
-            (queue-system-callback 
-             ut 
-             (λ ()
-               (when (eq? ut (get-user-thread))
-                 (thunk))
-               (semaphore-post s))
-             #t)
-            (semaphore-wait s))))
-      
-      ;; display-results : (listof TST) -> void
-      ;; prints each element of anss that is not void as values in the REPL.
-      (define/public (display-results anss) ; =User=, =Handler=, =Breaks=
-        (display-results/void (filter (λ (x) (not (void? x))) anss)))
-      
-      ;; display-results : (listof TST) -> void
-      ;; prints each element of anss in the REPL.
-      (define/public (display-results/void anss) ; =User=, =Handler=, =Breaks=
-        (for-each 
-         (λ (v) 
-           (let* ([ls (current-language-settings)]
-                  [lang (drracket:language-configuration:language-settings-language ls)]
-                  [settings (drracket:language-configuration:language-settings-settings ls)])
-             (send lang render-value/format
-                   v
-                   settings
-                   (get-value-port)
-                   (get-repl-char-width))))
-         anss))
-      
-      ;; get-repl-char-width : -> (and/c exact? integer?)
-      ;; returns the width of the repl in characters, or 80 if the
-      ;; answer cannot be found.
-      (define/private (get-repl-char-width)
-        (let ([admin (get-admin)]
-              [standard (send (get-style-list) find-named-style "Standard")])
-          (if (and admin standard)
-              (let ([bw (box 0)])
-                (send admin get-view #f #f bw #f)
-                (let* ([dc (send admin get-dc)]
-                       [standard-font (send standard get-font)]
-                       [old-font (send dc get-font)])
-                  (send dc set-font standard-font)
-                  (let* ([char-width (send dc get-char-width)]
-                         [answer (inexact->exact (floor (/ (unbox bw) char-width)))])
-                    (send dc set-font old-font)
-                    answer)))
-              80)))
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;;                                            ;;;
-      ;;;            Error Highlighting              ;;;
-      ;;;                                            ;;;
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      
-      ;; error-ranges : (union false? (cons srcloc (listof srcloc)))
-      (define error-ranges #f)
-      (define/public (get-error-ranges) error-ranges)
-      (define/public (set-error-ranges ranges)
-        (set! error-ranges (and ranges 
-                                (not (null? ranges))
-                                (cleanup-locs ranges))))
-      (define clear-error-highlighting void)
-      (define/public (reset-error-ranges) 
-        (set-error-ranges #f)
-        (when definitions-text (send definitions-text set-error-arrows #f))
-        (clear-error-highlighting)
-        (on-highlighted-errors #f))
-      
-      ;; highlight-error : file number number -> void
-      (define/public (highlight-error file start end)
-        (highlight-errors (list (make-srcloc file #f #f start (- end start))) #f))
-      
-      ;; highlight-errors/exn : exn -> void
-      ;; highlights all of the errors associated with the exn (incl. arrows)
-      (define/public (highlight-errors/exn exn)
-        (let ([locs (cond
-                      [(exn:srclocs? exn)
-                       ((exn:srclocs-accessor exn) exn)]
-                      [else '()])])
-          (highlight-errors locs #f)))
-      
-      ;; =Kernel= =handler=
-      ;; highlight-errors :    (listof srcloc)
-      ;;                       (union #f (listof srcloc))
-      ;;                    -> (void)
-      (define/public (highlight-errors raw-locs [raw-error-arrows #f])
-        (clear-error-highlighting)
-        (when definitions-text (send definitions-text set-error-arrows #f))
-        (set-error-ranges raw-locs)
-        (define locs (or (get-error-ranges) '())) ;; calling set-error-range cleans up the locs
-        (define error-arrows (and raw-error-arrows (cleanup-locs raw-error-arrows)))
-        
-        (for ([loc (in-list locs)])
-          (send (srcloc-source loc) begin-edit-sequence #t #f))
-        
-        (when color?
-          (let ([resets
-                 (map (λ (loc)
-                        (let* ([file (srcloc-source loc)]
-                               [start (- (srcloc-position loc) 1)]
-                               [span (srcloc-span loc)]
-                               [finish (+ start span)])
-                          (send file highlight-range start finish (drracket:debug:get-error-color) #f 'high)))
-                      locs)])
-            (when (and definitions-text error-arrows)
-              (let ([filtered-arrows
-                     (remove-duplicate-error-arrows
-                      (filter
-                       (λ (arr) (embedded-in? (srcloc-source arr) definitions-text))
-                       error-arrows))])
-                (send definitions-text set-error-arrows filtered-arrows)))
-            
-            (set! clear-error-highlighting
-                  (λ ()
-                    (set! clear-error-highlighting void)
-                    (for-each (λ (x) (x)) resets)))))
-
-        (let* ([first-loc (and (pair? locs) (car locs))]
-               [first-file (and first-loc (srcloc-source first-loc))]
-               [first-start (and first-loc (- (srcloc-position first-loc) 1))]
-               [first-span (and first-loc (srcloc-span first-loc))])
-          
-          (on-highlighted-errors locs)
-          
-          (when (and first-loc first-start first-span)
-            (let ([first-finish (+ first-start first-span)])
-              (when (eq? first-file definitions-text) ;; only move set the cursor in the defs window
-                (send first-file set-position first-start first-start))
-              (send first-file scroll-to-position first-start #f first-finish)))
-          
-          (for-each (λ (loc) (send (srcloc-source loc) end-edit-sequence)) locs)
-          
-          (when first-loc
-            
-            (when (eq? first-file definitions-text)
-              ;; when we're highlighting something in the defs window,
-              ;; make sure it is visible
-              (let ([tlw (send first-file get-top-level-window)]) 
-                (when (is-a? tlw drracket:unit:frame<%>)
-                  (send tlw ensure-defs-shown))))
-            
-            (send first-file set-caret-owner (get-focus-snip) 'global))))
-
-      ;; unlike highlight-error just above, this function does not change 
-      ;; what the currently noted errors locations are, it just highlights 
-      ;; one of them.
-      (define/public (highlight-a-single-error raw-loc)
-        (define loc (car (cleanup-locs (list raw-loc))))
-        (define source (srcloc-source loc))
-        (when (and (is-a? source text%)
-                   (srcloc-position loc)
-                   (srcloc-span loc))
-          (send source begin-edit-sequence #t #f)
-          
-          (clear-error-highlighting) ;; clear the 'highlight-range' from previous errors
-          
-          (define start (- (srcloc-position loc) 1))
-          (define span (srcloc-span loc))
-          (define finish (+ start span))
-          
-          (let ([reset (send source highlight-range start finish (drracket:debug:get-error-color) #f 'high)])
-            (set! clear-error-highlighting
-                  (λ ()
-                    (set! clear-error-highlighting void)
-                    (reset))))
-          
-          (when (and start span)
-            (let ([finish (+ start span)])
-              (when (eq? source definitions-text) ;; only move set the cursor in the defs window
-                (send source set-position start start))
-              (send source scroll-to-position start #f finish)))
-          
-          (on-highlighted-errors loc)
-          
-          (send source end-edit-sequence)
-          
-          (when (eq? source definitions-text)
-            ;; when we're highlighting something in the defs window,
-            ;; make sure it is visible
-            (let ([tlw (send source get-top-level-window)]) 
-              (when (is-a? tlw drracket:unit:frame<%>)
-                (send tlw ensure-defs-shown))))
-          
-          (send source set-caret-owner (get-focus-snip) 'global)))
-      
-      (define/public (on-highlighted-errors loc/s)
-        (void))
-        
-      (define/private (cleanup-locs locs)
-        (let ([ht (make-hasheq)])
-          (filter (λ (loc) (and (is-a? (srcloc-source loc) text:basic<%>)
-                                (number? (srcloc-position loc))
-                                (number? (srcloc-span loc))))
-                  (map (λ (srcloc)
-                         (cond
-                           [(hash-ref ht (srcloc-source srcloc) #f)
-                            =>
-                            (λ (e) 
-                              (make-srcloc e
-                                           (srcloc-line srcloc)
-                                           (srcloc-column srcloc)
-                                           (srcloc-position srcloc)
-                                           (srcloc-span srcloc)))]
-                           [(send definitions-text port-name-matches? (srcloc-source srcloc))
-                            (hash-set! ht (srcloc-source srcloc) definitions-text)
-                            (make-srcloc definitions-text
-                                         (srcloc-line srcloc)
-                                         (srcloc-column srcloc)
-                                         (srcloc-position srcloc)
-                                         (srcloc-span srcloc))]
-                           [(port-name-matches? (srcloc-source srcloc))
-                            (hash-set! ht (srcloc-source srcloc) this)
-                            (make-srcloc this
-                                         (srcloc-line srcloc)
-                                         (srcloc-column srcloc)
-                                         (srcloc-position srcloc)
-                                         (srcloc-span srcloc))]
-                           [(and (symbol? (srcloc-source srcloc))
-                                 (text:lookup-port-name (srcloc-source srcloc)))
-                            =>
-                            (lambda (editor)
-                              (make-srcloc editor
-                                           (srcloc-line srcloc)
-                                           (srcloc-column srcloc)
-                                           (srcloc-position srcloc)
-                                           (srcloc-span srcloc)))]
-                           [else srcloc]))
-                       locs))))
-      
-      (define highlights-can-be-reset (make-parameter #t))
-      (define/public (reset-highlighting)
-        (when (highlights-can-be-reset) (reset-error-ranges)))
-      (define/public (call-without-reset-highlighting thunk)
-        (parameterize ([highlights-can-be-reset #f])
-          (thunk)))
-      
-      ;; remove-duplicate-error-arrows : (listof X) -> (listof X)
-      ;; duplicate arrows point from and to the same place -- only
-      ;; need one arrow for each pair of locations they point to.
-      (define/private (remove-duplicate-error-arrows error-arrows)
-        (let ([ht (make-hash)])
-          (let loop ([arrs error-arrows]
-                     [n 0])
-            (unless (null? arrs)
-              (hash-set! ht (car arrs) n)
-              (loop (cdr arrs) (+ n 1))))
-          (let* ([unsorted (hash-map ht list)]
-                 [sorted (sort unsorted < #:key cadr)]
-                 [arrs (map car sorted)])
-            arrs)))
-      
-      (define/private (embedded-in? txt-inner txt-outer)
-        (let loop ([txt-inner txt-inner])
-          (cond
-            [(eq? txt-inner txt-outer) #t]
-            [else (let ([admin (send txt-inner get-admin)])
-                    (and (is-a? admin editor-snip-editor-admin<%>)
-                         (loop (send (send (send admin get-snip) get-admin) get-editor))))])))
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;;  specialization
-      ;;
-      
-      (define/override (after-io-insertion)
-        (super after-io-insertion)
-        (let ([frame (get-frame)])
-          (when frame
-            (let ([tab (send definitions-text get-tab)])
-              (when (eq? (send frame get-current-tab) tab)
-                (send context ensure-rep-shown this))))))
-      
-      (define/augment (after-insert start len)
-        (inner (void) after-insert start len)
-        (cond
-          [(in-edit-sequence?) 
-           (set! had-an-insert (cons start had-an-insert))]
-          [else (update-after-inserts (list start))]))
-      
-      ;; private field
-      (define had-an-insert '())
-      
-      (define/augment (after-edit-sequence)
-        (inner (void) after-edit-sequence)
-        (unless (null? had-an-insert)
-          (let ([to-clean had-an-insert])
-            (set! had-an-insert '())
-            (update-after-inserts to-clean))))
-      
-      (define/private (update-after-inserts starts)
-        (unless inserting-prompt?
-          (reset-highlighting))
-        (when (and prompt-position 
-                   (ormap (λ (start) (< start prompt-position))
-                          starts))
-          (set! prompt-position (get-unread-start-point))
-          (reset-regions (append (all-but-last (get-regions))
-                                 (list (list prompt-position 'end))))))
-      
-      (define/augment (after-delete x y)
-        (unless inserting-prompt?
-          (reset-highlighting))
-        (inner (void) after-delete x y))
-      
-      (define/override (get-keymaps)
-        (editor:add-after-user-keymap racket-interaction-mode-keymap
-                                      (super get-keymaps)))
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;;                                            ;;;
-      ;;;                Evaluation                  ;;;
-      ;;;                                            ;;;
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      
-      (define/public (eval-busy?)
-        (not (and (get-user-thread)
-                  (thread-running? (get-user-thread)))))
-      
-      (field (user-language-settings #f)
-             (user-custodian-parent #f)
-             (memory-killed-cust-box #f)
-             (user-custodian #f)
-             (custodian-limit (and (custodian-memory-accounting-available?)
-                                   (preferences:get 'drracket:child-only-memory-limit)))
-             (user-eventspace-box (make-weak-box #f))
-             (user-namespace-box (make-weak-box #f))
-             (user-eventspace-main-thread #f)
-             (user-break-parameterization #f)
-             (user-logger drracket:init:system-logger) ;; for now, just let all messages be everywhere
-             
-             ;; user-exit-code (union #f byte?)
-             ;; #f indicates that exit wasn't called. Integer indicates exit code
-             (user-exit-code #f))
-            
-      (define/public (get-user-language-settings) user-language-settings)
-      (define/public (get-user-custodian) user-custodian)
-      (define/public (get-user-eventspace) (weak-box-value user-eventspace-box))
-      (define/public (get-user-thread) user-eventspace-main-thread)
-      (define/public (get-user-namespace) (weak-box-value user-namespace-box))
-      (define/pubment (get-user-break-parameterization) user-break-parameterization) ;; final method
-      (define/pubment (get-custodian-limit) custodian-limit)
-      (define/pubment (set-custodian-limit c) (set! custodian-limit c))
-      (field (in-evaluation? #f)
-             (ask-about-kill? #f))
-      (define/public (get-in-evaluation?) in-evaluation?)
-      
-      (define/public-final (insert-warning message)
-        (let ([locked? (is-locked?)])
-          (when locked? (lock #f))
-          (begin-edit-sequence)
-          (let ([start (get-unread-start-point)])
-            (insert-before message)
-            (let ([end (get-unread-start-point)])
-              (change-style warning-style-delta start end)
-              (insert-before "\n")))
-          (end-edit-sequence)
-          (when locked? (lock #t))))
-      
-      (field (show-no-user-evaluation-message? #t))
-      
-      ;; use this to be able to kill the evaluator without the popup dialog
-      (define/public (set-show-no-user-evaluation-message? b)
-        (set! show-no-user-evaluation-message? b))
-      
-      (define/private (cleanup)
-        (set! in-evaluation? #f)
-        (update-running #f)
-        (unless (and (get-user-thread) (thread-running? (get-user-thread)))
-          (lock #t)
-          (when (and show-no-user-evaluation-message? (not shutting-down?))
-            (no-user-evaluation-message
-             (get-frame)
-             user-exit-code
-             (not (custodian-box-value memory-killed-cust-box))))
-          (set! show-no-user-evaluation-message? #t)))
-      
-      (field (need-interaction-cleanup? #f))
-      
-      (define/private (no-user-evaluation-message frame exit-code memory-killed?)
-        (define new-limit (and custodian-limit (+ custodian-limit custodian-limit)))
-        (define-values (ans checked?)
-          (if (preferences:get 'drracket:show-killed-dialog)
-              (message+check-box/custom
-               (string-constant evaluation-terminated)
-               (string-append
-                (string-constant evaluation-terminated-explanation)
-                (if exit-code
-                    (string-append
-                     "\n\n"
-                     (if (zero? exit-code)
-                         (string-constant exited-successfully)
-                         (format (string-constant exited-with-error-code) exit-code)))
-                    "")
-                (if memory-killed?
-                    (string-append 
-                     "\n\n"
-                     (string-constant program-ran-out-of-memory))
-                    ""))
-               (string-constant evaluation-terminated-ask)
-               (string-constant ok)
-               #f
-               (and memory-killed?
-                    new-limit
-                    (format "Increase memory limit to ~a megabytes" 
-                            (floor (/ new-limit 1024 1024))))
-               frame
-               '(default=1 stop checked)
-               #:dialog-mixin frame:focus-table-mixin)
-              (values 1 #t)))
-        (unless checked?
-          (preferences:set 'drracket:show-killed-dialog #f))
-        (when (equal? ans 3)
-          (set-custodian-limit new-limit)
-          (preferences:set 'drracket:child-only-memory-limit new-limit))
-        (set-insertion-point (last-position))
-        (insert-warning "\nInteractions disabled"))
-      
-      (define/private (cleanup-interaction) ; =Kernel=, =Handler=
-        (set! need-interaction-cleanup? #f)
-        (begin-edit-sequence)
-        (set-caret-owner #f 'display)
-        (cleanup)
-        (end-edit-sequence)
-        (send context set-breakables #f #f)
-        (send context enable-evaluation))
-      
-      (define/augment (submit-to-port? key)
-        (or (send key get-control-down)
-            (send key get-alt-down)
-            (and prompt-position
-                 (let ([lang (drracket:language-configuration:language-settings-language user-language-settings)])
-                   (cond
-                     [(is-a? lang drracket:module-language:module-language<%>)
-                      (let ([pred 
-                             (send lang get-language-info 
-                                   'drracket:submit-predicate
-                                   (λ (port only-whitespace-afterwards?)
-                                     (and only-whitespace-afterwards?
-                                          (submit-predicate this prompt-position))))])
-                        (pred 
-                         ;; no good! giving away the farm here. need to hand
-                         ;; over a proxy that is limited to just read access
-                         (open-input-text-editor this prompt-position)
-                         (only-whitespace-after-insertion-point)))]
-                     [else
-                      (and (only-whitespace-after-insertion-point)
-                           (submit-predicate this prompt-position))])))))
-      
-      (define/private (only-whitespace-after-insertion-point)
-        (let ([start (get-start-position)]
-              [end (get-end-position)])
-          (and (= start end)
-               (let loop ([pos start])
-                 (cond
-                   [(= pos (last-position)) #t]
-                   [else (and (char-whitespace? (get-character pos))
-                              (loop (+ pos 1)))])))))
-      
-      (define/augment (on-submit)
-        (inner (void) on-submit)
-        (when (and (get-user-thread) 
-                   (thread-running? (get-user-thread)))
-          ;; the -2 drops the last newline from history (why -2 and not -1?!)
-          (save-interaction-in-history prompt-position (- (last-position) 2))
-          
-          (let* ([old-regions (get-regions)]
-                 [abl (all-but-last old-regions)]
-                 [lst (last old-regions)])
-            (reset-regions (append abl (list (list (list-ref lst 0) (last-position))))))
-          
-          (send context repl-submit-happened)
-          
-          ;; lets us know we are done with this one interaction
-          ;; (since there may be multiple expressions at the prompt)
-          (send-eof-to-in-port)
-          
-          (set! prompt-position #f)
-          (evaluate-from-port
-           (get-in-port) 
-           #f
-           (λ ()
-             ;; clear out the eof object if it wasn't consumed
-             (clear-input-port)))))
-      
-      (inherit get-backward-sexp)
-      (define/override (on-local-char key)
-        (let ([start (get-start-position)]
-              [end (get-end-position)]
-              [code (send key get-key-code)])
-          (cond
-            [(not (or (eq? code 'numpad-enter)
-                      (equal? code #\return)
-                      (equal? code #\newline)))
-             (super on-local-char key)]
-            [(not prompt-position) 
-             ;; evaluating? just drop the keypress
-             (void)] 
-            [(and (< end prompt-position)
-                  (= start end)
-                  (get-backward-sexp end))
-             =>
-             (λ (sexp-start)
-               (copy-down sexp-start end))]
-            [(and (< end prompt-position)
-                  (not (= start end)))
-             (copy-down start end)]
-            [else
-             (super on-local-char key)])))
-      
-      (define/private (copy-down start end)
-        (begin-edit-sequence)
-        (split-snip start)
-        (split-snip end)
-        (let loop ([snip (find-snip start 'after-or-none)])
-          (when snip
-            (let ([pos (+ (get-snip-position snip)
-                          (send snip get-count))])
-              (when (<= pos end)
-                (insert (send snip copy) (last-position) (last-position))
-                (loop (send snip next))))))
-        (set-position (last-position) (last-position))
-        (end-edit-sequence))
-      
-      ;; prompt-position : (union #f integer)
-      ;; the position just after the last prompt
-      (field (prompt-position #f))
-      (define inserting-prompt? #f)
-      (define/public (get-prompt) "> ")
-      (define/public (insert-prompt)
-        (set! inserting-prompt? #t)
-        (begin-edit-sequence)
-        (reset-input-box)
-        (let* ([pmt (get-prompt)]
-               [prompt-space (string-length pmt)])
-          
-          ;; insert the prompt, possibly inserting a newline first
-          (let* ([usp (get-unread-start-point)]
-                 [usp-para (position-paragraph usp)]
-                 [usp-para-start (paragraph-start-position usp-para)])
-            (unless (equal? usp usp-para-start)
-              (insert-between "\n")
-              (set! prompt-space (+ prompt-space 1)))
-            (insert-between pmt))
-          
-          (let ([sp (get-unread-start-point)])
-            (set! prompt-position sp)
-            (reset-regions (append (get-regions) (list (list sp 'end))))))
-        (end-edit-sequence)
-        (set! inserting-prompt? #f))
-      
-      (field [submit-predicate (λ (text prompt-position) #t)])
-      (define/public (set-submit-predicate p)
-        (set! submit-predicate p))
-      
-      (define/public (evaluate-from-port port complete-program? cleanup) ; =Kernel=, =Handler=
-        (send context disable-evaluation)
-        (send context reset-offer-kill)
-        (send context set-breakables (get-user-thread) (get-user-custodian))
-        (reset-pretty-print-width)
-        (set! in-evaluation? #t)
-        (update-running #t)
-        (set! need-interaction-cleanup? #t)
-        (define the-after-expression (after-expression))
-        
-        (run-in-evaluation-thread
-         (λ () ; =User=, =Handler=, =No-Breaks=
-           (let* ([settings (current-language-settings)]
-                  [lang (drracket:language-configuration:language-settings-language settings)]
-                  [settings (drracket:language-configuration:language-settings-settings settings)]
-                  [dummy-value (box #f)]
-                  [get-sexp/syntax/eof 
-                   (if complete-program?
-                       (send lang front-end/complete-program port settings)
-                       (send lang front-end/interaction port settings))])
-             
-             ; Evaluate the user's expression. We're careful to turn on
-             ;   breaks as we go in and turn them off as we go out.
-             ;   (Actually, we adjust breaks however the user wanted it.)
-             
-             
-             ;; this binding of last-results is to catch the results 
-             ;; that come from throwing to the prompt instead of
-             ;; a normal exit
-             (define last-results
-               (call-with-values
-                (λ ()
-                  (call-with-continuation-prompt
-                   (λ ()
-                     (call-with-break-parameterization
-                      user-break-parameterization
-                      (λ ()
-                        (let loop ()
-                          (define sexp/syntax/eof (with-stack-checkpoint (get-sexp/syntax/eof)))
-                          (cond
-                            [(eof-object? sexp/syntax/eof) (abort-current-continuation 
-                                                            (default-continuation-prompt-tag)
-                                                            (λ () (values)))]
-                            [else
-                             (define results
-                               (call-with-values
-                                (λ ()
-                                  (parameterize ([do-dance #t])
-                                    (eval-syntax sexp/syntax/eof)))
-                                list))
-                             (parameterize ([pretty-print-columns pretty-print-width])
-                               (for ([x (in-list results)])
-                                 ((current-print) x)))
-                             (loop)])))))
-                   (default-continuation-prompt-tag)
-                   (letrec ([me
-                             (λ args
-                               (cond
-                                 [(and (pair? args)
-                                       (null? (cdr args))
-                                       (procedure? (car args))
-                                       (procedure-arity-includes? (car args) 0))
-                                  (call-with-continuation-prompt (car args) 
-                                                                 (default-continuation-prompt-tag)
-                                                                 me)]
-                                 [else
-                                  (call-with-continuation-prompt
-                                   (λ ()
-                                     (call-with-continuation-prompt
-                                      (λ ()
-                                        (apply
-                                         abort-current-continuation 
-                                         (default-continuation-prompt-tag)
-                                         args)))))]))])
-                     me)))
-                list))
-             (parameterize ([pretty-print-columns pretty-print-width])
-               (for ([x (in-list last-results)])
-                 ((current-print) x)))
-             
-             (when complete-program?
-               (call-with-continuation-prompt
-                (λ ()
-                  (call-with-break-parameterization
-                   user-break-parameterization
-                   (λ ()
-                     (send lang front-end/finished-complete-program settings))))
-                (default-continuation-prompt-tag)
-                (λ args (void))))
-             
-             (when the-after-expression 
-               (call-with-continuation-prompt
-                (λ () 
-                  (the-after-expression))))
-             
-             (set! in-evaluation? #f)
-             (update-running #f)
-             (cleanup)
-             (flush-output (get-value-port))
-             (queue-system-callback/sync
-              (get-user-thread)
-              (λ () ; =Kernel=, =Handler= 
-                (after-many-evals)
-                (cleanup-interaction)
-                (insert-prompt)))))))
-      
-      ;; =User=, =Handler=
-      (define/pubment (on-execute rout) (inner (void) on-execute rout))
-      
-      ;; =Kernel=, =Handler=
-      (define/pubment (after-many-evals) (inner (void) after-many-evals))
-      
-      (define/private shutdown-user-custodian ; =Kernel=, =Handler=
-        ; Use this procedure to shutdown when in the middle of other cleanup
-        ;  operations, such as when the user clicks "Run".
-        ; Don't use it to kill a thread where other, external cleanup
-        ;  actions must occur (e.g., the exit handler for the user's
-        ;  thread). In that case, shut down user-custodian directly.
-        (λ ()
-          (when user-custodian
-            (custodian-shutdown-all user-custodian))
-          (set! user-custodian #f)
-          (set! user-eventspace-main-thread #f)))
-      
-      (define/public (kill-evaluation) ; =Kernel=, =Handler=
-        (when user-custodian
-          (custodian-shutdown-all user-custodian))
-        (clear-input-port)
-        (clear-box-input-port)
-        (clear-output-ports)
-        (set! user-custodian #f))
-      
-      (field (eval-thread-thunks null)
-             (eval-thread-state-sema 'not-yet-state-sema)
-             (eval-thread-queue-sema 'not-yet-thread-sema)
-             
-             (cleanup-sucessful 'not-yet-cleanup-sucessful)
-             (cleanup-semaphore 'not-yet-cleanup-semaphore)
-             (thread-killed 'not-yet-thread-killed))
-      (define/private (initialize-killed-thread) ; =Kernel=
-        (when (thread? thread-killed)
-          (kill-thread thread-killed))
-        (set! thread-killed
-              (thread
-               (λ () ; =Kernel=
-                 (let ([ut (get-user-thread)])
-                   (thread-wait ut)
-                   (queue-system-callback
-                    ut
-                    (λ () ; =Kernel=, =Handler=
-                      (if need-interaction-cleanup?
-                          (cleanup-interaction)
-                          (cleanup))
-                      ;; HACK: lock the interactions now; the reason for this
-                      ;; is that `cleanup-interaction' invokes
-                      ;; `enable-evaluation', and in "unit.rkt" this is defined
-                      ;; to unlock the interactions which might make sense in
-                      ;; that context.
-                      (lock #t))))))))
-      
-      (define/public (run-in-evaluation-thread thunk) ; =Kernel=
-        (semaphore-wait eval-thread-state-sema)
-        (set! eval-thread-thunks (append eval-thread-thunks (list thunk)))
-        (semaphore-post eval-thread-state-sema)
-        (semaphore-post eval-thread-queue-sema))
-      
-      (define/private (init-evaluation-thread) ; =Kernel=
-        (set! user-language-settings (send definitions-text get-next-settings))
-        
-        (set! user-custodian-parent (make-custodian))
-        (set! user-custodian (parameterize ([current-custodian user-custodian-parent])
-                               (make-custodian)))
-        (set! memory-killed-cust-box (make-custodian-box user-custodian-parent #t))
-        (when custodian-limit
-          (custodian-limit-memory user-custodian-parent 
-                                  custodian-limit
-                                  user-custodian-parent))
-        (let ([user-eventspace (parameterize ([current-custodian user-custodian])
-                                 (make-eventspace))])
-          (set! user-eventspace-box (make-weak-box user-eventspace))
-          (set! user-break-parameterization (parameterize-break 
-                                             #t 
-                                             (current-break-parameterization)))
-          (set! eval-thread-thunks null)
-          (set! eval-thread-state-sema (make-semaphore 1))
-          (set! eval-thread-queue-sema (make-semaphore 0))
-          (set! user-exit-code #f)
-          
-          (reset-logger-messages)
-          
-          (current-eval
-           (let ([oe (current-eval)])
-             (define (drracket-eval-handler sexp/syntax)
-               (cond
-                 [(and (do-dance) 
-                       (syntax? sexp/syntax)
-                       (not (compiled-expression? (syntax-e sexp/syntax))))
-                  ;; we duplicate the 'expand-syntax-to-top-form' dance that eval-syntax
-                  ;; does here, so that we can put 'with-stack-checkpoint's in to limit
-                  ;; the amount of DrRacket code we see in stacktraces
-                  (parameterize ([do-dance #f])
-                    (let loop ([stx sexp/syntax])
-                      (define top-expanded (with-stack-checkpoint (expand-syntax-to-top-form stx)))
-                      (syntax-case top-expanded (begin)
-                        [(begin a1 . args)
-                         (let lloop ([args (syntax->list #'(a1 . args))])
-                           (cond
-                             [(null? (cdr args))
-                              (loop (car args))]
-                             [else
-                              (loop (car args))
-                              (lloop (cdr args))]))]
-                        [_ 
-                         (let ([expanded (with-stack-checkpoint (expand-syntax top-expanded))])
-                           (call-with-continuation-prompt
-                            (λ ()
-                              (with-stack-checkpoint (oe expanded)))
-                            (default-continuation-prompt-tag)
-                            (λ args
-                              (apply
-                               abort-current-continuation 
-                               (default-continuation-prompt-tag)
-                               args))))])))]
-                 [else
-                  (oe sexp/syntax)]))
-             drracket-eval-handler))
-          
-          (let* ([init-thread-complete (make-semaphore 0)]
-                 [goahead (make-semaphore)])
-            
-            ; setup standard parameters
-            (let ([snip-classes
-                   ; the snip-classes in the DrRacket eventspace's snip-class-list
-                   (drracket:eval:get-snip-classes)]
-                  [drs-eventspace (current-eventspace)])
-              (queue-user/wait
-               (λ () ; =User=, =No-Breaks=
-                 ; No user code has been evaluated yet, so we're in the clear...
-                 (break-enabled #f)
-                 (set! user-eventspace-main-thread (current-thread))
-                 
-                 (current-logger user-logger)
-
-                 (define user-plumber (make-plumber))
-                 (current-plumber user-plumber)
-                 
-                 (initialize-parameters snip-classes)
-                 (let ([drracket-exit-handler
-                        (λ (x)
-                          (plumber-flush-all user-plumber)
-                          (parameterize-break
-                           #f
-                           (let ([s (make-semaphore)])
-                             (parameterize ([current-eventspace drs-eventspace])
-                               (queue-callback
-                                (λ ()
-                                  (set! user-exit-code 
-                                        (if (exact-integer? x)
-                                            (modulo x 256)
-                                            0))
-                                  (semaphore-post s))))
-                             (semaphore-wait s)
-                             (custodian-shutdown-all user-custodian))))])
-                   (exit-handler drracket-exit-handler)))))
-            
-
-            (queue-user/wait
-             (λ ()
-               ;; register drscheme with the planet-terse-register for the user's namespace
-               ;; must be called after 'initialize-parameters' is called (since it initializes
-               ;; the user's namespace)
-               (planet-terse-set-key (namespace-module-registry (current-namespace)))
-               (planet-terse-register 
-                (lambda (tag package)
-                  (parameterize ([current-eventspace drracket:init:system-eventspace])
-                    (queue-callback (λ () (new-planet-info tag package))))))))
-               
-            ;; disable breaks until an evaluation actually occurs
-            (send context set-breakables #f #f)
-            
-            ;; initialize the language
-            (send (drracket:language-configuration:language-settings-language user-language-settings)
-                  on-execute
-                  (drracket:language-configuration:language-settings-settings user-language-settings)
-                  (let ([run-on-user-thread (lambda (t) 
-                                              (queue-user/wait 
-                                               (λ ()
-                                                 (with-handlers ((exn? (λ (x) (oprintf "~s\n" (exn-message x)))))
-                                                   (t)))))])
-                    run-on-user-thread))
-            
-            ;; setup the special repl values
-            (let ([raised-exn? #f]
-                  [exn #f])
-              (queue-user/wait
-               (λ () ; =User=, =No-Breaks=
-                 (with-handlers ((void (λ (x) 
-                                         (set! exn x)
-                                         (set! raised-exn? #t))))
-                   (drracket:language:setup-setup-values))))
-              (when raised-exn?
-                (eprintf
-                 (string-append
-                  "copied exn raised when setting up snip values"
-                  " (thunk passed as third argume to drracket:language:add-snip-value)\n"))
-                (raise exn)))
-            
-            ;; allow extensions to this class to do some setup work
-            (on-execute 
-             (let ([run-on-user-thread (lambda (t) (queue-user/wait t))])
-               run-on-user-thread))
-            
-            (parameterize ([current-eventspace user-eventspace])
-              (queue-callback
-               (λ ()
-                 (set! in-evaluation? #f)
-                 (update-running #f)
-                 (send context set-breakables #f #f)
-                 
-                 ;; after this returns, future event dispatches
-                 ;; will use the user's break parameterization
-                 (initialize-dispatch-handler)
-                 
-                 ;; let init-thread procedure return,
-                 ;; now that parameters are set
-                 (semaphore-post init-thread-complete)
-                 
-                 ; We're about to start running user code.
-                 
-                 ; Pause to let killed-thread get initialized
-                 (semaphore-wait goahead)
-                 
-                 (let loop () ; =User=, =Handler=, =No-Breaks=
-                   ; Wait for something to do
-                   (unless (semaphore-try-wait? eval-thread-queue-sema)
-                     ; User event callbacks run here; we turn on
-                     ;  breaks in the dispatch handler.
-                     (yield eval-thread-queue-sema))
-                   ; About to eval something
-                   (semaphore-wait eval-thread-state-sema)
-                   (let ([thunk (car eval-thread-thunks)])
-                     (set! eval-thread-thunks (cdr eval-thread-thunks))
-                     (semaphore-post eval-thread-state-sema)
-                     ; This thunk evals the user's expressions with appropriate
-                     ;   protections.
-                     (thunk))
-                   (loop)))))
-            (semaphore-wait init-thread-complete)
-            ; Start killed-thread
-            (initialize-killed-thread)
-            ; Let user expressions go...
-            (semaphore-post goahead))))
-      
-      (define/private (queue-user/wait thnk)
-        (let ([wait (make-semaphore 0)])
-          (parameterize ([current-eventspace (get-user-eventspace)])
-            (queue-callback
-             (λ ()
-               (thnk)
-               (semaphore-post wait))))
-          (semaphore-wait wait)))
-      
-      (field (shutting-down? #f))
-      
-      (define/override (allow-close-with-no-filename?) #t)
-      (define/augment (can-close?)
-        (and (cond
-               [in-evaluation?
-                (equal? (message-box/custom
-                         (string-constant drscheme)
-                         (string-constant program-is-still-running)
-                         (string-constant close-anyway)
-                         (string-constant cancel)
-                         #f
-                         (or (get-top-level-window) (get-can-close-parent))
-                         '(default=1 caution)
-                         2
-                         #:dialog-mixin frame:focus-table-mixin)
-                        1)]
-               [(let ([user-eventspace (get-user-eventspace)])
-                  (and user-eventspace
-                       (parameterize ([current-eventspace user-eventspace])
-                         (not (null? (get-top-level-windows))))))
-                (equal? (message-box/custom
-                         (string-constant drscheme)
-                         (string-constant program-has-open-windows)
-                         (string-constant close-anyway)
-                         (string-constant cancel)
-                         #f
-                         (or (get-top-level-window) (get-can-close-parent))
-                         '(default=1 caution)
-                         2
-                         #:dialog-mixin frame:focus-table-mixin)
-                        1)]
-               [else #t])
-             (inner #t can-close?)))
-      
-      (define/augment (on-close)
-        (shutdown)
-        (preferences:set 'drracket:console-previous-exprs 
-                         (trim-previous-exprs
-                          (append 
-                           (preferences:get 'drracket:console-previous-exprs)
-                           local-previous-exprs)))
-        (inner (void) on-close))
-      
-      (define/public (shutdown) ; =Kernel=, =Handler=
-        (set! shutting-down? #t)
-        (when (thread? thread-killed)
-          (kill-thread thread-killed)
-          (set! thread-killed #f))
-        (shutdown-user-custodian))
-      
-      (define/private update-running ; =User=, =Handler=, =No-Breaks=
-        (λ (bool)
-          (queue-system-callback
-           (get-user-thread)
-           (λ ()
-             (send context update-running bool)))))
-      
-      (define logger-editor #f)
-      (define logger-messages '())
-      (define user-log-receiver-args-str (preferences:get 'drracket:logger-receiver-string))
-      (define/public (set-user-log-receiver-args str args) 
-        (set! user-log-receiver-args-str str)
-        (update-log-receiver-to-match-str))
-      (define/public (get-user-log-receiver-args-str) user-log-receiver-args-str)
-      (define/public (enable/disable-capture-log logging-on?)
-        (cond
-          [logging-on?
-           (update-log-receiver-to-match-str)]
-          [else
-           (channel-put user-log-receiver-changed #f)]))
-      (define/private (update-log-receiver-to-match-str)
-        (define args (parse-logger-args user-log-receiver-args-str))
-        (channel-put user-log-receiver-changed
-                     (and args
-                          (apply make-log-receiver user-logger args))))
-      (define user-log-receiver-changed (make-channel))
-      (thread
-       (λ ()
-         (struct gui-event (start end name) #:prefab)
-         (define callback-running? #f)
-         (define evts '())
-         (define sema (make-semaphore 1))
-         (define (user-event-handler-callback)
-           (semaphore-wait sema)
-           (define my-evts evts)
-           (set! evts '())
-           (set! callback-running? #f)
-           (semaphore-post sema)
-           (for ([vec (in-list (reverse my-evts))])
-             (new-log-message vec)))
-         (let loop ([user-log-receiver #f])
-           (sync
-            (handle-evt user-log-receiver-changed
-                        (λ (user-log-receiver) 
-                          (loop user-log-receiver)))
-            (if user-log-receiver
-                (handle-evt user-log-receiver
-                            (λ (vec)
-                              (unless (gui-event? (vector-ref vec 2))
-                                (semaphore-wait sema)
-                                (set! evts (cons vec evts))
-                                (unless callback-running?
-                                  (queue-callback user-event-handler-callback #f)
-                                  (set! callback-running? #t))
-                                (semaphore-post sema))
-                              (loop user-log-receiver)))
-                never-evt)))))
-      (define/public (get-logger-messages) logger-messages)
-      (define/private (new-log-message vec)
-        (define str
-          (cond
-            [(<= (string-length (vector-ref vec 1)) log-entry-max-size)
-             (vector-ref vec 1)]
-            [else
-             (substring (vector-ref vec 1) 0 log-entry-max-size)]))
-        (cond
-          [(< (length logger-messages) log-max-size)
-           (set! logger-messages (cons str logger-messages))
-           (update-logger-gui (cons 'add-line str))]
-          [else
-           (set! logger-messages
-                 (cons
-                  str
-                  (let loop ([msgs logger-messages])
-                    (cond
-                      [(null? (cdr msgs)) null]
-                      [else (cons (car msgs) (loop (cdr msgs)))]))))
-           (update-logger-gui (cons 'clear-last-line-and-add-line str))]))
-      
-      (define/private (reset-logger-messages) 
-        (set! logger-messages '())
-        (update-logger-gui #f))
-      
-      (define/private (update-logger-gui command)
-        (let ([tab (send definitions-text get-tab)])
-          (send tab update-logger-window command)))
-                        
-      (define/private (new-planet-info tag package) 
-        (let ([frame (get-frame)])
-          (when frame
-            (send (send frame get-current-tab) new-planet-status tag package))))
-      
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;;                                          ;;;
-      ;;;                Execution                 ;;;
-      ;;;                                          ;;;
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      
-      ;; initialize-paramters : (listof snip-class%) -> void
-      (define/private (initialize-parameters snip-classes) ; =User=
-        
-        (current-language-settings user-language-settings)
-        (error-print-source-location #f)
-        (error-display-handler drracket-error-display-handler)
-        (current-load-relative-directory #f)
-        (current-custodian user-custodian)
-        (current-load text-editor-load-handler)
-        
-        (drracket:eval:set-basic-parameters snip-classes)
-        (current-rep this)
-        (let ([dir (or (send context get-directory)
-                       drracket:init:first-dir)])
-          (current-directory dir)
-          (current-directory-for-user dir))
-        
-        (set! user-namespace-box (make-weak-box (current-namespace)))
-        
-        (current-output-port (get-out-port))
-        (current-error-port (get-err-port))
-        (current-value-port (get-value-port))
-        (current-input-port (get-in-box-port))
-
-        (current-print (lambda (v) (display-results (list v)))))
-      
-      (define/private (initialize-dispatch-handler) ;;; =User=
-        (let* ([primitive-dispatch-handler (event-dispatch-handler)])
-          (event-dispatch-handler
-           (letrec ([drscheme-event-dispatch-handler ; <= a name for #<...> printout
-                     (λ (eventspace) ; =User=, =Handler=
-                       ; Breaking is enabled if the user turned on breaks and
-                       ;  is in a `yield'. If we get a break, that's ok, because
-                       ;  the kernel never queues an event in the user's eventspace.
-                       (cond
-                         [(eq? eventspace (get-user-eventspace))
-                          ; =User=, =Handler=
-                          
-                          ; We must distinguish between "top-level" events and
-                          ;  those within `yield' in the user's program.
-                          (cond
-                            [(not in-evaluation?)
-                             ;; at this point, we must not be in a nested dispatch, so we can
-                             ;; just disable breaks and rely on call-with-break-parameterization
-                             ;; to restore them to the user's setting.
-                             (call-with-break-parameterization
-                              no-breaks-break-parameterization
-                              (λ ()
-                                ; =No-Breaks=
-                                (send context reset-offer-kill)
-                                (send context set-breakables (get-user-thread) (get-user-custodian))
-                                (call-with-continuation-prompt
-                                 (λ () ; =User=, =Handler=, =No-Breaks=
-                                   (call-with-break-parameterization
-                                    user-break-parameterization
-                                    (λ () (primitive-dispatch-handler eventspace)))))
-                                
-                                ;; in principle, the line below might cause
-                                ;; "race conditions" in the GUI. That is, there might
-                                ;; be many little events that the user won't quite
-                                ;; be able to break.
-                                (send context set-breakables #f #f)))]
-                            [else
-                             ; Nested dispatch; don't adjust interface
-                             (primitive-dispatch-handler eventspace)])]
-                         [else 
-                          ; =User=, =Non-Handler=, =No-Breaks=
-                          (primitive-dispatch-handler eventspace)]))])
-             drscheme-event-dispatch-handler))))
-      
-      (define/public (reset-console)
-        (when (thread? thread-killed)
-          (kill-thread thread-killed))
-        (send context clear-annotations)
-        (drracket:debug:hide-backtrace-window)
-        (shutdown-user-custodian)
-        (clear-input-port)
-        (clear-box-input-port)
-        (clear-output-ports)
-        (set-allow-edits #t)
-        
-        ;; in case the last evaluation thread was killed, clean up some state.
-        (lock #f)
-        (set! in-evaluation? #f)
-        (update-running #f)
-        
-        ;; clear out repl first before doing any work.
-        (begin-edit-sequence)
-        (set! prompt-position #f)
-        (reset-input-box)
-        (delete (paragraph-start-position 1) (last-position))
-        (end-edit-sequence)
-        
-        ;; must init-evaluation-thread before determining
-        ;; the language's name, since this updates user-language-settings
-        (init-evaluation-thread)
-        
-        (begin-edit-sequence)
-        (set-position (last-position) (last-position))
-        
-        (set! setting-up-repl? #t)
-        (insert/delta this (string-append (string-constant language) ": ") welcome-delta)
-        (let-values (((before after)
-                      (insert/delta
-                       this
-                       (extract-language-name user-language-settings definitions-text)
-                       dark-green-delta
-                       (extract-language-style-delta user-language-settings)))
-                     ((url) (extract-language-url user-language-settings)))
-          (when url
-            (set-clickback before after (λ args (send-url url))
-                           click-delta)))
-        (unless (is-default-settings? user-language-settings)
-          (insert/delta this (string-append " [" (string-constant custom) "]") dark-green-delta))
-        (when custodian-limit
-          (insert/delta this 
-                        "; memory limit: "
-                        welcome-delta)
-          (insert/delta this
-                        (format "~a MB" (floor (/ custodian-limit 1024 1024)))
-                        dark-green-delta))
-        (insert/delta this ".\n" welcome-delta)
-        
-        (let ([osf (get-styles-fixed)])
-          (set-styles-fixed #f)
-          (send (drracket:language-configuration:language-settings-language user-language-settings)
-                extra-repl-information
-                (drracket:language-configuration:language-settings-settings user-language-settings)
-                (open-output-text-editor this 'end))
-          (set-styles-fixed osf))
-        
-        (set! setting-up-repl? #f)
-        
-        (reset-regions (list (list (last-position) (last-position))))
-        (set-unread-start-point (last-position))
-        (set-insertion-point (last-position))
-        (set! indenting-limit (last-position))
-        (set-allow-edits #f)
-        (set! repl-header-end #f)
-        (end-edit-sequence))
-      
-      (define/public (initialize-console)
-        (begin-edit-sequence)
-        (freeze-colorer)
-        (set! setting-up-repl? #t)
-        (insert/delta this (string-append (string-constant welcome-to) " ") welcome-delta)
-        (let-values ([(before after)
-                      (insert/delta this 
-                                    (string-constant drscheme)
-                                    click-delta
-                                    drs-font-delta)])
-          (insert/delta this (format (string-append ", " (string-constant version) " ~a [~a].\n") 
-                                     (version:version) (system-type 'gc))
-                        welcome-delta)
-          (set-clickback before after 
-                         (λ args (drracket:app:about-drscheme))
-                         click-delta))
-        (set! setting-up-repl? #f)
-        (send context disable-evaluation)
-        (reset-console)
-        (thaw-colorer)
-        (insert-prompt)
-        
-        ;; call the first-opened method on the user's thread, but wait here for that to terminate
-        (let ([lang (drracket:language-configuration:language-settings-language user-language-settings)]
-              [drr-evtspace (current-eventspace)]
-              [s (make-semaphore 0)])
-          
-          (define-values (sp-err-other-end sp-err) (make-pipe-with-specials))
-          (define-values (sp-out-other-end sp-out) (make-pipe-with-specials))
-          (define io-chan (make-channel))
-          
-          ;; collect the IO to replay later
-          (thread
-           (λ () 
-             (let loop ([ports (list sp-err-other-end sp-out-other-end)]
-                        [io '()])
-               (cond
-                 [(null? ports) (channel-put io-chan io)]
-                 [else
-                  (apply 
-                   sync
-                   (for/list ([port (in-list ports)])
-                     (handle-evt 
-                      port 
-                      (λ (_)
-                        (define-values (the-bytes/specials eof?)
-                          (let b-loop ([bytes '()])
-                            (cond
-                              [(byte-ready? port)
-                               (define b (read-byte-or-special port))
-                               (cond
-                                 [(eof-object? b) (values bytes #t)]
-                                 [else (b-loop (cons b bytes))])]
-                              [else (values bytes #f)])))
-                        (define new-io
-                          (if (null? bytes)
-                              io
-                              (cons (cons port (reverse the-bytes/specials))
-                                    io)))
-                        (if eof?
-                            (loop (remq port ports) new-io)
-                            (loop ports new-io))))))]))))
-             
-          (run-in-evaluation-thread
-           (λ ()
-             (let/ec k
-               ;; we set the io ports here to ones that just collect the data
-               ;; since we're blocking the eventspace handler thread (and thus IO to 
-               ;; the user's ports can deadlock)
-               (parameterize ([error-escape-handler (λ () (k (void)))]
-                              [current-output-port sp-out]
-                              [current-error-port sp-err])
-                 (cond
-                   ;; this is for backwards compatibility; drracket used to
-                   ;; expect this method to be a thunk (but that was a bad decision)
-                   [(object-method-arity-includes? lang 'first-opened 1)
-                    (send lang first-opened
-                          (drracket:language-configuration:language-settings-settings user-language-settings))]
-                   [else
-                    ;; this is the backwards compatible case.
-                    (send lang first-opened)])))
-             (semaphore-post s)))
-          
-          ;; wait for the first-opened method to finish up
-          (semaphore-wait s)
-          
-          ;; close the output ports to get the above thread to terminate
-          (close-output-port sp-err)
-          (close-output-port sp-out)
-          
-          ;; duplicate it over to the user's ports, now that there is
-          ;; no danger of deadlock
-          (for ([i (in-list (reverse (channel-get io-chan)))])
-            (define objs (cdr i))
-            (define port
-              (if (equal? (car i) sp-err-other-end)
-                  (get-err-port)
-                  (get-out-port)))
-            (for ([obj (in-list objs)])
-              ((if (byte? obj) write-byte write-special)
-               obj
-               port)))
-          (flush-output (get-err-port))
-          (flush-output (get-out-port)))
-        
-        (send context enable-evaluation)
-        (end-edit-sequence)
-        (clear-undos))
-      
-      (define indenting-limit 0)
-      (define/override (get-limit n) 
-        (cond
-          [(< n indenting-limit) 0]
-          [else indenting-limit]))
-      
-      ;; avoid calling paragraph-start-position very often.
-      (define repl-header-end #f)
-      (define/private (get-repl-header-end)
-        (if repl-header-end
-            repl-header-end
-            (begin (set! repl-header-end (paragraph-start-position 2))
-                   repl-header-end)))
-      
-      (define setting-up-repl? #f)
-      (define/augment (can-change-style? start len)
-        (and (inner #t can-change-style? start len)
-             (or setting-up-repl?
-                 (start . >= . (get-repl-header-end)))))
-      
-      (define/private (last-str l)
-        (if (null? (cdr l))
-            (car l)
-            (last-str (cdr l))))
-      
-      (field (previous-expr-pos -1))
-      
-      (define/public (copy-previous-expr)
-        (when prompt-position
-          (let ([snip/strings (list-ref (get-previous-exprs) previous-expr-pos)])
-            (begin-edit-sequence)
-            (delete prompt-position (last-position) #f)
-            (for-each (λ (snip/string)
-                        (insert (if (is-a? snip/string snip%)
-                                    (send snip/string copy)
-                                    snip/string)
-                                prompt-position))
-                      snip/strings)
-            (set-position (last-position))
-            (end-edit-sequence))))
-      
-      (define/public (copy-next-previous-expr)
-        (let ([previous-exprs (get-previous-exprs)])
-          (unless (null? previous-exprs)
-            (set! previous-expr-pos
-                  (if (< (add1 previous-expr-pos) (length previous-exprs))
-                      (add1 previous-expr-pos)
-                      0))
-            (copy-previous-expr))))
-      (define/public (copy-prev-previous-expr)
-        (let ([previous-exprs (get-previous-exprs)])
-          (unless (null? previous-exprs)
-            (set! previous-expr-pos
-                  (if (previous-expr-pos . <= . 0)
-                      (sub1 (length previous-exprs))
-                      (sub1 previous-expr-pos)))
-            (copy-previous-expr))))
-      
-      (define/public (show-interactions-history)
-        (define f (new frame:standard-menus% 
-                       [label (string-constant drscheme)]
-                       [width 600]
-                       [height 600]))
-        (define t (new (draw-lines-mixin (text:hide-caret/selection-mixin racket:text%))))
-        (define ec (new editor-canvas% [parent (send f get-area-container)] [editor t]))
-        (for ([prev-expr (in-list (get-previous-exprs))]
-              [i (in-naturals)])
-          (define lp (send t last-position))
-          (unless (zero? i)
-            (send t draw-along-line (- (send t position-paragraph lp) 1)))
-          (for ([snip/string (in-list prev-expr)])
-            (send t insert
-                  (if (string? snip/string)
-                      snip/string
-                      (send snip/string copy))
-                  lp lp))
-          (let ([lp (send t last-position)])
-            (unless (equal? (send t get-character lp) #\newline)
-              (send t insert #\newline lp lp))
-            (unless (equal? (send t get-character (- lp 1)) #\newline)
-              (send t insert #\newline lp lp))))
-        (send t delete (- (send t last-position) 2) (send t last-position))
-        (send t set-position (send t paragraph-start-position (send t last-paragraph)))
-        (send t hide-caret #t)
-        (send t lock #t)
-        (send f show #t))
-      
-      ;; private fields
-      (define global-previous-exprs (preferences:get 'drracket:console-previous-exprs))
-      (define local-previous-exprs null)
-      (define/private (get-previous-exprs)
-        (append global-previous-exprs local-previous-exprs))
-      (define/private (add-to-previous-exprs snips)
-        (let ([prev (get-previous-exprs)])
-          (when (or (null? prev)
-                    (not (same-stuff? (last prev) snips)))
-            (set! local-previous-exprs (append local-previous-exprs (list snips))))))
-      (define/private (same-stuff? s1 s2)
-        (equal? (simplify-history-element s1 #f) 
-                (simplify-history-element s2 #f)))
-      
-      ; list-of-lists-of-snip/strings? -> list-of-lists-of-snip/strings?
-      (define/private (trim-previous-exprs lst)
-        (define max-size 10000)
-        (define (expr-size expr)
-          (for/fold ([s 0]) ([e expr]) (+ s (string-length e))))
-        (define within-bound
-          (let loop ([marshalled (reverse (marshall-previous-exprs lst))]
-                     [keep 0]
-                     [sum 0])
-            (if (empty? marshalled)
-                keep
-                (let* ([size (expr-size (first marshalled))]
-                       [w/another (+ size sum)])
-                  (if (> w/another max-size)
-                      keep
-                      (loop (rest marshalled) (add1 keep) w/another))))))
-        (take-right lst within-bound))
-      
-      (define/private (save-interaction-in-history start end)
-        (split-snip start)
-        (split-snip end)
-        (let ([snips
-               (let loop ([snip (find-snip start 'after-or-none)]
-                          [snips null])
-                 (cond
-                   [(not snip) snips]
-                   [((get-snip-position snip) . <= . end)
-                    (loop (send snip next)
-                          (cons (send snip copy) snips))]
-                   [else snips]))])
-          (set! previous-expr-pos -1)
-          (add-to-previous-exprs snips)))
-      
-      (define pretty-print-width (pretty-print-columns))
-      (define/private (reset-pretty-print-width)
-        (let* ([standard (send (get-style-list) find-named-style "Standard")])
-          (when standard
-            (let* ([admin (get-admin)]
-                   [width
-                    (let ([bw (box 0)]
-                          [b2 (box 0)])
-                      (send admin get-view b2 b2 bw b2)
-                      (unbox bw))]
-                   [dc (send admin get-dc)]
-                   [new-font (send standard get-font)]
-                   [old-font (send dc get-font)])
-              (send dc set-font new-font)
-              (let* ([char-width (send dc get-char-width)]
-                     [min-columns 50]
-                     [new-columns (max min-columns 
-                                       (floor (/ width char-width)))])
-                (send dc set-font old-font)
-                (set! pretty-print-width new-columns))))))
-      
-      ;; get-frame : -> (or/c #f (is-a?/c frame))
-      (define/private (get-frame)
-        (let ([c (get-any-canvas)])
-          (and c (send c get-top-level-window))))
-      
-
-      ;; returns the most recently active canvas or, if no canvas
-      ;; has ever been active, it returns just any canvas
-      (define/private (get-any-canvas)
-        (or (get-active-canvas)
-            (let ([canvases (get-canvases)])
-              (and (not (null? canvases))
-                   (car canvases)))))
-
-      (inherit paragraph-end-position)
-      (define/override (get-start-of-line pos)
-        (define para (position-paragraph pos))
-        (define para-start (paragraph-start-position para))
-        (define para-end (paragraph-end-position para))
-        (define after-prompt-start 
-          (let* ([prompt (get-prompt)]
-                 [para-start-text (get-text para-start (+ para-start (string-length prompt)))])
-            (cond
-              [(equal? prompt para-start-text)
-               (+ para-start (string-length prompt))]
-              [else
-               para-start])))
-        (define first-non-whitespace 
-          (let loop ([i after-prompt-start])
-            (cond
-              [(= i para-end) #f]
-              [(char-whitespace? (get-character i))
-               (loop (+ i 1))]
-              [else i])))
-        (define new-pos 
-          (cond 
-            [(not first-non-whitespace) after-prompt-start]
-            [(< pos after-prompt-start) after-prompt-start]
-            [(= pos after-prompt-start) first-non-whitespace]
-            [(<= pos first-non-whitespace) after-prompt-start]
-            [else first-non-whitespace]))
-        new-pos)
-      
-      (super-new)
-      (auto-wrap #t)
-      (set-styles-sticky #f)
-      
-      (inherit set-max-undo-history)
-      (set-max-undo-history 'forever)))
-  
-  (define (all-but-last lst)
-    (let loop ([o lst])
-      (cond
-        [(null? o) null]
-        [(null? (cdr o)) null]
-        [else (cons (car o) (loop (cdr o)))])))
-  
-  (define input-delta (make-object style-delta%))
-  (send input-delta set-delta-foreground (make-object color% 0 150 0))
-  
-  ;; insert-error-in-text : (is-a?/c text%)
-  ;;                        (union #f (is-a?/c drracket:rep:text<%>))
-  ;;                        string?
-  ;;                        exn?
-  ;;                        (union false? (and/c string? directory-exists?))
-  ;;                        ->
-  ;;                        void?
-  (define (insert-error-in-text text interactions-text msg exn user-dir)
-    (insert-error-in-text/highlight-errors
-     text
-     (λ (l) (send interactions-text highlight-errors l))
-     msg
-     exn
-     user-dir))
-  
-  ;; insert-error-in-text/highlight-errors : (is-a?/c text%)
-  ;;                                         ((listof (list text% number number)) -> void)
-  ;;                                         string?
-  ;;                                         exn?
-  ;;                                         (union false? (and/c string? directory-exists?))
-  ;;                                         ->
-  ;;                                         void?
-  (define (insert-error-in-text/highlight-errors text highlight-errors msg exn user-dir)
-    (let ([locked? (send text is-locked?)]
-          [insert-file-name/icon
-           ;; insert-file-name/icon : string number number number number -> void
-           (λ (source-name start span row col)
-             (let ([range-spec
-                    (cond
-                      [(and row col)
-                       (format ":~a:~a" row col)]
-                      [start
-                       (format "::~a" start)]
-                      [else ""])])
-               (cond
-                 [(file-exists? source-name)
-                  (let* ([normalized-name (normalize-path source-name)]
-                         [short-name (if user-dir
-                                         (find-relative-path user-dir normalized-name)
-                                         source-name)])
-                    (let-values ([(icon-start icon-end) (insert/delta text (send file-icon copy))]
-                                 [(space-start space-end) (insert/delta text " ")]
-                                 [(name-start name-end) (insert/delta text short-name)]
-                                 [(range-start range-end) (insert/delta text range-spec)]
-                                 [(colon-start colon-ent) (insert/delta text ": ")])
-                      (when (number? start)
-                        (send text set-clickback icon-start range-end
-                              (λ (_1 _2 _3)
-                                (open-file-and-highlight normalized-name
-                                                         (- start 1) 
-                                                         (if span
-                                                             (+ start -1 span)
-                                                             start)))))))]
-                 [else
-                  (insert/delta text source-name)
-                  (insert/delta text range-spec)
-                  (insert/delta text ": ")])))])
-      (send text begin-edit-sequence)
-      (send text lock #f)
-      (cond
-        [(exn:fail:syntax? exn)
-         (for-each
-          (λ (expr)
-            (let ([src (and (syntax? expr) (syntax-source expr))]
-                  [pos (and (syntax? expr) (syntax-position expr))]
-                  [span (and (syntax? expr) (syntax-span expr))]
-                  [col (and (syntax? expr) (syntax-column expr))]
-                  [line (and (syntax? expr) (syntax-line expr))])
-              (when (and (string? src)
-                         (number? pos)
-                         (number? span)
-                         (number? line)
-                         (number? col))
-                (insert-file-name/icon src pos span line col))
-              (insert/delta text (format "~a" (exn-message exn)) error-delta)
-              (when (and (error-print-source-location)
-                         (syntax? expr))
-                (insert/delta text " in: ")
-                (insert/delta text (format "~s" (syntax->datum expr)) error-text-style-delta))
-              (insert/delta text "\n")
-              (when (and (is-a? src text:basic<%>)
-                         (number? pos)
-                         (number? span))
-                (highlight-errors (list (list src (- pos 1) (+ pos -1 span)))))))
-          (exn:fail:syntax-exprs exn))]
-        [(exn:fail:read? exn)
-         '(let ([src (exn:read-source exn)]
-                [pos (exn:read-position exn)]
-                [span (exn:read-span exn)]
-                [line (exn:read-line exn)]
-                [col (exn:read-column exn)])
-            (when (and (string? src)
-                       (number? pos)
-                       (number? span)
-                       (number? line)
-                       (number? col))
-              (insert-file-name/icon src pos span line col))
-            (insert/delta text (format "~a" (exn-message exn)) error-delta)
-            (insert/delta text "\n")
-            (when (and (is-a? src text:basic<%>)
-                       (number? pos)
-                       (number? span))
-              (highlight-errors (list (list src (- pos 1) (+ pos -1 span))))))]
-        [(exn? exn)
-         (insert/delta text (format "~a" (exn-message exn)) error-delta)
-         (insert/delta text "\n")]
-        [else
-         (insert/delta text "uncaught exception: " error-delta)
-         (insert/delta text (format "~s" exn) error-delta)
-         (insert/delta text "\n")])
-      (send text lock locked?)
-      (send text end-edit-sequence)))
-  
-  
-  ;; open-file-and-highlight : string (union number #f) (union number #f)
-  ;; =Kernel, =Handler=
-  ;; opens the file named by filename. If position is #f,
-  ;; doesn't highlight anything. If position is a number and other-position
-  ;; is #f, highlights the range from position to the end of sexp.
-  ;; if other-position is a number, highlights from position to 
-  ;; other position.
-  (define (open-file-and-highlight filename position other-position)
-    (let ([file (handler:edit-file filename)])
-      (when (and (is-a? file drracket:unit:frame%)
-                 position)
-        (if other-position
-            (send (send file get-interactions-text)
-                  highlight-error
-                  (send file get-definitions-text)
-                  position
-                  other-position)
-            (send (send file get-interactions-text)
-                  highlight-error/forward-sexp
-                  (send file get-definitions-text)
-                  position)))))
-  
-  (define drs-autocomplete-mixin
-    (λ (get-defs x)
-      (class (text:autocomplete-mixin x)
-        (define/override (get-all-words)
-          (let* ([definitions-text (get-defs this)]
-                 [settings (send definitions-text get-next-settings)]
-                 [language (drracket:language-configuration:language-settings-language settings)])
-            (send language capability-value 'drscheme:autocomplete-words)))
-        (super-new))))
-  
-  (define -text% 
-    (text-mixin 
-     ;; drs-bindings-keymap-mixin has to come
-     ;; before text-mixin so that the keymaps 
-     ;; get added in the right order (specifically
-     ;; so that esc;n and esc;p work right in the
-     ;; repl (prev and next interaction) and in the defs
-     ;; (previous and next error))
-     (drs-bindings-keymap-mixin
-      (text:ports-mixin
-       (racket:text-mixin
-        (color:text-mixin
-         (text:info-mixin
-          (editor:info-mixin
-           (text:searching-mixin
-            (mode:host-text-mixin
-             (drs-autocomplete-mixin 
-              (λ (txt) (send txt get-definitions-text))
-              (text:foreground-color-mixin
-               (text:normalize-paste-mixin
-                text:clever-file-format%))))))))))))))
-
-(define (draw-lines-mixin text%)
-  (class text%
-    (define line-paras (set))
-    (define/public (draw-along-line para)
-      (set! line-paras (set-add line-paras para)))
-    (inherit paragraph-start-position 
-             paragraph-end-position
-             position-locations)
-    (define ty (box 0.0))
-    (define by (box 0.0))
-    (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-      (unless before?
-        (define pen (send dc get-pen))
-        (for ([para (in-set line-paras)])
-          (define sp (paragraph-start-position para))
-          (define ep (paragraph-end-position para))
-          (position-locations sp #f ty #f by)
-          (define y (/ (+ (unbox ty) (unbox by)) 2))
-          (send dc set-pen "Lavender" (/ (- (unbox by) (unbox ty)) 3.0) 'solid)
-          (send dc draw-line 
-                (+ dx left)
-                (+ dy y)
-                (+ dx right)
-                (+ dy y))))
-      (super on-paint before? dc left top right bottom dx dy draw-caret))
-    (super-new)))
-
-(define (simplify-history-element s all-to-strings?)
-  (cond
-    [(null? s) '("")]
-    [else
-     (let loop ([acc '()]
-                [s s])
-       (cond
-         [(null? s) acc]
-         [else
-          (define e (car s))
-          (cond
-            [(or all-to-strings? (string? e) (is-a? e string-snip%))
-             (define str (cond
-                           [(is-a? e string-snip%)
-                            (send e get-text 0 (send e get-count))]
-                           [(string? e) e]
-                           [else "'non-string-snip"]))
-             (cond
-               [(null? acc) (loop (list str) (cdr s))]
-               [(string? (car acc))
-                (loop (cons (string-append str (car acc)) (cdr acc))
-                      (cdr s))]
-               [else (loop (cons str acc) (cdr s))])]
-            [else
-             (loop (cons e acc) (cdr s))])]))]))
-
-(module+ test
-  (require rackunit)
-  (define (old-conversion-code ls)
-    (list
-     (apply
-      string-append
-      (reverse
-       (map (λ (s)
-              (cond
-                [(is-a? s string-snip%)
-                 (send s get-text 0 (send s get-count))]
-                [(string? s) s]
-                [else "'non-string-snip"]))
-            ls)))))
-  
-  (check-equal? (simplify-history-element '("xyzpdq") #f)
-                '("xyzpdq"))
-  (check-equal? (simplify-history-element '("a" "b" "c") #f)
-                '("cba"))
-  (let ([i (make-object image-snip%)])
-    (check-equal? (simplify-history-element (list "a" "b" "c" i "d" "e" "f") #f)
-                  (list "fed" i "cba")))
-  
-  (check-equal? (simplify-history-element '() #t)
-                (old-conversion-code '()))
-  (check-equal? (simplify-history-element '("pdq") #t)
-                (old-conversion-code '("pdq")))
-  (check-equal? (simplify-history-element '("a" "b" "c") #t)
-                (old-conversion-code '("a" "b" "c")))
-  (let ([in (list (make-object string-snip% "a")
-                  (make-object string-snip% "b")
-                  (make-object string-snip% "c"))])
-    (check-equal? (simplify-history-element in #t)
-                  (old-conversion-code in)))
-  (let ([in (list (make-object string-snip% "a")
-                  (make-object image-snip%)
-                  (make-object string-snip% "c"))])
-    (check-equal? (simplify-history-element in #t)
-                  (old-conversion-code in))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/stack-checkpoint.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/stack-checkpoint.rkt
deleted file mode 100644
index 28e7afb4a6..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/stack-checkpoint.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-(provide cut-stack-at-checkpoint with-stack-checkpoint)
-
-;; run a thunk, and if an exception is raised, make it possible to cut the
-;; stack so that the surrounding context is hidden
-(define checkpoints (make-weak-hasheq))
-(define (call-with-stack-checkpoint thunk)
-  (define checkpoint #f)
-  (call-with-exception-handler
-   (λ (exn)
-     (when (and checkpoint ; just in case there's an exception before it's set
-                (not (hash-has-key? checkpoints exn)))
-       (hash-set! checkpoints exn checkpoint))
-     exn)
-   (lambda ()
-     (set! checkpoint (current-continuation-marks))
-     (thunk))))
-;; returns the stack of the input exception, cutting off any tail that was
-;; registered as a checkpoint
-(define (cut-stack-at-checkpoint exn)
-  (define stack (continuation-mark-set->context (exn-continuation-marks exn)))
-  (define checkpoint
-    (cond [(hash-ref checkpoints exn #f) => continuation-mark-set->context]
-          [else #f]))
-  (if (not checkpoint)
-    stack
-    (let loop ([st stack]
-               [sl (length stack)]
-               [cp checkpoint]
-               [cl (length checkpoint)])
-      (cond [(sl . > . cl) (cons (car st) (loop (cdr st) (sub1 sl) cp cl))]
-            [(sl . < . cl) (loop st sl (cdr cp) (sub1 cl))]
-            [(equal? st cp) '()]
-            [else (loop st sl (cdr cp) (sub1 cl))]))))
-  
-
-(define-syntax-rule (with-stack-checkpoint expr)
-  (call-with-stack-checkpoint (lambda () expr)))
-
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/stick-figures.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/stick-figures.rkt
deleted file mode 100644
index 0af8db8b5f..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/stick-figures.rkt
+++ /dev/null
@@ -1,343 +0,0 @@
-#lang racket/base
-  (require racket/class
-           racket/pretty
-           racket/gui/base)
-
-  (module test racket/base)
-  
-  (define head-size 40)
-  (define small-bitmap-factor 1/2)
-  (define small-factor 1/5)
-  (define line-size 2)
-  
-  (define waiting-points
-    '((head 47 2)
-      (neck 46 15)
-      (shoulders 38 42)
-      (left-shoulder 18 39)
-      (right-shoulder 65 42)
-      (left-elbow 8 74)
-      (right-elbow 68 76)
-      (left-hand 24 79)
-      (right-hand 56 83)
-      (waist 37 87)
-      (left-knee 23 117)
-      (right-knee 57 117)
-      (left-ankle 21 149)
-      (right-ankle 59 148)
-      (left-toe 3 148)
-      (right-toe 79 145)))
-  
-  (define waiting-points/2
-    '((head 47 2)
-      (neck 46 15)
-      (shoulders 38 42)
-      (left-shoulder 18 39)
-      (right-shoulder 65 42)
-      (left-elbow 8 74)
-      (right-elbow 68 76)
-      (left-hand 24 79)
-      (right-hand 56 83)
-      (waist 37 87)
-      (left-knee 23 117)
-      (right-knee 57 117)
-      (left-ankle 21 149)
-      (right-ankle 59 148)
-      (left-toe 3 148)
-      (right-toe 79 132)))
-  
-  (define waiting-points/old
-    '((head 55 0)
-      (neck 43 18)
-      (shoulders 37 33)
-      (left-shoulder 23 34)
-      (right-shoulder 50 37)
-      (left-elbow 8 74)
-      (right-elbow 66 69)
-      (left-hand 60 78)
-      (right-hand 68 18)
-      (waist 37 87)
-      (left-knee 19 122)
-      (right-knee 57 117)
-      (left-ankle 19 154)
-      (right-ankle 62 155)
-      (left-toe 0 154)
-      (right-toe 83 146)))
-  
-  (define waiting-points/2/old
-    '((head 55 0)
-      (neck 43 18)
-      (shoulders 37 33)
-      (left-shoulder 23 34)
-      (right-shoulder 50 37)
-      (left-elbow 8 74)
-      (right-elbow 66 69)
-      (left-hand 60 78)
-      (right-hand 68 18)
-      (waist 37 87)
-      (left-knee 19 122)
-      (right-knee 57 117)
-      (left-ankle 19 154)
-      (left-toe 0 154)
-      (right-ankle 62 155)
-      (right-toe 83 154)))
-  
-  (define running-points
-    '((head 130 18)
-      (neck 114 33)
-      (shoulders 105 44)
-      (left-shoulder 105 44)
-      (right-shoulder 105 44)
-      (left-elbow 71 28)
-      (right-elbow 115 67)
-      (left-hand 50 54)
-      (right-hand 148 53)
-      (waist 59 78)
-      (left-knee 41 112)
-      (right-knee 97 93)
-      (left-ankle 0 129)
-      (right-ankle 89 132)
-      (left-toe 14 146)
-      (right-toe 109 132)))
-  
-  (define (get-size-parameters)
-    (let-values ([(min-rx min-ry) (get-max/min-x/y min running-points)]
-                 [(max-rx max-ry) (get-max/min-x/y max running-points)]
-                 [(min-wx min-wy) (get-max/min-x/y min waiting-points)]
-                 [(max-wx max-wy) (get-max/min-x/y max waiting-points)])
-      (let* ([running-w (* small-factor (- max-rx min-rx))]
-             [waiting-w (* small-factor (- max-wx min-wx))]
-             [running-h (* small-factor (- max-ry min-ry))]
-             [waiting-h (* small-factor (- max-wy min-wy))]
-             [w (+ 2 (ceiling (max running-w waiting-w)))]
-             [h (+ 2 (ceiling (max running-h waiting-h)))]
-             [running-dx (+ 1 (- (/ w 2) (/ running-w 2)))]
-             [running-dy (+ 1 (- (/ h 2) (/ running-h 2)))]
-             [waiting-dx (+ 1 (- (/ w 2) (/ waiting-w 2)))]
-             [waiting-dy (+ 1 (- (/ h 2) (/ waiting-h 2)))])
-        (values w h running-dx running-dy waiting-dx waiting-dy))))
-  
-  (define (get-bitmap points green)
-    (let-values ([(min-rx min-ry) (get-max/min-x/y min points)]
-                 [(max-rx max-ry) (get-max/min-x/y max points)])
-      (let* ([margin 2]
-             [bw (+ margin margin (ceiling (* small-factor (- max-rx min-rx))))]
-             [bh (+ margin margin (ceiling (* small-factor (- max-ry min-ry))))]
-             [w (ceiling (* bw small-bitmap-factor))] 
-             [h (ceiling (* bh small-bitmap-factor))]
-             [bm-big (make-object bitmap% bw bh)]
-             [bm-solid (make-object bitmap% w h)]
-             [bm-small (make-object bitmap% w h)]
-             [bdc-big (make-object bitmap-dc% bm-big)]
-             [bdc-solid (make-object bitmap-dc% bm-solid)]
-             [bdc-small (make-object bitmap-dc% bm-small)])
-        (send bdc-big clear)
-        (draw-callback bdc-big small-factor #f points
-                       (+ margin (- (* small-factor min-rx)))
-                       (+ margin #;(- (* small-factor min-ry)))
-                       3)
-        
-        (send bdc-small clear)
-        (send bdc-small set-scale small-bitmap-factor small-bitmap-factor)
-        (send bdc-small draw-bitmap bm-big 0 0)
-        (send bdc-small set-scale 1 1)
-        
-        (send bdc-solid set-brush green 'solid)
-        (send bdc-solid set-pen green 1 'solid)
-        (send bdc-solid draw-rectangle 0 0 w h)
-        
-        (send bdc-solid set-bitmap #f)
-        (send bdc-small set-bitmap #f)
-        (send bdc-big set-bitmap #f)
-        
-        (send bm-solid set-loaded-mask bm-small)
-        bm-solid)))
-  
-  (define (get-running-bitmap) (get-bitmap running-points (make-object color% 30 100 30)))
-  (define (get-waiting-bitmap) (get-bitmap waiting-points (make-object color% 30 100 30)))
-  
-  (define (normalize points)
-    (let-values ([(min-x min-y) (get-max/min-x/y min points)])
-      (map (λ (x) (list (car x) 
-                        (+ (- (list-ref x 1) min-x))
-                        (+ (- (list-ref x 2) min-y))))
-           points)))
-  
-  (define (get-max/min-x/y choose points)
-    (values (apply choose
-                   (- (list-ref (assoc 'head points) 1) (/ head-size 2))
-                   (+ (list-ref (assoc 'head points) 1) (/ head-size 2))
-                   (map (λ (x) (list-ref x 1)) points))
-            (apply choose
-                   (- (list-ref (assoc 'head points) 2) (/ head-size 2))
-                   (+ (list-ref (assoc 'head points) 2) (/ head-size 2))
-                   (map (λ (x) (list-ref x 2)) points))))
-  
-  (define show-dots? #t)
-  (define (draw-callback dc factor dots? points dx dy line-size)
-    (send dc set-smoothing 'aligned)
-    (let ([points (normalize points)])
-      (send dc set-pen "orange" 1 'solid)
-      (send dc set-brush "orange" 'solid)
-      (when (and dots? show-dots?)
-        (for-each
-         (λ (x) (send dc draw-ellipse
-                      (+ dx (- (list-ref x 1) 4))
-                      (+ dy (- (list-ref x 2) 4))
-                      9 9))
-         points))
-      (send dc set-pen "black" line-size 'solid)
-      (send dc set-brush "black" 'transparent)
-      (draw-points points dc factor dx dy)
-      
-      (let* ([head (assoc 'head points)]
-             [hx (list-ref head 1)]
-             [hy (list-ref head 2)])
-        (send dc draw-ellipse 
-              (+ dx (* factor (- hx (/ head-size 2))))
-              (+ dy (* factor (- hy (/ head-size 2))))
-              (* factor head-size)
-              (* factor head-size)))))
-  
-  (define (draw-points points dc factor dx dy)
-    (connect 'neck 'shoulders points dc factor dx dy)
-    (connect 'shoulders 'left-shoulder points dc factor dx dy)
-    (connect 'left-shoulder 'left-elbow points dc factor dx dy)
-    (connect 'shoulders 'right-shoulder points dc factor dx dy)
-    (connect 'right-shoulder 'right-elbow points dc factor dx dy)
-    (connect 'left-elbow 'left-hand points dc factor dx dy)
-    (connect 'right-elbow 'right-hand points dc factor dx dy)
-    (connect 'shoulders 'waist points dc factor dx dy)
-    (connect 'waist 'left-knee points dc factor dx dy)
-    (connect 'waist 'right-knee points dc factor dx dy)
-    (connect 'left-knee 'left-ankle points dc factor dx dy)
-    (connect 'right-knee 'right-ankle points dc factor dx dy)
-    (connect 'left-ankle 'left-toe points dc factor dx dy)
-    (connect 'right-ankle 'right-toe points dc factor dx dy))
-  
-  (define (connect from to points dc factor dx dy)
-    (let ([from-p (assoc from points)]
-          [to-p (assoc to points)])
-      (when (and from-p to-p)
-        (send dc draw-line 
-              (+ dx (* factor (list-ref from-p 1)))
-              (+ dy (* factor (list-ref from-p 2)))
-              (+ dx (* factor (list-ref to-p 1)))
-              (+ dy (* factor (list-ref to-p 2)))))))
-  
-  ;; Use this thunk to edit the points.
-  ;; Click the 'show' button to print out the points and then
-  ;; copy and paste them back into this file.
-  (define (edit-points points)
-    (define c%
-      (class canvas%
-        (inherit get-client-size refresh get-dc)
-        (define clicked-point #f)
-        (define clicked-x 0)
-        (define clicked-y 0)
-        (define orig-x 0)
-        (define orig-y 0)
-        (define/override (on-paint)
-          (draw-callback (get-dc) 1 #t points 0 0 line-size))
-        (define/override (on-event evt)
-          (cond
-            [(send evt button-down? 'left)
-             (let-values ([(w h) (get-client-size)])
-               (let ([x (send evt get-x)]
-                     [y (send evt get-y)])
-                 (let ([point (find-point this x y)])
-                   (when point
-                     (set! clicked-x x)
-                     (set! clicked-y y)
-                     (set! clicked-point point)
-                     (let ([orig-point (assoc point points)])
-                       (set! orig-x (list-ref orig-point 1))
-                       (set! orig-y (list-ref orig-point 2)))))))]
-            [(and clicked-point (send evt moving?))
-             (set! points 
-                   (map (λ (x)
-                          (if (eq? (car x) clicked-point)
-                              (list (list-ref x 0)
-                                    (+ orig-x (- (send evt get-x) clicked-x))
-                                    (+ orig-y (- (send evt get-y) clicked-y)))
-                              x))
-                        points))
-             (refresh)
-             (send csmall refresh)]
-            [(send evt button-up? 'left)
-             (set! clicked-point #f)]))
-        (super-new)))
-    
-    (define (find-point c x y)
-      (let loop ([points (normalize points)])
-        (cond
-          [(null? points) #f]
-          [else (let ([point (car points)])
-                  (if (and (<= (- (list-ref point 1) 4)
-                               x
-                               (+ (list-ref point 1) 4))
-                           (<= (- (list-ref point 2) 4)
-                               y
-                               (+ (list-ref point 2) 4)))
-                      (car point)
-                      (loop (cdr points))))])))
-    
-    (define f (new frame% [label ""] [width 400] [height 400]))
-    (define cp (new horizontal-panel% [parent f]))
-    (define cbig (new c% [parent cp]))
-    (define csmall
-      (new canvas%
-           [parent cp]
-           [paint-callback (λ (c dc) 
-                             (draw-callback dc small-factor #f running-points 0 0 line-size)
-                             (draw-callback dc small-factor #f waiting-points 30 0 line-size)
-                             (draw-callback dc small-factor #f points 30 50 line-size)
-                             (draw-callback dc small-factor #f points 0 50 line-size))]))
-    (define cbitmap (new message% [label (get-bitmap points (send the-color-database find-color "black"))] [parent cp]))
-    (define bp (new horizontal-panel% [parent f] [stretchable-height #f]))
-    (new button%
-         [parent bp]
-         [label "Show"]
-         [callback
-          (λ (x y)
-            (pretty-print points))])
-    (new button%
-         [parent bp]
-         [label "Toggle dots"]
-         [callback
-          (λ (x y)
-            (set! show-dots? (not show-dots?))
-            (send cbig refresh))])
-    (new button%
-         [parent bp]
-         [label "Bitmap"]
-         [callback
-          (λ (x y)
-            (send cbitmap set-label (get-bitmap points (send the-color-database find-color "black"))))])
-    (send f show #t))
-  
-  (let ()
-    (define f (new frame% [label ""]))
-    (define hp (new horizontal-panel% [parent f]))
-    (define left-column (new vertical-panel% [parent hp]))
-    (define right-column (new vertical-panel% [parent hp]))
-    (define green-rb (get-running-bitmap))
-    (define black (send the-color-database find-color "black"))
-    (define rb (get-bitmap running-points black))
-    (define wb (get-bitmap waiting-points black))
-    (define wb2 (get-bitmap waiting-points/2 black))
-    (define rm (new message% [label rb] [parent left-column]))
-    (define grm (new message% [label green-rb] [parent right-column]))
-    (new message% [label wb] [parent left-column])
-    (new message% [label wb2] [parent left-column])
-    (new message% [label wb2] [parent right-column])
-    (new message% [label wb] [parent right-column])
-    (new grow-box-spacer-pane% [parent f])
-    (send green-rb save-file (collection-file-path "run.png" "icons") 'png)
-    (send rb save-file (collection-file-path "b-run.png" "icons") 'png)
-    (send wb save-file (collection-file-path "b-wait.png" "icons") 'png)
-    (send wb2 save-file (collection-file-path "b-wait2.png" "icons") 'png)
-    (send f show #t))
-
-  #;(edit-points waiting-points/2)
-  #;(edit-points running-points)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck-debug.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/syncheck-debug.rkt
deleted file mode 100644
index 9ff7a14dd9..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck-debug.rkt
+++ /dev/null
@@ -1,165 +0,0 @@
-#lang mzscheme
-
-  (require mzlib/pretty
-           mzlib/list
-           mzlib/class
-           mred)
-  
-  (provide debug-origin)  ;; : syntax [syntax] -> void
-  ;; creates a frame for examining the 
-  ;; origin and source fields of an expanded sexp
-  ;; also the 'bound-in-source syntax property
-  
-  (define debug-origin
-    (case-lambda 
-      [(original-object) (debug-origin original-object (expand original-object))]
-      [(original-object expanded-object)
-       (define-values (expanded-datum stx-ht) (syntax-object->datum/ht expanded-object))
-       
-       (define output-text (make-object text%))
-       (define output-port (make-text-port output-text))
-       (define info-text (make-object text%))
-       (define info-port (make-text-port info-text))
-       
-       ;; assume that there aren't any eq? sub structures, only eq? flat stuff (symbols, etc)
-       ;; this is guaranteed by syntax-object->datum/ht
-       (define range-start-ht (make-hash-table))
-       (define range-ht (make-hash-table))
-       (define original-output-port (current-output-port))
-       (define (range-pretty-print-pre-hook x v)
-         (hash-table-put! range-start-ht x (send output-text last-position)))
-       (define (range-pretty-print-post-hook x v)
-         (hash-table-put! range-ht x 
-                          (cons
-                           (cons
-                            (hash-table-get range-start-ht x)
-                            (send output-text last-position))
-                           (hash-table-get range-ht x (λ () null)))))
-       
-       (define (make-modern text)
-         (send text change-style
-               (make-object style-delta% 'change-family 'modern)
-               0
-               (send text last-position)))
-       
-       (define dummy
-         (begin (pretty-print (syntax-object->datum original-object) output-port)
-                (newline output-port)
-                (parameterize ([current-output-port output-port]
-                               [pretty-print-pre-print-hook range-pretty-print-pre-hook]
-                               [pretty-print-post-print-hook range-pretty-print-post-hook]
-                               [pretty-print-columns 30])
-                  (pretty-print expanded-datum))
-                (make-modern output-text)))
-       
-       (define ranges 
-         (sort 
-          (apply append (hash-table-map range-ht (λ (k vs) (map (λ (v) (cons k v)) vs))))
-          (λ (x y)
-            (<= (- (car (cdr x)) (cdr (cdr x)))
-                (- (car (cdr y)) (cdr (cdr y)))))))
-       
-       (define (show-info stx)
-         (fprintf info-port "datum: ~s\nsource: ~a\nposition: ~s\noffset: ~s\noriginal: ~s\nbound-in-source: ~s\n\n"
-                  (syntax-object->datum stx)
-                  (syntax-source stx)
-                  (syntax-position stx)
-                  (syntax-span stx)
-                  (syntax-original? stx)
-                  (syntax-property stx 'bound-in-source))
-         (let loop ([origin (syntax-property stx 'origin)])
-           (cond
-             [(pair? origin)
-              (loop (car origin))
-              (loop (cdr origin))]
-             [(syntax? origin)
-              (display "  " info-port)
-              (display origin info-port)
-              (newline info-port)
-              (fprintf info-port
-                       "  original? ~a\n  datum:\n  ~a\n\n"
-                       (and (syntax? origin) (syntax-original? origin))
-                       (and (syntax? origin) (syntax-object->datum origin)))]
-             [else (void)])))
-       
-       (for-each
-        (λ (range)
-          (let* ([obj (car range)]
-                 [stx (hash-table-get stx-ht obj)]
-                 [start (cadr range)]
-                 [end (cddr range)])
-            (when (syntax? stx)
-              (send output-text set-clickback start end 
-                    (λ _ 
-                      (send info-text begin-edit-sequence)
-                      (send info-text erase)
-                      (show-info stx)
-                      (make-modern info-text)
-                      (send info-text end-edit-sequence))))))
-        ranges)
-       
-       (newline output-port)
-       (newline output-port)
-       (let ([before (send output-text last-position)])
-         (display "all" output-port)
-         (send output-text set-clickback
-               before
-               (send output-text last-position)
-               (λ _
-                 (send info-text begin-edit-sequence)
-                 (send info-text erase)
-                 (for-each (λ (rng)
-                             (let ([stx (hash-table-get stx-ht (car rng))])
-                               (when (syntax? stx)
-                                 (show-info stx))))
-                           ranges)
-                 (make-modern info-text)
-                 (send info-text end-edit-sequence))))
-       
-       (let ()
-         (define f (make-object frame% "Syntax 'origin Browser" #f 600 300))
-         (define p (make-object horizontal-panel% f))
-         (make-object editor-canvas% p output-text)
-         (make-object editor-canvas% p info-text)
-         (send f show #t))]))
-  
-  ;; build-ht : stx -> hash-table
-  ;; the resulting hash-table maps from the each sub-object's to its syntax.
-  (define (syntax-object->datum/ht stx)
-    (let ([ht (make-hash-table)])
-      (values (let loop ([stx stx])
-                (let ([obj (syntax-e stx)])
-                  (cond
-                    [(list? obj) 
-                     (let ([res (map loop obj)])
-                       (hash-table-put! ht res stx)
-                       res)]
-                    [(pair? obj) 
-                     (let ([res (cons (loop (car obj))
-                                      (loop (cdr obj)))])
-                       (hash-table-put! ht res stx)
-                       res)]
-                    [(vector? obj) 
-                     (let ([res (list->vector (map loop (vector->list obj)))])
-                       (hash-table-put! ht res stx)
-                       res)]
-                    [else 
-                     (let ([res (syntax-object->datum stx)])
-                       (hash-table-put! ht res stx)
-                       res)])))
-              ht)))
-  
-  ;; make-text-port : text -> port
-  ;; builds a port from a text object.  
-  (define (make-text-port text)
-    (let-values ([(in out) (make-pipe)])
-      (thread
-       (λ ()
-         (let loop ()
-           (let ([c (read-char in)])
-             (unless (eof-object? c)
-               (send text insert (string c)
-                     (send text last-position)
-                     (send text last-position))
-               (loop))))))
-      out))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/blueboxes-gui.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/blueboxes-gui.rkt
deleted file mode 100644
index 27156e07e8..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/blueboxes-gui.rkt
+++ /dev/null
@@ -1,791 +0,0 @@
-#lang racket/base
-(require framework 
-         racket/gui/base
-         racket/class
-         racket/math
-         racket/runtime-path
-         data/interval-map
-         images/icons/misc
-         drracket/private/rectangle-intersect
-         string-constants
-         framework/private/logging-timer
-         scribble/blueboxes)
-(provide docs-text-mixin
-         docs-editor-canvas-mixin
-         syncheck:add-docs-range
-         syncheck:reset-docs-im
-         syncheck:update-blue-boxes)
-
-(define sc-f2-to-lock (string-constant sc-f2-to-un/lock))
-(define sc-read-more... (string-constant sc-read-more...))
-
-(preferences:set-default 'drracket:syncheck:contracts-locked? #f boolean?)
-(preferences:set-default 'drracket:syncheck:show-blueboxes? #t boolean?)
-
-(define corner-radius 48)
-(define blue-box-color (make-object color% 232 240 252))
-(define blue-box-gradient-stop-color (make-object color% 252 252 252))
-(define var-color (make-object color% 68 68 68))
-(define blue-box-label-text-color (make-object color% 128 128 128))
-(define blue-box-margin 5)
-
-(define stops (list (list 0 blue-box-color)
-                    (list 1 blue-box-gradient-stop-color)))
-(define (make-blue-box-gradient-pen x y w h)
-  (make-object brush% "black" 'solid #f
-    (new linear-gradient%
-         [x0 x] [y0 (+ y h)]
-         [x1 (+ x w)] [y1 y]
-         [stops stops])))
-
-;; the multiplication by 1.5 is suspicious, but it makes things
-;; look right under mac os x (with fairly standard font settings)
-(define (get-label-font sl)
-  (and (send sl find-named-style "Standard")
-       (send (send sl find-named-style "Standard") get-font)))
-
-(define (get-read-more-font sl)
-  (define style (send sl find-named-style "Standard"))
-  (define font-size (if style
-                        (send (send style get-font) get-point-size)
-                        12))
-  (send the-font-list find-or-create-font
-        font-size 'roman 'italic 'normal))
-(define (get-read-more-underline-font sl)
-  (define style (send sl find-named-style "Standard"))
-  (define font-size (if style
-                        (send (send style get-font) get-point-size)
-                        12))
-  (send the-font-list find-or-create-font
-        font-size 'roman 'italic 'normal #t))
-
-(define-local-member-name
-  get-show-docs?
-  get-current-strs
-  syncheck:reset-docs-im
-  syncheck:add-docs-range
-  syncheck:update-blue-boxes)
-
-(define docs-ec-clipping-region #f)
-(define docs-ec-last-cw #f)
-(define docs-ec-last-ch #f)
-(define docs-ec-last-hi #f)
-(define docs-ec-last-vi #f)
-
-(define (docs-editor-canvas-mixin %)
-  (class %
-    (inherit get-dc get-client-size get-editor
-             horizontal-inset vertical-inset)
-    (define/override (on-paint)
-      (when (preferences:get 'drracket:syncheck:show-blueboxes?)
-        (define e (get-editor))
-        (when e
-          (define dc (get-dc))
-          (define-values (cw ch) (get-client-size))
-          (define the-strs (send e get-current-strs))
-          (cond
-            [(and (send e get-show-docs?) the-strs)
-             (define hi (horizontal-inset))
-             (define vi (vertical-inset))
-             (define font (send dc get-font))
-             (define pen (send dc get-pen))
-             (define brush (send dc get-brush))
-             (define smoothing (send dc get-smoothing))
-             (define std (send (send e get-style-list) find-named-style "Standard"))
-             (when std (send dc set-font (send std get-font)))
-             (define-values (box-width box-height label-overlap?)
-               (get-blue-box-size dc (send e get-style-list) the-strs))
-             (send dc set-pen "black" 1 'transparent)
-             (let ([rect-x (- cw box-width)]
-                   [rect-y 0])
-               (send dc set-brush (make-blue-box-gradient-pen rect-x rect-y box-width box-height))
-               (send dc draw-rectangle rect-x rect-y box-width box-height))
-             (send dc set-smoothing 'aligned)
-             
-             ;; most of the time (unless the user is
-             ;; resizing the window) we don't really 
-             ;; need a new clipping region, so just
-             ;; make a cache of size 1, keyed by the
-             ;; client width, height, and vertical and 
-             ;; horizontal insets.
-             (unless (and (equal? cw docs-ec-last-cw)
-                          (equal? ch docs-ec-last-ch)
-                          (equal? hi docs-ec-last-hi)
-                          (equal? vi docs-ec-last-vi))
-               (set! docs-ec-last-cw cw)
-               (set! docs-ec-last-ch ch)
-               (set! docs-ec-last-hi hi)
-               (set! docs-ec-last-vi vi)
-               (define rgn1 (new region%))
-               (define rgn2 (new region%))
-               (define rgn3 (new region%))
-               (define rgn4 (new region%))
-               (send rgn1 set-rectangle 0 0 cw vi)
-               (send rgn2 set-rectangle (- cw hi) 0 hi ch)
-               (send rgn3 set-rectangle 0 (- ch vi) cw vi)
-               (send rgn4 set-rectangle 0 0 hi ch)
-               (send rgn1 union rgn2)
-               (send rgn1 union rgn3)
-               (send rgn1 union rgn4)
-               (set! docs-ec-clipping-region rgn1))
-             
-             (define old-region (send dc get-clipping-region))
-             (send dc set-clipping-region docs-ec-clipping-region)
-             (draw-blue-box-shadow dc (- cw box-width) 0 box-width box-height)
-             
-             (send dc set-clipping-region old-region)
-             (send dc set-pen pen)
-             (send dc set-brush brush)
-             (send dc set-font font)
-             (send dc set-smoothing smoothing)]
-            [the-strs
-             (draw-closed dc cw 0)])))
-      (super on-paint))
-    (super-new)))
-
-(define (docs-text-mixin %)
-  (class %
-    (inherit get-canvas get-admin get-style-list
-             dc-location-to-editor-location get-dc
-             get-start-position get-end-position
-             begin-edit-sequence end-edit-sequence
-             invalidate-bitmap-cache)
-    
-    (define locked? (preferences:get 'drracket:syncheck:contracts-locked?))
-    (define mouse-in-blue-box? #f)
-    (define mouse-in-lock-icon? #f)
-    (define mouse-in-read-more? #f)
-    
-    (define the-strs #f)
-    (define the-strs-id-start #f)
-    (define the-strs-id-end #f)
-    (define/public (get-current-strs) the-strs)
-    
-    (define visit-docs-url void)
-    
-    (define/public (get-show-docs?) (and the-strs (or locked? mouse-in-blue-box?)))
-    (define/public (toggle-syncheck-docs)
-      (begin-edit-sequence #t #f)
-      (invalidate-blue-box-region)
-      (cond
-        [locked?
-         (set! mouse-in-blue-box? #f)]
-        [else
-         (update-the-strs)])
-      (update-locked (not locked?))
-      (when last-evt-seen
-        (update-mouse-in-blue-box (in-blue-box? last-evt-seen))
-        (define-values (is-in-lock? is-in-read-more?) (in-lock/in-read-more? last-evt-seen))
-        (update-mouse-in-lock-icon/read-more? is-in-lock? is-in-read-more?))
-      (invalidate-blue-box-region)
-      (end-edit-sequence))
-    (define/public (update-mouse-in-blue-box b)
-      (unless (equal? b mouse-in-blue-box?)
-        (begin-edit-sequence #t #f)
-        (invalidate-blue-box-region)
-        (set! mouse-in-blue-box? b)
-        (invalidate-blue-box-region)
-        (end-edit-sequence)))
-    (define/public (update-locked b)
-      (preferences:set 'drracket:syncheck:contracts-locked? b)
-      (unless (equal? b locked?)
-        (begin-edit-sequence #t #f)
-        (invalidate-blue-box-region)
-        (set! locked? b)
-        (invalidate-blue-box-region)
-        (end-edit-sequence)))
-    (define/public (update-mouse-in-lock-icon/read-more? lk? rm?)
-      (unless (and (equal? lk? mouse-in-lock-icon?)
-                   (equal? rm? mouse-in-read-more?))
-        (begin-edit-sequence #t #f)
-        (invalidate-blue-box-region)
-        (set! mouse-in-lock-icon? lk?)
-        (set! mouse-in-read-more? rm?)
-        (invalidate-blue-box-region)
-        (end-edit-sequence)))
-    
-    (define/private (invalidate-blue-box-region)
-      (define c (get-canvas))
-      (when c (send c refresh))
-      ;; the code below is what I'd like to do here,
-      ;; but this doesn't redraw the margin (the part
-      ;; of the editor-canvas that is always outside
-      ;; of th editor) and it doesn't seem possible to
-      ;; trigger a redraw of that part without also
-      ;; triggering a redraw of the entire editor
-      ;; so we just do that instead (above)
-
-      #;
-      (begin
-        (define-values (br bt _1 _2) (get-box-upper-right-and-lock-coordinates))
-        (when (and bt br)
-          (cond
-            [(get-show-docs?)
-             (define-values (box-width box-height label-overlap?)
-               (get-blue-box-size (get-dc) (get-style-list) the-strs))
-             (define x (- br box-width shadow-size))
-             (invalidate-bitmap-cache (max x 0)
-                                      (max bt 0)
-                                      (+ box-width shadow-size)
-                                      (+ box-height shadow-size))]
-            [the-strs
-             (define size (+ corner-radius shadow-size))
-             (invalidate-bitmap-cache (max 0 (- br size)) (max 0 bt) size size)]))))
-    
-    (define pref-changed-callback (λ (x y) (invalidate-blue-box-region)))
-    (preferences:add-callback
-     'drracket:syncheck:show-blueboxes?
-     pref-changed-callback
-     #t)
-
-    (define bx (box 0))
-    (define by (box 0))
-    (define bw (box 0))
-    (define bh (box 0))
-    
-    (define docs-im #f)
-    (define/public (syncheck:reset-docs-im)
-      (set! docs-im #f)) 
-    (define (get/start-docs-im) 
-      (cond 
-        [docs-im docs-im]
-        [else
-         (set! docs-im (make-interval-map))
-         docs-im]))
-    (define/public (syncheck:add-docs-range start end tag visit-docs-url) 
-      ;; the +1 to end is effectively assuming that there
-      ;; are no abutting identifiers with documentation
-      (define rng (list start (+ end 1) tag visit-docs-url))
-      (interval-map-set! (get/start-docs-im) start (+ end 1) rng))
-    
-    (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-      (super on-paint before? dc left top right bottom dx dy draw-caret)
-      (when (preferences:get 'drracket:syncheck:show-blueboxes?)
-        (define-values (br bt bmp-x bmp-y) (get-box-upper-right-and-lock-coordinates))
-        (when (and (not before?) br bt)
-          (define canvas (get-canvas))
-          (define hi (send canvas horizontal-inset))
-          (define vi (send canvas vertical-inset))
-          (cond
-            [(get-show-docs?)
-             (draw-open dc dx dy 
-                        (get-style-list)
-                        the-strs
-                        br bt bmp-x bmp-y
-                        mouse-in-blue-box?
-                        mouse-in-lock-icon?
-                        mouse-in-read-more?
-                        locked?
-                        
-                        left top right bottom)]
-            [the-strs
-             (draw-closed dc (+ dx br) (+ dy bt))]))))
-    
-    ;; get-box-upper-right-and-lock-coordinates 
-    ;;   : (or/c (-> (values #f #f #f #f)
-    ;;           (-> (values num num #f #f))
-    ;;           (-> (values num num num num)))
-    (define/private (get-box-upper-right-and-lock-coordinates)
-      (define admin (get-admin))
-      (define canvas (get-canvas))
-      (cond
-        [(and admin canvas)
-         (send admin get-view bx by bw bh)
-         (define hi (send canvas horizontal-inset))
-         (define vi (send canvas vertical-inset))
-         (define view-left (unbox bx))
-         (define view-top (unbox by))
-         (define br (+ view-left (unbox bw) hi))
-         (define bt (+ view-top (- vi)))
-         (cond
-           [the-strs
-            (define-values (box-width box-height label-overlap?)
-              (get-blue-box-size (get-dc) (get-style-list) the-strs))
-            (define bmp-bluebox-x (+ br (- blue-box-margin box-width)))
-            (define bmp-bluebox-y (+ bt (- box-height blue-box-margin lock-height)))
-            (define view-bottom (+ view-top (unbox bh)))
-            (define bmp-view-x (+ view-left blue-box-margin))
-            (define bmp-view-y (- view-bottom blue-box-margin lock-height))
-            (cond
-              [(and (bmp-bluebox-x . <= . bmp-view-x)
-                    (bmp-bluebox-y . >= . bmp-view-y))
-               (values br bt bmp-view-x bmp-view-y)]
-              [(bmp-bluebox-y . >= . bmp-view-y)
-               (values br bt bmp-bluebox-x bmp-view-y)]
-              [(bmp-bluebox-x . <= . bmp-view-x)
-               (values br bt bmp-view-x bmp-bluebox-y)]
-              [else
-               (values br bt bmp-bluebox-x bmp-bluebox-y)])]
-           [else
-            (values br bt #f #f)])]
-        [else (values #f #f #f #f)]))
-
-    (define/override (adjust-cursor evt)
-      (cond
-        [(in-blue-box? evt)
-         arrow-cursor]
-        [else
-         (super adjust-cursor evt)]))
-    
-    (define last-evt-seen #f)
-    (define/override (on-event evt)
-      (set! last-evt-seen evt)
-      (update-the-strs/maybe-invalidate void void)
-      (update-mouse-in-blue-box (in-blue-box? evt))
-      (define-values (is-in-lock? is-in-read-more?) (in-lock/in-read-more? last-evt-seen))
-      (update-mouse-in-lock-icon/read-more? is-in-lock? is-in-read-more?)
-      (cond
-        [mouse-in-blue-box?
-         (cond
-           [(and mouse-in-lock-icon?
-                 (send evt button-up? 'left))
-            (update-locked (not locked?))]
-           [(and mouse-in-read-more?
-                 (send evt button-up? 'left))
-            (visit-docs-url)])]
-        [else
-         (super on-event evt)]))
-    
-    (define timer (new logging-timer%
-                       [notify-callback
-                        (λ () 
-                          (set! timer-running? #f)
-                          (update-the-strs))]))
-    (define timer-running? #f)
-    (define/augment (after-set-position)
-      (inner (void) after-set-position)
-      (when (or locked?
-                mouse-in-blue-box?
-                (not the-strs))
-        (unless timer-running?
-          (set! timer-running? #t)
-          (send timer start 300 #t))))
-    
-    (define/public (syncheck:update-blue-boxes)
-      (update-the-strs))
-    
-    (define/private (update-the-strs)
-      (update-the-strs/maybe-invalidate
-       (λ ()
-         (begin-edit-sequence #t #f)
-         (invalidate-blue-box-region))
-       (λ ()
-         (when last-evt-seen
-           (update-mouse-in-blue-box (in-blue-box? last-evt-seen))
-           (define-values (is-in-lock? is-in-read-more?) (in-lock/in-read-more? last-evt-seen))
-           (update-mouse-in-lock-icon/read-more? is-in-lock? is-in-read-more?))
-         (invalidate-blue-box-region)
-         (end-edit-sequence))))
-    
-      ;; update-the-strs/maybe-invalidate : (-> void) (-> void) -> boolean
-      ;; returns #t if something changed (and thus invalidation should happen)
-      (define/private (update-the-strs/maybe-invalidate before after)
-        (define sp (get-start-position))
-        (when (= sp (get-end-position))
-          (define tag+rng (interval-map-ref (get/start-docs-im) sp #f))
-          (when tag+rng
-            (define ir-start (list-ref tag+rng 0))
-            (define ir-end (list-ref tag+rng 1))
-            (define tag (list-ref tag+rng 2))
-            (define new-visit-docs-url (list-ref tag+rng 3))
-            (define new-strs (fetch-blueboxes-strs tag #:blueboxes-cache blueboxes-cache))
-            (when new-strs
-              (before)
-              (set! the-strs new-strs)
-              (set! the-strs-id-start ir-start)
-              (set! the-strs-id-end ir-end)
-              (set! visit-docs-url new-visit-docs-url)
-              (after)))))
-    
-    (define/augment (on-insert where len)
-      (when docs-im
-        (clear-im-range where len)
-        (interval-map-expand! docs-im where (+ where len))
-        (possibly-clobber-strs where len #f)
-        (when the-strs-id-start
-          (when (<= where the-strs-id-start)
-            (set! the-strs-id-start (+ the-strs-id-start len))
-            (set! the-strs-id-end (+ the-strs-id-end len)))))
-      (inner (void) on-insert where len))
-    
-    (define/augment (on-delete where len)
-      (when docs-im
-        (clear-im-range where len)
-        (interval-map-contract! docs-im where (+ where len))
-        (possibly-clobber-strs where len #t)
-        (when the-strs-id-start
-          (when (<= where the-strs-id-start)
-            (set! the-strs-id-start (- the-strs-id-start len))
-            (set! the-strs-id-end (- the-strs-id-end len)))))
-      (inner (void) on-delete where len))
-    
-    (define/private (possibly-clobber-strs where len delete?)
-      (when (or (not the-strs-id-start)
-                (not the-strs-id-end)
-                (and (<= the-strs-id-start where)
-                     (< where the-strs-id-end))
-                (and delete? (<= the-strs-id-start (+ where len) the-strs-id-end)))
-        (when the-strs
-          (begin-edit-sequence #t #f)
-          (invalidate-blue-box-region)
-          (set! the-strs #f)
-          (set! the-strs-id-start #f)
-          (set! the-strs-id-end #f)
-          (invalidate-blue-box-region)
-          (end-edit-sequence))))
-
-    (define/private (clear-im-range where len)
-      (when docs-im
-        (for ([x (in-range len)])
-          (define tag+rng (interval-map-ref docs-im (+ where x) #f))
-          (when tag+rng
-            (interval-map-remove! 
-             docs-im 
-             (list-ref tag+rng 0)
-             (list-ref tag+rng 1))))))
-    
-    (define/private (in-blue-box? evt)
-      (cond
-        [(send evt leaving?) #f]
-        [else
-         (define dc-x (send evt get-x))
-         (define dc-y (send evt get-y))
-         (define-values (br bt bmp-x bmp-y) (get-box-upper-right-and-lock-coordinates))
-         (cond
-           [(and br bt the-strs)
-            (define-values (ex ey) (dc-location-to-editor-location dc-x dc-y))
-            (define-values (bw bh _) 
-              (if (get-show-docs?)
-                  (get-blue-box-size (get-dc) (get-style-list) the-strs)
-                  (values corner-radius corner-radius #f)))
-            (and (<= (- br bw) ex br)
-                 (<= bt ey (+ bt bh)))]
-           [else #f])]))
-    
-    (define/private (in-lock/in-read-more? evt)
-      (cond
-        [(send evt leaving?) (values #f #f)]
-        [(and (get-show-docs?) (get-dc))
-         (define dc-x (send evt get-x))
-         (define dc-y (send evt get-y))
-         (define-values (br bt bmp-x bmp-y) (get-box-upper-right-and-lock-coordinates))
-    
-         (define-values (read-more-w read-more-h read-more-d read-more-a)
-           (send (get-dc) get-text-extent sc-read-more... 
-                 (get-read-more-underline-font (get-style-list))))
-         
-         (cond
-           [(and br bt bmp-x bmp-y)
-            (define-values (ex ey) (dc-location-to-editor-location dc-x dc-y))
-            (values (and (<= bmp-x ex (+ bmp-x lock-width))
-                         (<= bmp-y ey (+ bmp-y lock-height)))
-                    (and (<= (- br read-more-w read-more-gap) ex (- br read-more-gap))
-                         (<= (+ bmp-y lock-height (- read-more-h))
-                             ey
-                             (+ bmp-y lock-height))))]
-           [else (values #f #f)])]
-        [else (values #f #f)]))
-
-    (super-new)))
-
-(define blueboxes-cache (make-blueboxes-cache #f))
-
-(define arrow-cursor (make-object cursor% 'arrow))
-
-(define (make-arrow-path init-angle)
-  (struct turtle (x y θ))
-  
-  (define (move-then-turn p dist α)
-    (define x (turtle-x p))
-    (define y (turtle-y p))
-    (define θ (turtle-θ p))
-    (turtle (+ x (* dist (cos θ)))
-            (+ y (* dist (sin θ)))
-            (+ α θ)))
-  
-  (define arrow-tail-length 12)
-  (define arrow-tail-width 8)
-  (define arrow-head-side-len 24)
-  
-  ;; start at the center of the end of the arrow
-  (define p1 (turtle 0 0 init-angle))
-  (define p2 (move-then-turn p1 (/ arrow-tail-width 2) (/ pi 2)))
-  (define p3 (move-then-turn p2 arrow-tail-length (- (/ pi 2))))
-  (define p4 (move-then-turn p3 
-                             (- (/ arrow-head-side-len 2) (/ arrow-tail-width 2))
-                             (* pi 2/3)))
-  (define p5 (move-then-turn p4 arrow-head-side-len (* pi 2/3)))
-  (define p6 (move-then-turn p5 arrow-head-side-len (* pi 2/3)))
-  (define p7 (move-then-turn p6
-                             (- (/ arrow-head-side-len 2) (/ arrow-tail-width 2))
-                             (- (/ pi 2))))
-  (define p8 (move-then-turn p7 arrow-tail-length (/ pi 2)))
-  (define p9 (move-then-turn p8 (/ arrow-tail-width 2) 0))
-  
-  (define dc-path (new dc-path%))
-  (send dc-path move-to (turtle-x p1) (turtle-y p1))
-  (for ([p (in-list (list p2 p3 p4 p5 p6 p7 p8 p9))])
-    (send dc-path line-to (turtle-x p) (turtle-y p)))
-  (send dc-path close)
-  dc-path)
-
-(define open-arrow-path (make-arrow-path (* pi 1/4)))
-(define lock-closed (lock-icon #f))
-(define lock-open (lock-icon #t))
-(define lock-width (max (send lock-closed get-width)
-                        (send lock-open get-width)))
-(define lock-height (max (send lock-closed get-height)
-                         (send lock-open get-height)))
-
-(define (draw-closed dc x y)
-  (define smoothing (send dc get-smoothing))
-  (define pen (send dc get-pen))
-  (define brush (send dc get-brush))
-  
-  (send dc set-pen "black" 1 'transparent)
-  (send dc set-smoothing 'aligned)
-  
-  (define-values (ox oy) (send dc get-origin))
-  (send dc set-origin 
-        (+ ox x (- corner-radius) (- shadow-size)) 
-        (+ oy y (- corner-radius) (- shadow-size)))
-  (send dc set-brush closed-radial-gradient-brush)
-  (send dc draw-arc 
-        0 0
-        (* (+ corner-radius shadow-size) 2) 
-        (* (+ corner-radius shadow-size) 2)
-        pi (* pi #e1.5))
-  (send dc set-origin ox oy)
-
-  (send dc set-brush blue-box-color 'solid)
-  (send dc draw-arc 
-        (- x corner-radius 1) (- y corner-radius 1)
-        (+ (* corner-radius 2) 2) (+ (* corner-radius 2) 2)
-        pi (* pi #e1.5))
- 
-  (send dc set-brush "white" 'solid)
-  (send dc draw-path open-arrow-path (- x 6) (+ y 6))
-    
-  (send dc set-smoothing smoothing)
-  (send dc set-brush brush)
-  (send dc set-pen pen))
-
-(define fade-out-color (make-object color% 255 255 255 .8))
-
-(define (draw-open dc dx dy 
-                   sl strs 
-                   br bt bmp-x bmp-y
-                   show-lock? mouse-in-lock-icon? mouse-in-read-more? locked?
-                   left top right bottom)
-  
-  (define-values (box-width box-height label-overlap?)
-    (get-blue-box-size dc sl strs))
-  
-  (when (let* ([wd-left (- br box-width shadow-size)]
-               [wd-top bt]
-               [wd-right (+ wd-left box-width shadow-size)]
-               [wd-bottom (+ wd-top box-height shadow-size)])
-          ;; wd for "will draw"
-          (rectangles-intersect? wd-left wd-top wd-right wd-bottom
-                                 left top right bottom))
-    
-    (define dx+br (+ dx br))
-    (define dy+bt (+ dy bt))
-    (define pen (send dc get-pen))
-    (define brush (send dc get-brush))
-    (define smoothing (send dc get-smoothing))
-    (define text-foreground (send dc get-text-foreground))
-    (define font (send dc get-font))
-    
-    (define std (send sl find-named-style "Standard"))
-    (when std (send dc set-font (send std get-font)))
-    
-    (send dc set-smoothing 'aligned)
-    (send dc set-pen "black" 1 'transparent)
-    (let ([rect-x (+ dx (- br box-width))]
-          [rect-y (+ dy bt)])
-      (send dc set-brush (make-blue-box-gradient-pen rect-x rect-y box-width box-height))
-      (send dc draw-rectangle rect-x rect-y box-width box-height))
-    
-    (send dc set-font (if mouse-in-read-more?
-                          (get-read-more-underline-font sl)
-                          (get-read-more-font sl)))
-    (define-values (read-more-w read-more-h read-more-d read-more-a)
-      (send dc get-text-extent sc-read-more... (get-read-more-underline-font sl)))
-    (send dc draw-text 
-          sc-read-more...
-          (+ dx (- br read-more-w read-more-gap))
-          (+ dy (- (+ bmp-y lock-height) read-more-h)))
-    
-    (when show-lock?
-      (define icon (if locked? lock-closed lock-open))
-      (send dc draw-bitmap icon (+ dx bmp-x) (+ dy bmp-y))
-      (when mouse-in-lock-icon?
-        (send dc set-font normal-control-font)
-        (send dc set-text-foreground "black")
-        (define-values (tw th _1 _2) (send dc get-text-extent sc-f2-to-lock))
-        (send dc set-brush fade-out-color 'solid)
-        (define txt-x (- dx+br box-width))
-        (define txt-y (+ dy+bt box-height))
-        (send dc draw-rectangle 
-              txt-x txt-y
-              (+ tw 8)
-              (+ th 4))
-        (send dc draw-text sc-f2-to-lock 
-              (+ txt-x 4)
-              (+ txt-y 2))))
-    
-    (when std (send dc set-font (send std get-font)))
-    (define label-font (get-label-font sl))
-    (define-values (label-w label-h label-d label-a)
-      (send dc get-text-extent (list-ref strs 0) label-font))
-    (define-values (first-line-w first-line-h _1 _2)
-      (send dc get-text-extent (if (null? (cdr strs)) "" (list-ref strs 1))))
-    
-    (send dc set-text-foreground var-color)
-    (for/fold ([y (if label-overlap? 
-                      (+ blue-box-margin (extra-first-line-space dc sl strs))
-                      (+ blue-box-margin label-h))])
-      ([str (in-list (cdr strs))])
-      (define-values (w h d a) (send dc get-text-extent str))
-      (send dc draw-text str (+ (- dx+br  box-width) blue-box-margin) (+ dy+bt y))
-      (+ y h))
-    
-    (draw-blue-box-shadow dc (- dx+br box-width) dy+bt box-width box-height)
-    
-    (send dc set-text-foreground blue-box-label-text-color)
-    (send dc set-font label-font)
-    (send dc draw-text (list-ref strs 0) 
-          (- dx+br blue-box-margin label-w)
-          (+ dy+bt blue-box-margin))
-    
-    (send dc set-text-foreground text-foreground)
-    (send dc set-smoothing smoothing)
-    (send dc set-brush brush)
-    (send dc set-pen pen)
-    (send dc set-font font)))
-
-;; EFFECT: updates the pen & brush of the given dc (but restores origin)
-(define (draw-blue-box-shadow dc box-x box-y box-width box-height)
-  
-  (define-values (ox oy) (send dc get-origin))
-  (send dc set-pen "black" 1 'transparent)
-  (send dc set-brush horizontal-gradient-brush)
-  (send dc set-origin 
-        (+ ox (- box-x shadow-size))
-        (+ oy box-y))
-  (send dc draw-rectangle 0 0 shadow-size box-height)
-  
-  (send dc set-brush vertical-gradient-brush)
-  (send dc set-origin
-        (+ ox box-x)
-        (+ oy (+ box-y box-height)))
-  (send dc draw-rectangle 0 0 box-width shadow-size)
-  
-  (send dc set-brush radial-gradient-brush)
-  (send dc set-origin 
-        (+ ox (- box-x shadow-size))
-        (+ oy (- (+ box-y box-height) shadow-size)))
-  (send dc draw-arc
-        0 0
-        (* 2 shadow-size)
-        (* 2 shadow-size)
-        pi
-        (* pi 3/2))
-  (send dc set-origin ox oy))
-
-(define shadow-start-color (make-object color% 0 0 0 .5))
-(define shadow-end-color (make-object color% 0 0 0 0))
-(define shadow-size 10)
-
-(define horizontal-gradient-brush
-  (new brush%
-       [gradient
-        (new linear-gradient%
-             [x0 0] [y0 0]
-             [x1 shadow-size] [y1 0]
-             [stops (list (list 0 shadow-end-color)
-                          (list 1 shadow-start-color))])]))
-(define vertical-gradient-brush
-  (new brush%
-       [gradient
-        (new linear-gradient%
-             [x0 0] [y0 0]
-             [x1 0] [y1 shadow-size]
-             [stops (list (list 0 shadow-start-color)
-                          (list 1 shadow-end-color))])]))
-(define radial-gradient-brush
-  (new brush%
-       [gradient
-        (new radial-gradient%
-             [x0 shadow-size] [y0 shadow-size] [r0 0]
-             [x1 shadow-size] [y1 shadow-size] [r1 shadow-size]
-             [stops (list (list 0 shadow-start-color)
-                          (list 1 shadow-end-color))])]))
-
-(define closed-radial-gradient-brush
-  (new brush%
-       [gradient
-        (new radial-gradient%
-             [x0 (+ corner-radius shadow-size)] 
-             [y0 (+ corner-radius shadow-size)]
-             [r0 corner-radius]
-             [x1 (+ corner-radius shadow-size)]
-             [y1 (+ corner-radius shadow-size)]
-             [r1 (+ shadow-size corner-radius)]
-             [stops (list (list 0 (make-object color% 0 0 0 0))
-                          (list 0 shadow-start-color)
-                          (list 1 shadow-end-color))])]))
-
-(define (get-blue-box-size dc sl strs)
-  (define std-font
-    (and (send sl find-named-style "Standard")
-         (send (send sl find-named-style "Standard") get-font)))
-  (define-values (main-w main-h)
-    (for/fold ([tot-w (+ blue-box-margin blue-box-margin)]
-               [tot-h (+ blue-box-margin blue-box-margin)])
-              ([str (in-list (cdr strs))])
-      (define-values (w h d a) (send dc get-text-extent str std-font))
-      (values (max tot-w (+ w blue-box-margin blue-box-margin))
-              (+ tot-h h))))
-  (define-values (label-w label-h _2 _3) 
-    (send dc get-text-extent (list-ref strs 0) (get-label-font sl)))
-  (define-values (first-line-w first-line-h _5 _6)
-    (send dc get-text-extent 
-          (if (null? (cdr strs)) "" (list-ref strs 1))
-          std-font))
-  (define-values (read-more-w read-more-h _7 _8)
-    (send dc get-text-extent
-          sc-read-more...
-          (get-read-more-underline-font sl)))
-  (cond
-    [(<= (+ label-w first-line-w 10) main-w)
-     ;; in this case, there is no overlap on the first line, so
-     ;; we draw both on the first line (like they are drawn in the html)
-     (values main-w 
-             (+ main-h 
-                (extra-first-line-space dc sl strs)
-                read-more-h
-                read-more-gap)
-             #t)]
-    [else
-     ;; otherwise we make an extra line at the top for the first line
-     (values (max main-w 
-                  (+ label-w blue-box-margin blue-box-margin)
-                  (+ read-more-w blue-box-margin blue-box-margin))
-             (+ main-h label-h read-more-h read-more-gap)
-             #f)]))
-
-(define read-more-gap 4)
-
-;; returns the extra gap to leave above the first line of the contract
-;; so that the baseline of the label and the baseline of that first line
-;; are at the same place (useful in the case where the label overlaps
-;; with the first line of the contract)
-(define (extra-first-line-space dc sl strs)
-  (define-values (_1 label-h label-d _2) 
-    (send dc get-text-extent (list-ref strs 0) (get-label-font sl)))
-  (define-values (_3 first-line-h first-line-d _4)
-    (send dc get-text-extent (if (null? (cdr strs)) "" (list-ref strs 1))))
-  (max 0 (- (- label-h label-d)
-            (- first-line-h first-line-d))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/gui.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/gui.rkt
deleted file mode 100644
index b895b2970e..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/gui.rkt
+++ /dev/null
@@ -1,2562 +0,0 @@
-#lang racket/base
-#|
-
-Check Syntax separates two classes of identifiers,
-those bound in this file and those bound by require,
-and uses identifier-binding and identifier-transformer-binding
-to distinguish them. 
-
-Variables come from 'origin, 'disappeared-use, and 'disappeared-binding 
-syntax properties, as well as from variable references and binding (letrec-values,
-let-values, define-values) in the fully expanded text.
-
-Variables inside #%top (not inside a module) are treated specially. 
-If the namespace has a binding for them, they are colored bound color.
-If the namespace does not, they are colored the unbound color.
-
-|#
-
-(module+ test (require rackunit))
-
-(require string-constants
-         racket/unit
-         racket/match
-         racket/contract
-         racket/class
-         racket/dict
-         racket/set
-         racket/runtime-path
-         racket/place
-         data/interval-map
-         drracket/tool
-         syntax/toplevel
-         mrlib/switchable-button
-         (prefix-in drracket:arrow: drracket/arrow)
-         (prefix-in fw: framework/framework)
-         mred
-         framework
-         net/url
-         browser/external
-         (for-syntax racket/base)
-         (only-in ffi/unsafe register-finalizer)
-         "../../syncheck-drracket-button.rkt"
-         "../../private/eval-helpers-and-pref-init.rkt"
-         "intf.rkt"
-         "local-member-names.rkt"
-         "../tooltip.rkt"
-         "blueboxes-gui.rkt"
-         drracket/private/syncheck/syncheck-intf
-         drracket/private/syncheck/colors
-         drracket/private/syncheck/traversals
-         drracket/private/syncheck/annotate
-         framework/private/logging-timer)
-(provide tool@)
-
-(define orig-output-port (current-output-port))
-(define (oprintf . args) (apply fprintf orig-output-port args))
-
-(define status-init (string-constant cs-status-init))
-(define status-coloring-program (string-constant cs-status-coloring-program))
-(define status-eval-compile-time (string-constant cs-status-eval-compile-time))
-(define status-expanding-expression (string-constant cs-status-expanding-expression))
-
-(define jump-to-next-bound-occurrence (string-constant cs-jump-to-next-bound-occurrence))
-(define jump-to-binding (string-constant cs-jump-to-binding))
-(define jump-to-definition (string-constant cs-jump-to-definition))
-
-(define cs-check-syntax-mode (string-constant cs-check-syntax-mode))
-(define cs-mode-menu-show-my-obligations (string-constant cs-mode-menu-show-my-obligations))
-(define cs-mode-menu-show-client-obligations (string-constant cs-mode-menu-show-client-obligations))
-(define cs-mode-menu-show-syntax (string-constant cs-mode-menu-show-syntax))
-
-(define cs-syncheck-running "Check Syntax Running")
-
-;; This delay should be long enough that the arrows won't be drawn if drawing
-;; the editor hitches while scrolling:
-(define syncheck-scroll-arrow-cooldown 500)
-
-;; This delay should be longer than the time it takes for a quick mouse motion
-;; to pass vertically through an identifier
-;; It should also be longer than the polling delay for mouse events (which should
-;; be < 50ms)
-(define syncheck-arrow-delay 100)
-
-(let ([number-between-zero-and-one?
-       (λ (x) (and (number? x) (<= 0 x 1)))])
-  (preferences:set-default 
-   'drracket:check-syntax-error-report-window-percentage 
-   1/10
-   number-between-zero-and-one?))
-(preferences:set-default 'drracket:syncheck:show-arrows? #t boolean?)
-
-(define (syncheck-add-to-online-expansion-prefs-panel vp)
-  (preferences:add-check vp
-                         'drracket:syncheck:show-arrows?
-                         (string-constant show-arrows-on-mouseover))
-  (preferences:add-check vp
-                         'drracket:syncheck:show-blueboxes?
-                         (string-constant show-blueboxes)))
-
-(define (syncheck-add-to-preferences-panel parent)
-  (color-prefs:build-color-selection-panel parent
-                                           lexically-bound-variable-style-pref
-                                           lexically-bound-variable-style-name
-                                           (string-constant cs-lexical-variable))
-  (color-prefs:build-color-selection-panel parent
-                                           imported-variable-style-pref
-                                           imported-variable-style-name
-                                           (string-constant cs-imported-variable))
-  (color-prefs:build-color-selection-panel parent
-                                           set!d-variable-style-pref
-                                           set!d-variable-style-name
-                                           (string-constant cs-set!d-variable))
-  (color-prefs:build-color-selection-panel parent
-                                           unused-require-style-pref
-                                           unused-require-style-name
-                                           (string-constant cs-unused-require))
-  (color-prefs:build-color-selection-panel parent
-                                           free-variable-style-pref
-                                           free-variable-style-name
-                                           (string-constant cs-free-variable))
-  
-  (color-prefs:build-color-selection-panel parent
-                                           my-obligation-style-pref
-                                           my-obligation-style-name
-                                           cs-my-obligation-color)
-  (color-prefs:build-color-selection-panel parent
-                                           their-obligation-style-pref
-                                           their-obligation-style-name
-                                           cs-their-obligation-color)
-  (color-prefs:build-color-selection-panel parent
-                                           unk-obligation-style-pref
-                                           unk-obligation-style-name
-                                           cs-unk-obligation-color)
-  (color-prefs:build-color-selection-panel parent
-                                           both-obligation-style-pref
-                                           both-obligation-style-name
-                                           cs-both-obligation-color))
-
-(color-prefs:add-color-scheme-entry lexically-bound-variable-style-pref
-                                    #:style lexically-bound-variable-style-name
-                                    (make-object color% 81 112 203)
-                                    (make-object color% 50 163 255))
-(color-prefs:add-color-scheme-entry set!d-variable-style-pref
-                                    #:style set!d-variable-style-name
-                                    (send the-color-database find-color "firebrick")
-                                    (send the-color-database find-color "pink"))
-(color-prefs:add-color-scheme-entry unused-require-style-pref
-                                    #:style unused-require-style-name
-                                    (send the-color-database find-color "red")
-                                    (send the-color-database find-color "pink"))
-(color-prefs:add-color-scheme-entry free-variable-style-pref
-                                    #:style free-variable-style-name
-                                    (send the-color-database find-color "red")
-                                    (send the-color-database find-color "pink"))
-
-(color-prefs:add-color-scheme-entry imported-variable-style-pref
-                                    #:style imported-variable-style-name
-                                    (make-object color% 68 0 203)
-                                    (make-object color% 166 0 255))
-(color-prefs:add-color-scheme-entry my-obligation-style-pref
-                                    #:style my-obligation-style-name
-                                    (send the-color-database find-color "firebrick")
-                                    (send the-color-database find-color "pink"))
-(color-prefs:add-color-scheme-entry their-obligation-style-pref
-                                    #:style their-obligation-style-name
-                                    (make-object color% 0 116 0)
-                                    (send the-color-database find-color "limegreen"))
-(color-prefs:add-color-scheme-entry unk-obligation-style-pref
-                                    #:style unk-obligation-style-name
-                                    (send the-color-database find-color "black")
-                                    (send the-color-database find-color "white"))
-(color-prefs:add-color-scheme-entry both-obligation-style-pref
-                                    #:style both-obligation-style-name
-                                    (make-object color% 139 142 28)
-                                    (send the-color-database find-color "khaki"))
-(color-prefs:add-color-scheme-entry 'drracket:syncheck:matching-identifiers 
-                                    "GreenYellow"
-                                    "DarkGreen")
-
-(define tool@ 
-  (unit 
-    (import drracket:tool^)
-    (export drracket:tool-exports^)
-    
-    (define (phase1) 
-      (drracket:module-language-tools:add-opt-out-toolbar-button
-       (λ (frame parent)
-         (new switchable-button%
-              (label (string-constant check-syntax))
-              (bitmap syncheck-bitmap)
-              (alternate-bitmap syncheck-small-bitmap)
-              (parent parent)
-              (callback (λ (button) (send frame syncheck:button-callback)))))
-       'drracket:syncheck
-       #:number 50)
-      (drracket:unit:add-to-program-editor-mixin clearing-text-mixin))
-    (define (phase2) (void))
-    
-     ;;;  ;;; ;;; ;;;;; 
-    ;   ;  ;   ;    ;   
-    ;   ;  ;   ;    ;   
-    ;      ;   ;    ;   
-    ;  ;;  ;   ;    ;   
-    ;   ;  ;   ;    ;   
-    ;   ;  ;; ;;    ;   
-     ;;;    ;;;   ;;;;; 
-    
-    
-    ;; used for quicker debugging of the preference panel
-    '(define test-preference-panel
-       (λ (name f)
-         (let ([frame (make-object frame% name)])
-           (f frame)
-           (send frame show #t))))
-    
-    (define-struct graphic (pos* locs->thunks draw-fn click-fn))
-    
-    (define-struct arrow () #:mutable #:transparent)
-    (define-struct (var-arrow arrow)
-      (start-text start-pos-left start-pos-right
-                  end-text end-pos-left end-pos-right
-                  actual? level require-arrow? name-dup?)
-      ;; level is one of 'lexical, 'top-level, 'import
-      #:transparent)
-    (define-struct (tail-arrow arrow) (from-text from-pos to-text to-pos) #:transparent)
-    
-    (define-struct tooltip-info (text pos-left pos-right msg) #:transparent)
-    
-    ;; set : (uf-set (list/c source position span))
-    ;; name-dup? : symbol? -> boolean?
-    (define-struct identifier-location-set (set name-dup?) #:transparent)
-        
-    ;; color : string
-    ;; text: text:basic<%>
-    ;; start, fin: number
-    ;; used to represent regions to highlight when passing the mouse over the syncheck window
-    (define-struct colored-region (color text start fin) #:transparent)
-    
-    ;; id : symbol  --  the nominal-source-id from identifier-binding
-    ;; filename : path
-    (define-struct def-link (id filename submods) #:transparent)
-    
-    (define (get-tacked-var-brush white-on-black?)
-      (if white-on-black?
-          (send the-brush-list find-or-create-brush "LightSteelBlue" 'solid)
-          (send the-brush-list find-or-create-brush "BLUE" 'solid)))
-    (define (get-var-pen white-on-black?)
-      (if white-on-black?
-          (send the-pen-list find-or-create-pen "LightSteelBlue" 1 'solid)
-          (send the-pen-list find-or-create-pen "BLUE" 1 'solid)))
-    
-    (define templ-color (send the-color-database find-color "purple"))
-    (define (get-templ-pen white-on-black?)
-      (if white-on-black?
-          (send the-pen-list find-or-create-pen "orchid" 1 'solid)
-          (send the-pen-list find-or-create-pen templ-color 1 'solid)))
-    (define (get-tacked-templ-brush white-on-black?) 
-      (if white-on-black?
-          (send the-brush-list find-or-create-brush "orchid" 'solid)
-          (send the-brush-list find-or-create-brush templ-color 'solid)))
-    
-    (define (get-tail-pen white-on-black?) 
-      (send the-pen-list find-or-create-pen "orchid" 1 'solid))
-    (define (get-tacked-tail-brush white-on-black?)
-      (send the-brush-list find-or-create-brush "orchid" 'solid))
-    (define (get-untacked-brush white-on-black?)
-      (send the-brush-list find-or-create-brush 
-            (if white-on-black? "black" "white")
-            'solid))
-        
-    (define-local-member-name
-      reset-previous-check-syntax-information
-      get-next-trace-refresh?
-      set-next-trace-refresh
-      set-replay-state
-      get-replay-state)
-    
-    ;; clearing-text-mixin : (mixin text%)
-    ;; overrides methods that make sure the arrows go away appropriately.
-    ;; adds a begin/end-edit-sequence to the insertion and deletion
-    ;;  to ensure that the on-change method isn't called until after
-    ;;  the arrows are cleared.
-    (define (clearing-text-mixin super%)
-      (define-local-member-name set-do-cleanup)
-      
-      (define cs-clearing<%>
-        (interface ()
-          set-do-cleanup))
-      
-      ;; the commented out definition of extra
-      ;; is because of PR 11279. When it is fixed, use it
-      ;; instead of this one.
-      (define (extra super%)
-        (class super%
-          (inherit set-do-cleanup)
-          (define/augment (begin-metadata-changes)
-            (set-do-cleanup #f)
-            (inner (void) begin-metadata-changes))
-          (define/augment (end-metadata-changes)
-            (set-do-cleanup #t)
-            (inner (void) end-metadata-changes))
-          (super-new)))
-      
-      #|
-      (define extra
-        (mixin (cs-clearing<%> drracket:unit:definitions-text<%>) ()
-          (inherit set-do-cleanup)
-          (define/augment (begin-metadata-changes)
-            (set-do-cleanup #f)
-            (inner (void) begin-metadata-changes))
-          (define/augment (end-metadata-changes)
-            (set-do-cleanup #t)
-            (inner (void) end-metadata-changes))
-          (super-new)))
-      |#
-
-      (define basic
-        (mixin ((class->interface text%)) (cs-clearing<%>)
-          (inherit begin-edit-sequence end-edit-sequence)
-          (define/augment (on-delete start len)
-            (begin-edit-sequence #t #f)
-            (inner (void) on-delete start len))
-          (define/augment (after-delete start len)
-            (inner (void) after-delete start len)
-            (clean-up)
-            (end-edit-sequence))
-          
-          (define/augment (on-insert start len)
-            (begin-edit-sequence #t #f)
-            (inner (void) on-insert start len))
-          (define/augment (after-insert start len)
-            (inner (void) after-insert start len)
-            (clean-up)
-            (end-edit-sequence))
-          
-          (define do-cleanup #t)
-          (define/public (set-do-cleanup s)
-            (set! do-cleanup s))
-          
-          (define/private (clean-up)
-            (when do-cleanup
-              (let ([st (find-syncheck-text this)])
-                (when (and st
-                           (is-a? st drracket:unit:definitions-text<%>))
-                  (let ([tab (send st get-tab)])
-                    (send (send tab get-frame) set-syncheck-running-mode #f)
-                    (send tab syncheck:clear-error-message)
-                    (send tab syncheck:clear-highlighting))))))
-          
-          (super-new)))
-      
-      (cond
-        [(implementation? super% drracket:unit:definitions-text<%>)
-         (extra (basic super%))]
-        [else
-         (basic super%)]))
-                          
-    (struct tooltip-spec (strings x y w h) #:transparent)
-            
-    (define make-syncheck-text%
-      (λ (super%)
-        (let* ([cursor-arrow (make-object cursor% 'arrow)])
-          (class* (docs-text-mixin super%) (syncheck-text<%>)
-            (inherit set-cursor get-admin invalidate-bitmap-cache set-position
-                     get-pos/text-dc-location position-location
-                     get-canvas last-position dc-location-to-editor-location
-                     find-position begin-edit-sequence end-edit-sequence
-                     highlight-range unhighlight-range
-                     paragraph-end-position first-line-currently-drawn-specially?
-                     line-end-position position-line
-                     syncheck:add-docs-range get-padding)
-            
-            ;; arrow-records : (U #f hash[text% => arrow-record])
-            ;; arrow-record = interval-map[(listof arrow-entry)]
-            ;; arrow-entry is one of
-            ;;   - (cons (U #f sym) (menu -> void))
-            ;;   - def-link
-            ;;   - tail-link
-            ;;   - arrow
-            ;;   - string
-            ;;   - colored-region
-            (define/private (get-arrow-record text)
-              (unless (object? text)
-                (error 'get-arrow-record "expected a text as the second argument, got ~e" text))
-              (hash-ref! arrow-records text (lambda () (make-interval-map))))
-
-            (define arrow-records #f)
-            
-            (define/private (fetch-arrow-records txt pos)
-              (and arrow-records
-                   (let ([im (hash-ref arrow-records txt #f)]) 
-                     (if im
-                         (interval-map-ref im pos '())
-                         '()))))
-            
-            (define/public (dump-arrow-records)
-              (cond
-                [arrow-records
-                 (for ([(k v) (in-hash arrow-records)])
-                   (printf "\n\n~s:\n" k)
-                   (let loop ([it (interval-map-iterate-first v)])
-                     (when it
-                       (printf "~s =>\n" (interval-map-iterate-key v it))
-                       (for ([v (in-list (interval-map-iterate-value v it))])
-                         (printf "  ~s\n" v))
-                       (printf "\n")
-                       (loop (interval-map-iterate-next v it)))))]
-                [else
-                 (printf "arrow-records empty\n")]))
-            
-            ;; cleanup-texts : (or/c #f (listof text))
-            (define cleanup-texts #f)
-            
-            ;; definition-targets : hash-table[(list symbol[id-name] (listof symbol[submodname])) 
-            ;;                                 -o> (list text number number)]
-            (define definition-targets (make-hash))
-            
-            
-            ;; bindings-table : hash-table[(list text number number)
-            ;;                             -o> (setof (list text number number))]
-            ;; this is a private field
-            (define bindings-table (make-hash))
-            
-            ;; add-to-bindings-table : text number number text number number -> boolean
-            ;; results indicates if the binding was added to the table. It is added, unless
-            ;;  1) it is already there, or
-            ;;  2) it is a link to itself
-            (define/private (add-to-bindings-table start-text start-left start-right
-                                                   end-text end-left end-right)
-              (cond
-                [(and (object=? start-text end-text)
-                      (= start-left end-left)
-                      (= start-right end-right))
-                 #f]
-                [else
-                 (define key (list start-text start-left start-right))
-                 (define priors (hash-ref bindings-table key (λ () (set))))
-                 (define new (list end-text end-left end-right))
-                 (cond
-                   [(set-member? priors new)
-                    #f]
-                   [else
-                    (hash-set! bindings-table key (set-add priors new))
-                    #t])]))
-            
-            ;; for use in the automatic test suite (both)
-            (define/public (syncheck:get-bindings-table [tooltips? #f])
-              (cond
-                [tooltips?
-                 (define unsorted
-                   (apply 
-                    append
-                    (for/list ([(k interval-map) (in-hash arrow-records)])
-                      (apply
-                       append
-                       (dict-map
-                        interval-map
-                        (λ (key x)
-                          (for/list ([x (in-list x)]
-                                     #:when (tooltip-info? x))
-                            (list (tooltip-info-pos-left x)
-                                  (tooltip-info-pos-right x)
-                                  (tooltip-info-msg x)))))))))
-                 (define (compare l1 l2)
-                   (cond
-                     [(equal? (list-ref l1 0) (list-ref l2 0))
-                      (cond
-                        [(equal? (list-ref l1 2) (list-ref l2 2))
-                         (string<=? (list-ref l1 2) (list-ref l2 2))]
-                        [else
-                         (< (list-ref l1 1) (list-ref l2 1))])]
-                     [else
-                      (< (list-ref l1 0) (list-ref l2 0))]))
-                 (sort unsorted compare)]
-                [else
-                 bindings-table]))
-            
-            ;; compare-bindings : (list text number number) (list text number number) -> boolean
-            ;; compares two bindings in the sets inside the bindings table, returning
-            ;; #t if l1 appears earlier in the file than l2 does.
-            (define/private (syncheck:compare-bindings l1 l2)
-              
-              ;; find-dc-location : text number -> (values number number)
-              (define (find-dc-location text pos)
-                (send text position-location pos xlb xrb)
-                (send text editor-location-to-dc-location (unbox xlb) (unbox xrb)))
-              
-              (let ([start-text (list-ref l1 0)]
-                    [start-left (list-ref l1 1)]
-                    [end-text (list-ref l2 0)]
-                    [end-left (list-ref l2 1)])
-                (cond
-                  [(object=? start-text end-text)
-                   (< start-left end-left)]
-                  [else
-                   (let-values ([(sx sy) (find-dc-location start-text start-left)]
-                                [(ex ey) (find-dc-location end-text end-left)])
-                     (cond
-                       [(= sy ey) (< sx ex)]
-                       [else (< sy ey)]))])))
-            
-            (define tacked-hash-table (make-hasheq))
-            
-            ;; find-char-box : text number number -> (values number number number number)
-            ;; returns the bounding box (left, top, right, bottom) for the text range.
-            ;; only works right if the text is on a single line.
-            (define/private (find-char-box text left-pos right-pos)
-              (send text position-location left-pos xlb ylb #t)
-              (send text position-location right-pos xrb yrb #f)
-              (define-values (xl-off yl-off) 
-                (send text editor-location-to-dc-location (unbox xlb) (unbox ylb)))
-              (define-values (xl yl)
-                (dc-location-to-editor-location xl-off yl-off))
-              (define-values (xr-off yr-off)
-                (send text editor-location-to-dc-location (unbox xrb) (unbox yrb)))
-              (define-values (xr yr) (dc-location-to-editor-location xr-off yr-off))
-              (values 
-               xl
-               yl
-               xr 
-               yr))
-            
-            (define/private (get-arrow-poss arrow)
-              (cond
-                [(var-arrow? arrow) (get-var-arrow-poss arrow)]
-                [(tail-arrow? arrow) (get-tail-arrow-poss arrow)]))
-            
-            (define/private (get-var-arrow-poss arrow)
-              (let-values ([(start-x start-y) (find-poss 
-                                               (var-arrow-start-text arrow)
-                                               (var-arrow-start-pos-left arrow)
-                                               (var-arrow-start-pos-right arrow))]
-                           [(end-x end-y) (find-poss 
-                                           (var-arrow-end-text arrow)
-                                           (var-arrow-end-pos-left arrow)
-                                           (var-arrow-end-pos-right arrow))])
-                (values start-x start-y end-x end-y)))
-            
-            (define/private (get-tail-arrow-poss arrow)
-              ;; If the item is an embedded editor snip, redirect
-              ;; the arrow to point at the left edge rather than the
-              ;; midpoint.
-              (define (find-poss/embedded text pos)
-                (let* ([snip (send text find-snip pos 'after)])
-                  (cond
-                    [(and snip 
-                          (is-a? snip editor-snip%)
-                          (= pos (send text get-snip-position snip)))
-                     (find-poss text pos pos)]
-                    [else
-                     (find-poss text pos (+ pos 1))])))
-              (let-values ([(start-x start-y) (find-poss/embedded 
-                                               (tail-arrow-from-text arrow)
-                                               (tail-arrow-from-pos arrow))]
-                           [(end-x end-y) (find-poss/embedded
-                                           (tail-arrow-to-text arrow)
-                                           (tail-arrow-to-pos arrow))])
-                (values start-x start-y end-x end-y)))
-
-            (define xlb (box 0))
-            (define ylb (box 0))
-            (define xrb (box 0))
-            (define yrb (box 0))
-
-            (define/private (find-poss text left-pos right-pos)
-              (send text position-location left-pos xlb ylb #t)
-              (send text position-location right-pos xrb yrb #f)
-              (let*-values ([(xl-off yl-off) (send text editor-location-to-dc-location 
-                                                   (unbox xlb) (unbox ylb))]
-                            [(xl yl) (dc-location-to-editor-location xl-off yl-off)]
-                            [(xr-off yr-off) (send text editor-location-to-dc-location 
-                                                   (unbox xrb) (unbox yrb))]
-                            [(xr yr) (dc-location-to-editor-location xr-off yr-off)])
-                (values (/ (+ xl xr) 2)
-                        (/ (+ yl yr) 2))))
-            
-            ;; syncheck:init-arrows : -> void
-            (define/public (syncheck:init-arrows)
-              (set! tacked-hash-table (make-hasheq))
-              (set! arrow-records (make-hasheq))
-              (set! bindings-table (make-hash))
-              (set! cleanup-texts '())
-              (set! definition-targets (make-hash)))
-            
-            (define/public (syncheck:arrows-visible?)
-              (or arrow-records cursor-pos cursor-text cursor-eles cursor-tooltip))
-            
-            ;; syncheck:clear-arrows : -> void
-            (define/public (syncheck:clear-arrows)
-              (when (syncheck:arrows-visible?)
-                (set! tacked-hash-table #f)
-                (set! arrow-records #f)
-                (when (update-latent-arrows #f #f)
-                  (update-drawn-arrows))
-                (syncheck:clear-coloring)
-                (invalidate-bitmap-cache/padding)))
-            
-            (define/public (syncheck:clear-coloring)
-              (when cleanup-texts
-                (for-each (λ (text) (send text thaw-colorer))
-                          cleanup-texts))
-              (set! cleanup-texts #f))
-            
-            ;; syncheck:apply-style/remember : (is-a?/c text%) number number style% symbol -> void
-            (define/public (syncheck:apply-style/remember txt start finish style)
-              (add-to-cleanup/apply-style txt start finish style))
-            
-            (define/public (syncheck:color-range source start finish style-name)
-              (when (is-a? source text%)
-                (define (apply-style/remember ed start finish style)
-                  (let ([outermost (find-outermost-editor ed)])
-                    (and (is-a? outermost syncheck-text<%>)
-                         (send outermost syncheck:apply-style/remember ed start finish style))))
-                
-                (define (find-outermost-editor ed)
-                  (let loop ([ed ed])
-                    (let ([admin (send ed get-admin)])
-                      (if (is-a? admin editor-snip-editor-admin<%>)
-                          (let* ([enclosing-snip (send admin get-snip)]
-                                 [enclosing-snip-admin (send enclosing-snip get-admin)])
-                            (loop (send enclosing-snip-admin get-editor)))
-                          ed))))
-                
-                (let ([style (send (send source get-style-list)
-                                   find-named-style
-                                   style-name)])
-                  (apply-style/remember source start finish style))))
-
-            ;; add-to-cleanup/apply-style : (is-a?/c text%) number number style% symbol -> boolean
-            (define/private (add-to-cleanup/apply-style txt start finish style)
-              (cond
-                [cleanup-texts
-                 (unless (memq txt cleanup-texts)
-                   (send txt freeze-colorer)
-                   (set! cleanup-texts (cons txt cleanup-texts)))
-                 (send txt change-style style start finish #f)
-                 #t]
-                [else #f]))
-            
-            (define/public (syncheck:add-require-open-menu text start-pos end-pos file)
-              (define ((make-require-open-menu file) menu)
-                (define-values (base name dir?) (split-path file))
-                (new menu-item%
-                     (label (fw:gui-utils:format-literal-label
-                             (string-constant cs-open-file) (path->string name)))
-                     (parent menu)
-                     (callback (λ (x y) (fw:handler:edit-file file))))
-                (void))
-              (syncheck:add-menu text start-pos end-pos #f (make-require-open-menu file)))
-            
-            (define/public (syncheck:add-docs-menu text start-pos end-pos id
-                                                   the-label
-                                                   path
-                                                   definition-tag
-                                                   tag)
-              (define (visit-docs-url)
-                (define url (path->url path))
-                (define url2 (if tag
-                                 (make-url (url-scheme url)
-                                           (url-user url)
-                                           (url-host url)
-                                           (url-port url)
-                                           (url-path-absolute? url)
-                                           (url-path url)
-                                           (url-query url)
-                                           tag)
-                                 url))
-                (send-url (url->string url2)))
-              (syncheck:add-docs-range start-pos end-pos definition-tag visit-docs-url)
-              (syncheck:add-menu 
-               text start-pos end-pos id
-               (λ (menu)
-                 (new menu-item% 
-                      [parent menu]
-                      [label (gui-utils:format-literal-label "~a" the-label)]
-                      [callback
-                       (λ (x y)
-                         (visit-docs-url))]))))
-            
-            (define/public (syncheck:add-definition-target source start-pos end-pos id mods)
-              (hash-set! definition-targets (list id mods) (list source start-pos end-pos)))
-            ;; syncheck:find-definition-target 
-            ;;  : sym (listof sym) -> (or/c (list/c text number number) #f)
-            (define/public (syncheck:find-definition-target id mods)
-              (hash-ref definition-targets (list id mods) #f))
-            
-            ;; no longer used, but must be here for backwards compatibility
-            (define/public (syncheck:add-rename-menu id to-be-renamed/poss name-dup?) (void))
-            (define/public (syncheck:add-id-set to-be-renamed/poss name-dup?) (void))
-
-            (define/public (syncheck:rename-identifier text)
-              (define canvas (send text get-canvas))
-              
-              (define-values (binding-identifiers make-identifiers-hash)
-                (position->matching-identifiers-hash text 
-                                                     (send text get-start-position) 
-                                                     (send text get-end-position)
-                                                     #t))
-              (unless (null? binding-identifiers)
-                (define name-to-offer (find-name-to-offer binding-identifiers))
-                (rename-menu-callback make-identifiers-hash
-                                      name-to-offer
-                                      binding-identifiers
-                                      (and canvas (send canvas get-top-level-window)))))
-            
-            
-            (define/public (syncheck:tack/untack-arrows text)
-              (when arrow-records
-                (define arrow-record (hash-ref arrow-records text #f))
-                (define (find-arrows pos)
-                  (define vec-ents (interval-map-ref arrow-record pos null))
-                  (define arrs (filter arrow? vec-ents))
-                  (and (not (null? arrs)) arrs))
-                (define arrows
-                  (or (find-arrows (send text get-start-position))
-                      (and (= (send text get-start-position) 
-                              (send text get-end-position))
-                           (find-arrows (- (send text get-start-position) 1)))))
-                (when arrows
-                  (tack/untack-callback arrows))))
-            
-            ;; callback for the rename popup menu item
-            (define/private (rename-menu-callback make-identifiers-hash name-to-offer
-                                                  binding-identifiers parent)
-              (define (name-dup? x) 
-                (for/or ([var-arrow (in-list binding-identifiers)])
-                  ((var-arrow-name-dup? var-arrow) x)))
-              (define new-str
-                (fw:keymap:call/text-keymap-initializer
-                 (λ ()
-                   (get-text-from-user
-                    (string-constant cs-rename-id)
-                    (fw:gui-utils:format-literal-label (string-constant cs-rename-var-to) 
-                                                       name-to-offer)
-                    parent
-                    name-to-offer
-                    #:dialog-mixin frame:focus-table-mixin))))
-              (when new-str
-                (define new-sym (format "~s" (string->symbol new-str)))
-                (define dup-name? (name-dup? new-sym))
-                
-                (define do-renaming?
-                  (or (not dup-name?)
-                      (equal?
-                       (message-box/custom
-                        (string-constant check-syntax)
-                        (fw:gui-utils:format-literal-label
-                         (string-constant cs-name-duplication-error) 
-                         new-sym)
-                        (string-constant cs-rename-anyway)
-                        (string-constant cancel)
-                        #f
-                        parent
-                        '(stop default=2)
-                        #:dialog-mixin frame:focus-table-mixin)
-                       1)))
-                
-                (when do-renaming?
-                  (define edit-sequence-txts (list this))
-                  (define per-txt-positions (make-hash))
-                  (for ([(k _) (in-hash (make-identifiers-hash))])
-                    (define-values (txt start-pos end-pos) (apply values k))
-                    (hash-set! per-txt-positions txt 
-                               (cons (cons start-pos end-pos)
-                                     (hash-ref per-txt-positions txt '()))))
-                  (for ([(source-txt start+ends) (in-hash per-txt-positions)])
-                    (when (is-a? source-txt text%)
-                      (define merged-positions (sort-and-merge start+ends))
-                      (begin-edit-sequence)
-                      (for ([start+end (in-list (reverse merged-positions))])
-                        (define start (car start+end))
-                        (define end (cdr start+end))
-                        (unless (memq source-txt edit-sequence-txts)
-                          (send source-txt begin-edit-sequence)
-                          (set! edit-sequence-txts (cons source-txt edit-sequence-txts)))
-                        (send source-txt delete start end #f)
-                        (send source-txt insert new-sym start start #f))))
-                  (for ([txt (in-list edit-sequence-txts)])
-                    (send txt end-edit-sequence)))))
-            
-            ;; find-name-to-offer : (non-empty-listof identifier?) -> string?
-            (define/private (find-name-to-offer binding-var-arrows)
-              (define longest-var-arrow
-                (car 
-                 (sort binding-var-arrows
-                       >
-                       #:key (λ (x) (- (var-arrow-start-pos-right x)
-                                       (var-arrow-start-pos-left x))))))
-              (send (var-arrow-start-text longest-var-arrow)
-                    get-text
-                    (var-arrow-start-pos-left longest-var-arrow)
-                    (var-arrow-start-pos-right longest-var-arrow)))
-              
-              
-            ;; find-parent : menu-item-container<%> -> (union #f (is-a?/c top-level-window<%>)
-            (define/private (find-menu-parent menu)
-              (let loop ([menu menu])
-                (cond
-                  [(is-a? menu menu-bar%) (send menu get-frame)]
-                  [(is-a? menu popup-menu%)
-                   (let ([target (send menu get-popup-target)])
-                     (cond
-                       [(is-a? target editor<%>) 
-                        (let ([canvas (send target get-canvas)])
-                          (and canvas
-                               (send canvas get-top-level-window)))]
-                       [(is-a? target window<%>) 
-                        (send target get-top-level-window)]
-                       [else #f]))]
-                  [(is-a? menu menu-item<%>) (loop (send menu get-parent))]
-                  [else #f])))
-            
-            (define/private (syncheck:add-menu text start-pos end-pos key make-menu)
-              (when arrow-records
-                (when (<= 0 start-pos end-pos (last-position))
-                  (add-to-range/key text start-pos end-pos make-menu key (and key #t)))))
-            
-            (define/public (syncheck:add-background-color text start fin raw-color)
-              (when arrow-records
-                (when (is-a? text text:basic<%>)
-                  ;; we adjust the colors over here based on the white-on-black
-                  ;; preference so we don't have to have the preference set up
-                  ;; in the other place when running check syntax in online mode.
-                  (define color 
-                    (if (preferences:get 'framework:white-on-black?)
-                        (cond
-                          [(equal? raw-color "palegreen") "darkgreen"]
-                          [else raw-color])
-                        raw-color))
-                  (add-to-range/key text start fin
-                                    (make-colored-region color text start fin)
-                                    #f #f))))
-            
-            ;; this method is no longer used; see docs for more
-            (define/public (syncheck:add-arrow start-text start-pos-left start-pos-right
-                                               end-text end-pos-left end-pos-right
-                                               actual? level)
-              (void))
-            
-            ;; syncheck:add-arrow : symbol text number number text number number boolean -> void
-            ;; pre: start-editor, end-editor are embedded in `this' (or are `this')
-            (define/public (syncheck:add-arrow/name-dup start-text start-pos-left start-pos-right
-                                                        end-text end-pos-left end-pos-right
-                                                        actual? level require-arrow? name-dup?)
-              (when (and arrow-records
-                         (preferences:get 'drracket:syncheck:show-arrows?))
-                (when (add-to-bindings-table
-                       start-text start-pos-left start-pos-right
-                       end-text end-pos-left end-pos-right)
-                  (let ([arrow (make-var-arrow start-text start-pos-left start-pos-right
-                                               end-text end-pos-left end-pos-right
-                                               actual? level require-arrow? name-dup?)])
-                    (add-to-range/key start-text start-pos-left start-pos-right arrow #f #f)
-                    (add-to-range/key end-text end-pos-left end-pos-right arrow #f #f)))))
-            
-            ;; syncheck:add-tail-arrow : text number text number -> void
-            (define/public (syncheck:add-tail-arrow from-text from-pos to-text to-pos)
-              (when (and arrow-records
-                         (preferences:get 'drracket:syncheck:show-arrows?))
-                (let ([tail-arrow (make-tail-arrow to-text to-pos from-text from-pos)])
-                  (add-to-range/key from-text from-pos (+ from-pos 1) tail-arrow #f #f)
-                  (add-to-range/key to-text to-pos (+ to-pos 1) tail-arrow #f #f))))
-            
-            ;; syncheck:add-jump-to-definition : text start end id filename -> void
-            (define/public (syncheck:add-jump-to-definition text start end id filename submods)
-              (when arrow-records
-                (add-to-range/key text start end (make-def-link id filename submods) #f #f)))
-            
-            ;; syncheck:add-mouse-over-status : text pos-left pos-right string -> void
-            (define/public (syncheck:add-mouse-over-status text pos-left pos-right str)
-              (when arrow-records
-                (add-to-range/key text pos-left pos-right 
-                                  (make-tooltip-info text pos-left pos-right str)
-                                  #f #f)))
-            
-            ;; add-to-range/key : text number number any any boolean -> void
-            ;; adds `key' to the range `start' - `end' in the editor
-            ;; If use-key? is #t, it adds `to-add' with the key, and does not
-            ;; replace a value with that key already there.
-            ;; If use-key? is #f, it adds `to-add' without a key.
-            ;; pre: arrow-records is not #f
-            (define/private (add-to-range/key text start end to-add key use-key?)
-              (let ([arrow-record (get-arrow-record text)])
-                ;; Dropped the check (< _ (vector-length arrow-vector))
-                ;; which had the following comment:
-                ;;    the last test in the above and is because some syntax objects
-                ;;    appear to be from the original source, but can have bogus information.
-
-                ;; interval-maps use half-open intervals which works out well for positions
-                ;; in the editor, since the interval [0,3) covers the characters just after
-                ;; positions 0, 1, and 2, but not the character at position 3 (positions are
-                ;; between characters)
-                (cond [use-key?
-                       (interval-map-update*! arrow-record start end
-                                              (lambda (old)
-                                                (if (for/or ([x (in-list old)])
-                                                      (and (pair? x) (car x) (eq? (car x) key)))
-                                                    old
-                                                    (cons (cons key to-add) old)))
-                                              null)]
-                      [else
-                       (interval-map-cons*!
-                        arrow-record start end to-add null)])))
-            (inherit get-top-level-window)
-            
-            (define/augment (on-change)
-              (inner (void) on-change)
-              (when arrow-records
-                (let ([any-tacked? #f])
-                  (when tacked-hash-table
-                    (let/ec k
-                      (hash-for-each
-                       tacked-hash-table
-                       (λ (key val)
-                         (set! any-tacked? #t)
-                         (k (void))))))
-                  (when any-tacked?
-                    (invalidate-bitmap-cache/padding)))))
-            
-            (define view-corner-hash (make-weak-hasheq))
-            
-            (define/private (get-last-view-corner admin)
-              (hash-ref view-corner-hash admin (λ () (cons #f #f))))
-            
-            (define/private (set-last-view-corner! admin corner)
-              (hash-set! view-corner-hash admin corner))
-            
-            (define/private (get-view-corner admin)
-              (define new-x (box #f))
-              (define new-y (box #f))
-              (send admin get-view new-x new-y #f #f)
-              (cons (unbox new-x) (unbox new-y)))
-            
-            (define/private (update-view-corner admin)
-              (define old-corner (get-last-view-corner admin))
-              (define new-corner (get-view-corner admin))
-              (define scrolled? (not (equal? old-corner new-corner)))
-              (set-last-view-corner! admin new-corner)
-              scrolled?)
-            
-            (define/override (on-paint before dc left top right bottom dx dy draw-caret)
-              (when (and arrow-records (not before))
-                (define admin (get-admin))
-                ;; update the known editor location for the upper-left corner
-                (define scrolled? (update-view-corner admin))
-                ;; when painting on the canvas the mouse is over...
-                (when (eq? mouse-admin admin)
-                  (define update-tooltip-frame-and-matching-identifiers?
-                    (cond
-                      ;; turn off arrows immediately if scrolling
-                      [scrolled? (set! cursor-tooltip #f)
-                                 (set! cursor-pos #f)
-                                 (set! cursor-text #f)
-                                 (set! cursor-eles #f)
-                                 (update-docs-background #f)
-                                 (start-arrow-draw-cooldown syncheck-scroll-arrow-cooldown)
-                                 #t]
-                      ;; try to update the tooltips if they're wrong
-                      [(eq? cursor-tooltip 'out-of-sync)
-                       (set! cursor-tooltip (get-tooltip cursor-eles))
-                       (not (eq? cursor-tooltip 'out-of-sync))]
-                      [else #f]))
-                  (when update-tooltip-frame-and-matching-identifiers?
-                    (update-tooltip-frame-and-matching-identifiers #t))
-                  ;; update on a timer if the arrows changed
-                  (when (update-latent-arrows mouse-x mouse-y)
-                    (start-arrow-draw-timer syncheck-arrow-delay)))
-                (let ([draw-arrow2
-                       (λ (arrow)
-                         (define-values (start-x start-y end-x end-y)
-                           (get-arrow-poss arrow))
-                         (unless (and (= start-x end-x)
-                                      (= start-y end-y))
-                           (drracket:arrow:draw-arrow dc start-x start-y end-x end-y dx dy
-                                                      #:pen-width 2)
-                           (when (and (var-arrow? arrow) (not (var-arrow-actual? arrow)))
-                             (let-values ([(fw fh _d _v) (send dc get-text-extent "x")])
-                               (send dc draw-text "?"
-                                     (+ end-x dx fw)
-                                     (+ end-y dy (- fh)))))))]
-                      [old-brush (send dc get-brush)]
-                      [old-pen   (send dc get-pen)]
-                      [old-font  (send dc get-font)]
-                      [old-text-foreground (send dc get-text-foreground)]
-                      [old-text-mode (send dc get-text-mode)]
-                      [old-alpha (send dc get-alpha)]
-                      [white-on-black? (preferences:get 'framework:white-on-black?)]) 
-                  (send dc set-font
-                        (send the-font-list find-or-create-font
-                              (send old-font get-point-size)
-                              'default
-                              'normal
-                              'bold))
-                  (send dc set-text-foreground templ-color)
-                  (send dc set-alpha 0.5)
-                  (for ([(arrow v) (in-hash tacked-hash-table)])
-                    (when v 
-                      (cond
-                        [(var-arrow? arrow)
-                         (if (var-arrow-actual? arrow)
-                             (begin (send dc set-pen (get-var-pen white-on-black?))
-                                    (send dc set-brush (get-tacked-var-brush white-on-black?)))
-                             (begin (send dc set-pen (get-templ-pen white-on-black?))
-                                    (send dc set-brush (get-tacked-templ-brush white-on-black?))))]
-                        [(tail-arrow? arrow)
-                         (send dc set-pen (get-tail-pen white-on-black?))
-                         (send dc set-brush (get-tacked-tail-brush white-on-black?))])
-                      (draw-arrow2 arrow)))
-                  (when (and cursor-pos
-                             cursor-text)
-                    (define arrow-records-at-cursor (fetch-arrow-records cursor-text cursor-pos))
-                    (define tail-arrows '())
-                    (when arrow-records-at-cursor
-                      (for ([ele (in-list arrow-records-at-cursor)])
-                        (cond [(var-arrow? ele)
-                               (if (var-arrow-actual? ele)
-                                   (begin (send dc set-pen (get-var-pen white-on-black?))
-                                          (send dc set-brush (get-untacked-brush white-on-black?)))
-                                   (begin (send dc set-pen (get-templ-pen white-on-black?))
-                                          (send dc set-brush (get-untacked-brush white-on-black?))))
-                               (draw-arrow2 ele)]
-                              [(tail-arrow? ele)
-                               (set! tail-arrows (cons ele tail-arrows))])))
-                    
-                    (send dc set-pen (get-tail-pen white-on-black?))
-                    (send dc set-brush (get-untacked-brush white-on-black?))
-                    (for-each-tail-arrows draw-arrow2 tail-arrows))
-                  (send dc set-brush old-brush)
-                  (send dc set-pen old-pen)
-                  (send dc set-font old-font)
-                  (send dc set-text-foreground old-text-foreground)
-                  (send dc set-text-mode old-text-mode)
-                  (send dc set-alpha old-alpha)))
-              
-              ;; do the drawing before calling super so that the arrows don't
-              ;; cross the "#lang ..." line, if it is present.
-              (super on-paint before dc left top right bottom dx dy draw-caret))
-            
-            ;; for-each-tail-arrows : (tail-arrow -> void) tail-arrow -> void
-            (define/private (for-each-tail-arrows f tail-arrows)
-              ;; call-f-ht ensures that `f' is only called once per arrow
-              (define call-f-ht (make-hash))
-              
-              (for ([tail-arrow (in-list tail-arrows)])
-                (define (for-each-tail-arrows/to/from tail-arrow-pos tail-arrow-text
-                                                      tail-arrow-other-pos tail-arrow-other-text)
-                  
-                  ;; traversal-ht ensures that we don't loop in the arrow traversal.
-                  (let ([traversal-ht (make-hasheq)])
-                    (let loop ([tail-arrow tail-arrow])
-                      (unless (hash-ref traversal-ht tail-arrow #f)
-                        (hash-set! traversal-ht tail-arrow #t)
-                        (unless (hash-ref call-f-ht tail-arrow #f)
-                          (hash-set! call-f-ht tail-arrow #t)
-                          (f tail-arrow))
-                        (let* ([next-pos (tail-arrow-pos tail-arrow)]
-                               [next-text (tail-arrow-text tail-arrow)]
-                               [arrow-record (hash-ref arrow-records next-text #f)])
-                          (when arrow-record
-                            (for ([ele (in-list (interval-map-ref arrow-record next-pos null))])
-                              (cond
-                                [(tail-arrow? ele)
-                                 (let ([other-pos (tail-arrow-other-pos ele)]
-                                       [other-text (tail-arrow-other-text ele)])
-                                   (when (and (= other-pos next-pos)
-                                              (eq? other-text next-text))
-                                     (loop ele)))]))))))))
-                (for-each-tail-arrows/to/from tail-arrow-to-pos tail-arrow-to-text
-                                              tail-arrow-from-pos tail-arrow-from-text)
-                (for-each-tail-arrows/to/from tail-arrow-from-pos tail-arrow-from-text
-                                              tail-arrow-to-pos tail-arrow-to-text)))
-            
-            ;; after a short delay, current-* are set to latent-*, and arrows are drawn
-            (define latent-pos #f)
-            (define latent-text #f)
-            (define latent-eles #f)
-            (define latent-tooltip #f)
-            
-            (define cursor-pos #f)
-            (define cursor-text #f)
-            (define cursor-eles #f)
-            (define cursor-tooltip #f)
-            
-            ;; this gives errors if constructed immediately
-            (define arrow-draw-timer #f)
-            ;; Starts or restarts a one-shot arrow draw timer
-            (define/private (start-arrow-draw-timer delay-ms)
-              (unless arrow-draw-timer
-                (set! arrow-draw-timer (make-object logging-timer% 
-                                         (λ () (maybe-update-drawn-arrows)))))
-              (send arrow-draw-timer start delay-ms #t))
-            
-            ;; this will be set to a time in the future if arrows shouldn't be drawn until then
-            (define arrow-draw-cooldown-time (current-milliseconds))
-            ;; Starts an arrow draw cooldown
-            (define/private (start-arrow-draw-cooldown delay-ms)
-              (set! arrow-draw-cooldown-time (+ (current-milliseconds) delay-ms)))
-            
-            ;; The arrow-draw-timer proc
-            (define/private (maybe-update-drawn-arrows)
-              (cond
-                [(arrow-draw-cooldown-time . > . (current-milliseconds))
-                 ;; keep restarting the timer until we pass cooldown-time
-                 ;; (should happen < 5 times for a scroll, which is cheaper than mouse move)
-                 (start-arrow-draw-timer 100)]
-                [else
-                 (update-drawn-arrows)]))
-            
-            (define tooltips-enabled? #f)
-            (define/public (enable-tooltips x?)
-              (set! tooltips-enabled? x?)
-              (when (update-latent-arrows mouse-x mouse-y)
-                (start-arrow-draw-timer syncheck-arrow-delay)))
-            
-            ;; Given a mouse position, updates latent-* variables and tooltips
-            (define/private (update-latent-arrows x y)
-              (define-values (pos text eles tooltip)
-                (cond
-                  ;; need to check this first so syncheck:clear-arrows will work
-                  [(not arrow-records)
-                   (values #f #f #f #f)]
-                  [(and x y)
-                   (define-values (pos text) (get-pos/text-dc-location x y))
-                   (define arrow-record (and text pos (hash-ref arrow-records text #f)))
-                   (define eles (and arrow-record (interval-map-ref arrow-record pos null)))
-                   (define tooltip (cond [(not tooltips-enabled?) #f]
-                                         [(and (equal? latent-eles eles) latent-tooltip)
-                                          latent-tooltip]
-                                         [else (get-tooltip eles)]))
-                   (values pos text eles tooltip)]
-                  [else
-                   (values #f #f #f #f)]))
-              (define text-changed? (not (eq? latent-text text)))
-              (define eles-changed? (not (equal? latent-eles eles)))
-              (define tooltip-changed? (not (equal? latent-tooltip tooltip)))
-              
-              (set! latent-pos pos)
-              (set! latent-text text)
-              (set! latent-eles eles)
-              (set! latent-tooltip tooltip)
-              
-              (or text-changed? eles-changed? tooltip-changed?))
-            
-            (define/private (update-drawn-arrows)
-              (define latent-stuff (fetch-arrow-records latent-text latent-pos))
-              (define cursor-stuff (fetch-arrow-records cursor-text cursor-pos))
-
-              (set! cursor-pos latent-pos)
-              (set! cursor-text latent-text)
-              (set! cursor-eles latent-eles)
-              (set! cursor-tooltip latent-tooltip)
-              
-              (update-tooltip-frame-and-matching-identifiers #f)
-              (update-docs-background cursor-eles)
-              (unless (equal? latent-stuff cursor-stuff)
-                (invalidate-bitmap-cache/padding)))
-            
-            (define mouse-admin #f)  ; editor admin for the last mouse move
-            (define mouse-x #f)      ; last known mouse position
-            (define mouse-y #f)
-            (define/override (on-event event)
-              (define-values (x y)
-                (cond [(send event leaving?) (values #f #f)]
-                      [else (values (send event get-x) (send event get-y))]))
-              
-              (set! mouse-admin (get-admin))
-              (set! mouse-x x)
-              (set! mouse-y y)
-              
-              ;; mouse motion cancels arrow draw cooldown
-              (when (eq? 'motion (send event get-event-type))
-                (set! arrow-draw-cooldown-time (current-milliseconds)))
-              
-              ;; if the arrows changed, start the draw timer
-              (when (update-latent-arrows x y)
-                (start-arrow-draw-timer syncheck-arrow-delay))
-              
-              (super on-event event))
-            
-            (define/public (syncheck:update-drawn-arrows)
-              ;; This will ensure on-paint is called, once for each canvas that
-              ;; is displaying the editor. In the on-paint call for the canvas
-              ;; that the mouse is over, arrows will be updated, arrow-draw-timer
-              ;; will be set, etc.
-              ;; If this were done more directly, the tooltip would show up in
-              ;; the wrong canvas half the time - when the current admin isn't
-              ;; the admin for the canvas the mouse is over.
-              (invalidate-bitmap-cache 0 0 'display-end 'display-end))
-            
-            (define/public (syncheck:build-popup-menu menu pos text [sep-before? #t])
-              (when arrow-records
-                (define arrow-record (hash-ref arrow-records text #f))
-                (when arrow-record
-                  (define need-a-sep? (not sep-before?))
-                  (define (add-sep) 
-                    (unless need-a-sep? 
-                      (set! need-a-sep? #t)
-                      (when sep-before?
-                        (new separator-menu-item% [parent menu]))))
-                  (define vec-ents (interval-map-ref arrow-record pos null))
-                  (define start-selection (send text get-start-position))
-                  (define end-selection (send text get-end-position))
-                  (define arrows (filter arrow? vec-ents))
-                  (define def-links (filter def-link? vec-ents))
-                  (define var-arrows (filter var-arrow? arrows))
-                  (define add-menus (append (map cdr (filter pair? vec-ents))
-                                            (filter procedure? vec-ents)))
-                  (unless (null? arrows)
-                    (add-sep)
-                    (make-object menu-item%
-                      (string-constant cs-tack/untack-arrow)
-                      menu
-                      (λ (item evt) (tack/untack-callback arrows))))
-                  (unless (null? def-links)
-                    (add-sep)
-                    (let ([def-link (car def-links)])
-                      (new menu-item%
-                           [label (if (def-link->tab/pos def-link)
-                                      jump-to-definition
-                                      (string-constant cs-open-defining-file))]
-                           [parent menu]
-                           [callback
-                            (λ (item evt)
-                              (jump-to-definition-callback def-link))])))
-                  (unless (null? var-arrows)
-                    (add-sep)
-                    (make-object menu-item%
-                      jump-to-next-bound-occurrence
-                      menu
-                      (λ (item evt) (jump-to-next-callback pos (+ pos 1) text #f)))
-                    (make-object menu-item%
-                      jump-to-binding
-                      menu
-                      (λ (item evt) (jump-to-binding-callback arrows))))
-                  (unless (= start-selection end-selection)
-                    (add-sep)
-                    (define arrows-menu
-                      (make-object menu%
-                        "Arrows crossing selection"
-                        menu))
-                    (define (callback accept)
-                      (tack-crossing-arrows-callback
-                       arrow-record
-                       start-selection
-                       end-selection
-                       text
-                       accept))
-                    (make-object menu-item%
-                      "Tack arrows"
-                      arrows-menu
-                      (lambda (item evt)
-                        (callback
-                         '(lexical top-level imported))))
-                    (make-object menu-item%
-                      "Tack non-import arrows"
-                      arrows-menu
-                      (lambda (item evt)
-                        (callback
-                         '(lexical top-level))))
-                    (make-object menu-item%
-                      "Untack arrows"
-                      arrows-menu
-                      (lambda (item evt)
-                        (untack-crossing-arrows
-                         arrow-record
-                         start-selection
-                         end-selection))))
-                  (for ([f (in-list add-menus)])
-                    (f menu))
-                  
-                  (define-values (binding-identifiers make-identifiers-hash)
-                    (position->matching-identifiers-hash text pos (+ pos 1) #t))
-                  (unless (null? binding-identifiers)
-                    (define name-to-offer (find-name-to-offer binding-identifiers))
-                    (new menu-item%
-                         [parent menu]
-                         [label (fw:gui-utils:format-literal-label (string-constant cs-rename-var)
-                                                                   name-to-offer)]
-                         [callback
-                          (λ (x y)
-                            (let ([frame-parent (find-menu-parent menu)])
-                              (rename-menu-callback make-identifiers-hash
-                                                    name-to-offer 
-                                                    binding-identifiers
-                                                    frame-parent)))]))
-                  (unless sep-before?
-                    (when need-a-sep?
-                      (new separator-menu-item% [parent menu])))
-                  (void))))
-            
-            (define/private (update-tooltip-frame-and-matching-identifiers refreshing?)
-              (update-tooltip-frame)
-              (update-matching-identifiers refreshing?))
-            
-            (define tooltip-frame #f)
-            (define/private (update-tooltip-frame)
-              (unless tooltip-frame (set! tooltip-frame (new tooltip-frame%)))
-              (match cursor-tooltip
-                [(tooltip-spec strings x y w h)
-                 ;; hiding keeps it from flashing the new tooltip in the old location
-                 ;; but this hiding does strange things under linux, so don't do it there
-                 (unless (equal? (system-type) 'unix) (send tooltip-frame show #f))
-                 (send tooltip-frame set-tooltip strings)
-                 (send tooltip-frame show-over x y w h)]
-                ;; #f or 'out-of-sync
-                [_ (send tooltip-frame show #f)]))
-            
-            (define current-matching-identifiers (make-hash))
-            
-            (define/private (update-matching-identifiers refreshing?)
-              (define clr (color-prefs:lookup-in-color-scheme  
-                           'drracket:syncheck:matching-identifiers))
-              (define style 'ellipse) 
-              (define in-edit-sequence '())
-              (define (un/highlight highlight?)
-                (for ([(lst _) (in-hash current-matching-identifiers)])
-                  (define txt (list-ref lst 0))
-                  (define start (list-ref lst 1))
-                  (define end (list-ref lst 2))
-                  (unless refreshing?
-                    (unless (member txt in-edit-sequence)
-                      (set! in-edit-sequence (cons txt in-edit-sequence))
-                      (send txt begin-edit-sequence)))
-                  (if highlight?
-                      (send txt highlight-range start end clr #f 'low style)
-                      (send txt unhighlight-range start end clr #f style))))
-              
-              (un/highlight #f)
-              
-              (set! current-matching-identifiers
-                    (cond
-                      [(and cursor-text cursor-pos)
-                       (define-values (_binders make-identifiers-hash)
-                         (position->matching-identifiers-hash cursor-text cursor-pos cursor-pos
-                                                              #f))
-                       (make-identifiers-hash)]
-                      [else
-                       (make-hash)]))
-              
-              (un/highlight #t)
-              
-              (for ([txt (in-list in-edit-sequence)])
-                (send txt end-edit-sequence)))
-
-            ;; position->matching-identifiers-hash 
-            ;; : txt pos pos -> (values (listof var-arrow?) hash[(list txt pos pos) -o> #t])
-            (define/private (position->matching-identifiers-hash the-text the-start-pos the-end-pos
-                                                                 include-require-arrows?)
-              (define binding-arrows '())
-              (define (add-binding-arrow arr)
-                (when (or include-require-arrows?
-                          (not (var-arrow-require-arrow? arr)))
-                  (set! binding-arrows (cons arr binding-arrows))))
-              (for ([the-pos (in-range the-start-pos (+ the-end-pos 1))])
-                (define arrs (fetch-arrow-records the-text the-pos))
-                (when arrs
-                  (for ([arrow (in-list arrs)])
-                    (when (var-arrow? arrow)
-                      (cond
-                        [(and (equal? (var-arrow-start-text arrow) the-text)
-                              (<= (var-arrow-start-pos-left arrow) 
-                                  the-pos 
-                                  (var-arrow-start-pos-right arrow)))
-                         ;; a binding occurrence => keep it
-                         (add-binding-arrow arrow)]
-                        [else
-                         ;; a bound occurrence => find binders
-                         (for ([candidate-binder 
-                                (in-list (fetch-arrow-records (var-arrow-start-text arrow)
-                                                              (var-arrow-start-pos-left arrow)))])
-                           (when (var-arrow? candidate-binder)
-                             (when (and (equal? (var-arrow-start-text arrow) 
-                                                (var-arrow-start-text candidate-binder))
-                                        (equal? (var-arrow-start-pos-left arrow)
-                                                (var-arrow-start-pos-left candidate-binder))
-                                        (equal? (var-arrow-start-pos-right arrow)
-                                                (var-arrow-start-pos-right candidate-binder)))
-                               (add-binding-arrow candidate-binder))))])))))
-              
-              (define identifiers-hash #f)
-              (define (add-one txt start end)
-                (hash-set! identifiers-hash (list txt start end) #t))
-              (define (get-identifiers-hash)
-                (unless identifiers-hash
-                  (set! identifiers-hash (make-hash))
-                  (define already-considered (make-hash))
-                  (for ([binding-arrow (in-list binding-arrows)])
-                    (add-one (var-arrow-start-text binding-arrow)
-                             (var-arrow-start-pos-left binding-arrow)
-                             (var-arrow-start-pos-right binding-arrow))
-                    (define range-to-consider
-                      (cons (var-arrow-start-pos-left binding-arrow)
-                            (var-arrow-start-pos-right binding-arrow)))
-                    (unless (hash-ref already-considered range-to-consider #f)
-                      (hash-set! already-considered range-to-consider #t)
-                      (for ([pos (in-range (car range-to-consider) (cdr range-to-consider))])
-                        (for ([arrow (in-list (fetch-arrow-records 
-                                               (var-arrow-start-text binding-arrow)
-                                               pos))])
-                          (when (var-arrow? arrow)
-                            (when (or include-require-arrows?
-                                      (not (var-arrow-require-arrow? arrow)))
-                              (when (and (equal? (var-arrow-start-text arrow)
-                                                 (var-arrow-start-text binding-arrow))
-                                         (equal? (var-arrow-start-pos-left arrow)
-                                                 (var-arrow-start-pos-left binding-arrow))
-                                         (equal? (var-arrow-start-pos-right arrow)
-                                                 (var-arrow-start-pos-right binding-arrow)))
-                                (add-one (var-arrow-end-text arrow)
-                                         (var-arrow-end-pos-left arrow)
-                                         (var-arrow-end-pos-right arrow))))))))))
-                identifiers-hash)
-              
-              (values binding-arrows get-identifiers-hash))
-            
-            ;; Sometimes when this is called, the calls to 'tooltip-info->ltrb'
-            ;; fail and we get no information back. When that happens, we return 
-            ;; 'out-of-sync and try again in on-paint (which happens every time
-            ;; the caret blinks).
-            (define/private (get-tooltip eles)
-              (define tooltip-infos (if eles (filter tooltip-info? eles) null))
-              (let loop ([tooltip-infos tooltip-infos]
-                         [l #f] [t #f] [r #f] [b #f]
-                         [strings (set)])
-                (cond
-                  [(null? tooltip-infos)
-                   (cond
-                     [(and l t r b)
-                      (define-values (dx dy) (get-display-left-top-inset))
-                      (tooltip-spec (sort (set->list strings) string<=?)
-                                    (- l dx) (- t dy) (- r l) (- b t))]
-                     [else #f])]
-                  [else
-                   (define-values (tl tt tr tb) (tooltip-info->ltrb (car tooltip-infos)))
-                   (cond
-                     [(and tl tt tr tb)
-                      (define (min/f x y) (cond [(and x y) (min x y)] [x x] [y y] [else #f]))
-                      (define (max/f x y) (cond [(and x y) (max x y)] [x x] [y y] [else #f]))
-                      (loop (cdr tooltip-infos)
-                            (min/f tl l) (min/f tt t) (max/f tr r) (max/f tb b)
-                            (set-add strings (tooltip-info-msg (car tooltip-infos))))]
-                     [else
-                      ;(printf "~a: out of sync~n" (current-milliseconds))
-                      'out-of-sync])])))
-            
-            ;; Given an editor, returns the canvas that the mouse is currently over,
-            ;; as opposed to the one with keyboard focus (which get-canvas usually returns)
-            (define/private (find-mouse-canvas ed)
-              (define current-admin (send ed get-admin))
-              (let/ec return
-                (for ([canvas  (in-list (send ed get-canvases))])
-                  (define admin (send canvas call-as-primary-owner
-                                      (λ () (send ed get-admin))))
-                  (when (eq? admin current-admin)
-                    (return canvas)))
-                (send ed get-canvas)))
-            
-            (define/private (tooltip-info->ltrb tooltip)
-              (define left-pos (tooltip-info-pos-left tooltip))
-              (define right-pos (tooltip-info-pos-right tooltip))
-              (define text (tooltip-info-text tooltip))
-              
-              (define eol-pos (line-end-position (position-line right-pos)))
-              
-              (send text position-location eol-pos xlb ylb #t #t)
-              (define-values (x-off y-off)
-                (send text editor-location-to-dc-location (+ (unbox xlb) 4) (unbox ylb)))
-              (define (c n) (inexact->exact (round n)))
-              (define x-off-round (c x-off))
-              (define y-off-round (c y-off))
-              (define window
-                (let loop ([ed text])
-                  (cond
-                    [(find-mouse-canvas ed) => values]
-                    [else
-                     (define admin (send ed get-admin))
-                     (if (is-a? admin editor-snip-editor-admin<%>)
-                         (loop (send (send admin get-snip) get-editor))
-                         #f)])))
-              (cond
-                [(and window (position-integer? x-off-round) (position-integer? y-off-round))
-                 (define-values (gx gy) (send window client->screen x-off-round y-off-round))
-                 (values gx gy gx gy)]
-                [else
-                 (values #f #f #f #f)]))
-            
-            (define current-colored-region #f)
-            ;; update-docs-background : (or/c false/c (listof any)) -> void
-            (define/private (update-docs-background eles)
-              (let ([new-region (and eles (ormap (λ (x) (and (colored-region? x) x)) eles))])
-                (unless (eq? current-colored-region new-region)
-                  (when current-colored-region
-                    (send (colored-region-text current-colored-region) unhighlight-range 
-                          (colored-region-start current-colored-region)
-                          (colored-region-fin current-colored-region)
-                          (send the-color-database find-color 
-                                (colored-region-color current-colored-region))))
-                  (when new-region
-                    (send (colored-region-text new-region) highlight-range
-                          (colored-region-start new-region)
-                          (colored-region-fin new-region)
-                          (send the-color-database find-color (colored-region-color new-region))))
-                  (set! current-colored-region new-region))))
-                
-            ;; tack/untack-callback : (listof arrow) -> void
-            ;; callback for the tack/untack menu item
-            (define/private (tack/untack-callback arrows)
-              (let ([arrow-tacked?
-                     (λ (arrow)
-                       (hash-ref
-                        tacked-hash-table
-                        arrow
-                        (λ () #f)))]
-                    [untack-arrows? #f])
-                (for-each 
-                 (λ (arrow)
-                   (cond
-                     [(var-arrow? arrow)
-                      (set! untack-arrows? (or untack-arrows? (arrow-tacked? arrow)))]
-                     [(tail-arrow? arrow)
-                      (for-each-tail-arrows
-                       (λ (arrow) (set! untack-arrows? (or untack-arrows? (arrow-tacked? arrow))))
-                       (list arrow))]))
-                 arrows)
-                (for-each 
-                 (λ (arrow)
-                   (cond
-                     [(var-arrow? arrow)
-                      (hash-set! tacked-hash-table arrow (not untack-arrows?))]
-                     [(tail-arrow? arrow)
-                      (for-each-tail-arrows
-                       (λ (arrow) 
-                         (hash-set! tacked-hash-table arrow (not untack-arrows?)))
-                       (list arrow))]))
-                 arrows))
-              (invalidate-bitmap-cache/padding))
-            
-            (define/private (tack-crossing-arrows-callback arrow-record start end text kinds)
-              (define (xor a b)
-                (or (and a (not b)) (and (not a) b)))
-              (define (within t p)
-                (and (eq? t text)
-                     (<= start p end)))
-              ;; FIXME: Add to interval-map: iteration over distinct ranges w/i given range
-              (for ([position (in-range start end)])
-                (define things (interval-map-ref arrow-record position null))
-                (for ([va things] #:when (var-arrow? va))
-                  (define va-start (var-arrow-start-pos-left va))
-                  (define va-start-text (var-arrow-start-text va))
-                  (define va-end (var-arrow-end-pos-left va))
-                  (define va-end-text (var-arrow-end-text va))
-                  (when (xor (within va-start-text va-start)
-                             (within va-end-text va-end))
-                    (when (memq (var-arrow-level va) kinds)
-                      (hash-set! tacked-hash-table va #t)))))
-              (invalidate-bitmap-cache/padding))
-
-            (define/private (untack-crossing-arrows arrow-record start end)
-              ;; FIXME: same comment as in 'tack-crossing...'
-              (for ([position (in-range start end)])
-                (for ([va (interval-map-ref arrow-record position null)]
-                      #:when (var-arrow? va))
-                  (hash-set! tacked-hash-table va #f))))
-
-            ;; syncheck:jump-to-binding-occurrence : text [boolean?] -> void
-            ;; jumps to the next occurrence, based on the insertion point
-            (define/public (syncheck:jump-to-next-bound-occurrence text [backwards? #f])
-              (jump-to-binding/bound-helper 
-               text 
-               (λ (start-pos end-pos text vec-ents)
-                 (jump-to-next-callback start-pos end-pos text backwards?))))
-            
-            ;; syncheck:jump-to-binding-occurrence : text -> void
-            (define/public (syncheck:jump-to-binding-occurrence text)
-              (jump-to-binding/bound-helper 
-               text 
-               (λ (start-pos end-pos text vec-ents)
-                 (jump-to-binding-callback vec-ents))))
-            
-            (define/private (jump-to-binding/bound-helper text do-jump)
-              (when arrow-records
-                (define arrow-record (hash-ref arrow-records text #f))
-                (when arrow-record
-                  (define arrows '())
-                  (define start-pos (send text get-start-position))
-                  (define end-pos (send text get-end-position))
-                  (for ([pos (in-range start-pos (+ end-pos 1))])
-                    (set! arrows (append (filter var-arrow? (interval-map-ref arrow-record pos null))
-                                         arrows)))
-                  (unless (null? arrows)
-                    (do-jump start-pos end-pos text arrows)))))
-            
-            ;; jump-to-next-callback : num text boolean? -> void
-            ;; callback for the jump popup menu item
-            (define/private (jump-to-next-callback start-pos end-pos txt backwards?)
-              (define-values (_binders make-identifiers-hash)
-                (position->matching-identifiers-hash txt start-pos end-pos #t))
-              (define orig-arrows 
-                (sort (hash-map (make-identifiers-hash)
-                                (λ (x y) x))
-                      (λ (x y) (if backwards?
-                                   (not (syncheck:compare-bindings x y))
-                                   (syncheck:compare-bindings x y)))))
-              (define best (pick-next-arrow orig-arrows backwards? txt start-pos end-pos))
-              (when best (jump-to best)))
-            
-            ;; jump-to : (list text number number) -> void
-            (define/public (jump-to to-arrow)
-              (let ([end-text (list-ref to-arrow 0)]
-                    [end-pos-left (list-ref to-arrow 1)]
-                    [end-pos-right (list-ref to-arrow 2)])
-                (send end-text set-caret-owner #f 'global)
-                (define admin (send end-text get-admin))
-                (when admin 
-                  (define vxb (box 0.0))
-                  (define vyb (box 0.0))
-                  (define vwb (box 0.0))
-                  (define vhb (box 0.0))
-                  (define pxb (box 0.0))
-                  (define pyb (box 0.0))
-                  (send admin get-view vxb vyb vwb vhb)
-                  (send end-text position-location end-pos-left pxb pyb #t #f #t)
-                  (define vx (unbox vxb))
-                  (define vy (unbox vyb))
-                  (define vw (unbox vwb))
-                  (define vh (unbox vhb))
-                  (define px (unbox pxb))
-                  (define py (unbox pyb))
-                  (unless (and (<= vx px (+ vx vw))
-                               (<= vy py (+ vy vh)))
-                    (send end-text scroll-editor-to
-                          (max 0 (- px (* .2 vw)))
-                          (max 0 (- py (* .2 vh)))
-                          vw vh
-                          #t
-                          'none)))
-                ;; set-position after attempting to scroll, or
-                ;; else set-position's scrolling will cause the
-                ;; 'unless' test above to skip the call to scroll-editor-to
-                (send end-text set-position end-pos-left end-pos-right)))
-            
-            ;; jump-to-binding-callback : (listof arrow) -> void
-            ;; callback for the jump popup menu item
-            (define/private (jump-to-binding-callback arrows)
-              (unless (null? arrows)
-                (let* ([arrow (car arrows)]
-                       [start-text (var-arrow-start-text arrow)]
-                       [start-pos-left (var-arrow-start-pos-left arrow)]
-                       [start-pos-right (var-arrow-start-pos-right arrow)])
-                  (send start-text set-position start-pos-left start-pos-right)
-                  (send start-text set-caret-owner #f 'global))))
-            
-            ;; syncheck:jump-to-definition : text -> void
-            (define/public (syncheck:jump-to-definition text)
-              (let ([pos (send text get-start-position)])
-                (when arrow-records
-                  (let ([arrow-record (hash-ref arrow-records text #f)])
-                    (when arrow-record
-                      (let ([vec-ents (filter def-link? (interval-map-ref arrow-record pos null))])
-                        (unless (null? vec-ents)
-                          (jump-to-definition-callback (car vec-ents)))))))))
-            
-            (define/private (jump-to-definition-callback def-link)
-              (define go/f (def-link->tab/pos def-link))
-              (cond
-                [go/f (go/f)]
-                [else (handler:edit-file (def-link-filename def-link))]))
-            
-            ;; def-link->tab/pos : def-link -> (or/c #f (-> void?))
-            ;; if the result is a function, invoking it will open the file
-            ;; in the def-link and jump to the appropriate position in the file
-            (define/private (def-link->tab/pos a-def-link)
-              (match-define (def-link id filename submods) a-def-link)
-              (define tab
-                (for/or ([frame (in-list (send (group:get-the-frame-group) get-frames))])
-                  (and (is-a? frame drracket:unit:frame<%>)
-                       (send frame find-matching-tab filename))))
-              (define dt 
-                (and tab
-                     (send (send tab get-defs) syncheck:find-definition-target id submods)))
-              (and dt
-                   (λ ()
-                     (define frame (send tab get-frame))
-                     (send frame change-to-tab tab)
-                     (send frame show #t)
-                     (send (send tab get-defs) jump-to dt))))
-            
-            (define/augment (after-set-next-settings settings)
-              (let ([frame (get-top-level-window)])
-                (when frame
-                  (send frame update-button-visibility/settings settings)))
-              (inner (void) after-set-next-settings settings))
-
-            (define/public (syncheck:find-source-object stx)
-              (cond
-                [(not (syntax-source stx)) #f]
-                [(and (symbol? (syntax-source stx))
-                      (text:lookup-port-name (syntax-source stx)))
-                 => values]
-                [else
-                 (let txt-loop ([text this])
-                   (cond
-                     [(and (is-a? text text:basic<%>)
-                           (send text port-name-matches? (syntax-source stx)))
-                      text]
-                     [else
-                      (let snip-loop ([snip (send text find-first-snip)])
-                        (cond
-                          [(not snip)
-                           #f]
-                          [(and (is-a? snip editor-snip%)
-                                (send snip get-editor))
-                           (or (txt-loop (send snip get-editor))
-                               (snip-loop (send snip next)))]
-                          [else 
-                           (snip-loop (send snip next))]))]))]))
-            
-            (define/private (invalidate-bitmap-cache/padding)
-              (define-values (l t r b) (get-padding))
-              (invalidate-bitmap-cache l))
-            
-            (super-new)))))
-    
-    (keymap:add-to-right-button-menu/before
-     (let ([old (keymap:add-to-right-button-menu/before)])
-       (λ (menu editor event)
-         (old menu editor event)
-         (when (is-a? editor syncheck-text<%>)
-           (define-values (pos text) (send editor get-pos/text event))
-           (when (and pos (is-a? text text%))
-             (send editor syncheck:build-popup-menu menu pos text #f))))))
-    
-    (define syncheck-frame<%>
-      (interface ()
-        syncheck:button-callback
-        syncheck:error-report-visible?
-        syncheck:get-error-report-contents))
-    
-    (define tab-mixin
-      
-      (mixin (drracket:unit:tab<%>) ()
-        (inherit is-current-tab? get-defs get-frame)
-        
-        (define next-trace-refresh? #t)
-        (define/public (get-next-trace-refresh?) next-trace-refresh?)
-        (define/public (set-next-trace-refresh b) (set! next-trace-refresh? b))
-        
-        (define current-replay-state #f)
-        (define/public (set-replay-state rs) (set! current-replay-state #f))
-        (define/public (get-replay-state) current-replay-state)
-        
-        (define report-error-text-has-something? #f)
-        (define report-error-text (new (fw:text:ports-mixin fw:racket:text%)))
-        (define error-report-visible? #f)
-        (send report-error-text auto-wrap #t)
-        (send report-error-text set-autowrap-bitmap #f)
-        (send report-error-text lock #t)
-        
-        (define/public (get-error-report-text) report-error-text)
-        (define/public (get-error-report-visible?) error-report-visible?)
-        (define/public (turn-on-error-report) (set! error-report-visible? #t))
-        (define/public (turn-off-error-report) 
-          (when error-report-visible?
-            (send report-error-text clear-output-ports)
-            (send report-error-text lock #f)
-            (send report-error-text delete/io 0 (send report-error-text last-position))
-            (send report-error-text lock #t)
-            (set! error-report-visible? #f)))
-        (define/augment (clear-annotations)
-          (inner (void) clear-annotations)
-          (syncheck:clear-error-message)
-          ;; we only clear out the highlighting that check syntax 
-          ;; may have introduced here; we don't reset the arrows 
-          ;; (or other mouse-over stuff)
-          ;; this code is also run by syncheck:clear-arrows, which
-          ;; used to be called here (indirectly by syncheck:clear-highlighting)
-          (send (get-defs) syncheck:clear-coloring))
-
-        (define/public (syncheck:clear-error-message)
-          (define old-error-report-visible? error-report-visible?)
-          (turn-off-error-report)
-          (when old-error-report-visible?
-            (when (is-current-tab?)
-              (send (get-frame) hide-error-report))))
-        
-        (define/public (syncheck:clear-highlighting)
-          (let ([definitions (get-defs)])
-            (when (send definitions syncheck:arrows-visible?)
-              (let ([locked? (send definitions is-locked?)])
-                (send definitions begin-edit-sequence #f #f)
-                (send definitions lock #f)
-                (send definitions syncheck:clear-arrows)
-                (send definitions lock locked?)
-                (send definitions end-edit-sequence)))))
-        
-        (define/augment (can-close?)
-          (and (send report-error-text can-close?)
-               (inner #t can-close?)))
-        
-        (define/augment (on-close)
-          (send report-error-text on-close)
-          (send (get-defs) syncheck:clear-arrows)
-          (inner (void) on-close))
-        
-        (super-new)))
-    
-    (define unit-frame-mixin
-      (mixin (drracket:unit:frame<%>) (syncheck-frame<%>)
-        
-        (inherit get-button-panel 
-                 get-definitions-canvas 
-                 get-definitions-text
-                 get-interactions-text
-                 get-current-tab)
-        
-        (define/augment (on-tab-change old-tab new-tab)
-          (inner (void) on-tab-change old-tab new-tab)
-          (send (send old-tab get-defs) enable-tooltips #f)
-          (send (send new-tab get-defs) enable-tooltips #t)
-          (send (send old-tab get-defs) syncheck:update-drawn-arrows)
-          (send (send new-tab get-defs) syncheck:update-drawn-arrows)
-          (if (send new-tab get-error-report-visible?)
-              (show-error-report)
-              (hide-error-report))
-          (send report-error-canvas set-editor (send new-tab get-error-report-text))
-          (update-button-visibility/tab new-tab))
-        
-        (define/override (on-activate active?)
-          (define defs (send (get-current-tab) get-defs))
-          (send defs enable-tooltips active?)
-          (send defs syncheck:update-drawn-arrows)
-          (super on-activate active?))
-        
-        (define/private (update-button-visibility/tab tab)
-          (update-button-visibility/settings (send (send tab get-defs) get-next-settings)))
-        (inherit sort-toolbar-buttons-panel)
-        (define/public (update-button-visibility/settings settings)
-          (let* ([lang (drracket:language-configuration:language-settings-language settings)]
-                 [visible? (and (not (is-a? lang drracket:module-language:module-language<%>))
-                                (send lang capability-value 'drscheme:check-syntax-button))])
-            (send (get-button-panel) change-children
-                  (λ (l)
-                    (if visible?
-                        (cons check-syntax-button (remq check-syntax-button l))
-                        (remq check-syntax-button l))))
-            (sort-toolbar-buttons-panel)))
-        
-        ;; set-syncheck-running-mode : (or/c (box boolean?) 'button #f) -> boolean
-        ;; records how a particular check syntax is being played out in the editor right now.
-        ;; - #f means nothing is currently running.
-        ;; - 'button means someone clicked the check syntax button
-        ;;    (or the menu item or keyboard shortcut...)
-        ;; - the boxed boolean means that a trace is being replayed from the other place.
-        ;;   if the box is set to #f, then the trace replay will be stopped.
-        ;; if #f is returned, then the mode change is not allowed; this only happens when
-        ;;    a box is passed in
-        (define/public (set-syncheck-running-mode mode)
-          (cond
-            [(not mode)
-             (when (box? current-syncheck-running-mode)
-               (set-box! current-syncheck-running-mode #f))
-             (set! current-syncheck-running-mode #f)
-             #t]
-            [(box? mode)
-             (cond
-               [(eq? current-syncheck-running-mode 'button)
-                #f]
-               [(eq? mode current-syncheck-running-mode)
-                ;; this shouldn't happen, I think
-                #t]
-               [else
-                (when (box? current-syncheck-running-mode)
-                  (set-box! current-syncheck-running-mode #f))
-                (set! current-syncheck-running-mode mode)
-                #t])]
-            [(eq? 'button mode)
-             (when (box? current-syncheck-running-mode)
-               (set-box! current-syncheck-running-mode #f))
-             (set! current-syncheck-running-mode mode)
-             #t]
-            [else
-             (error 'set-syncheck-running-mode "unknown new mode ~s\n" mode)]))
-        
-        (define current-syncheck-running-mode #f)
-    
-        (define/public (replay-compile-comp-trace defs-text val bx)
-          (send (send defs-text get-tab) add-bkg-running-color
-                'syncheck "orchid" cs-syncheck-running)
-          (let loop ([val val]
-                     [start-time (current-inexact-milliseconds)]
-                     [i 0])
-            (cond
-              [(and (null? val) (pair? (unbox bx)))
-               (define new-val (car (unbox bx)))
-               (set-box! bx (cdr (unbox bx)))
-               (loop new-val start-time i)]
-              [(null? val)
-               (send defs-text syncheck:update-blue-boxes)
-               (send defs-text syncheck:update-drawn-arrows)
-               (send (send defs-text get-tab) remove-bkg-running-color 'syncheck)
-               (set-syncheck-running-mode #f)]
-              [(not (unbox bx))
-               ;; if we've been asked to stop (because some new results are ready
-               ;; and another trace is running).
-               (void)]
-              [(and (i . > . 0)  ;; check i just in case things are really strange
-                    (20 . <= . (- (current-inexact-milliseconds) start-time)))
-               (queue-callback
-                (λ ()
-                  (when (unbox bx)
-                    (log-timeline "continuing replay-compile-comp-trace"
-                                  (loop val (current-inexact-milliseconds) 0))))
-                #f)]
-              [else
-               (process-trace-element defs-text (car val))
-               (loop (cdr val) start-time (+ i 1))])))
-        
-        (define/public (reset-previous-check-syntax-information defs-text)
-          (define tab (send defs-text get-tab))
-          (send tab syncheck:clear-error-message)
-          (send tab syncheck:clear-highlighting)
-          (send defs-text syncheck:reset-docs-im)
-          (send defs-text syncheck:init-arrows))
-        
-        (define/private (process-trace-element defs-text x)
-          ;; using 'defs-text' all the time is wrong in the case of embedded editors,
-          ;; but they already don't work and we've arranged for them to not appear here ....
-          (match x
-            [`#(syncheck:add-arrow/name-dup ,start-pos-left ,start-pos-right
-                                            ,end-pos-left ,end-pos-right
-                                            ,actual? ,level ,require-arrow? ,name-dup-pc ,name-dup-id)
-             (define name-dup? (build-name-dup? name-dup-pc name-dup-id))
-             (send defs-text syncheck:add-arrow/name-dup
-                   defs-text start-pos-left start-pos-right
-                   defs-text end-pos-left end-pos-right 
-                   actual? level require-arrow? name-dup?)]
-            [`#(syncheck:add-tail-arrow ,from-pos ,to-pos)
-             (send defs-text syncheck:add-tail-arrow defs-text from-pos defs-text to-pos)]
-            [`#(syncheck:add-mouse-over-status ,pos-left ,pos-right ,str)
-             (send defs-text syncheck:add-mouse-over-status defs-text pos-left pos-right str)]
-            [`#(syncheck:add-background-color ,color ,start ,fin)
-             (send defs-text syncheck:add-background-color defs-text color start fin)]
-            [`#(syncheck:add-jump-to-definition ,start ,end ,id ,filename ,submods)
-             (send defs-text syncheck:add-jump-to-definition defs-text start end id filename submods)]
-            [`#(syncheck:add-require-open-menu ,start-pos ,end-pos ,file)
-             (send defs-text syncheck:add-require-open-menu defs-text start-pos end-pos file)]
-            [`#(syncheck:add-docs-menu ,start-pos ,end-pos ,key ,the-label ,path ,definition-tag ,tag)
-             (send defs-text syncheck:add-docs-menu defs-text start-pos end-pos
-                   key the-label path definition-tag tag)]
-            [`#(syncheck:add-definition-target ,start-pos ,end-pos ,id ,mods)
-             (send defs-text syncheck:add-definition-target defs-text start-pos end-pos id mods)]
-            [`#(syncheck:add-id-set ,to-be-renamed/poss ,name-dup-pc ,name-dup-id)
-             (define to-be-renamed/poss/fixed
-               (for/list ([lst (in-list to-be-renamed/poss)])
-                 (list defs-text (list-ref lst 0) (list-ref lst 1))))
-             (define name-dup? (build-name-dup? name-dup-pc name-dup-id))
-             (send defs-text syncheck:add-id-set to-be-renamed/poss/fixed name-dup?)]))
-        
-        (define/private (build-name-dup? name-dup-pc name-dup-id)
-          (define other-side-dead? #f)
-          (define (name-dup? name) 
-            (cond
-              [other-side-dead? 
-               ;; just give up here ...
-               #f]
-              [else
-               (place-channel-put name-dup-pc (list name-dup-id name))
-               (define res (sync/timeout .5 (handle-evt name-dup-pc list)))
-               (cond
-                 [(list? res) (car res)]
-                 [else
-                  (printf "other side died\n")
-                  (set! other-side-dead? #t)
-                  #f])]))
-          name-dup?)
-        
-        (define/augment (enable-evaluation)
-          (send check-syntax-button enable #t)
-          (inner (void) enable-evaluation))
-        
-        (define/augment (disable-evaluation)
-          (send check-syntax-button enable #f)
-          (inner (void) disable-evaluation))
-        
-        (define report-error-parent-panel 'uninitialized-report-error-parent-panel)
-        (define report-error-panel 'uninitialized-report-error-panel)
-        (define report-error-canvas 'uninitialized-report-error-editor-canvas)
-        (define/override (get-definitions/interactions-panel-parent)
-          (set! report-error-parent-panel
-                (new (class panel:vertical-dragable%
-                       (inherit get-percentages)
-                       (define record-prefs? #f)
-                       (define/public (stop-recording-prefs) (set! record-prefs? #f))
-                       (define/public (start-recording-prefs) (set! record-prefs? #t))
-                       (define/augment (after-percentage-change)
-                         (define ps (get-percentages))
-                         (when (and record-prefs? (= 2 (length ps)))
-                           (preferences:set 'drracket:check-syntax-error-report-window-percentage
-                                            (list-ref ps 0)))
-                         (inner (void) after-percentage-change))
-                       (super-new))
-                     [parent (super get-definitions/interactions-panel-parent)]))
-          (set! report-error-panel (new horizontal-panel%
-                                        [parent report-error-parent-panel]
-                                        [stretchable-height #f]
-                                        [alignment '(center center)]
-                                        [style '(border)]))
-          (send report-error-parent-panel change-children (λ (l) null))
-          (let ([message-panel (new vertical-panel%
-                                    [parent report-error-panel]
-                                    [stretchable-width #f]
-                                    [stretchable-height #f]
-                                    [alignment '(left center)])])
-            (make-object message% (string-constant check-syntax) message-panel)
-            (make-object message% (string-constant cs-error-message) message-panel))
-          (set! report-error-canvas (new editor-canvas% 
-                                         (parent report-error-panel)
-                                         (editor (send (get-current-tab) get-error-report-text))
-                                         (line-count 3)
-                                         (style '(no-hscroll))))
-          (new button% 
-               [label (string-constant hide)]
-               [parent report-error-panel]
-               [callback (λ (x y) (hide-error-report))]
-               [stretchable-height #t])
-          (define res (make-object vertical-panel% report-error-parent-panel))
-          res)
-        
-        (define/public-final (syncheck:error-report-visible?)
-          (and (is-a? report-error-parent-panel area-container<%>)
-               (member report-error-panel (send report-error-parent-panel get-children))))
-        
-        (define/public-final (syncheck:get-error-report-contents)
-          (and (syncheck:error-report-visible?)
-               (send (send report-error-canvas get-editor) get-text)))
-        
-        (define/public (hide-error-report) 
-          (when (syncheck:error-report-visible?)
-            (send (get-current-tab) turn-off-error-report)
-            (send report-error-parent-panel change-children
-                  (λ (l) (remq report-error-panel l)))))
-        
-        (define/private (show-error-report)
-          (unless (syncheck:error-report-visible?)
-            (send report-error-parent-panel stop-recording-prefs)
-            (send report-error-parent-panel change-children
-                  (λ (l) (cons report-error-panel l)))
-            (let ([p (preferences:get 'drracket:check-syntax-error-report-window-percentage)])
-              (send report-error-parent-panel set-percentages 
-                    (list p (- 1 p))))
-            (send report-error-parent-panel start-recording-prefs)))
-        
-        (define rest-panel 'uninitialized-root)
-        (define super-root 'uninitialized-super-root)
-        (define/override (make-root-area-container % parent)
-          (let* ([s-root (super make-root-area-container
-                                vertical-panel%
-                                parent)]
-                 [r-root (make-object % s-root)])
-            (set! super-root s-root)
-            (set! rest-panel r-root)
-            r-root))
-                
-        (inherit open-status-line close-status-line update-status-line ensure-rep-hidden)
-        ;; syncheck:button-callback : (case-> (-> void) ((union #f syntax) -> void)
-        ;; this is the only function that has any code running on the user's thread
-        (define/public (syncheck:button-callback #:print-extra-info? [print-extra-info? #f])
-          (when (send check-syntax-button is-enabled?)
-            (open-status-line 'drracket:check-syntax:status)
-            (update-status-line 'drracket:check-syntax:status status-init)
-            (ensure-rep-hidden)
-            (define definitions-text (get-definitions-text))
-            (define interactions-text (get-interactions-text))
-            (define drs-eventspace (current-eventspace))
-            (define the-tab (get-current-tab))
-            (define-values (old-break-thread old-custodian) (send the-tab get-breakables))
-            
-            ;; set by the init-proc
-            (define expanded-expression void)
-            (define expansion-completed void)
-            (define user-custodian #f)
-            
-            (define normal-termination? #f)
-            
-            (define show-error-report/tab
-              (λ () ; =drs=
-                (send the-tab turn-on-error-report)
-                (send (send the-tab get-error-report-text) scroll-to-position 0)
-                (when (eq? (get-current-tab) the-tab)
-                  (show-error-report))))
-            (define cleanup
-              (λ () ; =drs=
-                (send the-tab set-breakables old-break-thread old-custodian)
-                (send the-tab enable-evaluation)
-                (set-syncheck-running-mode #f) 
-                (close-status-line 'drracket:check-syntax:status)
-                
-                ;; do this with some lag ... not great, but should be okay.
-                (let ([err-port (send (send the-tab get-error-report-text) get-err-port)])
-                  (thread
-                   (λ ()
-                     (flush-output err-port)
-                     (queue-callback
-                      (λ ()
-                        (unless (= 0 (send (send the-tab get-error-report-text) last-position))
-                          (show-error-report/tab)))))))))
-            (define kill-termination
-              (λ ()
-                (unless normal-termination?
-                  (parameterize ([current-eventspace drs-eventspace])
-                    (queue-callback
-                     (λ ()
-                       (send the-tab syncheck:clear-highlighting)
-                       (cleanup)
-                       (custodian-shutdown-all user-custodian)))))))
-            (define error-display-semaphore (make-semaphore 0))
-            (define uncaught-exception-raised
-              (λ () ;; =user=
-                (set! normal-termination? #t)
-                (parameterize ([current-eventspace drs-eventspace])
-                  (queue-callback
-                   (λ () ;;  =drs=
-                     (yield error-display-semaphore) ;; let error display go first
-                     (send the-tab syncheck:clear-highlighting)
-                     (cleanup)
-                     (custodian-shutdown-all user-custodian))))))
-            (define error-port (send (send the-tab get-error-report-text) get-err-port))
-            (define output-port (send (send the-tab get-error-report-text) get-out-port))
-            (define init-proc
-              (λ () ; =user=
-                (send the-tab set-breakables (current-thread) (current-custodian))
-                (set-directory definitions-text)
-                (current-load-relative-directory #f)
-                (current-error-port error-port)
-                (current-output-port output-port)
-                (error-display-handler 
-                 (λ (msg exn) ;; =user=
-                   (parameterize ([current-eventspace drs-eventspace])
-                     (queue-callback
-                      (λ () ;; =drs=
-                        
-                        ;; this has to come first or else the positioning
-                        ;; computations in the highlight-errors/exn method
-                        ;; will be wrong by the size of the error report box
-                        (show-error-report/tab)
-                        
-                        ;; a call like this one also happens in 
-                        ;; drracket:debug:error-display-handler/stacktrace
-                        ;; but that call won't happen here, because
-                        ;; the rep is not in the current-rep parameter
-                        (send interactions-text highlight-errors/exn exn))))
-                   
-                   (drracket:debug:error-display-handler/stacktrace 
-                    msg 
-                    exn 
-                    '()
-                    #:definitions-text definitions-text)
-                   
-                   (semaphore-post error-display-semaphore)))
-                
-                (error-print-source-location #f) ; need to build code to render error first
-                (uncaught-exception-handler
-                 (let ([oh (uncaught-exception-handler)])
-                   (λ (exn)
-                     (uncaught-exception-raised)
-                     (oh exn))))
-                (update-status-line 'drracket:check-syntax:status status-expanding-expression)
-                (set!-values (expanded-expression expansion-completed) 
-                             (make-traversal (current-namespace)
-                                             (current-directory)
-                                             print-extra-info?)) ;; set by set-directory above
-                (set! user-custodian (current-custodian))))
-            
-            (set-syncheck-running-mode 'button)
-            (send the-tab disable-evaluation) ;; this locks the editor, so must be outside.
-            (define definitions-text-copy 
-              (new (class text:basic%
-                     ;; overriding get-port-name like this ensures
-                     ;; that the resulting syntax objects are connected
-                     ;; to the actual definitions-text, not this copy
-                     (define/override (get-port-name)
-                       (send definitions-text get-port-name))
-                     (super-new))))
-            (define settings (send definitions-text get-next-settings))
-            (define module-language?
-              (is-a? (drracket:language-configuration:language-settings-language settings)
-                     drracket:module-language:module-language<%>))
-             ;; speeds up the copy
-            (send definitions-text-copy set-style-list (send definitions-text get-style-list))
-            (send definitions-text copy-self-to definitions-text-copy)
-            (with-lock/edit-sequence
-             definitions-text-copy
-             (λ ()
-               (send the-tab clear-annotations)
-               (send the-tab reset-offer-kill)
-               (send the-tab syncheck:clear-highlighting)
-               (send (send the-tab get-defs) syncheck:init-arrows)
-               (drracket:eval:expand-program
-                #:gui-modules? #f
-                (drracket:language:make-text/pos definitions-text-copy
-                                                 0
-                                                 (send definitions-text-copy last-position))
-                settings
-                (not module-language?)
-                init-proc
-                kill-termination
-                (λ (sexp loop) ; =user=
-                  (cond
-                    [(eof-object? sexp)
-                     (set! normal-termination? #t)
-                     (parameterize ([current-eventspace drs-eventspace])
-                       (queue-callback
-                        (λ () ; =drs=
-                          (with-lock/edit-sequence
-                           definitions-text
-                           (λ ()
-                             (parameterize ([current-annotations definitions-text])
-                               (expansion-completed))))
-                          (cleanup)
-                          (custodian-shutdown-all user-custodian))))]
-                    [else
-                     (open-status-line 'drracket:check-syntax:status)
-                     (unless module-language?
-                       (update-status-line 'drracket:check-syntax:status status-eval-compile-time)
-                       (eval-compile-time-part-of-top-level sexp))
-                     (parameterize ([current-eventspace drs-eventspace])
-                       (queue-callback
-                        (λ () ; =drs=
-                          (with-lock/edit-sequence
-                           definitions-text
-                           (λ ()
-                             (open-status-line 'drracket:check-syntax:status)
-                             (update-status-line 
-                              'drracket:check-syntax:status status-coloring-program)
-                             (parameterize ([current-annotations definitions-text])
-                               (expanded-expression sexp))
-                             (close-status-line 'drracket:check-syntax:status))))))
-                     (update-status-line 'drracket:check-syntax:status status-expanding-expression)
-                     (close-status-line 'drracket:check-syntax:status)
-                     (loop)])))))))
-
-        ;; set-directory : text -> void
-        ;; sets the current-directory based on the file saved in the definitions-text
-        (define/private (set-directory definitions-text)
-          (define tmp-b (box #f))
-          (define fn (send definitions-text get-filename tmp-b))
-          (define dir (get-init-dir (and (not (unbox tmp-b)) fn)))
-          (current-directory dir))
-        
-        ;; with-lock/edit-sequence : text (-> void) -> void
-        ;; sets and restores some state of the definitions text
-        ;; so that edits to the definitions text work out.
-        (define/private (with-lock/edit-sequence definitions-text thnk)
-          (let* ([locked? (send definitions-text is-locked?)])
-            (send definitions-text begin-edit-sequence #t #f)
-            (send definitions-text lock #f)
-            (thnk)
-            (send definitions-text end-edit-sequence)
-            (send definitions-text lock locked?)))
-                
-        (super-new)
-        
-        (define check-syntax-button
-          (new switchable-button%
-               [label (string-constant check-syntax)]
-               [bitmap syncheck-bitmap]
-               [alternate-bitmap syncheck-small-bitmap]
-               [parent (get-button-panel)]
-               [callback (λ (button) (syncheck:button-callback))]))
-        (inherit register-toolbar-button)
-        (register-toolbar-button check-syntax-button #:number 50)
-        (define/public (syncheck:get-button) check-syntax-button)
-        (update-button-visibility/tab (get-current-tab))))
-    
-    (define report-error-style (make-object style-delta% 'change-style 'italic))
-    (send report-error-style set-delta-foreground "red")
-    
-    (define (add-check-syntax-key-bindings keymap)
-      (send keymap add-function
-            "check syntax"
-            (λ (obj evt)
-              (when (is-a? obj editor<%>)
-                (let ([canvas (send obj get-canvas)])
-                  (when canvas
-                    (let ([frame (send canvas get-top-level-window)])
-                      (when (is-a? frame syncheck-frame<%>)
-                        (send frame syncheck:button-callback))))))))
-      
-      (let ([cs-callback
-             (λ (send-msg)
-               (λ (obj evt)
-                 (when (is-a? obj text%)
-                   (let ([canvas (send obj get-canvas)])
-                     (when canvas
-                       (let ([frame (send canvas get-top-level-window)])
-                         (when (is-a? frame syncheck-frame<%>)
-                           (let ([defs (send frame get-definitions-text)])
-                             (when (is-a? defs syncheck-text<%>)
-                               (send-msg defs obj))))))))))])
-        (send keymap add-function
-              (string-constant cs-jump-to-binding)
-              (cs-callback (λ (defs obj) (send defs syncheck:jump-to-binding-occurrence obj))))
-        (send keymap add-function
-              (string-constant cs-jump-to-next-bound-occurrence)
-              (cs-callback (λ (defs obj) (send defs syncheck:jump-to-next-bound-occurrence obj))))
-        (send keymap add-function
-              (string-constant cs-jump-to-previous-bound-occurrence)
-              (cs-callback (λ (defs obj) (send defs syncheck:jump-to-next-bound-occurrence obj #t))))
-        (send keymap add-function
-              (string-constant cs-jump-to-definition)
-              (cs-callback (λ (defs obj) (send defs syncheck:jump-to-definition obj))))
-        (send keymap add-function
-              (string-constant cs-rename-id)
-              (cs-callback (λ (defs obj) 
-                             (send defs syncheck:rename-identifier obj))))
-        (send keymap add-function
-              (string-constant cs-tack/untack-arrow)
-              (cs-callback (λ (defs obj) 
-                             (send defs syncheck:tack/untack-arrows obj)))))
-      
-      (send keymap map-function "f6" "check syntax")
-      (send keymap map-function "c:c;c:c" "check syntax")
-      (send keymap map-function "c:x;b" (string-constant cs-jump-to-binding))
-      (send keymap map-function "c:x;n" (string-constant cs-jump-to-next-bound-occurrence))
-      (send keymap map-function "c:x;p" (string-constant cs-jump-to-previous-bound-occurrence))
-      (send keymap map-function "c:x;d" (string-constant cs-jump-to-definition))
-      (send keymap map-function "c:x;m" (string-constant cs-rename-id))
-      (send keymap map-function "c:x;a" (string-constant cs-tack/untack-arrow))
-      
-      (send keymap add-function "show/hide blue boxes in upper-right corner"
-            (λ (txt evt)
-              (when (is-a? txt editor<%>)
-                (let loop ([ed txt])
-                  (define c (send ed get-canvas))
-                  (cond
-                    [c (let loop ([w c])
-                         (cond
-                           [(is-a? w drracket:unit:frame<%>)
-                            (send (send w get-definitions-text) toggle-syncheck-docs)]
-                           [(is-a? w area<%>)
-                            (loop (send w get-parent))]))]
-                    [else
-                     (define admin (send ed get-admin))
-                     (when (is-a? admin editor-snip-editor-admin<%>)
-                       (define admin2 (send (send admin get-snip) get-admin))
-                       (when admin2
-                         (loop (send admin2 get-editor))))])))))
-      (send keymap map-function "f2" "show/hide blue boxes in upper-right corner"))
-    
-    ;; find-syncheck-text : text% -> (union #f (is-a?/c syncheck-text<%>))
-    (define (find-syncheck-text text)
-      (let loop ([text text])
-        (cond
-          [(is-a? text syncheck-text<%>) text]
-          [else 
-           (let ([admin (send text get-admin)])
-             (and (is-a? admin editor-snip-editor-admin<%>)
-                  (let* ([enclosing-editor-snip (send admin get-snip)]
-                         [editor-snip-admin (send enclosing-editor-snip get-admin)]
-                         [enclosing-editor (send editor-snip-admin get-editor)])
-                    (loop enclosing-editor))))])))
-    ;                                                 
-    ;                                                 
-    ;                                                 
-    ;  ;    ;    ; ;                                  
-    ;  ;    ;    ;                                    
-    ;  ;   ; ;   ;                                    
-    ;   ;  ; ;  ;  ;   ; ;   ;;;       ;   ;   ; ;;   
-    ;   ;  ; ;  ;  ;   ;;   ;   ;      ;   ;   ;;  ;  
-    ;   ; ;   ; ;  ;   ;   ;    ;      ;   ;   ;    ; 
-    ;   ; ;   ; ;  ;   ;   ;;;;;;      ;   ;   ;    ; 
-    ;   ; ;   ; ;  ;   ;   ;           ;   ;   ;    ; 
-    ;    ;     ;   ;   ;    ;          ;  ;;   ;;  ;  
-    ;    ;     ;   ;   ;     ;;;;       ;; ;   ; ;;   
-    ;                                          ;      
-    ;                                          ;      
-    ;                                          ;      
-    
-    
-    (add-check-syntax-key-bindings (drracket:rep:get-drs-bindings-keymap))
-    (fw:color-prefs:add-to-preferences-panel (string-constant check-syntax)
-                                             syncheck-add-to-preferences-panel)
-    (drracket:module-language-tools:register-online-expansion-pref 
-     syncheck-add-to-online-expansion-prefs-panel)
-    (drracket:language:register-capability 'drscheme:check-syntax-button (flat-contract boolean?) #t)
-    (drracket:get/extend:extend-definitions-text make-syncheck-text%)
-    (drracket:get/extend:extend-definitions-canvas docs-editor-canvas-mixin)
-    (drracket:get/extend:extend-unit-frame unit-frame-mixin #f)
-    (drracket:get/extend:extend-tab tab-mixin)
-    
-    
-    (drracket:module-language-tools:add-online-expansion-monitor
-     online-comp.rkt
-     'monitor
-     (λ (defs-text val)
-       (define tab (send defs-text get-tab))
-       (cond
-         [(drracket:module-language-tools:start? val) (send tab set-next-trace-refresh #t)]
-         [(drracket:module-language-tools:done? val) (void)]
-         [else 
-          
-          ;; replay-state = 
-          ;;  (or/c #f                  -- no replay running
-          ;;        (box #t             -- keep running this replay
-          ;;             (listof (listof stuff))
-          ;;                            -- pick up some new elements to add to the current replay
-          ;;             #f))           -- doesn't actually get set on a tab, but this means to
-          ;;                               just stop running the replay
-          
-          
-          (when (send tab get-next-trace-refresh?)
-            (define old-replay-state (send tab get-replay-state))
-            (when (box? old-replay-state)
-              (set-box! old-replay-state #f))
-            (send tab set-replay-state #f)
-            (send tab set-next-trace-refresh #f)
-            
-            ;; reset any previous check syntax information
-            (send tab syncheck:clear-error-message)
-            (send tab syncheck:clear-highlighting)
-            (send defs-text syncheck:reset-docs-im)
-            (send tab add-bkg-running-color 'syncheck "orchid" cs-syncheck-running)
-            (send defs-text syncheck:init-arrows))
-          
-          (define current-replay-state (send tab get-replay-state))
-          (define drr-frame (send (send defs-text get-tab) get-frame))
-          (cond
-            [(not current-replay-state)
-             (define new-replay-state (box '()))
-             (send tab set-replay-state new-replay-state)
-             (send drr-frame replay-compile-comp-trace
-                   defs-text 
-                   val
-                   (box '()))]
-            [else
-             (set-box! current-replay-state 
-                       (append (unbox current-replay-state) (list val)))])])))
-    
-    (drracket:module-language-tools:add-online-expansion-handler
-     online-comp.rkt
-     'go
-     void)))
-
-(define wbs '())
-    
-(define-runtime-path online-comp.rkt "online-comp.rkt")
-
-(define (pick-next-arrow orig-arrows backwards? txt start-pos end-pos)
-  (cond
-    [(null? orig-arrows) #f]
-    [(null? (cdr orig-arrows)) (car orig-arrows)]
-    [else
-     ;; find-overlap : -> (listof arrow)
-     ;; returns a list of arrows starting with the first arrow 
-     ;; that overlaps with 'pos' or is beyond 'pos' if there are
-     ;; no overlapping arrows, and continues thru all of the
-     ;; sorted arrows (wrapping back around thru the buffer)
-     (define (find-overlap)
-       (let loop ([fst-arrow (car orig-arrows)]
-                  [rst-arrows (cdr orig-arrows)]
-                  [acc '()])
-         (cond
-           [(null? rst-arrows) (reverse (cons fst-arrow acc))]
-           [else
-            (define snd-arrow (car rst-arrows))
-            (cond
-              [(overlaps? fst-arrow)
-               (append (cons fst-arrow rst-arrows) (reverse acc))]
-              [(if backwards?
-                   (between? snd-arrow fst-arrow)
-                   (between? fst-arrow snd-arrow))
-               (append rst-arrows (reverse (cons fst-arrow acc)))]
-              [else
-               (loop snd-arrow (cdr rst-arrows) (cons fst-arrow acc))])])))
-     
-     ;; find-first-non-overlap : (listof arrow) -> arrow
-     ;; finds the first arrow in the input list that does not overlap with
-     ;; start-pos/end-pos or returns (car orig-arrows) if all overlap
-     (define (find-first-non-overlap arrows)
-       (or (for/or ([arrow (in-list arrows)])
-             (and (not (overlaps? arrow))
-                  arrow))
-           (car orig-arrows)))
-     
-     (define (overlaps? arrow)
-       (define-values (a-text a-left a-right) (apply values arrow))
-       (and (equal? a-text txt)
-            (not (or (end-pos . < . a-left)
-                     (a-right . < . start-pos)))))
-     
-     (define (between? fst-arrow snd-arrow)
-       (define-values (fa-text fa-left fa-right) (apply values fst-arrow))
-       (define-values (sa-text sa-left sa-right) (apply values snd-arrow))
-       (and (equal? fa-text sa-text)
-            (overlaps? (list fa-text fa-right sa-left))))
-     
-     (find-first-non-overlap (find-overlap))]))
-
-(module+ test 
-  (check-equal? (pick-next-arrow '() #t 'txt1 0 1) #f)
-  (check-equal? (pick-next-arrow '((a 1 2)) #t 'txt1 0 1) '(a 1 2))
-  (check-equal? (pick-next-arrow '((a 2 3) (a 10 12)) #f 'a 0 1) '(a 2 3))
-  (check-equal? (pick-next-arrow '((a 1 3) (a 10 12)) #f 'a 0 0) '(a 1 3))
-  (check-equal? (pick-next-arrow '((a 1 3) (a 10 12)) #f 'a 2 2) '(a 10 12))
-  (check-equal? (pick-next-arrow '((a 1 3) (a 10 12)) #f 'a 4 4) '(a 10 12))
-  (check-equal? (pick-next-arrow '((a 1 3) (a 10 12)) #f 'a 11 11) '(a 1 3))
-  (check-equal? (pick-next-arrow '((a 1 3) (a 10 12)) #f 'a 14 14) '(a 1 3)))
-
-;; sort-and-merge : (listof (cons number number)) -> (listof (cons number number))
-;; the result is guaranteed to be non-overlapping ranges, 
-;; sorted from smallest to largest
-(define (sort-and-merge start+ends)
-  (define sorted-positions (sort start+ends < #:key car))
-  (let loop ([positions sorted-positions])
-    (cond
-      [(null? positions) '()]
-      [(null? (cdr positions)) positions]
-      [else
-       (define fst (car positions))
-       (define snd (cadr positions))
-       (cond
-         [(<= (cdr fst) (car snd)) ;; no overlap
-          (cons fst (loop (cdr positions)))]
-         [else
-          (define merged (cons (car fst) (max (cdr fst) (cdr snd))))
-          (loop (cons merged (cddr positions)))])])))
-
-(module+ test
-  (check-equal? (sort-and-merge '()) '())
-  (check-equal? (sort-and-merge '((1 . 2))) '((1 . 2)))
-  
-  (check-equal? (sort-and-merge '((1 . 2) (10 . 11))) '((1 . 2) (10 . 11)))
-  (check-equal? (sort-and-merge '((10 . 11) (1 . 2))) '((1 . 2) (10 . 11)))
-  (check-equal? (sort-and-merge '((1 . 2) (2 . 3))) '((1 . 2) (2 . 3)))
-  (check-equal? (sort-and-merge '((2 . 3) (1 . 2))) '((1 . 2) (2 . 3)))
-  (check-equal? (sort-and-merge '((1 . 3) (2 . 4))) '((1 . 4)))
-  (check-equal? (sort-and-merge '((2 . 4) (1 . 3))) '((1 . 4)))
-  (check-equal? (sort-and-merge '((2 . 4) (3 . 11) (1 . 3))) '((1 . 11)))
-  
-  ;; both answers seem fine -- other answers, not so much
-  (check-not-false (member (sort-and-merge '((1 . 1) (1 . 1)))
-                           (list '((1 . 1) (1 . 1))
-                                 '((1 . 1) ))))
-  
-  (for ([_ (in-range 100)])
-    (define input
-      (for/list ([i (in-range 10)])
-        (define start (random 50))
-        (cons start (+ start (random 100)))))
-    (define output (sort-and-merge input))
-    (define (valid? lst)
-      (cond
-        [(null? lst) #t]
-        [(null? (cdr lst)) #t]
-        [else
-         (define fst (car lst))
-         (define snd (cadr lst))
-         (and (<= (car fst) (cdr fst) (car snd) (cdr snd))
-              (valid? (cdr lst)))]))
-    (check-true
-     (valid? output)
-     (format "~s = ~s, but invalid" `(sort-and-merge ',input) `',output))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/intf.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/intf.rkt
deleted file mode 100644
index 2028e8acb6..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/intf.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-(provide syncheck-text<%>) 
-(require racket/class 
-         drracket/private/syncheck/syncheck-intf
-         "local-member-names.rkt")
-
-(define syncheck-text<%>
-  (interface (syncheck-annotations<%>)
-    syncheck:init-arrows
-    syncheck:clear-arrows
-    syncheck:arrows-visible?
-    syncheck:get-bindings-table
-    syncheck:jump-to-next-bound-occurrence
-    syncheck:jump-to-binding-occurrence
-    syncheck:jump-to-definition
-    syncheck:rename-identifier
-    syncheck:tack/untack-arrows))
\ No newline at end of file
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/local-member-names.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/local-member-names.rkt
deleted file mode 100644
index 2040fc8824..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/local-member-names.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket/base
-(require racket/class
-         drracket/private/syncheck/syncheck-local-member-names)
-(provide (all-defined-out)
-         (all-from-out drracket/private/syncheck/syncheck-local-member-names))
-
-(define-local-member-name
-  syncheck:init-arrows
-  syncheck:clear-arrows
-  syncheck:clear-coloring
-  syncheck:arrows-visible?
-
-  syncheck:jump-to-next-bound-occurrence
-  syncheck:jump-to-binding-occurrence
-  syncheck:jump-to-definition
-  syncheck:rename-identifier
-  syncheck:tack/untack-arrows
-  
-  syncheck:clear-highlighting
-  syncheck:apply-style/remember
-  ;syncheck:error-report-visible? ;; test suite uses this one.
-  ;syncheck:get-bindings-table    ;; test suite uses this one.
-  syncheck:clear-error-message
-  
-  syncheck:find-definition-target
-  
-  jump-to
-  
-  hide-error-report
-  get-error-report-text
-  get-error-report-visible?
-  
-  turn-off-error-report
-  turn-on-error-report
-  
-  update-button-visibility/settings
-  
-  set-syncheck-mode
-  get-syncheck-mode
-  update-menu-status)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/online-comp.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/online-comp.rkt
deleted file mode 100644
index 89afe0e519..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/syncheck/online-comp.rkt
+++ /dev/null
@@ -1,111 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/place
-         racket/match
-         racket/contract
-         (for-syntax racket/base)
-         drracket/private/syncheck/traversals
-         drracket/private/syncheck/syncheck-intf
-         drracket/private/syncheck/xref
-         "../../private/eval-helpers-and-pref-init.rkt"
-         "intf.rkt"
-         "local-member-names.rkt")
-
-(provide go monitor)
-
-(define (create-rename-answerer-thread orig-cust local-chan table)
-  ;; the hope is that changing the custodian like this
-  ;; shouldn't leak these threads, but it does seem to
-  ;; so for now we don't use it
-  (parameterize (#;[current-custodian orig-cust])
-    (thread
-     (λ () 
-       (with-handlers ([exn:fail? (λ (x) (eprintf "online-comp.rkt: thread failed ~a\n"
-                                                  (exn-message x)))])
-         (let loop ()
-           (define id/name (place-channel-get local-chan))
-           (define id (list-ref id/name 0))
-           (define name (list-ref id/name 1))
-           (define res ((hash-ref table id) name))
-           (place-channel-put local-chan res)
-           (loop))))))
-  (void))
-
-(define-logger online-check-syntax)
-(define (go expanded path the-source orig-cust)
-  (define c (make-channel))
-  (unless (exn? expanded)
-    (log-message online-check-syntax-logger 'info  "" (list expanded)))
-  (log-message online-check-syntax-logger 'info  "" c)
-  ;; wait for everything to actually get sent back to the main place
-  (channel-get c))
-
-(define (build-trace stxes the-source orig-cust path)
-  (parameterize ([current-max-to-send-at-once 50])
-    (with-handlers ((exn:fail? (λ (x) 
-                                 (printf "exception noticed in online-comp.rkt\n")
-                                 (printf "~a\n" (exn-message x))
-                                 (printf "---\n")
-                                 (for ([x (in-list 
-                                           (continuation-mark-set->context 
-                                            (exn-continuation-marks
-                                             x)))])
-                                   (printf "  ~s\n" x))
-                                 (printf "===\n")
-                                 (raise x))))
-      (define obj (new build-place-chan-trace%
-                       [src the-source]
-                       [orig-cust orig-cust]))
-      (define-values (expanded-expression expansion-completed) 
-        (make-traversal (current-namespace)
-                        (get-init-dir path)))
-      (parameterize ([current-annotations obj])
-        (for ([stx (in-list stxes)])
-          (expanded-expression stx))
-        (expansion-completed))
-      (send obj get-trace))))
-
-(define build-place-chan-trace%
-  (class build-trace%
-    (inherit add-to-trace)
-    (init-field  orig-cust)
-    (define-values (remote-chan local-chan) (place-channel))
-    (define table (make-hash))
-    (create-rename-answerer-thread orig-cust local-chan table)
-    (define/override (syncheck:add-arrow/name-dup _start-text start-pos-left start-pos-right
-                                                  _end-text end-pos-left end-pos-right
-                                                  actual? level require-arrow? name-dup?)
-      (define id (hash-count table))
-      (hash-set! table id name-dup?)
-      (add-to-trace (vector 'syncheck:add-arrow/name-dup
-                            start-pos-left start-pos-right
-                            end-pos-left end-pos-right
-                            actual? level require-arrow? remote-chan id)))
-    
-    (define/override (syncheck:add-id-set to-be-renamed/poss dup-name?)
-      (define id (hash-count table))
-      (hash-set! table id dup-name?)
-      (add-to-trace (vector 'syncheck:add-id-set (map cdr to-be-renamed/poss) remote-chan id)))
-    (super-new)))
-    
-
-(define (monitor send-back path the-source orig-cust)
-  (define lr (make-log-receiver (current-logger)
-                                'info
-                                'online-check-syntax))
-  (thread
-   (λ ()
-     (let loop ()
-       (define val (sync lr))
-       (match val
-         [(vector level message obj name)
-          (cond
-            [(and (list? obj) (andmap syntax? obj))
-             (define trace (build-trace obj the-source orig-cust path))
-             (send-back trace)]
-            [(channel? obj)
-             ;; signal back to the main place that we've gotten everything
-             ;; and sent it back over
-             (channel-put obj (void))])]
-         [_ (void)])
-       (loop)))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/text.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/text.rkt
deleted file mode 100644
index ea49d9dffb..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/text.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/unit
-  (require mzlib/class
-           drracket/private/drsig
-           framework)
-  
-  (import)
-  (export drracket:text^)
-  (define text<%>
-    (interface (racket:text<%>)
-      printing-on
-      printing-off
-      is-printing-on?))
-  
-  (define text%
-    (class* racket:text% (text<%>)
-      (define printing? #f)
-      (define/public (is-printing-on?) printing?)
-      (define/public (printing-on) (set! printing? #t))
-      (define/public (printing-off) (set! printing? #f))
-      ; (rename [super-on-paint on-paint])
-      ; (inherit get-filename)
-      ; (override
-      ;  [on-paint
-      ;   (λ (before? dc left top right bottom dx dy draw-caret)
-      ;     (super-on-paint before? dc left top right bottom dx dy draw-caret)
-      ;     (let ([str (string-append
-      ;                  (mzlib:date:date->string (seconds->date (current-seconds)))
-      ;                  " "
-      ;                  (if (string? (get-filename))
-      ;                      (get-filename)
-      ;                      "Untitled"))])
-      ;        (send dc draw-text str dx dy)))])
-      (super-new)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/tool-contract-language.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/tool-contract-language.rkt
deleted file mode 100644
index d507300b7e..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/tool-contract-language.rkt
+++ /dev/null
@@ -1,136 +0,0 @@
-#lang mzscheme
-
-  (provide (rename -#%module-begin #%module-begin)
-           (all-from-except mzscheme #%module-begin))
-  
-  (require mzlib/contract)
-  (require-for-syntax mzlib/list)
-  
-  (define-syntax (-#%module-begin stx)
-    
-    (define-struct ctc-binding (var arg))
-    (define-struct def-binding (var arg))
-    
-    (define (process-case case-stx)
-      (syntax-case case-stx (define)
-        [(define name expr)
-         (identifier? (syntax name))
-         (make-def-binding (syntax name) (syntax expr))]
-        [(name type type-names strs ...)
-         (and (identifier? (syntax name))
-              (not (string? (syntax-object->datum (syntax type))))
-              (andmap (λ (x) (string? (syntax-object->datum x))) (syntax->list (syntax (strs ...)))))
-         (make-ctc-binding (syntax name) (syntax type))]
-        [else (raise-syntax-error 'tool-contract-language.rkt "unknown case" stx case-stx)]))
-    
-    
-    (syntax-case stx ()
-      [(_ cases ...)
-       (let* ([pcases (map process-case (syntax->list (syntax (cases ...))))]
-              [def-cases (filter def-binding? pcases)]
-              [ctc-cases (filter ctc-binding? pcases)])
-         (with-syntax ([(ctc-name ...) (map ctc-binding-var ctc-cases)]
-                       [(ctc ...) (map ctc-binding-arg ctc-cases)]
-                       [(def-name ...) (map def-binding-var def-cases)]
-                       [(def-exp ...) (map def-binding-arg def-cases)]
-                       [wrap-tool-inputs (datum->syntax-object stx 'wrap-tool-inputs #'here)])
-           (syntax/loc stx
-             (#%module-begin
-              (provide wrap-tool-inputs)
-              (define-syntax wrap-tool-inputs
-                (λ (in-stx)
-                  (syntax-case in-stx ()
-                    [(_ body tool-name)
-                     (let ([f (λ (in-obj) 
-                                (datum->syntax-object 
-                                 in-stx
-                                 (syntax-object->datum in-obj)
-                                 in-obj))])
-                       (with-syntax ([(in-type (... ...)) (map f (syntax->list (syntax (ctc ...))))]
-                                     [(in-name (... ...)) (map f (syntax->list (syntax (ctc-name ...))))]
-                                     [(in-def-name (... ...)) (map f (syntax->list (syntax (def-name ...))))]
-                                     [(in-def-exp (... ...)) (map f (syntax->list (syntax (def-exp ...))))])
-                         (syntax/loc in-stx
-                           (let ([in-def-name in-def-exp] (... ...))
-                             (let ([in-name (contract (let ([in-name in-type]) in-name)
-                                                      in-name
-                                                      'drscheme
-                                                      tool-name
-                                                      (quote-syntax in-name))] (... ...))
-                               body)))))])))))))]
-      [(_ (name type type-names strs ...) ...)
-       (begin
-         (for-each
-          (λ (str-stx)
-            (when (string? (syntax-object->datum str-stx))
-              (raise-syntax-error 'tool-contract-language.rkt "expected type name specification"
-                                  stx
-                                  str-stx)))
-          (syntax->list (syntax (type-names ...))))
-         (for-each
-          (λ (name)
-            (unless (identifier? name)
-              (raise-syntax-error 'tool-contract-language.rkt "expected identifier" stx name)))
-          (syntax->list (syntax (name ...))))
-         (for-each
-          (λ (str)
-            (unless (string? (syntax-object->datum str))
-              (raise-syntax-error 'tool-contract-language.rkt "expected docs string" stx str)))
-          (apply append (map syntax->list (syntax->list (syntax ((strs ...) ...)))))))]))
-  
-  (define-syntax (-#%module-begin2 stx)
-    (syntax-case stx ()
-      [(_ (name type type-names strs ...) ...)
-       (and (andmap identifier? (syntax->list (syntax (name ...))))
-            (andmap (λ (x) (not (string? (syntax-object->datum x))))
-                    (syntax->list (syntax (type-names ...))))
-            (andmap (λ (x) (string? (syntax-object->datum x)))
-                    (apply append (map syntax->list (syntax->list (syntax ((strs ...) ...)))))))
-       (with-syntax ([wrap-tool-inputs (datum->syntax-object stx 'wrap-tool-inputs #'here)])
-         (syntax/loc stx
-           (#%module-begin
-            (provide wrap-tool-inputs)
-            (define-syntax wrap-tool-inputs
-              (λ (in-stx)
-                (syntax-case in-stx ()
-                  [(_ body tool-name)
-                   (with-syntax ([(in-type (... ...))
-                                  (map (λ (in-type-obj) 
-                                         (datum->syntax-object 
-                                          in-stx
-                                          (syntax-object->datum in-type-obj)
-                                          in-type-obj))
-                                       (syntax->list (syntax (type ...))))]
-                                 [(in-name (... ...))
-                                  (map (λ (in-name-obj) 
-                                         (datum->syntax-object 
-                                          in-stx 
-                                          (syntax-object->datum in-name-obj)
-                                          in-name-obj))
-                                       (syntax->list (syntax (name ...))))])
-                     (syntax/loc in-stx
-                       (let ([in-name (contract (let ([in-name in-type]) in-name)
-                                                in-name
-                                                'drscheme
-                                                tool-name
-                                                (quote-syntax in-name))] (... ...))
-                         body)))]))))))]
-      [(_ (name type type-names strs ...) ...)
-       (begin
-         (for-each
-          (λ (str-stx)
-            (when (string? (syntax-object->datum str-stx))
-              (raise-syntax-error 'tool-contract-language.rkt "expected type name specification"
-                                  stx
-                                  str-stx)))
-          (syntax->list (syntax (type-names ...))))
-         (for-each
-          (λ (name)
-            (unless (identifier? name)
-              (raise-syntax-error 'tool-contract-language.rkt "expected identifier" stx name)))
-          (syntax->list (syntax (name ...))))
-         (for-each
-          (λ (str)
-            (unless (string? (syntax-object->datum str))
-              (raise-syntax-error 'tool-contract-language.rkt "expected docs string" stx str)))
-          (apply append (map syntax->list (syntax->list (syntax ((strs ...) ...)))))))]))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/tools-drs.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/tools-drs.rkt
deleted file mode 100644
index ebcafcdfba..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/tools-drs.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang racket/unit
-
-#|
-
-This file sets up the right lexical environment to
-invoke the tools that want to use the drscheme: names.
-
-|#
-
-(require racket/class
-         racket/list
-         racket/runtime-path
-         racket/contract
-         racket/struct-info
-         setup/getinfo
-         mred
-         framework
-         framework/splash
-         drracket/private/drsig
-         "language-object-contract.rkt"
-         "wrap-tool-inputs.rkt"
-         mrlib/switchable-button
-         string-constants
-         net/url)
-
-(import [prefix drscheme:frame: drracket:frame^]
-        [prefix drscheme:unit: drracket:unit^]
-        [prefix drscheme:rep: drracket:rep^]
-        [prefix drscheme:get/extend: drracket:get/extend^]
-        [prefix drscheme:language: drracket:language^]
-        [prefix drscheme:language-configuration: drracket:language-configuration^]
-        [prefix drscheme:help-desk: drracket:help-desk^]
-        [prefix drscheme:init: drracket:init^]
-        [prefix drscheme:debug: drracket:debug^]
-        [prefix drscheme:eval: drracket:eval^]
-        [prefix drscheme:modes: drracket:modes^]
-        [prefix drscheme:tracing: drracket:tracing^]
-        [prefix drscheme:module-language: drracket:module-language^]
-        [prefix drscheme:module-language-tools: drracket:module-language-tools^]
-        [prefix drscheme: drracket:interface^])
-(export drracket:tools-drs^)
-
-
-
-;; these two definitions are a hack. They give bindings for the drracket: based names that
-;; appear in the source of language-object-contract.rkt.
-(define (drracket:language:capability-registered? . args)
-  (apply drscheme:language:capability-registered? args))
-(define (drracket:language:get-capability-contract . args)
-  (apply drscheme:language:get-capability-contract args))
-
-;; invoke-drs-tool : unit/sig string -> (values (-> void) (-> void))
-;; invokes the tools and returns the two phase thunks.
-;; this is the same as the invoke-tool function in tools.rkt, but 
-;; supplies names prefixed with `drscheme:'
-(define (invoke-drs-tool unit tool-name)
-  (define-unit-binding unit@ unit (import drscheme:tool^) (export drracket:tool-exports^))
-  (language-object-abstraction drscheme:language:object/c #f)
-  (wrap-tool-inputs 
-   (let ()
-     (define-values/invoke-unit unit@
-       (import drscheme:tool^) (export drracket:tool-exports^))
-     (values phase1 phase2))
-   tool-name
-   #t))
-
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/tools.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/tools.rkt
deleted file mode 100644
index f7e9a7c404..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/tools.rkt
+++ /dev/null
@@ -1,583 +0,0 @@
-#lang racket/unit
-
-(require racket/class
-         racket/list
-         racket/runtime-path
-         racket/contract
-         racket/struct-info
-         setup/getinfo
-         mred
-         framework
-         framework/splash
-         drracket/private/drsig
-         "language-object-contract.rkt"
-         "wrap-tool-inputs.rkt"
-         mrlib/switchable-button
-         net/url
-         string-constants)
-
-(import [prefix drracket:frame: drracket:frame^]
-        [prefix drracket:unit: drracket:unit^]
-        [prefix drracket:rep: drracket:rep^]
-        [prefix drracket:get/extend: drracket:get/extend^]
-        [prefix drracket:language: drracket:language^]
-        [prefix drracket:language-configuration: drracket:language-configuration^]
-        [prefix drracket:help-desk: drracket:help-desk^]
-        [prefix drracket:init: drracket:init^]
-        [prefix drracket:debug: drracket:debug^]
-        [prefix drracket:eval: drracket:eval^]
-        [prefix drracket:modes: drracket:modes^]
-        [prefix drracket:tracing: drracket:tracing^]
-        [prefix drracket:module-language: drracket:module-language^]
-        [prefix drracket:module-language-tools: drracket:module-language-tools/int^]
-        [prefix drracket:tools-drs: drracket:tools-drs^]
-        [prefix drracket: drracket:interface^])
-(export drracket:tools^)
-
-;; An installed-tool is
-;; (make-installed-tool directory-record module-spec string/#f string/#f string/#f string/#f boolean)
-(define-struct installed-tool (dir spec bitmap name url drracket?) #:transparent)
-
-;; installed-tools : (list-of installed-tool)
-(define installed-tools null)
-
-;; candidate-tools : (listof installed-tool)
-(define candidate-tools null)
-
-;; successfully-loaded-tool = 
-;; (make-successfully-loaded-tool 
-;;    module-spec (union #f (instanceof bitmap%)) (union #f string) (union #f string)
-;;    (-> void) (-> void))
-(define-struct successfully-loaded-tool (spec bitmap name url phase1 phase2))
-
-;; successfully-loaded-tools : (listof successfully-loaded-tool)
-;; this list contains the tools that successfully were loaded
-;; it is updated in load/invoke-tool. 
-(define successfully-loaded-tools null)
-
-;; successful-tool = (make-successful-tool module-spec 
-;;                                         (union #f (instanceof bitmap%))
-;;                                         (union #f string)
-;;                                         (union #f string))
-(define-struct successful-tool (spec bitmap name url))
-
-;; successful-tools : (listof successful-tool)
-(define successful-tools null)
-
-;; get-successful-tools : -> (listof successful-tool)
-(define (get-successful-tools) successful-tools)
-
-;; load/invoke-all-tools : -> void
-(define (load/invoke-all-tools phase1-extras phase2-extras)
-  (rescan-installed-tools!)
-  (set! current-phase 'loading-tools)
-  (set! candidate-tools (filter candidate-tool? installed-tools))
-  (for-each load/invoke-tool candidate-tools)
-  (run-phases phase1-extras phase2-extras))
-
-;; rescan-installed-tools! : -> void
-(define (rescan-installed-tools!)
-  (set! installed-tools (all-installed-tools)))
-
-;; all-installed-tools : -> (list-of installed-tool)
-(define (all-installed-tools)
-  (apply append
-         (map installed-tools-for-directory
-              (all-tool-directories))))
-
-;; all-tool-directories : -> (list-of directory-record)
-(define (all-tool-directories)
-  (find-relevant-directory-records
-   '(drracket-tools drracket-tool-icons drracket-tool-names drracket-tool-urls
-     tools tool-icons tool-names tool-urls)))
-
-;; installed-tools-for-directory : directory-record -> (list-of installed-tool)
-(define (installed-tools-for-directory coll-dir)
-  (append (installed-tools-for-directory/keys coll-dir 'tools 'tool-icons 'tool-names 'tool-urls #f)
-          (installed-tools-for-directory/keys coll-dir 'drracket-tools 'drracket-tool-icons 'drracket-tool-names 'drracket-tool-urls #t)))
-
-;; installed-tools-for-directory/keys : directory-record symbol symbol symbol symbol boolean -> (list-of installed-tool)
-(define (installed-tools-for-directory/keys coll-dir tools-key tool-icons-key tool-names-key tool-urls-key drracket-tool?)
-  (let ([table (with-handlers ((exn:fail? values))
-                 (get-info/full (directory-record-path coll-dir)))])
-    (cond
-      [(not table)
-       null]
-      [(exn? table)
-       (message-box (string-constant drscheme)
-                    (format (string-constant error-loading-tool-title)
-                            (directory-record-path coll-dir)
-                            (let ([sp (open-output-string)])
-                              (parameterize ([current-error-port sp]
-                                             [current-error-port sp])
-                                (drracket:init:original-error-display-handler (exn-message table) table))
-                              (get-output-string sp)))
-                    #f
-                    '(ok stop))
-       null]
-      [else
-       (let* ([tools (table tools-key (lambda () null))]
-              [tool-icons (table tool-icons-key (lambda () (map (lambda (x) #f) tools)))]
-              [tool-names (table tool-names-key (lambda () (map (lambda (x) #f) tools)))]
-              [tool-urls (table tool-urls-key (lambda () (map (lambda (x) #f) tools)))])
-         (unless (= (length tools) (length tool-icons))
-           (message-box (string-constant drscheme)
-                        (format (string-constant tool-tool-icons-same-length)
-                                coll-dir tools tool-icons)
-                        #f
-                        '(ok stop))
-           (set! tool-icons (map (lambda (x) #f) tools)))
-         (unless (= (length tools) (length tool-names))
-           (message-box (string-constant drscheme)
-                        (format (string-constant tool-tool-names-same-length)
-                                coll-dir tools tool-names)
-                        #f
-                        '(ok stop))
-           (set! tool-names (map (lambda (x) #f) tools)))
-         (unless (= (length tools) (length tool-urls))
-           (message-box (string-constant drscheme)
-                        (format (string-constant tool-tool-urls-same-length)
-                                coll-dir tools tool-urls)
-                        #f
-                        '(ok stop))
-           (set! tool-urls (map (lambda (x) #f) tools)))
-         (map (lambda (t i n u) (make-installed-tool coll-dir t i n u drracket-tool?))
-              tools tool-icons tool-names tool-urls))])))
-
-;; candidate-tool? : installed-tool -> boolean
-;; Predicate for tools selected for execution in this
-;; run of DrRacket (depending on env variables and preferences)
-(define candidate-tool?
-  (cond
-    [(getenv "PLTNOTOOLS")
-     (printf "PLTNOTOOLS: skipping tools\n") (flush-output)
-     (lambda (it) #f)]
-    [(getenv "PLTONLYTOOL")
-     => (lambda (onlys)
-          (let* ([allowed (let ([exp (read (open-input-string onlys))])
-                            (cond 
-                             [(symbol? exp) (list exp)]
-                             [(pair? exp) exp]
-                             [else '()]))]
-                 [directory-ok? (lambda (x) 
-                                  (let-values ([(base name dir) (split-path x)])
-                                    (memq (string->symbol (path->string name))
-                                          allowed)))])
-            (printf "PLTONLYTOOL: only loading ~s\n" allowed) (flush-output)
-            (lambda (it)
-              (directory-ok?
-               (directory-record-path
-                (installed-tool-dir it))))))]
-    [else
-     (lambda (it)
-       (eq? (or (get-tool-configuration it)
-                (default-tool-configuration it))
-            'load))]))
-
-;; get-tool-configuration : installed-tool -> symbol/#f
-;; Get tool configuration preference or #f if no preference set.
-(define (get-tool-configuration it)
-  (let ([p (assoc (installed-tool->key it) (toolspref))])
-    (and p (cadr p))))
-
-;; default-tool-configuration : installed-tool -> (union 'load 'skip)
-(define (default-tool-configuration it)
-  (preferences:get 'drracket:default-tools-configuration))
-
-(define toolspref
-  (case-lambda
-    [() (preferences:get 'drracket:tools-configuration)]
-    [(v) (preferences:set 'drracket:tools-configuration v)]))
-
-(define (installed-tool->key it)
-  (list (directory-record-spec (installed-tool-dir it))
-        (installed-tool-spec it)))
-
-(define (installed-tool-full-path it)
-  (apply build-path
-         (directory-record-path (installed-tool-dir it))
-         (let ([path-parts (installed-tool-spec it)])
-           (cond [(list? path-parts)
-                  (append (cdr path-parts) (list (car path-parts)))]
-                 [else (list path-parts)]))))
-
-(define (installed-tool->module-spec it)
-  (let* ([dirrec (installed-tool-dir it)]
-         [key (directory-record-spec dirrec)]
-         [maj (directory-record-maj dirrec)]
-         [min (directory-record-min dirrec)]
-         [parts (let ([parts0 (installed-tool-spec it)])
-                  (if (list? parts0)
-                      parts0
-                      (list parts0)))]
-         [file (car parts)]
-         [rest-parts (cdr parts)])
-    (case (car key)
-      ((lib)
-       `(lib ,(string-append
-               (apply string-append
-                      (map (lambda (s)
-                             (string-append s "/"))
-                           (append (cdr key) rest-parts)))
-               file)))
-      ((planet)
-       `(planet ,file (,@(cdr key) ,maj ,min) ,@rest-parts)))))
-
-;; installed-tool-is-loaded : installed-tool -> boolean
-(define (installed-tool-is-loaded? it)
-  (let ([path (installed-tool-full-path it)])
-    (ormap (lambda (st) (equal? path (successful-tool-spec st)))
-           (get-successful-tools))))
-
-
-;                                                                                        
-;                                                                                        
-;                                                                                        
-;  ;;;;                        ;;;;  ;;  ;;                             ;;;;             
-;  ;;;;                        ;;;;  ;;  ;;                             ;;;;             
-;  ;;;;   ;;;;   ;;;;;;;    ;;;;;;;  ;;     ;;;; ;;;  ;;;  ;;;   ;;;;   ;;;; ;;;   ;;;   
-;  ;;;;  ;;;;;;  ;;;;;;;;  ;;;;;;;;  ;;;;;; ;;;;;;;;; ;;;  ;;;  ;;;;;;  ;;;; ;;;  ;;;;;  
-;  ;;;; ;;;;;;;;     ;;;; ;;;;;;;;;  ;;;;;; ;;;; ;;;;  ;;;;;;  ;;;;;;;; ;;;;;;;  ;;;; ;; 
-;  ;;;; ;;;; ;;;  ;;;;;;; ;;;; ;;;; ;; ;;;; ;;;; ;;;;  ;;;;;;  ;;;; ;;; ;;;;;;;  ;;;;;;; 
-;  ;;;; ;;;;;;;; ;;  ;;;; ;;;;;;;;; ;; ;;;; ;;;; ;;;;  ;;;;;;  ;;;;;;;; ;;;; ;;; ;;;;;   
-;  ;;;;  ;;;;;;  ;;;;;;;;  ;;;;;;;; ;; ;;;; ;;;; ;;;;   ;;;;    ;;;;;;  ;;;; ;;;  ;;;;;; 
-;  ;;;;   ;;;;    ;; ;;;;   ;;;;;;; ;; ;;;; ;;;; ;;;;   ;;;;     ;;;;   ;;;; ;;;   ;;;;  
-;                                   ;;                                                   
-;                                                                                        
-;                                                                                        
-
-
-
-;; load/invoke-tool : installed-tool -> void
-(define (load/invoke-tool it)
-  (load/invoke-tool* (directory-record-path (installed-tool-dir it))
-                     (installed-tool-spec it)
-                     (installed-tool-bitmap it)
-                     (installed-tool-name it)
-                     (installed-tool-url it)
-                     (installed-tool-drracket? it)))
-
-;; load/invoke-tool* :   path
-;;                       (listof string[sub-collection-name]) 
-;;                       (union #f (cons string[filename] (listof string[collection-name])))
-;;                       (union #f string)
-;;                       (union #f string)
-;;                       boolean
-;;                    -> void
-;; `coll' is a collection to load the tool from
-;; `in-path' is the `coll'-relative collection-path spec for the tool module file
-;; `icon-spec' is the collection-path spec for the tool's icon, if there is one.
-;; `name' is the name of the tool (only used in about box)
-(define (load/invoke-tool* coll-dir in-path icon-spec name tool-url drracket?)
-  (let* ([icon-path 
-          (cond
-            [(string? icon-spec)
-             (build-path coll-dir icon-spec)]
-            [(and (list? icon-spec)
-                  (andmap string? icon-spec))
-             (apply collection-file-path icon-spec)]
-            [else #f])]
-         [tool-bitmap
-          (and icon-path
-               (install-tool-bitmap name icon-path))])
-    (let/ec k
-      (unless (or (string? in-path)
-                  (and (list? in-path)
-                       (not (null? in-path))
-                       (andmap string? in-path)))
-        (message-box (string-constant drscheme)
-                     (format (string-constant invalid-tool-spec)
-                             coll-dir in-path)
-                     #f
-                     '(ok stop))
-        (k (void)))
-      (let* ([tool-path
-              (if (string? in-path) 
-                  (build-path coll-dir in-path)
-                  (apply build-path coll-dir (append (cdr in-path) (list (car in-path)))))]
-             [unit 
-               (with-handlers ([exn:fail? 
-                                (lambda (x)
-                                  (show-error
-                                   (format (string-constant error-invoking-tool-title)
-                                           coll-dir in-path)
-                                   x)
-                                  (k (void)))])
-                 (dynamic-require tool-path 'tool@))])
-        (with-handlers ([exn:fail? 
-                         (lambda (x)
-                           (show-error 
-                            (format (string-constant error-invoking-tool-title)
-                                    coll-dir in-path)
-                            x))])
-          (let-values ([(phase1-thunk phase2-thunk) 
-                        (if drracket?
-                            (invoke-tool unit (string->symbol (or name (path->string coll-dir))))
-                            (drracket:tools-drs:invoke-drs-tool unit (string->symbol (or name (path->string coll-dir)))))])
-            (set! successfully-loaded-tools 
-                  (cons (make-successfully-loaded-tool
-                         tool-path
-                         tool-bitmap
-                         name
-                         tool-url 
-                         phase1-thunk
-                         phase2-thunk)
-                        successfully-loaded-tools))))))))
-
-;; invoke-tool : unit/sig string -> (values (-> void) (-> void))
-;; invokes the tools and returns the two phase thunks.
-(define (invoke-tool unit tool-name)
-  (define-unit-binding unit@ unit (import drracket:tool^) (export drracket:tool-exports^))
-  (language-object-abstraction drracket:language:object/c #f)
-  (wrap-tool-inputs 
-   (let ()
-     (define-values/invoke-unit unit@
-       (import drracket:tool^) (export drracket:tool-exports^))
-     (values phase1 phase2))
-   tool-name
-   #f))
-
-;; show-error : string (union exn TST) -> void
-(define (show-error title x)
-  (parameterize ([drracket:init:error-display-handler-message-box-title
-                  title])
-    ((error-display-handler)
-     (if (exn? x)
-         (format "~a\n\n~a" title (exn-message x))
-         (format "~a\n\nuncaught exception: ~s" title x))
-     x)))
-
-
-;; install-tool-bitmap : string path -> bitmap
-;; adds the tool's bitmap to the splash screen
-(define (install-tool-bitmap name bitmap-path)
-  (let/ec k
-    (let ([bitmap
-           (with-handlers ([exn:fail:filesystem? (lambda (x) (k (void)))])
-             (read-bitmap bitmap-path #:try-@2x? #t))])
-      (unless (and (is-a? bitmap bitmap%)
-                   (send bitmap ok?))
-        (k #f))
-      (let ([splash-eventspace (get-splash-eventspace)]
-            [splash-canvas (get-splash-canvas)]
-            [splash-width (get-splash-width)]
-            [splash-height (get-splash-height)])
-        
-        (unless (and (eventspace? splash-eventspace)
-                     (is-a? splash-canvas canvas%))
-          (k (void)))
-        
-        (parameterize ([current-eventspace splash-eventspace])
-          (queue-callback
-           (lambda ()
-             (let ([bdc (make-object bitmap-dc%)]
-                   [translated-tool-bitmap-y 
-                    (max 0 (- splash-height tool-bitmap-y tool-bitmap-size))])
-               
-               ;; add the bitmap, but centered at its position
-               ;; (used to truncate the bitmap
-               ;; if it was too large, but no longer)
-               ((dynamic-require 'framework/splash 'add-splash-icon)
-                bitmap
-                (floor (+ tool-bitmap-x
-                          (- (/ tool-bitmap-size 2)
-                             (/ (send bitmap get-width) 2))))
-                (floor (+ translated-tool-bitmap-y
-                          (- (/ tool-bitmap-size 2)
-                             (/ (send bitmap get-height) 2)))))
-               
-               (set! tool-bitmap-x (+ tool-bitmap-x tool-bitmap-size tool-bitmap-gap))
-               (when ((+ tool-bitmap-x tool-bitmap-gap tool-bitmap-size) . > . splash-width)
-                 (set! tool-bitmap-y (+ tool-bitmap-y tool-bitmap-size tool-bitmap-gap))
-                 (set! tool-bitmap-x tool-bitmap-gap))
-               (when ((+ tool-bitmap-y tool-bitmap-gap tool-bitmap-size) . > . splash-width)
-                 (set! tool-bitmap-y tool-bitmap-gap)))))))
-      bitmap)))
-
-(define tool-bitmap-gap 3)
-(define tool-bitmap-x tool-bitmap-gap)
-(define tool-bitmap-y tool-bitmap-gap)
-(define tool-bitmap-size 32)
-
-;     
-;     
-;            ;;                             ;                          ;;;  
-;             ;                           ;;;            ;;;          ;   ; 
-;             ;                             ;           ;  ;          ;   ; 
-;     ; ;;;   ; ;;   ;;;;    ;;;    ;;;     ;           ;             ;   ; 
-;      ;   ;  ;;  ;      ;  ;   ;  ;   ;    ;            ;   ;           ;  
-;      ;   ;  ;   ;   ;;;;   ;;;   ;;;;;    ;           ;;; ;           ;   
-;      ;   ;  ;   ;  ;   ;      ;  ;        ;          ;   ;           ;    
-;      ;   ;  ;   ;  ;   ;  ;   ;  ;   ;    ;          ;   ;;         ;   ; 
-;      ;;;;  ;;; ;;;  ;;; ;  ;;;    ;;;   ;;;;;         ;;;  ;        ;;;;; 
-;      ;                                                                    
-;      ;                                                                    
-;     ;;;                                                                   
-;       
-
-;; run-phases : -> void
-(define (run-phases phase1-extras phase2-extras)
-  (drracket:module-language-tools:no-more-online-expansion-handlers)
-  (let* ([after-phase1 (run-one-phase 'phase1
-                                      (string-constant tool-error-phase1)
-                                      successfully-loaded-tool-phase1
-                                      successfully-loaded-tools
-                                      phase1-extras)]
-         [after-phase2 (run-one-phase 'phase2
-                                      (string-constant tool-error-phase2)
-                                      successfully-loaded-tool-phase2
-                                      after-phase1
-                                      phase2-extras)])
-    (set! current-phase 'init-complete)
-    (set! successful-tools
-          (map (lambda (x) (make-successful-tool
-                            (successfully-loaded-tool-spec x)
-                            (successfully-loaded-tool-bitmap x)
-                            (successfully-loaded-tool-name x)
-                            (successfully-loaded-tool-url x)))
-               after-phase2))))
-
-;; run-one-phase : string 
-;;                 (successfully-loaded-tool -> (-> void))
-;;                 (listof successfully-loaded-tool)
-;;                 (-> void)
-;;              -> (listof successfully-loaded-tool)
-;; filters out the tools that raise exceptions during the phase.
-;; extras is the thunk for DrRacket init stuff on this phase.
-(define (run-one-phase _the-phase err-fmt selector tools extras)
-  (set! current-phase _the-phase)
-  (extras)
-  (let loop ([tools tools])
-    (cond
-      [(null? tools) null]
-      [else 
-       (let ([tool (car tools)])
-         (let ([phase-thunk (selector tool)])
-           (with-handlers ([exn:fail?
-                            (lambda (exn) 
-                              (show-error
-                               (format err-fmt 
-                                       (successfully-loaded-tool-spec tool)
-                                       (successfully-loaded-tool-name tool))
-                               exn)
-                              (loop (cdr tools)))])
-             (phase-thunk)
-             (cons tool (loop (cdr tools))))))])))
-
-;; current-phase : (union #f 'loading-tools 'phase1 'phase2 'init-complete)
-(define current-phase #f)
-(define (get-current-phase) current-phase)
-
-;; only-in-phase : sym (union #f 'loading-tools 'phase1 'phase2 'init-complete) ... -> void
-;; raises an error unless one of `phases' is the current phase
-(define (only-in-phase func . phases)
-  (unless (memq current-phase phases)
-    (error func "can only be called in phase: ~a"
-           (apply string-append 
-                  (map (lambda (x) (format "~e " x))
-                       (filter (lambda (x) x) phases))))))
-
-;; Preferences GUI
-
-(define load-action "Load the tool")
-(define skip-action "Skip the tool")
-
-(define (add-prefs-panel)
-  (preferences:add-panel
-   "Tools"
-   (lambda (parent)
-     (define main (new vertical-panel% (parent parent)))
-     (define advisory
-       (new message%
-            (parent main)
-            (label "Changes to tool configuration will take effect the next time you start DrRacket.")))
-     (define listing
-       (new list-box%
-            (parent main)
-            (label "Installed tools")
-            (choices null)
-            (callback (lambda _ (on-select-tool)))))
-     (define info
-       (new vertical-panel%
-            (parent main)
-            (style '(border))
-            (stretchable-height #f)))
-     (define location
-       (new text-field%
-            (parent info)
-            (label "Tool: ")))
-     (define location-editor (send location get-editor))
-     (define configuration
-       (new radio-box%
-            (label "Load the tool when DrRacket starts?")
-            (parent info)
-            (choices (list load-action skip-action #| default-action |#))
-            (callback (lambda _ (on-select-policy)))))
-
-     (define (populate-listing!)
-       (send listing clear)
-       (for-each
-        (lambda (entry+it)
-          (send listing append
-                (car entry+it)
-                (cdr entry+it)))
-        (sort (map (lambda (it) (cons (tool-list-entry it) it))
-                   installed-tools)
-              (lambda (a b)
-                (string<? (car a) (car b))))))
-     (define (tool-list-entry it)
-       (let ([name (or (installed-tool-name it)
-                       (format "unnamed tool ~a"
-                               (installed-tool->module-spec it)))])
-         (cond [(installed-tool-is-loaded? it)
-                (string-append name " (loaded)")]
-               [(not (memq it candidate-tools))
-                (string-append name " (skipped)")]
-               [else
-                (string-append name " (failed to load)")])))
-     (define (on-select-tool)
-       (let ([it (get-selected-tool)])
-         (send* location-editor
-           (begin-edit-sequence)
-           (lock #f)
-           (erase)
-           (insert
-            (if it
-                (format "~s" (installed-tool->module-spec it))
-                ""))
-           (lock #t)
-           (end-edit-sequence))
-         (send configuration set-selection
-               (case (and it (get-tool-configuration it))
-                 ((load) 0)
-                 ((skip) 1)
-                 ((#f) 0))) ;; XXX (or 2, if default is an option)
-         (send configuration enable (and it #t))
-         (void)))
-     (define (on-select-policy)
-       (let ([it (get-selected-tool)]
-             [policy
-              (case (send configuration get-selection)
-                ((0) 'load)
-                ((1) 'skip))])
-         (when it
-           (let ([key (installed-tool->key it)])
-             (case policy
-               ((load)
-                (toolspref (cons (list key 'load)
-                                 (let ([ts (toolspref)])
-                                   (remove (assoc key ts) ts)))))
-               ((skip)
-                (toolspref (cons (list key 'skip)
-                                 (let ([ts (toolspref)])
-                                   (remove (assoc key ts) ts)))))
-               ((#f)
-                (toolspref (let ([ts (toolspref)])
-                             (remove (assoc key ts) ts))))))))
-       (void))
-     (define (get-selected-tool)
-       (let ([index (send listing get-selection)])
-         (and index (send listing get-data index))))
-     (populate-listing!)
-     (send location-editor lock #t)
-     main)))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/tooltip.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/tooltip.rkt
deleted file mode 100644
index dfd7e25d48..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/tooltip.rkt
+++ /dev/null
@@ -1,240 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class)
-
-(provide tooltip-frame%)
-
-(define tooltip-frame%
-  (class frame%
-    (inherit reflow-container move get-width get-height is-shown?)
-    
-    (init-field [frame-to-track #f])
-    (define timer
-      (and frame-to-track
-           (new timer%
-                [notify-callback
-                 (λ ()
-                   (unless (send frame-to-track is-shown?)
-                     (show #f)
-                     (send timer stop)))])))
-    
-    
-    (define/override (on-subwindow-event r evt)
-      (and (is-shown?)
-           (begin (show #f)
-                  #t)))
-    
-    ;; ls may contain strings that have newlines; break up the strings here
-    (define/public (set-tooltip ls)
-      (define broken-up-lines
-        (apply
-         append
-         (for/list ([str (in-list ls)])
-           (strings->strings+spacers (regexp-split #rx"\n" str)))))
-      (send yellow-message set-lab broken-up-lines))
-    
-    (define/override (show on?)
-      (when timer
-        (cond
-          [on? (send timer start 200 #f)]
-          [else (send timer stop)]))
-      (super show on?))
-    
-    (define/public (show-over x y w h #:prefer-upper-left? [prefer-upper-left? #f])
-      (reflow-container)
-      (define mw (get-width))
-      (define mh (get-height))
-      (define (upper-left must?)
-        (define the-x (- x mw))
-        (define the-y (- y mh))
-        (if must?
-            (move the-x the-y)
-            (try-moving-to the-x the-y mw mh)))
-      (define (lower-right must?)
-        (define the-x (+ x w))
-        (define the-y (+ y h))
-        (if must?
-            (move the-x the-y)
-            (try-moving-to the-x the-y mw mh)))
-      (if prefer-upper-left?
-          (or (upper-left #t) (lower-right #f) (upper-left #t))
-          (or (lower-right #t) (upper-left #f) (lower-right #t)))
-      (show #t))
-    
-    (define/private (try-moving-to x y w h)
-      (and (for/or ([m (in-range 0 (get-display-count))])
-             (define-values (mx my) (get-display-left-top-inset #:monitor m))
-             (define-values (mw mh) (get-display-size #:monitor m))
-             (and (<= (- mx) x (+ x w) (+ (- mx) mw))
-                  (<= (- my) y (+ y h) (+ (- my) mh))))
-           (begin (move x y)
-                  #t)))
-
-    (super-new [style '(no-resize-border no-caption float)]
-               [label ""]
-               [stretchable-width #f]
-               [stretchable-height #f])
-    (define yellow-message (new yellow-message% [parent this]))))
-
-(define yellow-message%
-  (class canvas%
-    (inherit get-dc refresh get-client-size
-             min-width min-height
-             get-parent)
-    
-    
-    ;; (listof (list string string))
-    ;; the first string indicates the amount of leading space
-    ;; to give; it should be as much width as the first string
-    ;; would require to draw. The second string is then actually drawn
-    (define labels '(("" "")))
-    
-    (define/public (set-lab _ls)
-      (unless (equal? labels _ls)
-        (set! labels _ls)
-        (update-size)
-        (refresh)))
-    (define/private (update-size)
-      (define dc (get-dc))
-      (send dc set-font small-control-font)
-      (define-values (w h)
-        (for/fold ([w 0] [h 0])
-                  ([space+label (in-list labels)])
-          (define space (list-ref space+label 0))
-          (define label (list-ref space+label 1))
-          (define-values (space-w _1 _2 _3) (send dc get-text-extent space))
-          (define-values (this-w this-h _4 _5) (send dc get-text-extent label))
-          (values (max (+ space-w this-w) w)
-                  (max this-h h))))
-      (send (get-parent) begin-container-sequence)
-      (min-width (+ 5 (inexact->exact (ceiling w))))
-      (min-height (+ 5 (* (length labels) (inexact->exact (ceiling h)))))
-      (send (get-parent) end-container-sequence)
-      (send (get-parent) reflow-container))
-    (define/override (on-paint)
-      (define dc (get-dc))
-      (send dc set-font small-control-font)
-      (define-values (w h) (get-client-size))
-      (define-values (_1 th _2 _3) (send dc get-text-extent "yX"))
-      (send dc set-pen "black" 1 'transparent)
-      (send dc set-brush "LemonChiffon" 'solid)
-      (send dc set-pen "black" 1 'solid)
-      (send dc draw-rectangle 0 0 w h)
-      (for ([space+label (in-list labels)]
-            [i (in-naturals)])
-        (define space (list-ref space+label 0))
-        (define label (list-ref space+label 1))
-        (define-values (space-w _1 _2 _3) (send dc get-text-extent space))
-        (send dc draw-text label (+ 2 space-w) (+ 2 (* i th)))))
-    (super-new [stretchable-width #f] [stretchable-height #f])))
-
-
-(define (strings->strings+spacers strs)
-  (let loop ([strs strs]
-             [prefix ""])
-    (cond
-      [(null? strs) '()]
-      [else
-       (define str (car strs))
-       (define leading-spaces (car (regexp-match #rx"^ *" str)))
-       (define this-entry
-         (cond
-           [(<= (string-length prefix) (string-length leading-spaces))
-            (list prefix (substring str (string-length prefix) (string-length str)))]
-           [else
-            (list (substring prefix 0 (string-length leading-spaces))
-                  (substring str (string-length leading-spaces) (string-length str)))]))
-       (define new-prefix
-         (cond
-           [(< (string-length prefix) (string-length leading-spaces))
-            prefix]
-           [else
-            (string-append (substring prefix 0 (string-length leading-spaces))
-                           (substring str (string-length leading-spaces) (string-length str)))]))
-       (cons this-entry (loop (cdr strs) new-prefix))])))
-
-
-(module+ test
-  (require rackunit)
-  (check-equal? (strings->strings+spacers '()) '())
-  (check-equal? (strings->strings+spacers '("x")) '(("" "x")))
-  (check-equal? (strings->strings+spacers '("x" "x")) '(("" "x") ("" "x")))
-  (check-equal? (strings->strings+spacers '("xx" " x")) '(("" "xx") ("x" "x")))
-  (check-equal? (strings->strings+spacers '("abcdef"
-                                            " pqrst"
-                                            "  ijkl"
-                                            "   mno"))
-                '(("" "abcdef")
-                  ("a" "pqrst")
-                  ("ap" "ijkl")
-                  ("api" "mno")))
-  (check-equal? (strings->strings+spacers '("abcdef"
-                                            " pqrst"
-                                            "  ijkl"
-                                            " mnozz"))
-                '(("" "abcdef")
-                  ("a" "pqrst")
-                  ("ap" "ijkl")
-                  ("a" "mnozz")))
-  (check-equal? (strings->strings+spacers '("abcdef"
-                                            " pqrst"
-                                            " mnozz"
-                                            "  ijkl"))
-                '(("" "abcdef")
-                  ("a" "pqrst")
-                  ("a" "mnozz")
-                  ("am" "ijkl")))
-  (check-equal? (strings->strings+spacers '("abcdef"
-                                            " pqrst"
-                                            "  ijkl"
-                                            "  mnoz"))
-                '(("" "abcdef")
-                  ("a" "pqrst")
-                  ("ap" "ijkl")
-                  ("ap" "mnoz")))
-  (check-equal? (strings->strings+spacers '("   def"
-                                            "abcxyz"))
-                '(("" "   def")
-                  ("" "abcxyz")))
-  (check-equal? (strings->strings+spacers '("abcdef"
-                                            "   xyz"
-                                            "           pqrstuv"))
-                '(("" "abcdef")
-                  ("abc" "xyz")
-                  ("abcxyz" "     pqrstuv"))))
-
-#|
-(module+ main
-  (require racket/gui/base)
-  (define c%
-    (class canvas%
-      (inherit get-client-size client->screen)
-      (define state #f)
-      (define/override (on-event evt)
-        (define-values (w h) (get-client-size))
-        (define new-state
-          (cond
-            [(not (<= 0 (send evt get-y) h)) #f]
-            [(<= 0 (send evt get-x) (/ w 2))
-             'left]
-            [(<= (/ w 2) (send evt get-x) w)
-             'right]
-            [else
-             #f]))
-        (unless (equal? new-state state)
-          (define old-state state)
-          (set! state new-state)
-          (send tooltip-frame show #f)
-          (when state
-            (send tooltip-frame set-tooltip
-                  (case state
-                    [(left) '("abcdef\n  ghij\n  klmn\n    op\n     q")]
-                    [(right) '("right")]))
-            (define-values (sx sy) (client->screen 10 10))
-            (send tooltip-frame show-over sx sy 10 10))))
-      (super-new)
-      (define tooltip-frame (new tooltip-frame%))))
-  (define f (new frame% [label ""] [width 200] [height 200]))
-  (define c (new c% [parent f]))
-  (send f show #t))
-|#
\ No newline at end of file
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/tracing.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/tracing.rkt
deleted file mode 100644
index 688ed4b2dd..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/tracing.rkt
+++ /dev/null
@@ -1,229 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         racket/unit
-         racket/class
-         racket/path
-         racket/port
-         racket/list
-         racket/gui/base
-         string-constants
-         framework
-         (prefix-in tr: trace/stacktrace)
-         drracket/private/drsig)
-
-(provide tracing@)
-
-(define-unit tracing@
-  (import [prefix drracket:frame: drracket:frame^]
-          [prefix drracket:rep: drracket:rep^]
-          [prefix drracket:init: drracket:init^]
-          [prefix drracket:unit: drracket:unit^]
-          [prefix drracket: drracket:interface^])
-  (export drracket:tracing^)
-  
-  (define-local-member-name
-    get-tracing-text
-    show-tracing
-    tracing:add-line
-    tracing:rest)
-  (define tab-tracing<%>
-    (interface ()
-      get-tracing-text
-      get-any-results?
-      tracing:add-line
-      tracing:reset))
-  
-  (define ellipses-cutoff 200)
-  (define calltrace-key #`(quote #,(gensym 'drscheme-calltrace-key)))
-  
-  (define (print-call-trace inferred-name original? src args improper? depth)
-    (when inferred-name
-      (let ([name (cond
-                    [(identifier? inferred-name) (syntax-e inferred-name)]
-                    [else (object-name inferred-name)])]
-            [rep (drracket:rep:current-rep)])
-        (when (and name rep)
-          (let ([canvas (send rep get-canvas)])
-            (when canvas
-              (let* ([frame (send canvas get-top-level-window)]
-                     [tab (send frame get-current-tab)])
-                (when (is-a? tab tab-tracing<%>)
-                  (let ([sp (open-output-string)])
-                    (let loop ([i depth])
-                      (unless (zero? i)
-                        (display " " sp)
-                        (loop (- i 1))))
-                    (fprintf sp "(")
-                    (fprintf sp "~a" name)
-                    (let loop ([args args])
-                      (cond
-                        [(null? args) (void)]
-                        [(and (null? (cdr args)) improper?)
-                         (fprintf sp " . ")
-                         (fprintf sp "~v" (car args))]
-                        [else
-                         (let ([arg (car args)])
-                           (fprintf sp " ")
-                           (fprintf sp "~v" arg))
-                         (loop (cdr args))]))
-                    (fprintf sp ")")
-                    (let ([sema (make-semaphore)])
-                      ;; Disable breaks, so an exn handler can't
-                      ;;  grab the DrRacket eventspacae:
-                      (parameterize-break #f
-                                          ;; Queue callback to write trace line ---
-                                          ;; low priority, so that infinite loops don't stop the user
-                                          ;;  from clicking "Break"
-                                          (parameterize ([current-eventspace drracket:init:system-eventspace])
-                                            (queue-callback
-                                             (lambda ()
-                                               (send tab tracing:add-line (get-output-string sp))
-                                               (semaphore-post sema))
-                                             #f)))
-                      ;; Wait for the line to get written, so that the
-                      ;;  trace output doesn't get too far behind (which
-                      ;;  matters, again, for infinite loops)
-                      (semaphore-wait sema)))))))))))
-  
-  (define-values/invoke-unit tr:stacktrace@
-    (import tr:stacktrace-imports^) (export tr:stacktrace^))
-  
-  (define tab-mixin
-    (mixin (drracket:unit:tab<%> drracket:rep:context<%>) (tab-tracing<%>)
-      (inherit get-frame)
-      
-      (define tracing-visible? #f)
-      (define/public (set-tracing-visible? v?) (set! tracing-visible? v?))
-      (define/public (get-tracing-visible?) tracing-visible?)
-      
-      (define/augment (clear-annotations)
-        (tracing:reset)
-        (inner (void) clear-annotations))
-      
-      (define any-results? #f)
-      (define/public (get-any-results?) any-results?)
-      (define ever-been-reset? #f)
-      (define/public (tracing:reset)
-        (when (or any-results?
-                  (not ever-been-reset?))
-          (set! any-results? #f)
-          (set! ever-been-reset? #t)
-          (send show-tracing-text lock #f)
-          (send show-tracing-text erase)
-          (send show-tracing-text auto-wrap #t)
-          (send show-tracing-text insert (string-constant tracing-tracing-nothing-to-show))
-          (send show-tracing-text lock #t)))
-      
-      (define show-tracing-text (new text:hide-caret/selection%))
-      (define/public (get-tracing-text) show-tracing-text)
-      (send show-tracing-text lock #t)
-      
-      (define/public (tracing:add-line s)
-        (let ([old-any? any-results?])
-          (set! any-results? #t)
-          (unless old-any?
-            (send (get-frame) show-tracing))
-          (send show-tracing-text begin-edit-sequence)
-          (send show-tracing-text lock #f)
-          (unless old-any?
-            (send show-tracing-text erase)
-            (send show-tracing-text auto-wrap #f))
-          (let ([insert
-                 (lambda (s)
-                   (send show-tracing-text insert s (send show-tracing-text last-position) 'same #f))])
-            (cond
-              [(<= (string-length s) ellipses-cutoff)
-               (insert s)
-               (insert "\n")]
-              [else
-               (insert (substring s 0 ellipses-cutoff))
-               (insert " ")
-               (let ([ell-start (send show-tracing-text last-position)])
-                 (insert "...")
-                 (let ([ell-end (send show-tracing-text last-position)])
-                   (let ([para (send show-tracing-text last-paragraph)])
-                     (insert "\n")
-                     (send show-tracing-text change-style clickback-delta ell-start ell-end)
-                     (send show-tracing-text set-clickback ell-start ell-end 
-                           (lambda (t x y)
-                             (send show-tracing-text begin-edit-sequence)
-                             (send show-tracing-text lock #f)
-                             (let ([line-start (send show-tracing-text paragraph-start-position para)]
-                                   [line-end (send show-tracing-text paragraph-end-position para)])
-                               (send show-tracing-text delete line-start line-end #f)
-                               (send show-tracing-text insert s line-start 'same #f))
-                             (send show-tracing-text lock #t)
-                             (send show-tracing-text end-edit-sequence))))))]))
-          (send show-tracing-text lock #t)
-          (send show-tracing-text end-edit-sequence)))
-      
-      (super-new)))
-  
-  (define clickback-delta (make-object style-delta%))
-  (send clickback-delta set-delta-foreground "BLUE")
-  (send clickback-delta set-delta 'change-underline #t)
-  
-  (define frame-mixin 
-    (mixin (drracket:frame:<%> drracket:unit:frame<%>) ()
-      (inherit get-current-tab set-show-menu-sort-key)
-      (define show-tracing-menu-item #f)
-      (define tracing-visible? #f)
-      
-      (define/augment (on-tab-change old new)
-        (inner (void) on-tab-change old new)
-        (send show-tracing-canvas set-editor (send new get-tracing-text))
-        (cond
-          [(eq? tracing-visible? (send new get-tracing-visible?))
-           (void)]
-          [(send new get-tracing-visible?)
-           (show-tracing)]
-          [else
-           (hide-tracing)]))
-      
-      (define/override (add-show-menu-items show-menu)
-        (super add-show-menu-items show-menu)
-        (set! show-tracing-menu-item
-              (new menu-item%
-                   (parent show-menu)
-                   (label (string-constant tracing-show-tracing-window))
-                   (callback (lambda (x y) (toggle-tracing)))))
-        (set-show-menu-sort-key show-tracing-menu-item 206))
-      
-      (define/public (show-tracing)
-        (set! tracing-visible? #t)
-        (send show-tracing-menu-item set-label (string-constant tracing-hide-tracing-window))
-        (send dragable-parent begin-container-sequence)
-        (send dragable-parent change-children
-              (lambda (l)
-                (let ([without (remq show-tracing-canvas l)])
-                  (append without (list show-tracing-canvas)))))
-        (send dragable-parent set-percentages '(3/4 1/4))
-        (send dragable-parent end-container-sequence))
-      
-      (define/private (hide-tracing)
-        (set! tracing-visible? #f)
-        (send show-tracing-menu-item set-label (string-constant tracing-show-tracing-window))
-        (send dragable-parent change-children
-              (lambda (l)
-                (remq show-tracing-canvas l))))
-      
-      (define/private (toggle-tracing)
-        (if tracing-visible?
-            (hide-tracing)
-            (show-tracing)))
-      
-      (define dragable-parent #f)
-      (define show-tracing-parent-panel #f)
-      (define show-tracing-canvas #f)
-      
-      (define/override (make-root-area-container cls parent)
-        (set! dragable-parent (super make-root-area-container panel:horizontal-dragable% parent))
-        (let ([root (make-object cls dragable-parent)])
-          (set! show-tracing-canvas (new editor-canvas% 
-                                         (parent dragable-parent)
-                                         (editor (send (get-current-tab) get-tracing-text))))
-          (send dragable-parent change-children (lambda (l) (remq show-tracing-canvas l)))
-          root))
-      
-      (super-new))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/ts.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/ts.rkt
deleted file mode 100644
index eb706554ef..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/ts.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang at-exp racket/base
-
-(require scribble/decode
-         scribble/manual)
-
-(define (phase n)
-  (make-splice
-   @list{This function can only be called in
-              phase @(number->string n) (see @secref["implementing-tools"] for details).}))
-
-(provide phase)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/unit.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/unit.rkt
deleted file mode 100644
index 84e55b243f..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/unit.rkt
+++ /dev/null
@@ -1,5468 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         racket/unit
-         racket/class
-         racket/path
-         racket/port
-         racket/list
-         racket/match
-         string-constants
-         framework
-         mrlib/name-message
-         mrlib/bitmap-label
-         mrlib/include-bitmap
-         mrlib/switchable-button
-         mrlib/cache-image-snip
-         (prefix-in image-core: mrlib/image-core)
-         mrlib/include-bitmap
-         mrlib/close-icon
-         net/sendurl
-         net/url
-         
-         drracket/private/drsig
-         "auto-language.rkt"
-         "insert-large-letters.rkt"
-         "get-defs.rkt"
-         "local-member-names.rkt"
-         "eval-helpers-and-pref-init.rkt"
-         "parse-logger-args.rkt"
-         "get-module-path.rkt"
-         "named-undefined.rkt"
-         (prefix-in drracket:arrow: "../arrow.rkt")
-         (prefix-in icons: images/compile-time)
-         mred
-         (prefix-in mred: mred)
-         
-         mzlib/date
-         
-         framework/private/aspell
-         framework/private/logging-timer
-         
-         setup/collects
-         scribble/xref
-         setup/xref
-         scribble/tag
-         (only-in scribble/base doc-prefix))
-
-(provide unit@)
-
-(define module-browser-progress-constant (string-constant module-browser-progress))
-(define status-compiling-definitions (string-constant module-browser-compiling-defns))
-(define show-lib-paths (string-constant module-browser-show-lib-paths/short))
-(define show-planet-paths (string-constant module-browser-show-planet-paths/short))
-(define refresh (string-constant module-browser-refresh))
-
-(define oprintf
-  (let ([op (current-output-port)])
-    (λ args
-      (apply fprintf op args))))
-
-;; ===================================================================================================
-;; Compiled bitmaps
-
-(require (for-syntax
-          racket/base
-          (prefix-in icons: (combine-in images/icons/file images/icons/control images/icons/style
-                                        images/icons/stickman images/logos))))
-
-(define execute-bitmap
-  (icons:compiled-bitmap (icons:play-icon #:color icons:run-icon-color
-                                          #:height (icons:toolbar-icon-height))))
-(define break-bitmap
-  (icons:compiled-bitmap (icons:stop-icon #:color icons:halt-icon-color
-                                          #:height (icons:toolbar-icon-height))))
-(define small-save-bitmap
-  (icons:compiled-bitmap (icons:small-save-icon #:height (icons:toolbar-icon-height))))
-(define save-bitmap
-  (icons:compiled-bitmap (icons:save-icon #:height (icons:toolbar-icon-height))))
-
-(begin-for-syntax
-  (define stickman-height 18)
-  (define num-running-frames 12))
-
-(define running-frame-list
-  (icons:compiled-bitmap-list
-   (for/list ([t  (in-range 0 1 (/ 1 num-running-frames))])
-     (icons:running-stickman-icon t #:height stickman-height))))
-(define running-frames (list->vector running-frame-list))
-
-(define standing-frame
-  (icons:compiled-bitmap
-   (icons:standing-stickman-icon #:height stickman-height)))
-
-(define very-small-planet-bitmap
-  (icons:compiled-bitmap (icons:planet-logo #:height (icons:toolbar-icon-height))))
-
-;; ===================================================================================================
-
-(define-unit unit@
-  (import [prefix help-desk: drracket:help-desk^]
-          [prefix drracket:app: drracket:app^]
-          [prefix drracket:frame: drracket:frame^]
-          [prefix drracket:text: drracket:text^]
-          [prefix drracket:rep: drracket:rep/int^]
-          [prefix drracket:language-configuration: drracket:language-configuration/internal^]
-          [prefix drracket:language: drracket:language^]
-          [prefix drracket:get/extend: drracket:get/extend^]
-          [prefix drracket:module-overview: drracket:module-overview^]
-          [prefix drracket:tools: drracket:tools^]
-          [prefix drracket:init: drracket:init^]
-          [prefix drracket:module-language: drracket:module-language/int^]
-          [prefix drracket:module-language-tools: drracket:module-language-tools^]
-          [prefix drracket:modes: drracket:modes^]
-          [prefix drracket:debug: drracket:debug^]
-          [prefix drracket: drracket:interface^])
-  (export (rename drracket:unit/int^ [-frame% frame%]))
-  (init-depend drracket:module-language/int^)
-
-  (define struct:teachpack-callbacks struct:drracket:unit:teachpack-callbacks)
-  (define teachpack-callbacks? drracket:unit:teachpack-callbacks?)
-  (define teachpack-callbacks-get-names drracket:unit:teachpack-callbacks-get-names)
-  (define teachpack-callbacks-add drracket:unit:teachpack-callbacks-add)
-  (define teachpack-callbacks-remove drracket:unit:teachpack-callbacks-remove)
-  (define teachpack-callbacks-remove-all drracket:unit:teachpack-callbacks-remove-all)
-  (define make-teachpack-callbacks drracket:unit:teachpack-callbacks)
-  (define teachpack-callbacks drracket:unit:teachpack-callbacks)
-  
-  (keymap:add-to-right-button-menu
-   (let ([old (keymap:add-to-right-button-menu)])
-     (λ (menu text event)
-       (old menu text event)
-       (when (and (is-a? text text%)
-                  (or (is-a? text (get-definitions-text%))
-                      (is-a? text drracket:rep:text%))
-                  (is-a? event mouse-event%))
-         
-         (let ([add-sep
-                (let ([added? #f])
-                  (λ ()
-                    (unless added?
-                      (set! added? #t)
-                      (new separator-menu-item% [parent menu]))))])
-           
-           (add-search-help-desk-menu-item text menu
-                                           (let-values ([(x y)
-                                                         (send text dc-location-to-editor-location
-                                                               (send event get-x)
-                                                               (send event get-y))])
-                                             (send text find-position x y))
-                                           add-sep)
-           
-           (when (is-a? text editor:basic<%>)
-             (let-values ([(pos text) (send text get-pos/text event)])
-               (when (and pos (is-a? text text%))
-                 (send text split-snip pos)
-                 (send text split-snip (+ pos 1))
-                 (let ([snip (send text find-snip pos 'after-or-none)])
-                   (when (or (is-a? snip image-snip%)
-                             (is-a? snip image-core:image%)
-                             (is-a? snip cache-image-snip%))
-                     (add-sep)
-                     (define (save-image-callback _1 _2)
-                       (define fn
-                         (put-file #f 
-                                   (send text get-top-level-window)
-                                   #f "untitled.png" "png"))
-                       (when fn
-                         (define kind (filename->kind fn))
-                         (cond
-                           [kind
-                            (cond
-                              [(or (is-a? snip image-snip%)
-                                   (is-a? snip cache-image-snip%))
-                               (send (send snip get-bitmap) save-file fn kind)]
-                              [else
-                               (image-core:save-image-as-bitmap snip fn kind)])]
-                           [else
-                            (message-box 
-                             (string-constant drscheme)
-                             "Must choose a filename that ends with either .png, .jpg, .xbm, or .xpm"
-                             #:dialog-mixin frame:focus-table-mixin)])))
-                     (new menu-item%
-                          [parent menu]
-                          [label (string-constant save-image)]
-                          [callback save-image-callback]))))))
-           
-           (void))))))
-  
-  (define (add-search-help-desk-menu-item text menu position [add-sep void])
-    (let* ([end (send text get-end-position)]
-           [start (send text get-start-position)])
-      (unless (= 0 (send text last-position))
-        (let* ([str (if (= end start)
-                        (find-symbol text position)
-                        (send text get-text start end))]
-               ;; almost the same code as "search-help-desk" in "rep.rkt"
-               [l (send text get-canvas)]
-               [l (and l (send l get-top-level-window))]
-               [l (and l (is-a? l drracket:unit:frame<%>) (send l get-definitions-text))]
-               [l (and l (send l get-next-settings))]
-               [l (and l (drracket:language-configuration:language-settings-language l))]
-               [ctxt (and l (send l capability-value 'drscheme:help-context-term))]
-               [name (and l (send l get-language-name))])
-          (unless (string=? str "")
-            (add-sep)
-            (let ([short-str (shorten-str str 50)])
-              (make-object menu-item%
-                (gui-utils:format-literal-label
-                 (string-constant search-help-desk-for) 
-                 (if (equal? short-str str)
-                     str
-                     (string-append short-str "...")))
-                menu
-                (λ x (help-desk:help-desk str (list ctxt name))))
-              (void)))))))
-  
-  (define (filename->kind fn)
-    (let ([ext (filename-extension fn)])
-      (and ext
-           (let ([sym (string->symbol (bytes->string/utf-8 ext))])
-             (ormap (λ (pr) (and (equal? sym (car pr)) (cadr pr)))
-                    allowed-extensions)))))
-  
-  (define allowed-extensions '((png png)
-                               (jpg jpeg)
-                               (xbm xbm)
-                               (xpm xpm)))
-  
-  
-  
-  ;; find-symbol : number -> string
-  ;; finds the symbol around the position `pos' (approx)
-  (define (find-symbol text pos)
-    (cond
-      [(and (is-a? text racket:text<%>)
-            (not (send text is-stopped?)))
-       (let* ([before (send text get-backward-sexp pos)]
-              [before+ (and before (send text get-forward-sexp before))]
-              [after (send text get-forward-sexp pos)]
-              [after- (and after (send text get-backward-sexp after))])
-         
-         (define (get-tokens start end)
-           (let loop ([i start])
-             (cond
-               [(and (< i end)
-                     (< i (send text last-position)))
-                (define-values (tstart tend) (send text get-token-range i))
-                (cons (list (send text classify-position i) tstart tend)
-                      (loop tend))]
-               [else '()])))
-         
-         ;; find-searchable-tokens : number number -> (or/c #f (list symbol number number))
-         (define (find-searchable-tokens start end)
-           (define tokens (get-tokens start end))
-           (for/or ([tok tokens])
-             (define type (list-ref tok 0))
-             (cond [(or (equal? type 'symbol)
-                        (equal? type 'hash-colon-keyword)
-                        ;; The token may have been categorized as a keyword due to
-                        ;; its presence in the tabification preferences:
-                        (equal? type 'keyword))
-                    tok]
-                   [else
-                    #f])))
-         
-         (define searchable-token 
-           (or (and before before+ 
-                    (<= before pos before+)
-                    (find-searchable-tokens before before+))
-               (and after after- 
-                    (<= after- pos after)
-                    (find-searchable-tokens after- after))))
-         (if searchable-token
-             (send text get-text (list-ref searchable-token 1) (list-ref searchable-token 2))
-             ""))]
-      [else
-       (send text split-snip pos)
-       (send text split-snip (+ pos 1))
-       (let ([snip (send text find-snip pos 'after)])
-         (if (is-a? snip string-snip%)
-             (let* ([before
-                     (let loop ([i (- pos 1)]
-                                [chars null])
-                       (if (< i 0)
-                           chars
-                           (let ([char (send text get-character i)])
-                             (if (non-letter? char)
-                                 chars
-                                 (loop (- i 1)
-                                       (cons char chars))))))]
-                    [after
-                     (let loop ([i pos])
-                       (if (< i (send text last-position))
-                           (let ([char (send text get-character i)])
-                             (if (non-letter? char)
-                                 null
-                                 (cons char (loop (+ i 1)))))
-                           null))])
-               (apply string (append before after)))
-             ""))]))
-  
-  ;; non-letter? : char -> boolean
-  ;; returns #t if the character belongs in a symbol (approx) and #f it is
-  ;; a divider between symbols (approx)
-  (define (non-letter? x)
-    (or (char-whitespace? x)
-        (memq x '(#\` #\' #\, #\; #\"
-                      #\{ #\( #\[ #\] #\) #\}))))      
-  (define (shorten-str str len)
-    (if ((string-length str) . <= . len)
-        str
-        (substring str 0 len)))
-  
-  
-  ;                                                                                              
-  ;                                                                                              
-  ;                                                                                              
-  ;    ;;;                         ;                           ;   ;          ;                  
-  ;   ;                                                        ;              ;                  
-  ;   ;                       ;                                ;              ;                  
-  ;  ;;;;  ; ;  ;;;     ;;;  ;;;;  ;    ;;;    ; ;;         ;; ;   ;   ;;;    ;    ;;;     ;; ;  
-  ;   ;    ;;  ;   ;   ;   ;  ;    ;   ;   ;   ;;  ;       ;  ;;   ;  ;   ;   ;   ;   ;   ;  ;;  
-  ;   ;    ;       ;  ;       ;    ;  ;     ;  ;   ;      ;    ;   ;      ;   ;  ;     ; ;    ;  
-  ;   ;    ;    ;;;;  ;       ;    ;  ;     ;  ;   ;      ;    ;   ;   ;;;;   ;  ;     ; ;    ;  
-  ;   ;    ;   ;   ;  ;       ;    ;  ;     ;  ;   ;      ;    ;   ;  ;   ;   ;  ;     ; ;    ;  
-  ;   ;    ;   ;   ;   ;   ;  ;    ;   ;   ;   ;   ;       ;  ;;   ;  ;   ;   ;   ;   ;   ;  ;;  
-  ;   ;    ;    ;;;;;   ;;;    ;;  ;    ;;;    ;   ;        ;; ;   ;   ;;;;;  ;    ;;;     ;; ;  
-  ;                                                                                           ;  
-  ;                                                                                      ;    ;  
-  ;                                                                                       ;;;;   
-  
-  (define (get-fraction-from-user parent)
-    (define dlg (make-object dialog% (string-constant enter-fraction)))
-    (define hp (make-object horizontal-panel% dlg))
-    (make-object message% (string-constant whole-part) hp)
-    (define whole
-      (keymap:call/text-keymap-initializer
-       (λ ()
-         (make-object text-field% #f hp void))))
-    (define vp (make-object vertical-panel% hp))
-    (define hp2 (make-object horizontal-panel% vp))
-    (define num 
-      (keymap:call/text-keymap-initializer
-       (λ ()
-         (make-object text-field% #f hp2 void))))
-    (define num-m (make-object message% (string-constant numerator) hp2))
-    (define hp3 (make-object horizontal-panel% vp))
-    (define den       
-      (keymap:call/text-keymap-initializer
-       (λ ()
-         (make-object text-field% #f hp3 void))))
-    (define den-m (make-object message% (string-constant denominator) hp3))
-    (define bp (make-object horizontal-panel% dlg))
-    (define ok? #f)
-    (define (validate-number)
-      (define num-s (string->number (send num get-value)))
-      (define den-s (string->number (send den get-value)))
-      (define whole-s (if (string=? (send whole get-value) "")
-                          0
-                          (string->number (send whole get-value))))
-      (cond
-        [(or (not whole-s) (not (integer? whole-s)))
-         (string-constant insert-number/bad-whole-part)]
-        [(or (not num-s) (not (integer? num-s)) (< num-s 0))
-         (string-constant insert-number/bad-numerator)]
-        [(or (not den-s) (not (integer? den-s)) (<= den-s 0))
-         (string-constant insert-number/bad-denominator)]
-        [else
-         (if (< whole-s 0)
-             (- whole-s (/ num-s den-s))
-             (+ whole-s (/ num-s den-s)))]))
-    (define (ok-callback)
-      (define v (validate-number))
-      (cond
-        [(number? v)
-         (set! ok? #t)
-         (send dlg show #f)]
-        [else 
-         (message-box
-          (string-constant drscheme)
-          v
-          dlg
-          #:dialog-mixin frame:focus-table-mixin)]))
-    (define (cancel-callback) (send dlg show #f))
-    (define-values (ok cancel) 
-      (gui-utils:ok/cancel-buttons
-       bp
-       (λ (x y) (ok-callback))
-       (λ (x y) (cancel-callback))))
-    (let ([mw (max (send den-m get-width) (send num-m get-width))])
-      (send den-m min-width mw)
-      (send num-m min-width mw))
-    (send bp set-alignment 'right 'center)
-    (send dlg show #t)
-    (and ok?
-         (let ([v (validate-number)])
-           (and (number? v)
-                v))))
-  
-  ;; create-executable : (instanceof drracket:unit:frame<%>) -> void
-  (define (create-executable frame)
-    (define definitions-text (send frame get-definitions-text))
-    (define program-filename (send definitions-text get-filename))
-    (define settings (send definitions-text get-next-settings))
-    (cond
-      [(not (drracket:language-configuration:language-allows-executable-creation?
-             (drracket:language-configuration:language-settings-language settings)))
-       (message-box (string-constant drscheme)
-                    (string-constant drracket-creates-executables-only-in-some-languages)
-                    frame
-                    #:dialog-mixin frame:focus-table-mixin)]
-      [(not program-filename)
-       (message-box (string-constant create-executable-title)
-                    (string-constant must-save-before-executable)
-                    frame
-                    #:dialog-mixin frame:focus-table-mixin)]
-      [else
-       (when (or (not (send definitions-text is-modified?))
-                 (gui-utils:get-choice
-                  (string-constant definitions-not-saved)
-                  (string-constant yes)
-                  (string-constant no)
-                  (string-constant drscheme)
-                  #f
-                  frame))
-         (send (drracket:language-configuration:language-settings-language settings)
-               create-executable
-               (drracket:language-configuration:language-settings-settings settings)
-               frame
-               program-filename))]))
-  
-  (define-values (get-program-editor-mixin add-to-program-editor-mixin)
-    (let* ([program-editor-mixin
-            (mixin (editor:basic<%> (class->interface text%)) () 
-              (init-rest args) 
-              (inherit get-top-level-window) 
-              
-              (define/private (reset-highlighting) 
-                (let ([f (get-top-level-window)]) 
-                  (when (and f 
-                             (is-a? f drracket:unit:frame<%>)) 
-                    (let ([interactions-text (send f get-interactions-text)]) 
-                      (when (object? interactions-text) 
-                        (send interactions-text reset-highlighting)))))) 
-              
-              (define/augment (after-insert x y) 
-                (reset-highlighting) 
-                (inner (void) after-insert x y)) 
-              
-              (define/augment (after-delete x y) 
-                (reset-highlighting) 
-                (inner (void) after-delete x y)) 
-              
-              (apply super-make-object args))]
-           [get-program-editor-mixin
-            (λ ()
-              (drracket:tools:only-in-phase 'drracket:unit:get-program-editor-mixin
-                                            'phase2
-                                            'init-complete)
-              program-editor-mixin)]
-           [add-to-program-editor-mixin
-            (λ (mixin)
-              (drracket:tools:only-in-phase 'drracket:unit:add-to-program-editor-mixin 'phase1)
-              (let ([old program-editor-mixin])
-                (set! program-editor-mixin (λ (x) (mixin (old x))))))])
-      (values get-program-editor-mixin
-              add-to-program-editor-mixin)))
-  
-  ;; this sends a message to its frame when it gets the focus
-  (define make-searchable-canvas%
-    (λ (%)
-      (class %
-        (inherit get-top-level-window)
-        (define/override (on-focus on?)
-          (when on?
-            (send (get-top-level-window) make-searchable this))
-          (super on-focus on?))
-        (super-new))))
-  
-  (define interactions-canvas% 
-    (class (make-searchable-canvas%
-            (canvas:info-mixin
-             (canvas:wide-snip-mixin
-              (canvas:info-mixin
-               canvas:color%))))
-      (init [style '()])
-      (super-new (style (cons 'auto-hscroll style)))))
-  
-  
-  (define definitions-canvas%
-    (class (make-searchable-canvas% (canvas:delegate-mixin (canvas:info-mixin canvas:color%)))
-      (init [style '()])
-      (super-new (style (cons 'auto-hscroll style)))))
-  
-  ;                                                                                                  
-  ;                                                                                                  
-  ;                                                                                                  
-  ;       ;           ;;;            ;        ;                                                      
-  ;       ;          ;    ;                                                                          
-  ;       ;          ;                   ;                                   ;                   ;   
-  ;    ;; ;    ;;;  ;;;;;;;  ; ;;    ;  ;;;;  ;    ;;;    ; ;;     ;;;      ;;;;   ;;;  ;     ; ;;;; 
-  ;   ;  ;;   ;   ;  ;    ;  ;;  ;   ;   ;    ;   ;   ;   ;;  ;   ;          ;    ;   ;  ;   ;   ;   
-  ;  ;    ;  ;    ;  ;    ;  ;   ;   ;   ;    ;  ;     ;  ;   ;   ;;         ;   ;    ;   ; ;    ;   
-  ;  ;    ;  ;;;;;;  ;    ;  ;   ;   ;   ;    ;  ;     ;  ;   ;    ;;        ;   ;;;;;;    ;     ;   
-  ;  ;    ;  ;       ;    ;  ;   ;   ;   ;    ;  ;     ;  ;   ;      ;       ;   ;        ; ;    ;   
-  ;   ;  ;;   ;      ;    ;  ;   ;   ;   ;    ;   ;   ;   ;   ;      ;       ;    ;      ;   ;   ;   
-  ;    ;; ;    ;;;;  ;    ;  ;   ;   ;    ;;  ;    ;;;    ;   ;   ;;;         ;;   ;;;; ;     ;   ;; 
-  ;                                                                                                  
-  ;                                                                                                  
-  ;                                                                                                  
-  
-  
-  (define get-definitions-text%
-    (let ([definitions-text% #f])
-      (λ ()
-        (drracket:tools:only-in-phase 'phase2 'init-complete)
-        (unless definitions-text%
-          (set! definitions-text% (make-definitions-text%)))
-        definitions-text%)))
-  
-  (define (show-line-numbers?)
-    (preferences:get 'drracket:show-line-numbers?))
-  
-  (define (make-definitions-text%)
-    (let ([definitions-super%
-            (text:line-numbers-mixin
-             (text:first-line-mixin
-              (drracket:module-language:module-language-put-file-mixin
-               (racket:text-mixin
-                (color:text-mixin
-                 (drracket:rep:drs-bindings-keymap-mixin
-                  (mode:host-text-mixin
-                   (text:delegate-mixin
-                    (text:foreground-color-mixin
-                     (drracket:rep:drs-autocomplete-mixin
-                      (λ (x) x)
-                      (text:normalize-paste-mixin
-                       (text:column-guide-mixin
-                        text:info%))))))))))))])
-       ((get-program-editor-mixin)
-        (class* definitions-super% (drracket:unit:definitions-text<%>)
-          (inherit get-top-level-window is-locked? lock while-unlocked
-                   highlight-first-line is-printing?)
-          
-          (define interactions-text #f)
-          (define/public (set-interactions-text it)
-            (set! interactions-text it))
-          
-          (define tab #f)
-          (define/public (get-tab) tab)
-          (define/public (set-tab t) (set! tab t))
-          
-          (inherit begin-edit-sequence end-edit-sequence
-                   delete insert last-position paragraph-start-position
-                   get-character)
-          
-          (define save-file-metadata #f)
-          
-          (define/pubment (begin-metadata-changes)
-            (set! ignore-edits? #t)
-            (inner (void) begin-metadata-changes))
-          (define/pubment (end-metadata-changes)
-            (set! ignore-edits? #f)
-            (inner (void) end-metadata-changes))
-          
-          (define/augment (on-save-file filename fmt)
-            (inner (void) on-save-file filename fmt)
-            (define lang (drracket:language-configuration:language-settings-language next-settings))
-            (define settings (drracket:language-configuration:language-settings-settings 
-                              next-settings))
-            (define name-mod (send lang get-reader-module))
-            (when name-mod
-              ;; the reader-module method's result is used a test of whether or
-              ;; not the get-metadata method is used for this language
-              (let ([metadata (send lang get-metadata (filename->modname filename) settings)])
-                (begin-edit-sequence #f #f)
-                (begin-metadata-changes)
-                (let ([locked? (is-locked?)])
-                  (when locked? (lock #f))
-                  (set! save-file-metadata metadata)
-                  (while-unlocked
-                   (λ ()
-                     (insert metadata 0 0)))
-                  (when locked? (lock #t))))))
-          (define/private (filename->modname filename)
-            (let-values ([(base name dir) (split-path filename)])
-              (string->symbol (regexp-replace #rx"\\.[^.]*$"
-                                              (path->string name)
-                                              ""))))
-          
-          (define/augment (after-save-file success?)
-            (when success?
-              (let ([filename (get-filename)])
-                (when filename
-                  ;; if a filesystem error happens, just give up
-                  ;; on setting the file creator and type.
-                  (with-handlers ([exn:fail:filesystem? void])
-                    (let-values ([(creator type) (file-creator-and-type filename)])
-                      (file-creator-and-type filename #"DrSc" type))))))
-            (when save-file-metadata
-              (let ([modified? (is-modified?)]
-                    [locked? (is-locked?)])
-                (when locked? (lock #f))
-                (while-unlocked
-                 (λ ()
-                   (delete 0 (string-length save-file-metadata))))
-                (when locked? (lock #t))
-                (set! save-file-metadata #f)
-                ;; restore modification status to where it was before the metadata is removed
-                (set-modified modified?)
-                (end-metadata-changes)
-                (end-edit-sequence)))
-            (inner (void) after-save-file success?))
-          
-          (define/augment (on-load-file filename format)
-            (inner (void) on-load-file filename format)
-            (begin-edit-sequence #f #f))
-          (define/augment (after-load-file success?)
-            (when success?
-              (let-values ([(module-language module-language-settings)
-                            (get-module-language/settings)])
-                (let-values ([(matching-language settings)
-                              (pick-new-language
-                               this
-                               (drracket:language-configuration:get-languages)
-                               module-language
-                               module-language-settings)])
-                  (cond
-                    [matching-language
-                     (set-next-settings
-                      (drracket:language-configuration:language-settings 
-                       matching-language
-                       settings)
-                      #f)]
-                    [else
-                     (define lang (drracket:language-configuration:language-settings-language
-                                   (get-next-settings)))
-                     (when (send lang get-reader-module)
-                       (set-next-settings
-                        (drracket:language-configuration:get-default-language-settings)
-                        #f))])))
-              (set-modified #f))
-            
-            (end-edit-sequence)
-            (inner (void) after-load-file success?))
-          
-          (define/augment (on-lexer-valid valid?)
-            (inner (void) on-lexer-valid valid?)
-            (let ([f (get-top-level-window)])
-              (when (and f
-                         (is-a? f drracket:unit:frame<%>))
-                (send f set-color-status! valid?))))
-          
-          (define/override (get-can-close-parent)
-            (and tab (send tab get-frame)))
-          
-          (inherit is-modified? run-after-edit-sequence)
-          (define/override (set-modified mod?)
-            (super set-modified mod?)
-            (run-after-edit-sequence
-             (λ ()
-               (let ([f (get-top-level-window)])
-                 (when (and f
-                            (is-a? f drracket:unit:frame<%>))
-                   (send f update-save-button))))))
-          (define/override set-filename
-            (case-lambda
-              [(fn) (set-filename fn #f)]
-              [(fn tmp?)
-               (super set-filename fn tmp?)
-               (let ([f (get-top-level-window)])
-                 (when (and f
-                            (is-a? f drracket:unit:frame<%>))
-                   (send f update-save-message)))]))
-          
-          (field
-           [needs-execution-state #f]
-           [already-warned-state #f]
-           [execute-settings (preferences:get 
-                              drracket:language-configuration:settings-preferences-symbol)]
-           [next-settings execute-settings])
-          
-          (define/private (set-needs-execution-state! s) (set! needs-execution-state s))
-          
-          ;; get-needs-execution-message : -> (or/c string #f)
-          ;; returns the current warning message if "Run" should be clicked (ie, if the
-          ;; state of the REPL is out of sync with drscheme).
-          (define/public (get-needs-execution-message)
-            (and (not already-warned-state)
-                 (or (and (not (this-and-next-language-the-same?))
-                          (string-constant needs-execute-language-changed))
-                     needs-execution-state)))
-          
-          (define/pubment (get-next-settings) next-settings)
-          (define/pubment (set-next-settings _next-settings [update-prefs? #t])
-            (when (or 
-                   (send (drracket:language-configuration:language-settings-language _next-settings)
-                         get-reader-module)
-                   (send (drracket:language-configuration:language-settings-language next-settings)
-                         get-reader-module))
-              (set-modified #t))
-            (set! next-settings _next-settings)
-            (let ([f (get-top-level-window)])
-              (when (and f
-                         (is-a? f drracket:unit:frame<%>))
-                (send f language-changed)))
-            
-            (highlight-first-line
-             (is-a? (drracket:language-configuration:language-settings-language _next-settings)
-                    drracket:module-language:module-language<%>))
-            
-            (let ([lang (drracket:language-configuration:language-settings-language next-settings)]
-                  [sets (drracket:language-configuration:language-settings-settings next-settings)])
-              (preferences:set
-               'drracket:recent-language-names
-               (limit-length
-                (remove-duplicate-languages
-                 (cons (cons (send lang get-language-name)
-                             (send lang marshall-settings sets))
-                       (preferences:get 'drracket:recent-language-names)))
-                10)))
-            
-            (when update-prefs?
-              (preferences:set
-               drracket:language-configuration:settings-preferences-symbol
-               next-settings))
-            
-            (remove-auto-text)
-            (insert-auto-text)
-            (after-set-next-settings _next-settings))
-          
-          (define/pubment (after-set-next-settings s)
-            (inner (void) after-set-next-settings s))
-          
-          (define/public (this-and-next-language-the-same?)
-            (define execute-lang
-              (drracket:language-configuration:language-settings-language execute-settings))
-            (define next-lang 
-              (drracket:language-configuration:language-settings-language next-settings))
-            (and (equal? (send execute-lang get-language-position)
-                         (send next-lang get-language-position))
-                 (equal? (send execute-lang marshall-settings 
-                               (drracket:language-configuration:language-settings-settings
-                                execute-settings))
-                         (send execute-lang marshall-settings 
-                               (drracket:language-configuration:language-settings-settings
-                                next-settings)))))
-          
-          (define/pubment (set-needs-execution-message msg)
-            (set-needs-execution-state! msg))
-          (define/pubment (teachpack-changed)
-            (set-needs-execution-state! (string-constant needs-execute-teachpack-changed)))
-          (define/pubment (just-executed)
-            (set! execute-settings next-settings)
-            (set-needs-execution-state! #f)
-            (send tab clear-execution-state)
-            (set! already-warned-state #f))
-          (define/pubment (already-warned?)
-            already-warned-state)
-          (define/pubment (already-warned)
-            (set! already-warned-state #t))
-          
-          ;; the really-modified? flag determines if there 
-          ;; is a modification that is not the insertion of the auto-text
-          (define really-modified? #f)
-          
-          ;; when this flag is #t, edits to the buffer do not count as 
-          ;; user's edits and so the yellow warning does not appear
-          (define ignore-edits? #f)
-          
-          (define/augment (after-insert x y)
-            (unless ignore-edits?
-              (set! really-modified? #t)
-              (set-needs-execution-state! (string-constant needs-execute-defns-edited)))
-            (inner (void) after-insert x y))
-          (define/augment (after-delete x y)
-            (unless ignore-edits?
-              (set! really-modified? #t)
-              (set-needs-execution-state! (string-constant needs-execute-defns-edited)))
-            (inner (void) after-delete x y))
-          
-          (define/override (is-special-first-line? l) 
-            (and (preferences:get 'drracket:module-language-first-line-special?)
-                 (is-lang-line? l)))
-          
-          (inherit get-filename)
-          
-          (inherit get-filename/untitled-name)
-          (define/private (get-date-string)
-            (string-append
-             (date->string (seconds->date (current-seconds)))
-             " "
-             (get-filename/untitled-name)))
-          
-          (define/override (on-paint before dc left top right bottom dx dy draw-caret)
-            (super on-paint before dc left top right bottom dx dy draw-caret)
-            
-            ;; [Disabled] For printing, put date and filename in the top margin:
-            (when (and #f before (is-printing?))
-              (let ([h (box 0)]
-                    [w (box 0)])
-                (send (current-ps-setup) get-editor-margin w h)
-                (unless ((unbox h) . < . 2)
-                  (let ([font (make-font #:size (inexact->exact (ceiling (* 1/2 (unbox h))))
-                                         #:family 'modern)]
-                        [old-font (send dc get-font)])
-                    (send dc set-font font)
-                    (send dc draw-text (get-date-string) 0 0)
-                    (send dc set-font old-font)))))
-            
-            ;; draw the arrows
-            (when before
-              (when error-arrows
-                (define old-pen (send dc get-pen))
-                (define old-brush (send dc get-brush))
-                (send dc set-brush "red" 'solid)
-                (define font-size-factor
-                  (cond
-                    [(<= (editor:get-current-preferred-font-size) 12) 1]
-                    [else (* (editor:get-current-preferred-font-size) 1/8)]))
-                (define pen-width font-size-factor)
-                (define arrow-head-size (* 8 font-size-factor))
-                (define arrow-root-radius (* 1 font-size-factor))
-                (send dc set-pen (send the-pen-list find-or-create-pen "red" 1 'solid))
-                (let loop ([pts error-arrows])
-                  (cond
-                    [(null? pts) (void)]
-                    [(null? (cdr pts)) (void)]
-                    [else (define pt1 (car pts))
-                          (define pt2 (cadr pts))
-                          (draw-arrow dc dx dy pt1 pt2
-                                      pen-width arrow-head-size arrow-root-radius)
-                          (loop (cdr pts))]))
-                (send dc set-pen old-pen)
-                (send dc set-brush old-brush))))
-          
-          (define/private (draw-arrow dc dx dy pt1 pt2 pen-width arrow-head-size arrow-root-radius)
-            (define-values (x1 y1) 
-              (find-poss (srcloc-source pt1) (- (srcloc-position pt1) 1) (srcloc-position pt1)))
-            (define-values (x2 y2)
-              (find-poss (srcloc-source pt2) (- (srcloc-position pt2) 1) (srcloc-position pt2)))
-            (drracket:arrow:draw-arrow dc x1 y1 x2 y2 dx dy
-                                       #:pen-width pen-width
-                                       #:arrow-head-size arrow-head-size
-                                       #:arrow-root-radius arrow-root-radius))
-          
-          (inherit dc-location-to-editor-location)
-          (define/private (find-poss text left-pos right-pos)
-            (let ([xlb (box 0)]
-                  [ylb (box 0)]
-                  [xrb (box 0)]
-                  [yrb (box 0)])
-              (send text position-location left-pos xlb ylb #t)
-              (send text position-location right-pos xrb yrb #f)
-              (let*-values ([(xl-off yl-off) (send text editor-location-to-dc-location 
-                                                   (unbox xlb)
-                                                   (unbox ylb))]
-                            [(xl yl) (dc-location-to-editor-location xl-off yl-off)]
-                            [(xr-off yr-off) (send text editor-location-to-dc-location
-                                                   (unbox xrb)
-                                                   (unbox yrb))]
-                            [(xr yr) (dc-location-to-editor-location xr-off yr-off)])
-                (values (/ (+ xl xr) 2)
-                        (/ (+ yl yr) 2)))))
-          
-          (define/public (still-untouched?)
-            (and (or (= (last-position) 0) (not really-modified?))
-                 (not (is-modified?))
-                 (not (get-filename))))
-          ;; inserts the auto-text if any
-          (define/public (insert-auto-text)
-            (define lang
-              (drracket:language-configuration:language-settings-language
-               next-settings))
-            (define auto-text
-              (and (not really-modified?)
-                   (not (get-filename))
-                   (is-a? lang drracket:module-language:module-language<%>)
-                   (send lang get-auto-text
-                         (drracket:language-configuration:language-settings-settings
-                          next-settings))))
-            (when auto-text
-              (set! ignore-edits? #t)
-              (begin-edit-sequence #f #f)
-              (insert auto-text)
-              (set-modified #f)
-              (set! ignore-edits? #f)
-              (end-edit-sequence)
-              (set! really-modified? #f)))
-          (define/private (remove-auto-text)
-            (when (and (not really-modified?)
-                       (not (get-filename))
-                       (> (last-position) 0))
-              (begin-edit-sequence #f #f)
-              (send this erase)
-              (set-modified #f)
-              (end-edit-sequence)
-              (set! really-modified? #f)))
-          
-          (inherit invalidate-bitmap-cache)
-          (define/public (set-error-arrows arrows)
-            (unless (eq? arrows error-arrows)
-              (set! error-arrows arrows)
-              (invalidate-bitmap-cache)))
-          
-          (define error-arrows #f)
-          
-          (super-new [show-line-numbers? (show-line-numbers?)])
-          
-          (highlight-first-line
-           (is-a? (drracket:language-configuration:language-settings-language next-settings)
-                  drracket:module-language:module-language<%>))
-          (inherit set-max-undo-history)
-          (set-max-undo-history 'forever)))))
-  
-  ;; is-lang-line? : string -> boolean
-  ;; given the first line in the editor, this returns #t if it is a #lang line.
-  (define (is-lang-line? l)
-    (let ([m (regexp-match #rx"^#(!|(lang ))([-+_/a-zA-Z0-9]+)(.|$)" l)])
-      (and m
-           (let ([lang-name (list-ref m 3)]
-                 [last-char (list-ref m 4)])
-             (and (not (char=? #\/ (string-ref lang-name 0)))
-                  (not (char=? #\/ (string-ref lang-name (- (string-length lang-name) 1))))
-                  (or (string=? "" last-char)
-                      (char-whitespace? (string-ref last-char 0))))))))
-  
-  ;; test cases for is-lang-line?
-  #;
-  (printf "~s\n"
-          (list (is-lang-line? "#lang x")
-                (is-lang-line? "#lang racket")
-                (is-lang-line? "#lang racket ")
-                (not (is-lang-line? "#lang racketα"))
-                (not (is-lang-line? "#lang racket/ "))
-                (not (is-lang-line? "#lang /racket "))
-                (is-lang-line? "#lang rac/ket ")
-                (is-lang-line? "#lang r6rs")
-                (is-lang-line? "#!r6rs")
-                (is-lang-line? "#!r6rs ")
-                (not (is-lang-line? "#!/bin/sh"))))
-  
-  (define (get-module-language/settings)
-    (let* ([module-language
-            (and (preferences:get 'drracket:switch-to-module-language-automatically?)
-                 (ormap 
-                  (λ (lang)
-                    (and (is-a? lang drracket:module-language:module-language<%>)
-                         lang))
-                  (drracket:language-configuration:get-languages)))]
-           [module-language-settings
-            (let ([prefs-setting (preferences:get 
-                                  drracket:language-configuration:settings-preferences-symbol)])
-              (cond
-                [(eq? (drracket:language-configuration:language-settings-language prefs-setting)
-                      module-language)
-                 (drracket:language-configuration:language-settings-settings prefs-setting)]
-                [else 
-                 (and module-language
-                      (send module-language default-settings))]))])
-      (values module-language module-language-settings)))
-  
-  
-  
-  
-  ;                                                       
-  ;                                                       
-  ;                                                       
-  ;                                                       
-  ;      ;;;          ;;;;;;;                             
-  ;      ;;;         ;;;                                  
-  ;   ;; ;;;   ;;;; ;;;;; ;;; ;;; ;;    ;;;;              
-  ;  ;;;;;;;  ;; ;;;;;;;; ;;; ;;;;;;;  ;; ;;;             
-  ;  ;;; ;;; ;;; ;;; ;;;  ;;; ;;; ;;; ;;; ;;;             
-  ;  ;;; ;;; ;;;;;;; ;;;  ;;; ;;; ;;; ;;;;;;;             
-  ;  ;;; ;;; ;;;     ;;;  ;;; ;;; ;;; ;;;     ;;; ;;; ;;; 
-  ;  ;;;;;;;  ;;;;;; ;;;  ;;; ;;; ;;;  ;;;;;; ;;; ;;; ;;; 
-  ;   ;; ;;;   ;;;;  ;;;  ;;; ;;; ;;;   ;;;;  ;;; ;;; ;;; 
-  ;                                                       
-  ;                                                       
-  ;                                                       
-  ;                                                       
-  
-  ;; get-pos : text mouse-event% -> (union #f number)
-  (define (get-pos text event)
-    (let*-values ([(event-x event-y)
-                   (values (send event get-x)
-                           (send event get-y))]
-                  [(x y) (send text dc-location-to-editor-location
-                               event-x 
-                               event-y)])
-      (let* ([on-it? (box #f)]
-             [pos (send text find-position x y #f on-it?)])
-        (and (unbox on-it?)
-             pos))))
-  
-  (let ([old (keymap:add-to-right-button-menu)])
-    (keymap:add-to-right-button-menu
-     (λ (menu editor event)
-       (when (is-a? editor text%)
-         (let* ([canvas (send editor get-canvas)]
-                [frame (and canvas (send canvas get-top-level-window))])
-           (when (is-a? frame drracket:unit:frame<%>)
-             (let* ([language-settings (send (send frame get-definitions-text) get-next-settings)]
-                    [new-language (drracket:language-configuration:language-settings-language
-                                   language-settings)]
-                    [capability-info (send new-language capability-value 'drscheme:define-popup)])
-               (when capability-info
-                 (let* ([current-pos (get-pos editor event)]
-                        [current-word (and current-pos (get-current-word editor current-pos))]
-                        [defn (and current-word
-                                   (ormap (λ (defn) (and (string=? current-word (defn-name defn))
-                                                         defn))
-                                          (get-definitions (car capability-info)
-                                                           #f
-                                                           editor)))])
-                   (when defn
-                     (new separator-menu-item% (parent menu))
-                     (new menu-item%
-                          (parent menu)
-                          (label (gui-utils:format-literal-label (string-constant jump-to-defn)
-                                                                 (defn-name defn)))
-                          (callback (λ (x y)
-                                      (send editor set-position (defn-start-pos defn))))))))))))
-       (old menu editor event))))
-  
-  ;; get-current-word : editor number -> string
-  ;; returns the string that is being clicked on
-  (define (get-current-word editor pos)
-    (let* ([search
-            (λ (dir offset)
-              (let loop ([pos pos])
-                (cond
-                  [(or (= pos 0) 
-                       (= pos (send editor last-position)))
-                   pos]
-                  [(memq (send editor get-character pos)
-                         '(#\space #\return #\newline #\( #\) #\[ #\] #\tab))
-                   (offset pos)]
-                  [else (loop (dir pos))])))]
-           [before (search sub1 add1)]
-           [after (search add1 (λ (x) x))])
-      (send editor get-text before after)))
-  
-  (define func-defs-canvas%
-    (class name-message%
-      (init-field frame)
-      
-      (unless (is-a? frame drracket:unit:frame<%>)
-        (error 'func-defs-canvas "frame is not a drracket:unit:frame<%>"))
-      
-      (define sort-by-name? (preferences:get 'drracket:defns-popup-sort-by-name?))
-      (define sorting-name (if sort-by-name?
-                               (string-constant sort-by-position) 
-                               (string-constant sort-by-name)))
-      (define/private (change-sorting-order)
-        (set! sort-by-name? (not sort-by-name?))
-        (preferences:set 'drracket:defns-popup-sort-by-name? sort-by-name?)
-        (set! sorting-name (if sort-by-name?
-                               (string-constant sort-by-position) 
-                               (string-constant sort-by-name))))
-      
-      (define define-popup-capability-info
-        (drracket:language:get-capability-default 'drscheme:define-popup))
-      
-      (inherit set-message set-hidden?)
-      (define/public (language-changed new-language vertical?)
-        (set! define-popup-capability-info
-              (send new-language capability-value 'drscheme:define-popup))
-        (let ([define-name (get-define-popup-name define-popup-capability-info
-                                                  vertical?)])
-          (cond
-            [define-name
-              (set-message #f define-name)
-              (set-hidden? #f)]
-            [else
-             (set-hidden? #t)])))
-      (define/override (fill-popup menu reset)
-        (when define-popup-capability-info
-          (let* ([text (send frame get-definitions-text)]
-                 [unsorted-defns (get-definitions (car define-popup-capability-info)
-                                                  (not sort-by-name?)
-                                                  text)]
-                 [defns (if sort-by-name?
-                            (sort
-                             unsorted-defns
-                             (λ (x y) (string-ci<=? (defn-name x) (defn-name y))))
-                            unsorted-defns)])
-            (make-object menu:can-restore-menu-item% sorting-name
-              menu
-              (λ (x y)
-                (change-sorting-order)))
-            (make-object separator-menu-item% menu)
-            (if (null? defns)
-                (send (make-object menu:can-restore-menu-item%
-                        (string-constant no-definitions-found)
-                        menu
-                        void)
-                      enable #f)
-                (let loop ([defns defns])
-                  (unless (null? defns)
-                    (let* ([defn (car defns)]
-                           [checked? 
-                            (let ([t-start (send text get-start-position)]
-                                  [t-end (send text get-end-position)]
-                                  [d-start (defn-start-pos defn)]
-                                  [d-end (defn-end-pos defn)])
-                              (or (<= t-start d-start t-end)
-                                  (<= t-start d-end t-end)
-                                  (<= d-start t-start t-end d-end)))]
-                           [item
-                            (make-object (if checked?
-                                             menu:can-restore-checkable-menu-item%
-                                             menu:can-restore-menu-item%)
-                              (gui-utils:quote-literal-label (defn-name defn))
-                              
-                              menu
-                              (λ (x y)
-                                (reset)
-                                (send text set-position (defn-start-pos defn) (defn-start-pos defn))
-                                (let ([canvas (send text get-canvas)])
-                                  (when canvas
-                                    (send canvas focus)))))])
-                      (when checked?
-                        (send item check #t))
-                      (loop (cdr defns)))))))))
-      
-      (super-new (label "(define ...)") ;; this default is quickly changed
-                 [string-constant-untitled (string-constant untitled)]
-                 [string-constant-no-full-name-since-not-saved 
-                  (string-constant no-full-name-since-not-saved)])))
-  
-  (define (set-box/f! b v) (when (box? b) (set-box! b v)))
-  
-  ;                                        
-  ;                                        
-  ;                                        
-  ;                                        
-  ;   ;;;;                                 
-  ;  ;;;                                   
-  ;  ;;;; ;;; ;;;;;;;  ;;; ;; ;;;    ;;;;  
-  ;  ;;;; ;;;;;;;;;;;; ;;;;;;;;;;;  ;; ;;; 
-  ;  ;;;  ;;;  ;;  ;;; ;;; ;;; ;;; ;;; ;;; 
-  ;  ;;;  ;;;    ;;;;; ;;; ;;; ;;; ;;;;;;; 
-  ;  ;;;  ;;;  ;;; ;;; ;;; ;;; ;;; ;;;     
-  ;  ;;;  ;;;  ;;; ;;; ;;; ;;; ;;;  ;;;;;; 
-  ;  ;;;  ;;;   ;;;;;; ;;; ;;; ;;;   ;;;;  
-  ;                                        
-  ;                                        
-  ;                                        
-  ;                                        
-  
-  (define dragable/def-int-mixin
-    (mixin (panel:dragable<%>) ()
-      (init-field unit-frame)
-      (inherit get-percentages popup-menu 
-               set-orientation get-vertical?)
-      (define/augment (after-percentage-change)
-        (let ([percentages (get-percentages)])
-          (when (and (= 1
-                        (length (send unit-frame get-definitions-canvases))
-                        (length (send unit-frame get-interactions-canvases)))
-                     (= 2 (length percentages)))
-            (preferences:set 'drracket:unit-window-size-percentage (car percentages))))
-        (inner (void) after-percentage-change))
-      (define/override (right-click-in-gap evt before after)
-        (define menu (new popup-menu%))
-        (define vertical? (get-vertical?))
-        (new menu-item%
-             [parent menu]
-             [label 
-              ;; something seems to be wrong with the get-vertical? method...
-              (if vertical?
-                  (string-constant change-to-vertical-alignment)
-                  (string-constant change-to-horizontal-alignment))]
-             [callback
-              (λ (a b) 
-                (preferences:set 'drracket:defs/ints-horizontal vertical?)
-                (set-orientation vertical?))])
-        (popup-menu menu (send evt get-x) (send evt get-y)))
-      (super-new)))
-  
-  (define vertical-dragable/def-int% (dragable/def-int-mixin panel:vertical-dragable%))
-  (define horizontal-dragable/def-int% (dragable/def-int-mixin panel:horizontal-dragable%))
-  
-  (define tab%
-    (class* object% (drracket:rep:context<%> drracket:unit:tab<%>)
-      (init-field frame
-                  defs
-                  i
-                  defs-shown?
-                  ints-shown?)
-      (define enabled? #t)
-      (field [ints #f]
-             [visible-defs #f]
-             [visible-ints #f]
-             [focus-d/i 'defs])
-      
-      ;; only called to initialize this tab.
-      ;; the interactions editor should be invariant.
-      (define/public (set-ints i) (set! ints i)) 
-      
-      (define/public-final (get-frame) frame)
-      (define/public-final (get-defs) defs)
-      (define/public-final (get-ints) ints)
-      (define/public-final (get-visible-defs) (values visible-defs defs-shown?))
-      (define/public-final (set-visible-defs vd ds?)
-        (set! visible-defs vd)
-        (set! defs-shown? ds?))
-      (define/public-final (get-visible-ints) (values visible-ints ints-shown?))
-      (define/public-final (set-visible-ints vi is?)
-        (set! visible-ints vi)
-        (set! ints-shown? is?))
-      (define/public-final (set-focus-d/i di)
-        (set! focus-d/i di))
-      (define/public-final (get-focus-d/i) focus-d/i)
-      (define/public-final (get-i) i)
-      (define/public-final (set-i _i) (set! i _i))
-      (define/public (disable-evaluation)
-        (set! enabled? #f)
-        (send ints lock #t)
-        (send frame disable-evaluation-in-tab this))
-      (define/public (enable-evaluation)
-        (set! enabled? #t)
-        (send ints lock #f)
-        (send frame enable-evaluation-in-tab this))
-      (define/public (get-enabled) enabled?)
-      
-      (define last-touched (current-inexact-milliseconds))
-      (define/public-final (touched) (set! last-touched (current-inexact-milliseconds)))
-      (define/public-final (get-last-touched) last-touched)
-      
-      ;; current-execute-warning is a snapshot of the needs-execution-message
-      ;; that is taken each time repl submission happens, and it gets reset
-      ;; when "Run" is clicked.
-      (define current-execute-warning #f)
-      (define/pubment (repl-submit-happened)
-        (set! current-execute-warning (send defs get-needs-execution-message))
-        (update-execute-warning-gui))
-      (define/public (get-current-execute-warning) current-execute-warning)
-      (define/public (clear-execution-state) 
-        (set! current-execute-warning #f)
-        (update-execute-warning-gui)
-        (send defs already-warned))
-      (define/public (update-execute-warning-gui)
-        (when (is-current-tab?)
-          (send frame show/hide-warning-message 
-                (get-current-execute-warning)
-                (λ () 
-                  ;; this callback might be run with a different tab ...
-                  (send (send frame get-current-tab) clear-execution-state)))))
-      
-      (define/public (get-directory)
-        (define bx (box #f))
-        (define filename (send defs get-filename bx))
-        (get-init-dir 
-         (and (not (unbox bx)) filename)))
-      
-      (define/pubment (can-close?)
-        (and (send defs can-close?)
-             (send ints can-close?)
-             (inner #t can-close?)))
-      (define/pubment (on-close)
-        (send defs on-close)
-        (send ints on-close)
-        (inner (void) on-close))
-      
-      ;; this should really do something local to the tab, but
-      ;; for now it doesn't.
-      (define/public (ensure-rep-shown rep) 
-        (send frame ensure-rep-shown rep))
-      
-      (field [thread-to-break-box (make-weak-box #f)]
-             [custodian-to-kill-box (make-weak-box #f)]
-             [offer-kill? #f])
-      
-      ;; break-callback : -> void
-      (define/public (break-callback)
-        (let ([thread-to-break (weak-box-value thread-to-break-box)]
-              [custodian-to-kill (weak-box-value custodian-to-kill-box)])
-          (cond
-            [(or (not thread-to-break)
-                 (not custodian-to-kill))
-             (bell)]
-            [offer-kill? 
-             (if (user-wants-kill?)
-                 (when thread-to-break
-                   (break-thread thread-to-break))
-                 (when custodian-to-kill
-                   (custodian-shutdown-all custodian-to-kill)))]
-            [else
-             (when thread-to-break
-               (break-thread thread-to-break))
-             ;; only offer a kill the next time if 
-             ;; something got broken.
-             (set! offer-kill? #t)])))
-      
-      ;; user-wants-kill? : -> boolean
-      ;; handles events, so be sure to check state
-      ;; after calling to avoid race conditions.
-      (define/private (user-wants-kill?)
-        (gui-utils:get-choice
-         (string-constant kill-evaluation?)
-         (string-constant just-break)
-         (string-constant kill)
-         (string-constant kill?)
-         'diallow-close
-         frame))
-      
-      ;; reset-offer-kill
-      (define/public (reset-offer-kill)
-        (set! offer-kill? #f))
-      
-      ;; get-breakables : -> (union #f thread) (union #f cust) -> void
-      (define/public (get-breakables)
-        (values (weak-box-value thread-to-break-box) (weak-box-value custodian-to-kill-box)))
-      
-      ;; set-breakables : (union #f thread) (union #f cust) -> void
-      (define/public (set-breakables thd cust)
-        (set! thread-to-break-box (make-weak-box thd))
-        (set! custodian-to-kill-box (make-weak-box cust)))
-      
-      (define/pubment (clear-annotations)
-        (inner (void) clear-annotations)
-        (send ints reset-highlighting))
-      
-      (define running? #f)
-      (define/public-final (is-running?) running?)
-      (define/public (update-running b?) 
-        (set! running? b?)
-        (send frame update-running b?))
-      
-      (define/public-final (is-current-tab?) (eq? this (send frame get-current-tab)))
-      
-      (define log-visible? #f)
-      (define/public-final (toggle-log)
-        (set! log-visible? (not log-visible?))
-        (send frame show/hide-log log-visible?)
-        (send (get-ints) enable/disable-capture-log log-visible?))
-      (define/public-final (hide-log)
-        (when log-visible? (toggle-log)))
-      (define/public-final (update-log)
-        (send frame show/hide-log log-visible?)
-        (send frame set-logger-text-field-value (send (get-ints) get-user-log-receiver-args-str)))
-      (define/public-final (update-logger-window command)
-        (when (is-current-tab?)
-          (send frame update-logger-window command)))
-      
-      (define current-planet-status #f)
-      (define/public-final (new-planet-status a b)
-        (set! current-planet-status (cons a b))
-        (update-planet-status))
-      (define/public-final (clear-planet-status) 
-        (set! current-planet-status #f)
-        (update-planet-status))
-      (define/public-final (update-planet-status)
-        (send frame show-planet-status 
-              (and current-planet-status 
-                   (car current-planet-status))
-              (and current-planet-status 
-                   (cdr current-planet-status))))
-      
-      (super-new)))
-  
-  ;; should only be called by the tab% object (and the class itself)
-  (define-local-member-name 
-    disable-evaluation-in-tab
-    enable-evaluation-in-tab
-    update-toolbar-visibility
-    show/hide-log
-    set-logger-text-field-value
-    show-planet-status)
-  
-  (define frame-mixin
-    (mixin (drracket:frame:<%> frame:searchable-text<%> frame:delegate<%> frame:size-pref<%>)
-      (drracket:unit:frame<%>)
-      (init filename)
-      (inherit set-label-prefix get-show-menu
-               get-menu%
-               get-area-container
-               update-info
-               get-file-menu
-               search-hidden?
-               unhide-search
-               hide-search
-               file-menu:get-close-item
-               file-menu:get-save-item
-               file-menu:get-save-as-item
-               file-menu:get-revert-item
-               file-menu:get-print-item
-               set-delegated-text)
-      
-      (define resizable-panel (drr-named-undefined 'resizable-panel))
-      (define definitions-canvas (drr-named-undefined 'definitions-canvas))
-      (define definitions-canvases (drr-named-undefined 'definitions-canvases))
-      (define interactions-canvas (drr-named-undefined 'interactions-canvas))
-      (define interactions-canvases (drr-named-undefined 'interactions-canvases))
-      (define button-panel (drr-named-undefined 'button-panel))
-      
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;; execute warning
-      ;;
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      
-      (define execute-warning-panel #f)
-      (define execute-warning-parent-panel #f)
-      (define execute-warning-canvas #f)
-      (define/public-final (show/hide-warning-message msg hide-canvas)
-        (when (and execute-warning-parent-panel
-                   execute-warning-panel)
-          (cond
-            [msg
-             (cond
-               [execute-warning-canvas
-                (send execute-warning-canvas set-message msg)]
-               [else
-                (set! execute-warning-canvas
-                      (new execute-warning-canvas% 
-                           [stretchable-height #t]
-                           [parent execute-warning-panel]
-                           [message msg]))
-                (new close-icon% 
-                     [parent execute-warning-panel]
-                     [bg-color "yellow"]
-                     [callback (λ () (hide-canvas))])])
-             (send execute-warning-parent-panel
-                   change-children
-                   (λ (l) (append (remq execute-warning-panel l)
-                                  (list execute-warning-panel))))]
-            [else
-             (when execute-warning-canvas
-               (send execute-warning-parent-panel
-                     change-children
-                     (λ (l) (remq execute-warning-panel l)))
-               (send execute-warning-canvas set-message #f))])))
-      
-      
-      ;; bind the proc to a field
-      ;; so it stays alive as long 
-      ;; as the frame stays alive
-      (define show-line-numbers-pref-fn
-        (let ([fn (lambda (pref value)
-                    (when show-line-numbers-menu-item
-                      (send show-line-numbers-menu-item set-label
-                            (if value
-                                (string-constant hide-line-numbers/menu)
-                                (string-constant show-line-numbers/menu))))
-                    (show-line-numbers! value))])
-          (preferences:add-callback
-           'drracket:show-line-numbers?
-           fn
-           #t)
-          fn))
-      (define show-line-numbers-menu-item #f)
-      
-      (define/override (add-line-number-menu-items menu)
-        (define on? (preferences:get 'drracket:show-line-numbers?))
-        (new separator-menu-item% [parent menu])
-        (new checkable-menu-item% 
-             [label (string-constant show-line-numbers-in-definitions)]
-             [parent menu]
-             [checked on?]
-             [callback
-              (λ (c dc)
-                (preferences:set 'drracket:show-line-numbers? (not on?)))])
-        (super add-line-number-menu-items menu))
-      
-      (define/private (show-line-numbers! show)
-        (for ([tab tabs])
-          (define text (send tab get-defs))
-          (send text show-line-numbers! show))
-        (send definitions-canvas refresh))
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;; logging 
-      ;;
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      
-      (define logger-panel #f)
-      (define logger-parent-panel #f)
-      
-      ;; logger-gui-content-panel: (or/c #f (is-a?/c vertical-panel%))
-      ;; this is #f when the GUI has not been built yet. After
-      ;; it becomes a panel, it is always a panel 
-      ;; (altho the panel might not always be shown)
-      (define logger-gui-content-panel #f)
-      (define logger-gui-canvas #f)
-      (define logger-checkbox #f)
-      (define logger-text-field #f)
-      
-      ;; logger-gui-text: (or/c #f (is-a?/c text%))
-      ;; this is #f when the GUI has not been built or when the logging panel is hidden
-      ;; in that case, the logging messages aren't begin saved in an editor anywhere
-      (define logger-gui-text #f)
-      
-      (define logger-menu-item #f)
-      
-      (define/public-final (show/hide-log show?)
-        (let ([p (preferences:get 'drracket:logging-size-percentage)])
-          (begin-container-sequence)
-          (cond
-            [logger-gui-content-panel
-             (send logger-parent-panel change-children
-                   (λ (l)
-                     (cond
-                       [(or (and show? (member logger-panel l))
-                            (and (not show?)
-                                 (not (member logger-panel l))))
-                        ;; if things are already up to date, only update the logger text
-                        (when show?
-                          (update-logger-window #f))
-                        l]
-                       [show? 
-                        (new-logger-text)
-                        (send logger-gui-canvas set-editor logger-gui-text)
-                        (update-logger-window #f)
-                        (send logger-menu-item set-label (string-constant hide-log))
-                        (append (remq logger-panel l) (list logger-panel))]
-                       [else
-                        (send logger-menu-item set-label (string-constant show-log))
-                        (set! logger-gui-text #f)
-                        (send logger-gui-canvas set-editor #f)
-                        (remq logger-panel l)])))]
-            [else
-             (when show? ;; if we want to hide and it isn't built yet, do nothing
-               (define logger-gui-content-panel-parent (new vertical-panel%
-                                                            [style '(border)]
-                                                            [parent logger-panel]
-                                                            [stretchable-height #t]))
-               (set! logger-gui-content-panel
-                     (new horizontal-panel%
-                          [parent logger-gui-content-panel-parent]
-                          [stretchable-height #f]))
-               (new-logger-text)
-               (set! logger-gui-canvas 
-                     (new editor-canvas%
-                          [parent logger-gui-content-panel-parent]
-                          [style '(transparent no-border)]
-                          [editor logger-gui-text]))
-               (new message% [label (string-constant log-messages)] [parent logger-gui-content-panel])
-               (new button% 
-                    [label (string-constant help)]
-                    [callback (λ (x y) 
-                                (define-values (path tag) 
-                                  (xref-tag->path+anchor 
-                                   (load-collections-xref)
-                                   (make-section-tag
-                                    "follow-log"
-                                    #:doc '(lib "scribblings/drracket/drracket.scrbl"))))
-                                (define url (path->url path))
-                                (define url2 (if tag
-                                                 (make-url (url-scheme url)
-                                                           (url-user url)
-                                                           (url-host url)
-                                                           (url-port url)
-                                                           (url-path-absolute? url)
-                                                           (url-path url)
-                                                           (url-query url)
-                                                           tag)
-                                                 url))
-                                (send-url (url->string url2)))]
-                    [parent logger-gui-content-panel])
-               (set! logger-text-field
-                     (keymap:call/text-keymap-initializer
-                      (λ ()
-                        (new text-field% 
-                             [parent logger-gui-content-panel] 
-                             [label "‹level›@‹name› ..."]
-                             [init-value 
-                              (send (get-interactions-text) get-user-log-receiver-args-str)]
-                             [callback
-                              (λ (tf evt)
-                                (define str (send (send tf get-editor) get-text))
-                                (define args (parse-logger-args str))
-                                (preferences:set 'drracket:logger-receiver-string str)
-                                (send (get-interactions-text) set-user-log-receiver-args
-                                      str
-                                      (if (null? args) #f args))
-                                (set-logger-text-field-bg-color args))]))))
-               (set-logger-text-field-bg-color (parse-logger-args (send logger-text-field get-value)))
-               (set! logger-checkbox 
-                     (new check-box%
-                          [label (string-constant logger-scroll-on-output)]
-                          [callback (λ (a b) (preferences:set 'drracket:logger-scroll-to-bottom?
-                                                              (send logger-checkbox get-value)))]
-                          [parent logger-gui-content-panel]
-                          [value (preferences:get 'drracket:logger-scroll-to-bottom?)]))
-               (new button% 
-                    [label (string-constant hide-log)]
-                    [callback (λ (x y) (send current-tab hide-log))]
-                    [parent logger-gui-content-panel])
-               (send logger-menu-item set-label (string-constant hide-log))
-               (update-logger-window #f)
-               (send logger-parent-panel change-children (λ (l) (append l (list logger-panel)))))])
-          (with-handlers ([exn:fail? void])
-            (send logger-parent-panel set-percentages (list p (- 1 p))))
-          (update-logger-button-label)
-          (end-container-sequence)))
-      
-      (define/public (set-logger-text-field-value str)
-        (when logger-text-field
-          (send logger-text-field set-value str)
-          (set-logger-text-field-bg-color (parse-logger-args str))))
-      
-      (define/private (set-logger-text-field-bg-color good?)
-        (send logger-text-field set-field-background 
-              (send the-color-database find-color (if good? "white" "pink"))))
-      
-      (define/private (log-shown?)
-        (and logger-gui-content-panel
-             (member logger-panel (send logger-parent-panel get-children))))
-      
-      (define/private (new-logger-text)
-        (set! logger-gui-text (new (text:hide-caret/selection-mixin 
-                                    (editor:standard-style-list-mixin
-                                     text:line-spacing%))))
-        (send logger-gui-text lock #t))
-      
-      (define/public (update-logger-window command)
-        (when logger-gui-text 
-          (define admin (send logger-gui-text get-admin))
-          (define canvas (send logger-gui-text get-canvas))
-          (when (and canvas admin)
-            (define logger-messages (send interactions-text get-logger-messages))
-            (cond
-              [(and (pair? command)
-                    (pair? logger-messages)
-                    ;; just flush and redraw everything if there is one (or zero) logger messages
-                    (pair? (cdr logger-messages)))
-               (define msg (cdr command))
-               (define scroll? (if (object? logger-checkbox)
-                                   (send logger-checkbox get-value)
-                                   #t))
-               (send logger-gui-text begin-edit-sequence)
-               (send logger-gui-text lock #f)
-               (case (car command)
-                 [(add-line) (void)]
-                 [(clear-last-and-add-line)
-                  (send logger-gui-text delete
-                        0
-                        (send logger-gui-text paragraph-start-position 1)
-                        #f)])
-               (send logger-gui-text insert
-                     "\n"
-                     (send logger-gui-text last-position)
-                     (send logger-gui-text last-position)
-                     #f)
-               (send logger-gui-text insert 
-                     msg 
-                     (send logger-gui-text last-position)
-                     (send logger-gui-text last-position)
-                     #f)
-               (when scroll?
-                 (send logger-gui-text scroll-to-position
-                       (send logger-gui-text
-                             paragraph-start-position
-                             (send logger-gui-text last-paragraph))))
-               (send logger-gui-text end-edit-sequence)
-               (send logger-gui-text lock #t)]
-              [else
-               (send logger-gui-text begin-edit-sequence)
-               (send logger-gui-text lock #f)
-               (send logger-gui-text erase)
-               
-               (define (insert-one msg)
-                 (send logger-gui-text insert msg 0 0)) 
-               
-               (unless (null? logger-messages)
-                 ;; skip the last newline in the buffer
-                 (insert-one (car logger-messages))
-                 (for ([msg (in-list (cdr (send interactions-text get-logger-messages)))])
-                   (insert-one "\n")
-                   (insert-one msg)))
-               
-               (send logger-gui-text lock #t)
-               (send logger-gui-text end-edit-sequence)]))))
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;; planet status 
-      ;;
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      
-      (define planet-status-parent-panel #f)
-      (define planet-status-panel #f)
-      (define planet-message #f)
-      (define planet-logger-button #f)
-      ;; local-member-name
-      (define/public (show-planet-status tag package)
-        (cond
-          [(and (not tag)
-                (not package)
-                (or (not planet-status-parent-panel)
-                    (not (member planet-status-panel 
-                                 (send planet-status-parent-panel get-children)))))
-           ;; if there is no information and there is no GUI there, don't do anything
-           (void)]
-          [else
-           (when planet-status-panel
-             (unless planet-message
-               (new message% 
-                    [parent planet-status-panel]
-                    [label drracket:debug:small-planet-bitmap])
-               (set! planet-message (new message% 
-                                         [parent planet-status-panel] 
-                                         [label ""]
-                                         [stretchable-width #t]))
-               (set! planet-logger-button
-                     (new button%
-                          [font small-control-font]
-                          [parent planet-status-panel]
-                          [label (string-constant show-log)]
-                          [callback (λ (a b) (send current-tab toggle-log))]))
-               (update-logger-button-label)
-               (new close-icon%
-                    [parent planet-status-panel]
-                    [callback (λ () 
-                                (send planet-status-parent-panel change-children
-                                      (λ (l)
-                                        (remq planet-status-panel l)))
-                                (send current-tab clear-planet-status))]))
-             (send planet-message set-label 
-                   (case tag
-                     [(download)
-                      (format (string-constant planet-downloading) package)]
-                     [(install)
-                      (format (string-constant planet-installing) package)]
-                     [(docs-build)
-                      (format (string-constant planet-docs-building) package)]
-                     [(finish)
-                      (format (string-constant planet-finished) package)]
-                     [else
-                      (string-constant planet-no-status)]))
-             (send planet-status-parent-panel change-children
-                   (λ (l)
-                     (if (memq planet-status-panel l)
-                         l
-                         (append (remq planet-status-panel l) (list planet-status-panel))))))]))
-      
-      (define/private (update-logger-button-label)
-        (when planet-logger-button
-          (send planet-logger-button set-label
-                (if (and logger-gui-text
-                         (member logger-panel (send logger-parent-panel get-children)))
-                    (string-constant hide-log)
-                    (string-constant show-log)))))
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;; transcript
-      ;;
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      
-      
-      ;; transcript : (union #f string[directory-name])
-      (field [transcript #f]
-             [definitions-transcript-counter 0]  ;; number
-             [interactions-transcript-counter 0] ;; number
-             [transcript-parent-panel #f]    ;; panel (unitialized short time only)
-             [transcript-panel #f]           ;; panel (unitialized short time only)
-             [transcript-menu-item #f])      ;; menu-item (unitialized short time only)
-      ;; record-definitions : -> void
-      (define/private (record-definitions)
-        (when transcript
-          (set! definitions-transcript-counter (+ definitions-transcript-counter 1))
-          (send definitions-text save-file 
-                (build-path transcript (format "~a-definitions" 
-                                               (pad-two definitions-transcript-counter)))
-                'copy)))
-      
-      ;; record-ineractions : -> void
-      (define/private (record-interactions)
-        (when transcript
-          (set! interactions-transcript-counter (+ interactions-transcript-counter 1))
-          (send interactions-text save-file 
-                (build-path transcript (format "~a-interactions" 
-                                               (pad-two interactions-transcript-counter)))
-                'copy)))
-      
-      ;; pad-two : number -> string
-      ;; pads a number to two digits?
-      (define/private (pad-two n)
-        (cond
-          [(<= 0 n 9) (format "0~a" n)]
-          [else (format "~a" n)]))
-      
-      ;; start-transcript : -> void
-      ;; turns on the transcript and shows the transcript gui
-      (define/private (start-transcript)
-        (let ([transcript-directory (mred:get-directory
-                                     (string-constant please-choose-a-log-directory)
-                                     this)])
-          (when (and transcript-directory
-                     (ensure-empty transcript-directory))
-            (send transcript-menu-item set-label (string-constant stop-logging))
-            (set! transcript transcript-directory)
-            (set! definitions-transcript-counter 0)
-            (set! interactions-transcript-counter 0)
-            (build-transcript-panel)
-            (record-definitions))))
-      
-      ;; stop-transcript : -> void
-      ;; turns off the transcript procedure
-      (define/private (stop-transcript)
-        (record-interactions)
-        (send transcript-menu-item set-label (string-constant log-definitions-and-interactions))
-        (set! transcript #f)
-        (send transcript-panel change-children (λ (l) null)))
-      
-      ;; build-transcript-panel : -> void
-      ;; builds the contents of the transcript panel
-      (define/private (build-transcript-panel)
-        (define hp (make-object horizontal-panel% transcript-panel '(border)))
-        (make-object message% (string-constant logging-to) hp)
-        (send (make-object message% (path->string transcript) hp) stretchable-width #t)
-        (make-object button% (string-constant stop-logging) hp (λ (x y) (stop-transcript))))
-      
-      ;; ensure-empty : string[directory] -> boolean
-      ;; if the transcript-directory is empty, just return #t
-      ;; if not, ask the user about emptying it. 
-      ;;   if they say yes, try to empty it.
-      ;;     if that fails, report the error and return #f.
-      ;;     if it succeeds, return #t.
-      ;;   if they say no, return #f.
-      (define/private (ensure-empty transcript-directory)
-        (let ([dir-list (directory-list transcript-directory)])
-          (or (null? dir-list)
-              (let ([query (message-box 
-                            (string-constant drscheme)
-                            (gui-utils:format-literal-label
-                             (string-constant erase-log-directory-contents)
-                             transcript-directory)
-                            this
-                            '(yes-no)
-                            #:dialog-mixin frame:focus-table-mixin)])
-                (cond
-                  [(equal? query 'no) 
-                   #f]
-                  [(equal? query 'yes)
-                   (with-handlers ([exn:fail:filesystem?
-                                    (λ (exn)
-                                      (message-box 
-                                       (string-constant drscheme)
-                                       (gui-utils:format-literal-label 
-                                        (string-constant error-erasing-log-directory)
-                                        (if (exn? exn)
-                                            (format "~a" (exn-message exn))
-                                            (format "~s" exn)))
-                                       this
-                                       #:dialog-mixin frame:focus-table-mixin)
-                                      #f)])
-                     (for-each (λ (file) (delete-file (build-path transcript-directory file)))
-                               dir-list)
-                     #t)])))))
-      
-      (define/override (make-root-area-container cls parent)
-        (let* ([_module-browser-parent-panel
-                (super make-root-area-container 
-                       (make-two-way-prefs-dragable-panel% panel:horizontal-dragable%
-                                                           'drracket:module-browser-size-percentage)
-                       parent)]
-               [_module-browser-panel (new vertical-panel%
-                                           (parent _module-browser-parent-panel)
-                                           (alignment '(left center))
-                                           (stretchable-width #f))]
-               [planet-status-outer-panel (new vertical-panel% [parent _module-browser-parent-panel])]
-               [execute-warning-outer-panel (new vertical-panel% [parent planet-status-outer-panel])]
-               [logger-outer-panel (new (make-two-way-prefs-dragable-panel%
-                                         panel:vertical-dragable%
-                                         'drracket:logging-size-percentage)
-                                        [parent execute-warning-outer-panel])]
-               [trans-outer-panel (new vertical-panel% [parent logger-outer-panel])]
-               [root (make-object cls trans-outer-panel)])
-          (set! module-browser-parent-panel _module-browser-parent-panel)
-          (set! module-browser-panel _module-browser-panel)
-          (send module-browser-parent-panel change-children (λ (l) (remq module-browser-panel l)))
-          (set! logger-parent-panel logger-outer-panel)
-          (set! logger-panel (new vertical-panel% [parent logger-parent-panel]))
-          (send logger-parent-panel change-children (lambda (x) (remq logger-panel x)))
-          
-          (set! execute-warning-parent-panel execute-warning-outer-panel)
-          (set! execute-warning-panel (new horizontal-panel% 
-                                           [parent execute-warning-parent-panel]
-                                           [stretchable-height #f]))
-          (send execute-warning-parent-panel change-children (λ (l) (remq execute-warning-panel l)))
-          
-          (set! transcript-parent-panel (new horizontal-panel%
-                                             (parent trans-outer-panel)
-                                             (stretchable-height #f)))
-          (set! transcript-panel (make-object horizontal-panel% transcript-parent-panel))
-          (set! planet-status-parent-panel (new vertical-panel% 
-                                                [parent planet-status-outer-panel]
-                                                [stretchable-height #f]))
-          (set! planet-status-panel (new horizontal-panel% 
-                                         [parent planet-status-parent-panel]))
-          (send planet-status-parent-panel change-children (λ (l) (remq planet-status-panel l)))
-          (unless (toolbar-shown?)
-            (send transcript-parent-panel change-children (λ (l) '())))
-          (send logger-outer-panel enable-two-way-prefs)
-          (send _module-browser-parent-panel enable-two-way-prefs)
-          
-          root))
-      
-      (inherit show-info hide-info is-info-hidden?)
-      (field [toolbar-state (preferences:get 'drracket:toolbar-state)]
-             [toolbar-top-menu-item #f]
-             [toolbar-top-no-label-menu-item #f]
-             [toolbar-left-menu-item #f]
-             [toolbar-right-menu-item #f]
-             [toolbar-hidden-menu-item #f]
-             [toolbar-menu #f])
-      
-      ;; returns #t if the toolbar is visible, #f otherwise
-      (define/private (toolbar-shown?) (car toolbar-state))
-      
-      (define/private (change-toolbar-state new-state)
-        (set! toolbar-state new-state)
-        (preferences:set 'drracket:toolbar-state new-state)
-        (update-toolbar-visibility))
-      
-      (define/override (on-toolbar-button-click) 
-        (change-toolbar-state (cons (not (car toolbar-state)) (cdr toolbar-state))))
-      (define/private (set-toolbar-left) (change-toolbar-state (cons #f 'left)))
-      (define/private (set-toolbar-right) (change-toolbar-state (cons #f 'right)))
-      (define/private (set-toolbar-top) (change-toolbar-state (cons #f 'top)))
-      (define/private (set-toolbar-top-no-label) (change-toolbar-state (cons #f 'top-no-label)))
-      (define/private (set-toolbar-hidden) (change-toolbar-state (cons #t (cdr toolbar-state))))
-      
-      (define/public (update-toolbar-visibility)
-        (let* ([hidden? (toolbar-is-hidden?)]
-               [left? (toolbar-is-left?)]
-               [right? (toolbar-is-right?)]
-               [top? (toolbar-is-top?)]
-               [top-no-label? (toolbar-is-top-no-label?)])
-          
-          (send toolbar-left-menu-item check left?)
-          (send toolbar-right-menu-item check right?)
-          (send toolbar-top-menu-item check top?)
-          (send toolbar-top-no-label-menu-item check top-no-label?)
-          (send toolbar-hidden-menu-item check hidden?)
-          
-          (cond
-            [hidden?
-             (hide-info)
-             (send top-outer-panel change-children (λ (l) '()))
-             (send transcript-parent-panel change-children (λ (l) '()))]
-            [top? (orient/show #t)]
-            [top-no-label? (orient/show #t)]
-            [left? (orient/show #t)]
-            [right? (orient/show #f)]))
-        (update-defs/ints-resize-corner))
-      
-      (define/private (toolbar-is-hidden?)
-        (car (preferences:get 'drracket:toolbar-state)))
-      (define/private (toolbar-is-top?)
-        (and (not (toolbar-is-hidden?))
-             (equal? (cdr (preferences:get 'drracket:toolbar-state))
-                     'top)))
-      (define/private (toolbar-is-right?)
-        (and (not (toolbar-is-hidden?))
-             (equal? (cdr (preferences:get 'drracket:toolbar-state))
-                     'right)))
-      (define/private (toolbar-is-left?)
-        (and (not (toolbar-is-hidden?))
-             (equal? (cdr (preferences:get 'drracket:toolbar-state))
-                     'left)))
-      (define/private (toolbar-is-top-no-label?)
-        (and (not (toolbar-is-hidden?))
-             (equal? (cdr (preferences:get 'drracket:toolbar-state))
-                     'top-no-label)))
-      
-      (define/private (orient/show bar-at-beginning?)
-        (let ([vertical? (or (toolbar-is-left?) (toolbar-is-right?))])
-          (begin-container-sequence)
-          (show-info)
-          
-          ;; orient the button panel and all panels inside it.
-          (let loop ([obj button-panel])
-            (when (is-a? obj area-container<%>)
-              (when (or (is-a? obj vertical-panel%)
-                        (is-a? obj horizontal-panel%)
-                        (is-a? obj panel:discrete-sizes<%>))
-                (unless (equal? (send obj get-orientation) (not vertical?))
-                  (send obj set-orientation (not vertical?))))
-              (for-each loop (send obj get-children))))
-          (sort-toolbar-buttons-panel)
-          
-          (set-toolbar-label-visibilities/check-registered)
-          
-          (send top-outer-panel stretchable-height vertical?)
-          (send top-outer-panel stretchable-width (not vertical?))
-          (send top-panel set-orientation (not vertical?))
-          (send toolbar/rest-panel set-orientation vertical?)
-          (send toolbar/rest-panel change-children
-                (λ (l)
-                  (if bar-at-beginning?
-                      (cons top-outer-panel (remq top-outer-panel l))
-                      (append (remq top-outer-panel l) (list top-outer-panel)))))
-          (send top-outer-panel change-children (λ (l) (list top-panel)))
-          (send transcript-parent-panel change-children (λ (l) (list transcript-panel)))
-          
-          (let* ([settings (send definitions-text get-next-settings)]
-                 [language (drracket:language-configuration:language-settings-language settings)]
-                 [name (get-define-popup-name (send language capability-value 'drscheme:define-popup)
-                                              vertical?)])
-            (when name
-              (send func-defs-canvas set-message #f name)))
-          (send name-message set-short-title vertical?)
-          (send name-panel set-orientation (not vertical?))
-          (if vertical?
-              (send name-panel set-alignment 'right 'top)
-              (send name-panel set-alignment 'left 'center))
-          (end-container-sequence)))
-      
-      ;; this table uses object identity on buttons(!)
-      (define toolbar-buttons (make-hasheq))
-      (define smallest #f)
-      
-      (define/public (register-toolbar-button b #:number [number/f #f])
-        (add-to-toolbar-buttons 'register-toolbar-button b number/f)
-        (set-toolbar-label-visibilities/check-registered)
-        (sort-toolbar-buttons-panel))
-      
-      (define/public (register-toolbar-buttons bs #:numbers [numbers/fs (make-list (length bs) #f)])
-        (for ([b (in-list bs)]
-              [n (in-list numbers/fs)]) 
-          (add-to-toolbar-buttons 'register-toolbar-buttons b n))
-        (set-toolbar-label-visibilities/check-registered)
-        
-        ;; sort panel contents
-        (define panels '())
-        (for ([tb (in-list bs)])
-          (define parent (send tb get-parent))
-          (unless (memq parent panels)
-            (set! panels (cons parent panels))))
-        (for ([panel (in-list panels)])
-          (sort-toolbar-buttons-panel)))
-      
-      (define/private (add-to-toolbar-buttons who button number/f)
-        (define number (or number/f (if smallest (- smallest 1) 100)))
-        (define prev (hash-ref toolbar-buttons button #f))
-        (when (and prev (not (= prev number)))
-          (error who "cannot add toolbar button ~s with number ~a; already added with ~a"
-                 (send button get-label)
-                 number
-                 prev))
-        (when (or (not smallest) (< number smallest))
-          (set! smallest number))
-        (hash-set! toolbar-buttons button number))
-      
-      (define/private (in-toolbar-list? b) (hash-ref toolbar-buttons b #f))
-      
-      (define/public (unregister-toolbar-button b)
-        (hash-remove! toolbar-buttons b)
-        (set! smallest
-              (if (zero? (hash-count toolbar-buttons))
-                  #f
-                  (apply min (hash-map toolbar-buttons (λ (x y) y)))))
-        (void))
-      
-      (define/public (sort-toolbar-buttons-panel)
-        (define bp (get-button-panel))
-        (when (is-a? bp panel%)
-          (let sort-loop ([panel bp])
-            (define min #f)
-            (send panel change-children
-                  (λ (l)
-                    (define sub-panel-nums (make-hash))
-                    (for ([x (in-list l)])
-                      (when (is-a? x area-container<%>)
-                        (hash-set! sub-panel-nums x (sort-loop x))))
-                    (define (key i)
-                      (or (let loop ([item i])
-                            (cond
-                              [(is-a? item area-container<%>)
-                               (hash-ref sub-panel-nums item)]
-                              [else
-                               (hash-ref toolbar-buttons item #f)]))
-                          -5000))
-                    (define (min/f a b)
-                      (cond
-                        [(and a b) (min a b)]
-                        [else (or a b)]))
-                    (define cmp
-                      (cond
-                        [(is-a? panel vertical-pane%) >=]
-                        [(is-a? panel horizontal-pane%) <=]
-                        [else
-                         (if (send panel get-orientation) ;; horizontal is #t
-                             <=
-                             >=)]))
-                    (define ans (sort l cmp #:key key))
-                    (set! min (if (null? ans)
-                                  #f
-                                  (key (car ans))))
-                    ans))
-            min)
-          (void)))
-
-      (define/private (set-toolbar-label-visibilities/check-registered)
-        (define label-visible? (toolbar-is-top?))
-        (for ([(button number) (in-hash toolbar-buttons)])
-          (send button set-label-visible label-visible?))
-        
-        (let loop ([obj button-panel])
-          (cond
-            [(is-a? obj area-container<%>)
-             (for-each loop (send obj get-children))]
-            [(is-a? obj switchable-button%)
-             (unless (in-toolbar-list? obj)
-               (error 'register-toolbar-button 
-                      "found a switchable-button% that is not registered, label ~s"
-                      (send obj get-label)))]
-            [else (void)])))
-      
-      (field [remove-show-status-line-callback
-              (preferences:add-callback
-               'framework:show-status-line
-               (λ (p v)
-                 (update-defs/ints-resize-corner/pref v)))])
-      
-      (define/private (update-defs/ints-resize-corner)
-        (update-defs/ints-resize-corner/pref
-         (preferences:get 'framework:show-status-line)))
-      
-      (define/private (update-defs/ints-resize-corner/pref si-pref)
-        (let ([bottom-material? (and (not (car toolbar-state))
-                                     si-pref)])
-          (let loop ([cs definitions-canvases])
-            (cond
-              [(null? cs) (void)]
-              [(null? (cdr cs))
-               (send (car cs) set-resize-corner (and (not bottom-material?)
-                                                     (not interactions-shown?)))]
-              [else
-               (send (car cs) set-resize-corner #f)
-               (loop (cdr cs))]))
-          (let loop ([cs interactions-canvases])
-            (cond
-              [(null? cs) (void)]
-              [(null? (cdr cs))
-               (send (car cs) set-resize-corner (and (not bottom-material?) 
-                                                     interactions-shown?))]
-              [else
-               (send (car cs) set-resize-corner #f)
-               (loop (cdr cs))]))))
-      
-      [define definitions-item #f]
-      [define interactions-item #f]
-      [define name-message #f]
-      [define save-button #f]
-      [define save-init-shown? #f]
-      
-      [define/private set-save-init-shown? (λ (x) (set! save-init-shown? x))]
-      
-      [define canvas-show-mode #f]
-      [define allow-split? #f]
-      [define forced-quit? #f]
-      [define search-canvas #f]
-      
-      (define/public (make-searchable canvas)
-        (update-info)
-        (set! search-canvas canvas))
-      
-      (define was-locked? #f)
-      
-      (define/public-final (disable-evaluation-in-tab tab)
-        (when (eq? tab current-tab)
-          (disable-evaluation)))
-      
-      (define/pubment (disable-evaluation)
-        (when execute-menu-item
-          (send execute-menu-item enable #f))
-        (send execute-button enable #f)
-        (inner (void) disable-evaluation))
-      
-      (define/public-final (enable-evaluation-in-tab tab)
-        (when (eq? tab current-tab)
-          (enable-evaluation)))
-      
-      (define/pubment (enable-evaluation)
-        (when execute-menu-item
-          (send execute-menu-item enable #t))
-        (send execute-button enable #t)
-        (inner (void) enable-evaluation))
-      
-      (inherit set-label)
-      (inherit modified)
-      (define/public (update-save-button)
-        (let ([mod? (send definitions-text is-modified?)])
-          (modified mod?)
-          (if save-button
-              (unless (equal? mod? (send save-button is-shown?))
-                (send save-button show mod?))
-              (set! save-init-shown? mod?))
-          (update-tab-label current-tab)))
-      
-      (define/public (language-changed)
-        (define settings (send definitions-text get-next-settings))
-        (define language (drracket:language-configuration:language-settings-language settings))
-        (send func-defs-canvas language-changed language (or (toolbar-is-left?)
-                                                             (toolbar-is-right?)))
-        (send language-message set-yellow/lang
-              (not (send definitions-text this-and-next-language-the-same?))
-              (string-append (send language get-language-name)
-                             (if (send language default-settings? 
-                                       (drracket:language-configuration:language-settings-settings
-                                        settings))
-                                 ""
-                                 (string-append " " (string-constant custom)))))
-        (update-teachpack-menu)
-        (when (is-a? language-specific-menu menu%)
-          (define label (send language-specific-menu get-label))
-          (define new-label (send language capability-value 'drscheme:language-menu-title))
-          (unless (equal? label new-label)
-            (send language-specific-menu set-label new-label))))
-      
-      (define/public (get-language-menu) language-specific-menu)
-      
-      ;; update-save-message : -> void
-      ;; sets the save message. If input is #f, uses the frame's
-      ;; title.
-      (define/public (update-save-message)
-        (when name-message
-          (let ([filename (send definitions-text get-filename)])
-            (send name-message set-message 
-                  (if filename #t #f)
-                  (send definitions-text get-filename/untitled-name))))
-        (update-tabs-labels))
-      
-      (define/private (update-tabs-labels)
-        (for-each (λ (tab) (update-tab-label tab)) tabs)
-        (send tabs-panel set-selection (send current-tab get-i))
-        (send (send tabs-panel get-parent)
-              change-children
-              (λ (l)
-                (cond
-                  [(= (send tabs-panel get-number) 1)
-                   (remq tabs-panel l)]
-                  [else
-                   (if (memq tabs-panel l)
-                       l
-                       (cons tabs-panel l))]))))
-      
-      (define/private (update-tab-label tab)
-        (let ([label (gui-utils:trim-string (get-defs-tab-label (send tab get-defs) tab) 200)])
-          (unless (equal? label (send tabs-panel get-item-label (send tab get-i)))
-            (send tabs-panel set-item-label (send tab get-i) label))))
-      
-      (define/public (get-tab-filename i)
-        (get-defs-tab-filename (send (list-ref tabs i) get-defs)))
-      
-      (define/private (get-defs-tab-label defs tab)
-        (define tab-index
-          (for/or ([i (in-list tabs)]
-                   [n (in-naturals 1)])
-            (and (eq? i tab) n)))
-        (define i-prefix
-          (cond
-            [(not tab-index) ""]
-            [(<= tab-index 8) (format "~a: " tab-index)]
-            [(= tab-index (get-tab-count)) "9: "]
-            [else ""]))
-        (add-modified-flag
-         defs
-         (string-append
-          i-prefix
-          (get-defs-tab-filename defs))))
-      
-      (define/private (get-defs-tab-filename defs)
-        (let ([fn (send defs get-filename)])
-          (if fn
-              (get-tab-label-from-filename fn)
-              (send defs get-filename/untitled-name))))
-      
-      ;; tab-label-cache-valid : (listof path)
-      ;; If the current set of filenames in the tabs is the
-      ;;   same set of filenames as in this list, then the
-      ;;   tab-label-cache is valid; otherwise not
-      (define tab-label-cache-valid '())
-      
-      ;; tab-label-cache : path -o> string
-      (define tab-label-cache (make-hasheq))
-      
-      (define/private (get-tab-label-from-filename fn)
-        (define current-paths (map (lambda (tab) (send (send tab get-defs) get-filename))
-                                   tabs))
-        (unless (and (= (length tab-label-cache-valid) (length current-paths))
-                     (andmap eq? tab-label-cache-valid current-paths))
-          (set! tab-label-cache-valid current-paths)
-          (set! tab-label-cache (make-hasheq)))
-        (define nfn (normalize-path/exists fn))
-        (hash-ref! tab-label-cache 
-                   fn
-                   (lambda () 
-                     (path->string
-                      (or (shrink-path-wrt
-                           nfn
-                           (filter values
-                                   (for/list ([other-tab (in-list tabs)])
-                                     (define fn (send (send other-tab get-defs) get-filename))
-                                     (and fn (normalize-path/exists fn)))))
-                          (let-values ([(base name dir?) (split-path nfn)])
-                            name))))))
-
-      (define/private (normalize-path/exists fn)
-        (if (file-exists? fn)
-            (normalize-path fn)
-            fn))
-
-      (define/private (add-modified-flag text string)
-        (if (send text is-modified?)
-            (let ([prefix (get-save-diamond-prefix)])
-              (if prefix
-                  (string-append prefix string)
-                  string))
-            string))
-      
-      (define/private (get-save-diamond-prefix)
-        (let ([candidate-prefixes 
-               ;; be sure asterisk is at the end of each list,
-               ;; since that's a relatively safe character
-               (case (system-type)
-                 [(unix windows) '("★ " "◆ " "• " "* ")]
-                 [else '("◆ " "★ " "• " "* ")])])
-          (ormap
-           (lambda (candidate)
-             (and (andmap (λ (x) (send normal-control-font screen-glyph-exists? x #t))
-                          (string->list candidate))
-                  candidate))
-           candidate-prefixes)))
-      
-      [define/override get-canvas% (λ () (drracket:get/extend:get-definitions-canvas))]
-      
-      (define/public (update-running running?)
-        (send running-canvas set-running running?))
-      (define/public (ensure-defs-shown)
-        (unless definitions-shown?
-          (toggle-show/hide-definitions)
-          (update-shown)))
-      (define/public (ensure-rep-shown rep)
-        (unless (eq? rep interactions-text)
-          (let loop ([tabs tabs])
-            (unless (null? tabs)
-              (let ([tab (car tabs)])
-                (if (eq? (send tab get-ints) rep)
-                    (change-to-tab tab)
-                    (loop (cdr tabs)))))))
-        (unless interactions-shown?
-          (toggle-show/hide-interactions)
-          (update-shown)))
-      (define/public (ensure-rep-hidden)
-        (when interactions-shown?
-          (toggle-show/hide-interactions)
-          (update-shown)))
-      
-      (define/override (get-editor%) (drracket:get/extend:get-definitions-text))
-      (define/public (still-untouched?)
-        (and (send definitions-text still-untouched?)
-             (let* ([prompt (send interactions-text get-prompt)]
-                    [first-prompt-para
-                     (let loop ([n 0])
-                       (cond
-                         [(n . <= . (send interactions-text last-paragraph))
-                          (if (string=?
-                               (send interactions-text get-text 
-                                     (send interactions-text paragraph-start-position n)
-                                     (+ (send interactions-text paragraph-start-position n)
-                                        (string-length prompt)))
-                               prompt)
-                              n
-                              (loop (+ n 1)))]
-                         [else #f]))])
-               (and first-prompt-para
-                    (= first-prompt-para (send interactions-text last-paragraph))
-                    (equal? 
-                     (send interactions-text get-text
-                           (send interactions-text paragraph-start-position first-prompt-para)
-                           (send interactions-text paragraph-end-position first-prompt-para))
-                     (send interactions-text get-prompt))))))
-      (define/public (change-to-file name)
-        (cond
-          [(and name (file-exists? name))
-           (ensure-rep-hidden)
-           (send definitions-text begin-edit-sequence #t #f)
-           (send definitions-text load-file/gui-error name)
-           (send definitions-text end-edit-sequence)
-           (send language-message set-yellow #f)]
-          [name
-           (send definitions-text set-filename name)]
-          [else (send definitions-text clear)])
-        (send definitions-canvas focus))
-      
-      
-      
-      
-      
-      
-      ;                                            
-      ;                                            
-      ;                                            
-      ;                           ;                
-      ;                           ;                
-      ;                           ;                
-      ;   ; ;;  ;;     ;;;     ;; ;    ;;;    ;;;  
-      ;   ;;  ;;  ;   ;   ;   ;  ;;   ;   ;  ;     
-      ;   ;   ;   ;  ;     ; ;    ;  ;    ;  ;;    
-      ;   ;   ;   ;  ;     ; ;    ;  ;;;;;;   ;;   
-      ;   ;   ;   ;  ;     ; ;    ;  ;          ;  
-      ;   ;   ;   ;   ;   ;   ;  ;;   ;         ;  
-      ;   ;   ;   ;    ;;;     ;; ;    ;;;;  ;;;   
-      ;                                            
-      ;                                            
-      ;                                            
-      
-      
-      (define/private (add-modes-submenu edit-menu)
-        (new menu%
-             [parent edit-menu]
-             [label (string-constant mode-submenu-label)]
-             [demand-callback
-              (λ (menu)
-                (for ([item (in-list (send menu get-items))])
-                  (send item delete))
-                (for ([mode (in-list (drracket:modes:get-modes))])
-                  (define item
-                    (new checkable-menu-item%
-                         (label (drracket:modes:mode-name mode))
-                         (parent menu)
-                         (callback 
-                          (λ (_1 _2) (send definitions-text set-current-mode
-                                           mode)))))
-                  (when (send definitions-text is-current-mode? mode)
-                    (send item check #t))))]))
-      
-      
-      
-      
-      ;                                                                                         
-      ;                                                                                         
-      ;                                                                                         
-      ;                  ;   ;           ;                  ;   ;                               
-      ;                  ;               ;                  ;   ;                               
-      ;                  ;       ;      ;                   ;   ;                               
-      ;    ;;;   ; ;;    ;   ;  ;;;;    ;     ;;;    ;;;    ;   ;   ;;;    ; ;;     ;;;    ;;;  
-      ;   ;      ;;  ;   ;   ;   ;      ;    ;   ;  ;   ;   ;   ;  ;   ;   ;;  ;   ;      ;   ; 
-      ;   ;;     ;    ;  ;   ;   ;      ;   ;      ;     ;  ;   ;      ;   ;    ;  ;;    ;    ; 
-      ;    ;;    ;    ;  ;   ;   ;     ;    ;      ;     ;  ;   ;   ;;;;   ;    ;   ;;   ;;;;;; 
-      ;      ;   ;    ;  ;   ;   ;     ;    ;      ;     ;  ;   ;  ;   ;   ;    ;     ;  ;      
-      ;      ;   ;;  ;   ;   ;   ;     ;     ;   ;  ;   ;   ;   ;  ;   ;   ;;  ;      ;   ;     
-      ;   ;;;    ; ;;    ;   ;    ;;  ;       ;;;    ;;;    ;   ;   ;;;;;  ; ;;    ;;;     ;;;; 
-      ;          ;                    ;                                    ;                    
-      ;          ;                    ;                                    ;                    
-      ;          ;                                                         ;                    
-      
-      
-      (inherit get-edit-target-window)
-      
-      (define/public (split)
-        (let ([canvas-to-be-split (get-edit-target-window)])
-          (cond
-            [(memq canvas-to-be-split definitions-canvases)
-             (split-definitions canvas-to-be-split)]
-            [(memq canvas-to-be-split interactions-canvases)
-             (split-interactions canvas-to-be-split)]
-            [else (bell)])))
-      
-      (define/private (split-definitions canvas-to-be-split)
-        (handle-split canvas-to-be-split
-                      (λ (x) (set! definitions-canvases x))
-                      definitions-canvases
-                      (drracket:get/extend:get-definitions-canvas)
-                      definitions-text))
-      
-      (define/private (split-interactions canvas-to-be-split)
-        (handle-split canvas-to-be-split
-                      (λ (x) (set! interactions-canvases x))
-                      interactions-canvases
-                      (drracket:get/extend:get-interactions-canvas)
-                      interactions-text))
-      
-      (define/private (handle-split canvas-to-be-split set-canvases! canvases canvas% text)
-        (let-values ([(ox oy ow oh cursor-y)
-                      (get-visible-region canvas-to-be-split)])
-          (let ([orig-percentages (send resizable-panel get-percentages)]
-                [orig-canvases (send resizable-panel get-children)]
-                [new-canvas (new canvas% 
-                                 (parent resizable-panel)
-                                 (editor text)
-                                 (style '()))])
-            
-            (set-canvases!
-             (let loop ([canvases canvases])
-               (cond
-                 [(null? canvases) (error 'split "couldn't split; didn't find canvas")]
-                 [else
-                  (let ([canvas (car canvases)])
-                    (if (eq? canvas canvas-to-be-split)
-                        (list* new-canvas
-                               canvas
-                               (cdr canvases))
-                        (cons canvas (loop (cdr canvases)))))])))
-            
-            (update-shown)
-            
-            ;; with-handlers prevents bad calls to set-percentages
-            ;; might still leave GUI in bad state, however.
-            (with-handlers ([exn:fail? (λ (x) (void))])
-              (send resizable-panel set-percentages
-                    (let loop ([canvases orig-canvases]
-                               [percentages orig-percentages])
-                      (cond
-                        [(null? canvases)
-                         (error 'split "couldn't split; didn't find canvas")]
-                        [(null? percentages)
-                         (error 'split "wrong number of percentages: ~s ~s"
-                                orig-percentages
-                                (send resizable-panel get-children))]
-                        [else (let ([canvas (car canvases)])
-                                (if (eq? canvas-to-be-split canvas)
-                                    (list* (/ (car percentages) 2)
-                                           (/ (car percentages) 2)
-                                           (cdr percentages))
-                                    (cons
-                                     (car percentages)
-                                     (loop (cdr canvases)
-                                           (cdr percentages)))))]))))
-            
-            (set-visible-region new-canvas ox oy ow oh cursor-y)
-            (set-visible-region canvas-to-be-split ox oy ow oh cursor-y)
-            
-            (send new-canvas focus))))
-      
-      ;; split-demand : menu-item -> void
-      ;; enables the menu-item if splitting is allowed, disables otherwise
-      (define/private (split-demand item)
-        (let ([canvas-to-be-split (get-edit-target-window)])
-          (send item enable
-                (or (memq canvas-to-be-split definitions-canvases)
-                    (memq canvas-to-be-split interactions-canvases))))) 
-      
-      ;; collapse-demand : menu-item -> void
-      ;; enables the menu-item if collapsing is allowed, disables otherwise
-      (define/private (collapse-demand item)
-        (let ([canvas-to-be-split (get-edit-target-window)])
-          (cond
-            [(memq canvas-to-be-split definitions-canvases)
-             (send item enable (2 . <= . (length definitions-canvases)))]
-            [(memq canvas-to-be-split interactions-canvases)
-             (send item enable (2 . <= . (length interactions-canvases)))]
-            [else
-             (send item enable #f)])))
-      
-      ;; get-visible-region : editor-canvas -> number number number number (union #f number)
-      ;; calculates the visible region of the editor in this editor-canvas, returning
-      ;; four numbers for the x, y, width and height of the visible region
-      ;; also, the last two booleans indiciate if the beginning and the end
-      ;; of the selection was visible before the split, respectively.
-      (define/private (get-visible-region canvas)
-        (send canvas call-as-primary-owner
-              (λ ()
-                (let* ([text (send canvas get-editor)]
-                       [admin (send text get-admin)]
-                       [start (send text get-start-position)]
-                       [end (send text get-end-position)])
-                  (let-values ([(x y w h) (get-visible-area admin)])
-                    (let ([ysb (box 0)])
-                      (send text position-location (send text get-start-position) #f ysb)
-                      (values x y w h
-                              (and (= start end)
-                                   (<= y (unbox ysb) (+ y h))
-                                   (unbox ysb)))))))))
-      
-      ;; set-visible-region : editor-canvas number number number number (union #f number) -> void
-      ;; sets the visible region of the text displayed by the editor canvas
-      ;; to be the middle of the region (vertically) specified by x, y, w, and h.
-      ;; if start-visible? and/or end-visible? are true, some special handling
-      ;; is done to try to keep the start and end visible, with precendence
-      ;; given to start if both are #t.
-      (define/private (set-visible-region canvas x y w h cursor-y)
-        (send canvas call-as-primary-owner
-              (λ ()
-                (let* ([text (send canvas get-editor)]
-                       [admin (send text get-admin)]
-                       [nwb (box 0)]
-                       [nhb (box 0)])
-                  (send admin get-view #f #f nwb nhb)
-                  (let* ([nw (unbox nwb)]
-                         [nh (unbox nhb)]
-                         
-                         [nx x]
-                         [raw-y (- (+ y (/ h 2)) (/ nh 2))]
-                         [ny (if (and cursor-y 
-                                      (not (<= raw-y cursor-y (+ raw-y nh))))
-                                 (- cursor-y (/ nh 2))
-                                 raw-y)])
-                    (send canvas scroll-to nx ny nw nh #t)
-                    (void))))))
-      
-      ;; get-visible-area : admin -> number number number number
-      ;; returns the visible area for this admin
-      (define/private (get-visible-area admin)
-        (let ([bx (box 0)]
-              [by (box 0)]
-              [bw (box 0)]
-              [bh (box 0)])
-          (send admin get-view bx by bw bh)
-          (values (unbox bx)
-                  (unbox by)
-                  (unbox bw)
-                  (unbox bh))))
-      
-      (define/public (collapse)
-        (let* ([target (get-edit-target-window)])
-          (cond
-            [(memq target definitions-canvases)
-             (collapse-definitions target)]
-            [(memq target interactions-canvases)
-             (collapse-interactions target)]
-            [else (bell)])))
-      
-      (define/private (collapse-definitions target)
-        (handle-collapse
-         target
-         (λ () definitions-canvases)
-         (λ (c) (set! definitions-canvases c))))
-      
-      (define/private (collapse-interactions target)
-        (handle-collapse
-         target
-         (λ () interactions-canvases)
-         (λ (c) (set! interactions-canvases c))))
-      
-      (define/private (handle-collapse target get-canvases set-canvases!)
-        (if (= 1 (length (get-canvases)))
-            (bell)
-            (let* ([old-percentages (send resizable-panel get-percentages)]
-                   [soon-to-be-bigger-canvas #f]
-                   [percentages
-                    (if (and target (eq? (car (get-canvases)) target))
-                        (begin
-                          (set! soon-to-be-bigger-canvas (cadr (get-canvases)))
-                          (cons (+ (car old-percentages)
-                                   (cadr old-percentages))
-                                (cddr old-percentages)))
-                        (let loop ([canvases (cdr (get-canvases))]
-                                   [prev-canvas (car (get-canvases))]
-                                   [percentages (cdr old-percentages)]
-                                   [prev-percentage (car old-percentages)])
-                          (cond
-                            [(null? canvases)
-                             (error 'collapse "internal error.1")]
-                            [(null? percentages)
-                             (error 'collapse "internal error.2")]
-                            [else
-                             (if (and target (eq? (car canvases) target))
-                                 (begin
-                                   (set! soon-to-be-bigger-canvas prev-canvas)
-                                   (cons (+ (car percentages)
-                                            prev-percentage)
-                                         (cdr percentages)))
-                                 (cons prev-percentage
-                                       (loop (cdr canvases)
-                                             (car canvases)
-                                             (cdr percentages)
-                                             (car percentages))))])))])
-              (unless soon-to-be-bigger-canvas
-                (error 'collapse "internal error.3"))
-              (set-canvases! (remq target (get-canvases)))
-              (update-shown)
-              
-              (let ([target-admin 
-                     (send target call-as-primary-owner
-                           (λ ()
-                             (send (send target get-editor) get-admin)))]
-                    [to-be-bigger-admin 
-                     (send soon-to-be-bigger-canvas call-as-primary-owner
-                           (λ ()
-                             (send (send soon-to-be-bigger-canvas get-editor) get-admin)))])
-                (let-values ([(bx by bw bh) (get-visible-area target-admin)])
-                  
-                  ;; this line makes the soon-to-be-bigger-canvas bigger
-                  ;; if it fails, we're out of luck, but at least we don't crash.
-                  (with-handlers ([exn:fail? (λ (x) (void))])
-                    (send resizable-panel set-percentages percentages))
-                  
-                  (let-values ([(ax ay aw ah) (get-visible-area to-be-bigger-admin)])
-                    (send soon-to-be-bigger-canvas scroll-to
-                          bx
-                          (- by (/ (- ah bh) 2))
-                          aw
-                          ah
-                          #t))))
-              
-              (send target set-editor #f)
-              (send soon-to-be-bigger-canvas focus))))
-      ;                                                                          
-      ;                                                                          
-      ;                                                                          
-      ;          ;                                                               
-      ;          ;                                                               
-      ;          ;                                                               
-      ;    ;;;   ; ;;     ;;;   ;   ;   ;      ; ;;  ;;     ;;;   ; ;;    ;   ;  
-      ;   ;      ;;  ;   ;   ;  ;   ;   ;      ;;  ;;  ;   ;   ;  ;;  ;   ;   ;  
-      ;   ;;     ;   ;  ;     ;  ; ; ; ;       ;   ;   ;  ;    ;  ;   ;   ;   ;  
-      ;    ;;    ;   ;  ;     ;  ; ; ; ;       ;   ;   ;  ;;;;;;  ;   ;   ;   ;  
-      ;      ;   ;   ;  ;     ;  ; ; ; ;       ;   ;   ;  ;       ;   ;   ;   ;  
-      ;      ;   ;   ;   ;   ;    ;   ;        ;   ;   ;   ;      ;   ;   ;  ;;  
-      ;   ;;;    ;   ;    ;;;     ;   ;        ;   ;   ;    ;;;;  ;   ;    ;; ;  
-      ;                                                                          
-      ;                                                                          
-      ;                                                                          
-      
-      
-      (define interactions-shown? #t)
-      (define definitions-shown? #t)
-      
-      (define/private (toggle-show/hide-definitions)
-        (set! definitions-shown? (not definitions-shown?))
-        (unless definitions-shown?
-          (set! interactions-shown? #t)))
-      (define/private (toggle-show/hide-interactions)
-        (set! interactions-shown? (not interactions-shown?))
-        (unless  interactions-shown?
-          (set! definitions-shown? #t)))
-      
-      (define (immediate-children parent children)
-        (define (immediate child)
-          (let loop ([child child])
-            (define immediate-parent (send child get-parent))
-            (if (and immediate-parent 
-                     (eq? immediate-parent parent))
-                child
-                (loop immediate-parent))))
-        (for/list ([child children])
-          (immediate child)))
-      
-      (define/override (update-shown)
-        (super update-shown)
-        (let ([new-children
-               (foldl
-                (λ (shown? children sofar)
-                  (if shown?
-                      (append children sofar)
-                      sofar))
-                null
-                (list interactions-shown?
-                      definitions-shown?)
-                (list interactions-canvases
-                      definitions-canvases))]
-              [old-children (send resizable-panel get-children)]
-              [p (preferences:get 'drracket:unit-window-size-percentage)])
-          (update-defs/ints-resize-corner)
-          (send definitions-item set-label 
-                (if definitions-shown?
-                    (string-constant hide-definitions-menu-item-label)
-                    (string-constant show-definitions-menu-item-label)))
-          (send interactions-item set-label 
-                (if interactions-shown?
-                    (string-constant hide-interactions-menu-item-label)
-                    (string-constant show-interactions-menu-item-label)))
-          (send resizable-panel begin-container-sequence)
-          
-          ;; this might change the unit-window-size-percentage, so save/restore it
-          (send resizable-panel change-children
-                (λ (old)
-                  (immediate-children resizable-panel new-children)))
-          
-          (preferences:set 'drracket:unit-window-size-percentage p)
-          ;; restore preferred interactions/definitions sizes
-          (when (and (= 1 (length definitions-canvases))
-                     (= 1 (length interactions-canvases))
-                     (= 2 (length new-children)))
-            (with-handlers ([exn:fail? (λ (x) (void))])
-              (send resizable-panel set-percentages
-                    (list p (- 1 p)))))
-          
-          (send resizable-panel end-container-sequence)
-          (when (ormap (λ (child)
-                         (and (is-a? child editor-canvas%)
-                              (not (send child has-focus?))))
-                       (send resizable-panel get-children))
-            (let ([new-focus
-                   (let loop ([children (send resizable-panel get-children)])
-                     (cond
-                       [(null? children) (void)]
-                       [else (let ([child (car children)])
-                               (if (is-a? child editor-canvas%)
-                                   child
-                                   (loop (cdr children))))]))]
-                  [old-focus
-                   (ormap (λ (x) (and (is-a? x editor-canvas%) (send x has-focus?) x))
-                          old-children)])
-              
-              ;; conservatively, only scroll when the focus stays in the same place.
-              (when old-focus
-                (when (eq? old-focus new-focus)
-                  (let ([ed (send old-focus get-editor)])
-                    (when ed
-                      (send ed scroll-to-position 
-                            (send ed get-start-position)
-                            #f
-                            (send ed get-end-position))))))
-              
-              (send new-focus focus)))
-          
-          (for-each
-           (λ (get-item)
-             (let ([item (get-item)])
-               (when item
-                 (send item enable definitions-shown?))))
-           (list (λ () (file-menu:get-revert-item))
-                 (λ () (file-menu:get-save-item))
-                 (λ () (file-menu:get-save-as-item))
-                 ;(λ () (file-menu:save-as-text-item)) ; Save As Text...
-                 (λ () (file-menu:get-print-item))))
-          (send file-menu:print-interactions-item enable interactions-shown?)))
-      
-      (define/augment (can-close?)
-        (and (andmap (lambda (tab)
-                       (or (eq? tab current-tab)
-                           (and (send (send tab get-defs) can-close?)
-                                (send (send tab get-ints) can-close?))))
-                     tabs)
-             (send interactions-text can-close?)
-             (inner #t can-close?)))
-      (define/augment (on-close)
-        (inner (void) on-close)
-        (for-each (lambda (tab)
-                    (unless (eq? tab current-tab)
-                      (send (send tab get-defs) on-close)
-                      (send (send tab get-ints) on-close)))
-                  tabs)
-        (when (eq? this newest-frame)
-          (set! newest-frame #f))
-        (when transcript
-          (stop-transcript))
-        (remove-show-status-line-callback)
-        (remove-bug-icon-callback)
-        (send interactions-text on-close))
-      
-      ;; execute-callback : -> void
-      ;; uses the state of the button to determine if an execution is
-      ;; already running. This function is called from many places, not
-      ;; just the execute button.
-      (define/public (execute-callback)
-        (when (send execute-button is-enabled?)
-          
-          ;; if the language is not-a-language, and the buffer looks like a module,
-          ;; automatically make the switch to the module language
-          (let ([next-settings (send definitions-text get-next-settings)])
-            (when (is-a? (drracket:language-configuration:language-settings-language next-settings) 
-                         drracket:language-configuration:not-a-language-language<%>)
-              (when (looks-like-module? definitions-text)
-                (define-values (module-language module-language-settings)
-                  (get-module-language/settings))
-                (when (and module-language module-language-settings)
-                  (send definitions-text set-next-settings 
-                        (drracket:language-configuration:language-settings
-                         module-language
-                         module-language-settings))))))
-          
-          (check-if-save-file-up-to-date)
-          (when (preferences:get 'drracket:show-interactions-on-execute)
-            (ensure-rep-shown interactions-text))
-          (when transcript
-            (record-definitions)
-            (record-interactions))
-          (send definitions-text just-executed)
-          (send language-message set-yellow #f)
-          (send interactions-canvas focus)
-          (send interactions-text reset-console)
-          (send interactions-text clear-undos)
-          
-          (define name (send definitions-text get-port-name))
-          (define defs-copy (new text%))
-          (send defs-copy set-style-list (send definitions-text get-style-list)) ;; speeds up the copy
-          (send definitions-text copy-self-to defs-copy)
-          (define text-port (open-input-text-editor defs-copy 0 'end values name #t))
-          (port-count-lines! text-port)
-          (send interactions-text evaluate-from-port
-                text-port
-                #t
-                (λ ()
-                  (parameterize ([current-eventspace drracket:init:system-eventspace])
-                    (queue-callback 
-                     (λ ()
-                       (send interactions-text clear-undos))))))))
-      
-      (inherit revert save)
-      (define/private (check-if-save-file-up-to-date)
-        (when (send definitions-text save-file-out-of-date?)
-          (let ([user-choice 
-                 (message-box/custom
-                  (string-constant drscheme)
-                  (string-constant definitions-modified)
-                  (string-constant ignore)
-                  (string-constant revert)
-                  #f
-                  this
-                  '(caution default=2 number-order)
-                  1
-                  #:dialog-mixin frame:focus-table-mixin)])
-            (case user-choice
-              [(1) (void)]
-              [(2) (revert)]))))
-      
-      (inherit get-menu-bar get-focus-object get-edit-target-object)
-      
-      (define/override (get-editor) definitions-text)
-      (define/override (get-canvas)
-        (initialize-definitions-canvas)
-        definitions-canvas)
-      
-      (define (create-definitions-canvas)
-        (new (drracket:get/extend:get-definitions-canvas)
-             [parent resizable-panel]
-             [editor definitions-text]))
-      
-      (define/private (initialize-definitions-canvas)
-        (unless definitions-canvas
-          (set! definitions-canvas (create-definitions-canvas))))
-      
-      ;; wire the definitions text to the interactions text and initialize it.
-      (define/private (init-definitions-text tab)
-        (let ([defs (send tab get-defs)]
-              [ints (send tab get-ints)])
-          (send defs set-interactions-text ints)
-          (send defs set-tab tab)
-          (send ints set-definitions-text defs)
-          (send defs change-mode-to-match)
-          (send defs insert-auto-text)))
-      
-      
-      ;                              
-      ;                              
-      ;                @@            
-      ;    @            @            
-      ;   @@@@@   $@$:  @-@$   :@@+@ 
-      ;    @        -@  @+ *$  @$ -@ 
-      ;    @     -$@$@  @   @  :@@$- 
-      ;    @     $*  @  @   @     *@ 
-      ;    @: :$ @- *@  @  +$  @  :@ 
-      ;    :@@$- -$$-@@@@+@$   $+@@: 
-      ;                              
-      ;                              
-      ;                              
-      ;                              
-      
-      (define/public (get-current-tab) current-tab)
-      
-      ;; create-new-tab : -> void
-      ;; creates a new tab and updates the GUI for that new tab
-      (define/public create-new-tab
-        (lambda ([filename #f])
-          (let* ([defs (new (drracket:get/extend:get-definitions-text))]
-                 [tab-count (length tabs)]
-                 [new-tab (new (drracket:get/extend:get-tab)
-                               (defs defs)
-                               (i tab-count)
-                               (frame this)
-                               (defs-shown? #t)
-                               (ints-shown? (not filename)))]
-                 [ints (make-object (drracket:get/extend:get-interactions-text) new-tab)])
-            (send new-tab set-ints ints)
-            (set! tabs (append tabs (list new-tab)))
-            (send tabs-panel append 
-                  (gui-utils:trim-string
-                   (if filename
-                       (get-tab-label-from-filename filename)
-                       (get-defs-tab-label defs #f))
-                   200))
-            (init-definitions-text new-tab)
-            (when filename (send defs load-file filename))
-            (change-to-nth-tab (- (send tabs-panel get-number) 1))
-            (send ints initialize-console)
-            (send tabs-panel set-selection (- (send tabs-panel get-number) 1))
-            (set! newest-frame this)
-            (update-menu-bindings))))
-      
-      ;; change-to-tab : tab -> void
-      ;; updates current-tab, definitions-text, and interactactions-text
-      ;; to be the nth tab. Also updates the GUI to show the new tab
-      (inherit begin-container-sequence end-container-sequence)
-      (define/public (change-to-tab tab)
-        (unless (eq? current-tab tab)
-          (let ([old-tab current-tab])
-            (save-visible-tab-regions)
-            (set! current-tab tab)
-            (set! definitions-text (send current-tab get-defs))
-            (set! interactions-text (send current-tab get-ints))
-            
-            (begin-container-sequence)
-            (send definitions-text begin-edit-sequence #t #f)
-            (send interactions-text begin-edit-sequence #t #f)
-            (for-each (λ (defs-canvas) (send defs-canvas set-editor definitions-text #f))
-                      definitions-canvases)
-            (for-each (λ (ints-canvas) (send ints-canvas set-editor interactions-text #f))
-                      interactions-canvases)
-            
-            (update-save-message)
-            (update-save-button)
-            (language-changed)
-            (set-delegated-text definitions-text)
-            
-            (send definitions-text update-frame-filename)
-            (update-running (send current-tab is-running?))
-            (when (let ([tlw (get-top-level-focus-window)])
-                    (and tlw (eq? this tlw)))
-              (send current-tab touched))
-            (on-tab-change old-tab current-tab)
-            (send tab update-log)
-            (send tab update-planet-status)
-            (send tab update-execute-warning-gui)
-            (restore-visible-tab-regions)
-            (for-each (λ (defs-canvas) (send defs-canvas refresh))
-                      definitions-canvases)
-            (for-each (λ (ints-canvas) (send ints-canvas refresh))
-                      interactions-canvases)
-            (set-color-status! (send definitions-text is-lexer-valid?))
-            (send definitions-text end-edit-sequence)
-            (send interactions-text end-edit-sequence)
-            (end-container-sequence)
-            
-            (case (send current-tab get-focus-d/i)
-              [(defs) 
-               (send (car definitions-canvases) focus)
-               (set-text-to-search (send (car definitions-canvases) get-editor))]
-              [(ints)
-               (send (car interactions-canvases) focus)
-               (set-text-to-search (send (car interactions-canvases) get-editor))]))))
-      
-      (define/pubment (on-tab-change from-tab to-tab)
-        (let ([old-enabled (send from-tab get-enabled)]
-              [new-enabled (send to-tab get-enabled)])
-          (unless (eq? old-enabled new-enabled)
-            (if new-enabled
-                (enable-evaluation)
-                (disable-evaluation))))
-        
-        (inner (void) on-tab-change from-tab to-tab))
-      
-      (define/public (next-tab) (change-to-delta-tab +1))
-      (define/public (prev-tab) (change-to-delta-tab -1))
-      
-      (define/private (change-to-delta-tab dt)
-        (change-to-nth-tab (modulo (+ (send current-tab get-i) dt) (length tabs))))
-
-      ;; Re-orders the tabs according to the specified order
-      (define/public (reorder-tabs tab-order)
-        (unless (and
-                  ((listof exact-nonnegative-integer?) tab-order)
-                  (equal? (sort tab-order <)
-                          (range (length tabs))))
-          (raise-argument-error 'reorder-tabs 
-                 "list of unique integers from 0 to n where n is the current number of tabs"
-                 tab-order))
-        (begin-container-sequence)
-        (define-values (new-tabs-rev new-labels-rev)
-          (for/fold ([new-tabs '()]
-                     [new-labels '()]
-                     )([new-i (in-naturals)]
-                       [old-i tab-order])
-            (define t (list-ref tabs old-i))
-            (send t set-i new-i)
-            (values (cons t new-tabs)
-                    (cons (send tabs-panel get-item-label old-i)
-                          new-labels))))
-        (set! tabs (reverse new-tabs-rev))
-        (send tabs-panel set (reverse new-labels-rev))
-        (send tabs-panel set-selection (send current-tab get-i))
-        (end-container-sequence)
-        (update-menu-bindings)
-        (update-tabs-labels))
-
-      ;; Swaps the current tab with its right-hand neighbor
-      (define/public (move-current-tab-right)
-        (define i (send current-tab get-i))
-        (unless (= i (- (length tabs) 1))
-          (reorder-tabs
-           (append (range i)
-                   (list (+ i 1) i)
-                   (range (+ i 2) (length tabs))))))
-
-      ;; Swaps the current tab with its left-hand neighbor
-      (define/public (move-current-tab-left)
-        (define i (send current-tab get-i))
-        (unless (= i 0)
-          (reorder-tabs
-           (append (range (- i 1))
-                   (list i (- i 1))
-                   (range (+ i 1) (length tabs))))))
-
-      (define/public-final (close-current-tab)
-        (cond
-          [(null? tabs) (void)]
-          [(null? (cdr tabs)) (void)]
-          [else
-           (let loop ([l-tabs tabs])
-             (cond
-               [(null? l-tabs) (error 'close-current-tab "uh oh.3")]
-               [else
-                (let ([tab (car l-tabs)])
-                  (if (eq? tab current-tab)
-                      (when (close-tab tab)
-                        (for-each (lambda (t) (send t set-i (- (send t get-i) 1)))
-                                  (cdr l-tabs))
-                        (set! tabs (remq tab tabs))
-                        (send tabs-panel delete (send tab get-i))
-                        (update-menu-bindings) 
-                        (change-to-tab
-                         (argmax (λ (tab) (send tab get-last-touched)) 
-                                 tabs)))
-                      (loop (cdr l-tabs))))]))]))
-      
-      ;; a helper private method for close-current-tab -- doesn't close an arbitrary tab.
-      (define/private (close-tab tab)
-        (cond
-          [(send tab can-close?)
-           (send tab on-close)
-           #t]
-          [else #f]))
-      
-      (define/public (open-in-new-tab filename)
-        (create-new-tab filename))
-      
-      (define/public (get-tab-count) (length tabs))
-      (define/public (change-to-nth-tab n)
-        (unless (< n (length tabs))
-          (error 'change-to-nth-tab "number too big ~s" n))
-        (change-to-tab (list-ref tabs n)))
-      
-      (define/private (save-visible-tab-regions)
-        (send current-tab set-visible-ints
-              (get-tab-visible-regions interactions-text)
-              interactions-shown?)
-        (send current-tab set-visible-defs 
-              (get-tab-visible-regions definitions-text)
-              definitions-shown?)
-        (send current-tab set-focus-d/i
-              (if (ormap (λ (x) (send x has-focus?)) interactions-canvases)
-                  'ints
-                  'defs)))
-      
-      (define/private (get-tab-visible-regions txt)
-        (map (λ (canvas) 
-               (let-values ([(x y w h _) (get-visible-region canvas)])
-                 (list x y w h)))
-             (send txt get-canvases)))
-      
-      (inherit set-text-to-search reflow-container)
-      (define/private (restore-visible-tab-regions)
-        (define (fix-up-canvas-numbers txt regions ints?)
-          (when regions
-            (let* ([canvases (send txt get-canvases)]
-                   [canvases-count (length canvases)]
-                   [regions-count (length regions)])
-              (cond
-                [(> canvases-count regions-count)
-                 (let loop ([i (- canvases-count regions-count)]
-                            [canvases canvases])
-                   (unless (zero? i)
-                     (if ints?
-                         (collapse-interactions (car canvases))
-                         (collapse-definitions (car canvases)))
-                     (loop (- i 1)
-                           (cdr canvases))))]
-                [(= canvases-count regions-count)
-                 (void)]
-                [(< canvases-count regions-count)
-                 (let loop ([i (- regions-count canvases-count)]
-                            [canvases canvases])
-                   (unless (zero? i)
-                     (if ints?
-                         (split-interactions (car canvases))
-                         (split-definitions (car canvases)))
-                     (loop (- i 1) 
-                           (cdr canvases))))]))))
-        
-        (define (set-visible-regions txt regions)
-          (when regions
-            (for-each (λ (canvas region) 
-                        (set-visible-region canvas
-                                            (first region)
-                                            (second region)
-                                            (third region)
-                                            (fourth region)
-                                            #f))
-                      (send txt get-canvases)
-                      regions)))
-        
-        (let-values ([(vi is?) (send current-tab get-visible-ints)]
-                     [(vd ds?) (send current-tab get-visible-defs)])
-          (set! interactions-shown? is?)
-          (set! definitions-shown? ds?)
-          (update-shown)
-          (reflow-container) ;; without this one, the percentages in the
-                             ;; resizable-panel are not up to date with the children
-          (fix-up-canvas-numbers definitions-text vd #f)
-          (fix-up-canvas-numbers interactions-text vi #t)
-          (reflow-container)
-          (set-visible-regions definitions-text vd)
-          (set-visible-regions interactions-text vi)))
-      
-      (define/private (pathname-equal? p1 p2)
-        (with-handlers ([exn:fail? (λ (x) #f)])
-          (string=? (path->string (normal-case-path (normalize-path p1)))
-                    (path->string (normal-case-path (normalize-path p2))))))
-      
-      (define/override (make-visible filename)
-        (let ([tab (find-matching-tab filename)])
-          (when tab
-            (change-to-tab tab))))
-      
-      (define/public (find-matching-tab filename)
-        (define fn-path (if (string? filename)
-                            (string->path filename)
-                            filename))
-        (for/or ([tab (in-list tabs)])
-          (define tab-filename (send (send tab get-defs) get-filename))
-          (and tab-filename
-               (pathname-equal? fn-path tab-filename)
-               tab)))
-      
-      (define/override (editing-this-file? filename)
-        (ormap (λ (tab)
-                 (let ([fn (send (send tab get-defs) get-filename)])
-                   (and fn
-                        (pathname-equal? fn filename))))
-               tabs))
-      
-      (define/override (get-menu-item%)
-        (class (super get-menu-item%)
-          (inherit get-label get-plain-label)
-          (define/override (restore-keybinding)
-            (cond
-              [(equal? (get-plain-label) (string-constant close))
-               (update-close-menu-item-shortcut this)]
-              [(equal? (get-plain-label) (string-constant close-tab))
-               (update-close-tab-menu-item-shortcut this)]
-              [else (super restore-keybinding)]))
-          (super-new)))
-      
-      (define/override (on-activate active?)
-        (when active?
-          (send (get-current-tab) touched))
-        (super on-activate active?))
-      
-      (define/private (update-menu-bindings)
-        (when close-tab-menu-item
-          (update-close-tab-menu-item-shortcut close-tab-menu-item))
-        (update-close-menu-item-shortcut (file-menu:get-close-item)))
-      
-      (define/private (update-close-tab-menu-item-shortcut item)
-        (define just-one? (and (pair? tabs) (null? (cdr tabs))))
-        (send item set-label (if just-one? 
-                                 (string-constant close-tab)
-                                 (string-constant close-tab-amp)))
-        (when (preferences:get 'framework:menu-bindings)
-          (send item set-shortcut (if just-one? #f #\w))))
-      
-      (define/private (update-close-menu-item-shortcut item)
-        (cond
-          [(equal? (system-type) 'unix)
-           (send item set-label (string-constant close-menu-item))]
-          [else
-           (define just-one? (and (pair? tabs) (null? (cdr tabs))))
-           (send item set-label (if just-one?
-                                    (string-constant close-window-menu-item)
-                                    (string-constant close-window)))
-           (when (preferences:get 'framework:menu-bindings)
-             (send item set-shortcut-prefix (if just-one? 
-                                                (get-default-shortcut-prefix) 
-                                                (cons 'shift (get-default-shortcut-prefix)))))]))
-      
-      (define/override (file-menu:close-callback item control)
-        (define just-one? (and (pair? tabs) (null? (cdr tabs))))
-        (if (and (equal? (system-type) 'unix)
-                   (not just-one?))
-            (close-current-tab)
-            (super file-menu:close-callback item control)))
-      
-      ;; offer-to-save-file : path -> void
-      ;; bring the tab that edits the file named by `path' to the front
-      ;; and opens a dialog asking if it should be saved.
-      (define/public (offer-to-save-file path)
-        (let ([original-tab current-tab]
-              [tab-to-save (find-matching-tab path)])
-          (when tab-to-save
-            (let ([defs-to-save (send tab-to-save get-defs)])
-              (when (send defs-to-save is-modified?)
-                (unless (eq? tab-to-save original-tab)
-                  (change-to-tab tab-to-save))
-                (send defs-to-save user-saves-or-not-modified? #f)
-                (unless (eq? tab-to-save original-tab)
-                  (change-to-tab original-tab)))))))
-      
-      
-      ;;
-      ;; end tabs
-      ;;
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      
-      (define/public (get-definitions-text) definitions-text)
-      (define/public (get-interactions-text) interactions-text)
-      
-      (define/public (get-definitions/interactions-panel-parent)
-        toolbar/rest-panel)
-      
-      (inherit delegated-text-shown? hide-delegated-text show-delegated-text
-               set-show-menu-sort-key)
-      (define/override (add-show-menu-items show-menu)
-        (super add-show-menu-items show-menu)
-        (set! definitions-item
-              (make-object menu:can-restore-menu-item%
-                (string-constant hide-definitions-menu-item-label)
-                (get-show-menu)
-                (λ (_1 _2) 
-                  (toggle-show/hide-definitions)
-                  (update-shown))
-                #\d
-                (string-constant definitions-menu-item-help-string)))
-        (set-show-menu-sort-key definitions-item 101)
-        (set! interactions-item
-              (make-object menu:can-restore-menu-item%
-                (string-constant show-interactions-menu-item-label)
-                (get-show-menu)
-                (λ (_1 _2) 
-                  (toggle-show/hide-interactions)
-                  (update-shown))
-                #\e
-                (string-constant interactions-menu-item-help-string)))
-        (set-show-menu-sort-key interactions-item 102)
-        
-        (let ([layout-item
-               (new menu:can-restore-menu-item%
-                    [label (string-constant use-horizontal-layout)]
-                    [parent (get-show-menu)]
-                    [callback (λ (x y) 
-                                (define vertical? (send resizable-panel get-vertical?)) 
-                                (preferences:set 'drracket:defs/ints-horizontal vertical?)
-                                (send resizable-panel set-orientation vertical?)
-                                (define update-shown? (or (not interactions-shown?)
-                                                          (not definitions-shown?)))
-                                (unless interactions-shown?
-                                  (toggle-show/hide-interactions))
-                                (unless definitions-shown?
-                                  (toggle-show/hide-definitions))
-                                (when update-shown?
-                                  (update-shown)))]
-                    [demand-callback
-                     (λ (mi) (send mi set-label (if (send resizable-panel get-vertical?)
-                                                    (string-constant use-horizontal-layout)
-                                                    (string-constant use-vertical-layout))))]
-                    [shortcut (if (member 'shift (get-default-shortcut-prefix))
-                                  #f
-                                  #\l)]
-                    [shortcut-prefix (if (member 'shift (get-default-shortcut-prefix))
-                                         (get-default-shortcut-prefix)
-                                         (cons 'shift (get-default-shortcut-prefix)))])])
-          (set-show-menu-sort-key layout-item 103))
-        
-        (let ([overview-menu-item 
-               (new menu:can-restore-menu-item%
-                    (shortcut #\u)
-                    (label 
-                     (if (delegated-text-shown?)
-                         (string-constant hide-overview)
-                         (string-constant show-overview)))
-                    (parent (get-show-menu))
-                    (callback
-                     (λ (menu evt)
-                       (if (delegated-text-shown?)
-                           (begin
-                             (send menu set-label (string-constant show-overview))
-                             (preferences:set 'framework:show-delegate? #f)
-                             (hide-delegated-text))
-                           (begin
-                             (send menu set-label (string-constant hide-overview))
-                             (preferences:set 'framework:show-delegate? #t)
-                             (show-delegated-text))))))])
-          (set-show-menu-sort-key overview-menu-item 301))
-        
-        (set! module-browser-menu-item
-              (new menu:can-restore-menu-item%
-                   (label (if module-browser-shown?
-                              (string-constant hide-module-browser)
-                              (string-constant show-module-browser)))
-                   (parent (get-show-menu))
-                   (callback
-                    (λ (menu evt)
-                      (if module-browser-shown?
-                          (hide-module-browser)
-                          (show-module-browser))))))
-        (set-show-menu-sort-key module-browser-menu-item 401)
-        
-        (set! toolbar-menu (new menu% 
-                                [parent show-menu]
-                                [label (string-constant toolbar)]))
-        (set-show-menu-sort-key toolbar-menu 1)
-        (set! toolbar-left-menu-item
-              (new checkable-menu-item%
-                   [label (string-constant toolbar-on-left)]
-                   [parent toolbar-menu]
-                   [callback (λ (x y) (set-toolbar-left))]
-                   [checked #f]))
-        (set! toolbar-top-menu-item
-              (new checkable-menu-item%
-                   [label (string-constant toolbar-on-top)]
-                   [parent toolbar-menu]
-                   [callback (λ (x y) (set-toolbar-top))]
-                   [checked #f]))
-        (set! toolbar-top-no-label-menu-item
-              (new checkable-menu-item%
-                   [label (string-constant toolbar-on-top-no-label)]
-                   [parent toolbar-menu]
-                   [callback (λ (x y) (set-toolbar-top-no-label))]
-                   [checked #f]))
-        (set! toolbar-right-menu-item
-              (new checkable-menu-item%
-                   [label (string-constant toolbar-on-right)]
-                   [parent toolbar-menu]
-                   [callback (λ (x y) (set-toolbar-right))]
-                   [checked #f]))
-        (set! toolbar-hidden-menu-item
-              (new checkable-menu-item%
-                   [label (string-constant toolbar-hidden)]
-                   [parent toolbar-menu]
-                   [callback (λ (x y) (set-toolbar-hidden))]
-                   [checked #f]))
-        
-        (set! logger-menu-item
-              (new menu-item%
-                   [label (string-constant show-log)]
-                   [parent show-menu]
-                   [callback
-                    (λ (x y) (send current-tab toggle-log))]))
-        (set-show-menu-sort-key logger-menu-item 205)
-        
-        
-        (set! show-line-numbers-menu-item
-              (new menu:can-restore-menu-item%
-                   [label (if (show-line-numbers?)
-                              (string-constant hide-line-numbers/menu)
-                              (string-constant show-line-numbers/menu))]
-                   [parent (get-show-menu)]
-                   [callback (lambda (self event)
-                               (define value (preferences:get 'drracket:show-line-numbers?))
-                               (preferences:set 'drracket:show-line-numbers? (not value))
-                               (show-line-numbers! (not value)))]))
-        (set-show-menu-sort-key show-line-numbers-menu-item 302)
-        
-        (define show-column-guide-menu-item
-          (new menu:can-restore-menu-item%
-               [label ""]
-               [parent (get-show-menu)]
-               [demand-callback (λ (itm) 
-                                  (define pv (preferences:get 'framework:column-guide-width))
-                                  (send itm set-label
-                                        (format (if (car pv)
-                                                    (string-constant hide-column-width-guide)
-                                                    (string-constant show-column-width-guide))
-                                                (cadr pv))))]
-               [callback (λ (self evt)
-                           (define ov (preferences:get 'framework:column-guide-width))
-                           (preferences:set 'framework:column-guide-width
-                                            (list (not (car ov)) (cadr ov))))]))
-        (set-show-menu-sort-key show-column-guide-menu-item 303)
-        
-        (let ()
-          (define (font-adjust adj label key shortcut)
-            (define (adj-font _1 _2)
-              (editor:set-current-preferred-font-size
-               (adj 
-                (editor:get-current-preferred-font-size))))
-            (define (on-demand item)
-              (define lab 
-                (format 
-                 label 
-                 (adj 
-                  (editor:get-current-preferred-font-size))))
-              (send item set-label lab))
-            (define item
-             (new menu:can-restore-menu-item%
-                  (shortcut shortcut)
-                  (label "")
-                  (parent (get-show-menu))
-                  (callback adj-font)
-                  (demand-callback on-demand)))
-            (set-show-menu-sort-key item key))
-          (font-adjust add1 (string-constant increase-font-size) -2 #\=)
-          (font-adjust sub1 (string-constant decrease-font-size) -3 #\-))
-        
-        (let ([split
-               (new menu:can-restore-menu-item%
-                    (shortcut (if (equal? (system-type) 'macosx) #f #\m))
-                    (label (string-constant split-menu-item-label))
-                    (parent (get-show-menu))
-                    (callback (λ (x y) (split)))
-                    (demand-callback (λ (item) (split-demand item))))]
-              [collapse
-               (new menu:can-restore-menu-item% 
-                    (shortcut (if (or (equal? (system-type) 'macosx)
-                                      (member 'shift (get-default-shortcut-prefix)))
-                                  #f
-                                  #\m))
-                    (shortcut-prefix (cond
-                                       [(or (equal? (system-type) 'macosx)
-                                            (member 'shift (get-default-shortcut-prefix)))
-                                        (get-default-shortcut-prefix)]
-                                       [else
-                                        (cons 'shift (get-default-shortcut-prefix))]))
-                    (label (string-constant collapse-menu-item-label))
-                    (parent (get-show-menu))
-                    (callback (λ (x y) (collapse)))
-                    (demand-callback (λ (item) (collapse-demand item))))])
-          (set-show-menu-sort-key split 2)
-          (set-show-menu-sort-key collapse 3)))
-      
-
-;                                                  
-;                                                  
-;                                                  
-;                                                  
-;                          ;;;         ;;;         
-;                          ;;;         ;;;         
-;  ;;; ;; ;;;    ;;;    ;; ;;; ;;; ;;; ;;;   ;;;;  
-;  ;;;;;;;;;;;  ;;;;;  ;;;;;;; ;;; ;;; ;;;  ;; ;;; 
-;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; 
-;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;;;;;; 
-;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;;     
-;  ;;; ;;; ;;;  ;;;;;  ;;;;;;; ;;;;;;; ;;;  ;;;;;; 
-;  ;;; ;;; ;;;   ;;;    ;; ;;;  ;; ;;; ;;;   ;;;;  
-;                                                  
-;                                                  
-;                                                  
-;                                                  
-;                                                      
-;                                                      
-;                                                      
-;                                                      
-;  ;;;                                                 
-;  ;;;                                                 
-;  ;;; ;;  ;;; ;; ;;;   ;;; ;;; ;;; ;;;;    ;;;;  ;;; ;
-;  ;;;;;;; ;;;;; ;;;;;  ;;; ;;; ;;;;;; ;;  ;; ;;; ;;;;;
-;  ;;; ;;; ;;;  ;;; ;;;  ;;;;;;;;; ;;;    ;;; ;;; ;;;  
-;  ;;; ;;; ;;;  ;;; ;;;  ;;;; ;;;;  ;;;;  ;;;;;;; ;;;  
-;  ;;; ;;; ;;;  ;;; ;;;  ;;;; ;;;;    ;;; ;;;     ;;;  
-;  ;;;;;;; ;;;   ;;;;;    ;;   ;;  ;; ;;;  ;;;;;; ;;;  
-;  ;;; ;;  ;;;    ;;;     ;;   ;;   ;;;;    ;;;;  ;;;  
-;                                                      
-;                                                      
-;                                                      
-;                                                      
-
-      (field [module-browser-shown? #f]
-             [module-browser-parent-panel #f]
-             [module-browser-panel #f]
-             [module-browser-ec #f]
-             [module-browser-button #f]
-             [module-browser-lib-path-check-box #f]
-             [module-browser-planet-path-check-box #f]
-             [module-browser-name-length-choice #f]
-             [module-browser-pb #f]
-             [module-browser-menu-item 'module-browser-menu-item-unset])
-      
-      (inherit open-status-line close-status-line update-status-line)
-      
-      (define/private (show-module-browser)
-        (when module-browser-panel
-          (when (can-browse-language?)
-            (set! module-browser-shown? #t)
-            (send module-browser-menu-item set-label (string-constant hide-module-browser))
-            (update-module-browser-pane))))
-      
-      (define/private (hide-module-browser)
-        (when module-browser-panel
-          (set! module-browser-shown? #f)
-          (send module-browser-menu-item set-label (string-constant show-module-browser))
-          (set! module-browser-mouse-over-status-line-open? #f)
-          (close-status-line 'plt:module-browser:mouse-over)
-          (send module-browser-parent-panel change-children
-                (λ (l)
-                  (remq module-browser-panel l)))))
-      
-      (define/private (can-browse-language?)
-        (let* ([lang/config (send (get-definitions-text) get-next-settings)]
-               [lang (drracket:language-configuration:language-settings-language lang/config)]
-               [strs (send lang get-language-position)]
-               [can-browse?
-                (or (is-a? lang drracket:module-language:module-language<%>)
-                    (ormap (λ (x) (regexp-match #rx"PLT" x))
-                           strs))])
-          (unless can-browse?
-            (message-box (string-constant drscheme)
-                         (string-constant module-browser-only-in-plt-and-module-langs)
-                         #:dialog-mixin frame:focus-table-mixin))
-          can-browse?))
-      
-      (define module-browser-mouse-over-status-line-open? #f)
-      (define/private (update-module-browser-pane)
-        (open-status-line 'plt:module-browser:mouse-over)
-        (set! module-browser-mouse-over-status-line-open? #t)
-        (send module-browser-panel begin-container-sequence)
-        (unless module-browser-ec 
-          (set! module-browser-pb 
-                (drracket:module-overview:make-module-overview-pasteboard
-                 #t
-                 (λ (x) (mouse-currently-over x))))
-          (set! module-browser-ec (make-object editor-canvas%
-                                    module-browser-panel
-                                    module-browser-pb))
-          
-          (let* ([show-callback
-                  (λ (cb key)
-                    (if (send cb get-value)
-                        (send module-browser-pb show-visible-paths key)
-                        (send module-browser-pb remove-visible-paths key))
-                    (preferences:set 'drracket:module-browser:hide-paths 
-                                     (send module-browser-pb get-hidden-paths)))]
-                 [mk-checkbox
-                  (λ (key label)
-                    (new check-box%
-                         (parent module-browser-panel)
-                         (label label)
-                         (value (not (memq key (preferences:get 
-                                                'drracket:module-browser:hide-paths))))
-                         (callback 
-                          (λ (cb _) 
-                            (show-callback cb key)))))])
-            (set! module-browser-lib-path-check-box (mk-checkbox 'lib show-lib-paths))
-            (set! module-browser-planet-path-check-box (mk-checkbox 'planet show-planet-paths)))
-          
-          (set! module-browser-name-length-choice
-                (new choice%
-                     (parent module-browser-panel)
-                     (label (string-constant module-browser-name-length))
-                     (choices (list (string-constant module-browser-name-short)
-                                    (string-constant module-browser-name-medium)
-                                    (string-constant module-browser-name-long)
-                                    (string-constant module-browser-name-very-long)))
-                     (selection (preferences:get 'drracket:module-browser:name-length))
-                     (callback
-                      (λ (x y)
-                        (let ([selection (send module-browser-name-length-choice get-selection)])
-                          (preferences:set 'drracket:module-browser:name-length selection)
-                          (update-module-browser-name-length selection))))))
-          (update-module-browser-name-length 
-           (preferences:get 'drracket:module-browser:name-length))
-          
-          (set! module-browser-button 
-                (new button%
-                     (parent module-browser-panel)
-                     (label refresh)
-                     (callback (λ (x y) (update-module-browser-pane)))
-                     (stretchable-width #t))))
-        
-        (let ([p (preferences:get 'drracket:module-browser-size-percentage)])
-          (send module-browser-parent-panel change-children
-                (λ (l)
-                  (cons module-browser-panel
-                        (remq module-browser-panel l))))
-          (with-handlers ([exn:fail? void])
-            (send module-browser-parent-panel set-percentages (list p (- 1 p))))
-          (send module-browser-parent-panel end-container-sequence)
-          (calculate-module-browser)))
-      
-      (define/private (update-module-browser-name-length i)
-        (send module-browser-pb set-name-length 
-              (case i
-                [(0) 'short]
-                [(1) 'medium]
-                [(2) 'long]
-                [(3) 'very-long])))
-      
-      (define/private (mouse-currently-over snips)
-        (when module-browser-mouse-over-status-line-open?
-          (if (null? snips)
-              (update-status-line 'plt:module-browser:mouse-over #f)
-              (let* ([snip (car snips)]
-                     [lines (send snip get-lines)]
-                     [name (or (send snip get-filename)
-                               (send snip get-word))]
-                     [str (if lines
-                              (format (string-constant module-browser-filename-format) name lines)
-                              name)])
-                (update-status-line 'plt:module-browser:mouse-over str)))))
-      
-      (define/private (calculate-module-browser)
-        (let ([mod-tab current-tab])
-          (let-values ([(old-break-thread old-custodian) (send mod-tab get-breakables)])
-            (open-status-line 'plt:module-browser)
-            (update-status-line 'plt:module-browser status-compiling-definitions)
-            (send module-browser-button enable #f)
-            (send module-browser-lib-path-check-box enable #f)
-            (send module-browser-planet-path-check-box enable #f)
-            (send module-browser-name-length-choice enable #f)
-            (disable-evaluation-in-tab current-tab)
-            (drracket:module-overview:fill-pasteboard 
-             module-browser-pb
-             (drracket:language:make-text/pos
-              definitions-text
-              0
-              (send definitions-text last-position))
-             (λ (str) (update-status-line 
-                       'plt:module-browser 
-                       (format module-browser-progress-constant str)))
-             (λ (user-thread user-custodian)
-               (send mod-tab set-breakables user-thread user-custodian)))
-            (send mod-tab set-breakables old-break-thread old-custodian)
-            (send mod-tab enable-evaluation)
-            (send module-browser-button enable #t)
-            (send module-browser-lib-path-check-box enable #t)
-            (send module-browser-planet-path-check-box enable #t)
-            (send module-browser-name-length-choice enable #t)
-            (close-status-line 'plt:module-browser))))
-      
-      
-      ;                                            
-      ;                                            
-      ;                                            
-      ;                                            
-      ;                                            
-      ;                                            
-      ;   ; ;;  ;;     ;;;   ; ;;    ;   ;    ;;;  
-      ;   ;;  ;;  ;   ;   ;  ;;  ;   ;   ;   ;     
-      ;   ;   ;   ;  ;    ;  ;   ;   ;   ;   ;;    
-      ;   ;   ;   ;  ;;;;;;  ;   ;   ;   ;    ;;   
-      ;   ;   ;   ;  ;       ;   ;   ;   ;      ;  
-      ;   ;   ;   ;   ;      ;   ;   ;  ;;      ;  
-      ;   ;   ;   ;    ;;;;  ;   ;    ;; ;   ;;;   
-      ;                                            
-      ;                                            
-      ;                                            
-      
-      (define execute-menu-item #f)
-      (define file-menu:print-interactions-item #f)
-      (define file-menu:create-new-tab-item #f)
-      
-      (define/override (file-menu:between-new-and-open file-menu)
-        (set! file-menu:create-new-tab-item
-              (new menu:can-restore-menu-item%
-                   (label (string-constant new-tab))
-                   (shortcut #\t)
-                   (parent file-menu)
-                   (callback
-                    (λ (x y)
-                      (create-new-tab))))))
-      [define/override file-menu:between-open-and-revert
-        (lambda (file-menu)
-          (new menu:can-restore-menu-item%
-               [label (string-constant open-require-path)]
-               [shortcut (if (member 'shift (get-default-shortcut-prefix)) #f #\o)]
-               [shortcut-prefix (if (member 'shift (get-default-shortcut-prefix))
-                                    (get-default-shortcut-prefix)
-                                    (cons 'shift (get-default-shortcut-prefix)))]
-               [parent file-menu]
-               [callback
-                (λ (x y)
-                  (define editing-path (send (get-definitions-text) get-filename))
-                  (define editing-module-path
-                    (and editing-path
-                         (match (path->module-path editing-path)
-                           [`(lib ,(? string? s))
-                            (define m (regexp-match #rx"^(.*/)[^/]*$" s))
-                            (and m
-                                 (list-ref m 1))]
-                           [else #f])))
-                  ;; editing-module-path won't find anything interesting
-                  ;; if the get-module-path-from-user is using some other
-                  ;; racket binary
-                  (define pth
-                    (get-module-path-from-user
-                     #:init (or editing-module-path
-                                (preferences:get 'drracket:open-module-path-last-used))
-                     #:pref 'drracket:open-module-path-last-used
-                     #:current-directory 
-                     (and editing-path
-                          (let-values ([(base name dir?) (split-path editing-path)])
-                            base))))
-                  (when pth (handler:edit-file pth)))])
-          (super file-menu:between-open-and-revert file-menu)
-          (make-object separator-menu-item% file-menu))]
-      (define close-tab-menu-item #f)
-      (define/override (file-menu:between-close-and-quit file-menu)
-        (unless (equal? (system-type) 'unix)
-          (set! close-tab-menu-item
-                (new (get-menu-item%)
-                     (label (string-constant close-tab))
-                     (demand-callback
-                      (λ (item)
-                        (send item enable (1 . < . (send tabs-panel get-number)))))
-                     (parent file-menu)
-                     (callback
-                      (λ (x y)
-                        (close-current-tab))))))
-        (super file-menu:between-close-and-quit file-menu))
-      
-      (define/override (file-menu:save-string) (string-constant save-definitions))
-      (define/override (file-menu:save-as-string) (string-constant save-definitions-as))
-      (define/override (file-menu:between-save-as-and-print file-menu)
-        (let ([sub-menu (make-object menu% (string-constant save-other) file-menu)])
-          (make-object menu:can-restore-menu-item%
-            (string-constant save-definitions-as-text)
-            sub-menu
-            (λ (_1 _2)
-              (let ([filename (send definitions-text put-file #f #f)])
-                (when filename
-                  (send definitions-text save-file/gui-error filename 'text)))))
-          (make-object menu:can-restore-menu-item%
-            (string-constant save-interactions)
-            sub-menu
-            (λ (_1 _2) 
-              (send interactions-text save-file/gui-error)))
-          (make-object menu:can-restore-menu-item%
-            (string-constant save-interactions-as)
-            sub-menu
-            (λ (_1 _2)
-              (let ([filename (send interactions-text put-file #f #f)])
-                (when filename
-                  (send interactions-text save-file/gui-error filename 'standard)))))
-          (make-object menu:can-restore-menu-item%
-            (string-constant save-interactions-as-text)
-            sub-menu
-            (λ (_1 _2)
-              (let ([filename (send interactions-text put-file #f #f)])
-                (when filename
-                  (send interactions-text save-file/gui-error filename 'text)))))
-          (make-object separator-menu-item% file-menu)
-          (set! transcript-menu-item
-                (make-object menu:can-restore-menu-item%
-                  (string-constant log-definitions-and-interactions)
-                  file-menu
-                  (λ (x y)
-                    (if transcript
-                        (stop-transcript)
-                        (start-transcript)))))
-          (make-object separator-menu-item% file-menu)
-          (super file-menu:between-save-as-and-print file-menu)))
-      
-      [define/override file-menu:print-string (λ () (string-constant print-definitions))]
-      (define/override (file-menu:between-print-and-close file-menu)
-        (set! file-menu:print-interactions-item
-              (make-object menu:can-restore-menu-item%
-                (string-constant print-interactions)
-                file-menu
-                (λ (_1 _2)
-                  (send interactions-text print
-                        #t 
-                        #t
-                        (preferences:get 'framework:print-output-mode)))))
-        (super file-menu:between-print-and-close file-menu))
-      
-      (define/override (edit-menu:between-find-and-preferences edit-menu)
-        (super edit-menu:between-find-and-preferences edit-menu)
-        
-        (define (aspell-callback f)
-          (define problem (aspell-problematic?))
-          (cond
-            [problem
-             (message-box (string-constant drscheme) problem)
-             (f #t)]
-            [else
-             (f #f)]))
-        
-        (define (mk-menu-item checking-turned-on? 
-                              turn-checking-on
-                              pref-sym
-                              shortcut
-                              label)
-          (new menu:can-restore-checkable-menu-item%
-               [label label]
-               [shortcut (if (member 'shift (get-default-shortcut-prefix))
-                             #f
-                             shortcut)]
-               [shortcut-prefix (if (member 'shift (get-default-shortcut-prefix))
-                                    (get-default-shortcut-prefix)
-                                    (cons 'shift (get-default-shortcut-prefix)))]
-               [parent edit-menu]
-               [demand-callback
-                (λ (item)
-                  (define ed (get-edit-target-object))
-                  (define on? (and ed (is-a? ed color:text<%>)))
-                  (send item enable ed)
-                  (send item check (and on? (checking-turned-on? ed))))]
-               [callback
-                (λ (item evt)
-                  (aspell-callback
-                   (λ (problem?)
-                     (cond
-                       [problem? (preferences:set pref-sym #f)]
-                       [else
-                        (define ed (get-edit-target-object))
-                        (define old-val (checking-turned-on? ed))
-                        (preferences:set pref-sym (not old-val))
-                        (turn-checking-on ed (not old-val))]))))]))
-        (mk-menu-item (λ (ed) (send ed get-spell-check-strings)) 
-                      (λ (ed new-val) (send ed set-spell-check-strings new-val))
-                      'framework:spell-check-strings?
-                      #\c
-                      (string-constant spell-check-string-constants))
-        (mk-menu-item (λ (ed) (send ed get-spell-check-text)) 
-                      (λ (ed new-val) (send ed set-spell-check-text new-val))
-                      'framework:spell-check-text?
-                      #\t
-                      (string-constant spell-check-scribble-text))
-        
-        (new menu:can-restore-menu-item%
-             [label (string-constant spell-skip-to-next-misspelled-word)]
-             [shortcut (if (member 'shift (get-default-shortcut-prefix))
-                           #f
-                           #\n)]
-             [shortcut-prefix (if (member 'shift (get-default-shortcut-prefix))
-                                  (get-default-shortcut-prefix)
-                                  (cons 'shift (get-default-shortcut-prefix)))]
-             [parent edit-menu]
-             [demand-callback
-              (λ (item)
-                (define ed (get-edit-target-object))
-                (define on? (and ed 
-                                 (is-a? ed color:text<%>)
-                                 (= (send ed get-start-position) (send ed get-end-position))))
-                (send item enable on?))]
-             [callback
-              (λ (item evt)
-                (aspell-callback
-                 (λ (problem?)
-                   (unless problem?
-                     (define ed (get-edit-target-object))
-                     (define orig-pos (send ed get-start-position))
-                     
-                     (define (search start end mispelled?)
-                       (let loop ([p start])
-                         (cond
-                           [(< p end)
-                            (define sp (send ed get-spell-suggestions p))
-                            (define found-something? (if mispelled?
-                                                         (list? sp)
-                                                         (not (list? sp))))
-                            (cond
-                              [found-something? p]
-                              [else (loop (+ p 1))])]
-                           [else #f])))
-                     
-                     (define first-well-spelled (or (search orig-pos (send ed last-position) #f)
-                                                    (search 0 orig-pos #f)))
-                     (cond
-                       [first-well-spelled 
-                        (define mispelled (or (search first-well-spelled (send ed last-position) #t)
-                                              (search 0 first-well-spelled #t)))
-                        (cond
-                          [mispelled (send ed set-position mispelled)]
-                          [else (bell)])]
-                       [else (bell)])))))])
-        
-        (new menu:can-restore-menu-item%
-             [label (string-constant spell-suggest-corrections)]
-             [shortcut (if (member 'shift (get-default-shortcut-prefix))
-                           #f
-                           #\k)]
-             [shortcut-prefix (if (member 'shift (get-default-shortcut-prefix))
-                                  (get-default-shortcut-prefix)
-                                  (cons 'shift (get-default-shortcut-prefix)))]
-             [parent edit-menu]
-             [demand-callback
-              (λ (item)
-                (define ed (get-edit-target-object))
-                (define on? (and ed 
-                                 (is-a? ed color:text<%>)
-                                 (= (send ed get-start-position) (send ed get-end-position))))
-                (send item enable on?))]
-             [callback
-              (λ (item evt)
-                (aspell-callback
-                 (λ (problem?)
-                   (unless problem?
-                     (define ed (get-edit-target-object))
-                     (define orig-pos (send ed get-start-position))
-                     (match (send ed get-spell-suggestions orig-pos)
-                       [(list start end (cons first rest))
-                        (define suggestions (cons first rest))
-                        (define choice
-                          (get-choices-from-user (string-constant spell-correction-suggestions)
-                                                 (string-constant spell-choose-replacement-word)
-                                                 suggestions
-                                                 this
-                                                 '(0)))
-                        (when choice
-                          (send ed begin-edit-sequence)
-                          (send ed delete start end)
-                          (send ed insert (list-ref suggestions (car choice)) start start)
-                          (send ed end-edit-sequence))]
-                       [_ (bell)])))))])
-        
-        (define dicts (get-aspell-dicts))
-        (when dicts
-          (define dicts-menu (new menu:can-restore-underscore-menu% 
-                                  [parent edit-menu]
-                                  [label (string-constant spelling-dictionaries)]))
-          (define (mk-item dict label)
-            (new menu:can-restore-checkable-menu-item%
-                 [parent dicts-menu]
-                 [label label]
-                 [callback
-                  (λ (item evt)
-                    (define ed (get-edit-target-object))
-                    (when (and ed (is-a? ed color:text<%>))
-                      (preferences:set 'framework:aspell-dict dict)
-                      (send ed set-spell-current-dict dict)))]
-                 [demand-callback 
-                  (λ (item)
-                    (define ed (get-edit-target-object))
-                    (send item enable (and ed (is-a? ed color:text<%>)))
-                    (send item check 
-                          (and ed 
-                               (is-a? ed color:text<%>)
-                               (equal? dict (send ed get-spell-current-dict)))))]))
-          (mk-item #f (string-constant default-spelling-dictionary))
-          (new separator-menu-item% [parent dicts-menu])
-          (for ([dict (in-list dicts)])
-            (mk-item dict dict)))
-        (new menu:can-restore-menu-item%
-             [label (string-constant complete-word)]
-             [shortcut #\/]
-             [parent edit-menu]
-             [demand-callback
-              (λ (mi)
-                (send mi enable
-                      (let ([ed (get-edit-target-object)])
-                        (and ed
-                             (is-a? ed text:autocomplete<%>)))))]
-             [callback (λ (x y)
-                         (send (get-edit-target-object) auto-complete))])
-        (add-modes-submenu edit-menu))
-      
-      (define/override (edit-menu:between-select-all-and-find edit-menu)
-        (new menu:can-restore-checkable-menu-item%
-             [label (string-constant overwrite-mode)]
-             [parent edit-menu]
-             [demand-callback
-              (λ (mi)
-                (let ([target (get-edit-target-object)])
-                  (send mi enable (is-a? target text%))
-                  (when (is-a? target text%)
-                    (send mi check (and target (send target get-overwrite-mode))))))]
-             [callback (λ (x y)
-                         (let ([target (get-edit-target-object)])
-                           (send target set-overwrite-mode
-                                 (not (send target get-overwrite-mode)))))])
-        (super edit-menu:between-select-all-and-find edit-menu))
-      
-      ;; capability-menu-items : hash-table[menu -o> (listof (list menu-item number key)))
-      (define capability-menu-items (make-hasheq))
-      (define/public (register-capability-menu-item key menu)
-        (let ([items (send menu get-items)])
-          (when (null? items)
-            (error 'register-capability-menu-item "menu ~e has no items" menu))
-          (let* ([menu-item (last items)]
-                 [this-one (list menu-item (- (length items) 1) key)]
-                 [old-ones (hash-ref capability-menu-items menu (λ () '()))])
-            (hash-set! capability-menu-items menu (cons this-one old-ones)))))
-      
-      (define/private (update-items/capability menu)
-        (let* ([old-items (send menu get-items)]
-               [new-items (begin '(get-items/capability menu)
-                                 old-items)])
-          (unless (equal? old-items new-items)
-            (for-each (λ (i) (send i delete)) old-items)
-            (for-each (λ (i) (send i restore)) new-items))))
-      (define/private (get-items/capability menu)
-        (let loop ([capability-items (reverse (hash-ref capability-menu-items menu '()))]
-                   [all-items (send menu get-items)]
-                   [i 0])
-          (cond
-            [(null? capability-items) all-items]
-            [(pair? capability-items)
-             (let* ([cap-item-list (car capability-items)]
-                    [cap-item (list-ref cap-item-list 0)]
-                    [cap-num (list-ref cap-item-list 1)]
-                    [cap-key (list-ref cap-item-list 2)])
-               (cond
-                 [(= cap-num i)
-                  (let ([is-on? (get-current-capability-value cap-key)])
-                    (cond
-                      [is-on?
-                       (cond
-                         [(null? all-items)
-                          (cons cap-item (loop (cdr capability-items) null (+ i 1)))]
-                         [(pair? all-items)
-                          (if (eq? (car all-items) cap-item)
-                              (cons cap-item (loop (cdr capability-items) (cdr all-items) (+ i 1)))
-                              (cons cap-item (loop (cdr capability-items) all-items (+ i 1))))])]
-                      [else
-                       (cond
-                         [(null? all-items)
-                          (loop (cdr capability-items) null (+ i 1))]
-                         [(pair? all-items)
-                          (if (eq? (car all-items) cap-item)
-                              (loop (cdr capability-items) (cdr all-items) (+ i 1))
-                              (loop (cdr capability-items) all-items (+ i 1)))])]))]
-                 [else (cons (car all-items)
-                             (loop capability-items
-                                   (cdr all-items)
-                                   (+ i 1)))]))])))
-      
-      (define/private (get-current-capability-value key)
-        (define language-settings (send (get-definitions-text) get-next-settings))
-        (define new-language
-          (drracket:language-configuration:language-settings-language language-settings))
-        (send new-language capability-value key))
-      
-      (define language-menu 'uninited-language-menu)
-      (define language-specific-menu 'language-specific-menu-not-yet-init)
-      (define insert-menu 'insert-menu-not-yet-init)
-      (define/public (get-insert-menu) insert-menu)
-      (define/public (get-special-menu) insert-menu)
-      
-      (define/public (choose-language-callback)
-        (let ([new-settings (drracket:language-configuration:language-dialog
-                             #f
-                             (send definitions-text get-next-settings)
-                             this)])
-          (when new-settings
-            (send definitions-text set-next-settings new-settings))))
-      
-      ;; must be called from on-demand (on each menu click), or the state won't be handled properly
-      (define/private (update-teachpack-menu)
-        (for-each (λ (item) (send item delete)) teachpack-items)
-        (let ([tp-callbacks (get-current-capability-value 'drscheme:teachpack-menu-items)])
-          (cond
-            [tp-callbacks
-             (let* ([language (drracket:language-configuration:language-settings-language
-                               (send (get-definitions-text) get-next-settings))]
-                    [settings (drracket:language-configuration:language-settings-settings
-                               (send (get-definitions-text) get-next-settings))]
-                    [tp-names ((teachpack-callbacks-get-names tp-callbacks) settings)]
-                    [update-settings
-                     (λ (settings)
-                       (send (get-definitions-text) set-next-settings 
-                             (drracket:language-configuration:language-settings language settings))
-                       (send (get-definitions-text) teachpack-changed)
-                       (update-teachpack-menu))])
-               (set! teachpack-items
-                     (list*
-                      (make-object separator-menu-item% language-menu)
-                      (new menu:can-restore-menu-item%
-                           [label (string-constant add-teachpack-menu-item-label)]
-                           [parent language-menu]
-                           [callback
-                            (λ (_1 _2)
-                              (update-settings ((teachpack-callbacks-add tp-callbacks)
-                                                settings
-                                                this)))])
-                      (let ([mi (new menu:can-restore-menu-item% 
-                                     [label (string-constant clear-all-teachpacks-menu-item-label)]
-                                     [parent language-menu]
-                                     [callback
-                                      (λ (_1 _2) 
-                                        (update-settings 
-                                         ((teachpack-callbacks-remove-all tp-callbacks)
-                                          settings)))])])
-                        (send mi enable (not (null? tp-names)))
-                        mi)
-                      (map (λ (name)
-                             (new menu:can-restore-menu-item%
-                                  [label (gui-utils:format-literal-label 
-                                          (string-constant clear-teachpack)
-                                          name)]
-                                  [parent language-menu]
-                                  [callback
-                                   (λ (item evt)
-                                     (update-settings 
-                                      ((teachpack-callbacks-remove tp-callbacks)
-                                       settings name)))]))
-                           tp-names))))]
-            [else 
-             (set! teachpack-items 
-                   (list
-                    (new menu:can-restore-menu-item%
-                         [label (string-constant add-teachpack-menu-item-label)]
-                         [parent language-menu]
-                         [callback
-                          (λ (_1 _2)
-                            (message-box 
-                             (string-constant drscheme)
-                             (gui-utils:format-literal-label 
-                              (string-constant teachpacks-only-in-languages)
-                              (apply 
-                               string-append
-                               (reverse
-                                (filter
-                                 values
-                                 (map (λ (l) 
-                                        (and 
-                                         (send l capability-value 'drscheme:teachpack-menu-items)
-                                         (format "\n  ~a" (send l get-language-name))))
-                                      (drracket:language-configuration:get-languages))))))
-                             this
-                             #:dialog-mixin frame:focus-table-mixin))])))])))
-      
-      (define/private (initialize-menus)
-        (define mb (get-menu-bar))
-        (set! language-menu (new (get-menu%) 
-                                 [label (string-constant language-menu-name)]
-                                 [parent mb]))
-        (set! language-specific-menu (new (get-menu%) 
-                                          [label (drracket:language:get-capability-default
-                                                  'drscheme:language-menu-title)]
-                                          [parent mb]))
-        (define ((send-method method) _1 _2)
-          (define text (get-focus-object))
-          (when (is-a? text racket:text<%>)
-            (method text)))
-        (define (show/hide-capability-menus)
-          (for ([menu (in-list (send (get-menu-bar) get-items))])
-            (update-items/capability menu)))
-        
-        (make-object menu:can-restore-menu-item%
-          (string-constant choose-language-menu-item-label)
-          language-menu
-          (λ (_1 _2) (choose-language-callback))
-          #\l)
-        
-        (set! execute-menu-item
-              (make-object menu:can-restore-menu-item%
-                (string-constant execute-menu-item-label)
-                language-specific-menu
-                (λ (_1 _2) (execute-callback))
-                #\r
-                (string-constant execute-menu-item-help-string)))
-        (make-object menu:can-restore-menu-item%
-          (string-constant ask-quit-menu-item-label)
-          language-specific-menu
-          (λ (_1 _2) (send current-tab break-callback))
-          #\b
-          (string-constant ask-quit-menu-item-help-string))
-        (make-object menu:can-restore-menu-item%
-          (string-constant force-quit-menu-item-label)
-          language-specific-menu
-          (λ (_1 _2) (send interactions-text kill-evaluation))
-          #\k
-          (string-constant force-quit-menu-item-help-string))
-        (when (custodian-memory-accounting-available?)
-          (new menu-item%
-               [label (string-constant limit-memory-menu-item-label)]
-               [parent language-specific-menu]
-               [callback
-                (λ (item b)
-                  (let ([num (get-mbytes this 
-                                         (let ([limit (send interactions-text get-custodian-limit)])
-                                           (and limit
-                                                (floor (/ limit 1024 1024)))))])
-                    (when num
-                      (cond
-                        [(equal? num #t)
-                         (preferences:set 'drracket:child-only-memory-limit #f)
-                         (send interactions-text set-custodian-limit #f)]
-                        [else
-                         (preferences:set 'drracket:child-only-memory-limit 
-                                          (* 1024 1024 num))
-                         (send interactions-text set-custodian-limit
-                               (* 1024 1024 num))]))))]))
-        
-        (new menu:can-restore-menu-item%
-             (label (string-constant clear-error-highlight-menu-item-label))
-             (parent language-specific-menu)
-             (callback
-              (λ (_1 _2) 
-                (let* ([tab  (get-current-tab)]
-                       [ints (send tab get-ints)]
-                       [defs (send tab get-defs)])
-                  (send ints reset-error-ranges)
-                  (send defs clear-test-coverage))))
-             (help-string (string-constant clear-error-highlight-item-help-string))
-             (demand-callback
-              (λ (item)
-                (let* ([tab (get-current-tab)]
-                       [ints (send tab get-ints)])
-                  (send item enable (or (send ints get-error-ranges)
-                                        (send tab get-test-coverage-info-visible?)))))))
-        
-        (new menu:can-restore-menu-item%
-             (label (string-constant jump-to-next-error-highlight-menu-item-label))
-             (parent language-specific-menu)
-             (shortcut #\.)
-             (callback (λ (_1 _2) (jump-to-next-error-loc)))
-             (demand-callback
-              (λ (item)
-                (let* ([tab (get-current-tab)]
-                       [ints (send tab get-ints)])
-                  (send item enable (send ints get-error-ranges))))))
-        (new menu:can-restore-menu-item%
-             (label (string-constant jump-to-prev-error-highlight-menu-item-label))
-             (parent language-specific-menu)
-             (shortcut (if (equal? (system-type) 'macosx) #\. #\,))
-             (shortcut-prefix (if (equal? (system-type) 'macosx)
-                                  (cons 'shift (get-default-shortcut-prefix))
-                                  (get-default-shortcut-prefix)))
-             (callback (λ (_1 _2) (jump-to-previous-error-loc)))
-             (demand-callback
-              (λ (item)
-                (let* ([tab (get-current-tab)]
-                       [ints (send tab get-ints)])
-                  (send item enable (send ints get-error-ranges))))))
-        (make-object separator-menu-item% language-specific-menu)
-        (make-object menu:can-restore-menu-item%
-          (string-constant create-executable-menu-item-label)
-          language-specific-menu
-          (λ (x y) (create-executable this)))
-        (make-object menu:can-restore-menu-item%
-          (string-constant module-browser...)
-          language-specific-menu
-          (λ (x y) (drracket:module-overview:module-overview this)))
-        (let ()
-          (define (update-menu-item i)
-            (define fn (send definitions-text get-filename))
-            (define lab-str (compute-label-string fn))
-            (send i set-label lab-str)
-            (send i enable fn))
-          (define i (new menu:can-restore-menu-item%
-                         [label ""]
-                         [parent language-specific-menu]
-                         [demand-callback update-menu-item]
-                         [callback (λ (x y) 
-                                     (define fn (send definitions-text get-filename))
-                                     (when fn
-                                       (drracket:module-overview:module-overview/file fn this)))]))
-          (update-menu-item i))
-        (make-object separator-menu-item% language-specific-menu)
-        
-        (let ([cap-val
-               (λ ()
-                 (define tab (get-current-tab))
-                 (define defs (send tab get-defs))
-                 (define settings (send defs get-next-settings))
-                 (define language 
-                   (drracket:language-configuration:language-settings-language settings))
-                 (send language capability-value 'drscheme:tabify-menu-callback))])
-          (new menu:can-restore-menu-item%
-               [label (string-constant reindent-menu-item-label)]
-               [parent language-specific-menu]
-               [demand-callback (λ (m) (send m enable (cap-val)))]
-               [callback (send-method 
-                          (λ (x)
-                            (let ([f (cap-val)])
-                              (when f
-                                (f x
-                                   (send x get-start-position)
-                                   (send x get-end-position))))))])
-          
-          (new menu:can-restore-menu-item%
-               [label (string-constant reindent-all-menu-item-label)]
-               [parent language-specific-menu]
-               [callback 
-                (send-method 
-                 (λ (x)
-                   (let ([f (cap-val)])
-                     (when f
-                       (f x 0 (send x last-position))))))]
-               [shortcut #\i]
-               [demand-callback (λ (m) (send m enable (cap-val)))]))
-        
-        (make-object menu:can-restore-menu-item%
-          (string-constant box-comment-out-menu-item-label)
-          language-specific-menu
-          (send-method (λ (x) (send x box-comment-out-selection))))
-        (make-object menu:can-restore-menu-item%
-          (string-constant semicolon-comment-out-menu-item-label)
-          language-specific-menu
-          (send-method (λ (x) (send x comment-out-selection))))
-        (make-object menu:can-restore-menu-item%
-          (string-constant uncomment-menu-item-label)
-          language-specific-menu
-          (λ (x y)
-            (let ([text (get-focus-object)])
-              (when (is-a? text text%)
-                (let ([admin (send text get-admin)])
-                  (cond
-                    [(is-a? admin editor-snip-editor-admin<%>)
-                     (let ([es (send admin get-snip)])
-                       (cond
-                         [(is-a? es comment-box:snip%)
-                          (let ([es-admin (send es get-admin)])
-                            (when es-admin
-                              (let ([ed (send es-admin get-editor)])
-                                (when (is-a? ed racket:text<%>)
-                                  (send ed uncomment-box/selection)))))]
-                         [else (send text uncomment-selection)]))]
-                    [else (send text uncomment-selection)]))))))
-        
-        (set! insert-menu
-              (new (get-menu%)
-                   [label (string-constant insert-menu)]
-                   [parent mb]
-                   [demand-callback
-                    (λ (insert-menu)
-                      ;; just here for convience -- it actually 
-                      ;; works on all menus, not just the special menu
-                      (show/hide-capability-menus))]))
-        
-        (let ([has-editor-on-demand
-               (λ (menu-item)
-                 (let ([edit (get-edit-target-object)])
-                   (send menu-item enable (and edit (is-a? edit editor<%>)))))]
-              [callback
-               (λ (menu evt)
-                 (let ([edit (get-edit-target-object)])
-                   (when (and edit
-                              (is-a? edit editor<%>))
-                     (let ([number (get-fraction-from-user this)])
-                       (when number
-                         (send edit insert
-                               (number-snip:make-fraction-snip number #f)))))
-                   #t))]
-              [insert-lambda
-               (λ ()
-                 (let ([edit (get-edit-target-object)])
-                   (when (and edit
-                              (is-a? edit editor<%>))
-                     (send edit insert "\u03BB")))
-                 #t)]
-              [insert-large-semicolon-letters
-               (λ ()
-                 (let ([edit (get-edit-target-object)])
-                   (when edit
-                     (define language-settings (send definitions-text get-next-settings))
-                     (define-values(comment-prefix comment-character)
-                       (if language-settings
-                           (send (drracket:language-configuration:language-settings-language
-                                  language-settings)
-                                 get-comment-character)
-                           (values ";" #\;)))
-                     (insert-large-letters comment-prefix comment-character edit this))))]
-              [c% (get-menu-item%)])
-          
-          (frame:add-snip-menu-items 
-           insert-menu 
-           c%
-           (λ (item)
-             (let ([label (send item get-label)])
-               (cond
-                 [(equal? label (string-constant insert-comment-box-menu-item-label))
-                  (register-capability-menu-item 'drscheme:special:insert-comment-box insert-menu)]
-                 [(equal? label (string-constant insert-image-item))
-                  (register-capability-menu-item 'drscheme:special:insert-image insert-menu)]))))
-          
-          (make-object c% (string-constant insert-fraction-menu-item-label)
-            insert-menu callback 
-            #f #f
-            has-editor-on-demand)
-          (register-capability-menu-item 'drscheme:special:insert-fraction insert-menu)
-          
-          (make-object c% (string-constant insert-large-letters...)
-            insert-menu
-            (λ (x y) (insert-large-semicolon-letters))
-            #f #f
-            has-editor-on-demand)
-          (register-capability-menu-item 'drscheme:special:insert-large-letters insert-menu)
-          
-          (make-object c% (string-constant insert-lambda)
-            insert-menu
-            (λ (x y) (insert-lambda))
-            #\\
-            #f
-            has-editor-on-demand)
-          (register-capability-menu-item 'drscheme:special:insert-lambda insert-menu))
-        
-        (frame:reorder-menus this))
-      
-      (define/public (jump-to-previous-error-loc)
-        (define-values (before after sorted) (find-before-and-after))
-        (unless (null? sorted)
-          (jump-to-source-loc (or before (last sorted)))))
-      
-      (define/public (jump-to-next-error-loc)
-        (define-values (before after sorted) (find-before-and-after))
-        (unless (null? sorted)
-          (jump-to-source-loc (or after (car sorted)))))
-      
-      (define/private (find-before-and-after)
-        (define tab (get-current-tab))
-        (define pos (send (send tab get-defs) get-start-position))
-        (define ranges (or (send (send tab get-ints) get-error-ranges) '()))
-        (define sorted (sort ranges < #:key srcloc-position))
-        (let loop ([before #f]
-                   [lst sorted])
-          (cond
-            [(null? lst)
-             (values before #f sorted)]
-            [else
-             (define fst (car lst))
-             (cond 
-               [(= pos (- (srcloc-position fst) 1))
-                (values before 
-                        (if (null? (cdr lst))
-                            #f
-                            (cadr lst))
-                        sorted)]
-               [(< pos (- (srcloc-position fst) 1))
-                (values before fst sorted)]
-               [else (loop (car lst) (cdr lst))])])))
-      
-      (define/private (jump-to-source-loc srcloc)
-        (define ed (srcloc-source srcloc))
-        (send ed set-position (- (srcloc-position srcloc) 1))
-        (send ed set-caret-owner #f 'global)
-        (send (get-interactions-text) highlight-a-single-error srcloc))
-      
-      (define/public (move-to-interactions) 
-        (ensure-rep-shown (get-interactions-text))
-        (send (get-interactions-canvas) focus))
-
-      
-      ;                          
-      ;                          
-      ;                          
-      ;                          
-      ;   ++-@@-   -+@+- +++: :++
-      ;   +@@-+@  -@-:-@--@-   -@
-      ;   :@:  @: @+   ++ @::@::@
-      ;   :@   @: @@@@@@@ +--@--*
-      ;   :@   @: @-      -@+*+@:
-      ;   -@: :@- +@:::+@ :@@:@@ 
-      ;   @@@ +@@: +@@@+:  ++ ++ 
-      ;                          
-      ;                          
-      ;                          
-      
-      (define definitions-text (new (drracket:get/extend:get-definitions-text)))
-      
-      ;; tabs : (listof tab)
-      (define tabs (list (new (drracket:get/extend:get-tab)
-                              (defs definitions-text)
-                              (frame this)
-                              (i 0)
-                              (defs-shown? #t)
-                              (ints-shown? #t))))
-      (define/public-final (get-tabs) tabs)
-      
-      ;; current-tab : tab
-      ;; corresponds to the tabs-panel's active button.
-      (define current-tab (car tabs))
-      
-      (define interactions-text (new (drracket:get/extend:get-interactions-text) 
-                                     (context (car tabs))))
-      (send (car tabs) set-ints interactions-text)
-      
-      (init-definitions-text (car tabs))
-      
-      (define/override (adjust-size-when-monitor-setup-changes?) 
-        (= 1 (for/sum ([f (in-list (get-top-level-windows))])
-               (if (is-a? f drracket:unit:frame<%>)
-                   1
-                   0))))
-        
-      (super-new
-       [filename filename]
-       [style '(toolbar-button fullscreen-button)]
-       [size-preferences-key 'drracket:window-size]
-       [position-preferences-key 'drracket:window-position])
-      
-      (initialize-menus)
-      
-      
-      ;                                                                               
-      ;                                                                               
-      ;                                                                               
-      ;                                 ;       ;                                     
-      ;                                 ;       ;                                     
-      ;                                 ;       ;                                 ;   
-      ;   ; ;;    ;;;    ; ;;     ;;;   ;       ;   ;;;   ;     ;  ;;;    ;   ;  ;;;; 
-      ;   ;;  ;  ;   ;   ;;  ;   ;   ;  ;       ;  ;   ;  ;     ; ;   ;   ;   ;   ;   
-      ;   ;    ;     ;   ;   ;  ;    ;  ;       ;      ;   ;   ; ;     ;  ;   ;   ;   
-      ;   ;    ;  ;;;;   ;   ;  ;;;;;;  ;       ;   ;;;;   ;   ; ;     ;  ;   ;   ;   
-      ;   ;    ; ;   ;   ;   ;  ;       ;       ;  ;   ;    ; ;  ;     ;  ;   ;   ;   
-      ;   ;;  ;  ;   ;   ;   ;   ;      ;       ;  ;   ;    ; ;   ;   ;   ;  ;;   ;   
-      ;   ; ;;    ;;;;;  ;   ;    ;;;;  ;       ;   ;;;;;    ;     ;;;     ;; ;    ;; 
-      ;   ;                                                  ;                        
-      ;   ;                                                  ;                        
-      ;   ;                                                 ;                         
-      
-      
-      (define toolbar/rest-panel (new vertical-panel% [parent (get-area-container)]))
-      
-      ;; most contain only top-panel (or nothing)
-      (define top-outer-panel (new horizontal-panel% 
-                                   [parent toolbar/rest-panel]
-                                   [alignment '(right top)]
-                                   [stretchable-height #f]))
-      
-      [define top-panel (make-object horizontal-panel% top-outer-panel)]
-      [define name-panel (new horizontal-panel%
-                              (parent top-panel)
-                              (alignment '(left center))
-                              (stretchable-width #f)
-                              (stretchable-height #f))]
-      (define panel-with-tabs (new vertical-panel%
-                                   (parent (get-definitions/interactions-panel-parent))))
-      (define tabs-panel (new tab-panel% 
-                              (font small-control-font)
-                              (parent panel-with-tabs)
-                              (stretchable-height #f)
-                              (style '(deleted no-border))
-                              (choices '("first name"))
-                              (callback (λ (x y)
-                                          (let ([sel (send tabs-panel get-selection)])
-                                            (when sel
-                                              (change-to-nth-tab sel)))))))
-      (set! resizable-panel (new (if (preferences:get 'drracket:defs/ints-horizontal)
-                                       horizontal-dragable/def-int%
-                                       vertical-dragable/def-int%)
-                                   (unit-frame this)
-                                   (parent panel-with-tabs)))
-      
-      [set! definitions-canvas #f]
-      (initialize-definitions-canvas)
-      (set! definitions-canvases (list definitions-canvas))
-      
-      (set! interactions-canvas (new (drracket:get/extend:get-interactions-canvas)
-                                       (parent resizable-panel)
-                                       (editor interactions-text)))
-      (set! interactions-canvases (list interactions-canvas))
-      
-      
-      (define/public (get-definitions-canvases) 
-        ;; before definition, just return null
-        (if (pair? definitions-canvases)
-            definitions-canvases
-            null))
-      (define/public (get-interactions-canvases)
-        ;; before definition, just return null
-        (if (pair? interactions-canvases)
-            interactions-canvases
-            null))
-      
-      (define/public (get-definitions-canvas) definitions-canvas)
-      (define/public (get-interactions-canvas) interactions-canvas)
-      
-      (set! save-button
-            (new switchable-button%
-                 [parent top-panel]
-                 [callback (λ (x) (when definitions-text
-                                    (save)
-                                    (send definitions-canvas focus)))]
-                 [bitmap save-bitmap]
-                 [alternate-bitmap small-save-bitmap]
-                 [label (string-constant save-button-label)]))
-      (register-toolbar-button save-button)
-      
-      (set! name-message (new drs-name-message% [parent name-panel]))
-      (send name-message stretchable-width #t)
-      (send name-message set-allow-shrinking 160)
-      [define teachpack-items null]
-      [define break-button (void)]
-      [define execute-button (void)]
-      (set! button-panel (new panel:horizontal-discrete-sizes% 
-                              [parent top-panel]
-                              [stretchable-width #t]
-                              [alignment '(right center)]))
-      (define/public (get-execute-button) execute-button)
-      (define/public (get-break-button) break-button)
-      (define/public (get-button-panel) button-panel)
-      
-      (inherit get-info-panel)
-      
-      (define color-status-canvas 
-        (let ()
-          (define on-string "()")
-          (define color-status-canvas
-            (new canvas% 
-                 [parent (get-info-panel)]
-                 [style '(transparent)]
-                 [stretchable-width #f]
-                 [paint-callback
-                  (λ (c dc)
-                    (when (number? th)
-                      (unless color-valid?
-                        (let-values ([(cw ch) (send c get-client-size)])
-                          (send dc set-font small-control-font)
-                          (send dc draw-text on-string 0 (- (/ ch 2) (/ th 2)))))))]))
-          (define-values (tw th ta td) 
-            (send (send color-status-canvas get-dc) get-text-extent
-                  on-string small-control-font))
-          (send color-status-canvas min-width (inexact->exact (ceiling tw)))
-          color-status-canvas))
-      (define color-valid? #t)
-      (define/public (set-color-status! v?)
-        (when color-status-canvas
-          (set! color-valid? v?) 
-          (send color-status-canvas refresh-now)))
-      
-      (define running-canvas
-        (new running-canvas% [parent (get-info-panel)]))
-      
-      (define bug-icon
-        (let* ([info-panel (get-info-panel)]
-               [btn 
-                (new switchable-button%
-                     [parent info-panel]
-                     [callback (λ (x) (show-saved-bug-reports-window))]
-                     [bitmap very-small-planet-bitmap]
-                     [vertical-tight? #t]
-                     [label (string-constant show-planet-contract-violations)])])
-          (send btn set-label-visible #f)
-          (send info-panel change-children 
-                (λ (l)
-                  (cons btn (remq* (list btn) l))))
-          btn))
-      (define/private (set-bug-label v)
-        (if (null? v)
-            (send bug-icon show #f)
-            (send bug-icon show #t)))
-      (set-bug-label (preferences:get 'drracket:saved-bug-reports))
-      (define remove-bug-icon-callback
-        (preferences:add-callback
-         'drracket:saved-bug-reports
-         (λ (p v)
-           (set-bug-label v))))
-      
-      [define func-defs-canvas (new func-defs-canvas% 
-                                    (parent name-panel)
-                                    (frame this))]
-      
-      (set! execute-button
-            (new switchable-button%
-                 [parent button-panel]
-                 [callback (λ (x) (execute-callback))]
-                 [bitmap execute-bitmap]
-                 [label (string-constant execute-button-label)]))
-      (register-toolbar-button execute-button #:number 100)
-      
-      (set! break-button
-            (new switchable-button%
-                 [parent button-panel]
-                 [callback (λ (x) (send current-tab break-callback))]
-                 [bitmap break-bitmap]
-                 [label (string-constant break-button-label)]))
-      (register-toolbar-button break-button #:number 101)
-      
-      (send top-panel change-children
-            (λ (l)
-              (list name-panel save-button button-panel)))
-      
-      (send top-panel stretchable-height #f)
-      (inherit get-label)
-      (let ([m (send definitions-canvas get-editor)])
-        (set-save-init-shown?
-         (and m (send m is-modified?))))
-      
-      (define language-message
-        (let* ([info-panel (get-info-panel)]
-               [p (new vertical-panel% 
-                       [parent info-panel]
-                       [alignment '(left center)])]
-               [language-message (new language-label-message% [parent p] [frame this])])
-          (send info-panel change-children 
-                (λ (l)
-                  (list* p
-                         (remq* (list p)
-                                l))))
-          language-message))
-      
-      (update-save-message)
-      (update-save-button)
-      (language-changed)
-      (set-delegated-text definitions-text)
-      
-      (cond
-        [filename
-         (set! definitions-shown? #t)
-         (set! interactions-shown? #f)]
-        [else
-         (set! definitions-shown? #t)
-         (set! interactions-shown? #t)])
-      
-      (update-shown)
-      
-      (when (= 2 (length (send resizable-panel get-children)))
-        (send resizable-panel set-percentages
-              (let ([p (preferences:get 'drracket:unit-window-size-percentage)])
-                (list p (- 1 p)))))
-      
-      (set-label-prefix (string-constant drscheme))
-      (set! newest-frame this)
-      ;; a callback might have happened that initializes set-color-status! before the
-      ;; definitions text is connected to the frame, so we do an extra initialization
-      ;; now, once we know we have the right connection
-      (set-color-status! (send definitions-text is-lexer-valid?))
-      (send definitions-canvas focus)))
-  
-  ;; get-define-popup-name : (or/c #f (cons/c string? string?) (list/c string? string? string))
-  ;;                         boolean 
-  ;;                      -> (or/c #f string?)
-  (define (get-define-popup-name info vertical?)
-    (and info
-         (if vertical?
-             (if (pair? (cdr info))
-                 (list-ref info 2)
-                 "δ")
-             (if (pair? (cdr info))
-                 (list-ref info 1)
-                 (cdr info)))))
-  
-  
-  (define execute-warning-canvas%
-    (class canvas%
-      (inherit stretchable-height get-dc get-client-size min-height)
-      (init-field message)
-      (define/public (set-message _msg) (set! message _msg))
-      
-      (define/override (on-paint)
-        (let ([dc (get-dc)])
-          (let-values ([(w h) (get-client-size)])
-            (send dc set-pen "yellow" 1 'solid)
-            (send dc set-brush "yellow" 'solid)
-            (send dc draw-rectangle 0 0 w h)
-            (when message
-              (let* ([base normal-control-font]
-                     [face (send base get-face)])
-                (if face
-                    (send dc set-font (send the-font-list find-or-create-font
-                                            (send base get-point-size)
-                                            face
-                                            (send base get-family)
-                                            (send base get-style)
-                                            'bold))
-                    (send dc set-font (send the-font-list find-or-create-font
-                                            (send base get-point-size)
-                                            (send base get-family)
-                                            (send base get-style)
-                                            'bold))))
-              (let-values ([(tw th _1 _2) (send dc get-text-extent message)])
-                (send dc draw-text message 
-                      (floor (- (/ w 2) (/ tw 2)))
-                      (floor (- (/ h 2) (/ th 2)))))))))
-      (super-new [style '(no-focus)])
-      (let-values ([(w h d a) (send (get-dc) get-text-extent "Xy")])
-        (min-height (+ 4 (floor (inexact->exact h)))))))
-  
-  
-  ;                                                   
-  ;                                                   
-  ;                                                   
-  ;                                                   
-  ;                               ;;;                 
-  ;                                                   
-  ;  ;;; ;;;; ;;; ;;; ;;  ;;; ;;  ;;; ;;; ;;   ;; ;;; 
-  ;  ;;;;;;;; ;;; ;;;;;;; ;;;;;;; ;;; ;;;;;;; ;;;;;;; 
-  ;  ;;;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; 
-  ;  ;;;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; 
-  ;  ;;;  ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; 
-  ;  ;;;  ;;;;;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;;;;;; 
-  ;  ;;;   ;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;;  ;; ;;; 
-  ;                                               ;;; 
-  ;                                           ;;;;;;  
-  ;                                                   
-  ;                                                   
-  
-  (define running-canvas%
-    (class canvas%
-      (inherit get-dc refresh get-client-size)
-      
-      (define running-frame-delay 200)  ; 5 FPS at the most (if user program is blocked or waiting)
-      (define num-running-frames (vector-length running-frames))
-      (define is-running? #f)
-      (define frame 0)
-      (define timer (make-object logging-timer% (λ () (refresh) (yield)) #f))
-      
-      (define/public (set-running r?)
-        (cond [r?    (unless is-running? (set! frame 4))
-                     (send timer start running-frame-delay #f)]
-              [else  (send timer stop)
-                     (refresh)])
-        (set! is-running? r?))
-      
-      (define/override (on-paint) 
-        (define dc (get-dc))
-        (define bm (cond [is-running?  (define bm (vector-ref running-frames frame))
-                                       (set! frame (modulo (+ frame 1) num-running-frames))
-                                       bm]
-                         [else  standing-frame]))
-        (define-values (w h) (get-client-size))
-        (send dc draw-bitmap bm 
-              (- (/ w 2) (/ (send bm get-width) 2))
-              (- (/ h 2) (/ (send bm get-height) 2))))
-      
-      (super-new [stretchable-width #f]
-                 [stretchable-height #f]
-                 [style '(transparent no-focus)])
-      
-      (inherit min-width min-height)
-      
-      (define all-running-frames (cons standing-frame running-frame-list))
-      (min-width (apply max (map (λ (x) (send x get-width)) all-running-frames)))
-      (min-height (apply max (map (λ (x) (send x get-height)) all-running-frames)))))
-  
-  ;; get-mbytes : top-level-window -> (union #f  ;; cancel
-  ;;                                         integer[>=100] ;; a limit
-  ;;                                         #t) ;; no limit
-  (define (get-mbytes parent current-limit)
-    (define d (new dialog%
-                   [label (string-constant drscheme)]
-                   [parent parent]))
-    (define msg1 (new message%
-                      [parent d]
-                      [label (string-constant limit-memory-msg-1)]))
-    (define msg1.5 (new message%
-                        [parent d]
-                        [label (string-constant limit-memory-msg-2)]))
-    
-    (define top-hp (new horizontal-panel%
-                        [parent d] 
-                        [stretchable-height #f]
-                        [alignment '(left center)]))
-    (define bot-hp (new horizontal-panel%
-                        [parent d]
-                        [stretchable-height #f]
-                        [alignment '(left bottom)]))
-    (define limited-rb
-      (new radio-box%
-           [label #f]
-           [choices (list (string-constant limit-memory-limited))]
-           [callback (λ (a b)
-                       (send unlimited-rb set-selection #f)
-                       (cb-checked))]
-           [parent top-hp]))
-    (define unlimited-rb
-      (new radio-box%
-           [label #f]
-           [choices (list (string-constant limit-memory-unlimited))]
-           [callback (λ (a b) 
-                       (send limited-rb set-selection #f)
-                       (cb-checked))]
-           [parent bot-hp]))
-    
-    (define unlimited-warning-panel (new horizontal-panel%
-                                         [parent d]
-                                         [stretchable-width #t]
-                                         [stretchable-height #f]))
-    
-    (define (show-unlimited-warning)
-      (when (null? (send unlimited-warning-panel get-children))
-        (send d begin-container-sequence)
-        (define t (new text%))
-        (send t insert (string-constant limit-memory-warning-prefix))
-        (define between-pos (send t last-position))
-        (send t insert (string-constant limit-memory-warning))
-        
-        (define sdb (make-object style-delta% 'change-family 'system))
-        (send sdb set-delta-face (send normal-control-font get-face))
-        (send sdb set-size-mult 0)
-        (send sdb set-size-add (send normal-control-font get-point-size))
-        (send sdb set-size-in-pixels-off #t)
-        (send sdb set-weight-on 'bold)
-        (define sd (make-object style-delta%))
-        (send sd copy sdb)
-        (send sd set-weight-on 'normal)
-        
-        (send t change-style sdb 0 between-pos)
-        (send t change-style sd between-pos (send t last-position))
-        (define ec (new editor-canvas% 
-                        [editor t]
-                        [parent unlimited-warning-panel]
-                        [style '(no-border no-focus hide-hscroll hide-vscroll transparent)]
-                        [horiz-margin 12]))
-        (send t auto-wrap #t)
-        (send d reflow-container)
-        (send ec set-line-count (+ 1 (send t position-line (send t last-position))))
-        (send t hide-caret #t)
-        (send t lock #t)
-        (send d end-container-sequence)
-        (send unlimited-rb focus)))
-    
-    (define (cb-checked)
-      (cond
-        [(send limited-rb get-selection)
-         (send tb enable #t)
-         (send msg2 enable #t)
-         (background black-foreground-sd)
-         (let ([e (send tb get-editor)])
-           (send e set-position 0 (send e last-position)))
-         (send tb focus)]
-        [else
-         (show-unlimited-warning)
-         (send tb enable #f)
-         (send msg2 enable #f)
-         (background gray-foreground-sd)])
-      (update-ok-button-state))
-    
-    (define tb
-      (keymap:call/text-keymap-initializer
-       (λ ()
-         (new text-field%
-              [label #f]
-              [parent top-hp]
-              [init-value (if current-limit
-                              (format "~a" current-limit)
-                              "128")]
-              [stretchable-width #f]
-              [min-width 100]
-              [callback
-               (λ (tf e)
-                 (let ([ed (send tf get-editor)])
-                   (cond 
-                     [(is-valid-number? ed)
-                      (background clear-sd)]
-                     [else
-                      (background yellow-sd)]))
-                 (update-ok-button-state))]))))
-    
-    (define (update-ok-button-state)
-      (cond
-        [(send limited-rb get-selection)
-         (send ok-button enable (is-valid-number? (send tb get-editor)))]
-        [else
-         (send ok-button enable #t)]))
-    
-    (define msg2 (new message% [parent top-hp] [label (string-constant limit-memory-megabytes)]))
-    (define bp (new horizontal-panel% [parent d]))
-    (define-values (ok-button cancel-button)
-      (gui-utils:ok/cancel-buttons
-       bp 
-       (λ (a b) 
-         (cond
-           [(send limited-rb get-selection)
-            (set! result (string->number (send (send tb get-editor) get-text)))]
-           [else
-            (set! result #t)])
-         (send d show #f))
-       (λ (a b) (send d show #f))))
-    
-    (define result #f)
-    
-    (define clear-sd (make-object style-delta%))
-    (define yellow-sd (make-object style-delta%))
-    
-    (define black-foreground-sd (make-object style-delta%))
-    (define gray-foreground-sd (make-object style-delta%))
-    
-    (define (is-valid-number? txt)
-      (let* ([n (string->number (send txt get-text))])
-        (and n
-             (exact-positive-integer? n)
-             (8 . <= . n))))
-    
-    (define (background sd)
-      (let ([txt (send tb get-editor)])
-        (send txt change-style sd 0 (send txt last-position))))
-    
-    (send clear-sd set-delta-background "white")
-    (send yellow-sd set-delta-background "yellow")
-    (send black-foreground-sd set-delta-foreground "black")
-    (send gray-foreground-sd set-delta-foreground "gray")
-    (send d set-alignment 'left 'center)
-    (send bp set-alignment 'right 'center)
-    (cond
-      [current-limit
-       (send limited-rb set-selection 0)
-       (send unlimited-rb set-selection #f)]
-      [else
-       (send unlimited-rb set-selection 0)
-       (send limited-rb set-selection #f)])
-    (update-ok-button-state)
-    (cb-checked)
-    (let ([e (send tb get-editor)])
-      (send e set-position 0 (send e last-position)))
-    (cond 
-      [current-limit (send tb focus)]
-      [else (send unlimited-rb focus)])
-    (send d show #t)
-    result)
-  
-  (define (limit-length l n)
-    (let loop ([l l]
-               [n n])
-      (cond
-        [(or (null? l) (zero? n))  null]
-        [else (cons (car l) (loop (cdr l) (- n 1)))])))
-  (define (remove-duplicate-languages l)
-    (reverse
-     (let loop ([l (reverse l)])
-       (cond
-         [(null? l) l]
-         [else
-          (if (member (car (car l)) (map car (cdr l)))
-              (loop (cdr l))
-              (cons (car l) (loop (cdr l))))]))))
-  
-  (define language-label-message%
-    (class name-message%
-      (init-field frame)
-      (inherit refresh)
-      
-      (inherit set-message)
-      (define yellow? #f)
-      (define/override (get-background-color) (and yellow? "yellow"))
-      (define/public (set-yellow y?) 
-        (set! yellow? y?)
-        (refresh))
-      (define/public (set-yellow/lang y? lang) 
-        (set-message #f lang)
-        (set-yellow y?))
-      
-      (define/override (fill-popup menu reset)
-        (let ([added-one? #f])
-          (send (new menu-item%
-                     [label (string-constant recent-languages)]
-                     [callback void]
-                     [parent menu])
-                enable #f)
-          (for-each
-           (λ (name/settings)
-             (let* ([name (car name/settings)]
-                    [marshalled-settings (cdr name/settings)]
-                    [lang (ormap
-                           (λ (l) (and (equal? (send l get-language-name) name) l))
-                           (drracket:language-configuration:get-languages))])
-               (when lang
-                 ;; this test can fail when a language has been added wrongly via the tools interface
-                 ;; just ignore that menu item, in that case.
-                 (let ([settings (or (send lang unmarshall-settings marshalled-settings)
-                                     (send lang default-settings))])
-                   (when lang
-                     (set! added-one? #t)
-                     (new menu-item%
-                          [parent menu]
-                          [label (send lang get-language-name)]
-                          [callback
-                           (λ (x y)
-                             (send (send frame get-definitions-text)
-                                   set-next-settings
-                                   (drracket:language-configuration:language-settings
-                                    lang
-                                    settings)))]))))))
-           (preferences:get 'drracket:recent-language-names))
-          (unless added-one?
-            (send (new menu-item% 
-                       [label (string-append
-                               "  << "
-                               (string-constant no-recently-chosen-languages)
-                               " >>")]
-                       [parent menu]
-                       [callback void])
-                  enable #f))
-          (new separator-menu-item% [parent menu]))
-        (new menu-item%
-             [label (string-constant choose-language-menu-item-label)]
-             [parent menu]
-             [callback 
-              (λ (x y)
-                (send frame choose-language-callback))]))
-      
-      (super-new [label ""]
-                 [font small-control-font]
-                 [string-constant-untitled (string-constant untitled)]
-                 [string-constant-no-full-name-since-not-saved 
-                  (string-constant no-full-name-since-not-saved)])
-      
-      (inherit set-allow-shrinking)
-      (set-allow-shrinking 50)))
-  
-  
-  
-  ;                                                                            
-  ;                                                                            
-  ;                                                                            
-  ;                                                                            
-  ;  ;;;                                                             ;         
-  ;  ;;;                                                           ;;;         
-  ;  ;;; ;;  ;;; ;;;  ;; ;;;     ;;; ;; ;;;;  ;;; ;;    ;;;   ;;; ;;;;;  ;;;;  
-  ;  ;;;;;;; ;;; ;;; ;;;;;;;     ;;;;; ;; ;;; ;;;;;;;  ;;;;;  ;;;;;;;;; ;;; ;; 
-  ;  ;;; ;;; ;;; ;;; ;;; ;;;     ;;;  ;;; ;;; ;;; ;;; ;;; ;;; ;;;  ;;;  ;;;    
-  ;  ;;; ;;; ;;; ;;; ;;; ;;;     ;;;  ;;;;;;; ;;; ;;; ;;; ;;; ;;;  ;;;   ;;;;  
-  ;  ;;; ;;; ;;; ;;; ;;; ;;;     ;;;  ;;;     ;;; ;;; ;;; ;;; ;;;  ;;;     ;;; 
-  ;  ;;;;;;; ;;;;;;; ;;;;;;;     ;;;   ;;;;;; ;;;;;;;  ;;;;;  ;;;  ;;;; ;; ;;; 
-  ;  ;;; ;;   ;; ;;;  ;; ;;;     ;;;    ;;;;  ;;; ;;    ;;;   ;;;   ;;;  ;;;;  
-  ;                      ;;;                  ;;;                              
-  ;                  ;;;;;;                   ;;;                              
-  ;                                                                            
-  ;                                                                            
-  
-  
-  ;; record-saved-bug-report : (listof (cons symbol string)) -> void
-  ;; =Kernel= =Handler=
-  (define (record-saved-bug-report table)
-    (let ([recorded (preferences:get 'drracket:saved-bug-reports)])
-      (unless (member table recorded)
-        (preferences:set 'drracket:saved-bug-reports (shorten-to (cons table recorded) 15)))))
-  
-  ;; shorten-to : (listof X) number -> (listof X)
-  ;; drops items from the end of the list to bring it back down to `n' items
-  (define (shorten-to l n)
-    (let loop ([l l]
-               [n n])
-      (cond
-        [(zero? n) '()]
-        [(null? l) '()]
-        [else (cons (car l) (loop (cdr l) (- n 1)))])))
-  
-  (define saved-bug-reports-window #f)
-  (define saved-bug-reports-panel #f)
-  (define (init-saved-bug-reports-window)
-    (unless saved-bug-reports-window
-      (let ()
-        (set! saved-bug-reports-window (new frame:basic%
-                                            [label (string-constant drscheme)]
-                                            [width 600]))
-        (set! saved-bug-reports-panel
-              (new vertical-panel% [parent (send saved-bug-reports-window get-area-container)]))
-        (define hp (new horizontal-panel% 
-                        [parent (send saved-bug-reports-window get-area-container)] 
-                        [stretchable-width #f] 
-                        [alignment '(right center)]))
-        (define forget-all (new button% 
-                                [label (string-constant bug-track-forget-all)] 
-                                [callback 
-                                 (λ (_1 _2)
-                                   (send saved-bug-reports-window show #f)
-                                   (preferences:set 'drracket:saved-bug-reports '()))]
-                                [parent hp]))
-        (void))))
-  
-  (preferences:add-callback
-   'drracket:saved-bug-reports
-   (λ (p v)
-     (when saved-bug-reports-window
-       (when (send saved-bug-reports-window is-shown?)
-         (cond
-           [(null? v)
-            (send saved-bug-reports-window show #f)]
-           [else
-            (refresh-saved-bug-reports-window v)])))))
-  
-  (define (refresh-saved-bug-reports-window pref)
-    (send saved-bug-reports-window begin-container-sequence)
-    (send saved-bug-reports-panel change-children (λ (l) '()))
-    (for-each
-     (λ (item)
-       (let ()
-         (define (lookup k [default ""])
-           (let loop ([item item])
-             (cond
-               [(null? item) default]
-               [else (let ([rib (car item)])
-                       (if (eq? (car rib) k)
-                           (cdr rib)
-                           (loop (cdr item))))])))
-         (define vp
-           (new vertical-panel% 
-                [style '(border)]
-                [parent saved-bug-reports-panel]
-                [stretchable-height #f]))
-         (define hp
-           (new horizontal-panel% 
-                [parent vp]
-                [stretchable-height #f]))
-         (define first-line-msg 
-           (let ([desc (lookup 'description #f)])
-             (and desc
-                  (new message%
-                       [label (read-line (open-input-string desc))]
-                       [parent vp]
-                       [stretchable-width #t]
-                       [font (send (send (editor:get-standard-style-list) find-named-style 
-                                         "Standard")
-                                   get-font)]))))
-         (define msg (new message% 
-                          [stretchable-width #t]
-                          [label (string-append (lookup 'component "<<unknown component>>")
-                                                (let ([v (lookup 'version #f)])
-                                                  (if v
-                                                      (string-append " " v)
-                                                      "")))]
-                          [parent hp]))
-         (define forget (new button% 
-                             [parent hp] 
-                             [callback (λ (x y) (forget-saved-bug-report item))]
-                             [label (string-constant bug-track-forget)]))
-         (define report (new button% 
-                             [parent hp] 
-                             [callback (λ (x y) 
-                                         (forget-saved-bug-report item)
-                                         (send-url
-                                          (url->string
-                                           (drracket:debug:bug-info->ticket-url item))))]
-                             [label (string-constant bug-track-report)]))
-         (void)))
-     pref) ;; reverse list so first elements end up on top of list
-    (send saved-bug-reports-window reflow-container)
-    (send saved-bug-reports-window end-container-sequence))
-  
-  (define (forget-saved-bug-report item)
-    (preferences:set 'drracket:saved-bug-reports 
-                     (remove item (preferences:get 'drracket:saved-bug-reports))))
-  
-  (define (show-saved-bug-reports-window)
-    (init-saved-bug-reports-window)
-    (unless (send saved-bug-reports-window is-shown?)
-      (refresh-saved-bug-reports-window (preferences:get 'drracket:saved-bug-reports)))
-    (send saved-bug-reports-window show #t))
-  
-  
-  
-  ;                                                    
-  ;                                                    
-  ;                                                    
-  ;                                                    
-  ;   ;;;;                                   ;;    ;   
-  ;  ;;;                                    ;  ;  ;    
-  ;  ;;;; ;;; ;;;;;;;  ;;; ;; ;;;    ;;;;   ;  ;  ;    
-  ;  ;;;; ;;;;;;;;;;;; ;;;;;;;;;;;  ;; ;;;  ;  ; ;     
-  ;  ;;;  ;;;  ;;  ;;; ;;; ;;; ;;; ;;; ;;;   ;; ;; ;;  
-  ;  ;;;  ;;;    ;;;;; ;;; ;;; ;;; ;;;;;;;      ; ;  ; 
-  ;  ;;;  ;;;  ;;; ;;; ;;; ;;; ;;; ;;;         ;  ;  ; 
-  ;  ;;;  ;;;  ;;; ;;; ;;; ;;; ;;;  ;;;;;;     ;  ;  ; 
-  ;  ;;;  ;;;   ;;;;;; ;;; ;;; ;;;   ;;;;     ;    ;;  
-  ;                                                    
-  ;                                                    
-  ;                                                    
-  ;                                                    
-  
-  
-  (define -frame%
-    (drracket:module-language:module-language-online-expand-frame-mixin
-     (frame-mixin
-      (drracket:frame:mixin
-       (drracket:frame:basics-mixin 
-        (frame:size-pref-mixin
-         (frame:searchable-text-mixin 
-          (frame:searchable-mixin
-           (frame:text-info-mixin 
-            (frame:delegate-mixin
-             (frame:status-line-mixin
-              (frame:info-mixin
-               (frame:text-mixin
-                (frame:editor-mixin
-                 (frame:standard-menus-mixin
-                  (frame:register-group-mixin
-                   (frame:focus-table-mixin
-                    (frame:basic-mixin
-                     frame%))))))))))))))))))
-  
-  (define-local-member-name enable-two-way-prefs)
-  (define (make-two-way-prefs-dragable-panel% % pref-key)
-    (class %
-      (inherit get-percentages)
-
-      (define save-prefs? #f)
-      (define/public (enable-two-way-prefs) (set! save-prefs? #t))
-      
-      (define/augment (after-percentage-change)
-        (when save-prefs?
-          (let ([percentages (get-percentages)])
-            (when (and (pair? percentages)
-                       (pair? (cdr percentages))
-                       (null? (cddr percentages)))
-              (preferences:set pref-key (car percentages)))))
-        (inner (void) after-percentage-change))
-      (super-new)))
-  
-  (define drs-name-message%
-    (class name-message%
-      (define/override (on-choose-directory dir)
-        (let ([file (finder:get-file dir
-                                     (string-constant select-file)
-                                     #f
-                                     ""
-                                     (send this get-top-level-window))])
-          (when file
-            (handler:edit-file file))))
-      (super-new 
-       [string-constant-untitled (string-constant untitled)]
-       [string-constant-no-full-name-since-not-saved 
-        (string-constant no-full-name-since-not-saved)])))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;; lambda-snipclass is for backwards compatibility
-  ;;
-  (define lambda-snipclass
-    (make-object (class snip-class%
-                   (define/override (read p) (make-object string-snip% "λ"))
-                   (super-new))))
-  (send lambda-snipclass set-version 1)
-  (send lambda-snipclass set-classname "drscheme:lambda-snip%")
-  (send (get-the-snip-class-list) add lambda-snipclass)
-  
-  (define newest-frame 'nothing-yet)
-  
-  (define open-drscheme-window
-    (case-lambda
-      [() (open-drscheme-window #f)]
-      [(name)
-       (cond
-         [(and newest-frame
-               name
-               (not (equal? newest-frame 'nothing-yet)) 
-               (send newest-frame still-untouched?))
-          (send newest-frame change-to-file name)
-          (send newest-frame show #t)
-          (begin0 newest-frame
-                  (set! newest-frame #f))]
-         [(and name ;; only open a tab if we have a filename
-               (preferences:get 'drracket:open-in-tabs))
-          (define frs (send (group:get-the-frame-group) get-frames))
-          (let ([ac (send (group:get-the-frame-group) get-active-frame)])
-            (when (and ac (send ac is-shown?))
-              (set! frs (cons ac (remove ac frs)))))
-          (define fr (let loop ([frs frs])
-                       (cond
-                         [(null? frs) #f]
-                         [else (let ([fr (car frs)])
-                                 (or (and (is-a? fr drracket:unit:frame<%>)
-                                          fr)
-                                     (loop (cdr frs))))])))
-          (cond
-            [fr
-             (send fr open-in-new-tab name)
-             (send fr show #t)
-             fr]
-            [else
-             (create-new-drscheme-frame name)])]
-         [else
-          (create-new-drscheme-frame name)])]))
-  
-  (define (create-new-drscheme-frame filename)
-    (let* ([drs-frame% (drracket:get/extend:get-unit-frame)]
-           [frame (new drs-frame% (filename filename))])
-      (send frame update-toolbar-visibility)
-      (send frame initialize-module-language)
-      (send frame show #t)
-      (send (send frame get-interactions-text) initialize-console)
-      frame)))
-
-(define/contract (compute-label-string fn)
-  (-> (or/c path? #f) label-string?)
-  (cond
-    [fn
-     (define base-title (format (string-constant module-browser-in-file) ""))
-     (define str (path->string fn))
-     (define limit (- 200 (string-length base-title)))
-     (define str-to-use
-       (if (<= (string-length str) limit)
-           str
-           (string-append "..."
-                          (substring str
-                                     (+ (- (string-length str) limit) 3)
-                                     (string-length str)))))
-     (format (string-constant module-browser-in-file) str-to-use)]
-    [else (string-constant module-browser-no-file)]))
-
-(module+ test
-  (require rackunit)
-  (check-equal? (compute-label-string (string->path "x"))
-                (format (string-constant module-browser-in-file) "x"))
-  (check-equal? (compute-label-string #f)
-                (string-constant module-browser-no-file))
-  (check-equal? (string-length (compute-label-string (string->path (make-string 200 #\x))))
-                200)
-  (for ([i (in-range 100 300)])
-    (let/ec k
-      (parameterize ([error-escape-handler k])
-        (check-true (string? 
-                     (compute-label-string 
-                      (string->path (make-string i #\x)))))))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/private/wrap-tool-inputs.rkt b/pkgs/drracket-pkgs/drracket/drracket/private/wrap-tool-inputs.rkt
deleted file mode 100644
index da386c9e7b..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/private/wrap-tool-inputs.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket/base
-(provide wrap-tool-inputs)
-(require racket/contract)
-(require (for-syntax racket/base
-                     racket/match
-                     syntax/modread
-                     compiler/cm-accomplice))
-
-(define-syntax (wrap-tool-inputs stx)
-  (syntax-case stx ()
-    [(_ body tool-name replace?)
-     (let ()
-       (define do-regexp-replace? (syntax-e #'replace?))
-       (define tool-lib-src (collection-file-path "tool-lib.rkt" "drracket"))
-       (define full-sexp
-         (call-with-input-file tool-lib-src
-           (λ (port)
-              (with-module-reading-parameterization
-               (lambda ()
-                 (read port))))))
-       
-       (register-external-file tool-lib-src)
-
-       (let loop ([sexp full-sexp])
-         (match sexp
-           [`((#%module-begin ,body ...))
-            (loop body)]
-           [`((provide/dr/doc ,clauses ...) ,rest ...)
-            (let ()
-              (define (rewrite obj)
-                (if do-regexp-replace?
-                    (let loop ([obj obj])
-                      (cond
-                        [(symbol? obj)
-                         (string->symbol (regexp-replace #rx"^drracket:"
-                                                         (symbol->string obj)
-                                                         "drscheme:"))]
-                        [(pair? obj)
-                         (cons (loop (car obj)) (loop (cdr obj)))]
-                        [else obj]))
-                    obj))
-              (define let-bindingss
-                (for/list ([clause (in-list clauses)])
-                  (match clause
-                    [`(struct-doc ,struct-name ((,field-name ,field-ctc) ...) ,other ...)
-                     '()]
-                    [`(,(or 'proc-doc/names 'proc-doc 'thing-doc 'parameter-doc)
-                       ,(? symbol? orig-name)
-                       ,ctc
-                       ,other ...)
-                     (with-syntax ([name (datum->syntax #'tool-name (rewrite orig-name))]
-                                   [ctc (datum->syntax #'tool-name (rewrite ctc))])
-                       (list
-                        #`[name
-                           (contract
-                            (let ([name ctc]) name)  ;; need to replace the names in 'ctc'
-                            name 
-                            'drracket 
-                            tool-name
-                            (quote name)
-                            (quote-syntax name))]))])))
-            #`(let #,(apply append let-bindingss)
-                body))]
-           [`(,a . ,b) 
-            (loop b)]
-           [`()
-            (error 'tools-drs.rkt "did not find provide/dr/doc: ~a" full-sexp)])))]))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/sprof.rkt b/pkgs/drracket-pkgs/drracket/drracket/sprof.rkt
deleted file mode 100644
index 0f50626860..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/sprof.rkt
+++ /dev/null
@@ -1,398 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         framework
-         racket/class)
-
-;; how long between samples
-(define pause-time 0.1)
-
-;; gui updates occur every 'update-frequency' samples
-(define update-frequency 4)
-
-(define (make-prod-thread get-threads update-gui)
-  (thread (lambda ()
-            (define traces-table (make-hash))
-            (let loop ([i 0])
-              (sleep pause-time)
-              (let ([new-traces
-                     (map (λ (t) (continuation-mark-set->context (continuation-marks t)))
-                          (get-threads))])
-                (for-each
-                 (λ (trace)
-                   (for-each
-                    (λ (line)
-                      (hash-set! traces-table line (cons trace (hash-ref traces-table line '()))))
-                    trace))
-                 new-traces)
-                (cond
-                  [(zero? i)
-                   (update-gui traces-table)
-                   (loop update-frequency)]
-                  [else
-                   (loop (- i 1))]))))))
-
-(define (format-fn-name i)
-  (let ([id (car i)]
-        [src (cdr i)])
-    (cond
-      [id (format "~a" id)]
-      [src
-       (format "~a:~a~a"
-               (cond
-                 [(path? (srcloc-source src))
-                  (let-values ([(base name dir?) (split-path (srcloc-source src))])
-                    name)]
-                 [else (srcloc-source src)])
-               (if (srcloc-line src)
-                   (format "~a:~a"
-                           (srcloc-line src)
-                           (srcloc-column src))
-                   (srcloc-position src))
-               (if id
-                   (format ": ~a" id)
-                   ""))]
-      [else "???"])))
-
-(define (insert-long-fn-name t i)
-  (send t begin-edit-sequence)
-  (send t erase)
-  (let ([id (car i)]
-        [src (cdr i)])
-    (when src
-      (send t insert
-            (format "~a:~a"
-                    (srcloc-source src)
-                    (if (srcloc-line src)
-                        (format "~a:~a"
-                                (srcloc-line src)
-                                (srcloc-column src))
-                        (format ":~a" (srcloc-position src))))))
-    (when (and id src)
-      (send t insert "\n"))
-    (when id
-      (send t insert (format (format "~a" id))))
-    (unless (or id src)
-      (send t insert "???")))
-  (send t end-edit-sequence))
-
-(define (format-percentage n)
-  (let ([trunc (floor (* n 100))])
-    (format "~a%" (pad3 trunc))))
-
-(define (pad3 n)
-  (cond
-    [(< n 10) (format "00~a" n)]
-    [(< n 100) (format "0~a" n)]
-    [else (format "~a" n)]))
-
-(define cumulative-t%
-  (class text:line-spacing%
-    (init-field open-button vp ec1 lp info-editor)
-    (inherit begin-edit-sequence
-             end-edit-sequence
-             erase
-             find-position 
-             get-admin
-             dc-location-to-editor-location
-             position-paragraph
-             insert
-             last-position
-             highlight-range
-             last-paragraph
-             lock)
-    
-    (define gui-display-data '())
-    (define clicked-srcloc-pr #f)
-    (define line-to-source (make-hasheq))
-
-    (define clear-old-pr void)
-    
-    (define/override (on-event event)
-      (cond
-        [(send event button-up? 'left)
-         (let ([admin (get-admin)])
-           (when admin
-             (let ([dc (send admin get-dc)])
-               (let-values ([(x y) (dc-location-to-editor-location (send event get-x)
-                                                                   (send event get-y))])
-                 (let* ([loc (find-position x y)]
-                        [para (position-paragraph loc)])
-                   (set! clicked-srcloc-pr (and (<= 0 para (last-paragraph))
-                                                (car (list-ref gui-display-data para))))
-                   (update-gui-display))))))]
-        [else (void)]))
-
-    (define/public (set-gui-display-data/refresh traces-table)
-      (set! gui-display-data
-            (sort (hash-map traces-table (λ (k v) (cons k v)))
-                  >
-                  #:key (λ (x) (length (cdr x)))))
-      (update-gui-display))
-    
-    (define/public (clear-clicked)
-      (set! clicked-srcloc-pr #f)
-      (update-gui-display))
-    
-    (define/private (update-gui-display)
-      (lock #f)
-      (begin-edit-sequence)
-      (erase)
-      (set! line-to-source (make-hasheq))
-      (clear-old-pr)
-      (set! clear-old-pr void)
-      (let* ([denom-ht (make-hasheq)]
-             [filtered-gui-display-data
-              (map 
-               (λ (pr)
-                 (let ([id (car pr)]
-                       [stacks (filter-stacks (cdr pr))])
-                   (for-each (λ (stack) (hash-set! denom-ht stack #t)) stacks)
-                   (cons id stacks)))
-               gui-display-data)]
-             [denom-count (hash-count denom-ht)])
-        (let loop ([prs filtered-gui-display-data]
-                   [first? #t]
-                   [i 0])
-          (cond
-            [(null? prs) (void)]
-            [else
-             (let* ([pr (car prs)]
-                    [fn (car pr)]
-                    [count (length (cdr pr))])
-               (cond
-                 [(zero? count)
-                  (loop (cdr prs) first? i)]
-                 [else
-                  (unless first? (insert "\n"))
-                  (let ([before (last-position)])
-                    (hash-set! line-to-source i pr)
-                    (insert (format-percentage (/ count denom-count)))
-                    (insert (format " ~a" (format-fn-name fn)))
-                    (let ([after (last-position)])
-                      (when (equal? (car pr) clicked-srcloc-pr)
-                        (set! clear-old-pr (highlight-range before after "NavajoWhite")))))
-                  (loop (cdr prs) #f (+ i 1))]))]))
-        (lock #t)
-        (end-edit-sequence)
-        (update-info-editor clicked-srcloc-pr)
-        (send open-button enable (and clicked-srcloc-pr (path? (srcloc-source (cdr clicked-srcloc-pr)))))))
-    
-    (define/private (filter-stacks stacks)
-      (cond
-        [(not clicked-srcloc-pr) stacks]
-        [else
-         (filter (λ (stack) (ormap (λ (stack-ent) (equal? clicked-srcloc-pr stack-ent))
-                                   stack))
-                 stacks)]))
-         
-    (define/public (open-current-pr)
-      (when clicked-srcloc-pr
-        (let ([src (cdr clicked-srcloc-pr)])
-          (when (path? (srcloc-source src))
-            (printf "open ~s\n" (srcloc-source src))
-            (when (number? (srcloc-position src))
-              (printf "go to ~s\n" (srcloc-position src)))))))
-    
-    (define/private (update-info-editor pr)
-      (send vp change-children (λ (l) (if pr (list ec1 lp) (list ec1))))
-      (when pr
-        (insert-long-fn-name info-editor pr)))
-    
-    (super-new)))
-
-(define (construct-gui f)
-  (define info-editor (new text%))
-  (define vp (new vertical-panel% [parent f]))
-  (define ec1 (new editor-canvas% [parent vp]))
-  (define lp (new vertical-panel% [parent vp] [stretchable-height #f]))
-  (define ec2 (new editor-canvas%
-                   [parent lp]
-                   [min-height 100]
-                   [stretchable-height #f]
-                   [editor info-editor]))
-  (define bp (new horizontal-panel% [stretchable-height #f] [parent lp] [alignment '(center center)]))
-  (define open-button (new button%
-                           [parent bp]
-                           [label "Open"]
-                           [callback
-                            (λ (x y)
-                              (send cumulative-t open-current-pr))]))
-  (define unlock (new button%
-                      [label "Show All"]
-                      [parent bp]
-                      [callback
-                       (λ (x y)
-                         (send cumulative-t clear-clicked))]))
-  (define cumulative-t (new cumulative-t% 
-                            [open-button open-button]
-                            [vp vp]
-                            [ec1 ec1]
-                            [lp lp]
-                            [info-editor info-editor]))
-  (send ec1 set-editor cumulative-t)
-  (send vp change-children (λ (l) (list ec1)))
-  (send cumulative-t hide-caret #t)
-  (send cumulative-t lock #t)
-  (send info-editor auto-wrap #t)
-  (values vp cumulative-t))
-
-;; running an example outside of drscheme
-#;
-(begin
-  (define evt (make-eventspace))
-  (define f (parameterize ([current-eventspace evt])
-              (new frame%
-                   [label ""]
-                   [width 400]
-                   [height 800])))
-  (define-values (panel cumulative-t) (construct-gui f))
-  (send f show #t)
-  
-  (void (make-prod-thread (let ([t (current-thread)])
-                            (λ () (list t)))
-                          (λ (traces-table)
-                            (parameterize ([current-eventspace evt])
-                              (queue-callback
-                               (λ () 
-                                 (send cumulative-t set-gui-display-data/refresh traces-table)))))))
-  
-  (time (dynamic-require '(lib "scribblings/reference/reference.scrbl")
-                         #f)))
-
-;; tool code, for integration with drscheme
-(begin
-  (require drracket/tool
-           racket/unit
-           string-constants/string-constant)
-  
-  (define sc-show-sprof "Show SProfile")
-  (define sc-hide-sprof "Hide SProfile")
-  
-  (provide tool@)
-  (define tool@
-    (unit
-      (import drscheme:tool^)
-      (export drscheme:tool-exports^)     
-      (define (phase1) (void))
-      (define (phase2) (void))
-      
-      (define-local-member-name
-        show/hide-sprof-panel
-        update-sprof-panel
-        toggle-sprof-visiblity
-        stop-profiling-thread
-        start-profiling-thread
-        get-threads-to-profile)
-      
-      (define unit-frame-mixin
-        (mixin (drscheme:unit:frame<%>) ()
-          (inherit get-current-tab)
-          
-          (define main-panel #f)
-          (define sprof-main-panel #f)
-          (define everything-else #f)
-          (define cumulative-t #f)
-          (define show/hide-menu-item #f)
-          
-          (define/public (show/hide-sprof-panel show?)
-            (let ([main-children (send main-panel get-children)])
-              (send show/hide-menu-item 
-                    set-label
-                    (if show? sc-hide-sprof sc-show-sprof))
-              (unless (or (and show? (= 2 (length main-children)))
-                          (and (not show?) (= 1 (length main-children))))
-                (send main-panel change-children 
-                      (λ (l) 
-                        (if show?
-                            (list everything-else sprof-main-panel)
-                            (list everything-else)))))))
-          
-          (define/override (make-root-area-container cls parent)
-            (set! main-panel (super make-root-area-container panel:horizontal-dragable% parent))
-            (set! everything-else (make-object cls main-panel))
-            (set!-values (sprof-main-panel cumulative-t) (construct-gui main-panel))
-            (send main-panel change-children (λ (l) (list everything-else)))
-            everything-else)
-          
-          (define/augment (on-tab-change from-tab to-tab)
-            (inner (void) on-tab-change from-tab to-tab)
-            (send to-tab update-sprof-panel))
-          
-          (define/override (add-show-menu-items show-menu)
-            (super add-show-menu-items show-menu)
-            (set! show/hide-menu-item
-                  (new menu-item%
-                       [parent show-menu]
-                       [label sc-show-sprof]
-                       [callback 
-                        (λ (x y)
-                          (send (get-current-tab) toggle-sprof-visiblity))])))
-          
-          ;; FIX: the cumulative-t text object shouldn't be handed out like this
-          ;; instead its contents need to be tab specific, so switching tabs
-          ;; (ala the update-sprof-panel method) should change the contents of
-          ;; the cumulative-t, presumably via the set-gui-display-data/refresh method.
-          (define/public (get-cumulative-t) cumulative-t)
-          
-          (super-new)))
-      
-      (define tab-mixin
-        (mixin (drscheme:unit:tab<%>) ()
-          (inherit get-frame get-ints)
-          (define prof-visible? #f)
-          (define/public (toggle-sprof-visiblity)
-            (set! prof-visible? (not prof-visible?))
-            (cond
-              [prof-visible?
-               (start-profiling-thread)]
-              [else
-               (stop-profiling-thread)])
-            (update-sprof-panel))
-          (define/public (update-sprof-panel)
-            (send (get-frame) show/hide-sprof-panel prof-visible?))
-          
-          (define profiling-thread #f)
-          
-          (define/public (stop-profiling-thread)
-            (when profiling-thread
-              (kill-thread profiling-thread))
-            (set! profiling-thread #f))
-          
-          (define current-traces-table #f)
-          
-          (define/public (start-profiling-thread)
-            (stop-profiling-thread)
-            (set! profiling-thread (make-prod-thread 
-                                    (λ () (send (get-ints) get-threads-to-profile))
-                                    (λ (traces-table)
-                                      (queue-callback
-                                       (λ ()
-                                         (send (send (get-frame) get-cumulative-t) set-gui-display-data/refresh traces-table)))))))
-          
-          (super-new)))
-      
-      (define system-custodian (current-custodian))
-      
-      (define repl-mixin
-        (mixin (drscheme:rep:text<%>) ()
-          (inherit get-user-custodian)
-          (define/public (get-threads-to-profile)
-            (let ([thds '()])
-              (let loop ([cust (get-user-custodian)])
-                (for-each
-                 (λ (obj)
-                   (cond 
-                     [(custodian? obj) (loop obj)]
-                     [(thread? obj) (set! thds (cons obj thds))]))
-                 (custodian-managed-list cust system-custodian)))
-              thds))
-
-          ;; FIX
-          ;; something needs to happen here so that the profiling gets shutdown when the repl dies.
-          ;; the right call back isn't obvious, tho. :(
-          
-          (super-new)))
-       
-      (drscheme:get/extend:extend-tab tab-mixin)
-      (drscheme:get/extend:extend-interactions-text repl-mixin)
-      (drscheme:get/extend:extend-unit-frame unit-frame-mixin))))
diff --git a/pkgs/drracket-pkgs/drracket/drracket/syncheck-drracket-button.rkt b/pkgs/drracket-pkgs/drracket/drracket/syncheck-drracket-button.rkt
deleted file mode 100644
index b578fd0723..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/syncheck-drracket-button.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-(require racket/class 
-         racket/gui/base
-         string-constants/string-constant
-         images/compile-time
-         (for-syntax racket/base images/icons/tool images/icons/style))
-(provide syncheck-drracket-button
-         syncheck-bitmap
-         syncheck-small-bitmap
-         syncheck:button-callback)
-
-(define-local-member-name syncheck:button-callback)
-
-(define syncheck-bitmap
-  (compiled-bitmap (check-syntax-icon #:height (toolbar-icon-height))))
-(define syncheck-small-bitmap
-  (compiled-bitmap (small-check-syntax-icon #:height (toolbar-icon-height))))
-
-(define syncheck-drracket-button
-  (list 
-   (string-constant check-syntax)
-   syncheck-bitmap
-   (λ (drs-frame) (send drs-frame syncheck:button-callback))))
-
diff --git a/pkgs/drracket-pkgs/drracket/drracket/syncheck.rkt b/pkgs/drracket-pkgs/drracket/drracket/syncheck.rkt
deleted file mode 100644
index 20c205cd8c..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/syncheck.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "private/syncheck/gui.rkt")
-(provide tool@)
diff --git a/pkgs/drracket-pkgs/drracket/drracket/tool-lib.rkt b/pkgs/drracket-pkgs/drracket/drracket/tool-lib.rkt
deleted file mode 100644
index 92f747727d..0000000000
--- a/pkgs/drracket-pkgs/drracket/drracket/tool-lib.rkt
+++ /dev/null
@@ -1,2038 +0,0 @@
-#lang at-exp racket/base
-
-#|
-This first time this is loaded, it loads all of DrRacket and invokes
-the main unit, starting up DrRacket. After that, it just provides
-all of the names in the tools library, for use defining keybindings
-|#
-
-(module test racket/base)
-
-(require racket/class
-         racket/gui/base
-         racket/unit 
-         racket/contract
-         racket/class
-         racket/struct-info
-         
-         ;; these have to be absolute requires for `include-extracted'
-         ;; to work with this file.
-         drracket/private/link
-         drracket/private/drsig
-         drracket/private/language-object-contract
-         drracket/private/local-member-names
-         
-         framework
-         framework/splash
-         
-         mrlib/switchable-button
-         scribble/srcdoc
-         
-         net/url)
-
-(require (for-syntax racket/base racket/list racket/struct-info))
-
-(generate-delayed-documents) ; avoids a distribution dependency on `scribblings/tools/doc-util'
-(require (for-doc drracket/private/ts
-                  racket/base scribble/manual
-                  scribblings/tools/doc-util
-                  net/url
-                  (for-label errortrace/errortrace-key
-                             racket/place
-                             racket/pretty 
-                             mzlib/pconvert
-                             syntax/toplevel
-                             drracket/tool-lib)))
-
-;; these two declarations produce all of the struct names
-;; but with "drscheme" in front instead of drracket
-(begin
-  (module drr-structs racket/base
-    (require drracket/private/local-member-names)
-    (provide 
-     (combine-out
-      (struct-out drracket:language-configuration:language-settings)
-      (struct-out drracket:unit:teachpack-callbacks)
-      (struct-out drracket:language:text/pos) 
-      (struct-out drracket:language:simple-settings)
-      (struct-out drracket:modes:mode))))
-  (require racket/require
-           (filtered-in 
-            (λ (x) (regexp-replace #rx"drracket:" x "drscheme:"))
-            (submod "." drr-structs))))
-
-
-;; would like to use except here, but that
-;; is allowed only on imports,
-;; so just rename to something unused.
-(define-syntax (dv/iu/i/drop-struct stx)
-  (syntax-case stx ()
-    [(_ sig stuff ...)
-     (let ()
-       (define (get-ids prefix sid-flds)
-         (syntax-case sid-flds ()
-           [(struct-id constructor? fields ...)
-            (let ()
-              (define include-constructor? (syntax-e #'constructor?))
-              (unless (boolean? include-constructor?)
-                (raise-syntax-error #f "expected boolean?" stx #'constructor?))
-              (define (fmt str . args)
-                (define orig
-                  (string->symbol
-                    (apply format str (map (λ (x) (if (syntax? x) (syntax-e x) x))
-                                           args))))
-                `(,(datum->syntax #'sig (string->symbol (format "___~a" orig)))
-                  ,(datum->syntax #'sig orig)))
-              (append (list (fmt "~a~a?" prefix #'struct-id))
-                      (if include-constructor?
-                          (list (fmt "~a~a" prefix #'struct-id))
-                          '())
-                      (for/list ([fld (in-list (syntax->list #'(fields ...)))])
-                        (fmt "~a~a-~a" prefix #'struct-id fld))))]))
-     #`(define-values/invoke-unit/infer 
-         (export (rename sig
-                         #,@(apply
-                             append
-                             (for/list ([sid-flds (syntax->list #'(stuff ...))])
-                               (append (get-ids 'drracket: sid-flds)
-                                       (get-ids 'drscheme: sid-flds))))))
-         drracket@))]))
-(dv/iu/i/drop-struct 
- drscheme/drracket:tool^
- (language-configuration:language-settings #t language settings)
- (unit:teachpack-callbacks #t get-names add remove remove-all)
- (language:text/pos #t text start end)
- (language:simple-settings #t case-sensitive printing-style
-                           fraction-style show-sharing
-                           insert-newlines annotations)
- (modes:mode #t name surrogate repl-submit matches-language intended-to-edit-programs?))
- 
-(provide-signature-elements drracket:tool-cm^) ;; provide all of the classes & interfaces
-(provide-signature-elements drscheme:tool-cm^) ;; provide the classes & interfaces w/ drscheme: prefix
-
-(provide drracket:unit:program-editor-mixin)
-(define-syntax (drracket:unit:program-editor-mixin stx)
-  (syntax-case stx ()
-    [(_ a ...)
-     #'((drracket:unit:get-program-editor-mixin) a ...)]
-    [_ #'(drracket:unit:get-program-editor-mixin)]))
-
-(language-object-abstraction drracket:language:object/c #t)
-
-(define-syntax (provide/dr/doc stx)
-  (define (munge-id stx)
-    (datum->syntax
-     stx
-     (string->symbol
-      (regexp-replace #rx"drracket:" (symbol->string (syntax-e stx)) "drscheme:"))
-     stx))
-  (define (handle-one id ctc)
-    (with-syntax ([id id]
-                  [ctc ctc]
-                  [mid (munge-id id)])
-      #`(thing-doc 
-         mid ctc 
-         ("This binding provided for backwards compatibility; new code should use " 
-          (racket id)
-          " instead."))))
-  (define (remove-src-locs stx)
-    (let loop ([x stx])
-      (cond
-        [(syntax? x) (datum->syntax x (loop (syntax-e x)) #f)]
-        [(pair? x) (cons (loop (car x)) (loop (cdr x)))]
-        [else x])))
-  
-  (define (handle-struct a fld/ctc omit-constructor?)
-    (with-syntax ([([fld ctc] ...) fld/ctc])
-      (define (ds fmt . args)
-        (datum->syntax a
-                       (string->symbol (apply format fmt args))))
-      (let* ([flds (syntax->list #'(fld ...))]
-             [ctcs (syntax->list #'(ctc ...))]
-             [st-name (syntax-e a)]
-             [pid (ds "~a?" st-name)])
-        #`(combine-out
-           #,(handle-one pid (remove-src-locs #`(-> any/c boolean?)))
-           #,(if omit-constructor?
-                 #'(combine-out)
-                 (handle-one (ds "make-~a" st-name) (remove-src-locs #`(-> #,@ctcs #,pid))))
-           #,@(for/list ([fld (in-list flds)]
-                         [ctc (in-list ctcs)])
-                (define id (ds "~a-~a" st-name (syntax-e fld)))
-                (handle-one id (remove-src-locs #`(-> #,pid #,ctc))))))))
-  
-  (define defthings
-    (syntax-case stx ()
-      [(_ case ...)
-       (for/list ([case (in-list (syntax->list #'(case ...)))])
-         (syntax-case case (thing-doc
-                            proc-doc/names proc-doc 
-                            parameter-doc parameter/c
-                            struct-doc)
-           [(proc-doc/names id ctc . stuff)
-            (identifier? #'id)
-            (handle-one #'id #'ctc)]
-           [(proc-doc id ctc . stuff)
-            (identifier? #'id)
-            (handle-one #'id #'ctc)]
-           [(parameter-doc id (parameter/c ctc) arg-id . stuff)
-            (and (identifier? #'id)
-                 (identifier? #'arg-id))
-            (handle-one #'id (remove-src-locs #`(parameter/c ctc)))]
-           [(thing-doc id ctc . stuff)
-            (identifier? #'id)
-            (handle-one #'id #'ctc)]
-           [(struct-doc a ([fld ctc] ...) #:omit-constructor stuff)
-            (handle-struct #'a #'([fld ctc] ...) #t)]
-           [(struct-doc a ([fld ctc] ...) stuff)
-            (handle-struct #'a #'([fld ctc] ...) #f)]
-           [_
-            (raise-syntax-error 'provide/dr/doc "unknown clause" case)]))]))
-  (syntax-case stx ()
-    [(_  rst ...)
-     #`(provide #,@defthings rst ...)]))
-
-(provide/dr/doc
- 
- (proc-doc/names
-  drracket:module-language-tools:add-opt-out-toolbar-button
-  (->* ((-> (is-a?/c top-level-window<%>)
-            (is-a?/c area-container<%>) 
-            (is-a?/c switchable-button%))
-        symbol?)
-       (#:number (or/c real? #f))
-       void?)
-  ((make-button id) ((number #f)))
-  @{Call this function to add another button to DrRacket's toolbar. When buttons are added this way,
-    DrRacket monitors the @tt{#lang} line at the top of the file; when it changes DrRacket queries
-    the language to see if this button should be included.
-    These buttons are ``opt out'', meaning that if the language doesn't explicitly ask to not
-    have this button (or all such buttons), the button will appear.
-    
-    The @racket[number] argument is the same as the @racket[number] argument
-    to @method[drracket:unit:frame<%> register-toolbar-button].
-
-    @language-info-def[drracket:opt-out-toolbar-buttons]{
-      See @racket[read-language] for more details on how a language can opt out.
-      DrRacket will invoke the @tt{get-info} proc from @racket[read-language] with
-      @racket['drracket:opt-out-toolbar-buttons] 
-      (and @indexed-racket['drscheme:opt-out-toolbar-buttons] for backwards compatibility).
-      If the result is a list of symbols, the
-      listed symbols are opted out. If the result is @racket[#f], all buttons are opted
-      out. The default is the empty list, meaning that all opt-out buttons appear.}})
- 
- (proc-doc/names
-  drracket:module-language-tools:add-online-expansion-handler 
-  (-> path-string? symbol? (-> (is-a?/c drracket:unit:definitions-text<%>)
-                               any/c
-                               any)
-      void?)
-  (mod-path id local-handler)
-  @{Registers a pair of procedures with DrRacket's online expansion machinery. 
-    (See also @racket[drracket:module-language-tools:add-online-expansion-monitor].)
-    
-    The first two arguments name a procedure in a module that is loaded by 
-    @racket[dynamic-require] is specially designed separate @racket[place].
-    When DrRacket detects that
-    the editor has been modified, it sends the contents of the editor over to
-    that separate place, @racket[expand]s the program there, and then supplies
-    the fully expanded object to that first procedure. (The procedure is called 
-    in the same context as the expansion process.)
-
-    If the expansion raises an exception, then that exception is supplied as the 
-    first argument instead of the syntax object. If a non-@racket[exn?] is raised, 
-    or if the expansion process is terminated (e.g. via @racket[custodian-shutdown-all]
-    called during expansion), then the expansion monitor is not notified.
-    
-    The contract for that procedure is
-    @racketblock[(-> (or/c syntax? exn?) path? any/c custodian? 
-                     any)]
-    There are three other arguments:
-    @itemize[
-      @item{
-    The @racket[path?] argument is the path that was the @racket[current-directory]
-    when the code was expanded. This directory should be used as the 
-    @racket[current-directory] when resolving module paths obtained from
-    the syntax object.}
-    
-      @item{
-    The third argument is the source object used in the syntax objects that
-    come from the definitions window in DrRacket. It may be a path (if the file
-    was saved), but it also might not be. Use @racket[equal?] to compare it
-    with the @racket[syntax-source] field of syntax objects to determine if
-    they come from the definitions window.}
-    
-      @item{ Note that the thread that calls this procedure may be
-    killed at any time: DrRacket may kill it when the user types in the buffer
-    (in order to start a new expansion), but bizarro code may also create a separate
-    thread during expansion that lurks around and then mutates arbitrary things.
-    
-    Some code, however, should be longer running, surviving such custodian
-    shutdowns. To support this, the procedure called in the separate place is
-    supplied with a more powerful custodian that is not shut down. }]
-    
-    The result of the procedure is expected to be something that can be sent
-    across a @racket[place-channel], which is then sent back to the original
-    place where DrRacket itself is running and passed to the @racket[local-handler]
-    argument. At this point, the only code running is trusted code (DrRacket itself
-    and other tools), but any long running computations may freeze DrRacket's GUI, 
-    since this procedure is invoked on DrRacket's eventspace's handler thread.})
- 
- (proc-doc/names
-  drracket:module-language-tools:add-online-expansion-monitor
-  (-> path-string? symbol?
-      (-> (is-a?/c drracket:unit:definitions-text<%>)
-          (or/c drracket:module-language-tools:start?
-                any/c)
-          any)
-      void?)
-  (mod-path id local-handler)
-  @{Registers a pair of procedures with DrRacket's online expansion machinery. 
-    
-    Like @racket[drracket:module-language-tools:add-online-expansion-handler], 
-    the first two arguments name a procedure that is called in the separate place
-    designated for expansion.
-    
-    The procedure is called before expansion starts and once it returns, expansion
-    begins. The procedure should match this contract:
-    @racketblock[(-> (-> any/c void?)
-                     path? any/c custodian? 
-                     any)]
-    The first argument is a function that transmits its argument back to the
-    DrRacket place, send it to the @racket[local-handler] argument.
-    The other three arguments are the same as the corresponding procedure used
-    by @racket[drracket:module-language-tools:add-online-expansion-handler].
-    
-    The expectation is that this procedure creates a thread and monitors the 
-    expansion process, sending back information to the main place while
-    expansion is progressing.
-    
-    The @racket[local-handler] procedure is called each time the 
-    @racket[(-> any/c void?)] procedure (described just above) is called.
-    It is also called each time an expansion starts; it receives a value
-    that returns @racket[#t] from @racket[drracket:module-language-tools:start?]
-    in that case.})
-
- (proc-doc/names
-  drracket:module-language-tools:start?
-  (-> any/c boolean?)
-  (val)
-  @{Returns @racket[#t] if this is a special (unique) value, used as
-    discussed in @racket[drracket:module-language-tools:add-online-expansion-monitor].
-    Returns @racket[#f] otherwise.})
- 
- (proc-doc/names
-  drracket:module-language-tools:register-online-expansion-pref
-  (-> (-> (is-a?/c vertical-panel%) void?) void?)
-  (func)
-  @{Registers @racket[func] so that it is called while building the
-    preferences panel. The function is passed a panel that contains 
-    other configuration controls for online expansion.})
- 
- (proc-doc/names
-  drracket:module-language-tools:done?
-  (-> any/c boolean?)
-  (val)
-  @{Returns @racket[#t] for @racket[drracket:module-language-tools:done]
-            and @racket[#f] otherwise.})
- 
- (thing-doc
-  drracket:module-language-tools:done
-  drracket:module-language-tools:done?
-  @{Used to inform a monitor-based handler that the online expansion has finished.})
-  
- 
- (proc-doc/names
-  drracket:module-language:add-module-language
-  (-> any)
-  ()
-  @{Adds the module language to DrRacket. This is called during DrRacket's startup.})
- 
- (proc-doc/names
-  drracket:module-language:module-language-put-file-mixin
-  (-> (implementation?/c text:basic<%>) (implementation?/c text:basic<%>))
-  (super%)
-  @{Extends @racket[super%] by overriding the @method[editor<%> put-file] method
-    to use a default name from the buffer, if the buffer contains something like
-    @tt{(module name ...)}.})
-  
-  
- 
- ;                           
- ;                           
- ;                           
- ;                        ;  
- ;                        ;  
- ;                        ;  
- ;    ;;;  ;     ; ;;;    ;  
- ;   ;   ;  ;   ; ;   ;   ;  
- ;  ;    ;  ;   ;     ;   ;  
- ;  ;;;;;;   ; ;   ;;;;   ;  
- ;  ;        ; ;  ;   ;   ;  
- ;   ;        ;   ;   ;   ;  
- ;    ;;;;    ;    ;;;;;  ;  
- ;                           
- ;                           
- ;                           
- 
- 
- (proc-doc/names
-  drracket:eval:set-basic-parameters
-  (->* ((listof (is-a?/c snip-class%)))
-       (#:gui-modules? boolean?)
-       void?)
-  ((snipclasses)
-   ((gui-modules #t)))
-  @{Sets the parameters that are shared between the repl's
-    initialization and @racket[drracket:eval:build-user-eventspace/custodian].
-    
-    Specifically, it sets these parameters:
-    @itemize[
-             @item{@racket[current-namespace] has been set to a newly
-                    created empty namespace. This namespace has the following modules 
-                    shared (with @racket[namespace-attach-module])
-                    from DrRacket's original namespace:
-                    @itemize[@item{@racketmodname[racket/base]} 
-                              @item{@racketmodname['#%foreign]}
-                              @item{@racketmodname[mzlib/pconvert-prop]}
-                              @item{@racketmodname[planet/terse-info]}]
-                    If the @racket[gui-modules?] parameter is a true value, then
-                    these modules are also shared:
-                    @itemize[@item{@racketmodname[mred/mred]} 
-                              @item{@racketmodname[mrlib/cache-image-snip]}
-                              @item{@racketmodname[mrlib/image-core]}
-                              @item{@racketmodname[mrlib/matrix-snip]}]
-                    }
-              @item{@racket[read-curly-brace-as-paren]
-                     is @racket[#t]; }
-              @item{@racket[read-square-bracket-as-paren]
-                     is @racket[#t];}
-              @item{@racket[error-print-width] is set to 250;}
-              @item{@racket[current-ps-setup]
-                     is set to a newly created
-                     @racket[ps-setup%]
-                     object;}
-              @item{the @racket[exit-handler] is set to
-                        a parameter that kills the user's custodian; and}
-              @item{the snip-class-list, returned by
-                    @racket[get-the-snip-class-list]
-                    is initialized with all of the snipclasses in DrRacket's eventspace's 
-                    snip-class-list.}]})
- 
- (proc-doc/names
-  drracket:eval:get-snip-classes
-  (-> (listof (is-a?/c snip-class%)))
-  ()
-  @{Returns a list of all of the snipclasses in the current eventspace.})
- 
- (proc-doc/names
-  drracket:eval:expand-program
-  (->* ((or/c input-port? drracket:language:text/pos?)
-        drracket:language-configuration:language-settings?
-        boolean?
-        (-> void?)
-        (-> void?)
-        (-> (or/c eof-object? syntax? (cons/c string? any/c))
-            (-> any)
-            any))
-       (#:gui-modules? boolean?)
-       void?)
-  ((input language-settings eval-compile-time-part? init kill-termination iter)
-   ((gui-modules? #t)))
-  
-  @{Use this function to expand the contents of the definitions
-    window for use with external program processing tools.
-    
-    This function uses
-    @racket[drracket:eval:build-user-eventspace/custodian]
-    to build the user's environment.
-    The arguments @racket[language-settings], @racket[init], 
-    @racket[kill-termination], and @racket[gui-modules?] are passed to
-    @racket[drracket:eval:build-user-eventspace/custodian].
-    
-    The @racket[input] argument specifies the source of the program.
-    
-    The @racket[eval-compile-time-part?] argument indicates if
-    @racket[expand]
-    is called or if
-    @racket[expand-top-level-with-compile-time-evals]
-    is called when the program is expanded.
-    Roughly speaking, if your tool will evaluate each expression
-    itself by calling
-    @racket[eval]
-    then pass @racket[#f]. Otherwise, if your tool
-    just processes the expanded program, be sure to pass
-    @racket[#t].
-    
-    This function calls
-    @method[drracket:language:language<%> front-end/complete-program]
-    to expand the program. Unlike when the @onscreen{Run} is clicked,
-    however, it does not call 
-    @method[drracket:language:language<%> front-end/finished-complete-program].
-    
-    
-    The first argument to @racket[iter] is the expanded program
-    (represented as syntax) or eof.
-    The @racket[iter] argument is called for each expression in the
-    expanded program and once more with eof, unless an error is
-    raised during expansion.
-    It is called from the user's thread.
-    If an exception is raised during expansion of the
-    user's program, @racket[iter] is not called.
-    Consider setting the exception-handler during @racket[init] to
-    handle this situation.
-    
-    The second argument to @racket[iter] is a thunk that
-    continues expanding the rest of the contents of the
-    definitions window. If the first argument to @racket[iter] was
-    eof, this argument is just the primitive
-    @racket[void].
-    
-    See also
-    @racket[drracket:eval:expand-program/multiple].})
- 
- (proc-doc/names
-  drracket:eval:traverse-program/multiple
-  (->* (drracket:language-configuration:language-settings?
-        (-> void?)
-        (-> void?))
-       (#:gui-modules? boolean?)
-       (-> (or/c input-port? drracket:language:text/pos?)
-           (-> (or/c eof-object? syntax? (cons/c string? any/c))
-               (-> any)
-               any)
-           boolean?
-           void?))
-  ((language-settings init kill-termination)
-   ((gui-modules #t)))
-  
-  @{This function is similar to
-    @racket[drracket:eval:expand-program/multiple]
-    The only difference is that it does not
-    expand the program in the editor; instead
-    the processing function can decide how to
-    expand the program.})
- 
- (proc-doc/names
-  drracket:eval:expand-program/multiple
-  (->* (drracket:language-configuration:language-settings?
-        boolean?
-        (-> void?)
-        (-> void?))
-       (#:gui-modules? boolean?)
-       (-> (or/c input-port? drracket:language:text/pos?)
-           (-> (or/c eof-object? syntax? (cons/c string? any/c))
-               (-> any)
-               any)
-           boolean?
-           void?))
-  ((language-settings eval-compile-time-part? init kill-termination)
-   ((gui-modules? #t)))
-  
-  @{This function is just like
-    @racket[drracket:eval:expand-program]
-    except that it is curried and the second application
-    can be used multiple times.
-    Use this function if you want to initialize the user's
-    thread (and namespace, etc) once but have program text
-    that comes from multiple sources.
-    
-    The extra boolean argument to the result function
-    determines if
-    @racket[drracket:language:language front-end/complete-program<%>]
-    or
-    @racket[drracket:language:language front-end/interaction<%>]
-    is called.})
- 
- (proc-doc/names
-  drracket:eval:build-user-eventspace/custodian
-  (->* (drracket:language-configuration:language-settings?
-        (-> void?)
-        (-> void?))
-       (#:gui-modules? boolean?)
-       (values eventspace? custodian?))
-  ((language-settings init kill-termination) 
-   ((gui-modules? #t)))
-  
-  @{This function creates a custodian and an eventspace (on the
-    new custodian) to expand the user's program. It does not
-    kill this custodian, but it can safely be shutdown (with
-    @racket[custodian-shutdown-all]) after the
-    expansion is finished.
-    
-    It initializes the
-    user's eventspace's main thread with several parameters:
-    @itemize[
-             @item{ @racket[current-custodian] is set to a new custodian.
-                    }@item{
-                           In addition, it calls
-                           @racket[drracket:eval:set-basic-parameters],
-                           passing the @racket[#:gui-modules?] parameter along.
-                           }]
-    
-    The @racket[language-settings] argument is the current
-    language and its settings. See
-    @racket[drracket:language-configuration:language-settings]
-    for details on that structure.
-    
-    If the program is associated with a DrRacket
-    frame, get the frame's language settings from the
-    @method[drracket:unit:definitions-text<%> get-next-settings]
-    method of 
-    @racket[drracket:unit:definitions-text<%>].  Also, the most recently chosen language in
-    the language dialog is saved via the framework's
-    preferences. Apply
-    @racket[preferences:get]
-    to
-    @racket[drracket:language-configuration:get-settings-preferences-symbol]
-    for that @racket[language-settings].
-    
-    The @racket[init] argument is called after the user's parameters
-    are all set, but before the program is run. It is called on
-    the user's thread. The
-    @racket[current-directory] and
-    @racket[current-load-relative-directory]
-    parameters are not set, so if there are appropriate directories,
-    the @racket[init] argument is a good place to set them.
-    
-    The @racket[kill-termination] argument is called when the main thread of
-    the eventspace terminates, no matter if the custodian was
-    shutdown, or the thread was killed. This procedure is also
-    called when the thread terminates normally. This procedure is
-    called from a new, dedicated thread (@italic{i. e.}, not the thread
-    created to do the expansion, nor the thread that
-    @racket[drracket:eval:build-user-eventspace/custodian] was called from.)})
- 
- 
- 
- ;                                         
- ;                                         
- ;                                         
- ;       ;          ;                      
- ;       ;          ;                      
- ;       ;          ;                      
- ;    ;; ;    ;;;   ; ;;    ;   ;    ;; ;  
- ;   ;  ;;   ;   ;  ;;  ;   ;   ;   ;  ;;  
- ;  ;    ;  ;    ;  ;    ;  ;   ;  ;    ;  
- ;  ;    ;  ;;;;;;  ;    ;  ;   ;  ;    ;  
- ;  ;    ;  ;       ;    ;  ;   ;  ;    ;  
- ;   ;  ;;   ;      ;;  ;   ;  ;;   ;  ;;  
- ;    ;; ;    ;;;;  ; ;;     ;; ;    ;; ;  
- ;                                      ;  
- ;                                 ;    ;  
- ;                                  ;;;;   
- 
- (proc-doc/names
-  drracket:debug:error-display-handler/stacktrace
-  (->* (string? any/c)
-       ((or/c false/c (listof srcloc?))
-        #:definitions-text (or/c #f (is-a?/c drracket:unit:definitions-text<%>))
-        #:interactions-text (or/c #f (is-a?/c drracket:rep:text<%>))
-        )
-       any/c)
-  ((msg exn) ((stack #f)
-              (defs #f)
-              (ints #f)))
-  @{Displays the error message represented by the string, adding
-    embellishments like those that appears in the DrRacket REPL,
-    specifically a clickable icon for the stack trace (if the srcloc location is not empty),
-    and a clickable icon for the source of the error (read & syntax errors show their source
-    locations and otherwise the first place in the stack trace is shown).
-    
-    If @racket[stack] is false, then the stack traces embedded in the @racket[exn] argument (if any)
-    are used. Specifically, this function looks for a stacktrace via
-    @racket[errortrace-key] in the continuation marks of @racket[exn] and
-    @racket[continuation-mark-set->context].
-    
-    If @racket[stack] is not false, that stack is added to the stacks already in the exception.
-    
-    This should be called in the same eventspace and on the same thread as the error.})
- 
- (proc-doc/names
-  drracket:debug:make-debug-error-display-handler
-  (-> (-> string? (or/c any/c exn?) any)
-      (-> string? (or/c any/c exn?) any))
-  
-  (oedh)
-  
-  @{This function implements an error-display-handler in terms
-    of another error-display-handler.
-    
-    See also Racket's
-    @racket[error-display-handler]
-    parameter.
-    
-    If the current-error-port is the definitions window in
-    DrRacket, this error handler inserts some debugging
-    annotations, calls @racket[oedh], and then highlights the
-    source location of the runtime error.
-    
-    It looks for both stack trace information in the continuation
-    marks both via the
-    @racketmodname[errortrace/errortrace-key] 
-    module and via 
-    @racket[continuation-mark-set->context].
-    
-    })
- 
- (proc-doc/names
-  drracket:debug:hide-backtrace-window
-  (-> void?)
-  ()
-  @{Hides the backtrace window.})
- 
- (proc-doc/names
-  drracket:debug:add-prefs-panel
-  (-> void?)
-  ()
-  @{Adds the profiling preferences panel.})
- 
- (proc-doc/names
-  drracket:debug:make-debug-eval-handler
-  (-> (-> any/c any) (-> any/c any))
-  (oe)
-  @{Returns a function suitable for use with 
-    @racket[current-eval].
-                                             
-    The result function first adds debugging information to
-    its argument and then passes it to @racket[oe].})
- 
- (parameter-doc
-  drracket:debug:test-coverage-enabled
-  (parameter/c boolean?)
-  enabled?
-  @{Determines if the test-coverage annotation is added
-    by the result of @racket[drracket:debug:make-debug-eval-handler].})
- 
- (thing-doc
-  drracket:debug:test-coverage-on-style-name
-  string?
-  @{The name of the 
-    @racket[style%] object (in @racket[editor:get-standard-style-name])
-    used to indicate a covered region of code.})
- 
- (thing-doc
-  drracket:debug:test-coverage-off-style-name
-  string?
-  @{The name of the 
-    @racket[style%] object (in @racket[editor:get-standard-style-name])
-    used to indicate a region of code that tests (or any code, really)
-    didn't cover.})
- 
- (parameter-doc
-  drracket:debug:profiling-enabled
-  (parameter/c boolean?)
-  enabled?
-  @{Determines if the profiling annotation is added
-    by the result of @racket[drracket:debug:make-debug-eval-handler].})
- 
- (proc-doc/names
-  drracket:debug:bug-info->ticket-url
-  (-> (listof (cons/c symbol? (or/c #f string?)))
-      url?)
-  (query)
-  @{Builds a url that goes to the trac report system. 
-    The @racket[query] argument is used as the 
-    url's query field.})
- 
- (thing-doc
-  drracket:debug:small-planet-bitmap
-  (is-a?/c bitmap%)
-  @{The icon used in the DrRacket REPL when an exception is 
-    raised that includes blame information blaming a PLaneT
-    package. (Clicking the icon connects to the PLaneT bug
-    report form.)})
- 
- (proc-doc/names
-  drracket:debug:open-and-highlight-in-file
-  (->* ((or/c srcloc? (listof srcloc?)))
-       ((or/c #f (cons/c (λ (x) (and (weak-box? x)
-                                     (let ([v (weak-box-value x)])
-                                       (or (not v)
-                                           (is-a?/c v editor<%>)))))
-                         number?)))
-       void?)
-  ((debug-info)
-   ((edition-pair #f)))
-  @{This function opens a DrRacket to display
-    @racket[debug-info]. Only the src the position
-    and the span fields of the srcloc are considered.
-    
-    The @racket[edition-pair] is used to determine if a
-    warning message is shown when before opening the file.
-    If the @racket[edition-pair] is not @racket[#f], it is compared
-    with the result of @method[text:basic<%> get-edition-number]
-    of the editor that is loaded to determine if the file has been
-    edited since the source location was recorded. If so, it 
-    puts up a warning dialog message to that effect.})
- 
- (proc-doc/names
-  drracket:debug:show-backtrace-window/edition-pairs
-  (-> string?
-      (listof srcloc?)
-      (listof 
-       (or/c 
-        #f
-        (cons/c (λ (x) 
-                  (and (weak-box? x)
-                       (let ([v (weak-box-value x)])
-                         (or (not v)
-                             (is-a?/c v editor<%>)))))
-                number?)))
-      (or/c #f (is-a?/c drracket:unit:definitions-text<%>))
-      (or/c #f (is-a?/c drracket:rep:text<%>))
-      void?)
-  (error-message dis editions-pairs defs ints)
-  @{Same as @racket[drracket:debug:show-backtrace-window/edition-pairs/two],
-            where the @racket[_dis2] and @racket[_editions-pairs2] arguments
-            are both @racket['()]})
- 
- (proc-doc/names
-  drracket:debug:show-backtrace-window/edition-pairs/two
-  (-> string?
-      (listof srcloc?)
-      (listof 
-       (or/c 
-        #f
-        (cons/c (λ (x) 
-                  (and (weak-box? x)
-                       (let ([v (weak-box-value x)])
-                         (or (not v)
-                             (is-a?/c v editor<%>)))))
-                number?)))
-      (listof srcloc?)
-      (listof 
-       (or/c 
-        #f
-        (cons/c (λ (x) 
-                  (and (weak-box? x)
-                       (let ([v (weak-box-value x)])
-                         (or (not v)
-                             (is-a?/c v editor<%>)))))
-                number?)))
-      (or/c #f (is-a?/c drracket:unit:definitions-text<%>))
-      (or/c #f (is-a?/c drracket:rep:text<%>))
-      void?)
-  (error-message dis1 editions-pairs1 dis2 editions-pairs2 defs ints)
-  @{Shows the backtrace window you get when clicking on the bug in
-    DrRacket's REPL.
-    
-    The @racket[error-message] argument is the text of the error,
-    @racket[dis1] and @racket[dis2] are the stacktrace information, 
-    extracted from the
-    continuation mark in the exception record, using
-    @racket[errortrace-key] and using
-    @racket[continuation-mark-set->context].
-    
-    The @racket[editions1] and @racket[editions2] arguments indicate
-    the editions of any editors
-    that are open editing the files corresponding to the source locations.
-    The lists must have the same length as @racket[dis1] and @racket[dis2].
-    
-    The @racket[defs] argument should be non-@racket[#f] if there are 
-    possibly stacktrace frames that contain unsaved versions of the 
-    definitions window from DrRacket. Similarly, the @racket[ints] argument
-    should be non-@racket[#f] if there are possibly stacktrace frames that contain
-    unsaved versions of the interactions window.
-    
-    Use
-    @racket[drracket:rep:current-rep] to get the rep during evaluation of a program.
-    
-    })
- 
- (proc-doc
-  drracket:debug:get-error-color
-  (-> (is-a?/c color%))
-  @{Returns the background color used to highlight errors in the definitions window
-    (and other places, possibly).
-    
-    The result depends on the @racket['framework:white-on-black?] preference
-    setting.})
- 
- (proc-doc/names
-  drracket:debug:show-backtrace-window
-  (->* (string?
-        (or/c exn? 
-              (listof srcloc?)
-              (non-empty-listof (cons/c string? (listof srcloc?)))))
-       ((or/c #f (is-a?/c drracket:rep:text<%>))
-        (or/c #f (is-a?/c drracket:unit:definitions-text<%>)))
-       void?)
-  ((error-message dis)
-   ((rep #f)
-    (defs #f)))
-  @{Shows the backtrace window you get when clicking on the bug in
-    DrRacket's REPL.
-    
-    This function simply calls @racket[drracket:debug:show-backtrace-window/edition-pairs],
-    using @racket[drracket:debug:srcloc->edition/pair].
-    })
- 
- (proc-doc/names
-  drracket:debug:srcloc->edition/pair
-  (->* (srcloc?
-        (or/c #f (is-a?/c drracket:rep:text<%>))
-        (or/c #f (is-a?/c drracket:unit:definitions-text<%>)))
-       ((or/c #f (and/c hash? hash-equal?)))
-       (or/c #f (cons/c (let ([weak-box-containing-an-editor?
-                               (λ (x) (and (weak-box? x)
-                                           (let ([v (weak-box-value x)])
-                                             (or (not v)
-                                                 (is-a?/c v editor<%>)))))])
-                          weak-box-containing-an-editor?)
-                        number?)))
-  ((srcloc ints defs)
-   ((cache #f)))
-  @{Constructs a edition pair from a source location,
-    returning the current edition of the editor editing
-    the source location (if any).
-    
-    The @racket[ints] and @racket[defs] arguments are used to map source locations, 
-    in the case that the source location corresponds to the definitions
-    window (when it has not been saved) or the interactions window. This calls
-    @racket[normalize-path], so to avoid the severe performance penalty that can
-    incur on some filesystems, the @racket[cache] argument is consulted and updated, 
-    when it is provided. Use this argument if you're calling 
-    @racket[drracket:debug:srcloc->edition/pair] a number of times in a loop, when you
-    do not expect the filesystem to change across iterations of the loop. The initial
-    argument should be an empty equal hash (e.g., @racket[(make-hash)]).
-    })
- 
- 
- 
- ;                                                              
- ;                                                              
- ;                                                              
- ;   ;;             ;;                  ;;;               ;;    
- ;   ;;             ;;                   ;;               ;;    
- ;   ;;             ;;                   ;;               ;;    
- ;   ;;;;;;  ;;;;   ;;  ;;;;;         ;;;;;  ;;;;    ;;;; ;;  ;;
- ;   ;;  ;; ;;; ;;  ;;  ;;  ;;       ;; ;;; ;;; ;;  ;;  ; ;; ;  
- ;   ;;  ;; ;;;;;;  ;;  ;;  ;;  ;;;;;;;  ;; ;;;;;;  ;;;;  ;;;;  
- ;   ;;  ;; ;;      ;;  ;;  ;;  ;;;;;;;  ;; ;;      ;;;;  ;;;;; 
- ;   ;;  ;; ;;;  ;  ;;  ;;  ;;       ;;  ;; ;;;  ; ;  ;;  ;; ;; 
- ;   ;; ;;;  ;;;;   ;;  ;;;;;        ;;;;;;  ;;;;  ;;;;   ;; ;;;
- ;                      ;;                                      
- ;                      ;;                                      
- ;                      ;;                                      
- 
- (proc-doc/names
-  drracket:help-desk:help-desk
-  (->* ()
-       ((or/c #f string?)
-        (or/c #f string? (list/c string? string?)))
-       any)
-  (()
-   ((search-key #f)
-    (search-context #f)))
-  @{if @racket[search-key] is a string, calls @racket[perform-search] with
-       @racket[search-key] and @racket[search-context].
-       
-       Otherwise, calls @racket[send-main-page] with no arguments.})
- 
- (proc-doc
-  drracket:help-desk:goto-plt-license
-  (-> void?)
-  @{Opens the user's web browser and points it at the license for PLT software.})
- 
- 
- ;                           
- ;                           
- ;                           
- ;                   ;       
- ;                           
- ;                       ;   
- ;   ;   ;   ; ;;    ;  ;;;; 
- ;   ;   ;   ;;  ;   ;   ;   
- ;   ;   ;   ;   ;   ;   ;   
- ;   ;   ;   ;   ;   ;   ;   
- ;   ;   ;   ;   ;   ;   ;   
- ;   ;  ;;   ;   ;   ;   ;   
- ;    ;; ;   ;   ;   ;    ;; 
- ;                           
- ;                           
- ;                           
- 
- 
- (proc-doc/names
-  drracket:unit:get-program-editor-mixin
-  (-> ((subclass?/c text%) . -> . (subclass?/c text%)))
-  ()
-  @{Returns a mixin that must be mixed in to any
-    @racket[text%] object that might contain
-    program text (and thus can be in the source
-    field of some syntax object).
-    
-    See also
-    @racket[drracket:unit:add-to-program-editor-mixin].})
- 
- (proc-doc/names
-  drracket:unit:add-to-program-editor-mixin
-  (((subclass?/c text%) . -> . (subclass?/c text%)) . -> . void?)
-  (mixin)
-  @{@phase[1]
-     
-     Adds @racket[mixin] to the result of
-     @racket[drracket:unit:get-program-editor-mixin].})
- 
- (proc-doc/names
-  drracket:unit:open-drscheme-window
-  (case->
-   (-> (is-a?/c drracket:unit:frame%))
-   ((or/c string? false/c) . -> . (is-a?/c drracket:unit:frame%)))
-  (() (filename))
-  
-  @{Opens a DrRacket frame that displays 
-    @racket[filename],
-    or nothing if @racket[filename] is @racket[#f] or not supplied.})
- 
- (proc-doc/names
-  drracket:unit:add-search-help-desk-menu-item
-  (->* ((is-a?/c text%) (is-a?/c menu-item-container<%>) exact-nonnegative-integer?) ((-> any)) void?)
-  ((text menu position)
-   ((add-sep void)))
-  @{Adds a menu item to @racket[menu] that searches in Help Desk
-  for the word around @racket[position] in @racket[text].
-  
-  If there is only whitespace around @racket[position],
-  then no @racket[menu-item%]s are added, and
-  @racket[add-sep] is not called. If there is something to be
-  added, then @racket[add-sep] is called before the menu item is
-  created.
-  })
- 
- (struct-doc 
-  drracket:unit:teachpack-callbacks
-  ([get-names (-> any/c (listof string?))]
-   [add (-> any/c path-string? any/c)]
-   [remove (-> path-string? any/c any/c)]
-   [remove-all (-> any/c any/c)])
-  @{Holds callbacks for teachpack operations. DrRacket invokes
-    these functions in response to GUI operations being triggered.
-    
-    Each of the @racket[any/c]s that appear in the field
-    contracts are actually the settings of a language.
-    
-    The @racket[get-names] field returns the names
-    of the teachpacks in the given settings; @racket[add]
-    returns a new settings that includes the @racket[path-string?]
-    argument as a new teachpack; @racket[remove] removes the
-    given teachpack and @racket[remove-all] removes them all.})
- 
- (thing-doc
-  drracket:unit:struct:teachpack-callbacks
-  struct-type?
-  @{This is an alias for @racket[struct:drracket:unit:teachpack-callbacks].})
- 
- (thing-doc
-  drracket:unit:make-teachpack-callbacks
-  procedure?
-  @{This is an alias for @racket[make-drracket:unit:teachpack-callbacks].})
- 
- 
- (proc-doc/names
-  drracket:unit:find-symbol
-  (-> (is-a?/c text%) exact-nonnegative-integer? string?)
-  (text pos)
-  @{returns a string that corresponds to the a
-    symbol surrounding @racket[pos] (in @racket[text]).
-    
-    This is intended to be used with the ``f1'' keybinding
-    for searching in the documentation, so the result is
-    not always a symbol, but instead a best effort to find 
-    something that is likely to be useful to search for around
-    a point in the @racket[text].})
-  
-
-  
- 
- ;                                            
- ;                                            
- ;                                            
- ;                           ;                
- ;                           ;                
- ;                           ;                
- ;   ; ;;  ;;     ;;;     ;; ;    ;;;    ;;;  
- ;   ;;  ;;  ;   ;   ;   ;  ;;   ;   ;  ;     
- ;   ;   ;   ;  ;     ; ;    ;  ;    ;  ;;    
- ;   ;   ;   ;  ;     ; ;    ;  ;;;;;;   ;;   
- ;   ;   ;   ;  ;     ; ;    ;  ;          ;  
- ;   ;   ;   ;   ;   ;   ;  ;;   ;         ;  
- ;   ;   ;   ;    ;;;     ;; ;    ;;;;  ;;;   
- ;                                            
- ;                                            
- ;                                            
- 
- 
- (proc-doc/names
-  drracket:modes:add-mode
-  (->* (string?
-        (or/c #f (is-a?/c mode:surrogate-text<%>))
-        (-> (is-a?/c drracket:rep:text%) number? boolean?)
-        (-> (or/c #f (listof string?)) boolean?))
-       (#:intended-to-edit-programs? boolean?)
-       drracket:modes:mode?)
-  ((name surrogate repl-submit matches-language)
-   ([intended-to-edit-programs? #t]))
-  @{Adds a mode to DrRacket. Returns a mode value
-    that identifies the mode.
-    
-    The first argument, @racket[name], is the name
-    of the mode, used in DrRacket's GUI to allow
-    the user to select this mode.
-    
-    The @racket[surrogate] argument is set to the
-    definitions text and the interactions text
-    (via the
-    @racket[mode:host-text set-surrogate<%>]
-    method) whenever this mode is enabled.
-    
-    The @racket[repl-submit] procedure is called
-    whenever the user types a return in the interactions
-    window. It is passed the interactions editor
-    and the position where the last prompt occurs.
-    If it 
-    returns @racket[#t], the text after the last
-    prompt is treated as a program fragment and
-    evaluated, according to the language settings.
-    If it returns @racket[#f], the text is
-    assumed to be an incomplete program fragment, and
-    the keystroke is not treated specially.
-    
-    The @racket[matches-language] predicate is called whenever
-    the language changes. If it returns @racket[#t]
-    this mode is installed. It is passed the list of strings
-    that correspond to the names of the language in the
-    language dialog.
-    
-    The @racket[intended-to-edit-programs?] boolean indicates
-    if this mode is intended to be for editing programs 
-    (as opposed to some other kind of file content). If it is
-    @racket[#f], online expansion is disabled and DrRacket
-    won't look for @tt{(module} at the front of the buffer
-    to try to guess the intended filename.
-    
-    Modes are tested in the opposite order that they are
-    added. That is, the last mode to be added gets tested
-    first when the filename changes or when the language
-    changes.
-    
-    See also
-    @racket[drracket:modes:get-modes].
-    
-    @history[#:changed "1.1" @list{Added the @racket[intended-to-edit-programs?] argument.}]
-    })
- 
- (struct-doc 
-  drracket:modes:mode
-  ([name string?]
-   [surrogate (or/c #f (is-a?/c mode:surrogate-text<%>))]
-   [repl-submit (-> (is-a?/c drracket:rep:text%) number? boolean?)]
-   [matches-language (-> (or/c #f (listof string?)) boolean?)]
-   [intended-to-edit-programs? boolean?])
-  #:omit-constructor
-  @{See @racket[drracket:modes:add-mode] for details on modes.
-        
-    @history[#:changed "1.1" @list{Added the @racket[intended-to-edit-programs?] field.}]})
- 
- (thing-doc
-  drracket:modes:struct:mode
-  struct-type?
-  @{An alias for @racket[struct:drracket:modes:mode].})
-
- (proc-doc/names
-  drracket:modes:get-modes
-  (-> (listof drracket:modes:mode?))
-  ()
-  @{Returns all of the modes currently added to DrRacket.
-    
-    Note that the @racket[_surrogate] field of the
-    mode corresponding to the module language does not
-    take into account the 
-    @language-info-ref[definitions-text-surrogate], so it
-    may not be the actual class used directly in DrRacket,
-    even when the mode is active.
-    
-    See also
-    @racket[drracket:modes:add-mode].})
- 
- 
- ;                      
- ;                      
- ;                      
- ;                      
- ;                      
- ;                      
- ;   ; ;   ;;;   ; ;;   
- ;   ;;   ;   ;  ;;  ;  
- ;   ;   ;    ;  ;    ; 
- ;   ;   ;;;;;;  ;    ; 
- ;   ;   ;       ;    ; 
- ;   ;    ;      ;;  ;  
- ;   ;     ;;;;  ; ;;   
- ;               ;      
- ;               ;      
- ;               ;      
- 
- 
- (proc-doc/names
-  drracket:rep:get-welcome-delta 
-  (-> (is-a?/c style-delta%))
-  ()
-  @{Returns a style delta that matches the style and color of the 
-    phrase ``Welcome to'' in the beginning of the interactions window.})
-    
- 
- (proc-doc/names
-  drracket:rep:get-dark-green-delta
-  (-> (is-a?/c style-delta%))
-  ()
-  @{Returns a style delta that matches the style and color of the 
-    name of a language in the interactions window.})
- 
- (proc-doc
-  drracket:rep:get-error-delta 
-  (-> (is-a?/c style-delta%))
-  @{Returns a style delta that matches the style and color of 
-    errors that get shown in the interactions window.})
- 
- (proc-doc/names
-  drracket:rep:get-drs-bindings-keymap
-  (-> (is-a?/c keymap%))
-  ()
-  @{Returns a keymap that binds various DrRacket-specific
-    keybindings. This keymap is used in the definitions
-    and interactions window.
-
-    By default, binds C-x;o to a function that switches
-    the focus between the definitions and interactions
-    windows. Also binds f5 to Execute and f1 to Help Desk.})
- 
- (proc-doc/names
-  drracket:rep:current-rep
-  (-> (or/c false/c (is-a?/c drracket:rep:text%)))
-  ()
-  
-  @{This is a parameter whose value should not be set by tools.
-    It is initialized to the repl that controls this evaluation
-    in the user's thread.
-    
-    It only returns @racket[#f] if the program not running
-    in the context of a repl (eg, the test suite window).})
- 
- (proc-doc/names
-  drracket:rep:current-value-port
-  (-> (or/c false/c port?))
-  ()
-  @{This is a parameter whose value is a port that
-    prints in the REPL in blue. It is used to print
-    the values of toplevel expressions in the REPL.
-    
-    It is only initialized on the user's thread.})
- 
- (parameter-doc
-  drracket:rep:after-expression
-  (parameter/c (or/c #f (-> any)))
-  top-level-expression
-  @{This parameter is used by @method[drracket:rep:text% evaluate-from-port].
-    When it is a thunk, then DrRacket invokes the thunk on the user's thread
-    as the last thing it does (before cleaning up).})
- 
- (parameter-doc
-  drracket:rep:current-language-settings
-  (parameter/c drracket:language-configuration:language-settings?)
-  language-settings
-  @{This parameter is set (on the user's thread) to the 
-    @racket[drracket:language-configuration:language-settings]
-    for the currently running language.})
-  
- 
- 
- ;                                                                        
- ;                                                                        
- ;                                                                        
- ;                          ;                                          ;  
- ;                          ;                                          ;  
- ;                  ;      ;                   ;                       ;  
- ;    ;; ;    ;;;  ;;;;    ;     ;;;  ;     ; ;;;;   ;;;   ; ;;     ;; ;  
- ;   ;  ;;   ;   ;  ;      ;    ;   ;  ;   ;   ;    ;   ;  ;;  ;   ;  ;;  
- ;  ;    ;  ;    ;  ;      ;   ;    ;   ; ;    ;   ;    ;  ;   ;  ;    ;  
- ;  ;    ;  ;;;;;;  ;     ;    ;;;;;;    ;     ;   ;;;;;;  ;   ;  ;    ;  
- ;  ;    ;  ;       ;     ;    ;        ; ;    ;   ;       ;   ;  ;    ;  
- ;   ;  ;;   ;      ;     ;     ;      ;   ;   ;    ;      ;   ;   ;  ;;  
- ;    ;; ;    ;;;;   ;;  ;       ;;;; ;     ;   ;;   ;;;;  ;   ;    ;; ;  
- ;       ;               ;                                                
- ;  ;    ;               ;                                                
- ;   ;;;;                                                                 
- 
- 
- (proc-doc
-  drracket:get/extend:extend-unit-frame
-  (->i ([mixin (make-mixin-contract drracket:unit:frame%)])
-       ([before boolean?]
-        #:name-for-changes [name-for-changes (or/c #f symbol?)])
-       [result void?])
-  (#t #f)
-  
-  @{Extends the class that is used for the frame that implements the main DrRacket window.
-    
-    The @racket[before] argument controls if the mixin is applied before or
-    after already installed mixins.
-    
-    If @racket[name-for-changes] is a symbol and @racket[drracket:get/extend:allow-re-extension!]
-    has been called (without a subsequent call to @racket[drracket:get/extend:disallow-re-extension!])
-    then calling this function replaces any earlier mixins that have been added
-    that have the same name. Otherwise, calling this with the same name
-    twice is an error and calling it once @racket[drracket:get/extend:get-frame] has been
-    called is an error.})
- 
- (proc-doc
-  drracket:get/extend:get-unit-frame
-  (-> (subclass?/c drracket:unit:frame%))
-  
-  @{Returns a class whose objects are used for the DrRacket frames.
-    
-    Once this function is called, 
-    @racket[drracket:get/extend:extend-unit-frame]
-    raises an error, disallowing any more extensions.
-    
-    See also @racket[drracket:get/extend:allow-re-extension!].})
-
- (proc-doc
-  drracket:get/extend:extend-tab
-  (->i ([mixin (make-mixin-contract drracket:unit:tab<%>)])
-       ([before boolean?]
-        #:name-for-changes [name-for-changes (or/c #f symbol?)])
-       [result void?])
-  (#t #f)
-  @{Like @racket[drracket:get/extend:extend-unit-frame], except it extends the class 
-    that implements the tabs in DrRacket. One is created for each tab
-    in a frame (each frame always has at least one tab, even if the tab bar is not shown).})
- 
- (proc-doc
-  drracket:get/extend:get-tab
-  (-> (implementation?/c drracket:unit:tab<%>))
-  
-  @{Like @racket[drracket:get/extend:get-unit-frame], except it
-    returns the class used for tabs.})
- 
- (proc-doc
-  drracket:get/extend:extend-definitions-text
-  (->i ([mixin (make-mixin-contract drracket:unit:definitions-text<%>)])
-       ([before boolean?]
-        #:name-for-changes [name-for-changes (or/c #f symbol?)])
-       [result void?])
-  (#t #f)
-  
-  @{Like @racket[drracket:get/extend:extend-unit-frame], except
-         this text is used in the top window of DrRacket frames.})
- 
- (proc-doc
-  drracket:get/extend:get-definitions-text
-  (-> (implementation?/c drracket:unit:definitions-text<%>))
-  
-  @{Like @racket[drracket:get/extend:get-unit-frame], except
-         for the text that is used in the top window of DrRacket frames.})
-
- 
- (proc-doc
-  drracket:get/extend:extend-interactions-text
-  (->i ([mixin (make-mixin-contract drracket:rep:text<%>)])
-       ([before boolean?]
-        #:name-for-changes [name-for-changes (or/c #f symbol?)])
-       [result void?])
-  (#t #f)
-  @{Like @racket[drracket:get/extend:extend-unit-frame], except it extends the class 
-    that implements the the editor in the interactions window.})
- 
- (proc-doc
-  drracket:get/extend:get-interactions-text
-  (-> (implementation?/c drracket:rep:text<%>))
-  
-  @{Like @racket[drracket:get/extend:get-unit-frame] except it returns
-         the class that implements the editor in the interactions window.})
- 
-  
- (proc-doc
-  drracket:get/extend:extend-definitions-canvas
-  (->i ([mixin (make-mixin-contract drracket:unit:definitions-canvas%)])
-       ([before boolean?]
-        #:name-for-changes [name-for-changes (or/c #f symbol?)])
-       [result void?])
-  (#t #f)
-  
-  @{Like @racket[drracket:get/extend:extend-unit-frame], except it extends the class 
-    that implements the definitions window's @racket[editor-canvas%].})
- 
- (proc-doc
-  drracket:get/extend:get-definitions-canvas
-  (-> (subclass?/c drracket:unit:definitions-canvas%))
-  
-  @{Like @racket[drracket:get/extend:get-unit-frame] except it returns
-         the class that implements the definitions window's @racket[editor-canvas%].})
- 
- (proc-doc
-  drracket:get/extend:extend-interactions-canvas
-  (->i ([mixin (make-mixin-contract drracket:unit:interactions-canvas%)])
-       ([before boolean?]
-        #:name-for-changes [name-for-changes (or/c #f symbol?)])
-       [result void?])
-  (#t #f)
-  
-  @{Like @racket[drracket:get/extend:extend-unit-frame], except it extends the class 
-    that implements the interactions window's @racket[editor-canvas%].})
- 
- (proc-doc
-  drracket:get/extend:get-interactions-canvas
-  (-> (subclass?/c drracket:unit:interactions-canvas%))
-  
-  @{Like @racket[drracket:get/extend:get-unit-frame] except it returns
-         the class that implements the definitions window's @racket[editor-canvas%].})
- 
- 
- (proc-doc
-  drracket:get/extend:disallow-re-extension!
-  (-> void?)
-  @{Once this is called, re-extension of the mixins described in this
-    section is not allowed. This is the default state of mixin extension,
-    but it can be changed by @racket[drracket:get/extend:allow-re-extension!].})
- 
- (proc-doc
-  drracket:get/extend:allow-re-extension!
-  (-> void?)
-  @{Once this is called, re-extension of the mixins described in this
-    section are now allowed (see @racket[drracket:get/extend:extend-unit-frame]
-    for details of how to effect a re-extension).
-    
-    This mode is intended to support a faster development cycle, not for production code.
-    Specifically, the issue is that replacing mixins in this manner does not affect any
-    objects that have already been create and thus 
-    there can, in general, be a mixture of old and new objects in a single DrRacket.
-    If some kind of systematic change to the classes is wanted, consider instead using
-    the @racketmodname[racket/surrogate] library.
-    
-    Once an extension happens, newly created objects will use the new mixins. 
-    Mostly, however, creating a new frame will create a new set of all of the objects
-    that are extended in this section, so that can be used to experiment more quickly
-    with changes.
-    })
- 
- ;                                                
- ;                                                
- ;                                                
- ;                                                
- ;    ;                       ;;;                 
- ;  ;;;                                           
- ;  ;;;; ;;; ;;;;;;;    ;;;   ;;; ;;; ;;   ;; ;;; 
- ;  ;;;; ;;;;;;;;;;;;  ;;;;;  ;;; ;;;;;;; ;;;;;;; 
- ;  ;;;  ;;;  ;;  ;;; ;;;  ;; ;;; ;;; ;;; ;;; ;;; 
- ;  ;;;  ;;;    ;;;;; ;;;     ;;; ;;; ;;; ;;; ;;; 
- ;  ;;;  ;;;  ;;; ;;; ;;;  ;; ;;; ;;; ;;; ;;; ;;; 
- ;  ;;;; ;;;  ;;; ;;;  ;;;;;  ;;; ;;; ;;; ;;;;;;; 
- ;   ;;; ;;;   ;;;;;;   ;;;   ;;; ;;; ;;;  ;; ;;; 
- ;                                            ;;; 
- ;                                        ;;;;;;  
- ;                                                
- ;                                                
- 
- (proc-doc/names
-  drracket:tracing:annotate
-  (-> syntax? syntax?)
-  (stx)
-  @{Call this function to add tracing annotations to the a fully-expanded
-    expression. When the program runs, DrRacket will pop open the tracing
-    window to display the trace.})
- 
- ;                                                           
- ;                                                           
- ;                                                           
- ;   ;                                                       
- ;   ;                                                       
- ;   ;                                                       
- ;   ;   ;;;    ; ;;     ;; ;   ;   ;   ;;;     ;; ;    ;;;  
- ;   ;  ;   ;   ;;  ;   ;  ;;   ;   ;  ;   ;   ;  ;;   ;   ; 
- ;   ;      ;   ;   ;  ;    ;   ;   ;      ;  ;    ;  ;    ; 
- ;   ;   ;;;;   ;   ;  ;    ;   ;   ;   ;;;;  ;    ;  ;;;;;; 
- ;   ;  ;   ;   ;   ;  ;    ;   ;   ;  ;   ;  ;    ;  ;      
- ;   ;  ;   ;   ;   ;   ;  ;;   ;  ;;  ;   ;   ;  ;;   ;     
- ;   ;   ;;;;;  ;   ;    ;; ;    ;; ;   ;;;;;   ;; ;    ;;;; 
- ;                          ;                      ;         
- ;                     ;    ;                 ;    ;         
- ;                      ;;;;                   ;;;;          
- ;                                                                                       
- ;                                                                                       
- ;                                                                                       
- ;                           ;;; ;                                    ;                  
- ;                          ;                                                            
- ;                          ;                                    ;                       
- ;    ;;;    ;;;    ; ;;   ;;;;  ;    ;; ;   ;   ;   ; ;  ;;;   ;;;;  ;    ;;;    ; ;;   
- ;   ;   ;  ;   ;   ;;  ;   ;    ;   ;  ;;   ;   ;   ;;  ;   ;   ;    ;   ;   ;   ;;  ;  
- ;  ;      ;     ;  ;   ;   ;    ;  ;    ;   ;   ;   ;       ;   ;    ;  ;     ;  ;   ;  
- ;  ;      ;     ;  ;   ;   ;    ;  ;    ;   ;   ;   ;    ;;;;   ;    ;  ;     ;  ;   ;  
- ;  ;      ;     ;  ;   ;   ;    ;  ;    ;   ;   ;   ;   ;   ;   ;    ;  ;     ;  ;   ;  
- ;   ;   ;  ;   ;   ;   ;   ;    ;   ;  ;;   ;  ;;   ;   ;   ;   ;    ;   ;   ;   ;   ;  
- ;    ;;;    ;;;    ;   ;   ;    ;    ;; ;    ;; ;   ;    ;;;;;   ;;  ;    ;;;    ;   ;  
- ;                                       ;                                               
- ;                                  ;    ;                                               
- ;                                   ;;;;                                                
- 
- (proc-doc/names
-  drracket:language-configuration:get-languages
-  (-> (listof (is-a?/c drracket:language:language<%>)))
-  ()
-  @{This can only be called after all of the tools initialization phases have completed.
-    
-    Returns the list of all of the languages installed in DrRacket.})
- 
- (proc-doc/names
-  drracket:language-configuration:add-language
-  (->* ((and/c (is-a?/c drracket:language:language<%>)
-               drracket:language:object/c))
-       (#:allow-executable-creation? boolean?)
-       void?)
-  ((language) ((allow-executable-creation? #f)))
-  
-  @{@phase[2]
-     
-     Adds @racket[language] to the languages offered by DrRacket.
-     
-     If @racket[allow-executable-creation?] is @racket[#f], then
-     choosing the @onscreen{Create Executable...} menu item results
-     in a dialog box saying that executable creation is disabled.
-     If it is @racket[#t], then the 
-     @method[drracket:language:language<%> create-executable]
-     is called when that menu item is selected (after checking
-     to make sure the file is saved).})
- 
- (proc-doc/names
-  drracket:language-configuration:get-settings-preferences-symbol
-  (-> symbol?)
-  ()
-  @{Returns the symbol that is used to store the user's language
-    settings. Use as an argument to either
-    @racket[preferences:get]
-    or
-    @racket[preferences:set].})
- 
- (struct-doc
-  drracket:language-configuration:language-settings
-  ([language (or/c (is-a?/c drracket:language:language<%>) 
-                   drracket:language:object/c)]
-   [settings any/c])
-  @{This struct pairs together a language and some specific settings
-    for the language.
-    
-    The settings is a language-specific record that holds a
-    value describing a parameterization of the language.})
- 
- (thing-doc
-  drracket:language-configuration:struct:language-settings
-  struct-type?
-  @{An alias for @racket[struct:drracket:language-configuration:language-settings].})
- 
- (thing-doc
-  drracket:language-configuration:make-language-settings
-  procedure?
-  @{An alias for @racket[make-drracket:language-configuration:language-settings].})
- 
- (proc-doc/names
-  drracket:language-configuration:language-dialog
-  (->* (boolean? drracket:language-configuration:language-settings?)
-       ((or/c false/c (is-a?/c top-level-window<%>)))
-       (or/c false/c drracket:language-configuration:language-settings?))
-  ((show-welcome? language-settings-to-show)
-   ((parent #t)))
-  @{Opens the language configuration dialog.
-    See also
-    @racket[drracket:language-configuration:fill-language-dialog].
-    
-    The @racket[show-welcome?] argument determines if
-    if a ``Welcome to DrRacket'' message and some
-    natural language buttons are shown.
-    
-    The @racket[language-settings-to-show] argument
-    must be some default language settings that the dialog
-    is initialized to.
-    If unsure of a default, the currently set language
-    in the user's preferences can be obtained via:
-    @racketblock[
-      (preferences:get 
-       (drracket:language-configuration:get-settings-preferences-symbol))]
-    
-    The @racket[parent] argument is used as the parent
-    to the dialog.
-    
-    The result if @racket[#f] when the user cancells the dialog, and
-    the selected language if they hit ok.})
- 
- (proc-doc/names
-  drracket:language-configuration:fill-language-dialog
-  (->*
-   ((is-a?/c vertical-panel%)
-    (is-a?/c area-container<%>)
-    drracket:language-configuration:language-settings?)
-   ((or/c false/c (is-a?/c top-level-window<%>))
-    (-> symbol? void?))
-   (values (-> (is-a?/c drracket:language:language<%>))
-           (-> any/c)
-           (-> any/c (is-a?/c mouse-event%) any)))
-  ((panel button-panel language-setting)
-   ((re-center #f)
-    (ok-handler void)))
-  @{This procedure accepts two parent panels and
-    fills them with the contents of the language dialog.
-    It is used to include language configuration controls
-    in some larger context in another dialog.
-    
-    The @racket[panel] argument is the main panel where the
-    language controls will be placed.
-    The function adds buttons to the @racket[button-panel]
-    to revert a language to its default settings and to
-    show the details of a language.
-    
-    The @racket[language-setting] is the default
-    language to show in the dialog.
-    
-    The @racket[re-center] argument is used when the @onscreen{Show Details}
-    button is clicked. If that argument is a @racket[top-level-window<%>],
-    the @onscreen{Show Details} callback will recenter the window each time
-    it is clicked. Otherwise, the argument is not used.
-    
-    @racket[ok-handler] is a function that is in charge of interfacing the OK
-    button. It should accept a symbol message: @racket['enable] and
-    @racket['disable] to toggle the button, and @racket['execute] to run
-    the desired operation. (The language selection dialog also uses an
-    internal @racket['enable-sync] message.)
-    
-    The first two results of the function return a language object
-    and a settings for that language, as chosen by the user using the dialog.
-    The final function should be called when keystrokes are typed in the
-    enclosing frame. It is used to implement the shortcuts that choose the
-    two radio buttons in the language dialog.
-    })
- 
- (proc-doc
-  drracket:language:register-capability
-  (->i ([s symbol?]
-        [the-contract contract?]
-        [default (the-contract) the-contract])
-       ()
-       [res void?])
-  @{Registers a new capability with a default value for each language
-    and a contract on the values the capability might have.
-    
-    By default, these capabilities are registered as DrRacket starts up:
-    @(let-syntax ([cap (syntax-rules ()
-                         [(cap key contract default desc ...)
-                          (item @racket['key : contract = default]
-                                "--- " desc ...)])])
-       (itemize
-        @cap[drracket:check-syntax-button boolean? #t]{controls the visiblity of
-                                                       the check syntax button}
-        @cap[drracket:language-menu-title string?
-             (string-constant scheme-menu-name)]{
-          controls the name of the menu just to the right of the language
-          menu (named ``Racket'' by default)}
-        @cap[drscheme:define-popup
-             (or/c #f
-                   (list/c string? string? string?)
-                   (cons/c string? string?))
-             (list "(define" "(define ...)" "δ")]{
-          specifies the prefix that the define popup should look for and what
-          label it should have, or @racket[#f] if it should not appear at all.
-          
-          If the list of three strings alternative is used, the first string is
-          the prefix that is looked for when finding definitions. The second
-          and third strings are used as the label of the control, in horizontal
-          and vertical mode, respectively.
-          
-          The pair of strings alternative is deprecated. If it is used, 
-          the pair @racket[(cons a-str b-str)] is the same as @racket[(list a-str b-str "δ")].}
-        @cap[drscheme:help-context-term (or/c false/c string?) #f]{
-          specifies a context query for documentation searches that are
-          initiated in this language, can be @racket[#f] (no change to the
-          user's setting) or a string to be used as a context query (note: the
-          context is later maintained as a cookie, @racket[""] is different
-          from @racket[#f] in that it clears the stored context)}
-        @cap[drscheme:special:insert-fraction boolean? #t]{
-          determines if the insert fraction menu item in the special menu is
-          visible}
-        @cap[drscheme:special:insert-lambda boolean? #t]{
-          determines if the insert lambda menu item in the special menu is
-          visible}
-        @cap[drscheme:special:insert-large-letters boolean? #t]{
-          determines if the insert large letters menu item in the special menu
-          is visible}
-        @cap[drscheme:special:insert-image boolean? #t]{
-          determines if the insert image menu item in the special menu is
-          visible}
-        @cap[drscheme:special:insert-comment-box boolean? #t]{
-          determines if the insert comment box menu item in the special menu
-          is visible}
-        @cap[drscheme:special:insert-gui-tool boolean? #t]{
-          determines if the insert gui menu item in the special menu is
-          visible}
-        @cap[drscheme:special:slideshow-menu-item boolean? #t]{
-          determines if the insert pict box menu item in the special menu is
-          visible}
-        @cap[drscheme:special:insert-text-box boolean? #t]{
-          determines if the insert text box menu item in the special menu is
-          visible}
-        @cap[drscheme:special:xml-menus boolean? #t]{
-          determines if the insert scheme box, insert scheme splice box, and
-          the insert xml box menu item in the special menu are visible}
-        @cap[drscheme:autocomplete-words (listof string?) '()]{
-          determines the list of words that are used when completing words in
-          this language}
-        @cap[drscheme:tabify-menu-callback
-             (or/c false/c (-> (is-a?/c text%) number? number? void?))
-             (λ (t a b) (send t tabify-selection a b))]{
-          is used as the callback when the ``Reindent'' or ``Reindent All''
-          menu is selected. The first argument is the editor, and the second
-          and third are a range in the editor.}
-          ))})
- 
- (proc-doc/names
-  drracket:language:capability-registered? 
-  (-> symbol? boolean?)
-  (s)
-  @{Indicates if
-    @racket[drracket:language:register-capability]
-    has been called with @racket[s].})
- (proc-doc
-  drracket:language:get-capability-default
-  (->i ([s (and/c symbol? drracket:language:capability-registered?)])
-       ()
-       [res (s) (drracket:language:get-capability-contract s)])
-  @{Returns the default for a particular capability.})
- (proc-doc/names
-  drracket:language:get-capability-contract
-  (-> (and/c symbol? drracket:language:capability-registered?)
-      contract?)
-  (s)
-  @{Returns the contract for a given capability, which was specified
-    when @racket[drracket:language:register-capability] was called.})
- 
- 
- ;                                                           
- ;                                                           
- ;                                                           
- ;   ;                                                       
- ;   ;                                                       
- ;   ;                                                       
- ;   ;   ;;;    ; ;;     ;; ;   ;   ;   ;;;     ;; ;    ;;;  
- ;   ;  ;   ;   ;;  ;   ;  ;;   ;   ;  ;   ;   ;  ;;   ;   ; 
- ;   ;      ;   ;   ;  ;    ;   ;   ;      ;  ;    ;  ;    ; 
- ;   ;   ;;;;   ;   ;  ;    ;   ;   ;   ;;;;  ;    ;  ;;;;;; 
- ;   ;  ;   ;   ;   ;  ;    ;   ;   ;  ;   ;  ;    ;  ;      
- ;   ;  ;   ;   ;   ;   ;  ;;   ;  ;;  ;   ;   ;  ;;   ;     
- ;   ;   ;;;;;  ;   ;    ;; ;    ;; ;   ;;;;;   ;; ;    ;;;; 
- ;                          ;                      ;         
- ;                     ;    ;                 ;    ;         
- ;                      ;;;;                   ;;;;          
- 
- 
- (proc-doc/names
-  drracket:language:add-snip-value
-  (->* ((-> any/c boolean?)
-        (-> any/c (is-a?/c snip%)))
-       ((-> any/c))
-       void?)
-  ((test-value convert-value)
-   ((setup-thunk void)))
-  @{Registers a handler to convert values into snips as they are printed in the REPL.
-    
-    The @racket[test-snip] argument is called to determine if this handler can convert the value 
-    and the @racket[convert-value] argument is called to build a snip. 
-    The (optional) @racket[setup-thunk] is called just after the user's namespace and other 
-    setings are built, but before any of the user's code is evaluated.
-    
-    All three functions are called on the user's thread and with the user's settings.})
- 
- (proc-doc/names
-  drracket:language:extend-language-interface
-  (-> interface?
-      (make-mixin-contract drracket:language:language<%>)
-      void?)
-  (interface default-implementation)
-  
-  @{@phase[1]
-     
-     Each language added passed to
-     @racket[drracket:language-configuration:add-language]
-     must implement @racket[interface]. 
-     
-     The @racket[default-implementation] is a mixin
-     that provides a default implementation of 
-     @racket[interface]. Languages that are unaware of
-     the specifics of @racket[extension] use
-     @racket[default-implementation] via
-     @racket[drracket:language:get-default-mixin].})
- 
- (proc-doc
-  drracket:language:get-default-mixin
-  (-> (make-mixin-contract drracket:language:language<%>))
-  
-  @{@phase[2]
-     
-     The result of this function is the composite of all of the 
-     @racket[default-implementation] arguments passed
-     to
-     @racket[drracket:language:extend-language-interface].})
- 
- (proc-doc/names
-  drracket:language:get-language-extensions
-  (-> (listof interface?))
-  ()
-  @{@phase[2]
-     
-     Returns a list of the interfaces passed to
-     @racket[drracket:language:extend-language-interface].})
- 
- (proc-doc/names
-  drracket:language:put-executable
-  ((is-a?/c top-level-window<%>) 
-   path? 
-   (or/c boolean? 'launcher 'standalone 'distribution)
-   boolean? 
-   string? 
-   . -> . (or/c false/c path?))
-  (parent program-filename mode mred? title)
-  @{Calls the GRacket primitive
-    @racket[put-file]
-    with arguments appropriate for creating an executable
-    from the file @racket[program-filename]. 
-    
-    The arguments @racket[mred?] and @racket[mode] indicates
-    what type of executable this should be (and the dialog
-    may be slightly different on some platforms, depending
-    on these arguments). For historical reasons, @racket[#f]
-    is allowed for @racket[mode] as an alias for @racket['launcher], and
-    @racket[#t] is allowed for @racket[mode] as an alias for @racket['stand-alone].
-    
-    The @racket[title] argument is used as the title to the primitive
-    @racket[put-file]
-    or
-    @racket[get-directory]
-    primitive.})
- 
- (proc-doc/names
-  drracket:language:create-executable-gui
-  ((or/c false/c (is-a?/c top-level-window<%>))
-   (or/c false/c string?)
-   (or/c #t 'launcher 'standalone 'distribution)
-   (or/c #t 'mzscheme 'mred)
-   . -> .
-   (or/c false/c
-         (list/c (or/c 'no-show 'launcher 'stand-alone 'distribution)
-                 (or/c 'no-show 'mred 'mzscheme)
-                 string?)))
-  (parent program-name show-type show-base)
-  @{Opens a dialog to prompt the user about their choice of executable.
-    If @racket[show-type] is @racket[#t], the user is prompted about
-    a choice of executable: stand-alone,
-    launcher, or distribution; otherwise, the symbol determines the type.
-    If @racket[show-base]
-    is @racket[#t], the user is prompted about a choice of base
-    binary: mzscheme or mred; otherwise the symbol determines the base.
-    
-    The @racket[program-name] argument is used to construct the default
-    executable name in a platform-specific manner.
-    
-    The @racket[parent] argument is used for the parent of the dialog.
-    
-    The result of this function is @racket[#f] if the user cancel's
-    the dialog and a list of three items indicating what options
-    they chose. If either @racket[show-type] or @racket[show-base]
-    was not @racket[#t], the corresponding result will be @racket['no-show],
-    otherwise it will indicate the user's choice.})
- 
- (proc-doc/names
-  drracket:language:create-module-based-stand-alone-executable 
-  ((or/c path? string?)
-   (or/c path? string?) any/c any/c any/c boolean? boolean?
-   . -> .
-   void?)
-  (program-filename
-   executable-filename
-   module-language-spec
-   transformer-module-language-spec
-   init-code
-   gui?
-   use-copy?)
-  
-  @{This procedure creates a stand-alone executable in the file
-    @racket[executable-filename] that runs the program
-    @racket[program-filename]. 
-    
-    The arguments
-    @racket[module-language-spec] and
-    @racket[transformer-module-language-spec] specify the 
-    settings of the initial namespace, both the transformer
-    portion and the regular portion. Both may be @racket[#f]
-    to indicate there are no initial bindings.
-    
-    The @racket[init-code] argument is an s-expression representing
-    the code for a module. This module is expected to provide
-    the identifier @racket[init-code], bound to a procedure of no
-    arguments. That module is required and the @racket[init-code]
-    procedure is executed to initialize language-specific
-    settings before the code in @racket[program-filename] runs.
-    
-    The @racket[gui?] argument indicates if a GRacket or Racket
-    stand-alone executable is created.
-    
-    The @racket[use-copy?] argument indicates if the initial
-    namespace should be populated with
-    @racket[namespace-require/copy] or
-    @racket[namespace-require]. })
- 
- (proc-doc/names
-  drracket:language:create-module-based-distribution
-  ((or/c path? string?)
-   (or/c path? string?) any/c any/c any/c boolean? boolean?
-   . -> .
-   void?)
-  (program-filename
-   distribution-filename
-   module-language-spec
-   transformer-module-language-spec
-   init-code
-   gui?
-   use-copy?)
-  
-  @{Like
-    @racket[drracket:language:create-module-based-stand-alone-executable], 
-    but packages the stand-alone executable into a distribution.})
- 
- (proc-doc/names
-  drracket:language:create-distribution-for-executable
-  ((or/c path? string?) 
-   boolean?
-   (-> path? void?)
-   . -> .
-   void?)
-  (distribution-filename
-   gui?
-   make-executable)
-  
-  @{Creates a distribution where the given
-    @racket[make-executable] procedure
-    creates the stand-alone executable to be distributed. 
-    The @racket[make-executable] procedure is given the name of the 
-    executable to create. The @racket[gui?] argument is needed in case the
-    executable's name (which @racket[drracket:language:create-distribution-for-executable] 
-    must generate) depends on the type of executable. During the distribution-making 
-    process, a progress dialog is shown to the user, and the user can click an 
-    @onscreen{Abort} button that sends a break to the current thread.})
- 
- (proc-doc/names
-  drracket:language:create-module-based-launcher
-  ((or/c path? string?) (or/c path? string?) any/c any/c any/c boolean? boolean?
-                        . -> .
-                        void?)
-  (program-filename
-   executable-filename
-   module-language-spec
-   transformer-module-language-spec
-   init-code
-   gui?
-   use-copy?)
-  
-  @{This procedure is identical to 
-    @racket[drracket:language:create-module-based-stand-alone-executable], 
-    except that it creates a launcher instead of a
-    stand-alone executable.})
- 
- (proc-doc/names
-  drracket:language:simple-module-based-language-convert-value
-  (-> any/c drracket:language:simple-settings? any)
-  (value settings)
-  @{The result can be either one or two values. The first result is
-    the converted value. The second result is @racket[#t] if the converted
-    value should be printed with @racket[write] (or @racket[pretty-write]),
-    @racket[#f] if the converted result should be printed with
-    @racket[print] (or @racket[pretty-print]); the default second
-    result is @racket[#t].
-
-    The result of this function depends on the 
-    @racket[simple-settings-printing-style] field of @racket[settings].
-    If it is @racket['print], the
-    result is @racket[(values value #f)]. If it is @racket['write] or @racket['trad-write],
-    the result is just @racket[value]. Otherwise, the result is produce by 
-    adjusting the @racket[constructor-style-printing] and @racket[show-sharing] 
-    parameters based on @racket[settings], setting @racket[current-print-convert-hook]
-    to ignore snips, and then applying @racket[print-convert] to @racket[value].})
- 
- (proc-doc/names
-  drracket:language:setup-printing-parameters
-  (-> (-> any) drracket:language:simple-settings? (or/c number? 'infinity) any)
-  (thunk settings width)
-  @{Equivalent to @racket[(drracket:language:make-setup-printing-parameters)].})
- 
- (proc-doc/names
-  drracket:language:make-setup-printing-parameters
-  (-> (-> (-> any) drracket:language:simple-settings? (or/c number? 'infinity) any))
-  ()
-  @{Returns a procedure that accepts three arguments: a thunk, settings, and 
-    a pretty-print width. The result procedure, when invoked sets all of the 
-    @racket[pretty-print] and @racket[print-convert] parameters
-    either to the defaults to values based on @racket[settings]
-    and then invokes @racket[thunk], returning what it returns.
-    
-    When @racket[drracket:language:make-setup-printing-parameters] is invoked,
-    it @racket[dynamic-require]s @racketmodname[pict/convert] and
-    closes over the results, using them to convert values when the resulting
-    procedure is invoked.
-    })
- 
- (struct-doc
-  drracket:language:text/pos
-  ([text (is-a?/c text%)]
-   [start exact-nonnegative-integer?]
-   [end exact-nonnegative-integer?])
-  @{A record that tracks a @racket[text%] object and a range inside it.})
- 
- (thing-doc
-  drracket:language:make-text/pos
-  procedure?
-  @{An alias for @racket[make-drracket:language:text/pos].})
- 
- (thing-doc
-  drracket:language:struct:text/pos
-  struct-type?
-  @{An alias for @racket[struct:drracket:language:text/pos].})
- 
- (struct-doc
-  drracket:language:simple-settings
-  ([case-sensitive boolean?]
-   [printing-style (or/c 'constructor
-                         'quasiquote
-                         'write
-                         'trad-write
-                         'print)]
-   [fraction-style (or/c 'mixed-fraction
-                         'mixed-fraction-e
-                         'repeating-decimal
-                         'repeating-decimal-e)]
-   [show-sharing boolean?]
-   [insert-newlines boolean?]
-   [annotations (or/c 'none 'debug 'debug/profile 'test-coverage)])
-  @{A struct that tracks commonly used settings for a language.})
- 
- (thing-doc
-  drracket:language:make-simple-settings
-  procedure?
-  @{An alias for @racket[make-drracket:language:simple-settings].})
- 
- (thing-doc
-  drracket:language:struct:simple-settings
-  struct-type?
-  @{An alias for @racket[struct:drracket:language:simple-settings].})
- 
- (proc-doc/names
-  drracket:language:simple-settings->vector
-  (drracket:language:simple-settings? . -> . vector?)
-  (simple-settings)
-  
-  @{Constructs a vector whose elements are the fields of @racket[simple-settings].}))
diff --git a/pkgs/drracket-pkgs/drracket/drscheme/drscheme.creator b/pkgs/drracket-pkgs/drracket/drscheme/drscheme.creator
deleted file mode 100644
index 8e31ad43ae..0000000000
--- a/pkgs/drracket-pkgs/drracket/drscheme/drscheme.creator
+++ /dev/null
@@ -1,2 +0,0 @@
-DrSc
-(This code is registered with Apple.)
diff --git a/pkgs/drracket-pkgs/drracket/drscheme/drscheme.rkt b/pkgs/drracket-pkgs/drracket/drscheme/drscheme.rkt
deleted file mode 100644
index b5745267ac..0000000000
--- a/pkgs/drracket-pkgs/drracket/drscheme/drscheme.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require drracket/drracket)
-(module test racket/base)
diff --git a/pkgs/drracket-pkgs/drracket/drscheme/main.rkt b/pkgs/drracket-pkgs/drracket/drscheme/main.rkt
deleted file mode 100644
index afa5740b3a..0000000000
--- a/pkgs/drracket-pkgs/drracket/drscheme/main.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "drscheme.rkt")
-(module test racket/base)
diff --git a/pkgs/drracket-pkgs/drracket/drscheme/private/number-snip.rkt b/pkgs/drracket-pkgs/drracket/drscheme/private/number-snip.rkt
deleted file mode 100644
index bb14f3c873..0000000000
--- a/pkgs/drracket-pkgs/drracket/drscheme/private/number-snip.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require framework
-         racket/class
-         racket/snip)
-(define snip-class (send (get-the-snip-class-list) find
-                        (format "~s" `(lib "number-snip.ss" "drscheme" "private"))))
-(provide snip-class)
-;; this is here because there may be old number snips
-;; out there that still point to this file
diff --git a/pkgs/drracket-pkgs/drracket/drscheme/tool-lib.rkt b/pkgs/drracket-pkgs/drracket/drscheme/tool-lib.rkt
deleted file mode 100644
index ff617d01a4..0000000000
--- a/pkgs/drracket-pkgs/drracket/drscheme/tool-lib.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require drracket/tool-lib)
-(provide (all-from-out drracket/tool-lib))
-(module test racket/base)
\ No newline at end of file
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/LICENSE.txt b/pkgs/drracket-pkgs/drracket/gui-debugger/LICENSE.txt
deleted file mode 100644
index 19c8d11be2..0000000000
--- a/pkgs/drracket-pkgs/drracket/gui-debugger/LICENSE.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  Clanbomber icon
-  Everaldo Coelho
-  http://www.everaldo.com/
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/TODO.txt b/pkgs/drracket-pkgs/drracket/gui-debugger/TODO.txt
deleted file mode 100644
index cab4f1f3a7..0000000000
--- a/pkgs/drracket-pkgs/drracket/gui-debugger/TODO.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-- Stack navigation from REPL
-- Automated tests
-- Trace by function name
-
-CHANGES TO MAKE-----------------------------------------------------------------------------
-Ability to add named anchors into code using Special menu in DRS -- use those anchors as tracepoints.
-
-Demo monitoring DrRacket for Robby?
-
-Bind Stop button to kill-all.
-
-On the whole, I like the tool, although it'd be nice to have either
-        (a) an interactive pointy-clicky interface rather than figuring
-                out line/column co-ordinates, or
-
-
-Re-direct, or at least prefix, program output from the client so that it can be distinguished from the script
-
-Paramterize print-struct to #f for printing in the script
-
-ERROR-CHECKING/HANDLING---------------------------------------------------------------------
-
-* Make all exposed cells and evstreams read-only by lifting the identity function on them
-
-* Turn script errors into syntax errors (i.e. what happens when you bind to variables that don't exist)
-    --take the syntax when the binding is made and save it in a hashtable
-
-
-TESTING/CAPABILITIES------------------------------------------------------------------------
-* Does user interaction work?  Can we step through loops one line at a time waiting for input?  GUIs?
-
-* What kind of interface do we want to dig into frames
-
-* What do we do about binding to a variable and following it EVERYWHERE it goes.  Even if it is assigned to something else.
-
-* Implement access to the result of ananonymous expression: here->(add1 2)
-|#
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/annotator.rkt b/pkgs/drracket-pkgs/drracket/gui-debugger/annotator.rkt
deleted file mode 100644
index 3e7d46e98e..0000000000
--- a/pkgs/drracket-pkgs/drracket/gui-debugger/annotator.rkt
+++ /dev/null
@@ -1,410 +0,0 @@
-(module annotator scheme/base
-
-  (require (prefix-in kernel: syntax/kerncase)
-           gui-debugger/marks
-           mzlib/etc
-           (for-syntax scheme/base)
-           (only-in mzscheme [apply plain-apply])
-           )
-  (provide annotate-stx annotate-for-single-stepping)
-
-  (define (arglist-bindings arglist-stx)
-    (syntax-case arglist-stx ()
-      [var
-       (identifier? arglist-stx)
-       (list arglist-stx)]
-      [(var ...)
-       (syntax->list arglist-stx)]
-      [(var . others)
-       (cons #'var (arglist-bindings #'others))]))
-
-  ;; Retreives the binding of a variable from a normal-breakpoint-info.
-  ;; Returns a list of pairs `(,variable-name-stx ,variable-value). Each
-  ;; item in the list is a shadowed instance of a variable with the given
-  ;; name, with the first item being the one in scope.
-  #;
-  (define (bindings top-mark marks sym)
-    (let ([mark-list (cons top-mark (continuation-mark-set->list marks debug-key))])
-      (map (lambda (binding) (list (mark-binding-binding binding)
-                                   (mark-binding-value binding)))
-           (lookup-all-bindings (lambda (id) (eq? (syntax-e id) sym))
-                                mark-list))))
-
-
-  ;; annotate-for-single-stepping uses annotate-stx to create an annotated
-  ;; version of STX that pauses before and after each expression, in the style
-  ;; of a single stepping debugger.  
-  ;; 
-  ;; BREAK?, BREAK-BEFORE, BREAK-AFTER are inserted into the resulting syntax
-  ;; as 3D code.  When the resulting syntax is evaluated, before each
-  ;; expression is evaluated, BREAK? is called with the syntax position of
-  ;; that expression.  If BREAK? returns true, BREAK-BEFORE is called with two
-  ;; arguments: the debug-info structure representing the first stack frame
-  ;; and the current continuation marks representing the other stack frames
-  ;; (use the key DEBUG-KEY).  If BREAK-BEFORE returns some value, the
-  ;; evaluation skips the expression entirely and just returns that value.
-  ;; Otherwise, evaluation proceeds normally.  After the expression is
-  ;; evaluated, BREAK? is called with the position of the end of the expression.
-  ;; If it returns true, BREAK-AFTER is called; otherwise, the expression returns
-  ;; normally.  If BREAK-AFTER returns some value, the
-  ;; return value of the expression is replaced by that value.
-  ;;
-  ;; RECORD-BOUND-ID and RECORD-TOP-LEVEL-ID are simply passed to ANNOTATE-STX.  
-  
-  (define annotate-for-single-stepping
-    (opt-lambda (stx break? break-before break-after record-bound-id record-top-level-id [source #f])
-      (annotate-stx
-       stx
-       (lambda (debug-info annotated raw is-tail?)
-         (let* ([start (syntax-position raw)]
-                [end (+ start (syntax-span raw) -1)]
-                [break? (break? (syntax-source raw))])
-           (if is-tail?
-               #`(let-values ([(value-list) #f])
-                   (if (#%plain-app #,break? #,start)
-                       (set! value-list (#%plain-app
-                                         #,break-before
-                                         #,debug-info
-                                         (#%plain-app current-continuation-marks)))
-                       (#%plain-app void))
-                   (if (#%plain-app not value-list)
-                       #,annotated
-                       (#%plain-app plain-apply values value-list)))
-               #`(let-values ([(value-list) #f])
-                   (if (#%plain-app #,break? #,start)
-                       (set! value-list (#%plain-app 
-                                         #,break-before
-                                         #,debug-info
-                                         (#%plain-app current-continuation-marks)))
-                       (#%plain-app void))
-                   (if (#%plain-app not value-list)
-                       (#%plain-app 
-                        call-with-values
-                        (#%plain-lambda () #,annotated)
-                        (case-lambda
-                          [(val) (if (#%plain-app #,break? #,end)
-                                     (#%plain-app 
-                                      #,break-after
-                                      #,debug-info
-                                      (#%plain-app current-continuation-marks) val)
-                                     val)]
-                          [vals (if (#%plain-app 
-                                     #,break? #,end)
-                                    (#%plain-app 
-                                     plain-apply 
-                                     #,break-after
-                                     #,debug-info
-                                     (#%plain-app current-continuation-marks) vals)
-                                    (#%plain-app plain-apply values vals))]))
-                       (if (#%plain-app #,break? #,end)
-                           (#%plain-app 
-                            plain-apply #,break-after
-                            #,debug-info
-                            (#%plain-app current-continuation-marks) 
-                            value-list)
-                           (#%plain-app plain-apply values value-list)))))))
-       record-bound-id
-       record-top-level-id
-       source)))
-
-
-  ; annotate-stx : (syntax? 
-  ;                 (mark? syntax? syntax? boolean? . -> . syntax?)
-  ;                 (symbol? syntax? syntax? . -> . void?)
-  ;                 . -> .  
-  ;                 syntax?)
-
-
-  ;; annotate-stx consumes a syntax, transverses it, and gives the opportunity
-  ;; to the break-wrap to annotate every expression.  Once for each expression
-  ;; in the source program, annotate-stx will call break-wrap with that
-  ;; expression as an argument and insert the result in the original syntax.
-  ;; Expressions that were duplicated during the macro expansion are
-  ;; nevertheless only wrapped once.  
-  ;;
-  ;; annotate-stx inserts annotations around each expression that introduces a
-  ;; new scope: let, lambda, and function calls.  These annotations reify the
-  ;; call stack, and allows to list the current variable in scope, look up
-  ;; their value, as well as change their value.  The reified stack is accessed
-  ;; via the CURRENT-CONTINUATION-MARKS using the key DEBUG-KEY
-  ;;
-  ;; BREAK-WRAP is called with four arguments: 
-  ;;   debug-info : the top frame of the reified stack (which never changes
-  ;;   across execution)
-  ;;   annotate-stx : the syntax with its subbranches already
-  ;;   annotated. BREAK-WRAP should return a modified version of this syntax.  
-  ;;   original-stx : the original syntax before annoatations 
-  ;;   is-tail? : true when original syntax was in tail position
-  ;;
-  ;; The RECORD-BOUND-ID function is a callback that is invoked each time a
-  ;; new variable is introduced, looked up, or set in STX (lexically).
-  ;; RECORD-BOUND-ID takes three arguments: 
-  ;;   use-case : either 'bind or 'ref or 'set, respectively
-  ;;   bound-stx : syntax where the symbol is introduced, looked up, set, respectively 
-  ;;   binding-stx : syntax where the symbol was bound
-  ;;
-  ;; Naturally, when USE-CASE is 'bind, BOUND-STX and BINDING-STX are equal.  
-  ;;
-  (define annotate-stx
-    (opt-lambda (stx break-wrap record-bound-id record-top-level-id [source #f])
-      
-      (define breakpoints (make-hasheq))
-      
-      (define (previous-bindings bound-vars)
-        (if (null? bound-vars)
-            #'null
-            #'(#%plain-app debugger-local-bindings)))
-      
-      (define (top-level-annotate stx)
-        (kernel:kernel-syntax-case/phase
-         stx (namespace-base-phase)
-         [(module identifier name mb)
-          (module-annotate stx)]
-         [else-stx
-          (general-top-level-expr-iterator stx  #f)]))
-
-      (define (module-annotate stx)
-        (syntax-case stx ()
-          [(_ identifier name mb)
-           (syntax-case (disarm #'mb) ()
-             [(plain-module-begin . module-level-exprs)
-              (with-syntax ([(module . _) stx])
-                (quasisyntax/loc stx (module identifier name
-                                       #,(rearm
-                                          #'mb
-                                          #`(plain-module-begin 
-                                             #,@(map (lambda (e) (module-level-expr-iterator
-                                                                  e (list (syntax-e #'identifier)
-                                                                          (syntax-source #'identifier))))
-                                                     (syntax->list #'module-level-exprs)))))))])]))
-      
-      (define (module-level-expr-iterator stx module-name )
-        (kernel:kernel-syntax-case
-         stx #f
-         [(#%provide . provide-specs)
-          stx]
-         [(#%declare . declare-specs)
-          stx]
-         [else-stx
-          (general-top-level-expr-iterator stx module-name )]))
-      
-      (define (general-top-level-expr-iterator stx module-name )
-        (kernel:kernel-syntax-case
-         stx #f
-         [(define-values (var ...) expr)
-          (begin
-            (for-each (lambda (v) (record-bound-id 'bind v v))
-                      (syntax->list #'(var ...)))
-            (quasisyntax/loc stx
-              (begin (define-values (var ...) #,(annotate #`expr '() #t module-name))
-                     #,(if (syntax-source stx)
-                           #`(begin (#%plain-app 
-                                     #,record-top-level-id '#,module-name #'var (case-lambda
-                                                                                 [() var]
-                                                                                 [(v) (set! var v)])) ...)
-                           #'(#%plain-app void))
-                     (#%plain-app void))))]
-         [(define-syntaxes (var ...) expr)
-          stx]
-         [(begin-for-syntax . exprs)
-          ;; compile time, so treat it like define-syntaxes
-          stx]
-         [(begin . top-level-exprs)
-          (quasisyntax/loc stx (begin #,@(map (lambda (expr)
-                                                (module-level-expr-iterator expr module-name ))
-                                              (syntax->list #'top-level-exprs))))]
-         [(#%require . require-specs)
-          stx]
-         [(module . _)
-          ;; a submodule:
-          (module-annotate stx)]
-         [(module* . _)
-          ;; a submodule:
-          (module-annotate stx)]
-         [else
-          (annotate stx '() #f module-name )]))
-      
-      (define (annotate expr bound-vars is-tail? module-name)
-        
-        (define annotate-break?
-          (let ([pos (syntax-position expr)]
-                [src (syntax-source expr)])
-            (and src pos
-                 (hash-ref breakpoints pos (lambda () #t))
-                 (kernel:kernel-syntax-case
-                  expr #f
-                  [(if test then else) #t]
-                  [(begin . bodies) #t]
-                  [(begin0 . bodies) #t]
-                  [(let-values . clause) #t]
-                  [(letrec-values . clause) #t]
-                  [(set! var val) #t]
-                  [(with-continuation-mark key mark body) #t]
-                  [(#%plain-app . exprs) #t]
-                  [_ #f])
-                 (begin
-                   (hash-set! breakpoints pos #f)
-                   (when (not is-tail?)
-                     (hash-set! breakpoints (+ pos (syntax-span expr) -1) #f))
-                   #t))))
-        
-        (define (let/rec-values-annotator letrec?)
-          (kernel:kernel-syntax-case
-           (disarm expr) #f
-           [(label (((var ...) rhs) ...) . bodies)
-            (let* ([new-bindings (apply append
-                                        (map syntax->list
-                                             (syntax->list #`((var ...) ...))))]
-                   [all-bindings (append new-bindings bound-vars)]
-                   [new-rhs (map (lambda (expr)
-                                   (annotate expr 
-                                             (if letrec? all-bindings bound-vars)
-                                             #f module-name ))
-                                 (syntax->list #'(rhs ...)))]
-                   [last-body (car (reverse (syntax->list #'bodies)))]
-                   [all-but-last-body (reverse (cdr (reverse (syntax->list #'bodies))))]
-                   [bodies (append (map (lambda (expr)
-                                          (annotate expr all-bindings #f module-name ))
-                                        all-but-last-body)
-                                   (list (annotate
-                                          last-body
-                                          all-bindings 
-                                          is-tail? module-name )))]
-                   [local-debug-info (assemble-debug-info new-bindings new-bindings 'normal #f)]
-                   [previous-bindings (previous-bindings bound-vars)])
-              (for-each (lambda (id) (record-bound-id 'bind id id)) new-bindings)
-              (with-syntax ([(new-rhs/trans ...) new-rhs]
-                            [previous-bindings previous-bindings])
-                (if letrec?
-                    (quasisyntax/loc expr
-                      (let ([old-bindings previous-bindings])
-                        (label (((debugger-local-bindings) (#%plain-lambda ()
-                                                             (#%plain-app
-                                                              list*
-                                                              #,@local-debug-info
-                                                              old-bindings)))
-                                ((var ...) new-rhs/trans) ...)
-                               #,@bodies)))
-                    (quasisyntax/loc expr
-                      (label (((var ...) new-rhs/trans) ...)
-                             (let ([debugger-local-bindings (#%plain-lambda ()
-                                                              (#%plain-app
-                                                               list*
-                                                               #,@local-debug-info
-                                                               previous-bindings))])
-                               #,@bodies))))))]))
-        
-        (define (lambda-clause-annotator clause)
-          (kernel:kernel-syntax-case
-           clause #f
-           [(arg-list . bodies)
-            (let* ([new-bound-vars (arglist-bindings #'arg-list)]
-                   [all-bound-vars (append new-bound-vars bound-vars)]
-                   [new-bodies (let loop ([bodies (syntax->list #'bodies)])
-                                 (if (equal? '() (cdr bodies))
-                                     (list (annotate (car bodies) all-bound-vars #t module-name ))
-                                     (cons (annotate (car bodies) all-bound-vars #f module-name )
-                                           (loop (cdr bodies)))))])
-              (for-each (lambda (id) (record-bound-id 'bind id id)) new-bound-vars)
-              (quasisyntax/loc clause
-                (arg-list 
-                 (let ([debugger-local-bindings
-                        (#%plain-lambda ()
-                          (#%plain-app
-                           list*
-                           #,@(assemble-debug-info new-bound-vars new-bound-vars 'normal #f)
-                           #,(previous-bindings bound-vars)))])
-                   #,@new-bodies))))]))
-        
-        (define annotated
-          (rearm
-           expr
-           (kernel:kernel-syntax-case
-            (disarm expr) #f
-            [var-stx (identifier? (syntax var-stx))
-                     (let ([binder (and (syntax-original? expr)
-                                        (member expr bound-vars free-identifier=?))])
-                       (if binder
-                           (record-bound-id 'ref expr (car binder))
-                           (record-bound-id 'top-level expr expr))
-                       expr)]
-            
-            [(#%plain-lambda . clause)
-             (quasisyntax/loc expr 
-               (#%plain-lambda #,@(lambda-clause-annotator #'clause)))]
-            
-            [(case-lambda . clauses)
-             (quasisyntax/loc expr
-               (case-lambda #,@(map lambda-clause-annotator (syntax->list #'clauses))))]
-            
-            [(if test then else)
-             (quasisyntax/loc expr (if #,(annotate #'test bound-vars #f module-name )
-                                       #,(annotate #'then bound-vars is-tail? module-name )
-                                       #,(annotate #'else bound-vars is-tail? module-name )))]
-            
-            [(begin . bodies)
-             (letrec ([traverse
-                       (lambda (lst)
-                         (if (and (pair? lst) (equal? '() (cdr lst)))
-                             `(,(annotate (car lst) bound-vars is-tail? module-name ))
-                             (cons (annotate (car lst) bound-vars #f module-name )
-                                   (traverse (cdr lst)))))])
-               (quasisyntax/loc expr (begin #,@(traverse (syntax->list #'bodies)))))]
-            
-            [(begin0 . bodies)
-             (quasisyntax/loc expr (begin0 #,@(map (lambda (expr)
-                                                     (annotate expr bound-vars #f module-name ))
-                                                   (syntax->list #'bodies))))]
-            
-            [(let-values . clause)
-             (let/rec-values-annotator #f)]
-            
-            [(letrec-values . clause) 
-             (let/rec-values-annotator #t)]
-            
-            [(set! var val)
-             (let ([binder (and (syntax-original? #'var)
-                                (member #'var bound-vars free-identifier=?))])
-               (when binder
-                 (record-bound-id 'set expr (car binder)))
-               (quasisyntax/loc expr (set! var #,(annotate #`val bound-vars #f module-name ))))]
-            
-            [(quote _) expr]
-            
-            [(quote-syntax _) expr]
-            
-            [(with-continuation-mark key mark body)
-             (quasisyntax/loc expr (with-continuation-mark key
-                                     #,(annotate #'mark bound-vars #f module-name )
-                                     #,(annotate #'body bound-vars is-tail? module-name )))]
-            
-            [(#%plain-app . exprs)
-             (let ([subexprs (map (lambda (expr) 
-                                    (annotate expr bound-vars #f module-name ))
-                                  (syntax->list #'exprs))])
-               (if (or is-tail? (not (syntax-source expr)))
-                   (quasisyntax/loc expr (#%plain-app . #,subexprs))
-                   (wcm-wrap (make-debug-info module-name expr bound-vars bound-vars 'normal #f (previous-bindings bound-vars))
-                             (quasisyntax/loc expr (#%plain-app . #,subexprs)))))]
-            
-            [(#%top . var) expr]
-            [(#%variable-reference . _) expr]
-            
-            [else (error 'expr-syntax-object-iterator "unknown expr: ~a"
-                         (syntax->datum expr))])))
-        
-        (if annotate-break?
-            (break-wrap
-             (make-debug-info module-name expr bound-vars bound-vars 'at-break #f (previous-bindings bound-vars))
-             annotated
-             expr
-             is-tail?)
-            annotated))
-      
-      (values (top-level-annotate stx) (hash-map breakpoints (lambda (k v) k)))))
-
-  (define (disarm stx) (syntax-disarm stx code-insp))
-  (define (rearm old new) (syntax-rearm new old))
-
-  (define code-insp (variable-reference->module-declaration-inspector
-                     (#%variable-reference))))
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/debug-tool.rkt b/pkgs/drracket-pkgs/drracket/gui-debugger/debug-tool.rkt
deleted file mode 100644
index b01d16786a..0000000000
--- a/pkgs/drracket-pkgs/drracket/gui-debugger/debug-tool.rkt
+++ /dev/null
@@ -1,1539 +0,0 @@
-#lang racket/base
-
-;; DrRacket's debugging tool
-
-(require racket/function
-         racket/list
-         racket/class
-         racket/unit
-         racket/contract
-         racket/match
-         racket/gui
-         drscheme/tool
-         "marks.rkt"
-         mrlib/switchable-button
-         mrlib/bitmap-label
-         mrlib/close-icon
-         "annotator.rkt"
-         "load-sandbox.rkt"
-         framework
-         string-constants
-         lang/debugger-language-interface
-         images/compile-time
-         (for-syntax racket/base
-                     racket/class
-                     racket/draw
-                     images/icons/arrow
-                     images/icons/control
-                     images/icons/style
-                     images/icons/symbol
-                     images/icons/tool
-                     pict))
-
-(provide tool@)
-
-; QUESTIONS/IDEAS
-; what is the right way to deal with macros?
-; how can the three tool classes communicate with each other safely
-
-(define-local-member-name debug-callback)
-
-(preferences:set-default 'plt:debug-tool:stack/variable-area
-                         9/10 
-                         (λ (x) (and (real? x) (<= 0 x 1))))
-
-(define tool@
-  (unit 
-    (import drscheme:tool^)
-    (export drscheme:tool-exports^) 
-
-    (define (phase1)
-      (drscheme:module-language-tools:add-opt-out-toolbar-button
-       (λ (frame parent)
-         (new switchable-button%
-              (label (string-constant debug-tool-button-name))
-              (bitmap debug-bitmap)
-              (alternate-bitmap small-debug-bitmap)
-              (parent parent)
-              (callback (λ (button) (send frame debug-callback)))))
-       'macro-stepper)
-      (drscheme:language:extend-language-interface
-       debugger-language<%>
-       (lambda (superclass)
-         (class* superclass (debugger-language<%>)
-           (public debugger:supported?)
-           (define (debugger:supported?) #t)
-                 (super-instantiate ())))))
-    (define phase2 void)
-    
-    (define (extract-language-level settings)
-      (drscheme:language-configuration:language-settings-language settings))
-    
-    (define (debugger-does-not-work-for? lang)
-      (not (send lang debugger:supported?)))
-    
-    (define (robust-syntax-source stx)
-      (and (syntax? stx) (syntax-source stx)))
-    
-    (define (robust-vector-ref vec idx)
-      (if (< idx (vector-length vec))
-          (vector-ref vec idx)
-          #f))
-    
-    (define (safe-vector-set! vec idx val)
-      (when (< idx (vector-length vec))
-        (vector-set! vec idx val))
-      (void))
-    
-    (define (truncate str n)
-      (cond [(< (string-length str) n) str]
-            [(>= n 3) (string-append
-                        (substring str 0 (- n 3))
-                        "...")]
-            [else (substring str 0 (min n (string-length str)))]))
-    
-    (define (clean-status s)
-      (truncate (regexp-replace* #rx"\n" s " ") 200))
-    
-    (define (index-of chr str)
-      (let loop ([i 0])
-        (if (< i (string-length str))
-            (if (char=? chr (string-ref str i))
-                i
-                (loop (add1 i)))
-            #f)))
-    
-    (define (safe-min . args)
-      (apply min (filter identity args)))
-    
-    ;; trim-expr-str: string -> string
-    ;; examples:
-    ;; short-id                   => short-id
-    ;; really-long-identifier     => really-lon...
-    ;; (<form>)                   => (<form>)
-    ;; (<form> <arg1> ... <argn>) => (<form> ...)
-    (define trim-expr-str
-      (lambda (str [len 10])
-        (let* ([strlen (string-length str)]
-               [starts-with-paren (and (> strlen 0)
-                                       (char=? (string-ref str 0) #\())]
-               [len2 (+ len 4)]
-               [trunc-pos (safe-min (index-of #\space str)
-                                    (index-of #\newline str)
-                                    (and (> strlen len2) len)
-                                    strlen)])
-          (if (>= trunc-pos strlen)
-              str
-              (string-append
-               (substring str 0 trunc-pos)
-               (if starts-with-paren
-                   " ...)"
-                   " ..."))))))
-    
-    (define (average . values)
-      (/ (apply + values) (length values)))
-    
-    (define (truncate-value v size depth)
-      (cond
-        [(zero? depth) '...]
-        [(and (string? v)
-              (> (string-length v) size))
-         (string-append (substring v 0 size) "...")]
-        [(list? v)
-         (let* ([len (length v)]
-                [res (build-list (min size len)
-                                 (lambda (i) (truncate-value (list-ref v i) size (sub1 depth))))])
-           (if (> len size) (append res (list '...)) res))]
-        [(vector? v)
-         (build-vector (min size (vector-length v))
-                       (lambda (i)
-                         (if (and (= i (sub1 size))
-                                  (> size (vector-length v)))
-                             '...
-                             (truncate-value (vector-ref v i) size (sub1 depth)))))]
-        [(bytes? v)
-         (if (> (bytes-length v) size)
-             (bytes-append (subbytes v 0 size) #"...")
-             v)]
-        [else v]))
-    
-    (define filename->defs
-      (lambda (source [default #f])
-        (let/ec k
-          (cond
-            [(is-a? source editor<%>) source]
-            [else
-             (send (group:get-the-frame-group) for-each-frame
-                   (lambda (frame)
-                     (and (is-a? frame drscheme:unit:frame<%>)
-                          (let* ([defss (map (lambda (t) (send t get-defs)) (send frame get-tabs))]
-                                 [defs (findf (lambda (d) (send d port-name-matches? source)) defss)])
-                            (and defs (k defs))))))
-             default]))))
-    
-    (define (debug-definitions-text-mixin super%)
-      (class super%
-        
-        (inherit dc-location-to-editor-location
-                 editor-location-to-dc-location
-                 invalidate-bitmap-cache
-                 begin-edit-sequence
-                 end-edit-sequence
-                 get-canvas
-                 get-top-level-window
-                 get-filename
-                 get-tab)
-        
-        (define mouse-over-pos #f)
-        (super-instantiate ())
-        
-        (define/augment (on-delete start len)
-          (begin-edit-sequence)
-          (let ([breakpoints (send (get-tab) get-breakpoints)]
-                [shifts empty])
-            (hash-for-each
-             breakpoints
-             (lambda (pos status)
-               (cond
-                 ; deletion after breakpoint: no effect
-                 [(<= pos start)]
-                 ; deletion of breakpoint: remove from table
-                 [(and (< start pos)
-                       (<= pos (+ start len)))
-                  (hash-remove! breakpoints pos)]
-                 ; deletion before breakpoint: shift breakpoint
-                 [(> pos (+ start len))
-                  (hash-remove! breakpoints pos)
-                  (set! shifts (cons (cons (- pos len) status) shifts))])))
-            (for-each (lambda (p) (hash-set! breakpoints (car p) (cdr p)))
-                      shifts))
-          (inner (void) on-delete start len))
-        
-        (define/augment (after-delete start len)
-          (inner (void) after-delete start len)
-          (when (send (get-tab) debug?)
-            (send (get-tab) hide-debug))
-          (end-edit-sequence))
-        
-        (define/augment (on-insert start len)
-          (begin-edit-sequence)
-          (let ([breakpoints (send (get-tab) get-breakpoints)]
-                [shifts empty])
-            (hash-for-each
-             breakpoints
-             (lambda (pos status)
-               (when (< start pos)
-                 ;; text inserted before this breakpoint, so shift
-                 ;; the breakpoint forward by <len> positions
-                 (hash-remove! breakpoints pos)
-                 (set! shifts (cons (cons (+ pos len) status) shifts)))))
-            ;; update the breakpoint locations
-            (for-each (lambda (p) (hash-set! breakpoints (car p) (cdr p)))
-                      shifts))
-          (inner (void) on-insert start len))
-        
-        (define/augment (after-insert start len)
-          (inner (void) after-insert start len)
-          (when (send (get-tab) debug?)
-            (send (get-tab) hide-debug))
-          (end-edit-sequence))
-        
-        ;; lookup id in the given set of stack frames;
-        ;; if that fails, try the top-level environment
-        ;; invokes sk on success, fk on failure
-        (define/private (lookup-var id frames sk fk)
-          (cond
-            [(and id frames (lookup-first-binding
-                             (lambda (id2) (free-identifier=? id id2))
-                             frames (lambda () #f)))
-             => (lambda (binding)
-                  (sk (mark-binding-value binding)
-                      (lambda (v) (mark-binding-set! binding v))))]
-            [(and id (send (get-tab) lookup-top-level-var
-                           id (lambda () #f)))
-             => (lambda (tlb)
-                  (sk (tlb) tlb))]
-            [else (fk)]))
-        
-        ;; mouse-event -> (or (values #f #f) (values pos editor))
-        (define/private (get-pos/text event)
-          (let ([event-x (send event get-x)]
-                [event-y (send event get-y)]
-                [on-it? (box #f)])
-            (let loop ([editor this])
-              (let-values ([(x y) (send editor dc-location-to-editor-location
-                                        event-x event-y)])
-                (cond
-                  [(is-a? editor text%)
-                   (let ([pos (send editor find-position x y #f on-it?)])
-                     (cond
-                       [(not (unbox on-it?)) (values #f #f)]
-                       [else
-                        (let ([snip (send editor find-snip pos 'after-or-none)])
-                          (if (and snip
-                                   (is-a? snip editor-snip%))
-                              (loop (send snip get-editor))
-                              (values pos editor)))]))]
-                  [(is-a? editor pasteboard%)
-                   (let ([snip (send editor find-snip x y)])
-                     (if (and snip
-                              (is-a? snip editor-snip%))
-                         (loop (send snip get-editor))
-                         (values #f #f)))]
-                  [else (values #f #f)])))))
-        
-        ;; text% start -> (values left top right bottom)
-        ;; (four numbers that indicate the locations in pixels of the
-        ;;  box bounding the text between start and end
-        (define/private (find-char-box text pos)
-          (define start-pos (max 0 (- pos 1)))
-          (define end-pos (+ start-pos 1))
-          (let ([xlb (box 0)]
-                [ylb (box 0)]
-                [xrb (box 0)]
-                [yrb (box 0)])
-            (send text position-location start-pos xlb ylb #t)
-            (send text position-location end-pos xrb yrb #f)
-            (let*-values ([(xl-off yl-off) (send text editor-location-to-dc-location
-                                                 (unbox xlb) (unbox ylb))]
-                          [(xl yl) (dc-location-to-editor-location xl-off yl-off)]
-                          [(xr-off yr-off) (send text editor-location-to-dc-location
-                                                 (unbox xrb) (unbox yrb))]
-                          [(xr yr) (dc-location-to-editor-location xr-off yr-off)])
-              (cond
-                [(= (send text position-line start-pos)
-                    (send text position-line end-pos))
-                 (values xl yl xr yr)]
-                [else
-                 ;; in this case, the open paren we want to draw on top of is on
-                 ;; a different line from the operator following it, so we just 
-                 ;; give ourselves a little space and draw something, instead of
-                 ;; returning strange results (and possibly crashing)
-                 (values xl yl (+ 10 xl) (+ yl 10))]))))
-        
-        (define/private (render v)
-          (send (get-tab) render v))
-        
-        ;; mouse-event% integer -> ()
-        ;; handles a right-click on a position that's not a breakable paren
-        (define/private (debugger-handle-right-click-non-breakable event pos)
-          (let* ([frames (send (get-tab) get-stack-frames)]
-                 [pos-vec (send (get-tab) get-pos-vec)]
-                 [id (robust-vector-ref pos-vec pos)])
-            (unless (lookup-var
-                     id frames
-                     (lambda (val wr)
-                       (let ([id-sym (syntax-e id)]
-                             [menu (make-object popup-menu% #f)])
-                         (make-object menu-item%
-                           (clean-status (format "Print value of ~a to console" id-sym))
-                           menu
-                           (lambda (item evt)
-                             (send (get-tab) print-to-console (format "~a = ~s" id-sym val))))
-                         (make-object menu-item% (format "(set! ~a ...)" id-sym) menu
-                           (lambda (item evt)
-                             (let* ([tmp (get-text-from-user
-                                          (format "New value for ~a" id-sym) #f #f
-                                          (format "~a" val))])
-                               (when tmp
-                                 (let/ec k
-                                   (wr (with-handlers
-                                           ([exn:fail?
-                                             (lambda (exn)
-                                               (message-box
-                                                "Debugger Error"
-                                                (format "The following error occurred: ~a"
-                                                        (exn-message exn)))
-                                               (k))])
-                                         (read (open-input-string tmp)))))))))
-                         (send (get-canvas) popup-menu menu
-                               (+ 1 (inexact->exact (floor (send event get-x))))
-                               (+ 1 (inexact->exact (floor (send event get-y)))))
-                         #t))
-                     (lambda () #f))
-              (super on-event event))))
-        
-        (define/private (debugger-handle-right-click-breakable event breakpoints pos break-status)
-          (let ([menu (make-object popup-menu% #f)])
-            (make-object menu-item%
-              (if break-status
-                  "Remove pause at this point"
-                  "Pause at this point")
-              menu
-              (lambda (item evt)
-                (hash-set! breakpoints pos (not break-status))
-                (invalidate-bitmap-cache)))
-            (let ([pc (send (get-tab) get-pc)])
-              (if (and pc (= pos pc))
-                  (let* ([stat (send (get-tab) get-break-status)]
-                         [f (get-top-level-window)]
-                         [rendered-value
-                          (if (cons? stat)
-                              (if (= 2 (length stat))
-                                  (render (cadr stat))
-                                  (format "~s" (cons 'values 
-                                                     (map (lambda (v) (render v)) (rest stat)))))
-                              "")])
-                    (when (cons? stat)
-                      (make-object menu-item%
-                        "Print return value to console" menu
-                        (lambda _ (send (get-tab) print-to-console
-                                        (string-append "return val = " rendered-value)))))
-                    (when (not (eq? stat 'break))
-                      (make-object menu-item%
-                        (if (cons? stat)
-                            "Change return value..."
-                            "Skip expression...")
-                        menu
-                        (lambda (item evt)
-                          (let ([tmp (get-text-from-user "Return value" #f)])
-                            (when tmp
-                              (let/ec k
-                                (send (get-tab) set-break-status
-                                      (cons 'exit-break
-                                            (call-with-values
-                                             (lambda ()
-                                               (with-handlers
-                                                   ([exn:fail?
-                                                     (lambda (exn)
-                                                       (message-box
-                                                        "Debugger Error"
-                                                        (format "An error occurred: ~a" (exn-message exn))
-                                                        #f '(ok))
-                                                       (k))])
-                                                 (read (open-input-string tmp))))
-                                             list)))
-                                (invalidate-bitmap-cache))))))))
-                  (make-object menu-item%
-                    "Continue to this point"
-                    menu
-                    (lambda (item evt)
-                      (hash-set!
-                       breakpoints pos
-                       (lambda () (hash-set! breakpoints pos break-status) #t))
-                      (invalidate-bitmap-cache)
-                      (when (send (get-tab) get-stack-frames)
-                        (send (get-tab) resume))))))
-            (send (get-canvas) popup-menu menu
-                  (+ 1 (inexact->exact (floor (send event get-x))))
-                  (+ 1 (inexact->exact (floor (send event get-y)))))))
-        
-        (define/private (debugger-handle-right-click event breakpoints)
-          (let-values ([(pos text) (get-pos/text event)])
-            (if (and pos text)
-                (let* ([pos (add1 pos)]
-                       [break-status (hash-ref breakpoints pos (lambda () 'invalid))])
-                  (match break-status
-                    [(or #t #f (? procedure?))
-                     (debugger-handle-right-click-breakable event breakpoints pos break-status)]
-                    ['invalid
-                     (debugger-handle-right-click-non-breakable event pos)]))
-                (super on-event event))))
-        
-        (define/private (debugger-handle-event event)
-          (let ([breakpoints (send (get-tab) get-breakpoints)])
-            (cond
-              [(send event leaving?)
-               (when mouse-over-pos
-                 (set! mouse-over-pos #f)
-                 (invalidate-bitmap-cache))
-               (super on-event event)]
-              [(or (send event moving?)
-                   (send event entering?))
-               (let-values ([(pos text) (get-pos/text event)])
-                 (when (and pos text)
-                   (let ([pos (add1 pos)])
-                     (cond
-                       ;; mouse on breakable pos and hasn't moved significantly
-                       [(eq? pos mouse-over-pos)]
-                       ;; mouse on new breakable pos
-                       [(not (eq? (hash-ref
-                                   breakpoints pos (lambda () 'invalid)) 'invalid))
-                        (set! mouse-over-pos pos)
-                        (invalidate-bitmap-cache)]
-                       ;; moved off breakable pos
-                       [mouse-over-pos
-                        (set! mouse-over-pos #f)
-                        (invalidate-bitmap-cache)])
-                     (let* ([frames (send (get-tab) get-stack-frames)]
-                            [pos-vec (send (get-tab) get-pos-vec)]
-                            [id (robust-vector-ref pos-vec pos)]
-                            ;; Try to look up the identifier and render its value.  If either
-                            ;; of these steps fails, just draw an empty string in the status bar.
-                            [rendered
-                             (lookup-var
-                              id (list-tail frames (send (get-tab) get-frame-num))
-                                          ;; id found
-                                          (lambda (val _)
-                                            (cond
-                                              [(render val) => (lambda (str)
-                                                                 (string-append
-                                                                  (symbol->string (syntax-e id)) " = " str))]
-                                              [else ""]))
-                                          ;; id not found
-                                          (lambda () ""))])
-                       (send (get-tab) set-mouse-over-msg (clean-status rendered))))))
-               (super on-event event)]
-              [(send event button-down? 'right)
-               (debugger-handle-right-click event breakpoints)]
-              [else (super on-event event)])))
-          
-        (define/override (on-event event)
-          (if (send (get-tab) debug?)
-              (debugger-handle-event event)
-              (super on-event event)))
-        
-        (define/override (on-paint before dc left top right bottom dx dy draw-caret)
-          (super on-paint before dc left top right bottom dx dy draw-caret)
-          (when (and (send (get-tab) debug?) (not before))
-            ;; render breakpoints
-            (let ([breakpoints (send (get-tab) get-breakpoints)])
-              (hash-for-each
-               breakpoints
-               (lambda (pos enabled?)
-                 (when (and (>= pos 0) (or enabled? (and mouse-over-pos (= mouse-over-pos pos))))
-                   (let*-values ([(xl yl xr yr) (find-char-box this pos)]
-                                 [(diameter) (- xr xl)]
-                                 [(yoff) (/ (- yr yl diameter) 2)])
-                     (let ([op (send dc get-pen)]
-                           [ob (send dc get-brush)])
-                       (case enabled?
-                         [(#t) (send dc set-pen bp-pen)
-                               (send dc set-brush bp-brush)]
-                         [(#f) (send dc set-pen bp-mo-pen)
-                               (send dc set-brush bp-mo-brush)]
-                         [else (send dc set-pen bp-tmp-pen)
-                               (send dc set-brush bp-tmp-brush)])
-                       (send dc draw-ellipse (+ xl dx) (+ yl dy yoff) diameter diameter)
-                       (send dc set-pen op)
-                       (send dc set-brush ob)))))))
-            ;; mark the boundaries of the current stack frame
-            ;; unless we're at the end of the expression and looking at the top frame,
-            ;; in which case just mark the current location
-            (let* ([frame-defs (send (get-tab) defs-containing-current-frame)]
-                   [pos (send (get-tab) get-current-frame-endpoints)]
-                   [start (and pos (first pos))]
-                   [end (and pos (second pos))]
-                   [frame-num (send (get-tab) get-frame-num)]
-                   [break-status (send (get-tab) get-break-status)])
-              (when (and (eq? frame-defs this) start end)
-                (let*-values ([(xl yl xr yr) (find-char-box this start)]
-                              [(ym) (average yl yr)]
-                              [(xa ya xb yb) (find-char-box this end)]
-                              [(diameter) (- xb xa)]
-                              [(yoff) (/ (- yb ya diameter) 2)]
-                              [(ym2) (average ya yb)])
-                  (let ([op (send dc get-pen)]
-                        [ob (send dc get-brush)])
-                    (cond
-                      [(and (zero? frame-num)
-                            (eq? break-status 'error))
-                       (send dc set-pen pc-err-pen)
-                       (send dc set-brush pc-err-brush)]
-                      [(and (zero? frame-num)
-                            (eq? break-status 'break))
-                       (send dc set-pen pc-brk-pen)
-                       (send dc set-brush pc-brk-brush)]
-                      [(zero? frame-num)
-                       (send dc set-pen pc-pen)
-                       (send dc set-brush pc-brush)]
-                      [else
-                       (send dc set-pen pc-up-stack-pen)
-                       (send dc set-brush pc-up-stack-brush)])
-                    (unless (and (zero? frame-num) (cons? break-status))
-                      ;; mark the beginning of the expression with a triangle
-                      (send dc draw-polygon (list (make-object point% xl yl)
-                                                  (make-object point% xl yr)
-                                                  (make-object point% xr ym)) dx dy))
-                    (if (and (zero? frame-num) (cons? break-status))
-                        ;; top frame, end: mark the end of the expression with a triangle
-                        (send dc draw-polygon (list (make-object point% xa ya)
-                                                    (make-object point% xa yb)
-                                                    (make-object point% xb ym2)) dx dy)
-                        ;; otherwise: make the end of the expression with a circle
-                        (send dc draw-ellipse (+ xa dx) (+ ya dy yoff) diameter diameter))
-                    (send dc set-pen op)
-                    (send dc set-brush ob)))))))
-        
-        (define/augment (after-set-next-settings s)
-          (let ([tlw (get-top-level-window)])
-            (when tlw
-              (send tlw check-current-language-for-debugger)))
-          (inner (void) after-set-next-settings s))))
-    
-    ;; pen and brush for drawing a breakpoint
-    (define bp-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-    (define bp-brush (send the-brush-list find-or-create-brush "red" 'solid))
-    ;; pen and brush for marking a location that could have a breakpoint installed
-    (define bp-mo-pen (send the-pen-list find-or-create-pen "darkgray" 1 'solid))
-    (define bp-mo-brush (send the-brush-list find-or-create-brush "tomato"
-                              'solid))
-    ;; pen and brush for marking a conditional breakpoint
-    (define bp-tmp-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-    (define bp-tmp-brush (send the-brush-list find-or-create-brush "yellow"
-                               'solid))
-    ;; pen and brush for drawing the normal execution location
-    (define pc-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-    (define pc-brush (send the-brush-list find-or-create-brush "forestgreen" 'solid))
-    ;; pen and brush for marking the expression when not at the top of the stack
-    (define pc-up-stack-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-    (define pc-up-stack-brush (send the-brush-list find-or-create-brush "lightgreen" 'solid))
-    ;; pen and brush for marking the location when there's an an error
-    (define pc-err-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-    (define pc-err-brush (send the-brush-list find-or-create-brush "red" 'solid))
-    ;; pen and brush for marking the location following a break
-    (define pc-brk-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-    (define pc-brk-brush (send the-brush-list find-or-create-brush "gray" 'solid))
-    
-    (define (debug-interactions-text-mixin super%)
-      (class super%
-        
-        (inherit run-in-evaluation-thread
-                 get-user-thread)
-        
-        (super-instantiate ())
-        
-        (define debugged-thread #f)
-        (define tab #f)
-        (define/public (get-tab) tab)
-        (define/public (set-tab t) (set! tab t))
-        
-        ;; Returns whether the evaluation thread has been killed.
-        (define/public (evaluation-thread-dead?)
-          (cond
-            [(get-user-thread) => thread-dead?]
-            [else #t]))
-        
-        (define/override (kill-evaluation)
-          (super kill-evaluation)
-          (when (get-tab)
-            ;; Remove any markings indicating that the program is suspended.
-            (send (get-tab) resume-gui)))
-        
-        (define/private (stx-source->breakpoints src)
-          (send (send (or (and src (filename->defs src)) this) get-tab) get-breakpoints))
-        
-        (define/private (stx-source->pos-vec src)
-          (send (send (or (and src (filename->defs src)) this) get-tab) get-pos-vec))
-        
-        ;; make-debug-eval-handler : (sexp -> value) -> sexp -> value
-        ;; adds debugging information to `sexp' and calls `oe'
-        (define/private (make-debug-eval-handler oe break? break-before break-after)
-          (lambda (orig-exp)
-            (cond
-              [(compiled-expression? (if (syntax? orig-exp)
-                                         (syntax-e orig-exp)
-                                         orig-exp))
-               (oe orig-exp)]
-              [else
-               (define exp (if (syntax? orig-exp)
-                               orig-exp
-                               (namespace-syntax-introduce
-                                (datum->syntax #f orig-exp))))
-               (define top-e (expand-syntax-to-top-form exp))
-               (define fn (and (syntax? orig-exp)
-                               (let ([src (syntax-source orig-exp)])
-                                 (and (path? src)
-                                      src))))
-               (cond
-                 [(or (eq? (filename->defs (and (syntax? orig-exp)
-                                                (syntax-source orig-exp)))
-                           (send (get-tab) get-defs))
-                      (annotate-this-module? fn))
-                  (parameterize ([current-eval oe])
-                   (eval/annotations
-                    top-e
-                    ; annotate-module?
-                    (lambda (fn m) 
-                      (annotate-this-module? fn))
-                    ; annotator
-                    (lambda (stx)
-                      (define source (syntax-source stx))
-                      (define breakpoints (stx-source->breakpoints source))
-                      (define pos-vec (stx-source->pos-vec source))
-                      (define-values (annotated break-posns)
-                        (annotate-for-single-stepping
-                         (expand-syntax stx)
-                         break? break-before break-after
-                         ; record-bound-identifier
-                         (lambda (type bound binding)
-                           (cond
-                             [(filename->defs (robust-syntax-source bound))
-                              =>
-                              (lambda (defs)
-                                (let ([pos-vec (send (send defs get-tab) get-pos-vec)])
-                                  (let loop ([i 0])
-                                    (when (< i (syntax-span bound))
-                                      (safe-vector-set! pos-vec (+ i (syntax-position bound))
-                                                        binding)
-                                      (loop (add1 i))))))]
-                             [else (void)]))
-                         ; record-top-level-identifier
-                         (lambda (mod var rd/wr)
-                           ; filename->defs should succeed unless a slave tab gets closed
-                           (cond
-                             [(filename->defs (robust-syntax-source var))
-                              =>
-                              (lambda (defs)
-                                (send (send defs get-tab)
-                                      add-top-level-binding var rd/wr))]
-                             [else (void)]))
-                         source))
-                      (hash-for-each
-                       breakpoints
-                       (lambda (pos status)
-                         ; possible efficiency problem for large files with many breakpoints
-                         (when (and (syntax-position stx)
-                                    (>= pos (syntax-position stx))
-                                    (< pos (+ (syntax-position stx) (syntax-span stx)))
-                                    (not (memq pos break-posns)))
-                           (hash-remove! breakpoints pos))))
-                      (for ([posn (in-list break-posns)]) 
-                        (hash-set!
-                         breakpoints posn
-                         (hash-ref breakpoints posn (lambda () #f))))
-                      annotated)))]
-                 [else (oe top-e)])])))
-        
-        (define/private (annotate-this-module? fn)
-          (cond
-            [(filename->defs fn)
-             =>
-             ; fn is loaded into defs
-             (lambda (defs)
-               (let ([extern-tab (send defs get-tab)]
-                     [this-tab (get-tab)])
-                 (case (if (or (not (send extern-tab debug?))
-                               (eq? this-tab (send extern-tab get-master)))
-                           (message-box
-                            "Debugging Multi-File Program"
-                            (format "Debug ~a?" fn)
-                            #f
-                            '(yes-no))
-                           (message-box
-                            "Debugging Multi-File Program"
-                            (format "~a is already involved in a debugging session." fn)
-                            #f
-                            '(ok)))
-                   [(yes)
-                    ; set tab up with shared data from the master tab
-                    (send extern-tab prepare-execution #t)
-                    (send this-tab add-slave extern-tab)
-                    (call-with-values
-                     (lambda () (send this-tab get-shared-data))
-                     (lambda vals (send extern-tab set-shared-data . vals)))
-                    #t]
-                   [(no ok)
-                    (send extern-tab prepare-execution #f)
-                    #f])))]
-            ; fn is not open, so don't try to debug it
-            [else #f]))
-        
-        (define/override (reset-console)
-          (super reset-console)
-          (let ([tab (get-tab)])
-            (when (and tab (send tab debug?))
-              (let ([breakpoints (send tab get-breakpoints)])
-                (run-in-evaluation-thread
-                 (lambda ()
-                   ;(print-struct #t)
-                   (let ([self (current-thread)]
-                         [oeh (uncaught-exception-handler)]
-                         [err-hndlr (error-display-handler)])
-                     (set! debugged-thread self)
-                     (error-display-handler
-                      (lambda (msg exn)
-                        (err-hndlr msg exn)
-                        (when (and (eq? self (current-thread)) (exn:fail? exn))
-                              (send (get-tab) suspend oeh
-                                    (continuation-mark-set->list (exn-continuation-marks exn) debug-key)
-                                    'error)))) ; this breaks the buttons because it looks like we can resume
-                     (current-eval
-                      (make-debug-eval-handler
-                       (current-eval)
-                       ; break? -- curried to avoid looking up defs from source each time
-                       (lambda (src)
-                         (let* ([defs (filename->defs src)]
-                                [src-tab (if defs (send defs get-tab) (get-tab))]
-                                [breakpoints (if src
-                                                 (send src-tab get-breakpoints)
-                                                 breakpoints)]
-                                [single-step? (send tab get-single-step-box)]
-                                [closed? (send src-tab get-closed-box)])
-                           (lambda (pos)
-                             (and (not (unbox closed?))
-                                  (or (unbox single-step?)
-                                      (let ([bp (hash-ref breakpoints pos #f)])
-                                        (if (procedure? bp)
-                                            (bp)
-                                            bp)))))))
-                       ; break-before
-                       (lambda (top-mark ccm)
-                         (let* ([debug-marks (continuation-mark-set->list ccm debug-key)])
-                           (send (get-tab) suspend oeh (cons top-mark debug-marks) 'entry-break)))
-                       ; break-after
-                       (case-lambda
-                         [(top-mark ccm val)
-                          (let* ([debug-marks (continuation-mark-set->list ccm debug-key)])
-                            (car (send (get-tab) suspend oeh (cons top-mark debug-marks)
-                                       (list 'exit-break val))))]
-                         [(top-mark ccm . vals) 
-                          (let* ([debug-marks (continuation-mark-set->list ccm debug-key)])
-                            (apply values
-                                   (send (get-tab) suspend oeh (cons top-mark debug-marks)
-                                         (cons 'exit-break vals))))])))
-                     (uncaught-exception-handler
-                      (lambda (exn)
-                        (if (and (exn:break? exn) (send (get-tab) suspend-on-break?))
-                            (let ([marks (exn-continuation-marks exn)]
-                                  [cont (exn:break-continuation exn)])
-                              (send (get-tab) suspend oeh (continuation-mark-set->list marks debug-key) 'break)
-                              (cont))
-                            (oeh exn)))))))))))))
-    
-    (define (debug-tab-mixin super%)
-      (class super%
-        
-        (inherit get-defs
-                 get-ints
-                 get-frame
-                 is-running?)
-        
-        (field [breakpoints (make-hash)]
-               [suspend-sema (make-semaphore 1)]
-               [resume-ch (make-channel)]
-               [in-user-ch (make-channel)]
-               [want-suspend-on-break? #f]
-               [want-debug? #f]
-               [master this]
-               [slaves empty]
-               [closed? (box #f)]
-               [stack-frames (box #f)]
-               [frame-num (box 0)]
-               [break-status (box #f)]
-               [current-language-settings #f]
-               [pos-vec (vector #f)]
-               [single-step? (box #t)]
-               [top-level-bindings empty]
-               [control-panel #f])
-        
-        (define/public (debug?) want-debug?)
-        (define/public (get-master) master)
-        (define/public (add-slave s)
-          (set! slaves (cons s slaves)))
-        (define/public (get-closed-box) closed?)
-        (define/public suspend-on-break?
-          (case-lambda
-            [() want-suspend-on-break?]
-            [(v) (set! want-suspend-on-break? v)]))
-        (define/public (get-stack-frames)
-          (unbox stack-frames))
-        (define/public (get-pos-vec) pos-vec)
-        (define/public (get-breakpoints) breakpoints)
-        (define/public (get-break-status) (unbox break-status))
-        (define/public (get-frame-num) (unbox frame-num))
-        
-        (define/public (set-shared-data bs sf sema res-ch usr-ch step? frame m)
-          (set! break-status bs)
-          (set! stack-frames sf)
-          (set! suspend-sema sema)
-          (set! resume-ch res-ch)
-          (set! in-user-ch usr-ch)
-          (set! single-step? step?)
-          (set! frame-num frame)
-          (set! master m))
-        
-        (define/public (get-shared-data)
-          (values break-status stack-frames suspend-sema resume-ch in-user-ch single-step? frame-num master))
-        
-        (define/public (get-single-step-box) single-step?)
-        (define/public (set-single-step?! v) (set-box! single-step? v))
-        (define/public (set-break-status stat) (set-box! break-status stat))
-        (define/public (add-top-level-binding var rd/wr)
-          (set! top-level-bindings (cons (cons var rd/wr) top-level-bindings)))
-        (define/public (lookup-top-level-var var failure-thunk)
-          (let loop ([bindings top-level-bindings])
-            (cond
-              [(empty? bindings) (failure-thunk)]
-              [(or (bound-identifier=? var (caar bindings))
-                   (free-identifier=? var (caar bindings))) (cdar bindings)]
-              [else (loop (rest bindings))])))
-        
-        (define/public (move-to-frame the-frame-num)
-          (set-box! frame-num the-frame-num)
-          (suspend-gui (get-stack-frames) (get-break-status) #t #t))
-        
-        (define/public (resume)
-          (let ([v (get-break-status)])
-            ;; We should be suspended here, so the user thread should be waiting for a value
-            ;; on resume-ch.  However, we set a timeout to guard against cases where
-            ;; the user thread gets interrupted or killed unexpectedly.
-            (when (sync/timeout 1 (channel-put-evt resume-ch (and (pair? v) (cdr v))))
-              (resume-gui))))
-        
-        (define/public (set-mouse-over-msg msg)
-          (send (get-frame) set-mouse-over-msg msg))
-        
-        (define/public (defs-containing-pc)
-          (let ([stack-frames (get-stack-frames)])
-            (and (cons? stack-frames)
-                 (let* ([src-stx (mark-source (first stack-frames))]
-                        [source (syntax-source src-stx)])
-                   (if source
-                       (filename->defs source)
-                       (get-defs))))))
-        
-        (define/public (defs-containing-current-frame)
-          (let ([stack-frames (get-stack-frames)])
-            (and (cons? stack-frames)
-                 (let* ([src-stx (mark-source (list-ref stack-frames (get-frame-num)))]
-                        [source (syntax-source src-stx)])
-                   (if source
-                       (filename->defs source)
-                       (get-defs))))))
-
-        (define/public (get-pc)
-          (let ([stack-frames (get-stack-frames)])
-            (and (cons? stack-frames)
-                 (let* ([src-stx (mark-source (first stack-frames))]
-                        [start (syntax-position src-stx)]
-                        [end (and start (+ start (syntax-span src-stx) -1))])
-                   (if (cons? (get-break-status))
-                       end
-                       start)))))
-        
-        (define/public (get-frame-endpoints frame-num)
-          (let ([stack-frames (get-stack-frames)])
-            (and (cons? stack-frames)
-                 (let* ([src-stx (mark-source (list-ref stack-frames frame-num))]
-                        [start (syntax-position src-stx)]
-                        [end (and start (+ start (syntax-span src-stx) -1))])
-                   (list start end)))))
-        
-        (define/public (get-current-frame-endpoints)
-          (get-frame-endpoints (get-frame-num)))
-        
-        (define/private (do-in-user-thread thunk)
-          (if (get-break-status)
-              ;; The evaluation thread is suspended, so it should be waiting for thunks
-              ;; to arrive on in-user-ch, evaluating them, and sending the results back
-              ;; on result-ch.  However, the user (or some background thread) might break
-              ;; or kill the evaluation thread at any time, in which case this protocol could
-              ;; fail.  We could try to enumerate and handle all such failure modes explicitly,
-              ;; but a simple timeout, inelegant as it may be, lets us recover from all of them.
-              (sync/timeout 1 (channel-put-evt in-user-ch thunk))
-              (send (get-ints) run-in-evaluation-thread thunk)))
-        
-        ;; Returns whether the user thread is free, which is the case when:
-        ;; - it's not dead, AND either
-        ;;   * it's been suspended by the debugger, OR
-        ;;   * it's done running the user's program.
-        (define/private (user-thread-free?)
-          (and (not (send (get-ints) evaluation-thread-dead?))
-               (or (get-break-status) (not (is-running?)))))
-        
-        (define/public (render v)
-          ;; ==drscheme eventspace thread==
-          ;; returns false if the user thread is unavailable to perform the rendering
-          (and (user-thread-free?)
-          (let ([result-ch (make-channel)]
-                [v (truncate-value v 100 5)])
-            (do-in-user-thread
-             (lambda ()
-               (let ([s (open-output-string)])
-                 (send (drscheme:language-configuration:language-settings-language 
-                        current-language-settings)
-                       render-value
-                       v
-                       (drscheme:language-configuration:language-settings-settings
-                        current-language-settings)
-                       s)
-                      ;; Set a timeout in the user thread, so we don't block forever if the
-                      ;; drscheme thread gives up waiting for our response.
-                      (sync/timeout 1 (channel-put-evt result-ch (get-output-string s))))))
-                 ;; Set a timeout to guard against cases where the user thread
-                 ;; gets interrupted or killed in the middle of evaluation.
-                 (sync/timeout 1 result-ch))))
-        
-        (define/public (print-to-console v)
-          ;; ==drscheme eventspace thread==
-          ;; only when a user thread is suspended
-          (do-in-user-thread (lambda () (eprintf " ### DEBUGGER: ~s\n" v))))
-        
-        (define/private (frame->end-breakpoint-status frame)
-          (let/ec k
-            (let* ([stx (mark-source frame)]
-                   [src (syntax-source stx)]
-                   [pos (if (not (syntax-position stx))
-                            (k 'invalid)
-                            (+ (syntax-position stx) (syntax-span stx) -1))]
-                   [defs (filename->defs src)]
-                   [tab (if defs (send defs get-tab) (k 'invalid))]
-                   [bps (send tab get-breakpoints)])
-              (hash-ref bps pos 'invalid))))
-        
-        (define/private (can-step-over? frames status)
-          (and (or (not (zero? (get-frame-num))) (eq? status 'entry-break))
-               frames
-               (not (empty? frames))
-               (not (eq? (frame->end-breakpoint-status (list-ref frames (get-frame-num))) 'invalid))))
-        
-        (define/private (can-step-out? frames status)
-          (and frames
-            (let ([frames (list-tail frames (get-frame-num))])
-              (and (not (empty? frames))
-                   (ormap (lambda (f) (not (eq? (frame->end-breakpoint-status f) 'invalid)))
-                          (rest frames))))))
-
-        (define/public suspend-gui
-          (lambda (frames status [switch-tabs? #f] [already-stopped? #f])
-            (let ([top-of-stack? (zero? (get-frame-num))]
-                  [status-message (send (get-frame) get-status-message)])
-              (set! want-suspend-on-break? #f)
-              (set-single-step?! #f)
-              (set-box! stack-frames frames)
-              (set-box! break-status status)
-              (send (send (get-frame) get-pause-button) enable #f)
-              (send (send (get-frame) get-step-button) enable top-of-stack?)
-              (send (send (get-frame) get-step-over-button) enable (can-step-over? frames status))
-              (send (send (get-frame) get-step-out-button) enable (can-step-out? frames status))
-              (send (send (get-frame) get-resume-button) enable #t)
-              (when (cons? frames)
-                (send (get-frame) register-stack-frames frames already-stopped?)
-                (send (get-frame) register-vars (list-ref frames (get-frame-num))))
-              (send status-message set-label
-                    (if (and (cons? status) top-of-stack?)
-                        (let ([expr (mark-source (first frames))])
-                          (cond
-                            ; should succeed unless the user closes a slave tab during debugging
-                            [(filename->defs (syntax-source expr))
-                             => (lambda (defs)
-                                  (clean-status
-                                   (string-append
-                                    (if (syntax-position expr)
-                                        (trim-expr-str
-                                         (send defs get-text
-                                               (sub1 (syntax-position expr))
-                                               (+ -1 (syntax-position expr) (syntax-span expr))))
-                                        "??")
-                                    " => "
-                                    (if (= 2 (length status))
-                                        (render (cadr status))
-                                        (string-append
-                                         "(values"
-                                         (let loop ([vals (rest status)])
-                                           (cond
-                                             [(cons? vals) (string-append " " (render (first vals))
-                                                                          (loop (rest vals)))]
-                                             [else ")"])))))))]
-                            [""]))
-                        ""))
-              (cond [(get-current-frame-endpoints)
-                     => (lambda (start/end)
-                          (cond [(and (first start/end) (defs-containing-current-frame))
-                                 => (lambda (defs)
-                                      (cond
-                                        [(and switch-tabs? (send defs get-filename))
-                                         => (lambda (fn) (handler:edit-file fn))])
-                                      (send defs scroll-to-position (first start/end)))]))])
-              (send (get-defs) invalidate-bitmap-cache))))
-        
-        (define/public (resume-gui)
-          (set-box! stack-frames #f)
-          (set-box! break-status #f)
-          (set-box! frame-num 0)
-          (send (send (get-frame) get-pause-button) enable #t)
-          (send (send (get-frame) get-step-button) enable #f)
-          (send (send (get-frame) get-step-over-button) enable #f)
-          (send (send (get-frame) get-step-out-button) enable #f)
-          (send (send (get-frame) get-resume-button) enable #f)
-          (send (send (get-frame) get-status-message) set-label "")
-          (send (get-frame) clear-stack-frames/vars)
-          (send (get-defs) invalidate-bitmap-cache))
-        
-        (define/public suspend
-          ;; ==called from user thread==
-          (lambda (break-handler frames [status #f])
-            ;; suspend-sema ensures that we allow only one suspended thread
-            ;;  at a time
-            (cond
-              [(semaphore-try-wait? suspend-sema)
-               (parameterize ([current-eventspace (send (get-frame) get-eventspace)])
-                 (queue-callback (lambda () (suspend-gui frames status #t))))
-               (with-handlers ([exn:break?
-                                (lambda (exn)
-                                  (let ([wait-sema (make-semaphore)])
-                                    (parameterize ([current-eventspace (send (get-frame) get-eventspace)])
-                                      (queue-callback (lambda () 
-                                                        (resume-gui)
-                                                        (semaphore-post wait-sema))))
-                                    (semaphore-wait wait-sema))
-                                  (semaphore-post suspend-sema)
-                                  (break-handler exn))])
-                 (begin0
-                   (let loop ()
-                     (sync/enable-break
-                      resume-ch (handle-evt in-user-ch (lambda (thunk)
-                                                         (thunk)
-                                                         (loop)))))
-                   (semaphore-post suspend-sema)))]
-              [(pair? status) (cdr status)]
-              [else #f])))
-        
-        (define/public (prepare-execution debug?)
-          (set! want-debug? debug?)
-          (cond
-            [debug? (send (get-frame) show-debug)]
-            [else (send (get-frame) hide-debug)
-                  (set! master this)
-                  (for-each (lambda (t) (send t prepare-execution #f)) slaves)
-                  (set! slaves empty)])
-          (set! current-language-settings (and debug? (send (get-defs) get-next-settings)))
-          (set! single-step? (box #t))
-          (set! pos-vec (make-vector (add1 (send (get-defs) last-position)) #f))
-          (set! top-level-bindings empty)
-          (set! resume-ch (make-channel))
-          (set! suspend-sema (make-semaphore 1))
-          (set! in-user-ch (make-channel))
-          (set! break-status (box #f))
-          (set! want-suspend-on-break? #f)
-          (set! stack-frames (box #f))
-          (send (get-ints) set-tab this))
-        
-        (define/augment (on-close)
-          (inner (void) on-close)
-          (set-box! closed? #t)
-          (for-each (lambda (t) (send t prepare-execution #f)) slaves))
-        
-        (define/public (hide-debug)
-          (send (get-frame) hide-debug))
-        
-        (super-new)))
-
-    ;; define icons for the tool and debug panel
-    (define debug-bitmap (compiled-bitmap (debugger-icon)))
-    (define small-debug-bitmap (compiled-bitmap (small-debugger-icon)))
-    (define over-bitmap
-      (compiled-bitmap
-        (pict->bitmap
-          (cc-superimpose (bitmap (text-icon "()" #:color syntax-icon-color))
-                          (bitmap (right-over-arrow-icon #:color run-icon-color))))))
-    (define out-bitmap
-      (compiled-bitmap
-        (pict->bitmap
-          (hc-append
-            -8
-            (bitmap (text-icon "()" #:color syntax-icon-color))
-            (bitmap (right-arrow-icon #:color run-icon-color #:height 19))))))
-
-    (define pause-bitmap (compiled-bitmap (pause-icon #:color run-icon-color)))
-    (define resume-bitmap (compiled-bitmap (play-icon #:color run-icon-color)))
-    (define step-bitmap (compiled-bitmap (step-icon #:color run-icon-color)))
-
-    (define make-pause-label (bitmap-label-maker "Pause" pause-bitmap))
-    (define make-resume-label (bitmap-label-maker "Go" resume-bitmap))
-    (define make-step-label (bitmap-label-maker "Step" step-bitmap))
-    (define make-over-label (bitmap-label-maker "Over" over-bitmap))
-    (define make-out-label (bitmap-label-maker "Out" out-bitmap))
-    
-    (define (debug-unit-frame-mixin super%)
-      (class super%
-        
-        (inherit get-button-panel
-                 get-definitions-text
-                 get-interactions-text
-                 get-menu-bar
-                 get-current-tab
-                 get-top-level-window
-                 get-eventspace)
-        
-        (define current-language-settings #f)
-        (define control-panel #f)
-        (define debug? #f)
-        (define/public (set-mouse-over-msg msg)
-          (when (not (string=? msg (send mouse-over-message get-label)))
-            (send mouse-over-message set-label msg)))
-        
-        (define/public (debug-callback)
-          (let ([tab (get-current-tab)])
-            (cond
-              [(eq? tab (send tab get-master))
-               (set! debug? #t)
-               (execute-callback)
-               (set! debug? #f)]
-              [else
-               (already-debugging tab)])))
-        
-        (define/override (execute-callback)
-          (let ([tab (get-current-tab)])
-            (cond
-              [(eq? tab (send tab get-master))
-               (send (get-current-tab) prepare-execution debug?)
-               (super execute-callback)]
-              [else
-               (already-debugging tab)])))
-        
-        (define/private (already-debugging tab)
-          (message-box
-           "Debugger"
-           (format "This file is involved in a debugging session.  To run/debug this file, finish the session for ~a and close or re-run it."
-                   (send (send (send tab get-master) get-defs) get-filename/untitled-name))
-           this '(ok)))
-        
-        (define expr-positions empty)
-        (define expr-lengths empty)
-        
-        (define/public (register-vars frame)
-          (send variables-text begin-edit-sequence)
-          (send variables-text lock #f)
-          (send variables-text delete 0 (send variables-text last-position))
-          (for-each
-           (lambda (name/value)
-             (let ([name (format "~a" (syntax-e (first name/value)))]
-                   [value (format " => ~s\n" (truncate-value (second name/value) 100 5))])
-               (send variables-text insert name)
-               (send variables-text change-style bold-sd
-                     (- (send variables-text last-position) (string-length name))
-                     (send variables-text last-position))
-               (send variables-text insert value)
-               (send variables-text change-style normal-sd
-                     (- (send variables-text last-position) (string-length value))
-                     (send variables-text last-position))))
-           (third (expose-mark frame)))
-          (send variables-text lock #t)
-          (send variables-text end-edit-sequence))
-        
-        (define/public (register-stack-frames frames already-stopped?)
-          (let* ([trimmed-exprs
-                  (map (lambda (frame)
-                         (let ([expr (mark-source frame)])
-                           (cond
-                             ; should succeed unless the user closes a slave tab during debugging
-                             [(and expr (filename->defs (syntax-source expr)))
-                              => (lambda (defs)
-                                   (trim-expr-str
-                                    (if (syntax-position expr)
-                                        (send defs get-text
-                                              (sub1 (syntax-position expr))
-                                              (+ -1 (syntax-position expr) (syntax-span expr)))
-                                        "??")
-                                    15))]
-                             ["??"])))
-                       frames)]
-                 [trimmed-lengths (map add1 (map string-length trimmed-exprs))]
-                 [positions (foldl + 0 trimmed-lengths)])
-            (send stack-frames begin-edit-sequence)
-            (send stack-frames lock #f)
-            (unless already-stopped?
-              (send stack-frames delete 0 (send stack-frames last-position))
-              (for-each (lambda (trimmed-expr)
-                          (send stack-frames insert (format "~a\n" trimmed-expr)))
-                        trimmed-exprs))
-            (send stack-frames change-style normal-sd 0 (send stack-frames last-position))
-            (send stack-frames change-style bold-sd
-                  (send stack-frames paragraph-start-position (send (get-current-tab) get-frame-num))
-                  (send stack-frames paragraph-end-position (send (get-current-tab) get-frame-num)))
-            (send stack-frames lock #t)
-            (send stack-frames end-edit-sequence)))
-        
-        (define/public (clear-stack-frames/vars)
-          (send stack-frames begin-edit-sequence)
-          (send stack-frames lock #f)
-          (send stack-frames delete 0 (send stack-frames last-position))
-          (send stack-frames lock #t)
-          (send stack-frames end-edit-sequence)
-          (send variables-text begin-edit-sequence)
-          (send variables-text lock #f)
-          (send variables-text delete 0 (send variables-text last-position))
-          (send variables-text lock #t)
-          (send variables-text end-edit-sequence))
-        
-        (define debug-grandparent-panel 'uninitialized-debug-grandparent-panel)
-        (define debug-parent-panel 'uninitialized-debug-parent-panel)
-        (define debug-panel 'uninitialized-debug-panel)
-        (define stack-view-panel 'uninitialized-stack-view-panel)
-        (define stack-frames 'uninitialized-stack-frames)
-        (define variables-text 'uninitialized-variables-text)
-        (define highlight-color (make-object color% 207 255 207))
-        (define bold-sd (make-object style-delta% 'change-weight 'bold))
-        (define normal-sd (make-object style-delta% 'change-weight 'normal))
-        (define mouse-over-frame #f)
-        (define/override (get-definitions/interactions-panel-parent)
-          (set! debug-grandparent-panel
-                (new (class panel:horizontal-dragable%
-                       (inherit get-percentages)
-                       (define/augment (get-default-percentages i)
-                         (cond
-                           [(= i 2) 
-                            (define p (preferences:get 'plt:debug-tool:stack/variable-area))
-                            (list p (- 1 p))]
-                           [else (build-list i (λ (x) (/ i)))]))
-                       (define/augment (after-percentage-change)
-                         (define ps (get-percentages))
-                         (when (= (length ps) 2)
-                           (preferences:set 'plt:debug-tool:stack/variable-area (car ps)))
-                         (inner (void) after-percentage-change))
-                       (super-new))
-                     [parent (super get-definitions/interactions-panel-parent)]))
-          (set! stack-view-panel
-                (new panel:vertical-dragable%
-                     [parent debug-grandparent-panel]
-                     [min-width 160]
-                     [stretchable-width #f]))
-          (set! stack-frames
-                (new (class text%
-                       (super-new)
-                       (inherit find-line line-start-position line-end-position
-                                change-style begin-edit-sequence end-edit-sequence
-                                lock last-position line-paragraph find-position
-                                dc-location-to-editor-location)
-                       (define highlight-defs #f)
-                       (define highlight-start #f)
-                       (define highlight-end #f)
-                       (define mouse-over-frame #f)
-                       (define/override (on-event evt)
-                         (let*-values ([(x y) (dc-location-to-editor-location
-                                               (send evt get-x) (send evt get-y))]
-                                       [(line) (find-line y)]
-                                       [(pos) (find-position x y)]
-                                       [(paragraph) (line-paragraph line)]
-                                       [(frames) (send (get-current-tab) get-stack-frames)]
-                                       [(frame) (and frames
-                                                     (> (length frames) paragraph)
-                                                     (list-ref frames paragraph))]
-                                       [(expr) (and frame (mark-source frame))])
-                           (case (send evt get-event-type)
-                             [(enter motion)
-                              (when (and mouse-over-frame (not (= paragraph mouse-over-frame)))
-                                ;; motion to different frame: unhighlight old
-                                (send highlight-defs unhighlight-range
-                                      highlight-start highlight-end highlight-color)
-                                (set! mouse-over-frame #f))
-                              (when (and expr (not (eq? mouse-over-frame paragraph)))
-                                ;; motion to frame: highlight new
-                                (cond
-                                  [(filename->defs (syntax-source expr))
-                                   => (lambda (defs)
-                                        (set! mouse-over-frame paragraph)
-                                        (set! highlight-defs defs)
-                                        (set! highlight-start (sub1 (syntax-position expr)))
-                                        (set! highlight-end (+ -1 (syntax-position expr)
-                                                               (syntax-span expr)))
-                                        (send defs highlight-range
-                                              highlight-start highlight-end highlight-color)
-                                        (cond
-                                          [(send defs get-filename)
-                                           => (lambda (fn) (handler:edit-file fn))])
-                                        (send defs scroll-to-position (syntax-position expr)))]))]
-                             [(leave)
-                              (when mouse-over-frame
-                                ;; motion to different frame: unhighlight old
-                                (send highlight-defs unhighlight-range
-                                      highlight-start highlight-end highlight-color)
-                                (set! mouse-over-frame #f))
-                              (cond
-                                [(send (get-current-tab) get-frame-num)
-                                 => (lambda (num) (send (get-current-tab) move-to-frame num))])]
-                             [(left-down)
-                              (when (and paragraph expr)
-                                (send (get-current-tab) move-to-frame paragraph))]
-                             [else (void)]))))))
-          (set! variables-text (new text% [auto-wrap #f]))
-          (let ([stack-frames-panel (make-object vertical-panel% stack-view-panel)])
-            (new message% [parent stack-frames-panel] [label "Stack"])
-            (new editor-canvas% [parent stack-frames-panel] [editor stack-frames] [style '(auto-hscroll)]))
-          (let ([variables-panel (make-object vertical-panel% stack-view-panel)])
-            (new message% [parent variables-panel] [label "Variables"])
-            (new editor-canvas% [parent variables-panel] [editor variables-text] [style '(auto-hscroll)]))
-          ;; parent of panel with debug buttons
-          (set! debug-parent-panel
-                (make-object vertical-panel% debug-grandparent-panel))
-          ;; horizontal panel with debug buttons; not vertically stretchable
-          (set! debug-panel (instantiate horizontal-panel% ()
-                              (parent debug-parent-panel)
-                              (stretchable-height #f)
-                              (alignment '(center center))
-                              (style '(border))))
-          ;; add a close button to the debug panel
-          (new close-icon%
-               [parent debug-panel]
-               [callback (λ () (send (get-current-tab) break-callback)
-                               (hide-debug))])
-          ;; hide the debug panel and stack view initially
-          (send debug-parent-panel change-children (lambda (l) null))
-          (send debug-grandparent-panel change-children (lambda (l) (remq stack-view-panel l)))
-          (make-object vertical-panel% debug-parent-panel))
-        
-        (define/public (hide-debug)
-          (when (member debug-panel (send debug-parent-panel get-children))
-            (send debug-grandparent-panel change-children
-                  (lambda (l) (remq stack-view-panel l)))
-            (send debug-parent-panel change-children
-                  (lambda (l) (remq debug-panel l)))))
-        
-        (define/public (show-debug)
-          (unless (member debug-panel (send debug-parent-panel get-children))
-            (send debug-grandparent-panel change-children
-                  (lambda (l) (append l (list stack-view-panel))))
-            (send debug-parent-panel change-children
-                  (lambda (l) (cons debug-panel l)))))
-        
-        (super-new)
-        
-        (define status-message
-          (instantiate message% ()
-            [label " "]
-            [parent debug-panel]
-            [stretchable-width #t]))
-        
-        (define debug-button
-          (new switchable-button%
-               (label (string-constant debug-tool-button-name))
-               (bitmap debug-bitmap)
-               (alternate-bitmap small-debug-bitmap)
-               (parent (new panel:horizontal-discrete-sizes%
-                            [parent (get-button-panel)]
-                            [alignment '(center center)]))
-               (callback (λ (button) (debug-callback)))))
-        (inherit register-toolbar-button)
-        (register-toolbar-button debug-button #:number 60)
-
-        (define/augment (enable-evaluation)
-          (send debug-button enable #t)
-          (inner (void) enable-evaluation))
-
-        (define/augment (disable-evaluation)
-          (send debug-button enable #f)
-          (inner (void) disable-evaluation))
-
-        (define pause-button
-          (instantiate button% ()
-            [label (make-pause-label this)]
-            [parent debug-panel]
-            [callback (lambda (button evt)
-                        (cond [(send (get-current-tab) get-stack-frames) (bell)]
-                              [else (send (get-current-tab) suspend-on-break? #t)
-                                    (send (get-current-tab) break-callback)
-                                    (send (get-current-tab) reset-offer-kill)]))]
-            [enabled #t]))
-        
-        (define resume-button
-          (instantiate button% ()
-            [label (make-resume-label this)]
-            [parent debug-panel]
-            [callback (lambda (button evt)
-                        (if (send (get-current-tab) get-stack-frames)
-                            (send (get-current-tab) resume)
-                            (bell)))]
-            [enabled #f]))
-        
-        (define step-button
-          (instantiate button% ()
-            [label (make-step-label this)]
-            [parent debug-panel]
-            [callback (lambda (btn evt)
-                        (cond [(send (get-current-tab) get-stack-frames)
-                               (send (get-current-tab) set-single-step?! #t)
-                               (send (get-current-tab) resume)]
-                              [else (bell)]))]
-            [enabled #f]))
-        
-        (define (make-big-step-callback out?)
-          (lambda (btn evt)
-            ; go through stack frames until it's possible to set a breakpoint at the end
-            (let* ([frames (list-tail (send (get-current-tab) get-stack-frames)
-                                      (send (get-current-tab) get-frame-num))]
-                   [frames (case (send (get-current-tab) get-break-status)
-                             [(entry-break) (if out? (rest frames) frames)]
-                             [else (if out? (rest frames) empty)])]
-                   [frame (ormap (lambda (f depth)
-                                   (let/ec k
-                                     (let* ([stx (mark-source f)]
-                                            [src (syntax-source stx)]
-                                            [lpos (or (syntax-position stx) (k #f))]
-                                            [pos (+ lpos (syntax-span stx) -1)]
-                                            [defs (filename->defs src)]
-                                            [tab (if defs (send defs get-tab) (k #f))]
-                                            [bps (send tab get-breakpoints)]
-                                            [cur-stat (hash-ref bps pos 'invalid)])
-                                       (case cur-stat
-                                         [(invalid) #f]
-                                         [else
-                                          (hash-set!
-                                           bps pos
-                                           (lambda ()
-                                             (and (< (length (continuation-mark-set->list
-                                                              (current-continuation-marks) debug-key)) depth)
-                                                  (begin
-                                                    (hash-set! bps pos cur-stat)
-                                                    #t))))
-                                          f]))))
-                                 frames
-                                 (let ([len (length frames)])
-                                   (build-list len (lambda (i) (- len i)))))])
-              (cond [frames (send (get-current-tab) set-single-step?! (not frame))
-                            (send (get-current-tab) resume)]
-                    [else (bell)]))))
-        
-        (define step-over-button
-          (new button%
-               [label (make-over-label this)]
-               [parent debug-panel]
-               [callback (make-big-step-callback #f)]
-               [enabled #f]))
-        
-        (define step-out-button
-          (new button%
-               [label (make-out-label this)]
-               [parent debug-panel]
-               [callback (make-big-step-callback #t)]
-               [enabled #f]))
-        
-        (define/public (get-debug-button) debug-button)
-        (define/public (get-pause-button) pause-button)
-        (define/public (get-resume-button) resume-button)
-        (define/public (get-step-button) step-button)
-        (define/public (get-step-over-button) step-over-button)
-        (define/public (get-step-out-button) step-out-button)
-        (define/public (get-status-message) status-message)
-        
-        (define mouse-over-message
-          (instantiate message% ()
-            [label " "] [parent debug-panel] [stretchable-width #t]))
-        
-        (define/augment (on-tab-change old new)
-          (check-current-language-for-debugger)
-          (if (send new debug?)
-              (let ([status (send new get-break-status)])
-                (if status
-                    (send new suspend-gui (send new get-stack-frames) status #f #t)
-                    (send new resume-gui))
-                (show-debug))
-              (hide-debug))
-          (inner (void) on-tab-change old new))
-        
-        (define/public (check-current-language-for-debugger)
-          (let* ([settings (send (get-definitions-text) get-next-settings)]
-                 [lang (drscheme:language-configuration:language-settings-language settings)]
-                 [visible? (and (send lang capability-value 'gui-debugger:debug-button)
-                                (not (is-a? lang drscheme:module-language:module-language<%>)) ;; the opt-out button handles this language
-                                (not (debugger-does-not-work-for?
-                                      (extract-language-level settings))))])
-            (if visible?
-                (unless (send debug-button is-shown?)
-                  (send (send debug-button get-parent) add-child debug-button))
-                (when (send debug-button is-shown?)
-                  (send (send debug-button get-parent) delete-child debug-button)))))
-        
-        (send (get-button-panel) change-children
-              (lambda (children)
-                (cons (send debug-button get-parent)
-                      (remq (send debug-button get-parent) children))))
-        
-        ; hide debug button if it's not supported for the initial language:
-        (check-current-language-for-debugger)))
-    (drscheme:language:register-capability 'gui-debugger:debug-button (flat-contract boolean?) #t)
-    (drscheme:get/extend:extend-definitions-text debug-definitions-text-mixin)
-    (drscheme:get/extend:extend-interactions-text debug-interactions-text-mixin)
-    (drscheme:get/extend:extend-unit-frame debug-unit-frame-mixin)
-    (drscheme:get/extend:extend-tab debug-tab-mixin)))
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/clanbomber-16x16.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/clanbomber-16x16.png
deleted file mode 100644
index f507590063..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/clanbomber-16x16.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/clanbomber-32x32.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/clanbomber-32x32.png
deleted file mode 100644
index f1f4ea79ed..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/clanbomber-32x32.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/down.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/down.png
deleted file mode 100644
index 8d9466a664..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/down.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/emblem-ohno.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/emblem-ohno.png
deleted file mode 100644
index f684a453f2..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/emblem-ohno.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/icon.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/icon.png
deleted file mode 100644
index 94f0f0bec5..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/icon.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/icon2.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/icon2.png
deleted file mode 100644
index 6a48b00815..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/icon2.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/no.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/no.png
deleted file mode 100644
index 6f16ff9c49..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/no.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/pause.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/pause.png
deleted file mode 100644
index 29f8e10d07..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/pause.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/resume.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/resume.png
deleted file mode 100644
index 7670630e84..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/resume.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/step-out2.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/step-out2.png
deleted file mode 100644
index b57e03ebd8..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/step-out2.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/step-over2.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/step-over2.png
deleted file mode 100644
index 00804e73fd..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/step-over2.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/step.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/step.png
deleted file mode 100644
index feb20ab7c3..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/step.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/stock_macro-check-brackets-16.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/stock_macro-check-brackets-16.png
deleted file mode 100644
index 98dcd84a30..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/stock_macro-check-brackets-16.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/stock_macro-check-brackets.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/stock_macro-check-brackets.png
deleted file mode 100644
index 4c88dabf80..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/stock_macro-check-brackets.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/up.png b/pkgs/drracket-pkgs/drracket/gui-debugger/icons/up.png
deleted file mode 100644
index ae95b6517b..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/gui-debugger/icons/up.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/info.rkt b/pkgs/drracket-pkgs/drracket/gui-debugger/info.rkt
deleted file mode 100644
index 3d2d48c146..0000000000
--- a/pkgs/drracket-pkgs/drracket/gui-debugger/info.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang info
-
-(define tools '(("debug-tool.rkt")))
-(define tool-names '("Graphical Debugger"))
-(define tool-icons '(("bomb-32x32.png" "icons")))
-
-(define test-responsibles '((all (gmarceau mflatt))))
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/load-sandbox.rkt b/pkgs/drracket-pkgs/drracket/gui-debugger/load-sandbox.rkt
deleted file mode 100644
index 17806a09bc..0000000000
--- a/pkgs/drracket-pkgs/drracket/gui-debugger/load-sandbox.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang mzscheme
-  
-  (require syntax/moddep
-           mzlib/class
-           racket/private/namespace
-           mred)  
-  
-  (provide eval/annotations
-           require/annotations
-           require/sandbox+annotations
-           load-module/annotate)
-
-  ;; Like REQUIRE/ANNOTATIONS but the evaluation happens under the given
-  ;; custodian and the given error display handler.
-  (define (require/sandbox+annotations custodian err-display-handler initial-module annotate-module? annotator)
-    (parameterize ([current-custodian custodian]
-                   [current-namespace (make-gui-namespace)]
-                   [error-display-handler err-display-handler])
-      (require/annotations initial-module annotate-module? annotator)))
-
-
-  ;; Like EVAL/ANNOTATION, but loads the required spec INITIAL-MODULE using EVAL.
-  (define (require/annotations initial-module annotate-module? annotator)
-    (eval/annotations #`(require #,initial-module) annotate-module? annotator))
-
-  ;; Evaluates STX. For each module loaded during the evaluation,
-  ;; ANNOTATE-MODULE? is queried, if it returns true, ANNOTATOR is ran on the
-  ;; expanded module being loaded, and the return value is loaded instead.
-  (define (eval/annotations stx annotate-module? annotator)
-    (parameterize
-      ([current-load/use-compiled
-        (let ([ocload/use-compiled (current-load/use-compiled)])
-          (lambda (fn m)
-            (cond [(annotate-module? fn m)
-                   (load-module/annotate annotator fn m)]
-                  [else
-                   (ocload/use-compiled fn m)])))])
-      (eval-syntax (annotator stx))))
-  
-  ;; Loads the file FN expecting a definition for a module called M.  The
-  ;; code read from the file is expanded, then it is annotated using the
-  ;; ANNOTATOR function, then it is evaluated
-  (define (load-module/annotate annotator fn m)
-    (let-values ([(base _ __) (split-path fn)]
-                 [(in-port src) (build-input-port fn)])
-      (dynamic-wind
-       (lambda () (void))
-       
-       (lambda ()
-         (parameterize ([read-accept-compiled #f]
-                        [current-load-relative-directory base])
-           (unless m (raise 'module-name-not-passed-to-load-module/annotate))
-           (with-module-reading-parameterization
-            (lambda ()
-              (let* ([first (parameterize ([current-namespace (make-base-namespace)])
-                              (expand (read-syntax src in-port)))]
-                     [module-ized-exp (annotator (check-module-form first m fn))]
-                     [second (read in-port)])
-                (unless (eof-object? second)
-                  (raise-syntax-error
-                   'load-module/annotate
-                   (format "expected only a `module' declaration for `~s', but found an extra expression" m)
-                   second))
-                (eval module-ized-exp))))))
-       
-       (lambda () (close-input-port in-port)))))
-  
-  
-  
-  ; taken directly from mred.rkt -- it's not exported...
-  (define (build-input-port filename)
-    (let ([p (open-input-file filename)])
-      (port-count-lines! p)
-      (let ([p (cond [(regexp-match-peek "^WXME01[0-9][0-9] ## " p)
-                      (let ([t (make-object text%)])
-                        (send t insert-file p 'standard)
-                        (close-input-port p)
-                        (open-input-text-editor t))]
-                     [else p])])
-        (port-count-lines! p)
-        (values p filename))))
-
diff --git a/pkgs/drracket-pkgs/drracket/gui-debugger/marks.rkt b/pkgs/drracket-pkgs/drracket/gui-debugger/marks.rkt
deleted file mode 100644
index 8ca61133b6..0000000000
--- a/pkgs/drracket-pkgs/drracket/gui-debugger/marks.rkt
+++ /dev/null
@@ -1,182 +0,0 @@
-(module marks scheme/base
-
-  (require mzlib/list
-	   mzlib/contract
-           (prefix-in mz: mzscheme))
-
-  (define-struct full-mark-struct (module-name source label bindings values))
-
-  ; CONTRACTS
-  (define mark? (-> ; no args  
-                 full-mark-struct?))
-  (define mark-list? (listof procedure?))
-  
-  (provide/contract 
-   ;[make-debug-info (-> any? binding-set? varref-set? any? boolean? syntax?)] ; (location tail-bound free label lifting? -> mark-stx)
-   [expose-mark (-> mark? (list/c any/c symbol? (listof (list/c identifier? any/c))))]
-   ;[make-top-level-mark (syntax? . -> . syntax?)]
-   [lookup-all-bindings ((identifier? . -> . boolean?) mark-list? . -> . (listof any/c))]
-   [lookup-first-binding ((identifier? . -> . boolean?) mark-list? ( -> any) . -> . any)]
-   [lookup-binding (mark-list? identifier? . -> . any)])
-  
-  (mz:provide
-   make-debug-info
-   assemble-debug-info
-   wcm-wrap
-   skipto-mark?
-   skipto-mark
-   strip-skiptos
-   mark-list?
-   mark-module-name
-   mark-source
-   mark-bindings
-   mark-label
-   mark-binding-value
-   mark-binding-binding
-   mark-binding-set!
-   display-mark
-   all-bindings
-   #;lookup-binding-list
-   debug-key
-   extract-mark-list
-   make-normal-breakpoint-info normal-breakpoint-info-mark-list normal-breakpoint-info-kind
-   make-error-breakpoint-info error-breakpoint-info-message
-   (struct breakpoint-halt ())
-   make-expression-finished expression-finished-returned-value-list)
-  
-  ; BREAKPOINT STRUCTURES
-  
-  (define-struct normal-breakpoint-info (mark-list kind))
-  (define-struct error-breakpoint-info (message))
-  (define-struct breakpoint-halt ())
-  (define-struct expression-finished (returned-value-list))
-  
-  (define-struct skipto-mark-struct ())
-  (define skipto-mark? skipto-mark-struct?)
-  (define skipto-mark (make-skipto-mark-struct))
-  (define (strip-skiptos mark-list)
-    (filter (lambda (x) (#%plain-app not (skipto-mark? x))) mark-list))
-  
-    
-  ; debug-key: this key will be used as a key for the continuation marks.
-  (define-struct debug-key-struct ())
-  (define debug-key (make-debug-key-struct))
-  
-  (define (extract-mark-list mark-set)
-    (strip-skiptos (continuation-mark-set->list mark-set debug-key)))
-   
-  
-  ; the 'varargs' creator is used to avoid an extra cons cell in every mark:
-  (define (make-make-full-mark-varargs module-name source label bindings)
-    (lambda (values)
-      (make-full-mark-struct module-name source label bindings values)))
-  
-  ; see module top for type
-  (define (make-full-mark module-name source label bindings assembled-info-stx)
-    (mz:datum->syntax-object #'here `(#%plain-lambda () 
-                                       (#%plain-app 
-                                        ,(make-make-full-mark-varargs module-name source label bindings)
-                                        ,assembled-info-stx))))
-  
-  (define (mark-module-name mark)
-    (full-mark-struct-module-name (mark)))
-  
-  (define (mark-source mark)
-    (full-mark-struct-source (mark)))
-    
-  ; : identifier -> identifier
-  (define (make-mark-binding-stx id)
-    #`(case-lambda
-        [() #,id]
-        [(v) (set! #,id v)]))
-  
-  (define (mark-bindings mark)
-    (map list 
-         (full-mark-struct-bindings (mark)) 
-         (full-mark-struct-values (mark))))
-  
-  (define (mark-label mark)
-    (full-mark-struct-label (mark)))
-  
-  (define (mark-binding-value mark-binding)
-    ((cadr mark-binding)))
-  
-  (define (mark-binding-binding mark-binding)
-    (car mark-binding))
-
-  (define (mark-binding-set! mark-binding v)
-    ((cadr mark-binding) v))
-  
-  (define (expose-mark mark)
-    (let ([source (mark-source mark)]
-          [label (mark-label mark)]
-          [bindings (mark-bindings mark)])
-      (list source
-            label
-            (map (lambda (binding)
-                   (list (mark-binding-binding binding)
-                         (mark-binding-value binding)))
-                 bindings))))
-  
-  (define (display-mark mark)
-    (apply
-     string-append
-     (format "source: ~a\n" (mz:syntax-object->datum (mark-source mark)))
-     (format "label: ~a\n" (mark-label mark))
-     (format "bindings:\n")
-     (map (lambda (binding)
-                 (format " ~a : ~a\n" (syntax-e (mark-binding-binding binding))
-                         (mark-binding-value binding)))
-               (mark-bindings mark))))
-  
-  
-  ; possible optimization: rig the mark-maker to guarantee statically that a
-  ; variable can occur at most once in a mark.  
-  
-  (define (binding-matches matcher mark)
-    (filter (lambda (binding-pair) (matcher (mark-binding-binding binding-pair))) (mark-bindings mark)))
-  
-  (define (lookup-all-bindings matcher mark-list)
-    (apply append (map (lambda (m) (binding-matches matcher m)) mark-list)))
-  
-  (define (lookup-first-binding matcher mark-list fail-thunk)
-    (let ([all-bindings (lookup-all-bindings matcher mark-list)])
-      (if (null? all-bindings)
-          (fail-thunk)
-          (car all-bindings))))
-  
-  (define (lookup-binding mark-list id)
-    (mark-binding-value
-     (lookup-first-binding (lambda (id2) (mz:module-identifier=? id id2)) 
-                           mark-list 
-                           (lambda ()
-                             (error 'lookup-binding "variable not found in environment: ~a\n" (if (syntax? id) 
-                                                                                                  (mz:syntax-object->datum id)
-                                                                                                  id))))))
-  
-  (define (all-bindings mark)
-    (map mark-binding-binding (mark-bindings mark)))
-  
-  (define (wcm-wrap debug-info expr)
-    (quasisyntax/loc expr (with-continuation-mark #,debug-key #,debug-info #,expr)))
-
-  
-  ; DEBUG-INFO STRUCTURES
-  
-  ;;;;;;;;;;
-  ;;
-  ;; make-debug-info builds the thunk which will be the mark at runtime.  It contains 
-  ;; a source expression and a set of binding/value pairs.
-  ;; (syntax-object BINDING-SET VARREF-SET any boolean) -> debug-info)
-  ;;
-  ;;;;;;;;;;
-     
-  (define (make-debug-info module-name source tail-bound free-vars label lifting? assembled-info-stx)
-    (make-full-mark module-name source label free-vars assembled-info-stx))
-  
-  (define (assemble-debug-info tail-bound free-vars label lifting?)
-    (map make-mark-binding-stx free-vars))
-  
-  #;
-  (define (make-top-level-mark source-expr)
-    (make-full-mark source-expr 'top-level null)))
diff --git a/pkgs/drracket-pkgs/drracket/help/bug-report.rkt b/pkgs/drracket-pkgs/drracket/help/bug-report.rkt
deleted file mode 100644
index 7a7232bd9e..0000000000
--- a/pkgs/drracket-pkgs/drracket/help/bug-report.rkt
+++ /dev/null
@@ -1,337 +0,0 @@
-#lang racket/base
-(require string-constants
-         net/head
-         racket/gui/base
-         framework
-         racket/class
-         racket/port
-         net/url
-         net/uri-codec
-         browser/htmltext
-         "private/bug-report-controls.rkt"
-         "private/buginfo.rkt"
-         "private/save-bug-report.rkt")
-
-(provide help-desk:report-bug
-         (struct-out brinfo)
-         saved-bug-report-titles/ids
-         unsave-bug-report
-         discard-all-saved-bug-reports)
-
-(define (bug-server-url path)
-  (string->url (string-append "http://bugs.racket-lang.org/" path)))
-(define bug-report-url   (bug-server-url "bug-report.cgi"))
-(define captcha-text-url (bug-server-url "captcha-text"))
-(define (get-captcha-text)
-  (let* ([s (port->string (get-pure-port captcha-text-url))]
-         [s (regexp-replace #px"^\\s+" s "")]
-         [s (regexp-replace #px"\\s+$" s "")]
-         [s (if (<= (string-length s) 200)
-                s
-                (substring s 0 200))])
-    (and ((string-length s) . > . 0) s)))
-
-(preferences:set-default 'drracket:email "" string? #:aliases '(drscheme:email))
-(preferences:set-default 'drracket:full-name "" string? #:aliases '(drscheme:full-name))
-
-(define open-frames '())
-
-(define (discard-all-saved-bug-reports)
-  (discard-all-except 
-   (λ (id) (ormap (λ (frame) (equal? (send frame get-bug-id) id))
-                  open-frames))))
-
-(define (help-desk:report-bug [this-bug-id #f] #:frame-mixin [frame-mixin values])
-  (cond
-    [this-bug-id
-     (let loop ([open-frames open-frames])
-       (cond
-         [(null? open-frames)
-          (report-bug/new-frame this-bug-id frame-mixin)]
-         [else
-          (let ([open-frame (car open-frames)])
-            (if (= (send open-frame get-bug-id) this-bug-id)
-                (send open-frame show #t)
-                (loop (cdr open-frames))))]))]
-    [else
-     (report-bug/new-frame this-bug-id frame-mixin)]))
-
-(define (report-bug/new-frame this-bug-id frame-mixin)
-  (define bug-frame%
-    (frame-mixin
-     (class (frame:standard-menus-mixin frame:basic%)
-       (init title)
-       (init-field bug-id)
-       (define/public (get-bug-id) (and editing? bug-id))
-       
-       (define editing? #t)
-       (define/public (no-longer-editing) (set! editing? #f))
-       (define close-box-clicked? #t)
-       (define/public (set-close-box-not-clicked) (set! close-box-clicked? #f))
-       (define/augment (can-close?)
-         (cond
-           [close-box-clicked?
-            (cond
-              [(eq? (send single active-child) finished-panel)
-               #t]
-              [(empty-bug-report?)
-               (no-more-saving)
-               (unsave-bug-report bug-id)
-               (set! editing? #f)]
-              [else
-               (define user-choice
-                 (message-box/custom (string-constant cancel-bug-report?)
-                                     (string-constant do-you-want-to-discard-or-save-this-bug-report)
-                                     (string-constant save)
-                                     (string-constant cancel)
-                                     (string-constant discard)
-                                     this
-                                     '(default=1)
-                                     1))
-               (case user-choice
-                 [(1) #t] ;; saving happens automatically
-                 [(2) #f]
-                 [(3) 
-                  (no-more-saving)
-                  (unsave-bug-report bug-id)
-                  (set! editing? #f)
-                  #t])])]
-           [else #t]))
-       (define/augment (on-close)
-         (inner (void) on-close)
-         (set! open-frames (remq this open-frames)))
-       (super-make-object title)
-       (set! open-frames (cons this open-frames))
-       
-       ;; a bunch of stuff we don't want
-       (define/override (file-menu:between-print-and-close menu) (void))
-       (define/override (edit-menu:between-find-and-preferences menu) (void))
-       (define/override (file-menu:create-open?)        #f)
-       (define/override (file-menu:create-open-recent?) #f)
-       (define/override (file-menu:create-new?)         #f)
-       (define/override (file-menu:create-save?)        #f)
-       (define/override (file-menu:create-revert?)      #f))))
-
-  (define init-bug-report (if this-bug-id
-                              (lookup-bug-report this-bug-id)
-                              (register-new-bug-id)))
-  (define bug-frame (new bug-frame% 
-                         [bug-id (saved-report-id init-bug-report)]
-                         [title (string-constant bug-report-form)]))
-  (define single (new panel:single% (parent (send bug-frame get-area-container))))
-  (define compose-panel (make-object vertical-panel% single))
-  
-  (define cancel-kill-cust #f)
-  
-  (define-values (compose-view-focus get-query sanity-checking no-more-saving empty-bug-report?)
-    (add-bug-report-controls compose-panel
-                             init-bug-report
-                             (λ () (ok))
-                             (λ () (cancel))
-                             (λ () (close-and-save))))
-  
-  (define pending-panel (new vertical-panel% (parent single)))
-  (define pending-text (new html-text% (auto-wrap #t)))
-  (define (reset-pending-text)
-    (with-pending-text
-     (λ ()
-       (send pending-text erase)
-       (render-html-to-text ; hack to get nice text in
-        (open-input-string
-         "&nbsp;<br><br><br><br><br><div align=\"center\"><h2><b>Submitting bug report...</b></h2></div>")
-        pending-text #t #f))))
-  (define (with-pending-text t)
-    (send pending-text begin-edit-sequence)
-    (send pending-text lock #f)
-    (t)
-    (send pending-text lock #t)
-    (send pending-text end-edit-sequence))
-
-  (define pending-ec (new editor-canvas% [parent pending-panel] [editor pending-text]))
-  (send pending-ec allow-tab-exit #t)
-
-  (define pending-button-panel (new horizontal-panel%
-                                     [stretchable-height #f]
-                                     [parent pending-panel]
-                                     [alignment '(right center)]))
-  (define pending-back (new button%
-                            [parent pending-button-panel]
-                            [callback (λ (x y) (switch-to-compose-view))]
-                            [label (string-constant dialog-back)]))
-  (define pending-abort (new button%
-                             [parent pending-button-panel]
-                             [callback (lambda (x y) (custodian-shutdown-all cancel-kill-cust))]
-                             [label (string-constant abort)]))
-  (new grow-box-spacer-pane% [parent pending-button-panel])
-
-  (define finished-panel (new vertical-panel% [parent single]))
-  (define finished-ec (new editor-canvas% (parent finished-panel)))
-  (send finished-ec allow-tab-exit #t)
-  (define finished-button-panel (new horizontal-panel% 
-				     [stretchable-height #f]
-				     [parent finished-panel]
-				     [alignment '(right center)]))
-  (define finished-close (new button%
-			      [parent finished-button-panel]
-			      [enabled #t]
-			      [label (string-constant close)]
-                              [callback
-			       (lambda (x y)
-                                 (send bug-frame set-close-box-not-clicked)
-                                 (send bug-frame close))]))
-  (new grow-box-spacer-pane% [parent finished-button-panel])
-  
-  (define (init-pending-view)
-    (reset-pending-text)
-    (send pending-back enable #f)
-    (send pending-abort enable #t)
-    (send single active-child pending-panel))
-
-  (define (switch-to-compose-view)
-    (send single active-child compose-panel)
-    (compose-view-focus))
-  
-  ;; important that you cannot go back from this view, 
-  ;; or else that might trigger saving the bug report in the preferences 
-  ;; (but when you're here the bug report should be successfully submitted)
-  (define (switch-to-finished-view finished-text)
-    (send finished-ec set-editor finished-text)
-    (unsave-bug-report (saved-report-id init-bug-report))
-    (send single active-child finished-panel)
-    (send finished-close focus))
-
-  ;; send-bug-report : (-> void)
-  ;; initiates sending the bug report and switches the GUI's mode
-  (define (send-bug-report)
-    (set! cancel-kill-cust (make-custodian))
-    (define response-chan (make-channel))
-    (define exn-chan (make-channel))
-    (define starter-query (get-query))
-    (define worker-thread
-      (parameterize ([current-custodian cancel-kill-cust]
-                     [current-alist-separator-mode 'amp])
-        (thread
-         (λ ()
-           (with-handlers ([exn:fail? (λ (x) (channel-put exn-chan x))])
-             ;; Note that this UI is not great: every submission asks for a
-             ;; captcha and nothing is kept.  This is fine since this is only in
-             ;; case it needs to be used in the future -- if/when that happens,
-             ;; the code can be improved to remember some of it, and the server
-             ;; can have some better policy to send the same captcha to the same
-             ;; client.  So the only case where you'd suffer the bad UI is if a
-             ;; captcha is added *and* you have this version of the code (which
-             ;; will be outdated by that time).
-             (define captcha-question (get-captcha-text))
-             (define captcha-answer
-               (and captcha-question
-                    (get-text-from-user
-                     "Are you human?" ; FIXME: use string-constant
-                     captcha-question 
-                     bug-frame)))
-             (define post-data
-               (let* ([q (if captcha-answer
-                             `([captcha . ,captcha-answer]
-                               ;; send back the question too: if things get really
-                               ;; bad, then the server can make up random captchas
-                               ;; and check the reply against the challenge that
-                               ;; was used
-                               [captcha-question . ,captcha-question]
-                               ,@starter-query)
-                             starter-query)])
-                 (string->bytes/utf-8 (alist->form-urlencoded q))))
-
-             (call/input-url
-              bug-report-url
-              (lambda (x) (post-impure-port x post-data))
-              (lambda (port)
-                (define error?
-                  (cond [(regexp-match #rx"^HTTP/[0-9.]+ +([0-9]+) *(.*)$"
-                                       (read-line port 'any))
-                         => (lambda (m)
-                              ;; ignore the status text -- the reply should
-                              ;; have a better indication of what went wrong
-                              ((string->number (cadr m)) . >= . 400))]
-                        [else #f]))
-                ;; skip HTTP headers
-                (regexp-match-positions #rx"\r?\n\r?\n" port)
-                (if error?
-                  ;; error status => show as error
-                  (begin (with-pending-text
-                          (λ ()
-                            (send pending-text erase)
-                            (render-html-to-text port pending-text #t #f)))
-                         (channel-put exn-chan #f)) ; #f = "already rendered"
-                  ;; (hopefully) a good result
-                  (let ([response-text (new html-text%)])
-                    (render-html-to-text port response-text #t #f)
-                    (send response-text auto-wrap #t)
-                    (send response-text lock #t)
-                    (channel-put response-chan response-text))))))))))
-    (define (render-error to-render)
-      (cond
-        [(string? to-render)
-         (let ([str (string-append "<pre>\n\nERROR:\n"to-render"\n</pre>\n")])
-           (render-error (open-input-string str)))]
-        [(exn? to-render)
-         (define sp (open-output-string))
-         (fprintf sp "~a\n" (exn-message to-render))
-         (for ([x (in-list (continuation-mark-set->context
-                            (exn-continuation-marks to-render)))])
-           (fprintf sp "  ~s\n" x))
-         (render-error (get-output-string sp))]
-        [(or (input-port? to-render) (not to-render))
-         (queue-callback
-          (λ ()
-            (when to-render
-              (with-pending-text
-               (λ () (render-html-to-text to-render pending-text #t #f))))
-            (send pending-back enable #t)
-            (send pending-abort enable #f)))]
-        [else (error 'render-error "internal error")]))
-
-    (thread
-     (λ ()
-       (sync (handle-evt exn-chan render-error)
-             (handle-evt (thread-dead-evt worker-thread)
-                         (λ (_) (render-error "reporting process killed")))
-             (handle-evt response-chan
-                         (λ (finished-text)
-                           (queue-callback
-                            (λ ()
-                              (switch-to-finished-view finished-text))))))))
-
-    (init-pending-view))
-
-  (define (ok)
-    (when (sanity-checking)
-      (send-bug-report)))
-  
-  (define (cancel)
-    (when (or (empty-bug-report?)
-              (ask-yes-or-no (string-constant cancel-bug-report?)
-                             (string-constant are-you-sure-cancel-bug-report?)
-                             bug-frame))
-      (unsave-bug-report (saved-report-id init-bug-report))
-      (send bug-frame set-close-box-not-clicked)
-      (send bug-frame close)))
-  
-  (define (close-and-save)
-    (send bug-frame set-close-box-not-clicked)
-    (send bug-frame close))
-  
-  ;; Currently, the help-menu is left empty
-  (frame:remove-empty-menus bug-frame)
-  
-  (switch-to-compose-view)
-  
-  (send bug-frame show #t))
-
-(define html-text% (text:hide-caret/selection-mixin (html-text-mixin text:basic%)))
-
-(define (ask-yes-or-no title msg parent)
-  (gui-utils:get-choice msg 
-                        (string-constant yes)
-                        (string-constant no)
-                        title
-                        #f
-                        parent))
diff --git a/pkgs/drracket-pkgs/drracket/help/bug-report.scrbl b/pkgs/drracket-pkgs/drracket/help/bug-report.scrbl
deleted file mode 100644
index 73fdd63992..0000000000
--- a/pkgs/drracket-pkgs/drracket/help/bug-report.scrbl
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang scribble/manual
-@(require (for-label racket
-                     help/search
-                     help/bug-report
-                     help/help-utils))
-
-@title{Bug Reporting}
-@defmodule[help/bug-report]
-
-@defproc[(help-desk:report-bug [this-bug-id #f (or/c #f exact-positive-integer?)] 
-                               [#:frame-mixin 
-                                frame-mixin
-                                (make-mixin-contract frame%)
-                                values])
-         void?]{
-  Opens a bug report window to edit the bug report identified by @racket[this-bug-id].
-  If @racket[this-bug-id] is @racket[#f], then creates a new bug ID and uses that one.
-  
-  The @racket[frame-mixin] argument is passed the frame class before creating the window.
-}
-
-@defproc[(saved-bug-report-titles/ids) (listof brinfo?)]{
-  Returns a list of the saved bug reports.
-}
-
-@defproc[(discard-all-saved-bug-reports) void?]{
-  Deletes all of the saved bug reports, except those currently
-  open in frames.
-}
-
-@defproc[(unsave-bug-report [bug-id exact-positive-integer?]) void?]{
-  Deletes the saved bug report identified by @racket[bug-id].
-}
-
-@defstruct[brinfo ([title label-string?]
-                   [id number?]) #:transparent]{
-  A record representing a saved bug report. The @racket[id] field is suitable
-  for use with @racket[help-desk:report-bug], and the @racket[label] field
-  is suitable for use in a GUI control.
-}
diff --git a/pkgs/drracket-pkgs/drracket/help/info.rkt b/pkgs/drracket-pkgs/drracket/help/info.rkt
deleted file mode 100644
index 474170bc61..0000000000
--- a/pkgs/drracket-pkgs/drracket/help/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("bug-report.scrbl")))
diff --git a/pkgs/drracket-pkgs/drracket/help/private/bug-report-controls.rkt b/pkgs/drracket-pkgs/drracket/help/private/bug-report-controls.rkt
deleted file mode 100644
index 88eaaa7498..0000000000
--- a/pkgs/drracket-pkgs/drracket/help/private/bug-report-controls.rkt
+++ /dev/null
@@ -1,449 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class
-         racket/contract
-         racket/pretty
-         string-constants/string-constant
-         setup/dirs
-         setup/link
-         framework
-         pkg
-         (for-syntax racket/base
-                     racket/list)
-         "buginfo.rkt"
-         "save-bug-report.rkt")
-
-(provide/contract
- [add-bug-report-controls
-  (-> (is-a?/c area-container<%>) 
-      saved-report?
-      (-> any)
-      (-> any)
-      (-> any)
-      any)])
-
-(define (add-bug-report-controls compose-panel init-bug-report ok cancel close-and-save)
-  (define top-panel (make-object vertical-panel% compose-panel))
-  
-  (define lps null)
-  
-  ; build/label : ((union string (list-of string))
-  ;                (area-container<%> -> item<%>) 
-  ;                boolean
-  ;                area-container<%>
-  ;             -> item<%>)
-  ; constructs and arranges the gui objects for the bug report form
-  ; effect: updates lps with the new label panel, for future alignment
-  (define (build/label text make-item top? #:stretch? [stretch? #f] #:top-panel [top-panel top-panel] #:vertical? [vertical? #f])
-    (define hp (make-object (if vertical?
-                                vertical-panel%
-                                horizontal-panel%)
-                 top-panel))
-    (define lp (make-object vertical-panel% hp))
-    (define ip (make-object vertical-panel% hp))
-    (if (string? text)
-        (make-object message% text lp)
-        (map (lambda (s)
-               (make-object message% s lp))
-             text))
-    (define item (make-item ip))
-    (set! lps (cons lp lps))
-    (unless stretch? 
-      (send hp stretchable-height #f)
-      (send lp stretchable-height #f)
-      (send ip stretchable-height #f))
-    (send lp stretchable-width #f)
-    (send lp stretchable-height #f)
-    (send lp set-alignment (if vertical? 'left 'right) (if top? 'top 'center))
-    (send ip set-alignment 'left 'top)
-    item)
-  
-  (define (align-labels)
-    (send synthesized-dialog reflow-container)
-    (send compose-panel reflow-container)
-    (let ([width (apply max (map (lambda (x) (send (car (send x get-children)) get-width))
-                                 lps))])
-      (for ([x (in-list lps)])
-        (send x min-width width)))) 
-  
-  (define name
-    (build/label 
-     (string-constant bug-report-field-name)
-     (lambda (panel)
-       (keymap:call/text-keymap-initializer
-        (lambda ()
-          (make-object text-field% #f panel
-            (lambda (text event)
-              (preferences:set 'drracket:full-name (send text get-value)))
-            (preferences:get 'drracket:full-name)))))
-     #f))
-  
-  (define email  
-    (build/label
-     (string-constant bug-report-field-email)
-     (lambda (panel)
-       (keymap:call/text-keymap-initializer
-        (lambda ()
-          (make-object text-field% #f panel
-            (lambda (text event)
-              (preferences:set 'drracket:email (send text get-value)))
-            (preferences:get 'drracket:email)))))
-     #f))
-  
-  (define summary
-    (build/label
-     (string-constant bug-report-field-summary) 
-     (lambda (panel)
-       (keymap:call/text-keymap-initializer
-        (lambda ()
-          (define tf (new text-field%
-                          [label #f]
-                          [parent panel]
-                          [callback (λ (a b) (bug-report-out-of-date))]))
-          (send tf set-value (saved-report-lookup init-bug-report 'subject))
-          tf)))
-     #f))
-  
-  (define severity
-    (build/label 
-     (string-constant bug-report-field-severity) 
-     (lambda (panel)
-       (define choice
-         (make-object choice% 
-           #f
-           bug-severities
-           panel
-           (λ (a b) (bug-report-out-of-date))))
-       (send choice set-string-selection (saved-report-lookup init-bug-report 'severity))
-       choice)
-     #f))
-  
-  (define bug-class
-    (build/label
-     (string-constant bug-report-field-class)
-     (lambda (panel)
-       (define choice (make-object choice%
-                        #f
-                        (map car bug-classes)
-                        panel
-                        (λ (a b) (bug-report-out-of-date))))
-       (send choice set-string-selection 
-             (saved-report-lookup init-bug-report 'class))
-       choice)
-     #f))
-  
-  (define save-text%
-    (class text:basic%
-      (define initialized? #f)
-      (define/public (initialized) (set! initialized? #t))
-      (define/augment (after-insert a b)
-        (when initialized?
-          (bug-report-out-of-date))
-        (inner (void) after-insert a b))
-      (define/augment (after-delete a b)
-        (when initialized?
-          (bug-report-out-of-date))
-        (inner (void) after-delete a b))
-      (super-new)))
-  
-  (define (make-big-text label #:key [key #f] #:stretch? [stretch? #f] #:top-panel [top-panel top-panel] #:vertical? [vertical? #f])
-    (let ([canvas 
-           (build/label 
-            label 
-            (lambda (panel)
-              (let* ([text (new (editor:standard-style-list-mixin
-                                 (editor:keymap-mixin
-                                  (if key
-                                      save-text%
-                                      text:basic%))))]
-                     [canvas (new canvas:basic% 
-                                  (style '(hide-hscroll))
-                                  (parent panel) 
-                                  (editor text))])
-                (send text set-paste-text-only #t)
-                (send text auto-wrap #t)
-                (send text set-max-undo-history 'forever)
-                (send text set-styles-fixed #t)
-                (when key 
-                  (send text insert (saved-report-lookup init-bug-report key))
-                  (send text set-position 0 0)
-                  (send text initialized))
-                canvas))
-            #t
-            #:stretch? stretch?
-            #:top-panel top-panel
-            #:vertical? vertical?)])
-      (send canvas min-width 500)
-      (send canvas min-height 130)
-      (send canvas get-editor)
-      (send canvas allow-tab-exit #t)
-      canvas))
-  
-  (define description (make-big-text (string-constant bug-report-field-description)
-                                     #:key 'description
-                                     #:stretch? #t))
-  (define reproduce (make-big-text (list (string-constant bug-report-field-reproduce1)
-                                         (string-constant bug-report-field-reproduce2))
-                                   #:key 'how-to-repeat
-                                   #:stretch? #t))
- 
-  (define synthesized-dialog (make-object dialog% (string-constant bug-report-synthesized-information)))
-  (define synthesized-panel (make-object vertical-panel% synthesized-dialog))
-  (define synthesized-button-panel
-    (new horizontal-panel% [parent synthesized-dialog]
-         [alignment '(right center)] [stretchable-height #f]))
-  (define synthesized-ok-button (make-object button% (string-constant ok) synthesized-button-panel
-                                  (lambda (x y)
-                                    (send synthesized-dialog show #f))))
-  (define synthesized-info-shown? #t)
-  (define (show-synthesized-info)
-    (send synthesized-dialog show #t))
-  
-  (define version-tf
-    (build/label
-     (string-constant bug-report-field-version)
-     (lambda (panel)
-       (keymap:call/text-keymap-initializer
-        (lambda ()
-          (make-object text-field% #f panel void ""))))
-     #f
-     #:top-panel synthesized-panel))
-  (define environment
-    (build/label
-     (string-constant bug-report-field-environment)
-     (lambda (panel)
-       (keymap:call/text-keymap-initializer
-        (lambda ()
-          (make-object text-field% #f panel void ""))))
-     #f
-     #:top-panel synthesized-panel))
-  
-  (define human-language
-    (build/label 
-     (string-constant bug-report-field-human-language)
-     (lambda (panel)
-       (keymap:call/text-keymap-initializer
-        (lambda ()
-          (make-object text-field% #f panel void ""))))
-     #f
-     #:top-panel synthesized-panel))
-  
-  (define memory-use
-    (build/label 
-     (string-constant bug-report-field-memory-use)
-     (lambda (panel)
-       (keymap:call/text-keymap-initializer
-        (lambda ()
-          (make-object text-field% #f panel void ""))))
-     #f
-     #:top-panel synthesized-panel))
-    
-  (define pkg-info
-    (make-big-text
-     (string-constant bug-report-field-pkg)
-     #:stretch? #t
-     #:top-panel synthesized-panel))
-  
-  (define collections
-    (make-big-text
-     (string-constant bug-report-field-collections)
-     #:stretch? #t
-     #:top-panel synthesized-panel))
-  
-  (send synthesized-dialog reflow-container) ;; help out the editor by resizing the container to a reasonable width (and thus make word-wrapping easier)
-  
-  (define extras
-    (map (lambda (bri)
-           (let ([label (bri-label bri)])
-             (cons
-              label
-              (build/label
-               label
-               (lambda (panel)
-                 (let ([field
-                        (keymap:call/text-keymap-initializer
-                         (lambda ()
-                           (new text-field%
-                                [label #f]
-                                [parent panel]
-                                [callback void]
-                                [init-value ""]
-                                [min-height (bri-min-height bri)])))])
-                   (send field set-value (bri-value bri))
-                   (send (send field get-editor) set-position 0)
-                   field))
-               #f
-               #:top-panel synthesized-panel))))
-         (get-bug-report-infos)))
-  
-  (define still-save? #t)
-  (define (no-more-saving) (set! still-save? #f))
-  
-  (define (save-this-bug-report)
-    (when still-save?
-      (save-bug-report 
-       (saved-report-id init-bug-report)
-       #:severity (send severity get-string-selection)
-       #:class (send bug-class get-string-selection)
-       #:subject (send summary get-value)
-       #:description (get-content description)
-       #:how-to-repeat (get-content reproduce))))
-  
-  (define timer 
-    (new timer%
-         [notify-callback save-this-bug-report]
-         [just-once? #t]))
-  (define (bug-report-out-of-date)
-    (send timer stop)
-    (send timer start 200 #t))
-  
-  (define (get-query)
-    (append (list (cons 'help-desk "true")
-                  (cons 'replyto (preferences:get 'drracket:email))
-                  (cons 'originator (preferences:get 'drracket:full-name))
-                  (cons 'subject (send summary get-value))
-                  (cons 'severity (send severity get-string-selection))
-                  (cons 'class (translate-class (send bug-class get-string-selection)))
-                  (cons 'release (send version-tf get-value))
-                  (cons 'description (get-content description))
-                  (cons 'how-to-repeat (get-content reproduce))
-                  (cons 'platform (get-environment)))
-            (map (λ (bri) (cons (string->symbol (format "~a" (bri-label bri)))
-                                (bri-value bri)))
-                 (get-bug-report-infos))))
-  
-  (define (get-environment)
-    (string-append (send environment get-value)
-                   "\n"
-                   (format "Human Language: ~a\n" (send human-language get-value))
-                   (format "(current-memory-use) ~a\n" (send memory-use get-value))
-                   (format "raco pkg (show):\n~a\n" (send (send pkg-info get-editor) get-text))
-                   "\n"
-                   "\nCollections:\n"
-                   (format "~a" (send (send collections get-editor) get-text))
-                   "\n"
-                   (apply 
-                    string-append
-                    (map (lambda (extra)
-                           (format "~a: ~a\n"
-                                   (car extra)
-                                   (send (cdr extra) get-value)))
-                         extras))))
-  
-  (define (get-content canvas) 
-    (define t (send canvas get-editor))
-    (send t get-text 0 (send t last-position)))
-  
-  (define (set-content canvas str)
-    (define t (send canvas get-editor))
-    (send t begin-edit-sequence)
-    (send t erase)
-    (send t insert str)
-    (send t end-edit-sequence))
-  
-  (define (compose-view-focus)
-    (send (if (string=? "" (preferences:get 'drracket:full-name))
-              name
-              summary)
-          focus))
-  
-  (define button-panel
-    (new horizontal-panel% [parent compose-panel]
-         [alignment '(right center)] [stretchable-height #f]))
-  (define synthesized-button 
-    (make-object button%
-      (string-constant bug-report-show-synthesized-info)
-      button-panel (lambda x (show-synthesized-info))))
-  (new button% 
-       [parent button-panel]
-       [label (string-constant close-and-save)]
-       [callback (λ (a b) (close-and-save))])
-  (new horizontal-pane% (parent button-panel))
-  (gui-utils:ok/cancel-buttons button-panel
-                               (λ (a b) (ok))
-                               (λ (a b) (cancel))
-                               (string-constant bug-report-submit)
-                               #:confirm-style '())
-  (new grow-box-spacer-pane% [parent button-panel])
-  
-  
-  (define (sanity-checking)
-    (let ([no-value?
-           (lambda (f)
-             (cond
-               [(is-a? f editor-canvas%)
-                (= 0 (send (send f get-editor) last-position))]
-               [else (string=? "" (send f get-value))]))])
-      (let/ec done-checking
-        (for-each
-         (lambda (field field-name)
-           (when (no-value? field)
-             (message-box (string-constant illegal-bug-report)
-                          (format (string-constant pls-fill-in-field) field-name))
-             (done-checking #f)))
-         (list name summary)
-         (list (string-constant bug-report-field-name)
-               (string-constant bug-report-field-summary)))
-        
-        (when (and (no-value? description)
-                   (no-value? reproduce))
-          (message-box (string-constant illegal-bug-report)
-                       (string-constant pls-fill-in-either-description-or-reproduce))
-          (done-checking #f))
-        
-        (unless (regexp-match #rx"@" (or (preferences:get 'drracket:email) ""))
-          (message-box (string-constant illegal-bug-report)
-                       (string-constant malformed-email-address))
-          (done-checking #f))
-        (done-checking #t))))
-  
-  (send version-tf set-value (format "~a" (version:version)))
-  
-  (send environment set-value
-        (format "~a ~s (~a) (get-display-depth) = ~a"
-                (system-type)
-                (system-type 'machine)
-                (system-library-subpath)
-                (get-display-depth)))
-  
-  (send (send collections get-editor)
-        insert
-        (apply
-         string-append
-         (for/list ([d (get-collects-search-dirs)])
-           (format "(~s\n ~s)\n"
-                   (path->string d)
-                   (if (directory-exists? d)
-                       (map path->string (directory-list d))
-                       '(non-existent-path))))))
-  
-  (define pkg-info-sp (open-output-string))
-  (parameterize ([current-output-port pkg-info-sp])
-    (with-handlers ([exn:fail? (lambda (exn)
-                                 (printf "ERROR:\n~a" (exn-message exn)))])
-      (pkg-show-command)))
-  (send (send pkg-info get-editor)
-        insert
-        (get-output-string pkg-info-sp))
-  
-  (send human-language set-value (format "~a" (this-language)))
-  (send memory-use set-value (format "~a" (current-memory-use)))
-  
-  (send (send collections get-editor) auto-wrap #t)
-  (align-labels)
-
-  (define (empty-bug-report?)
-    (define (empty-editor? c) 
-      (define t (send c get-editor))
-      (zero? (send t last-position)))
-    (and (empty-editor? reproduce)
-         (empty-editor? description)
-         (empty-editor? summary)
-         (equal? (send severity get-selection) default-severity)
-         (equal? (send bug-class get-selection) default-class)))
-  
-  (values compose-view-focus
-          get-query
-          sanity-checking
-          no-more-saving
-          empty-bug-report?))
diff --git a/pkgs/drracket-pkgs/drracket/help/private/buginfo.rkt b/pkgs/drracket-pkgs/drracket/help/private/buginfo.rkt
deleted file mode 100644
index 3a1cdab79f..0000000000
--- a/pkgs/drracket-pkgs/drracket/help/private/buginfo.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-
-(provide set-bug-report-info!
-         get-bug-report-infos
-         bri-label
-         bri-value
-         bri-min-height)
-
-(struct bri (label get-value min-height) #:transparent)
-(define (bri-value bri) ((bri-get-value bri)))
-
-(define bug-report-infos null)
-
-(define (set-bug-report-info! str thunk [min-height #f])
-  (set! bug-report-infos (cons (bri str thunk min-height) bug-report-infos)))
-
-(define (get-bug-report-infos) bug-report-infos)
diff --git a/pkgs/drracket-pkgs/drracket/help/private/save-bug-report.rkt b/pkgs/drracket-pkgs/drracket/help/private/save-bug-report.rkt
deleted file mode 100644
index d5733cd808..0000000000
--- a/pkgs/drracket-pkgs/drracket/help/private/save-bug-report.rkt
+++ /dev/null
@@ -1,199 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         racket/contract
-         racket/serialize
-         racket/list
-         framework/preferences)
-
-(define bug-classes '(("software bug" "sw-bug")
-                      ("documentation bug" "doc-bug")
-                      ("change request" "change-request")
-                      ("support" "support")))
-
-(define (translate-class class)
-  (cadr (assoc class bug-classes)))
-
-(define bug-severities '("critical" "serious" "non-critical"))
-
-(define (with-pref func #:rewrite? rewrite?)
-  (define old (preferences:get 'drracket:unfinished-bug-reports))
-  (define ans (func old))
-  (if rewrite?
-      (preferences:set 'drracket:unfinished-bug-reports ans)
-      ans))
-
-(define (discard-all-except f)
-  (with-pref
-   #:rewrite? #t
-   (λ (exp)
-     (filter (λ (saved-report) (f (saved-report-id saved-report)))
-             exp))))
-
-(define valid-keys (sort '(severity 
-                           class 
-                           subject
-                           description
-                           how-to-repeat)
-                         symbol<?))
-
-;; id : number
-;; open? : boolean?
-;; table : (listof (list sym string?))
-;; (the above are only an upper bound on the constraints here; 
-;;  see validate for more info)
-(serializable-struct saved-report (id table) #:transparent)
-
-(define (blank-bug-form id) 
-  (saved-report id 
-                (for/list ([key (in-list valid-keys)])
-                  (list key
-                        (case key
-                          [(class) (car (list-ref bug-classes default-class))]
-                          [(severity) (list-ref bug-severities default-severity)]
-                          [else ""])))))
-
-(define default-class 0)
-(define default-severity 1)
-
-
-;; valid? : any -> boolean?
-;; returns #t if the saved-reports are well formed
-(define (valid? saved-reports)
-  (cond
-    [(list? saved-reports)
-     (and (for/and ([saved-report (in-list saved-reports)])
-            (validate-single saved-report))
-          (no-dups (map saved-report-id saved-reports)))]
-    [else #f]))
-
-(define (no-dups l) (equal? l (remove-duplicates l)))
-
-(define (validate-single a-saved-report)
-  (match a-saved-report
-    [(struct saved-report ((? number?)
-                           (list (list (? symbol? keys) vals) ...)))
-     (and (equal? (sort keys symbol<?) valid-keys)
-          (for/and ([key (in-list keys)]
-                    [val (in-list vals)])
-            (case key
-              [(class) (member val (map car bug-classes))]
-              [(severity) (member val bug-severities)]
-              [else (string? val)])))]
-    [else #f]))
-
-(define (register-new-bug-id)
-  (define ans #f)
-  (with-pref
-   #:rewrite? #t
-   (λ (bug-reports)
-     (define ids (map saved-report-id bug-reports))
-     (define new-id
-       (let loop ([i 0])
-         (cond
-           [(member i ids)
-            (loop (+ i 1))]
-           [else 
-            i])))
-     (set! ans (blank-bug-form new-id))
-     (cons ans bug-reports)))
-  ans)
-
-;; title : label-string?
-;; id : number?
-(struct brinfo (title id) #:transparent)
-
-(define (saved-bug-report-titles/ids)
-  (with-pref
-   #:rewrite? #f
-   (λ (x) 
-     (for/list ([a-saved-report (in-list x)])
-       (define assoc-l (saved-report-table a-saved-report))
-       (define subj-p (assoc 'subject assoc-l))
-       (define title (cadr subj-p))
-       (brinfo (if (string=? title "")
-                   "<<no title>>"
-                   (trim-to-200 (regexp-replace* #rx"&" title "&&"))) 
-               (saved-report-id a-saved-report))))))
-
-(define (trim-to-200 str)
-  (cond
-    [(<= (string-length str) 200)
-     str]
-    [else
-     (define len (string-length str))
-     (define spacer " ... ")
-     (string-append
-      (substring str 0 100)
-      spacer
-      (substring str (+ (- len 100) (string-length spacer)) len))]))
-
-(define (lookup-bug-report id)
-  (or (with-pref
-       #:rewrite? #f
-       (λ (exp)
-         (ormap (λ (x) (and (equal? id (saved-report-id x)) x))
-                exp)))
-      (register-new-bug-id)))
-
-(define (saved-report-lookup a-saved-report key)
-  (cadr (assoc key (saved-report-table a-saved-report))))
-
-(define (save-bug-report id
-                         #:severity severity
-                         #:class class
-                         #:subject subject
-                         #:description description
-                         #:how-to-repeat how-to-repeat)
-  (with-pref
-   #:rewrite? #t
-   (λ (reports)
-     (cons
-      (saved-report id (list (list 'severity severity)
-                             (list 'class class)
-                             (list 'subject subject)
-                             (list 'description description)
-                             (list 'how-to-repeat  how-to-repeat)))
-      (filter (λ (saved-report) 
-                (not (equal? id (saved-report-id saved-report))))
-              reports)))))
-
-  
-(define (unsave-bug-report id)
-  (with-pref
-   #:rewrite? #t
-   (λ (reports)
-     (filter (λ (saved-report) (not (equal? id (saved-report-id saved-report))))
-             reports))))
-
-(preferences:set-default 'drracket:unfinished-bug-reports 
-                         '()
-                         valid?)
-(preferences:set-un/marshall 'drracket:unfinished-bug-reports
-                             serialize
-                             (λ (x) 
-                               (with-handlers ((exn:fail? (λ (exn) '())))
-                                 (deserialize x))))
-
-(provide bug-severities
-         bug-classes
-         translate-class
-         (struct-out brinfo)
-         saved-report?
-         default-severity
-         default-class)
-(provide/contract
- [register-new-bug-id (-> saved-report?)]
- [lookup-bug-report (-> number? saved-report?)]
- [saved-report-lookup (-> saved-report? (apply or/c valid-keys) string?)]
- [saved-report-id (-> saved-report? number?)]
- [save-bug-report (-> number?
-                      #:severity (apply or/c bug-severities)
-                      #:class (apply or/c (map car bug-classes))
-                      #:subject string?
-                      #:description string?
-                      #:how-to-repeat string?
-                      void?)]
- [unsave-bug-report (-> number? void?)]
- [saved-bug-report-titles/ids (-> (listof brinfo?))]
- [discard-all-except (-> (-> number? boolean?) void?)])
diff --git a/pkgs/drracket-pkgs/drracket/info.rkt b/pkgs/drracket-pkgs/drracket/info.rkt
deleted file mode 100644
index d71491b499..0000000000
--- a/pkgs/drracket-pkgs/drracket/info.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "data-lib"
-               "compiler-lib"
-               "base"
-               "planet-lib"
-               "compatibility-lib"
-               "draw-lib"
-               "errortrace-lib"
-               "macro-debugger-text-lib"
-               "parser-tools-lib"
-               "pconvert-lib"
-               "pict-lib"
-               "profile-lib"
-               "sandbox-lib"
-               "scribble-lib"
-               "snip-lib"
-               "string-constants-lib"
-               "typed-racket-lib"
-               "unstable-contract-lib"
-               "wxme-lib"
-               "gui-lib"
-               "racket-index"
-               "racket-doc"
-               "html-lib"
-               "images-lib"
-               "icons"
-               "typed-racket-more"
-               "trace"
-               "macro-debugger"
-               "net-lib"
-               "tex-table"
-               "unstable-lib"
-               "drracket-plugin-lib"
-               "gui-pkg-manager-lib"
-               "drracket-tool-lib"
-               "drracket-tool-doc"))
-(define build-deps '("mzscheme-doc"
-                     "net-doc"
-                     "planet-doc"
-                     "compatibility-doc"
-                     "string-constants-doc"
-                     "draw-doc"
-                     "errortrace-doc"
-                     "gui-doc"
-                     "pict-doc"
-                     "profile-doc"
-                     "r5rs-doc"
-                     "at-exp-lib"
-                     "rackunit-lib"))
-
-;; implies drracket-tool-lib so that others dependencies don't break
-;; (redex, in particular, used to depend on drracket but it really
-;; needs only the parts in drracket-tool-lib)
-(define implies '("drracket-plugin-lib" "drracket-tool-lib"))
-
-(define pkg-desc "The DrRacket programming environment")
-
-(define pkg-authors '(robby))
-
-(define version "1.2")
diff --git a/pkgs/drracket-pkgs/drracket/lang/debugger-language-interface.rkt b/pkgs/drracket-pkgs/drracket/lang/debugger-language-interface.rkt
deleted file mode 100644
index c93bad79f9..0000000000
--- a/pkgs/drracket-pkgs/drracket/lang/debugger-language-interface.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-(module debugger-language-interface mzscheme
-  (require mzlib/class)
-  (provide debugger-language<%>)
-
-  (define debugger-language<%>
-    (interface () debugger:supported?)))
diff --git a/pkgs/drracket-pkgs/drracket/lang/info.rkt b/pkgs/drracket-pkgs/drracket/lang/info.rkt
deleted file mode 100644
index 2b49e2f0ee..0000000000
--- a/pkgs/drracket-pkgs/drracket/lang/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all (mflatt robby matthias))))
diff --git a/pkgs/drracket-pkgs/drracket/macro-debugger/info.rkt b/pkgs/drracket-pkgs/drracket/macro-debugger/info.rkt
deleted file mode 100644
index d424859abf..0000000000
--- a/pkgs/drracket-pkgs/drracket/macro-debugger/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define drracket-tools '(["tool.rkt"]))
-(define drracket-tool-names '("Macro Stepper"))
-(define drracket-tool-icons (list '("macro-stepper-32x32.png" "icons")))
diff --git a/pkgs/drracket-pkgs/drracket/macro-debugger/tool.rkt b/pkgs/drracket-pkgs/drracket/macro-debugger/tool.rkt
deleted file mode 100644
index e92084e328..0000000000
--- a/pkgs/drracket-pkgs/drracket/macro-debugger/tool.rkt
+++ /dev/null
@@ -1,476 +0,0 @@
-#lang racket/base
-(require racket/unit
-         racket/gui/base
-         racket/class
-         framework
-         drracket/tool
-         mrlib/switchable-button
-         macro-debugger/model/trace
-         macro-debugger/view/frame
-         (only-in macro-debugger/view/view macro-stepper-director%)
-         macro-debugger/view/stepper
-         macro-debugger/view/prefs
-         images/compile-time
-         (for-syntax racket/base images/icons/tool)
-         ;; FIXME:
-         drracket/private/syncheck/local-member-names
-         drracket/private/eval-helpers-and-pref-init)
-
-;; Capability name: 'macro-stepper:enabled
-
-(provide tool@)
-
-(define-local-member-name allow-macro-stepper?)
-(define-local-member-name run-macro-stepper)
-
-(define frame/supports-macro-stepper<%>
-  (interface ()
-    allow-macro-stepper?
-    run-macro-stepper))
-
-(define (drracket-macro-stepper-frame-mixin %)
-  (class %
-    (define/override (file-menu:create-new?) #t)
-    (define/override (file-menu:create-open?) #t)
-    (define/override (file-menu:create-open-recent?) #t)
-    (define/override (get-macro-stepper-widget%)
-      (macro-stepper-widget/process-mixin
-       (super get-macro-stepper-widget%)))
-    (super-new)))
-
-(define macro-stepper-frame%
-  (drracket-macro-stepper-frame-mixin
-   (macro-stepper-frame-mixin
-    (frame:standard-menus-mixin
-     frame:basic%))))
-
-(define drracket-macro-stepper-director%
-  (class macro-stepper-director%
-    (init-field filename)
-    (inherit-field stepper-frames)
-    (define eventspace (current-eventspace))
-
-    (define stepper #f)
-    (inherit new-stepper)
-
-    (define/private (lazy-new-stepper)
-      (unless stepper
-        (set! stepper (new-stepper))))
-
-    (define/override (add-trace events)
-      (parameterize ((current-eventspace eventspace))
-        (queue-callback
-         (lambda ()
-           (lazy-new-stepper)
-           (super add-trace events)))))
-    (define/override (add-deriv deriv)
-      (parameterize ((current-eventspace eventspace))
-        (queue-callback
-         (lambda ()
-           (lazy-new-stepper)
-           (super add-deriv deriv)))))
-
-    (define/override (new-stepper-frame)
-      (parameterize ((current-eventspace eventspace))
-        (new macro-stepper-frame%
-             (config (new macro-stepper-config/prefs%))
-             (filename filename)
-             (director this))))
-
-    (define/public (shutdown)
-      (when (pref:close-on-reset-console?)
-        (for ([(frame flags) (in-hash stepper-frames)])
-          (unless (memq 'no-obsolete flags)
-            (send frame show #f)))))
-
-    (super-new)))
-
-
-(define macro-stepper-button-label "Macro Stepper")
-
-(define macro-debugger-bitmap (compiled-bitmap (macro-stepper-icon)))
-(define small-macro-debugger-bitmap (compiled-bitmap (small-macro-stepper-icon)))
-
-(define tool@
-  (unit
-    (import drracket:tool^)
-    (export drracket:tool-exports^)
-
-    (define (phase1)
-      (drracket:module-language-tools:add-opt-out-toolbar-button
-       (λ (frame parent)
-         (new switchable-button%
-               (label macro-stepper-button-label)
-               (bitmap macro-debugger-bitmap)
-               (alternate-bitmap small-macro-debugger-bitmap)
-               (parent parent)
-               (callback (lambda (button) (send frame run-macro-stepper)))))
-       'macro-stepper
-       #:number 70)
-      (drracket:language:register-capability
-       'macro-stepper:enabled
-       boolean?
-       #f))
-    (define (phase2) (void))
-
-    (define drracket-eventspace (current-eventspace))
-    (define drracket-custodian (current-custodian))
-
-    (define-local-member-name check-language)
-    
-    (define (macro-debugger-unit-frame-mixin %)
-      (class* % (frame/supports-macro-stepper<%>)
-        (super-new)
-        (inherit get-button-panel
-                 get-language-menu
-                 get-interactions-text
-                 get-definitions-text
-                 get-top-level-window
-                 ensure-rep-hidden
-                 get-current-tab)
-
-        (define macro-debug-panel
-          (new panel:horizontal-discrete-sizes%
-               (parent (get-button-panel))))
-        (define macro-debug-button
-          (new switchable-button%
-               (label macro-stepper-button-label)
-               (bitmap macro-debugger-bitmap)
-               (alternate-bitmap small-macro-debugger-bitmap)
-               (parent macro-debug-panel)
-               (callback (lambda (button) (run-macro-stepper)))))
-        (inherit register-toolbar-button)
-        (register-toolbar-button macro-debug-button #:number 70)
-
-        (define/augment (enable-evaluation)
-          (send macro-debug-button enable #t)
-          (inner (void) enable-evaluation))
-        (define/augment (disable-evaluation)
-          (send macro-debug-button enable #f)
-          (inner (void) disable-evaluation))
-
-        (define macro-debug-menu-item
-          (let ([lang-menu (get-language-menu)])
-            (new separator-menu-item% (parent lang-menu))
-            (new menu-item%
-                 (label "Macro Stepper")
-                 (parent lang-menu)
-                 (callback (lambda _ (run-macro-stepper))))))
-
-        ;; Hide button for inappropriate languages
-
-        (define/augment (on-tab-change old new)
-          (check-language)
-          (inner (void) on-tab-change old new))
-
-        (define/public (check-language)
-          (enable/disable-stuff (allow-macro-stepper?)))
-
-        (define/public (allow-macro-stepper?)
-          (let ([lang
-                 (drracket:language-configuration:language-settings-language
-                  (send (get-definitions-text) get-next-settings))])
-            (send lang capability-value 'macro-stepper:enabled)))
-
-        (define/private (enable/disable-stuff enable?)
-          (if enable?
-              (begin (send macro-debug-menu-item enable #t)
-                     (unless (send macro-debug-button is-shown?)
-                       (send macro-debug-panel
-                             add-child macro-debug-button)))
-              (begin (send macro-debug-menu-item enable #f)
-                     (when (send macro-debug-button is-shown?)
-                       (send macro-debug-panel
-                             delete-child macro-debug-button)))))
-
-        (send (get-button-panel) change-children
-              (lambda (_)
-                (cons macro-debug-panel
-                      (remq macro-debug-panel _))))
-        (check-language)
-
-        ;; ----
-
-        (define/public-final (run-macro-stepper)
-
-          ;; FIXME!!! Lots of this is copied out of drracket/private/syncheck/gui.rkt
-          ;; except some of the code (eg error handling) thrown away to avoid pulling
-          ;; in lots more. Need to abstract.
-
-          (ensure-rep-hidden)
-          (define definitions-text (get-definitions-text))
-          (define interactions-text (get-interactions-text))
-          (define drs-eventspace (current-eventspace))
-          (define drs-custodian (current-custodian))
-          (define the-tab (get-current-tab))
-          (define-values (old-break-thread old-custodian) (send the-tab get-breakables))
-          (define error-port (send (send the-tab get-error-report-text) get-err-port))
-          (define output-port (send (send the-tab get-error-report-text) get-out-port))
-          (send the-tab disable-evaluation) ;; this locks the editor, so must be outside.
-          (define settings (send definitions-text get-next-settings))
-          (define module-language?
-            (is-a? (drracket:language-configuration:language-settings-language settings)
-                   drracket:module-language:module-language<%>))
-          (define error-display-semaphore (make-semaphore 0))
-
-          ;; --
-
-          (define user-custodian #f)
-          (define normal-termination? #f)
-          (define original-module-name-resolver #f)
-
-          ;; --
-
-          (define director
-            (parameterize ((current-eventspace drracket-eventspace)
-                           (current-custodian drracket-custodian))
-              (let ([filename (send definitions-text get-filename/untitled-name)])
-                (new drracket-macro-stepper-director% (filename filename)))))
-          (send interactions-text set-macro-stepper-director director)
-
-          (define (the-module-name-resolver . args)
-            (parameterize ((current-expand-observe void))
-              (apply original-module-name-resolver args)))
-
-          ;; --
-
-          (define (init-proc) ;; =user=
-            (set! original-module-name-resolver (current-module-name-resolver))
-            (current-module-name-resolver the-module-name-resolver)
-
-            (send the-tab set-breakables (current-thread) (current-custodian))
-            (set-directory definitions-text)
-            (current-load-relative-directory #f)
-            (current-error-port error-port)
-            (current-output-port output-port)
-            (error-display-handler 
-             (λ (msg exn) ;; =user=
-                (parameterize ([current-eventspace drs-eventspace])
-                  (queue-callback
-                   (λ () ;; =drs=
-                      ;; this has to come first or else the positioning
-                      ;; computations in the highlight-errors/exn method
-                      ;; will be wrong by the size of the error report box
-                      (show-error-report/tab)
-                      ;; a call like this one also happens in 
-                      ;; drracket:debug:error-display-handler/stacktrace
-                      ;; but that call won't happen here, because
-                      ;; the rep is not in the current-rep parameter
-                      (send interactions-text highlight-errors/exn exn))))
-                (drracket:debug:error-display-handler/stacktrace
-                 msg exn '()
-                 #:definitions-text definitions-text)
-                (semaphore-post error-display-semaphore)))
-            (error-print-source-location #f) ; need to build code to render error first
-            (uncaught-exception-handler
-             (let ([oh (uncaught-exception-handler)])
-               (λ (exn)
-                  (uncaught-exception-raised)
-                  (oh exn))))
-            (set! user-custodian (current-custodian)))
-
-          (define (uncaught-exception-raised) ;; =user=
-            (set! normal-termination? #t)
-            (parameterize ([current-eventspace drs-eventspace])
-              (queue-callback
-               (λ ()
-                  (cleanup)
-                  (custodian-shutdown-all user-custodian)))))
-          (define (show-error-report/tab) ;; =drs=
-            (send the-tab turn-on-error-report)
-            (send (send the-tab get-error-report-text) scroll-to-position 0)
-            (when (eq? (get-current-tab) the-tab)
-              ;; (show-error-report)
-              (void)))
-          (define (cleanup) ;; =drs=
-            (send the-tab set-breakables old-break-thread old-custodian)
-            (send the-tab enable-evaluation)
-            ;; do this with some lag ... not great, but should be okay.
-            (let ([err-port (send (send the-tab get-error-report-text) get-err-port)])
-              (thread
-               (λ ()
-                  (flush-output err-port)
-                  (queue-callback
-                   (λ ()
-                      (unless (= 0 (send (send the-tab get-error-report-text) last-position))
-                        (show-error-report/tab))))))))
-          (define (kill-termination)
-            (unless normal-termination?
-              (parameterize ([current-eventspace drs-eventspace])
-                (queue-callback
-                 (λ ()
-                    (cleanup)
-                    (custodian-shutdown-all user-custodian))))))
-
-          (with-lock/edit-sequence definitions-text
-            (lambda ()
-              (send the-tab clear-annotations)
-              (send the-tab reset-offer-kill)
-              (define get-terms
-                (drracket:eval:traverse-program/multiple
-                 settings init-proc kill-termination
-                 #:gui-modules? #f))
-              (get-terms
-               (drracket:language:make-text/pos definitions-text
-                                                0
-                                                (send definitions-text last-position))
-               (λ (sexp loop) ; =user=
-                  (cond [(eof-object? sexp)
-                         (set! normal-termination? #t)
-                         (parameterize ([current-eventspace drs-eventspace])
-                           (queue-callback
-                            (λ () ; =drs=
-                               (cleanup)
-                               (custodian-shutdown-all user-custodian))))]
-                        [(syntax? sexp)
-                         (let-values ([(e-expr events derivp) (expand+trace sexp)])
-                           (send director add-trace events)
-                           (cond [(syntax? e-expr)
-                                  ;; FIXME: eval compile-time parts?
-                                  (void)]
-                                 [else (raise e-expr)]))
-                         (loop)]
-                        [else
-                         (eprintf "Got non-syntax: ~e" sexp)
-                         (loop)]))
-               #t)))
-          (void))
-
-        ;; set-directory : text -> void
-        ;; sets the current-directory based on the file saved in the definitions-text
-        (define/private (set-directory definitions-text)
-          (define tmp-b (box #f))
-          (define fn (send definitions-text get-filename tmp-b))
-          (define dir (get-init-dir (and (not (unbox tmp-b)) fn)))
-          (current-directory dir))
-
-        ;; with-lock/edit-sequence : text (-> void) -> void
-        ;; sets and restores some state of the definitions text
-        ;; so that edits to the definitions text work out.
-        (define/private (with-lock/edit-sequence definitions-text thnk)
-          (let* ([locked? (send definitions-text is-locked?)])
-            (send definitions-text begin-edit-sequence)
-            (send definitions-text lock #f)
-            (thnk)
-            (send definitions-text end-edit-sequence)
-            (send definitions-text lock locked?)))
-
-        (define/private (expand+trace expr)
-          (define (handle-macro-limit c)
-            (define option
-              (message-box/custom
-               "Macro stepper"
-               (string-append "Macro expansion has taken a suspiciously large number of steps.\n"
-                              "\n"
-                              "Click Stop to stop macro expansion and see the steps taken "
-                              "so far, or click Continue to let it run a bit longer.")
-               "Continue"
-               "Stop"
-               #f
-               (get-top-level-window)))
-            (case option
-              ((2) (error "Macro expansion was stopped because it took too many steps."))
-              (else (* 2 c))))
-          (parameterize ((trace-macro-limit (pref:macro-step-limit))
-                         (trace-limit-handler handle-macro-limit))
-            (trace* expr)))
-
-        ))
-
-    ;; ============================================================
-
-    ;; Catch modifications => obsolete macro stepper
-    (define (macro-debugger-definitions-text-mixin %)
-      (class %
-        (inherit get-top-level-window)
-        (define/augment (after-set-next-settings s)
-          (let ([tlw (get-top-level-window)])
-            (when tlw
-              (send tlw check-language)))
-          (inner (void) after-set-next-settings s))
-
-        ;; Borrowed from stepper/stepper-tool
-        (define metadata-changing-now? #f)
-
-        (define modified-since-macro-stepper? #f) ;; mutable
-        (define/public (modified-since-macro-stepper ?)
-          (set! modified-since-macro-stepper? ?))
-
-        ;; don't pay attention to changes that occur on metadata.
-        ;; this assumes that metadata changes cannot be nested.
-        (define/augment (begin-metadata-changes)
-          (set! metadata-changing-now? #t)
-          (inner (void) begin-metadata-changes))
-
-        (define/augment (end-metadata-changes)
-          (set! metadata-changing-now? #f)
-          (inner (void) end-metadata-changes))
-
-        (define/private (notify-macro-stepper-of-change)
-          (unless modified-since-macro-stepper?
-            (set! modified-since-macro-stepper? #f)
-            (let ([win (get-top-level-window)])
-              ;; should only be #f when win is #f
-              (when (is-a? win drracket:unit:frame<%>)
-                (send (send win get-interactions-text)
-                      obsolete-macro-stepper)))))
-
-        ;; Catch program changes and mark macro stepper obsolete.
-        (define/augment (on-insert x y)
-          (unless metadata-changing-now?
-            (notify-macro-stepper-of-change))
-          (inner (void) on-insert x y))
-
-        (define/augment (on-delete x y)
-          (unless metadata-changing-now?
-            (notify-macro-stepper-of-change))
-          (inner (void) on-delete x y))
-
-        (super-new)))
-
-    ;; Catch reset => obsolete macro stepper
-    (define (macro-debugger-interactions-text-mixin %)
-      (class %
-        (define current-stepper-director #f)
-        (inherit get-top-level-window)
-        (super-new)
-
-        (define/override (reset-console)
-          (obsolete-macro-stepper)
-          (when current-stepper-director
-            (send current-stepper-director shutdown)
-            (set! current-stepper-director #f))
-          (super reset-console))
-
-        (define/public (obsolete-macro-stepper)
-          (when current-stepper-director
-            (send current-stepper-director add-obsoleted-warning)))
-
-        (define/public (set-macro-stepper-director director)
-          (set! current-stepper-director director))
-        ))
-
-    ;; Macro debugger code
-
-    (drracket:get/extend:extend-unit-frame
-     macro-debugger-unit-frame-mixin)
-    (drracket:get/extend:extend-interactions-text 
-     macro-debugger-interactions-text-mixin)
-    (drracket:get/extend:extend-definitions-text
-     macro-debugger-definitions-text-mixin)
-
-    (define (add-macro-stepper-key-bindings keymap)
-      (send keymap add-function
-            "macro stepper"
-            (lambda (obj evt)
-              (when (is-a? obj editor<%>)
-                (let ([canvas (send obj get-canvas)])
-                  (when canvas
-                    (let ([frame (send canvas get-top-level-window)])
-                      (when (is-a? frame frame/supports-macro-stepper<%>)
-                        (when (send frame allow-macro-stepper?)
-                          (send frame run-macro-stepper)))))))))
-      (send keymap map-function "c:c;c:m" "macro stepper"))
-
-    (add-macro-stepper-key-bindings (drracket:rep:get-drs-bindings-keymap))
-    ))
diff --git a/pkgs/drracket-pkgs/drracket/repo-time-stamp/doc.txt b/pkgs/drracket-pkgs/drracket/repo-time-stamp/doc.txt
deleted file mode 100644
index b5719c9f1b..0000000000
--- a/pkgs/drracket-pkgs/drracket/repo-time-stamp/doc.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This collection is used only for the repository.  It is not included
-in normal releases.  (It's existence indicates a checked out tree.)
-
-The "stamp.rkt" module provides one definition: `stamp' that is bound to
-a string representing the current day.  The "time-stamp.rkt" file is a
-tool, used by DrRacket to set the version based on the time stamp.
diff --git a/pkgs/drracket-pkgs/drracket/repo-time-stamp/info.rkt b/pkgs/drracket-pkgs/drracket/repo-time-stamp/info.rkt
deleted file mode 100644
index 5e7c2c2555..0000000000
--- a/pkgs/drracket-pkgs/drracket/repo-time-stamp/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang info
-
-(define tools (list "time-stamp.rkt"))
-(define tool-names (list "Repository Time Stamp"))
-
-(define test-responsibles '((all eli)))
diff --git a/pkgs/drracket-pkgs/drracket/repo-time-stamp/stamp.rkt b/pkgs/drracket-pkgs/drracket/repo-time-stamp/stamp.rkt
deleted file mode 100644
index 2bd630c6ac..0000000000
--- a/pkgs/drracket-pkgs/drracket/repo-time-stamp/stamp.rkt
+++ /dev/null
@@ -1,133 +0,0 @@
-#lang racket/base
-
-(provide stamp)
-
-#|
-
-  This file provides a single binding, `stamp', with a string value that
-  describes the Racket version, or #f to indicate a "release" without a
-  stamp.
-
-  The format of a string stamp is a date, a SHA1, and a character
-  describing how the information was retrieved:
-
-    "YYYY-MM-DD(SHA1/H)"
-
-  The description is attempted in several ways, with the `H' character
-  indicating how it was actually obtained:
-
-  * "a" -- the date and sha1 information were in the installation's
-    configuration (as a non-empty string). This is the expected value
-    for a snapshot build, and if the installation's configuration has
-    a `build-stamp' entry, this format or #f are the only possibilities.
-
-  * "g" -- `archive-id' didn't have information, but we found a git
-    executable and ran it. [*]  This strategy is currently disabled.
-
-  * "d" -- an executable was not found either, but a ".git" directory
-    was found in the usual place, with a "HEAD" file that has eventually
-    lead to a SHA1.  In this case, the time stamp is the stamp of the
-    git reference file that was used. [*]
-
-  * "f" -- none of the above worked, so the last resort was to report
-    the date of this file (which can provide a rough idea how old the
-    tree is, but obviously this can be arbitrary).  In this case the
-    SHA1 is missing and will be "-".
-
-  [*] In case of "g"/"d", another part is added, indicating the branch
-  name if one was found and if it isn't "master"; Eg, ".../g/foo".
-
-|#
-
-(require racket/system
-         racket/runtime-path
-         racket/string
-         racket/date
-         setup/dirs)
-
-(define-runtime-path this-dir  ".")
-(define-runtime-path this-file "stamp.rkt")
-
-(define (compute-stamp)
-  (let ([rx:secs+id #rx"^([0-9]+)\\|([0-9a-f]+|-)\\|(.*?)[ \r\n]*$"])
-    ;; info from an archive (incl. nightly builds)
-    (define (from-archive-id) 
-      (define m (regexp-match #rx"^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])-([0-9a-f]+)$"
-                              (or (get-build-stamp) "")))
-      (define (n pos) (string->number (list-ref m pos)))
-      (and m
-           (format "~a|~a|a" 
-                   (with-handlers ([exn:fail? (lambda (exn) 
-                                                ;; Last resort:
-                                                (current-seconds))])
-                     (with-handlers ([exn:fail? (lambda (exn)
-                                                  ;; Local time failed; try UTC:
-                                                  (find-seconds 0 0 12 (n 3) (n 2) (n 1) #f))])
-                       ;; Convert to seconds, hopfully for round-trip in seconds->date
-                       ;; conversion below:
-                       (find-seconds 0 0 12 (n 3) (n 2) (n 1))))
-                   (list-ref m 4))))
-    ;; adds a branch name if applicable (and if different from `master')
-    (define (add-branch str br*)
-      (define br
-        (and (string? br*)
-             (not (member br* '("refs/heads/master" "")))
-             (regexp-replace #rx"^refs/(?:heads/|remotes/)?" br* "")))
-      (if br (string-append str "/" br) str))
-    ;; try to run git to get the current info
-    (define (from-running-git)
-      (define exe
-        (or (find-executable-path "git")
-            (find-executable-path "git.exe")
-            (and (eq? 'macosx (system-type))
-                 (find-executable-path "/opt/local/bin/git"))))
-      (define (git . args)
-        (define out (open-output-string))
-        (parameterize ([current-output-port out]
-                       [current-error-port out]
-                       [current-input-port (open-input-string "")]
-                       [current-directory this-dir])
-          (apply system* exe args)
-          (string-trim (get-output-string out))))
-      (and exe (add-branch (git "log" "-1" "--pretty=format:%ct|%h|g")
-                           (git "rev-parse" "--symbolic-full-name" "HEAD"))))
-    ;; try to find a ".git" directory (can't run git, so conventional
-    ;; guess) and use the sha1 from that file and its date
-    (define (from-git-dir)
-      (define git-dir (build-path this-dir 'up 'up 'up 'up ".git"))
-      (define branch #f)
-      (let loop ([file (build-path git-dir "HEAD")])
-        (define l (and (file-exists? file)
-                       (call-with-input-file file read-line)))
-        (cond [(not l) #f]
-              [(regexp-match #rx"^ref: +(.*)$" l)
-               => (λ (m) (unless branch (set! branch (cadr m)))
-                         (loop (build-path git-dir (cadr m))))]
-              [(regexp-match #px"^[[:xdigit:]]{40}$" l)
-               (add-branch (format "~a|~a|d"
-                                   (file-or-directory-modify-seconds file)
-                                   (substring l 0 8))
-                           branch)])))
-    ;; fallback: get the date of this file, no id
-    (define (from-this-file)
-      (format "~a|-|f" (file-or-directory-modify-seconds this-file)))
-    (for*/or ([x (list from-archive-id
-                       ;; from-running-git
-                       from-git-dir
-                       from-this-file)])
-      (let* ([x (x)]
-             [m (and (string? x) (regexp-match rx:secs+id x))]
-             [d (and m (seconds->date (string->number (cadr m))))]
-             [id (and m (caddr m))]
-             [how (and m (cadddr m))])
-        (define (pad02 f) (let ([n (f d)]) (if (< n 10) (format "0~a" n) n)))
-        (and d (format "~a-~a-~a(~a/~a)"
-                       (date-year d) (pad02 date-month) (pad02 date-day)
-                       id how))))))
-
-(define stamp
-  (if (equal? "" (get-build-stamp))
-      ;; Release
-      #f
-      ;; Compute it:
-      (compute-stamp)))
diff --git a/pkgs/drracket-pkgs/drracket/repo-time-stamp/time-stamp.rkt b/pkgs/drracket-pkgs/drracket/repo-time-stamp/time-stamp.rkt
deleted file mode 100644
index 5161c4f74d..0000000000
--- a/pkgs/drracket-pkgs/drracket/repo-time-stamp/time-stamp.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require drracket/tool racket/unit framework "stamp.rkt")
-
-(provide tool@)
-(define tool@
-  (unit (import drscheme:tool^) (export drscheme:tool-exports^)
-    (define (phase1) (void))
-    (define (phase2) (void))
-    (when stamp
-      (version:add-spec '-- stamp))))
diff --git a/pkgs/drracket-pkgs/drracket/scribble/tools/drracket-buttons.rkt b/pkgs/drracket-pkgs/drracket/scribble/tools/drracket-buttons.rkt
deleted file mode 100644
index 10312b108a..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribble/tools/drracket-buttons.rkt
+++ /dev/null
@@ -1,71 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         racket/gui/base
-         racket/class
-         mrlib/bitmap-label
-         racket/system
-         net/sendurl
-         drracket/tool-lib)
-
-(provide drracket-buttons)
-
-(module test racket/base)
-
-(define-runtime-path pdf-png-path "pdf.png")
-(define-runtime-path html-png-path "html.png")
-(define pdf.png (make-object bitmap% pdf-png-path 'png/mask))
-(define html.png (make-object bitmap% html-png-path 'png/mask))
-
-(define-namespace-anchor anchor)
-
-(define original-error-display-handler (error-display-handler))
-
-(define (make-render-button label bmp mode suffix number)
-  (list 
-   label
-   bmp
-   (λ (drs-frame)
-     (define fn (send (send drs-frame get-definitions-text) get-filename))
-     (define html? (equal? suffix #".html"))
-     (cond
-       [fn
-        (parameterize ([drracket:rep:after-expression
-                        (λ ()
-                          (define doc (with-handlers ((exn:fail? (λ (x) #f))) (eval 'doc)))
-                          ;; if (eval 'doc) goes wrong, then we assume that's because of
-                          ;; an earlier failure, so we just don't do anything.
-                          (when doc
-                            (printf "scribble: loading xref\n")
-                            (define xref ((dynamic-require 'setup/xref 'load-collections-xref)))
-                            (printf "scribble: rendering\n")
-                            (parameterize ([current-input-port (open-input-string "")])
-                              ((dynamic-require 'scribble/render 'render) 
-                               (list doc)
-                               (list fn)
-                               #:render-mixin (dynamic-require (if html? 
-                                                                   'scribble/html-render
-                                                                   'scribble/pdf-render)
-                                                               'render-mixin)
-                               #:xrefs (list xref)))
-                            (cond
-                              [html?
-                               (send-url/file (path-replace-suffix fn suffix))]
-                              [else
-                               (parameterize ([current-input-port (open-input-string "")])
-                                 (system (format "open \"~a\"" (path->string (path-replace-suffix fn suffix)))))])))]) 
-          (send drs-frame execute-callback))]
-       [else
-        (message-box "Scribble" "Cannot render buffer without filename")]))
-   number))
-
-(define drracket-buttons
-  (let ([html-button
-         (make-render-button "Scribble HTML" html.png "--html" #".html" 99)]
-        [pdf-button
-         ;; only available on OSX currently
-         ;; when we have a general way of opening pdfs, can use that
-         (make-render-button "Scribble PDF" pdf.png "--pdf" #".pdf" 98)])
-    (case (system-type)
-      [(macosx) (list html-button pdf-button)]
-      [else (list html-button)])))
diff --git a/pkgs/drracket-pkgs/drracket/scribble/tools/html.png b/pkgs/drracket-pkgs/drracket/scribble/tools/html.png
deleted file mode 100644
index 24d8d99f58..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/scribble/tools/html.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/scribble/tools/pdf.png b/pkgs/drracket-pkgs/drracket/scribble/tools/pdf.png
deleted file mode 100644
index 4494e71d2e..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/scribble/tools/pdf.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/scribble/tools/private/mk-drs-bitmaps.rkt b/pkgs/drracket-pkgs/drracket/scribble/tools/private/mk-drs-bitmaps.rkt
deleted file mode 100644
index 0cbddb91ad..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribble/tools/private/mk-drs-bitmaps.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang scheme/gui
-
-(define width 16)
-(define height 16)
-
-(define (draw1 dc color?) (draw dc "pdf" 0 7 color?))
-(define (draw2 dc color?) (draw dc "htm" -1 5 color?))
-
-(define (draw dc str dx dy color?)
-  (send dc clear)
-  (send dc set-font (send the-font-list find-or-create-font 15 " Futura" 'swiss 'normal 'bold))
-  (let-values ([(tw th _1 _2) (send dc get-text-extent "@")])
-    (when color? (send dc set-text-foreground (send the-color-database find-color "gray")))
-    (send dc draw-text "@" 
-          (- (/ width 2) (/ tw 2))
-          (- (/ height 2) (/ th 2)))
-    (send dc set-font (send the-font-list find-or-create-font 6 " Gill Sans" 'swiss 'normal 'bold))
-    (when color? (send dc set-text-foreground (send the-color-database find-color "purple")))
-    (send dc draw-text str (+ 0 dx) (- height dy) #f 0 (* pi 1/4))))
-
-(define f (new frame% [label ""] [width 100] [height 100] [alignment '(center center)]))
-(define c (new canvas% 
-               [parent f]
-               [stretchable-width #f]
-               [stretchable-height #f]
-               [paint-callback (λ (c dc) (draw-bm dc pdf-bitmap))]
-               [min-width 16]
-               [min-height 16]))
-(define c2 (new canvas% 
-               [parent f]
-               [stretchable-width #f]
-               [stretchable-height #f]
-               [paint-callback (λ (c dc) (draw-bm dc html-bitmap))]
-               [min-width 16]
-               [min-height 16]))
-
-
-(define (mk-bitmap draw)
-  (define mask-bm (make-object bitmap% width height))
-  (define bm (make-object bitmap% width height))
-  (define bdc (make-object bitmap-dc%))
-  (send bm set-loaded-mask mask-bm)
-  (send bdc set-bitmap mask-bm)
-  (draw bdc #f)
-  (send bdc set-bitmap bm)
-  (draw bdc #t)
-  (send bdc set-bitmap #f)
-  bm)
-
-(define (draw-bm dc bm)
-  #;(send dc draw-bitmap (send bm get-loaded-mask) 0 0)
-  
-  (send dc set-pen "lightgray" 1 'transparent)
-  (send dc set-brush "lightgray" 'solid)
-  (send dc draw-rectangle 0 0 width height)
-  (send dc draw-bitmap bm 0 0 
-        'solid
-        (send the-color-database find-color "black")
-        (send bm get-loaded-mask)))
-
-
-(define pdf-bitmap (mk-bitmap draw1))
-(define html-bitmap (mk-bitmap draw2))
-
-(module+ main
-  (send pdf-bitmap save-file "../pdf.png" 'png)
-  (send html-bitmap save-file "../html.png" 'png)
-  (send f show #t))
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/common.rkt b/pkgs/drracket-pkgs/drracket/scribblings/drracket/common.rkt
deleted file mode 100644
index b52696ac62..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/common.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-
-(require scribble/manual
-         (for-label racket 
-                    racket/gui/base))
-
-(provide HtDP
-         drlang
-         (all-from-out scribble/manual)
-         (for-label (all-from-out racket 
-                                  racket/gui/base)))
-
-(define HtDP
-  (italic "How to Design Programs"))
-
-(define (drlang . s)
-  (apply onscreen s))
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/debugger1.png b/pkgs/drracket-pkgs/drracket/scribblings/drracket/debugger1.png
deleted file mode 100644
index 2fdfce6ddc..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/scribblings/drracket/debugger1.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/drracket.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/drracket/drracket.scrbl
deleted file mode 100644
index de5cd6dff1..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/drracket.scrbl
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual)
-
-@title{DrRacket: The Racket Programming Environment}
-
-@author["Robert Bruce Findler" "PLT"]
-
-DrRacket is a graphical environment for developing programs using the
-Racket programming languages.
-
-@table-of-contents[]
-
-@; ----------------------------------------------------------------------
-
-@include-section["interface-essentials.scrbl"]
-@include-section["languages.scrbl"]
-@include-section["interface-ref.scrbl"]
-@include-section["extending.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@index-section[]
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/example.png b/pkgs/drracket-pkgs/drracket/scribblings/drracket/example.png
deleted file mode 100644
index 1c43cd504b..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/scribblings/drracket/example.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/example.rkt b/pkgs/drracket-pkgs/drracket/scribblings/drracket/example.rkt
deleted file mode 100644
index 05e15e2427..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/example.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scheme
-
-;; square : number -> number
-;; to produce the square of x
-(define (square x)
-  (* x x))
-
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/extending.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/drracket/extending.scrbl
deleted file mode 100644
index 4c8017e38d..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/extending.scrbl
+++ /dev/null
@@ -1,216 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label compiler/cm setup/parallel-build racket/promise))
-
-@title[#:tag "extending-drracket"]{Extending DrRacket}
-
-DrRacket supports two forms of extension to the programming
- environment:
-
-@itemize[
-
-@item{@index['("languages" "extending")]{@index['("DrRacket
-  Teachpacks")]{A @deftech{teachpack}}} extends the set of procedures
-  that are built into a language in DrRacket.  For example, a
-  teachpack might extend the Beginning Student language with a
-  procedure for playing sounds.
-
-  Teachpacks are particularly useful in a classroom setting, where an
-  instructor can provide a teachpack that is designed for a specific
-  exercise. To use the teachpack, each student must download the
-  teachpack file and select it through the @menuitem["Language" "Add
-  Teachpack..."]  menu item.
-
-  See @secref["teachpacks"] for information in creating teachpacks.}
-
-@item{A @deftech{plugin} extends the set of utilities within the
-  DrRacket environment. For example, DrRacket's @onscreen{Check
-  Syntax} button starts a syntax-checking plugin. For information on
-  creating @tech{plugin}s, see @other-manual['(lib
-  "scribblings/tools/tools.scrbl")].}
-
-]
-
-@; ----------------------------------------
-
-@section[#:tag "teachpacks"]{Teachpacks}
-
-Teachpacks are designed to supplement student programs with code that 
-cannot be expressed in a teaching language. For
-example, to enable students to play hangman, we supply a teachpack that
-
-@itemize[
-
- @item{implements the random choosing of a word,}
-
- @item{maintains the state variable of how many guesses have gone wrong, and}
-
- @item{manages the GUI.}
-
-]
-
-All these tasks are beyond students in the third week and/or impose
-memorization of currently useless knowledge on students. The essence
-of the hangman game, however, is not. The use of teachpacks enables
-the students to implement the interesting part of this exercise and
-still be able to enjoy today's graphics without the useless
-memorization.
-
-A single Racket source file defines a teachpack (although the file may
-access other files via @racket[require]). The file must contain a
-module (see @secref[#:doc '(lib "scribblings/guide/guide.scrbl")
-"modules"]). Each exported syntax definition or value definition from
-the module is provided as a new primitive form or primitive operation
-to the user, respectively.
-
-As an example, the following teachpack provides a lazy cons
-implementation. To test it, save the following in a file and
-add the file as a teachpack (or use @racket[require]).
-
-@racketmod[
-racket
-
-(provide (rename-out [:lcons lcons]) lcar lcdr)
-
-(define-struct lcons (hd tl))
-
-(define-syntax (:lcons stx)
-  (syntax-case stx ()
-    [(_ hd-exp tl-exp)
-     (syntax (make-lcons 
-               (delay hd-exp)
-               (delay tl-exp)))]))
-
-(define (lcar lcons) (force (lcons-hd lcons)))
-(define (lcdr lcons) (force (lcons-tl lcons)))
-]
-
-Then, in this program:
-
-@racketblock[
-(define (lmap f l)
-  (lcons
-   (f (lcar l))
-   (lmap f (lcdr l))))
-
-(define all-nums (lcons 1 (lmap add1 all-nums)))
-]
-
-the list @racket[all-nums] is bound to an infinite list
- of ascending numbers.
-
-For more examples, see the @filepath{htdp} sub-collection in the
-@filepath{teachpack} collection of the PLT installation.
-
-@subsection{Adding Your Own Teachpacks to the Teachpack Dialog}
-
-The @onscreen{Language|Add Teachpack...} dialog is extensible
-in two ways. First, users can add teachpacks to the third column
-by clicking the button at the bottom of the column. These additions
-are stored in the preferences file, so one way to add site-specific
-teachpacks is to provide a default preferences file.
-
-The first two columns are also extensible. When a collection has
-an @filepath{info.rkt} file 
-(see @secref[#:doc '(lib "scribblings/raco/raco.scrbl") "info.rkt"])
-that defines @racket[htdp-teachpacks] or @racket[2htdp-teachpacks],
-then they are expected to be either a list of (collection-relative)
-paths containing teachpacks to add to the dialog, or the symbol
-@racket['all], which means that all of the (top-level) files in the collection
-that end with @filepath{.rkt}, @filepath{.ss}, or @filepath{.scm}
-are teachpacks (except @filepath{info.rkt} or @filepath{info.ss}).
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "environment-variables"]{Environment Variables}
-
-Several environment variables can affect DrRacket's behavior:
-
-@itemize[
-
- @item{@indexed-envvar{PLTNOTOOLS} : When this environment variable is
-       set, DrRacket doesn't load any tools.}
-
- @item{@indexed-envvar{PLTONLYTOOL} : When this environment variable
-       is set, DrRacket only loads the tools in the collection named
-       by the value of the environment variable. If the variable is
-       bound to a parenthesized list of collections, only the tools in
-       those collections are loaded (The contents of the environment
-       variable are @racket[read] and expected to be a single symbol
-       or a list of symbols).}
- 
- @item{@indexed-envvar{PLTDRREPL} : When this environment variable is
-        set, DrRacket starts a read-eval-print loop with all of
-        the forms and functions from the @racketmodname[racket]
-        module and those described in @other-doc['(lib "scribblings/tools/tools.scrbl")].
-        
-        If it is not set to @litchar{-q}, then @racket[(find-system-path 'init-file)]
-        is loaded as well.
-        
-        A new thread is created to evaluate REPL expressions, so be 
-        sure to use @racket[queue-callback] to evaluate expressions
-        that mutate the GUI (to avoid race-conditions).
-        }
-
- @item{@indexed-envvar{PLTDRCM} : When this environment variable is
-       set, DrRacket installs the compilation manager before starting
-       up, which means that the @filepath{.zo} files are automatically
-       kept up to date, as DrRacket's (or a tool's) source is modified.
-
-       If the variable is set to @litchar{trace} then the files that are
-       actually recompiled are shown.}
-
- @item{@indexed-envvar{PLTDRPAR} : When this environment variable is
-       set, DrRacket uses @racket[parallel-compile-files] to compile
-       the framework and the drracket collections in parallel and then
-       installs the compilation manager before starting
-       up, which means that the @filepath{.zo} files are automatically
-       kept up to date, as DrRacket's (or a tool's) source is modified.
-
-       If the variable is set to @litchar{trace} then the files that are
-       actually recompiled are shown.}
-
- @item{@indexed-envvar{PLTDRDEBUG} : When this environment variable is
-       set, DrRacket starts up with errortrace enabled. If the
-       variable is set to @litchar{profile}, DrRacket also records
-       profiling information about itself.}
-
- @item{@indexed-envvar{PLTDRPROFILE} : When this environment variable is
-       set, DrRacket uses the @racketmodname[profile] library (with
-       a little GUI) to collect profiling information about itself.}
-
- @item{@indexed-envvar{PLTDRBREAK} : When this environment variable is
-       set, DrRacket creates a window with a break button, during
-       startup. Clicking the button breaks DrRacket's eventspace's
-       main thread. This works well in combination with
-       @envvar{PLTDRDEBUG} since the source locations are reported for
-       the breaks.}
-
- @item{@indexed-envvar{PLTSTRINGCONSTANTS} : When this environment
-       variable is set, DrRacket prints out the string constants that
-       have not yet been translated. If it is set to a particular
-       language (corresponding to one of the files in
-       @filepath{string-constants} collection) it only shows the unset
-       string constants matching that language.
-
-       This environment variable must be set when @filepath{.zo} files
-       are made. To ensure that you see its output properly, run
-       @exec{setup-plt} with the @Flag{c} flag, set the environment
-       variable, and then run @exec{setup-plt} again.}
-
- @item{@indexed-envvar{PLTDRXREFDELAY} : When this environment variable
-        is set, DrRacket uses an ordinary @racket[delay] (instead of
-        @racket[delay/idle]) to delay the computation of the searching
-        indices. This means that Check Syntax will start more slowly
-        the first time, but that the startup performance is more
-        predictable. In addition, when the environment variable is
-        set, DrRacket will print out that it is set, and will print
-        when the index is started loading and when it finishes loading.}
-
- @item{@indexed-envvar{PLTDREASTERSECONDS} : When this environment variable
-        is set, DrRacket pretends that the result of @racket[current-seconds]
-        is actually this environment variable's value, for the purposes
-        of easter eggs. For example, setting it to 1339390801 would simulate
-        King Kamehameha day 2012 and show the corresponding easter egg splash 
-        screen.}
-]
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/files.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/drracket/files.scrbl
deleted file mode 100644
index 324fe45426..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/files.scrbl
+++ /dev/null
@@ -1,132 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "drracket-files"]{DrRacket Files}
-
-@; ----------------------------------------
-
-@section[#:tag "drracket-file-formats"]{Program Files}
-
-The standard @as-index{file extension} for a Racket program file is
-@indexed-file{.rkt}. The extensions @indexed-file{.ss},
-@indexed-file{.scm}, and @indexed-file{.sch} are also historically
-popular.
-
-DrRacket's editor can save a program file in two different formats:
-
-@itemize[
-
- @item{@deftech{Plain-text file format} --- All text editors can read
-       this format. DrRacket saves a program in plain-text format by
-       default, unless the program contains images or text boxes.
-       (Plain-text format does not preserve images or text boxes.)
-
-       Plain-text format is platform-specific because different
-       platforms have different newline conventions. However, most
-       tools for moving files across platforms support a ``text''
-       transfer mode that adjusts newlines correctly.}
-
- @item{@deftech{Multimedia file format} --- This format is specific to
-       DrRacket, and no other editor recognizes it. DrRacket saves a
-       program in multimedia format by default when the program
-       contains images, text boxes, or formatted text.
-
-       Multimedia format is platform-independent, and it uses an ASCII
-       encoding (so that different ways of transferring the file are
-       unlikely to corrupt the file).}
-
-]
-
-@; ----------------------------------------
-
-@section[#:tag "drracket-autosave-files"]{Backup and Autosave Files}
-
-When you modify an existing file in DrRacket and save it, DrRacket
-copies the old version of the file to a special backup file if no
-backup file exists. The backup file is saved in the same directory as
-the original file, and the backup file's name is generated from the
-original file's name:
-
-@itemize[
-
- @item{On Unix and Mac OS X, a @filepath{~} is added to the end of
-       the file's name.}
-
- @item{On Windows, the file's extension is replaced with
-       @filepath{.bak}.}
-
-]
-
-Every five minutes, DrRacket checks each open file. If any file is
-modified and not saved, DrRacket saves the file to a special autosave
-file (just in case there is a power failure or some other catastrophic
-error). If the file is later saved, or if the user exists DrRacket
-without saving the file, the autosave file is removed. The autosave
-file is saved in the same directory as the original file, and the
-autosave file's name is generated from the original file's name:
-
-@itemize[
-
- @item{On Unix and Mac OS X, a @filepath{#} is added to the start
-       and end of the file's name, then a number is added after the
-       ending @filepath{#}, and then one more @filepath{#} is appended
-       after the number. The number is selected to make the autosave
-       filename unique.}
-
- @item{On Windows, the file's extension is replaced with a number
-       to make the autosave filename unique.}
-
-]
-
-If the definitions window is modified and there is no current file,
-then an autosave file is written to the user's ``documents''
-directory. @margin-note{The ``documents'' directory is determined by
-@racket[(find-system-path 'doc-dir)].}
-
-@; ----------------------------------------
-
-@section{Preference Files}
-
-On start-up, DrRacket reads configuration information from a
-preferences file. The name and location of the preferences file
-depends on the platform and user:
-
-@margin-note{The expression @racket[(find-system-path 'pref-file)]
- returns the platform- and user-specific preference file path.}
-
-@itemize[
-
- @item{On Unix, preferences are stored in a
-   @indexed-file{.racket} subdirectory in the user's home
-   directory, in a file @indexed-file{racket-prefs.rktd}.}
-
- @item{On Windows, preferences are stored in a file
-  @indexed-file{racket-prefs.rktd} in a sub-directory
-  @indexed-file{Racket} in the user's application-data folder as
-  specified by the Windows registry; the application-data folder is
-  usually @indexed-file{Application Data} in the user's profile
-  directory, and that directory is usually hidden in the Windows GUI.}
-
- @item{On Mac OS X, preferences are stored in
-  @indexed-file{org.racket-lang.prefs.rktd} in the user's preferences
-  folder.}
-
-]
-
-A lock file is used while modifying the preferences file, and it is
-created in the same directory as the preferences file. On Windows,
-the lock file is named @indexed-file{_LOCKracket-prefs.rktd}; on Unix,
-it is @indexed-file{.LOCK.racket-prefs.rktd}; on Mac OS X, it is
-@indexed-file{.LOCK.org.racket-lang.prefs.rktd}.
-
-If the user-specific preferences file does not exist, and the file
-@indexed-file{racket-prefs.rktd} in the @filepath{defaults} collection
-does exist, then it is used for the initial preference settings.  (See
-@secref[#:doc '(lib "scribblings/reference/reference.scrbl")
-"collects"] for more information about collections.) This file thus
-allows site-specific configuration for preference defaults. To set up
-such a configuration, start DrRacket and configure the preferences to
-your liking.  Then, exit DrRacket and copy your preferences file into
-the @filepath{defaults} collection as
-@filepath{racket-prefs.rktd}. Afterward, users who have no preference
-settings already will get the preference settings that you chose.
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/incremental-keybindings.rkt b/pkgs/drracket-pkgs/drracket/scribblings/drracket/incremental-keybindings.rkt
deleted file mode 100644
index d9341ce0b7..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/incremental-keybindings.rkt
+++ /dev/null
@@ -1,94 +0,0 @@
-#lang s-exp framework/keybinding-lang
-
-(require drracket/tool-lib)
-
-(module test racket/base)
-
-(keybinding "c:c;c:e" (lambda (ed evt) (send-toplevel-form ed #f)))
-(keybinding "c:c;c:r" (lambda (ed evt) (send-selection ed #f)))
-(keybinding "c:c;~c:m:e" (lambda (ed evt) (send-toplevel-form ed #t)))
-(keybinding "c:c;~c:m:r" (lambda (ed evt) (send-selection ed #t)))
-
-(define/contract (send-toplevel-form defs shift-focus?)
-  (-> any/c boolean? any)
-  (when (is-a? defs drracket:unit:definitions-text<%>)
-    (define sp (send defs get-start-position))
-    (when (= sp (send defs get-end-position))
-      (cond
-        [(send defs find-up-sexp sp)
-         ;; we are inside some top-level expression;
-         ;; find the enclosing expression
-         (let loop ([pos sp])
-           (define next-up (send defs find-up-sexp pos)) 
-           (cond
-             [next-up (loop next-up)]
-             [else
-              (send-range-to-repl defs 
-                                  pos
-                                  (send defs get-forward-sexp pos)
-                                  shift-focus?)]))]
-        [else
-         ;; we are at the top-level
-         (define fw (send defs get-forward-sexp sp))
-         (define bw (send defs get-backward-sexp sp))
-         (cond
-           [(and (not fw) (not bw)) 
-            ;; no expressions in the file, give up
-            (void)]
-           [(not fw) 
-            ;; no expression after the insertion point;
-            ;; send the one before it
-            (send-range-to-repl defs 
-                                bw
-                                (send defs get-forward-sexp bw)
-                                shift-focus?)]
-           [else 
-            ;; send the expression after the insertion point
-            (send-range-to-repl defs 
-                                (send defs get-backward-sexp fw)
-                                fw
-                                shift-focus?)])]))))
-              
-(define/contract (send-selection defs shift-focus?)
-  (-> any/c boolean? any)
-  (when (is-a? defs drracket:unit:definitions-text<%>)
-    (send-range-to-repl defs
-                        (send defs get-start-position) 
-                        (send defs get-end-position) 
-                        shift-focus?)))
-
-(define/contract (send-range-to-repl defs start end shift-focus?)
-  (->i ([defs (is-a?/c drracket:unit:definitions-text<%>)]
-        [start exact-positive-integer?]
-        [end (start) (and/c exact-positive-integer? (>=/c start))]
-        [shift-focus? boolean?])
-       any)
-  (unless (= start end) ;; don't send empty regions
-    (define ints (send (send defs get-tab) get-ints))
-    (define frame (send (send defs get-tab) get-frame))
-    ;; copy the expression over to the interactions window
-    (send defs move/copy-to-edit 
-          ints start end
-          (send ints last-position)
-          #:try-to-move? #f)
-    
-    ;; erase any trailing whitespace
-    (let loop ()
-      (define last-pos (- (send ints last-position) 1))
-      (when (last-pos . > . 0)
-        (define last-char (send ints get-character last-pos))
-        (when (char-whitespace? last-char)
-          (send ints delete last-pos (+ last-pos 1))
-          (loop))))
-    
-    ;; put back a single newline
-    (send ints insert
-          "\n"
-          (send ints last-position)
-          (send ints last-position))
-    
-    ;; make sure the interactions is visible 
-    ;; and run the submitted expression
-    (send frame ensure-rep-shown ints)
-    (when shift-focus? (send (send ints get-canvas) focus))
-    (send ints do-submission)))
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/indentation-table.rkt b/pkgs/drracket-pkgs/drracket/scribblings/drracket/indentation-table.rkt
deleted file mode 100644
index 8ad6dc231b..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/indentation-table.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-;; warning, this file is generated by another program
-(provide (all-defined-out))
-(define app-example1 "(f a\n   b\n   c)")
-(define app-example2 "(f\n a\n b\n c)")
-(define begin-example1 "(begin a\n       b\n       c)")
-(define begin-example2 "(begin\n  a\n  b\n  c)")
-(define define-example1 "(define x\n  1)")
-(define define-example2 "(struct s t \n  (a b c))")
-(define define-example3 "(define\n  (f x)\n  1)")
-(define lambda-example1 "(λ (x y)\n  1)")
-(define lambda-example2 "(lambda\n    (x y)\n  1)")
-(define for/fold-example "(for/fold ([acc 0])\n          ([x (in-range 10)]\n           [y (in-list l)])\n  b\n  c)")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/info.rkt b/pkgs/drracket-pkgs/drracket/scribblings/drracket/info.rkt
deleted file mode 100644
index 3c4183f3eb..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("drracket.scrbl" (multi-page) (racket-core -25))))
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/interface-essentials.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/drracket/interface-essentials.scrbl
deleted file mode 100644
index aaeba4e52b..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/interface-essentials.scrbl
+++ /dev/null
@@ -1,937 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          scribble/decode scribble/eval scribble/struct scribble/racket
-          (for-label racket/gui/base framework compiler/embed)
-          setup/getinfo racket/pretty string-constants)
-
-@(define (ioinputfont . s)
-   (apply tt s))
-@(define (iooutputfont . s)
-   (make-element output-color (decode-content s)))
-
-@title[#:tag "interface-essentials" #:style 'toc]{Interface Essentials}
-
-The DrRacket window has three parts: a row of buttons at the top, two
-editing panels in the middle, and a status line at the bottom.
-
-@centerline{@image[#:scale 0.7 "example.png"]}
-
-The top editing panel, called the @deftech{definitions window}, is for
-defining programs. The above figure shows a program that defines the
-function @racket[square].
-
-The bottom panel, called the @deftech{interactions window}, is for
-evaluating Racket expressions interactively. The @onscreen{Language} line
-in the interactions window indicates which primitives are available in
-the definitions and interactions windows.  In the above figure, the
-language is determined from the program source's @hash-lang[] line.
-
-@margin-note{The interactions window is described further in
-@secref["interactions-window"], later in this manual.}
-
-Clicking the @onscreen{Run} button evaluates the program in the
-definitions window, making the program's definitions available in the
-interactions window. Given the definition of @racket[square] as in the
-figure above, typing @racket[(square 2)] in the interactions window
-produces the result @racket[4].
-
-The @deftech{status line} at the bottom of DrRacket's window provides
-information about the current line and position of the editing caret,
-whether the current file can be modified, and whether DrRacket is
-currently evaluating any expression. The @as-index{recycling icon}
-flashes while DrRacket is ``recycling'' internal resources, such as
-memory.
-
-@local-table-of-contents[]
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "buttons"]{Buttons}
-
-The left end of the row of buttons in DrRacket contains a miniature
-button with the @index['("filename button")]{current file's
-name}. Clicking the button opens a menu that shows the file's full
-pathname. Selecting one of the menu entries produces an open-file
-dialog starting in the corresponding directory.
-
-Below the filename button is a @as-index{@onscreen{(define ...)}
-button} for a pop-up menu of names that are defined in the definitions
-window. Selecting an item from the menu moves the blinking caret to
-the corresponding definition.
-
-The @as-index{@onscreen{Save} button} appears whenever the definitions
-window is modified. Clicking the button saves the contents of the
-definitions window to a file. The current name of the file appears to
-the left of the @onscreen{Save} button, but a file-selection dialog
-appears if the file has never been saved before.
-
-The @as-index{@onscreen{Step} button}---which appears only for the
-@|HtDP| teaching languages @drlang{Beginning Student} through
-@drlang{Intermediate Student with Lambda}---starts the
-@as-index{Stepper}, which shows the evaluation of a program as a
-series of small steps. Each evaluation step replaces an expression in
-the program with an equivalent one using the evaluation rules of
-DrRacket. For example, a step might replace @racket[(+ 1 2)] with
-@racket[3]. These are the same rules used by DrRacket to evaluate a
-program.  Clicking @onscreen{Step} opens a new window that contains
-the program from the definitions window, plus several new buttons:
-these buttons allow navigation of the evaluation as a series of steps.
-
-@margin-note{The debugging interface is described further in
-@secref["debugger"], later in this manual.}
-
-The @as-index{@onscreen{Debug} button}---which does @emph{not} appear
-for the @|HtDP| teaching languages---starts a more conventional
-stepping @as-index{debugger}.  It runs the program in the definitions
-window like the @onscreen{Run} button, but also opens a debugging
-panel with several other buttons that provide control over the
-program's execution.
-
-Clicking the @as-index{@onscreen{Check Syntax} button} annotates the
-program text in the definitions window.  It add the following
-annotations:
-
-@itemize[
-
- @item{@bold{Syntactic Highlighting:} Imported variables and locally
-        defined variables are highlighted with color
-        changes. Documented identifiers are hyperlinked (via a
-        right-click) to the documentation page.}
-
- @item{@bold{Lexical Structure:} The lexical structure is shown with
-       arrows overlaid on the program text.  When the mouse cursor
-       passes over a variable, DrRacket draws an arrow from the
-       binding location to the variable, or from the binding location
-       to every bound occurrence of the variable.
-
-       @index['("Check syntax" "purple arrows")]{@index['("Check
-       syntax" "question-mark arrows")]{In}} addition to indicating
-       definite references with blue arrows, DrRacket also draws
-       arrows to indicate potential references within macro
-       definitions. Potential arrows are drawn in purple and annotated
-       with a question mark to indicate uncertainty, because DrRacket
-       cannot predict how such identifiers will eventually be
-       used. Their roles may depend on the arguments to the macro and
-       the context the macro is used in.
-
-       @index['("alpha renaming")]{Additionally}, right-clicking (or
-       Control-clicking on Mac OS X) on a variable activates a
-       pop-up menu that lets you jump from binding location to bound
-       location and vice versa, @as-index{@"\u03B1"-rename} the
-       variable, or tack the arrows so they do not disappear.}
-
- @item{@index['("tail calls")]{@bold{Tail Calls:}} Any
-       sub-expression that is (syntactically) in tail-position with
-       respect to its enclosing context is annotated by drawing a
-       light purple arrow from the tail expression to its surrounding
-       expression.}
-
-  @item{@bold{Require Annotations:} Right-clicking (or
-        Control-clicking on Mac OS X) on the argument to
-        @racket[require] activates a pop-up menu that lets you open the
-        file that contains the @racket[require]d module.
-
-        Passing the mouse cursor over a @racket[require] expression
-        inside a module shows all of the variables that are used from
-        that @racket[require] expression. Additionally, if no
-        variables are used from that require expression, it is colored
-        like an unbound variable.
-
-         Finally, passing the mouse cursor over a variable that is
-         imported from a module shows the module that it is imported
-         from in a status line at the bottom of the frame.}
-
-]
-
-Check Syntax also runs automatically as you edit your program,
-and the bottom, rightmost corner of the DrRacket window
-shows its status. A red dot means that something has gone wrong;
-move your mouse over the dot to find out what is wrong. Mismatched parentheses indicates
-that the buffer's parens are also mismatched; mouse over the parens for details.
-
-When nothing goes wrong, the colors indicate the stages processing of the program:
-blue (expanding), purple (computing check syntax information), orchid (updating the
-editor with the check syntax information), and green (finished).
-
-Also, right-clicking in that area yields a menu that lets you disable
-(or re-enable) automatic Check Syntax.
-
-The @as-index{@onscreen{Run} button} evaluates the program in the
-@tech{definitions window} and resets the @tech{interactions window}.
-
-The @as-index{@onscreen{Break} button} interrupts an evaluation, or
-beeps if DrRacket is not evaluating anything. For example, after
-clicking @onscreen{Run} or entering an expression into the
-interactions window, click @onscreen{Break} to cancel the
-evaluation. Click the @onscreen{Break} button once to try to interrupt
-the evaluation gracefully; click the button twice to kill the
-evaluation immediately.
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "choose-language"]{Choosing a Language}
-
-@section-index["language levels"]
-
-DrRacket supports multiple dialects of Racket, as well as some
-non-Racket languages. You specify a language in one of two ways:
-
-@itemize[
-
- @item{Select the @drlang{Use the language declared in the source}
-       option (via the @menuitem["Language" "Choose Language..."] menu
-       item), and then specify a specific language as part of the
-       program usually by starting the definitions-window content with
-       @hash-lang[].}
-
-  @item{Select the @menuitem["Language" "Choose Language..."] menu
-       item, and choose a specific language. After changing the
-       language, click @onscreen{Run} to reset the language in the
-       interactions window. The bottom-left corner of DrRacket's main
-       window also has a shortcut menu item for selecting previously
-       selected languages.}
-
-]
-
-Using a language declared in a program's source is the recommend mode,
-and it is described further in @secref["module"].
-
-The @menuitem["Language" "Choose Language..."] dialog contains a
-@onscreen{Show Details} button for configuring certain details of the
-chosen language. Whenever the selected options do not match the
-default language specification, a @onscreen{Custom} indicator appears
-next to the language-selection control at the top of the dialog.
-
-See @secref["languages"] (later in this manual) for more information
-on the languages that DrRacket supports.
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "editor"]{Editing with Parentheses}
-
-@index['("flashing parenthesis matches")]{@index['("gray highlight
-regions")]{In}} Racket mode, especially, DrRacket's editor provides
-special support for managing parentheses in a program. When the
-blinking caret is next to a parenthesis, DrRacket shades the region
-between the parenthesis and its matching parenthesis. This feature is
-especially helpful when for balancing parentheses to complete an
-expression.
-
-@index['("formatting Racket code")]{@index['("indenting Racket
-code")]{Although}} whitespace is not significant in Racket, DrRacket
-encourages a particular format for Racket code. When you type Enter or
-Return, the editor inserts a new line and automatically indents it. To
-make DrRacket re-indent an existing line, move the blinking caret to
-the line and hit the Tab key. (The caret can be anywhere in the line.)
-You can re-indent an entire region by selecting the region and typing
-Tab.
-
-@index['("changing a parenthesis as you type")]{@index['("automatic
-parenthesis")]{DrRacket}} also rewrites parenthesis as you type them,
-in order to make them match better. If you type a closing parenthesis
-@litchar{)}, a closing square bracket @litchar{]}, or a closing curly brace
-@litchar["}"], and if DrRacket can match it back to some earlier opening
-parenthesis, bracket, or brace, then DrRacket changes what you type to
-match.  DrRacket also rewrites open square brackets, usually to an
-open parenthesis. There are some exceptions where opening square
-brackets are not automatically changed to parentheses:
-
-@itemize[
-
- @item{If the square bracket is after @racket[cond]-like keyword,
-       potentially skipping some of the sub-expressions in the
-       @racket[cond]-like expression (for example, in a @racket[case]
-       expression, the square brackets start in the second
-       sub-expression).}
-
- @item{If the square bracket begins a new expression immediately after
-       a @racket[local]-like keyword. Note that the second expression
-       after a @racket[local]-like keyword will automatically become
-       an ordinary parenthesis.}
-
- @item{If the square bracket is after a parenthesis that is after a
-       @racket[letrec]-like keyword,}
-
- @item{If the square bracket is in a sequence and the s-expression
-      before in the sequence is a compound expression, DrRacket uses
-      the same kind parenthesis, brace, or bracket as before, or}
-
- @item{If the square bracket is in the middle of string,
-       comment, character, or symbol.}
-]
-
-The upshot of DrRacket's help is that you can always use the
-(presumably unshifted) square brackets on your keyboard to type
-parenthesis. For example, when typing
-
-@racketblock[
-(define (length l)
-  (cond
-   [(empty? l) 0]
-   [else (+ 1 (length (rest l)))]))
-]
-
-If you always type @litchar{[} and @litchar{]} where any of the square
-brackets or parentheses appear, DrRacket will change the square
-brackets to match the code above.
-
-Of course, these features can be disabled and customized in the
-preferences dialog; see @secref["prefs-explanation"].  Also, in case
-DrRacket does not produce the character you want, holding down the
-control key while typing disables DrRacket's parenthesis, brace, and
-bracket converter.
- 
-@; -------------------------------
-
-@section{Searching}
-
-DrRacket's search and replace feature is interactive,
-similar to those in Safari, Firefox, and Emacs, but with a
-few differences.
-
-To start a search, first select the @onscreen{Find} menu
-item from the @onscreen{Edit} menu. This will open a small
-editor at the bottom of the DrRacket window. Start typing in
-there and, as you type, all occurrences of the string you're
-searching for will be circled in the editor window. Watch
-the space right next to the search window to see how many
-occurrences of the search string there are in your
-file. When you're ready, you use the @onscreen{Find Again}
-menu item to jump to the first occurrence of the search
-string. This will color in one of the circles. Use
-@onscreen{Find Again} a second time to jump to the next
-occurrence.
-
-If you click back into the definitions window, the
-@onscreen{Find Again} menu item, DrRacket will move the
-selection to the next occurrence of the search string.
-
-DrRacket also supports a mode where typing in the search
-editor takes you directly to the next occurrence of the
-search string, without selecting the @onscreen{Find Again}
-menu item. In the preference dialog, in the
-@onscreen{Editing} section and then in the
-@onscreen{General} section is a checkbox labeled
-@onscreen{Search using anchors}. When it is checked,
-DrRacket shows a little red dot and a red line indicating
-where the @deftech{search anchor} is. When the search anchor
-is enabled, typing in the search window jumps to the first 
-occurrence of the search string after the anchor.
-
-@; -------------------------------
-
-@section{Tabbed Editing}
-
-DrRacket's allows you to edit multiple files in a single window via
-tabs. The @menuitem["File" "New Tab"] menu item creates a new tab to
-show a new file. Each tab has its own interactions window.
-
-In the @onscreen{General} pane of the
-the preferences window, a checkbox labeled @onscreen{Open files in
-separate tabs} causes DrRacket to open files in new tabs in the
-frontmost window, rather than opening a new window for the file.
-
-The key bindings Control-Pageup and Control-Pagedown move between
-tabs. On Mac OS X, Command-Left-Square-Bracket and Command-Right-Square-Bracket also
-move between tabs.
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "interactions-window"]{The Interactions Window}
-
-@index['("> prompt")]{@index['("evaluating expressions")]{The}}
-interactions window lets you type an expression after the @tt{>}
-prompt for immediate evaluation. You cannot modify any text before the
-last @tt{>} prompt. To enter an expression, the blinking caret must
-appear after the last prompt, and also after the space following the
-prompt.
-
-When you type a complete expression and hit Enter or Return, DrRacket
-evaluates the expression and prints the result. After printing the
-result, DrRacket creates a new prompt for another expression. Some
-expressions return a special ``void'' value; DrRacket never prints
-void, but instead produces a new prompt immediately.
-
-If the expression following the current prompt is incomplete, then
-DrRacket will not try to evaluate it. In that case, hitting Enter or
-Return produces a new, auto-indented line. You can force DrRacket to
-evaluate the expression by typing Alt-Return or Command-Return
-(depending on your platform).
-
-To copy the @as-index{previous expression} to the current prompt, type
-ESC-p (i.e., type Escape and then type p). Type ESC-p multiple times
-to @as-index{cycle back through old expressions}. Type ESC-n to cycle
-forward through old expressions. There are other keys that have these
-same functions; see @seclink["Keyboard Shortcuts"] and the menu
-item @onscreen{Show Active Keybindings} menu item in the @onscreen{Edit} menu.
-
-Clicking the @onscreen{Run} button evaluates the program in the
-@tech{definitions window} and makes the program's definitions
-available in the interactions window. Clicking @onscreen{Run} also
-resets the interactions window, erasing all old interactions and
-removing old definitions from the interaction environment. Although
-@onscreen{Run} erases old @tt{>} prompts, ESC-p and ESC-n can still
-retrieve old expressions.
-
-@; ----------------------------------------
-
-@subsection{Errors}
-
-@index['("error highlighting")]{Whenever} DrRacket encounters an error
-while evaluating an expression, it prints an error message in the
-interactions window and highlights the expression that triggered the
-error. The highlighted expression might be in the definitions window,
-or it might be after an old prompt in the interactions window.
-
-For certain kinds of errors, DrRacket turns a portion of the error
-message into a hyperlink. Click the hyperlink to get help regarding a
-function or keyword related to the error.
-
-For some run-time errors, DrRacket shows a bug icon next to the error
-message. Click the bug icon to open a window that shows a ``stack'' of
-expressions that were being evaluated at the time of the error. In
-addition, if the expressions in the stack appear in the
-@tech{definitions window}, a red arrow is drawn to each expression
-from the next deeper one in the stack.
-
-@; ----------------------------------------
-
-@subsection{Input and Output}
-
-@section-index["I/O"]
-
-Many Racket programs avoid explicit input and output operations,
-obtaining input via direct function calls in the @tech{interactions
-window}, and producing output by returning values. Other Racket
-programs explicitly print output for the user during evaluation using
-@as-index{@racket[write]} or @as-index{@racket[display]}, or
-explicitly request input from the user using @as-index{@racket[read]}
-or @as-index{@racket[read-char]}.
-
-Explicit input and output appear in the @tech{interactions window},
-but within special boxes that separate explicit I/O from normal
-expressions and results. For example, evaluating
-
-@racketblock[
-@#,tt{>} (read)
-]
-
-in the interactions window produces a special box for entering input:
-
-@centerline{@image[#:scale 0.6 "io.png"]}
-
-Type a number into the box and hit Enter, and that number becomes the
-result of the @racket[(read)] expression. Once text is submitted for
-an input box, it is moved outside the input box, and when DrRacket
-shows a new prompt, it hides the interaction box. Thus, if you type
-@racket[5] in the above input box and hit Return, the result appears
-as follows:
-
-@racketblock[
-@#,tt{>} (read)
-@#,ioinputfont{5}
-@#,racketresult[5]
-@#,tt{>} @#,tt{_}
-]
-
-In this case, the first @ioinputfont{5} is the input, and the second
-@racketresult[5] is the result of the @racket[(read)] expression. The
-second @racketresult[5] is colored blue, as usual for a result printed
-by DrRacket. (The underscore indicates the location of the blinking
-caret.)
-
-Output goes into the @tech{interactions window} directly. If you run
-the program
-
-@racketmod[
-racket
-(define v (read))
-(display v) (newline)
-v
-]
-
-and provide the input S-expression @racket[(1 2)], the interactions
-window ultimately appears as follows:
-
-@racketblock[
-@#,ioinputfont{(1 2)}
-@#,iooutputfont{(1 2)}
-@#,racketresult['(1 2)]
-@#,tt{>} @#,tt{_}
-]
-
-In this example, @racket[display] produces output immediately beneath
-the input you typed, and the final result is printed last. The
-displayed output is drawn in purple. (The above example assumes
-default printing. With constructor-style value printing, the final
-before the prompt would be @racket[(list 1 2)].)
-
-Entering the same program line-by-line in the interactions window
-produces a different-looking result:
-
-@racketblock[
-@#,tt{>} (define v (read))
-@#,ioinputfont{(1 2)}
-@#,tt{>} (display v)
-@#,iooutputfont{(1 2)}
-@#,tt{>} v
-@#,racketresult['(1 2)]
-@#,tt{>} @#,tt{_}
-]
-
-Depending on the input operation, you may enter more text into an
-input box than is consumed. In that case, the leftover text remains in
-the input stream for later reads. For example, in the following
-interaction, two values are provided in response to the first
-@racket[(read)], so the second value is returned immediately for the
-second @racket[(read)]:
-
-@racketblock[
-@#,tt{>} (read)
-@#,ioinputfont{5 6}
-@#,racketresult[5]
-@#,tt{>} (read)
-@#,racketresult[6]
-@#,tt{>} @#,tt{_}
-]
-
-The following example illustrates that submitting input with Return
-inserts a newline character into the input stream:
-
-@racketblock[
-@#,tt{>} (read)
-@#,ioinputfont{5}
-@#,racketresult[5]
-@#,tt{>} (read-char)
-@#,racketresult[#\newline]
-@#,tt{>} @#,tt{_}
-]
-
-The @onscreen{eof} button that appears beside an input box inserts
-a single @racket[eof-object] into the input stream, but more IO may
-follow in a later sequence. For example, in the following interaction,
-the user typed @litchar{1} and then clicked the @onscreen{eof} button:
-
-@racketblock[
-@#,tt{>} (read-char)
-@#,ioinputfont{1}@#,racketresult[#\1]
-@#,tt{>} (read-char)
-@#,racketresultfont{#<eof>}
-]
-
-At this point, however, future interactions can still take place:
-new calls to input functions with open a new input box and new
-characters will come from the same port.
-
-Within a @racket[@#,hash-lang[] @#,racketmodname[racket]] module,
-the results of top-level expression print the same as the results of
-an expression entered in the @tech{interactions window}. The reason is
-that @racket[@#,hash-lang[] @#,racketmodname[racket]] explicitly
-prints the results of top-level expressions using
-@racket[(current-print)], and DrRacket sets @racket[(current-print)]
-to print values in the same way as for interactions.
-
-@; ----------------------------------------------------------------------
-
-@section{Graphical Syntax}
-
-In addition to normal textual program, DrRacket supports certain
-graphical elements as expressions within a program. Plug-in tools can
-extend the available graphical syntax, but this section describes some
-of the more commonly used elements.
-
-@subsection[#:tag "images"]{Images}
-
-DrRacket's @menuitem["Insert" "Insert Image..."] menu item lets you
-select an image file from disk (in various formats such as GIF, PNG,
-and BMP), and the image is inserted at the current editing caret.
-
-As an expression an image behaves like a number or string constant: it
-evaluates to itself. DrRacket's @tech{interactions window} knows how
-to draw image-value results or images displayed via @racket[print].
-
-A program can manipulate image values in various ways, such as using
-the @racket[htdp/image] library or as an
-@racket[image-snip%] value.
-
-@subsection[#:tag "xml-boxes"]{XML Boxes and Racket Boxes}
-
-DrRacket has special support for XML concrete syntax. The
-@menuitem["Special" "Insert XML Box"] menu item inserts an embedded
-editor into your program. In that embedded editor, you type XML's
-concrete syntax. When a program containing an XML box is evaluated,
-the XML box is translated into an @deftech{x-expression} (or
-@deftech{xexpr}), which is an s-expression representation of an XML
-expression. Each xexpr is a list whose first element is a symbol
-naming the tag, second element is an association list representing
-attributes and remaining elements are the nested XML expressions.
-
-XML boxes have two modes for handling whitespace. In one mode, all
-whitespace is left intact in the resulting xexpr.  In the other mode,
-any tag that only contains nested XML expressions and whitespace has
-the whitespace removed. You can toggle between these modes by
-right-clicking or Control-clicking (Mac OS X) on the top portion of
-the XML box.
-
-In addition to containing XML text, XML boxes can also
-contain Racket boxes. Racket boxes contain Racket
-expressions. These expressions are evaluated and their
-contents are placed into the containing XML box's xexpr.
-There are two varieties of Racket box: the standard Racket
-box and the splicing Racket box. The standard Racket box
-inserts its value into the containing xexpr. The contents of
-the splice box must evaluate to a list and the elements of
-the list are ``flattened'' into the containing xexpr.
-Right-clicking or control-clicking (Mac OS X) on the top of a Racket
-box opens a menu to toggle the box between a Racket box and
-a Racket splice box.
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "debugger"]{Graphical Debugging Interface}
-
-@margin-note{@bold{Tip:} Changing the name of a file in the middle of
-a debugging session will prevent the debugger from working properly on
-that file.}
-
-Like the @onscreen{Run} button, the @as-index{@onscreen{Debug} button}
-runs the program in the definitions window.  However, instead of
-simply running it from start to finish, it lets users control and
-observe the program as it executes.  The interface includes a panel of
-buttons above the definitions window, as well as extensions to the
-definitions window itself.
-
-The program starts out paused just before the first expression is
-executed.  This is indicated in the definitions window by the presence
-of a green triangle over this expression's left parenthesis.
-
-@subsection{Debugger Buttons}
-
-While execution is paused, several buttons are available:
-
-@itemize[
-
-    @item{The @as-index{@onscreen{Go} button} is enabled
-whenever the program is paused.  It causes the program to resume
-until it either completes, reaches a breakpoint, or raises an
-unhandled exception.}
-
-    @item{The @as-index{@onscreen{Step} button} is enabled whenever
-the program is paused.  It causes the program to make a single step
-and then pause again.}
-
-    @item{The @as-index{@onscreen{Over} button} is only enabled when
-execution is paused at the start of an expression that is not in tail
-position.  It sets a one-time breakpoint at the end of the
-expression (represented by a yellow circle) and causes the program to
-proceed.  When execution reaches the one-time breakpoint, it pauses
-and removes that breakpoint.}
-
-    @item{The @as-index{@onscreen{Out} button} is only enabled when
-execution is paused within the context of another expression.  Like
-the @onscreen{Over} button, it sets a one-time breakpoint and
-continues execution.  In this case, the program stops upon returning
-to the context or raising an unhandled exception.}
-
-]
-
-If the program is running (not paused), then only the @as-index{Pause}
-button will be enabled.  Clicking it will interrupt execution and
-pause it.  In this case, the current expression may only be known
-approximately, and it will be represented as a gray triangle.  The
-other features described above will still be available.
-
-At any time, execution may be interrupted by clicking the
-@onscreen{Stop} button.  However, unlike with the @onscreen{Pause}
-button, stopped execution cannot be continued.
-
-@subsection{Definitions Window Actions}
-
-When execution is paused, the definitions window supports several
-additional actions:
-
-@itemize[
-
-    @item{Hovering the mouse cursor over a parenthesis may reveal a
-pink circle.  If so, right-clicking or control-clicking (Mac OS X)
-will open a menu with options to @onscreen{Pause at this point} or
-@onscreen{Continue to this point}.  The former sets an ordinary
-breakpoint at that location; the latter sets a one-time breakpoint and
-resumes execution.  An ordinary breakpoint appears as a red circle,
-and a one-time breakpoint appears as a yellow circle.
-
-@bold{Tip:} If the debugged program is not a module, then the
-@italic{first time} it is debugged, breakpoints will only become
-available in expressions as they are evaluated.  However, the next
-time the program is debugged, the debugger will remember the set of
-breakable locations from the previous session.
-
-@bold{Tip:} Clicking the @onscreen{Run} button after a debugging
-session will cause all breakpoints to disappear from the definitions
-window.  These breakpoints are not forgotten, and clicking
-@onscreen{Debug} again will restore them.  However, breakpoints do
-@italic{not} persist across restarts of DrRacket.}
-
-    @item{If execution is paused at the start of an expression, then
-right-clicking or control-clicking (Mac OS X) on the green triangle
-opens a menu with the option to @onscreen{Skip expression...}.
-Selecting this opens a text box in which to enter a value for the
-expression.  The expression is skipped, with the entered value
-substituted for it.}
-
-    @item{If execution is paused at the end of an expression, then the
-expression and its value are displayed to the left of the button bar.
-Right-clicking or control-clicking (Mac OS X) on the green triangle
-opens a menu with options to @onscreen{Print return value to console}
-and @onscreen{Change return value...}.  The former displays the return
-value in the interactions window; the latter opens a text box in which
-to enter a substitute value.}
-
-    @item{Hovering the mouse cursor over a bound variable displays the
-variable's name and value to the right of the button bar.
-Right-clicking or control-clicking (Mac OS X) opens a menu with
-options to @onscreen{Print value of <var> to console} or
-@onscreen{(set! <var> ...)}.  The former displays the variable's value
-in the interactions window; the latter opens a text box in which to
-enter a new value for the variable.}
-
-]
-
-@subsection{Stack View Pane}
-
-In addition, while execution is paused, the stack view pane at the
-right of the DrRacket frame is active.  The top of the pane shows a
-list of active stack frames.  Mousing over a frame produces a faint
-green highlighting of the corresponding expression.  Clicking on the
-frame selects that frame, which makes its lexical variables visible.
-The selected frame is indicated by a bold font.
-
-The bottom of the pane shows the lexical variables in the selected
-stack frame.
-
-The following screenshot illustrates several aspects of the debugger
-interface.  The red circle before the @racket[if] is a breakpoint,
-and the green triangle at the end of the @racket[(fact (sub1 n))] is where
-execution is currently paused.  The expression's return value is
-displayed at the left of the button bar, and the value of @racket[n]
-is displayed in the stack view pane.
-
-@centerline{@image[#:scale 0.5 "debugger1.png"]}
-
-@subsection{Debugging Multiple Files}
-
-To debug a program that spans several files, make sure that all of the
-files are open in DrRacket.  Click the @onscreen{Debug} button in the
-window containing the main program.  As this program loads additional
-files that are present in other windows or tabs, message boxes will
-pop up asking whether or not to include the file in the debugging
-session.  Including the file means that it will be possible to set
-breakpoints, inspect variables, and single-step in that file.
-
-@bold{Tip:} A file may only be involved in one debugging session at a
-time.  If you try to debug a file that loads another file that is
-already being debugged, a message box will pop up explaining that the
-file cannot be included in another debugging session.
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "module-browser"]{The Module Browser}
-
-The module browser shows you the structure of all of the files in your program.
-It can be opened via the @onscreen{Show} menu, or via the 
-@onscreen{Module Browser} 
-menu items in the @onscreen{Racket} menu.
-
-A module browser window contains a square for each
-  module. The squares are colored based on the number of
-  lines of code in the module. If a module has more lines of
-  code, it gets a darker color. If a module is red, it means
-  that DrRacket did not find a source file for it.
-  
-  In addition, for each normal import, a blue line drawn is
-  from the module to the importing module. Similarly, purple
-  lines are drawn for each for-syntax, for-template or for-meta import. In the initial
-  module layout, modules to the left import modules to the
-  right, but since modules can be moved around
-  interactively, that property might not be preserved.
-
-  To open the file corresponding to the module, double click
-  on the box for that module.
-  
-  The module browser will also show you the phases that each
-  module is loaded in; choose the ``Long, with phases'' menu item
-  in the ``Names'' pop-up menu. The integers indicate the phases and
-  if @racket[#f] is present, it means the module is loaded @racket[for-label].
-  
-  The bar along the bottom helps you find your way in a module graph. Specifically,
-  if you type something there, then all of the modules whose filenames match
-  what you type will turn green in the module window. This bar is only visible
-  in the stand alone module browser window (via the @onscreen{Racket} menu)
-
-@section[#:tag "color-scheme"]{Color Schemes}
-
-DrRacket comes with three different color schemes, available in the preferences dialog's
-@onscreen{color} panel.
-
-You can add your own color schemes to DrRacket, too. The first step is to
-create a pkg (see @secref["how-to-create" #:doc '(lib "pkg/scribblings/pkg.scrbl")])
-and add an @filepath{info.rkt} file to it. The file should define
-@racket[framework:color-schemes] as a list of hashes that describe the color schemes.
-
-@(define example-key #f)
-
-As an example, this is the specification of the @racket["Modern"] style:
-@(let ()
-   (define pth (collection-file-path "info.rkt" "drracket"))
-   (define-values (base name dir?) (split-path pth))
-   (define info (get-info/full base))
-   (unless info (error 'framework/main.rkt "could not find example for modern color scheme"))
-   (define key 'framework:color-schemes)
-   (define datum (info key))
-   (define name-as-string-datum
-     (let loop ([datum datum])
-       (cond
-         [(list? datum)
-          (for/list ([datum (in-list datum)])
-            (loop datum))]
-         [(hash? datum)
-          (for/hash ([(k v) (in-hash datum)])
-            (if (and (equal? k 'name) (string-constant? v))
-                (values k (dynamic-string-constant v))
-                (values k (loop v))))]
-         [(and (symbol? datum)
-               (regexp-match #rx"framework:" (symbol->string datum)))
-          (unless example-key (set! example-key datum))
-          datum]
-         [else datum])))
-   (define sp (open-output-string))
-   (parameterize ([pretty-print-columns 60]
-                  [current-output-port sp])
-     (pretty-write
-      `(define ,key 
-         ',name-as-string-datum)))
-   (codeblock 
-    (string-append "#lang info\n"
-                   (get-output-string sp))))
-
-Each of the keys, e.g., @code[(format "~s" `',example-key)], maps to a color and possibly to
-some style information. All keys accept colors (the vectors shown
-above represent colors in r/g/b format), but only some accept style information. To
-find out which are which and to get a complete list of the possible keys, click the button
-labeled @onscreen[(regexp-replace #rx"&&" (string-constant style-and-color-names) "&")]
-at the bottom of the 
-@onscreen[(string-constant color-schemes)] tab of the
-@onscreen[(string-constant preferences-colors)] tab in the preferences dialog.
-If one can accept style information, then you may include any of the symbols @racket['bold],
-@racket['underline], or @racket['italic] in the list with the color.
-
-Full details on the specification of the info files can be found in the documentation
-for the function @racket[color-prefs:register-info-based-color-schemes].
-
-You may have to restart DrRacket (and, at least the first time after you add the @filepath{info.rkt}
-file, re-run @tt{raco setup}) to see changes to your color scheme.
-
-Color schemes are not limited only to the colors that DrRacket already knows about.
-If you are adding your own plugin to DrRacket, you can add new names that can be 
-mapped in the color scheme. See @racket[color-prefs:register-color-preference] for
-more information.
-
-@section[#:tag "create-exe"]{Creating Executables}
-
-DrRacket's @onscreen{Create Executable...} menu item lets you create
-an executable for your program that you can start without first
-starting DrRacket. To create an executable, first save your program to
-a file and set the language and teachpacks.  Click @onscreen{Run},
-just to make sure that the program is working as you expect. The
-executable you create will not have a read-eval-print-loop, so be sure
-to have an expression that starts your program running in the
-definitions window before creating the executable.
-
-Once you are satisfied with your program, choose the @onscreen{Create
-Executable...}  menu item from the @onscreen{Racket} menu. You will be
-asked to choose an executable file name or an archive file name. In
-the latter case, unpack the generated archive (on this machine or
-another one) to access the executable. In either case, you will be
-able to start the executable in the same way that you start any other
-program on your computer.
-
-The result of @onscreen{Create Executable...} is either a
-@defterm{launcher executable}, a @defterm{stand-alone executable}, or
-a @defterm{distribution archive}, and it uses either a
-@defterm{Racket} (textual) or @defterm{GRacket} (graphical) engine.
-For programs implemented with certain languages, @onscreen{Create
-Executable...}  will prompt you to choose the executable type and
-engine, while other languages support only one type or engine.
-
-Each type has advantages and disadvantages:
-
-@itemize[
-
-  @item{A @deftech{launcher executable} uses the latest version of
-  your program source file when it starts. It also accesses library
-  files from your DrRacket installation when it runs. Since a launcher
-  executable contains specific paths to access those files, launchers
-  usually cannot be moved from one machine to another.}
-
- @item{A @deftech{stand-alone executable} embeds a compiled copy of
- your program and any Racket libraries that your program uses. When
- the executable is started, it uses the embedded copies and does not
- need your original source file. It may, however, access your DrRacket
- installation for DLLs, frameworks, shared libraries, or helper
- executables. Consequently, a stand-alone executable usually cannot be
- moved from one machine to another.}
-
- @item{A @deftech{distribution archive} packages a stand-alone
- executable together with any needed DLLs, frameworks, shared
- libraries, and helper executables. A distribution archive can be
- unpacked and run on any machine with the same operating system as
- yours.}
-
-]
-
-In general, DrRacket's gives you the most options when it infers a
-language from a program's source. Most other languages only allow one
-type of executable. The teaching languages, for example, create
-stand-alone executables in distributions. The legacy languages create
-only launchers.
-
-@bold{Tip:} Disable debugging in the language dialog before creating
-your executable. With debugging enabled, you will see a stack trace
-with error messages, but your program will run more slowly.  To
-disable debugging, open the language dialog, click the @onscreen{Show
-Details} button, and select @onscreen{No debugging or profiling}, if
-it is available.
-
-When you create an executable in some languages, you can supply
-additional files to determine the executable's icon and similar
-properties, depending on the platform. The file's purpose is
-determined by its suffix:
-
-@itemlist[
-
- @item{On Windows, supply an @filepath{.ico} file for an icon. Only
-       16x16, 32x32, or 48x48 images from the @filepath{.ico} file are
-       used.}
-
- @item{On Mac OS X, supply an @filepath{.icns} file for an icon.  You
-       can set the application's creator with an @filepath{.creator}
-       file (whose first four bytes are used), and you can set
-       documents for the application through a @filepath{.utiexports}
-       file (see @racket['uti-exports] in
-       @racket[create-embedding-executable] for more information).}
-
- @item{On Unix, supply a @filepath{.png} or @filepath{.ico} file for
-       an icon.}
-
-]
-
-@section[#:tag "follow-log"]{Following Log Messages}
-
-The @onscreen{Show Log} menu item in the @onscreen{View} menu opens
-a pane in the DrRacket window showing log messages. 
-
-Along the top of the window is a text field that should be filled with
-a description of which log messages are interesting, as described in
-the @secref[#:doc '(lib "scribblings/reference/reference.scrbl") "logging"]
-section of @other-doc['(lib "scribblings/reference/reference.scrbl")].
-
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/interface-ref.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/drracket/interface-ref.scrbl
deleted file mode 100644
index 8ce83a8c2a..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/interface-ref.scrbl
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:style 'toc]{Interface Reference}
-
-@local-table-of-contents[]
-
-@include-section["menus.scrbl"]
-@include-section["prefs.scrbl"]
-@include-section["keybindings.scrbl"]
-@include-section["files.scrbl"]
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/io.png b/pkgs/drracket-pkgs/drracket/scribblings/drracket/io.png
deleted file mode 100644
index 59eb2c8e90..0000000000
Binary files a/pkgs/drracket-pkgs/drracket/scribblings/drracket/io.png and /dev/null differ
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/keybindings.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/drracket/keybindings.scrbl
deleted file mode 100644
index 48f5849189..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/keybindings.scrbl
+++ /dev/null
@@ -1,435 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          scribble/struct scribble/bnf
-          racket/list racket/runtime-path racket/port
-          mrlib/tex-table
-          (for-label drracket/tool-lib))
-
-@(define (keybinding key . desc)
-   (let* ([keys (if (string? key) (list key) key)]
-          [key-str (apply string-append (add-between keys " "))])
-     (apply item @index[(map (lambda (x) (format "~a keybinding" x)) keys) key-str] " : " desc)))
-
-@(define-syntax-rule (def-mod-beg id)
-   (begin
-     (require (for-label racket/base))
-     (define id @racket[#%module-begin])))
-@(def-mod-beg mz-mod-begin)
-
-@title[#:tag "Keyboard Shortcuts"]{Keyboard Shortcuts}
-
-@index['("keybindings")]{Most} key presses simply insert a character
-into the editor, such as @litchar{a}, @litchar{3}, or
-@litchar{(}. Other keys and key combinations act as keyboard shortcuts
-that move the blinking caret, delete a line, copy the selection,
-etc. Keyboard shortcuts are usually trigger by key combinations using
-the Control, Meta, or Command key.
-
-@margin-note{Many of the key-binding actions can also be performed
-with menu items.}
-
-C-@nonterm{key} means press the Control key, hold it down and then
-press @nonterm{key} and then release them both. For example: C-e
-(Control-E) moves the blinking caret to the end of the current line.
-
-M-@nonterm{key} is the same as C-@nonterm{key}, except with the Meta
-key.  Depending on your keyboard, Meta may be called ``Left,''
-``Right,'' or have a diamond symbol, but it's usually on the bottom
-row next to the space bar. M-@nonterm{key} can also be performed as a
-two-character sequence: first, strike and release the Escape key, then
-strike @nonterm{key}. On Mac OS X, Meta is, by default,
-available only through the Escape key. But the preferences dialog
-(in the @onscreen{General} sub-panel of the @onscreen{Editing} panel)
-has check boxes that adjust the handling of the Alt key or the Command
-key to be meta.
-
-DEL is the Delete key.
-
-SPACE is the Space bar.
-  
-On most keyboards, ``<'' and ``>'' are shifted characters. So, to
-get M->, you actually have to type Meta-Shift->. That is, press and
-hold down both the Meta and Shift keys, and then strike ``>''.
-
-On Windows (and sometimes under Unix)
-some of these keybindings are actually standard menu
-items.  Those keybindings will behave according to the menus, unless
-the @onscreen{Enable keybindings in menus} preference is unchecked.
-For example, the C-e keybinding mentioned above actually toggles
-the visibility of the interactions window.
-
-@index['("Emacs keybindings")]{If} you are most familiar with
-Emacs-style key bindings (especially on windows or some linux installations
-where the control key is, by default, for the menu shortcuts), 
-you should uncheck the @onscreen{Enable
-keybindings in menus} preference. Many of the keybindings below are
-inspired by Emacs. See also @secref["defining-shortcuts"] for suggestions
-on how to bind keys to menu items on a selective basis.
-
-And finally, the authoritative source for keybindings 
-is the @onscreen{Edit} menu's @onscreen{Show Active Keybindings}
-menu item. Keybindings in DrRacket are often sensitive to
-the window that has the keyboard focus, so the contents
-of the window that @onscreen{Show Active Keybindings} opens
-will depend where the keyboard focus was when the menu was
-selected.
-
-@section{Moving Around}
-
-@itemize[
-@keybinding["C-f"]{move forward one character}
-@keybinding["C-b"]{move backward one character}
-@keybinding["M-f"]{move forward one word}
-@keybinding["M-b"]{move backward one word}
-@keybinding["C-v"]{move forward one page}
-@keybinding["M-v"]{move backward one page}
-@keybinding["M-<"]{move to beginning of file}
-@keybinding["M->"]{move to end of file}
-
-@keybinding["C-a"]{move to beginning of line (left)}
-@keybinding["C-e"]{move to end of line (right)}
-@keybinding["C-n"]{move to next line (down)}
-@keybinding["C-p"]{move to previous line (up)}
-
-@keybinding["M-C-f"]{move forward one S-expression}
-@keybinding["M-C-b"]{move backward one S-expression}
-@keybinding["M-C-u"]{move up out of an S-expression}
-@keybinding["M-C-d"]{move down into a nested S-expression}
-@keybinding["M-C-SPACE"]{select forward S-expression}
-@keybinding["M-C-p"]{match parentheses backward}
-
-@keybinding["M-C-left"]{move backwards to the nearest editor box}
-@keybinding["A-C-left"]{move backwards to the nearest editor box}
-@keybinding["M-C-right"]{move forward to the nearest editor box}
-@keybinding["A-C-right"]{move forward to the nearest editor box}
-@keybinding["M-C-up"]{move up out of an embedded editor}
-@keybinding["A-C-up"]{move up out of an embedded editor}
-@keybinding["M-C-down"]{move down into an embedded editor}
-@keybinding["A-C-down"]{move down into an embedded editor}
-
-@keybinding["C-C C-Z"]{move the cursor to the interactions window}
-@keybinding["C-F6"]{move the cursor between different windows (usually
-                    the interactions and definitions windows, but also the
-                    search window and other editable portions of DrRacket).
-                    Also, search for ``shift-focus'' in the
-                    @onscreen{Show Active Keybindings} menu's window for more, 
-                    platform-specific keybindings that have this functionality}
-]
-
-@section{Editing Operations}
-
-@itemize[
-@keybinding["C-_"]{undo}
-@keybinding["C-+"]{redo}
-@keybinding["C-x u"]{undo}
-
-@keybinding["C-d"]{delete forward one character}
-@keybinding["C-h"]{delete backward one character}
-@keybinding["M-d"]{delete forward one word}
-@keybinding["M-DEL"]{delete backward one word}
-@keybinding["C-k"]{delete forward to end of line}
-@keybinding["M-C-k"]{delete forward one S-expression}
-
-@keybinding["M-w"]{copy selection to clipboard}
-@keybinding["C-w"]{delete selection to clipboard (cut)}
-@keybinding["C-y"]{paste from clipboard (yank)}
-
-@keybinding["C-t"]{transpose characters}
-@keybinding["M-t"]{transpose words}
-@keybinding["M-C-t"]{transpose sexpressions}
-
-@keybinding["M-C-m"]{toggle dark green marking of matching parenthesis}
-@keybinding["M-C-k"]{cut complete sexpression}
-
-@keybinding["M-("]{wrap selection in parentheses}
-@keybinding["M-["]{wrap selection in square brackets}
-@keybinding["M-{"]{wrap selection in curly brackets}
-@keybinding["M-S-L"]{wrap selection in @litchar{(lambda () }...@litchar{)}
-                     and put the insertion point in the argument list of the lambda}
-
-@keybinding["C-c C-o"]{the sexpression following the
-  insertion point is put in place of its containing sexpression}
-@keybinding["C-c C-e"]{the first and last characters (usually parentheses)
-  of the containing expression are removed}
-@keybinding["C-c C-l"]{wraps a let around the
-  sexpression following the insertion point and puts a printf in at
-  that point (useful for debugging).}
-
-@keybinding["M-o"]{toggle @as-index{overwrite mode}}
-
-@keybinding["C-x r a"]{Adjust nearby ASCII art rectangles 
-                       (that use @litchar{+}, @litchar{-}, or @litchar{|})
-                       to use Unicode characters.
-                       
-                       For example, if the insertion point is next to this rectangle:
-                       @tabular[(list (list @litchar{+-+})
-                                      (list @litchar{| |})
-                                      (list @litchar{+-+}))]
-                       then the keystroke will turn it into this one:
-                       @tabular[(list (list @litchar{╔═╗})
-                                      (list @litchar{║ ║})
-                                      (list @litchar{╚═╝}))]
-                       Similarly, if the rectangle near the insertion point has
-                       mixed Unicode and ASCII, it will all be converted to 
-                       the Unicode characters.
-                       }
-
-@keybinding["C-x r w"]{Widen the nearby ASCII art rectangles.
-                       
-                       For example, if the insertion point is just to the left of
-                       the middle line of this rectangle:
-                       @tabular[(list (list @litchar{╔═╦══╗})
-                                      (list @litchar{║ ║  ║})
-                                      (list @litchar{╠═╬══╣})
-                                      (list @litchar{║ ║  ║})
-                                      (list @litchar{╚═╩══╝}))]
-                       then the keystroke will turn it into this one:
-                       @tabular[(list (list @litchar{╔══╦══╗})
-                                      (list @litchar{║  ║  ║})
-                                      (list @litchar{╠══╬══╣})
-                                      (list @litchar{║  ║  ║})
-                                      (list @litchar{╚══╩══╝}))]
-                       }
-@keybinding["C-x r c"]{Centers the contents of the current line inside the enclosing
-                       cell of the enclosing ASCII art rectangle.}
-]
-
-@section{File Operations}
-
-@itemize[
-@keybinding["C-x C-s"]{save file}
-@keybinding["C-x C-w"]{save file under new name}
-]
-
-@section{Search}
-
-@itemize[
-@keybinding["C-s"]{search for string forward}
-@keybinding["C-r"]{search for string backward}
-]
-
-@section{Evaluation}
-
-@itemize[
-@keybinding["F5"]{Run}
-]
-
-@section{Documentation}
-@itemize[
-  @keybinding["f1"]{Search in the documentation for the words near the insertion point}
-  @keybinding["f2"]{Reveal the blue box for the identifier at the insertion point (requires
-                    background check syntax to be enabled, or normal check syntax to have been
-                    run).}
-]
-
-@section{Interactions}
-
-The @tech{interactions window} has all of the same keyboard shortcuts
-as the @tech{definitions window} plus a few more:
-
-@itemize[
-@keybinding["M-p"]{bring the previously entered expression down to the prompt}
-@keybinding["M-n"]{bring the expression after the current expression in the
-  expression history down to the prompt}
-@keybinding["M-h"]{Show the current expression history in a separate window}
-]
-
-@section{LaTeX and TeX inspired keybindings}
-
-@itemize[
-@keybinding['("C-\\" "M-\\" "c:x;l")]{traces backwards from the insertion
-point, looking for a backslash followed by a @index["LaTeX"]{LaTeX} 
-macro name or a prefix of such a name. If a macro name is found,
-it replaces the backslash and the name with the corresponding key in
-the table below; if a (proper) prefix @math{p} is found, it replaces @math{p} 
-with the longest common prefix of all macro names that have @math{p} as a 
-prefix (unless there is only one such name, in which case it behaves as if 
-@math{p} were a complete macro name).
-
-These are the currently supported macro names and the keys they map into:
-@(make-table
-  '()
-  (for/list ([line (in-list tex-shortcut-table)])
-    (define macro (list-ref line 0))
-    (define char (list-ref line 1))
-    (when (equal? char "\f")
-      (set! char "^L"))
-    (unless (equal? (regexp-replace* #px"[[:cntrl:]]" char " ") char)
-      (error 'keybindings.scrbl "cannot render a non-printing character"))
-    (list (make-flow (list (make-paragraph (list (index (format "\\~a keyboard shortcut" macro))
-                                                 (tt (format " \\~a" macro))))))
-          (make-flow (list (make-paragraph (list (hspace 1) char)))))))
-}
-]
-
-@section[#:tag "defining-shortcuts"]{Defining Custom Shortcuts}
-
- The @onscreen{Add User-defined Keybindings...} menu item in the
- @onscreen{Keybindings} sub-menu of @onscreen{Edit} selects a file
- containing Racket definitions of keybindings. The file must contain a
- module that uses a special keybindings language,
- @racket[framework/keybinding-lang]. To do so, begin your file with
- this line:
-
-@racketmod[
-s-exp framework/keybinding-lang
-]
-
-The @racket[framework/keybinding-lang] languages provides all of the bindings
-from @racketmodname[racket], @racketmodname[racket/class], and
-@racketmodname[drracket/tool-lib], 
-except that it adjusts @|mz-mod-begin| to
-introduce a @racketidfont{keybinding} form:
-
-@specform[#:literals (keybindings)
-          (keybinding string-expr proc-expr)]{
-
-Declares a keybinding, where @racket[string-expr] must produce a
-suitable first argument for @xmethod[keymap% map-function], and the
-@racket[proc-expr] must produce a suitable second argument for
-@xmethod[keymap% add-function].}
-
-For example, this remaps the key combination ``control-a'' key to ``!''.
-
-@racketmod[
-s-exp framework/keybinding-lang
-(keybinding "c:a" (λ (editor evt) (send editor insert "!")))
-]
-
-Since the file contains plain Racket code, you can write keybindings
-files that use DrRacket's @seclink[#:doc '(lib
-"scribblings/tools/tools.scrbl") "implementing-tools"]{Extension API}.
-For example, the following file binds ``control-t'' and ``control-='' to
-a execute the program and open a new tab respectively, as they were used
-before version 5.2.
-
-@racketmod[
-s-exp framework/keybinding-lang
-
-(define modifiers
-  (apply string-append
-         (map (λ (p)
-                (case p
-                  [(ctl) "c:"] [(cmd) "d:"] [(alt meta) "~c:m:"]
-                  [(shift) "s:"] [(option) "a:"]))
-              (get-default-shortcut-prefix))))
-
-(define-syntax-rule (frame-key key command)
-  (keybinding
-   (string-append modifiers key)
-   (λ (ed evt)
-     (when (is-a? ed text:basic<%>)
-       (define fr (send ed get-top-level-window))
-       @code:comment{note: fr could be #f}
-       (when fr (send fr command))))))
-
-(frame-key "t" execute-callback)
-(frame-key "=" create-new-tab)
-]
-
-Another example, this file rebinds ``control-w'' to delete the word
-behind the insertion point, but it does it by setting a new key to 
-be an existing keyboard shortcut. If you see a key in the 
-@onscreen{Show Active Keybindings} dialog (in the @onscreen{Keybindings}
-submenu of the @onscreen{Edit} menu), then you can use its
-name with the new keystroke you want, like this:
-
-@racketmod[
-s-exp framework/keybinding-lang
-
-(define (rebind key command)
-  (keybinding
-   key
-   (λ (ed evt)
-     (send (send ed get-keymap) call-function
-           command ed evt #t))))
-
-(rebind "c:w" "backward-kill-word")
-]
-
-This example shows how to bind a menu item (based on its name) to a particular key.
-The call at the end of the example binds ``control-a'' to the @onscreen{Run}
-menu item.
-
-@racketmod[
-s-exp framework/keybinding-lang
-
-(define (menu-bind key menu-item)
-  (keybinding
-   key
-   (λ (ed evt)
-     (define canvas (send ed get-canvas))
-     (when canvas
-       (define menu-bar (find-menu-bar canvas))
-       (when menu-bar
-         (define item (find-item menu-bar menu-item))
-         (when item
-           (define menu-evt
-             (new control-event% 
-                  [event-type 'menu]
-                  [time-stamp 
-                   (send evt get-time-stamp)]))
-           (send item command menu-evt)))))))
-
-(define/contract (find-menu-bar c)
-  (-> (is-a?/c area<%>) (or/c #f (is-a?/c menu-bar%)))
-  (let loop ([c c])
-    (cond
-      [(is-a? c frame%) (send c get-menu-bar)]
-      [(is-a? c area<%>) (loop (send c get-parent))]
-      [else #f])))
-
-(define/contract (find-item menu-bar label)
-  (-> (is-a?/c menu-bar%)
-      string?
-      (or/c (is-a?/c selectable-menu-item<%>) #f))
-  (let loop ([o menu-bar])
-    (cond
-      [(is-a? o selectable-menu-item<%>)
-       (and (equal? (send o get-plain-label) label)
-            o)]
-      [(is-a? o menu-item-container<%>)
-       (for/or ([i (in-list (send o get-items))])
-         (loop i))]
-      [else #f])))
-
-(menu-bind "c:a" "Run")]
-
-Note that DrRacket does not reload keybindings files automatically when you
-make changes, so you'll need to restart DrRacket to see changes to
-the file.
-
-@section{Sending Program Fragments to the REPL}
-
-@index['("Emacs keybindings")]Users comfortable with Emacs and the conventional Lisp/Scheme-style
-of interaction with an ``inferior process'' commonly request
-keybindings in DrRacket that send program fragments to be evaluated
-at the prompt. This style of interaction is fraught with difficulty, 
-especially for beginners, and so DrRacket, by default, does not support
-it. Instead, clicking DrRacket's ``Run'' button starts with a clean slate
-and sends the entire contents of the definitions window, ensuring that
-the state in the REPL matches what you would expect by reading
-the source code of the program.
-
-Based on years of experience with Emacs modes, some of the authors 
-consider this mode of interaction also appropriate for experienced 
-programmers. Indeed, they go through great effort to mimic this 
-behavior in Emacs. 
-
-That said, some people may wish to use such incremental keystroke modes
-anyway. Therefore the remainder of this section illustrates how to add such
-an incremental mode for your personal use with an example keybindings
-file. Specifically, the file shows how to add the ability to send
-expressions piecemeal to the interactions window. It also demonstrates how
-to pull together a bunch of pieces of DrRacket's implementation and its
-libraries to implement keystrokes. 
-
-@(define-runtime-path incremental-keybindings.rkt "incremental-keybindings.rkt")
-@(let ([sp (open-output-string)])
-   (call-with-input-file incremental-keybindings.rkt
-     (λ (port)
-       (copy-port port sp)))
-   (codeblock (get-output-string sp)))
-
-Others may wish to use the above example to invent other keystrokes for
-making work in DrRacket convenient. 
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/languages.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/drracket/languages.scrbl
deleted file mode 100644
index 86da36bba8..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/languages.scrbl
+++ /dev/null
@@ -1,372 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label errortrace/errortrace-lib compiler/cm planet/config))
-
-@title[#:tag "languages" #:style 'toc]{Languages}
-
-This chapter describes some of the languages that are available for
-use within DrRacket. The list here is potentially incomplete, because
-new languages can be added through DrRacket plug-ins.
-
-@local-table-of-contents[]
-
-@; ----------------------------------------
-
-@section[#:tag "module"]{Language Declared in Source}
-
-The @as-index{@drlang{The Racket Language} mode}
-in DrRacket is a kind of meta-language, where the program itself
-specifies its language, usually through a @hash-lang[] line.
-
-More generally, when using this mode, the
-@tech{definitions window} must contain a module in some form. Besides
-@hash-lang[], a Racket module can be written as @racket[(module
-...)]; aside from comments, the @tech{definitions window}
-must contain exactly one module.
-
-In the details pane of the language dialog, some of the configuration
-options correspond to using various libraries and thus can be used
-without DrRacket.  Here's how, for the ones that are straightforward
-(the ones not mentioned here require more sophisticated configuration
-of various libraries).
-
-@itemize[
- @item{@bold{Dynamic Properties}: 
-        The radio buttons corresond to various uses of the @racketmodname[errortrace/errortrace-lib] library.
-        
-        The @italic{No Debugging or profiling} option means not to use the library at all.
-        
-        The @italic{Debugging} option means @racket[(current-compile (make-errortrace-compile-handler))] as well as
-        adding @racket[(build-path "compiled" "errortrace")] to @racket[use-compiled-file-paths].
-        
-        The @italic{Debugging and profiling} option means to use @racketmodname[errortrace/errortrace-lib] library's 
-        @racket[profiling-enabled] in conjunction with @racket[current-eval].
-        
-        The @italic{Syntactic test suite coverage} option means to use @racket[test-coverage-enabled]
-        in conjunction with @racket[current-eval].
-
-        The other three checkboxes save compiled @tt{.zo} files and adjust the compiler. 
-        
-        The @italic{populate compiled/ directories} option corresponds to 
-        @racketblock[(current-load/use-compiled 
-                      (make-compilation-manager-load/use-compiled-handler))
-                     (manager-skip-file-handler
-                      (λ (p) 
-                        (file-date-in-paths 
-                         p
-                         (cons (CACHE-DIR) (current-library-collection-paths)))))]
-        plus adding either @racket[(build-path "compiled" "drracket")] or 
-        @racket[(build-path "compiled" "drracket" "errortrace")]
-        to the front of @racket[use-compiled-file-paths], depending if the
-        @italic{Debugging} option is set or not.
-        
-        The @italic{Preserve stacktrace} option corresponds to 
-        @racketblock[(compile-context-preservation-enabled #t)]
-        
-        The @italic{Enforce constant definitions (enables some inlining)} option
-        corresponds to calling @racket[compile-enforce-module-constants];
-        checking it passes @racket[#t] and leaving it unchecked passes @racket[#f].
-        }
- @item{@bold{Output Syntax}: The output syntax options correspond to settings in the @racketmodname[racket/pretty] library 
-       and the @racketmodname[mzlib/pconvert] library.}
- @item{@bold{Collection Paths}: This corresponds to setting the @racket[current-library-collection-paths] parameter.}
- @item{@bold{Command-line arguments}: This corresponds to setting the @racket[current-command-line-arguments] parameter.}
-]
-
-@; ----------------------------------------
-
-@section[#:tag "legacy"]{Legacy Languages}
-
-DrRacket supports several historically useful variants of Scheme
-without a @hash-lang[] prefix:
-
-@itemize[
-
- @item{The @as-index{@drlang{R5RS} language} contains those
-  primitives and syntax defined in the R@superscript{5}RS Scheme
-  standard. See the @racketmodname[r5rs] library for details.}
-
- @item{The @as-index{@defterm{PLT Pretty Big} language} provides a
-  language roughly compatible with a language in earlier versions of
-  DrRacket. It evaluates a program in the same way as @racket[load],
-  and it starts by importing the following modules:
-  @racketmodname[mzscheme], @racketmodname[racket/gui/base],
-  @racketmodname[mzlib/class], @racketmodname[mzlib/etc],
-  @racketmodname[mzlib/file], @racketmodname[mzlib/list],
-  @racketmodname[mzlib/unit], @racketmodname[mzlib/include],
-  @racketmodname[mzlib/defmacro], @racketmodname[mzlib/pretty],
-  @racketmodname[mzlib/string], @racketmodname[mzlib/thread],
-  @racketmodname[mzlib/math], @racketmodname[mzlib/match], and
-  @racketmodname[mzlib/shared].}
-
- @item{The @as-index{@drlang{Swindle} language} starts with the same
-  bindings as @racketmodname[swindle #:indirect], and evaluates the program like
-  @racket[load].}
-
-]
-
-@; ----------------------------------------
-
-@section[#:tag "htdp-langs"]{@|HtDP| Teaching Languages}
-
-Five of DrRacket's languages are specifically designed for teaching:
-
-@itemize[
-
- @item{The @as-index{@drlang{Beginning Student} language} is a small
-       version of Racket that is tailored for beginning computer
-       science students.}
-       
- @item{The @as-index{@drlang{Beginning Student with List
-       Abbreviations} languages} is an extension to Beginning Student
-       that prints lists with @racket[list] instead of @racket[cons],
-       and accepts @racket[quasiquote]d input.}
-
- @item{The @as-index{@drlang{Intermediate Student} language} adds
-       local bindings and higher-order functions.}
-
- @item{The @as-index{@drlang{Intermediate Student with Lambda}
-       language} adds anonymous functions.}
-
- @item{The @as-index{@drlang{Advanced Student} language} adds mutable
-       state.}
-
-]
-
-The teaching languages are different from conventional Racket in a number
-of ways:
-
-@itemize[
-
- @item{@defterm{Case-sensitive identifiers and symbols} --- In a
-       case-sensitive language, the variable names @racket[x] and
-       @racket[X] are distinct, and the symbols @racket['x] and
-       @racket['X] are also distinct. In a case-insensitive language,
-       @racket[x] and @racket[X] are equivalent and @racket['x] and
-       @racket['X] represent the same value. The teaching languages
-       are case-sensitive by default, and other languages are usually
-       case-insensitive. Case-sensitivity can be adjusted through the
-       detail section of the language-selection dialog.}
-        
- @item{@defterm{All numbers are exact unless @racketmetafont{#i} is
-       specified} --- In the @drlang{Beginning Student} through
-       @drlang{Intermediate Student with Lambda languages}, numbers
-       containing a decimal point are interpreted as exact
-       numbers. This interpretation allows students to use familiar
-       decimal notation without inadvertently triggering inexact
-       arithmetic. Exact numbers with decimal representations are also
-       printed in decimal. Inexact inputs and results are explicitly
-       marked with @racketmetafont{#i}.}
-
- @item{@defterm{Procedures must take at least one argument} --- In the
-       @drlang{Beginning Student} through @drlang{Intermediate
-       Student} languages, defined procedures must consume at least
-       one argument. Since the languages have no side-effects,
-       zero-argument functions are not useful, and rejecting such
-       function definitions helps detect confusing syntactic
-       mistakes.}
-
- @item{@defterm{Identifier required at function call position} --- In
-       the @drlang{Beginning Student} through @drlang{Intermediate
-       Student} languages, procedure calls must be of the form
-       @racket[(_identifier ...)]. This restriction helps detect
-       confusing misuses of parentheses, such as @racket[(1)] or
-       @racket[((+ 3 4))], which is a common mistake among beginners
-       who are used to the optional parentheses of algebra.}
-
- @item{@defterm{Top-level required at function call position} --- In
-       the @drlang{Beginning Student} languages, procedure calls must
-       be of the form @racket[(_top-level-identifier ...)], and the
-       number of actual arguments must match the number of formal
-       arguments if @racket[_top-level-identifier] is
-       @racket[define]d. This restriction helps detect confusing
-       misuses of parentheses, such as @racket[(x)] where @racket[x]
-       is a function argument. DrRacket can detect such mistakes
-       syntactically because Beginning Student does not support
-       higher-order procedures.}
-
- @item{@defterm{Primitive and defined functions allowed only in
-       function call position} --- In @drlang{Beginning Student}
-       languages, the name of a primitive operator or of a defined
-       function can be used only after the open-parenthesis of a
-       function call (except where teachpack extensions allow
-       otherwise, as in the @racket[convert-gui] teachpack). Incorrect
-       uses of primitives trigger a syntax error. Incorrect uses of
-       defined names trigger a run-time error.  DrRacket can detect
-       such mistakes because Beginning Student does not support
-       higher-order procedures.}
-
- @item{@defterm{@racket[lambda] allowed only in definitions} --- In
-       the Beginning Student through Intermediate Student languages,
-       @racket[lambda] (or @racket[case-lambda]) may appear only in a
-       definition, and only as the value of the defined variable.}
-
- @item{@defterm{Free variables are not allowed} --- In the
-       @drlang{Beginning Student} through @drlang{Advanced Student}
-       languages, every variable referenced in the definitions window
-       must be defined, pre-defined, or the name of a local function
-       argument.}
-
- @item{@defterm{@racket[quote] works only on symbols,
-       @racket[quasiquote] disallowed} --- In the @drlang{Beginning
-       Student} language, @racket[quote] and @racketvalfont{'} can
-       specify only symbols. This restriction avoids the need to
-       explain to beginners why @racket[1] and @racket['1] are
-       equivalent in standard Racket. In addition,
-       @racket[quasiquote], @litchar{`}, @racket[unquote],
-       @litchar{,}, @racket[unquote-splicing], and @litchar[",@"] are
-       disallowed.}
-
- @item{@defterm{Unmatched @racket[cond]/@racket[case] is an error} ---
-       In the @drlang{Beginning Student} through @drlang{Advanced
-       Student} languages, falling through a @racket[cond] or
-       @racket[case] expression without matching a clause signals a
-       run-time error. This convention helps detect syntactic and
-       logical errors in programs.}
-
- @item{@defterm{Conditional values must be @racket[true] or
-       @racket[false]} --- In the @drlang{Beginning Student} through
-       @drlang{Advanced Student} languages, an expression whose value
-       is treated as a boolean must return an actual boolean,
-       @racket[true] or @racket[false]. This restriction, which
-       applies to @racket[if], @racket[cond], @racket[and],
-       @racket[or], @racket[nand], and @racket[nor] expressions, helps
-       detect errors where a boolean function application is omitted.}
-
- @item{@defterm{@racket[+], @racket[*], and @racket[/] take at least
-       two arguments} --- In the @drlang{Beginning Student} through
-       @drlang{Advanced Student} languages, mathematical operators
-       that are infix in algebra notation require at least two
-       arguments in DrRacket. This restriction helps detect missing
-       arguments to an operator.}
-
- @item{@defterm{@racket[and], @racket[or], @racket[nand], and
-       @racket[nor] require at least 2 expressions} --- In the
-       @drlang{Beginning Student} through @drlang{Advanced Student}
-       languages, the boolean combination forms require at least two
-       sub-expressions.  This restriction helps detect missing or
-       ill-formed sub-expressions in a boolean expression.}
-
- @item{@defterm{@racket[set!] disallowed on arguments} --- In the
-       @drlang{Advanced Student} language, @racket[set!] cannot be
-       used to mutate variables bound by @racket[lambda]. This
-       restriction ensures that the substitution model of function
-       application is consistent with DrRacket's evaluation.}
-
- @item{@defterm{Improper lists disallowed} --- A @defterm{proper list}
-       is either an empty list or a list created by @racket[cons]ing
-       onto a proper list. In the @drlang{Beginning Student} through
-       @drlang{Advanced Student} languages, @racket[cons] constructs
-       only @defterm{proper lists}, signaling an error if the second
-       argument is not a proper list. Since beginning students do not
-       need improper lists, this restriction help detect logical
-       errors in recursive functions.}
-
- @item{@defterm{Dot is disallowed} --- In the @drlang{Beginning
-       Student} through @drlang{Advanced Student} languages, a
-       delimited period @litchar{.} is disallowed, (e.g., as an
-       improper-list constructor in a quoted form, or for defining
-       multi-arity procedures).}
-
- @item{@defterm{Syntactic form names disallowed as variable names} ---
-       In the @drlang{Beginning Student} through @drlang{Advanced
-       Student} languages, all syntactic form names are keywords that
-       cannot be used as variable names.}
-
- @item{@defterm{Re-definitions are disallowed} --- In the
-       @drlang{Beginning Student} through @drlang{Advanced Student}
-       languages, top-level names can never be re-defined.}
-
- @item{@defterm{Function definitions are allowed only in the
-       definitions window} --- In the @drlang{Beginning Student}
-       languages, function definitions are not allowed in the
-       interactions window.}
-
-]
-
-The teaching languages also deviate from traditional Racket in
-printing values. Different printing formats can be selected for any
-language through the detail section of language-selection dialog.
-
-@itemize[
-
- @item{@defterm{Constructor-style output} --- See
-       @secref["output-syntax"].}
-
- @item{@defterm{Quasiquote-style output} --- See
-       @secref["output-syntax"].}
-     
-   @item{@defterm{Rational number printing} -- In the teaching
-     languages, all numbers that have a finite decimal expansion are
-     printed in decimal form. For those numbers that do not have a
-     finite decimal expansion (such as @racket[4/3]) DrRacket offers a
-     choice. It either prints them as mixed fractions or as repeating
-     decimals, where the repeating portion of the decimal expansion is
-     shown with an overbar. In addition, DrRacket only shows the first
-     25 digits of the number's decimal expansion. If there are more
-     digits, the number appears with an ellipses at the end. Click the
-     ellipses to see the next 25 digits of the expansion.
-
-     This setting controls only the initial display of a number.
-     Right-clicking or Control-clicking (Mac OS X) on the number lets
-     you change from the fraction representation to the decimal
-     representation.}
-
- @item{@defterm{@racket[write] output} --- Prints values with
-        @racket[write].}
-
- @item{@defterm{Show sharing in values} --- Prints interaction results
-       using the @racket[shared] syntax, which exposes shared
-       structure within a value. For example, the list created by
-       @racket[(let ([lt (list 0)]) (list lt lt))] prints as
-
-@racketblock[
-(shared ((-1- (list 0))) (list -1- -1-))
-]
-
-       instead of
-
-@racketblock[
-(list (list 0) (list 0))
-]
-}
-
-]
-
-A program in the teaching languages should be tested using the check forms ---
- @racket[(check-expect value value)], @racket[(check-within value value value)], or
- @racket[(check-error value string)]. Tests are evaluated when running the program:
- when there are no tests, a warning appears in the interactions window;
- when all tests succeed, an acknowledgement appears in the interactions window;
- otherwise, a testing window appears to report the results. See @secref["menu:view"] 
- for details on configuring the report behavior. 
- 
- Tests can be disabled if necessary, see @secref["menu:racket"] for details.
-
-One final difference between these teaching languages and other languages is the way
-they save files. That is, when DrRacket saves a file and the current language
-is one of these five teaching languages, it inserts three lines of metadata that 
-record the precise language (including any options set) and the teachpacks.
-This has two benefits: opening the file later restores the settings and the metadata
-is formulated in such a way as to be executable code so running @exec{racket} or 
-@exec{gracket} on the file in a shell will run the program in the appropriate language.
-
-This meta data always consists of exactly three lines, and so can be stripped out
-by three calls to @racket[read-line].
- 
-@; ----------------------------------------
-
-@section[#:tag "experimental-langs"]{Other Experimental Languages}
-
-For information on @onscreen{Lazy Racket}, see @other-doc['(lib
-"lazy/lazy.scrbl") #:indirect "Lazy Racket"].
-
-For information on @onscreen{FrTime}, see @other-doc['(lib
-"frtime/scribblings/frtime.scrbl") #:indirect "FrTime"].
-
-For information on @onscreen{Algol 60}, see @other-doc['(lib
-"algol60/algol60.scrbl") #:indirect "Algol 60"].
-
-@; ----------------------------------------
-
-@include-section["printing.scrbl"]
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/make-indentation-table.rkt b/pkgs/drracket-pkgs/drracket/scribblings/drracket/make-indentation-table.rkt
deleted file mode 100644
index 80f60695a8..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/make-indentation-table.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         framework
-         racket/class
-         racket/runtime-path)
-
-#|
-
-The computations done in this file could be done as
-part of the documentation build, except that 
-racket/gui/base isn't available then and disentangling
-the indentation code from racket/gui/base seems painful.
-
-|#
-
-(define examples
-  '((app-example1 "(f a\nb\nc)")
-    (app-example2 "(f\na\nb\nc)")
-    (begin-example1 "(begin a\nb\nc)")
-    (begin-example2 "(begin\na\nb\nc)")
-    (define-example1 "(define x\n1)")
-    (define-example2 "(struct s t \n(a b c))")
-    (define-example3 "(define\n(f x)\n1)")
-    (lambda-example1 "(λ (x y)\n1)")
-    (lambda-example2 "(lambda\n(x y)\n1)")
-    (for/fold-example
-     "(for/fold ([acc 0])\n([x (in-range 10)]\n[y (in-list l)])\nb\nc)")))
-
-
-(define run-example
-  (let ()
-    (define f (new frame% [label ""]))
-    (define t (new racket:text%))
-    (define ec (new editor-canvas% [parent f] [editor t]))
-    (λ (example)
-      (send t erase)
-      (send t insert example)
-      (send t tabify-all)
-      (send t get-text))))
-
-(define-runtime-path indentation-table.rkt "indentation-table.rkt")
-
-(module+ main
-  (call-with-output-file indentation-table.rkt
-    (λ (port)
-      (fprintf port "#lang racket/base\n")
-      (fprintf port ";; warning, this file is generated by another program\n")
-      (fprintf port "~s\n" `(provide (all-defined-out)))
-      (for ([example (in-list examples)])
-        (fprintf port "~s\n" `(define ,(list-ref example 0) 
-                                ,(run-example (list-ref example 1))))))
-    #:exists 'truncate))
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/menus.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/drracket/menus.scrbl
deleted file mode 100644
index 53facf77ae..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/menus.scrbl
+++ /dev/null
@@ -1,494 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/struct)
-
-@(define (defmenuitem . s)
-  (let ([mi (apply onscreen s)])
-    @index*[(list (string-append (element->string mi) " menu item"))
-            (list (elem mi " menu item"))]{@|mi| :}))
-
-@(define lam-str "\u03BB")
-
-@title{Menus}
-
-@section[#:tag "menu:file"]{@onscreen{File}}
-
-@itemize[
-  
- @item{@defmenuitem{New} Creates a new DrRacket window.}
-
- @item{@defmenuitem{New Tab} Creates a new tab in the current DrRacket window.}
-
- @item{@defmenuitem{Open...} Opens a find-file dialog for choosing
-  a file to load into a @tech{definitions window}.}
-  
- @item{@defmenuitem{Open Recent} Lists recently opened
-   files. Choosing one of them opens that file for editing.}
-  
- @item{@defmenuitem{Open Require Path...} Opens a dialog where you
-        can enter in a @racket[require]-like module path (e.g.,
-        @litchar{racket/base.rkt} or @litchar{data/splay-tree.rkt}
-        or @litchar{"x.rkt"})
-        and edit the corresponding files in the @tech{definitions window}.}
- 
- @item{@defmenuitem{Install PLT File...} Opens a dialog asking for the
-   location of the @filepath{.plt} file (either on the local disk or
-   on the web) and installs the contents of the file.}
-
- @item{@defmenuitem{Revert} Re-loads the file that is currently in the
-  @tech{definitions window}. All changes since the file was last saved
-  will be lost.}
-  
- @item{@defmenuitem{Save Definitions} Saves the program in the
-  @tech{definitions window}. If the program has never been saved
-  before, a save-file dialog appears.}
-  
- @item{@defmenuitem{Save Definitions As...} Opens a save-file dialog for
-  choosing a destination file to save the program in the definitions
-  window. Subsequent saves write to the newly-selected file.}
-  
- @item{@defmenuitem{Save Other} Contains these sub-items
- @itemize[
-
- @item{@defmenuitem{Save Definitions As Text...} Like @onscreen{Save
-  Definitions As...}, but the file is saved in plain-text format (see
-  @secref["drracket-file-formats"]). Subsequent saves also write in
-  plain-text format.}
-  
- @item{@defmenuitem{Save Interactions} Saves the contents of the interactions
-  window to a file. If the interaction constants have never been saved
-  before, a save-file dialog appears.}
-  
- @item{@defmenuitem{Save Interactions As...}  Opens a save-file dialog for
-  choosing a destination file to save the contents of the interactions
-  window. Subsequent saves write to the newly-selected file.}
-  
- @item{@defmenuitem{Save Interactions As Text...}  Like @onscreen{Save
-  Interactions As...}, but the file is saved in plain-text format (see
-  @secref["drracket-file-formats"]). Subsequent saves are write in
-  plain-text format.}
-  
- ]}
- 
-@item{@defmenuitem{Log Definitions and Interactions...} Starts a
-  running of log of the text in the interactions and definitions
-  windows, organized by executions. In a directory of your choosing,
-  DrRacket saves files with the names @filepath{01-definitions},
-  @filepath{01-interactions}, @filepath{02-definitions},
-  @filepath{02-interactions}, @|etc| as you interact with various
-  programs.}
-
- @item{@defmenuitem{Print Definitions...} Opens a dialog for printing
-  the current program in the @tech{definitions window}.}
-
- @item{@defmenuitem{Print Interactions...} Opens a dialog for printing the
-  contents of the @tech{interactions window}.}
-
-@item{@defmenuitem{Search in Files...} Opens a dialog where you can
-  specify the parameters of a multi-file search. The results of the
-  search are displayed in a separate window.}
-
- @item{@defmenuitem{Close} Closes this DrRacket window. If this window
-  is the only open DrRacket window, then DrRacket quits, except on
-  Mac OS X.}
-
- @item{{@onscreen{Quit} or @onscreen{Exit}} Exits DrRacket. (On Mac
-  OS X, this menu item is in the Apple menu.)}
-
-]
-
-@; ----------------------------------------
-
-@section{@onscreen{Edit}}
-
-All @onscreen{Edit} menu items operate on either the definitions or
-interactions window, depending on the location of the selection or
-blinking caret. Each window maintains its own Undo and Redo history.
-
-@itemize[
-
- @item{@defmenuitem{Undo} Reverses an editing action. Each window
-  maintains a history of actions, so multiple @onscreen{Undo}
-  operations can reverse multiple editing actions.}
-
- @item{@defmenuitem{Redo} Reverses an @onscreen{Undo} action. Each
-  window (and boxed-subwindow) maintains its own history of
-  @onscreen{Undo} actions, so multiple @onscreen{Redo} operations can
-  reverse multiple @onscreen{Undo} actions.}
-
- @item{@defmenuitem{Cut} Copies the selected text to the clipboard and
-  deletes it from the window.}
-
- @item{@defmenuitem{Copy} Copies the selected text to the clipboard.}
-
- @item{@defmenuitem{Paste} Pastes the current clipboard contents into the
-  window.}
-
- @item{@defmenuitem{Delete} or @defmenuitem{Clear} Deletes the selected text.}
-
- @item{@defmenuitem{Select All} Highlights the entire text of the buffer.}
-
-  @item{@defmenuitem{Wrap Text} Toggles between wrapped text and
-  unwrapped text in the window.}
-
- @item{@defmenuitem{Find} Opens an interactive search
- window at the bottom of the frame and moves the insertion
- point to the search string editor (or out of it, if the
- insertion point is already there).
-
- See also @secref["Searching"].}
-
- @item{@defmenuitem{Find From Selection}
-        Just like @onscreen{Find}, except that it
-        copies the current selection into the search
-        window (but without using the clipboard, so
-        paste will paste whatever was last copied,
-        not the new search string)}
-
- @item{@defmenuitem{Find Again} Finds the next occurrence of the text 
- in the search window.}
-  
- @item{@defmenuitem{Find Again Backwards} Finds the next occurrence of the text 
- in the search window, but searching backwards.}
-  
-@item{@defmenuitem{Replace & Find Again} Replaces the selection with the
-  replace string (if it matches the find string) and finds the next
-  occurrence of the text that was last searched for, looking forwards.}
-
-@item{@defmenuitem{Replace & Find Again Backwards} Replaces the selection with the
-  replace string (if it matches the find string) and finds the next
-  occurrence of the text that was last searched for, looking backwards.}
-
-@item{@defmenuitem{Replace All} Replaces all occurrences of
-the search string with the replace string.}
-
-@item{@defmenuitem{Find Case Sensitive} Toggles between
-case-sensitive and case-insensitive search.}
-  
-@item{@defmenuitem{Keybindings} 
-@itemize[
-
-@item{@defmenuitem{Show Active Keybindings} Shows all of the
-  keybindings available in the current window.}
-
-@item{@defmenuitem{Add User-defined Keybindings...} Choosing this menu
-  item opens a file dialog where you can select a file containing
-  Racket-definitions of keybindings. See @secref["defining-shortcuts"]
-  for more information.}
-
-]}
-
-@item{@defmenuitem{Spell Check String Constants} Uses @tt{aspell}
-       or @tt{ispell} to look for unknown words in string constants
-       (things that would otherwise be colored green).}
-
-@item{@defmenuitem{Complete Word} Completes the word at the
-insertion point, using the manuals as a source of completions.}
-
- @item{@defmenuitem{Preferences...} Opens the preferences dialog. See
-  @secref["prefs-explanation"]. (On Mac OS X, this menu item is in
-  the Apple menu.)}  ]
-
-@; ----------------------------------------
-
-@section[#:tag "menu:view"]{@onscreen{View}}
-
-One each of the following show/hide pairs of menu items
-appears at any time.
-
-@itemize[
-
- @item{@defmenuitem{Toolbar} 
-        @itemize[
-          @item{@defmenuitem{Toolbar on Left} Moves the tool bar (on the top of DrRacket's window by default) to the left-hand side, organized vertically.}
-          @item{@defmenuitem{Toolbar on Top} Moves the toolbar to the top of the DrRacket window.}
-          @item{@defmenuitem{Toolbar on Right} Moves the tool bar to the right-hand side, organized vertically.}
-          @item{@defmenuitem{Toolbar Hidden} Hides the toolbar entirely.}]}
-
- @item{@defmenuitem{Split} Splits the current window in half to
-  allow for two different portions of the current window to
-  be visible simultaneously.}
-
- @item{@defmenuitem{Collapse} If the window has been split before, this
-   menu item becomes enabled, allowing you to collapse the split
-   window.}
-
-         
- @item{@defmenuitem{Show Definitions} Shows the definitions window.}
-
- @item{@defmenuitem{Hide Definitions} Hides the definitions window.}
-
- @item{@defmenuitem{Show Interactions} Shows interactions window.}
-
- @item{@defmenuitem{Hide Interactions} Hides interactions window.}
-
- @item{@defmenuitem{Use Vertical Layout} and @defmenuitem{Use Horizontal Layout}
-        adjust the definitions and interactions window so they
-        are either beside each other or with the definitions above
-        the interactions window.}
- 
- @item{@defmenuitem{Show Log} Shows the current log messages.}
- @item{@defmenuitem{Hide Log} Hides the current log messages.}
-
- @item{@defmenuitem{Show Tracing} Shows a trace of functions called since
-   the last time @onscreen{Run} was clicked. This menu is useful only if
-   you have enabled tracing in the @onscreen{Choose Language...} dialog's
-   @onscreen{Details} section. Profiling does not apply to all languages.}
-   
- @item{@defmenuitem{Hide Tracing} Hides the tracing display.}
-
- @item{@defmenuitem{Show Profile} Shows the current profiling
-   report. This menu is useful only if you have enabled profiling in
-   the @onscreen{Choose Language...} dialog's @onscreen{Details}
-   section. Profiling does not apply to all languages.}
-   
- @item{@defmenuitem{Hide Profile} Hides any profiling
-   information currently displayed in the DrRacket window.}
- 
- @item{@defmenuitem{Show Program Contour} Shows a ``20,000 foot''
-   overview window along the edge of the DrRacket
-   window. Each pixel in this window corresponds to a letter
-   in the program text.}
-
- @item{@defmenuitem{Hide Program Contour} Hides the contour window.}
- 
- @item{@defmenuitem{Show Line Numbers} Shows line numbers in the 
-        definitions window.}
- 
- @item{@defmenuitem{Hide Line Numbers} Hides the line numbers in the 
-        definitions window.}
-
-  @item{@defmenuitem{Show Column Width Guide at 102 Characters} 
-         Shows the column width guide when the current file's width
-         is greater than 102 characters.
-         
-         The number 102 is controlled in the @onscreen{General}
-         tab of the @onscreen{Editing} tab in the preferences dialog.}
-  @item{@defmenuitem{Hide Column Width Guide for 102 Characters} 
-         Hides the column width guide, even with the file's width
-         is greater than 102 characters.
-         
-         The number 102 is controlled in the @onscreen{General}
-         tab of the @onscreen{Editing} tab in the preferences dialog.}
-
- 
- @item{@defmenuitem{Show Module Browser} Shows the module DAG rooted
-   at the currently opened file in DrRacket.
-   
-   See also @secref["module-browser"].}
-
- @item{@defmenuitem{Hide Module Browser} Hides the module browser.
-        
-          See also @secref["module-browser"].}
-
-]
-
-Note: whenever a program is run, the interactions window is made
- visible if it is hidden.
-
-@; ----------------------------------------
-
-@section{@onscreen{Language}}
-
-@itemize[
-
- @item{@defmenuitem{Choose Language...} Opens a dialog for selecting
-  the current evaluation language. Click @onscreen{Run} to make the
-  language active in the interactions window. See
-  @secref["choose-language"] for more information about the
-  languages.}
-
-
- @item{@defmenuitem{Add Teachpack...} Opens a find-file dialog for
-  choosing a teachpack to extend the current language. Click
-  @onscreen{Run} to make the teachpack available in the interactions
-  windows. See @secref["extending-drracket"] for information on
-  creating teachpacks.}
-
-@item{@defmenuitem{Clear All Teachpacks} Clears all of the current
-  teachpacks.  Click @onscreen{Run} to clear the teachpack from the
-  interactions window.}
-
-]
-
-In addition to the above items, a menu item for each teachpack that
-clears only the corresponding teachpack.
-
-@; ----------------------------------------
-
-@section[#:tag "menu:racket"]{@onscreen{Racket}}
-
-@itemize[
-
- @item{@defmenuitem{Run} Resets the interactions window and runs the
-  program in the definitions window.}
-
- @item{@defmenuitem{Break} Breaks the current evaluation.}
-
- @item{@defmenuitem{Kill} Terminates the current evaluation.}
-
-@item{@defmenuitem{Limit Memory...} Allow you to specify a
-limit on the amount of memory that a program running in
-DrRacket is allowed to consume.}
-
-@item{@defmenuitem{Clear Error Highlight} Removes the red
-background that signals the source location of an error.
-Also removes the highlighting for uncovered (untested)
-portions of the program.}
-
- @item{@defmenuitem{Create Executable...} Creates a separate launcher
-   for running your program. See @secref["create-exe"] for more
-   info.}
-
-@item{@defmenuitem{Module Browser...} Prompts for a file and
-  then opens a window showing the module 
-  DAG starting at the module in the selected file.
-  
-  See also @secref["module-browser"].
-  }
-
-@item{@defmenuitem{Module Browser on @italic{file}} 
-       Opens a separate window showing the module graph rooted at the
-       file currently being edited in DrRacket, but
-       using the saved file on the disk, instead of the 
-       version in DrRacket.
-       
-  See also @secref["module-browser"].
-  }
-
- @item{@defmenuitem{Reindent} Indents the selected text according to
-  the standard Racket formatting conventions. (Pressing the Tab key
-  has the same effect.)}
-  
- @item{@defmenuitem{Reindent All} Indents all of the text in either
-  the definitions or interactions window, depending on the location of
-  the selection or blinking caret.}
-  
- @item{@defmenuitem{Comment Out with Semicolons} Puts @litchar{;}
-  characters at each of the beginning of each selected line of text.}
-
- @item{@defmenuitem{Comment Out with a Box} Boxes the selected
-  text with a comment box.}
-  
- @item{@defmenuitem{Uncomment} Removes all @litchar{;} characters at
-  the start of each selected line of text or removes a comment box
-  around the text. Uncommenting only removes a @litchar{;} if it
-  appears at the start of a line and it only removes the first
-  @litchar{;} on each line.}
-           
- @item{@defmenuitem{Disable Tests} Stops tests written in the definitions
-  window from evaluating when the program is Run. Tests can be enabled
-  using the @onscreen{Enable Tests} menu item. Disabling tests freezes
-  the contents of any existing test report window.
-  }
-
- @item{@defmenuitem{Enable Tests} Allows tests written in the definitions
-  window to evaluate when the program is Run. Tests can be disabled using
-  the @onscreen{Disable Tests} menu item.
-  }
-
-]
-
-@section{@onscreen{Insert}}
-
-@itemize[
-
- @item{@defmenuitem{Insert Comment Box} Inserts a box that is ignored
-  by DrRacket; use it to write comments for people who read your
-  program.}
-
- @item{@defmenuitem{Insert Image...} Opens a find-file dialog for
-  selecting an image file in GIF, BMP, XBM, XPM, PNG, or JPG
-  format. The image is treated as a value.}
-
- @item{@defmenuitem{Insert Fraction...} Opens a dialog for a
-   mixed-notation fraction, and inserts the given fraction into the
-   current editor.}
-  
- @item{@defmenuitem{Insert Large Letters...} Opens a dialog for a line of
-   text, and inserts a large version of the text (using semicolons and
-   spaces).
-          
-   Most of the dialog is self-explanatory: type in the top space to 
-   preview the semicolons in the bottom area. The numbers in the font
-   choice item show the (relative) widths of the letter ``w'' in the
-   given font to help you pick out the more boldfaced fonts (which
-   tend to look better).}
-
- @item{@defmenuitem{Insert @|lam-str|} Inserts the symbol @|lam-str|
-   (as a Unicode character) into the program. The @|lam-str| symbol is
-   normally bound the same as @racket[lambda].}
-
- @item{@defmenuitem{Insert XML Box} Inserts an XML; see
-   @secref["xml-boxes"] for more information.}
-
- @item{@defmenuitem{Insert Racket Box} Inserts a box to contain Racket
-   code, typically used inside an XML box; see @secref["xml-boxes"].}
-
- @item{@defmenuitem{Insert Racket Splice Box} Inserts a box to contain Racket
-   code, typically used inside an XML box; see also @secref["xml-boxes"].}
-
-]
-
-@; ----------------------------------------
-
-@section{@onscreen{Windows}}
-
-@itemize[
-
- @item{@defmenuitem{Bring Frame to Front...}  Opens a window that lists
-   all of the opened DrRacket frames. Selecting one of them brings the
-   window to the front.}
-
- @item{@defmenuitem{Most Recent Window} Toggles between the currently
-   focused window and the one that most recently had the focus.}
-
-]
-
-Additionally, after the above menu items, this menu contains
-an entry for each window in DrRacket. Selecting a menu item
-brings the corresponding window to the front.
-
-@; ----------------------------------------
-
-@section{@onscreen{Help}}
-
-@itemize[
-
- @item{@defmenuitem{Help Desk} Opens the Help Desk. This is the clearing 
- house for all documentation about DrRacket and its language.}
- 
- @item{@defmenuitem{About DrRacket...} Shows the credits for DrRacket.}
-
- @item{@defmenuitem{Check for Updates...} Checks to see if a new version
-        of DrRacket has been released.}
- 
- @item{@defmenuitem{Related Web Sites} Provides links to related web sites.}
-
- @item{@defmenuitem{Tool Web Sites} Provides links to web sites for
-   installed tools.}
-
- @item{@defmenuitem{Submit Bug Report...} The preferred mechanism for sending
-        in bug reports to the Racket development team. It automatically collects 
-        information about your Racket installation that sometimes can help
-        diagnose problems.}
- 
- @item{@defmenuitem{Saved Bug Reports} A submenu that holds bug reports that
-        you've started editing but haven't yet sent in.}
- 
- @item{@defmenuitem{Saved Bug Reports} A submenu that holds bug reports that
-        you've started editing but haven't yet sent in.}
-
- @item{@defmenuitem{Configure Command Line for Racket...} This menu item is
-        available only under Mac OS X. After prompting you for your password,
-        it adds a file named @filepath{racket} to @filepath{/etc/init.d/}
-        that contains the location of the @filepath{bin} directory. 
-        This has the effect of adding that path to the default PATH environment
-        variable (unless your shell explicitly changes teh default behavior).}
-  
- @item{@defmenuitem{Interact with DrRacket in English} Changes DrRacket's
-   interface to use English; the menu item appears only when the
-   current language is not English. Additional menu items switch
-   DrRacket to other languages.}
-
-]
-
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/prefs.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/drracket/prefs.scrbl
deleted file mode 100644
index 71a96dd386..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/prefs.scrbl
+++ /dev/null
@@ -1,291 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/bnf scribble/struct
-          "indentation-table.rkt")
-
-@(define (PrefItem . s) (apply onscreen s))
-
-@title[#:tag "prefs-explanation"]{Preferences}
-
-The preferences dialog consists of several panels.
-
-
-@section{@onscreen{Font}}
-
-This panel controls the main font used by DrRacket.
-
-
-@section{@onscreen{Colors}}
-
-The @onscreen{Colors} panel has several sub-panels that let you
-configure the colors that DrRacket uses for the editor background, for
-highlighting matching parentheses, for the syntax coloring for Racket
-and Java modes, for @onscreen{Check Syntax}, and for the colors of the
-text in the @tech{interactions window}.
-
-It also has two buttons, @onscreen{White on Black} and @onscreen{Black
-on White}, which set a number of defaults for the color preferences and
-change a few other aspects of DrRacket's behavior to make DrRacket's
-colors look nicer for those two modes.
-
-
-@section{@onscreen{Editing}}
-
-The @onscreen{Editing} panel consists of several sub-panels:
-
-@itemize[
-
-@item{@onscreen{Indenting}
-
-      This panel controls which keywords DrRacket recognizes for
-      indenting, and how each keyword is treated.
-      
-      To decide how a particular line is indented, DrRacket starts
-      at the beginning of the line and looks
-      for an enclosing s-expression. It finds the first symbol
-      after that open parenthesis, and uses that to determine 
-      how to indent the line.
-      
-      If the symbol is not listed in any of the lists in the preferences
-      dialog, then it is indented like a function call, e.g.:
-      @verbatim[app-example1]
-      @verbatim[app-example2]
-      
-      If the symbol is listed in the @onscreen{Begin-like Keywords} section,
-      it gets one extra space when the first sub-expression is on
-      a different line and otherwise it looks like an application.
-      @verbatim[begin-example1]
-      @verbatim[begin-example2]
-      
-      If the symbol is listed in the @onscreen{Define-like Keywords} section,
-      then all of the subexpressions are indented one extra space, 
-      no matter what happens on the first line:
-      @verbatim[define-example1]
-      @verbatim[define-example2]
-      @verbatim[define-example3]
-      
-      If the symbol is listed in the @onscreen{Lambda-like Keywords} section,
-      then it is indented like define, except that there is three extra spaces
-      of indentation added when the first sub-expression is not on the 
-      same line as the keyword:
-      @verbatim[lambda-example1]
-      @verbatim[lambda-example2]
-      
-      If the symbol is listed in the @onscreen{For/fold-like Keywords} section,
-      it is indented just like the define section, except that the first two
-      sub-expressions are treated specially:
-      @verbatim[for/fold-example]
-
-      }
-
-@item{@onscreen{Square bracket}
-
-      This panel controls which keywords DrRacket uses to determine when
-      to rewrite @litchar["["] to @litchar["("].  For @racket[cond]-like
-      keywords, the number in parenthesis indicates how many
-      sub-expressions are skipped before square brackets are started.
-
-      See @secref["editor"] for details on how the entries in the
-      columns behave.}
-
-@item{@onscreen{General}
-
-      @itemize[
-      @item{@PrefItem{Map delete to backspace} --- If checked, the editor
-            treats the Delete key like the Backspace key.}
-      @item{@PrefItem{Wrap words in editor buffers} --- If checked,
-            DrRacket editors auto-wrap text lines by default.  Changing
-            this preference affects new windows only.}
-      @item{@PrefItem{Enable keybindings in menus} --- If checked, some
-            DrRacket menu items have keybindings.  Otherwise, no menu
-            items have key bindings.  This preference is designed for
-            people who are comfortable editing in Emacs and find the
-            standard menu keybindings interfere with the Emacs
-            keybindings.}
-      @item{@PrefItem{Treat command key as meta} --- If checked,
-            DrRacket will use the command key for some Emacs-like
-            keybindings, instead of using it for menu shortcuts. This
-            option is only available on Mac OS X.}
-      @item{@PrefItem{Color syntax interactively} --- If checked,
-            DrRacket colors your syntax as you type.}
-      @item{@PrefItem{Search using anchors} --- If checked, DrRacket's
-            searching mode will jump directly to the first search hit,
-            using an ``anchor'' to determine where to search if the
-            search string changes.}
-      @item{@PrefItem{Normalize pasted strings} --- If checked, DrRacket
-            adjusts strings that are pasted into the editor to avoid
-            confusion.  For example, non-breaking spaces look just like
-            spaces but are not considered separators like ordinary
-            spaces are.  If this is checked DrRacket will automatically
-            turn those non-breaking spaces into regular spaces.
-            Similarly with other (less common) characters.}
-      @item{@PrefItem{Enable overwrite mode keybindings} --- If checked,
-            DrRacket enables the insert keybinding to swap into
-            overwrite mode}
-      @item{@PrefItem{Enable automatic parentheses} --- If checked,
-             typing an open parenthesis, curley brace, square bracket, or a double quote
-             character automatically inserts a matching one.}
-      @item{@PrefItem{Add one pixel of extra space between lines} ---
-             If checked, then an extra pixel of whitespace is added
-             between lines in the editor. The default value is platform-specific;
-             some fonts (notably those with @tt{╔══╗} characters) only look right with
-             this unchecked.}
-      @item{@PrefItem{Always use the platform-specific linefeed convention} ---
-             If checked, DrRacket always saves files with CRLF line terminators. 
-             If unchecked, DrRacket looks at each file as it is opened and if every
-             line is terminated with CRLF (and there is at least one line), 
-             then it saves the file with CRLF terminators
-             and otherwise it is saved with LF terminators (following the
-             Mac OS X and Linux convention). When a file is going to be saved
-             with CRLF terminators, then the status line at the bottom of the
-             DrRacket window shows ``CRLF''.
-             
-             This option is only available under Windows. On other operating
-             systems, all files are always saved with LF line terminators.}
-      @item{@PrefItem{Maximum character width guide} --- If checked, DrRacket
-             draws a vertical line in files that exceed the given maximum
-             width. The vertical line shows where the given maximum width is.}
-      @item{@PrefItem{Show line numbers} --- If checked, DrRacket shows
-            line numbers for the file being edited in the left-hand
-            column}
-      @item{@PrefItem{Show definitions/interactions labels} --- If checked,
-             then the teaching languages show big friendly labels indicating
-             which window is the definitions window and which is the interactions
-             window.]}]}
-
-@item{@onscreen{Racket}
-
-      @itemize[
-      @item{@PrefItem{Highlight between matching parens} --- If checked,
-            the editor marks the region between matching parenthesis
-            with a gray background (in color) or a stipple pattern (in
-            monochrome) when the blinking caret is next to a
-            parenthesis.}
-      @item{@PrefItem{Automatically adjust closing parens} --- If
-            checked, the editor automatically converts a typed
-            @litchar[")"] to @litchar["]"] to match @litchar["["], or it
-            converts a typed @litchar["]"] to @litchar[")"] to match
-            @litchar["("].}
-      @item{@PrefItem{Automatically adjust opening square brackets} If
-            checked, the editor changes typed @litchar["["] to match the
-            context (as explained in @secref["editor"]).}
-      @item{@PrefItem{Flash paren match} --- If checked, typing a
-            closing parenthesis, square bracket, or quotation mark
-            flashes the matching open parenthesis/bracket/quote.}]}
-
-]
-
-
-@section{@onscreen{Warnings}}
-
-@itemize[
-
-@item{@PrefItem{Ask before changing save format} --- If checked,
-      DrRacket consults the user before saving a file in non-text format
-      (see @secref["drracket-file-formats"]).}
-
-@item{@PrefItem{Verify exit} --- If checked, DrRacket consults the
-      user before exiting.}
-
-@item{@PrefItem{Ask about normalizing strings} --- If checked, DrRacket
-      consults the user before normalizing a string pasted into the
-      editor.}
-
-@item{@PrefItem{Only warn once when executions and interactions are not
-      synchronized} --- If checked, DrRacket warns the user on the first
-      interaction after the definitions window, language, or teachpack
-      is changed without a corresponding click on @onscreen{Run}.
-      Otherwise, the warning appears on every interaction.}
-
-@item{@PrefItem{Ask about clearing test coverage} --- If checked, when
-      test coverage annotations are displayed DrRacket prompts about
-      removing them.  This setting only applies to the PLT languages.
-      DrRacket never asks in the teaching languages.}
-
-@item{@PrefItem{Check for newer Racket versions} --- If checked,
-      DrRacket periodically polls a server to determine whether a newer
-      version of DrRacket is available.}
-
-]
-
-
-@section{@onscreen{General}}
-
-@itemize[
-
-@item{@PrefItem{Number of recent items} --- controls the length of the
-      @onscreen{Open Recent} menu (in the @onscreen{File} menu).}
-
-@item{@PrefItem{Auto-save files} --- If checked, the editor generates
-      autosave files (see @secref["drracket-autosave-files"]) for files
-      that have not been saved after five minutes.}
-
-@item{@PrefItem{Backup files} --- If checked, when saving a file for the
-      first time in each editing session, the original copy of the file
-      is copied to a backup file in the same directory.  The backup
-      files have the same name as the original, except that they end in
-      either @indexed-file{.bak} or @indexed-file{~}.}
-
-@item{@PrefItem{Show status-line} --- If checked, DrRacket shows a
-      status line at the bottom of each window.}
-
-@item{@PrefItem{Count column numbers from one} --- If checked, the
-      status line's column counter counts from one.  Otherwise, it
-      counts from zero.}
-
-@item{@PrefItem{Display line numbers in buffer; not character offsets}
-      --- If checked, the status line shows a
-      @nonterm{line}:@nonterm{column} display for the current selection
-      rather than the character offset into the text.}
-
-@item{@PrefItem{Automatically print to PostScript file} --- If checked,
-      printing will automatically save PostScript files.  If not,
-      printing will use the standard printing mechanisms for your
-      computer.}
-
-@item{@PrefItem{Open files in separate tabs (not separate windows)} ---
-      If checked, DrRacket will use tabs in the front-most window to
-      open new files, rather than creating new windows for new files.}
-
-@item{@PrefItem{Automatically open interactions window when running a
-      program} --- If checked, DrRacket shows the interactions window
-      (if it is hidden) when a program is run.}
-
-@item{@PrefItem{Automatically switch to the module language when opening
-      a module} --- If checked, DrRacket will recognize files that have
-      a @tt{#lang} line and adjust the language setting automatically.}
-
-@item{@PrefItem{Put the interactions window beside the definitions
-      window} --- If checked, DrRacket puts the interactions window to
-      the right of the definitions window.  By default, the interactions
-      window is below the definitions window.}
-
-@item{@PrefItem{Always show the #lang line in the Module language} ---
-      If checked, the module language always shows the @hash-lang[] line
-      (even when it would ordinarily be scrolled off of the page),
-      assuming that the @hash-lang[] line is the first line in the file.}
-
-]
-
-
-@section{@onscreen{Profiling}}
-
-This preference panel configures the profiling report.  The band of
-color shows the range of colors that profiled functions take on.  Colors
-near the right are used for code that is not invoked often and colors on
-the right are used for code that is invoked often.
-
-If you are interested in more detail at the low end, choose the
-@onscreen{Square root} check box.  If you are interested in more detail
-at the upper end, choose the @onscreen{Square} check box.
-
-
-@section{@onscreen{Browser}}
-
-This preferences panel allows you to configure your HTTP proxy.  Contact
-your system administrator for details.
-
-
-@section{@onscreen{Tools}}
-
-This preference panel allows you to configure the currently active
-plugins.
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/drracket/printing.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/drracket/printing.scrbl
deleted file mode 100644
index 1d024c2268..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/drracket/printing.scrbl
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/struct)
-
-@(define spacer (hspace 1))
-
-@(define-syntax-rule (print-table [expr cons qq wr] ...)
-  (*print-table (list (list spacer (racket expr) spacer (racketresult cons) spacer (racketresult qq) spacer (racketresult wr)) ...)))
-
-@(define (*print-table rows)
-   (make-table
-    #f
-    (cons
-     (list (make-flow (list (make-paragraph (list spacer))))
-           (make-flow (list @t{Input expression}))
-           (make-flow (list (make-paragraph (list spacer))))
-           (make-flow (list @t{@onscreen{Constructor}}))
-           (make-flow (list (make-paragraph (list spacer))))
-           (make-flow (list @t{@onscreen{Quasiquote}}))
-           (make-flow (list (make-paragraph (list spacer))))
-           (make-flow (list @t{@onscreen{write}})))
-     (map (lambda (row)
-            (map (lambda (e)
-                   (make-flow (list (make-paragraph (list e)))))
-                 row))
-          rows))))
-
-@title[#:tag "output-syntax"]{Output Printing Styles}
-
-@section-index["printing format"]
-
-Many Racket languages support a @onscreen{Output Syntax} choice that
-determines how evaluation results are printed in the
-@tech{interactions window}. This setting also applies to output
-generated by calling @racket[print] explicitly.
-
-The @onscreen{print} style is the normal Racket output style.  The
-following table illustrates the other output styles:
-
-@print-table[
-[(cons 1 2) (cons 1 2) `(1 . 2) (1 . 2)]
-[(list 1 2) (list 1 2) `(1 2) (1 2)]
-['(1 2) (list 1 2) `(1 2) (1 2)]
-[(list (void)) (list (void)) `(,(void)) (#,(@racketresultfont "#<void>"))]
-[`(,(void)) (list (void)) `(,(void)) (#,(racketresultfont "#<void>"))]
-[(vector 1 2 3) (vector 1 2 3) (vector 1 2 3) #(1 2 3)]
-[(box 1) (box 1) (box 1) #&1]
-[(lambda (x) x) (lambda (a1) ...) (lambda (a1) ...) #,(racketresultfont "#<procedure>")]
-['sym 'sym 'sym sym]
-[(make-s 1 2) (make-s 1 2) (make-s 1 2) #(struct:s 1 2)]
-['() empty `() ()]
-[add1 add1 add1 #,(racketresultfont "#<procedure:add1>")]
-[(delay 1) (delay ...) (delay ...) #,(racketresultfont "#<promise>")]
-[(regexp "a") (regexp "a") (regexp "a") #rx"a"]
-]
-
-The @as-index{@onscreen{Constructor} output} mode is similar to
-Rackets normal print mode, except that even quotable are still printed
-with constructors, constructor functions and forms are used to
-approximate some otherwise unprintable values. For example,
-@onscreen{Constructor} output prints a procedure in a
-@racketresult[lambda] form. For output to a graphical context,
-rational numbers are printed using a special @racket[snip%] object
-that lets the user choose between improper fractions, mixed fractions,
-and repeating decimals.
-
-The @as-index{@onscreen{Quasiquote} output} mode is like
-@onscreen{Constructor} output, but it uses @racket[quasiquote]
-(abbreviated with @litchar{`}) to print lists, and it uses
-@racket[unquote] (abbreviated with @litchar{,}) to escape back to
-@onscreen{Constructor} printing as needed.
-
-The @as-index{@onscreen{write} output} mode corresponds to traditional
-Scheme printing via the @racket[write] procedure. For example, lists
-print by parenthesizing the printed form of the list elements, without
-a leading quote mark or a constructor name.
-
-Finally, the @as-index{@onscreen{print} output} mode corresponds to
-Racket's default printing via the @racket[print] procedure. Output via
-@racket[print] is further configurable through run-time settings, such
-as the @racket[print-as-expression] parameter, and it may be adjusted
-by a @hash-lang[]-specified language. For example, the
-@racketmodname[scheme] language sets the @racket[print-as-expression]
-parameter to @racket[#f], which essentially makes @onscreen{print}
-mode act like @onscreen{write} mode.
-
-For any of the output styles, DrRacket sets the
-@racket[global-port-print-handler] so that the @racket[print]
-procedure produces output as selected.
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/common.rkt b/pkgs/drracket-pkgs/drracket/scribblings/tools/common.rkt
deleted file mode 100644
index e502291c97..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/common.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang at-exp racket/base
-(require (for-syntax racket/base))
-
-(require scribble/manual
-         scribble/basic
-         scribble/extract
-         racket/class
-         racket/contract
-         "doc-util.rkt")
-(provide (all-from-out scribble/manual
-                       scribble/basic
-                       scribble/extract
-                       racket/class
-                       racket/contract
-                       "doc-util.rkt"))
-
-(require (for-label racket/gui/base
-                    racket/snip
-                    racket/class
-                    racket/contract
-                    racket/base
-                    drracket/tool-lib
-                    mrlib/switchable-button
-                    framework))
-(provide (for-label (all-from-out racket/gui/base)
-                    (all-from-out racket/snip)
-                    (all-from-out racket/class)
-                    (all-from-out racket/contract)
-                    (all-from-out racket/base)
-                    (all-from-out drracket/tool-lib)
-                    (all-from-out mrlib/switchable-button)
-                    (all-from-out framework)))
-
-(provide tools-title tools-include tools-include/drs)
-
-(define (tools-title name)
-  (define str (format "drracket:~a" name))
-  (title #:tag str (tt str)))
-
-(define-syntax (tools-include stx)
-  (syntax-case stx ()
-    [(_ name)
-     (string? (syntax-e #'name))
-     (let ([name (syntax-e #'name)])
-       (with-syntax ([rx-drr (regexp (format "^~a" (regexp-quote (format "drracket:~a:" name))))])
-         #'(include-previously-extracted scribblings/tools/tool-lib-extracts rx-drr)))]))
-
-(define-syntax (tools-include/drs stx)
-  (syntax-case stx ()
-    [(_ name)
-     (string? (syntax-e #'name))
-     (let ([name (syntax-e #'name)])
-       (with-syntax ([rx-drs (regexp (format "^~a" (regexp-quote (format "drscheme:~a:" name))))])
-         #'(include-previously-extracted scribblings/tools/tool-lib-extracts rx-drs)))]))
-
-(provide docs-get/extend)
-(define-syntax (docs-get/extend stx)
-  (syntax-case stx ()
-    [(_ id)
-     (identifier? #'id)
-     (with-syntax ([get (datum->syntax
-                         #'id
-                         (string->symbol
-                          (format "drracket:get/extend:get-~a"
-                                  (syntax-e #'id))))]
-                   [extend (datum->syntax
-                            #'id
-                            (string->symbol
-                             (format "drracket:get/extend:extend-~a"
-                                     (syntax-e #'id))))])
-       #'(begin
-           @defproc*[([(extend (mixin mixin-contract))
-                       void?]
-                      [(extend (mixin mixin-contract) (before boolean?))
-                       void?])]{
-             Adds a new mixin to the class eventually created in DrRacket.}
-          @defproc[(get) class?]{
-            Returns the class (with all registered mixins applied).}))]))
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/debug.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/debug.scrbl
deleted file mode 100644
index 8295135936..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/debug.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-@(tools-title "debug")
-
-@defmixin[drracket:debug:profile-unit-frame-mixin
-          (drracket:frame:<%> drracket:unit:frame<%>)
-          ()]{
-}
-
-@defmixin[drracket:debug:profile-interactions-text-mixin
-          (drracket:rep:text<%>)
-          ()]{
-}
-
-@defmixin[drracket:debug:profile-definitions-text-mixin
-          (drracket:unit:definitions-text<%> text%)
-          ()]{
-}
-
-@(tools-include "debug")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/doc-util.rkt b/pkgs/drracket-pkgs/drracket/scribblings/tools/doc-util.rkt
deleted file mode 100644
index 87639ecccd..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/doc-util.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-(require scribble/base
-         scribble/manual)
-(provide language-info-ref
-         language-info-def)
-
-(define-syntax-rule 
-  (language-info-ref id)
-  (language-info-ref/proc (racket id) 'id))
-
-(define (language-info-ref/proc rkt-id sym)
-  (define str (format "~s" sym))
-  (elemref str rkt-id))
-
-(define-syntax-rule
-  (language-info-def id . args)
-  (language-info-def/proc 'id . args))
-
-(define (language-info-def/proc sym arg0 . args)
-  (define str (format "~s" sym))
-  (list (elemtag str arg0) args))
-
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/eval.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/eval.scrbl
deleted file mode 100644
index e1e0ea1c6d..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/eval.scrbl
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-@(tools-title "eval")
-@(tools-include "eval")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/example-src.rkt b/pkgs/drracket-pkgs/drracket/scribblings/tools/example-src.rkt
deleted file mode 100644
index 342d751283..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/example-src.rkt
+++ /dev/null
@@ -1,162 +0,0 @@
-#lang racket/base
-(provide (struct-out src-wrap)
-         files
-         sexp-files)
-
-(require (for-syntax racket/base))
-
-(define-struct src-wrap (obj srcloc)
-  #:transparent)
-
-(define-syntax (retain-src stx)
-  
-  (define (to-src-wrap stx)
-    (cond
-      [(syntax? stx)
-       #`(src-wrap #,(to-src-wrap (syntax-e stx))
-                   (vector '#,(syntax-source stx)
-                           #,(syntax-line stx)
-                           #,(syntax-column stx)
-                           #,(syntax-position stx)
-                           #,(syntax-span stx)))]
-      [(pair? stx)
-       #`(cons #,(to-src-wrap (car stx))
-               #,(to-src-wrap (cdr stx)))]
-      [else 
-       #`'#,stx]))
-                   
-  (syntax-case stx ()
-    [(_ args ...)
-     (with-syntax ([(args ...) 
-                    (map to-src-wrap
-                         (syntax->list #'(args ...)))])
-       #'(list args ...))]))
-
-(define files
-  (list (list "info.rkt"
-              (retain-src
-               info
-               (define drracket-tools (list (list "tool.rkt")))))
-        (list "tool.rkt"
-              (retain-src
-               racket/base
-               (require drracket/tool
-                        racket/class
-                        racket/gui/base
-                        racket/unit
-                        mrlib/switchable-button)
-               (provide tool@)
-               
-               (define secret-key "egg")
-               (define to-insert "easter ")
-               
-               (define tool@
-                 (unit
-                   (import drracket:tool^)
-                   (export drracket:tool-exports^)
-                   
-                   (define easter-egg-mixin
-                     (mixin ((class->interface text%)) ()
-                       
-                       (inherit begin-edit-sequence
-                                end-edit-sequence
-                                insert
-                                get-text)
-                       
-                       (define/augment (on-insert start len)
-                         (begin-edit-sequence))
-                       (define/augment (after-insert start len)
-                         (check-range (max 0 (- start (string-length secret-key)))
-                                      (+ start len))
-                         (end-edit-sequence))
-                       
-                       (define/augment (on-delete start len)
-                         (begin-edit-sequence))
-                       (define/augment (after-delete start len)
-                         (check-range (max 0 (- start (string-length secret-key)))
-                                      start)
-                         (end-edit-sequence))
-                       
-                       (define/private (check-range start stop)
-                         (let/ec k
-                           (for ([x (in-range start stop)])
-                             (define after-x 
-                               (get-text x (+ x (string-length secret-key))))
-                             (when (string=? after-x secret-key)
-                               (define before-x 
-                                 (get-text (max 0 (- x (string-length to-insert))) x))
-                               (unless (string=? before-x to-insert)
-                                 (insert to-insert x x)
-                                 (k (void)))))))
-                       
-                       (super-new)))
-                   
-                   (define reverse-button-mixin
-                     (mixin (drracket:unit:frame<%>) ()
-                       (super-new)
-                       (inherit get-button-panel
-                                get-definitions-text)
-                       (inherit register-toolbar-button)
-                       
-                       (let ([btn
-                              (new switchable-button%
-                                   [label "Reverse Definitions"]
-                                   [callback (λ (button) 
-                                               (reverse-content
-                                                (get-definitions-text)))]
-                                   [parent (get-button-panel)]
-                                   [bitmap reverse-content-bitmap])])
-                         (register-toolbar-button btn #:number 11)
-                         (send (get-button-panel) change-children
-                               (λ (l)
-                                 (cons btn (remq btn l)))))))
-                   
-                   (define reverse-content-bitmap
-                     (let* ([bmp (make-bitmap 16 16)]
-                            [bdc (make-object bitmap-dc% bmp)])
-                       (send bdc erase)
-                       (send bdc set-smoothing 'smoothed)
-                       (send bdc set-pen "black" 1 'transparent)
-                       (send bdc set-brush "blue" 'solid)
-                       (send bdc draw-ellipse 2 2 8 8)
-                       (send bdc set-brush "red" 'solid)
-                       (send bdc draw-ellipse 6 6 8 8)
-                       (send bdc set-bitmap #f)
-                       bmp))
-                   
-                   (define (reverse-content text)
-                     (for ([x (in-range 1 (send text last-position))])
-                       (send text split-snip x))
-                     (define snips
-                       (let loop ([snip (send text find-first-snip)])
-                         (if snip
-                             (cons snip (loop (send snip next)))
-                             '())))
-                     (define released-snips
-                       (for/list ([snip (in-list snips)]
-                                  #:when (send snip release-from-owner))
-                         snip))
-                     (for ([x (in-list released-snips)])
-                       (send text insert x 0 0)))
-                   
-                   (define (phase1) (void))
-                   (define (phase2) (void))
-                   
-                   (drracket:get/extend:extend-definitions-text easter-egg-mixin)
-                   (drracket:get/extend:extend-unit-frame reverse-button-mixin)))))))
-
-
-(define (to-sexp x)
-  (let loop ([sw x])
-    (cond
-      [(src-wrap? sw)
-       (loop (src-wrap-obj sw))]
-      [(pair? sw)
-       (cons (loop (car sw)) (loop (cdr sw)))]
-      [else sw])))
-
-(define sexp-files
-  (for/list ([file (in-list files)])
-    (list (list-ref file 0)
-          (to-sexp (car (list-ref file 1)))
-          (to-sexp (cdr (list-ref file 1))))))
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/frame.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/frame.scrbl
deleted file mode 100644
index dff48f1890..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/frame.scrbl
+++ /dev/null
@@ -1,292 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/core)
-@(tools-title "frame")
-
-@defclass[drracket:frame:name-message% canvas% ()]{
-
-This class implements the little filename button in the top-right hand
-side of DrRacket's frame.
-
-
-
-@defconstructor/make[([parent (is-a?/c area-container<%>)])]{}
-
-@defmethod[(set-message [name (or/c string? false/c)]
-                        [short-name string?])
-           void?]{
-@methspec{
-
-Sets the names that the button shows.
-
-}
-@methimpl{
-
-The string @racket[short-name] is the name that is shown on the button
-and @racket[name] is shown when the button is clicked on, in a separate
-window. If @racket[name] is @racket[#f], a message indicating that the file
-hasn't been saved is shown.
-
-
-
-}}}
-
-
-@defmixin[drracket:frame:mixin (drracket:frame:basics<%> frame:text-info<%> frame:editor<%>) (drracket:frame:<%>)]{
-
-Provides an implementation of 
-@racket[drracket:frame:<%>] 
-}
-
-
-@defmixin[drracket:frame:basics-mixin (frame:standard-menus<%>) (drracket:frame:basics<%>)]{
-
-Use this mixin to establish some common menu items across various DrRacket windows.
-
-
-
-@defmethod[#:mode override 
-           (edit-menu:between-find-and-preferences)
-           void?]{
-
-Adds a
-@racket[separator-menu-item%]. Next, adds the
-@racket["Keybindings"] menu item to the edit menu. Finally,
-if the 
-@racket[current-eventspace-has-standard-menus?] procedure returns @racket[#f], creates another 
-@racket[separator-menu-item%].
-
-
-
-}
-
-@defmethod[#:mode override 
-           (file-menu:between-open-and-revert [file-menu (is-a?/c menu%)])
-           void?]{
-
-Adds an ``Install .plt File...'' menu item, which
-downloads and installs .plt files from the web, or installs
-them from the local disk. After that, calls the super
-method.
-
-
-}
-
-@defmethod[#:mode override 
-           (file-menu:between-print-and-close [file-menu (is-a?/c menu%)])
-           void?]{
-
-Calls the super method. Then, creates a menu item for
-multi-file searching. Finally,
-adds a
-@racket[separator-menu-item%].
-
-
-}
-
-@defmethod[#:mode override 
-           (file-menu:new-callback [item (is-a?/c menu-item%)]
-                                   [evt (is-a?/c control-event%)])
-           void?]{
-
-Opens a new, empty DrRacket window.
-
-
-}
-
-@defmethod[#:mode override 
-           (file-menu:new-string)
-           string?]{
-
-Returns the empty string.
-
-
-}
-
-@defmethod[#:mode override 
-           (file-menu:open-callback [item (is-a?/c menu-item%)]
-                                    [evt (is-a?/c control-event%)])
-           void?]{
-
-Calls 
-@racket[handler:edit-file].
-
-
-}
-
-@defmethod[#:mode override 
-           (file-menu:open-string)
-           string?]{
-
-Returns the empty string.
-
-
-}
-
-@defmethod[(get-additional-important-urls)
-           (listof (list string string))]{
-@methspec{
-
-Each string in the result of this method is added as a menu
-item to DrRacket's ``Related Web Sites'' menu item. The
-first string is the name of the menu item and the second
-string is a url that, when the menu item is chosen, is sent
-to the user's browser.
-
-}
-@methimpl{
-
-Returns the empty list by default.
-
-
-}}
-
-@defmethod[#:mode override 
-           (help-menu:about-callback [item (is-a?/c menu-item%)]
-                                     [evt (is-a?/c control-event%)])
-           void?]{
-
-Opens an about box for DrRacket.
-
-
-}
-
-@defmethod[#:mode override 
-           (help-menu:about-string)
-           string?]{
-
-Returns the string @racket["DrRacket"].
-
-
-}
-
-@defmethod[#:mode override 
-           (help-menu:before-about [help-menu (is-a?/c menu%)])
-           void?]{
-
-Adds the Help Desk menu item and the Welcome to DrRacket menu item.
-}
-
-@defmethod[#:mode override 
-           (help-menu:create-about?)
-           boolean?]{
-
-Returns @racket[#t].
-
-
-}}
-
-
-@definterface[drracket:frame:basics<%> (frame:standard-menus<%>)]{
-
-This interface is the result of the @racket[drracket:frame:basics-mixin]
-
-}
-
-
-@definterface[drracket:frame:<%> (frame:editor<%> frame:text-info<%> drracket:frame:basics<%>)]{
-
-
-
-@defmethod[(add-show-menu-items [show-menu (is-a?/c menu%)])
-           void?]{
-@methspec{
-
-This method is called during the construction of the @onscreen{View}
-menu.  This method is intended to be overridden with the
-overriding methods adding other Show/Hide menu items to the @onscreen{View}
-menu.
-
-See also
-@method[drracket:frame:<%> set-show-menu-sort-key] and
-@method[drracket:frame:<%> get-show-menu].
-}
-@methimpl{
-  Does nothing.
-}}
-
-@defmethod[(set-show-menu-sort-key [item (is-a?/c menu-item<%>)]
-                                   [key (and/c real? positive?)])
-           void?]{
-  Controls the ordering of items in the @onscreen{View} menu.
-                                        
-The number determines the sorting order and where separators in the menu appear
-(smaller numbers first). 
-
-These are the numbers for many of the @onscreen{View} menu items that come
-built-in to DrRacket:
-@table[(style #f '())
-       (let ()
-         (define (add-blocks lol)
-           (for/list ([strs (in-list lol)])
-             (for/list ([str (in-list (reverse strs))]
-                        [i (in-naturals)])
-               @paragraph[(style #f '()) 
-                          (if (zero? i)
-                              (list str "\ua0\ua0\ua0\ua0\ua0")
-                              str)])))
-         (add-blocks
-          (list (list @racket[1] @onscreen{Toolbar})
-                (list @racket[2] @onscreen{Split})
-                (list @racket[3] @onscreen{Collapse})
-                (list @racket[101] @onscreen{Show Definitions})
-                (list @racket[102] @onscreen{Show Interactions})
-                (list @racket[103] @onscreen{Use Horizontal Layout})
-                (list @racket[205] @onscreen{Show Log})
-                (list @racket[206] @onscreen{Show Tracing})
-                (list @racket[207] @onscreen{Hide Profile})
-                (list @racket[301] @onscreen{Show Program Contour})
-                (list @racket[302] @onscreen{Show Line Numbers})
-                (list @racket[401] @onscreen{Show Module Browser}))))]
-
-In addition, a separator is inserted for each 100. So, for example,
-a separator is inserted between @onscreen{Collapse} and
-@onscreen{Show Definitions}.
-
-Note that the argument may be a rational number,
-effectively allowing insertion between any two menu items already in the menu.
-For this reason, avoid using @racket[0], or any number is that @racket[0]
-modulo @racket[100].
-
-}
-                 
-@defmethod[(get-show-menu)
-           (is-a?/c menu%)]{
-@index{View menu}
-
-returns the @onscreen{View} menu, for use by the
-@method[drracket:frame:<%> update-shown] method.
-
-See also
-@method[drracket:frame:<%> add-show-menu-items].
-
-The method (and others) uses the word @tt{show} to preserve
-backwards compatibility from when the menu itself was named
-the @onscreen{Show} menu.
-
-}
-
-@defmethod[(update-shown)
-           void?]{
-@methspec{
-
-This method is intended to be overridden. It's job is to
-update the @racket["View"] menu to match the state of the
-visible windows. In the case of the standard DrRacket
-window, it change the menu items to reflect the visibility of
-the definitions and interaction @racket[editor-canvas%]s.
-
-Call this method whenever the state of the show menu might
-need to change.
-
-See also
-@method[drracket:frame:<%> get-show-menu].
-
-}
-@methimpl{
-
-Does nothing.
-
-
-}}}
-
-@(tools-include "frame")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/get-slash-extend.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/get-slash-extend.scrbl
deleted file mode 100644
index c6aec33081..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/get-slash-extend.scrbl
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-@(tools-title "get/extend")
-@(tools-include "get/extend")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/help-desk.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/help-desk.scrbl
deleted file mode 100644
index ac91cef6b6..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/help-desk.scrbl
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label help/search))
-@(tools-title "help-desk")
-@(tools-include "help-desk")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/info.rkt b/pkgs/drracket-pkgs/drracket/scribblings/tools/info.rkt
deleted file mode 100644
index b6331e9e8e..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("tools.scrbl" (multi-page) (tool -100))))
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/language-configuration.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/language-configuration.scrbl
deleted file mode 100644
index b2cb3d393d..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/language-configuration.scrbl
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-@(tools-title "language-configuration")
-@(tools-include "language-configuration")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/language.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/language.scrbl
deleted file mode 100644
index 93827c208c..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/language.scrbl
+++ /dev/null
@@ -1,878 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-@(tools-title "language")
-
-@definterface[drracket:language:simple-module-based-language<%> ()]{
-
-This interface represents the bare essentials when defining a module-based
-language.  Use the
-@racket[drracket:language:simple-module-based-language->module-based-language-mixin]
-mixin to construct an implementation of
-@racket[drracket:language:module-based-language<%>] from an implementation of
-this interface.
-
-The class @racket[drracket:language:simple-module-based-language%] provides an
-implementation of this interface.
-
-@defmethod[(get-language-numbers)
-           (cons number (listof number))]{
-  Returns a list of numbers, whose length must be the same as the result
-  of
-  @method[drracket:language:simple-module-based-language<%> get-language-position].
-  Each number indicates the sorted order of the language positions in
-  the language dialog.
-}
-
-@defmethod[(get-language-position)
-           (cons string (listof string))]{
-  This method is the same as
-  @method[drracket:language:language<%> get-language-position].
-}
-
-@defmethod[(get-module)
-           s-expression]{
-  This method specifies the module that defines the language.
-
-  This method replaces
-  @method[drracket:language:language<%> front-end/complete-program] and
-  @method[drracket:language:language<%> front-end/interaction].
-
-  The result is expected to be the @racket[module] (its initial require)
-  except as value, ie @racket[quote]d.
-}
-
-@defmethod[(get-one-line-summary)
-           (or/c #f string?)]{
-  The result of this method is shown in a tooltip in
-  the language dialog when the
-  user mouses over this language. If the result is
-  @racket[#f], no tooltip is shown.
-}
-
-@defmethod[(get-reader)
-           (->* () (any/c input-port?) (or/c syntax? eof-object?))]{
-  This method must return a procedure that is used to read syntax from a
-  port in the same manner as @racket[read-syntax].  It is used as the
-  reader for this language.
-}}
-
-@defclass[drracket:language:simple-module-based-language%
-          object%
-          (drracket:language:simple-module-based-language<%>)]{
-
-@defconstructor/make[([module s-expression]
-                      [language-position (cons string (listof string))]
-                      [language-numbers (cons number (listof number)) (map (lambda (x) 0) language-position)]
-                      [one-line-summary string? ""]
-                      [documentation-reference (or/c false/c something-else) #f]
-                      [reader (->* () (any/c input-port?) (or/c syntax? eof-object?))]
-                      [language-id string?])]{
-  The init args are used as the results of the
-  @method[drracket:language:simple-module-based-language% get-module]
-  and
-  @method[drracket:language:simple-module-based-language% get-language-position]
-  methods.
-}
-
-@defmethod[#:mode override
-           (get-language-numbers)
-           (cons number (listof number))]{
-  returns the corresponding init arg.
-}
-
-@defmethod[#:mode override
-           (get-language-position)
-           s-expression]{
-  returns the corresponding init arg.
-}
-
-@defmethod[#:mode override
-           (get-module)
-           (cons string (listof string))]{
-  returns the corresponding init arg.
-}
-
-@defmethod[#:mode override
-           (get-one-line-summary)
-           string?]{
-  returns the corresponding initialization argument.
-}
-
-@defmethod[#:mode override
-           (get-reader)
-           (->* () (any/c input-port?) (or/c syntax? eof-object?))]{
-  returns the corresponding init arg.
-}}
-
-
-@defmixin[drracket:language:simple-module-based-language->module-based-language-mixin
-          (drracket:language:simple-module-based-language<%>)
-          (drracket:language:module-based-language<%>)]{
-
-@index{drracket:language:simple-settings}
-This mixin uses a struct definition for its settings:
-@racketblock[
-(define-struct drracket:language:simple-settings
-  (case-sensitive  (code:comment @#,t{boolean?})
-   printing-style  (code:comment @#,t{(symbols 'constructor 'quasiquote 'write 'print)})
-   fraction-style  (code:comment @#,t{(symbols 'mixed-fraction 'mixed-fraction-e})
-                   (code:comment @#,t{         'repeating-decimal 'repeating-decimal-e)})
-   show-sharing    (code:comment @#,t{boolean?})
-   insert-newlines (code:comment @#,t{boolean?})
-   annotations))   (code:comment @#,t{(symbols 'none 'debug 'debug/profile})
-                   (code:comment @#,t{         'test-coverage)})
-]
-
-The settings in this structure reflect the settings show in the language
-configuration dialog for languages constructed with this mixin.  The
-first controls the input for the language.  The rest specify printing
-controls for the language.  The style @racket['print] is the default
-style, as normally used in the Racket REPL.  The sharing field
-determines if cycles and sharing in values are displayed when the value
-is rendered.  The insert newlines field determines if values in the repl
-are formatted with @racket[write] style-line printouts, or with
-@racket[pretty-print] multi-line printouts.
-
-@defmethod[#:mode override
-           (config-panel)
-           (case-> (-> settings) (settings -> void))]{
-  Constructs a configuration panel that lets the user configure all of
-  the settings for this language.
-
-  See also
-  @racket[drracket:language:simple-module-based-language->module-based-language-mixin]
-  for details of the simple-settings structure, this mixin's
-  @racket[settings] type.
-}
-
-@defmethod[#:mode override
-           (default-settings)
-           settings]{
-  The defaults for the settings are
-  @itemize[
-  @item{@racket[case-sensitive] is @racket[#f]}
-  @item{@racket[printing-style] is @racket['write]}
-  @item{@racket[show-sharing] is @racket[#f]}
-  @item{@racket[insert-newlines] is @racket[#t]}
-  ]
-
-  See also
-  @racket[drracket:language:simple-module-based-language->module-based-language-mixin]
-  for details of the simple-settings structure, this mixins
-  @racket[settings] type.
-}
-
-@defmethod[#:mode override
-           (default-settings?)
-           boolean?]{
-}
-
-@defmethod[#:mode override
-           (get-init-code [settings settings])
-           sexpression]{
-  Creates an s-expression of a module that sets the
-  @racket[current-inspector], @racket[read-case-sensitive], and
-  @racket[error-value->string] parameters.  Additionally, it may load
-  @racket[errortrace], if debugging is enabled.
-}
-
-@defmethod[#:mode override
-           (get-transformer-module)
-           s-expression]{
-  Returns @racket['mzscheme].
-}
-
-@defmethod[#:mode override
-           (marshall-settings)
-           writable]{
-  Constructs a vector from the structure.
-
-  See also
-  @racket[drracket:language:simple-module-based-language->module-based-language-mixin]
-  for details of the simple-settings structure, this mixins
-  @racket[settings] type.
-}
-
-@defmethod[#:mode override
-           (on-execute)
-           void?]{
-  Sets the case sensitivity of the language.
-
-  Sets the structure inspector to a new inspector, saving the original
-  inspector for use during printing.
-
-  Sets the @racket[global-port-print-handler] to print based on the
-  settings structure, but without any newlines.
-
-  If debugging is enabled, it sets the @racket[current-eval] handler to
-  one that annotates each evaluated program with debugging annotations.
-  Additionally, it sets the @racket[error-display-handler] to show the
-  debugging annotations when an error is raised.
-
-  See also
-  @racket[drracket:language:simple-module-based-language->module-based-language-mixin]
-  for details of the simple-settings structure, this mixin's
-  @racket[settings] type.
-}
-
-@defmethod[#:mode override
-           (render-value)
-           void?]{
-  Translates the value to a string, based on the settings.
-
-  Restores a super struct inspector to render structs properly.  (See
-  also
-  @method[drracket:language:simple-module-based-language->module-based-language-mixin% on-execute])
-
-  See also
-  @racket[drracket:language:simple-module-based-language->module-based-language-mixin]
-  for details of the simple-settings structure, this mixin's
-  @racket[settings] type.
-}
-
-@defmethod[#:mode override
-           (render-value/format)
-           void?]{
-  Translates the value to a string, based on the settings.
-
-  Restores a super struct inspector to render structs properly.  (See
-  also
-  @method[drracket:language:simple-module-based-language->module-based-language-mixin% on-execute].)
-
-  See also
-  @racket[drracket:language:simple-module-based-language->module-based-language-mixin]
-  for details of the simple-settings structure, this mixin's
-  @racket[settings] type.
-}
-
-@defmethod[#:mode override
-           (unmarshall-settings)
-           (or/c false/c settings)]{
-  Builds a settings structure from the vector, or @racket[#f] if the
-  vector doesn't match the types of the structure.
-
-  See also
-  @racket[drracket:language:simple-module-based-language->module-based-language-mixin]
-  for details of the simple-settings structure, this mixin's
-  @racket[settings] type.
-}
-
-@defmethod[#:mode override
-           (use-mred-launcher)
-           boolean?]{
-  Returns @racket[#t].
-}}
-
-
-@definterface[drracket:language:module-based-language<%> ()]{
-
-This interface is for languages that can be implemented with Racket
-@racket[module]s.
-
-Use the @racket[drracket:language:module-based-language->language-mixin]
-mixin to construct an implementation of
-@racket[drracket:language:language<%>] from an implementation of this
-interface.
-
-@defmethod[(config-panel [parent (is-a?/c panel%)])
-           (case-> (-> settings) (settings -> void))]{
-  This method is the same as
-  @method[drracket:language:language<%> config-panel].
-}
-
-@defmethod[(default-settings)
-           settings]{
-  This method is the same as
-  @method[drracket:language:language<%> default-settings].
-}
-
-@defmethod[(default-settings? [settings settings])
-           boolean?]{
-  This method is the same as
-  @method[drracket:language:language<%> default-settings?].
-}
-
-@defmethod[(get-init-code [settings settings])
-           sexp]{
-  Returns a module in sexpression form that is used for creating
-  executables. The module must provide a thunk, called
-  @racket[init-code].
-
-  When either a stand-alone executable or a launcher is created, the
-  module is required, and @racket[init-code] is invoked. This procedure
-  is expected to set up the environment, based on the settings.
-}
-
-@defmethod[(get-language-numbers)
-           (cons number (listof number))]{
-  This method is the same as
-  @method[drracket:language:language<%> get-language-numbers].
-}
-
-@defmethod[(get-language-position)
-           (cons string (listof string))]{
-  This method is the same as
-  @method[drracket:language:language<%> get-language-position].
-}
-
-@defmethod[(get-module)
-           s-expression]{
-  This method specifies the module that defines the language.  It is
-  used to initialize the user's namespace.
-
-  The result is expected to be the @racket[module] (its initial require)
-  except as value, ie @racket[quote]d.
-
-  See also
-  @method[drracket:language:module-based-language<%> get-transformer-module].
-}
-
-@defmethod[(get-one-line-summary)
-           string?]{
-  The result of this method is shown in the language dialog when the
-  user selects this language.
-}
-
-@defmethod[(get-reader)
-           (->* () (any/c input-port?) (or/c syntax? eof-object?))]{
-  This method must return a procedure that is used to read syntax from a
-  port in the same manner as @racket[read-syntax]. It is used as the
-  reader for this language.
-}
-
-@defmethod[(get-transformer-module)
-           (or/c quoted-module-path #f)]{
-  This method specifies the module that defines the transformation
-  language.  It is used to initialize the transformer portion of the
-  user's namespace.
-
-  The result is expected to be the @racket[module] (its initial require)
-  except as value, i.e., @racket[quote]d or @racket[#f].
-
-  If the result is @racket[#f], no module is required into the
-  transformer part of the namespace.
-
-  See also
-  @method[drracket:language:module-based-language<%> get-module].
-}
-
-@defmethod[(marshall-settings [settings settings])
-           writable]{
-  This method is the same as
-  @method[drracket:language:language<%> marshall-settings].
-}
-
-@defmethod[(on-execute [settings settings]
-                       [run-on-user-thread ((-> void) -> void)])
-           void?]{
-  This method is the same as
-  @method[drracket:language:language<%> on-execute].
-}
-
-@defmethod[(render-value [value TST]
-                         [settings settings]
-                         [port port])
-           void?]{
-  This method is the same as
-  @method[drracket:language:language<%> render-value].
-}
-
-@defmethod[(render-value/format [value TST]
-                                [settings settings]
-                                [port port]
-                                [width (or/c number (symbols 'infinity))])
-           void?]{
-  This method is the same as
-  @method[drracket:language:language<%> render-value/format].
-}
-
-@defmethod[(unmarshall-settings [input writable])
-           (or/c settings false/c)]{
-  This method is the same as
-  @method[drracket:language:language<%> unmarshall-settings].
-}
-
-@defmethod[(use-mred-launcher)
-           boolean?]{
-  This method is called when an executable is created to determine if
-  the executable should use the GRacket or the Racket binary.
-}
-
-@defmethod[(use-namespace-require/copy?)
-           boolean?]{
-@methspec{
-  The result of this method controls how the module is attached to the
-  user's namespace. If the method returns @racket[#t], the Racket
-  primitive @racket[namespace-require/copy] is used and if it returns
-  @racket[#f], @racket[namespace-require] is used.
-}
-@methimpl{
-  Returns @racket[#f] by default.
-}}}
-
-
-@defmixin[drracket:language:module-based-language->language-mixin (drracket:language:module-based-language<%>) (drracket:language:language<%>)]{
-
-@defmethod[#:mode override
-           (front-end/complete-program)
-           (-> (or/c sexp/c syntax? eof-object?))]{
-  Reads a syntax object, from @racket[input].  Does not use
-  @racket[settings].
-
-  For languages that use these mixins, there is no difference between
-  this method and
-  @method[drracket:language:module-based-language->language-mixin% front-end/interaction].
-}
-
-@defmethod[#:mode override
-           (front-end/interaction)
-           (-> (or/c sexp/c syntax? eof-object?))]{
-  Reads a syntax object, from @racket[input]. Does not use
-  @racket[settings].
-
-  For languages that use these mixins, there is no difference between
-  this method and
-  @method[drracket:language:module-based-language->language-mixin% front-end/complete-program].
-}
-
-@defmethod[#:mode override
-           (get-language-name)
-           string?]{
-  Returns the last element of the list returned by
-  @method[drracket:language:language<%> get-language-position].
-}
-
-@defmethod[#:mode override
-           (on-execute)
-           void?]{
-  Calls the super method.
-
-  Uses @racket[namespace-require] to install the result of
-  @method[drracket:language:module-based-language<%> get-module] and
-  Uses @racket[namespace-transformer-require] to install the result of
-  @method[drracket:language:module-based-language<%>
-  get-transformer-module] into the user's namespace.
-}}
-
-
-@definterface[drracket:language:language<%> ()]{
-
-Implementations of this interface are languages that DrRacket supports.
-
-See @secref["adding-languages"] for an overview of adding languages to
-DrRacket.
-
-@defmethod[(capability-value [key symbol])
-           any]{
-@methspec{
-  Returns the language-specific value for some capability. See also
-  @racket[drracket:language:register-capability].
-}
-@methimpl{
-  By default, returns the value from:
-  @racket[drracket:language:get-capability-default].
-}}
-
-@defmethod[(config-panel [parent (is-a?/c panel%)])
-           (case-> (-> settings) (settings -> void))]{
-  This method used by the language configuration dialog to construct the
-  ``details'' panel for this language.  It accepts a parent panel and
-  returns a get/set function that either updates the GUI to the argument
-  or returns the settings for the current GUI.
-}
-
-@defmethod[(create-executable [settings settings]
-                              [parent (or/c (is-a?/c dialog%) (is-a?/c frame%))]
-                              [program-filename string?])
-           void?]{
-  This method creates an executable in the given language.  The
-  @racket[program-filename] is the name of the program to store in the
-  executable and @racket[executable-filename] is the name of a file
-  where the executable goes.
-
-  See also
-  @racket[drracket:language:create-module-based-stand-alone-executable]
-  and @racket[drracket:language:create-module-based-launcher].
-}
-
-@defmethod[(default-settings)
-           settings]{
-  Specifies the default settings for this language.
-}
-
-@defmethod[(default-settings? [settings settings])
-           boolean?]{
-  Return @racket[#t] if the input settings matches the default settings
-  obtained via @method[drracket:language:language<%> default-settings].
-}
-
-@defmethod[(first-opened [settings settings]) void?]{
-  This method is called after the language is initialized, but no
-  program has yet been run. It is called from the user's eventspace's
-  main thread.
-
-  See also @method[drracket:rep:text% initialize-console].
-
-  Calling this method should not escape.  DrRacket calls this method in
-  a @racket[parameterize] where the @racket[error-escape-handler] is set
-  to an escaping continuation that continues initializing the
-  interactions window.  Thus, raising an exception will report the error
-  in the user's interactions window as if this were a bug in the user's
-  program.  Escaping in any other way, however, can cause DrRacket to
-  fail to start up.
-
-  Also, IO system will deadlock if the @racket[first-opened] method does
-  IO on the user's IO ports, so the calling context of
-  @racket[first-opened] sets the @racket[current-output-port] and
-  @racket[current-error-port] to ports that just collect all of the IO
-  that happened and then replay it later in the initialization of the
-  user's program.
-
-  Contrary to the method contract spec, DrRacket will also invoke this
-  method if it has zero arguments, passing nothing; the zero argument
-  version is for backwards compatibility and is not recommended.
-
-}
-
-@defmethod[(front-end/complete-program [port port]
-                                       [settings settings])
-           (-> (or/c sexp/c syntax? eof-object?))]{
-  @racket[front-end/complete-program] method reads and parses a program
-  in the language. The @racket[port] argument contains all of the data
-  to be read (until eof) and the name of the @racket[port] (obtained via
-  @racket[object-name]) is a value representing the source of the
-  program (typically an editor, but may also be a string naming a file
-  or some other value).  The @racket[settings] argument is the current
-  settings for the language.
-
-  The @racket[front-end/complete-program] method is expected to return a
-  thunk that is called repeatedly to get all of the expressions in the
-  program. When all expressions have been read, the thunk is expected to
-  return @racket[eof].
-
-  This method is only called for programs in the definitions
-  window. Notably, it is not called for programs that are
-  @racket[load]ed or @racket[eval]ed.  See @racket[current-load] and
-  @racket[current-eval] for those.
-
-  This method is expected to raise an appropriate exception if the
-  program is malformed, eg an @racket[exn:syntax] or @racket[exn:read].
-
-  This is called on the user's thread, as is the thunk it returns.
-
-  Implementations of this method should not return fully expanded
-  expressions, since there are two forms of expansion, using either
-  @racket[expand] or @racket[expand-top-level-with-compile-time-evals]
-  and the use of the expanded code dictates which applies.
-
-  See also @method[drracket:language:language<%> front-end/interaction]
-  and
-  @method[drracket:language:language<%> front-end/finished-complete-program].
-}
-
-@defmethod[(front-end/finished-complete-program [settings settings]) any]{
-  This method is called when @onscreen{Run} is clicked, but only after
-  @method[drracket:language:language<%> front-end/complete-program] has
-  been called.  Specifically, @method[drracket:language:language<%>
-  front-end/complete-program] is first called to get a thunk that reads
-  from the program.  That thunk is called some number of times,
-  eventually returning @racket[eof], or raising an exception. Then, this
-  method is called.
-
-  This method is called on the user's main eventspace thread, and
-  without a prompt or other control delimiter.  It must return without
-  raising an error, or else the DrRacket window will be wedged.
-}
-
-@defmethod[(front-end/interaction [port input-port]
-                                  [settings settings])
-           (-> (or/c sexp/c syntax? eof-object?))]{
-  This method is just like
-  @method[drracket:language:language<%> front-end/complete-program]
-  except that it is called with program fragments, for example the
-  expressions entered in the interactions window.  It is also used in
-  other contexts by tools to expand single expressions.
-
-  See also
-  @method[drracket:language:language<%> front-end/finished-complete-program].
-}
-
-@defmethod[(get-comment-character)
-           (values string? char?)]{
-  Returns text to be used for the ``Insert Large Letters'' menu item in
-  DrRacket.  The first result is a prefix to be placed at the beginning
-  of each line and the second result is a character to be used for each
-  pixel in the letters.
-}
-
-@defmethod[(get-language-name)
-           string?]{
-  Returns the name of the language, as shown in the REPL when executing
-  programs in the language and in the bottom left of the DrRacket
-  window.
-}
-
-@defmethod[(get-language-numbers)
-           (cons number (listof number))]{
-  This method is used in a manner analogous to
-  @method[drracket:language:language<%> get-language-position].
-
-  Each element in the list indicates how the names at that point in
-  dialog will be sorted. Names with lower numbers appear first.  If two
-  languages are added to DrRacket with the same strings (as given by the
-  @method[drracket:language:language<%> get-language-position] method)
-  the corresponding numbers returned by this method must be the same.
-  Additionally, no two languages can have the same set of numbers.
-
-  (Note: this method should always return the same result, for the same
-  language.)
-
-}
-
-@defmethod[(get-language-position)
-           (cons string (listof string))]{
-  This method returns a list of strings that is used to organize this
-  language with the other languages.  Each entry in that list is a
-  category or subcategory of the language and the last entry in the list
-  is the name of the language itself.  In the language dialog, each
-  element in the list except for the last will be a nested turn down
-  triangle on the left of the dialog.  The final entry will be the name
-  that the user can choose to select this language. Names that are the
-  same will be combined into the same turndown entry.
-
-  For example, if one language's position is:
-  @racketblock[
-    (list "General Category" "Specific Category" "My Language")
-  ]
-  and another's is:
-  @racketblock[
-    (list "General Category" "Specific Category" "My Other Language")
-  ]
-  The language dialog will collapse the first two elements in the list,
-  resulting in only a pair of nested turn-down triangles, not parallel
-  pairs of nested turn-down triangles.
-
-}
-
-@defmethod[(get-language-url)
-           (or/c string? false/c)]{
-@methspec{
-  Returns a url for the language.
-}
-@methimpl{
-  If the result isn't @racket[#f], the name of the language is clickable
-  in the interactions window and clicking takes you to this url.
-}}
-
-@defmethod[(get-metadata [modname symbol?] [settings any/c])
-           string?]{
-  This method is only called when
-  @method[drracket:language:language<%> get-reader-module] returns an
-  sexp.
-
-  It is expected to return a string that contains N lines, where N is
-  the result of calling
-  @method[drracket:language:language<%> get-metadata-lines].
-  The string is prefixed to the buffer before the file is saved by
-  DrRacket, and removed from the buffer after it is opened in DrRacket.
-
-  The string is expect to be a prefix to the file that sets up a reader
-  for files in this language, using @tt{#reader}.
-
-  The @racket[modname] argument's printed form is the same as the file's
-  name, but without the path, and without an extension. The
-  @racket[settings] argument is the current language's settings value.
-
-  See also @method[drracket:language:language<%> metadata->settings],
-  @method[drracket:language:language<%> get-metadata-lines], and
-  @method[drracket:language:language<%> get-reader-module].
-}
-
-@defmethod[(get-metadata-lines)
-           number]{
-  This method is only called when
-  @method[drracket:language:language<%> get-reader-module] returns an
-  sexp.
-
-  The result of the method is a count of the number of lines in the
-  strings that @method[drracket:language:language<%> get-metadata]
-  returns. The @method[drracket:language:language<%> get-metadata]
-  function does not necessarily return the same string each time it is
-  called (see @method[drracket:language:language<%> metadata->settings])
-  but it is expected to always return a string with a fixed number of
-  lines, as indicated by the result of this method.
-}
-
-@defmethod[(get-one-line-summary)
-           string?]{
-@methspec{
-  The result of this method is shown in the language dialog when the
-  user selects this language.
-}
-@methimpl{
-}}
-
-@defmethod[(get-reader-module)
-           (or/c sexp-representing-a-require-spec false/c)]{
-  The result of this method is used when saving or loading files.
-
-  If the result is a sexp, saved files get a prefix inserted at the
-  beginning (the prefix is determined by calling
-  @method[drracket:language:language<%> get-metadata]).  When the file
-  is then loaded, DrRacket recognizes this prefix and sets the language
-  back to match the saved file.
-
-  See also @method[drracket:language:language<%> metadata->settings],
-  @method[drracket:language:language<%> get-metadata-lines], and
-  @method[drracket:language:language<%> get-metadata].
-}
-
-@defmethod[(get-style-delta)
-           (or/c #f (is-a?/c style-delta%) (listof (list/c (is-a?/c style-delta%) number? number?)))]{
-  The style delta that this method returns is used in the language
-  dialog and the DrRacket REPL when the language's name is printed.
-
-  When it is @racket[#f], no styling is used.
-
-  If the result is a list, each element is expected to be a list of
-  three items, a style-delta, and two numbers. The style delta will be
-  applied to the corresponding portion of the name.
-}
-
-@defmethod[(extra-repl-information [settings settings] [port output-port?]) void?]{
-  This method is called on the DrRacket eventspace main thread to insert
-  extra information into the REPL to reflect the state of the program.
-
-  It is used, for example, to print out the ``Teachpack'' lines in the
-  HtDP languages.
-}
-
-@defmethod[(marshall-settings [settings settings])
-           writable]{
-  Translates an instance of the settings type into a Racket object that
-  can be written out to disk.
-}
-
-@defmethod[(metadata->settings [metadata string?])
-           settings]{
-  This method is only called when
-  @method[drracket:language:language<%> get-reader-module] returns an
-  sexp.
-
-  When a file is opened in DrRacket, if this language's
-  @method[drracket:language:language<%> get-reader-module] returns an
-  sexp, the prefix of the file (the first N lines, where N is the number
-  returned by @method[drracket:language:language<%> get-metadata-lines])
-  is scanned for @racket["#reader"] followed by the result of
-  @method[drracket:language:language<%> get-reader-module].  If that
-  pattern is found, the language is set to this language.  Also, the
-  entire prefix is passed, as a string, to this method which returns a
-  @racket[settings] value, used as the settings for this language.
-}
-
-@defmethod[(on-execute [settings settings]
-                       [run-on-user-thread ((-> any) -> any)])
-           any]{
-  The @racket[on-execute] method is called on DrRacket's eventspace's
-  main thread before any evaluation happens when the Run button is
-  clicked. It is also called when a new DrRacket tab (or window) is
-  created to initialize the empty interactions window.
-
-  Use this method to initialize Racket's
-  @secref[#:doc '(lib "scribblings/reference/reference.scrbl") "parameters"]
-  for the user.  When this function is called, the user's thread has
-  already been created, as has its custodian.  These parameters have
-  been changed from the defaults in Racket:
-  @itemize[
-  @item{@racket[current-custodian] is set to a new custodian.}
-  @item{@racket[current-namespace] has been set to a newly created empty
-    namespace.  This namespace has the following modules copied (with
-    @racket[namespace-attach-module]) from DrRacket's original
-    namespace:
-    @itemize[
-    @item{@racket['mzscheme]}
-    @item{@racket['mred]}
-    ]}
-  @item{@racket[read-curly-brace-as-paren] is @racket[#t],}
-  @item{@racket[read-square-bracket-as-paren] is @racket[#t],}
-  @item{The @racket[port-write-handler] and @racket[port-display-handler]
-    have been set to procedures that call @racket[pretty-print] and
-    @racket[pretty-display] instead of @racket[write] and
-    @racket[display].  When @racket[pretty-print] and
-    @racket[pretty-display] are called by these parameters, the
-    @racket[pretty-print-columns] parameter is set to
-    @racket['infinity], so the output looks just like @racket[write] and
-    @racket[display].  This is done so that special scheme values can be
-    displayed as snips.}
-  @item{The @racket[current-print-covert-hook] is to a procedure so that
-    @racket[snip%]s are just returned directly to be inserted into the
-    interactions @racket[text%] object.}
-  @item{The output and input ports are set to point to the interactions
-    window with these parameters: @racket[current-input-port],
-    @racket[current-output-port], and @racket[current-error-port].}
-  @item{The @racket[event-dispatch-handler] is set so that DrRacket can
-    perform some initial setup and close down around the user's code.}
-  @item{The @racket[current-directory] and
-    @racket[current-load-relative-directory] are set to the directory
-    where the definitions file is saved, or if it isn't saved, to the
-    initial directory where DrRacket started up.}
-  @item{The snip-class-list, returned by @racket[get-the-snip-class-list]
-    is initialized with all of the snipclasses in DrRacket's
-    eventspace's snip-class-list.}
-  @item{The @racket[error-print-source-location] parameter is set to
-    @racket[#f] and the @racket[error-display-handler] is set to a
-    handler that creates an error message from the exception record,
-    with font and color information and inserts that error message into
-    the definitions window.}
-  ]
-
-  The @racket[run-on-user-thread] arguments accepts thunks and runs them
-  on the user's eventspace's main thread.  The output ports are not yet
-  functioning, so print outs should be directed to the original DrRacket
-  output port, if necessary.
-
-  This thunk is wrapped in a @racket[with-handlers] that catches all
-  exceptions matching @racket[exn:fail?] and then prints out the
-  exception message to the original output port of the DrRacket process.
-}
-
-@defmethod[(order-manuals [manuals (listof bytes?)])
-           (values (listof bytes?) boolean?)]{
-  Returns a sublist of its input, that specifies the manuals
-  (and their order) to search in. The boolean result indicates
-  if @tt{doc.txt} files should be searched.
-}
-
-@defmethod[(render-value [value TST]
-                         [settings settings]
-                         [port port])
-           void?]{
-  This method is just like
-  @method[drracket:language:language<%> render-value/format] except that
-  it is expected to put the entire value on a single line with no
-  newline after the value.
-}
-
-@defmethod[(render-value/format [value TST]
-                                [settings settings]
-                                [port port]
-                                [width (or/c number (symbols 'infinity))])
-           void?]{
-  This method is used to print values into a port, for display to a
-  user.  The final argument is a maximum width to use (in characters)
-  when formatting the value.
-
-  This method is expected to format the value by inserting newlines in
-  appropriate places and is expected to render a newline after the
-  value.
-
-  See also @method[drracket:language:language<%> render-value].
-}
-
-@defmethod[(unmarshall-settings [input writable])
-           (or/c settings false/c)]{
-  Translates a Racket value into a settings, returning @racket[#f] if
-  that is not possible.
-}}
-
-@(tools-include "language")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/modes.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/modes.scrbl
deleted file mode 100644
index bdd443987d..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/modes.scrbl
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-@(tools-title "modes")
-@(tools-include "modes")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/module-language-tools.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/module-language-tools.scrbl
deleted file mode 100644
index 617d07e8b7..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/module-language-tools.scrbl
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@tools-title["module-language-tools"]
-
-@language-info-def[drracket:toolbar-buttons]{
-If the result of @racket[read-language] for a language is a function, 
-DrRacket will query it to determine if there are any new toolbar
-buttons to be used when editing files in this language (when
-DrRacket's language is set to the Module language).
-}
-
-Specifically, DrRacket will pass @indexed-racket['drracket:toolbar-buttons]
-to the function and expect back a value matching this contract:
-@racketblock[(or/c (listof (list/c string?
-                                   (is-a?/c bitmap%)
-                                   (-> (is-a?/c drracket:unit:frame<%>) any)
-                                   (or/c real? #f)))
-                   #f)]
-which is then used to create new toolbar buttons, one for each list in the
-first. The string is the label on the button; the bitmap is the icon 
-(it should be 16x16); the function is called when the button is clicked;
-and the number is passed as the @racket[#:number] argument to
-@method[drracket:unit:frame<%> register-toolbar-button].
-
-If the result is @racket[#f], then no toolbar buttons are created.
-
-To implement functionality similar to the Run button, call the
-@method[drracket:unit:frame% execute-callback] method. You may also
-want to use the @racket[drracket:rep:after-expression] parameter.
-
-If @racket['drracket:toolbar-buttons] is not recognized, DrRacket will also
-pass @indexed-racket['drscheme:toolbar-buttons]; this is for backwards
-compatibility and new code should not use it.
-Similarly, if the fourth element from the list (the argument to @racket[#:number])
-is not present, then it is treated as @racket[#f].
-
-
-@(tools-include "module-language-tools")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/module-language.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/module-language.scrbl
deleted file mode 100644
index d9b59b3719..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/module-language.scrbl
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-@(tools-title "module-language")
-
-@definterface[drracket:language:module-language<%> ()]{
-
-The only language that implements this interface is DrRacket's ``Use
-the language declared in the source'' language.
-
-  @defmethod[(get-users-language-name) string]{
-  Returns the name of the language that is declared in the source, as a string.
-  }
-}
-
-@(tools-include "module-language")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/rep.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/rep.scrbl
deleted file mode 100644
index 45baae5c57..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/rep.scrbl
+++ /dev/null
@@ -1,470 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-@(tools-title "rep")
-
-
-@definterface[drracket:rep:text<%> ()]{
-}
-
-
-@defclass[drracket:rep:text% racket:text% (drracket:rep:text<%>)]{
-
-This class implements a read-eval-print loop for DrRacket.  User
-submitted evaluations in DrRacket are evaluated asynchronously, in an
-eventspace created for the user. No evaluations carried out by this
-class affect the implementation that uses it.
-
-
-
-@defconstructor/make[([context (implements drracket:rep:context<%>)])]{
-}
-
-@defmethod[#:mode override 
-           (after-delete)
-           void?]{
-
-Resets any error highlighting in this editor.
-
-
-}
-
-@defmethod[#:mode override 
-           (after-insert)
-           void?]{
-
-Resets any error highlighting in this editor.
-
-
-}
-
-@defmethod[(display-results [results (list-of TST)])
-           void?]{
-
-This displays each of the elements of @racket[results] in the interactions
-window, expect those elements of @racket[results] that are void. Those
-are just ignored.
-
-
-}
-
-@defmethod[(evaluate-from-port [port input-port?]
-                               [complete-program? boolean?]
-                               [cleanup (-> void)])
-           any]{
-  Evaluates the program in the @racket[port] argument. If @racket[complete-program?]
-  is @racket[#t], this method calls the
-  @method[drracket:language:language<%> front-end/complete-program] to evaluate
-  the program. If it is @racket[#f], it calls 
-  @method[drracket:language:language<%> front-end/interaction] method.
-  When evaluation finishes, it calls @racket[cleanup] on the user's main thread.
-
-  Just before calling @racket[cleanup], this invokes the thunk in 
-  @racket[drracket:rep:after-expression] (if any). It takes the value of
-  the @racket[drracket:rep:after-expression] parameter on the DrRacket main thread,
-  but invokes the thunk on the user's thread.
-  
-  This method must be called from the DrRacket main thread.
-  }
-                 
-@defmethod[#:mode augment (after-many-evals) any]{
-  Called from the DrRacket main thread after
-  @method[drracket:rep:text% evaluate-from-port] finishes (no matter
-  how it finishes).
-}
-
-@defmethod[(on-execute [run-on-user-thread (-> any)]) any]{
-
-  Use @racket[run-on-user-thread] to initialize the user's parameters, etc.
-
-  Called from the DrRacket thread after the language's
-  @method[drracket:language:language<%> on-execute]
-  method has been invoked, and after the
-  special values have been setup (the ones registered
-  via @racket[drracket:language:add-snip-value]).
-
-  Do not print to @racket[current-output-port] or @racket[current-error-port]
-  during the dynamic extent of the thunk passed to @racket[run-on-user-thread] becuase
-  this can deadlock. IO is still, in general, fine, but the @racket[current-error-port]
-  and @racket[current-output-port] are set to the user's ports that print
-  into the interactions window and are not in a good state during those calls.
-  
-}
-
-@defmethod[(get-error-range)
-           (or/c false/c (list/c (is-a?/c text:basic%) number? number?))]{
-@methspec{
-
-Indicates the highlighted error range. The state for the
-error range is shared across all instances of this class, so
-there can only be one highlighted error region at a time.
-
-}
-@methimpl{
-
-If @racket[#f], no region is highlighted. If a list, the first
-element is the editor where the range is highlighted and the
-second and third are the beginning and ending regions,
-respectively.
-
-
-}}
-
-@defmethod[(get-user-custodian)
-           (or/c false/c custodian?)]{
-This is the custodian controlling the user's program.
-
-}
-
-@defmethod[(get-user-eventspace)
-           (or/c false/c eventspace?)]{
-This is the user's eventspace. The result of
-@method[drracket:rep:text% get-user-thread] is the main thread of this eventspace.
-
-}
-
-@defmethod[(get-user-language-settings)
-           language-settings]{
-Returns the user's language-settings for the most recently
-run program. Consider using
-@method[drracket:unit:definitions-text<%> get-next-settings] instead, since the user may have selected a new language
-since the program was last run.
-
-}
-
-@defmethod[(get-user-namespace)
-           (or/c false/c namespace?)]{
-Returns the user's namespace. This method
-returns a new namespace each time Run is
-clicked.
-
-}
-
-@defmethod[(get-user-thread)
-           (or/c false/c thread?)]{
-This method returns the thread that the user's code runs
-in. It returns a different result each time the user
-runs the program.
-
-It is @racket[#f] before the first time the user click on
-the Run button or the evaluation has been killed.
-
-This thread has all of its parameters initialized according to the
-settings of the current execution.
-See @secref[#:doc '(lib "scribblings/reference/reference.scrbl")]{parameters}
-for more information about parameters.
-
-}
-
-@defmethod[(highlight-errors 
-            [locs (listof srcloc?)]
-            [error-arrows (or/c #f (listof srcloc?)) #f])
-           void?]{
-Call this method to highlight errors associated with this repl.
-See also
-@method[drracket:rep:text% reset-highlighting], and
-@method[drracket:rep:text% highlight-errors/exn].
-
-This method highlights a series of dis-contiguous ranges in
-the editor.
-
-It puts the caret at the location of the first error.
-
-}
-
-@defmethod[(highlight-errors/exn [exn exn])
-           void?]{
-
-Highlights the errors associated with the exn (only syntax
-and read errors -- does not extract any information from the
-continuation marks)
-
-See also 
-@method[drracket:rep:text% highlight-errors].
-
-
-}
-
-@defmethod[(on-highlighted-errors [loc/s (or/c srcloc? (listof srcloc?))]) void?]{
-  This method is called when an error is highlighted in a DrRacket window.
-  
-  If the input is a list of @racket[srcloc?] objects, then all of them
-  are highlighted, and they are all of the errors known to DrRacket at this
-  point.
-  
-  If a single one is passed, then user probably typed the @litchar{.} menu
-  shortcut to highlight a single error and there may be other errors
-  known to DrRacket.
-  
-  Errors are made known to DrRacket via
-  @method[drracket:rep:text% highlight-errors].
-}
-                 
-@defmethod[(initialize-console) void?]{
-
-This inserts the ``Welcome to DrRacket'' message into the interactions
-buffer, calls
-@method[drracket:rep:text% reset-console],
-@method[drracket:rep:text% insert-prompt], and 
-@method[editor<%> clear-undos].
-
-Once the console is initialized, this method calls
-@method[drracket:language:language<%> first-opened]. 
-Accordingly, this method should not be called to initialize
-a REPL when the user's evaluation is imminent. That is,
-this method should be called when new tabs or new windows
-are created, but not when the Run button is clicked. 
-
-This method calls the 
-@method[drracket:language:language<%> first-opened]
-from the user's eventspace's main thread and, when 
-@method[drracket:language:language<%> first-opened]
-returns, it enqueue's a callback that ends
-an edit sequence on the REPL and calls
-@method[editor<%> clear-undos]. Accordingly, if the
-@method[drracket:language:language<%> first-opened]
-method does not return, the interactions text will
-be in an unclosed edit sequence.
-}
-
-@defmethod[(insert-prompt)
-           void?]{
-
-Inserts a new prompt at the end of the text.
-}
-
-@defmethod[(kill-evaluation)
-           void?]{
-This method is called when the user chooses the kill menu item.
-
-}
-
-@defmethod[#:mode override 
-           (on-close)
-           void?]{
-
-Calls 
-@method[drracket:rep:text% shutdown].
-
-Calls the super method.
-
-
-}
-
-@defmethod[(queue-output [thnk (-> void?)])
-           void?]{
-@methspec{
-
-This method queues thunks for DrRacket's eventspace in a
-special output-related queue.
-}}
-
-@defmethod[(reset-console)
-           void?]{
-
-Kills the old eventspace, and creates a new
-parameterization for it.
-
-
-}
-
-@defmethod[(reset-highlighting)
-           void?]{
-This method resets the highlighting being displayed for this repl. See also:
-@method[drracket:rep:text% highlight-errors], and
-@method[drracket:rep:text% highlight-errors/exn].
-
-}
-
-@defmethod[(run-in-evaluation-thread [f ( -> void)])
-           void?]{
-@methspec{
-
-This function runs its arguments in the user evaluation thread. This
-thread is the same as the user's eventspace main thread.
-
-}
-@methimpl{
-
-Calls @racket[f], after switching to the user's thread.
-
-
-}}
-
-@defmethod[(shutdown)
-           void?]{
-Shuts down the user's program and all windows. Reclaims any
-resources the program allocated.  It is expected to be
-called from DrRacket's main eventspace thread.
-
-}
-
-@defmethod[(wait-for-io-to-complete)
-           void?]{
-This waits for all pending IO in the rep to finish
-and then returns.
-
-This method must only be called from the main thread in
-DrRacket's eventspace
-
-}
-
-@defmethod[(wait-for-io-to-complete/user)
-           void?]{
-This waits for all pending IO in the rep to finish
-and then returns.
-
-This method must only be called from the main thread
-in the user's eventspace
-
-}}
-
-
-@defmixin[drracket:rep:drs-bindings-keymap-mixin (editor:keymap<%>) ()]{
-
-This mixin adds some DrRacket-specific keybindings to the
-editor it is mixed onto.
-
-
-
-@defmethod[#:mode override 
-           (get-keymaps)
-           (listof (is-a?/c keymap%))]{
-
-Calls the super method and adds in a keymap with the
-DrRacket-specific keybindings:
-
-@itemize[
-@item{f5 - Run}
-
-@item{c:x;o - toggles the focus between the definition and
-interactions windows.}
-]
-
-
-
-}}
-
-
-@definterface[drracket:rep:context<%> ()]{
-
-Objects that match this interface provide all of the services that the 
-@racket[drracket:rep:text%] class needs to connect with its context.
-
-
-
-@defmethod[(clear-annotations)
-           void?]{
-@methspec{
-
-Call this method to clear any annotations in the text before
-executing or analyzing or other such activities that should
-process the program.
-
-Tools that annotate the program text should augment this
-method to clear their own annotations on the program text.
-
-DrRacket calls this method before a program is run (via the
-Run button).
-
-}
-@methimpl{
-
-Clears any error highlighting in the definitions window.
-
-
-
-}}
-
-@defmethod[(disable-evaluation)
-           void?]{
-Call this method to disable evaluation GUI evaluation while
-some evaluation (or expansion) is taking place on another
-thread.
-
-Override this method if you add a GUI-based mechanism for
-initiating evaluation in the frame.
-
-This method is also called when the user switches tabs.
-
-See also
-@method[drracket:rep:context<%> enable-evaluation].
-
-}
-
-@defmethod[(enable-evaluation)
-           void?]{
-This method must disable the GUI controls that start
-user-sponsored evaluation. It is called once the user starts
-some evaluation to ensure that only one evaluation proceeds
-at a time.
-
-It is also called when the user switches tabs.
-
-See also
-@method[drracket:rep:context<%> disable-evaluation].
-
-}
-
-@defmethod[(ensure-rep-shown [rep (is-a?/c drracket:rep:text<%>)])
-           void?]{
-
-This method is called to force the rep window to be visible when, for
-example, an error message is put into the rep. Also ensures
-that the appropriate tab is visible, if necessary.
-
-
-}
-
-@defmethod[(get-breakables)
-           (values (or/c thread? false/c) (or/c custodian? false/c))]{
-Returns the last values passed to
-@method[drracket:rep:context<%> set-breakables].
-
-}
-
-@defmethod[(get-directory)
-           (union string false/c)]{
-The result of this method is used as the initial directory for the
-user's program to be evaluated in.
-
-}
-
-@defmethod[(needs-execution)
-           (or/c string? false/c)]{
-This method should return an explanatory string when the
-state of the program that the repl reflects has changed. It
-should return @racket[#f] otherwise.
-
-}
-
-@defmethod[(reset-offer-kill)
-           void?]{
-The break button typically offers to kill if it has been
-pushed twice in a row. If this method is called, however, it
-ignores any prior clicks.
-
-}
-
-@defmethod[(set-breakables [thread (or/c thread false/c)]
-                           [custodian (or/c custodian false/c)])
-           void?]{
-Calling this method with a thread and a custodian means that
-the next time the break button is clicked, it will either
-break the thread or shutdown the custodian.
-
-See also
-@method[drracket:rep:context<%> get-breakables].
-
-}
-
-@defmethod[(update-running [running? any/c])
-           void?]{
-
-This method should update some display in the gui that
-indicates whether or not evaluation is currently proceeding
-in the user's world.
-
-
-}}
-
-@(tools-include "rep")
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/tool-lib-extracts.rkt b/pkgs/drracket-pkgs/drracket/scribblings/tools/tool-lib-extracts.rkt
deleted file mode 100644
index ed091b609a..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/tool-lib-extracts.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scheme/base
-
-(require scribble/extract)
-
-(provide-extracted (lib "tool-lib.rkt" "drracket"))
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/tools.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/tools.scrbl
deleted file mode 100644
index de7ba76925..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/tools.scrbl
+++ /dev/null
@@ -1,931 +0,0 @@
-#lang scribble/doc
-@(begin
-   (require scribble/manual
-            "common.rkt"
-            scribble/racket
-            (for-syntax racket/base
-                        "example-src.rkt")
-            (for-label drracket/tool-lib)
-            (for-label racket/unit racket/contract)
-            (for-label racket/base racket/gui)
-            (for-label framework/framework)
-            (for-label drracket/syncheck-drracket-button
-                       drracket/check-syntax
-                       string-constants/string-constant)
-            scribble/eval
-            scribble/extract)
-   
-   (define (File x) @tt[x])
-   (define (FileFirst x) @tt[x]) ;; indexing missing
-   
-   (define-syntax-rule (item/cap x . ys)
-     (item (indexed-racket x) ": " . ys)))
-
-@title{DrRacket Plugins}
-
-@author["Robert Bruce Findler"]
-
-@defmodule*[(drracket/tool-lib drracket/tool drscheme/tool-lib drscheme/tool)]
-
-This manual describes DrRacket's plugins interface. It assumes
-familiarity with 
-Racket, as described in the
-@(other-manual '(lib "scribblings/guide/guide.scrbl")),
-and the
-@(other-manual '(lib "scribblings/reference/reference.scrbl")),
-DrRacket, as described in
-@(other-manual '(lib "scribblings/drracket/drracket.scrbl")),
-and the GUI library, as described in
-@(other-manual '(lib "scribblings/gui/gui.scrbl")).
-The Framework, as described in
-@(other-manual '(lib "scribblings/framework/framework.scrbl")),
-may also come in handy.
-
-The @racketmodname[drscheme/tool-lib] and @racketmodname[drscheme/tool]
-libraries are for backward compatibility; they exports all of the bindings of
-their @tt{drracket} counterpart.
-
-@table-of-contents[]
-
-@bold{Thanks}
-
-Thanks to PLT and the early adopters of the 
-tools interface for
-their feedback and help.
-
-A special thanks to
-Eli Barzilay, 
-John Clements, 
-Matthias Felleisen,
-Cormac Flanagan,
-Matthew Flatt, 
-Max Hailperin, 
-Philippe Meunier, and
-Christian Queinnec for their
-help being early clients for DrRacket plugins.
-
-@section[#:tag "implementing-tools"]{Implementing DrRacket Plugins}
-
-Plugins are designed for major extensions in DrRacket's
-functionality.  To extend the appearance
-or the functionality the DrRacket window (say, to annotate
-programs in certain ways or to add buttons to the DrRacket
-frame) use a
-tool. The Macro Stepper, the Syntax Checker, the Stepper,
-and the teaching languages are all implemented as tools.
-
-When DrRacket starts up, it looks for tools by reading
-fields in the @File{info.rkt} file of each collection and the
-newest version of each PLaneT package installed on the
-system.  (Technically, DrRacket looks in a cache of the
-@filepath{info.rkt} files contents created by @tt{raco setup}. Be sure to
-re-run @tt{raco setup} if you change the contents of
-the @File{info.rkt} files).  DrRacket checks for these
-fields:
-@itemize[
-@item/cap[drracket-tools]{
-  @racket[(listof (listof string[subcollection-name]))]
-}
-@item/cap[drracket-tool-names]{@racket[(listof (or/c #f string))]}
-@item/cap[drracket-tool-icons]{
-@racketblock[(listof (or/c #f
-                           string[relative-pathname] 
-                           (cons string[filename] 
-                                 (listof string[collection-name]))))]
-}
-@item/cap[drracket-tool-urls]{
-@racket[(listof (or/c #f string[url]))]
-}]
-
-The @racket[drracket-tools] field names a list of tools in this
-collection. Each tool is specified as a collection path,
-relative to the collection where the @File{info.rkt} file
-resides. As an example, if there is only one tool named
-@File{tool.rkt}, this suffices:
-@racketblock[
-(define drracket-tools (list (list "tool.rkt")))
-]
-If the @racket[drracket-tool-icons] or @racket[drracket-tool-names] fields are
-present, they must be the same length as @racket[drracket-tools]. The
-@racket[drracket-tool-icons] field specifies the path to an icon for each
-tool and the name of each tool. If it is @racket[#f], no
-tool is shown. If it is a relative pathname, it must refer
-to a bitmap and if it is a list of strings, it is treated
-the same as the arguments to @racket[lib], inside
-@racket[require].
-
-This bitmap and the name show up in the about box, the
-bug report form, and the splash screen as the tool is
-loaded at DrRacket's startup.
-
-Each of the @racket[drracket-tools] files must contain a module that
-@racket[provide]s @racket[tool@], which must be bound to a
-@racket[unit]. The unit
-must import the @racket[drracket:tool^] signature, which is
-provided by the @racketmodname[drracket/tool] library. 
-The @as-index{@racket[drracket:tool^]}
-signature contains all of the names listed in this manual.
-The unit must export the @racket[drracket:tool-exports^]
-signature. 
-
-If the tool raises an error as it is loaded, invoked, or as
-the @sigelem[drracket:tool-exports^ phase1] or
-@sigelem[drracket:tool-exports^ phase2] thunks are called,
-DrRacket catches the error and displays a message box. Then,
-DrRacket continues to start up, without the tool.
-
-For example, if the @File{info.rkt} file in a collection
-contains:
-@racketmod[
-info
-(define drracket-name "Tool Name")
-(define drracket-tools (list (list "tool.rkt")))
-]
-then the same collection would be expected to contain a
-@File{tool.rkt} file. It might contain something like this:
-@racketmod[
-racket/gui
-(require drracket/tool)
-
-(provide tool@)
-
-(define tool@
-  (unit
-    (import drracket:tool^)
-    (export drracket:tool-exports^)
-    (define (phase1) (message-box "tool example" "phase1"))
-    (define (phase2) (message-box "tool example" "phase2"))
-    (message-box "tool example" "unit invoked")))
-]
-This tool just opens a few windows to indicate that it has
-been loaded and that the @sigelem[drracket:tool-exports^ phase1]
-and @sigelem[drracket:tool-exports^ phase2]
-functions have been called.
-
-Finally, here is a more involved example. This 
-module defines a plugin that adds a button to the DrRacket
-frame that, when clicked, reverses the contents of the definitions
-window. It also adds an easter egg. Whenever the definitions text is
-modified, it checks to see if the definitions text contains the
-text ``egg''. If so, it adds ``easter '' just before.
-
-@(let ()
- 
-   (define-syntax-rule (define-linked-method name interface)
-     (define-syntax name 
-       (make-element-id-transformer
-        (lambda (stx)
-          #'(method interface name)))))
-   
-   (define-linked-method begin-edit-sequence editor<%>)
-   (define-linked-method end-edit-sequence editor<%>)
-   (define-linked-method find-first-snip editor<%>)
-   (define-linked-method on-insert text%)
-   (define-linked-method on-delete text%)
-   (define-linked-method after-insert text%)
-   (define-linked-method after-delete text%)
-   
-   (define-linked-method insert text%)
-   (define-linked-method get-text text%)
-   (define-linked-method split-snip text%)
-   
-   (define-linked-method next snip%)
-   (define-linked-method release-from-owner snip%)
-   
-   (define-linked-method change-children area-container<%>)
-   
-   (define-linked-method get-button-panel drracket:unit:frame%)
-   (define-linked-method register-toolbar-button drracket:unit:frame<%>)
-   (define-linked-method get-definitions-text drracket:unit:frame<%>)
-   
-   (define-linked-method erase dc<%>)
-   (define-linked-method set-smoothing dc<%>)
-   (define-linked-method set-pen dc<%>)
-   (define-linked-method set-brush dc<%>)
-   (define-linked-method draw-ellipse dc<%>)
-   (define-linked-method set-bitmap bdc%)
-   
-   (define-syntax (get-src stx)
-     (define file (list-ref files 1))
-     #`(racketmod
-        #,@(let loop ([sw (list-ref file 1)])
-             (cond
-               [(src-wrap? sw)
-                (datum->syntax #'here
-                               (loop (src-wrap-obj sw))
-                               (src-wrap-srcloc sw))]
-               [(pair? sw)
-                (cons (loop (car sw)) (loop (cdr sw)))]
-               [else
-                sw]))))
-   
-   (get-src))
-
-
-
-@section[#:tag "adding-languages"]{Adding Languages to DrRacket}
-@index{adding languages to DrRacket}
-
-@subsection{@tt{#lang}-based Languages in DrRacket}
-
-If a language can be implemented as a module
-(see @racket[module] for details), then the simplest and
-best way to use the language is via the ``Use the language
-declared the in source'' checkbox in the @onscreen{Language} dialog.
-In this case, DrRacket's appearance can still be customized to
-the language; it uses @racket[read-language] with these arguments
-as the @racket[_key] argument to the @racket[_get-info] function to do so:
-
-@itemize[@item{@language-info-ref[drracket:toolbar-buttons]}
-          @item{@language-info-ref[drracket:opt-out-toolbar-buttons]}
-          @item{@language-info-ref[definitions-text-surrogate]}
-          @item{@language-info-ref[drracket:default-filters]}
-          @item{@language-info-ref[drracket:default-extension]}
-          @item{@language-info-ref[color-lexer]}]
-
-If the call to @racket[read-language] raises an error, DrRacket logs the
-error at the @racket[_debug] level to a logger with the name 
-@racket['drracket-language] (see 
-@secref["logging" #:doc '(lib "scribblings/reference/reference.scrbl")] for more
-about how to follow specific loggers).
-
-@language-info-def[color-lexer]{
-  When a language's @racket[_get-info] procedure responds to @racket['color-lexer], it
-  is expected to return a procedure suitable to pass as the @racket[_get-token]
-  argument to @method[color:text<%> start-colorer].
-}
-
-The recognized token styles (specified implicitly via @method[color:text<%> start-colorer]'s 
-@racket[_token-sym->style] argument) are:
-@itemize[@item{@indexed-racket['symbol]}
-          @item{@indexed-racket['keyword]}
-          @item{@indexed-racket['comment]}
-          @item{@indexed-racket['string]}
-          @item{@indexed-racket['constant]}
-          @item{@indexed-racket['parenthesis]}
-          @item{@indexed-racket['error]}
-          @item{@indexed-racket['other]}]
-These precise colors for these identifiers are controlled by the preferences dialog in DrRacket.
-
-@language-info-def[drracket:default-filters]{
-  When a language's @racket[_get-info] procedure responds to
-  @racket['drracket:default-filters], it is expected to return
-  @racket[(listof (list/c string? string?))].
-  
-  These results are added as a prefix to @racket[finder:default-filters],
-  extending the default that DrRacket normally uses, namely:
-  @racketblock[`(["Racket Sources" "*.rkt;*.scrbl;*.rktl;*.rktd;*.ss;*.scm"]
-                 ["Any" "*.*"])]
-  @history[#:added "1.2"]
-}
-
-@language-info-def[drracket:default-extension]{
-  When a language's @racket[_get-info] procedure responds to @racket['drracket:default-extension],
-  it is expected to return @racket[(and/c string? (not/c #rx"[.]"))]; the result is used
-  as the default extension when saving files by setting @racket[finder:default-extension].
-  
-  @history[#:added "1.2"]
-}
-
-@history[#:changed "1.1" @elem{Added support for @racket['drracket:default-filters]
-                               and @racket['drracket:default-extension].}]
-
-@subsection{Adding Module-based Languages to DrRacket}
-
-For backwards compatibility, DrRacket also supports
-and 
-@File{info.rkt} file-based method for specifying
-such languages. Include these definitions:
-@itemize[
-@item/cap[drscheme-language-modules]{
-  This must be bound to a
-  list of collection path specifications or strings, one for
-  each language in the collection. Each collection path
-  specification is the quoted form of what might appear as
-  an argument to @racket[require], using the
-  @tt{lib} argument (but without the @tt{lib}). The
-  strings represent relative paths starting at the directory
-  containing the @File{info.rkt} file.  They are interpreted
-  like string arguments to @racket[require].
-}
-@item/cap[drscheme-language-positions]{
-This must be bound to a
-  list of language positions. Each language position
-  corresponds to the position of the language in language
-  dialog. Each language position is a list of strings whose
-  length must be at least two.
-  
-  If the first string is the same as 
-  @racket[(string-constant teaching-languages)], then
-  it is put into the ``Teaching Languages'' section
-  of the dialog. Otherwise, it goes into the ``Other Languages''
-  section of the dialog.
-}
-@item/cap[get-drscheme-language-positions]{
-This must be bound to a list that contains a module path followed
-  by a symbol. The module path and symbol are combined with
-  @racket[dynamic-require] to obtain a list that is appended
-  to the one from @racket[drscheme-language-positions], which
-  allows access to @racketmodname[string-constants] to specify
-  language positions.
-}
-@item/cap[drscheme-language-numbers]{
-This is optional. If
-  present, it must be a list of a list of numbers. Each list
-  corresponds to a single language from this collection.
-  Each number indicates a sorting order in the language
-  dialog for the corresponding string in 
-  @racket[drscheme-language-positions]. If absent, it defaults
-  to a list of zeros that has the same length as
-  @racket[drscheme-language-positions]. This will rarely be correct.
-}
-  
-@item/cap[drscheme-language-one-line-summaries]{
-This is
-  optional. If present, it must be a list of strings. Each
-  string is displayed at the bottom of the language dialog
-  when the corresponding language is selected.
-}
-@item/cap[drscheme-language-urls]{
-This is
-  optional. If present, it must be a list whose elements are
-  either strings or @racket[#f].
-  Clicking the corresponding language's name in
-  the interactions window opens a web browser to the url.
-}
-@item/cap[drscheme-language-readers]{
-This is optional. If
-  present, it must be bound to a quoted list of module
-  specifications (that is, a quoted version of the argument
-  to @racket[require]). Each
-  specification must be a module that exports a function
-  named @racket[read-syntax].  Each of these
-  @racket[read-syntax] functions must match Racket's
-  @racket[read-syntax] primitive's contract, but may
-  read different concrete syntax.
-
-  If the module specification is a plain string, it 
-  represents a relative path starting at the directory
-  containing the @File{info.rkt} file.  It is interpreted
-  like the string arguments to @racket[require].
-}]
-The lists must have the same length.
-
-As an example, the @italic{Essentials of Programming Languages}
-language specification's @File{info.rkt} used to look like this:
-@racketmod[
-info
-(require string-constants)
-(define name "EoPL Support")
-(define drscheme-language-modules
-  (list "eopl-lang.rkt"))
-(define drscheme-language-positions
-  (list (list (string-constant teaching-languages)
-              "Essentials of Programming Languages")))
-]
-This @File{info.rkt} file indicates that there is a single
-language in this collection. The module that implements the
-language is the @File{eopl-lang.rkt} file in the same directory as
-the @File{info.rkt} file. Additionally, the language dialog will contain
-@tt{Essentials of Programming Languages} as a potential
-language. The use of the string constant
-@racket[teaching-languages] ensures that EoPL's language is
-placed properly in foreign language versions of DrRacket.
-
-For collections that define multiple (related) languages, if
-the language-positions contain multiple strings, the
-languages whose leading strings match are grouped together.
-That is, if two languages have strings:
-@racketblock[
-  '("My Text" "First Language")
-]
-and
-@racketblock[
-  '("My Text" "Second Language")
-]
-the two languages will be grouped together in the language
-dialog.
-
-@subsection{Adding Arbitrary Languages to DrRacket}
-With some additional work, any language that can be compiled
-to Racket is supported by the tools interface,
-not just those that use standard configurations and
-@racket[module].
-
-Each language is a class that implement the
-@racket[drracket:language:language<%>] interface.  DrRacket also
-  provides two simpler interfaces:
-  @racket[drracket:language:module-based-language<%>] and
-  @racket[drracket:language:simple-module-based-language<%>],
-  and 
-  @racket[mixin]s
-  @racket[drracket:language:simple-module-based-language->module-based-language-mixin]
-  and
-  @racket[drracket:language:module-based-language->language-mixin]
-  that build implementations of @racket[drracket:language:language<%>]s from these simpler interfaces.
-
-Once you have an implementation of the
-@racket[drracket:language:language<%>] interface, call
-@racket[drracket:language-configuration:add-language] to add the language
-to DrRacket.
-
-Each language comes with its own type, called
-@tt{settings}. This can be any type the language
-designer chooses, but to aid documentation, we call it
-@tt{settings} here. The settings type is expected to
-contain parameters of the language, such as case
-sensitivity, etc. The implementor of the language provides a
-GUI so the user can configure the settings and all of the
-language's operations accept a setting. DrRacket maintains
-the current settings for each language.
-
-@subsection{Language Extensions}
-
-Some tools may require additional functionality from the
-@racket[drracket:language:language<%>] interface. The
-@racket[drracket:language:extend-language-interface]
-function and the
-@racket[drracket:language:get-default-mixin]
-mixin make this possible.
-
-For example, the MrFlow tool expands a program, analyzes it
-and then displays sets of values for each program point.
-These sets of values should be rendered in the syntax of the
-language that MrFlow analyzes. Since MrFlow doesn't 
-know which languages are available, it can call
-@racket[drracket:language:extend-language-interface]
-to extend the @racket[drracket:language:language<%>]
-interface with a method for rendering sets of values and
-provide a default implementation of that method. Tools that
-know about MrFlow can then override the value rendering
-method to provide a language-specific implementation of
-value rendering.  Additionally, since the
-@racket[drracket:language:get-default-mixin]
-adds the default implementation for the value-set rendering
-method, all languages at least have some form of value-set
-rendering.
-
-In some cases, it is important for one tool to avoid
-depending on another in the manner above. For example, if a
-tool that provides a new language provides an implementation
-for the MrFlow-specific method, that tool may fail to load
-if MrFlow is not present (Indeed, with the tool manager,
-this can happen to any tool that depends on another in this
-manner.)
-
-To avoid this problem, consider writing your tool to first
-check to see if the base method is available before
-extending it. For example, if the MrFlow tool provides the
-@tt{render-value<%>} interface, then a tool that overrides
-that method can first test to see if the superclass
-implements that method before overriding it:
-@racketblock[
-(define (my-language-mixin %)
-  (if (implementation? % mrflow:render-value<%>)
-      (class % 
-        (define/override ...)
-        (super-new))
-      %))
-]
-
-To help test your tool, use the 
-@seclink["environment-variables" #:doc '(lib "scribblings/drracket/drracket.scrbl")]{@tt{PLTONLYTOOL}}
-environment variable to load it in isolation.
-
-@section{Creating New Kinds of DrRacket Frames}
-
-Each frame in DrRacket has certain menus and functionality,
-most of which is achieved by using the framework.
-Additionally, there is one mixin that DrRacket provides to
-augment that. It is @racket[drracket:frame:basics-mixin].
-Be sure to mix it into any new frame class that you add to
-DrRacket.
-
-@section{Extending the Existing DrRacket Classes}
-
-Each of the names:
-@itemize[
-@item{@racket[drracket:get/extend:extend-interactions-text]}
-@item{@racket[drracket:get/extend:extend-definitions-text]}
-@item{@racket[drracket:get/extend:extend-interactions-canvas]}
-@item{@racket[drracket:get/extend:extend-definitions-canvas]}
-@item{@racket[drracket:get/extend:extend-unit-frame]}
-@item{@racket[drracket:get/extend:extend-tab]}]
-is bound to an extender function. In order to change the
-behavior of DrRacket, you can derive new classes from the
-standard classes for the frame, texts, canvases. Each
-extender accepts a function as input. The function it
-accepts must take a class as its argument and return a
-classes derived from that class as its result. For example:
-
-@racketblock[
-(drracket:get/extend:extend-interactions-text
-  (lambda (super%)
-    (class super%
-      (define/public (method1 x) ...)
-      (super-new))))
-]
-extends the interactions text class with a method named @tt{method1}.
-
-@section[#:tag "Expanding and Breaking"]{Expanding the User's Program Text and Breaking}
-@index{expanding user programs}
-@index{breaking}
-@index{break button}
-
-Macro-expanding a program may involve arbitrary computation
-and requires the setup of the correct language. To aid this,
-DrRacket's tool interface provides
-@racket[drracket:eval:expand-program] to help. Use
-this method to extract the fully expanded program text in a
-particular language.
-
-Because expanding the user's program may require DrRacket to
-evaluate arbitrary code that the user wrote, tools that
-expand the user's program should also allow the user to break
-the expansion. To help with this, the tools interfaces
-provides these methods:
-@method[drracket:rep:context<%> enable-evaluation]
-and
-@method[drracket:rep:context<%> disable-evaluation].
-Since your tool will be expanding the program text, you
-should be both overriding 
-@method[drracket:rep:context<%> enable-evaluation]
-and
-@method[drracket:rep:context<%> disable-evaluation]
-to disable your tool and calling them
-to ensure that only one expansion is happening
-at a time.
-
-Finally, DrRacket provides the
-@method[drracket:rep:context<%> set-breakables]
-method. This method controls what behavior the Break button
-has.
-
-@section{Editor Modes}
-@index{modes}
-@index{scheme mode}
-@index{racket mode}
-
-@subsection{Color Schemes}
-
-DrRacket uses the framework's color schemes to colorize
-source text and other aspects of itself. See 
-@racket[color-prefs:register-info-based-color-schemes] for
-details on how to add new color schemes via @filepath{info.rkt}
-files.
-
-@subsection{General-purpose Modes}
-
-@index{definitions-text-surrogate}
-@language-info-def[definitions-text-surrogate]{
-DrRacket provides support for multiple editor modes based on the
-@tt{#lang} line at the beginning of the editor. If the 
-@onscreen{Modes} submenu of the @onscreen{Edit} menu has
-the @onscreen{Racket} mode chosen (which is the default if the
-Language dialog's ``The Racket Language'' is chosen), then 
-DrRacket calls the language's @racket[get-info] procedure
-(see @racket[read-language] for more about how to set up
-a language's @racket[get-info] procedure) with
-@racket['definitions-text-surrogate]. This is expected to return
-a quoted module path (in the sense of @racket[module-path?]) that
-names a module that exports @racket[surrogate%]. It is expected
-to be bound to a class implementing the @racket[mode:surrogate-text<%>]
-interface. Assuming so, it is used as the surrogate for the definitions
-text.}
-
-Additionally, plugins can register modes via
-@racket[drracket:modes:add-mode]. Each mode is
-visible in the @onscreen{Modes} submenu of the @onscreen{Edit}
-menu. Initially, DrRacket only supports two modes: Racket
-mode and text mode.
-
-DrRacket automatically selects a mode for each open
-file based on the file's extension (and the language chosen
-as described above). If the file ends with
-@File{.txt}, DrRacket uses text mode. Otherwise, DrRacket
-uses Racket mode.
-
-@section{Language-Specific Capabilities}
-
-@subsection[#:tag "drracket:lang-languages-customization"]{Customizing DrRacket's Behavior}
-
-When using the language declared in the source, DrRacket queries  that
-language via @racket[module-compiled-language-info] to determine
-if an expression in the interactions window is ready to be submitted
-to the evaluator (when the user types return).
-The info procedure is passed @racket['drracket:submit-predicate] 
-and should return a function with this contract:
-@racketblock[(-> input-port?
-                 boolean?
-                 boolean?)]
-This function's first argument is a port that contains the interactions window's
-data, starting from the prompt position to the end of the editor.
-The second argument is a boolean indicating if the insertion point is
-followed only by whitespace. The results should be a 
-boolean indicating if the expression should be evaluated.
-This function is called in sandbox, but with no filesystem or networking 
-limits.
-
-@subsection{Customizing DrRacket's GUI}
-
-DrRacket's capability interface provides a mechanism for
-tools to allow languages to hide their GUI interface, if the
-tool does not apply to the language. Tools register
-capabilities keyed with symbols via.
-@racket[drracket:language:register-capability]. Once
-registered, a tool can query a language, via the 
-@method[drracket:language:language<%> capability-value]
-method. The result from this method controls whether or not
-the tool shows this part of the GUI for DrRacket.
-
-See @racket[drracket:language:register-capability]
-for a list of the capabilities registered by default.
-
-@section{Check Syntax}
-
-Check Syntax is a part of the DrRacket collection, but is implemented via the 
-plugin API. See also @racketmodname[drracket/check-syntax].
-
-@subsection{Check Syntax Button}
-
-@defmodule[drracket/syncheck-drracket-button]
-
-@defthing[syncheck-drracket-button
-          (list/c 
-           string?
-           (is-a?/c bitmap%)
-           (-> (is-a?/c
-                top-level-window<%>)
-               any))]{
-   This is meant to be used with the @racket['drracket:toolbar-buttons] 
-   argument to the info proc returned
-   from @racket[read-language].
-}
-
-@defidform[syncheck:button-callback]{
-  This is defined with @racket[define-local-member-name] and
-  is bound to a method of no arguments of the DrRacket frame that runs Check
-  Syntax.
-}
-          
-@defthing[syncheck-bitmap (is-a?/c bitmap%)]{
-  The bitmap in the Check Syntax button on the DrRacket frame.
-}
-
-@subsection{Syntax Properties that Check Syntax Looks For}
-
-@section-index["disappeared-use" "disappeared-binding" "sub-range-binders" "mouse-over-tooltips"]
-
-Check Syntax collects the values of the 
-@racket[syntax-property]s named 
-@racket['disappeared-use],
-@racket['disappeared-binding], 
-@racket['sub-range-binders], and
-@racket['mouse-over-tooltips] and uses them to add
-additional arrows to the program text. These properties are
-intended for use when a macro discards or manufactures identifiers that,
-from the programmers perspective, should be binding each other.
-
-For example, here is a macro that discards its arguments, but
-adds properties to the result syntax object so the arguments
-are treated as a binding/bound pair by Check Syntax.
-
-@racketblock[
-  (define-syntax (m stx)
-    (syntax-case stx ()
-      [(_ id1 id2)
-       (and (identifier? #'id1) (identifier? #'id2))
-       (syntax-property
-        (syntax-property
-         #'1
-         'disappeared-use (list (syntax-local-introduce #'id1)))
-        'disappeared-binding (list (syntax-local-introduce #'id2)))]))]
-
-See also @racket[current-recorded-disappeared-uses].
-
-The value of the @racket['sub-range-binders] property is expected
-to be a tree of @racket[cons] pairs (in any configuration) whose leaves
-are either ignored or are vectors of the shape
-@racketblock[(vector/c syntax? exact-nonnegative-integer? exact-nonnegative-integer?
-                       syntax? exact-nonnegative-integer? exact-nonnegative-integer?)]
-If the leaf is a vector, the first syntax object is expected to be an identifier whose
-bound occurrences should have arrows that point to the syntax object in the fourth
-position in the vector. The numbers indicate the starting point and the range inside
-the corresponding identifier to consider as the location of the end of the arrow.
-Here's an example:
-
-@codeblock{#lang racket/base
-           (require (for-syntax racket/base))
-           (define-syntax (define/hyphen stx)
-             (syntax-case stx ()
-               [(_ id1 id2 rhs-expr)
-                (let ()
-                  (define first-part (symbol->string (syntax-e #'id1)))
-                  (define second-part (symbol->string (syntax-e #'id2)))
-                  (define first-len (string-length first-part))
-                  (define second-len (string-length second-part))
-                  (define hyphenated-id 
-                    (datum->syntax
-                     #'id1
-                     (string->symbol (string-append first-part "-" second-part))))
-                  (syntax-property
-                   #`(define #,hyphenated-id rhs-expr)
-                   'sub-range-binders
-                   (list
-                    (vector (syntax-local-introduce hyphenated-id)
-                            0 first-len
-                            (syntax-local-introduce #'id1)
-                            0 first-len)
-                    (vector (syntax-local-introduce hyphenated-id)
-                            (+ first-len 1) second-len
-                            (syntax-local-introduce #'id2)
-                            0 second-len))))]))
-           
-           (define/hyphen big generator
-             11)
-           
-           (+ big-generator big-generator)}
-
-After putting this code in the DrRacket window, mouse over the words ``big'' and 
-``generator'' to see arrows pointing to the individual pieces of the identifier
-@racket[_big-generator].
-
-The value of the @racket['mouse-over-tooltips] property is expected to be 
-to be a tree of @racket[cons] pairs (in any configuration) whose leaves
-are either ignored or are vectors of the shape
-@racketblock[(vector/c syntax?
-                       exact-nonnegative-integer?
-                       exact-nonnegative-integer?
-                       (or/c string? (-> string?)))]
-Each vector's content indicates where to show a tooltip. The first three components are
-a syntax object whose @racket[syntax-source] field indicates which file the tooltip goes in,
-the start and end position in the editor where mouseovers will show the tooltip, 
-and the content of the tooltip. If the tooltip content is a procedure, this procedure
-is called by Check Syntax to compute the string used for the tooltip, as Check Syntax
-traverses the syntax objects looking for properties.
-
-For example, here's a macro that shows the span of itself in a tooltip on mouseover:
-@codeblock{
-#lang racket
-(define-syntax (char-span stx)
-  (syntax-case stx ()
-    [(_ a)
-     (syntax-property
-      #'a
-      'mouse-over-tooltips
-      (vector
-       stx
-       (syntax-position stx)
-       (+ (syntax-position stx)
-          (syntax-span stx))
-       (format "this expression\nspans ~a chars"
-               (syntax-span stx))))]))
-
-(char-span (+ 1 2))}
-
-Finally, Check Syntax draws arrows only between identifiers that are @racket[syntax-original?]
-or that have the @racket[syntax-property] @racket['original-for-check-syntax]
-set to @racket[#t].
-
-@section{Cooperating with Background Check Syntax}
-
-DrRacket's continuous, background check syntax runs each time 
-an edit to the definitions text happens. In some cases, that
-expansion process fails, but there is still a well-formed syntax
-object that check syntax can use to display information to the user.
-In order to communicate that syntax object to check syntax, 
-send a log message with the name @racket['online-check-syntax],
-e.g.
-@racketblock[(define-logger online-check-syntax)
-             (log-message online-check-syntax-logger
-                          'info
-                          "ignored message"
-                          list-of-syntax-objects)]
-The fourth argument to @racket[log-message] should be a list 
-of syntax objects; these are processed as if they were the result
-of expansion. 
-
-Note: the identifiers in these objects should be @racket[syntax-original?]
-or else they will be ignored by check syntax.
-
-@section{Teaching Languages}
-
-The teaching language are implemented via the tools interface and thus
-not part of DrRacket proper, but one helper library is documented here.
-
-@defmodule[lang/htdp-langs-save-file-prefix]
-
-@defthing[htdp-save-file-prefix (listof string?)]{
-  These strings are used as the prefix in a file saved while using the teaching
-  languages. Each string is on a separate line in the saved file.
-}
-@defproc[(htdp-file-prefix? [ip input-port?]) boolean?]{
-  Determines if the contents of @racket[ip] is one of the possible prefixes that
-  DrRacket saves at the beginning of a teaching language file.
-  
-  In the case that this function returns @racket[#t], it consumes the entire prefix
-  from @racket[ip] (and discards it). In the case that this function returns
-  @racket[#f], it does not consume anything from @racket[ip].
-}
-
-@section{Signatures}
-
-@defsignature[drracket:tool^ ()]{
-  This signature includes all of the names in this manual that begin
-  with @tt{drracket:} (except these two signatures).
-}
-@defsignature[drracket:tool-exports^ ()]{
-The @racket[drracket:tool-exports^] signature contains two
-names: @sigelem[drracket:tool-exports^ phase1] and 
-@sigelem[drracket:tool-exports^ phase1]. 
-After all of the tools are loaded, all of
-the @tt{phase1} functions are called and then all of the
-@tt{phase2} functions are called. Certain primitives can
-only be called during the dynamic extent of those calls.
-
-This mechanism is designed to support DrRacket's
-@racket[drracket:language:language<%>] extension
-capabilities. That is, this mechanism enables two tools to
-cooperate via new capabilities of languages. The first phase
-is used for adding functionality that each language must
-support and the second is used for creating instances of
-languages. As an example, a tool may require certain
-specialized language-specific information. It uses phase1 to
-extend the @racket[drracket:language:language<%>] interface
-and supply a default implementation of the interface
-extension. Then, other languages that are aware of the
-extension can supply non-default implementations of the
-additional functionality.
-
-@defproc[(phase1) void?]{
-These functions can be called only in the dynamic extent
-of a call to @sigelem[drracket:tool-exports^ phase1] (see
-above for details).
-@itemize[
-@item{@racket[drracket:language:extend-language-interface]}
-@item{@racket[drracket:unit:add-to-program-editor-mixin]}
-]
-}
-
-@defproc[(phase2) void?]{
-These functions can be called only in the dynamic extent
-of a call to @sigelem[drracket:tool-exports^ phase2] (see
-above for details).
-@itemize[
-@item{@racket[drracket:language-configuration:add-language]}
-@item{@racket[drracket:language:get-default-mixin]}
-@item{@racket[drracket:language:get-language-extensions]}
-]
-}
-}
-
-@include-section["get-slash-extend.scrbl"]
-@include-section["unit.scrbl"]
-@include-section["language.scrbl"]
-@include-section["language-configuration.scrbl"]
-@include-section["debug.scrbl"]
-@include-section["rep.scrbl"]
-@include-section["frame.scrbl"]
-@include-section["help-desk.scrbl"]
-@include-section["eval.scrbl"]
-@include-section["modes.scrbl"]
-@include-section["module-language-tools.scrbl"]
-@include-section["module-language.scrbl"]
-
-@section{Backwards Compatibility}
-
-This section lists the bindings that begin with @tt{drscheme:} provided by the tools
-library; they are here for backwards compatibility and to provide links to the
-@tt{drracket:} versions of the names.
-
-@(require drracket/private/drsig
-          (for-syntax racket/base
-                      racket/unit-exptime))
-@(define-syntax (drs-compat stx)
-   (let-values ([(drs-parent drs-vars drs-var-defs-in-sig drs-stx-defs-in-sig)
-                 (signature-members #'drscheme:tool-cm^ #'here)]
-                [(drr-parent drr-vars drr-var-defs-in-sig drr-stx-defs-in-sig)
-                 (signature-members #'drracket:tool-cm^ #'here)])
-     (with-syntax ([(drs-id ...) (append '(drscheme:tool^ drscheme:tool-exports^) drs-vars)]
-                   [(drr-id ...) (append '(drracket:tool^ drracket:tool-exports^) drr-vars)])
-       #'(begin
-           (defthing drs-id any/c
-             "This is provided for backwards compatibility; new code should use "
-             (racket drr-id) " instead.") 
-           ...))))
-@drs-compat[]
-
-@(tools-include/drs "debug")
-@(tools-include/drs "eval")
-@(tools-include/drs "frame")
-@(tools-include/drs "get/extend")
-@(tools-include/drs "help-desk")
-@(tools-include/drs "language-configuration")
-@(tools-include/drs "language")
-@(tools-include/drs "modes")
-@(tools-include/drs "module-language-tools")
-@(tools-include/drs "module-language")
-@(tools-include/drs "rep")
-@(tools-include/drs "unit")
-
-@index-section[]
diff --git a/pkgs/drracket-pkgs/drracket/scribblings/tools/unit.scrbl b/pkgs/drracket-pkgs/drracket/scribblings/tools/unit.scrbl
deleted file mode 100644
index 45bb123e23..0000000000
--- a/pkgs/drracket-pkgs/drracket/scribblings/tools/unit.scrbl
+++ /dev/null
@@ -1,956 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-@(tools-title "unit")
-
-@definterface[drracket:unit:tab<%> (drracket:rep:context<%>)]{
-@defmethod[(break-callback) void?]{
-@methspec{
-This method is called when the break button is clicked and
-this tab is the active tab.
-}
-
-@methimpl{
-By default, breaks any evaluation that may be happening at
-this point.
-}}
-
-@defmethod[#:mode pubment (can-close?) boolean?]{
-@methspec{
-This method is called to determine if it is okay to close this tab.
-}
-
-@methimpl{
-Calls the definitions text's and interactions text's
-@method[editor:basic<%> can-close?] method.
-}}
-
-@defmethod[#:mode override 
-           (disable-evaluation)
-           void?]{
-Disables the Run button, and the Run menu item and
-@method[editor<%> lock]s the interactions window, and the definitions window.
-}
-
-@defmethod[#:mode override 
-           (enable-evaluation)
-           void?]{
-Enables the Run button, and the Run menu item and unlocks
-(via the
-@method[editor<%> lock] method) the interactions window and the definitions window.}
-
-@defmethod[#:mode override 
-           (get-breakables)
-           (values (or/c thread? false/c) (or/c custodian? false/c))]{}
-
-@defmethod[(get-defs)
-           (is-a?/c drracket:unit:definitions-text<%>)]{
-This text is initially the top half of the DrRacket window and
-contains the users program.
-
-This text defaults to a @racket[text%]
-object, but if you change
-@racket[drracket:get/extend:extend-definitions-text] procedure, it will use the extended class to create the text.
-
-}
-
-@defmethod[#:mode override 
-           (get-directory)
-           (or/c string? false/c)]{
-
-This is the directory that the file is saved in, or the
-directory DrRacket started up in, if the file has not been
-saved.
-
-
-}
-
-@defmethod[(get-enabled)
-           boolean?]{
-Indicates if evaluation is currently enabled in this
-tab. Evaluation is typically disabled when some evaluation
-is already running (in another thread).
-
-}
-
-@defmethod[(get-frame)
-           (is-a?/c drracket:unit:frame%)]{
-Returns the frame that this tab is inside.
-
-}
-
-@defmethod[(get-ints)
-           (is-a?/c drracket:rep:text%)]{
-This text is initially the bottom half of the DrRacket window and
-contains the users interactions with the REPL.
-
-This text defaults to a @racket[drracket:rep:text%]
-object, but if you use the
-@racket[drracket:get/extend:extend-interactions-text] procedure,
-it will use the extended class to create the text.
-
-}
-
-@defmethod[(is-current-tab?)
-           boolean?]{
-Indicates if this tab is the currently active tab.
-
-}
-
-@defmethod[(is-running?)
-           boolean?]{
-
-Indicates if the running message in the bottom right of
-DrRacket's frame should be ``running'' or ``not running''
-when this frame is active.
-
-
-
-}
-
-@defmethod[#:mode pubment 
-           (on-close)
-           void?]{
-@methspec{
-
-This method is called when the tab is closed.
-
-}
-
-@methimpl{
-
-Calls the definitions text's
-@method[editor:basic<%> on-close] and interactions text's
-@method[drracket:rep:text% on-close] methods.
-
-
-}}
-
-@defmethod[#:mode override 
-           (reset-offer-kill)
-           void?]{}
-
-@defmethod[#:mode override 
-           (set-breakables [thread (or/c thread? false/c)]
-                           [custodian (or/c custodian? false/c)])
-           void?]{}
-
-@defmethod[#:mode public-final
-                  (add-bkg-running-color [id symbol?]
-                                         [color (or/c string? (is-a?/c color%))]
-                                         [label string?])
-                  void?]{
-  
-   Sets the color of the circle in the bottom-right corner of the 
-   DrRacket window to @racket[color] with the tooltip window that
-   appears over it containing @racket[label]. If multiple coors are
-   registered they are all shown.
-
-   See also @method[drracket:unit:tab<%> remove-bkg-running-color].
-}
-@defmethod[#:mode public-final
-                  (remove-bkg-running-color [id symbol?])
-                  void?]{
-
-   Removes the color and label added with @racket[id].
-
-   See also @method[drracket:unit:tab<%> add-bkg-running-color].
-  }
-@defmethod[#:mode public-final (touched) void?]{
-  Called by the system to indicate that the tab has
-  just been switched to from another tab in the 
-  same frame (when the frame has the focus) 
-  or the frame itself has come to the 
-  front (via @method[top-level-window<%> on-activate])
-  and the tab is the current tab in that frame.
- 
-  This method updates the private state that
-  @method[drracket:unit:tab<%> get-last-touched]
-  returns.
-  }
-@defmethod[#:mode public-final (get-last-touched) flonum?]{
-   Returns the time that this tab was last focused, as counted
-   by @racket[current-inexact-milliseconds].
- }
-}
-
-
-@defclass[drracket:unit:tab% object% (drracket:unit:tab<%>)]{
-
-The base class that implements the tab's functionality.
-
-@defconstructor/make[()]{}
-
-@defmethod[#:mode override 
-           (clear-annotations)
-           void?]{
- Clears any error highlighting; calls
- @method[drracket:rep:context<%> clear-annotations].
- }
-}
-
-
-@defmixin[drracket:unit:program-editor-mixin (text% editor:basic<%>) ()]{
-
-This mixes in the ability to reset the highlighting for
-error message when the user modifies the buffer. Use it for
-editors that have program text where errors can occur.
-
-
-
-@defmethod[#:mode augment
-           (after-delete [start number] [len number])
-           void?]{
-
-Calls the inner method.
-
-Resets an error highlighting.
-
-
-
-}
-
-@defmethod[#:mode augment
-           (after-insert [start number]
-                         [len number])
-           void?]{
-
-Calls the inner method.
-
-Resets an error highlighting.
-
-
-}}
-
-
-@defclass[drracket:unit:interactions-canvas% canvas:wide-snip% ()]{
-
-
-
-
-
-@defconstructor/auto-super[()]{
-Passes all arguments to @racket[super-init].
-}}
-
-
-@defclass[drracket:unit:frame% (drracket:frame:basics-mixin (drracket:frame:mixin frame:searchable%)) (drracket:unit:frame<%>)]{
-
-This frame inserts the @onscreen{Racket} and @onscreen{Language} menus into the menu bar as it is initialized.
-
-
-
-
-@defconstructor/auto-super[()]{
-Passes all arguments to @racket[super-init].
-}
-
-@defmethod[#:mode override 
-           (add-show-menu-items [show-menu (is-a?/c menu%)])
-           void?]{
-
-Adds the ``Show Definitions'', ``Show Interactions'' and
-``Show Contour'' menu items.
-
-
-}
-
-@defmethod[(break-callback)
-           void?]{
-@methspec{
-
-This method is called when the user clicks on the break
-button or chooses the break menu item.
-
-}
-
-@methimpl{
-
-Breaks the user's evaluation started by the Run button
-(or possibly a queued callback in the user's eventspace).
-
-
-}}
-
-@defmethod[(change-to-file [file string?])
-           void?]{
-
-Loads this file into this already created frame. In normal
-DrRacket use, this method is only called if this is the
-first frame opened and no editing has occurred. It should be
-safe to call this at anytime, however.
-
-
-}
-                 
-@defmethod[(find-matching-tab [p path-string?]) (or/c (is-a?/c drracket:unit:tab%) #f)]{
-  Returns the tab that is currently editing @racket[p], if there is one
-  in this frame. Returns @racket[#f] otherwise.
-}
-@defmethod[(change-to-tab [tab (is-a?/c drracket:unit:tab%)]) void?]{
-  Makes @racket[tab] visible in this frame.
-}
-@defmethod[#:mode override 
-           (edit-menu:between-select-all-and-find)
-           void?]{
-
-Adds the @racket["Split"] and @racket["Collapse"] menu items.
-
-
-}
-
-@defmethod[(execute-callback)
-           void?]{
-@methspec{
-
-This method is called when the user clicks on the Run
-button or chooses the Run menu item.
-
-}
-
-@methimpl{
-
-It calls 
-@method[drracket:rep:context<%> ensure-rep-shown] and then it calls
-@method[drracket:rep:text% evaluate-from-port] passing in the result of
-@method[drracket:unit:frame<%> get-interactions-text] and its entire range, unless the first two characters are 
-@litchar{#!} in which case, it skips the first line.
-
-
-}}
-
-@defmethod[#:mode override 
-           (file-menu:between-open-and-revert)
-           void?]{
-
-Calls the super method and adds a
-@racket[separator-menu-item%] to the menu.
-
-
-}
-
-@defmethod[#:mode override 
-           (file-menu:between-print-and-close)
-           void?]{
-
-Adds a menu item for printing the interactions.
-
-
-}
-
-@defmethod[#:mode override 
-           (file-menu:between-save-as-and-print)
-           void?]{
-
-Adds a submenu that contains various save options:
-@itemize[
-@item{save definitions as text}
-@item{save interactions}
-@item{save interactions as}
-@item{save interactions as text}
-]
-
-and adds a separator item.
-
-
-}
-
-@defmethod[#:mode override 
-           (file-menu:print-string)
-           void?]{
-
-returns @racket["Definitions"]
-
-
-}
-
-@defmethod[#:mode override 
-           (file-menu:save-as-string)
-           void?]{
-
-Returns @racket["Definitions"].
-
-
-}
-
-@defmethod[#:mode override 
-           (file-menu:save-string)
-           void?]{
-
-Returns @racket["Definitions"].
-
-
-}
-
-@defmethod[(get-break-button)
-           (is-a?/c button%)]{
-Returns the break button. Mostly used for test suites.
-
-}
-
-@defmethod[(get-button-panel)
-           (is-a?/c horizontal-panel%)]{
-This panel goes along the top of the DrRacket window and has buttons
-for important actions the user frequently executes. 
-
-A tool can add a button to this panel to make some new functionality
-easily accessible to the user.
-
-See also mrlib's @racket[switchable-button%].
-
-}
-
-@defmethod[#:mode override 
-           (get-canvas)
-           (is-a?/c editor-canvas%)]{
-
-Returns the result of
-@method[drracket:unit:frame<%> get-definitions-canvas].
-
-
-}
-
-@defmethod[#:mode override
-           (get-canvas%)
-           (is-a?/c canvas%)]{
-
-Returns the result of
-@racket[drracket:get/extend:get-definitions-canvas].
-
-
-}
-
-@defmethod*[([(get-definitions/interactions-panel-parent)
-              (is-a?/c vertical-panel%)]
-             [(get-definitions/interactions-panel-parent)
-              void?])]{
-@methspec{
-
-This method is provided so that tools can add 
-@racket[area-container<%>]s to the DrRacket frame. Override this method so that it
-returns a child of the super-classes's result and insert new 
-children in between.
-
-}
-
-@methimpl{
-
-First case:
-
-
-Returns the result of 
-@method[frame:basic<%> get-area-container] 
-
-
-Second case:
-
-
-
-}}
-
-@defmethod[#:mode override 
-           (get-editor)
-           (is-a?/c editor<%>)]{
-
-Returns the result of
-@method[drracket:unit:frame<%> get-definitions-text].
-
-
-
-}
-
-@defmethod[#:mode override
-           (get-editor%)
-           (is-a?/c editor<%>)]{
-
-Returns the result of
-@racket[drracket:get/extend:get-definitions-text].
-
-
-}
-
-@defmethod[(get-execute-button)
-           (is-a?/c button%)]{
-Returns the Run button. Mostly used for test suites.
-
-}
-
-@defmethod[#:mode override 
-           (get-text-to-search)
-           (is-a?/c text:searching%)]{
-
-returns the text that is active in the last canvas passed to
-@method[drracket:unit:frame% make-searchable] 
-
-}
-
-@defmethod[(make-searchable [canvas (is-a?/c drracket:unit:interactions-canvas%)])
-           void?]{
-
-stores the canvas, until 
-@method[drracket:unit:frame% get-text-to-search] is called.
-
-
-}
-
-@defmethod[#:mode augment (on-close) void?]{
-
-Sends the result of
-@method[drracket:unit:frame<%> get-interactions-text] the
-@method[drracket:rep:text% shutdown] and 
-@method[drracket:rep:text% on-close] methods.
-
-Always calls the inner method.
-
-
-}
-
-@defmethod[#:mode override 
-           (on-size)
-           void?]{
-
-Updates the preferences for the window width and height
-so next time a DrRacket window is opened, it will be this
-width and height.
-
-
-}
-
-@defmethod[(still-untouched?)
-           boolean?]{
-@methspec{
-
-determines if the definitions window has not been
-modified. Used in conjunction with
-@method[drracket:unit:frame% change-to-file].
-
-}
-
-@methimpl{
-
-Returns @racket[#t] if the buffer is empty, it has not been
-saved and it is unmodified.
-
-
-}}
-
-@defmethod[(update-save-button [modified? any/c])
-           void?]{
-
-This method hides or shows the save button, based on
-the @racket[modified?] argument. 
-
-If the save button has not been created yet, it remembers
-the @racket[modified?] argument as an initial visibility for
-the save button.
-
-This method is called by the
-@method[drracket:unit:definitions-text% set-modified] method.
-
-
-}
-
-@defmethod[(update-save-message [name string?])
-           void?]{
-
-Updates the save message on the DrRacket frame. This method is called by
-the 
-@method[drracket:unit:definitions-text% set-filename] method.
-
-
-}
-
-@defmethod[#:mode override 
-           (update-shown)
-           void?]{
-
-Updates the interactions, definitions, and contour menu
-items based on the contents of the windows.
-
-
-}}
-
-
-@definterface[drracket:unit:frame<%> ()]{
-
-@defmethod[(get-language-menu) (is-a?/c menu%)]{ Returns the
-  language-specific menu. This menu is called the
-  @onscreen{Racket} menu in the Racket language but is, in general,
-  controlled by the @racket['drscheme:language-menu-title] 
-  capability (see @racket[drracket:language:register-capability]
-  for details on capabilities).
- }
-
-@defmethod[(ensure-defs-shown)
-           void?]{
-Ensures that the definitions window is visible.
-
-}
-
-@defmethod[(ensure-rep-hidden)
-           void?]{
-
-Makes sure the rep is hidden (by making the definitions window
-visible).
-
-
-}
-
-@defmethod[(ensure-rep-shown)
-           void?]{
-
-Shows the interactions window
-
-
-}
-
-@defmethod[(get-current-tab)
-           (is-a?/c drracket:unit:tab<%>)]{
-Returns the currently active tab.
-
-}
-
-@defmethod[(get-tab-filename [i (<=/c 0 (#,(method drracket:unit:frame<%> get-tab-count)))]) string?]{
-  Returns a string naming the file in the @racket[i]th tab or, if
-  the file is not saved, something like ``Untitled''.
-}
-
-@defmethod[(get-tab-count) exact-positive-integer?]{
-  Returns the number of open tabs in the frame.
-}
-
-@defmethod[(open-in-new-tab [filename (or/c path-string? #f)]) void?]{
-  Opens a new tab in this frame. If @racket[filename] is a @racket[path-string?],
-  It loads that file in the definitions window of the new tab.
-}
-
-@defmethod[(create-new-tab) void?]{
-  Creates a new tab.
-}
-
-@defmethod[(next-tab) void?]{
-  Switches to the next tab.
-}
-
-@defmethod[(prev-tab) void?]{
-  Switches to the previous tab.
-}
-
-@defmethod[(move-current-tab-right) void?]{
-  Swaps the current tab with its right-hand neighbor.
-}
-
-@defmethod[(move-current-tab-left) void?]{
-  Swaps the current tab with its left-hand neighbor.
-}
-
-@defmethod[(reorder-tabs [tab-order (listof exact-nonnegative-integer?)]) void?]{
-  Reorders the tabs according to @racket[tab-order].
-                                 
-  Each element in @racket[tab-order] identifies a tab by its position in the list
-  @method[drracket:unit:frame<%> get-tabs], and the position of this element identifies
-  the new position of the tab.
-  
-  For example, considering that there are only 3 tabs open, 
-  @racket[(send a-drracket-frame reorder-tabs '(2 1 0))]
-  swaps the first and last tabs, leaving the middle one unchanged.
-}
-
-@defmethod[#:mode public-final (close-current-tab) void?]{
-  Closes the current tab, making some other tab visible.
-  If there is only one tab open, this method does nothing.
-}
-
-@defmethod[(get-definitions-canvas)
-           (is-a?/c drracket:unit:definitions-canvas%)]{
-
-This canvas is the canvas containing the 
-@method[drracket:unit:frame<%> get-definitions-text]. It is initially the top half of the DrRacket window.
-
-This canvas defaults to a @racket[drracket:unit:definitions-canvas%]
-object, but if you change the
-@racket[drracket:get/extend:extend-definitions-canvas] procedure, it will use the class in the parameter to create the canvas.
-
-
-}
-
-@defmethod[(get-definitions-text)
-           (is-a?/c drracket:unit:definitions-text%)]{
-
-Calls result of
-@method[drracket:unit:frame<%> get-current-tab]'s 
-@method[drracket:unit:tab<%> get-defs] method.
-
-
-}
-
-@defmethod[(get-insert-menu)
-           (is-a?/c menu%)]{
-@methspec{
-
-Returns the Insert menu.
-
-}}
-
-@defmethod[(get-interactions-canvas)
-           (instanceof (derivedfrom drracket:unit:interactions-canvas%))]{
-
-This canvas is the canvas containing the 
-@method[drracket:unit:frame<%> get-interactions-text]. It is initially the bottom half of the DrRacket window.
-
-This canvas defaults to a @racket[drracket:unit:interactions-canvas%]
-object, but if you use the
-@racket[drracket:get/extend:extend-interactions-canvas] procedure,
-it will use the extended class to create the canvas.
-
-
-}
-
-@defmethod[(get-interactions-text)
-           (is-a?/c drracket:rep:text%)]{
-
-Calls result of
-@method[drracket:unit:frame<%> get-current-tab]'s 
-@method[drracket:unit:tab<%> get-ints] method.
-
-
-}
-
-@defmethod[(get-tabs)
-           (listof (is-a?/c drracket:unit:tab<%>))]{
-Returns the list of tabs in this frame.
-
-}
-
-@defmethod[#:mode pubment 
-           (on-tab-change [from-tab (is-a?/c drracket:unit:tab<%>)]
-                          [to-tab (is-a?/c drracket:unit:tab<%>)])
-           void?]{
-@methspec{
-
-Called after a new tab becomes the selected tab in the frame.
-
-}
-
-@methimpl{
-
-The @racket[from-tab] argument is the previously selected tab, and the
- @racket[to-tab] argument is the newly selected tab.
-
-
-
-}}
-
-@defmethod[(register-capability-menu-item [key symbol]
-                                          [menu (is-a? menu%)])
-           void?]{
-Registers the menu item that was most recently added as
-being controlled by the capability @racket[key]. This means
-that the (boolean) value of the capability determines if the
-menu item is present in the menu (the capability is checked
-when the menus are clicked on).
-
-This assumes that the menu items in this menu are not moved
-around, except by the this capability. If they are, things
-can go funny (i.e., no good checks are in place).
-
-Note that the capability must be registered separately, via
-@racket[drracket:language:register-capability].
-
-
-}
-
-@defmethod[(register-toolbar-button
-            [tb (is-a?/c switchable-button%)]
-            [#:number num (or/c #f real?) #f])
-           void?]{
-Registers the toolbar button @racket[tb]. 
-
-The @racket[num] argument controls the ordering of @racket[tb]
-with respect to other toolbar buttons. If it is
-@racket[#f], then a number one smaller than the currently
-smallest number is used.
-
-The buttons are sorted by their numbers, from left to right
-in horizontal mode and from top to bottom in vertical mode.
-If buttons are in sub-panels they cannot, in general, be
-sorted entirely by number without changing the panel 
-structure, but when a sub-panel appears as a sibling of
-some toolbar buttons, the sorting routine looks for the smallest
-number appearing in a button in the sub-panel, and uses that
-number when sorting the panel that appears with the buttons.
-
-A number of buttons already come with numbers:
-the @onscreen{Stop} button's number is @racket[101], 
-the @onscreen{Run} button's number is @racket[100],
-the @onscreen{Scribble PDF} button's number is @racket[99],
-the @onscreen{Scribble HTML} button's number is @racket[98],
-the @onscreen{Macro Stepper} button's number is @racket[70],
-the @onscreen{Debug} button's number is @racket[60],
-the @onscreen{Stepper} button's number is @racket[59], and
-the @onscreen{Check Syntax} button's number is @racket[50].
-
-All three are children of the panel returned by
-@method[drracket:unit:frame% get-button-panel].
-
-Registration is required
-so that the toolbar buttons properly switch orientation when 
-the toolbar's position is moved and the ordering via the
-@racket[number] argument is preserved. 
-See also @method[drracket:unit:frame<%> sort-toolbar-buttons-panel].
-}
-
-@defmethod[(register-toolbar-buttons 
-            [tbs (listof (is-a?/c switchable-button%))]
-            [#:numbers nums (listof (or/c real? #f)) (make-list (length tbs) #f)])
-           void?]{
-Simultaneously registers the toolbar buttons @racket[tbs].
-                                             
-See also @method[drracket:unit:frame<%> register-toolbar-button].
-
-}
-
-@defmethod[(unregister-toolbar-button [tb (is-a?/c switchable-button%)]) void?]{
-Unregisters the toolbar button @racket[tb]. Use this method to ensure
-that the button is not referenced by this frame and thus can be gc'd.
-}
-
-@defmethod[(sort-toolbar-buttons-panel) void?]{
-  Sorts the children of @method[drracket:unit:frame% get-button-panel], 
-  according to the @racket[number] argument passed to
-  @method[drracket:unit:frame<%> register-toolbar-button].
-}
-
-}
-
-
-@defclass[drracket:unit:definitions-text%
-          (drracket:rep:drs-bindings-keymap-mixin
-           (drracket:unit:program-editor-mixin (racket:text-mixin text:info%)))
-          (drracket:unit:definitions-text<%>)]{
-
-@defconstructor[()]{
-Passes all arguments to @racket[super-init].
-}
-
-@defmethod[#:mode override 
-           (set-filename)
-           void?]{
-
-Calls
-@method[drracket:unit:frame% update-save-message].
-}
-
-@defmethod[#:mode override 
-           (set-modified)
-           void?]{
-
-Calls
-@method[drracket:unit:frame% update-save-button].
-}}
-
-
-@definterface[drracket:unit:definitions-text<%> ()]{
-
-This interface is implemented by the definitions text. 
-
-
-
-@defmethod[#:mode pubment 
-           (after-set-next-settings [language-settings language-settings])
-           void?]{
-@methspec{
-
-Called when the next settings changes. See also
-@method[drracket:unit:definitions-text<%> get-next-settings].
-
-}
-
-@methimpl{
-
-
-
-
-}}
-
-@defmethod[(begin-metadata-changes)
-           void?]{
-Augment this method to be notified when DrRacket is changing
-the buffer to insert metadata. The metadata is only inserted
-during saving, so tools that track changes to DrRacket will
-need to ignore changes that occur after this method is
-called, and before
-@method[drracket:unit:definitions-text<%> end-metadata-changes] is called.
-
-A call to @racket[begin-metadata-changes] will always be
-followed with a call to @racket[end-metadata-changes] (ie,
-the calls cannot be nested).
-
-}
-
-@defmethod[(end-metadata-changes)
-           void?]{
-Called when the changes to insert metadata are done, and the
-editor is back to its state at the time of the call to
-@method[drracket:unit:definitions-text<%> begin-metadata-changes].
-
-A call to @racket[begin-metadata-changes] will always be
-followed with a call to @racket[end-metadata-changes] (ie,
-the calls cannot be nested).
-
-}
-
-@defmethod[(get-next-settings)
-           language-settings]{
-This method returns the language-settings that will be used
-when the user next clicks Run in this DrRacket window.
-
-}
-
-@defmethod[(get-tab)
-           (is-a?/c drracket:unit:tab%)]{
-Returns the editor's enclosing tab.
-
-}
-
-@defmethod[(set-needs-execution-message [msg string?])
-           void?]{
-@methspec{
-
-This method, when called, puts this DrRacket window in a
-state such that interactions submitted to the REPL will
-trigger a yellow warning message. The state is reset when
-the program is next Run.
-
-}
-
-@methimpl{
-
-Records @racket[msg] and uses it the next time the user submits
-an interaction (unless the Runs first).
-
-
-}}
-
-@defmethod[(set-next-settings [language-settings language-settings]
-                              [update-prefs? any/c #t])
-           void?]{
-
-Changes the language settings for this window. If
-@racket[update-prefs?] is a true value, the preference is
-changed, which affects newly created windows.
-
-See also
-@method[drracket:unit:definitions-text<%> after-set-next-settings] and
-@method[drracket:unit:definitions-text<%> get-next-settings].
-
-
-}}
-
-
-@defclass[drracket:unit:definitions-canvas% editor-canvas% ()]{
-
-Initializes the visibility of the save button.
-
-}
-
-@(tools-include "unit")
diff --git a/pkgs/drracket-pkgs/drracket/setup/info.rkt b/pkgs/drracket-pkgs/drracket/setup/info.rkt
deleted file mode 100644
index e8d44af48f..0000000000
--- a/pkgs/drracket-pkgs/drracket/setup/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("plt-installer.scrbl")))
diff --git a/pkgs/drracket-pkgs/drracket/setup/plt-installer-sig.rkt b/pkgs/drracket-pkgs/drracket/setup/plt-installer-sig.rkt
deleted file mode 100644
index 70dca6a5ad..0000000000
--- a/pkgs/drracket-pkgs/drracket/setup/plt-installer-sig.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-(module plt-installer-sig mzscheme
-  (require mzlib/unit)
-  (provide setup:plt-installer^)
-  (define-signature setup:plt-installer^
-    (run-installer
-     with-installer-window
-     run-single-installer
-     on-installer-run)))
diff --git a/pkgs/drracket-pkgs/drracket/setup/plt-installer-unit.rkt b/pkgs/drracket-pkgs/drracket/setup/plt-installer-unit.rkt
deleted file mode 100644
index a31eee5f84..0000000000
--- a/pkgs/drracket-pkgs/drracket/setup/plt-installer-unit.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-(require racket/unit
-         mred/mred-sig
-         racket/class
-         "plt-installer-sig.rkt"
-         (prefix-in single: setup/plt-single-installer)
-         mrlib/terminal
-         string-constants)
-
-(provide plt-installer@)
-(define-unit plt-installer@
-  (import mred^)
-  (export setup:plt-installer^)
-  
-  (define on-installer-run (make-parameter void))
-  
-  ;; with-installer-window : ((union (instanceof dialog%) (instanceof frame%)) -> void) (-> void) -> void
-  ;; creates a frame and sets up the current error and output ports
-  ;; before calling `do-install'. 
-  ;; runs the installer in a separate thread and returns immediately,
-  ;; before the installation is complete. The cleanup thunk is called when installation completes
-  (define (with-installer-window do-install cleanup-thunk)
-    (define installer-run (on-installer-run))
-    (parameterize ([on-terminal-run 
-                    (λ ()
-                      (printf "\nInstallation complete.\n")
-                      (installer-run))])
-      (in-terminal
-       (λ (custodian frame) (do-install frame))
-       #:title (string-constant plt-installer-progress-window-title)
-       #:cleanup-thunk cleanup-thunk)))
-  
-  (define run-single-installer single:run-single-installer)
-  
-  (define (run-installer file [cleanup-thunk void])
-    (with-installer-window 
-     (lambda (frame)
-       (run-single-installer 
-        file
-        (lambda ()
-          (sleep 0.2) ; kludge to allow f to appear first
-          (end-busy-cursor)
-          ;; do these strings ever appear? (should move to string-constants, if so)
-          (let ([d (get-directory 
-                    "Select the destination for unpacking"
-                    frame)])
-            (unless d
-              (printf ">>> Cancelled <<<\n"))
-            (begin-busy-cursor)
-            d))
-        #:show-beginning-of-file? #t))
-     cleanup-thunk)))
diff --git a/pkgs/drracket-pkgs/drracket/setup/plt-installer.rkt b/pkgs/drracket-pkgs/drracket/setup/plt-installer.rkt
deleted file mode 100644
index 9021508991..0000000000
--- a/pkgs/drracket-pkgs/drracket/setup/plt-installer.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-(module plt-installer mzscheme
-  (require mzlib/unit
-           "plt-installer-sig.rkt"
-           "plt-installer-unit.rkt"
-           mred/mred-unit
-           mred/mred-sig)
-
-  (provide-signature-elements setup:plt-installer^)
-  (define-compound-unit/infer plt-installer+mred@ 
-    (import) (export setup:plt-installer^)
-    (link standard-mred@ plt-installer@))
-  (define-values/invoke-unit/infer plt-installer+mred@))
diff --git a/pkgs/drracket-pkgs/drracket/setup/plt-installer.scrbl b/pkgs/drracket-pkgs/drracket/setup/plt-installer.scrbl
deleted file mode 100644
index 75318df937..0000000000
--- a/pkgs/drracket-pkgs/drracket/setup/plt-installer.scrbl
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang scribble/manual
-
-@(require (for-label setup/plt-installer
-                     setup/plt-installer-sig
-                     setup/plt-installer-unit))
-                    
-@title[#:tag "gui-unpacking"]{GUI @filepath{.plt} Installer}
-
-@defmodule[setup/plt-installer]{ The
-  @racketmodname[setup/plt-installer] library in the setup collection
-  defines procedures for installing a @filepath{.plt} archive with a
-  GUI (using the facilities of @racketmodname[racket/gui/base]).}
-
-@defproc[(run-installer (filename path-string?)) void?]{
-  Run the installer on the @filepath{.plt} file
-  in @racket[filename] and show the output in a window. This is a
-  composition of @racket[with-installer-window] and
-  @racket[run-single-installer] with a @racket[get-dir-proc] that prompts
-  the user for a directory (turning off the busy cursor while the dialog
-  is active).}
-
-@defparam[on-installer-run thunk (-> any)]{
-  A thunk that is run after a @filepath{.plt} file is installed.}
-
-@defproc[(with-installer-window
-          [do-install (-> (or/c (is-a?/c dialog%) (is-a?/c frame%))
-                          void?)]
-          [cleanup-thunk (-> any)])
-         void?]{
-
-  Equivalent to
-  @racketblock[(define installer-run (on-installer-run))
-               (parameterize ([on-terminal-run 
-                               (λ ()
-                                 (printf "\nInstallation complete.\n")
-                                 (installer-run))])
-                 (in-terminal
-                  (λ (custodian tlw) (do-install tlw))
-                  #:title (string-constant plt-installer-progress-window-title)
-                  #:cleanup-thunk cleanup-thunk))]
-  }
-
-@defproc[(run-single-installer (file path-string?)
-                               (get-dir-proc (-> (or/c path-string? #f)))
-                               [#:show-beginning-of-file? show-beginning-of-file? any/c #f])
-         void?]{
-  The same as the export from @racketmodname[setup/plt-single-installer], 
-  but with a GUI.}
-
-@; ----------------------------------------
-
-@section{GUI Unpacking Signature}
-      
-@defmodule[setup/plt-installer-sig]{
-  @defsignature[setup:plt-installer^ ()]{
-  Provides two names: @racket[run-installer] and @racket[on-installer-run].}
-}
-
-@; ----------------------------------------
-
-@section{GUI Unpacking Unit}
-
-@defmodule[setup/plt-installer-unit]{
-
-Imports @racket[mred^] and exports @racket[setup:plt-installer^]. }
-
diff --git a/pkgs/drracket-pkgs/drracket/version/info.rkt b/pkgs/drracket-pkgs/drracket/version/info.rkt
deleted file mode 100644
index 62eb48c100..0000000000
--- a/pkgs/drracket-pkgs/drracket/version/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang info
-
-(define tools (list "tool.rkt"))
-(define tool-names (list "Version"))
-
-(define scribblings '(("tool.scrbl")))
diff --git a/pkgs/drracket-pkgs/drracket/version/tool.rkt b/pkgs/drracket-pkgs/drracket/version/tool.rkt
deleted file mode 100644
index 81aca6f9e2..0000000000
--- a/pkgs/drracket-pkgs/drracket/version/tool.rkt
+++ /dev/null
@@ -1,184 +0,0 @@
-#lang racket/gui
-
-(require racket/unit racket/class framework drracket/tool
-         browser/external string-constants
-         version/patchlevel
-         version/check)
-
-(define download-url "http://download.racket-lang.org/")
-
-;; either 'yes, 'no, or something else, see `enabled?' below for a reason
-(preferences:set-default 'updates:enabled? 'unset symbol?)
-(preferences:set-default 'updates:last 0 integer?)
-;; how often do we check; default: check every week
-(preferences:set-default 'updates:frequency (* 60 60 24 7) integer?)
-;; time to wait if user chooses "later"; default: in two weeks
-(define later-delay (* 60 60 24 14))
-
-;; This is used to check if updates:enabled? is true or false.  The problem is
-;; that we don't want to set a default of #t or #f, so make it 'unset and
-;; change it only when users explicitly set it.  This makes it possible to have
-;; the default be #f, but without making it always #f for all users, and in the
-;; future it is possible to change it to default to #t.
-(define (is-enabled? v)
-  (case v [(yes) #t] [(no) #f] [else #f])) ; default to #f
-
-(define (check-for-updates . top?)
-  (define enabled?  (is-enabled? (preferences:get 'updates:enabled?)))
-  (define explicit? (pair? top?)) ; top => explicit check for updates
-  (define top       (and (pair? top?) (car top?)))
-  ;; wait until the definitions are instantiated, return top-level window
-  (define (wait-for-definitions)
-    (define ws (get-top-level-windows))
-    (if (null? ws)
-      (begin (sleep 1) (wait-for-definitions))
-      (car ws)))
-  #| ;; Cute code, but may resize the window if too much space, and people
-     ;; didn't like this way of asking if you want update checks.
-  ;; show a message and a disable button
-  (define hide-message void) ; set by show-message
-  (define (show-message first-time?)
-    ;; No info display if we got some non-drscheme window by accident
-    (cond
-      [(with-handlers ([void (λ _ #f)]) (send top get-info-panel)) =>
-       (λ (info)
-         (sleep 3) ; wait to make this appearance visible
-         (define -check "Checking for updates...")
-         (define -about "About to auto-check for updates, you can")
-         (define p (make-object horizontal-panel% info))
-         (define m (make-object message% (if first-time? -about -check) p))
-         (define b (make-object button% "Disable" p disable))
-         (send info change-children (λ (l) (cons p (remq p l))))
-         (when first-time?
-           (define m1 (make-object message% "these checks" p))
-           (sleep 20)
-           (send p change-children (λ (l) (remq m1 l)))
-           (send m set-label -check))
-         (sleep 2) ; wait before and after check to make it visible
-         (set! hide-message
-               (λ ([now? #f])
-                 (unless now? (sleep 1))
-                 (send info change-children (λ (l) (remq p l)))
-                 (set! hide-message void)))
-         #t)] ; return #t so that the check starts
-     [else #f])) ; no standard window -- return #f to skip the whole thing
-  |#
-  ;; show results in a dialog in a non-modal dialog (if it was not an
-  ;; explicit call) , so the window can be left around as a reminder.
-  (define (message style fmt . args)
-    (define (run)
-      (define-values [result new-enabled?]
-        (message+check-box/custom
-         (string-constant version:results-title)
-         (apply format fmt args)
-         (string-constant version:do-periodic-checks)
-         (string-constant ok)
-         (and (eq? 'newer style) (string-constant version:take-me-there))
-         #f
-         (and explicit? top)
-         `(,@(case style
-               [(#f) '()] [(newer) '(stop)] [else (list style)])
-           ,@(if enabled? '(checked) '())
-           default=1)))
-      (unless (eq? enabled? new-enabled?)
-        (preferences:set 'updates:enabled? (if new-enabled? 'yes 'no))
-        (set! enabled? new-enabled?))
-      result)
-    (if explicit?
-      (run)
-      ;; non-modal
-      (parameterize ([current-eventspace (make-eventspace)]) (run))))
-  ;; main checker
-  (define (check)
-    (define result #f)
-    ;; run the check in a thread, with a chance to abort it
-    (let ([d #f])
-      (define t (thread (λ () (set! result (check-version))
-                              (when d (send d show #f)))))
-      (unless (sync/timeout .4 t) ; still checking, pop message
-        (when explicit?           ; unless it's an automatic check
-          (queue-callback
-           (λ ()
-             (set! d (new (class dialog%
-                            (super-new
-                              [label (string-constant version:update-check)]
-                              [parent #f])
-                            (make-object message%
-                              (string-constant version:connecting-server)
-                              this)
-                            (make-object button%
-                              (string-constant abort) this
-                              (λ (b e) (kill-thread t) (send this show #f))
-                              '(border))
-                            (send this center))))
-             (send d show #t)))
-          (sleep/yield .5))
-        (thread-wait t)))
-    (cond
-      [(and (pair? result) (eq? 'newer (car result)))
-       (when (equal? 2 (message 'newer "Racket v~a ~a ~a"
-                                (cadr result)
-                                (string-constant version:now-available-at)
-                                download-url))
-         ;; 2 = go there
-         (send-url download-url)
-         ;; (sleep 1) ((application-quit-handler))
-         )]
-      ;; implicit auto-check => show a message only if there is a newer
-      ;; version => the rest are only for explicit calls
-      [(not explicit?) (void)]
-      [(eq? result 'ok)
-       (message #f (string-constant version:plt-up-to-date))]
-      [(not (pair? result)) (void)] ; either #f (canceled) or ok
-      [else (case (car result)
-              [(error)
-               (message 'stop "~a: ~a~a"
-                        (string-constant error) (cadr result)
-                        (if (pair? (cddr result))
-                          (string-append "\n" (caddr result)) ""))]
-              [(ok-but)
-               (message 'caution "~a,\n~a (v~a)"
-                        (string-constant version:plt-up-to-date)
-                        (string-constant version:but-newer-alpha)
-                        (cadr result))]
-              [else (error 'check-for-updates "internal error")])]))
-  ;; start the check if enabled and enough time passed
-  (when (or explicit? enabled?)
-    (unless top (set! top (wait-for-definitions)))
-    (let ([cur  (current-seconds)]
-          [last (preferences:get 'updates:last)]
-          [freq (preferences:get 'updates:frequency)])
-      (when (or explicit? (> (- cur last) freq))
-        (preferences:set 'updates:last cur)
-        (check)))))
-
-(provide tool@)
-(define tool@
-  (unit (import drscheme:tool^) (export drscheme:tool-exports^)
-
-    (define (phase1) (void))
-    (define (phase2)
-      (preferences:add-to-warnings-checkbox-panel
-       (λ (panel)
-         (define b
-           (make-object check-box%
-             (string-constant version:do-periodic-checks)
-             panel
-             (λ (b e) (preferences:set 'updates:enabled?
-                                       (if (send b get-value) 'yes 'no)))))
-         (preferences:add-callback
-          'updates:enabled?
-          (λ (p v) (send b set-value (is-enabled? v))))
-         (send b set-value
-               (is-enabled? (preferences:get 'updates:enabled?)))))
-      (drscheme:get/extend:extend-unit-frame
-       (λ (f%)
-         (class f%
-           (define/override (help-menu:after-about m)
-             (make-object menu-item%
-               (string-constant version:update-menu-item) m
-               (λ (b e) (check-for-updates this)))
-             (super help-menu:after-about m))
-           (super-new))))
-      (thread check-for-updates))
-    (when (> patchlevel 0) (version:add-spec 'p patchlevel))))
diff --git a/pkgs/drracket-pkgs/drracket/version/tool.scrbl b/pkgs/drracket-pkgs/drracket/version/tool.scrbl
deleted file mode 100644
index 71e8e5d5c3..0000000000
--- a/pkgs/drracket-pkgs/drracket/version/tool.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/manual
-@(require scribble/bnf
-          (for-label version/tool))
-
-@title{DrRacket Version Tool}
-
-@defmodule[version/tool]
-
-The @racket[version/tool] library implements a DrRacket tool that
-
-@itemize[
-
-@item{makes the patchlevel display as a version @tt{p}@nonterm{N}
-  suffix in DrRacket (though the base verion reported by
-  @racket[(version)] is not changed);}
-
-@item{if enabled by the user, periodically checks whether a
-  new Racket distribution is available for download.}
-
-]
diff --git a/pkgs/ds-store-pkgs/ds-store-doc/LICENSE.txt b/pkgs/ds-store-pkgs/ds-store-doc/LICENSE.txt
deleted file mode 100644
index 56efbc6dcb..0000000000
--- a/pkgs/ds-store-pkgs/ds-store-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ds-store-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/ds-store-pkgs/ds-store-doc/ds-store.scrbl b/pkgs/ds-store-pkgs/ds-store-doc/ds-store.scrbl
deleted file mode 100644
index 11709e873f..0000000000
--- a/pkgs/ds-store-pkgs/ds-store-doc/ds-store.scrbl
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang scribble/manual
-@(require (for-label ds-store
-                     ds-store/alias
-                     racket/base
-                     racket/contract/base))
-
-@title{Reading Writing @filepath{.DS_Store} Files}
-
-A @filepath{.DS_Store} file is a metadata file on Mac OS X that holds
-information about folder and icons as viewed and manipulated in
-Finder. One common reason to manipulate @filepath{.DS_Store} files
-is to create a nice-looking disk image for a Mac OS X installer.
-
-@filepath{.DS_Store} reading nd writing is based on a
-reverse-engineered description of the file format @cite["DS_Store"].
-
-@section[#:tag "ds-store-api"]{@filepath{.DS_Store} Files and Entries}
-
-@defmodule[ds-store]
-
-@defproc[(read-ds-store [path path-string?]
-                        [#:verbose verbose? any/c #f])
-         (listof ds?)]{
-
-Reads the @filepath{.DS_Store} file at @racket[path] returning a list
-of store items.}
-
-@defproc[(write-ds-store [path path-string?]
-                         [dses (listof ds?)])
-         void?]{
-
-Writes @racket[dses] to the @filepath{.DS_Store} file at
-@racket[path], replacing the file's current content.}
-
-@defstruct*[ds ([path (or/c path-element? 'same)]
-                [id symbol?]
-                [type (or/c 'long 'shor 'bool 'type 'ustr 'blob)]
-                [data (or/c exact-integer? boolean? symbol? string?
-                            bytes? iloc? fwind?)])
-            #:transparent]{
-
-Represents a entry in a @filepath{.DS_Store} file. A
-@filepath{.DS_Store} file typically has multiple entries for a single
-file or directory in the same directory as the @filepath{.DS_Store}.
-
-The @racket[path] should be @racket['same] only for a volume root
-directory; information about a directory is otherwise recorded in its
-parent directory's @filepath{.DS_Store} file.
-
-The @racket[id] symbols should each have four ASCII characters. See
-the @filepath{.DS_Store} format description @cite["DS_Store"] for more
-information @racket[id] and @racket[type] values.
-
-The @racket[data] field long should be an exact integer for
-@racket['long] and @racket['shor] types, a boolean for the
-@racket['bool] type, a 4-character ASCII symbol for the @racket['type]
-type, a string for the @racket['ustr] type, and either a byte string,
-@racket[iloc], or @racket[fwind] for the @racket['blob] type.}
-
-@defstruct*[iloc ([x exact-integer?] [y exact-integer?]) #:transparent]{
-
-Represents an icon location for an @racket['Iloc] entry.}
-
-@defstruct*[fwind ([t exact-integer?]
-                   [l exact-integer?]
-                   [b exact-integer?]
-                   [r exact-integer?]
-                   [mode symbol?]
-                   [sideview? any/c])
-            #:transparent]{
-
-Represent a window location for a @racket['fwi0] entry. The
-@racket[mode] field should have four ASCII characters, and recognized
-@racket[mode]s include @racket['icnv], @racket['clmv], and
-@racket['Nlsv].}
-
-@; ----------------------------------------
-
-@section[#:tag "aliases"]{Finder Aliases}
-
-A @racket['pict] entry in a @filepath{.DS_Store} file references a
-file through a Finder alias.
-
-@defmodule[ds-store/alias]
-
-@defproc[(path->alias-bytes [path path-string?]
-                            [#:wrt wrt-dir (or/c #f path-string?) #f])
-         (or/c bytes? #f)]{
-
-Constructs a byte string to represent a Finder alias but using the
-@filepath{CoreFoundation} library on Mac OS X.}
-
-@; ----------------------------------------
-
-@bibliography[(bib-entry #:key "DS_Store"
-                         #:title "DS_Store Format"
-                         #:author "Wim Lewis and Mark Mentovai"
-                         #:url "http://search.cpan.org/~wiml/Mac-Finder-DSStore/DSStoreFormat.pod")]
diff --git a/pkgs/ds-store-pkgs/ds-store-doc/info.rkt b/pkgs/ds-store-pkgs/ds-store-doc/info.rkt
deleted file mode 100644
index c32e847fb7..0000000000
--- a/pkgs/ds-store-pkgs/ds-store-doc/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection "ds-store")
-(define deps '("base"
-               "scribble-lib"
-               "racket-doc"
-               "ds-store-lib"))
-(define update-implies '("ds-store-lib"))
-
-(define scribblings '(("ds-store.scrbl")))
-
-
-(define pkg-desc "documentation part of \"ds-store\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/ds-store-pkgs/ds-store-lib/LICENSE.txt b/pkgs/ds-store-pkgs/ds-store-lib/LICENSE.txt
deleted file mode 100644
index 645f2749d5..0000000000
--- a/pkgs/ds-store-pkgs/ds-store-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ds-store-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/ds-store-pkgs/ds-store-lib/alias.rkt b/pkgs/ds-store-pkgs/ds-store-lib/alias.rkt
deleted file mode 100644
index 21ff36e4a6..0000000000
--- a/pkgs/ds-store-pkgs/ds-store-lib/alias.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang racket/base
-(require ffi/unsafe)
-
-(provide path->alias-bytes)
-
-(define CoreServices
-  (ffi-lib "/System/Library/Frameworks/CoreServices.framework/CoreServices"
-           #:fail (lambda () #f)))
-
-(define (make-unavailable)
-  (lambda args (error "unavailable")))
-
-(define FSNewAliasFromPath
-  (get-ffi-obj 'FSNewAliasFromPath
-               CoreServices
-               (_fun _path _path _int (h : (_ptr o _pointer)) (_ptr io _int) -> (r : _int) -> (if (zero? r) h #f))
-               (lambda () #f)))
-
-;; Fallback when FSNewAliasFromPath is not available:
-(define _FSRef _pointer) ; 80 bytes
-(define FSPathMakeRef
-  (get-ffi-obj 'FSPathMakeRef 
-               CoreServices
-               (_fun _path _FSRef (_pointer = #f) -> (r : _int) 
-                     -> (unless (zero? r)
-                          (error 'FSPathMakeRef "failed")))
-               make-unavailable))
-(define FSNewAliasUnicode
-  (get-ffi-obj 'FSNewAliasUnicode
-               CoreServices
-               (_fun _FSRef
-                     _FSRef
-                     _uint 
-                     _string/utf-16
-                     (h : (_ptr o _pointer)) 
-                     (_ptr io _int)
-                     -> (r : _int)
-                     -> (if (zero? r) h #f))
-               make-unavailable))
-
-(define GetAliasSize
-  (get-ffi-obj 'GetAliasSize
-               CoreServices
-               (_fun _pointer -> _long)
-               make-unavailable))
-(define DisposeHandle
-  (get-ffi-obj 'DisposeHandle
-               CoreServices
-               (_fun _pointer -> _void)
-               make-unavailable))
-
-(define (path->alias-bytes file
-                           #:wrt [wrt #f])
-  (define h
-    (if FSNewAliasFromPath
-        (FSNewAliasFromPath wrt
-                            file
-                            0
-                            0)
-        (let ([wrt-fs (and wrt (malloc 80))]
-              [fs (malloc 80)])
-          (when wrt (FSPathMakeRef wrt wrt-fs))
-          (define-values (base name dir?) (split-path file))
-          (FSPathMakeRef base fs)
-          (FSNewAliasUnicode wrt-fs
-                             fs
-                             (string-length (path->string name)) ; FIXME: should be utf-16 count
-                             (path->string name)
-                             0))))
-  (and h
-       (let ([sz (GetAliasSize h)])
-         (define bstr (make-bytes sz))
-         (memcpy bstr (ptr-ref h _pointer) sz)
-         (begin0
-          bstr
-          (DisposeHandle h)))))
diff --git a/pkgs/ds-store-pkgs/ds-store-lib/info.rkt b/pkgs/ds-store-pkgs/ds-store-lib/info.rkt
deleted file mode 100644
index 54cae0442d..0000000000
--- a/pkgs/ds-store-pkgs/ds-store-lib/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define collection "ds-store")
-(define deps '("base"))
-
-
-(define pkg-desc "implementation (no documentation) part of \"ds-store\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/ds-store-pkgs/ds-store-lib/main.rkt b/pkgs/ds-store-pkgs/ds-store-lib/main.rkt
deleted file mode 100644
index 8ed8fa3ee8..0000000000
--- a/pkgs/ds-store-pkgs/ds-store-lib/main.rkt
+++ /dev/null
@@ -1,368 +0,0 @@
-#lang racket/base
-
-(provide read-ds-store
-         write-ds-store
-         (struct-out ds)
-         (struct-out iloc)
-         (struct-out fwind))
-
-;; Based on 
-;;   http://search.cpan.org/~wiml/Mac-Finder-DSStore/DSStoreFormat.pod
-;; by Wim Lewis and Mark Mentovai
-
-(struct ds (path id type data) #:transparent)
-(struct iloc (x y) #:transparent)
-(struct fwind (t l b r mode sideview?) #:transparent)
-
-(define HEAD 4)
-
-(define (swap-bytes bstr)
-  (let ([s (make-bytes (bytes-length bstr))])
-    (for ([i (in-range 0 (bytes-length bstr) 2)])
-      (bytes-set! s i (bytes-ref bstr (add1 i)))
-      (bytes-set! s (add1 i) (bytes-ref bstr i)))
-    s))
-
-(define (bytes->string/utf-16 bstr)
-  (define bstr2 (if (system-big-endian?)
-                    bstr
-                    (swap-bytes bstr)))
-  (define c (bytes-open-converter "platform-UTF-16" "platform-UTF-8"))
-  (define-values (utf-8 got status) (bytes-convert c bstr2))
-  (bytes-close-converter c)
-  (bytes->string/utf-8 utf-8))
-
-(define (string->bytes/utf-16 s)
-  (define c (bytes-open-converter "platform-UTF-8" "platform-UTF-16"))
-  (define-values (utf-16 got status) (bytes-convert c (string->bytes/utf-8 s)))
-  (bytes-close-converter c)
-  (if (system-big-endian?)
-      utf-16
-      (swap-bytes utf-16)))
-
-(define (mac-path<? a b)
-  ;; A guess: alphabetic case-insensitively, but ties
-  ;; can be determined by case:
-  (define as (bytes->string/utf-16 a))
-  (define bs (bytes->string/utf-16 b))
-  (or (string-ci<? as bs)
-      (and (string-ci=? as bs)
-           (string<? as bs))))
-
-(define (read-ds-store path
-                       #:verbose? [verbose? #f])
-  (call-with-input-file*
-   path
-   (lambda (p)
-     (define (check b)
-       (unless (equal? b (read-bytes (bytes-length b) p))
-         (error "mismatch")))
-
-     (define (read-int)
-       (integer-bytes->integer (read-bytes 4 p) #f #t))
-     (define (read-short)
-       (integer-bytes->integer (read-bytes 2 p) #f #t))
-
-     (define (read-utf-16 len)
-       (define bstr (read-bytes (* 2 len) p))
-       (bytes->string/utf-16 bstr))
-
-     (define (read-four)
-       (string->symbol (bytes->string/utf-8 (read-bytes 4 p) #\?)))
-
-     (define (addr-offset o) (- o (bitwise-and o #x1F)))
-     (define (addr-size o) (expt 2 (bitwise-and o #x1F)))
-
-     (check #"\0\0\0\1")
-     (check #"Bud1")
-
-     (define bookkeeping-offset (read-int))
-     (define bookkeeping-size (read-int))
-
-     (when verbose?
-       (printf "Bookkeeping at ~a, size ~a\n"
-               bookkeeping-offset
-               bookkeeping-size))
-
-     (file-position p (+ bookkeeping-offset HEAD))
-     (define count (read-int))
-     (when verbose?
-       (printf "File has ~a blocks\n" count))
-     (void (read-int))
-     (define block-addresses
-       (for/vector ([i (in-range count)])
-         (read-int)))
-     (when verbose?
-       (printf "Block addresses:\n")
-       (for ([a (in-vector block-addresses)]
-             [i (in-naturals)])
-         (printf " ~a: ~a = ~a\n" 
-                 i
-                 (addr-offset a)
-                 (addr-size a))))
-     (void (read-bytes (* 4 (- 256 count)) p))
-     (define directory-count (read-int))
-     (define dirs (for/list ([i (in-range directory-count)])
-                    (cons (read-bytes (read-byte p) p)
-                          (read-int))))
-     (define free-lists (for/list ([i 32])
-                          (define c (read-int))
-                          (for/list ([i c])
-                            (read-int))))
-     (when verbose?
-       (printf "Free list:\n")
-       (for/list ([i 32]
-                  [l (in-list free-lists)])
-         (printf "~a: ~a\n" (expt 2 i) l)))
-
-     (define header-block (cdr (assoc #"DSDB" dirs)))
-
-     (define header-addr (vector-ref block-addresses header-block))
-
-     (when verbose?
-       (printf "Header block is ~a at ~a (size ~a)\n" 
-               header-block 
-               (addr-offset header-addr)
-               (addr-size header-addr)))
-
-     (file-position p (+ (addr-offset header-addr) HEAD))
-
-     (define root-block-number (read-int)) ; root node
-     (define more-root-data
-       (list
-        (read-int)   ; levels
-        (read-int)   ; records
-        (read-int))) ; nodes
-     (unless (equal? (read-int) #x1000)
-       (error "mismatch"))
-
-     (when verbose?
-       (printf "Root block is ~a ~s\n" root-block-number more-root-data))
-
-     (define (show-tree n accum)
-       (define addr (vector-ref block-addresses n))
-       (file-position p (+ (addr-offset addr) HEAD))
-       (define P (read-int))
-       (define count (read-int))
-       (when verbose?
-         (printf "block ~s ~s\n" P count))
-       (cond
-        [(zero? P)
-         (for/fold ([accum accum]) ([i (in-range count)])
-           (show-record accum))]
-        [else
-         (define a3
-           (for/fold ([accum accum]) ([i (in-range count)])
-             (define bn (read-int))
-             (define pos (file-position p))
-             (define a2 (show-tree bn accum))
-             (file-position p pos)
-             (show-record a2)))
-         (show-tree P a3)]))
-
-     (define (show-record accum)
-       (define len (read-int))
-       (define name (read-utf-16 len))
-       (define id (read-four))
-       (define type (read-four))
-       (define data
-         (case type
-           [(long shor) (read-int)]
-           [(bool) (positive? (read-byte p))]
-           [(blob) 
-            (define len (read-int))
-            (case id
-              [(fwi0) (begin0
-                       (fwind (read-short)
-                              (read-short)
-                              (read-short)
-                              (read-short)
-                              (read-four)
-                              (begin
-                                (read-byte p)
-                                (not (zero? (read-byte p)))))
-                       (read-bytes (- len 14) p))]
-              [(Iloc) (begin0
-                       (iloc (read-int)
-                             (read-int))
-                       (read-bytes (- len 8) p))]
-              [else (read-bytes len p)])]
-           [(type) (read-four)]
-           [(ustr) (read-utf-16 (read-int))]))
-       (when verbose?
-         (printf "~a '~a' '~a':\n  ~s\n" name id type data))
-       (cons (ds (if (equal? name ".")
-                     'same
-                     (string->path-element name))
-                 id
-                 type
-                 data)
-             accum))
-
-     (reverse (show-tree root-block-number null)))))
-
-(define (write-ds-store path dses)
-  (struct record (filename id type data))
-
-  (define (record<? a b)
-    (define af (record-filename a))
-    (define bf (record-filename b))
-    (if (equal? af bf)
-        (mac-path<? (record-id a) (record-id b))
-        (mac-path<? af bf)))
-
-  (define (record-size r)
-    (+ 4 ; filename length
-       (bytes-length (record-filename r))
-       4 ; id
-       4 ; type
-       (bytes-length (record-data r))))
-
-  (define (int->bytes i)
-    (integer->integer-bytes i 4 #t #t))
-  (define (short->bytes i)
-    (integer->integer-bytes i 2 #t #t))
-  
-  (define records
-    (sort (for/list ([ds (in-list dses)])
-            (define data (ds-data ds))
-            (record (if (eq? (ds-path ds) 'same)
-                        (string->bytes/utf-16 ".")
-                        (string->bytes/utf-16
-                         (path-element->string (ds-path ds))))
-                    (string->bytes/utf-8 (symbol->string (ds-id ds)))
-                    (string->bytes/utf-8 (symbol->string (ds-type ds)))
-                    (case (ds-type ds)
-                      [(long shor) (int->bytes data)]
-                      [(bool) (if data #"\1" #"\0")]
-                      [(blob)
-                       (define bstr
-                         (cond
-                          [(bytes? data) data]
-                          [(fwind? data) (bytes-append 
-                                          (short->bytes (fwind-t data))
-                                          (short->bytes (fwind-l data))
-                                          (short->bytes (fwind-b data))
-                                          (short->bytes (fwind-r data))
-                                          (string->bytes/utf-8 (symbol->string (fwind-mode data)))
-                                          (bytes 0
-                                                 (if (fwind-sideview? data) 1 0)
-                                                 0 
-                                                 0))]
-                          [(iloc? data) (bytes-append
-                                         (int->bytes (iloc-x data))
-                                         (int->bytes (iloc-y data))
-                                         (bytes #xff #xff #xff #xff #xff #xff 0 0))]
-                          [else (error "unrecognized block variant: ~s" data)]))
-                       (bytes-append
-                        (int->bytes (bytes-length bstr))
-                        bstr)]
-                      [(type)
-                       (string->bytes/utf-8 (symbol->string data))]
-                      [(ustr)
-                       (define bstr (string->bytes/utf-16 data))
-                       (string-append (int->bytes (quotient (bytes-length bstr) 2))
-                                      bstr)]
-                      [else (error "unrecognized data: ~s" (ds-type ds))])))
-          record<?))
-
-  (define records-block-size
-    (+ 4 ; P = 0
-       4 ; count 
-       (apply + (for/list ([r (in-list records)])
-                  (record-size r)))))
-
-  (define alloc-size (let ([v (max 64
-                                   (expt 2 (integer-length (add1 records-block-size))))])
-                       (if (= v 2048)
-                           4096 ; avoid collision with bookkeeping block
-                           v)))
-
-  (call-with-output-file*
-   path
-   #:exists 'truncate/replace
-   (lambda (p)
-     (define (write-records sz)
-       (write-int 0)
-       (write-int (length records))
-       (for ([r (in-list records)])
-         (write-int (quotient (bytes-length (record-filename r)) 2))
-         (write-bytes (record-filename r) p)
-         (write-bytes (record-id r) p)
-         (write-bytes (record-type r) p)
-         (write-bytes (record-data r) p))
-       (write-bytes (make-bytes (- sz records-block-size) 0) p))
-
-     (define (write-int i)
-       (write-bytes (int->bytes i) p))
-     (define (write-addr pos sz)
-       (write-int (bitwise-ior pos (sub1 (integer-length sz)))))
-
-     (write-bytes #"\0\0\0\1" p)
-
-     (write-bytes #"Bud1" p)     
-     ;; Bookeeping block always at 2048, since
-     ;; it needs 2048 bytes:
-     (write-int 2048) ; offset
-     (write-int 2048) ; size
-     (write-int 2048) ; offset, again
-     (write-bytes (make-bytes 16 0) p)
-
-     ;; Next 32-byte block (at offset 32) is used for the header block:
-     (write-int 2) ; block number for root
-     (write-int 0) ; level
-     (write-int (length records)) ; records
-     (write-int 1) ; nodes
-     (write-int #x1000)
-     (write-bytes (make-bytes 12 0) p)
-
-     ;; Starting with 64, need blocks up to size
-     ;; 1024. If any of those fit the records, then
-     ;; use it.
-     (let loop ([sz 64])
-       (if (= sz alloc-size)
-           (write-records sz)
-           (write-bytes (make-bytes sz 0) p))
-       (unless (= sz 1024)
-         (loop (* sz 2))))
-
-     ;; Write bookkeeping block
-     (write-int 3)     ; 3 blocks
-     (write-int 0)     ; unknown
-     (write-addr 2048 2048) ; bookkeeping
-     (write-addr 32 32) ; header block
-     ;; records block always lands at second buddy:
-     (write-addr alloc-size alloc-size)
-     (write-bytes (make-bytes (* 4 (- 256 3)) 0) p)
-     
-     ;; Single directory entry:
-     (write-int 1)
-     (write-byte 4 p)
-     (write-bytes #"DSDB" p)
-     (write-int 1) ; block 1 is header
-
-     ;; free lists:
-     (for/list ([i 32])
-       (define sz (expt 2 i))
-       (cond
-        [(= i 31) (write-int 0)]
-        [(or (sz . <= . 32) 
-             (sz . = . 2048))
-         (write-int 0)]
-        [(= sz alloc-size) (write-int 0)]
-        [else (write-int 1)
-              (write-int sz)]))
-
-     (file-truncate p (+ 4096 HEAD))
-     (file-position p (+ 4096 HEAD))
-
-     ;; write bytes as needed to reach records data
-     (let loop ([sz 4096])
-       (when (alloc-size . > . sz)
-         (write-bytes (make-bytes sz 0) p)
-         (loop (* 2 sz))))
-
-     (when (alloc-size . > . 2048)
-       (write-records alloc-size))
-
-     (void))))
diff --git a/pkgs/ds-store-pkgs/ds-store/LICENSE.txt b/pkgs/ds-store-pkgs/ds-store/LICENSE.txt
deleted file mode 100644
index 0ec27b05a7..0000000000
--- a/pkgs/ds-store-pkgs/ds-store/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ds-store
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/ds-store-pkgs/ds-store/info.rkt b/pkgs/ds-store-pkgs/ds-store/info.rkt
deleted file mode 100644
index 6568518f36..0000000000
--- a/pkgs/ds-store-pkgs/ds-store/info.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang info
-
-(define collection "ds-store")
-
-(define deps '("ds-store-lib"
-               "ds-store-doc"
-               "base"))
-(define implies '("ds-store-lib"
-                  "ds-store-doc"))
-
-(define pkg-desc "Libraries for manipulating \".DS_Store\" files")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/eli-tester/LICENSE.txt b/pkgs/eli-tester/LICENSE.txt
deleted file mode 100644
index 7eefba545b..0000000000
--- a/pkgs/eli-tester/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-eli-tester
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/eli-tester/info.rkt b/pkgs/eli-tester/info.rkt
deleted file mode 100644
index 1b61ea11fc..0000000000
--- a/pkgs/eli-tester/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"
-               "rackunit-lib"))
-
-(define pkg-desc "Testing framework")
-
-(define pkg-authors '(eli))
diff --git a/pkgs/eli-tester/tests/eli-tester.rkt b/pkgs/eli-tester/tests/eli-tester.rkt
deleted file mode 100644
index e9d817ae7f..0000000000
--- a/pkgs/eli-tester/tests/eli-tester.rkt
+++ /dev/null
@@ -1,289 +0,0 @@
-#lang racket/base
-
-(require racket/match racket/list racket/string rackunit/log
-         (for-syntax racket/base racket/match))
-
-(define-syntax (safe stx)
-  (syntax-case stx ()
-    [(_ expr)
-     ;; catch syntax errors while expanding, turn them into runtime errors
-     (with-handlers ([exn:fail:syntax? (lambda (e) #`(list 'error #,(exn-message e) #f))])
-       (define-values (_ opaque)
-         (syntax-local-expand-expression
-          #'(with-handlers
-                ([(lambda (_) #t)
-                  (lambda (e) (list 'error (and (exn? e) (exn-message e)) e))])
-              (cons 'values (call-with-values (lambda () expr) list)))))
-       opaque)]))
-
-(define show
-  (match-lambda
-    [(list 'values x)
-     (format "~e" x)]
-    [(list 'values xs ...)
-     (string-append "(values "
-                    (string-join (map (lambda (x) (format "~e" x)) xs))
-                    ")")]
-    [(list 'error err val)
-     (cond [(procedure? err) (format "error satisfying ~.s" err)]
-           [(regexp? err)    (format "error matching ~.s" err)]
-           [err              (format "error: ~.a" err)]
-           [else             (format "a raised non-exception ~.s" val)])]
-    [x (format "INTERNAL ERROR, unexpected value: ~.s" x)]))
-
-(define test-context (make-parameter #f))
-(define failure-format
-  (make-parameter
-   (lambda (prefix qe fmt . args)
-     (define str
-       (regexp-replace #rx"\n" (apply format fmt args) "\n  "))
-     (string-join (reverse (cons (format "test failure in ~.s\n  ~a" qe str)
-                                 prefix))
-                  " > "))))
-
-(define (make-failure-message msg)
-  (define str (regexp-replace #rx"\n" msg "\n  "))
-  (define real-msg (format "test failure\n  ~a" str))
-  (lambda (prefix qe fmt . args) real-msg))
-(define failure-prefix-mark (gensym 'failure-prefix))
-
-(define (make-location src line col pos)
-  (string->symbol
-   (format "~a:~a" (or src "(unknown)")
-           (let ([l line] [c col])
-             (cond [(and l c) (format "~a:~a" l c)]
-                   [l l]
-                   [pos => (lambda (p) (format "#~a" p))]
-                   [else "?"])))))
-    
-(define-syntax (test-thunk stx)
-  (define (blame e fmt . args)
-    (with-syntax ([e e] [fmt fmt] [(arg ...) args] 
-                  [src (syntax-source e)]
-                  [line (syntax-line e)]
-                  [col (syntax-column e)]
-                  [pos (syntax-position e)])
-      #'(let* ([form (failure-format)]
-               [prefix (continuation-mark-set->list (current-continuation-marks)
-                                                    failure-prefix-mark)])
-          (error (make-location 'src 'line 'col 'pos) "~a" (form prefix 'e fmt arg ...)))))
-  (define (test-1 x)
-    #`(let ([x (safe #,x)])
-        (unless (and (eq? 'values (car x)) (= 2 (length x)) (cadr x))
-          #,(blame x "expected: non-#f single value\n     got: ~a"
-                   #'(show x)))))
-  (define (test-2 x y [eval2? #t])
-    #`(let* ([x (safe #,x)]                   [xtag (car x)]
-             [y #,(if eval2? #`(safe #,y) y)] [ytag (car y)])
-        (cond
-          [(eq? ytag 'values)
-           (unless (equal? x y)
-             #,(blame x "expected: ~a\n     got: ~a" #'(show y) #'(show x)))]
-          [(eq? xtag 'values)
-           #,(blame x "expected: an error\n     got: ~a" #'(show x))]
-          ;; both are errors (or other raised values)
-          [(not (cadr x)) ; expecting a non-exception raise
-           (unless (or (equal? x y)
-                       (and (procedure? (cadr y)) ((cadr y) (caddr x))))
-             #,(blame x "expected ~a\n     got: ~a" #'(show y) #'(show x)))]
-          [else
-           (let ([xerr (cadr x)] [xval (caddr x)] [yerr (cadr y)])
-             (cond [(string? yerr)
-                    (unless (regexp-match? (regexp-quote yerr) xerr)
-                      #,(blame x "bad error message, expected: ~s\ngot: ~s"
-                               #'yerr #'xerr))]
-                   [(regexp? yerr)
-                    (unless (regexp-match? yerr xerr)
-                      #,(blame x "bad error message, expected ~a: ~s\ngot: ~s"
-                               "a match for" #'yerr #'xerr))]
-                   [(and (procedure? yerr) (procedure-arity-includes? yerr 1))
-                    (unless (yerr xval)
-                      #,(blame x "bad error message, expected ~a: ~s\ngot: ~s"
-                               "an exception satisfying" #'yerr #'xerr))]
-                   [else (error 'test "bad error specification: ~e" yerr)]))])))
-  (define (test-error x y) (test-2 x #`(list 'error #,y #f) #f))
-  (define (try t . args)
-    #`(let ([c (test-context)])
-        (with-handlers ([exn? (lambda (e) (set-mcdr! c (cons e (mcdr c))))])
-          (set-mcar! c (add1 (mcar c)))
-          #,(apply t args))))
-  (define (test-0 x) x)
-  (let loop ([xs (map (lambda (x)
-                        (let ([e (syntax-e x)])
-                          (if (or (memq e '(do => <= =error> <error=))
-                                  (keyword? e))
-                              e x)))
-                      (cdr (syntax->list stx)))]
-             [r '()])
-    (let ([t (let tloop ([xs xs])
-               (match xs
-                 [(list* #:failure-prefix msg r)
-                  (let ([r (tloop r)])
-                    (if (pair? r)
-                      (cons #`(with-continuation-mark failure-prefix-mark
-                                                      #,msg #,(car r))
-                            (cdr r))
-                      r))]
-                 [(list* #:failure-message msg r)
-                  (let ([r (tloop r)])
-                    (if (pair? r)
-                        (cons
-                         #`(parameterize ([failure-format
-                                           (make-failure-message #,msg)])
-                             #,(car r))
-                         (cdr r))
-                        r))]
-                 [(list* 'do x r) ; to avoid counting non-test exprs as tests
-                  (cons (test-0 x) r)]
-                 [(list* x '=> y r)      (cons (try test-2 x y) r)]
-                 [(list* y '<= x r)      (cons (try test-2 x y) r)]
-                 [(list* x '=error> y r) (cons (try test-error x y) r)]
-                 [(list* y '<error= x r) (cons (try test-error x y) r)]
-                 [(list* x r)
-                  ;; if x = (test ...), then it's implicitly in a `do'
-                  ;; (not really needed, but avoids an extra count of tests)
-                  (syntax-case x (test)
-                    [(test x0 x1 ...) (cons (test-0 x) r)]
-                    [_ (cons (try test-1 x) r)])]
-                 [(list) '()]))])
-      (if (pair? t)
-          (loop (cdr t) (cons (car t) r))
-          #`(lambda () #,@(reverse r))))))
-
-;; pass 'quiet to have nothing printed on success
-(define (run-tests thunk force-new-context? #:on-pass [pass 'loud])
-  (if (and (test-context) (not force-new-context?))
-      (thunk)
-      (let ([c (mcons 0 '())])
-        (parameterize ([test-context c])
-          (dynamic-wind
-           void
-           thunk
-           (lambda ()
-             (test-context #f)
-             (let ([num (mcar c)] [exns (mcdr c)])
-               (for ([i (in-range num)]) (test-log! #t))
-               (for ([i (in-list exns)]) (test-log! #f))
-               (if (null? exns)
-                   (case pass
-                     [(loud) (printf "~a test~a passed\n" num (if (= num 1) "" "s"))]
-                     [(quiet) (void)])
-                   (error 'test "~a/~a test failures:~a" (length exns) num
-                          (string-append*
-                           (append-map (lambda (e) (list "\n" (exn-message e)))
-                                       (reverse exns))))))))))))
-
-(define-syntax-rule (define-test name force-context)
-  (define-syntax (name stx)
-    (syntax-case stx ()
-      [(_ #:on-pass pass x0 x (... ...))
-       #'(run-tests #:on-pass pass (test-thunk x0 x (... ...)) force-context)]
-      [(_ x0 x (... ...))
-       #'(run-tests (test-thunk x0 x (... ...)) force-context)])))
-
-(provide test test*)
-(define-test test  #f)
-(define-test test* #t)
-
-#; ; test the `test' macro
-
-(test
- ;; test usage
- 1 => 1
- #t
- (< 1 2)
- (+ 1 2) => 3
- (+ 1 2) <= 3
- ;; multiple values
- (values 1) => 1
- (values 1) <= 1
- (quotient/remainder 10 3) => (values 3 1)
- ;; runtime errors
- (car '()) =error> "expects argument of type"
- (car '()) => (error "expects argument of type")
- ;; syntax errors
- (if 1) =error> "if: bad syntax"
-
- ;; error (and non-exception raises) predicates
- (+ 1 "2")   =error> exn:fail:contract?
- (+ 1 "2")   =error> (lambda (x) (not (exn:fail:filesystem? x)))
- (+ 1 "2")   =error> #rx"expects.*<number>"
- (error "1") =error> exn?
- (raise 1)   =error> number?
- (raise "1") =error> string?
-
- ;; test `test' errors
- (test* (/ 0)) =error> "expected: non-#f single value"
- (test* 1 => 2) =error> "expected: 2"
- (test* 1 =error> "") =error> "expected: an error"
- (test* (/ 0) =error> "zzz") =error> "bad error message"
- (test* (raise 1) =error> "foo") =error> "raised non-exception"
- (test* #:failure-message "FOO" (/ 0) => 1) =error> "FOO"
- (test* #:failure-message "FOO" (/ 0)) =error> "FOO"
- (test* #:failure-prefix "FOO" (/ 0)) =error> "FOO"
-
- ;; test possitive message
- (let ([o (open-output-bytes)])
-   (list (begin (parameterize ([current-output-port o]) (test* 1 => 1))
-                (get-output-bytes o #t))
-         (begin (parameterize ([current-output-port o]) (test* 1 => 1 (odd? 1)))
-                (get-output-bytes o #t))))
- => '(#"1 test passed\n" #"2 tests passed\n")
- )
-
-;; RackUnit stuff
-;; (examples that should fail modified to ones that shouldn't)
-#|
-
-;; Quick Start example
-(define (file-tests)
-  ;; Tests for file.scm
-  ;; (=> source location is sufficient, no need for test names in the code)
-  (test
-   (+ 1 1) => 2
-   (* 1 2) => 2
-   ;; List has length 4 and all elements even
-   do (let ([lst (list 2 4 6 8)])
-        (test (length lst) => 4
-              do (for ([x lst]) (test (even? x)))))))
-(file-tests)
-
-;; API listing
-(test
- ;; (check < 2 3)
- (< 2 3)
- ;; (check-eq? 1 1 "allocated data not eq?")
- (eq? 1 1)
- ;; (check-not-eq? (list 1) (list 1) "integers are eq?")
- (not (eq? (list 1) (list 1)))
- ;; (check-eqv? 1.0 1.0 "not eqv?")
- (eqv? 1.0 1.0)
- ;; (check-equal? 1.0 1.0 "not equal?")
- (equal? 1.0 1.0)
- 1.0 => 1.0 ; alternative
- ;; (check-not-equal? 1 1.0 "equal?")
- (not (equal? 1 1.0))
- ;; (check-pred string? "I work")
- (string? "I work")
- ;; (check-= 1.0 1.001 0.01 "I work")
- (< (abs (- 1.0 1.001)) 0.01)
- ;; (check-true (< 1 2))
- (eq? #t (< 1 2))
- ;; (check-false (< 2 1))
- (not (< 2 1))
- ;; (check-not-false (< 1 2))
- (< 1 2)
- ;; (check-exn exn?
- ;;            (lambda ()
- ;;              (raise (make-exn "Hi there"
- ;;                               (current-continuation-marks)))))
- (raise (make-exn "Hi there" (current-continuation-marks)))
- =error> ""
- ;; (check-not-exn (lambda () 1))
- (void 1)
- ;; (fail)
- ;; (error "foo") -> no real equivalent, since `fail' doesn't throw an error
- ;; (check-regexp-match "a+bba" "aaaaaabba")
- (regexp-match "a+bba" "aaaaaabba")
- )
-|#
diff --git a/pkgs/errortrace-pkgs/errortrace-doc/LICENSE.txt b/pkgs/errortrace-pkgs/errortrace-doc/LICENSE.txt
deleted file mode 100644
index 4992c85862..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-errortrace-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/errortrace-pkgs/errortrace-doc/errortrace/scribblings/errortrace.scrbl b/pkgs/errortrace-pkgs/errortrace-doc/errortrace/scribblings/errortrace.scrbl
deleted file mode 100644
index da767df60c..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-doc/errortrace/scribblings/errortrace.scrbl
+++ /dev/null
@@ -1,502 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          scribble/bnf
-          (for-label racket
-                     errortrace
-                     errortrace/errortrace-lib
-                     errortrace/stacktrace))
-
-@title[#:tag "top"]{Errortrace: Debugging and Profiling}
-
-@bold{Errortrace} is a stack-trace-on-exceptions, profiler, and
-coverage tool for Racket. It is not a complete debugger; DrRacket
-provides more. Meanwhile, using Errortrace might be better than
-Racket's limited stack-trace reporting.
-
-@table-of-contents[]
-
-@; ----------------------------------------------
-
-@section[#:tag "quick-instructions"]{Quick Instructions}
-
-First, throw away @filepath{.zo} versions of your program---at least
-for the modules or files that should be instrumented for error
-reporting or profiling.
-
-Then,
-
-@itemize[
-         @item{If your program has a module file @nonterm{prog}, run it with
-
-               @commandline{racket -l errortrace -t @nonterm{prog}}}
-
-         @item{If you program is a non-module top-level sequence of
-               definitions and expressions, you can instead add
-               @racketblock[(require errortrace)]
-               to the beginning of the program or start Racket with the @Flag{l} option before the
-               arguments to load your program:
-               @commandline{racket -l errortrace ...}}
-
-         @item{If you have no main program and you want to use
-               Racket interactively, include the @Flag{i} flag
-               before @Flag{l}:
-               @commandline{racket -i -l errortrace}}
-         ]
-
-After starting @racketmodname[errortrace] in one of these ways, when an
-exception occurs, the exception handler prints something like a stack trace
-with most recent contexts first.
-
-The @racketmodname[errortrace] module is strange: Don't import it
-into another module. Instead, the @racketmodname[errortrace] 
-module is meant to be invoked from the top-level, so that it can install 
-an evaluation handler, exception handler, etc.
-
-To reuse parts of the code of @racketmodname[errortrace], import
-@racketmodname[errortrace/errortrace-lib]. That library contains all
-of the bindings described here, but does not set the compilation
-handler or the error display handler.
-
-@; ----------------------------------------------
-
-@section[#:tag "installing-errortrace"]{Installing Errortrace}
-
-Invoking the 
-@racketmodname[errortrace] module sets the compilation
-handler to instrument Racket source code.  It also sets the error 
-display handler to report source information for an exception, and it
-sets the @racket[use-compiled-file-paths] parameter to trigger the use
-of Errortrace-specific @filepath{.zo} files.
-
-  NOTE: @racketmodname[errortrace] has no effect on code 
-  loaded as compiled byte code (i.e., from a @filepath{.zo} file) or
-  native code (i.e., from a @filepath{.dll}, @filepath{.so} or 
-  @filepath{.dylib} file). You can use the @DFlag{mode errortrace} flag
-  to @exec{setup-plt} to create @filepath{.zo} files with
-  Errortrace information.
-
-Explicitly requiring @racketmodname[errortrace] within a module is
-generally a bad idea, since @racketmodname[errortrace] sets various
-parameters.
-
-@; ---------------------------------------------
-@section[#:tag "using-errortrace"]{Using Errortrace}
-
-@defmodule[errortrace #:use-sources (errortrace/errortrace-lib)]
-
-See @secref["quick-instructions"] for information on starting with
-@racketmodname[errortrace]. This chapter provides information on the
-configuration of @racketmodname[errortrace] after it is loaded and
-installed.
-
-Don't import @racketmodname[errortrace] into another module and expect
-it to work on that module. Instead, the @racketmodname[errortrace]
-module is meant to be invoked from the top-level (as described in
-@secref["quick-instructions"]) so it can install handlers. The
-functions documented in this chapter then can be used at the
-top-level. The functions also can be accessed by importing
-@racketmodname[errortrace/errortrace-lib], which does not install any
-handlers.
-
-As a language name, @racketmodname[errortrace] chains to another
-language that is specified immediately after @racketmodname[errortrace],
-but instruments the module for debugging in the same way as if
-@racketmodname[errortrace] is required before loading the module from
-source. Using the @racketmodname[errortrace] meta-language is one way
-to ensure that debugging instrumentation is present when the module is
-compiled.
-
-@; ---------------------------------------------
-
-@subsection[#:tag "instrumentation-and-profiling"]{Instrumentation and Profiling}
-
-By default, @racketmodname[errortrace] only instruments for
-stack-trace-on-exception. Profiling and coverage need to be enabled
-separately.
-
-@defboolparam[instrumenting-enabled on?]{
-
-A parameter that determines whether tracing instrumentation is
-enabled, @racket[#t] by default.  Affects only the way that source code is
-compiled, not the way that exception information is reported. The
-instrumentation for storing exception information slows most programs
-by a factor of 2 or 3.}
-
-@defboolparam[profiling-enabled on?]{
-
-Errortrace's profiling instrumentation is @racket[#f] by default. To use it,
-you also need to ensure that @racket[instrumenting-enabled] is on.
-
-Also, profiling only records information about the time taken on the thread
-that compiled the code (more precisely, the thread that instruments the code via
-the @racket[errortrace-compile-handler]).
-}
-
-@defboolparam[profiling-record-enabled on?]{
-
-Enables/disables the recording of profiling info for the instrumented code.
-The default is @racket[#t].
-
-Profiling information is accumulated in a hash table.  If a procedure
-is redefined, new profiling information is accumulated for the new
-version of the procedure, but the old information is also preserved.
-
-Depending of the source program, profiling usually induces a factor of
-2 to 4 slowdown, in addition to any slowdown from the
-exception-information instrumentation.
-}
-
-@defproc[(output-profile-results [paths? any/c] [sort-time? any/c]) void?]{
-
-Gets the current profile results using @racket[get-profile-results] and 
-displays them.  It optionally shows paths information (if it is recorded),
-and sorts by either time or call counts.}
-
-@defproc[(get-profile-results [thd thread? (current-thread)]) list?]{
-
-Returns a list of lists that contain all profiling information accumulated
-so far (for the thread @racket[thd]):
-
-@itemize[
-   @item{the number of times a procedure was called.}
-
-   @item{the number of milliseconds consumed by the procedure's body across
-         all calls (including the time consumed by any nested non-tail call
-         within the procedure, but not including time consumed by a
-         tail-call from the procedure).}
-
-   @item{an inferred name (or @racket[#f]) for the procedure.}
-
-   @item{the procedure's source in the form of a syntax object (which might,
-         in turn, provide a source location file and position).}
-
-   @item{optionally, a list of unique call paths (i.e. stack traces) 
-         recorded if @racket[profile-paths-enabled] is set to @racket[#t].
-         Each call path is a pair of 
-         @itemize[
-           @item{a count (the number of times the path occurred), and}
-
-           @item{a list containing two-element lists. Each two-element list
-                 contains 
-                 @itemize[
-                   @item{the calling procedure's name or source expression,
-                         and}
-                   @item{the calling procedure's source file or @racket[#f].}]
-                }
-        ]
-        Collecting this information is relatively expensive.}
-]}
-
-@defboolparam[profile-paths-enabled on?]{
-
-Enables/disables collecting path information for profiling. The default is
-@racket[#f], but setting the parameter to @racket[#t] immediately affects
-all procedures instrumented for profiling information.}
-
-@defproc[(clear-profile-results) void?]{
-
-Clears accumulated profile results for the current thread.}
-
-
-@; ------------------------------------------------
-
-@subsection[#:tag "coverage"]{Coverage}
-
-Errortrace can produce coverage information in two flavors: both count
-the number of times each expression in the source was used during
-execution. The first flavor uses a simple approach, where each
-expression is counted when executed; the second one uses the same
-annotations that the profiler uses, so only function bodies are
-counted. To see the difference between the two approaches, try this
-program:
-
-@racketblock[(define (foo x) (if x 1 2))
-             (equal? (foo #t) 1)]
-
-The first approach will produce exact results, but it is more
-expensive; use it when you want to know how covered your code is (when
-the expected counts are small).  The second approach produces coarser
-results (which, in the above case, will miss the @racket[2] expression),
-but is less expensive; use it when you want to use the counts for
-profiling (when the expected counts are large).
-
-@deftogether[(
-  @defboolparam[coverage-counts-enabled on?]
-  @defboolparam[execute-counts-enabled on?])]{
-
-Parameters that determine if the first (exact coverage) or second
-(profiler-based coverage) are enabled. Remember that setting
-@racket[instrumenting-enabled] to @racket[#f] also disables both.}
-
-@defproc[(get-coverage) (listof (cons/c syntax? boolean?))]{
-
-Returns a list of pairs, one for each instrumented expression.  The
-first element of the pair is a @racket[syntax?] object (usually containing
-source location information) for the original expression, and the
-second element of the pair indicates if the code has been executed.
-This list is snapshot of the current state of the computation.}
-
-@defproc[(get-execute-counts) (list (cons/c syntax? number?))]{
-Returns a list of pairs, one for each instrumented expression.  The
-first element of the pair is a @racket[syntax?] object (usually containing
-source location information) for the original expression, and the
-second element of the pair is the number of times that the
-expression has been evaluated.
-This list is snapshot of the current state of the computation.}
-
-@deftogether[(
-  @defproc[(annotate-covered-file 
-            [filename-path path-string?]
-            [display-string (or/c string? #f) #f]) 
-           void?]
-  @defproc[(annotate-executed-file
-            [filename-path path-string?]
-            [display-string (or/c string? #t #f) "^.,"]) 
-           void?])]{
-
-Writes the named file to the @racket[current-output-port], inserting an
-additional line between each source line to reflect execution counts
-(as reported by @racket[get-coverage-counts] or @racket[get-execute-counts]).
-The optional @racket[display-string] is used for the annotation: the first
-character is used for expressions that were visited 0 times, the
-second character for 1 time, ..., and the last character for
-expressions that were visited more times.  It can also be
-@racket[#f] for a minimal display, @racket["#."], or, in
-the case of @racket[annotate-executed-file],
-@racket[#t] for a maximal display, @racket["0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"].
-}
-
-@defparam[test-coverage-info ht hasheq?]{
-  The hash-table in this parameter is used to store the profile results.
-}
-
-@; ------------------------------------------------------
-
-@subsection[#:tag "other-errortrace-bindings"]{Other Errortrace Bindings}
-
-The @racketmodname[errortrace] module also exports:
-
-@defproc[(print-error-trace [output-port output-port?] [exn exn?]) void?]{
-
-The @racket[print-error-trace] procedure takes a port and exception and
-prints the Errortrace-collected debugging information contained in the
-exception. It is used by the exception handler installed by
-Errortrace.}
-  
-@defparam[error-context-display-depth d integer?]{The 
-@racket[error-context-display-depth] parameter controls how much context
-Errortrace's exception handler displays. The default value is 10,000.}
-
-
-@; ------------------------------------------------------
-
-@section[#:tag "errortrace-library"]{Errortrace Library}
-
-@defmodule[errortrace/errortrace-lib]{
-
-The @racketmodname[errortrace/errortrace-lib] module exports all of the
-exports of @racketmodname[errortrace], plus a few more. It does
-not install any handlers.}
-
-The additional exports are as follows:
-
-@defproc[(errortrace-compile-handler (stx any/c) (immediate-eval? any/c))
-         compiled-expression?]{
-
-Compiles @racket[stx] using the compilation handler that was active
-when the @racketmodname[errortrace/errortrace-lib] module was
-executed, but first instruments the code for Errortrace information.
-The code is instrumented only if
-@racketblock[(list (namespace-module-registry (current-namespace))
-                   (namespace-base-phase (current-namespace)))]
-is the same as when the
-@racketmodname[errortrace/errortrace-lib] module was executed. This
-procedure is suitable for use as a compilation handler via
-@racket[current-compile].}
-
-@defproc[(make-errortrace-compile-handler)
-         (-> any/c any/c compiled-expression)]{
-
-Produces a compile handler that is like
-@racket[errortrace-compile-handler], except that the code that
-it produces is instrumented if the value of
-@racketblock[(namespace-module-registry (current-namespace))]
-is the same as when the original thunk is invoked.
-
-In addition, when the thunk is invoked, it uses
-@racket[namespace-attach-module] to attach the
-@racketmodname[errortrace/errortrace-key] module and the
-@racketmodname['#%kernel] module to the @racket[current-namespace].
-}
-
-@defproc[(errortrace-error-display-handler (string string?) (exn exn?)) void?]{
-
-Displays information about the exception; this procedure is suitable
-for use as an error display handler.}
-
-@defproc[(errortrace-annotate (stx any/c)) any/c]{
-
-Macro-expands and instruments the given top-level form. If the form is
-a module named @racketidfont{errortrace-key}, no instrumentation is
-applied. This annotation function is used by
-@racket[errortrace-compile-handler].}
-
-@defproc[(annotate-top [stx any/c][phase-level exact-integer?]) any/c]{
-
-Like @racket[errortrace-annotate], but given an explicit phase level
-for @racket[stx]; @racket[(namespace-base-phase)] is typically the
-right value for the @racket[phase-level] argument.
-
-Unlike @racket[errortrace-annotate], there no special case for
-a module named @racket[errortrace-key]. Also, if @racket[stx] is a module
-declaration, it is not enriched with imports to explicitly load
-Errortrace run-time support.}
-
-@; -----------------------------------------------
-
-@section[#:tag "stacktrace"]{Re-using Errortrace Stack Tracing}
-
-@(define-syntax-rule (racketin id) (sigelem stacktrace-imports^ id))
-@(define-syntax-rule (racketout id) (sigelem stacktrace^ id))
-
-@defmodule[errortrace/stacktrace]{
-The errortrace collection also includes a
-@racketmodname[errortrace/stacktrace] library. It exports
-the @racket[stacktrace@] unit, its import signature
-@racket[stacktrace-imports^], and its export signature
-@racket[stacktrace^].}
-
-@defthing[stacktrace@ unit?]{
-
-Imports @racket[stacktrace-imports^] and exports @racket[stacktrace^].}
-
-
-@defsignature[stacktrace^ ()]{
-
-@deftogether[(
-  @defproc[(annotate (stx syntax?) (phase-level exact-nonnegative-integer?)) syntax?]
-  @defproc[(annotate-top (stx syntax?) (phase-level exact-nonnegative-integer?)) syntax?])]{
-
-Annotate expressions with errortrace information. The
-@racketout[annotate-top] function should be called with a top-level
-expression, and @racketout[annotate] should be called with a nested
-expression (e.g., by @racketin[initialize-profile-point]).  The
-@racket[phase-level] argument indicates the phase level of the
-expression, typically @racket[(namespace-base-phase)] for a top-level
-expression.}
-
-@deftogether[(
-  @defproc[(make-st-mark [stx syntax?] [phase-level exact-nonnegative-integer?]) (or/c #f st-mark?)]
-  @defproc[(st-mark-source (st-mark st-mark?)) syntax?]
-  @defproc[(st-mark-bindings (st-mark st-mark?)) list?])]{
-
-The @racketout[st-mark-source] and @racketout[st-mark-bindings]
-functions extract information from a particular kind of value.
-The value must be created by @racketout[make-st-mark]
-(the shape of the value is guaranteed to be writable and not to be @racket[#f], but otherwise unspecified). 
-The @racket[make-st-mark] function returns @racket[#f] when there is
-no source location information in the syntax object.
-The @racketout[st-mark-source] extracts the value originally provided to
-the expression-maker, and @racketout[st-mark-bindings] returns local
-binding information (if available) as a list of two element (syntax?
-any/c) lists. The @racketout[st-mark-bindings] function is currently
-hardwired to return @racket[null]. }
-
-}
-
-@defsignature[stacktrace-imports^ ()]{
-
-@defproc[(with-mark [source-stx any/c]
-                    [dest-stx any/c]
-                    [phase nonnegative-exact-integer?]) 
-         any/c]{
-
-Called by @racketout[annotate] and @racketout[annotate-top] to wrap
-expressions with @racket[with-continuation-mark]. The first argument
-is the source expression, the second argument is the expression to
-be wrapped, and the last is the phase level of the expression.}
-
-@defboolparam[test-coverage-enabled on?]{
-
-Determines if the test coverage annotation is inserted into the code.
-This parameter controls how compilation happens---it does not affect the
-dynamic behavior of the already compiled code. If the parameter is set,
-code generated by @racketin[test-covered] are inserted into the code (and
-@racketin[initialize-test-coverage-point] is called during compilation).
-If not, no calls to @racket[test-covered] code are inserted.}
-
-@defproc[(test-covered (stx any/c)) (or/c syntax? (-> void?) #f)]{
-This is called during compilation of the program with an expression for
-each point in the program that was passed to
-@racketin[initialize-test-coverage-point].
-
-If the result is @racket[#f], this program point is not instrumented. If
-the result is syntax, it is inserted into the code, and if it is a
-thunk, the thunk is inserted into the code in an application (using the
-thunk directly, as a 3D value). In either case, the syntax or the thunk
-should register that the relevant point was covered.
-
-Note: using a thunk tends to be slow.  Current uses in the Racket code
-will create a mutable pair in @racket[initialize-test-coverage-point],
-and @racket[test-covered] returns syntax that will set its mcar.  (This
-makes the resulting overhead about 3 times smaller.)}
-
-@defproc[(initialize-test-coverage-point (stx any/c)) void?]{
-
-During compilation of the program, this function is called with each
-sub-expression of the program. The argument is the syntax of this program
-point, which is usually used as a key to identify this program point.}
-
-@defthing[profile-key any/c]{
-
-Only used for profiling paths.}
-
-@defboolparam[profiling-enabled on?]{
-
-Determines if profiling information is currently collected (affects
-the behavior of compiling the code---does not affect running code).
-If this always returns @racket[#f], the other profiling functions are
-never called.}
-
-@defproc[(initialize-profile-point (key any/c) 
-                                   (name (or/c syntax? false/c))
-                                   (stx any/c))
-         void?]{
-
-Called as the program is compiled for each profiling point that
-might be encountered during the program's execution. The first
-argument is a key identifying this code. The second argument is the
-inferred name at this point and the final argument is the syntax of
-this expression.}
-
-@defproc[(register-profile-start (key any/c)) (or/c number? false/c)]{
-
-Called when some profiled code is about to be executed. If the
-result is a number, it is expected to be the current number of
-milliseconds. @racket[key] is unique to this fragment of code---it is
-the same key passed to @racketin[initialize-profile-point] for this code
-fragment.}
-
-@defproc[(register-profile-done (key any/c)
-                                (start (or/c number? false/c)))
-                                void?]{
-
-This function is called when some profiled code is finished executing.
-
-Note that @racketin[register-profile-start] and
-@racketin[register-profile-done] can be called in a nested manner; in
-this case, the result of @racketin[register-profile-start] should be
-@racket[#f].}
-
-}
-
-@section{Errortrace Key}
-@defmodule[errortrace/errortrace-key]
-
-This module depends only on @racketmodname['#%kernel].
-
-@defthing[errortrace-key symbol?]{
-  A key used by errortrace via @racket[with-continuation-mark] to 
-  record stack information.
-}
diff --git a/pkgs/errortrace-pkgs/errortrace-doc/errortrace/scribblings/info.rkt b/pkgs/errortrace-pkgs/errortrace-doc/errortrace/scribblings/info.rkt
deleted file mode 100644
index 496d4fa6e8..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-doc/errortrace/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("errortrace.scrbl" (multi-page) (tool-library))))
diff --git a/pkgs/errortrace-pkgs/errortrace-doc/info.rkt b/pkgs/errortrace-pkgs/errortrace-doc/info.rkt
deleted file mode 100644
index 41b98324e2..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-doc/info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang info
-(define collection 'multi)
-(define build-deps '("racket-doc"
-                     "base"
-                     "errortrace-lib"
-                     "scribble-lib"))
-(define update-implies '("errortrace-lib"))
-
-(define pkg-desc "documentation part of \"errortrace\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/errortrace-pkgs/errortrace-lib/LICENSE.txt b/pkgs/errortrace-pkgs/errortrace-lib/LICENSE.txt
deleted file mode 100644
index db356f5bb5..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-errortrace-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/errortrace-key.rkt b/pkgs/errortrace-pkgs/errortrace-lib/errortrace/errortrace-key.rkt
deleted file mode 100644
index 24880de01a..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/errortrace-key.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-(module errortrace-key '#%kernel
-
-  ;; this file is badly named; it contains
-  ;; all of the code used at runtime by the
-  ;; various annotations inserted by this 
-  ;; library.
-  
-  ;; Defining `errortrace-key' as a function is a performance hack:
-  ;; the compiler can track function constants, and in particular the
-  ;; fact that it's not an impersonated/chaperoned mark key, so that a
-  ;; `with-continuation-mark' using this key can be dropped if the
-  ;; body expression is simple.
-  (define-values (errortrace-key) (lambda () 'anything))
-  
-  (define-values (test-coverage-info) 
-    (make-parameter
-     (make-hash)
-     (λ (x) 
-       (if (hash? x)
-           (void)
-           (error 'test-coverage-info "expected a hash, got ~e" x))
-       x)))
-  
-  (define-values (test-covered)
-    (lambda (key)
-      (hash-set! (test-coverage-info) key #t)))
-
-  (define-values (init-test-coverage)
-    (lambda (l)
-      (hash-set! (test-coverage-info) 'base l)))
-    
-  (#%provide errortrace-key
-             init-test-coverage
-             test-covered
-             test-coverage-info))
diff --git a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/errortrace-lib.rkt b/pkgs/errortrace-pkgs/errortrace-lib/errortrace/errortrace-lib.rkt
deleted file mode 100644
index 78c826d25e..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/errortrace-lib.rkt
+++ /dev/null
@@ -1,542 +0,0 @@
-#lang racket/base
-
-;; Poor man's stack-trace-on-exceptions/profiler.
-;; See manual for information.
-
-(require "stacktrace.rkt"
-         "errortrace-key.rkt"
-         "private/utils.rkt"
-         racket/contract/base
-         racket/unit
-         (for-template racket/base)
-         (for-syntax racket/base))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Test coverage run-time support
-(define test-coverage-enabled (make-parameter #f))
-
-(define test-coverage-state '())
-(define (initialize-test-coverage) (set! test-coverage-state '()))
-
-(define (initialize-test-coverage-point expr)
-  (when (and (syntax-position expr)
-             (syntax-span expr))
-    (set! test-coverage-state (cons (list (syntax-source expr)
-                                          (syntax-position expr)
-                                          (syntax-span expr))
-                                    test-coverage-state))))
-
-;; get-coverage : -> (values (listof (list src number number)) (listof (list src number number)))
-;; the first result is a (minimized) set of ranges for all of the code that could be executed
-;; the second result is the set of ranges that were actually executed.
-(define (get-coverage) 
-  (let* ([hash (test-coverage-info)]
-         [all (hash-ref hash 'base '())]
-         [covered '()])
-    (hash-for-each hash (lambda (x y) (unless (eq? x 'base) (set! covered (cons x covered)))))
-    (values all covered)))
-
-(define code-insp (variable-reference->module-declaration-inspector
-                   (#%variable-reference)))
-(define (disarm stx)
-  (syntax-disarm stx code-insp))
-
-(define (transform-all-modules stx proc [in-mod-id (namespace-module-identifier)])
-  (syntax-case stx ()
-    [(mod name init-import mb)
-     (syntax-case (disarm #'mb) (#%plain-module-begin)
-       [(#%plain-module-begin body ...)
-        (let ()
-          (define ((handle-top-form phase) expr)
-            (syntax-case* (disarm expr) (begin-for-syntax module module*) 
-                          (lambda (a b)
-                            (free-identifier=? a b phase 0))
-              [(begin-for-syntax body ...)
-               (syntax-rearm
-                #`(begin-for-syntax
-                   #,@(map (handle-top-form (add1 phase)) 
-                           (syntax->list #'(body ...))))
-                expr)]
-              [(module . _)
-               (transform-all-modules expr proc #f)]
-              [(module* . _)
-               (transform-all-modules expr proc #f)]
-              [else expr]))
-          (define mod-id (or in-mod-id #'mod))
-          (proc
-           (copy-props
-            stx
-            #`(#,mod-id name init-import
-                        #,(syntax-rearm
-                           #`(#%plain-module-begin
-                              . #,(map (handle-top-form 0) (syntax->list #'(body ...))))
-                           #'mb)))
-           mod-id))])]))
-    
-(define (add-test-coverage-init-code stx)
-  (transform-all-modules
-   stx
-   (lambda (stx mod-id)
-     (syntax-case stx ()
-       [(mod name init-import mb)
-        (syntax-case (disarm #'mb) (#%plain-module-begin)
-          [(#%plain-module-begin b1 body ...)
-           (copy-props
-            stx
-            #`(#,mod-id name init-import
-               #,(syntax-rearm
-                  #`(#%plain-module-begin
-                     b1 ;; the requires that were introduced earlier
-                     (#%plain-app init-test-coverage '#,(remove-duplicates test-coverage-state))
-                     body ...)
-                  #'mb)))])]))))
-
-(define (annotate-covered-file filename-path [display-string #f])
-  (annotate-file filename-path
-                 (map (λ (c) (cons (car c) (if (cdr c) 1 0))) (get-coverage))
-                 display-string))
-
-
-;; The next procedure is called by `annotate' and `annotate-top' to wrap
-;; expressions with test suite coverage information.  Returning the
-;; first argument means no tests coverage information is collected.
-
-;; test-coverage-point : syntax syntax integer -> (values syntax info)
-;; sets a test coverage point for a single expression
-(define (test-coverage-point body expr phase)
-  (if (and (test-coverage-enabled) (zero? phase))
-      (syntax-case expr ()
-        [(mod name . reste)
-         (and (identifier? #'mod)
-              (free-identifier=? #'mod 
-                                 (namespace-module-identifier)
-                                 (namespace-base-phase)))
-         ;; don't annotate module expressions
-         body]
-        [_
-         (cond
-           [(and (syntax-source expr)
-                 (number? (syntax-position expr))
-                 (number? (syntax-position expr)))
-            (initialize-test-coverage-point expr)
-            (with-syntax ([src (datum->syntax #f (syntax-source expr) (quote-syntax here))]
-                          [start-pos (syntax-position expr)]
-                          [end-pos (+ (syntax-position expr) (syntax-span expr))]
-                          [body body])
-              #'(begin (#%plain-app test-covered '(src start-pos end-pos)) body))]
-           [else
-            body])])
-      body))
-
-;; remove-duplicates : (listof X) -> (listof X)
-(define (remove-duplicates l)
-  (let ([ht (make-hash)])
-    (for-each (lambda (x) (hash-set! ht x #t)) l)
-    (sort (hash-map ht (lambda (x y) x))
-          (lambda (x y)
-            (cond
-              [(= (list-ref x 1) (list-ref y 1))
-               (< (list-ref x 2) (list-ref y 2))]
-              [else
-               (< (list-ref x 1) (list-ref y 1))])))))
-
-(define (copy-props orig new)
-  (datum->syntax orig (syntax-e new) orig orig))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Profiling run-time support
-
-(define profile-thread-cell (make-thread-cell #f))
-(define profile-key (gensym))
-
-(define thread->profile-table (make-weak-hasheq))
-
-(define profiling-enabled (make-parameter #f))
-(define profiling-record-enabled (make-parameter #t))
-(define profile-paths-enabled (make-parameter #f))
-
-(define (clear-profile-results)
-  (when (thread-cell-ref profile-thread-cell)
-    (hash-for-each
-     (thread-cell-ref profile-thread-cell)
-     (lambda (k v)
-       (set-box! (vector-ref v 0) #f)
-       (vector-set! v 1 0)
-       (vector-set! v 2 0)
-       (vector-set! v 4 null)))))
-
-(define (initialize-profile-point key name expr)
-  (unless (thread-cell-ref profile-thread-cell)
-    (let ([new-table (make-hasheq)])
-      (hash-set! thread->profile-table (current-thread) new-table)
-      (thread-cell-set! profile-thread-cell new-table)))
-  (hash-set! (thread-cell-ref profile-thread-cell)
-             key
-             (vector (box #f) 0 0 (and name (syntax-e name)) expr null)))
-
-(define (register-profile-start key)
-  (and (profiling-record-enabled)
-       (thread-cell-ref profile-thread-cell)
-       (let ([v (hash-ref (thread-cell-ref profile-thread-cell) key #f)])
-         (when v
-           (let ([b (vector-ref v 0)])
-             (vector-set! v 1 (add1 (vector-ref v 1)))
-             (when (profile-paths-enabled)
-               (let ([cms
-                      (continuation-mark-set->list
-                       (current-continuation-marks)
-                       profile-key)])
-                 (unless (hash? (vector-ref v 5))
-                   (vector-set! v 5 (make-hash)))
-                 (hash-set! (vector-ref v 5) cms 
-                            (add1 (hash-ref (vector-ref v 5) cms (lambda () 0))))))
-             (if (unbox b)
-                 #f
-                 (begin
-                   (set-box! b #t)
-                   (current-process-milliseconds))))))))
-
-(define (register-profile-done key start)
-  (when start
-    (when (thread-cell-ref profile-thread-cell)
-      (let ([v (hash-ref (thread-cell-ref profile-thread-cell) key #f)])
-        (when v
-          (let ([b (vector-ref v 0)])
-            (set-box! b #f)
-            (vector-set! v 2
-                         (+ (- (current-process-milliseconds) start)
-                            (vector-ref v 2)))))))))
-
-(define (get-profile-results [t (current-thread)])
-  (cond
-    [(hash-ref thread->profile-table t #f)
-     =>
-     (λ (profile-info)
-       (hash-map profile-info
-                 (lambda (key val)
-                   (let ([count (vector-ref val 1)]
-                         [time (vector-ref val 2)]
-                         [name (vector-ref val 3)]
-                         [expr (vector-ref val 4)]
-                         [cmss (vector-ref val 5)])
-                     (list count time name expr
-                           (if (hash? cmss)
-                               (hash-map cmss (lambda (ks v)
-                                                (cons v 
-                                                      (map (lambda (k)
-                                                             (let ([v (cdr (hash-ref profile-info k))])
-                                                               (list (vector-ref v 2)
-                                                                     (vector-ref v 3))))
-                                                           ks))))
-                               null))))))]
-    [else '()]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Stacktrace instrumenter
-
-(define base-phase
-  (variable-reference->module-base-phase (#%variable-reference)))
-
-;; with-mark : stx stx -> stx
-(define (with-mark mark expr phase)
-  (let ([loc (make-st-mark mark phase)])
-    (if loc
-        (with-syntax ([expr expr]
-                      [loc loc]
-                      [et-key (syntax-shift-phase-level #'errortrace-key (- phase base-phase))]
-                      [wcm (syntax-shift-phase-level #'with-continuation-mark (- phase base-phase))])
-          (execute-point
-           mark
-           (syntax
-            (wcm et-key
-                 loc
-                 expr))))
-        expr)))
-
-(define-values/invoke-unit/infer stacktrace@)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Execute counts
-
-(define execute-info (make-hasheq))
-
-(define execute-counts-enabled (make-parameter #f))
-
-(define (register-executed-once key)
-  (let ([i (hash-ref execute-info key)])
-    (set-mcdr! i (add1 (mcdr i)))))
-
-(define (execute-point mark expr)
-  (if (execute-counts-enabled)
-      (let ([key (gensym)])
-        (hash-set! execute-info key (mcons mark 0))
-        (with-syntax ([key (datum->syntax #f key (quote-syntax here))]
-                      [expr expr]
-                      [register-executed-once register-executed-once]);<- 3D!
-          #'(begin (register-executed-once 'key)
-                   expr)))
-      expr))
-
-(define (get-execute-counts)
-  (hash-map execute-info
-            (lambda (k v) (cons (mcar v) (mcdr v)))))
-
-(define (annotate-executed-file filename-path [display-string "^.,"])
-  (annotate-file filename-path (get-execute-counts) display-string))
-
-;; shared functionality for annotate-executed-file and annotate-covered-file
-(define (annotate-file name counts display-string)
-  (let ([name (path->complete-path name (current-directory))])
-    (let* (;; Filter relevant syntaxes
-           [here (filter (lambda (s)
-                           (and (equal? name (syntax-source (car s)))
-                                (syntax-position (car s))))
-                         counts)]
-           ;; Sort them: earlier first, wider if in same position
-           [sorted (sort here
-                         (lambda (a b)
-                           (let ([ap (syntax-position (car a))]
-                                 [bp (syntax-position (car b))])
-                             (or (< ap bp)
-                                 (and (= ap bp)
-                                      (> (syntax-span (car a))
-                                         (syntax-span (car b))))))))]
-           ;; Merge entries with the same position+span
-           [sorted (if (null? sorted)
-                       sorted ; guarantee one element for the next case
-                       (let loop ([xs (reverse sorted)] [r '()])
-                         (cond [(null? (cdr xs)) (append xs r)]
-                               [(and (= (syntax-position (caar xs))
-                                        (syntax-position (caadr xs)))
-                                     (= (syntax-span (caar xs))
-                                        (syntax-span (caadr xs))))
-                                ;; doesn't matter which syntax object is kept,
-                                ;; we only care about its position+span
-                                (loop (cons (cons (caar xs)
-                                                  (max (cdar xs) (cdadr xs)))
-                                            (cddr xs))
-                                      r)]
-                               [else (loop (cdr xs) (cons (car xs) r))])))]
-           [pic (make-string (file-size name) #\space)]
-           [display-string
-            (case display-string
-              [(#t) "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"]
-              [(#f) "#."]
-              [else display-string])]
-           [many-char (string-ref display-string
-                                  (sub1 (string-length display-string)))])
-      ;; Fill out picture
-      (for-each (lambda (s)
-                  (let ([pos (sub1 (syntax-position (car s)))]
-                        [span (syntax-span (car s))]
-                        [key (let ([k (cdr s)])
-                               (if (< k (string-length display-string))
-                                   (string-ref display-string k)
-                                   many-char))])
-                    (let loop ([p pos])
-                      (unless (= p (+ pos span))
-                        (string-set! pic p key)
-                        (loop (add1 p))))))
-                sorted)
-      ;; Write annotated file
-      (with-input-from-file name
-        (lambda ()
-          (let loop ()
-            (let ([pos (file-position (current-input-port))]
-                  [line (read-line (current-input-port) 'any)])
-              (unless (eof-object? line)
-                (printf "~a\n" line)
-                (let ([w (string-length line)])
-                  ;; Blank leading spaces in pic (copy them: works for tabs)
-                  (let loop ([i 0])
-                    (when (and (< i w)
-                               (char-whitespace? (string-ref line i)))
-                      (string-set! pic (+ pos i) (string-ref line i))
-                      (loop (add1 i))))
-                  (printf "~a\n" (substring pic pos (+ pos w))))
-                (loop)))))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Eval handler, exception handler
-
-(define instrumenting-enabled
-  (make-parameter #t))
-(define error-context-display-depth
-  (make-parameter 10000 (lambda (x) (and (integer? x) x))))
-
-;; port exn -> void
-;; effect: prints out the context surrounding the exception
-(define (print-error-trace p x)
-  (let loop ([n (error-context-display-depth)]
-             [l (map st-mark-source
-                     (continuation-mark-set->list (exn-continuation-marks x)
-                                                  errortrace-key))])
-    (cond
-      [(or (zero? n) (null? l)) (void)]
-      [(pair? l)
-       (let* ([stx (car l)]
-              [source (syntax-source stx)]
-              [file (cond
-                      [(string? source) source]
-                      [(path? source)
-                       (path->string source)]
-                      [(not source)
-                       #f]
-                      [else
-                       (format "~a" source)])]
-              [line (syntax-line stx)]
-              [col (syntax-column stx)]
-              [pos (syntax-position stx)])
-         (fprintf p "\n   ~a~a: ~.s"
-                  (or file "[unknown source]")
-                  (cond [line (format ":~a:~a" line col)]
-                        [pos (format "::~a" pos)]
-                        [else ""])
-                  (syntax->datum stx))
-         (loop (- n 1) (cdr l)))])))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Profile printer
-
-(define (output-profile-results paths? sort-time?)
-  (profiling-enabled #f)
-  (error-print-width 50)
-  (printf "Sorting profile data...\n")
-  (let* ([sel (if sort-time? cadr car)]
-         [counts (sort (filter (lambda (c) (positive? (car c)))
-                               (get-profile-results))
-                       < #:key sel)]
-         [total 0])
-    (for-each
-     (lambda (c)
-       (set! total (+ total (sel c)))
-       (printf "=========================================================\n")
-       (printf "time = ~a : no. = ~a : ~.s in ~s\n"
-               (cadr c) (car c) (caddr c) (cadddr c))
-       ;; print call paths
-       (when paths?
-         (for-each
-          (lambda (cms)
-            (unless (null? (cdr cms))
-              (printf "  ~e VIA ~e" (car cms) (caadr cms))
-              (for-each
-               (lambda (cm)
-                 (printf " <- ~e" (car cm)))
-               (cddr cms))
-              (printf "\n")))
-          (sort (cadddr (cdr c)) (lambda (a b) (> (car a) (car b)))))))
-     counts)
-    (printf "Total sample ~a: ~a\n" (if sort-time? "time" "counts") total)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define errortrace-annotate
-  (lambda (top-e)
-    (define (normal e)
-      (define expanded-e (expand-syntax e))
-      (parameterize ([original-stx e]
-                     [expanded-stx expanded-e])
-        (annotate-top expanded-e (namespace-base-phase))))
-    (syntax-case top-e ()
-      [(mod name . reste)
-       (and (identifier? #'mod)
-            (free-identifier=? #'mod 
-                               (namespace-module-identifier)
-                               (namespace-base-phase)))
-       (if (eq? (syntax-e #'name) 'errortrace-key)
-           top-e
-           (let ([expanded-e (normal top-e)])
-             (initialize-test-coverage)
-             (add-test-coverage-init-code
-              (transform-all-modules 
-               expanded-e
-               (lambda (top-e mod-id)
-                 (syntax-case top-e ()
-                   [(mod name init-import mb)
-                    (syntax-case (disarm #'mb) (#%plain-module-begin)
-                      [(#%plain-module-begin body ...)
-                       (let ([meta-depth ((count-meta-levels 0) #'(begin body ...))])
-                         (copy-props
-                          top-e
-                          #`(#,mod-id name init-import
-                                      #,(syntax-rearm
-                                         #`(#%plain-module-begin
-                                            #,(generate-key-imports meta-depth)
-                                            body ...)
-                                         #'mb))))])]))))))]
-      [_else
-       (let ([e (normal top-e)])
-         (let ([meta-depth ((count-meta-levels 0) e)])
-           #`(begin
-               #,(generate-key-imports meta-depth)
-               #,e)))])))
-
-(define-namespace-anchor orig-namespace)
-                      
-(define (make-errortrace-compile-handler)
-  (let ([orig (current-compile)]
-        [reg (namespace-module-registry (current-namespace))]
-        [phase (namespace-base-phase (current-namespace))])
-    (namespace-attach-module (namespace-anchor->namespace orig-namespace) 'racket/base)
-    (namespace-attach-module (namespace-anchor->namespace orig-namespace) 'errortrace/errortrace-key)
-    (lambda (e immediate-eval?)
-      (orig
-       (if (and (instrumenting-enabled)
-                (eq? reg
-                     (namespace-module-registry (current-namespace)))
-                (equal? phase
-                        (namespace-base-phase (current-namespace)))
-                (not (compiled-expression? (if (syntax? e)
-                                               (syntax-e e)
-                                               e))))
-           (let ([e2 (errortrace-annotate
-                      (if (syntax? e)
-                          e
-                          (namespace-syntax-introduce
-                           (datum->syntax #f e))))])
-             e2)
-           e)
-       immediate-eval?))))
-
-(define errortrace-compile-handler (make-errortrace-compile-handler))
-
-(define errortrace-error-display-handler
-  (let ([orig (error-display-handler)])
-    (lambda (msg exn)
-      (if (exn? exn)
-          (let ([p (open-output-string)])
-            (display (exn-message exn) p)
-            (display "\n  errortrace...:" p)
-            (print-error-trace p exn)
-            (orig (get-output-string p) exn))
-          (orig msg exn)))))
-
-(provide/contract
- [annotate-covered-file (->* (path-string?) ((or/c string? #t #f)) void?)]
- [annotate-executed-file (->* (path-string?) ((or/c string? #t #f)) void?)])
-(provide make-errortrace-compile-handler
-         errortrace-compile-handler
-         errortrace-error-display-handler
-         errortrace-annotate
-         
-         print-error-trace
-         error-context-display-depth
-         
-         instrumenting-enabled
-         
-         profiling-enabled
-         profiling-record-enabled
-         profile-paths-enabled
-         get-profile-results
-         output-profile-results
-         clear-profile-results
-         
-         execute-counts-enabled
-         get-execute-counts
-         
-         ;; need to rename here to avoid having to rename when the unit is invoked.
-         (rename-out [test-coverage-enabled coverage-counts-enabled])
-         get-coverage
-         test-coverage-info
-         
-         annotate-top)
diff --git a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/errortrace.rkt b/pkgs/errortrace-pkgs/errortrace-lib/errortrace/errortrace.rkt
deleted file mode 100644
index 16ef85e020..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/errortrace.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-
-;; Poor man's stack-trace-on-exceptions/profiler.
-;; See manual for information.
-
-(require "errortrace-lib.rkt")
-
-(provide print-error-trace
-         error-context-display-depth
-
-         instrumenting-enabled
-
-         profiling-enabled
-         profiling-record-enabled
-         profile-paths-enabled
-         get-profile-results
-         output-profile-results
-         clear-profile-results
-
-         execute-counts-enabled
-         get-execute-counts
-         annotate-executed-file
-
-         coverage-counts-enabled
-         get-coverage
-         test-coverage-info
-         annotate-covered-file)
-
-(current-compile errortrace-compile-handler)
-(error-display-handler errortrace-error-display-handler)
-(use-compiled-file-paths (cons (build-path "compiled" "errortrace")
-                               (use-compiled-file-paths)))
diff --git a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/lang/body.rkt b/pkgs/errortrace-pkgs/errortrace-lib/errortrace/lang/body.rkt
deleted file mode 100644
index ddb62ba1eb..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/lang/body.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     syntax/strip-context
-                     racket/pretty
-                     "../errortrace-lib.rkt"
-                     "../stacktrace.rkt"
-                     "../private/utils.rkt"))
-
-(provide (rename-out [module-begin #%module-begin]))
-
-(define-syntax (module-begin stx)
-  (syntax-case stx ()
-    [(_ lang . body)
-     (let ([e (let ([expanded-e
-                     (local-expand #`(module . #,(strip-context #`(n lang . body)))
-                                   'top-level
-                                   null)])
-                (parameterize ([original-stx stx]
-                               [expanded-stx expanded-e])
-                  (annotate-top expanded-e 0)))])
-       (collect-garbage)
-       (syntax-case e ()
-         [(mod nm lang (mb . body)) 
-          #`(#%plain-module-begin 
-             (require (only-in lang))
-             #,(generate-key-imports ((count-meta-levels 0) #'(begin . body)))
-             . body)]))]))
diff --git a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/lang/reader.rkt b/pkgs/errortrace-pkgs/errortrace-lib/errortrace/lang/reader.rkt
deleted file mode 100644
index fcb6d5704f..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/lang/reader.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-(module reader racket/base
-  (require syntax/module-reader)
-
-  (provide (rename-out [et-read read]
-                       [et-read-syntax read-syntax]
-                       [et-get-info get-info]))
-
-  (define (wrap-reader p)
-    (lambda args
-      (let ([r (apply p args)])
-        ;; Re-write module to use `errortrace':
-        (if (syntax? r)
-            (syntax-case r ()
-              [(mod name lang . body)
-               (quasisyntax/loc r
-                 (mod name errortrace/lang/body (#,(datum->syntax #f '#%module-begin) lang . body)))])
-            `(,(car r) ,(cadr r) errortrace/lang/body (#%module-begin . ,(cddr r)))))))
-
-  (define-values (et-read et-read-syntax et-get-info)
-    (make-meta-reader
-     'errortrace
-     "language path"
-     (lambda (bstr)
-       (let* ([str (bytes->string/latin-1 bstr)]
-              [sym (string->symbol str)])
-         (and (module-path? sym)
-              (vector
-               ;; try submod first:
-               `(submod ,sym reader)
-               ;; fall back to /lang/reader:
-               (string->symbol (string-append str "/lang/reader"))))))
-     wrap-reader
-     wrap-reader
-     values)))
diff --git a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/main.rkt b/pkgs/errortrace-pkgs/errortrace-lib/errortrace/main.rkt
deleted file mode 100644
index 4146da10a6..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/main.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "errortrace.rkt")
-(provide (all-from-out "errortrace.rkt"))
diff --git a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/private/utils.rkt b/pkgs/errortrace-pkgs/errortrace-lib/errortrace/private/utils.rkt
deleted file mode 100644
index 7cd6996cd0..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/private/utils.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-
-(provide count-meta-levels
-         generate-key-imports)
-
-(define base (variable-reference->module-base-phase (#%variable-reference)))
-
-(define ((count-meta-levels phase) expr)
-  (syntax-case expr ()
-    [(bfs . exprs)
-     (and (identifier? #'bfs) (free-identifier=? #'bfs #'begin-for-syntax phase base))
-     (add1 (apply max 0 (map (count-meta-levels (add1 phase)) (syntax->list #'exprs))))]
-    [(ds . _)
-     (and (identifier? #'ds) (free-identifier=? #'ds #'define-syntaxes phase base))
-     1]
-    [(b . exprs)
-     (and (identifier? #'b) (free-identifier=? #'b #'begin phase base))
-     (apply max 0 (map (count-meta-levels phase) (syntax->list #'exprs)))]
-    [_ 0]))
-
-
-(define (generate-key-imports meta-depth)
-  (syntax-shift-phase-level
-   (let loop ([meta-depth meta-depth])
-     (let ([e ((make-syntax-introducer)
-               #`(#%require (for-meta #,meta-depth
-                                      errortrace/errortrace-key)))])
-       (if (zero? meta-depth)
-           e
-           #`(begin #,e #,(loop (sub1 meta-depth))))))
-   (- (syntax-local-phase-level) base)))
diff --git a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/stacktrace.rkt b/pkgs/errortrace-pkgs/errortrace-lib/errortrace/stacktrace.rkt
deleted file mode 100644
index a3a23b4bf3..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/stacktrace.rkt
+++ /dev/null
@@ -1,662 +0,0 @@
-#lang racket/base
-(require racket/unit
-         syntax/kerncase
-         syntax/stx
-         syntax/source-syntax
-         (for-template racket/base)
-         (for-syntax racket/base)) ; for matching
-
-(define original-stx (make-parameter #f))
-(define expanded-stx (make-parameter #f))
-(define maybe-undefined (make-parameter #hasheq()))
-
-(provide stacktrace@ stacktrace^ stacktrace-imports^ original-stx expanded-stx)
-(define-signature stacktrace-imports^
-  (with-mark
-   
-   test-coverage-enabled
-   test-covered
-   initialize-test-coverage-point
-   
-   profile-key
-   profiling-enabled
-   initialize-profile-point
-   register-profile-start
-   register-profile-done))
-
-;; The intentionally-undocumented format of bindings introduced by `make-st-mark` is:
-;; (cons syntax? (cons syntax? srcloc-list))
-
-;; The first syntax object is the original annotated source expression as a (shrunken)
-;; datum.
-
-;; The second syntax object is some part of the original syntax as a (shrunken)
-;; datum, which contains the code that expanded to the annotated expression.
-
-(define-signature stacktrace^
-  (annotate-top
-   annotate
-   make-st-mark
-   st-mark-source
-   st-mark-bindings))
-
-(define base-phase
-  (variable-reference->module-base-phase (#%variable-reference)))
-
-(define-unit stacktrace@
-  (import stacktrace-imports^)
-  (export stacktrace^)
-  
-  (define (short-version v depth)
-    (cond
-      [(identifier? v) (syntax-e v)]
-      [(null? v) null]
-      [(vector? v) (if (zero? depth)
-                       #(....)
-                       (list->vector
-                        (short-version (vector->list v) (sub1 depth))))]
-      [(box? v) (if (zero? depth)
-                    #&(....)
-                    (box (short-version (unbox v) (sub1 depth))))]
-      [(pair? v)
-       (cond
-         [(zero? depth) '(....)]
-         [(memq (syntax-e (car v)) '(#%app #%top))
-          (short-version (cdr v) depth)]
-         [else
-          (cons (short-version (car v) (sub1 depth))
-                (short-version (cdr v) (sub1 depth)))])]
-      [(syntax? v) (short-version (syntax-e v) depth)]
-      [else v]))
-  
-  (define current-recover-table (make-parameter #f))
-
-  (define (make-st-mark stx phase)
-    (unless (syntax? stx)
-      (error 'make-st-mark
-             "expected syntax object as argument, got ~e" stx))
-    (cond
-      [(syntax-source stx)
-       ;; this horrible indirection is needed because the errortrace
-       ;; unit is invoked only once but annotate-top might be called
-       ;; many times with diferent values for original-stx and
-       ;; expanded-stx
-       (define recover-table (current-recover-table))
-       (define (make-new-recover)
-         (recover-source-syntax (original-stx) (expanded-stx)
-                                #:traverse-now? #t))
-       (define recover (if recover-table
-                           (hash-ref! recover-table 
-                                      (cons (original-stx) (expanded-stx))
-                                      make-new-recover)
-                           (make-new-recover)))
-       (define better-stx (and stx (recover stx)))
-       (with-syntax ([quote (syntax-shift-phase-level #'quote phase)])
-         #`(quote (#,(short-version better-stx 10)
-                   #,(syntax-source stx)
-                   #,(syntax-line stx)
-                   #,(syntax-column stx)
-                   #,(syntax-position stx)
-                   #,(syntax-span stx))))]
-      [else #f]))
-  
-  (define (st-mark-source src)
-    (and src
-         (datum->syntax #f (car src) (cdr src) #f)))
-  
-  (define (st-mark-bindings x) null)
-  
-  
-       ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; Test case coverage instrumenter
- 
-  ;; The next procedure is called by `annotate' and `annotate-top' to wrap
-  ;; expressions with test suite coverage information.  Returning the
-  ;; first argument means no tests coverage information is collected.
- 
-  ;; test-coverage-point : syntax syntax phase -> syntax
-  ;; sets a test coverage point for a single expression
-  (define (test-coverage-point body expr phase)
-    (if (and (test-coverage-enabled)
-             (zero? phase)
-             (syntax-position expr))
-      (begin (initialize-test-coverage-point expr)
-             (let ([thunk (test-covered expr)])
-               (cond [(procedure? thunk)
-                      (with-syntax ([body body] [thunk thunk])
-                        #'(begin (#%plain-app thunk) body))]
-                     [(syntax? thunk)
-                      (with-syntax ([body body] [thunk thunk])
-                        #'(begin thunk body))]
-                     [else body])))
-      body))
-
-
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; Profiling instrumenter
-  
-  ;; profile-point :
-  ;;   (syntax[list of exprs] symbol-or-#f syntax boolean
-  ;;    -> syntax[list of exprs])
-  
-  ;; This procedure is called by `annotate' and `annotate-top' to wrap
-  ;; expressions with profile collecting information.  Returning the
-  ;; first argument means no profiling information is collected.
-  
-  ;; The second argument is the point's inferred name, if any, the third
-  ;; argument is the source expression, and the fourth argument is #t for
-  ;; a transformer expression and #f for a normal expression.
-  
-  (define (profile-point bodies name expr phase)
-    (let ([key (gensym 'profile-point)])
-      (initialize-profile-point key name expr)
-      (with-syntax ([key (datum->syntax #f key (quote-syntax here))]
-                    [start (datum->syntax
-                            #f (gensym) (quote-syntax here))]
-                    [profile-key (datum->syntax
-                                  #f profile-key (quote-syntax here))]
-                    [register-profile-start register-profile-start]
-                    [register-profile-done register-profile-done]
-                    [app (syntax-shift-phase-level #'#%plain-app (- phase base-phase))]
-                    [lt (syntax-shift-phase-level #'let (- phase base-phase))]
-                    [qt (syntax-shift-phase-level #'quote (- phase base-phase))]
-                    [bgn (syntax-shift-phase-level #'begin (- phase base-phase))]
-                    [wcm (syntax-shift-phase-level #'with-continuation-mark (- phase base-phase))])
-        (with-syntax ([rest
-                       (insert-at-tail*
-                        (syntax (app (qt register-profile-done) (qt key) start))
-                        bodies
-                        phase)])
-          (syntax
-           (lt ([start (app (qt register-profile-start) (qt key))])
-             (wcm 
-              (qt profile-key)
-              (qt key)
-              (bgn . rest))))))))
-  
-  (define (insert-at-tail* e exprs phase)
-    (let ([new
-           (rebuild exprs
-                    (let loop ([exprs exprs])
-                      (if (stx-null? (stx-cdr exprs))
-                          (list (cons (stx-car exprs)
-                                      (insert-at-tail
-                                       e (stx-car exprs) phase)))
-                          (loop (stx-cdr exprs)))))])
-      (if (syntax? exprs)
-          (rearm exprs new)
-          new)))
-  
-  (define (insert-at-tail se sexpr phase)
-    (with-syntax ([expr sexpr]
-                  [e se]
-                  [bgn (syntax-shift-phase-level #'begin (- phase base-phase))]
-                  [bgn0 (syntax-shift-phase-level #'begin0 (- phase base-phase))])
-      (kernel-syntax-case/phase sexpr phase
-        ;; negligible time to eval
-        [id
-         (identifier? sexpr)
-         (syntax (bgn e expr))]
-        [(quote _) (syntax (bgn e expr))]
-        [(quote-syntax _) (syntax (bgn e expr))]
-        [(#%top . d) (syntax (bgn e expr))]
-        [(#%variable-reference . d) (syntax (bgn e expr))]
-        
-        ;; No tail effect, and we want to account for the time
-        [(#%plain-lambda . _) (syntax (bgn0 expr e))]
-        [(case-lambda . _) (syntax (bgn0 expr e))]
-        [(set! . _) (syntax (bgn0 expr e))]
-        
-        [(let-values bindings . body)
-         (insert-at-tail* se sexpr phase)]
-        [(letrec-values bindings . body)
-         (insert-at-tail* se sexpr phase)]
-        [(letrec-syntaxes+values sbindings bindings . body)
-         (insert-at-tail* se sexpr phase)]
-        
-        [(begin . _)
-         (insert-at-tail* se sexpr phase)]
-        [(with-continuation-mark . _)
-         (insert-at-tail* se sexpr phase)]
-        
-        [(begin0 body ...)
-         (rearm sexpr (syntax (bgn0 body ... e)))]
-        
-        [(if test then else)
-         ;; WARNING: se inserted twice!
-         (rearm
-          sexpr
-          (rebuild
-           sexpr
-           (list
-            (cons #'then (insert-at-tail se (syntax then) phase))
-            (cons #'else (insert-at-tail se (syntax else) phase)))))]
-        
-        [(#%plain-app . rest)
-         (if (stx-null? (syntax rest))
-             ;; null constant
-             (syntax (bgn e expr))
-             ;; application; exploit guaranteed left-to-right evaluation
-             (insert-at-tail* se sexpr phase))]
-        
-        [_else
-         (error 'errortrace
-                "unrecognized (non-top-level) expression form: ~.s"
-                (syntax->datum sexpr))])))
-  
-  (define (profile-annotate-lambda name expr clause bodys-stx phase)
-    (let* ([bodys (stx->list bodys-stx)]
-           [bodyl (map (lambda (e) (no-cache-annotate e phase))
-                       bodys)])
-      (rebuild clause
-               (if (profiling-enabled)
-                   (let ([prof-expr
-                          (profile-point bodyl name expr phase)])
-                     ;; Tell rebuild to replace first expressions with
-                     ;; (void), and replace the last expression with
-                     ;; prof-expr:
-                     (let loop ([bodys bodys])
-                       (if (null? (cdr bodys))
-                           (list (cons (car bodys) prof-expr))
-                           (cons (cons (car bodys) #'(#%plain-app void))
-                                 (loop (cdr bodys))))))
-                   ;; Map 1-to-1:
-                   (map cons bodys bodyl)))))
-  
-  (define (keep-lambda-properties orig new)
-    (let ([p (syntax-property orig 'method-arity-error)]
-          [p2 (syntax-property orig 'inferred-name)])
-      (let ([new (if p
-                   (syntax-property new 'method-arity-error p)
-                   new)])
-        (if p2
-            (syntax-property new 'inferred-name p2)
-            new))))
-  
-  (define (annotate-let expr phase varss-stx rhss-stx bodys-stx letrec?)
-    (let ([varss (syntax->list varss-stx)]
-          [rhss  (syntax->list rhss-stx)]
-          [bodys (syntax->list bodys-stx)])
-      (parameterize ([maybe-undefined (if (and letrec?
-                                               (not (andmap (simple-rhs? phase) rhss)))
-                                          (add-identifiers
-                                           (apply append (map syntax->list varss))
-                                           (maybe-undefined))
-                                          (maybe-undefined))])
-        (let ([rhsl (map
-                     (lambda (vars rhs)
-                       (no-cache-annotate-named
-                        (syntax-case vars () [(id) (syntax id)] [_else #f])
-                        rhs
-                        phase))
-                     varss
-                     rhss)]
-              [bodyl (map (lambda (body) (no-cache-annotate body phase))
-                          bodys)])
-          (rebuild expr (append (map cons bodys bodyl)
-                                (map cons rhss rhsl)))))))
-
-  (define ((simple-rhs? phase) expr)
-    (kernel-syntax-case/phase expr phase
-      [(quote _) #t]
-      [(quote-syntax _) #t]
-      [(#%plain-lambda . _) #t]
-      [(case-lambda . _) #t]
-      [_else #f]))
-
-  (define (add-identifiers ids ht)
-    (for/fold ([ht ht]) ([id (in-list ids)])
-      (define l (hash-ref ht (syntax-e id) null))
-      (hash-set ht (syntax-e id) (cons id l))))
-
-  (define (maybe-undefined? id phase)
-    (define l (hash-ref (maybe-undefined) (syntax-e id) null))
-    (for/or ([mu-id (in-list l)])
-      (free-identifier=? mu-id id phase)))
-  
-  (define (annotate-seq expr bodys-stx annotate phase)
-    (let* ([bodys (syntax->list bodys-stx)]
-           [bodyl (map (lambda (b) (annotate b phase)) bodys)])
-      (rebuild expr (map cons bodys bodyl))))
-  
-  (define orig-inspector (variable-reference->module-declaration-inspector
-                          (#%variable-reference)))
-  
-  (define (rearm orig new)
-    (syntax-rearm new orig))
-  
-  (define (disarm orig)
-    (syntax-disarm orig orig-inspector))
-  
-  (define (rebuild expr replacements)
-    (let loop ([expr expr] [same-k (lambda () expr)] [diff-k (lambda (x) x)])
-      (let ([a (assq expr replacements)])
-        (cond
-          [a (diff-k (cdr a))]
-          [(pair? expr)
-           (loop (car expr)
-                 (lambda ()
-                   (loop (cdr expr) same-k
-                         (lambda (y) (diff-k (cons (car expr) y)))))
-                 (lambda (x)
-                   (loop (cdr expr)
-                         (lambda () (diff-k (cons x (cdr expr))))
-                         (lambda (y) (diff-k (cons x y))))))]
-          [(vector? expr)
-           (loop (vector->list expr) same-k
-                 (lambda (x) (diff-k (list->vector x))))]
-          [(box? expr)
-           (loop (unbox expr) same-k (lambda (x) (diff-k (box x))))]
-          [(syntax? expr)
-           (if (identifier? expr)
-             (same-k)
-             (loop (syntax-e expr) same-k
-                   (lambda (x) (diff-k (datum->syntax expr x expr expr)))))]
-          [else (same-k)]))))
-  
-  (define (append-rebuild expr end)
-    (cond
-      [(syntax? expr)
-       (datum->syntax expr
-                      (append-rebuild (syntax-e expr) end)
-                      expr
-                      expr)]
-      [(pair? expr)
-       (cons (car expr) (append-rebuild (cdr expr) end))]
-      [(null? expr)
-       (list end)]
-      [else
-       (error 'append-rebuild "shouldn't get here")]))
-  
-  (define (one-name names-stx)
-    (let ([l (syntax->list names-stx)])
-      (and (pair? l)
-           (null? (cdr l))
-           (car l))))
-  
-  (define (make-annotate top? name)
-    (lambda (expr phase)
-      (define disarmed-expr (disarm expr))
-      (define (with-mrk* mark expr)
-        (with-mark mark expr phase))
-      (test-coverage-point
-       (kernel-syntax-case/phase disarmed-expr phase
-         [_
-          (identifier? expr)
-          (let ([b (identifier-binding expr phase)])
-            (cond
-             [(eq? 'lexical b)
-              ;; lexical variable; a use-before-defined error is possible
-              ;; for letrec-bound variables
-              (if (maybe-undefined? expr phase)
-                  (with-mrk* expr expr)
-                  expr)]
-             [(and (pair? b) (let-values ([(base rel) (module-path-index-split (car b))])
-                               (or base rel)))
-              ;; from another module -- no error possible
-              expr]
-             [else
-              ;; might be undefined/uninitialized
-              (with-mrk* expr expr)]))]
-         
-         [(#%top . id)
-          ;; might be undefined/uninitialized
-          (with-mrk* expr expr)]
-         [(#%variable-reference . _)
-          ;; no error possible
-          expr]
-         
-         [(define-values names rhs)
-          top?
-          ;; Can't put annotation on the outside
-          (let* ([marked 
-                  (with-mrk* expr
-                             (no-cache-annotate-named
-                              (one-name #'names)
-                              (syntax rhs)
-                              phase))]
-                 [with-coverage
-                  (let loop ([stx #'names]
-                             [obj marked])
-                    (cond
-                     [(not (syntax? stx)) obj]
-                     [(identifier? stx)
-                      (test-coverage-point obj stx phase)]
-                     [(pair? (syntax-e stx))
-                      (loop (car (syntax-e stx))
-                            (loop (cdr (syntax-e stx))
-                                  obj))]
-                     [else obj]))])
-            (rearm
-             expr
-             (rebuild 
-              disarmed-expr 
-              (list (cons #'rhs with-coverage)))))]
-         [(begin . exprs)
-          top?
-          (rearm
-           expr
-           (annotate-seq disarmed-expr
-                         (syntax exprs)
-                         no-cache-annotate-top phase))]
-         [(define-syntaxes (name ...) rhs)
-          top?
-          (let ([marked (with-mark expr
-                                   (no-cache-annotate-named
-                                    (one-name #'(name ...))
-                                    (syntax rhs)
-                                    (add1 phase))
-                                   (add1 phase))])
-            (rearm
-             expr
-             (rebuild disarmed-expr (list (cons #'rhs marked)))))]
-         
-         [(begin-for-syntax . exprs)
-          top?
-          (rearm
-           expr
-           (annotate-seq disarmed-expr
-                         (syntax exprs)
-                         no-cache-annotate-top 
-                         (add1 phase)))]
-
-         [(module name init-import mb)
-          (annotate-module expr disarmed-expr)]
-         [(module* name init-import mb)
-          (annotate-module expr disarmed-expr)]
-         
-         [(#%expression e)
-          (rearm expr #`(#%expression #,(no-cache-annotate (syntax e) phase)))]
-         
-         ;; No way to wrap
-         [(#%require i ...) expr]
-         ;; No error possible (and no way to wrap)
-         [(#%provide i ...) expr]
-         [(#%declare i ...) expr]
-         
-         ;; No error possible
-         [(quote _)
-          expr]
-         [(quote-syntax _)
-          expr]
-         
-         ;; Wrap body, also a profile point
-         [(#%plain-lambda args . body)
-          (rearm
-           expr
-           (keep-lambda-properties
-            expr
-            (profile-annotate-lambda name expr disarmed-expr (syntax body)
-                                     phase)))]
-         [(case-lambda clause ...)
-          (with-syntax ([([args . body] ...)
-                         (syntax (clause ...))])
-            (let* ([clauses (syntax->list (syntax (clause ...)))]
-                   [clausel (map
-                             (lambda (body clause)
-                               (profile-annotate-lambda
-                                name expr clause body phase))
-                             (syntax->list (syntax (body ...)))
-                             clauses)])
-              (rearm
-               expr
-               (keep-lambda-properties
-                expr
-                (rebuild disarmed-expr (map cons clauses clausel))))))]
-         
-         ;; Wrap RHSs and body
-         [(let-values ([vars rhs] ...) . body)
-          (with-mrk* expr
-                     (rearm
-                      expr
-                      (annotate-let disarmed-expr phase
-                                    (syntax (vars ...))
-                                    (syntax (rhs ...))
-                                    (syntax body)
-                                    #f)))]
-         [(letrec-values ([vars rhs] ...) . body)
-          (let ([fm (rearm
-                     expr
-                     (annotate-let disarmed-expr phase
-                                   (syntax (vars ...))
-                                   (syntax (rhs ...))
-                                   (syntax body)
-                                   #t))])
-            (kernel-syntax-case/phase expr phase
-              [(lv ([(var1) (#%plain-lambda . _)]) var2)
-               (and (identifier? #'var2)
-                    (free-identifier=? #'var1 #'var2))
-               fm]
-              [_
-               (with-mrk* expr fm)]))]
-         ;; This case is needed for `#lang errortrace ...', which uses
-         ;; `local-expand' on the module body.
-         [(letrec-syntaxes+values sbindings ([vars rhs] ...) . body)
-          (let ([fm (rearm
-                     expr
-                     (annotate-let disarmed-expr phase
-                                   (syntax (vars ...))
-                                   (syntax (rhs ...))
-                                   (syntax body)
-                                   #t))])
-            (with-mrk* expr fm))]
-
-         ;; Wrap RHS
-         [(set! var rhs)
-          (let ([new-rhs (no-cache-annotate-named
-                          (syntax var)
-                          (syntax rhs)
-                          phase)])
-            ;; set! might fail on undefined variable, or too many values:
-            (with-mrk* expr
-                       (rearm
-                        expr
-                        (rebuild disarmed-expr (list (cons #'rhs new-rhs))))))]
-         
-         ;; Wrap subexpressions only
-         [(begin e)
-          ;; Single expression: no mark
-          (rearm
-           expr
-           #`(begin #,(no-cache-annotate (syntax e) phase)))]
-         [(begin . body)
-          (with-mrk* expr
-                     (rearm
-                      expr
-                      (annotate-seq disarmed-expr #'body no-cache-annotate phase)))]
-         [(begin0 . body)
-          (with-mrk* expr
-                     (rearm
-                      expr
-                      (annotate-seq disarmed-expr #'body no-cache-annotate phase)))]
-         [(if tst thn els)
-          (let ([w-tst (no-cache-annotate (syntax tst) phase)]
-                [w-thn (no-cache-annotate (syntax thn) phase)]
-                [w-els (no-cache-annotate (syntax els) phase)])
-            (with-mrk* expr
-                       (rearm
-                        expr
-                        (rebuild disarmed-expr (list (cons #'tst w-tst)
-                                                     (cons #'thn w-thn)
-                                                     (cons #'els w-els))))))]
-         [(with-continuation-mark . body)
-          (with-mrk* expr
-                     (rearm
-                      expr
-                      (annotate-seq disarmed-expr (syntax body)
-                                    no-cache-annotate phase)))]
-         
-         ;; Wrap whole application, plus subexpressions
-         [(#%plain-app . body)
-          (cond
-           [(stx-null? (syntax body))
-            ;; It's a null:
-            expr]
-           ;; check for functions that are known to always succeed,
-           ;; in which case we can skip the wrapper:
-           [(syntax-case* expr (void cons mcons list list* vector box
-                                     vector-immutable)
-                          (lambda (a b)
-                            (free-identifier=? a b phase base-phase))
-              [(_ void . _) #t]
-              [(_ cons _ _) #t]
-              [(_ mcons _ _) #t]
-              [(_ list . _) #t]
-              [(_ list* _ . _) #t]
-              [(_ vector . _) #t]
-              [(_ vector-immutable . _) #t]
-              [(_ box _) #t]
-              [_else #f])
-            (rearm
-             expr
-             (annotate-seq disarmed-expr (syntax body)
-                           no-cache-annotate phase))]
-           ;; general case:
-           [else
-            (with-mrk* expr (rearm
-                             expr
-                             (annotate-seq disarmed-expr (syntax body)
-                                           no-cache-annotate phase)))])]
-         
-         [_else
-          (error 'errortrace "unrecognized expression form~a: ~.s"
-                 (if top? " at top-level" "")
-                 (syntax->datum expr))])
-       expr
-       phase)))
-
-  (define (annotate-module expr disarmed-expr)
-    (syntax-case disarmed-expr ()
-      [(mod name init-import mb)
-       (syntax-case (disarm #'mb) ()
-         [(__plain-module-begin body ...)
-          ;; Just wrap body expressions
-          (let ([bodys (syntax->list (syntax (body ...)))])
-            (let ([bodyl (map (lambda (b)
-                                (no-cache-annotate-top b 0))
-                              bodys)]
-                  [mb #'mb])
-              (rearm
-               expr
-               (rebuild
-                disarmed-expr
-                (list (cons
-                       mb
-                       (rearm
-                        mb
-                        (rebuild mb (map cons bodys bodyl)))))))))])]))
-  
-  (define no-cache-annotate (make-annotate #f #f))
-  (define (annotate expr phase)
-    (parameterize ([current-recover-table (make-hash)])
-      (no-cache-annotate expr phase)))
-  (define no-cache-annotate-top (make-annotate #t #f))
-  (define (annotate-top expr phase)
-    (parameterize ([current-recover-table (make-hash)])
-      (no-cache-annotate-top expr phase)))
-  (define (no-cache-annotate-named name expr phase)
-    ((make-annotate #t name) expr phase))
-  (define (annotate-named name expr phase)
-    (parameterize ([current-recover-table (make-hash)])
-      (no-cache-annotate-named name expr phase))))
diff --git a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/zo-compile.rkt b/pkgs/errortrace-pkgs/errortrace-lib/errortrace/zo-compile.rkt
deleted file mode 100644
index d654336d24..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-lib/errortrace/zo-compile.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-(module zo-compile racket/base
-  (require "errortrace-lib.rkt")
-  
-  (provide zo-compile)
-
-  (define zo-compile
-    (let ([orig (current-compile)])
-      (lambda (stx immediate-eval?)
-	(if (null? (use-compiled-file-paths))
-	    (orig stx immediate-eval?)
-	    (orig (errortrace-annotate stx) immediate-eval?))))))
diff --git a/pkgs/errortrace-pkgs/errortrace-lib/info.rkt b/pkgs/errortrace-pkgs/errortrace-lib/info.rkt
deleted file mode 100644
index 65f412fe32..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-lib/info.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang info
-(define collection 'multi)
-(define deps '("base" "source-syntax"))
-
-(define pkg-desc "implementation (no documentation) part of \"errortrace\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/errortrace-pkgs/errortrace-test/LICENSE.txt b/pkgs/errortrace-pkgs/errortrace-test/LICENSE.txt
deleted file mode 100644
index 8afaa9ac72..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-errortrace-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/errortrace-pkgs/errortrace-test/info.rkt b/pkgs/errortrace-pkgs/errortrace-test/info.rkt
deleted file mode 100644
index c23cec46b7..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-test/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '())
-(define build-deps '("base"
-                     "compiler-lib"))
-
-(define pkg-desc "tests for \"errortrace\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/alert.rkt b/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/alert.rkt
deleted file mode 100644
index 444df0e1e0..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/alert.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester (for-syntax racket/base))
-
-;; All current uses of the errortrace collection (there are currently 4:
-;; in the sandbox, drracket, and in htdp and deinprogramm) rely on
-;; making "self-modifying" code by using a single mpair in source code.
-;; This is a fragile hole, and it might be plugged at some point in the
-;; future.  (Another alternative is to inject a closure as a value into
-;; the syntax, which is similarly hackish.)  The purpose of this test is
-;; to fail when that happens, so we remember to deal with it in these
-;; uses.  A convenient commit to refer to is 2189957 -- it touches all
-;; four places.  (BTW, note that this file cannot be compiled because of
-;; this.)
-
-(define-syntax m
-  (let ([b (mcons 0 0)])
-    (lambda (stx)
-      (with-syntax ([b b])
-        #'(lambda () (set-mcar! b (add1 (mcar b))) (mcar b))))))
-
-(provide alert-tests)
-(define (alert-tests)
-  (define f m)
-  (test (list (f) (f) (f)) => '(1 2 3)))
diff --git a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/begin.rkt b/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/begin.rkt
deleted file mode 100644
index c4e282fb1d..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/begin.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(provide begin-for-syntax-tests)
-
-(define (begin-for-syntax-tests)
-  (define ns (make-base-namespace))
-  (parameterize ([current-namespace ns])
-    (dynamic-require 'errortrace #f)
-    (eval '(module m racket/base 
-             (require (for-syntax racket/base))
-             (begin-for-syntax 1 2)))))
-
-(module+ main
-  (begin-for-syntax-tests))
diff --git a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/info.rkt b/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/info.rkt
deleted file mode 100644
index 549d022b66..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("alert.rkt" "main.rkt"))
-
-(define test-responsibles '(("alert.rkt" eli)))
diff --git a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/main.rkt b/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/main.rkt
deleted file mode 100644
index 748c841201..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/main.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester 
-         "wrap.rkt" 
-         "alert.rkt"
-         "phase-1.rkt"
-         "phase-1-eval.rkt"
-         "begin.rkt")
-
-(module test racket/base
-  (displayln "run as program for tests"))
-
-(wrap-tests)
-
-(test do (alert-tests))
-
-(phase-1-tests)
-(phase-1-eval-tests)
-(begin-for-syntax-tests)
diff --git a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/phase-1-eval.rkt b/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/phase-1-eval.rkt
deleted file mode 100644
index 1c47afe0c3..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/phase-1-eval.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-
-(provide phase-1-eval-tests)
-
-;; Check that eval at phase 1 doesn't use errortrace.
-(define (phase-1-eval-tests)
-  (define ns (make-base-namespace))
-  (parameterize ([current-namespace ns])
-    (namespace-require '(for-syntax (only racket/base + eval quote #%app #%datum)))
-    (dynamic-require 'errortrace #f)
-    (eval '(begin-for-syntax (eval '(+ 1 2))))))
-
diff --git a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/phase-1.rkt b/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/phase-1.rkt
deleted file mode 100644
index fb4571a92d..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/phase-1.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(provide phase-1-tests)
-
-;; Check that phase-1 annotations work, even in a namespace that is
-;; otherwise empty at phase 1.
-(define (phase-1-tests)
-  (define ns (make-base-namespace))
-  (parameterize ([current-namespace ns])
-    (dynamic-require 'errortrace #f)
-    (eval #'(struct a (x)))))
diff --git a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/phase-2-profile.rkt b/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/phase-2-profile.rkt
deleted file mode 100644
index 976a277244..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/phase-2-profile.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-
-(provide phase-2-profile-tests)
-
-(define (phase-2-profile-tests)
-  (define ns (make-base-namespace))
-  (parameterize ([current-namespace ns])
-    (dynamic-require 'errortrace #f)
-    ((dynamic-require 'errortrace 'profiling-enabled) #t)
-    (eval
-     '(module m racket/base
-        (require (for-syntax racket/base))
-        (begin-for-syntax
-         (require (for-syntax racket/base))
-         (define-syntax (a stx)
-           (syntax-case stx () 
-             [(_) #'123])))))))
-
-(phase-2-profile-tests)
diff --git a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/simple.rkt b/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/simple.rkt
deleted file mode 100644
index ef819f62d3..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/simple.rkt
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang racket/base
-(require syntax/datum
-         compiler/zo-parse
-         compiler/decompile)
-
-;; Check some transformations directly. We check by compiling, which
-;; means that we can check that cerain optimizations still apply, but
-;; beware of the extra layer.
-
-(define et-ns (make-base-namespace))
-(parameterize ([current-namespace et-ns])
-  (dynamic-require 'errortrace #f))
-
-(define plain-ns (make-base-namespace))
-
-(define (do-expand s wrap ns)
-  (parameterize ([current-namespace ns])
-    (define o (open-output-bytes))
-    (write (compile (wrap s)) o)
-    (decompile (zo-parse (open-input-bytes (get-output-bytes o))))))
-
-(define orig (read-syntax 'orig (open-input-string "x")))
-(define (to-original d)
-  (namespace-syntax-introduce (datum->syntax #f d orig orig)))
-
-(define (normalize d)
-  (datum-case d (with-continuation-mark)
-    [(with-continuation-mark _ _ expr) `(with-continuation-mark 
-                                            ?
-                                            ?
-                                          ,(normalize (datum expr)))]
-    [(a ...) (map normalize (datum (a ...)))]
-    [else d]))
-
-;; Check that `et' with annotations is like `plain', modulo
-;; actual `wcm' keys and value expression. If `alt' is supplied,
-;; make sure that it is *different* than `et'.
-(define (check et plain [alt #f])
-  (define et-exp (datum-case (do-expand et to-original et-ns) (begin)
-                   [(begin (begin _ expr)) (normalize (datum expr))]))
-  (define plain-exp (datum-case (do-expand plain values plain-ns) (begin)
-                      [(begin expr) (normalize (datum expr))]))
-  (define alt-exp (datum-case (do-expand alt values plain-ns) (begin)
-                    [(begin expr) (normalize (datum expr))]))
-  (unless (equal? et-exp plain-exp)
-    (error 'errortrace-test "failed: ~s versus ~s" et-exp plain-exp))
-  (when alt
-    (when (equal? et-exp alt-exp)
-      (error 'errortrace-test "failed (shouldn't match): ~s versus ~s" et-exp plain-exp))))
-
-;; Check that known functions like `void' are not wrapped
-;; when applied to the right number of arguments, but other
-;; functions are:
-(check '(void)
-       '(void))
-(check '(void 1 2 3)
-       '(void 1 2 3))
-(check '(void free)
-       '(void (with-continuation-mark ? ? free)))
-(check '(cons)
-       '(with-continuation-mark ? ? (cons))
-       '(cons))
-(check '(cons 1 2)
-       '(cons 1 2))
-(check '(list)
-       '(list))
-(check '(list*)
-       '(with-continuation-mark ? ? (list*)))
-(check '(car (list))
-       '(with-continuation-mark ? ? (car (list)))
-       '(car (list)))
-
-;; Wrappers in these cases shouldn't get in the way of optimizations:
-(check '(+ 1 3)
-       '4)
-(check '(car (list 1))
-       '1)
diff --git a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/wrap.rkt b/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/wrap.rkt
deleted file mode 100644
index f15150136f..0000000000
--- a/pkgs/errortrace-pkgs/errortrace-test/tests/errortrace/wrap.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-
-(define err-stx #'(error '"bad"))
-
-(define (try expr)
-  (define out-str
-    (parameterize ([current-namespace (make-base-namespace)])
-      (parameterize ([current-compile (dynamic-require 'errortrace/errortrace-lib
-                                                       'errortrace-compile-handler)]
-                     [error-display-handler (dynamic-require 'errortrace/errortrace-lib
-                                                             'errortrace-error-display-handler)])
-        (let ([o (open-output-string)])
-          (parameterize ([current-error-port o])
-            (call-with-continuation-prompt
-             (lambda ()
-               (eval expr))))
-          (get-output-string o)))))
-  (unless (regexp-match? (regexp-quote (format "~s" (syntax->datum err-stx)))
-                         out-str)
-    (error 'test "not in context for: ~s got: ~s" (syntax->datum expr) out-str)))
-
-(provide wrap-tests)
-(define (wrap-tests)
-  (try #`(begin (module m racket/base #,err-stx) (require 'm)))
-  (try err-stx)
-  (try #`(syntax-case 'a ()
-           (_ #,err-stx)))
-  (try #`(begin (module m racket/base (module n racket/base #,err-stx)) (require (submod 'm n))))
-  (try #`(begin (module m racket/base (module* n racket/base #,err-stx)) (require (submod 'm n))))
-  (try #`(begin (module m racket/base (module* n #f #,err-stx)) (require (submod 'm n))))
-  (void))
diff --git a/pkgs/errortrace-pkgs/errortrace/LICENSE.txt b/pkgs/errortrace-pkgs/errortrace/LICENSE.txt
deleted file mode 100644
index 01cfef5d61..0000000000
--- a/pkgs/errortrace-pkgs/errortrace/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-errortrace
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/errortrace-pkgs/errortrace/info.rkt b/pkgs/errortrace-pkgs/errortrace/info.rkt
deleted file mode 100644
index 0f4bafccdc..0000000000
--- a/pkgs/errortrace-pkgs/errortrace/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("errortrace-lib"
-               "errortrace-doc"))
-(define implies '("errortrace-lib"
-                  "errortrace-doc"))
-
-(define pkg-desc "Instrumentation tools for debugging")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer-typed/LICENSE.txt b/pkgs/future-visualizer-pkgs/future-visualizer-typed/LICENSE.txt
deleted file mode 100644
index 3d3a52311c..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer-typed/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-future-visualizer-typed
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer-typed/future-visualizer/typed.rkt b/pkgs/future-visualizer-pkgs/future-visualizer-typed/future-visualizer/typed.rkt
deleted file mode 100644
index f119115801..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer-typed/future-visualizer/typed.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket/base
-
-(require/typed future-visualizer [visualize-futures-thunk (All (A) ((-> A) -> A))])
-
-(define-syntax-rule (visualize-futures e ...)
-  (visualize-futures-thunk (lambda () e ...)))
-
-(provide visualize-futures-thunk visualize-futures)
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer-typed/info.rkt b/pkgs/future-visualizer-pkgs/future-visualizer-typed/info.rkt
deleted file mode 100644
index e1e3063eed..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer-typed/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"
-               "future-visualizer"
-               "typed-racket-lib"))
-
-(define pkg-desc "type declarations for \"future-visualizer\"")
-
-(define pkg-authors '(jamesswaine))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/LICENSE.txt b/pkgs/future-visualizer-pkgs/future-visualizer/LICENSE.txt
deleted file mode 100644
index ced1d59490..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-future-visualizer
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/info.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/info.rkt
deleted file mode 100644
index 4e097232f5..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define scribblings
-  '(("scribblings/future-visualizer.scrbl" (multi-page) (tool))))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/main.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/main.rkt
deleted file mode 100644
index 4773764284..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/main.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base 
-(require racket/contract 
-         pict
-         racket/bool 
-         future-visualizer/trace
-         "private/visualizer-gui.rkt"  
-         "private/visualizer-drawing.rkt") 
-
-(provide visualize-futures 
-         (contract-out 
-          [show-visualizer (->* () (#:timeline (listof indexed-future-event?)) void?)]
-          [visualize-futures-thunk ((-> any/c) . -> . any/c)]
-          [timeline-pict (->i ([indexed-fevents (listof indexed-future-event?)]) 
-                              (#:x [x (or/c #f exact-nonnegative-integer?)] 
-                               #:y [y (or/c #f exact-nonnegative-integer?)] 
-                               #:width [width (or/c #f exact-nonnegative-integer?)]
-                               #:height [height (or/c #f exact-nonnegative-integer?)] 
-                               #:selected-event-index [i (or/c #f exact-nonnegative-integer?)])
-                              #:pre 
-                              (x y width height)
-                              (implies (or x y width height)
-                                       (and x y width height))
-                              [p pict?])]
-          [creation-tree-pict (->i ([indexed-fevents (listof indexed-future-event?)]) 
-                                    (#:x [x (or/c #f exact-nonnegative-integer?)] 
-                                     #:y [y (or/c #f exact-nonnegative-integer?)] 
-                                     #:width [width (or/c #f exact-nonnegative-integer?)] 
-                                     #:height [height (or/c #f exact-nonnegative-integer?)] 
-                                     #:node-width [node-width (or/c #f exact-nonnegative-integer?)]
-                                     #:padding [padding (or/c #f exact-nonnegative-integer?)] 
-                                     #:zoom [zoom (between/c 1 5)]) 
-                                    #:pre 
-                                    (x y width height) 
-                                    (implies (or x y width height) 
-                                             (and x y width height)) 
-                                    [p pict?])]))
-
-(define-syntax-rule (visualize-futures e ...)
-  (begin (start-future-tracing!)
-         (begin0 (begin e ...)
-           (stop-future-tracing!)
-           (show-visualizer))))
-
-;;visualize-futures-thunk : (-> any/c) -> any/c
-(define (visualize-futures-thunk thunk) 
-  (start-future-tracing!)
-  (begin0 (thunk)
-    (stop-future-tracing!)
-    (show-visualizer)))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/constants.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/constants.rkt
deleted file mode 100644
index 7b796fc154..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/constants.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-(provide DEF-WINDOW-WIDTH
-         DEF-WINDOW-HEIGHT
-         RT-THREAD-ID
-         MIN-SEG-WIDTH
-         STROKE-WIDTH
-         MIN-SEG-INNER-WIDTH
-         DEFAULT-TIME-INTERVAL
-         TIMELINE-HEADER-OPACITY
-         CONNECTION-LINE-HAT-THRESHOLD
-         HAT-HEIGHT
-         CREATE-GRAPH-NODE-DIAMETER
-         CREATE-GRAPH-PADDING
-         CREATE-GRAPH-MIN-ZOOM
-         CREATE-GRAPH-MAX-ZOOM
-         CREATE-GRAPH-DEFAULT-ZOOM
-         CREATE-GRAPH-ZOOM-FACTOR
-         TIMELINE-ROW-HEIGHT
-         TIMELINE-MIN-TICK-PADDING
-         HEADER-PADDING
-         DEFAULT-TIMELINE-WIDTH
-         HEADER-HEIGHT
-         TOOLTIP-MARGIN)
-
-(define DEF-WINDOW-WIDTH 1500)
-(define DEF-WINDOW-HEIGHT 1000)
-(define RT-THREAD-ID 0)
-(define MIN-SEG-WIDTH 10)
-(define STROKE-WIDTH 2)
-(define MIN-SEG-INNER-WIDTH (- MIN-SEG-WIDTH STROKE-WIDTH))
-;Default time interval (in MS) between ticks on the timeline
-(define DEFAULT-TIME-INTERVAL (/ 1 10))
-(define TIMELINE-HEADER-OPACITY 0.6)
-(define CONNECTION-LINE-HAT-THRESHOLD 20)
-(define HAT-HEIGHT 9)
-(define CREATE-GRAPH-NODE-DIAMETER 30)
-(define CREATE-GRAPH-PADDING 5)
-(define CREATE-GRAPH-MIN-ZOOM 1)
-(define CREATE-GRAPH-MAX-ZOOM 5)
-(define CREATE-GRAPH-DEFAULT-ZOOM 3)
-(define CREATE-GRAPH-ZOOM-FACTOR .4)
-(define TIMELINE-ROW-HEIGHT 100)
-(define TIMELINE-MIN-TICK-PADDING 10)
-(define HEADER-PADDING 5)
-(define DEFAULT-TIMELINE-WIDTH 1000)
-(define HEADER-HEIGHT 30)
-(define TOOLTIP-MARGIN 5)
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/display.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/display.rkt
deleted file mode 100644
index 8a57798ecd..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/display.rkt
+++ /dev/null
@@ -1,139 +0,0 @@
-#lang racket/base 
-(provide get-event-color 
-         get-event-forecolor
-         get-event-opacity
-         header-forecolor 
-         header-backcolor 
-         timeline-event-baseline-color 
-         event-connection-line-color 
-         event-target-future-line-color
-         timeline-tick-color 
-         timeline-tick-bold-color 
-         timeline-tick-label-backcolor 
-         timeline-tick-label-forecolor
-         timeline-baseline-color 
-         timeline-frame-color 
-         timeline-frame-bg-color
-         timeline-event-strokecolor
-         hover-tickline-color 
-         create-graph-node-backcolor
-         create-graph-node-strokecolor 
-         create-graph-node-forecolor 
-         create-graph-edge-color 
-         create-graph-block-node-forecolor 
-         create-graph-sync-node-forecolor
-         get-time-string
-         (struct-out viewable-region) 
-         viewable-region-x-extent 
-         viewable-region-y-extent
-         in-viewable-region 
-         in-viewable-region-horiz 
-         in-viewable-region-vert?
-         scale-viewable-region
-         between)
-
-(struct viewable-region (x y width height) #:transparent)
-
-;;viewable-region-x-extent : viewable-region -> uint
-(define (viewable-region-x-extent vregion) 
-  (+ (viewable-region-x vregion) (viewable-region-width vregion)))
-
-;;viewable-region-y-extent : viewable-region -> uint
-(define (viewable-region-y-extent vregion) 
-  (+ (viewable-region-y vregion) (viewable-region-height vregion)))
-
-(define (scale-viewable-region vreg factor)
-  (define (scale n) (* n factor))
-  (struct-copy viewable-region vreg
-               [width (scale (viewable-region-width vreg))]
-               [height (scale (viewable-region-height vreg))]))
-               
-
-;;between : uint uint uint -> bool
-(define (between x start end) 
-  (and (>= x start) (<= x end)))
-
-;;in-viewable-region : viewable-region uint -> bool
-(define (in-viewable-region-horiz vregion x) 
-  (between x (viewable-region-x vregion) (viewable-region-x-extent vregion)))
-
-;;in-viewable-region-vert : viewable-region uint -> bool
-(define (in-viewable-region-vert? vregion y) 
-  (between y (viewable-region-y vregion) (viewable-region-y-extent vregion)))
-
-;;in-viewable-region : viewable-region segment -> bool
-(define (in-viewable-region vregion x y w h)
-  (define-values (start-x start-y end-x end-y) 
-    (values (viewable-region-x vregion) 
-            (viewable-region-y vregion) 
-            (viewable-region-x-extent vregion) 
-            (viewable-region-y-extent vregion))) 
-  (define-values (x-end y-end) 
-    (values (+ x w) 
-            (+ y h))) 
-  (and (or (between x start-x end-x) 
-           (between x-end start-x end-x)
-           (between start-x x x-end)
-           (between end-y y y-end))
-       (or (between y start-y end-y) 
-           (between y-end start-y end-y)
-           (between start-y y y-end)
-           (between end-y y y-end))))
-
-;;get-event-color : symbol -> string
-(define (get-event-color type) 
-  (case type 
-    [(create) "blue"] 
-    [(start-work start-0-work touch-resume) "green"] 
-    [(block touch) "red"] 
-    [(sync) "orange"] 
-    [(touch-pause) "blue"] 
-    [(result abort suspend) "white"] 
-    [(complete end-work) "white"] 
-    [(gc) "maroon"]
-    [else "black"])) 
-
-;;get-event-opacity : symbol -> real [0 .. 1]
-(define (get-event-opacity type) 
-  (case type 
-    [(gc) 0.15] 
-    [else 1]))
-
-;;get-event-forecolor : symbol -> string
-(define (get-event-forecolor type) 
-  (case type 
-    [(block) "white"] 
-    [else "black"]))
-
-(define (header-forecolor) "white") 
-(define (header-backcolor) "slategray")
-(define (timeline-event-baseline-color) "gray")
-(define (event-connection-line-color) "orchid")
-(define (event-target-future-line-color) "blue")
-(define (creation-line-color) "green") 
-(define (touch-line-color) "red")
-(define (timeline-tick-color) "gray")
-(define (timeline-tick-bold-color) "darkgray")
-(define (timeline-tick-label-backcolor) "darkgray") 
-(define (timeline-tick-label-forecolor) "white")
-(define (timeline-baseline-color) "darkgray")
-(define (timeline-frame-color) "gray")
-(define (timeline-frame-bg-color) "white")
-(define (timeline-event-strokecolor) "darkgray")
-(define (hover-tickline-color) "darkgray")
-(define (create-graph-node-forecolor) "white")
-(define (create-graph-node-backcolor) "steelblue")
-(define (create-graph-node-strokecolor) "darkgray")
-(define (create-graph-edge-color) "black")
-(define (create-graph-block-node-forecolor) "white")
-(define (create-graph-sync-node-forecolor) "white")
-
-(define (get-time-string time) 
-  (if (or (= 0.0 time) (> time 0.1))
-      (format "~a ms" time)
-      (format "~a μs" (* 1000 time))))
-   
-   
-   
-   
-   
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/drawing-helpers.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/drawing-helpers.rkt
deleted file mode 100644
index 7fc2fa6514..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/drawing-helpers.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang racket/base
-(require pict
-         "display.rkt"
-         "constants.rkt")
-(provide opacity-layer
-         circle-pict
-         rect-pict
-         text-pict
-         text-block-pict
-         draw-line-onto
-         make-stand-out
-         at
-         draw-stack-onto)
-
-;;opacity-layer : float uint uint -> pict
-(define (opacity-layer alpha w h)
-  (cellophane (colorize (filled-rectangle w h)
-                        "white")
-              0.6))
-
-;;circle-pict : string string uint [uint] -> pict
-(define (circle-pict color stroke-color width #:stroke-width [stroke-width 1])
-    (pin-over (colorize (filled-ellipse width width)
-                        stroke-color)
-              (* stroke-width 2)
-              (* stroke-width 2)
-              (colorize (filled-ellipse (- width (* stroke-width 4))
-                                        (- width (* stroke-width 4)))
-                        color)))
-
-;;rect-pict : string string uint uint [uint] -> pict
-(define (rect-pict color stroke-color width height #:stroke-width [stroke-width 1])
-  (pin-over (colorize (filled-rectangle width height)
-                      stroke-color)
-            (* stroke-width 2)
-            (* stroke-width 2)
-            (colorize (filled-rectangle (- width (* stroke-width 4))
-                                        (- height (* stroke-width 4)))
-                      color)))
-
-;;text-pict : string [string] -> pict
-(define (text-pict t #:color [color "black"])
-  (colorize (text t) color))
-
-;;text-block-pict : string [string] [string] [uint] [float] [uint] [uint] -> pict
-(define (text-block-pict t #:backcolor [backcolor "white"]
-                         #:forecolor [forecolor "black"]
-                         #:padding [padding 10]
-                         #:opacity [opacity 1.0]
-                         #:width [width 0]
-                         #:height [height 0])
-  (let* ([textp (colorize (text t) forecolor)]
-         [padx2 (* padding 2)]
-         [text-cont (pin-over (blank (+ (pict-width textp) padx2)
-                                     (+ (pict-height textp) padx2))
-                              padding
-                              padding
-                              textp)]
-         [bg (cellophane (colorize (filled-rectangle (max width (pict-width text-cont))
-                                                     (max height (pict-height text-cont)))
-                                   backcolor)
-                         opacity)])
-    (lc-superimpose bg text-cont))) 
-
-;;draw-line-onto : pict uint uint uint uint string -> pict
-(define (draw-line-onto base
-                        startx
-                        starty
-                        endx
-                        endy
-                        color
-                        #:width [width 1]
-                        #:with-arrow [with-arrow #f]
-                        #:arrow-sz [arrow-sz 10]
-                        #:style [style 'solid])
-  (let ([dx (- endx startx)]
-        [dy (- endy starty)]
-        [line-f (if with-arrow pip-arrow-line pip-line)])
-    (pin-over base
-              startx
-              starty
-              (linewidth width
-                         (linestyle style
-                                    (colorize (line-f dx dy arrow-sz)
-                                              color))))))
-
-;;make-stand-out : pict -> pict
-(define (make-stand-out pict)
-  (scale pict 2))
-
-(struct draw-at (x y p) #:transparent)
-
-;;at : uint uint pict -> draw-at
-(define (at x y p)
-  (draw-at x y p))
-
-;;draw-stack-onto : pict (listof pict) -> pict
-(define (draw-stack-onto base . picts)
-  (for/fold ([p base]) ([cur-p (in-list picts)])
-    (cond
-      [(pict? cur-p) (pin-over p 0 0 cur-p)]
-      [(draw-at? cur-p) (pin-over p
-                                  (draw-at-x cur-p)
-                                  (draw-at-y cur-p)
-                                  (draw-at-p cur-p))]
-      [else (error 'draw-onto "Invalid argument in 'picts' list.")])))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/graph-drawing.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/graph-drawing.rkt
deleted file mode 100644
index b967c75a4b..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/graph-drawing.rkt
+++ /dev/null
@@ -1,201 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         racket/contract
-         ;; rackunit
-         "constants.rkt")
-
-(provide (struct-out point)
-         (struct-out node)
-         (struct-out drawable-node)
-         (struct-out graph-layout)
-         (struct-out attributed-node)
-         draw-tree
-         drawable-node-center
-         build-attr-tree)
-
-(define-struct/contract point ([x integer?] [y integer?]) #:transparent)
-(struct node (data children))
-(struct graph-layout (width height nodes) #:transparent)
-(struct drawable-node (node x y width depth children children-xextent children-yextent) #:transparent)
-
-(define (int x) 
-  (floor (exact->inexact x)))
-
-;;Gets the center point of a node circle.
-;;drawable-node-center : node -> point
-(define (drawable-node-center dnode) 
-  (point (int (+ (drawable-node-x dnode) (/ (drawable-node-width dnode) 2))) 
-         (int (+ (drawable-node-y dnode) (/ (drawable-node-width dnode) 2)))))
-
-;                                                                                  
-;                                                ;;                            ;;  
-;     ;;; ;     ;                                 ;                             ;  
-;    ;   ;;     ;                                 ;                             ;  
-;    ;    ;   ;;;;;;;     ;;;;    ;; ;;;      ;;; ;     ;;;;     ;;  ;;     ;;; ;  
-;    ;          ;        ;    ;    ;;   ;    ;   ;;    ;    ;     ;;;      ;   ;;  
-;     ;;;;      ;             ;    ;    ;   ;     ;         ;     ;       ;     ;  
-;         ;     ;        ;;;;;;    ;    ;   ;     ;    ;;;;;;     ;       ;     ;  
-;         ;     ;       ;     ;    ;    ;   ;     ;   ;     ;     ;       ;     ;  
-;    ;    ;     ;       ;     ;    ;    ;   ;     ;   ;     ;     ;       ;     ;  
-;    ;;   ;     ;       ;    ;;    ;    ;    ;   ;;   ;    ;;     ;        ;   ;;  
-;    ; ;;;       ;;;;    ;;;; ;;  ;;;  ;;;    ;;; ;;   ;;;; ;;   ;;;;;;     ;;; ;; 
-;                                                                                  
-
-;;draw-tree/standard : node uint uint uint uint uint -> drawable-node
-(define (draw-tree/standard parent x y depth node-width padding)
-  (if (empty? (node-children parent)) 
-      (drawable-node parent 
-                     (+ padding x) 
-                     (+ padding y) 
-                     node-width 
-                     depth
-                     '() 
-                     (+ padding x node-width) 
-                     (+ padding y node-width)) 
-      (let ([child-y (+ y node-width)] 
-            [children (node-children parent)] 
-            [parenty (+ y padding)])
-        (if (= 1 (length children)) ;Align parent and child vertically
-            (let ([child (draw-tree/standard (first children)
-                                            x 
-                                            (+ parenty node-width) 
-                                            (add1 depth) 
-                                            node-width 
-                                            padding)]) 
-              (drawable-node parent 
-                             (drawable-node-x child) 
-                             parenty 
-                             node-width 
-                             depth
-                             (list child) 
-                             (drawable-node-children-xextent child) 
-                             (drawable-node-children-yextent child)))
-            (let-values ([(x-extent 
-                           y-extent
-                           children) 
-                          (for/fold ([xacc x] [yacc y] [chn '()]) 
-                            ([child (in-list children)])
-                            (let ([dchild (draw-tree/standard child 
-                                                             xacc 
-                                                             (+ parenty node-width) 
-                                                             (add1 depth) 
-                                                             node-width 
-                                                             padding)]) 
-                              (values (drawable-node-children-xextent dchild) 
-                                      (drawable-node-children-yextent dchild)
-                                      (cons dchild chn))))]) 
-              (let* ([chn (reverse children)] 
-                     [xmin (drawable-node-x (first chn))] 
-                     [xmax (drawable-node-x (last chn))]) 
-                (drawable-node parent 
-                               (+ xmin (/ (- xmax xmin) 2))
-                               parenty
-                               node-width 
-                               depth
-                               chn 
-                               x-extent 
-                               (+ y-extent node-width))))))))
-
-                          ;;       ;                 ;;;    
-;   ;;;;;;                    ;                           ;    
-;    ;    ;;                  ;                           ;    
-;    ;     ;    ;;;;      ;;; ;     ;;;       ;;;;        ;    
-;    ;     ;   ;    ;    ;   ;;       ;      ;    ;       ;    
-;    ;    ;         ;   ;     ;       ;           ;       ;    
-;    ;;;;;     ;;;;;;   ;     ;       ;      ;;;;;;       ;    
-;    ;   ;    ;     ;   ;     ;       ;     ;     ;       ;    
-;    ;    ;   ;     ;   ;     ;       ;     ;     ;       ;    
-;    ;     ;  ;    ;;    ;   ;;       ;     ;    ;;       ;    
-;   ;;;    ;;  ;;;; ;;    ;;; ;;   ;;;;;;    ;;;; ;;   ;;;;;;  
-;                                                
-
-;(r * cos(deg), r * sin(deg)) = point on circle given angle and radius r.
-
-(struct attributed-node (node type num-leaves depth children))
-(define (leaf? anode) 
-  (equal? (attributed-node-type anode) 'leaf))
-
-;;build-attr-tree : node uint -> attributed-node
-(define (build-attr-tree parent depth) 
-  (if (empty? (node-children parent)) 
-      (attributed-node parent 'leaf 0 depth '()) 
-      (let-values ([(leaves achn) 
-                    (for/fold ([l 0] [achildren '()]) ([child (in-list (node-children parent))]) 
-                      (let ([anode (build-attr-tree child (add1 depth))]) 
-                        (if (leaf? anode) 
-                            (values (add1 l) (cons anode achildren)) 
-                            (values (+ l (attributed-node-num-leaves anode)) (cons anode achildren)))))]) 
-        (attributed-node parent 
-                         'interior 
-                         leaves 
-                         depth 
-                         achn))))
-
-
-;(struct drawable-node (node x y width depth children children-xextent children-yextent) #:transparent)
-;;draw-tree/radial : node uint (uint -> uint) uint -> drawable-node
-(define (draw-tree/radial root node-width Bv p depth)  
-  (let* ([atree (build-attr-tree root 0)] 
-         #;[angle-incr (/ Bv (length (attributed-node-children root)))])
-    (for/fold ([angle 0] [chn '()]) ([achild (in-list (attributed-node-children atree))]) 
-      (let* ([Bu (/ (* (attributed-node-num-leaves achild) Bv) 
-                    (attributed-node-num-leaves atree))] 
-             [pa (+ angle 
-                    (/ Bu 2))] 
-             [x (* (p depth) (cos pa))] 
-             [y (* (p depth) (sin pa))]) 
-        (values (+ angle Bu)
-                (cons (drawable-node (attributed-node-node achild) 
-                               x 
-                               y 
-                               node-width 
-                               depth 
-                               '() 
-                               0 
-                               0) chn))))))                   
-      
-;;tree-layout/private : drawable-node uint uint (listof drawable-node) -> (values uint uint (listof drawable-node))
-(define (tree-layout/private parent xextent yextent nodes) 
-  (if (empty? (drawable-node-children parent)) 
-      (values (max (+ (drawable-node-x parent) (drawable-node-width parent)) xextent) 
-              (max (+ (drawable-node-y parent) (drawable-node-width parent)) yextent) 
-              (cons parent nodes))
-      (for/fold ([x xextent] [y yextent] [ns (cons parent nodes)]) ([child (in-list (drawable-node-children parent))]) 
-        (tree-layout/private child x y (cons child ns)))))
-
-;;calc-tree-layout : drawable-node uint uint -> graph-layout
-(define (calc-tree-layout root node-width padding) 
-  (define-values (w h nodes) (tree-layout/private root 0 0 '())) 
-  (graph-layout w
-                h 
-                nodes))
-
-;;draw-tree : node [symbol] [uint] [uint] [uint] -> tree-layout 
-(define (draw-tree root 
-                   #:style [style 'standard]
-                   #:node-width [node-width CREATE-GRAPH-NODE-DIAMETER] 
-                   #:padding [padding CREATE-GRAPH-PADDING] 
-                   #:zoom [zoom-level 1])
-  (let* ([scaled-node-w (* node-width zoom-level)] 
-         [scaled-padding (* padding zoom-level)] 
-         [layout 
-          (case style 
-            [(standard) (calc-tree-layout (draw-tree/standard root 
-                                                              0 
-                                                              0 
-                                                              0
-                                                              scaled-node-w 
-                                                              scaled-padding) 
-                                          scaled-node-w 
-                                          scaled-padding)]
-            [(radial) (calc-tree-layout (draw-tree/radial root 
-                                                          (λ (i) (* i 50))) 
-                                        scaled-node-w 
-                                        scaled-padding)]
-            [(hv) 0] 
-            [else 
-             (error 'draw-tree "Invalid tree drawing style.")])]) 
-    (graph-layout (+ (graph-layout-width layout) scaled-padding) 
-                  (+ (graph-layout-height layout) scaled-padding) 
-                  (graph-layout-nodes layout))))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/gui-helpers.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/gui-helpers.rkt
deleted file mode 100644
index 40593fb749..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/gui-helpers.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang racket/gui
-(require framework 
-         pict
-         "display.rkt" 
-         "constants.rkt" 
-         "pict-canvas.rkt") 
-(provide label 
-         mt-label 
-         bold-label 
-         mt-bold-label 
-         section-header
-         (struct-out event-target) 
-         make-listener-table 
-         add-receiver 
-         post-event)
-
-(define bold-system-font
-  (send the-font-list find-or-create-font
-        (send normal-control-font get-point-size)
-        (send normal-control-font get-family)
-        (send normal-control-font get-style)
-        'bold))
-
-(define (label p str)
-  (new message% [parent p]
-       [label str]
-       [stretchable-width #t]))
-
-(define (mt-label p) 
-  (label p ""))
-
-(define (bold-label p str) 
-  (new message% [parent p] 
-       [label str] 
-       [font bold-system-font]
-       [stretchable-width #t])) 
-
-(define (mt-bold-label p) 
-  (bold-label p ""))
-
-(define (section-header par name orientation) 
-  (let* ([text-pict (colorize (text name) (header-forecolor))]
-         [text-container (pin-over (colorize (rectangle (+ 10 (pict-width text-pict)) 
-                                                        (+ 10 (pict-height text-pict))) 
-                                             (header-backcolor))
-                                   5 
-                                   5 
-                                   text-pict)]
-         [c (case orientation 
-             [(horizontal) 
-              (let ([canv (new pict-canvas% 
-                               [parent par] 
-                               [redraw-on-resize #t] 
-                               [pict-builder (λ (vregion)
-                                               (lc-superimpose (colorize (filled-rectangle (viewable-region-width vregion) 
-                                                                                           HEADER-HEIGHT) 
-                                                                         (header-backcolor))
-                                                               text-container))] 
-                               [min-height HEADER-HEIGHT] 
-                               [stretchable-width #t] 
-                               [stretchable-height #f])]) 
-                canv)]
-             [(vertical) 
-              (let ([canv (new pict-canvas% 
-                               [parent par] 
-                               [redraw-on-resize #t] 
-                               [pict-builder (λ (vregion)
-                                               (rotate (lc-superimpose (colorize (filled-rectangle (viewable-region-height vregion) 
-                                                                                                 HEADER-HEIGHT) 
-                                                                               (header-backcolor))
-                                                                     text-container)
-                                                     -1.57079633))] 
-                               [min-width HEADER-HEIGHT] 
-                               [stretchable-width #f] 
-                               [stretchable-height #t])]) 
-                canv)])]) 
-    c))
-
-;Events
-;receiver : any
-;handler : (any -> void)
-(struct event-target (receiver handler) #:transparent)
-
-(define (make-listener-table) (make-hash))
-
-(define (add-receiver table evt-name object handler)
-  (hash-update! table
-                evt-name
-                (λ (old)
-                  (cons (event-target object handler) old))
-                (list (event-target object handler))))
-
-(define (post-event table name sender arg)
-    (let ([targets (hash-ref table name)])
-      (for ([target (in-list targets)])
-        (let ([receiver (event-target-receiver target)]
-              [handler (event-target-handler target)])
-          (unless (eq? receiver sender)
-            (handler arg))))))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/pict-canvas.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/pict-canvas.rkt
deleted file mode 100644
index e3a6263f0a..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/pict-canvas.rkt
+++ /dev/null
@@ -1,124 +0,0 @@
-#lang racket/gui
-(require framework 
-         pict 
-         "display.rkt") 
-(provide pict-canvas%) 
-
-
-(define pict-canvas%
-  (class canvas%      
-    (init pict-builder [hover-handler #f] 
-                       [click-handler #f] 
-                       [overlay-builder #f] 
-                       [redraw-on-resize #f])
-    (inherit get-dc get-client-size refresh get-view-start)
-    (define bp pict-builder) ;Builds the main pict for the canvas
-    (define mh hover-handler) ;Mouse hover handler
-    (define ob overlay-builder) ;Hover overlay pict builder
-    (define ch click-handler) ;Mouse click handler  
-    (define redraw-on-size redraw-on-resize) ;Whether we should rebuild the pict for on-size events
-    (define scale-factor 1)
-    
-    (define/public (set-scale-factor! s) 
-      (set! scale-factor s))
-    
-    (define need-redraw? #f)
-    (define delaying-redraw? #f)
-    (define cached-base-bitmap #f)
-    (define cached-overlay-bitmap #f)
-    
-    (define/private (get-viewable-region) 
-      (define-values (x y) (get-view-start)) 
-      (define-values (w h) (get-client-size)) 
-      (scale-viewable-region (viewable-region x y w h) (/ 1 scale-factor)))
-    
-    (define/public (redraw-everything) 
-      (redraw-the-bitmap/maybe-delayed! (get-viewable-region)))
-    
-    ;Rebuild both the bottom (base) and overlay (top) 
-    ;pict layers for the canvas
-    ;;rebuild-the-pict : viewable-region -> void
-    (define/private (rebuild-the-pict! vregion #:only-the-overlay? [only-the-overlay? #f]) 
-      (when (or (not cached-base-bitmap) (not only-the-overlay?))  
-        (set! cached-base-bitmap (pict->bitmap (scale (bp vregion) scale-factor))))
-      (when ob 
-        (define overlay-pict (ob vregion scale-factor)) 
-        (set! cached-overlay-bitmap 
-              (if overlay-pict 
-                  (pict->bitmap overlay-pict) 
-                  #f))))
-    
-    ;Rebuilds the pict and stashes in a bitmap 
-    ;to be drawn to the canvas later
-    ;;redraw-the-bitmap : viewable-region -> void
-    (define/private (redraw-the-bitmap! vregion #:only-the-overlay? [only-the-overlay? #f]) 
-      (rebuild-the-pict! vregion #:only-the-overlay? only-the-overlay?) 
-      (set! need-redraw? #f))
-    
-    ;;redraw-the-bitmap/maybe-delayed! : viewable-region -> void
-    (define/private (redraw-the-bitmap/maybe-delayed! vregion 
-                                                      #:delay [delay 100]
-                                                      #:only-the-overlay? [only-the-overlay? #f]) 
-      (cond 
-        [need-redraw? 
-         (redraw-the-bitmap! vregion #:only-the-overlay? only-the-overlay?) 
-         (set! need-redraw? #f)] 
-        [(not delaying-redraw?) 
-         (new timer% [notify-callback (λ () 
-                                        (set! delaying-redraw? #f) 
-                                        (set! need-redraw? #t)
-                                        (redraw-the-bitmap/maybe-delayed! (get-viewable-region) #:only-the-overlay? only-the-overlay?) 
-                                        (refresh))] 
-              [interval delay] 
-              [just-once? #t]) 
-         (set! delaying-redraw? #t)]))
-    
-    (define last-vregion #f)
-    
-    (define (scroll-or-size-event? vregion) 
-      (not (equal? vregion last-vregion)))
-    
-    (define/override (on-paint)
-      (define vregion (get-viewable-region)) 
-      (when (and (not delaying-redraw?) (scroll-or-size-event? vregion))
-        (redraw-the-bitmap/maybe-delayed! vregion))
-      (set! last-vregion vregion)
-      (define dc (get-dc))
-      (when cached-base-bitmap
-        (send dc 
-              draw-bitmap 
-              cached-base-bitmap 
-              (viewable-region-x vregion) 
-              (viewable-region-y vregion))) 
-      (when cached-overlay-bitmap 
-        (send dc 
-              draw-bitmap 
-              cached-overlay-bitmap 
-              (viewable-region-x vregion) 
-              (viewable-region-y vregion))))
-    
-    (define/override (on-event event) 
-      (define vregion (get-viewable-region)) 
-      (define x (+ (viewable-region-x vregion) (/ (send event get-x) scale-factor))) 
-      (define y (+ (viewable-region-y vregion) (/ (send event get-y) scale-factor))) 
-      (case (send event get-event-type) 
-        [(motion) 
-         (when mh 
-           (when (mh x y vregion) ;Mouse handler returns non-false if a state change requiring redraw occurred 
-             (redraw-the-bitmap/maybe-delayed! vregion #:delay 0 #:only-the-overlay? #t)))]
-        [(left-up) 
-         (when ch (ch x y vregion)) ;Ditto for click handler
-         (redraw-the-bitmap/maybe-delayed! vregion #:only-the-overlay? #t)]))
-    
-    (super-new) 
-    (send (get-dc) set-smoothing 'aligned)))
-
-
-
-
-
-
-
-
-
-
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/visualizer-data.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/visualizer-data.rkt
deleted file mode 100644
index cc8fe7487d..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/visualizer-data.rkt
+++ /dev/null
@@ -1,556 +0,0 @@
-#lang racket/base
-(require (only-in racket/list flatten) 
-         (only-in racket/future futures-enabled?)
-         racket/set 
-         (only-in racket/vector vector-drop)
-         "constants.rkt"
-         "graph-drawing.rkt" 
-         "display.rkt"
-         (only-in '#%futures 
-                  reset-future-logs-for-tracing! 
-                  mark-future-trace-end!)) 
-
-(provide start-future-tracing! 
-         stop-future-tracing!
-         (struct-out future-event)
-         (struct-out gc-info)
-         (struct-out indexed-future-event)
-         (struct-out trace) 
-         (struct-out process-timeline) 
-         (struct-out future-timeline)
-         (struct-out event)
-         (struct-out rtcall-info)
-         timeline-events
-         organize-output 
-         build-trace 
-         missing-data?
-         event-has-duration? 
-         op-name 
-         touch-event?
-         allocation-event? 
-         jitcompile-event? 
-         synchronization-event? 
-         runtime-synchronization-event? 
-         runtime-block-event?
-         worker-block-event?
-         runtime-sync-event? 
-         worker-sync-event?
-         gc-event?
-         work-event?
-         final-event? 
-         relative-time 
-         event-or-gc-time
-         proc-id-or-gc<?)
-
-(define-struct future-event (future-id process-id what time prim-name user-data) 
-  #:prefab)
-
-(define-struct gc-info (major? 
-                        pre-used 
-                        pre-admin 
-                        code-page-total 
-                        post-used 
-                        post-admin 
-                        start-time 
-                        end-time 
-                        start-real-time 
-                        end-real-time) #:prefab)
-
-;Contains an index and a future-event, 
-;so we can preserve the order in which future-events 
-;were logged. 
-;Many future-events can be logged at what appears to be the same 
-;time, apparently because the time values don't have great enough precision 
-;to separate events which temporally occur close together.
-(struct indexed-future-event (index fevent) #:transparent)
-
-;The whole trace, with a start/end time and list of process timelines
-(struct trace (start-time ;Absolute start time (in process milliseconds)
-               end-time ;Absolute end time
-               proc-timelines ;(listof process-timeline)
-               future-timelines ;Hash of (future id --o--> (listof event)) 
-               gc-timeline ;process-timeline where proc-id == 'gc, and each event is a GC
-               all-events ;(listof event)
-               real-time ;Total amount of time for the trace (in ms)
-               num-futures ;Number of futures created
-               num-blocks ;Number of barricades hit
-               num-syncs ;Number of 'atomic' ops done 
-               num-gcs ;Number of GC's that occurred during the trace
-               blocked-futures ;Number of futures which encountered a barricade at some point
-               avg-syncs-per-future 
-               block-counts ;prim name --o--> number of blocks 
-               sync-counts ;op name --o--> number of syncs 
-               future-rtcalls ;fid --o--> rtcall-info
-               creation-tree))
-
-(struct rtcall-info (fid 
-                     block-hash ; prim name --o--> number of blocks
-                     sync-hash) ; op name --o--> number of syncs 
-  #:transparent)
-
-;(struct process-timeline timeline (proc-index))
-(struct process-timeline (proc-id 
-                          proc-index
-                          start-time 
-                          end-time 
-                          events))
-
-;(struct future-timeline timeline ())
-(struct future-timeline (future-id 
-                         start-time 
-                         end-time 
-                         events))
-
-;A block of time (e.g. a process executing a portion of a future thunk).
-(struct event (index
-               start-time 
-               end-time 
-               proc-id 
-               proc-index ;The id of the process in which this event occurred
-               future-id 
-               [user-data #:mutable]
-               type 
-               [prim-name #:mutable]
-               timeline-position ;The event's position among all events occurring in its process (sorted by time)
-               [prev-proc-event #:mutable] 
-               [next-proc-event #:mutable]
-               [prev-future-event #:mutable]
-               [next-future-event #:mutable]
-               [next-targ-future-event #:mutable] 
-               [prev-targ-future-event #:mutable]
-               ;If the event is a block on a future thread, pointer to the corresponding 
-               ;event indicating block handled on runtime thread
-               [block-handled-event #:mutable] 
-               [segment #:mutable]) #:transparent)
-
-;;event-has-duration? : event -> bool
-(define (event-has-duration? evt) 
-  (case (event-type evt) 
-    [(start-work start-0-work gc) #t] 
-    [else #f]))
-
-(define (missing-data? log) 
-  (if (findf (λ (e) (equal? (future-event-what (indexed-future-event-fevent e)) 'missing)) log) 
-      #t 
-      #f))
-
-;;event-op-name : (or event indexed-future-event future-event) -> symbol
-(define (op-name evt) 
-  (cond 
-    [(event? evt) (event-prim-name evt)] 
-    [(indexed-future-event? evt) (op-name (indexed-future-event-fevent evt))] 
-    [(future-event? evt) (future-event-prim-name evt)]
-    [(gc-info? evt) 'gc]))
-
-;;event-what : (or event indexed-future-event future-event) -> symbol
-(define (what evt) 
-  (cond 
-    [(event? evt) (event-type evt)] 
-    [(indexed-future-event? evt) (what (indexed-future-event-fevent evt))] 
-    [(future-event? evt) (future-event-what evt)] 
-    [(gc-info? evt) 'gc]))
-
-;;process-id : (or event indexed-future-event future-event) -> exact-nonnegative-integer
-(define (process-id evt) 
-  (cond 
-    [(event? evt) (event-proc-id evt)] 
-    [(indexed-future-event? evt) (process-id (indexed-future-event-fevent evt))] 
-    [(future-event? evt) (future-event-process-id evt)]
-    [(gc-info? evt) RT-THREAD-ID]))
-
-;;touch-event? : (or event indexed-future-event future-event) -> symbol
-(define (touch-event? evt) 
-  (equal? (what evt) 'touch))
-
-;;allocation-event? : (or event indexed-future-event future-event) -> bool
-(define (allocation-event? evt) 
-  (equal? (op-name evt) '|[allocate memory]|))
-
-;;jitcompile-event : (or event indexed-future-event future-event) -> bool
-(define (jitcompile-event? evt) 
-  (equal? (op-name evt) '|[jit_on_demand]|))
-
-;;synchronization-event? : (or event indexed-future-event future-event) -> bool
-(define (synchronization-event? evt) 
-  (case (what evt) 
-    [(block sync) #t] 
-    [else #f]))
-
-;;work-event : (or event indexed-future-event future-event) -> bool
-(define (work-event? evt) 
-  (case (what evt) 
-    [(start-work start-0-work) #t] 
-    [else #f]))
-
-;;runtime-thread-evt? : (or event indexed-future-event future-event) -> bool
-(define (runtime-thread-evt? evt) 
-  (define pid (process-id evt))
-  (and (number? pid) (= (process-id evt) RT-THREAD-ID)))
-
-;;runtime-synchronization-event? : (or event indexed-future-event future-event) -> bool
-(define (runtime-synchronization-event? evt) 
-  (and (synchronization-event? evt) (= (process-id evt) RT-THREAD-ID)))
-
-;;runtime-block-event? : (or event indexed-future-event future-event) -> bool
-(define (runtime-block-event? evt) 
-  (and (runtime-thread-evt? evt) (equal? (what evt) 'block))) 
-
-;;worker-block-event? : (or event indexed-future-event future-event) -> bool
-(define (worker-block-event? evt) 
-  (and (not (runtime-thread-evt? evt)) (equal? (what evt) 'block)))
-
-;;runtime-sync-evt? : (or event indexed-future-event future-event) -> bool
-(define (runtime-sync-event? evt) 
-  (and (runtime-thread-evt? evt) (equal? (what evt) 'sync)))
-
-;;worker-sync-evt? : (or event indexed-future-event future-event) -> bool
-(define (worker-sync-event? evt) 
-  (and (not (runtime-sync-event? evt)) (equal? (what evt) 'sync)))
-
-;;gc-event? : (or event indexed-future-event future-event) -> bool
-(define (gc-event? evt) 
-  (equal? (what evt) 'gc))
-
-;;final-event? : event -> bool
-(define (final-event? evt) 
-  (case (event-timeline-position evt) 
-    [(end singleton) #t] 
-    [else #f]))
-
-;;get-relative-start-time : trace float -> float
-(define (relative-time trace abs-time) 
-  (- abs-time (trace-start-time trace)))
-
-;Log message receiver 
-(define recv #f) 
-
-;;start-future-tracing! -> void
-(define (start-future-tracing!)
-  (reset-future-logs-for-tracing!)
-  (when (not recv) 
-    (set! recv (make-log-receiver (current-logger) 'debug))))
-
-;;stop-future-tracing! -> void
-(define (stop-future-tracing!) 
-  (mark-future-trace-end!))
-
-;;event-or-gc-time : (or future-event gc-info indexed-future-event) -> float
-(define (event-or-gc-time evt) 
-  (cond 
-    [(future-event? evt) (future-event-time evt)] 
-    [(gc-info? evt) (gc-info-start-real-time evt)]
-    [else (event-or-gc-time (indexed-future-event-fevent evt))]))
-
-;;process-id-or-gc : (or future-event gc-info) -> (or nonnegative-integer 'gc)
-(define (process-id-or-gc evt) 
-  (if (future-event? evt) 
-      (future-event-process-id evt) 
-      'gc))
-
-;;timeline-events/private : -> void
-(define (timeline-events/private) 
-  (let ([info (sync/timeout 0 recv)]) 
-    (if info 
-        (let ([v (vector-ref info 2)]) 
-          (cond 
-            [(future-event? v) 
-             (case (future-event-what v) 
-               [(stop-trace) '()] 
-               [else (cons v (timeline-events/private))])] 
-            [(gc-info? v) (cons v (timeline-events/private))] 
-            [else (timeline-events/private)])) 
-        (timeline-events/private))))
-          
-;Gets log events for an execution timeline
-;;timeline-events : (listof indexed-future-event)
-(define (timeline-events)
-  (cond 
-    [(not (futures-enabled?)) '()]
-    [else 
-     (define sorted (sort (timeline-events/private)
-                          #:key event-or-gc-time 
-                          <)) 
-     (for/list ([evt (in-list sorted)] 
-                [i (in-naturals)]) 
-       (indexed-future-event i evt))]))
-
-;;proc-id-or-gc<? : (or number symbol) (or number symbol) -> bool
-(define (proc-id-or-gc<? a b) 
-  (cond 
-    [(equal? b 'gc) #f]
-    [(equal? a 'gc) #t]  
-    [else (< a b)]))
-
-;Produces a vector of vectors, where each inner vector contains 
-;all the log output messages for a specific process
-;;organize-output : (listof indexed-future-event) real real -> (vectorof (vectorof future-event))
-(define (organize-output raw-log-output start-time end-time)
-  (define unique-proc-ids (for/set ([ie (in-list (filter (λ (e) 
-                                                           (between (event-or-gc-time (indexed-future-event-fevent e)) 
-                                                                    start-time 
-                                                                    end-time))
-                                                         raw-log-output))]) 
-                                   (process-id-or-gc (indexed-future-event-fevent ie))))
-  (for/vector ([procid (in-list (sort (set->list unique-proc-ids) proc-id-or-gc<?))])
-    (for/vector ([e (in-list raw-log-output)] 
-                 #:when (equal? procid (process-id-or-gc (indexed-future-event-fevent e)))) 
-      e)))
-
-;;Grab the first and last future events in the trace. 
-;;first-and-last-fevents : (listof (or future-event gc-info)) -> (values future-event future-event)
-(define (first-and-last-fevents log)  
-  (let loop ([fst #f] 
-             [last #f] 
-             [remaining-log log])
-    (cond 
-      [(null? remaining-log) (values fst last)] 
-      [else 
-       (define f (indexed-future-event-fevent (car remaining-log)))
-       (define rest (cdr remaining-log))
-       (cond 
-         [fst (if (future-event? f) 
-                  (loop fst f rest) 
-                  (loop fst last rest))] 
-         [else (if (future-event? f) 
-                   (loop f last rest) 
-                   (loop fst last rest))])])))
-
-;;event-pos-description : uint uint -> (or 'singleton 'start 'end 'interior)
-(define (event-pos-description index timeline-len) 
-  (cond 
-    [(zero? index) (if (= index (sub1 timeline-len)) 
-                       'singleton 
-                       'start)] 
-    [(= index (sub1 timeline-len)) 'end] 
-    [else 'interior]))
-
-;;build-timelines : (vectorof (vectorof future-event)) -> (listof process-timeline)
-(define (build-timelines data) 
-  (for/list ([proc-log-vec (in-vector data)]  
-             [i (in-naturals)]) 
-    (define timeline-len (vector-length proc-log-vec))
-    (let* ([fst-ie (vector-ref proc-log-vec 0)]
-           [fst-log-msg (indexed-future-event-fevent fst-ie)])
-      (process-timeline (process-id-or-gc fst-log-msg) 
-                        i
-                        (event-or-gc-time fst-log-msg) 
-                        (event-or-gc-time (indexed-future-event-fevent 
-                                           (vector-ref proc-log-vec 
-                                                       (sub1 timeline-len)))) 
-                        (for/list ([ie (in-vector proc-log-vec)]
-                                   [j (in-naturals)])
-                          (define evt (indexed-future-event-fevent ie))
-                          (define pos (event-pos-description j timeline-len))
-                          (define start (event-or-gc-time evt))
-                          (define end (if (or (equal? pos 'end) (equal? pos 'singleton)) 
-                                          start 
-                                          (future-event-time (indexed-future-event-fevent 
-                                                              (vector-ref proc-log-vec (add1 j))))))
-                          (event (indexed-future-event-index ie) 
-                                 start 
-                                 end
-                                 (process-id-or-gc evt) 
-                                 i
-                                 (future-event-future-id evt) 
-                                 (future-event-user-data evt)
-                                 (future-event-what evt) 
-                                 (future-event-prim-name evt)
-                                 pos 
-                                 #f #f #f #f #f #f #f #f))))))
-    
-;;build-trace : (listof indexed-future-event) -> trace
-(define (build-trace log-output) 
-  (when (null? log-output) 
-    (error 'build-trace "Empty timeline in log-output"))
-  (define-values (fst last) (first-and-last-fevents log-output))
-  (when (and (not fst) (not last)) ;If the log has no future events (only GC's) no timeline
-    (error 'build-trace "Empty timeline in log-output"))
-  (define start-time (future-event-time fst)) 
-  (define end-time (future-event-time last))
-  (define data (organize-output log-output start-time end-time))
-  (define-values (unique-fids nblocks nsyncs gcs) 
-    (for/fold ([unique-fids (set)]
-               [nblocks 0] 
-               [nsyncs 0]
-               [gc-evts '()]) ([ie (in-list log-output)])
-      (define evt (indexed-future-event-fevent ie)) 
-      (cond 
-        [(gc-info? evt) 
-         (cond 
-           [(between (event-or-gc-time evt) start-time end-time) 
-            (values unique-fids nblocks nsyncs (cons ie gc-evts))] 
-           [else (values unique-fids nblocks nsyncs gc-evts)])]
-        [else 
-         (define fid (future-event-future-id evt)) 
-         (define is-future-thread? (not (= (future-event-process-id evt) RT-THREAD-ID)))
-         (values 
-          (if fid 
-              (set-add unique-fids fid) 
-              unique-fids)
-          (if (and is-future-thread? 
-                   (case (future-event-what evt) 
-                     [(block touch) #t] 
-                     [else #f]))
-              (add1 nblocks) 
-              nblocks) 
-          (if (and is-future-thread? (equal? (future-event-what evt) 'sync)) 
-              (add1 nsyncs) 
-              nsyncs) 
-          gc-evts)])))
-  (define ngcs (length gcs))
-  ;If we have any GC events, the 0th element of 'data' contains them; 
-  ;don't build a timeline for it in the usual manner
-  (define tls (build-timelines (if (zero? ngcs) data (vector-drop data 1))))
-  (define gc-timeline (process-timeline 'gc 
-                                        'gc
-                                        start-time 
-                                        end-time 
-                                        (for/list ([gcie (in-list gcs)]
-                                                   [i (in-naturals)]) 
-                                          (define gc (indexed-future-event-fevent gcie))
-                                          (event (indexed-future-event-index gcie) 
-                                                 (event-or-gc-time gc) 
-                                                 (gc-info-end-real-time gc) 
-                                                 'gc
-                                                 'gc
-                                                 #f 
-                                                 (if (gc-info-major? gc) 'major 'minor)
-                                                 'gc 
-                                                 #f 
-                                                 (event-pos-description i ngcs) 
-                                                 #f #f #f #f #f #f #f #f))))
-  (define all-evts (sort (append (flatten (for/list ([tl (in-list tls)]) (process-timeline-events tl)))
-                                 (process-timeline-events gc-timeline))
-                         #:key event-index
-                         <))
-  (define non-gc-evts (filter (λ (e) (not (gc-event? e))) all-evts))
-  (define future-tl-hash (let ([h (make-hash)]) 
-                           (for ([evt (in-list non-gc-evts)]) 
-                             (let* ([fid (event-future-id evt)]
-                                    [existing (hash-ref h fid '())]) 
-                               (hash-set! h fid (cons evt existing))))
-                           h))
-  (for ([fid (in-list (hash-keys future-tl-hash))]) 
-    (hash-set! future-tl-hash fid (reverse (hash-ref future-tl-hash fid)))) 
-  (define-values (block-hash sync-hash rtcalls-per-future-hash) (build-rtcall-hashes all-evts))
-  (define tr (trace start-time 
-                    end-time 
-                    tls 
-                    future-tl-hash 
-                    gc-timeline
-                    all-evts
-                    (- end-time start-time) ;real time 
-                    (set-count unique-fids) ;num-futures
-                    nblocks                 ;num-blocks
-                    nsyncs                  ;num-syncs 
-                    ngcs                    ;num-gcs
-                    0 
-                    0 
-                    block-hash
-                    sync-hash 
-                    rtcalls-per-future-hash ;hash of fid -> rtcall-info
-                    (build-creation-graph future-tl-hash)))
-  (connect-event-chains! tr) 
-  (connect-target-fid-events! tr)
-  tr)
-
-;;build-rtcall-hash : (listof event) -> (values (blocking_prim -o-> count) (sync_prim -o-> count) (fid -o-> rtcall-info)
-(define (build-rtcall-hashes evts) 
-  (define block-hash (make-hash)) 
-  (define sync-hash (make-hash)) 
-  (define rt-hash (make-hash)) 
-  (for ([evt (in-list (filter runtime-synchronization-event? evts))])
-    (define isblock (runtime-block-event? evt))
-    (define ophash (if isblock block-hash sync-hash))
-    (hash-update! ophash 
-                  (event-prim-name evt) 
-                  (λ (old) (+ old 1)) 
-                  0) 
-    (hash-update! rt-hash 
-                  (event-future-id evt) 
-                  (λ (old) 
-                    (let ([h (if isblock 
-                                 (rtcall-info-block-hash old) 
-                                 (rtcall-info-sync-hash old))]) 
-                      (hash-update! h 
-                                    (event-prim-name evt) 
-                                    (λ (o) (+ o 1)) 
-                                    0)) 
-                    old)  
-                  (rtcall-info (event-future-id evt) (make-hash) (make-hash))))
-  (values block-hash sync-hash rt-hash))
-                                
-;;connect-event-chains! : trace -> void
-(define (connect-event-chains! trace) 
-  (for ([tl (in-list (trace-proc-timelines trace))]) 
-    (let loop ([evts (process-timeline-events tl)])
-      (cond 
-        [(or (null? evts) (null? (cdr evts))) void]
-        [else
-         (set-event-prev-proc-event! (car (cdr evts)) (car evts))
-         (set-event-next-proc-event! (car evts) (car (cdr evts)))
-         (loop (cdr evts))])))
-  (for ([fid (in-list (hash-keys (trace-future-timelines trace)))]) 
-    (let loop ([evts (hash-ref (trace-future-timelines trace) fid)]
-               [last-fthread-block #f])
-      (cond 
-        [(or (null? evts) (null? (cdr evts))) void]
-        [else
-         (define curevt (car evts)) 
-         (define nextevt (car (cdr evts)))
-         (set-event-prev-future-event! nextevt curevt)
-         (set-event-next-future-event! curevt nextevt)
-         (cond 
-           [(and last-fthread-block (or (runtime-sync-event? curevt) (runtime-block-event? curevt)))
-            (set-event-block-handled-event! last-fthread-block curevt)
-            (set-event-prim-name! last-fthread-block (event-prim-name curevt))
-            (set-event-user-data! last-fthread-block (event-user-data curevt))
-            (loop (cdr evts) #f)] 
-           [(or (worker-block-event? curevt) (worker-sync-event? curevt)) 
-            (loop (cdr evts) curevt)] 
-           [else 
-            (loop (cdr evts) last-fthread-block)])]))))
-
-;;connect-target-fid-events! : trace -> void
-(define (connect-target-fid-events! trace)
-  (let loop ([rest (trace-all-events trace)])
-    (unless (null? rest)
-      (let ([cur-evt (car rest)])
-        (when (and (or (equal? (event-type cur-evt) 'create) 
-                       (equal? (event-type cur-evt) 'touch)) 
-                   (>= (event-user-data cur-evt) 0)) 
-          (let ([targ-evt (findf (λ (e) (and (event-future-id e) 
-                                             (= (event-future-id e) 
-                                                (event-user-data cur-evt)))) 
-                                 (cdr rest))]) 
-            (when targ-evt
-              (set-event-next-targ-future-event! cur-evt targ-evt) 
-              (set-event-prev-targ-future-event! targ-evt cur-evt)))) 
-        (loop (cdr rest))))))
-      
-;;creation-event : event -> bool
-(define (creation-event? evt) 
-  (equal? (event-type evt) 'create))
-
-;;buid-creation-graph/private : (uint -o-> (listof future-event)) -> (listof node)
-(define (build-creation-graph/private future-timelines evt) 
-  (let* ([fid (event-user-data evt)] 
-         [ftimeline (hash-ref future-timelines fid #f)]) 
-    (if ftimeline 
-        (let ([fevents (filter creation-event? (hash-ref future-timelines fid #f))])
-          (for/list ([cevt (in-list fevents)]) 
-            (node cevt 
-                  (build-creation-graph/private future-timelines cevt)))) 
-        (begin 
-          (eprintf "WARNING: Could not find timeline for future ~a.  Creation tree may be truncated.\n" fid) 
-          '()))))
-
-;;build-creation-graph : (uint -o-> (listof future-event)) -> node
-(define (build-creation-graph future-timelines) 
-  (define roots (filter creation-event? 
-                        (hash-ref future-timelines #f))) 
-  (define root-nodes (for/list ([root (in-list roots)]) 
-                       (node root 
-                             (build-creation-graph/private future-timelines root)))) 
-  (node 'runtime-thread 
-        root-nodes))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/visualizer-drawing.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/visualizer-drawing.rkt
deleted file mode 100644
index 47d1f6a037..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/visualizer-drawing.rkt
+++ /dev/null
@@ -1,878 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/class
-         racket/draw
-         pict
-         data/interval-map
-         "visualizer-data.rkt"
-         "graph-drawing.rkt"
-         "drawing-helpers.rkt"
-         "display.rkt"
-         "constants.rkt")
-
-(provide timeline-pict
-         timeline-pict-for-trace-data
-         timeline-overlay
-         seg-in-vregion
-         calc-segments
-         calc-ticks
-         calc-row-mid-y
-         find-seg-for-coords
-         segment-edge
-         segs-equal-or-later
-         creation-tree-pict
-         draw-creategraph-pict
-         zoom-level->factor
-         graph-overlay-pict
-         (struct-out segment)
-         (struct-out frame-info)
-         (struct-out timeline-tick)
-         find-node-for-coords
-         find-fid-for-coords
-         first-seg-for-fid
-         print-seg)
-
-;Represents a dot or square on the timeline
-(struct segment (event
-                 x
-                 y
-                 width
-                 height
-                 color
-                 opacity
-                 p
-                 prev-future-seg
-                 next-future-seg
-                 prev-proc-seg
-                 next-proc-seg
-                 prev-targ-future-seg
-                 next-targ-future-seg) #:transparent #:mutable)
-
-;General information about the timeline image
-(struct frame-info (adjusted-width
-                    adjusted-height
-                    row-height
-                    modifier
-                    timeline-ticks
-                    process-line-coords) #:transparent)
-
-;Represents a vertical line depicting a specific time in the execution history
-(struct timeline-tick (x
-                       abs-time
-                       rel-time
-                       show-label?) #:transparent)
-
-;;viewable-region-from-frame : frame-info -> viewable-region
-(define (viewable-region-from-frame finfo)
-  (viewable-region 0
-                   0
-                   (frame-info-adjusted-width finfo)
-                   (frame-info-adjusted-height finfo)))
-
-;;print-seg : segment -> void
-(define (print-seg seg)
-  (printf "(segment type:~a x:~a y:~a width:~a height:~a color:~a\n"
-          (event-type (segment-event seg))
-          (segment-x seg)
-          (segment-y seg)
-          (segment-width seg)
-          (segment-height seg)
-          (segment-color seg)))
-
-;;seg-in-vregion : viewable-region segment -> bool
-(define (seg-in-vregion vregion)
-  (λ (seg)
-    (in-viewable-region vregion
-                        (segment-x seg)
-                        (segment-y seg)
-                        (segment-width seg)
-                        (segment-height seg))))
-
-;;calc-seg-x : event process-timeline trace uint float -> uint
-(define (calc-seg-x evt tr modifier)
-  (floor (* (relative-time tr (event-start-time evt))
-            modifier)))
-
-;;calc-seg-width : float event -> uint
-(define (calc-seg-width modifier evt)
-  (case (event-type evt)
-    [(start-work start-0-work) (max MIN-SEG-WIDTH (* modifier (- (event-end-time evt)
-                                                                 (event-start-time evt))))]
-    [else MIN-SEG-WIDTH]))
-
-;Finds the segment for given x and y mouse coordinates
-;;find-seg-for-coords : uint uint interval-map -> segment
-(define (find-seg-for-coords x y index)
-  (let ([xmap (interval-map-ref index y #f)])
-    (if xmap
-        (interval-map-ref xmap x #f)
-        #f)))
-
-;;find-fid-for-coords : uint uint (listof drawable-node) -> drawable-node
-(define (find-node-for-coords x y nodes)
-  (define node-l (filter (λ (n)
-                               (define n-x (drawable-node-x n))
-                               (define n-y (drawable-node-y n))
-                               (define n-w (drawable-node-width n))
-                               (and (n-x . < . x)
-                                    (n-y . < . y)
-                                    (x . < . (+ n-x n-w))
-                                    (y . < . (+ n-y n-w))))
-                          (remove-duplicates (flatten nodes))))
-  (cond
-    [(empty? node-l)
-     #f]
-    [(= 1 (length node-l))
-     (car node-l)]
-    [else
-     (error 'find-node-for-coords "Multiple nodes found for coords: ~s ~s, ~s" x y node-l)]))
-
-;;find-fid-for-coords : x y ??(listof (listof nodes)) by depth?? viewable-region -> fid
-(define (find-fid-for-coords x y nodes vregion)
-  (define n (find-node-for-coords x y nodes))
-  (if n
-      (event-user-data (node-data (drawable-node-node n)))
-      #f))
-
-;;first-seg-for-fid : future-id (listof segments) -> segment
-(define (first-seg-for-fid fid segs)
-  (first
-   (sort
-    (filter (λ (s) (define seg-fid (event-future-id (segment-event s)))
-              (and seg-fid fid (= fid seg-fid))) segs)
-    < #:key (λ (s) (event-start-time (segment-event s))))))
-
-;;calc-adjusted-width : uint trace -> uint
-(define (calc-adjusted-width w tr)
-  (define baseModifier (/ w (- (trace-end-time tr) (trace-start-time tr))))
-  (define max-x-extent (for*/fold ([x 0]) ([tl (in-list (trace-proc-timelines tr))]
-                                           [evt (in-list (process-timeline-events tl))])
-                         (max (+ (calc-seg-x evt tr baseModifier)
-                                 (calc-seg-width baseModifier evt))
-                              x)))
-  (- (- w (- max-x-extent w)) MIN-SEG-WIDTH))
-
-;;calc-row-mid-y : uint uint trace -> uint
-(define (calc-row-mid-y proc-index row-height tr)
-  (case proc-index 
-    [(gc) 0]
-    [else
-     (define PADDING 2)
-     (floor (- (+ (* proc-index row-height)
-                  (/ row-height 2))
-               PADDING))]))
-
-;Gets the center of a circle with (xleft, ytop) as the top-left coordinate.
-;;calc-center : uint uint uint -> (values uint uint)
-(define (calc-center xleft ytop diameter)
-  (let ([rad (floor (/ diameter 2))])
-    (values (+ xleft rad)
-            (+ ytop rad))))
-
-;;segs-equal-or-after : float (listof segment) -> (listof segment)
-(define (segs-equal-or-later real-time segs)
-  (let loop ([sgs segs])
-    (cond
-      [(null? sgs) '()]
-      [(>= (event-start-time (segment-event (car sgs))) real-time) sgs]
-      [else (loop (cdr sgs))])))
-
-;;segment-edge : segment -> uint
-(define (segment-edge seg)
-  (define evt (segment-event seg))
-  (if (event-has-duration? evt)
-      (segment-x seg)
-      (+ (segment-x seg) (segment-width seg))))
-
-(define (find-most-recent-and-next segs time)
-  (let loop ([ss segs])
-    (cond
-      [(empty? (cddr ss))
-       (values (first ss) (second ss) ss)]
-      [(> (event-start-time (segment-event (second ss))) time)
-       (values (first ss) (second ss) ss)]
-      [else
-       (loop (cdr ss))])))
-
-;;timeline-tick-label-pict : real -> pict
-(define (timeline-tick-label-pict rel-time)
-  (text-block-pict (format "~a ms" (real->decimal-string rel-time))
-                   #:backcolor (timeline-tick-label-backcolor)
-                   #:forecolor (timeline-tick-label-forecolor)
-                   #:padding 3))
-
-;;calc-ticks : (listof segment) float trace -> (listof timeline-tick)
-(define (calc-ticks segs timeToPixMod tr)
-  (define LABEL-PAD 3)
-  (define trace-start (inexact->exact (trace-start-time tr)))
-  (define segs-len (length segs))
-  (define-values (lt lx tks _ __)
-    (for/fold ([last-time trace-start]
-               [last-x 0]
-               [ticks '()]
-               [last-label-x-extent 0]
-               [remain-segs segs])
-              ([i (in-range 0 (floor (/ (- (trace-end-time tr)
-                                           trace-start)
-                                        DEFAULT-TIME-INTERVAL)))])
-      (define tick-rel-time (* (add1 i) DEFAULT-TIME-INTERVAL))
-      (define tick-time (+ trace-start tick-rel-time))
-      (define want-x (+ last-x (* DEFAULT-TIME-INTERVAL timeToPixMod)))
-      (define-values (most-recent-seg next-seg r-segs)
-        (find-most-recent-and-next remain-segs tick-time))
-      (define most-recent-evt (segment-event most-recent-seg))
-      (define most-recent-time (inexact->exact (event-start-time most-recent-evt)))
-      (define next-evt (segment-event next-seg))
-      (define next-evt-time (inexact->exact (event-start-time next-evt)))
-      (define most-recent-edge (segment-edge most-recent-seg))
-      (define next-edge (segment-x next-seg))
-      (define tick-x
-        (cond
-          [(= most-recent-time tick-time) (segment-x most-recent-seg)]
-          [(= (segment-x next-seg) (add1 (+ (segment-x most-recent-seg) (segment-width most-recent-seg))))
-           (+ (segment-x most-recent-seg) (segment-width most-recent-seg))]
-          [else
-           (define start-x (max most-recent-edge last-x))
-           (define start-time (max most-recent-time last-time))
-           (define size-mod (/ (- next-edge start-x) (- next-evt-time start-time)))
-           (define x-offset (ceiling (* (- tick-time start-time) size-mod)))
-           (round (+ start-x x-offset))]))
-      (define show-tick? ((- tick-x last-x) . >= . TIMELINE-MIN-TICK-PADDING))
-      (define show-label?
-        (if (not show-tick?)
-            #f
-            (>= tick-x (+ last-label-x-extent LABEL-PAD))))
-      (define new-label-x-extent
-        (if show-label?
-            (+ tick-x (pict-width (timeline-tick-label-pict tick-rel-time)))
-            last-label-x-extent))
-      (if show-tick?
-          (values tick-time
-                  tick-x
-                  (cons (timeline-tick tick-x tick-time tick-rel-time show-label?) ticks)
-                  new-label-x-extent
-                  r-segs)
-          (values tick-time
-                  last-x
-                  ticks
-                  new-label-x-extent
-                  r-segs))))
-  tks)
-
-;;calc-process-timespan-lines : trace (listof segment) uint -> (listof (uint . uint))
-(define (calc-process-timespan-lines trace segs max-x)
-  (for/list ([tl (in-list (trace-proc-timelines trace))])
-    (define sgs (filter (λ (s) (equal? (process-timeline-proc-id tl)
-                                        (event-proc-id (segment-event s))))
-                         segs))
-    (cond
-      [(empty? sgs) (cons 0 max-x)]
-      [else
-       (cons (segment-x (car sgs))
-             (segment-x (last sgs)))])))
-
-;;get-first-future-seg : seg -> seg
-(define (get-first-future-seg seg)
-  (let loop ([cur seg])
-    (if (segment-prev-future-seg cur)
-        (loop (segment-prev-future-seg cur))
-        cur)))
-
-;;get-first-future-seg-in-region : viewable-region segment -> segment
-(define (get-first-future-seg-in-region vregion seg)
-  (define prev-seg (get-seg-previous-to-vregion vregion seg))
-    (if ((seg-in-vregion vregion) prev-seg)
-        prev-seg
-        (segment-next-future-seg prev-seg)))
-
-;; get-seg-previous-to-vregion : viewable-region segment -> segment
-(define (get-seg-previous-to-vregion vregion seg)
-  (let loop ([cur seg])
-    (define prev (segment-prev-future-seg cur))
-    (cond
-      [(or (not prev) (not ((seg-in-vregion vregion) cur))) cur]
-      [else (loop prev)])))
-
-;;Set pixel widths of segments with variable widths, e.g.
-;;work and GC events
-;;adjust-variable-width-segs! : (listof segment) uint -> void
-(define (adjust-variable-width-segs! segs max-x)
-  (cond
-    [(empty? segs) void]
-    [else
-     (define cur (car segs))
-     (case (event-type (segment-event cur))
-       [(start-work start-0-work)
-        (define next-seg (segment-next-proc-seg cur))
-        ;Because we are truncating logs after they reach a certain size,
-        ;next-seg could be #f (where before it was safe to assume that a work segment
-        ;was always followed by another segment).
-        (define x-end (if next-seg
-                          (segment-x next-seg)
-                          max-x))
-        (set-segment-width! cur (max MIN-SEG-WIDTH
-                                     (- x-end (segment-x cur))))
-        (adjust-variable-width-segs! (cdr segs) max-x)]
-       [(gc)
-        (cond
-          [(empty? (cdr segs)) void]
-          [else
-           (set-segment-width! cur (max MIN-SEG-WIDTH
-                                        (- (segment-x (car (cdr segs))) (segment-x cur))))
-           (adjust-variable-width-segs! (cdr segs) max-x)])]
-       [else (adjust-variable-width-segs! (cdr segs) max-x)])]))
-
-;;connect-segments! : (listof segment) -> void
-(define (connect-segments! segs)
-  (for ([s (in-list segs)])
-    (define evt (segment-event s))
-    (define (segment-of-evt getter)
-      (define x (getter evt))
-      (and x (event-segment x)))
-    (set-segment-prev-proc-seg! s (segment-of-evt event-prev-proc-event))
-    (set-segment-next-proc-seg! s (segment-of-evt event-next-proc-event))
-    (set-segment-prev-future-seg! s (segment-of-evt event-prev-future-event))
-    (set-segment-next-future-seg! s (segment-of-evt event-next-future-event))
-    (set-segment-prev-targ-future-seg! s (segment-of-evt event-prev-targ-future-event))
-    (set-segment-next-targ-future-seg! s (segment-of-evt event-next-targ-future-event))))
-
-;;build-seg-layout : flonum (listof event) trace -> (values (listof segment) uint uint)
-(define (build-seg-layout timeToPixModifier events tr max-y)
-  (define num-tls (length (trace-proc-timelines tr)))
-  (define last-right-edges (build-vector num-tls (λ (n) 0)))
-  (define-values (sgs d x-extent)
-    (for/fold ([segs '()]
-               [delta 0]
-               [largest-x 0]) ([evt (in-list events)])
-      (define is-gc-evt? (equal? (event-type evt) 'gc))
-      (define last-right-edge (if is-gc-evt?
-                                  largest-x
-                                  (vector-ref last-right-edges (event-proc-index evt))))
-      (define wanted-offset (+ delta (* DEFAULT-TIMELINE-WIDTH
-                                        (inexact->exact
-                                         (/ (- (event-start-time evt) (trace-start-time tr))
-                                            (- (trace-end-time tr) (trace-start-time tr)))))))
-      (define-values (offset new-delta)
-        (if (last-right-edge . <= . wanted-offset)
-            (values wanted-offset delta)
-            (values last-right-edge (+ delta (- last-right-edge wanted-offset)))))
-      (define radius (if is-gc-evt? 0 (/ MIN-SEG-WIDTH 2)))
-      (define segw MIN-SEG-WIDTH)
-      (define segh (cond
-                     [is-gc-evt? max-y]
-                     [else MIN-SEG-WIDTH]))
-      (define seg (segment evt
-                           (round offset)
-                           (- (calc-row-mid-y (event-proc-index evt) TIMELINE-ROW-HEIGHT tr) radius)
-                           segw
-                           segh
-                           (get-event-color (event-type evt))
-                           (get-event-opacity (event-type evt))
-                           #f
-                           #f
-                           #f
-                           #f
-                           #f
-                           #f
-                           #f))
-      (set-event-segment! evt seg)
-      (when (not is-gc-evt?)
-        (vector-set! last-right-edges (event-proc-index evt) (+ offset segw)))
-      (values (cons seg segs)
-              new-delta
-              (max largest-x (+ offset segw) #;last-right-edge))))
-  (values sgs x-extent))
-
-;;calc-segments : trace uint uint -> (values frame-info (listof segment))
-(define (calc-segments tr)
-  (define evts (trace-all-events tr))
-  (define timeToPixModifier (/ DEFAULT-TIMELINE-WIDTH (- (trace-end-time tr) (trace-start-time tr))))
-  (define max-y (* TIMELINE-ROW-HEIGHT (length (trace-proc-timelines tr))))
-  (define-values (segments x)
-    (build-seg-layout timeToPixModifier evts tr max-y))
-  (define max-x (+ MIN-SEG-WIDTH (round x)))
-  (define ordered-segs (reverse segments))
-  (connect-segments! ordered-segs)
-  (adjust-variable-width-segs! ordered-segs max-x)
-  (define ticks (calc-ticks ordered-segs timeToPixModifier tr))
-  (values (frame-info max-x
-                      max-y
-                      TIMELINE-ROW-HEIGHT
-                      timeToPixModifier
-                      ticks
-                      (calc-process-timespan-lines tr ordered-segs max-x))
-          ordered-segs))
-
-;;pict-for-segment : segment -> pict
-(define (pict-for-segment seg)
-  (unless (segment-p seg)
-    (define p (if (event-has-duration? (segment-event seg))
-                  (rect-pict (segment-color seg)
-                             (timeline-event-strokecolor)
-                             (segment-width seg)
-                             (segment-height seg)
-                             #:stroke-width .5)
-                  (circle-pict (segment-color seg)
-                               (timeline-event-strokecolor)
-                               MIN-SEG-WIDTH
-                               #:stroke-width .5)))
-    (set-segment-p! seg (if (< (segment-opacity seg) 1)
-                            (cellophane p (segment-opacity seg))
-                            p)))
-  (segment-p seg))
-
-;;draw-ruler-on : pict viewable-region frameinfo -> pict
-(define (draw-ruler-on base vregion frameinfo)
-  (for/fold ([pct base]) ([tick (in-list (filter (λ (t) (in-viewable-region-horiz vregion (timeline-tick-x t)))
-                                                 (frame-info-timeline-ticks frameinfo)))])
-    (define cur-x (timeline-tick-x tick))
-    (define pinnedline
-      (pin-over pct
-                (- cur-x (viewable-region-x vregion))
-                0
-                (linestyle 'dot
-                           (colorize (vline 1
-                                            (viewable-region-height vregion))
-                                     (timeline-tick-color)))))
-    (if (timeline-tick-show-label? tick)
-        (pin-over pinnedline
-                  (- cur-x (viewable-region-x vregion))
-                  3
-                  (timeline-tick-label-pict (timeline-tick-rel-time tick)))
-        pinnedline)))
-
-;;draw-row-lines-on : pict viewable-region trace frameinfo -> pict
-(define (draw-row-lines-on base vregion tr finfo opacity)
-  (define num-tls (length (trace-proc-timelines tr)))
-  (pin-over base
-            0
-            0
-            (for/fold ([pct base]) ([tl (in-list (filter (λ (tline)
-                                                           (define midy (calc-row-mid-y (process-timeline-proc-index tline)
-                                                                                        (frame-info-row-height finfo)
-                                                                                        tr))
-                                                           (define topy (- midy (frame-info-row-height finfo)))
-                                                           (define boty (+ midy (frame-info-row-height finfo)))
-                                                           (or (in-viewable-region-vert? vregion topy)
-                                                               (in-viewable-region-vert? vregion boty)))
-                                                         (trace-proc-timelines tr)))])
-              (let* ([line-coords (list-ref (frame-info-process-line-coords finfo)
-                                           (process-timeline-proc-index tl))]
-                     [line-start (car line-coords)]
-                     [line-end (cdr line-coords)]
-                     [vregion-start (viewable-region-x vregion)]
-                     [vregion-end (viewable-region-x-extent vregion)]
-                     [start-x (cond
-                                [(< line-start vregion-start) 0]
-                                [(between line-start vregion-start vregion-end)
-                                 (- line-start vregion-start)]
-                                [else vregion-end])]
-                     [end-x (cond
-                              [(< line-end vregion-start) 0]
-                              [(between line-end vregion-start vregion-end)
-                               (- line-end vregion-start)]
-                              [else vregion-end])]
-                     [index (process-timeline-proc-index tl)]
-                     [proc-name (if (zero? index)
-                                    "Thread 0 (Runtime Thread)"
-                                    (format "Thread ~a" (process-timeline-proc-id tl)))]
-                     [proc-title (text-block-pict proc-name
-                                                  #:backcolor (header-backcolor)
-                                                  #:forecolor (header-forecolor)
-                                                  #:padding HEADER-PADDING
-                                                  #:opacity opacity
-                                                  #:width (viewable-region-width vregion))])
-                (draw-stack-onto pct
-                                 (at 0
-                                     (- (* index (frame-info-row-height finfo)) (viewable-region-y vregion))
-                                     (colorize (hline (viewable-region-width vregion) 1) (timeline-baseline-color)))
-                                 (at 0
-                                     (+ (+ (- (* index (frame-info-row-height finfo)) (viewable-region-y vregion))
-                                           (- (frame-info-row-height finfo) (pict-height proc-title)))
-                                        1)
-                                     proc-title)
-                                 (at start-x
-                                     (- (calc-row-mid-y index
-                                                        (frame-info-row-height finfo)
-                                                        tr)
-                                        (viewable-region-y vregion))
-                                     (colorize (hline (- end-x start-x) 1)
-                                               (timeline-event-baseline-color))))))))
-
-;Magnifies a segment's pict (dot or square) to make
-;it stand out when hovered over with the mouse pointer.
-;;make-stand-out-pict : segment -> pict
-(define (make-stand-out-pict seg)
-  (case (event-type (segment-event seg))
-    [(start-work start-0-work) (scale (pict-for-segment seg) 1 2)]
-    [(gc) (cellophane (pict-for-segment seg) 1)]
-    [else (scale (pict-for-segment seg) 2)]))
-
-;;frame-bg : viewable-region frame-info trace -> pict
-(define (frame-bg vregion finfo tr)
-  (draw-frame-bg-onto (colorize (filled-rectangle (viewable-region-width vregion)
-                                                  (frame-info-adjusted-height finfo))
-                                (timeline-frame-bg-color))
-                      vregion
-                      finfo
-                      tr
-                      TIMELINE-HEADER-OPACITY))
-
-;;draw-frame-bg-onto : pict viewable-region frameinfo trace -> pict
-(define (draw-frame-bg-onto base vregion finfo tr opacity)
-  (let ([with-ruler (draw-ruler-on base vregion finfo)])
-    (draw-row-lines-on with-ruler vregion tr finfo opacity)))
-
-;;timeline-pict : (listof indexed-future-event) [viewable-region] [integer] -> pict
-(define (timeline-pict logs
-                       #:x [x #f]
-                       #:y [y #f]
-                       #:width [width #f]
-                       #:height [height #f]
-                       #:selected-event-index [selected-event-index #f])
-  (define tr (build-trace logs))
-  (define-values (finfo segments) (calc-segments tr))
-  (define vregion (if x
-                      (viewable-region x y width height)
-                      (viewable-region 0 0 (frame-info-adjusted-width finfo) (frame-info-adjusted-height finfo))))
-  (timeline-pict-for-trace-data vregion
-                                tr
-                                finfo
-                                segments
-                                #:selected-event-index selected-event-index))
-
-;;timeline-pict : (or viewable-region #f) trace frame-info (listof segment) -> pict
-(define (timeline-pict-for-trace-data vregion
-                                      tr
-                                      finfo
-                                      segments
-                                      #:selected-event-index [selected-event-index #f])
-  (define vr (if (not vregion)
-                 (viewable-region 0
-                                  0
-                                  (frame-info-adjusted-width finfo)
-                                  (frame-info-adjusted-height finfo))
-                 vregion))
-  (define tp (for/fold ([pct (frame-bg vr finfo tr)])
-               ([seg (in-list (filter (seg-in-vregion vr) segments))])
-               (pin-over pct
-                         (- (segment-x seg) (viewable-region-x vr))
-                         (- (segment-y seg) (viewable-region-y vr))
-                         (pict-for-segment seg))))
-  (cond
-    [selected-event-index
-     (define overlay (timeline-overlay vregion
-                                       #f
-                                       (list-ref segments selected-event-index)
-                                       finfo
-                                       tr))
-     (pin-over tp
-               0
-               0
-               overlay)]
-    [else tp]))
-
-;;draw-connection : viewable-region segment segment pict string [uint bool symbol] -> pict
-(define (draw-connection vregion
-                         start
-                         end
-                         base-pct
-                         color
-                         #:width [width 1]
-                         #:with-arrow [with-arrow #f]
-                         #:style [style 'solid])
-  (let*-values ([(midx midy) (calc-center (- (segment-x start) (viewable-region-x vregion))
-                                          (- (segment-y start) (viewable-region-y vregion))
-                                          MIN-SEG-WIDTH)]
-                [(nextx nexty) (calc-center (- (segment-x end) (viewable-region-x vregion))
-                                            (- (segment-y end) (viewable-region-y vregion))
-                                            MIN-SEG-WIDTH)]
-                [(dx dy) (values (- nextx midx) (- nexty midy))])
-    (if (and (zero? dy)
-             (or (not (eq? (segment-next-proc-seg start) end))
-                 (< dx CONNECTION-LINE-HAT-THRESHOLD)))
-        (let* ([dxa (/ dx 2)]
-               [dya (- HAT-HEIGHT CONNECTION-LINE-HAT-THRESHOLD)]
-               [breakx (+ midx dxa)]
-               [breaky (+ midy dya)])
-          (draw-line-onto (draw-line-onto base-pct
-                                          midx
-                                          midy
-                                          breakx
-                                          breaky
-                                          color
-                                          #:width width
-                                          #:style style)
-                          breakx
-                          breaky
-                          nextx
-                          nexty
-                          color
-                          #:width width
-                          #:with-arrow with-arrow
-                          #:style style))
-        (draw-line-onto base-pct
-                        midx
-                        midy
-                        nextx
-                        nexty
-                        color
-                        #:width width
-                        #:with-arrow with-arrow
-                        #:style style))))
-
-;;draw-arrows : pict viewable-region segment -> pict
-(define (draw-arrows base-pct vregion seg)
-  (let ([fst (get-seg-previous-to-vregion vregion seg)])
-    (let loop ([pct base-pct]
-               [cur-seg fst]
-               [event-scope #f])
-        (if (not cur-seg)
-            pct
-            (let ([next (segment-next-future-seg cur-seg)])
-              (define cur-evt (segment-event cur-seg))
-              ;(define next-evt (segment-event next))
-              (define in-rtcall-scope 
-                (cond 
-                  [(and (symbol? event-scope) (or (runtime-block-event? cur-evt)
-                                                  (runtime-sync-event? cur-evt))) #f]
-                  [(worker-sync-event? cur-evt) 'sync] 
-                  [(worker-block-event? cur-evt) 'block] 
-                  [else event-scope]))
-              (let* ([next-targ (segment-next-targ-future-seg cur-seg)]
-                     [prev-targ (segment-prev-targ-future-seg cur-seg)]
-                     [ftl-arrows (if (not next)
-                                     pct
-                                     (draw-connection vregion
-                                                      cur-seg
-                                                      next
-                                                      pct
-                                                      (case in-rtcall-scope 
-                                                        [(block) (get-event-color 'block)]
-                                                        [(sync) (get-event-color 'sync)]
-                                                        [else (event-connection-line-color)])
-                                                      #:width 2))]
-                     [prev-targ-arr (if (not prev-targ)
-                                        ftl-arrows
-                                        (draw-connection vregion
-                                                         prev-targ
-                                                         cur-seg
-                                                         ftl-arrows
-                                                         (event-target-future-line-color)
-                                                         #:with-arrow #t
-                                                         #:style 'dot))]
-                     [next-targ-arr (if (not next-targ)
-                                        prev-targ-arr
-                                        (draw-connection vregion
-                                                         cur-seg
-                                                         next-targ
-                                                         prev-targ-arr
-                                                         (event-target-future-line-color)
-                                                         #:with-arrow #t
-                                                         #:style 'dot))])
-                (if (and next
-                         ((seg-in-vregion vregion) next))
-                    (loop next-targ-arr next in-rtcall-scope)
-                    next-targ-arr)))))))
-
-;Draws the pict that is layered on top of the exec. timeline canvas
-;to highlight a specific future's event sequence
-;;timeline-overlay : uint uint (or segment #f) (or segment #f) frame-info trace -> pict
-(define (timeline-overlay vregion tacked hovered finfo tr)
-  (define-values (width height) (values (viewable-region-width vregion)
-                                        (viewable-region-height vregion)))
-  (define base (blank (viewable-region-width vregion)
-                      (viewable-region-height vregion)))
-  (define-values (picked-seg showing-tacked)
-    (if tacked (values tacked #t) (values hovered #f)))
-  (cond
-    [picked-seg
-     (define bg base)
-     (define aseg-rel-x (- (segment-x picked-seg) (viewable-region-x vregion)))
-     (define aseg-rel-y (- (segment-y picked-seg) (viewable-region-y vregion)))
-     (define emphasized (make-stand-out-pict picked-seg))
-     (case (event-type (segment-event picked-seg))
-       [(gc)
-        (pin-over bg aseg-rel-x aseg-rel-y emphasized)]
-       [else
-        (let* ([line (pin-over bg
-                               (- (+ aseg-rel-x
-                                     (/ (segment-width picked-seg) 2))
-                                  2)
-                               0
-                               (colorize (vline 1 height) (hover-tickline-color)))]
-               [width-dif (/ (- (pict-width emphasized) (segment-width picked-seg)) 2)]
-               [height-dif (/ (- (pict-height emphasized) (segment-height picked-seg)) 2)]
-               [magnified (pin-over line
-                                    (- aseg-rel-x width-dif)
-                                    (- aseg-rel-y height-dif)
-                                    emphasized)]
-               [hover-magnified (if (and showing-tacked
-                                         hovered
-                                         (not (eq? hovered tacked)))
-                                    (let* ([hmag (make-stand-out-pict hovered)]
-                                           [hwidth-dif (/ (- (pict-width hmag)
-                                                             (pict-width (pict-for-segment hovered)))
-                                                          2)]
-                                           [hheight-dif (/ (- (pict-height hmag)
-                                                              (pict-height (pict-for-segment hovered)))
-                                                           2)])
-                                      (pin-over magnified
-                                                (- (- (segment-x hovered) (viewable-region-x vregion)) hwidth-dif)
-                                                (- (- (segment-y hovered) (viewable-region-y vregion)) hheight-dif)
-                                                hmag))
-                                    magnified)]
-               [arrows (draw-arrows hover-magnified vregion picked-seg)])
-          arrows)])]
-    [else base]))
-
-;Draw a line from one node on the creation graph to another
-;;line-from : drawable-node drawable-node pict viewable-region -> pict
-(define (line-from start end pct minx miny)
-  (define par-center (drawable-node-center start))
-  (define child-center (drawable-node-center end))
-  (draw-line-onto pct
-                  (- (point-x par-center) minx)
-                  (- (point-y par-center) miny)
-                  (- (point-x child-center) minx)
-                  (- (point-y child-center) miny)
-                  (create-graph-edge-color)
-                  #:width 1
-                  #:style 'dot))
-
-;Draws a circle for a node on the creation graph
-;;node-pict : drawable-node -> pict
-(define (node-pict dnode)
-  (let* ([ndata (node-data (drawable-node-node dnode))]
-         [ntext (if (equal? ndata 'runtime-thread)
-                    "RTT"
-                    (format "~a" (event-user-data ndata)))])
-    (cc-superimpose (circle-pict (create-graph-node-backcolor)
-                                 (create-graph-node-strokecolor)
-                                 (drawable-node-width dnode))
-                    (colorize (text ntext) (create-graph-node-forecolor)))))
-
-;;creation-tree-pict : (listof indexed-future-event) [enni] [enni] [enni] [enni] [enni] [enni] [enni] -> pict
-(define (creation-tree-pict events
-                             #:x [x #f]
-                             #:y [y #f]
-                             #:width [width #f]
-                             #:height [height #f]
-                             #:node-width [node-width #f]
-                             #:padding [padding #f]
-                             #:zoom [zoom CREATE-GRAPH-MIN-ZOOM])
-  (define tr (build-trace events))
-  (define node-diam (if node-width
-                        node-width
-                        CREATE-GRAPH-NODE-DIAMETER))
-  (define graph-padding (if padding
-                            padding
-                            CREATE-GRAPH-PADDING))
-  (define layout (draw-tree (trace-creation-tree tr)
-                            #:node-width node-diam
-                            #:padding graph-padding
-                            #:zoom zoom))
-  (define vregion (if x
-                      (viewable-region x y width height)
-                      #f))
-  (draw-creategraph-pict vregion layout))
-
-
-;;draw-creategraph-pict : (or/c viewable-region #f) tree-layout -> pict
-;; if vregion is #f, return a pict that includes the entire tree
-(define (draw-creategraph-pict vregion layout)
-  (define rt-root (first (graph-layout-nodes layout)))
-  (define width (inexact->exact (floor (graph-layout-width layout))))
-  (define height (inexact->exact (floor (graph-layout-height layout))))
-  (define base (if vregion
-                   (blank (viewable-region-width vregion) (viewable-region-height vregion))
-                   (blank)))
-  (define minx (if vregion (viewable-region-x vregion) 0))
-  (define miny (if vregion (viewable-region-y vregion) 0))
-  (define viewable-nodes (if vregion
-                             (filter (λ (n) (in-viewable-region vregion
-                                                                (drawable-node-x n)
-                                                                (drawable-node-y n)
-                                                                (drawable-node-width n)
-                                                                (drawable-node-width n)))
-                                     (graph-layout-nodes layout))
-                             (graph-layout-nodes layout)))
-  (define with-arrows
-    (let ([arrow-pct (for/fold ([pct base]) ([node (in-list (graph-layout-nodes layout))])
-                       (for/fold ([p pct]) ([child (in-list (drawable-node-children node))])
-                         (line-from node child p minx miny)))])
-      (for/fold ([pct arrow-pct]) ([node (in-list viewable-nodes)])
-        (pin-over pct
-                  (- (drawable-node-x node) minx)
-                  (- (drawable-node-y node) miny)
-                  (node-pict node)))))
-  (if vregion
-      with-arrows
-      (panorama with-arrows)))
-
-(define (zoom-level->factor zoom-level)
-   (+ 1.0 (* (- zoom-level CREATE-GRAPH-DEFAULT-ZOOM)
-                       CREATE-GRAPH-ZOOM-FACTOR)))
-
-;;graph-overlay-pict : drawable-node trace graph-layout -> pict
-(define (graph-overlay-pict hover-node tr layout vregion scale-factor)
-  (define (root-sym-or-first-evt n) (node-data (drawable-node-node n)))
-  (cond
-    [(or (not hover-node) (equal? (root-sym-or-first-evt hover-node) 'runtime-thread))
-      #f]
-    [else
-     (define fid (event-user-data (root-sym-or-first-evt hover-node)))
-     (define ri (hash-ref (trace-future-rtcalls tr) fid #f))
-     (cond
-       [(not ri) #f]
-       [else
-        (define block-ops (sort (hash-keys (rtcall-info-block-hash ri))
-                                >
-                                #:key (λ (p)
-                                        (hash-ref (rtcall-info-block-hash ri) p))))
-        (define sync-ops (sort (hash-keys (rtcall-info-sync-hash ri))
-                               >
-                               #:key (λ (op)
-                                       (hash-ref (rtcall-info-sync-hash ri) op))))
-        (define-values (node-origin-x node-origin-y)
-          (values (* (- (drawable-node-x hover-node) (viewable-region-x vregion)) scale-factor)
-                  (* (- (drawable-node-y hover-node) (viewable-region-y vregion)) scale-factor)))
-        (define-values (center-x center-y)
-          (values (+ node-origin-x (/ (* (drawable-node-width hover-node) scale-factor) 2))
-                  (+ node-origin-y (/ (* (drawable-node-width hover-node) scale-factor) 2))))
-        (define x (+ center-x CREATE-GRAPH-NODE-DIAMETER))
-        (define-values (pct yacc)
-          (for/fold ([p (pin-over (blank (viewable-region-width vregion) (viewable-region-height vregion))
-                                  node-origin-x
-                                  node-origin-y
-                                  (scale (node-pict hover-node) scale-factor))]
-                     [yacc node-origin-y])
-            ([rtcall (in-list (append (map (λ (op) (cons 'block op)) block-ops)
-                                      (map (λ (op) (cons 'sync op)) sync-ops)))])
-            (define evt-type (car rtcall))
-            (define prim (cdr rtcall))
-            (define the-hash (if (equal? evt-type 'block) (rtcall-info-block-hash ri) (rtcall-info-sync-hash ri)))
-            (define txtp (text-pict (format "~a (~a)"
-                                            (symbol->string prim)
-                                            (hash-ref the-hash prim))
-                                    #:color (get-event-forecolor evt-type)))
-            (define txtbg (rect-pict (get-event-color evt-type)
-                                     (create-graph-edge-color)
-                                     (+ (pict-width txtp) (* TOOLTIP-MARGIN 2))
-                                     (+ (pict-height txtp) (* TOOLTIP-MARGIN 2))
-                                     #:stroke-width .5))
-            (values
-             (pin-over (draw-line-onto p
-                                       center-x
-                                       center-y
-                                       x
-                                       yacc
-                                       (create-graph-edge-color))
-                       x
-                       yacc
-                       (pin-over txtbg
-                                 TOOLTIP-MARGIN
-                                 TOOLTIP-MARGIN
-                                 txtp))
-             (+ yacc (pict-height txtbg) CREATE-GRAPH-PADDING))))
-        pct])]))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/visualizer-gui.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/visualizer-gui.rkt
deleted file mode 100644
index b6d7e0971c..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/private/visualizer-gui.rkt
+++ /dev/null
@@ -1,403 +0,0 @@
-#lang racket/gui 
-(require framework 
-         data/interval-map 
-         mrlib/hierlist
-         "visualizer-drawing.rkt" 
-         "visualizer-data.rkt" 
-         "gui-helpers.rkt" 
-         "graph-drawing.rkt"
-         "display.rkt" 
-         "constants.rkt" 
-         "pict-canvas.rkt")    
-
-(provide show-visualizer) 
-
-;;rebuild-mouse-index : frame-info trace (listof segment) -> interval-map of (range --> interval-map)
-(define (rebuild-mouse-index frameinfo tr segs) 
-  (let ([ym (make-interval-map)]) 
-    (for ([tl (in-list (trace-proc-timelines tr))]) 
-      (define xm (make-interval-map)) 
-      (define-values (miny maxy) 
-        (cond 
-          [(equal? (process-timeline-proc-id tl) 'gc) 
-           (values 0 (frame-info-adjusted-height frameinfo))] 
-          [else 
-           (define midy (calc-row-mid-y (process-timeline-proc-index tl)
-                                        (frame-info-row-height frameinfo) 
-                                        tr)) 
-           (values (floor (- midy (/ MIN-SEG-WIDTH 2))) 
-                   (floor (+ midy (/ MIN-SEG-WIDTH 2))))]))
-        (interval-map-set! ym 
-                           miny 
-                           maxy 
-                           xm) 
-        (for ([seg (in-list (filter (λ (s) 
-                                      (equal? (event-proc-id (segment-event s)) 
-                                              (process-timeline-proc-id tl))) 
-                                    segs))]) 
-          (interval-map-set! xm 
-                             (segment-x seg) 
-                             (+ (segment-x seg) (segment-width seg)) 
-                             seg)))
-    ym)) 
-
-;;display-evt-details : segment trace message message message message message message -> void
-(define (display-evt-details seg 
-                             tr
-                             selected-label 
-                             time-label 
-                             fid-label 
-                             pid-label 
-                             data-label1 
-                             data-label2) 
-  (if seg 
-      (let ([evt (segment-event seg)]) 
-        (send selected-label set-label (format "Event: ~a" (event-type evt))) 
-        (send time-label set-label (format "Time: +~a" (get-time-string (- (event-start-time evt) 
-                                                                           (trace-start-time tr))))) 
-        (send fid-label set-label (format "Future ID: ~a" (if (not (event-future-id evt)) 
-                                                              "None (top-level event)" 
-                                                              (event-future-id evt)))) 
-        (send pid-label set-label (format "Process ID: ~a" 
-                                          (let ([id (event-proc-id evt)]) 
-                                            (if (equal? id 'gc) 
-                                                RT-THREAD-ID 
-                                                id))))
-        (case (event-type evt) 
-          [(start-work start-0-work gc) 
-           (send data-label1 set-label (format "Duration: ~a" (get-time-string (- (event-end-time evt) 
-                                                                                  (event-start-time evt)))))] 
-          [(block sync) 
-           (if (event-prim-name evt) 
-             (send data-label1 set-label (format "Primitive: ~a" (symbol->string (event-prim-name evt)))) 
-             (send data-label1 set-label ""))
-           (define label2-txt 
-             (cond 
-               ;If the log was unexpectedly truncated, some worker blocks/syncs may not have been linked 
-               ;with their runtime counterparts -- check to make sure prim-name is present
-               [(event-prim-name evt)
-                (cond  
-                  [(touch-event? evt) (format "Touching future ~a" (event-user-data evt))]
-                  [(allocation-event? evt) (format "Size: ~a" (event-user-data evt))] 
-                  [(jitcompile-event? evt) (format "Jitting: ~a" (event-user-data evt))] 
-                  [else ""])] 
-               [else ""]))
-           (send data-label2 set-label label2-txt)] 
-          [(create) 
-           (send data-label1 set-label (format "Creating future ~a" (event-user-data evt)))] 
-          [(touch) 
-           (send data-label1 set-label (format "Touching future ~a" (event-user-data evt)))]
-          [else 
-           (send data-label1 set-label "")
-           (send data-label2 set-label "")]))  
-      (begin 
-        (send selected-label set-label "") 
-        (send time-label set-label "") 
-        (send fid-label set-label "") 
-        (send pid-label set-label "") 
-        (send data-label1 set-label "") 
-        (send data-label2 set-label ""))))
-
-(define (get-window-size) 
-  (define-values (screen-w screen-h) (get-display-size)) 
-  (values (min screen-w DEF-WINDOW-WIDTH) 
-          (min screen-h DEF-WINDOW-HEIGHT)))
-
-(define (show-visualizer #:timeline [timeline #f]) 
-  (define the-tl (if timeline timeline (timeline-events)))
-  (when (empty? the-tl) 
-    (error 'show-visualizer "No future log messages found."))
-  (define the-trace (build-trace the-tl))  
-  (define-values (winw winh) (get-window-size))
-  ;The event segment we are currently mousing over
-  (define hover-seg #f) 
-  ;The event segment we last clicked on (tacked) -- if any
-  (define tacked-seg #f)
-  ;Table for broadcasting selection events to other controls
-  (define listener-table (make-listener-table))
-  
-  (define f (new frame:standard-menus% 
-                 [label "Futures Performance"] 
-                 [width winw] 
-                 [height winh])) 
-  (define main-panel (new panel:horizontal-dragable% 
-                          [parent (send f get-area-container)]))
-  
-  (define left-panel (new panel:horizontal-dragable% [parent main-panel] 
-                          [stretchable-width #t]))
-  (define hlist-ctl (new hierarchical-list% 
-                         [parent left-panel] 
-                         [stretchable-width #t] 
-                         [stretchable-height #t] 
-                         [style '(control-border)]))
-  
-  ;Build up items in the hierlist 
-  (define block-node (send hlist-ctl new-list)) 
-  (send (send block-node get-editor) insert (format "Blocks (~a)" (trace-num-blocks the-trace)) 0)
-  (for ([prim (in-list (sort (hash-keys (trace-block-counts the-trace)) > #:key (λ (x) (hash-ref (trace-block-counts the-trace) x))))]) 
-    (define item (send block-node new-item)) 
-    (send (send item get-editor) insert (format "~a (~a)" prim (hash-ref (trace-block-counts the-trace) prim))))
-  (send block-node open)
-  
-  (define sync-node (send hlist-ctl new-list)) 
-  (send (send sync-node get-editor) insert (format "Syncs (~a)" (trace-num-syncs the-trace)) 0) 
-  (for ([prim (in-list (sort (hash-keys (trace-sync-counts the-trace)) > #:key (λ (x) (hash-ref (trace-sync-counts the-trace) x))))]) 
-    (define item (send sync-node new-item)) 
-    (send (send item get-editor) insert (format "~a (~a)" prim (hash-ref (trace-sync-counts the-trace) prim))))
-  (send sync-node open)
-  
-  (define gc-node (send hlist-ctl new-list))
-  (define gc-time (for/fold ([gc-time 0.0]) ([gc (in-list (process-timeline-events (trace-gc-timeline the-trace)))])
-                    (define item (send gc-node new-item))
-                    (define len-ms (- (event-end-time gc) (event-start-time gc)))
-                    (send (send item get-editor) insert (format "~a: ~a - ~a (~a ms)" 
-                                                                (case (event-user-data gc) 
-                                                                  [(major) "Major"]
-                                                                  [(minor) "Minor"])
-                                                                (relative-time the-trace (event-start-time gc))
-                                                                (relative-time the-trace (event-end-time gc))
-                                                                len-ms))
-                    (+ gc-time len-ms)))
-  (send (send gc-node get-editor) insert (format "GC's (~a total, ~a ms)" 
-                                                   (trace-num-gcs the-trace)
-                                                   gc-time) 
-        0)
-  (send gc-node open)
-  
-  (define right-panel (new panel:vertical-dragable% 
-                          [parent main-panel] 
-                          [stretchable-width #t]))
-  (define graphic-panel (new panel:horizontal-dragable% 
-                             [parent right-panel] 
-                             [stretchable-height #t] 
-                             [stretchable-width #t]))
-  (define timeline-container (new vertical-panel% 
-                                  [parent graphic-panel] 
-                                  [stretchable-width #t] 
-                                  [stretchable-height #t])) 
-  (define graph-container (new vertical-panel% 
-                               [parent graphic-panel]
-                               [stretchable-width #t]
-                               [stretchable-height #t])) 
-  (define timeline-header (section-header timeline-container "Execution Timeline" 'horizontal)) 
-  (define graph-header (section-header graph-container "Future Creation Tree" 'horizontal))
-  
-  ;Calculate required sizes, mouse hover index, and create timeline pict container
-  (define-values (frameinfo segments) (calc-segments the-trace))
-  (define timeline-mouse-index (rebuild-mouse-index frameinfo the-trace segments))   
-  (define timeline-panel (new pict-canvas% 
-                              [parent timeline-container]
-                              [pict-builder (λ (vregion) (timeline-pict-for-trace-data vregion the-trace frameinfo segments))] 
-                              [hover-handler (λ (x y vregion) 
-                                               (let ([seg (find-seg-for-coords x y timeline-mouse-index)])
-                                                 (cond 
-                                                   [(equal? seg hover-seg) #f] 
-                                                   [else 
-                                                    (set! hover-seg seg) 
-                                                    (post-event listener-table 'segment-hover timeline-panel seg) 
-                                                    (if (not seg) #t seg)])))]
-                              [click-handler (λ (x y vregion) 
-                                               (let ([seg (find-seg-for-coords x y timeline-mouse-index)]) 
-                                                 (set! tacked-seg seg)  
-                                                 (post-event listener-table 'segment-click timeline-panel seg) 
-                                                 seg))] 
-                              [overlay-builder (λ (vregion scale-factor) 
-                                                 (timeline-overlay vregion 
-                                                                   tacked-seg 
-                                                                   hover-seg 
-                                                                   frameinfo 
-                                                                   the-trace))]
-                              [style '(hscroll vscroll)] 
-                              [stretchable-width #t]))
-  ;; TODO sometimes the sizes passed to the scrollbars are so big we blow up!
-  (send timeline-panel init-auto-scrollbars 
-        (frame-info-adjusted-width frameinfo) 
-        (frame-info-adjusted-height frameinfo) 
-        0.0 
-        0.0)
-  (send timeline-panel show-scrollbars #t #t)
-  
-  ;Calculate for and create creation graph pict container
-  (define creation-tree-layout (draw-tree (trace-creation-tree the-trace) 
-                                          #:node-width CREATE-GRAPH-NODE-DIAMETER 
-                                          #:padding CREATE-GRAPH-PADDING 
-                                          #:zoom CREATE-GRAPH-DEFAULT-ZOOM))
-  
-  (define hovered-graph-node #f)
-  (define creategraph-panel (new pict-canvas% 
-                                 [parent graph-container]
-                                 [pict-builder (λ (vregion) 
-                                                 (draw-creategraph-pict vregion 
-                                                                         creation-tree-layout))]
-                                 [hover-handler (λ (x y vregion) 
-                                                  (define hovered (find-node-for-coords x y 
-                                                                                        (graph-layout-nodes creation-tree-layout))) 
-                                                  (cond 
-                                                    [(eq? hovered hovered-graph-node) #f] 
-                                                    [else 
-                                                     (set! hovered-graph-node 
-                                                           (find-node-for-coords x 
-                                                                                 y 
-                                                                                 (graph-layout-nodes creation-tree-layout))) 
-                                                     (if (not hovered-graph-node) #t hovered-graph-node)]))]
-                                 [click-handler (λ (x y vregion)
-                                                  (define fid (find-fid-for-coords 
-                                                               x y (graph-layout-nodes creation-tree-layout)
-                                                               vregion))
-                                                  (cond 
-                                                    [(not fid) #f] 
-                                                    [else
-                                                     (define seg (first-seg-for-fid fid segments))
-                                                     (set! tacked-seg seg) 
-                                                     (send timeline-panel redraw-everything)
-                                                     (post-event listener-table 'segment-click timeline-panel seg) 
-                                                     #t]))]
-                                 [overlay-builder (λ (vregion scale-factor) 
-                                                    (graph-overlay-pict hovered-graph-node 
-                                                                        the-trace 
-                                                                        creation-tree-layout 
-                                                                        vregion 
-                                                                        scale-factor))]
-                                 [style '(hscroll vscroll)] 
-                                 [stretchable-width #t]))   
-    
-  (send creategraph-panel show-scrollbars #t #t)
-  (send creategraph-panel init-auto-scrollbars 
-        (inexact->exact (floor (graph-layout-width creation-tree-layout))) 
-        (inexact->exact (floor (graph-layout-height creation-tree-layout)))
-        0.0 
-        0.0) 
-  
-  
-  (define graph-footer (new horizontal-panel% 
-                            [parent graph-container] 
-                            [stretchable-width #t]
-                            [stretchable-height #f]
-                            [style '(border)]))
-  (define cg-zoom-level CREATE-GRAPH-DEFAULT-ZOOM)
-  
-  ;;Handles a change event for the creation graph zoom slider 
-  ;;on-zoom : slider% event% -> void
-  (define (on-zoom slider event)
-    (send creategraph-panel set-scale-factor! (zoom-level->factor (send slider get-value)))
-    (send creategraph-panel redraw-everything))
-    
-  (define zoom-slider (new slider% 
-                           [parent graph-footer] 
-                           [label "Zoom:"] 
-                           [min-value CREATE-GRAPH-MIN-ZOOM] 
-                           [max-value CREATE-GRAPH-MAX-ZOOM] 
-                           [init-value CREATE-GRAPH-DEFAULT-ZOOM]
-                           [style '(horizontal plain)]
-                           [callback on-zoom]))
-  (define bottom-panel (new panel:horizontal-dragable% 
-                            [parent right-panel] 
-                            [style '(border)] 
-                            [stretchable-height #t]))
-  
-  (define left-container (new horizontal-panel% 
-                              [parent bottom-panel] 
-                              [style '(border)] 
-                              [stretchable-height #t] 
-                              [stretchable-width #t])) 
-  (define right-container (new horizontal-panel% 
-                             [parent bottom-panel] 
-                             [stretchable-height #t]
-                             [stretchable-width #t])) 
-  (define left-bot-header (section-header left-container "Execution Statistics" 'vertical))
-  (define left-bot-panel (new vertical-panel% 
-                              [parent left-container]  
-                              [stretchable-height #t])) 
-  (define right-bot-header (section-header right-container "Event Details" 'vertical))
-  (define right-bot-panel (new vertical-panel% 
-                            [parent right-container]
-                            [stretchable-height #t]))
-  
-  (bold-label left-bot-panel "Program Statistics") 
-  (define runtime-label (label left-bot-panel 
-                               (format "Real time: ~a" (get-time-string (trace-real-time the-trace)))))
-  (define fcount-label (label left-bot-panel 
-                              (format "Total futures: ~a" (trace-num-futures the-trace)))) 
-  (define blocks-label (label left-bot-panel 
-                              (format "Barricades: ~a" (trace-num-blocks the-trace)))) 
-  (define syncs-label (label left-bot-panel 
-                             (format "Syncs: ~a" (trace-num-syncs the-trace))))
-  (define gcs-label (label left-bot-panel 
-                           (format "GC's: ~a" (trace-num-gcs the-trace))))
-                               
-  ;Selected-event-specific labels   
-  (define hover-label (mt-bold-label right-bot-panel))
-  (define hover-time-label (mt-label right-bot-panel)) 
-  (define hover-fid-label (mt-label right-bot-panel)) 
-  (define hover-pid-label (mt-label right-bot-panel))
-  (define hover-data-label1 (mt-label right-bot-panel))
-  (define hover-data-label2 (mt-label right-bot-panel))
-  
-  (define tacked-label (mt-bold-label right-bot-panel)) 
-  (define tacked-time-lbl (mt-label right-bot-panel)) 
-  (define tacked-fid-lbl (mt-label right-bot-panel)) 
-  (define tacked-pid-lbl (mt-label right-bot-panel)) 
-  (define tacked-data-lbl (mt-label right-bot-panel))
-  (define tacked-data-lbl2 (mt-label right-bot-panel))
-  
-  (define (update-event-details-panel seg) 
-    (display-evt-details hover-seg 
-                         the-trace
-                         hover-label 
-                         hover-time-label 
-                         hover-fid-label 
-                         hover-pid-label 
-                         hover-data-label1 
-                         hover-data-label2) 
-    (display-evt-details tacked-seg 
-                         the-trace
-                         tacked-label 
-                         tacked-time-lbl 
-                         tacked-fid-lbl 
-                         tacked-pid-lbl 
-                         tacked-data-lbl 
-                         tacked-data-lbl2))   
-  
-  ;Wire up events so selection, etc. in one panel is communicated to others 
-  (define (on-future-selected fid) 
-    0)
-  
-  (define (on-segment-hover seg) 
-    0)
-  
-  (define (on-segment-click seg) 
-    0)
-  
-  (define (on-segment-unclick seg) 
-    0)
-  
-  ;Wire up event handlers for selection, etc.
-  (add-receiver listener-table 'future-selected timeline-panel on-future-selected)
-  (add-receiver listener-table 'segment-hover creategraph-panel on-segment-hover) 
-  (add-receiver listener-table 'segment-click creategraph-panel on-segment-click)
-  (add-receiver listener-table 'segment-click right-bot-panel update-event-details-panel) 
-  (add-receiver listener-table 'segment-hover right-bot-panel update-event-details-panel)
-  (add-receiver listener-table 'segment-unclick right-bot-panel update-event-details-panel)
-  (add-receiver listener-table 'segment-unclick creategraph-panel on-segment-unclick)
-  
-  ;Additional menus/items 
-  (define showing-create-graph #t)
-  (define view-menu (new menu% [label "View"] [parent (send f get-menu-bar)]))
-  (new menu-item% 
-       [label "Hide Creation Tree"] 
-       [parent view-menu] 
-       [callback (λ (item evt) 
-                   (if showing-create-graph 
-                       (begin 
-                         (send graphic-panel delete-child graph-container) 
-                         (send item set-label "Show Creation Tree")) 
-                       (begin 
-                         (send graphic-panel add-child graph-container) 
-                         (send item set-label "Hide Creation Tree"))) 
-                   (set! showing-create-graph (not showing-create-graph)))])
-  
-  (send main-panel set-percentages '(1/5 4/5))
-  (send right-panel set-percentages '(3/4 1/4))
-  (send bottom-panel set-percentages '(1/2 1/2))
- 
-  (send f show #t))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/scribblings/common.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/scribblings/common.rkt
deleted file mode 100644
index 8dd07868b8..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/scribblings/common.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-
-(require (for-label racket/base)
-         scribble/manual
-         scribble/decode)
-
-(provide (for-label (all-from-out racket/base))
-         (all-from-out scribble/manual)
-         guideintro
-         refsecref)
-
-(define (refsecref s)
-  (secref #:doc '(lib "scribblings/reference/reference.scrbl") s))
-
-(define (guidesecref s)
-  (secref #:doc '(lib "scribblings/guide/guide.scrbl") s))
-
-(define Guide
-  (other-manual '(lib "scribblings/guide/guide.scrbl")))
-
-(define (guideintro tag . s)
-  (apply margin-note
-         (decode-content (append (list (guidesecref tag) " in " Guide " introduces ")))))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/scribblings/future-visualizer.scrbl b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/scribblings/future-visualizer.scrbl
deleted file mode 100644
index 026b3bfa97..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/scribblings/future-visualizer.scrbl
+++ /dev/null
@@ -1,148 +0,0 @@
-#lang scribble/doc 
-@(require "common.rkt" (for-label future-visualizer
-                                  future-visualizer/trace
-                                  racket/future)) 
-
-@title[#:tag "futures-visualizer"]{Futures Visualizer} 
-
-@guideintro["effective-futures"]{the future visualizer}
-
-@defmodule[future-visualizer] 
-
-The @deftech{futures visualizer} is a graphical profiling tool 
-for parallel programs written using @racket[future].  The tool 
-shows a timeline of a program's execution including all future-related 
-events, as well as the overall amount of processor utilization 
-at any point during the program's lifetime. 
-
-@deftogether[(
-  @defform[(visualize-futures e ...)]  
-  @defproc[(visualize-futures-thunk [thunk (-> any)]) any]
-)]{
- The @racket[visualize-futures] macro enables the collection 
- of data required by the visualizer and displays a profiler 
- window showing the corresponding trace.  The @racket[visualize-futures-thunk] 
- provides similar functionality where program code is contained 
- within @racket[thunk].
- 
- A typical program using profiling might look like the following: 
- 
- @racketblock[
-    (require racket/future 
-             future-visualizer) 
-    
-    (visualize-futures 
-     (let ([f (future (lambda () ...))]) 
-       ... 
-       (touch f)))
-  ]
- 
- The preceding program is equivalent to:
- 
- @racketblock[ 
-    (require racket/future 
-             future-visualizer/trace
-             future-visualizer) 
-                                      
-    (start-future-tracing!) 
-    (let ([f (future (lambda () ...))]) 
-      ... 
-      (touch f)) 
-    (stop-future-tracing!)
-    (show-visualizer)
- ]
-}
-
-@defproc[(show-visualizer [#:timeline timeline (listof indexed-future-event?)]) void?]{
- Displays the visualizer window.  If the function is called with no arguments, 
- it must be preceded by the following sequence: a call to @racket[start-future-tracing!], 
- program code that is being traced, and a call to @racket[stop-future-tracing!] -- in which case 
- the visualizer will show data for all events logged in between those calls (via @racket[timeline-events]).  
- Note that @racket[visualize-futures] and @racket[visualize-futures-thunk] are simpler alternatives to using these 
- primitives directly.
- The @racket[timeline] argument can be used to show the visualizer for a previously-generated 
- trace.
-}                                                      
-
-@section[#:tag "future-visualizer-timeline"]{Execution Timeline} 
-
-The @deftech{execution timeline}, shown in the top left-hand corner of the 
-profiler window, displays a history of the program 
-and all events associated with its futures, with OS-level threads 
-or @deftech{processes} organized along the y-axis and time increasing along 
-the x-axis.  Garbage collections are shown as translucent maroon bars spanning 
-the height of the timeline.  A coloring convention is used to distinguish between 
-different types of events (see @refsecref["future-logging"] for a full 
-description of these event types): 
-
-@itemlist[ 
-  @item{Blue dot: @racket['create]} 
-   
-  @item{Green bar: @racket['start-work], @racket['start-0-work]} 
-  
-  @item{Orange dot: @racket['sync]} 
-  
-  @item{Red dot: @racket['block], @racket['touch]} 
-  
-  @item{White dot: @racket['result], @racket['end-work]} 
-  
-  @item{Green dot: @racket['touch-pause], @racket['touch-resume]} 
-  
-  @item{Maroon bar: @racket['gc]}
-]
-
-Mousing over any non-GC event connects it via purple lines to the sequence 
-of events for its future.  Additionally, orange dotted lines 
-with arrowheads may be shown to indicate operations performed from 
-one future to another (e.g. @racket['create] or @racket['touch] actions).  
-To view details about two events simultaneously, a selection 
-can be tacked by clicking the mouse.  
-
-The timeline displays vertical lines at 100-microsecond intervals.  Note that 
-though the time interval is fixed, the pixel distance between lines varies 
-based on the event density for any given time range to prevent overlapping 
-event circles.  
-
-@defproc[(timeline-pict [events (listof indexed-future-event?)] 
-                        [#:x x (or #f exact-nonnegative-integer?) #f] 
-                        [#:y y (or #f exact-nonnegative-integer?) #f] 
-                        [#:width width (or #f exact-nonnegative-integer?) #f] 
-                        [#:height height (or #f exact-nonnegative-integer?) #f] 
-                        [#:selected-event-index selected-event-index (or #f exact-nonnegative-integer?) #f]) pict?]{
-  Returns a @racket[pict] showing the execution timeline for the trace in @racket[events].  The optional 
-  arguments @racket[x], @racket[y], @racket[width], and @racket[height] can be used to obtain a specific 
-  area (in pixels) of the timeline image.  The @racket[selected-event-index] argument, if specified, shows 
-  the timeline image as if the user placed the mouse pointer over the @racket[indexed-future-event] with 
-  the corresponding index.
-}                                                                                                      
-
-@section[#:tag "future-visualizer-tree"]{Future Creation Tree} 
-
-The @deftech{creation tree} shows a tree with a single node per 
-future created by the program.  This display can be particularly useful 
-for programs which spawn futures in nested fashion (futures within futures).  
-For any given future node, the children 
-of that node represent futures which were created by that future (within 
-the scope of its thunk).  For all programs, the root of the tree 
-is a special node representing the main computation thread (the runtime thread), 
-and is denoted @deftech{RTT}.
-
-@defproc[(creation-tree-pict [events (listof indexed-future-event?)] 
-                              [#:x x (or #f exact-nonnegative-integer?) #f] 
-                              [#:y y (or #f exact-nonnegative-integer?) #f] 
-                              [#:width width (or #f exact-nonnegative-integer?) #f] 
-                              [#:node-width node-width (or #f exact-nonnegative-integer?) #f]
-                              [#:height height (or #f exact-nonnegative-integer?) #f] 
-                              [#:padding padding (or #f exact-nonnegative-integer?) #f] 
-                              [#:zoom zoom exact-nonnegative-integer? 1]) pict?]{
-  Returns a @racket[pict] showing the future creation tree for the trace in @racket[events].  The optional 
-  arguments @racket[x], @racket[y], @racket[width], and @racket[height] can be used to obtain a specific 
-  area (in pixels) of the creation tree image.  The @racket[node-width] argument 
-  specifies (in pixels) the diameter of each node.  The @racket[padding] argument specifies the minimum space vertically 
-  between each depth and horizontally between siblings.  The @racket[zoom] argument specifies the zoom factor for the 
-  tree image in the range 1-5, where 5 returns a 500% zoom.
-}
-
-@; ----------------------------------------
-
-@include-section["futures-trace.scrbl"]
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/scribblings/futures-trace.scrbl b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/scribblings/futures-trace.scrbl
deleted file mode 100644
index 00d002d456..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/scribblings/futures-trace.scrbl
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang scribble/doc 
-@(require "common.rkt" 
-          (for-label racket/future 
-                     future-visualizer/trace)) 
-
-@title[#:tag "futures-trace"]{Futures Tracing} 
-
-@defmodule[future-visualizer/trace]
-
-The @deftech{futures trace} module exposes low-level information about 
-the execution of parallel programs written using @racket[future].   
-
-
-@deftogether[(
-  @defform[(trace-futures e ...)] 
-  @defproc[(trace-futures-thunk [thunk (-> any)]) (listof indexed-future-event?)]
-)]{
- The @racket[trace-futures] macro and @racket[trace-futures-thunk] function 
- track the execution of a program using futures and return the program 
- trace as a list of @racket[indexed-future-event] structures.
- 
- This program:
- 
- @racketblock[ 
-    (require racket/future 
-             future-visualizer/trace) 
-     
-    (trace-futures  
-     (let ([f (future (lambda () ...))]) 
-       ... 
-       (touch f)))
- ]
- 
- Is equivalent to:
- 
- @racketblock[ 
-    (require racket/future 
-             future-visualizer/trace) 
-                                      
-    (start-future-tracing!) 
-    (let ([f (future (lambda () ...))]) 
-      ... 
-      (touch f)) 
-    (stop-future-tracing!)
-    (timeline-events)
- ]
-}
-
-@deftogether[(
-  @defproc[(start-future-tracing!) void?]
-  @defproc[(stop-future-tracing!) void?]
-  @defproc[(timeline-events) (listof indexed-future-event?)]
-)]{
- The @racket[start-future-tracing!] procedure enables the collection 
- of future-related execution data.  This function should be called immediately 
- prior to executing code the programmer wishes to profile. 
- 
- The @racket[stop-future-tracing!] procedure must be used to indicate the 
- end of code the programmer wishes to trace.  Tracing works by simply using a 
- log receiver to record all future-related log events; this procedure logs a 
- special message that is well-known to the log receiver to mean 'stop recording'.
- 
- The @racket[timeline-events] procedure returns the program trace as 
- a list of @racket[indexed-future-event] structures. 
-}
-  
-@defstruct[indexed-future-event ([index exact-nonnegative-integer?] 
-                                 [event any])]{
-  Represents an individual log message in a program trace.  In addition to 
-  future events, the tracing code also records garbage collection events; hence 
-  the @racket[event] field may contain either a @racket[future-event] or gc-info 
-  @(tech "prefab" #:doc '(lib "scribblings/reference/reference.scrbl")) struct (see @refsecref["garbagecollection"]), 
-  where the latter describes a GC operation.  Because multiple 
-  @racket[future-event] structures may contain identical timestamps, the 
-  @racket[index] field ranks them in the order in which they were recorded 
-  in the log output.
-}
-                                                                      
-@defstruct[future-event ([future-id (or exact-nonnegative-integer? #f)]
-                         [proc-id exact-nonnegative-integer?] 
-                         [action symbol?] 
-                         [time-id real?] 
-                         [prim-name (or symbol? #f)] 
-                         [user-data (or #f symbol? exact-nonnegative-integer?)]) 
-                        #:prefab]{
- Represents a future event as logged by the run-time system. See
-@refsecref["future-logging"] for more information.}
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/blocks.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/blocks.rkt
deleted file mode 100644
index 4e35a7d991..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/blocks.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang scheme/base
-
-(require scheme/future 
-         scheme/list 
-         rackunit
-         (only-in future-visualizer/trace trace-futures) 
-         (only-in future-visualizer/private/visualizer-data runtime-block-event?))
-
-;;Test whether a futures program hits any barricades
-(define-syntax-rule (blocks? e ...) 
-  (let ([log (trace-futures e ...)])
-    (> (length (filter runtime-block-event? log)) 0)))
-
-;;Stress test for odd?/even?
-(define N 1000)
-(define MAX 1000)
-(define (rnd x) 
-  (case (random 3) 
-    [(0)
-     (define n (random MAX)) 
-     (case (random 2) 
-       [(0) (- 0 n)] ;negative
-       [(1) n])] ;positive
-    [(1) ;float
-     (+ (random MAX) .0)]
-    [(2) ;bignum
-     (expt 2 (+ (random MAX) 65))]))
-  
-(define (test-even-odd)
-  (define ns (build-list N rnd))
-  (define fs (for/list ([n (in-list ns)]) 
-               (future (λ () 
-                          (or (odd? n) (even? n))))))
-  (map touch fs))
-
-(void (test-even-odd))
-
-;; Only test for non-blocking when actually running parallel futures
-(when (futures-enabled?)
-  (check-false (blocks? (void (test-even-odd)))))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/trace.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/trace.rkt
deleted file mode 100644
index 9add0d5d83..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/trace.rkt
+++ /dev/null
@@ -1,124 +0,0 @@
-#lang racket/base 
-(require rackunit 
-         racket/future 
-         future-visualizer/private/visualizer-data 
-         (for-syntax racket/base 
-                     future-visualizer/private/visualizer-data)
-         (only-in future-visualizer/trace trace-futures)
-         "vtrace3.rkt") 
-
-#|
-
-Invariants: 
--It is not possible for a future to have an empty timeline, even if it never 
- executes on anything other than the runtime thread.
--Cannot have two consecutive 'start-work events on the same future, same thread.
--For each future created there must exist exactly one 'create event. 
--The number of events matching synchronization-event? must always match the 
- number of runtime-synchronization-event? events.
-
-|#
-
-;Stable sort by timestamp, then check 
-;index ordering
-(define-syntax (check-ordering stx) 
-  (syntax-case stx () 
-    [(_ log) 
-     (with-syntax ([line (syntax-line stx)]) 
-       #'(let ([time-sorted (sort log 
-                                  #:key (λ (e) (event-or-gc-time (indexed-future-event-fevent e))) 
-                                  <)])
-           (for ([e (in-list time-sorted)]
-                 [i (in-naturals)]) 
-             (check-equal? (indexed-future-event-index e) 
-                           i
-                           (format 
-                            "Incorrect event ordering at line ~a: event with (index=~a, time=~a) 
-                                occurs at actual index ~a\n" 
-                            line 
-                            (indexed-future-event-index e) 
-                            (event-or-gc-time (indexed-future-event-fevent e)) 
-                            i)))))]))
-
-;Each future timeline's events sorted in time order?
-(define (check-future-timeline-ordering tr)
-  (define ftls (hash-values (trace-future-timelines tr)))
-  (for ([ftl (in-list ftls)])
-    (let loop ([evts ftl]) 
-      (cond 
-        [(null? (cdr evts)) void]
-        [else 
-         (check-true (<= (event-start-time (car evts)) (event-start-time (car (cdr evts)))))
-         (loop (cdr evts))]))))
-
-(cond 
-  [(futures-enabled?)
-   (define log1 (parameterize ([current-output-port (open-output-string)])
-                  (trace-futures 
-                   (let ([fs (for/list ([i (in-range 0 1000)]) 
-                               (future (λ () 
-                                         (printf "hello\n"))))]) 
-                     (sleep 0.1)
-                     (map touch fs)))))
-   (check-true (> (length log1) 2000)) 
-   ;Event types 
-   (check-equal? (length (filter (λ (e) (and (synchronization-event? e) 
-                                             (equal? (op-name e) 'printf))) 
-                                 log1)) 
-                 1000)
-   (define syncs-len (length (filter synchronization-event? log1))) 
-   (check-true (>= syncs-len 1000)) 
-   (check-true (<= syncs-len 2000))
-   (check-ordering log1)
-   (define tr1 (build-trace log1)) 
-   ;Keys should include all unique future id's, and one entry for #f (no future context, on rt thread)
-   ;(events logged on runtime thread outside scope of any future)
-   (check-equal? (length (hash-keys (trace-future-timelines tr1))) 1001)
-   
-   (define log3 (trace-futures 
-                 (parameterize ([current-command-line-arguments #("2000")]
-                                [current-output-port (open-output-string)])
-                   (void (dynamic-require 'tests/racket/benchmarks/shootout/mandelbrot-futures #f))))) 
-   (check-true (> (length log3) 0))
-   (check-true (list? (memf jitcompile-event? log3)) "No JIT compilation events found in mandelbrot")
-   (define tr3 (build-trace log3)) 
-   (check-equal? (length (hash-keys (trace-future-timelines tr3))) 2001)
-   
-   
-   (define log4 (trace-futures 
-                 (let ([f (future (λ () 
-                                    (for/list ([i (in-range 0 10000)]) 
-                                      (cons i (+ i 1)))))]) 
-                   (sleep 0.5)
-                   (touch f)))) 
-   (check-true (> (length log4) 0))
-   (check-true (list? (memf allocation-event? log4)) "No allocation events found in log4")
-   (define ae (findf allocation-event? log4)) 
-   (check-true (allocation-event? ae)) 
-   (check-true (runtime-synchronization-event? ae))
-   
-   (check-true (proc-id-or-gc<? 'gc 0)) 
-   (check-false (proc-id-or-gc<? 0 'gc)) 
-   (check-false (proc-id-or-gc<? 'gc 'gc)) 
-   (check-true (proc-id-or-gc<? 0 1)) 
-   (check-false (proc-id-or-gc<? 1 0))
-   
-   (let* ([future-log (list (indexed-future-event 0 (future-event #f 0 'create 0 #f 0)) 
-                            (indexed-future-event 1 (future-event 0 1 'start-work 1 #f #f)) 
-                            (indexed-future-event 2 (future-event 0 1 'block 2 #f #f))
-                            (indexed-future-event 3 (future-event 0 1 'end-work 3 #f #f))
-                            (indexed-future-event 4 (future-event 0 0 'block 4 'printf #f))
-                            (indexed-future-event 5 (future-event 0 0 'complete 3 #f #f)))]) 
-     (define tr (build-trace future-log)) 
-     (define blocks (filter worker-block-event? (trace-all-events tr)))
-     (for ([b (in-list blocks)])
-       (check-true (event? (event-block-handled-event b))) 
-       (check-true (symbol? (event-prim-name b)))))
-   
-   (let ([tr (build-trace vtrace-3)]) 
-     (check-future-timeline-ordering tr))]
-  [else 
-   (define l (trace-futures (let ([f (future (λ () (printf "hello\n")))]) 
-                              (sleep 0.1) 
-                              (touch f)))) 
-   (check-equal? l '())])
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/visualizer.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/visualizer.rkt
deleted file mode 100644
index 333ef2d108..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/visualizer.rkt
+++ /dev/null
@@ -1,586 +0,0 @@
-#lang racket/base 
-(require rackunit 
-         racket/list 
-         racket/vector
-         future-visualizer/private/visualizer-drawing
-         future-visualizer/private/visualizer-data 
-         future-visualizer/private/display 
-         future-visualizer/private/graph-drawing)  
-
-(define (compile-trace-data logs) 
-  (define tr (build-trace logs)) 
-  (define-values (finfo segs) (calc-segments tr)) 
-  (values tr 
-          finfo 
-          segs 
-          (frame-info-timeline-ticks finfo)))
-
-(define (check-in-bounds? segs finfo) 
-  (for ([s (in-list segs)]) 
-    (check-false (negative? (segment-y s)))
-    (check-true (< (segment-y s) (frame-info-adjusted-height finfo)))))
-
-;Display tests
-(let ([vr (viewable-region 3 3 500 500)])
-  (for ([i (in-range 4 503)])
-    (check-true (in-viewable-region-horiz vr i)
-                (format "~a should be in ~a" i vr)))
-  (for ([i (in-range 0 2)])
-    (check-false (in-viewable-region-horiz vr i)
-                 (format "~a should not be in ~a" i vr))
-    (for ([i (in-range 504 1000)])
-      (check-false (in-viewable-region-horiz vr i)
-                   (format "~a should not be in ~a" i vr)))))
-
-(let ([vr (viewable-region 0 0 732 685)])
-  (check-true (in-viewable-region-horiz vr 10))
-  (check-true (in-viewable-region-horiz vr 63.0))
-  (check-true (in-viewable-region-horiz vr 116.0))
-  (check-true (in-viewable-region-horiz vr 169.0))
-  (check-true (in-viewable-region-horiz vr 222)))
-
-(let ([vr (viewable-region 0 0 732 685)] 
-      [ticks (list (timeline-tick 222.0 #f 0.4999999999999982 #f) 
-                   (timeline-tick 169.0 #f 0.3999999999999986 #f) 
-                   (timeline-tick 116.0 #f 0.29999999999999893 #f) 
-                   (timeline-tick 63.0 #f 0.1999999999999993 #f) 
-                   (timeline-tick 10 #f 0.09999999999999964 #f))]) 
-  (define in-vr (filter (λ (t) 
-                          (in-viewable-region-horiz vr (timeline-tick-x t))) 
-                        ticks)) 
-  (check-equal? (length in-vr) 5))
-
-;Trace compilation tests
-(let* ([future-log (list (indexed-future-event 0 (future-event #f 0 'create 0 #f 0)) 
-                         (indexed-future-event 1 (future-event 0 1 'start-work 1 #f #f)) 
-                         (indexed-future-event 2 (future-event 0 1 'end-work 2 #f #f)) 
-                         (indexed-future-event 3 (future-event 0 0 'complete 3 #f #f)))] 
-       [organized (organize-output future-log 0 3)]) 
-  (check-equal? (vector-length organized) 2) 
-  (let ([proc0log (vector-ref organized 0)] 
-        [proc1log (vector-ref organized 1)]) 
-    (check-equal? (vector-length proc0log) 2) 
-    (check-equal? (vector-length proc1log) 2)))
-
-(let* ([future-log (list (indexed-future-event 0 (future-event #f 0 'create 0 #f 0)) 
-                         (indexed-future-event 1 (future-event 0 1 'start-work 1 #f #f)) 
-                         (indexed-future-event 2 (future-event 0 1 'end-work 2 #f #f)) 
-                         (indexed-future-event 3 (future-event 0 0 'complete 3 #f #f)))] 
-       [trace (build-trace future-log)] 
-       [evts (trace-all-events trace)])
-  (check-equal? (length evts) 4) 
-  (check-equal? (length (filter (λ (e) (event-next-future-event e)) evts)) 2) 
-  (check-equal? (length (filter (λ (e) (event-next-targ-future-event e)) evts)) 1) 
-  (check-equal? (length (filter (λ (e) (event-prev-targ-future-event e)) evts)) 1))
-
-(let* ([future-log (list (indexed-future-event 0 (future-event 0 0 'create 0 #f 0)) 
-                         (indexed-future-event 1 (future-event 1 0 'create 1 #f 1)) 
-                         (indexed-future-event 2 (future-event 0 1 'start-work 2 #f #f)) 
-                         (indexed-future-event 3 (future-event 1 2 'start-work 2 #f #f))
-                         (indexed-future-event 4 (future-event 0 1 'end-work 4 #f #f)) 
-                         (indexed-future-event 5 (future-event 0 0 'complete 5 #f #f)) 
-                         (indexed-future-event 6 (future-event 1 2 'end-work 5 #f #f)) 
-                         (indexed-future-event 7 (future-event 1 0 'complete 7 #f #f)))] 
-       [organized (organize-output future-log 0 7)]) 
-  (check-equal? (vector-length organized) 3) 
-  (let ([proc0log (vector-ref organized 0)] 
-        [proc1log (vector-ref organized 1)] 
-        [proc2log (vector-ref organized 2)]) 
-    (check-equal? (vector-length proc0log) 4) 
-    (check-equal? (vector-length proc1log) 2)
-    (check-equal? (vector-length proc2log) 2) 
-    (for ([msg (in-vector (vector-map indexed-future-event-fevent proc0log))])  
-      (check-equal? (future-event-process-id msg) 0)) 
-    (for ([msg (in-vector (vector-map indexed-future-event-fevent proc1log))]) 
-      (check-equal? (future-event-process-id msg) 1)) 
-    (for ([msg (in-vector (vector-map indexed-future-event-fevent proc2log))]) 
-      (check-equal? (future-event-process-id msg) 2))))
-
-;Drawing calculation tests
-(let* ([future-log (list (indexed-future-event 0 (future-event #f 0 'create 0 #f 0)) 
-                         (indexed-future-event 1 (future-event 0 1 'start-work 1 #f #f)) 
-                         (indexed-future-event 2 (future-event 0 1 'end-work 2 #f #f)) 
-                         (indexed-future-event 3 (future-event 0 0 'complete 3 #f #f)))] 
-       [trace (build-trace future-log)]) 
-  (let-values ([(finfo segments) (calc-segments trace)])
-    (check-in-bounds? segments finfo)
-    (check-equal? (length segments) 4) 
-    (check-equal? (length (filter (λ (s) (segment-next-future-seg s)) segments)) 2) 
-    (check-equal? (length (filter (λ (s) (segment-next-targ-future-seg s)) segments)) 1) 
-    (check-equal? (length (filter (λ (s) (segment-prev-targ-future-seg s)) segments)) 1)))
-
-;Future=42
-(let* ([future-log (list (indexed-future-event 0 (future-event #f 0 'create 0.05 #f 42)) 
-                         (indexed-future-event 1 (future-event 42 1 'start-work 0.07 #f #f)) 
-                         (indexed-future-event 2 (future-event 42 1 'end-work 0.3 #f #f)) 
-                         (indexed-future-event 3 (future-event 42 0 'complete 1.2 #f #f)))] 
-       [tr (build-trace future-log)])
-  (define-values (finfo segs) (calc-segments tr))
-  (check-in-bounds? segs finfo)
-  (define ticks (frame-info-timeline-ticks finfo))
-  (check-equal? (length ticks) 11))
-
-(define (sanity-check-ticks ticks)
-  (define ticks-in-ascending-time-order (reverse ticks))
-  (let loop ([cur (car ticks-in-ascending-time-order)] 
-             [rest (cdr ticks-in-ascending-time-order)]) 
-    (unless (null? rest) 
-      (define next (car rest))
-      (check-true (>= (timeline-tick-x next) (timeline-tick-x cur)) 
-                  (format "Tick at time ~a [x:~a] had x-coord less than previous tick: ~a [x:~a]" 
-                          (exact->inexact (timeline-tick-rel-time next)) 
-                          (timeline-tick-x next) 
-                          (exact->inexact (timeline-tick-rel-time cur)) 
-                          (timeline-tick-x cur)))
-      (loop next 
-            (cdr rest)))))
-
-;;do-seg-check : trace segment timeline-tick (a a -> bool) string -> void
-(define (do-seg-check tr seg tick op adjective) 
-  (define evt (segment-event seg))
-  (check-true (op (segment-x seg) (timeline-tick-x tick)) 
-              (format "Event at time ~a [x:~a] (~a) should be ~a tick at time ~a [x:~a]"
-                      (relative-time tr (event-start-time evt))
-                      (segment-x seg)
-                      (event-type evt)
-                      adjective
-                      (exact->inexact (timeline-tick-rel-time tick)) 
-                      (timeline-tick-x tick))))
-
-;;check-seg-layout : trace (listof segment) (listof timeline-tick) -> void
-(define (check-seg-layout tr segs ticks) 
-  (for ([seg (in-list segs)])
-    (define evt-rel-time (relative-time tr (event-start-time (segment-event seg))))
-      (for ([tick (in-list ticks)]) 
-        (define ttime (timeline-tick-rel-time tick))
-          (cond 
-            [(< evt-rel-time ttime) 
-             (do-seg-check tr seg tick <= "before")] 
-            [(= evt-rel-time ttime) 
-             (do-seg-check tr seg tick = "equal to")]
-            [(> evt-rel-time ttime) 
-             (do-seg-check tr seg tick >= "after")]))))
-             
-(let* ([future-log (list (indexed-future-event 0 (future-event #f 0 'create 0.05 #f 42)) 
-                         (indexed-future-event 1 (future-event 42 1 'start-work 0.09 #f #f)) 
-                         (indexed-future-event 2 (future-event 42 1 'suspend 1.1 #f #f)) 
-                         (indexed-future-event 3 (future-event 42 1 'resume 1.101 #f #f)) 
-                         (indexed-future-event 4 (future-event 42 1 'suspend 1.102 #f #f)) 
-                         (indexed-future-event 5 (future-event 42 1 'resume 1.103 #f #f)) 
-                         (indexed-future-event 6 (future-event 42 1 'start-work 1.104 #f #f)) 
-                         (indexed-future-event 7 (future-event 42 1 'complete 1.41 #f #f)) 
-                         (indexed-future-event 8 (future-event 42 1 'end-work 1.42 #f #f)) 
-                         (indexed-future-event 9 (future-event 42 0 'result 1.43 #f #f)))] 
-       [tr (build-trace future-log)]) 
-  (define-values (finfo segs) (calc-segments tr))
-  (check-in-bounds? segs finfo)
-  (define ticks (frame-info-timeline-ticks finfo))
-  (check-seg-layout tr segs ticks))
-
-(let* ([future-log (list (indexed-future-event 0 (future-event #f 0 'create 0 #f 0)) 
-                         (indexed-future-event 1 (future-event 0 1 'start-work 1 #f #f)) 
-                         (indexed-future-event 2 (future-event 0 1 'end-work 2 #f #f)) 
-                         (indexed-future-event 3 (future-event 0 0 'complete 3 #f #f)))] 
-       [trace (build-trace future-log)]) 
-  (check-equal? (trace-start-time trace) 0) 
-  (check-equal? (trace-end-time trace) 3) 
-  (check-equal? (length (trace-proc-timelines trace)) 2) 
-  (check-equal? (trace-real-time trace) 3) 
-  (check-equal? (trace-num-futures trace) 1) 
-  (check-equal? (trace-num-blocks trace) 0) 
-  (check-equal? (trace-num-syncs trace) 0) 
-  (let ([proc0tl (list-ref (trace-proc-timelines trace) 0)] 
-        [proc1tl (list-ref (trace-proc-timelines trace) 1)]) 
-    (check-equal? (process-timeline-start-time proc0tl) 0) 
-    (check-equal? (process-timeline-end-time proc0tl) 3) 
-    (check-equal? (process-timeline-start-time proc1tl) 1) 
-    (check-equal? (process-timeline-end-time proc1tl) 2) 
-    (let ([proc0segs (process-timeline-events proc0tl)] 
-          [proc1segs (process-timeline-events proc1tl)]) 
-      (check-equal? (length proc0segs) 2) 
-      (check-equal? (length proc1segs) 2)
-      (check-equal? (event-timeline-position (list-ref proc0segs 0)) 'start) 
-      (check-equal? (event-timeline-position (list-ref proc0segs 1)) 'end)))) 
-
-;Viewable region tests 
-(define (make-seg-at x y w h) 
-  (segment #f x y w h #f #f #f #f #f #f #f #f #f))
-
-;;make-segs-with-times : (listof (or float (float . float))) -> (listof segment)
-(define (make-segs-with-times . times) 
-  (for/list ([t (in-list times)] [i (in-naturals)]) 
-    (if (pair? t) 
-        (make-seg-with-time i (car t) #:end-time (cdr t)) 
-        (make-seg-with-time i t))))
-
-;;make-seg-with-time : fixnum float [float] -> segment
-(define (make-seg-with-time index real-start-time #:end-time [real-end-time real-start-time]) 
-  (segment (event index
-                  real-start-time 
-                  real-end-time 
-                  0 0 0 0 0 0 0 0 0 0 0 0 0 #f #f)  
-           0 0 0 0 #f #f #f #f #f #f #f #f #f))
-                   
-
-(let ([vregion (viewable-region 20 30 100 100)] 
-      [seg1 (make-seg-at 0 5 10 10)] 
-      [seg2 (make-seg-at 20 30 5 5)] 
-      [seg3 (make-seg-at 150 35 5 5)]) 
-  (check-false ((seg-in-vregion vregion) seg1)) 
-  (check-true ((seg-in-vregion vregion) seg2)) 
-  (check-false ((seg-in-vregion vregion) seg3)))
-
-;segs-equal-or-later 
-(let ([segs (make-segs-with-times 0.1 
-                                  0.3 
-                                  1.2 
-                                  (cons 1.4 1.9) 
-                                  2.4 
-                                  2.8 
-                                  3.1)]) 
-  (check-equal? (length (segs-equal-or-later 0.1 segs)) 7) 
-  (check-equal? (length (segs-equal-or-later 0.3 segs)) 6) 
-  (check-equal? (length (segs-equal-or-later 1.2 segs)) 5) 
-  (check-equal? (length (segs-equal-or-later 1.4 segs)) 4) 
-  (check-equal? (length (segs-equal-or-later 2.4 segs)) 3) 
-  (check-equal? (length (segs-equal-or-later 2.8 segs)) 2) 
-  (check-equal? (length (segs-equal-or-later 3.1 segs)) 1) 
-  (check-equal? (length (segs-equal-or-later 4.0 segs)) 0))
-
-;Tick drawing  
-(let ([l (list (indexed-future-event 0 (future-event #f 0 'create 10.0 #f 0))
-               (indexed-future-event 1 (future-event 0 0 'start-work 11.0 #f #f)) 
-               (indexed-future-event 2 (future-event 0 0 'end-work 20.0 #f #f)))])
-  (define-values (tr finfo segs ticks) (compile-trace-data l)) 
-  ;Number of ticks can vary, but cannot exceed (total trace time / tick interval)
-  (check-true (<= (length ticks) 100))
-  (check-equal? (length (calc-ticks segs 1000 tr)) 99))
-
-(let ([l (list (indexed-future-event 0 '#s(future-event #f 0 create 1334778395768.733 #f 3))
-               (indexed-future-event 1 '#s(future-event 3 2 start-work 1334778395768.771 #f #f))
-               (indexed-future-event 2 '#s(future-event 3 2 complete 1334778395864.648 #f #f))
-               (indexed-future-event 3 '#s(future-event 3 2 end-work 1334778395864.652 #f #f)))]) 
-  (define-values (tr finfo segs ticks) (compile-trace-data l))
-  (define last-evt (indexed-future-event-fevent (list-ref l 3))) 
-  (define first-evt (indexed-future-event-fevent (list-ref l 0))) 
-  (define total-time (- (future-event-time last-evt) (future-event-time first-evt))) 
-  (check-true (<= (length ticks) (inexact->exact (floor (* 10 total-time))))))
-
-(define mand-first 
-  (list (indexed-future-event 0 '#s(future-event #f 0 create 1334779294212.415 #f 1))
-        (indexed-future-event 1 '#s(future-event 1 1 start-work 1334779294212.495 #f #f))
-        (indexed-future-event 2 '#s(future-event 1 1 sync 1334779294212.501 #f #f))
-        (indexed-future-event 3 (future-event 1 0 'sync 1334779294221.128 'allocate_memory #f))
-        (indexed-future-event 4 '#s(future-event 1 0 result 1334779294221.138 #f #f))
-        (indexed-future-event 5 '#s(future-event 1 1 result 1334779294221.15 #f #f)))) 
-(let-values ([(tr finfo segs ticks) (compile-trace-data mand-first)]) 
-  (check-seg-layout tr segs ticks))
-
-(define single-block-log 
-  (list
-   (indexed-future-event 0 '#s(future-event #f 0 create 1339469018856.55 #f 1))
-   (indexed-future-event 1 '#s(future-event 1 1 start-work 1339469018856.617 #f 0))
-   (indexed-future-event 2 '#s(future-event 1 1 block 1339469018856.621 #f 0))
-   (indexed-future-event 3 '#s(future-event 1 1 suspend 1339469018856.891 #f 0))
-   (indexed-future-event 4 '#s(future-event 1 1 end-work 1339469018856.891 #f 0))
-   (indexed-future-event 5 '#s(future-event 1 0 block 1339469019057.609 printf 0))
-   (indexed-future-event 6 '#s(future-event 1 0 result 1339469019057.783 #f 0))
-   (indexed-future-event 7 '#s(future-event 1 2 start-work 1339469019057.796 #f 0))
-   (indexed-future-event 8 '#s(future-event 1 2 complete 1339469019057.799 #f 0))
-   (indexed-future-event 9 '#s(future-event 1 2 end-work 1339469019057.801 #f 0)))) 
-(let ([tr (build-trace single-block-log)]) 
-  (check-equal? (length (hash-keys (trace-block-counts tr))) 1) 
-  (check-equal? (length (hash-keys (trace-sync-counts tr))) 0) 
-  (check-equal? (length (hash-keys (trace-future-rtcalls tr))) 1))
-
-(define gci (gc-info #f 0 0 0 0 0 0 0 4.0 6.0))
-(check-true (gc-event? gci)) 
-(check-true (gc-event? (indexed-future-event 0 gci)))
-
-(define gc-log1 
-  (list 
-   (indexed-future-event 0 (future-event #f 0 'create 10.0 #f 1)) 
-   (indexed-future-event 1 (gc-info #f 0 0 0 0 0 0 0 4.0 6.0)) 
-   (indexed-future-event 2 (future-event 1 1 'start-work 11.0 #f 0)) 
-   (indexed-future-event 3 (future-event 1 1 'complete 14.0 #f 0)) 
-   (indexed-future-event 4 (future-event 1 1 'end-work 15.0 #f 0)))) 
-(let ([tr (build-trace gc-log1)]) 
-  (check-true (not (findf gc-event? (trace-all-events tr)))) 
-  (check-equal? (trace-num-gcs tr) 0)
-  (check-equal? (process-timeline-proc-id (trace-gc-timeline tr)) 'gc) 
-  (check-equal? (length (process-timeline-events (trace-gc-timeline tr))) 0))
-
-(define gc-log2 
-  (list 
-   (indexed-future-event 0 (future-event #f 0 'create 10.0 #f 1)) 
-   (indexed-future-event 1 (gc-info #f 0 0 0 0 0 0 0 14.0 19.0)) 
-   (indexed-future-event 2 (future-event 1 1 'start-work 11.0 #f 0)) 
-   (indexed-future-event 3 (future-event 1 1 'complete 20.0 #f 0)) 
-   (indexed-future-event 4 (future-event 1 1 'end-work 21.0 #f 0)))) 
-(let ([tr (build-trace gc-log2)]) 
-  (check-equal? (length (filter gc-event? (trace-all-events tr))) 1) 
-  (check-equal? (process-timeline-proc-id (trace-gc-timeline tr)) 'gc)
-  (check-equal? (length (process-timeline-events (trace-gc-timeline tr))) 1)
-  (check-equal? (trace-num-gcs tr) 1))
-
-(define gc-log3 
-  (list 
-   (indexed-future-event 0 (future-event #f 0 'create 10.0 #f 1)) 
-   (indexed-future-event 1 (future-event 1 1 'start-work 11.0 #f 0))
-   (indexed-future-event 2 (gc-info #f 0 0 0 0 0 0 0 14.0 15.0)) 
-   (indexed-future-event 3 (gc-info #f 0 0 0 0 0 0 0 15.0 19.5)) 
-   (indexed-future-event 4 (future-event 1 1 'complete 20.0 #f 0)) 
-   (indexed-future-event 5 (future-event 1 1 'end-work 21.0 #f 0)))) 
-(let-values ([(tr finfo segs ticks) (compile-trace-data gc-log3)])
-  (check-in-bounds? segs finfo)
-  (check-equal? (length (filter gc-event? (trace-all-events tr))) 2) 
-  (check-equal? (trace-num-gcs tr) 2) 
-  (check-equal? (length (trace-proc-timelines tr)) 2)
-  (check-equal? (process-timeline-proc-id (trace-gc-timeline tr)) 'gc)
-  (check-equal? (length (process-timeline-events (trace-gc-timeline tr))) 2)
-  (let ([gc-segs (filter (λ (s) (gc-event? (segment-event s))) segs)]) 
-    (check-equal? (length gc-segs) 2) 
-    (for ([gs (in-list gc-segs)]) 
-      (check-true (= (segment-height gs) (frame-info-adjusted-height finfo))) 
-      (check-true (> (segment-width gs) 10))
-      (check-true (= (segment-y gs) 0)))))
-
-(check-true (work-event? (future-event #f 0 'start-work 1.0 #f 0))) 
-(check-true (work-event? (future-event #f 0 'start-0-work 2.0 #f 0))) 
-(check-false (work-event? (future-event #f 0 'end-work 1.0 #f 0)))
-
-;Graph drawing tests 
-(let* ([nodea (drawable-node (node 'a '()) 5 5 10 0 0 '() 10)]
-       [center (drawable-node-center nodea)]) 
-  (check-equal? (point-x center) 10.0) 
-  (check-equal? (point-y center) 10.0))
-
-
-(define test-padding 5)
-(define test-width 10)
-
-(define (tree root-data . children) 
-  (node root-data children))
-
-(define (get-node data layout) 
-  (first (filter (λ (dn) (equal? (node-data (drawable-node-node dn)) data)) (graph-layout-nodes layout))))
-
-#|
-   a
-   |
-   b
-|#
-(define tree0 (tree 'a (tree 'b)))
-(let* ([layout (draw-tree tree0 #:node-width test-width #:padding test-padding)]
-       [dnode-a (get-node 'a layout)]
-       [dnode-b (get-node 'b layout)])
-  (check-equal? (graph-layout-width layout) (+ (* test-padding 2) test-width))
-  (check-equal? (graph-layout-height layout) (+ (* test-padding 3) (* test-width 2)))
-  (check-equal? (drawable-node-x dnode-a) test-padding) 
-  (check-equal? (drawable-node-y dnode-a) test-padding) 
-  (check-equal? (drawable-node-x dnode-b) test-padding) 
-  (check-equal? (drawable-node-y dnode-b) (+ test-padding test-width test-padding)))
-(let ([atree (build-attr-tree tree0 0)]) 
-  (check-equal? (attributed-node-num-leaves atree) 1))
-
-#|
-      a
-     / \
-    b   c
-|# 
-(define tree1 (tree 'a 
-                    (tree 'b) 
-                    (tree 'c)))
-(define layout (draw-tree tree1 #:node-width test-width #:padding test-padding)) 
-(for ([dnode (in-list (graph-layout-nodes layout))]) 
-  (check-equal? (drawable-node-width dnode) test-width))
-(define dnode-a (get-node 'a layout)) 
-(define dnode-b (get-node 'b layout)) 
-(define dnode-c (get-node 'c layout))
-
-(define slot-one-pos (+ test-padding test-width test-padding))
-(define square-sz (+ (* test-padding 3) (* test-width 2)))
-(check-equal? (graph-layout-width layout) square-sz) 
-(check-equal? (graph-layout-height layout) square-sz)
-(check-equal? (drawable-node-x dnode-b) test-padding) 
-(check-equal? (drawable-node-y dnode-b) slot-one-pos)
-(check-equal? (drawable-node-x dnode-c) slot-one-pos)
-(check-equal? (drawable-node-y dnode-c) slot-one-pos) 
-(check-equal? (drawable-node-x dnode-a) (/ 25 2)) 
-(check-equal? (drawable-node-y dnode-a) test-padding) 
-(check-equal? (length (drawable-node-children dnode-a)) 2)
-(let ([atree (build-attr-tree tree1 0)]) 
-  (check-equal? (attributed-node-num-leaves atree) 2))
-
-#|
-         a
-       /  \
-      b    d
-      |   / \
-      c   e f
-            |
-            g
-|#
-(define tree2 (tree 'a 
-                    (tree 'b 
-                          (tree 'c)) 
-                    (tree 'd 
-                          (tree 'e) 
-                          (tree 'f 
-                                (tree 'g)))))
-(let* ([layout (draw-tree tree2 #:node-width test-width #:padding test-padding)] 
-       [nodes (graph-layout-nodes layout)] 
-       [dnode-a (get-node 'a layout)] 
-       [dnode-b (get-node 'b layout)] 
-       [dnode-c (get-node 'c layout)] 
-       [dnode-d (get-node 'd layout)] 
-       [dnode-e (get-node 'e layout)] 
-       [dnode-f (get-node 'f layout)] 
-       [dnode-g (get-node 'g layout)])
-  (check-equal? (node-data (drawable-node-node dnode-a)) 'a) 
-  (check-equal? (node-data (drawable-node-node dnode-b)) 'b) 
-  (check-equal? (node-data (drawable-node-node dnode-c)) 'c) 
-  (check-equal? (node-data (drawable-node-node dnode-d)) 'd) 
-  (check-equal? (node-data (drawable-node-node dnode-e)) 'e) 
-  (check-equal? (node-data (drawable-node-node dnode-f)) 'f) 
-  (check-equal? (node-data (drawable-node-node dnode-g)) 'g) 
-  (check-equal? (graph-layout-width layout) 50) 
-  (check-equal? (graph-layout-height layout) 65) 
-  (check-equal? (drawable-node-x dnode-a) (/ 65 4))
-  (check-equal? (drawable-node-y dnode-a) test-padding)
-  (check-equal? (drawable-node-x dnode-b) test-padding) 
-  (check-equal? (drawable-node-y dnode-b) (+ (* 2 test-padding) test-width)) 
-  (check-equal? (drawable-node-x dnode-c) test-padding) 
-  (check-equal? (drawable-node-y dnode-c) (+ (drawable-node-y dnode-b) test-width test-padding)) 
-  (check-equal? (drawable-node-x dnode-e) (+ (* 2 test-padding) test-width)) 
-  (check-equal? (drawable-node-y dnode-e) (+ (drawable-node-y dnode-d) test-width test-padding))
-  (check-equal? (drawable-node-x dnode-f) (+ (drawable-node-x dnode-e) test-width test-padding))
-  (check-equal? (drawable-node-y dnode-f) (drawable-node-y dnode-e))
-  (check-equal? (drawable-node-x dnode-g) (drawable-node-x dnode-f))
-  (check-equal? (drawable-node-y dnode-g) (+ (drawable-node-y dnode-f) test-width test-padding)))
-(let ([atree (build-attr-tree tree2 0)]) 
-  (check-equal? (attributed-node-num-leaves atree) 3))
-
-#|
-        a
-       /|\
-      b c e
-        |
-        d
-|#
-(define tree3 (tree 'a 
-                    (tree 'b) 
-                    (tree 'c 
-                          (tree 'd)) 
-                    (tree 'e)))
-(let* ([layout (draw-tree tree3 #:node-width test-width #:padding test-padding)] 
-       [nodes (graph-layout-nodes layout)] 
-       [dnode-a (get-node 'a layout)] 
-       [dnode-b (get-node 'b layout)] 
-       [dnode-c (get-node 'c layout)] 
-       [dnode-d (get-node 'd layout)] 
-       [dnode-e (get-node 'e layout)]) 
-  (check-equal? (graph-layout-width layout) 50) 
-  (check-equal? (graph-layout-height layout) 50) 
-  (check-equal? (drawable-node-x dnode-a) 20) 
-  (check-equal? (drawable-node-y dnode-a) 5)
-  (check-equal? (drawable-node-x dnode-b) test-padding) 
-  (check-equal? (drawable-node-y dnode-b) (+ (* 2 test-padding) test-width)) 
-  (check-equal? (drawable-node-x dnode-c) (+ (* 2 test-padding) test-width)) 
-  (check-equal? (drawable-node-y dnode-c) (drawable-node-y dnode-b)) 
-  (check-equal? (drawable-node-x dnode-e) (+ (* 3 test-padding) (* 2 test-width))) 
-  (check-equal? (drawable-node-y dnode-e) (drawable-node-y dnode-c)) 
-  (check-equal? (drawable-node-x dnode-d) (drawable-node-x dnode-c)) 
-  (check-equal? (drawable-node-y dnode-d) (+ (drawable-node-y dnode-c) test-padding test-width)))
-(let ([atree (build-attr-tree tree3 0)]) 
-  (check-equal? (attributed-node-num-leaves atree) 3))
-
-#| 
-        a
-     / | | \
-    b  c f  g 
-      / \
-     d   e
-|#
-(define tree4 (tree 'a 
-                    (tree 'b) 
-                    (tree 'c 
-                          (tree 'd) 
-                          (tree 'e)) 
-                    (tree 'f) 
-                    (tree 'g)))
-(let* ([layout (draw-tree tree4 #:node-width test-width #:padding test-padding)] 
-       [nodes (graph-layout-nodes layout)] 
-       [dnode-a (get-node 'a layout)] 
-       [dnode-b (get-node 'b layout)] 
-       [dnode-c (get-node 'c layout)] 
-       [dnode-d (get-node 'd layout)] 
-       [dnode-e (get-node 'e layout)] 
-       [dnode-f (get-node 'f layout)] 
-       [dnode-g (get-node 'g layout)]) 
-  (check-equal? (graph-layout-width layout) 80) 
-  (check-equal? (graph-layout-height layout) 50) 
-  (check-equal? (drawable-node-x dnode-b) test-padding) 
-  (check-equal? (drawable-node-y dnode-b) (+ (drawable-node-y dnode-a) test-width test-padding)) 
-  (check-equal? (drawable-node-y dnode-c) (drawable-node-y dnode-b)) 
-  (check-equal? (drawable-node-x dnode-d) (+ (drawable-node-x dnode-b) test-width test-padding)) 
-  (check-equal? (drawable-node-y dnode-d) (+ (drawable-node-y dnode-c) test-width test-padding)) 
-  (check-equal? (drawable-node-x dnode-e) (+ (drawable-node-x dnode-d) test-width test-padding)) 
-  (check-equal? (drawable-node-y dnode-e) (drawable-node-y dnode-d)) 
-  (check-equal? (drawable-node-x dnode-f) (+ (drawable-node-x dnode-e) test-width test-padding)) 
-  (check-equal? (drawable-node-y dnode-f) (drawable-node-y dnode-c)) 
-  (check-equal? (drawable-node-x dnode-g) (+ (drawable-node-x dnode-f) test-width test-padding)))
-(let ([atree (build-attr-tree tree4 0)]) 
-  (check-equal? (attributed-node-num-leaves atree) 5))
-
-#| 
-Layered-tree-draw example from Di Battista 
-         a
-        /   \
-       b      g
-       |     / \
-       c    h   k
-       |   / \
-       d  i   j
-      / \
-     e   f 
-|#
-(define tree5 (tree 'a 
-                    (tree 'b 
-                          (tree 'c 
-                                (tree 'd 
-                                      (tree 'e) 
-                                      (tree 'f)))) 
-                    (tree 'g 
-                          (tree 'h 
-                                (tree 'i) 
-                                (tree 'j)) 
-                          (tree 'k))))
-(let* ([layout (draw-tree tree5 #:node-width test-width #:padding test-padding)] 
-       [nodes (graph-layout-nodes layout)] 
-       [dnode-a (get-node 'a layout)] 
-       [dnode-b (get-node 'b layout)] 
-       [dnode-c (get-node 'c layout)] 
-       [dnode-d (get-node 'd layout)] 
-       [dnode-e (get-node 'e layout)] 
-       [dnode-f (get-node 'f layout)] 
-       [dnode-g (get-node 'g layout)] 
-       [dnode-h (get-node 'h layout)] 
-       [dnode-i (get-node 'i layout)] 
-       [dnode-j (get-node 'j layout)] 
-       [dnode-k (get-node 'k layout)]) 
-  (check-equal? (graph-layout-width layout) 80) 
-  (check-equal? (graph-layout-height layout) 80) 
-  (check-equal? (drawable-node-x dnode-e) test-padding) 
-  (check-equal? (drawable-node-y dnode-e) 65) 
-  (check-equal? (drawable-node-x dnode-f) (+ (drawable-node-x dnode-e) test-width test-padding)) 
-  (check-equal? (drawable-node-x dnode-i) (+ (drawable-node-x dnode-f) test-width test-padding)) 
-  (check-equal? (drawable-node-x dnode-j) (+ (drawable-node-x dnode-i) test-width test-padding)) 
-  (check-equal? (drawable-node-x dnode-k) (+ (drawable-node-x dnode-j) test-width test-padding)))
-(let ([atree (build-attr-tree tree5 0)]) 
-  (check-equal? (attributed-node-num-leaves atree) 5))
-
-
-
-  
-
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/vtrace3.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/vtrace3.rkt
deleted file mode 100644
index 9dccb2a1c4..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/tests/vtrace3.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang racket/base
-(require (only-in future-visualizer/private/visualizer-data 
-                  indexed-future-event
-                  future-event))
-(provide vtrace-3)
-
-(define vtrace-3
-  (list 
-   (indexed-future-event 0 '#s(future-event #f 0 create 1350710151424.755 #f 1)) 
-   (indexed-future-event 1 '#s(future-event 1 1 start-work 1350710151424.851 #f 0)) 
-   (indexed-future-event 2 '#s(future-event 1 1 sync 1350710151424.865 #f 0)) 
-   (indexed-future-event 3 '#s(future-event #f 0 create 1350710151424.966 #f 2)) 
-   (indexed-future-event 4 '#s(future-event 2 2 start-work 1350710151425.023 #f 0)) 
-   (indexed-future-event 5 '#s(future-event 2 2 sync 1350710151425.024 #f 0)) 
-   (indexed-future-event 6 '#s(future-event #f 0 create 1350710151425.041 #f 3)) 
-   (indexed-future-event 7 '#s(future-event 3 3 start-work 1350710151425.082 #f 0)) 
-   (indexed-future-event 8 '#s(future-event 3 3 sync 1350710151425.083 #f 0)) 
-   (indexed-future-event 9 '#s(future-event #f 0 create 1350710151425.096 #f 4)) 
-   (indexed-future-event 10 '#s(future-event 4 4 start-work 1350710151425.135 #f 0)) 
-   (indexed-future-event 11 '#s(future-event 4 4 sync 1350710151425.135 #f 0)) 
-   (indexed-future-event 12 '#s(future-event #f 0 create 1350710151425.148 #f 5)) 
-   (indexed-future-event 13 '#s(future-event 5 5 start-work 1350710151425.215 #f 0)) 
-   (indexed-future-event 14 '#s(future-event 5 5 sync 1350710151425.216 #f 0)) 
-   (indexed-future-event 15 '#s(future-event 1 0 sync 1350710151425.235 |[jit_on_demand]| for-loop)) 
-   (indexed-future-event 16 '#s(future-event 1 0 result 1350710151425.274 #f 0)) 
-   (indexed-future-event 17 '#s(future-event 1 1 result 1350710151425.306 #f 0)) 
-   (indexed-future-event 18 '#s(future-event 1 1 start-work 1350710151425.306 #f 0)) 
-   (indexed-future-event 19 '#s(future-event 1 1 sync 1350710151425.307 #f 0)) 
-   (indexed-future-event 20 '#s(future-event 1 0 sync 1350710151425.361 |[allocate memory]| 2)) 
-   (indexed-future-event 21 '#s(future-event 1 0 result 1350710151425.365 #f 0)) 
-   (indexed-future-event 22 '#s(future-event 5 0 sync 1350710151425.372 |[jit_on_demand]| for-loop)) 
-   (indexed-future-event 23 '#s(future-event 5 0 result 1350710151425.375 #f 0)) 
-   (indexed-future-event 24 '#s(future-event 1 1 result 1350710151425.376 #f 0)) 
-   (indexed-future-event 25 '#s(future-event 1 1 start-work 1350710151425.38 #f 0)) 
-   (indexed-future-event 26 '#s(future-event 1 1 sync 1350710151425.39 #f 0)) 
-   (indexed-future-event 27 '#s(future-event 5 5 result 1350710151425.399 #f 0)) 
-   (indexed-future-event 28 '#s(future-event 5 5 start-work 1350710151425.4 #f 0)) 
-   (indexed-future-event 29 '#s(future-event 5 5 sync 1350710151425.406 #f 0)) 
-   (indexed-future-event 30 '#s(future-event 1 0 sync 1350710151425.421 |[jit_on_demand]| loop-x)) 
-   (indexed-future-event 31 '#s(future-event 1 0 result 1350710151425.564 #f 0)) 
-   (indexed-future-event 32 '#s(future-event 1 1 result 1350710151425.571 #f 0)) 
-   (indexed-future-event 33 '#s(future-event 1 1 start-work 1350710151425.571 #f 0)) 
-   (indexed-future-event 34 '#s(future-event 1 1 complete 1350710151425.573 #f 0)) 
-   (indexed-future-event 35 '#s(future-event 1 1 end-work 1350710151425.574 #f 0)) 
-   (indexed-future-event 36 '#s(future-event 5 0 sync 1350710151425.576 |[allocate memory]| 2)) 
-   (indexed-future-event 37 '#s(future-event 5 0 result 1350710151425.58 #f 0)) 
-   (indexed-future-event 38 '#s(future-event 5 5 result 1350710151425.587 #f 0)) 
-   (indexed-future-event 39 '#s(future-event 5 5 start-work 1350710151425.587 #f 0)) 
-   (indexed-future-event 40 '#s(future-event 5 5 complete 1350710151425.589 #f 0)) 
-   (indexed-future-event 41 '#s(future-event 5 5 end-work 1350710151425.59 #f 0)) 
-   (indexed-future-event 42 '#s(future-event 4 0 sync 1350710151425.598 |[jit_on_demand]| for-loop)) 
-   (indexed-future-event 43 '#s(future-event 4 0 result 1350710151425.601 #f 0)) 
-   (indexed-future-event 44 '#s(future-event 4 4 result 1350710151425.606 #f 0)) 
-   (indexed-future-event 45 '#s(future-event 4 4 start-work 1350710151425.606 #f 0)) 
-   (indexed-future-event 46 '#s(future-event 4 4 sync 1350710151425.607 #f 0)) 
-   (indexed-future-event 47 '#s(future-event 3 0 sync 1350710151425.617 |[jit_on_demand]| for-loop)) 
-   (indexed-future-event 48 '#s(future-event 3 0 result 1350710151425.62 #f 0)) 
-   (indexed-future-event 49 '#s(future-event 3 3 result 1350710151425.625 #f 0)) 
-   (indexed-future-event 50 '#s(future-event 3 3 start-work 1350710151425.625 #f 0)) 
-   (indexed-future-event 51 '#s(future-event 3 3 sync 1350710151425.625 #f 0)) 
-   (indexed-future-event 52 '#s(future-event 4 0 sync 1350710151425.633 |[allocate memory]| 2)) 
-   (indexed-future-event 53 '#s(future-event 4 0 result 1350710151425.637 #f 0)) 
-   (indexed-future-event 54 '#s(future-event 4 4 result 1350710151425.641 #f 0)) 
-   (indexed-future-event 55 '#s(future-event 4 4 start-work 1350710151425.642 #f 0)) 
-   (indexed-future-event 56 '#s(future-event 4 4 complete 1350710151425.647 #f 0)) 
-   (indexed-future-event 57 '#s(future-event 4 4 end-work 1350710151425.648 #f 0)) 
-   (indexed-future-event 58 '#s(future-event 3 0 sync 1350710151425.65 |[allocate memory]| 2)) 
-   (indexed-future-event 59 '#s(future-event 3 0 result 1350710151425.653 #f 0)) 
-   (indexed-future-event 60 '#s(future-event 3 3 result 1350710151425.657 #f 0)) 
-   (indexed-future-event 61 '#s(future-event 3 3 start-work 1350710151425.658 #f 0)) 
-   (indexed-future-event 62 '#s(future-event 3 3 complete 1350710151425.662 #f 0)) 
-   (indexed-future-event 63 '#s(future-event 3 3 end-work 1350710151425.663 #f 0)) 
-   (indexed-future-event 64 '#s(future-event 2 0 sync 1350710151425.669 |[jit_on_demand]| for-loop)) 
-   (indexed-future-event 65 '#s(future-event 2 0 result 1350710151425.672 #f 0)) 
-   (indexed-future-event 66 '#s(future-event 1 0 touch-pause 1350710151425.675 #f 0)) 
-   (indexed-future-event 67 '#s(future-event 2 2 result 1350710151425.676 #f 0)) 
-   (indexed-future-event 68 '#s(future-event 2 2 start-work 1350710151425.678 #f 0)) 
-   (indexed-future-event 69 '#s(future-event 1 0 touch-resume 1350710151425.686 #f 0)) 
-   (indexed-future-event 70 '#s(future-event 2 2 sync 1350710151425.688 #f 0)) 
-   (indexed-future-event 71 '#s(future-event 2 0 sync 1350710151425.724 |[allocate memory]| 2)) 
-   (indexed-future-event 72 '#s(future-event 2 0 result 1350710151425.728 #f 0)) 
-   (indexed-future-event 73 '#s(future-event 2 0 touch-pause 1350710151425.734 #f 0)) 
-   (indexed-future-event 74 '#s(future-event 2 2 result 1350710151425.734 #f 0)) 
-   (indexed-future-event 75 '#s(future-event 2 2 start-work 1350710151425.734 #f 0)) 
-   (indexed-future-event 76 '#s(future-event 2 2 complete 1350710151425.738 #f 0)) 
-   (indexed-future-event 77 '#s(future-event 2 2 end-work 1350710151425.739 #f 0)) 
-   (indexed-future-event 78 '#s(future-event 2 0 touch-resume 1350710151425.748 #f 0))))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/trace.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/trace.rkt
deleted file mode 100644
index 36d1cecb94..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/future-visualizer/trace.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-(require racket/contract
-         "private/visualizer-data.rkt")
-(provide (struct-out future-event)
-         (struct-out gc-info)
-         (struct-out indexed-future-event)
-         trace-futures
-         (contract-out
-          [start-future-tracing! (-> void?)]
-          [stop-future-tracing! (-> void?)]
-          [timeline-events (-> (listof indexed-future-event?))]
-          [trace-futures-thunk ((-> any/c) . -> . (listof indexed-future-event?))]))
-
-(define-syntax-rule (trace-futures e ...)
-  (begin (start-future-tracing!)
-         (begin (begin e ...)
-                (stop-future-tracing!)
-                (timeline-events))))
-
-;;trace-futures-thunk : (-> any) -> (listof indexed-future-event)
-(define (trace-futures-thunk thunk)
-  (start-future-tracing!)
-  (begin
-    (thunk)
-    (stop-future-tracing!)
-    (timeline-events)))
diff --git a/pkgs/future-visualizer-pkgs/future-visualizer/info.rkt b/pkgs/future-visualizer-pkgs/future-visualizer/info.rkt
deleted file mode 100644
index ca7daae068..0000000000
--- a/pkgs/future-visualizer-pkgs/future-visualizer/info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "data-lib"
-               "draw-lib"
-               "pict-lib"
-               "gui-lib"))
-(define build-deps '("scheme-lib"
-                     "scribble-lib"
-                     "racket-doc"
-                     "rackunit-lib"))
-
-(define pkg-desc "Graphical performance tools for using futures")
-
-(define pkg-authors '(jamesswaine))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-doc/info.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-doc/info.rkt
deleted file mode 100644
index b472b60b8c..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-doc/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-(define collection 'multi)
-(define deps '("base" "racket-doc" "scribble-lib"))
-(define pkg-desc "documentation part of \"gui-pkg-manager\"")
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-doc/pkg/gui/scribblings/gui-pkg-manager.scrbl b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-doc/pkg/gui/scribblings/gui-pkg-manager.scrbl
deleted file mode 100644
index 8ca6e3e5d6..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-doc/pkg/gui/scribblings/gui-pkg-manager.scrbl
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang scribble/manual
-@(require scribble/bnf
-          scribble/core
-          (for-label pkg racket/base))
-
-@title{Package Management GUI Libraries}
-
-@author[@author+email["Matthew Flatt" "mflatt@racket-lang.org"]
-        @author+email["Jay McCarthy" "jay@racket-lang.org"]
-        @author+email["Robert Bruce Findler" "robby@racket-lang.org"]]
-
-@declare-exporting[pkg/gui]
-
-The @tt{gui-pkg-manager} provides GUI support for package management.
-
-@defproc[(make-pkg-gui
-          [#:wrap-terminal-action wrap-terminal-action (-> (-> any) any) (λ (t) (t))]
-          [#:initial-tab initial-tab (or/c 'by-source 'installed 'from-list 'migrate) 'by-source])
-         (is-a?/c top-level-window<%>)]{
- Opens the package manager GUI starting with the @racket[initial-tab] selected. 
-                                                   
- The @racket[wrap-terminal-action] function is passed a thunk that it is expected to 
- invoke, possibly after redirecting the @racket[current-output-port] and @racket[current-error-port]
- to point to an existing GUI window.
-}
-
-@defproc[(make-pkg-installer
-          [#:parent parent (or/c #f (is-a?/c top-level-window<%>)) #f]
-          [#:wrap-terminal-action wrap-terminal-action (-> (-> any) any) (λ (t) (t))]
-          [#:package-to-offer package-to-offer (or/c #f string?) #f])
-         (is-a?/c top-level-window<%>)]{
-                                        
- Opens a specialized version of the @racket[make-pkg-gui] window that contains only the 
- @racket['by-source] panel.
-  
- The @racket[wrap-terminal-action] function is passed a thunk that it is expected to 
- invoke, possibly after redirecting the @racket[current-output-port] and @racket[current-error-port]
- to point to an existing GUI window.
-}
-
-@defproc[(pkg-catalog-update-local/simple-status-dialog
-          [#:parent parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f])
-         void?]{
-  Calls @racket[pkg-catalog-update-local] with a simple @racket[dialog%]
-  that shows which catalog servers are being consulted.
-}
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-doc/pkg/info.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-doc/pkg/info.rkt
deleted file mode 100644
index 8ebc6f413b..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-doc/pkg/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define scribblings 
-  '(("gui/scribblings/gui-pkg-manager.scrbl")))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/LICENSE.txt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/LICENSE.txt
deleted file mode 100644
index 4ef724b0d6..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-gui-pkg-manager-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/info.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/info.rkt
deleted file mode 100644
index 5b2af7af77..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "gui-lib"
-               "string-constants-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"gui-pkg-manager\"")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui.rkt
deleted file mode 100644
index 3a14a5a76b..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui.rkt
+++ /dev/null
@@ -1,204 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/contract/base
-         framework
-         "gui/private/by-source.rkt"
-         "gui/private/by-list.rkt"
-         "gui/private/by-installed.rkt"
-         "gui/private/by-migrate.rkt"
-         "gui/private/settings.rkt"
-         "gui/private/catalog-update.rkt"
-         mrlib/terminal
-         string-constants)
-
-(provide
- (contract-out
-  [make-pkg-gui
-   (->* ()
-        (#:wrap-terminal-action 
-         (-> (-> any) any) 
-         #:initial-tab 
-         (or/c 'by-source 'installed 'from-list 'migrate))
-        (is-a?/c top-level-window<%>))]
-  [make-pkg-installer
-   (->* ()
-        (#:parent
-         (or/c #f (is-a?/c top-level-window<%>))
-         #:wrap-terminal-action 
-         (-> (-> any) any)
-         #:package-to-offer 
-         (or/c #f string?))
-        (is-a?/c top-level-window<%>))]
-  [pkg-catalog-update-local/simple-status-dialog
-   (->* () (#:parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f)) void?)]))
-
-(define pkg-gui-frame% 
-  (class (frame:standard-menus-mixin
-          (frame:status-line-mixin
-           frame:basic%))
-    (super-new)
-    ;; no menu separator:
-    (define/override (edit-menu:between-select-all-and-find m) (void))))
-
-(define (make-pkg-installer #:parent 
-                            [parent #f]
-                            #:wrap-terminal-action 
-                            [wrap-terminal-action (λ (t) (t))]
-                            #:package-to-offer
-                            [package-to-offer #f])
-  
-  (define allow-close? #t)
-  
-  (define dlg
-    (new (class dialog%
-           (define/augment (can-close?)
-             allow-close?)
-           (super-new
-            [parent parent]
-            [label "Package Installer"]))))
-
-  (define terminal #f)
-  (define (in-terminal-panel abort-label thunk)
-    (cond
-      [(or (not terminal) (send terminal can-close?))
-       (send dlg begin-container-sequence)
-       (when terminal (send terminal close))
-       (define t (in-terminal 
-                  #:abort-label abort-label
-                  #:canvas-min-height 200
-                  #:container dlg
-                  #:close-button? #f
-                  (λ (cust parent) (wrap-terminal-action thunk))))
-       (move-close-button (send t get-button-panel))
-       (send dlg reflow-container)
-       (set! terminal t)
-       (disallow-close)
-       (send dlg end-container-sequence)
-       (yield (send t can-close-evt))
-       (allow-close)]
-      [else 
-       (message-box (string-constant install-pkg-dialog-title)
-                    (string-constant install-pkg-not-rentrant))]))
-  
-  (define (disallow-close)
-    (set! allow-close? #f)
-    (send close enable #f))
-  
-  (define (allow-close)
-    (set! allow-close? #t)
-    (send close enable #t))
-
-  (define by-source-panel
-    (new by-source-panel% 
-         [parent dlg]
-         [in-terminal in-terminal-panel]
-         [text-field-initial-value package-to-offer]))
-  
-  (define close (new button% 
-                     [label (string-constant close)] 
-                     [parent (send by-source-panel get-close-button-panel)]
-                     [callback
-                      (λ (x y)
-                        (send dlg show #f))]))
-
-  (define (move-close-button button-panel)
-    (define button-panel-originals (send button-panel get-children))
-    (send close reparent button-panel)
-    ;; Make the close button appear in the bottom right:
-    (send button-panel change-children
-          (lambda (l)
-            (append
-             (list (new horizontal-pane% [parent button-panel]))
-             button-panel-originals
-             (list (new horizontal-pane% [parent button-panel])
-                   close)))))
-  
-  (send dlg show #t)
-
-  dlg)
-
-(define (make-pkg-gui #:wrap-terminal-action 
-                      [wrap-terminal-action (lambda (thunk) (thunk))]
-                      #:initial-tab [initial-tab 'by-source])
-
-  (define frame
-    (new pkg-gui-frame%
-         [label "Package Manager"]
-         [width 800]
-         [height 600]))
-
-  (define (update-sel-panel-active)
-    (define old (send sel-panel active-child))
-    (define new (list-ref (send sel-panel get-children) (send sel-tab get-selection)))
-    (unless (eq? new old)
-      (send sel-panel active-child new)
-      (when (and terminal
-                 (not (send terminal is-closed?)))
-        (send sel-tab stretchable-height (send new stretchable-height)))))
-  
-  (define sel-tab
-    (new tab-panel%
-         [parent (send frame get-area-container)]
-         [choices (list (string-constant install-pkg-install-by-source)
-                        (string-constant install-pkg-install-installed)
-                        (string-constant install-pkg-install-from-list)
-                        (string-constant install-pkg-migrate-from)
-                        (string-constant install-pkg-settings))]
-         [callback (lambda (t e)
-                     (update-sel-panel-active))]))
-
-  (define sel-panel
-    (new panel:single%
-         [parent sel-tab]
-         [alignment '(center top)]))
-
-  (define terminal #f)
-  (define (in-terminal-panel abort-label thunk)
-    (when terminal 
-      (send terminal close))
-    (send sel-tab stretchable-height (send (send sel-panel active-child)
-                                           stretchable-height))
-    (define t (in-terminal 
-               #:abort-label abort-label
-               #:close-label (string-constant install-pkg-close-terminal-output)
-               #:close-callback (lambda ()
-                                  (send sel-tab stretchable-height #t))
-               #:container (send frame get-area-container)
-               (λ (cust parent) (wrap-terminal-action thunk))))
-    (set! terminal t)
-    (send sel-tab enable #f)
-    (yield (send t can-close-evt))
-    (send sel-tab enable #t))
-
-  (new by-source-panel% 
-       [parent sel-panel]
-       [in-terminal in-terminal-panel])
-  (new by-installed-panel%
-       [parent sel-panel]
-       [in-terminal in-terminal-panel])
-  (new by-list-panel% 
-       [parent sel-panel]
-       [in-terminal in-terminal-panel])
-  (new by-migrate-panel%
-       [parent sel-panel]
-       [in-terminal in-terminal-panel])
-  (new settings-panel%
-       [parent sel-panel])
-  
-  (send sel-tab set-selection
-        (case initial-tab
-          [(by-source) 0]
-          [(from-list) 1]
-          [(installed) 2]
-          [(migrate) 3]))
-  (update-sel-panel-active)
-  
-  (send frame show #t)
-
-  frame)
-
-(module+ main
-  #;
-  (void (make-pkg-installer))
-  (void (make-pkg-gui)))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-installed.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-installed.rkt
deleted file mode 100644
index 214a899b20..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-installed.rkt
+++ /dev/null
@@ -1,299 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/format
-         setup/dirs
-         net/url
-         pkg/lib
-         pkg
-         string-constants
-         "filter-panel.rkt"
-         "common.rkt")
-
-(provide by-installed-panel%)
-
-(struct ipkg (name scope auto? checksum source))
-
-(define ((ipkg->desc dir) ipkg)
-  (define name (ipkg-name ipkg))
-  (define s (cadr (ipkg-source ipkg)))
-  (define kind (car (ipkg-source ipkg)))
-  (case kind
-    [(catalog) (pkg-desc s 'name name #f #f)]
-    [(link static-link)
-     (pkg-desc (path->string (path->complete-path s dir)) kind name #f #f)]
-    [(url) (pkg-desc s #f name #f #f)]
-    [(clone)
-     (define url-str (caddr (ipkg-source ipkg)))
-     (pkg-desc url-str
-               'clone
-               name
-               #f
-               #f
-               #:path (let loop ([p (path->complete-path s dir)]
-                                 [n (length (url-query (string->url url-str)))])
-                        (cond
-                         [(zero? n) p]
-                         [else (define-values (base name dir?) (split-path p))
-                               (if (path? base)
-                                   (loop base (sub1 n))
-                                   (error "mangled path recorded for a clone"))])))]))
-
-(define (source->string s)
-  (format "~a: ~a"
-          (case (car s)
-            [(catalog) "Catalog"]
-            [(url) "URL"]
-            [(link) "Link"]
-            [(static-link) "Static link"]
-            [(file) "File"]
-            [(clone) "Clone"])
-          (cadr s)))
-
-(define (status-string a default-scope)
-  (~a (if (ipkg-auto? a) "*" check-mark)
-      (if (equal? (ipkg-scope a) default-scope)
-          ""
-          "!")
-      (case (car (ipkg-source a))
-        [(link static-link) "="]
-        [(URL) "@"]
-        [else ""])))
-
-(define (scope<? a b)
-  (cond
-   [(path? a)
-    (or (not (path? b))
-        (bytes<? (path->bytes a) (path->bytes b)))]
-   [(path? b) #f]
-   [else
-    (case a
-      [(installation) #t]
-      [else #f])]))
-
-(define (ipkg<? a b)
-  (if (string=? (ipkg-name a) (ipkg-name b))
-      (scope<? (ipkg-scope a) (ipkg-scope b))
-      (string<? (ipkg-name a) (ipkg-name b))))
-
-(define by-installed-panel%
-  (class vertical-panel%
-    (init-field [in-terminal in-terminal])
-
-    (super-new)
-
-    (inherit get-top-level-window)
-
-    (define filter-panel (make-filter-panel this
-                                            (lambda () (sort-list!))))
-
-    (define status-text
-      (new message%
-           [parent this]
-           [label install-status-desc]
-           [font small-control-font]
-           [stretchable-width #t]))
-
-    (define pkg-list
-      (new list-box%
-           [parent this]
-           [label #f]
-           [choices null]
-           [columns (list check-mark "Scope" "Name" "Checksum" "Source")]
-           [style '(multiple column-headers clickable-headers)]
-           [callback (lambda (lb e)
-                       (when (e . is-a? . column-control-event%)
-                         (define sb (send e get-column))
-                         (if (= sb sort-by)
-                             (set! flip? (not flip?))
-                             (begin
-                               (set! sort-by sb)
-                               (set! flip? #f)))
-                         (sort-list!))
-                       (adjust-buttons!))]))
-
-    (send pkg-list set-column-width 0 30 2 1000)
-    (send pkg-list set-column-width 2 
-          (max 100 (let-values ([(w mn mx) (send pkg-list get-column-width 2)])
-                     w))
-          2 1000)
-    (send pkg-list set-column-width 4 300 2 1000)
-
-
-    (define sort-by 0)
-    (define flip? #f)
-    (define installed '())
-    (define sorted-installed '#())
-
-    (define/override (on-superwindow-show on?)
-      (when on?
-        (reset-installed-list!)))
-
-    (define/private (reset-installed-list!)
-      (set! installed
-            (for*/list ([scope (in-list (get-scope-list))]
-                        [(k v) (in-hash (installed-pkg-table #:scope scope))])
-              (ipkg k scope (pkg-info-auto? v) (pkg-info-checksum v) (pkg-info-orig-pkg v))))
-      (sort-list!))
-
-    (define/private (selected-ipkgs)
-      (for/list ([i (in-list (send pkg-list get-selections))])
-        (vector-ref sorted-installed i)))
-    
-    (define button-line
-      (new horizontal-panel%
-           [parent this]
-           [alignment '(center center)]
-           [stretchable-height #f]))
-
-    (define update-button
-      (new button%
-           [label (string-constant install-pkg-update)]
-           [parent button-line]
-           [callback (lambda (b e)
-                       (handle-packages
-                        (string-constant install-pkg-abort-update)
-                        (lambda (names scope)
-                          (apply
-                           pkg-update-command
-                           #:batch #t
-                           #:scope scope
-                           names))))]))
-
-    (define promote-button
-      (new button%
-           [label (string-constant install-pkg-promote)]
-           [parent button-line]
-           [callback (lambda (b e)
-                       (handle-packages
-                        (string-constant install-pkg-abort-promote)
-                        #:ipkgs? #t
-                        (lambda (ipkgs scope)
-                          ;; Links can be relative to scope:
-                          (define dir (cond
-                                       [(path? scope) scope]
-                                       [(eq? scope 'installation) (find-pkgs-dir)]
-                                       [else (find-user-pkgs-dir)]))
-                          (parameterize ([current-pkg-scope scope])
-                            (with-pkg-lock (pkg-install (map (ipkg->desc dir) ipkgs))))
-                          (void))))]))
-
-    (define demote-button
-      (new button%
-           [label (string-constant install-pkg-demote)]
-           [parent button-line]
-           [callback (lambda (b e)
-                       (handle-packages
-                        (string-constant install-pkg-abort-demote)
-                        (lambda (names scope)
-                          (apply
-                           pkg-remove-command
-                           #:batch #t
-                           #:demote #t
-                           #:scope scope
-                           names))))]))
-
-    (define remove-button
-      (new button%
-           [label sc-install-pkg-remove]
-           [parent button-line]
-           [callback (lambda (b e)
-                       (handle-packages
-                        (string-constant install-pkg-abort-remove)
-                        #:check (lambda (names)
-                                  (really-remove? names #:parent (get-top-level-window)))
-                        (lambda (names scope)
-                          (apply
-                           pkg-remove-command
-                           #:batch #t
-                           #:scope scope
-                           names))))]))
-
-    (define/private (handle-packages label cb 
-                                     #:ipkgs? [ipkgs? #f]
-                                     #:check [check void])
-      (define ipkgs (selected-ipkgs))
-      (define names (map ipkg-name ipkgs))
-      (when (check names)
-        (define scope (ipkg-scope (car ipkgs)))
-        (in-terminal
-         label
-         (lambda ()
-           (cb (if ipkgs? ipkgs names) scope)))
-        (reset-installed-list!)))
-
-    (define/private (adjust-buttons!)
-      (define ipkgs (selected-ipkgs))
-      (define same-scope? (and (pair? ipkgs)
-                               ;; must be all in the same scope:
-                               (for/and ([i (in-list (cdr ipkgs))])
-                                 (equal? (ipkg-scope i) (ipkg-scope (car ipkgs))))))
-      (send remove-button enable same-scope?)
-      (send demote-button enable (and same-scope?
-                                      (for/and ([i (in-list ipkgs)])
-                                        (not (ipkg-auto? i)))))
-      (send promote-button enable (and same-scope?
-                                       (for/and ([i (in-list ipkgs)])
-                                         (ipkg-auto? i))))
-      (send update-button enable (and same-scope?
-                                      (for/and ([i (in-list ipkgs)])
-                                        (not (memq (car (ipkg-source i))
-                                                   '(link static-link)))))))
-
-    (define/private (sort-list!)
-      (define default-scope (default-pkg-scope))
-      (define show-installed (let ([rx (send filter-panel get-rx)])
-                               (filter
-                                (lambda (a)
-                                  (or (regexp-match? rx (status-string a default-scope))
-                                      (regexp-match? rx (ipkg-name a))
-                                      (regexp-match? rx (~a (ipkg-scope a)))
-                                      (regexp-match? rx (or (ipkg-checksum a) ""))
-                                      (regexp-match? rx (source->string (ipkg-source a)))))
-                                installed)))
-      (send filter-panel set-result (length show-installed) (length installed))
-      (define l (sort show-installed
-                      (lambda (a b)
-                        ((if flip? not values)
-                         (case sort-by
-                           [(0) (if (eq? (ipkg-auto? a) (ipkg-auto? b))
-                                    (if (equal? (ipkg-scope a) (ipkg-scope b))
-                                        (string<? (ipkg-name a) (ipkg-name b))
-                                        (not (ipkg-auto? a)))
-                                    (ipkg-auto? b))]
-                           [(1) (if (equal? (ipkg-scope a) (ipkg-scope b))
-                                    (if (eq? (ipkg-auto? a) (ipkg-auto? b))
-                                        (string<? (ipkg-name a) (ipkg-name b))
-                                        (not (ipkg-auto? a)))
-                                    (scope<? (ipkg-scope a) (ipkg-scope b)))]
-                           [(2) (ipkg<? a b)]
-                           [(3) (if (equal? (ipkg-checksum a) (ipkg-checksum b))
-                                    (ipkg<? a b)
-                                    (cond
-                                     [(not (ipkg-checksum a)) #f]
-                                     [(not (ipkg-checksum b)) #t]
-                                     [else (string<? (ipkg-checksum a) (ipkg-checksum b))]))]
-                           [(4) 
-                            (define sa (ipkg-source a))
-                            (define sb (ipkg-source b))
-                            (if (equal? sa sb)
-                                (ipkg<? a b)
-                                (if (eq? (car sa) (car sb))
-                                    (string<? (cadr sa) (cadr sb))
-                                    (case (car sa)
-                                      [(link static-link clone) #t]
-                                      [(catalog) (eq? b 'url)]
-                                      [(url) #f])))])))))
-      (set! sorted-installed (list->vector l))
-      (send pkg-list set
-            (for/list ([i (in-list l)])
-              (status-string i default-scope))
-            (for/list ([i (in-list l)])
-              (~a (ipkg-scope i)))
-            (for/list ([i (in-list l)])
-              (format "~a" (ipkg-name i)))
-            (for/list ([i (in-list l)])
-              (or (ipkg-checksum i) ""))
-            (for/list ([i (in-list l)])
-              (source->string (ipkg-source i))))
-      (adjust-buttons!))))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-list.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-list.rkt
deleted file mode 100644
index 63abe8ba32..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-list.rkt
+++ /dev/null
@@ -1,479 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/port
-         racket/set
-         racket/format
-         string-constants
-         net/url
-         pkg/lib
-         pkg
-         (prefix-in db: pkg/db)
-         "filter-panel.rkt"
-         "common.rkt")
-
-(provide by-list-panel%)
-
-(define sc-pkg-update-package-list (string-constant install-pkg-update-package-list))
-(define sc-pkg-stop-update (string-constant install-pkg-stop-update))
-
-(define (pkg-install-status info scope default-scope)
-  (~a (cond 
-       [(pkg-info-auto? info) "*"]
-       [else check-mark])
-      (cond
-       [(equal? scope default-scope) ""]
-       [else "!"])
-      (case (car (pkg-info-orig-pkg info))
-        [(catalog) ""]
-        [(link) "="]
-        [(static-link) "="]
-        [(clone) "="]
-        [(url) "@"])))
-
-(define by-list-panel%
-  (class vertical-panel%
-    (init-field [in-terminal in-terminal])
-
-    (super-new)
-
-    (inherit get-top-level-window)
-
-    (define tool-panel
-      (new horizontal-panel%
-           [parent this]
-           [alignment '(left center)]
-           [stretchable-height #f]))
-
-    (define/private (list-pkg-keep? a)
-      (define keep-rx (send filter-panel get-rx))
-      (or (regexp-match? keep-rx (db:pkg-name a))
-          (regexp-match? keep-rx (db:pkg-author a))
-          (regexp-match? keep-rx (db:pkg-desc a))
-          (regexp-match? keep-rx (format-tags (pkg-tags a)))
-          (regexp-match? keep-rx (db:pkg-source a))
-          (regexp-match? keep-rx (db:pkg-catalog a))))
-
-    (define filter-panel (make-filter-panel tool-panel
-                                            (lambda () (sort-pkg-list!))))
-  
-    (define updating? #f)
-
-    (define update-button
-      (new button%
-           [label sc-pkg-update-package-list]
-           [parent tool-panel]
-           [font small-control-font]
-           [callback
-            (lambda (b e)
-              (if updating?
-                  (interrupt-task!)
-                  (update-db-package-list)))]))
-
-    (define status-text
-      (new message%
-           [parent this]
-           [label install-status-desc]
-           [font small-control-font]
-           [stretchable-width #t]))
-
-    (define sort-column -1)
-    (define list-pkg<? (lambda (a b) #f))
-
-    (define/private (sort-by! col)
-      (define sel (case col
-                    [(0) (lambda (p)
-                           (define i
-                             (hash-ref installed (db:pkg-name p) #f))
-                           (if i
-                               (pkg-install-status (cdr i) (car i) default-scope)
-                               ""))]
-                    [(1) db:pkg-name]
-                    [(2) db:pkg-author]
-                    [(3) db:pkg-desc]
-                    [(4) (lambda (p) (format-tags (pkg-tags p)))]
-                    [(5) db:pkg-checksum]
-                    [(6) db:pkg-source]
-                    [(7) db:pkg-catalog]))
-      (define empty-last? (not (= col 0)))
-      (define switch (if (= sort-column col)
-                         not
-                         values))
-      (set! sort-column (if (= sort-column col)
-                            -1
-                            col))
-      (set! list-pkg<?
-            (lambda (a b)
-              (switch
-               (cond
-                [(and empty-last?
-                      (not (string=? (sel a) ""))
-                      (string=? (sel b) ""))
-                 #t]
-                [(and empty-last?
-                      (string=? (sel a) "")
-                      (not (string=? (sel b) "")))
-                 #f]
-                [(string<? (sel a) (sel b)) #t]
-                [(string=? (sel a) (sel b))
-                 (cond
-                  [(string<? (db:pkg-name a) (db:pkg-name b)) #t]
-                  [(string=? (db:pkg-name a) (db:pkg-name b))
-                   (string<? (db:pkg-catalog a) (db:pkg-catalog b))]
-                  [else #f])]
-                [else #f])))))
-    (sort-by! 7)
-
-    (define pkg-list
-      (new list-box%
-           [parent this]
-           [label #f]
-           [choices null]
-           [columns (list check-mark "Package" "Author" "Description" "Tags" "Checksum" "Source" "Catalog")]
-           [style '(multiple column-headers clickable-headers)]
-           [callback (lambda (lb e)
-                       (when (e . is-a? . column-control-event%)
-                         (sort-by! (send e get-column))
-                         (sort-pkg-list!))
-                       (adjust-buttons!))]))
-    
-    (send pkg-list set-column-width 0 30 2 1000)
-    (send pkg-list set-column-width 3 300 2 1000)
-
-    (define button-line
-      (new horizontal-panel%
-           [parent this]
-           [alignment '(center center)]
-           [stretchable-height #f]))
-
-    (define install-button
-      (new button%
-           [label (pick-wider normal-control-font
-			      (string-constant install-pkg-install)
-			      (string-constant install-pkg-update))]
-           [parent button-line]
-           [style '(border)]
-           [callback (lambda (b e)
-                       (define pkgs (selected-pkgs))
-                       (define names (map db:pkg-name pkgs))
-                       (define first-inst
-                         (hash-ref installed (db:pkg-name (car pkgs)) #f))
-                       (define s (queue-scroll!))
-                       (in-terminal
-                        (if first-inst
-                            (string-constant install-pkg-abort-update)
-                            (string-constant install-pkg-abort-install))
-                        (lambda ()
-                          (apply
-                           (if first-inst pkg-update-command pkg-install-command)
-                           #:deps 'search-auto
-                           #:scope (and first-inst
-                                        (car first-inst))
-                           names)))
-                       (set-box! s #f)
-                       (refresh-installed-list!))]))
-    (define remove-button
-      (new button%
-           [label sc-install-pkg-remove]
-           [parent button-line]
-           [callback (lambda (b e)
-                       (define pkgs (selected-pkgs))
-                       (define names (map db:pkg-name pkgs))
-                       (when (really-remove? names #:parent (get-top-level-window))
-                         (define scope
-                           (car (hash-ref installed (db:pkg-name (car pkgs)) #f)))
-                         (define s (queue-scroll!))
-                         (in-terminal
-                          (string-constant install-pkg-abort-remove)
-                          (lambda ()
-                            (apply
-                             pkg-remove
-                             #:scope scope
-                             names)))
-                         (set-box! s #f)
-                         (refresh-installed-list!)))]))
-
-    ;; When a terminal panel appears, it may shrink the
-    ;; list box enough that the selected item is not visible,
-    ;; so re-sort to adjust scrolling:
-    (define (queue-scroll!)
-      (define b (box #t))
-      (queue-callback (lambda ()
-                        (when (unbox b)
-                          (sort-pkg-list!)))
-                      #f)
-      b)
-
-    (define/private (selected-pkgs)
-      (for/list ([i (in-list (send pkg-list get-selections))])
-        (send pkg-list get-data i)))
-
-    (define/private (adjust-buttons!)
-      (define sels (for/list ([p (selected-pkgs)])
-                     (hash-ref installed (db:pkg-name p) #f)))
-      (define all-installed? (and (pair? sels) 
-                                  (andmap values sels)
-                                  ;; must be all in the same scope:
-                                  (for/and ([p (cdr sels)])
-                                    (eq? (car p) (caar sels)))))
-      (define none-installed? (not (ormap values sels)))
-      (send install-button enable (and (pair? sels)
-                                       (or (and all-installed?
-                                                (not (for/or ([p (in-list sels)])
-                                                       (define kind (car (pkg-info-orig-pkg (cdr p))))
-                                                       (or (eq? 'link kind)
-                                                           (eq? 'static-link kind)))))
-                                           none-installed?)))
-      (send install-button set-label (if all-installed?
-                                         (string-constant install-pkg-update)
-                                         (string-constant install-pkg-install)))
-      (send remove-button enable all-installed?))
-
-    (adjust-buttons!)
-
-    (define/private (check-catalogs)
-      (define user-catalogs (pkg-config-catalogs))
-      (define db-catalogs (db:get-catalogs))
-      (unless (equal? (list->set db-catalogs)
-                      (list->set user-catalogs))
-        (when (= 1 (message-box/custom "Package Catalogs"
-                                       (~a
-                                        (string-constant install-pkg-update-catalogs?)
-                                        "\n\n"
-                                        (string-constant install-pkg-currently-configured-are) ":\n"
-                                        (apply ~a
-                                               (for/list ([url user-catalogs])
-                                                 (~a "  " url "\n")))
-                                        "\n"
-                                        (string-constant install-pkg-database-recorded-are) ":\n"
-                                        (apply ~a
-                                               (for/list ([url db-catalogs])
-                                                 (~a "  " url "\n"))))
-                                       (string-constant install-pkg-update-catalogs)
-                                       (string-constant install-pkg-do-not-update-catalogs)
-                                       #f
-                                       (get-top-level-window)
-                                       '(caution default=1)))
-          (db:set-catalogs! user-catalogs)
-          (update-db-package-list))))
-
-    (define/private (check-init)
-      (unless (file-exists? (db:current-pkg-catalog-file))
-        (db:set-catalogs! (pkg-config-catalogs))
-        (update-db-package-list)))
-
-    (define task #f)
-    (define finalize void)
-    
-    (define/private (task! thunk given-finalize)
-      (define finalized? #f)
-      (set! finalize (lambda (ok?)
-                       (unless finalized?
-                         (set! finalized? #t)
-                         (given-finalize ok?))))
-      (set! task (thread 
-                  (lambda ()
-                    (with-handlers ([exn:break? void])
-                      (with-handlers ([exn:fail? (lambda (exn)
-                                                   (queue-callback
-                                                    (lambda ()
-                                                      (message-box
-                                                       "Error"
-                                                       (exn-message exn)
-                                                       (get-top-level-window)
-                                                       '(ok stop)))))])
-                        (thunk))
-                      (let ([f finalize])
-                        (queue-callback/wait (lambda () (f #t)))))))))
-
-    (define/private (queue-callback/wait thunk)
-      (define s (make-semaphore))
-      (define ok? #t)
-      (queue-callback (lambda ()
-                        (when ok?
-                          (thunk)
-                          (semaphore-post s))))
-      (dynamic-wind
-          void
-          (lambda () (semaphore-wait s))
-          (lambda () (set! ok? #f))))
-
-    (define/private (interrupt-task!)
-      (when task
-        (break-thread task)
-        (sync task)
-        (finalize #f))
-      (set! task #f)
-      (send status-text set-label install-status-desc))
-
-    (define/private (update-db-package-list)
-      (interrupt-task!)
-      (set! updating? #t)
-      (send update-button set-label sc-pkg-stop-update)
-      (send status-text set-label "Updating package list...")
-      (task!
-       (lambda ()
-         (for ([catalog (in-list (db:get-catalogs))])
-           (queue-callback/wait
-            (lambda ()
-              (send status-text set-label (format "Updating from ~a..." catalog))))
-           (pkg-catalog-update-local #:catalogs (list catalog)
-                                     #:set-catalogs? #f
-                                     #:quiet? #t)))
-       (lambda (finished?)
-         (send status-text set-label install-status-desc)
-         (set! updating? #f)
-         (send update-button set-label sc-pkg-update-package-list)
-         (refresh-pkg-list!))))
-
-    (define/private (background-pkg-details)
-      (task!
-       (lambda ()
-         (define catalog-ht (make-hash))
-         (for ([a-pkg (in-vector pkgs)]
-               [pos (in-naturals)])
-           (define name (db:pkg-name a-pkg))
-           (define catalog (db:pkg-catalog a-pkg))
-           (send status-text set-label 
-                 (~a "Getting details for " name " from " catalog "..."))
-           (define all-ht 
-             (or (hash-ref catalog-ht catalog #f)
-                 (let ([all-ht (parameterize ([current-pkg-catalogs (list (string->url catalog))])
-                                 (get-all-pkg-details-from-catalogs))])
-                   (hash-set! catalog-ht catalog all-ht)
-                   all-ht)))
-           (define ht (hash-ref all-ht name))
-           (define author (hash-ref ht 'author ""))
-           (define source (hash-ref ht 'source ""))
-           (define checksum (hash-ref ht 'checksum ""))
-           (define desc (hash-ref ht 'description ""))
-           (define tags (hash-ref ht 'tags '()))
-           (define new-pkg (db:pkg name catalog author source checksum desc))
-           (unless (and (equal? new-pkg a-pkg)
-                        (equal? tagss (pkg-tags a-pkg)))
-             (db:set-pkg! name catalog author source checksum desc)
-             (db:set-pkg-tags! name catalog tags)
-             (queue-callback/wait
-              (lambda ()
-                (vector-set! pkgs pos new-pkg)
-                (set! tagss (hash-set (hash-remove tagss a-pkg)
-                                      new-pkg
-                                      tags))
-                (define lpos (vector-ref posns pos))
-                (when lpos
-                  (send pkg-list set-string lpos (->label-string author) 2)
-                  (send pkg-list set-string lpos (->label-string desc) 3)
-                  (send pkg-list set-string lpos (->label-string (format-tags tags)) 4)
-                  (send pkg-list set-string lpos (->label-string checksum) 5)
-                  (send pkg-list set-string lpos (->label-string source) 6)))))))
-       (lambda (ok?)
-         (send status-text set-label install-status-desc))))
-
-    (define/private (->label-string s)
-      (let ([s (regexp-replace* #rx"[\r\n]+" s " ")])
-	(substring s 0 (min 200 (string-length s)))))
-
-    (define pkgs '#())
-    (define tagss #(hash))
-    (define posns '#())
-    (define installed '#())
-    (define default-scope 'user)
-    
-    (define/private (refresh-pkg-list!)
-      (define pkg-list (db:get-pkgs))
-      (define tags-list (map (lambda (p)
-                               (db:get-pkg-tags (db:pkg-name p)
-                                                (db:pkg-catalog p)))
-                             pkg-list))
-      (set! pkgs (list->vector pkg-list))
-      (set! tagss (for/hash ([p (in-list pkg-list)]
-                             [t (in-list tags-list)])
-                    (values p t)))
-      (refresh-installed-list! #:always? #t))
-
-    (define/private (refresh-installed-list! #:always? [always? #f])
-      (define new-default-scope (default-pkg-scope))
-      (define new-installed
-        (for*/hash ([scope (in-list (get-scope-list))]
-                    [(k v) (in-hash (installed-pkg-table #:scope scope))])
-          (values k (cons scope v))))
-      (when (or always?
-                (not (equal? installed new-installed))
-                (not (eq? default-scope new-default-scope)))
-        (set! installed new-installed)
-        (set! default-scope new-default-scope)
-        (sort-pkg-list!)))
-
-    (define/private (pkg-tags p)
-      (hash-ref tagss p '()))
-    
-    (define/private (sort-pkg-list!)
-      (define sels (for/list ([i (in-list (send pkg-list get-selections))])
-                     (define p (send pkg-list get-data i))
-                     (cons (db:pkg-name p) (db:pkg-catalog p))))
-      (set! posns (make-vector (vector-length pkgs) #f))
-      (define list-pkg+poses
-        (sort
-         (filter
-          (lambda (p) (list-pkg-keep? (car p)))
-          (for/list ([p pkgs]
-                     [i (in-naturals)])
-            (cons p i)))
-         list-pkg<?
-         #:key car))
-      (for ([p (in-list list-pkg+poses)]
-            [j (in-naturals)])
-        (vector-set! posns (cdr p) j))
-      (define list-pkgs (map car list-pkg+poses))
-      (send filter-panel set-result (length list-pkgs) (vector-length pkgs))
-      (send pkg-list set
-            (for/list ([p list-pkgs])
-              (define v (hash-ref installed (db:pkg-name p) #f))
-              (cond
-               [(not v) ""]
-               [else
-                (pkg-install-status (cdr v) (car v) default-scope)]))
-            (for/list ([p list-pkgs]) (->label-string (db:pkg-name p)))
-            (for/list ([p list-pkgs]) (->label-string (db:pkg-author p)))
-            (for/list ([p list-pkgs]) (->label-string (db:pkg-desc p)))
-            (for/list ([p list-pkgs]) (->label-string (format-tags (pkg-tags p))))
-            (for/list ([p list-pkgs]) (->label-string (db:pkg-checksum p)))
-            (for/list ([p list-pkgs]) (->label-string (db:pkg-source p)))
-            (for/list ([p list-pkgs]) (->label-string (db:pkg-catalog p))))
-      (let ([ht (for/hash ([p list-pkgs]
-                           [i (in-naturals)])
-                  (send pkg-list set-data i p)
-                  (values (cons (db:pkg-name p) (db:pkg-catalog p))
-                          i))])
-        (for/fold ([did? #f]) ([sel (in-list sels)])
-          (define i (hash-ref ht sel #f))
-          (when i
-            (if did?
-                (send pkg-list select i)
-                (begin
-                  (send pkg-list set-selection i)
-                  (let ([f (send pkg-list get-first-visible-item)]
-                        [n (send pkg-list number-of-visible-items)])
-                    (unless (<= f i (+ f n -1))
-                      (send pkg-list set-first-visible-item
-                            (if (i . < . f)
-                                i
-                                (max 0 (add1 (- i n))))))))))
-          (or did? i)))
-      (adjust-buttons!))
-
-    (define/private (format-tags tags)
-      (apply ~a #:separator ", " tags))
-
-    (define prepared? #f)
-
-    (define/override (on-superwindow-show on?)
-      (if on?
-          (cond
-           [prepared? (refresh-installed-list!)]
-           [else
-            (check-init)
-            (refresh-pkg-list!)
-            (check-catalogs)
-            (set! prepared? #t)])
-          (interrupt-task!)))))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-migrate.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-migrate.rkt
deleted file mode 100644
index e5128a9379..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-migrate.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base 
-         racket/class
-         racket/format
-         racket/file
-         string-constants
-         setup/dirs
-         pkg
-         "common.rkt")
-
-(provide by-migrate-panel%)
-
-(define by-migrate-panel%
-  (class vertical-panel%
-    (init-field [in-terminal in-terminal])
-    (super-new)
-    
-    (inherit get-top-level-window)
-
-    (define choices-panel (new horizontal-panel% 
-                               [parent this] 
-                               [alignment '(center top)]))
-    
-    (define versions (new list-box% 
-                          [label (~a (string-constant install-pkg-migrate-available-installations)
-                                     ":")]
-                          [choices null]
-                          [parent choices-panel]
-                          [callback (λ (_1 _2) (adjust-all))]))
-
-    (define button-panel (new vertical-panel% 
-                              [parent choices-panel] 
-                              [stretchable-height #f]
-                              [stretchable-width #f]
-                              [alignment '(center center)]))
-
-    (define migrate-from-button (new button%
-                                     [parent button-panel]
-                                     [label (string-constant install-pkg-migrate-from)]
-                                     [callback (lambda (b e)
-                                                 (in-terminal
-                                                  (string-constant install-pkg-abort-migrate)
-                                                  (lambda ()
-                                                    (pkg-migrate-command
-                                                     (send versions get-string-selection)))))]
-                                     [style '(border)]))
-
-    (define remove-button (new button%
-                               [parent button-panel]
-                               [label (string-constant install-pkg-remove)]
-                               [callback (lambda (b e)
-                                           (remove-package-info
-                                            (send versions get-string-selection)))]))
-
-    (define (remove-package-info vers)
-      (when (= 1 (message-box/custom (format (string-constant install-pkg-packages-for) vers)
-                                     (format
-                                      (string-constant install-pkg-really-remove-installation)
-                                      vers)
-                                     (string-constant install-pkg-remove)
-                                     (string-constant install-pkg-do-not-remove)
-                                     #f
-                                     (get-top-level-window)
-                                     '(caution default=1)))
-        (delete-directory/files (build-path (find-system-path 'addon-dir) vers "pkgs"))
-        (update-list!)
-        (adjust-all)))
-
-    (define (update-list!)
-      (define d (find-system-path 'addon-dir))
-      (define dirs (for/list ([p (in-list (directory-list d))]
-                              #:when (let ([p (build-path d p "pkgs" "pkgs.rktd")])
-                                       (file-exists? p))
-                              #:unless (equal? (path-element->string p)
-                                               (get-installation-name)))
-                     (path-element->string p)))
-      (send versions set dirs))
-
-    (define (adjust-all)
-      (define s (send versions get-selection))
-      (send migrate-from-button enable s)
-      (send remove-button enable s))
-    
-    (define/override (on-superwindow-show on?)
-      (when on?
-        (update-list!)
-        (adjust-all)))
-    
-    (adjust-all)))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-source.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-source.rkt
deleted file mode 100644
index 9680ad3bae..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/by-source.rkt
+++ /dev/null
@@ -1,624 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base 
-         racket/class
-         racket/format
-         string-constants
-         pkg/name
-         pkg/lib
-         pkg
-         racket/list
-         framework
-         net/url
-	 "common.rkt")
-
-(provide by-source-panel%)
-
-(define sc-install-pkg-dialog-title (string-constant install-pkg-dialog-title))
-(define sc-install-pkg-source-label (string-constant install-pkg-source-label))
-(define sc-install-pkg-type-label (string-constant install-pkg-type-label))
-(define sc-install-pkg-infer (string-constant install-pkg-infer))
-(define sc-install-pkg-file (string-constant install-pkg-file))
-(define sc-install-pkg-dir (string-constant install-pkg-dir))
-(define sc-install-pkg-dir-url (string-constant install-pkg-dir-url))
-(define sc-install-pkg-file-url (string-constant install-pkg-file-url))
-(define sc-install-pkg-git (string-constant install-pkg-git))
-(define sc-install-pkg-github (string-constant install-pkg-github))
-(define sc-install-pkg-name (string-constant install-pkg-name))
-(define sc-install-pkg-inferred-as (string-constant install-pkg-inferred-as))
-(define sc-install-pkg-force? (string-constant install-pkg-force?))
-(define sc-install-pkg-replace? (string-constant install-pkg-replace?))
-(define sc-install-pkg-command-line (string-constant install-pkg-command-line))
-
-(define sc-install-pkg-action-label (string-constant install-pkg-action-label))
-(define sc-install-pkg-install (string-constant install-pkg-install))
-(define sc-install-pkg-update (string-constant install-pkg-update))
-(define sc-action-inferred-to-be-update (string-constant install-pkg-action-inferred-to-be-update))
-(define sc-action-inferred-to-be-install (string-constant install-pkg-action-inferred-to-be-install))
-
-(define sc-install-pkg-default (string-constant install-pkg-default))
-(define sc-install-pkg-scope-label (string-constant install-pkg-scope-label))
-(define sc-install-pkg-installation (string-constant install-pkg-installation))
-(define sc-install-pkg-user (string-constant install-pkg-user))
-(define sc-install-pkg-set-as-default (string-constant install-pkg-set-as-default))
-(define sc-install-pkg-scope-is (string-constant install-pkg-scope-is))
-  
-(define sc-install-pkg-browse (string-constant browse...))
-
-(define sc-install-pkg-abort-set-scope (string-constant install-pkg-abort-set-scope))
-
-(define sc-install-pkg-dependencies-fail (string-constant install-pkg-dependencies-fail))
-(define sc-install-pkg-dependencies-force (string-constant install-pkg-dependencies-force))
-(define sc-install-pkg-dependencies-search-ask (string-constant install-pkg-dependencies-search-ask))
-(define sc-install-pkg-dependencies-search-auto (string-constant install-pkg-dependencies-search-auto))
-(define sc-install-pkg-dependencies-search-auto+update (string-constant install-pkg-dependencies-search-auto+update))
-
-(define sc-install-pkg-dependencies-mode (string-constant install-pkg-dependencies-mode))
-
-(define sc-install-pkg-dependencies-search-ask-not-supported-in-gui
-  (string-constant install-pkg-dependencies-search-ask-not-supported-in-gui))
-(define sc-install-pkg-deps-is (string-constant install-pkg-deps-is))
-
-(preferences:set-default 'drracket:gui-installer-pkg-source "" string?)
-
-(define by-source-panel%
-  (class vertical-panel%
-    (init-field [in-terminal in-terminal])
-    (init [text-field-initial-value #f]
-          [(details-initially-shown? details-shown?) #f])
-    (super-new [stretchable-height #f])
-    
-    (inherit get-top-level-window)
-
-    (define source-panel (new horizontal-panel% 
-                              [parent this] 
-                              [stretchable-height #f]))
-
-    (define (save-tf!)
-      (preferences:set 'drracket:gui-installer-pkg-source (send tf get-value)))
-    (define tf 
-      (new text-field% 
-           [parent source-panel] 
-           [min-width 600]
-           [label (~a sc-install-pkg-source-label ":")]
-           [callback (λ (_1 _2) 
-                       (save-tf!)
-                       (adjust-all))]))
-    (send tf set-value (or text-field-initial-value 
-                           (preferences:get 'drracket:gui-installer-pkg-source)))
-
-    (define (browse-callback b e)
-      (let/ec esc
-        (define mode (send choice get-string-selection))
-        (define dir? (or (equal? mode sc-install-pkg-dir)
-                         (and (not (equal? mode sc-install-pkg-file))
-                              (let ([v (message-box/custom 
-                                        (string-constant browse...)
-                                        (string-constant install-pkg-file-or-dir?)
-                                        (string-constant install-pkg-file)
-                                        (string-constant install-pkg-dir)
-                                        (string-constant cancel)
-                                        (get-top-level-window)
-                                        '(default=1))])
-                                (when (or (not v) (= v 3)) (esc (void)))
-                                (= v 2)))))
-        
-        (define f
-          (cond
-           [dir?
-            (get-directory (string-constant install-pkg-select-package-directory)
-                           (get-top-level-window))]
-           [else
-            (parameterize ([finder:default-filters
-                            '(("Package" "*.zip;*.plt;*.tgz;*.tar")
-                              ("Any" "*.*"))])
-              (finder:get-file #f (string-constant install-pkg-select-package-file)
-                               #f "bad"
-                               (get-top-level-window)))]))
-        (when f
-          (send tf set-value 
-                ;; Simplified paths on no platform should start "[a-z]*://":
-                (path->string (simplify-path
-                               (if dir?
-                                   (path->directory-path f) 
-                                   f))))
-          (save-tf!)
-          (adjust-all))))
-    (define browse-button (new button%
-                               [parent source-panel]
-                               [label (string-constant browse...)]
-                               [font small-control-font]
-                               [callback browse-callback]
-                               [vert-margin 0]))
-
-    (new message% 
-         [parent this]
-         [label (string-constant install-pkg-package-source-desc)]
-         [stretchable-width #t]
-         [font small-control-font])
-    
-    (define button-panel (new horizontal-panel% 
-                              [parent this] 
-                              [stretchable-height #f]))
-    (define details-parent (new vertical-panel% [parent this]))
-    (define details-panel (new group-box-panel% 
-                               [label (string-constant autosave-details)]
-                               [parent details-parent]
-                               [alignment '(left center)]
-                               [stretchable-height #f]))
-
-    (define/private (reset-installed-pkgs!)
-      (define scope (selected-scope))
-      (set! currently-installed-pkgs (installed-pkg-names #:scope scope))
-      (set! currently-installed-pkgs-scope scope))
-    
-    (define details-shown? details-initially-shown?)
-    (define details-button (new button% 
-                                [label (if details-initially-shown?
-                                           (string-constant hide-details-button-label)
-                                           (string-constant show-details-button-label))]
-                                [parent button-panel]
-                                [callback
-                                 (λ (a b)
-                                   (set! details-shown? (not details-shown?))
-                                   (adjust-all))]))
-    (unless details-initially-shown?
-      (send details-parent change-children (λ (l) '())))
-
-    (new horizontal-panel% [parent button-panel])
-    (define ok-button
-      (new button%
-           [label (pick-wider normal-control-font
-			      sc-install-pkg-install
-			      sc-install-pkg-update)]
-           [parent button-panel]
-           [style '(border)]
-           [callback (lambda (b e)
-                       (define res (compute-cmd-line))
-                       (define action (case (cmdline-which res)
-                                        [(install) pkg-install-command]
-                                        [(update) pkg-update-command]))
-                       (in-terminal
-                        (case (cmdline-which res)
-                          [(install) (string-constant install-pkg-abort-install)]
-                          [(update) (string-constant install-pkg-abort-update)])
-                        (lambda ()
-                          (keyword-apply action
-                                         #:batch #t
-                                         (cmdline-kwds res)
-                                         (cmdline-kwd-args res)
-                                         (cmdline-args res))))
-                       (reset-installed-pkgs!)
-                       (adjust-all))]))
-
-    (define/public (get-close-button-panel) button-panel)
-    
-    (define name-panel (new horizontal-panel% 
-                            [parent details-panel]
-                            [stretchable-height #f]))
-    (define name-choice (new radio-box%
-                             [label (~a (string-constant install-pkg-package-name) ":")]
-                             [parent name-panel]
-                             [style '(horizontal)]
-                             [stretchable-width #f]
-                             [choices (list (string-constant install-pkg-infer)
-                                            (~a (string-constant install-pkg-use) ":"))]
-                             [callback (lambda (cb e) (adjust-all))]))
-    (define name-message (new message%
-                              [label ""]
-                              [parent name-panel]
-                              [stretchable-width #t]))
-    (define name-field (new text-field%
-                            [label #f]
-                            [parent name-panel]
-                            [callback (lambda (t e) (adjust-all))]))
-    ;; Make the panel height the same whether we show the message or field:
-    (let-values ([(w h) (send name-panel get-graphical-min-size)])
-      (send name-panel min-height h))
-
-    (define type-panel (new horizontal-panel% 
-                            [parent details-panel]
-                            [stretchable-height #f]))
-    (define choice (new choice%
-                        [label (~a sc-install-pkg-type-label ":")]
-                        [parent type-panel]
-                        [stretchable-width #t]
-                        [callback (λ (x y) (adjust-all))]
-                        [choices (list sc-install-pkg-infer
-                                       sc-install-pkg-file
-                                       sc-install-pkg-dir
-                                       sc-install-pkg-file-url
-                                       sc-install-pkg-dir-url
-                                       sc-install-pkg-git
-                                       sc-install-pkg-github
-                                       sc-install-pkg-name)]))
-    (define link-dir-checkbox (new check-box%
-                                   [parent type-panel]
-                                   [label (string-constant install-pkg-link-dirs)]
-                                   [value #t]
-                                   [callback (lambda (b e) (adjust-cmd-line))]))
-    
-    (define inferred-msg-parent (new horizontal-panel% 
-                                     [parent details-panel]
-                                     [stretchable-height #f]
-                                     [alignment '(right center)]))
-    (define inferred-msg (new message% [label ""] [parent inferred-msg-parent] [auto-resize #t]))
-    
-    (define action-choice (new choice%
-                               [label (~a sc-install-pkg-action-label ":")]
-                               [parent details-panel]
-                               [stretchable-width #t]
-                               [callback (λ (x y) (adjust-all))]
-                               [choices (list sc-install-pkg-infer
-                                              sc-install-pkg-install
-                                              sc-install-pkg-update)]))
-    (define inferred-action-msg-parent (new horizontal-panel% 
-                                            [parent details-panel]
-                                            [stretchable-height #f]
-                                            [alignment '(right center)]))
-    (define inferred-action-msg (new message% [label ""] 
-                                     [parent inferred-action-msg-parent]
-                                     [auto-resize #t]))
-
-    
-    (define scope-panel (new horizontal-panel%
-                             [parent details-panel]
-                             [stretchable-height #f]))
-    (define scope-choice (new choice%
-                              [label (~a sc-install-pkg-scope-label ":")]
-                              [parent scope-panel]
-                              [stretchable-width #t]
-                              [callback (λ (x y) (adjust-all))]
-                              [choices (list sc-install-pkg-default
-                                             sc-install-pkg-installation
-                                             sc-install-pkg-user)]))
-    (define/private (selected-scope) (case (send scope-choice get-selection)
-                                       [(0) (default-pkg-scope)]
-                                       [(1) 'installation]
-                                       [(2) 'user]))
-    (define scope-default-button (new button% 
-                                      [label sc-install-pkg-set-as-default]
-                                      [font small-control-font]
-                                      [vert-margin 0]
-                                      [parent scope-panel]
-                                      [callback
-                                       (lambda (b e)
-                                         (define scope (selected-scope))
-                                         (in-terminal
-                                          sc-install-pkg-abort-set-scope
-                                          (lambda ()
-                                            (pkg-config-command #:scope 'user
-                                                                #:set #t
-                                                                "default-scope"
-                                                                (~a scope))
-                                            (printf "Default scope successfully changed to ~a"
-                                                    scope)))
-                                         (adjust-all))]))
-    (define inferred-scope-msg-parent (new horizontal-panel% 
-                                           [parent details-panel]
-                                           [stretchable-height #f]
-                                           [alignment '(right center)]))
-    (define scope-msg (new message% [label ""] [parent inferred-scope-msg-parent] [auto-resize #t]))
-    
-    (define deps-panel (new horizontal-panel% [parent details-panel] [stretchable-height #f]))
-    (define (deps-choice-callback b e)
-      (case (send deps-choice get-selection)
-        [(3) 
-         (send deps-choice set-selection 0)
-         (adjust-all)
-         (message-box 
-          sc-install-pkg-dependencies-mode
-          sc-install-pkg-dependencies-search-ask-not-supported-in-gui)]
-        [else 
-         (adjust-all)]))
-              
-    (define deps-choice (new choice%
-                             [label sc-install-pkg-dependencies-mode]
-                             [parent deps-panel]
-                             [choices (list sc-install-pkg-default
-                                            sc-install-pkg-dependencies-fail
-                                            sc-install-pkg-dependencies-force
-                                            sc-install-pkg-dependencies-search-ask
-                                            sc-install-pkg-dependencies-search-auto
-                                            sc-install-pkg-dependencies-search-auto+update)]
-                             [stretchable-width #t]
-                             [callback deps-choice-callback]))
-    (define deps-msg-parent (new horizontal-panel% 
-                                 [parent details-panel]
-                                 [stretchable-height #f]
-                                 [alignment '(right center)]))
-    (define deps-msg (new message% [label ""] [parent deps-msg-parent] [auto-resize #t]))
-
-    (define checkboxes-panel (new horizontal-panel%
-                                  [parent details-panel]
-                                  [stretchable-height #f]
-                                  [alignment '(left center)]))
-    
-    (define cb (new check-box% 
-                    [label sc-install-pkg-force?] 
-                    [parent checkboxes-panel]
-                    [callback (λ (a b) (adjust-all))]))
-
-    (define overwrite-cb (new check-box% 
-                              [label sc-install-pkg-replace?]
-                              [parent checkboxes-panel]
-                              [callback (λ (a b) (adjust-all))]))
-
-    (new message% [parent details-panel] [label " "]) ; a spacer
-
-    (new message% [parent details-panel] [label sc-install-pkg-command-line])
-    (define cmdline-panel (new horizontal-panel% [parent details-panel] [stretchable-height #f]))
-    (new horizontal-panel% [parent cmdline-panel] [min-width 12] [stretchable-width #f])
-    (define cmdline-msg (new message% 
-                             [parent cmdline-panel]
-                             [auto-resize #t]
-                             [label ""]
-                             [font (send (send (editor:get-standard-style-list)
-                                               find-named-style
-                                               "Standard")
-                                         get-font)]))
-    (new horizontal-panel% [parent cmdline-panel] [stretchable-width #t])
-    
-    (define/private (selected-type)
-      (case (send choice get-selection)
-        [(0) #f]
-        [(1) 'file]
-        [(2) 'dir]
-        [(3) 'file-url]
-        [(4) 'dir-url]
-        [(5) 'git]
-        [(6) 'github]
-        [(7) 'name]))
-    
-    (define/private (type->str type)
-      (case type
-        [(file) sc-install-pkg-file]
-        [(name) sc-install-pkg-name]
-        [(dir) sc-install-pkg-dir]
-        [(git) sc-install-pkg-git]
-        [(github) sc-install-pkg-github]
-        [(file-url) sc-install-pkg-file-url]
-        [(dir-url) sc-install-pkg-dir-url]
-        [else (error 'type->str "unknown type ~s\n" type)]))
-    
-    (define currently-installed-pkgs-scope #f)
-    (define currently-installed-pkgs '())
-    (define/private (get-current-action)
-      (case (send action-choice get-selection)
-        [(0) 
-         (define current-name (get-name))
-         (cond
-          [(and current-name (member current-name currently-installed-pkgs))
-           'update]
-          [else 
-           'install])]
-        [(1) 'install]
-        [(2) 'update]))
-
-    (define/private (infer-package-name?)
-      (= 0 (send name-choice get-selection)))
-
-    (define/private (get-name)
-      (if (infer-package-name?)
-          (or (package-source->name (send tf get-value) (selected-type))
-              "???")
-          (send name-field get-value)))
-
-    (define/private (adjust-all)
-      (unless (eq? currently-installed-pkgs-scope
-                   (selected-scope))
-        (reset-installed-pkgs!))
-      (adjust-name)
-      (adjust-inferred)
-      (adjust-link-dir)
-      (adjust-inferred-action)
-      (adjust-checkbox)
-      (adjust-cmd-line)
-      (adjust-details-shown)
-      (adjust-browse)
-      (adjust-scope)
-      (adjust-deps)
-      (adjust-ok))
-
-    (define/private (adjust-name)
-      (define infer? (infer-package-name?))
-      (send name-panel change-children
-            (lambda (l)
-              (list name-choice
-                    (if infer? name-message name-field))))
-      (when infer?
-        (define name (get-name))
-        (send name-message set-label (gui-utils:trim-string name 200))
-        (send name-field set-value name)))
-    
-    (define/private (adjust-checkbox)
-      (void))
-    
-    (define/private (adjust-inferred-action)
-      (define action (get-current-action))
-      (define new-lab
-        (cond
-         [(equal? 0 (send action-choice get-selection)) 
-          (case (get-current-action)
-            [(install) sc-action-inferred-to-be-install]
-            [(update) sc-action-inferred-to-be-update])]
-         [else ""]))
-      (send inferred-action-msg set-label new-lab))
-    
-    (define/private (adjust-ok)
-      (send ok-button set-label (case (get-current-action)
-                                  [(install) sc-install-pkg-install]
-                                  [(update) sc-install-pkg-update]))
-      (send ok-button enable (compute-cmd-line)))
-
-    (define/private (adjust-browse)
-      (define mode (send choice get-string-selection))
-      (define show? (or (equal? mode sc-install-pkg-infer)
-                        (equal? mode sc-install-pkg-file)
-                        (equal? mode sc-install-pkg-dir)))
-      (define shown? (member browse-button (send source-panel get-children)))
-      (unless (eq? (and show? #t) (and shown? #t))
-        (if show?
-            (send source-panel add-child browse-button)
-            (send source-panel delete-child browse-button))))
-    
-    (define/private (adjust-details-shown)
-      (define current-details-shown-state?
-        (and (member details-panel (send details-parent get-children))
-             #t))
-      (unless (equal? current-details-shown-state? 
-                      details-shown?)
-        (cond
-         [details-shown?
-          (send details-button set-label (string-constant hide-details-button-label))
-          (send details-parent change-children
-                (λ (l) (list details-panel)))]
-         [else
-          (send details-button set-label (string-constant show-details-button-label))
-          (send details-parent change-children
-                (λ (l) '()))])))
-    
-    (define/private (adjust-inferred)
-      (define inferred-actual-type (get-inferred-actual-type))
-      (define new-lab
-        (and inferred-actual-type
-             (format sc-install-pkg-inferred-as (type->str inferred-actual-type))))
-      (send inferred-msg set-label (or new-lab "")))
-
-    (define/private (adjust-link-dir)
-      (send link-dir-checkbox show (member (selected-type) '(#f dir))))
-    
-    (define (get-inferred-actual-type)
-      (and (equal? #f (selected-type))
-           (let-values ([(_ actual-type)
-                         (package-source->name+type (send tf get-value) #f)])
-             actual-type)))
-
-    (define/private (adjust-scope)
-      (send scope-msg set-label (format sc-install-pkg-scope-is
-                                        (case (selected-scope)
-                                          [(installation) sc-install-pkg-installation]
-                                          [(user) sc-install-pkg-user])))
-      (define is-default? (let ([v (send scope-choice get-selection)])
-                            (or (zero? v)
-                                (= v (case (default-pkg-scope)
-                                       [(installation) 1]
-                                       [(user) 2])))))
-      (define deleted? (not (member scope-default-button (send scope-panel get-children))))
-      (unless (equal? is-default? deleted?)
-        (if is-default?
-            (send scope-panel delete-child scope-default-button)
-            (send scope-panel add-child scope-default-button))))
-    
-    (define/private (adjust-deps)
-      (send deps-msg set-label
-            (cond
-              [(equal? 0 (send deps-choice get-selection)) 
-               (format sc-install-pkg-deps-is 
-                       (cadr
-                        (regexp-match #rx"^(.*):" 
-                                      (case (get-deps-selected-type)
-                                        [(fail)
-                                         (string-constant install-pkg-dependencies-fail)]
-                                        [(search-auto)
-                                         (string-constant install-pkg-dependencies-search-auto)]))))]
-              [else ""])))
-    
-    (define (get-deps-selected-type)
-      (case (send deps-choice get-selection)
-        [(0)
-         (define current-type (or (selected-type) (get-inferred-actual-type)))
-         (case current-type
-           [(name) 'search-auto]
-           [else 'fail])]
-        [(1) 'fail]
-        [(2) 'force]
-        [(3) 'fail] ;; shouldn't happen
-        [(4 5) 'search-auto]))
-
-    (define (get-deps-auto-update)
-      (= 5 (send deps-choice get-selection)))
-      
-    (define/private (adjust-cmd-line)
-      (define (possibly-quote-string s)
-        (if (regexp-match #rx" " s)
-            (string-append "\"" s "\"")
-            s))
-      (define cmd-line (compute-cmd-line))
-      (send cmdline-msg set-label
-            (gui-utils:trim-string
-             (if cmd-line
-                 (string-append
-                  (if (eq? (system-type) 'windows)
-                      "raco.exe"
-                      "raco")
-                  " pkg "
-                  (format "~a " (cmdline-which cmd-line))
-                  (apply 
-                   string-append
-                   (add-between
-                    (map (λ (kwd kwd-arg)
-                           (define flag (~a "--" (keyword->string kwd)))
-                           (if (boolean? kwd-arg)
-                               flag
-                               (~a flag " " (~s kwd-arg))))
-                         (cmdline-kwds cmd-line)
-                         (cmdline-kwd-args cmd-line))
-                    " "))
-                  (apply string-append
-                         (map (λ (x) (format " ~a" (possibly-quote-string x)))
-                              (cmdline-args cmd-line))))
-                 "")
-             200)))
-    
-    (struct cmdline (which kwds kwd-args args) #:transparent)
-    (define/private (compute-cmd-line)
-      (define action (get-current-action))
-      (define update-by-name? (and (eq? 'update action)
-                                   (not (send overwrite-cb get-value))))
-      (define the-pkg (if update-by-name?
-                          (get-name)
-                          (send tf get-value)))
-      (cond
-        [(equal? the-pkg "") #f]
-        [else
-         (define kwds '()) 
-         (define kwd-args '())
-         (define (add-kwd-arg kwd arg)
-           (set!-values (kwds kwd-args)
-                        (let loop ([ks kwds] [as kwd-args])
-                          (cond
-                           [(null? ks) (values (list kwd) (list arg))]
-                           [(keyword<? kwd (car ks))
-                            (values (cons kwd ks) (cons arg as))]
-                           [else
-                            (define-values (ks2 as2) (loop (cdr ks) (cdr as)))
-                            (values (cons (car ks) ks2) (cons (car as) as2))]))))
-         (when (and (send cb is-enabled?) (send cb get-value))
-           (add-kwd-arg '#:force #t))
-         (when (and (not update-by-name?)
-                    (selected-type))
-           (add-kwd-arg '#:type (selected-type)))
-         (when (and (not update-by-name?)
-                    (send link-dir-checkbox get-value)
-                    (eq? 'dir (or (selected-type) (get-inferred-actual-type))))
-             (add-kwd-arg '#:link #t))
-         (let ([scope (selected-scope)])
-           (unless (and (equal? scope (default-pkg-scope))
-                        ;; Don't let `update' infer a scope itself:
-                        (not (eq? action 'update)))
-             (add-kwd-arg '#:scope scope)))
-         (add-kwd-arg '#:deps (get-deps-selected-type))
-         (when (get-deps-auto-update)
-           (add-kwd-arg '#:update-deps #t))
-         (unless (or update-by-name?
-                     (infer-package-name?))
-           (add-kwd-arg '#:name (get-name)))
-         (cmdline action kwds kwd-args (list the-pkg))]))
-
-    (define/override (on-superwindow-show on?)
-      (when on?
-        (reset-installed-pkgs!)
-        (adjust-all)))
-
-    (adjust-all)))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/catalog-update.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/catalog-update.rkt
deleted file mode 100644
index fbf6416c82..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/catalog-update.rkt
+++ /dev/null
@@ -1,103 +0,0 @@
-#lang racket/base
-(require racket/gui/base 
-         racket/class
-         racket/contract
-         string-constants
-         pkg/lib
-         (prefix-in db: pkg/db))
-(provide
- pkg-catalog-update-local/simple-status-dialog)
-
-(define (pkg-catalog-update-local/simple-status-dialog #:parent [parent #f])
-  (define error-message-shown? #f)
-  (define d%
-    (class dialog%
-      (define/override (on-subwindow-event w e)
-        (if (and error-message-shown? (send e button-down?))
-            (if (is-a? w button%)
-                #f
-                (if (or (is-a? w message%)
-                        (and
-                         (is-a? w editor-canvas%)
-                         (let-values ([(w h) (send w get-client-size)])
-                           (< (send e get-x) w))))
-                    (begin
-                      (send w popup-menu
-                            (let ([m (make-object popup-menu%)])
-                              (make-object menu-item%
-                                "Copy Message"
-                                m
-                                (lambda (i e)
-                                  (send the-clipboard
-                                        set-clipboard-string
-                                        (send err-msg-txt get-text 0 (send err-msg-txt last-position))
-                                        (send e get-time-stamp))))
-                              m)
-                            (send e get-x)
-                            (send e get-y))
-                      #t)
-                    #f))
-            #f))
-      (super-new)))
-  (define d (new d% 
-                 [width 600]
-                 [parent parent]
-                 [label (string-constant update-catalog)]))
-  (define m (new message% 
-                 [parent d]
-                 [label ""]
-                 [stretchable-width #t]))
-  
-  (define err-msg-txt (new text%))
-  (define (show-exn exn)
-    (set! error-message-shown? #t)
-    (send d begin-container-sequence)
-    (parameterize ([current-output-port (open-output-text-editor err-msg-txt)])
-      (display (exn-message exn))
-      (define context (continuation-mark-set->context
-                       (exn-continuation-marks exn)))
-      (unless (null? context)
-        (printf "\n")
-        (for ([x (in-list context)])
-          (printf "\n  ~s" x))))
-    (define sd (make-object style-delta% 'change-family 'modern))
-    (send sd set-delta-foreground "darkred")
-    (send err-msg-txt change-style sd 0 (send err-msg-txt last-position))
-    (send err-msg-txt lock #t)
-    (send err-msg-txt hide-caret #t)
-    (define ec (new editor-canvas%
-                    [parent d]
-                    [min-height 400]
-                    [editor err-msg-txt]))
-    (define bp (new horizontal-panel% 
-                    [parent d]
-                    [stretchable-height #f]
-                    [alignment '(right center)]))
-    (define b (new button% 
-                   [label (string-constant ok)]
-                   [parent bp]
-                   [callback
-                    (λ (_1 _2) (send d show #f))]))
-    (send d end-container-sequence))
-  
-  (thread
-   (λ ()
-     (with-handlers ([exn:fail?
-                      (λ (exn) 
-                        (queue-callback
-                         (λ ()
-                           (show-exn exn))))])
-       (for ([catalog (in-list (db:get-catalogs))])
-         (define s (make-semaphore 0))
-         (queue-callback
-          (λ ()
-            (send m set-label (format (string-constant updating-catalog-from) catalog))
-            (semaphore-post s)))
-         (semaphore-wait s)
-         (pkg-catalog-update-local #:catalogs (list catalog)
-                                   #:set-catalogs? #f
-                                   #:quiet? #t))
-       (queue-callback 
-        (λ () (send d show #f))))))
-  
-  (send d show #t))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/common.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/common.rkt
deleted file mode 100644
index 20882ae9ba..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/common.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         string-constants
-         racket/format
-         setup/dirs)
-
-(provide really-remove?
-         sc-install-pkg-remove
-	 pick-wider
-         get-scope-list
-         check-mark
-         install-status-desc)
-
-(define sc-install-pkg-remove (string-constant install-pkg-remove))
-(define really-uninstall?-msg (string-constant install-pkg-really-remove?))
-
-(define (really-remove? #:parent [parent #f] names)
-  (equal? 1
-          (message-box/custom sc-install-pkg-remove
-                              (apply ~a
-                                     really-uninstall?-msg
-                                     (for/list ([n (in-list names)])
-                                       (~a "\n  " n)))
-                              sc-install-pkg-remove
-                              (string-constant cancel)
-                              #f
-                              parent
-                              '(caution default=1))))
-
-(define (pick-wider font a b)
-  (define-values (wa ha) (get-window-text-extent a font))
-  (define-values (wb hb) (get-window-text-extent b font))
-  (if (wa . > . wb)
-      a
-      b))
-
-(define (get-scope-list)
-  (append (let ([main (find-pkgs-dir)])
-            (reverse
-             (for/list ([d (get-pkgs-search-dirs)])
-               (if (equal? d main)
-                   'installation
-                   d))))
-          '(user)))
-
-(define check-mark
-  (for/or ([c '(#\u2713 #\u2714 #\u221A #\x)])
-    (and (send normal-control-font screen-glyph-exists? c #t)
-	 (string c))))
-
-(define install-status-desc
-  (~a check-mark ": installed"
-      "  "
-      "*: auto-installed"
-      "  "
-      "!: not default scope"
-      "  "
-      "=: installed as link"
-      "  "
-      "@: installed from URL"))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/filter-panel.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/filter-panel.rkt
deleted file mode 100644
index 34ee360d9b..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/filter-panel.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/format
-         string-constants
-         (prefix-in db: pkg/db)
-         "common.rkt")
-
-(provide make-filter-panel)
-
-(define (make-filter-panel parent changed!)
-
-  (define filter-panel
-    (new horizontal-panel%
-         [parent parent]
-         [stretchable-height #f]))
-
-  (define keep-rx #rx"")
-  
-  (define filter-text
-    (new text-field%
-         [label (~a (string-constant install-pkg-filter) ":")]
-         [parent filter-panel]
-         [font small-control-font]
-         [stretchable-width #t]
-         [callback (lambda (tf e)
-                     (define s (send tf get-value))
-                     (define terms (filter (lambda (s) (not (string=? s "")))
-                                           (regexp-split #rx"[, \t\r\n]" s)))
-                     (define rx
-                       (regexp (apply ~a
-                                      #:separator "|"
-                                      (for/list ([term terms])
-                                        (~a "(?i:" (regexp-quote term) ")")))))
-                     (unless (equal? rx keep-rx)
-                       (set! keep-rx rx)
-                       (changed!)))]))
-  
-  (define filter-result
-    (new message%
-         [label "9999/9999 match"]
-         [parent filter-panel]
-         [font small-control-font]))
-  (send filter-result set-label "")
-
-  (new (class object%
-         (super-new)
-         (define/public (get-rx) keep-rx)
-         (define/public (set-result match-count out-of-count)
-           (send filter-result set-label (format "~a/~a match" match-count out-of-count))))))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/settings.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/settings.rkt
deleted file mode 100644
index dab14bbd48..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/private/settings.rkt
+++ /dev/null
@@ -1,164 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base 
-         racket/class
-         racket/format
-         racket/list
-         racket/file
-         string-constants
-         setup/dirs
-         pkg/lib
-         net/url
-         "common.rkt")
-
-(provide settings-panel%)
-
-(define settings-panel%
-  (class vertical-panel%
-    (super-new [alignment '(left center)])
-    
-    (inherit get-top-level-window)
-
-    (define scope-choice 
-      (new choice%
-           [label (~a (string-constant install-pkg-default-scope-label)
-                      ":")]
-           [parent this]
-           [callback (λ (c y)
-                        (catch-errors
-                         (lambda ()
-                           (parameterize ([current-pkg-scope 'user])
-                             (with-pkg-lock
-                              (pkg-config #t (list "default-scope"
-                                                   (if (= 0 (send c get-selection))
-                                                       "installation"
-                                                       "user")))))))
-                        (adjust-all))]
-           [choices (list (string-constant install-pkg-installation)
-                          (string-constant install-pkg-user))]))
-
-    (define catalog-panel
-      (new horizontal-panel%
-           [parent this]
-           [alignment '(center top)]))
-
-    (define catalog-list
-      (new list-box%
-           [label (~a (string-constant install-pkg-package-catalogs) ":")]
-           [parent catalog-panel]
-           [callback (lambda (x y) (adjust-buttons))]
-           [choices null]))
-
-    (define button-panel (new vertical-panel%
-                              [parent catalog-panel] 
-                              [stretchable-height #f]
-                              [stretchable-width #f]
-                              [alignment '(center top)]))
-
-    (define raise-button (new button%
-                              [parent button-panel]
-                              [label (string-constant ml-cp-raise)]
-                              [callback (lambda (b e)
-                                          (adjust-catalogs
-                                           (lambda (l n)
-                                             (values
-                                              (append
-                                               (take l (sub1 n))
-                                               (list (list-ref l n)
-                                                     (list-ref l (sub1 n)))
-                                               (drop l (add1 n)))
-                                              (sub1 n)))))]))
-                                           
-    (define lower-button (new button%
-                              [parent button-panel]
-                              [label (string-constant ml-cp-lower)]
-                              [callback (lambda (b e)
-                                          (adjust-catalogs
-                                           (lambda (l n)
-                                             (values
-                                              (append
-                                               (take l n)
-                                               (list (list-ref l (add1 n))
-                                                     (list-ref l n))
-                                               (drop l (+ n 2)))
-                                              (add1 n)))))]))
-
-    (send (new button% [parent button-panel] [label "1"]) show #f)
-
-    (define add-button (new button%
-                            [parent button-panel]
-                            [label (string-constant ml-cp-add)]
-                            [callback (lambda (b e)
-                                        (define s (get-text-from-user
-                                                   (string-constant install-pkg-add-package-catalog)
-                                                   (string-constant install-plt-url)
-                                                   (get-top-level-window)
-                                                   #:validate (lambda (s)
-                                                                (with-handlers ([exn:fail?
-                                                                                 (lambda (exn) #f)])
-                                                                  (define u (string->url s))
-                                                                  (and (url-scheme u)
-                                                                       (or (eq? (url-scheme u) 'file)
-                                                                           (url-host u)))))
-                                                   "http://..."
-                                                   '(disallow-invalid)))
-                                        (when s
-                                          (adjust-catalogs
-                                           (lambda (l n)
-                                             (values (append l (list s))
-                                                     (length l))))))]))
-
-    (define remove-button (new button%
-                               [parent button-panel]
-                               [label (string-constant ml-cp-remove)]
-                               [callback (lambda (b e)
-                                           (adjust-catalogs
-                                            (lambda (l n)
-                                              (values
-                                               (append
-                                                (take l n)
-                                                (drop l (add1 n)))
-                                               #f))))]))
-
-    (define/private (catch-errors thunk)
-      (with-handlers ([exn:fail? (lambda (exn)
-                                   (message-box
-                                    (string-constant error)
-                                    (exn-message exn)
-                                    (get-top-level-window)
-                                    '(ok stop)))])
-        (thunk)))
-
-    (define/private (adjust-catalogs cb)
-      (define l (for/list ([i (send catalog-list get-number)])
-                  (send catalog-list get-string i)))
-      (define-values (new-l new-n) (cb l (send catalog-list get-selection)))
-      (unless (equal? l new-l)
-        (catch-errors
-         (lambda ()
-           (parameterize ([current-pkg-scope 'user])
-             (with-pkg-lock
-              (pkg-config #t (cons "catalogs" new-l))))      
-           (send catalog-list set new-l)
-           (when new-n
-             (send catalog-list set-selection new-n)))))
-      (adjust-buttons))
-
-    (define/private (adjust-buttons)
-      (define s (send catalog-list get-selection))
-      (send remove-button enable s)
-      (send raise-button enable (and s (positive? s)))
-      (send lower-button enable (and s (s . < . (sub1 (send catalog-list get-number))))))
-
-    (define/private (adjust-all)
-      (send catalog-list set (pkg-config-catalogs))
-      (let ([scope (default-pkg-scope)])
-        (send scope-choice set-selection (if (eq? scope 'user) 1 0))
-        (send scope-choice enable (symbol? scope)))
-      (adjust-buttons))
-
-    (define/override (on-superwindow-show on?)
-      (when on?
-        (adjust-all)))
-    
-    (adjust-all)))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/LICENSE.txt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/LICENSE.txt
deleted file mode 100644
index f2c8340b29..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-gui-pkg-manager
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/THANKYOU.txt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/THANKYOU.txt
deleted file mode 100644
index 5433fbc85e..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/THANKYOU.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The icon was remixed from one by Everaldo Coelho
-http://www.everaldo.com/
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/info.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/info.rkt
deleted file mode 100644
index 06f22e78ef..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("gui-pkg-manager-lib"
-               "gui-pkg-manager-doc"
-               "gui-lib"
-               "base"))
-
-(define implies '("gui-pkg-manager-lib"
-                  "gui-pkg-manager-doc"))
-
-(define pkg-desc "Graphical tool for managing Racket package installations")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/info.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/info.rkt
deleted file mode 100644
index 8ec8966dce..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define gracket-launcher-names '("Racket Package Manager"))
-(define gracket-launcher-libraries '("start.rkt"))
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.desktop b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.desktop
deleted file mode 100644
index 7744a850da..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Racket Package Manager
-GenericName=Graphical package manager for Racket
-Comment=Racket Package Manager helps users install, update, and uninstall Racket packages.
-Terminal=false
-Type=Application
-Categories=Utility;PackageManager;
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.icns b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.icns
deleted file mode 100644
index 1eb029c72f..0000000000
Binary files a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.icns and /dev/null differ
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.ico b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.ico
deleted file mode 100644
index 0ea7b789ae..0000000000
Binary files a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.ico and /dev/null differ
diff --git a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.rkt b/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.rkt
deleted file mode 100644
index a4562cd760..0000000000
--- a/pkgs/gui-pkg-manager-pkgs/gui-pkg-manager/pkg/gui/start.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require pkg/gui)
-
-(void (make-pkg-gui))
-
-;; For test mode, check that we can at least start,
-;; but exit right away:
-(module+ test 
-  (require racket/gui/base)
-  (queue-callback (lambda () (exit)) #f))
diff --git a/pkgs/gui-pkgs/gui-doc/LICENSE.txt b/pkgs/gui-pkgs/gui-doc/LICENSE.txt
deleted file mode 100644
index 9416072c65..0000000000
--- a/pkgs/gui-pkgs/gui-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-gui-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/info.rkt b/pkgs/gui-pkgs/gui-doc/embedded-gui/info.rkt
deleted file mode 100644
index a4e7055793..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("scribblings/embedded-gui.scrbl" (multi-page) (gui-library))))
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/aligned-pasteboard.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/aligned-pasteboard.scrbl
deleted file mode 100644
index 7b5dd3acab..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/aligned-pasteboard.scrbl
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[aligned-pasteboard% pasteboard% (alignment-parent<%>)]{
-
-Acts as the top of an @racket[alignment<%>] tree.}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/alignment-parent.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/alignment-parent.scrbl
deleted file mode 100644
index 001c1c07af..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/alignment-parent.scrbl
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[alignment-parent<%> ()]{
-
-@defmethod[(get-pasteboard) (is-a?/c pasteboard%)]{
-
-The pasteboard that this alignment is being displayed to.}
-
-@defmethod[(add-child [child (is-a?/c alignment<%>)]) void?]{
-
-Add the given alignment as a child after the existing child.}
-
-@defmethod[(delete-child [child (is-a?/c alignment<%>)]) void?]{
-
-Deletes a child from the alignments.}
-
-@defmethod[(is-shown?) boolean?]{
-
-True if the alignment is being shown (accounting for its parent being
-shown).}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/alignment.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/alignment.scrbl
deleted file mode 100644
index 2f141975c4..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/alignment.scrbl
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[alignment<%> (dllist<%>)]{
-
-@defmethod[(get-parent) (is-a?/c alignment-parent<%>)]{
-
-The parent of the alignment in the tree.}
-
-@defmethod[(set-min-sizes) void?]{
-
-Tells the alignment that its sizes should be calculated.}
-
-@defmethod[(align [x-offset (and/c real? (not/c negative?))]
-                  [y-offset (and/c real? (not/c negative?))]
-                  [width (and/c real? (not/c negative?))]
-                  [height  (and/c real? (not/c negative?))]) void?]{
-Tells itself to align its children on the pasteboard
-in the given rectangle defined by @racket[width], @racket[height] and a top
-left corner point given as offsets into the pasteboards top
-left corner.}
-
-@defmethod[(get-min-width) (and/c real? (not/c negative?))]{
-
-The minimum width this alignment must be.}
-
-@defmethod[(get-min-height) (and/c real? (not/c negative?))]{
-
-The minimum height this alignment must be.}
-
-@defmethod*[([(stretchable-width) boolean?]
-             [(stretchable-width [value boolean?]) void?])]{
-
-Gets/sets the property of stretchability in the x dimension.}
-
-@defmethod*[([(stretchable-height) boolean?]
-             [(stretchable-height [value boolean?]) void?])]{
-
-Gets/sets the property of stretchability in the y dimension.}
-
-@defmethod[(show/hide [show? boolean?]) void?]{
-
-Tells the alignment to show or hide its children.}
-
-@defmethod[(show [show? boolean?]) void?]{
-
-Tells the alignment that its show state is the given value
-and it should show or hide its children accordingly.}
-
-}
-
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/button-snip.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/button-snip.scrbl
deleted file mode 100644
index 622f8449aa..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/button-snip.scrbl
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[button-snip% snip% ()]{
-
-A clickable button with a bitmap label.
-
-@defconstructor[([images (cons/c path-string? path-string?)]
-                 [callback ((is-a?/c button-snip%) (is-a?/c event%) . -> . void?)])]{
-
-The @racket[images] argument is a pair filenames to be load as the
-button-label image, where the first is the image for when the button
-is at rest, and the second is the image for the button while its
-pressed.
-
-The @racket[callback] is called when the button is clicked.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/common.rkt b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/common.rkt
deleted file mode 100644
index b567f8dee4..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/common.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scheme/base
-
-(require scribble/manual
-         (for-label embedded-gui
-                    scheme/base
-                    scheme/contract
-                    scheme/class
-                    scheme/gui/base))
-(provide (all-from-out scribble/manual)
-         (for-label (all-from-out embedded-gui
-                                  scheme/base
-                                  scheme/contract
-                                  scheme/class
-                                  scheme/gui/base)))
-
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/containers.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/containers.scrbl
deleted file mode 100644
index dae42590ab..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/containers.scrbl
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "containers" #:style 'toc]{Containers}
-
-@local-table-of-contents[]
-
-@include-section["aligned-pasteboard.scrbl"]
-@include-section["alignment.scrbl"]
-@include-section["alignment-parent.scrbl"]
-@include-section["stretchable-snip.scrbl"]
-@include-section["horizontal-alignment.scrbl"]
-@include-section["vertical-alignment.scrbl"]
-@include-section["dllist.scrbl"]
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/control-snips.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/control-snips.scrbl
deleted file mode 100644
index 9be11e89d8..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/control-snips.scrbl
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "control-snips" #:style 'toc]{Control Snips}
-
-To allow the buttons to be pushed, the editor in which they appear
-must forward clicks to them properly.
-
-@local-table-of-contents[]
-
-@include-section["snip-wrapper.scrbl"]
-@include-section["text-button-snip.scrbl"]
-@include-section["button-snip.scrbl"]
-@include-section["toggle-button-snip.scrbl"]
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/controls.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/controls.scrbl
deleted file mode 100644
index 3f66d070cd..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/controls.scrbl
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "controls" #:style 'toc]{Controls}
-
-@local-table-of-contents[]
-
-@include-section["embedded-text-button.scrbl"]
-@include-section["embedded-button.scrbl"]
-@include-section["embedded-toggle-button.scrbl"]
-@include-section["embedded-message.scrbl"]
-@include-section["vline.scrbl"]
-@include-section["hline.scrbl"]
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/dllist.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/dllist.scrbl
deleted file mode 100644
index 9c00267a55..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/dllist.scrbl
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[dllist<%> ()]{
-
-Defines a doubly-linked.
-
-@defmethod*[([(next) (is-a?/c dllist<%>)]
-             [(next [new-next (is-a?/c dllist<%>)]) void?])]{
-
-Gets/sets the next field to be the given dllist.}
-
-@defmethod*[([(prev) (is-a?/c dllist<%>)]
-             [(prev [new-prev (is-a?/c dllist<%>)]) void?])]{
-
-Gets/sets the previous item in the list.}
-
-@defmethod[(for-each [f ((is-a?/c dllist<%>) . -> . void?)]) void?]{
-
-Applies @racket[f] to every element of the dllist.}
-
-@defmethod[(map-to-list [f ((is-a?/c dllist<%>) . -> . any/c)]) 
-           (listof any/c)]{
-
-Creates a Racket list by applying @racket[f] to every element
-of @this-obj[].}
-
-}
-
-
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-button.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-button.scrbl
deleted file mode 100644
index 73d4675e78..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-button.scrbl
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[embedded-button% snip-wrapper% (alignment<%>)]{
-
-A clickable button with a bitmap label.
-
-@defconstructor[([images (cons/c path-string? path-string?)]
-                 [callback ((is-a?/c button-snip%) (is-a?/c event%) . -> . void?)])]{
-
-The @racket[images] argument is a pair filenames to be load as the
-button-label image, where the first is the image for when the button
-is at rest, and the second is the image for the button while its
-pressed.
-
-The @racket[callback] is called when the button is clicked.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-gui.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-gui.scrbl
deleted file mode 100644
index c3bca52a4b..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-gui.scrbl
+++ /dev/null
@@ -1,131 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label framework))
-
-@title{Embedded GUI: Widgets Within Editors}
-
-@author["Mike T. McHenry"]
-
-@defmodule[embedded-gui]
-
-The @racketmodname[embedded-gui] library provides a class hierarchy
-for creating graphical boxes within @racket[editor<%>] objects with
-geometry management that mirrors that of @racket[vertical-panel%] and
-@racket[horizontal-panel%].
-
-@table-of-contents[]
-
-@include-section["containers.scrbl"]
-@include-section["controls.scrbl"]
-@include-section["control-snips.scrbl"]
-
-@; ----------------------------------------------------------------------
-
-@section{Helpers}
-
-@defmixin[stretchable-editor-snip-mixin (editor-snip%) (stretchable-snip<%>)]{
-
- Extends an editor snip the @racket[stretchable-snip<%>] interface,
- which allows it to be stretched to fit an
- @racket[alignment-parent<%>]'s allotted width. Stretchable snips are
- useful as the snip of a @racket[snip-wrapper%] }
-
-
-@defclass[stretchable-editor-snip% editor-snip% (stretchable-editor-snip-mixin editor-snip%)]{
-
- @defconstructor[([stretchable-width boolean? #t]
-                  [stretchable-height boolean? #t])]{
-
- Creates a stretchable snip with the given initial stretchability.}}
-
-
-@defproc[(fixed-width-label-snip [possible-labels (listof string?)])
-         (subclass?/c snip%)]{
-
- Returns a subclass of @racket[snip%] that takes a single
- initialization argument. The argument provided when instantiating the
- class must be a member of @racket[possible-labels]; the given label
- is displayed by the snip, but the snip is sized to match the longest
- of the labels in @racket[possible-labels].
-
- In other words, the resulting class helps align multiple GUI elements
-t   hat are labeled from a particular set of strings.}
-
-
-@definterface[tabbable-text<%> ()]{
-
- An interface for tabbing between embedded @racket[text%]s.
-
- @defmethod[(set-caret-owner) void?]{
-
- Moves the caret into the @racket[tabbable-text<%>].}
-
- @defmethod[(set-ahead) void?]{
-
- Called when tabbing ahead.}
-
- @defmethod[ (set-back) void?]{
-
- Called when tabbing backward.}}
-
-
-@defmixin[tabbable-text-mixin (editor:keymap<%>) (tabbable-text<%>)]{
-
-  Adds the @racket[tabbable-text<%>] interface to an
-  @racket[editor:text%] class, where instantiation installs key
-  bindings to tab ahead and backward}
-
-
-@defproc[(set-tabbing [a-text (is-a?/c tabbable-text<%>)] ...)
-          void?]{
-
-Sets the tabbing order of @racket[tabbable-text<%>]s by setting each
-text's @method[tabbable-text<%> set-ahead] and
-@method[tabbable-text<%> set-back] thunks to point to its neighbor in
-the argument list.}
-
-
-@defmixin[grey-editor-snip-mixin (editor-snip%) ()]{
-
- Gives an @racket[editor-snip%] a colored background indicating that
- is disabled. The editor is not disabled by the mixin however, and
- must be locked separately.}
-
-@defmixin[grey-editor-mixin (editor<%>) ()]{
-
- Gives an @racket[editor<%>] a colored background indicating that is
- disabled. The editor is not disabled by the mixin however, and must be
- locked separately.}
-
-
-@defmixin[single-line-text-mixin (editor:keymap<%>) ()]{
-
- Restricts a text to one line by overriding its key bindings to do
- nothing on enter.}
-
-
-@defmixin[cue-text-mixin (text%) ()]{
-
- Gives a @racket[text%] an instantiation argument of a string that is
- displayed in the @racket[text%] initially in grey; the text
- disappears when the text gets focus. This technique is useful for
- labeling texts without needing to take up space.}
-
-
-@defclass[cue-text% (cue-text-mixin text%) ()]{
-
- @defconstructor[([cue-text string? ""]
-                  [color string? "gray"]
-                  [behavior (listof (one-of/c 'on-focus 'on-char)) '(on-focus)])]{
-
-  Creates an instance with the given initial content, color, and
-  behvior for when to clear the text.}
-
- @defmethod[(clear-cue-text) void?]{
-
-  Clears the cue text, if it's still present.}
-
-}
-
-@; ----------------------------------------------------------------------
-
-@include-section["snip-procs.scrbl"]
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-message.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-message.scrbl
deleted file mode 100644
index 8ae8cd95ea..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-message.scrbl
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[embedded-message% snip-wrapper% ()]{
-
-A static text label.
-
-@defconstructor[([parent (is-a?/c alignment-parent<%>)]
-                 [label string?])]{
-
-Creates a static control that displays @racket[label].}}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-text-button.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-text-button.scrbl
deleted file mode 100644
index 8e9f3e49d8..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-text-button.scrbl
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[embedded-text-button% snip-wrapper% (alignment<%>)]{
-
-A button with a text label.
-
-@defconstructor[([label string?]
-                 [callback ((is-a?/c text-button-snip%) (is-a?/c event%) . -> . void?)])]{
-
-The @racket[callback] is called when the button is clicked.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-toggle-button.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-toggle-button.scrbl
deleted file mode 100644
index 67f6e8983e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/embedded-toggle-button.scrbl
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[embedded-toggle-button% snip-wrapper% (alignment<%>)]{
-
-A @racket[check-box%]-like control that a user can toggle between
-checked and unchecked states.
-
-@defconstructor[([images-off (cons/c path-string? path-string?)]
-                 [images-on (cons/c path-string? path-string?)]
-                 [turn-on ((is-a?/c toggle-button-snip%) (is-a?/c event%) . -> . void?)]
-                 [turn-off ((is-a?/c toggle-button-snip%) (is-a?/c event%) . -> . void?)]
-                 [state (symbols 'on 'off) 'on])]{
-
-The @racket[images-off] argument is a pair filenames to be load as the
-button-label image, where the first is the image for when the button
-is at rest, and the second is the image for the button while its
-pressed---in both cases when the button is not checked by the
-user.  The @racket[images-on] argument similarly determines the images
-for then the button is checked.
-
-The @racket[turn-on] and @racket[turn-off] callbacks are invoked when
-the button changes to checked or unchecked, respectively.
-
-The @racket[state] argument determines whether the button is initially
-checked.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/hline.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/hline.scrbl
deleted file mode 100644
index e8c30cb36c..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/hline.scrbl
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[hline% snip-wrapper% (alignment<%>)]{
-
-Displays a horizontal line across the region that is inserted into.
-
-@defconstructor[([parent (is-a?/c alignment-parent<%>)])]{
-}
-}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/horizontal-alignment.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/horizontal-alignment.scrbl
deleted file mode 100644
index 75f73d9576..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/horizontal-alignment.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[horizontal-alignment% dllist<%> (alignment<%> alignment-parent<%>)]{
-
-@defconstructor[([parent (is-a?/c alignment-parent<%>)]
-                 [show? boolean? #t]
-                 [after (or/c (is-a?/c alignment<%>) false/c) #f])]{
-
-Inserts a new horizontal-alignment container into
-@racket[parent]---optionally after a given container also in
-@racket[parent]. The new container can be initially shown or hidden.}}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/snip-procs.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/snip-procs.scrbl
deleted file mode 100644
index 027fdced2f..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/snip-procs.scrbl
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "snip-related-functions"]{Snip Functions}
-
-@defproc[(snip-width [snip (is-a?/c snip%)]) real?]{
-
-The width of a snip in the parent pasteboard.}
-
-@defproc[(snip-height [snip (is-a?/c snip%)]) real?]{
-
-The height of a snip in the parent pasteboard.}
-
-@defproc[(snip-min-width [snip (is-a?/c snip%)]) real?]{
-
-The minimum width of the snip}
-
-@defproc[(snip-min-height [snip (is-a?/c snip%)]) real?]{
-
-The minimum height of the snip.}
-
-@defproc[(snip-parent [snip (is-a?/c snip%)]) (is-a?/c pasteboard%)]{
-
-The pasteboard that contains the snip.}
-
-@defproc[(fold-snip [f ((is-a?/c snip%) any/c . -> . any/c)]
-                    [init-acc any/c]
-                    [snip (is-a?/c snip%)])
-          any/c]{
-
-Applies @racket[f] to all snips in the parent of @racket[snip], 
-starting with @racket[snip].}
-
-@defproc[(for-each-snip [f ((is-a?/c snip%) . -> . any/c)]
-                        [first-snip (is-a?/c snip%)] 
-                        [more list?] ...)
-         void?]{
-
-Applies the function to each snip in the parent of
-@racket[first-snip], starting with @racket[first-snip]. If
-@racket[more] lists are supplied, they are used for extra arguments to
-@racket[f], just like extra lists provided to @racket[for-each].}
-
-@defproc[(map-snip [f ((is-a?/c snip%) . -> . any/c)]
-                   [first-snip (is-a?/c snip%)] 
-                   [more list?] ...)
-         void?]{
-
-Applies the function to each snip in the parent of
-@racket[first-snip], starting with @racket[first-snip], and
-accumulates the results into a list. If @racket[more] lists are
-supplied, they are used for extra arguments to @racket[f], just like
-extra lists provided to @racket[map].}
-
-
-@defproc[(stretchable-width? [snip (is-a?/c snip%)]) boolean?]{
-
-True if the snip can be resized in the X dimension.}
-
-@defproc[(stretchable-height? [snip (is-a?/c snip%)]) boolean?]{
-
-True if the snip can be resized in the Y dimension.}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/snip-wrapper.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/snip-wrapper.scrbl
deleted file mode 100644
index f74fc4ae5a..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/snip-wrapper.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[snip-wrapper% dllist<%> (alignment<%>)]{
-
-Adapts an arbitrary @racket[snip<%>] to work in an alignment
-container.
-
-@defconstructor[([parent (is-a?/c alignment-parent<%>)]
-                 [snip (is-a?/c snip%)])]{
-
-Adds @racket[snip] to @racket[parent].}}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/stretchable-snip.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/stretchable-snip.scrbl
deleted file mode 100644
index a0d7a8fc26..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/stretchable-snip.scrbl
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[stretchable-snip<%> ()]{
-
-Must be implemented by any snip class whose objects will be
-stretchable when inserted into an @racket[aligned-pasteboard<%>]
-within a @racket[snip-wrapper%].
-
-@defmethod[(get-aligned-min-width) (and/c real? (not/c negative?))]{
-
-The minimum width that the snip can be resized to.}
-
-@defmethod[(get-aligned-min-height) (and/c real? (not/c negative?))]{
-
-The minimum height that the snip can be resized to.}
-
-@defmethod*[([(stretchable-width) boolean?]
-             [(stretchable-width [stretch? boolean?]) void?])]{
-
-Gets/sets whether or not the snip can be stretched in the X
-dimension.}
-
-@defmethod*[([(stretchable-height) boolean?]
-             [(stretchable-height [stretch? boolean?]) void?])]{
-
-Gets/sets whether or not the snip can be stretched in the Y
-dimension.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/text-button-snip.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/text-button-snip.scrbl
deleted file mode 100644
index 9ec63966dc..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/text-button-snip.scrbl
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[text-button-snip% snip% ()]{
-
-A button with a text label.
-
-@defconstructor[([label string?]
-                 [callback ((is-a?/c text-button-snip%) (is-a?/c event%) . -> . void)])]{
-
-The @racket[callback] is called when the button is clicked.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/toggle-button-snip.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/toggle-button-snip.scrbl
deleted file mode 100644
index db4fb20a56..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/toggle-button-snip.scrbl
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[toggle-button-snip% snip% ()]{
-
-A @racket[check-box%]-like control that a user can toggle between
-checked and unchecked states.
-
-@defconstructor[([images-off (cons/c path-string? path-string?)]
-                 [images-on (cons/c path-string? path-string?)]
-                 [turn-on ((is-a?/c toggle-button-snip%) (is-a?/c event%) . -> . void?)]
-                 [turn-off ((is-a?/c toggle-button-snip%) (is-a?/c event%) . -> . void?)]
-                 [state (symbols 'on 'off) 'on])]{
-
-The @racket[images-off] argument is a pair filenames to be load as the
-button-label image, where the first is the image for when the button
-is at rest, and the second is the image for the button while its
-pressed---in both cases when the button is not checked by the
-user.  The @racket[images-on] argument similarly determines the images
-for then the button is checked.
-
-The @racket[turn-on] and @racket[turn-off] callbacks are invoked when
-the button changes to checked or unchecked, respectively.
-
-The @racket[state] argument determines whether the button is initially
-checked.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/vertical-alignment.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/vertical-alignment.scrbl
deleted file mode 100644
index 146a83eda1..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/vertical-alignment.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[vertical-alignment% dllist<%> (alignment<%> alignment-parent<%>)]{
-
-@defconstructor[([parent (is-a?/c alignment-parent<%>)]
-                 [show? boolean? #t]
-                 [after (or/c (is-a?/c alignment<%>) false/c) #f])]{
-
-Inserts a new vertical-alignment container into
-@racket[parent]---optionally after a given container also in
-@racket[parent]. The new container can be initially shown or hidden.}}
diff --git a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/vline.scrbl b/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/vline.scrbl
deleted file mode 100644
index 32de392a5d..0000000000
--- a/pkgs/gui-pkgs/gui-doc/embedded-gui/scribblings/vline.scrbl
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[vline% snip-wrapper% (alignment<%>)]{
-
-Displays a vertical line across the region that is inserted into.
-
-@defconstructor[([parent (is-a?/c alignment-parent<%>)])]{
-}
-}
diff --git a/pkgs/gui-pkgs/gui-doc/info.rkt b/pkgs/gui-pkgs/gui-doc/info.rkt
deleted file mode 100644
index 817d59d19a..0000000000
--- a/pkgs/gui-pkgs/gui-doc/info.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("scheme-lib"
-                     "syntax-color-doc"
-                     "at-exp-lib"
-                     "draw-doc"
-                     "draw-lib"
-                     "scribble-lib"
-                     "snip-lib"
-                     "string-constants-lib"
-                     "syntax-color-lib"
-                     "wxme-lib"
-                     "gui-lib"
-                     "racket-doc"
-                     "string-constants-doc"))
-(define deps '("base"))
-(define update-implies '("gui-lib"))
-
-(define pkg-desc "documentation part of \"gui\"")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/info.rkt b/pkgs/gui-pkgs/gui-doc/mrlib/info.rkt
deleted file mode 100644
index bb17d7a170..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all robby)))
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-editor-canvas-class.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-editor-canvas-class.scrbl
deleted file mode 100644
index 8ea9347dc7..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-editor-canvas-class.scrbl
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[aligned-editor-canvas% editor-canvas% ()]{
-
-Calls the
-@method[aligned-pasteboard<%> realign] method when resized.
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-editor-snip-class.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-editor-snip-class.scrbl
deleted file mode 100644
index b15e21ced6..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-editor-snip-class.scrbl
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[aligned-editor-snip% editor-snip% ()]{
-
-Calls the @method[aligned-pasteboard<%> realign] method when resized.
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-pasteboard-intf.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-pasteboard-intf.scrbl
deleted file mode 100644
index efe7f21c94..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-pasteboard-intf.scrbl
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[aligned-pasteboard<%> ()]{
-
-
-
-@defmethod[(get-aligned-min-height)
-           real?]{
-
-The minimum height an aligned-pasteboard can be and still
-fit the heights of all of its children.}
-
-
-@defmethod[(get-aligned-min-width)
-           real?]{
-The minimum width an aligned-pasteboard can be and still
-fit the widths of all of its children.
-
-}
-
-@defmethod*[([(realign [width exact-nonnegative-integer?]
-                       [height exact-nonnegative-integer?])
-              void?]
-             [(realign)
-              void?])]{
-
-Realigns the children inside the @racket[aligned-pasteboard<%>] to
-either a given @racket[width] and @racket[height] or the previously
-alloted width and height.}
-
-@defmethod[(set-aligned-min-sizes)
-           void?]{
-
-Calculates the minimum width and height of the of the
-pasteboard based on children's min-sizes and stores it for
-later retrieval via the getters.}}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-pasteboard-parent-intf.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-pasteboard-parent-intf.scrbl
deleted file mode 100644
index a8ed2280d8..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-pasteboard-parent-intf.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[aligned-pasteboard-parent<%> ()]{
-
-This interface must be implemented by any class who's editor
-is an @racket[aligned-pasteboard<%>].
-
-@defmethod[(set-aligned-min-sizes)
-           void?]{}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-pasteboard.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-pasteboard.scrbl
deleted file mode 100644
index fddb49ef32..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/aligned-pasteboard.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/doc
-@(require "../common.rkt")
-
-@title[#:style 'toc]{Aligned Pasteboard}
-
-The aligned-pasteboard library provides classes derived from
-@racket[pasteboard%] with geometry management that mirrors that of
-@racket[vertical-panel%] and @racket[horizontal-panel%].
-
-@defmodule[mrlib/aligned-pasteboard]
-
-@local-table-of-contents[]
-
-@include-section["aligned-pasteboard-intf.scrbl"]
-@include-section["horizontal-pasteboard-class.scrbl"]
-@include-section["vertical-pasteboard-class.scrbl"]
-@include-section["aligned-editor-snip-class.scrbl"]
-@include-section["aligned-editor-canvas-class.scrbl"]
-@include-section["aligned-pasteboard-parent-intf.scrbl"]
-@include-section["stretchable-snip-intf.scrbl"]
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/common.rkt b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/common.rkt
deleted file mode 100644
index 6ab5821430..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/common.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scheme/base
-
-(require "../common.rkt"
-         (for-label mrlib/aligned-pasteboard))
-
-(provide (all-from-out "../common.rkt")
-         (for-label (all-from-out mrlib/aligned-pasteboard)))
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/horizontal-pasteboard-class.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/horizontal-pasteboard-class.scrbl
deleted file mode 100644
index c1435eed12..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/horizontal-pasteboard-class.scrbl
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[horizontal-pasteboard% pasteboard% (aligned-pasteboard<%>)]{
-
-@defconstructor/auto-super[()]{
-Passes all arguments to @racket[super-init].
-}
-
-@defmethod[#:mode override 
-           (after-delete [snip (is-a?/c snip%)])
-           void?]{}
-
-@defmethod[#:mode override 
-           (after-insert [snip (is-a?/c snip%)]
-                         [before (or/c (is-a?/c snip%) false/c)]
-                         [x real?]
-                         [y real?])
-           void?]{}
-
-@defmethod[#:mode override 
-           (after-reorder [snip (is-a?/c snip%)]
-                          [to-snip (is-a?/c snip%)]
-                          [before? any/c])
-           boolean?]{}
-
-@defmethod[#:mode override 
-           (resized [snip (is-a?/c snip%)]
-                    [redraw-now? any/c])
-           void?]{}}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/stretchable-snip-intf.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/stretchable-snip-intf.scrbl
deleted file mode 100644
index 016b55dce2..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/stretchable-snip-intf.scrbl
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[stretchable-snip<%> ()]{
-
-This interface must be implemented by any snip class who's
-objects will be stretchable when inserted into an
-@racket[aligned-pasteboard<%>].
-
-
-
-@defmethod[(get-aligned-min-height)
-           real?]{
-The minimum height that the snip can be resized to
-
-}
-
-@defmethod[(get-aligned-min-width)
-           real?]{
-The minimum width that the snip can be resized to.
-
-}
-
-@defmethod[(stretchable-height)
-           boolean?]{
-Whether or not the snip can be stretched in the Y dimension
-
-}
-
-@defmethod[(stretchable-width)
-           boolean?]{
-Whether or not the snip can be stretched in the X dimension
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/vertical-pasteboard-class.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/vertical-pasteboard-class.scrbl
deleted file mode 100644
index dc863faa34..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/aligned-pasteboard/vertical-pasteboard-class.scrbl
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[vertical-pasteboard% pasteboard% (aligned-pasteboard<%>)]{
-
-@defconstructor/auto-super[()]{
-Passes all arguments to @racket[super-init].
-}
-
-@defmethod[#:mode override 
-           (after-delete [snip (is-a?/c snip%)])
-           void?]{}
-
-@defmethod[#:mode override 
-           (after-insert [snip (is-a?/c snip%)]
-                         [before (or/c (is-a?/c snip%) false/c)]
-                         [x real?]
-                         [y real?])
-           void?]{}
-
-@defmethod[#:mode override 
-           (after-reorder [snip (is-a?/c snip%)]
-                          [to-snip (is-a?/c snip%)]
-                          [before? any/c])
-           boolean?]{}
-
-@defmethod[#:mode override 
-           (resized [snip (is-a?/c snip%)]
-                    [redraw-now? any/c])
-           void?]{}}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/bitmap-label.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/bitmap-label.scrbl
deleted file mode 100644
index ccebcdfdba..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/bitmap-label.scrbl
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label mrlib/bitmap-label))
-
-@title{Bitmap Label}
-
-@defmodule[mrlib/bitmap-label]
-
-@defproc[(make-bitmap-label [str string?]
-                            [img (or/c (is-a?/c bitmap%) path-string?)]
-                            [font (is-a?/c font%) normal-control-font])
-         (is-a?/c bitmap%)]{
-
-Constructs a bitmap label suitable for use a button that contains the
-image specified by @racket[img] followed by the text in @racket[str].}
-
-
-@defproc[((bitmap-label-maker [str string?]
-                              [img (or/c (is-a?/c bitmap%) path-string?)])
-          [future-parent any/c])
-         (is-a?/c bitmap%)]{
-
-An older variant of @racket[make-bitmap-label] that was designed to
-obtain a font to use from a container @racket[future-parent]. The
-@racket[future-parent] argument is currently ignored.}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/cache-image-snip.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/cache-image-snip.scrbl
deleted file mode 100644
index 71aa4e4878..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/cache-image-snip.scrbl
+++ /dev/null
@@ -1,233 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" 
-          (for-label mrlib/cache-image-snip)
-          scribble/decode)
-
-@(define dont-use
-   (splice
-    @list{This function is in a library that will be 
-          removed in a future version. Do not use it.
-          
-          The mentions of ``argb'' in this library are not
-          @racket[bytes?] objects (i.e, not the
-          same as for example, the result of 
-          @method[bitmap-dc% get-argb-pixels])}))
-
-@title{Cache-image Snip}
-
-@defmodule[mrlib/cache-image-snip]{
-
-@deprecated[@racketmodname[racket/gui]]{This library will
-  no longer be public in a future release; much of it will
-  be available privately to continue to support the implementation
-  of @racketmodname[htdp/image #:indirect], but the other exported functions
-  here are not useful and have names that confusingly match
-  unrelated other libraries.}
-                                   
-The @racketmodname[mrlib/cache-image-snip] library provides the core
-data structure for DrRacket's @filepath{image.rkt} teachpack. Images in
-the @filepath{image.rkt} teachpack are instances of the
-@racket[cache-image-snip%] class.}
-
-The library also defines a new type, @racket[argb], that represents a
-bitmap, but with alpha values. It has a maker, two selectors, and a
-predicate.
-
-
-@defclass[cache-image-snip% image-snip% ()]{
-
-The @racket[cache-image-snip%] class is a subclass of
-@racket[image-snip%] simply so that its instances can be compared with
-@racket[image-snip%] using @racket[equal?]. All @racket[image-snip%]
-functionality is overridden or ignored.
-
-@defmethod[#:mode overrride
-           (equal-to? [snip (is-a?/c image-snip%)]
-                      [equal? (any/c any/c . -> . boolean?)])
-           boolean?]{
-
-Calls the @method[cache-image-snip% other-equal-to?] method of
-@racket[snip] if it is also a @racket[cache-image-snip%] instance,
-otherwise calls the @method[cache-image-snip% other-equal-to?] of
-@this-obj[].}
-
-
-@defmethod[(get-argb)
-           argb?]{
-
-    Returns a pixel array for this image, forcing it to be
-    computed.
-}
-
-@defmethod[(get-argb-proc)
-           (argb? exact-integer? exact-integer? . -> . void?)]{
-
-    Returns a procedure that fills in an argb with the contents of this image
-    at the given offset
-
-
-}
-
-@defmethod[(get-argb/no-compute)
-           (or/c false/c argb?)]{
-
-    Returns a pixel array for this image or @racket[#f] if it has not
-    been computed yet.
-
-
-}
-
-@defmethod[#:mode override
-           (get-bitmap) (or/c false/c (is-a?/c bitmap%))]{
-
-    Builds (if not yet built) a bitmap corresponding to
-    this snip and returns it.
-
-    If the width or the height of the snip is @racket[0], 
-    this method return @racket[#f].
-}
-
-@defmethod[(get-dc-proc)
-           (or/c false/c ((is-a?/c dc<%>) real? real? -> void?))]{
-
-    Either returns false, or a procedure that draws the
-    contents of this snip into a dc.
-
-}
-
-@defmethod[(get-pinhole)
-           (values real? real?)]{
-
-    Returns the pinhole coordinates for this image, counting
-    from the top-left of the image.
-
-
-}
-
-@defmethod[(get-size)
-           (values exact-nonnegative-integer? exact-nonnegative-integer?)]{
-
-    Returns the width and height for the image.
-
-}
-
-@defmethod[#:mode override
-           (other-equal-to? [snip (is-a?/c image-snip%)]
-                            [equal? (any/c any/c . -> . boolean?)])
-           boolean?]{
-
-Refines the comparison of @xmethod[image-snip% other-equal-to?] to
-exactly match alpha channels.}}
-
-@; ----------------------------------------
-
-@defthing[snip-class (is-a?/c snip-class%)]{
-
-This snipclass is used for saved cache image snips.}
-
-
-@defproc[(make-argb [vectorof byte?]
-                    [width exact-nonnegative-integer?]
-                    [height exact-nonnegative-integer?])
-         argb?]{
-
- Constructs a new argb value with the given width and height,
- using the data in the vector. The vector has four entries
-  for each pixel, an alpha, red, green, and blue value.
-  The pixels are specified in row-major order, so that the
-  pixel at location (x,y) comes from vector entry (4*(x+(width*y))).
-}
-
-@defproc[(argb-vector [argb argb?]) (vectorof byte?)]{
-
-  Extracts the vector from @racket[argb]. The resulting vector
- has entries in row-major order, so that the data for the pixel
- at (x,y) winds up in four vector entries beginning at
- (4*(x+(width*y))).
- 
-   @dont-use
-}
-
-@defproc[(argb-width [argb argb?]) exact-nonnegative-integer?]{
-
-   Extracts the width from @racket[argb].
-                           
-   @dont-use
-}
-
-@defproc[(argb-height [argb argb?]) exact-nonnegative-integer?]{
-
-  Extracts the height from @racket[argb].
-                           
-  @dont-use}
-
-
-@defproc[(argb? [v any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[v] is an argb, @racket[#f] otherwise.
-          
-  @dont-use
-}
-
-
-@defproc[(overlay-bitmap [dest argb?]
-                         [dx exact-integer?]
-                         [dy exact-integer?]
-                         [img (is-a?/c bitmap%)]
-                         [mask (is-a?/c bitmap%)])
-         void?]{
-
-Changes @racket[argb], overlaying @racket[img] with masking based on
-@racket[mask] at @math{(@racket[dx], @racket[dy])} from the top-left.
-
-  @dont-use
-}
-
-
-@defproc[(build-bitmap [draw ((is-a?/c dc<%>) . -> . any)]
-                       [width (integer-in 1 10000)]
-                       [height (integer-in 1 10000)])
-         (is-a?/c bitmap%)]{
-
-Builds a bitmap of size @racket[width] by @racket[height], using the
-procedure @racket[draw] to render the bitmap content into the given
-@racket[dc<%>].
-
-  @dont-use
-}
-
-
-@defproc[(flatten-bitmap [bitmap (is-a?/c bitmap%)]) (is-a?/c bitmap%)]{
-
-    Builds a new bitmap that flattens the original @racket[bitmap]
-    with its mask (as determined by @xmethod[bitmap%
-    get-loaded-mask]), producing a bitmap that has no mask, and looks
-    the way that bitmap would draw (when drawn with the mask) onto a
-    white background.
-    
-    @dont-use
-}
-
-
-@defproc[(argb->cache-image-snip [argb argb?][dx real?][dy real?])
-         (is-a?/c cache-image-snip%)]{
-
- Builds a new @racket[cache-image-snip%] based on the contents of
- @racket[argb], using @racket[dx] and @racket[dy] as the pinhole.
- 
-  @dont-use
-}
-
-
-@defproc[(argb->bitmap [argb argb?]) (or/c false/c (is-a?/c bitmap%))]{
-
-   Builds a bitmap that draws the same way as @racket[argb]; the alpha
-   pixels are put into the bitmap's @method[bitmap% get-loaded-mask]
-   bitmap.
-
-   If the width or height of @racket[argb] is @racket[0],
-   this returns @racket[#f].
-   
-   @dont-use
-}
-
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/close-icon.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/close-icon.scrbl
deleted file mode 100644
index a65d448fb3..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/close-icon.scrbl
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mrlib/close-icon
-                     scheme/gui scheme/runtime-path scheme/include))
-
-@title{Close Icon}
-
-@defmodule[mrlib/close-icon]{The @racket[close-icon%] class
-provides a clickable close button icon.}
-
-@defclass[close-icon% canvas% ()]{
- @defconstructor[([parent (is-a? area-container<%>)]
-                  [callback (-> any) void]
-                  [bg-color (or/c #f string (is-a?/c color%)) #f]
-                  [horizontal-pad positive-integer? 4]
-                  [vertical-pad positive-integer? 4])]{
-   The @racket[callback] is called when the close icon is clicked.
-
-   If @racket[bg-color] is specified, it is used as the background color of the icon.
- }
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/common.rkt b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/common.rkt
deleted file mode 100644
index cd0653ba60..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/common.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scheme/base
-
-(require scribble/manual
-         (for-label scheme/base
-                    scheme/contract
-                    scheme/class
-                    (except-in scheme/gui/base make-color make-pen)))
-
-(provide (all-from-out scribble/manual)
-         (for-label (all-from-out scheme/base
-                                  scheme/contract
-                                  scheme/class
-                                  scheme/gui/base)))
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/gif.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/gif.scrbl
deleted file mode 100644
index 1d14dc93ec..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/gif.scrbl
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label mrlib/gif file/gif))
-
-@title{GIF and Animated GIF Writing}
-
-@defmodule[mrlib/gif]
-
-
-@defproc[(write-gif [bitmap (or/c (is-a?/c bitmap%)
-                                  (-> (is-a?/c bitmap%)))]
-                    [filename path-string?])
-         void?]{
-
-Writes the given @racket[bitmap] to @racket[filename] as a GIF image,
-where @racket[bitmap] is either an instance of @racket[bitmap%] or a
-thunk (to be called just once) that generates such an object. If the
-bitmap uses more than 256 colors, it is automatically quantized using
-a simple algorithm; see @racket[quantize]. If the bitmap has a mask
-bitmap via @method[bitmap% get-loaded-mask], it is used to determine
-transparent pixels in the generated GIF image.}
-
-@defproc[(write-animated-gif [bitmaps (and/c 
-					(listof (or/c (is-a?/c bitmap%)
-						      (-> (is-a?/c bitmap%))))
-					pair?)]
-                             [delay-csec (integer-in 0 #xFFFFFFFF)]
-                             [filename path-string?]
-                             [#:loop? loop? any/c (and delay-csec #t)]
-                             [#:one-at-a-time? one-at-a-time? any/c #f]
-                             [#:last-frame-delay last-frame-delay (or/c (integer-in 0 #xFFFFFFFF) #f) #f]
-                             [#:disposal disposal (or/c 'any 'keep 'restore-bg 'restore-prev) 'any])
-         void?]{
-
-Writes the bitmaps in @racket[bitmaps] to @racket[filename] as an
-animated GIF. The @racket[bitmaps] list can contain a mixture of
-@racket[bitmap%] objects and thunks (each called just once) that
-produce @racket[bitmap%] objects. The @racket[delay-csec] argument is
-the amount of time in 1/100s of a second to wait between transitions.
-If @racket[loop?] is a true value, then the GIF is marked as a looping
-animation.
-
-If @racket[one-at-a-time?] is @racket[#f], then the content of all
-images is collected and quantized at once, to produce a single
-colortable; a drawback to this approach is that it uses more memory,
-and it allows less color variation among animation frames. Even when
-@racket[one-at-a-time?] is @racket[#f], the result of each thunk in
-@racket[bitmaps] is converted to a byte-string one at a time.
-
-If @racket[one-at-a-time?] is true, then the bitmaps are quantized and
-written to the file one at a time; that is, for each thunk in
-@racket[bitmaps], its result is written and discarded before another
-thunk is called. A drawback to this approach is that a separate
-colortable is written for each frame in the animation, which can make
-the resulting file large.
-
-If @racket[last-frame-delay] is not false, a delay of
-@racket[last-frame-delay] (in 1/100s of a second) is added to the last
-frame. This extra delay is useful when @racket[loop?] is true.
-
-The @racket[disposal] argument specifies the frame disposal method, which determines
-how the previous frame is treated when writing a transparent frame. The same
-disposal method is applied to every frame. See @racket[gif-add-control] for the
-meaning of the various disposal options.}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/common.rkt b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/common.rkt
deleted file mode 100644
index 5a5fdd64c9..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/common.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scheme/base
-
-(require "../common.rkt"
-         (for-label mrlib/graph))
-
-(provide (all-from-out "../common.rkt")
-         (for-label (all-from-out mrlib/graph)))
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-pasteboard-intf.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-pasteboard-intf.scrbl
deleted file mode 100644
index a18da120e0..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-pasteboard-intf.scrbl
+++ /dev/null
@@ -1,133 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[graph-pasteboard<%> ()]{
-
-
-@defmethod[(get-arrowhead-params)
-           (values number number number)]{
-
-Returns the current settings for the arrowhead's drawing.
-}
-
-
-@defmethod[(on-mouse-over-snips [lst (listof (is-a?/c snip%))])
-           void?]{
-
-This method is called when the mouse passes over any snips
-in the editor. It is only called when the list of snips
-under the editor changes (ie, if the mouse moves, but
-remains over the same list of snips, the method is not
-called). Also, this method is called with the empty list if
-the mouse leaves the pasteboard.}
-
-
-@defmethod[(set-arrowhead-params [angle-width real?]
-                                 [short-side real?]
-                                 [long-size real?])
-           void?]{
-
-Sets drawing parameters for the arrowhead. The first is the
-angle of the arrowhead's point, in radians. The second is
-the length of the outside line of the arrowhead and the last
-is the distance from the arrowhead's point to the place where
-the arrowhead comes together.}
-
-
-@defmethod[(set-draw-arrow-heads? [draw-arrow-heads? any/c])
-           void?]{
-
-Sets a boolean controlling whether or not arrow heads are
-drawn on the edges between nodes.
-
-This setting does not affect self-links---only links between two
-different nodes.
-
-}
-
-@defmethod[(set-flip-labels? [flip-labels? any/c])
-           void?]{
-
-Sets a boolean controlling whether or not arrow labels are flipped so
-the are always right-side-up.  Note that if there are two nodes with
-edges going from the first to the second, and from the second to the
-first, and the two have labels, then this should be turned off or the
-labels will appear in the same space.
-
-This setting does not affect self-links---only links between two
-different nodes.
-
-}
-
-@defmethod[(set-edge-label-font [font (is-a?/c font%)]) void?]{
-  Updates the font used to draw the edge labels.
-}
-
-@defmethod[(get-edge-label-font) (is-a?/c font%)]{
-  Returns the font currently being used to draw the edge labels
-}
-
-
-@defmethod[(draw-edges [dc (is-a?/c dc<%>)]
-[left real?]
-[top real?]
-[right real?]
-[bottom real?]
-[dx real?]
-[dy real?]) void?]{
-  This is called by the @method[editor<%> on-paint] callback of a
-  graph pasteboard, and is expected to draw the edges between the
-  snips. The argments are a subset of those passed to
-  @method[editor<%> on-paint] and it is only called when the
-  @racket[before?] argument to   @method[editor<%> on-paint] 
-  is @racket[#t].
-}
-
-@defmethod[(draw-single-edge [dc (is-a?/c dc<%>)]
-			     [dx real?]
-			     [dy real?]
-			     [from (is-a?/c graph-snip<%>)]
-			     [to (is-a?/c graph-snip<%>)]
-			     [from-x real?]
-			     [from-y real?]
-			     [to-x real?]
-			     [to-y real?]
-			     [arrow-point-ok? (-> real? real? boolean?)]) void?]{
-
-This method is called to draw each edge in the graph, except
-for the edges that connect a node to itself.
-
-The @racket[dc], @racket[dx], and @racket[dy] arguments are
-the same as in @method[editor<%> on-paint]. 
-
-The
-@racket[from-x], @racket[from-y], @racket[to-x], and
-@racket[to-y] arguments specify points on the source and
-destination snip's bounding box where a straight line
-between the centers of the snip would intersect.
-
-The @racket[arrow-point-ok?] function returns @racket[#t]
-when the point specified by its arguments is inside the
-smallest rectangle that covers both the source and
-destination snips, but is outside of both of the rectangles
-that surround the source and destination snips themselves.
-
-This default implementation uses @racket[update-polygon] to compute
-the arrowheads and otherwise draws a straight line between the two
-points and then the arrowheads, unless the arrowhead points
-are not ok according to @racket[arrow-point-ok?], in which case
-it just draws the line.
-}
-
-@defmethod[(update-arrowhead-polygon [from-x real?] [from-y real?] [to-x real?] [to-y real?] 
-                                     [point1 (is-a?/c point%)]
-                                     [point2 (is-a?/c point%)]
-                                     [point3 (is-a?/c point%)]
-                                     [point4 (is-a?/c point%)]) void?]{
-
-Updates the arguments @racket[point1], @racket[point2], @racket[point3], @racket[point4]
-with the coordinates of an arrowhead for a line that connects (@racket[from-x],@racket[from-y])
-to (@racket[to-x],@racket[to-y]).
-}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-pasteboard-mixin.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-pasteboard-mixin.scrbl
deleted file mode 100644
index fccff0da8d..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-pasteboard-mixin.scrbl
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defmixin/title[graph-pasteboard-mixin (pasteboard%) (graph-pasteboard<%>)]{
-
-@defconstructor/auto-super[([edge-labels? boolean? #t]
-                            [edge-label-font (or/c #f (is-a?/c font%)) #f]
-                            [cache-arrow-drawing? any])]{
-
-If @racket[edge-labels?] is @racket[#f], no edge labels are
-drawn. Otherwise, they are.
-
-If @racket[edge-label-font] is supplied, it is used when drawing the
-labels on the edges. Otherwise, the font is not set before drawing
-the labels, defaulting to the @racket[dc<%>] object's font.
-
-If @racket[cache-arrow-drawing?] is @racket[#f], then the arrows in the snip
-are not cached in a bitmap (to speed up drawing when the mouse moves around).
-Otherwise, they are.
-
-}
-
-This mixin overrides many methods to draw lines between
-@racket[graph-snip<%>] that it contains.}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-snip-intf.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-snip-intf.scrbl
deleted file mode 100644
index 679e5a9dd3..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-snip-intf.scrbl
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[graph-snip<%> ()]{
-
-
-
-@defmethod[(add-child [child (is-a?/c graph-snip<%>)])
-           void?]{
-
-  Adds a child of this snip. Instead of calling this method,
-  consider using the @racket[add-links] function.
-
-}
-
-@defmethod*[([(add-parent [parent (is-a?/c graph-snip<%>)])
-              void?]
-             [(add-parent [parent (is-a?/c graph-snip<%>)]
-                          [mouse-over-pen (or/c false/c (is-a?/c pen%))]
-                          [mouse-off-pen (or/c false/c (is-a?/c pen%))]
-                          [mouse-over-brush (or/c false/c (is-a?/c brush%))]
-                          [mouse-off-brush (or/c false/c (is-a?/c brush%))])
-              void?])]{
-
-  Adds a parent of this snip. Instead of calling this
-  method, consider using the @racket[add-links] function.
-
-}
-
-@defmethod[(get-children)
-           (listof snip%)]{
-
-returns a list of snips that implement
-@racket[graph-snip<%>]. Each of these snips will have a line
-drawn from it, pointing at this snip.
-
-}
-
-
-@defmethod[(get-parents)
-           (listof graph-snip<%>)]{
-
-Returns a list of snips that implement @racket[graph-snip<%>]. Each
-of these snips will have a line drawn to it, starting from
-this snip.
-}
-
-
-@defmethod[(remove-child [child (is-a?/c graph-snip<%>)])
-           void?]{
-
-  Removes a child snip from this snip. Be sure to remove
-  this snip as a parent from the argument, too.
-  Instead of calling this method, consider using the
-  @racket[remove-links] function.
-}
-
-
-@defmethod[(remove-parent [parent (is-a?/c graph-snip<%>)])
-           void?]{
-
-  Removes a parent snip from this snip. Be sure to remove this
-  snip as a child from the argument, too.
-  Instead of calling this method, consider using the
-  @racket[remove-links] function.
-}
-
-
-@defmethod[(set-parent-link-label [parent (is-a?/c graph-snip<%>)]
-                                  [label (or/c false/c string/)])
-           void?]{
-
-  Changes the label on the edge going to the @racket[parent] to be
-  @racket[label].  Ignored if no such egde exists.
-}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-snip-mixin.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-snip-mixin.scrbl
deleted file mode 100644
index b89480ce8b..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph-snip-mixin.scrbl
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defmixin/title[graph-snip-mixin (snip%) (graph-snip<%>)]{
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph.scrbl
deleted file mode 100644
index e82a4418ef..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/graph/graph.scrbl
+++ /dev/null
@@ -1,129 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label mrlib/graph))
-
-@title[#:style 'toc]{Graphs}
-
-@defmodule[mrlib/graph]{The @racketmodname[mrlib/graph] library
-provides a graph drawing toolkit built out of @racket[pasteboard%]s.}
-
-@local-table-of-contents[]
-
-@include-section["graph-pasteboard-intf.scrbl"]
-@include-section["graph-pasteboard-mixin.scrbl"]
-@include-section["graph-snip-intf.scrbl"]
-@include-section["graph-snip-mixin.scrbl"]
-
-@section{Graph Functions}
-
-@defproc*[([(add-links [parent (is-a?/c graph-snip<%>)]
-                       [child (is-a?/c graph-snip<%>)])
-            void?]
-           [(add-links [parent (is-a?/c graph-snip<%>)]
-                       [child (is-a?/c graph-snip<%>)])
-            void?]
-           [(add-links [parent (is-a?/c graph-snip<%>)]
-                       [child (is-a?/c graph-snip<%>)]
-                       [dark-pen (or/c (is-a?/c pen) false/c)]
-                       [light-pen (or/c (is-a?/c pen) false/c)]
-                       [dark-brush (or/c (is-a?/c brush%) false/c)]
-                       [light-brush (or/c (is-a?/c brush%) false/c)]
-                       [label (or/c string? false/c) #f])
-            void?]
-           [(add-links [parent (is-a?/c graph-snip<%>)]
-                       [child (is-a?/c graph-snip<%>)]
-                       [dark-pen (or/c (is-a?/c pen) false/c)]
-                       [light-pen (or/c (is-a?/c pen) false/c)]
-                       [dark-brush (or/c (is-a?/c brush%) false/c)]
-                       [light-brush (or/c (is-a?/c brush%) false/c)]
-                       [dx real?]
-                       [dy real?]
-                       [label (or/c string? false/c) #f])
-           void?])]{
-
-Connects a parent snip to a child snip within a pasteboard.
-
-The default @racket[dark-pen]/@racket[dark-brush] and
-@racket[light-pen]/@racket[light-brush] are blue and purple,
-respectively. The @racket[dark-pen] and @racket[dark-brush] are used
-when the mouse cursor is over the snip (or a child or parent), and the
-@racket[light-pen] and @racket[light-brush] are used when the mouse
-cursor is not over the snip. The brush is used to draw inside the
-arrow head and the pen is used to draw the border of the arrowhead and
-the line connecting the two snips.
-
-if @racket[label] is provided and not @racket[#f], it is used as a
-label on the edge.
-
-When @racket[dx] and @racket[dy] are provided, the are offsets for the
-head and the tail of the arrow. Otherwise, @racket[0] offsets are
-used.}
-
-@defproc[(add-links/text-colors [parent (is-a?/c graph-snip<%>)]
-                                [child (is-a?/c graph-snip<%>)]
-                                [dark-pen (or/c (is-a?/c pen) false/c)]
-                                [light-pen (or/c (is-a?/c pen) false/c)]
-                                [dark-brush (or/c (is-a?/c brush%) false/c)]
-                                [light-brush (or/c (is-a?/c brush%) false/c)]
-                                [dark-text (or/c (is-a?/c color%) false/c)]
-                                [light-text (or/c (is-a?/c color) false/c)]
-                                [dx real?]
-                                [dy real?]
-                                [label (or/c string? false/c)])
-          void?]{
-
-Like @racket[add-links], but with extra @racket[dark-text] and
-@racket[light-text] arguments to set the colors of the label.}
-
-@defproc[(remove-links [parent (is-a?/c graph-snip<%>)]
-                       [child (is-a?/c graph-snip<%>)])
-          void?]{
-
-Disconnects a parent snip from a child snip within a pasteboard.}
-
-@defproc[(set-link-label [parent (is-a?/c graph-snip<%>)]
-                         [child (is-a?/c graph-snip<%>)]
-                         [label (or/c string? false/c)])
-          void?]{
-
-Changes the label on the edge going from @racket[child] to
-@racket[parent] to be @racket[label].  If there is no existing edge
-between the two nodes, then nothing happens.}
-
-
-@defproc[(dot-positioning [pb (is-a?/c pasteboard%)]
-                          [option (or/c dot-label neato-label neato-hier-label neato-ipsep-label) 
-                                  dot-label]
-                          [overlap-or-horizontal? boolean? #f])
-         void?]{
-  This finds the sizes of the @racket[graph-snip<%>]s in @racket[pb] and their 
-  children and then passes that information to @tt{dot} or @tt{neato} (depending
-  on @racket[option]), extracting a layout and then applying it to the 
-  snips in @racket[pb].
-  
-  If @racket[option] is @racket[dot-label], then @racket[overlap-or-horizontal?]
-  controls whether @tt{dot} uses a horizontal or vertical alignment.
-  If @racket[option] is any of the other options, it controls whether or not
-  @tt{neato} is allowed to overlap nodes.
-  
-  If @racket[find-dot] returns @racket[#f], this function does nothing.
-}
-
-@defproc[(find-dot [neato? boolean? #f]) (or/c path? #f)]{
-  Tries to find the @tt{dot} or @tt{neato} binary and, if it succeeds,
-  returns the path to it. If it cannot find it, returns
-  @racket[#f].
-}
-
-@defthing[dot-label string?]{
-  A string describing the regular dot option for graph layout that @racket[dot-positioning] uses.
-}
-@defthing[neato-label string?]{
-  A string describing the neato option for graph layout that @racket[dot-positioning] uses.
-}
-@defthing[neato-hier-label string?]{
-  A string describing the neato hierarchical option for graph layout that 
-  @racket[dot-positioning] uses.
-}
-@defthing[neato-ipsep-label string?]{
-  A string describing the neato ipsep option for graph layout that @racket[dot-positioning] uses.
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/compound-item.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/compound-item.scrbl
deleted file mode 100644
index bcf19a24b6..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/compound-item.scrbl
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang scribble/doc
-@(require "../common.rkt" (for-label mrlib/hierlist))
-
-@definterface/title[hierarchical-list-compound-item<%>
-                    (hierarchical-list-item<%>)]{
-
-Instantiate this interface via @method[hierarchical-list% new-list].
-
-
-@defmethod[(new-item [mixin ((implementation?/c hierarchical-list-item<%>)
-                             . -> .
-                             (implementation?/c hierarchical-list-item<%>))
-                             (lambda (%) %)])
-           (is-a?/c hierarchical-list-item<%>)]{
-
-Like @xmethod[hierarchical-list% new-item].}
-
-
-@defmethod[(set-no-sublists [no-sublists? any/c]) void?]{
-
-Like @xmethod[hierarchical-list% set-no-sublists].}
-
-
-@defmethod[(new-list [mixin ((implementation?/c hierarchical-list-compound-item<%>)
-                             . -> .
-                             (implementation?/c hierarchical-list-compound-item<%>))
-                             (lambda (%) %)])
-           (is-a?/c hierarchical-list-compound-item<%>)]{
-
-Like @xmethod[hierarchical-list% new-list].}
-
-
-@defmethod[(delete-item [i (is-a?/c hierarchical-list-item<%>)]) void?]{
-
-Deletes immediate item or sub-list @racket[i] from the sub-list.}
-
-
-@defmethod[(get-items) (listof (is-a?/c hierarchical-list-item<%>))]{
-
-Returns a list of all immediate items in the sub-list.}
-
-
-@defmethod*[([(open) void?]
-             [(close) void?]
-             [(toggle-open/closed) void?])]{
-
-Shows or hides the items of this sub-list.}
-
-
-@defmethod[(is-open?) boolean?]{
-
-Reports whether the items of this sub-list are visible.}
-
-
-@defmethod[(get-arrow-snip) (is-a?/c snip%)]{
-
-Returns a snip that corresponds to the arrow to hide/show items of the
-sub-list. The result is intended for use by automatic test suites.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/hierlist.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/hierlist.scrbl
deleted file mode 100644
index b68c9cfd2e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/hierlist.scrbl
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang scribble/doc
-@(require "../common.rkt" (for-label mrlib/hierlist))
-
-@title[#:style 'toc]{Hierarchical List Control}
-
-@defmodule[mrlib/hierlist]
-
-A @racket[hierarchical-list%] control is a list of items, some of
-which can themselves be hierarchical lists. Each such sub-list has an
-arrow that the user can click to hide or show the sub-list's items.
-
-The list control supports the following default keystrokes:
-
-@itemize[
- 
- @item{Down: move to the next entry at the current level (skipping lower levels).}
-
- @item{Up: move to the previous entry at the current level (skipping lower levels).}
-
- @item{Left: move to the enclosing level (only valid at embedded levels).}
-
- @item{Right: move down in one level (only valid for lists).}
-
- @item{Return:  open/close the current selected level (only valid for lists).}
-
-]
-
-
-@local-table-of-contents[]
-
-@include-section["list.scrbl"]
-@include-section["item.scrbl"]
-@include-section["compound-item.scrbl"]
-@include-section["snips.scrbl"]
-
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/item.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/item.scrbl
deleted file mode 100644
index ffe10b657c..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/item.scrbl
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang scribble/doc
-@(require "../common.rkt" (for-label mrlib/hierlist))
-
-@definterface/title[hierarchical-list-item<%> ()]{
-
-Instantiate this interface via @method[hierarchical-list% new-item].
-
-@defmethod[(get-editor) (is-a?/c text%)]{
-
-Returns a text-editor buffer whose content is the display
-representation of the item. In other words, fill in this text editor
-to set the item's label.}
-
-
-@defmethod[(is-selected?) boolean?]{
-
-Reports whether the item is selected.}
-
-
-@defmethod*[([(select [on? any/c]) void?]
-             [(click-select [on? any/c]) void?])]{
-
-Calls @method[hierarchical-list% select] or @method[hierarchical-list%
-click-select]. The @racket[on?] argument can be @racket[#f] only if
-@xmethod[hierarchical-list% allow-deselect] allows it.}
-
-
-@defmethod*[([(user-data) any/c]
-             [(user-data [data any/c]) void?])]{
-
-Gets/sets arbitrary data associated with the item.}
-
-
-@defmethod[(get-clickable-snip) (is-a?/c snip%)]{
-
-Returns the snip that (when clicked) selects this element the
-list. This method is intended for use with an automatic test suite.}
-
-
-@defmethod*[([(get-allow-selection?) boolean?]
-             [(set-allow-selection [allow? any/c]) void?])]{
-
-Gets/sets whether this item is allowed to be selected.}
-
-
-@defmethod[(get-parent) (or/c (is-a?/c hierarchical-list-compound-item<%>) #f)]{
-
-Returns the compound list item that contains the item or @racket[#f] if
-none exists.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/list.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/list.scrbl
deleted file mode 100644
index b6114e3d5b..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/list.scrbl
+++ /dev/null
@@ -1,207 +0,0 @@
-#lang scribble/doc
-@(require "../common.rkt" (for-label mrlib/hierlist))
-
-@defclass/title[hierarchical-list% editor-canvas% ()]{
-
-Creates a hierarchical-list control.
-
-
-@defconstructor[([parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [style (listof (one-of/c 'no-border 'control-border 'combo 
-                                          'no-hscroll 'no-vscroll 
-                                          'hide-hscroll 'hide-vscroll 
-                                          'auto-vscroll 'auto-hscroll 
-                                          'resize-corner 'deleted 'transparent))
-                        '(no-hscroll)])]{
-
-Creates the control.
-
-If the style @racket['transparent] is passed, then the
-@method[editor-snip% use-style-background] method will be
-called with @racket[#t] when editor snips are created as part of
-the hierarchical list, ensuring that the entire control is 
-transparent.
-
-}
-
-
-@defmethod[(get-selected) (or/c (is-a?/c hierarchical-list-item<%>)
-                                false/c)]{
-
-Returns the currently selected item, if any.}
-
-
-@defmethod[(new-item [mixin ((implementation?/c hierarchical-list-item<%>)
-                             . -> .
-                             (implementation?/c hierarchical-list-item<%>))
-                             (lambda (%) %)])
-           (is-a?/c hierarchical-list-item<%>)]{
-
-Creates and returns a new (empty) item in the list. See
-@racket[hierarchical-list-item<%>] for methods to fill in the item's
-label.
-
-The @racket[mixin] argument is applied to a class implementing
-@racket[hierarchical-list-item<%>], and the resulting class is
-instantiated as the list item.}
-
-
-@defmethod[(set-no-sublists [no-sublists? any/c]) void?]{
-
-Enables/disables sublist mode. When sublists are disabled, space to
-the left of the list items (that would normally align non-list items
-with list items) is omitted. This method can be called only when the
-list is empty.}
-
-
-@defmethod[(new-list [mixin ((implementation?/c hierarchical-list-compound-item<%>)
-                             . -> .
-                             (implementation?/c hierarchical-list-compound-item<%>))
-                             (lambda (%) %)])
-           (is-a?/c hierarchical-list-compound-item<%>)]{
-
-Creates and returns a new (empty) sub-list in the list. See
-@racket[hierarchical-list-compound-item<%>] for methods to fill in the
-item's label and content.
-
-The @racket[mixin] argument is applied to a class implementing
-@racket[hierarchical-list-compound-item<%>], and the resulting class
-is instantiated as the sub-list.}
-
-
-@defmethod[(delete-item [i (is-a?/c hierarchical-list-item<%>)]) void?]{
-
-Deletes immediate item or sub-list @racket[i] from the list.}
-
-
-@defmethod[(get-items) (listof (is-a?/c hierarchical-list-item<%>))]{
-
-Returns a list of all immediate items in the list control.}
-
-
-@defmethod*[([(selectable) boolean?]
-             [(selectable [on? any/c]) void?])]{
-
-Reports whether items are selectable, or enables/disables item
-selection.}
-
-
-@defmethod[(on-select [i (or/c (is-a?/c hierarchical-list-item<%>) false/c)]) any]{
-
-Called for new select of @racket[i], where @racket[i] is @racket[#f]
-if no item is now selected.}
-
-
-@defmethod[(on-click [i (is-a?/c hierarchical-list-item<%>)]) any]{
-
-Called when an item is clicked on, but selection for that item is not
-allowed. Selection can be disallowed by @method[hierarchical-list%
-selectable] or @xmethod[hierarchical-list-item<%>
-set-allow-selection].}
-
-
-@defmethod[(on-double-select [i (is-a?/c hierarchical-list-item<%>)]) any]{
-
-Called for a double-click on @racket[i].}
-
-
-@defmethod[(on-item-opened [i (is-a?/c hierarchical-list-compound-item<%>)]) any]{
-
-Called when the arrow for @racket[i] is turned down.}
-
-
-@defmethod[(on-item-closed [i (is-a?/c hierarchical-list-compound-item<%>)]) any]{
-
-Called when the arrow for @racket[i] is turned up.}
-
-
-@defmethod[(sort [less-than-proc ((is-a?/c hierarchical-list-item<%>)
-                                  (is-a?/c hierarchical-list-item<%>)
-                                  . -> . any/c)]
-                 [recur? any/c #t])
-           void?]{
-
-Sorts items in the list by calling @racket[less-than-proc] on pairs of
-items. If @racket[recur?] is true, items in sub-lists are sorted
-recursively.}
-
-
-@defmethod[(can-do-edit-operation? [op symbol?] [recursive? any/c #t])
-           boolean?]{
-
-Like @xmethod[editor<%> can-do-edit-operation?]. The default
-implementation always returns @racket[#f].}
-
-
-@defmethod[(do-edit-operation [op symbol?] [recursive? any/c #t])
-           void?]{
-
-Like @xmethod[editor<%> do-edit-operation]. The default implementation
-does nothing.}
-
-
-@defmethod*[([(select-prev) void?]
-             [(select-next) void?]
-             [(select-first) void?]
-             [(select-last) void?]
-             [(select-in) void?]
-             [(select-out) void?]
-             [(page-up) void?]
-             [(page-down) void?])]{
-
-Move the selection, scroll, and call @method[hierarchical-list
-on-select].}
-
-
-@defmethod[(select [i (or/c (is-a?/c hierarchical-list-item<%>) false/c)]) void?]{
-
-Moves the selection, scrolls as necessary to show it, and calls
-@method[hierarchical-list% on-select] unless disabled via
-@method[hierarchical-list% on-select-always].
-
-The @method[hierarchical-list% allow-deselect] method controls whether
-@racket[i] is allowed to be @racket[#f] to deselect the currently
-selected item.}
-
-
-@defmethod[(click-select [i (or/c (is-a?/c hierarchical-list-item<%>) false/c)]) void?]{
-
-Like @method[hierarchical-list% select], but always calls
-@method[hierarchical-list% on-select].}
-
-
-@defmethod*[([(on-select-always) boolean?]
-             [(on-select-always [always? any/c]) void?])]{
-
-Gets/sets whether the @method[hierarchical-list% on-select] method is
-called in response to @method[hierarchical-list% select] (as opposed
-to @method[hierarchical-list% click-select]).
-
-The initial mode enables @method[hierarchical-list% on-select] calls
-always.}
-
-
-@defmethod*[([(on-click-always) boolean?]
-             [(on-click-always [always? any/c]) void?])]{
-
-Gets/sets whether the @method[hierarchical-list% on-click] method is
-called in response to all mouse clicks (as opposed to only when
-selected).  @method[hierarchical-list% on-click] is called before
-@method[hierarchical-list% on-select], if it is called (if the click
-results in selction).
-
-This is initially disabled, by default.}
-
-
-@defmethod*[([(allow-deselect) boolean?]
-             [(allow-deselect [allow? any/c]) void?])]{
-
-
-Gets/sets whether the @method[hierarchical-list% on-select] can be
-called with a @racket[#f] argument to deselect the current item
-(leaving none selected).
-
-The initial mode does not allow deselection.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/snips.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/snips.scrbl
deleted file mode 100644
index a237ef7d31..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/hierlist/snips.scrbl
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang scribble/doc
-@(require "../common.rkt" (for-label mrlib/hierlist))
-
-@title{Snips in a @racket[hierarchical-list%] Instance}
-
-The @xmethod[text% find-snip] method of the editor in a
-@racket[hierarchical-list%] return instances of
-@racket[hierarchical-item-snip%] and @racket[hierarchical-list-snip%].
-
-@defclass[hierarchical-item-snip% editor-snip% ()]{
-
- @defmethod[(get-item) (is-a?/c hierarchical-list-item<%>)]{
-
- Returns the @racket[hierarchical-list-item<%>] corresponding to the
- snip.}
-
-}
-
-
-@defclass[hierarchical-list-snip% editor-snip% ()]{
-
- @defmethod[(get-item) (is-a?/c hierarchical-list-compound-item<%>)]{
-
- Returns the @racket[hierarchical-list-compound-item<%>] corresponding to the
- snip.}
-
- @defmethod[(get-content-buffer) (is-a?/c text%)]{
-
- Returns the text% that contains the sub-item snips.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/image-core.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/image-core.scrbl
deleted file mode 100644
index 9093612448..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/image-core.scrbl
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label mrlib/image-core))
-
-@title{Image Core}
-
-@defmodule[mrlib/image-core]
-
-This library is the core part of the @racketmodname[2htdp/image #:indirect] library that DrRacket
-links into the namespace of all languages that it runs. This ensures that minimal
-support for these images are the same in all languages, specifically including
-support for printing the images and constructing the core data structures making
-up an image.
-
-@defproc[(render-image [image image?]
-                       [dc (is-a?/c dc<%>)]
-                       [dx real?]
-                       [dy real?])
-         void?]{
-  Draws @racket[image] in @racket[dc] at the position (@racket[dx],@racket[dy]).
-}
-
-@defproc[(image? [v any/c]) boolean?]{
- Recognizes the images that library handles.
-}
-
-@defproc[(un/cache-image [image image?] [b any/c]) image?]{
-  Returns an image that either caches its drawing in the 
-  snip @method[snip% draw] method or doesn't, depending on @racket[b].
-  
-  Not all @racket[image?] values have special caching capabilities;
-  in those cases, this returns a copy of the value if it is a 
-  @racket[snip%]; otherwise it returns the value itself (if it 
-  isn't a @racket[snip%]).
-}
-
-@defproc[(compute-image-cache [image image?]) void?]{
-  When the image has a bitmap-cache (which it does by default,
-  although @racket[un/cache-image] can disable it), this function
-  fills in the bitmap, doing the work to draw image into the bitmap.
-  
-  Ordinarily, the image's bitmap cache is computed the first time
-  the image is actually rendered.
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/include-bitmap.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/include-bitmap.scrbl
deleted file mode 100644
index 365024ff70..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/include-bitmap.scrbl
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mrlib/include-bitmap scheme/runtime-path scheme/include))
-
-@title{Include Bitmap}
-
-@defmodule[mrlib/include-bitmap]{The @racket[include-bitmap] form
-takes a filename containing a bitmap and ``inlines'' the bitmap into
-the program.}
-
-Historically, the advantage of inlining the bitmap is that a
-stand-alone executable can be created that contains the bitmap and
-does not refer to the original image file. The
-@racket[define-runtime-path] form, however, now provides a better
-alternative.
-
-@defform*[[(include-bitmap path-spec)
-           (include-bitmap path-spec type-expr)]]{
-
-
-The @racket[path-spec] is the same as for @racket[include] form. The
-@racket[type-expr] should produce @racket['unknown],
-@racket['unknown/mask], etc., as for @racket[bitmap%], and the default
-is @racket['unknown/mask].}
-
-
-@defform*[[(include-bitmap/relative-to source path-spec)
-           (include-bitmap/relative-to source path-spec [type-expr])]]{
-
-Analogous to @racket[include-at/relative-to], though only a source is
-needed (no context).}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/info.rkt b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/info.rkt
deleted file mode 100644
index f26edf95d0..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("mrlib.scrbl" (multi-page) (gui-library))))
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/interactive-value-port.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/interactive-value-port.scrbl
deleted file mode 100644
index 768718e1d9..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/interactive-value-port.scrbl
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label mrlib/interactive-value-port scheme/pretty))
-
-@title{Interactive Value Port}
-
-@defmodule[mrlib/interactive-value-port]
-
-
-@defproc[(set-interactive-display-handler [port output-port?]) void?]{
-
-Sets @racket[port]'s display handler (via
-@racket[port-display-handler]) so that when it encounters these
-values:
-
-@itemize[
- 
- @item{exact, real, non-integral numbers}
-
- @item{syntax objects}
-
-]
-
-it uses @racket[write-special] to send snips to the port,
-instead of those values. Otherwise, it behaves like the
-default handler.
-
-To show values embedded in lists and other compound object, it uses
-@racket[pretty-print].}
-
-
-@defproc[(set-interactive-write-handler [port output-port?]) void?]{
-
-Like @racket[set-interactive-display-handler], but sets the
-@racket[port-write-handler].}
-
-
-@defproc[(set-interactive-print-handler [port output-port?]) void?]{
-
-Like @racket[set-interactive-display-handler], but sets the
-@racket[port-print-handler].}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/matrix-snip.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/matrix-snip.scrbl
deleted file mode 100644
index 586e9a0058..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/matrix-snip.scrbl
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mrlib/matrix-snip
-                     (only-in mrlib/cache-image-snip
-                              cache-image-snip%)))
-
-@title{Matrix Snip}
-
-@defmodule[mrlib/matrix-snip]
-
-The @racket[mrlib/matrix-snip] library implements a matrix value that displays
-in 2-D graphical form.
-
-@defclass[visible-matrix% cache-image-snip% ()]{
-
-A 2-D graphical matrix.}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/mrlib.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/mrlib.scrbl
deleted file mode 100644
index 4f69b6e95b..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/mrlib.scrbl
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{MrLib: Extra GUI Libraries}
-
-@table-of-contents[]
-
-@include-section["aligned-pasteboard/aligned-pasteboard.scrbl"]
-@include-section["bitmap-label.scrbl"]
-@include-section["cache-image-snip.scrbl"]
-@include-section["close-icon.scrbl"]
-@include-section["gif.scrbl"]
-@include-section["graph/graph.scrbl"]
-@include-section["hierlist/hierlist.scrbl"]
-@include-section["include-bitmap.scrbl"]
-@include-section["interactive-value-port.scrbl"]
-@include-section["name-message.scrbl"]
-@include-section["path-dialog.scrbl"]
-@include-section["plot.scrbl"]
-@include-section["switchable-button.scrbl"]
-@include-section["image-core.scrbl"]
-@include-section["matrix-snip.scrbl"]
-@include-section["tex-table.scrbl"]
-@include-section["terminal.scrbl"]
-
-@section{Acknowledgments}
-
-Contributors to this set of libraries include Mike MacHenry.
-
-@index-section[]
-
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/name-message.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/name-message.scrbl
deleted file mode 100644
index f68c5de492..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/name-message.scrbl
+++ /dev/null
@@ -1,161 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mrlib/name-message))
-
-@title{Name Message}
-
-@defmodule[mrlib/name-message]
-
-@defclass[name-message% canvas% ()]{
-
-A @racket[name-message%] control displays a filename that the user can
-click to show the filename's path and select one of the enclosing
-directories. Override the @method[name-message% on-choose-directory]
-method to handle the user's selection.
-
-
-@defconstructor/auto-super[()]{
-
-Passes all arguments to @racket[super-init].}
-
-
-@defmethod[(on-choose-directory [dir path-string?])
-           void?]{
-
-Called when one of the popup menu items is chosen. The argument is a
-represents the selected directory.}
-
-
-@defmethod[#:mode override 
-           (on-event [event (is-a?/c mouse-event%)])
-           void?]{
-
-Handles the click by popping up a menu or message.}
-
-
-@defmethod[#:mode override 
-           (on-paint)
-           void?]{
-
-Draws the control's current message.}
-
-
-@defmethod[(set-hidden? [hidden? any/c])
-           void?]{
-Calling this method with @racket[#f] causes the name message
-to become invisible and to stop responding to mouse movements.
-
-Calling it with a true value restores its visibility and
-makes it respond to mouse movements again.}
-
-
-@defmethod[(set-message [file-name? any/c]
-                        [msg (if filename? path-string? string?)])
-           void?]{
-
-Sets the label for the control.
-
-If @racket[file-name?] is @racket[#t], @racket[msg] is treated like a
- pathname, and a click on the name-message control creates a popup
- menu to open a get-file dialog.
-
-If @racket[file-name?] is @racket[#f], @racket[msg] is treated as a
-label string. Clicking on the name-message control pops up a dialog
-saying that there is no file name until the file is saved.}
-
-@defmethod[(set-short-title [short-title? boolean?]) void?]{
-  Sets the @racket[short-title?] flag. The flag defaults to @racket[#f].
-  
-  If the flag is @racket[#t], then
-  the label for the control is simply the string @racket["/"]. Otherwise,
-  the label is determined by
-  the @method[name-message% set-message].
-}
-
-@defmethod[(fill-popup [menu (is-a?/c popup-menu%)]
-                       [reset (-> void?)])
-           any]{
-  This method is called when the user clicks in the name message.
-  Override it to fill in the menu items for the popup menu @racket[menu].
-}
-
-@defmethod[(get-background-color) (or/c #f (is-a/c color%) string?)]{
-
-The result of this method is used for the background color
-when redrawing the name message. If it is @racket[#f], the
-OS's default panel background is used.
-
-}
-
-@defmethod[(set-allow-shrinking [width (or/c #f number?)]) void?]{
-
-When this method receives a number, the name-message will
-then shrink (the number indicates the minimum width the name
-message will have).
-
-If it receives false, the name message will not shrink and
-its minimum width will be the size required to display its
-current label.
-
-By default, the name-message does not allow shrinking.
-}
-
-}
-
-@; ----------------------------------------------------------------------
-
-
-@defproc[(calc-button-min-sizes [dc (is-a?/c dc<%>)]
-                                [str string?]
-                                [font (or/c #f (is-a?/c font%)) #f])
-         (values real? real?)]{
-
-Calculates the minimum width and height of a button label (when drawn
-with @racket[draw-button-label]). Returns two values: the width
-and height. The @racket[dc] argument is used for sizing.}
-
-
-@defproc[(draw-button-label [dc (is-a?/c dc<%>)]
-                            [str string?]
-                            [dx real?]
-                            [dy real?]
-                            [width real?]
-                            [height real?]
-                            [mouse-over? boolean?]
-                            [grabbed? boolean?]
-                            [font (is-a?/c font%)]
-                            [background (or/c (is-a?/c color%) string? #f)])
-         void?]{
-
-Draws a button label like the one for the @onscreen{(define ...)} and
-filename buttons in the top-left corner of the DrRacket frame. Use
-this function to draw similar buttons.
-
-The basic idea is to create a canvas object whose on-paint method is
-overridden to call this function.  The @racket[dc] argument should be
-canvas's drawing context, and @racket[str] should be the string to
-display on the button.  The @racket[width] and @racket[height]
-arguments should be the width and height of the button, and the
-@racket[dx] and @racket[dy] arguments specify an offset into
-@racket[dc] for the button. The @racket[mouse-over?] argument should
-be true when the mouse is over the button, and the @racket[grabbed?]
-argument should be true when the button has been pressed. The
-@racket[font] and @racket[background] arguments supply the font to use
-in drawing (possibly @racket[normal-control-font]) and the background
-color to paint (if any).
-
-See @racket[calc-button-min-sizes] for help calculating the min sizes
-of the button.}
-
-@defproc[(pad-xywh [tx number?]
-                   [ty number?]
-                   [tw (>=/c 0)]
-                   [th (>=/c 0)])
-         (values number? number? (>=/c 0) (>=/c 0))]{
-  Returns spacing information describing how
-  @racket[draw-button-label] draws. The inputs are 
-  the x and y coordinates where the text should appear
-  and the width and height of the text, and the results
-  are the x and y coordinates where the shape should be
-  drawn and the width and height of the overall shape.
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/path-dialog.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/path-dialog.scrbl
deleted file mode 100644
index 2ebd2fd296..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/path-dialog.scrbl
+++ /dev/null
@@ -1,127 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label mrlib/path-dialog))
-
-@title{Path Dialog}
-
-@defmodule[mrlib/path-dialog]
-
-@defclass[path-dialog% dialog% ()]{
-
-The @racket[path-dialog%] class implements a platform-independent
-file/directory dialog.  The dialog is similar in functionality to the
-@racket[get-file], @racket[put-file], @racket[get-directory], and
-@racket[get-file-list] procedures, but considerable extra functionality
-is available through the @racket[path-dialog%] class.
-
-
-@defconstructor[([label (or/c label-string? false/c) #f]
-                 [message (or/c label-string? false/c) #f]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) false/c) #f]
-                 [directory (or/c path-string? false/c) #f]
-                 [filename (or/c path-string? false/c) #f]
-                 [put? any/c #f]
-                 [dir? any/c #f]
-                 [existing? any/c (not put?)]
-                 [new? any/c #f]
-                 [multi? any/c #f]
-                 [can-mkdir? any/c put?]
-                 [filters (or/c (listof (list string? string?)) 
-                                (one-of/c #f #t))
-                          #t]
-                 [show-file? (or/c (path? . -> . any) false/c) #f]
-                 [show-dir? (or/c (path? . -> . any) false/c) #f]
-                 [ok? (or/c (path? . -> . any) false/c) #f]
-                 [guard (or/c (path? . -> . any) false/c) #f])]{
-
-The @racket[label] argument is the dialog's title string. If
-@racket[label] is @racket[#f], the default is based on other field
-values.
-
-The @racket[message] argument is a prompt message to show at the top
-of the dialog.  If it is @racket[#f], no prompt line.
-
-The @racket[parent] argument is the parent frame or dialog, if any,
-for this dialog.
-
-The @racket[directory] argument specifies the dialog's initial
-directory.  If it is @racket[#f], the initial directory is the last
-directory that was used by the user (or the current directory on first
-use).
-
-The @racket[filename] argument provides an initial filename text, if
-any.
-
-If @racket[put?] is true, the dialog operates in choose-file-to-write
-mode (and warn the user if choosing an existing name).
-
-If @racket[dir?] is true, the dialog operates in directory-choice
-mode.
-
-If @racket[existing?] is true, the use must choose an existing file.
-
-If @racket[new?] is true, the user must choose a non-existant
-path. Providing both @racket[new?] and @racket[existing?] as true
-triggers an exception.
-
-If @racket[multi?] is true, the dialog allows selection of multiple
-paths.
-
-If @racket[can-mkdir?] is true, the dialog includes a button for the
-user to create a new directory.
-
-The @racket[filters] argument is one of:
-
-@itemize[
-
-   @item{@racket[(list (list _filter-name _filter-glob) ...)] --- a
-     list of pattern names (e.g., @racket["Racket Files"]) and glob
-     patterns (e.g., @racket["*.rkt;*.scrbl"]).  Any list, including an
-     empty list, enables a filter box for the user to enter glob
-     patterns, and the given list of choices is available in a
-     combo-box drop-down menu.  Glob patterns are the usual Unix ones
-     (see @racket[glob->regexp]), and a semicolon can be used to allow
-     multiple patterns.}
-
-   @item{@racket[#f] --- no patterns and no filter input box.}
-
-   @item{@racket[#t] --- use a generic @racket["All"] filter, which is
-     @racket["*.*"] on Windows and @racket["*"] on other
-     platforms.}
-
-]
-
-The @racket[show-file?] predicate is used to filter file paths that
-are shown in the dialog.  The predicate is applied to the file name as
-a string while the current-directory parameter is set. This predicate
-is intended to be a lightweight filter for choosing which names to
-display.
-
-The @racket[show-dir?] predicate is similar, but for directories
-instead of files.
-
-The @racket[ok?] predicate is used in a similar fashion to the
-@racket[show-file?] and @racket[show-dir?] predicate, but it is used
-to determine whether the @onscreen{OK} button should be enabled when a
-file or directory is selected (so it need not be as lightweight as the
-other predicates).
-
-The @racket[guard] procedure is a generic verifier for the dialog's
-final result, as produced by the @method[path-dialog% run] method.  It
-receives the result that is about to be returned (which can be a list
-in a multi-selection dialog), and can return a different value (any
-value) instead. If it throws an exception, an error dialog is shown,
-and the dialog interaction continues (so it can be used to verify
-results without dismissing the dialog). This procedure can also raise
-@|void-const|, in which case the dialog remains without an error
-message.}
-
-
-@defmethod[(run) any/c]{
-
-Shows the dialog and returns the selected result. If a @racket[guard]
-procedure is not supplied when the dialog is created, then the result
-is either a path or a list of paths (and the latter only when
-@racket[_multi?] is true when the dialog is created). If a
-@racket[_guard] procedure is supplied, its result determines the result
-of this method.}}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/plot.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/plot.scrbl
deleted file mode 100644
index 03e2b09543..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/plot.scrbl
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label mrlib/plot))
-
-@title{Plot}
-
-@defmodule[mrlib/plot]{The @racketmodname[mrlib/plot] library provides
-a simple tool for plotting data values to a device context.}
-
-@bold{This is an old library, kept only for compatibility.} You will
-undoubtedly want to use the @racketmodname[plot #:indirect] library instead, which offers
-many more features and is actively maintained.
-
-@defstruct[data-set ([points (listof (is-a?/c point%))]
-                     [connected? any/c]
-                     [pen (is-a?/c pen%)]
-                     [min-x real?]
-                     [max-x real?]
-                     [min-y real?]
-                     [max-y real?])]{
-
-The @racket[points] field contains the data values to plot, and
-@racket[connected?] indicates whether the points are connected by a
-line. The @racket[pen] field provides a pen for plotting
-points/lines. The remaining fields determine the plotting area within
-a drawing context.}
-
-@defstruct[plot-setup ([axis-label-font (is-a?/c font%)]
-                       [axis-number-font (is-a?/c font%)]
-                       [axis-pen (is-a?/c pen)]
-                       [grid? any/c]
-                       [grid-pen (is-a?/c pen)]
-                       [x-axis-marking (listof real?)]
-                       [y-axis-marking (listof real?)]
-                       [x-axis-label string?]
-                       [y-axis-label string?])]{
-
-Configures a plot. The @racket[grid?] field determines whether to draw
-a grid at axis markings, and the @racket[x-axis-marking] and
-@racket[y-axis-marking] lists supply locations for marks on each
-axis. The other fields are self-explanatory.}
-
-@defproc[(plot [dc (is-a?/c dc<%>)]
-               [data (listof data-set?)]
-               [setup plot-setup?])
-         void?]{
-
-Draws the @racket[data-set]s in @racket[data] into the given
-@racket[dc]. Uses drawing-context coordinates in @racket[data-set]s
-that will accommodate all of the data sets.}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/switchable-button.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/switchable-button.scrbl
deleted file mode 100644
index 093ec599a6..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/switchable-button.scrbl
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label mrlib/switchable-button framework))
-
-@title{Switchable Button}
-
-@defmodule[mrlib/switchable-button]
-
-@defclass[switchable-button% canvas% ()]{
-  
-  A @racket[switchable-button%] control displays
-  and icon and a string label. It toggles between
-  display of just the icon and a display with the 
-  label and the icon side-by-side. 
-  
-  The @racket[panel:discrete-sizes-mixin] explicitly
-  uses @racket[switchable-button%]s via their
-  @method[switchable-button% get-small-width],
-  @method[switchable-button% get-large-width], and
-  @method[switchable-button% get-without-label-small-width] methods.
-  See @racket[panel:discrete-sizes-mixin] for more details.
-  
-  @defconstructor/auto-super[([label (or/c string? (is-a?/c bitmap%) #f)]
-                              [bitmap (is-a?/c bitmap%)]
-                              [callback (-> (is-a?/c switchable-button%) any/c)]
-                              [alternate-bitmap (is-a?/c bitmap%) bitmap]
-                              [vertical-tight? boolean? #f]
-                              [min-width-includes-label? boolean? #f])]{
-    The @racket[callback] is called when the button
-    is pressed. The @racket[label] and @racket[bitmap] are
-    used as discussed above.
-    
-    If @racket[alternate-bitmap] is supplied, then it is used
-    when the label is not visible (via a call to @method[switchable-button% set-label-visible]).
-    If it is not supplied, both modes show @racket[bitmap].
-    
-    If the @racket[vertical-tight?] argument is @racket[#t], then the button takes up
-    as little as possible vertical space.
-    
-    If the @racket[min-width-includes-label?] is @racket[#t], then the minimum
-    width includes both the bitmap and the label. Otherwise, it includes
-    only the bitmap.
-  }
-  
-  @defmethod[(set-label-visible [visible? boolean?]) void?]{
-    Sets the visibility of the string part of the label.
-  }
-  
-  @defmethod[(command) void?]{
-    Calls the button's callback function.
-  }
-  
-  @defmethod[(get-button-label) string?]{
-    Returns the label of this button.
-  }
-  
-  @defmethod[(get-large-width) exact-nonnegative-integer?]{
-     Returns the width of the button when it would show both
-     the label and the bitmap and when it is in label-visible
-     mode (i.e., when @racket[set-label-visible] has been called
-     with @racket[#t]).
-  }
-
-  @defmethod[(get-small-width) exact-nonnegative-integer?]{
-     Returns the width of the button when it would show both
-     just the bitmap (not the alternate bitmap),
-     and when it is in label-visible
-     mode (i.e., when @racket[set-label-visible] has been called
-     with @racket[#t]).
-  }
-  
-  @defmethod[(get-without-label-small-width) exact-nonnegative-integer?]{
-     Returns the width of the button when
-     it is not in label-visible
-     mode (i.e., when @racket[set-label-visible] has been called
-     with @racket[#f]).
-  }
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/terminal.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/terminal.scrbl
deleted file mode 100644
index b05eb5051f..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/terminal.scrbl
+++ /dev/null
@@ -1,109 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" 
-          (for-label mrlib/terminal string-constants))
-
-@title{Terminal Window}
-
-@defmodule[mrlib/terminal]{The @racketmodname[mrlib/terminal] library provides
-a simple GUI wrapper around functions that normally would run
-in command-line scripts.}
-
-@defproc[(in-terminal [doit (-> eventspace? 
-                                (or/c (is-a?/c top-level-window<%>) #f) 
-                                void?)]
-                      [#:container container (or/c #f (is-a?/c area-container<%>)) #f]
-                      [#:cleanup-thunk cleanup-thunk (-> void?) void]
-                      [#:title title string? "mrlib/terminal"]
-                      [#:abort-label abort-label string? (string-constant plt-installer-abort-installation)]
-                      [#:aborted-message aborted-message string? (string-constant plt-installer-aborted)]
-                      [#:canvas-min-width canvas-min-width (or/c #f (integer-in 0 10000)) #f]
-                      [#:canvas-min-height canvas-min-height (or/c #f (integer-in 0 10000)) #f]
-                      [#:close-button? close-button? boolean? #t]
-                      [#:close-label close-label string? (string-constant close)]
-                      [#:close-callback close-callback (-> any) void])
-         (is-a?/c terminal<%>)]{
-                
-  Creates a GUI, sets up the current error and output ports to
-  print into the GUI's content,
-  and calls @racket[doit] in a separate thread under a separate
-  custodian. The @racket[exit-handler] is set to a function that
-  shuts down the new custodian.
-
-  The GUI is created in a new @racket[frame%], unless
-  @racket[container] is not @racket[#f], in which case the GUI is
-  created as a new panel inside @racket[container]. If a frame is
-  created, it is provided as the second argument to @racket[doit],
-  otherwise the second argument to @racket[doit] is @racket[#f].
-  If a frame is created, its title is @racket[title].
-
-  The result of @racket[in-terminal] is a @racket[terminal<%>] object
-  that reports on the state of the terminal; this result is produced
-  just after @racket[doit] is started.
-
-  The @racket[cleanup-thunk] is called on a queued callback to the
-  eventspace active when @racket[in-terminal] is invoked
-  after @racket[doit] completes.
-  
-  In addition to the I/O generated by @racket[doit], the generated GUI
-  contains two buttons: the abort button (with label
-  @racket[abort-label]) and the close button (with label
-  @racket[close-label]). The close button is present only
-  if @racket[close-button?] is @racket[#t].
- 
-  When the abort button is pushed,
-  the newly created custodian is shut down and the
-  @racket[aborted-message] is printed in the dialog. The close button
-  becomes active when @racket[doit] returns or when the thread running
-  it is killed (via a custodian shut down, typically).
-
-  If @racket[container] is @racket[#f], then the close button closes
-  the frame; otherwise, the close button causes the container created
-  for the terminal's GUI to be removed from its parent.
-  
-  The @racket[canvas-min-width] and @racket[canvas-min-height] are passed
-  to the @racket[_min-width] and @racket[_min-height] initialization arguments
-  of the @racket[editor-canvas%] object that holds the output generated
-  by @racket[doit].
-  
-  The value of @racket[on-terminal-run] is invoked after @racket[doit]
-  returns, but not if it is aborted or an exception is raised.
-
-  The @racket[close-callback] function is called after the terminal
-  frame is closed or container is removed.
-
-  @history[#:changed "1.4" @elem{Added the @racket[#:close-callback] argument.}]}
-
-@defparam[on-terminal-run run (-> void?)]{
-  Invoked by @racket[in-terminal].                                          
-}
-
-@definterface[terminal<%> ()]{
-
-The interface of a terminal status and control object produced by
-@racket[in-terminal].
-
-@defmethod[(is-closed?) boolean?]{
-
-Returns @racket[#t] if the terminal GUI has been closed, @racket[#f]
-otherwise.}
-
-@defmethod[(close) void?]{
-
-Closes the terminal GUI. Call this method only if @method[terminal<%>
-can-close?]  returns @racket[#t].}
-
-@defmethod[(can-close?) boolean?]{
-
-Reports whether the terminal GUI can be closed, because the terminal
-process is complete (or, equivalently, whether the close button is
-enabled).}
-
-@defmethod[(can-close-evt) evt?]{
-
-Returns a synchronizable event that becomes ready for synchronization
-when the terminal GUI can be closed.}
-
-@defmethod[(get-button-panel) (is-a?/c horizontal-panel%)]{
-
-Returns a panel that contains the abort and close buttons.}
-}
diff --git a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/tex-table.scrbl b/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/tex-table.scrbl
deleted file mode 100644
index 783c67bed1..0000000000
--- a/pkgs/gui-pkgs/gui-doc/mrlib/scribblings/tex-table.scrbl
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label mrlib/switchable-button))
-
-@title{TeX Table}
-
-@defmodule[mrlib/tex-table]
-
-@defthing[tex-shortcut-table
-          (listof
-            (list/c string? 
-                    (lambda (x) 
-                      (and (string? x)
-                           (= (string-length x)
-                              1)))))]{
-
-  This is an association list mapping the shortcut strings that
-  DrRacket uses with its @tt{control-\} (or @tt{command-\}) strings to
-  their corresponding unicode characters. For example, it contains
-  this mapping:
-  @racketblock[
-    ("alpha" "α")
-  ]
-  as well as many more.
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/application.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/application.scrbl
deleted file mode 100644
index cd48f3c3c6..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/application.scrbl
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Application}
-
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^application:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/autosave.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/autosave.scrbl
deleted file mode 100644
index 47bdd51012..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/autosave.scrbl
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Autosave}
-
-@definterface[autosave:autosavable<%> ()]{
-  Classes that implement this interface can be autosaved.
-  @defmethod*[(((do-autosave) void?))]{
-    This method is called when the object is registered to be
-    autosaved (see @racket[autosave:register]).
-  }
-}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^autosave:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/canvas.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/canvas.scrbl
deleted file mode 100644
index fb99d1ccdb..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/canvas.scrbl
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Canvas}
-
-@definterface[canvas:basic<%> (editor-canvas%)]{
-
-}
-@defmixin[canvas:basic-mixin (editor-canvas%) (canvas:basic<%>)]{
-}
-@definterface[canvas:color<%> (canvas:basic<%>)]{
-  @index{background color}
-  Mixins that implement this interface initialize the
-  background color of the canvas to the value of the
-  @index{'framework:basic-canvas-background}
-  @racket['framework:basic-canvas-background] preference.
-  Adds a callback so that when that preference is modified,
-  the background color changes.
-
-}
-@defmixin[canvas:color-mixin (canvas:basic<%>) (canvas:color<%>)]{
-}
-@definterface[canvas:delegate<%> (canvas:basic<%>)]{
-  This class is part of the delegate window implementation. 
-}
-@defmixin[canvas:delegate-mixin (canvas:basic<%>) (canvas:delegate<%>)]{
-  Provides an implementation of
-  @racket[canvas:delegate<%>].
-  @defmethod*[#:mode override (((on-superwindow-show (shown? boolean?)) void?))]{
-
-    Notifies the delegate window when the original window is
-    visible. When invisible, the blue highlighting is erased.
-  }
-}
-@definterface[canvas:info<%> (canvas:basic<%>)]{
-
-}
-@defmixin[canvas:info-mixin (canvas:basic<%>) (canvas:info<%>)]{
-
-  @defmethod*[#:mode override (((on-focus) void?))]{
-
-    sets the canvas that the frame displays info about.
-  }
-  @defmethod*[#:mode override (((set-editor) void?))]{
-
-    Calls 
-    @method[frame:info<%> update-info]
-    to update the frame's info panel.
-  }
-}
-@definterface[canvas:wide-snip<%> (canvas:basic<%>)]{
-  Any
-  @racket[canvas%]
-  that matches this interface will automatically
-  resize selected snips when its size changes. Use
-  @method[canvas:wide-snip<%> add-tall-snip]
-  and
-  @method[canvas:wide-snip<%> add-wide-snip]
-  to specify which snips should be resized.
-  @defmethod*[(((recalc-snips) void?))]{
-    Recalculates the sizes of the wide snips.
-
-  }
-  @defmethod*[(((add-wide-snip (snip (is-a?/c snip%))) void?))]{
-    Snips passed to this method will be resized when the canvas's size
-    changes. Their width will be set so they take up all of the space
-    from their lefts to the right edge of the canvas.
-  }
-  @defmethod*[(((add-tall-snip (snip (is-a?/c snip%))) void?))]{
-    Snips passed to this method will be resized when the canvas's size
-    changes. Their height will be set so they take up all of the space
-    from their tops to the bottom of the canvas.
-  }
-}
-@defmixin[canvas:wide-snip-mixin (canvas:basic<%>) (canvas:wide-snip<%>)]{
-  This canvas maintains a list of wide and tall snips and adjusts their
-  heights and widths when the canvas's size changes.
-
-  The result of this mixin uses the same initialization arguments as the
-  mixin's argument.
-  @defmethod*[#:mode override (((on-size (width dimension-integer?) (height dimension-integer?)) void?))]{
-
-    Adjusts the sizes of the marked snips.
-
-    See
-    @method[canvas:wide-snip<%> add-wide-snip]
-    and 
-    @method[canvas:wide-snip<%> add-tall-snip].
-
-  }
-}
-@defclass[canvas:basic% (canvas:basic-mixin editor-canvas%) ()]{}
-@defclass[canvas:color% (canvas:color-mixin canvas:basic%) ()]{}
-@defclass[canvas:info% (canvas:info-mixin canvas:basic%) ()]{}
-@defclass[canvas:delegate% (canvas:delegate-mixin canvas:basic%) ()]{}
-@defclass[canvas:wide-snip% (canvas:wide-snip-mixin canvas:basic%) ()]{}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^canvas:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/color-model.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/color-model.scrbl
deleted file mode 100644
index bd3624f487..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/color-model.scrbl
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Color Model}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^color-model:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/color-prefs.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/color-prefs.scrbl
deleted file mode 100644
index bec1a65f9b..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/color-prefs.scrbl
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Color Prefs}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^color-prefs:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/color.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/color.scrbl
deleted file mode 100644
index cb8fa4efce..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/color.scrbl
+++ /dev/null
@@ -1,389 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework scheme/gui syntax-color/lexer-contract))
-@title{Color}
-
-@definterface[color:text<%> (text:basic<%>)]{
-  This interface describes how coloring is stopped and started for text
-  that knows how to color itself.  It also describes how to query the
-  lexical and s-expression structure of the text.
-  @defmethod[(start-colorer (token-sym->style (-> symbol? string?)) 
-                            (get-token (or/c (-> input-port? 
-                                                 (values any/c 
-                                                         symbol? 
-                                                         (or/c symbol? #f)
-                                                         (or/c exact-positive-integer? #f)
-                                                         (or/c exact-positive-integer? #f)))
-                                             (-> input-port? 
-                                                 exact-nonnegative-integer?
-                                                 (not/c dont-stop?)
-                                                 (values any/c 
-                                                         symbol? 
-                                                         (or/c symbol? #f)
-                                                         (or/c exact-positive-integer? #f)
-                                                         (or/c exact-positive-integer? #f)
-                                                         exact-nonnegative-integer?
-                                                         any/c))))
-                            (pairs (listof (list/c symbol? symbol?))))
-             void?]{
-    Starts tokenizing the buffer for coloring and parenthesis matching.
-
-    The @racket[token-sym->style] argument will be passed the first return
-    symbol from @racket[get-token], and it should return the style-name that
-    the token should be colored.
-
-    The @racket[get-token] argument takes an input port and optionally an
-    offset and mode value.  When it accepts just an input port,
-    @racket[get-token] returns the next token as 5 values:
-
-    @itemize[
-    @item{This value is intended to represent the textual
-      component of the token. If the second value returned by
-      @racket[get-token] is @racket['symbol] and this value is a string
-      then the value is used to differentiate between symbols and keywords
-      for the purpose of coloring and formatting, configurable from DrRacket's preference's editing menu.}
-    @item{A symbol describing the type of the token.  This symbol is
-      transformed into a style-name via the @racket[token-sym->style] argument.
-      The symbols @racket['white-space] and @racket['comment] have special
-      meaning and should always be returned for white space and comment tokens
-      respectively.  The symbol @racket['no-color] can be used to indicate that
-      although the token is not white space, it should not be colored.  The
-      symbol @racket['eof] must be used to indicate when all the tokens have
-      been consumed.}
-    @item{A symbol indicating how the token should be treated by the paren
-      matcher or @racket[#f].  This symbol should be in the pairs argument.}
-    @item{The starting position of the token (or @racket[#f] if eof); this
-          number is relative to the third result of @racket[get-port-location]
-          when applied to the input port that gets passed to @racket[get-token].}
-    @item{The ending position of the token (or @racket[#f] if eof); this 
-          is also relative to the port's location, just like the previous value.}]
-
-    When @racket[get-token] accepts an offset and mode value in addition to an
-    input port, it must also return two extra results.
-    The offset given to @racket[get-token] can be added
-    to the position of the input port to obtain absolute coordinates within a
-    text stream. The extra two results are
-    @itemize[@item{a new mode; 
-    The mode argument allows @racket[get-token] to communicate
-    information from earlier parsing to later.  When @racket[get-token] is
-    called for the beginning on a stream, the mode argument is @racket[#f];
-    thereafter, the mode returned for the previous token is provided to
-    @racket[get-token] for the next token. 
-    
-    If the mode result is a @racket[dont-stop] struct, then the value inside
-    the struct is considered the new mode, and the colorer is guaranteed
-    not to be interrupted until at least the next call to this tokenizing
-    function that does not return a @racket[dont-stop] struct (unless, of course,
-    it returns an eof token, in which case the new mode result is ignored).
-    This is useful, for example, when a lexer has to read ahead in the buffer
-    to decide on the tokens at this point; then that read-ahead will be 
-    inconsistent if an edit happens; returning a @racket[dont-stop]
-    struct ensures that no changes to the buffer happen.
-    
-    The mode should not be a mutable
-    value; if part of the stream is re-tokenized, the mode saved from the
-    immediately preceding token is given again to the @racket[get-token]
-    function.}
-    @item{a backup distance;
-    The backup distance returned by @racket[get-token] indicates the
-    maximum number of characters to back up (counting from the start of the
-    token) and for re-parsing after a change to the editor within the token's
-    region.}]
-
-    The @racket[get-token] function must obey the following invariants:
-    @itemize[
-    @item{Every position in the buffer must be accounted for in exactly one
-      token, and every token must have a non-zero width.}
-    @item{The token returned by @racket[get-token] must rely only on the
-      contents of the input port argument plus the mode argument. This
-      constraint means that the tokenization of some part of the input cannot
-      depend on earlier parts of the input except through the mode (and
-      implicitly through the starting positions for tokens).}
-    @item{A change to the stream must not change the tokenization of the
-      stream prior to the token immediately preceding the change plus the
-      backup distance.  In the following example, this invariant does not hold
-      for a zero backup distance: If the buffer contains
-      @verbatim[#:indent 2]{" 1 2 3}
-      and the tokenizer treats the unmatched " as its own token (a string error
-      token), and separately tokenizes the 1 2 and 3, an edit to make the
-      buffer look like
-      @verbatim[#:indent 2]{" 1 2 3"}
-      would result in a single string token modifying previous tokens.  To
-      handle these situations, @racket[get-token] can treat the first line as a
-      single token, or it can precisely track backup distances.}]
-
-    The @racket[pairs] argument is a list of different kinds of matching
-    parens.  The second value returned by @racket[get-token] is compared to
-    this list to see how the paren matcher should treat the token.  An example:
-    Suppose pairs is @racket['((|(| |)|) (|[| |]|) (begin end))].  This means
-    that there are three kinds of parens.  Any token which has @racket['begin]
-    as its second return value will act as an open for matching tokens with
-    @racket['end].  Similarly any token with @racket['|]|] will act as a
-    closing match for tokens with @racket['|[|].  When trying to correct a
-    mismatched closing parenthesis, each closing symbol in pairs will be
-    converted to a string and tried as a closing parenthesis.
-    
-    The @racket[get-token] function is usually be implemented with a lexer using the 
-    @racket[parser-tools/lex] library, but can be implemented directly.
-    For example, here is a lexer that colors alternating characters as if they
-    were symbols and strings:
-    @racketblock[(λ (port offset mode)
-                   (define-values (line col pos) (port-next-location port))
-                   (define c (read-char port))
-                   (cond
-                     [(eof-object? c)
-                      (values c 'eof #f #f #f 0 mode)]
-                     [else
-                      (values (string c)
-                              (if mode 'symbol 'string)
-                              #f
-                              (+ pos)
-                              (+ pos 1)
-                              0
-                              (not mode))]))]
-    
-  }
-  @defmethod[(stop-colorer [clear-colors? boolean? #t]) void?]{
-    Stops coloring and paren matching the buffer.
-
-    If @racket[clear-colors?] is true all the text in the buffer will have its
-    style set to Standard.
-  }
-  @defmethod[(force-stop-colorer [stop? boolean?]) void?]{
-    Causes the entire tokenizing/coloring system to become inactive.
-    Intended for debugging purposes only.
-
-    @racket[stop?] determines whether the system is being forced to stop or
-    allowed to wake back up.
-  }
-  @defmethod[(is-stopped?) boolean?]{
-    Indicates if the colorer for this editor has been stopped, or not.
-
-  }
-  @defmethod[(is-frozen?) boolean?]{
-    Indicates if this editor's colorer is frozen. See also
-    @method[color:text<%> freeze-colorer]
-    and
-    @method[color:text<%> thaw-colorer].
-
-  }
-  @defmethod[(freeze-colorer) void?]{
-    Keep the text tokenized and paren matched, but stop altering the colors.
-
-    @racket[freeze-colorer] will not return until the coloring/tokenization of
-    the entire text is brought up-to-date.  It must not be called on a locked
-    text.
-  }
-  @defmethod[(thaw-colorer (recolor? boolean? #t) (retokenize? boolean? #f))
-             void?]{
-    Start coloring a frozen buffer again.
-
-    If @racket[recolor?] is @racket[#t], the text is re-colored.  If it is
-    @racket[#f] the text is not recolored.  When @racket[recolor?] is
-    @racket[#t], @racket[retokenize?] controls how the text is recolored.
-    @racket[#f] causes the text to be entirely re-colored before thaw-colorer
-    returns using the existing tokenization.  @racket[#t] causes the entire
-    text to be retokenized and recolored from scratch.  This will happen in the
-    background after the call to @racket[thaw-colorer] returns.
-
-  }
-  @defmethod[(reset-region (start exact-nonnegative-integer?) (end (or/c exact-nonnegative-integer? 'end))) void?]{
-    Set the region of the text that is tokenized.
-
-  }
-  @defmethod[(reset-regions (regions (listof (list/c exact-nonnegative-integer? (or/c exact-nonnegative-integer? 'end))))) void?]{
-
-    Sets the currently active regions to be @racket[regions].
-  }
-  
-  @defmethod[(get-spell-check-strings) boolean?]{
-    Returns @racket[#t] if the colorer will attempt to
-    spell-check string constants.
-  }
-  
-  @defmethod[(set-spell-check-strings [b? boolean?]) void?]{
-    If called with @racket[#t], tell the colorer to spell-check
-    string constants. Otherwise, disable spell-checking of 
-    string constants.
-  }
-  
-  @defmethod[(get-spell-check-text) boolean?]{
-    Returns @racket[#t] if the colorer will attempt to
-    spell-check text (e.g., the words inside @litchar[@"{"] and
-    @litchar[@"}"] in Scribble documents).
-  }
-  
-  @defmethod[(set-spell-check-text [b? boolean?]) void?]{
-    If called with @racket[#t], tell the colorer to spell-check
-    text constants. Otherwise, disable spell-checking of text.
-  }
-  
-  @defmethod[(set-spell-current-dict [dict (or/c string? #f)]) void?]{
-    Sets the current dictionary used with aspell to @racket[dict].
-    If @racket[dict] is @racket[#f], then the default dictionary is used.
-  }
-  
-  @defmethod[(get-spell-current-dict) (or/c string? #f)]{
-    Get the current dictionary used with aspell.
-    If the result is @racket[#f], then the default dictionary is used.
-  }
-  
-  @defmethod[(get-spell-suggestions [pos exact-nonnegative-integer?])
-             (or/c #f (list/c exact-nonnegative-integer?
-                              exact-nonnegative-integer?
-                              (listof string?)))]{
-    Returns suggested spelling corrections (and the span of the entire word)
-    to replace the word at @racket[pos]. If the word is spelled correctly or
-    spell checking is disabled, returns @racket[#f].
-  }
-  
-  @defmethod[(get-regions) (listof (list/c exact-nonnegative-integer? (or/c exact-nonnegative-integer? 'end)))]{
-    This returns the list of regions that are currently being colored in the
-    editor.
-
-  }
-  @defmethod[(skip-whitespace (position exact-nonnegative-integer?)
-                              (direction (or/c 'forward 'backward))
-                              (comments? boolean?))
-             exact-nonnegative-integer?]{
-    Returns the next non-whitespace character.
-
-    Starts from position and skips whitespace in the direction indicated by
-    direction.  If @racket[comments?] is true, comments are skipped as well as
-    whitespace.  skip-whitespace determines whitespaces and comments by
-    comparing the token type to @racket['white-space] and @racket['comment].
-
-    Must only be called while the tokenizer is started.
-  }
-  @defmethod[(backward-match [position exact-nonnegative-integer?] [cutoff exact-nonnegative-integer?])
-             (or/c exact-nonnegative-integer? #f)]{
-
-    Skip all consecutive whitespaces and comments (using
-    @racket[skip-whitespace]) immediately preceding the position.  If the token
-    at this position is a close, return the position of the matching open, or
-    @racket[#f] if there is none.  If the token was an open, return
-    @racket[#f].  For any other token, return the start of that token.
-
-    Must only be called while the tokenizer is started.
-  }
-  @defmethod[(backward-containing-sexp [position exact-nonnegative-integer?] [cutoff exact-nonnegative-integer?])
-             (or/c exact-nonnegative-integer? #f)]{
-
-    Return the starting position of the interior of the (non-atomic)
-    s-expression containing position, or @racket[#f] is there is none.
-
-    Must only be called while the tokenizer is started.
-  }
-  @defmethod[(forward-match [position exact-nonnegative-integer?] [cutoff exact-nonnegative-integer?])
-             (or/c exact-nonnegative-integer? #f)]{
-
-    Skip all consecutive whitespaces and comments (using
-    @racket[skip-whitespace]) immediately following position.  If the token at
-    this position is an open, return the position of the matching close, or
-    @racket[#f] if there is none.  For any other token, return the end of that
-    token.
-
-    Must only be called while the tokenizer is started.
-  }
-  @defmethod[(insert-close-paren (position exact-nonnegative-integer?) (char char?)
-                                 (flash? boolean?) (fixup? boolean?)
-                                 (smart-skip? (or/c #f 'adjacent 'forward) #f))
-             void?]{
-    Inserts a close parentheses, or, under scenarios described further below, skips
-    past a subsequent one. The @racket[position] is the place to put the parenthesis, or
-    from which to start searching for a subsequent one, and
-    @racket[char] is the parenthesis to be added (e.g., that the user typed).
-    If @racket[fixup?] is true, the right kind of closing parenthesis will be
-    chosen from the set previously passed to @method[color:text<%> start-colorer]---but only
-    if an inserted @racket[char] would be colored as a parenthesis (i.e., with
-    the @racket['parenthesis] classification).  Otherwise, @racket[char] will
-    be inserted (or skipped past), even if it is not the right kind.  
-    If @racket[flash?] is true, the matching open parenthesis will be flashed when
-    the insertion or skip is done.
-    
-    The "smart skipping" behavior of this function is determined by
-    @racket[smart-skip?]. If @racket[smart-skip?] is false, no skip will 
-    take place. A parenthesis will simply be inserted as described in the 
-    paragraph above. When @racket[smart-skip?] is @racket['adjacent], if
-    the next token after @racket[position], ignoring whitespace and 
-    comments (see @racket[skip-whitespace]), is a properly matched closing
-    parenthesis (which may not necessarily match @racket[char] if
-    @racket[fixup?] is true) then simply move the cursor to the position
-    immediately after that already present closing parenthesis. When
-    @racket[smart-skip?] is @racket['forward], this function attempts to
-    determine the closest pair of properly balanced parentheses around
-    @racket[position]. If that exists, then the cursor position skips
-    to the position immediately after the closing parenthesis of that 
-    outer pair. If a properly balanced outer pair is not present, then
-    the cursor attempts to skip immediately after the next closing
-    parenthesis that occurs after @racket[position], ignoring whitespace,
-    comments, and all other tokens. In both non-false cases of 
-    @racket[smart-skip?], if there is no subsequent parenthesis, then
-    a parenthesis is simply inserted, as previously described.
-  }
-  @defmethod[(classify-position [position exact-nonnegative-integer?])
-             (or/c symbol? #f)]{
-
-    Return a symbol for the lexer-determined token type for the token that
-    contains the item after @racket[position].
-
-    Must only be called while the tokenizer is started.
-  }
-
-  @defmethod[(get-token-range [position exact-nonnegative-integer?]) 
-             (values (or/c #f exact-nonnegative-integer?)
-                     (or/c #f exact-nonnegative-integer?))]{
-
-    Returns the range of the token surrounding @racket[position], if there is a
-    token there.
-
-    This method must be called only when the tokenizer is started.
-  }
-
-  @defmethod[#:mode augment (on-lexer-valid [valid? boolean?]) any]{
-    This method is an observer for when the lexer is working.  It is called
-    when the lexer's state changes from valid to invalid (and back).  The
-    @racket[valid?] argument indicates if the lexer has finished running over
-    the editor (or not).
-
-    The default method just returns @racket[(void?)].
-  }
-
-  @defmethod[#:mode public-final (is-lexer-valid?) boolean?]{
-    Indicates if the lexer is currently valid for this editor.
-  }
-
-}
-@defmixin[color:text-mixin (text:basic<%>) (color:text<%>)]{
-  Adds the functionality needed for on-the-fly coloring and parenthesis
-  matching based on incremental tokenization of the text.
-  @defmethod[#:mode override (lock) void?]{}
-  @defmethod[#:mode override (on-focus) void?]{}
-  @defmethod[#:mode augment (after-edit-sequence) void?]{}
-  @defmethod[#:mode augment (after-set-position) void?]{}
-  @defmethod[#:mode augment (after-change-style) void?]{}
-  @defmethod[#:mode augment (on-set-size-constraint) void?]{}
-  @defmethod[#:mode augment (after-insert) void?]{}
-  @defmethod[#:mode augment (after-delete) void?]{}
-}
-
-@defclass[color:text% (color:text-mixin text:keymap%) ()]{}
-
-@definterface[color:text-mode<%> ()]{}
-
-@defmixin[color:text-mode-mixin (mode:surrogate-text<%>) (color:text-mode<%>)]{
-  This mixin adds coloring functionality to the mode.
-
-  @defconstructor[((get-token lexer default-lexer) 
-                   (token-sym->style (symbol? . -> . string?) (λ (x) "Standard")) 
-                   (matches (listof (list/c symbol? symbol?)) null))]{
-
-    The arguments are passed to 
-    @method[color:text<%> start-colorer].
-  }
-  @defmethod[#:mode override (on-disable-surrogate) void?]{}
-  @defmethod[#:mode override (on-enable-surrogate) void?]{}
-}
-@defclass[color:text-mode% (color:text-mode-mixin mode:surrogate-text%) ()]{}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^color:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/comment-box.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/comment-box.scrbl
deleted file mode 100644
index 48cf52ce48..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/comment-box.scrbl
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Comment Box}
-
-@defclass[comment-box:snip% editor-snip:decorated% (readable-snip<%>)]{
-  This snip implements the comment boxes that you see in
-  DrRacket.
-
-  @defmethod*[#:mode override (((make-editor) (is-a?/c text%)))]{
-    Makes an instance of
-    @racketblock[(racket:text-mixin text:keymap%)]}
-
-  @defmethod*[#:mode override (((make-snip) (is-a?/c comment-snip%)))]{
-    Returns an instance of the @racket[comment-snip%] class.}
-
-  @defmethod*[#:mode override (((get-corner-bitmap) (is-a?/c bitmap%)))]{
-    Returns the semicolon bitmap from the file
-    @racketblock[(build-path (collection-path "icons") "semicolon.gif")]}
-
-  @defmethod*[#:mode override (((get-position) (symbols (quote left-top) (quote top-right))))]{
-    Returns @racket['left-top]}
-
-  @defmethod*[#:mode override (((get-text) string))]{
-    Returns the same string as the super method, but with
-    newlines replaced by newline-semicolon-space.}
-
-  @defmethod*[#:mode override (((get-menu) (is-a?/c popup-menu%)))]{
-    Returns a menu with a single item to change the box into
-    semicolon comments.}
-}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^comment-box:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/editor-snip.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/editor-snip.scrbl
deleted file mode 100644
index ca17c3a850..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/editor-snip.scrbl
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title[#:tag "editor-snip"]{Editor Snip}
-
-@definterface[editor-snip:decorated<%> (editor-snip%)]{
-  @defmethod[(get-corner-bitmap) (or/c false/c (is-a?/c bitmap%))]{
-    Returns a bitmap that is drawn in the upper-right corner of this snip.
-  }
-  @defmethod[(get-color) (or/c string? (is-a?/c color%))]{
-    Returns the color used to draw the background part of the snip.
-  }
-  @defmethod[(get-menu) (or/c false/c (is-a?/c popup-menu%))]{
-    Returns a popup menu that is used when clicking on the top part of the snip.
-  }
-  @defmethod[(get-position) (symbols 'top-right 'left-top)]{
-    Returns the location of the image and the clickable
-     region. The symbol @racket['top-right] indicates top portion is clickable
-     and icon on right. The symbol @racket['left-top] means left portion is
-     clickable and icon on top.
-  }
-  @defmethod[(reset-min-sizes) void?]{
-    Sets the minimum sizes based on the result of 
-    @method[editor-snip:decorated<%> get-corner-bitmap].
-  }
-}
-
-
-@defmixin[editor-snip:decorated-mixin (editor-snip%) (editor-snip:decorated<%>)]{
-  @defmethod[(get-corner-bitmap) (or/c false/c (is-a?/c bitmap%))]{
-    Returns @racket[#f].
-  }
-  @defmethod[(get-color) (or/c string? (is-a?/c color%))]{
-     Returns @racketblock[
-       (if (preferences:get 'framework:white-on-black?)
-           "white" 
-           "black")]
-  }
-  @defmethod[(get-menu) (or/c false/c (is-a?/c popup-menu%))]{
-    Returns @racket[#f].
- }
-  @defmethod[(get-position) (symbols 'top-right 'left-top)]{
-    Returns @racket['top-right].
-  }
-}
-
-@defclass[editor-snip:decorated% (editor-snip:decorated-mixin editor-snip%) ()]{
-  @defconstructor/auto-super[()]{
-     Invokes the super constructor with the keyword @racket[editor] as a call to
-     @method[editor-snip:decorated% make-editor].
-  }
-
-  @defmethod[(make-snip) (is-a?/c editor-snip:decorated%)]{
-    This method should return an instance of the class it is invoked in.
-    If you create a subclass of this class, be sure to override this method and
-    have it create instances of the subclass.
-  }
-  @defmethod[(make-editor) (is-a?/c editor<%>)]{
-   Creates an editor to be used in this snip.
- }
-
-  @defmethod[(copy) (is-a?/c editor-snip:decorated%)]{
-    Uses the @method[editor-snip:decorated% make-editor] and
-    @method[editor-snip:decorated% make-snip] methods to create a
-    copy of this snip, as follows:
-    @racketmod[
-      (let ([snip (make-snip)])
-        (send snip set-editor (send (get-editor) copy-self))
-        (send snip set-style (get-style))
-        snip)]
-  }
-}
-
-@defclass[editor-snip:decorated-snipclass% snip-class% ()]{
-  @defmethod[(make-snip [stream-in (is-a?/c editor-stream-in%)]) (is-a?/c editor-snip:decorated<%>)]{
-   Returns an instance of @racket[editor-snip:decorated%].
-  }
-  @defmethod[(read [stream-in (is-a?/c editor-stream-in%)]) (is-a?/c editor-snip:decorated<%>)]{
-   Calls @method[editor-snip:decorated-snipclass% make-snip] to get an object and
-   then invokes its @racket[editor<%>]'s @method[editor<%> read-from-file] method
-   in order to read a snip from @racket[stream-in], eg:
-   @racketblock[
-      (let ([snip (make-snip stream-in)])
-        (send (send snip get-editor) read-from-file stream-in #f)
-        snip)
-   ]
-  }
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/editor.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/editor.scrbl
deleted file mode 100644
index fc7efece3b..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/editor.scrbl
+++ /dev/null
@@ -1,457 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Editor}
-
-@definterface[editor:basic<%> (editor<%>)]{
-  Classes matching this interface support the basic 
-  @racket[editor<%>]
-  functionality required by the framework.
-  @defmethod*[(((has-focus?) boolean?))]{
-    This function returns @racket[#t] when the editor has the keyboard
-    focus. It is implemented using:
-    @method[editor<%> on-focus]
-
-  }
-  @defmethod*[(((local-edit-sequence?) boolean?))]{
-    Indicates if this editor is in an edit sequence. Enclosing buffer's
-    edit-sequence status is not considered by this method.
-
-    See
-    @method[editor<%> begin-edit-sequence]
-    and
-    @method[editor<%> end-edit-sequence]
-    for more info about edit sequences.
-
-  }
-  @defmethod*[(((run-after-edit-sequence (thunk (-> void?)) (tag (or/c symbol? #f) #f)) void?))]{
-    This method is used to install callbacks that will be run after any
-    edit-sequence completes.
-
-
-    The procedure @racket[thunk] will be called immediately if the edit is
-    not in an edit-sequence. If the edit is in an edit-sequence, it will
-    be called when the edit-sequence completes.
-
-    If @racket[tag] is a symbol, the @racket[thunk] is keyed on that symbol, and
-    only one thunk per symbol will be called after the
-    edit-sequence. Specifically, the last call to 
-    @method[editor:basic<%> run-after-edit-sequence]'s argument will be called.
-
-  }
-  @defmethod*[(((get-top-level-window) (or/c #f (is-a?/c top-level-window<%>))))]{
-    Returns the 
-    @racket[top-level-window<%>]
-    currently associated with this buffer.
-
-    This does not work for embedded editors.
-
-
-  }
-  @defmethod*[(((save-file-out-of-date?) boolean?))]{
-    Returns @racket[#t] if the file on disk has been modified, by some other program.
-
-  }
-  @defmethod*[(((save-file/gui-error (filename (or/c path? #f) #f) (format (or/c (quote guess) (quote standard) (quote text) (quote text-force-cr) (quote same) (quote copy)) (quote same)) (show-errors? boolean? #t)) boolean?))]{
-    This method is an alternative to 
-    @method[editor<%> save-file]. Rather than showing errors via the original stdout, it
-    opens a dialog with an error message showing the error.
-
-    The result indicates if an error happened (the error has
-    already been shown to the user). It returns @racket[#t] if
-    no error occurred and @racket[#f] if an error occurred.
-
-  }
-  @defmethod*[(((load-file/gui-error (filename (or/c string? #f) #f) (format (or/c (quote guess) (quote standard) (quote text) (quote text-force-cr) (quote same) (quote copy)) (quote guess)) (show-errors? boolean? #t)) boolean?))]{
-    This method is an alternative to 
-    @method[editor<%> load-file]. Rather than showing errors via the original stdout, it
-    opens a dialog with an error message showing the error.
-
-    The result indicates if an error happened (the error has
-    already been shown to the user). It returns @racket[#t] if
-    no error occurred and @racket[#f] if an error occurred.
-
-  }
-  @defmethod*[(((on-close) void?))]{
-
-    This method is called when an editor is closed.
-    Typically, this method is called when the frame
-    containing the editor is closed, but in some cases an
-    editor is considered ``closed'' before the frame it is
-    in is closed (e.g., when a tab in DrRacket is closed), and
-    thus @method[editor:basic<%> on-close] will be called at that point.
-
-    See also @method[editor:basic<%> can-close?] and @method[editor:basic<%>
-    close].
-
-    Does nothing.
-  }
-  @defmethod*[(((can-close?) boolean?))]{
-    This method is called to query the editor if is okay to
-    close the editor. Although there is no visible effect
-    associated with closing an editor, there may be some cleanup
-    actions that need to be run when the user is finished with
-    the editor (asking if it should be saved, for example).
-
-    See also
-    @method[editor:basic<%> on-close] and
-    @method[editor:basic<%> close].
-
-
-    Returns @racket[#t].
-  }
-  @defmethod*[(((close) boolean?))]{
-    This method is merely
-    @racketblock[
-    (if (can-close?)
-        (begin (on-close) #t)
-        #f)]
-
-    It is intended as a shorthand, helper method for closing
-    an editor. See also
-    @method[editor:basic<%> can-close?]
-    and 
-    @method[editor:basic<%> on-close].
-  }
-  @defmethod*[(((get-filename/untitled-name) string?))]{
-    Returns the printed version of the filename for this
-    editor. If the editor doesn't yet have a filename, it
-    returns a symbolic name (something like "Untitled").
-  }
-
-  @defmethod[(get-pos/text [event (is-a?/c mouse-event%)])
-             (values (or/c false/c number?)
-                     (or/c false/c (is-a?/c editor<%>)))]{
-
-    Calls @method[editor:basic<%> get-pos/text-dc-location] with
-          the x and y coordinates of @racket[event].
-                                                          }
-  @defmethod[(get-pos/text-dc-location [x exact-integer?] [y exact-integer?])
-             (values (or/c false/c number?)
-                     (or/c false/c (is-a?/c editor<%>)))]{
-
-   This method's first result is @racket[#f] when the mouse
-   event does not correspond to a location in the editor. 
-
-   If the second result is a @racket[text%] object, then the
-   first result will be a position in the editor and
-   otherwise the first result will be @racket[#f]. 
-
-   The @racket[editor<%>] object will always be the nearest
-   enclosing editor containing the point (@racket[x], @racket[y]).
-  }
-}
-@defmixin[editor:basic-mixin (editor<%>) (editor:basic<%>)]{
-  This provides the basic editor services required by the rest of the
-  framework.
-
-  The result of this mixin uses the same initialization arguments as the
-  mixin's argument.
-
-  Each instance of a class created with this mixin contains a private
-  @racket[keymap%] that is chained to the global keymap via:
-  @racket[(send keymap chain-to-keymap (keymap:get-global) #f)].
-
-  This installs the global keymap @racket[keymap:get-global] to
-  handle keyboard and mouse mappings not handled by @racket[keymap]. The
-  global keymap is created when the framework is invoked.
-  @defmethod*[#:mode augment (((can-save-file? (filename string?) (format symbol?)) boolean?))]{
-
-    Checks to see if the file on the disk has been modified out
-    side of this editor, using
-    @method[editor:basic<%> save-file-out-of-date?]. 
-    If it has, this method prompts the user to be sure they want to save.
-
-  }
-  @defmethod*[#:mode augment (((after-save-file (success? boolean?)) void?))]{
-
-    If the current filename is not a temporary filename, this method calls
-    @racket[handler:add-to-recent]with the current filename.
-
-    to add the new filename to the list of recently opened files.
-
-    Additionally, updates a private instance variable with the
-    modification time of the file, for using in implementing
-    @method[editor:basic<%> save-file-out-of-date?].
-
-  }
-  @defmethod*[#:mode augment (((after-load-file (success? boolean?)) void?))]{
-
-    Updates a private instance variable with the modification
-    time of the file, for using in implementing
-    @method[editor:basic<%> save-file-out-of-date?]
-
-  }
-  @defmethod*[#:mode override (((on-focus (on? boolean?)) void?))]{
-    Manages the state to implement
-    @method[editor:basic<%> has-focus?]
-
-  }
-  @defmethod*[#:mode augment (((on-edit-sequence) boolean?))]{
-
-    Always returns @racket[#t]. Updates a flag for
-    @method[editor:basic<%> local-edit-sequence?]
-  }
-  @defmethod*[#:mode augment (((after-edit-sequence) void?))]{
-
-    Helps to implement
-    @method[editor:basic<%> run-after-edit-sequence].
-  }
-  @defmethod*[#:mode override (((on-new-box (type (or/c (quote pasteboard) (quote text)))) (is-a?/c editor-snip%)))]{
-
-    Creates instances of 
-    @racket[pasteboard:basic%]
-    or
-    @racket[text:basic%]
-    instead of the built in
-    @racket[pasteboard%]
-    and
-    @racket[text%]
-    classes.
-  }
-  @defmethod[#:mode override (on-new-image-snip [filename (or/c path? false/c)]
-                                                [kind (one-of/c 'unknown 'gif 'jpeg 'xbm 'xpm 'bmp 'pict)]
-                                                 [relative-path? any/c]
-                                                 [inline? any/c])
-                             (is-a?/c image-snip%)]{
-    @racketblock[
-        (super on-new-image-snip 
-               (if (eq? kind 'unknown) 'unknown/mask kind) 
-               relative-path? 
-               inline?)]
-  }
-
-  @defmethod*[#:mode override (((get-file (directory (or/c path-string? false/c))) string))]{
-
-    Uses
-    @racket[finder:get-file]
-    to find a filename. Also, sets the parameter
-    @racket[finder:dialog-parent-parameter]
-    to the result of
-    @method[editor:basic<%> get-top-level-window].
-  }
-  @defmethod*[#:mode override (((put-file (directory (or/c path? false/c)) (default-name (or/c path? false/c))) string))]{
-
-    Uses
-    @racket[finder:put-file]
-    to find a filename. Also, sets the parameter
-    @racket[finder:dialog-parent-parameter]
-    to the result of
-    @method[editor:basic<%> get-top-level-window].
-  }
-}
-@definterface[editor:standard-style-list<%> (editor<%>)]{
-  This interface is implemented by the results of
-  @racket[editor:standard-style-list-mixin].
-}
-@defmixin[editor:standard-style-list-mixin (editor<%>) (editor:standard-style-list<%>)]{
-  The mixin adds code to the initialization
-  of the class that sets the editor's style
-  list (via
-  @method[editor<%> set-style-list])
-  to the result of
-  @racket[editor:get-standard-style-list].
-
-  In addition, it calls
-  @method[editor<%> set-load-overwrites-styles]
-  with @racket[#f].
-  This ensures that saved files with different
-  settings for the style list do not clobber
-  the shared style list.
-}
-@definterface[editor:keymap<%> (editor:basic<%>)]{
-  Classes matching this interface add support for mixing in multiple
-  keymaps. They provides an extensible interface to chained keymaps,
-  through the
-  @method[editor:keymap<%> get-keymaps]
-  method.
-
-  This editor is initialized by calling
-  @racket[add-editor-keymap-functions],
-  @racket[add-text-keymap-functions], and
-  @racket[add-pasteboard-keymap-functions].
-  @defmethod*[(((get-keymaps) (list-of (is-a?/c keymap%))))]{
-    The keymaps returned from this method are chained to this
-    @racket[editor<%>]'s keymap.
-
-    The result of this method should not change -- that is, it
-    should return the same list of keymaps each time it is
-    called.
-
-    See also @racket[editor:add-after-user-keymap].
-
-    Returns @racket[(list (keymap:get-user) (keymap:get-global))] by default.
-  }
-}
-@defmixin[editor:keymap-mixin (editor:basic<%>) (editor:keymap<%>)]{
-  This provides a mixin that implements the
-  @racket[editor:keymap<%>]
-  interface.
-}
-@definterface[editor:autowrap<%> (editor:basic<%>)]{
-  Classes implementing this interface keep the
-  @method[editor<%> auto-wrap]
-  state set based on the
-  @racket['framework:auto-set-wrap?] preference
-  (see @racket[preferences:get] for more information about preferences).
-
-  They install a preferences callback with
-  @racket[preferences:add-callback]
-  that sets the state when the preference changes and 
-  initialize the value of
-  @method[editor<%> auto-wrap]
-  to the current value of @racket['framework:auto-set-wrap?]
-  via
-  @racket[preferences:get].
-}
-@defmixin[editor:autowrap-mixin (editor:basic<%>) (editor:autowrap<%>)]{
-  See
-  @racket[editor:autowrap<%>]
-}
-@definterface[editor:file<%> (editor:keymap<%>)]{
-  Objects supporting this interface are expected to support files.
-  @defmethod*[(((get-can-close-parent) (or/c false (is-a?/c frame%) (is-a?/c dialog%))))]{
-    The result of this method is used as the parent for the
-    dialog that asks about closing.
-
-    Returns @racket[#f] by default.
-  }
-  @defmethod*[(((update-frame-filename) void?))]{
-    Attempts to find a frame that displays this editor. If it
-    does, it updates the frame's title based on a new filename
-    in the editor.
-
-  }
-  @defmethod*[(((allow-close-with-no-filename?) boolean?))]{
-    This method indicates if closing the file when it hasn't
-    been saved is a reason to alert the user. See also
-    @method[editor:file-mixin can-close?].
-
-    Returns @racket[#f] by default.
-  }
-  
-  @defmethod[(user-saves-or-not-modified? [allow-cancel? #t]) boolean?]{
-    If the file has not been saved, this prompts the user about saving and,
-    if the user says to save, then it saves the file.
-
-    The result is @racket[#t] if the save file is up to date, or if
-    the user says it is okay to continue without saving. Generally used
-    when closing the file or quiting the app.
-  }
-}
-@defmixin[editor:file-mixin (editor:keymap<%>) (editor:file<%>)]{
-  This editor locks itself when the file that is opened is read-only in
-  the filesystem.
-
-  The class that this mixin produces uses the same initialization
-  arguments as its input.
-  @defmethod*[#:mode override (((set-filename (name string?) (temp? boolean? #f)) void?))]{
-
-    Updates the filename on each frame displaying this editor, for each
-    frame that matches
-    @racket[frame:editor<%>].
-  }
-  @defmethod*[#:mode augment (((can-close?) boolean?))]{
-
-    If the 
-    @method[editor:file<%> allow-close-with-no-filename?]
-    method returns @racket[#f], this method checks to see if the file
-    has been saved at all yet. If not, it asks the user
-    about saving (and saves if they ask).
-
-    If the 
-    @method[editor:file<%> allow-close-with-no-filename?]
-    method returns @racket[#t], this method does as before,
-    except only asks if the editor's 
-    @method[editor<%> get-filename]method returns a path.
-
-    Also calls inner.
-  }
-  @defmethod*[#:mode override (((get-keymaps) (list-of (is-a?/c keymap%))))]{
-
-    This returns a list containing the super-class's keymaps, plus the
-    result of
-    @racket[keymap:get-file]
-  }
-}
-@definterface[editor:backup-autosave<%> (editor:basic<%>)]{
-  Classes matching this interface support backup files and autosaving.
-  @defmethod*[(((backup?) boolean?))]{
-    Indicates whether this 
-    @racket[editor<%>]
-    should be backed up.
-
-    Returns the value of the @racket[preferences:get] applied to
-    @racket['framework:backup-files?].  @index{'framework:backup-files?}
-  }
-  @defmethod*[(((autosave?) boolean?))]{
-    Indicates whether this 
-    @racket[editor<%>]
-    should be autosaved.
-
-    Returns @racket[#t].
-  }
-  @defmethod*[(((do-autosave) (or/c #f path?)))]{
-    This method is called to perform the autosaving.  See also
-    @racket[autosave:register]
-
-    When the file has been modified since it was last saved and autosaving it
-    turned on (via the @method[editor:backup-autosave<%> autosave?]  method) an
-    autosave file is created for this @racket[editor<%>].
-
-    Returns the filename where the autosave took place, or @racket[#f] if none
-    did.
-  }
-  @defmethod*[(((remove-autosave) void?))]{
-    This method removes the autosave file associated with this
-    @racket[editor<%>].
-  }
-}
-@defmixin[editor:backup-autosave-mixin (editor:basic<%>) (editor:backup-autosave<%> autosave:autosavable<%>)]{
-  This mixin adds backup and autosave functionality to an editor.
-
-  During initialization, this object is registered with
-  @racket[autosave:register].
-
-  The result of this mixin uses the same initialization arguments as the
-  mixin's argument.
-
-  @defmethod*[#:mode augment (((on-save-file (filename path?) (format (one-of/c (quote guess) (quote standard) (quote text) (quote text-force-cr) (quote same) (quote copy)))) bool))]{
-
-    If a backup file has not been created this session for this file,
-    deletes any existing backup file and copies the old save file into the
-    backup file. For the backup file's name, see
-    @racket[path-utils:generate-backup-name]
-  }
-  @defmethod*[#:mode augment (((on-close) void?))]{
-
-    Deletes the autosave file and turns off autosaving.
-  }
-  @defmethod*[#:mode augment (((on-change) void?))]{
-
-    Sets a flag indicating that this @racket[editor<%>] needs to be autosaved.
-  }
-  @defmethod*[#:mode override (((set-modified (modified? any/c)) void?))]{
-
-    If the file is no longer modified, this method deletes the autosave
-    file. If it is, it updates a flag to indicate that the autosave file
-    is out of date.
-  }
-}
-@definterface[editor:info<%> (editor:basic<%>)]{
-  An @racket[editor<%>] matching this interface provides information about its
-  lock state to its @racket[top-level-window<%>].
-}
-@defmixin[editor:info-mixin (editor:basic<%>) (editor:info<%>)]{
-  This editor tells the frame when it is locked and unlocked.
-  See also @racket[frame:text-info<%>].
-
-  @defmethod*[#:mode override (((lock (lock? boolean?)) void?))]{
-
-    Uses @method[editor:basic<%> run-after-edit-sequence]
-    to call @method[frame:info<%> lock-status-changed].
-  }
-}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^editor:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/exit.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/exit.scrbl
deleted file mode 100644
index 41b2f881ef..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/exit.scrbl
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Exit}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^exit:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/finder.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/finder.scrbl
deleted file mode 100644
index 309c6a6c22..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/finder.scrbl
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Finder}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^finder:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/frame.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/frame.scrbl
deleted file mode 100644
index 9a3cae5f0f..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/frame.scrbl
+++ /dev/null
@@ -1,986 +0,0 @@
-#lang scribble/doc 
-@(require scribble/manual scribble/extract
-          (for-label framework scheme/gui)
-          framework/private/gen-standard-menus)
-
-@title{Frame}
-
-@definterface[frame:basic<%> (frame%)]{
-  Classes matching this interface support the basic 
-  @racket[frame%]
-  functionality required by the framework.
-  @defmethod*[(((get-area-container%) (implementation?/c area-container<%>)))]{
-    The class that this method returns is used to create the
-    @racket[area-container<%>]
-    in this frame.
-
-  }
-  @defmethod*[(((get-area-container) (is-a?/c area-container<%>)))]{
-    This returns the main 
-    @racket[area-container<%>]
-    in the frame
-
-  }
-  @defmethod*[(((get-menu-bar%) (subclass?/c menu-bar%)))]{
-    The result of this method is used to create the initial menu bar for
-    this frame.
-
-    Return @racket[menu-bar%].
-  }
-  @defmethod*[(((make-root-area-container (class (implementation?/c area-container<%>))
-                                          (parent (is-a?/c area-container<%>)))
-                (is-a?/c area-container<%>)))]{
-    Override this method to insert a panel in between the panel used by
-    the clients of this frame and the frame itself. For example, to insert
-    a status line panel override this method with something like this:
-
-    @racketblock[
-    (class ...
-      ...
-      (define status-panel #f)
-      (define/override (make-root-area-container cls parent)
-        (set! status-panel
-              (super make-root-area-container vertical-panel% parent))
-        (let ([root (make-object cls status-panel)])
-
-           (code:comment "... add other children to status-panel ...")
-
-           root))
-      ...)]
-
-    In this example, status-panel will contain a root panel for the other
-    classes, and whatever panels are needed to display status information.
-
-    The searching frame is implemented using this method.
-
-    Calls @racket[make-object] with @racket[class] and @racket[parent].
-  }
-  @defmethod*[(((close) void?))]{
-    This method closes the frame by calling the
-    @method[top-level-window<%> can-close?],
-    @method[top-level-window<%> on-close], and
-    @method[top-level-window<%> show]
-    methods. 
-
-    It's implementation is:
-    @racketblock[
-      (inherit can-close? on-close)
-      (public
-        [show
-          (lambda ()
-            (when (can-close?)
-              (on-close)
-              (show #f)))])]
-
-  }
-  @defmethod*[(((editing-this-file? (filename path?)) boolean?))]{
-    Indicates if this frame contains this buffer (and can edit
-    that file).
-
-    Returns @racket[#f].
-  }
-  @defmethod*[(((get-filename (temp (or/c #f (box boolean?)) #f)) (or/c #f path?)))]{
-    This returns the filename that the frame is currently being saved as,
-    or @racket[#f] if there is no appropriate filename.
-
-    Returns @racket[#f] by default.
-
-    If @racket[temp] is a box, it is filled with @racket[#t] or @racket[#f],
-    depending if the filename is a temporary filename.
-  }
-  @defmethod*[(((make-visible (filename string?)) void?))]{
-    Makes the file named by @racket[filename] visible (intended for
-    use with tabbed editing).
-
-  }
-}
-@defmixin[frame:basic-mixin (frame%) (frame:basic<%>)]{
-  This mixin provides the basic functionality that the framework expects. It
-  helps manage the list of frames in the @racket[group:%] object returned by
-  @racket[group:get-the-frame-group].
-
-  Do not give @racket[panel%] or @racket[control<%>] objects this frame as
-  parent. Instead, use the result of the @method[frame:basic<%>
-  get-area-container] method.
-
-  @index{Windows menu}
-
-  This mixin also creates a menu bar for the frame, as the
-  frame is initialized. It uses the class returned by
-  @method[frame:basic<%> get-menu-bar%]. It only passes the frame as an
-  initialization argument.  In addition, it creates the windows menu in the
-  menu bar.
-
-  This mixin calls its @method[window<%> accept-drop-files] with @racket[#t].
-
-  It also calls its @method[top-level-window<%> set-icon] method according to the current
-  value of @racket[frame:current-icon].
-
-  See also @racket[frame:reorder-menus].
-
-  @defmethod*[#:mode override (((show (on? boolean?)) void?))]{
-
-    Calls the super method.
-
-    When @racket[on?] is @racket[#t], inserts the frame into the
-    frame group and when it is @racket[#f], removes the frame
-    from the group.
-  }
-  @defmethod*[#:mode override (((can-exit?) boolean?))]{
-
-    This, together with @method[frame:basic-mixin on-exit] mimics
-    @racket[exit:exit].
-
-    First, it calls @racket[exit:set-exiting] with @racket[#t].  Then, it calls
-    @racket[exit:can-exit?]. If it returns @racket[#t], so does this method. If
-    it returns @racket[#f], this method calls @racket[exit:set-exiting] with
-    @racket[#f].
-  }
-  @defmethod*[#:mode override (((on-exit) void?))]{
-
-    Together with @method[frame:basic-mixin can-exit?]  this mimics the
-    behavior of @racket[exit:exit].
-
-    Calls @racket[exit:on-exit] and then queues a callback to call Racket's
-    @racket[exit] function. If that returns, it calls @racket[exit:set-exiting]
-    to reset that flag to @racket[#f].
-  }
-  @defmethod*[#:mode override (((on-superwindow-show (shown? any/c)) void?))]{
-
-    Notifies the result of @racket[(group:get-the-frame-group)] that a frame
-    has been shown, by calling the @method[group:% frame-shown/hidden] method.
-
-  }
-  @defmethod*[#:mode override (((on-drop-file (pathname string?)) void?))]{
-
-    Calls @racket[handler:edit-file] with @racket[pathname] as an argument.
-  }
-  @defmethod*[#:mode override (((after-new-child) void?))]{
-
-    Raises an exception if attempting to add a child to this frame (except if
-    using the @method[frame:basic<%> make-root-area-container] method).
-  }
-}
-
-@definterface[frame:focus-table<%> (top-level-window<%>)]{}
-
-@defmixin[frame:focus-table-mixin (frame%) (frame:focus-table<%>)]{
-
-  Instances of classes returned from this mixin track how frontmost they are
-  based on calls made to methods at the Racket level, instead of using
-  the calls made by the operating system as it tracks the focus.
-  
-  See also @racket[frame:lookup-focus-table], @racket[test:use-focus-table]
-  and @racket[test:get-active-top-level-window].
-                                                         
-  @defmethod[#:mode override (show [on? boolean?]) void?]{
-    When @racket[on?] is @racket[#t], adds this frame to the 
-    front of the list of frames stored with the frame's eventspace. When 
-    @racket[on?] is @racket[#f], this method removes this frame
-    from the list.
-
-    See also @racket[frame:lookup-focus-table], @racket[test:use-focus-table]
-    and @racket[test:get-active-top-level-window].
-  }
-  @defmethod[#:mode augment (on-close) void?]{
-    Removes this frame from the list of frames stored with the frame's eventspace.
-    
-    See also @racket[frame:lookup-focus-table], @racket[test:use-focus-table]
-    and @racket[test:get-active-top-level-window].
-  }
-}
-                                                     
-@definterface[frame:size-pref<%> (frame:basic<%>)]{
-  @defmethod[(adjust-size-when-monitor-setup-changes?) boolean?]{
-     Determines if the frame's size should be automatically adjusted
-     when the monitors configuration changes.
-     
-     Defaults to returning @racket[#f].
-   }
-}
-@defmixin[frame:size-pref-mixin (frame:basic<%>) (frame:size-pref<%>)]{
-  @defconstructor/auto-super[([size-preferences-key symbol?]
-                              [position-preferences-key (or/c symbol? #f) #f]
-                              [width (or/c dimension-integer? #f) #f]
-                              [height (or/c dimension-integer? #f) #f]
-                              [x (or/c position-integer? #f) #f]
-                              [y (or/c position-integer? #f) #f])]{
-
-    The  @racket[size-preferences-key] symbol is used with
-    @racket[preferences:get] and @racket[preferences:set] to track the current
-    size.
-    
-    If present, the @racket[position-preferences-key] symbol is used with
-    @racket[preferences:get] and @racket[preferences:set] to track the current
-    position.
-
-    Both preferences are tracked on a per-monitor-configuration basis. That is,
-    the preference value saved is a mapping from the current monitor configuration
-    (derived from the results of @racket[get-display-count], @racket[get-display-left-top-inset],
-    and @racket[get-display-size]).
-    
-    Passes the @racket[x], @racket[y], and @racket[width] and @racket[height] 
-    initialization arguments to the superclass and calls @method[frame% maximize]
-    based on the current values of the preferences.
-
-    See also @racket[frame:setup-size-pref].
-
-  }
-
-  @defmethod[#:mode override (on-size (width dimension-integer?) 
-                                      (height dimension-integer?))
-                    void?]{
-    Updates the preferences, according to the width and
-    height. The preferences key is the one passed
-    to the initialization argument of the class.
-  }
-  @defmethod[#:mode override (on-move (width position-integer?)
-                                      (height position-integer?))
-                    void?]{
-    Updates the preferences according to the width and
-    height, if @racket[position-preferences-key] is not @racket[#f], using
-    it as the preferences key.
-  }
-}
-
-@definterface[frame:register-group<%> ()]{
-  Frames that implement this interface are registered with the group. See
-  @racket[group:get-the-frame-group] and @racket[frame:register-group-mixin].
-}
-@defmixin[frame:register-group-mixin (frame:basic<%>) (frame:register-group<%>)]{
-  During initialization, calls
-  @method[group:% insert-frame]with @racket[this].
-  @defmethod*[#:mode augment (((can-close?) boolean?))]{
-
-    Calls the inner method, with a default of @racket[#t].  If that returns
-    @racket[#t], it checks for one of the these three conditions:
-
-    @itemize[
-    @item{@racket[exit:exiting?] returns @racket[#t]}
-    @item{there is more than one frame in the group returned by
-      @racket[group:get-the-frame-group], or}
-    @item{the procedure @racket[exit:user-oks-exit] returns @racket[#t].}]
-
-    If any of those conditions hold, the method returns @racket[#t].
-  }
-  @defmethod*[#:mode augment (((on-close) void?))]{
-
-    First calls the inner method.  Next, calls the @method[group:%
-    remove-frame] method of the result of @racket[group:get-the-frame-group]
-    with @racket[this] as an argument.  Finally, unless @racket[exit:exiting?]
-    returns @racket[#t], and if there are no more frames open, it calls
-    @racket[exit:exit].
-  }
-  @defmethod*[#:mode override (((on-activate (on? boolean?)) void?))]{
-
-    Calls @method[group:% set-active-frame] with @racket[this] when
-    @racket[on?] is true.
-
-  }
-}
-@definterface[frame:status-line<%> (frame:basic<%>)]{
-  The mixin that implements this interface provides an interface to a set of
-  status lines at the bottom of this frame.
-
-  Each status line must be opened with @method[frame:status-line<%>
-  open-status-line] before any messages are shown in the status line and once
-  @method[frame:status-line<%> close-status-line] is called, no more messages
-  may be displayed, unless the status line is re-opened.
-
-  The screen space for status lines is not created until
-  @method[frame:status-line<%> update-status-line] is called with a
-  string. Additionally, the screen space for one status line is re-used when by
-  another status line when the first passes @racket[#f] to
-  @method[frame:status-line<%> update-status-line]. In this manner, the status
-  line frame avoids opening too many status lines and avoids flashing the
-  status lines open and closed too often.
-
-  @defmethod*[(((open-status-line (id symbol?)) void?))]{
-    Creates a new status line identified by the symbol
-    argument. The line will not appear in the frame until a
-    message is put into it, via
-    @method[frame:status-line<%> update-status-line].
-  }
-
-  @defmethod*[(((close-status-line (id symbol?)) void?))]{
-    Closes the status line @racket[id].
-  }
-  @defmethod*[(((update-status-line (id symbol?) (status (or/c #f string?))) void?))]{
-    Updates the status line named by @racket[id] with @racket[status]. If
-    @racket[status] is @racket[#f], the status line is becomes blank (and may
-    be used by other ids).
-  }
-}
-@defmixin[frame:status-line-mixin (frame:basic<%>) (frame:status-line<%>)]{
-
-  @defmethod*[#:mode override (((make-root-area-container (class (subclass?/c panel%)) 
-                                                          (parent (is-a?/c panel%)))
-                                (is-a?/c panel%)))]{
-
-    Adds a panel at the bottom of the frame to hold the status
-    lines.
-
-  }
-}
-@definterface[frame:info<%> (frame:basic<%>)]{
-  Frames matching this interface support a status line.
-
-  The preference @racket['framework:show-status-line] controls the visibility
-  of the status line. If it is @racket[#t], the status line is visible and if
-  it is @racket[#f], the status line is not visible (see
-  @racket[preferences:get] for more info about preferences)
-
-  @defmethod*[(((determine-width (str string) (canvas (is-a?/c editor-canvas%)) (text (is-a?/c text%))) integer))]{
-    This method is used to calculate the size of an @racket[editor-canvas%]
-    with a particular set of characters in it.  It is used to calculate the
-    sizes of the edits in the status line.
-  }
-
-  @defmethod*[(((lock-status-changed) void?))]{
-    This method is called when the lock status of the @racket[editor<%>]
-    changes.
-
-    Updates the lock icon in the status line panel.
-  }
-  @defmethod*[(((update-info) void?))]{
-    This method updates all of the information in the panel.
-  }
-  @defmethod*[(((set-info-canvas (canvas (or/c (is-a?/c canvas:basic%) #f))) void?))]{
-    Sets this canvas to be the canvas that the info frame shows info about. The
-    @method[canvas:info-mixin% on-focus] and @method[canvas:info-mixin%
-    set-editor] methods call this method to ensure that the info canvas is set
-    correctly.
-  }
-
-  @defmethod*[(((get-info-canvas) (or/c (is-a?/c canvas:basic%) #f)))]{
-    Returns the canvas that the @racket[frame:info<%>] currently shows info
-    about. See also @method[frame:info<%> set-info-canvas]
-  }
-
-  @defmethod*[(((get-info-editor) (or/c #f (is-a?/c editor<%>))))]{
-    Override this method to specify the editor that the status line
-    contains information about.
-
-    Returns the result of @method[frame:editor<%> get-editor].
-  }
-  @defmethod*[(((get-info-panel) (is-a?/c horizontal-panel%)))]{
-    This method returns the panel where the information about this editor is
-    displayed.
-  }
-
-  @defmethod*[(((show-info) void?))]{
-    Shows the info panel.
-
-    See also @method[frame:info<%> is-info-hidden?].
-  }
-
-  @defmethod*[(((hide-info) void?))]{
-    Hides the info panel.
-
-    See also @method[frame:info<%> is-info-hidden?].
-  }
-  @defmethod*[(((is-info-hidden?) boolean?))]{
-    Result indicates if the show info panel has been explicitly hidden with
-    @method[frame:info<%> hide-info].
-
-    If this method returns @racket[#t] and @racket[(preferences:get
-    'framework:show-status-line)] is @racket[#f], then the info panel will not
-    be visible.  Otherwise, it is visible.
-  }
-}
-@defmixin[frame:info-mixin (frame:basic<%>) (frame:info<%>)]{
-  This mixin provides support for displaying various info in the status line of
-  the frame.
-
-  The result of this mixin uses the same initialization arguments as the
-  mixin's argument.
-
-  @defmethod*[#:mode override (((make-root-area-container (class (subclass?/c area-container<%>))
-                                                          (parent (is-a?/c area-container<%>)))
-                                (is-a?/c area-container<%>)))]{
-
-    Builds an extra panel for displaying various information.
-  }
-  @defmethod*[#:mode augment (((on-close) void?))]{
-    Removes the GC icon with @racket[unregister-collecting-blit] and cleans up
-    other callbacks.
-  }
-
-}
-@definterface[frame:text-info<%> (frame:info<%>)]{
-  Objects matching this interface receive information from editors constructed
-  with @racket[editor:info-mixin] and display it.
-
-  @defmethod*[(((set-macro-recording (on? boolean?)) void?))]{
-    Shows/hides the icon in the info bar that indicates if a macro recording is
-    in progress.
-  }
-
-  @defmethod*[(((overwrite-status-changed) void?))]{
-    This method is called when the overwrite mode is turned either on or off in
-    the @racket[editor<%>] in this frame.
-  }
-
-  @defmethod*[(((anchor-status-changed) void?))]{
-    This method is called when the anchor is turned either on or off in the 
-    @racket[editor<%>]
-    in this frame.
-  }
-
-  @defmethod*[(((editor-position-changed) void?))]{
-    This method is called when the position in the @racket[editor<%>] changes.
-  }
-
-  @defmethod[(add-line-number-menu-items [menu (is-a?/c menu-item-container<%>)]) void?]{
-    This method is called when the line/column display in the info bar is
-    clicked.  It is passed a @racket[menu-item-container<%>] that can be filled
-    in with menu items; those menu items will appear in the menu that appears
-    when line/colun display is clicked.
-  }
-}
-
-@defmixin[frame:text-info-mixin (frame:info<%>) (frame:text-info<%>)]{
-  This mixin adds status information to the info panel relating to an
-  edit.
-
-  @defmethod*[#:mode augment (((on-close) void?))]{
-
-    removes a preferences callback for @racket['framework:line-offsets].
-    See @racket[preferences:add-callback] for more information.
-  }
-  @defmethod*[#:mode override (((update-info) void?))]{
-
-    Calls
-    @method[frame:text-info<%> overwrite-status-changed],
-    @method[frame:text-info<%> anchor-status-changed], and
-    @method[frame:text-info<%> editor-position-changed].
-  }
-}
-@definterface[frame:pasteboard-info<%> (frame:info<%>)]{
-
-}
-@defmixin[frame:pasteboard-info-mixin (frame:basic<%>) (frame:pasteboard-info<%>)]{
-
-}
-
-@(generate-standard-menus-docs)
-
-@defmixin[frame:standard-menus-mixin (frame:basic<%>) (frame:standard-menus<%>)]{
-  The result of this mixin implements @racket[frame:standard-menus<%>].
-
-  @defmethod*[#:mode augment (((on-close) void?))]{
-    Removes the preferences callbacks for the menu items
-  }
-}
-
-@definterface[frame:editor<%> (frame:standard-menus<%>)]{
-  Frame classes matching this interface support embedded editors.
-  @defmethod*[(((get-entire-label) string))]{
-    This method returns the entire label for the frame.  See also
-    @method[window<%> set-label] and @method[frame:editor<%> set-label-prefix].
-  }
-
-  @defmethod*[(((get-label-prefix) string?))]{
-    This returns the prefix for the frame's label.
-  }
-
-  @defmethod*[(((set-label-prefix (prefix string?)) void?))]{
-    Sets the prefix for the label of the frame.
-  }
-
-  @defmethod*[(((get-canvas%) (subclass?/c editor-canvas%)))]{
-    The result of this method is used to create the canvas for the
-    @racket[editor<%>] in this frame.
-
-    Returns @racket[editor-canvas%].
-  }
-
-  @defmethod*[(((get-canvas<%>) (is-a?/c canvas:basic%)))]{
-    The result of this method is used to guard the result of the
-    @method[frame:editor<%> get-canvas%] method.
-  }
-
-  @defmethod*[(((get-editor%) (implementation?/c editor<%>)))]{
-    The result of this class is used to create the @racket[editor<%>] in this
-    frame.
-
-    Override this method to specify a different editor class.
-
-    Returns the value of the init-field @racket[editor%].
-  }
-
-  @defmethod*[(((get-editor<%>) interface?))]{
-    The result of this method is used by @method[frame:editor<%> make-editor]
-    to check that @method[frame:editor<%> get-editor%] is returning a
-    reasonable editor.
-
-    Returns @racket[editor<%>].
-  }
-
-  @defmethod*[(((make-editor) (is-a?/c editor<%>)))]{
-    This method is called to create the editor in this frame.  It calls
-    @method[frame:editor<%> get-editor<%>] and uses that interface to make sure
-    the result of @method[frame:editor<%> get-editor%] is reasonable.
-
-    Calls @racket[(make-object @#,method[frame:editor<%> get-editor%])].
-  }
-
-  @defmethod*[(((revert) void?))]{
-    Loads the most recently saved version of the file to the disk. If the
-    @racket[editor<%>] is a @racket[text%], the start and end positions are
-    restored.
-  }
-
-  @defmethod*[(((save (format (or/c 'guess 'standard 'text 'text-force-cr 'same 'copy) 'same))
-                boolean?))]{
-    Saves the file being edited, possibly calling
-    @method[frame:editor<%> save-as]
-    if the editor has no filename yet.
-
-    Returns @racket[#f] if the user cancels this operation (only possible when
-    the file has not been saved before and the user is prompted for a new
-    filename) and returns @racket[#t] if not.
-  }
-
-  @defmethod*[(((save-as (format (or/c 'guess 'standard 'text 'text-force-cr 'same 'copy) 'same))
-                boolean?))]{
-    Queries the use for a file name and saves the file with that name.
-
-    Returns @racket[#f] if the user cancells the file-choosing
-    dialog and returns @racket[#t] otherwise.
-  }
-  @defmethod*[(((get-canvas) (is-a?/c canvas%)))]{
-    Returns the canvas used to display the 
-    @racket[editor<%>]
-    in this frame.
-
-
-  }
-  @defmethod*[(((get-editor) (is-a?/c editor<%>)))]{
-    Returns the editor in this frame.
-  }
-}
-@defmixin[frame:editor-mixin (frame:standard-menus<%>) (frame:editor<%>)]{
-  This mixin adds functionality to support an 
-  @racket[editor<%>]
-  in the frame. This
-  includes management of the title, implementations of some of the menu
-  items, a reasonable initial size, and access to the 
-  @racket[editor<%>]
-  itself.
-
-  The size of this frame with be either 600 by 650 or 65 less than the
-  width and height of the screen, whichever is smaller.
-
-  @defconstructor[((filename string?)
-                   (editor% (implementation?/c editor:basic<%>))
-                   (parent (or/c (is-a?/c frame%) false/c) #f)
-                   (width (or/c dimension-integer? false/c) #f)
-                   (height (or/c dimension-integer? false/c) #f)
-                   (x (or/c position-integer? false/c) #f)
-                   (y (or/c position-integer? false/c) #f)
-                   (style (listof (or/c 'no-resize-border
-                                        'no-caption
-                                        'no-system-menu
-                                        'hide-menu-bar
-                                        'mdi-parent
-                                        'mdi-child
-                                        'toolbar-button
-                                        'float
-                                        'metal))
-                          null)
-                   (enabled any/c #t)
-                   (border spacing-integer? 0)
-                   (spacing spacing-integer? 0)
-                   (alignment (list/c (or/c 'left 'center 'right) (or/c 'top 'center 'bottom)) '(center top))
-                   (min-width dimension-integer? graphical-minimum-width)
-                   (min-height dimension-integer? graphical-minimum-height)
-                   (stretchable-width any/c #t)
-                   (stretchable-height any/c #t))]{
-
-  }
-  @defmethod*[#:mode override (((get-filename) (or/c #f path?)))]{
-    Returns the filename in the editor returned by
-    @method[frame:editor<%> get-editor].
-  }
-
-  @defmethod*[#:mode override (((editing-this-file? (filename path?)) boolean?))]{
-    Returns @racket[#t] if the filename is the file that this frame is editing.
-  }
-
-  @defmethod*[#:mode augment (((on-close) void?))]{
-    Calls the @racket[editor:basic<%>]'s method @method[editor:basic<%>
-    on-close].
-  }
-
-  @defmethod*[#:mode augment (((can-close?) void?))]{
-    Calls the @racket[editor:basic<%>]'s method @method[editor:basic<%>
-    can-close?].
-  }
-
-  @defmethod*[#:mode override (((get-label) string?))]{
-    Returns the portion of the label after the hyphen. See also
-    @method[frame:editor<%> get-entire-label].
-  }
-
-  @defmethod*[#:mode override (((set-label (label string?)) void?))]{
-    Sets the label, but preserves the label's prefix. See also
-    @method[frame:editor<%> set-label-prefix].
-  }
-
-  @defmethod*[#:mode override (((file-menu:open-callback (item (is-a?/c menu-item<%>)) (evt (is-a?/c mouse-event%))) void?))]{
-    Calls @racket[handler:open-file] with the directory of the saved file
-    associated with this editor (if any).
-  }
-
-  @defmethod*[#:mode override (((file-menu:revert-on-demand) void?))]{
-    Disables the menu item when the editor is locked.
-  }
-
-  @defmethod*[#:mode override (((file-menu:revert-callback (item (is-a?/c menu-item%)) (evt (is-a?/c control-event%))) void?))]{
-    Informs the user that this action is not undoable and, if they still want
-    to continue, calls @method[frame:editor<%> revert].
-  }
-  @defmethod*[#:mode override (((file-menu:create-revert?) boolean?))]{
-    returns @racket[#t].
-  }
-  @defmethod*[#:mode override (((file-menu:save-callback (item (is-a?/c menu-item%)) (evt (is-a?/c control-event%))) void?))]{
-    Saves the file in the editor.
-  }
-
-  @defmethod*[#:mode override (((file-menu:create-save?) boolean?))]{
-    returns @racket[#t].
-  }
-
-  @defmethod*[#:mode override (((file-menu:save-as-callback (item (is-a?/c menu-item%))
-                                                            (evt (is-a?/c control-event%)))
-                                void?))]{
-    Prompts the user for a file name and uses that filename to save the buffer.
-    Calls @method[frame:editor<%> save-as] with no arguments.
-  }
-
-  @defmethod*[#:mode override (((file-menu:create-save-as?) boolean?))]{
-    returns @racket[#t].
-  }
-
-  @defmethod*[#:mode override (((file-menu:print-callback (item (is-a?/c menu-item%)) 
-                                                          (evt (is-a?/c control-event%)))
-                                void?))]{
-    Calls the @method[editor<%> print] method of @racket[editor<%>] with the
-    default arguments, except that the @racket[output-mode] argument is the
-    result of calling @racket[preferences:get] with
-    @racket['framework:print-output-mode].
-  }
-
-  @defmethod*[#:mode override (((file-menu:create-print?) boolean?))]{
-    returns @racket[#t].
-  }
-
-  @defmethod*[#:mode override (((file-menu:between-save-as-and-print (file-menu (is-a?/c menu%))) void?))]{
-    Creates a Print Setup menu item if @racket[can-get-page-setup-from-user?]
-    and @racket[file-menu:create-print?] both return true.
-  }
-
-  @defmethod*[#:mode override (((edit-menu:between-select-all-and-find (edit-menu (is-a?/c menu%))) void?))]{
-    Adds a menu item for toggling @method[editor<%> auto-wrap] in the focused
-    text.
-  }
-
-  @defmethod*[#:mode override (((help-menu:about-callback (item (is-a?/c menu-item%)) 
-                                                          (evt (is-a?/c control-event%)))
-                                void?))]{
-    Calls @racket[message-box] with a message welcoming the user to the
-    application named by @racket[application:current-app-name]
-  }
-
-  @defmethod*[#:mode override (((help-menu:about-string) string))]{
-    Returns the result of (@racket[application:current-app-name])
-  }
-
-  @defmethod*[#:mode override (((help-menu:create-about?) boolean?))]{
-    returns @racket[#t].
-  }
-}
-
-@definterface[frame:text<%> (frame:editor<%>)]{
-  Frames matching this interface provide support for @racket[text%]s.
-}
-
-@defmixin[frame:text-mixin (frame:editor<%>) (frame:text<%>)]{
-  This mixins adds support for @racket[text%]s in the frame.
-
-  @defconstructor[((editor% (extends text%)))]{
-    Calls the super initialization with either the value of the
-    @racket[editor%] init or, if none was supplied, it passes @racket[text%].
-  }
-
-  @defmethod*[#:mode override (((get-editor<%>) interface))]{
-    Returns @racket[(class->interface text%)].
-  }
-}
-
-@definterface[frame:pasteboard<%> (frame:editor<%>)]{
-  Frames matching this interface provide support for 
-  @racket[pasteboard%]s.
-}
-
-@defmixin[frame:pasteboard-mixin (frame:editor<%>) (frame:pasteboard<%>)]{
-  This mixin provides support for pasteboards in a frame.
-
-  @defconstructor[((editor% (extends pasteboard%)))]{
-    Calls the super initialization with either the value of the
-    @racket[editor%] init or, if none was supplied, it passes
-    @racket[pasteboard%].
-  }
-
-  @defmethod*[#:mode override (((get-editor<%>) interface))]{
-    Returns @racket[(class->interface pasteboard%)].
-  }
-}
-
-@definterface[frame:delegate<%> (frame:status-line<%> frame:text<%>)]{
-  Frames that implement this interface provide a 20,000 feet overview of the
-  text in the main editor. The term @bold{delegate} in these method
-  descriptions refers to the original editor and the term @bold{delegatee}
-  refers to the editor showing the 20,000 feet overview.
-
-  @defmethod[(get-delegated-text) (or/c #f (is-a?/c text:delegate<%>))]{
-    Returns the current delegate text, if any.
-  }
-  
-  @defmethod[(set-delegated-text [d (or/c #f (is-a?/c text:delegate<%>))]) 
-             void?]{
-    Sets the delegate text to @racket[d].
-  }
-
-  @defmethod*[(((delegated-text-shown?) boolean?))]{
-    Returns @racket[#t] if the delegate is visible, and @racket[#f] if it
-    isn't.
-  }
-
-  @defmethod*[(((hide-delegated-text) void?))]{
-    Hides the delegated text.
-
-    When the delegated text is hidden, it is not being updated. This is
-    accomplished by calling the @method[text:delegate<%> set-delegate] method
-    of @method[frame:editor<%> get-editor]with @racket[#f].
-
-    See also @method[frame:delegate<%> show-delegated-text]
-  }
-  @defmethod*[(((show-delegated-text) void?))]{
-    Makes the delegated text visible.
-
-    When the delegated text is shown, the @method[text:delegate<%>
-    set-delegate] method of @method[frame:delegate<%> get-delegated-text]is
-    called with the text to delegate messages to.
-
-    See also @method[frame:delegate<%> hide-delegated-text].
-  }
-
-  @defmethod*[(((delegate-moved) void?))]{
-    This method is called when the visible region of the delegate editor
-    changes, so that the blue region in the delegatee is updated.
-  }
-}
-
-@defmixin[frame:delegate-mixin (frame:status-line<%> frame:text<%>) (frame:delegate<%>)]{
-  Adds support for a 20,000-feet view via @racket[text:delegate<%>] and
-  @racket[text:delegate-mixin].
-
-  @defmethod*[#:mode override (((make-root-area-container (class (subclass?/c panel%))
-                                                          (parent (is-a?/c panel%)))
-                                (is-a?/c panel%)))]{
-    Adds a panel outside to hold the delegate @racket[editor-canvas%] and
-    @racket[text%].
-  }
-
-  @defmethod*[#:mode override (((get-editor<%>) interface))]{
-    Returns @racket[text:delegate<%>].
-  }
-
-  @defmethod*[#:mode override (((get-editor%) (is-a?/c text:delegate<%>)))]{
-    returns the super result, with the @racket[text:delegate-mixin] mixed in.
-  }
-}
-
-@definterface[frame:searchable<%> (frame:basic<%>)]{
-  Frames that implement this interface support searching.
-
-  @defmethod[(search (direction (symbols 'forward 'backward))) void?]{
-    Searches for the text in the search edit in the result of
-    @method[frame:searchable<%> get-text-to-search].
-
-    If the text is found and it sets the selection to the found text.
-  }
-
-  @defmethod[(search-replace) boolean?]{
-    If there is a dark purple bubble (ie, if the replace portion of the search
-    bar is visible and there is a search hit after the insertion point), then
-    this will replace it with the contents of the replace editor and move the
-    insertion point to just after that, or to the end of the editor (if there
-    are no more search hits after the insertion point, but there are search
-    hits before it).
-  }
-
-  @defmethod[(replace-all) void?]{
-    Loops through the text from the beginning to the end, replacing all
-    occurrences of the search string with the contents of the replace edit.
-  }
-
-  @defmethod[(get-text-to-search) (is-a?/c text%)]{
-    Returns the last value passed to
-    @method[frame:searchable<%> set-text-to-search].
-  }
-
-  @defmethod[(set-text-to-search [txt (or/c false/c (is-a?/c (subclass?/c text%)))]) void?]{
-    Sets the current text to be searched.
-  }
-
-  @defmethod[(search-hidden?) boolean?]{
-    Returns @racket[#t] if the search subwindow is visiable and @racket[#f]
-    otherwise.
-  }
-
-  @defmethod[(hide-search) void?]{
-    This method hides the searching information on the bottom of the frame.
-  }
-
-  @defmethod[(unhide-search [move-focus? boolean?]
-                            [#:new-search-string-from-selection? new-search-string-from-selection? boolean? #f])
-             void?]{
-    When the searching sub window is hidden, makes it visible. If
-    @racket[move-focus?] is @racket[#f], the focus is not moved, but if it is
-    any other value, the focus is moved to the find window.
-    
-    If @racket[new-search-string-from-selection?] is a true value and the selection
-    in the result of @method[frame:searchable<%> get-text-to-search] is not empty, 
-    then the search editor is replaced with the selection.
-  }
-
-  @defmethod[(unhide-search-and-toggle-focus
-              [#:new-search-string-from-selection? new-search-string-from-selection? boolean? #f])
-             void?]{
-     Like @method[frame:searchable<%> unhide-search], except it also moves the focus into the
-          text to be searched, or into the search string text, depending on where it 
-          currently is.
-  }
-                   
-  @defmethod[(get-case-sensitive-search?) boolean?]{
-    Returns @racket[#t] if the search is currently case-sensitive.  (This
-    method's value depends on the preference
-    @racket['framework:case-sensitive-search?], but the preference is only
-    consulted when the frame is created.)
-  }
-
-  @defmethod[#:mode public-final (search-hits-changed) void?]{
-    This method is called when the number of search matches changes and it
-    updates the GUI.
-  }
-}
-
-@defmixin[frame:searchable-mixin (frame:standard-menus<%>) (frame:searchable<%>)]{
-  This mixin adds support for searching in the @racket[editor<%>] in this
-  frame.
-
-  @defmethod*[#:mode override (((edit-menu:find-callback) boolean?))]{
-     Toggles the focus between the find window and the window being searched.
-     When moving to the window with the search string, selects the entire range
-     in the buffer.
-  }
-
-  @defmethod*[#:mode override (((edit-menu:create-find?) boolean?))]{
-    returns @racket[#t].
-  }
-
-  @defmethod*[#:mode override
-              (((edit-menu:find-again-callback (item (is-a?/c menu-item%))
-                                               (evt (is-a?/c control-event%)))
-                void?))]{
-    Calls @method[frame:searchable unhide-search] and then
-    @method[frame:searchable<%> search].
-  }
-
-  @defmethod*[#:mode override (((edit-menu:create-find-again?) boolean?))]{
-    returns @racket[#t].
-  }
-
-  @defmethod*[#:mode override (((edit-menu:find-again-backwards-callback
-                                 (item (is-a?/c menu-item%))
-                                 (evt (is-a?/c control-event%)))
-                                void?))]{
-    Calls @method[frame:searchable unhide-search] and then
-    @method[frame:searchable<%> search].
-  }
-
-  @defmethod*[#:mode override (((edit-menu:create-find-again-backwards?) boolean?))]{
-    returns @racket[#t].
-  }
-
-  @defmethod*[#:mode override (((edit-menu:replace-all-callback) boolean?))]{
-    Calls @method[frame:searchable<%> replace-all].
-  }
-
-  @defmethod*[#:mode override (((edit-menu:replace-all-on-demand (item menu-item%)) void?))]{
-    Disables @racket[item] when @method[frame:searchable<%> search-hidden?]
-    returns @racket[#t] and enables it when that method returns @racket[#f].
-  }
-
-  @defmethod*[#:mode override (((edit-menu:create-replace-all?) boolean?))]{
-    returns @racket[#t].
-  }
-
-  @defmethod*[#:mode override (((edit-menu:find-case-sensitive-callback) boolean?))]{
-     Updates the state of the case-sensitive searching for this frame, and sets
-     the @racket['framework:case-sensitive-search?] preference for later
-     frames.
-  }
-
-  @defmethod*[#:mode override (((edit-menu:find-case-sensitive-on-demand (item menu-item%)) void?))]{
-    Checks @racket[item] when searching is case-sensitive and unchecks it
-    otherwise.
-  }
-
-  @defmethod*[#:mode override (((edit-menu:create-find-case-sensitive?) boolean?))]{
-    returns @racket[#t].
-  }
-
-  @defmethod*[#:mode override (((make-root-area-container) (is-a?/c area-container<%>)))]{
-    Builds a panel for the searching information.
-  }
-
-  @defmethod*[#:mode augment (((on-close) void?))]{
-    Cleans up after the searching frame.
-  }
-}
-
-@definterface[frame:searchable-text<%> (frame:searchable<%> frame:text<%>)]{
-}
-
-@defmixin[frame:searchable-text-mixin (frame:text<%> frame:searchable<%>) (frame:searchable-text<%>)]{
-
-  @defmethod*[#:mode override-final (((get-text-to-search) (is-a?/c text%)))]{
-    Returns the result of @method[frame:editor<%> get-editor].
-  }
-
-  @defmethod*[#:mode override (((get-editor<%>) (is-a?/c editor<%>)))]{
-    Returns @racket[text:searching<%>].
-  }
-  @defmethod*[#:mode override (((get-editor%) (is-a?/c editor<%>)))]{
-    Returns @racket[(text:searching-mixin (super get-editor%))].
-  }
-}
-
-@defclass[frame:basic% (frame:register-group-mixin (frame:basic-mixin frame%)) ()]{}
-@defclass[frame:size-pref% (frame:size-pref-mixin frame:basic%) ()]{}
-@defclass[frame:info% (frame:info-mixin frame:basic%) ()]{}
-@defclass[frame:text-info% (frame:text-info-mixin frame:info%) ()]{}
-@defclass[frame:pasteboard-info% (frame:pasteboard-info-mixin frame:text-info%) ()]{}
-@defclass[frame:status-line% (frame:status-line-mixin frame:text-info%) ()]{}
-@defclass[frame:standard-menus% (frame:standard-menus-mixin frame:status-line%) ()]{}
-@defclass[frame:editor% (frame:editor-mixin frame:standard-menus%) ()]{}
-@defclass[frame:text% (frame:text-mixin frame:editor%) ()]{}
-@defclass[frame:searchable% (frame:searchable-text-mixin (frame:searchable-mixin frame:text%)) ()]{}
-@defclass[frame:delegate% (frame:delegate-mixin frame:searchable%) ()]{}
-@defclass[frame:pasteboard% (frame:pasteboard-mixin frame:editor%) ()]{}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^frame:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/framework.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/framework.scrbl
deleted file mode 100644
index 1b8fd00e4a..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/framework.scrbl
+++ /dev/null
@@ -1,148 +0,0 @@
-#lang scribble/doc
-
-@(require (for-label framework framework/framework-unit framework/framework-sig racket/gui)
-          (for-syntax framework/private/scheme racket/base)
-          scribble/manual)
-
-@title{Framework: Racket GUI Application Framework}
-@(defmodule framework)
-
-@author["Robert Bruce Findler" "Matthew Flatt"]
-
-The framework provides a number of mixins, classes and
-functions designed to help you build a complete application
-program on top of the @racket[racket/gui] library.
-
-
-@bold{Thanks}
-Thanks to Shriram Krishnamurthi, Cormac Flanagan, Matthias
-Felleisen, Ian Barland, Gann Bierner, Richard Cobbe, Dan
-Grossman, Stephanie Weirich, Paul Steckler, Sebastian Good,
-Johnathan Franklin, Mark Krentel, Corky Cartwright, Michael
-Ernst, Kennis Koldewyn, Bruce Duba, and many others for
-their feedback and help.
-
-
-@section{Framework Libraries Overview}
-
-@itemize[
-@item{Entire Framework: @racketmodname[framework]
-
-  This library provides all of the definitions and syntax
-  described in this manual.
-}
- 
-@item{Test Suite Engine: @racketmodname[framework/test]
-
-This library provides all of the definitions beginning with
-@racket[test:] described in this manual.
-}
-
-@item{GUI Utilities @racketmodname[framework/gui-utils]
-
-    This libraries provides all of the definitions beginning
-    with @racket[gui-utils:] described in this manual.
-}
-@item{Preferences @racketmodname[framework/preferences]
-    
-  This library provides a subset of the names of the
-  @racketmodname[framework] library, namely those for
-  manipulating preference settings and is designed to be
-  used from @exec{racket}.
-}
-
-@item{Splash Screen @racketmodname[framework/splash]  
-       This library provides support for a splash screen. See
-       @racketmodname[framework/splash] for more.
-}]
-        
-@include-section["application.scrbl"]
-@include-section["autosave.scrbl"]
-@include-section["canvas.scrbl"]
-@include-section["color-model.scrbl"]
-@include-section["color-prefs.scrbl"]
-@include-section["color.scrbl"]
-@include-section["comment-box.scrbl"]
-
-@section{Decorated Editor Snip}
-
-@defmodule[framework/decorated-editor-snip]
-
-This library is here for backwards compatibility. The
-functionality in it has moved into the framework proper, in
-the @secref["editor-snip"] section.
-
- @defidform[decorated-editor-snip%]{
-    Use @racket[editor-snip:decorated%] instead.
-  }
- @defidform[decorated-editor-snipclass%]{
-    Use @racket[editor-snip:decorated-snipclass%] instead.
-  }
- @defidform[decorated-editor-snip-mixin]{
-    Use @racket[editor-snip:decorated-mixin] instead.
-  }
- @defidform[decorated-editor-snip<%>]{
-    Use @racket[editor-snip:decorated<%>] instead.
-  }
-
-
-@include-section["editor-snip.scrbl"]
-@include-section["editor.scrbl"]
-@include-section["exit.scrbl"]
-@include-section["finder.scrbl"]
-@include-section["frame.scrbl"]
-@include-section["group.scrbl"]
-@include-section["gui-utils.scrbl"]
-@include-section["handler.scrbl"]
-@include-section["icon.scrbl"]
-@include-section["keymap.scrbl"]
-@include-section["menu.scrbl"]
-@include-section["mode.scrbl"]
-@include-section["number-snip.scrbl"]
-@include-section["panel.scrbl"]
-@include-section["pasteboard.scrbl"]
-@include-section["path-utils.scrbl"]
-@include-section["preferences.scrbl"]
-@include-section["preferences-text.scrbl"]
-@include-section["racket.scrbl"]
-@include-section["text.scrbl"]
-@include-section["splash.scrbl"]
-@include-section["test.scrbl"]
-@include-section["version.scrbl"]
-
-@section{Backwards Compatibility}
-
-@(define-syntax (scheme:-docs stx)
-   #`(begin
-       #,@(for/list ([suffix (in-list racket:ids)])
-            (define scheme:id (string->symbol (format "scheme:~a" suffix)))
-            (define racket:id (string->symbol (format "racket:~a" suffix)))
-            #`@defidform[#,scheme:id]{An alias for @racket[#,racket:id].})))
-@(scheme:-docs)
-
-@section{Signatures}
-
-@defmodule[framework/framework-sig]
-
-@defsignature[framework^ ()]{
-  Contains all of the names of the procedures in this
-  manual, except those that begin with @racket[test:] or
-  @racket[gui-utils:].
-}
-
-
-@defsignature[framework-class^ ()]{
-  Contains all of the classes defined in this
-  manual.
-}
-
-@section{Unit}
-
-@defmodule[framework/framework-unit]
-
-@defthing[framework@ unit?]{
-  Exports the signature
-  @racket[framework^] and imports the @racket[mred^] signature.
-}
-
-@index-section[]
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/group.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/group.scrbl
deleted file mode 100644
index dc558578ae..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/group.scrbl
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Group}
-
-@defclass[group:% object% ()]{
-  This class manages a group of frames matching the @racket[frame:basic<%>]
-  interface. There is one instance created by the framework, returned by the
-  function @racket[group:get-the-frame-group] and every frame that was
-  constructed with @racket[frame:basic-mixin] adds itself to the result of
-  @racket[group:get-the-frame-group].
-
-  @defmethod*[(((get-mdi-parent) (or/c false/c (is-a?/c frame%))))]{
-    The result of this method must be used as the parent frame for each frame
-    in the group.
-  }
-
-  @defmethod*[(((get-frames) (list-of (is-a?/c frame:basic<%>))))]{
-    Returns the frames in the group.
-  }
-
-  @defmethod*[(((frame-label-changed (frame (is-a?/c frame:basic<%>))) void?))]{
-    This method is called by frames constructed with @racket[frame:basic-mixin]
-    when their titles change.
-
-    Updates the windows menu of each frame in the group.
-  }
-
-  @defmethod*[(((frame-shown/hidden) void?))]{
-    This method is called by instances of @racket[frame:basic%] to notify the
-    frame group that a frame's visibility is changed.
-
-    Updates the Windows menus of all of the frames in the frame group.
-  }
-
-  @defmethod*[(((for-each-frame (f ((is-a?/c frame:basic<%>) -> void?))) void?))]{
-    This method applies a function to each frame in the group. It also
-    remembers the function and applies it to any new frames that are added to
-    the group when they are added.
-
-    See also @method[group:% get-frames].
-
-    Applies @racket[f] to each frame in the group
-  }
-
-  @defmethod*[(((get-active-frame) (is-a?/c frame:basic<%>)))]{
-    Returns the frame with the keyboard focus or the first frame in the group.
-  }
-
-  @defmethod*[(((set-active-frame (frame (is-a?/c frame:basic<%>))) void?))]{
-    Sets the active frame in the group.  This method is called by
-    @method[frame:register-group-mixin on-activate].
-  }
-
-  @defmethod*[(((insert-frame (frame (is-a?/c frame:basic<%>))) void?))]{
-    Inserts a frame into the group.
-  }
-
-  @defmethod*[(((remove-frame (frame (is-a?/c frame:basic<%>))) void?))]{
-    Removes a frame from the group.
-  }
-
-  @defmethod*[(((clear) boolean?))]{
-    This removes all of the frames in the group. It does not close the frames.
-    See also @method[group:% on-close-all]and @method[group:% can-close-all?].
-  }
-
-  @defmethod*[(((on-close-all) void?))]{
-    Call this method to close all of the frames in the group.  The function
-    @method[group:% can-close-all?] must have been called just before this
-    function and it must have returned @racket[#t].
-
-    Calls the @method[top-level-window<%> on-close] method and the
-    @method[top-level-window<%> show] method (with @racket[#f] as argument) on
-    each frame in the group.
-  }
-
-  @defmethod*[(((can-close-all?) boolean?))]{
-    Call this method to make sure that closing all of the frames in the frame
-    groups is permitted by the user. The function @method[group:% on-close-all]
-    is expected to be called just after this method is called.
-
-    Calls the @method[top-level-window<%> can-close?]  method of each frame in
-    the group.
-  }
-  @defmethod*[(((locate-file [name path?]) (or/c false/c (is-a?/c frame:basic<%>))))]{
-    Returns the frame that is editing or viewing the file @racket[name].
-  }
-}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^group:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/gui-utils.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/gui-utils.scrbl
deleted file mode 100644
index 3f99c0e573..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/gui-utils.scrbl
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract
-          (for-label framework racket/gui))
-@title{GUI Utilities}
-
-@defmodule*/no-declare[(framework/gui-utils)]
-@declare-exporting[framework/gui-utils framework]
-
-@(include-extracted (lib "gui-utils.rkt" "framework"))
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/handler.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/handler.scrbl
deleted file mode 100644
index 06316df349..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/handler.scrbl
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Handler}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^handler:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/icon.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/icon.scrbl
deleted file mode 100644
index ff08278152..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/icon.scrbl
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Icon}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^icon:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/info.rkt b/pkgs/gui-pkgs/gui-doc/scribblings/framework/info.rkt
deleted file mode 100644
index f235949236..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang info
-
-(define scribblings '(("framework.scrbl" (multi-page) (gui-library 100))))
-
-
-(define test-responsibles '((all robby)))
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/keymap.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/keymap.scrbl
deleted file mode 100644
index d372a78501..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/keymap.scrbl
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Keymap}
-
-@definterface[keymap:aug-keymap<%> (keymap%)]{
-  This keymap overrides some of the built in @racket[keymap%] methods to be
-  able to extract the keybindings from the keymap.
-
-  @defmethod*[(((get-chained-keymaps) (listof (is-a?/c keymap%))))]{
-    Returns the list of keymaps that are chained to this one.
-  }
-
-  @defmethod*[(((get-map-function-table) hash?))]{
-    Returns a hash-table that maps symbols naming key sequences to the names of
-    the keymap functions the are bound to.
-  }
-
-  @defmethod*[(((get-map-function-table/ht (ht hash?)) hash?))]{
-    This is a helper function for @method[keymap:aug-keymap<%>
-    get-map-function-table] that returns the same result, except it accepts a
-    hash-table that it inserts the bindings into. It does not replace any
-    bindings already in @racket[ht].
-  }
-}
-@defmixin[keymap:aug-keymap-mixin (keymap%) (keymap:aug-keymap<%>)]{
-  @defmethod*[#:mode override (((chain-to-keymap (next (is-a?/c keymap%)) (prefix? boolean?)) void))]{
-    Keeps a list of the keymaps chained to this one.
-  }
-
-  @defmethod*[#:mode override (((remove-chained-keymap (keymap (is-a?/c keymap))) void))]{
-    Keeps the list of the keymaps chained to this one up to date.
-  }
-
-  @defmethod*[#:mode override (((map-function (key-name string) (function-name string)) void))]{
-    Keeps a separate record of the key names and functions that they are bound
-    to in this keymap.
-  }
-}
-
-@defclass[keymap:aug-keymap% (keymap:aug-keymap-mixin keymap%) ()]{}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^keymap:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/main-extracts.rkt b/pkgs/gui-pkgs/gui-doc/scribblings/framework/main-extracts.rkt
deleted file mode 100644
index 6d7e7c29f2..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/main-extracts.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require scribble/extract)
-
-(provide-extracted (lib "framework/main.rkt"))
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/main.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/main.scrbl
deleted file mode 100644
index 74fd3fd0d0..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/main.scrbl
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Main}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^main:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/menu.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/menu.scrbl
deleted file mode 100644
index 6d8943900a..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/menu.scrbl
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Menu}
-
-@definterface[menu:can-restore<%> (selectable-menu-item<%>)]{
-  Classes created with this mixin remember their keybindings so the keybindings
-  can be removed and then restored.
-
-  @defmethod*[(((restore-keybinding) void?))]{
-    Sets the keyboard shortcut to the setting it had when the class was
-    created.
-  }
-}
-
-@defmixin[menu:can-restore-mixin (selectable-menu-item<%>) (menu:can-restore<%>)]{
-}
-
-@definterface[menu:can-restore-underscore<%> (labelled-menu-item<%>)]{
-  These menus can save and restore the underscores (indicated via the
-  @litchar{&} characters in the original labels) in their labels.
-
-  If the preference @racket['framework:menu-bindings] is @racket[#f], calls
-  @method[menu:can-restore-underscore<%> erase-underscores] during
-  initialization.
-
-  @defmethod*[(((erase-underscores) void?))]{
-    Erases the underscores in the label of this menu, but remembers them so
-    they can be restores with @method[menu:can-restore-underscore<%>
-    restore-underscores].
-  }
-
-  @defmethod*[(((restore-underscores) void?))]{
-    Restores underscores in the menu's label to their original state.
-  }
-}
-
-@defmixin[menu:can-restore-underscore-mixin (labelled-menu-item<%>) (menu:can-restore-underscore<%>)]{
-}
-
-@defclass[menu:can-restore-menu-item% (menu:can-restore-mixin menu-item%) ()]{}
-@defclass[menu:can-restore-checkable-menu-item% (menu:can-restore-mixin checkable-menu-item%) ()]{}
-@defclass[menu:can-restore-underscore-menu% (menu:can-restore-underscore-mixin menu%) ()]{}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^menu:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/mode-helpers.rkt b/pkgs/gui-pkgs/gui-doc/scribblings/framework/mode-helpers.rkt
deleted file mode 100644
index d2a3e3ea5e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/mode-helpers.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#reader scribble/reader
-#lang scheme/base
-
-(provide spec->host-method spec->surrogate-method)
-(require (for-template scribble/manual scheme/base))
-(require scheme/class)
-(require (for-label framework))
-
-(define (spec->host-method spec)
-  (syntax-case* spec (override augment) (λ (x y) (eq? (syntax-e x) (syntax-e y)))
-    [(override mtd (x ...) ...)
-     #'@defmethod*[(((mtd (x any/c) ...) any) ...)]{
-        Delegates to the result of @method[mode:host-text<%> get-surrogate] if it is not @racket[#f].}]
-    [(augment default mtd (x ...) ...)
-     #'@defmethod*[(((mtd (x any/c) ...) any) ...)]{
-        Delegates to the result of @method[mode:host-text<%> get-surrogate] if it is not @racket[#f].}]))
-
-(define (spec->surrogate-method spec)
-  (syntax-case* spec (override augment) (λ (x y) (eq? (syntax-e x) (syntax-e y)))
-    [(override method (x ...) ...)
-     #'@defmethod*[(((method (orig (is-a?/c text%)) (call-super (-> any)) (x any/c) ...) any) ...)]{
-          Returns the result of invoking @racket[call-super].
-    }]
-    [(augment default method (x ...) ...)
-     #'@defmethod*[(((method (orig (is-a?/c text%)) (call-inner (-> any)) (x any/c) ...) any) ...)]{
-          Returns the result of invoking @racket[call-super].
-    }]))
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/mode.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/mode.scrbl
deleted file mode 100644
index 598b29d621..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/mode.scrbl
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract
-          (for-label framework scheme/gui)
-          (for-syntax "mode-helpers.rkt"))
-@title{Mode}
-
-@(begin
-(require framework/private/mode (for-syntax scheme/base))
-
-(define-syntax (docs stx)
-  (syntax-case stx ()
-   [(_ spec ...)
-   #`(begin
-    @definterface[mode:surrogate-text<%> ()]{
-      @defmethod[(on-enable-surrogate [txt (is-a?/c text%)]) any]{
-        Called by @method[mode:host-text<%> set-surrogate] to notify the
-        surrogate that it has just become active.
-      }
-      @defmethod[(on-disable-surrogate [txt (is-a?/c text%)]) any]{
-        Called by @method[mode:host-text<%> set-surrogate] to notify the
-        surrogate that it has just been disabled.
-      }
-    }
-    @defclass[mode:surrogate-text% object% (mode:surrogate-text<%>)]{
-      @#,@(map spec->surrogate-method (syntax->list #'(spec ...)))
-    }
-    @definterface[mode:host-text<%> ()]{
-      @defmethod[(get-surrogate)
-                 (or/c false/c (is-a?/c mode:surrogate-text<%>))]{
-       Returns the currently active surrogate.
-      }
-      @defmethod[(set-surrogate
-                  [surrogate (or/c false/c (is-a?/c mode:surrogate-text<%>))])
-                 void?]{
-        Sets the current surrogate to @racket[surrogate].
-      }
-    }
-    @defmixin[mode:host-text-mixin () (mode:host-text<%>)]{
-      @#,@(map spec->host-method (syntax->list #'(spec ...)))
-    })]))
-
-(surrogate-methods docs)
-)
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^mode:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/number-snip.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/number-snip.scrbl
deleted file mode 100644
index e1a705f7b8..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/number-snip.scrbl
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Number Snip}
-
-@defclass[number-snip:snip-class% snip-class% ()]{
-
-  @defmethod*[#:mode override (((read (f (is-a?/c editor-stream-in%))) (or/c (is-a?/c snip%) #f)))]{
-
-    Constructs a number snip from its input.
-  }
-}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^number-snip:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/panel.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/panel.scrbl
deleted file mode 100644
index 708b46aec4..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/panel.scrbl
+++ /dev/null
@@ -1,283 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework mrlib/switchable-button racket/gui))
-@title{Panel}
-
-@definterface[panel:single<%> (area-container<%>)]{
-  See @racket[panel:single-mixin%].
-
-  @defmethod*[(((active-child (child (is-a?/c area<%>))) void?) ((active-child) (is-a?/c area<%>)))]{
-    Sets the active child to be @racket[child]
-
-    Returns the current active child.
-  }
-}
-
-@defmixin[panel:single-mixin (area-container<%>) (panel:single<%>)]{
-  This mixin adds single panel functionality to an implementation of the
-  @racket[area-container<%>] interface.
-
-  Single panels place all of the children in the center of the panel, and allow
-  make one child to be visible at a time. The
-  @method[panel:single<%> active-child] method controls which panel is
-  currently active.
-
-  The @method[window<%> show] method is used to hide and show the children of a
-  single panel.
-
-  @defmethod*[#:mode override (((after-new-child (child (is-a?/c subarea<%>))) void?))]{
-    Hides this child by calling @racket[(send child show #f)], unless this is
-    the first child in which case it does nothing.
-  }
-
-  @defmethod*[#:mode override (((container-size) (values exact-integer? exact-integer?)))]{
-    Returns the maximum width of all the children and the maximum height of all
-    of the children.
-  }
-
-  @defmethod*[#:mode override (((place-children) (listof (list/c exact-integer? exact-integer? exact-integer? exact-integer?))))]{
-    Returns the positions for single panels and panes.
-  }
-}
-
-@definterface[panel:single-window<%> (panel:single<%> window<%>)]{
-}
-
-@defmixin[panel:single-window-mixin (panel:single<%> window<%>) (panel:single-window<%>)]{
-  @defmethod*[#:mode override 
-                     (((container-size (info (listof (list/c exact-integer? 
-                                                             exact-integer? 
-                                                             boolean? 
-                                                             boolean?))))
-                       (values exact-integer? exact-integer?)))]{
-    Factors the border width into the size calculation.
-  }
-}
-
-@defclass[panel:single% (panel:single-window-mixin (panel:single-mixin panel%)) ()]{}
-@defclass[panel:single-pane% (panel:single-mixin pane%) ()]{}
-
-@definterface[panel:dragable<%> (window<%> area-container<%>)]{
-  Classes matching this interface implement a panel where the user can adjust
-  the percentage of the space that each takes up. The user adjusts the size by
-  clicking and dragging the empty space between the children.
-
-  @defmethod*[(((after-percentage-change) void?))]{
-    This method is called when the user changes the percentage by dragging the
-    bar between the children, or when a new child is added to the frame, but
-    not when @method[panel:dragable<%> set-percentages] is called.
-
-    Use @method[panel:dragable<%> get-percentages] to find the current
-    percentages.
-  }
-  
-  @defmethod[(get-default-percentages [subwindow-count exact-positive-integer?])
-             (listof (and/c real? (between/c 0 1)))]{
-     Called when the number of children in the panel changes;
-     the result is used as the initial percentages for each of the new
-     windows. 
-     
-     The numbers in the result list must sum to @racket[1].
-  }
-
-  @defmethod[(right-click-in-gap [evt (is-a?/c mouse-event%)]
-                                 [before (is-a?/c subarea<%>)]
-                                 [after (is-a?/c subarea<%>)])
-             void?]{
-    This method is called when the user right-clicks in the space
-    between two children. It receives the mouse event and the
-    child before and after the gap where the user clicked.
-  }
-
-                                                    
-  @defmethod*[(((set-percentages (new-percentages (listof number?))) void?))]{
-    Call this method to set the percentages that each window takes up of the
-    panel.
-
-    The argument, @racket[new-percentages] must be a list of numbers that sums
-    to 1. It's length must be equal to the number of children of the panel (see
-    @method[area-container<%> get-children]) and each percentage must
-    correspond to a number of pixels that is equal to or larger than the
-    minimum with of the child, as reported by @method[area<%> min-width].
-  }
-
-  @defmethod*[(((get-percentages) (listof number?)))]{
-    Return the current percentages of the children.
-  }
-
-  @defmethod*[(((get-vertical?) boolean?))]{
-    This method controls the behavior of the other overridden methods in mixins
-    that implement this interface.
-
-    If it returns @racket[#t], the panel will be vertically aligned and if it
-    returns @racket[#f], they will be horizontally aligned.
-  }
-
-  @defmethod[(set-orientation [horizontal? boolean?]) void?]{
-    Sets the orientation of the panel, switching it from behaving like a
-    @racket[panel:horizontal-dragable<%>] and
-    @racket[panel:vertical-dragable<%>].
-  }
-}
-
-@definterface[panel:vertical-dragable<%> (panel:dragable<%>)]{
-  A panel that implements @racket[panel:vertical-dragable<%>]. It aligns its
-  children vertically.
-}
-
-@definterface[panel:horizontal-dragable<%> (panel:dragable<%>)]{
-  A panel that implements @racket[panel:horizontal-dragable<%>]. It aligns its
-  children horizontally.
-}
-
-@defmixin[panel:dragable-mixin (window<%> area-container<%>) (panel:dragable<%>)]{
-  This mixin adds the @racket[panel:dragable<%>] functionality to a
-  @racket[panel%].
-
-  It is not useful unless the @method[panel:dragable<%> get-vertical?]  method
-  is overridden.
-
-  @defmethod*[#:mode override (((after-new-child (child (is-a?/c subarea<%>))) void?))]{
-    Updates the number of percentages to make sure that it matches the number
-    of children and calls @method[panel:dragable<%> after-percentage-change].
-  }
-
-  @defmethod*[#:mode override (((on-subwindow-event (receiver (is-a?/c window<%>)) (event (is-a?/c mouse-event%))) boolean?))]{
-    When the cursor is dragging the middle bar around, this method handles the
-    resizing of the two panes.
-  }
-
-  @defmethod*[#:mode override
-              (((place-children (info (listof (list/c exact-integer? exact-integer?)))
-                                (w exact-integer?)
-                                (h exact-integer?))
-                (listof (list/c exact-integer? exact-integer? exact-integer? exact-integer?))))]{
-    Places the children vertically in the panel, based on the percentages
-    returned from @method[panel:dragable<%> get-percentages]. Also leaves a
-    little gap between each pair of children.
-  }
-
-  @defmethod*[#:mode override (((container-size (info (listof (list/c exact-integer? exact-integer? any/c any/c))))
-                                (values exact-integer? exact-integer?)))]{
-    Computes the minimum size the panel would have to be in order to have the
-    current percentages (see @method[panel:dragable<%> get-percentages]).
-  }
-}
-
-@defmixin[panel:vertical-dragable-mixin (panel:dragable<%>) (panel:vertical-dragable<%>)]{
-  This mixin merely overrides the @method[panel:dragable<%> get-vertical?]
-  method of the @racket[panel:dragable-mixin] to return @racket[#t].
-
-  @defmethod*[#:mode override (((get-vertical?) boolean?))]{
-    Returns @racket[#t].
-  }
-}
-@defmixin[panel:horizontal-dragable-mixin (panel:dragable<%>) (panel:vertical-dragable<%>)]{
-  This mixin merely overrides the @method[panel:dragable<%> get-vertical?]
-  method of the @racket[panel:dragable-mixin] to return @racket[#f].
-
-  @defmethod*[#:mode override (((get-vertical?) boolean?))]{
-    Returns @racket[#f].
-  }
-}
-
-@defclass[panel:vertical-dragable% (panel:vertical-dragable-mixin (panel:dragable-mixin panel%)) ()]{}
-@defclass[panel:horizontal-dragable% (panel:horizontal-dragable-mixin (panel:dragable-mixin panel%)) ()]{}
-
-@definterface[panel:splitter<%> ()]{
-  A panel that implements @racket[panel:splitter<%>]. Children can be split
-  horizonally or vertically.
-}
-
-@defmixin[panel:splitter-mixin (area-container<%> panel:dragable<%>) (panel:splitter<%>)]{
-  This mixin allows panels to split their children either horizontally or
-  vertically. Children that are split can be further split independant of any
-  other splitting.
-
-  @defmethod[(split-vertical (canvas (is-a?/c canvas<%>))
-                             (maker (-> (is-a?/c panel:splitter<%>)
-                                        (is-a?/c canvas<%>))))
-                             (is-a?/c canvas<%>)]{
-    Splits the @racket[canvas] vertically by creating a new instance using
-    @racket[maker]. This splitter object is passed as the argument to
-    @racket[maker] and should be used as the @racket[parent] field of the newly
-    created canvas.
-  }
-
-  @defmethod[(split-horizontal (canvas (is-a?/c canvas<%>))
-                             (maker (-> (is-a?/c panel:splitter<%>)
-                                        (is-a?/c canvas<%>))))
-                             (is-a?/c canvas<%>)]{
-    Similar to @racket[split-vertical] but splits horizontally.
-  }
-
-  @defmethod[(collapse (canvas (is-a?/c canvas<%>))) void]{
-    Removes the given @racket[canvas] from the splitter hierarchy and collapses
-    any split panes as necessary.
-  }
-
-}
-
-@definterface[panel:discrete-sizes<%> ()]{
-  Classes implementing this interface support children
-  with multiple fixed sizes. As the panel is resized,
-  it calculates a set of sizes of its children
-  that fills its available size and approtions the space accordingly
-  using only one of the fixed sizes.
-  
-  The strategy it uses is to try to give the largest of
-  the sizes to children that appear later in
-  the list of children (to the right horizontal and lower
-  vertically). It does not try all possible combinations.
-  
-  Each child that supports minimum sizes is expected to
-  implement the @racket[panel:discrete-child<%>] interface.
-  Children that do not implement this interface are just
-  treated like @racket[horizontal-panel%] or @racket[vertical-panel%]
-  would treat them, with the exception of 
-  @racket[switchable-button%]. In that case, the
-  results of
-  @method[switchable-button% get-small-width] and
-  @method[switchable-button% get-large-width] are 
-  treated as the two fixed sizes for instances of that class.
-
-  Also note that, the orientation of the panel determines whether
-  or not it treats heights or widths as described above. That is,
-  when a panel is in vertical mode, it ignores the horizontal
-  discrete sizes, and vice-versa.
-  
-  @defmethod[(set-orientation [horizontal? boolean?]) void?]{
-    Changes the orientation of the panel.                                                           
-  }
-  @defmethod[(get-orientation) boolean?]{
-    Returns the current orientation of the panel.                                                           
-  }
-}
-
-@definterface[panel:discrete-child<%> ()]{
-   Classes that implement this method collaborate with 
-   @racket[panel:discrete-sizes<%>] to indicate 
-   which fixed sizes they support.
-                                          
-  @defmethod[(get-discrete-widths) (listof exact-nonnegative-integer?)]{
-     Return a list of widths this class supports.
-  }
-  @defmethod[(get-discrete-heights) (listof exact-nonnegative-integer?)]{    
-     Return a list of heights this class supports.
-  }
-}
-
-@defmixin[panel:discrete-sizes-mixin (panel%) (panel:discrete-sizes<%> panel:discrete-child<%>)]{
-   Provides an implementation of @racket[panel:discrete-sizes<%>].
-                                 
-   It uses the sizes of its children to implement the @racket[panel:discrete-child<%>] interface.
-}
-
-@defclass[panel:horizontal-discrete-sizes% (panel:discrete-sizes-mixin panel%) ()]{}
-@defclass[panel:vertical-discrete-sizes% (panel:discrete-sizes-mixin panel%) ()]{
-  Calls @method[panel:discrete-sizes<%> set-orientation] with @racket[#f] during
-        initialization.
-}
-
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^panel:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/pasteboard.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/pasteboard.scrbl
deleted file mode 100644
index dc449afa73..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/pasteboard.scrbl
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Pasteboard}
-
-@defclass[pasteboard:basic% (editor:basic-mixin pasteboard%) ()]{}
-@defclass[pasteboard:standard-style-list% (editor:standard-style-list-mixin pasteboard:basic%) ()]{}
-@defclass[pasteboard:keymap% (editor:keymap-mixin pasteboard:standard-style-list%) ()]{}
-@defclass[pasteboard:file% (editor:file-mixin pasteboard:keymap%) ()]{}
-@defclass[pasteboard:backup-autosave% (editor:backup-autosave-mixin pasteboard:file%) ()]{}
-@defclass[pasteboard:info% (editor:info-mixin pasteboard:backup-autosave%) ()]{}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^pasteboard:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/path-utils.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/path-utils.scrbl
deleted file mode 100644
index ea3ce3763f..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/path-utils.scrbl
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Path Utils}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^path-utils:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/preferences-text.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/preferences-text.scrbl
deleted file mode 100644
index 4adb557189..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/preferences-text.scrbl
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Preferences, Textual}
-
-@defmodule*/no-declare[(framework/preferences)]
-@declare-exporting[framework/preferences framework]
-
-@(include-extracted (lib "preferences.rkt" "framework"))
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/preferences.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/preferences.scrbl
deleted file mode 100644
index ff1e9a9337..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/preferences.scrbl
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Preferences}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^preferences:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/racket.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/racket.scrbl
deleted file mode 100644
index 6364f77d59..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/racket.scrbl
+++ /dev/null
@@ -1,288 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Racket}
-
-@definterface[racket:sexp-snip<%> ()]{
-  @defmethod*[(((get-saved-snips) (listof (is-a?/c snip%))))]{
-    This returns the list of snips hidden by the sexp snip.
-  }
-}
-@defclass[racket:sexp-snip% snip% (racket:sexp-snip<%> readable-snip<%>)]{
-  @defmethod*[#:mode override
-              (((get-text (offset number?) (num number?)
-                          (flattened? boolean? #f))
-                string?))]{
-    Returns the concatenation of the text for all of the hidden snips.
-  }
-  @defmethod*[#:mode override (((copy) (is-a?/c racket:sexp-snip%)))]{
-    Returns a copy of this snip that includes the hidden snips.
-  }
-  @defmethod*[#:mode override (((write (stream-out (is-a?/c editor-stream-out%))) void?))]{
-    Saves the embedded snips
-  }
-  @defmethod*[#:mode override
-              (((draw (dc dc<%>) (x real?) (y real?)
-                      (left real?) (top real?) (right real?) (bottom real?)
-                      (dx real?) (dy real?) (draw-caret symbol?))
-                void?))]{
-    Draws brackets with a centered ellipses between them.
-  }
-  @defmethod*[#:mode override
-              (((get-extent (dc (is-a?/c dc<%>)) (x real?) (y real?)
-                            (w (or/c (box/c (and/c real? (not/c negative?))) #f) #f)
-                            (h (or/c (box/c (and/c real? (not/c negative?))) #f) #f)
-                            (descent (or/c (box/c (and/c real? (not/c negative?))) #f) #f)
-                            (space (or/c (box/c (and/c real? (not/c negative?))) #f) #f)
-                            (lspace (or/c (box/c (and/c real? (not/c negative?))) #f) #f)
-                            (rspace (or/c (box/c (and/c real? (not/c negative?))) #f) #f))
-                void?))]{
-    Returns a size corresponding to what this snip draws.
-  }
-}
-@definterface[racket:text<%> (text:basic<%> mode:host-text<%> color:text<%>)]{
-  Texts matching this interface support Racket mode operations.
-
-  @defmethod*[(((get-limit (start exact-integer?)) exact-integer?))]{
-    Returns a limit for backward-matching parenthesis starting at position
-    @racket[start].
-  }
-
-  @defmethod*[(((balance-parens (key-event (is-a?/c key-event%))) void?))]{
-    This function is called when the user types a close parenthesis in the
-    @racket[text%].  If the close parenthesis that the user inserted does not
-    match the corresponding open parenthesis and the
-    @racket['framework:fixup-parens] preference is @racket[#t] (see
-    @racket[preferences:get]) the correct closing parenthesis is inserted.  If
-    the @racket['framework:paren-match] preference is @racket[#t] (see
-    @racket[preferences:get]) the matching open parenthesis is flashed.
-  }
-
-  @defmethod*[(((tabify-on-return?) boolean?))]{
-    The result of this method is used to determine if the return key
-    automatically tabs over to the correct position.
-
-    Override it to change its behavior.
-  }
-
-  @defmethod*[(((tabify (start-pos exact-integer?
-                                   (send this get-start-position)))
-                void?))]{
-    Tabs the line containing by @racket[start-pos]
-  }
-
-  @defmethod*[(((tabify-selection (start exact-integer? (send this get-start-position))
-                                  (end exact-integer? (send this get-end-position)))
-                void?))]{
-    Sets the tabbing for the lines containing positions @racket[start]
-    through @racket[end].
-  }
-
-  @defmethod*[(((tabify-all) void?))]{
-    Tabs all lines.
-  }
-
-  @defmethod*[(((insert-return) void?))]{
-    Inserts a newline into the buffer.  If @method[racket:text<%>
-    tabify-on-return?] returns @racket[#t], this will tabify the new line.
-  }
-
-  @defmethod*[(((box-comment-out-selection
-                 (start-pos (or/c (symbols 'start) exact-integer?))
-                 (end-pos (or/c (symbols 'end) exact-integer?)))
-                void?))]{
-    This method comments out a selection in the text by putting it into a
-    comment box.
-
-    Removes the region from @racket[start-pos] to @racket[end-pos] from the
-    editor and inserts a comment box with that region of text inserted into the
-    box.
-
-    If @racket[start-pos] is @racket['start], the starting point of the
-    selection is used.  If @racket[end-pos] is @racket['end], the ending point
-    of the selection is used.
-  }
-
-  @defmethod*[(((comment-out-selection (start exact-integer?)
-                                       (end exact-integer?))
-                void?))]{
-    Comments the lines containing positions @racket[start] through @racket[end]
-    by inserting a semi-colon at the front of each line.
-  }
-
-  @defmethod*[(((uncomment-selection (start exact-integer?) (end exact-integer?)) void?))]{
-    Uncomments the lines containing positions @racket[start] through
-    @racket[end].
-  }
-
-  @defmethod*[(((get-forward-sexp (start exact-integer?))
-                (or/c #f exact-integer?)))]{
-    Returns the position of the end of next S-expression after position
-    @racket[start], or @racket[#f] if there is no appropriate answer.
-  }
-
-  @defmethod*[(((remove-sexp (start exact-integer?)) void?))]{
-    Forward-deletes the S-expression starting after the position
-    @racket[start].
-  }
-
-  @defmethod*[(((forward-sexp (start exact-integer?)) void?))]{
-    Moves forward over the S-expression starting at position @racket[start].
-  }
-
-  @defmethod*[(((flash-forward-sexp (start-pos exact-integer?)) void?))]{
-    Flashes the parenthesis that closes the sexpression at @racket[start-pos].
-  }
-
-  @defmethod*[(((get-backward-sexp (start exact-integer?))
-                (or/c exact-integer? #f)))]{
-    Returns the position of the start of the S-expression before or containing
-    @racket[start], or @racket[#f] if there is no appropriate answer.
-  }
-
-  @defmethod*[(((flash-backward-sexp (start-pos exact-integer?)) void?))]{
-    Flashes the parenthesis that opens the sexpression at @racket[start-pos].
-  }
-
-  @defmethod*[(((backward-sexp (start-pos exact-integer?)) void?))]{
-    Move the caret backwards one sexpression
-
-    Moves the caret to the beginning of the sexpression that ends at
-    @racket[start-pos].
-  }
-
-  @defmethod*[(((find-up-sexp (start-pos exact-integer?))
-                (or/c #f exact-integer?)))]{
-    Returns the position of the beginning of the next sexpression outside the
-    sexpression that contains @racket[start-pos].  If there is no such
-    sexpression, it returns @racket[#f].
-  }
-
-  @defmethod*[(((up-sexp (start exact-integer?)) void?))]{
-    Moves backward out of the S-expression containing the position
-    @racket[start].
-  }
-
-  @defmethod*[(((find-down-sexp (start-pos exact-integer?))
-                (or/c #f exact-integer?)))]{
-    Returns the position of the beginning of the next sexpression inside the
-    sexpression that contains @racket[start-pos].  If there is no such
-    sexpression, it returns @racket[#f].
-  }
-
-  @defmethod*[(((down-sexp (start exact-integer?)) void?))]{
-    Moves forward into the next S-expression after the position @racket[start].
-  }
-
-  @defmethod*[(((remove-parens-forward (start exact-integer?)) void?))]{
-    Removes the parentheses from the S-expression starting after the position
-    @racket[start].
-  }
-
-  @defmethod*[(((select-forward-sexp) void?))]{
-    Selects the next S-expression, starting at the start of the current selection.
-  }
-
-  @defmethod*[(((select-backward-sexp) void?))]{
-    Selects the previous S-expression, starting at the start of the current selection.
-  }
-
-  @defmethod*[(((select-up-sexp) void?))]{
-    Selects the region to the enclosing S-expression, starting at the start of the current selection.
-  }
-
-  @defmethod*[(((select-down-sexp) void?))]{
-    Selects the region to the next contained S-expression, starting at the
-    start of the current selection.
-  }
-
-  @defmethod*[(((transpose-sexp (start exact-integer?)) void?))]{
-    Swaps the S-expression beginning before the position @racket[start] with
-    the next S-expression following @racket[start].
-  }
-
-  @defmethod*[(((mark-matching-parenthesis (pos exact-positive-integer?)) void?))]{
-    If the paren after @racket[pos] is matched, this method highlights it and
-    its matching counterpart in dark green.
-  }
-
-  @defmethod*[(((get-tab-size) exact-integer?))]{
-    This method returns the current size of the tabs for scheme mode.
-    See also @method[racket:text<%> set-tab-size].
-  }
-
-  @defmethod*[(((set-tab-size (new-size exact-integer?)) void?))]{
-    This method sets the tab size for this text.
-  }
-
-  @defmethod*[(((introduce-let-ans (start-pos exact-integer?)) void?))]{
-    Adds a let around the current s-expression and a printf into the
-    body of the let.
-  }
-
-  @defmethod*[(((move-sexp-out (start-pos exact-integer?)) void?))]{
-    Replaces the sexpression surrounding the insertion point with the
-    sexpression following the insertion point.
-  }
-}
-@defmixin[racket:text-mixin
-          (text:basic<%> mode:host-text<%> color:text<%> text:autocomplete<%>)
-          (racket:text<%>)]{
-  This mixin adds functionality for editing Racket files.
-
-  The result of this mixin uses the same initialization arguments as the
-  mixin's argument.
-  @defmethod*[#:mode override
-              (((get-word-at (pos exact-positive-integer?)) string?))]{
-    Returns the word just before @racket[pos], which is then used as the prefix
-    for auto-completion.
-  }
-
-  @defmethod[#:mode override
-             (get-start-of-line [pos exact-nonnegative-integer?])
-             exact-nonnegative-integer?]{
-     Returns the first non-whitespace character in the paragraph containing
-     @racket[pos], unless the position is already there, in which case it
-     returns the first position of the paragraph.
-  }
-}
-
-@definterface[racket:text-mode<%> ()]{
-  The result of @racket[racket:text-mode-mixin] implements this
-  interface.
-}
-
-@defmixin[racket:text-mode-mixin
-          (color:text-mode<%> mode:surrogate-text<%>)
-          (racket:text-mode<%>)]{
-  This mixin adds Racket mode functionality to the mode that it is mixed into.
-  The resulting mode assumes that it is only set to an editor that is the
-  result of @racket[racket:text-mixin].
-
-  @defmethod*[#:mode override (((on-disable-surrogate) void?))]{
-    Removes the scheme keymap (see also @racket[racket:get-keymap]) and
-    disables any parenthesis highlighting in the host editor.
-  }
-
-  @defmethod*[#:mode override (((on-enable-surrogate) void?))]{
-    Adds the scheme keymap (see also @racket[racket:get-keymap]) and enables a
-    parenthesis highlighting in the host editor.
-  }
-}
-
-@defmixin[racket:set-mode-mixin (racket:text<%> mode:host-text<%>) ()]{
-  This mixin creates a new instance of @racket[racket:text-mode%] and installs
-  it, by calling its own @method[mode:host-text<%> set-surrogate] method with
-  the object.
-}
-
-@defclass[racket:text%
-          (racket:set-mode-mixin
-           (racket:text-mixin
-            (text:autocomplete-mixin (mode:host-text-mixin color:text%))))
-          ()]{}
-
-@defclass[racket:text-mode% (racket:text-mode-mixin color:text-mode%) ()]{}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^racket:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/splash.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/splash.scrbl
deleted file mode 100644
index 3de13845f7..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/splash.scrbl
+++ /dev/null
@@ -1,145 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          (for-label framework/splash
-                     racket/gui
-                     racket/base))
-@title{Splash}
-@defmodule[framework/splash]
-
-This module helps support applications with splash screens like the one in DrRacket.
-
-When this module is invoked, it sets the @racket[current-load] parameter to a procedure
-that counts how many files are loaded (until @racket[shutdown-splash] is called) and uses
-that number to control the gauge along the bottom of the splash screen.
-
-@defproc[(start-splash [draw-spec (or/c path-string?
-                                        (is-a?/c bitmap%)
-                                        (vector/c (or/c (-> (is-a?/c dc<%>) void?)
-                                                        (-> (is-a?/c dc<%>) 
-                                                            exact-nonnegative-integer?
-                                                            exact-nonnegative-integer?
-                                                            exact-nonnegative-integer?
-                                                            exact-nonnegative-integer?
-                                                            void?))
-                                                  exact-nonnegative-integer?
-                                                  exact-nonnegative-integer?))]
-                       [splash-title string?]
-                       [width-default exact-nonnegative-integer?]
-                       [#:allow-funny? allow-funny? boolean? #f]
-                       [#:frame-icon
-                        frame-icon
-                        (or/c #f
-                              (is-a?/c bitmap%)
-                              (cons/c (is-a?/c bitmap%)
-                                      (is-a?/c bitmap%)))
-                        #f])
-         void?]{
-  Starts a new splash screen. The splash screen is created in its own, new 
-  @tech[#:doc '(lib "scribblings/gui/gui.scrbl") #:key "eventspace"]{eventspace}.
-  The progress gauge at the bottom of the window advances as files are loaded
-  (monitored via the @racket[current-load] parameter).
-  
-  The @racket[draw-spec] determines what the splash window contains. 
-  The @racket[splash-title] is used as the title of the window and the @racket[width-default] determines
-  how many progress steps the gauge in the splash screen should
-  contain if there is no preference saved for the splash screen width.
-  The splash library uses @racket[get-preference] and @racket[put-preferences]
-  to store preferences, using 
-  @racketblock[(string->symbol (format "plt:~a-splash-max-width" splash-title))]
-  as the key for the preference. Each time the app starts up, the maximum width 
-  is reset based on the number of files that were loaded that time.
-  
-  If the @racket[draw-spec] is a @racket[path-string?], then the path is expected to be a file
-  that contains a bitmap that is drawn as the contents of the splash screen. If it is
-  a bitmap, then that bitmap is used directly. If @racket[draw-spec]
-  is a vector, then the vector's first element is a procedure that is called to draw
-  the splash screen and the other two integers are the size of the splash screen, width followed by height.
-  If the procedure accepts only one argument, then it is called with a @racket[dc<%>] object where the
-  drawing should occur. If it accepts 5 arguments, it is called with the @racket[dc<%>], as well as
-  (in order) the current value of the gauge, the maximum value of the gauge, and the width and the height
-  of the area to draw.
-
-  The @racket[allow-funny?] argument determines if a special gauge is used on Christmas day.  
-
-  The @racket[frame-icon] is used just like the value of the parameter @racket[frame:current-icon] is used,
-  but for the splash screen.
-}
-
-@defproc[(shutdown-splash) void?]{
-  Stops the splash window's gauge from advancing. Call this after all of the files have been loaded.
-}
-
-@defproc[(close-splash) void?]{
-  Closes the splash window. Call @racket[shutdown-splash] first. You can leave some time between these two
-  if there is more initialization work to be done where you do not want to count loaded files.
-}
-
-@defproc[(add-splash-icon [bmp (is-a?/c bitmap%)] [x exact-nonnegative-integer?] [y exact-nonnegative-integer?])
-         void?]{
-  Adds an icon to the splash screen. (DrRacket uses this function to show the tools as they are loaded.)                
-}
-
-@defproc[(get-splash-bitmap) (or/c #f (is-a?/c bitmap%))]{Returns the splash bitmap unless one has not been set.}
-@defproc[(set-splash-bitmap [bmp (is-a?/c bitmap%)]) void?]{
-  Sets the splash bitmap to @racket[bmp] and triggers a redrawing of the splash screen. Don't use this to set
-  the initial bitmap, use @racket[start-splash] instead.
-}
-@defproc[(get-splash-canvas) (is-a?/c canvas%)]{
-  Returns the canvas where the splash screen bitmap is drawn (if there is a bitmap); see @racket[start-splash] for how the splash is drawn.
-}
-@defproc[(get-splash-eventspace) eventspace?]{
-  Returns the splash screen's eventspace.
-}
-@defproc[(get-splash-paint-callback)
-         (-> (is-a?/c dc<%>) 
-             exact-nonnegative-integer?
-             exact-nonnegative-integer?
-             exact-nonnegative-integer?
-             exact-nonnegative-integer?
-             void?)]{
-  Returns the callback that is invoked when redrawing the splash screen.
-}
-@defproc[(set-splash-paint-callback
-          [cb
-           (-> (is-a?/c dc<%>) 
-               exact-nonnegative-integer?
-               exact-nonnegative-integer?
-               exact-nonnegative-integer?
-               exact-nonnegative-integer?
-               void?)])
-         void?]{
-  Sets the callback that is invoked when redrawing the splash screen. See @racket[start-splash] for
-  what the arguments are.
-}
-@defproc[(set-splash-progress-bar?! [b boolean?]) void?]{
-  Calling this procedure with @racket[#f] removes the progress bar from the splash screen.
-  Useful in conjunction with setting your own paint callback for the splash screen that measures
-  progress in its own way, during drawing. DrRacket uses this on King Kamehameha and Prince
-  Kuhio day.
-}
-@defproc[(set-splash-char-observer [obs (-> (is-a?/c key-event%) any)]) void?]{
-  Sets a procedure that is called whenever a user types a key with the splash screen as the focus.
-}
-@defproc[(set-splash-event-callback [obj (-> (is-?/c mouse-event%) any)]) void?]{
-  Sets a procedure that is called whenever a mouse event happens in the splash canvas.                                             }
-@defproc[(get-splash-event-callback) (-> (is-?/c mouse-event%) any)]{
-  Returns the last procedure passed to @racket[set-splash-event-callback] or @racket[void], if
-  @racket[set-splash-event-callback] has not been called.
-}
-@defproc[(set-refresh-splash-on-gauge-change?! [proc (-> exact-nonnegative-integer? 
-                                                         exact-nonnegative-integer? 
-                                                         any)]) 
-         void?]{
-  Sets a procedure that is called each time the splash gauge changes. If the procedure returns a true value (i.e., not @racket[#f]),
-  then the splash screen is redrawn. The procedure is called with the current value of the gauge and the maximum value.
-  
-  The default function is @racket[(lambda (curr tot) #f)].
-}
-@defproc[(get-splash-width) exact-nonnegative-integer?]{Returns the width of the splash drawing area / bitmap. See @racket[start-splash] for the details of the size and how things are drawn.}
-@defproc[(get-splash-height) exact-nonnegative-integer?]{Returns the width of the splash drawing area / bitmap. See @racket[start-splash] for the details of the size and how things are drawn.}
-@defproc[(refresh-splash) void?]{
-  Triggers a refresh of the splash, handling the details of double buffering
-  and doing the drawing on the splash's
-  @tech[#:doc '(lib "scribblings/gui/gui.scrbl") #:key "eventspace"]{eventspace's}
-  main thread.
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/test.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/test.scrbl
deleted file mode 100644
index 20b7fc0e99..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/test.scrbl
+++ /dev/null
@@ -1,102 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Test}
-
-@defmodule*/no-declare[(framework/test)]
-@declare-exporting[framework/test framework]
-
-The framework provides several new primitive functions that simulate user
-actions, which may be used to test applications.  You use these primitives and
-combine them just as regular Racket functions.  For example,
-@racketblock[
-  (test:keystroke #\A)
-  (test:menu-select "File" "Save")
-]
-sends a keystroke event to the window with the keyboard focus and invokes the
-callback function for the ``Save'' menu item from the ``File'' menu.  This has
-the same effect as if the user typed the key ``A'', pulled down the ``File''
-menu and selected ``Save''.
-
-It is possible to load this portion of the framework without loading the rest
-of the framework. Use @racket[(require framework/test)].
-
-Currently, the test engine has primitives for pushing buttons, setting
-check-boxes and choices, sending keystrokes, selecting menu items and clicking
-the mouse.  Many functions that are also useful in application testing, such as
-traversing a tree of panels, getting the text from a canvas, determining if a
-window is shown, and so on, exist in GRacket.
-
-@section[#:tag "test:actions-completeness"]{Actions and completeness}
-
-The actions associated with a testing primitive may not have finished when the
-primitive returns to its caller.  Some actions may yield control before they
-can complete.  For example, selecting ``Save As...'' from the ``File'' menu
-opens a dialog box and will not complete until the ``OK'' or ``Cancel'' button
-is pushed.
-
-However, all testing functions wait at least a minimum interval before
-returning to give the action a chance to finish.  This interval controls the
-speed at which the test suite runs, and gives some slack time for events to
-complete.  The default interval is 100 milliseconds.  The interval can be
-queried or set with @racket[test:run-interval].
-
-A primitive action will not return until the run-interval has expired and the
-action has finished, raised an error, or yielded.  The number of incomplete
-actions is given by @racket[test:number-pending-actions].
-
-@italic{Note:}
-Once a primitive action is started, it is not possible to undo it or kill its
-remaining effect.  Thus, it is not possible to write a utility that flushes the
-incomplete actions and resets number-pending-actions to zero.
-
-However, actions which do not complete right away often provide a way to cancel
-themselves.  For example, many dialog boxes have a ``Cancel'' button which will
-terminate the action with no further effect.  But this is accomplished by
-sending an additional action (the button push), not by undoing the original
-action.
-
-@section[#:tag "test:errors"]{Errors}
-
-Errors in the primitive actions (which necessarily run in the handler thread)
-are caught and reraised in the calling thread.
-
-However, the primitive actions can only guarantee that the action has started,
-and they may return before the action has completed.  As a consequence, an
-action may raise an error long after the function that started it has returned.
-In this case, the error is saved and reraised at the first opportunity (the
-next primitive action).
-
-The test engine keeps a buffer for one error, saving only the first error.  Any
-subsequent errors are discarded.  Reraising an error empties the buffer,
-allowing the next error to be saved.
-
-The function @racket[test:reraise-error] reraises any pending errors.
-
-@section{Technical Issues}
-
-@subsection{Active Frame}
-
-The Self Test primitive actions all implicitly apply to the top-most (active)
-frame.
-
-@subsection{Thread Issues}
-
-The code started by the primitive actions must run in the handler thread of the
-eventspace where the event takes place.  As a result, the test suite that
-invokes the primitive actions must @italic{not} run in that handler thread (or
-else some actions will deadlock).  See @racket[make-eventspace] for more info.
-
-@subsection{Window Manager (Unix only)}
-
-In order for the Self Tester to work correctly, the window manager must set the
-keyboard focus to follow the active frame.  This is the default behavior in
-Microsoft Windows and MacOS, but not in X windows.
-
-In X windows, you must explicitly tell your window manager to set the keyboard
-focus to the top-most frame, regardless of the position of the actual mouse.
-
-@section{Test Functions}
-
-@(include-extracted (lib "test.rkt" "framework"))
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/text.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/text.scrbl
deleted file mode 100644
index 2c7b8133e0..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/text.scrbl
+++ /dev/null
@@ -1,1321 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Text}
-
-@definterface[text:basic<%> (editor:basic<%> text%)]{
-  Classes matching this interface are expected to implement the basic
-  functionality needed by the framework.
-  @defmethod[(highlight-range [start exact-nonnegative-integer?]
-                              [end exact-nonnegative-integer?]
-                              [color (or/c string? (is-a?/c color%))]
-                              [caret-space boolean? #f]
-                              [priority (or/c 'high 'low) 'low]
-                              [style (or/c 'rectangle 'ellipse 'hollow-ellipse 'dot) 'rectangle]
-                              [#:adjust-on-insert/delete adjust-on-insert/delete boolean? #f]
-                              [#:key key any/c #f])
-             (if adjust-on-insert/delete
-                 void?
-                 (-> void?))]{
-    This function highlights a region of text in the buffer.
-
-    The range between @racket[start] and @racket[end] will be highlighted with
-    the color in color, if the style is @racket['rectangle] (the default).  If
-    the style is @racket['ellipse], then an ellipse is drawn around the range
-    in the editor, using the color.  If the style is @racket['hollow-ellipse],
-    then the outline of an ellipse is drawn around the range in the editor,
-    using the color.
-
-    If the style is @racket['dot], then @racket[start] and @racket[end] must be
-    the same, and a dot is drawn at the bottom of that position in the editor.
-
-    If @racket[caret-space?] is not @racket[#f], the left edge of the range
-    will be one pixel short, to leave space for the caret. The caret does not
-    interfere with the right hand side of the range. Note that under some
-    platforms, the caret is drawn with XOR, which means almost anything can
-    happen. So if the caret is in the middle of the range it may be hard to
-    see, or if it is on the left of the range and @racket[caret-space?] is
-    @racket[#f] it may also be hard to see.
-
-    The @racket[priority] argument indicates the relative priority for drawing
-    overlapping regions. If two regions overlap and have different priorities,
-    the region with @racket['high] priority will be drawn second and only it
-    will be visible in the overlapping region.
-
-    If @racket[adjust-on-insert/delete?] is @racket[#t], then insertions
-    and deletions to the text will adjust the @racket[start] and @racket[end]
-    of the range. Insertions and deletions before the range move the range forward
-    and backward; insertions and deletions after the range will be ignored. An insertion
-    in the middle of the range will enlarge the range and a deletion that overlaps
-    the range adjusts the range to reflect the deleted portion of the range and its
-    new position.
-    
-    The @racket[key] argument can be used with 
-    @method[text:basic<%> unhighlight-ranges/key]
-    and 
-    @method[text:basic<%> unhighlight-ranges]
-    to identify ranges whose start and end positions may have changed.
-    Symbols whose names begin with @litchar{plt:} are reserved
-    for internal use.
-    
-    If this method returns a thunk, invoking the thunk will turn off the
-    highlighting from this range.
-
-    Note that if @racket[adjust-on-insert/delete] is a true value, then
-    the result is not a thunk and instead 
-    @method[text:basic<%> unhighlight-range],
-    @method[text:basic<%> unhighlight-ranges/key], or
-    @method[text:basic<%> unhighlight-ranges]
-    must be called directly to remove the highlighting.
-  }
-
-  @defmethod[(unhighlight-range
-              (start exact-nonnegative-integer?)
-              (end exact-nonnegative-integer?)
-              (color (or/c string? (is-a?/c color%)))
-              (caret-space boolean? #f)
-              (style (or/c 'rectangle 'ellipse 'hollow-ellipse) 'rectangle))
-             void?]{
-    This method removes the highlight from a region of text in the buffer.
-
-    The region must match up to a region specified from an earlier call to
-    @method[text:basic<%> highlight-range].
-    
-    This method does a linear scan over all of the regions currently set.
-    If you expect to call this method many times (when there are many 
-    ranges set)
-    consider instead calling @method[text:basic<%> unhighlight-ranges].
-  }
-
-  @defmethod[(unhighlight-ranges/key [key any/c]) void?]{
-    This method removes the highlight from regions in the buffer
-    that have the key @racket[key] 
-    (as passed to @method[text:basic<%> highlight-range]).
-  }
-
-  @defmethod[(unhighlight-ranges
-              [pred? (-> exact-nonnegative-integer?
-                         exact-nonnegative-integer?
-                         (is-a?/c color%)
-                         boolean?
-                         (or/c 'rectangle 'ellipse 'hollow-ellipse)
-                         (or/c boolean? exact-nonnegative-integer?)
-                         any/c
-                         boolean?)])
-               void?]{
-    This method removes the highlight from regions in the buffer as 
-    selected by @racket[pred?]. The arguments to @racket[pred?] are the
-    same as the arguments to 
-    @method[text:basic<%> highlight-range] when it was originally called,
-    unless the @racket[_adjust-on-insert/delete] argument was a true value, in which case the 
-    first two arguments to the predicate will reflect the current state
-    of the bubble, if it is changed.
-
-  }
-
-  @defmethod*[(((get-highlighted-ranges) (listof text:range?)))]{
-    Returns a list of (opaque) values representing the active ranges in the
-    editor.
-  }
-
-  @defmethod*[(((get-styles-fixed) boolean?))]{
-    If the result of this function is @racket[#t], the styles in this
-    @racket[text:basic<%>] will be fixed. This means that any text inserted to
-    this editor has its style set to this editor's @racket[style-list%]'s
-    @racket["Standard"] style.
-
-    See also @method[text:basic<%> set-styles-fixed].
-  }
-
-  @defmethod*[(((get-fixed-style) (is-a?/c style<%>)))]{
-    Returns the style used by @method[text:basic<%> set-styles-fixed]when
-    setting the styles.
-  }
-
-  @defmethod*[(((set-styles-fixed (fixed? boolean?)) void?))]{
-    Sets the styles fixed parameter of this @racket[text%]. See also
-    @method[text:basic<%> get-styles-fixed] and @method[text:basic<%>
-    get-fixed-style].
-  }
-
-  @defmethod[(move/copy-to-edit [dest-text (is-a?/c text%)]
-                                [start exact-integer?]
-                                [end exact-integer?]
-                                [dest-pos exact-integer?]
-                                [#:try-to-move? try-to-move? boolean? #t])
-             void?]{
-    This moves or copies text and snips to another edit.
-
-    Moves or copies from the edit starting at @racket[start] and ending at
-    @racket[end]. It puts the copied text and snips in @racket[dest-text]
-    starting at location @racket[dest-pos].
-
-    If @racket[try-to-move] is @racket[#t], then the snips are removed;
-    and if it is @racket[#f], then they are copied.
-    
-    If a snip refused to be moved, it will be copied and deleted from the editor,
-    otherwise it will be moved. A snip may refuse to be moved by returning
-    @racket[#f] from @method[snip% release-from-owner].
-  }
-
-  @defmethod*[(((initial-autowrap-bitmap) (or/c #f (is-a?/c bitmap%))))]{
-    The result of this method is used as the initial autowrap bitmap. Override
-    this method to change the initial @racket[bitmap%]. See also @method[text%
-    set-autowrap-bitmap]
-
-    Returns the result of @racket[icon:get-autowrap-bitmap] by default.
-  }
-
-  @defmethod*[(((get-port-name) (or/c path-string? symbol? #f)))]{
-    The result of this method is a symbol that identifies this editor and that
-    is used as the port-name of a port that is read from this editor if this
-    editor is used in DrRacket.  See also @method[text:basic<%>
-    port-name-matches?].
-  }
-
-  @defmethod[(port-name-matches? (id any/c)) boolean?]{
-    Indicates if @racket[id] matches the port name of this file. If the file is
-    saved, the port name matches when the save file is the path as
-    @racket[id]. If the file has not been saved, the port name matches if the
-    symbol is the same as the result of @method[text:basic<%> get-port-name].
-
-    This method calls @racket[normalize-path] and thus can be very expensive on
-    some filesystems. If it is called many times in a loop, cache the results
-    to avoid calling it too often.
-  }
-
-  @defmethod[(get-edition-number) exact-nonnegative-integer?]{
-     Returns a number that increments every time something in the editor
-     changes.
-
-     The number is updated in @xmethod[text% after-insert] and
-     @xmethod[text% after-delete].
-  }
-
-  @defmethod[(get-start-of-line [pos exact-nonnegative-integer?]) exact-nonnegative-integer?]{
-    This method is used by @racket[keymap:setup-global] to implement a
-    keybinding for the @racket["home"] key and for @racket["c:a"].
-
-    Its default implementation is
-    @racket[(#,(method text% line-start-position) (#,(method text% position-line) pos))].
-  }
-}
-
-@defmixin[text:basic-mixin (editor:basic<%> text%) (text:basic<%>)]{
-  This mixin implements the basic functionality needed for @racket[text%]
-  objects in the framework.
-
-  The class that this mixin produces uses the same initialization arguments as
-  its input.
-
-  @defmethod*[#:mode override (((on-paint (before? any/c)
-                                          (dc (is-a?/c dc<%>))
-                                          (left real?)
-                                          (top real?)
-                                          (right real?)
-                                          (bottom real?)
-                                          (dx real?)
-                                          (dy real?)
-                                          (draw-caret (or/c 'no-caret 'show-inactive-caret 'show-caret))) 
-                                void?))]{
-    Draws the rectangles installed by @method[text:basic<%> highlight-range].
-  }
-
-  @defmethod*[#:mode augment (((on-insert (start exact-nonnegative-integer?) (end exact-nonnegative-integer?)) void?))]{
-    See @method[text:basic<%> set-styles-fixed].
-  }
-
-  @defmethod*[#:mode augment (((after-insert (start exact-nonnegative-integer?) (len exact-nonnegative-integer?)) void?))]{
-    See @method[text:basic<%> set-styles-fixed].
-  }
-
-  @defmethod*[#:mode override (((put-file (directory (or/c path? #f)) (default-name string?)) (or/c path? #f)))]{
-    Like @method[editor<%> put-file] but uses @racket[finder:put-file] instead
-    of @racket[put-file].
-  }
-}
-
-@definterface[text:line-spacing<%> (text:basic<%>)]{
-   Objects implementing this interface adjust their
-   spacing based on the @racket['framework:line-spacing-add-gap?]
-   preference.
-}
-
-@defmixin[text:line-spacing-mixin (text:basic<%>) (text:line-spacing<%>)]{
-  Calls @method[text% set-line-spacing] to either @racket[0] or @racket[1]
-  when an object is created, based
-  on the @racket['framework:line-spacing-add-gap?]
-  preference.
-  
-  Also registers a callback (via @racket[preferences:add-callback]) to call
-  @method[text% set-line-spacing] when the @racket['framework:line-spacing-add-gap?]
-  preference changes.
-}
-
-@definterface[text:first-line<%> (text%)]{
-
-  Objects implementing this interface, when @method[text:first-line<%>
-  highlight-first-line] is invoked with @racket[#t], always show their first
-  line, even with scrolled (as long as @method[text:first-line<%>
-  first-line-currently-drawn-specially?]  returns @racket[#t]).
-
-  @defmethod[#:mode public-final (highlight-first-line [on? boolean?]) void?]{
-    Call this method to enable special treatment of the first line in the editor.
-  }
-
-  @defmethod[#:mode public-final (first-line-currently-drawn-specially?) boolean?]{
-    Returns @racket[#t] if @method[text:first-line<%> is-special-first-line?]
-    returned @racket[#t] for the current first line and if the buffer is
-    scrolled down so that the first line would not (ordinarily) be visible.
-  }
-
-  @defmethod[#:mode public-final (get-first-line-height) number?]{
-    Returns the height, in pixels, of the first line.
-  }
-
-  @defmethod[(is-special-first-line? [line string?]) boolean?]{
-    Override this method to control when the first line is always visible. The
-    argument is the first line, as a string.
-  }
-}
-
-@defmixin[text:first-line-mixin (text%) (text:first-line<%>)]{
-  Provides the implementation of @racket[text:first-line<%>].  Does so by just
-  painting the text of the first line over top of what is already there and
-  overriding @method[text:first-line-mixin scroll-editor-to] to patch up
-  scrolling and @method[text:first-line-mixin on-event] to patch up mouse
-  handling.
-
-  @defmethod[#:mode override
-             (on-paint [before? any/c]
-                       [dc (is-a?/c dc<%>)]
-                       [left real?]
-                       [top real?]
-                       [right real?]
-                       [bottom real?]
-                       [dx real?]
-                       [dy real?]
-                       [draw-caret (one-of/c 'no-caret 'show-inactive-caret 'show-caret)])
-             void?]{
-    Based on the various return values of the methods in
-    @racket[text:first-line], draws the first actual line of the editor over
-    top of the first visible line in the editor.
-  }
-
-  @defmethod[#:mode override
-             (on-event [event (is-a?/c mouse-event%)])
-             void?]{
-    Clicks in the first line cause the editor to scroll to the actual first
-    line.
-  }
-
-  @defmethod[#:mode override
-             (scroll-editor-to [localx real?]
-                               [localy real?]
-                               [width (and/c real? (not/c negative?))]
-                               [height (and/c real? (not/c negative?))]
-                               [refresh? any/c]
-                               [bias (one-of/c 'start 'end 'none)])
-             void?]{
-    Scrolls a little bit more, when a scroll would be requested that scrolls
-    something so that it is line underneath the first line.
-  }
-}
-
-@definterface[text:foreground-color<%> (text:basic<%> editor:standard-style-list<%>)]{
-}
-
-@defmixin[text:foreground-color-mixin (text:basic<%> editor:standard-style-list<%>) (text:foreground-color<%>)]{
-  This mixin changes the default text style to have the foreground color
-  controlled by @racket[editor:set-default-font-color].
-
-  @defmethod*[#:mode override (((default-style-name) string?))]{
-    Returns the result of @racket[editor:get-default-color-style-name].
-  }
-
-  @defmethod*[#:mode override (((get-fixed-style) (is-a?/c style<%>)))]{
-    Returns the style named by @racket[editor:get-default-color-style-name].
-  }
-}
-
-@definterface[text:hide-caret/selection<%> (text:basic<%>)]{
-  This class hides the caret, except when the selection is active.
-
-  Instances of this class are useful for editors that used for displaying
-  purposes, but still allow users to copy their text.
-}
-
-@defmixin[text:hide-caret/selection-mixin (text:basic<%>) (text:hide-caret/selection<%>)]{
-  @defmethod*[#:mode augment (((after-set-position) void?))]{
-    Calls @method[text% hide-caret] to hide the caret when there is only a
-    caret and no selection.
-  }
-}
-
-@definterface[text:nbsp->space<%> (text%)]{
-  Classes that implement this interface silently change non-breaking spaces, ie
-  the character @racket[(integer->char 160)], to regular spaces when inserted
-  into the editor.
-}
-
-@defmixin[text:nbsp->space-mixin (text%) (text:nbsp->space<%>)]{
-  @defmethod*[#:mode augment (((on-insert (start exact-nonnegative-integer?) (end exact-nonnegative-integer?)) void?))]{
-    Starts an edit-sequence by calling @method[editor<%> begin-edit-sequence].
-  }
-
-  @defmethod*[#:mode augment (((after-insert (start exact-nonnegative-integer?) (len exact-nonnegative-integer?)) void?))]{
-    Replaces all non-breaking space characters @racket[(integer->char 160)] by
-    @racket[#\space] characters.
-
-    Ends the edit sequence (by calling @method[editor<%> end-edit-sequence])
-    started in @method[text:nbsp->space-mixin on-insert].
-  }
-}
-
-@definterface[text:column-guide<%> (text%)]{
-  Classes that implement this interface show a vertical line
-  at a specified column width (when the content in the
-  text has any lines wider than that column width).
-  
-  The column width is determined by the @racket['framework:column-guide-width]
-  preference; that preference is a list of length two where the
-  first element is a boolean indicating if the line should be
-  visible at all, and the second is the width where the line
-  would be visible (if the first is @racket[#t]).
-  
-  The position of the line is determined by taking the
-  width of the @litchar{x} character in the @racket["Standard"]
-  style (or, if there is no @racket["Standard"] style, then
-  the @racket["Basic"] style) and multiplying that by the
-  preference value.
-  
-}
-
-@defmixin[text:column-guide-mixin (text%) (text:column-guide<%>)]{
- @defmethod[#:mode extend (on-paint [before? any/]
-                                    [dc (is-a?/c dc<%>)]
-                                    [left real?]
-                                    [top real?]
-                                    [right real?]
-                                    [bottom real?]
-                                    [dx real?]
-                                    [dy real?]
-                                    [draw-caret (or/c 'no-caret 'show-inactive-caret 'show-caret
-                                                      (cons/c exact-nonnegative-integer?
-                                                              exact-nonnegative-integer?))])
-                   void?]{
-    Draws the column guide (if appropriate; see @racket[text:column-guide<%>]).
-  }
- @defmethod[#:mode augment (on-change) void?]{
-   Checks to see if any of the state that would cause the line to draw
-   in a different place has changed (via calls to @method[editor<%> get-extent] and
-   @method[text% get-padding]; if so makes (up to) two calls to
-   @method[editor<%> invalidate-bitmap-cache] with rectangles that cover the
-   old and new locations of the line.
- }
-}
-
-@definterface[text:normalize-paste<%> (text:basic<%>)]{
-  @defmethod[(ask-normalize?) boolean?]{
-    Prompts the user if the pasted text should be normalized (and updates
-    various preferences based on the response).
-
-    Override this method in the mixin to avoid all GUI and preferences
-    interactions.
-  }
-
-  @defmethod[(string-normalize [s string?]) string?]{
-    Normalizes @racket[s]. Defaults to:
-    @racketblock[(regexp-replace* 
-                  #rx"\u200b" 
-                  (regexp-replace*
-                   #rx"\u2212" 
-                   (string-normalize-nfkc s)
-                   "-")
-                  "")]
-  }
-}
-
-@defmixin[text:normalize-paste-mixin (text:basic<%>) (text:normalize-paste<%>)]{
-  @defmethod[#:mode override
-             (do-paste [start exact-nonnegative-integer?] [time exact-integer?])
-             void?]{
-    Overridden to detect when insertions are due to pasting. Sets some internal
-    state and calls the super.
-  }
-
-  @defmethod[#:mode augment (on-insert [start exact-nonnegative-integer?] [len exact-nonnegative-integer?]) void?]{
-    Calls @method[editor<%> begin-edit-sequence].
-  }
-
-  @defmethod[#:mode augment (after-insert [start exact-nonnegative-integer?] [len exact-nonnegative-integer?]) void?]{
-    Normalizes any next text and calls @method[editor<%> end-edit-sequence].
-  }
-}
-
-@definterface[text:searching<%> (editor:keymap<%> text:basic<%>)]{
-  Any object matching this interface can be searched.
-
-  @defmethod[(set-searching-state [str (or/c #f string?)]
-                                  [cs? boolean?]
-                                  [replace-mode? boolean?]
-                                  [notify-frame? boolean?])
-             void?]{
-    If @racket[str] is not @racket[#f], then this method initiates a search for
-    every occurrence of @racket[str] in the editor. If @racket[str] is @racket[#f],
-    then it clears all of the search highlighting in the buffer.
-
-    If @racket[cs?] is @racket[#f], the search is case-insensitive, and otherwise
-    it is case-sensitive.
-
-    The @racket[replace-mode?] boolean determines if the resulting search should
-    be tracking the next-to-replace search hit as the insertion point moves
-    around in the editor. Also, when @racket[replace-mode?] is @racket[#f], then
-    the bubbles are are uniform medium purple color (@racket["plum"] in
-    @racket[the-color-database]) and otherwise they are either a lighter
-    purple or a darker purple, with every bubble except the one just following
-    the insertion the lighter color.
-
-    The search does not complete before @method[text:searching<%> set-searching-state]
-    returns. Accordingly, @method[text:searching<%> get-search-hit-count] may
-    have out-of-date results for a while, until the search process is finished.
-    If @racket[notify-frame?] is @racket[#t] then 
-    @method[frame:searchable<%> search-hits-changed]
-    is called when the search completes.
-  }
-
-  @defmethod[(set-search-anchor [position (or/c #f number?)]) void?]{
-    Sets the anchor's position in the editor. Only takes effect if the
-    @racket['framework:anchored-search] preference is on.
-  }
-
-  @defmethod[(get-search-hit-count) number?]{
-    Returns the number of hits for the search in the buffer, based on the count
-    found last time that a search completed.
-  }
-
-  @defmethod[(get-replace-search-hit) (or/c number? #f)]{
-    Returns the position of the nearest search hit that comes after the
-    insertion point.
-  }
-
-  @defmethod[(set-replace-start [pos (or/c number? #f)]) void?]{
-    This method is ignored. (The next replacement start is now
-    tracked via the @method[text% after-set-position] method.)
-  }
-
-  @defmethod[(get-search-bubbles)
-             (listof (list/c (cons/c number? number?)
-                             (or/c 'normal-search-color
-                                   'dark-search-color
-                                   'light-search-color)))]{
-    Returns information about the search bubbles in the editor. Each item in
-    the outermost list corresponds to a single bubble. The pair of numbers is
-    the range of the bubble and the symbol is the color of the
-    bubble.
-
-    This method is intended for use in test suites.
-  }
-}
-
-@defmixin[text:searching-mixin (editor:keymap<%> text:basic<%>) (text:searching<%>)]{
-  This @racket[text%] can be searched.
-
-  The result of this mixin uses the same initialization arguments as the
-  mixin's argument.
-
-  @defmethod*[#:mode override (((get-keymaps) (listof (is-a?/c keymap%))))]{
-    This returns a list containing the super-class's keymaps, plus the result
-    of @racket[keymap:get-search].
-  }
-
-  @defmethod[#:mode augment (after-insert [start exact-nonnegative-integer?] [len exact-nonnegative-integer?]) void?]{
-    Re-does any search now that the contents of the window have changed.
-  }
-
-  @defmethod[#:mode augment (after-delete [start exact-nonnegative-integer?] [len exact-nonnegative-integer?]) void?]{
-    Re-does any search now that the contents of the window have changed.
-  }
-
-  @defmethod[#:mode override (on-focus [on? boolean?]) void?]{
-    Tells the frame containing the editor to search based on this editor via
-    the @method[frame:searchable<%> set-text-to-search] method.
-  }
-}
-
-@definterface[text:return<%> (text%)]{
-  Objects supporting this interface were created by @racket[text:return-mixin].
-}
-
-@defmixin[text:return-mixin (text%) (text:return<%>)]{
-  Use this buffer to perform some special action when return is typed.
-
-  @defconstructor[((return (-> boolean?)))]{
-  }
-
-  @defmethod*[#:mode override
-              (((on-local-char (event (is-a?/c key-event%))) void?))]{
-    If @racket[key] is either return or newline, only invoke the
-    @racket[return] thunk (initialization argument) and do nothing else.
-  }
-}
-
-@definterface[text:wide-snip<%> (text:basic<%>)]{
-
-  @defmethod*[(((add-wide-snip (snip (is-a?/c snip%))) void?))]{
-    Registers a snip in this editor to be resized when its viewing area
-    changes. Ensures the snip is as wide as the viewing area.
-
-    This method should only be called by
-    @xmethod[canvas:wide-snip<%> add-wide-snip].
-  }
-
-  @defmethod*[(((add-tall-snip (snip (is-a?/c snip%))) void?))]{
-    Registers a snip in this editor. It is resized when the viewing area of the
-    editor changes.
-
-    This method should only be called by
-    @xmethod[canvas:wide-snip<%> add-tall-snip].
-  }
-}
-
-@defmixin[text:wide-snip-mixin (text:basic<%>) (text:wide-snip<%>)]{
-}
-
-@definterface[text:delegate<%> (text:basic<%>)]{
-  Implementations of this interface copy all of the changes to this editor to
-  the result of @method[text:delegate<%> get-delegate] except instead of
-  regular string and tab snips, instead instances of
-  @racket[text:1-pixel-string-snip%] and @racket[text:1-pixel-tab-snip%] are
-  created.
-
-  The contents of the two editor are kept in sync, as modifications to this
-  object happen.
-
-  @defmethod*[(((get-delegate) (or/c #f (is-a?/c text%))))]{
-    The result of this method is the @racket[text%] object that the contents of
-    this editor are being delegated to, or @racket[#f], if there is none.
-  }
-
-  @defmethod*[(((set-delegate (delegate (or/c #f (is-a?/c text%)))) void?))]{
-    This method sets the current delegate.
-
-    When it is set, all of the snips are copied from this object to
-    @racket[delegate]. Additionally, if this object implements
-    @racket[racket:text<%>] the tab settings of @racket[delegate] are updated
-    to match this objects.
-  }
-}
-
-@defclass[text:1-pixel-string-snip% string-snip% ()]{
-  This class re-uses the implementation of @racket[string-snip%] to implement a
-  string snip that just draws a single pixel for each character in the string.
-
-  See also @racket[text:1-pixel-tab-snip%] for a similar extension to the
-  @racket[tab-snip%] class.
-
-  This snip is used in conjunction with the @racket[frame:delegate<%>] and
-  @racket[text:delegate<%>] interfaces.
-
-  @defmethod*[#:mode override (((split (position exact-nonnegative-integer?)
-                                       (first (box/c (is-a?/c snip%)))
-                                       (second (box/c (is-a?/c snip%))))
-                                void?))]{
-    Fills the boxes with instance of @racket[text:1-pixel-string-snip%]s.
-  }
-
-  @defmethod*[#:mode override (((copy) (is-a?/c snip%)))]{
-    Creates and returns an instance of @racket[text:1-pixel-string-snip%].
-  }
-
-  @defmethod*[#:mode override
-              (((get-extent
-                 (dc (is-a?/c dc<%>))
-                 (x real?) (y real?)
-                 (w (or/c (box/c (and/c real? (not/c negative?))) #f) #f)
-                 (h (or/c (box/c (and/c real? (not/c negative?))) #f) #f)
-                 (descent (or/c (box/c (and/c real? (not/c negative?))) #f) #f)
-                 (space (or/c (box/c (and/c real? (not/c negative?))) #f) #f)
-                 (lspace (or/c (box/c (and/c real? (not/c negative?))) #f) #f)
-                 (rspace (or/c (box/c (and/c real? (not/c negative?))) #f) #f))
-                void?))]{
-
-    Sets the descent, space, lspace, and rspace to zero. Sets the height to
-    1. Sets the width to the number of characters in the string.
-  }
-
-  @defmethod*[#:mode override (((insert (s string?) (len exact-nonnegative-integer?) (pos exact-nonnegative-integer? 0)) void?))]{
-  }
-
-  @defmethod*[#:mode override (((draw (dc (is-a?/c dc<%>))
-                                      (x real?) 
-                                      (y real?)
-                                      (left real?)
-                                      (top real?)
-                                      (right real?)
-                                      (bottom real?)
-                                      (dx real?)
-                                      (dy real?)
-                                      (draw-caret (or/c 'no-caret 'show-inactive-caret 'show-caret)))
-                                void?))]{
-    Draws black pixels for non-whitespace characters and draws nothing for
-    whitespace characters.
-  }
-}
-
-@defclass[text:1-pixel-tab-snip% tab-snip% ()]{
-  This class re-uses the implementation of @racket[tab-snip%] to implement a
-  string snip that is always one pixel high.
-
-  See also @racket[text:1-pixel-string-snip%] for a similar extension to the
-  @racket[string-snip%] class.
-
-  This snip is used in conjunction with the @racket[frame:delegate<%>] and
-  @racket[text:delegate<%>] interfaces.
-
-  @defmethod*[#:mode override (((split (position exact-nonnegative-integer?)
-                                       (first (box/c (is-a?/c snip%)))
-                                       (second (box/c (is-a?/c snip%))))
-                                void?))]{
-    Fills the boxes with instance of @racket[text:1-pixel-tab-snip%]s.
-  }
-
-  @defmethod*[#:mode override (((copy) (is-a?/c snip%)))]{
-    Creates and returns an instance of @racket[text:1-pixel-tab-snip%].
-  }
-
-  @defmethod*[#:mode override (((get-extent (dc (is-a?/c dc<%>))
-                                            (x real?)
-                                            (y real?)
-                                            (w (or/c (box/c (and/c real? (not/c negative?)) #f)) #f)
-                                            (h (or/c (box/c (and/c real? (not/c negative?)) #f)) #f)
-                                            (descent (or/c (box/c (and/c real? (not/c negative?)) #f)) #f)
-                                            (space (or/c (box/c (and/c real? (not/c negative?)) #f)) #f)
-                                            (lspace (or/c (box/c (and/c real? (not/c negative?)) #f)) #f)
-                                            (rspace (or/c (box/c (and/c real? (not/c negative?)) #f)) #f))
-                                void?))]{
-    Sets the descent, space, lspace, and rspace to zero. Sets the height to
-    1. Sets the width to the width of tabs as returned in the
-    @racket[tab-width] parameter of the @method[text% get-tabs] method.
-  }
-
-  @defmethod*[#:mode override (((draw (dc (is-a?/c dc<%>))
-                                      (x real?)
-                                      (y real?)
-                                      (left real?)
-                                      (top real?)
-                                      (right real?)
-                                      (bottom real?)
-                                      (dx real?)
-                                      (dy real?)
-                                      (draw-caret (or/c 'no-caret 'show-inactive-caret 'show-caret)))
-                                void?))]{
-    Draws nothing.
-  }
-}
-
-@defmixin[text:delegate-mixin (text:basic<%>) (text:delegate<%>)]{
-  This mixin provides an implementation of the @racket[text:delegate<%>]
-  interface.
-
-  @defmethod*[#:mode override (((highlight-range (start exact-integer?)
-                                 (end exact-nonnegative-integer?)
-                                 (color (or/c string? (is-a?/c color%)))
-                                 (caret-space boolean? #f)
-                                 (priority (or/c 'high 'low) 'low)
-                                 (style (or/c 'rectangle 'ellipse 'hollow-ellipse 'dot) 'rectangle))
-                                 (-> void?)))]{
-    In addition to calling the super method, @method[text:basic<%>
-    highlight-range], this method forwards the highlighting to the delegatee.
-  }
-
-  @defmethod[#:mode override
-             (unhighlight-range
-                   (start exact-nonnegative-integer?)
-                   (end exact-nonnegative-integer?)
-                   (color (or/c string? (is-a?/c color%)))
-                   (caret-space boolean? #f)
-                   (style (or/c 'rectangle 'ellipse 'hollow-ellipse) 'rectangle))
-               void?]{
-    This method propagates the call to the delegate and calls the super method.
-  }
-  @defmethod*[#:mode override
-              (((on-paint (before? any/c)
-                          (dc (is-a?/c dc<%>))
-                          (left real?)
-                          (top real?)
-                          (right real?)
-                          (bottom real?)
-                          (dx real?)
-                          (dy real?)
-                          (draw-caret (one-of/c 'no-caret 'show-inactive-caret 'show-caret)))
-                void?))]{
-    Draws a blue region in the delegatee editor that shows where the visible
-    region of the delegate editor is.
-  }
-
-  @defmethod*[#:mode augment (((on-edit-sequence) void?))]{
-    starts an edit sequence in the delegate.
-  }
-
-  @defmethod*[#:mode augment (((after-edit-sequence) void?))]{
-    ends an edit sequence in the delegate.
-  }
-
-  @defmethod*[#:mode override (((resized (snip (is-a?/c snip%)) (redraw-now? boolean?)) void?))]{
-    Sends a message to the delegate to update the size of the copied snip, if
-    there is one.
-  }
-
-  @defmethod*[#:mode augment (((after-insert (start exact-nonnegative-integer?) (len exact-nonnegative-integer?)) void?))]{
-    forwards the change to the delegate
-  }
-
-  @defmethod*[#:mode augment (((after-delete (start exact-nonnegative-integer?) (len exact-nonnegative-integer?)) void?))]{
-    forwards the change to the delegate.
-  }
-
-  @defmethod*[#:mode augment (((after-change-style (start exact-nonnegative-integer?) (len exact-nonnegative-integer?)) void?))]{
-    forwards the changed style to the delegate.
-  }
-
-  @defmethod*[#:mode augment (((on-load-file (filename string?) (format symbol?)) void?))]{
-    remembers the filename, for use in
-    @method[text:delegate-mixin after-load-file].
-  }
-
-  @defmethod*[#:mode augment (((after-load-file (success? boolean?)) void?))]{
-    updates the delegate with the new contents of the text.
-  }
-}
-
-@definterface[text:info<%> (text:basic<%>)]{
-  Objects supporting this interface are expected to send information about
-  themselves to the frame that is displaying them.
-}
-@defmixin[text:info-mixin (editor:keymap<%> text:basic<%>) (text:info<%>)]{
-  This mixin adds support for supplying information to objects created with
-  @racket[frame:info-mixin]. When this @racket[editor:basic<%>] is displayed in
-  a frame, that frame must have been created with @racket[frame:info-mixin].
-
-  @defmethod*[#:mode override (((set-anchor (on? any/c)) void?))]{
-    Calls the @method[frame:text-info<%> anchor-status-changed] method of the
-    frame that is viewing this object. It uses @method[editor<%> get-canvas] to
-    get the canvas for this frame, and uses that canvas's
-    @racket[top-level-window<%>] as the frame.
-  }
-
-  @defmethod*[#:mode override (((set-overwrite-mode (on? any/c)) void?))]{
-    Calls the @method[frame:text-info<%> overwrite-status-changed]method of the
-    frame that is viewing this object. It uses @method[editor<%> get-canvas] to
-    get the canvas for this frame, and uses that canvas's
-    @racket[top-level-window<%>] as the frame.
-  }
-
-  @defmethod*[#:mode augment (((after-set-position) void?))]{
-    Calls the @method[frame:text-info<%> editor-position-changed] method of the
-    frame that is viewing this object. It uses @method[editor<%> get-canvas] to
-    get the canvas for this frame, and uses that canvas's
-    @racket[top-level-window<%>] as the frame.
-  }
-
-  @defmethod*[#:mode augment (((after-insert (start exact-nonnegative-integer?) (len exact-nonnegative-integer?)) void?))]{
-    Calls the @method[frame:text-info<%> editor-position-changed] method of the
-    frame that is viewing this object. It uses @method[editor<%> get-canvas] to
-    get the canvas for this frame, and uses that canvas's
-    @racket[top-level-window<%>] as the frame.
-  }
-
-  @defmethod*[#:mode augment (((after-delete (start exact-nonnegative-integer?) (len exact-nonnegative-integer?)) void?))]{
-    Calls the @method[frame:text-info<%> editor-position-changed] method of the
-    frame that is viewing this object. It uses @method[editor<%> get-canvas] to
-    get the canvas for this frame, and uses that canvas's
-    @racket[top-level-window<%>] as the frame.
-  }
-}
-
-@definterface[text:clever-file-format<%> (text%)]{
-  Objects supporting this interface are expected to support a clever
-  file format when saving.
-}
-
-@defmixin[text:clever-file-format-mixin (text%) (text:clever-file-format<%>)]{
-  The result of this mixin uses the same initialization arguments as the
-  mixin's argument.
-
-  When files are saved from this @racket[text%], a check is made to see if
-  there are any non-@racket[string-snip%] objects in the @racket[text%]. If so,
-  it is saved using the file format @racket['std]. (see @method[text%
-  set-file-format] for more information. If not, the file format passed to
-  @method[editor<%> save-file] is used.
-
-  @defmethod*[#:mode augment (((on-save-file (filename path?)
-                                             (format (or/c 'guess 'standard 'text 'text-force-cr 'same 'copy)))
-                               void?))]{
-    If the method @method[text% get-file-format] returns @racket['standard] and
-    the text has only @racket[string-snip%]s, the file format is set to
-    @racket['text].
-
-    If the method @method[text% get-file-format] returns @racket['text] and the
-    text has some non @racket[string-snip%]s, the file format is set to
-    @racket['standard].
-
-    Depending on the user's preferences, the user may also be queried.
-
-    Also, the changes to the file format only happen if the argument
-    @racket[file-format] is @racket['copy] or @racket['same].
-  }
-}
-
-@definterface[text:crlf-line-endings<%> (text%)]{
-  Objects supporting this interface use 
-  @method[editor<%> use-file-text-mode] to
-  change the line ending style under windows. See 
-  @method[text:crlf-line-endings-mixin after-load-file] for more information.
-}
-
-
-@defmixin[text:crlf-line-endings-mixin (text%) (text:crlf-line-endings<%>)]{
-  @defmethod[#:mode override (after-load-file [success? any/c]) void?]{
-    Checks to see if the newly loaded file has any lines terminated with 
-    @racket["\n"] (i.e., not @racket["\r\n"]) or if the file is empty. 
-    If so, and if the @racket[system-type] returns @racket['windows], then
-    this method calls @method[editor<%> use-file-text-mode], passing @racket[#f]. 
-    
-    Otherwise, calls @method[editor<%> use-file-text-mode] with @racket[#t].
-  }
-}
-
-@definterface[text:file<%> (editor:file<%> text:basic<%>)]{
-  Mixins that implement this interface lock themselves when the file they are
-  editing is read only.
-
-  @defmethod*[(((get-read-write?) boolean?))]{
-    Indicates whether or not this editor is in read-write mode.
-  }
-
-  @defmethod*[(((while-unlocked (thunk (-> any/c))) any/c))]{
-    Unlocks the editor, calls the thunk, and then relocks the editor, all using
-    a @racket[dynamic-wind].
-  }
-}
-
-@defmixin[text:file-mixin (editor:file<%> text:basic<%>) (text:file<%>)]{
-  @defmethod*[#:mode augment
-              (((can-insert? (start exact-nonnegative-integer?)
-                             (len exact-nonnegative-integer?))
-                boolean?))]{
-
-    Returns false if the result of @method[text:file<%> get-read-write?]  is
-    true, otherwise returns the result of calling @racket[inner].
-  }
-
-  @defmethod*[#:mode augment (((can-delete? (start exact-nonnegative-integer?) (len exact-nonnegative-integer?)) boolean?))]{
-    Returns false if the result of @method[text:file<%> get-read-write?]  is
-    true, otherwise returns the result of calling @racket[inner].
-  }
-
-  @defmethod*[#:mode augment (((after-save-file) void?))]{
-    Checks if the newly saved file is write-only in the filesystem. If so,
-    locks the editor with the @method[editor<%> lock] method. Otherwise unlocks
-    the buffer
-
-    For each canvas returned from @method[editor<%> get-canvases] it checks to
-    see if the @racket[canvas%]'s @method[area<%> get-top-level-window] matches
-    the @racket[frame:editor<%>] interface. If so, it calls
-    @method[frame:editor-mixin set-label] with the last part of the filename
-    (ie, the name of the file, not the directory the file is in).
-  }
-
-  @defmethod*[#:mode augment (((after-load-file) void?))]{
-    Checks if the newly loaded file is write-only in the filesystem. If so,
-    locks the editor with the @method[editor<%> lock] method. Otherwise unlocks
-    the buffer
-
-    For each canvas returned from @method[editor<%> get-canvases] it checks to
-    see if the @racket[canvas%]'s @method[area<%> get-top-level-window] matches
-    the @racket[frame:editor<%>] interface. If so, it calls
-    @method[frame:editor-mixin set-label] with the last part of the filename
-    (ie, the name of the file, not the directory the file is in).
-  }
-}
-
-@definterface[text:ports<%> ()]{
-  Classes implementing this interface (via the associated mixin) support input
-  and output ports that read from and to the editor.
-
-  There are two input ports: the normal input port just reads from the editor's
-  contents directly and the box input port inserts an editor snip into this
-  text and uses input typed into the box as input into the port.
-
-  There are three output ports, designed to match stdout, stderr, and a special
-  port for printing values. The only difference between them is the output is
-  rendered in different colors when it comes in via the different ports.
-
-  They create three threads to mediate access to the input and output ports
-  (one for each input port and one for all of the output ports).
-
-  @defmethod*[(((delete/io (start exact-integer?) (end exact-integer?)) void?))]{
-    Deletes the text between @racket[start] and @racket[end] without changing
-    the behavior of the ports (otherwise, deleting the text would break
-    internal invariants of the port).
-
-    Both @racket[start] and @racket[end] must be less than
-    @method[text:ports<%> get-insertion-point] (or else it is safe to delete
-    them via @method[text% delete], so you don't need this method).
-  }
-  
-  @defmethod[(insert/io [str string?] [pos exact-integer?]) void?]{
-    Inserts @racket[str] at the position @racket[start] without changing
-    the behavior of the ports (otherwise, inserting the text would break
-    internal invariants of the port).
-
-    The @racket[pos] argument must be less than
-    @method[text:ports<%> get-insertion-point] (or else it is safe to insert
-    the string via @method[text% insert], so you don't need this method).
-    
-    @history[#:added "1.2"]
-  }
-  
-  @defmethod[(do-submission) void?]{
-    Triggers a submission to the input port with what is currently pending 
-    in the editor.
-  }
-
-  @defmethod*[(((get-insertion-point) exact-integer?))]{
-    Returns the position where characters put into the output port will appear.
-  }
-
-  @defmethod*[(((set-insertion-point (ip exact-integer?)) void?))]{
-    Sets the position where the output port will insert characters.  See also
-    @method[text:ports<%> get-insertion-point].
-  }
-
-  @defmethod*[(((get-unread-start-point) exact-integer?))]{
-    Returns the position where input will be taken into the input port (after
-    the next time return is typed).
-  }
-
-  @defmethod*[(((set-unread-start-point (usp exact-integer?)) void?))]{
-    Sets the position where input will be taken into the input port (after the
-    next time return is typed).
-
-    See also @method[text:ports<%> get-unread-start-point].
-  }
-
-  @defmethod*[(((set-allow-edits (allow-edits? boolean?)) void?))]{
-    Enables or disables editing in the buffer. Be sure to update the unread
-    start point (via @method[text:ports<%> set-unread-start-point]) and the
-    insertion point (via @method[text:ports<%> set-insertion-point]) after
-    making changes to the buffer.
-  }
-
-  @defmethod*[(((get-allow-edits) boolean?))]{
-    Indicates if editing is allowed in the buffer at this point.
-  }
-
-  @defmethod*[(((insert-between (str (or/c (is-a?/c snip%) string?))) void?))]{
-    Inserts some text between the unread start point and the insertion point
-    (and updates them properly). To insert before the two points, see
-    @method[text:ports<%> insert-before].
-
-    See also @method[text:ports<%> set-unread-start-point] and
-    @method[text:ports<%> set-insertion-point].
-  }
-
-  @defmethod*[(((insert-before (str (or/c (is-a?/c snip%) string?))) void?))]{
-    Inserts some text before the unread start point and updates it and the
-    insertion point properly. To insert between the two points, see
-    @method[text:ports<%> insert-between].
-
-    See also @method[text:ports<%> set-unread-start-point] and
-    @method[text:ports<%> set-insertion-point].
-  }
-
-  @defmethod*[(((submit-to-port? (key (is-a?/c key-event%))) boolean?))]{
-    Augment this method to help control when characters should be submitted to
-    the input port.
-
-    Return @racket[#t] or the result of calling @racket[inner].
-  }
-
-  @defmethod*[(((on-submit) void?))]{
-    This method is called when text is sent into the input port.
-
-    Does nothing.
-  }
-
-  @defmethod*[(((send-eof-to-in-port) void?))]{
-    This method puts an eof into the input port.
-  }
-
-  @defmethod*[(((send-eof-to-box-in-port) void?))]{
-    This method puts an eof into the box input port.
-  }
-
-  @defmethod*[(((reset-input-box) void?))]{
-    This method removes the current input box from the editor (and all input in
-    it is lost).
-  }
-
-  @defmethod*[(((clear-output-ports) void?))]{
-    Flushes all of the data in all of the output ports that hasn't appeared in
-    the editor yet.
-  }
-
-  @defmethod*[(((clear-input-port) void?))]{
-    Flushes all of the data in the input port that hasn't yet been
-    read. Reading will now block.
-  }
-
-  @defmethod*[(((clear-box-input-port) void?))]{
-    Flushes all of the data in the box input port that hasn't yet been
-    read. Reading will now block.
-  }
-
-  @defmethod*[(((get-out-style-delta) (or/c (is-a?/c style-delta%) string?)))]{
-    The result of this method is the style that is used to color text submitted
-    to the result of @method[text:ports<%> get-out-port].
-
-    If the result is a string that is not mapped in the editor's style list,
-    the style named @racket["Standard"] is used and if that isn't mapped, the
-    style named @racket["Basic"] is used.
-
-    This method is called during the initialization of the class.
-
-    By default, returns @racket["text:ports out"] which is mapped to a blue
-    style in the style list returned by @racket[editor:get-standard-style-list].
-  }
-
-  @defmethod*[(((get-err-style-delta) (or/c (is-a?/c style-delta%) string?)))]{
-    The result of this method is the style that is used to color text submitted
-    to the result of @method[text:ports<%> get-err-port].
-
-    If the result is a string that is not mapped in the editor's style list,
-    the style named @racket["Standard"] is used and if that isn't mapped, the
-    style named @racket["Basic"] is used.
-
-    This method is called during the initialization of the class.
-
-    By default, returns @racket["text:ports err"] which is mapped to a red
-    italic style in the style list returned by
-    @racket[editor:get-standard-style-list].
-  }
-
-  @defmethod*[(((get-value-style-delta) (or/c (is-a?/c style-delta%) string?)))]{
-    The result of this method is the style (or the name of the style) that is
-    used to color text submitted to the result of @method[text:ports<%>
-    get-value-port].
-
-    If the result is a string that is not mapped in the editor's style list,
-    the style named @racket["Standard"] is used and if that isn't mapped, the
-    style named @racket["Basic"] is used.
-
-    This method is called during the initialization of the class.
-
-    By default, returns @racket["text:ports value"] which is mapped to a blue
-    style in the style list returned by
-    @racket[editor:get-standard-style-list].
-  }
-
-  @defmethod*[(((get-in-port) input-port?))]{
-    Returns the input port that data in this editor is sent to.
-  }
-
-  @defmethod*[(((get-in-box-port) input-port?))]{
-    Returns the box input port that data in this editor is sent to.
-  }
-
-  @defmethod*[(((get-out-port) output-port?))]{
-    Returns an output port that writes into this editor.  The only difference
-    between this port and the ports returned by @method[text:ports<%>
-    get-err-port] and @method[text:ports<%> get-value-port] is the font style
-    and color.
-  }
-
-  @defmethod*[(((get-err-port) output-port?))]{
-    Returns an output port that writes into this editor.  The only difference
-    between this port and the ports returned by @method[text:ports<%>
-    get-err-port] and @method[text:ports<%> get-out-port] is the font style and
-    color.
-  }
-
-  @defmethod*[(((get-value-port) output-port?))]{
-    Returns an output port that writes into this editor.  The only difference
-    between this port and the ports returned by @method[text:ports<%>
-    get-err-port] and @method[text:ports<%> get-out-port] is the font style and
-    color.
-  }
-
-  @defmethod*[(((after-io-insertion) void?))]{
-    This method is called after an insertion due to IO occurs.
-  }
-
-  @defmethod*[(((get-box-input-editor-snip%) (subclass?/c editor-snip%)))]{
-    The result of this method is used as the class of editor snips that is
-    inserted by the box port in this editor.
-  }
-
-  @defmethod*[(((get-box-input-text%) (is-a?/c text:input-box<%>)))]{
-    The result of this method is instantiated and placed inside the result of
-    @method[text:ports<%> get-box-input-editor-snip%].
-  }
-}
-
-@defmixin[text:ports-mixin (text:wide-snip<%>) (text:ports<%>)]{
-
-  @defmethod*[#:mode augment (((can-insert? (start exact-integer?) (len exact-integer?)) boolean?))]{
-    Returns the results of the @racket[inner] call, unless
-    @method[text:ports<%> get-allow-edits] returns @racket[#f].
-  }
-
-  @defmethod*[#:mode augment (((can-delete? (start exact-integer?) (len exact-integer?)) boolean?))]{
-    Returns the results of the @racket[inner] call, unless
-    @method[text:ports<%> get-allow-edits] returns @racket[#f].
-  }
-
-  @defmethod*[#:mode override (((on-local-char (event (is-a?/c key-event%))) void?))]{
-    Sends the data between the last position and the result of
-    @method[text:ports<%> get-unread-start-point] to the input port, unless
-    @method[text:ports<%> submit-to-port?]  returns @racket[#f].
-
-    Also calls @method[text:ports<%> on-submit].
-  }
-
-  @defmethod*[#:mode augment (((on-display-size) void?))]{
-    Adjusts the embedded editor-snip (used for reading input to the
-    @method[text:ports<%> get-in-box-port]) to match the width of the editor.
-  }
-}
-
-@definterface[text:input-box<%> (text%)]{
-  Classes that implement this interface are used as the editors for the box
-  input port in @racket[text:ports%].
-}
-
-@defmixin[text:input-box-mixin (text%) (text:input-box<%>)]{
-  This mixin provides an implementation of @racket[text:input-box<%>] for use
-  with @racket[text:ports<%>].
-
-  @defmethod*[#:mode override
-              (((on-default-char (event (is-a?/c key-event%))) void?))]{
-    Notifies the @racket[text:ports<%>] enclosing this editor that a new line
-    of input has been provided.
-  }
-}
-
-@definterface[text:autocomplete<%> (text%)]{
-  The mixin implementing this interface provides an unintrusive autocompletion
-  menu when a particular (configurable) keystroke is pressed.
-
-  @defmethod*[(((auto-complete) void?))]{
-    Starts a completion.
-  }
-
-  @defmethod*[(((get-autocomplete-border-color) (or/c string? (is-a?/c color%))))]{
-    The border color for the autocomplete menu. Defaults to @racket["black"].
-  }
-
-  @defmethod*[(((get-autocomplete-background-color) (or/c string? (is-a?/c color%))))]{
-    The background color for the non-selected menu items. Defaults to
-    @racket["lavender"].
-  }
-
-  @defmethod*[(((get-autocomplete-selected-color) (or/c string? (is-a?/c color%))))]{
-    The background color for the selected menu item. Defaults to
-    @racket[(make-object color% 204 153 255)].
-  }
-
-  @defmethod*[(((completion-mode-key-event? (key-event (is-a?/c key-event%))) boolean?))]{
-    Returns true when the key event passed to it should initiate the
-    completions menu.
-  }
-
-  @defmethod*[(((get-all-words) (listof string?)))]{
-    Returns the list of the words that autocompletion should
-    choose from.
-  }
-
-  @defmethod*[(((get-word-at (pos exact-positive-integer?)) string?))]{
-    Given an editor location, returns the prefix ending at that location
-    that autocompletion should try to complete. 
-  }
-}
-
-@defmixin[text:autocomplete-mixin (text%) (text:autocomplete<%>)]{
-
-  @defmethod*[#:mode override (((on-paint) void?))]{
-    Draws the completion menu (when it is popped up).
-  }
-
-  @defmethod*[#:mode override (((on-char) void?))]{
-    Takes over the handling of key events when the completions menu is
-    visible. Also, when the completions menu is not visible, it calls the
-    @method[text:completion<%> completion-mode-key-event?]  method to see if it
-    should start completing.
-  }
-
-  @defmethod*[#:mode override (((on-event) void?))]{
-    This method is overridden to allow mouse access of the completions menu. It
-    only handles events when there is a menu open and the mouse is in the menu,
-    in which case it makes the menu trace the mouse.
-
-    The only time it does not call the super method is when the mouse is button
-    is pushed.
-  }
-}
-
-@defclass[text:basic% (text:basic-mixin (editor:basic-mixin text%)) ()]{}
-@defclass[text:line-spacing% (text:line-spacing-mixin text:basic%) ()]{}
-@defclass[text:hide-caret/selection% (text:hide-caret/selection-mixin text:line-spacing%) ()]{}
-@defclass[text:nbsp->space% (text:nbsp->space-mixin text:line-spacing%) ()]{}
-@defclass[text:normalize-paste% (text:normalize-paste-mixin text:line-spacing%) ()]{}
-@defclass[text:delegate% (text:delegate-mixin text:line-spacing%) ()]{}
-@defclass[text:wide-snip% (text:wide-snip-mixin text:line-spacing%) ()]{}
-@defclass[text:standard-style-list% (editor:standard-style-list-mixin text:wide-snip%) ()]{}
-@defclass[text:input-box% (text:input-box-mixin text:standard-style-list%) ()]{}
-@defclass[text:keymap% (editor:keymap-mixin text:standard-style-list%) ()]{}
-@defclass[text:return% (text:return-mixin text:keymap%) ()]{}
-@defclass[text:autowrap% (editor:autowrap-mixin text:keymap%) ()]{}
-@defclass[text:file% (text:file-mixin (editor:file-mixin text:autowrap%)) ()]{}
-@defclass[text:clever-file-format% (text:clever-file-format-mixin text:file%) ()]{}
-@defclass[text:backup-autosave% (editor:backup-autosave-mixin text:clever-file-format%) ()]{}
-@defclass[text:searching% (text:searching-mixin text:backup-autosave%) ()]{}
-@defclass[text:info% (text:info-mixin (editor:info-mixin text:searching%)) ()]{}
-
-@definterface[text:line-numbers<%> ()]{
-
-  @defmethod*[(((show-line-numbers! (show boolean?)) void?))]{
-    Enables or disables line number drawing.
-  }
-
-  @defmethod*[(((show-line-numbers?) boolean?))]{
-    Returns whether or not line drawing is enabled.
-  }
-
-  @defmethod*[(((set-line-numbers-color (color string?)) void?))]{
-    Sets the color of the line numbers.
-  }
-}
-
-@defmixin[text:line-numbers-mixin (text%) (text:line-numbers<%>)]{
-
-  @defmethod*[#:mode override (((on-paint) void?))]{
-    Draws the line numbers.
-  }
-
-  @defmethod*[(((show-line-numbers! (show boolean?)) void?))]{
-    Enables or disables line number drawing.
-  }
-
-  @defmethod*[(((show-line-numbers?) boolean?))]{
-    Returns whether or not line drawing is enabled.
-  }
-
-  @defmethod*[(((set-line-numbers-color (color string?)) void?))]{
-    Sets the color of the line numbers.
-  }
-}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^text:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/framework/version.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/framework/version.scrbl
deleted file mode 100644
index 977082c835..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/framework/version.scrbl
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/extract)
-@(require (for-label framework))
-@(require (for-label scheme/gui))
-@title{Version}
-
-@(include-previously-extracted "main-extracts.rkt" #rx"^version:")
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/add-color-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/add-color-intf.scrbl
deleted file mode 100644
index 00bc50f689..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/add-color-intf.scrbl
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[add-color<%> ()]{
-
-An @racket[add-color<%>] object is used to additively change the RGB values of
-a @racket[color%] object. An @racket[add-color<%>] object only exists within a
-@racket[style-delta%] object.
-
-See also @method[style-delta% get-foreground-add] and @method[style-delta%
-get-background-add].
-
-@defmethod[(get [r (box/c (integer-in -1000 1000))]
-                [g (box/c (integer-in -1000 1000))]
-                [b (box/c (integer-in -1000 1000))])
-           void?]{
-  Gets all of the additive values.
-
-  @boxisfill[@racket[r] @elem{the additive value for the red component of the color}]
-  @boxisfill[@racket[g] @elem{the additive value for the green component of the color}]
-  @boxisfill[@racket[b] @elem{the additive value for the blue component of the color}]
-}
-
-@defmethod[(get-b)
-           (integer-in -1000 1000)]{
-  Gets the additive value for the blue component of the color.
-}
-
-@defmethod[(get-g)
-           (integer-in -1000 1000)]{
-
-Gets the additive value for the green component of the color.
-
-}
-
-@defmethod[(get-r)
-           (integer-in -1000 1000)]{
-  Gets the additive value for the red component of the color.
-}
-
-@defmethod[(set [r (integer-in -1000 1000)]
-                [g (integer-in -1000 1000)]
-                [b (integer-in -1000 1000)])
-           void?]{
-  Sets all of the additive values.
-}
-
-@defmethod[(set-b [v (integer-in -1000 1000)])
-           void?]{
-  Sets the additive value for the blue component of the color.
-}
-
-@defmethod[(set-g [v (integer-in -1000 1000)])
-           void?]{
-  Sets the additive value for the green component of the color.
-}
-
-@defmethod[(set-r [v (integer-in -1000 1000)])
-           void?]{
-  Sets the additive value for the red component of the color.
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/area-container-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/area-container-intf.scrbl
deleted file mode 100644
index 33608c626a..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/area-container-intf.scrbl
+++ /dev/null
@@ -1,227 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[area-container<%> (area<%>)]{
-
-An @racket[area-container<%>] is a container @racket[area<%>].
-
-All @racket[area-container<%>] classes accept the following named
-instantiation arguments:
-@itemize[
-
- @item{@indexed-racket[border] --- default is @racket[0]; passed to
-@method[area-container<%> border]} 
- @item{@indexed-racket[spacing] --- default is @racket[0]; passed to
-@method[area-container<%> spacing]} 
- @item{@indexed-racket[alignment] --- default is class-specific, such as
- @racket['(center top)] for @racket[vertical-panel%]; the list
- elements are passed to
-@method[area-container<%> set-alignment]} 
-]
-
-
-
-@defmethod[(add-child [child (is-a?/c subwindow<%>)])
-           void?]{
-Add the given subwindow to the set of non-deleted children. See also
-@method[area-container<%> change-children].
-
-}
-
-@defmethod[(after-new-child [child (is-a?/c subarea<%>)])
-           void?]{
-@methspec{
-
-This method is called after a new containee area is created with this
- area as its container. The new child is provided as an argument to
- the method.
-
-}
-@methimpl{
-
-Does nothing.
-
-
-
-}}
-
-@defmethod[(begin-container-sequence)
-           void?]{
-Suspends geometry management in the container's top-level window
- until
-@method[area-container<%> end-container-sequence] is called. The
-@method[area-container<%> begin-container-sequence] and 
-@method[area-container<%> end-container-sequence] methods are used to bracket a set of container modifications so that
- the resulting geometry is computed only once.  A container sequence also 
- delays show and hide actions by
-@method[area-container<%> change-children], as well as the on-screen part of showing via
-@method[window<%> show] until the sequence is complete.  Sequence begin and end commands may
- be nested arbitrarily deeply.
-
-}
-
-@defmethod*[([(border)
-              spacing-integer?]
-             [(border [margin spacing-integer?])
-              void?])]{
-
-Gets or sets the border margin for the container in pixels. This
- margin is used as an inset into the panel's client area before the
- locations and sizes of the subareas are computed.
-}
-
-
-@defmethod[(change-children [filter ((listof (is-a?/c subarea<%>)) 
-                                     . -> . (listof (is-a?/c subarea<%>)))])
-           void?]{
-
-Takes a filter procedure and changes the container's list of
-non-deleted children. The filter procedure takes a list of
-children areas and returns a new list of children areas. The new
-list must consist of children that were created as subareas of
-this area (i.e., @method[area-container<%> change-children]
-cannot be used to change the parent of a subarea).
-
-After the set of non-deleted children is changed, the container computes
- the sets of newly deleted and newly non-deleted children. Newly deleted
- windows are hidden. Newly non-deleted windows are shown.
-
-Since non-window areas cannot be hidden, non-window areas cannot be
- deleted. If the filter procedure removes non-window subareas,
- an exception is raised and the set of non-deleted children is not changed.
-
-}
-
-@defmethod[(container-flow-modified)
-           void?]{
-Call this method when the result changes for an overridden flow-defining method, such as
-@method[area-container<%> place-children]. The call notifies the geometry manager that the placement of the
- container's children needs to be recomputed. 
-
-The
-@method[area-container<%> reflow-container]method only recomputes child positions when the geometry manager
- thinks that the placement has changed since the last computation.
-
-}
-
-@defmethod[(container-size [info (listof (list/c dimension-integer?
-                                                 dimension-integer?
-                                                 any/c
-                                                 any/c))])
-           (values dimension-integer? dimension-integer?)]{
-
-Called to determine the minimum size of a container. See
- @|geomdiscuss| for more information.
-
-}
-
-@defmethod[(delete-child [child (is-a?/c subwindow<%>)])
-           void?]{
-Removes the given subwindow from the list of non-deleted children.  See also
-@method[area-container<%> change-children].
-
-}
-
-@defmethod[(end-container-sequence)
-           void?]{
-
-See
-@method[area-container<%> begin-container-sequence].
-
-}
-
-@defmethod[(get-alignment)
-           (values (symbols 'right 'center 'left)
-                   (symbols 'bottom 'center 'top))]{
-
-Returns the container's current alignment specification. See
-@method[area-container<%> set-alignment] for more information.
-
-}
-
-@defmethod[(get-children)
-           (listof (is-a?/c subarea<%>))]{
-Returns a list of the container's non-deleted children. (The non-deleted
- children are the ones currently managed by the container; deleted
- children are generally hidden.) The order of the children in the list
- is significant. For example, in a vertical panel, the first child in
- the list is placed at the top of the panel.
-
-}
-
-@defmethod[(place-children [info (listof (list/c dimension-integer?
-                                                 dimension-integer?
-                                                 any/c
-                                                 any/c))]
-                           [width dimension-integer?]
-                           [height dimension-integer?])
-           (listof (list/c dimension-integer?
-                           dimension-integer?
-                           dimension-integer?
-                           dimension-integer?))]{
-
-Called to place the children of a container. See @|geomdiscuss|
- for more information.
-
-}
-
-
-@defmethod[(reflow-container)
-           void?]{
-
-When a container window is not shown, changes to the container's
-set of children do not necessarily trigger the immediate
-re-computation of the container's size and its children's sizes
-and positions.  Instead, the recalculation is delayed until the
-container is shown, which avoids redundant computations between a
-series of changes. The @method[area-container<%>
-reflow-container] method forces the immediate recalculation of
-the container's and its children's sizes and locations.
-
-Immediately after calling the @method[area-container<%>
-reflow-container] method, @method[window<%> get-size],
-@method[window<%> get-client-size], @method[window<%> get-width],
-@method[window<%> get-height], @method[window<%> get-x], and
-@method[window<%> get-y] report the manager-applied sizes and
-locations for the container and its children, even when the
-container is hidden. A container implementation can call
-functions such as @method[window<%> get-size] at any time to
-obtain the current state of a window (because the functions do
-not trigger geometry management).
-
-See also @method[area-container<%> container-flow-modified].
-
-}
-
-@defmethod[(set-alignment [horiz-align (symbols 'right 'center 'left)]
-                          [vert-align (symbols 'bottom 'center 'top)])
-           void?]{
-Sets the alignment specification for a container, which determines how
- it positions its children when the container has leftover space (when
- a child was not stretchable in a particular dimension).
-
-When the container's horizontal alignment is @racket['left], the
- children are left-aligned in the container and whitespace is inserted
- to the right.  When the container's horizontal alignment is
- @racket['center], each child is horizontally centered in the
- container. When the container's horizontal alignment is
- @racket['right], leftover whitespace is inserted to the left.
-
-Similarly, a container's vertical alignment can be @racket['top],
- @racket['center], or @racket['bottom].
-
-}
-
-@defmethod*[([(spacing)
-              spacing-integer?]
-             [(spacing [spacing spacing-integer?])
-              void?])]{
-
-Gets or sets the spacing, in pixels, used between subareas in the
- container. For example, a vertical panel inserts this spacing between
- each pair of vertically aligned subareas (with no extra space at the
- top or bottom).
-}
-
-}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/area-container-window-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/area-container-window-intf.scrbl
deleted file mode 100644
index df724b3fd1..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/area-container-window-intf.scrbl
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[area-container-window<%> (area-container<%> window<%>)]{
-
-Combines two interfaces.
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/area-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/area-intf.scrbl
deleted file mode 100644
index a22ed6aa1d..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/area-intf.scrbl
+++ /dev/null
@@ -1,119 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[area<%> ()]{
-
-An @racket[area<%>] object is either a window or a windowless
- container for managing the position and size of other areas. An
- @racket[area<%>] can be a container, a containee, or both. The only
- areas without a parent are top-level windows.
-
-All @racket[area<%>] classes accept the following named instantiation
- arguments:
-@itemize[
-
- @item{@indexed-racket[min-width] --- default is the initial graphical minimum width; passed to
-@method[area<%> min-width]} 
- @item{@indexed-racket[min-height] --- default is the initial graphical minimum height; passed to
-@method[area<%> min-height]} 
- @item{@indexed-racket[stretchable-width] --- default is class-specific; passed to
-@method[area<%> stretchable-width]} 
- @item{@indexed-racket[stretchable-height] --- default is class-specific; passed to
-@method[area<%> stretchable-height]} 
-]
-
-
-
-@defmethod[(get-graphical-min-size)
-           (values dimension-integer?
-                   dimension-integer?)]{
-
-Returns the area's graphical minimum size as two values: the minimum
- width and the minimum height (in pixels).
-
-See @|geomdiscuss| for more information. Note that the return value
- @italic{does not} depend on the area's
-@method[area<%> min-width] and
-@method[area<%> min-height] settings.
-
-}
-
-@defmethod[(get-parent)
-           (or/c (is-a?/c area-container<%>) #f)]{
-
-Returns the area's parent. A top-level window may have no parent (in
- which case @racket[#f] is returned), or it may have another top-level
- window as its parent.
-
-}
-
-@defmethod[(get-top-level-window)
-           (or/c (is-a?/c frame%) (is-a?/c dialog%))]{
-
-Returns the area's closest frame or dialog ancestor. For a frame or
- dialog area, the frame or dialog itself is returned.
-
-}
-
-@defmethod*[([(min-width)
-              dimension-integer?]
-             [(min-width [w dimension-integer?])
-              void?])]{
-
-Gets or sets the area's minimum width (in pixels) for geometry
- management.
-
-The minimum width is ignored when it is smaller than the area's
- @tech{graphical minimum width}, or when it is smaller
- than the width reported by
-@method[area-container<%> container-size] if the area is a container. See @|geomdiscuss| for more information.
-
-An area's initial minimum width is its graphical minimum width. See
- also
-@method[area<%> get-graphical-min-size] .
-
-When setting the minimum width, if @racket[w] is smaller than the
- internal hard minimum, @|MismatchExn|.
-
-}
-
-@defmethod*[([(min-height)
-              dimension-integer?]
-             [(min-height [h dimension-integer?])
-              void?])]{
-
-Gets or sets the area's minimum height for geometry management.
-
-The minimum height is ignored when it is smaller than the area's
- @tech{graphical minimum height}, or when it is smaller
- than the height reported by
-@method[area-container<%> container-size] if the area is a container. See @|geomdiscuss| for more information.
-
-An area's initial minimum height is its graphical minimum height. See
- also
-@method[area<%> get-graphical-min-size] .
-
-When setting the minimum height (in pixels); if @racket[h] is smaller
- than the internal hard minimum, @|MismatchExn|.
-
-}
-
-@defmethod*[([(stretchable-height)
-              boolean?]
-             [(stretchable-height [stretch? any/c])
-              void?])]{
-
-Gets or sets the area's vertical stretchability for geometry
- management. See @|geomdiscuss| for more information.
-
-}
-
-@defmethod*[([(stretchable-width)
-              boolean?]
-             [(stretchable-width [stretch? any/c])
-              void?])]{
-
-Gets or sets the area's horizontal stretchability for geometry
- management. See @|geomdiscuss| for more information.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/blurbs.rkt b/pkgs/gui-pkgs/gui-doc/scribblings/gui/blurbs.rkt
deleted file mode 100644
index f5f99c7b15..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/blurbs.rkt
+++ /dev/null
@@ -1,279 +0,0 @@
-#lang at-exp scheme/base
-
-  (require scribble/struct
-           scribble/manual
-           scribble/scheme
-           scribble/decode
-           (for-label scheme/gui/base
-                      scheme/base)
-           (for-syntax scheme/base)
-           (only-in scribblings/draw/blurbs
-                    res-sym
-                    boxisfill
-                    boxisfillnull
-                    MismatchExn))
-
-  (provide (except-out (all-defined-out) p define-inline)
-           (all-from-out scribblings/draw/blurbs))
-
-  (define-syntax-rule (define-inline (name) body)
-    (define-syntax (name stx)
-      (datum->syntax stx 'body stx)))
-
-  (define (p . l)
-    (decode-paragraph l))
-
-  (define (labelsimplestripped where what)
-    @elem{If @litchar{&} occurs in @|where|, it is specially parsed; 
-      under Windows and X, the character
-      following @litchar{&} is underlined in the displayed control to
-      indicate a keyboard mnemonic. (Under Mac OS X, mnemonic underlines are
-      not shown.) The mnemonic is meaningless for a @|what| (as far as
-      @xmethod[top-level-window<%> on-traverse-char] is concerned),
-      but it is supported for consistency with other control types. A
-      programmer may assign a meaning to the mnemonic (e.g., by overriding
-      @method[top-level-window<%> on-traverse-char]).})
-
-  (define (labelstripped where detail what)
-    @elem{If @litchar{&} occurs in @|where|@|detail|, it
-      is specially parsed as for @racket[button%].})
-
-  (define (bitmapuseinfo pre what thing and the)
-   @elem{@|pre| @|what| is @|thing|,@|and| if @|the|
-     bitmap has a mask (see @xmethod[bitmap% get-loaded-mask])
-     that is the same size as the bitmap, then the mask is used for the
-     label. Modifying a bitmap while it is used as a label has
-     an unspecified effect on the displayed label.})
-
-  (define-syntax bitmaplabeluse
-   (syntax-rules ()
-     [(_ id) @bitmapuseinfo["If" @racket[id] "a bitmap" " and" "the"]]))
-  (define-syntax bitmaplabelusearray
-   (syntax-rules ()
-     [(_ id) @bitmapuseinfo["If" @racket[id] "a list of bitmaps" " and" "a"]]))
-  (define-syntax bitmaplabeluseisbm
-    (syntax-rules ()
-      [(_ id) @bitmapuseinfo["Since" @racket[id] "a bitmap" "" "the"]]))
-
-  (define bitmapiforiglabel
-    @elem{The bitmap label is installed only
-          if the control was originally created with a bitmap label.})
-
-  (define (popupmenuinfo what other more)
-   (make-splice
-    (list*
-     @p{Pops up the given @racket[popup-menu%] object at the specified
-        coordinates (in this window's coordinates), and returns after
-        handling an unspecified number of events; the menu may still be
-        popped up when this method returns. If a menu item is selected from
-        the popup-menu, the callback for the menu item is called. (The
-        eventspace for the menu item's callback is the @|what|'s eventspace.)}
-
-     @p{While the menu is popped up, its target is set to the @|other|. See
-        @method[popup-menu% get-popup-target]
-        for more information.}
- 
-     (if (equal? more "")
-         null
-         (list @p{@|more|})))))
-
-  (define insertcharundos
-    @elem{Multiple calls to the character-inserting method are grouped together
-      for undo purposes, since this case of the method is typically used
-      for handling user keystrokes. However, this undo-grouping feature
-      interferes with the undo grouping performed by
-      @method[editor<%> begin-edit-sequence] and
-      @method[editor<%> end-edit-sequence], so the string-inserting
-      method should be used instead during undoable edit sequences.})
-
-  (define (insertscrolldetails what)
-    @elem{@|what| editor's display is scrolled to show the new selection
-          @techlink{position}.})
-
-  (define (insertmovedetails what)
-    @elem{If the insertion @techlink{position} is before
-      or equal to the selection's start/end @techlink{position}, then the
-      selection's start/end @techlink{position} is incremented by @|what|.})
-
-  (define OVD
-    @elem{The result is only valid when the editor is displayed 
-          (see @secref["tb:miaoverview"]). Editors are displayed when 
-          @method[editor<%> get-admin] returns an administrator (not @racket[#f]).})
-
-  (define (FCAX c details)
-    @elem{
-      @|c|alling this method may force the recalculation of @techlink{location}
-      information@|details|, even if the editor currently has delayed
-      refreshing (see @method[editor<%> refresh-delayed?]).})
-
-  (define FCA (FCAX "C" ""))
-  (define FCAMW (FCAX "C" " if a maximum width is set for the editor"))
-  (define (FCAME) (FCAX @elem{For @racket[text%] objects, c} " if a maximum width is set for the editor"))
-  
-  (define EVD
-    @elem{If the editor is not displayed and the editor has a
-          maximum width, line breaks are calculated as for
-          @method[text% line-start-position] (which handles specially
-          the case of no display when the editor has a maximum width).})
-
-  (define (LineToPara what)
-    @elem{See also @method[text% paragraph-start-position], which
-          operates on paragraphs (determined by explicit newline characters)
-          instead of lines (determined by both explicit newline
-          characters and automatic line-wrapping).})
-
-  (define admindiscuss @secref["editoradministrators"])
-  (define ateoldiscuss @secref["editoreol"])
-  (define textdiscuss @secref["editorflattened"])
-  (define clickbackdiscuss @secref["editorclickback"])
-  (define stylediscuss @secref["editorstyles"])
-  (define timediscuss @secref["editorcutandpastetime"])
-  (define filediscuss @secref["editorfileformat"])
-  (define editordatadiscuss @secref["editordata"])
-  (define snipclassdiscuss @secref["editorsnipclasses"])
-  (define togglediscuss @secref["styledeltatoggle"])
-  (define drawcaretdiscuss @secref["drawcaretinfo"])
-  (define eventspacediscuss @secref["eventspaceinfo"])
-  (define lockdiscuss @secref["lockinfo"])
-  (define mousekeydiscuss @secref["mouseandkey"])
-  (define globaleditordatadiscuss @secref["globaleditordata"])
-
-  (define geomdiscuss @secref["containeroverview"])
-
-  (define mrprefsdiscuss @secref["mredprefs"])
-
-  (define seesniporderdiscuss
-    @elem{See @secref["tb:miaoverview"] for information about snip order in pasteboards.})
-
-  (define PrintNote
-    (make-splice
-     (list
-      @p{Be sure to use the following methods to start/end drawing:}
-      @itemize[@item{@method[dc<%> start-doc]}
-               @item{@method[dc<%> start-page]}
-               @item{@method[dc<%> end-page]}
-               @item{@method[dc<%> end-doc]}]
-      @p{Attempts to use a drawing method outside of an active page raises an exception.})))
-
-  (define reference-doc '(lib "scribblings/reference/reference.scrbl"))
-
-  (define SeeMzParam @elem{(see @secref[#:doc reference-doc "parameters"])})
-  
-  (define DrawSizeNote "")
-
-  (define LineNumbering @elem{Lines are numbered starting with @racket[0].})
-  (define ParagraphNumbering @elem{Paragraphs are numbered starting with @racket[0].})
-
-  (define (italicptyStyleNote style)
-    @elem{The @|style| argument is provided for future extensions. Currently, @|style| must be the empty list.})
-
-  (define (HVLabelNote style what)
-    @elem{If @|style| includes @racket['vertical-label], then the @|what| is
-          created with a label above the control; if @|style| does not include
-          @racket['vertical-label] (and optionally includes @racket['horizontal-label]), then the
-          label is created to the left of the @|what|.})
-
-  (define (DeletedStyleNote style parent what)
-    @elem{If @|style| includes @racket['deleted], then the @|what| is created as hidden,
-          and it does not affect its parent's geometry; the @|what| can be made active later by calling
-          @|parent|'s @method[area-container<%> add-child] method.})
-
-  (define (InStyleListNote style)
-    @elem{The editor's style list must contain @style, otherwise
-          the style is not changed. See also @xmethod[style-list% convert].})
-
-  (define (FontKWs font)
-    @elem{The @|font| argument determines the font for the control.})
-  (define (FontLabelKWs font label-font)
-    @elem{The @|font| argument determines the font for the control content, 
-          and @|label-font| determines the font for the control label.})
-
-  (define (WindowKWs enabled)
-    @elem{For information about the @|enabled| argument, see @racket[window<%>].})
-  (define-inline (SubareaKWs)
-    @elem{For information about the @racket[horiz-margin] and @racket[vert-margin]
-              arguments, see @racket[subarea<%>].})
-  (define-inline (AreaContKWs) 
-    @elem{For information about the @racket[border], @racket[spacing], and @racket[alignment]
-              arguments, see @racket[area-container<%>].})
-
-  (define-inline (AreaKWs) 
-    @elem{For information about the
-              @racket[min-width], @racket[min-height], @racket[stretchable-width], and 
-              @racket[stretchable-height] arguments, see @racket[area<%>].})
-
-  (define AFM @elem{Adobe Font Metrics})
-  
-  (define (MonitorMethod what by-what method whatsit)
-    @elem{@|what| can be changed
-          by @|by-what|, and such changes do not go through this method; use @|method| to
-          monitor @|whatsit| changes.})
-
-  (define (MonitorCallbackX a b c d)
-    (MonitorMethod a b @elem{the @|d| callback procedure (provided as an initialization argument)} c))
-
-  (define (MonitorCallback a b c)
-    (MonitorCallbackX a b c "control"))
-  
-  (define (Unmonitored what by-what the-what method)
-    @elem{@|what| can be changed
-          by @|by-what|, and such changes do not go through this method. A program
-          cannot detect when @|the-what| except by polling @|method|.})
-  
-  (define OnInsertNote
-    (MonitorMethod @elem{The content of an editor}
-                   @elem{the system in response to other method calls}
-                   @elem{@xmethod[text% on-insert] or @xmethod[pasteboard% on-insert]}
-                   @elem{content additions}))
-  
-  (define OnDeleteNote
-    (MonitorMethod @elem{The content of an editor}
-                   @elem{the system in response to other method calls}
-                   @elem{@xmethod[text% on-delete] or @xmethod[pasteboard% on-delete]}
-                   @elem{content deletions}))
-  
-  (define OnSelectNote
-    (MonitorMethod @elem{The selection in a pasteboard}
-                   @elem{the system in response to other method calls}
-                   @elem{@method[pasteboard% on-select]}
-                   @elem{selection}))
-
-  (define OnMoveNote
-    (MonitorMethod @elem{Snip @techlink{location}s in a pasteboard}
-                   @elem{the system in response to other method calls}
-                   @elem{@method[pasteboard% on-move-to]}
-                   @elem{snip @techlink{position}}))
-
-  (define (colorName name name2 r g b)
-    (make-element #f
-                  (list (make-element `(bg-color ,r ,g ,b)
-                                      (list (hspace 5)))
-                        (hspace 1)
-                        (bytes->string/latin-1 name))))
-  
-  (define (edsnipsize a b c)
-    @elem{An @racket[editor-snip%] normally stretches to wrap around the size
-          of the editor it contains. This method @|a| of the snip
-          (and if the editor is @|b|, @|c|).})
-  (define (edsnipmax n)
-    (edsnipsize @elem{limits the @|n|}
-                @elem{larger}
-                @elem{only part of the editor is displayed}))
-  (define (edsnipmin a b)
-    (edsnipsize @elem{sets the minimum @|a|}
-                "smaller"
-                @elem{the editor is @|b|-aligned in the snip}))
-
-  (define (slant . s)
-    (make-element "slant" (decode-content s)))
-
-  (define (Resource s)
-    @elem{@to-element[`(quote ,(res-sym s))]
-          preference})
-  (define (ResourceFirst s) ; fixme -- add index
-    (let ([r (Resource s)])
-      (index* (list (format "~a preference" (res-sym s)))
-              (list r) 
-              r)))
-  
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/button-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/button-class.scrbl
deleted file mode 100644
index 492f359238..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/button-class.scrbl
+++ /dev/null
@@ -1,83 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/button}}
-
-@defclass/title[button% object% (control<%>)]{
-
-Whenever a button is clicked by the user, the button's callback
- procedure is invoked. A callback procedure is provided as an
- initialization argument when each button is created.
-
-@defconstructor[([label (or/c label-string? 
-                              (is-a?/c bitmap%)
-                              (list/c (is-a?/c bitmap%)
-                                      label-string?
-                                      (or/c 'left 'top 'right 'bottom)))]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [callback ((is-a?/c button%) (is-a?/c control-event%) . -> . any) (lambda (b e) (void))]
-                 [style (listof (or/c 'border 'deleted)) null]
-                 [font (is-a?/c font%) normal-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 2]
-                 [horiz-margin spacing-integer? 2]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #f]
-                 [stretchable-height any/c #f])]{
-
-Creates a button with a string label, bitmap label, or both.
- @bitmaplabeluse[label] If @racket[label] is a list, then
- the button has both a bitmap and string label, and the
- symbol @racket['left], @racket['top], @racket['right], or @racket['bottom]
- specifies the location of the image relative to the text on the button.
-
-If @litchar{&} occurs in @racket[label] (when @racket[label] includes a
-string), it is specially parsed; on Windows and Unix, the character
-following @litchar{&} is underlined in the displayed control to
-indicate a keyboard mnemonic. (On Mac OS X, mnemonic underlines are
-not shown.)  The underlined mnemonic character must be a letter or a
-digit. The user can effectively click the button by typing the
-mnemonic when the control's top-level-window contains the keyboard
-focus. The user must also hold down the Meta or Alt key if the
-keyboard focus is currently in a control that handles normal
-alphanumeric input. The @litchar{&} itself is removed from
-@racket[label] before it is displayed for the control; a @litchar{&&}
-in @racket[label] is converted to @litchar{&} (with no mnemonic
-underlining). On Mac OS X, a parenthesized mnemonic character is
-removed (along with any surrounding space) before the label is
-displayed, since a parenthesized mnemonic is often used for non-Roman
-languages. Finally, for historical reasons, any text after a tab character is removed on all
-platforms. All of these rules are consistent with label handling in
-menu items (see @method[labelled-menu-item<%> set-label]). Mnemonic keyboard events are handled by
-@method[top-level-window<%> on-traverse-char] (but not on Mac OS
-X).
-
-The @racket[callback] procedure is called (with the event type
-@indexed-racket['button]) whenever the user clicks the button.
-
-If @racket[style] includes @racket['border], the button is drawn with
-a special border that indicates to the user that it is the default
-action button (see @method[top-level-window<%>
-on-traverse-char]). @DeletedStyleNote[@racket[style] @racket[parent]]{button}
-
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]}
-
-
-@defmethod[#:mode override
-           (set-label [label (or/c label-string? 
-                                   (is-a?/c bitmap%))])
-           void?]{
-
-The same as @xmethod[window<%> set-label] when @racket[label] is a
- string.
-
-Otherwise, sets the bitmap label for a bitmap button. @bitmaplabeluseisbm[label]
- @|bitmapiforiglabel|
-
-If the button has both a string and a bitmap label, then either can be
- set using @method[button% set-label].
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/canvas-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/canvas-class.scrbl
deleted file mode 100644
index badaa604bd..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/canvas-class.scrbl
+++ /dev/null
@@ -1,459 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[canvas% object% (canvas<%>)]{
-
-A @racket[canvas%] object is a general-purpose window for drawing and
- handling events. See @racket[canvas<%>] for information about drawing
- onto a canvas.
-
-
-@defconstructor[([parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [style (listof (or/c 'border 'control-border 'combo 
-                                      'vscroll 'hscroll 'resize-corner
-                                      'gl 'no-autoclear 'transparent
-                                      'no-focus 'deleted)) null]
-                 [paint-callback ((is-a?/c canvas%) (is-a?/c dc<%>) . -> . any) void]
-                 [label (or/c label-string? #f) #f]
-                 [gl-config (or/c (is-a?/c gl-config%) #f) #f]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 0]
-                 [horiz-margin spacing-integer? 0]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-The @racket[style] argument indicates one or more of the following styles:
-
-@itemize[
-
- @item{@racket['border] --- gives the canvas a thin border}
-
- @item{@racket['control-border] --- gives the canvas a border that is
- like a @racket[text-field%] control}
-
- @item{@racket['combo] --- gives the canvas a combo button that is like
- a @racket[combo-field%] control; this style is intended for use
- with @racket['control-border] and not with @racket['hscroll] or
- @racket['vscroll]}
-
- @item{@racket['hscroll] --- enables horizontal scrolling (initially visible but inactive)}
-
- @item{@racket['vscroll] --- enables vertical scrolling (initially visible but inactive)}
-
- @item{@racket['resize-corner] --- leaves room for a resize control at the canvas's
-                                  bottom right when only one scrollbar is visible}
-
- @item{@racket['gl] --- creates a canvas for OpenGL drawing instead of
-       normal @racket[dc<%>] drawing; call the @method[dc<%>
-       get-gl-context] method on the result of @method[canvas<%>
-       get-dc]; this style is usually combined with
-       @racket['no-autoclear]}
-
- @item{@racket['no-autoclear] --- prevents automatic erasing of the
-       canvas by the windowing system; see @racket[canvas<%>] for
-       information on canvas refresh}
-
- @item{@racket['transparent] --- the canvas is ``erased'' by the
- windowing system by letting its parent show through; see
- @racket[canvas<%>] for information on window refresh and on the
- interaction of @racket['transparent] and offscreen buffering; the
- result is undefined if this flag is combined with
- @racket['no-autoclear]}
- 
- @item{@racket['no-focus] --- prevents the canvas from accepting the
- keyboard focus when the canvas is clicked or when the
-@method[window<%> focus]   method is called}
-
- @item{@racket['deleted] --- creates the canvas as initially hidden and without affecting
-                             @racket[parent]'s geometry; the canvas can be made active
-                             later by calling @racket[parent]'s @method[area-container<%> add-child]
-                             method}
- 
-]
-
-The @racket['hscroll] and @racket['vscroll] styles create a
- canvas with an initially inactive scrollbar. The scrollbars are
- activated with either
-@method[canvas% init-manual-scrollbars] or
-@method[canvas% init-auto-scrollbars], and they can be hidden and re-shown with
-@method[canvas% show-scrollbars].
-
-The @racket[paint-callback] argument is called by the default
-@method[canvas% on-paint] method, using the canvas and the DC returned by
-@method[canvas<%> get-dc] as the argument.
-
-The @racket[label] argument names the canvas for
-@method[window<%> get-label], but it is not displayed with the canvas.
-
-The @racket[gl-config] argument determines properties of an OpenGL
- context for this canvas, as obtained through the canvas's drawing
- context. See also
-@method[canvas<%> get-dc] and
-@xmethod[dc<%> get-gl-context].
-
-
-@WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-}
-
-
-@defmethod[(get-scroll-page [which (or/c 'horizontal 'vertical)])
-           positive-dimension-integer?]{
-
-Get the current page step size of a manual scrollbar. The result is
- @racket[0] if the scrollbar is not active or it is automatic.
-
-The @racket[which] argument is either @racket['horizontal] or
- @racket['vertical], indicating whether to get the page step size of
- the horizontal or vertical scrollbar, respectively.
-
-See also
-@method[canvas% init-manual-scrollbars].
-}
-
-
-@defmethod[(get-scroll-pos [which (or/c 'horizontal 'vertical)])
-           dimension-integer?]{
-
-Gets the current value of a manual scrollbar. The result is always
- @racket[0] if the scrollbar is not active or it is automatic.
-
-The @racket[which] argument is either @racket['horizontal] or
- @racket['vertical], indicating that the value of the horizontal or
- vertical scrollbar should be returned, respectively.
-
-See also
-@method[canvas% init-manual-scrollbars].
-}
-
-
-@defmethod[(get-scroll-range [which (or/c 'horizontal 'vertical)])
-           dimension-integer?]{
-
-Gets the current maximum value of a manual scrollbar. The result is
- always @racket[0] if the scrollbar is not active or it is automatic.
-
-The @racket[which] argument is either @racket['horizontal] or
- @racket['vertical], indicating whether to get the maximum value of the
- horizontal or vertical scrollbar, respectively.
-
-See also
-@method[canvas% init-manual-scrollbars].
-}
-
-
-@defmethod[(get-view-start)
-           (values dimension-integer? dimension-integer?)]{
-
-Get the location at which the visible portion of the canvas
-starts, based on the current values of the horizontal and
-vertical scrollbars if they are initialized as automatic (see
-@method[canvas% init-auto-scrollbars]). Combined with
-@method[window<%> get-client-size], an application can
-efficiently redraw only the visible portion of the canvas.  The
-values are in pixels.
-
-If the scrollbars are disabled or initialized as manual (see
-@method[canvas% init-manual-scrollbars]), the result is @racket[(values 0 0)].
-
-}
-
-
-@defmethod[(get-virtual-size)
-           (value dimension-integer? dimension-integer?)]{
-Gets the size in device units of the scrollable canvas area (as
- opposed to the client size, which is the area of the canvas currently
- visible). This is the same size as the client size (as returned by
-@method[window<%> get-client-size]) unless scrollbars are initialized as automatic (see
-@method[canvas% init-auto-scrollbars]).
-
-}
-
-
-@defmethod[(init-auto-scrollbars [horiz-pixels (or/c positive-dimension-integer? #f)]
-                                 [vert-pixels (or/c positive-dimension-integer? #f)]
-                                 [h-value (real-in 0.0 1.0)]
-                                 [v-value (real-in 0.0 1.0)])
-           void?]{
-
-Enables and initializes automatic scrollbars for the canvas.  A
- horizontal or vertical scrollbar can be activated only in a canvas
- that was created with the @indexed-racket['hscroll] or
- @indexed-racket['vscroll] style flag, respectively.
-
-With automatic scrollbars, the programmer specifies the desired
- virtual size of the canvas, and the scrollbars are automatically
- handled to allow the user to scroll around the virtual area. The
- scrollbars are not automatically hidden if they are unneeded; see
-@method[canvas% show-scrollbars]. 
-
-The coordinates for mouse
-events (passed to @method[canvas<%> on-event]) are not adjusted to
-account for the position of the scrollbar; 
-use the @method[canvas% get-view-start] method to find suitable
-offsets.
-
-See also
-@method[canvas% init-manual-scrollbars] for information about manual scrollbars. The horizontal and vertical
- scrollbars are always either both manual or both automatic, but they
- are independently enabled. Automatic scrollbars can be
- re-initialized as manual, and vice versa.
-
-If either @racket[horiz-pixels] or @racket[vert-pixels] is
- @racket[#f], the scrollbar is not enabled in the corresponding
- direction, and the canvas's virtual size in that direction is the
- same as its client size.
-
-The @racket[h-value] and @racket[v-value] arguments specify the initial
- values of the scrollbars as a fraction of the scrollbar's range.  A
- @racket[0.0] value initializes the scrollbar to its left/top, while a
- @racket[1.0] value initializes the scrollbar to its right/bottom.
-
-It is possible to adjust the virtual sizes by calling this function again.
-
-
-See also
-@method[canvas% on-scroll] and
-@method[canvas% get-virtual-size].
-
-}
-
-@defmethod[(init-manual-scrollbars [h-length (or/c dimension-integer? #f)]
-                                   [v-length (or/c dimension-integer? #f)]
-                                   [h-page positive-dimension-integer?]
-                                   [v-page positive-dimension-integer?]
-                                   [h-value dimension-integer?]
-                                   [v-value dimension-integer?])
-           void?]{
-
-Enables and initializes manual scrollbars for the canvas.  A
- horizontal or vertical scrollbar can be activated only in a canvas
- that was created with the @indexed-racket['hscroll] or
- @indexed-racket['vscroll] style flag, respectively.
-
-With manual scrollbars, the programmer is responsible for managing all
- details of the scrollbars, and the scrollbar state has no effect on
- the canvas's virtual size. Instead, the canvas's virtual size is the
- same as its client size.
-
-See also
-@method[canvas% init-auto-scrollbars] for information about automatic scrollbars. The horizontal and vertical
- scrollbars are always either both manual or both automatic, but they
- are independently enabled. Automatic scrollbars can be re-initialized
- as manual, and vice versa.
-
-The @racket[h-length] and @racket[v-length] arguments specify the length of
- each scrollbar in scroll steps (i.e., the maximum value of each
- scrollbar). If either is @racket[#f], the scrollbar is disabled in the
-corresponding direction.
-
-The @racket[h-page] and @racket[v-page] arguments set the number of
- scrollbar steps in a page, i.e., the amount moved when pressing above
- or below the value indicator in the scrollbar control.
-
-The @racket[h-value] and @racket[v-value] arguments specify the initial
- values of the scrollbars.
-
-If @racket[h-value] is greater than @racket[h-length] or @racket[v-value] is
- greater than @racket[v-length], @|MismatchExn|. (The page step may be
- larger than the total size of a scrollbar.)
-
-See also
-@method[canvas% on-scroll] and
-@method[canvas% get-virtual-size].
-
-}
-
-@defmethod[(make-bitmap [width exact-positive-integer?]
-                        [height exact-positive-integer?]) 
-           (is-a/c? bitmap%)]{
-
-Creates a bitmap that draws in a way that is the same as drawing to the
-canvas. See also @racket[make-screen-bitmap]
-and @secref[#:doc '(lib "scribblings/draw/draw.scrbl") "Portability"].}
-
-
-@defmethod[#:mode override 
-           (on-paint)
-           void?]{
-
-Calls the procedure supplied as the @racket[paint-callback] argument when
- the @racket[canvas%] was created.
-}
-
-
-@defmethod[(on-scroll [event (is-a?/c scroll-event%)])
-           void?]{
-Called when the user changes one of the canvas's scrollbars. A
- @racket[scroll-event%] argument provides information about the
- scroll action.
-
-This method is called only when manual
- scrollbars are changed (see @method[canvas% init-manual-scrollbars]), 
- not automatic scrollbars; for automatic scrollbars,
- the
-@method[canvas<%> on-paint] method is called, instead.
-
-}
-
-
-@defmethod[(refresh-now [paint-proc ((is-a?/c dc<%>) . -> . any)
-                                    (lambda (dc) (send @#,this-obj[] on-paint))]
-                        [#:flush? flush? any/c #t])
-           void?]{
-
-Calls @racket[paint-proc] with the canvas's drawing context to immediately
-update the canvas (in contrast to @method[window<%> refresh], which merely
-queues an update request to be handled at the windowing system's discretion).
-
-Before @racket[paint-proc] is called, flushing is disabled for the
-canvas. Also, the canvas is erased, unless the canvas has the
-@racket['no-autoclear] style. After @racket[paint-proc] returns,
-flushing is enabled, and if @racket[flush?] is true, then
-@method[canvas<%> flush] is called immediately.}
-
-
-@defmethod[(scroll [h-value (or/c (real-in 0.0 1.0) #f)]
-                   [v-value (or/c (real-in 0.0 1.0) #f)])
-           void?]{
-
-Sets the values of automatic scrollbars. (This method has no effect on
- manual scrollbars.)
-
-If either argument is @racket[#f], the scrollbar value is not changed in
- the corresponding direction.
-
-The @racket[h-value] and @racket[v-value] arguments each specify a fraction
- of the scrollbar's movement.  A @racket[0.0] value sets the scrollbar to
- its left/top, while a @racket[1.0] value sets the scrollbar to its
- right/bottom. A @racket[0.5] value sets the scrollbar to its middle. In
- general, if the canvas's virtual size is @racket[_v], its client size is
- @racket[_c], and @racket[(> _v _c)], then scrolling to @racket[_p]
- sets the view start to @racket[(floor (* _p (- _v _c)))].
-
-See also
-@method[canvas% init-auto-scrollbars] and
-@method[canvas% get-view-start].
-
-}
-
-
-@defmethod[(set-scroll-page [which (or/c 'horizontal 'vertical)]
-                            [value positive-dimension-integer?])
-           void?]{
-
-Set the current page step size of a manual scrollbar. (This method has
- no effect on automatic scrollbars.)
-
-The @racket[which] argument is either @racket['horizontal] or
- @racket['vertical], indicating whether to set the page step size of
- the horizontal or vertical scrollbar, respectively.
-
-See also
-@method[canvas% init-manual-scrollbars].
-
-}
-
-
-@defmethod[(set-scroll-pos [which (or/c 'horizontal 'vertical)]
-                           [value dimension-integer?])
-           void?]{
-
-Sets the current value of a manual scrollbar. (This method has no
- effect on automatic scrollbars.)
-
-The @racket[which] argument is either @racket['horizontal] or
- @racket['vertical], indicating whether to set the value of the
- horizontal or vertical scrollbar set, respectively.
-
-@MonitorMethod[@elem{The value of the canvas's scrollbar} @elem{the user scrolling} @elem{@method[canvas% on-scroll]} @elem{scrollbar value}]
-
-See also
-@method[canvas% init-manual-scrollbars] and
-@method[canvas% scroll].
-
-}
-
-
-@defmethod[(set-scroll-range [which (or/c 'horizontal 'vertical)]
-                             [value dimension-integer?])
-           void?]{
-
-Sets the current maximum value of a manual scrollbar. (This method has
- no effect on automatic scrollbars.)
-
-The @racket[which] argument is either @racket['horizontal] or
- @racket['vertical], indicating whether to set the maximum value of the
- horizontal or vertical scrollbar, respectively.
-
-See also
-@method[canvas% init-manual-scrollbars].
-}
-
-
-@defmethod[(show-scrollbars [show-horiz? any/c]
-                            [show-vert? any/c])
-           void?]{
-
-Shows or hides the scrollbars as indicated by
-@racket[show-horiz?] and @racket[show-vert?]. If
-@racket[show-horiz?] is true and the canvas was not created with
-the @racket['hscroll] style, @|MismatchExn|.  Similarly, if
-@racket[show-vert?] is true and the canvas was not created with
-the @racket['vscroll] style, @|MismatchExn|.
-
-
-The horizontal scrollbar can be shown only if the canvas was
-created with the @racket['hscroll] style, and the vertical
-scrollbar can be shown only if the canvas was created with the
-@racket['vscroll] style. See also @method[canvas%
-init-auto-scrollbars] and @method[canvas%
-init-manual-scrollbars].
-
-}
-
-
-@defmethod[(swap-gl-buffers)
-           void?]{
-Calls
-@method[gl-context<%> swap-buffers]
-on the result of 
-@method[dc<%> get-gl-context]
-for this canvas's DC as returned by
-@method[canvas<%> get-dc].
-
-The 
-@xmethod[gl-context<%> swap-buffers]
-method acquires a re-entrant lock, so nested calls to
-@method[canvas% swap-gl-buffers] or @method[canvas% with-gl-context]
-on different threads or OpenGL contexts can block or deadlock.
-
-
-}
-
-
-@defmethod[(with-gl-context [thunk (-> any)]
-			    [#:fail fail (-> any) (lambda () (error ....))])
-           any]{
-Passes the given thunk to
-@method[gl-context<%> call-as-current]
-of the result of 
-@method[dc<%> get-gl-context]
-for this canvas's DC as returned by
-@method[canvas<%> get-dc]. If @method[dc<%> get-gl-context]
-returns @racket[#f], then @racket[fail] is called,
-instead.
-
-The 
-@xmethod[gl-context<%> call-as-current]
-method acquires a re-entrant lock, so nested calls to
-@method[canvas% with-gl-context] or @method[canvas% swap-gl-buffers]
-on different threads or OpenGL contexts can block or deadlock.
-
-
-}
-}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/canvas-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/canvas-intf.scrbl
deleted file mode 100644
index 4e537f9799..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/canvas-intf.scrbl
+++ /dev/null
@@ -1,296 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[canvas<%> (subwindow<%>)]{
-
-A canvas is a subwindow onto which graphics and text can be drawn. Canvases also
- receive mouse and keyboard events.
-
-The @racket[canvas<%>] interface is implemented by two classes:
-@itemize[
-
- @item{@racket[canvas%] --- a canvas for arbitrary drawing and
-  event handling; and}
-
- @item{@racket[editor-canvas%] --- a canvas for displaying
-  @racket[editor<%>] objects.}
-
-]
-
-To draw onto a canvas, get its device context via @method[canvas<%>
- get-dc]. There are two basic approaches to updating a canvas:
-
-@itemlist[
-
- @item{Drawing normally occurs during the canvas's @method[canvas<%>
-       on-paint] callback.  The @racket[canvas%] class supports a
-       @racket[paint-callback] initialization argument to be called
-       from the default @method[canvas<%> on-paint] method.
-
-       A canvas's @method[canvas<%> on-paint] method is called
-       automatically as an event when the windowing system determines
-       that the canvas must be updated, such as when the canvas is
-       first shown or when it is resized. Use the @method[window<%>
-       refresh] method to explicitly trigger an @method[canvas<%>
-       on-paint] call from the windowing system. (Multiple refresh
-       requests before @method[canvas<%> on-paint] can be called are
-       coaleced into a single @method[canvas<%> on-paint] call.)
-
-       Before the windowing system calls @method[canvas<%> on-paint],
-       it may erase the canvas's background (see @method[dc<%>
-       erase]), depending on the style of the canvas (e.g., as
-       determined by the @racket[style] initialization argument for
-       @racket[canvas%]). Even when the canvas's style suppresses
-       explicit clearing of the canvas, a canvas may be erased by the
-       windowing system due to window-moving and -resizing
-       operations. For a transparent canvas, ``erased'' means that the
-       canvas's parent window shows through.}
-
- @item{Drawing can also occur at any time outside an @method[canvas<%>
-       on-paint] call form the windowing system, including from
-       threads other than the @tech{handler thread} of the canvas's
-       eventspace. Drawing outside an @method[canvas<%> on-paint]
-       callback from the system is transient in the sense that
-       windowing activity can erase the canvas, but the drawing is
-       persistent as long as no windowing refresh is needed.
-
-       Calling an @method[canvas<%> on-paint] method directly is the
-       same as drawing outside an @method[canvas<%> on-paint] callback
-       from the windowing system. For a @racket[canvas%], use
-       @method[canvas% refresh-now] to force an immediate update of
-       the canvas's content that is otherwise analogous to queueing an
-       update with @method[window<%> refresh].}
-
-]
-
-Drawing to a canvas's drawing context actually renders into an
-offscreen buffer. The buffer is automatically flushed to the screen
-asynchronously, explicitly via the @method[canvas<%> flush] method, or
-explicitly via @racket[flush-display]---unless flushing has been
-disabled for the canvas.  The @method[canvas<%> suspend-flush] method
-suspends flushing for a canvas until a matching @method[canvas<%>
-resume-flush] calls; calls to @method[canvas<%> suspend-flush] and
-@method[canvas<%> resume-flush] can be nested, in which case flushing
-is suspended until the outermost @method[canvas<%> suspend-flush] is
-balanced by a @method[canvas<%> resume-flush]. An @method[canvas<%>
-on-paint] call from the windowing system is implicitly wrapped with
-@method[canvas<%> suspend-flush] and @method[canvas<%> resume-flush]
-calls, as is a call to a paint procedure by @method[canvas% refresh-now].
-
-In the case of a transparent canvas, line and text smoothing can
-depend on the window that serves as the canvas's background. For
-example, smoothing may color pixels differently depending on whether
-the target context is white or gray.  Background-sensitive smoothing
-is supported only if a relatively small number of drawing commands are
-recorded in the canvas's offscreen buffer, however.
-
-
-@defmethod*[([(accept-tab-focus)
-              boolean?]
-             [(accept-tab-focus [on? any/c])
-              void?])]{
-
-@index['("keyboard focus" "navigation")]{Gets} or sets whether
-tab-focus is enabled for the canvas (assuming that the canvas is
-not created with the @racket['no-focus] style for @racket[canvas%]). When tab-focus is
-enabled, the canvas can receive the keyboard focus when the user
-navigates among a frame or dialog's controls with the Tab and
-arrow keys. By default, tab-focus is disabled.
-
-When tab-focus is enabled for a @racket[canvas%] object, Tab, arrow,
- Enter, and Escape keyboard events are consumed by a frame's default
- @method[top-level-window<%> on-traverse-char] method. (In addition, a
- dialog's default method consumes Escape key events.) Otherwise,
- @method[top-level-window<%> on-traverse-char] allows the keyboard
- events to be propagated to the canvas.
-
-For an @racket[editor-canvas%] object, handling of Tab, arrow, Enter,
- and Escape keyboard events is determined by the
- @method[editor-canvas% allow-tab-exit] method.
-
-
-}
-
-
-@defmethod[(flush) void?]{
-
-Like @racket[flush-display], but constrained if possible to the canvas.}
-
-
-@defmethod[(get-canvas-background)
-           (or/c (is-a?/c color%) #f)]{
-Returns the color currently used to ``erase'' the canvas content before
-@method[canvas<%> on-paint] is called. See also
-@method[canvas<%> set-canvas-background].
-
-The result is @racket[#f] if the canvas was created with the
- @indexed-racket['transparent] style, otherwise it is always a
- @racket[color%] object.
-
-}
-
-
-@defmethod[(get-dc)
-           (is-a?/c dc<%>)]{
-Gets the canvas's device context. See @racket[dc<%>] for more information about
-drawing.
-
-}
-
-
-
-@defmethod*[([(min-client-height)
-              dimension-integer?]
-             [(min-client-height [h dimension-integer?])
-              void?])]{
-
-Gets or sets the canvas's minimum height for geometry management,
- based on the client size rather than the full size. The client height
- is obtained or changed via
-@xmethod[area<%> min-height], adding or subtracting border and scrollbar sizes as appropriate.
-
-The minimum height is ignored when it is smaller than the canvas's
- @tech{graphical minimum height}. See @|geomdiscuss| for
- more information.
-}
-
-
-@defmethod*[([(min-client-width)
-              dimension-integer?]
-             [(min-client-width [w dimension-integer?])
-              void?])]{
-
-Gets or sets the canvas's minimum width for geometry management, based
- on the canvas's client size rather than its full size. The client
- width is obtained or changed via
-@xmethod[area<%> min-width], adding or subtracting border and scrollbar sizes as appropriate.
-
-The minimum width is ignored when it is smaller than the canvas's
- @tech{graphical minimum width}. See @|geomdiscuss| for
- more information.
-
-}
-
-
-@defmethod[(on-char [ch (is-a?/c key-event%)])
-           void?]{
-@methspec{
-
-Called when the canvas receives a keyboard event.  See also
- @|mousekeydiscuss|.
-
-}
-@methimpl{
-
-Does nothing.
-
-
-
-}}
-
-
-@defmethod[(on-event [event (is-a?/c mouse-event%)])
-           void?]{
-@methspec{
-
-Called when the canvas receives a mouse event. See also
- @|mousekeydiscuss|, noting in particular that certain mouse events
- can get dropped.
-
-}
-@methimpl{
-
-Does nothing.
-
-
-
-}}
-
-@defmethod[(on-paint)
-           void?]{
-@methspec{
-
-Called when the canvas is exposed or resized so that the image in the
- canvas can be repainted.
-
-When
-@method[canvas<%> on-paint] is called in response to a system expose event and only a portion of
- the canvas is newly exposed, any drawing operations performed by
-@method[canvas<%> on-paint] are clipped to the newly-exposed region; however, the clipping region
- as reported by
-@method[dc<%> get-clipping-region] does not change.
-
-}
-@methimpl{
-
-Does nothing.
-
-
-
-}}
-
-@defmethod[(on-tab-in)
-           void?]{
-@methspec{
-
-Called when the keyboard focus enters the canvas via keyboard
- navigation events. The
-@method[window<%> on-focus] method is also called, as usual for a focus change. When the keyboard
- focus leaves a canvas due to a navigation event, only
-@method[window<%> on-focus] is called.
-
-See also
-@method[canvas<%> accept-tab-focus] and
-@xmethod[top-level-window<%> on-traverse-char] .
-
-}
-@methimpl{
-
-Does nothing.
-
-
-
-}}
-
-
-@defmethod[(resume-flush) void?]{
-
-See @racket[canvas<%>] for information on canvas flushing.}
-
-
-
-@defmethod[(set-canvas-background [color (is-a?/c color%)])
-           void?]{
-
-Sets the color used to ``erase'' the canvas content before
-@method[canvas<%> on-paint] is called. (This color is typically associated with the canvas at a
- low level, so that it is used even when a complete refresh of the
- canvas is delayed by other activity.)
-
-If the canvas was created with the @indexed-racket['transparent] style,
- @|MismatchExn|.
-
-}
-
-@defmethod[(set-resize-corner [on? any/c])
-           void?]{
-
-On Mac OS X, enables or disables space for a resize tab at the
- canvas's lower-right corner when only one scrollbar is visible. This
- method has no effect on Windows or Unix, and it has no effect when
- both or no scrollbars are visible. The resize corner is disabled by
- default, but it can be enabled when a canvas is created with the
- @racket['resize-corner] style.
-
-}
-
-
-@defmethod[(suspend-flush) void?]{
-
-See @racket[canvas<%>] for information on canvas flushing.
-
-Beware that suspending flushing for a canvas can discourage refreshes
-for other windows in the same frame on some platforms.}
-
-}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/check-box-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/check-box-class.scrbl
deleted file mode 100644
index 70aaa30e72..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/check-box-class.scrbl
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/check-box}}
-
-@defclass/title[check-box% object% (control<%>)]{
-
-A check box is a labeled box which is either checked or unchecked.
-
-Whenever a check box is clicked by the user, the check box's value is
- toggled and its callback procedure is invoked. A callback procedure
- is provided as an initialization argument when each check box is
- created.
-
-
-
-
-@defconstructor[([label (or/c label-string? (is-a?/c bitmap%))]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%)
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [callback ((is-a?/c check-box%) (is-a?/c control-event%)
-                            . -> . any) (lambda (c e) (void))]
-                 [style (listof (or/c 'deleted)) null]
-                 [value any/c #f]
-                 [font (is-a?/c font%) normal-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 2]
-                 [horiz-margin spacing-integer? 2]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #f]
-                 [stretchable-height any/c #f])]{
-
-Creates a check box with a string or bitmap label. @bitmaplabeluse[label]
-
-@labelstripped[@racket[label]
-  @elem{ (when @racket[label] is a string)}
-  @elem{effectively click the check box}]
-
-The @racket[callback] procedure is called (with the event type
- @indexed-racket['check-box]) whenever the user clicks the check box.
-
-@DeletedStyleNote[@racket[style] @racket[parent]]{check box}
-
-If @racket[value] is true, it is passed to
-@method[check-box% set-value] so that the box is initially checked.
-
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-
-
-}
-
-@defmethod[(get-value)
-           boolean?]{
-Gets the state of the check box: @racket[#t] if it is checked, @racket[#f]
- otherwise.
-
-}
-
-@defmethod[#:mode override
-           (set-label [label (or/c label-string? (is-a?/c bitmap%))])
-           void?]{
-
-The same as @xmethod[window<%> set-label] when @racket[label] is a
- string.
-
-Otherwise, sets the bitmap label for a bitmap check box.
-@bitmaplabeluseisbm[label] @|bitmapiforiglabel|
-
-}
-
-@defmethod[(set-value [state any/c])
-           void?]{
-
-Sets the check box's state. (The control's callback procedure is
-@italic{not} invoked.)
-
-@MonitorCallback[@elem{The check box's state} @elem{the user clicking the control} @elem{state}]
-
-
-If @racket[state] is @racket[#f], the box is
- unchecked, otherwise it is checked.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/checkable-menu-item-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/checkable-menu-item-class.scrbl
deleted file mode 100644
index 0611204bf0..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/checkable-menu-item-class.scrbl
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[checkable-menu-item% object% (selectable-menu-item<%>)]{
-
-A @racket[checkable-menu-item%] is a string-labelled menu item that
- maintains a check mark. Its parent must be a @racket[menu%] or
- @racket[popup-menu%]. When the user selects the menu item, the
- item's check mark is toggled and its callback procedure is called.
-
-
-@defconstructor[([label label-string?]
-                 [parent (or/c (is-a?/c menu%) (is-a?/c popup-menu%))]
-                 [callback ((is-a?/c checkable-menu-item%) (is-a?/c control-event%)
-                            . -> . any) 
-                           (lambda (i e) (void))]
-                 [shortcut (or/c char? symbol? #f) #f]
-                 [help-string (or/c label-string? #f) #f]
-                 [demand-callback ((is-a?/c menu-item%) . -> . any) 
-                           (lambda (i) (void))]
-                 [checked any/c #f]
-                 [shortcut-prefix (and/c (listof (or/c 'alt 'cmd 'meta 'ctl 
-                                                       'shift 'option))
-                                         (λ (x) (implies (equal? 'unix (system-type))
-                                                         (not (and (member 'alt x)
-                                                                   (member 'meta x)))))
-                                         (λ (x) (equal? x (remove-duplicates x)))) 
-                                  (get-default-shortcut-prefix)])]{
-
-Creates a new menu item in @racket[parent]. The item is initially
- shown, appended to the end of its parent, and unchecked. The
- @racket[callback] procedure is called (with the event type
- @indexed-racket['menu]) when the menu item is selected (either via a
- menu bar, @xmethod[window<%> popup-menu], or @xmethod[editor-admin%
- popup-menu]).
-
-See @method[labelled-menu-item<%> set-label] for information about
-mnemonic @litchar{&}s in @racket[label].
-
-If @racket[shortcut] is not @racket[#f], the item has a shortcut. See
-@method[selectable-menu-item<%> get-shortcut] for more information.
-The @racket[shortcut-prefix] argument determines the set of modifier
-keys for the shortcut; see @method[selectable-menu-item<%>
-get-shortcut-prefix].
-
-If @racket[help] is not @racket[#f], the item has a help string. See
-@method[labelled-menu-item<%> get-help-string] for more information.
-
-The @racket[demand-callback] procedure is called by the default
-@method[labelled-menu-item<%> on-demand] method with the object itself.
-
-By default, the menu item is initially unchecked. If @racket[checked]
- is true, then @method[checkable-menu-item% check] is called so that
- the menu item is initially checked.
-
-}
-
-@defmethod[(check [check? any/c])
-           void?]{
-
-Checks or unchecks the menu item.
-
-@MonitorCallbackX[@elem{A menu item's check state} @elem{the user selecting the item} @elem{check state} @elem{menu item}]
-
-}
-
-@defmethod[(is-checked?)
-           boolean?]{
-
-Returns @racket[#t] if the item is checked, @racket[#f] otherwise.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/choice-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/choice-class.scrbl
deleted file mode 100644
index bc59eb058d..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/choice-class.scrbl
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/choice}}
-
-@defclass/title[choice% object% (list-control<%>)]{
-
-A choice item allows the user to select one string item from a pop-up
- list of items. Unlike a list box, only the currently selection is
- visible until the user pops-up the menu of choices.
-
-Whenever the selection of a choice item is changed by the user, the
- choice item's callback procedure is invoked. A callback procedure is
- provided as an initialization argument when each choice item is
- created.
-
-See also @racket[list-box%].
-
-
-@defconstructor[([label (or/c label-string? #f)]
-                 [choices (listof label-string?)]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [callback ((is-a?/c choice%) (is-a?/c control-event%) . -> . any) 
-                           (lambda (c e) (void))]
-                 [style (listof (or/c 'horizontal-label 'vertical-label
-                                      'deleted)) 
-                   null]
-                 [selection exact-nonnegative-integer? 0]
-                 [font (is-a?/c font%) normal-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 2]
-                 [horiz-margin spacing-integer? 2]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #f]
-                 [stretchable-height any/c #f])]{
-
-Creates a choice item. If @racket[label] is a string, it is used as the
- label for the choice item.
-
-@labelstripped[@racket[label]
-  @elem{} @elem{move the keyboard focus to the choice item}]
-
-The @racket[choices] list specifies the initial list of user-selectable
- items for the control. The initial set of choices determines the
- control's minimum graphical width (see @|geomdiscuss| for more
- information).
-
-The @racket[callback] procedure is called (with the event type
- @indexed-racket['choice]) when the user selects a choice item (or
- re-selects the currently selected item).
-
-@HVLabelNote[@racket[style]]{choice item}
-@DeletedStyleNote[@racket[style] @racket[parent]]{choice item}
-
-By default, the first choice (if any) is initially selected. If
- @racket[selection] is positive, it is passed to
-@method[list-control<%> set-selection] to set the initial choice selection. Although @racket[selection] normally
- must be less than the length of @racket[choices], it can be @racket[0]
- when @racket[choices] is empty.
-
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/clipboard-client-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/clipboard-client-class.scrbl
deleted file mode 100644
index cec10dff86..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/clipboard-client-class.scrbl
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[clipboard-client% object% ()]{
-
-A @racket[clipboard-client%] object allows a program to take over
- the clipboard and service requests for clipboard data. See
- @racket[clipboard<%>] for more information.
-
-A @racket[clipboard-client%] object is associated to an eventspace
- when it becomes the current client; see
-@method[clipboard<%> set-clipboard-client] for more information.
-
-
-@defconstructor[()]{
-
-Creates a clipboard client that supports no data formats.
-
-}
-
-@defmethod[(add-type [format string?])
-           void?]{
-
-Adds a new data format name to the list supported by the clipboard
- client.
-
-The @racket[format] string is typically four capital letters. (On
- Mac OS X, only four characters for @racket[format] are ever used.)
- For example, @racket["TEXT"] is the name of the UTF-8-encoded string
- format. New format names can be used to communicate application- and
- platform-specific data formats.
-
-}
-
-@defmethod[(get-data [format string?])
-           (or/c bytes? string? #f)]{
-
-Called when a process requests clipboard data while this client is the
- current one for the clipboard. The requested format is passed to the
- method, and the result should be a byte string matching the requested
- format, or @racket[#f] if the request cannot be fulfilled.
-
-Only data format names in the client's list will be passed to this
- method; see @method[clipboard-client% add-type].
-
-When this method is called by the clipboard, the current eventspace is
- the same as the client's eventspace. If, at the point of the
- clipboard request, the current eventspace is not the client's
- eventspace, then current thread is guaranteed to be the handler
- thread of the client's eventspace.
-
-}
-
-@defmethod[(get-types)
-           (listof string?)]{
-
-Returns a list of names that are the data formats supported by the
- clipboard client.
-
-}
-
-@defmethod[(on-replaced)
-           void?]{
-Called when a clipboard client is dismissed as the clipboard owner
- (because the clipboard has be taken by another client or by an
- external application).
-
-}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/clipboard-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/clipboard-intf.scrbl
deleted file mode 100644
index c2afe28627..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/clipboard-intf.scrbl
+++ /dev/null
@@ -1,132 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[clipboard<%> ()]{
-
-A single @racket[clipboard<%>] object, @indexed-racket[the-clipboard],
- manages the content of the system-wide clipboard for cut and paste.
-
-On Unix, a second @racket[clipboard<%>] object,
- @indexed-racket[the-x-selection-clipboard], manages the content of the
- system-wide X11 selection. If the @ResourceFirst{selectionAsClipboard}
- preference (see @|mrprefsdiscuss|) is set to a non-zero true value,
- however, then @racket[the-clipboard] is always the same as
- @racket[the-x-selection-clipboard], and the system-wide X11 clipboard
- is not used.
-
-On Windows and Mac OS X, @racket[the-x-selection-clipboard] is
- always the same as @racket[the-clipboard].
-
-Data can be entered into a clipboard in one of two ways: by setting
- the current clipboard string or byte string, or by installing a
- @racket[clipboard-client%] object. When a client is installed,
- requests for clipboard data are directed to the client.
-
-Generic data is always retrieved from the clipboard as a byte
- string. When retrieving clipboard data, a data type string specifies
- the format of the data string. The availability of different
- clipboard formats is determined by the current clipboard owner.
-
-
-@defmethod[(get-clipboard-bitmap [time exact-integer?])
-           (or/c (is-a?/c bitmap%) #f)]{
-
-Gets the current clipboard contents as a bitmap (Windows, Mac OS X),
- returning @racket[#f] if the clipboard does not contain a bitmap.
-
-See
-@method[clipboard<%> get-clipboard-data] for information on eventspaces and the current clipboard client.
-
-See @|timediscuss| for a discussion of the @racket[time] argument.  If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-
-@defmethod[(get-clipboard-data [format string?]
-                               [time exact-integer?])
-           (or/c bytes? string? #f)]{
-
-Gets the current clipboard contents in a specific format, returning
- @racket[#f] if the clipboard does not contain data in the requested
- format.
-
-If the clipboard client is associated to an eventspace that is not the
- current one, the data is retrieved through a callback event in the
- client's eventspace. If no result is available within one second, the
- request is abandoned and @racket[#f] is returned.
-
-See @xmethod[clipboard-client% add-type] for information on
-@racket[format].
-
-See @|timediscuss| for a discussion of the @racket[time] argument.  If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-
-@defmethod[(get-clipboard-string [time exact-integer?])
-           string?]{
-
-Gets the current clipboard contents as simple text, returning
- @racket[""] if the clipboard does not contain any text.
-
-See @method[clipboard<%> get-clipboard-data] for information on
-eventspaces and the current clipboard client.
-
-See @|timediscuss| for a discussion of the @racket[time] argument.  If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-
-
-@defmethod[(same-clipboard-client? [owner (is-a?/c clipboard-client%)])
-           boolean?]{
-
-Returns @racket[#t] if @racket[owner] currently owns the clipboard,
-@racket[#f] otherwise.}
-
-
-@defmethod[(set-clipboard-bitmap [new-bitmap (is-a?/c bitmap%)]
-                                 [time exact-integer?])
-           void?]{
-
-Changes the current clipboard contents to @racket[new-bitmap] (Windows, Mac OS X)
- and releases the current clipboard client (if any).
-
-See @|timediscuss| for
- a discussion of the @racket[time] argument.  If @racket[time] is outside
- the platform-specific range of times, @|MismatchExn|.
-
-}
-
-@defmethod[(set-clipboard-client [new-owner (is-a?/c clipboard-client%)]
-                                 [time exact-integer?])
-           void?]{
-
-Changes the clipboard-owning client: sets the client to
- @racket[new-owner] and associates @racket[new-owner] with the current
- eventspace (as determined by @racket[current-eventspace]). The
- eventspace association is removed when the client is no longer the
- current one.
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-
-@defmethod[(set-clipboard-string [new-text string?]
-                                 [time exact-integer?])
-           void?]{
-
-Changes the current clipboard contents to @racket[new-text],
- and releases the current clipboard client (if any).
-
-See @|timediscuss| for
- a discussion of the @racket[time] argument.  If @racket[time] is outside
- the platform-specific range of times, @|MismatchExn|.
-}
-}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/column-control-event-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/column-control-event-class.scrbl
deleted file mode 100644
index fd6a53676d..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/column-control-event-class.scrbl
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[column-control-event% control-event% ()]{
-
-A @racket[column-control-event%] object contains information about a
- event on an @racket[list-box%] column header.
-
-@defconstructor[([column exact-nonnegative-integer?]
-                 [event-type (or/c 'list-box-column)]
-                 [time-stamp exact-integer? 0])]{
-
-The @racket[column] argument indicates the column that was clicked.
-}
-
-@defmethod[(get-column) exact-nonnegative-integer?]{
-
-Returns the column number (counting from 0) of the clicked column.
-}
-
-@defmethod[(set-column
-            [column exact-nonnegative-integer?])
-           void?]{
-
-
-Sets the column number (counting from 0) of the clicked column.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/combo-field-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/combo-field-class.scrbl
deleted file mode 100644
index b5a4480d78..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/combo-field-class.scrbl
+++ /dev/null
@@ -1,104 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/combo-field}}
-
-@defclass/title[combo-field% text-field% ()]{
-
-A @racket[combo-field%] object is a @racket[text-field%]
- object that also resembles a @racket[choice%] object, because it
- has a small popup button to the right of the text field. Clicking 
- the button pops up a menu, and selecting a menu item typically copies
- the item into the text field.
-
-
-
-
-@defconstructor[([label (or/c label-string? #f)]
-                 [choices (listof label-string?)]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [callback ((is-a?/c combo-field%) (is-a?/c control-event%)
-                            . -> . any) 
-                           (lambda (c e) (void))]
-                 [init-value string ""]
-                 [style (listof (or/c 'horizontal-label 'vertical-label 
-                                      'deleted)) 
-                        null]
-                 [font (is-a?/c font%) normal-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 2]
-                 [horiz-margin spacing-integer? 2]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #f])]{
-
-If @racket[label] is not @racket[#f], it is used as the combo label.
- Otherwise, the combo does not display its label.
-
-@labelstripped[@racket[label]
-  @elem{} @elem{move the keyboard focus to the combo}]
-
-The @racket[choices] list specifies the initial list of items for the
- combo's popup menu. The
-@method[combo-field% append] method adds a new item to the menu with a callback to install the
- appended item into the combo's text field. The
-@method[combo-field% get-menu] method returns a menu that can be changed to
- adjust the content and actions of the combo's menu.
-
-The @racket[callback] procedure is called when the user changes the text
- in the combo or presses the Enter key (and Enter is not handled by
- the combo's frame or dialog; see
-@xmethod[top-level-window<%> on-traverse-char] ). If the user presses Enter, the type of event passed to the callback
- is @indexed-racket['text-field-enter], otherwise it is
- @indexed-racket['text-field].
-
-If @racket[init-value] is not @racket[""], the minimum width of the text item
- is made wide enough to show @racket[init-value]. Otherwise, a built-in
- default width is selected.
-
-@HVLabelNote[@racket[style]]{combo} @DeletedStyleNote[@racket[style] @racket[parent]]{combo}.
-
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-
-}
-
-
-@defmethod[(append [l label-string?])
-           void?]{
-
-Adds a new item to the combo's popup menu. The given label is used for
- the item's name, and the item's callback installs the label into the
- combo's text field.
-
-}
-
-
-@defmethod[(get-menu)
-           (is-a?/c popup-menu%)]{
-Returns a @racket[popup-menu%] that is effectively copied into the
- combo's popup menu when the combo is clicked. Only the labels and
- callbacks of the menu's items are used; the enable state, submenus,
- or separators are ignored.
-}
-
-
-@defmethod[(on-popup [event (is-a?/c control-event%)])
-           void?]{
-
-@methspec{
-
-Called when the user clicks the combo's popup button. Override this method
-to adjust the content of the combo menu on demand.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/common.rkt b/pkgs/gui-pkgs/gui-doc/scribblings/gui/common.rkt
deleted file mode 100644
index 5b2445d5c1..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/common.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-(module common racket/base
-  (require scribble/manual
-           scribble/basic
-           racket/class
-           racket/contract
-           "blurbs.rkt"
-           (only-in scribblings/reference/mz AllUnix exnraise))
-  (provide (all-from-out scribble/manual)
-           (all-from-out scribble/basic)
-           (all-from-out racket/class)
-           (all-from-out racket/contract)
-           (all-from-out "blurbs.rkt")
-           (all-from-out scribblings/reference/mz))
-
-  (require (for-label racket/gui/base
-                      racket/class
-                      racket/contract
-                      racket/base
-                      racket/list
-                      racket/bool))
-  (provide (for-label (all-from-out racket/gui/base
-                                    racket/class
-                                    racket/contract
-                                    racket/base
-                                    racket/list
-                                    racket/bool))))
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/control-event-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/control-event-class.scrbl
deleted file mode 100644
index 1f602fe4ab..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/control-event-class.scrbl
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[control-event% event% ()]{
-
-A @racket[control-event%] object contains information about a
- control event. An instance of @racket[control-event%] is always
- provided to a control or menu item callback procedure.
-
-@defconstructor[([event-type (or/c 'button 'check-box 'choice
-                                   'list-box 'list-box-dclick 'list-box-column
-                                   'text-field 'text-field-enter 
-                                   'menu 'slider 'radio-box 'tab-panel
-                                   'menu-popdown 'menu-popdown-none)]
-                [time-stamp exact-integer? 0])]{
-
-The @racket[event-type] argument is one of the following:
-@itemize[
-@item{@racket['button] --- for @racket[button%] clicks}
-@item{@racket['check-box] --- for @racket[check-box%] toggles}
-@item{@racket['choice] --- for @racket[choice%] item selections}
-@item{@racket['list-box] --- for @racket[list-box%] selections and deselections}
-@item{@racket['list-box-dclick] --- for @racket[list-box%] double-clicks}
-@item{@racket['list-box-column] --- for @racket[list-box%] column clicks in
-                                    a @racket[column-control-event%] instance}
-@item{@racket['text-field] --- for @racket[text-field%] changes}
-@item{@racket['text-field-enter] --- for single-line @racket[text-field%] Enter event}
-@item{@racket['menu] --- for @racket[selectable-menu-item<%>] callbacks}
-@item{@racket['slider] --- for @racket[slider%] changes}
-@item{@racket['radio-box] --- for @racket[radio-box%] selection changes}
-@item{@racket['tab-panel] --- for @racket[tab-panel%] tab changes}
-@item{@racket['menu-popdown] --- for @racket[popup-menu%] callbacks (item selected)}
-@item{@racket['menu-popdown-none] --- for @racket[popup-menu%] callbacks (no item selected)}
-]
-
-This value is extracted out of a @racket[control-event%] object with
- the
-@method[control-event% get-event-type] method.
-
-See @method[event% get-time-stamp] for information about
-@racket[time-stamp].
-
-}
-
-@defmethod[(get-event-type)
-           (or/c 'button 'check-box 'choice
-                 'list-box 'list-box-dclick 'text-field 
-                 'text-field-enter 'menu 'slider 'radio-box 
-                 'menu-popdown 'menu-popdown-none 'tab-panel)]{
-Returns the type of the control event. See
-@racket[control-event%] for information about each event type symbol.
-
-}
-
-@defmethod[(set-event-type
-            [type (or/c 'button 'check-box 'choice
-                        'list-box 'list-box-dclick 'text-field 
-                        'text-field-enter 'menu 'slider 'radio-box 
-                        'menu-popdown 'menu-popdown-none 'tab-panel)])
-           void?]{
-
-Sets the type of the event. See
-@racket[control-event%] for information about each event type symbol.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/control-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/control-intf.scrbl
deleted file mode 100644
index a45e48272e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/control-intf.scrbl
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[control<%> (subwindow<%>)]{
-
-The @racket[control<%>] interface is implemented by the built-in
- control window classes:
-@itemize[
-@item{@racket[message%]}
-@item{@racket[button%]}
-@item{@racket[check-box%]}
-@item{@racket[slider%]}
-@item{@racket[gauge%]}
-@item{@racket[text-field%]}
-@item{@racket[radio-box%]}
-@item{@racket[choice%]}
-@item{@racket[list-box%]}
-]
-
-
-
-@defmethod[(command [event (is-a?/c control-event%)])
-           void?]{
-
-Calls the control's callback function, passing on the given
- @racket[control-event%] object.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/cursor-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/cursor-class.scrbl
deleted file mode 100644
index fd62c65ad2..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/cursor-class.scrbl
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[cursor% object% ()]{
-
-A cursor is a small icon that indicates the location of the mouse
- pointer.  The bitmap image typically indicates the current mode or
- meaning of a mouse click at its current location.
-
-A cursor is assigned to each window (or the window may use its
- parent's cursor; see @method[window<%> set-cursor] for more
- information), and the pointer image is changed to match the window's
- cursor when the pointer is moved over the window. Each cursor object
- may be assigned to many windows.
-
-
-@defconstructor*/make[(([image (is-a?/c bitmap%)]
-                        [mask (is-a?/c bitmap%)]
-                        [hot-spot-x (integer-in 0 15) 0]
-                        [hot-spot-y (integer-in 0 15) 0])
-                       ([id (or/c 'arrow 'bullseye 'cross 'hand 'ibeam 'watch 'blank 
-                                  'size-n/s 'size-e/w 'size-ne/sw 'size-nw/se)]))]{
-
-The first case creates a cursor using an image bitmap and a mask
-bitmap. Both bitmaps must have depth 1 and size 16 by 16
-pixels. The @racket[hot-spot-x] and @racket[hot-spot-y] arguments
-determine the focus point of the cursor within the cursor image,
-relative to its top-left corner.
-
-The second case creates a cursor using a stock cursor, specified
-as one of the following:
-
-@itemize[
-
- @item{@racket['arrow] --- the default cursor}
-
- @item{@racket['bullseye] --- concentric circles}
-
- @item{@racket['cross] --- a crosshair}
-
- @item{@racket['hand] --- an open hand}
-
- @item{@racket['ibeam] --- a vertical line, indicating that clicks
-  control a text-selection caret}
-
- @item{@racket['watch] --- a watch or hourglass, indicating that
-  the user must wait for a computation to complete}
-
- @item{@racket['arrow+watch] --- the default cursor with a watch or
-  hourglass, indicating that some computation is in progress, but the
-  cursor can still be used}
-
- @item{@racket['blank] --- invisible}
-
- @item{@racket['size-e/w] --- arrows left and right}
-
- @item{@racket['size-n/s] --- arrows up and down}
-
- @item{@racket['size-ne/sw] --- arrows up-right and down-left}
-
- @item{@racket['size-nw/se] --- arrows up-left and down-right}
-
-]
-
-If the cursor is created successfully, @method[cursor% ok?]
-returns @racket[#t], otherwise the cursor object cannot be
-assigned to a window.
-
-}
-
-@defmethod[(ok?)
-           boolean?]{
-
-Returns @racket[#t] if the cursor is can be assigned to a window,
- @racket[#f] otherwise.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/diagrams.rkt b/pkgs/gui-pkgs/gui-doc/scribblings/gui/diagrams.rkt
deleted file mode 100644
index 4479eccc4c..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/diagrams.rkt
+++ /dev/null
@@ -1,179 +0,0 @@
-(module diagrams scheme/base
-  (require scribble/struct
-           scribble/scheme
-           scribble/manual
-           (for-label scheme/gui/base))
-
-  (provide diagram->table
-           short-windowing-diagram
-           windowing-diagram
-           event-diagram
-           menu-diagram
-           editor-diagram
-           snip-diagram
-           editor-snip-diagram
-           style-diagram
-           snip-list-diagram
-           editor-admin-diagram
-           stream-diagram)
-
-  (define (diagram->table d)
-    (make-table
-     #f
-     (map (lambda (line)
-            (list (make-flow 
-                   (list (make-paragraph 
-                          (let loop ([line line])
-                            (cond
-                             [(regexp-match #rx"(.*)( +)(.*)" line)
-                              => (lambda (m)
-                                   (append (loop (cadr m))
-                                           (list (hspace (string-length (caddr m))))
-                                           (loop (cadddr m))))]
-                             [(regexp-match #rx"([^-a-zA-Z0-9]*)([-a-zA-Z0-9<%>]+)(.*)" line)
-                              => (lambda (m)
-                                   (append (loop (cadr m))
-                                           (list (to-element (make-just-context (string->symbol (caddr m))
-                                                                                #'here)))
-                                           (loop (cadddr m))))]
-                             [else (list (make-element 'tt (list line)))])))))))
-          (regexp-split #rx"[\r\n]+" d))))
-
-  (define short-windowing-diagram
-#<<DIAG
-                           area<%>
-       ______________________|_______________
-       |                  |                 |
-  subarea<%>          window<%>      area-container<%>      
-       |____       _______|__________       |
-            |      |                |       |
-           subwindow<%>          area-container-window<%>
-        ________|________                |
-        |               |                |
-     control<%>       canvas<%>   top-level-window<%>
-DIAG
-)
-
-  (define windowing-diagram
-#<<DIAG
-                           area<%>
-        _____________________|_______________
-        |               |                   |
-      subarea<%>     window<%>       area-container<%>      
-<<<____|____       _____|__________       __|___  ___________________<<<
-            |      |              |       |    |  |                  
-           subwindow<%>           |       |    |  |                  
-<<<______________|___________     |       |    |  |                 _<<<
-            |               |     |       |    pane%                |
-       control<%>           |     |       |     |- horizontal-pane% |
-        |- message%         |     |       |     |- vertical-pane%   |
-        |- button%          |     |       |                         |
-        |- check-box%       |  area-container-window<%>             |
-        |- slider%          |        |                              |
-        |- gauge%           |        |            __________________|
-        |- text-field%      |        |            |   
-            |- combo-field% |        |-------- panel%       
-        |- radio-box%       |        |          |- horizontal-panel%
-        |- list-control<%>  |        |          |- vertical-panel%
-            |- choice%      |        |              |- tab-panel%
-            |- list-box%    |        |              |- group-box-panel%
-                            |        |
-                            |        |- top-level-window<%>
-                            |            |- frame% 
-                         canvas<%>       |- dialog%
-                          |- canvas%
-                          |- editor-canvas%
-DIAG
-)
-
- 
-  (define event-diagram
-#<<DIAG
-       event%                                 timer%
-        |- key-event%                         cursor%
-        |- mouse-event%                    
-        |- scroll-event%                      clipboard<%>
-        |- control-event%                     clipboard-client%
-DIAG
-)
-
-  (define menu-diagram
-#<<DIAG
-    menu-item<%>                menu-item-container<%> 
-        |                              | 
-        |- separator-menu-item%   _____|___ 
-        |- labelled-menu-item<%>  |       |- menu-bar% 
-            _________|_________   |       |- popup-menu% 
-            |                 |   | 
-            |                 menu%
-            |                          
-            |- selectable-menu-item<%>               
-                |- menu-item%                        
-                |- checkable-menu-item%
-DIAG
-)
-
-  (define editor-diagram
-#<<DIAG
-  editor<%>
-   |- text%                   
-   |- pasteboard%
-DIAG
-)
-
-  (define snip-diagram
-#<<DIAG
-  snip%                   readable-snip<%>
-   |- string-snip%
-   |   |- tab-snip%
-   |- image-snip%
-   |- editor-snip% (not provided by racket/snip)
-
-  snip-admin%
-DIAG
-)
-
-  (define editor-snip-diagram
-#<<DIAG
-  snip%
-   |- editor-snip%
-DIAG
-)
-
- 
-  (define editor-admin-diagram
-#<<DIAG
-  editor-canvas%
- 
-  editor-admin%                     snip-admin%
-   |- editor-snip-editor-admin<%>
- 
-  editor-wordbreak-map%    keymap%
-DIAG
-)
- 
-  (define style-diagram
-#<<DIAG
-  style<%>         style-delta%       add-color<%>
-  style-list%                         mult-color<%>
-DIAG
-)
-
-  (define snip-list-diagram
-#<<DIAG
-  snip-class%
-  snip-class-list<%>
-DIAG
-)
-
-  (define stream-diagram
-#<<DIAG
- editor-data%
- editor-data-class%
- editor-data-class-list<%>
- 
- editor-stream-in%                 editor-stream-out%
- editor-stream-in-base%            editor-stream-out-base%
-  |- editor-stream-in-bytes-base%   |- editor-stream-out-bytes-base%
-DIAG
-))
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/dialog-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/dialog-class.scrbl
deleted file mode 100644
index 57226098f2..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/dialog-class.scrbl
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[dialog% object% (top-level-window<%>)]{
-
-A dialog is a top-level window that is @defterm{modal}: while the
- dialog is shown, key and mouse press/release events are disabled for
- all other top-level windows in the dialog's eventspace.
-
-@defconstructor[([label label-string?]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                 [width (or/c dimension-integer? #f) #f]
-                 [height (or/c dimension-integer? #f) #f]
-                 [x (or/c dimension-integer? #f) #f]
-                 [y (or/c dimension-integer? #f) #f]
-                 [style (listof (or/c 'no-caption 'resize-border 
-                                      'no-sheet 'close-button)) 
-                        null]
-                 [enabled any/c #t]
-                 [border spacing-integer? 0]
-                 [spacing spacing-integer? 0]
-                 [alignment (list/c (or/c 'left 'center 'right)
-                                    (or/c 'top 'center 'bottom))
-                            '(center top)]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-The @racket[label] string is used as the dialog's title in its
-title bar.  If the dialog's label is changed (see
-@method[window<%> set-label]), the title bar is updated.
-
-The @racket[parent] argument can be @racket[#f] or an existing
- frame. On Windows, if @racket[parent] is an existing frame, the
- new dialog is always on top of its parent. On Windows and Unix, a
- dialog is iconized when its parent is iconized.
-
-If @racket[parent] is @racket[#f], then the eventspace for the new
- dialog is the current eventspace, as determined by
- @racket[current-eventspace]. Otherwise, @racket[parent]'s eventspace
- is the new dialog's eventspace.
-
-If the @racket[width] or @racket[height] argument is not @racket[#f],
- it specifies an initial size for the dialog (in pixels) assuming that
- it is larger than the minimum size, otherwise the minimum size is
- used. On Windows and Mac OS X (and with some Unix window managers)
- dialogs are not resizeable.
-
-If the @racket[x] or @racket[y] argument is not @racket[#f], it
- specifies an initial location for the dialog. Otherwise, if no
- location is set before the dialog is shown, it is centered (with
- respect @racket[parent] if not @racket[#f], the screen otherwise).
-
-The @racket[style] flags adjust the appearance of the dialog on some
- platforms:
-
-@itemize[
-
- @item{@racket['no-caption] --- omits the title bar for the dialog
- (Windows)}
-
- @item{@racket['resize-border] --- adds a resizeable border around the
-  window (Windows), ability to resize the window (Mac OS X), or grow
-  box in the bottom right corner (older Mac OS X)}
-
- @item{@racket['no-sheet] --- uses a movable window for the dialog,
- even if a parent window is provided (Mac OS X)}
-
- @item{@racket['close-button] --- include a close button in the 
- dialog's title bar, which would not normally be included (Mac OS X)}
-
-]
-
-Even if the dialog is not shown, a few notification events may be
- queued for the dialog on creation. Consequently, the new dialog's
- resources (e.g., memory) cannot be reclaimed until some events are
- handled, or the dialog's eventspace is shut down.
-
-@WindowKWs[@racket[enabled]] @AreaContKWs[] @AreaKWs[]
-}
-
-@defmethod[#:mode override 
-           (on-subwindow-char [receiver (is-a?/c window<%>)]
-                              [event (is-a?/c key-event%)])
-           boolean?]{
-
-Returns the result of
-
-@racketblock[
-(or (send this #,(:: top-level-window<%> on-system-menu-char) event)
-    (send this #,(:: top-level-window<%> on-traverse-char) event))
-]
-
-}
-
-@defmethod[#:mode override
-           (show [show? any/c])
-           void?]{
-
-If @racket[show?] is true, the dialog is shown and all frames (and other
- dialogs) in the eventspace become disabled until the dialog is
- closed.  If @racket[show?] is false, the dialog is hidden and other
- frames and dialogs are re-enabled (unless a different, pre-existing
- dialog is still shown).
-
-If @racket[show?] is true, the method does not immediately return. Instead,
- it loops with @racket[yield] until the dialog is found to be hidden
- between calls to @racket[yield]. An internal semaphore is used with
- @racket[yield] to avoid a busy-wait, and to ensure that the @racket[show]
-  method returns as soon as possible after the dialog is hidden.
-
-}
-
-@defmethod[(show-without-yield)
-           void?]{
-
-Like @racket[(send @#,this-obj[] @#,method[dialog% show] #t)], but returns
-immediately instead of @racket[yield]ing.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/dialog-funcs.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/dialog-funcs.scrbl
deleted file mode 100644
index 8ef81243d9..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/dialog-funcs.scrbl
+++ /dev/null
@@ -1,549 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label mrlib/path-dialog))
-
-@title{Dialogs}
-
-
-These functions get input from the user and/or display
- messages.
-
-
-
-@defproc[(get-file [message (or/c label-string? #f) #f]
-                   [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                   [directory (or/c path-string? #f) #f]
-                   [filename (or/c path-string? #f) #f]
-                   [extension (or/c string? #f) #f]
-                   [style (listof (or/c 'packages 'enter-packages 'common)) null]
-                   [filters (listof (list/c string? string?)) '(("Any" "*.*"))]
-                   [#:dialog-mixin dialog-mixin (make-mixin-contract path-dialog%) (λ (x) x)])
-         (or/c path? #f)]{
-
-Obtains a file pathname from the user via the platform-specific
- standard (modal) dialog, using @racket[parent] as the parent window if
- it is specified, and using @racket[message] as a message at the top of
- the dialog if it is not @racket[#f].
-
-The result is @racket[#f] if the user cancels the dialog, the selected
- pathname otherwise. The returned pathname may or may not exist,
- although the style of the dialog is directed towards selecting
- existing files.
-
-If @racket[directory] is not @racket[#f], it is used as the starting
- directory for the file selector (otherwise the starting directory is
- chosen automatically in a platform-specific manner, usually based on
- the current directory and the user's interactions in previous calls
- to @racket[get-file], @racket[put-file], etc.). If
- @racket[filename] is not @racket[#f], it is used as the default filename
- when appropriate, and it should @italic{not} contain a directory path
- prefix.
-
-Under Windows, if @racket[extension] is not @racket[#f], the returned path
- will use the extension if the user does not supply one; the
- @racket[extension] string should not contain a period. The extension is
- ignored on other platforms.
-
-The @racket[style] list can contain @racket['common], a
- platform-independent version of the dialog is used instead of a
- native dialog.  On Mac OS X, if the @racket[style] list
- contains @racket['packages], a user is allowed to select a package
- directory, which is a directory with a special suffix (e.g.,
- ``.app'') that the Finder normally displays like a file.  If the list
- contains @racket['enter-packages], a user is allowed to select a file
- within a package directory. If the list contains both
- @racket['packages] and @racket['enter-packages], the former is ignored.
-
-On Windows and Unix, @racket[filters] determines a set of filters from
- which the user can choose in the dialog. Each element of the
- @racket[filters] list contains two strings: a description of the filter
- as seen by the user, and a filter pattern matched against file names.
- Pattern strings can be a simple ``glob'' pattern, or a number of glob
- patterns separated by a @litchar[";"] character.
- On Unix, a @racket["*.*"] pattern is implicitly replaced with @racket["*"].
- On Mac OS X, suffix names are extracted from all globs that match a
- fixed suffix (e.g., two suffixes of @racket["foo"] and @racket["bar"]
- are extracted from a @racket["*.foo;*.bar;*.baz*"] pattern), and files
- that have any of these suffixes in any filter are selectable; a
- @racket["*.*"] glob makes all files available for selection.
-
-The @racket[dialog-mixin] is applied to @racket[path-dialog%] before
-creating an instance of the class for this dialog.
-
-See also @racket[path-dialog%] for a richer interface.
-
-}
-
-@defproc[(get-file-list [message (or/c label-string? #f) #f]
-                        [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                        [directory (or/c path-string? #f) #f]
-                        [filename (or/c path-string? #f) #f]
-                        [extension (or/c string? #f) #f]
-                        [style (listof (or/c 'packages 'enter-packages 'common)) null]
-                        [filters (listof (list/c string? string?)) '(("Any" "*.*"))]
-                        [#:dialog-mixin dialog-mixin (make-mixin-contract path-dialog%) (λ (x) x)])
-         (or/c (listof path?) #f)]{
-Like
-@racket[get-file], except that the user can select multiple files, and the
- result is either a list of file paths of @racket[#f].
-
-}
-
-@defproc[(put-file [message (or/c label-string? #f) #f]
-                   [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                   [directory (or/c path-string? #f) #f]
-                   [filename (or/c path-string? #f) #f]
-                   [extension (or/c string? #f) #f]
-                   [style (listof (or/c 'packages 'enter-packages 'common)) null]
-                   [filters (listof (list/c string? string?)) '(("Any" "*.*"))]
-                   [#:dialog-mixin dialog-mixin (make-mixin-contract path-dialog%) (λ (x) x)])
-         (or/c path? #f)]{
-
-Obtains a file pathname from the user via the platform-specific
- standard (modal) dialog, using @racket[parent] as the parent window if
- it is specified, and using @racket[message] as a message at the top of
- the dialog if it is not @racket[#f].
-
-The result is @racket[#f] if the user cancels the dialog, the selected
- pathname otherwise. The returned pathname may or may not exist,
- although the style of the dialog is directed towards creating a new
- file.
-
-If @racket[directory] is not @racket[#f], it is used as the starting
- directory for the file selector (otherwise the starting directory is
- chosen automatically in a platform-specific manner, usually based on
- the current directory and the user's interactions in previous calls
- to @racket[get-file], @racket[put-file], etc.). If
- @racket[filename] is not @racket[#f], it is used as the default filename
- when appropriate, and it should @italic{not} contain a directory path
- prefix.
-
-On Windows, if @racket[extension] is not @racket[#f], the returned path
- will get a default extension if the user does not supply one. If
- @racket[extension] is the empty string, then the extension is derived
- from the user's @racket[filters] choice if the corresponding pattern is
- of the form @racket[(string-append "*." extension)]; if the pattern is
- @racket["*.*"], then no default extension is added. Finally, if
- @racket[extension] is any string other than the empty string,
- @racket[extension] is used as the default extension when the user's
- @racket[filters] choice has the pattern @racket["*.*"].  Meanwhile, the
- @racket[filters] argument has the same format and auxiliary role as for
- @racket[get-file]. In particular, if the only pattern in @racket[filters]
- is @racket[(string-append "*." extension)], then the result pathname is guaranteed
- to have an extension mapping @racket[extension].
-
-On Mac OS X 10.5 and later, if @racket[extension] is not
- @racket[#f] or @racket[""], the returned path will get a default extension if the
- user does not supply one.  If @racket[filters] contains as
- @racket["*.*"] pattern, then the user can supply any extension that
- is recognized by the system; otherwise, the extension on the returned
- path will be either @racket[extension] or @racket[_other-extension]
- for any @racket[(string-append "*."  _other-extension)] pattern in
- @racket[filters]. In particular, if the only pattern in
- @racket[filters] is empty or contains only @racket[(string-append
- "*." extension)], then the result pathname is guaranteed to have an
- extension mapping @racket[extension].
-
-On Mac OS X versions before 10.5, the returned path will get a
- default extension only if @racket[extension] is not @racket[#f], 
- @racket[extension] is not @racket[""], and
- @racket[filters] contains only @racket[(string-append "*."
- extension)].
-
-On Unix, @racket[extension] is ignored, and @racket[filters] is used
- to filter the visible list of files as in @racket[get-file].
-
-The @racket[style] list is treated as for @racket[get-file].
-
-The @racket[dialog-mixin] is applied to @racket[path-dialog%] before
-creating an instance of the class for this dialog.
-
-See also @racket[path-dialog%] for a richer interface.
-}
-
-@defproc[(get-directory [message (or/c label-string? #f) #f]
-                        [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                        [directory (or/c path-string? #f) #f]
-                        [style (listof (or/c 'enter-packages 'common)) null]
-                        [#:dialog-mixin dialog-mixin (make-mixin-contract path-dialog%) (λ (x) x)])
-         (or/c path #f)]{
-
-Obtains a directory pathname from the user via the platform-specific
- standard (modal) dialog, using @racket[parent] as the parent window if
- it is specified.
-
-If @racket[directory] is not @racket[#f], it is used on some platforms as
- the starting directory for the directory selector (otherwise the
- starting directory is chosen automatically in a platform-specific
- manner, usually based on the current directory and the user's
- interactions in previous calls to @racket[get-file],
- @racket[put-file], etc.).
-
-The @racket[style] argument is treated as for
-@racket[get-file], except that only @racket['common] or @racket['enter-packages] can be
-specified.  The latter
- matters only on Mac OS X, where @racket['enter-packages]
- enables the user to select package directory or a directory within a
- package. A package is a directory with a special suffix (e.g.,
- ``.app'') that the Finder normally displays like a file.
-
-The @racket[dialog-mixin] is applied to @racket[path-dialog%] before
-creating an instance of the class for this dialog.
-
-See also @racket[path-dialog%] for a richer interface.
-
-}
-
-@defproc[(message-box [title label-string?]
-                      [message string?]
-                      [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                      [style (listof (or/c 'ok 'ok-cancel 'yes-no 
-                                           'caution 'stop 'no-icon))
-                             '(ok)]
-                      [#:dialog-mixin dialog-mixin (make-mixin-contract dialog%) values])
-         (or/c 'ok 'cancel 'yes 'no)]{
-
-See also @racket[message-box/custom].
-
-Displays a message to the user in a (modal) dialog, using
- @racket[parent] as the parent window if it is specified. The dialog's
- title is @racket[title]. The @racket[message] string can be arbitrarily
- long, and can contain explicit linefeeds or carriage returns for
- breaking lines.
-
-The style must include exactly one of the following:
-@itemize[
-
- @item{@racket['ok] --- the dialog only has an @onscreen{OK} button
- and always returns @racket['ok].}
-
- @item{@racket['ok-cancel] --- the message dialog has
- @onscreen{Cancel} and @onscreen{OK} buttons. If the user clicks
- @onscreen{Cancel}, the result is @racket['cancel], otherwise the
- result is @racket['ok].}
-
- @item{@racket['yes-no] --- the message dialog has @onscreen{Yes} and
- @onscreen{No} buttons. If the user clicks @onscreen{Yes}, the result
- is @racket['yes], otherwise the result is @racket['no]. Note: instead
- of a @onscreen{Yes}/@onscreen{No} dialog, best-practice GUI design is
- to use @racket[message-box/custom] and give the buttons meaningful
- labels, so that the user does not have to read the message text
- carefully to make a selection.}
-
-]
-
-In addition, @racket[style] can contain @racket['caution] to make the
- dialog use a caution icon instead of the application (or generic
- ``info'') icon, @racket['stop] to make the dialog use a stop icon, or
- @racket['no-icon] to suppress the icon. If @racket[style] contains
- multiple of @racket['caution], @racket['stop], and @racket['no-icon],
- then @racket['no-icon] takes precedence followed by @racket['stop].
-
-The class that implements the dialog provides a @racket[get-message]
- method that takes no arguments and returns the text of the message as
- a string. (The dialog is accessible through the
- @racket[get-top-level-windows] function.)
-
-The @racket[message-box] function can be called in a thread other
- than the handler thread of the relevant eventspace (i.e., the eventspace of
- @racket[parent], or the current eventspace if @racket[parent] is @racket[#f]), in which case the
- current thread blocks while the dialog runs on the handler thread.
- 
-The @racket[dialog-mixin] argument is applied to the class that implements the dialog
-before the dialog is created. 
-}
-
-@defproc[(message-box/custom [title label-string?]
-                             [message string?]
-                             [button1-label (or/c label-string? (is-a?/c bitmap%) #f)]
-                             [button2-label (or/c label-string? (is-a?/c bitmap%) #f)]
-                             [button3-label (or/c label-string? (is-a?/c bitmap%) #f)]
-                             [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                             [style (listof (or/c 'stop 'caution 'no-icon 'number-order 
-                                                  'disallow-close 'no-default 
-                                                  'default=1 'default=2 'default=3))
-                                   '(no-default)]
-                             [close-result any/c #f]
-                             [#:dialog-mixin dialog-mixin (make-mixin-contract dialog%) values])
-         (or/c 1 2 3 close-result)]{
-
-Displays a message to the user in a (modal) dialog, using
- @racket[parent] as the parent window if it is specified. The dialog's
- title is @racket[title]. The @racket[message] string can be arbitrarily
- long, and can contain explicit linefeeds or carriage returns for
- breaking lines.
-
-The dialog contains up to three buttons for the user to click. The
- buttons have the labels @racket[button1-label],
- @racket[button2-label], and @racket[button3-label], where @racket[#f] for a
- label indicates that the button should be hidden.
-
-If the user clicks the button labelled @racket[button1-label], a @racket[1]
- is returned, and so on for @racket[2] and @racket[3]. If the user closes
- the dialog some other way---which is only allowed when @racket[style]
- does not contain @racket['disallow-close]---then the result is the
- value of @racket[close-result]. For example, the user can usually close
- a dialog by typing an Escape. Often, @racket[2] is an appropriate value
- for @racket[close-result], especially when Button 2 is a @onscreen{Cancel}
- button.
-
-If @racket[style] does not include @racket['number-order], the order of
- the buttons is platform-specific, and labels should be assigned to
- the buttons based on their role:
-@itemize[
-
- @item{Button 1 is the normal action, and it is usually the default
- button. For example, if the dialog has an @onscreen{OK} button, it is
- this one. On Windows, this button is leftmost; on Unix and Mac OS
- X, it is rightmost. (See also
- @racket[system-position-ok-before-cancel?].) Use this button for
- dialogs that contain only one button.}
-
- @item{Button 2 is next to Button 1, and it often plays the role of
- @onscreen{Cancel} (even when the default action is to cancel, such as
- when confirming a file replacement).}
-
- @item{Button 3 tends to be separated from the other two (on
- Mac OS X, it is left-aligned in the dialog). Use this button only
- for three-button dialogs.}
-
-]
-Despite the above guidelines, any combination of visible buttons is
- allowed in the dialog.
-
-If @racket[style] includes @racket['number-order], then the buttons are
- displayed in the dialog left-to-right with equal spacing between all
- buttons, though aligned within the dialog (centered or right-aligned)
- in a platform-specific manner. Use @racket['number-order] sparingly.
-
-The @racket[style] list must contain exactly one of @racket['default=1],
- @racket['default=2], @racket['default=3], and @racket['no-default] to
- determine which button (if any) is the default. The default button is
- ``clicked'' when the user types Return. If @racket['default=]@racket[n]
- is supplied but button @racket[n] has no label, then it is equivalent to
- @racket['no-default].
-
-In addition, @racket[style] can contain @racket['caution],
- @racket['stop], or @racket['no-icon] to adjust the icon that appears
- n the dialog, the same for @racket[message-box].
-
-The class that implements the dialog provides a @racket[get-message]
- method that takes no arguments and returns the text of the message as
- a string. (The dialog is accessible through the
-@racket[get-top-level-windows] function.)
-
-The @racket[message-box/custom] function can be called in a thread
- other than the handler thread of the relevant eventspace (i.e., the eventspace of
- @racket[parent], or the current eventspace if @racket[parent] is @racket[#f]), in which case the
- current thread blocks while the dialog runs on the handler thread.
- 
-The @racket[dialog-mixin] argument is applied to the class that implements the dialog
-before the dialog is created. 
-}
-
-@defproc[(message+check-box [title label-string?]
-                            [message string?]
-                            [check-label label-string?]
-                            [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                            [style (listof (or/c 'ok 'ok-cancel 'yes-no 
-                                                 'caution 'stop 'no-icon 'checked))
-                              '(ok)]
-                            [#:dialog-mixin dialog-mixin (make-mixin-contract dialog%) values])
-         (values (or/c 'ok 'cancel 'yes 'no) boolean?)]{
-
-See also @racket[message+check-box/custom].
-
-Like @racket[message-box], except that
-
-@itemize[
- @item{the dialog contains a check box whose label is @racket[check-label];}
- @item{the result is two values: the @racket[message-box] result, and a
-       boolean indicating whether the box was checked; and}
- @item{@racket[style] can contain @racket['checked] to indicate that the check box
-       should be initially checked.}
-]}
-
-@defproc[(message+check-box/custom [title label-string?]
-                                   [message string?]
-                                   [check-label label-string?]
-                                   [button1-label (or/c label-string? (is-a?/c bitmap%) #f)]
-                                   [button2-label (or/c label-string? (is-a?/c bitmap%) #f)]
-                                   [button3-label (or/c label-string? (is-a?/c bitmap%) #f)]
-                                   [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                                   [style (listof (or/c 'stop 'caution 'no-icon 'number-order 
-                                                        'disallow-close 'no-default 
-                                                        'default=1 'default=2 'default=3))
-                                          '(no-default)]
-                                   [close-result any/c #f]
-                                   [#:dialog-mixin dialog-mixin (make-mixin-contract dialog%) values])
-         (or/c 1 2 3 (λ (x) (eq? x close-result)))]{
-
-Like @racket[message-box/custom], except that
-@itemize[
- @item{the dialog contains a check box whose label is @racket[check-label];}
- @item{the result is two values: the @racket[message-box] result, and a
-       boolean indicating whether the box was checked; and}
- @item{@racket[style] can contain @racket['checked] to indicate that the check box
-       should be initially checked.}
-]
-}
-
-@defproc[(get-text-from-user [title label-string?]
-                             [message (or/c label-string? #f)]
-                             [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                             [init-val string? ""]
-                             [style (listof (or/c 'password 'disallow-invalid)) null]
-                             [#:validate validate (-> string? boolean?)]
-                             [#:dialog-mixin dialog-mixin (make-mixin-contract dialog%) values]) 
-         (or/c string? #f)]{
-
-Gets a text string from the user via a modal dialog, using
- @racket[parent] as the parent window, if it is specified. The dialog's
- title is @racket[title]. The dialog's text field is labelled with
- @racket[message] and initialized to @racket[init-val] (but @racket[init-val]
- does not determine the size of the dialog).
-
-The result is @racket[#f] if the user cancels the dialog, the
- user-provided string otherwise.
-
-If @racket[style] includes @racket['password], the dialog's text field
- draws each character of its content using a generic symbol, instead
- of the actual character.
-
-The @racket[validate] function is called each time the text field changed,
-with the contents of the text field. If it returns @racket[#f], the background
-of the text is colored pink. If @racket['disallow-invalid] is included in
-@racket[style], the @onscreen{Ok} button is disabled whenever the text
-background is pink.
- 
-The @racket[dialog-mixin] argument is applied to the class that implements the dialog
-before the dialog is created. 
-}
-
-@defproc[(get-choices-from-user [title label-string?]
-                                [message (or/c label-string? #f)]
-                                [choices (listof label-string?)]
-                                [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                                [init-choices (listof exact-nonnegative-integer?) null]
-                                [style (listof (or/c 'single 'multiple 'extended)) '(single)])
-         (or/c (listof exact-nonnegative-integer?) #f)]{
-
-Gets a list box selection from the user via a modal dialog, using
- @racket[parent] as the parent window if it is specified. The dialog's
- title is @racket[title]. The dialog's list box is labelled with
- @racket[message] and initialized by selecting the items in
- @racket[init-choices]. 
-
-The style must contain exactly one of @indexed-racket['single],
- @indexed-racket['multiple], or @indexed-racket['extended]. The styles have
- the same meaning as for creating a @racket[list-box%] object. (For
- the single-selection style, only the last selection in
- @racket[init-choices] matters.)
-
-The result is @racket[#f] if the user cancels the dialog, the
- list of selections otherwise.
-
-
-
-}
-
-@defproc[(get-color-from-user [message (or/c label-string? #f) #f]
-                              [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                              [init-color (or/c (is-a?/c color%) #f) #f]
-                              [style (listof 'alpha) null])
-         (or/c (is-a?/c color%) #f)]{
-
-Lets the user select a color though the platform-specific
- (modal) dialog, using @racket[parent] as the parent window if it is
- specified. The @racket[message] string is displayed as a prompt in the
- dialog if possible. If @racket[init-color] is provided, the dialog is
- initialized to the given color.
-
-The result is @racket[#f] if the user cancels the dialog, the selected
- color otherwise.
-
-If @racket[style] contains @racket['alpha], then the user is present with
-a field for filling in the alpha field of the resulting @racket[color%] object.
-If it does not, then the alpha component of @racket[init-color] is ignored,
-and the result always has alpha of @racket[1.0].
-}
-
-@defproc[(get-font-from-user [message (or/c label-string? #f) #f]
-                             [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                             [init-font (or/c (is-a?/c font%) #f) #f]
-                             [style null? null])
-         (or/c (is-a?/c font%) #f)]{
-
-Lets the user select a font though the platform-specific
- (modal) dialog, using @racket[parent] as the parent window if it is
- specified. The @racket[message] string is displayed as a prompt in the
- dialog if possible. If @racket[init-font] is provided, the dialog is
- initialized to the given font.
-
-@italicptyStyleNote[@racket[style]]
-
-The result is @racket[#f] if the user cancels the dialog, the selected
- font otherwise.
-
-
-
-}
-
-@defproc[(get-ps-setup-from-user [message (or/c label-string? #f) #f]
-                                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                                 [init-setup (or/c (is-a?/c ps-setup%) #f) #f]
-                                 [style null? null])
-         (or/c (is-a?/c ps-setup%) #f)]{
-
-Lets the user select a PostScript configuration though a (modal)
- dialog, using @racket[parent] as the parent window if it is
- specified. The @racket[message] string is displayed as a prompt in the
- dialog. If @racket[init-setup] is provided, the dialog is initialized to
- the given configuration, otherwise the current configuration from
-@racket[current-ps-setup]  is used.
-
-@italicptyStyleNote[@racket[style]]
-
-The result is @racket[#f] if the user cancels the dialog, , a
- @racket[ps-setup%] object that encapsulates the selected PostScript
- configuration otherwise.
-
-
-
-}
-
-@defproc[(get-page-setup-from-user [message (or/c label-string? #f) #f]
-                                   [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f]
-                                   [init-setup (or/c (is-a?/c ps-setup%) #f) #f]
-                                   [style null? null])
-         (or/c (is-a?/c ps-setup%) #f)]{
-
-Like
-@racket[get-ps-setup-from-user], but the dialog configures page layout for native printing
- with @racket[printer-dc%]. A dialog is shown only if
-@racket[can-get-page-setup-from-user?] returns @racket[#t], otherwise no dialog is shown and the result
- is @racket[#f].
-
-The @racket[parent] argument is used as the parent window for a dialog if
- it is specified. The @racket[message] string might be displayed as a
- prompt in the dialog. If @racket[init-setup] is provided, the dialog is
- initialized to the given configuration, otherwise the current
- configuration from
-@racket[current-ps-setup]  is used.
-
-@italicptyStyleNote[@racket[style]]
-
-The result is @racket[#f] if the user cancels the dialog, a
- @racket[ps-setup%] object that encapsulates the selected
- configuration otherwise.
-
-
-
-}
-
-@defproc[(can-get-page-setup-from-user?)
-         boolean?]{
-Returns @racket[#t] if the current platform supports a
- page-layout dialog for use with @racket[printer-dc%] printing. 
- Currently, all platforms support a page-layout dialog.
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/dynamic.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/dynamic.scrbl
deleted file mode 100644
index 95697dc949..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/dynamic.scrbl
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label racket/gui/dynamic))
-
-@title{Dynamic Loading}
-
-@defmodule[racket/gui/dynamic]{The @racketmodname[racket/gui/dynamic]
-library provides functions for dynamically accessing the
-@racketmodname[racket/gui/base] library, instead of directly requiring
-@racketmodname[racket/gui] or @racketmodname[racket/gui/base].}
-
-@defproc[(gui-available?) boolean?]{
-
-Returns @racket[#t] if dynamic access to the GUI bindings is
-available. The bindings are available if
-@racketmodname[racket/gui/base] has been loaded, instantiated, and
-attached to the namespace in which @racket[racket/gui/dynamic] was
-instantiated.}
-
-
-@defproc[(gui-dynamic-require [sym symbol?]) any]{
-
-Like @racket[dynamic-require], but specifically to access exports of
-@racketmodname[racket/gui/base].}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-admin-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-admin-class.scrbl
deleted file mode 100644
index 2b671f1158..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-admin-class.scrbl
+++ /dev/null
@@ -1,302 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[editor-admin% object% ()]{
-
-See @|admindiscuss| for information about the role of administrators.
- The @racket[editor-admin%] class is never instantiated directly. It
- is not even instantiated through derived classes by most programmers;
- each @racket[editor-canvas%] and @racket[editor-snip%] object
- creates its own administrator. However, it may be useful to derive a
- new instance of this class to display editors in a new context. Also,
- it may be useful to call the methods of an existing administrator
- from an owned editor.
-
-To create a new @racket[editor-admin%] class, all methods described
- here must be overridden. They are all invoked by the administrator's
- editor.
-
-@defconstructor[()]{
-
-Creates a (useless) editor administrator.
-
-
-}
-
-@defmethod[(get-dc [x (or/c (box/c real?) #f) #f]
-                   [y (or/c (box/c real?) #f) #f])
-           (or/c (is-a?/c dc<%>) #f)]{
-@methspec{
-
-Returns either the drawing context into which the editor is displayed,
- or the context into which it is currently being drawn. When the
- editor is not embedded, the returned context is always the drawing
- content into which the editor is displayed. If the editor is not
- displayed, @racket[#f] is returned.
-
-The origin of the drawing context is also returned, translated into
- the local coordinates of the editor. For an embedded editor, the
- returned origin is reliable only while the editor is being drawn, or
- while it receives a mouse or keyboard event.
-
-@boxisfillnull[@racket[x] @elem{the x-origin of the DC in editor coordinates}]
-@boxisfillnull[@racket[y] @elem{the y-origin of the DC in editor coordinates}]
-
-See also @xmethod[editor<%> editor-location-to-dc-location] and
- @xmethod[editor<%> dc-location-to-editor-location].
-
-}
-@methimpl{
-
-Fills all boxes with @racket[0.0] and returns @racket[#f].
-
-}}
-
-@defmethod[(get-max-view [x (or/c (box/c real?) #f)]
-                         [y (or/c (box/c real?) #f)]
-                         [w (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                         [h (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                         [full? any/c #f])
-           void?]{
-@methspec{
-
-Same as @method[editor-admin% get-view] unless the editor is visible
- in multiple standard @techlink{display}s. If the editor has multiple
- @techlink{display}s, a region is computed that includes the visible
- region in all @techlink{display}s.
-
-See @method[editor-admin% get-view].
-
-}
-@methimpl{
-
-Fills all boxes with @racket[0.0].
-
-}}
-
-
-@defmethod[(get-view [x (or/c (box/c real?) #f)]
-                     [y (or/c (box/c real?) #f)]
-                     [w (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                     [h (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                     [full? any/c #f])
-           void?]{
-@methspec{
-
-Gets the visible region of the editor within its @techlink{display} (in
- editor coordinates), or the overall size of the viewing region in the
- editor's top-level @techlink{display} (for an embedded editor).
-
-If the @techlink{display} is an editor canvas, see also
- @method[area-container<%> reflow-container]. The viewing area within
- an editor canvas is not the full client area of the canvas, because
- an editor canvas installs a whitespace border around a displayed
- editor within the client area.
-
-The calculation of the editor's visible region is based on the current
- size and scrollbar values of the top-level @techlink{display}. For an
- editor canvas @techlink{display}, the region reported by
- @method[editor-admin% get-view] does not depend on whether the canvas
- is hidden, obscured by other windows, or moved off the edge of the
- screen.
-
-@boxisfillnull[@racket[x] @elem{the left edge of the visible region in editor coordinates}]
-@boxisfillnull[@racket[y] @elem{the top edge of the visible region in editor coordinates}]
-@boxisfillnull[@racket[w] @elem{the width of the visible region, which may be larger than the editor itself}]
-@boxisfillnull[@racket[h] @elem{the height of the visible region, which may be larger than the editor itself}]
-
-If an editor is fully visible and @racket[full?] is @racket[#f], then
- @racket[x] and @racket[y] will both be filled with @racket[0].
-
-If @racket[full?] is a true value, then the returned area is the view
- area of the top-level @techlink{display} for the editor. This result
- is different only when the editor is embedded in another editor; in
- that case, the @racket[x] and @racket[y] values may be meaningless,
- because they are in the coordinate system of the immediate editor
- within the top-level @techlink{display}.
-
-}
-@methimpl{
-
-Fills all boxes with @racket[0.0].
-
-}}
-
-@defmethod[(grab-caret [domain (or/c 'immediate 'display 'global) 'global])
-           void?]{
-@methspec{
-
-Called by the editor to request the keyboard focus. If the request is
- granted, then the administered editor's @method[editor<%> own-caret]
- method will be called.
-
-See @method[editor<%> set-caret-owner] for information about the
- possible values of @racket[domain].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(modified [modified? any/c])
-           void?]{
-@methspec{
-
-Called by the editor to report that its modification state has
- changed to either modified or unmodified.
-
-See also @xmethod[editor<%> set-modified].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(needs-update [localx real?]
-                         [localy real?]
-                         [w (and/c real? (not/c negative?))]
-                         [h (and/c real? (not/c negative?))])
-           void?]{
-@methspec{
-
-Called by the editor to request a refresh to its displayed
- representation. When the administrator decides that the displayed
- should be refreshed, it calls the editor's @method[editor<%> refresh]
- method.
-
-The @racket[localx], @racket[localy], @racket[w], and @racket[h]
- arguments specify a region of the editor to be updated (in editor
- coordinates).
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(popup-menu [menu (is-a?/c popup-menu%)]
-                       [x real?]
-                       [y real?])
-           boolean?]{
-@methspec{
-
-@popupmenuinfo[@elem{administrator's @techlink{display}}
-               @elem{top-level editor in this administrator's @techlink{display}}
-               @elem{The result is @racket[#t] if the popup succeeds,
-                  @racket[#f] otherwise (independent of whether the
-                  user selects an item in the popup menu).}]
-
-The menu is displayed at @racket[x] and @racket[y] in editor coordinates.
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-
-@defmethod[(refresh-delayed?)
-           boolean?]{
-
-@methspec{
-
-Returns @racket[#t] if updating on this administrator's
- @techlink{display} is currently delayed (usually by
- @xmethod[editor<%> begin-edit-sequence] in an enclosing editor).
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-
-@defmethod[(resized [refresh? any/c])
-           void?]{
-
-@methspec{
-
-Called by the editor to notify its @techlink{display} that the
- editor's size or scroll count has changed, so the scrollbars need to
- be adjusted to reflect the new size. The editor generally needs to be
- updated after a resize, but the editor decides whether the update
- should occur immediately. If @racket[refresh?] is not @racket[#f],
- then the editor is requesting to be updated immediately.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(scroll-to [localx real?]
-                      [localy real?]
-                      [w (and/c real? (not/c negative?))]
-                      [h (and/c real? (not/c negative?))]
-                      [refresh? any/c #t]
-                      [bias (or/c 'start 'end 'none) 'none])
-           boolean?]{
-@methspec{
-
-Called by the editor to request scrolling so that the given region is
-visible. The editor generally needs to be updated after a scroll, but
-the editor decides whether the update should occur immediately.
-
-The @racket[localx], @racket[localy], @racket[w], and @racket[h]
- arguments specify a region of the editor to be made visible by the
- scroll (in editor coordinates).
-
-If @racket[refresh?] is not @racket[#f], then the editor is requesting
- to be updated immediately.
-
-The @racket[bias] argument is one of:
-@itemize[
-@item{@racket['start] --- if the range doesn't fit in the visible area, show the top-left region}
-@item{@racket['none] --- no special scrolling instructions}
-@item{@racket['end] --- if the range doesn't fit in the visible area, show the bottom-right region}
-]
-
-The return value is @racket[#t] if the @techlink{display} is scrolled,
- @racket[#f] if not (either because the requested region is already
- visible, because the @techlink{display} has zero size, or because the
- editor is currently printing).
-
-If an editor has multiple @techlink{displays}, then if any display
- currently has the keyboard focus, it is scrolled. Otherwise, the
- ``primary owner'' of the editor (see @method[editor-canvas%
- call-as-primary-owner]) is scrolled.
-
-}
-@methimpl{
-
-Return @racket[#f]
-
-}}
-
-@defmethod[(update-cursor)
-           void?]{
-
-@methspec{
-
-Queues an update for the cursor in the @techlink{display} for this
- editor.  The actual cursor used will be determined by calling the
- editor's @method[editor<%> adjust-cursor] method.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-canvas-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-canvas-class.scrbl
deleted file mode 100644
index 4f9a64b5c3..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-canvas-class.scrbl
+++ /dev/null
@@ -1,385 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/editor-canvas}}
-
-@defclass/title[editor-canvas% object% (canvas<%>)]{
-
-An @racket[editor-canvas%] object manages and displays a
- @racket[text%] or @racket[pasteboard%] object.
-
-
-@defconstructor[([parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [editor (or/c (or/c (is-a?/c text%) (is-a?/c pasteboard%)) #f) #f]
-                 [style (listof (or/c 'no-border 'control-border 'combo 
-                                      'no-hscroll 'no-vscroll 
-                                      'hide-hscroll 'hide-vscroll 
-                                      'auto-vscroll 'auto-hscroll 
-                                      'resize-corner 'no-focus 'deleted 
-                                      'transparent)) null]
-                 [scrolls-per-page (integer-in 1 10000) 100]
-                 [label (or/c label-string? #f) #f]
-                 [wheel-step (or/c (integer-in 1 10000) #f) 3]
-                 [line-count (or/c (integer-in 1 1000) #f) #f]
-                 [horizontal-inset spacing-integer? 5]
-                 [vertical-inset spacing-integer? 5]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 0]
-                 [horiz-margin spacing-integer? 0]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-If a canvas is initialized with @racket[#f] for @racket[editor],
- install an editor later with @method[editor-canvas% set-editor].
-
-The @racket[style] list can contain the following flags:
-
-@itemize[
-
- @item{@racket['no-border] --- omits a border around the canvas}
-
- @item{@racket['control-border] --- gives the canvas a border that is
-                              like a @racket[text-field%] control}
-
- @item{@racket['combo] --- gives the canvas a combo button that is like
-                          a @racket[combo-field%] control; this
-                          style is intended for use with
-                          @racket['control-border],
-                          @racket['hide-hscroll], and
-                          @racket['hide-vscroll]}
-
- @item{@racket['no-hscroll] --- disallows horizontal scrolling and hides the horizontal scrollbar}
-
- @item{@racket['no-vscroll] --- disallows vertical scrolling and hides the vertical scrollbar}
-
- @item{@racket['hide-hscroll] --- allows horizontal scrolling, but hides the horizontal scrollbar}
-
- @item{@racket['hide-vscroll] --- allows vertical scrolling, but hides the vertical scrollbar}
-
- @item{@racket['auto-hscroll] --- automatically hides the horizontal scrollbar when unneeded
-                                 (unless @racket['no-hscroll] or @racket['hide-hscroll] is specified)}
-
- @item{@racket['auto-vscroll] --- automatically hides the vertical scrollbar when unneeded
-                                 (unless @racket['no-vscroll] or @racket['hide-vscroll] is specified)}
-
- @item{@racket['resize-corner] --- leaves room for a resize control at the canvas's
-                                  bottom right when only one scrollbar is visible}
-
- @item{@racket['no-focus] --- prevents the canvas from accepting the
-                              keyboard focus when the canvas is clicked or when the
-                              @method[window<%> focus] method is called}
-
- @item{@racket['deleted] --- creates the canvas as initially hidden and without affecting
-                             @racket[parent]'s geometry; the canvas can be made active
-                             later by calling @racket[parent]'s @method[area-container<%> add-child]
-                             method}
-
- @item{@racket['transparent] --- the canvas is ``erased'' before an
-                             update using its parent window's background; see @racket[canvas<%>]
-                             for information on the interaction of @racket['transparent] and 
-                             offscreen buffering}
-
-]
-
-While vertical scrolling of text editors is based on lines,
- horizontal scrolling and pasteboard vertical scrolling is based on a
- fixed number of steps per horizontal page. The @racket[scrolls-per-page]
- argument sets this value.
-
-@index["wheel on mouse"]{If} provided, the @racket[wheel-step]
- argument is passed on to the @method[editor-canvas% wheel-step]
- method. The default wheel step can be overridden globally though the
- @ResourceFirst{wheelStep}; see @|mrprefsdiscuss|.
-
-If @racket[line-count] is not @racket[#f], it is passed on to the
- @method[editor-canvas% set-line-count] method.
-
-If @racket[horizontal-inset] is not @racket[5], it is passed on to the
- @method[editor-canvas% horizontal-inset] method. Similarly, if
- @racket[vertical-inset] is not @racket[5], it is passed on to the
- @method[editor-canvas% vertical-inset] method.
-
-@WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-}
-
-
-@defmethod*[([(allow-scroll-to-last)
-              boolean?]
-             [(allow-scroll-to-last [on? any/c])
-              void?])]{
-
-Enables or disables last-line scrolling, or gets the current enable
- state.  If last-line scrolling is enabled, then an editor displayed
- in this canvas can be scrolled so that the last line of text is at
- the top of the canvas (or bottom of the canvas when bottom-based
- scrolling is enabled; see @method[editor-canvas%
- scroll-with-bottom-base]). By default, an editor can only be scrolled
- until the last line is at the bottom (or top) of the canvas.
-
-}
-
-@defmethod*[([(allow-tab-exit)
-              boolean?]
-             [(allow-tab-exit [on? any/c])
-              void?])]{
-
-@index['("keyboard focus" "navigation")]{Gets} or sets whether
- tab-exit is enabled for the editor canvas. When tab-exit is enabled,
- the user can move the keyboard focus out of the editor using the Tab
- and arrow keys, invoke the default button using the Enter/Return key,
- or invoke a dialog's close action with Escape. By default, tab-exit
- is disabled.
-
-When tab-exit is enabled for an editor canvas, Tab and Enter keyboard
- events are consumed by a frame's default @method[top-level-window<%>
- on-traverse-char] method; in addition, a dialog's default method
- consumes Escape key events. Otherwise, @method[top-level-window<%>
- on-traverse-char] allows the keyboard events to be propagated to the
- canvas.
-
-}
-
-@defmethod[(call-as-primary-owner [f (-> any)])
-           any]{
-
-Calls a thunk and returns the value. While the thunk is being called,
- if the canvas has an editor, the editor's @method[editor<%>
- get-admin] method returns the administrator for this canvas. This
- method is only useful when an editor is displayed in multiple
- canvases.
-
-}
-
-@defmethod*[([(force-display-focus)
-              boolean?]
-             [(force-display-focus [on? any/c])
-              void?])]{
-
-Enables or disables force-focus mode.  In force-focus mode, the caret
- or selection of the editor displayed in this canvas is drawn even
- when the canvas does not have the keyboard focus.
-
-}
-
-
-@defmethod[(get-editor)
-           (or/c (or/c (is-a?/c text%) (is-a?/c pasteboard%)) #f)]{
-
-Returns the editor currently displayed by this canvas, or @racket[#f]
- if the canvas does not have an editor.
-
-}
-
-
-@defmethod[(get-line-count)
-           (or/c (integer-in 1 1000) #f)]{
-
-Returns a line count installed with @method[editor-canvas%
- set-line-count], or @racket[#f] if no minimum line count is set.
-
-}
-
-@defmethod*[([(horizontal-inset)
-              (integer-in 1 10000)]
-             [(horizontal-inset [step (integer-in 1 10000)])
-              void?])]{
-
-Gets or sets the number of pixels within the canvas reserved to
- the left and right of editor content. The default is @racket[5].
-
-}
-
-
-@defmethod*[([(lazy-refresh)
-              boolean?]
-             [(lazy-refresh [on? any/c])
-              void?])]{
-
-Enables or disables lazy-refresh mode, or gets the current enable
- state. In lazy-refresh mode, the canvas's @method[window<%> refresh]
- method is called when the window needs to be updated, rather than
- @method[editor-canvas% on-paint]. By default, an
- @racket[editor-canvas%] object is @italic{not} in lazy-refresh mode.
-
-}
-
-
-@defmethod[#:mode override 
-           (on-char [event (is-a?/c key-event%)])
-           void?]{
-
-Handles @racket['wheel-up] and @racket['wheel-down] events by
- scrolling vertically. Otherwise, passes the event to the canvas's
- editor, if any, by calling its @method[editor<%> on-char] method.
-
-See also @method[editor-canvas% get-editor].
-
-}
-
-
-@defmethod[#:mode override 
-           (on-event [event (is-a?/c mouse-event%)])
-           void?]{
-
-Passes the event to the canvas's editor, if any, by calling its
- @method[editor<%> on-event] method.
-
-See also @method[editor-canvas% get-editor].
-
-}
-
-@defmethod[#:mode override 
-           (on-focus [on? any/c])
-           void?]{
-
-Enables or disables the caret in the @techlink{display}'s editor, if
- there is one.
-
-}
-
-@defmethod[#:mode override 
-           (on-paint)
-           void?]{
-
-Repaints the editor, or clears the canvas if no editor is being
-displayed.
-
-This method is called after clearing the margin around the editor,
-unless the canvas is created with the @racket['transparent] style, but
-the editor area is not automatically cleared. In other words,
-@racket[editor-canvas%] update by default is like @racket[canvas%]
-update with the @racket['no-autoclear] style, except that the margin
-around the editor area is always cleared.
-
-}
-
-@defmethod[#:mode override 
-           (on-size [width dimension-integer?]
-                    [height dimension-integer?])
-           void?]{
-
-If the canvas is displaying an editor, its @method[editor<%>
-on-display-size] method is called.
-
-}
-
-@defmethod[(scroll-to [localx real?]
-                      [localy real?]
-                      [w (and/c real? (not/c negative?))]
-                      [h (and/c real? (not/c negative?))]
-                      [refresh? any/c]
-                      [bias (or/c 'start 'end 'none) 'none])
-           boolean?]{
-
-Requests scrolling so that the given region in the currently displayed
- editor is made visible.
-
-The @racket[localx], @racket[localy], @racket[w], and @racket[h] arguments specify
- a region of the editor to be made visible by the scroll (in editor
- coordinates).
-
-If @racket[refresh?] is not @racket[#f], then the editor is updated
- immediately after a successful scroll.
-
-The @racket[bias] argument is one of:
-@itemize[
-
- @item{@racket['start] --- if the range doesn't fit in the visible
- area, show the top-left region}
-
- @item{@racket['none] --- no special scrolling instructions}
-
- @item{@racket['end] --- if the range doesn't fit in the visible area,
- show the bottom-right region}
-
-]
-
-The return value is @racket[#t] if the @techlink{display} is scrolled, @racket[#f]
- if not (either because the requested region is already visible,
- because the @techlink{display} has zero size, or because the editor is currently
- printing).
-
-
-}
-
-
-@defmethod*[([(scroll-with-bottom-base)
-              boolean?]
-             [(scroll-with-bottom-base [on? any/c])
-              void?])]{
-
-Enables or disables bottom-base scrolling, or gets the current enable
- state. If bottom-base scrolling is on, then scroll positions are
- determined by line boundaries aligned with the bottom of the viewable
- area (rather than with the top of the viewable area). If last-line
- scrolling is also enabled (see @method[editor-canvas%
- allow-scroll-to-last]), then the editor is bottom-aligned in the
- @techlink{display} area even when the editor does not fill the
- viewable area.
-
-}
-
-
-
-@defmethod[(set-editor [edit (or/c (or/c (is-a?/c text%) (is-a?/c pasteboard%)) #f)]
-                       [redraw? any/c #t])
-           void?]{
-
-Sets the editor that is displayed by the canvas, releasing the current
- editor (if any). If the new editor already has an administrator that
- is not associated with an @racket[editor-canvas%], then the new
- editor is @italic{not} installed into the canvas.
-
-If @racket[redraw?] is @racket[#f], then the editor is not immediately
- drawn; in this case, something must force a redraw later (e.g., a
- call to the @method[editor-canvas% on-paint] method).
-
-If the canvas has a line count installed with @method[editor-canvas%
- set-line-count], the canvas's minimum height is adjusted.
-
-}
-
-
-@defmethod[(set-line-count [count (or/c (integer-in 1 1000) #f)])
-           void?]{
-
-Sets the canvas's graphical minimum height to display a particular
- number of lines of text. The line height is determined by measuring
- the difference between the top and bottom of a displayed editor's
- first line. The minimum height is not changed until the canvas gets
- an editor. When the canvas's editor is changed, the minimum height is
- recalculated.
-
-If the line count is set to @racket[#f], then the canvas's graphical
- minimum height is restored to its original value.
-
-}
-
-
-@defmethod*[([(vertical-inset)
-              (integer-in 1 10000)]
-             [(vertical-inset [step (integer-in 1 10000)])
-              void?])]{
-
-Gets or sets the number of pixels within the canvas reserved above
- and below editor content. The default is @racket[5].
-
-}
-
-
-@defmethod*[([(wheel-step)
-              (or/c (integer-in 1 10000) #f)]
-             [(wheel-step [step (or/c (integer-in 1 10000) #f)])
-              void?])]{
-
-Gets or sets the number of vertical scroll steps taken for one click
- of the mouse wheel via a @racket['wheel-up] or @racket['wheel-down]
- @racket[key-event%]. A @racket[#f] value disables special handling
- for wheel events (i.e., wheel events are passed on to the canvas's
- editor).
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-classes.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-classes.scrbl
deleted file mode 100644
index d709319684..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-classes.scrbl
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" "diagrams.rkt")
-
-@title[#:style '(toc quiet)]{Editor Classes}
-
-Editors:
-
-@diagram->table[editor-diagram]
-
-Editor Snips:
-
-@diagram->table[editor-snip-diagram]
-
-Displays, Administrators, and Mappings:
-
-@diagram->table[editor-admin-diagram]
-
-Streams for Saving and Cut-and-Paste:
-
-@diagram->table[stream-diagram]
-
-Alphabetical:
-
-@local-table-of-contents[]
-
-@include-section["editor-intf.scrbl"]
-@include-section["editor-admin-class.scrbl"]
-@include-section["editor-canvas-class.scrbl"]
-@include-section["editor-data-class.scrbl"]
-@include-section["editor-data-class-class.scrbl"]
-@include-section["editor-data-class-list-intf.scrbl"]
-@include-section["editor-snip-editor-admin-intf.scrbl"]
-@include-section["editor-snip-class.scrbl"]
-@include-section["editor-stream-in-class.scrbl"]
-@include-section["editor-stream-in-base-class.scrbl"]
-@include-section["editor-stream-in-bytes-base-class.scrbl"]
-@include-section["editor-stream-out-class.scrbl"]
-@include-section["editor-stream-out-base-class.scrbl"]
-@include-section["editor-stream-out-bytes-base-class.scrbl"]
-@include-section["editor-wordbreak-map-class.scrbl"]
-@include-section["keymap-class.scrbl"]
-@include-section["pasteboard-class.scrbl"]
-@include-section["text-class.scrbl"]
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-data-class-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-data-class-class.scrbl
deleted file mode 100644
index c5f26dc67f..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-data-class-class.scrbl
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[editor-data-class% object% ()]{
-
-An @racket[editor-data-class%] object defines a type for
-@racket[editor-data%] objects. See also @|editordatadiscuss|.
-
-
-@defconstructor[()]{
-
-Creates a (useless) instance.
-
-}
-
-@defmethod[(get-classname)
-           string?]{
-
-Gets the name of the class. Names starting with @litchar{wx} are reserved for
-internal use.
-
-}
-
-@defmethod[(read [f (is-a?/c editor-stream-in%)])
-           (or/c (is-a?/c editor-data%) #f)]{
-
-Reads a new data object from the given stream, returning @racket[#f] if
- there is an error.
-
-}
-
-@defmethod[(set-classname [v string?])
-           void?]{
-
-Sets the name of the class. Names starting with @litchar{wx} are
- reserved for internal use.
-
-An editor data class name should usually have the form @racket["(lib
- ...)"]  to enable on-demand loading of the class; see
- @|editordatadiscuss| for details.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-data-class-list-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-data-class-list-intf.scrbl
deleted file mode 100644
index 06cd55ca5d..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-data-class-list-intf.scrbl
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[editor-data-class-list<%> ()]{
-
-Each eventspace has an instance of @racket[editor-data-class-list<%>],
- obtained with @racket[(get-the-editor-data-class-list)]. New
- instances cannot be created directly. This list keeps a list of
- editor data classes; this list is needed for loading snips from a
- file. See also @|editordatadiscuss|.
-
-
-@defmethod[(add [snipclass (is-a?/c editor-data-class%)])
-           void?]{
-Adds a snip data class to the list. If a class with the same name already
-exists in the list, this one will not be added.
-
-}
-
-@defmethod[(find [name string?])
-           (or/c (is-a?/c snip-class%) #f)]{
-Finds a snip data class from the list with the given name, returning
- @racket[#f] if none can be found.
-
-}
-
-@defmethod[(find-position [class (is-a?/c editor-data-class%)])
-           exact-nonnegative-integer?]{
-Returns an index into the list for the specified class.
-
-}
-
-@defmethod[(nth [n exact-nonnegative-integer?])
-           (or/c (is-a?/c editor-data-class%) #f)]{
-Returns the @racket[n]th class in the list (counting from 0), returning
- @racket[#f] if the list has @racket[n] or less classes.
-
-}
-
-@defmethod[(number)
-           exact-nonnegative-integer?]{
-
-Returns the number of editor data classes in the list.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-data-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-data-class.scrbl
deleted file mode 100644
index c4c1620200..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-data-class.scrbl
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[editor-data% object% ()]{
-
-An @racket[editor-data%] object contains extra data associated to a
-snip or region in an editor. See also @|editordatadiscuss|.
-
-
-
-@defconstructor[()]{
-
-The element returned by @method[editor-data% get-next] is initialized
-to @racket[#f].
-
-}
-
-@defmethod[(get-dataclass)
-           (or/c (is-a?/c editor-data-class%) #f)]{
-Gets the class for this data.
-}
-
-@defmethod[(get-next)
-           (or/c (is-a?/c editor-data%) #f)]{
-Gets the next editor data element in a list of editor data elements.
-A @racket[#f] terminates the list.
-}
-
-@defmethod[(set-dataclass [v (is-a?/c editor-data-class%)])
-           void?]{Sets the class for this data.
-}
-
-@defmethod[(set-next [v (or/c (is-a?/c editor-data%) #f)])
-           void?]{Sets the next editor data element in a list of editor data elements.
-A @racket[#f] terminates the list.
-}
-
-@defmethod[(write [f (is-a?/c editor-stream-out%)])
-           boolean?]{
-@methspec{
-
-Writes the data to the specified stream, returning @racket[#t] if data
-is written successfully or @racket[#f] otherwise.
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-funcs.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-funcs.scrbl
deleted file mode 100644
index 0f4188b58c..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-funcs.scrbl
+++ /dev/null
@@ -1,459 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/bnf)
-
-@title{Editor Functions}
-
-
-@defproc[(add-editor-keymap-functions [keymap (is-a?/c keymap%)])
-         void?]{
-
-Given a @racket[keymap%] object, the keymap is loaded with mappable
- functions that apply to all @racket[editor<%>] objects:
-
-@itemize[ 
-@item{@racket["copy-clipboard"]}
-@item{@racket["copy-append-clipboard"]}
-@item{@racket["cut-clipboard"]}
-@item{@racket["cut-append-clipboard"]}
-@item{@racket["paste-clipboard"]}
-@item{@racket["paste-x-selection"]}
-@item{@racket["delete-selection"]}
-@item{@racket["clear-selection"]}
-@item{@racket["undo"]}
-@item{@racket["redo"]}
-@item{@racket["select-all"]}
-]
-
-}
-
-@defproc[(add-pasteboard-keymap-functions [keymap (is-a?/c keymap%)])
-         void?]{
-
-Given a @racket[keymap%] object, the table is loaded with mappable
- functions that apply to @racket[pasteboard%] objects. Currently,
- there are no such functions.
-
-See also
-@racket[add-editor-keymap-functions].
-
-}
-
-@defproc[(add-text-keymap-functions [keymap (is-a?/c keymap%)])
-         void?]{
-
-Given a @racket[keymap%] object, the table is loaded with functions
- that apply to all @racket[text%] objects:
-@itemize[ 
-@item{@racket["forward-character"]}
-@item{@racket["backward-character"]}
-@item{@racket["previous-line"]}
-@item{@racket["next-line"]}
-@item{@racket["previous-page"]}
-@item{@racket["next-page"]}
-@item{@racket["forward-word"]}
-@item{@racket["backward-word"]}
-@item{@racket["forward-select"]}
-@item{@racket["backward-select"]}
-@item{@racket["select-down"]}
-@item{@racket["select-up"]}
-@item{@racket["select-page-up"]}
-@item{@racket["select-page-down"]}
-@item{@racket["forward-select-word"]}
-@item{@racket["backward-select-word"]}
-@item{@racket["beginning-of-file"]}
-@item{@racket["end-of-file"]}
-@item{@racket["beginning-of-line"]}
-@item{@racket["end-of-line"]}
-@item{@racket["select-to-beginning-of-file"]}
-@item{@racket["select-to-end-of-file"]}
-@item{@racket["select-to-beginning-of-line"]}
-@item{@racket["select-to-end-of-line"]}
-@item{@racket["copy-clipboard"]}
-@item{@racket["copy-append-clipboard"]}
-@item{@racket["cut-clipboard"]}
-@item{@racket["cut-append-clipboard"]}
-@item{@racket["paste-clipboard"]}
-@item{@racket["paste-x-selection"]}
-@item{@racket["delete-selection"]}
-@item{@racket["delete-previous-character"]}
-@item{@racket["delete-next-character"]}
-@item{@racket["clear-selection"]}
-@item{@racket["delete-to-end-of-line"]}
-@item{@racket["delete-next-word"]}
-@item{@racket["delete-previous-word"]}
-@item{@racket["delete-line"]}
-@item{@racket["undo"]}
-@item{@racket["redo"]}
-]
-
-See also
-@racket[add-editor-keymap-functions].
-
-}
-
-@defproc[(append-editor-font-menu-items [menu (or/c (is-a?/c menu%) (is-a?/c popup-menu%))])
-         void?]{
-Appends menu items to @racket[menu] to implement a
- standard set of font-manipulation operations, such as changing the
- font face or style. The callback for each menu item uses
-@xmethod[top-level-window<%> get-edit-target-object] (finding the frame by following a chain of parents until a frame is
- reached); if the result is an @racket[editor<%>] object,
-@xmethod[text% change-style] or @xmethod[pasteboard% change-style] is called on the editor.
-
-}
-
-@defproc[(append-editor-operation-menu-items [menu (or/c (is-a?/c menu%) (is-a?/c popup-menu%))]
-                                             [text-only? any/c #t]
-                                             [#:popup-position 
-                                              popup-position 
-                                              (or/c #f (list/c (is-a?/c text%) exact-nonnegative-integer?))
-                                              #f])
-         void?]{
-Appends menu items to @racket[menu] to implement the
- standard editor operations, such as cut and paste. The callback for
- each menu item uses
-@xmethod[top-level-window<%> get-edit-target-object] (finding the frame by following a chain of parents until a frame is
- reached); if the result is an @racket[editor<%>] object,
-@xmethod[editor<%> do-edit-operation] is called on the editor.
-
-If @racket[text-only?] is @racket[#f], then menu items that insert
- non-text snips (such as @onscreen{Insert Image...}) are appended to
- the menu.
-
-If @racket[popup-position] is not @racket[#f], then @racket[append-editor-operation-menu-items]
-is expected to have been called to build a popup menu and the two elements
-of the list should be the @racket[text%] object where the mouse was clicked
-for the popup menu and the position where the click happened. In that case,
-the @onscreen{Copy} and @onscreen{Cut} menus are enabled when the click
-lands on a snip that is not a @racket[string-snip%], and the corresponding
-callbacks will copy and cut that one snip.
-
-}
-
-@defparam[current-text-keymap-initializer proc ((is-a?/c keymap%) . -> . any/c)]{
-
-Parameter that specifies a keymap-initialization procedure. This
- procedure is called to initialize the keymap of a
- @racket[text-field%] object or a @racket[text%] object created by
- @racket[graphical-read-eval-print-loop].
-
-The initializer takes a keymap object and returns nothing. The default
- initializer chains the given keymap to an internal keymap that
- implements standard text editor keyboard and mouse bindings for cut,
- copy, paste, undo, and select-all. The right mouse button is mapped
- to popup an edit menu when the button is released. On Unix,
- start-of-line (Ctl-A) and end-of-line (Ctl-E) are also mapped.
-
-}
-
-@defproc[(editor-set-x-selection-mode [on any/c])
-         void?]{
-
-On Unix, editor selections conform to the X11 Windows selection
-conventions. If @racket[on] is
-@racket[#f], the behavior is switched exclusively to the clipboard-based convention
-(where copy must be explicitly requested before a paste).
-
-}
-
-@defproc[(get-the-editor-data-class-list)
-         (is-a?/c editor-data-class-list<%>)]{
-
-Gets the editor data class list instance for the current eventspace.
-
-
-
-}
-
-@defproc[(get-the-snip-class-list)
-         (is-a?/c snip-class-list<%>)]{
-
-Gets the snip class list instance for the current eventspace.
-
-
-
-}
-
-@defproc*[([(map-command-as-meta-key [on? any/c])
-            void?]
-           [(map-command-as-meta-key)
-            boolean?])]{
-Determines the interpretation of @litchar{m:} for a @racket[keymap%]
-mapping on Mac OS X. See also
-@xmethod[keymap% map-function].
-
-
-First case:
-
-
-If @racket[on?] is @racket[#t], @litchar{m:} corresponds to the Command key. If
-@racket[on?] is @racket[#f], then @litchar{m:} corresponds to no key on Mac OS
-X.
-
-
-
-Second case:
-
-
-Returns @racket[#t] if @litchar{m:} corresponds to Command,
- @racket[#f] otherwise.
-
-}
-
-@defproc[(open-input-graphical-file [filename string?])
-         input-port?]{
-
-Opens @racket[filename] (in @racket['binary] mode) and checks whether it looks
- like a ``graphical'' file in editor format. If the file does not
- appear to be an editor file, the file port is returned with line
- counting enabled. Otherwise, the file is loaded into an editor, and
- the result port is created with
-@racket[open-input-text-editor].
-
-
-}
-
-@defproc[(open-input-text-editor [text-editor (is-a?/c text%)]
-                                 [start-position exact-nonnegative-integer? 0]
-                                 [end-position (or/c exact-nonnegative-integer? 'end) 'end]
-                                 [snip-filter ((is-a?/c snip%) . -> . any/c) (lambda (s) s)]
-                                 [port-name any/c text-editor]
-                                 [expect-to-read-all? any/c #f]
-                                 [#:lock-while-reading? lock-while-reading? any/c #f])
-         input-port]{
-
-Creates an input port that draws its content from @racket[text-editor].
- The editor content between positions @racket[start-position] and
- @racket[end-position] is the content of the port. If @racket[end-position]
- is @racket['end], the content runs until the end of the editor. If a
- snip that is not a @racket[string-snip%] object spans
- @racket[start-position] or @racket[end-position], the entire snip
- contributes to the port. If a @racket[string-snip%] instance spans
- @racket[start-position], only the part of the snip after
- @racket[start-position] contributes, and if a @racket[string-snip%]
- object spans @racket[end-position], only the part before
- @racket[end-position] contributes.
-
-An instance of @racket[string-snip%] in @racket[text-editor] generates
- a character sequence in the resulting port. All other kinds of snips
- are passed to @racket[snip-filter] to obtain a ``special'' value for
- the port.  If a snip is returned as the first result from
- @racket[snip-filter], and if the snip is an instance of
- @racket[readable-snip<%>], the snip generates a special value for the
- port through the @method[readable-snip<%> read-special] method. If
- @racket[snip-filter] returns any other kind of snip, it is copied for
- the special result. Finally, a non-snip first result from
- @racket[snip-filter] is used directly as the special result.
-
-The @racket[port-name] argument is used for the input port's name. The
- @racket[expect-to-read-all?] argument is a performance hint; use
- @racket[#t] if the entire port's stream will be read.
-
-The result port must not be used if @racket[text-editor] changes in any
- of the following ways: a snip is inserted (see
-@method[text% after-insert]), a snip is deleted  (see
-@method[text% after-delete]), a snip is split  (see
-@method[text% after-split-snip]), snips are merged  (see
-@method[text% after-merge-snips]), or a snip changes its count (which is rare; see
-@method[snip-admin% recounted]). The
-@method[text% get-revision-number] method can be used to detect any of these changes.
-
-To help guard against such uses, if @racket[lock-while-reading?] argument is
-a true value, then @racket[open-input-text-editor] will 
-@method[editor<%> lock] the @racket[text-editor] and call
-@method[editor<%> begin-edit-sequence]
-before it returns and un@method[editor<%> lock] it and
-call @method[editor<%> end-edit-sequence]
-after it is safe to use the above methods. (In some
-cases, it will not @method[editor<%> lock] the editor 
-or put it in an edit sequence at all, 
-if using those methods are always safe.)
-
-}
-
-@defproc[(open-output-text-editor [text-editor (is-a?/c text%)]
-                                  [start-position (or/c exact-nonnegative-integer? (one/of 'end)) 'end]
-                                  [special-filter (any/c . -> . any/c) (lambda (x) x)]
-                                  [port-name any/c text-editor]
-                                  [#:eventspace eventspace (or/c eventspace? #f) (current-eventspace)])
-         output-port]{
-
-Creates an output port that delivers its content to @racket[text-editor].
- The content is written to @racket[text-editor] starting at the position
- @racket[start-position], where @racket['end] indicates that output should
- start at the text editor's current end position.
-
-If @racket[special-filter] is provided, it is applied to any value
- written to the port with @racket[write-special], and the result is
- inserted in its place. If a special value is a @racket[snip%]
- object, it is inserted into the editor. Otherwise, the special value
- is @racket[display]ed into the editor.
-
-If line counting is enabled for the resulting output port, then the
- port will report the line, offset from the line's start, and position
- within the editor at which the port writes data.
-
-If @racket[eventspace] is not @racket[#f], then when the output port
- is used in a thread other than @racket[eventspace]'s handler thread,
- content is delivered to @racket[text-editor] through a low-priority
- callback in @racket[eventspace].  Thus, if @racket[eventspace]
- corresponds to the eventspace for the editor's @tech{displays},
- writing to the output port is safe from any thread.
-
-If @racket[eventspace] is @racket[#f], beware that the port is only
- weakly thread-safe. Content is delivered to @racket[text-editor] in
- an @tech{edit sequence}, but an edit sequence is not enough
- synchronization if, for example, the editor is displayed in an
- enabled @racket[editor-canvas%]. See @secref["editorthreads"] for
- more information.}
-
-
-@defproc[(read-editor-global-footer [in (is-a?/c editor-stream-in%)])
-         boolean?]{
-
-See 
-@racket[read-editor-global-header]. Call
-@racket[read-editor-global-footer] even if
-@racket[read-editor-global-header] returns @racket[#f].
-
-
-
-}
-
-@defproc[(read-editor-global-header [in (is-a?/c editor-stream-in%)])
-         boolean?]{
-
-Reads data from @racket[in] to initialize for reading editors from the
-stream. The return value is @racket[#t] if the read succeeds, or @racket[#f]
-otherwise.
-
-One or more editors can be read from the stream by calling
-the editor's 
-@method[editor<%> read-from-file] method. (The number of editors to be
-read must be known by the application beforehand.) When all editors
-are read, call 
-@racket[read-editor-global-footer]. Calls to 
-@racket[read-editor-global-header] and
-@racket[read-editor-global-footer] must bracket any call to 
-@method[editor<%> read-from-file], and only one stream at a time
-can be read using these methods or written using
-@racket[write-editor-global-header] and
-@racket[write-editor-global-footer].
-
-When reading from streams that span Racket versions, use
-@racket[read-editor-version] before this procedure.
-
-
-
-}
-
-@defproc[(read-editor-version [in (is-a?/c editor-stream-in%)]
-                              [in-base (is-a?/c editor-stream-in-base%)]
-                              [parse-format? any/c]
-                              [raise-errors? any/c #t])
-         boolean?]{
-
-Reads version information from @racket[in-base], where @racket[in-base] is
- the base for @racket[in]. The version information parsed from
- @racket[in-base] is recorded in @racket[in] for later version-sensitive
- parsing. The procedure result is true if the version information was
- read successfully and if the version is supported.
-
-If @racket[parse-format?] is true, then @racket[in-base] is checked for an
- initial @racket["WXME"] format indicator. Use @racket[#f] when
- @racket["WXME"] has been consumed already by format-dispatching code.
-
-If @racket[raise-errors?] is true, then an error in reading triggers an
- exception, instead of a @racket[#f] result.
-
-
-
-}
-
-@defproc[(text-editor-load-handler [filename path string]
-                                   [expected-module-name (or/c symbol? #f)])
-         any/c]{
-
-This procedure is a load handler for use with @racket[current-load].
-
-The handler recognizes Racket editor-format files (see
- @secref["editorfileformat"]) and decodes them for loading. It is
- normally installed as GRacket starts (see @secref[#:doc reference-doc
- "running-sa"]).
-
-The handler recognizes editor files by the first twelve characters of
- the file: @litchar{WXME01}@nonterm{digit}@nonterm{digit}@litchar{ ## }.
- Such a file is opened for loading by creating a @racket[text%]
- object, loading the file into the object with @method[editor<%>
- insert-file], and then converting the editor content into a port with
- @racket[open-input-text-editor]. After obtaining a port in this way,
- the content is read in essentially the same way as by the default
- Racket load handler. The difference is that the editor may contain
- instances of @racket[readable-snip<%>], which are ``read'' though the
- snips' @method[readable-snip<%> read-special] method; see
- @racket[open-input-text-editor] for details.
-
-
-}
-
-@defthing[the-editor-wordbreak-map (is-a?/c editor-wordbreak-map%)]{
-
-See @racket[editor-wordbreak-map%].
-
-}
-
-@defthing[the-style-list (is-a?/c style-list%)]{
-
-See @racket[style-list%].
-
-}
-
-@defproc[(write-editor-global-footer [out (is-a?/c editor-stream-out%)])
-         boolean?]{
-
-See @racket[write-editor-global-header]. Call
- @racket[write-editor-global-footer] even if
- @racket[write-editor-global-header] returns @racket[#f].
-
-
-
-}
-
-@defproc[(write-editor-global-header [out (is-a?/c editor-stream-out%)])
-         boolean?]{
-
-Writes data to @racket[out], initializing it for writing editors to
- the stream. The return value is @racket[#t] if the write succeeds, or
- @racket[#f] otherwise.
-
-One or more editors can be written to the stream by calling the
- editor's @method[editor<%> write-to-file] method. When all editors
- are written, call @racket[write-editor-global-footer]. Calls to
- @racket[write-editor-global-header] and
- @racket[write-editor-global-footer] must bracket any call to
- @method[editor<%> write-to-file], and only one stream at a time can
- be written using these methods or read using
- @racket[read-editor-global-header] and
- @racket[read-editor-global-footer].
-
-To support streams that span Racket versions, use
- @racket[write-editor-version] before this procedure.
-
-See also @secref["editorfileformat"].
-
-}
-
-@defproc[(write-editor-version [out (is-a?/c editor-stream-out%)]
-                               [out-base (is-a?/c editor-stream-out-base%)])
-         boolean?]{
-
-Writes version information to @racket[out-base] in preparation for
- writing editor information to the stream @racket[out].
-
-The @racket[out] argument is currently not used, but @racket[out-base]
- should be the base for @racket[out]. In the future, @racket[out] may record
- information about the version for later version-sensitive output.
-
-The result is @racket[#t] if the write succeeded, @racket[#f] otherwise.
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-intf.scrbl
deleted file mode 100644
index d0cb89cb72..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-intf.scrbl
+++ /dev/null
@@ -1,2540 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          scribble/eval)
-
-@(define editor-eval (make-base-eval))
-@(editor-eval '(require racket/class))
-
-@definterface/title[editor<%> ()]{
-
-The @racket[editor<%>] interface is implemented by @racket[text%] and
- @racket[pasteboard%].
-
-@defmethod[(add-canvas [canvas (is-a?/c editor-canvas%)])
-           void?]{
-
-Adds a canvas to this editor's list of displaying canvases. (See
-@method[editor<%> get-canvases].)
-
-Normally, this method is called only by @xmethod[editor-canvas%
- set-editor].
-
-}
-
-@defmethod[(add-undo [undoer (-> any)])
-           void?]{
-
-Adds an undoer procedure to the editor's undo stack. If an undo is
- currently being performed, the undoer is added to the editor's redo
- stack. The undoer is called by the system when it is undoing (or
- redoing) changes to an editor, and when this undoer is the first item
- on the undo (or redo) stack.
-
-The system automatically installs undo records to undo built-in editor
- operations, such as inserts, deletes, and font changes.  Install an
- undoer only when it is necessary to maintain state or handle
- operations that are not built-in. For example, in a program where the
- user can assign labels to snips in a pasteboard, the program should
- install an undoer to revert a label change. Thus, when a user changes
- a snip's label and then selects @onscreen{Undo} (from a standard menu
- bar), the snip's label will revert as expected. In contrast, there is
- no need to install an undoer when the user moves a snip by dragging
- it, because the system installs an appropriate undoer automatically.
-
-After an undoer returns, the undoer is popped off the editor's undo
- (or redo) stack; if the return value is true, then the next undoer is
- also executed as part of the same undo (or redo) step.  The undoer
- should return true if the action being undone was originally
- performed as part of a @method[editor<%> begin-edit-sequence] and
- @method[editor<%> end-edit-sequence] sequence. The return value
- should also be true if the undone action was implicitly part of a
- sequence. To extend the previous example, if a label change is paired
- with a move to realign the snip, then the label-change undoer should
- be added to the editor @italic{after} the call to @method[pasteboard%
- move], and it should return @racket[#t] when it is called. As a
- result, the move will be undone immediately after the label change is
- undone. (If the opposite order is needed, use @method[editor<%>
- begin-edit-sequence] and @method[editor<%> end-edit-sequence] to
- create an explicit sequence.)
-
-The system adds undoers to an editor (in response to other method
- calls) without calling this method.
-
-}
-
-@defmethod[(adjust-cursor [event (is-a?/c mouse-event%)])
-           (or/c (is-a?/c cursor%) #f)]{
-
-@methspec{
-
-Gets a cursor to be used in the editor's @techlink{display}.  If the
- return value is @racket[#f], a default cursor is used.
-
-See also @method[editor<%> set-cursor].
-
-}
-@methimpl{
-
-If an overriding cursor has been installed with
-@method[editor<%> set-cursor], then the installed cursor is returned.
-
-Otherwise, if the event is a dragging event, a snip in the editor has
-the focus, and the snip's
-@method[snip% adjust-cursor] method returns a cursor, that cursor is returned.
-
-Otherwise, if the cursor is over a snip and the snip's
-@method[snip% adjust-cursor] method returns a cursor, that cursor is returned.
-
-Otherwise, if a cursor has been installed with
-@method[editor<%> set-cursor], then the installed cursor is returned.
-
-Otherwise, if the cursor is over a clickback region in an editor, an
-arrow cursor is returned.
-
-Finally, if none of the above cases apply, a default cursor is
-returned. For a text editor, the default cursor is an I-beam. For a
-pasteboard editor, the default cursor is an arrow.
-
-}}
-
-@defmethod[#:mode pubment 
-           (after-edit-sequence)
-           void?]{
-
-@methspec{
-
-Called after a top-level edit sequence completes (involving unnested
-@method[editor<%> begin-edit-sequence] and @method[editor<%>
-end-edit-sequence]).
-
-See also @method[editor<%> on-edit-sequence].
-
-}
-
-@methimpl{
-
-Does nothing.
-
-}
-
-}
-
-@defmethod[#:mode pubment 
-           (after-load-file [success? any/c])
-           void?]{
-
-@methspec{
-
-Called just after the editor is loaded from a file or during the
-exception escape when an attempt to load fails. The @racket[success?]
-argument indicates whether the load succeeded.
-
-See also
-@method[editor<%> can-load-file?] and
-@method[editor<%> on-load-file].
-
-}
-
-@methimpl{
-
-Does nothing.
-
-}
-}
-
-@defmethod[#:mode pubment 
-           (after-save-file [success? any/c])
-           void?]{
-
-@methspec{
-
-Called just after the editor is saved to a file or during the
-exception escape when a save fails. The @racket[success?] argument
-indicates whether the save succeeded.
-
-See also
-@method[editor<%> can-save-file?] and
-@method[editor<%> on-save-file].
-
-}
-@methimpl{
-
-Does nothing.
-
-}
-}
-
-@defmethod*[([(auto-wrap)
-              boolean?]
-             [(auto-wrap [auto-wrap? any/c])
-              void?])]{
-
-Enables or disables automatically calling @method[editor<%>
-set-max-width] in response to @method[editor<%> on-display-size], or
-gets the state of auto-wrapping. For text editors, this has the effect
-of wrapping the editor's contents to fit in a canvas displaying the
-editor (the widest one if multiple canvases display the editor). For
-pasteboard editors, ``auto-wrapping'' merely truncates the area of the
-pasteboard to match its canvas @techlink{display}.
-
-When the wrapping mode is changed, the @method[editor<%>
-on-display-size] method is called immediately to update the editor's
-maximum width.
-
-Auto-wrapping is initially disabled. 
-
-}
-
-@defmethod[(begin-edit-sequence [undoable? any/c #t]
-                                [interrupt-streak? any/c #t])
-           void?]{
-
-@methspec{
-
-The @method[editor<%> begin-edit-sequence] and @method[editor<%>
- end-edit-sequence] methods are used to bracket a set of editor
- modifications so that the results are all displayed at once. The
- commands may be nested arbitrarily deeply. Using these functions can
- greatly speed up displaying the changes.
-
-When an editor contains other editors, using @method[editor<%>
- begin-edit-sequence] and @method[editor<%> end-edit-sequence] on the
- main editor brackets some changes to the sub-editors as well, but it
- is not as effective when a sub-editor changes as calling
- @method[editor<%> begin-edit-sequence] and @method[editor<%>
- end-edit-sequence] for the sub-editor.
-
-See also @method[editor<%> refresh-delayed?] and @method[editor<%>
- in-edit-sequence?], and see @secref["editorthreads"] for
- information about edit sequences and refresh requests.
-
-If the @racket[undoable?] flag is @racket[#f], then the changes made
- in the sequence cannot be reversed through the @method[editor<%>
- undo] method. See @elemref["ed-seq-undo"]{below} for more information
- on undo. The @racket[undoable?] flag is only effective for the outermost
- @method[editor<%> begin-edit-sequence] when nested sequences are
- used. Note that, for a @racket[text%] object, the character-inserting
- version of @method[text% insert] interferes with sequence-based undo
- groupings.
-
-If the @racket[interrupt-streak?] flag is @racket[#f] and the sequence is
- outermost, then special actions before and after the sequence count
- as consecutive actions. For example, @method[editor<%> kill]s just before 
- and after the sequence are appended in the clipboard.
-
-@elemtag["ed-seq-undo"]{@italic{Undo details:}} The behavior of @racket[undoable?] as @racket[#f] is
- implemented by not adding entries to an undo log. For example, suppose that
- an @litchar{a} is inserted into the editor, a @litchar{b}
- is inserted, and then an un-undoable edit sequence begins,
- and the @litchar{a} is colored red, and then the edit sequence ends.
- An undo will remove the @litchar{b}, leaving the @litchar{a}
- colored red. 
-
- As another example, in the following interaction,
- @method[editor<%> undo] removes the @litchar{a}
- instead of the @litchar{b}:
-
- @interaction[#:eval 
-           editor-eval
-           (eval:alts (define t (new text%))
-                      ;; this is a pretty horrible hack, but 
-                      ;; the sequence of calls below behaves 
-                      ;; the way they are predicted to as of
-                      ;; the moment of this commit
-                      (define t 
-                        (new (class object%
-                               (define/public (set-max-undo-history x) (void))
-                               (define/public (insert . args) (void))
-                               (define/public (begin-edit-sequence a b) (void))
-                               (define/public (end-edit-sequence) (void))
-                               (define/public (undo) (void))
-                               (define first? #t)
-                               (define/public (get-text)
-                                 (cond
-                                   [first?
-                                    (set! first? #f)
-                                    "cab"]
-                                   [else "cb"]))
-                               (super-new)))))
-           (begin
-            (send t set-max-undo-history 'forever)
-            (send t insert "a")
-            (send t insert "b")
-            (send t begin-edit-sequence #f #f)
-            (send t insert "c" 0 0)
-            (send t end-edit-sequence)
-            (send t get-text))
-           (begin
-            (send t undo)
-            (send t get-text))]
-      
-}
-@methimpl{
-
-Starts a sequence.
-
-}}
-
-@defmethod[(begin-write-header-footer-to-file [f (is-a?/c editor-stream-out%)]
-                                              [name string?]
-                                              [buffer (box/c exact-integer?)])
-           void?]{
-
-This method must be called before writing any special header data to a
-stream. See @|filediscuss| and @method[editor<%>
-write-headers-to-file] for more information.
-
-The @racket[name] string must be a unique name that can be used by a
- header reader to recognize the data. This method will store a value
- in @racket[buffer] that should be passed on to @method[editor<%>
- end-write-header-footer-to-file].
-
-}
-
-@defmethod[(blink-caret)
-           void?]{
-
-@methspec{
-
-Tells the editor to blink the selection caret. This method is 
-called periodically when the editor's @techlink{display} has the keyboard
-focus.
-
-}
-@methimpl{
-
-Propagates the request to any snip with the editor-local focus.
-
-}}
-
-@defmethod[(can-do-edit-operation? [op (or/c 'undo 'redo 'clear 'cut 'copy 'paste 
-                                             'kill 'select-all 'insert-text-box 
-                                             'insert-pasteboard-box 'insert-image)]
-                                   [recursive? any/c #t])
-           boolean?]{
-@methspec{
-
-Checks whether a generic edit command would succeed for the editor.
- This check is especially useful for enabling and disabling menus on
- demand. See @method[editor<%> do-edit-operation] for information
- about the @racket[op] and @racket[recursive?] arguments.
-
-}
-@methimpl{
-
-Allows the operation depending on the selection, whether the editor is
-locked, etc.
-
-}}
-
-@defmethod[#:mode pubment 
-           (can-load-file? [filename path?]
-                           [format (or/c 'guess 'same 'copy 'standard
-                                         'text 'text-force-cr)])
-           boolean?]{
-@methspec{
-
-Called just before the editor is loaded from a file. If the return
-value is @racket[#f], the file is not loaded. See also
-@method[editor<%> on-load-file] and @method[editor<%>
-after-load-file].
-
-The @racket[filename] argument is the name the file will be loaded
- from. See @method[editor<%> load-file] for information about
- @racket[format].
-
-Note that the @racket[filename] argument cannot be a string; it must
-be a path value.
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-@defmethod[#:mode pubment 
-           (can-save-file? [filename path?]
-                           [format (or/c 'guess 'same 'copy 'standard
-                                         'text 'text-force-cr)])
-           boolean?]{
-@methspec{
-
-Called just before the editor is saved to a file. If the return value
-is @racket[#f], the file is not saved. See also @method[editor<%>
-on-save-file] and @method[editor<%> after-save-file].
-
-The @racket[filename] argument is the name the file will be saved
- to. See @method[editor<%> load-file] for information about
- @racket[format].
-
-Note that the @racket[filename] argument cannot be a string; it must
- be a path value.
-
-}
-
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-@defmethod[(clear)
-           void?]{
-
-Deletes the currently selected @techlink{item}s.
-
-@|OnDeleteNote|
-
-}
-
-@defmethod[(clear-undos)
-           void?]{
-
-Destroys the undo history of the editor.
-
-}
-
-@defmethod[(copy [extend? any/c #f]
-                 [time exact-integer? 0])
-           void?]{
-
-Copies @techlink{item}s into the clipboard. If @racket[extend?] is not
- @racket[#f], the old clipboard contents are appended.
-
-The system may execute a copy (in response to other method calls)
- without calling this method. To extend or re-implement copying,
- override the @xmethod[text% do-copy] or @xmethod[pasteboard% do-copy]
- method of an editor.
-
-See @|timediscuss| for a discussion of the @racket[time] argument.  If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-
-}
-
-@defmethod[(copy-self)
-           (or/c (is-a?/c text%) (is-a?/c pasteboard%))]{
-
-Creates a new editor with the same properties as this one.  After an
- editor is created (either a @racket[text%] or @racket[pasteboard%]
- instance, as appropriate), the new editor is passed to
- @method[editor<%> copy-self-to].
-
-}
-
-
-@defmethod[(copy-self-to [dest (or/c (is-a?/c text%) (is-a?/c pasteboard%))])
-           void?]{
-
-Copies the properties of @this-obj[] to @racket[dest].
-
-Each snip in @this-obj[] is copied and inserted into @racket[dest].
-In addition, @this-obj[]'s filename, maximum undo history setting,
-keymap, interactive caret threshold, and overwrite-styles-on-load
-settings are installed into @racket[dest]. Finally, @this-obj[]'s
-style list is copied and the copy is installed as the style list for
-@racket[dest].
-
-}
-
-@defmethod[(cut [extend? any/c #f]
-                [time exact-integer? 0])
-           void?]{
-
-Copies and then deletes the currently selected @techlink{item}s. If
- @racket[extend?]  is not @racket[#f], the old clipboard contents are
- appended.
-
-The system may execute a cut (in response to other method calls)
- without calling this method. To extend or re-implement the copying
- portion of the cut, override the @xmethod[text% do-copy] or
- @xmethod[pasteboard% do-copy] method of an editor. To monitor
- deletions in an editor, override @xmethod[text% on-delete] or
- @xmethod[pasteboard% on-delete].
-
-See @|timediscuss| for a discussion of the @racket[time] argument.  If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-
-@defmethod[(dc-location-to-editor-location [x real?]
-                                           [y real?])
-           (values real? real?)]{
-
-Converts the given coordinates from top-level @techlink{display}
- coordinates (usually canvas coordinates) to editor
- @techlink{location} coordinates.  The same calculation is performed
- by @method[editor<%> global-to-local].
-
-@|OVD|
-
-See also @method[editor<%> editor-location-to-dc-location].
-
-}
-
-@defmethod[(default-style-name)
-           string?]{
-
-Returns the name of a style to be used for newly inserted text,
- etc. The default is @racket["Standard"].
-
-}
-
-
-@defmethod[(do-edit-operation [op (or/c 'undo 'redo 'clear 'cut 'copy 'paste 
-                                        'kill 'select-all 'insert-text-box 
-                                        'insert-pasteboard-box 'insert-image)]
-                              [recursive? any/c #t]
-                              [time exact-integer? 0])
-           void?]{
-
-Performs a generic edit command. The @racket[op] argument must be a
-valid edit command, one of:
-
-@itemize[
-@item{@racket['undo] --- undoes the last operation}
-@item{@racket['redo] --- undoes the last undo}
-@item{@racket['clear] --- deletes the current selection}
-@item{@racket['cut] --- cuts}
-@item{@racket['copy] --- copies}
-@item{@racket['paste] --- pastes}
-@item{@racket['kill] --- cuts to the end of the current line, or cuts a newline if there is only whitespace between the selection and end of line}
-@item{@racket['select-all] --- selects everything in the editor}
-@item{@racket['insert-text-box] --- inserts a text editor as an @techlink{item} in this editor; see also
-@method[editor<%> on-new-box] .}
-@item{@racket['insert-pasteboard-box] --- inserts a pasteboard editor as an @techlink{item} in this editor; see also
-@method[editor<%> on-new-box] .}
-@item{@racket['insert-image] --- gets a filename from the user and inserts the image as an @techlink{item} in this editor; see also
-@method[editor<%> on-new-image-snip] .}
-]
-
-If @racket[recursive?] is not @racket[#f], then the command is passed on to
- any active snips of this editor (i.e., snips which own the caret).
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-
-
-@defmethod[(editor-location-to-dc-location [x real?]
-                                           [y real?])
-           (values real? real?)]{
-
-Converts the given coordinates from editor @techlink{location}
- coordinates to top-level @techlink{display} coordinates (usually
- canvas coordinates).  The same calculation is performed by
- @method[editor<%> local-to-global].
-
-@|OVD|
-
-See also @method[editor<%> dc-location-to-editor-location].
-
-}
-
-@defmethod[(end-edit-sequence)
-           void?]{
-
-See @method[editor<%> begin-edit-sequence].
-
-}
-
-@defmethod[(end-write-header-footer-to-file [f (is-a?/c editor-stream-out%)]
-                                            [buffer-value exact-integer?])
-           void?]{
-
-This method must be called after writing any special header data to a
-stream. The @racket[buffer-value] argument must be the value put in
-the @racket[buffer] argument box by @method[editor<%>
-begin-write-header-footer-to-file].
-
-See @|filediscuss| and @method[editor<%> write-headers-to-file] for
-more information.
-
-}
-
-
-@defmethod[(find-first-snip)
-           (or/c (is-a?/c snip%) #f)]{
-
-Returns the first snip in the editor, or @racket[#f] if the editor is
- empty. To get all of the snips in the editor, use the @xmethod[snip%
- next] on the resulting snip.
-
-The first snip in a text editor is the one at @techlink{position}
- 0. The first snip in a pasteboard is the frontmost
- snip. (@|seesniporderdiscuss|)
-
-}
-
-@defmethod[(find-scroll-line [location real?])
-           exact-nonnegative-integer?]{
-
-Maps a vertical @techlink{location} within the editor to a vertical
- scroll position.
-
-For @racket[text%] objects: @|FCA| @|OVD|
-
-}
-
-@defmethod[(get-active-canvas)
-           (or/c (is-a?/c editor-canvas%) #f)]{
-
-If the editor is displayed in a canvas, this method returns the canvas
- that most recently had the keyboard focus (while the editor was
- displayed). If no such canvas exists, @racket[#f] is returned.
-
-}
-
-@defmethod[(get-admin)
-           (or/c (is-a?/c editor-admin%) #f)]{
-
-Returns the @racket[editor-admin%] object currently managing this
- editor or @racket[#f] if the editor is not displayed.
-
-}
-
-@defmethod[(get-canvas)
-           (or/c (is-a?/c editor-canvas%) #f)]{
-
-If @method[editor<%> get-active-canvas] returns a canvas, that canvas
- is also returned by this method. Otherwise, if @method[editor<%>
- get-canvases] returns a non-empty list, the first canvas in the list
- is returned, otherwise @racket[#f] is returned.
-
-}
-
-@defmethod[(get-canvases)
-           (listof (is-a?/c editor-canvas%))]{
-
-Returns a list of canvases displaying the editor. An editor may be
- displayed in multiple canvases and no other kind of @techlink{display}, or one
- instance of another kind of @techlink{display} and no canvases. If the editor is
- not displayed or the editor's current @techlink{display} is not a canvas,
- @racket[null] is returned.
-
-}
-
-@defmethod[(get-dc)
-           (or/c (is-a?/c dc<%>) #f)]{
-
-Typically used (indirectly) by snip objects belonging to the
- editor. Returns a destination drawing context which is suitable for
- determining display sizing information, or @racket[#f] if the editor
- is not displayed.
-
-}
-
-@defmethod[(get-descent)
-           (and/c real? (not/c negative?))]{
-
-Returns the font descent for the editor. This method is primarily used
- when an editor is an @techlink{item} within another editor.
-For a text editor, the reported descent includes the editor's
- bottom padding (see @method[text% set-padding]).
-
-@|OVD| @FCAME[]
-
-}
-
-@defmethod[(get-extent [w (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                       [h (or/c (box/c (and/c real? (not/c negative?))) #f)])
-           void?]{
-
-Gets the current extent of the editor's graphical representation.
-@boxisfillnull[@racket[w] @elem{the editor's width}]
-@boxisfillnull[@racket[h] @elem{the editor's height}]
-For a text editor, the reported extent includes the editor's
-padding (see @method[text% set-padding]).
-
-@|OVD|  @FCAME[]
-
-}
-
-@defmethod[(get-file [directory (or/c path? #f)])
-           (or/c path-string? #f)]{
-@methspec{
-
-Called when the user must be queried for a filename to load an
- editor. A starting-directory path is passed in, but is may be
- @racket[#f] to indicate that any directory is fine.
-
-Note that the @racket[directory] argument cannot be a string; it must
- be a path value or @racket[#f].
-
-}
-@methimpl{
-
-Calls the global @racket[get-file] procedure. 
-
-If the editor is displayed in a single canvas, then the canvas's
- top-level frame is used as the parent for the file dialog. Otherwise,
- the file dialog will have no parent.
-
-}}
-
-@defmethod[(get-filename [temp (or/c (box/c any/c) #f) #f])
-           (or/c path-string? #f)]{
-
-Returns the path name of the last file saved from or loaded into this
- editor, @racket[#f] if the editor has no filename.
-
-@boxisfill[@racket[temp] @elem{@racket[#t] if the filename is temporary or
-@racket[#f] otherwise}]
-
-}
-
-@defmethod[(get-flattened-text)
-           string?]{
-
-Returns the contents of the editor in text form. See @|textdiscuss| for
-a discussion of flattened vs. non-flattened text.
-
-}
-
-
-@defmethod[(get-focus-snip)
-           (or/c (is-a?/c snip%) #f)]{
-
-@index['("keyboard focus" "snips")]{Returns} the snip within the
- editor that gets the keyboard focus when the editor has the focus, or
- @racket[#f] if the editor does not delegate the focus.
-
-The returned snip might be an @racket[editor-snip%] object. In that
- case, the embedded editor might delegate the focus to one of its own
- snips. However, the @method[editor<%> get-focus-snip] method returns
- only the @racket[editor-snip%] object, because it is the focus-owning
- snip within the immediate editor.
-
-See also @method[editor<%> set-caret-owner].
-
-}
-
-
-@defmethod[(get-inactive-caret-threshold)
-           (or/c 'no-caret 'show-inactive-caret 'show-caret)]{
-
-Returns the threshold for painting an inactive selection. This
- threshold is compared with the @racket[draw-caret] argument to
- @method[editor<%> refresh] and if the argument is as least as large
- as the threshold (but larger than @indexed-racket['show-caret]), the
- selection is drawn as inactive.
-
-See also @method[editor<%> set-inactive-caret-threshold] and
- @|drawcaretdiscuss|.
-
-}
-
-
-@defmethod[(get-keymap)
-           (or/c (is-a?/c keymap%) #f)]{
-
-Returns the main keymap currently used by the editor.
-
-}
-
-
-@defmethod[(get-load-overwrites-styles)
-           boolean?]{
-
-Reports whether named styles in the current style list are replaced by
- @method[editor<%> load-file] when the loaded file contains style
- specifications.
-
-See also  @method[editor<%> set-load-overwrites-styles].
-
-}
-
-@defmethod[(get-max-height)
-           (or/c (and/c real? (not/c negative?)) 'none)]{
-
-Gets the maximum display height for the contents of the editor; zero or
- @racket['none] indicates that there is no maximum.
-
-}
-
-@defmethod[(get-max-undo-history)
-           (or/c (integer-in 0 100000) 'forever)]{
-
-Returns the maximum number of undoables that will be remembered by the
- editor. Note that undoables are counted by insertion, deletion,
- etc. events, not by the number of times that @method[editor<%> undo]
- can be called; a single @method[editor<%> undo] call often reverses
- multiple events at a time (such as when the user types a stream of
- characters at once).
-
-When an editor is in preserve-all-history mode (see @method[editor<%>
- set-undo-preserves-all-history]), then any non-@racket[0] value is
- treated the same as @racket['forever].
-
-}
-
-@defmethod[(get-max-view-size)
-           (values real? real?)]{
-
-Returns the maximum visible area into which the editor is currently
- being displayed, according to the editor's administrators. If the
- editor has only one @techlink{display}, the result is the same as for
- @method[editor<%> get-view-size]. Otherwise, the maximum width and
- height of all the editor's displaying canvases is returned.
-
-@|OVD|
-
-If the @techlink{display} is an editor canvas, see also
- @method[area-container<%> reflow-container].
-
-}
-
-@defmethod[(get-max-width)
-           (or/c (and/c real? (not/c negative?)) 'none)]{
-
-Gets the maximum display width for the contents of the editor; zero or
- @racket['none] indicates that there is no maximum. In a text editor,
- zero of @racket['none] disables automatic line breaking.
-
-}
-
-@defmethod[(get-min-height)
-           (or/c (and/c real? (not/c negative?)) 'none)]{
-
-Gets the minimum display height for the contents of the editor; zero
- or @racket['none] indicates that there is no minimum.
-
-}
-
-
-@defmethod[(get-min-width)
-           (or/c (and/c real? (not/c negative?)) 'none)]{
-
-Gets the minimum display width for the contents of the editor; zero or
- @racket['none] indicates that there is no minimum.
-
-}
-
-@defmethod[(get-paste-text-only)
-           boolean?]{
-
-If the result is @racket[#t], then the editor accepts only plain-text
- data from the clipboard. If the result is @racket[#f], the editor
- accepts both text and snip data from the clipboard.
-
-}
-
-@defmethod[(get-snip-data [thesnip (is-a?/c snip%)])
-           (or/c (is-a?/c editor-data%) #f)]{
-
-@methspec{
-
-Gets extra data associated with a snip (e.g., @techlink{location}
- information in a pasteboard) or returns @racket[#f] is there is no
- information. See @|editordatadiscuss| for more information.
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-
-@defmethod[(get-snip-location [thesnip (is-a?/c snip%)]
-                              [x (or/c (box/c real?) #f) #f]
-                              [y (or/c (box/c real?) #f) #f]
-                              [bottom-right? any/c #f])
-           boolean?]{
-
-Gets the @techlink{location} of the given snip. If the snip is found in
- the editor, @racket[#t] is returned; otherwise, @racket[#f] is returned.
-
-@boxisfillnull[@racket[x] @elem{the x-coordinate of the snip's @techlink{location}}]
-@boxisfillnull[@racket[y] @elem{the y-coordinate of the snip's @techlink{location}}]
-
-If @racket[bottom-right?] is not @racket[#f], the values in the
- @racket[x] and @racket[y] boxes are for the snip's bottom right
- corner instead of its top-left corner.
-
-Obtaining the @techlink{location} if the bottom-right corner may
- trigger delayed size calculations (including snips other than
- the one whose @techlink{location} was requested).
-
-@|OVD| As a special case, however, a @racket[pasteboard%] object
- always reports valid answers when @racket[bottom-right?] is @racket[#f].
- @FCAME[]
-
-}
-
-
-@defmethod[(get-space)
-           (and/c real? (not/c negative?))]{
-
-Returns the maximum font space for the editor. This method is
- primarily used when an editor is an @techlink{item} within another
- editor.
-For a text editor, the reported space includes the editor's
- top padding (see @method[text% set-padding]).
-
-@|OVD| @FCAME[]
-
-}
-
-@defmethod[(get-style-list)
-           (is-a?/c style-list%)]{
-
-Returns the style list currently in use by the editor.
-
-}
-
-
-@defmethod[(get-view-size [w (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                          [h (or/c (box/c (and/c real? (not/c negative?))) #f)])
-           void?]{
-
-Returns the visible area into which the editor is currently being
- displayed (according to the editor's administrator). See also
- @method[editor-admin% get-view] .
-
-@boxisfillnull[@racket[w] @elem{the visible area width}]
-@boxisfillnull[@racket[h] @elem{the visible area height}]
-
-@|OVD|
-
-If the @techlink{display} is an editor canvas, see also
-@method[area-container<%> reflow-container].
-
-}
-
-@defmethod[(global-to-local [x (or/c (box/c real?) #f)]
-                            [y (or/c (box/c real?) #f)])
-           void?]{
-
-Converts the given coordinates from top-level @techlink{display} coordinates
- (usually canvas coordinates) to editor @techlink{location} coordinates.  The
- same calculation is performed by
-@method[editor<%> dc-location-to-editor-location].
-
-@boxisfillnull[@racket[x] @elem{the translated x-coordinate of the value initially
-in @racket[x]}] 
-@boxisfillnull[@racket[y] @elem{the translated x-coordinate of the value initially
-in @racket[y]}]
-
-@|OVD|
-
-See also @method[editor<%> local-to-global].
-
-}
-
-@defmethod[#:mode public-final (in-edit-sequence?)
-           boolean?]{
-
-Returns @racket[#t] if updating on this editor is currently delayed
- because @method[editor<%> begin-edit-sequence] has been called for
- this editor.
-
-See also @method[editor<%> refresh-delayed?].
-
-}
-
-
-@defmethod[(insert [snip (is-a?/c snip%)])
-           void?]{
-
-Inserts data into the editor. A snip cannot be inserted into multiple
- editors or multiple times within a single editor.
-
-@|OnInsertNote|
-
-}
-
-
-@defmethod[(insert-box [type (or/c 'text 'pasteboard) 'text])
-           void?]{
-
-Inserts a box (a sub-editor) into the editor by calling
-@method[editor<%> on-new-box], then passing along @racket[type] and
-inserts the resulting snip into the editor.
-
-@|OnInsertNote|
-
-}
-
-
-@defmethod[(insert-file [filename path-string?]
-                        [format (or/c 'guess 'same 'copy 'standard
-                                      'text 'text-force-cr) 'guess]
-                        [show-errors? any/c #t])
-           boolean?]{
-
-Inserts the content of a file or port into the editor (at the current
- selection @techlink{position} in @racket[text%] editors).  The result
- is @racket[#t]; if an error occurs, an exception is raised.
-
-For information on @racket[format], see @method[editor<%> load-file].
-The @racket[show-errors?] argument is no longer used.
-
-@|OnInsertNote|
-
-}
-
-
-@defmethod[(insert-image [filename (or/c path-string? #f) #f]
-                         [type (or/c 'unknown 'unknown/mask 'unknown/alpha
-                                     'gif 'gif/mask 'gif/alpha 
-                                     'jpeg 'png 'png/mask 'png/alpha
-                                     'xbm 'xpm 'bmp 'pict)
-                               'unknown/alpha]
-                         [relative-path? any/c #f]
-                         [inline? any/c #t])
-           void?]{
-
-Inserts an image into the editor. 
-
-If @racket[filename] is @racket[#f], then the
-user is queried for a filename. The @racket[kind] must one of
-the symbols that can be passed to 
-@method[bitmap% load-file].
-
-After the filename has been determined, an image is created by
-calling
-@method[editor<%> on-new-image-snip]. See also
-@racket[image-snip%].
-
-@|OnInsertNote|
-
-}
-
-@defmethod[(insert-port [port input-port?]
-                        [format (or/c 'guess 'same 'copy 'standard
-                                      'text 'text-force-cr) 'guess]
-                        [replace-styles? any/c #t])
-           (or/c 'standard 'text 'text-force-cr)]{
-
-Inserts the content of a port into the editor (at the current
- selection @techlink{position} in @racket[text%] editors) without wrapping
- the insert operations as an edit sequence. The result is the actual
- format of the loaded content (which is different from the given
- format type if the given format is @racket['guess], @racket['same], or
- @racket['copy]).
-
-The @racket[port] must support position setting with @racket[file-position].
-
-For information on @racket[format], see
-@method[editor<%> load-file]. 
-
-if @racket[replace-styles?] is true, then styles in the current style
- list are replaced by style specifications in @racket[port]'s stream.
-
-See also @method[editor<%> insert-file].
-}
-
-@defmethod[(invalidate-bitmap-cache [x real? 0.0]
-                                    [y real? 0.0]
-                                    [width (or/c (and/c real? (not/c negative?)) 'end 'display-end) 'end]
-                                    [height (or/c (and/c real? (not/c negative?)) 'end 'display-end) 'end])
-           void?]{
-
-When @method[editor<%> on-paint] is overridden, call this method when
- the state of @method[editor<%> on-paint]'s drawing changes.
-
-The @racket[x], @racket[y], @racket[width], and @racket[height]
- arguments specify the area that needs repainting in editor
- coordinates. If @racket[width]/@racket[height] is @racket['end], then
- the total height/width of the editor (as reported by
- @method[editor<%> get-extent]) is used. Note that the editor's size
- can be smaller than the visible region of its @techlink{display}.  If
- @racket[width]/@racket[height] is @racket['display-end], then the
- largest height/width of the editor's views (as reported by
- @method[editor-admin% get-max-view]) is used. If
- @racket[width]/@racket[height] is not @racket['display-end], then
- the given @racket[width]/@racket[height] is constrained to the
- editor's size.
-
-The default implementation triggers a redraw of the editor, either
- immediately or at the end of the current edit sequence (if any)
- started by @method[editor<%> begin-edit-sequence].
-
-See also @method[editor<%> size-cache-invalid].}
-
-
-@defmethod[(is-locked?)
-           boolean?]{
-
-Returns @racket[#t] if the editor is currently locked, @racket[#f]
- otherwise. See @method[editor<%> lock] for more information.
-
-}
-
-
-@defmethod[(is-modified?)
-           boolean?]{
-
-Returns @racket[#t] if the editor has been modified since the last
- save or load (or the last call to @method[editor<%> set-modified]
- with @racket[#f]), @racket[#f] otherwise.
-
-}
-
-
-@defmethod[(is-printing?)
-           boolean?]{
-
-Returns @racket[#t] if the editor is currently being printed through
-the @method[editor<%> print] method, @racket[#f] otherwise.}
-
-
-@defmethod[(kill [time exact-integer? 0])
-           void?]{
-
-In a text editor, cuts to the end of the current line, or cuts a
- newline if there is only whitespace between the selection and end of
- line.  Multiple consecutive kills are appended.  In a pasteboard
- editor, cuts the current selection.
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-See also @method[editor<%> cut].
-
-@|OnDeleteNote|
-
-}
-
-
-@defmethod[(load-file [filename (or/c path-string? #f) #f]
-                      [format (or/c 'guess 'same 'copy 'standard
-                                    'text 'text-force-cr) 'guess]
-                      [show-errors? any/c #t])
-           boolean?]{
-
-
-Loads a file into the editor and returns @racket[#t]. If an error
- occurs, an exception is raised.
-
-If @racket[filename] is @racket[#f], then the
-internally stored filename will be used; if @racket[filename] is @racket[""] or
-if the internal name is unset or temporary, then the user will be
-prompted for a name.  
-
-The possible values for @racket[format] are listed below. A single set of
-@racket[format] values are used for loading and saving files:
-
-@itemize[
-
-@item{@racket['guess] --- guess the format based on
-extension and/or contents; when saving a file, this is the same as
-@racket['standard]}
-
-@item{@racket['same] --- read in whatever format was last loaded or saved}
-
-@item{@racket['standard] --- read/write a standard file (binary format)}
-
-@item{@racket['copy] --- write using whatever format was last loaded
- or saved, but do not change the modification flag or remember
- @racket[filename] (saving only)}
-
-@item{@racket['text] --- read/write a text file (@racket[text%] only);
- file writing uses the platform's text-mode conventions
- (e.g., newlines as return--linefeed combinations on Windows) when
- not specifically disabled via @method[editor<%> use-file-text-mode]}
-
-@item{@racket['text-force-cr] --- read/write a text file
-(@racket[text%] only); when writing, change automatic newlines (from
-word-wrapping) into real carriage returns}
-
-]
-
-In a @racket[text%] instance, the format returned from @method[text%
- get-file-format] is always one of @racket['standard], @racket['text],
- or @racket['text-force-cr].
-
-The @racket[show-errors?] argument is no longer used.
-
-The filename used to load the file can be retrieved with
- @method[editor<%> get-filename]. For a @racket[text%] instance, the
- format can be retrieved with @method[text% get-file-format]. However,
- if an error occurs while loading the file, the filename is set to
- @racket[#f].
-
-See also @method[editor<%> on-load-file], @method[editor<%>
- after-load-file], @method[editor<%> can-load-file?], and
- @method[editor<%> set-load-overwrites-styles].
-
-}
-
-@defmethod[(local-to-global [x (or/c (box/c real?) #f)]
-                            [y (or/c (box/c real?) #f)])
-           void?]{
-
-Converts the given coordinates from editor @techlink{location}
- coordinates to top-level @techlink{display} coordinates (usually
- canvas coordinates).  The same calculation is performed by
- @method[editor<%> editor-location-to-dc-location].
-
-@boxisfillnull[@racket[x] @elem{the translated x-coordinate of the value initially
-in @racket[x]}] 
-@boxisfillnull[@racket[y] @elem{the translated x-coordinate of the value initially
-in @racket[y]}]
-
-@|OVD|
-
-See also @method[editor<%> global-to-local].
-
-}
-
-
-@defmethod[(locations-computed?)
-           boolean?]{
-
-Returns @racket[#t] if all @techlink{location} information has been
- computed after recent changes to the editor's content or to its
- snips, @racket[#f] otherwise.
-
-Location information is often computed on demand, and
- @method[editor<%> begin-edit-sequence] tends to delay the
- computation.
-
-When the editor is locked for reflowing, location information cannot
- be recomputed. See also @|lockdiscuss|.
-
-}
-
-
-@defmethod[(lock [lock? any/c])
-           void?]{
-
-Locks or unlocks the editor for modifications. If an editor is locked,
- @italic{all} modifications are blocked, not just user modifications.
-
-See also @method[editor<%> is-locked?].
-
-This method does not affect internal locks, as discussed in
- @|lockdiscuss|.
-
-}
-
-@defmethod[#:mode public-final (locked-for-flow?) boolean?]{
-
-Reports whether the editor is internally locked for flowing. See
- @|lockdiscuss| for more information.
-
-}
-
-
-@defmethod[#:mode public-final (locked-for-read?)
-           boolean?]{
-
-Reports whether the editor is internally locked for reading. See
- @|lockdiscuss| for more information.
-
-}
-
-
-@defmethod[#:mode public-final (locked-for-write?)
-           boolean?]{
-
-Reports whether the editor is internally locked for writing. See
- @|lockdiscuss| for more information.
-
-}
-
-
-@defmethod[(needs-update [snip (is-a?/c snip%)]
-                         [localx real?]
-                         [localy real?]
-                         [w (and/c real? (not/c negative?))]
-                         [h (and/c real? (not/c negative?))])
-           void?]{
-
-Typically called (indirectly) by a snip within the editor to force the
-editor to be redrawn.
-
-The @racket[localx], @racket[localy], @racket[width], and @racket[height]
- arguments specify the area that needs repainting in the coordinate
- system of @racket[snip].
-
-@FCAME[]
-
-}
-
-
-@defmethod[(num-scroll-lines)
-           exact-nonnegative-integer?]{
-
-Reports the number of scroll positions available within the editor.
-
-For @racket[text%] objects: @|FCA| @|EVD|
-
-}
-
-
-@defmethod[#:mode pubment 
-           (on-change)
-           void?]{
-
-@methspec{
-
-Called whenever any change is made to the editor that affects the way
- the editor is drawn or the values reported for the
- @techlink{location}/size of some snip in the editor. The
- @method[editor<%> on-change] method is called just before the editor
- calls its administrator's @method[editor-admin% needs-update] method
- to refresh the editor's @techlink{display}, and it is also called
- just before and after printing an editor.
-
-The editor is locked for writing and reflowing during the call to
-@method[editor<%> on-change].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(on-char [event (is-a?/c key-event%)])
-           void?]{
-@methspec{
-
-Handles keyboard input to the editor.
-
-Consider overriding @method[editor<%> on-local-char] or
-@method[editor<%> on-default-char] instead of this method.
-
-}
-@methimpl{
-
-Either passes this event on to a caret-owning snip or calls
- @method[editor<%> on-local-char]. In the latter case, @racket[text%]
- first calls @racket[hide-cursor-until-moved].
-
-}}
-
-@defmethod[(on-default-char [event (is-a?/c key-event%)])
-           void?]{
-@methspec{
-
-Called by @method[editor<%> on-local-char] when the event is
- @italic{not} handled by a caret-owning snip or by the keymap.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(on-default-event [event (is-a?/c mouse-event%)])
-           void?]{
-
-@methspec{
-
-Called by @method[editor<%> on-local-event] when the event is
- @italic{not} handled by a caret-owning snip or by the keymap.
-
-}
-@methimpl{
-
-Does nothing. See also @xmethod[text% on-default-event] and
- @xmethod[pasteboard% on-default-event].
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (on-display-size)
-           void?]{
-
-@methspec{
-
-This method is called by the editor's @techlink{display} whenever the
- display's size (as reported by @method[editor<%> get-view-size])
- changes, but it is called indirectly through @method[editor<%>
- on-display-size-when-ready].
-
-}
-@methimpl{
-
-If automatic wrapping is enabled (see @method[editor<%> auto-wrap] )
- then @method[editor<%> set-max-width] is called with the maximum
- width of all of the editor's canvases (according to the
- administrators; @xmethod[editor-canvas% call-as-primary-owner] is
- used with each canvas to set the administrator and get the view
- size). If the editor is displayed but not in a canvas, the unique
- width is obtained from the editor's administrator (there is only
- one). If the editor is not displayed, the editor's maximum width is
- not changed.
-
-}}
-
-
-@defmethod[(on-display-size-when-ready)
-           void?]{
-
-Calls @method[editor<%> on-display-size] unless the editor is
- currently in an edit sequence or currently being refreshed. In the
- latter cases, the call to @method[editor<%> on-display-size] is
- delegated to another thread; see @secref["editorthreads"] for more
- information.
-
-}
-
-
-@defmethod[#:mode pubment 
-           (on-edit-sequence)
-           void?]{
-
-@methspec{
-
-Called just after a top-level (i.e., unnested) edit sequence starts.
-
-During an edit sequence, all callbacks methods are invoked normally,
- but it may be appropriate for these callbacks to delay computation
- during an edit sequence. The callbacks must manage this delay
- manually. Thus, when overriding other callback methods, such as
- @xmethod[text% on-insert], @xmethod[pasteboard% on-insert],
- @xmethod[text% after-insert], or @xmethod[pasteboard% after-insert],
- consider overriding @method[editor<%> on-edit-sequence] and
- @method[editor<%> after-edit-sequence] as well.
-
-``Top-level edit sequence'' refers to an outermost pair of
- @method[editor<%> begin-edit-sequence] and @method[editor<%>
- end-edit-sequence] calls. The embedding of an editor within another
- editor does not affect the timing of calls to @method[editor<%>
- on-edit-sequence], even if the embedding editor is in an edit
- sequence.
-
-Pairings of @method[editor<%> on-edit-sequence] and @method[editor<%>
- after-edit-sequence] can be nested if an @method[editor<%>
- after-edit-sequence] starts a new edit sequence, since
- @method[editor<%> after-edit-sequence] is called after an edit
- sequence ends. However, @method[editor<%> on-edit-sequence] can never
- start a new top-level edit sequence (except through an unpaired
- @method[editor<%> end-edit-sequence]), because it is called after a
- top-level edit sequence starts.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(on-event [event (is-a?/c mouse-event%)])
-           void?]{
-
-@methspec{
-
-Handles mouse input to the editor.  The event's x and y coordinates
- are in the @techlink{display}'s co-ordinate system; use the
- administrator's @method[editor-admin% get-dc] method to obtain
- translation arguments (or use @method[editor<%>
- dc-location-to-editor-location]).
-
-Consider overriding @method[editor<%> on-local-event] or
- @method[editor<%> on-default-event] instead of this method.
-
-}
-@methimpl{
-
-Either passes this event on to a caret-owning snip, selects a new
- caret-owning snip (@racket[text%] only) and passes the event on to
- the selected snip, or calls @method[editor<%> on-local-event]. A new
- caret-owning snip is selected in a @racket[text%] object when the
- click is on an event-handling snip, and not too close to the space
- between snips (see @method[text% get-between-threshold] ).
-
-}}
-
-
-@defmethod[(on-focus [on? any/c])
-           void?]{
-
-@index['("keyboard focus" "notification")]{Called} when the keyboard
- focus changes into or out of this editor (and not to/from a snip
- within the editor) with @racket[#t] if the focus is being turned on,
- @racket[#f] otherwise.
-
-}
-
-
-@defmethod[#:mode pubment 
-           (on-load-file [filename path?]
-                         [format (or/c 'guess 'same 'copy 'standard
-                                       'text 'text-force-cr)])
-           void?]{
-@methspec{
-
-Called just before the editor is loaded from a file, after calling
- @method[editor<%> can-load-file?] to verify that the load is
- allowed. See also @method[editor<%> after-load-file].
-
-The @racket[filename] argument is the name the file will be loaded
- from. See @method[editor<%> load-file] for information about
- @racket[format].
-
-Note that the @racket[filename] argument cannot be a string; it must
- be a path value.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(on-local-char [event (is-a?/c key-event%)])
-           void?]{
-@methspec{
-
-Called by @method[editor<%> on-char] when the event is @italic{not}
- handled by a caret-owning snip.
-
-Consider overriding @method[editor<%> on-default-char] instead of this
- method.
-
-}
-@methimpl{
-
-Either lets the keymap handle the event or calls @method[editor<%>
- on-default-char].
-
-}}
-
-
-@defmethod[(on-local-event [event (is-a?/c mouse-event%)])
-           void?]{
-@methspec{
-
-Called by @method[editor<%> on-event] when the event is @italic{not}
- handled by a caret-owning snip.
-
-Consider overriding @method[editor<%> on-default-event] instead of
- this method.
-
-}
-@methimpl{
-
-Either lets the keymap handle the event or calls 
- @method[editor<%> on-default-event].
-
-}}
-
-
-@defmethod[(on-new-box [type (or/c 'text 'pasteboard)])
-           (is-a?/c snip%)]{
-@methspec{
-
-Creates and returns a new snip for an embedded editor. This method is
- called by @method[editor<%> insert-box].
-
-}
-@methimpl{
-
-Creates a @racket[editor-snip%] with either a sub-editor from
- @racket[text%] or sub-pasteboard from @racket[pasteboard%], depending
- on whether @racket[type] is @racket['text] or
- @racket['pasteboard]. The keymap (see @racket[keymap%]) and style
- list (see @racket[style-list%]) for of the new sub-editor are set to
- the keymap and style list of this editor.
-
-}}
-
-
-@defmethod[(on-new-image-snip [filename path?]
-                              [kind (or/c 'unknown 'unknown/mask 'unknown/alpha
-                                          'gif 'gif/mask 'gif/alpha 
-                                          'jpeg 'png 'png/mask 'png/alpha
-                                          'xbm 'xpm 'bmp 'pict)]
-                              [relative-path? any/c]
-                              [inline? any/c])
-           (is-a?/c image-snip%)]{
-@methspec{
-
-Creates and returns a new instance of @racket[image-snip%] for
- @method[editor<%> insert-image].
-
-Note that the @racket[filename] argument cannot be a string; it must be a 
- path value.
-
-}
-@methimpl{
-
-Returns @racket[(make-object image-snip% filename kind relative-path? inline?)].
-
-}}
-
-
-@defmethod[(on-paint [before? any/c]
-                     [dc (is-a?/c dc<%>)]
-                     [left real?]
-                     [top real?]
-                     [right real?]
-                     [bottom real?]
-                     [dx real?]
-                     [dy real?]
-                     [draw-caret (or/c 'no-caret 'show-inactive-caret 'show-caret
-                                       (cons/c exact-nonnegative-integer?
-                                               exact-nonnegative-integer?))])
-           void?]{
-@methspec{
-
-Provides a way to add arbitrary graphics to an editor's @techlink{display}.  This
- method is called just before and just after every painting of the
- editor.
-
-The @racket[before?] argument is @racket[#t] when the method is called just
- before painting the contents of the editor or @racket[#f] when it is
- called after painting. The @racket[left], @racket[top], @racket[right], and
- @racket[bottom] arguments specify which region of the editor is being
- repainted, in editor coordinates. To get the coordinates for
- @racket[dc], offset editor coordinates by adding (@racket[dx], @racket[dy]).
- See @|drawcaretdiscuss| for information about @racket[draw-caret].
-
-The @method[editor<%> on-paint] method, together with the snips'
- @method[snip% draw] methods, must be able to draw the entire state of
- an editor.  Never paint directly into an editor's @techlink{display}
- canvas except from within @method[editor<%> on-paint] or
- @method[snip% draw]. Instead, put all extra drawing code within
- @method[editor<%> on-paint] and call @method[editor<%>
- invalidate-bitmap-cache] when part of the @techlink{display} needs to
- be repainted.
-
-If an @method[editor<%> on-paint] method uses cached
- @techlink{location} information, then the cached information should
- be recomputed in response to a call of @method[editor<%>
- invalidate-bitmap-cache].
-
-The @method[editor<%> on-paint] method must not make any assumptions
- about the state of the drawing context (e.g., the current pen),
- except that the clipping region is already set to something
- appropriate. Before @method[editor<%> on-paint] returns, it must
- restore any drawing context settings that it changes.
-
-The editor is internally locked for writing and reflowing during a
- call to this method (see also @|lockdiscuss|). The @method[editor<%>
- on-paint] method is called during a refresh; see
- @secref["editorthreads"].
-
-See also @method[editor<%> invalidate-bitmap-cache].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[#:mode pubment 
-           (on-save-file [filename path?]
-                         [format (or/c 'guess 'same 'copy 'standard
-                                       'text 'text-force-cr)])
-           void?]{
-@methspec{
-
-Called just before the editor is saved to a file, after calling
-@method[editor<%> can-save-file?] to verify that the save is
-allowed. See also @method[editor<%> after-save-file].
-
-The @racket[filename] argument is the name the file will be saved
-to. See @method[editor<%> load-file] for information about
-@racket[format].
-
-Note that the @racket[filename] argument cannot be a string; it must
- be a path value.
-
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (on-snip-modified [snip (is-a?/c snip%)]
-                             [modified? any/c])
-           void?]{
-@methspec{
-
-This method is called whenever a snip within the editor reports that
- it has been modified (by calling its adminstrator's
- @method[snip-admin% modified] method). The method arguments are the
- snip that reported a modification-state change, and the snip's new
- modification state.
-
-See also @method[editor<%> set-modified].
-
-}
-@methimpl{
-
-If @racket[modified?] is true and the editor was not already modified
- (i.e., its @method[editor<%> is-modified?]  method reports
- @racket[#f]), then the @method[editor<%> set-modified] method is
- called with @racket[#t]. If the editor was already modified, then the
- internal modify-counter is incremented.
-
-If @racket[modified?] is @racket[#f], and if the modify-counter is
- @racket[1], then the @method[editor<%> set-modified] method is called
- with @racket[#f] (on the assumption that the modify-counter was set
- to @racket[1] by an earlier call to this method for the same snip).
-
-}}
-
-@defmethod[(own-caret [own? any/c])
-           void?]{
-@methspec{
-
-Tells the editor to display or not display the caret or selection.
-
-@MonitorMethod[@elem{The focus state of an editor} @elem{by the system} @elem{@method[editor<%> on-focus]} @elem{focus}]
-
-}
-@methimpl{
-
-Propagates the flag to any snip with the editor-local focus. If no
- sub-editors are active, the editor assumes the caret ownership.
-
-}}
-
-
-@defmethod[(paste [time exact-integer? 0])
-           void?]{
-
-Pastes the current contents of the clipboard into the editor.
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-The system may execute a paste (in response to other method calls)
- without calling this method. To extend or re-implement copying,
- override the @xmethod[text% do-paste] or @xmethod[pasteboard%
- do-paste] method.
-
-See also @method[editor<%> get-paste-text-only].
-
-}
-
-
-@defmethod[(paste-x-selection [time exact-integer? 0])
-           void?]{
-
-Like @method[editor<%> paste], but on Unix, uses the X11 selection
-instead of the clipboard.
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-To extend or re-implement copying, override the @xmethod[text%
- do-paste-x-selection] or @xmethod[pasteboard% do-paste-x-selection]
- method.
-
-}
-
-
-@defmethod[(print [interactive? any/c #t]
-                  [fit-on-page? any/c #t]
-                  [output-mode (or/c 'standard 'postscript 'pdf) 'standard]
-                  [parent (or/c (or/c (is-a?/c frame%) (is-a?/c dialog%)) #f) #f]
-                  [force-ps-page-bbox? any/c #t]
-                  [as-eps? any/c #f])
-           void?]{
-
-Prints the editor. 
-
-If @racket[interactive?] is true and a PostScript file is created, the
- is given a dialog for adjusting printing parameters; see also
- @racket[get-ps-setup-from-user]. Otherwise, if a PostScript file is
- created, the settings returned by @racket[current-ps-setup] are
- used. (The user may still get a dialog to select an output file name;
- see @racket[post-script-dc%] for more details.)
-
-If @racket[fit-on-page?] is a true value, then during printing for a
- @racket[text%] editor, the editor's maximum width is set to the width
- of the page (less margins) and the autowrapping bitmap is removed.
-
-The @racket[output-mode] setting
- determines whether the output is generated directly as a PostScript
- file, generated directly as a PDF file, or generated
- using the platform-specific standard printing mechanism. The possible
- values are
-
-@itemize[
-
- @item{@racket['standard] --- print using the platform-standard
- mechanism (via a @racket[printer-dc%])}
-
- @item{@racket['postscript] --- print to a PostScript file (via a
- @racket[post-script-dc%])}
-
- @item{@racket['pdf] --- print to a PDF file (via a
- @racket[pdf-dc%])}
-
-]
-
-If @racket[parent] is not @racket[#f], it is used as the parent window
- for configuration dialogs (for either PostScript or platform-standard
- printing). If @racket[parent] is @racket[#f] and if the editor is
- displayed in a single canvas, then the canvas's top-level frame is
- used as the parent for configuration dialogs. Otherwise,
- configuration dialogs will have no parent.
-
-The @racket[force-ps-page-bbox?] argument is used for PostScript
- and PDF printing, and is used as the third initialization argument when
- creating the @racket[post-script-dc%] or @racket[pdf-dc%] instance. Unless it is
- @racket[#f], the bounding-box of the resulting PostScript/PDF file is set
- to the current paper size.
-
-The @racket[as-eps?] argument is used for PostScript and PDF printing, and is
- used as the fourth initialization argument when creating the
- @racket[post-script-dc%] or @racket[pdf-dc%] instance. Unless it is @racket[#f], a
- resulting PostScript file is identified as Encapsulated PostScript
- (EPS).
-
-The printing margins are determined by @method[ps-setup%
- get-editor-margin] in the current @racket[ps-setup%] object (as
- determined by @racket[current-ps-setup]), but they are ignored when
- @racket[as-eps?] is true.
-
-}
-
-
-@defmethod[(print-to-dc [dc (is-a?/c dc<%>)]
-                        [page-number exact-integer? -1])
-           void?]{
-
-Prints the editor into the given drawing context. See also
- @method[editor<%> print].
-
-If @racket[page-number] is a positive integer, then just the
-indicated page is printed, where pages are numbered from
-@racket[1]. If @racket[page-number] is @racket[0], then the
-entire content of the editor is printed on a single page.
-When @racket[page-number] is negative, then the editor content is
-split across pages as needed to fit, and the
-@method[dc<%> start-page] and @method[dc<%> end-page] methods of @racket[dc<%>] are
-called for each page.
-
-}
-
-
-@defmethod[(put-file [directory (or/c path? #f)]
-                     [default-name (or/c path? #f)])
-           (or/c path-string? #f)]{
-@methspec{
-
-Called when the user must be queried for a filename to save an
- editor. Starting-directory and default-name paths are passed in,
- but either may be @racket[#f] to indicate that any directory is fine or
- there is no default name.
-
-Note that the @racket[directory] and @racket[filename] arguments
- cannot be strings; each must be a path value.
-
-}
-@methimpl{
-
-Calls the global @racket[put-file] procedure.
-
-If the editor is displayed in a single canvas, then the canvas's
- top-level frame is used as the parent for the file dialog. Otherwise,
- the file dialog will have no parent.
-
-}}
-
-
-@defmethod[(read-footer-from-file [stream (is-a?/c editor-stream-in%)]
-                                  [name string?])
-           boolean?]{
-
-See @method[editor<%> read-header-from-file].
-
-}
-
-
-@defmethod[(read-from-file [stream (is-a?/c editor-stream-in%)]
-                           [overwrite-styles? any/c #f])
-           boolean?]{
-
-Reads new contents for the editor from a stream. The return value is
- @racket[#t] if there are no errors, @racket[#f] otherwise. See also
- @|filediscuss|.
-
-The stream provides either new mappings for names in the editor's
- style list, or it indicates that the editor should share a
- previously-read style list (depending on how style lists were shared
- when the editor was written to the stream; see also @method[editor<%>
- write-to-file]).
-
-@itemize[
-
- @item{In the former case, if the @racket[overwrite-styles?] argument
- is @racket[#f], then each style name in the loaded file that is already
- in the current style list keeps its current style. Otherwise,
- existing named styles are overwritten with specifications from the
- loaded file.}
-
- @item{In the latter case, the editor's style list will be changed to
- the previously-read list.}
-
-]
-}
-
-
-@defmethod[(read-header-from-file [stream (is-a?/c editor-stream-in%)]
-                                  [name string?])
-           boolean?]{
-
-Called to handle a named header that is found when reading editor data
- from a stream. The return value is @racket[#t] if there are no errors,
- @racket[#f] otherwise.
-
-Override this method only to embellish the file format with new header
- information. Always call the inherited method if the derived reader
- does not recognize the header.
-
-See also @|filediscuss|.
-}
-
-
-@defmethod[(redo)
-           void?]{
-
-Undoes the last undo, if no other changes have been made since. See
- @method[editor<%> undo] for information about Emacs-style undo.  If
- the editor is currently performing an undo or redo, the method call
- is ignored.
-
-The system may perform a redo without calling this method in response
- to other method calls. Use methods such as
- @method[editor<%> on-change] to monitor editor content changes.
-
-See also @method[editor<%> add-undo].
-
-}
-
-
-@defmethod[(refresh [x real?]
-                    [y real?]
-                    [width (and/c real? (not/c negative?))]
-                    [height (and/c real? (not/c negative?))]
-                    [draw-caret (or/c 'no-caret 'show-inactive-caret 'show-caret
-                                      (cons/c exact-nonnegative-integer?
-                                              exact-nonnegative-integer?))]
-                    [background (or/c (is-a?/c color%) #f)])
-           void?]{
-
-Repaints a region of the editor, generally called by an editor
- administrator. The @racket[x], @racket[y], @racket[width], and
- @racket[height] arguments specify the area that needs repainting in
- editor coordinates. The @method[editor-admin% get-dc] method of the
- editor's administrator (as returned by @method[editor<%> get-admin])
- supplies the target @racket[dc<%>] object and offset for drawing.
-
-See @|drawcaretdiscuss| for information about @racket[draw-caret].
-
-The @racket[background] color corresponds to the background of the
- @techlink{display}; if it is @racket[#f], then the display is transparent.
- An editor should use the given background color as its own
- background (or not paint the background of @racket[background] is
- @racket[#f]).
-
-See @secref["editorthreads"] for information about edit sequences and
- refresh requests.
-
-}
-
-
-@defmethod[(refresh-delayed?)
-           boolean?]{
-
-Returns @racket[#t] if updating on this editor is currently
- delayed. Updating may be delayed because @method[editor<%>
- begin-edit-sequence] has been called for this editor, or because the
- editor has no administrator, or because the editor's administrator
- returns @racket[#t] from its @method[editor-admin% refresh-delayed?]
- method. (The administrator might return @racket[#t] because an
- enclosing editor's refresh is delayed.)
-
-See also @method[editor<%> in-edit-sequence?].
-
-}
-
-
-@defmethod[(release-snip [snip (is-a?/c snip%)])
-           boolean?]{
-
-Requests that the specified snip be deleted and released from the
- editor. If this editor is not the snip's owner or if the snip cannot
- be released, then @racket[#f] is returned. Otherwise, @racket[#t] is
- returned and the snip is no longer owned.
-
-See also @xmethod[snip-admin% release-snip] .
-
-}
-
-
-@defmethod[(remove-canvas [canvas (is-a?/c editor-canvas%)])
-           void?]{
-
-Removes a canvas from this editor's list of displaying canvases. (See
- @method[editor<%> get-canvases].)
-
-Normally, this method is called only by @xmethod[editor-canvas%
- set-editor].
-
-}
-
-
-@defmethod[(resized [snip (is-a?/c snip%)]
-                    [redraw-now? any/c])
-           void?]{
-
-Called (indirectly) by snips within the editor: it forces a
- recalculation of the display information in which the specified snip
- has changed its size.
-
-If @racket[redraw-now?] is @racket[#f], the editor will require
- another message to repaint itself. (See also @method[editor<%>
- needs-update].)
-
-}
-
-
-@defmethod[(save-file [filename (or/c path-string? #f) #f]
-                      [format (or/c 'guess 'same 'copy 'standard
-                                    'text 'text-force-cr) 'same]
-                      [show-errors? any/c #t])
-           boolean?]{
-
-Saves the editor into a file and returns @racket[#t].  If an error
- occurs, an exception is raised.
-
-If @racket[filename] is @racket[#f], then the internally stored filename
- will be used; if @racket[filename] is @racket[""] or if the internal name
- is unset or temporary, then the user will be prompted for a name.
- The possible values for @racket[format] are described at
-@method[editor<%> load-file].
-
-The filename and format used to save the file can be retrieved with
- @method[editor<%> get-filename] unless the @racket[format] is
- @racket['copy] -- see also @method[editor<%> load-file] for more information
- on the @racket[format] argument.
- 
- In a @racket[text%] instance, the format can be retrieved 
- with @method[text% get-file-format].
-
-See also @method[editor<%> on-save-file], @method[editor<%>
- after-save-file], and @method[editor<%> can-save-file?].
-
-On Mac OS X, the file's type signature is set to @racket["TEXT"]
- for a text-format file or @racket["WXME"] for a standard-format
- (binary) file.
-
-The @racket[show-errors?] argument is no longer used.
-
-}
-
-
-@defmethod[(save-port [port output-port?]
-                      [format (or/c 'guess 'same 'copy 'standard
-                                    'text 'text-force-cr) 'same]
-                      [show-errors? any/c #t])
-           boolean?]{
-
-Saves the editor into a port and returns @racket[#t].  If an error
- occurs, an exception is raised.
-
-The possible values for @racket[format] are described at
-@method[editor<%> load-file]. 
-
-The @racket[show-errors?] argument is no longer used.
-
-}
-
-
-@defmethod[(scroll-editor-to [localx real?]
-                             [localy real?]
-                             [width (and/c real? (not/c negative?))]
-                             [height (and/c real? (not/c negative?))]
-                             [refresh? any/c]
-                             [bias (or/c 'start 'end 'none)])
-           boolean?]{
-
-Causes the editor to be scrolled so that a given @techlink{location}
- is visible. If the editor is scrolled, @racket[#t] is returned,
- otherwise @racket[#f] is returned.
-
-This method is normally called indirectly by @method[editor<%>
- scroll-to] or @xmethod[text% scroll-to-position] to implement
- scrolling.
-
-The default implementation forwards the request to the
-@method[editor-admin% scroll-to] method of the current administrator,
-if any (see @method[editor<%> get-admin]). If a text editor has
-padding (see @method[text% set-padding]), then the padding is added to
-the given @techlink{location} before forwarding to the
-administrator. If the editor has no administrator, @racket[#f] is
-returned.
-
-}
-
-
-@defmethod[(scroll-line-location [pos exact-nonnegative-integer?])
-           (and/c real? (not/c negative?))]{
-
-Maps a vertical scroll position to a vertical @techlink{location}
- within the editor.
-
-For @racket[text%] objects: @|FCA| @|EVD|
-
-}
-
-
-@defmethod[(scroll-to [snip (is-a?/c snip%)]
-                      [localx real?]
-                      [localy real?]
-                      [width (and/c real? (not/c negative?))]
-                      [height (and/c real? (not/c negative?))]
-                      [refresh? any/c]
-                      [bias (or/c 'start 'end 'none) 'none])
-           boolean?]{
-
-Called (indirectly) by snips within the editor: it causes the editor
- to be scrolled so that a given @techlink{location} range within a
- given snip is visible. If the editor is scrolled immediately,
- @racket[#t] is returned, otherwise @racket[#f] is returned.
-
-If refreshing is delayed (see @method[editor<%> refresh-delayed?]),
- then the scroll request is saved until the delay has ended. The
- scroll is performed (immediately or later) by calling
- @method[editor<%> scroll-editor-to].
-
-The @racket[localx], @racket[localy], @racket[width], and @racket[height]
- arguments specify the area that needs to be visible in @racket[snip]'s
- coordinate system.
-
-When the specified region cannot fit in the visible area, @racket[bias]
- indicates which end of the region to display. When @racket[bias] is
- @racket['start], then the top-left of the region is
- displayed. When @racket[bias] is @racket['end], then the
- bottom-right of the region is displayed. Otherwise, @racket[bias] must
- be @racket['none].
-
-}
-
-
-@defmethod[(select-all)
-           void?]{
-
-Selects all data in the editor
-
-}
-
-@defmethod[(set-active-canvas [canvas (is-a?/c editor-canvas%)])
-           void?]{
-
-Sets the active canvas for this editor. (See @method[editor<%>
- get-active-canvas].)
-
-Normally, this method is called only by @xmethod[editor-canvas%
- on-focus] in an editor canvas that is displaying an editor.
-
-}
-
-@defmethod[(set-admin [admin (or/c (is-a?/c editor-admin%) #f)])
-           void?]{
-
-Sets the editor's administrator. This method is only called by an
- administrator.
-
-@Unmonitored[@elem{The administrator of an editor} @elem{by the
-system} @elem{the administrator changes} @elem{@method[editor<%>
-get-admin]}]
-
-}
-
-
-@defmethod[(set-caret-owner [snip (or/c (is-a?/c snip%) #f)]
-                            [domain (or/c 'immediate 'display 'global) 'immediate])
-           void?]{
-
-Attempts to give the keyboard focus to @racket[snip].  If @racket[snip] is
- @racket[#f], then the caret is taken away from any snip in the editor
- that currently has the caret and restored to this editor.
-
-If the keyboard focus is moved to @racket[snip] and the editor has the
- real keyboard focus, the @method[snip% own-caret] method of the snip
- will be called.
-
-If @racket[#f] is provided as the new owner, then the local focus is
- moved to the editor itself. Otherwise, the local focus is moved to
- the specified snip.
-
-The domain of focus-setting is one of:
-
-@itemize[
-
- @item{@racket['immediate] --- only set the focus owner within the
- editor}
-
- @item{@racket['display] --- make this editor or the new focus
- owner get the keyboard focus among the editors in this editor's
- @techlink{display} (if this is an embedded editor)}
-
- @item{@racket['global] --- make this editor or the new focus
- owner get the keyboard focus among all elements in the editor's frame}
-
-]
-
-@MonitorMethod[@elem{The focus state of an editor} @elem{by the
-system} @elem{@method[editor<%> on-focus]} @elem{focus}]
-
-See also @method[editor<%> get-focus-snip].
-
-}
-
-
-@defmethod[(set-cursor [cursor (or/c (is-a?/c cursor%) #f)]
-                       [override? any/c #t])
-           void?]{
-
-Sets the custom cursor for the editor to @racket[cursor]. If
- @racket[override?] is a true value and @racket[cursor] is not
- @racket[#f], then this cursor overrides cursor settings in embedded
- editors.
-
-If the custom cursor is @racket[#f], the current cursor is removed,
- and a cursor is selected automatically by the editor (depending on
- whether the cursor is pointing at a clickback). See @method[editor<%>
- adjust-cursor] for more information about the default selection.
-
-An embedding editor's custom cursor can override the cursor of an
- embedded editor---even if the embedded editor has the caret---if
- the cursor is specified as an overriding cursor.
-
-}
-
-
-@defmethod[(set-filename [filename (or/c path-string? #f)]
-                         [temporary? any/c #f])
-           void?]{
-
-Sets the filename to @racket[filename]. If @racket[filename] is
- @racket[#f] or @racket[temporary?] is a true value, then the user
- will still be prompted for a name on future calls to
- @method[editor<%> save-file] and @method[editor<%> load-file].
-
-This method is also called when the filename changes through any
- method (such as @method[editor<%> load-file]).
-
-}
-
-
-@defmethod[(set-inactive-caret-threshold [threshold (or/c 'no-caret 'show-inactive-caret 'show-caret)])
-           void?]{
-
-Sets the threshold for painting an inactive selection.  See
- @method[editor<%> get-inactive-caret-threshold] for more information.
-
-}
-
-
-@defmethod[(set-keymap [keymap (or/c (is-a?/c keymap%) #f) #f])
-           void?]{
-
-Sets the current keymap for the editor. A @racket[#f] argument removes
- all key mapping.
-
-}
-
-
-@defmethod[(set-load-overwrites-styles [overwrite? any/c])
-           void?]{
-
-Determines whether named styles in the current style list are replaced
- by @method[editor<%> load-file] when the loaded file contains style
- specifications.
-
-See also @method[editor<%> get-load-overwrites-styles] and
- @method[editor<%> read-from-file].
-
-}
-
-
-@defmethod[(set-max-height [width (or/c (and/c real? (not/c negative?)) 'none)])
-           void?]{
-
-Sets the maximum display height for the contents of the editor.  A
- value less or equal to @racket[0] indicates that there is no maximum.
-
-Setting the height is disallowed when the editor is internally locked
- for reflowing (see also @|lockdiscuss|).
-
-}
-
-
-@defmethod[(set-max-undo-history [count (or/c exact-nonnegative-integer? 'forever)])
-           void?]{
-
-Sets the maximum number of undoables that will be remembered by the
- editor. The default is @racket[0], which disables undo.  The symbol
- @indexed-racket['forever] is accepted as a synonym for a very large
- number.
-
-When an editor is in preserve-all-history mode (see @method[editor<%>
- set-undo-preserves-all-history]), then any non-@racket[0] value is
- treated the same as @racket['forever].
-
-}
-
-
-@defmethod[(set-max-width [width (or/c (and/c real? (not/c negative?)) 'none)])
-           void?]{
-
-Sets the maximum display width for the contents of the editor; zero or
- @racket['none] indicates that there is no maximum.  In a text editor,
- having no maximum disables automatic line breaking, and the minimum
- (positive) maximum width depends on the width of the autowrap
- bitmap. The maximum width of a text editor includes its left and
- right padding (see @method[text% set-padding]) and its autowrap
- bitmap (see @method[text% set-autowrap-bitmap]).
-
-Setting the width is disallowed when the editor is internally locked
- for reflowing (see also @|lockdiscuss|).
-
-}
-
-@defmethod[(set-min-height [width (or/c (and/c real? (not/c negative?)) 'none)])
-           void?]{
-
-Sets the minimum display height for the contents of the editor; zero
- or @racket['none] indicates that there is no minimum.
-
-Setting the height is disallowed when the editor is internally locked
- for reflowing (see also @|lockdiscuss|).
-
-}
-
-@defmethod[(set-min-width [width (or/c (and/c real? (not/c negative?)) 'none)])
-           void?]{
-
-Sets the minimum display width for the contents of the editor; zero or
- @racket['none] indicates that there is no minimum.
-
-Setting the width is disallowed when the editor is internally locked
-for reflowing (see also @|lockdiscuss|).
-
-}
-
-@defmethod[(set-modified [modified? any/c])
-           void?]{
-
-Sets the modified state of the editor. Usually, the state is changed
- automatically after an insertion, deletion, or style change by
- calling this method. (This method is also called when the
- modification state changes through @italic{any} method.) This method
- is usually not called when the state of the flag is not changing.
-
-See also @method[editor<%> is-modified?] and @method[editor<%>
-on-snip-modified].
-
-When @racket[modified?] is true, then an internal modify-counter is
- set to @racket[1].
-
-When @racket[modified?] is @racket[#f] and the editor's undo or redo
- stack contains a system-created undoer that resets the modified state
- (because the preceding undo or redo action puts the editor back to a
- state where the modification state was @racket[#f]), the undoer is
- disabled.
-
-Regardless of the value of @racket[modified?], the editor's
- adminstrator's @method[editor-admin% modified] method is called.
-
-Finally, if @racket[modified?] is @racket[#f] and the internal
- modify-counter is set to @racket[0], then the @method[snip%
- set-unmodified] method is called on every snip within the editor.
-
-}
-
-
-@defmethod[(set-paste-text-only [text-only? any/c])
-           void?]{
-
-Sets whether the editor accepts only text from the clipboard, or both
- text and snips. By default, an editor accepts both text and
- snips.
-
-See also @method[editor<%> get-paste-text-only].
-
-}
-
-@defmethod[(set-snip-data [thesnip (is-a?/c snip%)]
-                          [data (is-a?/c editor-data%)])
-           void?]{
-
-Sets extra data associated with the snip (e.g., @techlink{location}
- information in a pasteboard). See @|editordatadiscuss| for more
- information.
-
-}
-
-
-@defmethod[(set-style-list [style-list (is-a?/c style-list%)])
-           void?]{
-
-Sets the editor's style list. Styles currently in use with the old
- style list will be ``moved'' to the new style list. In this ``move,''
- if a named style already exists in the new style list, then the new
- style with the same name will be used in place of the old style.
-
-Setting the style list is disallowed when the editor is internally
- locked for reflowing (see also @|lockdiscuss|).
-
-}
-
-@defmethod[(set-undo-preserves-all-history [on? any/c]) void?]{
-
-When @racket[on?] is true, configures the editor to preserve all
-editing history, including operations that have been undone, as long
-as the maximum undo history is non-zero (see @method[editor<%>
-set-max-undo-history]).  Otherwise, operations that are undone (and not
-redone) before another operation are lost from the editor's history.
-
-The default mode is determined by the @Resource{emacs-undo} preference
-(see @secref["mredprefs"]).
-
-@history[#:added "1.1"]}
-
-
-@defmethod[(size-cache-invalid)
-           void?]{
-
-This method is called when the drawing context given to the editor by
-its administrator changes in a way that makes cached size information
-(such as the width of a string) invalid.
-
-The default implementation eventually propagates the message to snips,
-and, more generally, causes @tech{location} information to be
-recalculated on demand.
-
-See also @method[editor<%> invalidate-bitmap-cache].}
-
-
-@defmethod[(style-has-changed [style (or/c (is-a?/c style<%>) #f)])
-           void?]{
-
-Notifies the editor that a style in its style list has changed. This
- method is automatically registered with the editor's style list using
- @xmethod[style-list% notify-on-change] and automatically deregistered
- when the style list is removed from the editor.
-
-See @xmethod[style-list% notify-on-change] for more information.
-
-}
-
-
-@defmethod[(undo)
-           void?]{
-
-Undoes the last editor change, if undos have been enabled by calling
- @method[editor<%> set-max-undo-history] with a non-zero integer.
-
-If the editor is currently performing an undo or redo, the method call
- is ignored.
-
-The user may enable Emacs-style undo for editors; see
- @|mrprefsdiscuss|. Normally, undo operations add to the redo stack
- (see @method[editor<%> redo]), and any undoable (non-undo) operation
- clears the redo stack. With Emacs-style undo, the redo stack is added
- back to the undo stack, along with the original undos, so that a
- complete history is kept in the undo stack.
-
-The system may perform an undo without calling this method in response
- to other method calls. Use methods such as
- @method[editor<%> on-change] to monitor editor content changes.
-
-See also @method[editor<%> add-undo] .
-
-}
-
-
-@defmethod[(undo-preserves-all-history?) boolean?]{
-
-Reports whether the editor is in preserve-all-history mode.
-See @method[editor<%> set-undo-preserves-all-history] for more information.
-
-@history[#:added "1.1"]}
-
-
-@defmethod*[([(use-file-text-mode) boolean?]
-             [(use-file-text-mode [on? any/c]) void?])]{
-
-Gets or sets a boolean that controls if files are saved in
-@racket['text] or @racket['binary] mode (as in @racket[open-input-file]'s
-@racket[#:mode] argument). This flag is consulted only when the
-format is @racket['text] or @racket['text-force-cr]. 
-See @method[editor<%> load-file] for information on 
-formats.
-
-The setting is consulted by
-@method[editor<%> save-file] after @method[editor<%> on-save-file] is
-called.
-
-Overriding this method is a reliable way to detect changes to the internal
-boolean.
-}
-
-
-@defmethod[(write-footers-to-file [stream (is-a?/c editor-stream-out%)])
-           boolean?]{
-
-See @method[editor<%> write-headers-to-file].
-
-}
-
-
-@defmethod[(write-headers-to-file [stream (is-a?/c editor-stream-out%)])
-           boolean?]{
-
-@methspec{
-
-Called when the editor is being saved to a file.  The return value is
- @racket[#t] if there are no errors, @racket[#f] otherwise. Override
- this method to add custom header data to a file, but always call the
- inherited method so that it can write its own extra headers.
-
-To write a header item, call @method[editor<%>
- begin-write-header-footer-to-file], passing a box for an
- integer. Then write the header data and end by calling
- @method[editor<%> end-write-header-footer-to-file], passing back the
- integer that was put into the box.  Follow this procedure correctly
- or the file will be corrupted.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(write-to-file [stream (is-a?/c editor-stream-out%)])
-           boolean?]{
-
-Writes the current editor contents to the given stream.  The return
- value is @racket[#t] if there are no errors, @racket[#f] otherwise. See
- also @|filediscuss|.
-
-If the editor's style list has already been written to the stream, it
- is not re-written. Instead, the editor content indicates that the
- editor shares a previously-written style list. This sharing will be
- recreated when the stream is later read.
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-overview.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-overview.scrbl
deleted file mode 100644
index f74466f43d..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-overview.scrbl
+++ /dev/null
@@ -1,773 +0,0 @@
-#lang scribble/doc
-@(require scribble/bnf "common.rkt")
-
-@title[#:tag "editor-overview"]{Editors}
-
-The editor toolbox provides a foundation for two common kinds of
- applications:
-
-@itemize[
-
- @item{@italic{Programs that need a sophisticated text editor} ---
- The simple text field control is inadequate for text-intensive
- applications.  Many programs need editors that can handle multiple
- fonts and non-text items.}
-
- @item{@italic{Programs that need a canvas with dragable objects} ---
- The drawing toolbox provides a generic drawing surface for plotting
- lines and boxes, but many applications need an interactive canvas,
- where the user can drag and resize individual objects.}
-
-]
-
-Both kinds of applications need an extensible editor that can handle
- text, images, programmer-defined items, and even embedded
- editors. The difference between them is the layout of items. The
- editor toolbox therefore provides two kinds of editors via two
- classes:
-
-@itemize[
-
- @item{@racket[text%] --- in a @deftech{text editor}, items are
- automatically positioned in a paragraph flow.}
-
- @item{@racket[pasteboard%] --- in a @deftech{pasteboard editor},
- items are explicitly positioned and dragable.}
-
-]
-
-This editor architecture addresses the full range of real-world
- issues for an editor---including cut-and-paste, extensible file
- formats, and layered text styles---while supporting a high level of
- extensibility.  Unfortunately, the system is fairly complex as a
- result, and using the editor classes effectively requires a solid
- understanding of the structure and terminology of the editor
- toolbox. Nevertheless, enough applications fit one (or both) of the
- descriptions above to justify the depth and complexity of the toolbox
- and the learning investment required to use it.
-
-A brief example illustrates how editors work. To start, an editor
- needs an @racket[editor-canvas%] to display its contents. Then, we
- can create a text editor and install it into the canvas:
-
-@racketblock[
-(define f (new frame% [label "Simple Edit"]
-                      [width 200]
-                      [height 200]))
-(define c (new editor-canvas% [parent f]))
-(define t (new text%))
-(send c #,(:: editor-canvas% set-editor) t)
-(send f #,(:: top-level-window<%> show) #t)
-]
-
-At this point, the editor is fully functional: the user can type text
- into the editor, but no cut-and-paste operations are available. We
- can support all of the standard operations on an editor via the
- menu bar:
-
-@racketblock[
-(define mb (new menu-bar% [parent f]))
-(define m-edit (new menu% [label "Edit"] [parent mb]))
-(define m-font (new menu% [label "Font"] [parent mb]))
-(append-editor-operation-menu-items m-edit #f)
-(append-editor-font-menu-items m-font)
-]
-
-Now, the standard cut and paste operations work, and the user can even
- set font styles. The user can also insert an embedded editor by
- selecting @onscreen{Insert Text} from the @onscreen{Edit} menu; after
- selecting the menu item, a box appears in the editor with the caret
- inside. Typing with the caret in the box stretches the box as text is
- added, and font operations apply wherever the caret is active. Text
- on the outside of the box is rearranged as the box changes
- sizes. Note that the box itself can be copied and pasted.
-
-The content of an editor is made up of @defterm{@tech{snips}}. An
- embedded editor is a single snip from the embedding editor's
- point-of-view. To encode immediate text, a snip can be a single
- character, but more often a snip is a sequence of adjacent characters
- on the same line. The @method[text% find-snip] method extracts a snip
- from a text editor:
-
-@racketblock[
-(send t #,(:: text% find-snip) 0 'after)
-]
-
-The above expression returns the first snip in the editor, which may
- be a string snip (for immediate text) or an editor snip (for an
- embedded editor).
-
-An editor is not permanently attached to any display. We can take the
- text editor out of our canvas and put a pasteboard editor in the
- canvas, instead:
-
-@racketblock[
-(define pb (new pasteboard%))
-(send c #,(:: editor-canvas% set-editor) pb)
-]
-
-With the pasteboard editor installed, the user can no longer type
- characters directly into the editor (because a pasteboard does not
- support directly entered text). However, the user can cut text from
- elsewhere and paste it into pasteboard, or select one of the
- @onscreen{Insert} menu items in the @onscreen{Edit} menu. Snips are
- clearly identifiable in a pasteboard editor (unlike a text editor)
- because each snip is separately dragable.
-
-We can insert the old text editor (which we recently removed from the
- canvas) as an embedded editor in the pasteboard by explicitly
- creating an editor snip:
-
-@racketblock[
-(define s (make-object editor-snip% t)) (code:comment @#,t{@racket[t] is the old text editor})
-(send pb #,(:: editor<%> insert) s)
-]
-
-An individual snip cannot be inserted into different editors at the
- same time, or inserted multiple times in the same editor:
-
-@racketblock[
-(send pb #,(:: editor<%> insert) s) (code:comment @#,t{no effect})
-]
-
-However, we can make a deep copy of the snip and insert the copy into
- the pasteboard:
-
-@racketblock[
-(send pb #,(:: editor<%> insert) (send s #,(:: snip% copy)))
-]
-
-Applications that use the editor classes typically derive new versions
- of the @racket[text%] and @racket[pasteboard%] classes. For
- example, to implement an append-only editor (which allows insertions
- only at the end and never allows deletions), derive a new class from
- @racket[text%] and override the
- @method[text% can-insert?] and
- @method[text% can-delete?] methods:
-
-@racketblock[
-(define append-only-text% 
-  (class text%
-    (inherit #,(:: text% last-position))
-    (define/augment (#,(:: text% can-insert?) s l) (= s (#,(:: text% last-position))))
-    (define/augment (#,(:: text% can-delete?) s l) #f)
-    (super-new)))
-]
-
-@section[#:tag "tb:miaoverview"]{Editor Structure and Terminology}
-
-The editor toolbox supports extensible and nestable editors by
- decomposing an editor assembly into three functional parts:
-
-@itemize[
-
- @item{The @deftech{editor} itself stores the state of the text or
- pasteboard and handles most events and editing operations. The
- @racket[editor<%>] interface defines the core editor functionality,
- but editors are created as instances of @racket[text%] or
- @racket[pasteboard%].}
-
- @item{A @deftech{snip} is a segment of information within the
- editor.  Each snip can contain a sequence of characters, a picture,
- or an interactive object (such as an embedded editor). In a text
- editor, snips are constrained to fit on a single line and generally
- contain data of a single type. The @racket[snip%] class implements a
- basic snip. Other snip classes include @racket[string-snip%] for
- managing text, @racket[image-snip%] for managing pictures, and
- @racket[editor-snip%] for managing embedded editors.}
-
- @item{A @deftech{display} presents the editor on the screen. The
- display lets the user scroll around an editor or change editors. Most
- displays are instances of the @racket[editor-canvas%] class, but the
- @racket[editor-snip%] class also acts as a display for embedded
- editors.}
-
-]
-
-These three parts are illustrated by a simple word processor. The
- editor corresponds to the text document. The editor object receives
- keyboard and mouse commands for editing the text. The text itself is
- distributed among snips. Each character could be a separate snip, or
- multiple characters on a single line could be grouped together into a
- snip. The display roughly corresponds to the window in which the
- text is displayed.  While the editor manages the arrangement of the
- text as it is displayed into a window, the display determines which
- window to draw into and which part of the editor to display.
-
-Each selectable entity in an editor is an @deftech{item}. In a
- pasteboard, all selection and dragging operations work on snips, so
- there is a one-to-one correspondence between snips and items.  In an
- editor, one snip contains one or more consecutive items, and every
- item belongs to some snip. For example, in a simple text editor, each
- character is an item, but multiple adjacent characters may be grouped
- into a single snip. The number of items in a snip is the snip's
- @deftech{count}.
-
-Each place where the insertion point can appear in a text editor is a
- @deftech{position}. A text editor with @math{n} items contains
- @math{n+1} positions: one position before each item, and one position
- after the last item.
-
-The order of snips within a pasteboard determines each snip's drawing
- plane. When two snips overlap within the pasteboard, the snip that is
- earlier in the order is in front of the other snip (i.e., the former
- is drawn after the latter, such that the former snip may cover part
- of the latter snip).
-
-When an editor is drawn into a display, each snip and position has a
- @deftech{location}. The location of a position or snip is specified
- in coordinates relative to the top-left corner of the
- editor. Locations in an editor are only meaningful when the editor is
- displayed.
-
-
-@subsection[#:tag "editoradministrators"]{Administrators}
-
-Two extra layers of administration manage the @techlink{display}-editor and
- editor-snip connections. An editor never communicates directly with
- a @techlink{display}; instead, it always communicates with an @deftech{editor
- administrator}, an instance of the @racket[editor-admin%] class,
- which relays information to the @techlink{display}. Similarly, a snip
- communicates with a @deftech{snip administrator}, an instance of the
- @racket[snip-admin%] class.
-
-The administrative layers make the editor hierarchy flexible without
- forcing every part of an editor assembly to contain the functionality
- of several parts. For example, a text editor can be a single
- @techlink{item} within another editor; without administrators, the
- @racket[text%] class would also have to contain all the functionality
- of a @techlink{display} (for the containing editor) and a snip (for
- the embedded editor). Using administrators, an editor class can serve
- as both a containing and an embedded editor without directly
- implementing the @techlink{display} and snip functionality.
-
-A snip belongs to at most one editor via a single administrator. An
- editor also has only one administrator at a time. However, the
- administrator that connects the an editor to the standard
- @techlink{display} (i.e., an editor canvas) can work with other such
- administrators. In particular, the administrator of an
- @racket[editor-canvas%] (each one has its own administrator) can work
- with other @racket[editor-canvas%] administrators, allowing an editor
- to be displayed in multiple @racket[editor-canvas%] windows at the
- same time.
-
-When an editor is displayed by multiple canvases, one of the canvases'
- administrators is used as the editor's primary administrator. To
- handle user and update events for other canvases, the editor's
- administrator is temporarily changed and then restored through the
- editor's @method[editor<%> set-admin] method. The return value of the
- editor's @method[editor<%> get-admin] method thus depends on the
- context of the call.
-
-@subsection[#:tag "editorstyles"]{Styles}
-
-A @deftech{style}, an instance of the @racket[style<%>] interface,
- parameterizes high-level display information that is common to all
- snip classes. This includes the font, color, and alignment for
- drawing the item. A single style is attached to each snip.
-
-Styles are hierarchical: each style is defined in terms of another
- style. @index*['("Basic style") (list @elem{@racket["Basic"]
- style})]{There} is a single @deftech{root style}, named
- @racket["Basic"], from which all other styles in an editor are
- derived. The difference between a base style and each of its derived
- style is encoded in a @deftech{style delta} (or simply
- @deftech{delta}). A delta encodes changes such as
-
-@itemize[
-
- @item{change the font family to @italic{X};}
-
- @item{enlarge the font by adding @italic{Y} to the point size;}
-
- @item{toggle the boldness of the font; or}
- 
- @item{change everything to match the style description @italic{Z}.}
-
-]
-
-Style objects are never created separately; rather, they are always
- created through a @deftech{style list}, an instance of the
- @racket[style-list%] class. A style list manages the styles,
- servicing external requests to find a particular style, and it
- manages the hierarchical relationship between styles.  A global style
- list is available, @indexed-racket[the-style-list], but new style
- lists can be created for managing separate style hierarchies. For
- example, each editor will typically have its own style list.
-
-Each new style is defined in one of two ways:
-
-@itemize[
-
- @item{A @deftech{derived style} is defined in terms of a base style
- and a delta. Every style (except for the root style) has a base
- style, even if it does not depend on the base style in any way (i.e.,
- the delta describes a fixed style rather than extensions to an
- existing style). (This is the usual kind of style inheritance, as
- found in word processors such as Microsoft Word.)}
-
- @item{A @deftech{join style} is defined in terms of two other styles:
- a base style and a @deftech{shift style}. The meaning of a join style
- is determined by reinterpreting the shift style; in the
- reinterpretation, the base style is used as the @italic{root} style
- for the shift style. (This is analogous to multi-level
- styles, like the paragraph and character styles in FrameMaker. In
- this analogy, the paragraph style is the base style, and the
- character style is the shift style.  However, FrameMaker allows only
- those two levels; with join styles support any number of levels.)}
-
-]
-
-@index*['("Standard style") (list @elem{@racket["Standard"]
- style})]{Usually}, when text is inserted into a text editor, it
- inherits the style of the preceding snip. If text is inserted into an
- empty editor, the text is usually assigned a style called
- @racket["Standard"]. By default, the @racket["Standard"] style is
- unmodified from the root style. The default style name can be changed
- by overriding @method[editor<%> default-style-name].
-
-The exception to the above is when @xmethod[text% change-style] is
- called with the current selection @techlink{position} (when the
- selection is a @techlink{position} and not a range). In that case,
- the style is remembered, and if the next editor-modifying action is a
- text insertion, the inserted text gets the remembered style.
-
-See @xmethod[text% get-styles-sticky] for more information about the
- style of inserted text.
-
-
-@section[#:tag "editorfileformat"]{File Format}
-
-To allow editor content to be saved to a file, the editor classes
- implement a special file format called @deftech{WXME}. (The format is
- used when cutting and pasting between applications or eventspaces,
- too). The file format is not documented, except that it begins
- @litchar{WXME01}@nonterm{digit}@nonterm{digit}@litchar{ ## }. Otherwise, the
- @method[editor<%> load-file] and @method[editor<%> save-file] methods
- define the format internally. The file format is the same for text
- and pasteboard editors. When a pasteboard saves its content to a
- file, it saves the snips from front to back, and also includes extra
- location information. The @racketmodname[wxme] library provides
- utilities for manipulating WXME files.
-
-Editor data is read and written using @racket[editor-stream-in%] and
-@racket[editor-stream-out%] objects.  Editor information can only be
- read from or written to one stream at a time. To write one or more
- editors to a stream, first call the function
- @racket[write-editor-global-header] to write initialization data into
- an output stream. When all editors are written to the stream, call
- @racket[write-editor-global-footer]. Similarly, reading editors from
- a stream is initialized with @racket[read-editor-global-header] and
- finalized with @racket[read-editor-global-footer]. Optionally, to
- support streams that span versions of Racket, use
- @racket[write-editor-version] and @racket[read-editor-version] before
- the header operations.
-
-The editor file data format can be embedded within another file, and
- it can be extended with new kinds of data. The editor file format can
- be extended in two ways: with snip- or content-specific data, and
- with editor-specific global data. These are described in the
- remainder of this section.
-
-@subsection{Encoding Snips}
-
-@index['("snips" "saving")]{@index['("snips" "cut and paste")]{The}}
- generalized notion of a snip allows new snip types to be defined and
- immediately used in any editor class. Also, when two applications
- support the same kinds of snips, snip data can easily be cut and
- pasted between them, and the same data files will be readable by each
- program. This interoperability is due to a consistent encoding
- mechanism that is built into the snip system.
-
-Graceful and extensible encoding of snips requires that 
- two issues are addressed:
-
-@itemize[
-
- @item{The encoding function for a snip can be associated with the snip
- itself. To convert a snip from an encoded representation (e.g., as
- bytes in a file) to a memory object, a decoding function must be
- provided for each type of snip. Furthermore, a list of such decoders
- must be available to the high-level decoding process. This decoding
- mapping is defined by associating a @deftech{snip class} object to
- every snip. A snip class is an instance of the @racket[snip-class%]
- class.}
-
- @item{Some editors may require additional information to be stored
- about a snip; this information is orthogonal to the type-specific
- information stored by the snip itself. For example, a pasteboard
- needs to remember a snip's @techlink{location}, while a text editor
- does not need this information.  If data is being cut and pasted from
- one pasteboard to another, then information about relative
- @techlink{location}s needs to be maintained, but this information
- should not inhibit pasting into an editor. Extra data is associated
- with a snip through @deftech{editor data} objects, which are
- instances of the @racket[editor-data%] class; decoding requires that
- each editor data object has an @deftech{editor data class}, which is
- an instance of the @racket[editor-data-class%] class.}
-
-]
-
-Snip classes, snip data, and snip data classes solve problems related
- to encoding and decoding snips. In an application that has no need
- for saving files or cut-and-paste, these issues can be safely
- ignored.
-
-@subsubsection[#:tag "editorsnipclasses"]{Snip Classes}
-
-Each snip can be associated to a @tech{snip class}. This ``class''
- is not a class description in the programmer's language; it is an
- object which provides a way to create new snips of the appropriate
- type from an encoded snip specification.
-
-Snip class objects can be added to the eventspace-specific
- @deftech{snip class list}, which is returned by
- @racket[get-the-snip-class-list]. When a snip is encoded, the snip's
- class name is associated with the encoding; when the snip needs to be
- decoded, then the snip class list is searched by name to find the
- snip's class. The snip class will then provide a decoding function
- that can create a new snip from the encoding.
-
-If a snip class's name is of the form
-@;-
-@racket["((lib ...) (lib ...))"], 
-@;-
- then the snip class implementation can be loaded on
- demand. The name is parsed using @racket[read]; if the result has the
- form @racket[((lib _string ...) (lib _string ...))], then the first
- element used with @racket[dynamic-require] along with
- @racket['snip-class]. If the @racket[dynamic-require] result is a
- @racket[snip-class%] object, then it is inserted into the current
- eventspace's snip class list, and loading or saving continues using
- the new class.
-
-The second @racket[lib] form in @racket["((lib ...) (lib ...))"]
- supplies a reader for a text-only version of the snip. See
- @secref["snipclassmapping"] for more information on how 
- such snipclasses work (and generally see the
- @racketmodname[wxme] library).
-
-A snip class's name can also be just @racket["(lib ...)"], which is
- used like the first part of the two-@racket[lib] form. However, this
- form provides no information for the text-only @racketmodname[wxme]
- reader.
-
-@subsubsection[#:tag "editordata"]{Editor Data}
-
-While a snip belongs to an editor, the editor may store extra
- information about a snip in some specialized way. When the snip is to
- be encoded, this extra information needs to be put into an
- @tech{editor data} object so that the extra information can be
- encoded as well.  In a text editor, extra information can be
- associated with ranges of @techlink{item}s, as well as snips.
-
-Just as a snip must be associated with a snip class to be decoded (see
- @|snipclassdiscuss|), an editor data object needs an @tech{editor
- data class} for decoding. Every editor data class object can be added
- to the eventspace-specific @deftech{editor data class list}, returned
- by @racket[get-the-editor-data-class-list]. Alternatively, like snip
- classes (see @secref["editorsnipclasses"]), editor data class names
- can use the form @racket["((lib ...)  (lib ...))"]  to enable
- on-demand loading. The corresponding module should export an
- @racket[editor-data-class%] object named @racket['editor-data-class].
-
-To store and load information about a snip or region in an editor:
-
-@itemize[
-
- @item{derive new classes from @racket[editor-data%] and
- @racket[editor-data-class%].}
-
-@item{derive a new class from the @racket[text%] or
-  @racket[pasteboard%] class, and override the @method[editor<%>
-  get-snip-data] and @method[editor<%> set-snip-data] methods and/or the
-  @method[text% get-region-data] and @method[text% set-region-data]
-  methods.
-
-  Note: the @method[text% get-region-data] and @method[text%
-  set-region-data] methods are called for cut-and-paste encoding, but
-  not for file-saving encoding; see @|globaleditordatadiscuss| for
-  information on extending the file format.}
-
-]
-
-
-@subsection[#:tag "globaleditordata"]{Global Data: Headers and Footers}
-
-The editor file format provides for adding extra global data in
- special header and footer sections. To save and load special header
- and/or footer records:
-
-@itemize[
-
- @item{Pick a name for each header/footer record. This name should not
- conflict with any other header/footer record name in use, and no one
- else should use these names. All names beginning with ``wx'' are
- reserved for internal use. By tagging extra header and footer records
- with a unique name, the file can be safely loaded in an installation that
- does not support the records.}
-
- @item{Derive a new class from the @racket[text%] or
- @racket[pasteboard%] class, and override the @method[editor<%>
- write-headers-to-file], @method[editor<%> write-footers-to-file],
- @method[editor<%> read-header-from-file] and/or @method[editor<%>
- read-footer-from-file] methods.}
-
-]
-
-When an editor is saved, the methods @method[editor<%>
- write-headers-to-file] and @method[editor<%> write-footers-to-file]
- are invoked; at this time, the derived @racket[text%] or
- @racket[pasteboard%] object has a chance to save records.  To write a
- header/footer record, first invoke the @method[editor<%>
- begin-write-header-footer-to-file] method, at which point the record
- name is provided. Once the record is written, call @method[editor<%>
- end-write-header-footer-to-file].
-
-When an editor is loaded and a header/footer record is encountered,
- the @method[editor<%> read-header-from-file] or @method[editor<%>
- read-footer-from-file] method is invoked, with the record name as the
- argument.  If the name matches a known record type, then the data can
- be loaded.
-
-See also @method[editor<%> write-headers-to-file] and
- @method[editor<%> read-header-from-file].
-
-
-@section[#:tag "editoreol"]{End of Line Ambiguity}
-
-Because an editor can force a line break even when there is no
- newline item, a @techlink{position} alone does not always
- specify a @techlink{location} for the caret. Consider the last
- @techlink{position} of a line that is soft-broken (i.e., no newline
- is present): there is no @techlink{item} between the last
- @techlink{item} of the line and the first @techlink{item} of the next
- line, so two @techlink{location}s (one end-of-line and one
- start-of-line) map to the same @techlink{position}.
-
-For this reason, @techlink{position}-setting and
- @techlink{position}-getting methods often have an extra argument. In
- the case of a @techlink{position}-setting method, the argument
- specifies whether the caret should be drawn at the left or right side
- of the page (in the event that the @techlink{location} is doubly
- defined); @racket[#t] means that the caret should be drawn on the
- right side. Similarly, methods which calculate a @techlink{position}
- from a @techlink{location} will take an extra boxed boolean; the box
- is filled with @racket[#t] if the position is ambiguous and it came
- from a right-side location, or @racket[#f] otherwise.
-
-@section[#:tag "editorflattened"]{Flattened Text}
-
-In plain text editors, there is a simple correlation between
- @techlink{position}s and characters. In an @racket[editor<%>] object,
- this is not true much of the time, but it is still sometimes useful
- to just ``get the text'' of an editor.
-
-Text can be extracted from an editor in either of two forms:
-
-@itemize[
-
- @item{@deftech{Simple text}, where there is one character per
- @techlink{item}. @techlink{Item}s that are characters are mapped to
- themselves, and all other @techlink{item}s are mapped to a
- period. Line breaks are represented by newline characters
- (ASCII 10).}
-
- @item{@deftech{Flattened text}, where each @techlink{item} can map to
- an arbitrary string.  @techlink{Item}s that are characters are still
- mapped to themselves, but more complicated @techlink{item}s can be
- represented with a useful string determined by the @techlink{item}'s
- snip. Newlines are mapped to platform-specific character sequences
- (linefeed on Unix and Mac OS X, and
- linefeed--carriage return on Windows). This form is called
- ``flattened'' because the editor's @techlink{item}s have been reduced
- to a linear sequence of characters.}
-
-]
-
-@section[#:tag "drawcaretinfo"]{Caret Ownership}
-
-Within a frame, only one object can contain the keyboard focus. This
- property must be maintained when a frame contains multiple editors in
- multiple @techlink{display}s, and when a single editor contains other
- editors as @techlink{item}s.
-
-When an editor has the keyboard focus, it will usually display the
- current selection or a line indicating the insertion point; the line
- is called the @deftech{caret}.
-
-When an editor contains other editors, it keeps track of caret
- ownership among the contained sub-editors. When the caret is taken
- away from the main editor, it will revoke caret ownership from the
- appropriate sub-editor.
-
-When an editor or snip is drawn, an argument to the drawing method
- specifies whether the caret should be drawn with the data or whether
- a selection spans the data. This argument can be any of:
-
-@itemize[
-
- @item{@indexed-racket['no-caret] --- The caret should not be drawn at
- all.}
-
- @item{@indexed-racket['show-inactive-caret] --- The caret should be drawn
- as inactive; items may be identified as the local current selection,
- but the keyboard focus is elsewhere.}
-
- @item{@indexed-racket['show-caret] --- The caret should be drawn to show
- keyboard focus ownership.}
-
- @item{@racket[(cons _start _end)] --- The caret is owned by an
- enclosing region, and its selection spans the current editor or snip;
- in the case of the snip, the selection spans elements @racket[_start]
- through @racket[_end] positions within the snip.}
-
-]
-
-The @racket['show-inactive-caret] display mode is useful for showing
- selection ranges in text editors that do not have the focus. This
- @racket['show-inactive-caret] mode is distinct from @racket['no-caret]
- mode; when editors are embedded, only the locally active editor shows
- its selection.
-
-
-@section[#:tag "editorcutandpastetime"]{Cut and Paste Time Stamps}
-
-Methods of @racket[editor<%>] that use the clipboard --- including
- @method[editor<%> copy], @method[editor<%> cut], @method[editor<%>
- paste], and @method[editor<%> do-edit-operation] --- consume a time
- stamp argument. This time stamp is generally extracted from the
- @racket[mouse-event%] or @racket[key-event%] object that triggered
- the clipboard action. Unix uses the time stamp to synchronize clipboard
- operations among the clipboard clients.
-
-All instances of @racket[event%] include a time stamp, which can be
- obtained using @method[event% get-time-stamp].
-
-If the time stamp is 0, it defaults to the current time. Using 0 as the
- time stamp almost always works fine, but it is considered bad manners
- on Unix.
-
-
-@section[#:tag "editorclickback"]{Clickbacks}
-
-@deftech{Clickbacks} in a @racket[text%] editor facilitate the
- creation of simple interactive objects, such as hypertext. A
- clickback is defined by associating a callback function with a range
- of @techlink{item}s in the editor. When a user clicks on the
- @techlink{item}s in that range, the callback function is invoked. For
- example, a hypertext clickback would associate a range to a callback
- function that changes the selection range in the editor.
-
-By default, the callback function is invoked when the user releases
- the mouse button. The @method[text% set-clickback] method accepts
- an optional argument that causes the callback function to be invoked
- on the button press, instead. This behavior is useful, for example,
- for a clickback that creates a popup menu.
-
-Note that there is no attempt to save clickback information when a
- file is saved, since a clickback will have an arbitrary procedure
- associated with it.
-
-@section[#:tag "lockinfo"]{Internal Editor Locks}
-
-Instances of @racket[editor<%>] have three levels of internal
- locking:
-
-@itemize[
-
- @item{write locking --- When an editor is internally locked for
- writing, the abstract content of the editor cannot be changed (e.g.,
- insertion attempts fail silently). However, snips in a text editor
- can still be split and merged, and the text editor can be changed in
- ways that affect the flow of lines. The
- @method[editor<%> locked-for-write?] method reports whether an
- editor is currently locked for writing.}
-
- @item{flow locking --- When a text editor is internally locked for
- reflowing, it is locked for writing, the snip content of the editor
- cannot change, the @techlink{location} of a snip cannot be computed if it
- is not already known (see
- @xmethod[editor<%> locations-computed?]), and the editor cannot
- be drawn to a @techlink{display}. A request for uncomputed location
- information during a flow lock produces undefined results. The
- @method[editor<%> locked-for-flow?] method reports whether an
- editor is currently locked for flowing.}
-
- @item{read locking --- When an editor is internally locked for
- reading, no operations can be performed on the editor (e.g., a
- request for the current selection position returns an undefined
- value). This extreme state is used only during callbacks to its snips
- for setting the snip's administrator, splitting the snip, or merging
- snips.  The @method[editor<%> locked-for-read?]  method reports
- whether an editor is currently locked for reading.}
-
-]
-
-The internal lock for an editor is @italic{not} affected by calls to
- @method[editor<%> lock].
-
-Methods that report @techlink{location}-independent information about an
- editor never trigger a lock. A method that reports @techlink{location}
- information may trigger a flow lock or write lock if the relevant
- information has not been computed since the last modification to the
- editor (see @xmethod[editor<%> locations-computed?]). A method
- that modifies the editor in any way, even setting the selection
- position, can trigger a read lock, flow lock, or write lock.
-
-@section[#:tag "editorthreads"]{Editors and Threads}
-
-An editor is not tied to any particular thread or eventspace, except
- to the degree that it is displayed in a canvas (which has an
- eventspace). Concurrent access of an editor is always safe in the
- weak sense that the editor will not become corrupted. However, because
- editor access can trigger locks, concurrent access can produce 
- contract failures or unexpected results.
-
-An editor supports certain concurrent patterns
- reliably. One relevant pattern is updating an editor in one thread
- while the editor is displayed in a canvas that is managed by a
- different (handler) thread. To ensure that canvas refreshes are not
- performed while the editor is locked for flowing, and to ensure that
- refreshes do not prevent editor modifications, the following are
- guaranteed:
-
-@itemize[
-
- @item{When an editor's @method[editor<%> refresh] method is
- called during an @deftech{edit sequence} (which is started by
- @method[editor<%> begin-edit-sequence] and ended with
- @method[editor<%> end-edit-sequence]), the requested refresh
- region is recorded, but the refresh is not performed. Instead, the
- refresh is delayed until the end of the edit sequence.}
-
- @item{Attempting to start an edit sequence while a refresh is in
- progress blocks until the refresh is complete.}
-
- @item{The @method[editor<%> on-display-size-when-ready] method
- calls @method[editor<%> on-display-size] only when the editor
- is not being refreshed and only when an edit sequence is not in
- progress. In the first case, the
- @method[editor<%> on-display-size] call is delegated to the
- refreshing thread to be called after the refresh completes. In the
- second case, the @method[editor<%> on-display-size] call is
- delegated to the edit-sequence thread, to be called when the edit
- sequence is complete.}
-
-]
-
-Thus, disabling an @racket[editor-canvas%] object (using
- @method[window<%> enable]) is sufficient to ensure that a
- background thread can modify an editor displayed by the canvas, as
- long as all modifications are in edit sequences. The background
- modifications will impair canvas refreshes minimally and temporarily,
- and refreshes will not impair modifications in the background thread.
-
-A second supported pattern is reading an editor in a background thread
- while the editor may be manipulated in other threads. Since no
- @techlink{location}-independent reads introduce locks, the such reads in
- the background thread will not impair other threads. However, other
- threads may interfere with the background thread, causing it to
- receive erroneous or out-of-date content information. This one-sided
- guarantee is useful if the background thread's work can be discarded
- when the editor is modified.
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-snip-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-snip-class.scrbl
deleted file mode 100644
index acc53ce77b..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-snip-class.scrbl
+++ /dev/null
@@ -1,349 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[editor-snip% snip% ()]{
-
-An @racket[editor-snip%] object is a @racket[snip%] object that
- contains and displays an @racket[editor<%>] object. This snip class
- is used to insert an editor as a single @techlink{item} within
- another editor.
-
-
-@defconstructor[([editor (or/c (is-a?/c editor<%>) #f) #f]
-                 [with-border? any/c #t]
-                 [left-margin exact-nonnegative-integer? 5]
-                 [top-margin exact-nonnegative-integer? 5]
-                 [right-margin exact-nonnegative-integer? 5]
-                 [bottom-margin exact-nonnegative-integer? 5]
-                 [left-inset exact-nonnegative-integer? 1]
-                 [top-inset exact-nonnegative-integer? 1]
-                 [right-inset exact-nonnegative-integer? 1]
-                 [bottom-inset exact-nonnegative-integer? 1]
-                 [min-width (or/c (and/c real? (not/c negative?)) 'none) 'none]
-                 [max-width (or/c (and/c real? (not/c negative?)) 'none) 'none]
-                 [min-height (or/c (and/c real? (not/c negative?)) 'none) 'none]
-                 [max-height (or/c (and/c real? (not/c negative?)) 'none) 'none])]{
-
-If @racket[editor] is non-@racket[#f], then it will be used as the
- editor contained by the snip. See also @method[editor-snip%
- set-editor].
-
-If @racket[with-border?] is not @racket[#f], then a border will be drawn
- around the snip. The editor display will be inset in the snip area by
- the amounts specified in the @racket[-margin] arguments.  The border
- will be drawn with an inset specified by the @racket[-inset] arguments.
-
-See @method[editor-snip% get-inset] and @method[editor-snip%
-get-margin] for information about the inset and margin arguments.
-
-}
-
-
-@defmethod[#:mode override 
-           (adjust-cursor [dc (is-a?/c dc<%>)]
-                          [x real?]
-                          [y real?]
-                          [editorx real?]
-                          [editory real?]
-                          [event (is-a?/c mouse-event%)])
-           (or/c (is-a?/c cursor%) #f)]{
-
-Gets a cursor from the embedded editor by calling its
-@method[editor<%> adjust-cursor] method.
-
-}
-
-
-@defmethod[(border-visible?)
-           boolean?]{
-
-Returns @racket[#t] if the snip has a border draw around it,
-@racket[#f] otherwise.
-
-See also @method[editor-snip% show-border].
-
-}
-
-
-@defmethod[(get-align-top-line)
-           boolean?]{
-
-Reports whether the snip is in align-top-line mode. See
-@method[editor-snip% get-extent] for more information.
-
-See also @method[editor-snip% set-align-top-line].
-
-}
-
-
-@defmethod[(get-editor)
-           (or/c (or/c (is-a?/c text%) (is-a?/c pasteboard%)) #f)]{
-
-Returns the editor contained by the snip, or @racket[#f] is there is
- no editor.
-
-}
-
-@defmethod[#:mode override 
-           (get-extent [dc (is-a?/c dc<%>)]
-                       [x real?]
-                       [y real?]
-                       [w (or/c (box/c (and/c real? (not/c negative?))) #f) #f]
-                       [h (or/c (box/c (and/c real? (not/c negative?))) #f) #f]
-                       [descent (or/c (box/c (and/c real? (not/c negative?))) #f) #f]
-                       [space (or/c (box/c (and/c real? (not/c negative?))) #f) #f]
-                       [lspace (or/c (box/c (and/c real? (not/c negative?))) #f) #f]
-                       [rspace (or/c (box/c (and/c real? (not/c negative?))) #f) #f])
-           void?]{
-
-Calls its editor's @method[editor<%> get-extent] method, then adds the
- editor snip's margins.
-
-The top space always corresponds to the space of the editor's top
- line, plus the snip's top margin. Normally, the descent corresponds
- to the descent of the editor's last line plus the snip's bottom
- margin. However, if the snip is in align-top-line mode (see
- @method[editor-snip% set-align-top-line]), the descent corresponds to
- the descent of the top line, plus the height rest of the editor's
- lines, plus the snip's bottom margin.
-
-If the editor is a text editor, then @racket[1] is normally subtracted
- from the editor's width as returned by @method[editor<%> get-extent],
- because the result looks better for editing.  If the snip is in
- tight-text-fit mode (see @method[editor-snip% set-tight-text-fit])
- then @racket[2] is subtracted from a text editor's width, eliminating
- the two pixels that the text editor reserves for the blinking
- caret. In addition, tight-text-fit mode subtracts an amount equal to
- the line spacing from the editor's height. By default, tight-text-fit
- mode is disabled.
-
-}
-
-
-@defmethod[(get-inset [l (box/c exact-nonnegative-integer?)]
-                      [t (box/c exact-nonnegative-integer?)]
-                      [r (box/c exact-nonnegative-integer?)]
-                      [b (box/c exact-nonnegative-integer?)])
-           void?]{
-
-Gets the current border insets for the snip. The inset sets how much space
-is left between the edge of the snip and the border.
-
-@boxisfill[@racket[l] @elem{left inset}]
-@boxisfill[@racket[t] @elem{top inset}]
-@boxisfill[@racket[r] @elem{right inset}]
-@boxisfill[@racket[b] @elem{bottom inset}]
-
-}
-
-
-@defmethod[(get-margin [l (box/c exact-nonnegative-integer?)]
-                       [t (box/c exact-nonnegative-integer?)]
-                       [r (box/c exact-nonnegative-integer?)]
-                       [b (box/c exact-nonnegative-integer?)])
-           void?]{
-
-Gets the current margins for the snip. The margin sets how much space
-is left between the edge of the editor's contents and the edge of the
-snip.
-
-@boxisfill[@racket[l] @elem{left margin}]
-@boxisfill[@racket[t] @elem{top margin}]
-@boxisfill[@racket[r] @elem{right margin}]
-@boxisfill[@racket[b] @elem{bottom margin}]
-
-}
-
-
-@defmethod[(get-max-height)
-           (or/c (and/c real? (not/c negative?)) 'none)]{
-
-Gets the maximum display height of the snip; zero or @racket['none]
- indicates that there is no maximum.
-
-}
-
-
-@defmethod[(get-max-width)
-           (or/c (and/c real? (not/c negative?)) 'none)]{
-
-Gets the maximum display width of the snip; zero or @racket['none]
- indicates that there is no maximum.
-
-}
-
-@defmethod[(get-min-height)
-           (or/c (and/c real? (not/c negative?)) 'none)]{
-
-Gets the minimum display height of the snip; zero or @racket['none]
- indicates that there is no minimum.
-
-}
-
-@defmethod[(get-min-width)
-           (or/c (and/c real? (not/c negative?)) 'none)]{
-
-Gets the minimum display width of the snip; zero or @racket['none]
- indicates that there is no minimum.
-
-}
-
-@defmethod[(get-tight-text-fit)
-           boolean?]{
-
-Reports whether the snip is in tight-text-fit mode. See
-@method[editor-snip% get-extent] for more information.
-
-See also @method[editor-snip% set-tight-text-fit].
-
-}
-
-@defmethod[#:mode override 
-           (resize [w (and/c real? (not/c negative?))]
-                   [h (and/c real? (not/c negative?))])
-           boolean?]{
-
-Sets the snip's minimum and maximum width and height to the specified
- values minus the snip border space. See also @method[editor-snip%
- set-min-width] @method[editor-snip% set-max-width]
- @method[editor-snip% set-max-height] @method[editor-snip%
- set-min-height].
-
-Also sets the minimum and maximum width of the editor owned by the
- snip to the given width (minus the snip border space) via
- @method[editor<%> set-max-width] and @method[editor<%>
- set-min-width].
-
-}
-
-@defmethod[(set-align-top-line [tight? any/c])
-           void?]{
-
-Enables or disables align-top-line mode. See @method[editor-snip%
- get-extent] for more information.
-
-See also @method[editor-snip% get-align-top-line].
-
-}
-
-@defmethod[(set-editor [editor (or/c (or/c (is-a?/c text%) (is-a?/c pasteboard%)) #f)])
-           void?]{
-
-Sets the editor contained by the snip, releasing the old editor in the
- snip (if any). If the new editor already has an administrator, then
- the new editor is @italic{not} installed into the snip.
-
-When an @racket[editor-snip%] object is not inserted in an editor, it
- does not have an administrator. During this time, it does not give
- its contained editor an administrator, either. The administratorless
- contained editor can therefore ``defect'' to some other
- @techlink{display} with an administrator. When a contained editor
- defects and the snip is eventually inserted into a different editor,
- the snip drops the traitor contained editor, setting its contained
- editor to @racket[#f].
-
-}
-
-@defmethod[(set-inset [l exact-nonnegative-integer?]
-                      [t exact-nonnegative-integer?]
-                      [r exact-nonnegative-integer?]
-                      [b exact-nonnegative-integer?])
-           void?]{
-
-Sets the current border insets for the snip. The inset sets how much
- space is left between the edge of the snip and the border.
-
-}
-
-
-@defmethod[(set-margin [l exact-nonnegative-integer?]
-                       [t exact-nonnegative-integer?]
-                       [r exact-nonnegative-integer?]
-                       [b exact-nonnegative-integer?])
-           void?]{
-
-Sets the current margins for the snip. The margin sets how much space
- is left between the edge of the editor's contents and the edge of the
- snip.
-
-}
-
-@defmethod[(set-max-height [h (or/c (and/c real? (not/c negative?)) 'none)])
-           void?]{
-
-@edsnipmax[@racket[height]]
-
-Zero or @racket['none] disables the limit.
-
-}
-
-@defmethod[(set-max-width [w (or/c (and/c real? (not/c negative?)) 'none)])
-           void?]{
-
-@edsnipmax[@racket[width]] The contained editor's width limits are not
- changed by this method.
-
-Zero or @racket['none] disables the limit.
-
-}
-
-@defmethod[(set-min-height [h (or/c (and/c real? (not/c negative?)) 'none)])
-           void?]{
-
-@edsnipmin[@racket[height] @elem{top}]
-
-Zero or @racket['none] disables the limit.
-
-}
-
-@defmethod[(set-min-width [w (or/c (and/c real? (not/c negative?)) 'none)])
-           void?]{
-
-@edsnipmin[@racket[width] @elem{left}] The contained editor's width
- limits are not changed by this method.
-
-Zero or @racket['none] disables the limit.
-
-}
-
-@defmethod[(set-tight-text-fit [tight? any/c])
-           void?]{
-
-Enables or disables tight-text-fit mode. See @method[editor-snip%
- get-extent] for more information.
-
-See also @method[editor-snip% get-tight-text-fit].
-
-}
-
-@defmethod[(show-border [show? any/c])
-           void?]{
-
-Shows or hides the snip's border.
-
-}
-
-
-@defmethod[(style-background-used?)
-           boolean?]{
-
-Returns @racket[#t] if the snip uses its style's background and
- transparency information when drawing, @racket[#f] otherwise.
-
-See also @method[editor-snip% use-style-background].
-
-}
-
-
-@defmethod[(use-style-background [use? any/c])
-           void?]{
-
-Causes the snip to use or not used (the default) its style's
- background and transparency information for drawing the background
- within the snip's border.
-
-If @racket[use?] is @racket[#f], the style background and transparency
-information is ignored, otherwise is it used.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-snip-editor-admin-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-snip-editor-admin-intf.scrbl
deleted file mode 100644
index fae19d48aa..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-snip-editor-admin-intf.scrbl
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[editor-snip-editor-admin<%> ()]{
-
-An instance of this administrator interface is created with each
- @racket[editor-snip%] object; new instances cannot be
- created directly.
-
-
-@defmethod[(get-snip)
-           (is-a?/c editor-snip%)]{
-
-Returns the snip that owns this administrator (and displays the
-editor controlled by the administrator, if any).
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-in-base-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-in-base-class.scrbl
deleted file mode 100644
index 3cf829b13d..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-in-base-class.scrbl
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[editor-stream-in-base% object% ()]{
-
-An @racket[editor-stream-in-base%] object is used by an
- @racket[editor-stream-in%] object to perform low-level reading of
- data.
-
-The @racket[editor-stream-in-base%] class is never instantiated
- directly, but the derived class @racket[editor-stream-in-bytes-base%]
- can be instantiated.  New derived classes must override all of the
- methods described in this section.
-
-
-@defmethod[(bad?)
-           boolean?]{
-
-Returns @racket[#t] if there has been an error reading from the
- stream, @racket[#f] otherwise.
-
-}
-
-@defmethod[(read [data (and/c vector? (not immutable?))])
-           exact-nonnegative-integer?]{
-
-Like @method[editor-stream-in-base% read-bytes], but fills a supplied
-vector with Latin-1 characters instead of filling a byte string.  This method
-is implemented by default via @method[editor-stream-in-base% read-bytes].}
-
-@defmethod[(read-bytes [bstr (and/c bytes? (not immutable?))])
-           exact-nonnegative-integer?]{
-
-Reads bytes to fill the supplied byte string. The return value is the
- number of bytes read, which may be less than the number
- requested if the stream is emptied. If the stream is emptied, the
- next call to @method[editor-stream-in-base% bad?] must return
- @racket[#t].}
-
-@defmethod[(read-byte) (or/c byte? #f)]{
-
-Reads a single byte and return it, or returns @racket[#f] if no more
-bytes are available. The default implementation of this method uses
-@method[editor-stream-in-base% read-bytes].
-
-}
-
-@defmethod[(seek [pos exact-nonnegative-integer?])
-           void?]{
-
-Moves to the specified absolute position in the stream.
-
-}
-
-@defmethod[(skip [n exact-nonnegative-integer?])
-           void?]{
-
-Skips past the next @racket[n] characters in the stream.
-
-}
-
-@defmethod[(tell)
-           exact-nonnegative-integer?]{
-
-Returns the current stream position.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-in-bytes-base-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-in-bytes-base-class.scrbl
deleted file mode 100644
index 1fe3da2040..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-in-bytes-base-class.scrbl
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[editor-stream-in-bytes-base% editor-stream-in-base% ()]{
-
-An @racket[editor-stream-in-bytes-base%] object can be used to
-read editor data from a byte string.
-
-
-@defconstructor/make[([s bytes?])]{
-
-Creates a stream base that reads from @racket[s].
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-in-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-in-class.scrbl
deleted file mode 100644
index 1af50e0eb7..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-in-class.scrbl
+++ /dev/null
@@ -1,148 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[editor-stream-in% object% ()]{
-
-An @racket[editor-stream-in%] object is used to read editor
- information from a file or other input stream (such as the
- clipboard).
-
-
-
-@defconstructor/make[([base (is-a?/c editor-stream-in-base%)])]{
-
-An in-stream base---possibly an @racket[editor-stream-in-bytes-base%]
- object---must be supplied in @racket[base].
-
-}
-
-
-@defmethod*[([(get [v (box/c exact-integer?)])
-              (is-a?/c editor-stream-in%)]
-             [(get [v (box/c real?)])
-              (is-a?/c editor-stream-in%)])]{
-
-Reads data from the stream, returning itself.
-Reading from a bad stream always gives @racket[0].
-
-@boxisfill[@racket[v] @elem{the next integer or floating-point value in the stream}]
-
-}
-
-
-@defmethod[(get-bytes [len (or/c (box/c exact-nonnegative-integer?) #f) #f])
-           (or/c bytes? #f)]{
-
-Like @method[editor-stream-in% get-unterminated-bytes], but the last
- read byte is assumed to be a nul terminator and discarded. Use this
- method when data is written by a call to @method[editor-stream-out%
- put] without an explicit byte count, and use
- @method[editor-stream-in% get-unterminated-bytes] when data is
- written with an explicit byte count.
-
-@boxisfillnull[@racket[len] @elem{the length of the byte string plus one (to indicate the terminator)}]
-
-}
-
-@defmethod[(get-exact)
-           exact-integer?]{
-
-Returns the next integer value in the stream.
-
-}
-
-@defmethod[(get-fixed [v (box/c exact-integer?)])
-           (is-a?/c editor-stream-in%)]{
-
-@boxisfill[@racket[v] @elem{a fixed-size integer from the stream obtained through 
-           @method[editor-stream-in% get-fixed-exact]}]
-
-}
-
-@defmethod[(get-fixed-exact)
-           exact-integer?]{
-
-Gets a fixed-sized integer from the stream. See
-@method[editor-stream-out% put-fixed] for more information.
-Reading from a bad stream always gives @racket[0].
-
-}
-
-@defmethod[(get-inexact)
-           real?]{
-
-Returns the next floating-point value in the stream.
-
-}
-
-@defmethod[(get-unterminated-bytes [len (or/c (box/c exact-nonnegative-integer?) #f) #f])
-           (or/c bytes? #f)]{
-
-Returns the next byte string from the stream.  This is
-the recommended way to read bytes back in from a stream;
-use @method[editor-stream-out% put] with two arguments
-(passing along the length of the bytes) to write out the bytes
-to match this method.
-
-Reading from a bad stream returns @racket[#f] or @racket[#""].
-
-Note that when @method[editor-stream-out% put] is not given a byte
- length, it includes an extra byte for a nul terminator; use
- @method[editor-stream-in% get-bytes] to read such byte strings.
-
-@boxisfillnull[@racket[len] @elem{the length of the byte string}]
-
-}
-
-@defmethod[(jump-to [pos exact-nonnegative-integer?])
-           void?]{
-
-Jumps to a given position in the stream.
-
-}
-
-@defmethod[(ok?)
-           boolean?]{
-
-Returns @racket[#t] if the stream is ready for reading, @racket[#f] otherwise.
-Reading from a bad stream always returns @racket[0] or @racket[""].
-
-}
-
-@defmethod[(remove-boundary)
-           void?]{
-
-See @method[editor-stream-in% set-boundary].
-
-}
-
-@defmethod[(set-boundary [n exact-nonnegative-integer?])
-           void?]{
-
-Sets a file-reading boundary at @racket[n] bytes past the current
- stream location. If there is an attempt to read past this boundary,
- an error is signaled. The boundary is removed with a call to
- @method[editor-stream-in% remove-boundary].  Every call to
- @method[editor-stream-in% set-boundary] must be balanced by a call to
- @method[editor-stream-in% remove-boundary].
-
-Boundaries help keep a subroutine from reading too much data leading
- to confusing errors. However, a malicious subroutine can call
- @method[editor-stream-in% remove-boundary] on its own.
-
-}
-
-
-@defmethod[(skip [n exact-nonnegative-integer?])
-           void?]{
-
-Skips past the next @racket[n] bytes in the stream.
-
-}
-
-@defmethod[(tell)
-           exact-nonnegative-integer?]{
-
-Returns the current stream position.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-out-base-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-out-base-class.scrbl
deleted file mode 100644
index 41193d668b..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-out-base-class.scrbl
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[editor-stream-out-base% object% ()]{
-
-An @racket[editor-stream-out-base%] object is used by an
- @racket[editor-stream-out%] object to perform low-level writing of
- data.
-
-The @racket[editor-stream-out-base%] class is never instantiated
- directly, but the derived class
- @racket[editor-stream-out-bytes-base%] can be instantiated.  New
- derived classes must override all of the methods described in this
- section.
-
-
-@defmethod[(bad?)
-           boolean?]{
-
-Returns @racket[#t] if there has been an error writing to the stream,
- @racket[#f] otherwise.
-
-}
-
-@defmethod[(seek [pos exact-nonnegative-integer?])
-           void?]{
-
-Moves to the specified absolute position in the stream.
-
-}
-
-@defmethod[(tell)
-           exact-nonnegative-integer?]{
-
-Returns the current stream position.
-
-}
-
-@defmethod[(write [data (listof char?)])
-           void?]{
-
-Writes data (encoded as Latin-1 characters) to the stream. This method
-is implemented by default via @method[editor-stream-out-base%
-write-bytes].}
-
-@defmethod[(write-bytes [bstr bytes?]) void?]{
-
-Writes data to the stream.}}
-
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-out-bytes-base-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-out-bytes-base-class.scrbl
deleted file mode 100644
index bcd0867dd4..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-out-bytes-base-class.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[editor-stream-out-bytes-base% editor-stream-out-base% ()]{
-
-An @racket[editor-stream-out-bytes-base%] object can be used to write
- editor data into a byte string.
-
-@defconstructor[()]{
-
-Creates an empty stream.
-
-}
-
-@defmethod[(get-bytes)
-           bytes?]{
-
-Returns the current contents of the stream.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-out-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-out-class.scrbl
deleted file mode 100644
index f15cd4be37..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-stream-out-class.scrbl
+++ /dev/null
@@ -1,105 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[editor-stream-out% object% ()]{
-
-An @racket[editor-stream-out%] object is used to write editor
- information to a file or other output stream (such as the
- clipboard).
-
-
-
-@defconstructor/make[([base (is-a?/c editor-stream-out-base%)])]{
-
-An out-stream base---possibly an
-@racket[editor-stream-out-bytes-base%] object---must be supplied in
-@racket[base].
-
-}
-
-@defmethod[(jump-to [pos exact-nonnegative-integer?])
-           void?]{
-Jumps to a given position in the stream.
-
-}
-
-@defmethod[(ok?)
-           boolean?]{
-Returns @racket[#t] if the stream is ready for writing, @racket[#f] otherwise.
-Writing to a bad stream has no effect.
-
-}
-
-@defmethod[(pretty-finish)
-           void?]{
-
-Ensures that the stream ends with a newline.
-This method is called by
-@racket[write-editor-global-footer].
-
-}
-
-
-@defmethod[(pretty-start)
-           void?]{
-
-Writes a ``comment'' into the stream that identifies the file format.
-This method is called by @racket[write-editor-global-header].
-
-}
-
-@defmethod*[([(put [n exact-nonnegative-integer?]
-                   [v bytes?])
-              (is-a?/c editor-stream-out%)]
-             [(put [v bytes?])
-              (is-a?/c editor-stream-out%)]
-             [(put [v exact-integer?])
-              (is-a?/c editor-stream-out%)]
-             [(put [v real?])
-              (is-a?/c editor-stream-out%)])]{
-
-
-Writes @racket[v], or @racket[n] bytes of @racket[v]. 
-
-When @racket[n] is supplied with a byte-string @racket[v], use
- @method[editor-stream-in% get-unterminated-bytes] to read the bytes
- later. This is the recommended way to write out bytes to 
- be easily read in later; use @method[editor-stream-in%
- get-unterminated-bytes] to read the bytes back in.
-
-If @racket[n] is not supplied and @racket[v] is a byte string, then
- for historical reasons, the actual number of bytes written includes a
- @racket[#\nul] terminator, so use @method[editor-stream-in%
- get-bytes] instead of @method[editor-stream-in%
- get-unterminated-bytes] to read the bytes later.
-
-}
-
-
-@defmethod[(put-fixed [v exact-integer?])
-           (is-a?/c editor-stream-out%)]{
-
-Puts a fixed-sized integer into the stream. This method is needed
- because numbers are usually written in a way that takes varying
- numbers of bytes. In some cases it is useful to temporary write a
- @racket[0] to a stream, write more data, and then go back and change
- the @racket[0] to another number; such a process requires a
- fixed-size number.
-
-Numbers written to a stream with @method[editor-stream-out% put-fixed]
- must be read with @method[editor-stream-in% get-fixed-exact]
- or @method[editor-stream-in% get-fixed].}
-
-
-@defmethod[(put-unterminated [v bytes?]) (is-a?/c editor-stream-out%)]{
-
-The same as calling @method[editor-stream-out% put] with
-@racket[(bytes-length v)] and @racket[v].}
-
-
-@defmethod[(tell)
-           exact-nonnegative-integer?]{
-
-Returns the current stream position.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-wordbreak-map-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-wordbreak-map-class.scrbl
deleted file mode 100644
index 8f56a9fea7..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/editor-wordbreak-map-class.scrbl
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[editor-wordbreak-map% object% ()]{
-
-An @racket[editor-wordbreak-map%] objects is used with a
- @racket[text%] objects to specify word-breaking criteria for the
- default wordbreaking function.  See also @method[text%
- set-wordbreak-map], @method[text% get-wordbreak-map], @method[text%
- find-wordbreak], and @method[text% set-wordbreak-func].
-
-A global object @racket[the-editor-wordbreak-map] is created
- automatically and used as the default map for all @racket[text%]
- objects.
-
-A wordbreak objects implements a mapping from each character to a list
-  of symbols. The following symbols are legal elements of the list:
-
-@itemize[
-@item{@indexed-racket['caret]}
-@item{@indexed-racket['line]}
-@item{@indexed-racket['selection]}
-@item{@indexed-racket['user1]}
-@item{@indexed-racket['user2]}
-]
-
-The presence of a flag in a character's value indicates that the
- character does not break a word when searching for breaks using the
- corresponding reason. For example, if @racket['caret] is present,
- then the character is a non-breaking character for caret-movement
- words. (Each stream of non-breaking characters is a single word.)
-
-
-
-@defconstructor[()]{
-
-All ASCII alpha-numeric characters are initialized with
- @racket['(caret line selection)]. All other ASCII non-whitespace
- characters except @litchar{-} are initialized with
- @racket['(line)]. All ASCII whitespace characters and @litchar{-} are
- initialized with @racket[null].
-
-}
-
-@defmethod[(get-map [char char?])
-           (listof (or/c 'caret 'line 'selection 'user1 'user2))]{
-
-Gets the mapping value for @racket[char].  See
-@racket[editor-wordbreak-map%] for more information.
-
-}
-
-@defmethod[(set-map [char char?]
-                    [value (listof (or/c 'caret 'line 'selection 'user1 'user2))])
-           void?]{
-
-
-Sets the mapping value for @racket[char] to @racket[value].  See
-@racket[editor-wordbreak-map%] for more information.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/event-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/event-class.scrbl
deleted file mode 100644
index 822c9c53cb..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/event-class.scrbl
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[event% object% ()]{
-
-An @racket[event%] object contains information about a control,
-keyboard, mouse, or scroll event. See also
-@racket[control-event%], 
-@racket[key-event%],
-@racket[mouse-event%], and
-@racket[scroll-event%].
-
-
-@defconstructor[([time-stamp exact-integer? 0])]{
-
-See @method[event% get-time-stamp] for information about
- @racket[time-stamp].
-
-}
-
-@defmethod[(get-time-stamp)
-           exact-integer?]{
-
-Returns the time, in milliseconds, when the event occurred. This time
- is compatible with times reported by Racket's
- @racket[current-milliseconds] procedure.
-
-}
-
-@defmethod[(set-time-stamp [time exact-integer?])
-           void?]{
-
-Set the time, in milliseconds, when the event occurred. See also
- Racket's @racket[current-milliseconds].
-
-If the supplied value is outside the platform-specific range of time
- values, @|MismatchExn|.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/eventspace-funcs.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/eventspace-funcs.scrbl
deleted file mode 100644
index 5326ade02e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/eventspace-funcs.scrbl
+++ /dev/null
@@ -1,239 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "eventspace-funcs"]{Eventspaces}
-
-@defproc[(make-eventspace)
-         eventspace?]{
-Creates and returns a new @tech{eventspace} value. The new eventspace is
- created as a child of the current eventspace. The eventspace is used
- by making it the current eventspace with the
- @racket[current-eventspace] parameter.
-
-See @|eventspacediscuss| for more information about eventspaces.
-
-}
-
-@defparam[current-eventspace e eventspace?]{
-
-A parameter @|SeeMzParam| that determines the current eventspace.
-
-See @|eventspacediscuss| for more information about eventspaces.
-
-}
-
-
-@defproc[(eventspace? [v any/c])
-         boolean?]{
-
-Returns @racket[#t] if @racket[v] is an eventspace value or @racket[#f]
- otherwise.
-
-See @|eventspacediscuss| for more information about eventspaces.
-}
-
-
-@defparam[event-dispatch-handler handler (eventspace? . -> . any)]{
-
-A parameter @|SeeMzParam| that determines the current event
- dispatch handler. The event dispatch handler is called by an
- eventspace's handler thread for every queue-based event to be
- processed in the eventspace. The only argument to the handler is the
- eventspace in which an event should be dispatched. The event dispatch
- handler gives the programmer control over the timing of event
- dispatching, but not the order in which events are dispatched within
- a single eventspace.
-
-An event dispatch handler must ultimately call the primitive event
- dispatch handler. If an event dispatch handler returns without
- calling the primitive handler, then the primitive handler is called
- directly by the eventspace handler thread.
-}
-
-
-@defproc[(eventspace-event-evt [e eventspace? (current-eventspace)]) evt?]{
-
-Produces a synchronizable event (see @racket[sync]) that is ready when
-a GUI event (mouse or keyboard action, update event, timer, queued
-callback, etc.) is ready for dispatch in @racket[e]. That is, the
-result event is ready when @racket[(yield)] for the eventspace
-@racket[e] would dispatch a GUI event. The synchronization result is
-the eventspace @racket[e] itself.
-}
-
-
-@defproc[(check-for-break)
-         boolean?]{
-Inspects the event queue of the current eventspace, searching for a
- Shift-Ctl-C (Unix, Windows) or Cmd-. (Mac OS X) key combination. Returns
- @racket[#t] if such an event was found (and the event is dequeued) or
- @racket[#f] otherwise.
-
-}
-
-@defproc[(get-top-level-windows)
-         (listof (or/c (is-a?/c frame%) (is-a?/c dialog%)))]{
-Returns a list of visible top-level frames and dialogs in the current
- eventspace.
-
-}
-
-@defproc[(get-top-level-focus-window)
-         (or/c (is-a?/c frame%) (is-a?/c dialog%) #f)]{
-Returns the top level window in the current eventspace that has the
- keyboard focus (or contains the window with the keyboard focus), or
- @racket[#f] if no window in the current eventspace has the focus.
-
-}
-
-@defproc[(get-top-level-edit-target-window)
-         (or/c (is-a?/c frame%) (is-a?/c dialog%) #f)]{
-Returns the top level window in the current eventspace that is visible
- and most recently had the keyboard focus (or contains the window that
- had the keyboard focus), or @racket[#f] if there is no visible window
- in the current eventspace.
-
-}
-
-@defproc*[([(special-control-key [on? any/c])
-            void?]
-           [(special-control-key)
-            boolean?])]{
-
-Enables or disables special Control key handling (Mac OS X). When Control
- is treated as a special key, the system's key-mapper is called
- without Control for keyboard translations. For some languages,
- Control key presses must be seen by the system translation, so this
- mode should be turned off, but the default is on.
-
-If @racket[on?] is provided and @racket[#f], Control is passed to the system
-translation as normal. This setting affects all windows and
-eventspaces.
-
-If no argument is provided, the result is @racket[#t] if Control is
-currently treated specially, @racket[#f] otherwise.
-
-}
-
-@defproc*[([(special-option-key [on? any/c])
-            void?]
-           [(special-option-key)
-            boolean?])]{
-Enables or disables special Option key handling (Mac OS X). When
- Option is treated as a special key, the system's key-mapper is called
- without Option for keyboard translations. By default, Option is not
- special.
-
-If @racket[on?] is provided @racket[#f], Option is passed to the
- system translation as normal. This setting affects all windows and
- eventspaces.
-
-If no argument is provided, the result is @racket[#t] if Option is
- currently treated specially, @racket[#f] otherwise.
-}
-
-@defproc[(queue-callback [callback (-> any)]
-                         [high-priority? any/c #t])
-         void?]{
-Installs a procedure to be called via the current eventspace's event
- queue. The procedure is called once in the same way and under the
- same restrictions that a callback is invoked to handle a method.
-
-A second (optional) boolean argument indicates whether the callback
- has a high or low priority in the event queue. See
- @|eventspacediscuss| for information about the priority of events.
-
-}
-
-@defproc*[([(yield)
-            boolean?]
-           [(yield [v (or/c 'wait evt?)])
-            any/c])]{
-@;@index{pause}@index{wait}
-Yields control to event dispatching. See
- @secref["eventspaceinfo"] for details.
-
-A handler procedure invoked by the system during a call to
- @racket[yield] can itself call @racket[yield], creating
- an additional level of nested (but single-threaded) event handling.
-
-See also @racket[sleep/yield].
-
-If no argument is provided, @racket[yield] dispatches an unspecified
- number of events, but only if the current thread is the current
- eventspace's handler thread (otherwise, there is no effect). The
- result is @racket[#t] if any events may have been handled,
- @racket[#f] otherwise.
-
-If @racket[v] is @indexed-racket['wait], and @racket[yield] is called
- in the handler thread of an eventspace, then @racket[yield] starts
- processing events in that eventspace until
-
-@itemize[
-
-  @item{no top-level windows in the eventspace are visible;}
-
-  @item{no timers in the eventspace are running;}
-
-  @item{no callbacks are queued in the eventspace; and}
-
-  @item{no @racket[menu-bar%] has been created for the eventspace
-        with @racket['root] (i.e., creating a @racket['root] menu bar
-        prevents an eventspace from ever unblocking).}
-
-]
-
-When called in a non-handler thread, @racket[yield] returns
- immediately. In either case, the result is @racket[#t].
-
-Evaluating @racket[(yield 'wait)] is thus similar to
- @racket[(yield (current-eventspace))], except that it is
- sensitive to whether the current thread is a handler thread, instead
- of the value of the @racket[current-eventspace] parameter.
-
-If @racket[v] is an event in Racket's sense (not to be confused with
- a GUI event), @racket[yield] blocks on @racket[v] in the same way as
- @racket[sync], except that it may start a @racket[sync] on @racket[v]
- multiple times (but it will complete a @racket[sync] on @racket[v] at
- most one time). If the current thread is the current eventspace's
- handler thread, events are dispatched until a @racket[v] sync
- succeeds on an event boundary. For other threads, calling
- @racket[yield] with a Racket event is equivalent to calling
- @racket[sync]. In either case, the result is the same that of
- @racket[sync]; however, if a wrapper procedure is associated with
- @racket[v] via @racket[handle-evt], it is not called in tail position
- with respect to the @racket[yield].
-
-Always use @racket[(yield v)] instead of a busy-wait loop.
-}
-
-@defproc[(sleep/yield [secs (and/c real? (not/c negative?))])
-         void?]{
-Blocks for at least the specified number of seconds, handling events
- meanwhile if the current thread is the current eventspace's handler
- thread (otherwise, @racket[sleep/yield] is equivalent to
- @racket[sleep]).
-
-}
-
-@defproc[(eventspace-shutdown? [e eventspace?])
-         boolean?]{
-Returns @racket[#t] if the given eventspace has been shut down by its
- custodian, @racket[#f] otherwise. Attempting to create a new window,
- timer, or explicitly queued event in a shut-down eventspace raises
- the @racket[exn:fail] exception.
-
-Attempting to use certain methods of windows and timers in a shut-down
- eventspace also raises the @racket[exn:fail] exception, but the
-@xmethod[area<%> get-top-level-window] and
-@xmethod[top-level-window<%> get-eventspace] methods work even after the area's eventspace is shut down.
-
-}
-
-@defproc[(eventspace-handler-thread [e eventspace?])
-         (or/c thread? #f)]{
-Returns the handler thread of the given eventspace. If the handler
- thread has terminated (e.g., because the eventspace was shut down), the
- result is @racket[#f].
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/font-funcs.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/font-funcs.scrbl
deleted file mode 100644
index ee67771caf..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/font-funcs.scrbl
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{Fonts}
-
-@defthing[menu-control-font (is-a?/c font%)]{
-
-This font is the default for @racket[popup-menu%] objects.
-
-On Mac OS X, this font is slightly larger than
- @racket[normal-control-font]. On Windows and Unix, it is the same
- size as @racket[normal-control-font].
-
-}
-
-@defthing[normal-control-font (is-a?/c font%)]{
-
-This font is the default for most controls, except
- @racket[list-box%] and @racket[group-box-panel%] objects.
-
-}
-
-@defthing[small-control-font (is-a?/c font%)]{
-
-This font is the default for @racket[group-box-panel%] objects, and it is
- a suitable for controls in a floating window and other contexts that
- need smaller controls.
-
-On Windows, this font is the same size as
- @racket[normal-control-font], since the Windows control font is
- already relatively small. On Unix and Mac OS X, this font is slightly
- smaller than @racket[normal-control-font].
-
-
-}
-
-@defthing[tiny-control-font (is-a?/c font%)]{
-
-This font is for tiny controls, and it is smaller than
- @racket[small-control-font] on all platforms.
-
-}
-
-@defthing[view-control-font (is-a?/c font%)]{
-
-This font is the default for @racket[list-box%] objects (but not
- list box labels, which use @racket[normal-control-font]).
-
-On Mac OS X, this font is slightly smaller than
- @racket[normal-control-font], and slightly larger than
- @racket[small-control-font]. On Windows and Unix, it is the same size
- as @racket[normal-control-font].
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/frame-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/frame-class.scrbl
deleted file mode 100644
index f686e13b0e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/frame-class.scrbl
+++ /dev/null
@@ -1,272 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[frame% object% (top-level-window<%>)]{
-
-A frame is a top-level container window. It has a title bar (which
- displays the frame's label), an optional menu bar, and an optional
- status line.
-
-@defconstructor[([label label-string?]
-                 [parent (or/c (is-a?/c frame%) #f) #f]
-                 [width (or/c dimension-integer? #f) #f]
-                 [height (or/c dimension-integer? #f) #f]
-                 [x (or/c position-integer? #f) #f]
-                 [y (or/c position-integer? #f) #f]
-                 [style (listof (or/c 'no-resize-border 'no-caption 
-                                      'no-system-menu 'hide-menu-bar 
-                                      'toolbar-button 'float 'metal
-                                      'fullscreen-button 'fullscreen-aux))
-                        null]
-                 [enabled any/c #t]
-                 [border spacing-integer? 0]
-                 [spacing spacing-integer? 0]
-                 [alignment (list/c (or/c 'left 'center 'right)
-                                    (or/c 'top 'center 'bottom))
-                            '(center top)]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-The @racket[label] string is displayed in the frame's title
-bar. If the frame's label is changed (see @method[window<%>
-set-label]), the title bar is updated.
-
-The @racket[parent] argument can be @racket[#f] or an existing
-frame. On Windows, if @racket[parent] is an existing frame,
-the new frame is always on top of its parent.
-On Windows and Unix (for many window managers), a
-frame is iconized when its parent is iconized.
-
-If @racket[parent] is @racket[#f], then the eventspace for the
-new frame is the current eventspace, as determined by
-@racket[current-eventspace]. Otherwise, @racket[parent]'s
-eventspace is the new frame's eventspace.
-
-If the @racket[width] or @racket[height] argument is not
-@racket[#f], it specifies an initial size for the frame (in
-pixels) assuming that it is larger than the minimum size,
-otherwise the minimum size is used.
-
-If the @racket[x] or @racket[y] argument is not @racket[#f], it
-specifies an initial location for the frame. Otherwise, a
-location is selected automatically (tiling frames and dialogs as
-they are created).
-
-The @racket[style] flags adjust the appearance of the frame on
-some platforms:
-
-@itemize[
-
- @item{@racket['no-resize-border] --- omits the resizeable border
-  around the window (Windows, Unix), ability to resize the window (Mac
-  OS X), or grow box in the bottom right corner (older Mac OS X)}
-
- @item{@racket['no-caption] --- omits the title bar for the frame
- (Windows, Mac OS X, Unix)}
-
- @item{@racket['no-system-menu] --- omits the system menu
- (Windows)}
-
- @item{@racket['toolbar-button] --- includes a toolbar button on the
- frame's title bar (Mac OS X 10.6 and earlier); a click on the toolbar button triggers
- a call to @method[frame% on-toolbar-button-click]}
-
- @item{@racket['hide-menu-bar] --- hides the menu bar and dock when
- the frame is active (Mac OS X) or asks the window manager to make
- the frame fullscreen (Unix)}
-
- @item{@racket['float] --- causes the frame to stay in front of all
- other non-floating windows (Windows, Mac OS X, Unix); on Mac OS X, a floating frame
- shares the focus with an active non-floating frame; when this style
- is combined with @racket['no-caption], then showing the frame does
- not cause the keyboard focus to shift to the window, and on Unix,
- clicking the frame does not move the focus; on Windows, a floating
- frame has no taskbar button}
-
- @item{@racket['metal] --- ignored (formerly supported for Mac OS X)}
-
- @item{@racket['fullscreen-button] --- includes a button on the
- frame's title bar to put the frame in fullscreen mode (Mac OS X 10.7 and later)}
-
- @item{@racket['fullscreen-aux] --- allows the frame to accompany
- another that is in fullscreen mode (Mac OS X 10.7 and later)}
-
-]
-
-Even if the frame is not shown, a few notification events may be
- queued for the frame on creation. Consequently, the new frame's
- resources (e.g., memory) cannot be reclaimed until some events are
- handled, or the frame's eventspace is shut down.
-
-@WindowKWs[@racket[enabled]] @AreaContKWs[] @AreaKWs[]
-
-@history[#:changed "6.0.0.6" @elem{Added @racket['fullscreen-button]
-                                   and @racket['fullscreen-aux] options 
-                                   for @racket[style].}]
-
-}
-
-
-@defmethod[(create-status-line)
-           void?]{
-
-Creates a status line at the bottom of the frame. The width of the
- status line is the whole width of the frame (adjusted automatically
- when resizing), and the height and text size are platform-specific.
-
-See also @method[frame% set-status-text].
-
-}
-
-@defmethod[(fullscreen [fullscreen? any/c])
-           void?]{
-
-Puts the frame in fullscreen mode or restores the frame to
- non-fullscreen mode (Mac OS X).
-
-@Unmonitored[@elem{A frame's mode} @elem{the user} @elem{a
-frame has been put in fullscreen mode} @elem{@method[frame% is-fullscreened?]}]
-
-@history[#:added "6.0.0.6"]
-
-}
-
-@defmethod[(get-menu-bar)
-           (or/c (is-a?/c menu-bar%) #f)]{
-
-Returns the frame's menu bar, or @racket[#f] if none has been created
- for the frame.
-
-}
-
-@defmethod[(has-status-line?)
-           boolean?]{
-
-Returns @racket[#t] if the frame's status line has been created,
- @racket[#f] otherwise. See also @method[frame% create-status-line].
-
-}
-
-@defmethod[(iconize [iconize? any/c])
-           void?]{
-
-Iconizes (@as-index{minimizes}) or deiconizes (restores) the
- frame. Deiconizing brings the frame to the front.
-
-@Unmonitored[@elem{A frame's iconization} @elem{the user} @elem{a
-frame has been iconized} @elem{@method[frame% is-iconized?]}]
-
-}
-
-@defmethod[(is-fullscreened?)
-           boolean?]{
-
-Returns @racket[#t] if the frame is in fullscreen mode (Mac OS X), @racket[#f]
-otherwise.
-
-@history[#:added "6.0.0.6"]
-}
-
-@defmethod[(is-iconized?)
-           boolean?]{
-
-Returns @racket[#t] if the frame is iconized (minimized), @racket[#f]
-otherwise.
-
-}
-
-@defmethod[(is-maximized?)
-           boolean?]{
-
-On Windows and Mac OS X, returns @racket[#t] if the frame is
-maximized, @racket[#f] otherwise. On Unix, the result is always
-@racket[#f].
-
-}
-
-@defmethod[(maximize [maximize? any/c])
-           void?]{
-@methspec{
-
-Maximizes or restores the frame on Windows and Mac OS X; the
- frame's show state is not affected. On Windows, an iconized frame
- cannot be maximized or restored.
-
-@MonitorMethod[@elem{A window's maximization} @elem{the user} @elem{@method[window<%> on-size]} @elem{size}]
-
-}
-@methimpl{
-
-If @racket[maximize?] is @racket[#f], the window is restored, otherwise
- it is maximized.
-
-
-
-}}
-
-@defmethod*[([(modified)
-              boolean?]
-             [(modified [modified? any/c])
-              void?])]{
-
-Gets or sets the frame's modification state as reflected to the user.
- On Mac OS X, the modification state is reflected as a dot in the
- frame's close button. On Windows and Unix, the modification state is
- reflected by an asterisk at the end of the frame's displayed title.
-
-}
-
-@defmethod[(on-menu-char [event (is-a?/c key-event%)])
-           boolean?]{
-
-If the frame has a menu bar with keyboard shortcuts, and if the key
-event includes a Control, Alt, Option, Meta, Command, Shift, or
-Function key, then @method[frame% on-menu-char] attempts to match the
-given event to a menu item. If a match is found, @racket[#t] is
-returned, otherwise @racket[#f] is returned.
-
-When the match corresponds to a complete shortcut combination, the
- menu item's callback is called (before
-@method[frame% on-menu-char] returns).
-
-If the event does not correspond to a complete shortcut combination,
- the event may be handled anyway if it corresponds to a mnemonic in the
- menu bar (i.e., an underlined letter in a menu's title, which is
- installed by including an ampersand in the menu's label). If a
- mnemonic match is found, the keyboard focus is moved to the menu bar
- (selecting the menu with the mnemonic), and @racket[#t] is returned.
-
-}
-
-@defmethod[#:mode override 
-           (on-subwindow-char [receiver (is-a?/c window<%>)]
-                              [event (is-a?/c key-event%)])
-           boolean?]{
-
-Returns the result of
-
-@racketblock[
-(or (send this @#,method[frame% on-menu-char] event)
-    (send this @#,method[top-level-window<%> on-system-menu-char] event)
-    (send this @#,method[top-level-window<%> on-traverse-char] event))
-]
-}
-
-@defmethod[(on-toolbar-button-click)
-           void?]{
-
-On Mac OS X, called when the user clicks the toolbar button on a
- frame created with the @indexed-racket['toolbar-button] style.
-
-}
-
-@defmethod[(set-status-text [text string?])
-           void?]{
-
-Sets the frame's status line text and redraws the status line. See
- also @method[frame% create-status-line].
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/gauge-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/gauge-class.scrbl
deleted file mode 100644
index d57db49216..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/gauge-class.scrbl
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/gauge}}
-
-@defclass/title[gauge% object% (control<%>)]{
-
-A gauge is a horizontal or vertical bar for displaying the output
-value of a bounded integer quantity. Each gauge has an adjustable
-range, and the gauge's current value is always between 0 and its
-range, inclusive. Use @method[gauge% set-value] to set the value
-of the gauge.
-
-
-@defconstructor[([label (or/c label-string? #f)]
-                 [range positive-dimension-integer?]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [style (listof (or/c 'horizontal 'vertical 
-                                      'vertical-label 'horizontal-label 
-                                      'deleted)) 
-                        '(horizontal)]
-                 [font (is-a?/c font%) normal-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 2]
-                 [horiz-margin spacing-integer? 2]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c (memq 'horizontal style)]
-                 [stretchable-height any/c (memq 'vertical style)])]{
-
-If @racket[label] is a string, it is used as the gauge label; otherwise
- the gauge does not display a label.
-
-@labelsimplestripped[@racket[label] @elem{gauge}]
-
-The @racket[range] argument is an integer specifying the maximum value of
- the gauge (inclusive). The minimum gauge value is always @racket[0].
-
-The @racket[style] list must include either @racket['horizontal],
- specifying a horizontal gauge, or @racket['vertical], specifying a vertical
- gauge. @HVLabelNote[@racket[style]]{gauge} @DeletedStyleNote[@racket[style]
- @racket[parent]]{gauge}
-
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-
-
-}
-
-@defmethod[(get-range)
-           positive-dimension-integer?]{
-Returns the range (maximum value) of the gauge.
-
-}
-
-@defmethod[(get-value)
-           dimension-integer?]{
-
-Returns the gauge's current value.
-
-}
-
-@defmethod[(set-range [range positive-dimension-integer?])
-           void?]{
-
-Sets the range (maximum value) of the gauge.
-
-}
-
-@defmethod[(set-value [pos dimension-integer?])
-           void?]{
-
-Sets the gauge's current value. If the specified value is larger than
- the gauge's range, @|MismatchExn|.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/global-draw-funcs.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/global-draw-funcs.scrbl
deleted file mode 100644
index 4e458d30b9..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/global-draw-funcs.scrbl
+++ /dev/null
@@ -1,112 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{Global Graphics}
-
-@defproc[(flush-display)
-         void?]{
-
-Flushes canvas offscreen drawing and other updates onto the
- screen.
-
-Normally, drawing is automatically flushed to the screen. Use
-@racket[flush-display] sparingly to force updates to the screen when
-other actions depend on updating the display.}
-
-
-@defproc[(get-display-backing-scale [#:monitor monitor exact-nonnegative-integer? 0])
-                                    (or/c (>/c 0.0) #f)]{
-
-Returns the number of pixels that correspond to one drawing unit on a
-monitor.  The result is normally @racket[1.0], but it is @racket[2.0]
-on Mac OS X in Retina display mode, and on Windows it can be a value
-such as @racket[1.25], @racket[1.5], or @racket[2.0] when the operating-system
-scale for text is changed.  See also @secref["display-resolution"].
-
-On Mac OS X, the result can change at any time.  See also
-@xmethod[top-level-window<%> display-changed].
-
-If @racket[monitor] is not less than the current number of available
- monitors (which can change at any time), the is @racket[#f]. See also
- @xmethod[top-level-window<%> display-changed].
-
-@history[#:changed "1.2" @elem{Added backing-scale support on Windows.}]}
-
-
-@defproc[(get-display-count) exact-positive-integer?]{
-Returns the number of monitors currently active. 
-
-On Windows and Mac OS X, the result can change at any time.
-See also @xmethod[top-level-window<%> display-changed].}
-
-
-@defproc[(get-display-depth)
-         exact-nonnegative-integer?]{
-
-Returns the depth of the main display (a value of 1 denotes a monochrome display).
-
-}
-
-@defproc[(get-display-left-top-inset [avoid-bars? any/c #f]
-                                     [#:monitor monitor exact-nonnegative-integer? 0])
-         (values (if (= monitor 0)
-                     exact-nonnegative-integer?
-                     (or/c exact-nonnegative-integer? #f))
-                 (if (= monitor 0)
-                     exact-nonnegative-integer?
-                     (or/c exact-nonnegative-integer? #f)))]{
-
-When the optional argument is @racket[#f] (the default), this function
- returns the offset of @racket[monitor]'s origin from the
- top-left of the physical monitor. For @racket[monitor] @racket[0], on Unix and Windows, the result is
- always @racket[0] and @racket[0]; on Mac OS X, the result is
- @racket[0] and the height of the menu bar. To position a frame
- at a given @racket[monitor]'s top-left corner, use the negated results from
- @racket[get-display-left-top-inset] as the frame's position.
-
-When the optional @racket[avoid-bars?] argument is true, for @racket[monitor]
- @racket[0], @racket[get-display-left-top-inset] function returns the
- amount space at the left and top of the monitor that is occupied by
- the task bar (Windows) or menu bar and dock (Mac OS X). On Unix, for
- monitor @racket[0], the result is always @racket[0] and @racket[0].
- For monitors other than @racket[0], @racket[avoid-bars?] has no effect.
-
-If @racket[monitor] is not less than the current number of available
- monitors (which can change at any time), the results are @racket[#f]
- and @racket[#f]. See also @xmethod[top-level-window<%> display-changed].
-
-See also @secref["display-resolution"].}
-
-
-@defproc[(get-display-size [full-screen? any/c #f]
-                           [#:monitor monitor exact-nonnegative-integer? 0])
-         (values (if (= monitor 0)
-                     exact-nonnegative-integer?
-                     (or/c exact-nonnegative-integer? #f))
-                 (if (= monitor 0)
-                     exact-nonnegative-integer?
-                     (or/c exact-nonnegative-integer? #f)))]{
-
-@index["screen resolution"]{Gets} the physical size of the specified @racket[monitor] in
- pixels.  On Windows, this size does not include the task bar by
- default.  On Mac OS X, this size does not include the menu bar or
- dock area by default.
-
-On Windows and Mac OS X, if the optional argument is true and @racket[monitor] is @racket[0], then
- the task bar, menu bar, and dock area are included in the result.
-
-If @racket[monitor] is not less than the current number of available
- monitors (which can change at any time), the results are @racket[#f]
- and @racket[#f]. See also @xmethod[top-level-window<%> display-changed].
-
-See also @secref["display-resolution"].}
-
-
-
-@defproc[(is-color-display?)
-         boolean?]{
-
-Returns @racket[#t] if the main display has color, @racket[#f]
-otherwise.
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/group-box-panel-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/group-box-panel-class.scrbl
deleted file mode 100644
index 0c3e60ab23..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/group-box-panel-class.scrbl
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/group-box-panel}}
-
-@defclass/title[group-box-panel% vertical-panel% ()]{
-
-A group-box panel arranges its subwindows in a single column, but also
- draws an optional label at the top of the panel and a border around
- the panel content.
-
-Unlike most panel classes, a group-box panel's horizontal and vertical
- margins default to @racket[2].
-
-
-@defconstructor[([label label-string?]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%)
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [style (listof (or/c 'deleted)) null]
-                 [font (is-a?/c font%) small-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 2]
-                 [horiz-margin spacing-integer? 2]
-                 [border spacing-integer? 0]
-                 [spacing spacing-integer? 0]
-                 [alignment (list/c (or/c 'left 'center 'right)
-                                    (or/c 'top 'center 'bottom))
-                            '(center top)]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-Creates a group pane whose title is @racket[label].
-
-@DeletedStyleNote[@racket[style] @racket[parent]]{group panel}
-
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/grow-box-spacer-pane-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/grow-box-spacer-pane-class.scrbl
deleted file mode 100644
index 6410b51566..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/grow-box-spacer-pane-class.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[grow-box-spacer-pane% pane% ()]{
-
-A @racket[grow-box-spacer-pane%] object is intended for use as a
- lightweight spacer in the bottom-right corner of a frame, rather than
- as a container. On older version of Mac OS X, a
- @racket[grow-box-spacer-pane%] has the same width and height as the
- grow box that is inset into the bottom-right corner of a frame. On
- Windows, Unix, and recent Mac OS X, a @racket[grow-box-spacer-pane%] has zero width and
- height. Unlike all other container types, a
- @racket[grow-box-spacer-pane%] is unstretchable by default.
-
-
-@defconstructor/auto-super[()]{
-
-See @racket[pane%] for information on initialization arguments.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/gui.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/gui.scrbl
deleted file mode 100644
index 43ec381ebc..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/gui.scrbl
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{The Racket Graphical Interface Toolkit}
-
-@author["Matthew Flatt" "Robert Bruce Findler" "John Clements"]
-
-@declare-exporting[racket/gui/base racket/gui #:use-sources (mred)]
-
-@defmodule*/no-declare[(racket/gui/base)]{The
-@racketmodname[racket/gui/base] library provides all of the class,
-interface, and procedure bindings defined in this manual, in addition
-to the bindings of @racketmodname[racket/draw] and 
-@racketmodname[file/resource].}
-
-@defmodulelang*/no-declare[(racket/gui)]{The
-@racketmodname[racket/gui] language combines all bindings of the
-@racketmodname[racket] language and the
-@racketmodname[racket/gui/base] and @racketmodname[racket/draw] modules.}
-
-The @racketmodname[racket/gui] toolbox is roughly organized into two
-parts:
-
-@itemize[
-
- @item{The @deftech{windowing toolbox}, for implementing windows,
- buttons, menus, text fields, and other controls.}
-
- @item{The @deftech{editor toolbox}, for developing traditional text
- editors, editors that mix text and graphics, or free-form layout
- editors (such as a word processor, HTML editor, or icon-based file
- browser).}
-
-]
-
-Both parts of the toolbox rely extensively on the
-@racketmodname[racket/draw] drawing library.
-
-@table-of-contents[]
-
-@;------------------------------------------------------------------------
-
-@include-section["win-overview.scrbl"]
-@include-section["widget-gallery.scrbl"]
-@include-section["win-classes.scrbl"]
-@include-section["win-funcs.scrbl"]
-@include-section["editor-overview.scrbl"]
-@include-section["snip-classes.scrbl"]
-@include-section["editor-classes.scrbl"]
-@include-section["editor-funcs.scrbl"]
-@include-section["wxme.scrbl"]
-@include-section["prefs.scrbl"]
-@include-section["dynamic.scrbl"]
-@include-section["startup.scrbl"]
-@include-section["libs.scrbl"]
-
-@;------------------------------------------------------------------------
-
-@index-section[]
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/guide.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/guide.scrbl
deleted file mode 100644
index 6ae7984748..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/guide.scrbl
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:style '(toc reveal)]{Overview}
-
-@local-table-of-contents[]
-
-@;------------------------------------------------------------------------
-
-@include-section["win-overview.scrbl"]
-
-@;------------------------------------------------------------------------
-
-@include-section["editor-overview.scrbl"]
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/horizontal-pane-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/horizontal-pane-class.scrbl
deleted file mode 100644
index b2f6aec288..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/horizontal-pane-class.scrbl
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[horizontal-pane% pane% ()]{
-
-A horizontal pane arranges its subwindows in a single row. See also
- @racket[pane%].
-
-@defconstructor[([parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [vert-margin spacing-integer? 0]
-                 [horiz-margin spacing-integer? 0]
-                 [border spacing-integer? 0]
-                 [spacing spacing-integer? 0]
-                 [alignment (list/c (or/c 'left 'center 'right)
-                                    (or/c 'top 'center 'bottom))
-                            '(left center)]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-@SubareaKWs[] @AreaContKWs[] @AreaKWs[]
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/horizontal-panel-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/horizontal-panel-class.scrbl
deleted file mode 100644
index 1331f496ad..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/horizontal-panel-class.scrbl
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[horizontal-panel% panel% ()]{
-
-A horizontal panel arranges its subwindows in a single row. See also
- @racket[panel%].
-
-@defconstructor[([parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [style (listof (or/c 'border 'deleted
-                                      'hscroll 'auto-hscroll
-                                      'vscroll 'auto-vscroll)) null]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 0]
-                 [horiz-margin spacing-integer? 0]
-                 [border spacing-integer? 0]
-                 [spacing spacing-integer? 0]
-                 [alignment (list/c (or/c 'left 'center 'right)
-                                    (or/c 'top 'center 'bottom))
-                            '(left center)]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-The @racket[style] flags are the same as for @racket[panel%].
-
-@WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaContKWs[] @AreaKWs[]
-}
-
-@defmethod[(set-orientation [horizontal? boolean?]) void?]{
-  Sets the orientation of the panel, switching it between
-  the behavior of the @racket[vertical-panel%] and that of
-  the @racket[horizontal-panel%].
-}
-
-@defmethod[(get-orientation) boolean?]{
-  Initially returns @racket[#t], but if
-  @method[horizontal-panel% set-orientation] is called,
-  this method returns whatever the last value passed to it was.
-}
-}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image-snip-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image-snip-class.scrbl
deleted file mode 100644
index 958e1c3e6d..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image-snip-class.scrbl
+++ /dev/null
@@ -1,171 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[image-snip% snip% ()]{
-
-An @racket[image-snip%] is a snip that can display bitmap images
- (usually loaded from a file). When the image file cannot be found, a
- box containing an ``X'' is drawn.
-
-
-@defconstructor*/make[(([file (or/c path-string? input-port? #f) #f]
-                        [kind (or/c 'unknown 'unknown/mask 'unknown/alpha
-                                    'gif 'gif/mask 'gif/alpha 
-                                    'jpeg 'png 'png/mask 'png/alpha
-                                    'xbm 'xpm 'bmp 'pict) 'unknown]
-                        [relative-path? any/c #f]
-                        [inline? any/c #t]
-                        [backing-scale (>/c 0.0) 1.0])
-                       ([bitmap (is-a?/c bitmap%)]
-                        [mask (or/c (is-a?/c bitmap%) #f) #f]))]{
-
-Creates an image snip, loading the image @racket[file] if
- specified (see also @method[image-snip% load-file]), or using the
- given @racket[bitmap].
-
-@history[#:changed "1.1" @elem{Added the @racket[backing-scale] argument.}]}
-
-
-@defmethod[(equal-hash-code-of [hash-code (any/c . -> . exact-integer?)])
-           exact-integer?]{
-
-Returns an integer that can be used as a @racket[equal?]-based hash
-code for @this-obj[] (using the same notion of @racket[equal?] as
-@method[image-snip% other-equal-to?]).
-
-See also @racket[equal<%>].}
-
-@defmethod[(equal-secondary-hash-code-of [hash-code (any/c . -> . exact-integer?)])
-           exact-integer?]{
-
-Returns an integer that can be used as a @racket[equal?]-based
-secondary hash code for @this-obj[] (using the same notion of
-@racket[equal?] as @method[image-snip% other-equal-to?]).
-
-See also @racket[equal<%>].}
-
-@defmethod[(get-bitmap)
-           (or/c (is-a?/c bitmap%) #f)]{
-
-Returns the bitmap that is displayed by the snip, whether set through
- @method[image-snip% set-bitmap] or @method[image-snip% load-file]. If
- no bitmap is displayed, the result is @racket[#f].
-
-}
-
-@defmethod[(get-bitmap-mask)
-           (or/c (is-a?/c bitmap%) #f)]{
-
-Returns the mask bitmap that is used for displaying by the snip, if
- one was installed with @method[image-snip% set-bitmap].  If no mask
- is used, the result is @racket[#f].
-
-}
-
-@defmethod[(get-filename [relative-path (or/c (box/c any/c) #f) #f])
-           (or/c path-string? #f)]{
-
-Returns the name of the currently loaded, non-inlined file, or
- @racket[#f] if a file is not loaded or if a file was loaded with
- inlining (the default).
-
-@boxisfillnull[@racket[relative-path] @elem{@racket[#t] if the loaded file's path is
-relative to the owning editor's path}]
-
-}
-
-@defmethod[(get-filetype)
-           (or/c 'unknown 'unknown/mask 'unknown/alpha
-                 'gif 'gif/mask 'gif/alpha 
-                 'jpeg 'png 'png/mask 'png/alpha
-                 'xbm 'xpm 'bmp 'pict)]{
-
-Returns the kind used to load the currently loaded, non-inlined file,
- or @racket['unknown] if a file is not loaded or if a file was loaded
- with inlining (the default).
-
-}
-
-@defmethod[(load-file [file (or/c path-string? input-port? #f)]
-                      [kind (or/c 'unknown 'unknown/mask 'unknown/alpha
-                                  'gif 'gif/mask 'gif/alpha 
-                                  'jpeg 'png 'png/mask 'png/alpha
-                                  'xbm 'xpm 'bmp 'pict) 'unknown]
-                      [relative-path? any/c #f]
-                      [inline? any/c #t]
-                      [backing-scale (>/c 0.0) 1.0])
-           void?]{
-
-Loads the file by passing @racket[file] and @racket[kind] to
- @xmethod[bitmap% load-file]. If a bitmap had previously been specified
- with @method[image-snip% set-bitmap], that bitmap (and mask) will no
- longer be used. If @racket[file] is @racket[#f], then the current
- image is cleared.
-
-When @racket['unknown/mask], @racket['gif/mask], or @racket['png/mask]
- is specified and the loaded bitmap object includes a mask (see
- @method[bitmap% get-loaded-mask]), the mask is used for drawing the
- bitmap (see @method[dc<%> draw-bitmap]). The @racket['unknown/alpha],
- @racket['gif/alpha], or @racket['png/alpha] variants are recommended,
- however.
-
-If @racket[relative-path?] is not @racket[#f] and @racket[file] is a
- relative path, then the file will be read using the path of the
- owning editor's filename. If the image is not inlined, it will be
- saved as a relative pathname.
-
-If @racket[inline?] is not @racket[#f], the image data will be saved
- directly to the file or clipboard when the image is saved or copied
- (preserving the bitmap's mask, if any).  The source filename and kind
- is no longer relevant.
-
-@history[#:changed "1.1" @elem{Added the @racket[backing-scale] argument.}]}
-
-@defmethod[(other-equal-to? [snip (is-a?/c image-snip%)]
-                            [equal? (any/c any/c . -> . boolean?)])
-           boolean?]{
-
-Returns @racket[#t] if @this-obj[] and @racket[snip] both have bitmaps
-and the bitmaps are the same. If either has a mask bitmap
-with the same dimensions as the main bitmap, then the masks must be
-the same (or if only one mask is present, it must correspond to a
-solid mask).
-
-The given @racket[equal?] function (for recursive comparisons) is not
-used.}
-
-
-@defmethod[#:mode override 
-           (resize [w (and/c real? (not/c negative?))]
-                   [h (and/c real? (not/c negative?))])
-           boolean?]{
-
-The bitmap will be cropped to fit in the given dimensions.
-
-}
-
-@defmethod[(set-bitmap [bm (is-a?/c bitmap%)]
-                       [mask (or/c (is-a?/c bitmap%) #f) #f])
-           void?]{
-
-Sets the bitmap that is displayed by the snip.
-
-An optional @racket[mask] is used when drawing the bitmap (see
- @method[dc<%> draw-bitmap]), but supplying the mask directly is
- deprecated. If no mask is supplied but the bitmap's
- @method[bitmap% get-loaded-mask] method produces a bitmap of the same
- dimensions, it is used as the mask; furthermore, such a mask is saved
- with the snip when it is saved to a file or copied (whereas a
- directly supplied mask is not saved). Typically, however, @racket[bm]
- instead should have an alpha channel instead of a separate mask bitmap.
-
-}
-
-@defmethod[(set-offset [dx real?]
-                       [dy real?])
-           void?]{
-
-Sets a graphical offset for the bitmap within the image snip.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/button.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/button.png
deleted file mode 100644
index 23536d9e14..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/button.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/check-box.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/check-box.png
deleted file mode 100644
index 3c562d9ce7..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/check-box.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/choice.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/choice.png
deleted file mode 100644
index 5adaf95bbb..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/choice.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/combo-field.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/combo-field.png
deleted file mode 100644
index df02e1a17f..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/combo-field.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/editor-canvas.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/editor-canvas.png
deleted file mode 100644
index 470a489fd0..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/editor-canvas.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/gauge.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/gauge.png
deleted file mode 100644
index e06fb76cd3..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/gauge.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/group-box-panel.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/group-box-panel.png
deleted file mode 100644
index a697b02328..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/group-box-panel.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/list-box.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/list-box.png
deleted file mode 100644
index 21f5ade09d..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/list-box.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/menu-bar.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/menu-bar.png
deleted file mode 100644
index 46d89ef256..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/menu-bar.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/message.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/message.png
deleted file mode 100644
index 96cf89097e..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/message.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/panel.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/panel.png
deleted file mode 100644
index 539f37c539..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/panel.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/radio-box.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/radio-box.png
deleted file mode 100644
index 06e5bedf20..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/radio-box.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/slider.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/slider.png
deleted file mode 100644
index ff431e14d9..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/slider.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/tab-panel.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/tab-panel.png
deleted file mode 100644
index 679316cb94..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/tab-panel.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/text-field.png b/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/text-field.png
deleted file mode 100644
index 28a49cd80a..0000000000
Binary files a/pkgs/gui-pkgs/gui-doc/scribblings/gui/image/text-field.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/info.rkt b/pkgs/gui-pkgs/gui-doc/scribblings/gui/info.rkt
deleted file mode 100644
index 435966bbf8..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("gui.scrbl" (multi-page) (racket-core -22))))
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/key-event-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/key-event-class.scrbl
deleted file mode 100644
index 7020f0eca7..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/key-event-class.scrbl
+++ /dev/null
@@ -1,471 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[key-event% event% ()]{
-
-A @racket[key-event%] object contains information about a key press
-or release event. Key events are primarily processed by
-@xmethod[window<%> on-subwindow-char] and
-@xmethod[canvas<%> on-char].
-
-For a key-press event, a virtual key code is provided by
-@method[key-event% get-key-code]. For a key-release event, 
-@method[key-event% get-key-code] reports @racket['release], and a virtual key code is provided by
-@method[key-event% get-key-release-code].
-
-See also @|mousekeydiscuss|.
-
-
-@defconstructor[([key-code (or/c char? key-code-symbol?) #\nul]
-                 [shift-down any/c #f]
-                 [control-down any/c #f]
-                 [meta-down any/c #f]
-                 [alt-down any/c #f]
-                 [x exact-integer? 0]
-                 [y exact-integer? 0]
-                 [time-stamp exact-integer? 0]
-                 [caps-down any/c #f]
-                 [mod3-down any/c #f]
-                 [mod4-down any/c #f]
-                 [mod5-down any/c #f]
-                 [control+meta-is-altgr any/c #f])]{
-
-See the corresponding @racketidfont{get-} and @racketidfont{set-}
- methods for information about @racket[key-code], @racket[shift-down],
- @racket[control-down], @racket[meta-down], @racket[mod3-down], @racket[mod4-down],
- @racket[mod5-down], @racket[alt-down], @racket[x], @racket[y], 
- @racket[time-stamp], @racket[caps-down], @racket[mod3-down],
- @racket[mod4-down], @racket[mod5-down], and @racket[control+meta-is-altgr].
-
-The release key code, as returned by @method[key-event%
-get-key-release-code], is initialized to @racket['press].
-
-@history[#:changed "1.1" @elem{Added @racket[mod3-down], @racket[mod4-down], and @racket[mod5-down].}
-         #:changed "1.2" @elem{Added @racket[control+meta-is-altgr].}]
-}
-
-@defmethod[(get-alt-down)
-           boolean?]{
-Returns @racket[#t] if the Option (Mac OS X) key was down for
- the event. When the Alt key is pressed in Windows, it is reported as
- a Meta press (see
-@method[key-event% get-meta-down]).
-
-}
-
-@defmethod[(get-caps-down)
-           boolean?]{
-Returns @racket[#t] if the Caps Lock key was on for the event.
-
-}
-
-@defmethod[(get-control-down)
-           boolean?]{
-Returns @racket[#t] if the Control key was down for the event.
-
-On Mac OS X, if a Control-key press is combined with a mouse button
- click, the event is reported as a right-button click and
-@method[key-event% get-control-down] for the event reports @racket[#f].
-
-}
-
-
-@defmethod[(get-control+meta-is-altgr)
-           boolean?]{
-
-Returns @racket[#t] if a Control plus Meta event should be treated as
-an AltGr event on Windows: the Control key was the left one and the
-Alt key was the right one (typed that way on a keyboard with a right
-Alt key, or produced by a single AltGr key).
-
-@history[#:added "1.2"]}
-
-
-@defmethod[(get-key-code)
-           (or/c char? key-code-symbol?)]{
-
-Gets the virtual key code for the key event. The virtual key code is
- either a character or a special key symbol, one of the following:
-
-@itemize[
-#:style 'compact
-@item{@indexed-racket['start]}
-@item{@indexed-racket['cancel]}
-@item{@indexed-racket['clear]}
-@item{@indexed-racket['shift] --- Shift key}
-@item{@indexed-racket['rshift] --- right Shift key}
-@item{@indexed-racket['control] --- Control key}
-@item{@indexed-racket['rcontrol] --- right Control key}
-@item{@indexed-racket['menu]}
-@item{@indexed-racket['pause]}
-@item{@indexed-racket['capital]}
-@item{@indexed-racket['prior]}
-@item{@indexed-racket['next]}
-@item{@indexed-racket['end]}
-@item{@indexed-racket['home]}
-@item{@indexed-racket['left]}
-@item{@indexed-racket['up]}
-@item{@indexed-racket['right]}
-@item{@indexed-racket['down]}
-@item{@indexed-racket['escape]}
-@item{@indexed-racket['select]}
-@item{@indexed-racket['print]}
-@item{@indexed-racket['execute]}
-@item{@indexed-racket['snapshot]}
-@item{@indexed-racket['insert]}
-@item{@indexed-racket['help]}
-@item{@indexed-racket['numpad0]}
-@item{@indexed-racket['numpad1]}
-@item{@indexed-racket['numpad2]}
-@item{@indexed-racket['numpad3]}
-@item{@indexed-racket['numpad4]}
-@item{@indexed-racket['numpad5]}
-@item{@indexed-racket['numpad6]}
-@item{@indexed-racket['numpad7]}
-@item{@indexed-racket['numpad8]}
-@item{@indexed-racket['numpad9]}
-@item{@indexed-racket['numpad-enter]}
-@item{@indexed-racket['multiply]}
-@item{@indexed-racket['add]}
-@item{@indexed-racket['separator]}
-@item{@indexed-racket['subtract]}
-@item{@indexed-racket['decimal]}
-@item{@indexed-racket['divide]}
-@item{@indexed-racket['f1]}
-@item{@indexed-racket['f2]}
-@item{@indexed-racket['f3]}
-@item{@indexed-racket['f4]}
-@item{@indexed-racket['f5]}
-@item{@indexed-racket['f6]}
-@item{@indexed-racket['f7]}
-@item{@indexed-racket['f8]}
-@item{@indexed-racket['f9]}
-@item{@indexed-racket['f10]}
-@item{@indexed-racket['f11]}
-@item{@indexed-racket['f12]}
-@item{@indexed-racket['f13]}
-@item{@indexed-racket['f14]}
-@item{@indexed-racket['f15]}
-@item{@indexed-racket['f16]}
-@item{@indexed-racket['f17]}
-@item{@indexed-racket['f18]}
-@item{@indexed-racket['f19]}
-@item{@indexed-racket['f20]}
-@item{@indexed-racket['f21]}
-@item{@indexed-racket['f22]}
-@item{@indexed-racket['f23]}
-@item{@indexed-racket['f24]}
-@item{@indexed-racket['numlock]}
-@item{@indexed-racket['scroll]}
-@item{@indexed-racket['wheel-up] --- @index["wheel on mouse"]{mouse} wheel up one notch}
-@item{@indexed-racket['wheel-down] --- mouse wheel down one notch}
-@item{@indexed-racket['wheel-left] --- mouse wheel left one notch}
-@item{@indexed-racket['wheel-right] --- mouse wheel right one notch}
-@item{@indexed-racket['release] --- indicates a key-release event}
-@item{@indexed-racket['press] --- indicates a key-press event; usually only from @racket[get-key-release-code]}
-]
-
-The special key symbols attempt to capture useful keys that have no
- standard ASCII representation. A few keys have standard
- representations that are not obvious:
-
-@itemize[
-
- @item{@racket[#\space] --- the space bar}
-
- @item{@racket[#\return] --- the Enter or Return key (on all
-      platforms), but not necessarily the Enter key near the numpad
-      (which is reported as @racket['numpad-enter] Unix and Mac OS X)}
-
- @item{@racket[#\tab] --- the tab key}
-
- @item{@racket[#\backspace] --- the backspace key}
-
- @item{@racket[#\rubout] --- the delete key}
-
-]
-
-If a suitable special key symbol or ASCII representation is not
- available, @racket[#\nul] (the NUL character) is reported.
-
-A @racket['wheel-up], @racket['wheel-down], @racket['wheel-left], or
- @racket['wheel-right] event may be sent to a window other than the
- one with the keyboard focus, because some platforms generate wheel
- events based on the location of the mouse pointer instead of the
- keyboard focus.
-
-On Windows, when the Control key is pressed without Alt, the key
- code for ASCII characters is downcased, roughly cancelling the effect
- of the Shift key. On Mac OS X, the key code is computed without
- Caps Lock effects when the Control or Command key is pressed; in the
- case of Control, Caps Lock is used normally if special handling is
- disabled for the Control key via @racket[special-control-key]. On
- Unix, the key code is computed with Caps Lock effects when the Control
- key is pressed without Alt.
-
-See also @method[key-event% get-other-shift-key-code].
-
-@history[#:changed "6.1.0.8" @elem{Changed reporting of numpad Enter
-                                   to @racket['numpad-enter] as
-                                   documented, instead of
-                                   @racket[#\u03].}]}
-
-
-@defmethod[(get-key-release-code)
-           (or/c char? key-code-symbol?)]{
-
-Gets the virtual key code for a key-release event; the result is
- @racket['press] for a key-press event. See @method[key-event%
- get-key-code] for the list of virtual key codes.
-
-}
-
-@defmethod[(get-meta-down)
-           boolean?]{
-
-Returns @racket[#t] if the Meta (Unix), Alt (Windows), or Command (Mac OS
- X) key was down for the event.
-
-}
-
-@defmethod[(get-mod3-down)
-           boolean?]{
-
-Returns @racket[#t] if the Mod3 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(get-mod4-down)
-           boolean?]{
-
-Returns @racket[#t] if the Mod4 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(get-mod5-down)
-           boolean?]{
-
-Returns @racket[#t] if the Mod5 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(get-other-altgr-key-code)
-           (or/c char? key-code-symbol? #f)]{
-
-See @method[key-event% get-other-shift-key-code].
-
-}
-
-@defmethod[(get-other-caps-key-code)
-           (or/c char? key-code-symbol? #f)]{
-
-See @method[key-event% get-other-shift-key-code].
-
-}
-
-@defmethod[(get-other-shift-altgr-key-code)
-           (or/c char? key-code-symbol? #f)]{
-
-See @method[key-event% get-other-shift-key-code].
-
-}
-
-@defmethod[(get-other-shift-key-code)
-           (or/c char? key-code-symbol? #f)]{
-
-Since keyboard mappings vary, it is sometimes useful in key mappings
- for a program to know the result that the keyboard would have
- produced for an event if the Shift key had been toggled
- differently. The @method[key-event% get-other-shift-key-code]
- produces that other mapping, returning @racket[#f] if the alternate
- mapping is unavailable, otherwise returning the same kind of result
- as @method[key-event% get-key-code].
-
-The @method[key-event% get-other-altgr-key-code] method provides the
-same information with respect to the AltGr key (i.e., Alt combined
-with Control) on Windows and Unix, or the Option key on Mac OS
-X. The @method[key-event% get-other-shift-altgr-key-code] method
-reports a mapping for in tha case that both Shift and AltGr/Option
-were different from the actual event.
-
-The @method[key-event% get-other-shift-key-code], @method[key-event%
-get-other-altgr-key-code], and @method[key-event%
-get-other-shift-altgr-key-code] results all report key mappings where
-Caps Lock is off, independent of whether Caps Lock was on for the
-actual event. The @method[key-event% get-other-caps-key-code] method
-reports a mapping for in that case that the Caps Lock state was
-treated opposite as for the @method[key-event% get-key-code]
-result. (Caps Lock normally has either no effect or the same effect as
-Shift, so further combinations involving Caps Lock and other modifier
-keys would not normally produce further alternatives.)
-
-Alternate mappings are not available for all events. On Windows,
- alternate mappings are reported when they produce ASCII letters,
- ASCII digits, and ASCII symbols. On Mac OS X, alternate mappings are
- available only when the Command key is pressed. On Unix, alternate
- mappings are usually available.
-
-}
-
-@defmethod[(get-shift-down)
-           boolean?]{
-
-Returns @racket[#t] if the Shift key was down for the event.
-
-}
-
-@defmethod[(get-x)
-           exact-integer?]{
-
-Returns the x-position of the mouse at the time of the event, in the
- target's window's (client-area) coordinate system.
-
-}
-
-@defmethod[(get-y)
-           exact-integer?]{
-
-Returns the y-position of the mouse at the time of the event in the
- target's window's (client-area) coordinate system.
-
-}
-
-@defmethod[(set-alt-down [down? any/c])
-           void?]{
-
-Sets whether the Option (Mac OS X) key was down for the event.  When
- the Alt key is pressed in Windows, it is reported as a Meta press
- (see @method[key-event% set-meta-down]).
-
-}
-
-@defmethod[(set-caps-down [down? any/c])
-           void?]{
-
-Sets whether the Caps Lock key was on for the event.
-
-}
-
-@defmethod[(set-control-down [down? any/c])
-           void?]{
-
-Sets whether the Control key was down for the event.
-
-On Mac OS X, if a control-key press is combined with a mouse button
- click, the event is reported as a right-button click and
- @method[key-event% get-control-down] for the event reports
- @racket[#f].
-
-}
-
-@defmethod[(control+meta-is-altgr [down? any/c])
-           void?]{
-
-Sets whether a Control plus Meta combination on Windows should be
-treated as an AltGr combinations. See @racket[get-control+meta-is-altgr].
-
-@history[#:added "1.2"]}
-
-
-@defmethod[(set-key-code [code (or/c char? key-code-symbol?)])
-           void?]{
-
-Sets the virtual key code for the event, either a character or one of
- the special symbols listed with @method[key-event% get-key-code].
-
-}
-
-@defmethod[(set-key-release-code [code (or/c char? key-code-symbol?)])
-           void?]{
-
-Sets the virtual key code for a release event, either a character or
- one of the special symbols listed with @method[key-event%
- get-key-code]. See also @method[key-event% get-key-release-code].
-
-}
-
-@defmethod[(set-meta-down [down? any/c])
-           void?]{
-
-Sets whether the Meta (Unix), Alt (Windows), or Command (Mac OS X) key
- was down for the event.
-
-}
-
-@defmethod[(set-mod3-down [down? any/c])
-           void?]{
-
-Sets whether the Mod3 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(set-mod4-down [down? any/c])
-           void?]{
-
-Sets whether the Mod4 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(set-mod5-down [down? any/c])
-           void?]{
-
-Sets whether the Mod5 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(set-other-altgr-key-code [code (or/c char? key-code-symbol? #f)])
-           void?]{
-
-Sets the key code produced by @method[key-event%
-get-other-altgr-key-code].
-
-}
-
-@defmethod[(set-other-caps-key-code [code (or/c char? key-code-symbol? #f)])
-           void?]{
-
-Sets the key code produced by @method[key-event%
- get-other-caps-key-code].
-
-}
-
-@defmethod[(set-other-shift-altgr-key-code [code (or/c char? key-code-symbol? #f)])
-           void?]{
-
-Sets the key code produced by @method[key-event%
- get-other-shift-altgr-key-code].
-
-}
-
-@defmethod[(set-other-shift-key-code [code (or/c char? key-code-symbol? #f)])
-           void?]{
-
-Sets the key code produced by @method[key-event%
- get-other-shift-key-code].
-
-}
-
-@defmethod[(set-shift-down [down? any/c])
-           void?]{
-
-Sets whether the Shift key was down for the event.
-
-}
-
-@defmethod[(set-x [pos exact-integer?])
-           void?]{
-
-Sets the x-position of the mouse at the time of the event in the
- target's window's (client-area) coordinate system.
-
-}
-
-@defmethod[(set-y [pos exact-integer?])
-           void?]{
-
-Sets the y-position of the mouse at the time of the event in the
- target's window's  (client-area) coordinate system.
-
-}
-}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/keymap-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/keymap-class.scrbl
deleted file mode 100644
index 23c57189b6..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/keymap-class.scrbl
+++ /dev/null
@@ -1,456 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[keymap% object% ()]{
-
-A @racket[keymap%] object is used by @racket[editor<%>] objects to
- map keyboard and mouse sequences to arbitrary functions in an
- extensible way. Keymaps can be used without editors, as well.  A
- @racket[keymap%] object contains
-
-@itemize[
-
- @item{a mapping from function names to event-handling procedures; and}
-
- @item{a mapping from key and mouse sequences to function names.}
-
-]
-
-A handler procedure in a keymap is invoked with a @racket[key-event%]
- object or a @racket[mouse-event%] object. It is also given another
- value that depends on the context in which the keymap is used (or,
- more specifically, the arguments to @method[keymap% handle-key-event]
- or @method[keymap% handle-mouse-event]). For keymaps associated with
- @racket[editor<%>] objects, the extra parameter is generally the
- @racket[editor<%>] object that received the keyboard or mouse event.
-
-
-@defconstructor[()]{
-
-Creates an empty keymap.
-
-}
-
-@defmethod[(add-function [name string?]
-                         [func (any/c (is-a?/c event%) . -> . any/c)])
-           void?]{
-
-Names a new function to handle events, called in response to
- @method[keymap% handle-key-event], @method[keymap%
- handle-mouse-event], or @method[keymap% call-function]. The return
- value is of the procedure is ignored.
-
-If there was already a function mapped to this name, it will be
- replaced with the given function.
-
-When the function is called, it gets the arguments that were passed to
- @method[keymap% handle-key-event], @method[keymap%
- handle-mouse-event], or @method[keymap% call-function]. For keymaps
- associated with an editor, this is normally the target editor.
-
-}
-
-@defmethod[(is-function-added? [fname string?]) boolean?]{
-  Returns @racket[#t] if @racket[fname] has been added
-          via @method[add-function keymap%] to this keymap 
-          and @racket[#f] otherwise.
-
-  This method doesn't check chained keymaps to see if the function
-  has been added to one of those.
-}
-
-@defmethod[(break-sequence)
-           void?]{
-
-Clears the state of the keymap if it is in the middle of a key
- sequence. For example, the user may have hit escape, and then changed
- to another window; if escape is part of a keyboard sequence, the
- keymap state needs to be cleared because the user is not going to
- complete the sequence.
-
-A break callback function can be installed with @method[keymap%
- set-break-sequence-callback].
-
-}
-
-@defmethod[(call-function [name string?]
-                          [in any/c]
-                          [event (is-a?/c event%)]
-                          [try-chain? any/c #f])
-           boolean?]{
-
-Calls a named event handler directly. If the function cannot be found
- or the found handler did not want to handle the event, @racket[#f] is
- returned. Otherwise, the return value is the boolean return value of
- the event handler.
-
-The @racket[in] and @racket[event] arguments are passed on to the keymap
- handler procedure if one is found.
-
-If @racket[try-chain?] is not @racket[#f], keymaps chained to this one
- are searched for the function name.  If the function is not found and
- @racket[try-chain?] is @racket[#f]; an exception is also raised, but
- the exception handler cannot escape (see
- @secref["evtcontjump"]).
-
-}
-
-
-@defmethod[(chain-to-keymap [next (is-a?/c keymap%)]
-                            [prefix? any/c])
-           void?]{
-
-Chains @racket[next] off @this-obj[] The @racket[next] keymap will be
- used to handle events which are not handled by @this-obj[]. If
- @racket[prefix?] is a true value, then @racket[next] will take
- precedence over other keymaps already chained to @this-obj[].
-
-Multiple keymaps can be chained off one keymap using @method[keymap%
- chain-to-keymap]. When keymaps are chained off a main keymap, events
- not handled by the main keymap are passed to the chained keymaps
- until some chained keymap handles the events.  Keymaps can be chained
- together in an arbitrary acyclic graph.
-
-Keymap chaining is useful because multiple-event sequences are handled
- correctly for chained groups. Without chaining, a sequence of events
- can produce state in a keymap that must be reset when a callback is
- invoked in one of the keymaps. This state can be manually cleared
- with @method[keymap% break-sequence], though calling the
- @method[keymap% break-sequence] method also invokes the handler
- installed by @method[keymap% set-break-sequence-callback].
-
-}
-
-
-@defmethod[(get-double-click-interval)
-           (integer-in 0 1000000)]{
-
-Returns the maximum number of milliseconds that can separate the
- clicks of a double-click.
-
-The default interval is determined in a platform-specific way, but it
- can be overridden globally though the
- @ResourceFirst{doubleClickTime}; see @|mrprefsdiscuss|.
-
-}
-
-@defmethod[(handle-key-event [in any/c]
-                             [event (is-a?/c key-event%)])
-           boolean?]{
-
-Attempts to handle a keyboard event, returning @racket[#t] if the event
- was handled (i.e., a handler was found and it returned a true value),
- @racket[#f] otherwise.
-
-See also @method[keymap% call-function].
-
-}
-
-
-@defmethod[(handle-mouse-event [in any/c]
-                               [event (is-a?/c mouse-event%)])
-           boolean?]{
-
-Attempts to handle a mouse event, returning @racket[#t] if the event
- was handled (i.e., a handler was found and it returned a true value),
- @racket[#f] otherwise.
-
-See also @method[keymap% call-function].
-
-}
-
-
-@defmethod[(map-function [keyname string?]
-                         [fname string?])
-           void?]{
-
-Maps an input state sequence to a function name using a string-encoded
- sequence in @racket[keyname]. The format of @racket[keyname] is a
- sequence of semicolon-delimited input states; each state is made up
- of a sequence of modifier identifiers followed by a key identifier.
-
-The modifier identifiers are:
-
-@itemize[
-
- @item{@litchar{s:} --- All platforms: Shift}
-
- @item{@litchar{c:} --- All platforms: Control}
-
- @item{@litchar{a:} --- Mac OS X: Option}
-
- @item{@litchar{m:} --- Windows: Alt; Unix: Meta; Mac OS X: Command, when
- @racket[map-command-as-meta-key] produces @racket[#t]}
-
- @item{@litchar{d:} --- Mac OS X: Command}
-
- @item{@litchar{l:} --- All platforms: Caps Lock}
-
- @item{@litchar{g:} --- Windows: Control plus Alt as AltGr;
-                        see @xmethod[key-event% control+meta-is-altgr]}
-
- @item{@litchar{?:} --- All platforms: allow match to character produced by opposite 
-                  use of Shift, AltGr/Option, and/or Caps Lock, when available; see
-                  @xmethod[key-event% get-other-shift-key-code]}
-]
-
-If a particular modifier is not mentioned in a state string, it
- matches states whether that modifier is pressed or not pressed. A
- @litchar{~} preceding a modifier makes the string match only states
- where the corresponding modifier is not pressed. If the state string
- begins with @litchar{:}, then the string matches a state only if
- modifiers among Shift, Control, Option, Alt, Meta, and Command that are
- not mentioned in the string are not pressed.
-
-A key identifier can be either a character on the keyboard (e.g.,
- @litchar{a}, @litchar{2}, @litchar{?}) or a special name. The
- special names are as follows:
-
-@itemize[
-#:style 'compact
-@item{@litchar{leftbutton} (button down)}
-@item{@litchar{rightbutton}}
-@item{@litchar{middlebutton}}
-@item{@litchar{leftbuttondouble} (button down for double-click)}
-@item{@litchar{rightbuttondouble}}
-@item{@litchar{middlebuttondouble}}
-@item{@litchar{leftbuttontriple} (button down for triple-click)}
-@item{@litchar{rightbuttontriple}}
-@item{@litchar{middlebuttontriple}}
-@item{@litchar{leftbuttonseq} (all events from button down through button up)}
-@item{@litchar{rightbuttonseq}}
-@item{@litchar{middlebuttonseq}}
-@item{@litchar{wheelup}}
-@item{@litchar{wheeldown}}
-@item{@litchar{wheelleft}}
-@item{@litchar{wheelright}}
-@item{@litchar{esc}}
-@item{@litchar{delete}}
-@item{@litchar{del}  (same as @litchar{delete})}
-@item{@litchar{insert}}
-@item{@litchar{ins} (same as @litchar{insert})}
-@item{@litchar{add}}
-@item{@litchar{subtract}}
-@item{@litchar{multiply}}
-@item{@litchar{divide}}
-@item{@litchar{backspace}}
-@item{@litchar{back}}
-@item{@litchar{return}}
-@item{@litchar{enter} (same as @litchar{return})}
-@item{@litchar{tab}}
-@item{@litchar{space}}
-@item{@litchar{right}}
-@item{@litchar{left}}
-@item{@litchar{up}}
-@item{@litchar{down}}
-@item{@litchar{home}}
-@item{@litchar{end}}
-@item{@litchar{pageup}}
-@item{@litchar{pagedown}}
-@item{@litchar{semicolon} (since @litchar{;} separates sequence steps)}
-@item{@litchar{colon}  (since @litchar{:} separates modifiers)}
-@item{@litchar{numpad0}}
-@item{@litchar{numpad1}}
-@item{@litchar{numpad2}}
-@item{@litchar{numpad3}}
-@item{@litchar{numpad4}}
-@item{@litchar{numpad5}}
-@item{@litchar{numpad6}}
-@item{@litchar{numpad7}}
-@item{@litchar{numpad8}}
-@item{@litchar{numpad9}}
-@item{@litchar{numpadenter}}
-@item{@litchar{f1}}
-@item{@litchar{f2}}
-@item{@litchar{f3}}
-@item{@litchar{f4}}
-@item{@litchar{f5}}
-@item{@litchar{f6}}
-@item{@litchar{f7}}
-@item{@litchar{f8}}
-@item{@litchar{f9}}
-@item{@litchar{f10}}
-@item{@litchar{f11}}
-@item{@litchar{f12}}
-@item{@litchar{f13}}
-@item{@litchar{f14}}
-@item{@litchar{f15}}
-@item{@litchar{f16}}
-@item{@litchar{f17}}
-@item{@litchar{f18}}
-@item{@litchar{f19}}
-@item{@litchar{f20}}
-@item{@litchar{f21}}
-@item{@litchar{f22}}
-@item{@litchar{f23}}
-@item{@litchar{f24}}
-]
-
-For a special keyword, the capitalization does not matter. However,
- capitalization is important for single-letter keynames. Furthermore,
- single-letter ASCII keynames are treated specially: @litchar{A} and
- @litchar{s:a} are both treated as @litchar{s:A}.  However, when
- @litchar{c:} is included on Windows without @litchar{m:}, or when
- @litchar{d:} is included on Mac OS X, then ASCII letters are not
- upcased with @litchar{s:}, since the upcasing behavior of the Shift key
- is cancelled by Control without Alt (on Windows) or by Command
- (on Mac OS X).
-
-A state can match multiple state strings mapped in a keymap (or keymap
- chain); when a state matches multiple state strings, a mapping is
- selected by ranking the strings according to specificity. A state
- string that mentions more pressed modifiers ranks higher than other
- state strings, and if two strings mention the same number of pressed
- modifiers, the one that mentions more unpressed modifiers ranks
- higher. Finally, a state string that includes @litchar{?:} and
- matches only with the opposite use of Shift, AltGr/Option, and/or
- Caps Lock ranks below all matches that do not depend on @litchar{?:},
- and one that requires the opposite use of both Shift and AltGr/Option
- ranks even lower. In the case that multiple matching strings have the
- same rank, a match is selected arbitrarily.
-
-Examples:
-
-@itemize[
-
- @item{@racket["space"] --- matches whenever the space bar is pressed,
- regardless of the state of modifiers keys.}
-
- @item{@racket["~c:space"] --- matches whenever the space bar is pressed
- and the Control key is not pressed.}
-
- @item{@racket["a"] --- matches whenever @litchar{a} is typed, regardless of
- the state of modifiers keys (other than Shift).}
-
- @item{@racket[":a"] --- matches only when @litchar{a} is typed with no
- modifier keys pressed.}
-
- @item{@racket["~c:a"] --- matches whenever @litchar{a} is typed and neither
- the Shift key nor the Control key is pressed.}
-
- @item{@racket["c:m:~g:x"] --- matches whenever @litchar{x} is typed
- with Control and Alt (Windows) or Meta (Unix) is pressed, as long as
- the Control-Alt combination is not formed by AltGr on Windows.}
-
- @item{@racket[":esc;:c:c"] --- matches an Escape key press (no
- modifiers) followed by a Control-C press (no modifiers other than
- Control).}
-
- @item{@racket["?:d:+"] --- matches when Command is pressed with key
-  that produces @litchar{+}, even if producing @litchar{+} normally requires
-  pressing Shift.}
-
-]
-
-A call to @method[keymap% map-function] that would map a particular
- key sequence both as a prefix and as a complete sequence raises an
- exception, but the exception handler cannot escape (see
- @secref["evtcontjump"]).
-
-A function name does not have to be mapped to a handler before input
- states are mapped to the name; the handler is dispatched by name at
- the time of invocation. The event handler mapped to a function name
- can be changed without affecting the map from input states to
- function names.
-
-
-@history[#:changed "1.2" @elem{Added @litchar{g:} and @litchar{~g:} support.}]}
-
-
-@defmethod[(remove-chained-keymap [keymap (is-a?/c keymap%)])
-           void?]{
-
-If @racket[keymap] was previously chained from this keymap (through
- @method[keymap% chain-to-keymap]), then it is removed from the
- chain-to list.
-
-}
-
-
-@defmethod[(remove-grab-key-function)
-           void?]{
-
-Removes a callback installed with @method[keymap%
- set-grab-key-function].
-
-}
-
-@defmethod[(remove-grab-mouse-function)
-           void?]{
-
-Removes a callback installed with @method[keymap%
- set-grab-mouse-function].
-
-}
-
-
-@defmethod[(set-break-sequence-callback [f (-> any)])
-           void?]{
-
-Installs a callback procedure that is invoked when @method[keymap%
- break-sequence] is called. After it is invoked once, the callback is
- removed from the keymap. If another callback is installed before
- @method[keymap% break-sequence] is called, the old callback is
- invoked immediately before the new one is installed.
-
-}
-
-
-@defmethod[(set-double-click-interval [n (integer-in 0 1000000)])
-           void?]{
-
-Sets the maximum number of milliseconds that can separate the clicks
- of a double-click.
-
-}
-
-@defmethod[(set-grab-key-function [f ((or/c string? false?) 
-                                      (is-a?/c keymap%) 
-                                      any/c 
-                                      (is-a?/c key-event%)
-                                      . -> . any)])
-           void?]{
-
-Installs a callback procedure that is invoked after the keymap matches
- input to a function name or fails to match an input. Only one
- keyboard grab function can be installed at a time. When keymaps are
- chained to a keymap with a grab callback, the callback is invoked for
- matches in the chained keymap (when the chained keymap does not have
- its own grab callback).
-
-If a grab callback returns a true value for a matching or non-matching
- callback, the event is considered handled. If the callback returns a
- true value for a matching callback, then the matching keymap function
- is not called by the keymap.
-
-The callback procedure @racket[f] will be invoked as:
-
-@racketblock[
-(f _str _keymap _editor _event)
-]
-
-The @racket[_str] argument is the name of a function for a matching
- callback, or @racket[#f] for a non-matching callback.  The
- @racket[_keymap] argument is the keymap that matched (possibly a
- keymap chained to the one in which the callback was installed) or the
- keymap in which the callback was installed. The @racket[_editor] and
- @racket[_event] arguments are the same as passed on to the matching
- keymap function.
-
-Key grab callback functions are de-installed with @method[keymap%
- remove-grab-key-function].
-
-}
-
-
-@defmethod[(set-grab-mouse-function [f ((or/c string? false?) 
-                                        (is-a?/c keymap%)
-                                        any/c 
-                                        (is-a?/c mouse-event%)
-                                        . -> . any)])
-           void?]{
-
-Like @method[keymap% set-grab-key-function], but for mouse events.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/labelled-menu-item-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/labelled-menu-item-intf.scrbl
deleted file mode 100644
index 4f1330b385..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/labelled-menu-item-intf.scrbl
+++ /dev/null
@@ -1,124 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[labelled-menu-item<%> (menu-item<%>)]{
-
-A @racket[labelled-menu-item<%>] object is a @racket[menu-item<%>] with
- a string label (i.e., any menu item other than a separator).  More
- specifically, it is an instance of either @racket[menu-item%] (a
- plain menu item), @racket[checkable-menu-item%] (a checkable menu
- item), or @racket[menu%] (a submenu).
-
-
-@defmethod[(enable [enabled? any/c])
-           void?]{
-
-Enables or disables the menu item. If the item is a submenu (or menu
- in a menu bar), the entire menu is disabled, but each submenu item's
- @method[labelled-menu-item<%> is-enabled?] method returns @racket[#f]
- only if the item is specifically disabled (in addition to the
- submenu).
-
-}
-
-@defmethod[(get-help-string)
-           (or/c label-string? #f)]{
-
-Returns the help string for the menu item, or @racket[#f] if the item
- has no help string.
-
-When an item has a @racket[help], the string may be used to
- display help information to the user.
-
-}
-
-@defmethod[(get-label)
-           label-string?]{
-
-Returns the item's label.
-
-See also @method[labelled-menu-item<%> set-label] and
-@method[labelled-menu-item<%> get-plain-label].
-
-
-}
-
-@defmethod[(get-plain-label)
-           label-string?]{
-
-Like @method[labelled-menu-item<%> get-label], except that
-@litchar{&}s and tab characters in the label are stripped in
-the same way as for @method[window<%> set-label].
-}
-
-@defmethod[(is-enabled?)
-           boolean?]{
-
-Returns @racket[#t] if the menu item is enabled, @racket[#f]
-otherwise.
-
-See also
-@method[labelled-menu-item<%> enable].
-
-}
-
-@defmethod[(on-demand)
-           void?]{
-@methspec{
-
-Normally called when the user clicks on the menu bar containing the
- item (before the user sees any menu items), just before the popup
- menu containing the item is popped up, or just before inspecting the
- menu bar containing the item for a shortcut key binding.
- See @xmethod[menu-item-container<%> on-demand] for further details.
-
-A @xmethod[menu-item-container<%> on-demand] method can be overridden
-in such a way that the container does not call the
-@method[labelled-menu-item<%> on-demand] method of its items.
-
-}
-@methimpl{
-
-Calls the @racket[demand-callback] procedure that was provided when the
- object was created.
-
-}}
-
-@defmethod[(set-help-string [help (or/c label-string? #f)])
-           void?]{
-
-Sets the help string for the menu item. Use @racket[#f] to remove the
- help string for an item.
-
-}
-
-@defmethod[(set-label [label label-string?])
-           void?]{
-
-Sets the menu item's label. If the item has a shortcut, the shortcut
- is not affected.
-
-If the label contains @litchar{&} and the window is a control, the
- label is parsed specially; on Windows and Unix, the character
- following a @litchar{&} is underlined in the displayed menu to
- indicate a keyboard mnemonic. Pressing the Alt key with an underlined
- character from a menu's name in the menu bar causes the menu to be
- selected (via @method[frame% on-menu-char]). When a menu has the
- focus, the mnemonic characters are used for navigation without Alt. A
- @litchar{&&} in the label is replaced by a literal (non-navigation)
- @litchar{&}. On Mac OS X, @litchar{&}s in the label are parsed in
- the same way as for Unix and Windows, but no mnemonic underline is
- displayed. On Mac OS X, a parenthesized mnemonic character is
- removed (along with any surrounding space) before the label is
- displayed, since a parenthesized mnemonic is often used for non-Roman
- languages. Finally, for historical reasons, if a label contains a tab character, then the
- tab and all remaining characters are hidden in the displayed menu.
- All of these rules are consistent with label handling in @racket[button%]
- and other windows.
-
-A @litchar{&} is always preserved in the label returned by
- @method[labelled-menu-item<%> get-label], but never preserved in the
- label returned by @method[labelled-menu-item<%> get-plain-label].
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/libs.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/libs.scrbl
deleted file mode 100644
index 6ce9a91101..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/libs.scrbl
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@(define draw-doc '(lib "scribblings/draw/draw.scrbl"))
-
-@title[#:tag "libs"]{Platform Dependencies}
-
-See @secref[#:doc draw-doc "libs"] in @other-manual[draw-doc] for
-information on platform library dependencies for
-@racketmodname[racket/draw]. On Unix, the following additional
-system libraries must be installed for @racketmodname[racket/gui/base]:
-
-@itemlist[
- @item{@filepath{libgdk-x11-2.0[.0]}}
- @item{@filepath{libgdk_pixbuf-2.0[.0]}}
- @item{@filepath{libgtk-x11-2.0[.0]}}
- @item{@filepath{libGL} --- optional, for OpenGL support}
- @item{@filepath{libunique-1.0[.0]} --- optional, for single-instance support}
-]
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/list-box-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/list-box-class.scrbl
deleted file mode 100644
index b027194cdf..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/list-box-class.scrbl
+++ /dev/null
@@ -1,371 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/list-box}}
-
-@(define lbnumnote @elem{List box rows are indexed from @racket[0].})
-@(define lbcnumnote @elem{List box rows and columns are indexed from @racket[0].})
-
-
-@defclass/title[list-box% object% (list-control<%>)]{
-
-A list box allows the user to select one or more string items from a
- scrolling list. A list box is either a single-selection control (if
- an item is selected, the previous selection is removed) or a
- multiple-selection control (clicking an item toggles the item on or
- off independently of other selections).
-
-Whenever the user changes the selection in a list box, the list box's
- callback procedure is called. A callback procedure is provided as an
- initialization argument when each list box is created.
-
-A list box can have multiple columns with optional column headers. An
- item in the list corresponds to a row that spans all columns. When
- column headers are displayed, the column widths can be changed by a
- user. In addition, columns can optionally support dragging by the
- user to change the display order of columns, while the logical order
- remains fixed.
-
-@|lbcnumnote|
-
-See also @racket[choice%].
-
-
-@defconstructor[([label (or/c label-string? #f)]
-                 [choices (listof label-string?)]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [callback ((is-a?/c list-box%) (is-a?/c control-event%) 
-                            . -> . any) 
-                           (lambda (c e) (void))]
-                 [style (listof (or/c 'single 'multiple 'extended 
-                                      'vertical-label 'horizontal-label 
-                                      'variable-columns 'column-headers 
-                                      'clickable-headers 'reorderable-headers 
-                                      'deleted)) 
-                        '(single)]
-                 [selection (or/c exact-nonnegative-integer? #f) #f]
-                 [font (is-a?/c font%) view-control-font]
-                 [label-font (is-a?/c font%) normal-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 2]
-                 [horiz-margin spacing-integer? 2]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t]
-                 [columns (cons/c label-string? (listof label-string?))
-                          '("Column")]
-                 [column-order (or/c #f (listof exact-nonnegative-integer?)) #f])]{
-
-If @racket[label] is not @racket[#f], it is used as the list box
- label.  Otherwise, the list box will not display its label.
-
-@labelstripped[@racket[label] @elem{}
-  @elem{move the keyboard focus to the list box}]
-
-The @racket[choices] list specifies the initial list of items
- to appear in the list box. If the list box has multiple columns, 
- @racket[choices] determines the content of the first column, and
- other columns are initialized to the empty string.
-
-The @racket[callback] procedure is called when the user changes the list
- box selection, by either selecting, re-selecting, deselecting, or
- double-clicking an item.  The type of the event provided to the
- callback is @indexed-racket['list-box-dclick] when the user double-clicks
- on an item, or @indexed-racket['list-box] otherwise.
-
-The @racket[columns] list determines the number of columns in the list
- box. The column titles in @racket[columns] are shown only if
- @racket[style] includes @racket['column-headers]. If @racket[style]
- also includes @racket['clickable-headers], then a click on a header
- triggers a call to @racket[callback] with a
- @racket[column-control-event%] argument whose event type is
- @indexed-racket['list-box-column].
-
-The @racket[style] specification must include exactly one of the
- following:
-@itemize[
-
- @item{@racket['single] --- Creates a single-selection list.}
-
- @item{@racket['multiple] --- Creates a multiple-selection list
- where a single click deselects other items and selects a new
- item. Use this style for a list when single-selection is common, but
- multiple selections are allowed.}
-
- @item{@racket['extended] --- Creates a multiple-selection list where a
- single click extends or contracts the selection by toggling the
- clicked item. Use this style for a list when multiple selections are
- the rule rather than the exception.}
-
-]
-The @racket['multiple] and @racket['extended] styles determine a
- platform-independent interpretation of unmodified mouse clicks, but
- dragging, shift-clicking, control-clicking, etc. have
- platform-standard interpretations. Whatever the platform-specific
- interface, the user can always select disjoint sets of items or
- deselect items (and leave no items selected). On some platforms, the
- user can deselect the (sole) selected item in a @racket['single] list
- box.
-
-@HVLabelNote[@racket[style]]{list box} @DeletedStyleNote[@racket[style] @racket[parent]]{list box}
-
-If @racket[style] includes @racket['variable-columns], then the number
-of columns in the list box can be changed via @method[list-box% append-column]
-and @method[list-box% delete-column].
-
-If @racket[selection] is an integer, it is passed to
-@method[list-control<%> set-selection] to set the initial selection. The @racket[selection] must be less than
- the length of @racket[choices].
-
-@FontLabelKWs[@racket[font] @racket[label-font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-It the @racket[column-order] argument is not @racket[#f], it
-determines the order in which logical columns are initially displayed. See
-@method[list-box% set-column-order] for more information. If
-@racket[style] includes @racket['column-headers] and
-@racket['reorderable-headers], then a user can reorder columns as
-displayed (but the display order does not change the logical order of
-the columns).
-
-}
-
-
-@defmethod[#:mode override
-           (append [item label-string?]
-                   [data any/c #f])
-           void?]{
-
-Adds a new item to the list box with an associated ``data'' object.
- The @racket[data] object is not displayed in the list box; it is
- provided merely as a convenience for use with @method[list-box%
- get-data], possibly allowing a programmer to avoid managing a
- separate item-to-data mapping in addition to the list box control.
-
-See also @xmethod[list-control<%> append].
-
-}
-
-
-@defmethod[(append-column [label label-string?])
-           void?]{
-
-Adds a new column with title @racket[label] to the list box, but only
-if the list box is created with the @racket['variable-columns]
-style. The new column is logically the last column, and it is initially
-displayed as the last column.}
-
-
-@defmethod[(delete-column [n exact-nonnegative-integer?])
-           void?]{
-
-Deletes the column with logical position @racket[n], but only if the
-list box is created with the @racket['variable-columns] style, and
-only if the list box currently has more than one column (i.e., the
-number of columns can never be zero).}
-
-
-@defmethod[(get-column-labels) (cons/c label-string? (listof label-string?))]{
-
-Returns the labels of the list box's columns, and the number of
-returned strings indicates the number of columns in the list box.}
-
-
-@defmethod[(get-column-order) (listof exact-nonnegative-integer?)]{
-
-Returns the display order of logical columns. Each column is
-represented by its logical position in the result list, and the order
-of the column positions indicates the display order.
-
-See also @method[list-box% set-column-order].}
-
-
-@defmethod[(get-column-width [column exact-nonnegative-integer?])
-           (values dimension-integer?
-                   dimension-integer?
-                   dimension-integer?)]{
-
-Gets the width of the column identified by @racket[column] (in logical
-positions, as opposed to display positions), which must be between 0
-and one less than the number of columns.
-
-The result includes the column's current width as well as its minimum
-and maximum widths to constrain the column size as adjusted by a user.
-
-See also @method[list-box set-column-width].}
-
-
-@defmethod[(get-data [n exact-nonnegative-integer?])
-           any/c]{
-
-Returns the data for the item indexed by @racket[n], or @racket[#f]
- if there is no associated data. @|lbnumnote| If
- @racket[n] is equal to or larger than the number of choices,
- @|MismatchExn|.
-
-See also @method[list-box% append] and @method[list-box% set-data].
-
-}
-
-
-@defmethod[(get-first-visible-item)
-           exact-nonnegative-integer?]{
-
-Reports the index of the item currently scrolled to the top of the
- list box. @|lbnumnote|
-
-}
-
-@defmethod[(get-label-font)
-           (is-a?/c font%)]{
-
-Returns the font used for the control's label, which is optionally
- supplied when a list box is created.
-
-}
-
-@defmethod[(get-selections)
-           (listof exact-nonnegative-integer?)]{
-
-Returns a list of indices for all currently selected items.
- @|lbnumnote|
-
-For single-selection lists, the result is always either @racket[null] or
- a list containing one number.
-
-}
-
-
-@defmethod[(is-selected? [n exact-nonnegative-integer?])
-           boolean?]{
-
-Returns @racket[#t] if the items indexed by @racket[n] is selected,
- @racket[#f] otherwise. @|lbnumnote| If @racket[n] is equal to or
- larger than the number of choices, @|MismatchExn|.
-
-
-@MonitorCallback[@elem{A list box's selection} @elem{the user clicking the control} @elem{selection}]
-
-}
-
-@defmethod[(number-of-visible-items)
-           exact-positive-integer?]{
-
-Returns the maximum number of items in the list box that are visible
- to the user with the control's current size (rounding down if the
- exact answer is fractional, but returning at least @racket[1]).
-
-}
-
-@defmethod[(select [n exact-nonnegative-integer?]
-                   [select? any/c #t])
-           void?]{
-
-Selects or deselects an item. For selection in a single-selection list
- box, if a different choice is currently selected, it is automatically
- deselected. For selection in a multiple-selection list box, other
- selections are preserved, unlike
-@method[list-control<%> set-selection].
-
-If @racket[select?] is @racket[#f], the item indexed by @racket[n] is
- deselected; otherwise it is selected. @|lbnumnote| If @racket[n] is
- equal to or larger than the number of choices, @|MismatchExn|.
-
-@MonitorCallback[@elem{A list box's selection} @elem{the user clicking the control} @elem{selection}]
-
-The control's callback procedure is @italic{not} invoked.
-
-}
-
-
-@defmethod[(set [choices0 (listof label-string?)]
-                [choices (listof label-string?)]
-                ...)
-           void?]{
-
-Clears the list box and installs a new list of items. The number of
-@racket[choices0] plus @racket[choices] lists must match the number of columns, and all
-@racket[choices] lists must have the same number of items, otherwise
-@|MismatchExn|.}
-
-
-@defmethod[(set-column-label [column exact-nonnegative-integer?]
-                             [label label-string?])
-            void?]{
-
-Sets the label of the column identified by @racket[column] (in logical
-positions, as opposed to display positions), which must be between 0
-and one less than the number of columns.}
-
-
-@defmethod[(set-column-order [column-order (listof exact-nonnegative-integer?)])
-            void?]{
-
-Sets the order in which logical columns are displayed. Each element of
-@racket[column-order] must identify a unique column by its logical
-position, and all logical columns must be represented in the list.
-
-See also @method[list-box% get-column-order].}
-
-
-@defmethod[(set-column-width [column exact-nonnegative-integer?]
-                             [width dimension-integer?]
-                             [min-width dimension-integer?]
-                             [max-width dimension-integer?])
-            void?]{
-
-Sets the width of the column identified by @racket[column] (in logical
-positions, as opposed to display positions), which must be between 0
-and one less than the number of columns.
-
-The @racket[width] argument sets the current display width, while
-@racket[min-width] and @racket[max-width] constrain the width of the
-column when the user resizes it. The @racket[width] argument must be
-no less than @racket[min-width] and no more than @racket[max-width].
-
-The default width of a column is platform-specific, and the last
-column of a list box may extend to the end of the control independent
-of its requested size.
-
-See also @method[list-box% get-column-width].}
-
-
-@defmethod[(set-data [n exact-nonnegative-integer?]
-                     [data any/c])
-           void?]{
-
-Sets the associated data for item indexed by @racket[n]. @|lbnumnote| If
- @racket[n] is equal to or larger than the number of choices,
- @|MismatchExn|.
-
-See also @method[list-box% append].
-
-}
-
-
-@defmethod[(set-first-visible-item [n exact-nonnegative-integer?])
-           void?]{
-
-Scrolls the list box so that the item indexed by @racket[n] is at the
- top of the list box display. @|lbnumnote| If @racket[n] is equal to
- or larger than the number of choices, @|MismatchExn|.
-
-@Unmonitored[@elem{A list box's scroll position} @elem{the user clicking the control} @elem{the scroll position
- changes} @elem{@method[list-box% get-first-visible-item]}]
-
-}
-
-
-@defmethod[(set-string [n exact-nonnegative-integer?]
-                       [label label-string?]
-                       [column exact-nonnegative-integer? 0])
-           void?]{
-
-Sets the item indexed by @racket[n] in logical column @racket[column]. 
-@|lbcnumnote| If @racket[n] is
-equal to or larger than the number of choices, or if @racket[column]
-is equal to or larger than the number of columns, @|MismatchExn|.
-
-}
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/list-control-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/list-control-intf.scrbl
deleted file mode 100644
index 4b04a9309c..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/list-control-intf.scrbl
+++ /dev/null
@@ -1,127 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[list-control<%> (control<%>)]{
-
-A list control gives the user a list of string items to choose from.
- There are two built-in classes that implement
- @racket[list-control<%>]: 
-@itemize[
-
- @item{@racket[choice%] --- presents the list in a popup menu (so
- the user can choose only one item at a time)}
-
- @item{@racket[list-box%] --- presents the list in a scrolling box,
- allowing the use to choose one item (if the style includes
- @racket['single]) or any number of items}
-
-]
-In either case, the set of user-selectable items can be changed
- dynamically.
-
-
-
-
-@defmethod[(append [item label-string?])
-           void?]{
-Adds a new item to the list of user-selectable items. The current
- selection is unchanged (unless the list control is an empty choice
- control, in which case the new item is selected).
-
-}
-
-@defmethod[(clear)
-           void?]{
-Removes all user-selectable items from the control.
-
-}
-
-@defmethod[(delete [n exact-nonnegative-integer?])
-           void?]{
-
-Deletes the item indexed by @racket[n] (where items are indexed
- from @racket[0]). If @racket[n] is equal
- to or larger than the number of items in the control, @|MismatchExn|.
-
-Selected items that are not deleted remain selected, and no other
- items are selected.}
-
-
-@defmethod[(find-string [s string?])
-           (or/c exact-nonnegative-integer? #f)]{
-Finds a user-selectable item matching the given string. If no matching
- choice is found, @racket[#f] is returned, otherwise the index of the
- matching choice is returned (where items are indexed from @racket[0]).
-
-}
-
-@defmethod[(get-number)
-           exact-nonnegative-integer?]{
-Returns the number of user-selectable items in the control (which is
- also one more than the greatest index in the list control).
-
-}
-
-@defmethod[(get-selection)
-           (or/c exact-nonnegative-integer? #f)]{
-Returns the index of the currently selected item (where items are indexed
- from @racket[0]). If the choice item currently contains no choices or no
- selections, @racket[#f] is returned.  If multiple selections are
- allowed and multiple items are selected, the index of the first
- selection is returned.
-
-}
-
-@defmethod[(get-string [n exact-nonnegative-integer?])
-           (and/c immutable? label-string?)]{
-
-Returns the item for the given index (where items are indexed from
- @racket[0]). If the provided index is larger than the greatest index in
- the list control, @|MismatchExn|.
-
-}
-
-@defmethod[(get-string-selection)
-           (or/c (and/c immutable? label-string?) #f)]{
-Returns the currently selected item.  If the control currently
- contains no choices, @racket[#f] is returned. If multiple selections
- are allowed and multiple items are selected, the first selection is
- returned.
-
-}
-
-@defmethod[(set-selection [n exact-nonnegative-integer?])
-           void?]{
-Selects the item specified by the given index (where items are indexed from
- @racket[0]). If the given index larger than the greatest index in the
- list control, @|MismatchExn|.
-
-In a list box control, all other items are deselected, even if multiple
- selections are allowed in the control. See also
-@xmethod[list-box% select].
-
-The control's callback procedure is @italic{not} invoked when this method
-is called.
-
-@MonitorCallback[@elem{The list control's selection} @elem{the user clicking the control} @elem{selection}]
-
-}
-
-@defmethod[(set-string-selection [s string?])
-           void?]{
-Selects the item that matches the given string.  If no match
- is found in the list control, @|MismatchExn|.
-
-In a list box control, all other items are deselected, even if multiple
- selections are allowed in the control. See also
-@xmethod[list-box% select].
-
-The control's callback procedure is @italic{not} invoked when this method
-is called.
-
-@MonitorCallback[@elem{The list control's selection} @elem{the user clicking the control} @elem{selection}]
-
-}
-
-}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-bar-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-bar-class.scrbl
deleted file mode 100644
index 5349195beb..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-bar-class.scrbl
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/menu-bar}}
-
-@defclass/title[menu-bar% object% (menu-item-container<%>)]{
-
-A @racket[menu-bar%] object is created for a particular
- @racket[frame%] object. A frame can have at most one menu bar;
- @|MismatchExn| when a new menu bar is created for a frame that
- already has a menu bar.
-
-
-
-@defconstructor[([parent (or/c (is-a?/c frame%) 'root)]
-                 [demand-callback ((is-a?/c menu-bar%) . -> . any) (lambda (m) (void))])]{
-
-Creates a menu bar in the specified frame. The menu bar is initially
- empty. If @indexed-racket['root] is supplied as @racket[parent], the
- menu bar becomes active only when no other frames are shown. A
- @racket['root] @racket[parent] is allowed only when
- @racket[current-eventspace-has-menu-root?] returns @racket[#t], and
- only if no such menu bar has been created before, otherwise
- @|MismatchExn|.
-
-The @racket[demand-callback] procedure is called by the default
-@method[menu-item-container<%> on-demand] method with the object itself.
-
-}
-
-
-@defmethod[(enable [enable? any/c])
-           void?]{
-
-Enables or disables the menu bar (i.e., all of its menus).  Each
- menu's @method[labelled-menu-item<%> is-enabled?] method returns
- @racket[#f] only if the menu is specifically disabled (in addition to
- the menu bar).
-
-}
-
-
-@defmethod[(get-frame)
-           (or/c (is-a?/c frame%) 'root)]{
-
-Returns the menu bar's frame, or returns @racket['root] if the menu
-bar is shown when no other frames are shown.
-
-}
-
-
-@defmethod[(is-enabled?)
-           boolean?]{
-
-Returns @racket[#t] if the menu bar is enabled, @racket[#f] otherwise.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-class.scrbl
deleted file mode 100644
index bdf38aabb7..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-class.scrbl
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[menu% object% (menu-item-container<%> labelled-menu-item<%>)]{
-
-A @racket[menu%] object is a submenu within a @racket[menu%] or
- @racket[popup-menu%], or as a top-level menu in a
- @racket[menu-bar%].
-
-
-@defconstructor[([label label-string?]
-                 [parent (or/c (is-a?/c menu%) (is-a?/c popup-menu%) 
-                               (is-a?/c menu-bar%))]
-                 [help-string (or/c label-string? #f) #f]
-                 [demand-callback ((is-a?/c menu%) . -> . any) (lambda (m) (void))])]{
-
-Creates a new menu with the given label.
-
-If @racket[label] contains a @litchar{&} or tab characters, they are
- handled specially in the same way as for menu-item labels and buttons. See
- @method[labelled-menu-item<%> set-label] and @racket[button%].
-
-If @racket[help-string] is not @racket[#f], the menu has a help
-string. See @method[labelled-menu-item<%> get-help-string] for more
-information.
-
-The @racket[demand-callback] procedure is called by the default
-@method[menu-item-container<%> on-demand] method with the object itself.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-item-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-item-class.scrbl
deleted file mode 100644
index 79def956a4..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-item-class.scrbl
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[menu-item% object% (selectable-menu-item<%>)]{
-
-A @racket[menu-item%] is a plain string-labelled menu item. Its
- parent must be a @racket[menu%] or @racket[popup-menu%]. When the
- user selects the menu item, its callback procedure is called.
-
-
-@defconstructor[([label label-string?]
-                 [parent (or/c (is-a?/c menu%) (is-a?/c popup-menu%))]
-                 [callback ((is-a?/c menu-item%) (is-a?/c control-event%) . -> . any)]
-                 [shortcut (or/c char? symbol? #f) #f]
-                 [help-string (or/c label-string? #f) #f]
-                 [demand-callback ((is-a?/c menu-item%) . -> . any) 
-                           (lambda (i) (void))]
-                 [shortcut-prefix (and/c (listof (or/c 'alt 'cmd 'meta 'ctl 
-                                                       'shift 'option))
-                                         (λ (x) (implies (equal? 'unix (system-type))
-                                                         (not (and (member 'alt x)
-                                                                   (member 'meta x)))))
-                                         (λ (x) (equal? x (remove-duplicates x))))
-                                  (get-default-shortcut-prefix)])]{
-
-Creates a new menu item in @racket[parent]. The item is initially
- shown, appended to the end of its parent. The @racket[callback]
- procedure is called (with the event type @indexed-racket['menu]) when
- the user selects the menu item (either via a menu bar,
- @xmethod[window<%> popup-menu], or @xmethod[editor-admin%
- popup-menu]).
-
-See @method[labelled-menu-item<%> set-label] for information about
-mnemonic @litchar{&}s in @racket[label].
-
-If @racket[shortcut] is not @racket[#f], the item has a shortcut. See
-@method[selectable-menu-item<%> get-shortcut] for more information.
-The @racket[shortcut-prefix] argument determines the set of modifier
-keys for the shortcut; see @method[selectable-menu-item<%>
-get-shortcut-prefix].
-
-If @racket[help] is not @racket[#f], the item has a help string. See
-@method[labelled-menu-item<%> get-help-string] for more information.
-
-The @racket[demand-callback] procedure is called by the default
-@method[menu-item-container<%> on-demand] method with the object itself.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-item-container-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-item-container-intf.scrbl
deleted file mode 100644
index 0eeed8faaa..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-item-container-intf.scrbl
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[menu-item-container<%> ()]{
-
-A @racket[menu-item-container<%>] object is a @racket[menu%],
- @racket[popup-menu%], or @racket[menu-bar%].
-
-
-@defmethod[(get-items)
-           (listof (is-a?/c menu-item<%>))]{
-Returns a list of the items in the menu, popup menu, or menu bar. The
- order of the items in the returned list corresponds to the order as
- the user sees them in the menu or menu bar.
-
-}
-
-
-@defmethod[(on-demand)
-           void?]{
-@methspec{
-
-Called when the user clicks on the container as a menu bar (before the
- user sees any menu items, except with Unity's global menu bar as
- noted below), just before the container as a popup menu
- is popped up, or just before inspecting the menu bar containing the
- item for a shortcut key binding.
-
-If the container is not a @tech{menu bar} or a @tech{popup menu}, this method is
- normally called via the @method[menu-item-container<%> on-demand]
- method of the container's owning menu bar or popup menu, because the
- default implementation of the method chains to the
- @method[labelled-menu-item<%> on-demand] method of its
- items. However, the method can be overridden in a container such that
- it does not call the @method[labelled-menu-item<%> on-demand] method
- of its items.
-
-On Unix with the Unity window manager using the global menu bar (which
- is the default on Ubuntu), @racket[racket/gui/base] receives no
- notification when the user clicks the menu bar. To approximate
- @method[menu-item-container<%> on-demand] triggered by user clicks of
- the menu bar, @method[menu-item-container<%> on-demand] is called for
- a @tech{menu bar} whenever its @racket[frame%] object loses the
- keyboard focus. Beware that if keyboard focus was lost because a menu
- was clicked, then items added to the clicked menu during an
- @method[menu-item-container<%> on-demand] invocation may not appear
- for the user.
-
-}
-@methimpl{
-
-Calls the @racket[demand-callback] procedure that was provided when
- the object was created, then calls the @method[labelled-menu-item<%>
- on-demand] method of the contained items.
-
-}}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-item-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-item-intf.scrbl
deleted file mode 100644
index 7f86372afa..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/menu-item-intf.scrbl
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[menu-item<%> ()]{
-
-A @racket[menu-item<%>] object is an element within a @racket[menu%],
- @racket[popup-menu%], or @racket[menu-bar%]. Operations that affect
- the parent --- such as renaming the item, deleting the item, or
- adding a check beside the item --- are accomplished via the
- @racket[menu-item<%>] object.
-
-A menu item is either a @racket[separator-menu-item%] object (merely
- a separator), or a @racket[labelled-menu-item<%>] object; the latter
- is more specifically an instance of either @racket[menu-item%] (a
- plain menu item), @racket[checkable-menu-item%] (a checkable menu
- item), or @racket[menu%] (a submenu).
-
-
-@defmethod[(delete)
-           void?]{
-
-Removes the item from its parent. If the menu item is already deleted,
-@method[menu-item<%> delete] has no effect.
-
-See also @method[menu-item<%> restore].
-
-
-}
-
-@defmethod[(get-parent)
-           (or/c (is-a?/c menu%) (is-a?/c popup-menu%) (is-a?/c menu-bar%))]{
-
-Returns the menu, popup menu, or menu bar containing the item. The
- parent for a menu item is specified when the menu item is created,
- and it cannot be changed.
-
-}
-
-@defmethod[(is-deleted?)
-           boolean?]{
-
-Returns @racket[#t] if the menu item is deleted from its parent,
- @racket[#f] otherwise.
-
-}
-
-@defmethod[(restore)
-           void?]{
-
-Adds a deleted item back into its parent. The item is always restored
- to the end of the parent, regardless of its original position. If the
- item is not currently deleted, @method[menu-item<%> restore] has no
- effect.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/message-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/message-class.scrbl
deleted file mode 100644
index a093094649..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/message-class.scrbl
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/message}}
-
-@defclass/title[message% object% (control<%>)]{
-
-A message control is a static line of text or a static bitmap. The
- text or bitmap corresponds to the message's label (see
-@method[message% set-label]).
-
-
-@defconstructor[([label (or/c label-string? (is-a?/c bitmap%) 
-                              (or/c 'app 'caution 'stop))]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [style (listof (or/c 'deleted)) null]
-                 [font (is-a?/c font%) normal-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 2]
-                 [horiz-margin spacing-integer? 2]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #f]
-                 [stretchable-height any/c #f]
-                 [auto-resize any/c #f])]{
-
-Creates a string or bitmap message initially showing @racket[label].
- @bitmaplabeluse[label] An @indexed-racket['app],
- @indexed-racket['caution], or @indexed-racket['stop] symbol for
- @racket[label] indicates an icon; @racket['app] is the application
- icon (Windows and Mac OS X) or a generic ``info'' icon (X),
- @racket['caution] is a caution-sign icon, and @racket['stop] is a
- stop-sign icon.
-
-@labelsimplestripped[@racket[label] @elem{message}]
-
-@DeletedStyleNote[@racket[style] @racket[parent]]{message}
-
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-If @racket[auto-resize] is not @racket[#f], then automatic resizing is
-initially enanbled (see @method[message% auto-resize]), and the
-@racket[message%] object's @tech{graphical minimum size} is as small as
-possible.
-
-}
-
-@defmethod*[([(auto-resize) boolean?]
-             [(auto-resize [on? any/c]) void?])]{
-
-Reports or sets whether the @racket[message%]'s @method[area<%> min-width] and
-@method[area<%> min-height] are automatically set when the label is changed
-via @method[message% set-label].
-
-}
-
-@defmethod[#:mode override
-           (set-label [label (or/c label-string? (is-a?/c bitmap%))])
-           void?]{
-
-The same as @xmethod[window<%> set-label] when @racket[label] is a
- string.
-
-Otherwise, sets the bitmap label for a bitmap message.
- @bitmaplabeluseisbm[label] @|bitmapiforiglabel|
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/miscwin-funcs.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/miscwin-funcs.scrbl
deleted file mode 100644
index b625d0c4ae..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/miscwin-funcs.scrbl
+++ /dev/null
@@ -1,434 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/struct)
-
-@(define (atable . l)
-   (make-table #f (map (lambda (i)
-                         (map (lambda (e)
-                                (make-flow (list (make-paragraph (list e)))))
-                              i))
-                       l)))
-@(define (tline l r)
-   (list (hspace 2) l (hspace 1) 'rarr (hspace 1) r))
-
-
-@title{Miscellaneous}
-
-@defproc[(begin-busy-cursor) void?]{
-
-Changes the cursor to a watch cursor for all windows in the current eventspace.
-Use @racket[end-busy-cursor] to revert the cursor back to its previous
-state. Calls to @racket[begin-busy-cursor] and @racket[end-busy-cursor] can be
-nested arbitrarily.
-
-The cursor installed by @racket[begin-busy-cursor] overrides any
-window-specific cursors installed with @method[window<%> set-cursor].
-
-See also @racket[is-busy?].
-}
-
-@defproc[(bell) void?]{
-Rings the system bell.
-}
-
-
-@defproc[(dimension-integer? [v any/c]) boolean?]{
-
-Equivalent to @racket[(integer-in 0 1000000)].
-
-Beware that certain kinds of windows behave badly when larger than
-32,000 or so in either dimension on some platforms. Redraw of the
-window may be disabled or clipped, for example.}
-
-
-@defproc[(end-busy-cursor) void?]{
-See @racket[begin-busy-cursor].
-}
-
-@defproc*[([(file-creator-and-type [filename path?]
-                                   [creator-string (lambda (s) (and (bytes? s)
-                                                                    (= 4 (bytes-length s))))]
-                                   [type-bytes (lambda (s) (and (bytes? s)
-                                                                 (= 4 (bytes-length s))))])
-            void?]
-           [(file-creator-and-type [filename path?])
-            (values (lambda (s) (and (bytes? s)
-                                (= 4 (bytes-length s))))
-                    (lambda (s) (and (bytes? s)
-                                (= 4 (bytes-length s)))))])]{
-
-Gets or sets the creator and type of a file in Mac OS X.
-
-The get operation always returns @racket[#"????"] and @racket[#"????"] for
- Unix or Windows. The set operation has no effect on Unix or
- Windows.
-}
-
-@defproc[(find-graphical-system-path [what (or/c 'init-file 'x-display)])
-         (or/c path? #f)]{
-
-Finds a platform-specific (and possibly user- or machine-specific)
- standard filename or directory. See also @racket[find-system-path].
-
-The result depends on @racket[what], and a @racket[#f] result is only
- possible when @racket[what] is @racket['x-display]:
-
-@itemize[
-
- @item{@racket['init-file] returns the ,path to the user-specific
- initialization file (containing Racket code). The directory part of
- the path is the same path as returned for @racket['init-dir] by
- Racket's @racket[find-system-path].  The file name is
- platform-specific:
-  @itemize[
-
-  @item{@|AllUnix|: @indexed-file{.gracketrc}}
-  @item{Windows: @indexed-file{gracketrc.rktl}}
-
-  ]}
-
- @item{@racket['x-display] returns a ``path'' whose string identifies
- the X11 display if specified by either the @Flag{display} flag or the
- @envvar{DISPLAY} environment variable when GRacket starts on Unix. For
- other platforms, or when neither @Flag{display} nor @envvar{DISPLAY}
- was specified, the result is @racket[#f].}
-
-]
-
-}
-
-@defproc[(get-default-shortcut-prefix)
-         (case (system-type)
-           [(windows) (list/c 'ctl)]
-           [(macosx)  (list/c 'cmd)]
-           [(unix)    (list/c (or/c 'alt 'cmd 'meta 'ctl 'shift 'option))])]{
-Returns an immutable list specifying the default prefix for menu
-shortcuts. See also
-@xmethod[selectable-menu-item<%> get-shortcut-prefix].
-
-On Windows, the default is @racket['(ctl)]. On Mac OS X, the
-default is @racket['(cmd)]. On Unix, the default is normally
-@racket['(ctl)], but the default can be changed through the
-@Resource{defaultMenuPrefix} low-level preference (see
-@|mrprefsdiscuss|).}
-
-@defproc[(get-panel-background)
-         (is-a?/c color%)]{
-
-Returns a shade of gray.
-
-Historically, the result matched the color of
-a @racket[panel%] background, but @racket[panel%] backgrounds can vary
-on some platforms (e.g., when nested in a @racket[group-box-panel%]),
-so the result is no longer guaranteed to be related to a
-@racket[panel%]'s color.
-}
-
-
-@defproc[(get-highlight-background-color) (is-a?/c color%)]{
-
-Returns the color that is drawn behind selected text.}
-
-
-@defproc[(get-highlight-text-color) (or/c (is-a?/c color%) #f)]{
-
-Returns the color that is used to draw selected text or @racket[#f] if
-selected text is drawn with its usual color.}
-
-
-@defproc[(get-window-text-extent [string string?]
-                                 [font (is-a?/c font%)]
-                                 [combine? any/c #f])
-         (values exact-nonnegative-integer?
-                 exact-nonnegative-integer?)]{
-
-Returns the pixel size of a string drawn as a window's label or value
-when drawn with the given font. The optional @racket[combine?]
-argument is as for @xmethod[dc<%> get-text-extent].
-
-See also @xmethod[dc<%> get-text-extent].
-}
-
-@defproc[(graphical-read-eval-print-loop [eval-eventspace (or/c eventspace? #f) #f]
-                                         [redirect-ports? any/c (not eval-eventspace)])
-         void?]{
-
-Similar to @racket[read-eval-print-loop], except that none of
- @racket[read-eval-print-loop]'s configuration parameters are used (such
- as @racket[current-read]) and the interaction occurs in a GUI window
- instead of using the current input and output ports.
-
-Expressions entered into the graphical read-eval-print loop can be
- evaluated in an eventspace (and thread) that is distinct from the one
- implementing the @racket[graphical-read-eval-print-loop]
- window (i.e., the current eventspace when
- @racket[graphical-read-eval-print-loop] is called).
-
-If no eventspace is provided, or if @racket[#f] is provided, an
- evaluation eventspace is created using @racket[(make-eventspace)]
- with a new custodian; the eventspace and its threads are be shut down
- when the user closes the @racket[graphical-read-eval-print-loop]
- window. If an eventspace is provided, closing the window performs no
- shut-down actions on eventspace.
-
-When @racket[redirect-ports?] is true, the following parameters are
- initialized in the created eventspace's handler thread:
-@itemize[
-
- @item{@racket[current-output-port] --- writes to the frame}
- @item{@racket[current-error-port] --- writes to the frame}
- @item{@racket[current-input-port] --- always returns @racket[eof]}
-
-]
-
-The keymap for the read-eval-print loop's editor is initialized by
- calling the current keymap initializer procedure, which is determined
- by the
-@racket[current-text-keymap-initializer] parameter.
-}
-
-@defproc[(textual-read-eval-print-loop) void?]{
-
-Similar to @racket[read-eval-print-loop], except that evaluation uses
- a newly created eventspace like @racket[graphical-read-eval-print-loop].
-
-The @racket[current-prompt-read] parameter is used in the current
- thread to read input. The result is queued for evaluation and
- printing in the created eventspace's @tech{handler thread}, which
- uses @racket[current-eval] and @racket[current-print]. After printing
- completes for an interaction result, the next expression in read in
- the original thread, and so on.
-
-If an @racket[exn:break] exception is raised in the original thread
-during reading, it aborts the current call to @racket[(current-read)]
-and a new one is started. If an @racket[exn:break] exception is raised
-in the original thread while waiting for an interaction to complete, a
-break is sent (via @racket[break-thread]) to the created eventspace's
-@tech{handler thread}.}
-
-
-@defproc[(get-current-mouse-state) (values (is-a?/c point%)
-                                           (listof (or/c 'left 'middle 'right
-                                                         'shift 'control 'alt 'meta 'caps)))]{
-
-@margin-note{On Mac OS X 10.5 and earlier, mouse-button information is
-not available, so the second result includes only symbols for modifier
-keys.}
-
-Returns the current location of the mouse in screen coordinates, and
-returns a list of symbols for mouse buttons and modifier keys that are
-currently pressed.}
-
-
-@defproc[(hide-cursor-until-moved) void?]{
-
-Hides the cursor until the user moves the mouse or clicks the mouse
- button. (For some platforms, the cursor is not hidden if it is over
- a window in a different eventspace or application.)
-}
-
-@defproc[(is-busy?) boolean?]{
-
-Returns @racket[#t] if a busy cursor has been installed with
-@racket[begin-busy-cursor] and not removed with
-@racket[end-busy-cursor].
-}
-
-@defproc[(label->plain-label [label string?]) string?]{
-
-Strips shortcut ampersands from @racket[label], removes parenthesized
- ampersand--character combinations along with any surrounding space,
- and removes anything after a tab. Overall, it returns the label as it would
- appear on a button on a platform without support for mnemonics.
-
-}
-
-
-@defproc[(make-gl-bitmap [width exact-positive-integer?]
-                         [height exact-positive-integer?]
-                         [config (is-a?/c gl-config%)])
-         (is-a?/c bitmap%)]{
-
-Creates a bitmap that supports both normal @racket[dc<%>] drawing an
-OpenGL drawing through a context returned by @xmethod[dc<%> get-gl-context].
-
-For @racket[dc<%>] drawing, an OpenGL-supporting bitmap draws like a
-bitmap from @racket[make-screen-bitmap] on some platforms, while it
-draws like a bitmap instantiated directly from @racket[bitmap%] on
-other platforms.
-
-Be aware that on Unix systems, GLX may choose indirect rendering for OpenGL
-drawing to bitmaps, which can limit its features to OpenGL 1.4 or below.
-}
-
-
-@defproc[(make-gui-empty-namespace) namespace?]{
-
-Like @racket[make-base-empty-namespace], but with
-@racketmodname[racket/class] and @racketmodname[racket/gui/base] also
-attached to the result namespace.}
-
-@defproc[(make-gui-namespace) namespace?]{
-
-Like @racket[make-base-namespace], but with @racketmodname[racket/class] and
-@racketmodname[racket/gui/base] also required into the top-level
-environment of the result namespace.}
-
-
-@defproc[(make-screen-bitmap [width exact-positive-integer?]
-                             [height exact-positive-integer?]) 
-         (is-a?/c bitmap%)]{
-
-Creates a bitmap that draws in a way that is the same as drawing to a
-canvas in its default configuration.
-
-In particular, on Mac OS X when the main monitor is in Retina display
-mode, a drawing unit corresponds to two pixels, and the bitmap
-internally contains four times as many pixels as requested by
-@racket[width] and @racket[height]. On Windows, the backing scale
-is similarly increased by adjusting the operating-system text scale.
-See also @racket[get-display-backing-scale].
-
-See also @secref[#:doc '(lib "scribblings/draw/draw.scrbl") "Portability"].}
-
-
-@defproc[(play-sound [filename path-string?]
-                     [async? any/c])
-         boolean?]{
-
-Plays a sound file. If @racket[async?] is false, the function does not
- return until the sound completes. Otherwise, it returns immediately.
- The result is @racket[#t] if the sound plays successfully, @racket[#f]
- otherwise.
-
-On Windows, only @filepath{.wav} files are supported.
-
-On Unix, the function invokes an external sound-playing program;
-  looking for a few known programs (@exec{aplay}, @exec{play},
-  @exec{esdplay}, @exec{sndfile-play}, @exec{audioplay}). In addition, a
-  play command can be defined through the @ResourceFirst{playcmd}
-  preference (see @|mrprefsdiscuss|). The preference can hold a
-  program name, or a format string containing a single @litchar{~a}
-  where the filename should be substituted---and used as a shell
-  command.  (Don't use @litchar{~s}, since the string that is used
-  with the format string will be properly quoted and wrapped in double
-  quotes.)  A plain command name is usually better since execution is
-  faster.  The command's output is discarded, unless it returns an
-  error code---in this case the last part of the error output is
-  shown.
-
-On Mac OS X, Quicktime is used to play sounds; most sound
- formats (.wav, .aiff, .mp3) are supported in recent versions of
- Quicktime. In order to play .wav files, Quicktime 3.0 (compatible
- with OS 7.5 and up) is required.}
-
-
-@defproc[(position-integer? [v any/c]) boolean?]{
-
-Equivalent to @racket[(integer-in -1000000 1000000)].}
-
-
-@defproc[(positive-dimension-integer? [v any/c]) boolean?]{
-
-Equivalent to @racket[(integer-in 1 1000000)].}
-
-
-@defproc[(register-collecting-blit [canvas (is-a?/c canvas%)]
-                                   [x position-integer?]
-                                   [y position-integer?]
-                                   [w dimension-integer?]
-                                   [h dimension-integer?]
-                                   [on (is-a?/c bitmap%)]
-                                   [off (is-a?/c bitmap%)]
-                                   [on-x real? 0]
-                                   [on-y real? 0]
-                                   [off-x real? 0]
-                                   [off-y real? 0])
-         void?]{
-
-Registers a ``blit'' to occur when garbage collection starts and
- ends. When garbage collection starts, @racket[on] is drawn at
- location @racket[x] and @racket[y] within @racket[canvas], if
- @racket[canvas] is shown.  When garbage collection ends, the drawing
- is reverted, possibly by drawing the @racket[off] bitmap.
-
-The background behind @racket[on] is unspecified, so @racket[on]
- should be a solid image, and the canvas's scale or scrolling is not
- applied to the drawing. Only the portion of @racket[on] within
- @racket[w] and @racket[h] pixels is used; if @racket[on-x] and
- @racket[on-y] are specified, they specify an offset within the bitmap
- that is used for drawing, and @racket[off-x] and @racket[off-y]
- similarly specify an offset within @racket[off].
-
-The blit is automatically unregistered if @racket[canvas] becomes
- invisible and inaccessible.  Multiple registrations can be installed
- for the same @racket[canvas].
-
-See also @racket[unregister-collecting-blit].}
-
-
-@defproc[(unregister-collecting-blit [canvas (is-a?/c canvas%)])
-         void?]{
-
-Unregisters all blit requests installed for @racket[canvas] with
- @racket[register-collecting-blit].}
-
-
-@defproc[(send-message-to-window [x position-integer?]
-                                 [y position-integer?]
-                                 [message any/c])
-         any/c]{
-
-@index['("drag-and-drop")]{Finds} the frontmost top-level window at
- (@racket[x], @racket[y]) in global coordinates. If a window is there,
- this function calls the window's @method[top-level-window<%>
- on-message] method, providing @racket[message] as the method's
- argument; the result of the function call is the result returned by
- the method. If no Racket window is at the given coordinates, or if it
- is covered by a non-Racket window at (@racket[x], @racket[y]),
- @racket[#f] is returned.
-}
-
-
-@defproc[(spacing-integer? [v any/c]) boolean?]{
-
-Equivalent to @racket[(integer-in 0 1000)].}
-
-
-@defproc[(system-position-ok-before-cancel?) boolean?]{
-
-Returns @racket[#t] on Windows---indicating that a dialog with
-@onscreen{OK} and @onscreen{Cancel} buttons should place the
-@onscreen{OK} button on to left of the @onscreen{Cancel} button---and
-returns @racket[#f] on Mac OS X and Unix.}
-
-
-@defthing[the-clipboard (is-a?/c clipboard<%>)]{
-
-See @racket[clipboard<%>].
-
-
-}
-
-@defthing[the-x-selection-clipboard (is-a?/c clipboard<%>)]{
-
-See @racket[clipboard<%>].
-
-
-}
-
-@defproc[(label-string? [v any/c]) boolean?]{
-  Returns @racket[#t] if @racket[v] is a string whose length is less than or equal to @racket[200].
-
-  This predicate is typically used as the contract for strings that 
-  appear in GUI objects. In some cases, such as the label in a @racket[button%]
-  or @racket[menu-item%] object, the character @litchar{&} is treated specially
-  to indicate that the following character is used in keyboard navigation. See
-  @xmethod[labelled-menu-item<%> set-label] for one such example.
-  In other cases, such as the label on a @racket[frame%], @litchar{&} is not
-  treated specially.
-}
-
-@defproc[(key-code-symbol? [v any/c]) boolean?]{
-  Returns @racket[#t] if the argument is a symbol that can be returned by
-  @racket[@key-event%]'s method @method[key-event% get-key-code].
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/mouse-event-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/mouse-event-class.scrbl
deleted file mode 100644
index 44832a2fe0..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/mouse-event-class.scrbl
+++ /dev/null
@@ -1,369 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[mouse-event% event% ()]{
-
-A @racket[mouse-event%] object encapsulates a mouse event.
- Mouse events are primarily processed by
-@xmethod[window<%> on-subwindow-event] and
-@xmethod[canvas<%> on-event].
-
-See also @|mousekeydiscuss|.
-
-
-
-
-@defconstructor[([event-type (or/c 'enter 'leave 'left-down 'left-up 
-                                   'middle-down 'middle-up 
-                                   'right-down 'right-up 'motion)]
-                 [left-down any/c #f]
-                 [middle-down any/c #f]
-                 [right-down any/c #f]
-                 [x exact-integer? 0]
-                 [y exact-integer? 0]
-                 [shift-down any/c #f]
-                 [control-down any/c #f]
-                 [meta-down any/c #f]
-                 [alt-down any/c #f]
-                 [time-stamp exact-integer? 0]
-                 [caps-down any/c #f]
-                 [mod3-down any/c #f]
-                 [mod4-down any/c #f]
-                 [mod5-down any/c #f])]{
-
-Creates a mouse event for a particular type of event. The event types
- are:
-
-@itemize[
-@item{@racket['enter] --- mouse pointer entered the window}
-@item{@racket['leave] --- mouse pointer left the window}
-@item{@racket['left-down] --- left mouse button pressed}
-@item{@racket['left-up] --- left mouse button released}
-@item{@racket['middle-down] --- middle mouse button pressed}
-@item{@racket['middle-up] --- middle mouse button released}
-@item{@racket['right-down] --- right mouse button pressed (Mac OS X: click with control key pressed)}
-@item{@racket['right-up] --- right mouse button released (Mac OS X: release with control key pressed)}
-@item{@racket['motion] --- mouse moved, with or without button(s) pressed}
-]
-
-See the corresponding @racketidfont{get-} and @racketidfont{set-}
- methods for information about @racket[left-down],
- @racket[middle-down], @racket[right-down], @racket[x], @racket[y],
- @racket[shift-down], @racket[control-down], @racket[meta-down],
- @racket[alt-down], @racket[time-stamp], @racket[caps-down], @racket[mod3-down],
- @racket[mod4-down], and @racket[mod5-down].
-
-@history[#:changed "1.1" @elem{Added @racket[mod3-down], @racket[mod4-down], and @racket[mod5-down].}]
-}
-
-@defmethod[(button-changed? [button (or/c 'left 'middle 'right 'any) 'any])
-           boolean?]{
-
-Returns @racket[#t] if this was a mouse button press or release event,
- @racket[#f] otherwise. See also
-@method[mouse-event% button-up?] and
-@method[mouse-event% button-down?].
-
-If @racket[button] is not @racket['any], then @racket[#t] is only returned
- if it is a release event for a specific button.
-
-}
-
-@defmethod[(button-down? [button (or/c 'left 'middle 'right 'any) 'any])
-           boolean?]{
-
-Returns @racket[#t] if the event is for a button press, @racket[#f]
- otherwise.
-
-If @racket[button] is not @racket['any], then @racket[#t] is only returned
- if it is a press event for a specific button.
-
-}
-
-@defmethod[(button-up? [button (or/c 'left 'middle 'right 'any) 'any])
-           boolean?]{
-
-Returns @racket[#t] if the event is for a button release, @racket[#f]
- otherwise. (As noted in @|mousekeydiscuss|, button release events are
- sometimes dropped.)
-
-If @racket[button] is not @racket['any], then @racket[#t] is only returned
- if it is a release event for a specific button.
-
-}
-
-@defmethod[(dragging?)
-           boolean?]{
-
-Returns @racket[#t] if this was a dragging event (motion while a button
- is pressed), @racket[#f] otherwise.
-
-}
-
-@defmethod[(entering?)
-           boolean?]{
-
-Returns @racket[#t] if this event is for the mouse entering a window,
- @racket[#f] otherwise.
-
-When the mouse button is up, an enter/leave event notifies a window
- that it will start/stop receiving mouse events. When the mouse button
- is down, however, the window receiving the mouse-down event receives
- all mouse events until the button is released; enter/leave events are
- not sent to other windows, and are not reliably delivered to the
- click-handling window (since the window can detect movement out of
- its region via @method[mouse-event% get-x] and @method[mouse-event%
- get-y]). See also @|mousekeydiscuss|.
-
-}
-
-
-@defmethod[(get-alt-down)
-           boolean?]{
-
-Returns @racket[#t] if the Option (Mac OS X) key was down for the
- event. When the Alt key is pressed in Windows, it is reported as a
- Meta press (see @method[mouse-event% get-meta-down]).
-
-}
-
-@defmethod[(get-caps-down)
-           boolean?]{
-
-Returns @racket[#t] if the Caps Lock key was on for the event.
-
-}
-
-@defmethod[(get-control-down)
-           boolean?]{
-
-Returns @racket[#t] if the Control key was down for the event.
-
-On Mac OS X, if a control-key press is combined with a mouse button
- click, the event is reported as a right-button click and
- @method[mouse-event% get-control-down] for the event reports
- @racket[#f].
-
-}
-
-@defmethod[(get-event-type)
-           (or/c 'enter 'leave 'left-down 'left-up 
-                 'middle-down 'middle-up 
-                 'right-down 'right-up 'motion)]{
-
-Returns the type of the event; see @racket[mouse-event%] for
-information about each event type. See also @method[mouse-event%
-set-event-type].
-
-}
-
-@defmethod[(get-left-down)
-           boolean?]{
-Returns @racket[#t] if the left mouse button was down (but not pressed) during the event.
-
-}
-
-@defmethod[(get-meta-down)
-           boolean?]{
-
-Returns @racket[#t] if the Meta (Unix), Alt (Windows), or Command (Mac OS
- X) key was down for the event.
-
-}
-
-@defmethod[(get-middle-down)
-           boolean?]{
-
-Returns @racket[#t] if the middle mouse button was down (but not
- pressed) for the event.  On Mac OS X, a middle-button click is
- impossible.
-
-}
-
-@defmethod[(get-mod3-down)
-           boolean?]{
-
-Returns @racket[#t] if the Mod3 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(get-mod4-down)
-           boolean?]{
-
-Returns @racket[#t] if the Mod4 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(get-mod5-down)
-           boolean?]{
-
-Returns @racket[#t] if the Mod5 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(get-right-down)
-           boolean?]{
-
-Returns @racket[#t] if the right mouse button was down (but not
- pressed) for the event. On Mac OS X, a control-click combination
- is treated as a right-button click.
-
-}
-
-@defmethod[(get-shift-down)
-           boolean?]{
-
-Returns @racket[#t] if the Shift key was down for the event.
-
-}
-
-@defmethod[(get-x)
-           exact-integer?]{
-
-Returns the x-position of the mouse at the time of the event, in the
- target's window's (client-area) coordinate system.
-
-}
-
-@defmethod[(get-y)
-           exact-integer?]{
-
-Returns the y-position of the mouse at the time of the event in the
- target's window's (client-area) coordinate system.
-
-}
-
-@defmethod[(leaving?)
-           boolean?]{
-
-Returns @racket[#t] if this event is for the mouse leaving a window,
- @racket[#f] otherwise.
-
-See @method[mouse-event% entering?] for information about enter and
-leave events while the mouse button is clicked.
-
-}
-
-@defmethod[(moving?)
-           boolean?]{
-
-Returns @racket[#t] if this was a moving event (whether a button is
- pressed is not), @racket[#f] otherwise.
-}
-
-
-@defmethod[(set-alt-down [down? any/c])
-           void?]{
-
-Sets whether the Option (Mac OS X) key was down for the event.  When
- the Alt key is pressed in Windows, it is reported as a Meta press
- (see @method[mouse-event% set-meta-down]).
-
-}
-
-@defmethod[(set-caps-down [down? any/c])
-           void?]{
-
-Sets whether the Caps Lock key was on for the event.
-
-}
-
-@defmethod[(set-control-down [down? any/c])
-           void?]{
-
-Sets whether the Control key was down for the event.
-
-On Mac OS X, if a control-key press is combined with a mouse button
- click, the event is reported as a right-button click and
- @method[mouse-event% get-control-down] for the event reports
- @racket[#f].
-
-}
-
-@defmethod[(set-event-type [event-type (or/c 'enter 'leave 'left-down 'left-up 
-                                             'middle-down 'middle-up 
-                                             'right-down 'right-up 'motion)])
-           void?]{
-
-Sets the type of the event; see @racket[mouse-event%] for information
-about each event type. See also @method[mouse-event% get-event-type].
-
-}
-
-@defmethod[(set-left-down [down? any/c])
-           void?]{
-
-Sets whether the left mouse button was down (but not pressed) during
-the event.
-
-}
-
-@defmethod[(set-meta-down [down? any/c])
-           void?]{
-
-Sets whether the Meta (Unix), Alt (Windows), or Command (Mac OS X) key
- was down for the event.
-
-}
-
-@defmethod[(set-middle-down [down? any/c])
-           void?]{
-
-Sets whether the middle mouse button was down (but not pressed) for
- the event.  On Mac OS X, a middle-button click is impossible.
-
-}
-
-@defmethod[(set-mod3-down [down? any/c])
-           void?]{
-
-Sets whether the Mod3 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(set-mod4-down [down? any/c])
-           void?]{
-
-Sets whether the Mod4 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(set-mod5-down [down? any/c])
-           void?]{
-
-Sets whether the Mod5 (Unix) key was down for the event.
-
-@history[#:added "1.1"]}
-
-@defmethod[(set-right-down [down? any/c])
-           void?]{
-
-Sets whether the right mouse button was down (but not pressed) for the
- event. On Mac OS X, a control-click combination by the user is
- treated as a right-button click.
-
-}
-
-@defmethod[(set-shift-down [down? any/c])
-           void?]{
-
-Sets whether the Shift key was down for the event.
-
-}
-
-@defmethod[(set-x [pos exact-integer?])
-           void?]{
-
-Sets the x-position of the mouse at the time of the event in the
- target's window's (client-area) coordinate system.
-
-}
-
-@defmethod[(set-y [pos exact-integer?])
-           void?]{
-
-Sets the y-position of the mouse at the time of the event in the
- target's window's (client-area) coordinate system.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/mult-color-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/mult-color-intf.scrbl
deleted file mode 100644
index 869258454e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/mult-color-intf.scrbl
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[mult-color<%> ()]{
-
-A @racket[mult-color<%>] object is used to scale the RGB values of a
- @racket[color%] object. A @racket[mult-color<%>] object exist only
- within a @racket[style-delta%] object.
-
-See also @method[style-delta% get-foreground-mult] and
- @method[style-delta% get-background-mult].
-
-
-
-@defmethod[(get [r (box/c real?)]
-                [g (box/c real?)]
-                [b (box/c real?)])
-           void?]{
-
-Gets all of the scaling values.
-
-@boxisfill[@racket[r] @elem{the scaling value for the red component of the color}]
-@boxisfill[@racket[g] @elem{the scaling value for the green component of the color}]
-@boxisfill[@racket[b] @elem{the scaling value for the blue component of the color}]
-
-}
-
-@defmethod[(get-b)
-           real?]{
-
-Gets the multiplicative scaling value for the blue component of the color.
-
-}
-
-@defmethod[(get-g)
-           real?]{
-
-Gets the multiplicative scaling value for the green component of the color.
-
-}
-
-@defmethod[(get-r)
-           real?]{
-
-Gets the multiplicative scaling value for the red component of the color.
-
-}
-
-@defmethod[(set [r real?]
-                [g real?]
-                [b real?])
-           void?]{
-
-Sets all of the scaling values.
-
-}
-
-@defmethod[(set-b [v real?])
-           void?]{
-
-Sets the multiplicative scaling value for the blue component of the color.
-
-}
-
-@defmethod[(set-g [v real?])
-           void?]{
-
-Sets the multiplicative scaling value for the green component of the
-color.
-
-}
-
-@defmethod[(set-r [v real?])
-           void?]{
-
-Sets the additive value for the red component of the color.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/pane-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/pane-class.scrbl
deleted file mode 100644
index 528f733037..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/pane-class.scrbl
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[pane% object% (area-container<%> subarea<%>)]{
-
-A pane is a both a container and a containee area. It serves only
- as a geometry management device. A @racket[pane%]
- cannot be hidden or disabled like a @racket[panel%] object.
-
-A @racket[pane%] object has a degenerate placement strategy for
- managing its children: it places each child as if it was the only
- child of the panel.  The @racket[horizontal-pane%] and
- @racket[vertical-pane%] classes provide useful geometry management
- for multiple children.
-
-See also @racket[grow-box-spacer-pane%].
-
-@history[#:changed "1.3" @elem{Changed the placement strategy to
-                               stretch and align children, instead of
-                               placing all children at the top-left
-                               corner.}]
-
-@defconstructor[([parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [vert-margin spacing-integer? 0]
-                 [horiz-margin spacing-integer? 0]
-                 [border spacing-integer? 0]
-                 [spacing spacing-integer? 0]
-                 [alignment (list/c (or/c 'left 'center 'right)
-                                    (or/c 'top 'center 'bottom))
-                            '(center top)]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-@SubareaKWs[] @AreaContKWs[] @AreaKWs[]
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/panel-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/panel-class.scrbl
deleted file mode 100644
index 625c7b2389..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/panel-class.scrbl
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/panel}}
-
-@defclass/title[panel% object% (area-container-window<%> subwindow<%>)]{
-
-A panel is a both a container and a containee window. It serves mainly
- as a geometry management device, but the @racket['border] creates a
- container with a border. Unlike a @racket[pane%] object, a @racket[panel%]
- object can be hidden or disabled.
-
-A @racket[panel%] object has a degenerate placement strategy for
- managing its children: it places each child as if it was the only
- child of the panel.  The @racket[horizontal-panel%] and
- @racket[vertical-panel%] classes provide useful geometry management
- for multiple children.
-
-@history[#:changed "1.3" @elem{Changed the placement strategy to
-                               stretch and align children, instead of
-                               placing all children at the top-left
-                               corner.}]
-
-@defconstructor[([parent (or/c (is-a?/c frame%) (is-a?/c dialog%)
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [style (listof (or/c 'border 'deleted
-                                      'hscroll 'auto-hscroll
-                                      'vscroll 'auto-vscroll)) null]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 0]
-                 [horiz-margin spacing-integer? 0]
-                 [border spacing-integer? 0]
-                 [spacing spacing-integer? 0]
-                 [alignment (list/c (or/c 'left 'center 'right)
-                                    (or/c 'top 'center 'bottom))
-                            '(center center)]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-If the @racket['border] style is specified, the window is created with
- a thin border (in which case the client size of the panel may be
- less than its total size). @DeletedStyleNote[@racket[style] @racket[parent]]{panel}
-
-If the @racket['hscroll] or @racket['vscroll] style is specified, then
- the panel includes a scrollbar in the corresponding direction, and
- the panel's own size in the corresponding direction is not
- constrained by the size of its children subareas. The @racket['auto-hscroll]
- and @racket['auto-vscroll] styles are like @racket['hscroll] or
- @racket['vscroll], but they cause the corresponding scrollbar to
- disappear when no scrolling is needed in the corresponding direction;
- the @racket['auto-vscroll] and @racket['auto-hscroll] modes assume that
- children subareas are placed using the default algorithm for a @racket[panel%],
- @racket[vertical-panel%], or @racket[horizontal-panel%].
-
-@WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaContKWs[] @AreaKWs[]
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/pasteboard-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/pasteboard-class.scrbl
deleted file mode 100644
index 53b59c65c0..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/pasteboard-class.scrbl
+++ /dev/null
@@ -1,1163 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[pasteboard% object% (editor<%>)]{
-
-A @racket[pasteboard%] object is an editor for displaying snips with
- arbitrary @techlink{location}s.
-
-@defconstructor[()]{
-
-The editor will not be displayed until it is attached to an
- @racket[editor-canvas%] object or some other @techlink{display}.
-
-A new @racket[keymap%] object is created for the new editor.  See also
- @method[editor<%> get-keymap] and @method[editor<%> set-keymap].
-
-A new @racket[style-list%] object is created for the new editor.  See
- also @method[editor<%> get-style-list] and @method[editor<%>
- set-style-list].
-
-}
-
-
-@defmethod*[([(add-selected [snip (is-a?/c snip%)])
-              void?]
-             [(add-selected [x real?]
-                            [y real?]
-                            [w (and/c real? (not/c negative?))]
-                            [h (and/c real? (not/c negative?))])
-              void?])]{
-
-Selects snips without deselecting other snips. When coordinates are
- given, this method selects all snips that intersect with the given
- rectangle (in editor coordinates).
-
-@|OnSelectNote|
-
-}
-
-
-@defmethod[#:mode pubment 
-           (after-delete [snip (is-a?/c snip%)])
-           void?]{
-@methspec{
-
-Called after a snip is deleted from the editor (and after the
- @techlink{display} is refreshed; use @method[pasteboard% on-delete]
- and @method[editor<%> begin-edit-sequence] to avoid extra refreshes
- when @method[pasteboard% after-delete] modifies the editor).
-
-See also @method[pasteboard% can-delete?] and @method[editor<%>
- on-edit-sequence].
-
-No internals locks are set when this method is called.
-
-}
-@methimpl{
-Does nothing.
-}
-}
-
-
-@defmethod[#:mode pubment 
-           (after-insert [snip (is-a?/c snip%)]
-                         [before (or/c (is-a?/c snip%) #f)]
-                         [x real?]
-                         [y real?])
-           void?]{
-
-@methspec{
-
-Called after a snip is inserted into the editor (and after the
- @techlink{display} is refreshed; use @method[pasteboard% on-insert]
- and @method[editor<%> begin-edit-sequence] to avoid extra refreshes
- when @method[pasteboard% after-insert] modifies the editor).
-
-See also @method[pasteboard% can-insert?] and @method[editor<%>
- on-edit-sequence].
-
-No internals locks are set when this method is called.
-
-}
-@methimpl{
-Does nothing.
-}
-}
-
-
-@defmethod[#:mode pubment 
-           (after-interactive-move [event (is-a?/c mouse-event%)])
-           void?]{
-@methspec{
-
-Called after the user stops interactively dragging snips (the ones
- that are selected; see @method[pasteboard%
- find-next-selected-snip]). The mouse event that terminated the move
- (usually a button-up event) is provided.
-
-See also @method[pasteboard% can-interactive-move?] and
- @method[pasteboard% on-interactive-move].
-
-}
-@methimpl{
-
-Does nothing.
-
-}
-}
-
-
-@defmethod[#:mode pubment 
-           (after-interactive-resize [snip (is-a?/c snip%)])
-           void?]{
-@methspec{
-
-Called after the user stops interactively resizing a snip (the one
- that is currently selected; see @method[pasteboard%
- find-next-selected-snip]). The @racket[snip] argument is the snip
- that was resized.
-
-See also @method[pasteboard% can-interactive-resize?] and
- @method[pasteboard% on-interactive-resize].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (after-move-to [snip (is-a?/c snip%)]
-                          [x real?]
-                          [y real?]
-                          [dragging? any/c])
-           void?]{
-@methspec{
-
-Called after a given snip is moved within the editor (and after the
- @techlink{display} is refreshed; use @method[pasteboard% on-move-to]
- and @method[editor<%> begin-edit-sequence] to avoid extra refreshes
- when @method[pasteboard% after-move-to] modifies the editor).
-
-If @racket[dragging?] is not @racket[#f], then this move was a temporary
- move for dragging.
-
-See also
- @method[pasteboard% can-move-to?] and
- @method[editor<%> on-edit-sequence].
-
-No internals locks are set when this method is called.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (after-reorder [snip (is-a?/c snip%)]
-                          [to-snip (is-a?/c snip%)]
-                          [before? any/c])
-           boolean?]{
-@methspec{
-
-Called before a snip is moved in the pasteboard's front-to-back snip
- order (and after the @techlink{display} is refreshed; use
- @method[pasteboard% on-reorder] and @method[editor<%>
- begin-edit-sequence] to avoid extra refreshes when
- @method[pasteboard% after-reorder] modifies the editor).
-
-If @racket[before?] is @racket[#t], then @racket[snip] was moved before
- @racket[to-snip], otherwise @racket[snip] was moved after @racket[to-snip].
-
-See also @method[pasteboard% can-reorder?] and @method[editor<%>
- on-edit-sequence].
-
-No internals locks are set when this method is called.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (after-resize [snip (is-a?/c snip%)]
-                         [w (and/c real? (not/c negative?))]
-                         [h (and/c real? (not/c negative?))]
-                         [resized? any/c])
-           void?]{
-@methspec{
-
-Called after a given snip is resized (and after the @techlink{display}
- is refreshed; use @method[pasteboard% on-resize] and
- @method[editor<%> begin-edit-sequence] to avoid extra refreshes when
- @method[pasteboard% after-resize] modifies the editor), or after an
- unsuccessful resize attempt was made.
-
-If @racket[resized?] is not @racket[#f], the snip was successfully
- resized.
-
-See also @method[pasteboard% can-resize?] and @method[editor<%>
- on-edit-sequence].
-
-No internals locks are set when this method is called.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (after-select [snip (is-a?/c snip%)]
-                         [on? any/c])
-           void?]{
-
-@methspec{
-
-Called after a snip in the pasteboard is selected or deselected. See
- also @method[pasteboard% on-select].  This method is not called after
- selected snip is deleted (and thus de-selected indirectly); see also
- @method[pasteboard% after-delete].
-
-If @racket[on?] is @racket[#t], then @racket[snip] was just selected,
- otherwise @racket[snip] was just deselected.
-
-See also @method[pasteboard% can-select?] and @method[editor<%>
- on-edit-sequence].
-
-No internals locks are set when this method is called.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (can-delete? [snip (is-a?/c snip%)])
-           boolean?]{
-
-@methspec{
-
-Called before a snip is deleted from the editor.
- If the return value is @racket[#f], then the
- delete will be aborted.
-
-See also @method[pasteboard% on-delete] and @method[pasteboard%
- after-delete].
-
-The editor is internally locked for writing when this method is called (see
- also @|lockdiscuss|).
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}
-}
-
-@defmethod[#:mode pubment 
-           (can-insert? [snip (is-a?/c snip%)]
-                        [before (or/c (is-a?/c snip%) #f)]
-                        [x real?]
-                        [y real?])
-           boolean?]{
-
-@methspec{
-
-Called before a snip is inserted from the editor.  If the return value
- is @racket[#f], then the insert will be aborted.
-
-See also @method[pasteboard% on-insert] and @method[pasteboard%
- after-insert].
-
-The editor is internally locked for writing when this method is called (see
- also @|lockdiscuss|).
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}
-}
-
-
-@defmethod[#:mode pubment 
-           (can-interactive-move? [event (is-a?/c mouse-event%)])
-           boolean?]{
-
-@methspec{
-
-Called when the user starts interactively dragging snips (the ones
- that are selected; see @method[pasteboard%
- find-next-selected-snip]). All of the selected snips will be
- moved. If @racket[#f] is returned, the interactive move is
- disallowed. The mouse event that started the move (usually a
- button-down event) is provided.
-
-See also @method[pasteboard% on-interactive-move], @method[pasteboard%
- after-interactive-move], and @method[pasteboard%
- interactive-adjust-move].
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (can-interactive-resize? [snip (is-a?/c snip%)])
-           boolean?]{
-@methspec{
-
-Called when the user starts interactively resizing a snip (the one
- that is selected; see @method[pasteboard%
- find-next-selected-snip]). If @racket[#f] is returned, the
- interactive resize is disallowed.
-
-The @racket[snip] argument is the snip that will be resized.
-
-See also @method[pasteboard% after-interactive-resize],
- @method[pasteboard% after-interactive-resize], and
- @method[pasteboard% interactive-adjust-resize].
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (can-move-to? [snip (is-a?/c snip%)]
-                         [x real?]
-                         [y real?]
-                         [dragging? any/c])
-           boolean?]{
-@methspec{
-
-Called before a snip is moved in the editor.  If the return value is
- @racket[#f], then the move will be aborted.
-
-If @racket[dragging?] is not @racket[#f], then this move is a
- temporary move for dragging.
-
-See also @method[pasteboard% on-move-to] and @method[pasteboard%
- after-move-to].
-
-The editor is internally locked for writing when this method is called
- (see also @|lockdiscuss|).
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (can-reorder? [snip (is-a?/c snip%)]
-                         [to-snip (is-a?/c snip%)]
-                         [before? any/c])
-           boolean?]{
-@methspec{
-
-Called before a snip is moved in the pasteboard's front-to-back snip
- order.  If the return value is @racket[#f], then the reordering will
- be aborted.
-
-If @racket[before?] is @racket[#t], then @racket[snip] is to be moved before
- @racket[to-snip], otherwise @racket[snip] is to be moved after
- @racket[to-snip].
-
-See also @method[pasteboard% on-reorder] and @method[pasteboard%
- after-reorder].
-
-The editor is internally locked for writing when this method is called (see
- also @|lockdiscuss|).
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (can-resize? [snip (is-a?/c snip%)]
-                        [w (and/c real? (not/c negative?))]
-                        [h (and/c real? (not/c negative?))])
-           boolean?]{
-
-@methspec{
-
-Called before a snip is resized in the editor.  If the return value is
- @racket[#f], then the resize will be aborted.
-
-See also @method[pasteboard% on-resize] and @method[pasteboard%
- after-resize].
-
-The editor is internally locked for writing when this method is called (see
- also @|lockdiscuss|).
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-@defmethod[#:mode pubment 
-           (can-select? [snip (is-a?/c snip%)]
-                        [on? any/c])
-           boolean?]{
-@methspec{
-
-This method is called before a snip in the pasteboard is selected or
- deselected. If @racket[#f] is returned, the selection change is
- disallowed. This method is not called when a selected snip is to be
- deleted (and thus de-selected indirectly); see also
- @method[pasteboard% can-delete?].
-
-If @racket[on?] is @racket[#t], then @racket[snip] will be selected,
-otherwise @racket[snip] will be deselected.
-
-See also @method[pasteboard% on-select] and @method[pasteboard%
- after-select].
-
-The editor is internally locked for writing when this method is called (see
- also @|lockdiscuss|). 
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-
-@defmethod*[([(change-style [style (or/c (is-a?/c style-delta%) (is-a?/c style<%>) #f) #f]
-                            [snip (or/c (is-a?/c snip%) #f) #f])
-              void?])]{
-
-Changes the style of @racket[snip] to a specific style or by applying
- a style delta.  If @racket[snip] is @racket[#f], then all currently
- selected snips are changed. If @racket[style] is @racket[#f], then 
- the default style is used, according to @method[editor<%> default-style-name].
- 
-To change a large collection of snips from one style to another style,
- consider providing a @racket[style<%>] instance rather than a
- @racket[style-delta%] instance. Otherwise, @method[pasteboard%
- change-style] must convert the @racket[style-delta%] instance to the
- @racket[style<%>] instance for every snip; this conversion consumes
- both time and (temporary) memory.
-
-When a @racket[style] is provided: @InStyleListNote[@racket[style]]
-
-}
-
-
-@defmethod[#:mode override
-           (copy-self-to [dest (or/c (is-a?/c text%) (is-a?/c pasteboard%))])
-           void?]{
-
-In addition to the default @xmethod[editor<%> copy-self-to] work, the
- dragability, selection visibility state, and scroll step of
- @this-obj[] are installed into @racket[dest].
-
-}
-
-
-@defmethod*[([(delete)
-              void?]
-             [(delete [snip (is-a?/c snip%)])
-              void?])]{
-
-Deletes @racket[snip] when provided, or deletes the currently selected
- snips from the editor when @racket[snip] is not provided.
-
-@MonitorMethod[@elem{The content of an editor} @elem{the
- system in response to other method
- calls} @elem{@method[pasteboard% on-delete]} @elem{content deletion}]
-
-}
-
-
-@defmethod[(do-copy [time exact-integer?]
-                    [extend? any/c])
-           void?]{
-
-@methspec{
-
-Called to copy the editor's current selection into the clipboard.
- This method is provided so that it can be overridden by subclasses.
- Do not call this method directly; instead, call @method[editor<%>
- copy].
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-@methimpl{
-
-Copies the current selection, extending the current clipboard contexts
- if @racket[extend?] is true.
-
-}}
-
-
-@defmethod[(do-paste [time exact-integer?])
-           void?]{
-@methspec{
-
-Called to paste the current contents of the clipboard into the editor.
- This method is provided so that it can be overridden by subclasses.
- Do not call this method directly; instead, call @method[editor<%>
- paste].
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-@methimpl{
-
-Pastes.
-
-}}
-
-
-@defmethod[(do-paste-x-selection [time exact-integer?])
-           void?]{
-@methspec{
-
-Called to paste the current contents of the X11 selection on Unix (or
- the clipboard on Windows and Mac OS X) into the editor.  This
- method is provided so that it can be overridden by subclasses.  Do
- not call this method directly; instead, call @method[editor<%>
- paste-x-selection].
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-@methimpl{
-
-Pastes.
-
-}}
-
-
-@defmethod[(erase)
-           void?]{
-
-Deletes all snips from the editor.
-
-See also @method[pasteboard% delete].
-
-}
-
-
-@defmethod[(find-next-selected-snip [start (or/c (is-a?/c snip%) #f)])
-           (or/c (is-a?/c snip%) #f)]{
-
-Returns the next selected snip in the editor, starting the search
- after @racket[start]. (@|seesniporderdiscuss|) If @racket[start] is @racket[#f],
- then the search starts with the first snip in the editor (and thus
- returns the first selected snip, if any are selected). If no more
- selected snips are available, or if @racket[start] is not in the
- pasteboard, @racket[#f] is returned.
-
-}
-
-
-@defmethod[(find-snip [x real?]
-                      [y real?]
-                      [after (or/c (is-a?/c snip%) #f) #f])
-           (or/c (is-a?/c snip%) #f)]{
-
-Finds the frontmost snip (after a given snip) that intersects a given
- @techlink{location}.  @|seesniporderdiscuss|
-
-The @racket[x] and @racket[y] arguments are in editor coordinates. If
- @racket[after] is not supplied, the frontmost snip at @racket[x] and
- @racket[y] is returned, otherwise the frontmost snip behind @racket[after]
- is returned. If @racket[after] is a snip that is not in the pasteboard,
- @racket[#f] is returned.
-
-@|OVD|
-
-}
-
-
-@defmethod[(get-center) (values real? real?)]{
-
-Returns the center of the pasteboard in pasteboard coordinates.
-
-The first result is the x-coordinate of the center and
-the second result is the y-coordinate of the center.
-
-}
-
-
-@defmethod[(get-dragable)
-           boolean?]{
-
-Returns whether snips in the editor can be interactively dragged by
- event handling in @method[pasteboard% on-default-event]: @racket[#t]
- if dragging is allowed, @racket[#f] otherwise.  By default, dragging
- is allowed. See also @method[pasteboard% set-dragable].
-
-}
-
-@defmethod[(get-scroll-step)
-           (and/c real? (not/c negative?))]{
-
-Gets the editor @techlink{location} offset for each vertical scroll
- position.  See also @method[pasteboard% set-scroll-step].
-
-}
-
-
-@defmethod[(get-selection-visible)
-           boolean?]{
-
-Returns whether selection dots are drawn around the edge of selected
- snips in the pasteboard. By default, selection dots are on. See also
- @method[pasteboard% set-selection-visible].
-
-}
-
-
-@defmethod*[#:mode extend
-            ([(insert [snip (is-a?/c snip%)])
-              void?]
-             [(insert [snip (is-a?/c snip%)]
-                      [before (or/c (is-a?/c snip%) #f)]
-                      [x real?]
-                      [y real?])
-              void?]
-             [(insert [snip (is-a?/c snip%)]
-                      [x real?]
-                      [y real?])
-              void?]
-             [(insert [snip (is-a?/c snip%)]
-                      [before (or/c (is-a?/c snip%) #f)])
-              void?])]{
-
-Inserts @racket[snip] at @techlink{location} @math{(@racket[x],
- @racket[y])} just in front of
- @racket[before]. (@|seesniporderdiscuss|) If @racket[before] is not
- provided or is @racket[#f], then @racket[snip] is inserted behind all
- other snips. If @racket[x] and @racket[y] are not provided, the snip
- is added at @math{(0, 0)}.
-
-}
-
-
-@defmethod[(interactive-adjust-mouse [x (box/c real?)]
-                                     [y (box/c real?)])
-           void?]{
-
-@methspec{
-
-This method is called during interactive dragging and resizing (of the
- currently selected snips; see @method[pasteboard%
- find-next-selected-snip]) to preprocess the current mouse
- @techlink{location} (in editor coordinates).  The snip and actual x
- and y coordinates are passed into the method (boxed); the resulting
- coordinates are used instead of the actual mouse @techlink{location}.
-
-See also 
- @method[pasteboard% interactive-adjust-resize].
-
-}
-@methimpl{
-
-A negative value for either @racket[x] or @racket[y] is replaced with
- @racket[0].
-
-}}
-
-
-@defmethod[(interactive-adjust-move [snip (is-a?/c snip%)]
-                                    [x (box/c real?)]
-                                    [y (box/c real?)])
-           void?]{
-@methspec{
-
-This method is called during an interactive move (for each selected
- snip) to preprocess the user-determined snip @techlink{location} for each
- selected snip. The snip and mouse-determined @techlink{location}s (in editor
- coordinates) are passed into the method (boxed); the resulting
- @techlink{location}s are used for graphical feedback to the user during moving.
-
-The actual mouse coordinates are first sent through
- @method[pasteboard% interactive-adjust-mouse] before determining the
- @techlink{location}s passed into this method.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(interactive-adjust-resize [snip (is-a?/c snip%)]
-                                      [width (box/c (and/c real? (not/c negative?)))]
-                                      [height (box/c (and/c real? (not/c negative?)))])
-           void?]{
-@methspec{
-
-This method is called during interactive resizing of a snip to
- preprocess the user-determined snip size. The snip and
- mouse-determined height and width are passed into the method (boxed);
- the resulting height and width are used for graphical feedback to the
- user during resizing.
-
-The actual mouse coordinates are first sent through
- @method[pasteboard% interactive-adjust-mouse] before determining the
- sizes passed into this method.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(is-selected? [snip (is-a?/c snip%)])
-           boolean?]{
-
-Returns @racket[#t] if a specified snip is currently selected or
- @racket[#f] otherwise.
-
-}
-
-@defmethod[(lower [snip (is-a?/c snip%)])
-           void?]{
-
-Moves the snip one level deeper (i.e., behind one more other snip) in
- the pasteboard's snip order. @|seesniporderdiscuss|
-
-See also @method[pasteboard% raise], @method[pasteboard% set-before],
- and @method[pasteboard% set-after].
-
-}
-
-
-@defmethod*[([(move [snip (is-a?/c snip%)]
-                    [x real?]
-                    [y real?])
-              void?]
-             [(move [x real?]
-                    [y real?])
-              void?])]{
-
-Moves @racket[snip] right @racket[x] pixels and down @racket[y]
- pixels.  If @racket[snip] is not provided, then all selected snips
- are moved.
-
-@|OnMoveNote|
-
-}
-
-
-@defmethod[(move-to [snip (is-a?/c snip%)]
-                    [x real?]
-                    [y real?])
-           void?]{
-
-Moves @racket[snip] to a given @techlink{location} in the editor.
-
-@|OnMoveNote|
-
-}
-
-
-@defmethod[(no-selected)
-           void?]{
-
-Deselects all selected snips in the editor.
-
-@|OnSelectNote|
-
-}
-
-
-@defmethod[#:mode override
-           (on-default-event [event (is-a?/c mouse-event%)])
-           void?]{
-
-Selects, drags, and resizes snips:
-
-@itemize[
-
-@item{Clicking on a snip selects the snip. Shift-clicking extends
-the current selection with the snip.}
-
-@item{Clicking in the space between snips drags a selection
-box; once the mouse button is released, all snips touching the
-box are selected. Shift-clicking extends the current selection
-with the new snips.}
-
-@item{Double-clicking on a snip calls
-@method[pasteboard% on-double-click].}
-
-@item{Clicking on a selected snip drags the selected snip(s) to a new
-@techlink{location}.}
-
-@item{Clicking on a hiliting tab for a selected object resizes the
-object.}
-
-]
-}
-
-
-@defmethod[#:mode pubment 
-           (on-delete [snip (is-a?/c snip%)])
-           void?]{
-
-Called before a snip is deleted from the editor, after
- @method[pasteboard% can-delete?] is called to verify that the
- deletion is allowed. The @method[pasteboard% after-delete] method is
- guaranteed to be called after the delete has completed.
-
-The editor is internally locked for writing when this method is called
- (see also @|lockdiscuss|). Use @method[pasteboard% after-delete] to
- modify the editor, if necessary.
-
-}
-
-
-@defmethod[(on-double-click [snip (is-a?/c snip%)]
-                            [event (is-a?/c mouse-event%)])
-           void?]{
-@methspec{
-
-This method is called when the user double-clicks on a snip in the
- editor. The clicked-on snip and event records are passed to the
- method.
-
-}
-@methimpl{
-
-If @racket[snip] accepts events, it is designated as the caret owner
- and all snips in the editor are unselected.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (on-insert [snip (is-a?/c snip%)]
-                      [before (or/c (is-a?/c snip%) #f)]
-                      [x real?]
-                      [y real?])
-           void?]{
-
-
-Called before a snip is inserted from the editor, after
- @method[pasteboard% can-insert?] is called to verify that the
- insertion is allowed. The @method[pasteboard% after-insert] method is
- guaranteed to be called after the insert has completed.
-
-The editor is internally locked for writing when this method is called
- (see also @|lockdiscuss|). Use @method[pasteboard% after-insert] to
- modify the editor, if necessary.
-
-}
-
-
-@defmethod[#:mode pubment 
-           (on-interactive-move [event (is-a?/c mouse-event%)])
-           void?]{
-@methspec{
-
-Called when the user starts interactively dragging snips (the ones
- that are selected; see @method[pasteboard% find-next-selected-snip]),
- after @method[pasteboard% can-interactive-move?] is called to verify
- that the move is allowed. The @method[pasteboard%
- after-interactive-move] method is guaranteed to be called after the
- move has completed. All of the selected snips will be moved. The
- mouse event that started the move (usually a button-down event) is
- provided.
-
-See also @method[pasteboard% interactive-adjust-move].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[#:mode pubment 
-           (on-interactive-resize [snip (is-a?/c snip%)])
-           void?]{
-@methspec{
-
-Called when the user starts interactively resizing a snip (the one
- that is selected; see @method[pasteboard% find-next-selected-snip]),
- after @method[pasteboard% can-interactive-resize?] is called to
- verify that the resize is allowed. The @method[pasteboard%
- after-interactive-resize] method is guaranteed to be called after the
- resize has completed.
-
-The @racket[snip] argument is the snip that will be resized. 
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (on-move-to [snip (is-a?/c snip%)]
-                       [x real?]
-                       [y real?]
-                       [dragging? any/c])
-           void?]{
-@methspec{
-
-Called before a snip is moved in the editor, after @method[pasteboard%
- can-move-to?] is called to verify that the move is allowed. The
- @method[pasteboard% after-move-to] method is guaranteed to be called
- after the move has completed.
-
-If @racket[dragging?] is not @racket[#f], then this move is a
- temporary move for dragging.
-
-The editor is internally locked for writing when this method is called
- (see also @|lockdiscuss|). Use @method[pasteboard% after-move-to] to
- modify the editor, if necessary. See also @method[pasteboard%
- on-interactive-move] and @method[pasteboard%
- interactive-adjust-move].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (on-reorder [snip (is-a?/c snip%)]
-                       [to-snip (is-a?/c snip%)]
-                       [before? any/c])
-           void?]{
-@methspec{
-
-Called before a snip is moved in the pasteboard's front-to-back snip
- order, after @method[pasteboard% can-reorder?] is called to verify
- that the reorder is allowed. The @method[pasteboard% after-reorder]
- method is guaranteed to be called after the reorder has completed.
-
-If @racket[before?] is @racket[#t], then @racket[snip] is to be moved
- before @racket[to-snip], otherwise @racket[snip] is to be moved after
- @racket[to-snip].
-
-The editor is internally locked for writing when this method is called
- (see also @|lockdiscuss|). Use @method[pasteboard% after-reorder] to
- modify the editor, if necessary.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[#:mode pubment 
-           (on-resize [snip (is-a?/c snip%)]
-                      [w (and/c real? (not/c negative?))]
-                      [h (and/c real? (not/c negative?))])
-           void?]{
-
-@methspec{
-
-Called before a snip is resized by the editor, after
- @method[pasteboard% can-resize?] is called to verify that the resize
- is allowed. The @method[pasteboard% after-resize] method is
- guaranteed to be called after the resize has completed.
-
-The editor is internally locked for writing when this method is called (see
- also @|lockdiscuss|). Use
-@method[pasteboard% after-resize] to modify the editor, if necessary. 
-
-Note that a snip calls
-@method[editor<%> resized], not this method, to notify the pasteboard that the snip resized
- itself.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (on-select [snip (is-a?/c snip%)]
-                      [on? any/c])
-           void?]{
-@methspec{
-
-Called before a snip in the pasteboard is selected or deselected,
- after @method[pasteboard% can-select?] is called to verify that the
- selection is allowed. The @method[pasteboard% after-select] method is
- guaranteed to be called after the selection has completed.  This
- method is not called when a selected snip is to be deleted (and thus
- de-selected indirectly); see also @method[pasteboard% on-delete] .
-
-If @racket[on?] is @racket[#t], then @racket[snip] will be selected,
- otherwise @racket[snip] will be deselected.
-
-The editor is internally locked for writing when this method is called
- (see also @|lockdiscuss|). Use @method[pasteboard% after-select] to
- modify the editor, if necessary.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(raise [snip (is-a?/c snip%)])
-           void?]{
-
-Moves a snip one level shallower (i.e., in front of one more other
- snip) in the pasteboard's snip order. @|seesniporderdiscuss|
-
-See also @method[pasteboard% lower], @method[pasteboard% set-before],
- and @method[pasteboard% set-after].
-
-}
-
-
-@defmethod[(remove [snip (is-a?/c snip%)])
-           void?]{
-
-Removes the specified snip from the editor in a non-undoable manner
- (so the snip is completely free of the pasteboard can be used in
- other editors).
-
-See also @method[pasteboard% delete].
-
-}
-
-
-@defmethod[(remove-selected [snip (is-a?/c snip%)])
-           void?]{
-
-Deselects @racket[snip] (if it is currently selected) without
- deselecting any other snips.
-
-@|OnSelectNote|
-
-}
-
-
-@defmethod[(resize [snip (is-a?/c snip%)]
-                   [w (and/c real? (not/c negative?))]
-                   [h (and/c real? (not/c negative?))])
-           boolean?]{
-
-Attempts to resize a given snip. If the snip allows resizing,
- @racket[#t] is returned, otherwise @racket[#f] is returned. Using
- this method instead of calling the snip's @method[snip% resize]
- method directly will make the resize undo-able.
-
-}
-
-
-@defmethod[(set-after [snip (is-a?/c snip%)]
-                      [after (or/c (is-a?/c snip%) #f)])
-           void?]{
-
-Changes the depth of @racket[snip] moving it just behind
- @racket[after].  If @racket[after] is @racket[#f], @racket[snip] is
- moved to the back. @|seesniporderdiscuss|
-
-See also @method[pasteboard% raise], @method[pasteboard% lower], and
- @method[pasteboard% set-before].
-
-}
-
-
-@defmethod[(set-before [snip (is-a?/c snip%)]
-                       [before (or/c (is-a?/c snip%) #f)])
-           void?]{
-
-Changes the depth of @racket[snip] moving it just in front of
- @racket[before].  If @racket[before] is @racket[#f], @racket[snip] is
- moved to the front. @|seesniporderdiscuss|
-
-See also @method[pasteboard% raise], @method[pasteboard% lower], and
- @method[pasteboard% set-after].
-
-}
-
-
-@defmethod[(set-dragable [allow-drag? any/c])
-           void?]{
-
-Sets whether snips in the editor can be interactively dragged by event
- handling in @method[pasteboard% on-default-event]: a true value
- allows dragging, @racket[#f] disallows dragging.  See also
- @method[pasteboard% get-dragable].
-
-}
-
-@defmethod[(set-scroll-step [stepsize (and/c real? (not/c negative?))])
-           void?]{
-
-Sets the editor @techlink{location} offset for each vertical scroll
- position.  See also @method[pasteboard% get-scroll-step].
-
-}
-
-@defmethod[(set-selected [snip (is-a?/c snip%)])
-           void?]{
-
-Selects a specified snip (deselecting all others).
-
-@|OnSelectNote|
-
-}
-
-@defmethod[(set-selection-visible [visible? any/c])
-           void?]{
-
-Sets whether selection dots are drawn around the edge of selected
- snips in the pasteboard. See also @method[pasteboard%
- get-selection-visible].
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/popup-menu-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/popup-menu-class.scrbl
deleted file mode 100644
index 2c4fe986be..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/popup-menu-class.scrbl
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[popup-menu% object% (menu-item-container<%>)]{
-
-A @racket[popup-menu%] object is created without a parent. Dynamically
- display a @racket[popup-menu%] with @xmethod[window<%> popup-menu]
- or @xmethod[editor-admin% popup-menu].
-
-A popup menu is @italic{not} a control. A @racket[choice%] control,
-however, displays a single value that the user selects from a popup
- menu. A @racket[choice%] control's popup menu is built into the
- control, and it is not accessible to the programmer.
-
-
-@defconstructor[([title (or/c label-string? #f) #f]
-                 [popdown-callback ((is-a?/c popup-menu%) (is-a?/c control-event%)
-                                    . -> . any) 
-                                   (lambda (p e) (void))]
-                 [demand-callback ((is-a?/c popup-menu%) . -> . any) 
-                                  (lambda (p) (void))]
-                 [font (is-a?/c font%) normal-control-font])]{
-
-If @racket[title] is not @racket[#f], it is used as a displayed title
- at the top of the popup menu.
-
-If @racket[title] contains @litchar{&}, it is handled specially, the
- same as for @racket[menu%] titles. A popup menu mnemonic is not
- useful, but it is supported for consistency with other menu labels.
-
-The @racket[popdown-callback] procedure is invoked when a popup menu is
- dismissed. If the popup menu is dismissed without an item being
- selected, @racket[popdown-callback] is given a @racket[control-event%]
- object with the event type @indexed-racket['menu-popdown-none]. If the
- popup menu is dismissed via an item selection, the item's callback is
- invoked first, and then @racket[popdown-callback] is given a
- @racket[control-event%] object with the event type
- @indexed-racket['menu-popdown].
-
-The @racket[demand-callback] procedure is called by the default
-@method[menu-item-container<%> on-demand] method with the object itself.
-
-The @racket[font] argument determines the font for the popup menu's
- items.
-}
-
-
-@defmethod[(get-font)
-           (is-a?/c font%)]{
-
-Returns the font used for the popup menu's items, which is optionally
- supplied when a popup menu is created.
-
-}
-
-
-@defmethod[(get-popup-target)
-           (or/c (is-a?/c window<%>) (is-a?/c editor<%>) #f)]{
-
-Returns the context in which the popup menu is currently displayed, or
- @racket[#f] if it is not popped up in any window.
-
-The context is set before the @method[menu-item-container<%>
-on-demand] method is called, and it is not removed until after the
-popup-menu's callback is invoked. (Consequently, it is also set while
-an item callback is invoked, if the user selected an item.)
-
-}
-
-
-@defmethod[(set-min-width [width dimension-integer?])
-           void?]{
-
-Sets the popup menu's minimum width in pixels.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/prefs.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/prefs.scrbl
deleted file mode 100644
index 6b7ecbdd02..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/prefs.scrbl
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label scheme/file))
-
-@title[#:tag "mredprefs"]{Preferences}
-
-The @racketmodname[racket/gui/base] library supports a number of preferences for global configuration. The
- preferences are stored in the common file reported by
- @racket[find-system-path] for @indexed-racket['pref-file], and
- preference values can be retrieved and changed through
- @racket[get-preference] and @racket[put-preferences]. Except for the except the
- @Resource{playcmd} preference, the @racketmodname[racket/gui/base] library
- reads each of the preferences below once at startup.
-
-@emph{Beware:} The preferences file is read in case-insensitive mode (for 
- historical reasons), so the symbols listed below must be surrounded with
- @litchar{|}. 
-
-The following are the preference names used by GRacket:
-
-@itemize[
-
- @item{@ResourceFirst{default-font-size} --- sets the default font size
- the basic style in a style list, and thus the default font size for
- an editor.}
-
- @item{@ResourceFirst{defaultMenuPrefix} --- sets the prefix used by
- default for menu item shortcuts on Unix, one of @racket['ctl],
- @racket['meta], or @racket['alt]. The default is
- @racket['ctl]. When this preference is set to @racket['meta] or
- @racket['alt], underlined mnemonics (introduced by @litchar{&} in menu
- labels) are suppressed.}
-
- @item{@ResourceFirst{emacs-undo} --- a true value makes undo in
- editors by default preserve all editing history, including operations
- that are undone (as in Emacs); the @xmethod[editor<%>
- set-undo-preserves-all-history] method changes a specific editor's
- configuration.}
-
- @item{@ResourceFirst{wheelStep} --- sets the default mouse-wheel step
- size of @racket[editor-canvas%] objects.}
-
- @item{@ResourceFirst{outline-inactive-selection} --- a true value
- causes selections in text editors to be shown with an outline of the
- selected region when the editor does no have the keyboard focus.}
-
- @item{@ResourceFirst{playcmd} --- used to format a sound-playing
- command; see @racket[play-sound] for details.}
-
- @item{@ResourceFirst{doubleClickTime} --- overrides the
- platform-specific default interval (in milliseconds) for double-click
- events.}
-
-]
-
-In each of the above cases, if no preference value is found using the
-@racketidfont{GRacket}-prefixed name, a @racketidfont{MrEd}-prefixed
-name is tried for backward compatibility.
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/printer-dc-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/printer-dc-class.scrbl
deleted file mode 100644
index 196cfc31d1..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/printer-dc-class.scrbl
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[printer-dc% object% (dc<%>)]{
-
-A @racket[printer-dc%] object is a printer device context. A newly
- created @racket[printer-dc%] object obtains orientation (portrait
- versus landscape) and scaling information from the current
- @racket[ps-setup%] object, as determined by the
- @racket[current-ps-setup] parameter. This information can be
- configured by the user through a dialog shown by
- @racket[get-page-setup-from-user].
-
-@|PrintNote|
-
-See also @racket[post-script-dc%].
-
-When the @method[dc<%> end-doc] method is called on a
- @racket[printer-dc%] instance, the user may receive a dialog
- to determine how the document is printed.
-
-@defconstructor[([parent (or/c (is-a?/c frame%) (is-a?/c dialog%) #f) #f])]{
-
-If @racket[parent] is not @racket[#f], it is may be as the parent window
- of the dialog (if any) presented by @method[dc<%> end-doc].
-
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/radio-box-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/radio-box-class.scrbl
deleted file mode 100644
index 3827949988..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/radio-box-class.scrbl
+++ /dev/null
@@ -1,158 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/radio-box}}
-
-@defclass/title[radio-box% object% (control<%>)]{
-
-
-A @racket[radio-box%] control allows the user to select one of a
- number of mutually exclusive items. The items are displayed as a
- vertical column or horizontal row of labelled @defterm{radio
- buttons}. Unlike a @racket[list-control<%>], the set of items in a
- @racket[radio-box%] cannot be changed dynamically.
-
-Whenever the user changes the selected radio button, the radio box's
- callback procedure is invoked. A callback procedure is provided as an
- initialization argument when each radio box is created.
-
-
-
-
-@defconstructor[([label (or/c label-string? #f)]
-                 [choices (or/c (listof label-string?) (listof (is-a?/c bitmap%)))]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [callback ((is-a?/c radio-box%) (is-a?/c control-event%)
-                            . -> . any) 
-                           (lambda (r e) (void))]
-                 [style (listof (or/c 'horizontal 'vertical 
-                                      'vertical-label 'horizontal-label 
-                                      'deleted)) 
-                        '(vertical)]
-                 [selection (or/c exact-nonnegative-integer? #f) 0]
-                 [font (is-a?/c font%) normal-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 2]
-                 [horiz-margin spacing-integer? 2]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #f]
-                 [stretchable-height any/c #f])]{
-
-Creates a radio button set with string or bitmap labels. The
- @racket[choices] list specifies the radio button labels; the list of
- choices must be homogeneous, either all strings or all bitmaps.
-
-@labelstripped[@racket[label]
-  @elem{} @elem{move the keyboard focus to the radio box}]
-
-Each string in @racket[choices] can also contain a @litchar{&}, which
- creates a mnemonic for clicking the corresponding radio button. As
- for @racket[label], a @litchar{&&} is converted to a @litchar{&}.
-
-@bitmaplabelusearray[choices]
-
-If @racket[label] is a string, it is used as the label for the radio
- box. Otherwise, the radio box does not display its
- label.
-
-The @racket[callback] procedure is called (with the event type
- @indexed-racket['radio-box]) when the user changes the radio button
- selection.
-
-The @racket[style] argument must include either @racket['vertical] for a
- collection of radio buttons vertically arranged, or
- @racket['horizontal] for a horizontal arrangement.
- @HVLabelNote[@racket[style]]{radio box} @DeletedStyleNote[@racket[style] @racket[parent]]{radio box}
-
-By default, the first radio button is initially selected. If
- @racket[selection] is positive or @racket[#f], it is passed to
- @method[radio-box% set-selection] to set the initial radio button
- selection.
-
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-}
-
-
-@defmethod*[#:mode override 
-            ([(enable [enable? any/c])
-              void?]
-             [(enable [n exact-nonnegative-integer?]
-                      [enable? any/c])
-              void?])]{
-
-If a single argument is provided, the entire radio box is enabled or disabled.
-
-If two arguments are provided, then if @racket[enable?] is
- @racket[#f], the @racket[n]th radio button is disabled, otherwise it
- is enabled (assuming the entire radio box is enabled). Radio buttons
- are numbered from @racket[0].  If @racket[n] is equal to or larger
- than the number of radio buttons in the radio box, @|MismatchExn|.
-
-}
-
-
-@defmethod[(get-item-label [n exact-nonnegative-integer?])
-           string?]{
-
-Gets the label of a radio button by position. Radio buttons are
- numbered from @racket[0]. If @racket[n] is equal to or larger than
- the number of radio buttons in the radio box, @|MismatchExn|.
-
-}
-
-@defmethod[(get-item-plain-label [n exact-nonnegative-integer?])
-           string?]{
-
-Like @method[radio-box% get-item-label], except that the label must be
-a string and @litchar{&}s in the label are removed.
-
-}
-
-@defmethod[(get-number)
-           exact-nonnegative-integer?]{
-
-Returns the number of radio buttons in the radio box.
-
-}
-
-@defmethod[(get-selection)
-           (or/c exact-nonnegative-integer? #f)]{
-
-Gets the position of the selected radio button, returning @racket[#f]
-if no button is selected. Radio buttons are numbered from @racket[0].
-
-}
-
-@defmethod*[#:mode override 
-            ([(is-enabled?)
-              boolean?]
-             [(is-enabled? [n exact-nonnegative-integer?])
-              boolean?])]{
-
-If no arguments are provided, the enable state of the entire radio box
-is reported.
-
-Otherwise, returns @racket[#f] if @racket[n]th radio button is
-disabled (independent of disabling the entire radio box), @racket[#t]
-otherwise. Radio buttons are numbered from @racket[0].  If @racket[n]
-is equal to or larger than the number of radio buttons in the radio
-box, @|MismatchExn|.
-
-}
-
-@defmethod[(set-selection [n (or/c exact-nonnegative-integer? #f)])
-           void?]{
-
-Sets the selected radio button by position, or deselects all radio
- buttons if @racket[n] is @racket[#f]. (The control's callback
- procedure is @italic{not} invoked.) Radio buttons are numbered from
- @racket[0]. If @racket[n] is equal to or larger than the number of
- radio buttons in the radio box, @|MismatchExn|.
-
-@MonitorCallback[@elem{A radio box's selection} @elem{the user clicking the control} @elem{selection}]
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/readable-snip-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/readable-snip-intf.scrbl
deleted file mode 100644
index 886a53751c..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/readable-snip-intf.scrbl
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[readable-snip<%> ()]{
-
-A @racket[readable-snip<%>] object is treated specially by the port
- generated by @racket[open-input-text-editor]: When a
- @racket[readable-snip<%>] object is encountered for the input stream,
- its @method[readable-snip<%> read-special] method is called to
- generate the read result for the snip, which is returned from the
- port as a ``special'' value in the sense of
- @racket[read-char-or-special].
-
-Since @racket[read] and @racket[read-syntax] build on
- @racket[read-char-or-special], a snip can implement
- @racket[readable-snip<%>] so that it produces a whole S-expression or
- some other kind of value when @racket[read] is used on a stream
- containing the snip.
-
-@defmethod[(read-special [source any/c]
-                         [line (or/c exact-nonnegative-integer? #f)]
-                         [column (or/c exact-nonnegative-integer? #f)]
-                         [position (or/c exact-nonnegative-integer? #f)])
-           any/c]{
-
-The arguments are the same as the arguments to a procedure returned by
- a custom input port's @racket[_read-in]; see @secref[#:doc '(lib
- "scribblings/reference/reference.scrbl") "customport"] for
- details. The result is also the same as the result from a
- @racket[_read-in]-produced procedure.
-
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/reference.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/reference.scrbl
deleted file mode 100644
index c1dcd41178..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/reference.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:style '(toc reveal)]{Reference}
-
-@local-table-of-contents[]
-
-@include-section["win-classes.scrbl"]
-@include-section["win-funcs.scrbl"]
-@include-section["editor-classes.scrbl"]
-@include-section["editor-funcs.scrbl"]
-@include-section["wxme.scrbl"]
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/scroll-event-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/scroll-event-class.scrbl
deleted file mode 100644
index bec12ad726..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/scroll-event-class.scrbl
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[scroll-event% event% ()]{
-
-A @racket[scroll-event%] object contains information about a scroll
- event. An instance of @racket[scroll-event%] is always provided to
-@method[canvas% on-scroll].
-
-See
-@method[scroll-event% get-event-type] for a list of the scroll event types.
-
-
-
-
-@defconstructor[([event-type (or/c 'top 'bottom 'line-up 'line-down 
-                                   'page-up 'page-down 'thumb)
-                             'thumb]
-                 [direction (or/c 'horizontal 'vertical) 'vertical]
-                 [position dimension-integer? 0]
-                 [time-stamp exact-integer? 0])]{
-
-See the corresponding @racket[get-] and @racket[set-] methods for
- information about @racket[event-type], @racket[direction], @racket[position],
- and @racket[time-stamp].
-
-}
-
-@defmethod[(get-direction)
-           (or/c 'horizontal 'vertical)]{
-
-Gets the identity of the scrollbar that was modified by the event,
- either the horizontal scrollbar or the vertical scrollbar, as
- @racket['horizontal] or @racket['vertical], respectively. See also
- @method[scroll-event% set-direction].
-
-}
-
-@defmethod[(get-event-type)
-           (or/c 'top 'bottom 'line-up 'line-down 
-                 'page-up 'page-down 'thumb)]{
-
-Returns the type of the event, one of the following:
-
-@itemize[
-@item{@racket['top] --- user clicked a scroll-to-top button}
-@item{@racket['bottom] --- user clicked a scroll-to-bottom button}
-@item{@racket['line-up]  --- user clicked an arrow to scroll up or left one step}
-@item{@racket['line-down] --- user clicked an arrow to scroll down or right one step}
-@item{@racket['page-up]  --- user clicked an arrow to scroll up or left one page}
-@item{@racket['page-down] --- user clicked an arrow to scroll down or right one page}
-@item{@racket['thumb] --- user dragged the scroll position indicator}
-]
-
-}
-
-@defmethod[(get-position)
-           dimension-integer?]{
-
-Returns the position of the scrollbar after the action triggering the
- event. See also @method[scroll-event% set-position].
-
-}
-
-@defmethod[(set-direction [direction (or/c 'horizontal 'vertical)])
-           void?]{
-
-Sets the identity of the scrollbar that was modified by the event,
- either the horizontal scrollbar or the vertical scrollbar, as
- @racket['horizontal] or @racket['vertical], respectively. See also
- @method[scroll-event% get-direction].
-
-}
-
-@defmethod[(set-event-type [type (or/c 'top 'bottom 'line-up 'line-down 
-                                       'page-up 'page-down 'thumb)])
-           void?]{
-
-Sets the type of the event. See @method[scroll-event% get-event-type]
-for information about each event type.
-
-}
-
-@defmethod[(set-position [position dimension-integer?])
-           void?]{
-
-Records the position of the scrollbar after the action triggering the
- event. (The scrollbar itself is unaffected). See also
- @method[scroll-event% get-position].
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/selectable-menu-item-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/selectable-menu-item-intf.scrbl
deleted file mode 100644
index 75e5b6b8ce..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/selectable-menu-item-intf.scrbl
+++ /dev/null
@@ -1,122 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[selectable-menu-item<%> (labelled-menu-item<%>)]{
-
-A @racket[selectable-menu-item<%>] object is a
- @racket[labelled-menu-item<%>] that the user can select. It may also
- have a keyboard shortcut; the shortcut is displayed in the menu, and
- the default @method[frame% on-subwindow-char] method in the menu's
- frame dispatches to the menu item when the shortcut key combination
- is pressed.
-
-
-@defmethod[(command [event (is-a?/c control-event%)])
-           void?]{
-
-Invokes the menu item's callback procedure, which is supplied when an
- instance of
-@racket[menu-item%] or
-@racket[checkable-menu-item%] is created.
-
-}
-
-@defmethod[(get-shortcut)
-           (or/c char? symbol? #f)]{
-
-Gets the keyboard shortcut character or virtual key for the menu
- item. This character or key is combined with the shortcut prefix,
- which is reported by @method[selectable-menu-item<%>
- get-shortcut-prefix].
-
-If the menu item has no shortcut, @racket[#f] is returned.
-
-The shortcut part of a menu item name is not included in the label
- returned by @method[labelled-menu-item<%> get-label].
-
-For a list of allowed key symbols, see @xmethod[key-event%
- get-key-code], except that the following are disallowed: 
- @racket['shift], @racket['control], @racket['numlock],
- @racket['scroll], @racket['wheel-up], @racket['wheel-down],
- @racket['release], and @racket['press].
-
-}
-
-@defmethod[(get-shortcut-prefix)
-           (and/c (listof (or/c 'alt 'cmd 'meta 'ctl 
-                                'shift 'option))
-                  (λ (x) (implies (equal? 'unix (system-type))
-                                  (not (and (member 'alt x)
-                                            (member 'meta x)))))
-                  (λ (x) (equal? x (remove-duplicates x))))]{
-
-Returns a list of symbols that indicates the keyboard prefix used for the menu
- item's keyboard shortcut. The allowed symbols for the list are the following:
-
-@itemize[
-@item{@racket['alt] --- Meta (Windows and X only)}
-@item{@racket['cmd] --- Command (Mac OS X only)}
-@item{@racket['meta] --- Meta (Unix only)}
-@item{@racket['ctl] --- Control}
-@item{@racket['shift] --- Shift}
-@item{@racket['option] --- Option (Mac OS X only)}
-]
-
-On Unix, at most one of @racket['alt] and @racket['meta] can be
- supplied; the only difference between @racket['alt] and
- @racket['meta] is the key combination's display in a menu.
-
-The default shortcut prefix is available from
- @racket[get-default-shortcut-prefix].
-
-The shortcut key, as determined by @method[selectable-menu-item<%>
- get-shortcut], matches a key event using either the normally reported
- key code or the other-Shift/AltGr key code (as produced by
- @xmethod[key-event% get-other-shift-key-code], etc.). When the
- shortcut key is a key-code symbol or an ASCII letter or digit, then
- the shortcut matches only the exact combination of modifier keys
- listed in the prefix. For character shortcuts other than ASCII
- letters and digits, however, then the shortcut prefix merely
- determines a minimum set of modifier keys, because additional
- modifiers may be needed to access the character; an exception is
- that, on Windows or Unix, the Alt/Meta key press must match the
- prefix exactly (i.e., included or not). In all cases, the most
- precise match takes precedence; see @xmethod[keymap% map-function]
- for more information on match ranking.
-
-An empty list can be used for a shortcut prefix. However, the default
- @xmethod[frame% on-menu-char] method checks for menu shortcuts only
- when the key event includes either a non-Shift modifier or a Function
- key. Thus, an empty shortcut prefix is normally useful only if the
- shortcut key is a Function key.
-
-}
-
-
-@defmethod[(set-shortcut [shortcut (or/c char? symbol? #f)])
-           void?]{
-
-Sets the keyboard shortcut character for the menu item. See
-@method[selectable-menu-item<%> get-shortcut] for more information.
-
-If the shortcut character is set to @racket[#f], then menu item has no
-keyboard shortcut.
-
-}
-
-@defmethod[(set-shortcut-prefix [prefix (and/c (listof (or/c 'alt 'cmd 'meta 'ctl 
-                                                             'shift 'option))
-                                               (λ (x) (implies (equal? 'unix (system-type))
-                                                               (not (and (member 'alt x)
-                                                                         (member 'meta x)))))
-                                               (λ (x) (equal? x (remove-duplicates x))))])
-           void?]{
-
-Sets a list of symbols to indicates the keyboard prefix used for the
-menu item's keyboard shortcut.
-
-See @method[selectable-menu-item<%> get-shortcut-prefix] for more
-information.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/separator-menu-item-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/separator-menu-item-class.scrbl
deleted file mode 100644
index f85b07d73f..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/separator-menu-item-class.scrbl
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[separator-menu-item% object% (menu-item<%>)]{
-
-A separator is an unselectable line in a menu. Its parent must be a
- @racket[menu%] or @racket[popup-menu%].
-
-
-@defconstructor[([parent (or/c (is-a?/c menu%) (is-a?/c popup-menu%))])]{
-
-Creates a new separator in the menu.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/slider-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/slider-class.scrbl
deleted file mode 100644
index a851d81232..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/slider-class.scrbl
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/slider}}
-
-@defclass/title[slider% object% (control<%>)]{
-
-A @racket[slider] object is a panel item with a handle that the user can
- drag to change the control's value. Each slider has a fixed minimum
- and maximum value.
-
-Whenever the user changes the value of a slider, its callback
- procedure is invoked. A callback procedure is provided as an
- initialization argument when each slider is created.
-
-
-
-
-@defconstructor[([label (or/c label-string? #f)]
-                 [min-value position-integer?]
-                 [max-value position-integer?]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [callback ((is-a?/c slider%) (is-a?/c control-event%) . -> . any) (lambda (b e) (void))]
-                 [init-value position-integer? min-value]
-                 [style (listof (or/c 'horizontal 'vertical 'plain 
-                                      'vertical-label 'horizontal-label 
-                                      'deleted)) 
-                        '(horizontal)]
-                 [font (is-a?/c font%) normal-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 2]
-                 [horiz-margin spacing-integer? 2]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c (memq 'horizontal style)]
-                 [stretchable-height any/c (memq 'vertical style)])]{
-
-If @racket[label] is a string, it is used as the label for the slider.
- Otherwise, the slider does not display its label.
-
-@labelstripped[@racket[label]
-  @elem{} @elem{move the keyboard focus to the slider}]
-
-The @racket[min-value] and @racket[max-value] arguments specify the
- range of the slider, inclusive. The @racket[init-value] argument
- optionally specifies the slider's initial value. If the sequence
- [@racket[min-value], @racket[initial-value], @racket[maximum-value]]
- is not increasing, @|MismatchExn|.
-
-The @racket[callback] procedure is called (with the event type
- @indexed-racket['slider]) when the user changes the slider's value.
-
-The @racket[style] argument must include either @racket['vertical] for
- a vertical slider, or @racket['horizontal] for a horizontal
- slider. If @racket[style] includes @racket['plain], the slider does
- not display numbers for its range and current value to the user.
- @HVLabelNote[@racket[style]]{slider} @DeletedStyleNote[@racket[style] @racket[parent]]{slider}
-
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-
-}
-
-@defmethod[(get-value)
-           position-integer?]{
-
-Gets the current slider value.
-
-}
-
-@defmethod[(set-value [value position-integer?])
-           void?]{
-
-Sets the value (and displayed position) of the slider. (The control's
- callback procedure is @italic{not} invoked.) If @racket[value] is
- outside the slider's minimum and maximum range, @|MismatchExn|.
-
-@MonitorCallback[@elem{A slider's value} @elem{the user clicking the control} @elem{value}]
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-admin-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-admin-class.scrbl
deleted file mode 100644
index 09163582e1..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-admin-class.scrbl
+++ /dev/null
@@ -1,389 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[snip-admin% object% ()]{
-
-See @|admindiscuss| for information about the role of administrators.
- The @racket[snip-admin%] class is never instantiated directly. It
- is not even instantiated through derived classes by most programmers;
- each @racket[text%] or @racket[pasteboard%] object
- creates its own administrator. However, it may be useful to derive a
- new instance of this class to display snips in a new context. Also,
- it may be useful to call the methods of an existing administrator
- from an owned snip.
-
-To create a new @racket[snip-admin%] class, all methods described here
- must be overridden. They are all invoked by the administrator's snip.
-
-Because a @racket[snip-admin%] object typically owns more than one
- snip, many methods require a @racket[snip%] object as an argument.
-
-
-
-@defconstructor[()]{
-
-Creates a (useless) editor administrator.
-
-}
-
-@defmethod[(get-dc)
-           (or/c (is-a?/c dc<%>) #f)]{
-
-Gets a drawing context suitable for determining display size
- information. If the snip is not displayed, @racket[#f] is returned.
-
-}
-
-@defmethod[(get-editor)
-           (or/c (is-a?/c text%) (is-a?/c pasteboard%))]{
-
-Returns the editor that this administrator reports to (directly or
- indirectly).
-
-}
-
-@defmethod[(get-view [x (or/c (box/c real?) #f)]
-                     [y (or/c (box/c real?) #f)]
-                     [w (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                     [h (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                     [snip (or/c (is-a?/c snip%) #f) #f])
-           void?]{
-@methspec{
-
-Gets the @techlink{location} and size of the visible region of a snip in snip
- coordinates. The result is undefined if the given snip is not managed
- by this administrator.
-
-If @racket[snip] is not @racket[#f], the current visible region of the
- snip is installed in the boxes @racket[x], @racket[y], @racket[w],
- and @racket[h].  The @racket[x] and @racket[y] values are relative to
- the snip's top-left corner. The @racket[w] and @racket[h] values may
- be larger than the snip itself.
-
-If @racket[snip] is @racket[#f], the total visible region of the
- snip's top-level @techlink{display} is returned in editor
- coordinates. Using @racket[#f] for @racket[snip] is analogous to
- using @racket[#t] for @racket[full?] in @xmethod[editor-admin%
- get-view].
-
-If no snip is specified, then the @techlink{location} and size of the snip's
- editor are returned, instead, in editor coordinates.
-
-See also @xmethod[editor-admin% get-view].
-
-}
-@methimpl{
-
-Fills all boxes with @racket[0.0].
-
-}}
-
-@defmethod[(get-view-size [w (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                          [h (or/c (box/c (and/c real? (not/c negative?))) #f)])
-           void?]{
-
-@methspec{
-
-Gets the visible size of the administrator's @techlink{display} region.
-
-If the @techlink{display} is an editor canvas, see also
- @method[area-container<%> reflow-container].
-
-}
-@methimpl{
-
-Fills all boxes with @racket[0.0].
-
-}
-}
-
-@defmethod[(modified [snip (is-a?/c snip%)]
-                     [modified? any/c])
-           void?]{
-@methspec{
-
-Called by a snip to report that its modification state has changed to
- either modified or unmodified.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(needs-update [snip (is-a?/c snip%)]
-                         [localx real?]
-                         [localy real?]
-                         [w (and/c real? (not/c negative?))]
-                         [h (and/c real? (not/c negative?))])
-           void?]{
-@methspec{
-
-Called by the snip to request that the snip's display needs to be
- updated. The administrator determines when to actually update the
- snip; the snip's @method[snip% draw] method is eventually called.
-
-The @racket[localx], @racket[localy], @racket[w], and @racket[h]
- arguments specify a region of the snip to be refreshed (in snip
- coordinates).
-
-No update occurs if the given snip is not managed by this
- administrator.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(popup-menu [menu (is-a?/c popup-menu%)]
-                       [snip (is-a?/c snip%)]
-                       [x real?]
-                       [y real?])
-           boolean?]{
-@methspec{
-
-Opens a popup menu in the @techlink{display} for this snip's editor.  The result
- is @racket[#t] if the popup succeeds, @racket[#f] otherwise (independent
- of whether the user selects an item in the popup menu).
-
-The menu is placed at @racket[x] and @racket[y] in @racket[snip]
- coordinates.
-
-While the menu is popped up, its target is set to the top-level editor
- in the @techlink{display} for this snip's editor. See
-@method[popup-menu% get-popup-target] for more information.
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-@defmethod[(recounted [snip (is-a?/c snip%)]
-                      [refresh? any/c])
-           void?]{
-@methspec{
-
-Called by a snip to notify the administrator that the specified snip
- has changed its @techlink{count}. The snip generally needs to be updated after
- changing its @techlink{count}, but the snip decides whether the update should
- occur immediately.
-
-If @racket[refresh?] is not @racket[#f], then the snip is requesting
- to be updated immediately. Otherwise, @method[snip-admin%
- needs-update] must eventually be called as well.
-
-The method call is ignored if the given snip is not managed by this
- administrator.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(release-snip [snip (is-a?/c snip%)])
-           boolean?]{
-
-@methspec{
-
-Requests that the specified snip be released. If this administrator is
- not the snip's owner or if the snip cannot be released, then
- @racket[#f] is returned. Otherwise, @racket[#t] is returned and the
- snip is no longer owned.
-
-See also @xmethod[editor<%> release-snip] .
-
-The result is @racket[#f] if the given snip is not managed by this
- administrator.
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-
-@defmethod[(resized [snip (is-a?/c snip%)]
-                    [refresh? any/c])
-           void?]{
-@methspec{
-
-Called by a snip to notify the administrator that the specified snip
- has changed its display size. The snip generally needs to be updated
- after a resize, but the snip decides whether the update should occur
- immediately.
-
-If @racket[refresh?] is not @racket[#f], then the snip is requesting
- to be updated immediately, as if calling @method[snip-admin%
- needs-update].  Otherwise, @method[snip-admin% needs-update] must
- eventually be called as well.
-
-
-The method call is ignored if the given snip is not managed by this
- administrator.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(scroll-to [snip (is-a?/c snip%)]
-                      [localx real?]
-                      [localy real?]
-                      [w (and/c real? (not/c negative?))]
-                      [h (and/c real? (not/c negative?))]
-                      [refresh? any/c]
-                      [bias (or/c 'start 'end 'none) 'none])
-           boolean?]{
-@methspec{
-
-Called by the snip to request scrolling so that the given region is
- visible. The snip generally needs to be updated after a scroll, but
- the snip decides whether the update should occur immediately.
-
-The @racket[localx], @racket[localy], @racket[w], and @racket[h] arguments specify
- a region of the snip to be made visible by the scroll (in snip
- coordinates).
-
-If @racket[refresh?] is not @racket[#f], then the editor is requesting to
- be updated immediately.
-
-The @racket[bias] argument is one of:
-@itemize[
-
- @item{@racket['start] --- if the range doesn't fit in the visible area, show the top-left region}
-
- @item{@racket['none] --- no special scrolling instructions}
-
- @item{@racket['end] --- if the range doesn't fit in the visible area, show the bottom-right region}
-
-]
-
-The result is @racket[#t] if the editor is scrolled, @racket[#f]
- otherwise.
-
-The method call is ignored (and the result is @racket[#f]) if the given
- snip is not managed by this administrator.
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-@defmethod[(set-caret-owner [snip (is-a?/c snip%)]
-                            [domain (or/c 'immediate 'display 'global)])
-           void?]{
-@methspec{
-
-Requests that the keyboard focus is assigned to the specified snip.
- If the request is granted, the @method[snip% own-caret] method of the
- snip is called.
-
-See @method[editor<%> set-caret-owner] for information about the
- possible values of @racket[domain].
-
-
-The method call is ignored if the given snip is not managed by this
- administrator.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(update-cursor)
-           void?]{
-
-@methspec{
-
-Queues an update for the cursor in the @techlink{display} for this
- snip's editor.  The actual cursor used will be determined by calling
- the snip's @method[snip% adjust-cursor] method as appropriate.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(get-line-spacing)
-           (and/c real? (not/c negative?))]{
-
-@methspec{
-
-Returns the spacing inserted by the snip's editor between each
-line. 
-}
-@methimpl{
-
-Returns @racket[0.0]
-
-}}
-
-@defmethod[(get-selected-text-color)
-           (or/c (is-a?/c color%) #f)]{
-
-@methspec{
-
-Returns the color that is used to draw selected text or @racket[#f] if
-selected text is drawn with its usual color.
-}
-@methimpl{
-
-Returns @racket[#f].
-}}
-
-
-@defmethod[(call-with-busy-cursor [thunk (-> any)])
-           any]{
-
-@methspec{
-
-Calls @racket[thunk] while changing the cursor to a watch cursor for
-all windows in the current eventspace.
-
-}
-
-@methimpl{
-
-Does nothing.
-}}
-
-@defmethod[(get-tabs [length (or/c (box/c exact-nonnegative-integer?) #f) #f]
-                     [tab-width (or/c (box/c real?) #f) #f]
-                     [in-units (or/c (box/c any/c) #f) #f])
-           (listof real?)]{
-
-@methspec{
-Returns the current tab-position array as a list.
-
-@boxisfillnull[@racket[length] @elem{the length of the tab array (and therefore the returned 
-list)}]
-@boxisfillnull[@racket[tab-width] @elem{the width used for tabs past the 
-end of the tab array}]
-@boxisfillnull[@racket[in-units] @elem{@racket[#t] if the tabs are specified in
-canvas units or @racket[#f] if they are specified in space-widths}]
-}
-
-@methimpl{
-Returns @racket[null].
-}
-}
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-class-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-class-class.scrbl
deleted file mode 100644
index 7aa85b5293..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-class-class.scrbl
+++ /dev/null
@@ -1,146 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[snip-class% object% ()]{
-
-Useful snip classes are defined by instantiating derived subclasses of
- @racket[snip-class%]. A class derived from @racket[snip-class%]
- serves as a kind of ``meta-class'' for snips; each snip is associated
- with an instance of @racket[snip-class%] as its snip class.
-
-In deriving a new @racket[snip-class%] class, override the
- @method[snip-class% read] method. Then, for each instance of the
- derived class (where each instance corresponds to a single snip
- class):
-
-@itemize[
-
- @item{Set the classname using @method[snip-class% set-classname].}
-
- @item{Set the version using 
-       @method[snip-class% set-version].} 
-
- @item{Install the class into the list returned by
-       @racket[get-the-snip-class-list] using the
-       @method[snip-class-list<%> add] method. Note that if the same
-       name is inserted into the same class list multiple times, all
-       but the first insertion is ignored.}
-
-]
-
-See also @|snipclassdiscuss|.
-
-
-@defconstructor[()]{
-
-Creates a (useless) snip class.
-
-}
-
-@defmethod[(get-classname)
-           string?]{
-
-Returns the class's name, a string uniquely designating this snip
- class. For example, the standard text snip classname is
- @racket["wxtext"]. Names beginning with @litchar{wx} are reserved.
-
-A snip class name should usually have the form @racket["((lib ...)
-(lib ...))"]  to enable on-demand loading of the class. See
-@|snipclassdiscuss| for details.
-
-}
-
-@defmethod[(get-version)
-           exact-integer?]{
-
-Returns the version of this snip class. When attempting to load a file
- containing a snip with the same class name but a different version,
- the user is warned.
-
-}
-
-@defmethod[(read [f (is-a?/c editor-stream-in%)])
-           (or/c (is-a?/c snip%) #f)]{
-
-@methspec{
-
-Reads a snip from a given stream, returning a newly created snip as
- the result or @racket[#f] if there is an error.
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-@defmethod[(read-header [f (is-a?/c editor-stream-in%)])
-           boolean?]{
-
-@methspec{
-
-Called to read header information that may be useful for every snip
- read in this class. This method is only called once per editor read
- session, and only if the stream contains header information for this
- class.
-
-The return value is @racket[#f] if a read error occurs or anything else
- otherwise.
-
-See also @method[snip-class% write-header].
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-
-@defmethod[(reading-version [stream (is-a?/c editor-stream-in%)])
-           exact-integer?]{
-
-Returns the version number specified for this snip class for snips
- currently being read from the given stream.
-
-}
-
-
-@defmethod[(set-classname [name string?])
-           void?]{
-
-Sets the class's name. See also @method[snip-class% get-classname].
-
-}
-
-
-@defmethod[(set-version [v exact-integer?])
-           void?]{
-
-Sets the version of this class. See @method[snip-class% get-version].
-
-}
-
-@defmethod[(write-header [stream (is-a?/c editor-stream-out%)])
-           boolean?]{
-
-@methspec{
-
-Called to write header information that may be useful for every snip
- written for this class. This method is only called once per editor
- write session, and only if the editor contains snips in this class.
-
-When reading the snips back in, @method[snip-class% read-header] will
- only be called if @method[snip-class% write-header] writes some data
- to the stream.
-
-The return value is @racket[#f] if a write error occurs or anything else
- otherwise.
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-class-list-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-class-list-intf.scrbl
deleted file mode 100644
index d53375db4e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-class-list-intf.scrbl
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[snip-class-list<%> ()]{
-
-Each eventspace has its own instance of @racket[snip-class-list<%>],
- obtained with @racket[(get-the-snip-class-list)]. New instances
- cannot be created directly. Each instance keeps a list of snip
- classes. This list is needed for loading snips from a file. See also
- @|snipclassdiscuss|.
-
-
-@defmethod[(add [snipclass (is-a?/c snip-class%)])
-           void?]{
-
-Adds a snip class to the list. If a class with the same name already
- exists in the list, this one will not be added.
-
-}
-
-@defmethod[(find [name string?])
-           (or/c (is-a?/c snip-class%) #f)]{
-
-Finds a snip class from the list with the given name, returning
- @racket[#f] if none is found.
-
-}
-
-@defmethod[(find-position [class (is-a?/c snip-class%)])
-           exact-nonnegative-integer?]{
-
-Returns an index into the list for the specified class.
-
-}
-
-@defmethod[(nth [n exact-nonnegative-integer?])
-           (or/c (is-a?/c snip-class%) #f)]{
-
-Returns the @racket[n]th class in the list, or @racket[#f] if
- the list has @racket[n] classes or less.
-
-}
-
-@defmethod[(number)
-           exact-nonnegative-integer?]{
-
-Returns the number of snip classes in the list.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-class.scrbl
deleted file mode 100644
index e03cf26bc2..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-class.scrbl
+++ /dev/null
@@ -1,919 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[snip% object% (equal<%>)]{
-
-A direct instance of @racket[snip%] is uninteresting. Useful snips are
- defined by instantiating derived subclasses, but this class defines
- the basic functionality.
-
-In deriving a new snip class, these methods must be overridden to
-create a useful snip:
-
-@itemize[
-
- @item{@method[snip% get-extent]} 
-
- @item{@method[snip% draw]} 
-
- @item{@method[snip% copy]} 
-
- @item{@method[snip% resize] if the snip can be resized by the user}
-
- @item{@method[snip% partial-offset] if the snip can contain more than
-       one @techlink{item}}
-
- @item{@method[snip% split] if the snip can contain more than one @techlink{item}}
-
- @item{@method[snip% size-cache-invalid] if the snip caches the result to @method[snip% get-extent]} 
-
- @item{@method[snip% get-text] (not required)}
-
- @item{@method[snip% find-scroll-step], @method[snip%
-       get-num-scroll-steps], and @method[snip%
-       get-scroll-step-offset] if the snip can contain more than one
-       scroll position}
-
- @item{@method[snip% set-unmodified] if the snip's internal state can
-       be modified by the user, and call @method[snip-admin% modified]
-       in the snip's administrator when the state changes the first
-       time}
-
-]
-
-If a snip can contain more than one @techlink{item}, then the snip's @techlink{count}
- must be maintained as well.
-
-To define a class of snips that can be saved or cut-and-pasted:
-
-@itemize[
-
- @item{Create an instance of @racket[snip-class%], implementing the
-       @method[snip-class% read] method. Export the
-       @racket[snip-class%] instance as @racket[snip-class] from a
-       module, and use a classname of the form @racket["(lib ...)"] as
-       described in @|snipclassdiscuss|.}
-
- @item{For each instance of the snip class, set the snip's class object 
-       with @method[snip% set-snipclass].}
-
- @item{Override the @method[snip% copy] method.}
-
- @item{Override the @method[snip% write] method.}
-
-]
-
-To define a class of snips that read specially with
-@racket[open-input-text-editor]:
-
-@itemize[
-
- @item{Make your @racket[snip%] class implement @racket[readable-snip<%>].}
-
- @item{Implement the @method[readable-snip<%> read-special] method.}
-
-]
-
-
-
-@defconstructor[()]{
-
-Creates a plain snip of length 1 with the @racket["Basic"] style of
- @racket[the-style-list].
-
-}
-
-
-@defmethod[(adjust-cursor [dc (is-a?/c dc<%>)]
-                          [x real?]
-                          [y real?]
-                          [editorx real?]
-                          [editory real?]
-                          [event (is-a?/c mouse-event%)])
-           (or/c (is-a?/c cursor%) #f)]{
-
-@methspec{
-
-Called to determine the cursor image used when the cursor is moved
- over the snip in an editor. If @racket[#f] is returned, a default
- cursor is selected by the editor. (See @xmethod[editor<%>
- adjust-cursor] for more information.)
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-
-@defmethod[(blink-caret [dc (is-a?/c dc<%>)]
-                        [x real?]
-                        [y real?])
-           void?]{
-
-Tells the snip to blink the selection caret. This method is called
- periodically when the snip's editor's @techlink{display} has the
- keyboard focus, and the snip has the editor-local focus.
-
-The drawing context and snip's @techlink{location}s in drawing context
- coordinates are provided.
-
-}
-
-
-@defmethod[(can-do-edit-operation? [op (or/c 'undo 'redo 'clear 'cut 'copy 
-                                             'paste 'kill 'select-all 
-                                             'insert-text-box 'insert-pasteboard-box 
-                                             'insert-image)]
-                                   [recursive? any/c #t])
-           boolean?]{
-
-See @xmethod[editor<%> can-do-edit-operation?].
-
-Called when the snip's editor's method is called, @racket[recursive?]
- is not @racket[#f], and this snip owns the caret.
-
-}
-
-
-@defmethod[(copy)
-           (is-a?/c snip%)]{
-
-Creates and returns a copy of this snip. The @method[snip% copy]
- method is responsible for copying this snip's style (as returned by
- @method[snip% get-style]) to the new snip.
-
-}
-
-
-@defmethod[(do-edit-operation [op (or/c 'undo 'redo 'clear 'cut 'copy 
-                                        'paste 'kill 'select-all 
-                                        'insert-text-box 'insert-pasteboard-box 
-                                        'insert-image)]
-                              [recursive? any/c #t]
-                              [time exact-integer? 0])
-           void?]{
-
-See @xmethod[editor<%> do-edit-operation].
-
-Called when the snip's editor's method is called,
- @racket[recursive?] is not @racket[#f], and this snip owns the caret.
-
-}
-
-
-@defmethod[(draw [dc (is-a?/c dc<%>)]
-                 [x real?]
-                 [y real?]
-                 [left real?]
-                 [top real?]
-                 [right real?]
-                 [bottom real?]
-                 [dx real?]
-                 [dy real?]
-                 [draw-caret (or/c 'no-caret 'show-inactive-caret 'show-caret
-                                   (cons/c exact-nonnegative-integer?
-                                           exact-nonnegative-integer?))])
-           void?]{
-@methspec{
-
-Called (by an editor) to draw the snip into the given drawing context
- with the snip's top left corner at @techlink{location} (@racket[x],
- @racket[y]) in DC coordinates.
-
-The arguments @racket[left], @racket[top], @racket[right], and @racket[bottom]
- define a clipping region (in DC coordinates) that the snip can use to
- optimize drawing, but it can also ignore these arguments.
-
-The @racket[dx] and @racket[dy] argument provide numbers that can be
- subtracted from @racket[x] and @racket[y] to obtain the snip's @techlink{location} in
- editor coordinates (as opposed to DC coordinates, which are used for
- drawing).
-
-See @|drawcaretdiscuss| for information about
-@racket[draw-caret]. When @racket[draw-caret] is a pair, refrain from
-drawing a background for the selected region, and if
-@racket[(get-highlight-text-color)] returns a color (instead of @racket[#f]),
-use that color for drawing selected text and other selected foreground elements.
-
-Before this method is called, the font, text color, and pen color for
- the snip's style will have been set in the drawing context.  (The
- drawing context is @italic{not} so configured for @method[snip%
- get-extent] or @method[snip% partial-offset].)  The @method[snip% draw] method must
- not make any other assumptions about the state of the drawing
- context, except that the clipping region is already set to something
- appropriate. Before @method[snip% draw] returns, it must restore any
- drawing context settings that it changes.
-
-See also @xmethod[editor<%> on-paint].
-
-The snip's editor is usually internally locked for
- writing and reflowing when this method is called
- (see also @|lockdiscuss|), and it is normally in a refresh (see 
- @secref["editorthreads"]).
-
-}
-@methimpl{
-
-Draws nothing.
-
-}}
-
-@defmethod[(equal-to? [snip (is-a?/c snip%)]
-                      [equal? (-> any/c any/c boolean?)])
-           boolean?]{
-@methspec{See @racket[equal<%>].}
-
-@methimpl{Calls the @method[snip% other-equal-to?] method of @racket[snip]
-(to simulate multi-method dispatch) in case @racket[snip] provides a
-more specific equivalence comparison.}}
-
-@defmethod[(other-equal-to? [that (is-a?/c snip%)]
-                            [equal? (-> any/c any/c boolean?)])
-           boolean?]{
-@methimpl{Returns @racket[(eq? @#,(this-obj) that)].}
-}
-
-@defmethod[(equal-hash-code-of [hash-code (any/c . -> . exact-integer?)])
-           exact-integer?]{
-
-@methspec{See @racket[equal<%>].}
- 
-@methimpl{Returns @racket[(eq-hash-code @#,(this-obj))].}}
-
-@defmethod[(equal-secondary-hash-code-of [hash-code (any/c . -> . exact-integer?)])
-           exact-integer?]{
-
-@methspec{See @racket[equal<%>].}
- 
-@methimpl{Returns @racket[1].}}
-
-@defmethod[(find-scroll-step [y real?])
-           exact-nonnegative-integer?]{
-
-@methspec{
-
-If a snip contains more than one vertical scroll step (see
- @method[snip% get-num-scroll-steps]) then this method is called to
- find a scroll step offset for a given y-offset into the snip.
-
-}
-@methimpl{
-
-Returns @racket[0].
-
-}}
-
-@defmethod[(get-admin)
-           (or/c (is-a?/c snip-admin%) #f)]{
-
-Returns the administrator for this snip. (The administrator can be
- @racket[#f] even if the snip is owned but not visible in the editor.)
-
-}
-
-@defmethod[(get-count)
-           (integer-in 0 100000)]{
-
-Returns the snip's @techlink{count} (i.e., number of @techlink{item}s
- within the snip).
-
-}
-
-@defmethod[(get-extent [dc (is-a?/c dc<%>)]
-                       [x real?]
-                       [y real?]
-                       [w (or/c (box/c (and/c real? (not/c negative?))) #f) #f]
-                       [h (or/c (box/c (and/c real? (not/c negative?))) #f) #f]
-                       [descent (or/c (box/c (and/c real? (not/c negative?))) #f) #f]
-                       [space (or/c (box/c (and/c real? (not/c negative?))) #f) #f]
-                       [lspace (or/c (box/c (and/c real? (not/c negative?))) #f) #f]
-                       [rspace (or/c (box/c (and/c real? (not/c negative?))) #f) #f])
-           void?]{
-@methspec{
-
-Calculates the snip's width, height, descent (amount of height which
- is drawn below the baseline), space (amount of height which is
- ``filler'' space at the top), and horizontal spaces (amount of width
- which is ``filler'' space at the left and right). Those values are
- returned by filling the @racket[w], @racket[h], @racket[descent],
- @racket[space], @racket[lspace], and @racket[rspace] boxes.
-
-This method is called by the snip's administrator; it is not normally
- called directly by others. To get the extent of a snip, use
- @xmethod[editor<%> get-snip-location] .
-
-A drawing context is provided for the purpose of finding font sizes,
- but no drawing should occur. The @method[snip% get-extent] and
- @method[snip% partial-offset] methods must not make any assumptions
- about the state of the drawing context, except that it is scaled
- properly. In particular, the font for the snip's style is not
- automatically set in the drawing context before the method is
- called. (Many snips cache their size information, so
- automatically setting the font would be wasteful.)  If @method[snip%
- get-extent] or @method[snip% partial-offset] changes the drawing
- context's setting, it must restore them before returning. However,
- the methods should not need to change the drawing context; only font
- settings can affect measurement results from a device context, and
- @xmethod[dc<%> get-text-extent] accepts a @racket[font%] argument for
- sizing that overrides that device context's current font.
-
-The snip's left and top @techlink{location}s are provided as @racket[x]
- and @racket[y] in editor coordinates, in case the snip's size depends
- on its location; the @racket[x] and @racket[y] arguments are usually
- ignored. In a text editor, the @racket[y]-coordinate is the @italic{line's}
- top @techlink{location}; the snip's actual top @techlink{location} is
- potentially undetermined until its height is known.
-
-If a snip caches the result size for future replies, it should
- invalidate its cached size when @method[snip% size-cache-invalid] is
- called (especially if the snip's size depends on any device context
- properties).
-
-If a snip's size changes after receiving a call to
-@method[snip% get-extent] and before receiving a call to
-@method[snip% size-cache-invalid], then the snip must notify its administrator of the size change, so
- that the administrator can recompute its derived size information.
- Notify the administrator of a size change by call its
-@method[snip-admin% resized] method.
-
-The snip's editor is usually internally locked for writing and
- reflowing when this method is called (see also @|lockdiscuss|).
-
-}
-@methimpl{
-
-Fills in all boxes with @racket[0.0].
-
-}}
-
-
-@defmethod[(get-flags)
-           (listof symbol?)]{
-
-Returns flags defining the behavior of the snip, a list of the
-following symbols:
-
-@itemize[
-
- @item{@indexed-racket['is-text] --- this is a text snip derived from
-       @racket[string-snip%]; do not set this flag}
-
- @item{@indexed-racket['can-append] --- this snip can be merged with
-       another snip of the same type}
-
- @item{@indexed-racket['invisible] --- an @deftech{invisible} snip
-       that the user doesn't see, such as a newline}
-
- @item{@indexed-racket['hard-newline] --- a newline must follow the snip}
-
- @item{@indexed-racket['newline] --- a newline currently follows the
-       snip; only an owning editor should set this flag}
-
- @item{@indexed-racket['handles-events] --- this snip can handle
-       keyboard and mouse events when it has the keyboard focus}
-
- @item{@indexed-racket['handles-all-mouse-events] --- this snip can
-       handle mouse events that touch the snip or that immediately
-       follow an event that touches the snip, even if the snip does
-       not have the keyboard focus (see also
-       @method[snip% on-goodbye-event])}
-
- @item{@indexed-racket['width-depends-on-x] --- this snip's display
-       width depends on the snip's x-@techlink{location} within the
-       editor; e.g.: tab}
-
- @item{@indexed-racket['height-depends-on-y] --- this snip's display
-       height depends on the snip's y-@techlink{location} within the editor}
-
- @item{@indexed-racket['width-depends-on-y] --- this snip's display
-       width depends on the snip's y-@techlink{location} within the editor}
-
- @item{@indexed-racket['height-depends-on-x] --- this snip's display
-       height depends on the snip's x-@techlink{location} within the editor}
-
- @item{@indexed-racket['uses-editor-path] --- this snip uses its
-       editor's pathname and should be notified when the name changes;
-       notification is given as a redundant call to @method[snip%
-       set-admin]}
-
-]}
-
-
-@defmethod[(get-num-scroll-steps)
-           exact-nonnegative-integer?]{
-
-@methspec{
-
-Returns the number of horizontal scroll steps within the snip.  For
- most snips, this is @racket[1]. Embedded editor snips use this method so that
- scrolling in the owning editor will step through the lines in the
- embedded editor.
-
-}
-@methimpl{
-
-Returns @racket[1].
-
-}}
-
-
-@defmethod[(get-scroll-step-offset [offset exact-nonnegative-integer?])
-           (and/c real? (not/c negative?))]{
-
-@methspec{
-If a snip contains more than one vertical scroll step (see
-@method[snip% get-num-scroll-steps]) then this method is called to
-find the y-offset into the snip for a given scroll offset.
-
-}
-@methimpl{
-
-Returns @racket[0.0].
-
-}}
-
-
-@defmethod[(get-snipclass)
-           (or/c #f (is-a?/c snip-class%))]{
-
-Returns the snip's class, which is used for file saving and
- cut-and-paste.
-
-Since this method returns the snip class stored by @method[snip%
- set-snipclass], it is not meant to be overridden.
-
-}
-
-
-@defmethod[(get-style)
-           (is-a?/c style<%>)]{
-
-Returns the snip's style. See also @method[snip% set-style].
-
-}
-
-
-@defmethod[(get-text [offset exact-nonnegative-integer?]
-                     [num exact-nonnegative-integer?]
-                     [flattened? any/c #f])
-           string?]{
-@methspec{
-
-Returns the text for this snip starting with the @techlink{position}
- @racket[offset] within the snip, and continuing for a total length of
- @racket[num] @techlink{item}s. If @racket[offset] is greater than the snip's
- @techlink{count}, then @racket[""] is returned. If @racket[num] is greater than the
- snip's @techlink{count} minus the offset, then text from the offset to the end
- of the snip is returned.
-
-If @racket[flattened?] is not @racket[#f], then flattened text is returned.
- See @|textdiscuss| for a discussion of flattened vs. non-flattened
- text.
-
-}
-@methimpl{
-
-Returns @racket[""].
-
-}}
-
-
-@defmethod[(get-text! [buffer (and/c string? (not/c immutable?))]
-                      [offset exact-nonnegative-integer?]
-                      [num exact-nonnegative-integer?]
-                      [buffer-offset exact-nonnegative-integer?])
-           void?]{
-@methspec{
-
-Like @method[snip% get-text] in non-flattened mode, except that the
- characters are put into the given mutable string, instead of returned
- in a newly allocated string.
-
-The @racket[buffer] string is filled starting at position
- @racket[buffer-offset]. The @racket[buffer] string must be at least
- @math{@racket[num]+@racket[buffer-offset]} characters long.
-
-}
-@methimpl{
-
-Calls @method[snip% get-text], except in the case of a
- @racket[string-snip%], in which case @racket[buffer] is filled
- directly.
-
-}}
-
-
-@defmethod[(is-owned?)
-           boolean?]{
-
-Returns @racket[#t] if this snip has an owner, @racket[#f] otherwise.
- Note that a snip may be owned by an editor if it was inserted and
- then deleted from the editor, if it's still in the editor's undo
- history.
-
-}
-
-
-@defmethod[(match? [snip (is-a?/c snip%)])
-           boolean?]{
-
-@methspec{
-
-Return @racket[#t] if @this-obj[] ``matches'' @racket[snip],
- @racket[#f] otherwise.
-
-}
-@methimpl{
-
-Returns @racket[#t] if the @racket[snip] and @this-obj[] are from the
- same class and have the same length.
-
-}}
-
-
-@defmethod[(merge-with [prev (is-a?/c snip%)])
-           (or/c (is-a?/c snip%) #f)]{
-
-@methspec{
-
-Merges @this-obj[] with @racket[prev], returning @racket[#f] if the
- snips cannot be merged or a new merged snip otherwise. This method
- will only be called if both snips are from the same class and both
- have the @indexed-racket['can-append] flag.
-
-If the returned snip does not have the expected @techlink{count}, its
- @techlink{count} is forcibly modified. If the returned snip is
- already owned by another administrator, a surrogate snip is created.
-
-The snip's editor is usually internally locked for reading when this
- method is called (see also @|lockdiscuss|).
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-
-@defmethod[(next)
-           (or/c (is-a?/c snip%) #f)]{
-
-Returns the next snip in the editor owning this snip, or @racket[#f]
- if this is the last snip.
-
-In a text editor, the next snip is the snip at the @techlink{position}
- following this snip's (last) @techlink{position}. In a pasteboard,
- the next snip is the one immediately behind this
- snip. (@|seesniporderdiscuss|)
-
-}
-
-
-@defmethod[(on-char [dc (is-a?/c dc<%>)]
-                    [x real?]
-                    [y real?]
-                    [editorx real?]
-                    [editory real?]
-                    [event (is-a?/c key-event%)])
-           void?]{
-@methspec{
-
-Called to handle keyboard events when this snip has the keyboard focus
- and can handle events. The drawing context is provided, as well as
- the snip's @techlink{location} in @techlink{display} coordinates (the
- event uses @techlink{display} coordinates), and the snip's
- @techlink{location} in editor coordinates.
-
-The @racket[x] and @racket[y] arguments are the snip's
- @techlink{location} in @techlink{display} coordinates. The
- @racket[editorx] and @racket[editory] arguments are the snip's
- @techlink{location} in editor coordinates.  To get @racket[event]'s x
- @techlink{location} in snip coordinates, subtract @racket[x] from
- @racket[(send event get-x)].
-
-See also @indexed-racket['handles-events] in @method[snip% get-flags].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(on-event [dc (is-a?/c dc<%>)]
-                     [x real?]
-                     [y real?]
-                     [editorx real?]
-                     [editory real?]
-                     [event (is-a?/c mouse-event%)])
-           void?]{
-@methspec{
-
-Called to handle mouse events on the snip when this snip can handle
- events and when the snip has the keyboard focus. See @method[snip%
- on-char] for information about the arguments. 
-
-The @racket[x] and @racket[y] arguments are the snip's
- @techlink{location} in @techlink{display} coordinates. The
- @racket[editorx] and @racket[editory] arguments are the snip's
- @techlink{location} in editor coordinates.  To get @racket[event]'s x
- @techlink{location} in snip coordinates, subtract @racket[x] from
- @racket[(send event get-x)].
-
-See also @indexed-racket['handles-events] in @method[snip% get-flags].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(on-goodbye-event [dc (is-a?/c dc<%>)]
-                             [x real?]
-                             [y real?]
-                             [editorx real?]
-                             [editory real?]
-                             [event (is-a?/c mouse-event%)])
-           void?]{
-@methspec{
-
-Called to handle an event that is really aimed at another
-snip in order to give this snip a chance to clean up 
-as the mouse moves away. The arguments are the same
-as @method[snip% on-event].
-
-This method is called only when the snip has the
-@indexed-racket['handles-all-mouse-events] flag set
-(see @method[snip% get-flags] and @method[snip% set-flags]).
-
-}
-@methimpl{
-
-  Calls this object's @racket[_on-event] method
-
-}
-
-@history[#:added "1.1"]}
-
-@defmethod[(own-caret [own-it? any/c])
-           void?]{
-@methspec{
-
-Notifies the snip that it is or is not allowed to display the caret
- (indicating ownership of keyboard focus) in some
- @techlink{display}. This method is @italic{not} called to request
- that the caret is actually shown or hidden; the @method[snip% draw]
- method is called for all display requests.
-
-The @racket[own-it?] argument is @racket[#t] if the snip owns the
- keyboard focus or @racket[#f] otherwise.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(partial-offset [dc (is-a?/c dc<%>)]
-                           [x real?]
-                           [y real?]
-                           [len exact-nonnegative-integer?])
-           real?]{
-@methspec{
-
-Calculates a partial width for the snip, starting from the first snip
- @techlink{item} and continuing for @racket[len] @techlink{item}s. The
- drawing context and snip's @techlink{location}s in editor coordinates
- are provided. See also @method[snip% get-extent].
-
-The snip's editor is usually internally locked for writing and
- reflowing when this method is called (see also @|lockdiscuss|).
-
-}
-@methimpl{
-
-Returns @racket[0.0].
-
-}}
-
-
-@defmethod[(previous)
-           (or/c (is-a?/c snip%) #f)]{
-
-Returns the previous snip in the editor owning this snip, or @racket[#f] if this
- is the first snip.
-
-}
-
-
-@defmethod[(release-from-owner)
-           boolean?]{
-@methspec{
-
-Asks the snip to try to release itself from its owner. If the snip is
- not owned or the release is successful, then @racket[#t] is
- returned. Otherwise, @racket[#f] is returned and the snip remains
- owned.  See also @method[snip% is-owned?].
-
-Use this method for moving a snip from one editor to another. This
- method notifies the snip's owning editor that someone else really
- wants control of the snip. It is not necessary to use this method for
- "cleaning up" a snip when it is deleted from an editor.
-
-}
-@methimpl{
-
-Requests a low-level release from the snip's owning administrator.
-
-}}
-
-
-@defmethod[(resize [w (and/c real? (not/c negative?))]
-                   [h (and/c real? (not/c negative?))])
-           boolean?]{
-@methspec{
-
-Resizes the snip. The snip can refuse to be resized by returning
- @racket[#f]. Otherwise, the snip will resize (it must call its
- administrator's @method[snip-admin% resized] method) and return
- @racket[#t].
-
-See also @xmethod[pasteboard% on-interactive-resize].
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-
-@defmethod[(set-admin [admin (or/c (is-a?/c snip-admin%) #f)])
-           void?]{
-
-Sets the snip's administrator. Only an administrator should call this
- method.
-
-The default method sets the internal state of a snip to record its
- administrator. It will not modify this state if the snip is already
- owned by an administrator and the administrator has not blessed the
- transition. If the administrator state of a snip is not modified as
- expected during a sensitive call to this method by an instance of
- @racket[text%] or @racket[pasteboard%], the
- internal state may be forcibly modified (if the new administrator was
- @racket[#f]) or a surrogate snip may be created (if the snip was
- expected to receive a new administrator).
-
-The snip's (new) editor is usually internally locked for reading when
- this method is called (see also @|lockdiscuss|).
-
-}
-
-
-@defmethod[(set-count [c (integer-in 1 100000)])
-           void?]{
-@methspec{
-
-Sets the snip's @techlink{count} (i.e., the number of @techlink{item}s
- within the snip).
-
-The snip's @techlink{count} may be changed by the system (in extreme cases to
- maintain consistency) without calling this method.
-
-}
-@methimpl{
-
-Sets the snip's @techlink{count} and notifies the snip's administrator
- that the snip's size has changed.
-
-}}
-
-
-@defmethod[(set-flags [flags (listof symbol?)])
-           void?]{
-@methspec{
-
-Sets the snip's flags. See @method[snip% get-flags].
-
-}
-@methimpl{
-
-Sets the snip flags and notifies the snip's editor that its flags have
-changed. 
-
-}}
-
-
-@defmethod[(set-snipclass [class (is-a?/c snip-class%)])
-           void?]{
-
-Sets the snip's class, used for file saving and cut-and-paste.
-
-This method stores the snip class internally; other editor objects may
- access the snip class directly, instead of through the @method[snip%
- get-snipclass] method.
-
-}
-
-
-@defmethod[(set-style [style (is-a?/c style<%>)])
-           void?]{
-
-Sets the snip's style if it is not owned by any editor.  See also
- @method[snip% get-style] and @method[snip% is-owned?].
-
-The snip's style may be changed by the system without calling this method.
-
-}
-
-
-@defmethod[(set-unmodified)
-           void?]{
-@methspec{
-
-Called by the snip's administrator to notify the snip that its changed
- have been saved. The next time snip's internal state is modified by
- the user, it should call @method[snip-admin% modified] to report the
- state change (but only on the first change after this method is
- called, or the first change after the snip acquires a new
- administrator).
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(size-cache-invalid)
-           void?]{
-
-@methspec{
-
-Called to notify the snip that it may need to recalculate its display
- arguments (width, height, etc.) when it is next asked, because the
- style or @techlink{location} of the snip has changed.
-
-The snip's (new) editor is usually internally locked for reflowing
- when this method is called (see also @|lockdiscuss|).
-
-}
-
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(split [position exact-nonnegative-integer?]
-                  [first (box/c (is-a?/c snip%))]
-                  [second (box/c (is-a?/c snip%))])
-           void?]{
-
-@methspec{
-Splits the snip into two snips. This is called when a snip has more
- than one @techlink{item} and something is inserted between two
- @techlink{item}s.
-
-The arguments are a relative @techlink{position} integer and two
- boxes. The @techlink{position} integer specifies how many
- @techlink{item}s should be given to the new first snip; the rest go
- to the new second snip. The two boxes must be filled with two new
- snips. (The old snip is no longer used, so it can be recycled as a
- new snip.)
-
-If the returned snips do not have the expected @techlink{count}s, their
- @techlink{count}s are forcibly modified. If either returned snip is already
- owned by another administrator, a surrogate snip is created.
-
-The snip's editor is usually internally locked for reading when this
- method is called (see also @|lockdiscuss|).
-}
-
-@methimpl{
-
-Creates a new @racket[snip%] instance with @racket[position]
-elements, and modifies @this-obj[] to decrement its count by
-@racket[position]. The nest snip is installed into @racket[first] and
-@this-obj[] is installed into @racket[second].
-
-}}
-
-
-@defmethod[(write [f (is-a?/c editor-stream-out%)])
-           void?]{
-
-Writes the snip to the given stream. (Snip reading is handled by the
- snip class.) Style information about the snip (i.e., the content of
- @method[snip% get-style]) will be saved and restored automatically.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-classes.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-classes.scrbl
deleted file mode 100644
index ed96a384fa..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/snip-classes.scrbl
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" "diagrams.rkt")
-
-@title[#:style '(toc quiet)]{Snip and Style Classes}
-
-@declare-exporting[racket/snip racket/gui/base racket/gui]
-@defmodule*/no-declare[(racket/snip)]
-
-The @racketmodname[racket/snip] collection provides the core
-@tech{snip} and @tech{style} classes @emph{without} depending on
-@racketmodname[racket/gui/base]. This separation enables
-libraries that can cooperate with an editor while also working in
-contexts that do not have a GUI.
-
-Snips and Administrators:
-
-@diagram->table[snip-diagram]
-
-Snip Lists:
-
-@diagram->table[snip-list-diagram]
-
-Styles:
-
-@diagram->table[style-diagram]
-
-Alphabetical:
-
-@local-table-of-contents[]
-
-@include-section["add-color-intf.scrbl"]
-@include-section["image-snip-class.scrbl"]
-@include-section["mult-color-intf.scrbl"]
-@include-section["readable-snip-intf.scrbl"]
-@include-section["snip-class.scrbl"]
-@include-section["snip-admin-class.scrbl"]
-@include-section["snip-class-class.scrbl"]
-@include-section["snip-class-list-intf.scrbl"]
-@include-section["string-snip-class.scrbl"]
-@include-section["style-intf.scrbl"]
-@include-section["style-delta-class.scrbl"]
-@include-section["style-list-class.scrbl"]
-@include-section["tab-snip-class.scrbl"]
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/startup.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/startup.scrbl
deleted file mode 100644
index d5d0047ee1..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/startup.scrbl
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label racket/gui/dynamic))
-
-@title{Startup Actions}
-
-The @racketmodname[racket/gui/base] module can be instantiated only
-once per operating-system process, because it sets hooks in the Racket
-run-time system to coordinate between Racket thread scheduling and GUI
-events. Attempting to instantiate it a second time results in an
-exception.
-
-Loading @racketmodname[racket/gui/base] sets two parameters:
-
-@itemlist[
-
-@item{@racket[executable-yield-handler] --- The executable yield
-      handler is set to evaluate @racket[(yield _initial-eventspace)]
-      before chaining to the previously installed handler. As a
-      result, the Racket process will normally wait until all
-      top-level windows are closed, all callbacks are invoked, and all
-      timers are stopped in the initial eventspace before the process
-      exits.}
-
-@item{@racket[current-get-interaction-input-port] --- The interaction
-      port handler is set to wrap the previously installed handler's
-      result to yield to GUI events when the input port blocks on
-      reading. This extension of the default handler's behavior is
-      triggered only when the current thread is the handler thread of
-      some eventspace, in which case @racket[current-eventspace] is
-      set to the eventspace before invoking @racket[yield]. As a
-      result, GUI events normally can be handled while
-      @racket[read-eval-print-loop] (such as run by the plain Racket
-      executable) is blocked on input.}
-
-]
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/string-snip-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/string-snip-class.scrbl
deleted file mode 100644
index 42c19151d9..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/string-snip-class.scrbl
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[string-snip% snip% ()]{
-
-An instance of @racket[string-snip%] is created automatically when
- text is inserted into a text editor. See also @xmethod[text%
- on-new-string-snip].
-
-
-@defconstructor*/make[(([allocsize exact-nonnegative-integer? 0])
-                       ([s string?]))]{
-
-Creates a string snip whose initial content is @racket[s], if
- supplied, empty otherwise. In the latter case, the optional
- @racket[allocsize] argument is a hint about how much storage space
- for text should be initially allocated by the snip.
-
-}
-
-
-@defmethod[(insert [s string?]
-                   [len exact-nonnegative-integer?]
-                   [pos exact-nonnegative-integer? 0])
-           void?]{
-
-Inserts @racket[s] (with length @racket[len]) into the snip at relative
- @techlink{position} @racket[pos] within the snip.
-
-}
-
-
-@defmethod[(read [len exact-nonnegative-integer?]
-                 [f (is-a?/c editor-stream-in%)])
-           void?]{
-
-Reads the snip's data from the given stream. 
-
-The @racket[len] argument specifies the maximum length of the text to
- be read.  (When a text snip is written to a file, the very first
- field is the length of the text contained in the snip.)  This method
- is usually invoked by the text snip class's @method[snip-class% read]
- method.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/style-delta-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/style-delta-class.scrbl
deleted file mode 100644
index c408aba77e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/style-delta-class.scrbl
+++ /dev/null
@@ -1,502 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[style-delta% object% ()]{
-
-A @racket[style-delta%] object encapsulates a style change. The changes
-expressible by a delta include:
-@itemize[
-@item{changing the font family}
-@item{changing the font face}
-@item{changing the font size to a new value}
-@item{enlarging the font by an additive amount}
-@item{enlarging the font by a multiplicative amount, etc.}
-@item{changing the font style (normal, @italic{italic}, or @slant{slant})}
-@item{toggling the font style}
-@item{changing the font to @italic{italic} if it is currently @slant{slant}, etc.}
-@item{changing the font weight, etc.}
-@item{changing the underline, etc.}
-@item{changing the vertical alignment, etc.}
-@item{changing the foreground color}
-@item{dimming or brightening the foreground color, etc.}
-@item{changing the background color, etc.}
-@item{changing text backing transparency}
-]
-
-The @method[style-delta% set-delta] method is convenient for most
-style delta settings; it takes a high-level delta specification and
-sets the internal delta information.
-
-To take full advantage of a style delta, it is necessary to understand
-the internal on/off settings that can be manipulated through methods
-such as @method[style-delta% set-weight-on]. For example, the font
-weight change is specified through the @racket[weight-on] and
-@racket[weight-off] internal settings. Roughly, @racket[weight-on]
-turns on a weight setting when it is not present and
-@racket[weight-off] turns off a weight setting when it is
-present. These two interact precisely in the following way:
-
-@itemize[
-@item{If both @racket[weight-on] and @racket[weight-off] are set to @racket['base], 
-then the font weight is not changed.}
-@item{If @racket[weight-on] is not @racket['base], then the weight is set to 
-@racket[weight-on].}
-@item{If @racket[weight-off] is not @racket['base], then the weight will be set back 
-to @racket['normal] when the base style has the weight @racket[weight-off].}
-@item{If both @racket[weight-on] and @racket[weight-off] are set to the same
-value, then the weight is toggled with respect to that value: if
-the base style has the weight @racket[weight-on], then weight is changed to
-@racket['normal]; if the base style has a different weight, it is changed to
-@racket[weight-on].}
-@item{If both @racket[weight-on] and @racket[weight-off] are set, but to
-different values, then the weight is changed to @racket[weight-on] 
-only when the base style has the weight @racket[weight-off].}
-]
-
-Font styles, smoothing, underlining, and alignment work in an analogous manner.
-
-The possible values for @racket[alignment-on] and @racket[alignment-off] are:
-@itemize[
-@item{@indexed-racket['base]}
-@item{@indexed-racket['top]}
-@item{@indexed-racket['center]}
-@item{@indexed-racket['bottom]}
-]
-
-The possible values for @racket[style-on] and @racket[style-off] are:
-@itemize[
-@item{@indexed-racket['base]}
-@item{@indexed-racket['normal]}
-@item{@indexed-racket['italic]}
-@item{@indexed-racket['slant]}
-]
-
-The possible values for @racket[smoothing-on] and @racket[smoothing-off] are:
-@itemize[
-@item{@indexed-racket['base]}
-@item{@indexed-racket['default]}
-@item{@indexed-racket['partly-smoothed]}
-@item{@indexed-racket['smoothed]}
-@item{@indexed-racket['unsmoothed]}
-]
-
-The possible values for @racket[underlined-on] and @racket[underlined-off] are:
-@itemize[
-@item{@racket[#f] (acts like @racket['base])}
-@item{@racket[#t]}
-]
-
-The possible values for @racket[size-in-pixels-on] and
-@racket[size-in-pixels-off] are:
-@itemize[
-@item{@racket[#f] (acts like @racket['base])}
-@item{@racket[#t]}
-]
-
-The possible values for @racket[transparent-text-backing-on] and 
-@racket[transparent-text-backing-off] are:
-@itemize[
-@item{@racket[#f] (acts like @racket['base])}
-@item{@racket[#t]}
-]
-
-The possible values for @racket[weight-on] and @racket[weight-off] are:
-@itemize[
-@item{@indexed-racket['base]}
-@item{@indexed-racket['normal]}
-@item{@indexed-racket['bold]}
-@item{@indexed-racket['light]}
-]
-
-The family and face settings in a style delta are interdependent:
-
-@itemize[
-
- @item{When a delta's face is @racket[#f] and its family is
-       @racket['base], then neither the face nor family are modified by
-       the delta.}
-
- @item{When a delta's face is a string and its family is
-       @racket['base], then only face is modified by the delta.}
-
- @item{When a delta's family is not @racket['base], then both the face
-       and family are modified by the delta. If the delta's face is
-       @racket[#f], then applying the delta sets a style's face to
-       @racket[#f], so that the family setting prevails in choosing a
-       font.}
-
-]
-
-
-@defconstructor*/make[(([change-command (or/c 'change-nothing
-                                              'change-normal
-                                              'change-toggle-underline
-                                              'change-toggle-size-in-pixels
-                                              'change-normal-color
-                                              'change-bold)
-                                        'change-nothing])
-                       ([change-command (or/c 'change-family
-                                              'change-style
-                                              'change-toggle-style
-                                              'change-weight
-                                              'change-toggle-weight
-                                              'change-smoothing
-                                              'change-toggle-smoothing
-                                              'change-alignment)]
-                        [v symbol])
-                       ([change-command (or/c 'change-size
-                                              'change-bigger
-                                              'change-smaller)]
-                        [v byte?])
-                       ([change-command (or/c 'change-underline
-                                              'change-size-in-pixels)]
-                        [v any/c]))]{
-
-The initialization arguments are passed on to
- @method[style-delta% set-delta].
-}
-
-
-@defmethod[(collapse [delta (is-a?/c style-delta%)])
-           boolean?]{
-
-Tries to collapse into a single delta the changes that would be made
- by applying this delta after a given delta. If the return value is
- @racket[#f], then it is impossible to perform the
- collapse. Otherwise, the return value is @racket[#t] and this delta
- will contain the collapsed change specification.
-
-}
-
-@defmethod[(copy [delta (is-a?/c style-delta%)]) void?]{
-  Copies the given style delta's settings into this one.}
-
-@defmethod[(equal? [delta (is-a?/c style-delta%)]) boolean?]{
-  Returns @racket[#t] if the given delta is equivalent to this one in
-  all contexts or @racket[#f] otherwise.}
-
-@defmethod[(get-alignment-off) (or/c 'base 'top 'center 'bottom)]{
-  See @racket[style-delta%].}
-
-@defmethod[(get-alignment-on) (or/c 'base 'top 'center 'bottom)]{
-  See @racket[style-delta%].}
-
-@defmethod[(get-background-add) (is-a?/c add-color<%>)]{
-
-Gets the object additive color shift for the background (applied after
- the multiplicative factor). Call this @racket[add-color<%>] object's
- methods to change the style delta's additive background color shift.
-
-}
-
-@defmethod[(get-background-mult)
-           (is-a?/c mult-color<%>)]{
-
-Gets the multiplicative color shift for the background (applied before
- the additive factor). Call this @racket[mult-color<%>] object's
- methods to change the style delta's multiplicative background color
- shift.
-
-}
-
-@defmethod[(get-face)
-           (or/c string? #f)]{
-
-Gets the delta's font face string. If this string is @racket[#f] and the
- family is @indexed-racket['base] when the delta is applied to a style,
- the style's face and family are not changed. However, if the face
- string is @racket[#f] and the family is not @indexed-racket['base], then
- the style's face is changed to @racket[#f].
-
-See also @method[style-delta% get-family].
-
-}
-
-@defmethod[(get-family)
-           (or/c 'base 'default 'decorative 'roman 'script 
-                 'swiss 'modern 'symbol 'system)]{
-
-Returns the delta's font family. The possible values are
-@itemize[
-@item{@indexed-racket['base] --- no change to family}
-@item{@indexed-racket['default]}
-@item{@indexed-racket['decorative]}
-@item{@indexed-racket['roman]}
-@item{@indexed-racket['script]}
-@item{@indexed-racket['swiss]}
-@item{@indexed-racket['modern] (fixed width)}
-@item{@indexed-racket['symbol] (Greek letters)}
-@item{@indexed-racket['system] (used to draw control labels)}
-]
-
-See also @method[style-delta% get-face].
-
-}
-
-@defmethod[(get-foreground-add) (is-a?/c add-color<%>)]{
-
-Gets the additive color shift for the foreground (applied after the
- multiplicative factor). Call this @racket[add-color<%>] object's
- methods to change the style delta's additive foreground color shift.
-
-}
-
-@defmethod[(get-foreground-mult)
-           (is-a?/c mult-color<%>)]{
-
-Gets the multiplicative color shift for the foreground (applied before
- the additive factor). Call this @racket[mult-color<%>] object's
- methods to change the style delta's multiplicative foreground color
- shift.
-
-}
-
-@defmethod[(get-size-add) byte?]{
-  Gets the additive font size shift (applied after the multiplicative factor).}
-
-@defmethod[(get-size-in-pixels-off) boolean?]{
-  See @racket[style-delta%].}
-
-@defmethod[(get-size-in-pixels-on) boolean?]{
-  See @racket[style-delta%].}
-
-@defmethod[(get-size-mult) real?]{
-  Gets the multiplicative font size shift (applied before the additive factor).}
-
-@defmethod[(get-smoothing-off)
-           (or/c 'base 'default 'partly-smoothed 'smoothed 'unsmoothed)]{
-  See @racket[style-delta%].
-}
-
-@defmethod[(get-smoothing-on)
-           (or/c 'base 'default 'partly-smoothed 'smoothed 'unsmoothed)]{See 
-  @racket[style-delta%].
-}
-
-@defmethod[(get-style-off)
-           (or/c 'base 'normal 'italic 'slant)]{See 
-  @racket[style-delta%].
-}
-
-@defmethod[(get-style-on) (or/c 'base 'normal 'italic 'slant)]{
-  See @racket[style-delta%].}
-
-@defmethod[(get-transparent-text-backing-off) boolean?]{
-  See @racket[style-delta%].}
-
-@defmethod[(get-transparent-text-backing-on) boolean?]{
-  See @racket[style-delta%].}
-
-@defmethod[(get-underlined-off)
-           boolean?]{
-  See @racket[style-delta%].}
-
-@defmethod[(get-underlined-on)
-           boolean?]{
-  See @racket[style-delta%].}
-
-@defmethod[(get-weight-off) (or/c 'base 'normal 'bold 'light)]{
-  See @racket[style-delta%].}
-
-@defmethod[(get-weight-on) (or/c 'base 'normal 'bold 'light)]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-alignment-off [v (or/c 'base 'top 'center 'bottom)]) void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-alignment-on [v (or/c 'base 'top 'center 'bottom)]) void?]{
-  See @racket[style-delta%].}
-
-@defmethod*[([(set-delta [change-command (or/c 'change-nothing
-                                               'change-normal
-                                               'change-toggle-underline
-                                               'change-toggle-size-in-pixels
-                                               'change-normal-color
-                                               'change-bold)
-                                         'change-nothing])
-              (is-a?/c style-delta%)]
-             [(set-delta [change-command (or/c 'change-family
-                                               'change-style
-                                               'change-toggle-style
-                                               'change-weight
-                                               'change-toggle-weight
-                                               'change-smoothing
-                                               'change-toggle-smoothing
-                                               'change-alignment)]
-                         [param symbol?])
-              (is-a?/c style-delta%)]
-             [(set-delta [change-command (or/c 'change-size
-                                               'change-bigger
-                                               'change-smaller)]
-                         [param byte?])
-              (is-a?/c style-delta%)]
-             [(set-delta [change-command (or/c 'change-underline
-                                               'change-size-in-pixels)]
-                         [on? any/c])
-              (is-a?/c style-delta%)])]{
-
-Configures the delta with high-level specifications.  The return value
- is the delta itself.
-
-Except for @racket['change-nothing] and
- @racket['change-normal], the command only changes part of the
- delta. Thus, applying @racket['change-bold] and then
- @racket['change-italic] sets the delta for both the style and
- weight change.
-
-The @racket[change-command] argument specifies how the delta is changed;
-the possible values are:
-@itemize[
-@item{@racket['change-nothing] --- reset all changes}
-@item{@racket['change-normal] --- turn off all styles and resizings}
-@item{@racket['change-toggle-underline] --- underline regions that are currently not underlined, and vice versa}
-@item{@racket['change-toggle-size-in-pixels] --- interpret sizes in pixels for regions that are currently interpreted in points, and vice versa}
-@item{@racket['change-normal-color] --- change the foreground and background to black and white, respectively}
-@item{@racket['change-italic] --- change the style of the font to @italic{italic}}
-@item{@racket['change-bold] --- change the weight of the font to @bold{bold}}
-@item{@racket['change-family] --- change the font family (@racket[param] is a family; see
-@racket[font%]); see also
-@method[style-delta% get-family]} @item{@racket['change-style] --- change the style of the font (@racket[param] is a style; see
-@racket[font%])}
-@item{@racket['change-toggle-style] --- toggle the style of the font (@racket[param] is a style; see
-@racket[font%])}
-@item{@racket['change-weight] --- change the weight of the font (@racket[param] is a weight; see
-@racket[font%])}
-@item{@racket['change-toggle-weight] --- toggle the weight of the font (@racket[param] is a weight; see
-@racket[font%])}
-@item{@racket['change-smoothing] --- change the smoothing of the font (@racket[param] is a smoothing; see
-@racket[font%])}
-@item{@racket['change-toggle-smoothing] --- toggle the smoothing of the font (@racket[param] is a smoothing; see
-@racket[font%])}
-@item{@racket['change-alignment] --- change the alignment (@racket[param] is an alignment; see
-@racket[style-delta%])}
-@item{@racket['change-size] --- change the size to an absolute value (@racket[param] is a size)}
-@item{@racket['change-bigger] --- make the text larger (@racket[param] is an additive amount)}
-@item{@racket['change-smaller] --- make the text smaller (@racket[param] is an additive amount)}
-@item{@racket['change-underline] --- set the underline status to either underlined or plain}
-@item{@racket['change-size-in-pixels] --- set the size interpretation to pixels or points}
-]
-}
-
-
-@defmethod*[([(set-delta-background [name string?])
-              (is-a?/c style-delta%)]
-             [(set-delta-background [color (is-a?/c color%)])
-              (is-a?/c style-delta%)])]{
-
-Makes the delta encode a background color change to match the absolute
- color given; that is, it sets the multiplicative factors to
- @racket[0.0] in the result of @method[style-delta%
- get-background-mult], and it sets the additive values in the result
- of @method[style-delta% get-background-add] to the specified color's
- values.  In addition, it also disables transparent text backing by
- setting @racket[transparent-text-backing-on] to @racket[#f] and
- @racket[transparent-text-backing-off] to @racket[#t].
- The return value of the method is the delta itself.
-
-For the case that a string color name is supplied, see
- @racket[color-database<%>].
-
-}
-
-@defmethod[(set-delta-face [name string?]
-                           [family (or/c 'base 'default 'decorative 'roman
-                                         'script 'swiss 'modern 'symbol 'system)
-                                   'default])
-           (is-a?/c style-delta%)]{
-
-Like @method[style-delta% set-face], but sets the family at the same
- time.
-
-The return value is @this-obj[].
-
-}
-
-
-@defmethod*[([(set-delta-foreground [name string?])
-              (is-a?/c style-delta%)]
-             [(set-delta-foreground [color (is-a?/c color%)])
-              (is-a?/c style-delta%)])]{
-
-Makes the delta encode a foreground color change to match the absolute
- color given; that is, it sets the multiplicative factors to
- @racket[0.0] in the result of @method[style-delta%
- get-foreground-mult], and it sets the additive values in the result
- of @method[style-delta% get-foreground-add] to the specified color's
- values.  The return value of the method is the delta itself.
-
-For the case that a string color name is supplied, see
- @racket[color-database<%>].
-
-}
-
-
-@defmethod[(set-face [v (or/c string? #f)])
-           void?]{See
-@method[style-delta% get-face]. See also
-@method[style-delta% set-delta-face].
-
-}
-
-@defmethod[(set-family [v (or/c 'base 'default 'decorative 'roman 'script
-                                'swiss 'modern 'symbol 'system)])
-           void?]{
-Sets the delta's font family. See
-@method[style-delta% get-family].
-
-}
-
-@defmethod[(set-size-add [v byte?]) void?]{
-  Sets the additive font size shift (applied
-  after the multiplicative factor).}
-
-@defmethod[(set-size-in-pixels-off [v any/c]) void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-size-in-pixels-on [v any/c]) void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-size-mult [v real?]) void?]{
-  Sets the multiplicative font size shift (applied before the additive factor).}
-
-@defmethod[(set-smoothing-off [v (or/c 'base 'default 'partly-smoothed
-                                       'smoothed 'unsmoothed)])
-           void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-smoothing-on [v (or/c 'base 'default 'partly-smoothed
-                                      'smoothed 'unsmoothed)])
-           void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-style-off [v (or/c 'base 'normal 'italic 'slant)])
-           void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-style-on [v (or/c 'base 'normal 'italic 'slant)])
-           void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-transparent-text-backing-off [v any/c])
-           void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-transparent-text-backing-on [v any/c]) void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-underlined-off [v any/c]) void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-underlined-on [v any/c])
-           void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-weight-off [v (or/c 'base 'normal 'bold 'light)])
-           void?]{
-  See @racket[style-delta%].}
-
-@defmethod[(set-weight-on [v (or/c 'base 'normal 'bold 'light)])
-           void?]{
-  See @racket[style-delta%].}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/style-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/style-intf.scrbl
deleted file mode 100644
index 380cb556fc..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/style-intf.scrbl
+++ /dev/null
@@ -1,212 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[style<%> ()]{
-
-A @racket[style<%>] object encapsulates drawing information (font,
- color, alignment, etc.) in a hierarchical manner. A @racket[style<%>]
- object always exists within the context of a @racket[style-list%]
- object and is never created except by a @racket[style-list%] object.
-
-See also @|stylediscuss|.
-
-
-@defmethod[(get-alignment)
-           (or/c 'top 'center 'bottom)]{
-
-Returns the style's alignment: @racket['top], @racket['center], or
- @racket['bottom].
-
-}
-
-
-@defmethod[(get-background)
-           (is-a?/c color%)]{
-
-Returns the style's background color.
-
-}
-
-
-@defmethod[(get-base-style)
-           (or/c (is-a?/c style<%>) #f)]{
-
-Returns the style's base style. See @|stylediscuss| for more
- information. The return value is @racket[#f] only for the basic style
- in the list.
-
-}
-
-@defmethod[(get-delta [delta (is-a?/c style-delta%)])
-           void?]{
-
-Mutates @racket[delta], changing it to match the style's delta, if the style is not a join
- style. See @|stylediscuss| for more information.
-
-}
-
-@defmethod[(get-face)
-           (or/c string? #f)]{
-
-Returns the style's face name. See @racket[font%].
-
-}
-
-
-@defmethod[(get-family)
-           (or/c 'default 'decorative 'roman 'script 
-                 'swiss 'modern 'symbol 'system)]{
-
-Returns the style's font family. See @racket[font%].
-
-}
-
-@defmethod[(get-font)
-           (is-a?/c font%)]{
-
-Returns the style's font information.
-
-}
-
-@defmethod[(get-foreground)
-           (is-a?/c color%)]{
-
-Returns the style's foreground color.
-
-}
-
-@defmethod[(get-name)
-           (or/c string? #f)]{
-
-Returns the style's name, or @racket[#f] if it is unnamed. Style names
- are only set through the style's @racket[style-list%] object.
-
-}
-
-@defmethod[(get-shift-style)
-           (is-a?/c style<%>)]{
-
-Returns the style's shift style if it is a join style. Otherwise, the
- root style is returned. See @|stylediscuss| for more information.
-
-}
-
-@defmethod[(get-size) byte?]{
-  Returns the style's font size.}
-
-@defmethod[(get-size-in-pixels)
-           boolean?]{
-
-Returns @racket[#t] if the style size is in pixels, instead of points,
- or @racket[#f] otherwise.
-
-}
-
-@defmethod[(get-smoothing)
-           (or/c 'default 'partly-smoothed 'smoothed 'unsmoothed)]{
-
-Returns the style's font smoothing. See @racket[font%].
-
-}
-
-@defmethod[(get-style)
-           (or/c 'normal 'italic 'slant)]{
-
-Returns the style's font style. See @racket[font%].
-
-}
-
-@defmethod[(get-text-descent [dc (is-a?/c dc<%>)])
-           (and/c real? (not/c negative?))]{
-
-Returns the descent of text using this style in a given DC.
-
-}
-
-@defmethod[(get-text-height [dc (is-a?/c dc<%>)])
-           (and/c real? (not/c negative?))]{
-
-Returns the height of text using this style in a given DC.
-
-}
-
-@defmethod[(get-text-space [dc (is-a?/c dc<%>)])
-           (and/c real? (not/c negative?))]{
-
-Returns the vertical spacing for text using this style in a given DC.
-
-}
-
-@defmethod[(get-text-width [dc (is-a?/c dc<%>)])
-           (and/c real? (not/c negative?))]{
-
-Returns the width of a space character using this style in a given
-DC.
-
-}
-
-@defmethod[(get-transparent-text-backing)
-           boolean?]{
-
-Returns @racket[#t] if text is drawn without erasing the
- text background or @racket[#f] otherwise.
-
-}
-
-@defmethod[(get-underlined)
-           boolean?]{
-
-Returns @racket[#t] if the style is underlined or @racket[#f]
- otherwise.
-
-}
-
-@defmethod[(get-weight)
-           (or/c 'normal 'bold 'light)]{
-
-Returns the style's font weight. See @racket[font%].
-
-}
-
-@defmethod[(is-join?)
-           boolean?]{
-
-Returns @racket[#t] if the style is a join style or @racket[#f]
- otherwise. See @|stylediscuss| for more information.
-
-}
-
-@defmethod[(set-base-style [base-style (is-a?/c style<%>)])
-           void?]{
-
-Sets the style's base style and recomputes the style's font, etc. See
- @|stylediscuss| for more information.
-
-}
-
-@defmethod[(set-delta [delta (is-a?/c style-delta%)])
-           void?]{
-
-Sets the style's delta (if it is not a join style) and recomputes the
-style's font, etc. See @|stylediscuss| for more information.
-
-}
-
-@defmethod[(set-shift-style [style (is-a?/c style<%>)])
-           void?]{
-
-Sets the style's shift style (if it is a join style) and recomputes
-the style's font, etc. See @|stylediscuss| for more information.
-
-}
-
-@defmethod[(switch-to [dc (is-a?/c dc<%>)]
-                      [old-style (or/c (is-a?/c style<%>) #f)])
-           void?]{
-
-Sets the font, pen color, etc. of the given drawing context. If
- @racket[oldstyle] is not @racket[#f], only differences between the
- given style and this one are applied to the drawing context.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/style-list-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/style-list-class.scrbl
deleted file mode 100644
index fc7724447f..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/style-list-class.scrbl
+++ /dev/null
@@ -1,181 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[style-list% object% ()]{
-
-A @racket[style-list%] object contains a set of @racket[style<%>]
- objects and maintains the hierarchical relationships between them. A
- @racket[style<%>] object can only be created through the methods of a
- @racket[style-list%] object. There is a global style list object,
- @indexed-racket[the-style-list], but any number of independent lists can be
- created for separate style hierarchies.  Each editor creates its own
- private style list.
-
-See @|stylediscuss| for more information.
-
-
-
-@defconstructor[()]{
-
-The root style, named @racket["Basic"], is automatically created.
-
-}
-
-@defmethod[#:mode public-final
-                  (basic-style)
-                  (is-a?/c style<%>)]{
-
-Returns the root style. Each style list has its own root style.
-
-See also @|mrprefsdiscuss| for information about the
- @ResourceFirst{default-font-size}.
-
-}
-
-
-@defmethod[(convert [style (is-a?/c style<%>)])
-           (is-a?/c style<%>)]{
-
-Converts @racket[style], which can be from another style list, to a style
-in this list. If @racket[style] is already in this list, then @racket[ style]
-is returned. If @racket[style] is named and a style by that name is
-already in this list, then the existing named style is returned.
-Otherwise, the style is converted by converting its base style
-(and shift style if @racket[style] is a join style) and then creating
-a new style in this list.
-
-}
-
-@defmethod[(find-named-style [name string?])
-           (or/c (is-a?/c style<%>) #f)]{
-
-Finds a style by name. If no such style can be found, @racket[#f] is
-returned.
-
-}
-
-@defmethod[(find-or-create-join-style [base-style (is-a?/c style<%>)]
-                                      [shift-style (is-a?/c style<%>)])
-           (is-a?/c style<%>)]{
-
-Creates a new join style, or finds an appropriate existing one. The
-returned style is always unnamed.  See @|stylediscuss| for more
-information. 
-
-The @racket[base-style] argument must be a style within this style
- list.
-
-}
-
-
-@defmethod[(find-or-create-style [base-style (is-a?/c style<%>)]
-                                 [delta (is-a?/c style-delta%)])
-           (is-a?/c style<%>)]{
-
-Creates a new derived style, or finds an appropriate existing one.
-The returned style is always unnamed.  See @|stylediscuss| for more
-information.
-
-The @racket[base-style] argument must be a style within this style
-list.  If @racket[base-style] is not a join style, if it has no name,
-and if its delta can be collapsed with @racket[delta] (see
-@xmethod[style-delta% collapse]), then the collapsed delta is used in
-place of @racket[delta], and the base style of @racket[base-style] is
-used in place of @racket[base-style]; this collapsing and substitution
-of base styles is performed recursively.}
-
-
-@defmethod[(forget-notification [key any/c])
-           void?]{
-
-See @method[style-list% notify-on-change].
-
-The @racket[key] argument is the value returned by @method[style-list%
-notify-on-change].
-
-}
-
-
-@defmethod[(index-to-style [i exact-nonnegative-integer?])
-           (or/c (is-a?/c style<%>) #f)]{
-
-Returns the style associated with the given index, or @racket[#f] for
- a bad index. See also @method[style-list% style-to-index].
-
-}
-
-
-@defmethod[(new-named-style [name string?]
-                            [like-style (is-a?/c style<%>)])
-           (is-a?/c style<%>)]{
-
-Creates a new named style, unless the name is already being used. 
-
-If @racket[name] is already being used, then @racket[like-style] is
- ignored and the old style associated to the name is
- returned. Otherwise, a new style is created for @racket[name] with
- the same characteristics (i.e., the same base style and same style
- delta or shift style) as @racket[like-style].
-
-The @racket[like-style] style must be in this style list, otherwise
- the named style is derived from the basic style with an empty style
- delta.
-
-}
-
-@defmethod[(notify-on-change [f ((or/c (is-a?/c style<%>) #f) . -> . any)])
-           any/c]{
-
-Attaches a callback @racket[f] to the style list. The callback
- @racket[f] is invoked whenever a style is modified.
-
-Often, a change in one style will trigger a change in several other
- derived styles; to allow clients to handle all the changes in a
- batch, @racket[#f] is passed to @racket[f] as the changing style after a set of
- styles has been processed.
-
-The return value from @method[style-list% notify-on-change] is an
- opaque key to be used with @method[style-list% forget-notification].
-
-The callback @racket[f] replaces any callback for which it is
- @racket[equal?], which helps avoid redundant notifications in case of
- redundant registrations. The callback @racket[f] is retained only
- weakly (in the sense of @racket[make-weak-box]), but it is retained
- as long as any value that @racket[f] impersonates is reachable; for
- example, if @racket[f] represents a function with a contract applied,
- then @racket[f] is retained for notification as long as the original
- (pre-contract) function is reachable. The callback @racket[f] is also
- retained as long as the opaque key produced by @method[style-list%
- notify-on-change] is reachable.}
-
-
-@defmethod[(number)
-           exact-nonnegative-integer?]{
-
-Returns the number of styles in the list.
-
-}
-
-@defmethod[(replace-named-style [name string?]
-                                [like-style (is-a?/c style<%>)])
-           (is-a?/c style<%>)]{
-
-Like @method[style-list% new-named-style], except that if the name is
- already mapped to a style, the existing mapping is replaced.
-
-}
-
-@defmethod[(style-to-index [style (is-a?/c style<%>)])
-           (or/c exact-nonnegative-integer? #f)]{
-
-Returns the index for a particular style. The index for a style's base
- style (and shift style, if it is a join style) is guaranteed to be
- lower than the style's own index. (As a result, the root style's
- index is always @racket[0].) A style's index can change whenever a new
- style is added to the list, or the base style or shift style of
- another style is changed.
-
-If the given style is not in this list, @racket[#f] is returned.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/subarea-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/subarea-intf.scrbl
deleted file mode 100644
index 1b6252fcd2..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/subarea-intf.scrbl
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[subarea<%> (area<%>)]{
-
-A @racket[subarea<%>] is a containee @racket[area<%>].
-
-All @racket[subarea<%>] classes accept the following named
- instantiation arguments:
-@itemize[
-
- @item{@indexed-racket[horiz-margin] --- default is @racket[2] for
- @racket[control<%>] classes and @racket[group-box-panel%], 
- @racket[0] for others; passed to
-@method[subarea<%> horiz-margin]} 
- @item{@indexed-racket[vert-margin] --- default is @racket[2] for
- @racket[control<%>] classes and @racket[group-box-panel%], 
- @racket[0] for others; passed to
-@method[subarea<%> vert-margin]} 
-]
-
-
-@defmethod*[([(horiz-margin)
-              spacing-integer?]
-             [(horiz-margin [margin spacing-integer?])
-              void?])]{
-
-Gets or sets the area's horizontal margin, which is added both to the
- right and left, for geometry management. See @|geomdiscuss| for more
- information.
-
-}
-
-@defmethod*[([(vert-margin)
-              spacing-integer?]
-             [(vert-margin [margin spacing-integer?])
-              void?])]{
-
-Gets or sets the area's vertical margin, which is added both to the
- top and bottom, for geometry management. See @|geomdiscuss| for more
- information.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/subwindow-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/subwindow-intf.scrbl
deleted file mode 100644
index 4a19c81d0f..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/subwindow-intf.scrbl
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[subwindow<%> (subarea<%> window<%>)]{
-
-A @racket[subwindow<%>] is a containee window.
-
-@defmethod[(reparent [new-parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                                       (is-a?/c panel%) (is-a?/c pane%))])
-           void?]{
-
-Removes the window from its current parent and makes it a child of
-@racket[new-parent]. The current and new parents must have the same
-eventspace, and @racket[new-parent] cannot be a descendant of
-@this-obj[].
-
-If @this-obj[] is deleted within its current parent, it remains
-deleted in @racket[new-parent]. Similarly, if @this-obj[] is shown in
-its current parent, it is shown in @racket[new-parent].}
-
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/system-menu-funcs.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/system-menu-funcs.scrbl
deleted file mode 100644
index c331b1832b..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/system-menu-funcs.scrbl
+++ /dev/null
@@ -1,155 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{System Menus}
-
-
-@defproc[(current-eventspace-has-standard-menus?)
-         boolean?]{
-Returns @racket[#t] for Mac OS X when the current eventspace is the
- initial one, since that eventspace is the target for the standard
- application menus. For any other system or eventspace, the result is
- @racket[#f].
-
-This procedure is intended for use in deciding whether to include a
- @onscreen{Quit}, @onscreen{About}, and @onscreen{Preferences} menu
- item in a frame's menu. On Mac OS X, the application
- @onscreen{Quit} menu triggers a call to a frame's
-@method[top-level-window<%> on-exit] method, the @onscreen{About} menu item is controlled by
- @racket[application-about-handler], and the
- @onscreen{Preferences} menu item is controlled by
- @racket[application-preferences-handler].
-
-}
-
-@defproc[(current-eventspace-has-menu-root?)
-         boolean?]{
-Returns @racket[#t] for Mac OS X when the current eventspace is the
- initial one, since that eventspace can supply a menu bar to be active
- when no frame is visible. For any other system or eventspace, the
- result is @racket[#f].
-
-This procedure is intended for use in deciding whether to create a
- @racket[menu-bar%] instance with @racket['root] as its parent.
-
-}
-
-@defproc*[([(application-about-handler)
-            (-> any)]
-           [(application-about-handler [handler-thunk (-> any)])
-            void?])]{
-
-When the current eventspace is the initial eventspace, this
-procedure retrieves or installs a thunk that is called when the
-user selects the application @onscreen{About} menu item on Mac OS
-X.  The thunk is always called in the initial eventspace's
-handler thread (as a callback).
-
-The default handler displays a generic Racket dialog.
-
-If the current eventspace is not the initial eventspace, this
-procedure returns @racket[void] (when called with zero arguments)
-or has no effect (when called with a handler).
-
-}
-
-
-@defproc*[([(application-file-handler)
-            (path? . -> . any)]
-           [(application-file-handler [handler-proc (path? . -> . any)])
-            void?])]{
-When the current eventspace is the initial eventspace, this procedure
- retrieves or installs a procedure that is called on Mac OS X
- and Windows when the application is running and user double-clicks an
- application-handled file or drags a file onto the application's
- icon. The procedure is always called in the initial eventspace's
- handler thread (as a callback), and the argument is a filename.
-
-The default handler queues a callback to the
-@method[window<%> on-drop-file] method of the most-recently activated frame in the main eventspace (see
-@racket[get-top-level-edit-target-window]), if any such frame exists and if
- drag-and-drop is enabled for that frame. Otherwise, it saves
- the filename and re-queues the handler event when the application
- file handler is later changed or when a frame becomes active.
-
-On Windows, when the application is @italic{not} running and user double-clicks an
- application-handled file or drags a file onto the application's icon,
- the filename is provided as a command-line argument to the
- application.
-
-On Mac OS X, if an application is started @emph{without} files, then
- the @racket[application-start-empty-handler] procedure is called.
-
-If the current eventspace is not the initial eventspace, this
-procedure returns @racket[void] (when called with zero arguments)
-or has no effect (when called with a handler).
-}
-
-
-@defproc*[([(application-preferences-handler)
-            (or/c (-> any) #f)]
-           [(application-preferences-handler [handler-thunk (or/c (-> any) #f)])
-            void?])]{
-When the current eventspace is the initial eventspace, this procedure
- retrieves or installs a thunk that is called when the user selects
- the application @onscreen{Preferences} menu item on Mac OS X.  The
- thunk is always called in the initial eventspace's handler thread (as
- a callback). If the handler is set to @racket[#f], the
- @onscreen{Preferences} item is disabled.
-
-The default handler is @racket[#f].
-
-If the current eventspace is not the initial eventspace, this
-procedure returns @racket[void] (when called with zero arguments)
-or has no effect (when called with a handler).
-}
-
-@defproc*[([(application-quit-handler)
-            (-> any)]
-           [(application-quit-handler [handler-thunk (-> any)])
-            void?])]{
-When the current eventspace is the initial eventspace, this procedure
- retrieves or installs a thunk that is called when the user requests
- that the application quit (e.g., through the @onscreen{Quit} menu
- item on Mac OS X, or when shutting down the machine in Windows). The
- thunk is always called in the initial eventspace's handler thread (as
- a callback). If the result of the thunk is @racket[#f], then the
- operating system is explicitly notified that the application does not
- intend to quit (on Windows).
-
-The default handler queues a call to the
- @method[top-level-window<%> can-exit?] method of the most
- recently active frame in the initial eventspace (and then calls the
- frame's @method[top-level-window<%> on-exit] method if the
- result is true). The result is @racket[#t] if the eventspace is
- left with no open frames after
- @method[top-level-window<%> on-exit] returns, @racket[#f]
- otherwise.
-
-
-If the current eventspace is not the initial eventspace, this
-procedure returns @racket[void] (when called with zero arguments)
-or has no effect (when called with a handler).
-}
-
-
-@defproc*[([(application-start-empty-handler)
-            (-> any)]
-           [(application-start-empty-handler [handler-thunk (-> any)])
-            void?])]{
-When the current eventspace is the initial eventspace, this procedure
- retrieves or installs a thunk that is called when the user starts
- the application on Mac OS X without supplying any initial files (e.g.,
- by double-clicking the application icon instead of double-clicking
- files that are handled by the application).
-
-The default handler re-queues the handler event when the application
- start-empty handler is later changed. As a result, if an application
- sets both @racket[application-start-empty-handler] and
- @racket[application-file-handler], then one or the other is
- eventually called.
-
-If the current eventspace is not the initial eventspace, this
-procedure returns @racket[void] (when called with zero arguments)
-or has no effect (when called with a handler).
-}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/tab-panel-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/tab-panel-class.scrbl
deleted file mode 100644
index 1ef1ce3be6..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/tab-panel-class.scrbl
+++ /dev/null
@@ -1,128 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/tab-panel}}
-
-@defclass/title[tab-panel% vertical-panel% ()]{
-
-A tab panel arranges its subwindows in a single column, but also
- includes a horizontal row of tabs at the top of the panel. See
- also @racket[panel%].
-
-The @racket[tab-panel%] class does not implement the virtual
- swapping of the panel content when a new tab is selected. Instead, it
- merely invokes a callback procedure to indicate that a user changed
- the tab selection.
-
-
-
-
-@defconstructor[([choices (listof label-string?)]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [callback ((is-a?/c tab-panel%) (is-a?/c control-event%)
-                            . -> . any) 
-                           (lambda (b e) (void))]
-                 [style (listof (or/c 'no-border 'deleted)) null]
-                 [font (is-a?/c font%) normal-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 0]
-                 [horiz-margin spacing-integer? 0]
-                 [border spacing-integer? 0]
-                 [spacing spacing-integer? 0]
-                 [alignment (list/c (or/c 'left 'center 'right)
-                                    (or/c 'top 'center 'bottom))
-                            '(center top)]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-Creates a tab pane, where the @racket[choices] list specifies the tab
- labels.
-
-Each string in @racket[choices] can contain an ampersand, which (in the
- future) may create a mnemonic for clicking the corresponding tab. A
- double ampersand is converted to a single ampersand.
-
-The @racket[callback] procedure is called (with the event type
- @indexed-racket['tab-panel]) when the user changes the tab selection.
-
-If the @racket[style] list includes @racket['no-border], no border is
- drawn around the panel content. @DeletedStyleNote[@racket[style] @racket[parent]]{tab panel}
-
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-
-
-}
-
-@defmethod[(append [choice label-string?])
-           void?]{
-
-Adds a tab to the right end of panel's top row of tabs.
-
-The label string @racket[choice] can contain @litchar{&}, which (in
- the future) may create a mnemonic for clicking the new tab. A
- @litchar{&&} is converted to @litchar{&}.
-
-}
-
-@defmethod[(delete [n exact-nonnegative-integer?])
-           void?]{
-
-Deletes an existing tab. If @racket[n] is equal to or larger than the
- number of tabs on the panel, @|MismatchExn|.
-
-}
-
-@defmethod[(get-item-label [n exact-nonnegative-integer?])
-           string?]{
-
-Gets the label of a tab by position. Tabs are numbered from @racket[0].
-If @racket[n] is equal to or larger than the number of tabs in the panel,
- @|MismatchExn|.
-
-}
-
-@defmethod[(get-number)
-           exact-nonnegative-integer?]{
-
-Returns the number of tabs on the panel.
-
-}
-
-@defmethod[(get-selection)
-           (or/c exact-nonnegative-integer? #f)]{
-
-Returns the index (counting from 0) of the currently selected tab.  If
- the panel has no tabs, the result is @racket[#f].
-
-}
-
-@defmethod[(set [choices (listof label-string?)])
-           void?]{
-
-Removes all tabs from the panel and installs tabs with the given
- labels.
-
-}
-
-@defmethod[(set-item-label [n exact-nonnegative-integer?]
-                           [label label-string?])
-           void?]{
-
-Set the label for tab @racket[n] to @racket[label]. If @racket[n] is equal to
- or larger than the number of tabs in the panel, @|MismatchExn|.
-
-}
-
-@defmethod[(set-selection [n exact-nonnegative-integer?])
-           void?]{
-
-Sets the currently selected tab by index (counting from 0).
-If @racket[n] is equal to or larger than the number of tabs in the panel,
- @|MismatchExn|.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/tab-snip-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/tab-snip-class.scrbl
deleted file mode 100644
index 4eecd7236e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/tab-snip-class.scrbl
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[tab-snip% string-snip% ()]{
-
-An instance of @racket[tab-snip%] is created automatically when a
- tab is inserted into an editor.
-
-
-@defconstructor[()]{
-
-Creates a snip for a single tab, though the tab is initially empty.
-
-Normally, a single tab is inserted into a @racket[tab-snip%] object
- using the @method[string-snip% insert] method.
-
-The tab's content is not drawn, through it is used when determining
- the size of a single character in editors where tabbing is determined
- by the character width (see @method[text% set-tabs]); if the content
- is a single tab character (the normal case), then the average
- character width of snip's font is used as the tab's width.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/text-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/text-class.scrbl
deleted file mode 100644
index c27462924d..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/text-class.scrbl
+++ /dev/null
@@ -1,2205 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[text% object% (editor<%>)]{
-
-A @racket[text%] object is a standard text editor. A text editor is
- displayed on the screen through an @racket[editor-canvas%] object or
- some other @techlink{display}.
-
-
-@defconstructor[([line-spacing (and/c real? (not/c negative?)) 1.0]
-                 [tab-stops (listof real?) null]
-                 [auto-wrap any/c #f])]{
-
-The @racket[line-spacing] argument sets the additional amount of space
- (in DC units) inserted between each line in the editor when the
- editor is displayed. This spacing is included in the reported height
- of each line.
-
-See @method[text% set-tabs] for information about @racket[tabstops].
-
-If @racket[auto-wrap] is true, then auto-wrapping is enabled via
- @method[editor<%> auto-wrap].
-
-A new @racket[keymap%] object is created for the new editor.  See also
- @method[editor<%> get-keymap] and @method[editor<%> set-keymap].
-
-A new @racket[style-list%] object is created for the new editor.  See
- also @method[editor<%> get-style-list] and @method[editor<%>
- set-style-list].
-
-}
-
-
-@defmethod[#:mode pubment 
-           (after-change-style [start exact-nonnegative-integer?]
-                               [len exact-nonnegative-integer?])
-           void?]{
-@methspec{
-
-Called after the style is changed for a given range (and after the
- @techlink{display} is refreshed; use @method[text% on-change-style]
- and @method[editor<%> begin-edit-sequence] to avoid extra refreshes
- when @method[text% after-change-style] modifies the editor).
-
-See also @method[text% can-change-style?] and @method[editor<%>
- on-edit-sequence].
-
-No internals locks are set when this method is called.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[#:mode pubment 
-           (after-delete [start exact-nonnegative-integer?]
-                         [len exact-nonnegative-integer?])
-           void?]{
-@methspec{
-
-Called after a given range is deleted from the editor (and after the
- @techlink{display} is refreshed; use @method[text% on-delete] and
- @method[editor<%> begin-edit-sequence] to avoid extra refreshes when
- @method[text% after-delete] modifies the editor).
-
-The @racket[start] argument specifies the starting @techlink{position}
- of the deleted range. The @racket[len] argument specifies number of
- deleted @techlink{item}s (so @math{@racket[start]+@racket[len]} is
- the ending @techlink{position} of the deleted range).
-
-See also @method[text% can-delete?] and @method[editor<%>
- on-edit-sequence].
-
-No internals locks are set when this method is called.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[#:mode pubment 
-           (after-insert [start exact-nonnegative-integer?]
-                         [len exact-nonnegative-integer?])
-           void?]{
-@methspec{
-
-Called after @techlink{item}s are inserted into the editor (and after
- the @techlink{display} is refreshed; use @method[text% on-insert] and
- @method[editor<%> begin-edit-sequence] to avoid extra refreshes when
- @method[text% after-insert] modifies the editor).
-
-The @racket[start] argument specifies the @techlink{position} of the insert. The
- @racket[len] argument specifies the total length (in @techlink{position}s) of
- the inserted @techlink{item}s.
-
-See also @method[text% can-insert?] and @method[editor<%>
- on-edit-sequence].
-
-No internals locks are set when this method is called.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[#:mode pubment 
-           (after-merge-snips [pos exact-nonnegative-integer?])
-           void?]{
-@methspec{
-
-Called after adjacent snips in the editor are combined into one.
-
-The @racket[pos] argument specifies the @techlink{position} within the editor
- where the snips were merged (i.e., one old snip was just before
- @racket[pos], one old was just after @racket[pos], and the new snip spans
- @racket[pos]).
-
-See also @method[snip% merge-with].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[#:mode pubment 
-           (after-set-position)
-           void?]{
-
-@methspec{
-
-Called after the start and end @techlink{position} have been moved (but not
- when the @techlink{position} is moved due to inserts or deletes).
-
-See also
-@method[editor<%> on-edit-sequence].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[#:mode pubment 
-           (after-set-size-constraint)
-           void?]{
-
-@methspec{
-
-Called after the editor's maximum or minimum height or width is
- changed (and after the @techlink{display} is refreshed; use
- @method[text% on-set-size-constraint] and @method[editor<%>
- begin-edit-sequence] to avoid extra refreshes when @method[text%
- after-set-size-constraint] modifies the editor).
-
-(This callback method is provided because setting an editor's maximum
- width may cause lines to be re-flowed with soft newlines.)
-
-See also @method[text% can-set-size-constraint?] and @method[editor<%>
- on-edit-sequence].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (after-split-snip [pos exact-nonnegative-integer?])
-           void?]{
-@methspec{
-
-Called after a snip in the editor is split into two, either through a
- call to @method[text% split-snip] or during some other action, such
- as inserting.
-
-The @racket[pos] argument specifies the @techlink{position} within the editor
- where a snip was split.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(call-clickback [start exact-nonnegative-integer?]
-                           [end exact-nonnegative-integer?])
-           void?]{
-
-Simulates a user click that invokes a clickback, if the given range of
- @techlink{position}s is within a clickback's region. See also
- @|clickbackdiscuss|.
-
-}
-
-@defmethod[#:mode pubment 
-           (can-change-style? [start exact-nonnegative-integer?]
-                              [len exact-nonnegative-integer?])
-           boolean?]{
-
-@methspec{
-
-Called before the style is changed in a given range of the editor. If
- the return value is @racket[#f], then the style change will be
- aborted.
-
-The editor is internally locked for writing during a call to this
- method (see also @|lockdiscuss|). Use @method[text%
- after-change-style] to modify the editor, if necessary.
-
-See also @method[text% on-change-style], @method[text%
- after-change-style], and @method[editor<%> on-edit-sequence].
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}
-}
-
-@defmethod[#:mode pubment 
-           (can-delete? [start exact-nonnegative-integer?]
-                        [len exact-nonnegative-integer?])
-           boolean?]{
-@methspec{
-
-Called before a range is deleted from the editor.
-If the return value is @racket[#f], then the
-delete will be aborted.
-
-The @racket[start] argument specifies the starting @techlink{position}
- of the range to delete. The @racket[len] argument specifies number of
- @techlink{item}s to delete (so @math{@racket[start]+@racket[len]} is
- the ending @techlink{position} of the range to delete).
-
-The editor is internally locked for writing during a call to this method
-(see also @|lockdiscuss|). Use
-@method[text% after-delete] to modify the editor, if necessary.
-
-See also @method[text% on-delete], @method[text% after-delete], and
- @method[editor<%> on-edit-sequence].
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-@defmethod[#:mode pubment 
-           (can-insert? [start exact-nonnegative-integer?]
-                        [len exact-nonnegative-integer?])
-           boolean?]{
-@methspec{
-
-Called before @techlink{item}s are inserted into the editor.  If the
- return value is @racket[#f], then the insert will be aborted.
-
-The @racket[start] argument specifies the @techlink{position} of the potential
- insert. The @racket[len] argument specifies the total length (in
- @techlink{position}s) of the @techlink{item}s to be inserted.
-
-The editor is internally locked for writing during a call to this
- method (see also @|lockdiscuss|). Use @method[text% after-insert] to
- modify the editor, if necessary.
-
-See also @method[text% on-insert], @method[text% after-insert], and
- @method[editor<%> on-edit-sequence].
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (can-set-size-constraint?)
-           boolean?]{
-
-@methspec{
-
-Called before the editor's maximum or minimum height or width
-is changed. If the return value is @racket[#f], then the
-change will be aborted.
-
-(This callback method is provided because setting an editor's maximum
-width may cause lines to be re-flowed with soft newlines.)
-
-See also @method[text% on-set-size-constraint], @method[text%
- after-set-size-constraint], and @method[editor<%> on-edit-sequence].
-
-}
-@methimpl{
-
-Returns @racket[#t].
-
-}}
-
-
-@defmethod[(caret-hidden?)
-           boolean?]{
-
-Returns @racket[#t] if the caret is hidden for this editor or @racket[#f]
-otherwise.
-
-See also @method[text% hide-caret].
-
-}
-
-
-@defmethod*[([(change-style [delta (or/c (is-a?/c style-delta%) #f)]
-                            [start (or/c exact-nonnegative-integer? 'start) 'start]
-                            [end (or/c exact-nonnegative-integer? 'end) 'end]
-                            [counts-as-mod? any/c #t])
-              void?]
-             [(change-style [style (or/c (is-a?/c style<%>) #f)]
-                            [start (or/c exact-nonnegative-integer? 'start) 'start]
-                            [end (or/c exact-nonnegative-integer? 'end) 'end]
-                            [counts-as-mod? any/c #t])
-              void?])]{
-
-Changes the style for a region in the editor by applying a style delta
- or installing a specific style.  If @racket[start] is @racket['start]
- and @racket[end] is @racket['end], then the currently selected
- @techlink{item}s are changed. Otherwise, if @racket[end] is
- @racket['end], then the style is changed from @racket[start] until
- the end of the selection.  If @racket[counts-as-mod?] is @racket[#f],
- then @method[editor<%> set-modified] is not called after applying the
- style change.
-
-To change a large collection of snips from one style to another style,
- consider providing a @racket[style<%>] instance rather than a
- @racket[style-delta%] instance. Otherwise, @method[text%
- change-style] must convert the @racket[style-delta%] instance to the
- @racket[style<%>] instance for every snip; this conversion consumes
- both time and (temporary) memory.
-
-When @racket[style] is provided: @InStyleListNote[@racket[style]]
-
-}
-
-
-@defmethod[#:mode extend
-           (copy [extend? any/c #f]
-                 [time exact-integer? 0]
-                 [start (or/c exact-nonnegative-integer? 'start) 'start]
-                 [end (or/c exact-nonnegative-integer? 'end) 'end])
-           void?]{
-
-Copies specified range of text into the clipboard. If @racket[extend?] is
- not @racket[#f], the old clipboard contents are appended. If
- @racket[start] is @racket['start] or @racket[end] is @racket['end], then the
- current selection start/end is used.
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-
-
-@defmethod[#:mode override 
-           (copy-self-to [dest (or/c (is-a?/c text%) (is-a?/c pasteboard%))])
-           void?]{
-
-In addition to the default @xmethod[editor<%> copy-self-to] work,
- this editor's file format, wordbreak function, wordbreak map,
- click-between-threshold, caret visibility state, overwrite mode
- state, and autowrap bitmap are installed into @racket[dest].
-
-}
-
-
-@defmethod[#:mode override
-           (cut [extend? any/c #f]
-                [time exact-integer? 0]
-                [start (or/c exact-nonnegative-integer? 'start) 'start]
-                [end (or/c exact-nonnegative-integer? 'end) 'end])
-           void?]{
-
-Copies and then deletes the specified range. If @racket[extend?] is not
- @racket[#f], the old clipboard contents are appended. If @racket[start] is
- @racket['start] or @racket[end] is @racket['end], then the current
- selection start/end is used.
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-
-
-@defmethod*[([(delete [start (or/c exact-nonnegative-integer? 'start)]
-                      [end (or/c exact-nonnegative-integer? 'back) 'back]
-                      [scroll-ok? any/c #t])
-              void?]
-             [(delete)
-              void?])]{
-
-Deletes the specified range or the currently selected text (when no
- range is provided) in the editor. If @racket[start] is
- @racket['start], then the starting selection @techlink{position} is
- used; if @racket[end] is @racket['back], then only the character
- preceding @racket[start] is deleted.  If @racket[scroll-ok?] is not
- @racket[#f] and @racket[start] is the same as the current caret
- @techlink{position}, then the editor's @techlink{display} may be
- scrolled to show the new selection @techlink{position}.
-
-
-@MonitorMethod[@elem{The content of an editor} @elem{the
- system in response to other method
- calls} @elem{@method[text% on-delete]} @elem{content deletion}]
-
-}
-
-@defmethod[(do-copy [start exact-nonnegative-integer?]
-                    [end exact-nonnegative-integer?]
-                    [time exact-integer?]
-                    [extend? any/c])
-           void?]{
-@methspec{
-
-Called to copy a region of the editor into the clipboard.  This method
- is provided so that it can be overridden by subclasses.  Do not call
- this method directly; instead, call @method[text% copy].
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-@methimpl{
-
-Copy the data from @racket[start] to @racket[end], extending the current
- clipboard contexts if @racket[extend?] is not @racket[#f].
-
-}}
-
-
-@defmethod[(do-paste [start exact-nonnegative-integer?]
-                     [time exact-integer?])
-           void?]{
-@methspec{
-
-Called to paste the current contents of the clipboard into the editor.
- This method is provided so that it can be overridden by subclasses.
- Do not call this method directly; instead, call @method[text% paste].
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-@methimpl{
-
-Pastes into the @techlink{position} @racket[start].
-
-}}
-
-
-@defmethod[(do-paste-x-selection [start exact-nonnegative-integer?]
-                                 [time exact-integer?])
-           void?]{
-@methspec{
-
-Called to paste the current contents of the X11 selection on Unix (or the
- clipboard on Windows or Mac OS X) into the editor.  This method is
- provided so that it can be overridden by subclasses.  Do not call
- this method directly; instead, call @method[text% paste-x-selection].
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-@methimpl{
-
-Pastes into the @techlink{position} @racket[start].
-
-}}
-
-
-@defmethod[(erase)
-           void?]{
-
-Erases the contents of the editor.
-
-See also @method[text% delete].
-
-}
-
-@defmethod[(extend-position [pos exact-nonnegative-integer?]) void?]{
-  Updates the selection (see @method[text% set-position]) based on 
-  the result of @method[text% get-extend-end-position], 
-  @method[text% get-extend-start-position], and @racket[pos].
-  
-  If @racket[pos] is before the extend start and extend end positions,
-  then the selection goes from @racket[pos] to the extend end position.
-  If it is after, then the selection goes from the extend start position
-  to @racket[pos].
-  
-  Use this method to implement shift-modified movement keys in order to
-  properly extend the selection.
-}
-
-@defmethod[(find-line [y real?]
-                      [on-it? (or/c (box/c any/c) #f) #f])
-           exact-nonnegative-integer?]{
-
-Given a @techlink{location} in the editor, returns the line at the
- @techlink{location}. @|LineNumbering|
-
-@boxisfillnull[@racket[on-it?] @elem{@racket[#t] if the line actually
- touches this @techlink{position}, or @racket[#f] otherwise}] (A large
- enough @racket[y] will always return the last line number, but will
- set @racket[on-it?] to @racket[#f].)
-
-@|OVD| @|FCA|
-
-}
-
-
-@defmethod[(find-newline [direction (or/c 'forward 'backward) 'forward]
-                         [start (or/c exact-nonnegative-integer? 'start) 'start]
-                         [end (or/c exact-nonnegative-integer? 'eof) 'eof])
-           (or/c exact-nonnegative-integer? #f)]{
-
-Like @method[text% find-string], but specifically finds a paragraph
-break (possibly more efficiently than searching text).}
-
-
-@defmethod[(find-next-non-string-snip [after (or/c (is-a?/c snip%) #f)])
-           (or/c (is-a?/c snip%) #f)]{
-
-Given a snip, returns the next snip in the editor (after the given
- one) that is not an instance of @racket[string-snip%]. If
- @racket[#f] is given as the snip, the result is the first non-string
- snip in the editor (if any). If no non-string snip is found after the
- given snip, the result is @racket[#f].
-
-}
-
-
-@defmethod[(find-position [x real?]
-                          [y real?]
-                          [at-eol? (or/c (box/c any/c) #f) #f]
-                          [on-it? (or/c (box/c any/c) #f) #f]
-                          [edge-close? (or/c (box/c real?) #f) #f])
-           exact-nonnegative-integer?]{
-
-Given a @techlink{location} in the editor, returns the @techlink{position} at the
- @techlink{location}.
-
-See @|ateoldiscuss| for a discussion of the @racket[at-eol?] argument.
- @boxisfillnull[@racket[on-it?] @elem{@racket[#t] if the line actually touches this
- @techlink{position}, or @racket[#f] otherwise}]
-
-@boxisfillnull[@racket[edge-close?] @elem{it will be filled in with a value
- indicating how close the point is to the vertical edges of the @techlink{item}
- when the point falls on the @techlink{item}}] If the point is closest to the left
- edge of the @techlink{item}, the value will be negative; otherwise, the value
- will be positive. In either case, then absolute value of the returned
- result is the distance from the point to the edge of the @techlink{item}. The
- values 100 and -100 indicate infinity.
-
-@|OVD| @|FCA|
-
-}
-
-
-@defmethod[(find-position-in-line [line exact-nonnegative-integer?]
-                                  [x real?]
-                                  [at-eol? (or/c (box/c any/c) #f) #f]
-                                  [on-it? (or/c (box/c any/c) #f) #f]
-                                  [edge-close? (or/c (box/c real?) #f) #f])
-           exact-nonnegative-integer?]{
-
-Given a @techlink{location} within a line of the editor, returns the
- @techlink{position} at the @techlink{location}. @|LineNumbering|
-
-See @|ateoldiscuss| for a discussion of the @racket[at-eol?] argument.
- @boxisfillnull[@racket[on-it?] @elem{@racket[#t] if the line actually
- touches this @techlink{position}, or @racket[#f] otherwise}]
-
-See @method[text% find-position] for a discussion of
- @racket[edge-close?].
-
-@|OVD| @|FCA|
-
-}
-
-
-@defmethod[(find-snip [pos exact-nonnegative-integer?]
-                      [direction (or/c 'before-or-none 'before 'after 'after-or-none)]
-                      [s-pos (or/c (box/c exact-nonnegative-integer?) #f) #f])
-           (or/c (is-a?/c snip%) #f)]{
-
-Returns the snip at a given @techlink{position}, or @racket[#f] if an appropriate
- snip cannot be found.
-
-If the @techlink{position} @racket[pos] is between
-two snips, @racket[direction] specifies which snip to return; @racket[direction]
-can be any of the following:
-@itemize[
-
- @item{@racket['before-or-none] --- returns the snip before the
- @techlink{position}, or @racket[#f] if @racket[pos] is @racket[0]}
-
- @item{@racket['before] --- returns the snip before the @techlink{position},
- or the first snip if @racket[pos] is @racket[0]}
-
- @item{@racket['after] --- returns the snip after the @techlink{position}, or
- the last snip if @racket[pos] is the last @techlink{position}}
-
- @item{@racket['after-or-none] -- returns the snip after the
- @techlink{position}, or @racket[#f] if @racket[pos] is the last @techlink{position} or larger}
-
-]
-
-@boxisfillnull[@racket[s-pos] @elem{the @techlink{position} where the returned snip starts}]
-
-}
-
-
-@defmethod[(find-string [str string?]
-                        [direction (or/c 'forward 'backward) 'forward]
-                        [start (or/c exact-nonnegative-integer? 'start) 'start]
-                        [end (or/c exact-nonnegative-integer? 'eof) 'eof]
-                        [get-start? any/c #t]
-                        [case-sensitive? any/c #t])
-           (or/c exact-nonnegative-integer? #f)]{
-
-Finds an exact-match string in the editor and returns its @techlink{position}. 
- If the string is not found, @racket[#f] is returned.
-
-The @racket[direction] argument can be @racket['forward] or
- @racket['backward], indicating a forward search or backward
- search respectively. In the case of a forward search, the return
- value is the starting @techlink{position} of the string; for a backward search,
- the ending @techlink{position} is returned.  However, if @racket[get-start?] is
- @racket[#f], then the other end of the string @techlink{position} will be
- returned.
-
-The @racket[start] and @racket[end] arguments set the starting and ending
- @techlink{position}s of a forward search (use @racket[start] > @racket[end] for a
- backward search). If @racket[start] is @racket['start], then the search
- starts at the start of the selection. If @racket[end] is @racket['eof],
- then the search continues to the end (for a forward search) or start
- (for a backward search) of the editor.
-
-If @racket[case-sensitive?] is @racket[#f], then an uppercase and lowercase
- of each alphabetic character are treated as equivalent.
-
-}
-
-@defmethod[(find-string-embedded [str string?]
-                                 [direction (or/c 'forward 'backward) 'forward]
-                                 [start (or/c exact-nonnegative-integer? 'start) 'start]
-                                 [end (or/c exact-nonnegative-integer? 'eof) 'eof]
-                                 [get-start? any/c #t]
-                                 [case-sensitive? any/c #t])
-           (or/c exact-nonnegative-integer? 
-                 #f
-                 (cons/c
-                  (is-a?/c editor<%>)
-                  (flat-rec-contract
-                   nested-editor-search-result
-                   (or/c (cons/c (is-a?/c editor<%>)
-                                 nested-editor-search-result)
-                         exact-nonnegative-integer?))))]{
-  Like @method[text% find-string], but also searches in embedded editors,
-       returning a series of cons pairs whose @racket[car] positions
-       are the editors on the path to the editor where the search
-       string occurred and whose final @racket[cdr] position is the 
-       search result position.
-}
-                                                
-@defmethod[(find-string-all [str string?]
-                            [direction (or/c 'forward 'backward) 'forward]
-                            [start (or/c exact-nonnegative-integer? 'start) 'start]
-                            [end (or/c exact-nonnegative-integer? 'eof) 'eof]
-                            [get-start? any/c #t]
-                            [case-sensitive any/c #t])
-           (listof exact-nonnegative-integer?)]{
-
-Finds all occurrences of a string using @method[text% find-string]. If
- no occurrences are found, the empty list is returned.  The arguments
- are the same as for @method[text% find-string].
-
-}
-
-@defmethod[(find-string-embedded-all [str string?]
-                                     [direction (or/c 'forward 'backward) 'forward]
-                                     [start (or/c exact-nonnegative-integer? 'start) 'start]
-                                     [end (or/c exact-nonnegative-integer? 'eof) 'eof]
-                                     [get-start? any/c #t]
-                                     [case-sensitive any/c #t])
-           (listof (or/c exact-nonnegative-integer? 
-                         (cons/c
-                          (is-a?/c editor<%>)
-                          (flat-rec-contract
-                           nested-editor-search-result
-                           (or/c (cons/c (is-a?/c editor<%>)
-                                         nested-editor-search-result)
-                                 (listof exact-nonnegative-integer?))))))]{
-Like @method[text% find-string-embedded], but also searches in embedded
-editors, returning search  results a list of the editors that contain
-the matches.
-}
-
-@defmethod[(find-wordbreak [start (or/c (box/c exact-nonnegative-integer?) #f)]
-                           [end (or/c (box/c exact-nonnegative-integer?) #f)]
-                           [reason (or/c 'caret 'line 'selection 'user1 'user2)])
-           void?]{
-
-Finds wordbreaks in the editor using the current wordbreak procedure.
- See also @method[text% set-wordbreak-func].
-
-The contents of the @racket[start] argument specifies an @techlink{position} to start
- searching backwards to the next word start; its will be filled with
- the starting @techlink{position} of the word that is found.  If @racket[start] is
- @racket[#f], no backward search is performed.
-
-The contents of the @racket[end] argument specifies an @techlink{position} to start
- searching forwards to the next word end; its will be filled with the
- ending @techlink{position} of the word that is found.  If @racket[end] is
- @racket[#f], no forward search is performed.
-
-The @racket[reason] argument specifies more information about what the
- wordbreak is used for. For example, the wordbreaks used to move the
- caret may be different from the wordbreaks used to break lines. The
- possible values of @racket[reason] are:
-
-@itemize[
-@item{@racket['caret] --- find a wordbreak suitable for moving the caret}
-@item{@racket['line] --- find a wordbreak suitable for breaking lines}
-@item{@racket['selection] --- find a wordbreak suitable for selecting the closest word}
-@item{@racket['user1] --- for other (not built-in) uses}
-@item{@racket['user2] --- for other (not built-in) uses}
-]
-
-The actual handling of @racket[reason] is controlled by the current
- wordbreak procedure; see @method[text% set-wordbreak-func]for
- details. The default handler and default wordbreak map treats
- alphanumeric characters the same for @racket['caret], @racket['line],
- and @racket['selection]. Non-alphanumeric, non-space, non-hyphen
- characters do not break lines, but do break caret and selection
- words.  For example a comma should not be counted as part of the
- preceding word for moving the caret past the word or double-clicking
- the word, but the comma should stay on the same line as the word (and
- thus counts in the same ``line word'').
-
-}
-
-
-@defmethod[(flash-off)
-           void?]{
-
-Turns off the hiliting and shows the normal selection range again; see
- @method[text% flash-on]. There is no effect if this method is called
- when flashing is already off.
-
-}
-
-
-@defmethod[(flash-on [start exact-nonnegative-integer?]
-                     [end exact-nonnegative-integer?]
-                     [at-eol? any/c #f]
-                     [scroll? any/c #t]
-                     [timeout exact-nonnegative-integer? 500])
-           void?]{
-
-Temporarily hilites a region in the editor without changing the
- current selection.
-
-See @|ateoldiscuss| for a discussion of the @racket[at-eol?] argument. If
- @racket[scroll?] is not @racket[#f], the editor's @techlink{display} will be scrolled
- if necessary to show the hilited region. If @racket[timeout] is greater
- than 0, then the hiliting will be automatically turned off after the
- given number of milliseconds.
-
-See also  @method[text% flash-off].
-
-}
-
-
-@defmethod[(get-anchor)
-           boolean?]{
-
-Returns @racket[#t] if the selection is currently auto-extending. See
- also @method[text% set-anchor].
-
-}
-
-@defmethod[(get-autowrap-bitmap-width) (and/c real? (not/c negative?))]{
-  Returns the width of the bitmap last passed to @method[text% set-autowrap-bitmap]
-  or @racket[zero?] if no bitmap has been passed to @method[text% set-autowrap-bitmap] or
-  if @racket[#f] was most recently passed.
-}
-
-@defmethod[(get-between-threshold)
-           (and/c real? (not/c negative?))]{
-
-Returns an amount used to determine the meaning of a user click. If
- the click falls within the threshold of a position between two
- @techlink{item}s, then the click registers on the space between the
- @techlink{item}s rather than on either @techlink{item}.
-
-See also @method[text% set-between-threshold].
-
-}
-
-
-@defmethod[(get-character [start exact-nonnegative-integer?])
-           char?]{
-
-Returns the character following the @techlink{position}
- @racket[start]. The character corresponds to getting non-flattened
- text from the editor.
-
-If @racket[start] is greater than or equal to the last
- @techlink{position}, @racket[#\nul] is returned.
-
-}
-
-
-@defmethod[(get-end-position)
-           exact-nonnegative-integer?]{
-
-Returns the ending @techlink{position} of the current selection. See
- also @method[text% get-position].
-
-}
-
-@defmethod[(get-extend-start-position) exact-nonnegative-integer?]{
-  Returns the beginning of the ``extend'' region if the selection
-  is currently being extended via, e.g., shift and a cursor movement key; 
-  otherwise returns the same value as @method[text% get-end-position].
-}
-
-@defmethod[(get-extend-end-position) exact-nonnegative-integer?]{
-  Returns the beginning of the ``extend'' region if the selection
-  is currently being extended via, e.g., shift and a cursor movement key; 
-  otherwise returns the same value as @method[text% get-start-position].
-}
-
-@defmethod[(get-file-format)
-           (or/c 'standard 'text 'text-force-cr)]{
-
-Returns the format of the last file saved from or loaded into this
- editor. See also @method[editor<%> load-file].
-
-}
-
-
-@defmethod[(get-line-spacing)
-           (and/c real? (not/c negative?))]{
-
-Returns the spacing inserted by the editor between each line. This
- spacing is included in the reported height of each line.
-
-}
-
-@defmethod[(get-overwrite-mode)
-           boolean?]{
-
-Returns @racket[#t] if the editor is in overwrite mode, @racket[#f]
- otherwise. Overwrite mode only affects the way that @method[editor<%>
- on-default-char] handles keyboard input for insertion characters. See
- also @method[text% set-overwrite-mode].
-
-}
-
-
-@defmethod[(get-padding) (values (and/c real? (not/c negative?))
-                                 (and/c real? (not/c negative?))
-                                 (and/c real? (not/c negative?))
-                                 (and/c real? (not/c negative?)))]{
-
-Returns the editor's padding for its left, top, right, and bottom
-sides (in that order).
-
-See also @method[text% set-padding].}
-
-
-@defmethod[(get-position [start (or/c (box/c exact-nonnegative-integer?) #f)]
-                         [end (or/c (box/c exact-nonnegative-integer?) #f) #f])
-           void?]{
-
-Returns the current selection range in @techlink{position}s.  If
-nothing is selected, the @racket[start] and @racket[end] will be
-the same number and that number will be where the insertion point is.
-
-See also @method[text% get-start-position] 
-and @method[text% get-end-position].
-
-@boxisfillnull[@racket[start] @elem{the starting @techlink{position} of the selection}]
-@boxisfillnull[@racket[end] @elem{the ending @techlink{position} of the selection}]
-
-}
-
-
-@defmethod[(get-region-data [start exact-nonnegative-integer?]
-                            [end exact-nonnegative-integer?])
-           (or/c (is-a?/c editor-data%) #f)]{
-
-Gets extra data associated with a given region. See
- @|editordatadiscuss| for more information.
-
-This method is @italic{not} called when the whole editor is saved to a
- file. In such cases, the information can be stored in the header or
- footer; see @|globaleditordatadiscuss|.
-
-This method is meant to be overridden; the default @method[text%
- set-region-data] method does not store information to be retrieved by
- this method.
-
-}
-
-
-@defmethod[(get-revision-number)
-           (and/c real? (not/c negative?))]{
-
-Returns an inexact number that increments every time the editor is
- changed in one of the following ways: a snip is inserted (see
- @method[text% after-insert]), a snip is deleted (see @method[text%
- after-delete]), a snip is split (see @method[text%
- after-split-snip]), snips are merged (see @method[text%
- after-merge-snips]), or a snip changes its count (which is rare; see
- @method[snip-admin% recounted]).
-
-}
-
-
-@defmethod[(get-snip-position [snip (is-a?/c snip%)])
-           (or/c exact-nonnegative-integer? #f)]{
-
-Returns the starting @techlink{position} of a given snip or
- @racket[#f] if the snip is not in this editor.
-
-}
-
-@defmethod[#:mode public-final
-           (get-snip-position-and-location [snip (is-a?/c snip%)]
-                                           [pos (or/c (box/c exact-nonnegative-integer?) #f)]
-                                           [x (or/c (box/c real?) #f) #f]
-                                           [y (or/c (box/c real?) #f) #f])
-           boolean?]{
-
-Gets a snip's @techlink{position} and top left @techlink{location} in editor
- coordinates.  The return value is @racket[#t] if the snip is found,
- @racket[#f] otherwise.
-
-@boxisfillnull[@racket[pos] @elem{starting @techlink{position} of @racket[snip]}]
-@boxisfillnull[@racket[x] @elem{left @techlink{location} of @racket[snip] in editor coordinates}]
-@boxisfillnull[@racket[y] @elem{top @techlink{location} of @racket[snip] in editor coordinates}]
-
-When @techlink{location} information is requested: @|OVD| @|FCA|
-
-}
-
-
-@defmethod[(get-start-position)
-           exact-nonnegative-integer?]{
-
-Returns the starting @techlink{position} of the current selection. See also
- @method[text% get-position].
-
-}
-
-
-@defmethod[(get-styles-sticky)
-           boolean?]{
-
-In the normal mode for a text editor, style settings are sticky. With
- sticky styles, when a string or character is inserted into an editor,
- it gets the style of the snip preceding the insertion point (or the
- snip that includes the insertion point if text is inserted into an
- exiting string snip). Alternatively, if @method[text% change-style]
- is called to set the style at the caret @techlink{position} (when it
- is not a range), then the style is remembered; if the editor is not
- changed before text is inserted at the caret, then the text gets the
- remembered style.
-
-With non-sticky styles, text inserted into an editor always gets the
- style in the editor's style list named by @method[editor<%>
- default-style-name].
-
-See also @method[text% set-styles-sticky].
-
-}
-
-
-@defmethod[(get-tabs [length (or/c (box/c exact-nonnegative-integer?) #f) #f]
-                     [tab-width (or/c (box/c real?) #f) #f]
-                     [in-units (or/c (box/c any/c) #f) #f])
-           (listof real?)]{
-
-Returns the current tab-position array as a list.
-
-@boxisfillnull[@racket[length] @elem{the length of the tab array (and therefore the returned 
-list)}]
-@boxisfillnull[@racket[tab-width] @elem{the width used for tabs past the 
-end of the tab array}]
-@boxisfillnull[@racket[in-units] @elem{@racket[#t] if the tabs are specified in
-canvas units or @racket[#f] if they are specified in space-widths}]
-
-See also 
-@method[text% set-tabs].
-
-}
-
-
-@defmethod[(get-text [start exact-nonnegative-integer? 0]
-                     [end (or/c exact-nonnegative-integer? 'eof) 'eof]
-                     [flattened? any/c #f]
-                     [force-cr? any/c #f])
-           string?]{
-
-Gets the text from @racket[start] to @racket[end]. If @racket[end] is
- @racket['eof], then the contents are returned from @racket[start] until the
- end of the editor.
-
-If @racket[flattened?] is not @racket[#f], then flattened text is returned.
- See @|textdiscuss| for a discussion of flattened vs. non-flattened
- text.
-
-If @racket[force-cr?] is not @racket[#f] and @racket[flattened?] is not
- @racket[#f], then automatic newlines (from word-wrapping) are
- written into the return string as real newlines.
-
-}
-
-
-@defmethod[(get-top-line-base)
-           (and/c real? (not/c negative?))]{
-
-Returns the distance from the top of the editor to the alignment
- baseline of the top line. This method is primarily used when an
- editor is an @techlink{item} within another editor.
-The reported baseline distance includes the editor's
- top padding (see @method[text% set-padding]).
-
-@|OVD| @FCAME[]
-
-}
-
-
-@defmethod[(get-visible-line-range [start (or/c (box/c exact-nonnegative-integer?) #f)]
-                                   [end (or/c (box/c exact-nonnegative-integer?) #f)]
-                                   [all? any/c #t])
-           void?]{
-
-Returns the range of lines which are currently visible (or partially
- visible) to the user. @|LineNumbering|
-
-@boxisfillnull[@racket[start] @elem{first line visible to the user}]
-@boxisfillnull[@racket[end] @elem{last line visible to the user}]
-
-If the editor is displayed by multiple canvases and @racket[all?] is
- @racket[#t], then the computed range includes all visible lines in all
- @techlink{display}s. Otherwise, the range includes only the visible lines in the
- current @techlink{display}.
-
-@|OVD| @|FCA|
-
-}
-
-
-@defmethod[(get-visible-position-range [start (or/c (box/c exact-nonnegative-integer?) #f)]
-                                       [end (or/c (box/c exact-nonnegative-integer?) #f)]
-                                       [all? any/c #t])
-           void?]{
-
-Returns the range of @techlink{position}s that are currently visible (or
- partially visible) to the user.
-
-@boxisfillnull[@racket[start] @elem{first @techlink{position} visible to the user}]
-@boxisfillnull[@racket[end] @elem{last @techlink{position} visible to the user}]
-
-If the editor is displayed by multiple canvases and @racket[all?] is
- @racket[#t], then the computed range includes all visible @techlink{position}s in
- all @techlink{display}s. Otherwise, the range includes only the visible
- @techlink{position}s in the current @techlink{display}.
-
-@|OVD| @|FCA|
-
-}
-
-
-@defmethod[(get-wordbreak-map)
-           (or/c (is-a?/c editor-wordbreak-map%) #f)]{
-
-Returns the wordbreaking map that is used by the standard wordbreaking
- function. See @method[text% set-wordbreak-map] and 
- @racket[editor-wordbreak-map%] for more information.
-
-}
-
-
-@defmethod[(hide-caret [hide? any/c])
-           void?]{
-
-Determines whether the caret is shown when the editor has the keyboard
- focus.
-
-If @racket[hide?] is not @racket[#f], then the caret or selection hiliting
- will not be drawn for the editor. The editor can still own the
- keyboard focus, but no caret will be drawn to indicate the focus.
-
-See also @method[text% caret-hidden?] and @method[editor<%> lock].
-
-}
-
-
-@defmethod*[#:mode override 
-            ([(insert [str string?]
-                      [start exact-nonnegative-integer?]
-                      [end (or/c exact-nonnegative-integer? 'same) 'same]
-                      [scroll-ok? any/c #t])
-              void?]
-             [(insert [n (and/c exact-nonnegative-integer?
-                                (<=/c (string-length str)))]
-                      [str string?]
-                      [start exact-nonnegative-integer?]
-                      [end (or/c exact-nonnegative-integer? 'same) 'same]
-                      [scroll-ok? any/c #t])
-              void?]
-             [(insert [str string?])
-              void?]
-             [(insert [n (and/c exact-nonnegative-integer?
-                                (<=/c (string-length str)))]
-                      [str string?])
-              void?]
-             [(insert [snip (is-a?/c snip%)]
-                      [start exact-nonnegative-integer?]
-                      [end (or/c exact-nonnegative-integer? 'same) 'same]
-                      [scroll-ok? any/c #t])
-              void?]
-             [(insert [snip (is-a?/c snip%)])
-              void?]
-             [(insert [char char?])
-              void?]
-             [(insert [char char?]
-                      [start exact-nonnegative-integer?]
-                      [end (or/c exact-nonnegative-integer? 'same) 'same])
-              void?])]{
-
-Inserts text or a snip into @this-obj[] at @techlink{position}
- @racket[start].  If @racket[n] is provided, the only the first
- @racket[n] characters of @racket[str] are inserted. 
-
-When a @racket[snip] is provided: The snip cannot be inserted into
- multiple editors or multiple times within a single editor. As the
- snip is inserted, its current style is converted to one in the
- editor's style list; see also @method[style-list% convert].
-
-When a @racket[char] is provided: @|insertcharundos|
-
-When @racket[start] is not provided, the current selection start is
- used. If the current selection covers a range of @techlink{item}s,
- then @racket[char] replaces the selected text. The selection's start
- and end @techlink{position}s are moved to the end of the inserted
- character.
-
-For a case where @racket[end] is not provided and has no default, the
- current selection end is used. Otherwise, if @racket[end] is not
- @racket['same], then the inserted value replaces the region from
- @racket[start] to @racket[end], and the selection is left at the end
- of the inserted text. Otherwise, if the insertion @techlink{position}
- is before or equal to the selection's start/end @techlink{position},
- then the selection's start/end @techlink{position} is incremented by
- the length of @racket[str].
-
-If @racket[scroll-ok?] is not @racket[#f] and @racket[start] is the
- same as the current selection's start @techlink{position}, then the
- editor's @techlink{display} is scrolled to show the new selection
- @techlink{position}.
-
-See also @method[text% get-styles-sticky].
-
-}
-
-
-@defmethod*[#:mode override
-            ([(kill [time exact-integer? 0])
-              void?]
-             [(kill [time exact-integer?]
-                    [start exact-nonnegative-integer?]
-                    [end exact-nonnegative-integer?])
-              void?])]{
-
-Cuts the text in the given region. If @racket[start] and @racket[end]
- are not supplied, then the selected region plus all whitespace to the
- end of line is cut; the newline is also cut if only whitespace exists
- between the selection and the end of line.
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-
-
-@defmethod[(last-line)
-           exact-nonnegative-integer?]{
-
-Returns the number of the last line in the editor. Lines are numbered
- starting with @racket[0], so this is one less than the number of lines
- in the editor.
-
-@LineToPara[@racket[last-paragraph]]
-
-@|FCAMW| @|EVD|
-}
-
-
-@defmethod[(last-paragraph)
-           exact-nonnegative-integer?]{
-
-Returns the number of the last paragraph in the editor. Paragraphs are
- numbered starting with @racket[0], so this is one less than the
- number of paragraphs in the editor.
-
-@|FCAMW|
-
-}
-
-@defmethod[(last-position)
-           exact-nonnegative-integer?]{
-
-Returns the last selection @techlink{position} in the editor. This is
- also the number of @techlink{item}s in the editor.
-
-}
-
-@defmethod[(line-end-position [line exact-nonnegative-integer?]
-                              [visible? any/c #t])
-           exact-nonnegative-integer?]{
-
-Returns the last @techlink{position} of a given line. @|LineNumbering|
-
-If there are fewer than @math{@racket[line]-1} lines, the end of the
- last line is returned. If @racket[line] is less than 0, then the end
- of the first line is returned.
-
-If the line ends with @tech{invisible} @techlink{item}s (such as a
- newline) and @racket[visible?] is not @racket[#f], the first
- @techlink{position} before the @tech{invisible} @techlink{item}s is
- returned.
-
-@LineToPara[@racket[paragraph-end-position]]
-
-@|FCAMW| @|EVD|
-
-}
-
-
-@defmethod[(line-length [i exact-nonnegative-integer?])
-           exact-nonnegative-integer?]{
-
-Returns the number of @techlink{item}s in a given
-line. @|LineNumbering|
-
-@|FCAMW| @|EVD|
-
-}
-
-
-@defmethod[(line-location [line exact-nonnegative-integer?]
-                          [top? any/c #t])
-           real?]{
-
-Given a line number, returns the @techlink{location} of the line. @|LineNumbering|
-
-If @racket[top?] is not @racket[#f], the @techlink{location} for the
- top of the line is returned; otherwise, the @techlink{location} for
- the bottom of the line is returned.
-
-@LineToPara[@racket[paragraph-location]]
-
-@|OVD| @|FCA|
-
-}
-
-@defmethod[(line-paragraph [start exact-nonnegative-integer?])
-           exact-nonnegative-integer?]{
-
-Returns the paragraph number of the paragraph containing the line.
- @|LineNumbering| @|ParagraphNumbering|
-
-@|FCAMW| @|EVD|
-
-}
-
-@defmethod[(line-start-position [line exact-nonnegative-integer?]
-                                [visible? any/c #t])
-           exact-nonnegative-integer?]{
-
-Returns the first @techlink{position} of the given line. @|LineNumbering|
-
-If there are fewer than @math{@racket[line]-1} lines, the start of the
-last line is returned. If @racket[line] is less than 0, then
-the start of the first line is returned.
-
-If the line starts with @tech{invisible} @techlink{item}s and @racket[visible?] is not
- @racket[#f], the first @techlink{position} past the @tech{invisible} @techlink{item}s is
- returned.
-
-@LineToPara[@racket[paragraph-start-position]]
-
-@|FCAMW|
-
-To calculate lines, if the following are true:
-@itemize[
-
- @item{the editor is not displayed (see @secref["tb:miaoverview"]),}
-
- @item{a maximum width is set for the editor, and} 
-
- @item{the editor has never been viewed}
-
-]
-
-then this method ignores the editor's maximum width and any automatic
- line breaks it might imply.  If the first two of the above conditions
- are true and the editor was @italic{formerly} displayed, this method
- uses the line breaks from the most recent display of the
- editor. (Insertions or deletions since the display shift line breaks
- within the editor in the same way as @techlink{item}s.)
-
-}
-
-
-@defmethod[(move-position [code (or/c 'home 'end 'right 'left 'up 'down)]
-                          [extend? any/c #f]
-                          [kind (or/c 'simple 'word 'page 'line) 'simple])
-           void?]{
-
-Moves the current selection. 
-
-The possible values for @racket[code] are:
-
-@itemize[
-@item{@racket['home] --- go to start of file}
-@item{@racket['end] --- go to end of file}
-@item{@racket['right] --- move right}
-@item{@racket['left] --- move left}
-@item{@racket['up] --- move up}
-@item{@racket['down] --- move down}
-]
-
-If @racket[extend?] is not @racket[#f], the selection range is
- extended instead of moved.  If anchoring is on (see @method[text%
- get-anchor] and @method[text% set-anchor]), then @racket[extend?] is
- effectively forced to @racket[#t]. See also @method[text% get-extend-start-position]
- and @method[text% get-extend-end-position].
-
-The possible values for @racket[kind] are:
-
-@itemize[
-@item{@racket['simple] --- move one item or line}
-@item{@racket['word] --- works with @racket['right] or @racket['left]}
-@item{@racket['page] --- works with @racket['up] or @racket['down]}
-@item{@racket['line] --- works with @racket['right] or @racket['left]; moves to the start or end of the line}
-]
-
-See also @method[text% set-position].
-
-}
-
-
-@defmethod[#:mode pubment 
-           (on-change-style [start exact-nonnegative-integer?]
-                            [len exact-nonnegative-integer?])
-           void?]{
-
-@methspec{
-
-Called before the style is changed in a given range of the editor,
- after @method[text% can-change-style?] is called to verify that the
- change is ok. The @method[text% after-change-style] method is
- guaranteed to be called after the change has completed.
-
-The editor is internally locked for writing during a call to this method
- (see also @|lockdiscuss|). Use 
-@method[text% after-change-style] to modify the editor, if necessary.
-
-See also @method[editor<%> on-edit-sequence].
-
-}
-@methimpl{
-
-Does nothing.
-
-}
-}
-
-
-@defmethod[#:mode override 
-           (on-default-char [event (is-a?/c key-event%)])
-           void?]{
-
-Handles the following:
-
-@itemize[
-
- @item{Delete and Backspace --- calls @method[text% delete].} 
-
- @item{The arrow keys, Page Up, Page Down, Home, and End (including
-  shifted versions) --- moves the selection @techlink{position} with
-  @method[text% move-position].}
-
- @item{Any other character in the range @racket[(integer->char 32)] to
- @racket[(integer->char 255)] --- inserts the character into the
- editor.}
-
-]
-
-Note that an editor's @racket[editor-canvas%] normally handles mouse
- wheel events (see also @method[editor-canvas% on-char] ).
-
-}
-
-
-@defmethod[#:mode override 
-           (on-default-event [event (is-a?/c mouse-event%)])
-           void?]{
-
-Tracks clicks on a clickback (see @method[text% set-clickback]) of
- changes the selection. Note that @method[editor<%> on-event]
- dispatches to a caret-owning snip and detects a click on an
- event-handling snip before calling to this method.
-
-@itemize[
-
- @item{Clicking on a clickback region starts clickback tracking. See
- @method[text% set-clickback] for more information. Moving over a
- clickback changes the shape of the mouse cursor.}
-
- @item{Clicking anywhere else moves the caret to the closest @techlink{position}
- between @techlink{item}s. Shift-clicking extends the current selection.}
-
- @item{Dragging extends the selection, scrolling if possible when the
- selection is dragged outside the editor's visible region.}
-
-]
-}
-
-
-@defmethod[#:mode pubment 
-           (on-delete [start exact-nonnegative-integer?]
-                      [len exact-nonnegative-integer?])
-           void?]{
-@methspec{
-
-Called before a range is deleted from the editor, after @method[text%
- can-delete?] is called to verify that the deletion is ok. The
- @method[text% after-delete] method is guaranteed to be called after
- the delete has completed.
-
-The @racket[start] argument specifies the starting @techlink{position}
- of the range to delete. The @racket[len] argument specifies number of
- @techlink{item}s to delete (so @math{@racket[start]+@racket[len]} is
- the ending @techlink{position} of the range to delete).
-
-The editor is internally locked for writing during a call to this
- method (see also @|lockdiscuss|). Use @method[text% after-delete] to
- modify the editor, if necessary.
-
-See also @method[editor<%> on-edit-sequence].
-
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (on-insert [start exact-nonnegative-integer?]
-                      [len exact-nonnegative-integer?])
-           void?]{
-@methspec{
-
-Called before @techlink{item}s are inserted into the editor, after
- @method[text% can-insert?] is called to verify that the insertion is
- ok. The @method[text% after-insert] method is guaranteed to be called
- after the insert has completed.
-
-The @racket[start] argument specifies the @techlink{position} of the insert. The
- @racket[len] argument specifies the total length (in @techlink{position}s) of the
- @techlink{item}s to be inserted.
-
-The editor is internally locked for writing during a call to this
- method (see also @|lockdiscuss|). Use @method[text% after-insert] to
- modify the editor, if necessary.
-
-See also @method[editor<%> on-edit-sequence].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(on-new-string-snip)
-           (is-a?/c string-snip%)]{
-
-@methspec{
-
-Called by @method[text% insert] when a string or character is inserted
-into the editor, this method creates and returns a new instance of
-@racket[string-snip%] to store inserted text. The returned string snip
-is empty (i.e., its @techlink{count} is zero).
-
-}
-@methimpl{
-
-Returns a @racket[string-snip%] instance.
-
-}}
-
-@defmethod[(on-new-tab-snip)
-           (is-a?/c tab-snip%)]{
-
-@methspec{
-
-Creates and returns a new instance of @racket[tab-snip%] to store an
- inserted tab. The returned tab snip is empty (i.e., its @techlink{count}
- is zero).
-
-}
-@methimpl{
-
-Returns a @racket[tab-snip%] instance.
-
-}}
-
-
-@defmethod[#:mode pubment 
-           (on-reflow)
-           void?]{
-
-@methspec{
-Called after @tech{locations} have changed and are recomputed for the editor.
-}
-@methimpl{
-
-Does nothing.
-}}
-
-@defmethod[#:mode pubment 
-           (on-set-size-constraint)
-           void?]{
-
-@methspec{
-
-Called before the editor's maximum or minimum height or width is
- changed, after @method[text% can-set-size-constraint?] is called to
- verify that the change is ok. The @method[text%
- after-set-size-constraint] method is guaranteed to be called after
- the change has completed.
-
-(This callback method is provided because setting an editor's maximum
- width may cause lines to be re-flowed with soft newlines.)
-
-See also @method[editor<%> on-edit-sequence].
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(paragraph-end-line [paragraph exact-nonnegative-integer?])
-           exact-nonnegative-integer?]{
-
-Returns the ending line of a given paragraph. @|ParagraphNumbering| @|LineNumbering|
-
-@|FCAMW| @|EVD|
-
-}
-
-
-@defmethod[(paragraph-end-position [paragraph exact-nonnegative-integer?]
-                                   [visible? any/c #t])
-           exact-nonnegative-integer?]{
-
-Returns the ending @techlink{position} of a given paragraph. @|ParagraphNumbering|
-
-If there are fewer than @math{@racket[paragraph]-1} paragraphs, the
- end of the last paragraph is returned. If @racket[paragraph] is less
- than 0, then the end of the first paragraph is returned.
-
-If the paragraph ends with @tech{invisible} @techlink{item}s (such as a newline)
- and @racket[visible?] is not @racket[#f], the first @techlink{position}
- before the @tech{invisible} @techlink{item}s is returned.
-
-}
-
-
-@defmethod[(paragraph-start-line [paragraph exact-nonnegative-integer?])
-           exact-nonnegative-integer?]{
-
-Returns the starting line of a given paragraph. If @racket[paragraph]
-is greater than the highest-numbered paragraph, then the editor's end
-@tech{position} is returned. @|ParagraphNumbering| @|LineNumbering|
-
-@|FCAMW| @|EVD|
-
-}
-
-
-@defmethod[(paragraph-start-position [paragraph exact-nonnegative-integer?]
-                                     [visible? any/c #t])
-           exact-nonnegative-integer?]{
-
-Returns the starting @techlink{position} of a given paragraph. @|ParagraphNumbering|
-
-If there are fewer than @math{@racket[paragraph]-1} paragraphs, the
- start of the last paragraph is returned.
-
-If the paragraph starts with @tech{invisible} @techlink{item}s and @racket[visible?] is
- not @racket[#f], the first @techlink{position} past the @tech{invisible} @techlink{item}s is
- returned.
-
-}
-
-
-@defmethod[#:mode override
-           (paste [time exact-integer? 0]
-                  [start (or/c exact-nonnegative-integer? 'start 'end) 'start]
-                  [end (or/c exact-nonnegative-integer? 'same) 'same])
-           void?]{
-
-Pastes into the specified range. If @racket[start] is @racket['start],
- then the current selection start @techlink{position} is used. If
- @racket[start] is @racket['end], then the current selection end
- @techlink{position} is used. If @racket[end] is @racket['same], then
- @racket[start] is used for @racket[end], unless @racket[start] is
- @racket['start], in which case the current selection end
- @techlink{position} is used.
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-
-
-@defmethod[(paste-next)
-           void?]{
-
-Editors collectively maintain a copy ring that holds up to 30 previous
- copies (and cuts) among the editors. When it is called as the next
- method on an editor after a paste, the @method[text% paste-next]
- method replaces the text from a previous paste with the next data in
- the copy ring, incrementing the ring pointer so that the next
- @method[text% paste-next] pastes in even older data.
-
-It is a copy ``ring'' because the ring pointer wraps back to the most
- recent copied data after the oldest remembered data is pasted. Any
- cut, copy, or (regular) paste operation resets the copy ring pointer
- back to the beginning.
-
-If the previous operation on the editor was not a paste, calling
- @method[text% paste-next] has no effect.
-
-}
-
-
-@defmethod[#:mode override
-           (paste-x-selection [time exact-integer? 0]
-                              [start (or/c exact-nonnegative-integer? 'start 'end) 'start]
-                              [end (or/c exact-nonnegative-integer? 'same) 'same])
-           void?]{
-
-Pastes into the specified range. If @racket[start] is @racket['start],
- then the current selection start @techlink{position} is used. If
- @racket[start] is @racket['end], then the current selection end
- @techlink{position} is used. If @racket[end] is @racket['same], then
- @racket[start] is used for @racket[end], unless @racket[start] is
- @racket['start], in which case the current selection end
- @techlink{position} is used.
-
-See @|timediscuss| for a discussion of the @racket[time] argument. If
- @racket[time] is outside the platform-specific range of times,
- @|MismatchExn|.
-
-}
-
-@defmethod[(position-line [start exact-nonnegative-integer?]
-                          [at-eol? any/c #f])
-           exact-nonnegative-integer?]{
-
-Returns the line number of the line containing a given @techlink{position}. @|LineNumbering|
-
-@LineToPara[@racket[position-paragraph]]
-
-See @|ateoldiscuss| for a discussion of @racket[at-eol?].
-
-@|FCAMW| @|EVD|
-
-}
-
-
-@defmethod[(position-location [start exact-nonnegative-integer?]
-                              [x (or/c (box/c real?) #f) #f]
-                              [y (or/c (box/c real?) #f) #f]
-                              [top? any/c #t]
-                              [at-eol? any/c #f]
-                              [whole-line? any/c #f])
-           void?]{
-
-Returns the @techlink{location} of a given @techlink{position}. See also @method[text% position-locations].
-
-@boxisfillnull[@racket[x] @elem{the x-@techlink{location} of the @techlink{position} @racket[start] in editor
-coordinates} ]
-@boxisfillnull[@racket[y] @elem{the y-@techlink{location} (top or bottom; see below) of the
-@techlink{position} @racket[start] in editor coordinates}]
-
-See @|ateoldiscuss| for a discussion of @racket[at-eol?].
-
-If @racket[top?] is not @racket[#f], the top coordinate of the @techlink{location}
-is returned, otherwise the bottom coordinate of the
-@techlink{location} is returned.
-
-The top @racket[y] @techlink{location} may be different for different @techlink{position}s
-within a line when different-sized graphic objects are used. If
-@racket[whole-line?] is not @racket[#f], the minimum top @techlink{location} or
-maximum bottom @techlink{location} for the whole line is returned in @racket[y].
-
-@|OVD| @|FCA|
-
-}
-
-
-@defmethod[(position-locations [start exact-nonnegative-integer?]
-                               [top-x (or/c (box/c real?) #f) #f]
-                               [top-y (or/c (box/c real?) #f) #f]
-                               [bottom-x (or/c (box/c real?) #f) #f]
-                               [bottom-y (or/c (box/c real?) #f) #f]
-                               [at-eol? any/c #f]
-                               [whole-line? any/c #f])
-           void?]{
-
-Like @method[text% position-location], but returns both the ``top''
-and ``bottom'' results at once.
-
-@|OVD| @|FCA|
-
-}
-
-@defmethod[(position-paragraph [start exact-nonnegative-integer?]
-                               [at-eol? any/c #f])
-           exact-nonnegative-integer?]{
-
-See @|ateoldiscuss| for a discussion of @racket[at-eol?].
-
-Returns the paragraph number of the paragraph containing a given @techlink{position}.
-
-}
-
-
-@defmethod*[#:mode extend
-            ([(read-from-file [stream (is-a?/c editor-stream-in%)]
-                              [start (or/c exact-nonnegative-integer? 'start)]
-                              [overwrite-styles? any/c #f])
-              boolean?]
-             [(read-from-file [stream (is-a?/c editor-stream-in%)]
-                              [overwrite-styles? any/c #f])
-              boolean?])]{
-
-New data is inserted at the @techlink{position} indicated by @racket[start], or at
- the current @techlink{position} if @racket[start] is @racket['start].
-
-}
-
-
-@defmethod[(remove-clickback [start exact-nonnegative-integer?]
-                             [end exact-nonnegative-integer?])
-           void?]{
-
-Removes all clickbacks installed for exactly the range @racket[start]
- to @racket[end]. See also @|clickbackdiscuss|.
-
-}
-
-
-@defmethod[(scroll-to-position [start exact-nonnegative-integer?]
-                               [at-eol? any/c #f]
-                               [end (or/c exact-nonnegative-integer? 'same) 'same]
-                               [bias (or/c 'start 'end 'none) 'none])
-           boolean?]{
-
-Scrolls the editor so that a given @techlink{position} is visible. 
-
-If @racket[end] is @racket['same] or equal to @racket[start], then @techlink{position}
- @racket[start] is made visible.  See @|ateoldiscuss| for a discussion of
- @racket[at-eol?].
-
-If @racket[end] is not @racket['same] and not the same as @racket[start],
- then the range @racket[start] to @racket[end] is made visible and
- @racket[at-eol?] is ignored.
-
-When the specified range cannot fit in the visible area, @racket[bias]
- indicates which end of the range to display. When @racket[bias] is
- @racket['start], then the start of the range is displayed. When
- @racket[bias] is @racket['end], then the end of the range is
- displayed. Otherwise, @racket[bias] must be @racket['none].
-
-If the editor is scrolled, then the editor is redrawn and the return
- value is @racket[#t]; otherwise, the return value is @racket[#f].  If
- refreshing is delayed (see @method[editor<%> refresh-delayed?]), then
- the scroll request is saved until the delay has ended. The scroll is
- performed (immediately or later) by calling @method[editor<%>
- scroll-editor-to].
-
-Scrolling is disallowed when the editor is internally locked for
- reflowing (see also @|lockdiscuss|).
-
-The system may scroll the editor without calling this method. For
- example, a canvas displaying an editor might scroll the editor to
- handle a scrollbar event.
-
-}
-
-
-@defmethod[(set-anchor [on? any/c])
-           void?]{
-
-Turns anchoring on or off. This method can be overridden to affect or
- detect changes in the anchor state. See also
- @method[text% get-anchor].
-
-If @racket[on?] is not @racket[#f], then the selection will be
- automatically extended when cursor keys are used (or, more generally,
- when @method[text% move-position] is used to move the selection or the
- @racket[_keep-anchor?] argument to @method[text% set-position] is a true value),
- otherwise anchoring is turned off. Anchoring is automatically turned
- off if the user does anything besides cursor movements.
-
-}
-
-
-@defmethod[(set-autowrap-bitmap [bitmap (or/c (is-a?/c bitmap%) #f)])
-           (or/c (is-a?/c bitmap%) #f)]{
-
-Sets the bitmap that is drawn at the end of a line when it is
- automatically line-wrapped.
-
-If @racket[bitmap] is @racket[#f], no autowrap indicator is drawn
- (this is the default). The previously used bitmap (possibly
- @racket[#f]) is returned.
-
-Setting the bitmap is disallowed when the editor is internally locked
- for reflowing (see also @|lockdiscuss|).
-
-}
-
-
-@defmethod[(set-between-threshold [threshold (and/c real? (not/c negative?))])
-           void?]{
-
-Sets the graphical distance used to determine the meaning of a user
- click. If a click falls within @racket[threshold] of a position
- between two @techlink{item}s, then the click registers on the space
- between the @techlink{item}s rather than on either @techlink{item}.
-
-See also 
-@method[text% get-between-threshold].
-
-}
-
-
-@defmethod[(set-clickback [start exact-nonnegative-integer?]
-                          [end exact-nonnegative-integer?]
-                          [f (-> (is-a?/c text%) 
-                                 exact-nonnegative-integer?
-                                 exact-nonnegative-integer?
-                                 any)]
-                          [hilite-delta (or/c (is-a?/c style-delta%) #f) #f]
-                          [call-on-down? any/c #f])
-           void?]{
-
-Installs a clickback for a given region. If a clickback is already
- installed for an overlapping region, this clickback takes precedence.
-
-The callback procedure @racket[f] is called when the user selects the
- clickback. The arguments to @racket[f] are this editor and the starting
- and ending range of the clickback.
-
-The @racket[hilite-delta] style delta is applied to the clickback text
- when the user has clicked and is still holding the mouse over the
- clickback. If @racket[hilite-delta] is @racket[#f], then the clickback
- region's style is not changed when it is being selected.
-
-If @racket[call-on-down?] is not @racket[#f], the clickback is called
- immediately when the user clicks the mouse button down, instead of
- after a mouse-up event. The @racket[hilite-delta] argument is not used
- in this case.
-
-See also @|clickbackdiscuss|.
- }
-
-@defmethod[(set-file-format [format (or/c 'standard 'text 'text-force-cr)])
-           void?]{
-
-Set the format of the file saved from this editor. 
-
-The legal formats are:
-
-@itemize[
-@item{@racket['standard] ---  a standard editor  file}
-@item{@racket['text] --- a text file}
-@item{@racket['text-force-cr] --- a text file; when writing, change 
-automatic newlines (from word-wrapping) into real newlines}
-]
-
-@MonitorMethod[@elem{The file format of an editor} @elem{the
- system in response to file loading and saving
- method calls} @elem{@method[editor<%> on-load-file] and
- @method[editor<%> on-save-file]} @elem{such file format}]
-}
-
-
-@defmethod[(set-line-spacing [space (and/c real? (not/c negative?))])
-           void?]{
-
-Sets the spacing inserted by the editor between each line. This
- spacing is included in the reported height of each line.
-
-}
-
-@defmethod[(set-overwrite-mode [on? any/c])
-           void?]{
-
-Enables or disables overwrite mode. See @method[text%
- get-overwrite-mode]. This method can be overridden to affect or
- detect changes in the overwrite mode.
-
-}
-
-@defmethod[(set-padding [left (and/c real? (not/c negative?))]
-                        [top (and/c real? (not/c negative?))]
-                        [right (and/c real? (not/c negative?))]
-                        [bottom (and/c real? (not/c negative?))])
-           void?]{
-
-Sets padding that insets the editor's content when drawn within its
-@techlink{display}.
-
-Unlike any margin that may be applied by the editor's
-@techlink{display}, padding is counted in @techlink{location}
-information that is reported by methods such as @method[text%
-position-location]. For example, with a @racket[left] padding of 17.0
-and a @racket[top] padding of 9.0, the location of position 0 will be
-(17.0, 9.0) rather than (0, 0). Padding also contributes to the
-editor's size as reported by @method[editor<%> get-extent].}
-
-
-@defmethod[(set-paragraph-alignment [paragraph exact-nonnegative-integer?]
-                                    [alignment (or/c 'left 'center 'right)])
-           void?]{
-
-Sets a paragraph-specific horizontal alignment. The alignment is only
- used when the editor has a maximum width, as set with
- @method[editor<%> set-max-width]. @|ParagraphNumbering|
-
-@italic{This method is experimental.} It works reliably only when the
- paragraph is not merged or split. Merging or splitting a paragraph
- with alignment settings causes the settings to be transferred
- unpredictably (although other paragraphs in the editor can be safely
- split or merged). If the last paragraph in an editor is empty,
- settings assigned to it are ignored.
-
-}
-
-
-@defmethod[(set-paragraph-margins [paragraph exact-nonnegative-integer?]
-                                  [first-left (and/c real? (not/c negative?))]
-                                  [left (and/c real? (not/c negative?))]
-                                  [right (and/c real? (not/c negative?))])
-           void?]{
-
-Sets a paragraph-specific margin. @|ParagraphNumbering|
-
-The first line of the paragraph is indented by @racket[first-left] points
- within the editor. If the paragraph is line-wrapped (when the editor
- has a maximum width), subsequent lines are indented by @racket[left]
- points.  If the editor has a maximum width, the paragraph's maximum
- width for line-wrapping is @racket[right] points smaller than the
- editor's maximum width.
-
-@italic{This method is experimental.} See @method[text%
- set-paragraph-alignment] for more information.
-
-}
-
-
-@defmethod[(set-position [start exact-nonnegative-integer?]
-                         [end (or/c exact-nonnegative-integer? 'same) 'same]
-                         [at-eol? any/c #f]
-                         [scroll? any/c #t]
-                         [seltype (or/c 'default 'x 'local) 'default])
-           void?]{
-
-Sets the current selection in the editor. 
-
-If @racket[end] is @racket['same] or less than or equal to @racket[start],
- the current start and end @techlink{position}s are both set to
- @racket[start]. Otherwise the given range is selected.
-
-See @|ateoldiscuss| for a discussion of @racket[at-eol?]. If
- @racket[scroll?]  is not @racket[#f], then the @techlink{display} is
- scrolled to show the selection if necessary.
-
-The @racket[seltype] argument is only used when the X Window System
- selection mechanism is enabled. The possible values are:
-@itemize[
-
- @item{@racket['default] --- if this window has the keyboard focus
- and given selection is non-empty, make it the current X selection}
-
- @item{@racket['x] --- if the given selection is non-empty, make
- it the current X selection}
-
- @item{@racket['local] --- do not change the
- current X selection}
-
-]
-
-Setting the @techlink{position} is disallowed when the editor is internally
- locked for reflowing (see also @|lockdiscuss|).
-
-The system may change the selection in an editor without calling this
- method (or any visible method).
-
-See also @racket[editor-set-x-selection-mode].
-
-}
-
-@defmethod[(set-position-bias-scroll [bias (or/c 'start-only 'start 'none 'end 'end-only)]
-                                     [start exact-nonnegative-integer?]
-                                     [end (or/c exact-nonnegative-integer? 'same) 'same]
-                                     [ateol? any/c #f]
-                                     [scroll? any/c #t]
-                                     [seltype (or/c 'default 'x 'local) 'default])
-           void?]{
-
-Like  @method[text% set-position], but a scrolling bias can be specified.
-
-The possible values for @racket[bias] are:
-@itemize[
-@item{@racket['start-only] --- only insure that the starting @techlink{position} is visible}
-@item{@racket['start] --- if the range doesn't fit in the visible area, show the starting @techlink{position}}
-@item{@racket['none] --- no special scrolling instructions}
-@item{@racket['end] --- if the range doesn't fit in the visible area, show the ending @techlink{position}}
-@item{@racket['end-only] --- only insure that the ending @techlink{position} is visible}
-]
-
-See also @method[text% scroll-to-position].
-
-}
-
-
-@defmethod[(set-region-data [start exact-nonnegative-integer?]
-                            [end exact-nonnegative-integer?]
-                            [data (is-a?/c editor-data%)])
-           void?]{
-
-@methspec{
-
-Sets extra data associated with a given region. See
- @|editordatadiscuss| and @method[text% get-region-data] for more
- information.
-
-This method is meant to be overridden in combination with
- @method[text% get-region-data] .
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(set-styles-sticky [sticky? any/c])
-           void?]{
-
-See @method[text% get-styles-sticky] for information about sticky
- styles.
-
-}
-
-
-@defmethod[(set-tabs [tabs (listof real?)]
-                     [tab-width real? 20]
-                     [in-units? any/c #t])
-           void?]{
-
-Sets the tabbing array for the editor.
-
-The @racket[tabs] list determines the tabbing array. The tabbing array
- specifies the x-@techlink{location}s where each tab occurs. Tabs beyond the last
- specified tab are separated by a fixed amount @racket[tab-width].  If
- @racket[in-units?] is not @racket[#f], then tabs are specified in canvas
- units; otherwise, they are specified as a number of spaces. (If tabs
- are specified in spaces, then the graphic tab positions will change
- with the font used for the tab.)
-
-Setting tabs is disallowed when the editor is internally locked for
- reflowing (see also @|lockdiscuss|).
-
-}
-
-
-@defmethod[(set-wordbreak-func [f ((is-a?/c text%) (or/c (box/c exact-nonnegative-integer?) #f)
-                                                   (or/c (box/c exact-nonnegative-integer?) #f)
-                                                   symbol?
-                                   . -> . any)])
-           void?]{
-
-Sets the word-breaking function for the editor.  For information about
- the arguments to the word-breaking function, see @method[text%
- find-wordbreak].
-
-The standard wordbreaking function uses the editor's
- @racket[editor-wordbreak-map%] object to determine which characters
- break a word. See also @racket[editor-wordbreak-map%] and
- @method[text% set-wordbreak-map].
-
-Since the wordbreak function will be called when line breaks are being
- determined (in an editor that has a maximum width), there is a
- constrained set of @racket[text%] methods that the wordbreak
- function is allowed to invoke. It cannot invoke a member function
- that uses information about @techlink{location}s or lines (which are
- identified in this manual with ``@|OVD|''), but it can still invoke
- member functions that work with snips and @techlink{item}s.
-
-}
-
-
-@defmethod[(set-wordbreak-map [map (or/c (is-a?/c editor-wordbreak-map%) #f)])
-           void?]{
-
-Sets the wordbreaking map that is used by the standard wordbreaking
- function. See @racket[editor-wordbreak-map%] for more information.
-
-If @racket[map] is @racket[#f], then the standard map
- (@racket[the-editor-wordbreak-map]) is used.
-
-}
-
-
-@defmethod[(split-snip [pos exact-nonnegative-integer?])
-           void?]{
-
-Given a @techlink{position}, splits the snip that includes the
- @techlink{position} (if any) so that the @techlink{position} is
- between two snips. The snip may refuse to split, although none of the
- built-in snip classes will ever refuse.
-
-Splitting a snip is disallowed when the editor is internally locked
- for reflowing (see also @|lockdiscuss|).
-
-}
-
-
-@defmethod[#:mode extend
-           (write-to-file [stream (is-a?/c editor-stream-out%)]
-                          [start exact-nonnegative-integer? 0]
-                          [end (or/c exact-nonnegative-integer? 'eof) 'eof])
-           boolean?]{
-
-If @racket[start] is 0 and @racket[end] is @racket['eof] negative,
- then the entire contents are written to the stream. If @racket[end]
- is @racket['eof], then the contents are written from @racket[start]
- until the end of the editor. Otherwise, the contents of the given
- range are written.
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/text-field-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/text-field-class.scrbl
deleted file mode 100644
index 993aaeb96e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/text-field-class.scrbl
+++ /dev/null
@@ -1,148 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@centered{@image[#:suffixes @list[".png"]]{image/text-field}}
-
-@defclass/title[text-field% object% (control<%>)]{
-
-A @racket[text-field%] object is an editable text field with an
- optional label displayed in front of it. There are two text field
- styles:
-
-@itemize[
-
- @item{A single line of text is visible, and a special control event
- is generated when the user presses Return or Enter (when the text field has the
- focus) and the event is not handled by the text field's frame or
- dialog (see @xmethod[top-level-window<%> on-traverse-char] ).}
-
- @item{Multiple lines of text are visible, and Enter is not handled
- specially.}
-
-]
-
-Whenever the user changes the content of a text field, its callback
- procedure is invoked. A callback procedure is provided as an
- initialization argument when each text field is created.
-
-The text field is implemented using a @racket[text%] editor (with an
- inaccessible display). Thus, whereas @racket[text-field%] provides
- only @method[text-field% get-value] and @method[text-field%
- set-value] to manipulate the text in a text field, the
- @method[text-field% get-editor] returns the field's editor, which
- provides a vast collection of methods for more sophisticated
- operations on the text.
-
-The keymap for the text field's editor is initialized by calling the
- current keymap initializer procedure, which is determined by the
- @racket[current-text-keymap-initializer] parameter.
-
-
-@defconstructor[([label (or/c label-string? #f)]
-                 [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [callback ((is-a?/c text-field%) (is-a?/c control-event%) 
-                            . -> . any) 
-                           (lambda (t e) (void))]
-                 [init-value string? ""]
-                 [style (listof (or/c 'single 'multiple 'hscroll 'password 
-                                      'vertical-label 'horizontal-label 
-                                      'deleted)) 
-                        '(single)]
-                 [font (is-a?/c font%) normal-control-font]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 2]
-                 [horiz-margin spacing-integer? 2]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c (memq 'multiple style)])]{
-
-If @racket[label] is not @racket[#f], it is used as the text field
- label.  Otherwise, the text field does not display its label.
-
-@labelstripped[@racket[label] @elem{} @elem{move the keyboard focus to the text field}]
-
-The @racket[callback] procedure is called when the user changes the
- text in the text field or presses the Enter key (and Enter is not
- handled by the text field's frame or dialog; see
- @xmethod[top-level-window<%> on-traverse-char]). If the user presses
- Enter, the type of event passed to the callback is
- @indexed-racket['text-field-enter], otherwise it is
- @indexed-racket['text-field].
-
-If @racket[init-value] is not @racket[""], the @tech{graphical minimum size} for the
- text item is made wide enough to show @racket[init-value]. Otherwise,
- a built-in default width is selected. For a text field in single-line
- mode, the @tech{graphical minimum size} is set to show one line, and only the
- control's width is stretchable by default. For a multiple-line text field, the
- @tech{graphical minimum size} shows three lines of text, and it is stretchable in both
- directions by default.
-
-The style must contain exactly one of @racket['single] or
- @racket['multiple]; the former specifies a single-line field and the
- latter specifies a multiple-line field. The @racket['hscroll] style
- applies only to multiple-line fields; when @racket['hscroll] is
- specified, the field has a horizontal scrollbar and autowrapping is
- disabled; otherwise, the field has no horizontal scrollbar and
- autowrapping is enabled. A multiple-line text field always has a
- vertical scrollbar. The @racket['password] style indicates that the
- field should draw each character of its content using a generic
- symbol instead of the actual character.  @HVLabelNote[@racket[style]]{text field}
- @DeletedStyleNote[@racket[style] @racket[parent]]{text field}.
-
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
-
-}
-
-
-@defmethod[(get-editor)
-           (is-a?/c text%)]{
-
-Returns the editor used to implement the text field.
-
-For a text field, the most useful methods of a @racket[text%] object
- are the following:
-@itemize[
- 
- @item{@racket[(send a-text @#,method[text% get-text])] returns
- the current text of the editor.}
-
- @item{@racket[(send a-text @#,method[text% erase])] deletes all text from
- the editor.}
-
- @item{@racket[(send a-text @#,method[text% insert] _str)] inserts
- @racket[_str] into the editor at the current caret position.}
-
-]
-}
-
-
-@defmethod[(get-field-background) (is-a?/c color%)]{
-
-Gets the background color of the field's editable area.}
-
-
-@defmethod[(get-value)
-           string?]{
-
-Returns the text currently in the text field.
-
-}
-
-
-@defmethod[(set-field-background [color (is-a?/c color%)])
-           void?]{
-
-Sets the background color of the field's editable area.}
-
-
-@defmethod[(set-value [val string?])
-           void?]{
-
-Sets the text currently in the text field. (The control's callback
- procedure is @italic{not} invoked.)
-
-@MonitorCallback[@elem{A text field's value} @elem{the user typing into the control} @elem{value}]
-
-}}
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/timer-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/timer-class.scrbl
deleted file mode 100644
index 05c49fff33..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/timer-class.scrbl
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[timer% object% ()]{
-
-A @racket[timer%] object encapsulates an event-based alarm. To use a
- timer, either instantiate it with a @racket[timer-callback] thunk to
- perform the alarm-based action, or derive a new class and override
- the @method[timer% notify] method to perform the alarm-based
- action. Start a timer with @method[timer% start] and stop it with
- @method[timer% stop]. Supplying an initial @racket[interval] (in
- milliseconds) when creating a timer also starts the timer.
-
-Timers have a relatively high priority in the event queue. Thus, if
- the timer delay is set low enough, repeated notification for a timer
- can preempt user activities (which might be directed at stopping the
- timer). For timers with relatively short delays, call @racket[yield]
- within the @method[timer% notify] procedure to allow guaranteed event
- processing.
-
-See @secref["eventspaceinfo"] for more information about event
- priorities.
-
-
-@defconstructor[([notify-callback (-> any) void]
-                 [interval (or/c (integer-in 0 1000000000) #f) #f]
-                 [just-once? any/c #f])]{
-
-The @racket[notify-callback] thunk is called by the default
-@method[timer% notify] method when the timer expires.
-
-If @racket[interval] is @racket[#f] (the default), the timer is not
- started; in that case, @method[timer% start] must be called
- explicitly. If @racket[interval] is a number (in milliseconds), then
- @method[timer% start] is called with @racket[interval] and
- @racket[just-once?].
-
-}
-
-
-@defmethod[(interval)
-           (integer-in 0 1000000000)]{
-
-Returns the number of milliseconds between each timer expiration (when
- the timer is running).
-
-}
-
-@defmethod[(notify)
-           void?]{
-
-@methspec{
-
-Called (on an event boundary) when the timer's alarm expires.
-
-}
-@methimpl{
-
-Calls the @racket[notify-callback] procedure that was provided when the
- object was created.
-
-}}
-
-@defmethod[(start [msec (integer-in 0 1000000000)]
-                  [just-once? any/c #f])
-           void?]{
-
-Starts (or restarts) the timer. If the timer is already running, its
- alarm time is not changed.
-
-The timer's alarm expires after @racket[msec] milliseconds, at which
-point @method[timer% notify] is called (on an event boundary). If
-@racket[just-once?] is @racket[#f], the timer expires @italic{every}
-@racket[msec] milliseconds until the timer is explicitly
-stopped. (More precisely, the timer expires @racket[msec]
-milliseconds after @method[timer% notify] returns each time.)
-Otherwise, the timer expires only once.
-
-}
-
-@defmethod[(stop)
-           void?]{
-
-Stops the timer. A stopped timer never calls
-@method[timer% notify]. If the timer has expired but the call to
-@method[timer% notify] has not yet been dispatched, the call is removed from the event queue.
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/top-level-window-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/top-level-window-intf.scrbl
deleted file mode 100644
index 0762cfecf6..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/top-level-window-intf.scrbl
+++ /dev/null
@@ -1,381 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@definterface/title[top-level-window<%> (area-container-window<%>)]{
-
-A top-level window is either a @racket[frame%] or @racket[dialog%]
- object.
-
-@defmethod[#:mode pubment 
-           (can-close?)
-           boolean?]{
-
-Called just before the window might be closed (e.g., by the window
- manager). If @racket[#f] is returned, the window is not closed,
- otherwise @method[top-level-window<%> on-close] is called and the
- window is closed (i.e., the window is hidden, like calling
- @method[window<%> show] with @racket[#f]).
-
-This method is @italic{not} called by @method[window<%> show].
-}
-
-@defmethod[(can-exit?)
-           boolean?]{
-@methspec{
-
-Called before @method[top-level-window<%> on-exit] to check whether an
-exit is allowed. See @method[top-level-window<%> on-exit] for more
-information.
-
-}
-@methimpl{
-
-Calls @method[top-level-window<%> can-close?] and returns the result.
-
-}}
-
-@defmethod[(center [direction (or/c 'horizontal 'vertical 'both) 'both])
-           void?]{
-
-Centers the window on the screen if it has no parent. If it has a
- parent, the window is centered with respect to its parent's location.
-
-If @racket[direction] is @racket['horizontal], the window is centered
- horizontally.  If @racket[direction] is @racket['vertical], the
- window is centered vertically.  If @racket[direction] is
- @racket['both], the window is centered in both directions.
-
-}
-
-@defmethod[(get-edit-target-object)
-           (or/c (or/c (is-a?/c window<%>) (is-a?/c editor<%>)) #f)]{
-
-@index['("keyboard focus" "last active")]{Like}
- @method[top-level-window<%> get-edit-target-window], but if an editor
- canvas had the focus and it also displays an editor, the editor is
- returned instead of the canvas. Further, if the editor's focus is
- delegated to an embedded editor, the embedded editor is returned.
-
-See also @method[top-level-window<%> get-focus-object].
-
-}
-
-@defmethod[(get-edit-target-window)
-           (or/c (is-a?/c window<%>) #f)]{
-
-@index['("keyboard focus" "last active")]{Returns} the window that
-most recently had the keyboard focus, either the top-level window or
-one of its currently-shown children. If neither the window nor any of
-its currently-shown children has even owned the keyboard focus,
-@racket[#f] is returned.
-
-See also @method[top-level-window<%> get-focus-window] and
-@method[top-level-window<%> get-edit-target-object].
-
-}
-
-@defmethod[(get-eventspace)
-           eventspace?]{
-Returns the window's eventspace.
-
-}
-
-@defmethod[(get-focus-object)
-           (or/c (or/c (is-a?/c window<%>) (is-a?/c editor<%>)) #f)]{
-
-@index["keyboard focus"]{Like} @method[top-level-window<%>
-get-focus-window], but if an editor canvas has the focus and it also
-displays an editor, the editor is returned instead of the
-canvas. Further, if the editor's focus is delegated to an embedded
-editor, the embedded editor is returned.
-
-See also @method[top-level-window<%> get-edit-target-object].
-
-}
-
-@defmethod[(get-focus-window)
-           (or/c (is-a?/c window<%>) #f)]{
-
-@index["keyboard focus"]{Returns} the window that has the keyboard
- focus, either the top-level window or one of its children. If neither
- the window nor any of its children has the focus, @racket[#f] is
- returned.
-
-See also @method[top-level-window<%> get-edit-target-window] and
-@method[top-level-window<%> get-focus-object].
-
-}
-
-
-@defmethod[(move [x position-integer?]
-                 [y position-integer?])
-           void?]{
-
-Moves the window to the given position on the screen.
-
-@MonitorMethod[@elem{A window's position} @elem{the user dragging the window} @elem{@method[window<%> on-move]} @elem{position}]
-
-}
-
-
-@defmethod[(on-activate [active? any/c])
-           void?]{
-
-Called when a window is @defterm{activated} or
- @defterm{deactivated}. A top-level window is activated when the
- keyboard focus moves from outside the window to the window or one of
- its children. It is deactivated when the focus moves back out of the
- window. On Mac OS X, a child of a floating frames can have the
- focus instead of a child of the active non-floating frame; in other
- words, floating frames act as an extension of the active non-frame
- for keyboard focus.
-
-The method's argument is @racket[#t] when the window is activated,
- @racket[#f] when it is deactivated.
-
-}
-
-@defmethod[#:mode pubment 
-           (on-close)
-           void?]{
-
-Called just before the window is closed (e.g., by the window manager).
- This method is @italic{not} called by @method[window<%> show].
-
-See also
-@method[top-level-window<%> can-close?].
-
-}
-
-@defmethod[(on-exit)
-           void?]{
-
-@methspec{
-
-Called by the default application quit handler (as determined by the
- @racket[application-quit-handler] parameter) when the operating
- system requests that the application shut down (e.g., when the
- @onscreen{Quit} menu item is selected in the main application menu
- on Mac OS X). In that case, this method is called for the most
- recently active top-level window in the initial eventspace, but only
- if the window's @method[top-level-window<%> can-exit?]  method first
- returns true.
-
-}
-@methimpl{
-
-Calls
-@method[top-level-window<%> on-close] and then
-@method[top-level-window<%> show] to hide the window.
-
-
-
-}}
-
-@defmethod[(on-message [message any/c])
-           any/c]{
-@methspec{
-
-@index["drag-and-drop"]{A} generic message method, usually called by
-@racket[send-message-to-window].
-
-If the method is invoked by @racket[send-message-to-window], then it
-is invoked in the thread where @racket[send-message-to-window] was
-called (which is possibly @italic{not} the handler thread of the
-window's eventspace).
-
-}
-@methimpl{
-
-Returns @|void-const|.
-
-}}
-
-
-@defmethod[(display-changed) any/c]{
-  @methspec{
-    Called when the displays configuration changes.
-
-    To determine the new monitor configuration, use
-    @racket[get-display-count], @racket[get-display-size],
-    @racket[get-display-left-top-inset], and
-    @racket[get-display-backing-scale].
-
-    Note that this method may be invoked multiple times for a single
-    logical change to the monitors.
-    
-  }
-  @methimpl{
-    Returns @|void-const|.
-  }
-}
-
-
-@defmethod[(on-traverse-char [event (is-a?/c key-event%)])
-           boolean?]{
-
-@methspec{
-
-@index['("keyboard focus" "navigation")]{Attempts} to handle the given
- keyboard event as a navigation event, such as a Tab key event that
- moves the keyboard focus. If the event is handled, @racket[#t] is
- returned, otherwise @racket[#f] is returned.
-
-}
-@methimpl{
-
-The following rules determine, in order, whether and how @racket[event]
-is handled:
-
-@itemize[
-
-@item{
-If the window that currently owns the focus specifically handles the
- event, then @racket[#f] is returned. The following describes window
- types and the keyboard events they specifically handle:
-@itemize[
-
- @item{@racket[editor-canvas%] --- tab-exit is disabled (see
-@method[editor-canvas% allow-tab-exit]): all keyboard events, except alphanumeric key events when the Meta
-       (Unix) or Alt (Windows) key is pressed; when tab-exit is enabled:
-       all keyboard events except Tab, Enter, Escape, and alphanumeric
-       Meta/Alt events.}
-
- @item{@racket[canvas%] --- when tab-focus is disabled (see
-@method[canvas<%> accept-tab-focus]): all keyboard events, except alphanumeric key events when the Meta
-       (Unix) or Alt (Windows) key is pressed; when tab-focus is enabled:
-       no key events}
-
- @item{@racket[text-field%], @racket['single] style --- arrow key
- events and alphanumeric key events when the Meta (Unix) or Alt
- (Windows) key is not pressed (and all alphanumeric events on
- Mac OS X)}
-
- @item{@racket[text-field%], @racket['multiple] style --- all
- keyboard events, except alphanumeric key events when the Meta (Unix) or
- Alt (Windows) key is pressed}
-
- @item{@racket[choice%] --- arrow key events and alphanumeric key
- events when the Meta (Unix) or Alt (Windows) key is not pressed}
-
- @item{@racket[list-box%] --- arrow key events and alphanumeric key
- events when the Meta (Unix) or Alt (Windows) key is not pressed}
-
-]}
-
-@item{
-If @racket[event] is a Tab or arrow key event, the keyboard focus is
- moved within the window and @racket[#t] is returned. Across platforms,
- the types of windows that accept the keyboard focus via navigation
- may vary, but @racket[text-field%] windows always accept the focus,
- and @racket[message%], @racket[gauge%], and @racket[panel%]
- windows never accept the focus.}
-
-@item{
-If @racket[event] is a Space key event and the window that currently
- owns the focus is a @racket[button%], @racket[check-box%], or
- @racket[radio-box%] object, the event is handled in the same way as
- a click on the control and @racket[#t] is returned.}
-
-@item{
-If @racket[event] is an Enter key event and the current top-level window
- contains a border button, the button's callback is invoked and
- @racket[#t] is returned. (The @racket['border] style for a
- @racket[button%] object indicates to the user that pressing Enter
- is the same as clicking the button.) If the window does not contain a
- border button, @racket[#t] is returned if the window with the current
- focus is not a text field or editor canvas.}
-
-@item{
-In a dialog, if @racket[event] is an Escape key event, the event is
- handled the same as a click on the dialog's close box (i.e., the
- dialog's
-@method[top-level-window<%> can-close?] and
-@method[top-level-window<%> on-close] methods are called, and the dialog is hidden) and @racket[#t] is
- returned.}
-
-@item{
-If @racket[event] is an alphanumeric key event and the current top-level
- window contains a control with a mnemonic matching the key (which is
- installed via a label that contains @litchar{&}; see
- @method[window<%> get-label] for more information), then the
- keyboard focus is moved to the matching control. Furthermore, if the
- matching control is a @racket[button%], @racket[check-box%], or
- @racket[radio-box%] button, the keyboard event is handled in the
- same way as a click on the control.}
-
-@item{
-Otherwise, @racket[#f] is returned.}
-
-]
-}}
-
-@defmethod[(on-system-menu-char [event (is-a?/c key-event%)])
-           boolean?]{
-
-Checks whether the given event pops open the system menu in the
- top-left corner of the window (Windows only). If the window's system
- menu is opened, @racket[#t] is returned, otherwise @racket[#f] is
- returned.
-
-}
-
-@defmethod[(resize [width dimension-integer?]
-                   [height dimension-integer?])
-           void?]{
-
-Sets the size of the window (in pixels), but only if the given size is
- larger than the window's minimum size.
-
-@MonitorMethod[@elem{A window's size} @elem{the user} @elem{@method[window<%> on-size]} @elem{size}]
-
-}
-
-
-@defmethod[(set-icon [icon (is-a?/c bitmap%)]
-                     [mask (is-a?/c bitmap%) #f]
-                     [which (or/c 'small 'large 'both) 'both])
-           void?]{
-
-Sets the large or small icon bitmap for the window.  Future changes to
- the bitmap do not affect the window's icon.
-
-The icon is used in a platform-specific way:
-
-@itemize[
-
- @item{Windows --- the small icon is used for the window's icon (in the
-       top-left) and in the task bar, and the large icon is used for
-       the Alt-Tab task switcher.}
-
- @item{Mac OS X --- both icons are ignored.}
-
- @item{Unix --- many window managers use the small icon in the same way
-       as Windows, and others use the small icon when iconifying the
-       frame; the large icon is ignored.}
-
-]
-
-The bitmap for either icon can be any size, but most platforms scale
- the small bitmap to 16 by 16 pixels and the large bitmap to 32 by 32
- pixels.
-
-If a mask bitmap is not provided, then the entire (rectangular) bitmap
- is used as an icon.
-
-If a mask bitmap is provided, the mask must be monochrome. In the mask
- bitmap, use black pixels to indicate the icon's region and use white
- pixels outside the icon's region. In the icon bitmap, use black
- pixels for the region outside the icon.}
-
-
-@defmethod[(show [show any/c])
-           void?]{
-
-If the window is already shown, it is moved front of other top-level
- windows. If the window is iconized (frames only), it is deiconized.
-
-See also @xmethod[window<%> show].
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/vertical-pane-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/vertical-pane-class.scrbl
deleted file mode 100644
index 06ff397191..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/vertical-pane-class.scrbl
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[vertical-pane% pane% ()]{
-
-A vertical pane arranges its subwindows in a single column. See also @racket[pane%].
-
-
-
-
-@defconstructor[([parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [vert-margin spacing-integer? 0]
-                 [horiz-margin spacing-integer? 0]
-                 [border spacing-integer? 0]
-                 [spacing spacing-integer? 0]
-                 [alignment (list/c (or/c 'left 'center 'right)
-                                    (or/c 'top 'center 'bottom))
-                            '(center top)]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-@SubareaKWs[] @AreaContKWs[] @AreaKWs[]
-
-}}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/vertical-panel-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/vertical-panel-class.scrbl
deleted file mode 100644
index 1fb0b5f54e..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/vertical-panel-class.scrbl
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@defclass/title[vertical-panel% panel% ()]{
-
-A vertical panel arranges its subwindows in a single column. See
- also @racket[panel%].
-
-
-
-
-@defconstructor[([parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [style (listof (or/c 'border 'deleted
-                                      'hscroll 'auto-hscroll
-                                      'vscroll 'auto-vscroll)) null]
-                 [enabled any/c #t]
-                 [vert-margin spacing-integer? 0]
-                 [horiz-margin spacing-integer? 0]
-                 [border spacing-integer? 0]
-                 [spacing spacing-integer? 0]
-                 [alignment (list/c (or/c 'left 'center 'right)
-                                    (or/c 'top 'center 'bottom))
-                            '(center top)]
-                 [min-width (or/c dimension-integer? #f) #f]
-                 [min-height (or/c dimension-integer? #f) #f]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-
-The @racket[style] flags are the same as for @racket[panel%].
-
-@WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaContKWs[] @AreaKWs[]
-}
-
-@defmethod[(set-orientation [horizontal? boolean?]) void?]{
-  Sets the orientation of the panel, switching it between
-  the behavior of the @racket[vertical-panel%] and that of
-  the @racket[horizontal-panel%].
-}
-
-@defmethod[(get-orientation) boolean?]{
-  Initially returns @racket[#f], but if 
-  @method[vertical-panel% set-orientation] is called,
-  this method returns whatever the last value passed to it was.
-}
-}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/widget-gallery.rkt b/pkgs/gui-pkgs/gui-doc/scribblings/gui/widget-gallery.rkt
deleted file mode 100644
index 6efb6dcb0b..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/widget-gallery.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-(require racket/string
-         "common.rkt")
-
-(provide showcase-widget)
-
-(define-syntax-rule (showcase-widget widget code ...)
-  (begin
-    (racketlink widget
-                (image #:suffixes
-                       (list ".png")
-                       (string-append "image/"
-                                      (string-trim (symbol->string 'widget)
-                                                   "%"
-                                                   #:left? #f))))
-    (racketblock code ...)))
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/widget-gallery.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/widget-gallery.scrbl
deleted file mode 100644
index c024544f66..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/widget-gallery.scrbl
+++ /dev/null
@@ -1,141 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          "widget-gallery.rkt")
-
-@title[#:style '(toc quiet)]{Widget Gallery}
-
-@; Note: Instructions for taking widget screenshots are avaiable at:
-@;   collects/meta/images/taking-screenshots/instructions
-
-This section shows the main widgets available in the Racket Graphical User
-Interface Toolkit. Each image is a link to the documentation of the relevant
-widget.
-
-@(showcase-widget button%
-(define button (new button%
-                    (parent panel)
-                    (label "Button")))
-)
-
-@(showcase-widget check-box%
-(define check-box (new check-box%
-                       (parent panel)
-                       (label "Check Box")
-                       (value #t)))
-)
-
-@(showcase-widget choice%
-(define choice (new choice%
-                    (label "Choice")
-                    (parent panel)
-                    (choices (list "Item 0"))))
-)
-
-@(showcase-widget combo-field%
-(define combo-field (new combo-field%
-                         (label "Combo")
-                         (parent panel)
-                         (choices (list "Field"))
-                         (init-value "Field")))
-)
-
-@(showcase-widget editor-canvas%
-(define editor-canvas (new editor-canvas%
-                           (parent panel)
-                           (label "Editor Canvas")))
-(define text (new text%))
-(send text insert "Editor Canvas")
-(send editor-canvas set-editor text)
-)
-
-
-@(showcase-widget gauge%
-(define gauge (new gauge%
-                   (label "Gauge")
-                   (parent panel)
-                   (range 100)))
-(send gauge set-value 42)
-)
-
-@(showcase-widget group-box-panel%
-(define group-box-panel (new group-box-panel%
-                             (parent panel)
-                             (label "Group Box Panel")))
-)
-
-@(showcase-widget list-box%
-(define list-box (new list-box%
-                      (label "List Box")
-                      (parent (new horizontal-panel%
-                                   (parent panel)
-                                   (style (list 'border))))
-                      (choices (list "Item 0"
-                                     "Item 1"
-                                     "Item 2"))
-                      (style (list 'single
-                                   'column-headers))
-                      (columns (list "First Column"))))
-)
-
-@(showcase-widget menu-bar%
-(define menu-bar (new menu-bar%
-                      (parent frame)))
-(new menu%
-     (label "&File")
-     (parent menu-bar))
-(new menu%
-     (label "&Edit")
-     (parent menu-bar))
-(new menu%
-     (label "&Help")
-     (parent menu-bar))
-)
-
-@(showcase-widget message%
-(define message (new message%
-                     (parent panel)
-                     (label "Message")))
-)
-
-@(showcase-widget panel%
-(define a-panel (new panel%
-                     (parent panel)
-                     (style (list 'border))))
-(new message%
-     (parent a-panel)
-     (label "Panel"))
-)
-
-
-@(showcase-widget radio-box%
-(define radio-box (new radio-box%
-                       (label "Radio Box")
-                       (parent panel)
-                       (choices (list "Button 0"
-                                      "Button 1"
-                                      "Button 2"))))
-)
-
-@(showcase-widget slider%
-(define slider (new slider%
-                    (label "Slider")
-                    (parent panel)
-                    (min-value 0)
-                    (max-value 100)
-                    (init-value 42)))
-)
-
-@(showcase-widget tab-panel%
-(define tab-panel (new tab-panel%
-                       (parent panel)
-                       (choices (list "Tab 0"
-                                      "Tab 1"
-                                      "Tab 2"))))
-)
-
-@(showcase-widget text-field%
-(define text-field (new text-field%
-                        (label "Text")
-                        (parent panel)
-                        (init-value "Field")))
-)
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/win-classes.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/win-classes.scrbl
deleted file mode 100644
index 9035cf3712..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/win-classes.scrbl
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" "diagrams.rkt")
-
-@title[#:style '(toc quiet)]{Windowing Classes}
-
-Windows and controls:
-
-@diagram->table[windowing-diagram]
-
-Menus:
-
-@diagram->table[menu-diagram]
-
-Events and other:
-
-@diagram->table[event-diagram]
-
-Alphabetical:
-
-@local-table-of-contents[]
-
-@include-section["area-intf.scrbl"]
-@include-section["area-container-intf.scrbl"]
-@include-section["area-container-window-intf.scrbl"]
-@include-section["button-class.scrbl"]
-@include-section["canvas-intf.scrbl"]
-@include-section["canvas-class.scrbl"]
-@include-section["check-box-class.scrbl"]
-@include-section["checkable-menu-item-class.scrbl"]
-@include-section["choice-class.scrbl"]
-@include-section["clipboard-client-class.scrbl"]
-@include-section["clipboard-intf.scrbl"]
-@include-section["combo-field-class.scrbl"]
-@include-section["control-intf.scrbl"]
-@include-section["column-control-event-class.scrbl"]
-@include-section["control-event-class.scrbl"]
-@include-section["cursor-class.scrbl"]
-@include-section["dialog-class.scrbl"]
-@include-section["event-class.scrbl"]
-@include-section["frame-class.scrbl"]
-@include-section["gauge-class.scrbl"]
-@include-section["group-box-panel-class.scrbl"]
-@include-section["grow-box-spacer-pane-class.scrbl"]
-@include-section["horizontal-pane-class.scrbl"]
-@include-section["horizontal-panel-class.scrbl"]
-@include-section["key-event-class.scrbl"]
-@include-section["labelled-menu-item-intf.scrbl"]
-@include-section["list-box-class.scrbl"]
-@include-section["list-control-intf.scrbl"]
-@include-section["menu-class.scrbl"]
-@include-section["menu-bar-class.scrbl"]
-@include-section["menu-item-intf.scrbl"]
-@include-section["menu-item-class.scrbl"]
-@include-section["menu-item-container-intf.scrbl"]
-@include-section["message-class.scrbl"]
-@include-section["mouse-event-class.scrbl"]
-@include-section["pane-class.scrbl"]
-@include-section["panel-class.scrbl"]
-@include-section["popup-menu-class.scrbl"]
-@include-section["printer-dc-class.scrbl"]
-@include-section["radio-box-class.scrbl"]
-@include-section["selectable-menu-item-intf.scrbl"]
-@include-section["separator-menu-item-class.scrbl"]
-@include-section["scroll-event-class.scrbl"]
-@include-section["slider-class.scrbl"]
-@include-section["subarea-intf.scrbl"]
-@include-section["subwindow-intf.scrbl"]
-@include-section["tab-panel-class.scrbl"]
-@include-section["text-field-class.scrbl"]
-@include-section["timer-class.scrbl"]
-@include-section["top-level-window-intf.scrbl"]
-@include-section["vertical-pane-class.scrbl"]
-@include-section["vertical-panel-class.scrbl"]
-@include-section["window-intf.scrbl"]
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/win-funcs.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/win-funcs.scrbl
deleted file mode 100644
index d76cf0dea5..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/win-funcs.scrbl
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{Windowing Functions}
-
-@local-table-of-contents[]
-
-@include-section["dialog-funcs.scrbl"]
-@include-section["eventspace-funcs.scrbl"]
-@include-section["system-menu-funcs.scrbl"]
-@include-section["global-draw-funcs.scrbl"]
-@include-section["font-funcs.scrbl"]
-@include-section["miscwin-funcs.scrbl"]
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/win-overview.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/win-overview.scrbl
deleted file mode 100644
index a3ab1905e1..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/win-overview.scrbl
+++ /dev/null
@@ -1,1028 +0,0 @@
-#lang scribble/doc
-@(require scribble/eval "common.rkt" "diagrams.rkt")
-
-@title[#:tag "windowing-overview"]{Windowing}
-
-The windowing toolbox provides the basic building blocks of GUI
- programs, including frames (top-level windows), modal dialogs, menus,
- buttons, check boxes, text fields, and radio buttons---all as
- classes.
-
-@margin-note{See @secref["classes" #:doc '(lib
-"scribblings/guide/guide.scrbl")] for an introduction to classes and
-interfaces in Racket.}
-
-@section{Creating Windows}
-
-To create a new top-level window, instantiate the @racket[frame%]
- class:
-
-@racketblock[
-(code:comment @#,t{Make a frame by instantiating the @racket[frame%] class})
-(define frame (new frame% [label "Example"]))
- 
-(code:comment @#,t{Show the frame by calling its @method[top-level-window<%> show] method})
-(send frame #,(:: top-level-window<%> show) #t)
-]
-
-The built-in classes provide various mechanisms for handling GUI
- events. For example, when instantiating the @racket[button%] class,
- supply an event callback procedure to be invoked
- when the user clicks the button. The following example program
- creates a frame with a text message and a button; when the user
- clicks the button, the message changes:
-
-@racketblock[
-(code:comment @#,t{Make a frame by instantiating the @racket[frame%] class})
-(define frame (new frame% [label "Example"]))
-
-(code:comment @#,t{Make a static text message in the frame})
-(define msg (new message% [parent frame]
-                          [label "No events so far..."]))
-
-(code:comment @#,t{Make a button in the frame})
-(new button% [parent frame] 
-             [label "Click Me"]
-             (code:comment @#,t{Callback procedure for a button click:})
-             [callback (lambda (button event) 
-                         (send msg #,(method message% set-label) "Button click"))])
-
-(code:comment @#,t{Show the frame by calling its @racket[show] method})
-(send frame #,(:: top-level-window<%> show) #t)
-]
-
-Programmers never implement the GUI event loop directly. Instead, the
- windowing system automatically pulls each event from an internal queue and
- dispatches the event to an appropriate window. The dispatch invokes
- the window's callback procedure or calls one of the window's
- methods. In the above program, the windowing system automatically invokes the
- button's callback procedure whenever the user clicks @onscreen{Click
- Me}.
-
-If a window receives multiple kinds of events, the events are
- dispatched to methods of the window's class instead of to a callback
- procedure. For example, a drawing canvas receives update events,
- mouse events, keyboard events, and sizing events; to handle them,
- derive a new class from the built-in
- @racket[canvas%] class and override the event-handling methods. The
- following expression extends the frame created above with a canvas
- that handles mouse and keyboard events:
-
-@racketblock[
-(code:comment @#,t{Derive a new canvas (a drawing window) class to handle events})
-(define my-canvas%
-  (class canvas% (code:comment @#,t{The base class is @racket[canvas%]})
-    (code:comment @#,t{Define overriding method to handle mouse events})
-    (define/override (#,(:: canvas<%> on-event) event)
-      (send msg #,(:: message% set-label) "Canvas mouse"))
-    (code:comment @#,t{Define overriding method to handle keyboard events})
-    (define/override (#,(:: canvas<%> on-char) event)
-      (send msg #,(:: message% set-label) "Canvas keyboard"))
-    (code:comment @#,t{Call the superclass init, passing on all init args})
-    (super-new)))
-
-(code:comment @#,t{Make a canvas that handles events in the frame})
-(new my-canvas% [parent frame])
-]
-
-After running the above code, manually resize the frame to see the
- new canvas.  Moving the cursor over the canvas calls the canvas's
- @method[canvas<%> on-event] method with an object representing a
- motion event. Clicking on the canvas calls @method[canvas<%>
- on-event]. While the canvas has the keyboard focus, typing on the
- keyboard invokes the canvas's @method[canvas<%> on-char] method.
-
-The windowing system dispatches GUI events sequentially; that is, after invoking
- an event-handling callback or method, the windowing system waits until the
- handler returns before dispatching the next event. To illustrate the
- sequential nature of events, extend the frame again, adding a
- @onscreen{Pause} button:
-
-@racketblock[
-(new button% [parent frame] 
-             [label "Pause"]
-             [callback (lambda (button event) (sleep 5))])
-]
-
-After the user clicks @onscreen{Pause}, the entire frame becomes
- unresponsive for five seconds; the windowing system cannot dispatch more events
- until the call to @racket[sleep] returns. For more information about
- event dispatching, see @secref["eventspaceinfo"].
-
-In addition to dispatching events, the GUI classes also handle the
- graphical layout of windows. Our example frame demonstrates a simple
- layout; the frame's elements are lined up top-to-bottom. In general,
- a programmer specifies the layout of a window by assigning each GUI
- element to a parent @tech{container}. A vertical container, such
- as a frame, arranges its children in a column, and a horizontal
- container arranges its children in a row. A container can be a child
- of another container; for example, to place two buttons side-by-side
- in our frame, create a horizontal panel for the new buttons:
-
-@racketblock[
-(define panel (new horizontal-panel% [parent frame]))
-(new button% [parent panel]
-             [label "Left"]
-             [callback (lambda (button event) 
-                         (send msg #,(:: message% set-label) "Left click"))])
-(new button% [parent panel]
-             [label "Right"]
-             [callback (lambda (button event) 
-                         (send msg #,(:: message% set-label) "Right click"))])
-]
-
-For more information about window layout and containers, see
- @secref["containeroverview"].
-
-
-@section[#:tag "canvas-drawing"]{Drawing in Canvases}
-
-The content of a canvas is determined by its @method[canvas% on-paint]
-method, where the default @method[canvas% on-paint] calls the
-@racket[paint-callback] function that is supplied when the canvas is
-created. The @method[canvas% on-paint] method receives no arguments
-and uses the canvas's @method[canvas<%> get-dc] method to obtain a
-@tech[#:doc '(lib "scribblings/draw/draw.scrbl")]{drawing context}
-(DC) for drawing; the default @method[canvas% on-paint] method passes
-the canvas and this DC on to the @racket[paint-callback] function.
-Drawing operations of the @racket[racket/draw] toolbox on the DC are
-reflected in the content of the canvas onscreen.
-
-For example, the following program creates a canvas
-that displays large, friendly letters:
-
-@racketblock[
-(define frame (new frame% 
-                   [label "Example"]
-                   [width 300]
-                   [height 300]))
-(new canvas% [parent frame]
-             [paint-callback
-              (lambda (canvas dc)
-                (send dc #,(:: dc<%> set-scale) 3 3)
-                (send dc #,(:: dc<%> set-text-foreground) "blue")
-                (send dc #,(:: dc<%> draw-text) "Don't Panic!" 0 0))])
-(send frame #,(:: top-level-window<%> show) #t)
-]
-
-The background color of a canvas can be set through the
-@method[canvas<%> set-canvas-background] method. To make the canvas
-transparent (so that it takes on its parent's color and texture as its
-initial content), supply @racket['transparent] in the @racket[style]
-argument when creating the canvas.
-
-See @secref["overview" #:doc '(lib "scribblings/draw/draw.scrbl")] in
-@other-doc['(lib "scribblings/draw/draw.scrbl")] for an overview of
-drawing with the @racket[racket/draw] library. For more advanced
-information on canvas drawing, see @secref["animation"].
-
-
-@section{Core Windowing Classes}
-
-The fundamental graphical element in the windowing toolbox is an
- @deftech{area}. The following classes implement the different types
- of areas in the windowing toolbox:
-
-@itemize[
-
- @item{@deftech{Containers} --- areas that can
- contain other areas:
-
- @itemize[
-
- @item{@racket[frame%] --- a @deftech{frame} is a top-level window
- that the user can move and resize.}
-
- @item{@racket[dialog%] --- a @deftech{dialog} is a modal top-level
- window; when a dialog is shown, other top-level windows are disabled
- until the dialog is dismissed.}
-
- @item{@racket[panel%] --- a @deftech{panel} is a subcontainer
- within a container. The toolbox provides three subclasses of
- @racket[panel%]: @racket[vertical-panel%],
- @racket[horizontal-panel%], and @racket[tab-panel%].}
-
- @item{@racket[pane%] --- a @deftech{pane} is a lightweight panel.
- It has no graphical representation or event-handling capabilities.
- The @racket[pane%] class has three subclasses:
- @racket[vertical-pane%], @racket[horizontal-pane%], and
- @racket[grow-box-spacer-pane%].}
-
- ]}
-
- @item{@deftech{Containees} --- areas that must be
- contained within other areas:
-
- @itemize[
-
- @item{@racket[panel%] --- a panel is a containee as well as
- a container.}
-
- @item{@racket[pane%] --- a pane is a containee as well as a
- container.}
-
- @item{@racket[canvas%] --- a @deftech{canvas} is a subwindow for
- drawing on the screen.}
-
- @item{@racket[editor-canvas%] --- an @deftech{editor canvas} is a
- subwindow for displaying a text editor or pasteboard editor. The
- @racket[editor-canvas%] class is documented with the editor classes
- in @secref["editor-overview"].}
-
- @item{@deftech{Controls} --- containees that the user can manipulate:
-
- @itemize[
-
-   @item{@racket[message%] --- a @deftech{message} is a static
-   text field or bitmap with no user interaction.}
-
-   @item{@racket[button%] --- a @deftech{button} is a clickable
-   control.}
-
-   @item{@racket[check-box%] --- a @deftech{check box} is a
-   clickable control; the user clicks the control to set or remove
-   its check mark.}
-
-   @item{@racket[radio-box%] --- a @deftech{radio box} is a
-   collection of mutually exclusive @deftech{radio buttons}; when the
-   user clicks a radio button, it is selected and the radio box's
-   previously selected radio button is deselected.}
-
-   @item{@racket[choice%] --- a @deftech{choice item} is a pop-up
-   menu of text choices; the user selects one item in the control.}
-
-   @item{@racket[list-box%] --- a @deftech{list box} is a
-   scrollable lists of text choices; the user selects one or more
-   items in the list (depending on the style of the list box).}
-
-   @item{@racket[text-field%] --- a @deftech{text field} is a box
-   for simple text entry.}
-
-   @item{@racket[combo-field%] --- a @deftech{combo field} combines
-   a text field with a pop-up menu of choices.}
-
-   @item{@racket[slider%] --- a @deftech{slider} is a dragable
-   control that selects an integer value within a fixed range.}
-
-   @item{@racket[gauge%] --- a @deftech{gauge} is an output-only
-   control (the user cannot change the value) for reporting an integer
-   value within a fixed range.}
-
-  ]}
-
- ]}
-
-]
-
-As suggested by the above listing, certain @tech{areas}, called
- @tech{containers}, manage certain other areas, called
- @tech{containees}. Some areas, such as panels, are both
- @tech{containers} and @tech{containees}.
-
-Most areas are @deftech{windows}, but some are
- @deftech{non-windows}. A @tech{window}, such as a @tech{panel}, has a
- graphical representation, receives keyboard and mouse events, and can
- be disabled or hidden.  In contrast, a @tech{non-window}, such as a
- @tech{pane}, is useful only for geometry management; a
- @tech{non-window} does not receive mouse events, and it cannot be
- disabled or hidden.
-
-Every @tech{area} is an instance of the @racket[area<%>]
- interface. Each @tech{container} is also an instance of the
- @racket[area-container<%>] interface, whereas each @tech{containee}
- is an instance of @racket[subarea<%>]. @tech{Windows} are instances
- of @racket[window<%>]. The @racket[area-container<%>],
- @racket[subarea<%>], and @racket[window<%>] interfaces are
- subinterfaces of @racket[area<%>].
-
-The following diagram shows more of the type hierarchy under
- @racket[area<%>]:
-
-@diagram->table[short-windowing-diagram]
-
-The diagram below extends the one above to show the complete type
- hierarchy under @racket[area<%>]. (Some of the types are represented
- by interfaces, and some types are represented by classes. In
- principle, every area type should be represented by an interface, but
- whenever the windowing toolbox provides a concrete implementation,
- the corresponding interface is omitted from the toolbox.)  To avoid
- intersecting lines, the hierarchy is drawn for a cylindrical surface;
- lines from @racket[subarea<%>] and @racket[subwindow<%>] wrap from
- the left edge of the diagram to the right edge.
-
-@diagram->table[windowing-diagram]
-
-Menu bars, menus, and menu items are graphical elements, but not areas
- (i.e., they do not have all of the properties that are common to
- areas, such as an adjustable graphical size).  Instead, the menu
- classes form a separate container--containee hierarchy:
-
-@itemize[
-
- @item{@deftech{Menu Item Containers}
-
-  @itemize[
-
-  @item{@racket[menu-bar%] --- a @deftech{menu bar} is a top-level
-  collection of menus that are associated with a frame.}
-
-  @item{@racket[menu%] --- a @deftech{menu} contains a set of menu
-  items. The menu can appear in a menu bar, in a popup menu, or as a
-  submenu in another menu.}
-
-  @item{@racket[popup-menu%] --- a @deftech{popup menu} is a
-  top-level menu that is dynamically displayed in a canvas or
-  editor canvas.}
-
-  ]}
-  
- @item{@deftech{Menu Items}
-
-  @itemize[
-  
-  @item{@racket[separator-menu-item%] --- a @deftech{separator} is
-  an unselectable line in a menu or popup menu.}
-
-  @item{@racket[menu-item%] --- a @deftech{plain menu item} is a
-  selectable text item in a menu. When the item is selected, its
-  callback procedure is invoked.}
-
-  @item{@racket[checkable-menu-item%] --- a @deftech{checkable menu
-  item} is a text item in a menu; the user selects a checkable menu
-  item to toggle a check mark next to the item.}
-
-  @item{@racket[menu%] --- a menu is a menu item as well as a menu
-  item container.}
-
-  ]}
-
-]
-
-The following diagram shows the complete type hierarchy for the menu
-system:
-
-@diagram->table[menu-diagram]
-
-@; ------------------------------------------------------------------------
-
-@section[#:tag "containeroverview"]{Geometry Management}
-
-The windowing toolbox's geometry management makes it easy to design windows that look
- right on all platforms, despite different graphical representations
- of GUI elements. Geometry management is based on containers; each
- container arranges its children based on simple constraints, such as
- the current size of a frame and the natural size of a button.
-
-The built-in container classes include horizontal panels (and panes),
- which align their children in a row, and vertical panels (and panes),
- which align their children in a column. By nesting horizontal and
- vertical containers, a programmer can achieve most any layout.  For
- example, to construct a dialog with the shape
-
-@verbatim[#:indent 2]{
-  ------------------------------------------------------
- |              -------------------------------------   |
- |  Your name: |                                     |  |
- |              -------------------------------------   |
- |                    --------     ----                 |
- |                   ( Cancel )   ( OK )                |
- |                    --------     ----                 |
-  ------------------------------------------------------
-}
-
-with the following program:
-
-@racketblock[
-(code:comment @#,t{Create a dialog})
-(define dialog (instantiate dialog% ("Example")))
-
-(code:comment @#,t{Add a text field to the dialog})
-(new text-field% [parent dialog] [label "Your name"])
-
-(code:comment @#,t{Add a horizontal panel to the dialog, with centering for buttons})
-(define panel (new horizontal-panel% [parent dialog]
-                                     [alignment '(center center)]))
-
-(code:comment @#,t{Add @onscreen{Cancel} and @onscreen{Ok} buttons to the horizontal panel})
-(new button% [parent panel] [label "Cancel"])
-(new button% [parent panel] [label "Ok"])
-(when (system-position-ok-before-cancel?)
-  (send panel #,(:: area-container<%> change-children) reverse))
-
-(code:comment @#,t{Show the dialog})
-(send dialog #,(:: dialog% show) #t)
-]
-
-Each container arranges its children using the natural size of each
- child, which usually depends on instantiation parameters of the
- child, such as the label on a button or the number of choices in a
- radio box. In the above example, the dialog stretches horizontally to
- match the minimum width of the text field, and it stretches
- vertically to match the total height of the field and the
- buttons. The dialog then stretches the horizontal panel to fill the
- bottom half of the dialog. Finally, the horizontal panel uses the sum
- of the buttons' minimum widths to center them horizontally.
-
-As the example demonstrates, a stretchable container grows to fill its
- environment, and it distributes extra space among its stretchable
- children. By default, panels are stretchable in both directions,
- whereas buttons are not stretchable in either direction. The
- programmer can change whether an individual GUI element is
- stretchable.
-
-The following subsections describe the container system in detail,
- first discussing the attributes of a containee in
- @secref["containees"], and then describing
- the attributes of a container in
- @secref["containers"]. In addition to the
- built-in vertical and horizontal containers, programmers can define
- new types of containers as discussed in the final subsection,
- @secref["new-containers"].
-
-
-@subsection[#:tag "containees"]{Containees}
-
-Each @tech{containee}, or child, has the following properties:
-
-@itemize[
- 
- @item{a @deftech{graphical minimum width} and a @deftech{graphical minimum height};}
-
- @item{a @deftech{requested minimum width} and a @deftech{requested minimum height};}
-
- @item{horizontal and vertical @deftech{stretchability} (on or off); and}
-
- @item{horizontal and vertical @tech{margins}.}
-
-]
-
-A @tech{container} arranges its children based on these four
- properties of each @tech{containee}. A @tech{containee}'s parent
- container is specified when the @tech{containee} is created. A window
- @tech{containee} can be @tech{hidden} or @tech{deleted} within its
- parent, and its parent can be changed by @tech{reparent}ing.
-
-The @deftech{graphical minimum size} of a particular containee, as
- reported by @method[area<%> get-graphical-min-size], depends on the
- platform, the label of the containee (for a control), and style
- attributes specified when creating the containee. For example, a
- button's minimum graphical size ensures that the entire text of the
- label is visible. The graphical minimum size of a control (such as a
- button) cannot be changed; it is fixed at creation time. (A control's
- minimum size is @italic{not} recalculated when its label is changed.)
- The graphical minimum size of a panel or pane depends on the total
- minimum size of its children and the way that they are arranged.
-
-To select a size for a containee, its parent container considers the
- containee's @deftech{requested minimum size} rather than its
- graphical minimum size (assuming the requested minimum is larger than
- the graphical minimum). Unlike the graphical minimum, the requested
- minimum size of a containee can be changed by a programmer at any
- time using the @method[area<%> min-width] and
- @method[area<%> min-height] methods.
-
-Unless a containee is stretchable (in a particular direction), it
- always shrinks to its minimum size (in the corresponding
- direction). Otherwise, containees are stretched to fill all available
- space in a container. Each containee begins with a default
- stretchability. For example, buttons are not initially stretchable,
- whereas a one-line text field is initially stretchable in the
- horizontal direction. A programmer can change the stretchability of a
- containee at any time using the @method[area<%> stretchable-width]
- and @method[area<%> stretchable-height] methods.
-
-A @deftech{margin} is space surrounding a containee. Each containee's
- margin is independent of its minimum size, but from the container's
- point of view, a margin effectively increases the minimum size of the
- containee. For example, if a button has a vertical margin of
- @racket[2], then the container must allocate enough room to leave two
- pixels of space above and below the button, in addition to the space
- that is allocated for the button's minimum height. A programmer can
- adjust a containee's margin with @method[subarea<%> horiz-margin] and
- @method[subarea<%> vert-margin]. The default margin is @racket[2] for
- a control, and @racket[0] for any other type of containee.
-
-In practice, the @tech{requested minimum size} and @tech{margin} of a
- control are rarely changed, although they are often changed for a
- canvas. @tech{Stretchability} is commonly adjusted for any type of
- containee, depending on the visual effect desired by the programmer.
-
-
-@subsection[#:tag "containers"]{Containers}
-
-A container has the following properties:
-
-@itemize[
- 
- @item{a list of (non-deleted) children containees;}
-
- @item{a requested minimum width and a requested minimum height;}
-
- @item{a spacing used between the children;}
-
- @item{a border margin used around the total set of children;}
-
- @item{horizontal and vertical stretchability (on or off); and}
-
- @item{an alignment setting for positioning leftover space.}
-
-]
-
-These properties are factored into the container's calculation of its
- own size and the arrangement of its children. For a container that is
- also a containee (e.g., a panel), the container's requested minimum
- size and stretchability are the same as for its containee aspect.
-
-A containee's parent container is specified when the containee is
- created. A containee
- window can be @tech{hidden} or @tech{deleted} within its parent
- container, and its parent can be changed by @tech{reparent}ing
- (but a non-window containee cannot be @tech{hidden},
- @tech{deleted}, or @tech{reparent}ed):
-
-@itemize[
-
- @item{A @deftech{hidden} child is invisible to the user, but space is
- still allocated for each hidden child within a container. To hide or
- show a child, call the child's @method[window<%> show] method.}
-
- @item{A @deftech{deleted} child is hidden @italic{and} ignored by
- container as it arranges its other children, so no space is reserved
- in the container for a deleted child.  To make a child deleted or
- non-deleted, call the container's @method[area-container<%>
- delete-child] or @method[area-container<%> add-child] method (which
- calls the child's @method[window<%> show] method).}
-
- @item{To @deftech{reparent} a window containee, use the
- @method[subwindow<%> reparent] method. The window retains its
- @tech{hidden} or @tech{deleted} status within its new parent.}
-
-]
-
-When a child is created, it is initially shown and non-deleted. A
- deleted child is subject to garbage collection when no external
- reference to the child exists. A list of non-deleted children (hidden
- or not) is available from a container through its
- @method[area-container<%> get-children] method.
-
-The order of the children in a container's non-deleted list is
- significant. For example, a vertical panel puts the first child in
- its list at the top of the panel, and so on. When a new child is
- created, it is put at the end of its container's list of
- children. The order of a container's list can be changed dynamically
- via the @method[area-container<%> change-children] method. (The
- @method[area-container<%> change-children] method can also be used to
- activate or deactivate children.)
-
-The @tech{graphical minimum size} of a container, as reported by
- @method[area<%> get-graphical-min-size], is calculated by combining
- the minimum sizes of its children (summing them or taking the
- maximum, as appropriate to the layout strategy of the container)
- along with the spacing and border margins of the container. A larger
- minimum may be specified by the programmer using @method[area<%>
- min-width] and @method[area<%> min-height] methods; when the computed
- minimum for a container is larger than the programmer-specified
- minimum, then the programmer-specified minimum is ignored.
-
-A container's spacing determines the amount of space left between
- adjacent children in the container, in addition to any space required
- by the children's margins. A container's border margin determines the
- amount of space to add around the collection of children; it
- effectively decreases the area within the container where children
- can be placed.  A programmer can adjust a container's border and
- spacing dynamically via the @method[area-container<%> border] and
- @method[area-container<%> spacing] methods. The default border and
- spacing are @racket[0] for all container types.
-
-Because a panel or pane is a containee as well as a container, it has
- a containee margin in addition to its border margin. For a panel,
- these margins are not redundant because the panel can have a
- graphical border; the border is drawn inside the panel's containee
- margin, but outside the panel's border margin.
-
-For a top-level-window container, such as a frame or dialog, the
- container's stretchability determines whether the user can resize the
- window to something larger than its minimum size. Thus, the user
- cannot resize a frame that is not stretchable. For other types of
- containers (i.e., panels and panes), the container's stretchability
- is its stretchability as a containee in some other container.  All
- types of containers are initially stretchable in both
- directions---except instances of @racket[grow-box-spacer-pane%],
- which is intended as a lightweight spacer class rather than a useful
- container class---but a programmer can change the stretchability of
- an area at any time via the @method[area<%> stretchable-width] and
- @method[area<%> stretchable-height] methods.
-
-The alignment specification for a container determines how it
- positions its children when the container has leftover space. (A
- container can only have leftover space in a particular direction when
- none of its children are stretchable in that direction.) For example,
- when the container's horizontal alignment is @indexed-racket['left],
- the children are left-aligned in the container and leftover space is
- accumulated to the right.  When the container's horizontal alignment
- is @indexed-racket['center], each child is horizontally centered in
- the container. A container's alignment is changed with the
- @method[area-container<%> set-alignment] method.
-
-@subsection[#:tag "new-containers"]{Defining New Types of Containers}
-
-Although nested horizontal and vertical containers can express most
- layout patterns, a programmer can define a new type of container with
- an explicit layout procedure. A programmer defines a new type of
- container by deriving a class from @racket[panel%] or @racket[pane%]
- and overriding the @method[area-container<%> container-size] and
- @method[area-container<%> place-children] methods. The
- @method[area-container<%> container-size] method takes a list of size
- specifications for each child and returns two values: the minimum
- width and height of the container. The @method[area-container<%>
- place-children] method takes the container's size and a list of size
- specifications for each child, and returns a list of sizes and
- placements (in parallel to the original list).
-
-An input size specification is a list of four values:
-
-@itemize[
- @item{the child's minimum width;}
- @item{the child's minimum height;}
- @item{the child's horizontal stretchability (@racket[#t] means stretchable, @racket[#f] means not stretchable); and}
- @item{the child's vertical stretchability.}
-]
-
-For @method[area-container<%> place-children], an output
- position and size specification is a list of four values:
-
-@itemize[
- @item{the child's new horizontal position (relative to the parent);}
- @item{the child's new vertical position;}
- @item{the child's new actual width;}
- @item{the child's new actual height.}
-]
-
-The widths and heights for both the input and output include the
- children's margins. The returned position for each child is
- automatically incremented to account for the child's margin in
- placing the control.
-
-
-@section[#:tag "mouseandkey"]{Mouse and Keyboard Events}
-
-Whenever the user moves the mouse, clicks or releases a mouse button,
- or presses a key on the keyboard, an event is generated for some
- window. The window that receives the event depends on the current
- state of the graphic display:
-
-@itemize[
-
- @item{@index['("mouse events" "overview")]{The} receiving window of a
- mouse event is usually the window under the cursor when the mouse is
- moved or clicked. If the mouse is over a child window, the child
- window receives the event rather than its parent.
-
- When the user clicks in a window, the window ``grabs'' the mouse, so
- that @italic{all} mouse events go to that window until the mouse
- button is released (regardless of the location of the cursor). As a
- result, a user can click on a scrollbar thumb and drag it without
- keeping the cursor strictly inside the scrollbar control.
-
- A mouse button-release event is normally generated for each mouse
- button-down event, but a button-release event might get dropped. For
- example, a modal dialog might appear and take over the mouse. More
- generally, any kind of mouse event can get dropped in principle, so
- avoid algorithms that depend on precise mouse-event sequences. For
- example, a mouse tracking handler should reset the tracking state
- when it receives an event other than a dragging event.}
-
- @item{@index['("keyboard focus" "overview")]{@index['("keyboard
- events" "overview")]{The}} receiving window of a keyboard event is
- the window that owns the @deftech{keyboard focus} at the time of the
- event. Only one window owns the focus at any time, and focus
- ownership is typically displayed by a window in some manner. For
- example, a text field control shows focus ownership by displaying a
- blinking caret.
-
- Within a top-level window, only certain kinds of subwindows can have
- the focus, depending on the conventions of the platform. Furthermore,
- the subwindow that initially owns the focus is platform-specific. A
- user can moves the focus in various ways, usually by clicking the
- target window. A program can use the @method[window<%> focus] method
- to move the focus to a subwindow or to set the initial focus.
-
- A @indexed-racket['wheel-up] or @indexed-racket['wheel-down]
- event may be sent to a window other than the one with the keyboard
- focus, depending on how the operating system handles wheel events.
-
- A key-press event may correspond to either an actual key press or an
- auto-key repeat. Multiple key-press events without intervening
- key-release events normally indicate an auto-key. Like any input
- event, however, key-release events sometimes get dropped (e.g., due
- to the appearance of a modal dialog).}
-
-]
-
-Controls, such as buttons and list boxes, handle keyboard and mouse
- events automatically, eventually invoking the callback procedure that
- was provided when the control was created. A canvas propagates mouse
- and keyboard events to its @method[canvas<%> on-event] and
- @method[canvas<%> on-char] methods, respectively.
-
-@index['("events" "delivery")]{A} mouse and keyboard event is
- delivered in a special way to its window. Each ancestor of the
- receiving window gets a chance to intercept the event through the
- @method[window<%> on-subwindow-event] and @method[window<%>
- on-subwindow-char] methods. See the method descriptions for more
- information.
-
-@index['("keyboard focus" "navigation")]{The} default
- @method[window<%> on-subwindow-char] method for a top-level window
- intercepts keyboard events to detect menu-shortcut events and
- focus-navigation events. See @xmethod[frame% on-subwindow-char] and
- @xmethod[dialog% on-subwindow-char] for details.  Certain OS-specific
- key combinations are captured at a low level, and cannot be
- overridden. For example, on Windows and Unix, pressing and releasing
- Alt always moves the keyboard focus to the menu bar. Similarly,
- Alt-Tab switches to a different application on Windows. (Alt-Space
- invokes the system menu on Windows, but this shortcut is
- implemented by @method[top-level-window<%> on-system-menu-char],
- which is called by @xmethod[frame% on-subwindow-char] and
- @xmethod[dialog% on-subwindow-char].)
-
-@; ------------------------------------------------------------------------
-
-@section[#:tag "eventspaceinfo"]{Event Dispatching and Eventspaces}
-
-@section-index["events" "dispatching"]
-
-A graphical user interface is an inherently multi-threaded system: one
- thread is the program managing windows on the screen, and the other
- thread is the user moving the mouse and typing at the keyboard. GUI
- programs typically use an @deftech{event queue} to translate this
- multi-threaded system into a sequential one, at least from the
- programmer's point of view. Each user action is handled one at a
- time, ignoring further user actions until the previous one is
- completely handled. The conversion from a multi-threaded process to a
- single-threaded one greatly simplifies the implementation of GUI
- programs.
-
-Despite the programming convenience provided by a purely sequential
- event queue, certain situations require a less rigid dialog with
- the user:
-
-@itemize[
-
- @item{@italic{Nested event handling:} In the process of handling an
- event, it may be necessary to obtain further information from the
- user. Usually, such information is obtained via a modal dialog; in
- whatever fashion the input is obtained, more user events must be
- received and handled before the original event is completely
- handled. To allow the further processing of events, the handler for
- the original event must explicitly @deftech{yield} to the
- system. Yielding causes events to be handled in a nested manner,
- rather than in a purely sequential manner.}
-
- @item{@italic{Asynchronous event handling:} An application may
- consist of windows that represent independent dialogs with the
- user. For example, a drawing program might support multiple drawing
- windows, and a particularly time-consuming task in one window (e.g.,
- a special filter effect on an image) should not prevent the user from
- working in a different window. Such an application needs sequential
- event handling for each individual window, but asynchronous
- (potentially parallel) event handling across windows. In other words,
- the application needs a separate event queue for each window, and a
- separate event-handling thread for each event queue.}
-
-]
-
-An @deftech{eventspace} is a context for processing GUI
- events. Each eventspace maintains its own queue of events, and events
- in a single eventspace are dispatched sequentially by a designated
- @deftech{handler thread}. An event-handling procedure running in this
- handler thread can yield to the system by calling @racket[yield], in
- which case other event-handling procedures may be called in a nested
- (but single-threaded) manner within the same handler thread. Events
- from different eventspaces are dispatched asynchronously by separate
- handler threads.
-
-@index['("dialogs" "modal")]{When} a frame or dialog is created
- without a parent, it is associated with the @tech{current eventspace}
- as described in @secref["currenteventspace"].  Events for a
- top-level window and its descendants are always dispatched in the
- window's eventspace.  Every dialog is modal; a dialog's
- @method[dialog% show] method implicitly calls @racket[yield] to
- handle events while the dialog is shown. (See also
- @secref["espacethreads"] for information about threads and modal
- dialogs.) Furthermore, when a modal dialog is shown, the system
- disables key and mouse press/release events to other top-level 
- windows in the dialog's eventspace, but
- windows in other eventspaces are unaffected by the modal dialog.
- (Mouse motion, enter, and leave events are still delivered to
- all windows when a modal dialog is shown.)
-
-
-@subsection{Event Types and Priorities}
-
-@section-index["events" "timer"]
-@section-index["events" "explicitly queued"]
-
-In addition to events corresponding to user and windowing actions,
- such as button clicks, key presses, and updates, the system
- dispatches two kinds of internal events: @tech{timer events} and
- @tech{explicitly queued events}.
-
-@deftech{Timer events} are created by instances of @racket[timer%]. When
- a timer is started and then expires, the timer queues an event to
- call the timer's @method[timer% notify] method. Like a top-level
- window, each timer is associated with a particular eventspace (the
- @tech{current eventspace} as described in
- @secref["currenteventspace"]) when it is created, and the timer
- queues the event in its eventspace.
-
-@deftech{Explicitly queued events} are created with
- @racket[queue-callback], which accepts a callback procedure to handle
- the event. The event is enqueued in the current eventspace at the
- time of the call to @racket[queue-callback], with either a high or
- low priority as specified by the (optional) second argument to
- @racket[queue-callback].
-
-An eventspace's event queue is actually a priority queue with events
- sorted according to their kind, from highest-priority (dispatched
- first) to lowest-priority (dispatched last):
-
-@itemize[
-
- @item{The highest-priority events are high-priority events installed
-   with @racket[queue-callback].}
-
- @item{Timer events have the second-highest priority.}
-
- @item{Graphical events, such as mouse clicks or window updates, have
-   the second-lowest priority.}
-
- @item{The lowest-priority events are low-priority events installed
-   with @racket[queue-callback].}
-
-]
-
-Although a programmer has no direct control over the order in which
- events are dispatched, a programmer can control the timing of
- dispatches by setting the @deftech{event dispatch handler} via the
- @racket[event-dispatch-handler] parameter. This parameter and other
- eventspace procedures are described in more detail in
- @secref["eventspace-funcs"].
-
-
-@subsection[#:tag "espacethreads"]{Eventspaces and Threads}
-
-When a new eventspace is created, a corresponding @tech{handler
- thread} is created for the eventspace. When the system dispatches an
- event for an eventspace, it always does so in the eventspace's
- handler thread. A handler procedure can create new threads that run
- indefinitely, but as long as the handler thread is running a handler
- procedure, no new events can be dispatched for the corresponding
- eventspace.
-
-When a handler thread shows a dialog, the dialog's @method[dialog%
- show] method implicitly calls @racket[yield] for as long as the
- dialog is shown. When a non-handler thread shows a dialog, the
- non-handler thread simply blocks until the dialog is
- dismissed. Calling @racket[yield] with no arguments from a
- non-handler thread has no effect. Calling @racket[yield] with a
- semaphore from a non-handler thread is equivalent to calling
- @racket[semaphore-wait].
-
-
-@subsection[#:tag "currenteventspace"]{Creating and Setting the Eventspace}
-
-Whenever a frame, dialog, or timer is created, it is associated with
- the @deftech{current eventspace} as determined by the
- @racket[current-eventspace] parameter @|SeeMzParam|.
-
-The @racket[make-eventspace] procedure creates a new
- eventspace. The following example creates a new eventspace and a new
- frame in the eventspace (the @racket[parameterize] syntactic form
- temporary sets a parameter value):
-
-@racketblock[
-(let ([new-es (make-eventspace)])
-  (parameterize ([current-eventspace new-es])
-    (new frame% [label "Example"])))
-]
-
-When an eventspace is created, it is placed under the management of
- the @tech[#:doc reference-doc]{current custodian}. When a custodian
- shuts down an eventspace, all frames and dialogs associated with the
- eventspace are destroyed (without calling @method[top-level-window<%>
- can-close?]  or @xmethod[top-level-window<%> on-close]), all timers
- in the eventspace are stopped, and all enqueued callbacks are
- removed.  Attempting to create a new window, timer, or explicitly
- queued event in a shut-down eventspace raises the @racket[exn:misc]
- exception.
-
-An eventspace is a @techlink[#:doc reference-doc]{synchronizable
- event} (not to be confused with a GUI event), so it can be used with
- @racket[sync]. As a synchronizable event, an eventspace is in a
- blocking state when a frame is visible, a timer is active, a callback
- is queued, or a @racket[menu-bar%] is created with a @racket['root]
- parent. (Note that the blocking state of an eventspace is unrelated
- to whether an event is ready for dispatching.)
-
-@subsection[#:tag "evtcontjump"]{Continuations and Event Dispatch}
-
-Whenever the system dispatches an event, the call to the handler is
- wrapped with a @deftech{continuation prompt} (see
- @racket[call-with-continuation-prompt]) that delimits continuation
- aborts (such as when an exception is raised) and continuations
- captured by the handler. The delimited continuation prompt is
- installed outside the call to the @tech{event dispatch handler}, so
- any captured continuation includes the invocation of the @tech{event
- dispatch handler}.
-
-For example, if a button callback raises an exception, than the abort
- performed by the default exception handler returns to the event-dispatch
- point, rather than terminating the program or escaping past an enclosing 
- @racket[(yield)]. If @racket[with-handlers] wraps a @racket[(yield)] that
- leads to an exception raised by a button callback, however, the exception
- can be captured by the @racket[with-handlers].
-
-Along similar lines, if a button callback captures a continuation
- (using the default continuation prompt tag), then applying the
- continuation re-installs only the work to be done by the handler up
- until the point that it returns; the dispatch machinery to invoke the
- button callback is not included in the continuation. A continuation
- captured during a button callback is therefore potentially useful
- outside of the same callback.
-
-@subsection{Logging}
-
-The GUI system logs the timing of when events are handled and how
-long they take to be handled. Each event that involves a callback
-into Racket code has two events logged, both of which use
-the @racket[gui-event] struct:
-@racketblock[(struct gui-event (start end name) #:prefab)]
-The @racket[_start] field is the result of @racket[(current-inexact-milliseconds)]
-when the event handling starts. The @racket[_end] field is 
-@racket[#f] for the log message when the event handling starts,
-and the result of @racket[(current-inexact-milliseconds)] when
-it finishes for the log message when an event finishes.
-The @racket[_name] field is
-the name of the function that handled the event; in the case of a
-@racket[queue-callback]-based event, it is the name of the thunk passed to
-@racket[queue-callback].
-
-@section[#:tag "animation"]{Animation in Canvases}
-
-The content of a canvas is buffered, so if a canvas must be redrawn,
-the @method[canvas% on-paint] method or @racket[paint-callback] function
-usually does not need to be called again. To further reduce flicker,
-while the @method[canvas% on-paint] method or @racket[paint-callback] function
-is called, the windowing system avoids flushing the canvas-content
-buffer to the screen.
-
-Canvas content can be updated at any time by drawing with the result
-of the canvas's @method[canvas<%> get-dc] method, and drawing is
-thread-safe. Changes to the canvas's content are flushed to the screen
-periodically (not necessarily on an event-handling boundary), but the
-@method[canvas<%> flush] method immediately flushes to the screen---as
-long as flushing has not been suspended. The @method[canvas<%>
-suspend-flush] and @method[canvas<%> resume-flush] methods suspend and
-resume both automatic and explicit flushes, although on some
-platforms, automatic flushes are forced in rare cases.
-
-For most animation purposes, @method[canvas<%> suspend-flush],
-@method[canvas<%> resume-flush], and @method[canvas<%> flush] can be
-used to avoid flicker and the need for an additional drawing buffer
-for animations.  During an animation, bracket the construction of each
-animation frame with @method[canvas<%> suspend-flush] and
-@method[canvas<%> resume-flush] to ensure that partially drawn frames
-are not flushed to the screen. Use @method[canvas<%> flush] to ensure
-that canvas content is flushed when it is ready if a @method[canvas<%>
-suspend-flush] will soon follow, because the process of flushing to
-the screen can be starved if flushing is frequently suspend.  The
-method @xmethod[canvas% refresh-now] conveniently encapsulates this
-sequence.
-
-@; ----------------------------------------
-
-@section[#:tag "display-resolution"]{Screen Resolution and Text Scaling}
-
-On Mac OS X, screen sizes are described to users in terms of drawing
-units. A Retina display provides two pixels per drawing unit, while
-drawing units are used consistently for window sizes, child window
-positions, and canvas drawing. A ``point'' for font sizing is
-equivalent to a drawing unit.
-
-On Windows, screen sizes are described to users in terms of pixels,
-while a scale can be selected independently by the user to apply to
-text and other items. Typical text scales are 125%, 150%, and
-200%. The @racketmodname[racket/gui] library uses this scale for all
-GUI elements, including the screen, windows, buttons, and canvas
-drawing. For example, if the scale is 200%, then the screen size
-reported by @racket[get-display-size] will be half of the number of
-pixels in each dimension. Beware that round-off effects can cause the
-reported size of a window to be different than a size to which a
-window has just been set.  A ``point'' for font sizing is equivalent
-to @racket[(/ 96 72)] drawing units.
-
-On Unix, the @racketmodname[racket/gui] library always uses the
-drawing units of the X11 server, and it uses a backing scale of
-@math{1.0} for screen and canvas-compatible bitmaps.  A ``point'' for
-font sizing is equivalent to @racket[(/ 96 72)] drawing units.
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/window-intf.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/window-intf.scrbl
deleted file mode 100644
index 1b82aa1dc3..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/window-intf.scrbl
+++ /dev/null
@@ -1,605 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label (only-in ffi/unsafe cpointer?)))
-
-@definterface/title[window<%> (area<%>)]{
-
-A @racket[window<%>] object is an @racket[area<%>] with a graphical
- representation that can respond to events.
-
-All @racket[window<%>] classes accept the following named instantiation
- arguments:
-@itemize[
-
- @item{@indexed-racket[enabled] --- default is @racket[#t]; passed to
-@method[window<%> enable] if @racket[#f]}
-
-]
-
-
-
-
-@defmethod*[([(accept-drop-files)
-              boolean?]
-             [(accept-drop-files [accept-files? any/c])
-              void?])]{
-
-@index["drag-and-drop"]{Enables} or disables drag-and-drop dropping
- for the window, or gets the enable state. Dropping is initially
- disabled. See also @method[window<%> on-drop-file].
-}
-
-@defmethod[(client->screen [x position-integer?]
-                           [y position-integer?])
-           (values position-integer?
-                   position-integer?)]{
-
-@index["global coordinates"]{Converts} local window coordinates to
-screen coordinates.
-
-On Mac OS X, the screen coordinates start with @math{(0, 0)} at the
-upper left of the menu bar. In contrast, @xmethod[top-level-window<%>
-move] considers @math{(0, 0)} to be below the menu bar. See also
-@racket[get-display-left-top-inset].
-
-}
-
-@defmethod[(enable [enable? any/c])
-           void?]{
-
-Enables or disables a window so that input events are ignored. (Input
- events include mouse events, keyboard events, and close-box clicks,
- but not focus or update events.) When a window is disabled, input
- events to its children are also ignored.
-
-@MonitorMethod[@elem{The enable state of a window} @elem{enabling a parent window} @elem{@method[window<%> on-superwindow-enable]} @elem{enable state}]
-
-If @racket[enable?] is true, the window is enabled, otherwise it is
- disabled.
-
-}
-
-@defmethod[(focus)
-           void?]{
-
-@index['("keyboard focus" "setting")]{Moves} the keyboard focus to the
- window, relative to its top-level window, if the window ever accepts
- the keyboard focus.  If the focus is in the window's top-level
- window, then the focus is immediately moved to this
- window. Otherwise, the focus is not immediately moved, but when the
- window's top-level window gets the keyboard focus, the focus is
- delegated to this window.
-
-See also
-@method[window<%> on-focus].
-
-Note that on Unix, keyboard focus can move to the menu bar
- when the user is selecting a menu item.
-
-@MonitorMethod[@elem{The current keyboard focus window} @elem{the user} @elem{@method[window<%> on-focus]} @elem{focus}]
-
-}
-
-
-@defmethod[(get-client-handle) cpointer?]{
-
-Returns a handle to the ``inside'' of the window for the current
-platform's GUI toolbox. The value that the pointer represents depends
-on the platform:
-
-@itemize[
-
- @item{Windows: @tt{HWND}}
-
- @item{Mac OS X: @tt{NSView}}
-
- @item{Unix: @tt{GtkWidget}}
-
-]
-
-See also @method[window<%> get-handle].}
-
-
-@defmethod[(get-client-size)
-           (values dimension-integer?
-                   dimension-integer?)]{
-
-Gets the interior size of the window in pixels. For a container, the
- interior size is the size available for placing subwindows (including
- the border margin). For a canvas, this is the visible drawing
- area.
-
-The client size is returned as two values: width and height (in pixels).
-
-See also
-@method[area-container<%> reflow-container].
-
-}
-
-
-@defmethod[(get-cursor)
-           (or/c (is-a?/c cursor%) #f)]{
-
-Returns the window's cursor, or @racket[#f] if this window's cursor
- defaults to the parent's cursor.  See
-@method[window<%> set-cursor] for more information.
-
-}
-
-
-@defmethod[(get-handle) cpointer?]{
-
-Returns a handle to the ``outside'' of the window for the current platform's GUI
-toolbox. The value that the pointer represents depends on the
-platform:
-
-@itemize[
-
- @item{Windows: @tt{HWND}}
-
- @item{Mac OS X: @tt{NSWindow} for a @racket[top-level-window<%>] object,
-       @tt{NSView} for other windows}
-
- @item{Unix: @tt{GtkWidget}}
-
-]
-
-See also @method[window<%> get-client-handle].}
-
-
-@defmethod[(get-height)
-           dimension-integer?]{
-
-Returns the window's total height (in pixels).
-
-See also
-@method[area-container<%> reflow-container].
-
-}
-
-@defmethod[(get-label)
-           (or/c label-string? 
-                 (is-a?/c bitmap%)
-                 (or/c 'app 'caution 'stop) 
-                 (list/c (is-a?/c bitmap%)
-                         label-string?
-                         (or/c 'left 'top 'right 'bottom))
-                 #f)]{
-
-Gets a window's label, if any. Control windows generally display their
- label in some way. Frames and dialogs display their label as a window
- title. Panels do not display their label, but the label can be used
- for identification purposes. Messages, buttons, and check boxes can
- have bitmap labels (only when they are created with bitmap labels),
- but all other windows have string labels. In addition, a message
- label can be an icon symbol @racket['app], @racket['caution], or
- @racket['stop], and a button can have both a bitmap label and a
- string label (along with a position for the bitmap).
-
-A label string may contain @litchar{&}s, which serve as
- keyboard navigation annotations for controls on Windows and Unix. The
- ampersands are not part of the displayed label of a control; instead,
- ampersands are removed in the displayed label (on all platforms),
- and any character preceding an ampersand is underlined (Windows and
- Unix) indicating that the character is a mnemonic for the
- control. Double ampersands are converted into a single ampersand
- (with no displayed underline). See also
- @method[top-level-window<%> on-traverse-char].
-
-If the window does not have a label, @racket[#f] is returned.
-
-}
-
-
-@defmethod[(get-plain-label)
-           (or/c string? #f)]{
-
-Like
-@method[window<%> get-label], except that:
-
-@itemlist[
-
- @item{If the label includes @litchar{(&}@racket[_c]@litchar{)} for
-       any character @racket[_c], then the sequenece and any surrounding
-       whitespace is removed.}
-
- @item{If the label contains @litchar{&}@racket[_c] for any character @racket[_c],
-       the @litchar{&} is removed.}
-
- @item{If the label contains a tab character, then the tab character and all following
-       characters are removed.}
-
-]
-
-See also @racket[button%]'s handling of labels.
-
-If the window has
- no label or the window's
- label is not a string, @racket[#f] is returned.
-
-}
-
-
-@defmethod[(get-size)
-           (values dimension-integer?
-                   dimension-integer?)]{
-
-Gets the current size of the entire window in pixels, not counting
- horizontal and vertical margins. (On Unix, this size does not include
- a title bar or borders for a frame/dialog.) See also
-@method[window<%> get-client-size].
-
-The geometry is returned as two values: width and height (in pixels).
-
-See also
-@method[area-container<%> reflow-container].
-
-}
-
-
-@defmethod[(get-width)
-           dimension-integer?]{
-
-Returns the window's current total width (in pixels).
-
-See also
-@method[area-container<%> reflow-container].
-
-}
-
-@defmethod[(get-x)
-           position-integer?]{
-
-Returns the position of the window's left edge in its
- parent's coordinate system.
-
-See also
-@method[area-container<%> reflow-container].
-
-}
-
-@defmethod[(get-y)
-           position-integer?]{
-
-Returns the position of the window's top edge in its
- parent's coordinate system.
-
-See also
-@method[area-container<%> reflow-container].
-
-}
-
-
-@defmethod[(has-focus?)
-           boolean?]{
-
-Indicates whether the window currently has the keyboard focus. See
- also
-@method[window<%> on-focus].
-
-}
-
-
-@defmethod[(is-enabled?)
-           boolean?]{
-
-Indicates whether the window is currently enabled or not. The result is
- @racket[#t] if this window is enabled when its ancestors are enabled, or
- @racket[#f] if this window remains disable when its ancestors are
- enabled. (That is, the result of this method is affected only by calls
- to @method[window<%> enable] for @this-obj[], not by the enable state of
- parent windows.)}
-
-
-@defmethod[(is-shown?)
-           boolean?]{
-
-Indicates whether the window is currently shown or not. The result is
- @racket[#t] if this window is shown when its ancestors are shown, or
- @racket[#f] if this window remains hidden when its ancestors are
- shown. (That is, the result of this method is affected only by calls
- to @method[window<%> show] for @this-obj[], not by the visibility of
- parent windows.)}
-
-
-@defmethod[(on-drop-file [pathname path?])
-           void?]{
-
-@index["drag-and-drop"]{Called} when the user drags a file onto the
- window. (On Unix, drag-and-drop is supported via the XDND
- protocol.) Drag-and-drop must first be enabled for the window with
- @method[window<%> accept-drop-files].
-
-On Mac OS X, when the application is running and user
- double-clicks an application-handled file or drags a file onto the
- application's icon, the main thread's application file handler is
- called (see
-@racket[application-file-handler]). The default handler calls the
-@method[window<%> on-drop-file] method of the most-recently activated frame if drag-and-drop is
- enabled for that frame, independent of the frame's eventspace (but
- the method is called in the frame's eventspace's handler
- thread). When the application is not running, the filenames are
- provided as command-line arguments.
-
-}
-
-@defmethod[(on-focus [on? any/c])
-           void?]{
-@methspec{
-
-@index['("keyboard focus" "notification")]{Called} when a window
- receives or loses the keyboard focus. If the argument is @racket[#t],
- the keyboard focus was received, otherwise it was lost.
-
-Note that on Unix, keyboard focus can move to the menu bar
- when the user is selecting a menu item.
-
-}
-@methimpl{
-
-Does nothing.
-
-
-
-}}
-
-@defmethod[(on-move [x position-integer?]
-                    [y position-integer?])
-           void?]{
-@methspec{
-
-Called when the window is moved. (For windows that are not top-level
- windows, ``moved'' means moved relative to the parent's top-left
- corner.) The new position is provided to the method.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-
-@defmethod[(on-size [width dimension-integer?]
-                    [height dimension-integer?])
-           void?]{
-@methspec{
-
-Called when the window is resized. The window's new size (in pixels)
- is provided to the method. The size values are for the entire window,
- not just the client area.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(on-subwindow-char [receiver (is-a?/c window<%>)]
-                              [event (is-a?/c key-event%)])
-           boolean?]{
-@methspec{
-
-Called when this window or a child window receives a keyboard event.
- The
-@method[window<%> on-subwindow-char] method of the receiver's top-level window is called first (see
-@method[area<%> get-top-level-window]); if the return value is @racket[#f], then the
-@method[window<%> on-subwindow-char] method is called for the next child in the path to the receiver, and
- so on. Finally, if the receiver's
-@method[window<%> on-subwindow-char] method returns @racket[#f], the event is passed on to the receiver's
- normal key-handling mechanism.
-
-The @racket[event] argument is the event that was generated for the
- @racket[receiver] window.
-
-The atomicity limitation @method[window<%> on-subwindow-event] applies
- to @method[window<%> on-subwindow-char] as well. That is, an insufficiently cooperative
- @method[window<%> on-subwindow-char] method can effectively disable
- a control's handling of key events, even when it returns @racket[#f]
-
-BEWARE: The default
-@xmethod[frame% on-subwindow-char] and
-@xmethod[dialog% on-subwindow-char] methods consume certain keyboard events (e.g., arrow keys, Enter) used
- for navigating within the window. Because the top-level window gets
- the first chance to handle the keyboard event, some events never
- reach the ``receiver'' child unless the default frame or dialog
- method is overridden.
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-@defmethod[(on-subwindow-event [receiver (is-a?/c window<%>)]
-                               [event (is-a?/c mouse-event%)])
-           boolean?]{
-@methspec{
-
-Called when this window or a child window receives a mouse event.
- The
-@method[window<%> on-subwindow-event] method of the receiver's top-level window is called first (see
-@method[area<%> get-top-level-window]); if the return value is @racket[#f], the
-@method[window<%> on-subwindow-event] method is called for the next child in the path to the receiver, and
- so on. Finally, if the receiver's
-@method[window<%> on-subwindow-event] method returns @racket[#f],  the event is passed on to the
- receiver's normal mouse-handling mechanism. 
-
-The @racket[event] argument is the event that was generated for the
- @racket[receiver] window.
-
-If the @method[window<%> on-subwindow-event] method chain does not complete
- atomically (i.e., without requiring other threads to run) or does not complete
- fast enough, then the corresponding event may not be delivered to a target
- control, such as a button. In other words, an insufficiently cooperative
- @method[window<%> on-subwindow-event] method can effectively disable a
- control's handling of mouse events, even when it returns @racket[#f].
-
-}
-@methimpl{
-
-Returns @racket[#f].
-
-}}
-
-
-@defmethod[(on-subwindow-focus [receiver (is-a?/c window<%>)]
-                               [on? boolean?])
-           void?]{
-
-@methspec{
-
-Called when this window or a child window receives or loses the keyboard focus.
- This method is called after the @method[window<%> on-focus] method of @racket[receiver].
- The
-@method[window<%> on-subwindow-focus] method of the receiver's top-level window is called first (see
-@method[area<%> get-top-level-window]), then the
-@method[window<%> on-subwindow-focus] method is called for the next child in the path to the receiver, and
- so on.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(on-superwindow-enable [enabled? any/c])
-           void?]{
-
-@methspec{
-
-Called via the event queue whenever the enable state of a window has
- changed, either through a call to the window's
-@method[window<%> enable] method, or through the enabling/disabling of one of the window's
- ancestors. The method's argument indicates whether the window is now
- enabled or not.
-
-This method is not called when the window is initially created; it is
- called only after a change from the window's initial enable
- state. Furthermore, if an enable notification event is queued for the
- window and it reverts its enabled state before the event is
- dispatched, then the dispatch is canceled.
-
-If the enable state of a window's ancestor changes while the window is
- deleted (e.g., because it was removed with
-@method[area-container<%> delete-child]), then no enable events are queued for the deleted window. But if
- the window is later re-activated into an enable state that is
- different from the window's state when it was de-activated, then an
- enable event is immediately queued.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-@defmethod[(on-superwindow-show [shown? any/c])
-           void?]{
-
-@methspec{
-
-Called via the event queue whenever the visibility of a window has
- changed, either through a call to the window's
-@method[window<%> show], through the showing/hiding of one of the window's ancestors, or
- through the activating or deactivating of the window or its ancestor
- in a container (e.g., via
-@method[area-container<%> delete-child]). The method's argument indicates whether the window is now
- visible or not.
-
-This method is not called when the window is initially created; it is
- called only after a change from the window's initial
- visibility. Furthermore, if a show notification event is queued for
- the window and it reverts its visibility before the event is
- dispatched, then the dispatch is canceled.
-
-}
-@methimpl{
-
-Does nothing.
-
-}}
-
-@defmethod[(popup-menu [menu (is-a?/c popup-menu%)]
-                       [x position-integer?]
-                       [y position-integer?])
-           void?]{
-
-@popupmenuinfo["window" "window" ""]
-
-The @racket[menu] is popped up within the window at position
- (@racket[x], @racket[y]).
-
-}
-
-@defmethod[(refresh)
-           void?]{
-
-Enqueues an event to repaint the window.
-
-}
-
-@defmethod[(screen->client [x position-integer?]
-                           [y position-integer?])
-           (values position-integer?
-                   position-integer?)]{
-
-@index["global coordinates"]{Converts} global coordinates to window
- local coordinates. See also @racket[client->screen] for information
- on screen coordinates.
-
-}
-
-
-@defmethod[(set-cursor [cursor (or/c (is-a?/c cursor%) #f)])
-           void?]{
-
-Sets the window's cursor. Providing @racket[#f] instead of a cursor
- value removes the window's cursor.
-
-If a window does not have a cursor, it uses the cursor of its parent.
- Frames and dialogs start with the standard arrow cursor, and text
- fields start with an I-beam cursor. All other windows are created
- without a cursor.
-
-}
-
-
-@defmethod[(set-label [l label-string?])
-           void?]{
-
-Sets a window's label. The window's natural minimum size might be
- different after the label is changed, but the window's minimum size
- is not recomputed.
-
-If the window was not created with a label, or if the window was
- created with a non-string label, @racket[l] is ignored.
-
-See
-@method[window<%> get-label] for more information.
-
-}
-
-@defmethod[(show [show? any/c])
-           void?]{
-
-Shows or hides a window.
-
-@MonitorMethod[@elem{The visibility of a window} @elem{the user clicking the window's close box, for example} @elem{@method[window<%> on-superwindow-show] or @method[top-level-window<%> on-close]} @elem{visibility}]
-
-If @racket[show?] is @racket[#f], the window is hidden. Otherwise, the
-window is shown.
-
-}
-
-@defmethod[(warp-pointer [x position-integer?]
-                         [y position-integer?])
-           void?]{
-Moves the cursor to the given location in the window's local coordinates.
-
-}
-
-}
-
diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/wxme.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/wxme.scrbl
deleted file mode 100644
index 54c7374421..0000000000
--- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/wxme.scrbl
+++ /dev/null
@@ -1,648 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label wxme wxme/editor wxme/image racket/snip
-                     racket/gui/dynamic
-                     (except-in wxme/comment reader)
-                     (except-in wxme/xml reader)
-                     (except-in wxme/scheme reader)
-                     (except-in wxme/text reader)
-                     (except-in wxme/test-case reader)
-                     (except-in wxme/cache-image reader)))
-
-@(define-syntax-rule (in mod . content)
-   (begin
-     (define-syntax-rule (intro)
-       (begin (require (for-label mod))
-              . content))
-     (intro)))
-
-@title{WXME Decoding}
-
-@defmodule[wxme]{The @racketmodname[wxme] library provides tools for
-reading @tech{WXME} @racket[editor<%>]-format files (see
-@secref["editorfileformat"]) without the @racket[racket/gui] library.}
-
-
-@defproc[(is-wxme-stream? [in input-port?]) boolean?]{
-
-Peeks from @racket[in] and returns @racket[#t] if it starts with the
-magic bytes indicating a @tech{WXME}-format stream (see
-@secref["editorfileformat"]), @racket[#f] otherwise.}
-
-
-@defproc[(wxme-port->text-port [in input-port?] [close? any/c #t])
-         input-port?]{
-
-Takes an input port whose stream starts with @tech{WXME}-format data
-and returns an input port that produces a text form of the WXME
-content, like the result of opening a WXME file in DrRacket and saving
-it as text. 
-
-Unlike @racket[wxme-port->port], this function may take liberties
-with the snips in a way that would render a valid program invalid.
-For example, if the wxme stream @racket[in] contains
-a bitmap image, then there may not be a reasonable text-only version
-of it and thus @racket[wxme-port->port] might turn what would have been
-a valid Racket program into text that is a syntax error,
-Nevertheless, the result may still be useful for human readers or 
-approximate program-processing tools that run only in a GUI-less context.
-
-If @racket[close?] is true, then closing the result port closes the
-original port.
-
-See @secref["snipclassmapping"] for information about the kinds of
-non-text content that can be read.}
-
-
-@defproc[(wxme-port->port [in input-port?]
-                          [close? any/c #t]
-                          [snip-filter (any/c . -> . any/c) (lambda (_x) _x)])
-         input-port?]{
-
-Takes an input port whose stream starts with @tech{WXME}-format data
-and returns an input port that produces text content converted to
-bytes, and non-text content as ``special'' values (see
-@racket[read-char-or-special]).
-
-These special values produced by the new input port are different than
-the ones produced by reading a file into an @racket[editor<%>]
-object. Instead of instances of the @racket[snip%], the special values
-are typically simple extensions of @racket[object%].  See
-@secref["snipclassmapping"] for information about the kinds of
-non-text content that can be read.
-
-If @racket[close?] is true, then closing the result port close the
-original port.
-
-The @racket[snip-filter] procedure is applied to any special value
-generated for the stream, and its result is used as an alternate
-special value.
-
-If a special value (possibly produced by the filter procedure) is an
-object implementing the @racket[readable<%>] interface, then the
-object's @method[readable<%> read-special] method is called to produce
-the special value.}
-
-
-@defproc[(extract-used-classes [in input-port?])
-         (values (listof string?)
-                 (listof string?))]{
-
-Returns two values: a list of snip-class names used by the given
-stream, and a list of data-class names used by the stream. If the
-stream is not a @tech{WXME} stream, the result is two empty lists. The
-given stream is not closed, and only data for a @tech{WXME} stream (if
-any) is consumed.}
-
-
-@defproc[(register-lib-mapping! [str string?] 
-                                [mod-path (cons/c 'lib (listof string?))])
-         void?]{
-
-Maps a snip-class name to a quoted module path that provides a
-@racket[reader%] implementation. The module path must have the form
-@racket['(lib #,(racket _string ...))], where each @racket[_string]
-contains only alpha-numeric ASCII characters, @litchar{.},
-@litchar{_}, @litchar{-}, and spaces.}
-
-
-@defproc[(string->lib-path [str string?] [gui? any/c])
-         (cons/c 'lib (listof string?))]{
-
-Returns a quoted module path for @racket[str] for either
-@racket[editor<%>] mode when @racket[gui?] is true, or
-@racketmodname[wxme] mode when @racket[gui?] is @racket[#f]. For the
-latter, built-in mappings and mapping registered via
-@racket[register-lib-mapping!] are used. If @racket[str] cannot be
-parsed as a library path, and if no mapping is available (either
-because the class is built-in or not known), the result is
-@racket[#f].}
-
-
-@defboolparam[unknown-extensions-skip-enabled skip?]{
-
-A parameter. When set to #f (the default), an exception is raised when
-an unrecognized snip class is encountered in a @tech{WXME}
-stream. When set to a true value, instances of unrecognized snip
-classes are simply omitted from the transformed stream.}
-
-
-@defboolparam[broken-wxme-big-endian? big?]{
-
-A parameter. Some old and short-lived @tech{WXME} formats depended on
-the endian order of the machine where the file was saved. Set this
-parameter to pick the endian order to use when reading the file; the
-default is the current platform's endian order.}
-
-
-@defproc[(wxme-read [in input-port?]) any/c]{
-
-Like @racket[read], but for a stream that starts with
-@tech{WXME}-format data. If multiple S-expressions are in the
-@tech{WXME} data, they are all read and combined with
-@racket['begin].
-
-If @racket[racket/gui/base] is available (as determined by
-@racket[gui-available?]), then @racket[open-input-text-editor] is
-used. Otherwise, @racket[wxme-port->port] is used.}
-
-
-@defproc[(wxme-read-syntax [source-v any/c] [in input-port?])
-         (or/c syntax? eof-object?)]{
-
-Like @racket[read-syntax], but for a @tech{WXME}-format input stream.
-If multiple S-expressions are in the @tech{WXME} data, they are all
-read and combined with @racket['begin].
-
-If @racket[racket/gui/base] is available (as determined by
-@racket[gui-available?]), then @racket[open-input-text-editor] is
-used. Otherwise, @racket[wxme-port->port] is used.}
-
-
-@definterface[snip-reader<%> ()]{
-
-An interface to be implemented by a reader for a specific kind of data
-in a @tech{WXME} stream. The interface has two methods:
-@method[snip-reader<%> read-header] and @method[snip-reader<%> read-snip].
-
-@defmethod[(read-header [version exact-nonnegative-integer?]
-                        [stream (is-a?/c stream<%>)])
-           any]{
-
-Called at most once per @tech{WXME} stream to initialize the data
-type's stream-specific information. This method usually does nothing.}
-
-@defmethod[(read-snip [text-only? boolean?]
-                      [version exact-nonnegative-integer?]
-                      [stream (is-a?/c stream<%>)])
-           (if text-only?
-               bytes?
-               any/c)]{
-
-Called when an instance of the data type is encountered in the
-stream. This method reads the data and returns either bytes to be
-returned as part of the decoded stream or any other kind of value to
-be returned as a ``special'' value from the decoded stream. The result
-value can optionally be an object that implements
-@racket[readable<%>].
-
-The @racket[text-only?] argument is @racket[#f] when 
-@racket[wxme-port->text-port] was called and @racket[#t]
-when @racket[wxme-port->port] was called.
-}
-
-}
-
-@definterface[readable<%> ()]{
-
-An interface to be implemented by values returned from a snip reader.
-The only method is @method[readable<%> read-special].
-
-@defmethod[(read-special [source any/c]
-                         [line (or/c exact-nonnegative-integer? #f)]
-                         [column (or/c exact-nonnegative-integer? #f)]
-                         [position (or/c exact-nonnegative-integer? #f)])
-           any/c]{
-
-Like @method[readable-snip<%> read-special], but for non-graphical
-mode. When a value implements this interface, its @method[readable<%>
-read-special] method is called with source-location information to
-obtain the ``special'' result from the @tech{WXME}-decoding port.}
-
-}
-
-@definterface[stream<%> ()]{
-
-Represents a @tech{WXME} input stream for use by
-@racket[snip-reader<%>] instances.
-
-@defmethod[(read-integer [what any/c]) exact-integer?]{
-
-Reads an exact integer, analogous to @method[editor-stream-in%
-get-exact].
-
-The @racket[what] field describes what is being read, for
-error-message purposes, in case the stream does not continue with an
-integer.}
-
-@defmethod[(read-fixed-integer [what any/c]) exact-integer?]{
-
-Reads an exact integer that has a fixed size in the stream, analogous
-to @method[editor-stream-in% get-fixed].
-
-The @racket[what] argument is as for @method[stream<%> read-integer].}
-
-@defmethod[(read-inexact [what any/c]) (and/c real? inexact?)]{
-
-Reads an inexact real number, analogous to @method[editor-stream-in%
-get-inexact].
-
-The @racket[what] argument is as for @method[stream<%> read-integer].}
-
-@defmethod[(read-raw-bytes [what any/c]) bytes?]{
-
-Reads raw bytes, analogous to @method[editor-stream-in%
-get-unterminated-bytes].
-
-The @racket[what] argument is as for @method[stream<%> read-integer].}
-
-@defmethod[(read-bytes [what any/c]) bytes?]{
-
-Reads raw bytes, analogous to @method[editor-stream-in% get-bytes].
-
-The @racket[what] argument is as for @method[stream<%> read-integer].}
-
-@defmethod[(read-editor [what any/c]) input-port?]{
-
-Reads a nested editor, producing a new input port to extract the
-editor's content.
-
-The @racket[what] argument is as for @method[stream<%> read-integer].}
-}
-
-@defproc[(read-snip-from-port [name string?]
-                              [who any/c]
-                              [stream (is-a?/c stream<%>)])
-         bytes?]{
-  Given @racket[name], which is expected to be the name of a snipclass,
-  uses that snipclass to read from the given stream at the current point
-  in that stream. Returns the processed bytes, much like the
-  @method[snip-reader<%> read-snip] method.
-}
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "snipclassmapping"]{Snip Class Mapping}
-
-When graphical data is marshaled to the WXME format, it is associated
-with a snip-class name to be matched with an implementation at load
-time. See also @secref["editorsnipclasses"].
-
-Ideally, the snip-class name is generated as
-
-@racketblock[
-(format "~s" (list '(lib #,(racket _string ...))
-                   '(lib #,(racket _string ...))))
-]
-
-where each element of the @racket[format]ed list is a quoted module
-path (see @racket[module-path?]). The @racket[_string]s must contain only
-alpha-numeric ASCII characters, plus @litchar{.}, @litchar{_},
-@litchar{-}, and spaces, and they must not be @racket["."] or
-@racket[".."].
-
-In that case, the first quoted module path is used for loading
-@tech{WXME} files in graphical mode; the corresponding module must
-provide @racketidfont{snip-class} object that implements the
-@racket[snip-class%] class. The second quoted module path is used by
-the @racketmodname[wxme] library for converting @tech{WXME} streams
-without graphical support; the corresponding module must provide a
-@racketidfont{reader} object that implements the @racket[snip-reader<%>]
-interface. Naturally, the @racket[snip-class%] instance and
-@racket[snip-reader<%>] instance are expected to parse the same format, but
-generate different results suitable for the different contexts (i.e.,
-graphical or not).
-
-If a snip-class name is generated as
-
-@racketblock[
-(format "~s" '(lib #,(racket _string ...)))
-]
-
-then graphical mode uses the sole module path, and
-@racketmodname[wxme] needs a compatibility mapping. Install one with
-@racket[register-lib-mapping!].
-
-If a snip-class name has neither of the above formats, then graphical
-mode can use the data only if a snip class is registered for the name,
-or if it the name of one of the built-in classes: @racket["wxtext"],
-@racket["wxtab"], @racket["wximage"], or @racket["wxmedia"] (for
-nested editors). The @racketmodname[wxme] library needs a
-compatibility mapping installed with @racket[register-lib-mapping!]
-if it is not one of the built-in classes.
-
-Several compatibility mappings are installed automatically for the
-@racketmodname[wxme] library. They correspond to popular graphical
-elements supported by various versions of DrRacket, including comment
-boxes, fractions, XML boxes, Racket boxes, text boxes, and images
-generated by the @racketmodname[htdp/image #:indirect] teachpack (or, more
-generally, from @racketmodname[mrlib/cache-image-snip]), and test-case
-boxes.
-
-For a port created by @racket[wxme-port->port], nested editors are
-represented by instances of the @racket[editor%] class provided by the
-@racketmodname[wxme/editor] library. This class provides a single
-method, @method[editor% get-content-port], which returns a port for
-the editor's content. Images are represented as instances of the
-@racket[image%] class provided by the @racketmodname[wxme/image]
-library.
-
-Comment boxes are represented as instances of a class that extends
-@racket[editor%] to implement @racket[readable<%>]; see
-@racketmodname[wxme/comment]. The read form produces a special comment
-(created by @racket[make-special-comment]), so that the comment box
-disappears when @racket[read] is used to read the stream; the
-special-comment content is the readable instance. XML, Racket, and
-text boxes similarly produce instances of @racket[editor%] and
-@racket[readable<%>] that expand in the usual way; see
-@racketmodname[wxme/xml], @racketmodname[wxme/scheme], and
-@racket[wxme/text]. Images from the 
-@racketmodname[htdp/image #:indirect] teachpack
-are packaged as instances of @racket[cache-image%] from the
-@racketmodname[wxme/cache-image] library. Test-case boxes are packaged
-as instances of @racket[test-case%] from the
-@racketmodname[wxme/test-case] library.
-
-@; ----------------------------------------
-
-@subsection{Nested Editors}
-
-@defmodule[wxme/editor]
-
-@defclass[editor% object% ()]{
-
-Instantiated for plain nested editors in a @tech{WXME} stream in text
-mode.
-
-@defmethod[(get-content-port) input-port?]{
-
-Returns a port (like the one from @racket[wxme-port->port]) for the
-editor's content.}
-
-}
-
-@; ----------------------------------------
-
-@subsection{Images}
-
-@defmodule[wxme/image]
-
-@defclass[image% image-snip% ()]{
-
-Instantiated for images in a @tech{WXME} stream in text mode.
-This class can just be treated like @racket[image-snip%] and should
-behave just like it, except it has the methods below in addition
-in case old code still needs them. In other words, the methods
-below are provided for backwards compatibility with earlier 
-verisons of Racket.
-
-@defmethod[(get-data) (or/c bytes? #f)]{
-
-Returns bytes for a PNG, XBM,or XPM file for the image.}
-
-@defmethod[(get-w) (or/c exact-nonnegative-integer? -1)]{
-
-Returns the display width of the image, which may differ from the
-width of the actual image specified as data or by a filename; -1 means
-that the image data's width should be used.}
-
-@defmethod[(get-h) (or/c exact-nonnegative-integer? -1)]{
-
-Returns the display height of the image, which may differ from the
-height of the actual image specified as data or by a filename; -1
-means that the image data's height should be used.}
-
-@defmethod[(get-dx) exact-integer?]{
-
-Returns an offset into the actual image to be used
-as the left of the display image.}
-
-@defmethod[(get-dy) exact-integer?]{
-
-Returns an offset into the actual image to be used as the top of the
-display image.}
-
-}
-
-@; ----------------------------------------
-
-@section{DrRacket Comment Boxes}
-
-@defmodule[wxme/comment]
-
-@in[wxme/comment
-@defthing[reader (is-a?/c snip-reader<%>)]{
-
-A text-mode reader for comment boxes.}]
-
-
-@defclass[comment-editor% editor% (readable<%>)]{
-
-Instantiated for DrRacket comment boxes in a @tech{WXME} stream for
-text mode.
-
-@defmethod[(get-data) #f]{
-
-No data is available.
-
-}
-
-@defmethod[(read-special [source any/c]
-                         [line (or/c exact-nonnegative-integer? #f)]
-                         [column (or/c exact-nonnegative-integer? #f)]
-                         [position (or/c exact-nonnegative-integer? #f)])
-           any/c]{
-
-Generates a special comment using @racket[make-special-comment]. The
-special comment contains the comment text.}
-
-}
-
-@; ----------------------------------------
-
-@section{DrRacket XML Boxes}
-
-@defmodule[wxme/xml]
-
-@in[wxme/xml
-@defthing[reader (is-a?/c snip-reader<%>)]{
-
-A text-mode reader for XML boxes.}]
-
-
-@defclass[xml-editor% editor% (readable<%>)]{
-
-Instantiated for DrRacket XML boxes in a @tech{WXME} stream for text
-mode.
-
-@defmethod[(get-data) any/c]{
-
-Returns @racket[#t] if whitespace is elimited from the contained XML
-literal, @racket[#f] otherwise.}
-
-@defmethod[(read-special [source any/c]
-                         [line (or/c exact-nonnegative-integer? #f)]
-                         [column (or/c exact-nonnegative-integer? #f)]
-                         [position (or/c exact-nonnegative-integer? #f)])
-           any/c]{
-
-Generates a @racket[quasiquote] S-expression that enclosed the XML,
-with @racket[unquote] and @racket[unquote-splicing] escapes for nested
-Racket boxes.}
-
-}
-
-@; ----------------------------------------
-
-@section{DrRacket Racket Boxes}
-
-@defmodule[wxme/scheme]
-
-@in[wxme/scheme
-@defthing[reader (is-a?/c snip-reader<%>)]{
-
-A text-mode reader for Racket boxes.}]
-
-
-@defclass[racket-editor% editor% (readable<%>)]{
-
-Instantiated for DrRacket Racket boxes in a @tech{WXME} stream for text
-mode.
-
-@defmethod[(get-data) any/c]{
-
-Returns @racket[#t] if the box corresponds to a splicing unquote,
-@racket[#f] for a non-splicing unquote.}
-
-@defmethod[(read-special [source any/c]
-                         [line (or/c exact-nonnegative-integer? #f)]
-                         [column (or/c exact-nonnegative-integer? #f)]
-                         [position (or/c exact-nonnegative-integer? #f)])
-           any/c]{
-
-Generates an S-expression for the code in the box.}
-
-}
-
-@; ----------------------------------------
-
-@section{DrRacket Text Boxes}
-
-@defmodule[wxme/text]
-
-@in[wxme/text
-@defthing[reader (is-a?/c snip-reader<%>)]{
-
-A text-mode reader for text boxes.}]
-
-
-@defclass[text-editor% editor% (readable<%>)]{
-
-Instantiated for DrRacket text boxes in a @tech{WXME} stream for text
-mode.
-
-@defmethod[(get-data) #f]{
-
-No data is available.}
-
-@defmethod[(read-special [source any/c]
-                         [line (or/c exact-nonnegative-integer? #f)]
-                         [column (or/c exact-nonnegative-integer? #f)]
-                         [position (or/c exact-nonnegative-integer? #f)])
-           any/c]{
-
-Generates a string containing the text.}
-
-}
-
-@; ----------------------------------------
-
-@section{DrRacket Fractions}
-
-@defmodule[wxme/number]
-
-@in[wxme/number
-@defthing[reader (is-a?/c snip-reader<%>)]{
-
-A text-mode reader for DrRacket fractions that generates exact,
-rational numbers.}]
-
-@; ----------------------------------------
-
-@section{DrRacket Teachpack Images}
-
-@defmodule[wxme/cache-image]
-
-@in[wxme/cache-image
-@defthing[reader (is-a?/c snip-reader<%>)]{
-
-A text-mode reader for images in a WXME stream generated by the
-@racketmodname[htdp/image #:indirect] teachpack---or, more generally, by
-@racketmodname[mrlib/cache-image-snip].}]
-
-
-@defclass[cache-image% object% ()]{
-
-Instantiated for DrRacket teachpack boxes in a @tech{WXME} stream for
-text mode.
-
-@defmethod[(get-argb) (vectorof byte?)]{
-
-Returns a vector of bytes representing the content of the image.}
-
-@defmethod[(get-width) exact-nonnegative-integer?]{
-
-Returns the width of the image.}
-
-@defmethod[(get-height) exact-nonnegative-integer?]{
-
-Returns the height of the image.}
-
-@defmethod[(get-pin-x) exact-integer?]{
-
-Returns an offset across into the image for the pinhole.}
-
-@defmethod[(get-pin-y) exact-integer?]{
-
-Returns an offset down into the image for the pinhole.}
-
-}
-
-@section{DrRacket Test-Case Boxes}
-
-@defmodule[wxme/test-case]
-
-@in[wxme/test-case
-@defthing[reader (is-a?/c snip-reader<%>)]{
-
-A text-mode reader for DrRacket test-case boxes in a WXME stream. It
-generates instances of @racket[test-case%].}]
-
-@defclass[test-case% object% ()]{
-
-Instantiated for old-style DrRacket test-case boxes in a @tech{WXME}
-stream for text mode.
-
-@defmethod[(get-comment) (or/c #f input-port?)]{
-
-Returns a port for the comment field, if any.}
-
-@defmethod[(get-test) input-port?]{
-
-Returns a port for the ``test'' field.}
-
-@defmethod[(get-expected) input-port?]{
-
-Returns a port for the ``expected'' field.}
-
-@defmethod[(get-should-raise) (or/c #f input-port?)]{
-
-Returns a port for the ``should raise'' field, if any.}
-
-@defmethod[(get-error-message) (or/c #f input-port?)]{
-
-Returns a port for the ``error msg'' field, if any.}
-
-@defmethod[(get-enabled?) boolean?]{
-
-Returns @racket[#t] if the test is enabled.}
-
-@defmethod[(get-collapsed?) boolean?]{
-
-Returns @racket[#t] if the test is collapsed.}
-
-@defmethod[(get-error-box?) boolean?]{
-
-Returns @racket[#t] if the test is for an exception.}
-
-}
diff --git a/pkgs/gui-pkgs/gui-lib/LICENSE.txt b/pkgs/gui-pkgs/gui-lib/LICENSE.txt
deleted file mode 100644
index a9cb8c368f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-gui-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/doc.txt b/pkgs/gui-pkgs/gui-lib/embedded-gui/doc.txt
deleted file mode 100644
index 2f0affea80..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/doc.txt
+++ /dev/null
@@ -1,390 +0,0 @@
-[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]
-
-                     _embedded_gui.ss_
-
-[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]
-
-The embedded gui collection provides a class hierarchy for
-creating graphical boxes within mred's editors with geometry
-management that mirrors that of vertical-panel% and
-horizontal-panel%
-
-============================================================
-
-The _aligned-pasteboard%_ class is derived from pasteboard%
-It implements alignment-parent<%> and acts as the top of an
-alignment<%> tree.
-
-============================================================
-
-_alignment<%> is derived from dllist<%> and requires the
-following additional methods.
-
-> (send an-alignment get-parent) -> (is-a?/c alignment-parent<%>)
-
-The parent of the alignment in the tree.
-
-> (send an-alignment set-min-sizes) -> void
-
-Tells the alignment that its sizes should be calculated
-      
-> (send an-alignment align x-offset y-offset width height) -> void
-  x-offset : nonnegative?
-  y-offset : nonnegative?
-  width : nonnegative?
-  height : nonnegative?
-      
-Tells the alignment to align its children on the pasteboard
-in the given rectangle defined by a width, height and a top
-left corner point given as offsets into the pasteboards top
-left corner.
-
-> (send an-alignment get-min-width) -> nonnegative?
-
-The minimum width this alignment must be
-      
-> (send an-alignment get-min-height) -> nonnegative?
-
-The minimum height this alignment must be
-      
-> (send an-alignment stretchable-width value) -> void
-  value : boolean?
-
-Sets the property of stretchability in the x dimension
-
-> (send an-alignment stretchable-width) -> boolean?
-
-True if the alignment can be stretched in the x dimension
-      
-> (send an-alignment stretchable-height value) -> void
-  value : boolean?
-
-Sets the property of stretchability in the y dimension
-
-> (send an-alignment stretchable-height) -> boolean?
-
-True if the alignment can be stretched in the y dimension
-      
-> (send an-alignment show/hide show?) -> void
-  show? : boolean?
-  
-Tells the alignment to show or hide its children
-      
-> (send an-alignment show show?) -> void
-  show? : boolean?
-
-Tells the alignment that its show state is the given value
-and it should show or hide its children accordingly.
-
-============================================================
-
-_alignment-parent<%>_s implement the following methods.
-
-> (send an-alignment-parent get-pasteboard) -> (is-a?/c pasteboard%)
-
-The pasteboard that this alignment is being displayed to
-      
-> (send an-alignment-parent add-child child) -> void
-  child : (is-a?/c alignment<%>)
-  after : (union (is-a?/c alignment<%>) false?) = false
-
-Add the given alignment as a child after the existing child
-      
-> (send an-alignment-parent delete-child child) -> void
-  child : (is-a?/c alignment<%>)
-
-Deletes a child from the alignments
-
-> (send an-alignment-parent is-shown?) -> boolean?
-
-True if the alignment is being shown (accounting for its parent being shown)
-
-============================================================
-
-The _stretchable-snip<%>_ interface must be implemented
-by any snip class who's objects will be stretchable when
-inserted into an aligned-pasteboard<%> within a
-snip-wrapper%.
-
-> (send a-stretchable-snip get-aligned-min-width) -> nonnegative?
-
-The minimum width that the snip can be resized to
-
-> (send a-stretchable-snip get-aligned-min-height) -> nonnegative?
-
-The minimum height that the snip can be resized to
-
-> (send a-stretchable-snip stretchable-width) -> boolean?
-
-Whether or not the snip can be stretched in the X dimension
-
-> (send a-stretchable-snip stretchable-height) -> boolean?
-
-Whether or not the snip can be stretched in the Y dimension
-
-============================================================
-
-_dllist<%>_ is an interface which makes a class a
-doubly-linked list and requires the following methods
-
-> (send a-dlllist next) -> (is-a?/c dllist<%>)
-
-The next item in the list
-
-> (send a-dllist next new-next) -> void
-  new-next : (is-a?/c dllist<%>)
-
-Set the next field to be the given dllist
-
-> (send a-dllist prev) -> (is-a?/c dllist<%>)
-
-The previous item in the list
-
-> (send a-dllist prev new-prev) -> void
-  new-prev : (is-a?/c dllist<%>)
-
-Set the previous field to be the given dllist
-
-> (send a-dllist for-each f) -> void
-  f : ((is-a?/c dllist<%>) . -> . void)
-
-Applies f to every element of the dllist
-
-> (send a-dllist map-to-list f) -> (listof any?)
-  f : ((is-a?/c dllist<%>) . -> . any?)
-
-A Scheme list of the results of applying f to every element
-of the dllist.
-
-============================================================
-
-_vertical-alignment%_ and _horizontal-alignment%_ are
-geometry management classes of the embedded-gui toolkit. They
-implement alignment<%> and alignment-parent<%> and are
-instantiated as follows
-
-> (new vertical-alignment% (parent _) [(show? _)] [(after _)])
-  parent : (is-a?/c alignment-parent<%>)
-  show? : boolean? = true
-  after : (union (is-a?/c alignment<%>) false?) = false
-
-Inserts a new vertical alignment into the parent optionally
-after a given alignment also in the parent. The alignment
-can be initially shown or hidden.
-
-============================================================
-
-_snip-wrapper%_ is an alignment<%> that introduces a snip
-into the alignment tree. snip%s are not instantiated with
-a parent nor do they implement alignment<%>. snip-wrapper%
-is an adapter for snip%s.
-
-> (new snip-wrapper% (parent _) (snip _))
-  parent : (is-a?/c alignment-parent<%>)
-  snip : (is-a?/c snip%)
-
-============================================================
-
-_text-button-snip%_, button-snip%, and toggle-button-snip%
-are three derivative snip% classes that act like buttons
-when inserted into an editor.
-
-Note: In order to allow the buttons to be pushed the editor
-in which they appear must forward clicks to them properly.
-(see click-forwarding-editor-mixin)
-
-> (new text-button-snip% (label _) (callback _))
-  label : string?
-  callback : ((is-a?/c text-button-snip%) (is-a?/c event%) . -> . void)
-
-> (new button-snip% (images _) (callback _))
-  images : (pair string? string?)
-  callback : ((is-a?/c button-snip%) (is-a?/c event%) . -> . void)
-
-The images argument is a pair filenames to be load as the
-button image. The car of the pair is the normal button and the
-cdr of the pair is the depressed button image.
-
-> (new toggle-button-snip% (images-off _) (images-on _) (turn-off _) (turn-on _) [(state _)])
-  images-off : (pair string string)
-  images-on : (pair string string)
-  turn-on : ((is-a?/c toggle-button-snip%) (is-a?/c event%) . -> . void)
-  turn-off : ((is-a?/c toggle-button-snip%) (is-a?/c event%) . -> . void)
-  state : (symbols 'on 'off) = 'on
-
-Like button-snip but given two pairs of images, images-on
-and images-off, and two callback, turn-on and turn-off. The
-initial can be passed as an argument but is by default on.
-
-============================================================
-
-_embedded-button%_, _embedded-text-button%_, and
-_embedded-toggle-button%_ are button classes derived from
-snip-wrapper% that wrap their corresponding snip% derivative
-buttons from above. The embedded buttons implement
-alignment<%> and take an addition parent init argument.
-
-============================================================
-
-The _embedded-message%_ is a label with no IO.
-
-> (new embedded-message% (parent _) (label _))
-  parent : (is-a?/c alignment-parent<%>)
-  label : string?
-
-============================================================
-
-_fixed-width-label-snip_ makes it easy to align GUI elements
-that are labeled with arbitrary strings.
-fixed-width-label-snip is an abstract snip% class that takes
-a list of strings, labels, and returns a snip% class. The
-returned class may be instantiated with a string, label,
-argument matching any of the strings in the list. The
-resultant object is a snip% displaying label with a width as
-wide as is required to display the longest string in labels.
-
-============================================================
-
-_vline%_ and _hline%_ are two graphical elements of the
-alignment<%> hierarchy that display a vertical or horizontal
-line across the region they are inserted into. They implement
-alignment<%>.
-
-> (new vline% (parent _))
-  parent : (is-a?/c alignment-parent<%>)
-
-============================================================
-
-_stretchable-editor-snip-mixin_ gives an editor snip the
-_stretchable-snip<%>_ interface allowing it to be stretched
-to fit its alignment-parent<%>'s alloted width. Stretchable
-snips are useful as the snip of a snip-wrapper%.
-
-_stretchable-editor-snip%_ is (stretcable-editor-snip-mixin editor-snip%)
-
-> (new stretchable-editor-snip% [(stretchable-width _)] [(stretchable-height _)])
-  stretchable-width : boolean? = true
-  stretchable-height : boolean? = true
-
-============================================================
-
-_tabbable-text<%>_ is an interface for tabbing between
-text%s. It requires the following methods.
-
-> (send a-tabbable-text set-caret-owner) -> void
-
-Takes the caret into the tabbable-text<%>
-
-> (send a-tabbable-text set-ahead) -> void
-
-The thunk to execute when tabbing ahead
-
-> (send a-tabbable-text set-back) -> void
-
-The thunk to execute when tabbing back
-
-============================================================
-
-_tabbable-text-mixin_ gives a text% the tabbable-text<%>
-interface and gives it key bindings to tab ahead and back.
-
-============================================================
-
-The _set-tabbing_ function sets the tabbing order of
-tabbable-text<%>s by setting each text's set-ahead and
-set-back thunks to point to its neighbor in the argument
-list.
-
-> (set-tabbing a-text ...)
-  a-text : (is-a?/c tabbable-text<%>)
-
-============================================================
-
-The _grey-editor-snip-mixin_ and _grey-editor-mixin_ give an
-editor-snip% and editor% a colored background indicating they
-are disabled. The editor is not disabled by the mixin however,
-and must be locked separately.
-
-============================================================
-
-The _single-line-text-mixin_ restricts a text to one line by
-overriding its key bindings to do nothing on enter.
-
-============================================================
-
-The _cue-text-mixin_ gives a text% an instantiation argument
-of a string that is displayed in the text% initially in grey.
-This text disappears when the text gets focus. This is
-useful for labeling texts without needing to take up space.
-
-_cue-text%_ is (cue-text-mixin text%)
-
-> (new cue-text% [(cue-text _)])
-  cue-text : string? = ""
-  color : string = "gray"
-  behavior : (listof (symbols 'on-focus 'on-char)) = '(on-focus)
-
-> (send a-cue-text clear-cue-text)
-
-Clears the cue text, if it's still present.
-
-============================================================
-
-The following functions are useful for working with snips
-
-> (snip-width snip) -> number?
-  snip : (is-a?/c snip%)
-
-The width of a snip in the parent pasteboard
-    
-> (snip-height snip)
-  snip : (is-a?/c snip%)
-
-The height of a snip in the parent pasteboard
-  
-> (snip-min-width snip)
-  snip : (is-a?/c snip%)
-
-The minimum width of the snip
-  
-> (snip-min-height snip)
-  snip : (is-a?/c snip%)
-
-The minimum height of the snip
-  
-> (snip-parent snip)
-  snip : (is-a?/c snip%)
-
-The pasteboard that contains the snip
-  
-> (fold-snip f init-acc snip) -> any?
-  f : ((is-a?/c snip%) any? . -> . any?)
-  init-acc : any?
-  snip : (is-a?/c snip%)
-
-The application of f on all snips from snip to the end in a
-foldl foldr manner
-  
-> (for-each-snip f first-snip init-lists ...) -> void
-  f : ((is-a?/c snip%) . -> . void)
-  first-snip : (is-a?/c snip%)
-  init-lists : (listof any?)
-
-Applies the function to all the snips
-  
-> (map-snip f first-snip init-lists ...) -> (listof any?)
-  f : ((is-a?/c snip%) . -> . any?)
-  first-snip : (is-a?/c snip%)
-  init-lists : (listof any?)
-
-A list of f applied to each snip
-  
-> (stretchable-width? snip) -> boolean?
-  snip : (is-a?/c snip%)
-
-True if the snip can be resized in the x dimension
-  
-> (stretchable-height? snip) -> boolean?
-  snip : (is-a?/c snip%)
-
-True if the snip can be resized in the y dimension
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/embedded-gui.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/embedded-gui.rkt
deleted file mode 100644
index 2953298b67..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/embedded-gui.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-(module embedded-gui mzscheme
-  
-  (define-syntax (require/provide stx)
-    (syntax-case stx ()
-      [(_ filename ...)
-       #'(begin (require filename ...)
-                (provide (all-from filename) ...))]))
-  
-  (require/provide
-   "private/interface.rkt"
-   
-   "private/aligned-pasteboard.rkt"
-   "private/verthoriz-alignment.rkt"
-   "private/grid-alignment.rkt"
-   "private/snip-wrapper.rkt"
-   
-   "private/on-show-editor.rkt"
-   
-   "private/button-snip.rkt"
-   "private/embedded-message.rkt"
-   "private/fixed-width-label-snip.rkt"
-   "private/lines.rkt"
-   
-   "private/stretchable-editor-snip.rkt"
-   "private/tabbable-text.rkt"
-   "private/grey-editor.rkt"
-   "private/single-line-text.rkt"
-   "private/cue-text.rkt"
-   
-   "private/snip-lib.rkt")
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/main.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/main.rkt
deleted file mode 100644
index 9aab7e8153..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scheme/base
-
-(require "embedded-gui.rkt")
-(provide (all-from-out "embedded-gui.rkt"))
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/aligned-pasteboard.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/aligned-pasteboard.rkt
deleted file mode 100644
index 3d8ddd0227..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/aligned-pasteboard.rkt
+++ /dev/null
@@ -1,135 +0,0 @@
-#| Note: It might be a good idea to override insert with an error so that people don't
-   insert or delete from the pasteboard without using the alignment<%>. Then the alignments
-   could go through a different interface for inserting the snips that would call
-   super-insert.
-|#
-
-(module aligned-pasteboard mzscheme
-
-  (provide aligned-pasteboard%)
-
-  (require
-   mzlib/class
-   mred
-   mzlib/etc
-   mrlib/click-forwarding-editor
-   "on-show-pasteboard.rkt"
-   "really-resized-pasteboard.rkt"
-   "interface.rkt"
-   "locked-pasteboard.rkt"
-   "suppress-modify-editor.rkt"
-   "on-show-editor.rkt")
-
-  (define aligned-pasteboard%
-    (class* (click-forwarding-editor-mixin
-             (suppress-modify-editor-mixin
-              (locked-pasteboard-mixin
-               (really-resized-pasteboard-mixin pasteboard%))))
-      (alignment-parent<%> on-show-editor<%>)
-      
-      (inherit begin-edit-sequence end-edit-sequence
-               get-max-view-size refresh-delayed?)
-      
-      (field
-       [alignment false]
-       [lock-alignment-depth 0]
-       [needs-alignment? false])
-      
-      ;;;;;;;;;;
-      ;; insert/delete
-      
-      (rename-super [super-insert insert] [super-release-snip release-snip])
-      (define/override (insert . args) (void))
-      (define/override (release-snip snip) (void))
-      
-      #;((is-a?/c snip%) . -> . void)
-      ;; The insert that can be called from snip-wrappers to install a snip in the pasteboard
-      (define/public (insert-aligned-snip snip)
-        #;(lock-alignment true)
-        (super-insert snip)
-        #;(realign)
-        #;(lock-alignment false))
-      
-      #;((is-a?/c snip%) . -> . void)
-      ;; The release-snip that can be called from snip-wrappers to clear a snip
-      (define/public (release-aligned-snip snip)
-        #;(lock-alignment true)
-        (super-release-snip snip)
-        #;(realign)
-        #;(lock-alignment false))
-      
-      ;;;;;;;;;;
-      ;; alignment-parent<%>
-      
-      #;(-> (is-a?/c pasteboard%))
-      ;; The pasteboard that this alignment is being displayed to
-      (define/public (get-pasteboard) this)
-      
-      #;(((is-a?/c alignment<%>)) ((union (is-a?/c alignment<%>) false?)) . opt-> . void?)
-      ;; Add the given alignment as a child before the existing child
-      (define/public add-child
-        (opt-lambda (child (after #f))
-          (if alignment
-              (error 'add-child "There may be only one alignment<%> of a pasteboard")
-              (set! alignment child))))
-      
-      #;((is-a?/c alignment<%>) . -> . void?)
-      ;; Deletes a child from the alignments
-      (define/public (delete-child child)
-        (if alignment
-            (if (eq? child alignment)
-                (set! alignment false)
-                (error 'delete-child "Child not found"))
-            (error 'delete-child "No children")))
-      
-      #;(-> (listof (is-a?/c alignment<%>)))
-      ;; A list of the children of this alignment parent
-      (define/public (get-children) (list alignment))
-            
-      #;(-> boolean?)
-      ;; True if the alignment is being shown (accounting for its parent being shown)
-      ;; NOTE: Pasteboards are always shown and have no show/hide state.
-      (define/public (is-shown?) true)
-      
-      #;((is-a?/c snip%) . -> . void?)
-      ;; Called when a snip in the pasteboard changes its size
-      ;; Overriden because the layout will change when a snip gets bigger.
-      (define/override (really-resized snip)
-        (super really-resized snip)
-        (realign))
-      
-      #;(-> void)
-      ;; Called when the pasteboard is first shown.
-      ;; Overriden because I need to know when the snips have their size to lay them out.
-      (define/public (on-show)
-        (realign))
-      
-      #;(boolean? . -> . void?)
-      ;; Locks the pasteboard so that all alignment requests are delayed until after it's done.
-      ;; STATUS: I can still observe inserts of the interactions when I paste an interactions box.
-      ;; I need to figure out why these edit-sequences are not hiding them.
-      (define/public (lock-alignment lock?)
-        (set! lock-alignment-depth ((if lock? add1 sub1) lock-alignment-depth))
-        (case lock-alignment-depth
-          [(0) (when needs-alignment? (realign))
-               (unless lock? (end-edit-sequence))]
-          [(1) (when lock? (begin-edit-sequence))]
-          [else (void)]))
-      
-      #;(-> void?)
-      ;; Realigns the snips in the pasteboard according to the alignment tree.
-      (define/public (realign)
-        (if (zero? lock-alignment-depth)
-            (fluid-let ([lock-alignment-depth (add1 lock-alignment-depth)])
-              (begin-edit-sequence)
-              (send alignment set-min-sizes)
-              (let ([width (send alignment get-min-width)]
-                    [height (send alignment get-min-height)])
-                (unless (or (zero? width) (zero? height))
-                  (send alignment align 0 0 width height)
-                  (set! needs-alignment? false)))
-              (end-edit-sequence))
-            (set! needs-alignment? true)))
-      
-      (super-new)))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/alignment-helpers.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/alignment-helpers.rkt
deleted file mode 100644
index 4640880111..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/alignment-helpers.rkt
+++ /dev/null
@@ -1,74 +0,0 @@
-(module alignment-helpers mzscheme
-  
-  (require
-   mzlib/list
-   mzlib/class
-   mred
-   mzlib/contract
-   
-   "interface.rkt"
-   "snip-lib.rkt")
-  
-  (provide/contract
-   (vacuous-max (() (listof number?) . ->* . (number?)))
-   (child-height ((union (is-a?/c alignment<%>) (is-a?/c snip%)) . -> . number?))
-   (child-width ((union (is-a?/c alignment<%>) (is-a?/c snip%)) . -> . number?))
-   (insert-before (any/c (listof any/c) any/c . -> . (listof any/c)))
-   (insert-after (any/c (listof any/c) any/c . -> . (listof any/c))))
-  
-  (define (vacuous-max . n)
-    (if (empty? n)
-        0
-        (apply max n)))
-  
-  #|
-  (equal? (vacuous-max 5 2) 5)
-  (equal? (vacuous-max) 0)
-  (equal? (vacuous-max -2 6) 6)
-  (equal? (vacuous-max -3 -5) -3)
-  (equal? (vacuous-max -2 0) 0)
-  |#
-  
-  (define (child-height item)
-    (cond
-      [(is-a? item snip%) (snip-min-height item)]
-      [(is-a? item alignment<%>) (send item get-min-height)]))
-  
-  (define (child-width item)
-    (cond
-      [(is-a? item snip%) (snip-min-width item)]
-      [(is-a? item alignment<%>) (send item get-min-width)]))
-  
-  (define ((insert how) item alist reference)
-    (cond
-      [(empty? alist) (error 'insert "Could not find item in list")]
-      [(cons? alist)
-       (if (equal? (first alist) reference)
-           (how item (first alist) (rest alist))
-           (cons (first alist)
-                 ((insert how) item (rest alist) reference)))]))
-  
-  (define insert-before
-    (insert (lambda (item the-first the-rest)
-              (cons item
-                    (cons the-first the-rest)))))
-  
-  (define insert-after
-    (insert (lambda (item the-first the-rest)
-              (cons the-first
-                    (cons item the-rest)))))
-  #|
-  (equal? (insert-before 1 '(3 4 2 5) 2)
-          '(3 4 1 2 5))
-  (equal? (insert-before 1 '(1) 1)
-          '(1 1))
-  (equal? (insert-before 0 '(5 -5 6 -5) -5)
-          '(5 0 -5 6 -5))
-  (equal? (insert-after 1 '(3 4 2 5) 2)
-          '(3 4 2 1 5))
-  (equal? (insert-after 1 '(1) 1)
-          '(1 1))
-  (equal? (insert-after 0 '(5 -5 6 -5) -5)
-          '(5 -5 0 6 -5))
-  |#
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/alignment.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/alignment.rkt
deleted file mode 100644
index 3a89451e91..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/alignment.rkt
+++ /dev/null
@@ -1,149 +0,0 @@
-#|
-This code computes the sizes for the rectangles in the space using the on dimension
-off dimension method of referencing sizes. This means for example instead of saying
-width we say off dimension for vertical alignment. Inorder to consume and return
-the values in terms of width and height manipulation had to be done. I chose to create
-a struct abs-rect (abstract rectangle) and have code map horizontal and vertical rect
-stucts on to them. This code is a bit long but more readable than the other two options
-I came up with.
-  1) define all functions to be letrec bound functions inside align. align then take
-     accessors for the rect struct. The caller of align swaps the order of ondimension
-     and off dimension accessors for vertical or horizontal code. This method does not
-     allow the use of the readable, short, consis pattern matching code. As some of the
-     matching code is easily removed this may be a good option but a large letrec
-     is harder to write tests for.
-  2) define a pattern matcher syntax that will match the struct rect but swap the fields
-     based on which on is the on or off dimension. This would have been shorter but much
-     more confusing.
-The current implementation requires align to map over the rects and allocate new stucts
-for each one on both passing into and returning from stretch-to-fit; This is not a bottle
-neck and it is the most readable solution.
-|#
-
-(module alignment mzscheme
-  
-  (require
-   mzlib/match
-   mzlib/contract
-   mzlib/etc
-   mzlib/list)
-  
-  (define-struct rect (x y) (make-inspector))
-  (define-struct abs-rect (ondim offdim) (make-inspector))
-  (define-struct dim (pos size stretchable?) (make-inspector))
-  
-  (define (nonnegative? n)
-    (and (number? n)
-         (or (positive? n)
-             (zero? n))))
-  
-  (provide/contract
-   (struct rect ((x dim?) (y dim?)))
-   (struct abs-rect ((ondim dim?) (offdim dim?)))
-   (struct dim ((pos nonnegative?) (size nonnegative?) (stretchable? boolean?)))
-   (align ((symbols 'horizontal 'vertical)
-           nonnegative? nonnegative? (listof rect?)
-           . -> . (listof rect?))))
-  
-  ;; align the rectangles within the given space
-  (define (align type width height rects)
-    (cond
-      [(symbol=? type 'horizontal)
-       (map abs->horiz (stretch-to-fit width height (map horiz->abs rects)))]
-      [(symbol=? type 'vertical)
-       (map abs->vert (stretch-to-fit height width (map vert->abs rects)))]))
-  
-  #;(abs-rect? . -> . rect?)
-  ;; convert an abstract rect to a horizontal rect
-  (define abs->horiz
-    (match-lambda
-      [($ abs-rect ondim offdim)
-       (make-rect ondim offdim)]))
-  
-  #;(abs-rect? . -> . rect?)
-  ;; convert an abstract rect to a vertical rect
-  (define abs->vert
-    (match-lambda
-      [($ abs-rect ondim offdim)
-       (make-rect offdim ondim)]))
-  
-  #;(rect? . -> . abs-rect?)
-  ;; convert a horizontal rect to an abstract rect
-  (define horiz->abs
-    (match-lambda
-      [($ rect x y)
-       (make-abs-rect x y)]))
-  
-  #;(rect? . -> . abs-rect?)
-  ;; convert a vertical rect to an abstract rect
-  (define vert->abs
-    (match-lambda
-      [($ rect x y)
-       (make-abs-rect y x)]))
-  
-  #;(positive? positive? (listof abs-rect?) . -> . (listof abs-rect?))
-  ;; stretch the rectangles to fit with the given space
-  (define (stretch-to-fit onsize offsize rects)
-    (let-values ([(total-unstretchable-size stretchable-sizes)
-                  (get-onsizes rects)])
-      (let-values ([(extra-div extra-mod)
-                    (get-extra/rect (- onsize total-unstretchable-size)
-                                    (sort stretchable-sizes >))])
-        (allocate-evenly/position extra-div extra-mod offsize rects))))
-  
-  #;(((listof rect?)) . ->* . (nonnegative? (listof nonnegative?)))
-  ;; gets the unstretchable total size and a list of the stretchable sizes
-  (define (get-onsizes init-rects)
-    (let loop ([extra 0]
-               [stretchables empty]
-               [rects init-rects])
-      (match rects
-        [() (values extra stretchables)]
-        [(($ abs-rect ($ dim _ onsize #f) _) rest-rects ...)
-         (loop (+ onsize extra) stretchables rest-rects)]
-        [(($ abs-rect ($ dim _ onsize #t) _) rest-rects ...)
-         (loop extra (cons onsize stretchables) rest-rects)])))
-  
-  #;((nonnegative? (listof nonnegative?)) . ->* . (nonnegative? nonnegative?))
-  ;; get the space that each stretchable snip will have
-  (define (get-extra/rect init-extra init-sizes)
-    (let loop ([sizes init-sizes]
-               [extra init-extra]
-               [count (length init-sizes)])
-      (cond
-        [(empty? sizes) (values 0 0)]
-        [else
-         (let ([extra/rect (quotient (floor extra) count)]
-               [onsize (first sizes)])
-           (if (> onsize extra/rect)
-               (loop (rest sizes) (- extra onsize) (sub1 count))
-               (values extra/rect (modulo (floor extra) count))))])))
-  
-  #;((cons/p nonnegative? nonnegative?) positive? (listof abs-rect?) . -> . (listof abs->rect?))
-  ;; allocate the extra per rectangle to the stretchable rects and move them to their positions
-  (define (allocate-evenly/position extra-div extra-mod offsize init-rects)
-    (let ([mod (waner extra-mod)])
-      (let loop ([rects init-rects]
-                 [onpos 0])
-        (match rects
-          [() empty]
-          [(($ abs-rect ($ dim _ min-onsize onstretch?)
-               ($ dim _ min-offsize offstretch?)) rest-rects ...)
-           (let ([onsize (if (and onstretch?
-                                  (< min-onsize extra-div))
-                             (+ extra-div (mod)) min-onsize)]
-                 [offsize (if offstretch? offsize min-offsize)])
-             (cons (make-abs-rect (make-dim onpos onsize onstretch?)
-                                  (make-dim 0 offsize offstretch?))
-                   (loop rest-rects (+ onpos onsize))))]))))
-  
-  #;(natural-number? . -> . (-> (union 1 0)))
-  ;; makes a thunk that returns 1 for its first n applications, zero otherwise
-  (define (waner n)
-    (lambda ()
-      (if (zero? n)
-          0
-          (begin
-            (set! n (sub1 n))
-            1))))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/button-snip.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/button-snip.rkt
deleted file mode 100644
index 064430c132..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/button-snip.rkt
+++ /dev/null
@@ -1,247 +0,0 @@
-#| Rewrite these to use snip-wrapper% automatically |#
-
-(module button-snip mzscheme
-  
-  (require
-   mred
-   mzlib/class
-   mzlib/etc
-   "snip-wrapper.rkt")
-  
-  (provide
-   text-button-snip%
-   button-snip%
-   toggle-button-snip%
-   embedded-button%
-   embedded-text-button%
-   embedded-toggle-button%)
-  
-  (define embedded-button%
-    (class snip-wrapper%
-      (init images callback)
-      (super-new
-       (snip (new button-snip%
-                  (images images)
-                  (callback callback))))))
-  
-  (define embedded-text-button%
-    (class snip-wrapper%
-      (init label callback)
-      (super-new
-       (snip (new text-button-snip%
-                  (label label)
-                  (callback callback))))))
-  
-  (define embedded-toggle-button%
-    (class snip-wrapper%
-      (init images-off images-on turn-off turn-on (state 'on))
-      (field [btn (new toggle-button-snip%
-                       (images-off images-off)
-                       (images-on images-on)
-                       (turn-off turn-off)
-                       (turn-on turn-on)
-                       (state state))])
-      ;; Provide the original toggle-button-snip% interface
-      (define/public (set-state x) (send btn set-state x))
-      (super-new (snip btn))))
-  
-  ;; a snip of a button that can be pushed to invoke a given callback
-  (define button-snip%
-    (class image-snip%
-      (inherit load-file)
-      (init images)
-      (init-field callback)
-      (field
-       [got-click? false]
-       [inside? false]
-       [image (car images)]
-       [depressed (cdr images)])
-      
-      ;; (string? . -> . void?)
-      ;; set the image to be displayed on the button when it is not clicked
-      (define/public (set-images i)
-        (set! image (car i))
-        (set! depressed (cdr i))
-        (load-file image))
-      
-      ;; Should I be calling super-on-event?
-      (define/override (on-event dc x y editorx editory event)
-        (case (send event get-event-type)
-          [(left-down)
-           (set! got-click? true)
-           (set! inside? true)
-           (load-file depressed)]
-          [(left-up)
-           (load-file image)
-           (when (and got-click? inside?)
-             (callback this event))
-           (set! got-click? false)
-           (set! inside? false)]
-          [(enter)
-           (set! inside? true)
-           (when got-click?
-             (load-file depressed))]
-          [(leave)
-           (set! inside? false)
-           (when got-click?
-             (load-file image))]
-          [else (void)]))
-      
-      (super-new)
-      (load-file image)))
-  
-  (define BUTTON-H-SPACE 5)
-  (define BUTTON-V-SPACE 2)
-
-  (define UNCLICKED-COLOR (make-object color% 220 220 175))
-  (define CLICKED-COLOR (make-object color% 100 100 50))
-
-  ;; a textual button of the same type
-  (define text-button-snip%
-    (class string-snip%
-      (init label)
-      (init-field callback)
-      (field
-       [got-click? false]
-       [inside? false])
-
-      (define/private (inc b v)
-	(when b
-	  (set-box! b (+ v (unbox b)))))
-
-      (define/override get-extent 
-	(opt-lambda (dc x y [w #f] [h #f] [db #f] [dt #f] [dl #f] [dr #f])
-	  (super get-extent dc (+ x BUTTON-H-SPACE) (+ y BUTTON-V-SPACE) w h db dt dl dr)
-	  (inc w (* 2 BUTTON-H-SPACE))
-	  (inc h (* 2 BUTTON-V-SPACE))
-	  (inc db BUTTON-V-SPACE)
-	  (inc dt BUTTON-V-SPACE)
-	  (inc dl BUTTON-H-SPACE)
-	  (inc dr BUTTON-H-SPACE)))
-
-      (define/override (draw dc x y t l r b dx dy caret)
-	(let ([p (send dc get-pen)]
-	      [b (send dc get-brush)]
-	      [smoothing (send dc get-smoothing)])
-	  (send dc set-pen "black" 1 'solid)
-	  (send dc set-brush 
-		(if got-click? CLICKED-COLOR UNCLICKED-COLOR)
-		'solid)
-	  (send dc set-smoothing 'aligned)
-	  (let ([w (box 0)]
-		[h (box 0)])
-	    (get-extent dc x y w h)
-	    (send dc draw-rounded-rectangle x y (unbox w) (unbox h) BUTTON-H-SPACE))
-	  (send dc set-pen p)
-	  (send dc set-brush b)
-	  (send dc set-smoothing smoothing))
-	(super draw dc (+ x BUTTON-H-SPACE) (+ y BUTTON-V-SPACE) 
-	       t l r b 
-	       (+ dx BUTTON-H-SPACE) (+ dy BUTTON-V-SPACE)
-	       caret))
-
-      (define/override (on-event dc x y editorx editory event)
-        (case (send event get-event-type)
-          [(left-down)
-           (set! got-click? true)
-           (set! inside? true)
-	   (refresh)]
-          [(left-up)
-           (when (and got-click? inside?)
-             (callback this event))
-           (set! got-click? false)
-           (set! inside? false)
-	   (refresh)]
-          [(enter)
-           (set! inside? true)]
-          [(leave)
-           (set! inside? false)]
-          [else (void)]))
-
-      (inherit get-admin)
-      (define/private (refresh)
-	(let ([a (get-admin)])
-	  (when a
-	    (send a needs-update this 0 0 1000 100))))
-      
-      (super-make-object label)
-      (inherit set-style)
-      (set-style control-style)))
-  
-  ;; a toggle button that displays different images
-  (define toggle-button-snip%
-    (class button-snip%
-      (inherit set-images)
-      (init-field images-off images-on turn-off turn-on (state 'on))
-      
-      ;; Emulates clicking the button to a certain state
-      (define/public (turn astate)
-        (case astate
-          [(off) (set-state 'off)
-                 (turn-on this #f)]
-          [(on) (set-state 'on)
-                (turn-off this #f)]))
-      
-      (define/public (set-state value)
-        (case value
-          [(off) (set-images images-off)
-                 (set! state 'off)]
-          [(on) (set-images images-on)
-                (set! state 'on)]))
-      
-      (super-new
-       (images (case state
-                 [(on) images-on]
-                 [(off) images-off]))
-       (callback
-        (lambda (b e)
-          ;; NOTE: I lose the event right here, but turn can't require it.
-          ;; Since it's public.
-          (case state
-            [(on) (turn 'off)]
-            [(off) (turn 'on)]))))))
-  
-  ;;;;;;;;;;
-  ;; tests
-  #|
-  (require
-   mrlib/private/aligned-pasteboard/locked-pasteboard
-   mrlib/click-forwarding-editor)
-  
-  (define (test)
-    (define f (new frame% (label "test") (width 200) (height 200)))
-    (define e (new (locked-pasteboard-mixin
-                    (click-forwarding-editor-mixin pasteboard%))))
-    (define c (new editor-canvas% (editor e) (parent f)))
-    (define b (new button-snip%
-                   (images (cons (build-path (collection-path "icons") "turn-up.gif")
-                                 (build-path (collection-path "icons") "turn-up-click.gif")))
-                   (callback
-                    (lambda (b e)
-                      (message-box "Test" "Horray!")))))
-    (send e insert b)
-    (send f show #t))
-  
-  (define (test2)
-    (define f (new frame% (label "test") (width 200) (height 200)))
-    (define e (new (locked-pasteboard-mixin
-                    (click-forwarding-editor-mixin pasteboard%))))
-    (define c (new editor-canvas% (editor e) (parent f)))
-    (define t (new text%))
-    (define es (new editor-snip% (editor t)))
-    (define b (new toggle-button-snip%
-                   (images-on (cons (build-path (collection-path "icons") "turn-up.gif")
-                                  (build-path (collection-path "icons") "turn-up-click.gif")))
-                   (images-off (cons (build-path (collection-path "icons") "turn-down.gif")
-                                  (build-path (collection-path "icons") "turn-down-click.gif")))
-                   (turn-on
-                    (lambda (b e)
-                      (send* t (erase) (insert "Up"))))
-                   (turn-off
-                    (lambda (b e)
-                      (send* t (erase) (insert "Down"))))))
-    (send e insert es 50 0)
-    (send e insert b)
-    (send f show #t))
-  |#
-)
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/cue-text.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/cue-text.rkt
deleted file mode 100644
index 8af79ecb10..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/cue-text.rkt
+++ /dev/null
@@ -1,77 +0,0 @@
-#| This module provides a text that has the an init argument of a string
-   that is displayed in the text initially. This text acts as a cue or a
-   label for that text and goes away when it is typed into.
-|#
-#| TODO: Adjust read methods like get-text and write-to-file so that if the
-   cue text is still in the editor when they are called the result is that
-   the text appears empty.
-|#
-(module cue-text mzscheme
-  
-  (require
-   mzlib/class
-   mred
-   mzlib/etc
-   framework)
-  
-  (provide cue-text-mixin
-           cue-text%)
-  
-  (define cue-text-mixin
-    (mixin ((class->interface text%)) ()
-      (inherit insert change-style erase clear-undos
-               copy-self-to get-line-spacing)
-      (init [cue-text ""]
-            [color "gray"])
-      (init-field
-       [behavior '(on-focus)])
-      (field [first-focus? true])
-      
-      #;(-> void)
-      ;; Clears the cue-text if it's still there.
-      (define/public (clear-cue-text)
-        (when first-focus?
-          (set! first-focus? false)
-          (erase)
-	  (clear-undos)))
-      
-      #;(boolean? . -> . void)
-      ;; Called when this text% gains or loses focus
-      (define/override (on-focus on?)
-        (when (and on? (member 'on-focus behavior))
-          (clear-cue-text))
-        (super on-focus on?))
-      
-      #;((is-a?/c keyevent%) . -> . void)
-      ;; Called when the keyboard is used with focus in this text
-      (define/override (on-local-char akeyevent)
-        (when (member 'on-char behavior)
-          (clear-cue-text))
-        (super on-local-char akeyevent))
-
-      (define/override (copy-self)
-        (let ([m (new cue-text% 
-                      [behavior behavior]
-                      [line-spacing (get-line-spacing)])])
-          (copy-self-to m)
-          m))
-      
-      ;; Insert the cue text into the text% on instantiation
-      (super-new)
-      (let ([grey-text (new style-delta%)])
-        (send grey-text set-delta-foreground color)
-        (change-style grey-text 'start 'end #f))
-      (insert cue-text)))
-  
-  (define cue-text% (cue-text-mixin text%))
-  
-  #|
-  (define f (new frame% (label "f") (width 400) (height 400)))
-  (define e (new text%))
-  (define c (new editor-canvas% (editor e) (parent f)))
-  (define t (new cue-text% (cue-text "Hello, World!")))
-  (define s (new editor-snip% (editor t)))
-  (send e insert s)
-  (send f show #t)
-  |#
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/dllist.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/dllist.rkt
deleted file mode 100644
index a135c12e0c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/dllist.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-(module dllist mzscheme
-  
-  (require
-   mzlib/class
-   mzlib/list
-   mzlib/etc
-   framework
-   "interface.rkt")
-  
-  (provide dllist-mixin dllist% head% tail%)
-  
-  (define dllist-mixin
-    (mixin () (dllist<%>)
-      (field [nextf #f] [prevf #f])
-      (define/public next
-        (case-lambda
-          [(n) (set! nextf n)]
-          [() nextf]))
-      (define/public prev
-        (case-lambda
-          [(p) (set! prevf p)]
-          [() prevf]))
-      (define/public (for-each f . lol)
-        (apply f this (map first lol))
-        (send/apply nextf for-each f (map rest lol)))
-      (define/public (map-to-list f)
-        (cons (f this) (send nextf map-to-list f)))
-      (super-new)))
-  
-  (define dllist% (dllist-mixin object%))
-  
-  (define head%
-    (class* dllist% (dllist<%>)
-      (inherit next)
-      (define/override prev
-        (opt-lambda ((p #f))
-          (error 'prev "Head has no prev")))
-      (define/override (for-each f . lol)
-        (send/apply (next) for-each f lol))
-      (define/override (map-to-list f)
-        (send (next) map-to-list f))
-      (super-new)))
-  
-  (define tail%
-    (class* dllist% (dllist<%>)
-      (define/override next
-        (opt-lambda ((n #f))
-          (error 'next "Tail has no next")))
-      (define/override (for-each f . lol) (void))
-      (define/override (map-to-list f) empty)
-      (super-new)))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/embedded-message.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/embedded-message.rkt
deleted file mode 100644
index 7645ba31cd..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/embedded-message.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-(module embedded-message mzscheme
-  
-  (require
-   mred
-   mzlib/class
-   "snip-wrapper.rkt")
-  
-  (provide embedded-message%)
-
-  (define embedded-message%
-    (class snip-wrapper%
-      
-      (init label)
-      
-      (super-new
-       (snip (let ([s (make-object string-snip% label)])
-	       (send s set-style control-style)
-	       s)))))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/fixed-width-label-snip.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/fixed-width-label-snip.rkt
deleted file mode 100644
index cb2369be32..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/fixed-width-label-snip.rkt
+++ /dev/null
@@ -1,129 +0,0 @@
-(module fixed-width-label-snip mzscheme
-  
-  (require
-   mzlib/class
-   mzlib/list
-   mred)
-  
-  (provide fixed-width-label-snip)
-  
-  (define (fixed-width-label-snip labels)
-    (define label-snip%
-      (class snip%
-        (inherit set-snipclass)
-        (init-field
-         label
-         (with-border? #f)
-         (left-margin 5)
-         (right-margin 5)
-         (top-margin 5)
-         (bottom-margin 5)
-         (left-inset 1)
-         (top-inset 1)
-         (right-inset 1)
-         (bottom-inset 1))
-        
-        (field [font normal-control-font])
-        
-        (unless (member label labels)
-          (error 'fixed-width-label-snip
-                 "Instantiation of label-snip expected one of ~s. Given ~s"
-                 labels
-                 label))
-        
-        (define (get-string-width dc string)
-          (let-values ([(width height baseline vspace)
-                        (send dc get-text-extent string font)])
-            width))
-        
-        (define (get-string-height dc string)
-          (let-values ([(width height baseline vspace)
-                        (send dc get-text-extent string font)])
-            height))
-        
-        (define (get-max-string-width dc strings)
-          (foldl
-           (lambda (str max-width)
-             (max (get-string-width dc str) max-width))
-           (get-string-width dc (first strings))
-           (rest strings)))
-        
-        (define (get-max-string-height dc strings)
-          (foldl
-           (lambda (str max-height)
-             (max (get-string-height dc str) max-height))
-           (get-string-height dc (first strings))
-           (rest strings)))
-        
-        (define/override (get-extent dc x y w h descent space lspace rspace)
-          (let ([width (get-max-string-width dc labels)]
-                [height (get-max-string-height dc labels)])
-            (when w (set-box! w (+ left-margin width right-margin)))
-            (when h (set-box! h (+ top-margin height bottom-margin)))))
-        
-        (define/override (draw dc x y left top right bottom dx dy draw-caret)
-          (super draw dc x y left top right bottom dx dy draw-caret)
-          (let ([max-width (get-max-string-width dc labels)]
-                [width (get-string-width dc label)]
-                [max-height (get-max-string-height dc labels)])
-            (let ([f (send dc get-font)])
-              (send dc set-font font)
-              (send dc draw-text label
-                    (+ left-margin x (- max-width width))
-                    (+ y top-margin))
-              (send dc set-font f))
-            (when with-border?
-              (let ((w (+ left-margin max-width right-margin))
-                    (h (+ top-margin max-height bottom-margin)))
-                (send dc draw-lines 
-                      (list (make-object point% left-inset top-inset)
-                            (make-object point% left-inset (- h bottom-inset))
-                            (make-object point% (- w right-inset) (- h bottom-inset))
-                            (make-object point% (- w right-inset) top-inset)
-                            (make-object point% left-inset top-inset))
-                    x 
-                    y)))))
-        
-        ;(define/override (copy)
-        ;  (super copy))
-        
-        (define/override (resize w h) #f)
-        
-        ;; write ((is-a?/c editor-stream-out%) . -> . void?)
-        ;; write the snip out to the stream
-        (define/override (write f)
-          (send f put label))
-        
-        (super-new)
-        (set-snipclass (new label-snip-class%))))
-    
-    (define label-snip-class%
-      (class snip-class%
-        ;; read ((is-a?/c editor-stream-in%) . -> . snip%)
-        ;; read a snip from the stream
-        (define/override (read f)
-          (new label-snip% (label (send f get-string))))
-        (super-new)))
-    
-    (let ([lsc (new label-snip-class%)])
-      (send lsc set-classname "...")
-      (send lsc set-version 1)
-      (send (get-the-snip-class-list) add lsc))
-    
-    label-snip%)
-
-  ;;;;;;;;;;
-  ;; tests
-  
-  ;(define mylabels (list "Call" "Expected" "Actual"))
-  ;(define label% (fixed-width-label-snip mylabels))
-  ;(define align? #t)
-  ;(define f (new frame% (label "test") (width 175) (height 175)))
-  ;(define e (new pasteboard%))
-  ;(define c (new editor-canvas% (editor e) (parent f)))
-  ;(for-each
-  ; (lambda (s)
-  ;   (send e insert (new label% (label s))))
-  ; '("Expected"))
-  ;(send f show #t)
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/grey-editor.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/grey-editor.rkt
deleted file mode 100644
index e123911d5e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/grey-editor.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-(module grey-editor mzscheme
-  
-  (provide grey-editor-snip-mixin grey-editor-mixin)
-  
-  (require
-   mred
-   mzlib/class
-   framework)
-  
-  (define *disable-color* (make-object color% 235 235 255))
-  
-  (define grey-editor-snip-mixin
-    (mixin ((class->interface editor-snip%)) ()
-      (inherit get-admin get-inset)
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (let ([old-pen (send dc get-pen)]
-              [old-brush (send dc get-brush)]
-              [admin (get-admin)]
-              [left-inset (box 0)]
-              [top-inset (box 0)]
-              [right-inset (box 0)]
-              [bottom-inset (box 0)]
-              [xb (box 0)]
-              [yb (box 0)]
-              [wb (box 0)]
-              [hb (box 0)])
-          (when admin
-            (send admin get-view xb yb wb hb this)
-            (get-inset left-inset top-inset right-inset bottom-inset)
-            (send dc set-pen (send the-pen-list find-or-create-pen *disable-color* 1 'solid))
-            (send dc set-brush (send the-brush-list find-or-create-brush *disable-color* 'solid))
-            (send dc draw-rectangle
-                  (+ x (unbox xb) (unbox left-inset))
-                  (+ y (unbox yb) (unbox top-inset))
-                  (max 0 (- (unbox wb) (+ (unbox left-inset) (unbox right-inset))))
-                  (max 0 (- (unbox hb) (+ (unbox top-inset) (unbox bottom-inset)))))
-            (send dc set-pen old-pen)
-            (send dc set-brush old-brush)))
-        (super draw dc x y left top right bottom dx dy draw-caret))
-      (super-new)))
-  
-  (define grey-editor-mixin
-    (mixin (editor<%>) ()
-      (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-        (when before?
-          (let ([old-pen (send dc get-pen)]
-                [old-brush (send dc get-brush)])
-            (send dc set-pen (send the-pen-list find-or-create-pen *disable-color* 1 'solid))
-            (send dc set-brush (send the-brush-list find-or-create-brush *disable-color* 'solid))
-            (send dc draw-rectangle (+ left dx) (+ top dy) (+ right dx) (+ bottom dy))
-            (send dc set-pen old-pen)
-            (send dc set-brush old-brush)))
-        (super on-paint before? dc left top right bottom dx dy draw-caret))
-      (super-new))))
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/grid-alignment.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/grid-alignment.rkt
deleted file mode 100644
index c6b7b6eeb0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/grid-alignment.rkt
+++ /dev/null
@@ -1,142 +0,0 @@
-#| Not yet functional |#
-
-(module grid-alignment mzscheme
-  (define grid-alignment #f)
-  (provide grid-alignment))
-
-#;(module grid-alignment mzscheme
-  
-  (require
-   mzlib/class
-   mred
-   mzlib/etc
-   mzlib/list
-   mzlib/match
-   (prefix a: "alignment.rkt")
-   mrlib/click-forwarding-editor
-   
-   "on-show-pasteboard.rkt"
-   "really-resized-pasteboard.rkt"
-   "interface.rkt"
-   "snip-lib.rkt"
-   "alignment-helpers.rkt")
-  
-  (provide grid-alignment%)
-  
-  ;; totally broken and not up to date with last revision
-  (define grid-alignment%
-    (class* object% (#;alignment<%>)
-      (init-field
-       columns
-       (parent false))
-      (field
-       [pasteboard false]
-       [rows empty]
-       [row-heights 0]
-       [column-widths 0]
-       [show? true])
-      
-      ;; need base class for this method
-      (define (show/hide-child child show?)
-        (if (is-a? child alignment<%>)
-            (send child show show?)
-            (if show?
-                (send pasteboard insert child)
-                (send pasteboard release-snip child))))
-      
-      (define/public (add row)
-        (set! rows (append rows (list row)))
-        (unless (= (vector-length row) columns)
-          (error 'add "Invalid number of rows"))
-        (send pasteboard lock-alignment true)
-        (let loop ([column 0])
-          (unless (>= column columns)
-            (let ([child (vector-ref row column)])
-              (cond
-                [(is-a? child snip%)
-                 (when show?
-                   (send pasteboard insert child false))]
-                [(is-a? child alignment<%>)
-                 (send child set-pasteboard pasteboard)])
-              (loop (add1 column)))))
-        (send pasteboard lock-alignment false))
-      
-      (define/public (set-min-sizes)
-        
-        (set! column-widths
-              (map
-               (lambda (column)
-                 (apply vacuous-max
-                        (map (lambda (row)
-                               (child-width
-                                (vector-ref row column)))
-                             rows)))
-               (build-list columns identity)))
-        
-        (set! row-heights
-              (map
-               (lambda (row)
-                 (apply vacuous-max
-                        (map (lambda (column)
-                               (child-height
-                                (vector-ref row column)))
-                             (build-list columns identity))))
-               rows)))
-      
-      ;; STATUS: This function currently doesn't stretch snips.
-      (define/public (align x-offset y-offset width height)
-          (define (align-row row init-x y)
-            (let xloop ([x init-x]
-                        [column 0]
-                        [widths column-widths])
-              (unless (or (>= column columns) (empty? widths))
-                (move-child (vector-ref row column) pasteboard x y)
-                (xloop (+ x (first widths))
-                       (add1 column)
-                       (rest widths)))))
-          (when show?
-            (let yloop ([y y-offset]
-                        [the-rows rows]
-                        [heights row-heights])
-              (unless (or (empty? the-rows) (empty? heights))
-                (align-row (first the-rows) x-offset y)
-                (yloop (+ y (first heights))
-                       (rest the-rows)
-                       (rest heights))))))
-      
-      (define/public (get-min-width)
-        (if show?
-            (apply + column-widths)
-            0))
-      (define/public (get-min-height)
-        (if show?
-            (apply + row-heights)
-            0))
-      
-      (define/public (show bool)
-        (define (show/hide-row row)
-          (let loop ([column 0])
-            (unless (>= column columns)
-              (let ([child (vector-ref row column)])
-                (show/hide-child child bool)
-                (loop (add1 column))))))
-        (unless (boolean=? bool show?)
-          (set! show? bool)
-          (send pasteboard lock-alignment true)
-          (for-each show/hide-row rows)
-          (send pasteboard lock-alignment false)))
-      
-      (define/public (stretchable-width?) false)
-      (define/public (stretchable-height?) false)
-      (define/public (set-pasteboard pb) (set! pasteboard pb))
-      
-      (super-new)
-      (when parent (send parent add this))))
-  
-  (define (move-child child pasteboard x y)
-    (cond
-      [(is-a? child snip%)
-       (send pasteboard move-to child x y)]
-      [(is-a? child alignment<%>)
-       (send child align x y)]))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/interface.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/interface.rkt
deleted file mode 100644
index bbc1b498e6..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/interface.rkt
+++ /dev/null
@@ -1,105 +0,0 @@
-(module interface mzscheme
-  
-  (require mzlib/class)
-  
-  (provide stretchable-snip<%>
-           alignment<%>
-           alignment-parent<%>
-           dllist<%>)
-  
-  (define dllist<%>
-    (interface ()
-      next
-      prev
-      for-each
-      map-to-list))
-  
-  (define alignment<%>
-    (interface (dllist<%>)
-      
-      #;(-> alignment-parent<%>)
-      ;; The parent of this alignment
-      get-parent
-      
-      #;(-> void?)
-      ;; Tells the alignment that its sizes should be calculated
-      set-min-sizes
-      
-      #;(nonnegative? nonnegative? nonnegative? nonnegative? . -> . void?)
-      ;; Tells the alignment to align its children on the pasteboard in the given rectangle
-      align
-      
-      #;(-> nonnegative?)
-      ;; The minimum width this alignment must be
-      get-min-width
-      
-      #;(-> nonnegative?)
-      ;; The minimum height this alignment must be
-      get-min-height
-      
-      #;(case-> (-> boolean?) (boolean? . -> . void?))
-      ;; True if the alignment can be stretched in the x dimension
-      stretchable-width
-      
-      #;(case-> (-> boolean?) (boolean? . -> . void?))
-      ;; True if the alignment can be stretched in the y dimension
-      stretchable-height
-      
-      #;(boolean? . -> . void)
-      ;; Tells the alignment to show or hide its children
-      show/hide
-      
-      #;(boolean? . -> . void)
-      ;; Tells the alignment that its show state is the given value
-      ;; and it should show or hide its children accordingly.
-      show
-      ))
-  
-  (define alignment-parent<%>
-    (interface ()
-      #;(-> (is-a?/c pasteboard%))
-      ;; The pasteboard that this alignment is being displayed to
-      get-pasteboard
-      
-      #;(((is-a?/c alignment<%>)) ((union (is-a?/c alignment<%>) false?)) . opt-> . void?)
-      ;; Add the given alignment as a child before the existing child
-      add-child
-      
-      #;((is-a?/c alignment<%>) . -> . void?)
-      ;; Deletes a child from the alignments
-      delete-child
-      
-      #;(-> boolean?)
-      ;; True if the alignment is being shown (accounting for its parent being shown)
-      is-shown?
-      ))
-  
-  #| the interface that must be implemented by a class to be inserted into an
-     aligned-pasteboard<%> and be stretched and shrunk according to the geometry managment.
-  
-     note: any snip may be insert... those
-     that do not implement stretchable-snip<%> will simply not be stretched.
-  |#
-  (define stretchable-snip<%>
-    (interface ()
-      #;(positive? positive? . ->  . void?)
-      ;; called by the parent editor to stretch the snip to an specific size
-      stretch
-      
-      #;(-> positive?)
-      ;; get the minimum width of the snip
-      get-aligned-min-width
-      
-      #;(-> positive?)
-      ;; get the minmum height of the snip
-      get-aligned-min-height
-      
-      #;(case-> (boolean . -> . void?) (-> boolean?))
-      ;; get or set the stretchablity of the pasteboards width
-      stretchable-width
-      
-      #;(case-> (boolean . -> . void?) (-> boolean?))
-      ;; get or set the stretchablity of the pasteboards height
-      stretchable-height
-      ))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/lines.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/lines.rkt
deleted file mode 100644
index 67147d27cc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/lines.rkt
+++ /dev/null
@@ -1,154 +0,0 @@
-(module lines mzscheme
-  
-  (require
-   mzlib/class
-   mzlib/etc
-   mred
-   "snip-wrapper.rkt"
-   "interface.rkt")
-  
-  (provide hline% vline%)
-  
-  (define hline%
-    (class snip-wrapper%
-      (super-new
-       (snip (new hline-snip%)))))
-  
-  (define vline%
-    (class snip-wrapper%
-      (super-new
-       (snip (new vline-snip%)))))
-  
-  (define (make-line-snip draw-line stretch-w stretch-h classname)
-    (letrec ([c (class* snip% (stretchable-snip<%>)
-               
-               (field
-                [width 0]
-                [height 0])
-               
-               ;;;;;;;;;;
-               ;; snip%
-               
-               #;(((is-a?/c dc<%>)
-                   number?
-                   number?)
-                  ((union nonnegative? false/c)
-                   (union nonnegative? false/c)
-                   (union nonnegative? false/c)
-                   (union nonnegative? false/c)
-                   (union nonnegative? false/c)
-                   (union nonnegative? false/c))
-                  . opt-> .
-                  void?)
-               (define/override (get-extent dc x y w h descent space lspace rspace)
-                 (super get-extent dc x y w h descent space lspace rspace)
-                 (when w (set-box! w width))
-                 (when h (set-box! h height)))
-               
-               #;((is-a?/c dc<%>)
-                  number?
-                  number?
-                  number?
-                  number?
-                  number?
-                  number?
-                  number?
-                  number?
-                  (symbols no-caret show-inactive-caret show-caret))
-               (define/override (draw dc x y left top right bottom dx dy draw-caret)
-                 (super draw dc x y left top right bottom dx dy draw-caret)
-                 (draw-line dc x y width height)
-                 (void))
-               
-               ;;;;;;;;;;
-               ;; stretchable-snip<%>
-               
-               #;(positive? positive? . ->  . void?)
-               ;; called by the parent editor to stretch the snip to an specific size
-               (define/public (stretch w h)
-                 (set! width w)
-                 (set! height h))
-               
-               #;(-> positive?)
-               ;; get the minimum width of the snip
-               ;; NOTE: Lines need a margin so they're not overwritten
-               (define/public (get-aligned-min-width) 8)
-               
-               #;(-> positive?)
-               ;; get the minmum height of the snip
-               ;; NOTE: Lines need a margin so they're not overwritten
-               (define/public (get-aligned-min-height) 8)
-               
-               #;(case-> (boolean . -> . void?) (-> boolean?))
-               ;; get or set the stretchablity of the pasteboards width
-               (define/public stretchable-width
-                 (case-lambda
-                   [(v) (error 'stretchable-width "Cannot set stretchable-width of a line-snip%")]
-                   [() stretch-w]))
-               
-               #;(case-> (boolean . -> . void?) (-> boolean?))
-               ;; get or set the stretchablity of the pasteboards height
-               (define/public stretchable-height
-                 (case-lambda
-                   [(v) (error 'stretchable-height "Cannot set stretchable-height of a line-snip%")]
-                   [() stretch-h]))
-               
-               (super-new)
-               (inherit set-snipclass)
-               (set-snipclass sc))]
-             [sc (new
-                  (class snip-class%
-                    (define/override (read f)
-                      (new c))
-                    (super-new)))])
-      (send sc set-classname classname)
-      (send sc set-version 1)
-      (send (get-the-snip-class-list) add sc)
-      c))
-                
-  
-  (define hline-snip%
-     (make-line-snip
-      (lambda (dc x y width height)
-        (send dc draw-line x (+ y (/ height 2)) (+ x width) (+ y (/ height 2))))
-      true
-      false
-      "make-hline-snip"))
-    
-  (define vline-snip%
-     (make-line-snip
-      (lambda (dc x y width height)
-        (send dc draw-line (+ x (/ width 2)) y (+ x (/ width 2))  (+ y height)))
-      false
-      true
-      "make-line-snip"))
-  
-  #|
-  (require
-   "verthoriz-alignment.rkt"
-   "aligned-pasteboard.rkt"
-   "snip-wrapper.rkt")
-  
-  (define f (new frame% (label "f") (height 500) (width 500)))
-  (send f show true)
-  (define p (new aligned-pasteboard%))
-  (define c (new editor-canvas% (editor p) (parent f)))
-  (define a1 (new vertical-alignment% (parent p)))
-  (define a2 (new horizontal-alignment% (parent a1)))
-  (new hline% (parent a1))
-  (define a3 (new horizontal-alignment% (parent a1)))
-  
-  (new snip-wrapper%
-       (snip (make-object string-snip% "One"))
-       (parent a2))
-  (new snip-wrapper%
-       (snip (make-object string-snip% "Two"))
-       (parent a2))
-  (new snip-wrapper%
-       (snip (make-object string-snip% "Three"))
-       (parent a3))
-  (new snip-wrapper%
-       (snip (make-object string-snip% "Three"))
-       (parent a3))
-  |#
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/locked-pasteboard.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/locked-pasteboard.rkt
deleted file mode 100644
index 17d9f17576..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/locked-pasteboard.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-;; This module provides a mixin that locks a pasteboard to all mouse interaction. This
-;; means that there is no interactive dragging, no keyboard deletion, no handles drawn
-;; at the corners of the snips for dragging, and anything else that must be added.
-
-(module locked-pasteboard mzscheme
-  
-  (require
-   mzlib/class
-   mred
-   mzlib/etc
-   mzlib/contract
-   framework)
-  
-  (provide/contract
-   (locked-pasteboard-mixin mixin-contract))
-  
-  ;; mixin to remove interactive movement of snips from pasteboards
-  ;; STATUS: Look into and make sure I don't need to deal with the following.
-  ;;           interactive-adjust-mouse, interactive-adjust-move, on-default-event
-  ;;           interactive-adjust-resize
-  (define locked-pasteboard-mixin
-    (mixin ((class->interface pasteboard%)) ()
-      (define/override (on-default-event event) (void))
-      ;; The rest of the methods I believe to be redundant but
-      ;; are overriden anyway for consistancy.
-      (define/augment-final (can-interactive-move? event) false)
-      (define/augment-final (can-interactive-resize? snip) false)
-      (define/override (get-dragable) false)
-      (define/override (get-selection-visible) false)
-      (super-new)))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/on-show-editor.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/on-show-editor.rkt
deleted file mode 100644
index f93d75b7d5..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/on-show-editor.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-(module on-show-editor mzscheme
-  (define (writeln x) (write x) (newline))
-  (require
-   mzlib/class
-   mzlib/etc
-   mred
-   framework
-   "snip-lib.rkt")
-  
-  (provide
-   on-show-editor<%>
-   on-show-editor-canvas-mixin
-   on-show-editor-snip-mixin)
-  
-  (define on-show-editor<%>
-    (interface ()
-      #;(-> void)
-      ;; Called when the editor is shown.
-      on-show))
-  
-  (define on-show-editor-snip-mixin
-    (mixin ((class->interface editor-snip%)) ()
-      (super-new)))
-  
-  (define on-show-editor-canvas-mixin
-    (mixin ((class->interface editor-canvas%)) ()
-      (inherit get-editor)
-      #;(number? number? . -> . void)
-      ;; called when the canvas's parent size changes
-      (define/override (on-size width height)
-        (super on-size width height)
-        (send (get-editor) on-show))
-      (super-new)))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/on-show-pasteboard.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/on-show-pasteboard.rkt
deleted file mode 100644
index 7af6eeaa49..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/on-show-pasteboard.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-(module on-show-pasteboard mzscheme
-  
-  (require
-   mzlib/class
-   mzlib/etc
-   mred)
-  
-  (provide
-   on-show-pasteboard%
-   on-show-pasteboard-mixin)
-  
-  (define (on-show-pasteboard-mixin super%)
-    (class super%
-      (field [shown? false])
-      #|
-      (define/override (refresh x y w h d-c)
-        (super refresh x y (max w 0) (max h 0) d-c)
-        (unless shown?
-          (set! shown? true)
-          (on-show)))
-      |#
-      #|
-      (define/override (get-extent w h)
-        (super get-extent w h)
-        (unless shown?
-          (set! shown? true)
-          (on-show)))
-      |#
-      (define/public (showing?) shown?)
-      (define/public (on-show) (void))
-      (super-new)))
-  
-  (define on-show-pasteboard%
-    (on-show-pasteboard-mixin
-     pasteboard%))
-  
-  #|
-  (define f (new frame% (label "f") (width 400) (height 400)))
-  (send f show true)
-  (define e (new pasteboard%))
-  (define c (new editor-canvas% (editor e) (parent f)))
-  (define pb (new on-show-pasteboard%))
-  (define es (new editor-snip% (editor pb)))
-  (not (send pb showing?))
-  (send e insert es)
-  (send pb showing?)
-  (send e remove es)
-  (not (send pb showing?))
-  |#
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/program-editor.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/program-editor.rkt
deleted file mode 100644
index 9b3be80cba..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/program-editor.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#|
-
-This file contains a mixin that should be used my any embedded editor that contains
-code. What is does is tells the drscheme frame that the program has changed and
-drscheme can appropriately reset highlighting and display the "save" button. There
-is a facility of drscheme to do this but to my knowledge it is not working properly.
-
-|#
-
-#|NOTES:
-
-This code is copied from the test suite tool and the test suite tool should be
-rewritten to use this copy of the program. This is not a trivial change since the
-alert-of-modify method in test-suite is currently clearing the test cases to reset
-them.
-
-This code can be replaced by drscheme:unit:program-editor-mixin when I figure out how
-to make the results of the test case boxes be reset when (and only when) highlighting
-is being reset.
-|#
-
-(module program-editor mzscheme
-  
-  (require
-   mred
-   mzlib/etc
-   mzlib/class
-   framework
-   "snip-lib.rkt")
-  
-  (provide program-editor-mixin
-           program-editor%)
-  
-  (define (program-editor-mixin %)
-    (class %
-      (inherit get-admin begin-edit-sequence end-edit-sequence)
-      (define (get-frame)
-        ;; gets the top most editor in the tree of snips and editors
-        (define (editor-root ed)
-          (let ([parent (editor-parent ed)])
-            (cond
-              [(is-a? parent area<%>) parent]
-              [(is-a? parent snip%)
-               (editor-root (snip-parent parent))]
-              [else false])))
-        
-        ;; gets the canvas or snip that the pasteboard is displayed in
-        ;; status: what if there is more than one canvas?
-        (define (editor-parent ed)
-          (let ([admin (send ed get-admin)])
-            (cond
-              [(is-a? admin editor-snip-editor-admin<%>)
-               (send admin get-snip)]
-              [(is-a? admin editor-admin%)
-               (send ed get-canvas)]
-              [else false])))
-        
-        (let ([er (editor-root this)])
-          (if er
-              (send er get-top-level-window)
-              false)))
-      
-      (define (alert-of-modify)
-        (let ([frame (get-frame)])
-          (when frame
-            (send (send frame get-interactions-text) reset-highlighting)
-            (send* (send frame get-definitions-text)
-              (set-modified true)))))
-      
-      ;(define/override (on-insert start len)
-      ;  (begin-edit-sequence)
-      ;  (super on-insert start len)
-      ;  (end-edit-sequence))
-      
-      (define/augment (after-insert start len)
-        (alert-of-modify)
-        ;(begin-edit-sequence)
-        #;(super after-insert start len)
-        ;(end-edit-sequence)
-        )
-      (define/augment (after-delete start len)
-        (alert-of-modify)
-        #;(super after-delete start len))
-      (super-new)))
-  
-  (define program-editor%
-    (program-editor-mixin color:text%))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/really-resized-pasteboard.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/really-resized-pasteboard.rkt
deleted file mode 100644
index eec5a66040..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/really-resized-pasteboard.rkt
+++ /dev/null
@@ -1,85 +0,0 @@
-#|
-
-This module provides a really-resized pasteboard that calls the really-resized
-method when a snip in the editor is really resized, not when pasteboard says
-it's resized. This file was written because sometimes I need to override resized
-to adjust my editors layout however the resized method of the pasteboard is
-invoked whenever editor snips get focus, lose focus, get text typed into them,
-get text deteleted from them, etc.
-
-|#
-
-(module really-resized-pasteboard mzscheme
-  
-  (require
-   mzlib/etc
-   mzlib/class
-   mred)
-  
-  (provide
-   really-resized-pasteboard-mixin
-   really-resized-pasteboard%)
-  
-  (define (really-resized-pasteboard-mixin super%)
-    (class super%
-      (inherit refresh-delayed? get-snip-location)
-      (field [snip-cache (make-hash-table)]
-             [ignore-resizing? false])
-      
-      ;; Called whenever a snip within the editor is resized, just like the
-      ;; resized method but excludes suchs events as when and editor-snip gets
-      ;; focus.
-      (define/public (really-resized snip) (void))
-      
-      #|
-      snip : snip% object 
-      redraw-now? : boolean
-      |#
-      (define/override (resized snip redraw-now?)
-        (super resized snip redraw-now?)
-        (unless ignore-resizing?
-          (let ([size (snip-size snip)])
-            ;; The snip is getting remove from hash table in  a way I
-            ;; am not antisipating. I need to find it and then I can
-            ;; remove this error catcher.
-            (unless (equal? size (with-handlers ([exn? (lambda x 0)])
-                                   (hash-table-get snip-cache snip)))
-              (hash-table-put! snip-cache snip size)
-              (really-resized snip)))))
-      
-      #|
-      snip : snip% object 
-      before : snip% object or #f 
-      x : real number 
-      y : real number
-      |#
-      (define/augment (after-insert snip before x y)
-        (hash-table-put! snip-cache snip (snip-size snip))
-        (inner (void) after-insert snip before x y))
-      
-      #|
-      snip : snip% object
-      |#
-      (define/augment (after-delete snip)
-        (hash-table-remove! snip-cache snip)
-        (inner (void) after-delete snip))
-      
-      #;((is-a?/c snip%) . -> . (cons/p natural-number? natural-number?))
-      ;; The width and height of the given snip in this pasteboard.
-      (define (snip-size snip)
-        (let ([top (box 0)]
-              [bottom (box 0)]
-              [left (box 0)]
-              [right (box 0)])
-          (fluid-let ([ignore-resizing? true])
-            (get-snip-location snip left top false)
-            (get-snip-location snip right bottom true))
-          (cons (- (unbox right) (unbox left))
-                (- (unbox bottom) (unbox top)))))
-      
-      (super-new)))
-  
-  (define really-resized-pasteboard%
-    (really-resized-pasteboard-mixin
-     pasteboard%))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/single-line-text.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/single-line-text.rkt
deleted file mode 100644
index 4deb55018f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/single-line-text.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-(module single-line-text mzscheme
-  
-  (require
-   mred
-   framework
-   mzlib/class)
-  
-  (provide single-line-text-mixin)
-  
-  (define single-line-text-mixin
-    (mixin (editor:keymap<%>) ()
-      #;(-> (listof keymap%))
-      ;; the list of keymaps associated with this text
-      (define/override (get-keymaps)
-        (let ([keymap (make-object keymap%)])
-          (send keymap add-function "do nothing" void)
-          (send keymap map-function ":enter" "do nothing")
-          (cons keymap (super get-keymaps))))
-      (super-new)))
-  
-  #|
-  (define f (new frame% (label "f")))
-  (define e (new text%))
-  (define c (new editor-canvas% (editor e) (parent f)))
-  (send e insert (new editor-snip% (editor (new (single-line-text-mixin scheme:text%)))))
-  (send f show #t)
-  |#
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/snip-lib.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/snip-lib.rkt
deleted file mode 100644
index 0f7e055dc0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/snip-lib.rkt
+++ /dev/null
@@ -1,119 +0,0 @@
-#| WARNING: DUPLICATED FILE |#
-
-(module snip-lib mzscheme
-  
-  (require
-   mzlib/class
-   mzlib/etc
-   mred
-   mzlib/list
-   mzlib/contract
-   "interface.rkt")
-  
-  ;; a snip
-  (define snip? (is-a?/c snip%))
-  ;; a snip to act as the varying argument to a recursive functions
-  (define linked-snip? (union snip? false/c))
-  ;; a function to act on snips being mapped
-  (define snip-visitor? any/c #;((snip?) (listof any/c) . ->* . (void)))
-  ;; the rest of the lists passed to a snip mapping function
-  (define rest-lists? (listof (listof any/c)))
-  ;; a class that contains a snip
-  (define editor? (is-a?/c editor<%>))
-  
-  (provide/contract
-   (snip-width (snip? . -> . number?))
-   (snip-height (snip? . -> . number?))
-   (snip-min-width (snip? . -> . number?))
-   (snip-min-height (snip? . -> . number?))
-   (snip-parent (snip? . -> . (union editor? false/c)))
-   (fold-snip ((snip? any/c . -> . any/c) any/c linked-snip? . -> . any/c))
-   (for-each-snip any/c #;((snip-visitor? linked-snip?) rest-lists? . ->* . (void)))
-   (map-snip any/c #;((snip-visitor? linked-snip?) rest-lists? . ->* . ((listof any/c))))
-   (stretchable-width? (snip? . -> . boolean?))
-   (stretchable-height? (snip? . -> . boolean?)))
-  
-  ;; the width of a snip in the parent pasteboard
-  (define (snip-width snip)
-    (let ([left (box 0)]
-          [right (box 0)]
-          [pasteboard (snip-parent snip)])
-      (send pasteboard get-snip-location snip left (box 0) false)
-      (send pasteboard get-snip-location snip right (box 0) true)
-      (- (unbox right) (unbox left))))
-    
-  ;; the height of a snip in the parent pasteboard
-  (define (snip-height snip)
-    (let ([top (box 0)]
-          [bottom (box 0)]
-          [pasteboard (snip-parent snip)])
-      (send pasteboard get-snip-location snip (box 0) top false)
-      (send pasteboard get-snip-location snip (box 0) bottom true)
-      (- (unbox bottom) (unbox top))))
-  
-  ;; the minimum width of the snip
-  (define (snip-min-width snip)
-    (cond
-      [(is-a? snip stretchable-snip<%>)
-       (send snip get-aligned-min-width)]
-      [else (snip-width snip)]))
-  
-  ;; the minimum height of the snip
-  (define (snip-min-height snip)
-    (cond
-      [(is-a? snip stretchable-snip<%>)
-       (send snip get-aligned-min-height)]
-      [else (snip-height snip)]))
-  
-  ;; the pasteboard that contains the snip
-  (define (snip-parent snip)
-    (let ([admin (send snip get-admin)])
-      (if admin
-          (send admin get-editor)
-          false)))
-  
-  ;; the application of f on all snips from snip to the end in a foldl foldr mannor
-  (define (fold-snip f init-acc snip)
-    (let loop ([snip snip]
-               [acc init-acc])
-      (cond
-        [(is-a? snip snip%)
-         (loop (send snip next) (f snip acc))]
-        [else acc])))
-  
-  ;; applies the function to all the snips
-  (define (for-each-snip f first-snip . init-lists)
-    (let loop ([snip first-snip]
-               [lists init-lists])
-      (cond
-        [(is-a? snip snip%)
-         (apply f (cons snip (map first lists)))
-         (loop (send snip next)
-               (map rest lists))]
-        [else (void)])))
-  
-  ;; a list of f applied to each snip
-  (define (map-snip f first-snip . init-lists)
-    (let loop ([snip first-snip]
-               [lists init-lists])
-      (cond
-        [(is-a? snip snip%)
-         (cons (apply f (cons snip (map first lists)))
-               (loop (send snip next)
-                     (map rest lists)))]
-        [else empty])))
-  
-  ;; true if the snip can be resized in the x dimention
-  (define (stretchable-width? snip)
-    (cond
-      [(is-a? snip stretchable-snip<%>)
-       (send snip stretchable-width)]
-      [else false]))
-  
-  ;; true if the snip can be resized in the y dimention
-  (define (stretchable-height? snip)
-    (cond
-      [(is-a? snip stretchable-snip<%>)
-       (send snip stretchable-height)]
-      [else false]))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/snip-wrapper.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/snip-wrapper.rkt
deleted file mode 100644
index 014a34ee14..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/snip-wrapper.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-(module snip-wrapper mzscheme
-  
-  (require
-   mzlib/etc
-   mzlib/class
-   mred
-   "interface.rkt"
-   (prefix sl: "snip-lib.rkt")
-   "dllist.rkt")
-  
-  (provide control-style
-	   snip-wrapper%)
-
-  (define control-style
-    (let ([delta (make-object style-delta%)])
-      (send delta set-family 'system)
-      (send delta set-delta 'change-size (send normal-control-font get-point-size))
-      (send the-style-list find-or-create-style 
-	    (send the-style-list basic-style)
-	    delta)))
-    
-  (define snip-wrapper%
-    (class* dllist% (alignment<%>)
-      (init-field parent snip)
-      (field [pasteboard (send parent get-pasteboard)]
-             [show? true]
-             [snip-is-inserted? false]
-             [min-width 0]
-             [min-height 0])
-      
-      ;;;;;;;;;;
-      ;; alignment<%>
-      
-      #;(-> alignment-parent<%>)
-      ;; The parent of this alignment
-      (define/public (get-parent) parent)
-      
-      #;(-> void?)
-      ;; Tells the alignment that its sizes should be calculated
-      (define/public (set-min-sizes)
-        (if snip-is-inserted?
-            (begin (set! min-width (sl:snip-min-width snip))
-                   (set! min-height (sl:snip-min-height snip)))
-            (begin (set! min-width 0)
-                   (set! min-height 0))))
-      
-      #;(nonnegative? nonnegative? nonnegative? nonnegative? . -> . void?)
-      ;; Tells the alignment to align its children on the pasteboard in the given rectangle
-      (define/public (align x y w h)
-        (send pasteboard move-to snip x y)
-        (when (is-a? snip stretchable-snip<%>)
-          (send snip stretch w h)))
-      
-      #;(-> nonnegative?)
-      ;; The minimum width this alignment must be.
-      (define/public (get-min-width) min-width)
-      
-      #;(-> nonnegative?)
-      ;; The minimum height this alignment must be.
-      (define/public (get-min-height) min-height)
-      
-      #;(case-> (-> boolean?) (boolean? . -> . void?))
-      ;; True if the alignment can be stretched in the x dimension
-      (define/public (stretchable-width)
-        (sl:stretchable-width? snip))
-      
-      #;(case-> (-> boolean?) (boolean? . -> . void?))
-      ;; True if the alignment can be stretched in the y dimension
-      (define/public (stretchable-height)
-        (sl:stretchable-height? snip))
-      
-      #;(boolean? . -> . void?)
-      ;; Tells the alignment that its show state is the given value
-      ;; and it should show or hide its children accordingly.
-      (define/public (show bool)
-        (set! show? bool)
-        (show/hide show?))
-      
-      #;(boolean? . -> . void)
-      ;; Tells the alignment to show or hide its children
-      (define/public (show/hide bool)
-        (send pasteboard lock-alignment true)
-        (unless (boolean=? bool snip-is-inserted?)
-          (if bool
-              (begin (send pasteboard insert-aligned-snip snip)
-                     (set! snip-is-inserted? true))
-              (begin (send pasteboard release-aligned-snip snip)
-                     (set! snip-is-inserted? false))))
-        (send pasteboard realign)
-        (send pasteboard lock-alignment false))
-      
-      (super-new)
-      (send parent add-child this)
-      (show/hide (and show? (send parent is-shown?)))))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/stretchable-editor-snip.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/stretchable-editor-snip.rkt
deleted file mode 100644
index 36301e3a5e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/stretchable-editor-snip.rkt
+++ /dev/null
@@ -1,116 +0,0 @@
-(module stretchable-editor-snip mzscheme
-  
-  (provide
-   stretchable-editor-snip%
-   stretchable-editor-snip-mixin)
-  
-  (require
-   mzlib/class
-   mred
-   mzlib/etc
-   
-   "interface.rkt")
-  
-  (define (stretchable-editor-snip-mixin super%)
-    (class* super% (stretchable-snip<%>)
-      
-      (init
-       (stretchable-width true)
-       (stretchable-height true))
-      
-      (field
-       (aligned-min-width 0)
-       (aligned-min-height 0)
-       (stretchable-width-field stretchable-width)
-       (stretchable-height-field stretchable-height))
-      
-      (public (stretchable-width-method stretchable-width)
-              (stretchable-height-method stretchable-height))
-      
-      ;; stretchable-width (case-> (Boolean . -> . (void)) (-> Boolean))
-      ;; get or set the stretchablity of the pasteboards width
-      (define stretchable-width-method
-        (case-lambda
-          [(value) (set! stretchable-width-field value)]
-          [() stretchable-width-field]))
-      
-      ;; stretchable-height (case-> (Boolean . -> .(void)) (-> Boolean))
-      ;; get or set the stretchablity of the pasteboards height
-      (define stretchable-height-method
-        (case-lambda
-          [(value) (set! stretchable-height-field value)]
-          [() stretchable-height-field]))
-      
-      (define/public (get-aligned-min-width) aligned-min-width)
-      (define/public (get-aligned-min-height) aligned-min-height)
-      
-      (inherit get-margin get-editor get-admin)
-      (define/override (resize w h)
-        (set! aligned-min-width w)
-        (set! aligned-min-height h)
-        (super-resize w h))
-        
-      (define/public (stretch w h)
-        (super-resize w h))
-      
-      (define/override (get-extent dc x y w h descent space lspace rspace)
-        (super get-extent dc x y w h descent space lspace rspace)
-        (when (is-a? (get-editor) text%)
-          (set-box! w (sub1 (unbox w))))
-        (go))
-      
-      (define/override (set-min-width w)
-        ;; account for margin !!!!!!
-        (send (get-editor) set-min-width w))
-      
-      (define/override (set-min-height h)
-        ;; account for margin !!!!!!
-        (send (get-editor) set-min-height h))
-      
-      ;; NOTE: Can I make this not public? I don't think it
-      ;; should be but it's been a while since I wrote this class.
-      (define/public (super-resize w h)
-        (let ((top (box 0))
-              (bot (box 0))
-              (lef (box 0))
-              (rit (box 0)))
-          (get-margin top bot lef rit)
-          (let ((w (max (- w (unbox lef) (unbox rit)) 0))
-                (h (max (- h (unbox top) (unbox bot)) 0))
-                (e (get-editor))
-                (a (get-admin)))
-            ;; subtracting 1 from W seems to make it act more like the editor-snip
-            ;; because the C code has a hack to sub1 to make it look better. I am not
-            ;; sure if this change here is sound and works for every part of this
-            ;; class.
-            (if (> w aligned-min-width)
-                (super set-min-width w)
-                (super set-min-width 'none))
-            (if (> h aligned-min-height)
-                (super set-min-height h)
-                (super set-min-height 'none))
-            (when a (send a resized this #t)))))
-      
-      ;; call this from within get extent and use the values it produces by subtracting the
-      ;; margin instead of calling the editors get-extent and adding the margin.
-      (define (go)
-        (let ([w (box 0)]
-              [h (box 0)]
-              (top (box 0))
-              (bot (box 0))
-              (lef (box 0))
-              (rit (box 0)))
-          (get-margin top bot lef rit)
-          (send (get-editor) get-extent w h)
-          (set! aligned-min-width (+ (unbox w) (unbox lef) (unbox rit)))
-          (set! aligned-min-height (+ (unbox h) (unbox top) (unbox rit)))))
-            
-      (super-new)
-      (inherit get-min-width get-min-height)
-      (set-min-width (get-min-width))
-      (set-min-height (get-min-height))))
-  
-  (define stretchable-editor-snip%
-    (stretchable-editor-snip-mixin
-     editor-snip%))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/suppress-modify-editor.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/suppress-modify-editor.rkt
deleted file mode 100644
index e0a3e7f7be..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/suppress-modify-editor.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-(module suppress-modify-editor mzscheme
-  
-  (require
-   mzlib/etc
-   mzlib/class
-   mred)
-  
-  (provide suppress-modify-editor-mixin)
-      
-  ;; Ignore the modification of the pasteboard that is used for layout
-  ;; Allow nested editors to percollate modify messages up through 
-  (define (suppress-modify-editor-mixin %)
-    (class %
-      (inherit set-modified)
-      (define/augment (after-delete snip)
-        (set-modified false))
-      (define/augment (after-insert snip before x y)
-        (set-modified false))
-      (define/augment (after-move-to snip x y dragging?)
-        (set-modified false))
-      (define/augment (after-resize snip w h resized?)
-        (set-modified false))
-      (super-new)))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tabbable-text.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tabbable-text.rkt
deleted file mode 100644
index 0daeb41961..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tabbable-text.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-
-(module tabbable-text mzscheme
-  
-  (require
-   mzlib/class
-   mzlib/list
-   mzlib/etc
-   framework
-   mred
-   mzlib/contract)
-  
-  (define tabbable-text<%>
-    (interface ()
-      #;(-> void)
-      ;; Takes the caret into this text
-      
-      set-caret-owner
-      #;((-> void) . -> . void)
-      ;; The thunk to execute when tabbing ahead
-      set-ahead
-      
-      #;((-> void) . -> . void)
-      ;; The thunk to execute when tabbing back
-      set-back))
-  
-  (provide/contract
-   (tabbable-text<%> interface?)
-   (tabbable-text-mixin mixin-contract)
-   (set-tabbing (() (listof (is-a?/c tabbable-text<%>)) . ->* . (void?))))
-  
-  (define tabbable-text-mixin
-    (mixin (editor:keymap<%>) (tabbable-text<%>)
-      
-      (init-field
-       [ahead void]
-       [back void])
-      
-      #;(-> (listof keymap%))
-      ;; the list of keymaps associated with this text
-      (define/override (get-keymaps)
-        (let ([keymap (make-object keymap%)])
-          (send keymap add-function "tab-ahead"
-                (lambda (ignored event) (ahead)))
-          (send keymap map-function ":tab" "tab-ahead")
-          (send keymap add-function "tab-back"
-                (lambda (ignored event) (back)))
-          (send keymap map-function "s:tab" "tab-back")
-          (cons keymap (super get-keymaps))))
-      
-      (define/public (set-ahead t) (set! ahead t))
-      (define/public (set-back t) (set! back t))
-      
-      (super-new)))
-  
-  ;; sets the tabbing of all of the texts in the order of the list
-  (define (set-tabbing . l)
-    (cond
-      [(or (empty? l) (empty? (rest l))) (void)]
-      [else
-       (send (first l) set-ahead
-             (lambda () (send (second l) set-caret-owner false 'global)))
-       (send (second l) set-back
-             (lambda () (send (first l) set-caret-owner false 'global)))
-       (apply set-tabbing (rest l))]))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/alignment-test.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/alignment-test.rkt
deleted file mode 100644
index 1609a68679..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/alignment-test.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-(require
- mzlib/class
- mzlib/etc
- mred
- "../verthoriz-alignment.rkt"
- "../lines.rkt"
- "../aligned-pasteboard.rkt"
- "../snip-wrapper.rkt")
-
-(require "../snip-lib.rkt")
-
-(define f (new frame% (label "f") (height 500) (width 500)))
-(send f show true)
-(define p (new aligned-pasteboard%))
-(define c (new editor-canvas% (editor p) (parent f)))
-(define a1 (new vertical-alignment% (parent p)))
-(define a2 (new horizontal-alignment% (parent a1)))
-(define a3 (new horizontal-alignment% (parent a1)))
-
-(new snip-wrapper%
-     (snip (make-object string-snip% "One"))
-     (parent a2))
-(new snip-wrapper%
-     (snip (make-object string-snip% "Two"))
-     (parent a2))
-(new snip-wrapper%
-     (snip (make-object string-snip% "Three"))
-     (parent a3))
-(new snip-wrapper%
-     (snip (make-object string-snip% "Three"))
-     (parent a3))
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/info.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/info.rkt
deleted file mode 100644
index 864455a14c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define compile-omit-paths 'all)
-(define test-omit-paths 'all)
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/not-stetching.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/not-stetching.rkt
deleted file mode 100644
index ace952c96f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/not-stetching.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-(module not-stetching mzscheme
-  
-  (require
-   mike-lib/debug
-   mzlib/class
-   mzlib/etc
-   mred
-   embedded-gui/aligned-pasteboard
-   embedded-gui/stretchable-editor-snip
-   embedded-gui/verthoriz-alignment)
-  
-  (define traced-ses%
-    #;(override/trace stretchable-editor-snip%
-                    (stretch
-                     get-aligned-min-width
-                     get-aligned-min-height
-                     stretchable-width
-                     stretchable-height)))
-  
-  (define f (new frame% (label "f") (width 400) (height 400)))
-  (define e (new text%))
-  (define c (new editor-canvas% (parent f) (editor e)))
-  (define main (new aligned-pasteboard%))
-  (define j (new editor-snip% (editor main)))
-  (define line (new horizontal-alignment% (parent main)))
-  (define ses (new traced-ses% (editor (new text%))))
-  (send line add ses)
-  (send main add (make-object string-snip% "super duper very long snip"))
-  (send e insert j)
-  (send f show true)
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/only-one-child.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/only-one-child.rkt
deleted file mode 100644
index 898cc3b62a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/only-one-child.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-(require
- mred
- mzlib/class
- mzlib/etc
- mzlib/list
- mzlib/match
- (prefix a: "../alignment.rkt")
- "../alignment-helpers.rkt"
- "../dllist.rkt"
- mrlib/click-forwarding-editor
- "../on-show-pasteboard.rkt"
- "../really-resized-pasteboard.rkt"
- "../interface.rkt"
- "../locked-pasteboard.rkt"
- "../suppress-modify-editor.rkt")
-
-;;;;;;;;;;
-;; alignment
-
-(define (vert/horiz-alignment type)
-  (class* dllist% ()
-    
-    (init-field [parent #f])
-    
-    (field
-     [head (new head%)]
-     [tail (new tail%)])
-    
-    (send head next tail)
-    (send tail prev head)
-    
-    #;(((is-a?/c alignment<%>)) ((union (is-a?/c alignment<%>) false?)) . opt-> . void?)
-    ;; Add the given alignment as a child before the existing child
-    (define/public add-child
-      (opt-lambda (child (after #f))
-        (define (link p item n)
-          (send p next child)
-          (send child prev p)
-          (send n prev child)
-          (send child next n))
-        (if after
-            (link after child (send after next))
-            (link (send tail prev) child tail))))
-    
-    (super-new)
-    (when parent (send parent add-child this))))
-
-(define vertical-alignment% (vert/horiz-alignment 'vertical))
-(define horizontal-alignment% (vert/horiz-alignment 'horizontal))
-
-(let* ([interactions (new vertical-alignment% (parent (new vertical-alignment%)))])
-  (new horizontal-alignment% (parent interactions))
-  (new horizontal-alignment% (parent interactions))
-  `(equal? ,(length (send interactions map-to-list (lambda (x) x))) 2))
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/peer-stretchables.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/peer-stretchables.rkt
deleted file mode 100644
index 709015fd85..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/peer-stretchables.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-(require
- mzlib/class
- mzlib/etc
- mred
- "../stretchable-editor-snip.rkt"
- "../verthoriz-alignment.rkt"
- "../aligned-pasteboard.rkt")
-
-(define f (new frame% (label "f") (width 400) (height 400)))
-(define e (new text%))
-(define c (new editor-canvas% (parent f) (editor e)))
-(define main (new aligned-pasteboard%))
-(define horiz (new vertical-alignment% (parent main)))
-(define es (new editor-snip% (editor main)))
-(define ses1 (new stretchable-editor-snip% (editor (new text%))))
-(define ses2 (new stretchable-editor-snip% (editor (new text%))))
-(send* horiz (add ses1) (add ses2))
-(send e insert es)
-(send f show true)
-
-(let ([e (send ses2 get-editor)]
-      [ses1-mw (send ses1 get-min-width)])
-  (send e insert "sdflsdfnsknbskdlf")
-  (send e erase)
-  (equal? ses1-mw (send ses1 get-min-width)))
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/stretching-in-alignment.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/stretching-in-alignment.rkt
deleted file mode 100644
index b8ab0e435c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/stretching-in-alignment.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-(module stretching-in-alignment mzscheme
-    
-  (require
-   mred
-   mzlib/etc
-   mzlib/class
-   mrlib/private/aligned-pasteboard/interface
-   mike-lib/debug
-   mzlib/list
-   mzlib/match
-   (prefix a: "alignment.ss")
-   mrlib/click-forwarding-editor
-   mrlib/private/aligned-pasteboard/snip-lib
-   embedded-gui/aligned-pasteboard
-   embedded-gui/stretchable-editor-snip)
-  
-  (define f (new frame% (label "f") (width 400) (height 400)))
-  (define e (new text%))
-  (define c (new editor-canvas% (editor e) (parent f)))
-  (define pb (new aligned-pasteboard%))
-  (define es (new editor-snip% (editor pb)))
-  (define ses (new (stretchable-editor-snip-mixin editor-snip%)
-                   (editor (new text%))))
-  (send* pb
-    (add (new (stretchable-editor-snip-mixin editor-snip%)
-              (editor (new text%))))
-    (add (make-object string-snip% "This snip is very long")))
-  (send e insert es)
-  (send f show true)
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/target-not-object.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/target-not-object.rkt
deleted file mode 100644
index 1e6ddfb90f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/target-not-object.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-(require
- mzlib/class
- embedded-gui)
-
-(let* ([pb (new aligned-pasteboard%)]
-       [interactions (new vertical-alignment% (parent pb))])
-  (send interactions map-to-list (lambda (x) x))
-  #t)
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-alignment.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-alignment.rkt
deleted file mode 100644
index d7857a013b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-alignment.rkt
+++ /dev/null
@@ -1,276 +0,0 @@
-(require
- mzlib/etc
- mzlib/list
- mzlib/match
- "../alignment.rkt"
- "test-macro.rkt")
-
-;;los-equal? ((listof rect?) (listof rect?) . -> . boolean?)
-;;tests the equality of the list of structures
-(define (los-equal? a b)
-  (equal?
-   (map rect->list a)
-   (map rect->list b)))
-
-;;rect->list (rect? . -> . vector?)
-;;a vector of the fields in the rect
-(define rect->list
-  (match-lambda
-    [($ rect ($ dim x width stretchable-width?) ($ dim y height stretchable-height?))
-     (list x width stretchable-width? y height stretchable-height?)]))
-
-;;empty pasteboard
-(test
- los-equal?
- (align 'vertical 100 100 empty)
- empty)
-
-;;empty pasteboard
-(test
- los-equal?
- (align 'horizontal 100 100 empty)
- empty)
-
-;;one unstretchable snip
-(test
- los-equal?
- (align 'vertical
-        100 100
-        (list (make-rect (make-dim 0 10 false)
-                         (make-dim 0 10 false))))
- (list (make-rect (make-dim 0 10 false)
-                  (make-dim 0 10 false))))
-
-(test
- los-equal?
- (align 'horizontal
-        100 100
-        (list (make-rect (make-dim 0 10 false)
-                         (make-dim 0 10 false))))
- (list (make-rect (make-dim 0 10 false)
-                  (make-dim 0 10 false))))
-
-;;one stretchable snip
-(test
- los-equal?
- (align 'vertical
-        100 100
-        (list (make-rect (make-dim 0 10 true)
-                         (make-dim 0 10 true))))
- (list (make-rect (make-dim 0 100 true)
-                  (make-dim 0 100 true))))
-
-;;two stretchable snips
-(test
- los-equal?
- (align 'vertical
-        10
-        10
-        (list
-         (make-rect (make-dim 0 0 true)
-                    (make-dim 0 0 true))
-         (make-rect (make-dim 0 0 true)
-                    (make-dim 0 0 true))))
- (list
-  (make-rect (make-dim 0 10 true)
-             (make-dim 0 5 true))
-  (make-rect (make-dim 0 10 true)
-             (make-dim 5 5 true))))
-
-;;three stretchable, one too big
-(test
- los-equal?
- (align 'vertical
-        50 100
-        (list (make-rect (make-dim 0 0 true)
-                         (make-dim 0 50 true))
-              (make-rect (make-dim 0 0 true)
-                         (make-dim 0 0 true))
-              (make-rect (make-dim 0 0 true)
-                         (make-dim 0 0 true))))
- (list (make-rect (make-dim 0 50 true)
-                  (make-dim 0 50 true))
-       (make-rect (make-dim 0 50 true)
-                  (make-dim 50 25 true))
-       (make-rect (make-dim 0 50 true)
-                  (make-dim 75 25 true))))
-
-;;three stetchable, one too big, and an unstetchable
-(test
- los-equal?
- (align 'vertical
-        50 100
-        (list (make-rect (make-dim 0 0 true)
-                         (make-dim 0 50 true))
-              (make-rect (make-dim 0 0 true)
-                         (make-dim 0 0 true))
-              (make-rect (make-dim 0 0 true)
-                         (make-dim 0 0 true))
-              (make-rect (make-dim 0 50 false)
-                         (make-dim 0 10 false))))
- (list (make-rect (make-dim 0 50 true)
-                  (make-dim 0 50 true))
-       (make-rect (make-dim 0 50 true)
-                  (make-dim 50 20 true))
-       (make-rect (make-dim 0 50 true)
-                  (make-dim 70 20 true))
-       (make-rect (make-dim 0 50 false)
-                  (make-dim 90 10 false))))
-
-;;failure from test-suite frame
-;;wrong answer given was (list (make-rect 0 0 335.0 10 #t))
-(test
- los-equal?
- (align 'vertical
-        335.0
-        563.0
-        (list
-         (make-rect (make-dim 0 10.0 #t)
-                    (make-dim 0 10.0 #t))))
- (list (make-rect (make-dim 0 335.0 true)
-                  (make-dim 0 563.0 true))))
-
-;;sort of like the previous failed test but with a nonsizable snip
-(test
- los-equal?
- (align 'vertical
-        563.0
-        335.0
-        (list
-         (make-rect (make-dim 0 10.0 #t)
-                    (make-dim 0 10.0 #t))
-         (make-rect (make-dim 0 10.0 false)
-                    (make-dim 0 10.0 false))))
- (list (make-rect (make-dim 0 563.0 true)
-                  (make-dim 0 325.0 true))
-       (make-rect (make-dim 0 10.0 false)
-                  (make-dim 325.0 10.0 false))))
-
-;;something that requires a little modulo in division
-(test
- los-equal?
- (align 'vertical
-        10
-        10
-        (list
-         (make-rect (make-dim 0 0 true)
-                    (make-dim 0 0 true))
-         (make-rect (make-dim 0 0 true)
-                    (make-dim 0 0 true))
-         (make-rect (make-dim 0 0 true)
-                    (make-dim 0 0 true))))
- (list (make-rect (make-dim 0 10 true)
-                  (make-dim 0 4 true))
-       (make-rect (make-dim 0 10 true)
-                  (make-dim 4 3 true))
-       (make-rect (make-dim 0 10 true)
-                  (make-dim 7 3 true))))
-
-;; 1 snip only stretches in off dimention
-(test
- los-equal?
- (align 'vertical
-        100
-        400
-        (list
-         (make-rect (make-dim 0 10 true)
-                    (make-dim 0 30 false))))
- (list (make-rect (make-dim 0 100 true)
-                  (make-dim 0 30 false))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; The following examples of usage were taken from the test-suite tool and turned into test cases ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(test
- los-equal?
- (align 'vertical 563.0 335.0 (list))
- empty)
-
-(test
- los-equal?
- (align 'vertical 563.0 335.0
-        (list (make-rect (make-dim 0 241 #t) (make-dim 0 114 #f))))
- (list (make-rect (make-dim 0 563.0 #t) (make-dim 0 114 #f))))
-
-(test
- los-equal?
- (align 'vertical 551.0 102.0
-        (list (make-rect (make-dim 0 34 #t) (make-dim 0 47 #t))
-              (make-rect (make-dim 0 231 #t) (make-dim 0 57 #t))))
- (list (make-rect (make-dim 0 551.0 #t) (make-dim 0 47 #t))
-       (make-rect (make-dim 0 551.0 #t) (make-dim 47 57 #t))))
-
-(test
- los-equal?
- (align 'vertical 539.0 35.0
-        (list (make-rect (make-dim 0 24 #f) (make-dim 0 13 #f))
-              (make-rect (make-dim 0 11 #f) (make-dim 0 24 #f))))
- (list (make-rect (make-dim 0 24 #f) (make-dim 0 13 #f))
-       (make-rect (make-dim 0 11 #f) (make-dim 13 24 #f))))
-
-(test
- los-equal?
- (align 'horizontal 539.0 45.0
-        (list (make-rect (make-dim 0 65 #t) (make-dim 0 47 #t))
-              (make-rect (make-dim 0 48 #t) (make-dim 0 47 #t))
-              (make-rect (make-dim 0 63 #t) (make-dim 0 47 #t))
-              (make-rect (make-dim 0 45 #f) (make-dim 0 44 #f))))
- (list
-  (make-rect (make-dim 0 165.0 true) (make-dim 0 45.0 true))
-  (make-rect (make-dim 165.0 165.0 true) (make-dim 0 45.0 true))
-  (make-rect (make-dim 330.0 164.0 true) (make-dim 0 45.0 true))
-  (make-rect (make-dim 494.0 45 false) (make-dim 0 44 false))))
-
-(test
- los-equal?
- (align 'vertical 153.0 33.0
-        (list (make-rect (make-dim 0 55 #f) (make-dim 0 13 #f))
-              (make-rect (make-dim 0 11 #f) (make-dim 0 24 #f))))
- (list
-  (make-rect (make-dim 0 55 false) (make-dim 0 13 false))
-  (make-rect (make-dim 0 11 false) (make-dim 13 24 false))))
-
-(test
- los-equal?
- (align 'vertical 153.0 33.0
-        (list (make-rect (make-dim 0 38 #f) (make-dim 0 13 #f))
-              (make-rect (make-dim 0 11 #f) (make-dim 0 24 #f))))
- (list
-  (make-rect (make-dim 0 38 false) (make-dim 0 13 false))
-  (make-rect (make-dim 0 11 false) (make-dim 13 24 false))))
-
-(test
- los-equal?
- (align 'vertical 152.0 33.0
-        (list (make-rect (make-dim 0 26 #f) (make-dim 0 13 #f))
-              (make-rect (make-dim 0 53 #f) (make-dim 0 24 #f))))
- (list
-  (make-rect (make-dim 0 26 false) (make-dim 0 13 false))
-  (make-rect (make-dim 0 53 false) (make-dim 13 24 false))))
-
-(test
- los-equal?
- (align 'vertical 0 0 empty)
- empty)
-
-(test
- los-equal?
- (align 'vertical 4 0 empty)
- empty)
-
-(test
- los-equal?
- (align 'vertical 0 3 empty)
- empty)
-
-(test
- los-equal?
- (align 'horizontal 35 1 empty)
- empty)
-
-(test
- los-equal?
- (align 'horizontal 0 0
-        (list (make-rect (make-dim 0 4 #f) (make-dim 0 5 #f))))
- (list (make-rect (make-dim 0 4 #f) (make-dim 0 5 #f))))
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-case-box.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-case-box.rkt
deleted file mode 100644
index d97f855c9d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-case-box.rkt
+++ /dev/null
@@ -1,175 +0,0 @@
-(require
- mzlib/class
- mzlib/list
- mred
- mzlib/unitsig
- drscheme/tool
- mzlib/etc
- mzlib/match
- framework
- syntax/readerr
- string-constants
- embedded-gui
- string-constants)
-
-(define test-case:program-editor% text%)
-
-(define test-case-box%
-  (class editor-snip%
-    (inherit get-admin)
-          
-          (init-field
-           [enabled? true]
-           [actual-show? true]
-           [collapsed? false]
-           [to-test (new test-case:program-editor%)]
-           [expected (new test-case:program-editor%)])
-          
-          (field
-           [actual (new actual-text%)]
-           [result (new result-snip%
-                        (status (if enabled?
-                                    'unknown
-                                    'disabled)))])
-    
-
-          (define (show-actual show?)
-            (set! actual-show? show?)
-            (send show-actual-button set-state
-                  (boolean->show-actual-btn-state show?))
-            (send actual-pane show show?))
-          
-          (define (collapse bool)
-            (set! collapsed? bool)
-            (send collapse-button set-state
-                  (boolean->collapse-btn-state bool))
-            (send pb lock-alignment true)
-            (send left show (not bool))
-            (send right show (not bool))
-            (send pb lock-alignment false))
-            
-          (define (boolean->collapse-btn-state bool)
-            (if bool 'on 'off))
-          
-          (define (boolean->show-actual-btn-state bool)
-            (if bool 'off 'on))
-          
-          (field
-           [pb (new aligned-pasteboard%)]
-           [main (new horizontal-alignment% (parent pb))]
-           [left (new vertical-alignment%
-                      (parent main)
-                      (show? (not collapsed?)))]
-           [right (new vertical-alignment%
-                       (parent main)
-                       (show? (not collapsed?)))]
-           [button-pane (new vertical-alignment% (parent main))]
-           [to-test-pane (new vertical-alignment% (parent left))]
-           [expected-pane (new vertical-alignment% (parent right))]
-           [actual-pane (new vertical-alignment%
-                             (parent right)
-                             (show? actual-show?))]
-           [collapse-button
-            (new turn-button-snip%
-                 (state (boolean->collapse-btn-state collapsed?))
-                 (turn-off
-                  (lambda (b e) (collapse true)))
-                 (turn-on
-                  (lambda (b e) (collapse false))))]
-           [show-actual-button
-            (new turn-button-snip%
-                 (state (boolean->show-actual-btn-state actual-show?))
-                 (turn-off
-                  (lambda (b e) (show-actual false)))
-                 (turn-on
-                  (lambda (b e) (show-actual true))))])
-    
-    (super-new (editor pb))
-          
-          (define (labeled-field alignment label text)
-            ;; I string-append here to give space after the label
-            ;; They look a lot better without something right after them.
-            (new snip-wrapper%
-                 (snip (make-object string-snip% (string-append label "     ")))
-                 (parent alignment))
-            (new snip-wrapper%
-                 (snip (new stretchable-editor-snip%
-                            (editor text)
-                            (stretchable-height false)))
-                 (parent alignment)))
-          
-          (labeled-field to-test-pane (string-constant test-case-to-test) to-test)
-          (labeled-field expected-pane (string-constant test-case-expected) expected)
-          
-          (new snip-wrapper%
-               (snip (make-object string-snip% (string-constant test-case-actual)))
-               (parent actual-pane))
-          (new snip-wrapper%
-               (snip (new (grey-editor-snip-mixin stretchable-editor-snip%)
-                          (editor actual)
-                          (stretchable-height false)))
-               (parent actual-pane))
-          
-          (new snip-wrapper%
-               (snip result)
-               (parent button-pane))
-          ;; NOTE: When you add the collapse feature, be sure that
-          ;; error-reporting on collapsed test-cases highlight the
-          ;; test-case. (PR6955)
-          (new snip-wrapper%
-               (snip collapse-button)
-               (parent button-pane))
-          (new snip-wrapper%
-               (snip show-actual-button)
-               (parent button-pane))
-    ))
-  
-  #;((-> void?) (-> void?) (symbols 'up 'down) . -> . snip%)
-  ;; a snip which acts as a toggle button for rolling a window up and down
-  (define turn-button-snip%
-    (class toggle-button-snip%
-      (super-new
-       (images-off (cons (icon "turn-down.png") (icon "turn-down-click.png")))
-       (images-on (cons (icon "turn-up.png") (icon "turn-up-click.png"))))))
-  
-  ;; a snip which will display a pass/fail result
-  (define result-snip%
-    (class image-snip%
-      (inherit load-file)
-      (init-field [status 'unknown])
-      ;; ((symbols 'pass 'fail 'unknown 'disabled) . -> . void?)
-      ;; updates the image with the icon representing one of three results
-      (define/public (update value)
-        (load-file
-         (test-icon
-          (case value
-            [(pass) "small-check-mark.jpeg"]
-            [(fail) "small-cross.jpeg"]
-            [(unknown) "small-empty.gif"]
-            [(disabled) "small-no.gif"]))))
-      
-      (super-new)
-      (update status)))
-      
-  
-  (define (icon str)
-    (build-path (collection-path "icons") str))
-  
-  (define (test-icon str)
-    (build-path (collection-path "test-suite") "private" "icons" str))
-  
-  ;; a locked text hightlighted to show that it is inactive
-  (define actual-text%
-    (class (grey-editor-mixin
-            (text:hide-caret/selection-mixin racket:text%))
-      (inherit hide-caret lock)
-      (super-new)
-      (hide-caret true)
-      (lock true)))
-  
-(define f (new frame% (label "f") (width 400) (height 400)))
-(define e (new text%))
-(define c (new editor-canvas% (parent f) (editor e)))
-(define t (new test-case-box%))
-(send f show #t)
-(send e insert t)
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-macro.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-macro.rkt
deleted file mode 100644
index d25eee3d70..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-macro.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-(module test-macro mzscheme
-  
-  (require mzlib/etc)
-  
-  (provide test)
-  
-  ;; test: (lambda (a?) ((a? a? . -> . boolean?) a? a? . -> . (void))
-  ;; tests to see if the expression is true and prints and error if it's not
-  (define-syntax test
-    (syntax-rules (identity)
-      ((_ test actual expected)
-       (let ([result
-              (with-handlers
-                  ([exn? identity])
-                actual)])
-         (and (not (exn? result))
-              (test result expected))))))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-show-feature-for-test-case.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-show-feature-for-test-case.rkt
deleted file mode 100644
index 4805b1d30e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-show-feature-for-test-case.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-(require
- mzlib/class
- mred
- "../aligned-pasteboard.rkt"
- "../verthoriz-alignment.rkt"
- "../snip-wrapper.rkt"
- "../stretchable-editor-snip.rkt")
-
-(define actual-show? #f)
-(define collapsed? #t)
-(define actual (new text%))
-(define to-test (new text%))
-(define expected (new text%))
-
-(define pb (new aligned-pasteboard%))
-(define main (new horizontal-alignment% (parent pb)))
-(define left (new vertical-alignment%
-                  (parent main)
-                  (show? (not collapsed?))))
-(define right (new vertical-alignment%
-                       (parent main)
-                       (show? (not collapsed?))))
-(define button-pane (new vertical-alignment% (parent main)))
-(define to-test-pane (new vertical-alignment% (parent left)))
-(define expected-pane (new vertical-alignment% (parent right)))
-(define actual-pane (new vertical-alignment%
-                         (parent right)
-                         (show? actual-show?)))
-
-(define f (new frame% (label "f") (width 400) (height 500)))
-(send f show #t)
-(define e (new text%))
-(define c (new editor-canvas% (editor e) (parent f)))
-(define es (new editor-snip% (editor pb)))
-
-(define (show-actual show?)
-  (set! actual-show? show?)
-  (send actual-pane show actual-show?))
-
-(define (collapse bool)
-  (set! collapsed? bool)
-  (send left show (not collapsed?))
-  (send right show (not collapsed?)))
-
-(send e insert es)
-
-(define (labeled-field alignment label text)
-  ;; I string-append here to give space after the label
-  ;; They look a lot better without something right after them.
-  (new snip-wrapper%
-       (snip (make-object string-snip% (string-append label "     ")))
-       (parent alignment))
-  (new snip-wrapper%
-       (snip (new stretchable-editor-snip%
-                  (editor text)
-                  (stretchable-height #f)))
-       (parent alignment)))
-          
-(send pb lock-alignment #t)
-(labeled-field to-test-pane "Test" to-test)
-(labeled-field expected-pane "Expected" expected)
-(new snip-wrapper%
-     (snip (make-object string-snip% "Actual"))
-     (parent actual-pane))
-(new snip-wrapper%
-     (snip (new stretchable-editor-snip%
-                (editor actual)
-                (stretchable-height #f)))
-     (parent actual-pane))
-(send pb lock-alignment #f)
-;(collapse #t)
-;(collapse #f)
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-show-feature.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-show-feature.rkt
deleted file mode 100644
index 2e912ad14a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/test-show-feature.rkt
+++ /dev/null
@@ -1,261 +0,0 @@
-#| This tests to make sure show works. It's not a correct test because
-   it's been abandoned and was reduced to wont-shrink.rkt This is still
-   a good file for sandboxing show stuff though.
-|#
-
-(require
- mzlib/class
- mred
- mzlib/etc
- mzlib/list
- mzlib/match
- (prefix a: "../alignment.rkt")
-   
- "../snip-lib.rkt"
- "../interface.rkt"
- "../alignment-helpers.rkt"
- mrlib/click-forwarding-editor
- "../on-show-pasteboard.rkt"
- "../really-resized-pasteboard.rkt"
- "../interface.rkt"
- "../snip-lib.rkt"
- "../locked-pasteboard.rkt"
- "../verthoriz-alignment.rkt"
- "../suppress-modify-editor.rkt")
-  
-(require mike-lib/print-debug)
-  
-(define aligned-pasteboard%
-  (class (click-forwarding-editor-mixin
-          (on-show-pasteboard-mixin
-           (suppress-modify-editor-mixin
-            (locked-pasteboard-mixin
-             (really-resized-pasteboard-mixin pasteboard%)))))
-    
-    (inherit begin-edit-sequence end-edit-sequence
-             get-max-view-size refresh-delayed?)
-    (init align)
-    (field
-     [alignment (new (case align
-                       [(horizontal) horizontal-alignment%]
-                       [(vertical) vertical-alignment%]))]
-     [lock-alignment? false]
-     [needs-alignment? false])
-    
-    (define/public (get-alignment) alignment)
-    
-    #|
-     snip : snip% object
-     before : snip% object or #f
-     x : real number
-     y : real number
-    |#
-    (rename [super-after-insert after-insert])
-    (define/override (after-insert snip before x y)
-      (super-after-insert snip before x y)
-      (realign))
-    
-    #|
-      snip : snip% object
-    |#
-    (rename [super-after-delete after-delete])
-    (define/override (after-delete snip)
-      (super-after-delete snip)
-      (realign))
-    
-    #|
-      snip : snip% object
-    |#
-    (rename [super-really-resized really-resized])
-    (define/override (really-resized snip)
-      (super-really-resized snip)
-      (realign))
-    
-    (rename [super-on-show on-show])
-    (define/override (on-show)
-      (realign)
-      (super-on-show))
-    
-    (define/public (lock-alignment lock?)
-      (set! lock-alignment? lock?)
-      (when (and needs-alignment? (not lock-alignment?))
-        (realign))
-      (if lock?
-          (begin-edit-sequence)
-          (end-edit-sequence)))
-    
-    (define/public (realign)
-      (if lock-alignment?
-          (set! needs-alignment? true)
-          (fluid-let ([lock-alignment? true])
-            (send alignment set-min-sizes)
-            (let ([width (send alignment get-min-width)]
-                  [height (send alignment get-min-height)])
-              (unless (or (zero? width) (zero? height))
-                (send alignment align 0 0 width height)
-                (set! needs-alignment? false))))))
-    
-    (super-new)
-    (send alignment set-pasteboard this)))
-  
-(define (vert/horiz-alignment type)
-  (class* object% (alignment<%>)
-    
-    (init-field
-     [parent false]
-     [show? true])
-    
-    (field
-     [pasteboard false]
-     [children empty]
-     [min-width 0]
-     [min-height 0])
-      
-    ;; STATUS: This function (through lock-alignment false) invokes a call
-    ;; to realign of the pasteboard even when this alignement has show? = false
-    ;; so the call is not needed.
-    (define/public (add child)
-      (set! children (append children (list child)))
-      (send pasteboard lock-alignment true)
-      (cond
-        [(is-a? child snip%)
-         (when (get-show?)
-           (send pasteboard insert child false))]
-        [(is-a? child alignment<%>)
-         (send child set-pasteboard pasteboard)])
-      (send pasteboard lock-alignment false))
-    
-    (define/public (get-min-width)
-      (if (get-show?) min-width 0))
-    (define/public (get-min-height)
-      (if (get-show?) min-height 0))
-    (define/public (set-pasteboard pb) (set! pasteboard pb))
-    (define/public (stretchable-width?) true)
-    (define/public (stretchable-height?) true)
-    
-    #;(boolean? . -> . void?)
-    ;; Shows or hides the alignment
-    (define/public (show bool)
-      (set! show? bool)
-      (when (parent-show?)
-        (send pasteboard lock-alignment true)
-        (show/hide-snips show?)
-        (send pasteboard lock-alignment false)))
-    
-    #;(boolean? . -> . void?)
-    ;; Inserts or deletes all the snips in the tree.
-    (define/public (show/hide-snips bool)
-      (when (boolean=? show? bool)
-        (for-each (show/hide-child bool) children)))
-    
-    (define ((show/hide-child show?) child)
-      (if (is-a? child alignment<%>)
-          (send child show/hide-snips show?)
-          (if show?
-              (send pasteboard insert child)
-              (send pasteboard release-snip child))))
-    
-    (define/public (get-show?)
-      (and show? (parent-show?)))
-    
-    (define (parent-show?)
-      (if (and parent (is-a? parent alignment<%>))
-          (send parent get-show?)
-          true))
-    
-    (define/public (align x-offset y-offset width height)
-      
-      (define move/resize
-        (match-lambda*
-          [(child ($ a:rect
-                     ($ a:dim x w stretchable-width?)
-                     ($ a:dim y h stretchable-height?)))
-           (let ([global-x (+ x x-offset)]
-                 [global-y (+ y y-offset)])
-             (cond
-               [(is-a? child snip%)
-                (send pasteboard move-to child global-x global-y)
-                (when (or stretchable-width? stretchable-height?)
-                      (send child stretch w h))]
-               [(is-a? child alignment<%>)
-                (send child align global-x global-y w h)]))]))
-      
-      (when (and (get-show?) (not (empty? children)))
-        (for-each move/resize
-                  children
-                  (a:align type width height
-                           (map build-rect children)))))
-    
-    (define/public (set-min-sizes)
-      (when show?
-        (for-each
-         (lambda (child)
-           (when (is-a? child alignment<%>)
-             (send child set-min-sizes)))
-         children)
-        (let-values ([(x-accum y-accum)
-                      (if (symbol=? type 'vertical)
-                          (values vacuous-max +)
-                          (values + vacuous-max))])
-          (set! min-width
-                (apply x-accum
-                       (map child-width
-                            children)))
-          (set! min-height
-                (apply y-accum
-                       (map child-height
-                            children))))))
-    
-    (super-new)
-    ;; NOTE: Try to figure out how it's getting a nonalignment<%> parent
-    (when (and parent (is-a? parent alignment<%>))
-      (send parent add this))))
-
-(define vertical-alignment% (vert/horiz-alignment 'vertical))
-(define horizontal-alignment% (vert/horiz-alignment 'horizontal))
-
-;; build-rect ((is-a?/c snip%) . -> . rect?)
-;; makes a new default rect out of a snip
-(define (build-rect item)
-  (cond
-    [(is-a? item snip%)
-     (a:make-rect
-      (a:make-dim 0 (snip-min-width item) (stretchable-width? item))
-      (a:make-dim 0 (snip-min-height item) (stretchable-height? item)))]
-    [(is-a? item alignment<%>)
-     (a:make-rect
-      (a:make-dim 0 (send item get-min-width) (send item stretchable-width?))
-      (a:make-dim 0 (send item get-min-height) (send item stretchable-height?)))]))
-
-;;;;;;;;;;
-;; main
-
-(define f (new frame% (label "f") (width 400) (height 400)))
-(define e (new text%))
-(define c (new editor-canvas% (parent f) (editor e)))
-(define ap (new aligned-pasteboard% (align 'horizontal)))
-(define es (new editor-snip% (editor ap)))
-(define a1 (send ap get-alignment))
-
-(define a2 (new vertical-alignment% (parent a1)))
-(define a3 (new vertical-alignment% (parent a1)))
-(define a4 (new vertical-alignment% (parent a3)))
-(define a5 (new vertical-alignment% (parent a3) (show? #f)))
-
-(send a2 add (make-object string-snip% "a2"))
-(send a4 add (make-object string-snip% "a4"))
-(send a5 add (make-object string-snip% "a5"))
-
-;; this next line blows up but should not
-#;(send a5 show #t)
-  
-(send f show #t)
-(send e insert es)
-
-(let ([a (send a1 get-min-height)])
-  (send a5 show #t)
-  (let ([b (send a1 get-min-height)])
-    (send a5 show #f)
-    (let ([c (send a1 get-min-height)])
-      (values (equal? a c)
-              (equal? a (/ b 2))))))
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/unaligned-childless-redux.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/unaligned-childless-redux.rkt
deleted file mode 100644
index a1c6ab25e5..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/tests/unaligned-childless-redux.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-(require embedded-gui/aligned-pasteboard
-         mike-lib/debug)
-
-(define f (new frame% (label "f") (width 100) (height 100)))
-(define e (new text%))
-(define c (new editor-canvas% (parent f) (editor e)))
-(define main (new aligned-pasteboard%))
-(define j (new editor-snip% (editor main)))
-(define line (new horizontal-alignment% (parent main)))
-(send e insert j)
-(zero? (send line get-min-width))
-(send line add (make-object string-snip% "foo"))
-(send line add (make-object string-snip% "foo"))
-(send f show #t)
-;; If the following test case is delayed it's true.
-;; is this a problem? It could be if this attempt
-;; to read the min-width when aligning. However, this
-;; program prints out foofoo like it should and doesn't
-;; overlap them so maybe we're okay.
-(not (zero? (send line get-min-width)))
diff --git a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/verthoriz-alignment.rkt b/pkgs/gui-pkgs/gui-lib/embedded-gui/private/verthoriz-alignment.rkt
deleted file mode 100644
index 9a6ed2f01e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/embedded-gui/private/verthoriz-alignment.rkt
+++ /dev/null
@@ -1,175 +0,0 @@
-(module verthoriz-alignment mzscheme
-  
-  (require
-   mzlib/class
-   mzlib/etc
-   mzlib/list
-   mzlib/match
-   (prefix a: "alignment.rkt")
-   "interface.rkt"
-   "alignment-helpers.rkt"
-   "dllist.rkt")
-   
-  (provide
-   horizontal-alignment%
-   vertical-alignment%)
-  
-  ;;;;;;;;;;
-  ;; alignment
-    
-  (define (vert/horiz-alignment type)
-    (class* dllist% (alignment<%> alignment-parent<%>)
-      
-      (init-field parent [show? true] [after #f])
-      (init [stretchable-width true]
-            [stretchable-height true])
-      
-      (field
-       [pasteboard (send parent get-pasteboard)]
-       [min-width 0]
-       [min-height 0]
-       [stretchable-width? stretchable-width]
-       [stretchable-height? stretchable-height])
-      
-      (field
-       [head (new head%)]
-       [tail (new tail%)])
-      
-      (send head next tail)
-      (send tail prev head)
-      
-      ;;;;;;;;;;
-      ;; alignment<%>
-      
-      #;(-> alignment-parent<%>)
-      ;; The parent of this alignment
-      (define/public (get-parent) parent)
-      
-      #;(-> void?)
-      ;; Tells the alignment that its sizes should be calculated
-      (define/public (set-min-sizes)
-        (when show?
-          (send head for-each
-                (lambda (child)
-                  (send child set-min-sizes)))
-          (let-values ([(x-accum y-accum)
-                        (if (symbol=? type 'vertical)
-                            (values vacuous-max +)
-                            (values + vacuous-max))])
-            (set! min-width
-                  (apply x-accum
-                         (send head map-to-list
-                               (lambda (c) (send c get-min-width)))))
-            (set! min-height
-                  (apply y-accum
-                         (send head map-to-list
-                               (lambda (c) (send c get-min-height))))))))
-      
-      #;(nonnegative? nonnegative? nonnegative? nonnegative? . -> . void?)
-      ;; Tells the alignment to align its children on the pasteboard in the given rectangle
-      (define/public (align x-offset y-offset width height)
-          
-          (define move/resize
-            (match-lambda*
-              [(child ($ a:rect ($ a:dim x w _) ($ a:dim y h _)))
-               (send child align (+ x x-offset) (+ y y-offset) w h)]))
-          
-          (when (is-shown?)
-            (send head for-each
-                  move/resize
-                  (a:align type width height
-                           (send head map-to-list build-rect)))))
-      
-      #;(-> nonnegative?)
-      ;; The minimum width this alignment must be
-      (define/public (get-min-width)
-        (if (is-shown?) min-width 0))
-      
-      #;(-> nonnegative?)
-      ;; The minimum height this alignment must be
-      (define/public (get-min-height)
-        (if (is-shown?) min-height 0))
-      
-      #;(case-> (-> boolean?) (boolean? . -> . void?))
-      ;; True if the alignment can be stretched in the x dimension
-      (public [stretchable-width-method stretchable-width])
-      (define stretchable-width-method
-        (case-lambda
-          [() stretchable-width?]
-          [(value) (set! stretchable-width? value)]))
-      
-      #;(case-> (-> boolean?) (boolean? . -> . void?))
-      ;; True if the alignment can be stretched in the y dimension
-      (public [stretchable-height-method stretchable-height])
-      (define stretchable-height-method
-        (case-lambda
-          [() stretchable-height?]
-          [(value) (set! stretchable-height? value)]))
-      
-      #;(boolean? . -> . void)
-      ;; Tells the alignment to show or hide its children
-      (define/public (show/hide bool)
-        (when show? (show/hide-children bool)))
-      
-      #;(boolean? . -> . void)
-      ;; Tells the alignment that its show state is the given value
-      ;; and it should show or hide its children accordingly.
-      (define/public (show bool)
-        (set! show? bool)
-        (when (send parent is-shown?)
-          (show/hide-children bool)))
-      
-      #;(-> (is-a?/c pasteboard%))
-      ;; The pasteboard that this alignment is being displayed to
-      (define/public (get-pasteboard) pasteboard)
-      
-      #;(((is-a?/c alignment<%>)) ((union (is-a?/c alignment<%>) false?)) . opt-> . void?)
-      ;; Add the given alignment as a child before the existing child
-      (define/public add-child
-        (opt-lambda (child (after #f))
-          (define (link p item n)
-            (send p next child)
-            (send child prev p)
-            (send n prev child)
-            (send child next n))
-          (if after
-              (link after child (send after next))
-              (link (send tail prev) child tail))))
-      
-      #;((is-a?/c alignment<%>) . -> . void?)
-      ;; Deletes a child from the alignments
-      (define/public (delete-child child)
-        (send child show/hide false)
-        (let ([p (send child prev)]
-              [n (send child next)])
-          (send p next n)
-          (send n prev p)))
-      
-      #;(-> boolean?)
-      ;; True if the alignment is being shown (accounting for its parent being shown)
-      (define/public (is-shown?)
-        (and show? (send parent is-shown?)))
-      
-      ;;;;;;;;;;
-      ;; helpers
-      
-      #;(boolean? . -> . void?)
-      ;; Shows or hides the children
-      (define/private (show/hide-children bool)
-        (send pasteboard lock-alignment true)
-        (send head for-each (lambda (c) (send c show/hide bool)))
-        (send pasteboard lock-alignment false))
-      
-      (super-new)
-      (send parent add-child this after)))
-  
-  (define vertical-alignment% (vert/horiz-alignment 'vertical))
-  (define horizontal-alignment% (vert/horiz-alignment 'horizontal))
-  
-  #;((is-a?/c alignment%) . -> . rect?)
-  ;; makes a new default rect out of an alignment
-  (define (build-rect item)
-    (a:make-rect
-     (a:make-dim 0 (max 0 (send item get-min-width)) (send item stretchable-width))
-     (a:make-dim 0 (max 0 (send item get-min-height)) (send item stretchable-height))))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/framework/collapsed-snipclass-wxme.rkt b/pkgs/gui-pkgs/gui-lib/framework/collapsed-snipclass-wxme.rkt
deleted file mode 100644
index 24ed587992..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/collapsed-snipclass-wxme.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(require racket/class
-         wxme)
-
-(provide reader)
-
-(define what "collapsed-sexp")
-
-(define reader
-  (new (class* object% (snip-reader<%>)
-         (define/public (read-header version stream) (void))
-         (define/public (read-snip text-only? version stream)
-           (define left (send stream read-bytes what))
-           (define right (send stream read-bytes what))
-           (define count (send stream read-integer what))
-           (define snips
-             (for/list ([x (in-range 0 count)])
-               (define snip-class-name (bytes->string/utf-8 (send stream read-bytes what)))
-               (read-snip-from-port snip-class-name
-                                    'collapsed-snipclass-wxme.rkt
-                                    stream)))
-           (apply bytes-append snips))
-         (super-new))))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/collapsed-snipclass.rkt b/pkgs/gui-pkgs/gui-lib/framework/collapsed-snipclass.rkt
deleted file mode 100644
index 9eab2283d3..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/collapsed-snipclass.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class
-         "private/collapsed-snipclass-helpers.rkt")
-
-(provide snip-class)
-
-(define simple-sexp-snip%
-  (class* snip% (readable-snip<%>)
-    (init-field left-bracket right-bracket saved-snips)
-    (define/public (read-special file line col pos)
-      (define text (make-object text%))
-      (for ([s (in-list saved-snips)])
-        (send text insert (send s copy)
-              (send text last-position)
-              (send text last-position)))
-      (datum->syntax
-       #f
-       (read (open-input-text-editor text))
-       (list file line col pos 1)))
-    (define/override (copy)
-      (new simple-sexp-snip% 
-           [left-bracket left-bracket]
-           [right-bracket right-bracket]
-           [saved-snips saved-snips]))
-    (super-new)))
-
-(define sexp-snipclass% (make-sexp-snipclass% simple-sexp-snip%))
-
-(define snip-class (make-object sexp-snipclass%))
-(send snip-class set-classname (format "~s" '((lib "collapsed-snipclass.ss" "framework")
-                                              (lib "collapsed-snipclass-wxme.ss" "framework"))))
-(send snip-class set-version 0)
-(send (get-the-snip-class-list) add snip-class)
diff --git a/pkgs/gui-pkgs/gui-lib/framework/comment-snip.rkt b/pkgs/gui-pkgs/gui-lib/framework/comment-snip.rkt
deleted file mode 100644
index 3a4d1d63fb..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/comment-snip.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-
-(module comment-snip mzscheme
-  (require framework)
-  
-  (provide (rename comment-box:snipclass snip-class)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/decorated-editor-snip.rkt b/pkgs/gui-pkgs/gui-lib/framework/decorated-editor-snip.rkt
deleted file mode 100644
index b8e68152dc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/decorated-editor-snip.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-
-(require "private/decorated-editor-snip.rkt")
-
-(provide 
- (rename-out [editor-snip:decorated% decorated-editor-snip%])
- (rename-out [editor-snip:decorated-snipclass% decorated-editor-snipclass%])
- (rename-out [editor-snip:decorated-mixin decorated-editor-snip-mixin])
- (rename-out [editor-snip:decorated<%> decorated-editor-snip<%>]))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/doc.txt b/pkgs/gui-pkgs/gui-lib/framework/doc.txt
deleted file mode 100644
index f67918b47b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/doc.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-
-_Framework Extras_
-
-_decorated-editor-snip.ss_ defines two classes:
-
---------------------------------------------------
-
-> decorated-editor-snip%, derived from editor-snip%
-   
-This class operated just like a regular editor snip, except
-that it has a color and an icon in the top right hand corner.
-
-Overridable methods:
-
-Each of these methods must be overridden in a derived class
-to specify this class's behavior.
-
->  make-snip :: (send a-des make-snip) - returns an instance
-     of one of these snips. Defaults to returning an
-     instance of decorated-editor-snip%. Override this when
-     deriving a new class from decorated-editor-snip%.
-
->  make-editor :: (send a-des make-editor) - returns the
-     editor to be used in the snip. Returns an instance of
-     text% by default.
-
->  get-color :: (send a-des get-color) - returns a color%
-     object or a string in the color-database%
-     that is used for the border of the snip. Defaults to
-     return "black".
-
-> get-corner-bitmap :: (send a-des get-corner-bitmap) -
-     returns the bitmap to be used in the corner of the
-     snip, or #f. Defaults to returning #f.
-
-> get-menu :: (send a-des get-menu) - returns the menu to be
-     used when someone clicks on the top portion of the
-     snip, or #f (in which case there is no menu). Defaults
-     to return #f.
-
-Overridden methods:
-
->  write : writes the editor's contents to the file.
-
->  copy : uses the `make-snip' method to copy the
-          snip. Creates a copy of the editor in the snip using
-          the `copy-self' method and sets the style of the
-          copy to be the style of the original.
-
->  on-event : handles the popup menu 
-
->  draw : draws the icon
-
---------------------------------------------------
-
-> decorated-editor-snipclass%, derived from snip-class%
-
-Overridable method:
-
->  make-snip :: (send a-desc make-snip stream-in) - returns
-   an instance of the snip to be created by this snipclass.
-
-Overridden method:
-
->  write : This method matches decorated-editor-snip%'s
-           `write' method. It first calls `make-snip' to
-           create the snip and then reads the editor from
-           the stream.
diff --git a/pkgs/gui-pkgs/gui-lib/framework/framework-sig.rkt b/pkgs/gui-pkgs/gui-lib/framework/framework-sig.rkt
deleted file mode 100644
index 905cfedabb..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/framework-sig.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang scheme/base
-(require "private/sig.rkt")
-(provide framework^)
diff --git a/pkgs/gui-pkgs/gui-lib/framework/framework-unit.rkt b/pkgs/gui-pkgs/gui-lib/framework/framework-unit.rkt
deleted file mode 100644
index c7580da4a0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/framework-unit.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         mred/mred-sig)
-
-(require "private/sig.rkt"
-         "private/number-snip.rkt"
-         "private/comment-box.rkt"
-         "private/application.rkt"
-         "private/version.rkt"
-         "private/color-model.rkt"
-         "private/exit.rkt"
-         "private/menu.rkt"
-         "private/preferences.rkt"
-         "private/autosave.rkt"
-         "private/color.rkt"
-         "private/color-prefs.rkt"
-         "private/handler.rkt" 
-         "private/keymap.rkt"
-         "private/path-utils.rkt"
-         "private/icon.rkt"
-         "private/editor.rkt"
-         "private/pasteboard.rkt"
-         "private/text.rkt"
-         "private/finder.rkt"
-         "private/group.rkt"
-         "private/canvas.rkt"
-         "private/panel.rkt"
-         "private/frame.rkt"
-         "private/racket.rkt"
-         "private/main.rkt"
-         "private/mode.rkt"
-         "private/early-init.rkt")
-
-(provide framework@)
-
-(define-compound-unit/infer framework-separate@
-  (import mred^)
-  (export framework:application^ 
-          framework:version^
-          framework:color-model^
-          framework:mode^
-          framework:exit^
-          framework:menu^
-          framework:preferences^
-          framework:number-snip^
-          framework:autosave^
-          framework:path-utils^
-          framework:icon^
-          framework:keymap^
-          framework:editor^
-          framework:pasteboard^
-          framework:text^
-          framework:color^
-          framework:color-prefs^
-          framework:comment-box^
-          framework:finder^
-          framework:group^ 
-          framework:canvas^
-          framework:panel^
-          framework:frame^ 
-          framework:handler^
-          framework:racket^ 
-          framework:main^)
-  (link
-   preferences@ early-init@
-   application@ version@ color-model@ mode@ exit@ menu@
-   number-snip@ autosave@ path-utils@ icon@ keymap@
-   editor@ pasteboard@ text@ color@ color-prefs@ comment-box@ 
-   finder@ group@ canvas@ panel@ frame@ handler@ racket@ main@))
-
-(define-unit/new-import-export framework@ (import mred^) (export framework^)
-  (((prefix application: framework:application^)
-    (prefix version: framework:version^)
-    (prefix color-model: framework:color-model^)
-    (prefix mode: framework:mode^)
-    (prefix exit: framework:exit^)
-    (prefix menu: framework:menu^)
-    (prefix preferences: framework:preferences^)
-    (prefix number-snip: framework:number-snip^)
-    (prefix autosave: framework:autosave^)
-    (prefix path-utils: framework:path-utils^)
-    (prefix icon: framework:icon^)
-    (prefix keymap: framework:keymap^)
-    (prefix editor: framework:editor^)
-    (prefix pasteboard: framework:pasteboard^)
-    (prefix text: framework:text^)
-    (prefix color: framework:color^)
-    (prefix color-prefs: framework:color-prefs^)
-    (prefix comment-box: framework:comment-box^)
-    (prefix finder: framework:finder^)
-    (prefix group: framework:group^)
-    (prefix canvas: framework:canvas^)
-    (prefix panel: framework:panel^)
-    (prefix frame: framework:frame^)
-    (prefix handler: framework:handler^)
-    (prefix racket: framework:racket^)
-    (prefix main: framework:main^))
-   framework-separate@ mred^))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/framework.rkt b/pkgs/gui-pkgs/gui-lib/framework/framework.rkt
deleted file mode 100644
index 5eb761974d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/framework.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang scheme/base
-(require "main.rkt")
-(provide (all-from-out "main.rkt"))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/gui-utils.rkt b/pkgs/gui-pkgs/gui-lib/framework/gui-utils.rkt
deleted file mode 100644
index 544607c4e0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/gui-utils.rkt
+++ /dev/null
@@ -1,602 +0,0 @@
-#lang at-exp racket/base
-
-(require string-constants racket/gui/base
-         racket/contract/base racket/class)
-(require scribble/srcdoc)
-(require/doc racket/base scribble/manual)
-
-(define (trim-string str size)
-  (let ([str-size (string-length str)])
-    (cond
-      [(<= str-size size)
-       str]
-      [else
-       (let* ([between "..."]
-              [pre-length (- (quotient size 2)
-                             (quotient (string-length between) 2))]
-              [post-length (- size
-                              pre-length
-                              (string-length between))])
-         (cond
-           [(or (<= pre-length 0)
-                (<= post-length 0))
-            (substring str 0 size)]
-           [else
-            (string-append
-             (substring str 0 pre-length)
-             between
-             (substring str
-                        (- str-size post-length)
-                        str-size))]))])))
-
-
-(define maximum-string-label-length 200)
-
-;; format-literal-label: string any* -> string
-(define (format-literal-label format-str . args)
-  (quote-literal-label (apply format format-str args)))
-
-;; quote-literal-label: string -> string
-(define (quote-literal-label a-str #:quote-amp? [quote-amp? #t])
-  (define quoted (if quote-amp?
-                     (regexp-replace* #rx"(&)" a-str "\\1\\1")
-                     a-str))
-  (trim-string quoted maximum-string-label-length))
-
-;; selected-text-color : color
-(define selected-text-color (send the-color-database find-color "black"))
-
-;; unselected-text-color : color
-(define unselected-text-color (case (system-type)
-                                [(macosx) (make-object color% 75 75 75)]
-                                [else (send the-color-database find-color "black")]))
-
-;; selected-brush : brush
-(define selected-brush (send the-brush-list find-or-create-brush "WHITE" 'solid))
-
-;; unselected-brush : brush
-(define unselected-brush (send the-brush-list find-or-create-brush (get-panel-background) 'solid))
-
-;; button-down/over-brush : brush
-(define button-down/over-brush 
-  (case (system-type)
-    [(macosx) (send the-brush-list find-or-create-brush
-                    "light blue"
-                    'solid)]
-    [else
-     (send the-brush-list find-or-create-brush
-           (make-object color% 225 225 255)
-           'solid)]))
-
-
-;; name-box-pen : pen
-;; this pen draws the lines around each individual item
-(define name-box-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-
-;; background-brush : brush
-;; this brush is set when drawing the background for the control
-(define background-brush 
-  (case (system-type)
-    [(macosx) (send the-brush-list find-or-create-brush (get-panel-background) 'panel)]
-    [else (send the-brush-list find-or-create-brush "white" 'solid)]))
-
-;; background-pen : pen
-;; this pen is set when drawing the background for the control
-(define background-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-
-;; label-font : font
-(define label-font (send the-font-list find-or-create-font
-                         (if (eq? (system-type) 'windows) 10 12)
-                         'system 'normal
-                         (if (eq? (system-type) 'macosx) 'bold 'normal)
-                         #f))
-
-;; name-gap : number
-;; the space between each name
-(define name-gap 4)
-
-;; hang-over : number
-;; the amount of space a single entry "slants" over
-(define hang-over 8)
-
-;; top-space : number
-;; the gap at the top of the canvas, above all the choices
-(define top-space 4)
-
-;; bottom-space : number
-;; the extra space below the words
-(define bottom-space 2)
-
-;; end choices-canvas%
-
-(define (cancel-on-right?) (system-position-ok-before-cancel?))
-
-(define (ok/cancel-buttons parent 
-                           confirm-callback
-                           cancel-callback 
-                           [confirm-str (string-constant ok)]
-                           [cancel-str (string-constant cancel)]
-                           #:confirm-style [confirm-style '(border)]) 
-  (let ([confirm (λ ()
-                   (instantiate button% ()
-                     (parent parent)
-                     (callback confirm-callback)
-                     (label confirm-str)
-                     (style confirm-style)))]
-        [cancel (λ ()
-                  (instantiate button% ()
-                    (parent parent)
-                    (callback cancel-callback)
-                    (label cancel-str)))])
-    (let-values ([(b1 b2)
-                  (cond
-                    [(cancel-on-right?)
-                     (values (confirm) (cancel))]
-                    [else
-                     (values (cancel) (confirm))])])
-      (let ([w (max (send b1 get-width)
-                    (send b2 get-width))])
-        (send b1 min-width w)
-        (send b2 min-width w)
-        (if (cancel-on-right?)
-            (values b1 b2)
-            (values b2 b1))))))
-
-
-(define clickback-delta (make-object style-delta% 'change-underline #t))
-(define white-on-black-clickback-delta (make-object style-delta% 'change-underline #t))
-(let ()
-  (send clickback-delta set-delta-foreground "BLUE")
-  (send white-on-black-clickback-delta set-delta-foreground "deepskyblue")
-  (void))
-(define get-clickback-delta
-  (lambda ([white-on-black? #f])
-    (if white-on-black? 
-        white-on-black-clickback-delta
-        clickback-delta)))
-
-(define clicked-clickback-delta (make-object style-delta%))
-(define white-on-black-clicked-clickback-delta (make-object style-delta%))
-(let ()
-  (send clicked-clickback-delta set-delta-background "BLACK")
-  (send white-on-black-clicked-clickback-delta set-delta-background "white")
-  (void))
-(define get-clicked-clickback-delta
-  (lambda ([white-on-black? #f])
-    (if white-on-black? 
-        white-on-black-clicked-clickback-delta
-        clicked-clickback-delta)))
-
-(define next-untitled-name
-  (let ([n 1])
-    (λ ()
-      (begin0
-        (cond
-          [(= n 1) (string-constant untitled)]
-          [else (format (string-constant untitled-n) n)])
-        (set! n (+ n 1))))))
-
-(define cursor-delay
-  (let ([x 0.25])
-    (case-lambda
-      [() x]
-      [(v) (set! x v) x])))
-
-(define show-busy-cursor
-  (lambda (thunk [delay (cursor-delay)])
-    (local-busy-cursor #f thunk delay)))
-
-(define delay-action
-  (λ (delay-time open close)
-    (let ([semaphore (make-semaphore 1)]
-          [open? #f]
-          [skip-it? #f])
-      (thread 
-       (λ ()
-         (sleep delay-time)
-         (semaphore-wait semaphore)
-         (unless skip-it?
-           (set! open? #t)
-           (open))
-         (semaphore-post semaphore)))
-      (λ ()
-        (semaphore-wait semaphore)
-        (set! skip-it? #t)
-        (when open?
-          (close))
-        (semaphore-post semaphore)))))
-
-(define local-busy-cursor
-  (let ([watch (make-object cursor% 'watch)])
-    (case-lambda
-      [(win thunk) (local-busy-cursor win thunk (cursor-delay))]
-      [(win thunk delay)
-       (let* ([old-cursor #f]
-              [cursor-off void])
-         (dynamic-wind
-          (λ ()
-            (set! cursor-off
-                  (delay-action
-                   delay
-                   (λ ()
-                     (if win
-                         (begin (set! old-cursor (send win get-cursor))
-                                (send win set-cursor watch))
-                         (begin-busy-cursor)))
-                   (λ ()
-                     (if win
-                         (send win set-cursor old-cursor)
-                         (end-busy-cursor))))))
-          (λ () (thunk))
-          (λ () (cursor-off))))])))
-
-(define (unsaved-warning filename action-anyway [can-save-now? #f] [parent #f] [cancel? #t])
-  (define key-closed #f)
-  (define (unsaved-warning-mixin %)
-    (class %
-      (inherit show)
-      (define/override (on-subwindow-char receiver evt)
-        (define (is-menu-key? char)
-          (and (send evt get-meta-down)
-               (equal? (send evt get-key-code) char)))
-        (cond
-          [(is-menu-key? #\d)
-           (set! key-closed 'continue)
-           (show #f)]
-          [(is-menu-key? #\s)
-           (set! key-closed 'save)
-           (show #f)]
-          [(is-menu-key? #\c)
-           (set! key-closed 'cancel)
-           (show #f)]
-          [else
-           (super on-subwindow-char receiver evt)]))
-      (super-new)))
-  (define mb-res 
-    (message-box/custom 
-     (string-constant warning)
-     (format (string-constant file-is-not-saved) filename)
-     (string-constant save)
-     (and cancel? (string-constant cancel))
-     action-anyway
-     parent
-     (if can-save-now?
-         '(default=1 caution)
-         '(default=2 caution))
-     2
-     #:dialog-mixin (if (equal? (system-type) 'macosx)
-                        unsaved-warning-mixin
-                        values)))
-  (or key-closed
-      (case mb-res
-        [(1) 'save]
-        [(2) 'cancel]
-        [(3) 'continue])))
-
-(define get-choice
-  (lambda (message 
-           true-choice
-           false-choice 
-           (title (string-constant warning))
-           (default-result 'disallow-close)
-           (parent #f)
-           (style 'app)
-           (checkbox-proc #f)
-           (checkbox-label (string-constant dont-ask-again)))
-    (let* ([check? (and checkbox-proc (checkbox-proc))]
-           [style  (if (eq? style 'app) `(default=1) `(default=1 ,style))]
-           [style  (if (eq? 'disallow-close default-result)
-                       (cons 'disallow-close style) style)]
-           [style  (if check? (cons 'checked style) style)]
-           [return (λ (mb-res) (case mb-res [(1) #t] [(2) #f] [else mb-res]))])
-      (if checkbox-proc
-          (let-values ([(mb-res checked)
-                        (message+check-box/custom title message checkbox-label
-                                                  true-choice false-choice #f
-                                                  parent style default-result)])
-            (checkbox-proc checked)
-            (return mb-res))
-          (return (message-box/custom title message true-choice false-choice #f
-                                      parent style default-result))))))
-
-;; manual renaming
-(define gui-utils:trim-string trim-string)
-(define gui-utils:quote-literal-label quote-literal-label)
-(define gui-utils:format-literal-label format-literal-label)
-(define gui-utils:next-untitled-name next-untitled-name)
-(define gui-utils:show-busy-cursor show-busy-cursor)
-(define gui-utils:delay-action delay-action)
-(define gui-utils:local-busy-cursor local-busy-cursor)
-(define gui-utils:unsaved-warning unsaved-warning)
-(define gui-utils:get-choice get-choice)
-(define gui-utils:get-clicked-clickback-delta get-clicked-clickback-delta)
-(define gui-utils:get-clickback-delta get-clickback-delta)
-(define gui-utils:ok/cancel-buttons ok/cancel-buttons)
-(define gui-utils:cancel-on-right? cancel-on-right?)
-(define gui-utils:cursor-delay cursor-delay)
-
-
-(provide/doc
- (proc-doc
-  gui-utils:trim-string
-  (->i ([str string?]
-        [size (and/c number? positive?)])
-       ()
-       [res (size)
-            (and/c string?
-                   (λ (str)
-                     ((string-length str) . <= . size)))])
-  @{Constructs a string whose size is less
-    than @racket[size] by trimming the @racket[str]
-    and inserting an ellispses into it.})
-
- (proc-doc/names
-  gui-utils:quote-literal-label
-  (->* (string?)
-       (#:quote-amp? any/c)
-       (and/c string?
-              (λ (str) ((string-length str) . <= . 200))))
-  ((string)
-   ((quote-amp? #t)))
-  @{Constructs a string whose length is less than @racket[200] and,
-    if @racket[quote-amp?] is not @racket[#f], then it also quotes
-    the ampersand in the result (making the string suitable for use in
-    @racket[menu-item%] label, for example).})
-
- (proc-doc
-  gui-utils:format-literal-label
-  (->i ([str string?])
-       ()
-       #:rest [rest (listof any/c)]
-       [res (str)
-            (and/c string?
-                   (lambda (str)
-                     ((string-length str) . <= . 200)))])
-  @{Formats a string whose ampersand characters are
-    mk-escaped; the label is also trimmed to <= 200
-    mk-characters.})
-
- (proc-doc/names
-  gui-utils:cancel-on-right?
-  (-> boolean?)
-  ()
-  @{Returns @racket[#t] if cancel should be on the right-hand side (or below)
-    in a dialog and @racket[#f] otherwise.
-    
-    Just returns what @racket[system-position-ok-before-cancel?] does.
-    
-    See also @racket[gui-utils:ok/cancel-buttons].})
- (proc-doc/names
-  gui-utils:ok/cancel-buttons
-  (->* ((is-a?/c area-container<%>)
-        ((is-a?/c button%) (is-a?/c event%) . -> . any)
-        ((is-a?/c button%) (is-a?/c event%) . -> . any))
-       (string?
-        string?
-        #:confirm-style (listof symbol?))
-       (values (is-a?/c button%)
-               (is-a?/c button%)))
-  ((parent
-    confirm-callback
-    cancel-callback)
-   ((confirm-label (string-constant ok))
-    (cancel-label (string-constant cancel))
-    (confirm-style '(border))))
-  @{Adds an Ok and a cancel button to a panel, changing the order
-    to suit the platform. Under Mac OS X and unix, the confirmation action
-    is on the right (or bottom) and under Windows, the canceling action is on
-    the right (or bottom).
-    The buttons are also sized to be the same width.
-    
-    The first result is be the OK button and the second is
-    the cancel button.
-    
-    By default, the confirmation action button has the @racket['(border)] style,
-    meaning that hitting return in the dialog will trigger the confirmation action.
-    The @racket[confirm-style] argument can override this behavior, tho.
-    See @racket[button%] for the precise list of allowed styles.
-    
-    See also @racket[gui-utils:cancel-on-right?].})
- 
- (proc-doc/names
-  gui-utils:next-untitled-name
-  (-> string?)
-  ()
-  @{Returns a name for the next opened untitled frame. The first
-    name is ``Untitled'', the second is ``Untitled 2'',
-    the third is ``Untitled 3'', and so forth.})
- (proc-doc/names
-  gui-utils:cursor-delay
-  (case->
-   (-> real?)
-   (real? . -> . void?))
-  (() (new-delay))
-  @{This function is @italic{not} a parameter.
-    Instead, the state is just stored in the closure.
-    
-    The first case in the case lambda
-    returns the current delay in seconds before a watch cursor is shown,
-    when either @racket[gui-utils:local-busy-cursor] or
-    @racket[gui-utils:show-busy-cursor] is called.
-    
-    The second case in the case lambda
-    Sets the delay, in seconds, before a watch cursor is shown, when
-    either @racket[gui-utils:local-busy-cursor] or
-    @racket[gui-utils:show-busy-cursor] is called.})
- (proc-doc/names
-  gui-utils:show-busy-cursor
-  (->* ((-> any/c))
-       (integer?)
-       any/c)
-  ((thunk)
-   ((delay (gui-utils:cursor-delay))))
-  @{Evaluates @racket[(thunk)] with a watch cursor. The argument
-    @racket[delay] specifies the amount of time before the watch cursor is
-    opened. Use @racket[gui-utils:cursor-delay] to set this value
-    to all calls.
-    
-    This function returns the result of @racket[thunk].})
- (proc-doc/names
-  gui-utils:delay-action
-  (real?
-   (-> void?)
-   (-> void?)
-   . -> .
-   (-> void?))
-  (delay-time open close)
-  @{Use this function to delay an action for some period of time. It also
-    supports canceling the action before the time period elapses. For
-    example, if you want to display a watch cursor, but you only want it
-    to appear after 2 seconds and the action may or may not take more than
-    two seconds, use this pattern:
-    
-    @racketblock[(let ([close-down
-                        (gui-utils:delay-action
-                         2
-                         (λ () .. init watch cursor ...)
-                         (λ () .. close watch cursor ...))])
-                   ;; .. do action ...
-                   (close-down))]
-    
-    Creates a thread that waits @racket[delay-time]. After @racket[delay-time]
-    has elapsed, if the result thunk has @italic{not} been called, call
-    @racket[open]. Then, when the result thunk is called, call
-    @racket[close]. The function @racket[close] will only be called if
-    @racket[open] has been called.})
- 
- (proc-doc/names
-  gui-utils:local-busy-cursor
-  (->*
-   ((is-a?/c window<%>)
-    (-> any/c))
-   (integer?)
-   any/c)
-  ((window thunk)
-   ((delay (gui-utils:cursor-delay))))
-  @{Evaluates @racket[(thunk)] with a watch cursor in @racket[window]. If
-    @racket[window] is @racket[#f], the watch cursor is turned on globally.
-    The argument @racket[delay] specifies the amount of time before the watch
-    cursor is opened. Use @racket[gui-utils:cursor-delay]
-    to set this value for all uses of this function.
-    
-    The result of this function is the result of @racket[thunk].})
- 
- (proc-doc/names
-  gui-utils:unsaved-warning
-  (->*
-   (string?
-    string?)
-   (boolean?
-    (or/c false/c
-          (is-a?/c frame%)
-          (is-a?/c dialog%))
-    boolean?)
-   (symbols 'continue 'save 'cancel))
-  ((filename action)
-   ((can-save-now? #f)
-    (parent #f)
-    (cancel? #t)))
-  
-  @{This displays a dialog that warns the user of a unsaved file.
-    
-    The string, @racket[action], indicates what action is about to
-    take place, without saving. For example, if the application
-    is about to close a file, a good action is @racket["Close Anyway"].
-    The result symbol indicates the user's choice. If
-    @racket[can-save-now?] is @racket[#f], this function does not
-    give the user the ``Save'' option and thus will not return
-    @racket['save].
-    
-    If @racket[cancel?] is @racket[#t] there is a cancel button
-    in the dialog and the result may be @racket['cancel]. If it
-    is @racket[#f], then there is no cancel button, and @racket['cancel]
-    will not be the result of the function.
-    
-    })
- 
- (proc-doc/names
-  gui-utils:get-choice
-  (->* (string?
-        string?
-        string?)
-       (string?
-        any/c
-        (or/c false/c (is-a?/c frame%) (is-a?/c dialog%))
-        (symbols 'app 'caution 'stop)
-        (or/c false/c (case-> (boolean? . -> . void?)
-                              (-> boolean?)))
-        string?)
-       any/c)
-  ((message true-choice false-choice)
-   ((title (string-constant warning))
-    (default-result 'disallow-close)
-    (parent #f)
-    (style 'app)
-    (checkbox-proc #f)
-    (checkbox-label (string-constant dont-ask-again))))
-  
-  @{Opens a dialog that presents a binary choice to the user. The user is
-    forced to choose between these two options, ie cancelling or closing the
-    dialog opens a message box asking the user to actually choose one of the
-    two options.
-    
-    The dialog will contain the string @racket[message] and two buttons,
-    labeled with the @racket[true-choice] and the @racket[false-choice].  If the
-    user clicks on @racket[true-choice] @racket[#t] is returned. If the user
-    clicks on @racket[false-choice], @racket[#f] is returned.
-    
-    The argument @racket[default-result] determines how closing the window is
-    treated. If the argument is @racket['disallow-close], closing the window
-    is not allowed. If it is anything else, that value is returned when
-    the user closes the window.
-    
-    If @racket[gui-utils:cancel-on-right?]
-    returns @racket[#t], the false choice is on the right.
-    Otherwise, the true choice is on the right.
-    
-    The @racket[style] parameter is (eventually) passed to
-    @racket[message]
-    as an icon in the dialog.
-    
-    If @racket[checkbox-proc] is given, it should be a procedure that behaves
-    like a parameter for getting/setting a boolean value.  The intention for
-    this value is that it can be used to disable the dialog.  When it is
-    given, a checkbox will appear with a @racket[checkbox-label] label
-    (defaults to the @racket[dont-ask-again] string constant), and that
-    checkbox value will be sent to the @racket[checkbox-proc] when the dialog
-    is closed.  Note that the dialog will always pop-up --- it is the
-    caller's responsibility to avoid the dialog if not needed.})
- 
- (proc-doc/names
-  gui-utils:get-clicked-clickback-delta
-  (->* ()
-       (boolean?)
-       (is-a?/c style-delta%))
-  (()
-   ((white-on-black? #f)))
-  @{This delta is designed for use with
-    @method[text set-clickback].
-    Use it as one of the @racket[style-delta%] argument to
-    @method[text% set-clickback].
-    
-    If @racket[white-on-black?] is true, the function returns
-    a delta suitable for use on a black background.
-    
-    See also @racket[gui-utils:get-clickback-delta].})
- 
- (proc-doc/names
-  gui-utils:get-clickback-delta
-  (->* ()
-       (boolean?)
-       (is-a?/c style-delta%))
-  (()
-   ((white-on-black? #f)))
-  @{This delta is designed for use with @method[text% set-clickback].
-    Use the result of this function as the style
-    for the region text where the clickback is set.
-    
-    If @racket[white-on-black?] is true, the function returns
-    a delta suitable for use on a black background.
-    
-    See also
-    @racket[gui-utils:get-clicked-clickback-delta].}))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/info.rkt b/pkgs/gui-pkgs/gui-lib/framework/info.rkt
deleted file mode 100644
index bb17d7a170..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all robby)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/keybinding-lang.rkt b/pkgs/gui-pkgs/gui-lib/framework/keybinding-lang.rkt
deleted file mode 100644
index 2e1f8e2436..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/keybinding-lang.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang scheme
-(require mred
-         string-constants
-         framework
-         scheme/class)
-
-(provide (rename-out (kl-module-begin #%module-begin))
-         (except-out (all-from-out scheme) #%module-begin)
-         (all-from-out framework
-                       mred
-                       scheme/class))
-
-(define-syntax (kl-module-begin stx)
-  (syntax-case stx ()
-    [(mb a ...) 
-     (with-syntax ([#%keymap (datum->syntax (syntax mb) '#%keymap)]
-                   [#%keybinding (datum->syntax (syntax mb) '#%keybinding)]
-                   [keybinding (datum->syntax (syntax mb) 'keybinding)])
-       (syntax (#%plain-module-begin 
-                (define #%keymap (make-object keymap:aug-keymap%))
-                (provide #%keymap)
-                (define name-counter (make-hash))
-                (define (unique-name raw-name)
-                  (let ([last-number (hash-ref name-counter raw-name #f)])
-                    (cond
-                      [last-number
-                       (hash-set! name-counter raw-name (+ last-number 1))
-                       (format "~a:~a" raw-name last-number)]
-                      [else
-                       (hash-set! name-counter raw-name 2)
-                       raw-name])))
-                (define (#%keybinding key proc src line col pos)
-                  (unless (string? key)
-                    (error 'keybinding "expected string as first argument, got ~e (other arg ~e)" key proc))
-                  (unless (and (procedure? proc)
-                               (procedure-arity-includes? proc 2))
-                    (error 'keybinding "expected procedure of two arguments as second argument, got ~e (other arg ~e)"
-                           proc
-                           key))
-                  (let ([name 
-                         (unique-name
-                          (cond
-                            [(symbol? (object-name proc))
-                             (format "~a" (object-name proc))]
-                            [(and line col)
-                             (format "~a:~a.~a" src line col)]
-                            [else
-                             (format "~a:~a" src pos)]))])
-                    (send #%keymap add-function name 
-                          (λ (x y)
-                            (let ([end-edit-sequence
-                                   (λ ()
-                                     (when (is-a? x editor<%>)
-                                       (let loop ()
-                                         (when (send x in-edit-sequence?)
-                                           (send x end-edit-sequence)
-                                           (loop)))))])
-                              (with-handlers ([exn:fail? 
-                                               (λ (x)
-                                                 (end-edit-sequence)
-                                                 (message-box (string-constant drscheme)
-                                                              (format (string-constant user-defined-keybinding-error) 
-                                                                      name
-                                                                      (exn-message x))))])
-                                (proc x y)
-                                (when (is-a? x editor<%>)
-                                  (when (send x in-edit-sequence?)
-                                    (end-edit-sequence)
-                                    (message-box (string-constant drscheme)
-                                                 (format (string-constant user-defined-keybinding-error) 
-                                                         name
-                                                         "Editor left in edit-sequence"))))))))
-                    (send #%keymap map-function key name)))
-                (define-syntax (keybinding stx)
-                  (syntax-case stx ()
-                    [(_ key val)
-                     (with-syntax ([src (syntax-source stx)]
-                                   [line (syntax-line stx)]
-                                   [col (syntax-column stx)]
-                                   [pos (syntax-position stx)])
-                       (syntax (#%keybinding key val 'src 'line 'col 'pos)))]))
-                a ...)))]))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/main.rkt b/pkgs/gui-pkgs/gui-lib/framework/main.rkt
deleted file mode 100644
index 737f429156..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/main.rkt
+++ /dev/null
@@ -1,2008 +0,0 @@
-#lang at-exp racket/base
-
-(require racket/contract/base
-         racket/unit
-         racket/class
-         racket/gui/base
-         racket/set
-         mred/mred-unit
-         framework/framework-unit
-         framework/private/sig
-         (for-syntax scheme/base)
-         scribble/srcdoc
-         (for-syntax "private/scheme.rkt")) 
-
-;; these next two lines do a little dance to make the
-;; require/doc setup work out properly
-(require (prefix-in :: framework/private/focus-table))
-(define frame:lookup-focus-table ::frame:lookup-focus-table)
-
-(require framework/preferences
-         framework/test
-         framework/gui-utils
-         framework/decorated-editor-snip
-         framework/private/decorated-editor-snip)
-
-(provide (all-from-out framework/preferences
-                       framework/test
-                       framework/gui-utils
-                       framework/decorated-editor-snip
-                       framework/private/decorated-editor-snip))
-
-(require (for-doc racket/base scribble/manual framework/private/mapdesc
-                  setup/getinfo racket/pretty string-constants))
-
-(provide-signature-elements
- (prefix application: framework:application-class^)
- (prefix version: framework:version-class^)
- (prefix color-model: framework:color-model-class^)
- (prefix mode: framework:mode-class^)
- (prefix exit: framework:exit-class^)
- (prefix menu: framework:menu-class^)
- (prefix preferences: framework:preferences-class^)
- (prefix number-snip: framework:number-snip-class^)
- (prefix autosave: framework:autosave-class^)
- (prefix path-utils: framework:path-utils-class^)
- (prefix icon: framework:icon-class^)
- (prefix keymap: framework:keymap-class^)
- (prefix editor: framework:editor-class^)
- (prefix pasteboard: framework:pasteboard-class^)
- (prefix text: framework:text-class^)
- (prefix color: framework:color-class^)
- (prefix color-prefs: framework:color-prefs-class^)
- (prefix comment-box: framework:comment-box-class^)
- (prefix finder: framework:finder-class^)
- (prefix group: framework:group-class^)
- (prefix canvas: framework:canvas-class^)
- (prefix panel: framework:panel-class^)
- (prefix frame: framework:frame-class^)
- (prefix handler: framework:handler-class^)
- (prefix racket: framework:racket-class^)
- (prefix main: framework:main-class^))
-
-(define-values/invoke-unit/infer
-  (export framework^)
-  (link standard-mred@ framework@))
-
-(provide
-
- (proc-doc
-  color:get-parenthesis-colors-table 
-  (-> (listof (list/c symbol? string? (vectorof (is-a?/c color%)) (or/c 'low 'high))))
-  @{Returns a table of colors that get used for parenthesis highlighting.
-    Each entry in the table consists of a symbolic name, a name to show
-    in a GUI, the color to use, and the @racket[_priority] argument to
-    pass to @racket[text:basic<%> highlight-range] when highlighting the parens.
-    Generally the priority should be @racket['low] if the color is solid
-    (α=1) but can be @racket['high] if the α component is small.
-    
-    When an entry in the table has multiple colors, they are used to show the nesting
-    structure in the parentheses.})
- 
- (thing-doc
-  color:misspelled-text-color-style-name
-  string?
-  @{The name of the style used to color misspelled words. See also 
-    @method[color:text<%> get-spell-check-strings].})
- 
- (proc-doc/names
-  text:range? (-> any/c boolean?) (arg)
-  @{Determines if @racket[arg] is an instance of the @tt{range} struct.})
-
- (proc-doc/names
-  text:range-start
-  (-> text:range? exact-nonnegative-integer?)
-  (range)
-  @{Returns the start position of the range.})
-
- (proc-doc/names
-  text:range-end
-  (-> text:range? exact-nonnegative-integer?)
-  (range)
-  @{Returns the end position of the range.})
-
- (proc-doc/names
-  text:range-caret-space?
-  (-> text:range? boolean?)
-  (range)
-  @{Returns a boolean indicating where the caret-space in the range goes.
-    See also @method[text:basic<%> highlight-range].})
-
- (proc-doc/names
-  text:range-style
-  (-> text:range? exact-nonnegative-integer?)
-  (range)
-  @{Returns the style of the range.
-    See also @method[text:basic<%> highlight-range].})
-
- (proc-doc/names
-  text:range-color
-  (-> text:range? (or/c string? (is-a?/c color%)))
-  (range)
-  @{Returns the color of the highlighted range.})
-
- (parameter-doc
-  text:autocomplete-append-after
-  (parameter/c string?)
-  suffix
-  @{A string that is inserted after a completion is inserted by a
-    @racket[text:autocomplete] instance.
-    
-    Defaults to @racket[""].})
-
- (parameter-doc
-  text:autocomplete-limit
-  (parameter/c (and/c integer? exact? positive?))
-  count
-  @{Controls the number of completions visible at a time in the menu produced
-    by @racket[text:autocomplete] instances.
-    
-    Defaults to 15.})
-
- (proc-doc/names
-  text:get-completions/manuals
-  (-> (or/c false/c (listof symbol?)) (listof string?))
-  (manuals)
-  @{Returns the list of keywords for the manuals from @racket[manuals] by
-    extracting all of the documented exports of the manuals.  The symbols are
-    meant to be module paths, e.g., the quoted form of the argument to
-    @racket[require].
-
-    If @racket[manuals] is false, then all of the documented names are used.})
-
- (proc-doc/names
-  text:lookup-port-name
-  (-> symbol? (or/c (is-a?/c editor:basic<%>) false/c))
-  (manuals)
-  @{Returns the editor instance whose port-name matches the given symbol.
-    If no editor can be found, then returns @racket[false].})
-
- (proc-doc/names
-  number-snip:make-repeating-decimal-snip
-  (real? boolean? . -> . (is-a?/c snip%))
-  (num show-prefix?)
-  @{Makes a number snip that shows the decimal expansion for @racket[number].
-    The boolean indicates if a @litchar{#e} prefix appears on the number.
-    
-    See also @racket[number-snip:make-fraction-snip].})
-
- (proc-doc/names
-  number-snip:make-fraction-snip
-  (real? boolean? . -> . (is-a?/c snip%))
-  (num show-prefix-in-decimal-view?)
-  @{Makes a number snip that shows a fractional view of @racket[number].
-    The boolean indicates if a @litchar{#e} prefix appears on the number, when
-    shown in the decimal state.
-    
-    See also @racket[number-snip:make-repeating-decimal-snip].})
- 
- (thing-doc
-  comment-box:snipclass
-  (is-a?/c snip-class%)
-  @{The @racket[snip-class%] object used by @racket[comment-box:snip%].})
-
- (proc-doc/names
-  version:add-spec
-  (any/c any/c . -> . void?)
-  (spec revision)
-  @{The two values are appended to the version string.  @racket[write] is used
-    to transform them to strings.  For example:
-    
-    @racket[(version:add-spec 's 1)]
-    
-    in version 205 will make the version string be @litchar{205s1}.  The
-    symbols @racket['f] and @racket['d] were used internally for framework and
-    drscheme revisions in the past.})
-
- (proc-doc/names
-  version:version
-  (-> string?)
-  ()
-  @{This function returns a string describing the version of this application.
-    See also @racket[version:add-spec].})
-
- (parameter-doc
-  application:current-app-name
-  (parameter/c string?)
-  name
-  @{This is a parameter specifying the name of the current application.  It is
-    used in the help menu (see @racket[frame:standard-menus%]) and in frame
-    titles (see @racket[frame:editor%]).  The first case in the case-lambda
-    returns the current name, and the second case in the case-lambda sets the
-    name of the application to @racket[name].})
-
- (proc-doc/names
-  preferences:put-preferences/gui
-  (-> (listof symbol?)
-      (listof any/c)
-      any)
-  (name-list val-list)
-  @{Like @racket[put-preferences], but has more sophisticated error handling.
-    In particular, when it fails to grab a lock, it
-    @itemize[
-      @item{waits for three consecutive failures before informing the user}
-      @item{gives the user the opportunity to ``steal'' the lockfile after the
-            third failure, and}
-      @item{when lock failures occur, it remembers what its arguments were and if
-            any preference save eventually succeeds, all of the past failures
-            are also written at that point.}]
-    
-    In addition when an error is raised trying to save a preference to the preference
-    file, @racket[preferences:put-preferences/gui] logs the error using @racket[log-warning],
-    instead of raising an exception.
-    })
-
- (proc-doc/names
-  preferences:get-preference/gui
-  (->* (symbol?)
-       ((-> void?))
-       any/c)
-  ((sym)
-   ((default (λ () (error 'get-preference/gui "unknown pref ~s" sym)))))
-  @{Like @racket[get-preference], but has more sophisticated error handling.
-    In particular, it passes a @racket[#:timeout-lock-there] argument that
-    informs the user that the preferences file is locked (and offers the alternative
-    of not showing the message again).})
-
- 
- (proc-doc/names
-  preferences:add-panel
-  (-> (or/c string? (cons/c string? (listof string?)))
-      (->i ([parent (is-a?/c area-container-window<%>)])
-           ()
-           [_ (parent)
-              (let ([old-children (send parent get-children)])
-                (and/c (is-a?/c area-container-window<%>)
-                       (λ (child)
-                         (andmap eq?
-                                 (append old-children (list child))
-                                 (send parent get-children)))))])
-      void?)
-  (labels f)
-  @{@racket[preferences:add-preference-panel] adds the result of @racket[f]
-    with name @racket[labels] to the preferences dialog box.
-    
-    The labels determine where this preference panel is placed in the dialog.
-    If the list is just one string, the preferences panel is placed at the top
-    level of the dialog.  If there are more strings, a hierarchy of nested
-    panels is created and the new panel is added at the end.  If multiple calls
-    to @racket[preferences:add-preference-panel] pass the same prefix of
-    strings, those panels are placed in the same children.
-    
-    When the preference dialog is opened for the first time, the function
-    @racket[f] is called with a panel, and @racket[f] is expected to add a new
-    child panel to it and add whatever preferences configuration controls it
-    wants to that panel.  Then, @racket[f]'s should return the panel it added.})
-
- (proc-doc/names
-  preferences:add-editor-checkbox-panel
-  (-> void?)
-  ()
-  @{Adds a preferences panel for configuring options related to editing.})
-
- (proc-doc/names
-  preferences:add-general-checkbox-panel
-  (-> void?)
-  ()
-  @{Adds a catch-all preferences panel for options.})
-
- (proc-doc/names
-  preferences:add-warnings-checkbox-panel
-  (-> void?)
-  ()
-  @{Adds a preferences panel for configuring options relating to warnings.})
-
- (proc-doc/names
-  preferences:add-scheme-checkbox-panel
-  (-> void?)
-  ()
-  @{Adds a preferences panel for configuring options related to Racket.})
-
- (proc-doc/names
-  preferences:add-to-warnings-checkbox-panel
-  (((is-a?/c vertical-panel%) . -> . void?) . -> . void?)
-  (proc)
-  @{Saves @racket[proc] until the preferences panel is created, when it is
-    called with the Misc. panel to add new children to the panel.})
-
- (proc-doc/names
-  preferences:add-to-scheme-checkbox-panel
-  (((is-a?/c vertical-panel%) . -> . void?) . -> . void?)
-  (proc)
-  @{Saves @racket[proc] until the preferences panel is created, when it is
-    called with the Racket preferences panel to add new children to the
-    panel.})
-
- (proc-doc/names
-  preferences:add-to-editor-checkbox-panel
-  (((is-a?/c vertical-panel%) . -> . void?) . -> . void?)
-  (proc)
-  @{Saves @racket[proc] until the preferences panel is created, when it is
-    called with the editor preferences panel to add new children to the
-    panel.})
-
- (proc-doc/names
-  preferences:add-to-general-checkbox-panel
-  (((is-a?/c vertical-panel%) . -> . void?) . -> . void?)
-  (proc)
-  @{Saves @racket[proc] until the preferences panel is created, when it is
-    called with the general preferences panel to add new children to the
-    panel.})
-
- (proc-doc/names
-  preferences:add-font-panel
-  (-> void?)
-  ()
-  @{Adds a font selection preferences panel to the preferences dialog.})
-
- (proc-doc/names
-  preferences:show-dialog
-  (-> void?)
-  ()
-  @{Shows the preferences dialog.})
-
- (proc-doc/names
-  preferences:hide-dialog
-  (-> void?)
-  ()
-  @{Hides the preferences dialog.})
-
- (proc-doc/names
-  preferences:add-on-close-dialog-callback
-  ((-> void?) . -> . void?)
-  (cb)
-  @{Registers @racket[cb].  Next time the user clicks the OK button the
-    preferences dialog, all of the @racket[cb] functions are called, assuming
-    that each of the callbacks passed to
-    @racket[preferences:add-can-close-dialog-callback] succeed.})
-
- (proc-doc/names
-  preferences:add-can-close-dialog-callback
-  ((-> boolean?) . -> . void?)
-  (cb)
-  @{Registers @racket[cb].  Next time the user clicks the OK button the
-    preferences dialog, all of the @racket[cb] functions are called.  If any of
-    them return @racket[#f], the dialog is not closed.
-    
-    See also @racket[preferences:add-on-close-dialog-callback].})
- 
- (proc-doc/names
-  preferences:add-check
-  (->* ((is-a?/c area-container<%>) symbol? string?)
-       ((-> boolean? any/c)
-        (-> any/c boolean?))
-       void?)
-  ((parent pref-key label) ((from-boolean values) (to-boolean values)))
-  @{Adds a @racket[radio-box%] object (with @racket[label] as its label)
-    to @racket[parent] that, when checked
-    adjusts the preference with the key @racket[pref-key].
-    
-    The @racket[to-boolean] and @racket[from-boolean] functions
-    are used to convert from the preferences value to a booleans
-    when checking/unchecking the @racket[radio-box%] object. 
-    The defaults amount to treating the preference as a boolean such
-    that checking the @racket[radio-box%] sets the preference to
-    @racket[#t] and unchecking it sets the preference to @racket[#f].
-    })
-
- (proc-doc/names
-  autosave:register
-  ((and/c (is-a?/c autosave:autosavable<%>)
-          (is-a?/c editor<%>))
-   . -> .
-   void?)
-  (obj)
-  @{Adds @racket[obj] to the list of objects to be autosaved.  When it is time
-    to autosave, the @racket[do-autosave] method of the object is called.  This
-    method is responsible for performing the autosave.
-    
-    There is no need to de-register an object because the autosaver keeps a
-    ``weak'' pointer to the object; i.e., the autosaver does not keep an object
-    from garbage collection.})
-
- (thing-doc
-  autosave:toc-path
-  path?
-  @{The path to the a table-of-contents file for the autosave files that DrRacket has created.})
- 
- (proc-doc/names
-  autosave:restore-autosave-files/gui
-  (-> void?)
-  ()
-  @{Opens a GUI to ask the user about recovering any autosave files left around
-    from crashes and things.
-    
-    This function doesn't return until the user has finished restoring the
-    autosave files.  (It uses yield to handle events however.)})
-
- (proc-doc/names
-  exit:exiting?
-  (-> boolean?)
-  ()
-  @{Returns @racket[#t] to indicate that an exit operation is taking place.
-    Does not indicate that the app will actually exit, since the user may
-    cancel the exit.
-    
-    See also @racket[exit:insert-on-callback] and
-    @racket[exit:insert-can?-callback].})
-
- (proc-doc/names
-  exit:set-exiting
-  (boolean? . -> . void?)
-  (exiting?)
-  @{Sets a flag that affects the result of @racket[exit:exiting?].})
-
- (proc-doc/names
-  exit:insert-on-callback
-  ((-> void?) . -> . (-> void?))
-  (callback)
-  @{Adds a callback to be called when exiting.  This callback must not fail.
-    If a callback should stop an exit from happening, use
-    @racket[exit:insert-can?-callback].})
-
- (proc-doc/names
-  exit:insert-can?-callback
-  ((-> boolean?) . -> . (-> void?))
-  (callback)
-  @{Use this function to add a callback that determines if an attempted exit
-    can proceed.  This callback should not clean up any state, since another
-    callback may veto the exit.  Use @racket[exit:insert-on-callback] for
-    callbacks that clean up state.})
-
- (proc-doc/names
-  exit:can-exit?
-  (-> boolean?)
-  ()
-  @{Calls the ``can-callbacks'' and returns their results.  See
-    @racket[exit:insert-can?-callback] for more information.})
-
- (proc-doc/names
-  exit:on-exit
-  (-> void?)
-  ()
-  @{Calls the ``on-callbacks''.  See @racket[exit:insert-on-callback] for more
-    information.})
-
- (proc-doc/names
-  exit:exit
-  (-> any)
-  ()
-  @{@racket[exit:exit] performs four actions:
-    @itemize[
-      @item{sets the result of the @racket[exit:exiting?] function to
-            @racket[#t].}
-      @item{invokes the exit-callbacks, with @racket[exit:can-exit?] if none of
-            the ``can?'' callbacks return @racket[#f],}
-      @item{invokes @racket[exit:on-exit] and then}
-      @item{queues a callback that calls @racket[exit] (a racket procedure)
-            and (if @racket[exit] returns) sets the result of
-            @racket[exit:exiting?] back to @racket[#f].}]})
-
- (proc-doc/names
-  exit:user-oks-exit
-  (-> boolean?)
-  ()
-  @{Opens a dialog that queries the user about exiting.  Returns the user's
-    decision.})
-
- (proc-doc/names
-  path-utils:generate-autosave-name
-  (-> (or/c #f path-string? path-for-some-system?) path?)
-  (filename)
-  @{Generates a name for an autosave file from @racket[filename].})
-
- (proc-doc/names
-  path-utils:generate-backup-name
-  (path? . -> . path?)
-  (filename)
-  @{Generates a name for an backup file from @racket[filename].})
-
- (parameter-doc
-  finder:dialog-parent-parameter
-  (parameter/c (or/c false/c (is-a?/c dialog%) (is-a?/c frame%)))
-  parent
-  @{This parameter determines the parent of the dialogs created by
-    @racket[finder:get-file], @racket[finder:put-file],
-    @racket[finder:common-get-file], @racket[finder:common-put-file],
-    @racket[finder:common-get-file-list], @racket[finder:std-get-file],
-    and @racket[finder:std-put-file].})
-
- (parameter-doc
-  finder:default-extension
-  (parameter/c string?)
-  extension
-  @{This parameter controls the default extension for the framework's
-    @racket[finder:put-file] and @racket[finder:get-file] dialog.  Its value gets passed as the
-    @racket[_extension] argument to @racket[put-file] and @racket[get-file].
-    
-    Its default value is @racket[""].})
-
- (parameter-doc
-  finder:default-filters
-  (parameter/c (listof (list/c string? string?)))
-  filters
-  @{This parameter controls the default filters for the framework's
-    @racket[finder:put-file] dialog.  Its value gets passed as the
-    @racket[default-filters] argument to @racket[put-file].
-    
-    Its default value is @racket['(("Any" "*.*"))].})
-
- (proc-doc/names
-  finder:common-put-file
-  (->* ()
-       (string?
-        (or/c false/c path?)
-        boolean?
-        string?
-        (or/c false/c byte-regexp?)
-        string?
-        (or/c (is-a?/c top-level-window<%>) false/c))
-       (or/c false/c path?))
-  (()
-   ((name "Untitled")
-    (directory #f)
-    (replace? #f)
-    (prompt "Select File")
-    (filter #f)
-    (filter-msg "That filename does not have the right form.")
-    (parent (finder:dialog-parent-parameter))))
-  @{This procedure queries the user for a single filename, using a
-    platform-independent dialog box.  Consider using @racket[finder:put-file]
-    instead of this function.})
-
- (proc-doc/names
-  finder:common-get-file
-  (->* ()
-       ((or/c path? false/c)
-        string?
-        (or/c byte-regexp? false/c)
-        string?
-        (or/c false/c (is-a?/c top-level-window<%>)))
-       (or/c path? false/c))
-  (()
-   ((directory #f)
-    (prompt "Select File")
-    (filter #f)
-    (filter-msg "That filename does not have the right form.")
-    (parent #f)))
-  @{This procedure queries the user for a single filename, using a
-    platform-independent dialog box.  Consider using
-    @racket[finder:get-file] instead of this function.})
-
- (proc-doc/names
-  finder:std-put-file
-  (->* ()
-       (string?
-        (or/c false/c path?)
-        boolean?
-        string?
-        (or/c false/c byte-regexp?)
-        string?
-        (or/c (is-a?/c top-level-window<%>) false/c))
-       (or/c false/c path?))
-  (()
-   ((name "Untitled")
-    (directory #f)
-    (replace? #f)
-    (prompt "Select File")
-    (filter #f)
-    (filter-msg "That filename does not have the right form.")
-    (parent (finder:dialog-parent-parameter))))
-  @{This procedure queries the user for a single filename, using a
-    platform-dependent dialog box.  Consider using @racket[finder:put-file]
-    instead of this function.})
-
- (proc-doc/names
-  finder:std-get-file
-  (->* ()
-       ((or/c path? false/c)
-        string?
-        (or/c byte-regexp? false/c)
-        string?
-        (or/c false/c (is-a?/c top-level-window<%>)))
-       (or/c path? false/c))
-  (()
-   ((directory #f)
-    (prompt "Select File")
-    (filter #f)
-    (filter-msg "That filename does not have the right form.")
-    (parent #f)))
-  @{This procedure queries the user for a single filename, using a
-    platform-dependent dialog box.  Consider using @racket[finder:get-file]
-    instead of this function.})
-
- (proc-doc/names
-  finder:put-file
-  (->* ()
-       (string?
-        (or/c false/c path?)
-        boolean?
-        string?
-        (or/c false/c byte-regexp?)
-        string?
-        (or/c (is-a?/c top-level-window<%>) false/c))
-       (or/c false/c path?))
-  (()
-   ((name "Untitled")
-    (directory #f)
-    (replace? #f)
-    (prompt "Select File")
-    (filter #f)
-    (filter-msg "That filename does not have the right form.")
-    (parent (finder:dialog-parent-parameter))))
-  @{Queries the user for a filename.
-    
-    If the result of @racket[(preferences:get 'framework:file-dialogs)] is
-    @racket['std] this calls @racket[finder:std-put-file], and if it is
-    @racket['common], @racket[finder:common-put-file] is called.})
-
- (proc-doc/names
-  finder:get-file
-  (->* ()
-       ((or/c path? false/c)
-        string?
-        (or/c byte-regexp? string? false/c)
-        string?
-        (or/c false/c (is-a?/c top-level-window<%>)))
-       (or/c path? false/c))
-  (()
-   ((directory #f)
-    (prompt "Select File")
-    (filter #f)
-    (filter-msg "That filename does not have the right form.")
-    (parent #f)))
-  @{Queries the user for a filename.
-    
-    If the result of @racket[(preferences:get 'framework:file-dialogs)] is
-    @racket['std] this calls @racket[finder:std-get-file], and if it is
-    @racket['common], @racket[finder:common-get-file] is called.})
-
- (proc-doc/names
-  frame:setup-size-pref
-  (->* (symbol? number? number?) 
-       (#:maximized? 
-        boolean?
-        #:position-preferences 
-        (or/c #f symbol?))
-       void?)
-  ((size-pref-sym width height)
-   ((maximized? #f)
-    (position-preferences-sym #f)))
-  @{Initializes a preference for the @racket[frame:size-pref] mixin.
-    
-    The first argument should be the preferences symbol, and the second and
-    third should be the default width and height, respectively. If the
-    window should be maximized by default, pass @racket[#t] for the
-    @racket[maximized?] argument.
-    
-    If @racket[position-preferences-sym] is passed, then that symbol will be
-    used to track the position of the window.
-    })
-
- (proc-doc/names
-  frame:add-snip-menu-items
-  (->* ((is-a?/c menu%) (subclass?/c menu-item%))
-       ((-> (is-a?/c menu-item%) void?))
-       void?)
-  ((menu menu-item%)
-   ((func void)))
-  @{Inserts three menu items into @racket[menu], one that inserts a text box,
-    one that inserts a pasteboard box, and one that inserts an image into the
-    currently focused editor (if there is one).  Uses @racket[menu-item%] as
-    the class for the menu items.
-    
-    Calls @racket[func] right after inserting each menu item.})
-
- (proc-doc/names
-  frame:reorder-menus
-  (-> (is-a?/c frame%) void?)
-  (frame)
-  @{Re-orders the menus in a frame.  It moves the ``File'' and ``Edit'' menus
-    to the front of the menubar and moves the ``Windows'' and ``Help'' menus to
-    the end of the menubar.
-    
-    This is useful in conjunction with the frame classes.  After instantiating
-    the class and adding ones own menus, the menus will be mis-ordered.  This
-    function fixes them up.})
-
- (proc-doc/names
-  frame:remove-empty-menus
-  ((is-a?/c frame%) . -> . void?)
-  (frame)
-  @{Removes empty menus in a frame.})
-
- (parameter-doc
-  frame:current-icon
-  (parameter/c (or/c #f
-                     (is-a?/c bitmap%)
-                     (cons/c (is-a?/c bitmap%)
-                             (is-a?/c bitmap%))))
-  icon-spec
-  @{The value of this parameter is used by the initialization code of
-    @racket[frame:basic-mixin].
-    @itemize[
-      @item{If it is @racket[#f], then its value is ignored.}
-      @item{If it is a @racket[bitmap%], then the @method[top-level-window<%> set-icon] is
-            called with the bitmap, the result of invoking the
-            @racket[bitmap% get-loaded-mask] method, and @racket['both].}
-      @item{If it is a pair of bitmaps, then the @method[top-level-window<%> set-icon]
-            method is invoked twice, once with each bitmap in the pair. The
-            first bitmap is passed (along with the result of its
-            @racket[bitmap% get-loaded-mask]) and @racket['small], and then the
-            second bitmap is passed (also along with the result of its
-            @racket[bitmap% get-loaded-mask]) and @racket['large].}]
-    
-    Defaults to @racket[#f].})
- 
- (proc-doc/names
-  frame:lookup-focus-table
-  (->* () (eventspace?) (listof (is-a?/c frame:focus-table<%>)))
-  (()
-   ((eventspace (current-eventspace))))
-  @{Returns a list of the frames in @racket[eventspace], where the first element of the list
-    is the frame with the focus.
-    
-    The order and contents of the list are maintained by
-    the methods in @racket[frame:focus-table-mixin], meaning that the
-    OS-level callbacks that track the focus of individual frames is 
-    ignored.
-    
-    See also @racket[test:use-focus-table] and @racket[test:get-active-top-level-window].
-    
-    })
- 
- (proc-doc/names
-  group:get-the-frame-group
-  (-> (is-a?/c group:%))
-  ()
-  @{This returns the frame group.})
-
- (proc-doc/names
-  group:on-close-action
-  (-> void?)
-  ()
-  @{See also @racket[group:can-close-check].
-    
-    Call this function from the @method[top-level-window<%> can-close?]
-    callback of a frame in order for the group to properly close the
-    application.})
-
- (proc-doc/names
-  group:can-close-check
-  (-> boolean?)
-  ()
-  @{See also @racket[group:on-close-action].
-    
-    Call this function from the @method[top-level-window<%> can-close?]
-    callback of a frame in order for the group to properly close the
-    application.})
-
- (proc-doc/names
-  group:add-to-windows-menu
-  (-> (-> (is-a?/c menu%) any) any)
-  (proc)
-  @{Procedures passed to this function are called when the @onscreen{Windows}
-    menu is created. Use it to add additional menu items.})
-
-  (proc-doc/names
-   group:create-windows-menu
-   (-> (is-a?/c menu-item-container<%>) (is-a?/c menu%))
-   (mb)
-   @{Creates a windows menu, registers it (internally) with
-     the frame group (see @racket[(get-the-frame-group)]), and
-     returns it.})
- 
- (proc-doc/names
-  handler:handler?
-  (any/c . -> . boolean?)
-  (obj)
-  @{This predicate determines if its input is a handler.})
-
- (proc-doc/names
-  handler:handler-name
-  (handler:handler? . -> . string?)
-  (handler)
-  @{Extracts the name from a handler.})
-
- (proc-doc/names
-  handler:handler-extension
-  (handler:handler?
-   . -> . (or/c (path? . -> . boolean?) (listof string?)))
-  (handler)
-  @{Extracts the extension from a handler.})
-
- (proc-doc/names
-  handler:handler-handler
-  (handler:handler? . -> . (path? . -> . (is-a?/c frame:editor<%>)))
-  (handler)
-  @{Extracts the handler's handling function.})
-
- (proc-doc/names
-  handler:insert-format-handler
-  (string?
-   (or/c string? (listof string?) (path? . -> . boolean?))
-   (path? . -> . (or/c false/c (is-a?/c frame:editor<%>)))
-   . -> .
-   void?)
-  (name pred handler)
-  @{This function inserts a format handler.
-    
-    The string, @racket[name] names the format handler for use with
-    @racket[handler:find-named-format-handler].  If @racket[pred] is a string,
-    it is matched with the extension of a filename by
-    @racket[handler:find-format-handler].  If @racket[pred] is a list of
-    strings, they are each matched with the extension of a filename by
-    @racket[handler:find-format-handler].  If it is a function, the filename is
-    applied to the function and the functions result determines if this is the
-    handler to use.
-    
-    The most recently added format handler takes precedence over all other
-    format handlers.})
-
- (proc-doc/names
-  handler:find-named-format-handler
-  (-> string? (or/c #f (-> path? (is-a?/c frame:editor<%>))))
-  (name)
-  @{This function selects a format handler.  See also
-    @racket[handler:insert-format-handler].
-    
-    It finds a handler based on @racket[name].})
-
- (proc-doc/names
-  handler:find-format-handler
-  (-> path? (or/c #f (-> path? (is-a?/c frame:editor<%>))))
-  (filename)
-  @{This function selects a format handler.  See also
-    @racket[handler:insert-format-handler].
-    
-    It finds a handler based on @racket[filename].})
-
- (proc-doc/names
-  handler:edit-file
-  (->* ((or/c path? false/c))
-       ((-> (is-a?/c frame:editor<%>)))
-       (or/c false/c (is-a?/c frame:editor<%>)))
-  ((filename)
-   ((make-default
-     (λ () ((handler:current-create-new-window) filename)))))
-  @{This function invokes the appropriate format handler to open the file (see
-    @racket[handler:insert-format-handler]).
-    
-    @itemize[
-      @item{If @racket[filename] is a string, this function checks the result
-            of @racket[group:get-the-frame-group] to see if the
-            @racket[filename] is already open by a frame in the group.
-            @itemize[
-              @item{If so, it returns the frame.}
-                   @item{If not, this function calls
-                         @racket[handler:find-format-handler] with
-                         @racket[filename].
-                         @itemize[
-                           @item{If a handler is found, it is applied to
-                                 @racket[filename] and its result is the final
-                                 result.}
-                           @item{If not, @racket[make-default] is used.}]}]}
-      @item{If @racket[filename] is @racket[#f], @racket[make-default] is
-            used.}]})
-
- (parameter-doc
-  handler:current-create-new-window
-  (parameter/c (-> (or/c false/c path?) (is-a?/c frame%)))
-  proc
-  @{This is a parameter that controls how the framework creates new application
-    windows.
-    
-    The default setting is this:
-    @racketblock[(λ (filename)
-                   (let ([frame (make-object frame:text-info-file% filename)])
-                     (send frame show #t)
-                     frame))]})
-
- (proc-doc/names
-  handler:open-file
-  (->* ()
-       ((or/c false/c path? string?))
-       (or/c false/c (is-a?/c frame:basic<%>)))
-  (()
-   ((dir #f)))
-  @{This function queries the user for a filename and opens the file for
-    editing.  It uses @racket[handler:edit-file] to open the file, once the
-    user has chosen it.
-    
-    Calls @racket[finder:get-file] and @racket[handler:edit-file], passing
-    along @racket[dir].})
-
- (proc-doc/names
-  handler:install-recent-items
-  ((is-a?/c menu%) . -> . void?)
-  (menu)
-  @{This function deletes all of the items in the given menu and adds one menu
-    item for each recently opened file.  These menu items, when selected, call
-    @racket[handler:edit-file] with the filename of the recently opened file.
-    
-    The menu's size is limited to 10.})
-
- (proc-doc/names
-  handler:set-recent-items-frame-superclass
-  ((implementation?/c frame:standard-menus<%>) . -> . void?)
-  (frame)
-  @{Sets the superclass for the recently opened files frame.  It must be
-    derived from @racket[frame:standard-menus].})
-
- (proc-doc/names
-  handler:add-to-recent
-  (path? . -> . void?)
-  (filename)
-  @{Adds a filename to the list of recently opened files.})
-
- (proc-doc/names
-  handler:set-recent-position
-  (path? number? number? . -> . void?)
-  (filename start end)
-  @{Sets the selection of the recently opened file to @racket[start] and
-    @racket[end].})
-
- (proc-doc/names
-  handler:size-recently-opened-files
-  (number? . -> . void?)
-  (num)
-  @{Sizes the @racket['framework:recently-opened-files/pos] preference list
-    length to @racket[num].})
-
- (proc-doc/names
-  icon:get-paren-highlight-bitmap
-  (-> (is-a?/c bitmap%))
-  ()
-  @{This returns the parenthesis highlight @racket[bitmap%].  It is only used
-    on black and white screens.})
-
- (proc-doc/names
-  icon:get-eof-bitmap
-  (-> (is-a?/c bitmap%))
-  ()
-  @{This returns the @racket[bitmap%] used for the clickable ``eof'' icon from
-    @racket[text:ports].})
-
- (proc-doc/names
-  icon:get-autowrap-bitmap
-  (-> (is-a?/c bitmap%))
-  ()
-  @{This returns the autowrap's @racket[bitmap%].
-    
-    The bitmap may not respond @racket[#t] to the @method[bitmap% ok?]
-    method.})
-
- (proc-doc/names
-  icon:get-lock-bitmap
-  (-> (is-a?/c bitmap%))
-  ()
-  @{This returns the lock's @racket[bitmap].
-    
-    The bitmap may not respond @racket[#t] to the @method[bitmap% ok?]
-    method.})
-
- (proc-doc/names
-  icon:get-unlock-bitmap
-  (-> (is-a?/c bitmap%))
-  ()
-  @{This returns the reset unlocked @racket[bitmap].
-    
-    The bitmap may not respond @racket[#t] to the @method[bitmap% ok?]
-    method.})
-
- (proc-doc/names
-  icon:get-anchor-bitmap
-  (-> (is-a?/c bitmap%))
-  ()
-  @{This returns the anchor's @racket[bitmap].
-    
-    The bitmap may not respond @racket[#t] to the @method[bitmap% ok?]
-    method.})
-
- (proc-doc/names
-  icon:get-left/right-cursor
-  (-> (is-a?/c cursor%))
-  ()
-  @{This function returns a @racket[cursor%] object that indicates left/right
-    sizing is possible, for use with columns inside a window.
-    
-    The cursor may not respond @racket[#t] to the @method[cursor% ok?]
-    method.})
-
- (proc-doc/names
-  icon:get-up/down-cursor
-  (-> (is-a?/c cursor%))
-  ()
-  @{This function returns a @racket[cursor%] object that indicates up/down
-    sizing is possible, for use with columns inside a window.
-    
-    The cursor may not respond @racket[#t] to the @method[cursor% ok?]
-    method.})
-
- (proc-doc/names
-  icon:get-gc-on-bitmap
-  (-> (is-a?/c bitmap%))
-  ()
-  @{This returns a bitmap to be displayed in an @racket[frame:info<%>] frame
-    when garbage collection is taking place.
-    
-    The bitmap may not respond @racket[#t] to the @method[bitmap% ok?]
-    method.})
-
- (proc-doc/names
-  icon:get-gc-off-bitmap
-  (-> (is-a?/c bitmap%))
-  ()
-  @{This returns a bitmap to be displayed in an @racket[frame:info<%>] frame
-    when garbage collection is not taking place.
-    
-    The bitmap may not respond @racket[#t] to the @method[bitmap% ok?]
-    method.})
-
- (proc-doc/names
-  keymap:remove-user-keybindings-file
-  (-> any/c any)
-  (user-keybindings-path)
-  @{Removes the keymap previously added by
-    @racket[keymap:add-user-keybindings-file].})
-
- (proc-doc/names
-  keymap:add-user-keybindings-file
-  (-> any/c any)
-  (user-keybindings-path-or-require-spec)
-  @{Chains the keymap defined by @racket[user-keybindings-path-or-require-spec]
-    to the global keymap, returned by @racket[keymap:get-global].
-    
-    If @racket[user-keybindings-path-or-require-spec] is a path, the module is
-    loaded directly from that path.  Otherwise,
-    @racket[user-keybindings-path-or-require-spec] is treated like an argument
-    to @racket[require].})
-
- (parameter-doc
-  keymap:add-to-right-button-menu
-  (parameter/c
-   (-> (is-a?/c popup-menu%)
-       (is-a?/c editor<%>)
-       (is-a?/c event%)
-       void?))
-  proc
-  @{When the keymap that @racket[keymap:get-global] returns is installed into
-    an editor, this parameter's value is used for right button clicks.
-    
-    Before calling this procedure, the function
-    @racket[append-editor-operation-menu-items] is called.
-    
-    See also @racket[keymap:add-to-right-button-menu/before].})
-
- (parameter-doc
-  keymap:add-to-right-button-menu/before
-  (parameter/c
-   (-> (is-a?/c popup-menu%) (is-a?/c editor<%>) (is-a?/c event%) void?))
-  proc
-  @{When the keymap that @racket[keymap:get-global] returns is installed into
-    an editor, this function is called for right button clicks.
-    
-    After calling this procedure, the function
-    @racket[append-editor-operation-menu-items] is called.
-    
-    See also @racket[keymap:add-to-right-button-menu].})
-
- (proc-doc/names
-  keymap:call/text-keymap-initializer
-  ((-> any/c) . -> . any/c)
-  (thunk-proc)
-  @{This function parameterizes the call to @racket[thunk-proc] by setting the
-    keymap-initialization procedure (see
-    @racket[current-text-keymap-initializer]) to install the framework's
-    standard text bindings.})
-
- (proc-doc/names
-  keymap:canonicalize-keybinding-string
-  (string? . -> . string?)
-  (keybinding-string)
-  @{Returns a string that denotes the same keybindings as the input string,
-    except that it is in canonical form; two canonical keybinding strings can
-    be compared with @racket[string=?].})
-
- (proc-doc/names
-  keymap:get-editor
-  (-> (is-a?/c keymap%))
-  ()
-  @{This returns a keymap for handling standard editing operations.  It binds
-    these keys:
-    
-    @itemize[
-      @item{@racket["z"]: undo}
-      @item{@racket["y"]: redo}
-      @item{@racket["x"]: cut}
-      @item{@racket["c"]: copy}
-      @item{@racket["v"]: paste}
-      @item{@racket["a"]: select all}]
-    where each key is prefixed with the menu-shortcut key, based on the
-    platform.  Under Unix, the shortcut is @racket["a:"]; under windows the
-    shortcut key is @racket["c:"] and under MacOS, the shortcut key is
-    @racket["d:"].})
-
- (proc-doc/names
-  keymap:get-file
-  (-> (is-a?/c keymap%))
-  ()
-  @{This returns a keymap for handling file operations.})
-
- (proc-doc/names
-  keymap:get-user
-  (-> (is-a?/c keymap%))
-  ()
-  @{This returns a keymap that contains all of the keybindings in the keymaps
-    loaded via @racket[keymap:add-user-keybindings-file]})
-
- (proc-doc/names
-  keymap:get-global
-  (-> (is-a?/c keymap%))
-  ()
-  @{This returns a keymap for general operations.  See
-    @racket[keymap:setup-global] for a list of the bindings this keymap
-    contains.})
-
- (proc-doc/names
-  keymap:get-search
-  (-> (is-a?/c keymap%))
-  ()
-  @{This returns a keymap for searching operations.})
-
- (proc-doc/names
-  keymap:make-meta-prefix-list
-  (->* (string?) (boolean?) (listof string?))
-  ((key)
-   ((mask-control? #f)))
-  @{This prefixes a key with all of the different meta prefixes and returns a
-    list of the prefixed strings. If @racket[mask-control?] is @racket[#t],
-    then the result strings include @racket["~c:"] in them 
-    (see @racket[keymap:send-map-function-meta]) for a fuller discussion of this
-    boolean).
-    
-    Takes a keymap, a base key specification, and a function name; it prefixes
-    the base key with all ``meta'' combination prefixes, and installs the new
-    combinations into the keymap.  For example,
-    @racket[(keymap:send-map-function-meta keymap "a" func)] maps
-    @racket["m:a"] and @racket["ESC;a"] to @racket[func].})
-
- (proc-doc/names
-  keymap:send-map-function-meta
-  (->* ((is-a?/c keymap%) string? string?) 
-       (boolean? #:alt-as-meta-keymap (or/c (is-a?/c keymap%) #f))
-       void?)
-  ((keymap key func)
-   ((mask-control? #f)
-    (alt-as-meta-keymap #f)))
-  @{@index{Meta} Most keyboard and mouse mappings are inserted into a keymap by
-    calling the keymap's @method[keymap% map-function] method.  However,
-    ``meta'' combinations require special attention.  The @racket["m:"] prefix
-    recognized by @method[keymap% map-function] applies only to the Meta key
-    that exists on some keyboards.  By convention, however, ``meta''
-    combinations can also be accessed by using ``ESC'' as a prefix.
-    
-    This procedure binds all of the key-bindings obtained by prefixing
-    @racket[key] with a meta-prefix to @racket[func] in @racket[keymap].
-    
-    If @racket[alt-as-meta-keymap] is a @racket[keymap%] object, then the
-    the key binding @racket[(string-append "?:a:" key)] is bound to
-    @racket[func] in @racket[alt-as-meta-keymap]. Additionally, if
-    @racket[func] has not been added (via @method[add-function keymap%])
-    to @racket[alt-as-meta-keymap], then @racket[keymap:send-map-function-meta]
-    signals an error.
-    
-    If @racket[mask-control?] is @racket[#t],
-    then the result strings include @racket["~c:"] in them.
-    This is important under Windows where international keyboards
-    often require characters that are unmodified on US keyboards to
-    be typed with the AltGr key; such keys come into the system as
-    having both the control and the meta modified applied to them and, 
-    generally speaking, keybindings should not change the behavior of
-    those keys.})
-
- (proc-doc/names
-  keymap:setup-editor
-  ((is-a?/c keymap%) . -> . void?)
-  (keymap)
-  @{This sets up the input keymap with the bindings described in
-    @racket[keymap:get-editor].})
-
- (proc-doc/names
-  keymap:setup-file
-  ((is-a?/c keymap%) . -> . void?)
-  (keymap)
-  @{This extends a @racket[keymap%] with the bindings for files.})
-
- (proc-doc/names
-  keymap:setup-global
-  ((is-a?/c keymap%) . -> . void?)
-  (keymap)
-  @{This function extends a @racket[keymap%] with the following functions:
-    @itemize[
-      @item{@mapdesc[ring-bell any] --- Rings the bell (using @racket[bell])
-            and removes the search panel from the frame, if there.}
-      @item{@mapdesc[save-file key] --- Saves the buffer.  If the buffer has no
-            name, then @racket[finder:put-file]@index["finder:put-file"] is
-            invoked.}
-      @item{@mapdesc[save-file-as key] --- Calls
-            @racket[finder:put-file]@index["finder:put-file"] to save the
-            buffer.}
-      @item{@mapdesc[load-file key] --- Invokes
-            @racket[finder:open-file]@index["finder:open-file"].}
-      @item{@mapdesc[find-string key] --- Opens the search buffer at the bottom
-            of the frame, unless it is already open, in which case it searches
-            for the text in the search buffer.}
-      @item{@mapdesc[find-string-reverse key] --- Same as ``find-string'', but
-            in the reverse direction.}
-      @item{@mapdesc[find-string-replace key] --- Opens a replace string dialog
-            box.}
-      @item{@mapdesc[toggle-anchor key] --- Turns selection-anchoring on or
-            off.}
-      @item{@mapdesc[center-view-on-line key] --- Centers the buffer in its
-            display using the currently selected line.}
-      @item{@mapdesc[collapse-space key] --- Collapses all non-return
-            whitespace around the caret into a single space.}
-      @item{@mapdesc[remove-space key] --- Removes all non-return whitespace
-            around the caret.}
-      @item{@mapdesc[collapse-newline key] --- Collapses all empty lines around
-            the caret into a single empty line.  If there is only one empty
-            line, it is removed.}
-      @item{@mapdesc[open-line key] --- Inserts a new line.}
-      @item{@mapdesc[transpose-chars key] --- Transposes the characters before
-            and after the caret and moves forward one position.}
-      @item{@mapdesc[transpose-words key] --- Transposes words before and after
-            the caret and moves forward one word.}
-      @item{@mapdesc[capitalize-word key] --- Changes the first character of
-            the next word to a capital letter and moves to the end of the
-            word.}
-      @item{@mapdesc[upcase-word key] --- Changes all characters of the next
-            word to capital letters and moves to the end of the word.}
-      @item{@mapdesc[downcase-word key] --- Changes all characters of the next
-            word to lowercase letters and moves to the end of the word.}
-      @item{@mapdesc[kill-word key] --- Kills the next word.}
-      @item{@mapdesc[backward-kill-word key] --- Kills the previous word.}
-      @item{@mapdesc[goto-line any] --- Queries the user for a line number and
-            moves the caret there.}
-      @item{@mapdesc[goto-position any] --- Queries the user for a position
-            number and moves the caret there.}
-      @item{@mapdesc[copy-clipboard mouse] --- Copies the current selection to
-            the clipboard.}
-      @item{@mapdesc[cut-clipboard mouse] --- Cuts the current selection to the
-            clipboard.}
-      @item{@mapdesc[paste-clipboard mouse] --- Pastes the clipboard to the
-            current selection.}
-      @item{@mapdesc[copy-click-region mouse] --- Copies the region between the
-            caret and the input mouse event.}
-      @item{@mapdesc[cut-click-region mouse] --- Cuts the region between the
-            caret and the input mouse event.}
-      @item{@mapdesc[paste-click-region mouse] --- Pastes the clipboard into
-            the position of the input mouse event.}
-      @item{@mapdesc[select-click-word mouse] --- Selects the word under the
-            input mouse event.}
-      @item{@mapdesc[select-click-line mouse] --- Selects the line under the
-            input mouse event.}
-      @item{@mapdesc[start-macro key] -- Starts recording a keyboard macro}
-      @item{@mapdesc[end-macro key] --- Stops recording a keyboard macro}
-      @item{@mapdesc[do-macro key] --- Executes the last keyboard macro}
-      @item{@mapdesc[toggle-overwrite key] --- Toggles overwriting mode}]
-    
-    These functions are bound to the following keys
-    (C = control, S = shift, A = alt, M = ``meta'', D = command):
-    
-    @itemize[
-      @item{C-g : ``ring-bell''}
-      @item{M-C-g : ``ring-bell''}
-      @item{C-c C-g : ``ring-bell''}
-      @item{C-x C-g : ``ring-bell''}
-      @item{C-p : ``previous-line''}
-      @item{S-C-p : ``select-previous-line''}
-      @item{C-n : ``next-line''}
-      @item{S-C-n : ``select-next-line''}
-      @item{C-e : ``end-of-line''}
-      @item{S-C-e : ``select-to-end-of-line''}
-      @item{D-RIGHT : ``end-of-line''}
-      @item{S-D-RIGHT : ``select-to-end-of-line''}
-      @item{M-RIGHT : ``end-of-line''}
-      @item{S-M-RIGHT : ``select-to-end-of-line''}
-      @item{C-a : ``beginning-of-line''}
-      @item{S-C-a : ``select-to-beginning-of-line''}
-      @item{D-LEFT : ``beginning-of-line''}
-      @item{D-S-LEFT : ``select-to-beginning-of-line''}
-      @item{M-LEFT : ``beginning-of-line''}
-      @item{M-S-LEFT : ``select-to-beginning-of-line''}
-      @item{C-h : ``delete-previous-character''}
-      @item{C-d : ``delete-next-character''}
-      @item{C-f : ``forward-character''}
-      @item{S-C-f : ``select-forward-character''}
-      @item{C-b : ``backward-character''}
-      @item{S-C-b : ``select-backward-character''}
-      @item{M-f : ``forward-word''}
-      @item{S-M-f : ``select-forward-word''}
-      @item{A-RIGHT : ``forward-word''}
-      @item{A-S-RIGHT : ``forward-select-word''}
-      @item{M-b : ``backward-word''}
-      @item{S-M-b : ``select-backward-word''}
-      @item{A-LEFT : ``backward-word''}
-      @item{A-S-LEFT : ``backward-select-word''}
-      @item{M-d : ``kill-word''}
-      @item{M-DELETE : ``backward-kill-word''}
-      @item{M-c : ``capitalize-word''}
-      @item{M-u : ``upcase-word''}
-      @item{M-l : ``downcase-word''}
-      @item{M-< : ``beginning-of-file''}
-      @item{S-M-< : ``select-to-beginning-of-file''}
-      @item{M-> : ``end-of-file''}
-      @item{S-M-> : ``select-to-end-of-file''}
-      @item{C-v : ``next-page''}
-      @item{S-C-v : ``select-next-page''}
-      @item{M-v : ``previous-page''}
-      @item{S-M-v : ``select-previous-page''}
-      @item{C-l : ``center-view-on-line''}
-      @item{C-k : ``delete-to-end-of-line''}
-      @item{C-y : ``paste-clipboard'' (Except Windows)}
-      @item{A-v : ``paste-clipboard''}
-      @item{D-v : ``paste-clipboard''}
-      @item{C-_ : ``undo''}
-      @item{C-x u : ``undo''}
-      @item{C-+ : ``redo''}
-      @item{C-w : ``cut-clipboard''}
-      @item{M-w : ``copy-clipboard''}
-      @item{C-x C-s : ``save-file''}
-      @item{C-x C-w : ``save-file-as''}
-      @item{C-x C-f : ``load-file''}
-      @item{C-s : ``find-string''}
-      @item{C-r : ``find-string-reverse''}
-      @item{M-% : ``find-string-replace''}
-      @item{SPACE : ``collapse-space''}
-      @item{M-Backslash : ``remove-space''}
-      @item{C-x C-o : ``collapse-newline''}
-      @item{C-o : ``open-line''}
-      @item{C-t : ``transpose-chars''}
-      @item{M-t : ``transpose-words''}
-      @item{C-SPACE : ``toggle-anchor''}
-      @item{M-g : ``goto-line''}
-      @item{M-p : ``goto-position''}
-      @item{LEFTBUTTONTRIPLE : ``select-click-line''}
-      @item{LEFTBUTTONDOUBLE : ``select-click-word''}
-      @item{RIGHTBUTTON : ``copy-click-region''}
-      @item{RIGHTBUTTONDOUBLE : ``cut-click-region''}
-      @item{MIDDLEBUTTON : ``paste-click-region''}
-      @item{C-RIGHTBUTTON : ``copy-clipboard''}
-      @item{INSERT : ``toggle-overwrite''}
-      @item{M-o : ``toggle-overwrite''}]})
-
- (proc-doc/names
-  keymap:setup-search
-  ((is-a?/c keymap%) . -> . void?)
-  (keymap)
-  @{This extends a @racket[keymap%] with the bindings for searching.})
-
- (proc-doc/names
-  keymap:set-chained-keymaps
-  ((is-a?/c keymap:aug-keymap<%>)
-   (listof (is-a?/c keymap%))
-   . -> .
-   void?)
-  (keymap children-keymaps)
-  @{Sets @racket[keymap]'s chained keymaps to @racket[children-keymaps],
-    unchaining any keymaps that are currently chained to @racket[keymap].})
-
- (proc-doc/names
-  keymap:remove-chained-keymap
-  ((is-a?/c editor<%>)
-   (is-a?/c keymap:aug-keymap<%>)
-   . -> .
-   void?)
-  (editor keymap)
-  @{Removes @racket[keymap] from the keymaps chained to @racket[editor].
-    Also (indirectly) removes all keymaps chained to @racket[keymap] from
-    @racket[editor], since they are removed when unchaining @racket[keymap]
-    itself.
-    
-    Each of the keymaps chained to @racket[editor] must be an
-    @racket[keymap:aug-keymap%] and @racket[keymap] cannot be the result of
-    @racket[(send editor get-keymap)] That is, @racket[keymap] must be chained
-    to some keymap attached to the editor.})
-
- (proc-doc/names
-  keymap:region-click
-  (-> any/c any/c (-> number? boolean? number? number? any)
-      any)
-  (text mouse-event f)
-  @{Calls @racket[f] after computing where the @racket[event]
-    corresponds to in the @racket[text]. If @racket[event] is
-    not a @racket[mouse-event%] object or if @racket[text] is not a
-    @racket[text%] object, this function does nothing, returning
-    @racket[(void)]. 
-    
-    The arguments to @racket[f] are:
-    @itemize[@item{the position where the click occurred}
-             @item{a boolean indicating if the position is at
-                   the right-hand edge of the screen (to
-                   cover the eol ambiguity)}]})
- 
- (proc-doc/names
-  racket:text-balanced?
-  (->* ((is-a?/c text%))
-       (number? (or/c false/c number?))
-       boolean?)
-  ((text)
-   ((start 0) (end #f)))
-  @{Determines if the range in the editor from @racket[start] to @racket[end]
-    in @racket[text] has at least one complete s-expression and there are no
-    incomplete s-expressions.  If @racket[end] is @racket[#f], it defaults to
-    the last position of the @racket[text]. The designation ``complete'' is
-    defined to be something that does not cause @racket[read] to raise a
-    @racket[exn:fail:read:eof?] exception, so there may be all kinds of strange
-    read-level (not to speak of parse level) errors in the expressions.
-    
-    The implementation of this function creates a port with
-    @racket[open-input-text-editor] and then uses @racket[read] to parse the
-    range of the buffer.})
-
- (proc-doc/names
-  racket:add-preferences-panel
-  (-> void?)
-  ()
-  @{Adds a tabbing preferences panel to the preferences dialog.})
-
- (proc-doc/names
-  racket:get-keymap
-  (-> (is-a?/c keymap%))
-  ()
-  @{Returns a keymap with binding suitable for Racket.})
-
- (proc-doc/names
-  racket:add-coloring-preferences-panel
-  (-> any)
-  ()
-  @{Installs the ``Racket'' preferences panel in the ``Syntax Coloring''
-    section.})
-
- (proc-doc/names
-  racket:get-color-prefs-table
-  (-> (listof (list/c symbol? (is-a?/c color%) string?)))
-  ()
-  @{Returns a table mapping from symbols (naming the categories that the online
-    colorer uses for Racket mode coloring) to their colors.
-    
-    These symbols are suitable for input to
-    @racket[racket:short-sym->pref-name] and
-    @racket[racket:short-sym->style-name].
-    
-    See also @racket[racket:get-white-on-black-color-prefs-table].})
-
- (proc-doc/names
-  racket:get-white-on-black-color-prefs-table
-  (-> (listof (list/c symbol? (is-a?/c color%) string?)))
-  ()
-  @{Returns a table mapping from symbols (naming the categories that the online
-    colorer uses for Racket mode coloring) to their colors when the user
-    chooses the white-on-black mode in the preferences dialog.
-    
-    See also @racket[racket:get-color-prefs-table].})
-
- (proc-doc/names
-  racket:short-sym->pref-name
-  (symbol? . -> . symbol?)
-  (short-sym)
-  @{Builds the symbol naming the preference from one of the symbols in the
-    table returned by @racket[racket:get-color-prefs-table].})
-
- (proc-doc/names
-  racket:short-sym->style-name
-  (symbol? . -> . string?)
-  (short-sym)
-  @{Builds the symbol naming the editor style from one of the symbols in the
-    table returned by @racket[racket:get-color-prefs-table].  This style is a
-    named style in the style list returned by
-    @racket[editor:get-standard-style-list].})
-
- (proc-doc/names
-  racket:get-wordbreak-map
-  (-> (is-a?/c editor-wordbreak-map%))
-  ()
-  @{This method returns a @racket[editor-wordbreak-map%] that is suitable for
-    Racket.})
-
- (proc-doc/names
-  racket:init-wordbreak-map
-  ((is-a?/c keymap%) . -> . void?)
-  (key)
-  @{Initializes the workdbreak map for @racket[keymap].})
-
- (proc-doc/names
-  racket:setup-keymap
-  ((is-a?/c keymap%) . -> . void?)
-  (keymap)
-  @{Initializes @racket[keymap] with Racket-mode keybindings.})
-
- (proc-doc/names
-  editor:set-current-preferred-font-size
-  (-> exact-nonnegative-integer? void?)
-  (new-size)
-  @{Sets the font preference for the current monitor configuration to
-    @racket[new-size]. 
-    
-    See also @racket[editor:get-current-preferred-font-size]
-    and @racket[editor:font-size-pref->current-font-size].})
- 
- (proc-doc
-  editor:get-current-preferred-font-size
-  (-> exact-nonnegative-integer?)
-  @{Gets the current setting for the font size preference. Calls
-    @racket[editor:font-size-pref->current-font-size] with the
-    current preference setting.
-    
-    See also @racket[editor:set-current-preferred-font-size] and
-    @racket[editor:get-change-font-size-when-monitors-change?].
-    })
- 
- (proc-doc/names
-  editor:font-size-pref->current-font-size
-  (-> (vector/c 
-       ;; font sizes for specific monitor configurations
-       (hash/c 
-        ;; a particular monitor configuration: the widths and heights
-        (non-empty-listof (list/c exact-nonnegative-integer? 
-                                  exact-nonnegative-integer?))
-        ;; the font size for that configuration
-        exact-nonnegative-integer?
-        #:flat? #t)
-       
-       ;; default font size, when none of the configs above apply
-       exact-nonnegative-integer?
-       #:flat? #t)
-      exact-nonnegative-integer?)
-  (font-preference)
-  @{Determines the current monitor configuration and uses that to pick
-    one of the sizes from its argument. The argument is expected
-    to come from the preference value of @racket['framework:standard-style-list:font-size].
-    
-    Except if @racket[editor:get-change-font-size-when-monitors-change?] returns
-    @racket[#f], in which case the current monitor configuration is not considered
-    and the last-set size (the second position in the vector) is always returned.
-    
-    As background, the font size
-    preference is actually saved on a per-monitor configuration basis; specifically
-    the preference value (using the same contract as the argument of this function)
-    contains a table mapping a list of monitor sizes (but not their
-    positions) obtained by @racket[get-display-size] to the preferred font size
-    (plus a default size used for new configurations). 
-    
-    See also @racket[editor:get-current-preferred-font-size], 
-    @racket[editor:get-current-preferred-font-size], and
-    @racket[editor:get-change-font-size-when-monitors-change?].})
- 
- (proc-doc/names
-  editor:get-change-font-size-when-monitors-change?
-  (-> boolean?)
-  ()
-  @{Returns @racket[#t] when the framework will automatically
-            adjust the current font size in the @racket["Standard"]
-            style of the result of @racket[editor:get-standard-style-list]
-            based on the monitor configuration.
-            
-            Defaults to @racket[#f]
-            
-            See also @racket[editor:set-change-font-size-when-monitors-change?];
-            @racket[editor:font-size-pref->current-font-size].})
- 
- (proc-doc/names
-  editor:set-change-font-size-when-monitors-change?
-  (-> boolean? void?)
-  (b?)
-  @{Controls the result of @racket[editor:get-change-font-size-when-monitors-change?].
-                           
-                           See also @racket[editor:get-change-font-size-when-monitors-change?].})
- 
- (proc-doc/names
-  editor:set-default-font-color
-  (->* ((is-a?/c color%)) ((or/c #f (is-a?/c color%))) void?)
-  ((fg-color) ((bg-color #f)))
-  @{Sets the foreground color of the style named
-    @racket[editor:get-default-color-style-name] to @racket[fg-color].
-    If @racket[bg-color] is not @racket[#f], then @racket[editor:set-default-font-color]
-    sets the background color to @racket[bg-color].})
-
- (proc-doc/names
-  editor:get-default-color-style-name
-  (-> string?)
-  ()
-  @{The name of the style (in the list returned by
-    @racket[editor:get-standard-style-list]) that holds the default color.})
-
- (proc-doc/names
-  editor:set-standard-style-list-delta
-  (-> string? (is-a?/c style-delta%) void?)
-  (name delta)
-  @{Finds (or creates) the style named by @racket[name] in the result of
-    @racket[editor:get-standard-style-list] and sets its delta to
-    @racket[delta].
-    
-    If the style named by @racket[name] is already in the style list, it must
-    be a delta style.})
-
- (proc-doc/names
-  editor:set-standard-style-list-pref-callbacks
-  (-> any)
-  ()
-  @{Installs the font preference callbacks that update the style list returned
-    by @racket[editor:get-standard-style-list] based on the font preference
-    symbols.})
-
- (proc-doc/names
-  editor:get-standard-style-list
-  (-> (is-a?/c style-list%))
-  ()
-  @{Returns a style list that is used for all instances of
-    @racket[editor:standard-style-list%].})
-
- (proc-doc/names
-  editor:add-after-user-keymap
-  (-> (is-a?/c keymap%) (listof (is-a?/c keymap%)) (listof (is-a?/c keymap%)))
-  (keymap keymaps)
-  @{Returns a list that contains all of the keymaps in @racket[keymaps], in the
-    same relative order, but also with @racket[keymap], where @racket[keymap]
-    is now the first keymap after @racket[keymap:get-user] (if that keymap is
-    in the list.)})
-
- (proc-doc/names
-  panel:dragable-container-size
-  (-> (listof (list/c real? real? boolean? boolean?)) real? boolean?
-      (values real? real?))
-  (container-info bar-thickness vertical?)
-  @{Returns the minimum width and height for a @racket[panel:dragable<%>] object
-    where @racket[container-info] (see @method[area-container<%> container-size] for
-    more details on that argument) is the children's info, and @racket[bar-thickness] and
-    @racket[vertical?] indicate the properties of the panel.
-    
-    This function is exported mostly for the test suite.})
-
- (proc-doc/names
-  panel:dragable-place-children
-  (-> (listof (list/c real? real? boolean? boolean?)) 
-      real?
-      real?
-      (listof (between/c 0 1)) 
-      real?
-      boolean?
-      (values (listof (list/c (integer-in 0 10000)
-                              (integer-in 0 10000)
-                              (integer-in 0 10000)
-                              (integer-in 0 10000)))
-              (listof (list/c (integer-in 0 10000)
-                              (integer-in 0 10000)))))
-  (container-info width height percentages bar-thickness vertical?)
-  @{Returns the geometry information for a dragable panel. The inputs
-    are the @racket[container-info] (see @method[area-container<%> place-children] for more info),
-    the @racket[width] and @racket[height] of the window, the @racket[percentages] for the spacing
-    of the children, and a real and a boolean indicating the thickness of the bar between
-    the child panels and whether or not this is a vertical panel, respectively.
-    
-    This function is exported mostly for the test suite.})
- 
- (proc-doc/names
-  color-model:rgb->xyz
-  (number? number? number? . -> . color-model:xyz?)
-  (r g b)
-  @{Converts a color represented as a red-green-blue tuple (each value from 0
-    to 255) into an XYZ tuple.  This describes a point in the CIE
-    XYZ color space.})
-
- (proc-doc/names
-  color-model:rgb-color-distance
-  (number? number? number? number? number? number? . -> . number?)
-  (red-a green-a blue-a red-b green-b blue-b)
-  @{This calculates a distance between two colors.  The smaller the distance,
-    the closer the colors should appear to the human eye.  A distance of 10 is
-    reasonably close that it could be called the same color.
-    
-    This function is not symmetric in red, green, and blue, so it is important
-    to pass red, green, and blue components of the colors in the proper order.
-    The first three arguments are red, green and blue for the first color,
-    respectively, and the second three arguments are red green and blue for the
-    second color, respectively.})
-
- (proc-doc/names
-  color-model:xyz->rgb
-  (number? number? number? . -> . (list/c number? number? number?))
-  (x y z)
-  @{Converts an XYZ-tuple (in the CIE XYZ colorspace) into a list of values
-    representing an RGB-tuple.})
-
- (proc-doc/names
-  color-model:xyz?
-  (any/c . -> . boolean?)
-  (val)
-  @{Determines if @racket[val] an xyz color record.})
-
- (proc-doc/names
-  color-model:xyz-x
-  (color-model:xyz? . -> . number?)
-  (xyz)
-  @{Extracts the x component of @racket[xyz].})
-
- (proc-doc/names
-  color-model:xyz-y
-  (color-model:xyz? . -> . number?)
-  (xyz)
-  @{Extracts the y component of @racket[xyz].})
-
- (proc-doc/names
-  color-model:xyz-z
-  (color-model:xyz? . -> . number?)
-  (xyz)
-  @{Extracts the z component of @racket[xyz].})
-
- (proc-doc/names
-  color-prefs:set-default/color-scheme
-  (-> symbol?
-      (or/c (is-a?/c color%) string?)
-      (or/c (is-a?/c color%) string?)
-      void?)
-  (pref-sym black-on-white-color white-on-black-color)
-  @{Registers a preference whose value will be updated when the user clicks on
-    one of the color scheme default settings in the preferences dialog.
-    
-    Also calls @racket[preferences:set-default] and
-    @racket[preferences:set-un/marshall] with appropriate arguments to register
-    the preference.})
-
- (proc-doc/names 
-  color-prefs:register-color-preference
-  (->* (symbol? string? (or/c (is-a?/c color%) (is-a?/c style-delta%)))
-       ((or/c string? (is-a?/c color%) #f)
-        #:background (or/c (is-a?/c color%) #f))
-       void?)
-  ((pref-name style-name color/sd)
-   ((white-on-black-color #f)
-    (background #f)))
-  @{This function registers a color preference and initializes the style list
-    returned from @racket[editor:get-standard-style-list].  In particular, it
-    calls @racket[preferences:set-default] and
-    @racket[preferences:set-un/marshall] to install the pref for
-    @racket[pref-name], using @racket[color/sd] as the default color.  The
-    preference is bound to a @racket[style-delta%], and initially the
-    @racket[style-delta%] changes the foreground color to @racket[color/sd],
-    unless @racket[color/sd] is a style delta already, in which case it is just
-    used directly.  Then, it calls
-    @racket[editor:set-standard-style-list-delta] passing the
-    @racket[style-name] and the current value of the preference
-    @racket[pref-name].
-    
-    Finally, it adds calls @racket[preferences:add-callback] to set a callback
-    for @racket[pref-name] that updates the style list when the preference
-    changes.
-    
-    If @racket[white-on-black-color] is not @racket[#f], then the color of the
-    @racket[color/sd] argument is used in combination with
-    @racket[white-on-black-color] to register this preference with
-    @racket[color-prefs:set-default/color-scheme].
-    
-    If @racket[background] is not @racket[#f], then it is used to construct the
-    default background color for the style delta.
-    })
-
- (proc-doc/names
-  color-prefs:add-background-preferences-panel
-  (-> void?)
-  ()
-  @{Adds a preferences panel that configures the background color for
-    @racket[editor:basic-mixin].})
-
- (proc-doc/names
-  color-prefs:add-to-preferences-panel
-  (string? ((is-a?/c vertical-panel%) . -> . void?) . -> . void?)
-  (name func)
-  @{Calls @racket[func] with the subpanel of the preferences coloring panel
-    that corresponds to @racket[name].})
-
- (proc-doc/names
-  color-prefs:build-color-selection-panel
-  (->* ((is-a?/c area-container<%>) symbol? string? string?)
-       (#:background? boolean?)
-       void?)
-  ((parent pref-sym style-name example-text)
-   ((background? #f)))
-  @{Builds a panel with a number of controls for configuring a font: its color
-    (including a background configuration if @racket[background] is @racket[#t])
-    and check boxes for bold, italic, and underline.  The @racket[parent]
-    argument specifies where the panel will be placed.  The @racket[pref-sym]
-    should be a preference (suitable for use with @racket[preferences:get] and
-    @racket[preferences:set]).  The @racket[style-name] specifies the name of a
-    style in the style list returned from
-    @racket[editor:get-standard-style-list] and @racket[example-text] is shown
-    in the panel so users can see the results of their configuration.})
-
- (proc-doc/names
-  color-prefs:marshall-style-delta
-  (-> (is-a?/c style-delta%) printable/c)
-  (style-delta)
-  @{Builds a printed representation for a style-delta.})
-
- (proc-doc/names
-  color-prefs:unmarshall-style-delta
-  (-> printable/c (or/c false/c (is-a?/c style-delta%)))
-  (marshalled-style-delta)
-  @{Builds a style delta from its printed representation.  Returns @racket[#f]
-    if the printed form cannot be parsed.})
-
- (proc-doc/names
-  color-prefs:white-on-black
-  (-> any)
-  ()
-  @{Sets the colors registered by @racket[color-prefs:register-color-preference]
-    to their white-on-black variety.})
-
- (proc-doc/names
-  color-prefs:black-on-white
-  (-> any)
-  ()
-  @{Sets the colors registered by @racket[color-prefs:register-color-preference]
-    to their black-on-white variety.})
- 
- (proc-doc
-  color-prefs:add-color-scheme-entry
-  (->i ([name symbol?]
-        [black-on-white-color (or/c string? (is-a?/c color%))]
-        [white-on-black-color (or/c string? (is-a?/c color%))])
-       (#:style 
-        [style (or/c #f string?)]
-        #:bold? [bold? (style) (if style boolean? #f)]
-        #:underline? [underline? (style) (if style boolean? #f)]
-        #:italic? [italic? (style) (if style boolean? #f)]
-        #:background
-        [background (style)
-                    (if style
-                        (or/c #f string? (is-a?/c color%))
-                        #f)])
-       [result void?])
-  (#f #f #f #f #f)
-  @{Registers a new color or style named @racket[name] for use in the color schemes. 
-    If @racket[style] is provided, a new style is registered; if not a color is
-    registered.})
- 
- (proc-doc/names
-  color-prefs:add-color-scheme-preferences-panel
-  (->* () (#:extras (-> (is-a?/c panel%) any)) void?)
-  (() ((extras void)))
-  @{Adds a panel for choosing a color-scheme to the preferences dialog.
-    
-    The @racket[extras] argument is called after the color schemes have been added
-    to the preferences panel. It is passed the panel containing the color schemes
-    and can add items to it.})
- 
- (proc-doc
-  color-prefs:register-info-based-color-schemes
-  (-> void?)
-  @{Reads 
-    the @filepath{info.rkt} file in each collection, looking for the key
-    @index{framework:color-schemes}
-    @racket['framework:color-schemes]. Each definition must bind
-    a list of hash tables, each of which introduces a new
-    color scheme. Each hash table should have keys that specify
-    details of the color scheme, as follows:
-    @itemlist[@item{@racket['name]: must be either a string or a symbol;
-                     if it is a symbol and @racket[string-constant?], 
-                     it is passed to @racket[dynamic-string-constant]
-                     to get the name; otherwise it is used as the name directly.
-                     If absent, the name of the directory containing the @filepath{info.rkt}
-                     file is used as the name.}
-               @item{@racket['white-on-black-base?]: must be a boolean indicating if this
-                      color-scheme is based on an inverted color scheme. If absent, it
-                      is @racket[#f].}
-               @item{@racket['example]: must be a string and is used in the preferences dialog
-                      to show an example of the color scheme. If absent, the string used in
-                      the ``Classic'' color scheme is used.}
-               @item{@racket['colors]: must be a non-empty list whose first position
-                      is a symbol, naming a color or style. The rest of the elements describe
-                      the style or color. In either case, an element may be a vector of three
-                      bytes: this describes a color (in r/g/b order) with an alpha value of
-                      @racket[1.0]. The vector may also have three bytes followed by a real
-                      number between @racket[0] and @racket[1], which is used as the alpha
-                      value. If the name corresponds to a style, then the list may also contain
-                      the symbols @racket['bold], @racket['italic], or @racket['underline].}]
-    
-    The names of the colors and styles are extensible; new ones can be added by calling
-    @racket[color-prefs:add-color-scheme-entry]. When
-    @racket[color-prefs:register-info-based-color-schemes]
-    is called, it logs the active set of color names and style names to the @tt{color-scheme}
-    logger at the info level. So, for example, starting up DrRacket like this:
-    @tt{racket -W info@"@"color-scheme -l drracket} will print out the styles used in your
-    version of DrRacket.})
- 
- (proc-doc/names
-  color-prefs:set-current-color-scheme
-  (-> symbol? void?)
-  (name)
-  @{Sets
-    the current color scheme to the scheme named @racket[name], 
-    if @racket[name] is @racket[color-prefs:known-color-scheme-name?].
-    Otherwise, does nothing.})
- 
- (proc-doc
-  color-prefs:get-current-color-scheme-name
-  (-> color-prefs:color-scheme-style-name?)
-  @{Returns the current color scheme's name.})
- 
- (proc-doc/names
-  color-prefs:known-color-scheme-name?
-  (-> any/c boolean?)
-  (name)
-  @{Returns @racket[#t] if the input is a @racket[symbol?] that names
-            a color or style that is part of the current color scheme.
-            
-            In order to return @racket[#t], @racket[name] must have been
-            passed as the first argument to @racket[color-prefs:add-color-scheme-entry].})
- 
- (proc-doc/names
-  color-prefs:color-scheme-style-name?
-  (-> any/c boolean?)
-  (name)
-  @{Returns @racket[#t] if @racket[name] is a known color scheme name,
-            and is connected to a style. 
-            
-            In order to return @racket[#t], @racket[name] must have been
-            passed as the first argument to @racket[color-prefs:add-color-scheme-entry]
-            and the @racket[#:style] argument must have also been passed.})
- 
- (proc-doc 
-  color-prefs:lookup-in-color-scheme
-  (->i ([name color-prefs:known-color-scheme-name?])
-       ()
-       [result (name)
-               (if (color-prefs:color-scheme-style-name? name)
-                   (is-a?/c style-delta%)
-                   (is-a?/c color%))])
-  @{Returns the current style delta or color associated with @racket[name].})
- 
- (proc-doc
-  color-prefs:set-in-color-scheme
-  (->i ([name color-prefs:known-color-scheme-name?]
-        [new-val (name)
-                 (if (color-prefs:color-scheme-style-name? name)
-                     (is-a?/c style-delta%)
-                     (is-a?/c color%))])
-       ()
-       [result void?])
-  @{Updates the current color or style delta associated with 
-    @racket[name] in the current color scheme.})
- 
- (proc-doc
-  color-prefs:register-color-scheme-entry-change-callback
-  (->i ([name color-prefs:known-color-scheme-name?]
-        [fn (name)
-            (-> (if (color-prefs:color-scheme-style-name? name)
-                    (is-a?/c style-delta%)
-                    (is-a?/c color%))
-                any)])
-       ([weak? boolean?])
-       [result void?])
-  (#f)
-  @{Registers a callback that is invoked whenever the color mapped by
-    @racket[name] changes. Changes may happen due to calls to
-    @racket[color-prefs:set-in-color-scheme] or due to calls to 
-    @racket[color-prefs:set-current-color-scheme].
-    
-    If @racket[weak?] is @racket[#t], the @racket[fn] argument is held
-    onto weakly; otherwise it is held onto strongly.})
- 
- (proc-doc
-  color-prefs:get-color-scheme-names
-  (-> (values set? set?))
-  @{Returns two sets; the first is the known color scheme names that are just colors
-    and the second is the known color scheme names that are styles.
-    
-    These are all of the names that have been passed to @racket[color-prefs:add-color-scheme-entry].})
- )
-
-
-(define-syntax (racket:-reprovides stx)
-  #`(provide
-     (rename-out #,@(for/list ([suffix (in-list racket:ids)])
-                      (define rkt (string->symbol (format "racket:~a" suffix)))
-                      (define scm (string->symbol (format "scheme:~a" suffix)))
-                      #`[#,rkt #,scm]))))
-(racket:-reprovides)
diff --git a/pkgs/gui-pkgs/gui-lib/framework/preferences.rkt b/pkgs/gui-pkgs/gui-lib/framework/preferences.rkt
deleted file mode 100644
index 7f1b977d24..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/preferences.rkt
+++ /dev/null
@@ -1,566 +0,0 @@
-#lang at-exp racket/base
-#|
-
-There are three attributes for each preference:
-
-  - default set, or not
-  - marshalling function set, or not
-  - initialization still okay, or not
-
-the state transitions / contracts are:
-
-  get(true, _, _) -> (true, _, false)
-  get(false, _, _) -> error default not yet set
-
-  set is just like get.
-
-  set-default(false, _, true) -> set-default(true, _, true)
-  set-default(true, _, _) -> error default already set
-  set-default(_, _, false) -> initialization not okay anymore  /* cannot happen, I think */
-
-  set-un/marshall(true, false, true) -> (true, true, true)
-  .. otherwise error
-
-  for all syms: 
-   prefs-snapshot(_, _, _) -> (_, _, false) 
-
-|#
-
-(require scribble/srcdoc
-         racket/contract/base racket/file)
-(require/doc racket/base scribble/manual (for-label racket/serialize))
-
-(define-struct (exn:unknown-preference exn) ())
-
-;; these two names are for consistency
-(define exn:make-unknown-preference make-exn:unknown-preference)
-(define exn:struct:unknown-preference struct:exn:unknown-preference)
-
-(define preferences:low-level-put-preferences (make-parameter put-preferences))
-(define preferences:low-level-get-preference  (make-parameter get-preference))
-
-(define (add-pref-prefix p) (string->symbol (format "plt:framework-pref:~a" p)))
-
-;; preferences : hash-table[sym -o> any]
-;; the current values of the preferences
-(define preferences (make-hasheq))
-
-;; marshall-unmarshall : sym -o> un/marshall
-(define marshall-unmarshall (make-hasheq))
-
-;; callbacks : sym -o> (listof (sym TST -> boolean))
-(define callbacks (make-hasheq))
-
-;; defaults : hash-table[sym -o> default]
-(define defaults (make-hasheq))
-
-;; these four functions determine the state of a preference
-(define (pref-un/marshall-set? pref) (hash-has-key? marshall-unmarshall pref))
-(define (preferences:default-set? pref) (hash-has-key? defaults pref))
-(define (pref-can-init? pref)
-  (and (not snapshot-grabbed?)
-       (not (hash-has-key? preferences pref))))
-
-;; type un/marshall = (make-un/marshall (any -> prinable) (printable -> any))
-(define-struct un/marshall (marshall unmarshall))
-
-;; type pref = (make-pref any)
-(define-struct pref (value))
-
-;; type default  = (make-default any (-> any bool) (listof symbol) (listof (-> any any)))
-(define-struct default (value checker aliases rewrite-aliases))
-
-;; pref-callback : (make-pref-callback (union (weak-box (sym tst -> void)) (sym tst -> void)))
-;; this is used as a wrapped to deal with the problem that different procedures might be eq?.
-(define-struct pref-callback (cb))
-
-;; used to detect missing hash entries
-(define none (gensym 'none))
-
-;; get : symbol -> any
-;; return the current value of the preference `p'
-;; exported
-(define (preferences:get p)
-  (define v (hash-ref preferences p none))
-  (cond
-    ;; if this is found, we can just return it immediately
-    [(not (eq? v none))
-     v]
-    ;; first time reading this, check the file & unmarshall value, if
-    ;; it's not there, use the default
-    [(preferences:default-set? p)
-     (let* (;; try to read the preference from the preferences file
-            [v (read-pref-from-file p)]
-            [v (if (eq? v none)
-                 ;; no value read, take the default value
-                 (default-value (hash-ref defaults p))
-                 ;; found a saved value, unmarshall it
-                 (unmarshall-pref p v))])
-       ;; set the value for future reference and return it
-       (hash-set! preferences p v)
-       v)]
-    [(not (preferences:default-set? p))
-     (raise-unknown-preference-error
-      'preferences:get
-      "tried to get a preference but no default set for ~e"
-      p)]))
-
-;; read-pref-from-file : symbol -> (or/c any none)
-;; reads the preference saved in the low-level preferences
-;; file, first checking 'p' and then checking the aliases (in order)
-(define (read-pref-from-file p)
-  (let ([defaults (hash-ref defaults p)])
-    (let loop ([syms (cons p (default-aliases defaults))]
-               [rewriters (cons values (default-rewrite-aliases defaults))])
-      (cond
-        [(null? syms) none]
-        [else
-         (let/ec k
-           ((car rewriters)
-            ((preferences:low-level-get-preference)
-             (add-pref-prefix (car syms))
-             (lambda () (k (loop (cdr syms) (cdr rewriters)))))))]))))
-
-;; set : symbol any -> void
-;; updates the preference
-;; exported
-(define (preferences:set p value) (multi-set (list p) (list value)))
-
-;; set : symbol any -> void
-;; updates the preference
-;; exported
-(define (multi-set ps values)
-  (dynamic-wind
-   (λ () 
-     (call-pref-save-callbacks #t))
-   (λ ()
-     (for-each
-      (λ (p value)
-        (cond
-          [(preferences:default-set? p)
-           (define default (hash-ref defaults p))
-           (define checker? (default-checker default))
-           (unless (checker? value)
-             (error 'preferences:set
-                    (string-append
-                     "new value doesn't satisfy preferences:set-default predicate\n"
-                     "  pref sym: ~v\n"
-                     "  given: ~e\n"
-                     "  predicate: ~e")
-                     p value checker?))
-             (check-callbacks p value)
-             (hash-set! preferences p value)]
-          [(not (preferences:default-set? p))
-           (raise-unknown-preference-error
-            'preferences:set
-            (string-append
-             "cannot set preference before setting default"
-             "  pref sym: ~e\n"
-             "  given: ~e")
-            p
-            value)]))
-      ps values)
-     ((preferences:low-level-put-preferences)
-      (map add-pref-prefix ps)
-      (map (λ (p value) (marshall-pref p value))
-           ps
-           values))
-     (void))
-   (λ ()
-     (call-pref-save-callbacks #f))))
-
-(define pref-save-callbacks '())
-
-(define (preferences:register-save-callback f)
-  (define key (gensym))
-  (set! pref-save-callbacks (cons (list key f) pref-save-callbacks))
-  key)
-
-(define (preferences:unregister-save-callback k)
-  (set! pref-save-callbacks
-        (let loop ([callbacks pref-save-callbacks])
-          (cond
-            [(null? callbacks) '()]
-            [else
-             (let ([cb (car callbacks)])
-               (if (eq? (list-ref cb 0) k)
-                   (cdr callbacks)
-                   (cons cb (loop (cdr callbacks)))))]))))
-
-(define (call-pref-save-callbacks b)
-  (for ([cb (in-list pref-save-callbacks)])
-    ((list-ref cb 1) b)))
-
-(define (raise-unknown-preference-error sym fmt . args)
-  (raise (exn:make-unknown-preference
-          (string-append (format "~a: " sym) (apply format fmt args))
-          (current-continuation-marks))))
-
-;; add-callback : sym (-> void) -> void
-(define preferences:add-callback 
-  (lambda (p callback [weak? #f])
-    (let ([new-cb (make-pref-callback (if weak?
-                                          (impersonator-ephemeron callback)
-                                          callback))])
-      (hash-set! callbacks
-                 p 
-                 (append 
-                  (hash-ref callbacks p '())
-                  (list new-cb)))
-      (λ ()
-        (hash-set!
-         callbacks
-         p
-         (let loop ([callbacks (hash-ref callbacks p '())])
-           (cond
-             [(null? callbacks) '()]
-             [else 
-              (let ([callback (car callbacks)])
-                (cond
-                  [(eq? callback new-cb)
-                   (loop (cdr callbacks))]
-                  [else
-                   (cons (car callbacks) (loop (cdr callbacks)))]))])))))))
-
-;; check-callbacks : sym val -> void
-(define (check-callbacks p value)
-  (define new-callbacks
-    (let loop ([callbacks (hash-ref callbacks p '())])
-      (cond
-        [(null? callbacks) null]
-        [else 
-         (define callback (car callbacks))
-         (define cb (pref-callback-cb callback))
-         (cond
-           [(ephemeron? cb)
-            (define v (ephemeron-value cb))
-            (cond
-              [v
-               (v p value)
-               (cons callback (loop (cdr callbacks)))]
-              [else
-               (loop (cdr callbacks))])]
-           [else
-            (cb p value)
-            (cons callback (loop (cdr callbacks)))])])))
-  (if (null? new-callbacks)
-      (hash-remove! callbacks p)
-      (hash-set! callbacks p new-callbacks)))
-
-(define (preferences:set-un/marshall p marshall unmarshall)
-  (cond
-    [(and (preferences:default-set? p)
-          (not (pref-un/marshall-set? p))
-          (pref-can-init? p))
-     (hash-set! marshall-unmarshall p (make-un/marshall marshall unmarshall))]
-    [(not (preferences:default-set? p))
-     (error 'preferences:set-un/marshall
-            "must call set-default for ~s before calling set-un/marshall for ~s"
-            p p)]
-    [(pref-un/marshall-set? p)
-     (error 'preferences:set-un/marshall
-            "already set un/marshall for ~e" 
-            p)]
-    [(not (pref-can-init? p))
-     (error 'preferences:set-un/marshall "the preference ~e cannot be configured any more" p)]))
-
-(define (preferences:restore-defaults)
-  (hash-for-each
-   defaults
-   (λ (p def) (preferences:set p (default-value def)))))
-
-;; set-default : (sym TST (TST -> boolean) -> void
-(define (preferences:set-default p default-value checker 
-                                 #:aliases [aliases '()]
-                                 #:rewrite-aliases [rewrite-aliases (map (lambda (x) values) aliases)])
-  (cond
-    [(and (not (preferences:default-set? p))
-          (pref-can-init? p))
-     (define default-okay? (checker default-value))
-     (unless default-okay?
-       (error 'set-default 
-              (string-append
-               "checker doesn't match default\n"
-               "  default: ~e\n"
-               "  pref sym: ~e\n"
-               "  checker: ~e")
-              p default-value checker))
-
-     (unless (= (length aliases) (length rewrite-aliases))
-       (error 'preferences:set-default 
-	      "expected equal length lists for the #:aliases and #:rewrite-aliases arguments, got ~e and ~e"
-	      aliases rewrite-aliases))
-     (hash-set! defaults p (make-default default-value checker aliases rewrite-aliases))]
-    [(not (pref-can-init? p))
-     (error 'preferences:set-default
-            "tried to call set-default for preference ~e but it cannot be configured any more"
-            p)]
-    [(preferences:default-set? p)
-     (error 'preferences:set-default
-            "preferences default already set for ~e" p)]
-    [(not (pref-can-init? p))
-     (error 'preferences:set-default
-            "can no longer set the default for ~e" p)]))
-
-;; marshall-pref : symbol any -> (list symbol printable)
-(define (marshall-pref p value)
-  (let/ec k
-    (let* ([marshaller
-            (un/marshall-marshall
-             (hash-ref marshall-unmarshall p (λ () (k value))))])
-      (marshaller value))))
-
-;; unmarshall-pref : symbol marshalled -> any
-;; unmarshalls a preference read from the disk
-(define (unmarshall-pref p data)
-  (let* ([un/marshall (hash-ref marshall-unmarshall p #f)]
-         [result (if un/marshall
-                     ((un/marshall-unmarshall un/marshall) data)
-                     data)]
-         [default (hash-ref defaults p)])
-    (if ((default-checker default) result)
-        result
-        (default-value default))))
-
-;; copy-pref-value : sym any -> any
-;; uses the marshalling code to copy a preference. If there
-;; is not marshaller set, then no copying happens.
-(define (copy-pref-value p value)
-  (let/ec k
-    (let* ([un/marshaller (hash-ref marshall-unmarshall p (λ () (k value)))]
-           [default (hash-ref defaults p)]
-           [marsh (un/marshall-marshall un/marshaller)]
-           [unmarsh (un/marshall-unmarshall un/marshaller)]
-           [marshalled (marsh value)]
-           [copy (unmarsh marshalled)])
-      (if ((default-checker default) copy)
-          copy
-          value))))
-  
-(define-struct preferences:snapshot (x))
-(define snapshot-grabbed? #f)
-(define (preferences:get-prefs-snapshot)
-  (set! snapshot-grabbed? #t)
-  (make-preferences:snapshot 
-   (hash-map defaults 
-             (λ (k v) (cons k (copy-pref-value k (preferences:get k)))))))
-
-(define (preferences:restore-prefs-snapshot snapshot)
-  (multi-set (map car (preferences:snapshot-x snapshot))
-             (map cdr (preferences:snapshot-x snapshot)))
-  (void))
-
-
-(provide/doc
- (proc-doc/names
-  preferences:get
-  (symbol? . -> . any/c)
-  (symbol)
-  @{See also @racket[preferences:set-default].
-        
-        @racket[preferences:get] returns the value for the preference
-        @racket[symbol]. It raises an exception matching
-        @racket[exn:unknown-preference?]
-        if the preference's default has not been set.})
-
- (proc-doc/names
-  preferences:set
-  (symbol? any/c . -> . void?)
-  (symbol value)
-  @{Sets the preference
-    @racket[symbol] to @racket[value]. It should be called when the
-    users requests a change to a preference.
-    
-    @racket[preferences:set] immediately writes the preference value to disk.    
-    It raises an exception matching
-    @racket[exn:unknown-preference?]
-    if the preference's default has not been set.
-    
-    See also @racket[preferences:set-default].})
- 
- (proc-doc/names
-  preferences:add-callback
-  (->* (symbol? (-> symbol? any/c any)) 
-       (boolean?)
-       (-> void?))
-  ((p f)
-   ((weak? #f)))
-  @{This function adds a callback which is called with a symbol naming a
-    preference and its value, when the preference changes.
-    @racket[preferences:add-callback] returns a thunk, which when
-    invoked, removes the callback from this preference.
-    
-    If @racket[weak?] is true, the preferences system will only hold on to
-    the callback weakly.
-    
-    The callbacks will be called in the order in which they were added.
-    
-    If you are adding a callback for a preference that requires
-    marshalling and unmarshalling, you must set the marshalling and
-    unmarshalling functions by calling
-    @racket[preferences:set-un/marshall] before adding a callback.
-    
-    This function raises an exception matching
-    @racket[exn:unknown-preference?]
-    if the preference has not been set.})
- (proc-doc/names
-  preferences:set-default
-  (->* (symbol? any/c (any/c . -> . any))
-       (#:aliases (listof symbol?)
-        #:rewrite-aliases (listof (-> any/c any)))
-      void?)
-  ((symbol value test)
-   ((aliases '()) (rewrite-aliases (map (lambda (x) values) aliases))))
-  @{This function must be called every time your application starts up, before
-    any call to @racket[preferences:get] or @racket[preferences:set]
-    (for any given preference).
-    
-    If you use @racket[preferences:set-un/marshall],
-    you must call this function before calling it.
-    
-    This sets the default value of the preference @racket[symbol] to
-    @racket[value]. If the user has chosen a different setting,
-    the user's setting will take precedence over the default value.
-    
-    The @racket[test] argument is used as a safeguard. That function is
-    called to determine if a preference read in from a file is a valid
-    preference. If @racket[test] returns @racket[#t], then the preference is
-    treated as valid. If @racket[test] returns @racket[#f] then the default is
-    used.
-
-    The @racket[aliases] and @racket[rewrite-aliases] arguments aids
-    in renaming preferences. If @racket[aliases] is present, it is 
-    expected to be a list of symbols that correspond to old versions
-    of the preferences. It defaults to @racket['()]. If @racket[rewrite-aliases]
-    is present, it is used to adjust the old values of the preferences
-    when they are present in the saved file.})
- 
- (proc-doc/names
-  preferences:default-set?
-  (-> symbol? boolean?)
-  (pref)
-  @{Returns @racket[#t] if @racket[pref] has been passed to
-            @racket[preferences:set-default], @racket[#f]
-            otherwise})
-
- (proc-doc/names
-  preferences:set-un/marshall
-  (symbol? (any/c . -> . printable/c) (printable/c . -> . any/c) . -> . void?)
-  (symbol marshall unmarshall)
-  @{@racket[preferences:set-un/marshall] is used to specify marshalling and
-    unmarshalling functions for the preference
-    @racket[symbol]. @racket[marshall] will be called when the users saves their
-    preferences to turn the preference value for @racket[symbol] into a
-    printable value. @racket[unmarshall] will be called when the user's
-    preferences are read from the file to transform the printable value
-    into its internal representation. If @racket[preferences:set-un/marshall]
-    is never called for a particular preference, the values of that
-    preference are assumed to be printable.
-    
-    If the unmarshalling function returns a value that does not meet the
-    guard passed to @racket[preferences:set-default]
-    for this preference, the default value is used.
-    
-    The @racket[marshall] function might be called with any value returned
-    from @racket[read] and it must not raise an error 
-    (although it can return arbitrary results if it gets bad input). This might
-    happen when the preferences file becomes corrupted, or is edited
-    by hand.
-    
-    @racket[preferences:set-un/marshall] must be called before calling
-    @racket[preferences:get],@racket[preferences:set].
-
-    See also @racket[serialize] and @racket[deserialize].
-   })
- 
- (proc-doc/names
-  preferences:restore-defaults
-  (-> void?)
-  ()
-  @{@racket[(preferences:restore-defaults)] restores the users' configuration
-    to the default preferences.})
- 
- (proc-doc/names
-  preferences:register-save-callback
-  (-> (-> boolean? any) symbol?)
-  (callback)
-  @{Registers @racket[callback] to run twice for each call to @racket[preferences:set]---once 
-              before the preferences file is written, with @racket[#t], and once after it is written, with
-              @racket[#f]. Registration returns a key for use with @racket[preferences:unregister-save-callback]. 
-              Caveats:
-              @itemize{@item{The callback occurs on whichever thread happened to call @racket[preferences:set].}
-                       @item{Pre- and post-write notifications are not necessarily paired; unregistration
-                             may cancel the post-write notification before it occurs.}}})
- 
- (proc-doc/names
-  preferences:unregister-save-callback
-  (-> symbol? void?)
-  (key)
-  @{Unregisters the save callback associated with @racket[key].})
- 
- (proc-doc/names
-  exn:make-unknown-preference 
-  (string? continuation-mark-set? . -> . exn:unknown-preference?)
-  (message continuation-marks)
-  @{Creates an unknown preference exception.})
- 
- (proc-doc/names
-  exn:unknown-preference? 
-  (any/c . -> . boolean?)
-  (exn)
-  @{Determines if a value is an unknown preference exn.})
- 
- (thing-doc
-  exn:struct:unknown-preference
-  struct-type?
-  @{The struct type for the unknown preference exn.})
-
- 
- (parameter-doc
-  preferences:low-level-put-preferences
-  (parameter/c ((listof symbol?) (listof any/c) . -> . any))
-  put-preferences
-  @{This parameter's value is called to save preference the preferences file.
-    Its interface should be just like mzlib's @racket[put-preferences].
-    
-    The default value calls @racket[put-preferences] and, if there is an error,
-    then starts using a hash-table to save the preferences instead.
-    See also @racket[]})
- 
- (parameter-doc
-  preferences:low-level-get-preference
-  (parameter/c (->* (symbol?) [(-> any)] any))
-  get-preference
-  @{This parameter's value is called to get a preference from the preferences
-    file. Its interface should be just like @racket[get-preference].
-    
-    The default value calls @racket[get-preferences] and, if there is an error,
-    then starts using a hash-table to save the preferences instead.})
-  
- (proc-doc/names
-  preferences:snapshot? 
-  (-> any/c boolean?)
-  (arg)
-  @{Determines if its argument is a preferences snapshot.
-    
-    See also @racket[preferences:get-prefs-snapshot] and
-    @racket[preferences:restore-prefs-snapshot].})
- (proc-doc/names
-  preferences:restore-prefs-snapshot 
-  (-> preferences:snapshot? void?)
-  (snapshot)
-  @{Restores the preferences saved in @racket[snapshot].
-    
-    See also @racket[preferences:get-prefs-snapshot].})
- 
- (proc-doc/names
-  preferences:get-prefs-snapshot 
-  (-> preferences:snapshot?)
-  ()
-  @{Caches all of the current values of the preferences and returns them.
-    For any preference that has marshalling and unmarshalling set
-    (see @racket[preferences:set-un/marshall]), the preference value is
-    copied by passing it through the marshalling and unmarshalling process.
-    Other values are not copied, but references to them are instead saved.
-
-    See also @racket[preferences:restore-prefs-snapshot].}))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/application.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/application.rkt
deleted file mode 100644
index 250a633824..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/application.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scheme/unit
-
-  (require "sig.rkt")
-  
-  (import)
-  
-  (export framework:application^)
-  
-  (define current-app-name (make-parameter
-                            "GRacket"
-                            (λ (x)
-                              (unless (string? x)
-                                (error 'current-app-name
-                                       "the app name must be a string"))
-                              x)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/aspell.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/aspell.rkt
deleted file mode 100644
index 3bc9452788..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/aspell.rkt
+++ /dev/null
@@ -1,238 +0,0 @@
-#lang racket/base
-(require racket/system
-         racket/match
-         racket/contract
-         racket/port
-         string-constants)
-
-(provide/contract
- [query-aspell (->* ((and/c string? (not/c #rx"[\n]")))
-                    ((or/c #f string?))
-                    (listof (list/c number? number? (listof string?))))]
-
- ;; may return #f when aspell is really ispell or when
- ;; something goes wrong trying to get the list of dictionaries
- [get-aspell-dicts (-> (or/c #f (listof string?)))]
- 
- [find-aspell-binary-path (-> (or/c path? #f))]
- [aspell-problematic? (-> (or/c string? #f))])
-
-(define aspell-candidate-paths
-  '("/usr/bin" 
-    "/bin"
-    "/usr/local/bin"
-    "/opt/local/bin/"))
-
-(define (find-aspell-binary-path)
-  (define aspell (if (eq? (system-type) 'windows) "aspell.exe" "aspell"))
-  (define ispell (if (eq? (system-type) 'windows) "ispell.exe" "ispell"))
-  (or (find-executable-path aspell)
-      (find-executable-path ispell)
-      (for/or ([cp aspell-candidate-paths])
-        (define c1 (build-path cp aspell))
-        (define c2 (build-path cp ispell))
-        (or (and (file-exists? c1)
-                 c1)
-            (and (file-exists? c2)
-                 c2)))))
-
-(define (start-aspell asp dict)
-  (define aspell? (regexp-match? #rx"aspell" (path->string asp)))
-  (apply process* asp 
-         (append
-          '("-a")
-          (if dict
-              (list "-d" dict)
-              '())
-          (if aspell? '("--encoding=utf-8") '()))))
-
-(define problematic 'dont-know)
-(define (aspell-problematic?)
-  (when (eq? problematic 'dont-know)
-    (set! problematic (do-aspell-problematic))
-    (asp-log (format "set problematic to ~s" problematic)))
-  problematic)
-
-(define (do-aspell-problematic)
-  (define asp (find-aspell-binary-path))
-  (cond
-    [(not asp)
-     (string-constant cannot-find-ispell-or-aspell-path)]
-    [else
-     (define proc-lst (start-aspell asp #f))
-     (define stdout (list-ref proc-lst 0))
-     (define stderr (list-ref proc-lst 3))
-     (close-output-port (list-ref proc-lst 1)) ;; close stdin
-     (close-input-port stdout)
-     (define sp (open-output-string))
-     (copy-port stderr sp)
-     (define errmsg (get-output-string sp))
-     (close-input-port stderr)
-     (cond
-       [(not (equal? errmsg ""))
-        (string-append
-         (format (string-constant spell-program-wrote-to-stderr-on-startup) asp)
-         "\n\n"
-         errmsg)]
-       [else #f])]))
-
-(define asp-logger (make-logger 'framework/aspell (current-logger)))
-(define-syntax-rule 
-  (asp-log arg)
-  (when (log-level? asp-logger 'debug)
-    (asp-log/proc arg)))
-(define (asp-log/proc arg)
-  (log-message asp-logger 'debug arg (current-continuation-marks)))
-
-(define aspell-req-chan (make-channel))
-(define change-dict-chan (make-channel))
-(define aspell-thread #f)
-(define (start-aspell-thread)
-  (unless aspell-thread
-    (set! aspell-thread
-          (thread
-           (λ () 
-             (define aspell-proc #f)
-             (define already-attempted-aspell? #f)
-             (define current-dict #f)
-             
-             (define (fire-up-aspell)
-               (unless already-attempted-aspell?
-                 (set! already-attempted-aspell? #t)
-                 (define asp (find-aspell-binary-path))
-                 (when asp
-                   (set! aspell-proc (start-aspell asp current-dict))
-                   (define line (with-handlers ((exn:fail? exn-message))
-                                  (read-line (list-ref aspell-proc 0))))
-                   (asp-log (format "framework: started speller: ~a" line))
-                   
-                   (when (and (string? line)
-                              (regexp-match #rx"[Aa]spell" line))
-                     ;; put aspell in "terse" mode 
-                     (display "!\n" (list-ref aspell-proc 1))
-                     (flush-output (list-ref aspell-proc 1)))
-                   
-                   (define stderr (list-ref aspell-proc 3))
-                   (thread
-                    (λ ()
-                      (let loop ()
-                        (define l (with-handlers ((exn:fail? void))
-                                    (read-line stderr)))
-                        (when (string? l)
-                          (asp-log (format "aspell-proc stderr: ~a" l))
-                          (loop))))))))
-             
-             (define (shutdown-aspell why)
-               (asp-log (format "aspell.rkt: shutdown connection to aspell: ~a" why))
-               (define proc (list-ref aspell-proc 4))
-               (close-input-port (list-ref aspell-proc 0))
-               (close-output-port (list-ref aspell-proc 1))
-               (close-input-port (list-ref aspell-proc 3))
-               (proc 'kill)
-               (set! aspell-proc #f))
-             
-             (let loop ()
-               (sync
-                (handle-evt
-                 aspell-req-chan
-                 (match-lambda
-                   [(list line new-dict resp-chan nack-evt)
-                    (unless (equal? new-dict current-dict)
-                      (when aspell-proc
-                        (shutdown-aspell "changing dictionary")
-                        (set! already-attempted-aspell? #f))
-                      (set! current-dict new-dict))
-                    (unless aspell-proc (fire-up-aspell))
-                    (define (send-resp resp)
-                      (sync (channel-put-evt resp-chan resp)
-                            nack-evt))
-                    (cond
-                      [aspell-proc
-                       (define stdout (list-ref aspell-proc 0))
-                       (define stdin (list-ref aspell-proc 1))
-                       
-                       ;; always lead with a ^ character so aspell
-                       ;; doesn't interpret anything as a command
-                       (display "^" stdin)
-                       (display line stdin) 
-                       (newline stdin)
-                       (flush-output stdin)
-                       (let loop ([resp '()])
-                         (define check-on-aspell (sync/timeout .5 stdout))
-                         (cond
-                           [check-on-aspell
-                            (define (handle-err x)
-                              (asp-log
-                               (format "error reading stdout of aspell process: ~a"
-                                       (exn-message x)))
-                              eof)
-                            (define l (with-handlers ((exn:fail? handle-err))
-                                        (read-line stdout)))
-                            (cond
-                              [(eof-object? l) 
-                               (send-resp '())
-                               (shutdown-aspell "got eof from process")]
-                              [(equal? l "") (send-resp (reverse resp))]
-                              [(regexp-match #rx"^[*]" l) (loop resp)]
-                              [(regexp-match #rx"^[&] ([^ ]*) [0-9]+ ([0-9]+): (.*)$" l) 
-                               =>
-                               (λ (m)
-                                 (define word-len (string-length (list-ref m 1)))
-                                 ;; subtract one to correct for the leading ^
-                                 (define word-start (- (string->number (list-ref m 2)) 1))
-                                 (define suggestions (list-ref m 3))
-                                 (loop 
-                                  (cons 
-                                   (list word-start word-len (regexp-split #rx", " suggestions))
-                                   resp)))]
-                              [(regexp-match #rx"^[#] ([^ ]*) ([0-9]+)" l) 
-                               =>
-                               (λ (m)
-                                 (define word-len (string-length (list-ref m 1)))
-                                 ;; subtract one to correct for the leading ^
-                                 (define word-start (- (string->number (list-ref m 2)) 1))
-                                 (loop (cons (list word-start word-len '()) resp)))]
-                              [else
-                               (send-resp '())
-                               (shutdown-aspell (format "could not parse aspell output line: ~s" l))])]
-                           [else
-                            (send-resp '())
-                            (shutdown-aspell "interaction timed out")]))]
-                      [else (send-resp '())])
-                    (loop)])))))))))
-
-(define (query-aspell line [dict #f])
-  (cond
-    [(aspell-problematic?)
-     '()]
-    [else
-     (when dict
-       (unless (member dict (get-aspell-dicts))
-         (set! dict #f)))
-     
-     (start-aspell-thread)
-     (sync
-      (nack-guard-evt
-       (λ (nack-evt)
-         (define resp (make-channel))
-         (channel-put aspell-req-chan (list line dict resp nack-evt))
-         resp)))]))
-
-(define aspell-dicts #f)
-(define (get-aspell-dicts)
-  (unless (aspell-problematic?)
-    (unless aspell-dicts
-      (define asp (find-aspell-binary-path))
-      (when (regexp-match? #rx"aspell" (path->string asp))
-        (define proc-lst (process* asp "dump" "dicts"))
-        (define stdout (list-ref proc-lst 0))
-        (define stderr (list-ref proc-lst 3))
-        (close-output-port (list-ref proc-lst 1)) ;; close stdin
-        (close-input-port stderr)
-        (set! aspell-dicts
-              (let loop ()
-                (define l (read-line stdout))
-                (cond
-                  [(eof-object? l) '()]
-                  [else (cons l (loop))]))))))
-  aspell-dicts)
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/autocomplete.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/autocomplete.rkt
deleted file mode 100644
index 70589624dc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/autocomplete.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/match)
-(provide autocompletion-cursor<%> autocompletion-cursor%)
-
-(define autocompletion-cursor<%>
-  (interface ()
-    get-completions  ;      -> (listof string) 
-    get-length       ;      -> int
-    empty?           ;      -> boolean
-    narrow           ; char -> autocompletion-cursor<%>
-    widen))          ; char -> autocompletion-cursor<%>
-    
-
-;; string -> (values (string -> real) natural)
-;; produce a ranking function and a max normal score
-;; the ranking function is as follows:
-;; w |-> +inf.0 if `prefix' is a prefix of w
-;; w |-> 1000 if `prefix' appears in w
-;; w |-> n if n parts of `prefix' appear in w as first segments
-;; the max normal score is the largest n that the last clause can produce
-(define (rank prefix) 
-  (define splitters "[-/:_!]")
-  (define parts (regexp-split splitters prefix))
-  (define re (regexp (string-append "^" (regexp-quote prefix))))
-  (values (λ (w) (cond 
-                   [(regexp-match re w) +inf.0]
-                   ;; it's a very good match prefix appears in the word
-                   [(regexp-match (regexp-quote prefix) w) 1000]
-                   ;; otherwise, we iterate and check each component of 
-                   [else
-                    (for/fold ([c 0]) ([r parts])
-                      (define rq (regexp-quote r))
-                      (cond [(regexp-match (string-append "^" rq) w)
-                             (+ 1 c)]
-                            [(regexp-match (string-append splitters rq) w)
-                             (+ 1 c)]
-                            [else c]))]))
-          (length parts)))
-
-;; ============================================================
-;; autocompletion-cursor<%> implementation
-
-(define autocompletion-cursor%
-  (class* object% (autocompletion-cursor<%>)
-    
-    (init-field word all-words)        
-    
-    (define-values (rnk max-count) (rank word))
-    ;; this determines the fuzziness
-    ;; if we set mx to +inf.0, we get just the prefix matches
-    ;; if we set mx to 1000, we get just the matches somewhere in the word
-    ;; this definition is fuzzier the more parts there are in the word
-    (define mx (cond
-                 [(<= max-count 2) max-count]
-                 [(<= max-count 4) (- max-count 1)]
-                 [else (- max-count 2)]))
-    
-    ;; all the possible completions for `word', in ranked order
-    (define all-completions 
-      (map car (sort
-                ;; we don't use `rnk' as the key to avoid
-                ;; constructing a huge list
-                (for*/list ([w (in-list all-words)]
-                            [r (in-value (rnk w))]
-                            #:when (>= r mx))
-                  (cons w r))
-                (match-lambda** [((cons w r) (cons w* r*))
-                                 (or (> r r*)
-                                     ;; prefer shorter matches
-                                     (< (string-length w) (string-length w*)))]))))
-    
-    (define all-completions-length (length all-completions))
-    
-    (define/public (narrow c)
-      (new autocompletion-cursor%
-           [word (string-append word (list->string (list c)))]
-           [all-words all-words]))
-    
-    (define/public (widen)
-      (let ([strlen (string-length word)])
-        (cond
-          [(< strlen 2) #f]
-          [else 
-           (new autocompletion-cursor%
-                [word (substring word 0 (- (string-length word) 1))]
-                [all-words all-words])])))
-    
-    (define/public (get-completions) all-completions)
-    (define/public (get-length) all-completions-length)
-    (define/public (empty?) (eq? (get-length) 0))
-    
-    (super-new)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/autosave.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/autosave.rkt
deleted file mode 100644
index 04e91a9f8a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/autosave.rkt
+++ /dev/null
@@ -1,328 +0,0 @@
-#lang scheme/unit
-
-  (require racket/class
-           racket/file
-           "sig.rkt"
-           "../gui-utils.rkt"
-           "../preferences.rkt"
-           mred/mred-sig
-           string-constants)
-  
-  (import mred^
-          [prefix exit: framework:exit^]
-          [prefix frame: framework:frame^]
-          [prefix racket: framework:racket^]
-          [prefix editor: framework:editor^]
-          [prefix text: framework:text^]
-          [prefix finder: framework:finder^]
-          [prefix group: framework:group^])
-  
-  (export framework:autosave^)
-  
-  (define autosavable<%>
-    (interface ()
-      do-autosave))
-  
-  (define objects null)
-  
-  (define toc-path
-    (build-path (find-system-path 'pref-dir)
-                (case (system-type)
-                  [(unix) ".plt-autosave-toc.rktd"]
-                  [else "PLT-autosave-toc.rktd"])))
-  
-  (define autosave-toc-save-filename
-    (build-path (find-system-path 'pref-dir)
-                (case (system-type)
-                  [(unix) ".plt-autosave-toc-save.rktd"]
-                  [else "PLT-autosave-toc-save.rktd"])))
-  
-  (define autosave-timer%
-    (class timer%
-      (inherit start)
-      (field [last-name-mapping #f])
-      (define/override (notify)
-        (when (preferences:get 'framework:autosaving-on?)
-          (let-values ([(new-objects new-name-mapping) (rebuild-object-list)])
-            (set! objects new-objects)
-            (unless (equal? last-name-mapping new-name-mapping)
-              (set! last-name-mapping new-name-mapping)
-              (when (file-exists? autosave-toc-save-filename)
-                (delete-file autosave-toc-save-filename))
-              (when (file-exists? toc-path)
-                (copy-file toc-path autosave-toc-save-filename))
-              (call-with-output-file toc-path
-                (λ (port)
-                  (write new-name-mapping port))
-                #:exists 'truncate
-                #:mode 'text))))
-        (let ([seconds (preferences:get 'framework:autosave-delay)])
-          (start (* 1000 seconds) #t)))
-      (super-new)
-      (let ([seconds (preferences:get 'framework:autosave-delay)])
-        (start (* 1000 seconds) #t))))
-  
-  ;; rebuild-object-list : -> (values (listof (weak-box (is-a?/c editor<%>)))
-  ;;                                  (listof (list (union #f string[filename]) string[filename]))
-  (define (rebuild-object-list)
-    (let loop ([orig-objects objects]
-               [name-mapping null]
-               [new-objects null])
-      (if (null? orig-objects)
-          (values new-objects name-mapping)
-          (let* ([object-wb (car orig-objects)]
-                 [object (weak-box-value object-wb)])
-            (if object
-                (let* ([new-filename (send object do-autosave)]
-                       [tmp-box (box #f)]
-                       [filename (send object get-filename tmp-box)])
-                  (loop (cdr orig-objects)
-                        (if new-filename
-                            (cons (list (and (not (unbox tmp-box)) 
-                                             filename
-                                             (path->bytes filename))
-                                        (and new-filename 
-                                             (path->bytes new-filename)))
-                                  name-mapping)
-                            name-mapping)
-                        (cons object-wb new-objects)))
-                (loop (cdr orig-objects)
-                      name-mapping
-                      new-objects))))))
-  
-  (define timer #f)
-  ;; when the autosave delay is changed then we
-  ;; trigger an autosave right away and let the
-  ;; callback trigger the next one at the right interval
-  (preferences:add-callback
-   'framework:autosave-delay
-   (λ (k v)
-     (when timer
-       (send timer stop)
-       (send timer start 0 #t))))
-  
-
-  
-  (define (register b)
-    (unless timer
-      (set! timer (make-object autosave-timer%)))
-    (set! objects
-          (let loop ([objects objects])
-            (cond
-              [(null? objects) (list (make-weak-box b))]
-              [else (let ([weak-box (car objects)])
-                      (if (weak-box-value weak-box)
-                          (cons weak-box (loop (cdr objects)))
-                          (loop (cdr objects))))]))))
-  
-  ;; restore-autosave-files/gui : -> (union #f (is-a?/c top-level-window<%>))
-  ;; opens a frame that lists the autosave files that have changed.
-  (define (restore-autosave-files/gui)
-    
-    ;; main : -> void
-    ;; start everything going
-    (define (main)
-      (when (file-exists? toc-path)
-        ;; Load table from file, and check that the file was not corrupted
-        (let* ([table (let ([v (with-handlers ([exn:fail? (λ (x) null)])
-                                 (call-with-input-file toc-path read))])
-                        (if (and (list? v)
-                                 (andmap (λ (i)
-                                           (and (list? i) 
-                                                (= 2 (length i))
-                                                (or (not (car i))
-                                                    (bytes? (car i)))
-                                                (bytes? (cadr i))))
-                                         v))
-                            (map (λ (ent) (list (if (bytes? (list-ref ent 0))
-                                                    (bytes->path (list-ref ent 0))
-                                                    #f)
-                                                (bytes->path (list-ref ent 1))))
-                                 v)
-                            null))]
-               ;; assume that the autosave file was deleted due to the file being saved
-               [filtered-table
-                (filter (λ (x) (file-exists? (cadr x))) table)])
-          (unless (null? filtered-table)
-            (let* ([dlg (new (frame:focus-table-mixin dialog%)
-                             (label (string-constant recover-autosave-files-frame-title)))]
-                   [t (new text% (auto-wrap #t))]
-                   [ec (new editor-canvas%
-                            (parent dlg)
-                            (editor t)
-                            (line-count 2)
-                            (stretchable-height #f)
-                            (style '(no-hscroll)))]
-                   [hp (new horizontal-panel% 
-                            [parent dlg]
-                            [stretchable-height #f])]
-                   [vp (new vertical-panel%
-                            [parent hp]
-                            [stretchable-height #f])]
-                   [details-parent (new horizontal-panel% [parent dlg])])
-              (send vp set-alignment 'right 'center)
-              (make-object grow-box-spacer-pane% hp)
-              (send t insert (string-constant autosave-explanation))
-              (send t hide-caret #t)
-              (send t set-position 0 0)
-              (send t lock #t)
-              
-              (for-each (add-table-line vp dlg details-parent) filtered-table)
-              (make-object button%
-                (string-constant autosave-done)
-                vp
-                (λ (x y)
-                  (when (send dlg can-close?)
-                    (send dlg on-close)
-                    (send dlg show #f))))
-              (send dlg show #t)
-              (void))))))
-    
-    ;; add-table-line : (is-a? area-container<%>)
-    ;;                  (or/c #f (is-a?/c top-level-window<%>))
-    ;;                  (is-a? area-container<%>)
-    ;;               -> (list/c (or/c #f path?) path?)
-    ;;               -> void?
-    ;; adds in a line to the overview table showing this pair of files.
-    (define (add-table-line area-container dlg show-details-parent)
-      (λ (table-entry)
-        (letrec ([orig-file (car table-entry)]
-                 [backup-file (cadr table-entry)]
-                 [hp (new horizontal-panel%
-                          (parent area-container)
-                          (style '(border))
-                          (stretchable-height #f))]
-                 [vp (new vertical-panel%
-                          (parent hp))]
-                 [msg1-panel (new horizontal-panel%
-                                  (parent vp))]
-                 [msg1-label (new message%
-                                  (parent msg1-panel)
-                                  (label (string-constant autosave-original-label:)))]
-                 [msg1 (new message%
-                            (label (if orig-file (path->string orig-file) (string-constant autosave-unknown-filename)))
-                            (stretchable-width #t)
-                            (parent msg1-panel))]
-                 [msg2-panel (new horizontal-panel%
-                                  (parent vp))]
-                 [msg2-label (new message%
-                                  (parent msg2-panel)
-                                  (label (string-constant autosave-autosave-label:)))]
-                 [msg2 (new message%
-                            (label (path->string backup-file))
-                            (stretchable-width #t)
-                            (parent msg2-panel))]
-                 [details
-                  (make-object button% (string-constant autosave-details) hp
-                    (λ (x y)
-                      (show-files table-entry show-details-parent dlg)))]
-                 [delete
-                  (make-object button%
-                    (string-constant autosave-delete-button)
-                    hp
-                    (λ (delete y)
-                      (when (delete-autosave table-entry)
-                        (disable-line)
-                        (send msg2 set-label (string-constant autosave-deleted)))))]
-                 [recover
-                  (make-object button% 
-                    (string-constant autosave-recover)
-                    hp
-                    (λ (recover y)
-                      (let ([filename-result (recover-file dlg table-entry)])
-                        (when filename-result
-                          (disable-line)
-                          (send msg2 set-label (string-constant autosave-recovered!))
-                          (send msg1 set-label (gui-utils:quote-literal-label
-                                                (path->string filename-result)
-                                                #:quote-amp? #f))))))]
-                 [disable-line
-                  (λ ()
-                    (send recover enable #f)
-                    (send details enable #f)
-                    (send delete enable #f))])
-          (let ([w (max (send msg1-label get-width) (send msg2-label get-width))])
-            (send msg1-label min-width w)
-            (send msg2-label min-width w))
-          (void))))
-
-    ;; delete-autosave : (list (union #f string[filename]) string[filename]) -> boolean
-    ;; result indicates if delete occurred
-    (define (delete-autosave table-entry)
-      (let ([autosave-file (cadr table-entry)])
-        (and (gui-utils:get-choice
-              (format (string-constant are-you-sure-delete?)
-                      autosave-file)
-              (string-constant autosave-delete-title)
-              (string-constant cancel)
-              (string-constant warning)
-              #f)
-             (with-handlers ([exn:fail?
-                              (λ (exn)
-                                (message-box
-                                 (string-constant warning)
-                                 (format (string-constant autosave-error-deleting)
-                                         autosave-file
-                                         (if (exn? exn)
-                                             (format "~a" (exn-message exn))
-                                             (format "~s" exn))))
-                                #f)])
-               (delete-file autosave-file)
-               #t))))
-    
-    ;; show-files : (list (or/c #f path?) path?) (is-a?/c area-container<%>) (is-a?/c dialog%) -> void
-    (define (show-files table-entry show-details-parent dlg)
-      (let ([file1 (list-ref table-entry 0)]
-            [file2 (list-ref table-entry 1)])
-        (send dlg begin-container-sequence)
-        (define had-children? #f)
-        (send show-details-parent change-children (λ (x) 
-                                                    (set! had-children? (not (null? x)))
-                                                    '()))
-        (when file1
-          (add-file-viewer file1 show-details-parent (string-constant autosave-original-label)))
-        (add-file-viewer file2 show-details-parent (string-constant autosave-autosave-label))
-        (send dlg end-container-sequence)
-        (unless had-children?
-          (send dlg center))))
-    
-    ;; add-file-viewer : path? -> void
-    (define (add-file-viewer filename parent label)
-      (define vp (make-object vertical-panel% parent))
-      (define t (make-object show-files-text%))
-      (define msg1 (make-object message% label vp))
-      (define msg2 (new message% 
-                        [label (gui-utils:quote-literal-label
-                                (path->string filename)
-                                #:quote-amp? #f)]
-                        [parent vp]))
-      (define ec (make-object editor-canvas% vp t))
-      (send ec min-height 400)
-      (send t load-file filename)
-      (send t hide-caret #t)
-      (send t lock #t))
-    
-    (define show-files-frame% frame:basic%)
-    (define show-files-text% text:keymap%)
-    
-    (main))
-  
-  ;; recover-file : (union #f (is-a?/c toplevel-window<%>)) 
-  ;;                (list (union #f string[filename]) string)
-  ;;             -> (union #f string)
-  (define (recover-file parent table-entry)
-    (let ([orig-name (or (car table-entry)
-                         (parameterize ([finder:dialog-parent-parameter parent])
-                           (finder:put-file #f #f #f
-                                            (string-constant autosave-restore-to-where?))))])
-      (and orig-name
-           (let ([autosave-name (cadr table-entry)])
-             (let ([tmp-name (and (file-exists? orig-name)
-                                  (make-temporary-file "autosave-repair~a" orig-name))])
-               (when (file-exists? orig-name)
-                 (delete-file orig-name))
-               (copy-file autosave-name orig-name)
-               (delete-file autosave-name)
-               (when tmp-name
-                 (delete-file tmp-name))
-               orig-name)))))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/bday.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/bday.rkt
deleted file mode 100644
index 2c49adbea5..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/bday.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang s-exp framework/private/decode
-
-       bZFPT8MwDMXv/RR
-    POzmHSC        sgAQeGE
-  Os  NAVp3Q          xzaxR0
-        VJEVJ           NolvT5
-         Kl3fi           T04t/z
-          45jF/          Rph32v
-          GNp2sl          XN1y3
-          0KNx7F         twehCg
-         KUtz1hkE        UI9BQ
-         QhQAfbAH       vajGB
-        +R4Mxjl5CJ     dA/1x
-       stUFF 2jLns    0es+e
-       H9XJ  V3dXra  lVX9
-      0+Py3   omXsXv1JD
-      cd4i    Zf0mizt
-     vebOX     C7HTL
-     Njn/K     ZKsm52
-    1bLzM       zYpw8
-    oPUGA       W6AcX2
-   pR6Mf         0OUAl
-   oc4/H          3h6iK
-  ucfJj           MMKhd
-  KIcIn            zeTCM
- fBpv5u            UcZ9en
-fFpE5i              VQnvBp
-K2P9C+               Aq8G8=
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/canvas.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/canvas.rkt
deleted file mode 100644
index 8ba2e1f2c4..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/canvas.rkt
+++ /dev/null
@@ -1,186 +0,0 @@
-#lang scheme/unit
-  (require mzlib/class
-           "sig.rkt"
-           "../preferences.rkt"
-           mred/mred-sig)
-  
-  (import mred^
-          [prefix frame: framework:frame^]
-          [prefix text: framework:text^]
-          [prefix color-prefs: framework:color-prefs^])
-  
-  (export (rename framework:canvas^
-                  (-color% color%)))
-  
-  (define basic<%> (interface ((class->interface editor-canvas%))))
-  (define basic-mixin
-    (mixin ((class->interface editor-canvas%)) (basic<%>)
-      (super-new)))
-  
-  (define color<%> (interface (basic<%>)))
-  
-  (define color-mixin
-    (mixin (basic<%>) (color<%>)
-      (define callback (λ (v) (set-canvas-background v)))
-      (super-new)
-      (inherit set-canvas-background)
-      (set-canvas-background (color-prefs:lookup-in-color-scheme 'framework:basic-canvas-background))
-      (color-prefs:register-color-scheme-entry-change-callback
-       'framework:basic-canvas-background callback #t)))
-  
-  (define delegate<%> (interface (basic<%>)))
-  
-  (define delegate-mixin
-    (mixin (basic<%>) (delegate<%>)
-      (inherit get-top-level-window)
-      (define/override (on-superwindow-show shown?)
-        (define delegatee (send (get-top-level-window) get-delegatee))
-        (when delegatee
-          (send delegatee set-start/end-para #f #f))
-        (super on-superwindow-show shown?))
-      (super-new)))
-  
-  (define info<%> (interface (basic<%>)))
-  ;; (basic<%> -> (class (is-a? (send this get-top-level-window) frame:info<%>)))
-  (define info-mixin 
-    (mixin (basic<%>) (info<%>)
-      (inherit has-focus? get-top-level-window)
-      (define/override (on-focus on?)
-        (super on-focus on?)
-        (send (get-top-level-window) set-info-canvas (and on? this))
-        (when on?
-          (send (get-top-level-window) update-info)))
-      (define/override (set-editor m [redraw? #t])
-        (super set-editor m redraw?)
-        (let ([tlw (get-top-level-window)])
-          (when (eq? this (send tlw get-info-canvas))
-            (send tlw update-info))))
-      
-      (super-new)
-      
-      (unless (is-a? (get-top-level-window) frame:info<%>)
-        (error 'canvas:text-info-mixin
-               "expected to be placed into a frame or dialog implementing frame:info<%>, got: ~e" 
-               (get-top-level-window)))
-      
-      (when (has-focus?)
-        (send (get-top-level-window) update-info))))
-  
-  (define wide-snip<%> (interface (basic<%>)
-                         recalc-snips
-                         add-wide-snip
-                         add-tall-snip))
-  
-  (define wide-snip-mixin
-    (mixin (basic<%>) (wide-snip<%>)
-      (inherit get-editor)
-      (define/private ((update-snip-size width?) s)
-        (let* ([width (box 0)]
-               [height (box 0)]
-               [leftm (box 0)]
-               [rightm (box 0)]
-               [topm (box 0)]
-               [bottomm (box 0)]
-               [left-edge-box (box 0)]
-               [top-edge-box (box 0)]
-               [snip-media (send s get-editor)]
-               [edit (get-editor)]        
-               [get-width
-                (let ([bl (box 0)]
-                      [br (box 0)])
-                  (λ (s)
-                    (send edit get-snip-location s bl #f #f)
-                    (send edit get-snip-location s br #f #t)
-                    (- (unbox br) (unbox bl))))]
-               [calc-after-width
-                (λ (s)
-                  (+ 4 ;; this is compensate for an autowrapping bug
-                     (let loop ([s s])
-                       (cond
-                         [(not s) 0]
-                         [(member 'hard-newline (send s get-flags)) (get-width s)]
-                         [(member 'newline (send s get-flags)) (get-width s)]
-                         [else
-                          (+ (get-width s)
-                             2 ;; for the caret
-                             (loop (send s next)))]))))])
-          (when edit
-            (send edit
-                  run-after-edit-sequence
-                  (λ ()
-                    (let ([admin (send edit get-admin)])
-                      (send admin get-view #f #f width height)
-                      (send s get-margin leftm topm rightm bottomm)
-                      
-                      
-                      ;; when the width is to be maximized and there is a
-                      ;; newline just behind the snip, we know that the left
-                      ;; edge is zero. Special case for efficiency in the 
-                      ;; console printer
-                      (let ([fallback
-                             (λ ()
-                               (send edit get-snip-location s left-edge-box top-edge-box))])
-                        (cond
-                          [(not width?) (fallback)]
-                          [(let ([prev (send s previous)])
-                             (and prev
-                                  (member 'hard-newline (send prev get-flags))))
-                           (set-box! left-edge-box 0)]
-                          [else (fallback)]))
-                      
-                      (if width?
-                          (let* ([after-width (calc-after-width (send s next))]
-                                 [snip-width (max 0 (- (unbox width)
-                                                       (unbox left-edge-box)
-                                                       (unbox leftm)
-                                                       (unbox rightm)
-                                                       after-width
-                                                       ;; this two is the space that 
-                                                       ;; the caret needs at the right of
-                                                       ;; a buffer.
-                                                       2))])
-                            (send* s 
-                              (set-min-width snip-width)
-                              (set-max-width snip-width))
-                            (when snip-media
-                              (send snip-media set-max-width
-                                    (if (send snip-media auto-wrap)
-                                        snip-width
-                                        0))))
-                          (let ([snip-height (max 0 (- (unbox height)
-                                                       (unbox top-edge-box)
-                                                       (unbox topm)
-                                                       (unbox bottomm)))])
-                            (send* s 
-                              (set-min-height snip-height)
-                              (set-max-height snip-height))))))))))
-      (define/public (recalc-snips)
-        (let ([editor (get-editor)])
-          (when editor
-            (unless (is-a? editor text:wide-snip<%>)
-              (error 'recalc-snips "expected a text:wide-snip<%> editor, instead ~e" editor))
-            (when (eq? (send editor get-canvas) this)
-              (for-each (update-snip-size #t) (send editor get-wide-snips))
-              (for-each (update-snip-size #f) (send editor get-tall-snips))))))
-      (define/public (add-wide-snip snip)
-        (let ([editor (get-editor)])
-          (unless (is-a? editor text:wide-snip<%>)
-            (error 'add-wide-snip "expected to have a text:wide-snip<%> editor, instead ~e" editor))
-          (send editor add-wide-snip snip))
-        ((update-snip-size #t) snip))
-      (define/public (add-tall-snip snip)
-        (let ([editor (get-editor)])
-          (unless (is-a? editor text:wide-snip<%>)
-            (error 'add-wide-snip "expected to have a text:wide-snip<%> editor, instead ~e" editor))
-          (send editor add-tall-snip snip))
-        ((update-snip-size #f) snip))
-      (define/override (on-size width height)
-        (recalc-snips)
-        (super on-size width height))
-      (super-new)))
-  
-  (define basic% (basic-mixin editor-canvas%))
-  (define -color% (color-mixin basic%))
-  (define info% (info-mixin basic%))
-  (define delegate% (delegate-mixin basic%))
-  (define wide-snip% (wide-snip-mixin basic%))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/collapsed-snipclass-helpers.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/collapsed-snipclass-helpers.rkt
deleted file mode 100644
index bda8c33d33..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/collapsed-snipclass-helpers.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class)
-
-(provide make-sexp-snipclass%)
-
-(define (make-sexp-snipclass% sexp-snip%)
-  (class snip-class%
-    (define/override (read in)
-      (define left-bracket (integer->char (bytes-ref (send in get-bytes) 0)))
-      (define right-bracket (integer->char (bytes-ref (send in get-bytes) 0)))
-      (define snip-count (send in get-exact))
-      (define saved-snips
-        (for/list ([in-range snip-count])
-          (define classname (bytes->string/utf-8 (send in get-bytes)))
-          (define snipclass (send (get-the-snip-class-list) find classname))
-          (send snipclass read in)))
-      (new sexp-snip%
-           [left-bracket left-bracket]
-           [right-bracket right-bracket]
-           [saved-snips saved-snips]))
-    (super-new)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/color-local-member-name.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/color-local-member-name.rkt
deleted file mode 100644
index e7c5b2b449..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/color-local-member-name.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require racket/class)
-(define-local-member-name tokenizing-give-up-early)
-(provide tokenizing-give-up-early)
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/color-model.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/color-model.rkt
deleted file mode 100644
index 6c48aa8f52..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/color-model.rkt
+++ /dev/null
@@ -1,264 +0,0 @@
-#lang scheme/unit
-(require "sig.rkt")
-
-  (import)
-  (export framework:color-model^)
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;;                                 ;;;
-  ;;;           matrix ops            ;;;
-  ;;;                                 ;;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; matrix inversion using cramer's rule
-  
-  ;; submatrix : (list-of (list-of num)) int int -> (list-of (list-of num))
-  ;; submatrix "crosses out" row i and column j from the matrix, returning a new one
-  
-  (define (submatrix source i j)
-    (let row-loop ([row 0])
-      (cond 
-        [(eq? row (length source)) null]
-        [(eq? row i) (row-loop (+ row 1))]
-        [else
-         (cons 
-          (let col-loop ([col 0])
-            (cond 
-              [(eq? col (length (car source))) null]
-              [(eq? col j) (col-loop (+ col 1))]
-              [else
-               (cons (list-ref (list-ref source row) col)
-                     (col-loop (+ col 1)))]))
-          (row-loop (+ row 1)))])))
-  
-  ;;(equal? (submatrix test-matrix 1 2)
-  ;;        '((1 2 6) (7 8 4)))
-  
-  ;; det : (list-of (list-of num)) -> num
-  
-  (define (det matrix)
-    (if (null? matrix)
-        1
-        (let loop ([row 0] [sign 1])
-          (if (= row (length matrix))
-              0
-              (+ (* sign
-                    (list-ref (list-ref matrix row) 0)
-                    (det (submatrix matrix row 0)))
-                 (loop (+ row 1) (- sign)))))))
-  
-  ;;(define square-test-matrix '((3 20 3) (37 0 8) (2 1 4)))
-  
-  ;;(= (det square-test-matrix) -2553)
-  
-  ;; invert : (list-of (list-of num)) -> (list-of (list-of num))
-  
-  (define (matrix-invert matrix)
-    (let-values ([(width height) (matrix-dimension matrix)])
-      (when (not (= width height))
-        (error 'invert "matrix is not square: ~s" matrix))
-      (let ([delta-inv (/ 1 (det matrix))])
-        (let row-loop ([row 0] [sign 1])
-          (if (= row (length matrix))
-              null
-              (cons 
-               (let col-loop ([col 0] [sign sign])
-                 (if (= col (length (car matrix)))
-                     null
-                     (cons (* delta-inv
-                              sign
-                              (det (submatrix matrix col row)))
-                           (col-loop (+ col 1) (- sign)))))
-               (row-loop (+ row 1) (- sign))))))))
-  
-  ;;(equal? (matrix-invert square-test-matrix)
-  ;;        '((8/2553 77/2553 -160/2553) (44/851 -2/851 -29/851) (-1/69 -1/69 20/69)))
-  
-  ;; matrix-dimension : (list-of (list-of num)) -> (values num num)  
-  ;; takes a matrix, returns width and height
-  
-  (define (matrix-dimension matrix)
-    (when (not (pair? matrix))
-      (error 'matrix-dimension "matrix argument is not a list: ~s" matrix))
-    (let ([height (length matrix)])
-      (when (= height 0)
-        (error 'matrix-dimension "matrix argument is empty: ~s" matrix))
-      (when (not (pair? (car matrix)))
-        (error 'matrix-dimension "matrix row is not a list: ~s" (car matrix)))
-      (let ([width (length (car matrix))])
-        (when (= width 0)
-          (error 'matrix-dimension "matrix argument has width 0: ~s" matrix))
-        (let loop ([rows matrix])
-          (if (null? rows)
-              (values width height)
-              (begin
-                (when (not (pair? (car rows)))
-                  (error 'matrix-dimension "row is not a list: ~s" (car rows)))
-                (when (not (= width (length (car rows))))
-                  (error 'matrix-dimension "rows have different widths: ~s and ~s" width (length (car rows))))
-                (loop (cdr rows))))))))
-  
-  ;; transpose : (list-of (list-of num)) -> (list-of (list-of num))
-  (define (transpose vector) (apply map list vector))
-  
-  
-  ;; test code
-  ;;(equal? (transpose '((3 2 1) (9 8 7))) '((3 9) (2 8) (1 7)))
-  
-  ;; inner-product : (list-of num) (list-of num) -> num
-  (define (inner-product a b)
-    (foldl + 0 (map * a b)))
-  
-  ;; test code
-  ;; (= (inner-product '(4 1 3) '(0 3 4)) 15)
-  
-  ;; matrix-multiply: (list-of (list-of num)) (list-of (list-of num)) -> (list-of (list-of num))
-  ;; multiplies the two matrices.
-  (define (matrix-multiply a b)
-    (let-values ([(width-a height-a) (matrix-dimension a)]
-                 [(width-b height-b) (matrix-dimension b)])
-      (when (not (= width-a height-b))
-        (error 'matrix-multiply "matrix dimensions do not match for multiplication"))
-      (let ([b-t (transpose b)])
-        (map (λ (row)
-               (map (λ (col)
-                      (inner-product row col))
-                    b-t))
-             a))))
-  
-  ;; test code
-  ;; (equal? (matrix-multiply '((1 2 3 4) (9 8 3 2)) '((0) (2) (0) (3)))
-  ;;         '((16) (22)))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;;                                 ;;;
-  ;;;           color model           ;;;
-  ;;;                                 ;;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; ITU reccommendation phosphors:
-  
-  ;;    red green blue
-  ;;x   0.64 0.29 0.15
-  ;;y   0.33 0.60 0.06
-  ;;
-  ;; white point: 
-  ;; c : x-w = 0.313, y-w = 0.329, big-y-w = 100.0
-  
-  (define x-r 0.64)
-  (define y-r 0.33)
-  (define x-g 0.29)
-  (define y-g 0.60)
-  (define x-b 0.15)
-  (define y-b 0.06)
-  
-  (define z-r (- 1 x-r y-r))
-  (define z-g (- 1 x-g y-g))
-  (define z-b (- 1 x-b y-b))
-  
-  (define x-w 0.313)
-  (define y-w 0.329)
-  (define big-y-w 100.0)
-  
-  (define-struct xyz (x y z))
-  
-  (define (xy-big-y->xyz x y big-y)
-    (let ([sigma (/ big-y y)])
-      (make-xyz
-       (* x sigma)
-       (* y sigma)
-       (* (- 1 x y) sigma))))
-  
-  (define xyz-white (xy-big-y->xyz x-w y-w big-y-w))
-  
-  ;;`((,(xyz-x xyz-white) ,x-r ,x-g ,x-b)
-  ;;  (,(xyz-y xyz-white) ,y-r ,y-g ,y-b)
-  ;;  (,(xyz-z xyz-white) ,z-r ,z-g ,z-b))
-  
-  ;; sigmas were calculated by soving a set of linear equations based upon ntsc standard phosphors
-  
-  (define pre-matrix `((,x-r ,x-g ,x-b)
-                       (,y-r ,y-g ,y-b)
-                       (,z-r ,z-g ,z-b)))
-  
-  (define-values (sigma-r sigma-g sigma-b)
-    (let* ([inversion 
-            (matrix-invert pre-matrix)]
-           [sigmas
-            (matrix-multiply inversion `((,(xyz-x xyz-white))
-                                         (,(xyz-y xyz-white))
-                                         (,(xyz-z xyz-white))))])
-      (apply values (car (transpose sigmas)))))
-  
-  ;; (printf "should be equal to xyz-white: \n~a\n"
-  ;;    (matrix-multiply pre-matrix `((,sigma-r) (,sigma-g) (,sigma-b))))
-  
-  (define rgb->xyz-matrix
-    (map (λ (row)
-           (map (λ (row-elt scalar) (* row-elt scalar 1/255)) row `(,sigma-r ,sigma-g ,sigma-b)))
-         pre-matrix))
-  
-  (define xyz->rgb-matrix
-    (matrix-invert rgb->xyz-matrix))
-  
-  ;;(printf "should be identity: \n~a\n" (matrix-multiply rgb->xyz-matrix xyz->rgb-matrix))
-  
-  (define (rgb->xyz r g b)
-    (apply make-xyz (car (transpose (matrix-multiply rgb->xyz-matrix (transpose `((,r ,g ,b))))))))
-  
-  ;;(print-struct #t)
-  ;; (printf "should be xyz-white: \n~a\n" (rgb->xyz 255 255 255))
-  
-  (define (xyz->rgb x y z)
-    (car (transpose (matrix-multiply xyz->rgb-matrix (transpose `((,x ,y ,z)))))))
-  
-  ;;l* = 116(y/big-y-n)^1/3 - 16, y/big-y-n > 0.01
-  ;;u* = 13 l*(u-p - u-p-n)
-  ;;v* = 13 l*(v-p - v-p-n)
-  ;;
-  ;;u-p = (4x)/(x+15y+3z)   v-p = (9y)/(x+15y+3z)
-  ;;u-p-n = (same but with -n) v-p-n = (same but with -n)
-  
-  ;; the following transformation is undefined if the y component
-  ;; is zero.  So if it is, we bump it up a little.
-  
-  (define (xyz-tweak xyz)
-    (let* ([y (xyz-y xyz)])
-      (make-xyz (xyz-x xyz) (if (< y 0.01) 0.01 y) (xyz-z xyz))))
-  
-  (define-struct luv (l u v))
-  
-  (define (xyz-denom xyz)
-    (+ (xyz-x xyz) (* 15 (xyz-y xyz)) (* 3 (xyz-z xyz))))
-  
-  (define (xyz-u-p xyz)
-    (/ (* 4 (xyz-x xyz)) (xyz-denom xyz)))
-  
-  (define (xyz-v-p xyz)
-    (/ (* 9 (xyz-y xyz)) (xyz-denom xyz)))
-  
-  (define (xyz->luv xyz)
-    (let ([xyz (xyz-tweak xyz)])
-      (let* ([l (- (* 116 (expt (/ (xyz-y xyz) (xyz-y xyz-white))
-                                1/3))
-                   16)]
-             [u-p (xyz-u-p xyz)]
-             [u-p-white (xyz-u-p xyz-white)]
-             [v-p (xyz-v-p xyz)]
-             [v-p-white (xyz-v-p xyz-white)])
-        (make-luv l (* 13 l (- u-p u-p-white)) (* 13 l (- v-p v-p-white))))))
-  
-  (define (luv-distance a b)
-    (expt (+ (expt (- (luv-l a) (luv-l b)) 2)
-             (expt (- (luv-u a) (luv-u b)) 2)
-             (expt (- (luv-v a) (luv-v b)) 2))
-          1/2))
-  
-  (define (rgb-color-distance r-a g-a b-a r-b g-b b-b)
-    (let* ([luv-a (xyz->luv (rgb->xyz r-a g-a b-a))]
-           [luv-b (xyz->luv (rgb->xyz r-b g-b b-b))])
-      (luv-distance luv-a luv-b)))
-  
-  ;;(rgb-color-distance 0 0 0 0 0 0)
-  ;; (print-struct #t)
-  ;; (xyz->luv (make-xyz 95.0 100.0 141.0))
-  ;; (xyz->luv (make-xyz 60.0 80.0 20.0))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/color-prefs.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/color-prefs.rkt
deleted file mode 100644
index 48834ffb2c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/color-prefs.rkt
+++ /dev/null
@@ -1,1078 +0,0 @@
-#lang racket/unit
-  (require racket/class
-           racket/gui/base
-           string-constants
-           racket/match
-           racket/contract/base
-           racket/set
-           setup/getinfo
-           setup/collects
-           string-constants
-           racket/pretty
-           "../preferences.rkt"
-           "sig.rkt")
-  
-  (import [prefix preferences: framework:preferences^]
-          [prefix editor: framework:editor^]
-          [prefix panel: framework:panel^]
-          [prefix canvas: framework:canvas^]
-          [prefix racket: framework:racket^]
-          [prefix color: framework:color^])
-  (export framework:color-prefs^)
-  (init-depend framework:editor^)
-  
-  (define standard-style-list-text% (editor:standard-style-list-mixin text%))
-  
-  ;; build-color-selection-panel : (is-a?/c area-container<%>) symbol string string -> void
-  ;; constructs a panel containg controls to configure the preferences panel.
-  (define (build-color-selection-panel parent pref-sym style-name example-text 
-                                       #:background? [background? #f])
-    (define (get-from-pref-sym)
-      (if (set-member? known-style-names pref-sym)
-          (lookup-in-color-scheme pref-sym)
-          (preferences:get pref-sym)))
-    (define (set-via-pref-sym delta) 
-      (if (set-member? known-style-names pref-sym)
-          (set-in-color-scheme pref-sym delta)
-          (preferences:set pref-sym delta)))
-    (define (add-pref-sym-callback f) 
-      (if (set-member? known-style-names pref-sym)
-          (register-color-scheme-entry-change-callback pref-sym f)
-          (preferences:add-callback pref-sym (λ (p sd) (f sd)))))
-    (define (update-style-delta func)
-      (let ([working-delta (new style-delta%)])
-        (send working-delta copy (get-from-pref-sym))
-        (func working-delta)
-        (set-via-pref-sym working-delta)))
-    (define hp (new horizontal-panel%
-                    [parent parent]
-                    [style '(border)]
-                    [alignment '(center top)]
-                    [stretchable-height #f]))
-    
-    (define e (new (class standard-style-list-text%
-                     (inherit change-style get-style-list)
-                     (define/augment (after-insert pos offset)
-                       (inner (void) after-insert pos offset)
-                       (let ([style (send (get-style-list)
-                                          find-named-style
-                                          style-name)])
-                         (change-style style pos (+ pos offset) #f)))
-                     (super-new))))
-    (define c (new canvas:color%
-                   [parent hp]
-                   [min-width 150]
-                   [editor e]
-                   [stretchable-height #t]
-                   [style '(hide-hscroll hide-vscroll)]))
-    
-    (define (make-check name on off)
-      (let* ([c (λ (check command)
-                  (if (send check get-value)
-                      (update-style-delta on)
-                      (update-style-delta off)))]
-             [check (new check-box% 
-                         [label name]
-                         [parent hp]
-                         [callback c])])
-        check))
-    
-    (define slant-check
-      (make-check (string-constant cs-italic)
-                  (λ (delta)
-                    (send delta set-style-on 'italic)
-                    (send delta set-style-off 'base))
-                  (λ (delta)
-                    (send delta set-style-on 'normal)
-                    (send delta set-style-off 'base))))
-    (define bold-check
-      (make-check (string-constant cs-bold)
-                  (λ (delta)
-                    (send delta set-weight-on 'bold)
-                    (send delta set-weight-off 'base))
-                  (λ (delta)
-                    (send delta set-weight-on 'normal)
-                    (send delta set-weight-off 'base))))
-    (define underline-check
-      (make-check (string-constant cs-underline)
-                  (λ (delta)
-                    (send delta set-underlined-on #t)
-                    (send delta set-underlined-off #f))
-                  (λ (delta)
-                    (send delta set-underlined-off #f)
-                    (send delta set-underlined-on #f))))
-    
-    (define smoothing-options
-      '(default
-         partly-smoothed
-         smoothed
-         unsmoothed))
-    (define smoothing-option-strings
-      '("Default"
-        "Partly smoothed"
-        "Smoothed"
-        "Unsmoothed"))
-    
-    (define (smoothing->index s)
-      (let loop ([i 0]
-                 [l smoothing-options])
-        (cond
-          [(null? l) 
-           ;; if it is something strange or it is 'base, we go with 'default (which is 0)
-           0]
-          [else
-           (if (eq? (car l) s)
-               i
-               (loop (+ i 1)
-                     (cdr l)))])))
-    
-    (define smoothing-menu
-      (new choice%
-           [label #f]
-           [parent hp]
-           [choices smoothing-option-strings]
-           [callback 
-            (λ (c e)
-              (update-style-delta
-               (λ (delta)
-                 (send delta set-smoothing-on 
-                       (list-ref smoothing-options
-                                 (send c get-selection))))))]))
-    
-    (define fore/back-panel
-      (and background? 
-           (new vertical-pane%
-                [parent hp]
-                [stretchable-width #f]
-                [stretchable-height #f])))
-    
-    (define foreground-color-button
-      (and (>= (get-display-depth) 8)
-           (new button%
-                [label (if background? 
-                           (string-constant cs-foreground-color)
-                           (string-constant cs-change-color))]
-                [parent (if background? 
-                            fore/back-panel
-                            hp)]
-                [callback
-                 (λ (color-button evt)
-                   (let* ([add (send (get-from-pref-sym) get-foreground-add)]
-                          [color (make-object color%
-                                   (send add get-r)
-                                   (send add get-g)
-                                   (send add get-b))]
-                          [users-choice
-                           (get-color-from-user
-                            (format (string-constant syntax-coloring-choose-color) example-text)
-                            (send color-button get-top-level-window)
-                            color
-                            '(alpha))])
-                     (when users-choice
-                       (update-style-delta
-                        (λ (delta)
-                          (send delta set-delta-foreground users-choice))))))])))
-    (define background-color-button
-      (and (>= (get-display-depth) 8)
-           background?
-           (new button%
-                [label (string-constant cs-background-color)]
-                [parent (if background? 
-                            fore/back-panel
-                            hp)]
-                [callback
-                 (λ (color-button evt)
-                   (let* ([add (send (get-from-pref-sym) get-background-add)]
-                          [color (make-object color%
-                                   (send add get-r)
-                                   (send add get-g)
-                                   (send add get-b))]
-                          [users-choice
-                           (get-color-from-user
-                            (format (string-constant syntax-coloring-choose-color) example-text)
-                            (send color-button get-top-level-window)
-                            color
-                            '(alpha))])
-                     (when users-choice
-                       (update-style-delta
-                        (λ (delta)
-                          (send delta set-delta-background users-choice))))))])))
-    
-    (define style (send (send e get-style-list) find-named-style style-name))
-    
-    (send c set-line-count 1)
-    (send c allow-tab-exit #t)
-    
-    (send e insert example-text)
-    (send e set-position 0)
-    
-    (send slant-check set-value (or (eq? (send style get-style) 'slant)
-                                    (eq? (send style get-style) 'italic)))
-    (send bold-check set-value (eq? (send style get-weight) 'bold))
-    (send underline-check set-value (send style get-underlined))
-    (send smoothing-menu set-selection (smoothing->index (send style get-smoothing)))
-    
-    (send hp reflow-container)
-    (when (> (send c get-height) 50)
-      (send c set-line-count #f)
-      (send c min-height 50)
-      (send c stretchable-height #f))
-    
-    (add-pref-sym-callback
-     (λ (sd)
-       (send slant-check set-value (or (equal? (send style get-style) 'slant)
-                                       (equal? (send style get-style) 'italic)))
-       (send bold-check set-value (equal? (send sd get-weight-on) 'bold))
-       (send underline-check set-value (send sd get-underlined-on))
-       (send smoothing-menu set-selection (smoothing->index (send sd get-smoothing-on)))))
-    (void))
-  
-  (define (add/mult-set m v)
-    (send m set (car v) (cadr v) (caddr v)))
-  
-  (define (add/mult-get m)
-    (let ([b1 (box 0)]
-          [b2 (box 0)]
-          [b3 (box 0)])
-      (send m get b1 b2 b3)
-      (map unbox (list b1 b2 b3))))
-  
-  (define style-delta-get/set
-    (let ([lo3n (λ (x) (and (list? x) (= (length x) 3) (andmap number? x)))])
-      (list (list (λ (x) (send x get-alignment-off))
-                  (λ (x v) (send x set-alignment-off v))
-                  (λ (x) (memq x '(base top center bottom))))
-            
-            (list (λ (x) (send x get-alignment-on))
-                  (λ (x v) (send x set-alignment-on v))
-                  (λ (x) (memq x '(base top center bottom))))
-            
-            (list (λ (x) (add/mult-get (send x get-background-add)))
-                  (λ (x v) (add/mult-set (send x get-background-add) v))
-                  lo3n)
-            
-            (list (λ (x) (add/mult-get (send x get-background-mult)))
-                  (λ (x v) (add/mult-set (send x get-background-mult) v))
-                  lo3n)
-            
-            (list (λ (x) (send x get-face))
-                  (λ (x v) (send x set-face v))
-                  (λ (x) (or (string? x) (not x))))
-            
-            (list (λ (x) (send x get-family))
-                  (λ (x v) (send x set-family v))
-                  (λ (x) (memq x '(base default decorative roman script swiss modern symbol system))))
-            
-            (list (λ (x) (add/mult-get (send x get-foreground-add)))
-                  (λ (x v) (add/mult-set (send x get-foreground-add) v))
-                  lo3n)
-            
-            (list (λ (x) (add/mult-get (send x get-foreground-mult)))
-                  (λ (x v) (add/mult-set (send x get-foreground-mult) v))
-                  lo3n)
-            
-            (list (λ (x) (send x get-size-add))
-                  (λ (x v) (send x set-size-add v))
-                  (λ (x) (and (integer? x) (exact? x) (<= 0 x 255))))
-            
-            (list (λ (x) (send x get-size-mult))
-                  (λ (x v) (send x set-size-mult v))
-                  (λ (x) (and (number? x) (real? x))))
-            
-            (list (λ (x) (send x get-style-off))
-                  (λ (x v) (send x set-style-off v))
-                  (λ (x) (memq x '(base normal italic slant))))
-            
-            (list (λ (x) (send x get-style-on))
-                  (λ (x v) (send x set-style-on v))
-                  (λ (x) (memq x '(base normal italic slant))))
-            
-            (list (λ (x) (send x get-underlined-off))
-                  (λ (x v) (send x set-underlined-off v))
-                  boolean?)
-            
-            (list (λ (x) (send x get-underlined-on))
-                  (λ (x v) (send x set-underlined-on v))
-                  boolean?)
-            
-            (list (λ (x) (send x get-weight-off))
-                  (λ (x v) (send x set-weight-off v))
-                  (λ (x) (memq x '(base normal bold light))))
-            
-            (list (λ (x) (send x get-weight-on))
-                  (λ (x v) (send x set-weight-on v))
-                  (λ (x) (memq x '(base normal bold light)))))))
-  
-  (define (marshall-style-delta style)
-    (map (λ (fs) ((car fs) style)) style-delta-get/set))
-  
-  (define (unmarshall-style-delta info)
-    (let ([style (make-object style-delta%)])
-      
-      (when (list? info)
-        (let loop ([style-delta-get/set style-delta-get/set]
-                   [info info])
-          (cond
-            [(null? info) (void)]
-            [(null? style-delta-get/set) (void)]
-            [else (let ([v (car info)]
-                        [fs (car style-delta-get/set)])
-                    (when ((list-ref fs 2) v)
-                      ((list-ref fs 1) style v))
-                    (loop (cdr style-delta-get/set)
-                          (cdr info)))])))
-      
-      style))
-  
-  (define (make-style-delta color bold? underline? italic? #:background [background #f])
-    (define sd (make-object style-delta%))
-    (send sd set-delta-foreground color)
-    (cond
-      [bold?
-       (send sd set-weight-on 'bold)
-       (send sd set-weight-off 'base)]
-      [else
-       (send sd set-weight-on 'base)
-       (send sd set-weight-off 'bold)])
-    (send sd set-underlined-on underline?)
-    (send sd set-underlined-off (not underline?))
-    (cond
-      [italic?
-       (send sd set-style-on 'italic)
-       (send sd set-style-off 'base)]
-      [else
-       (send sd set-style-on 'base)
-       (send sd set-style-off 'italic)])
-    (when background
-      (send sd set-delta-background background))
-    sd)
-  
-  (define (add-background-preferences-panel)
-    (preferences:add-panel
-     (list (string-constant preferences-colors)
-           (string-constant background-color))
-     (λ (parent)
-       (let ([vp (new vertical-panel% (parent parent) (alignment '(left top)))])
-         (add-solid-color-config (string-constant background-color)
-                                 vp
-                                 'framework:basic-canvas-background)
-         (add-solid-color-config (string-constant basic-gray-paren-match-color)
-                                 vp
-                                 'framework:paren-match-color)
-         (build-text-foreground-selection-panel vp
-                                                'framework:default-text-color
-                                                (editor:get-default-color-style-name)
-                                                (string-constant default-text-color))
-         
-         (build-text-foreground-selection-panel vp
-                                                'framework:misspelled-text-color
-                                                color:misspelled-text-color-style-name
-                                                (string-constant misspelled-text-color))
-         
-         (let* ([choice (new choice% 
-                             [label (string-constant parenthesis-color-scheme)]
-                             [parent vp]
-                             [choices (map (λ (x) (list-ref x 1)) 
-                                           (color:get-parenthesis-colors-table))]
-                             [callback
-                              (λ (choice _)
-                                (preferences:set 'framework:paren-color-scheme
-                                                 (car (list-ref (color:get-parenthesis-colors-table)
-                                                                (send choice get-selection)))))])]
-                [update-choice
-                 (lambda (v)
-                   (send choice set-string-selection 
-                         (cadr (or (assoc v (color:get-parenthesis-colors-table))
-                                   (car (color:get-parenthesis-colors-table))))))])
-           (preferences:add-callback 
-            'framework:paren-color-scheme
-            (λ (p v)
-              (update-choice v)))
-           (update-choice (preferences:get 'framework:paren-color-scheme)))))))
-    
-  (define (build-text-foreground-selection-panel parent pref-sym style-name example-text)
-    (define hp (new horizontal-panel% 
-                    (parent parent)
-                    (style '(border))
-                    (stretchable-height #f)))
-    (define e (new (class standard-style-list-text%
-                     (inherit change-style get-style-list)
-                     (define/augment (after-insert pos offset)
-                       (inner (void) after-insert pos offset)
-                       (let ([style (send (get-style-list)
-                                          find-named-style
-                                          style-name)])
-                         (change-style style pos (+ pos offset) #f)))
-                     (super-new))))
-    (define c (new canvas:color%
-                   (parent hp)
-                   (editor e)
-                   (style '(hide-hscroll
-                            hide-vscroll))))
-    (define color-button
-      (and (>= (get-display-depth) 8)
-           (make-object button%
-             (string-constant cs-change-color)
-             hp
-             (λ (color-button evt)
-               (let ([users-choice
-                      (get-color-from-user
-                       (format (string-constant syntax-coloring-choose-color) example-text)
-                       (send color-button get-top-level-window)
-                       (lookup-in-color-scheme pref-sym)
-                       '(alpha))])
-                 (when users-choice
-                   (set-in-color-scheme pref-sym users-choice)))))))
-    (define style (send (send e get-style-list) find-named-style style-name))
-    
-    (send c set-line-count 1)
-    (send c allow-tab-exit #t)
-    
-    (send e insert example-text)
-    (send e set-position 0))
-  
-  (define (add-solid-color-config label parent pref-id)
-    (define panel (new vertical-panel% (parent parent) (stretchable-height #f)))
-    (define hp (new horizontal-panel% (parent panel) (stretchable-height #f)))
-    (define msg (new message% (parent hp) (label label)))
-    (define canvas
-      (new canvas%
-           (parent hp)
-           (paint-callback
-            (λ (c dc)
-              (draw (lookup-in-color-scheme pref-id))))))
-    (define (draw clr)
-      (define dc (send canvas get-dc))
-      (define-values (w h) (send canvas get-client-size))
-      (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-      (send dc set-brush (if (preferences:get 'framework:white-on-black?)
-                             "black"
-                             "white")
-            'solid)
-      (send dc draw-rectangle 0 0 w h)
-      (send dc set-brush (send the-brush-list find-or-create-brush clr 'solid))
-      (send dc draw-rectangle 0 0 w h))
-    (define button
-      (new button% 
-           (label (string-constant cs-change-color))
-           (parent hp)
-           (callback
-            (λ (x y)
-              (define color (get-color-from-user
-                             (string-constant choose-a-background-color)
-                             (send hp get-top-level-window)
-                             (lookup-in-color-scheme pref-id)
-                             '(alpha)))
-              (when color
-                (set-in-color-scheme pref-id color))))))
-    (register-color-scheme-entry-change-callback
-     pref-id
-     (λ (v) 
-       ;; the pref should be updated on the next event callback
-       (queue-callback (λ () (send canvas refresh)))))
-    panel)
-
-  ;; add-to-preferences-panel : string (vertical-panel -> void) -> void
-  (define (add-to-preferences-panel panel-name func)
-    (preferences:add-panel
-     (list (string-constant preferences-colors) panel-name)
-     (λ (parent)
-       (let ([panel (new vertical-panel% (parent parent))])
-         (func panel)
-         panel))))
-  
-  ;; see docs
-  (define (register-color-preference pref-name style-name color/sd 
-                                     [white-on-black-color #f]
-                                     [use-old-marshalling? #t]
-                                     #:background [background #f])
-    (let ([sd (cond 
-                [(is-a? color/sd style-delta%)
-                 color/sd]
-                [else
-                 (let ([sd (new style-delta%)])
-                   (send sd set-delta-foreground color/sd)
-                   sd)])])
-      
-      (when background
-        (send sd set-delta-background background))
-      
-      (preferences:set-default pref-name sd (λ (x) (is-a? x style-delta%)))
-      (when white-on-black-color
-        (set! color-scheme-colors
-              (cons (list pref-name
-                          color/sd
-                          (to-color white-on-black-color))
-                    color-scheme-colors)))
-      (preferences:set-un/marshall pref-name marshall-style-delta unmarshall-style-delta)
-      (preferences:add-callback pref-name
-                                (λ (sym v)
-                                  (editor:set-standard-style-list-delta style-name v)))
-      (editor:set-standard-style-list-delta style-name (preferences:get pref-name))))
-  
-  (define color-scheme-colors '())
-  
-  (define (set-default/color-scheme pref-sym black-on-white white-on-black)
-    (let ([bw-c (to-color black-on-white)]
-          [wb-c (to-color white-on-black)])
-      (set! color-scheme-colors
-            (cons (list pref-sym 
-                        (to-color black-on-white)
-                        (to-color white-on-black))
-                  color-scheme-colors))
-      
-      (preferences:set-default pref-sym bw-c (λ (x) (is-a? x color%)))
-      (preferences:set-un/marshall 
-       pref-sym
-       (λ (clr) (list (send clr red) (send clr green) (send clr blue) (send clr alpha)))
-       unmarshall-color)
-      (void)))
-  
-(define (unmarshall-color lst)
-  (match lst
-    [(list (? byte? red) (? byte? green) (? byte? blue))
-     ;; old prefs-- before there were no alpha components to color% objects
-     ;; and so only r/g/b was saved.
-     (make-object color% red green blue)]
-    [(list (? byte? red) (? byte? green) (? byte? blue) (? (between/c 0 1) α))
-     (make-object color% red green blue α)]
-    [else #f]))
-
-  (define (to-color c)
-    (cond
-      [(is-a? c color%) c]
-      [(is-a? c style-delta%)
-       (let ([m (send c get-foreground-mult)])
-         (unless (and (= 0 (send m get-r))
-                      (= 0 (send m get-g))
-                      (= 0 (send m get-b)))
-           (error 'register-color-scheme
-                  "expected a style delta with foreground-mult that is all zeros"))
-         (let ([add (send c get-foreground-add)])
-           (make-object color% 
-             (send add get-r)
-             (send add get-g)
-             (send add get-b))))]
-      [(string? c)
-       (or (send the-color-database find-color c)
-           (error 'register-color-scheme 
-                  "did not find color ~s in the-color-database"
-                  c))]))
-  
-  (define (black-on-white) (do-colorization cadr))
-  (define (white-on-black) (do-colorization caddr))
-  (define (do-colorization sel)
-    (for-each (λ (l) 
-                (let* ([p (car l)]
-                       [color (sel l)]
-                       [old (preferences:get p)])
-                  (cond
-                    [(is-a? old color%)
-                     (preferences:set p color)]
-                    [(is-a? old style-delta%)
-                     (send old set-delta-foreground color)
-                     (preferences:set p old)])))
-              color-scheme-colors))
-
-
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;                  ;;;                                 ;;;                                        
-;                  ;;;                                 ;;;                                        
-;    ;;;     ;;;   ;;;   ;;;   ;;; ;;    ;;;;    ;;;   ;;; ;;    ;;;;  ;;; ;; ;;;    ;;;;   ;;;;  
-;   ;;;;;   ;;;;;  ;;;  ;;;;;  ;;;;;    ;;; ;;  ;;;;;  ;;;;;;;  ;; ;;; ;;;;;;;;;;;  ;; ;;; ;;; ;; 
-;  ;;;  ;; ;;; ;;; ;;; ;;; ;;; ;;;      ;;;    ;;;  ;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;; ;;;    
-;  ;;;     ;;; ;;; ;;; ;;; ;;; ;;;       ;;;;  ;;;     ;;; ;;; ;;;;;;; ;;; ;;; ;;; ;;;;;;;  ;;;;  
-;  ;;;  ;; ;;; ;;; ;;; ;;; ;;; ;;;         ;;; ;;;  ;; ;;; ;;; ;;;     ;;; ;;; ;;; ;;;        ;;; 
-;   ;;;;;   ;;;;;  ;;;  ;;;;;  ;;;      ;; ;;;  ;;;;;  ;;; ;;;  ;;;;;; ;;; ;;; ;;;  ;;;;;; ;; ;;; 
-;    ;;;     ;;;   ;;;   ;;;   ;;;       ;;;;    ;;;   ;;; ;;;   ;;;;  ;;; ;;; ;;;   ;;;;   ;;;;  
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-
-(define default-example
-  (string-append
-   "#lang racket   ; draw a graph of\n"
-   "(require plot) ; cos and log\n"
-   "(plot #:label \"y = cos(x) & y = log(x)\"\n"
-   "      (list (function cos -5 5) (function log -5 5)))\n"
-   "\"an unclosed string is an error"))
-
-(struct color-scheme (name button-label white-on-black-base? mapping example) #:transparent)
-(define black-on-white-color-scheme-name 'classic)
-(define white-on-black-color-scheme-name 'white-on-black)
-(define known-color-schemes
-  ;; note:first item in this list must be the black-on-white color scheme
-  ;; and the second must the white-on-black color scheme
-  (list (color-scheme black-on-white-color-scheme-name
-                      (string-constant classic-color-scheme)
-                      #f (make-hash) default-example)
-        (color-scheme white-on-black-color-scheme-name
-                      (string-constant white-on-black-color-scheme)
-                      #t (make-hash) default-example)))
-
-(define color-change-callbacks (make-hash))
-
-(define known-color-names (set))
-(define known-style-names (set))
-
-(define (get-color-scheme-names) (values known-color-names known-style-names))
-
-(define-logger color-scheme)
-
-(define (register-info-based-color-schemes)
-  (log-color-scheme-info
-   "color-names: ~a\nstyle-names:\n~a\n" 
-   (sort (set->list known-color-names) symbol<?)
-   (sort (set->list known-style-names) symbol<?))
-  (define preferred-color-scheme (preferences:get 'framework:color-scheme))
-  (for ([dir (in-list (find-relevant-directories '(framework:color-schemes)))])
-    (define info (get-info/full dir))
-    (when info
-      (define cs-info (info 'framework:color-schemes))
-      (cond
-        [(info-file-result-check? cs-info)
-         (for ([one-scheme (in-list cs-info)])
-           (define name (hash-ref one-scheme 'name 
-                                  (λ ()
-                                    (define d (path->module-path dir))
-                                    (if (path-string? d)
-                                        (format "~a" d)
-                                        (format "~s" d)))))
-           (define white-on-black-base? (hash-ref one-scheme 'white-on-black-base? #f))
-           (define mapping (hash-ref one-scheme 'colors '()))
-           (define example (hash-ref one-scheme 'example default-example))
-           (register-color-scheme (if (symbol? name)
-                                      (if (string-constant? name)
-                                          (dynamic-string-constant name)
-                                          (symbol->string name))
-                                      name)
-                                  white-on-black-base?
-                                  mapping
-                                  example))]
-        [else
-         (when cs-info
-           (log-color-scheme-warning
-            "expected something matching:\n~a\nfor framework:color-schemes in ~a, got\n~a"
-            (pretty-format (contract-name info-file-result-check?))
-            dir
-            (pretty-format cs-info)))])))
-  ;; the color-scheme saved in the user's preferences may not be known
-  ;; until after the code above executes, which would mean that the 
-  ;; color scheme in effect up to that point may be wrong. So fix that here:
-  (set-current-color-scheme preferred-color-scheme #t))
-
-
-;; register-color-scheme : string boolean? (listof (cons/c symbol? (listof props)) -> void
-;; props = (or/c 'bold 'italic 'underline 
-;;              
-;; called based on the contents of info.rkt files
-(define (register-color-scheme scheme-name white-on-black-base? mapping example)
-  (define (good-line? line)
-    (or (set-member? known-color-names (car line))
-        (set-member? known-style-names (car line))))
-  (for ([x (in-list mapping)])
-    (unless (good-line? x)
-      (log-color-scheme-warning "unknown style/color name: ~s" x)))
-  (set! known-color-schemes
-        (append known-color-schemes
-                (list
-                 (color-scheme
-                  (if (symbol? scheme-name)
-                      scheme-name
-                      (string->symbol scheme-name))
-                  (if (symbol? scheme-name)
-                      (dynamic-string-constant scheme-name)
-                      scheme-name)
-                  white-on-black-base?
-                  (make-hash
-                   (for/list ([line (in-list mapping)]
-                              #:when (good-line? line))
-                     (define name (car line))
-                     (cons name
-                           (cond
-                             [(set-member? known-color-names name)
-                              (props->color (cdr line))]
-                             [(set-member? known-style-names name)
-                              (props->style-delta (cdr line))]))))
-                  example)))))
-
-(define valid-props? 
-  (listof (or/c 'bold 'italic 'underline
-                (vector/c byte? byte? byte? #:flat? #t)
-                (vector/c byte? byte? byte? (between/c 0.0 1.0) #:flat? #t))))
-
-(define (valid-key-values? h)
-  (for/or ([(k v) (in-hash h)])
-    (cond
-      [(equal? k 'name) (or (string? v) (symbol? v))]
-      [(equal? k 'white-on-black-base?) (boolean? v)]
-      [(equal? k 'colors) ((listof (cons/c symbol? valid-props?)) v)]
-      [(equal? k 'example) (string? v)]
-      [else 
-       ;; don't care about other keys, as they'll be ignored
-       #t])))
-
-(define info-file-result-check?
-  (listof (and/c hash?
-                 immutable?
-                 valid-key-values?)))
-
-(define (props->color line)
-  (or (for/or ([v (in-list line)])
-        (and (vector? v)
-             (vec->color v)))
-      (vec->color #'(0 0 0))))
-
-(define (props->style-delta line)
-  (define sd (new style-delta%))
-  (for ([prop (in-list line)])
-    (match prop
-      [`bold (send sd set-delta 'change-bold)]
-      [`italic (send sd set-delta 'change-italic)]
-      [`underline (send sd set-delta 'change-underline #t)]
-      [else (send sd set-delta-foreground (vec->color prop))]))
-  sd)
-
-(define (vec->color v)
-  (make-object color% 
-    (vector-ref v 0)
-    (vector-ref v 1)
-    (vector-ref v 2)
-    (if (= (vector-length v) 4)
-        (vector-ref v 3)
-        1.0)))
-
-;; returns the user's preferred color, wrt to the current color scheme
-(define (lookup-in-color-scheme color-name)
-  (lookup-in-color-scheme/given-mapping 
-   color-name
-   (preferences:get (color-scheme-entry-name->pref-name color-name))
-   (get-current-color-scheme)))
-
-(define (lookup-in-color-scheme/given-mapping color-name table a-color-scheme)
-  (cond
-    ;; check if the user adjusted the color
-    [(hash-ref table (color-scheme-name a-color-scheme) #f)
-     =>
-     values]
-    ;; check if the color scheme has that mapping
-    [(hash-ref (color-scheme-mapping a-color-scheme)
-               color-name
-               #f)
-     => values]
-    [else
-     ;; fall back to either the white-on-black or the black-on-white color scheme
-     (define fallback-color-scheme
-       (lookup-color-scheme
-        (if (color-scheme-white-on-black-base? a-color-scheme)
-            white-on-black-color-scheme-name
-            black-on-white-color-scheme-name)))
-     (hash-ref (color-scheme-mapping fallback-color-scheme)
-               color-name)]))
-
-;; set-color : symbol (or/c string? (is-a?/c color%) (is-a?/c style-delta%)) -> void
-(define (set-in-color-scheme color-name clr/sd)
-  (define table (preferences:get (color-scheme-entry-name->pref-name color-name)))
-  (define current-color-scheme (get-current-color-scheme))
-  (define scheme-name (color-scheme-name current-color-scheme))
-  (define new-table
-    (cond
-      [(set-member? known-style-names color-name)
-       ;; it would be good to be able to use hash-remove here when 
-       (hash-set table scheme-name clr/sd)]
-      [else
-       (define color (->color-object clr/sd))
-       (define default 
-         (hash-ref (color-scheme-mapping current-color-scheme)
-                   color-name
-                   #f))
-       (cond
-         [(and default (same-color? color default))
-          (hash-remove table scheme-name)]
-         [else
-          (hash-set table scheme-name color)])]))
-  (preferences:set (color-scheme-entry-name->pref-name color-name) new-table))
-
-(define (->color-object clr)
-  (if (string? clr)
-      (send the-color-database find-color clr)
-      clr))
-
-(define (same-color? c1 c2)
-  (and (= (send c1 red) (send c2 red))
-       (= (send c1 green) (send c2 green))
-       (= (send c1 blue) (send c2 blue))
-       (= (send c1 alpha) (send c2 alpha))))
-
-(define (get-current-color-scheme)
-  ;; if pref not recognized, return white-on-black color scheme
-  ;; so that if some color scheme goes away, we have
-  ;; some reasonable backup plan (and, if it comes back
-  ;; we don't lose the prefs)
-  (define pref-val (preferences:get 'framework:color-scheme))
-  (define found-color-scheme (lookup-color-scheme pref-val))
-  (cond
-    [found-color-scheme found-color-scheme]
-    [else (car known-color-schemes)]))
-
-(define (get-current-color-scheme-name)
-  (color-scheme-name (get-current-color-scheme)))
-
-;; string -> (or/c #f color-scheme?)
-(define (lookup-color-scheme name)
-  (for/or ([known-color-scheme (in-list known-color-schemes)])
-    (and (equal? name (color-scheme-name known-color-scheme))
-         known-color-scheme)))
-
-(define (set-current-color-scheme name [avoid-shortcircuit? #f])
-  (define color-scheme
-    (or (for/or ([known-color-scheme (in-list known-color-schemes)])
-          (and (equal? name (color-scheme-name known-color-scheme))
-               known-color-scheme))
-        (car known-color-schemes)))
-  (when (or avoid-shortcircuit?
-            (not (equal? (color-scheme-name color-scheme)
-                         (color-scheme-name (get-current-color-scheme)))))
-    (preferences:set 'framework:color-scheme (color-scheme-name color-scheme))
-    (define old-wob (preferences:get 'framework:white-on-black?))
-    (define new-wob (color-scheme-white-on-black-base? color-scheme))
-    (unless (equal? old-wob new-wob)
-      (preferences:set 'framework:white-on-black? new-wob)
-      (if new-wob
-          (white-on-black)
-          (black-on-white)))
-    (for ([(color-name fns) (in-hash color-change-callbacks)])
-      (for ([fn/b (in-list fns)])
-        (define fn (if (weak-box? fn/b) (weak-box-value fn/b) fn/b))
-        (when fn
-          (fn (lookup-in-color-scheme color-name)))))))
-
-(define (get-available-color-schemes) 
-  (for/list ([(name a-color-scheme) (in-hash known-color-schemes)])
-    name))
-
-(define (register-color-scheme-entry-change-callback color fn [weak? #f])
-  (define wb/f (if weak? (make-weak-box fn) fn))
-  ;; so we know which callbacks to call when a color scheme change happens
-  (hash-set! color-change-callbacks 
-             color
-             (cons wb/f
-                   (remove-gones (hash-ref color-change-callbacks color '()))))
-  ;; so that individual color changes in a given scheme get callbacks
-  (define remover
-    (preferences:add-callback
-     (color-scheme-entry-name->pref-name color)
-     (λ (pref ht)
-       (define fn
-         (cond
-           [(weak-box? wb/f)
-            (define fn (weak-box-value wb/f))
-            (unless fn (remover))
-            fn]
-           [else wb/f]))
-       (when fn
-         (fn (lookup-in-color-scheme/given-mapping 
-              color
-              ht
-              (get-current-color-scheme)))))))
-  (void))
-
-(define (remove-gones lst)
-  (for/list ([x (in-list lst)]
-             #:when (or (not (weak-box? x))
-                        (weak-box-value x)))
-    x))
-
-(define (known-color-scheme-name? n) 
-  (or (set-member? known-color-names n) 
-      (set-member? known-style-names n)))
-
-(define (color-scheme-style-name? n)
-  (set-member? known-style-names n))
-
-(define (color-scheme-entry-name->pref-name sym)
-  (string->symbol (format "color-scheme-entry:~a" sym)))
-
-(define name->style-name (make-hash))
-
-(define (add-color-scheme-entry name _b-o-w-color _w-o-b-color 
-                                #:style [style-name #f]
-                                #:bold? [bold? #f]
-                                #:underline? [underline? #f]
-                                #:italic? [italic? #f]
-                                #:background [background #f])
-  (define b-o-w-color (->color-object _b-o-w-color))
-  (define w-o-b-color (->color-object _w-o-b-color))
-  (cond
-    [style-name
-     (set! known-style-names (set-add known-style-names name))
-     (hash-set! name->style-name name style-name)]
-    [else
-     (set! known-color-names (set-add known-color-names name))])
-  (define (update-color scheme-name color)
-    (hash-set! (color-scheme-mapping (lookup-color-scheme scheme-name))
-               name
-               (if style-name
-                   (make-style-delta color bold? underline? italic? #:background background)
-                   color)))
-  (update-color white-on-black-color-scheme-name w-o-b-color)
-  (update-color black-on-white-color-scheme-name b-o-w-color)
-  (preferences:set-default (color-scheme-entry-name->pref-name name)
-                           (hash)
-                           (hash/c symbol?
-                                   (if style-name 
-                                       (is-a?/c style-delta%)
-                                       (is-a?/c color%))
-                                   #:immutable #t))
-  (preferences:set-un/marshall 
-   (color-scheme-entry-name->pref-name name)
-   (λ (h)
-     (for/hash ([(k v) (in-hash h)])
-       (values k
-               (if style-name
-                   (marshall-style-delta v)
-                   (vector (send v red) (send v green) (send v blue) (send v alpha))))))
-   (λ (val)
-     (cond
-       [(and (list? val) (= (length val) (length style-delta-get/set)))
-        ;; old style prefs; check to see if this user
-        ;; was using the white on black or black on white and 
-        ;; build the corresponding new pref
-        (hash (if (preferences:get 'framework:white-on-black?)
-                  white-on-black-color-scheme-name
-                  black-on-white-color-scheme-name)
-              (unmarshall-style-delta val))]
-       [(unmarshall-color val)
-        => 
-        (λ (clr)
-          ;; old color prefs; as above
-          (hash (if (preferences:get 'framework:white-on-black?)
-                    white-on-black-color-scheme-name
-                    black-on-white-color-scheme-name)
-                clr))]
-       [(hash? val)
-        ;; this may return a bogus hash, but the preferesnces system will check
-        ;; and revert this to the default pref in that case
-        (for/hash ([(k v) (in-hash val)])
-          (values 
-           k 
-           (if style-name
-               (unmarshall-style-delta v)
-               (and (vector? v)
-                    (= (vector-length v) 4)
-                    (make-object color% 
-                      (vector-ref v 0) (vector-ref v 1) 
-                      (vector-ref v 2) (vector-ref v 3))))))]
-       [else #f])))
-  
-  (when style-name
-    (register-color-scheme-entry-change-callback
-     name
-     (λ (sd)
-       (editor:set-standard-style-list-delta style-name sd)))
-    (define init-value (lookup-in-color-scheme name))
-    (editor:set-standard-style-list-delta style-name init-value)))
-
-(define (add-color-scheme-preferences-panel #:extras [extras void])
-  (preferences:add-panel
-   (list (string-constant preferences-colors)
-         (string-constant color-schemes))
-   (λ (parent)
-     (define vp 
-       (new vertical-panel% 
-            [parent parent]
-            [style '(auto-vscroll)]))
-     (extras vp)
-     (define buttons
-       (for/list ([color-scheme (in-list known-color-schemes)])
-         (define hp (new horizontal-panel% 
-                         [parent vp]
-                         [alignment '(left top)]
-                         [stretchable-height #t]))
-         (define t (new racket:text%))
-         (define str (color-scheme-example color-scheme))
-         (send t insert str)
-         (define ec (new editor-canvas% 
-                         [parent hp]
-                         [style '(auto-hscroll no-vscroll)]
-                         [editor t]))
-         (define (update-colors defaults?)
-           (define bkg-name 'framework:basic-canvas-background)
-           (send ec set-canvas-background
-                 (lookup-in-color-scheme/given-mapping 
-                  bkg-name
-                  (if defaults?
-                      (hash)
-                      (preferences:get (color-scheme-entry-name->pref-name bkg-name)))
-                  color-scheme))
-           (send t set-style-list (color-scheme->style-list color-scheme defaults?)))
-         (send ec set-line-count (+ 1 (for/sum ([c (in-string str)])
-                                        (if (equal? c #\newline)
-                                            1
-                                            0))))
-         (define bp (new vertical-panel% [parent hp] 
-                         [stretchable-height #f]
-                         [stretchable-width #f]))
-         (define defaults? #f)
-         (define btn
-           (new button%
-                [label (color-scheme-button-label color-scheme)]
-                [parent bp]
-                [callback (λ (x y) 
-                            (set-current-color-scheme
-                             (color-scheme-name color-scheme))
-                            (when (and default-checkbox
-                                       (send default-checkbox get-value))
-                              (revert-to-color-scheme-defaults color-scheme)))]))
-         (define default-checkbox
-           (new check-box%
-                [stretchable-width #t]
-                [label "Revert to\ndefault colors"]
-                [parent bp]
-                [callback
-                 (λ (x y)
-                   (update-colors (send default-checkbox get-value)))]))
-         (update-colors #f)
-         btn))
-     (define wid (apply max (map (λ (x) (send x get-width)) buttons)))
-     (for ([b (in-list buttons)])
-       (send b min-width wid))
-     (void))))
-
-(define (revert-to-color-scheme-defaults color-scheme)
-  (define cs-name (color-scheme-name color-scheme))
-  (for ([name (in-set (set-union known-style-names known-color-names))])
-    (define pref-sym (color-scheme-entry-name->pref-name name))
-    (define pref-hash (preferences:get pref-sym))
-    (when (hash-ref pref-hash cs-name #f)
-      (preferences:set pref-sym (hash-remove pref-hash cs-name)))))
-
-(define (color-scheme->style-list color-scheme defaults?)
-  (define style-list (new style-list%))
-  
-  (define standard-delta (make-object style-delta% 'change-normal))
-  (send standard-delta set-delta 'change-family 'modern)
-  (send standard-delta set-size-mult 0)
-  (send standard-delta set-size-add (editor:get-current-preferred-font-size))
-  (send standard-delta set-delta-face (preferences:get 'framework:standard-style-list:font-name))
-  (send style-list new-named-style "Standard"
-        (send style-list find-or-create-style
-              (send style-list basic-style)
-              standard-delta))
-  (for ([name (in-set known-style-names)])
-    (define pref-hash (preferences:get (color-scheme-entry-name->pref-name name)))
-    (define delta
-      (lookup-in-color-scheme/given-mapping
-       name 
-       (if defaults? (hash) pref-hash)
-       color-scheme))
-    (send style-list new-named-style
-          (hash-ref name->style-name name)
-          (send style-list find-or-create-style
-                (send style-list find-named-style "Standard")
-                delta)))
-  style-list)
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/color.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/color.rkt
deleted file mode 100644
index 0232bc7ee4..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/color.rkt
+++ /dev/null
@@ -1,1341 +0,0 @@
-#lang racket/unit
-#|
-update-region-end is now gone
-get-region is gone
-added reset-regions
-added get-regions
-|#
-
-(require racket/class
-         racket/gui/base
-         syntax-color/token-tree
-         syntax-color/paren-tree
-         syntax-color/default-lexer
-         syntax-color/lexer-contract
-         string-constants
-         data/interval-map
-         "../preferences.rkt"
-         "sig.rkt"
-         "aspell.rkt"
-         "color-local-member-name.rkt")
-
-(import [prefix icon: framework:icon^]
-        [prefix mode: framework:mode^]
-        [prefix text: framework:text^]
-        [prefix color-prefs: framework:color-prefs^]
-        [prefix racket: framework:racket^])
-
-(export (rename framework:color^
-                (-text<%> text<%>)
-                (-text% text%)
-                (-text-mode<%> text-mode<%>)))
-
-(init-depend framework:text^ framework:mode^)
-
-(define (should-color-type? type)
-  (not (memq type '(no-color))))
-
-(define (make-data type mode backup-delta) 
-  (if (zero? backup-delta)
-      (cons type mode)
-      (vector type mode backup-delta)))
-(define (data-type data) (if (pair? data) (car data) (vector-ref data 0)))
-(define (data-lexer-mode data) (if (pair? data) (cdr data) (vector-ref data 1)))
-(define (data-backup-delta data) (if (vector? data) (vector-ref data 2) 0))
-
-(define -text<%>
-  (interface (text:basic<%>)
-    start-colorer
-    stop-colorer
-    force-stop-colorer
-    
-    is-stopped?
-    is-frozen?
-    freeze-colorer
-    thaw-colorer
-    
-    reset-region
-    reset-regions
-    get-regions
-    
-    skip-whitespace
-    backward-match
-    backward-containing-sexp
-    forward-match
-    insert-close-paren
-    classify-position
-    get-token-range
-    
-    set-spell-check-strings
-    get-spell-check-strings
-    set-spell-check-text
-    get-spell-check-text
-    get-spell-current-dict
-    get-spell-suggestions))
-
-(define text-mixin
-  (mixin (text:basic<%>) (-text<%>)
-    
-    ;; For profiling
-    (define timer #f)
-    
-    ;; ---------------------- Coloring modes ----------------------------
-    
-    ;; The tokenizer is stopped.  This is used by the surrogate to enter
-    ;; a mode with no coloring or paren matching.
-    (define stopped? #t)
-    
-    ;; The tokenizer is stopped and prevented from starting.  This is 
-    ;; an internal call for debugging.
-    (define force-stop? #f)
-    
-    ;; color-callback has been suspended because the text% became locked
-    ;; and should be requeued when the text% is unlocked.
-    (define restart-callback #f)
-    
-    ;; Some other tool wants to take over coloring the buffer, so the 
-    ;; colorer shouldn't color anything.
-    (define frozen? #f)
-    ;; true iff the colorer must recolor from scratch when the freeze
-    ;; is over.
-    (define force-recolor-after-freeze #f)
-    
-    ;; if we were coloring and discovered that an edit-sequence was 
-    ;; going on, then we postpone coloring until the edit-sequence
-    ;; ends
-    (define continue-after-edit-sequence? #f)
-    
-    ;; ---------------------- Parenethesis matching ----------------------
-    
-    ;; The pairs of matching parens
-    (define pairs '())
-    
-    ;; ---------------------- Lexing state ------------------------------
-    
-    (define-struct lexer-state
-      (start-pos 
-       end-pos
-       ;; The tree of valid tokens, starting at start-pos
-       tokens ; = (new token-tree%)
-       ;; If the tree is completed
-       up-to-date? ; #t
-       ;; The tree of tokens that have been invalidated by an edit
-       ;; but might still be valid.
-       invalid-tokens ; = (new token-tree%)
-       ;; The position right before the invalid-tokens tree
-       invalid-tokens-start ; = +inf.0
-       invalid-tokens-mode
-       ;; The position right before the next token to be read
-       current-pos
-       ;; Thread a mode through lexing, and remember the mode
-       ;;  at each token boundary, so that lexing can depend on
-       ;;  previous tokens. This is the mode for lexing at
-       ;;  current-pos:
-       current-lexer-mode
-       ;; Paren-matching
-       parens 
-       )
-      #:mutable #:transparent)
-    
-    ;; The lexer
-    (define get-token #f)
-    
-    (define/private (make-new-lexer-state start end)
-      (make-lexer-state start
-                        end
-                        (new token-tree%)
-                        #t
-                        (new token-tree%)
-                        +inf.0
-                        #f
-                        start
-                        #f
-                        (new paren-tree% (matches pairs))))
-    
-    (define lexer-states (list (make-new-lexer-state 0 'end)))
-    (define/public (get-up-to-date?) 
-      (andmap lexer-state-up-to-date? lexer-states))
-    
-    (define/private (find-ls pos)
-      (ormap (lambda (ls)
-               (and (<= (lexer-state-start-pos ls)
-                        pos
-                        (let ([end (lexer-state-end-pos ls)])
-                          (if (eq? end 'end)
-                              +inf.0
-                              end)))
-                    ls))
-             lexer-states))
-    
-    ;; ---------------------- Interactions state ------------------------
-    ;; The positions right before and right after the area to be tokenized
-    
-    (inherit last-position)
-    
-    (define/public (reset-region start end)
-      (unless (<= 0 start (last-position))
-        (raise-mismatch-error 'reset-region
-                              "start position not inside editor: "
-                              start))
-      (unless (or (eq? 'end end) (<= 0 end (last-position)))
-        (raise-mismatch-error 'reset-region
-                              "end position not inside editor: "
-                              end))
-      (unless (or (eq? 'end end) (<= start end))
-        (raise-mismatch-error 'reset-region
-                              "end position before start position: "
-                              (list end start)))
-      (reset-regions (list (list start end))))
-    
-    (define/public (reset-regions _regions)
-      (let loop ([regions _regions]
-                 [pos 0])
-        (cond
-          [(null? regions) (void)]
-          [(pair? regions)
-           (let ([region (car regions)])
-             (unless (and (list? region)
-                          (= 2 (length region))
-                          (number? (list-ref region 0))
-                          (or (number? (list-ref region 1))
-                              (and (null? (cdr regions))
-                                   (eq? 'end (list-ref region 1)))))
-               (error 'reset-regions 
-                      "got a region that is not a list of two numbers (or 'end if it is the last region): ~e, all regions ~e" 
-                      region
-                      regions))
-             (unless (and (<= pos (list-ref region 0))
-                          (or (eq? 'end (list-ref region 1))
-                              (<= (list-ref region 0) (list-ref region 1))))
-               (error 'reset-regions "found regions with numbers out of order ~e" regions))
-             (loop (cdr regions) (list-ref region 1)))]
-          [else
-           (error 'reset-regions "expected a list of regions, got ~e" regions)]))
-      
-      (set! lexer-states
-            (let loop ([old lexer-states]
-                       [new _regions])
-              (cond
-                [(null? new) null]
-                [(and (pair? old)
-                      (equal? (caar new) (lexer-state-start-pos (car old)))
-                      (equal? (cadar new) (lexer-state-end-pos (car old))))
-                 (cons (car old)
-                       (loop (cdr old) (cdr new)))]
-                [else
-                 (cons (make-new-lexer-state (caar new) (cadar new))
-                       (loop null (cdr new)))])))
-      (update-lexer-state-observers))
-    
-    
-    (define/public (get-regions) 
-      (map (lambda (ls)
-             (list (lexer-state-start-pos ls)
-                   (lexer-state-end-pos ls)))
-           lexer-states))
-    
-    ;; ---------------------- Preferences -------------------------------
-    (define should-color? #t)
-    (define token-sym->style #f)
-    (define spell-check-strings? (preferences:get 'framework:spell-check-strings?))
-    (define spell-check-text? (preferences:get 'framework:spell-check-text?))
-    
-    (define/public (get-spell-check-strings) spell-check-strings?)
-    (define/public (get-spell-check-text) spell-check-text?)
-    (define/public (set-spell-check-strings s) 
-      (define new-val (and s #t))
-      (unless (equal? new-val spell-check-strings?)
-        (set! spell-check-strings? s)
-        (spell-checking-values-changed)))
-    (define/public (set-spell-check-text s) 
-      (define new-val (and s #t))
-      (unless (equal? new-val spell-check-text?)
-        (set! spell-check-text? s)
-        (spell-checking-values-changed)))
-    (define/private (spell-checking-values-changed)
-      (reset-tokens)
-      (start-colorer token-sym->style get-token pairs))
-    (define current-dict (preferences:get 'framework:aspell-dict))
-    (define/public (set-spell-current-dict d)
-      (unless (equal? d current-dict)
-        (set! current-dict d)
-        (reset-tokens)
-        (start-colorer token-sym->style get-token pairs)))
-    (define/public (get-spell-current-dict) current-dict)
-    
-    ;; ---------------------- Multi-threading ---------------------------
-    ;; The editor revision when the last coloring was started
-    (define revision-when-started-parsing #f)
-
-    ;; The editor revision when after the last edit to the buffer
-    (define revision-after-last-edit #f)
-    
-    (inherit change-style begin-edit-sequence end-edit-sequence highlight-range
-             get-style-list in-edit-sequence? get-start-position get-end-position
-             local-edit-sequence? get-styles-fixed has-focus?
-             get-fixed-style get-text)
-    
-    (define lexers-all-valid? #t)
-    (define/private (update-lexer-state-observers)
-      (define new (for/and ([ls (in-list lexer-states)])
-                    (lexer-state-up-to-date? ls)))
-      (unless (eq? new lexers-all-valid?)
-        (set! lexers-all-valid? new)
-        (on-lexer-valid lexers-all-valid?)))
-    (define/pubment (on-lexer-valid valid?)
-      (inner (void) on-lexer-valid valid?))
-    (define/public-final (is-lexer-valid?) lexers-all-valid?)
-    
-    (define/private (reset-tokens)
-      (for-each
-       (lambda (ls)
-         (send (lexer-state-tokens ls) reset-tree)
-         (send (lexer-state-invalid-tokens ls) reset-tree)
-         (set-lexer-state-invalid-tokens-start! ls +inf.0)
-         (set-lexer-state-up-to-date?! ls #t)
-         (set-lexer-state-current-pos! ls (lexer-state-start-pos ls))
-         (set-lexer-state-current-lexer-mode! ls #f)
-         (set-lexer-state-parens! ls (new paren-tree% (matches pairs))))
-       lexer-states)
-      (update-lexer-state-observers)
-      (set! restart-callback #f)
-      (set! continue-after-edit-sequence? #f)
-      (set! force-recolor-after-freeze #f)
-      (set! revision-when-started-parsing #f))
-    
-    ;; Discard extra tokens at the first of invalid-tokens
-    (define/private (sync-invalid ls)
-      (let ([invalid-tokens (lexer-state-invalid-tokens ls)]
-            [invalid-tokens-start (lexer-state-invalid-tokens-start ls)])
-        (when (and (not (send invalid-tokens is-empty?))
-                   (< invalid-tokens-start
-                      (lexer-state-current-pos ls)))
-          (send invalid-tokens search-min!)
-          (let ((length (send invalid-tokens get-root-length))
-                (mode (data-lexer-mode (send invalid-tokens get-root-data))))
-            (send invalid-tokens remove-root!)
-            (set-lexer-state-invalid-tokens-start! ls (+ invalid-tokens-start length))
-            (set-lexer-state-invalid-tokens-mode! ls mode))
-          (sync-invalid ls))))
-    
-    (define/private (re-tokenize-move-to-next-ls start-time ok-to-stop?)
-      (cond
-        [(null? re-tokenize-lses) 
-         ;; done: return #t
-         #t]
-        [else
-         (define ls (car re-tokenize-lses))
-         (set! re-tokenize-lses (cdr re-tokenize-lses))
-         (define in
-           (open-input-text-editor this 
-                                   (lexer-state-current-pos ls)
-                                   (lexer-state-end-pos ls)
-                                   (λ (x) #f)))
-         (port-count-lines! in)
-         (continue-re-tokenize start-time ok-to-stop? ls in
-                               (lexer-state-current-pos ls)
-                               (lexer-state-current-lexer-mode ls))]))
-    
-    (define re-tokenize-lses #f)
-    
-    (define/public (tokenizing-give-up-early) 'defer)
-    
-    (define/private (continue-re-tokenize start-time ok-to-stop? ls in in-start-pos lexer-mode)
-      (cond
-        [(and ok-to-stop?
-              (case (tokenizing-give-up-early)
-                [(#t) #t]
-                [(#f) #f]
-                [(defer) ((+ start-time 20.0) . <= . (current-inexact-milliseconds))]))
-         #f]
-        [else
-         (define-values (_line1 _col1 pos-before) (port-next-location in))
-         (define-values (lexeme type data new-token-start new-token-end backup-delta new-lexer-mode/cont) 
-           (get-token in in-start-pos lexer-mode))
-         (define-values (_line2 _col2 pos-after) (port-next-location in))
-         (define new-lexer-mode (if (dont-stop? new-lexer-mode/cont)
-                                    (dont-stop-val new-lexer-mode/cont)
-                                    new-lexer-mode/cont))
-         (define next-ok-to-stop? (not (dont-stop? new-lexer-mode/cont)))
-         (cond
-           [(eq? 'eof type) 
-            (set-lexer-state-up-to-date?! ls #t)
-            (re-tokenize-move-to-next-ls start-time next-ok-to-stop?)]
-           [else
-            (unless (<= pos-before new-token-start pos-after)
-              (error 'color:text<%>
-                     "expected the token start to be between ~s and ~s, got ~s" pos-before pos-after new-token-start))
-            (unless (<= pos-before new-token-end pos-after)
-              (error 'color:text<%>
-                     "expected the token end to be between ~s and ~s, got ~s" pos-before pos-after new-token-end))
-            (let ((len (- new-token-end new-token-start)))
-              (set-lexer-state-current-pos! ls (+ len (lexer-state-current-pos ls)))
-              (set-lexer-state-current-lexer-mode! ls new-lexer-mode)
-              (sync-invalid ls)
-              (when (and should-color? (should-color-type? type) (not frozen?))
-                (add-colorings type in-start-pos new-token-start new-token-end))
-              ;; Using the non-spec version takes 3 times as long as the spec
-              ;; version.  In other words, the new greatly outweighs the tree
-              ;; operations.
-              ;;(insert-last! tokens (new token-tree% (length len) (data type)))
-              (insert-last-spec! (lexer-state-tokens ls) len (make-data type new-lexer-mode backup-delta))
-              #; (show-tree (lexer-state-tokens ls))
-              (send (lexer-state-parens ls) add-token data len)
-              (cond
-                [(and (not (send (lexer-state-invalid-tokens ls) is-empty?))
-                      (= (lexer-state-invalid-tokens-start ls)
-                         (lexer-state-current-pos ls))
-                      (equal? new-lexer-mode 
-                              (lexer-state-invalid-tokens-mode ls)))
-                 (send (lexer-state-invalid-tokens ls) search-max!)
-                 (send (lexer-state-parens ls) merge-tree
-                       (send (lexer-state-invalid-tokens ls) get-root-end-position))
-                 (insert-last! (lexer-state-tokens ls)
-                               (lexer-state-invalid-tokens ls))
-                 (set-lexer-state-invalid-tokens-start! ls +inf.0)
-                 (set-lexer-state-up-to-date?! ls #t)
-                 (re-tokenize-move-to-next-ls start-time next-ok-to-stop?)]
-                [else
-                 (continue-re-tokenize start-time next-ok-to-stop? ls in in-start-pos new-lexer-mode)]))])]))
-
-    (define/private (add-colorings type in-start-pos new-token-start new-token-end)
-      (define sp (+ in-start-pos (sub1 new-token-start)))
-      (define ep (+ in-start-pos (sub1 new-token-end)))
-      (define style-name (token-sym->style type))
-      (define color (send (get-style-list) find-named-style style-name))
-      (define do-spell-check?
-        (cond
-          [(equal? type 'string) spell-check-strings?]
-          [(equal? type 'text) spell-check-text?]
-          [else #f]))
-      (cond
-        [do-spell-check?
-         (define misspelled-color (send (get-style-list) find-named-style misspelled-text-color-style-name))
-         (cond
-           [misspelled-color
-            (define strs (regexp-split #rx"\n" (get-text sp ep)))
-            (let loop ([strs strs]
-                       [pos sp])
-              (unless (null? strs)
-                (define str (car strs))
-                (let loop ([spellos (query-aspell str current-dict)]
-                           [lp 0])
-                  (cond
-                    [(null? spellos)
-                     (add-coloring/spell #f color (+ pos lp) (+ pos (string-length str)))]
-                    [else
-                     (define err (car spellos))
-                     (define err-start (list-ref err 0))
-                     (define err-len (list-ref err 1))
-                     (define suggestions (list-ref err 2))
-                     (add-coloring/spell suggestions
-                                         misspelled-color
-                                         (+ pos err-start)
-                                         (+ pos err-start err-len))
-                     (add-coloring/spell #f
-                                         color
-                                         (+ pos lp)
-                                         (+ pos err-start))
-                     (loop (cdr spellos) (+ err-start err-len))]))
-                (loop (cdr strs)
-                      (+ pos (string-length str) 1))))]
-           [else
-            (add-coloring/spell #f color sp ep)])]
-        [else
-         (add-coloring/spell #f color sp ep)]))
-    
-    (define/private (add-coloring/spell suggestions color start end)
-      (add-coloring color start end)
-      (unless misspelled-regions
-        (when suggestions
-          (set! misspelled-regions (make-interval-map))))
-      (unless (= start end)
-        (when misspelled-regions
-          (interval-map-set! misspelled-regions start end
-                             (and suggestions
-                                  (list start end suggestions))))))
-    (define misspelled-regions #f)
-    (define/public (get-spell-suggestions position)
-      (and misspelled-regions (interval-map-ref misspelled-regions position #f)))
-    
-    (define/private (add-coloring color sp ep)
-      (change-style color sp ep #f))
-    
-    (define/private (show-tree t)
-      (printf "Tree:\n")
-      (send t search-min!)
-      (let loop ([old-s -inf.0])
-        (let ([s (send t get-root-start-position)]
-              [e (send t get-root-end-position)])
-          (unless (= s old-s)
-            (printf " ~s\n" (list s e))
-            (send t search! e)
-            (loop s)))))
-    
-    (define/private (split-backward ls valid-tree pos)
-      (let loop ([pos pos][valid-tree valid-tree][old-invalid-tree #f])
-        (let-values (((orig-token-start orig-token-end valid-tree invalid-tree orig-data)
-                      (send valid-tree split/data (- pos (lexer-state-start-pos ls)))))
-          (let ([backup-pos (- pos (data-backup-delta orig-data))]
-                [invalid-tree (or old-invalid-tree invalid-tree)])
-            (if (backup-pos . < . pos)
-                ;; back up more:
-                (loop pos valid-tree invalid-tree)
-                ;; that was far enough:
-                (values orig-token-start orig-token-end valid-tree invalid-tree orig-data))))))
-    
-    (define/private (do-insert/delete/ls ls edit-start-pos change-length)
-      (unless (lexer-state-up-to-date? ls)
-        (sync-invalid ls))
-      (cond
-        ((lexer-state-up-to-date? ls)
-         (let-values (((orig-token-start orig-token-end valid-tree invalid-tree orig-data)
-                       (split-backward ls (lexer-state-tokens ls) edit-start-pos)))
-           (send (lexer-state-parens ls) split-tree orig-token-start)
-           (set-lexer-state-invalid-tokens! ls invalid-tree)
-           (set-lexer-state-tokens! ls valid-tree)
-           (set-lexer-state-invalid-tokens-start!
-            ls
-            (if (send (lexer-state-invalid-tokens ls) is-empty?)
-                +inf.0
-                (+ (lexer-state-start-pos ls) orig-token-end change-length)))
-           (set-lexer-state-invalid-tokens-mode! ls (and orig-data (data-lexer-mode orig-data)))
-           (let ([start (+ (lexer-state-start-pos ls) orig-token-start)])
-             (set-lexer-state-current-pos! ls start)
-             (set-lexer-state-current-lexer-mode! ls
-                                                  (if (= start (lexer-state-start-pos ls))
-                                                      #f
-                                                      (begin
-                                                        (send valid-tree search-max!)
-                                                        (data-lexer-mode (send valid-tree get-root-data))))))
-           (set-lexer-state-up-to-date?! ls #f)
-           (update-lexer-state-observers)
-           (queue-callback (λ () (colorer-callback)) #f)))
-        ((and (>= edit-start-pos (lexer-state-invalid-tokens-start ls))
-              (> edit-start-pos (lexer-state-current-pos ls)))
-         (let-values (((tok-start tok-end valid-tree invalid-tree orig-data)
-                       (split-backward ls (lexer-state-invalid-tokens ls) edit-start-pos)))
-           (set-lexer-state-invalid-tokens! ls invalid-tree)
-           (set-lexer-state-invalid-tokens-start!
-            ls
-            (+ (lexer-state-invalid-tokens-start ls) tok-end change-length))
-           (set-lexer-state-invalid-tokens-mode! ls (and orig-data (data-lexer-mode orig-data)))))
-        ((> edit-start-pos (lexer-state-current-pos ls))
-         (set-lexer-state-invalid-tokens-start! 
-          ls 
-          (+ change-length (lexer-state-invalid-tokens-start ls))))
-        (else
-         (let-values (((tok-start tok-end valid-tree invalid-tree data)
-                       (split-backward ls (lexer-state-tokens ls) edit-start-pos)))
-           (send (lexer-state-parens ls) truncate tok-start)
-           (set-lexer-state-tokens! ls valid-tree)
-           (set-lexer-state-invalid-tokens-start! ls (+ change-length (lexer-state-invalid-tokens-start ls)))
-           (let ([start (+ (lexer-state-start-pos ls) tok-start)])
-             (set-lexer-state-current-pos! ls start)
-             (set-lexer-state-current-lexer-mode! 
-              ls
-              (if (= start (lexer-state-start-pos ls))
-                  #f
-                  (begin
-                    (send valid-tree search-max!)
-                    (data-lexer-mode (send valid-tree get-root-data))))))))))
-    
-    (define/private (do-insert/delete edit-start-pos change-length)
-      (unless (or stopped? force-stop?)
-        (let ([ls (find-ls edit-start-pos)])
-          (when ls
-            (do-insert/delete/ls ls edit-start-pos change-length)))))
-    
-    (define/private (do-insert/delete-all)
-      (for-each (lambda (ls)
-                  (do-insert/delete/ls ls (lexer-state-start-pos ls) 0))
-                lexer-states))
-    
-    (inherit is-locked? get-revision-number)
-    
-    (define/private (colorer-driver)
-      (unless (andmap lexer-state-up-to-date? lexer-states)
-        (begin-edit-sequence #f #f)
-        (c-log "starting to color")
-        (set! re-tokenize-lses (let loop ([lexer-states lexer-states])
-                                 (cond
-                                   [(null? lexer-states) null]
-                                   [else (if (lexer-state-up-to-date? (car lexer-states))
-                                             (loop (cdr lexer-states))
-                                             lexer-states)])))
-        (define finished? (re-tokenize-move-to-next-ls 
-                           (current-inexact-milliseconds) 
-                           ;; #f initially here ensures we do at least
-                           ;; one step of tokenization before giving up
-                           #f))
-        (c-log (format "coloring stopped ~a" (if finished? "because it finished" "with more to do")))
-        (when finished?
-          (update-lexer-state-observers)
-          (c-log "updated observers"))
-        (c-log "starting end-edit-sequence")
-        (end-edit-sequence)
-        (c-log "finished end-edit-sequence")))
-    
-    (define/private (colorer-callback)
-      (cond
-        ((is-locked?)
-         (set! restart-callback #t))
-        (else
-         (cond
-           [(in-edit-sequence?)
-            (set! continue-after-edit-sequence? #t)]
-           [else
-            (colorer-driver)
-            (unless (andmap lexer-state-up-to-date? lexer-states)
-              (queue-callback (λ () (colorer-callback)) #f))]))))
-    
-    ;; Must not be called when the editor is locked
-    (define/private (finish-now)
-      (unless stopped?
-        (let loop ()
-          (unless (andmap lexer-state-up-to-date? lexer-states)
-            (colorer-driver)
-            (loop)))))
-    
-    ;; See docs
-    (define/public (start-colorer token-sym->style- get-token- pairs-)
-      (unless force-stop?
-        (set! stopped? #f)
-        (reset-tokens)
-        (set! should-color? (preferences:get 'framework:coloring-active))
-        (set! token-sym->style token-sym->style-)
-        (set! get-token (if (procedure-arity-includes? get-token- 3)
-                            ;; New interface: thread through a mode:
-                            get-token-
-                            ;; Old interface: no offset, backup delta, or mode
-                            (lambda (in offset mode)
-                              (let-values ([(lexeme type data new-token-start new-token-end) 
-                                            (get-token- in)])
-                                (values lexeme type data new-token-start new-token-end 0 #f)))))
-        (set! pairs pairs-)
-        (for-each
-         (lambda (ls)
-           (set-lexer-state-parens! ls (new paren-tree% (matches pairs))))
-         lexer-states)
-        ;; (set! timer (current-milliseconds))
-        (do-insert/delete-all)))
-    
-    ;; See docs
-    (define/public stop-colorer
-      (lambda ((clear-the-colors #t))
-        (set! stopped? #t)
-        (when (and clear-the-colors (not frozen?))
-          (clear-colors))
-        (match-parens #t)
-        (reset-tokens)
-        (set! pairs null)
-        (set! token-sym->style #f)
-        (set! get-token #f)))
-    
-    (define/private (clear-colors)
-      (begin-edit-sequence #f #f)
-      (for-each
-       (λ (ls)
-         (change-style (get-fixed-style) 
-                       (lexer-state-start-pos ls) 
-                       (lexer-state-end-pos ls) 
-                       #f))
-       lexer-states)
-      (end-edit-sequence))
-    
-    (define/public (is-frozen?) frozen?)
-    (define/public (is-stopped?) stopped?)
-    
-    ;; See docs
-    (define/public (freeze-colorer)
-      (when (is-locked?)
-        (error 'freeze-colorer "called on a locked color:text<%>."))
-      (unless frozen?
-        (finish-now)
-        (set! frozen? #t)))
-    
-    ;; See docs
-    (define/public thaw-colorer
-      (lambda ((recolor? #t)
-               (retokenize? #f))
-        (when frozen?
-          (set! frozen? #f)
-          (cond
-            (stopped?
-             (stop-colorer))
-            ((or force-recolor-after-freeze recolor?)
-             (cond
-               (retokenize?
-                (let ((tn token-sym->style)
-                      (gt get-token)
-                      (p pairs))
-                  (stop-colorer (not should-color?))
-                  (start-colorer tn gt p)))
-               (else
-                (begin-edit-sequence #f #f)
-                (finish-now)
-                (when should-color?
-                  (for-each
-                   (lambda (ls)
-                     (let ([tokens (lexer-state-tokens ls)]
-                           [start-pos (lexer-state-start-pos ls)])
-                       (send tokens for-each
-                             (λ (start len data)
-                               (let ([type (data-type data)])
-                                 (when (should-color-type? type)
-                                   (let ((color (send (get-style-list) find-named-style
-                                                      (token-sym->style type)))
-                                         (sp (+ start-pos start))
-                                         (ep (+ start-pos (+ start len))))
-                                     (change-style color sp ep #f))))))))
-                   lexer-states))
-                (end-edit-sequence))))))))
-    
-    
-    (define/private (toggle-color on?)
-      (cond
-        ((and frozen? (not (equal? on? should-color?)))
-         (set! should-color? on?)
-         (set! force-recolor-after-freeze #t))
-        ((and (not should-color?) on?)
-         (set! should-color? on?)
-         (reset-tokens)
-         (do-insert/delete-all))
-        ((and should-color? (not on?))
-         (set! should-color? on?)
-         (clear-colors))))
-    
-    ;; see docs
-    (define/public (force-stop-colorer stop?)
-      (set! force-stop? stop?)
-      (when stop?
-        (stop-colorer)))
-    
-    
-    ;; ----------------------- Match parentheses ----------------------------
-    
-    (define clear-old-locations void)
-    
-    (define mismatch-color (make-object color% "PINK"))
-    (define/private (get-match-color) 
-      (color-prefs:lookup-in-color-scheme 'framework:paren-match-color))
-    
-    
-    ;; higlight : number number number (or/c color any)
-    ;;   if color is a color, then it uses that color to higlight
-    ;;   Otherwise, it treats it like a boolean, where a true value  
-    ;;   means the normal paren color and #f means an error color. 
-    ;; numbers are expected to have zero be start-pos.
-    (define/private (highlight ls start end caret-pos color [priority 'low])
-      (let* ([start-pos (lexer-state-start-pos ls)]
-             [off (highlight-range (+ start-pos start) (+ start-pos end)
-                                   (if (is-a? color color%)
-                                       color
-                                       (if color mismatch-color (get-match-color)))
-                                   (= caret-pos (+ start-pos start))
-                                   priority)])
-        (set! clear-old-locations
-              (let ([old clear-old-locations])
-                (λ ()
-                  (old)
-                  (off))))))
-    
-    (define in-match-parens? #f)
-    
-    ;; the forward matcher signaled an error because not enough of the
-    ;; tree has been built.
-    (define/private (f-match-false-error ls start end error)
-      (and error 
-           (<= (+ (lexer-state-start-pos ls) error) 
-               (lexer-state-current-pos ls))
-           (not (lexer-state-up-to-date? ls))))
-    
-    ;; If there is no match because the buffer isn't lexed far enough yet,
-    ;; this will do nothing, but the edit sequence for changing the colors 
-    ;; will trigger a callback that will call this to try and match again.
-    ;; This edit sequence is used even if the coloring is disabled in
-    ;; the preferences, although nothing is actually colored during it.
-    ;; This leads to the nice behavior that we don't have to block to
-    ;; highlight parens, and the parens will be highlighted as soon as
-    ;; possible.
-    (define/private match-parens
-      (lambda ([just-clear? #f])
-        ;;(printf "(match-parens ~a)\n" just-clear?)
-        (when (and (not in-match-parens?)
-                   ;; Trying to match open parens while the
-                   ;; background thread is going slows it down.
-                   ;; The random number slows down how often it
-                   ;; tries.
-                   (or just-clear? 
-                       (andmap lexer-state-up-to-date? lexer-states)
-                       (= 0 (random 5))))
-          (set! in-match-parens? #t)
-          (begin-edit-sequence #f #f)
-          (clear-old-locations)
-          (set! clear-old-locations void)
-          (when (and (preferences:get 'framework:highlight-parens)
-                     (not just-clear?))
-            (let* ((here (get-start-position)))
-              (when (= here (get-end-position))
-                (let ([ls (find-ls here)])
-                  (when ls
-                    (let-values (((start-f end-f error-f)
-                                  (send (lexer-state-parens ls) match-forward 
-                                        (- here (lexer-state-start-pos ls)))))
-                      (when (and (not (f-match-false-error ls start-f end-f error-f))
-                                 start-f end-f)
-                        (if error-f
-                            (highlight ls start-f end-f here error-f)
-                            (highlight-nested-region ls start-f end-f here))))
-                    (let-values  (((start-b end-b error-b)
-                                   (send (lexer-state-parens ls) match-backward 
-                                         (- here (lexer-state-start-pos ls)))))
-                      (when (and start-b end-b)
-                        (if error-b
-                            (highlight ls start-b end-b here error-b)
-                            (highlight-nested-region ls start-b end-b here)))))))))
-          (end-edit-sequence)
-          (set! in-match-parens? #f))))
-    
-    ;; highlight-nested-region : lexer-state number number number -> void
-    ;; colors nested regions of parentheses.
-    (define/private (highlight-nested-region ls orig-start orig-end here)
-      (define priority (get-parenthesis-priority))
-      (define paren-colors (get-parenthesis-colors))
-      (let paren-loop ([start orig-start]
-                       [end orig-end]
-                       [depth 0])
-        (when (< depth (vector-length paren-colors))
-          
-          ;; when there is at least one more color in the vector we'll look
-          ;; for regions to color at that next level
-          (when (< (+ depth 1) (vector-length paren-colors))
-            (let seq-loop ([inner-sequence-start (+ start 1)])
-              (when (< inner-sequence-start end)
-                (let ([post-whitespace (skip-whitespace inner-sequence-start 'forward #t)])
-                  (let-values ([(start-inner end-inner error-inner)
-                                (send (lexer-state-parens ls) match-forward post-whitespace)])
-                    (cond
-                      [(and start-inner end-inner (not error-inner))
-                       (paren-loop start-inner end-inner (+ depth 1))
-                       (seq-loop end-inner)]
-                      [(skip-past-token ls post-whitespace)
-                       =>
-                       (λ (after-non-paren-thing)
-                         (seq-loop after-non-paren-thing))]))))))
-          
-          (highlight ls start end here (vector-ref paren-colors depth) priority))))
-    
-    ;; See docs
-    (define/public (forward-match position cutoff)
-      (do-forward-match position cutoff #t))
-    
-    (define/private (do-forward-match position cutoff skip-whitespace?)
-      (let ((position 
-             (if skip-whitespace? 
-                 (skip-whitespace position 'forward #t)
-                 position)))
-        (let ([ls (find-ls position)])
-          (and 
-           ls
-           (let-values (((start end error)
-                         (send (lexer-state-parens ls) match-forward
-                               (- position (lexer-state-start-pos ls)))))
-             (cond
-               ((f-match-false-error ls start end error)
-                (colorer-driver)
-                (do-forward-match position cutoff #f))
-               ((and start end (not error))
-                (let ((match-pos (+ (lexer-state-start-pos ls) end)))
-                  (cond
-                    ((<= match-pos cutoff) match-pos)
-                    (else #f))))
-               ((and start end error) #f)
-               (else
-                (skip-past-token ls position))))))))
-    
-    (define/private (skip-past-token ls position)
-      (let-values (((tok-start tok-end)
-                    (begin
-                      (tokenize-to-pos ls position)
-                      (send (lexer-state-tokens ls) search! 
-                            (- position (lexer-state-start-pos ls)))
-                      (values (send (lexer-state-tokens ls) get-root-start-position)
-                              (send (lexer-state-tokens ls) get-root-end-position)))))
-        (cond
-          ((or (send (lexer-state-parens ls) is-close-pos? tok-start)
-               (= (+ (lexer-state-start-pos ls) tok-end) position))
-           #f)
-          (else
-           (+ (lexer-state-start-pos ls) tok-end)))))
-    
-    ;; See docs
-    (define/public (backward-match position cutoff)
-      (let ((x (internal-backward-match position cutoff)))
-        (cond
-          ((or (eq? x 'open) (eq? x 'beginning)) #f)
-          (else x))))
-    
-    (define/private (internal-backward-match position cutoff)
-      (when stopped?
-        (error 'backward-match "called on a color:text<%> whose colorer is stopped."))
-      (let* ([position (skip-whitespace position 'backward #t)]
-             [ls (find-ls position)]
-             [start-pos (and ls (lexer-state-start-pos ls))])
-        (and
-         ls
-         (let-values (((start end error)
-                       (send (lexer-state-parens ls) match-backward (- position start-pos))))
-           (cond
-             ((and start end (not error))
-              (let ((match-pos (+ start-pos start)))
-                (cond
-                  ((>= match-pos cutoff) match-pos)
-                  (else #f))))
-             ((and start end error) #f)
-             (else
-              (let-values (((tok-start tok-end)
-                            (begin
-                              (send (lexer-state-tokens ls) search!
-                                    (if (> position start-pos)
-                                        (- position start-pos 1)
-                                        0))
-                              (values (send (lexer-state-tokens ls) get-root-start-position)
-                                      (send (lexer-state-tokens ls) get-root-end-position)))))
-                (cond
-                  ((send (lexer-state-parens ls) is-open-pos? tok-start)
-                   'open)
-                  ((= (+ start-pos tok-start) position)
-                   'beginning)
-                  (else
-                   (+ start-pos tok-start))))))))))
-    
-    ;; See docs
-    (define/public (backward-containing-sexp position cutoff)
-      (when stopped?
-        (error 'backward-containing-sexp "called on a color:text<%> whose colorer is stopped."))
-      (let loop ((cur-pos position))
-        (let ((p (internal-backward-match cur-pos cutoff)))
-          (cond
-            ((eq? 'open p) 
-             ;; Should this function skip  
-             ;; backwards past whitespace? 
-             ;; the docs seem to indicate it
-             ;; does, but it doesn't really
-             cur-pos)
-            ((eq? 'beginning p) #f)
-            ((not p) #f)
-            (else (loop p))))))
-    
-    ;; Determines whether a position is a 'comment, 'string, etc.
-    (define/public (classify-position position)
-      (define-values (tokens ls) (get-tokens-at-position 'classify-position position))
-      (and tokens
-           (let ([root-data (send tokens get-root-data)])
-             (and root-data
-                  (data-type root-data)))))
-    
-    (define/public (get-token-range position)
-      (define-values (tokens ls) (get-tokens-at-position 'get-token-range position))
-      (values (and tokens ls
-                   (+ (lexer-state-start-pos ls)
-                      (send tokens get-root-start-position)))
-              (and tokens ls
-                   (+ (lexer-state-start-pos ls)
-                      (send tokens get-root-end-position)))))
-    
-    (define/private (get-tokens-at-position who position)
-      (when stopped?
-        (error who "called on a color:text<%> whose colorer is stopped."))
-      (let ([ls (find-ls position)])
-        (if ls
-            (let ([tokens (lexer-state-tokens ls)])
-              (tokenize-to-pos ls position)
-              (send tokens search! (- position (lexer-state-start-pos ls)))
-              (values tokens ls))
-            (values #f #f))))
-    
-    (define/private (tokenize-to-pos ls position)
-      (when (and (not (lexer-state-up-to-date? ls)) 
-                 (<= (lexer-state-current-pos ls) position))
-        (colorer-driver)
-        (tokenize-to-pos ls position)))
-    
-    ;; See docs
-    ;;  Note: this doesn't seem to handle sexp-comments correctly  .nah.
-    (define/public (skip-whitespace position direction comments?)
-      (when stopped?
-        (error 'skip-whitespace "called on a color:text<%> whose colorer is stopped."))
-      (let ([ls (find-ls position)])
-        (if (not ls) 
-            position
-            (let ([start-pos (lexer-state-start-pos ls)]
-                  [end-pos (lexer-state-end-pos ls)]
-                  [tokens (lexer-state-tokens ls)])
-              (cond
-                ((and (eq? direction 'forward)
-                      (>= position (if (eq? 'end end-pos) (last-position) end-pos)))
-                 position)
-                ((and (eq? direction 'backward) (<= position start-pos))
-                 position)
-                (else
-                 (tokenize-to-pos ls position)
-                 (send tokens search! (- (if (eq? direction 'backward) (sub1 position) position)
-                                         start-pos))
-                 (cond
-                   ((and (send tokens get-root-data)
-                         (or (eq? 'white-space (data-type (send tokens get-root-data)))
-                             (and comments? (eq? 'comment (data-type (send tokens get-root-data))))))
-                    (skip-whitespace (+ start-pos
-                                        (if (eq? direction 'forward)
-                                            (send tokens get-root-end-position)
-                                            (send tokens get-root-start-position)))
-                                     direction
-                                     comments?))
-                   (else position))))))))
-    
-    ;; this returns the start/end positions
-    ;; of the matching close paren of the first open paren to the left of pos,
-    ;; if it is properly balanced. (this one assumes though that closers
-    ;; really contains only 'parenthesis type characters)
-    ;; find-next-outer-paren : number (list string)
-    ;;            -> (values (or #f number) (or #f number) (or #f string))
-    (define/private (find-next-outer-paren pos closers)
-      (let loop ([pos pos])
-        (define after-ws (skip-whitespace pos 'forward #f))
-        (cond
-          [after-ws
-           (define tok (classify-position after-ws))
-           (define-values (a b) (get-token-range after-ws))
-           (cond
-             [(eq? tok 'parenthesis)
-              (define str (get-text a b))
-              (cond
-                [(member str closers) 
-                 (values a b str)]
-                [else
-                 (define m (forward-match a (last-position)))
-                 (cond
-                   [m (loop m)]
-                   [else (values #f #f #f)])])]
-             [(< b (last-position))
-              (loop b)]
-             [else
-              (values #f #f #f)])]
-          [else (values #f #f)])))
-    
-
-    ;; returns the start and end positions of the next token at or after
-    ;;   pos that matches any of the given list of closers, as well as
-    ;;   the string of the matching token itself and whether it
-    ;;   occurred immediately adjacent to pos, ignoring whitespace and comments
-    ;; find-next-close-paren : number (list string) boolean
-    ;;      -> (values (or #f number) (or #f number) (or #f string) boolean)
-    (define/private (find-next-close-paren pos closers [adj? #t])
-      (define next-pos (skip-whitespace pos 'forward #t))
-      (define ls (find-ls next-pos))
-      (cond
-        [ls
-         (define ls-start (lexer-state-start-pos ls))
-         (define tree (lexer-state-tokens ls))
-         (send tree search! (- next-pos ls-start))
-         (define start-pos (+ ls-start (send tree get-root-start-position)))
-         (define end-pos (+ ls-start (send tree get-root-end-position))) 
-         
-         #;(printf "~a |~a| |~a|~n" (list pos next-pos start-pos end-pos (send tree get-root-data)) closers (get-text start-pos end-pos))
-         
-         (cond
-           [(or (not (send tree get-root-data)) (<= end-pos pos))
-            (values #f #f #f #f)]    ;; didn't find /any/ token ending after pos
-           [(and (<= pos start-pos)
-                 (member (get-text start-pos end-pos) closers)) ; token at start-pos matches
-            (values start-pos end-pos (get-text start-pos end-pos) adj?)]
-           [else   ; skip ahead
-            (find-next-close-paren end-pos closers #f)])]
-        [else
-         (values #f #f #f #f)]))
-
-
-    ;; given end-pos, a position right after a closing parens,
-    ;; flash the matching open parens
-    (define/private (flash-from end-pos)
-      (let ((to-pos (backward-match end-pos 0)))
-        (when to-pos
-          (let ([ls (find-ls to-pos)])
-            (when ls
-              (let ([start-pos (lexer-state-start-pos ls)]
-                    [parens (lexer-state-parens ls)])
-                (when (and (send parens is-open-pos? (- to-pos start-pos))
-                           (send parens is-close-pos? (- end-pos 1 start-pos)))
-                  (flash-on to-pos (+ 1 to-pos)))))))))
-
-
-    (inherit insert delete flash-on on-default-char set-position get-character)
-    ;; See docs
-    ;; smart-skip : (or/c #f 'adjacent 'forward)
-    (define/public (insert-close-paren pos char flash? fixup? [smart-skip #f])
-      (begin-edit-sequence #t #f)
-      (define closers (map symbol->string (map cadr pairs)))
-      (define closer (get-close-paren pos
-                                      (if fixup? ;; Ensure preference for given character:
-                                          (cons (string char) (remove (string char) closers))
-                                          null)
-                                      #f))
-      (define insert-str (if closer closer (string char)))
-      (define (insert)
-        (for ([c (in-string insert-str)])
-          (on-default-char (new key-event% (key-code c))))
-        (+ pos (string-length insert-str)))
-      (define (skip p)
-        (set-position p)
-        p)
-      
-      (define end-pos
-        (cond
-          [smart-skip
-           (define-values (next-close-start next-close-end next-close-str next-close-adj?)
-             (find-next-close-paren pos closers))
-           (cond
-             [(eq? smart-skip 'adjacent)
-              (if (and next-close-start next-close-adj?
-                       (string=? insert-str next-close-str))
-                  (skip next-close-end)
-                  (insert))]
-             [(eq? smart-skip 'forward)
-              (define-values (outer-close-start outer-close-end outer-close-str)
-                (find-next-outer-paren pos closers))
-              (cond
-                [(and outer-close-start
-                      (or fixup? (string=? insert-str outer-close-str)))
-                 (skip outer-close-end)]
-                [(and next-close-start
-                      (or fixup? (string=? insert-str next-close-str)))
-                 (skip next-close-end)]
-                [else  (insert)])]
-             [else
-              (error 'insert-close-paren
-                     (format "invalid smart-skip option: ~a" smart-skip))])]
-          [else
-           (insert)]))
-      (end-edit-sequence)
-      (when (and flash? (not stopped?)) (flash-from end-pos)))
-    
-    ;; find-closer : exact-nonnegative-integer? -> (or/c #f string?)
-    ;; returns what the close paren should be at position pos to
-    ;; match whatever the opening paren is at the other end, unless
-    ;; the position is inside some other token or there is no opening
-    ;; paren, in which case it returns #f.
-    (define/private (get-close-paren pos closers continue-after-non-paren?)
-      (cond
-        [(null? closers) #f]
-        [else
-         (define c (car closers))
-         (define l (string-length c))
-         (define ls (find-ls pos))
-         (cond
-           [ls
-            (define start-pos (lexer-state-start-pos ls))
-            (insert c pos)
-            (define cls (classify-position pos))
-            (cond
-              [(eq? cls 'parenthesis)
-               (define m (backward-match (+ l pos) start-pos))
-               (cond
-                 [(and m
-                       (send (lexer-state-parens ls) is-open-pos? (- m start-pos))
-                       (send (lexer-state-parens ls) is-close-pos? (- pos start-pos)))
-                  (delete pos (+ l pos))
-                  c]
-                 [else
-                  (delete pos (+ l pos))
-                  (get-close-paren pos (cdr closers) #t)])]
-              [else
-               (delete pos (+ l pos))
-               (if continue-after-non-paren?
-                   (get-close-paren pos (cdr closers) #t)
-                   #f)])]
-           [else c])]))
-
-    
-    (define/public (debug-printout)
-      (for-each 
-       (lambda (ls)
-         (let* ((x null)
-                (f (λ (a b c) (set! x (cons (list a b c) x)))))
-           (send (lexer-state-tokens ls) for-each f)
-           (printf "tokens: ~.s\n" (reverse x))
-           (set! x null)
-           (send (lexer-state-invalid-tokens ls) for-each f)
-           (printf "invalid-tokens: ~.s\n" (reverse x))
-           (printf "start-pos: ~a current-pos: ~a invalid-tokens-start ~a\n"
-                   (lexer-state-start-pos ls)
-                   (lexer-state-current-pos ls)
-                   (lexer-state-invalid-tokens-start ls))
-           (printf "parens: ~.s\n" (car (send (lexer-state-parens ls) test)))))
-       lexer-states))
-    
-    ;; ------------------------- Callbacks to Override ----------------------
-    
-    (define/override (lock x)
-      ;;(printf "(lock ~a)\n" x)
-      (super lock x)
-      (when (and restart-callback (not x))
-        (set! restart-callback #f)
-        (queue-callback (λ () (colorer-callback)))))
-    
-    
-    (define/override (on-focus on?)
-      ;;(printf "(on-focus ~a)\n" on?)
-      (super on-focus on?)
-      (match-parens (not on?)))
-    
-    (define/augment (after-edit-sequence)
-      ;;(printf "(after-edit-sequence)\n")
-      (when continue-after-edit-sequence?
-        (set! continue-after-edit-sequence? #f)
-        (queue-callback (λ () (colorer-callback)) #f))
-      (when (has-focus?)
-        (match-parens))
-      (inner (void) after-edit-sequence))
-    
-    (define/augment (after-set-position)
-      ;;(printf "(after-set-position)\n")
-      (unless (local-edit-sequence?)
-        (when (has-focus?)
-          (match-parens)))
-      (inner (void) after-set-position))
-    
-    (define/augment (after-change-style a b)
-      ;;(printf "(after-change-style)\n")
-      (unless (get-styles-fixed)
-        (unless (local-edit-sequence?)
-          (when (has-focus?)
-            (match-parens))))
-      (inner (void) after-change-style a b))
-    
-    (define/augment (on-set-size-constraint)
-      ;;(printf "(on-set-size-constraint)\n")
-      (unless (local-edit-sequence?)
-        (when (has-focus?)
-          (match-parens)))
-      (inner (void) on-set-size-constraint))
-    
-    (define/augment (after-insert edit-start-pos change-length)
-      ;;(printf "(after-insert ~a ~a)\n" edit-start-pos change-length)
-      (when misspelled-regions
-        (interval-map-expand! misspelled-regions 
-                              edit-start-pos 
-                              (+ edit-start-pos change-length)))
-      (do-insert/delete edit-start-pos change-length)
-      (inner (void) after-insert edit-start-pos change-length))
-    
-    (define/augment (after-delete edit-start-pos change-length)
-      ;;(printf "(after-delete ~a ~a)\n" edit-start-pos change-length)
-      (when misspelled-regions
-        (interval-map-contract! misspelled-regions
-                                edit-start-pos
-                                (+ edit-start-pos change-length)))
-      (do-insert/delete edit-start-pos (- change-length))
-      (inner (void) after-delete edit-start-pos change-length))
-    
-    (super-new)
-    
-    ;; need pref-callback to be in a private field
-    ;; so that the editor hangs on to the callback
-    ;; when the editor goes away, so does the callback
-    (define (pref-callback k v) (toggle-color v))
-    (preferences:add-callback 'framework:coloring-active pref-callback #t)))
-
-(define parenthesis-color-table #f)
-(define (get-parenthesis-colors-table)
-  (define (reverse-vec v) (list->vector (reverse (vector->list v))))
-  (unless parenthesis-color-table
-    (set! parenthesis-color-table
-          (list
-           (list 'shades-of-gray  
-                 (string-constant paren-color-shades-of-gray)
-                 (reverse-vec
-                  (between .2 0 0 0
-                           .2 0 0 0))
-                 'high)
-           (list 'shades-of-blue
-                 (string-constant paren-color-shades-of-blue)
-                 (between .4 153 153 255
-                          .4 153 153 255)
-                 'high)
-           (list 'spring
-                 (string-constant paren-color-spring)
-                 (between 1 255 255 153
-                          1 204 255 153)
-                 'low)
-           (list 'fall
-                 (string-constant paren-color-fall)
-                 (between 1 255 204 153
-                          1 204 153 102)
-                 'low)
-           (list 'winter
-                 (string-constant paren-color-winter)
-                 (between 1 204 205 255
-                          1 238 238 255)
-                 'low))))
-  (cons (list 'basic-grey
-              (string-constant paren-color-basic-grey)
-              (vector (color-prefs:lookup-in-color-scheme 'framework:paren-match-color))
-              'high)
-        parenthesis-color-table))
-
-(define (get-parenthesis-colors) 
-  (let ([choice (or (assoc (preferences:get 'framework:paren-color-scheme)
-                           (get-parenthesis-colors-table))
-                    (car (get-parenthesis-colors-table)))])
-    (caddr choice)))
-
-(define (get-parenthesis-priority) 
-  (let ([choice (or (assoc (preferences:get 'framework:paren-color-scheme)
-                           (get-parenthesis-colors-table))
-                    (car (get-parenthesis-colors-table)))])
-    (list-ref choice 3)))
-
-(define (between start-a start-r start-g start-b end-a end-r end-g end-b)
-  (let ([size 4])
-    (build-vector
-     4 
-     (lambda (x) 
-       (define (between start end) (+ start (* (- end start) (/ x (- size 1)))))
-       (make-object color% 
-         (floor (between start-r end-r))
-         (floor (between start-g end-g))
-         (floor (between start-b end-b))
-         (between start-a end-a))))))
-
-(define -text% (text-mixin text:keymap%))
-
-(define -text-mode<%> (interface ()))
-
-(define text-mode-mixin
-  (mixin (mode:surrogate-text<%>) (-text-mode<%>)
-    ;; The arguments here are only used to be passed to start-colorer.  Refer to its
-    ;; documentation.
-    (init-field (get-token default-lexer) 
-                (token-sym->style (λ (x) "Standard"))
-                (matches null))
-    
-    (define/override (on-disable-surrogate text)
-      (super on-disable-surrogate text)
-      (send text stop-colorer))
-    
-    (define/override (on-enable-surrogate text)
-      (super on-enable-surrogate text)
-      (send text start-colorer token-sym->style get-token matches))
-    
-    (super-new)))
-
-(define text-mode% (text-mode-mixin mode:surrogate-text%))
-
-(define misspelled-text-color-style-name "Misspelled Text")
-
-(define logger (make-logger 'framework/colorer (current-logger)))
-(define-syntax-rule
-  (c-log exp)
-  (when (log-level? logger 'debug)
-    (log-message logger 'debug exp (current-inexact-milliseconds))))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/comment-box.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/comment-box.rkt
deleted file mode 100644
index 23cc6d3fd8..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/comment-box.rkt
+++ /dev/null
@@ -1,125 +0,0 @@
-#lang scheme/base
-
-(require (for-syntax scheme/base)
-         scheme/unit
-         racket/class
-         scheme/gui/base
-         racket/runtime-path
-         "sig.rkt"
-         "../decorated-editor-snip.rkt"
-         string-constants)
-
-(define-runtime-path semicolon-bitmap-path '(lib "icons/semicolon.gif"))
-(provide comment-box@)
-
-(define-unit comment-box@
-  
-  (import [prefix text: framework:text^]
-          [prefix racket: framework:racket^]
-          [prefix keymap: framework:keymap^])
-  (export (rename framework:comment-box^
-                  (-snip% snip%)))
-  
-  (define snipclass%
-    (class decorated-editor-snipclass%
-      (define/override (make-snip stream-in) (instantiate -snip% ()))
-      (super-instantiate ())))
-  
-  (define snipclass (make-object snipclass%))
-  (send snipclass set-version 1)
-  (send snipclass set-classname (format "~s" '(lib "comment-snip.ss" "framework")))
-  (send (get-the-snip-class-list) add snipclass)
-  
-  (define bm (make-object bitmap% semicolon-bitmap-path))
-  
-  (define scheme+copy-self% #f)
-  (define (get-scheme+copy-self%)
-    (unless scheme+copy-self%
-      (set! scheme+copy-self%
-            (class racket:text%
-              (inherit copy-self-to)
-              (define/override (copy-self)
-                (let ([ed (new scheme+copy-self%)])
-                  (copy-self-to ed)
-                  ed))
-              (super-new)
-              (inherit set-max-undo-history)
-              (set-max-undo-history 'forever))))
-    scheme+copy-self%)
-  
-  (define -snip%
-    (class* decorated-editor-snip% (readable-snip<%>)
-      (inherit get-editor get-style)
-      
-      (define/override (make-editor) (new (get-scheme+copy-self%)))
-      (define/override (make-snip) (make-object -snip%))
-      (define/override (get-corner-bitmap) bm)
-      (define/override (get-position) 'left-top)
-      
-      (define/override (get-text offset num [flattened? #t])
-        (let* ([super-res (super get-text offset num flattened?)]
-               [replaced (string-append "; " (regexp-replace* "\n" super-res "\n; "))])
-          (if (char=? #\newline (string-ref replaced (- (string-length replaced) 1)))
-              replaced
-              (string-append replaced "\n"))))
-      
-      
-      (define/override (get-menu)
-        (let ([menu (make-object popup-menu%)])
-          (make-object menu-item% 
-            (string-constant convert-to-semicolon-comment)
-            menu
-            (λ (x y)
-              (let ([to-ed (find-containing-editor)])
-                (when to-ed
-                  (let ([this-pos (find-this-position)])
-                    (when this-pos
-                      (let ([from-ed (get-editor)])
-                        (send to-ed begin-edit-sequence)
-                        (send from-ed begin-edit-sequence)
-                        (copy-contents-with-semicolons-to-position to-ed from-ed (+ this-pos 1))
-                        (send to-ed delete this-pos (+ this-pos 1))
-                        (send to-ed end-edit-sequence)
-                        (send from-ed end-edit-sequence))))))))
-          menu))
-      
-      (inherit get-admin)
-      ;; find-containing-editor : -> (union #f editor)
-      (define/private (find-containing-editor)
-        (let ([admin (get-admin)])
-          (and admin
-               (send admin get-editor))))
-      
-      ;; find-this-position : -> (union #f number)
-      (define/private (find-this-position)
-        (let ([ed (find-containing-editor)])
-          (and ed
-               (send ed get-snip-position this))))
-      
-      ;; copy-contents-with-semicolons-to-position : (is-a? text%) number -> void
-      (define/private (copy-contents-with-semicolons-to-position to-ed from-ed pos)
-        (let loop ([snip (find-last-snip from-ed)])
-          (cond
-            [snip 
-             (when (or (memq 'hard-newline (send snip get-flags))
-                       (memq 'newline (send snip get-flags)))
-               (send to-ed insert "; " pos))
-             (send to-ed insert (send snip copy) pos)
-             (loop (send snip previous))]
-            [else 
-             (send to-ed insert "; " pos)])))
-      
-      ;; find-last-snip : editor -> snip
-      ;; returns the last snip in the editor
-      (define/private (find-last-snip ed)
-        (let loop ([snip (send ed find-first-snip)]
-                   [acc (send ed find-first-snip)])
-          (cond
-            [snip (loop (send snip next) snip)]
-            [else acc])))
-      
-      (define/public (read-special source line column position)
-        (make-special-comment "comment"))
-      (super-instantiate ())
-      (inherit set-snipclass)
-      (set-snipclass snipclass))))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/coroutine.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/coroutine.rkt
deleted file mode 100644
index 640b3fedc3..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/coroutine.rkt
+++ /dev/null
@@ -1,120 +0,0 @@
-#lang racket/base
-(require racket/contract)
-
-(provide coroutine)
-(provide
- (contract-out
-  [coroutine-run (-> coroutine? any/c boolean?)]
-  [coroutine-runnable? (-> coroutine? boolean?)]
-  [coroutine-value (-> coroutine? any/c)]))
-
-(define-syntax-rule
-  (coroutine pause-id first-id exp1 exp2 ...)
-  (coroutine/proc (λ (pause-id first-id) exp1 exp2 ...)))
-
-(struct coroutine ([run-proc #:mutable] [val #:mutable] tag)
-  #:omit-define-syntaxes
-  #:extra-constructor-name
-  make-coroutine)
-
-(define (coroutine/proc cproc)
-  (define tag (make-continuation-prompt-tag 'coroutine))
-  (define (pauser)
-    (call-with-composable-continuation 
-     (λ (k) (abort-current-continuation tag k))
-     tag))
-  (make-coroutine (λ (first-val) (values (cproc pauser first-val) #t))
-                  #f
-                  tag))
-
-(define (coroutine-run a-coroutine val)
-  (cond
-    [(coroutine-run-proc a-coroutine)
-     =>
-     (λ (proc)
-       (define-values (res done?)
-         (call-with-continuation-prompt
-          (λ () (proc val))
-          (coroutine-tag a-coroutine)
-          (λ (k)
-            (set-coroutine-run-proc! 
-             a-coroutine
-             (λ (next-val)
-               (k next-val)))
-            (values #f #f))))
-       (cond
-         [done?
-          (set-coroutine-run-proc! a-coroutine #f)
-          (set-coroutine-val! a-coroutine res)
-          #t]
-         [else #f]))]
-    [else
-     (error 'coroutine-run "coroutine already terminated")]))
-
-(define (coroutine-runnable? a-coroutine)
-  (and (coroutine-run-proc a-coroutine) 
-       #t))
-
-(define (coroutine-value a-coroutine)
-  (when (coroutine-runnable? a-coroutine)
-    (error 'coroutine-value "coroutine not yet finished"))
-  (coroutine-val a-coroutine))
-
-(module+ test
-  (require rackunit)
-  
-  (define c
-    (coroutine
-     pause
-     first
-     (begin
-       (printf "first ~s\n" first)
-       (let loop ([i 5])
-         (printf "i ~a\n" i)
-         (when (zero? (modulo i 3))
-           (printf ">> ~a\n" (pause)))
-         (cond
-           [(zero? i) '()]
-           [else
-            (cons i (loop (- i 1)))])))))
-  
-  (define (with-stdout th)
-    (define sp (open-output-string))
-    (list (parameterize ([current-output-port sp])
-            (th))
-          (get-output-string sp)))
-  
-  (check-equal? (with-stdout (λ () (coroutine-run c 123)))
-                (list #f "first 123\ni 5\ni 4\ni 3\n"))
-  
-  (check-equal? (with-stdout (λ () (coroutine-run c 456)))
-                (list #f ">> 456\ni 2\ni 1\ni 0\n"))
-  
-  (check-equal? (with-stdout (λ () (coroutine-run c 789)))
-                (list #t ">> 789\n"))
-  
-  (check-equal? (coroutine-value c)
-                '(5 4 3 2 1))
-  
-  
-  (define c2
-    (coroutine
-     pause first
-     (define x first)
-     (define (try-it)
-       (define new-x (pause))
-       (printf "~a => ~a\n" x new-x)
-       (set! x new-x))
-     (try-it)
-     (try-it)
-     x))
-  
-  (check-equal? (with-stdout (λ () (coroutine-run c2 0)))
-                (list #f ""))
-  (check-equal? (with-stdout (λ () (coroutine-run c2 1)))
-                (list #f "0 => 1\n"))
-  (check-equal? (with-stdout (λ () (coroutine-run c2 2)))
-                (list #t "1 => 2\n"))
-  (check-equal? (coroutine-value c2)
-                2))
-
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/decode.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/decode.rkt
deleted file mode 100644
index 6f21e0793a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/decode.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base file/gunzip net/base64))
-(provide (except-out (all-from-out racket/base) #%module-begin)
-         (rename-out [module-begin #%module-begin]))
-
-(define-syntax (module-begin stx)
-  (syntax-case stx ()
-    [(_ x ...)
-     (andmap (lambda (x) (or (identifier? x) (integer? (syntax-e x))))
-             (syntax->list #'(x ...)))
-     (let* ([data  (format "~a" (syntax->datum #'(x ...)))]
-            [data  (substring data 1 (sub1 (string-length data)))]
-            [data  (string->bytes/utf-8 data)]
-            [in    (open-input-bytes (base64-decode data))]
-            [out   (open-output-string)]
-            [out   (begin (inflate in out) (get-output-string out))]
-            [exprs (read (open-input-string (string-append "(" out ")")))]
-            [exprs (datum->syntax stx exprs stx)])
-       #`(#%module-begin #,@exprs))]))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/decorated-editor-snip.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/decorated-editor-snip.rkt
deleted file mode 100644
index 39a322df97..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/decorated-editor-snip.rkt
+++ /dev/null
@@ -1,243 +0,0 @@
-#lang scheme/base
-
-(require scheme/gui/base
-         racket/class)
-
-(provide editor-snip:decorated%
-         editor-snip:decorated-snipclass%
-         editor-snip:decorated-mixin
-         editor-snip:decorated<%>)
-
-(require "../preferences.rkt")
-
-(define editor-snip:decorated<%>
-  (interface ((class->interface editor-snip%))
-    get-corner-bitmap
-    get-color
-    get-menu
-    get-position
-    reset-min-sizes))
-
-(define editor-snip:decorated-mixin
-  (mixin ((class->interface editor-snip%)) (editor-snip:decorated<%>)
-    
-    (init [with-border? #t])
-    (define draw-border? with-border?)
-    
-    ;; get-corner-bitmap : -> (union #f (is-a?/c bitmap%))
-    ;; returns the bitmap to be shown in the top right corner.
-    (define/public (get-corner-bitmap) #f)
-    
-    ;; get-color : -> (union string (is-a?/c color%))
-    (define/public (get-color) (if (preferences:get 'framework:white-on-black?) "white" "black"))
-    
-    ;; get-menu : -> (union #f (is-a?/c popup-menu%))
-    ;; returns the popup menu that should appear
-    ;; when clicking in the top part of the snip.
-    (define/public (get-menu) #f)
-    
-    ;; get-position : -> (union 'top-right 'left-top)
-    ;; returns the location of the image and the clickable
-    ;; region. 'top-right indicates top portion is clickable
-    ;; and icon on right. 'left-top means left portion is
-    ;; clickable and icon on top.
-    (define/public (get-position) 'top-right)
-    
-    [define/private (get-pen) (send the-pen-list find-or-create-pen (get-color) 1 'solid)]
-    [define/private (get-brush) (send the-brush-list find-or-create-brush "BLACK" 'transparent)]
-    
-    (inherit get-admin)
-    (define/override (on-event dc x y editorx editory evt)
-      (cond
-        [(eq? (send evt get-event-type) 'right-down)
-         (let ([sx (- (send evt get-x) x)]
-               [sy (- (send evt get-y) y)]
-               [bil (box 0)]
-               [bit (box 0)]
-               [bir (box 0)]
-               [bib (box 0)]
-               [bw (box 0)]
-               [bh (box 0)]
-               [bml (box 0)]
-               [bmt (box 0)]
-               [bmr (box 0)]
-               [bmb (box 0)]
-               [menu (get-menu)])
-           (get-extent dc x y bw bh #f #f #f #f)
-           (get-inset bil bit bir bib)
-           (get-margin bml bmt bmr bmb)
-           (let ([in-range
-                  (case (get-position)
-                    [(top-right)
-                     (and (<= 0 sx (unbox bw))
-                          (<= 0 sy (unbox bmt)))]
-                    [(left-top)
-                     (and (<= 0 sx (unbox bml))
-                          (<= 0 sy (unbox bh)))]
-                    [else #f])])
-             (cond
-               [(and menu in-range)
-                (let ([admin (get-admin)])
-                  (when admin
-                    (send admin popup-menu menu this (+ sx 1) (+ sy 1))))]
-               [else (super on-event dc x y editorx editory evt)])))]
-        [else
-         (super on-event dc x y editorx editory evt)]))
-    
-    (inherit get-extent get-inset)
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (let ([bm (get-corner-bitmap)]
-            [bil (box 0)]
-            [bit (box 0)]
-            [bir (box 0)]
-            [bib (box 0)]
-            [bw (box 0)]
-            [bh (box 0)]
-            [bml (box 0)]
-            [bmt (box 0)]
-            [bmr (box 0)]
-            [bmb (box 0)])
-        (get-extent dc x y bw bh #f #f #f #f)
-        (get-inset bil bit bir bib)
-        (get-margin bml bmt bmr bmb)
-        (super draw dc x y left top right bottom dx dy draw-caret)
-        (let* ([old-pen (send dc get-pen)]
-               [old-brush (send dc get-brush)]
-               [white-on-black? (preferences:get 'framework:white-on-black?)])
-          
-          (send dc set-pen (send the-pen-list find-or-create-pen 
-                                 (if white-on-black? "black" "white")
-                                 1
-                                 'transparent))
-          (send dc set-brush (send the-brush-list find-or-create-brush 
-                                   (if white-on-black? "black" "white")
-                                   'solid))
-          (case (get-position)
-            [(top-right)
-             (send dc draw-rectangle 
-                   (+ x (unbox bml))
-                   (+ y (unbox bit))
-                   (max 0 (- (unbox bw) (unbox bml) (unbox bmr)))
-                   (- (unbox bmt) (unbox bit)))]
-            [(left-top)
-             (send dc draw-rectangle 
-                   (+ x (unbox bil))
-                   (+ y (unbox bmt))
-                   (- (unbox bml) (unbox bil))
-                   (max 0 (- (unbox bh) (unbox bmt) (unbox bmb))))])
-          
-          (send dc set-pen (send the-pen-list find-or-create-pen
-                                 (if white-on-black? "white" "black")
-                                 1
-                                 'solid))
-          (send dc set-brush (send the-brush-list find-or-create-brush 
-                                   (if white-on-black? "white" "black")
-                                   'solid))
-          
-          (when bm
-            (let ([bm-w (send bm get-width)]
-                  [bm-h (send bm get-height)])
-              (case (get-position)
-                [(top-right)
-                 (send dc draw-bitmap
-                       bm
-                       (+ x (max 0
-                                 (- (unbox bw)
-                                    (unbox bmr)
-                                    bm-w)))
-                       ;; leave two pixels above and two below (see super-instantiate below)
-                       (+ y (unbox bit) 2))]
-                [(left-top)
-                 (send dc draw-bitmap
-                       bm
-                       ;; leave two pixels left and two right (see super-instantiate below)
-                       (+ x (unbox bil) 2)
-                       (+ y (unbox bmt)))])))
-          
-          (when draw-border?
-            (send dc set-pen (get-pen))
-            (send dc set-brush (get-brush))
-            (send dc draw-rectangle
-                  (+ x (unbox bil))
-                  (+ y (unbox bit))
-                  (max 0 (- (unbox bw) (unbox bil) (unbox bir)))
-                  (max 0 (- (unbox bh) (unbox bit) (unbox bib)))))
-          
-          (send dc set-pen old-pen)
-          (send dc set-brush old-brush))))
-    
-    (inherit set-min-width set-min-height get-margin)
-    (define/public (reset-min-sizes)
-      (let ([bm (get-corner-bitmap)])
-        (when bm
-          (case (get-position)
-            [(top-right)
-             (set-min-width (+ 4 (send bm get-width)))]
-            [(left-top)
-             (set-min-height (+ 4 (send bm get-height)))]))))
-    
-    (let ([top-margin 
-           (case (get-position)
-             [(top-right)
-              (+ 4 
-                 (let ([bm (get-corner-bitmap)])
-                   (if bm
-                       (send bm get-height)
-                       0)))]
-             [else 4])]
-          [left-margin
-           (case (get-position)
-             [(left-top)
-              (+ 4
-                 (let ([bm (get-corner-bitmap)])
-                   (if bm
-                       (send bm get-width)
-                       0)))]
-             [else 4])])
-      (super-new
-       (with-border? #f)
-       (top-margin top-margin)
-       (left-margin left-margin)))
-    
-    (inherit use-style-background)
-    (use-style-background #t)
-    
-    (reset-min-sizes)))
-
-(define editor-snip:decorated%
-  (class (editor-snip:decorated-mixin editor-snip%)
-    (inherit get-editor get-style)
-    
-    ;; make-snip : -> this%
-    ;; returns an instance of this class. used in the copy method
-    (define/public (make-snip) (make-object editor-snip:decorated%))
-    
-    ;; make-editor : -> editor<%>
-    ;; returns the editor to be used in this snip.
-    (define/public (make-editor) (make-object text%))
-    
-    (define/override write
-      (λ (stream-out)
-        (send (get-editor) write-to-file stream-out 0 'eof)))
-    
-    (define/override (copy)
-      (let ([snip (make-snip)])
-        (send snip set-editor (send (get-editor) copy-self))
-        (send snip set-style (get-style))
-        snip))
-    
-    (super-new
-     (editor (make-editor)))))
-
-(define editor-snip:decorated-snipclass%
-  (class snip-class%
-    
-    ;; make-snip : stream-in -> (is-a?/c snip%)
-    ;; returns an unfilled version of the snip
-    (define/public (make-snip stream-in) (make-object editor-snip:decorated%))
-    
-    (define/override (read stream-in)
-      (let ([snip (make-snip stream-in)])
-        (send (send snip get-editor) read-from-file stream-in #f)
-        snip))
-    (super-new)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/early-init.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/early-init.rkt
deleted file mode 100644
index 56d3d0966c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/early-init.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/unit
-(require "sig.rkt"
-         "../preferences.rkt")
-(import [prefix preferences: framework:preferences^])
-(export framework:early-init^)
-(init-depend framework:preferences^)
-
-(preferences:low-level-get-preference preferences:get-preference/gui)
-(preferences:low-level-put-preferences preferences:put-preferences/gui)
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/editor.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/editor.rkt
deleted file mode 100644
index 8c886371df..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/editor.rkt
+++ /dev/null
@@ -1,753 +0,0 @@
-#lang racket/unit
-
-  (require mzlib/class
-           string-constants
-           "sig.rkt"
-           "../preferences.rkt"
-           "../gui-utils.rkt"
-           mzlib/etc
-           mred/mred-sig
-           racket/path)
-  
-  (import mred^
-          [prefix autosave: framework:autosave^]
-          [prefix finder: framework:finder^]
-          [prefix path-utils: framework:path-utils^]
-          [prefix keymap: framework:keymap^]
-          [prefix icon: framework:icon^]
-          [prefix text: framework:text^]
-          [prefix pasteboard: framework:pasteboard^]
-          [prefix frame: framework:frame^]
-          [prefix handler: framework:handler^])
-  (export (rename framework:editor^
-                  [-keymap<%> keymap<%>]))
-  (init-depend mred^ framework:autosave^)
-  
-  ;; renaming, for editor-mixin where get-file is shadowed by a method.
-  (define mred:get-file get-file) 
-  
-  (define basic<%>
-    (interface (editor<%>)
-      has-focus?
-      local-edit-sequence?
-      run-after-edit-sequence
-      get-top-level-window
-      save-file-out-of-date?
-      save-file/gui-error
-      load-file/gui-error
-      on-close
-      can-close?
-      close
-      get-filename/untitled-name
-      
-      get-pos/text
-      get-pos/text-dc-location))
-  
-  (define basic-mixin
-    (mixin (editor<%>) (basic<%>)
-      
-      (define/pubment (can-close?) (inner #t can-close?))
-      (define/pubment (on-close) (inner (void) on-close))
-      (define/public (close) (if (can-close?)
-                                 (begin (on-close) #t)
-                                 #f))
-      
-      (define/public (get-pos/text event)
-        (get-pos/text-dc-location (send event get-x) (send event get-y)))
-      
-      (define/public (get-pos/text-dc-location event-x event-y)
-        (let ([on-it? (box #f)])
-          (let loop ([editor this])
-            (let-values ([(x y) (send editor dc-location-to-editor-location event-x event-y)])
-              (cond
-                [(is-a? editor text%)
-                 (let ([pos (send editor find-position x y #f on-it?)])
-                   (cond
-                     [(not (unbox on-it?)) (values #f #f)]
-                     [else
-                      (let ([snip (send editor find-snip pos 'after-or-none)])
-                        (if (and snip
-                                 (is-a? snip editor-snip%))
-                            (loop (send snip get-editor))
-                            (values pos editor)))]))]
-                [(is-a? editor pasteboard%)
-                 (let ([snip (send editor find-snip x y)])
-                   (if (and snip
-                            (is-a? snip editor-snip%))
-                       (loop (send snip get-editor))
-                       (values #f editor)))]
-                [else (values #f #f)])))))
-      
-      ;; get-filename/untitled-name : -> string
-      ;; returns a string representing the visible name for this file,
-      ;; or "Untitled <n>" for some n.
-      (define untitled-name #f)
-      (define/public (get-filename/untitled-name)
-        (let ([filename (get-filename)])
-          (if filename
-              (path->string filename)
-              (begin
-                (unless untitled-name
-                  (set! untitled-name (gui-utils:next-untitled-name)))
-                untitled-name))))
-      
-      (inherit get-filename save-file)
-      (define/public save-file/gui-error
-        (opt-lambda ([input-filename #f]
-                     [fmt 'same]
-                     [show-errors? #t])
-          (let ([filename (if (or (not input-filename)
-                                  (equal? input-filename ""))
-                              (let ([internal-filename (get-filename)])
-                                (if (or (not internal-filename)
-                                        (equal? internal-filename ""))
-                                    (put-file #f #f)
-                                    internal-filename))
-                              input-filename)])
-            (with-handlers ([exn:fail?
-                             (λ (exn)
-                               (message-box
-                                (string-constant error-saving)
-                                (string-append
-                                 (format (string-constant error-saving-file/name) 
-                                         filename)
-                                 "\n\n"
-                                 (format-error-message exn))
-                                #f
-                                '(stop ok))
-                               #f)])
-              (when filename
-                (save-file filename fmt #f))
-              #t))))
-      
-      (inherit load-file)
-      (define/public load-file/gui-error
-        (opt-lambda ([input-filename #f]
-                     [fmt 'guess]
-                     [show-errors? #t])
-          (let ([filename (if (or (not input-filename)
-                                  (equal? input-filename ""))
-                              (let ([internal-filename (get-filename)])
-                                (if (or (not internal-filename)
-                                        (equal? internal-filename ""))
-                                    (get-file #f)
-                                    internal-filename))
-                              input-filename)])
-            (with-handlers ([exn:fail?
-                             (λ (exn)
-                               (message-box 
-                                (string-constant error-loading)
-                                (string-append
-                                 (format (string-constant error-loading-file/name)
-                                         filename)
-                                 "\n\n"
-                                 (format-error-message exn))
-                                #f
-                                '(stop ok))
-                               #f)])
-              (load-file input-filename fmt show-errors?)
-              #t))))
-      
-      (define/private (format-error-message exn)
-        (if (exn? exn)
-            (format "~a" (exn-message exn))
-            (format "uncaught exn: ~s" exn)))
-      
-      (inherit refresh-delayed? 
-               get-canvas
-               get-admin)
-      
-      (define/augment (can-save-file? filename format)
-        (and (if (equal? filename (get-filename))
-                 (if (save-file-out-of-date?)
-                     (gui-utils:get-choice 
-                      (string-constant file-has-been-modified)
-                      (string-constant overwrite-file-button-label)
-                      (string-constant cancel)
-                      (string-constant warning)
-                      #f
-                      (get-top-level-window))
-                     #t)
-                 #t)
-             (inner #t can-save-file? filename format)))
-      
-      (define last-saved-file-time #f)
-      
-      (define/augment (after-save-file success?)
-        (define temp-b (box #f))
-        (define filename (get-filename temp-b))
-
-        ;; update recently opened file names
-        (unless (unbox temp-b)
-          (when filename
-            (handler:add-to-recent filename)))
-        
-        ;; update last-saved-file-time
-        (unless (doing-autosave?)
-          (unless (unbox temp-b)
-            (when success?
-              (set! last-saved-file-time
-                    (and filename
-                         (file-exists? filename)
-                         (file-or-directory-modify-seconds filename))))))
-        
-        (inner (void) after-save-file success?))
-      
-      (define/augment (after-load-file success?)
-        (when success?
-          (define temp-b (box #f))
-          (define filename (get-filename temp-b))
-          (unless (unbox temp-b)
-            (set! last-saved-file-time
-                  (and filename
-                       (file-exists? filename)
-                       (file-or-directory-modify-seconds filename)))))
-        (inner (void) after-load-file success?))
-      
-      (define/public (save-file-out-of-date?)
-        (and last-saved-file-time
-             (let ([fn (get-filename)])
-               (and fn
-                    (file-exists? fn)
-                    (let ([ms (file-or-directory-modify-seconds fn)])
-                      (< last-saved-file-time ms))))))
-      
-      (define has-focus #f)
-      (define/override (on-focus x)
-        (set! has-focus x)
-        (super on-focus x))
-      (define/public (has-focus?) has-focus)
-      
-      (define/public (get-top-level-window)
-        (let loop ([text this])
-          (let ([editor-admin (send text get-admin)])
-            (cond
-              [(is-a? editor-admin editor-snip-editor-admin<%>)
-               (let* ([snip (send editor-admin get-snip)]
-                      [snip-admin (send snip get-admin)])
-                 (loop (send snip-admin get-editor)))]
-              [(send text get-canvas) 
-               => 
-               (λ (canvas)
-                 (send canvas get-top-level-window))]
-              [else #f]))))
-      
-      [define edit-sequence-queue null]
-      [define edit-sequence-ht (make-hasheq)]
-      [define in-local-edit-sequence? #f]
-      [define/public local-edit-sequence? (λ () in-local-edit-sequence?)]
-      [define/public run-after-edit-sequence
-        (case-lambda 
-          [(t) (run-after-edit-sequence t #f)]
-          [(t sym)
-           (unless (and (procedure? t)
-                        (= 0 (procedure-arity t)))
-             (error 'editor:basic::run-after-edit-sequence
-                    "expected procedure of arity zero, got: ~s\n" t))
-           (unless (or (symbol? sym) (not sym))
-             (error 'editor:basic::run-after-edit-sequence
-                    "expected second argument to be a symbol or #f, got: ~s\n"
-                    sym))
-           (if (refresh-delayed?)
-               (if in-local-edit-sequence?
-                   (cond
-                     [(symbol? sym)
-                      (hash-set! edit-sequence-ht sym t)]
-                     [else (set! edit-sequence-queue
-                                 (cons t edit-sequence-queue))])
-                   (let ([snip-admin (get-admin)])
-                     (cond
-                       [(not snip-admin)
-                        (t)] ;; refresh-delayed? is always #t when there is no admin.
-                       [(is-a? snip-admin editor-snip-editor-admin<%>)
-                        (let loop ([ed this])
-                          (let ([snip-admin (send ed get-admin)])
-                            (if (is-a? snip-admin editor-snip-editor-admin<%>)
-                                (let ([up-one
-                                       (send (send (send snip-admin get-snip) get-admin) get-editor)])
-                                  (if (is-a? up-one basic<%>)
-                                      (send up-one run-after-edit-sequence t sym)
-                                      (loop up-one)))
-                                
-                                ;; here we are in an embdedded editor that is not
-                                ;; in an edit sequence and the "parents" of the embdedded editor
-                                ;; are all non-basic<%> objects, so we just run the thunk now.
-                                (t))))]
-                       [else
-                        '(message-box "run-after-edit-sequence error"
-                                      (format "refresh-delayed? is #t but snip admin, ~s, is not an editor-snip-editor-admin<%>"
-                                              snip-admin))
-                        '(t)
-                        (void)])))
-               (t))
-           (void)])]
-      [define/public extend-edit-sequence-queue
-        (λ (l ht)
-          (hash-for-each ht (λ (k t) (hash-set! edit-sequence-ht k t)))
-          (set! edit-sequence-queue (append l edit-sequence-queue)))]
-      (define/augment (on-edit-sequence)
-        (set! in-local-edit-sequence? #t)
-        (inner (void) on-edit-sequence))
-      (define/augment (after-edit-sequence)
-        (set! in-local-edit-sequence? #f)
-        (let ([queue edit-sequence-queue]
-              [ht edit-sequence-ht]
-              [find-enclosing-editor
-               (λ (editor)
-                 (let ([admin (send editor get-admin)])
-                   (cond
-                     [(is-a? admin editor-snip-editor-admin<%>)
-                      (send (send (send admin get-snip) get-admin) get-editor)]
-                     [else #f])))])
-          (set! edit-sequence-queue null)
-          (set! edit-sequence-ht (make-hash))
-          (let loop ([editor (find-enclosing-editor this)])
-            (cond
-              [(and editor 
-                    (is-a? editor basic<%>)
-                    (not (send editor local-edit-sequence?)))
-               (loop (find-enclosing-editor editor))]
-              [(and editor
-                    (is-a? editor basic<%>))
-               (send editor extend-edit-sequence-queue queue ht)]
-              [else
-               (hash-for-each ht (λ (k t) (t)))
-               (for-each (λ (t) (t)) queue)])))
-        (inner (void) after-edit-sequence))
-      
-      (define/override (on-new-box type)
-        (cond
-          [(eq? type 'text) (make-object editor-snip% (make-object text:basic%))]
-          [else (make-object editor-snip% (make-object pasteboard:basic%))]))
-      
-      (define/override (on-new-image-snip filename kind relative-path? inline?)
-        (super on-new-image-snip 
-               filename
-               (if (eq? kind 'unknown) 'unknown/mask kind) 
-               relative-path? 
-               inline?))
-      
-      (define/override (get-file d)
-        (parameterize ([finder:dialog-parent-parameter
-                        (get-top-level-window)])
-          (finder:get-file d)))
-      (define/override (put-file d f)
-        (parameterize ([finder:dialog-parent-parameter
-                        (get-top-level-window)])
-          (finder:put-file f d)))
-      
-      (super-new)))
-  
-  (define standard-style-list (new style-list%))
-  (define (get-standard-style-list) standard-style-list)
-  
-  (define default-color-style-name "framework:default-color")
-  (define (get-default-color-style-name) default-color-style-name)
-  
-  (let ([delta (make-object style-delta% 'change-normal)])
-    (send delta set-delta 'change-family 'modern)
-    (let ([style (send standard-style-list find-named-style "Standard")])
-      (if style
-          (send style set-delta delta)
-          (send standard-style-list new-named-style "Standard"
-                (send standard-style-list find-or-create-style
-                      (send standard-style-list basic-style)
-                      delta)))))
-  
-  (let ([delta (make-object style-delta%)]
-        [style (send standard-style-list find-named-style default-color-style-name)])
-    (if style
-        (send style set-delta delta)
-        (send standard-style-list new-named-style default-color-style-name
-              (send standard-style-list find-or-create-style
-                    (send standard-style-list find-named-style "Standard")
-                    delta))))
-  
-(define (set-default-font-color color [bg-color #f])
-  (define the-standard (send standard-style-list find-named-style default-color-style-name))
-  (define the-delta (make-object style-delta%))
-  (send the-standard get-delta the-delta)
-  (send the-delta set-delta-foreground color)
-  (when bg-color (send the-delta set-delta-background bg-color))
-  (send the-standard set-delta the-delta))
-  
-  (define (set-font-size size)
-    (update-standard-style
-     (λ (the-delta)
-       (send the-delta set-size-mult 0)
-       (send the-delta set-size-add size))))
-  
-  (define (set-font-name name)
-    (update-standard-style
-     (λ (the-delta)
-       (send the-delta set-delta-face name)
-       (send the-delta set-family 'modern))))
-  
-  (define (set-font-smoothing sym)
-    (update-standard-style
-     (λ (the-delta)
-       (send the-delta set-smoothing-on sym))))
-  
-  (define (update-standard-style cng-delta)
-    (let* ([the-standard (send standard-style-list find-named-style "Standard")]
-           [the-delta (make-object style-delta%)])
-      (send the-standard get-delta the-delta)
-      (cng-delta the-delta)
-      (send the-standard set-delta the-delta)))
-  
-  (define standard-style-list<%>
-    (interface (editor<%>)
-      ))
-  
-  (define standard-style-list-mixin
-    (mixin (editor<%>) (standard-style-list<%>)
-      (super-new)
-      (inherit set-style-list set-load-overwrites-styles)
-      (set-style-list standard-style-list)
-      (set-load-overwrites-styles #f)))
-  
-    
-  ;; the 'set-font-size' function can be slow,
-  ;; as it involves redrawing every frame
-  ;; so we do the change on a low-priority
-  ;; callback so we don't get too many of these
-  ;; piling up.
-  (define (set-font-size/callback size)
-    (set! set-font-size-callback-size size)
-    (unless set-font-size-callback-running?
-      (set! set-font-size-callback-running? #t)
-      (queue-callback
-       (λ ()
-         (set-font-size set-font-size-callback-size)
-         (set! set-font-size-callback-running? #f))
-       #f)
-      (set! set-font-size-callback-running? #t)))  
-  (define set-font-size-callback-running? #f)
-  (define set-font-size-callback-size #f)
-
-  (define (set-standard-style-list-pref-callbacks)
-    (set-font-size (get-current-preferred-font-size))
-    (set-font-name (preferences:get 'framework:standard-style-list:font-name))
-    (set-font-smoothing (preferences:get 'framework:standard-style-list:smoothing))
-    (preferences:add-callback 'framework:standard-style-list:font-size 
-                              (λ (p v)
-                                (set-font-size/callback (font-size-pref->current-font-size v))))
-    (preferences:add-callback 'framework:standard-style-list:font-name (λ (p v) (set-font-name v)))
-    (preferences:add-callback 'framework:standard-style-list:smoothing (λ (p v) (set-font-smoothing v)))
-    (define fl (get-face-list))
-    (unless (member (preferences:get 'framework:standard-style-list:font-name) fl)
-      (define preferred-font 
-        (cond
-          [(equal? (system-type) 'macosx)
-           (define preferred-font "Menlo")
-           (if (member preferred-font fl)
-               preferred-font
-               (get-family-builtin-face 'modern))]
-          [else (get-family-builtin-face 'modern)]))
-      (preferences:set 'framework:standard-style-list:font-name preferred-font)))
-  
-  (define (get-current-preferred-font-size)
-    (font-size-pref->current-font-size (preferences:get 'framework:standard-style-list:font-size)))
-  
-  (define (font-size-pref->current-font-size v)
-    (define default-size (vector-ref v 1))
-    (cond
-      [change-font-size-when-monitors-change?
-       (define monitor-sizes (get-current-monitor-sizes))
-       (hash-ref (vector-ref v 0) monitor-sizes default-size)]
-      [else
-       default-size]))
-  
-  (define change-font-size-when-monitors-change? #f)
-  (define (get-change-font-size-when-monitors-change?)
-    change-font-size-when-monitors-change?)
-  (define (set-change-font-size-when-monitors-change? b?)
-    (unless (equal? change-font-size-when-monitors-change? b?)
-      (set! change-font-size-when-monitors-change? b?)
-      (set-current-preferred-font-size
-       (get-current-preferred-font-size))))
-  
-  
-  (define (set-current-preferred-font-size new-size)
-    (unless (exact-nonnegative-integer? new-size)
-      (raise-argument-error 'set-current-preferred-font-size
-                            "exact-nonnegative-integer?"
-                            new-size))
-    (define old-pref (preferences:get 'framework:standard-style-list:font-size))
-    (define current-mons (get-current-monitor-sizes))
-    (define new-monitor-sizes
-      (hash-set (vector-ref old-pref 0)
-                current-mons
-                new-size))
-    (preferences:set 'framework:standard-style-list:font-size
-                     (vector new-monitor-sizes new-size)))
-  
-  (define (get-current-monitor-sizes)
-    (let loop ([m (get-display-count)]
-               [sizes '()])
-      (cond
-        [(zero? m) sizes]
-        [else
-         (define-values (w h) (get-display-size #:monitor (- m 1)))
-         (loop (- m 1)
-               (if (and w h)
-                   (cons (list w h) sizes)
-                   sizes))])))
-  
-  ;; set-standard-style-list-delta : string (is-a?/c style-delta<%>) -> void
-  (define (set-standard-style-list-delta name delta)
-    (let* ([style-list (get-standard-style-list)]
-           [style (send style-list find-named-style name)])
-      (if style
-          (send style set-delta delta)
-          (send style-list new-named-style name
-                (send style-list find-or-create-style
-                      (send style-list find-named-style "Standard")
-                      delta)))
-      (void)))
-  
-  (define -keymap<%> (interface (basic<%>) get-keymaps))
-  (define keymap-mixin
-    (mixin (basic<%>) (-keymap<%>)
-      (define/public (get-keymaps)
-        (list (keymap:get-user) (keymap:get-global)))
-      (inherit set-keymap)
-      
-      (super-new)
-      (let ([keymap (make-object keymap:aug-keymap%)])
-        (set-keymap keymap)
-        (for-each (λ (k) (send keymap chain-to-keymap k #f))
-                  (get-keymaps)))))
-  
-  (define (add-after-user-keymap km kms)
-    (let loop ([kms kms])
-      (cond
-        [(null? kms) (list km)]
-        [else
-         (let ([f (car kms)])
-           (if (eq? f (keymap:get-user))
-               (list* f km (cdr kms))
-               (cons f (loop (cdr kms)))))])))
-  
-  (define autowrap<%> (interface (basic<%>)))
-  (define autowrap-mixin
-    (mixin (basic<%>) (autowrap<%>)
-      (inherit auto-wrap)
-      (super-instantiate ())
-      (auto-wrap 
-       (preferences:get
-        'framework:auto-set-wrap?))))
-  
-  (define file<%> 
-    (interface (-keymap<%>)
-      get-can-close-parent
-      update-frame-filename
-      allow-close-with-no-filename?))
-  
-  (define file-mixin
-    (mixin (-keymap<%>) (file<%>)
-      (inherit get-filename lock get-style-list 
-               is-modified? set-modified 
-               get-top-level-window)
-      
-      (inherit get-canvases get-filename/untitled-name)
-      (define/public (update-frame-filename)
-        (let* ([filename (get-filename)]
-               [name (if filename
-                         (path->string 
-                          (file-name-from-path 
-                           filename))
-                         (get-filename/untitled-name))])
-          (for-each (λ (canvas)
-                      (let ([tlw (send canvas get-top-level-window)])
-                        (when (and (is-a? tlw frame:editor<%>)
-                                   (eq? this (send tlw get-editor)))
-                          (send tlw set-label name))))
-                    (get-canvases))))
-      
-      (define/override set-filename
-        (case-lambda
-          [(name) (set-filename name #f)]
-          [(name temp?)
-           (super set-filename name temp?)
-           (unless temp?
-             (update-frame-filename))]))
-      
-      (inherit save-file)
-      (define/public (allow-close-with-no-filename?) #f)
-      (define/augment (can-close?)
-        (and (user-saves-or-not-modified?)
-             (inner #t can-close?)))
-      
-      (define/public (user-saves-or-not-modified? [allow-cancel? #t])
-        (or (not (is-modified?))
-            (and (not (get-filename))
-                 (allow-close-with-no-filename?))
-            (case (gui-utils:unsaved-warning
-                   (get-filename/untitled-name)
-                   (string-constant dont-save)
-                   #t
-                   (or (get-top-level-window)
-                       (get-can-close-parent))
-                   allow-cancel?)
-              [(continue) #t]
-              [(save) (save-file)]
-              [else #f])))
-      
-      (define/public (get-can-close-parent) #f)
-      
-      (define/override (get-keymaps)
-        (add-after-user-keymap (keymap:get-file) (super get-keymaps)))
-      (super-new)))
-  
-  (define backup-autosave<%>
-    (interface (basic<%>)
-      backup?
-      autosave?
-      do-autosave
-      remove-autosave))
-
-  (define doing-autosave? (make-parameter #f))
-
-  (define backup-autosave-mixin
-    (mixin (basic<%>) (backup-autosave<%> autosave:autosavable<%>)
-      (inherit is-modified? get-filename save-file)
-      [define auto-saved-name #f]
-      [define auto-save-out-of-date? #t]
-      [define auto-save-error? #f]
-      (define/private (file-old? filename)
-        (if (and filename
-                 (file-exists? filename))
-            (let ([modified-seconds (file-or-directory-modify-seconds filename)]
-                  [old-seconds (- (current-seconds) (* 7 24 60 60))])
-              (< modified-seconds old-seconds))
-            #t))
-      (define/public (backup?) (preferences:get 'framework:backup-files?))
-      (define/augment (on-save-file name format)
-        (when (and (backup?)
-                   (not (eq? format 'copy))
-                   (file-exists? name))
-          (let ([back-name (path-utils:generate-backup-name name)])
-            (when (or (not (file-exists? back-name))
-                      (file-old? back-name))
-              (with-handlers ([exn:fail? 
-                               (λ (exn)
-                                 (log-debug "failed to clean up autosave file.1: ~a" back-name))])
-                (when (file-exists? back-name)
-                  (delete-file back-name))
-                (copy-file name back-name)))))
-        (inner (void) on-save-file name format))
-      (define/augment (after-save-file success?)
-        (when success?
-          (set! auto-save-error? #f))
-        (inner (void) after-save-file success?))
-
-      (define/augment (on-close)
-        (remove-autosave)
-        (set! do-autosave? #f)
-        (inner (void) on-close))
-      (define/augment (on-change)
-        (set! auto-save-out-of-date? #t)
-        (inner (void) on-change))
-      (define/override (set-modified modified?)
-        (when auto-saved-name
-          (if modified?
-              (set! auto-save-out-of-date? #t)
-              (remove-autosave)))
-        (super set-modified modified?))
-      
-      [define do-autosave? #t]
-      (define/public (autosave?) do-autosave?)
-      
-      (define/public (do-autosave)
-        (cond
-          [(and (autosave?)
-                (not auto-save-error?)
-                (is-modified?)
-                (or (not auto-saved-name)
-                    auto-save-out-of-date?))
-           (let* ([orig-name (get-filename)]
-                  [old-auto-name auto-saved-name]
-                  [auto-name (path-utils:generate-autosave-name orig-name)]
-                  [orig-format (and (is-a? this text%)
-                                    (send this get-file-format))])
-             (when (is-a? this text%)
-               (send this set-file-format 'standard))
-             (with-handlers ([exn:fail?
-                              (λ (exn)
-                                (show-autosave-error exn orig-name)
-                                (set! auto-save-error? #t)
-                                (when (is-a? this text%)
-                                  (send this set-file-format orig-format))
-                                #f)])
-               (parameterize ([doing-autosave? #t])
-                 (save-file auto-name 'copy #f))
-               (when (is-a? this text%)
-                 (send this set-file-format orig-format))
-               (when old-auto-name
-                 (when (file-exists? old-auto-name)
-                   (delete-file old-auto-name)))
-               (set! auto-saved-name auto-name)
-               (set! auto-save-out-of-date? #f)
-               auto-name))]
-          [else auto-saved-name]))
-      
-      ;; show-autosave-error : any (union #f string) -> void
-      ;; opens a message box displaying the exn and the filename
-      ;; to the user.
-      (define/private (show-autosave-error exn orig-name)
-        (message-box 
-         (string-constant warning)
-         (apply
-          string-append
-          (format (string-constant error-autosaving)
-                  (or orig-name (string-constant untitled)))
-          "\n"
-          (string-constant autosaving-turned-off)
-          "\n\n"
-          (if (exn? exn)
-              (format "~a" (exn-message exn))
-              (format "~s" exn))
-          "\n\n"
-          (if (and (exn? exn)
-                   (continuation-mark-set? (exn-continuation-marks exn)))
-              (for/list ([fr (in-list (continuation-mark-set->context 
-                                       (exn-continuation-marks exn)))])
-                (format "   ~s\n" fr))
-              '()))
-         #f
-         '(caution ok)))
-      
-      (define/public (remove-autosave)
-        (when auto-saved-name
-          (when (file-exists? auto-saved-name)
-            (with-handlers ([exn:fail? 
-                             (λ (exn)
-                               (log-debug "failed to clean up autosave file.2: ~a" 
-                                          auto-saved-name))])            
-              (delete-file auto-saved-name)
-              (set! auto-saved-name #f)))))
-      (super-new)
-      (autosave:register this)))
-  
-  (define info<%> (interface (basic<%>)))
-  (define info-mixin
-    (mixin (basic<%>) (info<%>)
-      (inherit get-top-level-window run-after-edit-sequence)
-      (define callback-running? #f)
-      (define/override (lock x)
-        (super lock x)
-        (run-after-edit-sequence
-         (rec send-frame-update-lock-icon
-           (λ ()
-             (unless callback-running?
-               (set! callback-running? #t)
-               (queue-callback
-                (λ ()
-                  (let ([frame (get-top-level-window)])
-                    (when (is-a? frame frame:info<%>)
-                      (send frame lock-status-changed)))
-                  (set! callback-running? #f))
-                #f))))
-         'framework:update-lock-icon))
-      (super-new)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/encode.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/encode.rkt
deleted file mode 100644
index a8d0798788..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/encode.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-(require racket/cmdline file/gzip file/gunzip net/base64)
-
-(define do-lang? #f)
-
-(define (encode/decode-text who lang-from lang-to convert1 convert2)
-  (when do-lang?
-    (let ([l (cadr (or (regexp-match #rx"^ *#lang +(.*[^ ]) *$" (read-line))
-                       (error who "missing #lang line")))])
-      (if (equal? l lang-from)
-        (printf "#lang ~a\n" lang-to)
-        (error who "bad #lang: expected ~s, got ~s" lang-from l))))
-  (define O (open-output-bytes))
-  (convert1 (current-input-port) O)
-  (convert2 (open-input-bytes (get-output-bytes O)) (current-output-port))
-  (flush-output))
-
-(define (encode-text)
-  (encode/decode-text
-   'encode-text "racket/base" "s-exp framework/private/decode"
-   deflate base64-encode-stream))
-
-(define (decode-text)
-  (encode/decode-text
-   'decode-text "s-exp framework/private/decode" "racket/base"
-   base64-decode-stream inflate))
-
-(command-line
- #:once-each
- ["-l" "translate lang line" (set! do-lang? #t)]
- #:once-any
- ["-e" "encode" (encode-text) (exit)]
- ["-d" "decode" (decode-text) (exit)])
-(printf "Use `-h' for help\n")
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/exit.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/exit.rkt
deleted file mode 100644
index 1cb98c5db8..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/exit.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang scheme/unit
-
-  (require string-constants
-           "sig.rkt"
-           "../preferences.rkt"
-           "../gui-utils.rkt"
-           mred/mred-sig)
-  
-  (import mred^)
-  (export (rename framework:exit^
-                  (-exit exit)))
-  
-  (define can?-callbacks '())
-  (define on-callbacks '())
-  
-  (define insert-can?-callback
-    (λ (cb)
-      (set! can?-callbacks (cons cb can?-callbacks))
-      (λ ()
-        (set! can?-callbacks
-              (let loop ([cb-list can?-callbacks])
-                (cond
-                  [(null? cb-list) '()]
-                  [(eq? cb (car cb-list)) (cdr cb-list)]
-                  [else (cons (car cb-list) (loop (cdr cb-list)))]))))))
-  
-  (define insert-on-callback
-    (λ (cb)
-      (set! on-callbacks (cons cb on-callbacks))
-      (λ ()
-        (set! on-callbacks
-              (let loop ([cb-list on-callbacks])
-                (cond
-                  [(null? cb-list) '()]
-                  [(eq? cb (car cb-list)) (cdr cb-list)]
-                  [else (cons (car cb-list) (loop (cdr cb-list)))]))))))
-  
-  (define is-exiting? #f)
-  (define (set-exiting b) (set! is-exiting? b))
-  (define (exiting?) is-exiting?)
-  
-  (define (can-exit?) (andmap (λ (cb) (cb)) can?-callbacks))
-  (define (on-exit) (for-each (λ (cb) (cb)) on-callbacks))
-  
-  (define (user-oks-exit)
-    (if (preferences:get 'framework:verify-exit)
-        (gui-utils:get-choice
-         (if (eq? (system-type) 'windows)
-             (string-constant are-you-sure-exit)
-             (string-constant are-you-sure-quit))
-         (if (eq? (system-type) 'windows)
-             (string-constant exit)
-             (string-constant quit))
-         (if (eq? (system-type) 'windows)
-             (string-constant dont-exit)
-             (string-constant dont-quit))
-         (string-constant warning)
-         #f
-         #f
-         'app
-         (case-lambda
-           [() (not (preferences:get 'framework:verify-exit))]
-           [(new) (preferences:set 'framework:verify-exit (not new))]))
-        #t))
-  
-  (define (-exit)
-    (set! is-exiting? #t)
-    (cond
-      [(can-exit?)
-       (on-exit)
-       (queue-callback 
-        (λ () 
-          (exit)
-          (set! is-exiting? #f)))]
-      [else
-       (set! is-exiting? #f)]))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/finder.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/finder.rkt
deleted file mode 100644
index 8a3aca5a38..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/finder.rkt
+++ /dev/null
@@ -1,107 +0,0 @@
-#lang scheme/unit
-
-  (require string-constants
-           "sig.rkt"
-           "../preferences.rkt"
-           mred/mred-sig
-           racket/path)
-  
-  (import mred^
-          [prefix keymap: framework:keymap^]
-          [prefix frame: framework:frame^])
-  
-  (export (rename framework:finder^
-                  [-put-file put-file]
-                  [-get-file get-file]))
-  
-  (define dialog-parent-parameter (make-parameter #f))
-  
-  (define filter-match?
-    (λ (filter name msg)
-      (let-values ([(base name dir?) (split-path name)])
-        (if (regexp-match-exact? filter (path->bytes name))
-            #t
-            (begin
-              (message-box (string-constant error) msg)
-              #f)))))
-  
-  (define default-filters (make-parameter '(["Any" "*.*"])))
-  (define default-extension (make-parameter ""))
-  
-  ;; dialog wrappers
-  
-  (define (*put-file style)
-    (lambda ([name #f]
-             [directory #f]
-             [replace? #f]
-             [prompt (string-constant select-file)]
-             [filter #f]
-             [filter-msg (string-constant file-wrong-form)]
-             [parent-win (dialog-parent-parameter)])
-      (let* ([directory (if (and (not directory) (string? name))
-                            (path-only name)
-                            directory)]
-             [name (or (and (string? name) (file-name-from-path name))
-                       name)]
-             [f (put-file prompt parent-win directory name
-                          (default-extension) style (default-filters)
-                          #:dialog-mixin frame:focus-table-mixin)])
-        (and f (or (not filter) (filter-match? filter f filter-msg))
-             (let* ([f (simple-form-path f)]
-                    [dir (path-only f)]
-                    [name (file-name-from-path f)])
-               (cond
-                 [(not (and (path-string? dir) (directory-exists? dir)))
-                  (message-box (string-constant error)
-                               (string-constant dir-dne))
-                  #f]
-                 [(or (not name) (equal? name ""))
-                  (message-box (string-constant error)
-                               (string-constant empty-filename))
-                  #f]
-                 [else f]))))))
-  
-  (define op (current-output-port))
-  (define (*get-file style)
-    (lambda ([directory #f]
-             [prompt (string-constant select-file)]
-             [filter #f]
-             [filter-msg (string-constant file-wrong-form)]
-             [parent-win (dialog-parent-parameter)])
-      (let ([f (get-file prompt parent-win directory #f
-                         (default-extension) style (default-filters)
-                         #:dialog-mixin frame:focus-table-mixin)])
-        (and f (or (not filter) (filter-match? filter f filter-msg))
-             (cond [(directory-exists? f)
-                    (message-box (string-constant error)
-                                 (string-constant that-is-dir-name))
-                    #f]
-                   [(not (file-exists? f))
-                    (message-box (string-constant error) 
-                                 (string-constant file-dne))
-                    #f]
-                   [else (simple-form-path f)])))))
-  
-  (define-syntax-rule
-    (define/rename id exp)
-    (define id (procedure-rename exp 'id)))
-  
-  ;; external interfaces to file functions
-  
-  (define/rename std-put-file    (*put-file '()))
-  (define/rename std-get-file    (*get-file '()))
-  (define/rename common-put-file (*put-file '(common)))
-  (define/rename common-get-file (*get-file '(common)))
-  
-  (define -put-file
-    (λ args
-      (apply (case (preferences:get 'framework:file-dialogs)
-               [(std) std-put-file]
-               [(common) common-put-file])
-             args)))
-  (define -get-file
-    (λ args
-      (apply (case (preferences:get 'framework:file-dialogs)
-               [(std) std-get-file]
-               [(common) common-get-file])
-             args)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/focus-table.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/focus-table.rkt
deleted file mode 100644
index 159ef90550..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/focus-table.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require racket/gui/base)
-(provide frame:lookup-focus-table
-         frame:set-focus-table)
-
-;; focus-table : hash[eventspace -o> (listof frame)]
-(define focus-table (make-hash))
-(define (frame:lookup-focus-table [eventspace (current-eventspace)])
-  (hash-ref focus-table eventspace '()))
-(define (frame:set-focus-table eventspace new)
-  (if (null? new)
-      (hash-remove! focus-table eventspace)
-      (hash-set! focus-table eventspace new)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/follow-log.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/follow-log.rkt
deleted file mode 100644
index ae089e5f3e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/follow-log.rkt
+++ /dev/null
@@ -1,324 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         racket/class
-         racket/match
-         racket/pretty
-         racket/gui/base
-         framework/private/logging-timer)
-
-(provide stop-and-dump
-         sb-callback
-         controller-frame-eventspace)
-
-(define lr (make-log-receiver (current-logger)
-                              'debug 'racket/engine
-                              'debug 'GC
-                              'debug 'gui-event
-                              'debug 'framework/colorer
-                              'debug 'timeline))
-(define gc-only-lr
-  (make-log-receiver (current-logger)
-                     'debug 'GC))
-
-(define top-n-events 30)
-(define drop-gc? #f)
-(define interesting-range-start 26)
-(define interesting-range-end +inf.0)
-
-(define log-done-chan (make-channel))
-(define bt-done-chan (make-channel))
-
-(define start-log-chan (make-channel))
-(void 
- (thread
-  (λ ()
-    (let loop () 
-      (define lr (sync start-log-chan))
-      (let loop ([events '()])
-        (sync
-         (handle-evt
-          lr
-          (λ (info)
-            (loop (cons info events))))
-         (handle-evt
-          log-done-chan
-          (λ (resp-chan)
-            (channel-put resp-chan events)))))
-      (loop)))))
-
-(define thread-to-watch (current-thread))
-(let ([win (get-top-level-windows)])
-  (unless (null? win)
-    (define fr-thd (eventspace-handler-thread (send (car win) get-eventspace)))
-    (unless (eq? thread-to-watch fr-thd)
-      (eprintf "WARNING: current-thread and eventspace thread aren't the same thread\n"))))
-(define start-bt-chan (make-channel))
-(void 
- (thread
-  (λ ()
-    (let loop () 
-      (sync start-bt-chan)
-      (let loop ([marks '()])
-        (sync
-         (handle-evt
-          (alarm-evt (+ (current-inexact-milliseconds) 10))
-          (λ (_)
-            (loop (cons (continuation-marks thread-to-watch)
-                        marks))))
-         (handle-evt
-          bt-done-chan
-          (λ (resp-chan)
-            (define stacks (map continuation-mark-set->context marks))
-            (channel-put resp-chan stacks)))))
-      (loop)))))
-
-(define controller-frame-eventspace (make-eventspace))
-(define f (parameterize ([current-eventspace controller-frame-eventspace])
-            (new frame% [label "Log Follower"])))
-(define sb (new button% [label "Start Following Log"] [parent f]
-               [callback
-                (λ (_1 _2)
-                  (sb-callback))]))
-(define sb2 (new button% [label "Start Collecting Backtraces"] [parent f]
-                 [callback
-                  (λ (_1 _2)
-                    (start-bt-callback))]))
-(define sb3 (new button% [label "Start Following GC Log"] [parent f]
-                 [callback
-                  (λ (_1 _2)
-                    (start-gc-callback))]))
-(define db (new button% [label "Stop && Dump"] [parent f] [enabled #f]
-                [callback
-                 (λ (_1 _2)
-                   (stop-and-dump))]))
-
-(let ([m 0])
-  (send f reflow-container)
-  (for ([x (in-list (send f get-children))])
-    (when (is-a? x button%)
-      (set! m (max m (send x get-width)))))
-  (for ([x (in-list (send f get-children))])
-    (when (is-a? x button%)
-      (send x min-width m))))
-
-(define (stop-and-dump)
-  (define sp (open-output-string))
-  (parameterize ([current-output-port sp])
-    (cond
-      [following-log?
-       (define resp (make-channel))
-       (channel-put log-done-chan resp)
-       (show-results (channel-get resp))
-       (set! following-log? #f)]
-      [following-bt?
-       (define resp (make-channel))
-       (channel-put bt-done-chan resp)
-       (define stacks (channel-get resp))
-       (show-bt-results stacks)
-       (set! following-bt? #f)]
-      [following-gc-log?
-       (define resp (make-channel))
-       (channel-put log-done-chan resp)
-       (show-gc (channel-get resp))
-       (set! following-gc-log? #f)])
-    (send db enable #f)
-    (send sb enable #t)
-    (send sb2 enable #t)
-    (send sb3 enable #t))
-  (show-string (get-output-string sp)))
-
-(define (show-string str)
-  (define t (new text%))
-  (send t insert str)
-  (send t change-style (make-object style-delta% 'change-family 'modern)
-        0
-        (send t last-position))
-  (define f (new frame% [width 600] [height 800] [label "Log Follower Results"]))
-  (define ec (new editor-canvas% [parent f] [editor t]))
-  (define mb (new menu-bar% [parent f]))
-  (define edit-menu (new menu% [label "Edit"] [parent mb]))
-  (append-editor-operation-menu-items edit-menu)
-  (send f show #t))
-
-(define following-log? #f)
-(define following-bt? #f)
-(define following-gc-log? #f)
-
-(define (sb-callback)
-  (set! following-log? #t)
-  (send sb enable #f)
-  (send sb2 enable #f)
-  (send sb3 enable #f)
-  (send db enable #t)
-  (channel-put start-log-chan lr))
-
-(define (start-bt-callback)
-  (set! following-bt? #t)
-  (send sb enable #f)
-  (send sb2 enable #f)
-  (send sb3 enable #f)
-  (send db enable #t)
-  (channel-put start-bt-chan #t))
-
-(define (start-gc-callback)
-  (set! following-gc-log? #t)
-  (send sb enable #f)
-  (send sb2 enable #f)
-  (send sb3 enable #f)
-  (send db enable #t)
-  (channel-put start-log-chan gc-only-lr))
-  
-
-(send f show #t)
-
-(define (show-gc lst)
-  (for ([x (in-list lst)])
-    (printf "~a\n" (vector-ref x 1))))
-
-(define (show-bt-results stacks)
-  (define top-frame (make-hash))
-  (for ([stack (in-list stacks)])
-    (unless (null? stack)
-      (define k (car stack))
-      (hash-set! top-frame k (cons stack (hash-ref top-frame k '())))))
-  (define sorted (sort (hash-map top-frame (λ (x y) y)) > #:key length))
-  (printf "top 10: ~s\n" (map length (take sorted (min (length sorted) 10))))
-  (define most-popular (car sorted))
-  (for ([x (in-range 10)])
-    (printf "---- next stack\n")
-    (pretty-print (list-ref most-popular (random (length most-popular))))
-    (printf "\n"))
-  (void))
-
-(struct gui-event (start end name) #:prefab)
-
-(define (print-gui-event-hist gui-events)
-  (print-hist 
-   (for/list ([gui-event (in-list gui-events)])
-     (gui-event->delta gui-event))))
-
-(define (print-hist nums)
-  (define bucket-size 2) ;; in milliseconds
-  (define (δ->bucket δ)
-    (* bucket-size
-       (inexact->exact (round (* δ (/ 1.0 bucket-size))))))
-  
-  (define buckets (make-hash))
-  (for ([num (in-list nums)])
-    (define bucket (δ->bucket num))
-    (hash-set! buckets bucket (+ (hash-ref buckets bucket 0) 1)))
-  (pretty-print
-   (sort (hash-map buckets vector)
-         <
-         #:key (λ (x) (vector-ref x 0)))))
-
-(define (gui-event->delta x)
-    (define i (vector-ref x 2))
-    (- (gui-event-end i)
-       (gui-event-start i)))
-
-(define (show-results evts)
-  (define gui-events (filter (λ (x) 
-                               (define i (vector-ref x 2))
-                               (and (gui-event? i)
-                                    (number? (gui-event-end i))))
-                             evts))
-  
-  (define (show-hist)
-    (define gc-starts+ends
-      (filter 
-       values
-       (for/list ([evt (in-list evts)])
-         (cond
-           [(gc-info? (vector-ref evt 2))
-            (cons (gc-info-start-time (vector-ref evt 2))
-                  (gc-info-end-time (vector-ref evt 2)))]
-           [else #f]))))
-    
-    (printf "gc deltas\n")
-    (print-hist (map (λ (x) (- (cdr x) (car x))) gc-starts+ends))
-    
-    (define (has-a-gc? evt-vec)
-      (define evt (vector-ref evt-vec 2))
-      (for/or ([gc-start+end (in-list gc-starts+ends)])
-        (<= (gui-event-start evt) 
-            (car gc-start+end)
-            (gui-event-end evt))))
-    
-    (define-values (has-gc-events no-gc-events)
-      (partition has-a-gc? gui-events))
-    (printf "\nwith gc\n")
-    (print-gui-event-hist has-gc-events)
-    (printf "\nwithout gc\n")
-    (print-gui-event-hist no-gc-events)
-    (printf "\nboth with and without gc\n")
-    (print-gui-event-hist gui-events))
-
-  (define (show-top-events)
-     (define interesting-gui-events
-       (let ([candidate-events
-              (sort (filter (λ (x)
-                              (<= interesting-range-start 
-                                  (gui-event->delta x)
-                                  interesting-range-end))
-                            gui-events)
-                    >
-                    #:key gui-event->delta)])
-         (take candidate-events (min (length candidate-events) top-n-events))))
-     
-     (define with-other-events
-       (for/list ([gui-evt (in-list interesting-gui-events)])
-         (match (vector-ref gui-evt 2)
-           [(gui-event start end name)
-            (define in-the-middle
-              (append (map (λ (x) (list (list 'δ (- (get-start-time x) start)) x))
-                           (sort
-                            (filter (λ (x) (and (not (gui-event? (vector-ref x 2)))
-                                                (<= start (get-start-time x) end)))
-                                    evts)
-                            <
-                            #:key get-start-time))
-                      (list (list (list 'δ (- end start)) 'end-of-gui-event))))
-            (list* (- end start)
-                   gui-evt
-                   in-the-middle)])))
-     
-     (define (has-a-gc-event? x)
-       (define in-the-middle (cddr x))
-       (ormap (λ (x) 
-                (and (vector? (list-ref x 1))
-                     (gc-info? (vector-ref (list-ref x 1) 2))))
-              in-the-middle))
-     
-     (pretty-print
-      (if drop-gc?
-          (filter (λ (x) (not (has-a-gc-event? x)))
-                  with-other-events)
-          with-other-events)))
-  
-  (show-top-events)
-  (printf "\n\n============================================================\n\n\n")
-  (show-hist))
-
-(struct gc-info (major? pre-amount pre-admin-amount code-amount
-                        post-amount post-admin-amount
-                        start-process-time end-process-time
-                        start-time end-time)
-  #:prefab)
-(struct engine-info (msec name) #:prefab)
-
-(define (get-start-time x)
-  (cond
-    [(gc-info? (vector-ref x 2))
-     (gc-info-start-time (vector-ref x 2))]
-    [(engine-info? (vector-ref x 2))
-     (engine-info-msec (vector-ref x 2))]
-    [(regexp-match #rx"framework" (vector-ref x 1))
-     (vector-ref x 2)]
-    [(timeline-info? (vector-ref x 2))
-     (timeline-info-milliseconds (vector-ref x 2))]         
-    [else
-     (unless (regexp-match #rx"^GC: 0:MST @" (vector-ref x 1))
-       (eprintf "unk: ~s\n" x))
-     0]))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/frame.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/frame.rkt
deleted file mode 100644
index 3ddcd797e0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/frame.rkt
+++ /dev/null
@@ -1,2864 +0,0 @@
-#lang racket/unit
-
-(require string-constants
-         racket/class
-         racket/contract/base
-         racket/path
-         "search.rkt"
-         "sig.rkt"
-         "../preferences.rkt"
-         "../gui-utils.rkt"
-         "bday.rkt"
-         "gen-standard-menus.rkt"
-         framework/private/focus-table
-         mrlib/close-icon
-         mred/mred-sig)
-
-(import mred^
-        [prefix group: framework:group^]
-        [prefix preferences: framework:preferences^]
-        [prefix icon: framework:icon^]
-        [prefix handler: framework:handler^]
-        [prefix application: framework:application^]
-        [prefix panel: framework:panel^]
-        [prefix finder: framework:finder^]
-        [prefix keymap: framework:keymap^]
-        [prefix text: framework:text^]
-        [prefix pasteboard: framework:pasteboard^]
-        [prefix editor: framework:editor^]
-        [prefix canvas: framework:canvas^]
-        [prefix menu: framework:menu^]
-        [prefix racket: framework:racket^]
-        [prefix exit: framework:exit^]
-        [prefix comment-box: framework:comment-box^])
-
-(export (rename framework:frame^ 
-                [-editor<%> editor<%>]
-                [-pasteboard% pasteboard%]
-                [-text% text%]))
-
-(init-depend mred^ framework:text^ framework:canvas^)
-
-(define (reorder-menus frame)
-  (define items (send (send frame get-menu-bar) get-items))
-  (define (find-menu name)
-    (ormap (λ (i) (and (string=? (send i get-plain-label) name) i))
-           items))
-  (let* ([file-menu (find-menu (string-constant file-menu))]
-         [edit-menu (find-menu (string-constant edit-menu))]
-         [windows-menu (or (find-menu (string-constant windows-menu))
-                           (find-menu (string-constant tabs-menu)))]
-         [help-menu (find-menu (string-constant help-menu))]
-         [other-items
-          (remq* (list file-menu edit-menu windows-menu help-menu) items)]
-         [re-ordered (filter values `(,file-menu ,edit-menu
-                                                 ,@other-items
-                                                 ,windows-menu ,help-menu))])
-    (for-each (λ (item) (send item delete)) items)
-    (for-each (λ (item) (send item restore)) re-ordered)))
-
-(define (remove-empty-menus frame)
-  (define menus (send (send frame get-menu-bar) get-items))
-  (for-each (λ (menu) (send menu delete)) menus)
-  (for-each (λ (menu)
-              (when (pair? (send menu get-items)) (send menu restore)))
-            menus))
-
-(define add-snip-menu-items
-  (lambda (edit-menu c% [func void])
-    (let* ([get-edit-target-object
-            (λ ()
-              (let ([menu-bar
-                     (let loop ([p (send edit-menu get-parent)])
-                       (cond
-                         [(is-a? p menu-bar%)
-                          p]
-                         [(is-a? p menu%)
-                          (loop (send p get-parent))]
-                         [else #f]))])
-                (and menu-bar
-                     (let ([frame (send menu-bar get-frame)])
-                       (send frame get-edit-target-object)))))]
-           [edit-menu:do 
-            (λ (const)
-              (λ (menu evt)
-                (let ([edit (get-edit-target-object)])
-                  (when (and edit
-                             (is-a? edit editor<%>))
-                    (send edit do-edit-operation const)))
-                #t))]
-           [on-demand
-            (λ (menu-item)
-              (let ([edit (get-edit-target-object)])
-                (send menu-item enable (and edit (is-a? edit editor<%>)))))]
-           [insert-comment-box
-            (λ ()
-              (let ([text (get-edit-target-object)])
-                (when text
-                  (let ([snip (make-object comment-box:snip%)])
-                    (send text insert snip)
-                    (send text set-caret-owner snip 'global)))))])
-      
-      (let ([item
-             (new c%
-                  [label (string-constant insert-comment-box-menu-item-label)]
-                  [parent edit-menu]
-                  [callback (λ (x y) (insert-comment-box))]
-                  [demand-callback on-demand])])
-        (func item))
-      (define plain-insert-callback (edit-menu:do 'insert-image))
-      (define lowercase-imgs "*.png;*.jpg;*.jpeg;*.gif;*.xpm;*.bmp")
-      (define imgs (string-append
-                    lowercase-imgs ";"
-                    (string-upcase lowercase-imgs)))
-      (let ([item 
-             (new c% 
-                  [label (string-constant insert-image-item)]
-                  [parent edit-menu]
-                  [callback (λ (menu evt)
-                              (parameterize ([finder:default-filters 
-                                              `(["Image" ,imgs]
-                                                ["Any" "*.*"])])
-                                (plain-insert-callback menu evt)))]
-                  [demand-callback on-demand])])
-        (func item))
-      (void))))
-
-(define frame-width 600)
-(define frame-height 650)
-(let ([window-trimming-upper-bound-width 20]
-      [window-trimming-upper-bound-height 50])
-  (let-values ([(w h) (get-display-size)])
-    (set! frame-width (min frame-width (- w window-trimming-upper-bound-width)))
-    (set! frame-height (min frame-height (- h window-trimming-upper-bound-height)))))
-
-(define basic<%> (interface ((class->interface frame%))
-                   get-area-container%
-                   get-area-container
-                   get-menu-bar%
-                   make-root-area-container
-                   close
-                   editing-this-file?
-                   get-filename
-                   make-visible))
-
-(define focus-table<%> (interface (top-level-window<%>)))
-(define focus-table-mixin
-  (mixin (top-level-window<%>) (focus-table<%>)
-    (inherit get-eventspace)
-    
-    (define/override (show on?)
-      (define old (remove this (frame:lookup-focus-table (get-eventspace))))
-      (define new (if on? (cons this old) old))
-      (frame:set-focus-table (get-eventspace) new)
-      (super show on?))
-    
-    (define/augment (on-close)
-      (frame:set-focus-table (get-eventspace) (remove this (frame:lookup-focus-table (get-eventspace))))
-      (inner (void) on-close))
-    
-    (super-new)
-    
-    (frame:set-focus-table (get-eventspace) (frame:lookup-focus-table (get-eventspace)))))
-
-(define basic-mixin
-  (mixin ((class->interface frame%)) (basic<%>)
-    
-    (define/override (show on?)
-      (if on?
-          (send (group:get-the-frame-group) insert-frame this)
-          (send (group:get-the-frame-group) remove-frame this))
-      (super show on?))
-    
-    (define/override (can-exit?)
-      (and (exit:user-oks-exit)
-           (begin
-             (exit:set-exiting #t)
-             (let ([res (exit:can-exit?)])
-               (unless res
-                 (exit:set-exiting #f))
-               res))))
-    (define/override (on-exit) 
-      (exit:on-exit)
-      (queue-callback
-       (λ ()
-         (exit)
-         (exit:set-exiting #f))))
-    
-    (define/public (make-visible filename) (void))
-    (define/public get-filename
-      (case-lambda
-        [() (get-filename #f)]
-        [(b) #f]))
-    
-    (define/public (editing-this-file? filename) #f)
-    
-    (define/override (on-superwindow-show shown?)
-      (send (group:get-the-frame-group) frame-shown/hidden this)
-      (super on-superwindow-show shown?))
-    
-    (define after-init? #f)
-    
-    (define/override on-drop-file
-      (λ (filename)
-        (handler:edit-file filename)))
-    
-    ;; added call to set label here to hopefully work around a problem in mac mred
-    (inherit set-label change-children)
-    (define/override after-new-child
-      (λ (child)
-        (when after-init?
-          (change-children (λ (l) (remq child l)))
-          (error 'frame:basic-mixin
-                 (string-append
-                  "do not add children directly to a frame:basic (unless using make-root-area-container); "
-                  "use the get-area-container method instead")))))
-    
-    (define/public get-area-container% (λ () vertical-panel%))
-    (define/public get-menu-bar% (λ () menu-bar%))
-    (define/public make-root-area-container
-      (λ (% parent)
-        (make-object % parent)))
-    
-    (inherit on-close can-close?)
-    (define/public (close)
-      (when (can-close?)
-        (on-close)
-        (show #f)))
-    
-    (inherit accept-drop-files)
-    
-    (super-new)
-    
-    (accept-drop-files #t)
-    
-    (inherit set-icon)
-    (let ([icon (current-icon)])
-      (when icon
-        (if (pair? icon)
-            (let ([small (car icon)]
-                  [large (cdr icon)])
-              (set-icon small (send small get-loaded-mask) 'small)
-              (set-icon large (send large get-loaded-mask) 'large))
-            (set-icon icon (send icon get-loaded-mask) 'both))))
-    
-    (group:create-windows-menu (make-object (get-menu-bar%) this))
-    
-    (reorder-menus this)
-    
-    [define panel (make-root-area-container (get-area-container%) this)]
-    (define/public (get-area-container) panel)
-    (set! after-init? #t)))
-
-(define current-icon (make-parameter #f))
-
-(define size-pref<%>
-  (interface (basic<%>)
-    adjust-size-when-monitor-setup-changes?))
-
-(define-local-member-name monitor-setup-changed)
-
-(define size-pref-mixin
-  (mixin (basic<%>) (size-pref<%>)
-    (init-field size-preferences-key
-                [position-preferences-key #f])
-    (inherit is-maximized?)
-    (define/override (on-size w h)
-      
-      ;; if the monitor state is currently fluxuating, then
-      ;; don't save preferences values, since the OS is doing
-      ;; some adjustments for us.
-      (when (or (equal? (compute-current-monitor-information)
-                        latest-monitor-information)
-                (not (adjust-size-when-monitor-setup-changes?)))
-        (define old-table (preferences:get size-preferences-key)) 
-        (define new-val
-          (cond
-            [(is-maximized?)
-             (define old (or (hash-ref old-table latest-monitor-information #f)
-                             (hash-ref old-table #f)))
-             (cons #t (cdr old))]
-            [else
-             (list #f w h)]))
-        (preferences:set size-preferences-key 
-                         (hash-set*
-                          old-table
-                          latest-monitor-information new-val
-                          #f new-val)))
-      (super on-size w h))
-      
-    (define on-move-timer-arg-x #f)
-    (define on-move-timer-arg-y #f)
-    (define on-move-timer-arg-max? #f)
-    (define on-move-callback-running? #f)
-    (define/override (on-move x y)
-      (when position-preferences-key
-        (unless on-move-callback-running?
-          (set! on-move-callback-running? #t)
-          (queue-callback
-           (λ () 
-             (set! on-move-callback-running? #f)
-             (unless on-move-timer-arg-max?
-               
-               ;; if the monitor state is currently fluxuating, then
-               ;; don't save preferences values, since the OS is doing
-               ;; some adjustments for us.
-               (when (or (equal? (compute-current-monitor-information)
-                                 latest-monitor-information)
-                         (not (adjust-size-when-monitor-setup-changes?)))
-                 (define-values (monitor delta-x delta-y) (find-closest on-move-timer-arg-x on-move-timer-arg-y))
-                 (define old-table (preferences:get position-preferences-key))
-                 (define val (list monitor delta-x delta-y))
-                 (preferences:set position-preferences-key
-                                  (hash-set*
-                                   old-table
-                                   latest-monitor-information val
-                                   #f val)))))
-           #f))
-        (set! on-move-timer-arg-x x)
-        (set! on-move-timer-arg-y y)
-        (set! on-move-timer-arg-max? (is-maximized?)))
-      (super on-move x y))
-    
-    (define/augment (display-changed)
-      (restart-montior-information-timer)
-      (inner (void) display-changed))
-    
-    ;; if all of the offsets have some negative direction, then
-    ;; just keep the thing relative to the original montior; otherwise
-    ;; make it relative to whatever origin it is closest to.
-    (define/private (find-closest x y)
-      (define closest 0)
-      (define-values (delta-x delta-y dist) (find-distance x y 0))
-      
-      (for ([m (in-range 1 (get-display-count))])
-        (define-values (new-delta-x new-delta-y new-dist) 
-          (find-distance x y m))
-        (when (and new-delta-x
-                   new-delta-y
-                   (new-delta-x . >= . 0)
-                   (new-delta-y . >= . 0))
-          (when (< new-dist dist)
-            (set! closest m)
-            (set!-values (delta-x delta-y dist) (values new-delta-x new-delta-y new-dist)))))
-      
-      (values closest delta-x delta-y))
-    
-    (define/private (find-distance x y mon)
-      (define-values (delta-x delta-y)
-        (let-values ([(l t) (get-display-left-top-inset #:monitor mon)])
-          (values (+ x l) (+ y t))))
-      (values delta-x
-              delta-y
-              (sqrt (+ (* delta-x delta-x)
-                       (* delta-y delta-y)))))
-    
-    (inherit maximize)
-    (define/private (get-sizes/maximzed)
-      (define size-table (preferences:get size-preferences-key))
-      (define-values (maximized? w h) (apply values (or (hash-ref size-table latest-monitor-information #f)
-                                                        (hash-ref size-table #f))))
-      (define-values (x y origin-still-visible?)
-        (cond
-          [position-preferences-key
-           (define pos-table (preferences:get position-preferences-key))
-           (define-values (monitor delta-x delta-y) (apply values (or (hash-ref pos-table latest-monitor-information #f)
-                                                                      (hash-ref pos-table #f))))
-           (define-values (l t) (get-display-left-top-inset #:monitor monitor))
-           (define-values (mw mh) (get-display-size #:monitor monitor))
-           (if (and l t mw mh)
-               (values (- delta-x l) 
-                       (- delta-y t)
-                       (and (<= 0 l mw)
-                            (<= 0 t mh)))
-               (values #f #f #f))]
-          [else
-           (values #f #f #f)]))
-      (define (already-one-there? x y w h)
-        (for/or ([fr (in-list (get-top-level-windows))])
-          (and (equal? x (send fr get-x))
-               (equal? y (send fr get-y))
-               (equal? w (send fr get-width))
-               (equal? h (send fr get-height))
-               (equal? maximized? (send fr is-maximized?)))))
-      (cond
-        [(or (and (already-one-there? x y w h)
-                  (not maximized?))
-             (not origin-still-visible?))
-         ;; these are the situations where we look for a different position of the window
-         (let loop ([n 50]
-                    [x 0]
-                    [y 0])
-           (cond
-             [(zero? n)
-              (values #f #f #f #f maximized?)]
-             [(already-one-there? x y w h)
-              (define-values (dw dh) (get-display-size #:monitor 0))
-              (define sw (- dw w))
-              (define sh (- dh h))
-              (if (or (<= sw 0)
-                      (<= sh 0))
-                (values #f #f #f #f maximized?)
-                (loop (- n 1) 
-                      (modulo (+ x 20) (- dw w))
-                      (modulo (+ y 20) (- dh h))))]
-             [else
-              (values w h x y maximized?)]))]
-        [else
-         (values w h x y maximized?)]))
-    
-    (define/public (adjust-size-when-monitor-setup-changes?) #f)
-    
-    (inherit begin-container-sequence
-             end-container-sequence
-             move
-             resize)
-    (define/public (monitor-setup-changed) 
-      (when (adjust-size-when-monitor-setup-changes?)
-        (define-values (w h x y maximized?) (get-sizes/maximzed))
-        (when (and w h x y)
-          (begin-container-sequence)
-          (move x y)
-          (resize w h)
-          (when maximized?
-            (maximize #t))
-          (end-container-sequence))))
-    
-    (let-values ([(w h x y maximized?) (get-sizes/maximzed)])
-      (cond
-        [(and w h x y)
-         (super-new [width w] [height h] [x x] [y y])]
-        [else
-         (super-new)])
-      (when maximized?
-        (maximize #t)))))
-
-(define (setup-size-pref size-preferences-key w h 
-                         #:maximized? [maximized? #f]
-                         #:position-preferences [position-preferences-key #f])
-  (preferences:set-default size-preferences-key 
-                           (hash #f (list maximized? w h))
-                           (hash/c (or/c (listof (list/c any/c any/c any/c any/c))
-                                         #f)
-                                   (list/c boolean?
-                                           exact-nonnegative-integer?
-                                           exact-nonnegative-integer?)
-                                   #:immutable #t
-                                   #:flat? #t))
-  (when position-preferences-key
-    (preferences:set-default position-preferences-key 
-                             (hash #f (list 0 0 0))
-                             (hash/c (or/c (listof (list/c any/c any/c any/c any/c))
-                                           #f)
-                                     (list/c exact-nonnegative-integer?
-                                             exact-integer?
-                                             exact-integer?)
-                                     #:immutable #t
-                                     #:flat? #t))))
-
-(define (compute-current-monitor-information)
-  (filter
-   values
-   (for/list ([m (in-range (get-display-count))])
-     (define-values (left top) (get-display-left-top-inset #:monitor m))
-     (define-values (width height) (get-display-size #:monitor m))
-     (and left top width height
-          (list left top width height)))))
-
-(define latest-monitor-information (compute-current-monitor-information))
-(define pending-monitor-information #f)
-(define montior-information-timer
-  (new timer%
-       [notify-callback
-        (λ ()
-          (define new-monitor-information (compute-current-monitor-information))
-          (cond
-            [pending-monitor-information
-             (cond
-               [(equal? pending-monitor-information new-monitor-information)
-                (set! pending-monitor-information #f)
-                (set! latest-monitor-information new-monitor-information)
-                (queue-callback
-                 (λ ()
-                   (when (editor:get-change-font-size-when-monitors-change?)
-                     (editor:set-current-preferred-font-size
-                      (editor:get-current-preferred-font-size)))
-                   (for ([frame (in-list (get-top-level-windows))])
-                     (when (is-a? frame size-pref<%>)
-                       (send frame monitor-setup-changed)))
-                   #f))]
-               [else
-                (set! pending-monitor-information new-monitor-information)
-                (restart-montior-information-timer)])]
-            [else
-             (unless (equal? latest-monitor-information new-monitor-information)
-               (set! pending-monitor-information new-monitor-information)
-               (restart-montior-information-timer))]))]))
-(define (restart-montior-information-timer)
-  (send montior-information-timer stop)
-  (send montior-information-timer start 250 #t))
-
-
-(define register-group<%> (interface ()))
-(define register-group-mixin
-  (mixin (basic<%>) (register-group<%>)
-    
-    (define/augment (can-close?)
-      (and (inner #t can-close?)
-           (group:can-close-check)))
-    (define/augment (on-close)
-      (send (group:get-the-frame-group)
-            remove-frame
-            this)
-      (inner (void) on-close)
-      (group:on-close-action))
-    
-    (define/override (on-activate on?)
-      (super on-activate on?)
-      (when on?
-        (send (group:get-the-frame-group) set-active-frame this)))
-    
-    (super-new)
-    (send (group:get-the-frame-group) insert-frame this)))
-
-(define locked-message (string-constant read-only))
-
-(define lock-canvas%
-  (class canvas%
-    (field [locked? #f])
-    (inherit refresh)
-    (define/public (set-locked l)
-      (unless (eq? locked? l)
-        (set! locked? l)
-        (setup-sizes)
-        (refresh)))
-    (inherit get-client-size get-dc)
-    (define/override (on-paint)
-      (let* ([dc (get-dc)]
-             [draw
-              (λ (str bg-color bg-style line-color line-style)
-                (send dc set-font small-control-font)
-                (let-values ([(w h) (get-client-size)]
-                             [(tw th _1 _2) (send dc get-text-extent str)])
-                  (send dc set-pen (send the-pen-list find-or-create-pen line-color 1 line-style))
-                  (send dc set-brush (send the-brush-list find-or-create-brush bg-color bg-style))
-                  (send dc draw-rectangle 0 0 w h)
-                  (send dc draw-text str
-                        (- (/ w 2) (/ tw 2))
-                        (- (/ h 2) (/ th 2)))))])
-        (when locked?
-          (draw locked-message "yellow" 'solid "black" 'solid))))
-    
-    (inherit get-parent min-width min-height stretchable-width stretchable-height)
-    (define/private (setup-sizes)
-      (let ([dc (get-dc)])
-        (if locked?
-            (let-values ([(w h _1 _2) (send dc get-text-extent locked-message)])
-              (min-width (inexact->exact (floor (+ w 4))))
-              (min-height (inexact->exact (floor (+ h 2)))))
-            (begin
-              (min-width 0)
-              (min-height 0)))))
-    
-    (super-new [style '(transparent no-focus)])
-    
-    (send (get-dc) set-font small-control-font)
-    (setup-sizes)
-    (stretchable-width #f)
-    (stretchable-height #t)))
-
-(define status-line<%>
-  (interface (basic<%>)
-    open-status-line
-    close-status-line
-    update-status-line))
-
-;; status-line : (make-status-line symbol number)
-(define-struct status-line (id count))
-
-;; status-line-msg : (make-status-line-msg (is-a?/c message%) (union symbol #f))
-(define-struct status-line-msg (message [id #:mutable]))
-
-(define status-line-mixin
-  (mixin (basic<%>) (status-line<%>)
-    (field [status-line-container-panel #f]
-           
-           ;; status-lines : (listof status-line)
-           [status-lines null]
-           
-           ;; status-line-msgs : (listof status-line-msg)
-           [status-line-msgs null])
-    (define/override (make-root-area-container % parent)
-      (let* ([s-root (super make-root-area-container vertical-panel% parent)]
-             [r-root (make-object % s-root)])
-        (set! status-line-container-panel
-              (instantiate vertical-panel% ()
-                (parent s-root)
-                (stretchable-height #f)))
-        r-root))
-    (define/public (open-status-line id)
-      (do-main-thread
-       (λ ()
-         (when status-line-container-panel
-           (set! status-lines
-                 (let loop ([status-lines status-lines])
-                   (cond
-                     [(null? status-lines)
-                      (list (make-status-line id 1))]
-                     [else (let ([status-line (car status-lines)])
-                             (if (eq? id (status-line-id status-line))
-                                 (cons (make-status-line id (+ (status-line-count status-line) 1))
-                                       (cdr status-lines))
-                                 (cons status-line (loop (cdr status-lines)))))])))))))
-    
-    (define/public (close-status-line id)
-      (do-main-thread
-       (λ ()
-         (when status-line-container-panel
-           
-           ;; decrement counter in for status line, or remove it if
-           ;; counter goes to zero.
-           (set! status-lines
-                 (let loop ([status-lines status-lines])
-                   (cond
-                     [(null? status-lines) (error 'close-status-line "status line not open ~e" id)]
-                     [else (let* ([status-line (car status-lines)]
-                                  [this-line? (eq? (status-line-id status-line) id)])
-                             (cond
-                               [(and this-line? (= 1 (status-line-count status-line)))
-                                (cdr status-lines)]
-                               [this-line?
-                                (cons (make-status-line id (- (status-line-count status-line) 1))
-                                      (cdr status-lines))]
-                               [else (cons status-line (loop (cdr status-lines)))]))])))
-           
-           ;; make sure that there are only as many messages as different status lines, in total
-           (let ([status-line-msg (find-status-line-msg id)])
-             (when status-line-msg
-               (send (status-line-msg-message status-line-msg) set-label "")
-               (set-status-line-msg-id! status-line-msg #f)))
-           (let* ([msgs-that-can-be-removed (filter (λ (x) (not (status-line-msg-id x))) status-line-msgs)]
-                  [max-to-include (length status-lines)]
-                  [msgs-to-remove
-                   (let loop ([n max-to-include]
-                              [l msgs-that-can-be-removed])
-                     (cond
-                       [(null? l) l]
-                       [(zero? n) l]
-                       [else (loop (- n 1) (cdr l))]))])
-             (send status-line-container-panel
-                   change-children
-                   (λ (old-children)
-                     (foldl (λ (status-line-msg l)
-                              (remq (status-line-msg-message status-line-msg) l))
-                            old-children
-                            msgs-to-remove)))
-             (set! status-line-msgs
-                   (let loop ([l msgs-to-remove]
-                              [status-line-msgs status-line-msgs])
-                     (cond
-                       [(null? l) status-line-msgs]
-                       [else (loop (cdr l)
-                                   (remq (car l) status-line-msgs))]))))))))
-    
-    ;; update-status-line : symbol (union #f string)
-    (define/public (update-status-line id msg-txt)
-      (do-main-thread
-       (λ ()
-         (unless (open-status-line? id)
-           (error 'update-status-line "unknown id ~e, other arg ~e" id msg-txt))
-         (if msg-txt
-             (cond
-               [(find-status-line-msg id)
-                =>
-                (λ (existing-status-line-msg)
-                  (let ([msg (status-line-msg-message existing-status-line-msg)])
-                    (unless (equal? (send msg get-label) msg-txt)
-                      (send msg set-label msg-txt))))]
-               [(find-available-status-line-msg)
-                =>
-                (λ (available-status-line-msg)
-                  (send (status-line-msg-message available-status-line-msg) set-label msg-txt)
-                  (set-status-line-msg-id! available-status-line-msg id))]
-               [else
-                (set! status-line-msgs
-                      (cons (make-new-status-line-msg id msg-txt)
-                            status-line-msgs))])
-             (let ([status-line-msg (find-status-line-msg id)])
-               (when status-line-msg
-                 (send (status-line-msg-message status-line-msg) set-label "")
-                 (set-status-line-msg-id! status-line-msg #f)))))))
-    
-    ;; open-status-line? : symbol -> boolean
-    (define/private (open-status-line? id)
-      (let loop ([status-lines status-lines])
-        (cond
-          [(null? status-lines) #f]
-          [else
-           (let ([status-line (car status-lines)])
-             (or (eq? (status-line-id status-line) id)
-                 (loop (cdr status-lines))))])))
-    
-    ;; find-available-status-line-msg : -> (union #f status-line-msg)
-    (define/private (find-available-status-line-msg)
-      (let loop ([status-line-msgs status-line-msgs])
-        (cond
-          [(null? status-line-msgs) #f]
-          [else (let ([status-line-msg (car status-line-msgs)])
-                  (if (status-line-msg-id status-line-msg)
-                      (loop (cdr status-line-msgs))
-                      status-line-msg))])))
-    
-    ;; find-status-line-msg : symbol -> (union #f status-line-msg)
-    (define/private (find-status-line-msg id)
-      (let loop ([status-line-msgs status-line-msgs])
-        (cond
-          [(null? status-line-msgs) #f]
-          [else (let ([status-line-msg (car status-line-msgs)])
-                  (if (eq? id (status-line-msg-id status-line-msg))
-                      status-line-msg
-                      (loop (cdr status-line-msgs))))])))
-    
-    ;; make-new-status-line-msg : symbol string -> status-line-msg
-    (define/private (make-new-status-line-msg id msg-txt)
-      (define msg
-        (new message% 
-             [parent status-line-container-panel]
-             [stretchable-width #t]
-             [label ""]))
-      (send msg set-label msg-txt)
-      (make-status-line-msg msg id))
-    
-    (inherit get-eventspace)
-    (define/private (do-main-thread t)
-      (let ([c-eventspace (current-eventspace)])
-        (if (and (eq? c-eventspace (get-eventspace))
-                 (eq? (current-thread) (eventspace-handler-thread c-eventspace)))
-            (t)
-            (parameterize ([current-eventspace c-eventspace])
-              ;; need high priority callbacks to ensure ordering wrt other callbacks
-              (queue-callback t #t)))))
-    
-    (super-new)))
-
-(define info<%> (interface (basic<%>)
-                  determine-width
-                  lock-status-changed
-                  update-info
-                  set-info-canvas
-                  get-info-canvas
-                  get-info-editor
-                  get-info-panel
-                  show-info
-                  hide-info
-                  is-info-hidden?))
-
-(define magic-space 25)
-
-(define info-mixin
-  (mixin (basic<%>) (info<%>)
-    [define rest-panel 'uninitialized-root]
-    [define super-root 'uninitialized-super-root]
-    (define/override (make-root-area-container % parent)
-      (let* ([s-root (super make-root-area-container
-                            vertical-panel%
-                            parent)]
-             [r-root (make-object % s-root)])
-        (set! super-root s-root)
-        (set! rest-panel r-root)
-        r-root))
-    
-    (define info-canvas #f)
-    (define/public (get-info-canvas) info-canvas)
-    (define/public (set-info-canvas c) (set! info-canvas c))
-    (define/public (get-info-editor)
-      (and info-canvas
-           (send info-canvas get-editor)))
-    
-    (define/public (determine-width string canvas edit)
-      (send edit set-autowrap-bitmap #f)
-      (send canvas call-as-primary-owner
-            (λ ()
-              (let ([lb (box 0)]
-                    [rb (box 0)])
-                (send edit erase)
-                (send edit insert string)
-                (send edit position-location 
-                      (send edit last-position)
-                      rb)
-                (send edit position-location 0 lb)
-                (send canvas min-width 
-                      (+ (get-client-width/view-delta edit canvas)
-                         (- (inexact->exact (floor (unbox rb)))
-                            (inexact->exact (floor (unbox lb))))))))))
-    
-    (define outer-info-panel 'top-info-panel-uninitialized)
-    
-    ;; this flag is specific to this frame
-    ;; the true state of the info panel is
-    ;; the combination of this flag and the 
-    ;; 'framework:show-status-line preference
-    ;; as shown in update-info-visibility
-    (define info-hidden? #f)
-    (define/public (hide-info)
-      (set! info-hidden? #t)
-      (update-info-visibility (preferences:get 'framework:show-status-line)))
-    (define/public (show-info)
-      (set! info-hidden? #f)
-      (update-info-visibility (preferences:get 'framework:show-status-line)))
-    (define/public (is-info-hidden?) info-hidden?)
-    (define/private (update-info-visibility pref-value)
-      (cond
-        [(or info-hidden? (not pref-value))
-         (send super-root change-children
-               (λ (l)
-                 (if (memq outer-info-panel l)
-                     (begin (unregister-collecting-blit gc-canvas)
-                            (unregister-pref-save-callback)
-                            (list rest-panel))
-                     l)))]
-        [else
-         (send super-root change-children
-               (λ (l)
-                 (if (memq outer-info-panel l)
-                     l
-                     (begin
-                       (register-gc-blit)
-                       (register-pref-save-callback)
-                       (list rest-panel outer-info-panel)))))]))
-    
-    [define close-panel-callback
-      (preferences:add-callback
-       'framework:show-status-line
-       (λ (p v)
-         (update-info-visibility v)))]
-    (define memory-cleanup void) ;; only for checkouts and nightly build users; used with memory-text
-    
-    (define/augment (on-close)
-      (unregister-collecting-blit gc-canvas)
-      (unregister-pref-save-callback)
-      (close-panel-callback)
-      (memory-cleanup)
-      (inner (void) on-close))
-    
-    (define icon-currently-locked? 'uninit)
-    (define/public (lock-status-changed)
-      (let ([info-edit (get-info-editor)])
-        (cond
-          [(not (object? lock-canvas))
-           (void)]
-          [(is-a? info-edit editor:file<%>)
-           (unless (send lock-canvas is-shown?)
-             (send lock-canvas show #t))
-           (let ([locked-now? (not (send info-edit get-read-write?))])
-             (unless (eq? locked-now? icon-currently-locked?)
-               (set! icon-currently-locked? locked-now?)
-               (when (object? lock-canvas)
-                 (send lock-canvas set-locked locked-now?))))]
-          [else
-           (when (send lock-canvas is-shown?)
-             (send lock-canvas show #f))])))
-    
-    (define/public (update-info) (lock-status-changed))
-    
-    (super-new)
-    (set! outer-info-panel (make-object horizontal-panel% super-root))
-    (send outer-info-panel stretchable-height #f)
-    
-    (define info-panel (new horizontal-panel% [parent outer-info-panel]))
-    (new grow-box-spacer-pane% [parent outer-info-panel])
-    
-    (define/public (get-info-panel) info-panel)
-    (define/public (update-memory-text)
-      (for ([memory-canvas (in-list memory-canvases)])
-        (send memory-canvas set-str (format-number (current-memory-use)))))
-    
-    (define/private (format-number n)
-      (let* ([mbytes (/ n 1024 1024)]
-             [before-decimal (floor mbytes)]
-             [after-decimal (modulo (floor (* mbytes 100)) 100)])
-        (string-append
-         (number->string before-decimal)
-         "."
-         (cond
-           [(<= after-decimal 9) (format "0~a" after-decimal)]
-           [else (number->string after-decimal)])
-         " MB")))
-    
-    (define/private (pad-to-3 n)
-      (cond
-        [(<= n 9) (format "00~a" n)]
-        [(<= n 99) (format "0~a" n)]
-        [else (number->string n)]))
-    
-    (define pref-save-canvas #f)
-    (set! pref-save-canvas (new pref-save-canvas% [parent (get-info-panel)]))
-    
-    [define lock-canvas (make-object lock-canvas% (get-info-panel))]
-    
-    ; set up the memory use display in the status line
-    (let* ([panel (new horizontal-panel%
-                       [parent (get-info-panel)]
-                       [stretchable-width #f]
-                       [stretchable-height #f])]
-           [ec (new position-canvas%
-                    [parent panel]
-                    [button-up
-                     (λ (evt)
-                       (cond
-                         [(or (send evt get-alt-down)
-                              (send evt get-control-down))
-                          (dynamic-require 'framework/private/follow-log #f)]
-                         [else
-                          (collect-garbage)
-                          (update-memory-text)]))]
-                    [init-width "99.99 MB"])])
-      (set! memory-canvases (cons ec memory-canvases))
-      (update-memory-text)
-      (set! memory-cleanup
-            (λ ()
-              (set! memory-canvases (remq ec memory-canvases))))
-      (send panel stretchable-width #f))
-    
-    (define gc-canvas (new bday-click-canvas% [parent (get-info-panel)] [style '(border no-focus)]))
-    (define/private (register-gc-blit)
-      (let ([onb (icon:get-gc-on-bitmap)]
-            [offb (icon:get-gc-off-bitmap)])
-        (when (and (send onb ok?)
-                   (send offb ok?))
-          (register-collecting-blit gc-canvas 
-                                    0 0
-                                    (send onb get-width)
-                                    (send onb get-height)
-                                    onb offb))))
-    
-    (define pref-save-callback-registration #f)
-    (inherit get-eventspace)
-    (define/private (register-pref-save-callback)
-      (when pref-save-canvas
-        (set! pref-save-callback-registration
-              (preferences:register-save-callback
-               (λ (start?)
-                 (cond
-                   [(eq? (current-thread) (eventspace-handler-thread (get-eventspace)))
-                    (send pref-save-canvas set-on? start?)]
-                   [else
-                    (queue-callback
-                     (λ ()
-                       (send pref-save-canvas set-on? start?)))]))))))
-    (define/private (unregister-pref-save-callback)
-      (when pref-save-callback-registration
-        (preferences:unregister-save-callback pref-save-callback-registration)))
-    (register-pref-save-callback)
-    
-    (unless (preferences:get 'framework:show-status-line)
-      (send super-root change-children
-            (λ (l)
-              (list rest-panel))))
-    (register-gc-blit)
-    
-    (let* ([gcb (icon:get-gc-on-bitmap)]
-           [gc-width (if (send gcb ok?)
-                         (send gcb get-width)
-                         10)]
-           [gc-height (if (send gcb ok?)
-                          (send gcb get-height)
-                          10)])
-      (send* gc-canvas
-        (min-client-width (max (send gc-canvas min-width) gc-width))
-        (min-client-height (max (send gc-canvas min-height) gc-height))
-        (stretchable-width #f)
-        (stretchable-height #f)))
-    (send* (get-info-panel) 
-      (set-alignment 'right 'center)
-      (stretchable-height #f)
-      (spacing 3)
-      (border 3))))
-
-(define (ensure-enough-width editor-canvas text)
-  (send editor-canvas call-as-primary-owner
-        (λ ()
-          (let ([delta (get-client-width/view-delta text editor-canvas)]
-                [lb (box 0)]
-                [rb (box 0)])
-            (send text position-location 
-                  (send text last-position)
-                  rb)
-            (send text position-location 0 lb)
-            (let ([nw
-                   (+ delta (- (inexact->exact (floor (unbox rb)))
-                               (inexact->exact (floor (unbox lb)))))])
-              (when (< (send editor-canvas min-client-width) nw)
-                (send editor-canvas min-client-width nw)))))))
-
-(define (get-client-width/view-delta position-edit position-canvas)
-  (let ([admin (send position-edit get-admin)]
-        [wb (box 0)])
-    (send admin get-view #f #f wb #f)
-    (let-values ([(cw ch) (send position-canvas get-client-size)])
-      (inexact->exact (floor (- cw (unbox wb)))))))
-
-(define position-canvas%
-  (class canvas%
-    (inherit min-client-height min-client-width get-dc get-client-size refresh)
-    (init init-width)
-    (init-field [button-up #f])
-    (init-field [char-typed void])
-    (define str "")
-    (define/public (set-str _str)
-      (set! str _str)
-      (update-client-width str)
-      (refresh))
-    (define/private (update-client-width str)
-      (let ([dc (get-dc)])
-        (let-values ([(cw _4) (get-client-size)]
-                     [(tw _1 _2 _3) (send dc get-text-extent str normal-control-font)])
-          (when (< cw tw)
-            (min-client-width (inexact->exact (ceiling tw)))))))
-    (define/override (on-paint)
-      (let ([dc (get-dc)])
-        (send dc set-font normal-control-font)
-        (let-values ([(cw ch) (get-client-size)]
-                     [(tw th _1 _2) (send dc get-text-extent str)])
-          (send dc draw-text str 0 (/ (- ch th) 2)))))
-    (define/override (on-event evt)
-      (when button-up
-        (when (send evt button-up?)
-          (let-values ([(cw ch) (get-client-size)])
-            (when (and (<= (send evt get-x) cw)
-                       (<= (send evt get-y) ch))
-              (if (procedure-arity-includes? button-up 1)
-                  (button-up evt)
-                  (button-up)))))))
-    (define/override (on-char evt)
-      (char-typed evt))
-    (super-new (style '(transparent no-focus)))
-    (let ([dc (get-dc)])
-      (let-values ([(_1 th _2 _3) (send dc get-text-extent str)])
-        (min-client-height (inexact->exact (floor th)))))
-    (update-client-width init-width)))
-
-(define text-info<%> (interface (info<%>)
-                       set-macro-recording
-                       overwrite-status-changed
-                       anchor-status-changed
-                       editor-position-changed
-                       use-file-text-mode-changed
-                       add-line-number-menu-items))
-(define text-info-mixin
-  (mixin (info<%>) (text-info<%>)
-    (inherit get-info-editor)
-    (define remove-first
-      (preferences:add-callback
-       'framework:col-offsets
-       (λ (p v)
-         (editor-position-changed-offset/numbers
-          v
-          (preferences:get 'framework:display-line-numbers))
-         #t)))
-    (define remove-second
-      (preferences:add-callback
-       'framework:display-line-numbers
-       (λ (p v)
-         (editor-position-changed-offset/numbers
-          (preferences:get 'framework:col-offsets)
-          v)
-         #t)))
-    (define/augment (on-close)
-      (remove-first)
-      (remove-second)
-      (inner (void) on-close))
-    [define last-start #f]
-    [define last-end #f]
-    [define last-params #f]
-    (define/private (editor-position-changed-offset/numbers offset? line-numbers?)
-      (let* ([edit (get-info-editor)]
-             [make-one
-              (λ (pos)
-                (if line-numbers?
-                    (let* ([line (send edit position-paragraph pos)]
-                           [col (find-col edit line pos)])
-                      (format "~a:~a"
-                              (add1 line)
-                              (if offset?
-                                  (add1 col)
-                                  col)))
-                    (format "~a" pos)))])
-        (cond
-          [(not (object? position-canvas))
-           (void)]
-          [edit
-           (unless (send position-canvas is-shown?)
-             (send position-canvas show #t))
-           (let ([start (send edit get-start-position)]
-                 [end (send edit get-end-position)])
-             (unless (and last-start
-                          (equal? last-params (list offset? line-numbers?))
-                          (= last-start start)
-                          (= last-end end))
-               (set! last-params (list offset? line-numbers?))
-               (set! last-start start)
-               (set! last-end end)
-               (when (object? position-canvas)
-                 (change-position-edit-contents
-                  (if (= start end)
-                      (make-one start)
-                      (string-append (make-one start)
-                                     "-"
-                                     (make-one end)))))))]
-          [else
-           (when (send position-canvas is-shown?)
-             (send position-canvas show #f))])))
-    
-    ;; find-col : text number number -> number
-    ;; given a line number and a position, finds the
-    ;; column number for that position
-    (define/private (find-col text line pos)
-      (let ([line-start (send text paragraph-start-position line)])
-        (if (= line-start pos)
-            0
-            (let loop ([col 0]
-                       [snip (send text find-snip line-start 'after-or-none)])
-              (cond
-                [(and snip (is-a? snip tab-snip%))
-                 ;; assume cursor isn't in the middle of the tab snip
-                 ;; and that there is no tab array
-                 (let ([twb (box 0)])
-                   (send text get-tabs #f twb #f)
-                   (let ([tw (floor (inexact->exact (unbox twb)))])
-                     (loop (+ col (- tw (modulo col tw)))
-                           (send snip next))))]
-                [snip 
-                 (let ([snip-position (send text get-snip-position snip)]
-                       [snip-length (send snip get-count)])
-                   (if (<= snip-position pos (+ snip-position snip-length))
-                       (+ col (- pos snip-position))
-                       (loop (+ col snip-length)
-                             (send snip next))))]
-                [else
-                 col])))))
-    
-    
-    [define anchor-last-state? #f]
-    [define overwrite-last-state? #f]
-    
-    (field (macro-recording? #f))
-    (define/private (update-macro-recording-icon)
-      (unless (eq? (send macro-recording-message is-shown?)
-                   macro-recording?)
-        (if macro-recording?
-            (add-uncommon-child macro-recording-message)
-            (remove-uncommon-child macro-recording-message))))
-    (define/public (set-macro-recording on?)
-      (set! macro-recording? on?)
-      (update-macro-recording-icon))
-    
-    (define/public (anchor-status-changed)
-      (let ([info-edit (get-info-editor)]
-            [failed
-             (λ ()
-               (unless (eq? anchor-last-state? #f)
-                 (set! anchor-last-state? #f)
-                 (remove-uncommon-child anchor-message)))])
-        (cond
-          [info-edit
-           (let ([anchor-now? (send info-edit get-anchor)])
-             (unless (eq? anchor-now? anchor-last-state?)
-               (cond
-                 [(object? anchor-message)
-                  (if anchor-now?
-                      (add-uncommon-child anchor-message)
-                      (remove-uncommon-child anchor-message))
-                  (set! anchor-last-state? anchor-now?)]
-                 [else (failed)])))]
-          [else
-           (failed)])))
-    (define/public (editor-position-changed)
-      (editor-position-changed-offset/numbers
-       (preferences:get 'framework:col-offsets)
-       (preferences:get 'framework:display-line-numbers)))
-    (define/public (overwrite-status-changed)
-      (let ([info-edit (get-info-editor)]
-            [failed
-             (λ ()
-               (set! overwrite-last-state? #f)
-               (remove-uncommon-child overwrite-message))])
-        (cond
-          [info-edit
-           (let ([overwrite-now? (send info-edit get-overwrite-mode)])
-             (unless (eq? overwrite-now? overwrite-last-state?)
-               (cond
-                 [(object? overwrite-message)
-                  (if overwrite-now?
-                      (add-uncommon-child overwrite-message)
-                      (remove-uncommon-child overwrite-message))
-                  (set! overwrite-last-state? overwrite-now?)]
-                 [else
-                  (failed)])))]
-          [else
-           (failed)])))
-    
-
-    (define/public (add-line-number-menu-items menu)
-      (void))
-    
-    (define/public (use-file-text-mode-changed)
-      (when (object? file-text-mode-msg)
-        (define ed (get-info-editor))
-        (send file-text-mode-msg-parent change-children
-              (λ (l)
-                (if (and (is-a? ed text:info<%>)
-                         (eq? (system-type) 'windows)
-                         (send ed use-file-text-mode))
-                  (list file-text-mode-msg)
-                  '())))))
-    
-    (define/override (update-info)
-      (super update-info)
-      (update-macro-recording-icon)
-      (overwrite-status-changed)
-      (anchor-status-changed)
-      (editor-position-changed)
-      (use-file-text-mode-changed))
-    (super-new)
-    
-    (inherit get-info-panel)
-    
-    (define position-parent (new click-pref-panel% 
-                                 [border 2]
-                                 [parent (get-info-panel)]
-                                 [stretchable-width #f]
-                                 [stretchable-height #f]
-                                 [extra-menu-items (λ (menu) (add-line-number-menu-items menu))]))
-    (define position-canvas (new position-canvas% 
-                                 [parent position-parent] 
-                                 [init-width "1:1"]))
-    (define/private (change-position-edit-contents str)
-      (send position-canvas set-str str))
-    
-    (send (get-info-panel) change-children
-          (λ (l)
-            (cons position-parent (remq position-parent l))))
-
-    (define file-text-mode-msg-parent (new horizontal-panel%
-                                           [stretchable-width #f]
-                                           [stretchable-height #f]
-                                           [parent (get-info-panel)]))
-    (define file-text-mode-msg (new file-text-mode-msg% [parent file-text-mode-msg-parent]))
-    (send file-text-mode-msg-parent change-children (λ (l) '()))
-    (send (get-info-panel) change-children
-          (λ (l)
-            (cons file-text-mode-msg-parent (remq file-text-mode-msg-parent l))))
-    
-    (define uncommon-parent (new horizontal-panel%
-                                 [parent (get-info-panel)]
-                                 [stretchable-width #f]))
-    
-    (send (get-info-panel) change-children
-          (λ (l) (cons uncommon-parent (remq uncommon-parent l))))
-    (define anchor-message
-      (new message%
-           [font small-control-font]
-           [label (string-constant auto-extend-selection)]
-           [parent uncommon-parent]))
-    (define overwrite-message 
-      (new message%
-           [font small-control-font]
-           [label (string-constant overwrite)]
-           [parent uncommon-parent]))
-    (define macro-recording-message
-      (new message%
-           [label "c-x;("]
-           [font small-control-font]
-           [parent uncommon-parent]))
-    (define/private (remove-uncommon-child c)
-      (send uncommon-parent change-children
-            (λ (l) (remq c l))))
-    (define/private (add-uncommon-child c)
-      (define (child->num c)
-        (cond
-          [(eq? c anchor-message) 0]
-          [(eq? c overwrite-message) 1]
-          [(eq? c macro-recording-message) 2]))
-      (send uncommon-parent change-children
-            (λ (l) (sort (cons c (remq c l))
-                         <
-                         #:key child->num))))
-
-    (inherit determine-width)
-    (send uncommon-parent change-children (λ (l) '()))
-    (editor-position-changed)
-    (use-file-text-mode-changed)))
-
-(define crlf-string "CRLF")
-(define file-text-mode-msg%
-  (class canvas%
-    (inherit min-width min-height get-dc refresh)
-    (define/override (on-paint)
-      (define dc (get-dc))
-      (send dc set-pen "black" 1 'transparent)
-      (send dc set-brush "orange" 'solid)
-      (define-values (w h d a) (send dc get-text-extent crlf-string))
-      (send dc draw-rectangle 0 0 (+ w 4) h)
-      (send dc draw-text crlf-string 2 0))
-    (super-new)
-    (inherit stretchable-width)
-    (stretchable-width #f)
-    (send (get-dc) set-font small-control-font)
-    (let ()
-      (define-values (w h d a) (send (get-dc) get-text-extent crlf-string))
-      (min-width (inexact->exact (ceiling (+ w 4))))
-      (min-height (inexact->exact (ceiling h))))))         
-
-(define click-pref-panel%
-  (class horizontal-panel%
-    (init-field extra-menu-items)
-    (inherit popup-menu)
-    (define/override (on-subwindow-event receiver evt)
-      (cond
-        [(send evt button-down?)
-         (let ([menu (new popup-menu%)]
-               [line-numbers? (preferences:get 'framework:display-line-numbers)])
-           (new checkable-menu-item%
-                [parent menu]
-                [label (string-constant show-line-and-column-numbers)]
-                [callback (λ (x y) (preferences:set 'framework:display-line-numbers #t))]
-                [checked line-numbers?])
-           (new checkable-menu-item%
-                [parent menu]
-                [label (string-constant show-character-offsets)]
-                [callback (λ (x y) (preferences:set 'framework:display-line-numbers #f))]
-                [checked (not line-numbers?)])
-           (extra-menu-items menu)
-           (popup-menu menu 
-                       (+ 1 (send evt get-x))
-                       (+ 1 (send evt get-y))))
-         #t]
-        [else
-         (super on-subwindow-event receiver evt)]))
-    (super-new)))
-
-(define pasteboard-info<%> (interface (info<%>)))
-(define pasteboard-info-mixin
-  (mixin (basic<%>) (pasteboard-info<%>)
-    (super-new)))
-
-(generate-standard-menus-code)
-
-(define -editor<%> (interface (standard-menus<%>)
-                     get-entire-label
-                     get-label-prefix
-                     set-label-prefix
-
-                     get-canvas%
-                     get-canvas<%>
-                     get-editor%
-                     get-editor<%>
-                     
-                     make-editor
-                     revert
-                     save
-                     save-as
-                     get-canvas
-                     get-editor))
-
-(define editor-mixin
-  (mixin (standard-menus<%>) (-editor<%>)
-    (init (filename #f))
-    (init-field (editor% #f))
-    
-    (inherit get-area-container get-client-size 
-             show get-edit-target-window get-edit-target-object)
-    
-    (define/override get-filename
-      (case-lambda
-        [() (get-filename #f)]
-        [(b)
-         (let ([e (get-editor)])
-           (and e (send e get-filename b)))]))
-    
-    (define/override (editing-this-file? filename)
-      (let ([path-equal?
-             (λ (x y)
-               (with-handlers ((exn:fail? (λ (x) #f)))
-                 (equal? (normal-case-path (normalize-path x))
-                         (normal-case-path (normalize-path y)))))])
-        (let ([this-fn (get-filename)])
-          (and this-fn
-               (path-equal? filename (get-filename))))))
-    
-    (define/augment (on-close)
-      (send (get-editor) on-close)
-      (inner (void) on-close))
-    
-    (define/augment (can-close?)
-      (and (send (get-editor) can-close?)
-           (inner #t can-close?)))
-    
-    [define label ""]
-    [define label-prefix (application:current-app-name)]
-    (define/private (do-label)
-      (super set-label (gui-utils:trim-string (get-entire-label) 200))
-      (send (group:get-the-frame-group) frame-label-changed this))
-    
-    (define/public (get-entire-label)
-      (cond
-        [(string=? "" label)
-         label-prefix]
-        [(string=? "" label-prefix)
-         label]
-        [else 
-         (string-append label " - " label-prefix)]))
-    (define/public (get-label-prefix) label-prefix)
-    (define/public (set-label-prefix s)
-      (when (and (string? s)
-                 (not (string=? s label-prefix)))
-        (set! label-prefix s)
-        (do-label)))
-    [define/override get-label (λ () label)]
-    [define/override set-label
-      (λ (t)
-        (when (and (string? t)
-                   (not (string=? t label)))
-          (set! label t)
-          (do-label)))]
-    
-    (define/public (get-canvas%) editor-canvas%)
-    (define/public (get-canvas<%>) (class->interface editor-canvas%))
-    (define/public (make-canvas)
-      (let ([% (get-canvas%)]
-            [<%> (get-canvas<%>)])
-        (unless (implementation? % <%>)
-          (error 'frame:editor%
-                 "result of get-canvas% method must match ~e interface; got: ~e"
-                 <%> %))
-        (instantiate % () (parent (get-area-container)))))
-    (define/public (get-editor%)
-      (or editor%
-          (error 'editor-frame% "abstract method: no editor% class specified")))
-    (define/public (get-editor<%>)
-      editor:basic<%>)
-    (define/public (make-editor)
-      (let ([% (get-editor%)]
-            [<%> (get-editor<%>)])
-        (unless (implementation? % <%>)
-          (error 'frame:editor%
-                 "result of get-editor% method must match ~e interface; got: ~e"
-                 <%> %))
-        (make-object %)))
-    
-    (define/public save
-      (lambda ([format 'same])
-        (let* ([ed (get-editor)]
-               [filename (send ed get-filename)])
-          (if filename
-              (send ed save-file/gui-error filename format)
-              (save-as format)))))
-    
-    (define/public save-as
-      (lambda ([format 'same])
-        (let* ([editor (get-editor)]
-               [name (send editor get-filename)])
-          (let-values ([(base name)
-                        (if name 
-                            (let-values ([(base name dir?) (split-path name)])
-                              (values base name))
-                            (values #f #f))])
-            (let ([file (send editor put-file base name)])
-              (if file
-                  (send editor save-file/gui-error file format)
-                  #f))))))
-    
-    (define/private (basename str)
-      (let-values ([(base name dir?) (split-path str)])
-        base))
-    
-    (inherit get-checkable-menu-item% get-menu-item%)
-    
-    (define/override (file-menu:open-callback item evt)
-      (let* ([e (get-editor)]
-             [fn (and e (send e get-filename))]
-             [dir (and fn
-                       (let-values ([(base name dir) (split-path fn)])
-                         base))])
-        (handler:open-file dir)))
-    
-    (define/override (file-menu:revert-on-demand item)
-      (send item enable (not (send (get-editor) is-locked?))))
-    
-    (define/override file-menu:revert-callback 
-      (λ (item control)
-        (let* ([edit (get-editor)]
-               [b (box #f)]
-               [filename (send edit get-filename b)])
-          (if (or (not filename)
-                  (unbox b))
-              (bell)
-              (when (or (not (send (get-editor) is-modified?))
-                        (gui-utils:get-choice
-                         (string-constant are-you-sure-revert)
-                         (string-constant yes)
-                         (string-constant no)
-                         (string-constant are-you-sure-revert-title)
-                         #f
-                         this))
-                (revert))))
-        #t))
-    
-    (define/public (revert)
-      (let* ([edit (get-editor)]
-             [b (box #f)]
-             [filename (send edit get-filename b)])
-        (when (and filename
-                   (not (unbox b)))
-          (let ([start
-                 (if (is-a? edit text%)
-                     (send edit get-start-position)
-                     #f)])
-            (send edit begin-edit-sequence)
-            (let ([status (send edit load-file/gui-error
-                                filename
-                                'guess
-                                #f)])
-              (if status
-                  (begin
-                    (when (is-a? edit text%)
-                      (send edit set-position start start))
-                    (send edit end-edit-sequence))
-                  (send edit end-edit-sequence)))))))
-    
-    (define/override file-menu:create-revert? (λ () #t))
-    (define/override file-menu:save-callback
-      (λ (item control)
-        (save)
-        #t))
-    
-    (define/override file-menu:create-save? (λ () #t))
-    (define/override file-menu:save-as-callback (λ (item control) (save-as) #t))
-    (define/override file-menu:create-save-as? (λ () #t))
-    (define/override file-menu:print-callback (λ (item control)
-                                                (send (get-editor) print
-                                                      #t
-                                                      #t
-                                                      (preferences:get 'framework:print-output-mode))
-                                                #t))
-    (define/override file-menu:create-print? (λ () #t))
-    
-    (inherit get-top-level-window)
-    (define/override (file-menu:between-save-as-and-print file-menu)
-      (when (and (can-get-page-setup-from-user?) (file-menu:create-print?))
-        (new menu-item% 
-             [parent file-menu]
-             [label (string-constant page-setup-menu-item)]
-             [help-string (string-constant page-setup-info)]
-             [callback
-              (lambda (item event)
-                (let ([s (get-page-setup-from-user #f (get-top-level-window))])
-                  (when s
-                    (send (current-ps-setup) copy-from s))))])))
-    
-    (define/override (edit-menu:between-select-all-and-find edit-menu)
-      (define c% (get-checkable-menu-item%))
-      (define (on-demand menu-item)
-        (define edit (get-edit-target-object))
-        (cond
-          [(and edit (is-a? edit editor<%>))
-           (send menu-item enable #t)
-           (send menu-item check (send edit auto-wrap))]
-          [else 
-           (send menu-item check #f)
-           (send menu-item enable #f)]))
-      (define (callback item event)
-        (define edit (get-edit-target-object))
-        (when (and edit
-                   (is-a? edit editor<%>))
-          (define new-pref (not (send edit auto-wrap)))
-          (preferences:set 'framework:auto-set-wrap? new-pref)
-          (send edit auto-wrap new-pref)))
-      (new c%
-           [label (string-constant wrap-text-item)]
-           [parent edit-menu]
-           [callback callback]
-           [demand-callback on-demand])
-      (make-object separator-menu-item% edit-menu))
-    
-    (define/override help-menu:about-callback 
-      (λ (menu evt) 
-        (message-box (application:current-app-name)
-                     (format (string-constant welcome-to-something)
-                             (application:current-app-name))
-                     #f
-                     '(ok))))
-    (define/override help-menu:about-string (λ () (application:current-app-name)))
-    (define/override help-menu:create-about? (λ () #t))
-    
-    (super-new (label (get-entire-label)))
-    
-    (define canvas #f)
-    (define editor #f)
-    (public get-canvas get-editor)
-    (define get-canvas 
-      (λ () 
-        (unless canvas
-          (set! canvas (make-canvas))
-          (send canvas set-editor (get-editor)))
-        canvas))
-    (define get-editor 
-      (λ () 
-        (unless editor
-          (set! editor (make-editor))
-          (send (get-canvas) set-editor editor))
-        editor))
-    
-    (cond
-      [(and filename (file-exists? filename))
-       (let ([ed (get-editor)])
-         (send ed begin-edit-sequence)
-         (send ed load-file/gui-error filename 'guess)
-         (send ed end-edit-sequence))]
-      [filename
-       (send (get-editor) set-filename filename)]
-      [else (void)])
-    
-    (let ([ed-fn (send (get-editor) get-filename)])
-      (set! label (or (and ed-fn 
-                           (path->string (file-name-from-path ed-fn)))
-                      (send (get-editor) get-filename/untitled-name))))
-    (do-label)
-    (let ([canvas (get-canvas)])
-      (when (is-a? canvas editor-canvas%)
-        ;; when get-canvas is overridden,
-        ;; it might not yet be implemented
-        (send canvas focus)))))
-
-(define text<%> (interface (-editor<%>)))
-(define text-mixin
-  (mixin (-editor<%>) (text<%>)
-    (define/override (get-editor<%>) (class->interface text%))
-    (init (filename #f) (editor% text:keymap%))
-    
-    (inherit get-editor)
-    (define/override (edit-menu:between-find-and-preferences edit-menu)
-      (when (add-find-longest-line-menu-item?)
-        (new menu-item%
-             [parent edit-menu] 
-             [label (string-constant find-longest-line)]
-             [callback 
-              (λ (x y)
-                (define ed (get-editor))
-                (define (line-len p)
-                  (define ans 
-                    (- (send ed paragraph-end-position p #f)
-                       (send ed paragraph-start-position p #f)))
-                  ans)
-                (when ed
-                  (let loop ([p (- (send ed last-paragraph) 1)]
-                             [longest-size (line-len (send ed last-paragraph))]
-                             [longest (send ed last-paragraph)])
-                    (cond
-                      [(= p -1)
-                       (send ed set-position 
-                             (send ed paragraph-start-position longest #f)
-                             (send ed paragraph-end-position longest #f))]
-                      [else
-                       (define this-size (line-len p))
-                       (cond
-                         [(<= longest-size this-size)
-                          (loop (- p 1) this-size p)]
-                         [else
-                          (loop (- p 1) longest-size longest)])]))))]))
-      (super edit-menu:between-find-and-preferences edit-menu))
-      
-    (define/public (add-find-longest-line-menu-item?) #t)
-    
-    (super-new (filename filename) (editor% editor%))))
-
-(define pasteboard<%> (interface (-editor<%>)))
-(define pasteboard-mixin
-  (mixin (-editor<%>) (pasteboard<%>)
-    (define/override get-editor<%> (λ () (class->interface pasteboard%)))
-    (init (filename #f) (editor% pasteboard:keymap%))
-    (super-new (filename filename) (editor% editor%))))
-
-(define delegate<%>
-  (interface (status-line<%> text<%>)
-    delegated-text-shown?
-    hide-delegated-text
-    show-delegated-text
-    delegate-moved
-    set-delegated-text
-    get-delegated-text))
-
-(define delegatee-editor-canvas%
-  (class (canvas:color-mixin canvas:basic%)
-    (init-field delegate-frame)
-    (inherit get-editor get-dc)
-    
-    (define/override (on-event evt)
-      (super on-event evt)
-      (when delegate-frame
-        (let ([text (get-editor)])
-          (when (and (is-a? text text%)
-                     (send delegate-frame delegated-text-shown?))
-            (cond
-              [(send evt button-down?)
-               (let-values ([(editor-x editor-y)
-                             (send text dc-location-to-editor-location 
-                                   (send evt get-x)
-                                   (send evt get-y))])
-                 (send delegate-frame click-in-overview 
-                       (send text find-position editor-x editor-y)))])))))
-    (super-new)))
-
-(define (at-most-200 s)
-  (cond
-    [(<= (string-length s) 200)
-     s]
-    [else (substring s 0 200)]))
-
-(define delegatee-text<%>
-  (interface ()
-    set-start/end-para))
-
-(define delegatee-text%
-  (class* text:basic% (delegatee-text<%>)
-    (define start-para #f)
-    (define end-para #f)
-    (define view-x-b (box 0))
-    (define view-width-b (box 0))
-    (inherit get-admin
-             paragraph-start-position paragraph-end-position 
-             position-location invalidate-bitmap-cache scroll-to-position
-             get-visible-position-range position-paragraph
-             last-position)
-    
-    (define/override (on-new-string-snip)
-      (instantiate text:1-pixel-string-snip% ()))
-    
-    (define/override (on-new-tab-snip)
-      (instantiate text:1-pixel-tab-snip% ()))
-    
-    ;; set-start/end-para : (union (#f #f -> void) (number number -> void))
-    (define/public (set-start/end-para _start-para _end-para)
-      (unless (and (equal? _start-para start-para)
-                   (equal? _end-para end-para))
-        (let ([old-start-para start-para]
-              [old-end-para end-para])
-          (cond
-            [else
-             (set! start-para _start-para)
-             (set! end-para _end-para)])
-          
-          (when (and start-para end-para)
-            
-            (let-values ([(v-start v-end) (let ([bs (box 0)]
-                                                [bf (box 0)])
-                                            (get-visible-position-range bs bf)
-                                            (values (unbox bs)
-                                                    (unbox bf)))])
-              (let ([v-start-para (position-paragraph v-start)]
-                    [v-end-para (position-paragraph v-end)])
-                (cond
-                  [(v-start-para . >= . start-para)
-                   (scroll-to-position (paragraph-start-position start-para))]
-                  [(v-end-para . <= . end-para)
-                   (scroll-to-position (paragraph-end-position end-para))]
-                  [else (void)]))))
-          (define the-l #f)
-          (define the-t #f)
-          (define the-r #f)
-          (define the-b #f)
-          (when (and old-start-para old-end-para)
-            (let-values ([(x y w h) (get-rectangle old-start-para old-end-para)])
-              (when x
-                (set! the-l x)
-                (set! the-t y)
-                (set! the-r (+ x w))
-                (set! the-b (+ y h)))))
-          (when (and start-para end-para)
-            (let-values ([(x y w h) (get-rectangle start-para end-para)])
-              (cond
-                [(and x the-l)
-                 (set! the-l (min x the-l))
-                 (set! the-t (min y the-t))
-                 (set! the-r (max the-r (+ x w)))
-                 (set! the-b (max the-b (+ y h)))]
-                [x
-                 (set! the-l x)
-                 (set! the-t y)
-                 (set! the-r (+ x w))
-                 (set! the-b (+ y h))])))
-          (when the-l
-            (invalidate-bitmap-cache the-l the-t (- the-r the-l) (- the-b the-t))))))
-    
-    (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-      (when (and before?
-                 start-para
-                 end-para)
-        (let ([old-pen (send dc get-pen)]
-              [old-brush (send dc get-brush)])
-          (send dc set-pen
-                (send the-pen-list find-or-create-pen 
-                      (preferences:get 'framework:delegatee-overview-color)
-                      1
-                      'solid))
-          (send dc set-brush
-                (send the-brush-list find-or-create-brush 
-                      (preferences:get 'framework:delegatee-overview-color)
-                      'solid))
-          (let-values ([(x y w h) (get-rectangle start-para end-para)])
-            (when x
-              (send dc draw-rectangle 
-                    (+ dx x)
-                    (+ dy y)
-                    w
-                    h)))
-          (send dc set-pen old-pen)
-          (send dc set-brush old-brush)))
-      (super on-paint before? dc left top right bottom dx dy draw-caret))
-    
-    
-    ;; get-rectangle : number number -> 
-    ;;                (values (union #f number) (union #f number) (union #f number) (union #f number))
-    ;; computes the rectangle corresponding the input paragraphs
-    (define/private (get-rectangle start-para end-para)
-      (let ([start (get-line-y start-para #t)]
-            [end (get-line-y end-para #f)]
-            [admin (get-admin)])
-        (cond
-          [(not admin)
-           (values #f #f #f #f)]
-          [(= 0 (last-position))
-           (values #f #f #f #f)]
-          [else
-           (send admin get-view view-x-b #f view-width-b #f)
-           (send admin get-view view-x-b #f view-width-b #f)
-           (values (unbox view-x-b)
-                   start
-                   (unbox view-width-b)
-                   (- end start))])))
-    
-    (define/private (get-line-y para top?)
-      (let ([pos (paragraph-start-position para)]
-            [b (box 0)])
-        (position-location pos #f b top? #f #t)
-        (unbox b)))
-    (super-new)
-    
-    (inherit set-cursor)
-    (set-cursor (make-object cursor% 'arrow))
-    
-    (inherit set-line-spacing)
-    (set-line-spacing 0)))
-
-(define delegate-mixin
-  (mixin (status-line<%> text<%>) (delegate<%>)
-    
-    (define delegated-text #f)
-    (define/public-final (get-delegated-text) delegated-text)
-    (define/public-final (set-delegated-text t) 
-      (unless (or (not t) (is-a? t text:delegate<%>))
-        (error 'set-delegated-text 
-               "expected either #f or a text:delegate<%> object, got ~e" 
-               t))
-      (unless (eq? delegated-text t)
-        (set! delegated-text t)
-        (when shown?
-          (unless (send (get-delegated-text) get-delegate)
-            (send (get-delegated-text) set-delegate 
-                  (new delegatee-text%)))
-          (send delegate-ec set-editor (send (get-delegated-text) get-delegate)))))
-    
-    [define rest-panel 'uninitialized-root]
-    [define super-root 'uninitialized-super-root]
-    [define/override make-root-area-container
-      (λ (% parent)
-        (let* ([s-root (super make-root-area-container
-                              horizontal-panel%
-                              parent)]
-               [r-root (make-object % s-root)])
-          (set! super-root s-root)
-          (set! rest-panel r-root)
-          r-root))]
-    
-    (define/override (get-editor<%>)
-      text:delegate<%>)
-    
-    (define/override (get-editor%)
-      (text:delegate-mixin (super get-editor%)))
-    
-    (field (shown? (preferences:get 'framework:show-delegate?)))
-    (define/public (delegated-text-shown?) 
-      shown?)
-    
-    (inherit close-status-line open-status-line)
-    (define/public (hide-delegated-text)
-      (set! shown? #f)
-      (when delegated-text 
-        (send delegated-text set-delegate #f))
-      (send delegate-ec set-editor #f)
-      (send super-root change-children
-            (λ (l) (list rest-panel))))
-    (define/public (show-delegated-text)
-      (set! shown? #t)
-      (when delegated-text
-        (unless (send delegated-text get-delegate)
-          (send delegated-text set-delegate 
-                (new delegatee-text%)))
-        (send delegate-ec set-editor (send (get-delegated-text) get-delegate)))
-      (send super-root change-children
-            (λ (l) (list rest-panel delegate-ec))))
-    
-    (define/public (click-in-overview pos)
-      (when shown?
-        (let* ([d-canvas (send delegated-text get-canvas)]
-               [bx (box 0)]
-               [by (box 0)])
-          (let-values ([(cw ch) (send d-canvas get-client-size)])
-            (send delegated-text position-location pos bx by)
-            (send d-canvas focus)
-            (send d-canvas scroll-to 
-                  (- (unbox bx) (/ cw 2))
-                  (- (unbox by) (/ ch 2))
-                  cw
-                  ch
-                  #t)
-            (send delegated-text set-position pos)))))
-    
-    (define/public (delegate-moved)
-      (define delegatee (send delegate-ec get-editor))
-      (when delegatee
-        (let ([startb (box 0)]
-              [endb (box 0)])
-          (send delegated-text get-visible-position-range startb endb #f)
-          (send delegatee set-start/end-para
-                (send delegated-text position-paragraph (unbox startb)) 
-                (send delegated-text position-paragraph (unbox endb))))))
-    
-    (define/public (get-delegatee) (send delegate-ec get-editor))
-        
-    (super-new)
-    
-    (define delegate-ec (new delegatee-editor-canvas%
-                             [parent super-root]
-                             [delegate-frame this]
-                             [min-width 150]
-                             [stretchable-width #f]))
-    (inherit get-editor)
-    (if (preferences:get 'framework:show-delegate?)
-        (show-delegated-text)
-        (hide-delegated-text))))
-
-(define searchable<%> (interface (basic<%>)
-                        search
-                        search-replace
-                        replace-all
-                        
-                        get-text-to-search
-                        set-text-to-search
-                        
-                        search-hidden?
-                        hide-search
-                        unhide-search
-
-                        get-case-sensitive-search?
-                        search-hits-changed
-                        ))
-
-(define old-search-highlight void)
-(define (clear-search-highlight)
-  (old-search-highlight)
-  (set! old-search-highlight void))
-
-(define find/replace-text%
-  (class text:keymap%
-    (init-field pref-sym)
-    (inherit get-canvas get-text last-position insert find-first-snip
-             get-admin invalidate-bitmap-cache
-             begin-edit-sequence end-edit-sequence get-top-level-window)
-    (define/augment (after-insert x y)
-      (update-prefs)
-      (inner (void) after-insert x y))
-    (define/augment (after-delete x y)
-      (update-prefs)
-      (inner (void) after-delete x y))
-    (define timer #f)
-    (define/private (update-prefs)
-      (unless timer
-        (set! timer (new timer%
-                         [notify-callback
-                          (λ ()
-                            (preferences:set pref-sym
-                                             (let loop ([snip (find-first-snip)])
-                                               (cond
-                                                 [(not snip) '()]
-                                                 [(is-a? snip string-snip%)
-                                                  (cons (send snip get-text 0 (send snip get-count))
-                                                        (loop (send snip next)))]
-                                                 [else (cons snip (loop (send snip next)))]))))])))
-      (send timer stop)
-      (send timer start 150 #t))
-    (define/override (get-keymaps)
-      (editor:add-after-user-keymap search/replace-keymap (super get-keymaps)))
-    (super-new)
-    (inherit set-styles-fixed)
-    (set-styles-fixed #t)
-    (begin-edit-sequence)
-    (for-each
-     (λ (x) (insert x (last-position) (last-position)))
-     (preferences:get pref-sym))
-    (end-edit-sequence)
-    
-    (define pref-callback 
-      (λ (p v)
-        (let ([c (get-canvas)])
-          (when (and c (send c get-line-count))
-            (send c set-editor (send c get-editor))))))
-    
-    (preferences:add-callback 'framework:standard-style-list:font-size pref-callback #t)))
-
-(define find-text%
-  (class find/replace-text%
-    (inherit get-canvas get-text last-position insert find-first-snip
-             get-admin invalidate-bitmap-cache run-after-edit-sequence
-             begin-edit-sequence end-edit-sequence get-top-level-window)
-    
-    (define/private (get-case-sensitive-search?)
-      (let ([frame (get-top-level-window)])
-        (and frame
-             (send frame get-case-sensitive-search?))))
-
-    (define/override (on-focus on?)  
-      (let ([frame (get-top-level-window)])
-        (when frame
-          (let ([text-to-search (send frame get-text-to-search)])
-            (when text-to-search
-              (when on?
-                (send text-to-search set-search-anchor (send text-to-search get-start-position)))))))
-      (super on-focus on?))
-    
-    (define/augment (after-insert x y)
-      (update-searching-str/trigger-jump)
-      (inner (void) after-insert x y))
-    (define/augment (after-delete x y)
-      (update-searching-str/trigger-jump)
-      (inner (void) after-delete x y))
-    (define/private (update-searching-str/trigger-jump)
-      (let ([tlw (get-top-level-window)])
-        (when tlw
-          (send tlw search-string-changed)))
-      
-      ;; trigger-jump
-      (when (preferences:get 'framework:anchored-search)
-        (let ([frame (get-top-level-window)])
-          (when frame
-            (let ([text-to-search (send frame get-text-to-search)])
-              (when text-to-search
-                (let ([anchor-pos (send text-to-search get-anchor-pos)])
-                  (when anchor-pos
-                    (cond
-                      [(equal? "" (get-text))
-                       (send text-to-search set-position anchor-pos anchor-pos)]
-                      [else
-                       (search 'forward #t #t #f anchor-pos)])))))))))
-
-    
-    (define/private (get-searching-text)
-      (let ([frame (get-top-level-window)])
-        (and frame
-             (send frame get-text-to-search))))
-    (define/public (search [searching-direction 'forward] 
-                           [beep? #t]
-                           [wrap? #t]
-                           [move-anchor? #t]
-                           [search-start-position #f])
-      (let* ([string (get-text)]
-             [top-searching-edit (get-searching-text)])
-        (when top-searching-edit
-          (let ([searching-edit (let ([focus-snip (send top-searching-edit get-focus-snip)])
-                                  (if (and focus-snip (is-a? focus-snip editor-snip%))
-                                      (send focus-snip get-editor)
-                                      top-searching-edit))]
-                
-                [not-found
-                 (λ (found-edit skip-beep?)
-                   (when (and beep?
-                              (not skip-beep?))
-                     (bell))
-                   #f)]
-                [found
-                 (λ (text first-pos)
-                   (define (thunk)
-                     (define last-pos ((if (eq? searching-direction 'forward) + -)
-                                       first-pos (string-length string)))
-                     (define start-pos (min first-pos last-pos))
-                     (define end-pos (max first-pos last-pos))
-                     
-                     (send text begin-edit-sequence #t #f)
-                     (send text set-caret-owner #f 'display)
-                     (send text set-position start-pos end-pos #f #f 'local)
-                     
-                     
-                     ;; scroll to the middle if the search result isn't already visible
-                     (let ([search-result-line (send text position-line (send text get-start-position))]
-                           [bt (box 0)]
-                           [bb (box 0)])
-                       (send text get-visible-line-range bt bb #f)
-                       (unless (< (unbox bt) search-result-line (unbox bb))
-                         (let* ([half (sub1 (quotient (- (unbox bb) (unbox bt)) 2))]
-                                [last-pos (send text position-line (send text last-position))]
-                                [top-pos (send text line-start-position 
-                                               (max (min (- search-result-line half) last-pos) 0))]
-                                [bottom-pos (send text line-start-position 
-                                                  (max 0
-                                                       (min (+ search-result-line half)
-                                                            last-pos)))])
-                           (send text scroll-to-position 
-                                 top-pos
-                                 #f
-                                 bottom-pos))))
-                     
-                     (when move-anchor?
-                       (when (is-a? text text:searching<%>)
-                         (send text set-search-anchor
-                               (if (eq? searching-direction 'forward)
-                                   end-pos
-                                   start-pos))))
-                     
-                     (send text end-edit-sequence))
-                   
-                   (define owner (or (send text get-active-canvas)
-                                     (send text get-canvas)))
-                   (if owner
-                       (send owner call-as-primary-owner thunk)
-                       (thunk))
-                   #t)])
-            
-            (if (string=? string "")
-                (not-found top-searching-edit #t)
-                (let-values ([(found-edit first-pos)
-                              (find-string-embedded
-                               (if search-start-position 
-                                   top-searching-edit
-                                   searching-edit)
-                               string
-                               searching-direction
-                               (or search-start-position
-                                   (if (eq? 'forward searching-direction)
-                                       (send searching-edit get-end-position)
-                                       (send searching-edit get-start-position)))
-                               'eof #t
-                               (get-case-sensitive-search?)
-                               #t)])
-                  (cond
-                    [(not first-pos)
-                     (if wrap?
-                         (begin
-                           (let-values ([(found-edit pos)
-                                         (find-string-embedded
-                                          top-searching-edit
-                                          string 
-                                          searching-direction
-                                          (if (eq? 'forward searching-direction)
-                                              0
-                                              (send searching-edit last-position))
-                                          'eof #t
-                                          (get-case-sensitive-search?)
-                                          #f)])
-                             (if (not pos)
-                                 (not-found found-edit #f)
-                                 (found found-edit pos))))
-                         (not-found found-edit #f))]
-                    [else
-                     (found found-edit first-pos)])))))))
-
-    (define/override (on-paint before dc left top right bottom dx dy draw-caret?)
-      (super on-paint before dc left top right bottom dx dy draw-caret?)
-      (when before
-        (let ([canvas (get-canvas)])
-          (when (and canvas
-                     (send canvas is-red?))
-            (let-values ([(view-x view-y view-width view-height)
-                          (let ([b1 (box 0)]
-                                [b2 (box 0)]
-                                [b3 (box 0)]
-                                [b4 (box 0)])
-                            (send (get-admin) get-view b1 b2 b3 b4)
-                            (values (unbox b1)
-                                    (unbox b2)
-                                    (unbox b3)
-                                    (unbox b4)))])
-              (let ([pen (send dc get-pen)]
-                    [brush (send dc get-brush)])
-                (send dc set-pen "black" 1 'transparent)
-                (send dc set-brush "pink" 'solid)
-                (send dc draw-rectangle (+ dx view-x) (+ view-y dy) view-width view-height)
-                (send dc set-pen pen)
-                (send dc set-brush brush)))))))
-    
-    (super-new [pref-sym 'framework:search-string])))
-
-(define replace-text%
-  (class find/replace-text%
-    (inherit set-styles-fixed)
-    (super-new [pref-sym 'framework:replace-string])
-    (define/override (get-keymaps)
-      (editor:add-after-user-keymap search/replace-keymap (super get-keymaps)))
-    (set-styles-fixed #t)))
-
-(define search/replace-keymap (new keymap%))
-(send search/replace-keymap map-function "tab" "switch-between-search-and-replace")
-(send search/replace-keymap add-function "switch-between-search-and-replace"
-      (λ (text evt)
-        (let ([find-txt (send (send text get-top-level-window) get-find-edit)]
-              [replace-txt (send (send text get-top-level-window) get-replace-edit)])
-          (cond
-            [(eq? find-txt text)
-             (send replace-txt set-position 0 (send replace-txt last-position))
-             (send (send replace-txt get-canvas) focus)]
-            [(eq? replace-txt text)
-             (send find-txt set-position 0 (send find-txt last-position))
-             (send (send find-txt get-canvas) focus)]))))
-
-(send search/replace-keymap map-function "return" "next")
-(send search/replace-keymap add-function "next"
-      (λ (text evt)
-        (send (send text get-top-level-window) search 'forward)))
-
-(send search/replace-keymap map-function "s:return" "prev")
-(send search/replace-keymap add-function "prev"
-      (λ (text evt)
-        (send (send text get-top-level-window) search 'backward)))
-
-(send search/replace-keymap map-function "c:return" "insert-return")
-(send search/replace-keymap map-function "a:return" "insert-return")
-(send search/replace-keymap add-function "insert-return"
-      (λ (text evt)
-        (send text insert "\n")))
-
-(send search/replace-keymap map-function "esc" "hide-search")
-(send search/replace-keymap add-function "hide-search"
-      (λ (text evt)
-        (let ([tlw (send text get-top-level-window)])
-          (when tlw
-            (send tlw hide-search)))))
-
-(send search/replace-keymap map-function "c:g" "hide-search-and-snap-back")
-(send search/replace-keymap add-function "hide-search-and-snap-back"
-      (λ (text evt)
-        (let ([tlw (send text get-top-level-window)])
-          (when tlw
-            (when (preferences:get 'framework:anchored-search)
-              (let ([text-to-search (send tlw get-text-to-search)])
-                (when text-to-search
-                  (let ([anchor-pos (send text-to-search get-anchor-pos)])
-                    (when anchor-pos 
-                      (send text-to-search set-position anchor-pos))))))
-            (send tlw hide-search)))))
-
-(send search/replace-keymap map-function "f3" "unhide-search-and-toggle-focus")
-(send search/replace-keymap add-function "unhide-search-and-toggle-focus"
-      (λ (text evt)
-        (let ([tlw (send text get-top-level-window)])
-          (when tlw
-            (send tlw unhide-search-and-toggle-focus)))))
-
-(define searchable-canvas% 
-  (class editor-canvas% 
-    (inherit refresh get-dc get-client-size)
-    (define red? #f)
-    (define/public (is-red?) red?)
-    (define/public (set-red r?)
-      (unless (equal? red? r?)
-        (set! red? r?)
-        (refresh)))
-    (define/override (on-paint)
-      (when red?
-        (let ([dc (get-dc)])
-          (let-values ([(cw ch) (get-client-size)])
-            (let ([pen (send dc get-pen)]
-                  [brush (send dc get-brush)])
-              (send dc set-pen "black" 1 'transparent)
-              (send dc set-brush "pink" 'solid)
-              (send dc draw-rectangle 0 0 cw ch)
-              (send dc set-pen pen)
-              (send dc set-brush brush)))))
-      (super on-paint))
-    (super-new)))
-
-(define-local-member-name 
-  update-matches 
-  get-find-edit
-  get-replace-edit
-  search-string-changed)
-
-(define searchable-mixin
-  (mixin (standard-menus<%>) (searchable<%>)
-    (inherit edit-menu:get-show/hide-replace-item)
-    
-    (define super-root 'unitiaialized-super-root)
-    
-    (define case-sensitive-search? (preferences:get 'framework:case-sensitive-search?))
-    (define/public (get-case-sensitive-search?) case-sensitive-search?)
-    (define replace-visible? (preferences:get 'framework:replace-visible?))
-  
-    (define/override (edit-menu:find-callback menu evt) (unhide-search-and-toggle-focus) #t)
-    (define/override (edit-menu:create-find?) #t)
-
-    (define/override (edit-menu:find-from-selection-callback menu evt) 
-      (unhide-search-and-toggle-focus #:new-search-string-from-selection? #t)
-      #t)
-    (define/override (edit-menu:find-from-selection-on-demand item)
-      (define t (get-text-to-search))
-      (send item enable (and t (not (= (send t get-start-position)
-                                       (send t get-end-position))))))
-    (define/override (edit-menu:create-find-from-selection?) #t)
-    
-    (define/override (edit-menu:find-next-callback menu evt) (search 'forward) #t)
-    (define/override (edit-menu:create-find-next?) #t)
-    
-    (define/override (edit-menu:find-previous-callback menu evt) (search 'backward) #t)
-    (define/override (edit-menu:create-find-previous?) #t)
-    
-    (define/override (edit-menu:create-show/hide-replace?) #t)
-    (define/override (edit-menu:show/hide-replace-callback a b) 
-      (cond
-        [hidden?
-         (unhide-search #f)
-         (set-replace-visible? #t)
-         (send replace-edit set-position 0 (send replace-edit last-position))
-         (send (send replace-edit get-canvas) focus)]
-        [else
-         (set-replace-visible? (not replace-visible?))
-         (when replace-visible?
-           (send replace-edit set-position 0 (send replace-edit last-position))
-           (send (send replace-edit get-canvas) focus))])
-      #t)
-    (define/override (edit-menu:show/hide-replace-string)
-      (if replace-visible?
-          (string-constant hide-replace-menu-item)
-          (string-constant show-replace-menu-item)))
-    (define/override (edit-menu:show/hide-replace-on-demand item) 
-      (send item set-label
-            (if (and (not hidden?) replace-visible?)
-                (string-constant hide-replace-menu-item)
-                (string-constant show-replace-menu-item))))
-    
-    (define/override (edit-menu:replace-callback a b) (search-replace) #t)
-    (define/override (edit-menu:create-replace?) #t)
-    (define/override (edit-menu:replace-on-demand item) 
-      (send item enable (and (not hidden?) replace-visible?)))
-
-    (define/override (edit-menu:find-case-sensitive-callback menu evt) 
-      (set! case-sensitive-search? (not case-sensitive-search?))
-      (preferences:set 'framework:case-sensitive-search? case-sensitive-search?)
-      (when find-edit
-        (unless hidden?
-          (search-string-changed))))
-    (define/override (edit-menu:find-case-sensitive-on-demand item) (send item check case-sensitive-search?))
-    (define/override (edit-menu:create-find-case-sensitive?) #t)
-
-    (define/override (edit-menu:replace-all-callback menu evt) (replace-all) #t)
-    (define/override (edit-menu:replace-all-on-demand item) (send item enable (not hidden?)))
-    (define/override (edit-menu:create-replace-all?) #t)
-
-    (define/override make-root-area-container
-      (λ (% parent)
-        (let* ([s-root (super make-root-area-container
-                              vertical-panel%
-                              parent)]
-               [root (make-object % s-root)])
-          (set! super-root s-root)
-          root)))
-    
-    (define text-to-search #f)
-    (define/public-final (get-text-to-search) text-to-search)
-
-    (define/public-final (set-text-to-search new)
-      (unless (eq? new text-to-search)
-        (let ([old text-to-search])
-          (set! text-to-search new)
-          (unless hidden?
-            (when find-edit
-              (when old
-                (send old set-searching-state #f #f #f #f)
-                (send old set-search-anchor #f))
-              (when new
-                (send new set-search-anchor (send new get-start-position))
-                (search-parameters-changed)))))))
-    
-    ;; called by the text-to-search when it finishes the search
-    (define/public-final (search-hits-changed)
-      (when find-edit
-        (when text-to-search
-          (let-values ([(before-caret-new-hits new-hits) (send text-to-search get-search-hit-count)])
-            (update-matches before-caret-new-hits new-hits)
-            (let ([is-red? (and (zero? new-hits) 
-                                (not (zero? (send find-edit last-position))))])
-              (send find-canvas set-red is-red?))))))
-
-    (define/public-final (search-string-changed) (search-parameters-changed))
-    (define/private (search-parameters-changed)
-      (let ([str (send find-edit get-text)])
-        (send text-to-search set-searching-state
-              (if (equal? str "") #f str)
-              case-sensitive-search?
-              replace-visible?
-              #t)))
-    
-    (define/public (search-hidden?) hidden?)
-    
-    (define/public (hide-search)
-      (set! hidden? #t)
-      (when search-gui-built?
-        (when text-to-search
-          (send text-to-search set-searching-state #f #f #f #f))
-        (send super-root change-children
-              (λ (l)
-                (remove search/replace-panel l)))
-        (clear-search-highlight)
-        (when text-to-search
-          (send text-to-search set-search-anchor #f)
-          (let ([canvas (send text-to-search get-canvas)])
-            (when canvas
-              (send canvas focus))))))
-    
-    (define/public (unhide-search focus? #:new-search-string-from-selection? [new-search-string-from-selection? #f])
-      (when hidden?
-        (set! hidden? #f)
-        (build-search-gui-in-frame)
-        (unless (memq search/replace-panel (send super-root get-children))
-          (send super-root add-child search/replace-panel))
-        (search-parameters-changed)
-        (send find-edit begin-edit-sequence #t #f)
-        (when new-search-string-from-selection?
-          (update-search-string-from-selection))
-        (when focus?
-          (send find-edit set-position 0 (send find-edit last-position))
-          (send (send find-edit get-canvas) focus))
-        (send find-edit end-edit-sequence)))
-    
-    (define/public (unhide-search-and-toggle-focus #:new-search-string-from-selection? [new-search-string-from-selection? #f])
-      (if hidden?
-        (unhide-search #t #:new-search-string-from-selection? new-search-string-from-selection?)
-        (let ([canvas (and text-to-search (send text-to-search get-canvas))])
-          (cond
-            [(or (not text-to-search) (and canvas (send canvas has-focus?)))
-             (send find-edit begin-edit-sequence #t #f)
-             (when new-search-string-from-selection?
-               (update-search-string-from-selection))
-             (send find-edit set-position 0 (send find-edit last-position))
-             (send find-canvas focus)
-             (send find-edit end-edit-sequence)]
-            [canvas
-             (send canvas focus)]))))
-    
-    (define/private (update-search-string-from-selection)
-      (when (and text-to-search
-                 (not (= (send text-to-search get-start-position)
-                         (send text-to-search get-end-position))))
-        (send find-edit delete 0 (send find-edit last-position))
-        (send text-to-search move/copy-to-edit 
-              find-edit 
-              (send text-to-search get-start-position)
-              (send text-to-search get-end-position)
-              0
-              #:try-to-move? #f)))
-    
-    (define/public (search searching-direction)
-      (unhide-search #f)
-      (send find-edit search searching-direction #t))
-    
-    (define/public (search-replace) 
-      (let ([text-to-search (get-text-to-search)])
-        (when text-to-search
-          (let ([replacee-start (send text-to-search get-replace-search-hit)])
-            (when replacee-start
-              (let ([replacee-end (+ replacee-start (send find-edit last-position))])
-                (send text-to-search begin-edit-sequence)
-                (send text-to-search set-position replacee-end replacee-end)
-                (send text-to-search delete replacee-start replacee-end)
-                (copy-over replace-edit 0 (send replace-edit last-position) text-to-search replacee-start)
-                (search 'forward)
-                (send text-to-search end-edit-sequence)))))))
-      
-    (define/private (copy-over src-txt src-start src-end dest-txt dest-pos)
-      (send src-txt split-snip src-start)
-      (send src-txt split-snip src-end)
-      (let loop ([snip (send src-txt find-snip src-end 'before)])
-        (cond
-          [(or (not snip) (< (send src-txt get-snip-position snip) src-start))
-           (void)]
-          [else
-           (let ([prev (send snip previous)])
-             (send dest-txt insert (send snip copy) dest-pos dest-pos)
-             (loop prev))])))
-    
-    (define/public (replace-all)
-      (unhide-search #f)
-      (let ([txt (get-text-to-search)])
-        (when txt
-          (let ([search-str (send find-edit get-text)]
-                [ht (make-hasheq)])
-            (send txt begin-edit-sequence)
-            (hash-set! ht txt #t)
-            (let loop ([txt (pop-all-the-way-out txt)]
-                       [pos 0])
-              (let-values ([(found-txt found-pos) (find-string-embedded txt
-                                                                        search-str
-                                                                        'forward
-                                                                        pos
-                                                                        'eof
-                                                                        #f
-                                                                        case-sensitive-search?
-                                                                        #t)])
-                (when found-pos
-                  (unless (hash-ref ht found-txt #f)
-                    (hash-set! ht found-txt #t)
-                    (send found-txt begin-edit-sequence))
-                  (let ([start (- found-pos (send find-edit last-position))])
-                    (send found-txt delete start found-pos)
-                    (copy-over replace-edit 0 (send replace-edit last-position) found-txt start)
-                    (loop found-txt (+ start (send replace-edit last-position)))))))
-            (hash-for-each ht (λ (txt _) (send txt end-edit-sequence)))))))
-                             
-    (define/private (pop-all-the-way-out txt)
-      (let ([admin (send txt get-admin)])
-        (if (is-a? admin editor-snip-editor-admin<%>)
-            (let* ([snip (send admin get-snip)]
-                   [edit-above (send (send snip get-admin) get-editor)])
-              (pop-all-the-way-out edit-above))
-            txt)))
-    
-    (define/private (find-embedded-focus-editor editor)
-      (let loop ([editor editor])
-        (let ([s (send editor get-focus-snip)])
-          (cond
-            [(and s (is-a? s editor-snip%))
-             (let ([next-ed (send s get-editor)])
-               (if next-ed 
-                   (loop next-ed)
-                   editor))]
-            [else editor]))))
-    
-    (define search-gui-built? #f)
-    (define search/replace-panel #f)
-    (define find-canvas #f)
-    (define replace-canvas #f)
-    (define hidden? #t)
-    (field [update-matches void])
-    (define find-edit #f)
-    (define replace-edit #f)
-    
-    (define/public (get-find-edit) find-edit)
-    (define/public (get-replace-edit) replace-edit)
-    
-    (inherit begin-container-sequence end-container-sequence)
-    
-    (define/public (get-replace-visible?) replace-visible?)
-    (define/public (set-replace-visible? r?) 
-      (unless (equal? replace-visible? r?)
-        (set! replace-visible? r?)
-        (preferences:set 'framework:replace-visible? r?)
-        (show/hide-replace)
-        (send (edit-menu:get-show/hide-replace-item) set-label
-              (if replace-visible?
-                  (string-constant hide-replace-menu-item)
-                  (string-constant show-replace-menu-item)))
-        (search-parameters-changed)))
-    
-    (define show/hide-replace void)
-    
-    (define/private (build-search-gui-in-frame)
-      (unless search-gui-built?
-        (set! search-gui-built? #t)
-        (begin-container-sequence)
-        (set! find-edit (new find-text%))
-        (set! replace-edit (new replace-text%))
-        (set! search/replace-panel (new horizontal-panel% 
-                                        [parent super-root]
-                                        [stretchable-height #f]))
-        (define search-panel
-          (new horizontal-panel% 
-               [parent search/replace-panel]
-               [stretchable-height #f]))
-        (define replace-panel
-          (new horizontal-panel%
-               [parent search/replace-panel]
-               [stretchable-height #f]))
-        (set! find-canvas (new searchable-canvas%
-                               [style '(hide-hscroll hide-vscroll)]
-                               [vertical-inset 2]
-                               [parent search-panel]
-                               [editor find-edit]
-                               [line-count 1]
-                               [stretchable-height #f]
-                               [stretchable-width #t]))
-        (set! replace-canvas (new searchable-canvas%
-                                  [style '(hide-hscroll hide-vscroll)]
-                                  [vertical-inset 2]
-                                  [parent replace-panel]
-                                  [editor replace-edit]
-                                  [line-count 1]
-                                  [stretchable-height #f]
-                                  [stretchable-width #t]))
-        
-        (define search-button (new button% 
-                                   [label (string-constant search-next)]
-                                   [vert-margin 0]
-                                   [parent search-panel]
-                                   [callback (λ (x y) (search 'forward))]
-                                   [font small-control-font]))
-        (define search-prev-button (new button% 
-                                        [label (string-constant search-previous)]
-                                        [vert-margin 0]
-                                        [parent search-panel]
-                                        [callback (λ (x y) (search 'backward))]
-                                        [font small-control-font]))
-        
-        (define hits-panel (new vertical-panel%
-                                [parent search-panel]
-                                [alignment '(left center)]
-                                [stretchable-height #f]
-                                [stretchable-width #f]))
-        
-        (define num-msg (new message% 
-                             [label "0"] 
-                             [vert-margin 0]
-                             [auto-resize #t]
-                             [font tiny-control-font]
-                             [parent hits-panel]))
-        (define matches-msg (new message% 
-                                 [label (string-constant search-matches)]
-                                 [vert-margin 0]
-                                 [font tiny-control-font]
-                                 [parent hits-panel]))
-        
-        (define _6 (set! update-matches
-                         (λ (before-caret-m m) 
-                           (cond
-                             [(zero? m)
-                              (send num-msg set-label "0")]
-                             [else
-                              (let ([number (number->str/comma m)]
-                                    [bc-number (number->str/comma before-caret-m)])
-                                (send num-msg set-label (format "~a/~a" bc-number number)))])
-                           (send matches-msg set-label (if (= m 1) 
-                                                           (string-constant search-match)
-                                                           (string-constant search-matches))))))
-        
-        (define replace-button
-          (new button% 
-               [label (string-constant search-replace)]
-               [vert-margin 0]
-               [parent replace-panel]
-               [font small-control-font]
-               [callback (λ (x y) (search-replace))]))
-        (define skip-button
-          (new button% 
-               [label (string-constant search-skip)]
-               [vert-margin 0]
-               [parent replace-panel]
-               [font small-control-font]
-               [callback (λ (x y) (search 'forward))]))
-        
-        (define show-replace-button
-          (new button%
-               [label (string-constant search-show-replace)]
-               [font small-control-font]
-               [callback (λ (a b) (set-replace-visible? #t))]
-               [parent replace-panel]))
-        (define hide-replace-button
-          (new button%
-               [label (string-constant search-hide-replace)]
-               [font small-control-font]
-               [callback (λ (a b) (set-replace-visible? #f))]
-               [parent replace-panel]))
-        
-        (set! show/hide-replace
-              (λ ()
-                (send replace-panel begin-container-sequence)
-                (cond
-                  [replace-visible?
-                   (send replace-panel change-children (λ (l) all-replace-children))
-                   (send replace-panel stretchable-width #t)]
-                  [else
-                   (send replace-panel change-children (λ (l) (list show-replace-button)))
-                   (send replace-panel stretchable-width #f)])
-                (send replace-panel end-container-sequence)))
-        
-        (define all-replace-children
-          (list replace-canvas
-                replace-button
-                skip-button
-                hide-replace-button))
-        
-        (define hide-button
-          (new close-icon%
-               [callback (λ () (hide-search))]
-               [vertical-pad 0]
-               [parent search/replace-panel]))
-        
-        (show/hide-replace)
-        (end-container-sequence)))
-    
-    (super-new)))
-
-(define (number->str/comma m)
-  (list->string
-   (reverse
-    (let loop ([chars (reverse (string->list (format "~a" m)))])
-      (cond
-        [(<= (length chars) 3)
-         chars]
-        [else (list* (list-ref chars 0)
-                     (list-ref chars 1)
-                     (list-ref chars 2)
-                     #\,
-                     (loop (cdddr chars)))])))))
-
-(define searchable-text<%> (interface (searchable<%> text<%>)))
-
-(define searchable-text-mixin
-  (mixin (text<%> searchable<%>) (searchable-text<%>)
-    (inherit get-editor)
-    (define/override (get-editor<%>) text:searching<%>)
-    (define/override (get-editor%) (text:searching-mixin (super get-editor%)))
-    (super-new)))
-
-(define memory-canvases '())
-
-(define bday-click-canvas%
-  (class canvas%
-    (define/override (on-event evt)
-      (cond
-        [(and (mrf-bday?)
-              (send evt button-up?))
-         (message-box (string-constant drscheme)
-                      (string-constant happy-birthday-matthew))]
-        [else (super on-event evt)]))
-    (super-new)))
-
-(define pref-save-canvas%
-  (class canvas%
-    (define on? #f)
-    
-    (define mouse-over? #f)
-    (define mouse-down? #f)
-    
-    (define/private (update-mouse-over? mo?)
-      (unless (eq? mouse-over? mo?)
-        (set! mouse-over? mo?)
-        (refresh)))
-    (define/private (update-mouse-down? md?)
-      (unless (eq? mouse-down? md?)
-        (set! mouse-down? md?)
-        (refresh)))
-    
-    (define indicator "P")
-    
-    (inherit refresh)
-    (define/override (on-event evt)
-      (cond
-        [(send evt entering?)
-         (update-mouse-over? #t)]
-        [(send evt leaving?)
-         (update-mouse-over? #f)])
-      (cond
-        [(send evt button-down?)
-         (update-mouse-down? #t)]
-        [(send evt button-up?)
-         (update-mouse-down? #f)
-         (let-values ([(cw ch) (get-client-size)])
-           (when (and (<= 0 (send evt get-x) cw)
-                      (<= 0 (send evt get-y) ch))
-             (show-prefs-stats)))]))
-    
-    (define/private (show-prefs-stats)
-      (define f (new frame% 
-                     [label (format "~a - Preferences Stats" (string-constant drscheme))]
-                     [width 600]
-                     [height 400]))
-      (define t (new text%))
-      (define ec (new editor-canvas% [parent f] [editor t]))
-      (send f reflow-container)
-      (send t begin-edit-sequence)
-      (define tp (open-output-text-editor t))
-      (define prefs-file (find-system-path 'pref-file))
-      (fprintf tp "prefs file:\n  ~a\n\n" (path->string prefs-file))
-      (fprintf tp "setting a preference:\n  ")
-      (preferences:set 'drracket:prefs-debug #f)
-      (parameterize ([current-output-port tp])
-        (time (preferences:set 'drracket:prefs-debug #t)))
-      (define file-contents (call-with-input-file prefs-file read))
-      (fprintf tp "\n~s preference keys\n\n" (length file-contents))
-      
-      (fprintf tp "preferences taking the most space:\n")
-      (define sizes (map 
-                     (λ (x) 
-                       (list 
-                        (car x)
-                        (bytes-length (string->bytes/utf-8 (format "~s" x)))))
-                     file-contents))
-      (for ([frame (in-list (sort sizes > #:key cadr))]
-            [x (in-range 0 10)])
-        (define key (list-ref frame 0))
-        (define size (list-ref frame 1))
-        (fprintf tp "  ~s (~s bytes)\n" key size))
-      (send t auto-wrap #t)
-      (send t set-position 0 0)
-      (send t lock #t)
-      (send t end-edit-sequence)
-      (send f show #t))
-    
-    (define/override (on-paint)
-      (define-values (cw ch) (get-client-size))
-      (define dc (get-dc))
-      (define (draw-p)
-        (send dc set-font small-control-font)
-        (send dc draw-text indicator
-              (- (/ cw 2) (/ indicator-width 2))
-              (- (/ ch 2) (/ indicator-height 2))))
-      (cond
-        [on?
-         (send dc set-text-foreground (send the-color-database find-color "black"))
-         (draw-p)]
-        [mouse-over?
-         (send dc set-brush (if mouse-down? "blue" "skyblue") 'solid)
-         (send dc set-pen "black" 1 'transparent)
-         (send dc draw-rectangle 0 0 cw ch)
-         (send dc set-text-foreground (send the-color-database find-color "white"))
-         (draw-p)]))
-    
-    (define/public (set-on? new-on?)
-      (set! on? new-on?)
-      (send (get-dc) erase)
-      (on-paint)
-      (flush))
-    
-    (inherit get-dc flush get-client-size min-width min-height)
-    (super-new [stretchable-width #f]
-               [stretchable-height #f]
-               [style '(transparent no-focus)])
-    
-    (send (get-dc) set-smoothing 'smoothed)
-    (define-values (indicator-width indicator-height)
-      (let-values ([(tw th _1 _2) (send (get-dc) get-text-extent indicator small-control-font)])
-        (values tw th)))
-    (min-width (+ (inexact->exact (ceiling indicator-width)) 4))
-    (min-height (+ (inexact->exact (ceiling indicator-height)) 4))))
-
-(define basic% (focus-table-mixin (register-group-mixin (basic-mixin frame%))))
-(define size-pref% (size-pref-mixin basic%))
-(define info% (info-mixin basic%))
-(define text-info% (text-info-mixin info%))
-(define pasteboard-info% (pasteboard-info-mixin text-info%))
-(define status-line% (status-line-mixin text-info%))
-(define standard-menus% (standard-menus-mixin status-line%))
-(define editor% (editor-mixin standard-menus%))
-
-(define -text% (text-mixin editor%))
-(define searchable% (searchable-text-mixin (searchable-mixin -text%)))
-(define delegate% (delegate-mixin searchable%))
-
-(define -pasteboard% (pasteboard-mixin editor%))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/gen-standard-menus.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/gen-standard-menus.rkt
deleted file mode 100644
index 0c75b4e3fc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/gen-standard-menus.rkt
+++ /dev/null
@@ -1,234 +0,0 @@
-#lang at-exp racket/base
-
-;; Generates the framework code for standard menus, and the code for
-;; their documentation.  This is done in a naive way (replaces older
-;; code that generated files), should really be made into proper macros
-;; instead.
-
-(require (for-syntax racket/base racket/list racket/match syntax/strip-context
-                     racket/pretty "standard-menus-items.rkt"))
-
-;; build-before-super-item-clause : an-item -> (listof clause)
-(define-for-syntax (build-before-super-item-clause item)
-  `((define/public ,(an-item->callback-name item) ,(an-item-proc item))
-    (define/public (,(an-item->get-item-name item))
-      ,(an-item->item-name item))
-    (define/public (,(an-item->string-name item))
-      ,(an-item-menu-string item))
-    (define/public (,(an-item->help-string-name item))
-      ,(an-item-help-string item))
-    (define/public ,(an-item->on-demand-name item) ,(an-item-on-demand item))
-    (define/public (,(an-item->create-menu-item-name item))
-      ,(an-item-create item))))
-
-;; build-before-super-clause : ((X -> sym) (X sexp) -> X -> (listof clause))
-(define-for-syntax ((build-before-super-clause ->name -procedure) obj)
-  `((define/public ,(->name obj)
-      ,(case (-procedure obj)
-         [(nothing) '(λ (menu) (void))]
-         [(separator) '(λ (menu) (make-object separator-menu-item% menu))]
-         [(nothing-with-standard-menus)
-          '(λ (menu)
-             (unless (current-eventspace-has-standard-menus?)
-               (make-object separator-menu-item% menu)))]
-         [else (error 'gen-standard-menus "unknown between sym: ~e" (-procedure obj))]))))
-
-;; build-before-super-between-clause : between -> (listof clause)
-(define-for-syntax build-before-super-between-clause
-  (build-before-super-clause between->name between-procedure))
-
-;; build-before-super-before/after-clause : before/after -> (listof clause)
-(define-for-syntax build-before-super-before/after-clause
-  (build-before-super-clause before/after->name before/after-procedure))
-
-;; build-after-super-item-clause : an-item -> (list clause)
-(define-for-syntax (build-after-super-item-clause item)
-  (let* ([callback-name (an-item->callback-name item)]
-         [create-menu-item-name (an-item->create-menu-item-name item)]
-         [callback-name-string (symbol->string callback-name)]
-         [key (an-item-shortcut item)])
-    `((define ,(an-item->item-name item)
-        (and (,create-menu-item-name)
-             ,(if (a-submenu-item? item)
-                `(new (get-menu%)
-                      [label (,(an-item->string-name item))]
-                      [parent ,(menu-item-menu-name item)]
-                      [help-string (,(an-item->help-string-name item))]
-                      [demand-callback (λ (menu-item) (,(an-item->on-demand-name item) menu-item))])
-                `(new ,(if (a-checkable-item? item)
-                         '(get-checkable-menu-item%)
-                         '(get-menu-item%))
-                      [label (,(an-item->string-name item))]
-                      [parent ,(menu-item-menu-name item)]
-                      [callback (let ([,callback-name (λ (item evt) (,callback-name item evt))])
-                                  ,callback-name)]
-                      [shortcut ,key]
-                      [shortcut-prefix ,(an-item-shortcut-prefix item)]
-                      [help-string (,(an-item->help-string-name item))]
-                      [demand-callback (λ (menu-item) (,(an-item->on-demand-name item) menu-item))])))))))
-
-;; build-after-super-clause : ((X -> symbol) -> X -> (listof clause))
-(define-for-syntax ((build-after-super-clause ->name) between/after)
-  `((,(->name between/after)
-     (,(menu-name->get-menu-name between/after)))))
-
-;; build-after-super-between-clause : between -> (listof clause)
-(define-for-syntax build-after-super-between-clause
-  (build-after-super-clause between->name))
-;; build-after-super-before/after-clause : before/after -> (listof clause)
-(define-for-syntax build-after-super-before/after-clause
-  (build-after-super-clause before/after->name))
-
-;; build-after-super-generic-clause : generic -> (listof clause)
-(define-for-syntax (build-after-super-generic-clause x)
-  (cond [(generic-private-field? x)
-         `((define ,(generic-name x) ,(generic-initializer x)))]
-        [(generic-override? x) '()]
-        [(generic-augment? x) '()]
-        [(generic-method? x) '()]))
-
-;; build-before-super-generic-clause : generic -> (listof clause)
-(define-for-syntax (build-before-super-generic-clause generic)
-  (cond [(generic-private-field? generic)
-         '()]
-        [(generic-override? generic)
-         `((define/override ,(generic-name generic)
-             ,(generic-initializer generic)))]
-        [(generic-augment? generic)
-         `((define/augment ,(generic-name generic)
-             ,(generic-initializer generic)))]
-        [(generic-method? generic)
-         `((define/public ,(generic-name generic)
-             ,(generic-initializer generic)))]))
-
-(provide generate-standard-menus-code)
-(define-syntax (generate-standard-menus-code stx)
-  (datum->syntax
-   stx
-   `(begin
-      (define standard-menus<%>
-        (interface (basic<%>)
-          ,@(append-map
-             (λ (x)
-               (cond [(an-item? x)
-                      (list (an-item->callback-name x)
-                            (an-item->get-item-name x)
-                            (an-item->string-name x)
-                            (an-item->help-string-name x)
-                            (an-item->on-demand-name x)
-                            (an-item->create-menu-item-name x))]
-                     [(between? x)
-                      (list (between->name x))]
-                     [(or (after? x) (before? x))
-                      (list (before/after->name x))]
-                     [(generic? x)
-                      (if (generic-method? x) (list (generic-name x)) '())]))
-             items)))
-      (define standard-menus-mixin
-        (mixin (basic<%>) (standard-menus<%>)
-          (inherit on-menu-char on-traverse-char)
-          (define remove-prefs-callback
-            (preferences:add-callback
-             'framework:menu-bindings
-             (λ (p v)
-               (let loop ([menu (get-menu-bar)])
-                 (when (is-a? menu menu:can-restore<%>)
-                   (if v
-                     (send menu restore-keybinding)
-                     (send menu set-shortcut #f)))
-                 (when (is-a? menu menu:can-restore-underscore<%>)
-                   (if v
-                     (send menu restore-underscores)
-                     (send menu erase-underscores)))
-                 (when (is-a? menu menu-item-container<%>)
-                   (for-each loop (send menu get-items)))))))
-          (inherit get-menu-bar show can-close? get-edit-target-object)
-          ,@(append-map
-             (λ (x)
-               (cond [(between? x) (build-before-super-between-clause x)]
-                     [(or (after? x) (before? x))
-                      (build-before-super-before/after-clause x)]
-                     [(an-item? x) (build-before-super-item-clause x)]
-                     [(generic? x) (build-before-super-generic-clause x)]))
-             items)
-          (super-instantiate ())
-          ,@(append-map
-             (λ (x)
-               (cond [(between? x) (build-after-super-between-clause x)]
-                     [(an-item? x) (build-after-super-item-clause x)]
-                     [(or (after? x) (before? x))
-                      (build-after-super-before/after-clause x)]
-                     [(generic? x) (build-after-super-generic-clause x)]))
-             items)
-          (reorder-menus this))))))
-
-(define-for-syntax (generate-item-docs x)
-  (cond
-    [(generic/docs? x)
-     (filter-not string? (generic/docs-documentation x))]
-    [(before/after? x)
-     `(@defmethod[(,(before/after->name x) [menu (is-a?/c menu-item%)]) void?]{
-         This method is called @,(if (before? x) "before" "after") the addition of the
-         @tt[,(format "~a" (before/after-name x))] menu-item. Override it to add additional
-         menu items at that point. })]
-    [(between? x)
-     `(@defmethod[(,(between->name x) [menu (is-a?/c menu-item%)]) void?]{
-         This method is called between the addition of the
-         @tt[,(format "~a" (between-before x))] and the @tt[,(format "~a" (between-after x))] menu-item. 
-         Override it to add additional menu items at that point. })]
-    [(an-item? x)
-     `(@defmethod[(,(an-item->get-item-name x)) (or/c false/c (is-a?/c menu-item%))]{
-         This method returns the @racket[menu-item%] object corresponding
-         to this menu item, if it has been created (as controlled by
-         @method[frame:standard-menus<%> ,(an-item->create-menu-item-name x)]).}
-       @defmethod[(,(an-item->create-menu-item-name x)) boolean?]{
-         The result of this method determines if the corresponding
-         menu item is created. Override it to control the creation of the menu item. 
-         @||
-         Defaults to @racket[,(an-item-create x)].}
-       ,(match (an-item-proc x)
-          [`(λ (,item-name ,evt-name) ,bodies ...)
-           `@defmethod[(,(an-item->callback-name x)
-                        [,item-name (is-a?/c menu-item%)]
-                        [,evt-name (is-a?/c control-event%)])
-                       void?]{
-              Defaults to
-              @racketblock[,(if (= 1 (length bodies)) (car bodies) `(begin ,@bodies))] }])
-       ,(match (an-item-on-demand x)
-          [`(λ (,item-name) ,body)
-           `@defmethod[(,(an-item->on-demand-name x)
-                        [,item-name (is-a?/c menu-item%)])
-                       void?]{
-              The menu item's on-demand proc calls this method. 
-              @||
-              Defaults to @racketblock[,body]}])
-       @defmethod[(,(an-item->string-name x)) string?]{
-          The result of this method is used as the name of the @racket[menu-item%].
-          @||
-          Defaults to @racket[,(an-item-menu-string x)].}
-       @defmethod[(,(an-item->help-string-name x)) string?]{
-         The result of this method is used as the help string
-         when the @racket[menu-item%] object is created.
-         @||
-         Defaults to @racket[,(an-item-help-string x)].})]
-    [else '()]))
-
-(provide generate-standard-menus-docs)
-(define-syntax (generate-standard-menus-docs stx)
-  (define docs
-    `(definterface frame:standard-menus<%> (frame:basic<%>)
-       ,@(append-map generate-item-docs items)))
-  ;; HACK: the rendering includes location information from the source, so
-  ;; generating a location-less syntax doesn't work.  Instead, use the pretty
-  ;; printer to display the whole thing, then read the output as a syntax with
-  ;; location.  Note that the 80 width is a guess that works, since indentation
-  ;; includes the documentation forms too (starting from the toplevel
-  ;; `definterface' and on.)
-  (define o (open-output-string))
-  (parameterize ([pretty-print-columns 80] [current-output-port o])
-    (pretty-write docs))
-  (parameterize ([port-count-lines-enabled #t])
-    (replace-context
-     stx
-     (read-syntax 'gen-standard-menus
-                  (open-input-string (get-output-string o))))))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/group.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/group.rkt
deleted file mode 100644
index 675b24c94b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/group.rkt
+++ /dev/null
@@ -1,351 +0,0 @@
-#lang scheme/unit
-
-  (require string-constants
-           racket/class
-           "sig.rkt"
-           "../preferences.rkt"
-           "../gui-utils.rkt"
-           mred/mred-sig
-           racket/path)
-  
-  (import mred^
-          [prefix application: framework:application^]
-          [prefix frame: framework:frame^]
-          [prefix text: framework:text^]
-          [prefix canvas: framework:canvas^]
-          [prefix menu: framework:menu^]
-          [prefix exit: framework:exit^])
-  (export framework:group^)
-  
-  (define-struct frame (frame id))
-  
-  (define mdi-parent #f)
-  
-  (define extra-windows-menus-proc void)
-  (define (add-to-windows-menu f)
-    (let ([old extra-windows-menus-proc])
-      (set! extra-windows-menus-proc
-            (λ (menu)
-              (f menu)
-              (old menu)))))
-  
-  (define windows-menu-label
-    (case (system-type)
-      [(macosx) (string-constant windows-menu-label)]
-      [else (string-constant tabs-menu-label)]))
-  
-  (define-local-member-name update-windows-menu)
-  
-  (define %
-    (class object%
-      
-      [define active-frame #f]
-      [define most-recent-window-box (make-weak-box #f)]
-      [define frame-counter 0]
-      [define frames null]
-      [define todo-to-new-frames void]
-      
-      [define windows-menus null]
-      
-      ;; get-windows-menu : (is-a?/c frame%) -> (union false? (is-a?/c menu%))
-      (define/private (get-windows-menu frame)
-        (let ([menu-bar (send frame get-menu-bar)])
-          (and menu-bar
-               (let ([menus (send menu-bar get-items)])
-                 (ormap (λ (x)
-                          (if (or (string=? (string-constant windows-menu)
-                                            (send x get-plain-label))
-                                  (string=? (string-constant tabs-menu)
-                                            (send x get-plain-label)))
-                              x
-                              #f))
-                        menus)))))
-      
-      (define/private (insert-windows-menu frame)
-        (let ([menu (get-windows-menu frame)])
-          (when menu
-            (set! windows-menus (cons menu windows-menus)))))
-      
-      (define/private (remove-windows-menu frame)
-        (let ([menu (get-windows-menu frame)])
-          
-          (when menu
-            ;; to help the gc.
-            (for-each (λ (i) (send i delete)) (send menu get-items))
-            
-            (set! windows-menus
-                  (remove
-                   menu
-                   windows-menus
-                   eq?)))))
-      
-      (define/public (update-windows-menu menu)
-        (let* ([windows (length windows-menus)]
-               [default-name (string-constant untitled)]
-               [get-name 
-                (λ (frame)
-                  (let ([label (send frame get-label)])
-                    (if (string=? label "")
-                        (if (method-in-interface? 'get-entire-label (object-interface frame))
-                            (let ([label (send frame get-entire-label)])
-                              (if (string=? label "")
-                                  default-name
-                                  label))
-                            default-name)
-                        label)))]
-               [sorted/visible-frames
-                (sort
-                 (filter (λ (x) (send (frame-frame x) is-shown?)) frames)
-                 (λ (f1 f2)
-                   (string-ci<=? (get-name (frame-frame f1))
-                                 (get-name (frame-frame f2)))))])
-          (for-each (λ (item) (send item delete)) (send menu get-items))
-          (when (eq? (system-type) 'macosx)
-            (new menu:can-restore-menu-item%
-                 [label (string-constant minimize)]
-                 [parent menu]
-                 [callback (λ (x y) (send (send (send menu get-parent) get-frame) iconize #t))]
-                 [shortcut #\m])
-            (new menu:can-restore-menu-item%
-                 [label (string-constant zoom)]
-                 [parent menu]
-                 [callback (λ (x y) 
-                             (let ([frame (send (send menu get-parent) get-frame)])
-                               (send frame maximize (not (send frame is-maximized?)))))]) 
-            (instantiate menu:can-restore-menu-item% ()
-              (label (string-constant bring-frame-to-front...))
-              (parent menu)
-              (callback (λ (x y) (choose-a-frame (send (send menu get-parent) get-frame))))
-              (shortcut #\j))
-            (instantiate menu:can-restore-menu-item% ()
-              (label (string-constant most-recent-window))
-              (parent menu)
-              (callback (λ (x y) (most-recent-window-to-front)))
-              (shortcut #\'))
-            (make-object separator-menu-item% menu))
-          
-          (extra-windows-menus-proc menu)
-          
-          (when (eq? (system-type) 'macosx)
-            (for-each
-             (λ (frame)
-               (let ([frame (frame-frame frame)])
-                 (make-object menu-item% 
-                   (regexp-replace*
-                    #rx"&"
-                    (gui-utils:trim-string (get-name frame) 200)
-                    "&&")
-                   menu
-                   (λ (_1 _2)
-                     (send frame show #t)))))
-             sorted/visible-frames))))
-      
-      ;; most-recent-window-to-front : -> void?
-      ;; brings the most recent window to the front
-      (define/private (most-recent-window-to-front)
-        (let ([most-recent-window (weak-box-value most-recent-window-box)])
-          (when most-recent-window
-            (send most-recent-window show #t))))                              
-      
-      (define/private (update-close-menu-item-state)
-        (let* ([set-close-menu-item-state! 
-                (λ (frame state)
-                  (when (is-a? frame frame:standard-menus<%>)
-                    (let ([close-menu-item (send frame file-menu:get-close-menu)])
-                      (when close-menu-item
-                        (send close-menu-item enable state)))))])
-          (if (eq? (length frames) 1)
-              (set-close-menu-item-state! (car frames) #f)
-              (for-each (λ (a-frame)
-                          (set-close-menu-item-state! a-frame #t))
-                        frames))))
-      
-      (define/public (get-mdi-parent)
-        (when (and (eq? (system-type) 'windows)
-                   (preferences:get 'framework:windows-mdi)
-                   (not mdi-parent))
-          (set! mdi-parent (make-object frame% (application:current-app-name)
-                             #f #f #f #f #f
-                             '(mdi-parent)))
-          (send mdi-parent show #t))
-        mdi-parent)
-      
-      (define/public (get-frames) (map frame-frame frames))
-      
-      (define/public (frame-label-changed frame)
-        (void))
-      
-      (define/public (frame-shown/hidden frame)
-        (void))
-      
-      (define/public (for-each-frame f)
-        (for-each (λ (x) (f (frame-frame x))) frames)
-        (set! todo-to-new-frames
-              (let ([old todo-to-new-frames])
-                (λ (frame) (old frame) (f frame)))))
-      
-      (define/public (get-active-frame)
-        (cond
-          [active-frame active-frame]
-          [(null? frames) #f]
-          [else (frame-frame (car frames))]))
-      
-      (define/public (set-active-frame f)
-        (when (and active-frame
-                   (not (eq? active-frame f)))
-          (set! most-recent-window-box (make-weak-box active-frame)))
-        (set! active-frame f))
-      
-      (define/public (insert-frame new-frame)
-        (unless (memf (λ (fr) (eq? (frame-frame fr) new-frame))
-                      frames)
-          (set! frame-counter (add1 frame-counter))
-          (let ([new-frames (cons (make-frame new-frame frame-counter)
-                                  frames)])
-            (set! frames new-frames)
-            (update-close-menu-item-state)
-            (insert-windows-menu new-frame))
-          (todo-to-new-frames new-frame)))
-      
-      (define/public (remove-frame f)
-        (when (eq? f active-frame)
-          (set! active-frame #f))
-        (let ([new-frames
-               (remove
-                f frames
-                (λ (f fr) (eq? f (frame-frame fr))))])
-          (set! frames new-frames)
-          (update-close-menu-item-state)
-          (remove-windows-menu f)))
-      
-      (define/public (clear)
-        (set! frames null)
-        #t)
-      
-      (define/public (on-close-all)
-        (for-each (λ (f)
-                    (let ([frame (frame-frame f)])
-                      (send frame on-close) 
-                      (send frame show #f)))
-                  frames))
-      
-      (define/public (can-close-all?)
-        (andmap (λ (f)
-                  (let ([frame (frame-frame f)])
-                    (send frame can-close?)))
-                frames))
-      
-      (define/public (locate-file name)
-        (let* ([normalized
-                ;; allow for the possibility of filenames that are urls
-                (with-handlers ([exn:fail?
-                                 (λ (x) name)])
-                  (normal-case-path
-                   (normalize-path name)))]
-               [test-frame
-                (λ (frame)
-                  (and (is-a? frame frame:basic<%>)
-                       (send frame editing-this-file? normalized)))])
-          (let loop ([frames frames])
-            (cond
-              [(null? frames) #f]
-              [else
-               (let* ([frame (frame-frame (car frames))])
-                 (if (test-frame frame)
-                     frame
-                     (loop (cdr frames))))]))))
-      
-      (super-new)))
-
-  (define (create-windows-menu mb)
-    (new menu:can-restore-underscore-menu%
-         [label windows-menu-label]
-         [demand-callback (λ (menu) (send (get-the-frame-group) update-windows-menu menu))]
-         [parent mb]))
-  
-  (define (can-close-check)
-    (let ([number-of-frames (length (send (get-the-frame-group) get-frames))])
-      (or (not (preferences:get 'framework:exit-when-no-frames))
-          (exit:exiting?)
-          (not (= 1 number-of-frames))
-          (current-eventspace-has-standard-menus?)
-          (exit:user-oks-exit))))
-
-  (define (on-close-action)
-    (when (preferences:get 'framework:exit-when-no-frames)
-      (unless (exit:exiting?)
-        (when (and (null? (send (get-the-frame-group) get-frames))
-                   (not (current-eventspace-has-standard-menus?)))
-          (exit:exit)))))
-  
-  (define (choose-a-frame parent)
-    (letrec-values ([(sorted-frames)
-                     (sort
-                      (send (get-the-frame-group) get-frames)
-                      (λ (x y) (string-ci<=? (send x get-label) (send y get-label))))]
-                    [(d) (make-object dialog% (string-constant bring-frame-to-front) parent 400 600)]
-                    [(lb) (instantiate list-box% () 
-                            (label #f)
-                            (choices (map (λ (x) (gui-utils:trim-string (send x get-label) 200)) sorted-frames))
-                            (callback (λ (x y) (listbox-callback y)))
-                            (parent d))]
-                    [(t) (instantiate text:hide-caret/selection% ())]
-                    [(ec) (instantiate canvas:basic% ()
-                            (parent d)
-                            (stretchable-height #f))]
-                    [(bp) (instantiate horizontal-panel% ()
-                            (parent d)
-                            (stretchable-height #f)
-                            (alignment '(right center)))]
-                    [(cancelled?) #t]
-                    [(listbox-callback)
-                     (λ (evt)
-                       (case (send evt get-event-type)
-                         [(list-box)
-                          
-                          (send ok enable (pair? (send lb get-selections)))
-                          
-                          (let ([full-name
-                                 (let ([sels (send lb get-selections)])
-                                   (and (pair? sels)
-                                        (let ([fr (list-ref sorted-frames (car sels))])
-                                          (and (is-a? fr frame:basic%)
-                                               (send fr get-filename)))))])
-                            (send t begin-edit-sequence)
-                            (send t erase)
-                            (when full-name
-                              (send t insert (path->string full-name)))
-                            (send t end-edit-sequence))]
-                         [(list-box-dclick)
-                          (set! cancelled? #f)
-                          (send d show #f)]))]
-                    [(ok cancel)
-                     (gui-utils:ok/cancel-buttons
-                      bp
-                      (λ (x y)
-                        (set! cancelled? #f)
-                        (send d show #f))
-                      (λ (x y)
-                        (send d show #f)))])
-      (send ec set-line-count 3)
-      (send ec set-editor t)
-      (send t auto-wrap #t)
-      (let ([fr (car sorted-frames)])
-        (when (and (is-a? fr frame:basic<%>)
-                   (send fr get-filename))
-          (send t insert (path->string (send (car sorted-frames) get-filename))))
-        (send lb set-selection 0))
-      (send d show #t)
-      (unless cancelled?
-        (let ([sels (send lb get-selections)])
-          (unless (null? sels)
-            (send (list-ref sorted-frames (car sels)) show #t))))))
-  
-  
-  (define (internal-get-the-frame-group)
-    (let ([the-frame-group (make-object %)])
-      (set! internal-get-the-frame-group (λ () the-frame-group))
-      (internal-get-the-frame-group)))
-  
-  (define (get-the-frame-group)
-    (internal-get-the-frame-group))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/handler.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/handler.rkt
deleted file mode 100644
index f84dfe00ac..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/handler.rkt
+++ /dev/null
@@ -1,351 +0,0 @@
-#lang scheme/unit
-
-(require mzlib/class
-         mrlib/hierlist
-         "sig.rkt"
-         "../preferences.rkt"
-         "../gui-utils.rkt"
-         mred/mred-sig
-         racket/path
-         string-constants)
-
-(import mred^
-        [prefix finder: framework:finder^]
-        [prefix group: framework:group^]
-        [prefix text: framework:text^]
-        [prefix frame: framework:frame^])
-(export framework:handler^)
-(init-depend framework:frame^)
-
-(define-struct handler (name extension handler))
-
-(define format-handlers '())
-
-(define (make-insert-handler who name extension handler)
-  (cond [(not (string? name))
-         (error who "name was not a string")]
-        [(not (or (procedure? extension)
-                  (string? extension)
-                  (and (list? extension) (andmap string? extension))))
-         (error who
-                "extension was not a string, list of strings, or a predicate")]
-        [(not (procedure? handler))
-         (error who "handler was not a function")]
-        [else (make-handler name
-                            (if (string? extension) (list extension) extension)
-                            handler)]))
-
-(define (insert-format-handler . args)
-  (set! format-handlers
-        (cons (apply make-insert-handler 'insert-format-handler args)
-              format-handlers)))
-
-(define (find-handler name handlers)
-  (let/ec exit
-    (let ([extension (if (string? name) (or (filename-extension name) "") "")])
-      (for ([handler handlers])
-        (let ([ext (handler-extension handler)])
-          (when (or (and (procedure? ext) (ext name))
-                    (and (pair? ext)
-                         (ormap (λ (ext) (string=? ext extension))
-                                ext)))
-            (exit (handler-handler handler)))))
-      #f)))
-
-(define (find-format-handler name)
-  (find-handler name format-handlers))
-
-; Finding format & mode handlers by name
-(define (find-named-handler name handlers)
-  (let loop ([l handlers])
-    (cond [(null? l) #f]
-          [(string-ci=? (handler-name (car l)) name)
-           (handler-handler (car l))]
-          [else (loop (cdr l))])))
-
-(define (find-named-format-handler name)
-  (find-named-handler name format-handlers))
-
-; Open a file for editing
-(define current-create-new-window
-  (make-parameter
-   (λ (filename)
-     (let ([frame (make-object frame:text% filename)])
-       (send frame show #t)
-       frame))))
-
-(define (edit-file filename [make-default
-                             (λ () ((current-create-new-window) filename))])
-  (with-handlers ([(λ (x) #f) ;exn:fail?
-                   (λ (exn)
-                     (message-box
-                      (string-constant error-loading)
-                      (string-append
-                       (format (string-constant error-loading-file/name)
-                               (or filename
-                                   (string-constant unknown-filename)))
-                       "\n\n"
-                       (if (exn? exn)
-                         (format "~a" (exn-message exn))
-                         (format "~s" exn))))
-                     #f)])
-    (gui-utils:show-busy-cursor
-     (λ ()
-       (if filename
-         (let ([already-open (send (group:get-the-frame-group)
-                                   locate-file
-                                   filename)])
-           (cond
-             [already-open
-              (send already-open make-visible filename)
-              (send already-open show #t)
-              already-open]
-             [else
-              (let ([handler (and (path? filename)
-                                  (find-format-handler filename))])
-                (add-to-recent filename)
-                (if handler (handler filename) (make-default)))]))
-         (make-default))))))
-
-;; type recent-list-item = (list/p string? number? number?)
-
-;; add-to-recent : path -> void
-(define (add-to-recent filename)
-  
-  (define old-list (preferences:get 'framework:recently-opened-files/pos))
-  (define old-ents (filter (λ (x) (recently-opened-files-same-enough-path? (car x) filename))
-                           old-list))
-  (define new-ent (if (null? old-ents)
-                      (list filename 0 0)
-                      (cons filename (cdr (car old-ents)))))
-  (define added-in (cons new-ent
-                         (remove* (list new-ent)
-                                  old-list 
-                                  (λ (l1 l2) 
-                                    (recently-opened-files-same-enough-path? (car l1) (car l2))))))
-  (define new-recent (size-down added-in
-                                (preferences:get 'framework:recent-max-count)))
-  (preferences:set 'framework:recently-opened-files/pos new-recent))
-
-;; same-enough-path? : path path -> boolean
-;; used to determine if the open-recent-files menu item considers two paths to be the same
-(define (recently-opened-files-same-enough-path? p1 p2)
-  (equal? (simplify-path (normal-case-path p1) #f)
-          (simplify-path (normal-case-path p2) #f)))
-
-
-
-;; size-down : (listof X) -> (listof X)[< recent-max-count]
-;; takes a list of stuff and returns the
-;; front of the list, up to `recent-max-count' items
-(define (size-down new-recent n)
-  (let loop ([n n] [new-recent new-recent])
-    (cond [(zero? n) null]
-          [(null? new-recent) null]
-          [else (cons (car new-recent)
-                      (loop (- n 1) (cdr new-recent)))])))
-
-;; size-recently-opened-files : number -> void
-;; sets the recently-opened-files/pos preference
-;; to a size limited by `n'
-(define (size-recently-opened-files n)
-  (preferences:set
-   'framework:recently-opened-files/pos
-   (size-down (preferences:get 'framework:recently-opened-files/pos)
-              n)))
-
-;; set-recent-position : path number number -> void
-;; updates the recent menu preferences
-;; with the positions `start' and `end'
-(define (set-recent-position filename start end)
-  (let* ([recent-items
-          (preferences:get 'framework:recently-opened-files/pos)]
-         [new-recent-items
-          (map (λ (x)
-                 (if (recently-opened-files-same-enough-path? (path->string (car x))
-                                                              (path->string filename))
-                     (list* (car x) start end (cdddr x))
-                     x))
-               (preferences:get 'framework:recently-opened-files/pos))])
-    (unless (equal? recent-items new-recent-items)
-      (preferences:set 'framework:recently-opened-files/pos
-                       new-recent-items))))
-
-;; install-recent-items : (is-a?/c menu%) -> void?
-(define (install-recent-items menu)
-  (let ([recently-opened-files
-         (preferences:get
-          'framework:recently-opened-files/pos)])
-    (unless (menu-items-still-same? recently-opened-files menu)
-      (for ([item (send menu get-items)]) (send item delete))
-      
-      (for ([recent-list-item recently-opened-files])
-        (new menu-item%
-             [parent menu]
-             [label (recent-list-item->menu-label recent-list-item)]
-             [callback (λ (x y) (open-recent-list-item recent-list-item))]))
-      (new separator-menu-item% [parent menu])
-      (new menu-item%
-           [parent menu]
-           [label (string-constant show-recent-items-window-menu-item)]
-           [callback (λ (x y) (show-recent-items-window))]))
-    (void)))
-
-(define (recent-list-item->menu-label recent-list-item)
-  (let ([filename (car recent-list-item)])
-    (gui-utils:quote-literal-label
-     (path->string filename))))
-
-;; this function must mimic what happens in install-recent-items
-;; it returns #t if all of the labels of menus are the same, or approximation to
-;; the menus actually being different
-(define (menu-items-still-same? recently-opened-files menu)
-  (let ([current-items 
-         (map (λ (x) (and (is-a? x labelled-menu-item<%>) (send x get-label)))
-              (send menu get-items))]
-        ;; the new-items variable should match up to what install-recent-items actually does when it creates the menu 
-        [new-items 
-         (append 
-          (for/list ([recent-list-item recently-opened-files])
-            (recent-list-item->menu-label recent-list-item))
-          (list #f 
-                (string-constant show-recent-items-window-menu-item)))])
-    (equal? current-items new-items)))
-
-;; open-recent-list-item : recent-list-item -> void
-(define (open-recent-list-item recent-list-item)
-  (let* ([filename (car recent-list-item)]
-         [start (cadr recent-list-item)]
-         [end (caddr recent-list-item)])
-    (cond
-      [(file-exists? filename)
-       (edit-file filename)]
-      [else
-       (preferences:set 'framework:recently-opened-files/pos
-                        (remove* (list recent-list-item)
-                                 (preferences:get 'framework:recently-opened-files/pos)
-                                 (λ (l1 l2)
-                                   (recently-opened-files-same-enough-path?
-                                    (car l1)
-                                    (car l2)))))
-       (message-box (string-constant error)
-                    (format (string-constant cannot-open-because-dne)
-                            filename))])))
-
-;; show-recent-items-window : -> void
-(define (show-recent-items-window)
-  (unless recent-items-window
-    (set! recent-items-window (make-recent-items-window)))
-  (send recent-items-window show #t))
-
-;; make-recent-items-window : -> frame
-(define (make-recent-items-window)
-  (make-object (get-recent-items-window%)
-    (string-constant show-recent-items-window-label)
-    #f
-    (preferences:get 'framework:recent-items-window-w)
-    (preferences:get 'framework:recent-items-window-h)))
-
-;; recent-items-window : (union #f (is-a?/c frame%))
-(define recent-items-window #f)
-
-(define recent-items-hierarchical-list%
-  (class hierarchical-list%
-    (define/override (on-double-select item)
-      (send item open-item))
-    (super-instantiate ())))
-
-(define recent-items-super% (frame:standard-menus-mixin frame:basic%))
-
-(define (set-recent-items-frame-superclass super%)
-  (set! recent-items-super% super%))
-
-(define (get-recent-items-window%)
-  (class recent-items-super%
-
-    ;; remove extraneous separators
-    (define/override (file-menu:between-print-and-close menu) (void))
-    (define/override (edit-menu:between-find-and-preferences menu) (void))
-
-    (define/override (on-size w h)
-      (preferences:set 'framework:recent-items-window-w w)
-      (preferences:set 'framework:recent-items-window-h h))
-
-    ;; refresh-hl : (listof recent-list-item) -> void
-    (define/private (refresh-hl recent-list-items)
-      (let ([ed (send hl get-editor)])
-        (send ed begin-edit-sequence)
-        (for ([item (send hl get-items)]) (send hl delete-item item))
-        (for-each (λ (item) (add-recent-item item))
-                  (if (eq? (preferences:get 'framework:recently-opened-sort-by)
-                           'name)
-                    (sort recent-list-items string<?
-                          #:key (compose path->string car) #:cache-keys? #t)
-                    recent-list-items))
-        (send ed end-edit-sequence)))
-
-    (define/private (add-recent-item recent-list-item)
-      (let ([item (send hl
-                        new-item (make-hierlist-item-mixin recent-list-item))])
-        (send (send item get-editor)
-              insert (path->string (car recent-list-item)))))
-
-    (field [remove-prefs-callback
-            (preferences:add-callback 'framework:recently-opened-files/pos
-                                      (λ (p v) (refresh-hl v)))])
-
-    (define/augment (on-close)
-      (inner (void) on-close)
-      (remove-prefs-callback)
-      (set! recent-items-window #f))
-
-    (super-new)
-
-    (inherit get-area-container)
-    (field [bp (make-object horizontal-panel% (get-area-container))]
-           [hl (make-object recent-items-hierarchical-list%
-                            (get-area-container) '())]
-           [sort-by-name-button
-            (make-object button%
-              (string-constant recent-items-sort-by-name)
-              bp
-              (λ (x y) (set-sort-by 'name)))]
-           [sort-by-age-button
-            (make-object button%
-              (string-constant recent-items-sort-by-age)
-              bp
-              (λ (x y) (set-sort-by 'age)))])
-
-    (send bp stretchable-height #f)
-    (send sort-by-name-button stretchable-width #t)
-    (send sort-by-age-button stretchable-width #t)
-
-    (define/private (set-sort-by flag)
-      (preferences:set 'framework:recently-opened-sort-by flag)
-      (case flag
-        [(name)
-         (send sort-by-age-button enable #t)
-         (send sort-by-name-button enable #f)]
-        [(age)
-         (send sort-by-age-button enable #f)
-         (send sort-by-name-button enable #t)])
-      (refresh-hl (preferences:get 'framework:recently-opened-files/pos)))
-
-    (set-sort-by (preferences:get 'framework:recently-opened-sort-by))))
-
-;; make-hierlist-item-mixin : recent-item -> mixin(arg to new-item method of hierlist)
-(define (make-hierlist-item-mixin recent-item)
-  (λ (%)
-    (class %
-      (define/public (open-item)
-        (open-recent-list-item recent-item))
-      (super-instantiate ()))))
-
-(define (open-file [directory #f])
-  (let* ([parent (and (not (eq? 'macosx (system-type)))
-                      (get-top-level-focus-window))]
-         [file
-          (parameterize ([finder:dialog-parent-parameter parent])
-            (finder:get-file directory))])
-    (and file
-         (edit-file file))))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/icon.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/icon.rkt
deleted file mode 100644
index 828136a53b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/icon.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang scheme/base
-
-(require (for-syntax scheme/base)
-         scheme/unit
-         racket/promise
-         racket/class
-         racket/runtime-path
-         "bday.rkt"
-         "sig.rkt"
-         mred/mred-sig)
-
-(provide icon@)
-
-(define-runtime-path eof-bitmap-path '(lib "eof.gif" "icons"))
-(define-runtime-path anchor-bitmap-path '(lib "anchor.gif" "icons"))
-(define-runtime-path lock-bitmap-path '(lib "lock.gif" "icons"))
-(define-runtime-path unlock-bitmap-path '(lib "unlock.gif" "icons"))
-(define-runtime-path return-bitmap-path '(lib "return.xbm" "icons"))
-(define-runtime-path paren-bitmap-path '(lib "paren.xbm" "icons"))
-(define-runtime-path mrf-bitmap-path '(lib "mrf.png" "icons"))
-(define-runtime-path gc-on-bitmap-path '(lib "recycle.png" "icons"))
-
-(define-runtime-path up-down-mask-path '(lib "up-down-mask.xbm" "icons"))
-(define-runtime-path up-down-csr-path '(lib "up-down-cursor.xbm" "icons"))
-
-(define-runtime-path left-right-mask-path '(lib "left-right-mask.xbm" "icons"))
-(define-runtime-path left-right-csr-path '(lib "left-right-cursor.xbm" "icons"))
-
-(define-unit icon@
-  (import mred^)
-  (export framework:icon^)
-  
-  (define eof-bitmap (delay/sync (let ([bm (make-object bitmap% eof-bitmap-path)])
-                                   (unless (send bm ok?)
-                                     (error 'eof-bitmap "not ok ~s\n" eof-bitmap-path))
-                                   bm)))
-  (define (get-eof-bitmap) (force eof-bitmap))
-  
-  (define anchor-bitmap (delay/sync (make-object bitmap% anchor-bitmap-path)))
-  (define (get-anchor-bitmap) (force anchor-bitmap))
-  
-  (define lock-bitmap (delay/sync (make-object bitmap% lock-bitmap-path)))
-  (define (get-lock-bitmap) (force lock-bitmap))
-  
-  (define unlock-bitmap (delay/sync (make-object bitmap% unlock-bitmap-path)))
-  (define (get-unlock-bitmap) (force unlock-bitmap))
-  
-  (define autowrap-bitmap (delay/sync (make-object bitmap% return-bitmap-path)))
-  (define (get-autowrap-bitmap) (force autowrap-bitmap))
-  
-  (define paren-highlight-bitmap (delay/sync (make-object bitmap% paren-bitmap-path)))
-  (define (get-paren-highlight-bitmap) (force paren-highlight-bitmap))
-  
-  (define-syntax (make-get-cursor stx)
-    (syntax-case stx ()
-      [(_ id mask-path csr-path fallback)
-       (syntax
-        (begin
-          (define id 
-            (let ([ans (delay/sync 
-                         (let* ([msk-b (make-object bitmap% mask-path)]
-                                [csr-b (make-object bitmap% csr-path)])
-                           (if (and (send msk-b ok?)
-                                    (send csr-b ok?))
-                               (let ([csr (make-object cursor% msk-b csr-b 7 7)])
-                                 (if (send csr ok?)
-                                     csr
-                                     (make-object cursor% fallback)))
-                               (make-object cursor% fallback))))])
-              (λ () (force ans))))))]))
-  
-  (make-get-cursor get-up/down-cursor up-down-mask-path up-down-csr-path 'size-n/s)
-  (make-get-cursor get-left/right-cursor left-right-mask-path left-right-csr-path 'size-e/w)
-  
-  (define mrf-on-bitmap (delay/sync (make-object bitmap% mrf-bitmap-path)))
-  (define gc-on-bitmap (delay/sync (read-bitmap gc-on-bitmap-path #:try-@2x? #t)))
-  
-  (define (make-off-bitmap onb)
-    (let* ([bitmap (make-object bitmap%
-                     (send onb get-width)
-                     (send onb get-height))]
-           [bdc (make-object bitmap-dc% bitmap)])
-      (send bdc clear)
-      (send bdc set-bitmap #f)
-      bitmap))
-  
-  (define mrf-off-bitmap (delay/sync (make-off-bitmap (force mrf-on-bitmap))))
-  (define gc-off-bitmap (delay/sync (make-off-bitmap (force gc-on-bitmap))))
-  
-  (define (get-gc-on-bitmap)
-    (force
-     (if (mrf-bday?)
-         mrf-on-bitmap
-         gc-on-bitmap)))
-  
-  (define (get-gc-off-bitmap)
-    (force
-     (if (mrf-bday?)
-         mrf-off-bitmap
-         gc-off-bitmap))))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/keymap.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/keymap.rkt
deleted file mode 100644
index 9fb2b2b48c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/keymap.rkt
+++ /dev/null
@@ -1,1913 +0,0 @@
-#lang racket/base
-
-(require string-constants
-         racket/class
-         racket/match
-         racket/list
-         racket/set
-         racket/unit
-         mred/mred-sig
-         "../preferences.rkt"
-         unstable/2d/dir-chars
-         mrlib/tex-table
-         (only-in srfi/13 string-prefix? string-prefix-length)
-         "sig.rkt")
-(provide keymap@)
-
-(define-unit keymap@
-  (import mred^
-          [prefix finder: framework:finder^]
-          [prefix handler: framework:handler^]
-          [prefix frame: framework:frame^]
-          [prefix editor: framework:editor^]
-          [prefix text: framework:text^])
-  (export (rename framework:keymap^
-                  [-get-file get-file]))
-  (init-depend mred^)
-
-  ;; if I put this in main.rkt with the others, it doesn't happen
-  ;; early enough... ? JBC, 2011-07-12
-  (preferences:set-default 'framework:automatic-parens #f boolean?)
-
-
-  (define user-keybindings-files (make-hash))
-  
-  (define (add-user-keybindings-file spec)
-    (hash-ref
-     user-keybindings-files
-     spec
-     (λ ()
-       (let* ([path (spec->path spec)]
-              [sexp (and (file-exists? path)
-                         (parameterize ([read-accept-reader #t])
-                           (call-with-input-file path read)))])
-         (match sexp
-           [`(module ,name ,lang ,x ...)
-	    (cond
-	     [(valid-keybindings-lang? lang)
-	      (let ([km (dynamic-require spec '#%keymap)])
-		(hash-set! user-keybindings-files spec km)
-		(send user-keymap chain-to-keymap km #t))]
-	     [else
-	      (error 'add-user-keybindings-file
-		     (string-constant user-defined-keybinding-malformed-file/found-lang)
-		     (path->string path)
-		     lang)])]
-           [else (error 'add-user-keybindings-file 
-                        (string-constant user-defined-keybinding-malformed-file)
-                        (path->string path))])))))
-  
-  (define (valid-keybindings-lang? x)
-    (member x
-            (list `(lib "keybinding-lang.ss" "framework")
-                  `(lib "keybinding-lang.rkt" "framework")
-                  `(lib "framework/keybinding-lang.ss")
-                  `(lib "framework/keybinding-lang.rkt")
-                  `framework/keybinding-lang)))
-  
-  (define (spec->path p)
-    (cond
-      [(path? p) p]
-      [else
-       (let* ([mod-name ((current-module-name-resolver) p #f #f #t)]
-              [str (symbol->string mod-name)]
-              [pth (substring str 1 (string-length str))])
-         (let-values ([(base name _) (split-path pth)])
-           (let ([filenames
-                  (sort
-                   (filter (λ (x) (substring? (path->string name) x))
-                           (map path->string (directory-list base)))
-                   (λ (x y) (> (string-length x) (string-length y))))])
-             (when (null? filenames)
-               (error 'spec->path "could not convert ~s, found no filenames for ~s" p mod-name))
-             (build-path base (car filenames)))))]))
-  
-  (define (substring? s1 s2)
-    (and (<= (string-length s1) 
-             (string-length s2))
-         (string=? s1 (substring s2 0 (string-length s1)))))
-  
-  (define (remove-user-keybindings-file spec)
-    (let/ec k
-      (let ([km (hash-ref user-keybindings-files spec (λ () (k (void))))])
-        (send global remove-chained-keymap km)
-        (hash-remove! user-keybindings-files spec))))
-  
-  (define (remove-chained-keymap ed keymap-to-remove)
-    (let ([ed-keymap (send ed get-keymap)])
-      (when (eq? keymap-to-remove ed-keymap)
-        (error 'keymap:remove-keymap "cannot remove initial keymap from editor"))
-      (let p-loop ([parent-keymap ed-keymap])
-        (unless (is-a? parent-keymap aug-keymap<%>)
-          (error 'keymap:remove-keymap
-                 "found a keymap that is not a keymap:aug-keymap<%> ~e" 
-                 parent-keymap))
-        (let c-loop ([child-keymaps (send parent-keymap get-chained-keymaps)])
-          (cond
-            [(null? child-keymaps) 
-             (void)]
-            [else
-             (let ([child-keymap (car child-keymaps)])
-               (cond
-                 [(eq? child-keymap keymap-to-remove)
-                  (send parent-keymap remove-chained-keymap child-keymap)
-                  (c-loop (cdr child-keymaps))]
-                 [else 
-                  (p-loop child-keymap)
-                  (c-loop (cdr child-keymaps))]))])))))
-  
-  (define (set-chained-keymaps parent-keymap children-keymaps)
-    (for-each (λ (orig-sub) (send parent-keymap remove-chained-keymap))
-              (send parent-keymap get-chained-keymaps))
-    (for-each (λ (new-sub) (send parent-keymap chain-to-keymap new-sub #f))
-              children-keymaps))
-  
-  (define aug-keymap<%> (interface ((class->interface keymap%))
-                          get-chained-keymaps
-                          get-map-function-table
-                          get-map-function-table/ht))
-  
-  (define aug-keymap-mixin
-    (mixin ((class->interface keymap%)) (aug-keymap<%>)
-      (define chained-keymaps null)
-      (define/public (get-chained-keymaps) chained-keymaps)
-      
-      (define/override (chain-to-keymap keymap prefix?)
-        (super chain-to-keymap keymap prefix?)
-        (set! chained-keymaps
-              (if prefix?
-                  (cons keymap chained-keymaps)
-                  (append chained-keymaps (list keymap)))))
-      
-      (define/override (remove-chained-keymap keymap)
-        (super remove-chained-keymap keymap)
-        (set! chained-keymaps (remq keymap chained-keymaps)))
-      
-      (define function-table (make-hasheq))
-      (define/public (get-function-table) function-table)
-      (define/override (map-function keyname fname)
-        (super map-function (canonicalize-keybinding-string keyname) fname)
-        (hash-set! function-table (string->symbol keyname) fname))
-      
-      (define/public (get-map-function-table)
-        (get-map-function-table/ht (make-hasheq)))
-      
-      (define/public (get-map-function-table/ht table)
-        (for ([(keyname fname) (in-hash function-table)])
-          (define cs (canonicalize-keybinding-string (format "~a" keyname)))
-          (define key (string->symbol cs))
-          (unless (hash-ref table key #f)
-            (when (on-this-platform? cs)
-              (hash-set! table key fname))))
-        (for ([chained-keymap (in-list chained-keymaps)])
-          (when (is-a? chained-keymap aug-keymap<%>)
-            (send chained-keymap get-map-function-table/ht table)))
-        table)
-      
-      (define/private (on-this-platform? cs)
-        (define splits
-          (for/list ([x (in-list (split-out #\; (string->list cs)))])
-            (all-but-last (split-out #\: x))))
-        (define (has-key? k) (ormap (λ (x) (member (list k) x)) splits))
-        (cond
-          [(eq? (system-type) 'windows)
-           (cond
-             [(and (regexp-match? #rx"c:m" cs)
-		   (not (regexp-match? #rx"~c:m" cs))
-		   (not (regexp-match? #rx"~g:" cs)))
-              #f]
-             [(or (has-key? #\a) (has-key? #\d))
-              #f]
-             [else #t])]
-          [(eq? (system-type) 'macosx)
-           (cond
-             [(has-key? #\m)
-              #f]
-             [else #t])]
-          [(eq? (system-type) 'unix)
-           (cond
-             [(or (has-key? #\a) (has-key? #\d))
-              #f]
-             [else #t])]
-          [else 
-           ;; just in case new platforms come along .... 
-           #t]))
-      
-      (define/private (all-but-last l)
-        (cond
-          [(null? l) l]
-          [(null? (cdr l)) l]
-          [else (cons (car l) (all-but-last (cdr l)))]))
-      
-      (super-new)))
-  
-  (define aug-keymap% (aug-keymap-mixin keymap%))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;;;;;;                                                     ;;;;;;;;
-  ;;;;;;;           canonicalize-keybinding-string            ;;;;;;;;
-  ;;;;;;;                                                     ;;;;;;;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; canonicalize-keybinding-string : string -> string
-  ;; The result can be used with string=? to determine
-  ;; if two key bindings refer to the same key.
-  ;; Assumes a well-formed keystring.
-  (define (canonicalize-keybinding-string str)
-    (define chars (map char-downcase (string->list str)))
-    (define separated-keys
-      (map
-       canonicalize-single-keybinding-string
-       (split-out #\; chars)))
-    (join-strings ";" separated-keys))
-  
-  ;; join-strings : string (listof string) -> string
-  ;; concatenates strs with sep between each of them
-  (define (join-strings sep strs)
-    (if (null? strs)
-        ""
-        (apply
-         string-append
-         (cons
-          (car strs)
-          (let loop ([sepd-strs (cdr strs)])
-            (cond
-              [(null? sepd-strs) null]
-              [else (list*
-                     sep
-                     (car sepd-strs)
-                     (loop (cdr sepd-strs)))]))))))
-  
-  ;; canonicalize-single-keybinding-string : (listof char) -> string
-  (define (canonicalize-single-keybinding-string chars)
-    (let* ([neg? (char=? (car chars) #\:)]
-           [mods/key (split-out #\: (if neg? (cdr chars) chars))]
-           [mods
-            (let loop ([mods mods/key])
-              (cond
-                [(null? mods) null]
-                [(null? (cdr mods)) null]
-                [else (cons (car mods) (loop (cdr mods)))]))]
-           [key (apply string (car (last-pair mods/key)))]
-           [canon-key
-            (cond
-              [(string=? key "enter") "return"]
-              [(string=? key "del") "delete"]
-              [(string=? key "ins") "insert"]
-              [else key])]
-           [shift (if neg? #f 'd/c)]
-           [control (if neg? #f 'd/c)]
-           [alt (if neg? #f 'd/c)]
-           [meta (if neg? #f 'd/c)]
-           [command (if neg? #f 'd/c)]
-           [lock 'd/c]
-           [altgr 'd/c]
-           [question-mark 'd/c]
-           
-           [do-key
-            (λ (char val)
-              (cond
-                [(eq? val #t) (string char)]
-                [(eq? val #f) (string #\~ char)]
-                [(eq? val 'd/c) #f]))])
-      
-      (for-each (λ (mod)
-                  (let ([val (not (char=? (car mod) #\~))])
-                    (case (if (char=? (car mod) #\~)
-                              (cadr mod)
-                              (car mod))
-                      [(#\s) (set! shift val)]
-                      [(#\c) (set! control val)]
-                      [(#\a) (set! alt val)]
-                      [(#\d) (set! command val)]
-                      [(#\m) (set! meta val)]
-                      [(#\l) (set! lock val)]
-                      [(#\g) (set! altgr val)]
-                      [(#\?) (set! question-mark val)])))
-                mods)
-      
-      (join-strings ":"
-                    (filter
-                     values
-                     (list
-                      (do-key #\? question-mark)
-                      (do-key #\a alt)
-                      (do-key #\c control)
-                      (do-key #\d command)
-                      (do-key #\m meta)
-                      (do-key #\s shift)
-                      (do-key #\l lock)
-		      (and (eq? 'windows (system-type))
-			   control
-			   meta
-			   (do-key #\g altgr))
-                      canon-key)))))
-  
-  ;; split-out : char (listof char) -> (listof (listof char))
-  ;; splits a list of characters at its first argument
-  ;; if the last character is the same as the first character,
-  ;; it is not split into an empty list, but returned.
-  (define (split-out split-char chars)
-    (let loop ([chars chars]
-               [this-split null]
-               [all-split null])
-      (cond
-        [(null? chars)
-         (reverse (cons (reverse this-split) all-split))]
-        [else (let ([char (car chars)])
-                (cond
-                  [(char=? split-char char)
-                   (if (null? (cdr chars))
-                       (loop null
-                             (cons char this-split)
-                             all-split)
-                       (loop (cdr chars)
-                             null
-                             (cons (reverse this-split) all-split)))]
-                  [else
-                   (loop (cdr chars)
-                         (cons char this-split)
-                         all-split)]))])))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;;;;;;                                                     ;;;;;;;;
-  ;;;;;;;         end canonicalize-keybinding-string          ;;;;;;;;
-  ;;;;;;;                                                     ;;;;;;;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (make-meta-prefix-list key [mask-control? #f])
-    ;; Note: key canonicalization will remove "~g" when redundant
-    (list (if mask-control?
-	      (string-append "~g:m:" key)
-              (string-append "~c:~g:m:" key))
-          (string-append "ESC;" key)))
-  
-  (define (send-map-function-meta keymap key func [mask-control? #f] 
-                                  #:alt-as-meta-keymap [alt-as-meta-keymap #f])
-    (for ([key (in-list (make-meta-prefix-list key mask-control?))])
-      (send keymap map-function key func))
-    (when alt-as-meta-keymap
-      (unless (send alt-as-meta-keymap is-function-added? func)
-        (error 'send-map-function-meta
-               "expected to find ~s mapped in alt-as-meta-keymap"
-               func))
-      (send alt-as-meta-keymap map-function (string-append "?:a:" key) func)))
-  
-  (define has-control-regexp #rx"(?:^|:)c:")
-  
-  (define add-to-right-button-menu (make-parameter void))
-  (define add-to-right-button-menu/before (make-parameter void))
-  
-  (define setup-global
-    ; Define some useful keyboard functions
-    (let* ([ring-bell
-            (λ (edit event)
-              (bell))]
-           
-           [mouse-popup-menu 
-            (λ (edit event)
-              (when (send event button-up?)
-                (let ([a (send edit get-admin)])
-                  (when a
-                    (let ([m (make-object popup-menu%)])
-                      
-                      ((add-to-right-button-menu/before) m edit event)
-                      
-                      (append-editor-operation-menu-items 
-                       m #:popup-position 
-                       (list edit
-                             (send edit find-position (send event get-x) (send event get-y))))
-                      (for-each
-                       (λ (i)
-                         (when (is-a? i selectable-menu-item<%>)
-                           (send i set-shortcut #f)))
-                       (send m get-items))
-                      
-                      ((add-to-right-button-menu) m edit event)
-                      
-                      (let-values ([(x y) (send edit
-                                                dc-location-to-editor-location
-                                                (send event get-x)
-                                                (send event get-y))])
-                        (send a popup-menu m (+ x 1) (+ y 1))))))))]
-           
-           [toggle-anchor
-            (λ (edit event)
-              (send edit set-anchor
-                    (not (send edit get-anchor))))]
-           [center-view-on-line
-            (λ (edit event)
-              (let ([new-mid-line (send edit position-line
-                                        (send edit get-start-position))]
-                    [bt (box 0)]
-                    [bb (box 0)])
-                (send edit get-visible-line-range bt bb #f)
-                (let* ([half (sub1 (quotient (- (unbox bb) (unbox bt)) 2))]
-                       [last-pos (send edit position-line (send edit last-position))]
-                       [top-pos (send edit line-start-position 
-                                      (max (min (- new-mid-line half) last-pos) 0))]
-                       [bottom-pos (send edit line-start-position 
-                                         (max 0
-                                              (min (+ new-mid-line half)
-                                                   last-pos)))])
-                  (send edit scroll-to-position 
-                        top-pos
-                        #f
-                        bottom-pos)))
-              #t)]
-           
-                      
-           [collapse-variable-space
-            ;; As per emacs: collapse tabs & spaces around the point,
-            ;; perhaps leaving a single space.
-            ;; drscheme bonus: if at end-of-line, collapse into the next line.
-            (λ (leave-one? edit event)
-              (letrec ([last-pos  (send edit last-position)]
-                       [sel-start (send edit get-start-position)]
-                       [sel-end   (send edit get-end-position)]
-                       [collapsible? (λ (c) (and (char-whitespace? c)
-                                                 (not (char=? #\newline c))))]
-                       [find-noncollapsible
-                        ; Return index of next non-collapsible char,
-                        ; starting at pos in direction dir.
-                        ; NB returns -1 or last-pos, if examining
-                        ; initial/final whitespace
-                        ; (or, when initial pos is outside of [0,last-pos).)
-                        (λ (pos dir)
-                          (let loop ([pos pos])
-                            (cond [(<  pos 0) -1]
-                                  [(>= pos last-pos) last-pos]
-                                  [(collapsible? (send edit get-character pos))
-                                   (loop (+ pos dir))]
-                                  [else pos])))])
-                (when (= sel-start sel-end) ; Only when no selection:
-                  (let* ([start (add1 (find-noncollapsible (sub1 sel-start) -1))]
-                         [end-heeding-eol (find-noncollapsible sel-start +1)]
-                         ; This is the end of the range, were we to always heed newlines.
-                         
-                         ; Special case: if we're sitting at EOL,
-                         ; and we're not affecting much else,
-                         ; then delete that EOL and collapse spaces
-                         ; at the start of next line, too:
-                         [end (if (and (<= (- end-heeding-eol start)
-                                           (if leave-one? 1 0))
-                                       (char=? #\newline (send edit get-character end-heeding-eol))
-                                       ; If you wish to avoid deleting an newline at EOF, do so here.
-                                       )
-                                  (find-noncollapsible (add1 end-heeding-eol) +1)
-                                  end-heeding-eol)]
-                         [making-no-difference?
-                          ; Don't introduce edits into undo-chain, if no effect.
-                          (if leave-one?
-                              (and (= (- end start) 1)
-                                   (char=? #\space (send edit get-character start)))
-                              (= (- end start) 0))])
-                    (unless making-no-difference?
-                      (send edit begin-edit-sequence)
-                      (send edit set-position end) ; Even after delete, caret will be at "end".
-                      (send edit delete start end)
-                      (when leave-one? (send edit insert #\space start))
-                      (send edit end-edit-sequence))))))]
-           
-           [collapse-space
-            (λ (edit event)
-              (collapse-variable-space #t edit event))]
-           
-           [remove-space
-            (λ (edit event)
-              (collapse-variable-space #f edit event))]
-           
-           [collapse-newline
-            (λ (edit event)
-              (define (find-nonwhite pos d offset)
-                (define done (if (= offset -1) 0 (send edit last-position)))
-                (let/ec escape
-                  (let loop ([pos pos])
-                    (cond
-                      [(= pos done) (escape pos)]
-                      [else
-                       (define c (send edit get-character (+ pos offset)))
-                       (cond
-                         [(char=? #\newline c)
-                          (loop (+ pos d))
-                          (escape pos)]
-                         [(char-whitespace? c)
-                          (loop (+ pos d))]
-                         [else pos])]))))
-              (define sel-start (send edit get-start-position))
-              (define sel-end (send edit get-end-position))
-              (when (= sel-start sel-end)
-                (define pos-para (send edit position-paragraph sel-start #f))
-                (define pos-para-start (send edit paragraph-start-position pos-para))
-                (define pos-para-end (send edit paragraph-end-position pos-para))
-                       
-                (define whitepara?
-                  (let loop ([pos pos-para-start])
-                    (if (>= pos pos-para-end)
-                        #t
-                        (and (char-whitespace? (send edit get-character pos))
-                             (loop (add1 pos))))))
-                       
-                (define start (find-nonwhite pos-para-start -1 -1))
-                (define end (find-nonwhite pos-para-end 1 0))
-                
-                (define start-para (send edit position-paragraph start #f))
-                (define start-para-start (send edit paragraph-start-position start-para))
-                (define end-para (send edit position-paragraph end #f))
-                (define end-para-start (send edit paragraph-start-position (add1 end-para)))
-                (cond
-                  [(and whitepara?
-                        (= start-para pos-para)
-                        (= end-para pos-para))
-                   ; Special case: just delete this para
-                   (send edit delete pos-para-start (add1 pos-para-end))]
-                  [(and whitepara? (< start-para pos-para))
-                   ; Can delete before & after
-                   (send* edit 
-                     (begin-edit-sequence)
-                     (delete (add1 pos-para-end) end-para-start)
-                     (delete start-para-start pos-para-start)
-                     (end-edit-sequence))]
-                  [else
-                   ; Only delete after
-                   (send edit delete (add1 pos-para-end) end-para-start)])))]
-           
-           [open-line
-            (λ (edit event)
-              (let ([sel-start (send edit get-start-position)]
-                    [sel-end (send edit get-end-position)])
-                (when (= sel-start sel-end)
-                    (send* edit 
-                      (insert #\newline)
-                      (set-position sel-start)))))]
-           
-           [transpose-chars
-            (λ (edit event)
-              (let ([sel-start (send edit get-start-position)]
-                    [sel-end (send edit get-end-position)])
-                (when (and (= sel-start sel-end)
-                           (not (= sel-start 0)))
-                  
-                  (let ([sel-start
-                         (if (= sel-start
-                                (send edit line-end-position
-                                      (send edit position-line sel-start)))
-                             (sub1 sel-start)
-                             sel-start)])
-                    (let ([s (send edit get-text
-                                   sel-start (add1 sel-start))])
-                      (send* edit
-                        (begin-edit-sequence)
-                        (delete sel-start (add1 sel-start))
-                        (insert s (- sel-start 1))
-                        (set-position (add1 sel-start))
-                        (end-edit-sequence)))))))]
-           
-           [transpose-words
-            (λ (edit event)
-              (let ([sel-start (send edit get-start-position)]
-                    [sel-end (send edit get-end-position)])
-                (when (= sel-start sel-end)
-                  (let ([word-1-start (box sel-start)])
-                    (send edit find-wordbreak word-1-start #f 'caret)
-                    (let ([word-1-end (box (unbox word-1-start))])
-                      (send edit find-wordbreak #f word-1-end 'caret)
-                      (let ([word-2-end (box (unbox word-1-end))])
-                        (send edit find-wordbreak #f word-2-end 'caret)
-                        (let ([word-2-start (box (unbox word-2-end))])
-                          (send edit find-wordbreak word-2-start #f 'caret)
-                          (let ([text-1 (send edit get-text
-                                              (unbox word-1-start)
-                                              (unbox word-1-end))]
-                                [text-2 (send edit get-text
-                                              (unbox word-2-start)
-                                              (unbox word-2-end))])
-                            (send* edit
-                              (begin-edit-sequence)
-                              (insert text-1 
-                                      (unbox word-2-start)
-                                      (unbox word-2-end))
-                              (insert text-2 
-                                      (unbox word-1-start)
-                                      (unbox word-1-end))
-                              (set-position (unbox word-2-end))
-                              (end-edit-sequence))))))))))]
-           
-           [capitalize-it
-            (λ (edit char-case1 char-case2)
-              (let ([sel-start (send edit get-start-position)]
-                    [sel-end (send edit get-end-position)]
-                    [real-end (send edit last-position)])
-                (when (= sel-start sel-end)
-                  (let ([word-end (let ([b (box sel-start)])
-                                    (send edit find-wordbreak #f b 'caret)
-                                    (min real-end (unbox b)))])
-                    (send edit begin-edit-sequence)
-                    (let loop ([pos sel-start]
-                               [char-case char-case1])
-                      (when (< pos word-end)
-                        (let ([c (send edit get-character pos)])
-                          (cond
-                            [(char-alphabetic? c)
-                             (send edit insert 
-                                   (list->string
-                                    (list (char-case c)))
-                                   pos (add1 pos))
-                             (loop (add1 pos) char-case2)]
-                            [else 
-                             (loop (add1 pos) char-case)]))))
-                    (send* edit 
-                      (end-edit-sequence)
-                      (set-position word-end))))))]
-           
-           [capitalize-word
-            (λ (edit event)
-              (capitalize-it edit char-upcase char-downcase))]
-           [upcase-word
-            (λ (edit event)
-              (capitalize-it edit char-upcase char-upcase))]
-           [downcase-word
-            (λ (edit event)
-              (capitalize-it edit char-downcase char-downcase))]
-           
-           [kill-word
-            (λ (edit event)
-              (let ([sel-start (send edit get-start-position)]
-                    [sel-end (send edit get-end-position)])
-                (let ([end-box (box sel-end)])
-                  (send edit find-wordbreak #f end-box 'caret)
-                  (send edit kill 0 sel-start (unbox end-box)))))]
-           
-           [backward-kill-word
-            (λ (edit event)
-              (let ([sel-start (send edit get-start-position)]
-                    [sel-end (send edit get-end-position)])
-                (let ([start-box (box sel-start)])
-                  (send edit find-wordbreak start-box #f 'caret)
-                  (send edit kill 0 (unbox start-box) sel-end))))]
-           [copy-click-region
-            (λ (edit event)
-              (region-click/internal edit event
-                            (λ (click eol start end)
-                              (send edit flash-on start end)
-                              (send edit copy #f 0 start end))))]
-           [cut-click-region
-            (λ (edit event)
-              (region-click/internal edit event
-                            (λ (click eol start end)
-                              (send edit cut #f 0 start end))))]
-           [paste-click-region
-            (λ (edit event)
-              (region-click/internal edit event
-                            (λ (click eol start end)
-                              (send edit set-position click)
-                              (send edit paste-x-selection 0 click))))]
-           
-           [mouse-copy-clipboard
-            (λ (edit event)
-              (send edit copy #f (send event get-time-stamp)))]
-           
-           [mouse-copy-clipboard/disable-anchor
-            (λ (edit event)
-              (send edit set-anchor #f)
-              (send edit copy #f (send event get-time-stamp)))]
-           
-           [mouse-paste-clipboard
-            (λ (edit event)
-              (send edit paste (send event get-time-stamp)))]
-           
-           [mouse-cut-clipboard
-            (λ (edit event)
-              (send edit cut #f (send event get-time-stamp)))]
-           
-           [select-click-word
-            (λ (edit event)
-              (region-click edit event
-                            (λ (click eol)
-                              (let ([start-box (box click)]
-                                    [end-box (box click)])
-                                (send edit find-wordbreak 
-                                      start-box
-                                      end-box
-                                      'selection)
-                                (send edit set-position
-                                      (unbox start-box)
-                                      (unbox end-box))))))]
-           [select-click-line
-            (λ (edit event)
-              (region-click edit event
-                            (λ (click eol)
-                              (let* ([line (send edit position-line 
-                                                 click eol)]
-                                     [start (send edit line-start-position
-                                                  line #f)]
-                                     [end (send edit line-end-position
-                                                line #f)])
-                                (send edit set-position start end)))))]
-           
-           [goto-line
-            (λ (edit event)
-              (let ([num-str
-                     (call/text-keymap-initializer
-                      (λ ()
-                        (get-text-from-user
-                         (string-constant goto-line)
-                         (string-constant goto-line))))])
-                (when (string? num-str)
-                  (let* ([possible-num (string->number num-str)]
-                         [line-num (and possible-num (inexact->exact possible-num))])
-                    (cond
-                      [(and (number? line-num)
-                            (integer? line-num)
-                            (<= 1 line-num (+ (send edit last-paragraph) 1)))
-                       (let ([pos (send edit paragraph-start-position 
-                                        (sub1 line-num))])
-                         (send edit set-position pos))]
-                      [else
-                       (message-box
-                        (string-constant goto-line)
-                        (format 
-                         (string-constant goto-line-invalid-number)
-                         num-str
-                         (+ (send edit last-line) 1)))]))))
-              
-              #t)]
-           [repeater
-            (λ (n edit)
-              (let* ([km (send edit get-keymap)]
-                     [done
-                      (λ ()
-                        (send km set-break-sequence-callback void)
-                        (send km remove-grab-key-function))])
-                (send km set-grab-key-function
-                      (λ (name local-km edit event)
-                        (if name
-                            (begin
-                              (done)
-                              (dynamic-wind
-                               (λ ()
-                                 (send edit begin-edit-sequence))
-                               (λ ()
-                                 (let loop ([n n])
-                                   (unless (zero? n)
-                                     (send local-km call-function name edit event)
-                                     (loop (sub1 n)))))
-                               (λ ()
-                                 (send edit end-edit-sequence))))
-                            (let ([k (send event get-key-code)])
-                              (if (and (char? k) (char<=? #\0 k #\9))
-                                  (set! n (+ (* n 10) (- (char->integer k)
-                                                         (char->integer #\0))))
-                                  (begin
-                                    (done)
-                                    (dynamic-wind
-                                     (λ ()
-                                       (send edit begin-edit-sequence))
-                                     (λ ()
-                                       (let loop ([n n])
-                                         (unless (zero? n)
-                                           (send edit on-char event)
-                                           (loop (sub1 n)))))
-                                     (λ ()
-                                       (send edit end-edit-sequence)))))))
-                        #t))
-                (send km set-break-sequence-callback done)
-                #t))]
-           [make-make-repeater
-            (λ (n)
-              (λ (edit event)
-                (repeater n edit)))]
-           [current-macro '()] 
-           [building-macro #f] [build-macro-km #f] [build-protect? #f]
-           [show/hide-keyboard-macro-icon
-            (λ (edit on?)
-              (when (is-a? edit editor:basic<%>)
-                (let ([frame (send edit get-top-level-window)])
-                  (when (is-a? frame frame:text-info<%>)
-                    (send frame set-macro-recording on?)
-                    (send frame update-shown)))))]
-           
-           [do-macro
-            (λ (edit event)
-              ; If c:x;e during record, copy the old macro
-              (when building-macro
-                (set! building-macro (append (reverse current-macro) 
-                                             (cdr building-macro))))
-              (let ([bm building-macro]
-                    [km (send edit get-keymap)])
-                (dynamic-wind
-                 (λ ()
-                   (set! building-macro #f)
-                   (send edit begin-edit-sequence))
-                 (λ ()
-                   (let/ec escape
-                     (for-each
-                      (λ (f)
-                        (let ([name (car f)]
-                              [event (cdr f)])
-                          (if name
-                              (unless (send km call-function name edit event #t)
-                                (escape #t))
-                              (send edit on-char event))))
-                      current-macro)))
-                 (λ ()
-                   (send edit end-edit-sequence)
-                   (set! building-macro bm))))
-              #t)]
-           [start-macro
-            (λ (edit event)
-              (if building-macro
-                  (send build-macro-km break-sequence)
-                  (letrec ([km (send edit get-keymap)]
-                           [done
-                            (λ ()
-                              (if build-protect?
-                                  (send km set-break-sequence-callback done)
-                                  (begin
-                                    (set! building-macro #f)
-                                    (show/hide-keyboard-macro-icon edit #f)
-                                    (send km set-break-sequence-callback void)
-                                    (send km remove-grab-key-function))))])
-                    (set! building-macro '())
-                    (show/hide-keyboard-macro-icon edit #t)
-                    (set! build-macro-km km)
-                    (send km set-grab-key-function
-                          (λ (name local-km edit event)
-                            (dynamic-wind
-                             (λ ()
-                               (set! build-protect? #t))
-                             (λ ()
-                               (if name
-                                   (send local-km call-function name edit event)
-                                   (send edit on-default-char event)))
-                             (λ ()
-                               (set! build-protect? #f)))
-                            (when building-macro
-                              (set! building-macro 
-                                    (cons (cons name event)
-                                          building-macro)))
-                            #t))
-                    (send km set-break-sequence-callback done)))
-              #t)]
-           [end-macro
-            (λ (edit event)
-              (when building-macro
-                (set! current-macro (reverse building-macro))
-                (set! build-protect? #f)
-                (send build-macro-km break-sequence))
-              #t)]
-           [delete-key
-            (λ (edit event)
-              (let ([kmap (send edit get-keymap)])
-                (send kmap call-function
-                      (if (preferences:get 'framework:delete-forward?)
-                          "delete-next-character"
-                          "delete-previous-character")
-                      edit event #t)))]
-           
-           [toggle-overwrite
-            (λ (edit event)
-              (when (preferences:get 'framework:overwrite-mode-keybindings)
-                (send edit set-overwrite-mode
-                      (not (send edit get-overwrite-mode)))))]
-           
-           [down-into-embedded-editor
-            (λ (text event)
-              (let ([start (send text get-start-position)]
-                    [end (send text get-end-position)])
-                (when (= start end)
-                  (let* ([bx (box 0)]
-                         [after-snip (send text find-snip start 'after-or-none bx)])
-                    (cond
-                      [(and (= (unbox bx) start)
-                            after-snip
-                            (is-a? after-snip editor-snip%))
-                       (let ([embedded-editor (send after-snip get-editor)])
-                         (when (is-a? embedded-editor text%)
-                           (send embedded-editor set-position 0))
-                         (send embedded-editor set-caret-owner #f 'global))]
-                      [else
-                       (let ([before-snip (send text find-snip start 'before-or-none bx)])
-                         (when (and (= (+ (unbox bx) 1) start)
-                                    before-snip
-                                    (is-a? before-snip editor-snip%))
-                           (let ([embedded-editor (send before-snip get-editor)])
-                             (when (is-a? embedded-editor text%)
-                               (send embedded-editor set-position
-                                     (send embedded-editor last-position)))
-                             (send embedded-editor set-caret-owner #f 'global))))]))))
-              #t)]
-           
-           [forward-to-next-embedded-editor
-            (λ (text event)
-              (let ([start-pos (send text get-start-position)]
-                    [end-pos (send text get-end-position)])
-                (when (= start-pos end-pos)
-                  (let loop ([snip (send text find-snip start-pos 'after-or-none)])
-                    (cond
-                      [(not snip) (void)]
-                      [(is-a? snip editor-snip%)
-                       (send text set-position (send text get-snip-position snip))]
-                      [else (loop (send snip next))]))))
-              #t)]
-           
-           [back-to-prev-embedded-editor
-            (λ (text event)
-              (let ([start-pos (send text get-start-position)]
-                    [end-pos (send text get-end-position)])
-                (when (= start-pos end-pos)
-                  (let loop ([snip (send text find-snip start-pos 'before-or-none)])
-                    (cond
-                      [(not snip) (void)]
-                      [(is-a? snip editor-snip%)
-                       (send text set-position (+ (send text get-snip-position snip) 1))]
-                      [else (loop (send snip previous))]))))
-              #t)]
-           
-           [up-out-of-embedded-editor
-            (λ (text event)
-              (let ([start (send text get-start-position)]
-                    [end (send text get-end-position)])
-                (when (= start end)
-                  (let ([editor-admin (send text get-admin)])
-                    (when (is-a? editor-admin editor-snip-editor-admin<%>)
-                      (let* ([snip (send editor-admin get-snip)]
-                             [snip-admin (send snip get-admin)])
-                        (when snip-admin
-                          (let ([editor (send snip-admin get-editor)])
-                            (when (is-a? editor text%)
-                              (let ([new-pos (send editor get-snip-position snip)])
-                                (send editor set-position new-pos new-pos))
-                              (send editor set-caret-owner #f 'display)))))))))
-              #t)]
-           
-           [make-read-only
-            (λ (text event)
-              (send text lock #t)
-              #t)]
-           
-           [newline
-            (λ (text event)
-              (send text insert "\n")
-              #t)]
-           
-           [shift-focus
-            (λ (adjust)
-              (λ (text event)
-                (when (is-a? text editor:basic<%>)
-                  (let ([frame (send text get-top-level-window)]
-                        [found-one? #f])
-                    (let/ec k
-                      (let ([go
-                             (λ ()
-                               (let loop ([obj frame])
-                                 (cond
-                                   [(and found-one? 
-                                         (is-a? obj editor-canvas%)
-                                         (is-a? (send obj get-editor) editor:keymap<%>))
-                                    (send obj focus)
-                                    (k (void))]
-                                   [(and (is-a? obj window<%>) (send obj has-focus?))
-                                    (set! found-one? #t)]
-                                   [(is-a? obj area-container<%>)
-                                    (for-each loop (adjust (send obj get-children)))])))])
-                        (go)
-                        ;;; when we get here, we either didn't find the focus anywhere,
-                        ;;; or the last editor-canvas had the focus. either way,
-                        ;;; the next thing should get the focus
-                        (set! found-one? #t)
-                        (go)))))))]
-           
-           [TeX-compress
-            (let* ([biggest (apply max (map (λ (x) (string-length (car x))) tex-shortcut-table))])
-              (define (meet s t)
-                (substring s 0 (string-prefix-length s t 0)))
-              (λ (text event)
-                (define pos (send text get-start-position))
-                (when (= pos (send text get-end-position))
-                  (define slash (send text find-string "\\" 'backward pos (max 0 (- pos biggest 1))))
-                  (when slash
-                    (define entered (send text get-text slash pos))
-                    (define completions
-                      (filter (λ (shortcut) (string-prefix? entered (first shortcut)))
-                              tex-shortcut-table))
-                    (unless (empty? completions)
-                      (define-values (replacement partial?)
-                        (let ([complete-match 
-                               (findf (λ (shortcut) (equal? entered (first shortcut)))
-                                      completions)])
-                          (if complete-match
-                              (values (second complete-match) #f)
-                              (if (= 1 (length completions))
-                                  (values (second (first completions)) #f)
-                                  (let ([tex-names (map first completions)])
-                                    (values (foldl meet (first tex-names) (rest tex-names))
-                                            #t))))))
-                      (send text begin-edit-sequence)
-                      (send text delete (if partial? slash (- slash 1)) pos)
-                      (send text insert replacement)
-                      (send text end-edit-sequence))))))]
-           
-           [greek-letters "αβγδεζηθι κλμνξοπρςστυφχψω"]
-           [Greek-letters "ΑΒΓΔΕΖΗΘΙ ΚΛΜΝΞΟΠΡ ΣΤΥΦΧΨΩ"]
-           ;; don't have a capital ς, just comes out as \u03A2 (or junk) 
-     
-           
-           [find-beginning-of-line
-            (λ (txt)
-              (define pos-to-start-with
-                (cond
-                  [(= (send txt get-extend-start-position)
-                      (send txt get-start-position))
-                   (send txt get-end-position)]
-                  [else
-                   (send txt get-start-position)]))
-              
-              (cond
-                [(is-a? txt text:basic<%>)
-                 (send txt get-start-of-line pos-to-start-with)]
-                [(is-a? txt text%)
-                 (send txt line-start-position (send txt position-line pos-to-start-with))]
-                [else #f]))]
-           [beginning-of-line
-             (λ (txt event)
-               (define pos (find-beginning-of-line txt))
-               (when pos
-                 (send txt set-position pos pos)))]
-           [select-to-beginning-of-line
-            (λ (txt event)
-              (define pos (find-beginning-of-line txt))
-              (when pos
-                (send txt extend-position pos)))]
-           
-           
-           [normalize-unicode-ascii-art-box
-            (λ (txt evt)
-              (define start (send txt get-start-position))
-              (when (= start (send txt get-end-position))
-                (normalize-unicode-ascii-art-box txt start)
-                (send txt set-position start)))]
-           
-           [widen-unicode-ascii-art-box
-            (λ (txt evt)
-              (define start (send txt get-start-position))
-              (when (= start (send txt get-end-position))
-                (widen-unicode-ascii-art-box txt start)))]
-           
-           [center-in-unicode-ascii-art-box
-            (λ (txt evt)
-              (define start (send txt get-start-position))
-              (when (= start (send txt get-end-position))
-                (center-in-unicode-ascii-art-box txt start)))])
-      
-      (λ (kmap #:alt-as-meta-keymap [alt-as-meta-keymap #f])
-        (let* ([map (λ (key func) 
-                      (send kmap map-function key func))]
-               [map-meta (λ (key func)
-                           (send-map-function-meta kmap key func
-                                                   (regexp-match? has-control-regexp key)
-                                                   #:alt-as-meta-keymap alt-as-meta-keymap))]
-               [add (λ (name func)
-                      (send kmap add-function name func))]
-               [add-m (λ (name func)
-                        (send kmap add-function name func)
-                        (when alt-as-meta-keymap
-                          (send alt-as-meta-keymap add-function name func)))])
-          
-          ; Map names to keyboard functions
-          
-          (for-each
-           (λ (c) 
-             (unless (equal? c #\space)
-               (add (format "insert ~a" c) 
-                    (λ (txt evt) (send txt insert c)))))
-           (string->list (string-append greek-letters Greek-letters)))
-          
-          (add "normalize-unicode-ascii-art-box" normalize-unicode-ascii-art-box)
-          (add "widen-unicode-ascii-art-box" widen-unicode-ascii-art-box)
-          (add "center-in-unicode-ascii-art-box" center-in-unicode-ascii-art-box)
-          (add "shift-focus" (shift-focus values))
-          (add "shift-focus-backwards" (shift-focus reverse))
-          
-          (add "TeX compress" TeX-compress)
-          (add "newline" newline)
-          (add-m "down-into-embedded-editor" down-into-embedded-editor)
-          (add-m "up-out-of-embedded-editor" up-out-of-embedded-editor)
-          (add-m "forward-to-next-embedded-editor" forward-to-next-embedded-editor)
-          (add-m "back-to-prev-embedded-editor" back-to-prev-embedded-editor)
-          
-          (add-m "toggle-overwrite (when enabled in prefs)" toggle-overwrite)
-          
-          (add "exit" (λ (edit event)
-                        (let ([frame (send edit get-frame)])
-                          (if (and frame
-                                   (is-a? frame frame:standard-menus<%>))
-                              (send frame file-menu:quit)
-                              (bell)))))
-          
-          (add "ring-bell" ring-bell)
-          
-                    
-          (add "toggle-anchor" toggle-anchor)
-          (add "center-view-on-line" center-view-on-line)
-          (add-m "collapse-space" collapse-space)
-          (add "remove-space" remove-space)
-          (add "collapse-newline" collapse-newline)
-          (add "open-line" open-line)
-          (add "transpose-chars" transpose-chars)
-          (add-m "transpose-words" transpose-words)
-          (add-m "capitalize-word" capitalize-word)
-          (add-m "upcase-word" upcase-word)
-          (add-m "downcase-word" downcase-word)
-          (add-m "kill-word" kill-word)
-          (add-m "backward-kill-word" backward-kill-word)
-          
-          (let loop ([n 9])
-            (unless (negative? n)
-              (let ([s (number->string n)])
-                (add-m (string-append "command-repeat-" s)
-                       (make-make-repeater n))
-                (loop (sub1 n)))))
-          
-          (add "keyboard-macro-run-saved" do-macro)
-          (add "keyboard-macro-start-record" start-macro)
-          (add "keyboard-macro-end-record" end-macro)
-          
-          (add-m "copy-clipboard" mouse-copy-clipboard)
-          (add-m "copy-clipboard/disable-anchor" mouse-copy-clipboard/disable-anchor)
-          (add-m "cut-clipboard" mouse-cut-clipboard)
-          (add-m "paste-clipboard" mouse-paste-clipboard)
-          (add-m "copy-click-region" copy-click-region)
-          (add-m "cut-click-region" cut-click-region)
-          (add-m "paste-click-region" paste-click-region)
-          (add-m "select-click-word" select-click-word)
-          (add-m "select-click-line" select-click-line)
-          
-          (add-m "goto-line" goto-line)
-          
-          (add "delete-key" delete-key)
-          
-          (add "mouse-popup-menu" mouse-popup-menu)
-          
-          (add "make-read-only" make-read-only)
-        
-          (add "beginning-of-line" beginning-of-line)
-          (add "select-to-beginning-of-line" select-to-beginning-of-line)
-          
-          ; Map keys to functions
-          
-          (let ([setup-mappings
-                 (λ (greek-chars shift?)
-                   (let loop ([i 0])
-                     (when (< i (string-length greek-chars))
-                       (let ([greek-char (string-ref greek-chars i)])
-                         (unless (equal? greek-char #\space)
-                           (let ([roman-char
-                                  (integer->char
-                                   (+ (char->integer #\a) i))])
-                             (map (format "a:g;~a~a" 
-                                          (if shift? "s:" "")
-                                          roman-char)
-                                  (format "insert ~a" greek-char))
-                             (map (format "~~c:m:x;c:g;~a~a" 
-                                          (if shift? "s:" "")
-                                          roman-char)
-                                  (format "insert ~a" greek-char))
-                             (map (format "c:x;c:g;~a~a"
-                                          (if shift? "s:" "")
-                                          roman-char)
-                                  (format "insert ~a" greek-char)))))
-                       (loop (+ i 1)))))])
-            (setup-mappings greek-letters #f)
-            (setup-mappings Greek-letters #t))
-          
-          (map "c:x;r;a" "normalize-unicode-ascii-art-box")
-          (map "c:x;r;w" "widen-unicode-ascii-art-box")
-          (map "c:x;r;c" "center-in-unicode-ascii-art-box")
-          
-          (map "~m:c:\\" "TeX compress")
-          (map "~c:m:\\" "TeX compress")
-          (map "c:x;t" "TeX compress")
-          
-          (map "c:j" "newline")
-          
-          (map-meta "c:down" "down-into-embedded-editor")
-          (map "a:c:down" "down-into-embedded-editor")
-          (map-meta "c:up" "up-out-of-embedded-editor")
-          (map "a:c:up" "up-out-of-embedded-editor")
-          (map-meta "c:right" "forward-to-next-embedded-editor")
-          (map "a:c:right" "forward-to-next-embedded-editor")
-          (map-meta "c:left" "back-to-prev-embedded-editor")
-          (map "a:c:left" "back-to-prev-embedded-editor")
-          
-          (map "c:c;c:g" "ring-bell")
-          
-          (map "c:p" "previous-line")
-          (map "up" "previous-line")
-          (map "s:c:p" "select-up")
-          (map "s:up" "select-up")
-          
-          (map "c:n" "next-line")
-          (map "down" "next-line")
-          (map "s:c:n" "select-down")
-          (map "s:down" "select-down")
-          
-          (map "c:e" "end-of-line")
-          (map "d:right" "end-of-line")
-          (map "end" "end-of-line")
-          (map "s:end" "select-to-end-of-line")
-          (map "s:c:e" "select-to-end-of-line")
-          (map "s:d:right" "select-to-end-of-line")
-          
-          (map "c:a" "beginning-of-line")
-          (map "d:left" "beginning-of-line")
-          (map "home" "beginning-of-line")
-          (map "s:home" "select-to-beginning-of-line")
-          (map "s:c:a" "select-to-beginning-of-line")
-          (map "s:d:left" "select-to-beginning-of-line")
-
-          (map "c:f" "forward-character")
-          (map "right" "forward-character")
-          (map "s:c:f" "forward-select")
-          (map "s:right" "forward-select")
-          
-          (map "c:b" "backward-character")
-          (map "left" "backward-character")
-          (map "s:c:b" "backward-select")
-          (map "s:left" "backward-select")
-          
-          (map-meta "f" "forward-word")
-          (map "c:right" "forward-word")
-          (map-meta "s:f" "forward-select-word")
-          (map "c:s:right" "forward-select-word")
-          
-          (map-meta "b" "backward-word")
-          
-          (map "c:left" "backward-word")
-          (map-meta "s:b" "backward-select-word")
-          (map "c:s:left" "backward-select-word")
-          
-          (map-meta "<" "beginning-of-file")
-          (map "d:up" "beginning-of-file")
-          (map "c:home" "beginning-of-file")
-          (map "s:c:home" "select-to-beginning-of-file")
-          (map "s:d:up" "select-to-beginning-of-file")
-          
-          (map-meta ">" "end-of-file")
-          (map "d:down" "end-of-file")
-          (map "c:end" "end-of-file")
-          (map "s:c:end" "select-to-end-of-file")
-          (map "s:d:down" "select-to-end-of-file")
-          
-          (map "c:v" "next-page")
-          (map "pagedown" "next-page")
-          (map "c:down" "next-page")
-          (map "s:c:v" "select-page-down")
-          (map "s:pagedown" "select-page-down")
-          (map "s:c:down" "select-page-down")
-          
-          (map-meta "v" "previous-page")
-          (map "pageup" "previous-page")
-          (map "c:up" "previous-page")
-          (map-meta "s:v" "select-page-up")
-          (map "s:pageup" "select-page-up")
-          (map "s:c:up" "select-page-up")
-          
-          (map "c:h" "delete-previous-character")
-          (map "c:d" "delete-next-character")
-          (map "del" "delete-key")
-          
-          (map-meta "d" "kill-word")
-          (map-meta "del" "kill-word")
-          (map-meta "backspace" "backward-kill-word")
-          (map-meta "c" "capitalize-word")
-          (map-meta "u" "upcase-word")
-          (map-meta "l" "downcase-word")
-          
-          (map "c:l" "center-view-on-line")
-          
-          (map "c:k" "delete-to-end-of-line")
-          (map "c:y" "paste-clipboard")
-          (map-meta "y" "paste-next")
-          (map "a:v" "paste-clipboard")
-          (map "d:v" "paste-clipboard")
-          (map "c:_" "undo")
-          (map "c:/" "undo")
-          (map (format "~a" (integer->char 31)) "undo") ; for Windows - strange
-          (map "c:+" "redo")
-          (map "a:z" "undo")
-          (map "d:z" "undo")
-          (map "c:x;u" "undo")
-          (map "c:w" "cut-clipboard")
-          (map "a:x" "cut-clipboard")
-          (map "d:x" "cut-clipboard")
-          (map-meta "w" "copy-clipboard/disable-anchor")
-          (map "a:c" "copy-clipboard")
-          (map "d:c" "copy-clipboard")
-          
-          (map "s:delete" "cut-clipboard")
-          (map "c:insert" "copy-clipboard")
-          (map "s:insert" "paste-clipboard")
-          
-          (map-meta "space" "collapse-space")
-          (when (eq? (system-type) 'macosx)
-            (map "a:space" "collapse-space"))
-          ;(map-meta "\\" "remove-space") ; Conflicts with european keyboards.
-          (map "c:x;c:o" "collapse-newline")
-          (map "c:o" "open-line")
-          (map "c:t" "transpose-chars")
-          (map-meta "t" "transpose-words")
-          
-          (map "c:space" "toggle-anchor")
-          
-          (map "insert" "toggle-overwrite (when enabled in prefs)")
-          (map-meta "o" "toggle-overwrite (when enabled in prefs)")
-          
-          (map-meta "g" "goto-line")
-          
-          (map "c:u" "command-repeat-0")
-          (let loop ([n 9])
-            (unless (negative? n)
-              (let ([s (number->string n)])
-                (map-meta s (string-append "command-repeat-" s))
-                (loop (sub1 n)))))
-          
-          (map "c:x;e" "keyboard-macro-run-saved")
-          (map "c:x;(" "keyboard-macro-start-record")
-          (map "c:x;)" "keyboard-macro-end-record")
-          
-          (map "leftbuttontriple" "select-click-line")
-          (map "leftbuttondouble" "select-click-word")
-          
-          ;; the "roller ball" mice map clicking the ball to button 2.
-          (unless (eq? (system-type) 'windows)
-            (map "middlebutton" "paste-click-region"))
-          
-          (map ":rightbuttonseq" "mouse-popup-menu")
-          
-          (map "c:c;c:r" "make-read-only")
-          
-          (map "c:x;o" "shift-focus")
-          (map "c:x;p" "shift-focus-backwards")
-          (map "c:f6" "shift-focus")
-          (map "a:tab" "shift-focus")
-          (map "a:s:tab" "shift-focus-backwards")))))
-  
-  (define setup-search
-    (let* ([send-frame
-            (λ (invoke-method)
-              (λ (edit event)
-                (let ([frame
-                       (cond
-                         [(is-a? edit editor<%>)
-                          (let ([canvas (or (send edit get-active-canvas)
-                                            (send edit get-canvas))])
-                            (and canvas
-                                 (send canvas get-top-level-window)))]
-                         [(is-a? edit area<%>)
-                          (send edit get-top-level-window)]
-                         [else #f])])
-                  (if frame
-                      (invoke-method frame)
-                      (bell)))
-                #t))])
-      (λ (kmap #:alt-as-meta-keymap [alt-as-meta-keymap #f])
-        (let* ([map (λ (key func) 
-                      (send kmap map-function key func))]
-               [map-meta (λ (key func)
-                           (send-map-function-meta kmap key func
-                                                   (regexp-match? has-control-regexp key)
-                                                   #:alt-as-meta-keymap alt-as-meta-keymap))]
-               [add (λ (name func)
-                      (send kmap add-function name func))]
-               [add-m (λ (name func)
-                        (send kmap add-function name func)
-                        (when alt-as-meta-keymap
-                          (send alt-as-meta-keymap add-function name func)))])
-          
-          (add-m "search forward" 
-                 (send-frame (λ (f) (send f search 'forward))))
-          (add "search backward" 
-               (send-frame (λ (f) (send f search 'backward))))
-          (add "replace & search forward" 
-               (send-frame (λ (f) (send f replace&search 'forward))))
-          (add "replace & search backward" 
-               (send-frame (λ (f) (send f replace&search 'backward))))
-          (add "unhide search and toggle focus"
-               (send-frame (λ (f) (send f unhide-search-and-toggle-focus))))
-          (add "hide-search" 
-               (send-frame (λ (f) (send f hide-search))))
-          
-          (map "c:g" "hide-search")
-          (map "f3" "unhide search and toggle focus")
-          (map "c:s" "unhide search and toggle focus")
-          (map "c:r" "search backward")
-          (case (system-type)
-            [(unix)
-             (map-meta "%" "search forward")])))))
-  
-  (define setup-file
-    (let* ([get-outer-editor ;; : text% -> text%
-            ;; returns the outermost editor, if this editor is nested in an editor snip.
-            (λ (edit)
-              (let loop ([edit edit])
-                (let ([admin (send edit get-admin)])
-                  (cond
-                    [(is-a? admin editor-snip-editor-admin<%>)
-                     (loop (send (send (send admin get-snip) get-admin) get-editor))]
-                    [else edit]))))]
-           [save-file-as
-            (λ (this-edit event)
-              (let ([edit (get-outer-editor this-edit)])
-                (parameterize ([finder:dialog-parent-parameter 
-                                (and (is-a? edit editor:basic<%>)
-                                     (send edit get-top-level-window))])
-                  (let ([file (finder:put-file)])
-                    (when file
-                      (send edit save-file/gui-error file)))))
-              #t)]
-           [save-file
-            (λ (this-edit event)
-              (let ([edit (get-outer-editor this-edit)])
-                (if (send edit get-filename)
-                    (send edit save-file/gui-error)
-                    (save-file-as edit event)))
-              #t)]
-           [load-file
-            (λ (edit event)
-              (define (fallback)
-                (let ([fn (send edit get-filename)])
-                  (handler:open-file
-                   (and fn
-                        (let-values ([(base name dir) (split-path fn)])
-                          base)))))
-              (cond
-                [(is-a? edit editor:basic<%>)
-                 (define fr (send edit get-top-level-window))
-                 (cond
-                   [(is-a? fr frame:standard-menus<%>)
-                    (send fr file-menu:open-callback 
-                          (send fr file-menu:get-open-item)
-                          event)]
-                   [else (fallback)])]
-                [else (fallback)])
-              #t)])
-      (λ (kmap #:alt-as-meta-keymap [alt-as-meta-keymap #f])
-        (let* ([map (λ (key func) 
-                      (send kmap map-function key func))]
-               [map-meta (λ (key func)
-                           (send-map-function-meta kmap key func 
-                                                   (regexp-match? has-control-regexp key)
-                                                   #:alt-as-meta-keymap alt-as-meta-keymap))]
-               [add (λ (name func)
-                      (send kmap add-function name func))]
-               [add-m (λ (name func)
-                        (send kmap add-function name func)
-                        (when alt-as-meta-keymap
-                          (send alt-as-meta-keymap add-function name func)))])
-          
-          (add "save-file" save-file)
-          (add "save-file-as" save-file-as)
-          (add "load-file" load-file)
-          
-          (map "c:x;c:s" "save-file")
-          (map "d:s" "save-file")
-          (map "c:x;c:w" "save-file-as")
-          (map "c:x;c:f" "load-file")))))
-  
-  (define (setup-editor kmap)
-    (let ([add/map
-           (λ (func op key)
-             (send kmap add-function
-                   func
-                   (λ (editor evt)
-                     (send editor do-edit-operation op)))
-             (send kmap map-function
-                   (string-append
-                    (case (system-type)
-                      [(macosx macos) "d:"]
-                      [(windows unix) "c:"]
-                      [else (error 'keymap.rkt "unknown platform: ~s" (system-type))])
-                    key)
-                   func))])
-      (add/map "editor-undo" 'undo "z")
-      (unless (eq? (system-type) 'macosx)
-        (add/map "editor-redo" 'redo "y"))
-      (add/map "editor-cut" 'cut "x")
-      (add/map "editor-copy" 'copy "c")
-      (add/map "editor-paste" 'paste "v")
-      (add/map "editor-select-all" 'select-all "a")))
-  
-  (define (generic-setup keymap)
-    (add-editor-keymap-functions keymap)
-    (add-pasteboard-keymap-functions keymap)
-    (add-text-keymap-functions keymap))
-  
-  (define user-keymap (make-object aug-keymap%))
-  (define (get-user) user-keymap)
-  
-  (define global (make-object aug-keymap%))
-  (define global-main (make-object aug-keymap%))
-  (define global-alt-as-meta (make-object aug-keymap%))
-  (send global chain-to-keymap global-main #f)
-  (generic-setup global-main)
-  (generic-setup global-alt-as-meta)
-  (setup-global global-main #:alt-as-meta-keymap global-alt-as-meta)
-  (define (get-global) global)
-  
-  (define file (make-object aug-keymap%))
-  (define file-alt-as-meta (make-object aug-keymap%))
-  (generic-setup file)
-  (setup-file file #:alt-as-meta-keymap file-alt-as-meta)
-  (define (-get-file) file)
-  
-  (define search (make-object aug-keymap%))
-  (define search-alt-as-meta (make-object aug-keymap%))
-  (generic-setup search)
-  (setup-search search #:alt-as-meta-keymap search-alt-as-meta)
-  (define (get-search) search)
-  
-  (define editor (make-object aug-keymap%))
-  (setup-editor editor)
-  (define (get-editor) editor)
-  
-  (preferences:set-default 'framework:alt-as-meta #f boolean?)
-  (define (adjust-alt-as-meta on?)
-    (send global-main remove-chained-keymap global-alt-as-meta)
-    (send file remove-chained-keymap file-alt-as-meta)
-    (send search remove-chained-keymap search-alt-as-meta)
-    (when on?
-      (send global-main chain-to-keymap global-alt-as-meta #f)
-      (send file chain-to-keymap file-alt-as-meta #f)
-      (send search chain-to-keymap search-alt-as-meta #f)))
-  (preferences:add-callback 'framework:alt-as-meta
-                            (λ (p v) (adjust-alt-as-meta v)))
-  (adjust-alt-as-meta (preferences:get 'framework:alt-as-meta))
-  
-  (define (call/text-keymap-initializer thunk)
-    (let ([ctki (current-text-keymap-initializer)])
-      (parameterize ([current-text-keymap-initializer
-                      (λ (keymap)
-                        (send keymap chain-to-keymap global #t)
-                        (ctki keymap))])
-        (thunk))))
-
-  (define (region-click text event f)
-    (region-click/internal text event 
-                           (λ (click-pos eol start end) (f click-pos eol))))
-  
-  (define (region-click/internal text event f)
-    (when (and (is-a? event mouse-event%)
-               (send event button-down?)
-               (is-a? text text%))
-      (define x-box (box (send event get-x)))
-      (define y-box (box (send event get-y)))
-      (define eol-box (box #f))
-      (send text global-to-local x-box y-box)
-      (define click-pos (send text find-position 
-                              (unbox x-box)
-                              (unbox y-box)
-                              eol-box))
-      (define start-pos (send text get-start-position))
-      (define end-pos (send text get-end-position))
-      (define eol (unbox eol-box))
-      (if (< start-pos click-pos)
-          (f click-pos eol start-pos click-pos)
-          (f click-pos eol click-pos end-pos)))))
-
-(define (widen-unicode-ascii-art-box t orig-pos)
-  (define start-pos (scan-for-start-pos t orig-pos))
-  (when start-pos 
-    (send t begin-edit-sequence)
-    (define-values (start-x start-y) (pos->xy t orig-pos))
-    (define min-y #f)
-    (define max-y #f)
-    (trace-unicode-ascii-art-box 
-     t start-pos #f 
-     (λ (pos x y i-up? i-dn? i-lt? i-rt?)
-       (when (= x start-x)
-         (unless min-y
-           (set! min-y y)
-           (set! max-y y))
-         (set! min-y (min y min-y))
-         (set! max-y (max y max-y)))))
-    (define to-adjust 0)
-    (for ([y (in-range max-y (- min-y 1) -1)])
-      (define-values (pos char) (xy->pos t start-x y))
-      (when (< pos start-pos)
-        (set! to-adjust (+ to-adjust 1)))
-      (send t insert 
-            (cond
-              [(member char lt-chars) #\═]
-              [else #\space])
-            pos pos))
-    (send t set-position (+ orig-pos to-adjust 1) (+ orig-pos to-adjust 1))
-    (send t end-edit-sequence)))
-
-(define (normalize-unicode-ascii-art-box t pos)
-  (define start-pos (scan-for-start-pos t pos))
-  (when start-pos
-    (send t begin-edit-sequence)
-    (trace-unicode-ascii-art-box 
-     t start-pos #f 
-     (λ (pos x y i-up? i-dn? i-lt? i-rt?)
-       (cond
-         [(and i-up? i-dn? i-lt? i-rt?) (set-c t pos "╬")]
-         [(and i-dn? i-lt? i-rt?)       (set-c t pos "╦")]
-         [(and i-up? i-lt? i-rt?)       (set-c t pos "╩")]
-         [(and i-up? i-dn? i-rt?)       (set-c t pos "╠")]
-         [(and i-up? i-dn? i-lt?)       (set-c t pos "╣")]
-         [(and i-up? i-lt?)             (set-c t pos "╝")]
-         [(and i-up? i-rt?)             (set-c t pos "╚")]
-         [(and i-dn? i-lt?)             (set-c t pos "╗")]
-         [(and i-dn? i-rt?)             (set-c t pos "╔")]
-         [(or i-up? i-dn?)              (set-c t pos "║")]
-         [else                          (set-c t pos "═")])))
-     (send t end-edit-sequence)))
-
-(define (center-in-unicode-ascii-art-box txt insertion-pos)
-  (define (find-something start-pos inc char-p?)
-    (define-values (x y) (pos->xy txt start-pos))
-    (let loop ([pos start-pos])
-      (cond
-        [(char-p? (send txt get-character pos))
-         pos]
-        [else
-         (define new-pos (inc pos))
-         (cond
-           [(<= 0 new-pos (send txt last-position))
-            (define-values (x2 y2) (pos->xy txt new-pos))
-            (cond
-              [(= y2 y)
-               (loop new-pos)]
-              [else #f])]
-           [else #f])])))
-  
-  (define (adjust-space before-space after-space pos)
-    (cond
-      [(< before-space after-space) 
-       (send txt insert (make-string (- after-space before-space) #\space) pos pos)]
-      [(> before-space after-space) 
-       (send txt delete pos (+ pos (- before-space after-space)))]))
-  
-  (define left-bar (find-something insertion-pos sub1 (λ (x) (equal? x #\║))))
-  (define right-bar (find-something insertion-pos add1 (λ (x) (equal? x #\║))))
-  (when (and left-bar right-bar (< left-bar right-bar))
-    (define left-space-edge (find-something (+ left-bar 1) add1 (λ (x) (not (char-whitespace? x)))))
-    (define right-space-edge (find-something (- right-bar 1) sub1 (λ (x) (not (char-whitespace? x)))))
-    (when (and left-space-edge right-space-edge)
-      (define before-left-space-count (- left-space-edge left-bar 1))
-      (define before-right-space-count (- right-bar right-space-edge 1))
-      (define tot-space (+ before-left-space-count before-right-space-count))
-      (define after-left-space-count (floor (/ tot-space 2)))
-      (define after-right-space-count (ceiling (/ tot-space 2)))
-      (send txt begin-edit-sequence)
-      (adjust-space before-right-space-count after-right-space-count (+ right-space-edge 1))
-      (adjust-space before-left-space-count after-left-space-count (+ left-bar 1))
-      (send txt end-edit-sequence))))
-
-(define (trace-unicode-ascii-art-box t start-pos only-double-barred-chars? f)
-  (define visited (make-hash))
-  (let loop ([pos start-pos])
-    (unless (hash-ref visited pos #f)
-      (hash-set! visited pos #t)
-      (define-values (x y) (pos->xy t pos))
-      (define c (send t get-character pos))
-      (define-values (up upc) (xy->pos t x (- y 1)))
-      (define-values (dn dnc) (xy->pos t x (+ y 1)))
-      (define-values (lt ltc) (xy->pos t (- x 1) y))
-      (define-values (rt rtc) (xy->pos t (+ x 1) y))
-      (define (interesting-dir? dir-c dir-chars) 
-        (or (and (not only-double-barred-chars?)
-                 (member dir-c adjustable-chars)
-                 (member c dir-chars))
-            (and (member dir-c double-barred-chars)
-                 (member c double-barred-chars))))
-      (define i-up? (interesting-dir? upc up-chars))
-      (define i-dn? (interesting-dir? dnc dn-chars))
-      (define i-lt? (interesting-dir? ltc lt-chars))
-      (define i-rt? (interesting-dir? rtc rt-chars))
-      (f pos x y i-up? i-dn? i-lt? i-rt?)
-      (when i-up? (loop up))
-      (when i-dn? (loop dn))
-      (when i-lt? (loop lt))
-      (when i-rt? (loop rt)))))
-
-(define (scan-for-start-pos t pos)
-  (define-values (x y) (pos->xy t pos))
-  (findf
-   (λ (p) (adj? t p))
-   (for*/list ([xadj '(0 -1)]
-               [yadj '(0 -1 1)])
-     (define-values (d dc) (xy->pos t (+ x xadj) (+ y yadj)))
-     d)))
-       
-(define (adj? t pos)
-  (and pos 
-       (member (send t get-character pos) 
-               adjustable-chars)))
-
-(define (set-c t pos s)
-  (unless (equal? (string-ref s 0) (send t get-character pos))
-    (send t delete pos (+ pos 1))
-    (send t insert s pos pos)))
-
-(define (pos->xy text pos)
-  (define para (send text position-paragraph pos))
-  (define start (send text paragraph-start-position para))
-  (values (- pos start) para))
-
-(define (xy->pos text x y)
-  (cond
-    [(and (<= 0 x) (<= 0 y (send text last-paragraph)))
-     (define para-start (send text paragraph-start-position y))
-     (define para-end (send text paragraph-end-position y))
-     (define pos (+ para-start x))
-     (define res-pos
-       (and (< pos para-end)
-            ;; the newline at the end of the
-            ;; line is not on the line, so use this guard
-            pos))
-     (if res-pos
-         (values res-pos (send text get-character res-pos))
-         (values #f #f))]
-    [else (values #f #f)]))
-
-(module+ test
-  (require rackunit 
-           racket/gui/base)
-  (define sa string-append)
-  
-  (define (first-value-xy->pos a b c)
-    (define-values (d e) (xy->pos a b c))
-    d)
-  
-  (let ([t (new text%)])
-    (send t insert (sa "abc\n"
-                       "d\n"
-                       "ghi\n"))
-    (check-equal? (first-value-xy->pos t 0 0) 0)
-    (check-equal? (first-value-xy->pos t 1 0) 1)
-    (check-equal? (first-value-xy->pos t 0 1) 4)
-    (check-equal? (first-value-xy->pos t 3 0) #f)
-    (check-equal? (first-value-xy->pos t 0 3) #f)
-    (check-equal? (first-value-xy->pos t 1 1) #f)
-    (check-equal? (first-value-xy->pos t 2 1) #f)
-    (check-equal? (first-value-xy->pos t 0 2) 6)
-    (check-equal? (first-value-xy->pos t 1 2) 7)
-    (check-equal? (first-value-xy->pos t 2 -1) #f)
-    (check-equal? (first-value-xy->pos t -1 0) #f)
-    (check-equal? (first-value-xy->pos t 2 2) 8)
-    (check-equal? (first-value-xy->pos t 2 3) #f))
-  
-  (let ([t (new text%)])
-    (send t insert (sa "abc\n"
-                       "d\n"
-                       "ghi"))
-    (check-equal? (first-value-xy->pos t 2 2) 8)
-    (check-equal? (first-value-xy->pos t 2 3) #f))
-  
-  (let ([t (new text%)])
-    (send t insert (string-append "+-+\n"
-                                  "| |\n"
-                                  "+-+\n"))
-    (normalize-unicode-ascii-art-box t 0)
-    (check-equal? (send t get-text)
-                  (string-append
-                   "╔═╗\n"
-                   "║ ║\n"
-                   "╚═╝\n")))
-  
-  (let ([t (new text%)])
-    (send t insert (string-append "+=+\n"
-                                  "| |\n"
-                                  "+=+\n"))
-    (normalize-unicode-ascii-art-box t 0)
-    (check-equal? (send t get-text)
-                  (string-append
-                   "╔═╗\n"
-                   "║ ║\n"
-                   "╚═╝\n")))
-  
-  (let ([t (new text%)])
-    (send t insert (string-append "+-+-+\n"
-                                  "| | |\n"
-                                  "+-+-+\n"
-                                  "| | |\n"
-                                  "+-+-+\n"))
-    (normalize-unicode-ascii-art-box t 0)
-    (check-equal? (send t get-text)
-                  (string-append
-                   "╔═╦═╗\n"
-                   "║ ║ ║\n"
-                   "╠═╬═╣\n"
-                   "║ ║ ║\n"
-                   "╚═╩═╝\n")))
-  
-  (let ([t (new text%)])
-    (send t insert (string-append
-                    "╔═══╗\n"
-                    "║ - ║\n"
-                    "╚═══╝\n"))
-    
-    (normalize-unicode-ascii-art-box t 0)
-    (check-equal? (send t get-text)
-                  (string-append
-                   "╔═══╗\n"
-                   "║ - ║\n"
-                   "╚═══╝\n")))
-  
-  (let ([t (new text%)])
-    (send t insert (string-append
-                    "╔═╦═╗\n"
-                    "║ ║ ║\n"
-                    "╠═╬═╣\n"
-                    "║ ║ ║\n"
-                    "╚═╩═╝\n"))
-    (send t set-position 1 1)
-    (widen-unicode-ascii-art-box t 1)
-    (check-equal? (send t get-start-position) 2)
-    (check-equal? (send t get-text)
-                  (string-append
-                   "╔══╦═╗\n"
-                   "║  ║ ║\n"
-                   "╠══╬═╣\n"
-                   "║  ║ ║\n"
-                   "╚══╩═╝\n")))
-  
-  (let ([t (new text%)])
-    (send t insert (string-append
-                    "╔═╦═╗\n"
-                    "║ ║ ║\n"
-                    "╠═╬═╣\n"
-                    "║ ║ ║\n"
-                    "╚═╩═╝\n"))
-    (send t set-position 8 8)
-    (widen-unicode-ascii-art-box t 8)
-    (check-equal? (send t get-start-position) 10)
-    (check-equal? (send t get-text)
-                  (string-append
-                   "╔══╦═╗\n"
-                   "║  ║ ║\n"
-                   "╠══╬═╣\n"
-                   "║  ║ ║\n"
-                   "╚══╩═╝\n")))
-  
-  (let ([t (new text%)])
-    (send t insert (string-append
-                    "╔═╦═╗\n"
-                    "║ ║ ║\n"
-                    "╠═╬═╣\n"
-                    "║ ║ ║\n"))
-    (send t set-position 8 8)
-    (widen-unicode-ascii-art-box t 8)
-    (check-equal? (send t get-text)
-                  (string-append
-                   "╔══╦═╗\n"
-                   "║  ║ ║\n"
-                   "╠══╬═╣\n"
-                   "║  ║ ║\n")))
-  
-  (let ([t (new text%)])
-    (send t insert "║ x   ║\n")
-    (center-in-unicode-ascii-art-box t 1)
-    (check-equal? (send t get-text)
-                  "║  x  ║\n"))
-  
-  (let ([t (new text%)])
-    (send t insert "║x    ║\n")
-    (center-in-unicode-ascii-art-box t 1)
-    (check-equal? (send t get-text)
-                  "║  x  ║\n"))
-  
-  (let ([t (new text%)])
-    (send t insert "║    x║\n")
-    (center-in-unicode-ascii-art-box t 1)
-    (check-equal? (send t get-text)
-                  "║  x  ║\n"))
-  
-  (let ([t (new text%)])
-    (send t insert "║abcde║\n")
-    (center-in-unicode-ascii-art-box t 1)
-    (check-equal? (send t get-text)
-                  "║abcde║\n"))
-  
-  (let ([t (new text%)])
-    (send t insert "║║\n")
-    (center-in-unicode-ascii-art-box t 1)
-    (check-equal? (send t get-text)
-                  "║║\n"))
-  
-  (let ([t (new text%)])
-    (send t insert "║abcde \n")
-    (center-in-unicode-ascii-art-box t 1)
-    (check-equal? (send t get-text)
-                  "║abcde \n"))
-  
-  (let ([t (new text%)])
-    (send t insert " abcde║\n")
-    (center-in-unicode-ascii-art-box t 1)
-    (check-equal? (send t get-text)
-                  " abcde║\n"))
-  
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/logging-timer.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/logging-timer.rkt
deleted file mode 100644
index 0c9ad724e2..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/logging-timer.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base
-         racket/class
-         (for-syntax racket/base))
-
-(define timeline-logger (make-logger 'timeline (current-logger)))
-
-(provide logging-timer%
-         (struct-out timeline-info)
-         log-timeline)
-
-(define logging-timer%
-  (class timer%
-    (init notify-callback)
-    (define name (object-name notify-callback))
-    (define wrapped-notify-callback
-      (λ ()
-        (log-timeline
-         (format "~a timer fired" name)
-         (notify-callback))))
-    (super-new [notify-callback wrapped-notify-callback])
-    (define/override (start msec [just-once? #f])
-      (log-timeline (format "~a timer started; msec ~s just-once? ~s" name msec just-once?))
-      (super start msec just-once?))))
-
-
-(define-syntax (log-timeline stx)
-  (syntax-case stx ()
-    [(_ info-string expr)
-     #'(log-timeline/proc 
-        (and (log-level? timeline-logger 'debug)
-             info-string)
-        (λ () expr))]
-    [(_ info-string)
-     #'(log-timeline/proc 
-        (and (log-level? timeline-logger 'debug)
-             info-string)
-        #f)]))
-
-(define (log-timeline/proc info expr)
-  (define start-time (current-inexact-milliseconds))
-  (when info
-    (log-message timeline-logger 'debug 
-                 (format "~a start" info)
-                 (timeline-info (if expr 'start 'once)
-                                (current-process-milliseconds)
-                                start-time)))
-  (when expr 
-    (begin0
-      (expr)
-      (when info
-        (define end-time (current-inexact-milliseconds))
-        (log-message timeline-logger 'debug 
-                     (format "~a   end; delta ms ~a" info (- end-time start-time))
-                     (timeline-info start-time
-                                    end-time
-                                    (current-inexact-milliseconds)))))))
-
-
-;; what : (or/c 'start 'once flonum)
-;;    flonum means that this is an 'end' event and there should be
-;;    a start event corresponding to it with that milliseconds 
-;; process-milliseconds : fixnum
-;; milliseconds : flonum -- time of this event
-(struct timeline-info (what process-milliseconds milliseconds) #:transparent)
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/main.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/main.rkt
deleted file mode 100644
index 09a4318fb0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/main.rkt
+++ /dev/null
@@ -1,608 +0,0 @@
-#lang racket/unit
-(require racket/class
-         racket/contract
-         racket/list
-         "sig.rkt"
-         "../preferences.rkt"
-         mred/mred-sig)
-
-(import mred^
-        [prefix preferences: framework:preferences^]
-        [prefix exit: framework:exit^]
-        [prefix group: framework:group^]
-        [prefix handler: framework:handler^]
-        [prefix editor: framework:editor^]
-        [prefix color-prefs: framework:color-prefs^]
-        [prefix racket: framework:racket^]
-        [prefix early-init: framework:early-init^]
-        [prefix color: framework:color^])
-(export framework:main^)
-(init-depend framework:preferences^ framework:exit^ framework:editor^
-             framework:color-prefs^ framework:racket^ framework:early-init^)
-
-(preferences:low-level-get-preference preferences:get-preference/gui)
-(preferences:low-level-put-preferences preferences:put-preferences/gui)
-
-(application-preferences-handler (λ () (preferences:show-dialog)))
-
-(preferences:set-default 'framework:color-scheme 'classic symbol?)
-
-(preferences:set-default 'framework:column-guide-width
-                         '(#f 102)
-                         (list/c boolean? (and/c exact-integer? (>=/c 2))))
-
-(preferences:set-default 'framework:aspell-dict #f (λ (x) (or (not x) (string? x))))
-
-(preferences:set-default 'framework:line-spacing-add-gap?
-                         (not (eq? (system-type) 'windows))
-                         boolean?)
-
-;; used to time how long it takes to set a preference; the value is not actually used.
-(preferences:set-default 'drracket:prefs-debug #f (λ (x) #t))
-
-;; 'framework:spell-check-on? is only for people who had set
-;; prefs in old versions; it isn't used except to provide the
-;; default values for the newer prefs: 'framework:spell-check-strings?
-;; and 'framework:spell-check-text?
-(preferences:set-default 'framework:spell-check-on? #f boolean?)
-(preferences:set-default 'framework:spell-check-strings? 
-                         (preferences:get 'framework:spell-check-on?)
-                         boolean?)
-(preferences:set-default 'framework:spell-check-text?
-                         (preferences:get 'framework:spell-check-on?)
-                         boolean?)
-
-(preferences:set-default 'framework:always-use-platform-specific-linefeed-convention #f boolean?)
-
-(preferences:set-default 'framework:overwrite-mode-keybindings #f boolean?)
-
-(preferences:set-default 'framework:ask-about-paste-normalization #t boolean?)
-(preferences:set-default 'framework:do-paste-normalization #t boolean?)
-
-(preferences:set-default 'framework:replace-visible? #f boolean?)
-(preferences:set-default 'framework:anchored-search #f boolean?)
-
-(let ([search/replace-string-predicate
-       (λ (l) 
-         (and (list? l)
-              (andmap 
-               (λ (x) (or (string? x) (is-a? x snip%)))
-               l)))])
-  (preferences:set-default 'framework:search-string 
-                           '() 
-                           search/replace-string-predicate)
-  (preferences:set-default 'framework:replace-string 
-                           '() 
-                           search/replace-string-predicate))
-
-;; marshalling for this one will just lose information. Too bad.
-(preferences:set-un/marshall 'framework:search-string 
-                             (λ (l)
-                               (map (λ (x) 
-                                      (if (is-a? x snip%)
-                                          (send x get-text 0 (send x get-count))
-                                          x))
-                                    l))
-                             values)
-
-(preferences:set-default 'framework:paren-color-scheme 'basic-grey symbol?)
-  
-(define cond/offset-defaults
-  '(("case-lambda" 0)
-    ("match-lambda" 0)
-    ("match-lambda*" 0)
-    ("cond" 0)
-    ("field" 0)
-    ("provide/contract" 0)
-    ("match" 1)
-    ("new" 1)
-    ("case" 1)
-    ("datum-case" 1)
-    ("match" 1)
-    ("match*" 1)
-    ("syntax-rules" 1)
-    ("syntax-case" 2)
-    ("syntax-case*" 3)
-    ("kernel-syntax-case" 2)
-    ("kernel-syntax-case*" 3)))
-(preferences:set-default 'framework:square-bracket:cond/offset
-                         cond/offset-defaults
-                         (listof (list/c string? exact-nonnegative-integer?)))
-
-(preferences:set-un/marshall
- 'framework:square-bracket:cond/offset
- (λ (val) 
-   (define deletions (for/list ([line (in-list cond/offset-defaults)]
-                                #:unless (ormap (λ (val-line)
-                                                  (equal? (car line) (car val-line)))
-                                                val))
-                       (list-ref line 0)))
-   (define additions/changes (for/list ([line (in-list val)]
-                                        #:when (not (member line cond/offset-defaults)))
-                               line))
-   (list additions/changes deletions))
- (λ (marsh)
-   (cond
-     [((listof (list/c string? exact-nonnegative-integer?)) marsh)
-      ;; old style prefs: don't try to find any deletions, as they are
-      ;; probably caused by a stale defaults setting
-      (define ht (make-hash (map (λ (x) (cons (list-ref x 0) (list-ref x 1))) cond/offset-defaults)))
-      (for ([line (in-list marsh)])
-        (hash-set! ht (list-ref line 0) (list-ref line 1)))
-      (hash-map ht list)]
-     [((list/c (listof (list/c string? exact-nonnegative-integer?)) (listof string?)) marsh)
-      ;; new style-pref
-      (define additions/changes (list-ref marsh 0))
-      (define deletions (list-ref marsh 1))
-      (define ht (make-hash (map (λ (x) (cons (list-ref x 0) (list-ref x 1))) cond/offset-defaults)))
-      (for ([del (in-list deletions)])
-        (hash-remove! ht del))
-      (for/list ([line (in-list additions/changes)])
-        (hash-set! ht (list-ref line 0) (list-ref line 1)))
-      (hash-map ht list)])))
-
- 
-(define (set-square-bracket-nonum-pref pref-sym defaults)
-  (preferences:set-default pref-sym defaults (listof string?))
-  (preferences:set-un/marshall 
-   pref-sym
-   (λ (val)
-     (define additions '())
-     (define deletions '())
-     (for ([itm (in-list val)])
-       (unless (member itm defaults)
-         (set! additions (cons itm additions))))
-     (for ([def (in-list defaults)])
-       (unless (member def val)
-         (set! deletions (cons def deletions))))
-     (list additions deletions))
-   (λ (marshed)
-     (cond
-       [((listof string?) marshed)
-        ;; this is the old preference; in this case
-        ;; we ignore any deletions while unmarshalling
-        ;; as those are likely caused by a defaults
-        ;; set that got bigger
-        (remove-duplicates (append marshed defaults))]
-       [((list/c (listof string?) (listof string?)) marshed)
-        (define additions (list-ref marshed 0))
-        (define deletions (list-ref marshed 1))
-        (append additions (remove* deletions defaults))]))))
-  
-(set-square-bracket-nonum-pref 'framework:square-bracket:local
-                               '("local"))
-
-(define all-fors
-  (let ()
-    (define base-fors
-      '(for for/list for/hash for/hasheq for/hasheqv for/and for/or 
-         for/lists for/first for/last for/vector for/flvector
-         for/sum for/product for/set))
-    (define untyped-fors
-      (append base-fors
-              (map (λ (x) (string->symbol (regexp-replace #rx"^for" (symbol->string x) "for*")))
-                   base-fors)))
-    (define all-fors
-      (append untyped-fors
-              (map (λ (x) (string->symbol (string-append (symbol->string x) ":")))
-                   untyped-fors)))
-    all-fors))
-
-(define for/folds '("for/fold" "for/fold:" "for*/fold" "for*/fold:"))
-(set-square-bracket-nonum-pref 'framework:square-bracket:letrec
-                               (append (map symbol->string all-fors)
-                                       for/folds
-                                       '("let" 
-                                         "let*" "let-values" "let*-values"
-                                         "let-syntax" "let-struct" "let-syntaxes"
-                                         "match-let" "match-let*" "match-letrec"
-                                         "letrec"
-                                         "letrec-syntaxes" "letrec-syntaxes+values" "letrec-values"
-                                         "parameterize" "parameterize*"
-                                         "with-syntax" "with-handlers")))
-
-(set-square-bracket-nonum-pref 'framework:square-bracket:for/fold for/folds)
-
-(preferences:set-default 'framework:white-on-black? #f boolean?)
-
-(preferences:set-default 'framework:case-sensitive-search?
-                         #f
-                         boolean?)
-(color-prefs:add-color-scheme-entry 'framework:basic-canvas-background "white" "black")
-
-(preferences:set-default 'framework:special-meta-key #f boolean?)
-(preferences:add-callback 'framework:special-meta-key (λ (p v) (map-command-as-meta-key v)))
-(map-command-as-meta-key (preferences:get 'framework:special-meta-key))
-
-(preferences:set-default 'framework:fraction-snip-style 
-                         'mixed (λ (x) (memq x '(mixed improper decimal))))
-
-(preferences:set-default 'framework:standard-style-list:font-name
-                         (cond
-                           [(equal? (system-type) 'macosx)
-                            (define preferred-font "Menlo")
-                            (define fl (get-face-list))
-                            (if (member preferred-font fl)
-                                preferred-font
-                                (get-family-builtin-face 'modern))]
-                           [else (get-family-builtin-face 'modern)])
-                         string?)
-
-(preferences:set-default
- 'framework:standard-style-list:font-size
- (vector (hash)
-         (let* ([txt (make-object text%)]
-                [stl (send txt get-style-list)]
-                [bcs (send stl basic-style)])
-           (send bcs get-size)))
- (vector/c 
-  ;; font sizes for specific monitor configurations
-  (hash/c 
-   ;; a particular monitor configuration: the widths and heights
-   (non-empty-listof (list/c exact-nonnegative-integer? 
-                             exact-nonnegative-integer?))
-   ;; the font size for that configuration
-   exact-nonnegative-integer?
-   #:flat? #t)
-  ;; default font size, when none of the configs above apply
-  exact-nonnegative-integer?
-  #:flat? #t))
-
-(preferences:set-un/marshall
- 'framework:standard-style-list:font-size
- values
- (λ (x)
-   (if (exact-nonnegative-integer? x)
-       ;; coerce old pref settings to new
-       (vector (hash) x)
-       x)))
-
-(preferences:set-default
- 'framework:standard-style-list:smoothing
- 'default
- (λ (x) 
-   (memq x '(unsmoothed partly-smoothed smoothed default))))
-
-(editor:set-standard-style-list-pref-callbacks)
-
-(let ([gray-level
-       ;; old gray-level 192
-       (if (eq? (system-type) 'windows)
-           (* 3/4 256)
-           (- (* 7/8 256) 1))])
-  (define default-color (make-object color% 0 0 0 (- 1. (/ gray-level 255))))
-  (define w-o-b-default-color (make-object color% 255 255 255 (/ 50 255)))
-  (color-prefs:add-color-scheme-entry 'framework:paren-match-color
-                                      default-color
-                                      w-o-b-default-color)
-  
-  ;; when the preference is currently set to the old color,
-  ;; then just update it to the new one (if someone really
-  ;; wants the old default, they can still have a color that is
-  ;; off by one from the old default which should be ok)
-  (define current-color (color-prefs:lookup-in-color-scheme 'framework:paren-match-color))
-  (cond
-    [(and (= (send current-color red) gray-level)
-          (= (send current-color green) gray-level)
-          (= (send current-color blue) gray-level)
-          (= (send current-color alpha) 1.0))
-     (color-prefs:set-in-color-scheme 'framework:paren-match-color default-color)]
-    [(and (= (send current-color red) 50)
-          (= (send current-color green) 50)
-          (= (send current-color blue) 50)
-          (= (send current-color alpha) 1.0))
-     (color-prefs:set-in-color-scheme 'framework:paren-match-color w-o-b-default-color)]))
-
-(preferences:set-default 'framework:recently-opened-files/pos 
-                         null 
-                         (λ (x) (and (list? x) 
-                                     (andmap
-                                      (λ (x) 
-                                        (and (list? x)
-                                             (= 3 (length x))
-                                             (path? (car x))
-                                             (number? (cadr x))
-                                             (number? (caddr x))))
-                                      x))))
-
-(preferences:set-un/marshall
- 'framework:recently-opened-files/pos
- (λ (l) (map (λ (ele) (cons (path->bytes (car ele)) (cdr ele))) l))
- (λ (l) 
-   (let/ec k
-     (unless (list? l)
-       (k '()))
-     (map (λ (x)
-            (unless (and (list? x)
-                         (= 3 (length x))
-                         (bytes? (car x))
-                         (number? (cadr x))
-                         (number? (caddr x)))
-              (k '()))
-            (cons (bytes->path (car x)) (cdr x)))
-          l))))
-
-(preferences:set-default 'framework:last-directory 
-                         (find-system-path 'doc-dir) 
-                         (λ (x) (or (not x) path-string?)))
-
-(preferences:set-un/marshall 'framework:last-directory 
-                             (λ (x) (and (path? x) (path->bytes x)))
-                             (λ (x)
-                               (and (bytes? x)
-                                    (bytes->path x))))
-
-(preferences:set-default 'framework:recent-max-count 
-                         50 
-                         (λ (x) (and (number? x)
-                                     (x . > . 0) 
-                                     (integer? x))))
-(preferences:add-callback
- 'framework:recent-max-count
- (λ (p v)
-   (handler:size-recently-opened-files v)))
-
-(preferences:set-default 'framework:last-url-string "" string?)
-(preferences:set-default 'framework:recently-opened-sort-by 'age 
-                         (λ (x) (or (eq? x 'age) (eq? x 'name))))
-(preferences:set-default 'framework:recent-items-window-w 400 number?)
-(preferences:set-default 'framework:recent-items-window-h 600 number?)
-(preferences:set-default 'framework:show-delegate? #f boolean?)
-(preferences:set-default 'framework:windows-mdi #f boolean?)
-(preferences:set-default 'framework:menu-bindings #t boolean?)
-(preferences:set-default 'framework:verify-change-format #f boolean?)
-(preferences:set-default 'framework:auto-set-wrap? #f boolean?)
-(preferences:set-default 'framework:display-line-numbers #t boolean?)
-(preferences:set-default 'framework:show-status-line #t boolean?)
-(preferences:set-default 'framework:col-offsets #f boolean?)
-
-(preferences:set-default
- 'framework:print-output-mode
- 'standard
- (λ (x) (or (eq? x 'standard) (eq? x 'postscript) (eq? x 'pdf))))
-
-(preferences:set-default 'framework:highlight-parens #t boolean?)
-(preferences:set-default 'framework:fixup-parens #t boolean?)
-(preferences:set-default 'framework:fixup-open-parens #f boolean?)
-(preferences:set-default 'framework:paren-match #t boolean?)
-(let ([defaults-ht (make-hasheq)])
-  (for-each (λ (x) (hash-set! defaults-ht x 'for/fold))
-            '(for/fold for/fold: for*/fold for*/fold:))
-  (for-each (λ (x) (hash-set! defaults-ht x 'define))
-            '(struct
-              local
-                     
-              struct: define-struct: define-typed-struct define-struct/exec:
-              define: pdefine:
-              define-type define-predicate
-              match-define))
-  (for-each (λ (x) (hash-set! defaults-ht x 'begin))
-            '(case-lambda case-lambda: pcase-lambda:
-               match-lambda match-lambda*
-               syntax-parser
-               cond
-               delay
-               unit compound-unit compound-unit/sig
-               public private override require
-               inherit sequence))
-  (for-each (λ (x) (hash-set! defaults-ht x 'lambda))
-            `(
-              cases
-                 instantiate super-instantiate
-               syntax/loc quasisyntax/loc
-               match match* match-let match-let* match-letrec
-               
-               λ lambda let let* letrec recur
-               lambda/kw
-               letrec-values
-               with-syntax with-syntax*
-               with-continuation-mark
-               module module* module+
-               match match-let match-let* match-letrec
-               let/cc let/ec letcc catch
-               let-syntax letrec-syntax fluid-let-syntax letrec-syntaxes+values
-               
-               let: letrec: let*:
-               let-values: letrec-values: let*-values:
-               let/cc: let/ec:
-               lambda: λ:
-               plambda: opt-lambda: popt-lambda:
-
-               splicing-let splicing-letrec splicing-let-values
-               splicing-letrec-values splicing-let-syntax
-               splicing-letrec-syntax splicing-let-syntaxes
-               splicing-letrec-syntaxes splicing-letrec-syntaxes+values
-               splicing-local splicing-syntax-parameterize
-
-               ,@all-fors
-
-               do:
-               
-               kernel-syntax-case
-               syntax-case syntax-case* syntax-rules syntax-id-rules
-               syntax-parse
-               let-signature fluid-let
-               let-struct let-macro let-values let*-values
-               case when unless 
-               let-enumerate
-               class class* class-asi class-asi* class*/names
-               class100 class100* class100-asi class100-asi* class100*/names
-               rec
-               make-object mixin
-               define-some do opt-lambda
-               send* with-method
-               define-record
-               catch shared
-               unit/sig unit/lang
-               with-handlers
-               interface
-               parameterize parameterize*
-               call-with-input-file call-with-input-file* with-input-from-file
-               with-input-from-port call-with-output-file
-               with-output-to-file with-output-to-port 
-
-	       for-all
-               
-               type-case))
-  (preferences:set-default 
-   'framework:tabify
-   (list defaults-ht #rx"^begin" #rx"^def" #f #f)
-   (list/c (hash/c symbol? (or/c 'for/fold 'define 'begin 'lambda) #:flat? #t)
-           (or/c #f regexp?) (or/c #f regexp?) (or/c #f regexp?) (or/c #f regexp?)))
-  
-  (define old-style-pred? (listof (list/c symbol? symbol?)))
-  (define new-style-pred?
-    (list/c (listof (list/c symbol? symbol?))   ;; additions to defaults
-            (listof (list/c symbol? symbol?)))) ;; deletions
-  
-  (define pref-pred?
-    (or/c (list/c new-style-pred? 
-                  (or/c regexp? #f)
-                  (or/c regexp? #f)
-                  (or/c regexp? #f)
-                  (or/c regexp? #f))
-          (list/c (or/c old-style-pred? new-style-pred?)                  
-                  (or/c regexp? #f)
-                  (or/c regexp? #f)
-                  (or/c regexp? #f))))
-  
-  (define (ht->addition/deletion-lists ht)
-    (define additions '())
-    (define deletions '())
-    (for ([(k v) (in-hash ht)])
-      (unless (hash-ref defaults-ht k #f)
-        (set! additions (cons (list k v) additions))))
-    (for ([(k v) (in-hash defaults-ht)])
-      (unless (hash-ref ht k #f)
-        (set! deletions (cons (list k v) deletions))))
-    (list additions deletions))
-  
-  (define (addition/deletion-lists->ht lsts)
-    (define additions (list-ref lsts 0))
-    (define deletions (list-ref lsts 1))
-    (define ht (hash-copy defaults-ht))
-    (for ([pr (in-list deletions)])
-      (define k (list-ref pr 0))
-      (define v (list-ref pr 1))
-      (when (equal? (hash-ref ht k #f) v)
-        (hash-remove! ht k)))
-    (for ([pr (in-list additions)])
-      (define k (list-ref pr 0))
-      (define v (list-ref pr 1))
-      (hash-set! ht k v))
-    ht)
-  
-  (define (pad-to len lst)
-    (cond
-      [(null? lst) (build-list len (λ (x) #f))]
-      [else (cons (car lst) (pad-to (- len 1) (cdr lst)))]))
-  
-  (preferences:set-un/marshall
-   'framework:tabify 
-   (λ (t) (cons (ht->addition/deletion-lists (list-ref t 0))
-                (cdr t)))
-   (λ (l) 
-     (and (pref-pred? l)
-          (cond
-            [(old-style-pred? (list-ref l 0))
-             ;; when migrating prefs from the old style,
-             ;; get rid of any apparent deletions, as
-             ;; they are likely unintentional, a result 
-             ;; of moving defaults
-             (define h (make-hasheq))
-             (for-each (λ (x) (apply hash-set! h x)) (list-ref l 0))
-             (define lsts (ht->addition/deletion-lists h))
-             (cons (addition/deletion-lists->ht (list (list-ref l 0)
-                                                      '()))
-                   (cdr l))]
-            [else 
-             (cons (addition/deletion-lists->ht (list-ref l 0))
-                   (pad-to 4 (cdr l)))])))))
-
-
-(preferences:set-default 'framework:autosave-delay 30 number?)
-(preferences:set-default 'framework:autosaving-on? #t boolean?)
-(preferences:set-default 'framework:backup-files? #t boolean?)
-(preferences:set-default 'framework:verify-exit #t boolean?)
-(preferences:set-default 'framework:delete-forward? #t boolean?)
-(preferences:set-default 'framework:show-periods-in-dirlist #f boolean?)
-(preferences:set-default 'framework:file-dialogs 'std
-                         (λ (x) (and (memq x '(common std)) #t)))
-
-(for ([line (in-list (racket:get-color-prefs-table))]
-      [white-on-black-line (in-list (racket:get-white-on-black-color-prefs-table))])
-  (define sym (car line))
-  (define color (cadr line))
-  (define white-on-black-color (cadr white-on-black-line))
-  (color-prefs:add-color-scheme-entry (racket:short-sym->pref-name sym)
-                                      #:style (racket:short-sym->style-name sym)
-                                      color
-                                      white-on-black-color))
-  
-(preferences:set-default 'framework:coloring-active #t boolean?)
-
-(color-prefs:add-color-scheme-entry 'framework:default-text-color "black" "white")
-(color-prefs:register-color-scheme-entry-change-callback
- 'framework:basic-canvas-background
- (λ (v)
-   (editor:set-default-font-color
-    (color-prefs:lookup-in-color-scheme 'framework:default-text-color)
-    v)))
-(color-prefs:register-color-scheme-entry-change-callback
- 'framework:default-text-color
- (λ (v)
-   (editor:set-default-font-color 
-    v 
-    (color-prefs:lookup-in-color-scheme 'framework:basic-canvas-background))))
-(editor:set-default-font-color 
- (color-prefs:lookup-in-color-scheme 'framework:default-text-color)
- (color-prefs:lookup-in-color-scheme 'framework:basic-canvas-background))
-
-(color-prefs:add-color-scheme-entry 'framework:misspelled-text-color "black" "white")
-
-(color-prefs:set-default/color-scheme 'framework:delegatee-overview-color
-                                      "light blue"
-                                      (make-object color% 62 67 155))
-
- 
-(let ([delta (make-object style-delta%)]
-      [style (send (editor:get-standard-style-list) find-named-style
-                   color:misspelled-text-color-style-name)])
-  (if style
-      (send style set-delta delta)
-      (send (editor:get-standard-style-list) new-named-style color:misspelled-text-color-style-name
-            (send (editor:get-standard-style-list) find-or-create-style
-                  (send (editor:get-standard-style-list) find-named-style "Standard")
-                  delta))))
-(let ([update-style-list
-       (λ (v)
-         (define sl (editor:get-standard-style-list))
-         (define style (send sl find-named-style color:misspelled-text-color-style-name))
-         (define delta (new style-delta%))
-         (send style get-delta delta)
-         (send delta set-delta-foreground v)
-         (send style set-delta delta))])
-  (color-prefs:register-color-scheme-entry-change-callback
-   'framework:misspelled-text-color
-   (λ (v) (update-style-list v)))
-  (update-style-list 
-   (color-prefs:lookup-in-color-scheme 'framework:misspelled-text-color)))
-
-;; groups
-
-(preferences:set-default 'framework:exit-when-no-frames #t boolean?)
-(unless (preferences:get 'framework:exit-when-no-frames)
-  (preferences:set 'framework:exit-when-no-frames #t))
-
-(exit:insert-can?-callback
- (λ ()
-   (send (group:get-the-frame-group) can-close-all?)))    
-
-(exit:insert-on-callback
- (λ ()
-   (send (group:get-the-frame-group) on-close-all)))
-
-;; reset these -- they are only for the test suite.
-;; they do not need to be set across starting up and shutting down
-;; the application.
-;(preferences:set 'framework:file-dialogs 'std)
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/mapdesc.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/mapdesc.rkt
deleted file mode 100644
index 00575cfebc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/mapdesc.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scheme/base
-
-(provide mapdesc)
-(require (for-syntax scheme/base)
-         scribble/decode
-         scribble/manual)
-
-(define-syntax (mapdesc stx)
-  (syntax-case stx ()
-    [(_ cmd events)
-     #'(make-splice (list (index (symbol->string 'cmd))
-                          (symbol->string 'cmd)
-                          " ("
-                          (symbol->string 'events)
-                          " events)"))]))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/menu.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/menu.rkt
deleted file mode 100644
index d50568d210..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/menu.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang scheme/unit
-  (require mzlib/class
-           "sig.rkt"
-           "../preferences.rkt"
-           mred/mred-sig)
-  
-  (import mred^)
-  (export framework:menu^)
-  
-  (define can-restore<%>
-    (interface (selectable-menu-item<%>)
-      restore-keybinding))
-  
-  (define can-restore-mixin
-    (mixin (selectable-menu-item<%>) (can-restore<%>)
-      (inherit set-shortcut get-shortcut)
-      (define saved-shortcut 'not-yet)
-      (define/public (restore-keybinding)
-        (unless (eq? saved-shortcut 'not-yet)
-          (set-shortcut saved-shortcut)))
-      
-      (super-new)
-      (set! saved-shortcut (get-shortcut))
-      (unless (preferences:get 'framework:menu-bindings)
-        (set-shortcut #f))))
-  
-  (define can-restore-underscore<%>
-    (interface (labelled-menu-item<%>)
-      erase-underscores
-      restore-underscores))
-  
-  (define can-restore-underscore-mixin
-    (mixin (labelled-menu-item<%>) (can-restore-underscore<%>)
-      (inherit get-label get-plain-label)
-      (define/override (set-label nl)
-        (super set-label nl)
-        (unless dont-save
-          (set! saved-label nl)
-          (unless (preferences:get 'framework:menu-bindings)
-            (erase-underscores))))
-      (define/public (erase-underscores)
-        (set! dont-save #t)
-        (set-label (get-plain-label))
-        (set! dont-save #f))
-      (define/public (restore-underscores)
-        (unless (eq? saved-label 'not-yet-saved-label)
-          (set! dont-save #t)
-          (set-label saved-label)
-          (set! dont-save #f)))
-      (define dont-save #f)
-      (define saved-label 'not-yet-saved-label)
-      (super-new)
-      (set! saved-label (get-label))
-      (unless (preferences:get 'framework:menu-bindings)
-        (erase-underscores))))
-  
-  (define can-restore-menu-item% (can-restore-mixin menu-item%))
-  (define can-restore-checkable-menu-item% (can-restore-mixin checkable-menu-item%))
-  (define can-restore-underscore-menu% (can-restore-underscore-mixin menu%))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/mode.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/mode.rkt
deleted file mode 100644
index 6256536a5c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/mode.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         racket/unit
-         racket/class
-         racket/surrogate
-         "sig.rkt")
-
-(provide mode@ surrogate-methods)
-
-(define-syntax (surrogate-methods stx)
-  (syntax-case stx ()
-    [(_ m)
-     #'(m (augment (void) on-change ())
-          (override on-char (event))
-          (override on-default-char (event))
-          (override on-default-event (event))
-          (augment (void) on-display-size ())
-          (augment (void) on-edit-sequence ())
-          (override on-event (event))
-          (override on-focus (on?))
-          (augment (void) on-load-file (filename format))
-          (override on-local-char (event))
-          (override on-local-event (event))
-          (override on-new-box (type))
-          (override on-new-image-snip (filename kind relative-path? inline?))
-          (override on-paint (before? dc left top right bottom dx dy draw-caret))
-          (augment (void) on-save-file (filename format))
-          (augment (void) on-snip-modified (snip modified?))
-          
-          (augment (void) on-change-style (start len))
-          (augment (void) on-delete (start len))
-          (augment (void) on-insert (start len))
-          (override on-new-string-snip ())
-          (override on-new-tab-snip ())
-          (augment (void) on-set-size-constraint ())
-          
-          (augment (void) after-change-style (start len))
-          (augment (void) after-delete (start len))
-          (augment (void) after-insert (start len))
-          (augment (void) after-set-position ())
-          (augment (void) after-set-size-constraint ())
-          (augment (void) after-edit-sequence ())
-          (augment (void) after-load-file (success?))
-          (augment (void) after-save-file (success?))
-          
-          (augment #t can-change-style? (start len))
-          (augment #t can-delete? (start len))
-          (augment #t can-insert? (start len))
-          (augment #t can-set-size-constraint? ())
-          (override can-do-edit-operation? (op) (op recursive?))
-          (augment #t can-load-file? (filename format))
-          (augment #t can-save-file? (filename format))
-          
-          (override put-file (directory default-name)))]))
-
-(define-unit mode@
-  (import)
-  (export framework:mode^)
-  
-  (define-values (host-text-mixin host-text<%> surrogate-text% surrogate-text<%>)
-    (surrogate-methods surrogate)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/number-snip.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/number-snip.rkt
deleted file mode 100644
index 56edc4c141..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/number-snip.rkt
+++ /dev/null
@@ -1,553 +0,0 @@
-#lang racket/unit
-
-  (require "sig.rkt"
-           mred/mred-sig
-           racket/class
-           "../preferences.rkt"
-           string-constants
-           file/convertible)
-  
-  (import mred^)
-  (export (rename framework:number-snip^
-                  [-snip-class% snip-class%]))
-  (init-depend mred^)
-  
-  ;; make-repeating-decimal-snip : number boolean -> snip
-  (define (make-repeating-decimal-snip number e-prefix?)
-    (new number-snip%
-      [number number]
-      [decimal-prefix (if e-prefix? "#e" "")]))
-  
-  ;; make-fraction-snip : number boolean -> snip
-  (define (make-fraction-snip number e-prefix?)
-    (let ([n (new number-snip%
-               [number number]
-               [decimal-prefix (if e-prefix? "#e" "")])])
-      (send n set-fraction-view (preferences:get 'framework:fraction-snip-style))
-      n))
-  
-  (define (set-box/f! b v) (when (box? b) (set-box! b v)))
-  (define bw? (< (get-display-depth) 3))
-  
-  (define -snip-class%
-    (class snip-class%
-      (define/override (read f)
-        (let* ([number (string->number (bytes->string/utf-8 (send f get-bytes)))]
-               [decimal-prefix (bytes->string/utf-8 (send f get-bytes))]
-               [fraction-bytes (send f get-bytes)]
-               [expansions (string->number (bytes->string/utf-8 (send f get-bytes)))]
-               [fraction-view
-                (cond
-                  [(equal? #"#t" fraction-bytes) 'decimal]
-                  [(equal? #"#f" fraction-bytes) 
-                   (preferences:get 'framework:fraction-snip-style)]
-                  [(equal? #"mixed" fraction-bytes) 'mixed]
-                  [(equal? #"decimal" fraction-bytes) 'decimal]
-                  [(equal? #"improper" fraction-bytes) 'improper])]
-               [snip
-                (new number-snip%
-                  [number number]
-                  [decimal-prefix decimal-prefix])])
-          (send snip iterate (max 0 (- expansions 1))) ;; one iteration is automatic
-          (send snip set-fraction-view fraction-view)
-          snip))
-      (super-new)))
-  
-  (define old-number-snipclass (new -snip-class%))
-  (send old-number-snipclass set-version 3)
-  (send old-number-snipclass set-classname "drscheme:number")
-  (send (get-the-snip-class-list) add old-number-snipclass)
-  
-  (define number-snipclass (new -snip-class%))
-  (send number-snipclass set-version 1)
-  (send number-snipclass set-classname (format "~s" '(lib "number-snip.ss" "drscheme" "private")))
-  (send (get-the-snip-class-list) add number-snipclass)
-  
-  (define arrow-cursor (make-object cursor% 'arrow))
-  
-  ;; cut-off : number
-  ;; indicates how many digits to fetch for each click
-  (define cut-off 25)
-
-  (define-local-member-name draw-fraction)
-  
-  (define number-snip-convertible<%>
-    (interface* ()
-                ([prop:convertible
-                  (λ (number-snip request default)
-                    (case request
-                      [(png-bytes) 
-                       (define dc (make-object bitmap-dc% (make-bitmap 1 1)))
-                       (define wb (box 0))
-                       (define hb (box 0))
-                       (send number-snip get-extent dc 0 0 wb hb #f #f #f #f)
-                       (define bm (make-bitmap (inexact->exact (ceiling (unbox wb))) 
-                                               (inexact->exact (ceiling (unbox hb)))))
-                       (send dc set-bitmap bm)
-                       (send number-snip draw-fraction dc 0 0)
-                       (define bp (open-output-bytes))
-                       (send bm save-file bp 'png)
-                       (get-output-bytes bp)]
-                      [(text)
-                       (send number-snip get-text 0 1)]
-                      [else default]))])))
-  
-  (define number-snip%
-    (class* snip% (readable-snip<%> number-snip-convertible<%>)
-      ;; number : number
-      ;; this is the number to show
-      (init-field number)
-      (define/public (get-number) number)
-      
-      ;; decimal-prefix : string
-      ;; this prefix is shown on the string when it is viewed in
-      ;; the decimal view
-      (init-field [decimal-prefix ""])
-      
-      ;; fraction-view : (union 'decimal 'mixed 'improper)
-      ;; this field holds the current view state
-      (field [fraction-view 'decimal])
-      
-      ;; these fields are for the drawing code for decimal printing
-      (field 
-       ;; clickable-portion : (union #f string)
-       [clickable-portion #f]
-       ;; unbarred-portion : string
-       [unbarred-portion ""]
-       ;; barred-portion : (union #f string)
-       [barred-portion #f])
-      
-      (field
-       ;; wholes/frac : string
-       ;; the whole-number portion of the number as a fraction
-       [wholes/frac
-        (cond
-          [(= (floor number) 0) ""]
-          [(= (ceiling number) 0) "-"]
-          [(< number 0)
-           (number->string (ceiling number))]
-          [else
-           (number->string (floor number))])])
-      
-      (field
-       ;; wholes/dec : string
-       ;; the whole-number portion of decimal expansion
-       [wholes/dec
-        (cond
-          [(= (floor number) 0) "0"]
-          [(= (ceiling number) 0) "-0"]
-          [(< number 0)
-           (number->string (ceiling number))]
-          [else
-           (number->string (floor number))])])
-      
-      ;; these fields are for the fractional printing view
-      (field
-       ;; nums : string
-       ;; the numerator of the mixed fraction, as a string
-       [nums (number->string (numerator (- (abs number) (floor (abs number)))))]
-       
-       ;; improper-nums : string
-       ;; the numerator of the improper fraction, as a string
-       [improper-nums (number->string (numerator (abs number)))]
-       
-       ;; mixed-prefix : string
-       ;; a prefix on the front of the mixed number (indicates if negative)
-       [improper-prefix (if (number . < . 0) "-" "")]
-       
-       ;; dens : string
-       ;; the denominator, as a string
-       [dens (number->string (denominator (- (abs number) (floor (abs number)))))])
-      
-      ;; these fields are for the decimal expansion calculation code
-      (field
-       [init-num (* 10 (numerator (- (abs number) (floor (abs number)))))]
-       [den (denominator (- (abs number) (floor (abs number))))])
-      
-      ;; ht : number -o> (cons digit number)
-      ;; this maps from divisors of the denominator to
-      ;; digit and new divisor pairs. Use this
-      ;; to read off the decimal expansion.
-      (field
-       [ht (make-hash)]
-       [expansions 0])
-      
-      ;; this field holds the state of the current computation
-      ;; of the numbers digits. If it is a number, it corresponds
-      ;; to the next starting divisor in the iteration.
-      ;; if it is #f, it means that the string of digits is
-      ;; fully computed.
-      (field [state init-num])
-      
-      ;; repeat : (union 'unk number #f)
-      ;; this field correlates with `state'. If `state' is a number,
-      ;; this field is 'unk. Otherwise, this is either a number of #f.
-      ;; #f indicates no repeat.
-      ;; a number indiates a repeat starting at `number' in `ht'.
-      (field [repeat 'unk])
-      
-      ;; set-fraction-view : (union 'mixed 'improper 'decimal) -> void
-      ;; sets the view based on the input
-      (define/public (set-fraction-view b)
-        (set! fraction-view b)
-        (let ([admin (get-admin)])
-          (when admin
-            (send admin resized this #t))))
-      
-      ;; get-fraction-view : -> (union 'mixed 'improper 'decimal)
-      ;; returns the current fraction view settings
-      (define/public (get-fraction-view) fraction-view)
-      
-      ;; iterate : number -> void
-      ;; computes the next sequence of digits (`n' times)
-      ;; and update the strings for GUI drawing
-      (define/public (iterate n)
-        (let loop ([n n])
-          (unless (zero? n)
-            (expand-number)
-            (loop (- n 1))))
-        (update-drawing-fields))
-      
-      (inherit get-admin)
-      
-      ;; iterate/reflow : -> void
-      ;; iterates the fraction and tells the administrator to redraw the numbers
-      (define/private (iterate/reflow)
-        (iterate 1)
-        (let ([admin (get-admin)])
-          (when admin
-            (send admin resized this #t))))
-      
-      ;; one-step-division : number -> number number
-      ;; given a numerator and denominator,
-      ;; returns a digits and a new numerator to consider
-      (define/private (one-step-division num)
-        (cond
-          [(num . < . den) (values 0 (* 10 num))]
-          [else
-           (let ([qu (quotient num den)])
-             (values qu (* 10 (- num (* qu den)))))]))
-      
-      ;; expand-number : -> void
-      ;; iterates until the numbers decimal expansion is completely computed,
-      ;; or the number's decimal expansion terminates.
-      (define/public (expand-number)
-        (when state
-          (set! expansions (+ expansions 1))
-          (let loop ([num state]
-                     [counter cut-off])
-            (cond
-              [(hash-has-key? ht num)
-               (set! state #f)
-               (set! repeat num)]
-              [(zero? counter) 
-               (set! state num)]
-              [else
-               (let-values ([(dig next-num) (one-step-division num)])
-                 (if (zero? next-num)
-                     (begin
-                       (hash-set! ht num (cons dig #t))
-                       (set! state #f)
-                       (set! repeat #f))
-                     (begin
-                       (hash-set! ht num (cons dig next-num))
-                       (loop next-num (- counter 1)))))]))))
-      
-      ;; update-drawing-fields : -> void
-      (define/public (update-drawing-fields)
-        (cond
-          [(number? state) 
-           (set! unbarred-portion
-                 (string-append
-                  decimal-prefix
-                  wholes/dec
-                  "."
-                  (apply string-append (map number->string (extract-non-cycle)))))
-           (set! barred-portion #f)
-           (set! clickable-portion "...")]
-          [(number? repeat)
-           (set! unbarred-portion
-                 (string-append
-                  decimal-prefix
-                  wholes/dec
-                  "."
-                  (apply string-append 
-                         (map number->string (extract-non-cycle)))))
-           (set! barred-portion (apply string-append (map number->string (extract-cycle))))
-           (set! clickable-portion #f)]
-          [else
-           (set! unbarred-portion
-                 (string-append
-                  decimal-prefix
-                  wholes/dec
-                  "."
-                  (apply string-append
-                         (map number->string (extract-non-cycle)))))
-           (set! barred-portion #f)
-           (set! clickable-portion #f)]))
-      
-      ;; extract-cycle : -> (listof digit)
-      ;; pre: (number? repeat)
-      (define/private (extract-cycle)
-        (let ([pr (hash-ref ht repeat)])
-          (cons (car pr)
-                (extract-helper (cdr pr)))))
-      
-      ;; extract-non-cycle : -> (listof digit)
-      (define/private (extract-non-cycle) (extract-helper init-num))
-      
-      (define/private (extract-helper start)
-        (let loop ([ind start])
-          (cond
-            [(equal? ind repeat) null]
-            [else
-             (let* ([iter (hash-ref ht ind)]
-                    [dig (car iter)]
-                    [next-num (cdr iter)])
-               (cons dig
-                     (if (hash-has-key? ht next-num)
-                         (loop next-num)
-                         null)))])))
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;                                                                  ;;
-      ;;                       snip infrastructure                        ;;
-      ;;                                                                  ;;
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      
-      
-      (define/public (read-special file line col pos)
-        number)
-      
-      (define/override get-text
-        (case-lambda
-          [(offset num) (get-text offset num #f)]
-          [(offset num flattened?) 
-           (case fraction-view
-             [(mixed)
-              (cond
-                [(string=? wholes/frac "")
-                 (string-append nums "/" dens)]
-                [(string=? wholes/frac "-")
-                 (string-append wholes/frac nums "/" dens)]
-                [else
-                 (string-append wholes/frac " " nums "/" dens)])]
-             [(decimal)
-              (string-append 
-               unbarred-portion
-               (or barred-portion "")
-               (or clickable-portion ""))]
-             [(improper) (string-append 
-                          improper-prefix
-                          improper-nums
-                          "/"
-                          dens)])]))
-      
-      (define/override (write f)
-        (send f put (string->bytes/utf-8 (number->string number)))
-        (send f put (string->bytes/utf-8 decimal-prefix))
-        (send f put (string->bytes/utf-8 (format "~a" fraction-view)))
-        (send f put (string->bytes/utf-8 (number->string expansions))))
-      
-      (define/override (copy)
-        (let ([snip (new number-snip%
-                      [number number]
-                      [decimal-prefix decimal-prefix])])
-          (send snip iterate (max 0 (- expansions 1))) ;; one iteration is automatic
-          (send snip set-fraction-view fraction-view)
-          snip))
-      
-      (inherit get-style)
-      
-      (define/override (get-extent dc x y wb hb descent space lspace rspace)
-        (case fraction-view
-          [(decimal)
-           (get-decimal-extent dc x y wb hb descent space lspace rspace)]
-          [(mixed)
-           (get-mixed-fraction-extent dc x y wb hb descent space lspace rspace)]
-          [(improper)
-           (get-improper-fraction-extent dc x y wb hb descent space lspace rspace)]))
-      
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (define clr (send dc get-text-foreground))
-        (define pen (send dc get-pen))
-        (when (pair? draw-caret)
-          (let ([fg-color (get-highlight-text-color)])
-            (when fg-color
-              (send dc set-pen fg-color 1 'solid)
-              (send dc set-text-foreground fg-color)))) 
-        (draw-fraction dc x y)
-        (send dc set-text-foreground clr)
-        (send dc set-pen pen))
-      
-      (define/public (draw-fraction dc x y)
-        (case fraction-view
-          [(mixed) (draw-mixed-fraction dc x y)]
-          [(improper) (draw-improper-fraction dc x y)]
-          [(decimal) (draw-decimals dc x y)]))
-      
-      (define/private (get-improper-fraction-extent dc x y w h descent space lspace rspace)
-        (let* ([style (get-style)]
-               [th (send style get-text-height dc)]
-               [old-font (send dc get-font)])
-          (send dc set-font (send style get-font))
-          (let-values ([(nw nh nd na) (send dc get-text-extent improper-nums)]
-                       [(dw dh dd da) (send dc get-text-extent dens)]
-                       [(ww wh wd wa) (send dc get-text-extent improper-prefix)])
-            (define frac-h (+ nh dh 1))
-            (set-box/f! h (+ nh dh 1))
-            (set-box/f! w (+ ww (max nw dw)))
-            (set-box/f! descent (+ wd (/ (- frac-h wh) 2)))
-            (set-box/f! space  (+ wa (/ (- frac-h wh) 2)))
-            (set-box/f! lspace 0)
-            (set-box/f! rspace 0))))
-      
-      (define/private (draw-improper-fraction dc x y)
-        (let-values ([(nw nh nd na) (send dc get-text-extent improper-nums)]
-                     [(dw dh dd da) (send dc get-text-extent dens)]
-                     [(ww wh wd wa) (send dc get-text-extent improper-prefix)])
-          (let ([frac-w (max nw dw)])
-            (send dc draw-text improper-nums (+ x ww (- frac-w nw)) y)
-            (send dc draw-text dens (+ x ww (- (/ dw 2)) (/ frac-w 2)) (+ y nh 1))
-            (send dc draw-text improper-prefix x (+ y (/ nh 2)))
-            (send dc draw-line
-                  (+ x ww) (+ y dh)
-                  (+ x ww (max nw dw) -1) (+ y dh)))))
-      
-      (define/private (get-mixed-fraction-extent dc x y w h descent space lspace rspace)
-        (let* ([style (get-style)]
-               [th (send style get-text-height dc)]
-               [old-font (send dc get-font)])
-          (send dc set-font (send style get-font))
-          (let-values ([(nw nh nd na) (send dc get-text-extent nums)]
-                       [(dw dh dd da) (send dc get-text-extent dens)]
-                       [(ww wh wd wa) (send dc get-text-extent wholes/frac)])
-            (define frac-h (+ nh dh 1))
-            (set-box/f! h frac-h)
-            (set-box/f! w (+ ww (max nw dw)))
-            (set-box/f! descent (+ wd (/ (- frac-h wh) 2)))
-            (set-box/f! space  (+ wa (/ (- frac-h wh) 2)))
-            (set-box/f! lspace 0)
-            (set-box/f! rspace 0))))
-      
-      (define/private (draw-mixed-fraction dc x y)
-        (let-values ([(nw nh na nd) (send dc get-text-extent nums)]
-                     [(dw dh da dd) (send dc get-text-extent dens)]
-                     [(ww wh wa wd) (send dc get-text-extent wholes/frac)])
-          (let ([frac-w (max nw dw)])
-            (define frac-h (+ nh dh 1))
-            (send dc draw-text nums (+ x ww (- frac-w nw)) y)
-            (send dc draw-text dens (+ x ww (- (/ dw 2)) (/ frac-w 2)) (+ y nh 1))
-            (send dc draw-text wholes/frac x (+ y (/ (- frac-h wh) 2)))
-            (send dc draw-line
-                  (+ x ww) (+ y dh)
-                  (+ x ww (max nw dw) -1) (+ y dh)))))
-      
-      (define/private (get-decimal-extent dc x y wb hb descent space lspace rspace)
-        (let ([font (send (get-style) get-font)])
-          (let-values ([(w1 h1 d1 a1) (get-text-extent/f dc unbarred-portion font)]
-                       [(w2 h2 d2 a2) (get-text-extent/f dc barred-portion font)]
-                       [(w3 h3 d3 a3) (get-text-extent/f dc clickable-portion font)])
-            (set-box/f! wb (+ w1 w2 w3))
-            (set-box/f! hb (if barred-portion 
-                               (+ h1 2)
-                               h1))
-            (set-box/f! descent d1)
-            (set-box/f! space (if barred-portion
-                                  (+ a1 2)
-                                  a1))
-            (set-box/f! lspace 0)
-            (set-box/f! rspace 0))))
-      
-      (define/private (draw-decimals dc x y)
-        (define (draw-digits digits x)
-          (if digits
-              (let-values ([(w h a d) (send dc get-text-extent digits)])
-                (send dc draw-text digits x (if barred-portion (+ y 2) y))
-                (+ x w))
-              x))
-        (let* ([unbarred-end (draw-digits unbarred-portion x)]
-               [barred-end (draw-digits barred-portion unbarred-end)]
-               [clickable-end (draw-digits clickable-portion barred-end)])
-          (when barred-portion
-            (send dc draw-line unbarred-end y (- barred-end 1) y))))
-      
-      (define/private (get-text-extent/f dc str font)
-        (if str
-            (let-values ([(w h d a) (send dc get-text-extent str font)])
-              (values w h d a))
-            (values 0 0 0 0)))
-      
-      (define/override (adjust-cursor dc x y editorx editory evt)
-        (let ([sx (- (send evt get-x) x)]
-              [sy (- (send evt get-y) y)])
-          (if (in-clickable-portion? dc sx sy)
-              arrow-cursor
-              #f)))
-      
-      (define/override (on-event dc x y editor-x editor-y evt)
-        (let ([sx (- (send evt get-x) x)]
-              [sy (- (send evt get-y) y)])
-          (cond
-            [(send evt button-down? 'right)
-             (let ([admin (get-admin)])
-               (when admin
-                 (let ([popup-menu (make-right-clickable-menu)])
-                   (send admin popup-menu popup-menu this (+ sx 1) (+ sy 1)))))]
-            [(send evt button-up? 'left)
-             (when (in-clickable-portion? dc sx sy)
-               (iterate/reflow))]
-            [else (void)])))
-      
-      (define/private (make-right-clickable-menu)
-        (let* ([menu (make-object popup-menu%)]
-               [decimal-item
-                (make-object checkable-menu-item% 
-                  (string-constant show-decimal-expansion)
-                  menu
-                  (λ (x y) 
-                    (set-fraction-view 'decimal)
-                    (preferences:set 'framework:fraction-snip-style 'decimal)))]
-               [mixed-fraction-item
-                (make-object checkable-menu-item% 
-                  (string-constant show-mixed-fraction-view)
-                  menu
-                  (λ (x y) 
-                    (set-fraction-view 'mixed)
-                    (preferences:set 'framework:fraction-snip-style 'mixed)))]
-               [improper-fraction-item
-                (make-object checkable-menu-item% 
-                  (string-constant show-improper-fraction-view)
-                  menu
-                  (λ (x y) 
-                    (set-fraction-view 'improper)
-                    (preferences:set 'framework:fraction-snip-style 'improper)))])
-          
-          (case fraction-view
-            [(decimal) (send decimal-item check #t)]
-            [(mixed) (send mixed-fraction-item check #t)]
-            [(improper) (send improper-fraction-item check #t)])
-          
-          (when (and (eq? fraction-view 'decimal)
-                     clickable-portion)
-            (make-object menu-item% 
-              (string-constant show-more-decimal-places)
-              menu
-              (λ (x y)
-                (iterate/reflow))))
-          menu))
-      
-      (define/private (in-clickable-portion? dc sx sy)
-        (and clickable-portion
-             (let ([font (send (get-style) get-font)])
-               (let-values ([(w1 h1 d1 a1) (get-text-extent/f dc unbarred-portion font)]
-                            [(w2 h2 d2 a2) (get-text-extent/f dc barred-portion font)]
-                            [(w3 h3 d3 a3) (get-text-extent/f dc clickable-portion font)])
-                 (and (<= (+ w1 w2) sx (+ w1 w2 w3))
-                      (<= 0 sy h3))))))
-      
-      (super-new)
-      (inherit set-snipclass set-flags get-flags)
-      (set-flags (cons 'handles-events (get-flags)))
-      (set-snipclass number-snipclass)
-      (iterate 1))) ;; calc first digits
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/panel.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/panel.rkt
deleted file mode 100644
index 9e44987484..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/panel.rkt
+++ /dev/null
@@ -1,899 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/list
-         racket/unit
-         "sig.rkt"
-         mred/mred-sig
-         mrlib/switchable-button)
-(provide panel@)
-
-(define-unit panel@
-  (import [prefix icon: framework:icon^]
-          mred^)
-  (export framework:panel^)
-  (init-depend mred^)
-  
-  (define single<%> (interface (area-container<%>) active-child))
-  (define single-mixin
-    (mixin (area-container<%>) (single<%>)
-      (inherit get-alignment change-children)
-      (define/override (after-new-child c)
-        (unless (is-a? c window<%>)
-          
-          ;; would like to remove the child here, waiting on a PR submitted
-          ;; about change-children during after-new-child
-          (change-children
-           (λ (l)
-             (remq c l)))
-          
-          (error 'single-mixin::after-new-child
-                 "all children must implement window<%>, got ~e"
-                 c))
-        (if current-active-child
-            (send c show #f)
-            (set! current-active-child c)))
-      [define/override (container-size l)
-        (if (null? l)
-            (values 0 0)
-            (values (apply max (map car l)) (apply max (map cadr l))))]
-      [define/override (place-children l width height)
-        (let-values ([(h-align-spec v-align-spec) (get-alignment)])
-          (let ([align
-                 (λ (total-size spec item-size)
-                   (floor
-                    (case spec
-                      [(center) (- (/ total-size 2) (/ item-size 2))]
-                      [(left top) 0]
-                      [(right bottom) (- total-size item-size)]
-                      [else (error 'place-children
-                                   "alignment spec is unknown ~a\n" spec)])))])
-            (map (λ (l) 
-                   (let*-values ([(min-width min-height h-stretch? v-stretch?)
-                                  (apply values l)]
-                                 [(x this-width)
-                                  (if h-stretch?
-                                      (values 0 width)
-                                      (values (align width h-align-spec min-width)
-                                              min-width))]
-                                 [(y this-height)
-                                  (if v-stretch?
-                                      (values 0 height)
-                                      (values (align height v-align-spec min-height)
-                                              min-height))])
-                     (list x y this-width this-height)))
-                 l)))]
-      
-      (inherit get-children begin-container-sequence end-container-sequence)
-      [define current-active-child #f]
-      (define/public active-child
-        (case-lambda
-          [() current-active-child]
-          [(x) 
-           (unless (memq x (get-children))
-             (error 'active-child "got a panel that is not a child: ~e" x))
-           (unless (eq? x current-active-child)
-             (begin-container-sequence)
-             (for-each (λ (x) (send x show #f))
-                       (get-children))
-             (set! current-active-child x)
-             (send current-active-child show #t)
-             (end-container-sequence))]))
-      (super-instantiate ())))
-  
-  (define single-window<%> (interface (single<%> window<%>)))
-  (define single-window-mixin
-    (mixin (single<%> window<%>) (single-window<%>)
-      (inherit get-client-size get-size)
-      [define/override container-size
-        (λ (l)
-          (let-values ([(super-width super-height) (super container-size l)]
-                       [(client-width client-height) (get-client-size)]
-                       [(window-width window-height) (get-size)]
-                       [(calc-size)
-                        (λ (super client window)
-                          (+ super (max 0 (- window client))))])
-            
-            (values
-             (calc-size super-width client-width window-width)
-             (calc-size super-height client-height window-height))))]
-      (super-new)))
-  
-  (define multi-view<%>
-    (interface (area-container<%>)
-      split-vertically
-      split-horizontally
-      collapse))
-  
-  (define multi-view-mixin
-    (mixin (area-container<%>) (multi-view<%>) 
-      (init-field parent editor)
-      (public get-editor-canvas% get-vertical% get-horizontal%)
-      [define get-editor-canvas%
-        (λ ()
-          editor-canvas%)]
-      [define get-vertical%
-        (λ ()
-          vertical-panel%)]
-      [define get-horizontal%
-        (λ ()
-          horizontal-panel%)]
-      
-      (define/private (split p%)
-        (let ([canvas (send (send parent get-top-level-window) get-edit-target-window)]
-              [ec% (get-editor-canvas%)])
-          (when (and canvas
-                     (is-a? canvas ec%)
-                     (eq? (send canvas get-editor) editor))
-            (let ([p (send canvas get-parent)])
-              (send p change-children (λ (x) null))
-              (let ([pc (make-object p% p)])
-                (send (make-object ec% (make-object vertical-panel% pc) editor) focus)
-                (make-object ec% (make-object vertical-panel% pc) editor))))))
-      [define/public split-vertically
-        (λ ()
-          (split (get-vertical%)))]
-      [define/public split-horizontally
-        (λ ()
-          (split (get-horizontal%)))]
-      
-      (define/public (collapse)
-        (let ([canvas (send (send parent get-top-level-window) get-edit-target-window)]
-              [ec% (get-editor-canvas%)])
-          (when (and canvas
-                     (is-a? canvas ec%)
-                     (eq? (send canvas get-editor) editor))
-            (let ([p (send canvas get-parent)])
-              (if (eq? p this)
-                  (bell)
-                  (let* ([sp (send p get-parent)]
-                         [p-to-remain (send sp get-parent)])
-                    (send p-to-remain change-children (λ (x) null))
-                    (send (make-object ec% p-to-remain editor) focus)))))))
-      
-      
-      (super-instantiate () (parent parent))
-      (make-object (get-editor-canvas%) this editor)))
-  
-  (define single% (single-window-mixin (single-mixin panel%)))
-  (define single-pane% (single-mixin pane%))
-  (define multi-view% (multi-view-mixin vertical-panel%))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; type gap = (make-gap number area<%> percentage number area<%> percentage)
-  (define-struct gap (before before-dim before-percentage after after-dim after-percentage))
-  
-  ;; type percentage : (make-percentage number)
-  (define-struct percentage (%) #:mutable)
-  
-  (define dragable<%>
-    (interface (window<%> area-container<%>)
-      after-percentage-change
-      set-percentages
-      get-percentages
-      get-vertical?
-      get-default-percentages
-      right-click-in-gap
-      set-orientation))
-  
-  (define vertical-dragable<%>
-    (interface (dragable<%>)))
-  
-  (define horizontal-dragable<%>
-    (interface (dragable<%>)))
-  
-  (define dragable-mixin
-    (mixin (window<%> area-container<%>) (dragable<%>)
-      (init parent)
-
-      (init-field vertical?)
-      (define/public-final (get-vertical?) vertical?)
-      (define/public-final (set-orientation h?) 
-        (define v? (not h?))
-        (unless (eq? vertical? v?)
-          (set! vertical? v?) 
-          (container-flow-modified)))
-      (define/private (min-extent child) 
-        (let-values ([(w h) (send child get-graphical-min-size)])
-          (if (get-vertical?)
-              (max (send child min-height) h)
-              (max (send child min-width) w))))
-      (define/private (event-get-dim evt)
-        (if (get-vertical?)
-            (send evt get-y)
-            (send evt get-x)))
-      (define/private (get-gap-cursor)
-        (if (get-vertical?)
-            (icon:get-up/down-cursor)
-            (icon:get-left/right-cursor)))
-      
-      (define/public (right-click-in-gap evt before after) (void))
-      
-      (inherit get-client-size container-flow-modified)
-      
-      (init-field [bar-thickness 5])
-      
-      ;; percentages : (listof percentage)
-      (define percentages null)
-      
-      ;; get-percentages : -> (listof number)
-      (define/public (get-percentages)
-        (map percentage-% percentages))
-      
-      (define/public (set-percentages ps)
-        (unless (and (list? ps)
-                     (andmap number? ps)
-                     (= 1 (apply + ps))
-                     (andmap positive? ps))
-          (error 'set-percentages 
-                 "expected a list of numbers that are all positive and sum to 1, got: ~e"
-                 ps))
-        (unless (= (length ps) (length (get-children)))
-          (error 'set-percentages 
-                 "expected a list of numbers whose length is the number of children: ~a, got ~e"
-                 (length (get-children))
-                 ps))
-        (set! percentages (map make-percentage ps))
-        (container-flow-modified))
-      
-      (define/pubment (after-percentage-change) (inner (void) after-percentage-change))
-      
-      (define/private (get-available-extent)
-        (let-values ([(width height) (get-client-size)])
-          (- (if (get-vertical?) height width)
-             (* bar-thickness (- (length (get-children)) 1)))))
-      
-      (inherit get-children)
-      
-      (define/private (update-percentages)
-        (let ([len-children (length (get-children))])
-          (unless (= len-children (length percentages))
-            (cond
-              [(zero? len-children)
-               (set! percentages '())]
-              [else
-               (set! percentages (map make-percentage (get-default-percentages len-children)))])
-            (after-percentage-change))))
-      
-      (define/pubment (get-default-percentages i) 
-        (define res (inner (if (zero? i) '() (make-list i (/ i)))
-                           get-default-percentages i))
-        (unless (and (list? res)
-                     (andmap (λ (x) (and (real? x) (<= 0 x 1))) res)
-                     (= 1 (apply + res))
-                     (= (length res) i))
-          (error 'get-default-percentages 
-                 "expected inner call to return a list of real numbers that sum to 1 and has length ~a"
-                 i))
-        res)
-      
-      (define/override (after-new-child child)
-        (update-percentages))
-      
-      (define resizing-dim #f)
-      (define resizing-gap #f)
-      
-      (inherit set-cursor)
-      (define/override (on-subwindow-event receiver evt)
-        (if (eq? receiver this)
-            (let ([gap
-                   (ormap (λ (gap) 
-                            (and (<= (gap-before-dim gap) 
-                                     (event-get-dim evt)
-                                     (gap-after-dim gap))
-                                 gap))
-                          cursor-gaps)])
-              (set-cursor (and (or gap
-                                   resizing-dim)
-                               (let ([c (get-gap-cursor)])
-                                 (and (send c ok?)
-                                      c))))
-              (cond
-                [(and gap (send evt button-down? 'right))
-                 (right-click-in-gap evt (gap-before gap) (gap-after gap))]
-                [(and gap (send evt button-down? 'left))
-                 (set! resizing-dim (event-get-dim evt))
-                 (set! resizing-gap gap)]
-                [(send evt button-up? 'left)
-                 (set! resizing-dim #f)
-                 (set! resizing-gap #f)]
-                [(and resizing-dim resizing-gap (send evt moving?))
-                 (let-values ([(width height) (get-client-size)])
-                   (let* ([before-percentage (gap-before-percentage resizing-gap)]
-                          [orig-before (percentage-% before-percentage)]
-                          [after-percentage (gap-after-percentage resizing-gap)]
-                          [orig-after (percentage-% after-percentage)]
-                          [available-extent (get-available-extent)]
-                          [change-in-percentage (/ (- resizing-dim (event-get-dim evt)) available-extent)]
-                          [new-before (- (percentage-% before-percentage) change-in-percentage)]
-                          [new-after (+ (percentage-% after-percentage) change-in-percentage)])
-                     (when ((floor (* new-before available-extent)) . > . (min-extent (gap-before resizing-gap)))
-                       (when ((floor (* new-after available-extent)) . > . (min-extent (gap-after resizing-gap)))
-                         (set-percentage-%! before-percentage new-before)
-                         (set-percentage-%! after-percentage new-after)
-                         (after-percentage-change)
-                         (set! resizing-dim (event-get-dim evt))
-                         (container-flow-modified)))))]
-                [else (super on-subwindow-event receiver evt)]))
-            (begin
-              (set-cursor #f)
-              (super on-subwindow-event receiver evt))))
-      
-      (define cursor-gaps null)
-      
-      (define/override (place-children _infos width height)
-        (update-percentages)
-        (define-values (results gaps) 
-          (dragable-place-children _infos width height
-                                   (map percentage-% percentages)
-                                   bar-thickness
-                                   (get-vertical?)))        
-        (set! cursor-gaps
-              (let loop ([children (get-children)]
-                         [percentages percentages]
-                         [gaps gaps])
-                (cond
-                  [(null? children) '()]
-                  [(null? (cdr children)) '()]
-                  [else
-                   (define gap (car gaps))
-                   (cons (make-gap (car children)
-                                   (list-ref gap 0)
-                                   (car percentages)
-                                   (cadr children)
-                                   (list-ref gap 1)
-                                   (cadr percentages))
-                         (loop (cdr children)
-                               (cdr percentages)
-                               (cdr gaps)))])))
-        
-        results)
-      
-      (define/override (container-size children-info)
-        (update-percentages)
-        (dragable-container-size children-info bar-thickness (get-vertical?)))
-      
-      (super-new [parent parent])))
-
-  ;; this function repeatedly checks to see if the current set of percentages and children
-  ;; would violate any minimum size constraints. If not, the percentages are used and the
-  ;; function termiantes. If some minimum sizes would be violated, the function pulls those 
-  ;; children out of the list under consideration, gives them their minimum sizes, rescales
-  ;; the remaining percentages back to 1, adjusts the available space after removing those
-  ;; panels, and tries again.
-  (define (dragable-place-children infos width height percentages bar-thickness vertical?)
-    (define original-major-dim-tot (- (if vertical? height width)
-                                      (* (max 0 (- (length infos) 1)) bar-thickness)))
-    ;; vec : id -o> major-dim size (width)
-    (define vec (make-vector (length infos) 0))
-    (let loop ([percentages percentages] ;; sums to 1.
-               [major-dim-mins (map (λ (info) (if vertical? (list-ref info 1) (list-ref info 0)))
-                                    infos)]
-               [major-dim-tot original-major-dim-tot]
-               [ids (build-list (length percentages) values)])
-      (define fitting-ones (extract-fitting-percentages percentages major-dim-mins major-dim-tot))
-      (cond
-        [(andmap not fitting-ones)
-         ;; all of them (perhaps none) fit, terminate.
-         (for ([id (in-list ids)]
-               [percentage (in-list percentages)])
-           (vector-set! vec id (* percentage major-dim-tot)))]
-        [else
-         ;; something doesn't fit; remove them and try again
-         (let ([next-percentages '()]
-               [next-major-dim-mins '()]
-               [next-major-dim-tot major-dim-tot]
-               [next-ids '()])
-           (for ([percentage (in-list percentages)]
-                 [major-dim-min (in-list major-dim-mins)]
-                 [id (in-list ids)]
-                 [fitting-one (in-list fitting-ones)])
-             (cond
-               [fitting-one
-                (vector-set! vec id fitting-one)
-                (set! next-major-dim-tot (- major-dim-tot fitting-one))]
-               [else
-                (set! next-percentages (cons percentage next-percentages))
-                (set! next-major-dim-mins (cons major-dim-min next-major-dim-mins))
-                (set! next-ids (cons id next-ids))]))
-           (define next-percentage-sum (apply + next-percentages))
-           (loop (map (λ (x) (/ x next-percentage-sum)) next-percentages)
-                 next-major-dim-mins
-                 next-major-dim-tot
-                 next-ids))]))
-
-    ;; adjust the contents of the vector if there are any fractional values
-    (let loop ([i 0]
-               [maj-val 0])
-      (cond
-        [(= i (vector-length vec))
-         (unless (= maj-val original-major-dim-tot)
-           (unless (zero? (vector-length vec))
-             (define last-index (- (vector-length vec) 1))
-             (vector-set! vec last-index (+ (vector-ref vec last-index) (- original-major-dim-tot maj-val)))))]
-        [else
-         (vector-set! vec i (floor (vector-ref vec i)))
-         (loop (+ i 1)
-               (+ maj-val (vector-ref vec i)))]))
-    
-    ;; build the result for the function from the major dim sizes
-    (let loop ([i 0]
-               [infos '()]
-               [gaps '()]
-               [maj-start 0])
-      (cond
-        [(= i (vector-length vec))
-         (values (reverse infos)
-                 (reverse gaps))]
-        [else
-         (define maj-stop (+ maj-start (vector-ref vec i)))
-         (define has-gap? (not (= i (- (vector-length vec) 1))))
-         (loop (+ i 1)
-               (cons (if vertical?
-                         (list 0
-                               maj-start
-                               width
-                               (- maj-stop maj-start))
-                         (list maj-start
-                               0
-                               (- maj-stop maj-start)
-                               height))
-                     infos)
-               (if has-gap?
-                   (cons (list maj-stop (+ maj-stop bar-thickness)) gaps)
-                   gaps)
-               (if has-gap?
-                   (+ maj-stop bar-thickness)
-                   maj-stop))])))
-  
-  (define (extract-fitting-percentages percentages major-dim-mins major-dim-tot)
-    (for/list ([percentage (in-list percentages)]
-               [major-dim-min (in-list major-dim-mins)])
-      (if (<= major-dim-min (* percentage major-dim-tot))
-          #f
-          major-dim-min)))
-  
-  (define (dragable-container-size orig-children-info bar-thickness vertical?)
-    (let loop ([children-info orig-children-info]
-               [major-size 0]
-               [minor-size 0])
-      (cond
-        [(null? children-info)
-         (let ([major-size (+ major-size 
-                              (* (max 0 (- (length orig-children-info) 1)) 
-                                 bar-thickness))])
-           (if vertical?
-               (values (ceiling minor-size) (ceiling major-size))
-               (values (ceiling major-size) (ceiling minor-size))))]
-        [else
-         (let ([child-info (car children-info)])
-           (let-values ([(child-major major-stretch? child-minor minor-stretch?)
-                         (if vertical?
-                             ;; 0 = width/horiz, 1 = height/vert
-                             (values (list-ref child-info 1)
-                                     (list-ref child-info 3)
-                                     (list-ref child-info 0)
-                                     (list-ref child-info 2))
-                             (values (list-ref child-info 0)
-                                     (list-ref child-info 2)
-                                     (list-ref child-info 1)
-                                     (list-ref child-info 3)))])
-             (loop (cdr children-info)
-                   (+ child-major major-size)
-                   (max child-minor minor-size))))])))
-  
-  (define three-bar-pen-bar-width 8)
-  
-  (define three-bar-canvas%
-    (class canvas%
-      (inherit get-dc get-client-size)
-      (define/override (on-paint)
-        (let ([dc (get-dc)])
-          (let-values ([(w h) (get-client-size)])
-            (let ([sx (floor (- (/ w 2) (/ three-bar-pen-bar-width 2)))])
-              (send dc set-brush (send the-brush-list find-or-create-brush (get-panel-background) 'panel))
-              (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-              (send dc draw-rectangle 0 0 w h)
-              
-              (send dc set-pen (send the-pen-list find-or-create-pen  "black" 1 'solid))
-              (send dc draw-line sx 1 (+ sx three-bar-pen-bar-width) 1)
-              (send dc draw-line sx 4 (+ sx three-bar-pen-bar-width) 4)
-              (send dc draw-line sx 7 (+ sx three-bar-pen-bar-width) 7)
-              
-              (send dc set-pen (send the-pen-list find-or-create-pen  "gray" 1 'solid))
-              (send dc draw-line sx 2 (+ sx three-bar-pen-bar-width) 2)
-              (send dc draw-line sx 5 (+ sx three-bar-pen-bar-width) 5)
-              (send dc draw-line sx 8 (+ sx three-bar-pen-bar-width) 8)))))
-      
-      (super-new [style '(no-focus)])
-      (inherit stretchable-height min-height)
-      (stretchable-height #f)
-      (min-height 10)))
-  
-  (define vertical-dragable-mixin
-    (mixin (dragable<%>) (vertical-dragable<%>)
-      (super-new [vertical? #t])))
-  
-  (define horizontal-dragable-mixin
-    (mixin (dragable<%>) (horizontal-dragable<%>)
-      (super-new [vertical? #f])))
-  
-  (define vertical-dragable% (vertical-dragable-mixin (dragable-mixin panel%)))
-  
-  (define horizontal-dragable% (horizontal-dragable-mixin (dragable-mixin panel%)))
-
-  (define splitter<%> (interface () split-horizontal split-vertical collapse))
-  ;; we need a private interface so we can use `generic' because `generic'
-  ;; doesn't work on mixins
-  (define splitter-private<%> (interface () self-vertical? self-horizontal?))
-
-  (define splitter-mixin
-   (mixin (area-container<%> dragable<%>) (splitter<%> splitter-private<%>)
-    (super-new)
-    (inherit get-children add-child
-             delete-child
-             change-children
-             begin-container-sequence
-             end-container-sequence)
-
-    (field [horizontal-panel% horizontal-dragable%]
-           [vertical-panel% vertical-dragable%])
-
-    (define/public (self-vertical?)
-      (send this get-vertical?))
-    
-    (define/public (self-horizontal?)
-      (not (send this get-vertical?)))
-
-    ;; insert an item into a list after some element
-    ;; FIXME: this is probably a library function somewhere
-    (define/private (insert-after list before item)
-      (let loop ([so-far '()]
-                 [list list])
-        (cond
-          [(null? list) (reverse so-far)]
-          [(eq? (car list) before) (loop (cons item (cons before so-far))
-                                         (cdr list))]
-          [else (loop (cons (car list) so-far) (cdr list))])))
-
-    ;; replace an element with a list of stuff
-    ;; FIXME: this is probably a library function somewhere
-    (define/private (replace list at stuff)
-      (let loop ([so-far '()]
-                 [list list])
-        (cond
-          [(null? list) (reverse so-far)]
-          [(eq? (car list) at) (append (reverse so-far) stuff (cdr list))]
-          [else (loop (cons (car list) so-far) (cdr list))])))
-
-    ;; remove a canvas and merge split panels if necessary
-    ;; TODO: restore percentages
-    (define/public (collapse canvas)
-      (begin-container-sequence)
-      (for ([child (get-children)])
-        (cond
-          [(eq? child canvas)
-           (when (> (length (get-children)) 1)
-             (change-children
-               (lambda (old-children)
-                 (remq canvas old-children))))]
-          [(is-a? child splitter<%>)
-           (send child collapse canvas)]))
-      (change-children
-        (lambda (old-children)
-          (for/list ([child old-children])
-            (if (and (is-a? child splitter<%>)
-                     (= (length (send child get-children)) 1))
-              (let ()
-                (define single (car (send child get-children)))
-                (send single reparent this)
-                single)
-              child))))
-      (end-container-sequence))
-
-    ;; split a canvas by creating a new editor and either
-    ;; 1) adding it to the panel if the panel is already using the same
-    ;;   orientation as the split that is about to occur
-    ;; 2) create a new panel with the orientation of the split about to
-    ;;   occur and add a new editor
-    ;;
-    ;; in both cases the new editor is returned
-    (define/private (do-split canvas maker orientation? orientation% split)
-      (define new-canvas #f)
-      (for ([child (get-children)])
-        (cond
-          [(eq? child canvas)
-           (begin-container-sequence)
-           (change-children
-             (lambda (old-children)
-               (if (send-generic this orientation?)
-                 (let ([new (maker this)])
-                   (set! new-canvas new)
-                   (insert-after old-children child new))
-                 (let ()
-                   (define container (new (splitter-mixin orientation%)
-                                          [parent this]))
-                   (send canvas reparent container)
-                   (define created (maker container))
-                   (set! new-canvas created)
-                   ;; this throws out the old child but we should probably
-                   ;; try to keep it
-                   (replace old-children child (list container))))))
-           (end-container-sequence)]
-
-          [(is-a? child splitter<%>)
-           (let ([something (send-generic child split canvas maker)])
-             (when something
-               (set! new-canvas something)))]))
-        new-canvas)
-
-    ;; canvas (widget -> editor) -> editor
-    (define/public (split-horizontal canvas maker)
-      (do-split canvas maker (generic splitter-private<%> self-horizontal?)
-                horizontal-panel% (generic splitter<%> split-horizontal)))
-
-    ;; canvas (widget -> editor) -> editor
-    (define/public (split-vertical canvas maker)
-      (do-split canvas maker (generic splitter-private<%> self-vertical?)
-                vertical-panel% (generic splitter<%> split-vertical)))))
-
-    
-  (define discrete-child<%> 
-    (interface ()
-      get-discrete-widths
-      get-discrete-heights))
-  
-  (define discrete-sizes<%> (interface ((class->interface panel%))
-                              get-orientation
-                              set-orientation))
-  (define (discrete-get-widths c)
-    (cond
-      [(is-a? c switchable-button%) 
-       (if (send c get-label-visible)
-           (list (send c get-large-width)
-                 (send c get-small-width))
-           (list (send c get-without-label-small-width)))]
-      [(is-a? c discrete-sizes<%>)
-       (send c get-discrete-widths)]
-      [else
-       #f]))
-  
-  (define (discrete-get-heights c)
-    (cond
-      [(is-a? c discrete-sizes<%>)
-       (send c get-discrete-heights)]
-      [else
-       #f]))
-  
-  (define discrete-sizes-mixin
-    (mixin ((class->interface panel%)) (discrete-sizes<%> discrete-child<%>)
-      (inherit get-children spacing get-alignment border container-flow-modified
-               get-size get-client-size)
-      (define horizontal? #t)
-      (define/public (get-orientation) horizontal?)
-      (define/public (set-orientation h?)
-        (unless (equal? horizontal? h?)
-          (set! horizontal? h?)
-          (container-flow-modified)))
-      
-      (define/public (get-discrete-widths)
-        (cond
-          [horizontal?
-           (define ws 
-             (for/list ([c (in-list (get-children))])
-               (discrete-get-widths c)))
-           (and (andmap values ws)
-                (remove-duplicates
-                 (map
-                  (λ (x) (apply + x))
-                  (candidate-sizes ws))))]
-          [else #f]))
-      
-      (define/public (get-discrete-heights)
-        (cond
-          [horizontal? #f]
-          [else
-           (define hs 
-             (for/list ([c (in-list (get-children))])
-               (discrete-get-heights c)))
-           (and (andmap values hs)
-                (remove-duplicates
-                 (map
-                  (λ (x) (apply + x))
-                  (candidate-sizes hs))))]))
-      
-      (define/override (container-size infos)
-        (define the-spacing (spacing))
-        (define the-border (spacing))
-        (define-values (total-min-w total-min-h)
-          (for/fold ([w 0] [h 0])
-            ([info (in-list infos)]
-             [n (in-naturals)])
-            (define-values (min-w min-h h-stretch? v-stretch?)
-              (apply values info))
-            (define this-spacing (if (zero? n) 0 the-spacing))
-            (cond
-              [horizontal?
-               (values (+ w this-spacing min-w)
-                       (max h min-h))]
-              [else
-               (values (max w min-w)
-                       (+ h this-spacing min-h))])))
-        (define-values (sw sh) (get-size))
-        (define-values (cw ch) (get-client-size))
-        (values (+ total-min-w the-border the-border
-                   (- sw cw))
-                (+ total-min-h the-border the-border
-                   (- sh ch))))
-      
-      (define/override (place-children infos w h)
-        (define the-spacing (spacing))
-        (define the-border (border))
-        (define-values (halign valign) (get-alignment))
-        (define children (get-children))
-        (define all-sizess
-          (candidate-sizes
-           (for/list ([c (in-list children)]
-                      [info (in-list infos)]
-                      #:unless (if horizontal?
-                                   (and (not (discrete-get-widths c))
-                                        (list-ref info 2))
-                                   (and (not (discrete-get-heights c))
-                                        (list-ref info 3))))
-             (if horizontal?
-                 (or (discrete-get-widths c)
-                     (list (list-ref info 0)))
-                 (or (discrete-get-heights c)
-                     (list (list-ref info 1)))))))
-        (define fitting-sizes
-          (for/or ([sizes (in-list all-sizess)])
-            (and (<= (apply + sizes) 
-                     (- (if horizontal? w h)
-                        (* 2 the-border)))
-                 sizes)))
-        (define fixed-size (apply + fitting-sizes))
-        (define number-stretchable
-          (for/sum ([info (in-list infos)]
-                    [c children])
-            (if (if horizontal?
-                    (and (not (discrete-get-widths c))
-                         (list-ref info 2))
-                    (and (not (discrete-get-heights c))
-                         (list-ref info 3)))
-                1
-                0)))
-        (define initial-position
-          (+ the-border
-             (if (zero? number-stretchable)
-                 (if horizontal?
-                     (case halign
-                       [(right) (- w fixed-size)]
-                       [(center) (round (/ (- w fixed-size) 2))]
-                       [(left) 0])
-                     (case valign
-                       [(bottom) (- h fixed-size)]
-                       [(center) (round (/ (- h fixed-size) 2))]
-                       [(top) 0]))
-                 0)))
-        (define-values (stretchable-size stretchable-leftover)
-          (if (zero? number-stretchable)
-              (values 0 0)
-              (let ([total 
-                     (- (if horizontal?
-                            w
-                            h)
-                        fixed-size)])
-                (values (quotient total number-stretchable)
-                        (modulo total number-stretchable)))))
-        (define (take-one) 
-          (cond
-            [(zero? stretchable-leftover)
-             0]
-            [else
-             (set! stretchable-leftover (- stretchable-leftover 1))
-             1]))
-        (let loop ([infos infos]
-                   [children children]
-                   [spot initial-position])
-          (cond
-            [(null? infos) null]
-            [else
-             (define-values (min-w min-h h-stretch? v-stretch?)
-               (apply values (car infos)))
-             (define discrete-child? (if horizontal?
-                                         (discrete-get-widths (car children))
-                                         (discrete-get-heights (car children))))
-             (define this-one
-               (cond
-                 [(and horizontal? h-stretch? (not discrete-child?))
-                  (list spot
-                        (round (- (/ h 2) (/ min-h 2)))
-                        (+ stretchable-size (take-one))
-                        min-h)]
-                 [(and (not horizontal?) v-stretch? (not discrete-child?))
-                  (list (round (- (/ w 2) (/ min-w 2)))
-                        spot
-                        min-w
-                        (+ stretchable-size (take-one)))]
-                 [horizontal?
-                  (define size (car fitting-sizes))
-                  (set! fitting-sizes (cdr fitting-sizes))
-                  (list spot 
-                        (round (- (/ h 2) (/ min-h 2)))
-                        size
-                        min-h)]
-                 [else
-                  (define size (car fitting-sizes))
-                  (set! fitting-sizes (cdr fitting-sizes))
-                  (list (round (- (/ w 2) (/ min-w 2)))
-                        spot
-                        min-w
-                        size)]))
-             (cons this-one (loop (cdr infos)
-                                  (cdr children)
-                                  (+ spot
-                                     (if horizontal? 
-                                         (list-ref this-one 2)
-                                         (list-ref this-one 3)))))])))
-      
-      (super-new)))
-  
-  (define horizontal-discrete-sizes%
-    ;; extra wrapper to get the name right
-    (class (discrete-sizes-mixin panel%)
-      (super-new)))
-  (define vertical-discrete-sizes%
-    (class (discrete-sizes-mixin panel%)
-      (super-new)
-      (inherit set-orientation)
-      (set-orientation #f))))
-
-
-;; candidate-sizes : (listof (listof number)) -> (listof (listof number))
-;; in the input, the outer list corresponds to the children for a panel,
-;; and each inner list are the sizes that the children can take on.
-;; This function returns each possible configuration of sizes, starting
-;; with the largest for each and then shrinking each child one size
-;; at a time, starting from the earlier children in the list.
-;; Note that this will not try all combinations of sizes; once a child
-;; has been shrunk one size, larger sizes for that child will not be
-;; considered, and shrinking always proceeds from the left to the right.
-(define (candidate-sizes lolon)
-  (define all-boxes (map (λ (x) (box (sort x >))) lolon))
-  (define answer '())
-  (define (record-current)
-    (set! answer (cons (map car (map unbox all-boxes)) answer)))
-  (for ([box (in-list all-boxes)])
-    (for ([i (in-range (- (length (unbox box)) 1))])
-      (record-current)
-      (set-box! box (cdr (unbox box)))))
-  (record-current)
-  (reverse answer))
-
-(module+ test
-  (require rackunit)
-  
-  (define (log-em lolon) (candidate-sizes lolon))
-  
-  (check-equal? (log-em '((1)))
-                (list '(1)))
-  (check-equal? (log-em '((1) (2) (3)))
-                (list '(1 2 3)))
-  (check-equal? (log-em '((4 3 2 1)))
-                (list '(4) '(3) '(2) '(1)))
-  (check-equal? (log-em '((1 2 3 4)))
-                (list '(4) '(3) '(2) '(1)))
-  (check-equal? (log-em '((5 1) (6 2) (7 3)))
-                (list '(5 6 7)
-                      '(1 6 7)
-                      '(1 2 7)
-                      '(1 2 3)))
-  (check-equal? (log-em '((10 9 8) (7 6 5)))
-                (list '(10 7)
-                      '(9 7)
-                      '(8 7)
-                      '(8 6)
-                      '(8 5))))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/pasteboard.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/pasteboard.rkt
deleted file mode 100644
index d8b59f6d59..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/pasteboard.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang scheme/unit
-  (require "sig.rkt" mred/mred-sig)
-
-  (import mred^
-          [prefix editor: framework:editor^])
-  (export (rename framework:pasteboard^
-                  [-keymap% keymap%]))
-  (init-depend mred^ framework:editor^)
-
-
-  (define basic% (editor:basic-mixin pasteboard%))
-  (define standard-style-list% (editor:standard-style-list-mixin basic%))
-  (define -keymap% (editor:keymap-mixin standard-style-list%))
-  (define file% (editor:file-mixin -keymap%))
-  (define backup-autosave% (editor:backup-autosave-mixin file%))
-  (define info% (editor:info-mixin backup-autosave%))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/path-utils.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/path-utils.rkt
deleted file mode 100644
index 7b73201378..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/path-utils.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang scheme/unit
-  (require "sig.rkt")
-  
-  (import)
-  (export framework:path-utils^)
-  
-  (define (generate-autosave-name name)
-    (let-values ([(base name dir?)
-                  (if name
-                      (split-path name)
-                      (values (find-system-path 'doc-dir)
-                              (bytes->path-element #"mredauto")
-                              #f))])
-      (let* ([base (if (path? base)
-                       base
-                       (current-directory))]
-             [path (if (relative-path? base)
-                       (build-path (current-directory) base)
-                       base)])
-        (let loop ([n 1])
-          (let* ([numb (string->bytes/utf-8 (number->string n))]
-                 [new-name
-                  (build-path path
-                              (if (eq? (system-type) 'windows)
-                                  (bytes->path-element
-                                   (bytes-append (regexp-replace #rx#"\\..*$" 
-                                                                 (path-element->bytes name)
-                                                                 #"")
-                                                 #"."
-                                                 numb))
-                                  (bytes->path-element
-                                   (bytes-append #"#"
-                                                 (path-element->bytes name)
-                                                 #"#"
-                                                 numb
-                                                 #"#"))))])
-            (if (file-exists? new-name)
-                (loop (add1 n))
-                new-name))))))
-  
-  (define (generate-backup-name full-name)
-    (let-values ([(pre-base name dir?) (split-path full-name)])
-      (let ([base (if (path? pre-base)
-                      pre-base
-                      (current-directory))])
-        (let ([name-bytes (path-element->bytes name)])
-          (cond
-            [(and (eq? (system-type) 'windows)
-                  (regexp-match #rx#"(.*)\\.[^.]*" name-bytes))
-             =>
-             (λ (m)
-               (build-path base (bytes->path-element (bytes-append (cadr m) #".bak"))))]
-            [(eq? (system-type) 'windows)
-             (build-path base (bytes->path-element (bytes-append name-bytes #".bak")))]
-            [else
-             (build-path base (bytes->path-element (bytes-append name-bytes #"~")))])))))
-
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/preferences.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/preferences.rkt
deleted file mode 100644
index e6c0c7a940..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/preferences.rkt
+++ /dev/null
@@ -1,760 +0,0 @@
-#lang racket/unit
-
-#|
-
-There are three attributes for each preference:
-
-  - default set, or not
-  - marshalling function set, or not
-  - initialization still okay, or not
-
-the state transitions / contracts are:
-
-  get(true, _, _) -> (true, _, false)
-  get(false, _, _) -> error default not yet set
-
-  set is just like get.
-
-  set-default(false, _, true) -> set-default(true, _, true)
-  set-default(true, _, _) -> error default already set
-  set-default(_, _, false) -> initialization not okay anymore  /* cannot happen, I think */
-
-  set-un/marshall(true, false, true) -> (true, true, true)
-  .. otherwise error
-
-  for all syms: 
-   prefs-snapshot(_, _, _) -> (_, _, false) 
-
-|#
-
-
-  (require string-constants
-	   mzlib/class
-           racket/file
-           "sig.rkt"
-           "../gui-utils.rkt"
-           "../preferences.rkt"
-	   mred/mred-sig)
-  
-  (import mred^
-          [prefix exit: framework:exit^]
-          [prefix panel: framework:panel^]
-          [prefix frame: framework:frame^])
-  (export framework:preferences^)
-  
-  (define past-failure-ps '())
-  (define past-failure-vs '())
-  (define number-of-consecutive-failures 0)
-  (define stop-warning? #f)
-  
-  (define get-pref-retry-result #f)
-  
-  (define (get-preference/gui sym [def (λ () (error 'get-preference/gui "unknown pref ~s" sym))])
-    (define (try)
-      (get-preference sym
-                      def
-                      #:timeout-lock-there
-                      (λ (filename)
-                        (define what-to-do
-                          (cond
-                            [get-pref-retry-result
-                             get-pref-retry-result]
-                            [else
-                             (define-values (res dont-ask-again?)
-                               (message+check-box/custom
-                                (string-constant error-reading-preferences)
-                                (format (string-constant error-reading-preferences-explanation)
-                                        sym)
-                                (string-constant dont-ask-again-until-drracket-restarted) ;; check label
-                                (string-constant try-again)
-                                (string-constant give-up-and-use-the-default)
-                                #f
-                                #f
-                                '(caution default=1)
-                                1)) ;; cannot return #f here or get-pref-retry-result may get set wrong
-                             (when dont-ask-again?
-                               (set! get-pref-retry-result res))
-                             res]))
-                        (case what-to-do
-                          [(1) (try)]
-                          [(2) (def)]))))
-    (try))
-                          
-  
-  (define put-pref-retry-result #f)
-  
-  (define (put-preferences/gui new-ps new-vs)
-    ;; NOTE: old ones must come first in the list, 
-    ;; or else multiple sets to the same preference
-    ;; will save old values, instead of new ones.
-    (define ps (begin0 (append past-failure-ps new-ps)
-                       (set! past-failure-ps '())))
-    (define vs (begin0 (append past-failure-vs new-vs)
-                       (set! past-failure-vs '())))
-    
-    (define failed #f)
-    (define (record-actual-failure)
-      (set! number-of-consecutive-failures (+ number-of-consecutive-failures 1))
-      (set! past-failure-ps ps)
-      (set! past-failure-vs vs)
-      (set! failed #t))
-    (define (fail-func path)
-      (cond
-        [(= number-of-consecutive-failures 3)
-         (set! number-of-consecutive-failures 0)
-         (define the-mode (preferences-lock-file-mode)) 
-         (define mb-ans
-           (case the-mode
-             [(file-lock) 
-              (define-values (checked? res)
-                (if put-pref-retry-result
-                    (values #t 'ok)
-                    (message+check-box
-                     (string-constant error-saving-preferences-title)
-                     (format (string-constant prefs-file-locked-nothing-doing)
-                             path)
-                     (string-constant dont-notify-again-until-drracket-restarted))))
-              (when checked?
-                (set! put-pref-retry-result #t))
-               2]
-             [(exists) 
-              (message-box/custom
-               (string-constant error-saving-preferences-title)
-               (format (string-constant prefs-file-locked)
-                       (path->string path))
-               (string-constant steal-the-lock-and-retry)
-               (string-constant cancel)
-               #f
-               #f ;;parent
-               '(default=2 caution))]
-             [else (error 'preferences.rkt "preferences-lock-file-mode returned unknown mode ~s\n" the-mode)]))
-         (case mb-ans
-           [(2 #f) (record-actual-failure)]
-           [(1) 
-            (let ([delete-failed #f])
-              (with-handlers ((exn:fail:filesystem? (λ (x) (set! delete-failed x))))
-                (delete-file path))
-              (cond
-                [delete-failed
-                 (record-actual-failure)
-                 (message-box 
-                  (string-constant error-saving-preferences-title)
-                  (exn-message delete-failed))]
-                [else
-                 (put-preferences ps vs second-fail-func)]))])]
-        [else 
-         (record-actual-failure)]))
-    (define (second-fail-func path)
-      (record-actual-failure)
-      (message-box
-       (string-constant error-saving-preferences-title)
-       (format (string-constant prefs-file-still-locked)
-               (path->string path))
-       #f
-       '(stop ok)))
-    
-    (with-handlers ((exn:fail? 
-                     (λ (exn)
-                       (log-warning (format "preferences: failed to save ~a prefs:\n   ~a" 
-                                            ps
-                                            (exn-message exn))))))
-      (begin0
-        (put-preferences ps vs fail-func)
-        (unless failed
-          (set! number-of-consecutive-failures 0)))))
-  
-  ;; ppanel-tree = 
-  ;;  (union (make-ppanel-leaf string (union #f panel) (panel -> panel))
-  ;;         (make-ppanel-interior string (union #f panel) (listof panel-tree)))
-  (define-struct ppanel (name panel))
-  (define-struct (ppanel-leaf ppanel) (maker))
-  (define-struct (ppanel-interior ppanel) (children) #:mutable)
-  
-  ;; ppanels : (listof ppanel-tree)
-  (define ppanels null)
-  
-  (define preferences-dialog #f)
-  
-  (define (add-panel title make-panel)
-    (when preferences-dialog
-      (error 'add-panel "preferences dialog already open, cannot add new panels"))
-    (let ([titles (if (string? title)
-                      (list title)
-                      title)])
-      (add-to-existing-children
-       titles 
-       make-panel
-       (λ (new-ppanels) (set! ppanels new-ppanels)))))
-  
-  ;; add-to-existing-children : (listof string) (panel -> panel) (ppanel -> void)
-  ;; adds the child specified by the path in-titles to the tree.
-  (define (add-to-existing-children in-titles make-panel banger)
-    (let loop ([children ppanels]
-               [title (car in-titles)]
-               [titles (cdr in-titles)]
-               [banger banger])
-      (cond
-        [(null? children)
-         (banger (list (build-new-subtree (cons title titles) make-panel)))]
-        [else
-         (let ([child (car children)])
-           (if (string=? (ppanel-name child) title)
-               (cond
-                 [(null? titles) 
-                  (error 'add-child "child already exists with this path: ~e" in-titles)]
-                 [(ppanel-leaf? child)
-                  (error 'add-child "new child's path conflicts with existing path: ~e" in-titles)]
-                 [else
-                  (loop
-                   (ppanel-interior-children child)
-                   (car titles)
-                   (cdr titles)
-                   (λ (children)
-                     (set-ppanel-interior-children! 
-                      child
-                      children)))])
-               (loop 
-                (cdr children)
-                title
-                titles
-                (λ (children)
-                   (banger (cons child children))))))])))
-
-  ;; build-new-subtree : (cons string (listof string)) (panel -> panel) -> ppanel
-  (define (build-new-subtree titles make-panel)
-    (let loop ([title (car titles)]
-               [titles (cdr titles)])
-      (cond
-        [(null? titles) (make-ppanel-leaf title #f make-panel)]
-        [else
-         (make-ppanel-interior 
-          title
-          #f
-          (list (loop (car titles) (cdr titles))))])))
-  
-  
-  (define (hide-dialog)
-    (when preferences-dialog
-      (send preferences-dialog close)))
-  
-  (define (show-dialog)
-    (if preferences-dialog
-        (send preferences-dialog show #t)
-        (set! preferences-dialog
-              (make-preferences-dialog))))
-  
-  (define (add-can-close-dialog-callback cb)
-    (set! can-close-dialog-callbacks
-          (cons cb can-close-dialog-callbacks)))
-  
-  (define (add-on-close-dialog-callback cb)
-    (set! on-close-dialog-callbacks
-          (cons cb on-close-dialog-callbacks)))
-  
-  (define on-close-dialog-callbacks null)
-  
-  (define can-close-dialog-callbacks null)
-  
-  (define (make-preferences-dialog)
-    (letrec ([stashed-prefs (preferences:get-prefs-snapshot)]
-             [cancelled? #f]
-             [frame-stashed-prefs%
-              (class frame:basic%
-                (inherit close)
-                (define/override (on-subwindow-char receiver event)
-                  (cond
-                    [(eq? 'escape (send event get-key-code))
-                     (set! cancelled? #t)
-                     (close)]
-                    [else 
-                     (super on-subwindow-char receiver event)]))
-                (define/augment (on-close)
-                  (when cancelled?
-                    (preferences:restore-prefs-snapshot stashed-prefs)))
-                (define/override (show on?)
-                  (when on?
-                    ;; reset the flag and save new prefs when the window becomes visible
-                    (set! cancelled? #f)
-                    (set! stashed-prefs (preferences:get-prefs-snapshot)))
-                  (super show on?))
-                (super-new))]
-             [frame 
-              (new frame-stashed-prefs%
-                   [label (string-constant preferences)]
-                   [height 200])]
-             [build-ppanel-tree
-              (λ (ppanel tab-panel single-panel)
-                (send tab-panel append (ppanel-name ppanel))
-                (cond
-                  [(ppanel-leaf? ppanel) 
-                   ((ppanel-leaf-maker ppanel) single-panel)]
-                  [(ppanel-interior? ppanel)
-                   (let-values ([(tab-panel single-panel) (make-tab/single-panel single-panel #t)])
-                     (for-each
-                      (λ (ppanel) (build-ppanel-tree ppanel tab-panel single-panel))
-                      (ppanel-interior-children ppanel)))]))]
-             [make-tab/single-panel 
-              (λ (parent inset?)
-                (letrec ([spacer (and inset?
-                                      (instantiate vertical-panel% ()
-                                        (parent parent)
-                                        (border 10)))]
-                         [tab-panel (instantiate tab-panel% ()
-                                      (choices null)
-                                      (parent (if inset? spacer parent))
-                                      (callback (λ (_1 _2) 
-                                                  (tab-panel-callback
-                                                   single-panel
-                                                   tab-panel))))]
-                         [single-panel (instantiate panel:single% ()
-                                         (parent tab-panel))])
-                  (values tab-panel single-panel)))]
-             [tab-panel-callback
-              (λ (single-panel tab-panel)
-                (send single-panel active-child
-                      (list-ref (send single-panel get-children)
-                                (send tab-panel get-selection))))]
-             [panel (make-object vertical-panel% (send frame get-area-container))]
-             [_ (let-values ([(tab-panel single-panel) (make-tab/single-panel panel #f)])
-                  (for-each
-                   (λ (ppanel)
-                     (build-ppanel-tree ppanel tab-panel single-panel))
-                   ppanels)
-                  (let ([single-panel-children (send single-panel get-children)])
-                    (unless (null? single-panel-children)
-                      (send single-panel active-child (car single-panel-children))
-                      (send tab-panel set-selection 0)))
-                  (send tab-panel focus))]
-             [bottom-panel (make-object horizontal-panel% panel)]
-             [ok-callback (λ args
-                            (when (andmap (λ (f) (f))
-                                          can-close-dialog-callbacks)
-                              (for-each
-                               (λ (f) (f))
-                               on-close-dialog-callbacks)
-                              (send frame close)))]
-             [cancel-callback (λ () 
-                                (set! cancelled? #t)
-                                (send frame close))])
-      (new button%
-           [label (string-constant revert-to-defaults)]
-           [callback
-            (λ (a b)
-              (preferences:restore-defaults))]
-           [parent bottom-panel])
-      (new horizontal-panel% [parent bottom-panel]) ;; spacer
-      (gui-utils:ok/cancel-buttons
-       bottom-panel
-       ok-callback
-       (λ (a b) (cancel-callback))
-       (string-constant ok)
-       (string-constant undo-changes))
-      (make-object grow-box-spacer-pane% bottom-panel)
-      (send* bottom-panel
-        (stretchable-height #f)
-        (set-alignment 'right 'center))
-      (send frame show #t)
-      frame))
-  
-  (define (add-to-scheme-checkbox-panel f)
-    (set! scheme-panel-procs 
-          (let ([old scheme-panel-procs])
-            (λ (parent) (old parent) (f parent)))))
-  
-  (define (add-to-editor-checkbox-panel f)
-    (set! editor-panel-procs 
-          (let ([old editor-panel-procs])
-            (λ (parent) (old parent) (f parent)))))
-  
-  (define (add-to-general-checkbox-panel f)
-    (set! general-panel-procs 
-          (let ([old general-panel-procs])
-            (λ (parent) (old parent) (f parent)))))
-  
-  (define (add-to-warnings-checkbox-panel f)
-    (set! warnings-panel-procs 
-          (let ([old warnings-panel-procs])
-            (λ (parent) (old parent) (f parent)))))
-  
-  (define scheme-panel-procs void)
-  (define editor-panel-procs void)
-  (define general-panel-procs void)
-  (define warnings-panel-procs void)
-  
-  (define (add-checkbox-panel label proc)
-    (add-panel
-     label
-     (λ (parent)
-       (let* ([main (make-object vertical-panel% parent)])
-         (send main set-alignment 'left 'center)
-         (proc main)
-         main))))
-  
-  ;; add-check : panel symbol string (boolean -> any) (any -> boolean) -> void
-  ;; adds a check box preference to `main'.
-  (define (add-check main pref title [bool->pref values] [pref->bool values])
-    (let* ([callback
-            (λ (check-box _)
-              (preferences:set pref (bool->pref (send check-box get-value))))]
-           [pref-value (preferences:get pref)]
-           [initial-value (pref->bool pref-value)]
-           [c (make-object check-box% title main callback)])
-      (send c set-value initial-value)
-      (preferences:add-callback
-       pref
-       (λ (p v)
-         (send c set-value (pref->bool v))))
-      (void)))
-  
-  (define (make-recent-items-slider parent)
-    (let ([slider (instantiate slider% ()
-                    (parent parent)
-                    (label (string-constant number-of-open-recent-items))
-                    (min-value 1)
-                    (max-value 100)
-                    (init-value (preferences:get 'framework:recent-max-count))
-                    (callback (λ (slider y)
-                                (preferences:set 'framework:recent-max-count
-                                                 (send slider get-value)))))])
-      (preferences:add-callback
-       'framework:recent-max-count
-       (λ (p v)
-         (send slider set-value v)))))
-  
-  (define (add-scheme-checkbox-panel)
-    (letrec ([add-scheme-checkbox-panel
-              (λ ()
-                (set! add-scheme-checkbox-panel void)
-                (add-checkbox-panel
-                 (list 
-                  (string-constant editor-prefs-panel-label) 
-                  (string-constant scheme-prefs-panel-label))
-                 (λ (scheme-panel)
-                   (add-check scheme-panel
-                              'framework:highlight-parens
-                              (string-constant highlight-parens)
-                              values values)
-                   (add-check scheme-panel
-                              'framework:fixup-parens
-                              (string-constant fixup-close-parens)
-                              values values)
-                   (add-check scheme-panel
-                              'framework:fixup-open-parens
-                              (string-constant fixup-open-brackets)
-                              values values)
-                   (add-check scheme-panel
-                              'framework:paren-match
-                              (string-constant flash-paren-match)
-                              values values)
-                   (scheme-panel-procs scheme-panel))))])
-      (add-scheme-checkbox-panel)))
-  
-  (define (add-editor-checkbox-panel)
-    (letrec ([add-editor-checkbox-panel
-              (λ ()
-                (set! add-editor-checkbox-panel void)
-                (add-checkbox-panel 
-                 (list (string-constant editor-prefs-panel-label) 
-                       (string-constant general-prefs-panel-label))
-                 (λ (editor-panel)
-                   (add-check editor-panel 'framework:delete-forward? (string-constant map-delete-to-backspace)
-                              not not)
-                   (add-check editor-panel 
-                              'framework:auto-set-wrap?
-                              (string-constant wrap-words-in-editor-buffers))
-                   
-                   (add-check editor-panel 
-                              'framework:menu-bindings
-                              (string-constant enable-keybindings-in-menus))
-                   (when (memq (system-type) '(macosx))
-                     (add-check editor-panel 
-                                'framework:alt-as-meta
-                                (string-constant alt-as-meta))
-                     (add-check editor-panel 
-                                'framework:special-meta-key
-                                (string-constant command-as-meta)))
-                   
-                   (add-check editor-panel 
-                              'framework:coloring-active
-                              (string-constant online-coloring-active))
-                   
-                   (add-check editor-panel
-                               'framework:anchored-search
-                               (string-constant find-anchor-based))
-                   (add-check editor-panel
-                              'framework:do-paste-normalization
-                              (string-constant normalize-string-preference))
-                   (add-check editor-panel
-                               'framework:overwrite-mode-keybindings
-                               (string-constant enable-overwrite-mode-keybindings))
-                   (add-check editor-panel
-                               'framework:automatic-parens
-                               (string-constant enable-automatic-parens))
-                   (when (eq? (system-type) 'windows)
-                     (add-check editor-panel
-                                 'framework:always-use-platform-specific-linefeed-convention
-                                 (string-constant always-use-platform-specific-linefeed-convention)))
-                   (add-check editor-panel
-                              'framework:line-spacing-add-gap?
-                              (string-constant add-spacing-between-lines))
-                   
-                   (let ([hp (new horizontal-panel% [parent editor-panel] [stretchable-height #f])]
-                         [init-pref (preferences:get 'framework:column-guide-width)])
-                     (define on-cb
-                       (new check-box% 
-                            [parent hp]
-                            [label (string-constant maximum-char-width-guide-pref-check-box)]
-                            [value (car init-pref)]
-                            [callback
-                             (λ (x y)
-                               (update-pref)
-                               (update-tf-bkg)
-                               (send tf enable (send on-cb get-value)))]))
-                     (define tf 
-                       (new text-field%
-                            [label #f]
-                            [parent hp]
-                            [init-value (format "~a" (cadr init-pref))]
-                            [callback
-                             (λ (x y)
-                               (update-pref)
-                               (update-tf-bkg))]))
-                     (define (update-tf-bkg)
-                       (send tf set-field-background
-                             (send the-color-database find-color 
-                                   (cond
-                                     [(not (send on-cb get-value)) "gray"]
-                                     [(good-val? (string->number (send tf get-value)))
-                                      "white"]
-                                     [else
-                                      "yellow"]))))
-                     (define (good-val? n)
-                       (and (exact-integer? n)
-                            (>= n 2)))
-                     (define (update-pref)
-                       (define current (preferences:get 'framework:column-guide-width))
-                       (define candidate-num (string->number (send tf get-value)))
-                       (preferences:set 'framework:column-guide-width
-                                        (list (send on-cb get-value)
-                                              (if (good-val? candidate-num)
-                                                  candidate-num
-                                                  (cadr current)))))
-                     (update-tf-bkg))
-                   
-                   (editor-panel-procs editor-panel))))])
-      (add-editor-checkbox-panel)))
-  
-  (define (add-general-checkbox-panel)
-    (letrec ([add-general-checkbox-panel
-              (λ ()
-                (set! add-general-checkbox-panel void)
-                (add-checkbox-panel 
-                 (list (string-constant general-prefs-panel-label))
-                 (λ (editor-panel)
-                   (make-recent-items-slider editor-panel)
-                   (add-check editor-panel
-                              'framework:autosaving-on? 
-                              (string-constant auto-save-files))
-                   (add-check editor-panel 'framework:backup-files? (string-constant backup-files))
-                   (add-check editor-panel 'framework:show-status-line (string-constant show-status-line))
-                   ;; does this not belong here?
-                   ;; (add-check editor-panel 'drracket:show-line-numbers (string-constant show-line-numbers)
-                   (add-check editor-panel 'framework:col-offsets (string-constant count-columns-from-one))
-                   (add-check editor-panel 
-                              'framework:display-line-numbers
-                              (string-constant display-line-numbers))
-                   (define print-rb (new radio-box% 
-                                         [label (string-constant printing-mode)]
-                                         [parent editor-panel]
-                                         [choices (list (string-constant print-using-platform-specific-mode)
-                                                        (string-constant print-to-ps)
-                                                        (string-constant print-to-pdf))]
-                                         [callback
-                                          (λ (rb evt)
-                                            (preferences:set 'framework:print-output-mode
-                                                             (case (send print-rb get-selection)
-                                                               [(0) 'standard]
-                                                               [(1) 'postscript]
-                                                               [(2) 'pdf])))]))
-                   (define (update-print-rb what)
-                     (send print-rb set-selection (case what
-                                                    [(standard) 0]
-                                                    [(postscript) 1]
-                                                    [(pdf) 2])))
-                   (update-print-rb (preferences:get 'framework:print-output-mode))
-                   (preferences:add-callback 'framework:print-output-mode (λ (p v) (update-print-rb v)))
-                   (general-panel-procs editor-panel))))])
-      (add-general-checkbox-panel)))
-  
-  (define (add-warnings-checkbox-panel)
-    (letrec ([add-warnings-checkbox-panel
-              (λ ()
-                (set! add-warnings-checkbox-panel void)
-                (add-checkbox-panel
-                 (string-constant warnings-prefs-panel-label)
-                 (λ (warnings-panel)
-                   (add-check warnings-panel 
-                              'framework:verify-change-format 
-                              (string-constant ask-before-changing-format))
-                   (add-check warnings-panel 
-                              'framework:verify-exit
-                              (string-constant verify-exit))
-                   (add-check warnings-panel
-                              'framework:ask-about-paste-normalization
-                              (string-constant ask-about-normalizing-strings))
-                   (warnings-panel-procs warnings-panel))))])
-      (add-warnings-checkbox-panel)))
-  
-  (define (local-add-font-panel)
-    (let* ([font-families-name/const
-            (list (list "Default" 'default)
-                  (list "Decorative" 'decorative)
-                  (list "Modern" 'modern)
-                  (list "Roman" 'roman)
-                  (list "Script" 'script)
-                  (list "Swiss" 'swiss))]
-           
-           [font-families (map car font-families-name/const)]
-           
-           [font-size-entry "defaultFontSize"]
-           [font-default-string "Default Value"]
-           [font-default-size (case (system-type)
-                                [(windows) 10]
-                                [(macosx) 13]
-                                [else 12])]
-           [font-section "mred"]
-           [build-font-entry (λ (x) (string-append "Screen" x "__"))]
-           [build-font-preference-symbol
-            (λ (family)
-              (string->symbol (string-append "framework:" family)))]
-           
-           [set-default
-            (λ (build-font-entry default pred)
-              (λ (family)
-                (let ([name (build-font-preference-symbol family)]
-                      [font-entry (build-font-entry family)])
-                  (preferences:set-default
-                   name
-                   default
-                   (cond
-                     [(string? default) string?]
-                     [(number? default) number?]
-                     [else (error 'internal-error.set-default "unrecognized default: ~a\n" default)])))))])
-      
-      (for-each (set-default build-font-entry font-default-string string?)
-                font-families)
-      ((set-default (λ (x) x)
-                    font-default-size
-                    number?)
-       font-size-entry)
-      (add-panel
-       (string-constant default-fonts)
-       (λ (parent)
-         (letrec ([font-size-pref-sym (build-font-preference-symbol font-size-entry)]
-                  [ex-string (string-constant font-example-string)]
-                  [main (make-object vertical-panel% parent)]
-                  [fonts (cons font-default-string (get-face-list))]
-                  [make-family-panel
-                   (λ (name)
-                     (let* ([pref-sym (build-font-preference-symbol name)]
-                            [family-const-pair (assoc name font-families-name/const)]
-                            
-                            [edit (make-object text%)]
-                            [_ (send edit insert ex-string)]
-                            [set-edit-font
-                             (λ (size)
-                               (let ([delta (make-object style-delta% 'change-size size)]
-                                     [face (preferences:get pref-sym)])
-                                 (if (and (string=? face font-default-string)
-                                          family-const-pair)
-                                     (send delta set-family (cadr family-const-pair))
-                                     (send delta set-delta-face (preferences:get pref-sym)))
-                                 
-                                 (send edit change-style delta 0 (send edit last-position))))]
-                            
-                            [horiz (make-object horizontal-panel% main '(border))]
-                            [label (make-object message% name horiz)]
-                            
-                            [message (make-object message%
-                                       (let ([b (box "")])
-                                         font-default-string)
-                                       horiz)]
-                            [button 
-                             (make-object button%
-                               (string-constant change-font-button-label)
-                               horiz
-                               (λ (button evt)
-                                 (let ([new-value
-                                        (get-choices-from-user
-                                         (string-constant fonts)
-                                         (format (string-constant choose-a-new-font)
-                                                 name)
-                                         fonts)])
-                                   (when new-value
-                                     (preferences:set pref-sym (list-ref fonts (car new-value))) 
-                                     (set-edit-font (preferences:get font-size-pref-sym))))))]
-                            [canvas (make-object editor-canvas% horiz
-                                      edit
-                                      (list 'hide-hscroll
-                                            'hide-vscroll))])
-                       (set-edit-font (preferences:get font-size-pref-sym))
-                       (preferences:add-callback
-                        pref-sym
-                        (λ (p new-value)
-                          (send horiz change-children
-                                (λ (l)
-                                  (let ([new-message (make-object message%
-                                                       new-value
-                                                       horiz)])
-                                    (set! message new-message)
-                                    (update-message-sizes font-message-get-widths 
-                                                          font-message-user-min-sizes)
-                                    (list label 
-                                          new-message
-                                          button
-                                          canvas))))))
-                       (send canvas set-line-count 1)
-                       (vector set-edit-font
-                               (λ () (send message get-width))
-                               (λ (width) (send message min-width width))
-                               (λ () (send label get-width))
-                               (λ (width) (send label min-width width)))))]
-                  [set-edit-fonts/messages (map make-family-panel font-families)]
-                  [collect (λ (n) (map (λ (x) (vector-ref x n))
-                                       set-edit-fonts/messages))]
-                  [set-edit-fonts (collect 0)]
-                  [font-message-get-widths (collect 1)]
-                  [font-message-user-min-sizes (collect 2)]
-                  [category-message-get-widths (collect 3)]
-                  [category-message-user-min-sizes (collect 4)]
-                  [update-message-sizes
-                   (λ (gets sets)
-                     (let ([width (foldl (λ (x l) (max l (x))) 0 gets)])
-                       (for-each (λ (set) (set width)) sets)))]
-                  [size-panel (make-object horizontal-panel% main '(border))]
-                  [initial-font-size
-                   (let ([b (box 0)])
-                     font-default-size)]
-                  [size-slider
-                   (make-object slider%
-                     (string-constant font-size-slider-label)
-                     1 127
-                     size-panel
-                     (λ (slider evt)
-                       (preferences:set font-size-pref-sym (send slider get-value)))
-                     initial-font-size)])
-           (update-message-sizes font-message-get-widths font-message-user-min-sizes)
-           (update-message-sizes category-message-get-widths category-message-user-min-sizes)
-           (preferences:add-callback
-            font-size-pref-sym
-            (λ (p value)
-              (for-each (λ (f) (f value)) set-edit-fonts)
-              (unless (= value (send size-slider get-value))
-                (send size-slider set-value value))
-              #t))
-           (for-each (λ (f) (f initial-font-size)) set-edit-fonts)
-           (make-object message% (string-constant restart-to-see-font-changes) main)
-           main))))
-    (set! local-add-font-panel void))
-  
-  (define (add-font-panel) (local-add-font-panel))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/racket.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/racket.rkt
deleted file mode 100644
index 38662f2060..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/racket.rkt
+++ /dev/null
@@ -1,2250 +0,0 @@
-#lang racket/unit
-
-;; originally by Dan Grossman
-;; 6/30/95
-
-(require string-constants
-         racket/class
-         racket/string
-         mred/mred-sig
-         syntax-color/module-lexer
-         "collapsed-snipclass-helpers.rkt"
-         "sig.rkt"
-         "../gui-utils.rkt"
-         "../preferences.rkt"
-         racket/match
-         unstable/options)
-
-(import mred^
-        [prefix preferences: framework:preferences^]
-        [prefix icon: framework:icon^]
-        [prefix keymap: framework:keymap^]
-        [prefix text: framework:text^]
-        [prefix editor: framework:editor^]
-        [prefix frame: framework:frame^]
-        [prefix comment-box: framework:comment-box^]
-        [prefix mode: framework:mode^]
-        [prefix color: framework:color^]
-        [prefix color-prefs: framework:color-prefs^]
-        [prefix finder: framework:finder^])
-
-(export (rename framework:racket^
-                [-text-mode<%> text-mode<%>]
-                [-text<%> text<%>]
-                [-text% text%]))
-
-(init-depend mred^ framework:keymap^ framework:color^ framework:mode^
-             framework:text^ framework:editor^)
-
-(define-local-member-name 
-  stick-to-next-sexp?
-  get-private-racket-container-keymap)
-
-(define (racket-paren:get-paren-pairs)
-  '(("(" . ")")
-    ("[" . "]")
-    ("{" . "}")))
-
-(define text-balanced? 
-  (lambda (text [start 0] [in-end #f])
-    (let* ([end (or in-end (send text last-position))]
-           [port (open-input-text-editor text start end)])
-      (with-handlers ([exn:fail:read:eof? (λ (x) #f)]
-                      [exn:fail:read? (λ (x) #t)])
-        (let ([first (read port)])
-          (cond
-            [(eof-object? first) #f]
-            [else
-             (let loop ()
-               (let ([s (read port)])
-                 (cond
-                   [(eof-object? s) #t]
-                   [else (loop)])))]))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                                  ;;
-;;                           Sexp Snip                              ;;
-;;                                                                  ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (set-box/f! b v) (when (box? b) (set-box! b v)))
-
-(define sexp-snip<%>
-  (interface ()
-    get-saved-snips))
-
-(define sexp-snip%
-  (class* snip% (sexp-snip<%> readable-snip<%>)
-    (init-field left-bracket right-bracket saved-snips)
-    (define/public (get-saved-snips) saved-snips)
-    (field [sizing-text (format "~a   ~a" left-bracket right-bracket)])
-    
-    (define/public (read-special file line col pos)
-      (let ([text (make-object text:basic%)])
-        (for-each
-         (λ (s) (send text insert (send s copy)
-                      (send text last-position)
-                      (send text last-position)))
-         saved-snips)
-        (datum->syntax
-         #f
-         (read (open-input-text-editor text))
-         (list file line col pos 1))))
-    
-    (define/override get-text
-      (lambda (offset num [flattened? #f])
-        (if flattened?
-            (apply string-append
-                   (map (λ (snip)
-                          (send snip get-text 0 (send snip get-count) flattened?))
-                        saved-snips))
-            (super get-text offset num flattened?))))
-    
-    (define/override (copy)
-      (instantiate sexp-snip% ()
-        (left-bracket left-bracket)
-        (right-bracket right-bracket)
-        (saved-snips saved-snips)))
-    
-    (define/override (write stream-out)
-      (send stream-out put (bytes (char->integer left-bracket)))
-      (send stream-out put (bytes (char->integer right-bracket)))
-      (send stream-out put (length saved-snips))
-      (let loop ([snips saved-snips])
-        (cond
-          [(null? snips) (void)]
-          [else
-           (let* ([snip (car snips)]
-                  [snipclass (send snip get-snipclass)])
-             (send stream-out put (string->bytes/utf-8 (send snipclass get-classname)))
-             (send snip write stream-out))
-           (loop (cdr snips))])))
-    
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (send dc draw-text sizing-text x y)
-      (let-values ([(lpw lph lpa lpd) (send dc get-text-extent (string left-bracket))]
-                   [(rpw rph rpa rpd) (send dc get-text-extent (string right-bracket))]
-                   [(sw sh sa sd) (send dc get-text-extent sizing-text)])
-        (let* ([dtw (- sw lpw rpw)]
-               [dot-start (+ x lpw)]
-               [dt1x (+ dot-start (* dtw 1/5))]
-               [dt2x (+ dot-start (* dtw 1/2))]
-               [dt3x (+ dot-start (* dtw 4/5))]
-               [dty (+ y (/ sh 2))])
-          (send dc draw-rectangle dt1x dty 2 2)
-          (send dc draw-rectangle dt2x dty 2 2)
-          (send dc draw-rectangle dt3x dty 2 2))))
-    
-    (inherit get-style)
-    (define/override (get-extent dc x y wb hb descentb spaceb lspaceb rspaceb)
-      (let-values ([(w h d a) (send dc get-text-extent sizing-text (send (get-style) get-font))])
-        (set-box/f! wb w)
-        (set-box/f! hb h)
-        (set-box/f! descentb d)
-        (set-box/f! spaceb a)
-        (set-box/f! lspaceb 0)
-        (set-box/f! rspaceb 0)))
-    (super-new)
-    (inherit set-snipclass)
-    (set-snipclass 2lib-snip-class)))
-
-(define sexp-snipclass% (make-sexp-snipclass% sexp-snip%))
-
-;; old snips (from old versions of drracket) use this snipclass
-(define 2lib-snip-class (make-object sexp-snipclass%))
-(send 2lib-snip-class set-classname (format "~s" '((lib "collapsed-snipclass.ss" "framework")
-                                                   (lib "collapsed-snipclass-wxme.ss" "framework"))))
-(send 2lib-snip-class set-version 0)
-(send (get-the-snip-class-list) add 2lib-snip-class)
-
-;; old snips (from old versions of drracket) use this snipclass
-(define lib-snip-class (make-object sexp-snipclass%))
-(send lib-snip-class set-classname (format "~s" '(lib "collapsed-snipclass.ss" "framework")))
-(send lib-snip-class set-version 0)
-(send (get-the-snip-class-list) add lib-snip-class)
-
-;; new snips use this snipclass
-(define old-snip-class (make-object sexp-snipclass%))
-(send old-snip-class set-classname "drscheme:sexp-snip")
-(send old-snip-class set-version 0)
-(send (get-the-snip-class-list) add old-snip-class)
-
-(keymap:add-to-right-button-menu
- (let ([old (keymap:add-to-right-button-menu)])
-   (λ (menu text event)
-     (old menu text event)
-     (split/collapse-text menu text event)
-     (void))))
-
-;; split/collapse-text : (instanceof menu%) (instanceof editor<%>) (instanceof mouse-event%) -> void
-(define (split/collapse-text menu text event)
-  (when (and (is-a? text -text<%>)
-             (not (send text is-stopped?)))
-    (let* ([on-it-box (box #f)]
-           [click-pos 
-            (call-with-values
-             (λ ()
-               (send text dc-location-to-editor-location
-                     (send event get-x)
-                     (send event get-y)))
-             (λ (x y)
-               (send text find-position x y #f on-it-box)))]
-           [snip (send text find-snip click-pos 'after)]
-           [char (send text get-character click-pos)]
-           [left? (memq char '(#\( #\{ #\[))]
-           [right? (memq char '(#\) #\} #\]))])
-      (cond
-        [(and snip (is-a? snip sexp-snip<%>))
-         (make-expand-item text snip menu)]
-        [(not (unbox on-it-box))
-         ;; clicking in nowhere land, just ignore
-         (void)]
-        [(or left? right?)
-         ;; clicking on left or right paren
-         (let* ([pos (if left?
-                         click-pos
-                         (+ click-pos 1))]
-                [other-pos (if left?
-                               (send text get-forward-sexp pos)
-                               (send text get-backward-sexp pos))])
-           (when other-pos
-             (let ([left-pos (min pos other-pos)]
-                   [right-pos (max pos other-pos)])
-               (make-collapse-item text left-pos right-pos menu))))]
-        [else 
-         ;; clicking on some other text -> collapse containing sexp
-         (let ([up-sexp (send text find-up-sexp click-pos)])
-           (when up-sexp 
-             (let ([fwd (send text get-forward-sexp up-sexp)])
-               (when fwd
-                 (make-collapse-item text up-sexp fwd menu)))))]))))
-
-;; make-expand-item : (instanceof text%) (instanceof sexp-snip<%>) (instanceof menu%) -> void
-(define (make-expand-item text snip menu)
-  (instantiate separator-menu-item% ()
-    (parent menu))
-  (instantiate menu-item% ()
-    (parent menu)
-    (label (string-constant expand-sexp))
-    (callback (λ (item evt) (expand-from text snip)))))
-
-;; expand-from : (instanceof text%) (instanceof sexp-snip<%>) -> void
-(define (expand-from text snip)
-  (let ([snips (send snip get-saved-snips)])
-    (send text begin-edit-sequence)
-    (let ([pos (send text get-snip-position snip)])
-      (send text delete pos (+ pos 1))
-      (let loop ([snips (reverse snips)])
-        (cond
-          [(null? snips) (void)]
-          [else (send text insert (send (car snips) copy) pos pos)
-                (loop (cdr snips))])))
-    (send text end-edit-sequence)))
-
-;; make-collapse-item : (instanceof text%) number number (instanceof menu%) -> void
-;; adds a collapse menu item to the menu
-(define (make-collapse-item text left-pos right-pos menu)
-  (instantiate separator-menu-item% ()
-    (parent menu))
-  (instantiate menu-item% ()
-    (parent menu)
-    (label (string-constant collapse-sexp))
-    (callback (λ (item evt)
-                (collapse-from text left-pos right-pos)))))
-
-(define (collapse-from text left-pos right-pos)
-  (let ([left-bracket (send text get-character left-pos)]
-        [right-bracket (send text get-character (- right-pos 1))])
-    (send text begin-edit-sequence)
-    (send text split-snip left-pos)
-    (send text split-snip right-pos)
-    (let ([snips (let loop ([snip (send text find-snip left-pos 'after)])
-                   (cond
-                     [(not snip) null]
-                     [((send text get-snip-position snip) . >= . right-pos)
-                      null]
-                     [else (cons (send snip copy) (loop (send snip next)))]))])
-      (send text delete left-pos right-pos)
-      (send text insert (instantiate sexp-snip% () 
-                          (left-bracket left-bracket)
-                          (right-bracket right-bracket)
-                          (saved-snips snips))
-            left-pos left-pos)
-      (send text end-edit-sequence))))
-
-
-;                                            
-;                                            
-;                                            
-;               ;  ;;;;                      
-;              ;;  ;;;;                      
-;    ;;;;    ;;;;; ;;;; ;;;    ;;;   ;;; ;;; 
-;   ;;;;;;  ;;;;;; ;;;;;;;;;  ;;;;;  ;;;;;;; 
-;  ;;;;;;;;  ;;;;  ;;;; ;;;; ;;;; ;; ;;;; ;; 
-;  ;;;; ;;;  ;;;;  ;;;; ;;;; ;;;;;;; ;;;;    
-;  ;;;;;;;;  ;;;;; ;;;; ;;;; ;;;;;   ;;;;    
-;   ;;;;;;   ;;;;; ;;;; ;;;;  ;;;;;; ;;;;    
-;    ;;;;     ;;;; ;;;; ;;;;   ;;;;  ;;;;    
-;                                            
-;                                            
-;                                            
-
-
-(define color-prefs-table
-  (let ([constant-green (make-object color% 41 128 38)]
-        [symbol-blue (make-object color% 38 38 128)])
-    `((symbol ,symbol-blue ,(string-constant scheme-mode-color-symbol))
-      (keyword ,symbol-blue ,(string-constant scheme-mode-color-keyword))
-      (comment ,(make-object color% 194 116 31) ,(string-constant scheme-mode-color-comment))
-      (string ,constant-green ,(string-constant scheme-mode-color-string))
-      (text ,constant-green ,(string-constant scheme-mode-color-text))
-      (constant ,constant-green ,(string-constant scheme-mode-color-constant))
-      (hash-colon-keyword ,(make-object color% "brown")
-                          ,(string-constant scheme-mode-color-hash-colon-keyword))
-      (parenthesis ,(make-object color% "brown") ,(string-constant scheme-mode-color-parenthesis))
-      (error ,(make-object color% "red") ,(string-constant scheme-mode-color-error))
-      (other ,(make-object color% "black") ,(string-constant scheme-mode-color-other)))))
-
-(define white-on-black-color-prefs-table
-  (let* ([sym/kwd (make-object color% 102 102 255)]
-         [new-entries
-          `((symbol ,sym/kwd)
-            (keyword ,sym/kwd)
-            (comment ,(make-object color% 249 148 40))
-            (string ,(make-object color% 51 174 51))
-            (text ,(make-object color% 51 174 51))
-            (constant ,(make-object color% 60 194 57))
-            (hash-colon-keyword ,(make-object color% 151 69 43))
-            (parenthesis ,(make-object color% 151 69 43))
-            (other ,(make-object color% "white")))])
-    (map 
-     (λ (line)
-       (let ([new (assoc (car line) new-entries)])
-         (if new
-             (list* (car line)
-                    (cadr new)
-                    (cddr line))
-             line)))
-     color-prefs-table)))
-
-(define (get-color-prefs-table) color-prefs-table)
-(define (get-white-on-black-color-prefs-table) white-on-black-color-prefs-table)
-
-(define (short-sym->pref-name sym) (string->symbol (short-sym->style-name sym)))
-(define (xlate-sym-style sym) (case sym
-                                [(sexp-comment) 'comment]
-                                [else sym]))
-(define sn-hash (make-hasheq))
-(define (short-sym->style-name _sym)
-  (define sym (if (eq? _sym 'white-space)
-                  'parenthesis
-                  _sym))
-  (hash-ref sn-hash sym
-            (λ ()
-              (let ([s (format "framework:syntax-color:scheme:~a"
-                               (xlate-sym-style sym))])
-                (hash-set! sn-hash sym s)
-                s))))
-
-(define (add-coloring-preferences-panel)
-  (color-prefs:add-to-preferences-panel
-   "Racket"
-   (λ (parent)
-     (for-each
-      (λ (line)
-        (let ([sym (car line)])
-          (color-prefs:build-color-selection-panel 
-           parent
-           (short-sym->pref-name sym)
-           (short-sym->style-name sym)
-           (caddr line))))
-      color-prefs-table))))
-
-(define-struct string/pos (string pos))
-
-(define -text<%>
-  (interface (text:basic<%> mode:host-text<%> color:text<%>)
-    get-limit
-    balance-parens
-    tabify-on-return?
-    tabify
-    tabify-selection
-    tabify-all
-    insert-return
-    box-comment-out-selection
-    comment-out-selection
-    uncomment-selection
-    get-forward-sexp
-    remove-sexp
-    forward-sexp
-    flash-forward-sexp
-    get-backward-sexp
-    flash-backward-sexp
-    backward-sexp
-    find-up-sexp
-    up-sexp
-    find-down-sexp
-    down-sexp
-    remove-parens-forward
-    
-    select-forward-sexp
-    select-backward-sexp
-    select-up-sexp
-    select-down-sexp
-    transpose-sexp
-    mark-matching-parenthesis
-    get-tab-size
-    set-tab-size
-    
-    introduce-let-ans
-    move-sexp-out
-    kill-enclosing-parens
-    toggle-round-square-parens))
-
-(define init-wordbreak-map
-  (λ (map)
-    (send map set-map  #\< '(line selection))  ; interfaces e.g.the canvas<%> interface
-    (send map set-map  #\> '(line selection))  ; interfaces, casts e.g. string->path
-    (send map set-map  #\% '(line selection))  ; intefraces, classes
-    (send map set-map  #\? '(line selection))  ; predicates
-    (send map set-map  #\' '(line selection))  ; literal symbols
-    (send map set-map  #\! '(line selection))  ; assignments e.g. set
-    (send map set-map  #\- '(line selection))  ; hyphens
-    (send map set-map  #\: '(line selection)))); valid identifiers with colons
-
-(define wordbreak-map (make-object editor-wordbreak-map%))
-(define (get-wordbreak-map) wordbreak-map)
-(init-wordbreak-map wordbreak-map)
-
-(define matching-parenthesis-style 
-  (let ([matching-parenthesis-delta (make-object style-delta% 'change-bold)]
-        [style-list (editor:get-standard-style-list)])
-    (send matching-parenthesis-delta set-delta-foreground "forest green")
-    (send style-list new-named-style "Matching Parenthesis Style"
-          (send style-list find-or-create-style
-                (send style-list find-named-style "Standard")
-                matching-parenthesis-delta))
-    (send style-list find-named-style "Matching Parenthesis Style")))
-
-(define text-mixin
-  (mixin (text:basic<%> mode:host-text<%> color:text<%> text:autocomplete<%> editor:keymap<%>)
-         (-text<%>)
-    (inherit begin-edit-sequence
-             delete
-             end-edit-sequence
-             local-edit-sequence?
-             find-string
-             extend-position
-             get-character
-             get-extend-end-position
-             get-extend-start-position
-             get-keymap
-             get-text
-             get-start-position
-             get-style-list
-             get-end-position
-             flash-on
-             insert
-             is-stopped?
-             kill
-             last-position
-             paragraph-start-position
-             paragraph-end-position
-             position-paragraph
-             set-keymap
-             set-load-overwrites-styles
-             set-position
-             set-wordbreak-map
-             set-tabs
-             set-style-list
-             set-styles-fixed
-             change-style
-             get-snip-position
-             backward-match
-             backward-containing-sexp
-             forward-match
-             skip-whitespace
-             insert-close-paren
-             classify-position)
-    
-    (inherit get-styles-fixed)
-    (inherit has-focus? find-snip split-snip
-             position-location get-dc)
-    
-    (define private-racket-container-keymap (new keymap:aug-keymap%))
-    (define/public (get-private-racket-container-keymap) private-racket-container-keymap) 
-    
-    (define/override (get-keymaps)
-      (editor:add-after-user-keymap private-racket-container-keymap 
-                                    (super get-keymaps)))
-    
-    (define/override (get-word-at current-pos)
-      (let ([no-word ""])
-        (cond
-          [(is-stopped?)
-           no-word]
-          [else
-           (let ([type (classify-position (max 0 (- current-pos 1)))])
-             (cond
-               [(memq type '(symbol keyword)) 
-                (get-text (look-for-non-symbol/non-kwd (max 0 (- current-pos 1)))
-                          current-pos)]
-               [else no-word]))])))
-    
-    (define/private (look-for-non-symbol/non-kwd start)
-      (let loop ([i start])
-        (cond
-          [(< i 0) 
-           0]
-          [(memq (classify-position i) '(symbol keyword))
-           (loop (- i 1))]
-          [else
-           (+ i 1)])))
-    
-    (public tabify-all insert-return calc-last-para 
-            box-comment-out-selection comment-out-selection uncomment-selection
-            flash-forward-sexp 
-            flash-backward-sexp backward-sexp find-up-sexp up-sexp find-down-sexp down-sexp
-            remove-parens-forward)
-    
-    (define/public (get-limit pos) 0)
-    
-    (define/public (balance-parens key-event [smart-skip #f])
-      (insert-close-paren (get-start-position) 
-                          (send key-event get-key-code)
-                          (preferences:get 'framework:paren-match)
-                          (preferences:get 'framework:fixup-parens)
-                          (or smart-skip
-                              (and (preferences:get 'framework:automatic-parens)
-                                   (not (in-string/comment? this))
-                                   'adjacent))))
-    
-    (define/public (tabify-on-return?) #t)
-    (define/public (tabify [pos (get-start-position)])
-      (unless (is-stopped?)
-        (define tabify-prefs (preferences:get 'framework:tabify))
-        (define last-pos (last-position))
-        (define para (position-paragraph pos))
-        (define is-tabbable?
-          (and (> para 0)
-               (not (memq (classify-position (- (paragraph-start-position para) 1))
-                          '(comment string error)))))
-        (define end (if is-tabbable? (paragraph-start-position para) 0))
-        (define limit (get-limit pos))
-        
-        ;; "contains" is the start of the initial sub-S-exp
-        ;;  in the S-exp that contains "pos". If pos is outside
-        ;;  all S-exps, this will be the start of the initial
-        ;;  S-exp
-        (define contains
-          (if is-tabbable?
-              (backward-containing-sexp end limit)
-              #f))
-        (define contain-para (and contains
-                                  (position-paragraph contains)))
-        
-        ;; last is the start of the S-exp just before "pos"
-        (define last
-          (if contains
-              (let ([p (get-backward-sexp end)])
-                (if (and p (p . >= . limit))
-                    p
-                    (backward-match end limit)))
-              #f))
-        (define last-para (and last (position-paragraph last)))
-        
-        ;; last2 is the start of the S-exp just before the one before "pos"
-        (define last2
-          (if last
-              (let ([p (get-backward-sexp last)])
-                (if (and p (p . >= . limit))
-                    p
-                    (backward-match last limit)))
-              #f))
-        
-        (define sizing-dc (or (get-dc) (make-object bitmap-dc% (make-bitmap 1 1))))
-        (define (find-offset start-pos)
-          (define tab-char? #f)
-          (define end-pos
-            (let loop ([p start-pos])
-              (let ([c (get-character p)])
-                (cond
-                  [(char=? c #\tab)
-                   (set! tab-char? #t)
-                   (loop (add1 p))]
-                  [(char=? c #\newline)
-                   p]
-                  [(char-whitespace? c)
-                   (loop (add1 p))]
-                  [else
-                   p]))))
-          (define start-x (box 0))
-          (define end-x (box 0))
-          (position-location start-pos start-x #f #t #t)
-          (position-location end-pos end-x #f #t #t)
-          (define-values (w _1 _2 _3)
-            (send sizing-dc get-text-extent "x"
-                  (send (send (get-style-list)
-                              find-named-style "Standard")
-                        get-font)))
-          (values (inexact->exact (floor (/ (- (unbox end-x) (unbox start-x)) w)))
-                  end-pos
-                  tab-char?))
-        
-        (define (visual-offset pos)
-          (let loop ([p (sub1 pos)])
-            (if (= p -1)
-                0
-                (let ([c (get-character p)])
-                  (cond
-                    [(char=? c #\null) 0]
-                    [(char=? c #\tab)
-                     (let ([o (loop (sub1 p))])
-                       (+ o (- 8 (modulo o 8))))]
-                    [(char=? c #\newline) 0]
-                    [else (add1 (loop (sub1 p)))])))))
-        
-        (define (do-indent amt)
-          (define pos-start end)
-          (define-values (gwidth curr-offset tab-char?) (find-offset pos-start))
-          (unless (and (not tab-char?) (= amt (- curr-offset pos-start)))
-            (delete pos-start curr-offset)
-            (insert (make-string amt #\space) pos-start)))
-        (define (get-proc)
-          (define id-end (get-forward-sexp contains))
-          (and (and id-end (> id-end contains))
-               (let ([text (get-text contains id-end)])
-                 (or (get-keyword-type text tabify-prefs)
-                     'other))))
-        (define (procedure-indent)
-          (case (get-proc)
-            [(begin define) 1]
-            [(lambda) 3]
-            [else 0]))
-        (define (define-or-lambda-style?)
-          (define proc-name (get-proc))
-          (or (equal? proc-name 'define)
-              (equal? proc-name 'lambda)))
-        (define (for/fold-style?)
-          (define proc-name (get-proc))
-          (equal? proc-name 'for/fold))
-        
-        (define (indent-first-arg start)
-          (define-values (gwidth curr-offset tab-char?) (find-offset start))
-          gwidth)
-        
-        (when (and is-tabbable?
-                   (not (char=? (get-character (sub1 end))
-                                #\newline)))
-          (insert #\newline (paragraph-start-position para)))
-        
-        (cond
-          [(not is-tabbable?)
-           (when (= para 0)
-             (do-indent 0))]
-          [(let-values ([(gwidth real-start tab-char?) (find-offset end)])
-             (and (<= (+ 3 real-start) (last-position))
-                  (string=? ";;;"
-                            (get-text real-start
-                                      (+ 2 real-start)))))
-           (void)]
-          [(not contains)
-           ;; Something went wrong matching. Should we get here?
-           (do-indent 0)]
-          [(not last)
-           ;; We can't find a match backward from pos,
-           ;;  but we seem to be inside an S-exp, so
-           ;;  go "up" an S-exp, and move forward past
-           ;;  the associated paren
-           (define enclosing (find-up-sexp pos))
-           (if enclosing
-               (do-indent (+ (visual-offset enclosing) 1))
-               (do-indent 0))]
-          [(= contains last)
-           ;; this is the first expression in the define
-           (do-indent (+ (visual-offset contains)
-                         (procedure-indent)))]
-          [(and (for/fold-style?)
-                last2
-                (= contains last2))
-           (do-indent (- last (paragraph-start-position last-para)))]
-          [(or (define-or-lambda-style?)
-               (for/fold-style?))
-           ;; In case of "define", etc., ignore the position of last
-           ;;  and just indent under the "define"
-           (do-indent (add1 (visual-offset contains)))]
-          [(= contain-para last-para)
-           ;; So far, the S-exp containing "pos" was all on
-           ;;  one line (possibly not counting the opening paren),
-           ;;  so indent to follow the first S-exp's end
-           ;;  unless there are just two sexps and the second is an ellipsis.
-           ;;  in that case, we just ignore the ellipsis
-           (define id-end (get-forward-sexp contains))
-           (define name-length
-             (if id-end
-                 (- id-end contains)
-                 0))
-             (cond
-               [(second-sexp-is-ellipsis? contains)
-                (do-indent (visual-offset contains))]
-               [(not (find-up-sexp pos))
-                (do-indent (visual-offset contains))]
-               [else
-                (do-indent (+ (visual-offset contains)
-                              name-length
-                              (indent-first-arg (+ contains
-                                                   name-length))))])]
-          [else
-           ;; No particular special case, so indent to match first
-           ;; S-expr that starts on the previous line
-           (let loop ([last last][last-para last-para])
-             (let* ([next-to-last (backward-match last limit)]
-                    [next-to-last-para (and next-to-last
-                                            (position-paragraph next-to-last))])
-               (if (equal? last-para next-to-last-para)
-                   (loop next-to-last next-to-last-para)
-                   (do-indent (visual-offset last)))))])))
-    
-    ;; returns #t if `contains' is at a position on a line with an sexp, an ellipsis and nothing else.
-    ;; otherwise, returns #f
-    (define/private (second-sexp-is-ellipsis? contains)
-      (let ([fst-end (get-forward-sexp contains)])
-        (and fst-end
-             (let ([snd-end (get-forward-sexp fst-end)])
-               (and snd-end
-                    (let ([snd-start (get-backward-sexp snd-end)])
-                      (and snd-start
-                           (equal? (get-text snd-start snd-end)
-                                   "...")
-                           (let ([thrd-start (get-forward-sexp snd-end)])
-                             (and (or (not thrd-start)
-                                      (not (= (position-paragraph thrd-start)
-                                              (position-paragraph snd-start)))))))))))))
-    
-    (define/public (tabify-selection [start-pos (get-start-position)]
-                                     [end-pos (get-end-position)])
-      (unless (is-stopped?) 
-        (define first-para (position-paragraph start-pos))
-        (define end-para (position-paragraph end-pos))
-        (with-handlers ([exn:break?
-                         (λ (x) #t)])
-          (dynamic-wind
-           (λ () 
-             (when (< first-para end-para)
-               (begin-busy-cursor))
-             (begin-edit-sequence))
-           (λ ()
-             (let loop ([para first-para])
-               (when (<= para end-para)
-                 (tabify (paragraph-start-position para))
-                 (parameterize-break #t (void))
-                 (loop (add1 para))))
-             (when (and (>= (position-paragraph start-pos) end-para)
-                        (<= (skip-whitespace (get-start-position) 'backward #f)
-                            (paragraph-start-position first-para)))
-               (set-position 
-                (let loop ([new-pos (get-start-position)])
-                  (if (let ([next (get-character new-pos)])
-                        (and (char-whitespace? next)
-                             (not (char=? next #\newline))))
-                      (loop (add1 new-pos))
-                      new-pos)))))
-           (λ ()
-             (end-edit-sequence)
-             (when (< first-para end-para)
-               (end-busy-cursor)))))))
-    
-    (define (tabify-all) (tabify-selection 0 (last-position)))
-    (define (insert-return)
-      (if (tabify-on-return?)
-          (begin 
-            (begin-edit-sequence #t #f)
-            (insert #\newline)
-            (tabify (get-start-position))
-            (set-position 
-             (let loop ([new-pos (get-start-position)])
-               (if (let ([next (get-character new-pos)])
-                     (and (char-whitespace? next)
-                          (not (char=? next #\newline))))
-                   (loop (add1 new-pos))
-                   new-pos)))
-            (end-edit-sequence))
-          (insert #\newline)))
-    
-    (define (calc-last-para last-pos)
-      (let ([last-para (position-paragraph last-pos #t)])
-        (if (and (> last-pos 0)
-                 (> last-para 0))
-            (begin (split-snip last-pos)
-                   (let ([snip (find-snip last-pos 'before)])
-                     (if (member 'hard-newline (send snip get-flags))
-                         (- last-para 1)
-                         last-para)))
-            last-para)))
-    
-    (define comment-out-selection 
-      (lambda ([start-pos (get-start-position)] 
-               [end-pos (get-end-position)]) 
-        (begin-edit-sequence) 
-        (let ([first-pos-is-first-para-pos? 
-               (= (paragraph-start-position (position-paragraph start-pos)) 
-                  start-pos)]) 
-          (let* ([first-para (position-paragraph start-pos)] 
-                 [last-para (calc-last-para end-pos)]) 
-            (let para-loop ([curr-para first-para]) 
-              (when (<= curr-para last-para) 
-                (let ([first-on-para (paragraph-start-position curr-para)]) 
-                  (insert #\; first-on-para) 
-                  (para-loop (add1 curr-para)))))) 
-          (when first-pos-is-first-para-pos? 
-            (set-position 
-             (paragraph-start-position (position-paragraph (get-start-position))) 
-             (get-end-position)))) 
-        (end-edit-sequence) 
-        #t)) 
-    
-    (define box-comment-out-selection
-      (lambda ([_start-pos 'start]
-               [_end-pos 'end])
-        (let ([start-pos (if (eq? _start-pos 'start)
-                             (get-start-position)
-                             _start-pos)]
-              [end-pos (if (eq? _end-pos 'end)
-                           (get-end-position)
-                           _end-pos)])
-          (begin-edit-sequence)
-          (split-snip start-pos)
-          (split-snip end-pos)
-          (let* ([cb (instantiate comment-box:snip% ())]
-                 [text (send cb get-editor)])
-            (let loop ([snip (find-snip start-pos 'after-or-none)])
-              (cond
-                [(not snip) (void)]
-                [((get-snip-position snip) . >= . end-pos) (void)]
-                [else
-                 (send text insert (send snip copy)
-                       (send text last-position)
-                       (send text last-position))
-                 (loop (send snip next))]))
-            (delete start-pos end-pos)
-            (insert cb start-pos)
-            (set-position start-pos start-pos))
-          (end-edit-sequence)
-          #t)))
-    
-    ;; uncomment-box/selection : -> void
-    ;; uncomments a comment box, if the focus is inside one.
-    ;; otherwise, calls uncomment selection to uncomment
-    ;; something else.
-    (inherit get-focus-snip)
-    (define/public (uncomment-box/selection)
-      (begin-edit-sequence)
-      (let ([focus-snip (get-focus-snip)])
-        (cond
-          [(not focus-snip) (uncomment-selection)]
-          [(is-a? focus-snip comment-box:snip%) 
-           (extract-contents 
-            (get-snip-position focus-snip)
-            focus-snip)]
-          [else (uncomment-selection)]))
-      (end-edit-sequence)
-      #t)
-    
-    (define uncomment-selection
-      (lambda ([start-pos (get-start-position)]
-               [end-pos (get-end-position)])
-        (let ([snip-before (find-snip start-pos 'before-or-none)]
-              [snip-after (find-snip start-pos 'after-or-none)])
-          
-          (begin-edit-sequence)
-          (cond
-            [(and (= start-pos end-pos)
-                  snip-before
-                  (is-a? snip-before comment-box:snip%))
-             (extract-contents start-pos snip-before)]
-            [(and (= start-pos end-pos)
-                  snip-after
-                  (is-a? snip-after comment-box:snip%))
-             (extract-contents start-pos snip-after)]
-            [(and (= (+ start-pos 1) end-pos)
-                  snip-after
-                  (is-a? snip-after comment-box:snip%))
-             (extract-contents start-pos snip-after)]
-            [else
-             (let* ([last-pos (last-position)]
-                    [first-para (position-paragraph start-pos)]
-                    [last-para (calc-last-para end-pos)])
-               (let para-loop ([curr-para first-para])
-                 (when (<= curr-para last-para)
-                   (let ([first-on-para
-                          (skip-whitespace  (paragraph-start-position curr-para)
-                                            'forward
-                                            #f)])
-                     (split-snip first-on-para)
-                     (when (and (< first-on-para last-pos)
-                                (char=? #\; (get-character first-on-para))
-                                (is-a? (find-snip first-on-para 'after-or-none) string-snip%))
-                       (delete first-on-para (+ first-on-para 1)))
-                     (para-loop (add1 curr-para))))))])
-          (end-edit-sequence))
-        #t))
-    
-    ;; extract-contents : number (is-a?/c comment-box:snip%) -> void
-    ;; copies the contents of the comment-box-snip out of the snip
-    ;; and into this editor as `pos'. Deletes the comment box snip
-    (define/private (extract-contents pos snip)
-      (let ([editor (send snip get-editor)])
-        (let loop ([snip (send editor find-snip (send editor last-position) 'before-or-none)])
-          (cond
-            [snip
-             (insert (send snip copy) pos)
-             (loop (send snip previous))]
-            [else (void)]))
-        (let ([snip-pos (get-snip-position snip)])
-          (delete snip-pos (+ snip-pos 1)))
-        (set-position pos pos)))
-
-
-    ;; stick-to-next-sexp?: natural -> boolean
-    (define stick-to-patterns
-      '("'" "," ",@" "`" "#'" "#," "#`" "#,@"
-        "#&" "#;" "#hash" "#hasheq" "#ci" "#cs"))
-    (define stick-to-patterns-union
-      (regexp (string-append 
-               "^("
-               (string-join (map regexp-quote stick-to-patterns) "|")
-               ")")))
-    (define stick-to-patterns-union-anchored
-      (regexp (string-append 
-               "^("
-               (string-join (map regexp-quote stick-to-patterns) "|")
-               ")$")))
-    (define stick-to-max-pattern-length 
-      (apply max (map string-length stick-to-patterns)))
-    (define/public (stick-to-next-sexp? start-pos)
-      ;; Optimization: speculatively check whether the string will
-      ;; match the patterns; at time of writing, forward-match can be
-      ;; really expensive.
-      (define snippet 
-        (get-text start-pos 
-                  (min (last-position) 
-                       (+ start-pos stick-to-max-pattern-length))))
-      (and (regexp-match stick-to-patterns-union snippet)
-           (let ([end-pos (forward-match start-pos (last-position))])
-             (and end-pos
-                  (regexp-match stick-to-patterns-union-anchored
-                                (get-text start-pos end-pos))
-                  #t))))
-      
-    (define/public (get-forward-sexp start-pos) 
-      ;; loop to work properly with quote, etc.
-      (let loop ([one-forward (forward-match start-pos (last-position))])
-        (cond
-          [(and one-forward (not (= 0 one-forward)))
-           (let ([bw (backward-match one-forward 0)])
-             (cond
-               [(and bw 
-                     (stick-to-next-sexp? bw))
-                (let ([two-forward (forward-match one-forward (last-position))])
-                  (if two-forward
-                      (loop two-forward)
-                      one-forward))]
-               [else
-                one-forward]))]
-          [else one-forward])))
-    
-    (define/public (remove-sexp start-pos)
-      (let ([end-pos (get-forward-sexp start-pos)])
-        (if end-pos 
-            (kill 0 start-pos end-pos)
-            (bell)))
-      #t)
-    (define/public (forward-sexp start-pos)
-      (let ([end-pos (get-forward-sexp start-pos)])
-        (if end-pos 
-            (set-position end-pos)
-            (bell))
-        #t))
-    [define flash-forward-sexp
-      (λ (start-pos)
-        (let ([end-pos (get-forward-sexp start-pos)])
-          (if end-pos 
-              (flash-on end-pos (add1 end-pos))
-              (bell)) 
-          #t))]
-    (define/public (get-backward-sexp start-pos)
-      (let* ([limit (get-limit start-pos)]
-             [end-pos (backward-match start-pos limit)]
-             [min-pos (backward-containing-sexp start-pos limit)])
-        (if (and end-pos 
-                 (or (not min-pos)
-                     (end-pos . >= . min-pos)))
-            ;; Can go backward, but check for preceding quote, unquote, etc.
-            (let loop ([end-pos end-pos])
-              (let ([next-end-pos (backward-match end-pos limit)])
-                (if (and next-end-pos
-                         (or (not min-pos)
-                             (end-pos . >= . min-pos))
-                         (stick-to-next-sexp? next-end-pos))
-                    (loop next-end-pos)
-                    end-pos)))
-            ;; can't go backward at all:
-            #f)))
-    [define flash-backward-sexp
-      (λ (start-pos)
-        (let ([end-pos (get-backward-sexp start-pos)])
-          (if end-pos
-              (flash-on end-pos (add1 end-pos))
-              (bell))
-          #t))]
-    [define backward-sexp
-      (λ (start-pos)
-        (let ([end-pos (get-backward-sexp start-pos)])
-          (if end-pos
-              (set-position end-pos)
-              (bell))
-          #t))]
-    [define find-up-sexp
-      (λ (start-pos)
-        (let* ([limit-pos (get-limit start-pos)]
-               [exp-pos
-                (backward-containing-sexp start-pos limit-pos)])
-          
-          (if (and exp-pos (> exp-pos limit-pos))
-              (let* ([in-start-pos (skip-whitespace exp-pos 'backward #t)]
-                     [paren-pos
-                      (λ (paren-pair)
-                        (find-string
-                         (car paren-pair)
-                         'backward
-                         in-start-pos
-                         limit-pos))])
-                (let ([poss (let loop ([parens (racket-paren:get-paren-pairs)])
-                              (cond
-                                [(null? parens) null]
-                                [else 
-                                 (let ([pos (paren-pos (car parens))])
-                                   (if pos
-                                       (cons pos (loop (cdr parens)))
-                                       (loop (cdr parens))))]))])
-                  (if (null? poss) ;; all finds failed
-                      #f
-                      (- (apply max poss) 1)))) ;; subtract one to move outside the paren
-              #f)))]
-    [define up-sexp
-      (λ (start-pos)
-        (let ([exp-pos (find-up-sexp start-pos)])
-          (if exp-pos
-              (set-position exp-pos)
-              (bell))
-          #t))]
-    [define find-down-sexp
-      (λ (start-pos)
-        (let loop ([pos start-pos])
-          (let ([next-pos (get-forward-sexp pos)])
-            (if (and next-pos (> next-pos pos))
-                (let ([back-pos
-                       (backward-containing-sexp (sub1 next-pos) pos)])
-                  (if (and back-pos
-                           (> back-pos pos))
-                      back-pos
-                      (loop next-pos)))
-                #f))))]
-    [define down-sexp
-      (λ (start-pos)
-        (let ([pos (find-down-sexp start-pos)])
-          (if pos
-              (set-position pos)
-              (bell))
-          #t))]
-    [define remove-parens-forward
-      (λ (start-pos)
-        (let* ([pos (skip-whitespace start-pos 'forward #f)]
-               [first-char (get-character pos)]
-               [paren? (or (char=? first-char #\()
-                           (char=? first-char #\[)
-                           (char=? first-char #\{))]
-               [closer (and paren? 
-                            (get-forward-sexp pos))])
-          (if (and paren? closer)
-              (begin (begin-edit-sequence #t #f)
-                     (delete pos (add1 pos))
-                     (delete (-  closer 2) (- closer 1))
-                     (end-edit-sequence))
-              (bell))
-          #t))]
-    
-    (define/private (select-text f forward?)
-      (define start-pos (get-start-position))
-      (define end-pos (get-end-position))
-      (define new-pos
-        (if forward?
-            (if (= (get-extend-start-position) start-pos)
-                (f end-pos)
-                (f start-pos))
-            (if (= (get-extend-end-position) end-pos)
-                (f start-pos)
-                (f end-pos))))
-      (if new-pos 
-          (extend-position new-pos)
-          (bell))
-          #t)
-    (public select-forward-sexp select-backward-sexp select-up-sexp select-down-sexp)
-    [define select-forward-sexp (λ () (select-text (λ (x) (get-forward-sexp x)) #t))]
-    [define select-backward-sexp (λ () (select-text (λ (x) (get-backward-sexp x)) #f))]
-    [define select-up-sexp (λ () (select-text (λ (x) (find-up-sexp x)) #f))]
-    [define select-down-sexp (λ () (select-text (λ (x) (find-down-sexp x)) #t))]
-    
-    (define/public (introduce-let-ans pos)
-      (dynamic-wind
-       (λ () (begin-edit-sequence))
-       (λ ()
-         (let ([before-text "(let ([ans "]
-               [after-text "])\n"]
-               [after-text2 "(printf \"~s\\n\" ans)\nans)"]
-               [end-l (get-forward-sexp pos)])
-           (cond
-             [end-l
-              (insert after-text2 end-l end-l)
-              (insert after-text end-l end-l)
-              (insert before-text pos pos)
-              (let ([blank-line-pos (+ end-l (string-length after-text) (string-length before-text))])
-                (set-position blank-line-pos blank-line-pos))
-              (tabify-selection 
-               pos
-               (+ end-l 
-                  (string-length before-text)
-                  (string-length after-text)
-                  (string-length after-text2)))]
-             [else
-              (bell)])))
-       (λ ()
-         (end-edit-sequence))))
-    
-    (define/public (move-sexp-out begin-inner)
-      (begin-edit-sequence #t #f)
-      (let ([end-inner (get-forward-sexp begin-inner)]
-            [begin-outer (find-up-sexp begin-inner)])
-        (cond
-          [(and end-inner begin-outer)
-           (let ([end-outer (get-forward-sexp begin-outer)])
-             (cond
-               [end-outer
-                (delete end-inner end-outer)
-                (delete begin-outer begin-inner)
-                (tabify-selection begin-outer (+ begin-outer (- end-inner begin-inner)))]
-               [else (bell)]))]
-          [else (bell)]))
-      (end-edit-sequence))
-    
-    (define/public (kill-enclosing-parens begin-inner)
-      (begin-edit-sequence #t #f)
-      (define begin-outer (find-up-sexp begin-inner))
-      (cond
-        [begin-outer
-          (define end-outer (get-forward-sexp begin-outer))
-          (cond
-            [(and end-outer (>= (- end-outer begin-outer) 2))
-             (delete (- end-outer 1) end-outer)
-             (delete begin-outer (+ begin-outer 1))
-             (tabify-selection begin-outer (- end-outer 2))]
-            [else (bell)])]
-        [else (bell)])
-      (end-edit-sequence))
-    
-    ;; change the parens following the cursor from () to [] or vice versa
-    (define/public (toggle-round-square-parens start-pos)
-      (begin-edit-sequence #t #f)
-      (let* ([sexp-begin (skip-whitespace start-pos 'forward #f)]
-             [sexp-end (get-forward-sexp sexp-begin)])
-        (cond [(and sexp-end
-                    (< (+ 1 sexp-begin) sexp-end))
-               ;; positions known to exist: start-pos <= x < sexp-end
-               (match* ((get-character sexp-begin) (get-character (- sexp-end 1)))
-                       [(#\( #\)) (replace-char-at-posn sexp-begin "[")
-                                  (replace-char-at-posn (- sexp-end 1) "]")]
-                       [(#\[ #\]) (replace-char-at-posn sexp-begin "(")
-                                  (replace-char-at-posn (- sexp-end 1) ")")]
-                       [(_ _) (bell)])]
-              [else (bell)]))
-      (end-edit-sequence))
-    
-    ;; replace-char-at-posn: natural-number string -> 
-    ;;   replace the char at the given posn with the given string.
-    ;;
-    ;; this abstraction exists because the duplicated code in toggle-round-square-parens was 
-    ;; just a little too much for comfort
-    (define (replace-char-at-posn posn str)
-      ;; insertions are performed before deletions in order to preserve the location of the cursor
-      (insert str (+ posn 1) (+ posn 1))
-      (delete posn (+ posn 1)))
-    
-    (inherit get-fixed-style)
-    (define/public (mark-matching-parenthesis pos)
-      (let ([open-parens (map car (racket-paren:get-paren-pairs))]
-            [close-parens (map cdr (racket-paren:get-paren-pairs))])
-        (when (member (string (get-character pos)) open-parens)
-          (let ([end (get-forward-sexp pos)])
-            (when (and end
-                       (member (string (get-character (- end 1))) close-parens))
-              (let ([start-style (send (find-snip pos 'after) get-style)]
-                    [end-style (send (find-snip end 'before) get-style)])
-                (cond
-                  [(and (eq? matching-parenthesis-style start-style)
-                        (eq? matching-parenthesis-style end-style))
-                   (let ([fixed-style (get-fixed-style)])
-                     (change-style fixed-style pos (+ pos 1))
-                     (change-style fixed-style (- end 1) end))]
-                  [else
-                   (change-style matching-parenthesis-style pos (+ pos 1))
-                   (change-style matching-parenthesis-style (- end 1) end)])))))))
-    
-    ;; get-snips/rev: start end -> (listof snip)
-    ;; Returns a list of the snips in reverse order between
-    ;; start and end.
-    (define/private (get-snips/rev start end)
-      (split-snip start)
-      (split-snip end)
-      (let loop ([snips/rev '()]
-                 [a-snip (find-snip start 'after-or-none)])
-        (cond
-          [(or (not a-snip)
-               (>= (get-snip-position a-snip)
-                   end))
-           snips/rev]
-          [else
-           (loop (cons (send a-snip copy) snips/rev)
-                 (send a-snip next))])))
-    
-    (define/public (transpose-sexp pos)
-      (let ([start-1 (get-backward-sexp pos)])
-        (if (not start-1)
-            (bell)
-            (let ([end-1 (get-forward-sexp start-1)])
-              (if (not end-1)
-                  (bell)
-                  (let ([end-2 (get-forward-sexp end-1)])
-                    (if (not end-2)
-                        (bell)
-                        (let ([start-2 (get-backward-sexp end-2)])
-                          (if (or (not start-2)
-                                  (< start-2 end-1))
-                              (bell)
-                              (let ([snips-1/rev (get-snips/rev start-1 end-1)]
-                                    [snips-2/rev (get-snips/rev start-2 end-2)])
-                                (begin-edit-sequence)
-                                (delete start-2 end-2)
-                                (for-each (λ (s) (insert s start-2)) snips-1/rev)
-                                (delete start-1 end-1)
-                                (for-each (λ (s) (insert s start-1)) snips-2/rev)
-                                (set-position end-2)
-                                (end-edit-sequence)))))))))))
-    [define tab-size 8]
-    (public get-tab-size set-tab-size)
-    [define get-tab-size (λ () tab-size)]
-    [define set-tab-size (λ (s) (set! tab-size s))]
-    
-    (define/override (get-start-of-line pos)
-      (define para (position-paragraph pos))
-      (define para-start (paragraph-start-position para))
-      (define para-end (paragraph-end-position para))
-      (define first-non-whitespace 
-        (let loop ([i para-start])
-          (cond
-            [(= i para-end) #f]
-            [(char-whitespace? (get-character i))
-             (loop (+ i 1))]
-            [else i])))
-      (define new-pos 
-        (cond 
-          [(not first-non-whitespace) para-start]
-          [(= pos para-start) first-non-whitespace]
-          [(<= pos first-non-whitespace) para-start]
-          [else first-non-whitespace]))
-      new-pos)
-
-    (super-new)))
-
-(define -text-mode<%>
-  (interface ()
-    ))
-
-(define module-lexer/waived (waive-option module-lexer))
-
-(define text-mode-mixin
-  (mixin (color:text-mode<%> mode:surrogate-text<%>) (-text-mode<%>)
-    
-    (define saved-wordbreak-map #f)
-    
-    (define/override (on-disable-surrogate text)
-      (keymap:remove-chained-keymap text keymap)
-      (send text set-wordbreak-map saved-wordbreak-map)
-      (super on-disable-surrogate text))
-    
-    (define/override (on-enable-surrogate text)
-      (send text begin-edit-sequence)
-      (super on-enable-surrogate text)
-      (send (send text get-private-racket-container-keymap) chain-to-keymap keymap #f)
-      
-      (set! saved-wordbreak-map (send text get-wordbreak-map))
-      
-      (send text set-load-overwrites-styles #f)
-      (send text set-wordbreak-map wordbreak-map)
-      (let ([bw (box 0)]
-            [bu (box #f)]
-            [tab-size (send text get-tab-size)])
-        (unless (and (null? (send text get-tabs #f bw bu))
-                     (= tab-size (unbox bw))
-                     (not (unbox bu)))
-          (send text set-tabs null (send text get-tab-size) #f)))
-      (send text set-styles-fixed #t)
-      (send text end-edit-sequence))
-    
-    (define tabify-pref (preferences:get 'framework:tabify))
-    (preferences:add-callback
-     'framework:tabify
-     (lambda (k v) (set! tabify-pref v)))
-    (define/private (racket-lexer-wrapper in offset mode)
-      (define-values (lexeme type paren start end backup-delta new-mode) 
-        (module-lexer/waived in offset mode))
-      (cond
-        [(and (eq? type 'symbol)
-              (string? lexeme)
-              (get-keyword-type lexeme tabify-pref))
-         (values lexeme 'keyword paren start end backup-delta new-mode)]
-        [else
-         (values lexeme type paren start end backup-delta new-mode)]))
-    
-    (define/override (put-file text sup directory default-name)
-      (parameterize ([finder:default-extension "rkt"]
-                     #; ; no need for the following, since it's the default
-                     [finder:default-filters '(["Racket Sources" "*.rkt;*.scrbl;*.ss;*.scm"]
-                                               ["Any" "*.*"])])
-        ;; don't call the surrogate's super, since it sets the default extension
-        (sup directory default-name)))
-    
-    (super-new (get-token (lambda (in offset mode) (racket-lexer-wrapper in offset mode)))
-               (token-sym->style short-sym->style-name)
-               (matches '((|(| |)|)
-                          (|[| |]|)
-                          (|{| |}|))))))
-
-;; get-keyword-type : string (list ht regexp regexp regexp)
-;;                 -> (or/c #f 'lambda 'define 'begin 'for/fold)
-(define (get-keyword-type text pref)
-  (define ht (car pref))
-  (define beg-reg (list-ref pref 1))
-  (define def-reg (list-ref pref 2))
-  (define lam-reg (list-ref pref 3))
-  (define for/fold-reg (list-ref pref 4))
-  (hash-ref
-   ht
-   (with-handlers ((exn:fail:read? (λ (x) #f)))
-     (read (open-input-string text)))
-   (λ () 
-     (cond
-       [(and beg-reg (regexp-match beg-reg text)) 'begin]
-       [(and def-reg (regexp-match def-reg text)) 'define]
-       [(and lam-reg (regexp-match lam-reg text)) 'lambda]
-       [(and for/fold-reg (regexp-match for/fold-reg text)) 'for/fold]
-       [else #f]))))
-
-
-;; in-position? : text (list symbol) -> boolean
-;; determines if the cursor is currently sitting in a particular
-;; position. To make detection of whether the cursor is in
-;; a string or comment more robust, check also the position
-;; right before the cursor to make sure it matches. This handles
-;; the situation ... |"blah blah"  where | indicates cursor; in
-;; this case, the cursor is _not_ in the string (although
-;; classify-position characterizes it so).
-(define (in-position? text sym-list)
-  (define selection-start (send text get-start-position))
-  (define first-type (send text classify-position selection-start))
-  (define final-type
-    (if (and (member first-type '(string comment))
-             (or (= selection-start 0)
-                 (not (eq? (send text classify-position (- selection-start 1))
-                           first-type))))
-        'white-space
-        first-type))
-  (and (member final-type sym-list) #t))
-
-;; determines if the cursor is currently sitting in a string
-;; literal or a comment. 
-(define (in-string/comment? text)
-  (in-position? text '(comment string)))
-
-;; produces the 1 character string immediately following
-;; the cursor, if there is one and if there is not a current
-;; selection, in which case produces #f
-(define (immediately-following-cursor text)
-  (define selection-start (send text get-start-position))
-  (and (= selection-start (send text get-end-position))   ; nothing selected
-       (< selection-start (send text last-position))
-       (send text get-text selection-start (+ selection-start 1))))
-
-
-(define set-mode-mixin
-  (mixin (-text<%> mode:host-text<%>) ()
-    (super-new)
-    (inherit set-surrogate)
-    (set-surrogate (new text-mode%))))
-
-(define -text% (set-mode-mixin
-                (text-mixin
-                 (text:autocomplete-mixin
-                  (mode:host-text-mixin
-                   color:text%)))))
-
-(define text-mode% (text-mode-mixin color:text-mode%))
-
-(define (setup-keymap keymap)
-  (define (add-edit-function name f)
-    (send keymap add-function name (λ (edit event) (f edit))))
-  (define (add-pos-function name f)
-    (send keymap add-function name
-          (λ (edit event)
-            (f edit (send edit get-start-position)))))
-  (add-pos-function "remove-sexp" (λ (e p) (send e remove-sexp p)))
-  (add-pos-function "forward-sexp" (λ (e p) (send e forward-sexp p)))
-  (add-pos-function "backward-sexp" (λ (e p) (send e backward-sexp p)))
-  (add-pos-function "up-sexp" (λ (e p) (send e up-sexp p)))
-  (add-pos-function "down-sexp" (λ (e p) (send e down-sexp p)))
-  (add-pos-function "flash-backward-sexp" (λ (e p) (send e flash-backward-sexp p)))
-  (add-pos-function "flash-forward-sexp" (λ (e p) (send e flash-forward-sexp p)))
-  (add-pos-function "remove-parens-forward" (λ (e p) (send e remove-parens-forward p)))
-  (add-pos-function "transpose-sexp" (λ (e p) (send e transpose-sexp p)))
-  (add-pos-function "mark-matching-parenthesis"
-                    (λ (e p) (send e mark-matching-parenthesis p)))
-  (add-pos-function "introduce-let-ans"
-                    (λ (e p) (send e introduce-let-ans p)))
-  (add-pos-function "move-sexp-out"
-                    (λ (e p) (send e move-sexp-out p)))
-  (add-pos-function "kill-enclosing-parens"
-                    (lambda (e p) (send e kill-enclosing-parens p)))
-  (add-pos-function "toggle-round-square-parens"
-                    (lambda (e p) (send e toggle-round-square-parens p)))
-  
-  (add-edit-function "select-forward-sexp" 
-                     (λ (x) (send x select-forward-sexp)))
-  (add-edit-function "select-backward-sexp"  
-                     (λ (x) (send x select-backward-sexp)))
-  (add-edit-function "select-down-sexp"  
-                     (λ (x) (send x select-down-sexp)))
-  (add-edit-function "select-up-sexp"  
-                     (λ (x) (send x select-up-sexp)))
-  (add-edit-function "tabify-at-caret"  
-                     (λ (x) (send x tabify-selection)))
-  (add-edit-function "do-return"  
-                     (λ (x) (send x insert-return)))
-  (add-edit-function "comment-out"  
-                     (λ (x) (send x comment-out-selection)))
-  (add-edit-function "box-comment-out"  
-                     (λ (x) (send x box-comment-out-selection)))
-  (add-edit-function "uncomment"  
-                     (λ (x) (send x uncomment-selection)))
-  
-  (send keymap add-function "paren-double-select"
-        (λ (text event)
-          (keymap:region-click
-           text event 
-           (λ (click-pos eol?)
-             (define (word-based)
-               (define start-box (box click-pos))
-               (define end-box (box click-pos))
-               (send text find-wordbreak start-box end-box 'selection)
-               (values (unbox start-box) (unbox end-box)))
-             (define token (send text classify-position click-pos))
-             (define-values (start end)
-               (cond
-                 [(memq token '(string comment)) (word-based)]
-                 [(and (equal? token 'other)
-                       (let-values ([(start end) (send text get-token-range click-pos)])
-                         (and start
-                              end
-                              (let ([str (send text get-text start end)])
-                                (or (regexp-match? #rx"^#lang" str)
-                                    (regexp-match? #rx"^#!" str))))))
-                  (word-based)]
-                 [(and (equal? token 'parenthesis)
-                       (ormap (λ (pr) (equal? (cdr pr) (string (send text get-character click-pos))))
-                              (racket-paren:get-paren-pairs)))
-                  (define start (send text get-backward-sexp (+ click-pos 1)))
-                  (if start 
-                      (values start (+ click-pos 1))
-                      (word-based))]
-                 [else
-                  (let ([end (send text get-forward-sexp click-pos)])
-                    (if end 
-                        (let ([beginning (send text get-backward-sexp end)])
-                          (if beginning
-                              (values beginning end)
-                              (word-based)))
-                        (word-based)))]))
-             (send text set-position start end)))))
-
-  (let ([add/map-non-clever
-         (λ (name keystroke char [closer #f])
-           (add-edit-function 
-            name
-            (λ (e)
-              (send e begin-edit-sequence)
-              (define start (send e get-start-position))
-              (define stop (send e get-end-position))
-              (send e insert char start stop)
-              (when (and closer (preferences:get 'framework:automatic-parens))
-                (send e insert closer (+ start 1) (+ start 1)))
-              (send e end-edit-sequence)))
-           (send keymap map-function keystroke name))])
-    (add/map-non-clever "non-clever-open-square-bracket" "~g:c:[" #\[ #\])
-    (add/map-non-clever "non-clever-close-square-bracket" "~g:c:]" #\])
-    (add/map-non-clever "non-clever-close-curley-bracket" "~g:c:}" #\})
-    (add/map-non-clever "non-clever-close-round-paren" "~g:c:)" #\)))
-  
-  (send keymap add-function "balance-parens"
-        (λ (edit event)
-          (send edit balance-parens event)))
-  (send keymap add-function "balance-parens-forward"
-        (λ (edit event)
-          (send edit balance-parens event 'forward)))
-  
-  (send keymap map-function "TAB" "tabify-at-caret")
-  
-  (send keymap map-function "return" "do-return")
-  (send keymap map-function "s:return" "do-return")
-  (send keymap map-function "s:c:return" "do-return")
-  (send keymap map-function "a:return" "do-return")
-  (send keymap map-function "s:a:return" "do-return")
-  (send keymap map-function "c:a:return" "do-return")
-  (send keymap map-function "c:s:a:return" "do-return")
-  (send keymap map-function "c:return" "do-return")
-  (send keymap map-function "d:return" "do-return")
-  
-  (send keymap map-function ")" "balance-parens")
-  (send keymap map-function "]" "balance-parens")
-  (send keymap map-function "}" "balance-parens")
-  
-  (send keymap map-function "leftbuttondouble" "paren-double-select")
-  
-
-  ;(define (insert-brace-pair text open-brace close-brace [space-between? #f])
-  ;  (insert/check/balance text open-brace close-brace #f space-between?))
-    #|
-    (define selection-start (send text get-start-position))
-    (define hash-before?  ; tweak to detect and correctly close block comments #| ... |#
-      (and (< 0 selection-start)
-           (string=? "#" (send text get-text (- selection-start 1) selection-start))))
-    (send text begin-edit-sequence)
-    (send text set-position (send text get-end-position))
-    (when space-between? (send text insert " "))
-    (send text insert close-brace)
-    (when (and (char? open-brace) (char=? #\| open-brace) hash-before?) 
-      (send text insert #\#))
-    (send text set-position selection-start)
-    (send text insert open-brace)
-    (when space-between?
-      (send text set-position (+ (send text get-start-position) 1)))
-    (send text end-edit-sequence))|#
-
-  ;; Inserts the open parens character and, if the resulting token
-  ;; type satisfies checkp, then go ahead and insert the close parens
-  ;; and set the cursor between them.
-  ;; When space-between?, adds a space between the braces and places
-  ;; the cursor after the space.
-  ;; checkp: (or/c #f symbol (symbol -> boolean))
-  ;;  When checkp is #f, always inserts both open and close braces
-  ;;  When checkp is a symbol, only inserts the closing brace if 
-  ;;    the tokenizer identifies open-brace as that type of token
-  ;;    having inserted it
-  ;;  When checkp is a predicate, only inserts the closing brace if
-  ;;    the token type of the inserted open-brace satisfies it
-  (define (insert-brace-pair text open-brace close-brace [checkp #f] [space-between? #f])
-    (define selection-start (send text get-start-position))
-    (define selection-end (send text get-end-position))
-    (define open-len (if (string? open-brace) (string-length open-brace) 1))
-    (send text begin-edit-sequence #t #f)
-    (send text insert open-brace selection-start)
-    (define tok-type (send text classify-position selection-start))
-    (when (or (not checkp)
-              (and (symbol? checkp) (eq? checkp tok-type))
-              (and (procedure? checkp) (checkp tok-type)))
-      (define hash-before?  ; tweak to detect and correctly close block comments #| ... |#
-        (and (< 0 selection-start)
-             (string=? "#" (send text get-text (- selection-start 1) selection-start))))
-      (send text set-position (+ selection-end open-len))
-      (when space-between? (send text insert " "))
-      (send text insert close-brace)
-      (when (and (char? open-brace) (char=? #\| open-brace) hash-before?) 
-        (send text insert #\#))
-      (send text set-position (+ selection-start open-len (if space-between? 1 0))))
-    (send text end-edit-sequence))
-  
-
-  ;; only insert a pair if automatic-parens preference is on, depending
-  ;; on other analyses of the state of the text (e.g. auto-parens shouldn't
-  ;; affect typing literal characters inside a string constant, etc.)
-  (define (maybe-insert-brace-pair text open-brace close-brace)
-    (define open-parens 
-      (for/list ([x (racket-paren:get-paren-pairs)]) (string-ref (car x) 0)))
-    (cond
-      [(not (preferences:get 'framework:automatic-parens))
-       (define startpos (send text get-start-position))
-       (if (and (send text get-overwrite-mode) 
-                (= startpos (send text get-end-position)))
-           (send text insert open-brace startpos (add1 startpos))
-           (send text insert open-brace))]
-    
-      [else  ; automatic-parens is enabled
-       (define c (immediately-following-cursor text))
-       (define cur-token 
-         (send text classify-position (send text get-start-position)))
-       (cond
-         ; insert paren pair if it results valid parenthesis token...
-         [(member open-brace open-parens) 
-          (insert-brace-pair text open-brace close-brace 'parenthesis)]
-         
-         ; ASSUME: from here on, open-brace is either "  or  |
-         [else
-          ;(printf "tok ~a~n" cur-token)
-          (match cur-token
-            [(or 'error #f) (insert-brace-pair text open-brace close-brace 'error)]
-            ['constant (insert-brace-pair text open-brace close-brace 
-                                       (λ(t) (not (eq? t 'constant))))]
-            [(or 'symbol 'comment)
-             (cond
-               [(and c (char=? #\| open-brace) (string=? c "|"))   ;; smart skip
-                   (send text set-position (+ 1 (send text get-end-position)))
-                   (define d (immediately-following-cursor text))
-                   (when (and d (string=? d "#"))   ; a block comment?
-                     (send text set-position (+ 1 (send text get-end-position))))]
-               [(eq? cur-token 'comment) (send text insert open-brace)]
-               [else (insert-brace-pair text open-brace close-brace)])]
-            ['string
-             (cond
-               [(not (char=? #\" open-brace)) (send text insert open-brace)]
-               [else 
-                (define start-position (send text get-start-position))
-                (define end-position (send text get-end-position))
-                (cond
-                  ; smart skip a " if it is the immediately following character (c)
-                  [(and c (string=? c "\"")) 
-                   (send text set-position (+ 1 end-position))]
-                  
-                  ; there is no current selection - split the string in two
-                  [(= start-position end-position)
-                   (insert-brace-pair text #\" #\" #f #t)]
-                  
-                  ; there is a selection - split the selected text off as a
-                  ; separate string from the surrounding in an intelligent way
-                  ; and retain selection of the split-out string
-                  [else (define selection-length (- end-position start-position))
-                        (insert-brace-pair text "\" \"" "\" \"")
-                        (define cur-position (send text get-start-position))
-                        (send text set-position 
-                              (- cur-position 1)
-                              (+ cur-position selection-length 1))])])]
-            [_  (insert-brace-pair text open-brace close-brace)]) ])]))
-         
-
-      
-  
-  (add-edit-function "insert-()-pair" (λ (text) (insert-brace-pair text #\( #\))))
-  (add-edit-function "insert-[]-pair" (λ (text) (insert-brace-pair text #\[ #\])))
-  (add-edit-function "insert-{}-pair" (λ (text) (insert-brace-pair text #\{ #\})))
-  (add-edit-function "insert-\"\"-pair" (λ (text) (insert-brace-pair text #\" #\")))
-  (add-edit-function "insert-||-pair" (λ (text) (insert-brace-pair text #\| #\|)))
-  
-  (add-edit-function "maybe-insert-()-pair" (λ (text) (maybe-insert-brace-pair text #\( #\))))
-  (add-edit-function "maybe-insert-[]-pair" (λ (text) (maybe-insert-brace-pair text #\[ #\])))
-  (add-edit-function "maybe-insert-{}-pair" (λ (text) (maybe-insert-brace-pair text #\{ #\})))
-  (add-edit-function "maybe-insert-\"\"-pair" (λ (text) (maybe-insert-brace-pair text #\" #\")))
-  (add-edit-function "maybe-insert-||-pair" (λ (text) (maybe-insert-brace-pair text #\| #\|)))
-  
-  (add-edit-function "maybe-insert-[]-pair-maybe-fixup-[]"
-                     (λ (text)
-                       (cond
-                         [(or (not (preferences:get 'framework:fixup-open-parens))
-                              (send text is-stopped?))
-                          (maybe-insert-brace-pair text #\[ #\])]
-                         [else 
-                          (insert-paren text)])))
-  
-  (define (insert-lambda-template edit)
-    (send edit begin-edit-sequence)
-    (let ([selection-start (send edit get-start-position)])
-      (send edit set-position (send edit get-end-position))
-      (send edit insert ")")
-      (send edit set-position selection-start)
-      (send edit insert ") ")
-      (send edit set-position selection-start)
-      (send edit insert "(λ ("))
-    (send edit end-edit-sequence))
-  
-  (add-edit-function "insert-lambda-template" insert-lambda-template)
-  
-  (define (map-meta key func) (keymap:send-map-function-meta keymap key func))
-  (define (map key func) (send keymap map-function key func))
-  
-  (map-meta "up" "up-sexp")
-  (map-meta "c:u" "up-sexp")
-  (map "a:up" "up-sexp")
-  (map-meta "s:up" "select-up-sexp")
-  (map "a:s:up" "select-up-sexp")
-  (map-meta "s:c:u" "select-up-sexp")
-  
-  (map-meta "down" "down-sexp")
-  (map "a:down" "down-sexp")
-  (map-meta "s:down" "select-down-sexp")
-  (map "a:s:down" "select-down-sexp")
-  (map-meta "s:c:down" "select-down-sexp")
-  
-  (map-meta "right" "forward-sexp")
-  (map "a:right" "forward-sexp")
-  (map "m:right" "forward-sexp")
-  (map-meta "s:right" "select-forward-sexp")
-  (map "a:s:right" "select-forward-sexp")
-  (map "m:s:right" "select-forward-sexp")
-  
-  (map-meta "left" "backward-sexp")
-  (map "a:left" "backward-sexp")
-  (map "m:left" "backward-sexp")
-  (map-meta "s:left" "select-backward-sexp")
-  (map "a:s:left" "select-backward-sexp")
-  (map "m:s:left" "select-backward-sexp")
-  
-  (map-meta "return" "do-return")
-  (map-meta "s:return" "do-return")
-  (map-meta "s:c:return" "do-return")
-  (map-meta "a:return" "do-return")
-  (map-meta "s:a:return" "do-return")
-  (map-meta "c:a:return" "do-return")
-  (map-meta "c:s:a:return" "do-return")
-  (map-meta "c:return" "do-return")
-  
-  (map-meta "c:semicolon" "comment-out")
-  (map-meta "c:=" "uncomment")
-  (map-meta "c:k" "remove-sexp")
-  
-  (map-meta "c:f" "forward-sexp")
-  (map-meta "s:c:f" "select-forward-sexp")
-  
-  (map-meta "c:b" "backward-sexp")
-  (map-meta "s:c:b" "select-backward-sexp")
-  
-  (map-meta "c:p" "flash-backward-sexp")
-  (map-meta "s:c:n" "flash-forward-sexp")
-  
-  (map-meta "c:space" "select-forward-sexp")
-  (map-meta "c:t" "transpose-sexp")
-  
-  ;(map-meta "c:m" "mark-matching-parenthesis")
-  ; this keybinding doesn't interact with the paren colorer
-
-  (map-meta ")" "balance-parens-forward")
-  (map-meta "]" "balance-parens-forward")
-  (map-meta "}" "balance-parens-forward")
-  
-  (map-meta "(" "insert-()-pair")
-  (map-meta "[" "insert-[]-pair")
-  (map-meta "{" "insert-{}-pair")
-  (map-meta "\"" "insert-\"\"-pair")
-  (map-meta "|" "insert-||-pair")
-
-  (map "(" "maybe-insert-()-pair")
-  (map "[" "maybe-insert-[]-pair-maybe-fixup-[]")
-  (map "{" "maybe-insert-{}-pair")
-  (map "\"" "maybe-insert-\"\"-pair")
-  (map "|" "maybe-insert-||-pair")
-
-  (map-meta "s:l" "insert-lambda-template")
-
-  (map "c:c;c:b" "remove-parens-forward")
-  (map "c:c;c:l" "introduce-let-ans")
-  (map "c:c;c:o" "move-sexp-out")
-  (map "c:c;c:e" "kill-enclosing-parens")
-  (map "c:c;c:[" "toggle-round-square-parens"))
-
-(define keymap (make-object keymap:aug-keymap%))
-(setup-keymap keymap)
-(define (get-keymap) keymap)
-
-;; choose-paren : racket-text number -> character
-;; returns the character to replace a #\[ with, based
-;; on the context where it is typed in.
-(define (insert-paren text)
-  (let* ([pos (send text get-start-position)]
-         [real-char #\[]
-         [change-to (λ (i c) 
-                      ;(printf "change-to, case ~a\n" i)
-                      (set! real-char c))]
-         [start-pos (send text get-start-position)]
-         [end-pos (send text get-end-position)]
-         [letrec-like-forms (preferences:get 'framework:square-bracket:letrec)]
-         [for/fold-like-forms (preferences:get 'framework:square-bracket:for/fold)])
-    (send text begin-edit-sequence #f #f)
-    (if (and (send text get-overwrite-mode) (= start-pos end-pos))
-        (send text insert "[" start-pos (add1 start-pos) #f)
-        (send text insert "[" start-pos 'same #f))
-    (when (equal? (send text classify-position pos) 'parenthesis)
-      (let* ([before-whitespace-pos (send text skip-whitespace pos 'backward #t)]
-             [keyword/distance (find-keyword-and-distance before-whitespace-pos text)])
-        (cond
-          [(and keyword/distance
-                (member keyword/distance
-                        (preferences:get 'framework:square-bracket:cond/offset)))
-           ;; just leave the square backet in, in this case
-           (void)]
-          [(and keyword/distance
-                (member (car keyword/distance)
-                        (preferences:get 'framework:square-bracket:local)))
-           (unless (= (cadr keyword/distance) 0)
-             (change-to 7 #\())]
-          [else
-           (let* ([backward-match (send text backward-match before-whitespace-pos 0)]
-                  [b-m-char (and (number? backward-match) (send text get-character backward-match))])
-             (cond
-               [backward-match
-                ;; there is an expression before this, at this layer
-                (define before-whitespace-pos2 
-                  (send text skip-whitespace backward-match 'backward #t))
-                (define backward-match2 (send text backward-match before-whitespace-pos2 0))
-                (cond
-                  [(member b-m-char '(#\( #\[ #\{))
-                   ;; found a "sibling" parenthesized sequence. use the parens it uses.
-                   (change-to 1 b-m-char)]
-                  [else
-                   ;; otherwise, we switch to (
-                   (change-to 2 #\()])]
-               [(not (zero? before-whitespace-pos))
-                ;; this is the first thing in the sequence
-                ;; pop out one layer and look for a keyword.
-                (define b-w-p-char (send text get-character (- before-whitespace-pos 1)))
-                (cond
-                  [(equal? b-w-p-char #\()
-                   (define second-before-whitespace-pos (send text skip-whitespace 
-                                                              (- before-whitespace-pos 1)
-                                                              'backward
-                                                              #t))
-                   (define second-backwards-match (send text backward-match
-                                                        second-before-whitespace-pos
-                                                        0))
-                   (cond
-                     [(not second-backwards-match)
-                      (change-to 3 #\()]
-                     [(and (beginning-of-sequence? text second-backwards-match)
-                           (ormap (λ (x) (text-between-equal? x
-                                                              text
-                                                              second-backwards-match
-                                                              second-before-whitespace-pos))
-                                  letrec-like-forms))
-                      ;; we found a let<mumble> keyword, so we get a square bracket
-                      (void)]
-                     [else
-                      ;; go back one more sexp in the same row, looking for `let loop' pattern
-                      (define second-before-whitespace-pos2 (send text skip-whitespace 
-                                                                  second-backwards-match
-                                                                  'backward
-                                                                  #t))
-                      (define second-backwards-match2 (send text backward-match
-                                                            second-before-whitespace-pos2
-                                                            0))
-                      (cond
-                        [(and second-backwards-match2
-                              (ormap (λ (x)
-                                       (text-between-equal? x
-                                                            text
-                                                            second-backwards-match2
-                                                            second-before-whitespace-pos2))
-                                     for/fold-like-forms))
-                         ;; found a for/fold-like form, so we keep the [
-                         (void)]
-                        [(and second-backwards-match2
-                              (member (send text classify-position second-backwards-match)
-                                      ;;; otherwise, this isn't a `let loop',
-                                      ;;; it is a regular let
-                                      '(symbol keyword))
-                              (member "let" letrec-like-forms)
-                              (text-between-equal? "let"
-                                                   text
-                                                   second-backwards-match2
-                                                   second-before-whitespace-pos2))
-                         ;; found the `(let loop (' so we keep the [
-                         (void)]
-                        [else
-                         ;; otherwise, round.
-                         (change-to 4 #\()])])]
-                  [else 
-                   (change-to 5 #\()])]
-               [else 
-                (change-to 6 #\()]))])))
-    (send text delete pos (+ pos 1) #f)
-    (send text end-edit-sequence)
-    (cond
-      [(and (preferences:get 'framework:automatic-parens)
-            (not (in-string/comment? text)))
-       (send text insert real-char start-pos start-pos)
-       (when (equal? (send text classify-position start-pos) 'parenthesis)
-         (send text insert (case real-char
-                           [(#\() #\)]
-                           [(#\[) #\]]
-                           [(#\{) #\}])
-             (+ end-pos 1) (+ end-pos 1))
-         (send text set-position (+ start-pos 1)))]
-      [else
-       (send text insert real-char start-pos end-pos)])))
-
-;; find-keyword-and-distance : -> (union #f (cons string number))
-(define (find-keyword-and-distance before-whitespace-pos text)
-  ;; searches backwards for the keyword in the sequence at this level.
-  ;; if found, it counts how many sexps back it was 
-  (let loop ([pos before-whitespace-pos]
-             [n 0])
-    (let ([backward-match (send text backward-match pos 0)])
-      (cond
-        [backward-match
-         (let ([before-whitespace-pos (send text skip-whitespace backward-match 'backward #t)])
-           (loop before-whitespace-pos
-                 (if (send text stick-to-next-sexp? backward-match)
-                     n
-                     (+ n 1))))]
-        [else
-         (let* ([afterwards (send text get-forward-sexp pos)]
-                [keyword
-                 (and afterwards
-                      (send text get-text pos afterwards))])
-           (and keyword
-                (list keyword (- n 1))))]))))
-
-;; beginning-of-sequence? : text number -> boolean 
-;; determines if this position is at the beginning of a sequence
-;; that begins with a parenthesis.
-(define (beginning-of-sequence? text start)
-  (let ([before-space (send text skip-whitespace start 'backward #t)])
-    (cond
-      [(zero? before-space) #t]
-      [else
-       (equal? (send text get-character (- before-space 1)) 
-               #\()])))
-
-(define (text-between-equal? str text start end)
-  (and (= (string-length str) (- end start))
-       (let loop ([i (string-length str)])
-         (cond
-           [(= i 0) #t]
-           [else
-            (and (char=? (string-ref str (- i 1))
-                         (send text get-character (+ i start -1)))
-                 (loop (- i 1)))]))))
-
-
-;                       ;;;                                            ;;;   
-;                      ;                                                 ;   
-;                      ;                                                 ;   
-; ;;;   ; ;;;   ;;;   ;;;;;   ;;;         ; ;;;   ;;;;  ; ;;;    ;;;     ;   
-;;   ;   ;     ;   ;   ;     ;   ;         ;   ;      ;  ;;  ;  ;   ;    ;   
-;;   ;   ;     ;;;;;   ;      ;;;          ;   ;   ;;;;  ;   ;  ;;;;;    ;   
-;;   ;   ;     ;       ;         ;         ;   ;  ;   ;  ;   ;  ;        ;   
-;;   ;   ;     ;   ;   ;     ;   ;         ;   ;  ;   ;  ;   ;  ;   ;    ;   
-;;;;;   ;;;;    ;;;   ;;;;    ;;;          ;;;;    ;;; ;;;;  ;;  ;;;   ;;;;;;
-;;                                         ;                                 
-;;                                         ;                                 
-;;;;                                       ;;;                                
-
-
-(define (add-preferences-panel)
-  (preferences:add-panel
-   (list (string-constant editor-prefs-panel-label) 
-         (string-constant indenting-prefs-panel-label))
-   make-indenting-prefs-panel)
-  (preferences:add-panel
-   (list (string-constant editor-prefs-panel-label) 
-         (string-constant square-bracket-prefs-panel-label))
-   make-square-bracket-prefs-panel))
-
-(define (make-square-bracket-prefs-panel p)
-  (define main-panel (make-object vertical-panel% p))
-  (define boxes-panel (new horizontal-panel% [parent main-panel]))
-  
-  (define (mk-list-box sym keyword-type pref->string get-new-one)
-    (letrec ([vp (new vertical-panel% [parent boxes-panel])]
-             [_ (new message% 
-                     [label (format (string-constant x-like-keywords) keyword-type)]
-                     [parent vp])]
-             [lb
-              (new list-box% 
-                   [label #f]
-                   [parent vp]
-                   [choices (map pref->string (preferences:get sym))]
-                   [callback
-                    (λ (lb evt)
-                      (send remove-button enable (pair? (send lb get-selections))))])]
-             [bp (new horizontal-panel% [parent vp] [stretchable-height #f])]
-             [add
-              (new button%
-                   [label (string-constant add-keyword)]
-                   [parent bp]
-                   [callback 
-                    (λ (x y)
-                      (let ([new-one (get-new-one)])
-                        (when new-one
-                          (preferences:set sym (append (preferences:get sym) 
-                                                       (list new-one))))))])]
-             [remove-button
-              (new button%
-                   [label (string-constant remove-keyword)]
-                   [parent bp]
-                   [callback 
-                    (λ (x y)
-                      (let ([n (send lb get-selections)])
-                        (when (pair? n)
-                          (preferences:set 
-                           sym 
-                           (let loop ([i 0]
-                                      [prefs (preferences:get sym)])
-                             (cond
-                               [(= i (car n)) (cdr prefs)]
-                               [else (cons (car prefs)
-                                           (loop (+ i 1)
-                                                 (cdr prefs)))])))
-                          (cond
-                            [(= 0 (send lb get-number))
-                             (send remove-button enable #f)]
-                            [else
-                             (send lb set-selection 
-                                   (if (= (car n) (send lb get-number))
-                                       (- (send lb get-number) 1)
-                                       (car n)))]))))])])
-      (unless (pair? (send lb get-selections))
-        (send remove-button enable #f))
-      (preferences:add-callback sym
-                                (λ (p v)
-                                  (send lb clear)
-                                  (for-each (λ (x) (send lb append (pref->string x))) v)))))
-  
-  (define (get-new-simple-keyword label)
-    (λ ()
-      (let ([new-one
-             (keymap:call/text-keymap-initializer
-              (λ ()
-                (get-text-from-user
-                 (format (string-constant enter-new-keyword) label)
-                 (format (string-constant x-keyword) label))))])
-        (and new-one
-             (let ([parsed (with-handlers ((exn:fail:read? (λ (x) #f)))
-                             (read (open-input-string new-one)))])
-               
-               (and (symbol? parsed)
-                    (symbol->string parsed)))))))
-  
-  (define (get-new-cond-keyword)
-    (define f (new dialog% [label (format (string-constant enter-new-keyword) "Cond")]))
-    (define tb (keymap:call/text-keymap-initializer
-                (λ ()
-                  (new text-field% 
-                       [parent f]
-                       [label #f]))))
-    (define number-panel (new horizontal-panel% [parent f] [stretchable-height #f]))
-    (define number-label (new message% 
-                              [parent number-panel]
-                              [label (string-constant skip-subexpressions)]))
-    (define number
-      (keymap:call/text-keymap-initializer
-       (λ ()
-         (new text-field% 
-              [parent number-panel]
-              [init-value "1"]
-              [min-width 50]
-              [label #f]))))
-    
-    (define answers #f)
-    (define bp (new horizontal-panel% 
-                    [parent f] 
-                    [stretchable-height #f]
-                    [alignment '(right center)]))
-    (define (confirm-callback b e)
-      (let ([n (string->number (send number get-value))]
-            [sym (with-handlers ([exn:fail:read? (λ (x) #f)])
-                   (read (open-input-string (send tb get-value))))])
-        (when (and (number? n)
-                   (symbol? sym))
-          (set! answers (list (symbol->string sym) n)))
-        (send f show #f)))
-    
-    (define (cancel-callback b e)
-      (send f show #f))
-    
-    (define-values (ok-button cancel-button)
-      (gui-utils:ok/cancel-buttons bp confirm-callback cancel-callback 
-                                   (string-constant ok) (string-constant cancel)))
-    (send tb focus)
-    (send f show #t)
-    answers)
-  
-  (mk-list-box 'framework:square-bracket:letrec "Letrec" values (get-new-simple-keyword "Letrec"))
-  (mk-list-box 'framework:square-bracket:local 
-               "Local" 
-               values
-               (get-new-simple-keyword "Local"))
-  (mk-list-box 'framework:square-bracket:for/fold 
-               "For/fold" 
-               values
-               (get-new-simple-keyword "For/fold"))
-  (mk-list-box 'framework:square-bracket:cond/offset 
-               "Cond" 
-               (λ (l) (format "~a (~a)" (car l) (cadr l)))
-               get-new-cond-keyword)
-  
-  (define check-box (new check-box% 
-                         [parent main-panel]
-                         [label (string-constant fixup-open-brackets)]
-                         [value (preferences:get 'framework:fixup-open-parens)]
-                         [callback 
-                          (λ (x y)
-                            (preferences:set 'framework:fixup-open-parens 
-                                             (send check-box get-value)))]))
-  (preferences:add-callback
-   'framework:fixup-open-parens
-   (λ (p v)
-     (send check-box set-value v)))
-  
-  main-panel)
-
-(define (make-indenting-prefs-panel p)
-  (define get-keywords
-    (λ (hash-table)
-      (define all-keywords (hash-map hash-table list))
-      (define (pick-out wanted in out)
-        (cond
-          [(null? in) (sort out string<?)]
-          [else (if (eq? wanted (cadr (car in))) 
-                    (pick-out wanted (cdr in) 
-                              (cons (format "~s" (car (car in))) out))
-                    (pick-out wanted (cdr in) out))]))
-      (values  (pick-out 'begin all-keywords null)
-               (pick-out 'define all-keywords null)
-               (pick-out 'lambda all-keywords null)
-               (pick-out 'for/fold all-keywords null))))
-  (define-values (begin-keywords define-keywords lambda-keywords for/fold-keywords)
-    (get-keywords (car (preferences:get 'framework:tabify))))
-  (define ((add-button-callback keyword-type keyword-symbol list-box) button command)
-    (define new-one
-      (keymap:call/text-keymap-initializer
-       (λ ()
-         (get-text-from-user
-          (format (string-constant enter-new-keyword) keyword-type)
-          (format (string-constant x-keyword) keyword-type)))))
-    (when new-one
-      (let ([parsed (with-handlers ((exn:fail:read? (λ (x) #f)))
-                      (read (open-input-string new-one)))])
-        (cond
-          [(and (symbol? parsed)
-                (hash-ref (car (preferences:get 'framework:tabify))
-                          parsed
-                          (λ () #f)))
-           (message-box (string-constant error)
-                        (format (string-constant already-used-keyword) parsed))]
-          [(symbol? parsed)
-           (let* ([pref (preferences:get 'framework:tabify)]
-                  [ht (car pref)])
-             (hash-set! ht parsed keyword-symbol)
-             (preferences:set 'framework:tabify pref)
-             (update-list-boxes ht))]
-          [else (message-box 
-                 (string-constant error)
-                 (format (string-constant expected-a-symbol) new-one))]))))
-  (define ((delete-callback list-box) button command)
-    (define selections (send list-box get-selections))
-    (define symbols 
-      (map (λ (x) (read (open-input-string (send list-box get-string x)))) selections))
-    (for-each (λ (x) (send list-box delete x)) (reverse selections))
-    (define pref (preferences:get 'framework:tabify))
-    (define ht (car pref))
-    (for-each (λ (x) (hash-remove! ht x)) symbols)
-    (preferences:set 'framework:tabify pref))
-  (define main-panel (make-object horizontal-panel% p))
-  (define (make-column string symbol keywords bang-regexp)
-    (define vert (make-object vertical-panel% main-panel))
-    (make-object message% (format (string-constant x-like-keywords) string) vert)
-    (define box (make-object list-box% #f keywords vert void '(multiple)))
-    (define button-panel (make-object horizontal-panel% vert))
-    (define text (new text-field% 
-                      (label (string-constant indenting-prefs-extra-regexp))
-                      (callback (λ (tf evt) 
-                                  (define str (send tf get-value))
-                                  (cond
-                                    [(equal? str "") 
-                                     (bang-regexp #f)]
-                                    [else
-                                     (with-handlers ([exn:fail?
-                                                      (λ (x)
-                                                        (color-yellow (send tf get-editor)))])
-                                       (bang-regexp (regexp str))
-                                       (clear-color (send tf get-editor)))])))
-                      (parent vert)))
-    (define add-button (make-object button% (string-constant add-keyword)
-                         button-panel (add-button-callback string symbol box)))
-    (define delete-button (make-object button% (string-constant remove-keyword)
-                            button-panel (delete-callback box)))
-    (send* button-panel 
-      (set-alignment 'center 'center)
-      (stretchable-height #f))
-    (send add-button min-width (send delete-button get-width))
-    (values box text))
-  (define (color-yellow text)
-    (let ([sd (make-object style-delta%)])
-      (send sd set-delta-background "yellow")
-      (send text change-style sd 0 (send text last-position))))
-  (define (clear-color text)
-    (let ([sd (make-object style-delta%)])
-      (send sd set-delta-background "white")
-      (send text change-style sd 0 (send text last-position))))
-  (define (update-pref sel x)
-    (let ([pref (preferences:get 'framework:tabify)])
-      (let ([pref
-             (let loop ([pref pref][sel sel])
-               (if (zero? sel)
-                   (cons x (cdr pref))
-                   (cons (car pref) (loop (cdr pref) (sub1 sel)))))])
-        (preferences:set 'framework:tabify pref))))
-  (define-values (begin-list-box begin-regexp-text) 
-    (make-column "Begin"
-                 'begin
-                 begin-keywords
-                 (λ (x) (update-pref 1 x))))
-  (define-values (define-list-box define-regexp-text) 
-    (make-column "Define" 
-                 'define 
-                 define-keywords
-                 (λ (x) (update-pref 2 x))))
-  (define-values (lambda-list-box lambda-regexp-text)
-    (make-column "Lambda"
-                 'lambda
-                 lambda-keywords
-                 (λ (x) (update-pref 3 x))))
-  (define-values (for/fold-list-box for/fold-regexp-text)
-    (make-column "For/fold"
-                 'for/fold
-                 for/fold-keywords
-                 (λ (x) (update-pref 4 x))))
-  (define (update-list-boxes hash-table)
-    (define-values (begin-keywords define-keywords lambda-keywords for/fold-keywords) 
-      (get-keywords hash-table))
-    (define (reset list-box keywords)
-      (send list-box clear)
-      (for-each (λ (x) (send list-box append x)) keywords))
-    (reset begin-list-box begin-keywords)
-    (reset define-list-box define-keywords)
-    (reset lambda-list-box lambda-keywords)
-    (reset for/fold-list-box for/fold-keywords)
-    #t)
-  (define update-gui
-    (λ (pref)
-      (update-list-boxes (car pref))
-      (send begin-regexp-text set-value (or (object-name (list-ref pref 1)) ""))
-      (send define-regexp-text set-value (or (object-name (list-ref pref 2)) ""))
-      (send lambda-regexp-text set-value (or (object-name (list-ref pref 3)) ""))
-      (send for/fold-regexp-text set-value (or (object-name (list-ref pref 4)) ""))))
-  (preferences:add-callback 'framework:tabify (λ (p v) (update-gui v)))
-  (update-gui (preferences:get 'framework:tabify))
-  main-panel)
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/scheme.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/scheme.rkt
deleted file mode 100644
index bbd3a3e13b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/scheme.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-
-;; these are the names that used to be a part
-;; of the framework with the `scheme:' prefix 
-;; and now are primarily used with the `racket:'
-;; prefix. This list is used to build documentation
-;; and renaming exports
-
-(provide racket:ids)
-(define racket:ids
-  '(text<%>
-    text-mixin
-    text%
-    
-    text-mode<%>
-    text-mode-mixin
-    text-mode%
-    
-    set-mode-mixin
-    
-    sexp-snip%
-    sexp-snip<%>
-    get-wordbreak-map
-    init-wordbreak-map
-    get-keymap
-    setup-keymap
-    add-preferences-panel
-    add-coloring-preferences-panel
-    
-    get-color-prefs-table
-    get-white-on-black-color-prefs-table
-    short-sym->pref-name
-    short-sym->style-name
-    
-    text-balanced?))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/search.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/search.rkt
deleted file mode 100644
index e7d91d7224..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/search.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang scheme/base
-(require racket/contract/base
-         racket/class
-         scheme/gui/base)
-
-(provide/contract
- [find-string-embedded
-  (->* ((is-a?/c text%)
-        string?)
-       ((symbols 'forward 'backward)
-        (or/c (symbols 'start) number?)
-        (or/c (symbols 'eof) number?)
-        boolean?
-        boolean?
-        boolean?)
-      (values (is-a?/c editor<%>)
-              (or/c false/c number?)))])
-
-(define find-string-embedded
-  (lambda (edit
-           str
-           [direction 'forward]
-           [start 'start]
-           [end 'eof]
-           [get-start #t]
-           [case-sensitive? #t]
-           [pop-out? #f])
-    (let/ec k
-      (let* ([start (if (eq? start 'start) 
-                        (send edit get-start-position)
-                        start)]
-             [end (if (eq? 'eof end)
-                      (if (eq? direction 'forward)
-                          (send edit last-position)
-                          0)
-                      end)]
-             [flat (send edit find-string str direction
-                         start end get-start
-                         case-sensitive?)]
-             [pop-out
-              (λ ()
-                (let ([admin (send edit get-admin)])
-                  (if (is-a? admin editor-snip-editor-admin<%>)
-                      (let* ([snip (send admin get-snip)]
-                             [edit-above (send (send snip get-admin) get-editor)]
-                             [pos (send edit-above get-snip-position snip)]
-                             [pop-out-pos (if (eq? direction 'forward) (add1 pos) pos)])
-                        (find-string-embedded
-                         edit-above
-                         str
-                         direction 
-                         pop-out-pos
-                         (if (eq? direction 'forward) 'eof 0)
-                         get-start
-                         case-sensitive?
-                         pop-out?))
-                      (values edit #f))))])
-        (let loop ([current-snip (send edit find-snip start
-                                       (if (eq? direction 'forward)
-                                           'after-or-none
-                                           'before-or-none))])
-          (let ([next-loop
-                 (λ ()
-                   (if (eq? direction 'forward)
-                       (loop (send current-snip next))
-                       (loop (send current-snip previous))))])
-            (cond
-              [(or (not current-snip)
-                   (and flat
-                        (let* ([start (send edit get-snip-position current-snip)]
-                               [end (+ start (send current-snip get-count))])
-                          (if (eq? direction 'forward)
-                              (and (<= start flat)
-                                   (< flat end))
-                              (and (< start flat)
-                                   (<= flat end))))))
-               (if (and (not flat) pop-out?)
-                   (pop-out)
-                   (values edit flat))]
-              [(is-a? current-snip editor-snip%)
-               (let-values ([(embedded embedded-pos)
-                             (let ([media (send current-snip get-editor)])
-                               (if (and media
-                                        (is-a? media text%))
-                                   (begin
-                                     (find-string-embedded 
-                                      media 
-                                      str
-                                      direction
-                                      (if (eq? 'forward direction)
-                                          0
-                                          (send media last-position))
-                                      'eof
-                                      get-start case-sensitive?))
-                                   (values #f #f)))])
-                 (if (not embedded-pos)
-                     (next-loop)
-                     (values embedded embedded-pos)))]
-              [else (next-loop)])))))))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/sig.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/sig.rkt
deleted file mode 100644
index 9d2be724f8..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/sig.rkt
+++ /dev/null
@@ -1,522 +0,0 @@
-#lang racket/base
-  
-  (require scheme/unit)
-  
-  (provide (prefix-out framework: (except-out (all-defined-out) framework^))
-           framework^)
-  
-  (define-signature number-snip-class^ 
-    (snip-class%))
-  (define-signature number-snip^ extends number-snip-class^
-    (make-repeating-decimal-snip
-     make-fraction-snip))
-  
-  (define-signature comment-box-class^
-    (snip%))
-  (define-signature comment-box^ extends comment-box-class^
-    (snipclass))
-  
-  (define-signature menu-class^
-    (can-restore<%>
-     can-restore-mixin
-     can-restore-underscore<%>
-     can-restore-underscore-mixin
-     can-restore-menu-item%
-     can-restore-checkable-menu-item%
-     can-restore-underscore-menu%))
-  (define-signature menu^ extends menu-class^
-    ())
-  
-  (define-signature version-class^
-    ())
-  (define-signature version^ extends version-class^
-    (add-spec
-     version))
-  
-  (define-signature panel-class^
-    (single-mixin
-     single<%>
-     
-     single-window<%>
-     single-window-mixin
-     
-     ;;multi-view-mixin
-     ;;multi-view<%>
-     
-     
-     single%
-     single-pane%
-     ;;multi-view%
-     
-     dragable<%>
-     dragable-mixin
-     
-     vertical-dragable<%>
-     vertical-dragable-mixin
-     vertical-dragable%
-     
-     horizontal-dragable<%>
-     horizontal-dragable-mixin
-     horizontal-dragable%
-
-     splitter<%>
-     splitter-mixin
-     
-     discrete-sizes<%>
-     discrete-child<%>
-     discrete-sizes-mixin
-     horizontal-discrete-sizes%
-     vertical-discrete-sizes%))
-  (define-signature panel^ extends panel-class^
-    (dragable-container-size
-     dragable-place-children))
-
-  (define-signature application-class^
-    ())
-  (define-signature application^ extends application-class^
-    (current-app-name))
-  
-  (define-signature preferences-class^
-    ())
-  (define-signature preferences^ extends preferences-class^
-    (put-preferences/gui
-     get-preference/gui
-     add-panel
-     add-font-panel
-     
-     add-editor-checkbox-panel
-     add-general-checkbox-panel
-     add-warnings-checkbox-panel
-     add-scheme-checkbox-panel
-     
-     add-to-editor-checkbox-panel
-     add-to-general-checkbox-panel
-     add-to-warnings-checkbox-panel
-     add-to-scheme-checkbox-panel
-     
-     add-on-close-dialog-callback
-     add-can-close-dialog-callback
-     
-     add-check
-     
-     show-dialog
-     hide-dialog))
-  
-  (define-signature autosave-class^
-    (autosavable<%>))
-  (define-signature autosave^ extends autosave-class^
-    (toc-path
-     register
-     restore-autosave-files/gui))
-  
-  (define-signature exit-class^
-    ())
-  (define-signature exit^ extends exit-class^
-    (set-exiting
-     exiting?
-     user-oks-exit
-     insert-on-callback
-     insert-can?-callback
-     can-exit?
-     on-exit
-     exit))
-  
-  (define-signature path-utils-class^
-    ())
-  (define-signature path-utils^ extends path-utils-class^
-    (generate-autosave-name 
-     generate-backup-name))
-  
-  (define-signature finder-class^
-    ())
-  (define-signature finder^ extends finder-class^
-    (dialog-parent-parameter
-     default-extension
-     default-filters
-     common-put-file 
-     common-get-file 
-     std-put-file 
-     std-get-file 
-     get-file
-     put-file))
-  
-  (define-signature editor-class^
-    (basic<%>
-     standard-style-list<%>
-     keymap<%>
-     autowrap<%>
-     info<%>
-     file<%>
-     backup-autosave<%>
-     basic-mixin
-     standard-style-list-mixin
-     keymap-mixin
-     autowrap-mixin
-     info-mixin
-     file-mixin
-     backup-autosave-mixin))
-  (define-signature editor^ extends editor-class^
-    (get-standard-style-list
-     set-standard-style-list-pref-callbacks
-     set-standard-style-list-delta
-     set-default-font-color
-     get-default-color-style-name
-     add-after-user-keymap
-     get-current-preferred-font-size
-     set-current-preferred-font-size
-     font-size-pref->current-font-size
-     set-change-font-size-when-monitors-change?
-     get-change-font-size-when-monitors-change?))
-  
-  (define-signature pasteboard-class^
-    (basic%
-     standard-style-list%
-     keymap%
-     file%
-     backup-autosave%
-     info%))
-  (define-signature pasteboard^ extends pasteboard-class^
-    ())
-  
-  (define-signature text-class^
-    (basic<%>
-     line-spacing<%>
-     first-line<%>
-     line-numbers<%>
-     foreground-color<%>
-     hide-caret/selection<%>
-     nbsp->space<%>
-     column-guide<%>
-     normalize-paste<%>
-     delegate<%>
-     wide-snip<%>
-     searching<%>
-     return<%>
-     info<%>
-     file<%>
-     clever-file-format<%>
-     crlf-line-endings<%>
-     ports<%>
-     input-box<%>
-     autocomplete<%>
-     
-     basic% 
-     line-spacing%
-     hide-caret/selection%
-     nbsp->space%
-     normalize-paste%
-     1-pixel-string-snip%
-     1-pixel-tab-snip%
-     delegate%
-     wide-snip%
-     standard-style-list%
-     keymap%
-     return%
-     autowrap%
-     file%
-     clever-file-format%
-     backup-autosave%
-     searching%
-     info%
-     input-box%
-     
-     basic-mixin
-     line-spacing-mixin
-     first-line-mixin
-     line-numbers-mixin
-     foreground-color-mixin
-     hide-caret/selection-mixin
-     nbsp->space-mixin
-     column-guide-mixin
-     normalize-paste-mixin
-     wide-snip-mixin
-     delegate-mixin
-     searching-mixin
-     return-mixin
-     info-mixin
-     file-mixin
-     clever-file-format-mixin
-     crlf-line-endings-mixin
-     ports-mixin
-     input-box-mixin
-     autocomplete-mixin))
-  (define-signature text^ extends text-class^
-    (autocomplete-append-after
-     autocomplete-limit
-     get-completions/manuals
-     lookup-port-name
-     
-     range?
-     range-start
-     range-end
-     range-caret-space? 
-     range-style 
-     range-color))
-  
-  (define-signature canvas-class^
-    (basic<%>
-     color<%>
-     delegate<%>
-     info<%>
-     wide-snip<%>
-     
-     basic%
-     color%
-     info%
-     delegate%
-     wide-snip%
-     
-     basic-mixin
-     color-mixin
-     delegate-mixin
-     info-mixin
-     wide-snip-mixin))
-  (define-signature canvas^ extends canvas-class^
-    ())
-  
-  (define-signature frame-class^
-    (basic<%>
-     focus-table<%>
-     size-pref<%>
-     register-group<%>
-     status-line<%>
-     standard-menus<%>
-     editor<%>
-     text<%>
-     pasteboard<%>
-     delegate<%>
-     searchable<%>
-     searchable-text<%>
-     info<%>
-     text-info<%>
-     pasteboard-info<%>
-     
-     basic%
-     size-pref%
-     status-line%
-     info%
-     text-info%
-     pasteboard-info%
-     standard-menus%
-     editor%
-     text%
-     searchable%
-     delegate%
-     pasteboard%
-     
-     focus-table-mixin
-     basic-mixin
-     size-pref-mixin
-     register-group-mixin
-     status-line-mixin
-     standard-menus-mixin
-     editor-mixin
-     text-mixin
-     pasteboard-mixin
-     delegate-mixin
-     searchable-mixin
-     searchable-text-mixin
-     info-mixin
-     text-info-mixin
-     pasteboard-info-mixin))
-  (define-signature frame^ extends frame-class^
-    (current-icon
-     reorder-menus
-     remove-empty-menus
-     add-snip-menu-items
-     setup-size-pref))
-  
-  (define-signature group-class^
-    (%))
-  (define-signature group^ extends group-class^
-    (get-the-frame-group
-     on-close-action
-     can-close-check
-     add-to-windows-menu
-     create-windows-menu))
-  
-  (define-signature handler-class^
-    ())
-  (define-signature handler^ extends handler-class^
-    (handler? 
-     handler-name 
-     handler-extension
-     handler-handler
-     insert-format-handler
-     find-format-handler 
-     find-named-format-handler 
-     current-create-new-window
-     edit-file
-     open-file
-     install-recent-items
-     add-to-recent
-     set-recent-position
-     set-recent-items-frame-superclass
-     size-recently-opened-files))
-  
-  (define-signature icon-class^
-    ())
-  (define-signature icon^ extends icon-class^
-    (get-paren-highlight-bitmap
-     get-autowrap-bitmap
-     get-eof-bitmap
-     
-     get-lock-bitmap
-     get-unlock-bitmap
-     get-anchor-bitmap
-     
-     get-left/right-cursor
-     get-up/down-cursor
-     
-     get-gc-on-bitmap
-     get-gc-off-bitmap))
-  
-  (define-signature keymap-class^
-    (aug-keymap%
-     aug-keymap<%>
-     aug-keymap-mixin))
-  (define-signature keymap^ extends keymap-class^
-    (send-map-function-meta
-     make-meta-prefix-list
-     
-     canonicalize-keybinding-string
-     
-     add-to-right-button-menu
-     add-to-right-button-menu/before
-     
-     setup-global
-     setup-search
-     setup-file
-     setup-editor
-     
-     get-user
-     get-global
-     get-search
-     get-file
-     get-editor
-     
-     set-chained-keymaps
-     remove-chained-keymap
-     
-     call/text-keymap-initializer
-     
-     add-user-keybindings-file
-     remove-user-keybindings-file
-     
-     region-click))
-  
-  (define-signature color-class^
-    (text<%>
-     text-mixin
-     text%
-     
-     text-mode<%>
-     text-mode-mixin
-     text-mode%))
-  (define-signature color^ extends color-class^
-    (get-parenthesis-colors-table
-     misspelled-text-color-style-name))
-  
-  (define-signature color-prefs-class^
-    ())
-  (define-signature color-prefs^ extends color-prefs-class^
-    (register-color-preference
-     add-to-preferences-panel
-     build-color-selection-panel
-     add-background-preferences-panel
-     marshall-style-delta
-     unmarshall-style-delta
-     set-default/color-scheme
-     white-on-black
-     black-on-white
-     
-     add-color-scheme-preferences-panel
-     set-current-color-scheme
-     get-current-color-scheme-name
-     known-color-scheme-name?
-     color-scheme-style-name?
-     lookup-in-color-scheme
-     set-in-color-scheme
-     register-color-scheme-entry-change-callback
-     add-color-scheme-entry
-     register-info-based-color-schemes
-     get-color-scheme-names))
-  
-  (define-signature racket-class^
-    (text<%>
-     text-mixin
-     text%
-     
-     text-mode<%>
-     text-mode-mixin
-     text-mode%
-     
-     set-mode-mixin
-     
-     sexp-snip%
-     sexp-snip<%>))
-  (define-signature racket^ extends racket-class^
-    (get-wordbreak-map
-     init-wordbreak-map
-     get-keymap
-     setup-keymap
-     add-preferences-panel
-     add-coloring-preferences-panel
-     
-     get-color-prefs-table
-     get-white-on-black-color-prefs-table
-     short-sym->pref-name
-     short-sym->style-name
-     
-     text-balanced?))
-  
-  (define-signature main-class^ ())
-  (define-signature main^ extends main-class^ ())
-  
-  (define-signature mode-class^ 
-    (host-text-mixin
-     host-text<%>
-     surrogate-text%
-     surrogate-text<%>))
-  (define-signature mode^ extends mode-class^ ())
-  
-  (define-signature color-model-class^
-    ())
-  (define-signature color-model^ extends color-model-class^
-    (xyz?
-     xyz-x
-     xyz-y
-     xyz-z
-     rgb-color-distance
-     rgb->xyz
-     xyz->rgb))
-  
-  (define-signature early-init^ ())
-  
-  (define-signature framework^
-    ((open (prefix application: application^))
-     (open (prefix version: version^))
-     (open (prefix color-model: color-model^))
-     (open (prefix mode: mode^))
-     (open (prefix exit: exit^))
-     (open (prefix menu: menu^))
-     (open (prefix preferences: preferences^))
-     (open (prefix number-snip: number-snip^))
-     (open (prefix autosave: autosave^))
-     (open (prefix path-utils: path-utils^))
-     (open (prefix icon: icon^))
-     (open (prefix keymap: keymap^))
-     (open (prefix editor: editor^))
-     (open (prefix pasteboard: pasteboard^))
-     (open (prefix text: text^))
-     (open (prefix color: color^))
-     (open (prefix color-prefs: color-prefs^))
-     (open (prefix comment-box: comment-box^))
-     (open (prefix finder: finder^))
-     (open (prefix group: group^))
-     (open (prefix canvas: canvas^))
-     (open (prefix panel: panel^))
-     (open (prefix frame: frame^))
-     (open (prefix handler: handler^))
-     (open (prefix racket: racket^))
-     (open (prefix main: main^))))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/standard-menus-items.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/standard-menus-items.rkt
deleted file mode 100644
index 05e6fe09c3..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/standard-menus-items.rkt
+++ /dev/null
@@ -1,448 +0,0 @@
-#lang at-exp racket/base
-
-(provide
- (struct-out generic)
-
- (struct-out generic/docs)
-
- (struct-out generic-override)
- (struct-out generic-augment)
- (struct-out generic-method)
- (struct-out generic-private-field)
-
- (struct-out menu-item)
- menu-name->get-menu-name ;; : menu-item -> symbol
-
- (struct-out before/after)
- (struct-out before)
- (struct-out after)
-
- (struct-out between)
-
- (struct-out an-item)
- (struct-out a-checkable-item)
- (struct-out a-submenu-item)
-
- ;; an-item -> symbol
- ;; calcualates the names of various identifiers associated with the item.
- an-item->callback-name
- an-item->create-menu-item-name
- an-item->get-item-name
- an-item->item-name
- an-item->on-demand-name
- an-item->string-name
- an-item->help-string-name
-
- before/after->name
- between->name
-
- items)
-
-(define-struct generic (name initializer))
-(define-struct (generic/docs generic) (documentation))
-(define-struct (generic-override generic/docs) ())
-(define-struct (generic-augment generic/docs) ())
-(define-struct (generic-method generic/docs) ())
-(define-struct (generic-private-field generic) ())
-
-(define-struct menu-item (menu-name))
-(define (menu-name->get-menu-name menu-item)
-  (string->symbol
-   (format "get-~a" (menu-item-menu-name menu-item))))
-
-(define-struct (before/after menu-item) (name procedure))
-(define-struct (before before/after) ())
-(define-struct (after before/after) ())
-(define (before/after->name before/after)
-  (string->symbol (format "~a:~a-~a"
-                          (menu-item-menu-name before/after)
-                          (if (before? before/after)
-                              "before"
-                              "after")
-                          (before/after-name before/after))))
-
-(define-struct (between menu-item) (before after procedure))
-(define (between->name between)
-  (string->symbol (format "~a:between-~a-and-~a"
-                          (menu-item-menu-name between)
-                          (between-before between)
-                          (between-after between))))
-
-(define-struct (an-item menu-item)
-  (item-name
-   help-string
-   proc
-   shortcut
-   shortcut-prefix
-   menu-string
-   on-demand
-   create))
-(define-struct (a-submenu-item an-item) ())
-(define-struct (a-checkable-item an-item) ())
-
-(define (an-item->callback-name item)
-  (string->symbol
-   (format "~a:~a-callback" (menu-item-menu-name item) (an-item-item-name item))))
-(define (an-item->create-menu-item-name item)
-  (string->symbol
-   (format "~a:create-~a?" (menu-item-menu-name item) (an-item-item-name item))))
-(define (an-item->get-item-name item)
-  (string->symbol
-   (format "~a:get-~a-item" (menu-item-menu-name item) (an-item-item-name item))))
-(define (an-item->item-name item)
-  (string->symbol
-   (format "~a:~a-item" (menu-item-menu-name item) (an-item-item-name item))))
-(define (an-item->on-demand-name item)
-  (string->symbol
-   (format "~a:~a-on-demand" (menu-item-menu-name item) (an-item-item-name item))))
-(define (an-item->string-name item)
-  (string->symbol
-   (format "~a:~a-string" (menu-item-menu-name item) (an-item-item-name item))))
-(define (an-item->help-string-name item)
-  (string->symbol
-   (format "~a:~a-help-string" (menu-item-menu-name item) (an-item-item-name item))))
-
-(define (edit-menu:do const)
-  `(λ (menu evt)
-     (let ([edit (get-edit-target-object)])
-       (when (and edit
-                  (is-a? edit editor<%>))
-         (send edit do-edit-operation ',const)))
-     #t))
-
-(define (edit-menu:can-do-on-demand const)
-  `(λ (item)
-     (let* ([editor (get-edit-target-object)]
-            [enable?
-             (and editor
-                  (is-a? editor editor<%>)
-                  (send editor can-do-edit-operation? ',const))])
-       (send item enable enable?))))
-
-(define edit-menu:edit-target-on-demand
-  `(λ (item)
-     (send item enable
-           (let ([target (get-edit-target-object)])
-             (and target (is-a? target editor<%>))))))
-
-(define on-demand-do-nothing '(λ (menu-item) (void)))
-
-(define items
-  (list (make-generic-augment
-         'on-close
-         '(λ ()
-            (remove-prefs-callback)
-            (inner (void) on-close))
-         (list
-          '@defmethod[(on-close) void?]{
-             Removes the preferences callbacks for the menu items
-           }))
-        (make-generic-method
-         'get-menu% '(λ () menu:can-restore-underscore-menu%)
-         (list
-          '@defmethod[(get-menu%)
-                      (is-a?/c menu:can-restore-underscore-menu%)]{
-             The result of this method is used as the class
-             for creating the result of these methods:
-             @method[frame:standard-menus get-file-menu],
-             @method[frame:standard-menus get-edit-menu], and
-             @method[frame:standard-menus get-help-menu].}))
-        (make-generic-method
-         'get-menu-item% '(λ () menu:can-restore-menu-item%)
-         (list
-          '@defmethod[(get-menu-item%) (is-a?/c menu:can-restore-menu-item%)]{
-             The result of this method is used as the class for creating
-             the menu items in this frame.
-
-             Returns @racket[menu:can-restore-menu-item] by default.}))
-        (make-generic-method
-         'get-checkable-menu-item% '(λ () menu:can-restore-checkable-menu-item%)
-         (list
-          '@defmethod[(get-checkable-menu-item%) (is-a?/c menu:can-restore-checkable-menu-item%)]{
-             The result of this method is used as the class for creating
-             checkable menu items in this class.
-
-             returns @racket[menu:can-restore-checkable-menu-item] by default.}))
-
-        (make-generic-method
-         'get-file-menu
-         '(λ () file-menu)
-         (list
-          '@defmethod[(get-file-menu) (is-a?/c menu%)]{
-             Returns the file menu.
-             See also @method[frame:standard-menus<%> get-menu%].}))
-
-        (make-generic-private-field
-         'file-menu
-         '(make-object (get-menu%)
-            (string-constant file-menu-label)
-            (get-menu-bar)))
-        (make-generic-method
-         'get-edit-menu
-         '(λ () edit-menu)
-         (list
-          '@defmethod[(get-edit-menu) (is-a?/c menu%)]{
-             Returns the edit menu.
-             See also @method[frame:standard-menus<%> get-menu%].}))
-        (make-generic-private-field
-         'edit-menu
-         '(make-object (get-menu%) (string-constant edit-menu-label) (get-menu-bar)))
-        (make-generic-method
-         'get-help-menu
-         '(λ () help-menu)
-         (list
-          '@defmethod[(get-help-menu) (is-a?/c menu%)]{
-             Returns the help menu.
-             See also @method[frame:standard-menus<%> get-menu%].}))
-        (make-generic-private-field
-         'help-menu
-         '(make-object (get-menu%) (string-constant help-menu-label) (get-menu-bar)))
-
-        (make-an-item 'file-menu 'new
-                      '(string-constant new-info)
-                      '(λ (item control) (handler:edit-file #f) #t)
-                      #\n
-                      '(get-default-shortcut-prefix)
-                      '(string-constant new-menu-item)
-                      on-demand-do-nothing
-                      #t)
-        (make-between 'file-menu 'new 'open 'nothing)
-        (make-an-item 'file-menu 'open '(string-constant open-info)
-                      '(λ (item control) (handler:open-file) #t)
-                      #\o
-                      '(get-default-shortcut-prefix)
-                      '(string-constant open-menu-item)
-                      on-demand-do-nothing
-                      #t)
-        (make-a-submenu-item 'file-menu 'open-recent
-                             '(string-constant open-recent-info)
-                             '(λ (x y) (void))
-                             #f
-                             '(get-default-shortcut-prefix)
-                             '(string-constant open-recent-menu-item)
-                             '(λ (menu)
-                                (handler:install-recent-items menu))
-                             #t)
-        (make-between 'file-menu 'open 'revert 'nothing)
-        (make-an-item 'file-menu 'revert
-                      '(string-constant revert-info)
-                      '(λ (item control) (void))
-                      #\e
-                      '(cons 'shift (get-default-shortcut-prefix))
-                      '(string-constant revert-menu-item)
-                      on-demand-do-nothing
-                      #f)
-        (make-between 'file-menu 'revert 'save 'nothing)
-        (make-an-item 'file-menu 'save
-                      '(string-constant save-info)
-                      '(λ (item control) (void))
-                      #\s
-                      '(get-default-shortcut-prefix)
-                      '(string-constant save-menu-item)
-                      on-demand-do-nothing
-                      #f)
-        (make-an-item 'file-menu 'save-as
-                      '(string-constant save-as-info)
-                      '(λ (item control) (void))
-                      #\s
-                      '(cons 'shift (get-default-shortcut-prefix))
-                      '(string-constant save-as-menu-item)
-                      on-demand-do-nothing
-                      #f)
-        (make-between 'file-menu 'save-as 'print 'nothing)
-        (make-an-item 'file-menu 'print
-                      '(string-constant print-info)
-                      '(λ (item control) (void))
-                      #\p
-                      '(get-default-shortcut-prefix)
-                      '(string-constant print-menu-item)
-                      on-demand-do-nothing
-                      #f)
-        (make-between 'file-menu 'print 'close 'separator)
-        (make-an-item 'file-menu 'close
-                      '(string-constant close-info)
-                      '(λ (item control) (when (can-close?) (on-close) (show #f)) #t)
-                      #\w
-                      '(get-default-shortcut-prefix)
-                      '(if (eq? (system-type) 'unix)
-                           (string-constant close-menu-item)
-                           (string-constant close-window-menu-item))
-                      on-demand-do-nothing
-                      #t)
-        (make-between 'file-menu 'close 'quit 'nothing)
-        (make-an-item 'file-menu 'quit
-                      '(string-constant quit-info)
-                      '(λ (item control)
-                         (when (exit:user-oks-exit)
-                           (exit:exit)))
-                      #\q
-                      '(get-default-shortcut-prefix)
-                      '(if (eq? (system-type) 'windows)
-                           (string-constant quit-menu-item-windows)
-                           (string-constant quit-menu-item-others))
-                      on-demand-do-nothing
-                      '(not (eq? (system-type) 'macosx)))
-        (make-after 'file-menu 'quit 'nothing)
-
-        (make-an-item 'edit-menu 'undo
-                      '(string-constant undo-info)
-                      (edit-menu:do  'undo)
-                      #\z
-                      '(get-default-shortcut-prefix)
-                      '(string-constant undo-menu-item)
-                      (edit-menu:can-do-on-demand 'undo)
-                      #t)
-        (make-an-item 'edit-menu 'redo
-                      '(string-constant redo-info)
-                      (edit-menu:do 'redo)
-                      '(if (eq? (system-type) 'windows)
-                           #\y
-                           #\z)
-                      '(if (eq? (system-type) 'windows)
-                           (get-default-shortcut-prefix)
-                           (cons 'shift (get-default-shortcut-prefix)))
-                      '(string-constant redo-menu-item)
-                      (edit-menu:can-do-on-demand 'redo)
-                      #t)
-        (make-between 'edit-menu 'redo 'cut 'separator)
-        (make-an-item 'edit-menu 'cut '(string-constant cut-info)
-                      (edit-menu:do 'cut)
-                      #\x
-                      '(get-default-shortcut-prefix)
-                      '(string-constant cut-menu-item)
-                      (edit-menu:can-do-on-demand 'cut)
-                      #t)
-        (make-between 'edit-menu 'cut 'copy 'nothing)
-        (make-an-item 'edit-menu 'copy
-                      '(string-constant copy-info)
-                      (edit-menu:do 'copy)
-                      #\c
-                      '(get-default-shortcut-prefix)
-                      '(string-constant copy-menu-item)
-                      (edit-menu:can-do-on-demand 'copy)
-                      #t)
-        (make-between 'edit-menu 'copy 'paste 'nothing)
-        (make-an-item 'edit-menu 'paste
-                      '(string-constant paste-info)
-                      (edit-menu:do 'paste)
-                      #\v
-                      '(get-default-shortcut-prefix)
-                      '(string-constant paste-menu-item)
-                      (edit-menu:can-do-on-demand 'paste)
-                      #t)
-        (make-between 'edit-menu 'paste 'clear 'nothing)
-        (make-an-item 'edit-menu 'clear
-                      '(string-constant clear-info)
-                      (edit-menu:do 'clear)
-                      #f
-                      '(get-default-shortcut-prefix)
-                      '(if (eq? (system-type) 'windows)
-                           (string-constant clear-menu-item-windows)
-                           (string-constant clear-menu-item-windows))
-                      (edit-menu:can-do-on-demand 'clear)
-                      #t)
-        (make-between 'edit-menu 'clear 'select-all 'nothing)
-        (make-an-item 'edit-menu 'select-all
-                      '(string-constant select-all-info)
-                      (edit-menu:do 'select-all)
-                      #\a
-                      '(get-default-shortcut-prefix)
-                      '(string-constant select-all-menu-item)
-                      (edit-menu:can-do-on-demand 'select-all)
-                      #t)
-        (make-between 'edit-menu 'select-all 'find 'separator)
-
-        (make-an-item 'edit-menu 'find
-                      '(string-constant find-info)
-                      '(λ (item control) (void))
-                      #\f
-                      '(get-default-shortcut-prefix)
-                      '(string-constant find-menu-item)
-                      edit-menu:edit-target-on-demand
-                      #f)
-        (make-an-item 'edit-menu 'find-from-selection
-                      '(string-constant find-info)
-                      '(λ (item control) (void))
-                      '(if (eq? (system-type) 'macosx)
-                           #\f
-                           #f)
-                      '(if (eq? (system-type) 'macosx)
-                           (cons 'option (get-default-shortcut-prefix))
-                           (get-default-shortcut-prefix))
-                      '(string-constant find-from-selection-menu-item)
-                      edit-menu:edit-target-on-demand
-                      #f)
-
-        (make-an-item 'edit-menu 'find-next
-                      '(string-constant find-next-info)
-                      '(λ (item control) (void))
-                      #\g
-                      '(get-default-shortcut-prefix)
-                      '(string-constant find-next-menu-item)
-                      edit-menu:edit-target-on-demand
-                      #f)
-        (make-an-item 'edit-menu 'find-previous
-                      '(string-constant find-previous-info)
-                      '(λ (item control) (void))
-                      #\g
-                      '(cons 'shift (get-default-shortcut-prefix))
-                      '(string-constant find-previous-menu-item)
-                      edit-menu:edit-target-on-demand
-                      #f)
-        (make-an-item 'edit-menu 'show/hide-replace
-                      '(string-constant show/hide-replace-info)
-                      '(λ (item control) (void))
-                      #\r
-                      '(cons 'shift (get-default-shortcut-prefix))
-                      '(string-constant show-replace-menu-item)
-                      on-demand-do-nothing
-                      #f)
-        (make-an-item 'edit-menu 'replace
-                      '(string-constant replace-info)
-                      '(λ (item control) (void))
-                      #\f
-                      '(cons 'shift (get-default-shortcut-prefix))
-                      '(string-constant replace-menu-item)
-                      on-demand-do-nothing
-                      #f)
-        (make-an-item 'edit-menu 'replace-all
-                      '(string-constant replace-all-info)
-                      '(λ (item control) (void))
-                      #f
-                      '(get-default-shortcut-prefix)
-                      '(string-constant replace-all-menu-item)
-                      on-demand-do-nothing
-                      #f)
-
-        (make-a-checkable-item 'edit-menu 'find-case-sensitive
-                               '(string-constant find-case-sensitive-info)
-                               '(λ (item control) (void))
-                               #f
-                               '(get-default-shortcut-prefix)
-                               '(string-constant find-case-sensitive-menu-item)
-                               edit-menu:edit-target-on-demand
-                               #f)
-
-        (make-between 'edit-menu 'find 'preferences 'nothing-with-standard-menus)
-        (make-an-item 'edit-menu 'preferences
-                      '(string-constant preferences-info)
-                      '(λ (item control) (preferences:show-dialog) #t)
-                      '(case (system-type)
-                         [(macosx) #\,]
-                         [else #\;])
-                      '(get-default-shortcut-prefix)
-                      '(string-constant preferences-menu-item)
-                      on-demand-do-nothing
-                      '(not (current-eventspace-has-standard-menus?)))
-        (make-after 'edit-menu 'preferences 'nothing)
-
-        (make-before 'help-menu 'about 'nothing)
-        (make-an-item 'help-menu 'about
-                      '(string-constant about-info)
-                      '(λ (item control) (void))
-                      #f
-                      '(get-default-shortcut-prefix)
-                      '(string-constant about-menu-item)
-                      on-demand-do-nothing
-                      #f)
-        (make-after 'help-menu 'about 'nothing)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/text.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/text.rkt
deleted file mode 100644
index 25aa9c4edc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/text.rkt
+++ /dev/null
@@ -1,4604 +0,0 @@
-#lang racket/base
-
-(require string-constants
-         racket/class
-         racket/match
-         racket/path
-         racket/math
-         "sig.rkt"
-         "../gui-utils.rkt"
-         "../preferences.rkt"
-         "autocomplete.rkt"
-         mred/mred-sig
-         mrlib/interactive-value-port
-         racket/list
-         "logging-timer.rkt"
-         "coroutine.rkt"
-         data/queue
-         racket/unit)
-
-(require scribble/xref
-         scribble/manual-struct)
-
-(provide text@)
-(define-unit text@
-(import mred^
-        [prefix icon: framework:icon^]
-        [prefix editor: framework:editor^]
-        [prefix keymap: framework:keymap^]
-        [prefix color-model: framework:color-model^]
-        [prefix frame: framework:frame^]
-        [prefix racket: framework:racket^]
-        [prefix number-snip: framework:number-snip^]
-        [prefix finder: framework:finder^])
-(export (rename framework:text^
-                [-keymap% keymap%]))
-(init-depend framework:editor^)
-
-(define original-output-port (current-output-port))
-(define (oprintf . args) (apply fprintf original-output-port args))
-
-;; rectangles : (or/c #f (listof rectangle))
-;;  #f => range information needs to be computed for this rectangle
-(define-struct range ([start #:mutable] 
-                      [end #:mutable]
-                      caret-space?
-                      style color 
-                      adjust-on-insert/delete?
-                      key
-                      [rectangles #:mutable]) #:inspector #f)
-(define-struct rectangle (left top right bottom style color) #:inspector #f)
-
-(define (build-rectangle left top right bottom style color [info (λ () "")])
-  (unless (or (symbol? right) (symbol? left))
-    (when (right . < . left)
-      (error 'build-rectangle "found right to the right of left: ~s; info ~a"
-             (list left top right bottom style color)
-             (info))))
-  (unless (or (symbol? top) (symbol? bottom))
-    (when (bottom . < . top)
-      (error 'build-rectangle "found bottom above top: ~s; info ~a"
-             (list left top right bottom style color)
-             (info))))
-  (make-rectangle left top right bottom style color))
-  
-
-(define-values (register-port-name! lookup-port-name)
-  ;; port-name->editor-ht: (hashof symbol (weakboxof editor:basic<%>))
-  ;; Maintains a mapping from port names back to their respective editors.
-  (let ([port-name->editor-ht (make-weak-hasheq)])
-    
-    ;; register-port-name-to-editor!: symbol editor<%> -> void
-    ;; Registers the editor's port name.
-    (define (register-port-name! a-port-name an-editor)
-      (hash-set! port-name->editor-ht a-port-name (make-weak-box an-editor)))
-    
-    ;; lookup-port-name: symbol -> (or/c editor:basic<%> #f)
-    ;; Given a port name, tries to get the editor with that name.
-    (define (lookup-port-name a-port-name)
-      (let ([a-weak-box (hash-ref port-name->editor-ht a-port-name #f)])
-        (cond
-          [(not a-weak-box)
-           #f]
-          [else
-           (weak-box-value a-weak-box)])))
-    
-    (values register-port-name! lookup-port-name)))
-
-(define basic<%>
-  (interface (editor:basic<%> (class->interface text%))
-    highlight-range
-    unhighlight-range
-    unhighlight-ranges
-    unhighlight-ranges/key
-    get-highlighted-ranges
-    get-styles-fixed
-    get-fixed-style
-    set-styles-fixed
-    move/copy-to-edit
-    initial-autowrap-bitmap
-    get-port-name
-    port-name-matches?
-    get-start-of-line))
-
-(define highlight-range-mixin
-  (mixin (editor:basic<%> (class->interface text%)) ()
-  
-    (inherit invalidate-bitmap-cache
-             last-position 
-             position-locations
-             position-location
-             position-line 
-             line-start-position
-             line-end-position
-             get-style-list
-             get-admin)
-
-    (define highlight-tmp-color (make-object color% 0 0 0))
-
-    (define ranges-deq (make-queue))
-    
-    (define/public-final (get-highlighted-ranges) 
-      (for/list ([x (in-queue ranges-deq)]) x))
-    
-    (define/private (recompute-range-rectangles)
-      (set! pending-ranges (queue->list ranges-deq))
-      (unless recompute-callback-running?
-        (set! recompute-callback-running? #t)
-        (queue-callback (λ () (run-recompute-range-rectangles)) #f)))
-    
-    (define pending-ranges '())
-    (define recompute-callback-running? #f)
-    
-    (define/private (run-recompute-range-rectangles)
-      (when (get-admin)
-        ;; when there is no admin, then the position-location information
-        ;; is bogus, so we just give up trying to recompute this information
-        
-        (define done-time (+ (current-inexact-milliseconds) 20)) 
-        (define did-something? #f)
-        (let loop ([left #f]
-                   [top #f]
-                   [right #f]
-                   [bottom #f])
-          (cond
-            [(and did-something? ((current-inexact-milliseconds) . >= . done-time))
-             (final-invalidate left top right bottom)
-             (queue-callback
-              (λ () (run-recompute-range-rectangles))
-              #f)]
-            [(null? pending-ranges)
-             (final-invalidate left top right bottom)
-             (set! recompute-callback-running? #f)]
-            [else
-             (set! did-something? #t)
-             (define a-range (car pending-ranges))
-             (set! pending-ranges (cdr pending-ranges))
-             (define old-rectangles (range-rectangles a-range))
-             (cond
-               [old-rectangles
-                (define new-rectangles (compute-rectangles a-range))
-                (cond
-                  [(equal? new-rectangles old-rectangles)
-                   (loop left top right bottom)]
-                  [else
-                   (define-values (new-left new-top new-right new-bottom)
-                     (for/fold ([left left] [top top] [right right] [bottom bottom]) 
-                       ([r (in-list new-rectangles)])
-                       (join-rectangles left top right bottom r)))
-                   (define-values (both-left both-top both-right both-bottom)
-                     (for/fold ([left new-left] [top new-top] [right new-right] [bottom new-bottom]) 
-                       ([r (in-list old-rectangles)])
-                       (join-rectangles left top right bottom r)))
-                   (set-range-rectangles! a-range new-rectangles)
-                   (loop both-left both-top both-right both-bottom)])]
-               [else 
-                ;; when old-rectangles is #f, that means that this
-                ;; range has been removed from the ranges-deq, so 
-                ;; can just skip over it here.
-                (loop left top right bottom)])]))))
-    
-    (define/private (join-rectangles left top right bottom r)
-      (define this-left
-        (if (number? (rectangle-left r))
-            (adjust r (rectangle-left r) -)
-            0.0))
-      (define this-right
-        (if (number? (rectangle-right r))
-            (adjust r (rectangle-right r) +)
-            'display-end))
-      (define this-top (adjust r (rectangle-top r) -))
-      (define this-bottom (adjust r (rectangle-bottom r) +))
-      (if (and left top right bottom)
-          (values (min this-left left)
-                  (min this-top top)
-                  (if (and (number? this-right) (number? right))
-                      (max this-right right)
-                      'display-end)
-                  (max this-bottom bottom))
-          (values this-left 
-                  this-top
-                  this-right
-                  this-bottom)))
-    
-    (define/private (final-invalidate left top right bottom)
-      (when left
-        (let ([width (if (number? right) (- right left) 'display-end)]
-              [height (if (number? bottom) (- bottom top) 'display-end)])
-          (when (and (or (symbol? width) (> width 0))
-                     (or (symbol? height) (> height 0)))
-            (invalidate-bitmap-cache left top width height)))))
-    
-      (define/private (adjust r w f)
-        (+ w (f (case (rectangle-style r)
-                  [(dot hollow-ellipse) 8]
-                  [else 0]))))
-    
-    (define b1 (box 0))
-    (define b2 (box 0))
-    (define b3 (box 0))
-    (define/private (compute-rectangles range)
-      (define start (range-start range))
-      (define end (range-end range))
-      (define caret-space? (range-caret-space? range))
-      (define style (range-style range))
-      (define color (range-color range))
-      (define lp (last-position))
-      (define-values (start-eol? end-eol?) (if (= start end) (values #f #f) (values #f #t)))
-      (define-values (end-x top-end-y bottom-end-y)
-        (begin (position-locations end b1 b2 #f b3 end-eol? #t)
-               (values (unbox b1) 
-                       (unbox b2)
-                       (unbox b3))))
-      (define-values (start-x top-start-y bottom-start-y)
-        (begin 
-          (position-locations start b1 b2 #f b3 start-eol? #t)
-          (values (if (and caret-space? 
-                           (not (= start end))
-                           (<= (+ (unbox b1) 1) end-x))
-                      (+ 1 (unbox b1))
-                      (unbox b1))
-                  (unbox b2)
-                  (unbox b3))))
-      (cond
-        ;; the position-location values can be strange when
-        ;; this condition is true, so we just bail out.
-        [(or (> start lp) (> end lp)) '()]
-        [(= top-start-y top-end-y)
-         (list (build-rectangle start-x
-                                top-start-y
-                                (if (= end-x start-x)
-                                    (+ end-x 1)
-                                    end-x)
-                                bottom-start-y
-                                style
-                                color
-                                (λ () (format "start = ~s end = ~s filename = ~s content = ~s"
-                                              start end 
-                                              (send this get-filename)
-                                              (send this get-text 0 100)))))]
-        [(or (eq? style 'hollow-ellipse)
-             (eq? style 'ellipse))
-         (define end-line (position-line end end-eol?))
-         (let loop ([l (min start-x end-x)]
-                    [r (max start-x end-x)]
-                    [line (position-line start start-eol?)])
-           
-           (cond
-             [(> line end-line) 
-              (list (build-rectangle l top-start-y
-                                     r bottom-end-y
-                                     style color))]
-             [else
-              (define line-start (line-start-position line))
-              (define line-end (line-end-position line))
-              (position-location line-start b1 #f #t)
-              (position-location line-end b2 #f #t)
-              (loop (min (unbox b1) (unbox b2) l)
-                    (max (unbox b1) (unbox b2) r)
-                    (+ line 1))]))]
-        [else
-         (list (build-rectangle start-x top-start-y
-                                'right-edge bottom-start-y
-                                style color)
-               (build-rectangle 'left-edge bottom-start-y
-                                'right-edge top-end-y
-                                style color)
-               (build-rectangle 'left-edge top-end-y
-                                end-x bottom-end-y
-                                style color))]))
-    
-    (define/augment (after-insert insert-start insert-len)
-      (for ([r (in-queue ranges-deq)])
-        (when (range-adjust-on-insert/delete? r)
-          (define rstart (range-start r))
-          (define rend (range-end r))
-          (cond
-            [(<= insert-start rstart) 
-             (set-range-start! r (+ rstart insert-len))
-             (set-range-end! r (+ rend insert-len))]
-            [(<= insert-start rend)
-             (set-range-end! r (+ rend insert-len))])))
-      (inner (void) after-insert insert-start insert-len))
-    (define/augment (after-delete delete-start delete-len)
-      (define delete-end (+ delete-start delete-len))
-      (for ([r (in-queue ranges-deq)])
-        (when (range-adjust-on-insert/delete? r)
-          (define rstart (range-start r))
-          (define rend (range-end r))
-          (cond
-            [(<= delete-end rstart)
-             (set-range-start! r (- rstart delete-len))
-             (set-range-end! r (- rend delete-len))]
-            [(<= delete-start rstart delete-end rend)
-             (define new-len (- rend delete-end))
-             (set-range-start! r delete-start)
-             (set-range-end! r (+ delete-start new-len))]
-            [(<= rstart delete-start delete-end rend)
-             (define new-len (- rend delete-end))
-             (set-range-start! r delete-start)
-             (set-range-end! r (- rend delete-len))]
-            [(<= rstart delete-start rend)
-             (set-range-end! r delete-end)])))
-      (inner (void) after-delete delete-start delete-len))
-   
-    (define/augment (on-reflow)
-      (recompute-range-rectangles)
-      (inner (void) on-reflow))
-    
-    (define/augment (after-load-file success?)
-      (inner (void) after-load-file success?)
-      (when success?
-        (set! ranges-deq (make-queue))))
-        
-    (define/public (highlight-range start end in-color 
-                                    [caret-space? #f]
-                                    [priority 'low]
-                                    [style 'rectangle] 
-                                    #:adjust-on-insert/delete? [adjust-on-insert/delete? #f]
-                                    #:key [key #f])
-      (unless (let ([exact-pos-int?
-                     (λ (x) (and (integer? x) (exact? x) (x . >= . 0)))])
-                (and (exact-pos-int? start)
-                     (exact-pos-int? end)))
-        (error 'highlight-range
-               "expected first two arguments to be non-negative exact integers, got: ~e ~e"
-               start
-               end))
-      (unless (<= start end)
-        (error 'highlight-range
-               "expected start to be less than end, got ~e ~e" start end))
-      (unless (or (eq? priority 'high) (eq? priority 'low))
-        (error 'highlight-range
-               "expected priority argument to be either 'high or 'low, got: ~e"
-               priority))
-      (unless (or (is-a? in-color color%)
-                  (and (string? in-color)
-                       (send the-color-database find-color in-color)))
-        (error 'highlight-range
-               "expected a color or a string in the-color-database for the third argument, got ~e" 
-               in-color))
-      (unless (memq style '(rectangle hollow-ellipse ellipse dot))
-        (error 'highlight-range
-               "expected one of 'rectangle, 'ellipse 'hollow-ellipse, or 'dot as the style, got ~e"
-               style))
-      (when (eq? style 'dot)
-        (unless (= start end)
-          (error 'highlight-range
-                 "when the style is 'dot, the start and end regions must be the same")))
-      
-      (define color (if (is-a? in-color color%)
-                        in-color
-                        (send the-color-database find-color in-color)))
-      (define l (make-range start end caret-space? style color adjust-on-insert/delete? key #f))
-      (if (eq? priority 'high)
-          (enqueue! ranges-deq l)
-          (enqueue-front! ranges-deq l))
-      (set-range-rectangles! l (compute-rectangles l))
-      (invalidate-rectangles (range-rectangles l))
-      (unless adjust-on-insert/delete?
-        (λ () 
-          (unhighlight-range start end color caret-space? style))))
-        
-    (define/public (unhighlight-range start end in-color [caret-space? #f] [style 'rectangle])
-      (define color (if (is-a? in-color color%)
-                        in-color
-                        (send the-color-database find-color in-color)))
-      (unhighlight-ranges
-       (λ (r-start r-end r-color r-caret-space? r-style r-adjust-on-insert/delete? r-key)
-         (and (equal? start r-start)
-              (equal? end r-end)
-              (equal? color r-color)
-              (equal? caret-space? r-caret-space?)
-              (equal? style r-style)))
-       #t))
-    
-    (define/public (unhighlight-ranges/key key)
-      (unhighlight-ranges
-       (λ (r-start r-end r-color r-caret-space? r-style r-adjust-on-insert/delete? r-key)
-         (equal? r-key key))))
-    
-    (define/public (unhighlight-ranges pred [just-one? #f])
-      (define left #f)
-      (define top #f)
-      (define right #f)
-      (define bottom #f)
-      (define found-one? #f)
-      (queue-filter! 
-       ranges-deq
-       (λ (a-range)
-         (cond
-           [(and just-one? found-one?) #t]
-           [(pred (range-start a-range)
-                  (range-end a-range)
-                  (range-color a-range)
-                  (range-caret-space? a-range)
-                  (range-style a-range)
-                  (range-adjust-on-insert/delete? a-range)
-                  (range-key a-range))
-            (set! found-one? #t)
-            (for ([rect (in-list (range-rectangles a-range))])
-              (set!-values (left top right bottom)
-                (join-rectangles left top right bottom rect)))
-            (set-range-rectangles! a-range #f)
-            #f]
-           [else
-            #t])))
-      (final-invalidate left top right bottom))
-    
-    (define/private (invalidate-rectangles rectangles)
-      (let loop ([left #f]
-                 [top #f]
-                 [right #f]
-                 [bottom #f]
-                 [rectangles rectangles])
-        (cond
-          [(null? rectangles)
-           (final-invalidate left top right bottom)]
-          [else
-           (define-values (new-left new-top new-right new-bottom)
-             (join-rectangles left top right bottom (car rectangles)))
-           (loop new-left new-top new-right new-bottom
-                 (cdr rectangles))])))
-    
-    (define/override (on-paint before dc left-margin top-margin right-margin bottom-margin
-                               dx dy draw-caret)
-      (super on-paint before dc left-margin top-margin right-margin bottom-margin dx dy draw-caret)
-      (when before
-        (define-values (view-x view-y view-width view-height)
-          (let ([admin (get-admin)])
-            (if admin
-                (let ([b1 (box 0)]
-                      [b2 (box 0)]
-                      [b3 (box 0)]
-                      [b4 (box 0)])
-                  (send admin get-view b1 b2 b3 b4)
-                  (values (unbox b1)
-                          (unbox b2)
-                          (unbox b3)
-                          (unbox b4)))
-                (values left-margin top-margin right-margin bottom-margin))))
-        (define old-pen (send dc get-pen))
-        (define old-brush (send dc get-brush))
-        (define old-smoothing (send dc get-smoothing))
-        (define last-color #f)
-        (send dc set-smoothing 'aligned)
-        (for ([range (in-queue ranges-deq)])
-          (for ([rectangle (in-list (range-rectangles range))])
-            (define left (if (number? (rectangle-left rectangle))
-                             (rectangle-left rectangle)
-                             view-x))
-            (define top (rectangle-top rectangle))
-            (define right (if (number? (rectangle-right rectangle))
-                              (rectangle-right rectangle)
-                              (+ view-x view-width)))
-            (define bottom (rectangle-bottom rectangle))
-            (when (and (or (<= left-margin left right-margin)
-                           (<= left-margin right right-margin)
-                           (<= left left-margin right-margin right))
-                       (or (<= top-margin top bottom-margin)
-                           (<= top-margin bottom bottom-margin)
-                           (<= top top-margin bottom-margin bottom)))
-              (define width (if (right . <= . left) 0 (- right left)))
-              (define height (if (bottom . <= . top) 0 (- bottom top)))
-              (define color (let ([rc (rectangle-color rectangle)])
-                              (cond
-                                [(not (= 1 (send rc alpha))) rc]
-                                [(and last-color (eq? last-color rc))
-                                 rc]
-                                [rc
-                                 (set! last-color #f)
-                                 (send dc try-color rc highlight-tmp-color)
-                                 (if (<= (color-model:rgb-color-distance
-                                          (send rc red)
-                                          (send rc green)
-                                          (send rc blue)
-                                          (send highlight-tmp-color red)
-                                          (send highlight-tmp-color green)
-                                          (send highlight-tmp-color blue))
-                                         18)
-                                     (begin (set! last-color rc)
-                                            rc)
-                                     #f)]
-                                [else 
-                                 (set! last-color #f)
-                                 rc])))
-              (when color
-                (case (rectangle-style rectangle)
-                  [(dot)
-                   (let ([cx left]
-                         [cy bottom])
-                     (send dc set-pen "black" 1 'transparent)
-                     (send dc set-brush color 'solid)
-                     (send dc draw-ellipse (+ dx cx -3) (+ dy cy -3) 6 6))]
-                  [(hollow-ellipse)
-                   (send dc set-pen color 3 'solid)
-                   (send dc set-brush "black" 'transparent)
-                   (send dc draw-ellipse 
-                         (+ dx left -4)
-                         (+ dy top -4)
-                         (+ width 8)
-                         (+ height 8))]
-                  [(rectangle)
-                   (send dc set-pen color 1 'transparent)
-                   (send dc set-brush color 'solid)
-                   (send dc draw-rectangle (+ left dx) (+ top dy) width height)]
-                  [(ellipse)
-                   (send dc set-pen color 1 'transparent)
-                   (send dc set-brush color 'solid)
-                   (send dc draw-ellipse (+ left dx) (+ top dy) width height)])))))
-            (send dc set-smoothing old-smoothing)
-            (send dc set-pen old-pen)
-            (send dc set-brush old-brush)))
-    
-    (super-new)))
-  
-(define other-basics-mixin
-  (mixin (editor:basic<%> (class->interface text%)) ()
-    (inherit get-canvas split-snip get-snip-position
-             begin-edit-sequence end-edit-sequence
-             set-autowrap-bitmap
-             delete find-snip 
-             get-style-list change-style
-             position-line line-start-position
-             get-filename)
-    
-    (define/public (get-fixed-style)
-      (send (get-style-list) find-named-style "Standard"))
-
-    (define port-name-identifier #f)
-    (define/public (get-port-name)
-      (let* ([b (box #f)]
-             [n (get-filename b)])
-        (cond
-          [(or (unbox b) (not n))
-           (unless port-name-identifier
-             (set! port-name-identifier (gensym 'unsaved-editor))
-             (register-port-name! port-name-identifier this))
-           port-name-identifier]
-          [else n])))
-    (define/public (port-name-matches? id)
-      (let ([filename (get-filename)])
-        (or (and (path? id)
-                 (path? filename)
-                 (or (equal? id filename) ;; "fast path" check
-                     (equal? (normal-case-path (normalize-path (get-filename)))
-                             (normal-case-path (normalize-path id)))))
-            (and (symbol? port-name-identifier)
-                 (symbol? id)
-                 (equal? port-name-identifier id)))))
-    
-    
-    (define styles-fixed? #f)
-    (public get-styles-fixed set-styles-fixed)
-    (define (get-styles-fixed) styles-fixed?)
-    (define (set-styles-fixed b) (set! styles-fixed? b))
-    
-    (define edition 0)
-    (define/public (get-edition-number) edition)
-    
-    (define/augment (on-insert start len)
-      (begin-edit-sequence #t #f)
-      (inner (void) on-insert start len))
-    (define/augment (after-insert start len)
-      (set! edition (+ edition 1))
-      (when styles-fixed?
-        (change-style (get-fixed-style) start (+ start len) #f))
-      (inner (void) after-insert start len)
-      (end-edit-sequence))
-   (define/augment (after-delete start len)
-     (set! edition (+ edition 1))
-     (inner (void) after-delete start len))
-    
-    (define/public (move/copy-to-edit dest-edit start end dest-position
-                                      #:try-to-move? [try-to-move? #t])
-      (split-snip start)
-      (split-snip end)
-      (let loop ([snip (find-snip end 'before)])
-        (cond
-          [(or (not snip) (< (get-snip-position snip) start))
-           (void)]
-          [else
-           (let ([prev (send snip previous)]
-                 [released/copied 
-                  (if try-to-move?
-                      (if (send snip release-from-owner)
-                          snip
-                          (let* ([copy (send snip copy)]
-                                 [snip-start (get-snip-position snip)]
-                                 [snip-end (+ snip-start (send snip get-count))])
-                            (delete snip-start snip-end)
-                            snip))
-                      (send snip copy))])
-             (send dest-edit insert released/copied dest-position dest-position)
-             (loop prev))])))
-    
-    (public initial-autowrap-bitmap)
-    (define (initial-autowrap-bitmap) (icon:get-autowrap-bitmap))
-    
-    (define/override (put-file directory default-name)
-      (let* ([canvas (get-canvas)]
-             [parent (and canvas (send canvas get-top-level-window))])
-        (finder:put-file default-name
-                         directory
-                         #f
-                         (string-constant select-file)
-                         #f
-                         ""
-                         parent)))
-    
-    (define/public (get-start-of-line pos)
-      (line-start-position (position-line pos)))
-    
-    (super-new)
-    (set-autowrap-bitmap (initial-autowrap-bitmap))))
-
-(define (basic-mixin %)
-  (class* (highlight-range-mixin (other-basics-mixin %)) (basic<%>)
-    (super-new)))
-
-(define line-spacing<%> (interface ()))
-
-(define line-spacing-mixin
-  (mixin (basic<%>) (line-spacing<%>)
-    (super-new)
-    (inherit set-line-spacing)
-    ;; this is a field so that the weakly
-    ;; held callback works out properly
-    (define (pref-cb-func sym val)
-      (set-line-spacing (if val 1 0)))
-    (preferences:add-callback 'framework:line-spacing-add-gap?
-                              pref-cb-func
-                              #t)
-    (set-line-spacing (if (preferences:get 'framework:line-spacing-add-gap?)
-                          1
-                          0))))
-
-(define first-line<%>
-  (interface ()
-    highlight-first-line
-    get-first-line-height
-    first-line-currently-drawn-specially?
-    is-special-first-line?))
-
-(define dark-first-line-color (make-object color% 50 0 50))
-(define dark-wob-first-line-color (make-object color% 255 200 255))
-
-(define first-line-mixin
-  (mixin ((class->interface text%)) (first-line<%>)
-    (inherit get-text paragraph-end-position get-admin invalidate-bitmap-cache position-location
-             scroll-to local-to-global get-dc get-padding)
-    (define bx (box 0))
-    (define by (box 0))
-    (define bw (box 0))
-    
-    (define fancy-first-line? #f)
-    
-    (define first-line "")
-    (define end-of-first-line 0)
-    (define first-line-is-lang? #f)
-
-    (define/public-final (highlight-first-line on?)
-      (unless (equal? fancy-first-line? on?)
-        (set! fancy-first-line? on?)
-        (invalidate-bitmap-cache)
-        (let ([canvas (send this get-canvas)])
-          (when canvas
-            (send canvas refresh)))))
-    
-    (define/public-final (get-first-line-height)
-      (let-values ([(_1 h _2 _3) (send (get-dc) get-text-extent first-line (get-font))])
-        h))
-    
-    (define/public-final (first-line-currently-drawn-specially?)
-      (and (show-first-line?)
-           (let ([admin (get-admin)])
-             (and admin
-                  (begin
-                    (send admin get-view #f by #f #f #f)
-                    (not (= (unbox by) 0)))))))
-           
-    (define/public (is-special-first-line? l) #f)
-    
-    (define/private (show-first-line?)
-      (and fancy-first-line? first-line-is-lang?))
-    
-    (define/private (update-first-line)
-      (set! end-of-first-line (paragraph-end-position 0))
-      (set! first-line (get-text 0 end-of-first-line))
-      (set! first-line-is-lang? (is-special-first-line? first-line)))
-    
-    (define/augment (after-insert start len)
-      (when (<= start end-of-first-line)
-        (update-first-line))
-      (inner (void) after-insert start len))
-    (define/augment (after-delete start len)
-      (when (<= start end-of-first-line)
-        (update-first-line))
-      (inner (void) after-delete start len))
-    
-    (define/override (scroll-editor-to localx localy width height refresh? bias)
-      (let ([admin (get-admin)])
-        (cond
-          [(not admin)
-           #f]
-          [(show-first-line?)
-           (let ([h (get-first-line-height)])
-             (set-box! by localy)
-             (local-to-global #f by)
-             (cond
-               [(<= (unbox by) h)
-                ;; the max is relevant when we're already scrolled to the top.
-                (super scroll-editor-to localx (max 0 (- localy h)) width height refresh? bias)]
-               [else
-                (super scroll-editor-to localx localy width height refresh? bias)]))]
-          [else
-           (super scroll-editor-to localx localy width height refresh? bias)])))
-    
-    (define/override (on-event event)
-      (cond
-        [(or (send event moving?)
-             (send event leaving?)
-             (send event entering?))
-         (super on-event event)]
-        [else
-         (let ([y (send event get-y)]
-               [h (get-first-line-height)]
-               [admin (get-admin)])
-           (unless admin (send admin get-view #f by #f #f #f))
-           (cond
-             [(and admin
-                   (< y h)
-                   (not (= (unbox by) 0)))
-              (send admin scroll-to (send event get-x) 0 0 0 #t)
-              (super on-event event)]
-             [else         
-              (super on-event event)]))]))
-    
-    (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-      (unless before?
-        (when (show-first-line?) 
-          (define admin (get-admin))
-          (when admin
-            (send admin get-view bx by bw #f #f)
-            (unless (= (unbox by) 0)
-              (define draw-first-line-number?
-                (and (is-a? this line-numbers<%>)
-                     (send this showing-line-numbers?)))
-              (define first-line (get-text 0 (paragraph-end-position 0)))
-              (define old-pen (send dc get-pen))
-              (define old-brush (send dc get-brush))
-              (define old-smoothing (send dc get-smoothing))
-              (define old-α (send dc get-alpha))
-              (define old-font (send dc get-font))
-              (define old-text-foreground (send dc get-text-foreground))
-              (define w-o-b? (preferences:get 'framework:white-on-black?))
-              (send dc set-font (get-font))
-              (send dc set-smoothing 'aligned)
-              (define-values (tw th _1 _2) (send dc get-text-extent first-line))
-              (define line-height (+ (unbox by) dy th 1))
-              (define line-left (+ (unbox bx) dx))
-              (define line-right (+ (unbox bx) dx (unbox bw)))
-              
-              (if w-o-b?
-                  (send dc set-pen "white" 1 'solid)
-                  (send dc set-pen "black" 1 'solid))
-              (send dc draw-line line-left line-height line-right line-height)
-              
-              (when (eq? (send dc get-smoothing) 'aligned)
-                (define start (if w-o-b? 6/10 3/10))
-                (define end 0)
-                (define steps 10)
-                (send dc set-pen 
-                      (if w-o-b? dark-wob-first-line-color dark-first-line-color) 
-                      1
-                      'solid)
-                (let loop ([i steps])
-                  (unless (zero? i)
-                    (define alpha-value (+ start (* (- end start) (/ i steps))))
-                    (send dc set-alpha alpha-value)
-                    (send dc draw-line 
-                          line-left
-                          (+ line-height i)
-                          line-right
-                          (+ line-height i))
-                    (loop (- i 1)))))
-              
-              (send dc set-alpha 1)
-              (send dc set-pen "gray" 1 'transparent)
-              (send dc set-brush (if w-o-b? "black" "white") 'solid)
-              (send dc draw-rectangle (+ (unbox bx) dx) (+ (unbox by) dy) (unbox bw) th)
-              (send dc set-text-foreground
-                    (send the-color-database find-color
-                          (if w-o-b? "white" "black")))
-              (define x-start
-                (cond
-                  [draw-first-line-number?
-                   (send this do-draw-single-line dc dx dy 0 (unbox by) #f #f)
-                   (send dc set-pen (if w-o-b? "white" "black") 1 'solid)
-                   (send this draw-separator dc (unbox by) (+ (unbox by) line-height) dx dy)
-                   (define-values (padding-left _1 _2 _3) (get-padding))
-                   padding-left]
-                  [else 0]))
-              (send dc draw-text first-line (+ x-start (+ (unbox bx) dx)) (+ (unbox by) dy))
-              
-              (send dc set-text-foreground old-text-foreground)
-              (send dc set-font old-font)
-              (send dc set-pen old-pen)
-              (send dc set-brush old-brush)
-              (send dc set-alpha old-α)
-              (send dc set-smoothing old-smoothing)))))
-      (super on-paint before? dc left top right bottom dx dy draw-caret))
-    
-    (inherit get-style-list)
-    (define/private (get-font)
-      (define style-list (get-style-list))
-      (define std (or (send style-list find-named-style "Standard")
-                      (send style-list basic-style)))
-      (send std get-font))
-    
-    (super-new)))
-
-
-(define foreground-color<%>
-  (interface (basic<%> editor:standard-style-list<%>)
-    ))
-
-(define foreground-color-mixin
-  (mixin (basic<%> editor:standard-style-list<%>) (foreground-color<%>)
-    (inherit begin-edit-sequence end-edit-sequence change-style get-style-list)
-    
-    (define/override (default-style-name)
-      (editor:get-default-color-style-name))
-    
-    (define/override (get-fixed-style)
-      (send (editor:get-standard-style-list)
-            find-named-style
-            (editor:get-default-color-style-name)))
-    (super-new)))
-
-(define hide-caret/selection<%> (interface (basic<%>)))
-(define hide-caret/selection-mixin
-  (mixin (basic<%>) (hide-caret/selection<%>)
-    (inherit get-start-position get-end-position hide-caret)
-    (define/augment (after-set-position)
-      (hide-caret (= (get-start-position) (get-end-position)))
-      (inner (void) after-set-position))
-    (super-new)))
-
-(define nbsp->space<%> (interface ((class->interface text%))))
-(define nbsp->space-mixin
-  (mixin ((class->interface text%)) (nbsp->space<%>)
-    (field [rewriting #f])
-    (inherit begin-edit-sequence end-edit-sequence delete insert get-character)
-    (define/augment (on-insert start len)
-      (inner (void) on-insert start len)
-      (begin-edit-sequence #t #f))
-    (inherit find-string)
-    (define/augment (after-insert start len)
-      (unless rewriting
-        (set! rewriting #t)
-        (let ([str (string (integer->char 160))]
-              [last-pos (+ start len)])
-          (let loop ([pos start])
-            (when (< pos last-pos)
-              (let ([next-pos (find-string str 'forward pos last-pos)])
-                (when next-pos
-                  (delete next-pos (+ next-pos 1) #f)
-                  (insert " " next-pos next-pos #f)
-                  (loop (+ next-pos 1)))))))
-        (set! rewriting #f))
-      (end-edit-sequence)
-      (inner (void) after-insert start len))
-    (super-new)))
-
-(define column-guide<%> (interface ((class->interface text%))))
-(define column-guide-mixin-pen-size 2)
-(define column-guide-mixin 
-  (mixin ((class->interface text%)) (column-guide<%>)
-    (inherit get-style-list invalidate-bitmap-cache get-dc
-             begin-edit-sequence end-edit-sequence
-             get-extent get-padding)
-    (define char-width #f)
-    (define pen #f)
-    ;; these two functions are defined as private fields
-    ;; because they are weakly held callbacks
-    (define (bw-cb p v)
-      (set! pen 
-            (send the-pen-list find-or-create-pen
-                  (if v
-                      (make-object color% 225 225 51)
-                      (make-object color% 204 204 51))
-                  (* column-guide-mixin-pen-size 2)
-                  'solid)))
-    (define (cw-cb p v)
-      (define new-cw (and (car v) (cadr v)))
-      (unless (equal? new-cw char-width)
-        (define (inv cw)
-          (define x-pos (get-x-spot cw))
-          (when x-pos
-            (invalidate-bitmap-cache 
-             (- x-pos (send pen get-width))
-             0
-             (+ x-pos (send pen get-width))
-             'end)))
-        (define old-char-w char-width)
-        (set! char-width new-cw)
-        (begin-edit-sequence #t #f)
-        (inv old-char-w)
-        (inv char-width)
-        (end-edit-sequence)))
-      
-    (super-new)
-    
-    (preferences:add-callback 'framework:white-on-black? bw-cb #t)
-    (bw-cb 'ignored-arg (preferences:get 'framework:white-on-black?))
-    
-    (preferences:add-callback 'framework:column-guide-width cw-cb #t)
-    (cw-cb 'ignored-arg (preferences:get 'framework:column-guide-width))
-    
-    (define aw (box 0.0))
-    (define ah (box 0.0))
-    (define old-draw-the-line? #f)
-    (define left-padding 0)
-    
-    (define/augment (on-change)
-      (inner (void) on-change)
-      (define old-aw (unbox aw))
-      (define old-ah (unbox ah))
-      (get-extent aw ah)
-      (define new-draw-the-line? (draw-the-line?))
-      (define-values (left top right bottom) (get-padding))
-      (unless (and (= old-aw (unbox aw)) 
-                   (= old-ah (unbox ah))
-                   (= left left-padding)
-                   (equal? new-draw-the-line? old-draw-the-line?))
-        (set! old-draw-the-line? new-draw-the-line?)
-        (set! left-padding left)
-        (invalidate-bitmap-cache 0.0 0.0 'display-end 'display-end)))
-    
-    ;; pre: aw initialized to current value
-    (define/private (draw-the-line?)
-      (define x-pos (get-x-spot char-width))
-      (and x-pos
-           (< x-pos (- (unbox aw) 3))))
-    
-    (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-      (super on-paint before? dc left top right bottom dx dy draw-caret)
-      (when char-width
-        (when before?
-          (define x-pos (get-x-spot char-width))
-          (when x-pos
-            (define old-pen (send dc get-pen))
-            (send dc set-pen pen)
-            (when (draw-the-line?)
-              (send dc draw-line
-                    (+ dx x-pos)
-                    (+ dy top column-guide-mixin-pen-size)
-                    (+ dx x-pos)
-                    (+ dy (min (unbox ah) bottom) (- column-guide-mixin-pen-size))))
-            (send dc set-pen old-pen)))))
-
-    (define/private (get-x-spot char-width)
-      (let/ec return
-        (unless char-width (return #f))
-        (define dc (get-dc))
-        (unless dc (return #f))
-        (define style (or (send (get-style-list) find-named-style "Standard")
-                          (send (get-style-list) find-named-style "Basic")))
-        (unless style (return #f))
-        (define fnt (send style get-font))
-        (define-values (xw _1 _2 _3) (send dc get-text-extent "x" fnt))
-        (+ left-padding (* xw char-width))))))
-
-(define normalize-paste<%> (interface ((class->interface text%))
-                             ask-normalize?
-                             string-normalize))
-(define normalize-paste-mixin
-  (mixin (basic<%>) (normalize-paste<%>)
-    (inherit begin-edit-sequence end-edit-sequence
-             delete insert split-snip find-snip
-             get-snip-position get-top-level-window find-string)
-    
-    ;; pasting-info : (or/c #f (listof (list number number)))
-    ;; when #f, we are not in a paste
-    ;; when a list, we are in a paste and the 
-    ;;   list contains the regions that have
-    ;;   been changed by the paste
-    (define paste-info #f)
-
-    (define/public (ask-normalize?)
-      (cond
-        [(preferences:get 'framework:ask-about-paste-normalization)
-         (let-values ([(mbr checked?)
-                       (message+check-box/custom
-                        (string-constant drscheme)
-                        (string-constant normalize-string-info)
-                        (string-constant dont-ask-again)
-                        (string-constant normalize)
-                        (string-constant leave-alone)
-                        #f
-                        (get-top-level-window)
-                        (cons (if (preferences:get 'framework:do-paste-normalization)
-                                  'default=1
-                                  'default=2)
-                              '(caution))
-                        2)])
-           (let ([normalize? (not (equal? 2 mbr))])
-             (preferences:set 'framework:ask-about-paste-normalization (not checked?))
-             (preferences:set 'framework:do-paste-normalization normalize?)
-             normalize?))]
-        [else
-         (preferences:get 'framework:do-paste-normalization)]))
-    (define/public (string-normalize s) 
-      (regexp-replace* 
-       #rx"\u200b" 
-       (regexp-replace*
-        #rx"\u2212" 
-        (string-normalize-nfkc s)
-        "-")
-       ""))
-    
-    (define/override (do-paste start time)
-      (dynamic-wind
-       (λ () (set! paste-info '()))
-       (λ () (super do-paste start time)
-         (let ([local-paste-info paste-info])
-           (set! paste-info #f)
-           (deal-with-paste local-paste-info)))
-       ;; use the dynamic wind to be sure that the paste-info is set back to #f
-       ;; in the case that the middle thunk raises an exception
-       (λ () (set! paste-info #f))))
-    
-    (define/augment (after-insert start len)
-      (when paste-info
-        (set! paste-info (cons (list start len) paste-info)))
-      (inner (void) after-insert start len))
-
-    (define/private (deal-with-paste local-paste-info)
-      (let/ec abort
-        (define ask? #t)
-        (for ([insertion (in-list local-paste-info)])
-          (define start (list-ref insertion 0))
-          (define len (list-ref insertion 1))
-          (split-snip start)
-          (split-snip (+ start len))
-          (let loop ([snip (find-snip start 'after-or-none)])
-            (when snip
-              (let ([pos (get-snip-position snip)])
-                (when (< pos (+ start len))
-                  (when (is-a? snip string-snip%)
-                    (let* ([old (send snip get-text 0 (send snip get-count))]
-                           [new (string-normalize old)])
-                      (unless (equal? new old)
-                        (when ask?
-                          (set! ask? #f)
-                          (unless (ask-normalize?) (abort)))
-                        (let ([snip-pos (get-snip-position snip)])
-                          (delete snip-pos (+ snip-pos (string-length old)))
-                          (insert new snip-pos snip-pos #f)))))
-                  (loop (send snip next)))))))))
-    
-    (super-new)))
-
-(define searching<%> 
-  (interface (editor:keymap<%> basic<%>)
-    set-replace-start
-    get-replace-search-hit
-    set-searching-state
-    set-search-anchor
-    get-search-bubbles
-    get-search-hit-count))
-
-(define normal-search-color (send the-color-database find-color "plum"))
-(define dark-search-color (send the-color-database find-color "mediumorchid"))
-(define light-search-color 
-  (let ([f (λ (x) (+ x (floor (* (- 255 x) 2/3))))])
-    (make-object color% 
-      (f (send normal-search-color red))
-      (f (send normal-search-color green))
-      (f (send normal-search-color blue)))))
-(define white-on-black-yellow-bubble-color (make-object color% 50 50 5))
-
-(define searching-mixin
-  (mixin (editor:basic<%> editor:keymap<%> basic<%>) (searching<%>)
-    (inherit invalidate-bitmap-cache
-             get-start-position get-end-position
-             unhighlight-ranges/key unhighlight-range highlight-range
-             run-after-edit-sequence begin-edit-sequence end-edit-sequence
-             find-string get-admin position-line
-             in-edit-sequence? get-pos/text-dc-location
-             get-canvas get-top-level-window)
-    
-    (define has-focus? #f)
-    (define clear-yellow void)
-    (define searching-str #f)
-    (define case-sensitive? #f)
-    (define search-hit-count 0)
-    (define before-caret-search-hit-count 0)
-    (define search-coroutine #f)
-    
-    (define update-replace-bubble-callback-running? #f)
-    (define search-position-callback-running? #f)
-      
-    (define anchor-pos #f)
-    
-    ;; replace-mode? : boolean?
-    ;; #t if the replace portion of the GUI is visible
-    ;; (and thus we have light/dark bubbles)
-    (define replace-mode? #f)
-    
-    ;; to-replace-highlight : (or/c #f (cons/c number number))
-    ;; the location where the next replacement will happen, or #f
-    ;; if there isn't one (in case the insertion point is past
-    ;; the last search hit, or replace-mode? is #f)
-    ;; invariant: to-replace-highlight is not mapped in search-bubble-table
-    ;;            (even though it is a legtimate hit)
-    (define to-replace-highlight #f)
-    
-    ;; search-bubble-table : hash-table[(cons number number) -o> #t]
-    (define search-bubble-table (make-hash))
-    
-    ;; get-replace-search-hit : -> (or/c number #f)
-    ;; returns the nearest search hit after `replace-start'
-    (define/public (get-replace-search-hit) 
-      (and searching-str
-           to-replace-highlight
-           (car to-replace-highlight)))
-
-    ;; NEW METHOD: used for test suites
-    (define/public (search-updates-pending?) 
-      (or update-replace-bubble-callback-running?
-          search-position-callback-running?
-          search-coroutine))
-    
-    (define/public (set-replace-start n) (void))
-    
-    (define/public (get-anchor-pos) anchor-pos)
-
-    (define/public (set-search-anchor position)
-      (begin-edit-sequence #t #f)
-      (when anchor-pos (unhighlight-anchor))
-      (cond
-        [(and position
-              (preferences:get 'framework:anchored-search))
-         (set! anchor-pos position)
-         (highlight-anchor)]
-        [else
-         (set! anchor-pos #f)])
-      (end-edit-sequence))
-    
-    (define/public (get-search-hit-count) (values before-caret-search-hit-count search-hit-count))
-    
-    (define/public (set-searching-state s in-cs? in-r? [notify-frame? #f])
-      (define r? (and in-r? #t))
-      (define cs? (and in-cs? #t))
-      (unless (and (equal? searching-str s)
-                   (equal? case-sensitive? cs?)
-                   (equal? r? replace-mode?))
-        (set! searching-str s)
-        (set! case-sensitive? cs?)
-        (set! replace-mode? r?)
-        (redo-search notify-frame?)))
-    
-    (define/override (get-keymaps)
-      (editor:add-after-user-keymap (keymap:get-search) (super get-keymaps)))
-    
-    (define/augment (after-insert start len)
-      (when searching-str
-        (redo-search #t))
-      (inner (void) after-insert start len))
-    (define/augment (after-delete start len)
-      (when searching-str
-        (redo-search #t))
-      (inner (void) after-delete start len))
-    
-    (define/override (on-focus on?)
-      (let ([f (get-top-level-window)])
-        (when (is-a? f frame:searchable<%>)
-          (set! has-focus? on?)
-          (cond
-            [on?
-             ;; this triggers a call to update-yellow
-             (send f set-text-to-search this)]
-            [else
-             (update-yellow)])))
-      (super on-focus on?))
-    
-    (define/augment (after-set-position)
-      (update-yellow)
-      (maybe-queue-update-replace-bubble)
-      (maybe-queue-search-position-update)
-      (inner (void) after-set-position))
-    
-    (define/private (maybe-queue-update-replace-bubble)
-      (unless update-replace-bubble-callback-running?
-        (set! update-replace-bubble-callback-running? #t)
-        (queue-callback
-         (λ () 
-           (set! update-replace-bubble-callback-running? #f)
-           (unless search-coroutine
-             ;; the search co-routine will update
-             ;; the replace bubble to its proper color
-             ;; before it finishes so we can just let
-             ;; do this job
-             
-             
-             (define (replace-highlight->normal-hit)
-               (when to-replace-highlight
-                 (let ([old-to-replace-highlight to-replace-highlight])
-                   (unhighlight-replace)
-                   (highlight-hit old-to-replace-highlight))))
-             
-             (cond
-               [(or (not searching-str)
-                    (not replace-mode?))
-                (when to-replace-highlight
-                  (unhighlight-replace))]
-               [else
-                (define next (do-search (get-start-position) 'eof))
-                (begin-edit-sequence #t #f)
-                (cond
-                  [next
-                   (unless (and to-replace-highlight
-                                (= (car to-replace-highlight) next)
-                                (= (cdr to-replace-highlight) 
-                                   (+ next (string-length searching-str))))
-                     (replace-highlight->normal-hit)
-                     (define pr (cons next (+ next (string-length searching-str))))
-                     (unhighlight-hit pr)
-                     (highlight-replace pr))]
-                  [else
-                   (replace-highlight->normal-hit)])
-                (end-edit-sequence)])))
-         #f)))
-    
-    ;; maybe-queue-editor-position-update : -> void
-    ;; updates the editor-position in the frame,
-    ;; but delays it until the next low-priority event occurs.
-    (define/private (maybe-queue-search-position-update)
-      (unless search-position-callback-running?
-        (set! search-position-callback-running? #t)
-        (queue-callback
-         (λ ()
-           (when searching-str
-             (define count 0)
-             (define start-pos (get-start-position))
-             (hash-for-each
-              search-bubble-table
-              (λ (k v)
-                (when (<= (car k) start-pos)
-                  (set! count (+ count 1)))))
-             (update-before-caret-search-hit-count count))
-           (set! search-position-callback-running? #f))
-         #f)))
-    
-    (define/private (update-before-caret-search-hit-count c)
-      (unless (equal? before-caret-search-hit-count c)
-        (set! before-caret-search-hit-count c)
-        (let ([tlw (get-top-level-window)])
-          (when (is-a? tlw frame:searchable<%>)
-            (send tlw search-hits-changed)))))
-    
-    (define/private (update-yellow)
-      (cond
-        [has-focus?
-         (unless (eq? clear-yellow void)
-           (clear-yellow)
-           (set! clear-yellow void))]
-        [searching-str
-         (let ([start (get-start-position)]
-               [end (get-end-position)])
-           (cond
-             [(= start end)
-              (clear-yellow)
-              (set! clear-yellow void)]
-             [else
-              (begin-edit-sequence #t #f)
-              (clear-yellow)
-              (set! clear-yellow void)
-              (when (and searching-str (= (string-length searching-str) (- end start)))
-                (when (do-search start end)
-                  (set! clear-yellow (highlight-range
-                                      start end
-                                      (if (preferences:get 'framework:white-on-black?)
-                                          white-on-black-yellow-bubble-color
-                                          "khaki")
-                                      #f 'low 'ellipse))))
-              (end-edit-sequence)]))]
-        [else
-         (clear-yellow)
-         (set! clear-yellow void)]))
-
-    (define/public (get-search-bubbles)
-      (sort 
-       (append
-        (if to-replace-highlight
-            (list (list to-replace-highlight 'dark-search-color))
-            (list))
-        (hash-map search-bubble-table
-                  (λ (x true) 
-                    (list x (if replace-mode? 'light-search-color 'normal-search-color)))))
-       string<?
-       #:key (λ (x) (format "~s" (car x)))))
-    
-    
-    (define/private (redo-search notify-frame?)
-      (define old-search-coroutine search-coroutine)
-      (set! search-coroutine (create-search-coroutine notify-frame?))
-      (unless old-search-coroutine 
-        ;; when old-search-coroutine is not #f, then
-        ;; we know that there is already a callback
-        ;; pending; the set! above just change what 
-        ;; it will be doing.
-        (queue-callback (λ () (run-search)) #f)))
-    
-    (define/private (run-search)
-      (define done? (coroutine-run search-coroutine (void)))
-      (cond
-        [done?
-         (set! search-coroutine #f)]
-        [else
-         (queue-callback
-          (λ () (run-search))
-          #f)]))
-    
-    (define/private (create-search-coroutine notify-frame?)
-      (coroutine
-       pause
-       first-val
-       (define start-time (current-inexact-milliseconds))
-       (define did-something? #f)
-       (define (maybe-pause)
-         (cond
-           [(not did-something?)
-            (set! did-something? #t)]
-           [((+ start-time 30) . < . (current-inexact-milliseconds))
-            (define was-in-edit-sequence? (in-edit-sequence?))
-            (when was-in-edit-sequence?
-              (end-edit-sequence))
-            (pause)
-            (when was-in-edit-sequence?
-              (begin-edit-sequence #t #f))
-            (set! did-something? #f)
-            (set! start-time (current-inexact-milliseconds))
-            #t]
-           [else #f]))
-         
-       (cond
-        [searching-str
-         (define new-search-bubbles '())
-         (define new-replace-bubble #f)
-         (define first-hit (do-search 0 'eof))
-         (define-values (this-search-hit-count this-before-caret-search-hit-count)
-           (cond
-             [first-hit
-              (define sp (get-start-position))
-              (let loop ([bubble-start first-hit]
-                         [search-hit-count 0]
-                         [before-caret-search-hit-count 1])
-                (maybe-pause)
-                (define bubble-end (+ bubble-start (string-length searching-str)))
-                (define bubble (cons bubble-start bubble-end))
-                (define this-bubble
-                  (cond
-                    [(and replace-mode?
-                          (not new-replace-bubble)
-                          (<= sp bubble-start))
-                     (set! new-replace-bubble bubble)
-                     'the-replace-bubble]
-                    [else
-                     bubble]))
-                (set! new-search-bubbles (cons this-bubble new-search-bubbles))
-                      
-                (define next (do-search bubble-end 'eof))
-                (define next-before-caret-search-hit-count
-                  (if (and next (< next sp))
-                      (+ 1 before-caret-search-hit-count)
-                      before-caret-search-hit-count))
-                (cond
-                  [next
-                   ;; start a new one if there is another hit
-                   (loop next 
-                         (+ search-hit-count 1)
-                         next-before-caret-search-hit-count)]
-                  [else
-                   (values (+ search-hit-count 1) 
-                           before-caret-search-hit-count)]))]
-             [else (values 0 0)]))
-         
-         (set! search-hit-count this-search-hit-count)
-         (set! before-caret-search-hit-count this-before-caret-search-hit-count)
-         
-         (maybe-pause)
-         
-         (begin-edit-sequence #t #f)
-         (clear-all-regions)
-         
-         (maybe-pause)
-         
-         (for ([search-bubble (in-list (reverse new-search-bubbles))])
-           (cond
-             [(eq? search-bubble 'the-replace-bubble)
-              (highlight-replace new-replace-bubble)]
-             [else
-              (highlight-hit search-bubble)])
-           (maybe-pause))
-         
-         (update-yellow) 
-         (end-edit-sequence)]
-        [else
-         (begin-edit-sequence #t #f)
-         (clear-all-regions)
-         (set! search-hit-count 0)
-         (set! before-caret-search-hit-count 0)
-         (update-yellow) 
-         (end-edit-sequence)])
-       (when notify-frame?
-         (define canvas (get-canvas))
-         (when canvas
-           (let loop ([w canvas])
-             (cond
-               [(is-a? w frame:searchable<%>)
-                (send w search-hits-changed)]
-               [(is-a? w area<%>)
-                (loop (send w get-parent))]))))))
-    
-    (define/private (clear-all-regions) 
-      (when to-replace-highlight 
-        (unhighlight-replace))
-      (unhighlight-ranges/key 'plt:framework:search-bubbles)
-      (set! search-bubble-table (make-hash)))
-    
-    (define/private (do-search start end)
-      (find-string searching-str 'forward start end #t case-sensitive?))
-    
-    ;; INVARIANT: when a search bubble is highlighted,
-    ;; the search-bubble-table has it mapped to #t
-    ;; the two methods below contribute to this, but
-    ;; so does the 'clear-all-regions' method above
-    
-    
-    ;; this method may be called with bogus inputs (ie a pair that has no highlight)
-    ;; but only when there is a pending "erase all highlights and recompute everything" callback
-    (define/private (unhighlight-hit pair)
-      (hash-remove! search-bubble-table pair)
-      (unhighlight-range (car pair) (cdr pair) 
-                         (if replace-mode? light-search-color normal-search-color)
-                         #f
-                         'hollow-ellipse))
-    (define/private (highlight-hit pair)
-      (hash-set! search-bubble-table pair #t)
-      (highlight-range (car pair) (cdr pair) 
-                       (if replace-mode? light-search-color normal-search-color)
-                       #f
-                       'low
-                       'hollow-ellipse
-                       #:key 'plt:framework:search-bubbles
-                       #:adjust-on-insert/delete? #t))
-    
-    ;; INVARIANT: the "next to replace" highlight is always
-    ;; saved in 'to-replace-highlight'
-    (define/private (unhighlight-replace)
-      (unhighlight-range (car to-replace-highlight)
-                         (cdr to-replace-highlight)
-                         dark-search-color
-                         #f
-                         'hollow-ellipse)
-      (set! to-replace-highlight #f))
-    
-    (define/private (highlight-replace new-to-replace)
-      (set! to-replace-highlight new-to-replace)
-      (highlight-range (car to-replace-highlight)
-                       (cdr to-replace-highlight)
-                       dark-search-color
-                       #f
-                       'high
-                       'hollow-ellipse))
-    
-    (define/private (unhighlight-anchor)
-      (unhighlight-range anchor-pos anchor-pos "red" #f 'dot)
-      (unhighlight-range anchor-pos anchor-pos "red"))
-    
-    (define/private (highlight-anchor)
-      (highlight-range anchor-pos anchor-pos "red" #f 'low 'dot)
-      (highlight-range anchor-pos anchor-pos "red"))
-    
-    (super-new)))
-
-(define return<%> (interface ((class->interface text%))))
-(define return-mixin
-  (mixin ((class->interface text%)) (return<%>) 
-    (init-field return)
-    (define/override (on-local-char key)
-      (let ([cr-code #\return]
-            [lf-code #\newline]
-            [code (send key get-key-code)])
-        (or (and (char? code)
-                 (or (char=? lf-code code)
-                     (char=? cr-code code))
-                 (return))
-            (super on-local-char key))))
-    (super-new)))
-
-(define wide-snip<%>
-  (interface (basic<%>)
-    add-wide-snip
-    add-tall-snip))
-
-(define wide-snip-mixin
-  (mixin (basic<%>) (wide-snip<%>)
-    (define wide-snips '())
-    (define tall-snips '())
-    (define/public (add-wide-snip s) (set! wide-snips (cons s wide-snips)))
-    (define/public (get-wide-snips) wide-snips)
-    (define/public (add-tall-snip s) (set! tall-snips (cons s tall-snips)))
-    (define/public (get-tall-snips) tall-snips)
-    (super-new)))
-
-(define delegate<%> (interface (basic<%>) 
-                      get-delegate
-                      set-delegate))
-
-(define small-version-of-snip%
-  (class snip%
-    (init-field big-snip)
-    (define width 0)
-    (define height 0)
-    (define/override (get-extent dc x y wb hb db sb lb rb)
-      (set/f! db 0)
-      (set/f! sb 0)
-      (set/f! lb 0)
-      (set/f! rb 0)
-      (let ([bwb (box 0)]
-            [bhb (box 0)])
-        (send big-snip get-extent dc x y bwb bhb #f #f #f #f)
-        (let* ([cw (send dc get-char-width)]
-               [ch (send dc get-char-height)]
-               [w (floor (/ (unbox bwb) cw))]
-               [h (floor (/ (unbox bhb) ch))])
-          (set/f! wb w)
-          (set/f! hb h)
-          (set! width w)
-          (set! height h))))
-    
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (send dc draw-rectangle x y width height))
-    (define/override (copy) (instantiate small-version-of-snip% () (big-snip big-snip)))
-    (super-instantiate ())))
-
-(define 1-pixel-string-snip%
-  (class string-snip%
-    (init-rest args)
-    (inherit get-text get-count set-count get-flags)
-    (define/override (split position first second)
-      (let* ([str (get-text 0 (get-count))]
-             [new-second (make-object 1-pixel-string-snip%
-                           (substring str position (string-length str)))])
-        (set-box! first this)
-        (set-box! second new-second)
-        (set-count position)
-        (void)))
-    (define/override (copy)
-      (let ([cpy (make-object 1-pixel-string-snip%
-                   (get-text 0 (get-count)))])
-        (send cpy set-flags (get-flags))))
-    (define/override (partial-offset dc x y len)
-      len)
-    (define/override (get-extent dc x y wb hb db sb lb rb)
-      (cond
-        [(memq 'invisible (get-flags))
-         (set/f! wb 0)]
-        [else
-         (set/f! wb (get-count))])
-      (set/f! hb 1)
-      (set/f! db 0)
-      (set/f! sb 0)
-      (set/f! lb 0)
-      (set/f! rb 0))
-    
-    (define cache-function void)
-    (define cache-str (make-string 1 #\space))
-    (define container-str (make-string 1 #\space))
-    
-    (inherit get-text!)
-    
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (let ([len (get-count)])
-        (unless (= len (string-length container-str))
-          (set! container-str (make-string len #\space))
-          (set! cache-function void))
-        (get-text! container-str 0 len 0)
-        (unless (string=? container-str cache-str)
-          (set! cache-function (for-each/sections container-str))
-          (set! cache-str (make-string len #\space))
-          (get-text! cache-str 0 len 0)))
-      (when (<= top y bottom)
-        (cache-function dc x y)))
-    
-    (apply super-make-object args)))
-
-;; for-each/sections : string -> dc number number -> void
-(define (for-each/sections str)
-  (let ([str-len (string-length str)])
-    (cond
-      [(zero? str-len)
-       void]
-      [else
-       (let loop ([i 1]
-                  [len 1]
-                  [start 0]
-                  [blank? (char-whitespace? (string-ref str 0))])
-         (cond
-           [(= i str-len)
-            (if blank?
-                void
-                (λ (dc x y)
-                  (send dc draw-line (+ x start) y (+ x start (- len 1)) y)))]
-           [else
-            (let ([white? (char-whitespace? (string-ref str i))])
-              (cond
-                [(eq? white? blank?)
-                 (loop (+ i 1) (+ len 1) start blank?)]
-                [else
-                 (let ([res (loop (+ i 1) 1 i (not blank?))])
-                   (if blank?
-                       res
-                       (λ (dc x y)
-                         (res dc x y)
-                         (send dc draw-line (+ x start) y (+ x start (- len 1)) y))))]))]))])))
-
-
-#;
-(let ()
-  ;; test cases for for-each/section
-  (define (run-fe/s str)
-    (let ([calls '()])
-      ((for-each/sections str)
-       (new (class object%
-              (define/public (draw-line x1 y1 x2 y2)
-                (set! calls (cons (list x1 x2) calls)))
-              (super-new)))
-       0
-       0)
-      calls))
-  
-  (printf "framework/private/text.rkt: ~s\n" 
-          (list
-           (equal? (run-fe/s "") '())
-           (equal? (run-fe/s "a") '((0 0)))
-           (equal? (run-fe/s " ") '())
-           (equal? (run-fe/s "ab") '((0 1)))
-           (equal? (run-fe/s "ab c") '((0 1) (3 3)))
-           (equal? (run-fe/s "a bc") '((0 0) (2 3)))
-           (equal? (run-fe/s "a b c d") '((0 0) (2 2) (4 4) (6 6)))
-           (equal? (run-fe/s "a b c d    ") '((0 0) (2 2) (4 4) (6 6)))
-           (equal? (run-fe/s "abc def ghi") '((0 2) (4 6) (8 10)))
-           (equal? (run-fe/s "abc   def   ghi") '((0 2) (6 8) (12 14))))))
-
-(define 1-pixel-tab-snip%
-  (class tab-snip%
-    (init-rest args)
-    (inherit get-text get-count set-count get-flags)
-    (define/override (split position first second)
-      (let* ([str (get-text 0 (get-count))]
-             [new-second (make-object 1-pixel-string-snip%
-                           (substring str position (string-length str)))])
-        (set-box! first this)
-        (set-box! second new-second)
-        (set-count position)
-        (void)))
-    (define/override (copy)
-      (let ([cpy (make-object 1-pixel-tab-snip%)])
-        (send cpy set-flags (get-flags))))
-    
-    (inherit get-admin)
-    (define/override (get-extent dc x y wb hb db sb lb rb)
-      (set/f! wb 0)
-      (let ([admin (get-admin)])
-        (when admin
-          (let ([ed (send admin get-editor)])
-            (when (is-a? ed text%)
-              (let ([len-b (box 0)]
-                    [tab-width-b (box 0)]
-                    [in-units-b (box #f)])
-                (send ed get-tabs len-b tab-width-b in-units-b)
-                (when (and (or (equal? (unbox len-b) 0)
-                               (equal? (unbox len-b) null))
-                           (not (unbox in-units-b)))
-                  (let ([tabspace (unbox tab-width-b)])
-                    (set/f! wb (tabspace . - . (x . modulo . tabspace))))))))))
-      
-      (set/f! hb 0)
-      (set/f! db 0)
-      (set/f! sb 0)
-      (set/f! lb 0)
-      (set/f! rb 0))
-    
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (void))
-    (apply super-make-object args)))
-
-(define (set/f! b n)
-  (when (box? b)
-    (set-box! b n)))
-
-(define delegate-mixin
-  (mixin (basic<%>) (delegate<%>) 
-    (inherit split-snip find-snip 
-             get-snip-position
-             find-first-snip 
-             get-style-list set-tabs)
-    
-    (define linked-snips #f)
-    
-    (define/private (copy snip)
-      (let ([new-snip
-             (cond
-               [(is-a? snip tab-snip%)
-                (let ([new-snip (make-object 1-pixel-tab-snip%)])
-                  (send new-snip insert (string #\tab) 1)
-                  new-snip)]
-               [(is-a? snip string-snip%)
-                (make-object 1-pixel-string-snip%
-                  (send snip get-text 0 (send snip get-count)))]
-               [else 
-                (let ([new-snip
-                       (instantiate small-version-of-snip% ()
-                         (big-snip snip))])
-                  (hash-set! linked-snips snip new-snip)
-                  new-snip)])])
-        (send new-snip set-flags (send snip get-flags))
-        (send new-snip set-style (send snip get-style))
-        new-snip))
-    
-    (define delegate #f)
-    (inherit get-highlighted-ranges)
-    (define/public-final (get-delegate) delegate)
-    (define/public-final (set-delegate _d)
-      (when delegate
-        ;; the delegate may be in a bad state because we've killed the pending todo
-        ;; items; to clear out the bad state, end any edit sequences, and unhighlight
-        ;; any highlighted ranges. The rest of the state is reset if the editor
-        ;; is ever installed as a delegate again (by refresh-delegate)
-        (let loop ()
-          (when (send delegate in-edit-sequence?)
-            (send delegate end-edit-sequence)
-            (loop)))
-        (for ([range (in-list (send delegate get-highlighted-ranges))])
-          (send delegate unhighlight-range
-                (range-start range)
-                (range-end range)
-                (range-color range)
-                (range-caret-space? range)
-                (range-style range))))
-      
-      (set! delegate _d)
-      (set! linked-snips (if _d
-                             (make-hasheq)
-                             #f))
-      (refresh-delegate))
-    
-    (define/private (refresh-delegate)
-      (when delegate 
-        (refresh-delegate/do-work)))
-    
-    (define/private (refresh-delegate/do-work)
-      (send delegate begin-edit-sequence)
-      (send delegate lock #f)
-      (when (is-a? this racket:text<%>)
-        (send delegate set-tabs null (send this get-tab-size) #f))
-      (send delegate hide-caret #t)
-      (send delegate erase)
-      (send delegate set-style-list (get-style-list))
-      (let loop ([snip (find-first-snip)])
-        (when snip
-          (let ([copy-of-snip (copy snip)])
-            (send delegate insert
-                  copy-of-snip
-                  (send delegate last-position)
-                  (send delegate last-position))
-            (loop (send snip next)))))
-      (for-each
-       (λ (range)
-         (send delegate unhighlight-range 
-               (range-start range)
-               (range-end range)
-               (range-color range)
-               (range-caret-space? range)
-               (range-style range)))
-       (send delegate get-highlighted-ranges))
-      (for-each
-       (λ (range)
-         (send delegate highlight-range 
-               (range-start range)
-               (range-end range)
-               (range-color range)
-               (range-caret-space? range)
-               'high
-               (range-style range)))
-       (reverse (get-highlighted-ranges)))
-      (send delegate lock #t)
-      (send delegate end-edit-sequence))
-    
-    (define/override (highlight-range start end color 
-                                      [caret-space? #f] 
-                                      [priority 'low]
-                                      [style 'rectangle] 
-                                      #:adjust-on-insert/delete? [adjust-on-insert/delete? #f]
-                                      #:key [key #f])
-      (when delegate 
-        (send delegate highlight-range start end color caret-space? priority style
-              #:adjust-on-insert/delete? adjust-on-insert/delete?
-              #:key key))
-      (super highlight-range start end color caret-space? priority style 
-             #:adjust-on-insert/delete? adjust-on-insert/delete?
-             #:key key))
-    
-    ;; only need to override this unhighlight-ranges, since 
-    ;; all the other unhighlighting variants call this one
-    (define/override (unhighlight-ranges pred [just-one? #f])
-      (when delegate 
-        (send delegate unhighlight-ranges pred just-one?))
-      (super unhighlight-ranges pred just-one?))
-    
-    (inherit get-canvases get-active-canvas has-focus?)
-    (define/override (on-paint before? dc left top right bottom dx dy draw-caret?)
-      (super on-paint before? dc left top right bottom dx dy draw-caret?)
-      (when delegate 
-        (unless before?
-          (let ([active-canvas (get-active-canvas)])
-            (when active-canvas
-              (send (send active-canvas get-top-level-window) delegate-moved))))))
-    
-    (define no-delegate-edit-sequence-depth 0)
-     
-    (define/augment (on-edit-sequence)
-      (cond
-        [delegate 
-         (send delegate begin-edit-sequence)]
-        [else
-         (set! no-delegate-edit-sequence-depth
-               (+ no-delegate-edit-sequence-depth 1))])
-      (inner (void) on-edit-sequence))
-
-    (define/augment (after-edit-sequence)
-      (cond
-        [(and delegate 
-              (= 0 no-delegate-edit-sequence-depth))
-         (send delegate end-edit-sequence)]
-        [else
-         (set! no-delegate-edit-sequence-depth
-               (- no-delegate-edit-sequence-depth 1))])
-      (inner (void) after-edit-sequence))
-    
-    (define/override (resized snip redraw-now?)
-      (super resized snip redraw-now?)
-      (when (and delegate
-                 (not (is-a? snip string-snip%)))
-        (when linked-snips
-          (let ([delegate-copy (hash-ref linked-snips snip (λ () #f))])
-            (when delegate-copy
-              (send delegate resized delegate-copy redraw-now?))))))
-    
-    (define/augment (after-insert start len)
-      (when delegate 
-        (send delegate begin-edit-sequence)
-        (send delegate lock #f)
-        (split-snip start)
-        (split-snip (+ start len))
-        (let loop ([snip (find-snip (+ start len) 'before-or-none)])
-          (when snip
-            (unless ((get-snip-position snip) . < . start)
-              (send delegate insert (copy snip) start start)
-              (loop (send snip previous)))))
-        (send delegate lock #t)
-        (send delegate end-edit-sequence))
-      (inner (void) after-insert start len))
-    
-    (define/augment (after-delete start len)
-      (when delegate 
-        (send delegate lock #f)
-        (send delegate begin-edit-sequence)
-        (send delegate delete start (+ start len))
-        (send delegate end-edit-sequence)
-        (send delegate lock #t))
-      (inner (void) after-delete start len))
-    
-    (define/augment (after-change-style start len)
-      (when delegate 
-        (send delegate begin-edit-sequence)
-        (send delegate lock #f)
-        (split-snip start)
-        (let* ([snip (find-snip start 'after)]
-               [style (send snip get-style)])
-          (send delegate change-style style start (+ start len)))
-        (send delegate lock #f)
-        (send delegate end-edit-sequence))
-      (inner (void) after-change-style start len))
-    
-    (define/augment (after-load-file success?)
-      (when success?
-        (refresh-delegate))
-      (inner (void) after-load-file success?))
-    (super-new)))
-
-(define info<%> (interface (basic<%>)))
-
-(define info-mixin
-  (mixin (editor:keymap<%> basic<%>) (info<%>)
-    (inherit get-start-position get-end-position get-canvas
-             run-after-edit-sequence)
-    (define/private (enqueue-for-frame call-method tag)
-      (run-after-edit-sequence
-       (let ([from-enqueue-for-frame
-              (λ ()
-                (call-with-frame call-method))])
-         from-enqueue-for-frame)
-       tag))
-    
-    ;; call-with-frame : ((is-a?/c frame:text-info<%>) -> void) -> void
-    ;; calls the argument thunk with the frame showing this editor.
-    (define/private (call-with-frame call-method)
-      (let ([canvas (get-canvas)])
-        (when canvas
-          (let ([frame (send canvas get-top-level-window)])
-            (when (is-a? frame frame:text-info<%>)
-              (call-method frame))))))
-    
-    (define/override (set-anchor x)
-      (super set-anchor x)
-      (enqueue-for-frame 
-       (λ (x) (send x anchor-status-changed))
-       'framework:anchor-status-changed))
-    (define/override (set-overwrite-mode x)
-      (super set-overwrite-mode x)
-      (enqueue-for-frame
-       (λ (x) (send x overwrite-status-changed))
-       'framework:overwrite-status-changed))
-    (define/augment (after-set-position)
-      (maybe-queue-editor-position-update)
-      (inner (void) after-set-position))
-    (define/override use-file-text-mode
-      (case-lambda
-        [() (super use-file-text-mode)]
-        [(x) (super use-file-text-mode x)
-             (enqueue-for-frame
-              (λ (x) (send x use-file-text-mode-changed))
-              'framework:file-text-mode-changed)]))
-    
-    ;; maybe-queue-editor-position-update : -> void
-    ;; updates the editor-position in the frame,
-    ;; but delays it until the next low-priority event occurs.
-    (define callback-running? #f)
-    (define/private (maybe-queue-editor-position-update)
-      (enqueue-for-frame 
-       (λ (frame) 
-         (unless callback-running?
-           (set! callback-running? #t)
-           (queue-callback
-            (λ ()
-              (send frame editor-position-changed)
-              (set! callback-running? #f))
-            #f)))
-       'framework:info-frame:update-editor-position))
-    
-    (define/augment (after-insert start len)
-      (maybe-queue-editor-position-update)
-      (inner (void) after-insert start len))
-    (define/augment (after-delete start len)
-      (maybe-queue-editor-position-update)
-      (inner (void) after-delete start len))
-    (super-new)))
-
-(define clever-file-format<%> (interface ((class->interface text%))))
-
-(define clever-file-format-mixin
-  (mixin ((class->interface text%)) (clever-file-format<%>)
-    (inherit get-file-format set-file-format find-first-snip)
-      
-    ;; all-string-snips : -> boolean
-    ;; returns #t when it is safe to save this file in regular (non-WXME) mode.
-    (define/private (all-string-snips)
-      (let loop ([s (find-first-snip)])
-        (cond
-          [(not s) #t]
-          [(is-a? s string-snip%)
-           (loop (send s next))]
-          [else #f])))
-    
-    (define/augment (on-save-file name format)
-      (let ([all-strings? (all-string-snips)])
-        (cond
-          [(and all-strings?
-                (eq? format 'same)
-                (eq? 'standard (get-file-format))
-                (or (not (preferences:get 'framework:verify-change-format))
-                    (gui-utils:get-choice
-                     (string-constant save-as-plain-text) 
-                     (string-constant yes)
-                     (string-constant no))))
-           (set-file-format 'text)]
-          [(and (not all-strings?)
-                (eq? format 'same)
-                (eq? 'text (get-file-format))
-                (or (not (preferences:get 'framework:verify-change-format))
-                    (gui-utils:get-choice
-                     (string-constant save-in-drs-format)
-                     (string-constant yes)
-                     (string-constant no))))
-           (set-file-format 'standard)]
-          [else (void)]))
-      (inner (void) on-save-file name format))
-    
-    (super-new)))
-
-(define unix-line-endings-regexp #rx"(^$)|((^|[^\r])\n)")
-(unless (and (regexp-match? unix-line-endings-regexp "")
-             (regexp-match? unix-line-endings-regexp "\n")
-             (regexp-match? unix-line-endings-regexp "a\n")
-             (not (regexp-match? unix-line-endings-regexp "\r\n"))
-             (regexp-match? unix-line-endings-regexp "x\ny\r\nz\n")
-             (regexp-match? unix-line-endings-regexp "\n\r\n")
-             (not (regexp-match? unix-line-endings-regexp "a\r\nb\r\nc\r\n"))
-             (regexp-match? unix-line-endings-regexp "a\r\nb\r\nc\n")
-             (regexp-match? unix-line-endings-regexp "a\nb\r\nc\r\n"))
-  (error 'framework/private/text.rkt "unix-line-endings-regexp test failure"))
-
-(define crlf-line-endings<%> (interface ((class->interface text%))))
-
-(define crlf-line-endings-mixin
-  (mixin ((class->interface text%)) (crlf-line-endings<%>)
-    (inherit get-filename use-file-text-mode)
-    (define/augment (after-load-file success?)
-      (when success?
-        (cond
-          [(preferences:get 'framework:always-use-platform-specific-linefeed-convention)
-           (use-file-text-mode #t)]
-          [else
-           (define unix-endings?
-             (with-handlers ((exn:fail:filesystem? (λ (x) #t)))
-               (call-with-input-file (get-filename)
-                 (λ (port)
-                   (regexp-match? unix-line-endings-regexp port)))))
-           (use-file-text-mode
-            (and (eq? (system-type) 'windows) 
-                 (not unix-endings?)))]))
-      (inner (void) after-load-file success?))
-
-    (super-new)
-    
-    ;; for empty files we want to use LF mode so
-    ;; set it this way until a file is loaded in the editor
-    (when (eq? (system-type) 'windows)
-      (unless (preferences:get 'framework:always-use-platform-specific-linefeed-convention)
-        (use-file-text-mode #f)))))
-
-(define file<%>
-  (interface (editor:file<%> basic<%>)
-    get-read-write?
-    while-unlocked))
-
-(define file-mixin
-  (mixin (editor:file<%> basic<%>) (file<%>)
-    (inherit get-filename)
-    (define read-write? #t)
-    (define/public (get-read-write?) read-write?)
-    (define/private (check-lock)
-      (define filename (get-filename))
-      (define can-edit?
-        (if (and filename
-                 (file-exists? filename))
-            (and (member 'write 
-                         (with-handlers ([exn:fail:filesystem? (λ (x) '())])
-                           (file-or-directory-permissions filename)))
-                 #t)
-            #t))
-      (set! read-write? can-edit?))
-    
-    (define/public (while-unlocked t)
-      (define unlocked? 'unint)
-      (dynamic-wind
-       (λ () 
-         (set! unlocked? read-write?)
-         (set! read-write? #t))
-       (λ () (t))
-       (λ () (set! read-write? unlocked?))))
-    
-    (define/augment (can-insert? x y)
-      (and read-write? (inner #t can-insert? x y)))
-    (define/augment (can-delete? x y) 
-      (and read-write? (inner #t can-delete? x y)))
-    
-    (define/augment (after-save-file success)
-      (when success
-        (check-lock))
-      (inner (void) after-save-file success))
-    
-    (define/augment (after-load-file sucessful?)
-      (when sucessful?
-        (check-lock))
-      (inner (void) after-load-file sucessful?))
-    (super-new)))
-
-
-(define ports<%>
-  (interface ()
-    delete/io
-    get-insertion-point 
-    set-insertion-point
-    get-unread-start-point
-    set-unread-start-point
-    set-allow-edits
-    get-allow-edits
-    insert-between
-    insert-before
-    submit-to-port?
-    on-submit
-    send-eof-to-in-port
-    send-eof-to-box-in-port
-    reset-input-box
-    clear-output-ports
-    clear-input-port
-    clear-box-input-port
-    get-out-style-delta
-    get-err-style-delta
-    get-value-style-delta
-    get-in-port
-    get-in-box-port
-    get-out-port
-    get-err-port
-    get-value-port
-    after-io-insertion
-    get-box-input-editor-snip%
-    get-box-input-text%))
-
-(define-struct peeker (bytes skip-count pe resp-chan nack polling?) #:inspector (make-inspector))
-(define-struct committer (kr commit-peeker-evt done-evt resp-chan resp-nack))
-
-(define msec-timeout 500)
-
-;; this value (4096) is also mentioned in the test suite (collects/tests/framework/test.rkt)
-;; so if you change it, be sure to change things over there too
-(define output-buffer-full 4096)
-
-(define-local-member-name 
-  new-box-input
-  box-input-not-used-anymore
-  set-port-text)
-
-(define (set-box/f! b v) (when (box? b) (set-box! b v)))
-
-(define arrow-cursor (make-object cursor% 'arrow))
-
-(define eof-snip%
-  (class image-snip%
-    (init-field port-text)
-    (define/override (get-extent dc x y w h descent space lspace rspace)
-      (super get-extent dc x y w h descent space lspace rspace)
-      (set-box/f! descent 7)) ;; depends on actual bitmap used ...
-    
-    (define/override (on-event dc x y editorx editory event)
-      (when (send event button-up? 'left)
-        (send port-text send-eof-to-box-in-port)))
-    (define/override (adjust-cursor dc x y edx edy e)
-      arrow-cursor)
-    (super-make-object (icon:get-eof-bitmap))
-    (inherit set-flags get-flags)
-    (set-flags (list* 'handles-events (get-flags)))))
-
-(define out-style-name "text:ports out")
-(define error-style-name "text:ports err")
-(define value-style-name "text:ports value")
-(let ([create-style-name
-       (λ (name sd)
-         (let* ([sl (editor:get-standard-style-list)])
-           (send sl new-named-style 
-                 name
-                 (send sl find-or-create-style
-                       (send sl find-named-style "Standard")
-                       sd))))])
-  (let ([out-sd (make-object style-delta% 'change-nothing)])
-    (send out-sd set-delta-foreground (make-object color% 150 0 150))
-    (create-style-name out-style-name out-sd))
-  (let ([err-sd (make-object style-delta% 'change-italic)])
-    (send err-sd set-delta-foreground (make-object color% 255 0 0))
-    (create-style-name error-style-name err-sd))
-  (let ([value-sd (make-object style-delta% 'change-nothing)])
-    (send value-sd set-delta-foreground (make-object color% 0 0 175))
-    (create-style-name value-style-name value-sd)))
-
-;; data : any
-;; to-insert-chan : (or/c #f channel)
-;;   if to-insert-chan is a channel, this means
-;;   the eventspace handler thread is the one that
-;;   is initiating the communication, so instead of
-;;   queueing a callback to do the update of the editor,
-;;   just send the work back directly and it will be done
-;;   syncronously there. If it is #f, then we queue a callback
-;;   to do the work
-(define-struct data/chan (data to-insert-chan))
-
-(define ports-mixin
-  (mixin (wide-snip<%>) (ports<%>)
-    (inherit begin-edit-sequence
-             change-style
-             delete
-             end-edit-sequence
-             find-snip
-             insert
-             get-canvas
-             get-start-position
-             get-end-position
-             get-snip-position
-             get-style-list
-             get-port-name
-             is-locked?
-             last-position
-             lock
-             paragraph-start-position
-             position-paragraph
-             release-snip
-             set-caret-owner
-             split-snip
-             get-focus-snip
-             get-view-size
-             scroll-to-position
-             position-location
-             get-styles-fixed
-             set-styles-fixed
-             auto-wrap
-             get-autowrap-bitmap-width)
-    
-    ;; private field
-    (define eventspace (current-eventspace))
-    
-    ;; insertion-point : number
-    ;; the place where the output ports insert data
-    ;; only updated in `eventspace' (above)'s main thread
-    (define insertion-point 0)
-    
-    ;; unread-start-points : number
-    ;; from this position to the end of the buffer is the
-    ;;      users editing that has not been committed to the
-    ;;      port.
-    ;; only updated in `eventspace' (above)'s main thread
-    (define unread-start-point 0)
-    
-    ;; box-input : (union #f (is-a?/c editor-snip%))
-    ;; the snip where the user's input is typed for the box input port
-    (define box-input #f)
-    (define eof-button (new eof-snip% (port-text this)))
-    
-    ;; allow-edits? : boolean
-    ;; when this flag is set, only insert/delete after the
-    ;; insertion-point are allowed.
-    (define allow-edits? #f)
-    
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;;
-    ;;  public interface
-    ;;
-    
-    ;; insert-between : string/snp -> void
-    ;; inserts something between the insertion point and the unread region
-    (define/public-final (insert-between str/snp)
-      (insert str/snp unread-start-point unread-start-point)
-      (set! unread-start-point (+ unread-start-point 
-                                  (amt-of-space str/snp))))
-    
-    ;; insert-before : string/snp -> void
-    ;; inserts something before both the insertion point and the unread region
-    (define/public-final (insert-before str/snp)
-      (insert str/snp insertion-point insertion-point)
-      (let ([amt (amt-of-space str/snp)])
-        (set! insertion-point (+ insertion-point amt))
-        (set! unread-start-point (+ unread-start-point amt))))
-    
-    (define/private (amt-of-space str/snp)
-      (cond
-        [(string? str/snp) (string-length str/snp)]
-        [(is-a? str/snp snip%)
-         (send str/snp get-count)]))
-    
-    (define/public-final (get-insertion-point) insertion-point)
-    (define/public-final (set-insertion-point ip) (set! insertion-point ip))
-    (define/public-final (get-unread-start-point)
-      unread-start-point)
-    (define/public-final (set-unread-start-point u) 
-      (unless (<= u (last-position))
-        (error 'set-unread-start-point "~e is too large, last-position is ~e"
-               unread-start-point 
-               (last-position)))
-      (set! unread-start-point u))
-    
-    (define/public-final (set-allow-edits allow?) (set! allow-edits? allow?))
-    (define/public-final (get-allow-edits) allow-edits?)
-    
-    (define/public-final (send-eof-to-in-port) 
-      (when box-input (new-box-input (send box-input get-editor)))
-      (channel-put read-chan (cons eof (position->line-col-pos unread-start-point))))
-    (define/public-final (send-eof-to-box-in-port) 
-      (when box-input (new-box-input (send box-input get-editor)))
-      (channel-put box-read-chan (cons eof (position->line-col-pos unread-start-point))))
-    (define/public-final (clear-input-port) (channel-put clear-input-chan (void)))
-    (define/public-final (clear-box-input-port) (channel-put box-clear-input-chan (void)))
-    (define/public-final (clear-output-ports) 
-      (channel-put clear-output-chan (void))
-      (init-output-ports))
-    
-    ;; delete/io: number number -> void
-    (define/public-final (delete/io start end)
-      (unless (<= start end insertion-point)
-        (error 'delete/io "expected start (~a) <= end (~a) <= insertion-point (~a)"
-               start end insertion-point))
-      
-      (let ([dist (- end start)])
-        (set! insertion-point (- insertion-point dist))
-        (set! unread-start-point (- unread-start-point dist)))
-      
-      (let ([before-allowed? allow-edits?])
-        (set! allow-edits? #t)
-        (delete start end #f)
-        (set! allow-edits? before-allowed?)))
-    
-    (define/public-final (insert/io str start [style #f])
-      (unless (<= start insertion-point)
-        (error 'insert/io "expected start (~a) <= insertion-point (~a)"
-               start (string-length str) insertion-point))
-      (define len (string-length str))
-      (set! insertion-point (+ insertion-point len))
-      (set! unread-start-point (+ unread-start-point len))
-      (let ([before-allowed? allow-edits?])
-        (set! allow-edits? #t)
-        (insert str start start #f)
-        (when style
-          (change-style (add-standard style) start (+ start len)))
-        (set! allow-edits? before-allowed?)))
-      
-    (define/public-final (get-in-port)
-      (unless in-port (error 'get-in-port "not ready"))
-      in-port)
-    (define/public-final (get-in-box-port)
-      (unless in-port (error 'get-in-box-port "not ready"))
-      in-box-port)
-    (define/public-final (get-out-port)
-      (unless out-port (error 'get-out-port "not ready"))
-      out-port)
-    (define/public-final (get-err-port)
-      (unless err-port (error 'get-err-port "not ready"))
-      err-port)
-    (define/public-final (get-value-port)
-      (unless value-port (error 'get-value-port "not ready"))
-      value-port)
-    
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;;
-    ;;  specialization interface
-    ;;
-    
-    (define/pubment (submit-to-port? key) (inner #t submit-to-port? key))
-    (define/pubment (on-submit) (inner (void) on-submit))
-    (define/public (get-out-style-delta) out-style-name)
-    (define/public (get-err-style-delta) error-style-name)
-    (define/public (get-value-style-delta) value-style-name)
-    
-    (define/public (get-box-input-editor-snip%) editor-snip%)
-    (define/public (get-box-input-text%) input-box%)
-    
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;;
-    ;;  editor integration
-    ;;
-    
-    (define/augment (can-insert? start len)
-      (and (or allow-edits? 
-               (start . >= . unread-start-point))
-           (inner #t can-insert? start len)))
-    
-    (define/augment (can-delete? start len)
-      (and (or allow-edits?
-               (start . >= . unread-start-point))
-           (inner #t can-delete? start len)))
-    
-    (inherit set-position)
-    (define/override (on-local-char key)
-      (let ([start (get-start-position)]
-            [end (get-end-position)]
-            [code (send key get-key-code)])
-        (cond
-          [(not (or (eq? code 'numpad-enter)
-                    (equal? code #\return)
-                    (equal? code #\newline)))
-           (super on-local-char key)]
-          [(and (insertion-point . <= . start)
-                (= start end)
-                (submit-to-port? key))
-           (insert "\n" (last-position) (last-position))
-           (do-submission)]
-          [else
-           (super on-local-char key)])))
-    
-    (define/public-final (do-submission)
-      (set-position (last-position) (last-position))
-      (for-each/snips-chars
-       unread-start-point
-       (last-position)
-       (λ (s/c line-col-pos) 
-         (cond
-           [(is-a? s/c snip%)
-            (channel-put read-chan (cons s/c line-col-pos))]
-           [(char? s/c)
-            (for-each (λ (b) (channel-put read-chan (cons b line-col-pos)))
-                      (bytes->list (string->bytes/utf-8 (string s/c))))])))
-      (set! unread-start-point (last-position))
-      (set! insertion-point (last-position))
-      (on-submit))
-    
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;;
-    ;; box input port management
-    ;;
-    
-    (define/public-final (reset-input-box) 
-      (when box-input
-        (let ([l? (is-locked?)]
-              [old-allow-edits? allow-edits?])
-          (lock #f)
-          (set! allow-edits? #t)
-          (send box-input release-from-owner)
-          (send eof-button release-from-owner)
-          (set! unread-start-point (- unread-start-point 2))
-          (set! allow-edits? old-allow-edits?)
-          (lock l?))
-        (set! box-input #f)))
-    
-    (define/private (adjust-box-input-width)
-      (when box-input
-        (define w (box 0))
-        (define x (box 0))
-        (define bw (send (icon:get-eof-bitmap) get-width))
-        (get-view-size w #f)
-        (define pos (- (last-position) 2))
-        (position-location pos x #f #t
-                           (not (= pos (paragraph-start-position (position-paragraph pos)))))
-        (define auto-wrap-icon-size (get-autowrap-bitmap-width))
-        (define size (- (unbox w) (unbox x) bw 24 auto-wrap-icon-size))
-        (when (positive? size)
-          (send box-input set-min-width size))))
-    
-    (define/augment (on-display-size)
-      (adjust-box-input-width)
-      (inner (void) on-display-size))
-    
-    (define/private (on-box-peek)
-      (unless box-input
-        (let* ([ed (new (get-box-input-text%))]
-               [es (new (get-box-input-editor-snip%) 
-                        (editor ed))]
-               [locked? (is-locked?)])
-          (begin-edit-sequence)
-          (send ed set-port-text this)
-          (lock #f)
-          #;(unless (= unread-start-point (paragraph-start-position 
-                                           (position-paragraph unread-start-point)))
-              (insert-between "\n"))
-          (insert-between es)
-          (insert-between eof-button)
-          #;(send (get-canvas) add-wide-snip es)
-          (set! box-input es)
-          (adjust-box-input-width)
-          (set-caret-owner es 'display)
-          (lock locked?)
-          (end-edit-sequence))))
-    
-    (define/public (new-box-input ed)
-      (when (eq? ed (send box-input get-editor)) ;; just in case things get out of sync.
-        (let ([locked? (is-locked?)])
-          (begin-edit-sequence)
-          (send box-input set-min-width 'none)
-          (lock #f)
-          
-          (let ([old-insertion-point insertion-point])
-            (let loop ([snip (send (send box-input get-editor) find-first-snip)])
-              (when snip
-                (let ([next (send snip next)])
-                  (send snip release-from-owner)
-                  (do-insertion
-                   (list (cons (cond
-                                 [(is-a? snip string-snip%)
-                                  (send snip get-text 0 (send snip get-count))]
-                                 [else snip])
-                               (make-object style-delta%)))
-                   #t)
-                  (loop next))))
-            
-            ;; this is copied code ...
-            (for-each/snips-chars
-             old-insertion-point
-             insertion-point
-             (λ (s/c line-col-pos) 
-               (cond
-                 [(is-a? s/c snip%)
-                  (channel-put box-read-chan (cons s/c line-col-pos))]
-                 [(char? s/c)
-                  (for-each (λ (b) (channel-put box-read-chan (cons b line-col-pos)))
-                            (bytes->list (string->bytes/utf-8 (string s/c))))]))))
-          
-          (lock locked?)
-          (adjust-box-input-width)
-          (end-edit-sequence))))
-    
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;;
-    ;; output port synchronization code
-    ;;
-    
-    ;; flush-chan : (channel (evt void))
-    ;; signals that the buffer-thread should flush pending output
-    ;; the evt inside is waited on to indicate the flush has occurred
-    (define flush-chan (make-channel))
-    
-    ;; clear-output-chan : (channel void)
-    (define clear-output-chan (make-channel))
-    
-    ;; write-chan : (channel (cons (union snip bytes) style))
-    ;; send output to the editor
-    (define write-chan (make-channel))
-    
-    ;; readers-chan : (channel (list (channel (union byte snip))
-    ;;                               (channel ...)))
-    (define readers-chan (make-channel))
-    
-    ;; queue-insertion : (listof (cons (union string snip) style)) evt -> void
-    ;; txt is in the reverse order of the things to be inserted.
-    ;; the evt is waited on when the text has actually been inserted
-    ;; thread: any thread, except the eventspace main thread
-    (define/private (queue-insertion txts signal)
-      (parameterize ([current-eventspace eventspace])
-        (queue-callback
-         (λ ()
-           (do-insertion txts #f)
-           (sync signal))
-         #f)))
-    
-    ;; do-insertion : (listof (cons (union string snip) style-delta)) boolean -> void
-    ;; thread: eventspace main thread
-    (define/private (do-insertion txts showing-input?)
-      (let ([locked? (is-locked?)]
-            [sf? (get-styles-fixed)])
-        (begin-edit-sequence)
-        (lock #f)
-        (set-styles-fixed #f)
-        (set! allow-edits? #t)
-        (let loop ([txts txts])
-          (cond
-            [(null? txts) (void)]
-            [else 
-             (let* ([fst (car txts)]
-                    [str/snp (car fst)]
-                    [style (cdr fst)])
-               
-               (let ([inserted-count
-                      (if (is-a? str/snp snip%)
-                          (send str/snp get-count)
-                          (string-length str/snp))]
-                     [old-insertion-point insertion-point])
-                 (set! insertion-point (+ insertion-point inserted-count))
-                 (set! unread-start-point (+ unread-start-point inserted-count))
-                 
-                 (insert (if (is-a? str/snp snip%)
-                             (let ([s (send str/snp copy)])
-                               (if (is-a? s snip%)
-                                   s
-                                   (new snip%)))
-                             str/snp)
-                         old-insertion-point
-                         old-insertion-point
-                         #t)
-                 
-                 ;; the idea here is that if you made a string snip, you
-                 ;; could have made a string and gotten the style, so you
-                 ;; must intend to have your own style.
-                 (unless (is-a? str/snp string-snip%)
-                   (change-style style old-insertion-point insertion-point))))
-             (loop (cdr txts))]))
-        (set-styles-fixed sf?)
-        (set! allow-edits? #f)
-        (lock locked?)
-        (unless showing-input?
-          (when box-input
-            (adjust-box-input-width)
-            (when (eq? box-input (get-focus-snip))
-              (scroll-to-position (last-position)))))
-        (end-edit-sequence)
-        (unless (null? txts)
-          (after-io-insertion))))
-    
-    (define/public (after-io-insertion) (void))
-
-    (define output-buffer-thread
-      (let ([converter (bytes-open-converter "UTF-8-permissive" "UTF-8")])
-        (thread
-         (λ ()
-           (let loop (;; text-to-insert : (queue (cons (union snip bytes) style))
-                      [text-to-insert (empty-at-queue)]
-                      [last-flush (current-inexact-milliseconds)])
-             
-             (sync
-              (if (at-queue-empty? text-to-insert)
-                  never-evt
-                  (handle-evt
-                   (alarm-evt (+ last-flush msec-timeout))
-                   (λ (_)
-                     (define-values (viable-bytes remaining-queue flush-keep-trying?)
-                       (split-queue converter text-to-insert))
-                     ;; we always queue the work here since the 
-                     ;; always event means no one waits for the callback
-                     (queue-insertion viable-bytes always-evt)
-                     (loop remaining-queue (current-inexact-milliseconds)))))
-              (handle-evt
-               flush-chan
-               (λ (return-evt/to-insert-chan)
-                 (define remaining-queue #f)
-                 (define viable-bytess
-                   (let loop ([q text-to-insert])
-                     (define-values (viable-bytes next-remaining-queue flush-keep-trying?)
-                       (split-queue converter q))
-                     (cond
-                       [flush-keep-trying?
-                        (cond
-                          [(channel? return-evt/to-insert-chan)
-                           (cons viable-bytes (loop next-remaining-queue))]
-                          [else
-                           (define c (make-channel))
-                           (queue-insertion viable-bytes c)
-                           (channel-put c #f)
-                           (loop next-remaining-queue)])]
-                       [else
-                        (set! remaining-queue next-remaining-queue)
-                        (cond
-                          [(channel? return-evt/to-insert-chan)
-                           (list viable-bytes)]
-                          [else
-                           (queue-insertion viable-bytes return-evt/to-insert-chan)
-                           #f])])))
-                 (when (channel? return-evt/to-insert-chan)
-                   (channel-put return-evt/to-insert-chan viable-bytess))
-                 (loop remaining-queue (current-inexact-milliseconds))))
-              (handle-evt
-               clear-output-chan
-               (λ (_)
-                 (loop (empty-at-queue) (current-inexact-milliseconds))))
-              (handle-evt
-               write-chan
-               (λ (pr-pr)
-                 (define return-chan (car pr-pr))
-                 (define pr (cdr pr-pr))
-                 (let ([new-text-to-insert (at-enqueue pr text-to-insert)])
-                   (cond
-                     [((at-queue-size text-to-insert) . < . output-buffer-full)
-                      (when return-chan
-                        (channel-put return-chan '()))
-                      (loop new-text-to-insert 
-                            (if (at-queue-empty? text-to-insert)
-                                (current-inexact-milliseconds)
-                                last-flush))]
-                     [else
-                      (let ([chan (make-channel)])
-                        (let-values ([(viable-bytes remaining-queue flush-keep-trying?)
-                                      (split-queue converter new-text-to-insert)])
-                          (if return-chan
-                              (channel-put return-chan viable-bytes)
-                              (queue-insertion viable-bytes (channel-put-evt chan (void))))
-                          (channel-get chan)
-                          (loop remaining-queue (current-inexact-milliseconds))))]))))))))))
-    
-    (field [in-port-args #f]
-           [out-port #f]
-           [err-port #f]
-           [value-port #f])
-    
-    (define/private (init-output-ports)
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;;  the following must be able to run
-      ;;  in any thread (even concurrently)
-      ;;
-      (define (make-write-bytes-proc style)
-        (λ (to-write start end block/buffer? enable-breaks?)
-          (cond
-            [(= start end) (flush-proc)]
-            [else
-             (define pair (cons (subbytes to-write start end) style))
-             (cond
-               [(eq? (current-thread) (eventspace-handler-thread eventspace))
-                (define return-channel (make-channel))
-                (thread (λ () (channel-put write-chan (cons return-channel pair))))
-                (do-insertion (channel-get return-channel) #f)]
-               [else
-                (channel-put write-chan (cons #f pair))])])
-          (- end start)))
-      
-      (define (flush-proc)
-        (cond
-          [(eq? (current-thread) (eventspace-handler-thread eventspace))
-           (define to-insert-channel (make-channel))
-           (thread (λ () (channel-put flush-chan to-insert-channel)))
-           (for ([ele (in-list (channel-get to-insert-channel))])
-             (do-insertion ele #f))]
-          [else
-           (sync
-            (nack-guard-evt
-             (λ (fail-channel)
-               (let* ([return-channel (make-channel)]
-                      [return-evt
-                       (choice-evt
-                        fail-channel
-                        (channel-put-evt return-channel (void)))])
-                 (channel-put flush-chan return-evt)
-                 return-channel))))]))
-      
-      (define (out-close-proc)
-        (void))
-      
-      (define (make-write-special-proc style)
-        (λ (special can-buffer? enable-breaks?)
-          (define str/snp (cond
-                            [(string? special) special]
-                            [(is-a? special snip%) special]
-                            [else (format "~s" special)]))
-          (define to-send (cons str/snp style))
-          (cond
-            [(eq? (current-thread) (eventspace-handler-thread eventspace))
-             (define return-chan (make-channel))
-             (thread (λ () (channel-put write-chan (cons return-chan to-send))))
-             (do-insertion (channel-get return-chan) #f)]
-            [else
-             (channel-put write-chan (cons #f to-send))])
-          #t))
-      
-      (let ([out-style (add-standard (get-out-style-delta))]
-            [err-style (add-standard (get-err-style-delta))]
-            [value-style (add-standard (get-value-style-delta))])
-        (set! out-port (make-output-port #f
-                                         always-evt
-                                         (make-write-bytes-proc out-style)
-                                         out-close-proc
-                                         (make-write-special-proc out-style)))
-        (set! err-port (make-output-port #f 
-                                         always-evt
-                                         (make-write-bytes-proc err-style)
-                                         out-close-proc
-                                         (make-write-special-proc err-style)))
-        (set! value-port (make-output-port #f
-                                           always-evt
-                                           (make-write-bytes-proc value-style)
-                                           out-close-proc
-                                           (make-write-special-proc value-style)))
-        (let ([install-handlers
-               (λ (port)
-                 ;; don't want to set the port-print-handler here; 
-                 ;; instead drracket sets the global-port-print-handler
-                 ;; to catch fractions and the like
-                 (set-interactive-write-handler port)
-                 (set-interactive-display-handler port))])
-          (install-handlers out-port)
-          (install-handlers err-port)
-          (install-handlers value-port))))
-    
-    (define/private (add-standard sd)
-      (cond
-        [(string? sd)
-         (define style-list (get-style-list))
-         (or (send style-list find-named-style sd)
-             (send style-list find-named-style "Standard")
-             (send style-list basic-style))]
-        [sd
-         (define style-list (get-style-list))
-         (define std (send style-list find-named-style "Standard"))
-         (cond
-           [std
-            (send style-list find-or-create-style std sd)]
-           [else
-            (define basic (send style-list basic-style))
-            (send style-list find-or-create-style basic sd)])]))
-    
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;;
-    ;;  helpers
-    ;;
-    
-    ;; type line-col-pos = (list (union #f fixnum) (union #f fixnum) (union #f fixnum)))
-    
-    ;; position->line-col-pos : number -> (list number number number)
-    (define/private (position->line-col-pos pos)
-      (let* ([para (position-paragraph pos)]
-             [para-start (paragraph-start-position para)])
-        (list (+ para 1)
-              (- pos para-start)
-              (+ pos 1))))
-    
-    ;; for-each/snips-chars : number number ((union char snip) line-col-pos -> void) -> void
-    (define/private (for-each/snips-chars start end func)
-      (split-snip start)
-      (split-snip end)
-      (let loop ([snip (find-snip start 'after-or-none)])
-        (cond
-          [(not snip) (void)]
-          [(< (get-snip-position snip) end)
-           (let ([line-col-pos (position->line-col-pos (get-snip-position snip))])
-             (cond
-               [(is-a? snip string-snip%)
-                (let ([str (send snip get-text 0 (send snip get-count))])
-                  (let loop ([i 0])
-                    (when (< i (string-length str))
-                      (func (string-ref str i)
-                            (list (car line-col-pos)
-                                  (+ i (cadr line-col-pos))
-                                  (+ i (caddr line-col-pos))))
-                      (loop (+ i 1)))))
-                (loop (send snip next))]
-               [else
-                (func (send snip copy) line-col-pos)
-                (loop (send snip next))]))]
-          [else (void)])))
-    
-    
-    ;; split-queue : converter (queue (cons (union snip bytes) style) 
-    ;;            -> (values (listof (queue (cons (union snip bytes) style))
-    ;;                       queue
-    ;;                       boolean)
-    ;; this function must only be called on the output-buffer-thread
-    ;; extracts the viable bytes (and other stuff) from the front of the queue
-    ;; and returns them as strings (and other stuff).
-    ;; the boolean result is #t when a flush should try to get more stuff out of the
-    ;;   queue for a second GUI callback
-    (define/private (split-queue converter q)
-      
-      ;; this number based on testing in drracket's REPL
-      ;; the number can be 10x bigger if you use a vanilla
-      ;; text, but something about something in how DrRacket's
-      ;; styles or something else is set up makes this number
-      ;; take more like 20-60 msec per event (on my laptop)
-      ;; for a bytes containing all (char->integer #\a)s. Random
-      ;; bytes are slower, but probably that's not the common case.
-      (define bytes-limit-for-a-single-go 1000)
-      
-      (define lst (at-queue->list q))
-      (let loop ([lst lst] [acc null])
-        (cond
-          [(null? lst)
-           (values (reverse acc)
-                   (empty-at-queue)
-                   #f)]
-          [else
-           (define-values (front rest) (peel lst))
-           (cond
-             [(not front) (values (reverse acc)
-                                  (empty-at-queue)
-                                  #f)]
-             [(bytes? (car front))
-              (define the-bytes (car front))
-              (define key (cdr front))
-              (define too-many-bytes? (>= (bytes-length the-bytes) bytes-limit-for-a-single-go))
-              (cond
-                [(or (null? rest) too-many-bytes?)
-                 (define remainder-re-enqueued (list->at-queue rest))
-                 (define-values (converted-bytes src-read-amt termination)
-                   (bytes-convert converter the-bytes 0 (min (bytes-length the-bytes)
-                                                             bytes-limit-for-a-single-go)))
-                 (define new-at-queue 
-                   (cond
-                     [(= src-read-amt (bytes-length the-bytes))
-                      remainder-re-enqueued]
-                     [else
-                      (define leftovers (subbytes the-bytes src-read-amt (bytes-length the-bytes)))
-                      (at-enqueue (cons leftovers key) remainder-re-enqueued)]))
-                 (define converted-str (bytes->string/utf-8 converted-bytes))
-                 (values (reverse (cons (cons converted-str key) acc))
-                         new-at-queue
-                         too-many-bytes?)]
-                [else
-                 (define-values (converted-bytes src-read-k termination)
-                   (bytes-convert converter the-bytes))
-                 (define-values (more-bytes more-termination) (bytes-convert-end converter))
-                 (loop rest
-                       (cons (cons (bytes->string/utf-8 (bytes-append converted-bytes more-bytes))
-                                   key)
-                             acc))])]
-             [else (loop rest
-                         (cons front acc))])])))
-    
-    
-    (super-new)
-    (init-output-ports)
-    (define-values (in-port read-chan clear-input-chan)
-      (start-text-input-port (get-port-name) #f))
-    (define-values (in-box-port box-read-chan box-clear-input-chan) 
-      (start-text-input-port (get-port-name) (lambda () (on-box-peek))))))
-
-(define input-box<%>
-  (interface ((class->interface text%))
-    ))
-
-(define input-box-mixin
-  (mixin ((class->interface text%)) (input-box<%>)
-    (inherit erase lock)
-    
-    (define port-text #f)
-    (define/public (set-port-text pt) (set! port-text pt))
-    
-    (define in-use? #t)
-    (define/public (box-input-not-used-anymore)
-      (lock #t)
-      (set! in-use? #f))
-    
-    (define/override (on-default-char kevt)
-      (super on-default-char kevt)
-      (when in-use?
-        (case (send kevt get-key-code)
-          [(numpad-enter #\return)
-           (send port-text new-box-input this)]
-          [else (void)])))
-    
-    (super-new)))
-
-(define (start-text-input-port source on-peek)
-  
-  ;; eventspace at the time this function was called. used for peek callbacks
-  (define eventspace (current-eventspace))
-  
-  ;; read-chan : (channel (cons (union byte snip eof) line-col-pos))
-  ;; send input from the editor
-  (define read-chan (make-channel))
-  
-  ;; clear-input-chan : (channel void)
-  (define clear-input-chan (make-channel))
-  
-  ;; progress-event-chan : (channel (cons (channel event) nack-evt)))
-  (define progress-event-chan (make-channel))
-  
-  ;; peek-chan : (channel peeker)
-  (define peek-chan (make-channel))
-  
-  ;; commit-chan : (channel committer)
-  (define commit-chan (make-channel))
-  
-  ;; position-chan : (channel (cons (channel void) (channel line-col-pos)))
-  (define position-chan (make-channel))
-  
-  (define input-buffer-thread
-    (thread
-     (λ ()
-       
-       ;; these vars are like arguments to the loop function
-       ;; they are only set right before loop is called.
-       ;; This is done to avoid passing the same arguments
-       ;; over and over to loop.
-       (define peeker-sema (make-semaphore 0))
-       (define peeker-evt (semaphore-peek-evt peeker-sema))
-       (define bytes-peeked 0)
-       (define response-evts '())
-       (define peekers '())     ;; waiting for a peek
-       (define committers '())  ;; waiting for a commit
-       (define positioners '()) ;; waiting for a position
-       (define data (empty-at-queue)) ;; (queue (cons (union byte snip eof) line-col-pos))
-       (define position #f)
-       
-       ;; loop : -> alpha
-       ;; the main loop for this thread
-       (define (loop)
-         (let-values ([(not-ready-peekers new-peek-response-evts)
-                       (separate peekers service-waiter)]
-                      [(potential-commits new-commit-response-evts) 
-                       (separate 
-                        committers
-                        (service-committer data peeker-evt))])
-           (when (and on-peek
-                      (not (null? not-ready-peekers)))
-             (parameterize ([current-eventspace eventspace])
-               (queue-callback on-peek)))
-           (set! peekers not-ready-peekers)
-           (set! committers potential-commits)
-           (set! response-evts 
-                 (append response-evts
-                         new-peek-response-evts
-                         new-commit-response-evts))
-           (sync
-            (handle-evt
-             position-chan
-             (λ (pr)
-               (let ([nack-chan (car pr)]
-                     [resp-chan (cdr pr)])
-                 (set! positioners (cons pr positioners))
-                 (loop))))
-            (apply choice-evt (map service-positioner positioners))
-            (handle-evt
-             read-chan
-             (λ (ent)
-               (set! data (at-enqueue ent data))
-               (unless position
-                 (set! position (cdr ent)))
-               (loop)))
-            (handle-evt
-             clear-input-chan
-             (λ (_)
-               (semaphore-post peeker-sema)
-               (set! peeker-sema (make-semaphore 0))
-               (set! peeker-evt (semaphore-peek-evt peeker-sema))
-               (set! data (empty-at-queue))
-               (set! position #f)
-               (loop)))
-            (handle-evt
-             progress-event-chan
-             (λ (return-pr)
-               (let ([return-chan (car return-pr)]
-                     [return-nack (cdr return-pr)])
-                 (set! response-evts
-                       (cons (choice-evt
-                              return-nack
-                              (channel-put-evt return-chan peeker-evt))
-                             response-evts))
-                 (loop))))
-            (handle-evt
-             peek-chan
-             (λ (peeker)
-               (set! peekers (cons peeker peekers))
-               (loop)))
-            (handle-evt
-             commit-chan
-             (λ (committer)
-               (set! committers (cons committer committers))
-               (loop)))
-            (apply 
-             choice-evt
-             (map
-              (λ (a-committer)
-                (match a-committer
-                  [(struct committer 
-                           (kr
-                            commit-peeker-evt
-                            done-evt
-                            resp-chan
-                            resp-nack))
-                   (choice-evt
-                    (handle-evt 
-                     commit-peeker-evt
-                     (λ (_)
-                       ;; this committer will be thrown out in next iteration
-                       (loop)))
-                    (handle-evt
-                     done-evt
-                     (λ (v)
-                       (let ([nth-pos (cdr (at-peek-n data (- kr 1)))])
-                         (set! position
-                               (list (car nth-pos)
-                                     (+ 1 (cadr nth-pos))
-                                     (+ 1 (caddr nth-pos)))))
-                       (set! data (at-dequeue-n data kr))
-                       (semaphore-post peeker-sema)
-                       (set! peeker-sema (make-semaphore 0))
-                       (set! peeker-evt (semaphore-peek-evt peeker-sema))
-                       (set! committers (remq a-committer committers))
-                       (set! response-evts
-                             (cons 
-                              (choice-evt
-                               resp-nack
-                               (channel-put-evt resp-chan #t))
-                              response-evts))
-                       (loop))))]))
-              committers))
-            (apply choice-evt 
-                   (map (λ (resp-evt)
-                          (handle-evt
-                           resp-evt
-                           (λ (_)
-                             (set! response-evts (remq resp-evt response-evts))
-                             (loop))))
-                        response-evts)))))
-       
-       ;; service-positioner : (cons (channel void) (channel line-col-pos)) -> evt
-       (define (service-positioner pr)
-         (let ([nack-evt (car pr)]
-               [resp-evt (cdr pr)])
-           (handle-evt
-            (choice-evt nack-evt 
-                        (channel-put-evt resp-evt (or position 
-                                                      
-                                                      ;; a bogus position for when 
-                                                      ;; nothing has happened yet.
-                                                      (list 1 0 1))))
-            (let ([sent-position position])
-              (λ (_)
-                (set! positioners (remq pr positioners))
-                (loop))))))
-       
-       ;; service-committer : queue evt -> committer -> (union #f evt)
-       ;; if the committer can be dumped, return an evt that
-       ;; does the dumping. otherwise, return #f
-       (define ((service-committer data peeker-evt) a-committer)
-         (match a-committer
-           [(struct committer
-                    (kr commit-peeker-evt
-                        done-evt resp-chan resp-nack))
-            (let ([size (at-queue-size data)])
-              (cond
-                [(not (eq? peeker-evt commit-peeker-evt))
-                 (choice-evt
-                  resp-nack
-                  (channel-put-evt resp-chan #f))]
-                [(< size kr)
-                 (choice-evt
-                  resp-nack
-                  (channel-put-evt resp-chan 'commit-failure))]
-                [else  ;; commit succeeds
-                 #f]))]))
-       
-       ;; service-waiter : peeker -> (union #f evt)
-       ;; if the peeker can be serviced, build an event to service it
-       ;; otherwise return #f
-       (define (service-waiter a-peeker)
-         (match a-peeker
-           [(struct peeker (bytes skip-count pe resp-chan nack-evt polling?))
-            (cond
-              [(and pe (not (eq? pe peeker-evt)))
-               (choice-evt (channel-put-evt resp-chan #f)
-                           nack-evt)]
-              [((at-queue-size data) . > . skip-count)
-               (let ([nth (car (at-peek-n data skip-count))])
-                 (choice-evt
-                  nack-evt
-                  (cond
-                    [(byte? nth)
-                     (bytes-set! bytes 0 nth)
-                     (channel-put-evt resp-chan 1)]
-                    [(eof-object? nth)
-                     (channel-put-evt resp-chan nth)]
-                    [else
-                     (channel-put-evt 
-                      resp-chan
-                      (λ (src line col pos)
-                        (if (is-a? nth readable-snip<%>)
-                            (send nth read-special src line col pos)
-                            nth)))])))]
-              [polling? 
-               (choice-evt
-                nack-evt
-                (channel-put-evt resp-chan 0))]
-              [else
-               #f])]))
-       
-       ;; separate (listof X) (X -> (union #f Y)) -> (values (listof X) (listof Y))
-       ;; separates `eles' into two lists -- those that `f' returns #f for
-       ;; and then the results of calling `f' for those where `f' doesn't return #f
-       (define (separate eles f)
-         (let loop ([eles eles]
-                    [transformed '()]
-                    [left-alone '()])
-           (cond
-             [(null? eles) (values left-alone transformed)]
-             [else (let* ([ele (car eles)]
-                          [maybe (f ele)])
-                     (if maybe
-                         (loop (cdr eles)
-                               (cons maybe transformed)
-                               left-alone)
-                         (loop (cdr eles)
-                               transformed
-                               (cons ele left-alone))))])))
-       
-       ;;; start things going
-       (loop))))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;;  the following must be able to run
-  ;;  in any thread (even concurrently)
-  ;;
-  (define (read-bytes-proc bstr)
-    (let* ([progress-evt (progress-evt-proc)]
-           [v (peek-proc bstr 0 progress-evt)])
-      (cond
-        [(sync/timeout 0 progress-evt)
-         0]
-        [else 
-         (wrap-evt 
-          v 
-          (λ (v) 
-            (if (and (number? v) (zero? v))
-                0
-                (if (commit-proc (if (number? v) v 1)
-                                 progress-evt
-                                 always-evt)
-                    v
-                    0))))])))
-  
-  (define (peek-proc bstr skip-count progress-evt)
-    (poll-guard-evt
-     (lambda (polling?)
-       (define evt 
-         (nack-guard-evt
-          (λ (nack)
-            (define chan (make-channel))
-            (channel-put peek-chan (make-peeker bstr skip-count progress-evt chan nack polling?))
-            chan)))
-       (if polling? 
-           (let ([v (sync evt)])
-             (if (eq? v 0)
-                 ;; Don't return 0, because that means something is
-                 ;; probably ready. We want to indicate that nothing is
-                 ;; ready.
-                 never-evt
-                 ;; Even on success, package it as an event, because
-                 ;; `read-bytes-proc' expects an event
-                 (wrap-evt always-evt (lambda (_) v))))
-           evt))))
-  
-  (define (progress-evt-proc)
-    (sync
-     (nack-guard-evt
-      (λ (nack)
-        (let ([chan (make-channel)])
-          (channel-put progress-event-chan (cons chan nack))
-          chan)))))
-  
-  (define (commit-proc kr progress-evt done-evt)
-    (sync
-     (nack-guard-evt
-      (λ (nack)
-        (let ([chan (make-channel)])
-          (channel-put commit-chan (make-committer kr progress-evt done-evt chan nack))
-          chan)))))
-  
-  (define (close-proc) (void))
-  
-  (define (position-proc)
-    (let ([chan (make-channel)])
-      (apply 
-       values
-       (sync
-        (nack-guard-evt
-         (λ (fail)
-           (channel-put position-chan (cons fail chan))
-           chan))))))
-  (let ([p (make-input-port source
-                            read-bytes-proc
-                            peek-proc
-                            close-proc
-                            progress-evt-proc
-                            commit-proc
-                            position-proc)])
-    (port-count-lines! p)
-    (values p read-chan clear-input-chan)))
-
-
-#| 
-=== AUTOCOMPLETE ===
-
-This module defines autocomplete-mixin, a mixin for editors that adds an
-unintrusive autocompletion menu when a keystroke is pressed.
-
-By default, the system works by reading the prefix whenever the autcomplete
-keystroke is pressed, and then constructing a list of possible completions
-by searching through the contents of the autocomplete-word-list parameter for all words
-that share that prefix; when the user types another character or deletes a
-character autocomplete-word-list is consulted again. This seems to be fast enough for
-all but very large completion lists. However, the code has been designed
-to allow more efficient implementations if that becomes necessary --- 
-all autocomplete-word-list manipulation functions are isolated to the autocompletion-cursor<%>
-interface, which implements two main methods, narrow and widen, to add or subtract
-a character from the current prefix, respectively. A trie-based implementation,
-for instance, could implement narrow and widen in constant-time at the cost of more
-memory and more time to build the initial data structure.
-
-===
-
-autocomplete<%>
-
-=new methods=
-
-get-all-words : -> (listof string)
-returns a list of all of the possible words that the completion should choose from
-
-get-autocomplete-border-color : -> color string
-returns the color for the border of the autocompletion menu
-
-get-autocomplete-background-color : -> color string
-returns the background color for the autocompletion menu
-
-get-autocomplete-selected-color : -> color string
-returns the selected color for the autocompletion menu
-
-===
-
-autocomplete-mixin: mixin (editor<%> -> editor<%>)
-
-The autocomplete-text mixin produces a class that implements
-editor<%> and provides the following extra public methods:
-
-=overridden methods=
-
-on-paint
-overridden to draw the autocompletion menu as necessary.
-
-on-char
-overridden to intercept keypress events to control the completions
-menu.
-
-====
-
-autocompletion-cursor<%>
-
-An autocompletion-cursor<%> abstracts over a set of completions 
-for a particular prefix. Typically an autocompletion-cursor<%>
-implementation will be created with a particular initial prefix; 
-from then on the autocomplete-text system will manipulate it
-using the narrow and widen methods in response to user input.
-
-The autocompletion-cursor<%> interface defines the following
-methods:
-
-get-completions : -> (listof string) 
-Produces a list of all possible completions.
-
-get-length      : -> int
-Produces the number of possible completions.
-
-empty?          : -> boolean
-Determines if there are any completions in the given cursor.
-
-narrow          : char -> autocompletion-cursor<%>
-Yields a new cursor that represents the subset of
-the completions held by this cursor that are also
-completions of this cursor's prefix followed by the
-given character.
-
-widen           : -> autocompletion-cursor<%> | #f
-Yields a new cursor that represents the completions
-of this cursor's prefix with the last character
-removed.
-
-===
-autocompletion-cursor%
-
-The implementation of autcompletion-cursor<%> used
-by the default get-completions method.
-
-===
-
-scrolling-cursor : mixin (autocompletion-cursor<%> -> scrolling-cursor<%>)
-
-scrolling-cursor is a mixin that takes classes that implement
-autocompletion-cursor<%> to classes that implement scrolling-cursor<%>
-(not provided).
-
-===
-configuration parameters
-
-These configuration parameters customize autocompletion behavior.
-
-autocomplete-append-after : string parameter
-designates text to insert after a completion. Default: ""
-
-autocomplete-limit : positive int parameter
-designates the maximum number of completions to show at a time. Default: 15
-
-completion-mode-key : character parameter
-designates the character that triggers autocompletion
-
-|#
-
-(define autocomplete<%>
-  (interface ((class->interface text%))
-    auto-complete
-    get-autocomplete-border-color
-    get-autocomplete-background-color
-    get-autocomplete-selected-color
-    completion-mode-key-event?
-    get-all-words
-    get-word-at))
-
-;; ============================================================
-;; auto-complete-text (mixin) implementation
-
-(define selected-color (make-object color% 204 153 255))
-
-(define autocomplete-mixin
-  (mixin ((class->interface text%)) (autocomplete<%>)
-    
-    (inherit invalidate-bitmap-cache get-dc get-start-position get-end-position
-             find-wordbreak get-text position-location insert dc-location-to-editor-location)
-    
-    ; get-autocomplete-border-color : -> string
-    ; the color of text in the autocomplete menu
-    (define/public (get-autocomplete-border-color) "black")
-    
-    ; get-background-color : -> string
-    ; background color in the autocomplete menu
-    (define/public (get-autocomplete-background-color) "lavender")
-    
-    ; get-autocomplete-selected-color : -> string
-    ; selected option background color in the autocomplete menu
-    (define/public (get-autocomplete-selected-color) selected-color)
-    
-    (define/public (completion-mode-key-event? key-event)
-      (cond
-        [(and (eq? (send key-event get-key-code) #\.)
-              (send key-event get-control-down))
-         (or (eq? (system-type) 'macosx)
-             (not (preferences:get 'framework:menu-bindings)))]
-        [else
-         #f]))
-    
-    (define/public (get-all-words) (get-completions/manuals #f))
-    
-    (define completions-box #f) ; completions-box% or #f if no completions box is active right now
-    (define word-start-pos #f)  ; start pos of that word, or #f if no autocompletion
-    (define word-end-pos #f)    ; end pos of that word, or #f if none
-    
-    ; string -> scrolling-cursor<%>       given a prefix, returns the possible completions
-    ; given a word, produces a cursor that describes
-    ; all possible completions. The default implementation of autocompletion-cursor%
-    ; returns all strings from the get-all-words method (below)
-    ; that have the given string as a prefix; it performs a 
-    ; linear-search at every narrow/widen.
-    (define/private (get-completions word) 
-      (new autocompletion-cursor% 
-           [word word] 
-           [all-words (get-all-words)]))
-    
-    (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-      (super on-paint before? dc left top right bottom dx dy draw-caret)
-      (when (and completions-box (not before?))
-        (send completions-box draw dc dx dy)))
-    
-    ;; (-> void)
-    ;; Check for possible completions of the current word and give the user a menu for them.
-    (define/public-final (auto-complete)
-      (when (equal? (get-start-position) (get-end-position))
-        (let* ([end-pos (get-end-position)]
-               [word (get-word-at end-pos)]
-               [completion-cursor (get-completions word)])
-          (let ([start-pos (- end-pos (string-length word))])
-            (set! word-start-pos start-pos)
-            (set! word-end-pos end-pos)
-            (show-options word start-pos end-pos completion-cursor)))))
-    
-    ;; Number -> String
-    ;; The word that ends at the current position of the editor
-    (define/public (get-word-at current-pos)
-      (let ([start-pos (box current-pos)]) 
-        (find-wordbreak start-pos #f 'caret)
-        (get-text (unbox start-pos) current-pos)))
-    
-    ;; String Number Number scrolling-cursor<%> -> void
-    ;; Popup a menu of the given words at the location of the end-pos. Each menu item
-    ;; should change the current word to the word in the list.
-    (define/private (show-options word start-pos end-pos cursor)
-      (let ([x (box 0)]
-            [yb (box 0)]
-            [yt (box 0)])
-        (position-location start-pos x yb #f)
-        (position-location start-pos #f yt #t)
-        (set! completions-box (new completion-box%
-                                   [completions (new scroll-manager% [cursor cursor])]
-                                   [line-x (unbox x)]
-                                   [line-y-above (unbox yt)]
-                                   [line-y-below (unbox yb)]
-                                   [editor this]))
-        (send completions-box redraw)))
-    
-    (define/augment (after-set-position)
-      (when completions-box
-        (destroy-completions-box)
-        (auto-complete))
-      (inner (void) after-set-position))
-    
-    ;; on-char must handle inputs for two modes: normal text mode and in-the-middle-of-autocompleting
-    ;; mode perhaps it would be better to handle this using the state machine pattern
-    (define/override (on-char key-event)
-      (cond
-        [completions-box
-         (let ([code (send key-event get-key-code)]
-               [full? (not (send completions-box empty?))])
-           (cond
-             [(and full? (memq code '(up wheel-up)))
-              (send completions-box prev-item)]
-             [(and full? 
-                   (or (memq code '(down wheel-down))
-                       (completion-mode-key-event? key-event)))
-              (send completions-box next-item)]
-             [(and full? (eq? code 'prior)) (send completions-box scroll-display-up)]
-             [(and full? (eq? code 'next))  (send completions-box scroll-display-down)]
-             [(eq? code 'release)
-              (void)]
-             [(eq? code #\backspace)
-              (widen-possible-completions)
-              (super on-char key-event)]
-             [(eq? code #\return)
-              (when full?
-                (insert-currently-selected-string))
-              (destroy-completions-box)]
-             [(and (char? code) (char-graphic? code))
-              (super on-char key-event)
-              (constrict-possible-completions code)]
-             [else
-              (destroy-completions-box)
-              (super on-char key-event)]))]
-        [(completion-mode-key-event? key-event)
-         (auto-complete)]
-        [else 
-         (super on-char key-event)]))
-    
-    ;; on-event controls what happens with the mouse
-    (define/override (on-event mouse-event)
-      (cond
-        [completions-box
-         (let*-values ([(x) (send mouse-event get-x)]
-                       [(y) (send mouse-event get-y)]
-                       [(mouse-x mouse-y) (dc-location-to-editor-location x y)])
-           (if (and (send completions-box point-inside-menu? mouse-x mouse-y)
-                    (not (send completions-box empty?)))
-               (cond
-                 [(send mouse-event moving?)
-                  (send completions-box handle-mouse-movement mouse-x mouse-y)
-                  (super on-event mouse-event)]
-                 [(send mouse-event button-down?)
-                  (insert-currently-selected-string)
-                  (destroy-completions-box)]
-                 [else
-                  (super on-event mouse-event)])
-               (super on-event mouse-event)))]
-        [else (super on-event mouse-event)]))
-    
-    (define/private (constrict-possible-completions char)
-      (set! word-end-pos (add1 word-end-pos))
-      (let-values ([(x0 y0 x1 y1) (send completions-box get-menu-coordinates)])
-        (send completions-box narrow char)
-        (let-values ([(_ __ x1p y1p) (send completions-box get-menu-coordinates)])
-          (invalidate-bitmap-cache x0 y0 (max x1 x1p) (max y1 y1p)))))
-    
-    (define/private (widen-possible-completions)
-      (let-values ([(x0 y0 x1 y1) (send completions-box get-menu-coordinates)])
-        (let ([reasonable? (send completions-box widen)])
-          (cond
-            [reasonable?
-             (let-values ([(_ __ x1p y1p) (send completions-box get-menu-coordinates)])
-               (invalidate-bitmap-cache x0 y0 (max x1 x1p) (max y1 y1p)))]
-            [else
-             (set! completions-box #f)
-             (invalidate-bitmap-cache x0 y0 x1 y1)]))))
-    
-    ;; destroy-completions-box : -> void
-    ;; eliminates the active completions box
-    (define/private (destroy-completions-box)
-      (let-values ([(x0 y0 x1 y1) (send completions-box get-menu-coordinates)])
-        (set! completions-box #f)
-        (invalidate-bitmap-cache x0 y0 x1 y1)))
-    
-    ;; insert-currently-selected-string : -> void
-    ;; inserts the string that is currently being autoselected
-    (define/private (insert-currently-selected-string)
-      (let ([css (send completions-box get-current-selection)])
-        (insert (string-append css (autocomplete-append-after)) word-start-pos word-end-pos)))
-    
-    (super-new)))
-
-(define scrolling-cursor<%>
-  (interface (autocompletion-cursor<%>)
-    items-are-hidden?
-    get-visible-completions
-    get-visible-length
-    scroll-down
-    scroll-up))
-
-(define scroll-manager% 
-  (class* object% ()
-    (init-field cursor)
-    
-    (define all-completions #f)
-    (define all-completions-length #f)
-    (define visible-completions #f)
-    (define visible-completions-length #f)
-    (define hidden? #f)
-    
-    (define/private (initialize-state!)
-      (cond
-        [(<= (send cursor get-length) (autocomplete-limit))
-         (set! hidden? #f)
-         (set! all-completions (send cursor get-completions))
-         (set! all-completions-length (send cursor get-length))
-         (set! visible-completions all-completions)
-         (set! visible-completions-length all-completions-length)]
-        [else
-         (set! hidden? #t)
-         (set! all-completions (send cursor get-completions))
-         (set! all-completions-length (send cursor get-length))
-         (set! visible-completions (take (send cursor get-completions) (autocomplete-limit)))
-         (set! visible-completions-length (autocomplete-limit))]))
-    
-    (define/public (get-completions) all-completions)
-    (define/public (get-length) all-completions-length)
-    (define/public (empty?) (send cursor empty?))
-    
-    (define/public (get-visible-length) visible-completions-length)
-    (define/public (get-visible-completions) visible-completions)
-    
-    (define/public (items-are-hidden?) hidden?)
-    
-    (define/public (scroll-down)
-      (when hidden?
-        (set! all-completions (append (drop all-completions (autocomplete-limit))
-                                      visible-completions))
-        (set! visible-completions (take all-completions (autocomplete-limit)))))
-    
-    (define/public (scroll-up)
-      (when hidden?
-        (let ([n (- all-completions-length (autocomplete-limit))])
-          (set! all-completions (append (drop all-completions n) (take all-completions n)))
-          (set! visible-completions (take all-completions (autocomplete-limit))))))
-    
-    (define/public (narrow char)
-      (let ([new-cursor (send cursor narrow char)])
-        (set! cursor new-cursor)
-        (initialize-state!)))
-    
-    (define/public (widen)
-      (let ([new-cursor (send cursor widen)])
-        (cond
-          [new-cursor
-           (set! cursor new-cursor)
-           (initialize-state!)
-           #t]
-          [else #f])))
-    
-    (initialize-state!)
-    (super-new)))
-
-;; ============================================================
-;; completion-box<%> implementation
-
-(define menu-padding-x 4)
-(define menu-padding-y 0)
-
-(define completion-box<%>
-  (interface ()
-    draw                   ; dc<%> int int -> void
-    redraw                 ; -> void
-    get-menu-coordinates   ; -> (values int int int int)
-    next-item              ; -> void
-    prev-item              ; -> void
-    scroll-display-up      ; -> void
-    scroll-display-down    ; -> void
-    get-current-selection  ; -> string
-    narrow                 ; char -> boolean
-    widen                  ;      -> boolean
-    empty?))               ; -> boolean
-
-
-(define hidden-completions-text "⋮")
-(define-struct geometry (menu-x
-                         menu-y
-                         menu-width
-                         menu-height
-                         mouse->menu-item-vector))
-
-(define completion-box% 
-  (class* object% (completion-box<%>)
-    
-    (init-field completions       ; scroll-manager%      
-                ;                   the possible completions (all of which have base-word as a prefix)
-                line-x            ; int                  
-                ;                   the x coordinate of the line where the menu goes
-                line-y-above      ; int                   
-                ;                   the y coordinate of the top of the line where the menu goes
-                line-y-below      ; int                  
-                ;                   the y coordinate of the bottom of the line where the menu goes
-                editor            ; editor<%>             
-                ;                   the owner of this completion box
-                )
-    
-    (define/public (empty?) (send completions empty?))
-    
-    (define/private (compute-geometry)
-      
-      (define vec #f)
-      (define (initialize-mouse-offset-map! coord-map)
-        (cond
-          [(null? coord-map) (void)] ; is this possible?
-          [else
-           (let* ([last-index (cadr (car coord-map))]
-                  [v (make-vector (add1 last-index))])
-             (for-each
-              (λ (elt)
-                (let ([first (car elt)]
-                      [last  (cadr elt)]
-                      [val   (caddr elt)])
-                  (let loop ([n first])
-                    (when (<= n last)
-                      (vector-set! v n val)
-                      (loop (add1 n))))))
-              coord-map)
-             (set! vec v))]))
-      
-      (define-values (editor-width editor-height)
-        (let* ([wb (box 0)]
-               [hb (box 0)]
-               [admin (send editor get-admin)])
-          (if admin
-              (begin
-                (send admin get-view #f #f wb hb)
-                (values (unbox wb)
-                        (unbox hb)))
-              (values 10 10))))
-      
-      (let* ([num-completions (send completions get-length)]
-             [shown-completions (send completions get-visible-completions)])
-        (define-values (w h)
-          (let ([dc (send editor get-dc)])
-            (cond
-              [(zero? num-completions)
-               (let-values ([(tw th _1 _2) (send dc get-text-extent (string-constant no-completions) 
-                                                 (get-mt-font))])
-                 (values (+ menu-padding-x tw menu-padding-x)
-                         (+ menu-padding-y th menu-padding-y)))]
-              [else
-               (let loop ([pc shown-completions]
-                          [w 0]
-                          [h 0]
-                          [coord-map '()]
-                          [n 0])
-                 (cond
-                   [(null? pc)
-                    (let-values ([(hidden?) (send completions items-are-hidden?)] 
-                                 [(tw th _1 _2) (send dc get-text-extent
-                                                      hidden-completions-text
-                                                      (get-reg-font))])
-                      (let ([w (if hidden? (max tw w) w)]
-                            [h (if hidden? (+ th h) h)])
-                        (initialize-mouse-offset-map! coord-map)
-                        (let ([offset-h menu-padding-y]
-                              [offset-w (* menu-padding-x 2)])
-                          (values (+ offset-w w)
-                                  (+ offset-h h)))))]
-                   [else 
-                    (let ([c (car pc)])
-                      (let-values ([(tw th _1 _2) (send dc get-text-extent c (get-reg-font))])
-                        (loop (cdr pc)
-                              (max tw w)
-                              (+ th h)
-                              (cons (list (inexact->exact h) (inexact->exact (+ h th)) n) coord-map)
-                              (add1 n))))]))])))
-        
-        (let ([final-x (cond
-                         [(< (+ line-x w) editor-width)
-                          line-x]
-                         [(> editor-width w)
-                          (- editor-width w)]
-                         [else line-x])]
-              [final-y (cond
-                         [(< (+ line-y-below 2 h) editor-height)
-                          (+ line-y-below 2)]
-                         [(> (- line-y-above h) 0)
-                          (- line-y-above h)]
-                         [else
-                          (+ line-y-below 2)])])
-          
-          (make-geometry final-x final-y w h vec))))
-    
-    ;; geometry records the menu's current width and height and
-    ;; a vector associating mouse location with a selected item
-    (define geometry (compute-geometry))
-    
-    (define highlighted-menu-item 0) ; the currently-highlighted menu item
-    
-    ;; draw : dc<%> int int -> void
-    ;; draws the menu to the given drawing context at offset dx, dy
-    (define/public (draw dc dx dy)
-      (let ([old-pen (send dc get-pen)]
-            [old-brush (send dc get-brush)]
-            [font (send dc get-font)])
-        (define-values (mx my tw th) (get-menu-coordinates))
-        (send dc set-pen (send editor get-autocomplete-border-color) 1 'solid)
-        (send dc set-brush (send editor get-autocomplete-background-color) 'solid)
-        (send dc draw-rectangle (+ mx dx) (+ my dy) tw th)
-        
-        (cond
-          [(send completions empty?)
-           (let ([font (send dc get-font)])
-             (send dc set-font (get-mt-font))
-             (send dc draw-text 
-                   (string-constant no-completions) 
-                   (+ mx dx menu-padding-x)
-                   (+ menu-padding-y my dy))
-             (send dc set-font font))]
-          [else
-           (send dc set-font (get-reg-font))
-           (let loop ([item-number 0] [y my] [pc (send completions get-visible-completions)])
-             (cond
-               [(null? pc) 
-                (when (send completions items-are-hidden?)
-                  (let-values ([(hw _1 _2 _3) (send dc get-text-extent hidden-completions-text)])
-                    (send dc draw-text 
-                          hidden-completions-text 
-                          (+ mx dx (- (/ tw 2) (/ hw 2)))
-                          (+ menu-padding-y y dy))))]
-               [else
-                (let ([c (car pc)])
-                  (let-values ([(w h d a) (send dc get-text-extent c)])
-                    (when (= item-number highlighted-menu-item)
-                      (send dc set-pen "black" 1 'transparent)
-                      (send dc set-brush (send editor get-autocomplete-selected-color) 'solid)
-                      (send dc draw-rectangle (+ mx dx 1) (+ dy y menu-padding-y 1) (- tw 2) (- h 1)))
-                    (send dc draw-text c (+ mx dx menu-padding-x) (+ menu-padding-y y dy))
-                    (loop (add1 item-number) (+ y h) (cdr pc))))]))])
-        (send dc set-pen old-pen)
-        (send dc set-brush old-brush)
-        (send dc set-font font)))
-    
-    (define/private (get-mt-font)
-      (send the-font-list find-or-create-font
-            (editor:get-current-preferred-font-size)
-            'default
-            'italic
-            'normal))
-    
-    (define/private (get-reg-font)
-      (send the-font-list find-or-create-font
-            (editor:get-current-preferred-font-size)
-            'default
-            'normal
-            'normal))
-    
-    ;; redraw : -> void
-    ;; tells the parent to refresh enough of itself to redraw this menu
-    (define/public (redraw)
-      (let-values ([(x y w h) (get-menu-coordinates)])
-        (send editor invalidate-bitmap-cache x y w h)))
-    
-    ;; get-menu-coordinates : -> (values int int int int)
-    ;; get the menu's x, y, w, h coordinates with respect to its parent
-    (define/public (get-menu-coordinates)
-      (values (geometry-menu-x geometry)
-              (geometry-menu-y geometry)
-              (geometry-menu-width geometry)
-              (geometry-menu-height geometry)))
-    
-    ;; next-item : -> void
-    ;; tells the menu that the next item is selected
-    (define/public (next-item)
-      (cond
-        [(and (= highlighted-menu-item (sub1 (autocomplete-limit)))
-              (send completions items-are-hidden?))
-         (set! highlighted-menu-item 0)
-         (scroll-display-down)]
-        [else
-         (set! highlighted-menu-item (modulo (add1 highlighted-menu-item)
-                                             (send completions get-visible-length)))
-         (redraw)]))
-    
-    ;; prev-item : -> void
-    ;; tells the menu that the previous item is selected
-    (define/public (prev-item)
-      (cond
-        [(and (= highlighted-menu-item 0)
-              (send completions items-are-hidden?))
-         (set! highlighted-menu-item
-               (sub1 (send completions get-visible-length)))
-         (scroll-display-up)]
-        [else
-         (set! highlighted-menu-item (modulo (sub1 highlighted-menu-item)
-                                             (send completions get-visible-length)))
-         (redraw)]))
-    
-    ;; scroll-display-down : -> void
-    ;; shows the next page possible completions
-    (define/private (scroll-display do-it!)
-      (let*-values ([(old-x1 old-y1 old-w old-h) (get-menu-coordinates)]
-                    [(_) (do-it!)]
-                    [(_) (set! geometry (compute-geometry))]
-                    [(new-x1 new-y1 new-w new-h) (get-menu-coordinates)])
-        (let ([old-x2 (+ old-x1 old-w)]
-              [old-y2 (+ old-y1 old-h)]
-              [new-x2 (+ new-x1 new-w)]
-              [new-y2 (+ new-y1 new-h)])
-          (let ([composite-x1 (min old-x1 new-x1)]
-                [composite-y1 (min old-y1 new-y1)]
-                [composite-x2 (max old-x2 new-x2)]
-                [composite-y2 (max old-y2 new-y2)])
-            (send editor invalidate-bitmap-cache 
-                  composite-x1
-                  composite-y1
-                  (- composite-x2 composite-x1)
-                  (- composite-y2 composite-y1))))))
-    
-    (define/public (scroll-display-down)
-      (scroll-display (λ () (send completions scroll-down))))
-    
-    (define/public (scroll-display-up)
-      (scroll-display (λ () (send completions scroll-up))))
-    
-    ;; point-inside-menu? : nat nat -> boolean
-    ;; determines if the given x,y editor coordinate is inside
-    ;; the drawn window or not
-    (define/public (point-inside-menu? x y)
-      (let*-values ([(mx my w h) (get-menu-coordinates)])
-        (and (<= mx x (+ mx w))
-             (<= my y (+ my h)))))
-    
-    ;; handle-mouse-movement : int int -> bool
-    ;; takes an editor coordinate, returns whether it has intercept
-    (define/public (handle-mouse-movement x y)
-      (define-values (mx my w h) (get-menu-coordinates))
-      (define index (floor (inexact->exact (- y my))))
-      (when (and (<= mx x (+ mx w))
-                 (< menu-padding-y
-                    index
-                    (vector-length (geometry-mouse->menu-item-vector geometry))))
-        (set! highlighted-menu-item (vector-ref (geometry-mouse->menu-item-vector geometry)
-                                                index))
-        (redraw)))
-    
-    ;; get-current-selection : -> string
-    ;; returns the selected string
-    (define/public (get-current-selection)
-      (list-ref (send completions get-visible-completions) highlighted-menu-item))
-    
-    ;; narrow : char -> boolean
-    ;; narrows the given selection given a new character (faster than recomputing the whole thing)
-    (define/public (narrow char)
-      (send completions narrow char)
-      (set! highlighted-menu-item 0)
-      (set! geometry (compute-geometry))
-      (not (send completions empty?)))
-    
-    ;; widen : -> boolean
-    ;; attempts widens the selection by eliminating the last character from the word.
-    ;; returns #f if that cannot be done (because there are no characters left); #t otherwise
-    (define/public (widen)
-      (let ([successfully-widened? (send completions widen)])
-        (cond
-          [successfully-widened?
-           (set! highlighted-menu-item 0)
-           (set! geometry (compute-geometry))
-           #t]
-          [else #f])))
-    
-    (super-new)))
-
-;; ============================================================
-;; configuration parameters
-
-(define (make-guarded-parameter name description default okay?)
-  (make-parameter
-   default
-   (λ (v)
-     (cond
-       [(okay? v) v]
-       [else
-        (raise (make-exn:fail:contract
-                (string->immutable-string
-                 (format "parameter ~a: expected ~a, given: ~e" name description v))
-                (current-continuation-marks)))]))))
-
-(define autocomplete-append-after
-  (make-guarded-parameter 'append-after "string" "" string?))
-(define autocomplete-limit
-  (make-guarded-parameter 'limit "positive integer" 15 (λ (x) (and (integer? x) (> x 0)))))
-
-;; ============================================================
-;; read keywords from manuals
-
-(define xref #f)
-
-(define (get-completions/manuals manuals)
-  (let* ([sym->mpi (λ (mp) (module-path-index-resolve (module-path-index-join mp #f)))]
-         [manual-mpis (and manuals (map sym->mpi manuals))])
-    
-    (unless xref
-      (let ([load-collections-xref
-             ;; Make the dependency on `setup/xref' indirect, so that a
-             ;; GUI does not depend on having documentation installed:
-             (with-handlers ([exn:missing-module? (lambda (exn)
-                                                         (lambda ()
-                                                           (load-xref null)))])
-               (dynamic-require 'setup/xref 'load-collections-xref))])
-        (set! xref (load-collections-xref))))
-    
-    (let ([ht (make-hash)])
-      (for-each
-       (λ (entry)
-         (let ([desc (entry-desc entry)])
-           (when (exported-index-desc? desc)
-             (let ([name (exported-index-desc-name desc)])
-               (when name
-                 (when (or (not manual-mpis)
-                           (ormap (λ (from-lib) (memq from-lib manual-mpis))
-                                  (map sym->mpi (exported-index-desc-from-libs desc))))
-                   (hash-set! ht (symbol->string name) #t)))))))
-       (xref-index xref))
-      (sort (hash-map ht (λ (x y) x)) string<?))))
-
-;; ============================================================
-;; auto complete example code
-
-#;
-(begin
-  (define all-words (get-completions/manuals #f))
-  
-  (let* ([f (new frame% (label "Test") (height 400) (width 400))]
-         [e (new (autocomplete-mixin text%))]
-         [c (new editor-canvas% (editor e) (parent f))])
-    (send c focus)
-    (send e insert "\n\n     get")
-    (send e set-position (send e last-position) (send e last-position))
-    (send f show #t)))
-
-;; ============================================================
-;; line number text%
-
-(define line-numbers<%>
-  (interface ()
-             show-line-numbers!
-             showing-line-numbers?
-             set-line-numbers-color))
-
-(define-local-member-name do-draw-single-line draw-separator)
-
-;; draws line numbers on the left hand side of a text% object
-(define line-numbers-mixin
-  (mixin ((class->interface text%) editor:standard-style-list<%>) (line-numbers<%>)
-    (inherit begin-edit-sequence
-             end-edit-sequence
-             in-edit-sequence?
-             get-visible-line-range
-             get-visible-position-range
-             last-line
-             line-location
-             line-paragraph
-             line-start-position
-             line-end-position
-             get-view-size
-             set-padding
-             get-padding
-             get-start-position
-             get-end-position
-             position-paragraph
-             position-line
-             position-location
-             paragraph-start-position
-             invalidate-bitmap-cache
-             get-dc)
-
-    (init-field [line-numbers-color #f])
-    (init-field [show-line-numbers? #t])
-    ;; whether the numbers are aligned on the left or right
-    ;; only two values should be 'left or 'right
-    (init-field [alignment 'right])
-
-    (define need-to-setup-padding? #f)
-    
-    (define/private (number-space)
-      (number->string (max (* 10 (add1 (last-line))) 100)))
-    ;; add an extra 0 so it looks nice
-    (define/private (number-space+1) (string-append (number-space) "0"))
-
-    (define/private (setup-padding)
-      (cond
-        [(showing-line-numbers?)
-         (send padding-dc set-font (get-style-font))
-         (define-values (padding-left padding-top padding-right padding-bottom) (get-padding))
-         (define new-padding (text-width padding-dc (number-space+1)))
-         (set-padding new-padding 0 0 0)
-         (unless (= padding-left new-padding)
-           (invalidate-bitmap-cache))]
-        [else 
-         (set-padding 0 0 0 0)]))
-    
-    ;; call this method with #t or #f to turn on/off line numbers
-    (define/public (show-line-numbers! what)
-      (set! show-line-numbers? what)
-      (setup-padding))
-
-    (define/public (showing-line-numbers?)
-      show-line-numbers?)
-
-    (define/public (set-line-numbers-color color)
-      (set! line-numbers-color color))
-
-    (define notify-registered-in-list #f)
-
-    (define style-change-notify
-      (lambda (style) (unless style (setup-padding))))
-
-    (define/private (get-style)
-      (let* ([style-list (editor:get-standard-style-list)]
-             [std (or (send style-list
-                            find-named-style
-                            (editor:get-default-color-style-name))
-                      (send style-list find-named-style "Standard")
-                      (send style-list basic-style))])
-        ;; If the style changes, we should re-check the width of
-        ;; drawn line numbers:
-        (unless (eq? notify-registered-in-list style-list)
-          ;; `notify-on-change' holds the given function weakly:
-          (send style-list notify-on-change style-change-notify)
-          ;; Avoid registering multiple notifications:
-          (set! notify-registered-in-list style-list))
-        std))
-
-    (define/private (get-style-foreground)
-      (send (get-style) get-foreground))
-
-    (define/private (get-style-font)
-      (send (get-style) get-font))
-
-    (define/private (save-dc-state dc)
-      (saved-dc-state (send dc get-smoothing)
-                      (send dc get-pen)
-                      (send dc get-brush)
-                      (send dc get-font)
-                      (send dc get-text-foreground)))
-
-    (define/private (restore-dc-state dc dc-state)
-      (send dc set-smoothing (saved-dc-state-smoothing dc-state))
-      (send dc set-pen (saved-dc-state-pen dc-state))
-      (send dc set-brush (saved-dc-state-brush dc-state))
-      (send dc set-font (saved-dc-state-font dc-state))
-      (send dc set-text-foreground (saved-dc-state-foreground-color dc-state)))
-
-    (define/private (get-foreground)
-      (if line-numbers-color
-        (make-object color% line-numbers-color)
-        (get-style-foreground)))
-        
-    ;; set the dc stuff to values we want
-    (define/private (setup-dc dc)
-      (send dc set-smoothing 'aligned)
-      (send dc set-font (get-style-font))
-      (send dc set-text-foreground (get-foreground)))
-
-    (define/private (lighter-color color)
-      (define (integer number)
-        (inexact->exact (round number)))
-      ;; hue 0-360
-      ;; saturation 0-1
-      ;; lightness 0-1
-      ;; returns rgb as float values with ranges 0-1
-      (define (hsl->rgb hue saturation lightness)
-        (define (helper x a b)
-          (define x* (cond
-                       [(< x 0) (+ x 1)]
-                       [(> x 1) (- x 1)]
-                       [else x]))
-          (cond
-            [(< (* x 6) 1) (+ b (* 6 (- a b) x))]
-            [(< (* x 6) 3) a]
-            [(< (* x 6) 4) (+ b (* (- a b) (- 4 (* 6 x))))]
-            [else b]))
-
-        (define h (/ hue 360))
-        (define a (if (< lightness 0.5)
-                    (+ lightness (* lightness saturation))
-                    (- (+ lightness saturation) (* lightness saturation))))
-        (define b (- (* lightness 2) a))
-        (define red (helper (+ h (/ 1.0 3)) a b))
-        (define green (helper h a b))
-        (define blue (helper (- h (/ 1.0 3)) a b))
-        (values red green blue))
-        
-      ;; red 0-255
-      ;; green 0-255
-      ;; blue 0-255
-      (define (rgb->hsl red green blue)
-        (define-values (a b c d)
-                       (if (> red green)
-                         (if (> red blue)
-                           (if (> green blue)
-                             (values red (- green blue) blue 0)
-                             (values red (- green blue) green 0))
-                           (values blue (- red green) green 4))
-                         (if (> red blue)
-                           (values green (- blue red) blue 2)
-                           (if (> green blue)
-                             (values green (- blue red) red 2)
-                             (values blue (- red green) red 4)))))
-        (define hue (if (= a c) 0
-                      (let ([x (* 60 (+ d (/ b (- a c))))])
-                        (if (< x 0) (+ x 360) x))))
-        (define saturation (cond
-                             [(= a c) 0]
-                             [(< (+ a c) 1) (/ (- a c) (+ a c))]
-                             [else (/ (- a c) (- 2 a c))]))
-        (define lightness (/ (+ a c) 2))
-        (values hue saturation lightness))
-      (define-values (hue saturation lightness)
-                     (rgb->hsl (send color red)
-                               (send color green)
-                               (send color blue)))
-      (define-values (red green blue)
-                     (hsl->rgb hue saturation (+ 0.5 lightness)))
-      (make-object color% (min 255 (integer (* 255 red)))
-                          (min 255 (integer (* 255 green)))
-                          (min 255 (integer (* 255 blue)))))
-
-    ;; adjust space so that we are always at the left-most position where
-    ;; drawing looks right
-    (define/private (left-space dc dx)
-      (define left (box 0))
-      (define top (box 0))
-      (define width (box 0))
-      (define height (box 0))
-      (send (send this get-admin) get-view left top width height)
-      (+ (unbox left) dx))
-
-    (define/augment (after-insert start length)
-      (inner (void) after-insert start length)
-      ; in case the max line number changed:
-      (if (in-edit-sequence?)
-          (set! need-to-setup-padding? #t)
-          (setup-padding)))
-
-    (define/augment (after-delete start length)
-      (inner (void) after-delete start length)
-      ; in case the max line number changed:
-      (if (in-edit-sequence?)
-          (set! need-to-setup-padding? #t)
-          (setup-padding)))
-
-    (define/augment (after-edit-sequence)
-      (when need-to-setup-padding?
-        (set! need-to-setup-padding? #f)
-        (setup-padding))
-      (inner (void) after-edit-sequence))
-    
-    (define/private (draw-numbers dc left top right bottom dx dy start-line end-line)
-      (unless (left . > . (line-x-coordinate dc dx))
-        (define last-paragraph #f)
-        (define insertion-para
-          (let ([sp (get-start-position)])
-            (if (= sp (get-end-position))
-                (position-paragraph sp)
-                #f)))
-        (for ([line (in-range start-line end-line)])
-          (define y (line-location line))
-          (define yb (line-location line #f))
-          (define this-paragraph (line-paragraph line))
-          (when (and (y . <= . bottom) (yb . >= . top))
-            (do-draw-single-line dc dx dy line y last-paragraph 
-                                 (and insertion-para
-                                      (= insertion-para this-paragraph))))
-          (set! last-paragraph this-paragraph))))
-    
-    (define/public (do-draw-single-line dc dx dy line y last-paragraph is-insertion-line?)
-      (define single-space (text-width dc "0"))
-      (define-values (single-w single-h _1 _2) (send dc get-text-extent "0"))
-      (define view (number->string (add1 (line-paragraph line))))
-      (define ls (left-space dc dx))
-      (define right-space (text-width dc (number-space)))
-      (define final-x
-        (+ ls
-           (case alignment
-             [(left) 0]
-             [(right) (- right-space (text-width dc view) single-space)]
-             [else 0])))
-      (define final-y (+ dy y))
-      (cond
-        [is-insertion-line?
-         (send dc set-pen "black" 1 'transparent)
-         (send dc set-brush 
-               (if (get-highlight-text-color)
-                   (get-highlight-background-color)
-                   (if (preferences:get 'framework:white-on-black?)
-                       "lime"
-                       "forestgreen"))               
-               'solid)
-         
-         (send dc draw-rectangle ls final-y (- right-space single-w) single-h)
-         (send dc draw-arc 
-               (- (+ ls (- right-space single-w)) single-w) final-y
-               (* 2 single-w) single-h
-               (* pi 3/2) (* pi 1/2))
-         
-         (define text-fg (send dc get-text-foreground))
-         (send dc set-text-foreground (if (get-highlight-text-color)
-                                          (send dc get-text-foreground)
-                                          (if (preferences:get 'framework:white-on-black?)
-                                              "black"
-                                              "white")))
-         (send dc draw-text view final-x final-y)
-         (send dc set-text-foreground text-fg)]
-        [(and last-paragraph (= last-paragraph (line-paragraph line)))
-         (send dc set-text-foreground (lighter-color (send dc get-text-foreground)))
-         (send dc draw-text view final-x final-y)
-         (send dc set-text-foreground (get-foreground))]
-        [else
-         (send dc draw-text view final-x final-y)]))
-
-    ;; draw the line between the line numbers and the actual text
-    (define/public (draw-separator dc top bottom dx dy)
-      (define line-x (line-x-coordinate dc dx))
-      (define line-y1 (+ dy top))
-      (define line-y2 (+ dy bottom))
-      (send dc set-pen (get-foreground) 1 'solid)
-      (send dc draw-line line-x line-y1
-                         line-x line-y2))
-    
-    (define/private (line-x-coordinate dc dx)
-      (define x (text-width dc (number-space)))
-      (+ (left-space dc dx) x))
-
-    ;; `line-numbers-space' will get mutated in the `on-paint' method
-    ;; (define line-numbers-space 0)
-
-    (define/private (draw-line-numbers dc left top right bottom dx dy)
-      (define saved-dc (save-dc-state dc))
-      (setup-dc dc)
-      (define start-line (box 0))
-      (define end-line (box 0))
-      (get-visible-line-range start-line end-line #f)
-
-      (draw-numbers dc left top right bottom dx dy (unbox start-line) (add1 (unbox end-line)))
-      (draw-separator dc top bottom dx dy)
-      (restore-dc-state dc saved-dc))
-
-    (define/private (text-width dc stuff)
-      (define-values (font-width font-height baseline space)
-                     (send dc get-text-extent stuff))
-      font-width)
-
-    (define/private (text-height dc stuff)
-      (define-values (font-width height baseline space)
-                     (send dc get-text-extent stuff))
-      height)
-
-    (define old-clipping #f)
-    (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-      (when show-line-numbers?
-        (cond
-          [before?
-           (define left-most (left-space dc dx))
-           (set! old-clipping (send dc get-clipping-region))
-           (define saved-dc (save-dc-state dc))
-           (setup-dc dc)
-           (define clipped (make-object region% dc))
-           (define copy (make-object region% dc))
-           (if old-clipping
-               (send copy union old-clipping)
-               (let ([all (make-object region% dc)])
-                 (send all set-rectangle
-                       (+ dx left) (+ dy top)
-                       (- right left) (- bottom top))
-                 (send copy union all)))
-           (send clipped set-rectangle
-                 0 (+ dy top)
-                 (text-width dc (number-space+1))
-                 (- bottom top))
-           (restore-dc-state dc saved-dc)
-           (send copy subtract clipped)
-           (send dc set-clipping-region copy)]
-          [else
-           (send dc set-clipping-region old-clipping)
-           (draw-line-numbers dc left top right bottom dx dy)]))
-      (super on-paint before? dc left top right bottom dx dy draw-caret))
-
-    (define old-position #f)
-    (define/augment (after-set-position)
-      (cond
-        [(and old-position
-              (= (get-start-position)
-                 (get-end-position))
-              (= (position-line old-position)
-                 (position-line (get-start-position))))
-         ;; when the line stays the same, don't invalidate anything
-         (set! old-position (get-start-position))]
-        [else
-         (define old-position-before old-position)
-         (set! old-position (and (= (get-start-position)
-                                    (get-end-position))
-                                 (get-start-position)))
-         (define single-edit-sequence?
-           (and old-position-before 
-                old-position
-                (<= (abs (- (position-paragraph old-position-before)
-                            (position-paragraph old-position)))
-                    1)))
-         (when single-edit-sequence? (begin-edit-sequence #f #f))
-         (when old-position-before (invalidate-at-position old-position-before))
-         (when old-position (invalidate-at-position old-position))
-         (when single-edit-sequence? (end-edit-sequence))])
-      (inner (void) after-set-position))
-    
-    (define/private (invalidate-at-position pos)
-      (when (showing-line-numbers?)
-        (define dc (get-dc))
-        (when dc
-          (begin-edit-sequence #f #f)
-          (define bx (box 0))
-          (define by (box 0))
-          (define tw (text-width dc (number-space+1)))
-          (define th (text-height dc "0"))
-          (define start-para (position-paragraph pos))
-          (define start-line (position-line (paragraph-start-position start-para)))
-          (let loop ([line start-line])
-            (define para (position-paragraph (line-start-position line)))
-            (when (= start-para para)
-              (position-location (line-start-position line) bx by)
-              (invalidate-bitmap-cache (- (unbox bx) tw)
-                                       (unbox by) 
-                                       tw
-                                       th)
-              (unless (= line (last-line))
-                (loop (+ line 1)))))
-          (end-edit-sequence))))
-    
-    (super-new)
-    (setup-padding)))
-
-(define-struct saved-dc-state (smoothing pen brush font foreground-color))
-(define padding-dc (new bitmap-dc% [bitmap (make-screen-bitmap 1 1)]))
-
-(define basic% (basic-mixin (editor:basic-mixin text%)))
-(define line-spacing% (line-spacing-mixin basic%))
-(define hide-caret/selection% (hide-caret/selection-mixin line-spacing%))
-(define nbsp->space% (nbsp->space-mixin line-spacing%))
-(define normalize-paste% (normalize-paste-mixin line-spacing%))
-(define delegate% (delegate-mixin line-spacing%))
-(define wide-snip% (wide-snip-mixin line-spacing%))
-(define standard-style-list% (editor:standard-style-list-mixin wide-snip%))
-(define input-box% (input-box-mixin standard-style-list%))
-(define -keymap% (editor:keymap-mixin standard-style-list%))
-(define return% (return-mixin -keymap%))
-(define autowrap% (editor:autowrap-mixin -keymap%))
-(define file% (file-mixin (editor:file-mixin autowrap%)))
-(define clever-file-format% (crlf-line-endings-mixin (clever-file-format-mixin file%)))
-(define backup-autosave% (editor:backup-autosave-mixin clever-file-format%))
-(define searching% (searching-mixin backup-autosave%))
-(define info% (info-mixin (editor:info-mixin searching%))))
-
-
-;; peel : (cons/c (cons/c (or/c bytes? (not/c bytes?)) X) 
-;;                        (listof (cons (or/c bytes? (not/c bytes?)) X))
-;;     -> (values (cons/c (or/c bytes? (not/c bytes?)) X)
-;;                (listof (cons (or/c bytes? (not/c bytes?)) X)
-;; finds the first segment of bytes with the same style and combines them,
-;; otherwise a lot like (define (peel x) (values (car x) (cdr x)))
-(define (peel lst)
-  (let loop ([lst lst]
-             [acc '()]
-             [key #f])
-    (cond
-      [(null? lst) (values (cons (peel-acc->bytes acc) key) null)]
-      [else 
-       (let* ([fst (car lst)]
-              [fst-key (cdr fst)]
-              [fst-val (car fst)])
-         (cond
-           [(and (not key) (bytes? fst-val))
-            (loop (cdr lst)
-                  (list fst-val)
-                  fst-key)]
-           [(and key (bytes? fst-val) (eq? key fst-key))
-            (loop (cdr lst)
-                  (cons fst-val acc)
-                  key)]
-           [(not key)
-            (values fst (cdr lst))]
-           [else (if (pair? acc)
-                     (values (cons (peel-acc->bytes acc) key) lst)
-                     (values fst (cdr lst)))]))])))
-
-(define (peel-acc->bytes acc)
-  (apply bytes-append (reverse acc)))
-
-(module+ test
-  (require rackunit)
-  (define (peek-lst arg) (define-values (x y) (peel arg)) (list x y))
-  (check-equal? (peek-lst (list (cons #"x" 'one)))
-                (list '(#"x" . one) '()))
-  (check-equal? (peek-lst (list (cons 'nb 'one)))
-                (list '(nb . one) '()))
-  (check-equal? (peek-lst (list (cons 'nb1 'one) (cons 'nb2 'one)))
-                (list '(nb1 . one) '((nb2 . one))))
-  (check-equal? (peek-lst (list (cons 'nb1 'one) (cons 'nb2 'two)))
-                (list '(nb1 . one) '((nb2 . two))))
-  (check-equal? (peek-lst (list (cons #"x" 'one) (cons #"y" 'one)))
-                (list '(#"xy" . one) '()))
-  (check-equal? (peek-lst (list (cons #"x" 'one) (cons 'nb 'one)))
-                (list '(#"x" . one) '((nb . one))))
-  (check-equal? (peek-lst (list (cons #"x" 'one) (cons #"y" 'two)))
-                (list '(#"x" . one) '((#"y" . two))))
-  (check-equal? (peek-lst (list (cons #"x" 'one) (cons #"y" 'one) (cons #"z" 'two)))
-                (list '(#"xy" . one) '((#"z" . two)))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; queues
-;;
-(define-struct at-queue (front back count) #:mutable)
-(define (empty-at-queue) (make-at-queue '() '() 0))
-(define (at-enqueue e q) (make-at-queue
-                          (cons e (at-queue-front q))
-                          (at-queue-back q)
-                          (+ (at-queue-count q) 1)))
-(define (at-queue-first q)
-  (at-flip-around q)
-  (let ([back (at-queue-back q)])
-    (if (null? back)
-        (error 'at-queue-first "empty queue")
-        (car back))))
-(define (at-queue-rest q)
-  (at-flip-around q)
-  (let ([back (at-queue-back q)])
-    (if (null? back)
-        (error 'queue-rest "empty queue")
-        (make-at-queue (at-queue-front q)
-                       (cdr back)
-                       (- (at-queue-count q) 1)))))
-(define (at-flip-around q)
-  (when (null? (at-queue-back q))
-    (set-at-queue-back! q (reverse (at-queue-front q)))
-    (set-at-queue-front! q '())))
-
-(define (at-queue-empty? q) (zero? (at-queue-count q)))
-(define (at-queue-size q) (at-queue-count q))
-
-;; queue->list : (queue x) -> (listof x)
-;; returns the elements in the order that successive deq's would have
-(define (at-queue->list q) 
-  (let ([ans (append (at-queue-back q) (reverse (at-queue-front q)))])
-    (set-at-queue-back! q ans)
-    (set-at-queue-front! q '())
-    ans))
-
-(define (list->at-queue l) (make-at-queue '() l (length l)))
-
-;; dequeue-n : queue number -> queue
-(define (at-dequeue-n queue n)
-  (let loop ([q queue]
-             [n n])
-    (cond
-      [(zero? n) q]
-      [(at-queue-empty? q) (error 'dequeue-n "not enough!")]
-      [else (loop (at-queue-rest q) (- n 1))])))
-
-;; peek-n : queue number -> queue
-(define (at-peek-n queue init-n)
-  (let loop ([q queue]
-             [n init-n])
-    (cond
-      [(zero? n) 
-       (when (at-queue-empty? q)
-         (error 'peek-n "not enough; asked for ~a but only ~a available" 
-                init-n 
-                (at-queue-size queue)))
-       (at-queue-first q)]
-      [else 
-       (when (at-queue-empty? q)
-         (error 'dequeue-n "not enough!"))
-       (loop (at-queue-rest q) (- n 1))])))
-
-;;
-;;  end queue abstraction
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(module+ test
-  (check-equal? (let* ([q1 (empty-at-queue)]
-                       [q2 (at-enqueue 1 q1)])
-                  (at-queue-first q2))
-                1)
-  (check-equal? (let* ([q1 (empty-at-queue)]
-                       [q2 (at-enqueue 1 q1)])
-                  (list (at-queue-size q1)
-                        (at-queue-size q2)))
-                (list 0 1))
-  (check-equal? (let* ([q1 (empty-at-queue)]
-                       [q2 (at-enqueue 1 q1)]
-                       [q3 (at-enqueue 2 q2)]
-                       [q4 (at-enqueue 3 q3)])
-                  (at-queue->list q4))
-                '(1 2 3))
-  (check-equal? (at-queue->list (list->at-queue '(1 2 3)))
-                '(1 2 3)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/version.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/version.rkt
deleted file mode 100644
index 23c91f4ee7..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/private/version.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang scheme/unit
-
-  (require "sig.rkt"
-           mzlib/string
-           mzlib/list)
-  (import)
-  (export (rename framework:version^
-                  [-version version]))
-  
-  (define specs null)
-  
-  (define (-version)
-    (foldr (lambda (entry sofar)
-             (let ([sep (first entry)]
-                   [num (second entry)])
-               (string-append sofar sep num)))
-           (version)
-           specs))
-  
-  (define (add-spec sep num)
-    (set! specs (cons (list (expr->string sep) (format "~a" num))
-                      specs)))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/splash.rkt b/pkgs/gui-pkgs/gui-lib/framework/splash.rkt
deleted file mode 100644
index fdfcde335a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/splash.rkt
+++ /dev/null
@@ -1,389 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/file
-         racket/gui/base
-         (for-syntax racket/base))
-
-(provide get-splash-bitmap
-         set-splash-bitmap
-         get-splash-canvas
-         get-splash-eventspace
-         get-splash-paint-callback
-         set-splash-paint-callback
-         start-splash 
-         shutdown-splash
-         close-splash
-         add-splash-icon
-         set-splash-progress-bar?!
-         set-splash-char-observer
-         set-splash-event-callback
-         get-splash-event-callback
-         set-refresh-splash-on-gauge-change?!
-         get-splash-width
-         get-splash-height
-         refresh-splash)
-
-(define splash-bitmap #f)
-(define splash-cache-bitmap #f)
-(define splash-cache-dc (make-object bitmap-dc%))
-(define splash-eventspace (make-eventspace))
-
-(define (on-splash-eventspace/proc t)
-  (parameterize ([current-eventspace splash-eventspace])
-    (queue-callback t)))
-(define-syntax-rule 
-  (on-splash-eventspace e ...)
-  (on-splash-eventspace/proc (λ () e ...)))
-
-(define (on-splash-eventspace/ret/proc t)
-  (define c (make-channel))
-  (parameterize ([current-eventspace splash-eventspace])
-    (queue-callback
-     (λ ()
-       (channel-put c (t)))))
-  (channel-get c))
-
-(define-syntax (on-splash-eventspace/ret stx)
-  (syntax-case stx ()
-    [(_ e ...)
-     (with-syntax ([line (syntax-line stx)])
-       #'(on-splash-eventspace/ret/proc (λ () e ...))
-       #;
-       #'(begin
-           (printf "starting ~a\n" line)
-           (begin0 
-             (on-splash-eventspace/ret/proc (λ () (with-handlers ((exn:fail? (λ (x) 
-                                                                               (printf "~a\n" (exn-message x)) 
-                                                                               (for ([x (in-list (continuation-mark-set->context
-                                                                                                  (exn-continuation-marks x)))])
-                                                                                 (printf "  ~s\n" x))
-                                                                               (void))))
-                                                    e ...)))
-             (printf "finishing ~a\n" line))))]))
-
-(define (get-splash-bitmap) splash-bitmap)
-(define (set-splash-bitmap bm) 
-  (set! splash-bitmap bm)
-  (on-splash-eventspace (send splash-canvas on-paint)))
-(define (get-splash-canvas) splash-canvas)
-(define (get-splash-eventspace) splash-eventspace)
-
-(define (get-splash-paint-callback) splash-paint-callback)
-(define (set-splash-paint-callback sp) 
-  (set! splash-paint-callback sp)
-  (refresh-splash))
-
-(define (get-splash-width) (on-splash-eventspace/ret (send splash-canvas get-width)))
-(define (get-splash-height) (on-splash-eventspace/ret (send splash-canvas get-height)))
-
-(define (set-splash-event-callback cb) (set! splash-event-callback cb))
-(define (get-splash-event-callback cb) splash-event-callback)
-
-(define (refresh-splash-on-gauge-change? start range) #f)
-(define (set-refresh-splash-on-gauge-change?! f) (set! refresh-splash-on-gauge-change? f))
-
-(define (refresh-splash)
-  
-  (define (recompute-bitmap/refresh)
-    (send splash-cache-dc set-bitmap splash-cache-bitmap)
-    (call-splash-paint-callback splash-cache-dc)
-    (send splash-cache-dc set-bitmap #f)
-    (send splash-canvas on-paint))
-       
-  (define (call-splash-paint-callback dc)
-    (cond
-      [(equal? 1 (procedure-arity splash-paint-callback))
-       (splash-paint-callback dc)]
-      [else 
-       (splash-paint-callback dc 
-                              (send (get-gauge) get-value) 
-                              (send (get-gauge) get-range)
-                              (send splash-canvas get-width)
-                              (send splash-canvas get-height))])
-    (for-each (λ (icon)
-                (send dc draw-bitmap
-                      (icon-bm icon)
-                      (icon-x icon)
-                      (icon-y icon)
-                      'solid
-                      (make-object color% "black")
-                      (send (icon-bm icon) get-loaded-mask)))
-              icons))
-  
-  (cond
-    [(not (is-a? splash-cache-bitmap bitmap%)) (void)]
-    [(eq? (current-thread) (eventspace-handler-thread splash-eventspace))
-     (recompute-bitmap/refresh)]
-    [else
-     (parameterize ([current-eventspace splash-eventspace])
-       (queue-callback
-        recompute-bitmap/refresh))]))
-
-(define (set-splash-progress-bar?! b?) 
-  (on-splash-eventspace/ret
-   (get-gauge) ;; force the gauge to be created
-   (send gauge-panel change-children
-         (λ (l) (if b? (list (get-gauge)) '())))))
-
-;; the function bound to the variable should only be called on the splash-eventspace main thread
-(define (splash-paint-callback dc)
-  (if splash-bitmap
-      (begin
-        (send dc clear)
-        (send dc draw-bitmap splash-bitmap 0 0))
-      (send dc clear)))
-
-(define (splash-event-callback evt) (void))
-
-(define char-observer void)
-(define (set-splash-char-observer proc)
-  (set! char-observer proc))
-
-(define-struct icon (bm x y))
-(define icons null)
-(define (add-splash-icon bm x y)
-  (set! icons (cons (make-icon bm x y) icons))
-  (refresh-splash))
-
-(define (start-splash splash-draw-spec _splash-title width-default 
-                      #:allow-funny? [allow-funny? #f]
-                      #:frame-icon [frame-icon #f])
-  (unless allow-funny? (set! funny? #f))
-  (set! splash-title _splash-title)
-  (set! splash-max-width (max 1 (splash-get-preference (get-splash-width-preference-name) width-default)))
-    
-  (on-splash-eventspace/ret
-   (let/ec k
-     (define (no-splash)
-       (set! splash-bitmap #f)
-       (k (void)))
-     (send (get-gauge) set-range splash-max-width)
-     (send splash-tlw set-label splash-title)
-     
-     (when frame-icon
-       (if (pair? frame-icon)
-         (let ([small (car frame-icon)]
-               [large (cdr frame-icon)])
-           (send splash-tlw set-icon small (send small get-loaded-mask) 'small)
-           (send splash-tlw set-icon large (send large get-loaded-mask) 'large))
-         (send splash-tlw set-icon frame-icon (send frame-icon get-loaded-mask) 'both)))
-     
-     (cond
-       [(or (path? splash-draw-spec)
-            (string? splash-draw-spec)
-            (is-a? splash-draw-spec bitmap%))
-        (cond
-          [(or (path? splash-draw-spec)
-               (string? splash-draw-spec))
-           (unless (file-exists? splash-draw-spec)
-             (eprintf "WARNING: bitmap path ~s not found\n" splash-draw-spec)
-             (no-splash))
-           
-           (set! splash-bitmap (read-bitmap splash-draw-spec #:try-@2x? #t))]
-          [else
-           (set! splash-bitmap splash-draw-spec)])
-        
-        (unless (send splash-bitmap ok?)
-          (no-splash))
-        
-        (send splash-canvas min-width (send splash-bitmap get-width))
-        (send splash-canvas min-height (send splash-bitmap get-height))
-        (set! splash-cache-bitmap (make-screen-bitmap
-                                    (send splash-bitmap get-width)
-                                    (send splash-bitmap get-height)))]
-       [(and (vector? splash-draw-spec)
-             (procedure? (vector-ref splash-draw-spec 0))
-             (number? (vector-ref splash-draw-spec 1))
-             (number? (vector-ref splash-draw-spec 2)))
-        (set! splash-paint-callback (vector-ref splash-draw-spec 0))
-        (send splash-canvas min-width (vector-ref splash-draw-spec 1))
-        (send splash-canvas min-height (vector-ref splash-draw-spec 2))
-        (set! splash-cache-bitmap (make-screen-bitmap
-                                    (vector-ref splash-draw-spec 1)
-                                    (vector-ref splash-draw-spec 2)))]
-       [(not splash-draw-spec)
-        (no-splash)]
-       [else
-        (eprintf "WARNING: unknown splash spec: ~s" splash-draw-spec)
-        (no-splash)])
-     
-     (send splash-tlw reflow-container)
-     
-     (refresh-splash)
-     
-     (send splash-tlw center 'both)
-     (send splash-tlw show-without-yield)
-     (sync (system-idle-evt)) ; try to wait for dialog to be shown
-     (flush-display) (yield) (sleep)
-     (flush-display) (yield) (sleep))))
-
-(define splash-title "no title")
-
-(define splash-current-width 0)
-
-(define (get-splash-width-preference-name) 
-  (string->symbol (format "plt:~a-splash-max-width" splash-title)))
-(define splash-max-width 1)
-
-(define (close-splash)
-  (unless (= splash-max-width splash-current-width)
-    (splash-set-preference (get-splash-width-preference-name) (max 1 splash-current-width)))
-  (on-splash-eventspace/ret (set! quit-on-close? #f))
-  (when splash-tlw
-    (on-splash-eventspace
-     (send splash-tlw show #f))))
-
-(define (shutdown-splash)
-  (set! splash-load-handler (λ (old-load f expected) (old-load f expected))))
-
-(define funny?
-  (let ([date (seconds->date (let ([ssec (getenv "PLTDREASTERSECONDS")])
-                               (if ssec
-                                   (string->number ssec)
-                                   (current-seconds))))])
-    (and (with-handlers ([exn:fail:filesystem? (λ (x) #f)])
-           (collection-path "icons")
-           #t)
-         (= (date-day date) 25)
-         (= (date-month date) 12))))
-
-(define (splash-load-handler old-load f expected)
-  (set! splash-current-width (+ splash-current-width 1))
-  (when (<= splash-current-width splash-max-width)
-    (let ([splash-save-width splash-current-width])
-      (on-splash-eventspace
-       (send (get-gauge) set-value splash-save-width)
-       (when (or (not (member (get-gauge) (send gauge-panel get-children)))
-                 ;; when the gauge is not visible, we'll redraw the canvas regardless
-                 (refresh-splash-on-gauge-change? splash-save-width splash-max-width))
-         (refresh-splash)))))
-  (old-load f expected))
-
-(let-values ([(make-compilation-manager-load/use-compiled-handler
-               manager-trace-handler)
-              (if (or (getenv "PLTDRCM")
-                      (getenv "PLTDRDEBUG"))
-                  (parameterize ([current-namespace (make-base-namespace)])
-                    (values
-                     (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler)
-                     (dynamic-require 'compiler/cm 'manager-trace-handler)))
-                  (values #f #f))])
-  
-  (current-load
-   (let ([old-load (current-load)])
-     (λ (f expected)
-       (splash-load-handler old-load f expected))))
-  
-  (when (and make-compilation-manager-load/use-compiled-handler
-             manager-trace-handler)
-    (printf "PLTDRCM/PLTDRDEBUG: reinstalling CM load handler after setting splash load handler\n")
-    (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler))))
-
-(define funny-gauge%
-  (class canvas% 
-    (inherit get-dc min-width min-height stretchable-width stretchable-height)
-    (field
-     [funny-value 0]
-     [funny-bitmap
-      (make-object bitmap% (collection-file-path "touch.bmp" "icons"))]
-     [max-value 1])
-    
-    (define/public (get-range) max-value)
-    (define/public (get-value) funny-value) 
-    
-    [define/public set-range (λ (r) (set! max-value r))]
-    [define/public set-value
-      (λ (new-value)
-        (let* ([before-x
-                (floor (* (send funny-bitmap get-width) (/ funny-value max-value)))]
-               [after-x
-                (ceiling (* (send funny-bitmap get-width) (/ new-value max-value)))]
-               [width (- after-x before-x)])
-          (send (get-dc) draw-line
-                (+ before-x 2) 0
-                (+ width 2) 0)
-          (send (get-dc) draw-line
-                (+ before-x 2) (+ (send funny-bitmap get-height) 4)
-                (+ width 2) (+ (send funny-bitmap get-height) 4))
-          (send (get-dc) draw-bitmap-section funny-bitmap
-                (+ 2 before-x) 2
-                before-x 0
-                width (send funny-bitmap get-height)))
-        (set! funny-value new-value))]
-    
-    [define/override (on-paint)
-      (let ([dc (get-dc)])
-        (send dc clear)
-        (send dc draw-rectangle 0 0
-              (+ (send funny-bitmap get-width) 4)
-              (+ (send funny-bitmap get-height) 4))
-        (send dc draw-bitmap-section funny-bitmap
-              2 2 0 0
-              (* (send funny-bitmap get-width) (/ funny-value max-value))
-              (send funny-bitmap get-height)))]
-    
-    (super-instantiate ())
-    (min-width (+ (send funny-bitmap get-width) 4))
-    (min-height (+ (send funny-bitmap get-height) 4))
-    (stretchable-width #f)
-    (stretchable-height #f)))
-
-(define (splash-get-preference name default)
-  (get-preference
-   name
-   (λ () default)
-   #:timeout-lock-there (λ (path) default)))
-(define (splash-set-preference name value)
-  (with-handlers ((exn:fail?
-                   (λ (exn)
-                     (log-warning (format "splash pref save: ~a" (exn-message exn))))))
-    (put-preferences (list name) (list value) void)))
-
-;; only modified (or read) on the splash eventspace handler thread
-(define quit-on-close? #t)
-
-(define splash-tlw%
-  (class dialog%
-    (define/augment (on-close)
-      (when quit-on-close?
-        (exit)))
-    (super-new [style '(close-button)])))
-
-(define splash-canvas%
-  (class canvas%
-    (inherit get-client-size get-dc)
-    (define/override (on-char evt) (char-observer evt))
-    (define/override (on-paint) (when splash-cache-bitmap (send (get-dc) draw-bitmap splash-cache-bitmap 0 0)))
-    (define/override (on-event evt) (splash-event-callback evt))
-    (super-new)))
-
-(define splash-tlw
-  (parameterize ([current-eventspace splash-eventspace])
-    (new splash-tlw%
-      (label splash-title))))
-
-(define panel (on-splash-eventspace/ret (make-object vertical-pane% splash-tlw)))
-(define splash-canvas (on-splash-eventspace/ret (new splash-canvas% [parent panel] [style '(no-autoclear)])))
-(define gauge-panel (on-splash-eventspace/ret (make-object horizontal-pane% panel)))
-
-;; only called on the splash eventspace main thread
-(define get-gauge
-  (let ([gauge #f])
-    (λ ()
-      (unless (eq? (current-thread) (eventspace-handler-thread splash-eventspace))
-        (error 'get-gauge "called from the wrong thread"))
-      (unless gauge
-        (set! gauge
-              (if funny?
-                  (make-object funny-gauge% gauge-panel)
-                  (make-object gauge% #f splash-max-width gauge-panel '(horizontal)))))
-      gauge)))
-(on-splash-eventspace/ret
- (send splash-tlw set-alignment 'center 'center)
- (send panel stretchable-width #f)
- (send panel stretchable-height #f)
- (send gauge-panel set-alignment 'center 'top)
- (send splash-canvas focus)
- (send splash-canvas stretchable-width #f)
- (send splash-canvas stretchable-height #f))
diff --git a/pkgs/gui-pkgs/gui-lib/framework/test.rkt b/pkgs/gui-pkgs/gui-lib/framework/test.rkt
deleted file mode 100644
index e6f51297d3..0000000000
--- a/pkgs/gui-pkgs/gui-lib/framework/test.rkt
+++ /dev/null
@@ -1,1136 +0,0 @@
-#lang at-exp racket/base
-
-(require racket/class
-         racket/contract/base
-         racket/gui/base
-         scribble/srcdoc
-         (for-syntax racket/base)
-         (prefix-in :: framework/private/focus-table))
-(generate-delayed-documents) ; enables for-doc--for-label import of `framework'
-(require/doc scheme/base scribble/manual
-             (for-label framework))
-
-(define (test:top-level-focus-window-has? pred)
-  (let ([tlw (test:get-active-top-level-window)])
-    (and tlw
-         (let loop ([tlw tlw])
-           (or (pred tlw)
-               (and (is-a? tlw area-container<%>)
-                    (ormap loop (send tlw get-children))))))))
-
-(define initial-run-interval 0)  ;; milliseconds
-
-;;
-;; The minimum time an action is allowed to run before returning from
-;; mred:test:action.  Controls the rate at which actions are started, 
-;; and gives some slack time for real events to complete (eg, update).
-;; Make-parameter doesn't do what we need across threads.
-;; Probably don't need semaphores here (set! is atomic).
-;; Units are in milliseconds (as in mred:timer%).
-;;
-
-(define run-interval
-  (let ([tag  'test:run-interval]
-        [msec  initial-run-interval])
-    (case-lambda
-      [()   msec]
-      [(x)  (if (and (integer? x) (exact? x) (<= 0 x))
-                (set! msec x)
-                (error tag "expects exact, non-negative integer, given: ~e" x))])))
-
-;;
-;; How we get into the handler thread, and put fake actions 
-;; on the real event queue.
-;;
-
-(define install-timer
-  (λ (msec thunk)
-    (let ([timer (instantiate timer% ()
-                   [notify-callback (λ () (thunk))])])
-      (send timer start msec #t))))
-
-;;
-;; Simple accounting of actions and errors.
-;;
-;; Keep number of unfinished actions.  An error in the buffer
-;; (caught but not-yet-reraised) counts as an unfinished action.
-;; (but kept in the-error, not count).
-;;
-;; Keep buffer of one error, and reraise at first opportunity.
-;; Keep just first error, any others are thrown on the floor.
-;; Reraising the error flushes the buffer.
-;; Store exn in box, so can correctly catch (raise #f).
-;; 
-;; These values are set in handler thread and read in main thread,
-;; so certainly need semaphores here.
-;;
-
-(define-values (begin-action  end-action  end-action-with-error
-                              get-exn-box   is-exn?     num-actions)
-  (let 
-      ([sem    (make-semaphore 1)]
-       [count      0]     ;; number unfinished actions.
-       [the-error  #f])   ;; boxed exn struct, or else #f.
-    (letrec
-        ([begin-action
-           (λ ()
-             (semaphore-wait sem)
-             (set! count (add1 count))
-             (semaphore-post sem))]
-         
-         [end-action
-          (λ ()
-            (semaphore-wait sem)
-            (set! count (sub1 count))
-            (semaphore-post sem))]
-         
-         [end-action-with-error
-          (λ (exn)
-            (semaphore-wait sem)
-            (set! count (sub1 count))
-            (unless the-error
-              (set! the-error (box exn)))
-            (semaphore-post sem))]
-         
-         [get-exn-box
-          (λ ()
-            (semaphore-wait sem)
-            (let ([ans  the-error])
-              (set! the-error #f)
-              (semaphore-post sem)
-              ans))]
-         
-         [is-exn?
-          (λ ()
-            (semaphore-wait sem)
-            (let ([ans  (if the-error #t #f)])
-              (semaphore-post sem)
-              ans))]
-         
-         [num-actions
-          (λ ()
-            (semaphore-wait sem)
-            (let ([ans  (+ count (if the-error 1 0))])
-              (semaphore-post sem)
-              ans))])
-      
-      (values  begin-action  end-action  end-action-with-error
-               get-exn-box   is-exn?     num-actions))))
-
-;; Functions to export, always in main thread.
-
-(define number-pending-actions num-actions)
-
-(define reraise-error
-  (λ ()
-    (let ([exn-box  (get-exn-box)])
-      (if exn-box (raise (unbox exn-box)) (void)))))
-
-;;
-;; Start running thunk in handler thread.
-;; Don't return until run-interval expires, and thunk finishes, 
-;; raises error, or yields (ie, at event boundary).
-;; Reraise error (if exists) even from previous action.
-;; Note: never more than one timer (of ours) on real event queue.
-;; 
-
-(define run-one
-  (let ([yield-semaphore (make-semaphore 0)]
-        [thread-semaphore (make-semaphore 0)])
-    (thread
-     (λ ()
-       (let loop ()
-         (semaphore-wait thread-semaphore)
-         (sleep)
-         (semaphore-post yield-semaphore)
-         (loop))))
-    (λ (thunk)
-      (let ([sem (make-semaphore 0)])
-        (letrec ([start
-                  (λ () ;; eventspace main thread
-                    
-                    ;; guarantee (probably) that some events are handled
-                    (semaphore-post thread-semaphore) 
-                    (yield yield-semaphore)
-                    
-                    (install-timer (run-interval) return)
-                    (unless (is-exn?)
-                      (begin-action)
-                      (call-with-exception-handler
-                       (λ (exn)
-                         (end-action-with-error exn)
-                         ((error-escape-handler)))
-                       thunk)
-                      (end-action)))]
-                 
-                 [return (λ () (semaphore-post sem))])
-          
-          (install-timer 0 start)
-          (semaphore-wait sem)
-          (reraise-error))))))
-
-(define current-get-eventspaces
-  (make-parameter (λ () (list (current-eventspace)))))
-
-(define test:use-focus-table (make-parameter #f))
-
-(define (test:get-active-top-level-window)
-  (ormap (λ (eventspace)
-           (parameterize ([current-eventspace eventspace])
-             (cond
-               [(test:use-focus-table)
-                (define lst (::frame:lookup-focus-table))
-                (define focusd (and (not (null? lst)) (car lst)))
-                (when (eq? (test:use-focus-table) 'debug)
-                  (define f2 (get-top-level-focus-window))
-                  (unless (eq? focusd f2)
-                    (eprintf "found mismatch focus-table: ~s vs get-top-level-focus-window: ~s\n" 
-                             (map (λ (x) (send x get-label)) lst) 
-                             (and f2 (list (send f2 get-label))))))
-                focusd]
-               [else
-                (get-top-level-focus-window)])))
-         ((current-get-eventspaces))))
-
-(define (get-focused-window)
-  (let ([f (test:get-active-top-level-window)])
-    (and f
-         (send f get-edit-target-window))))
-
-(define time-stamp current-milliseconds)
-
-;;
-;; Return list of window's ancestors from root down to window
-;; (including window).  Used for on-subwindow-char and on-subwindow-event.
-;; get-parent returns #f for no parent.
-;; If stop-at-top-level-window? is #t, then the ancestors up to the
-;; first top-level-window are returned.
-;;
-
-(define ancestor-list
-  (λ (window stop-at-top-level-window?)
-    (let loop ([w window] [l null])
-      (if (or (not w)
-              (and stop-at-top-level-window?
-                   (is-a? w top-level-window<%>)))
-          l
-          (loop (send w get-parent) (cons w l))))))
-
-;;
-;; Returns #t if window is in active-frame, else #f.
-;; get-parent returns () for no parent.
-;;
-
-(define (in-active-frame? window)
-  (let ([frame  (test:get-active-top-level-window)])
-    (let loop ([window  window])
-      (cond [(not window) #f]
-            [(not frame) #f]
-            [(null? window) #f]  ;; is this test needed?
-            [(object=? window frame) #t]
-            [else (loop (send window get-parent))]))))
-
-;;
-;; Verify modifier list.
-;; l, valid : lists of symbols.
-;; returns first item in l *not* in valid, or else #f.
-;;
-
-(define verify-list
-  (λ (l  valid)
-    (cond [(null? l)  #f]
-          [(member (car l) valid)  (verify-list (cdr l) valid)]
-          [else  (car l)])))
-
-(define verify-item 
-  (λ (item valid)
-    (verify-list (list item) valid)))
-
-;;;
-;;; find-object obj-class b-desc 
-;;; returns an object belonging to obj-class, where b-desc
-;;; is either an object, or a string
-;;;
-
-(define object-tag 'test:find-object)
-
-;; find-object : class (union string regexp (object -> boolean)) -> object
-(define (find-object obj-class b-desc)
-  (λ ()
-    (cond
-      [(or (string? b-desc)
-           (regexp? b-desc)
-           (procedure? b-desc))
-       (let* ([active-frame (test:get-active-top-level-window)]
-              [_ (unless active-frame
-                   (error object-tag
-                          "could not find object: ~e, no active frame" 
-                          b-desc))]
-              [child-matches?
-               (λ (child)
-                 (cond
-                   [(string? b-desc)
-                    (equal? (send child get-label) b-desc)]
-                   [(regexp? b-desc)
-                    (and (send child get-label)
-                         (regexp-match? b-desc (send child get-label)))]
-                   [(procedure? b-desc)
-                    (b-desc child)]))]
-              [found
-               (let loop ([panel active-frame])
-                 (ormap (λ (child)
-                          (cond
-                            [(and (is-a? child obj-class)
-                                  (child-matches? child))
-                             child]
-                            [(is-a? child area-container-window<%>) 
-                             (and (send child is-shown?)
-                                  (loop child))]
-                            [(is-a? child area-container<%>) 
-                             (loop child)]
-                            [else #f]))
-                        (send panel get-children)))])
-         (or found
-             (error object-tag 
-                    "no object of class ~e named ~e in active frame"
-                    obj-class
-                    b-desc)))]
-      [(is-a? b-desc obj-class) b-desc]
-      [else (error 
-             object-tag
-             "expected either a string or an object of class ~e as input, received: ~e"
-             obj-class b-desc)])))
-
-
-;;; functions specific to various user input
-
-;;; CONTROL functions, to be specialized for individual controls 
-
-(define control-action
-  (λ (error-tag event-sym find-ctrl update-control)
-    (run-one
-     (λ ()
-       (let ([event (make-object control-event% event-sym)]
-             [ctrl (find-ctrl)])
-         (cond
-           [(not (send ctrl is-shown?))
-            (error error-tag "control ~e is not shown (label ~e)" ctrl (send ctrl get-label))]
-           [(not (send ctrl is-enabled?))
-            (error error-tag "control ~e is not enabled (label ~e)" ctrl (send ctrl get-label))]
-           [(not (in-active-frame? ctrl))
-            (error error-tag "control ~e is not in active frame (label ~e)" ctrl (send ctrl get-label))]
-           [else
-            (update-control ctrl)
-            (send ctrl command event)
-            (void)]))))))
-
-;;
-;; BUTTON
-;;
-
-(define (button-push button)
-  (control-action
-   'test:button-push
-   'button
-   (find-object button% button)
-   void))
-
-;; 
-;; CHECK-BOX 
-;;
-
-(define (set-check-box! in-cb state) 
-  (control-action
-   'test:set-check-box!
-   'check-box 
-   (find-object check-box% in-cb)
-   (λ (cb) (send cb set-value state))))
-
-;; 
-;; RADIO-BOX 
-;;
-
-(define (build-labels radio-box)
-  (string-append
-   (format "~s" (send radio-box get-item-label 0))
-   (let loop ([n (- (send radio-box get-number) 1)])
-     (cond
-       [(zero? n) ""]
-       [else (string-append " "
-                            (format "~s"
-                                    (send radio-box get-item-label
-                                          (- (send radio-box get-number)
-                                             n)))
-                            (loop (- n 1)))]))))
-
-(define (set-radio-box! in-cb state) 
-  (control-action
-   'test:set-radio-box!
-   'radio-box 
-   (find-object radio-box% in-cb)
-   (λ (rb) 
-     (cond
-       [(string? state) 
-        (let ([total (send rb get-number)])
-          (let loop ([n total])
-            (cond
-              [(zero? n) (error 'test:set-radio-box!
-                                "did not find ~e as a label for ~e; labels: ~a"
-                                state in-cb
-                                (build-labels rb))]
-              [else (let ([i (- total n)])
-                      (if (ith-item-matches? rb state i)
-                          (if (send rb is-enabled? i)
-                              (send rb set-selection i)
-                              (error 'test:set-radio-box!
-                                     "label ~e is disabled"
-                                     state))
-                          (loop (- n 1))))])))]
-       [(number? state)
-        (unless (send rb is-enabled? state)
-          (error 'test:set-radio-box! "item ~a is not enabled\n" state))
-        (send rb set-selection state)]
-       [else (error 'test:set-radio-box!
-                    "expected a string or a number as second arg, got: ~e (other arg: ~e)"
-                    state in-cb)]))))
-
-(define (ith-item-matches? rb state i)
-  (cond
-    [(string? state)
-     (or (string=? state (send rb get-item-label i))
-         (string=? state (send rb get-item-plain-label i)))]
-    [(regexp? state)
-     (or (regexp-match state (send rb get-item-label i))
-         (regexp-match state (send rb get-item-plain-label i)))]))
-
-;; set-radio-box-item! : string -> void
-(define (set-radio-box-item! state) 
-  (control-action
-   'test:set-check-box-state!
-   'radio-box
-   (find-object radio-box% (entry-matches state))
-   (λ (rb) 
-     (let ([total (send rb get-number)])
-       (let loop ([n total])
-         (cond
-           [(zero? n) (error 'test:set-radio-box-item! "internal error")]
-           [else (let ([i (- total n)])
-                   (if (ith-item-matches? rb state i)
-                       (if (send rb is-enabled? i)
-                           (send rb set-selection i)
-                           (error 'test:set-radio-box!
-                                  "label ~e is disabled"
-                                  state))
-                       (loop (- n 1))))]))))))
-
-;; entry-matches : string | regexp -> radio-box -> boolean
-(define (entry-matches name)
-  (procedure-rename
-   (λ (rb)
-     (let loop ([n (send rb get-number)])
-       (cond
-         [(zero? n) #f]
-         [else
-          (let ([itm (send rb get-item-label (- n 1))]
-                [pln-itm (send rb get-item-plain-label (- n 1))])
-            (or (cond
-                  [(string? name)
-                   (or (equal? name itm)
-                       (equal? name pln-itm))]
-                  [(regexp? name)
-                   (or (regexp-match name itm)
-                       (regexp-match name pln-itm))])
-                (loop (- n 1))))])))
-   (string->symbol
-    (if (regexp? name)
-        (object-name name)
-        name))))
-
-;;; CHOICE 
-
-; set-choice! : ((instance in-choice%) (union string number) -> void)
-(define (set-choice! in-choice str)
-  (control-action
-   'test:set-choice!
-   'choice
-   (find-object choice% in-choice)
-   (λ (choice)
-     (cond
-       [(number? str) (send choice set-selection str)]
-       [(string? str) (send choice set-string-selection str)]
-       [else (error 'test:set-choice!
-                    "expected a string or a number as second arg, got: ~e (other arg: ~e)"
-                    str in-choice)]))))
-
-(define (set-list-box! in-lb str)
-  (control-action
-   'test:set-list-box!
-   'list-box
-   (find-object list-box% in-lb)
-   (λ (lb)
-     (cond
-       [(number? str) (send lb set-selection str)]
-       [(string? str) (send lb set-string-selection str)]
-       [else (error 'test:set-list-box!
-                    "expected a string or a number as second arg, got: ~e (other arg: ~e)"
-                    str in-lb)]))))
-
-;;
-;; KEYSTROKES 
-;;
-;; Give ancestors (from root down) option of handling key event
-;; with on-subwindow-char.  If none want it, then send to focused window
-;; with (send <window> on-char <wx:key-event>).
-;;
-;; key: char or integer.
-;; optional modifiers: 'alt, 'control, 'meta, 'shift, 
-;;   'noalt, 'nocontrol, 'nometa, 'noshift.
-;;
-;; Window must be shown, in active frame, and either the window has
-;; on-char, or else some ancestor must grab key with on-subwindow-char.
-;;
-
-(define key-tag 'test:keystroke)
-(define legal-keystroke-modifiers
-  (list 'alt 'control 'meta 'shift
-        'noalt 'nocontrol 'nometa 'noshift))
-
-(define valid-key-symbols
-  (list 'escape ;; just trying this for the heck of it -- JBC, 2010-08-13
-        'start 'cancel 'clear 'shift 'control 'menu 'pause 'capital
-        'prior 'next 'end 'home 'left 'up 'right 'down 'select 'print
-        'execute 'snapshot 'insert 'help 'numpad0 'numpad1 'numpad2
-        'numpad3 'numpad4 'numpad5 'numpad6 'numpad7 'numpad8 'numpad9
-        'multiply 'add 'separator 'subtract 'decimal 'divide 'f1 'f2 'f3
-        'f4 'f5 'f6 'f7 'f8 'f9 'f10 'f11 'f12 'f13 'f14 'f15 'f16 'f17
-        'f18 'f19 'f20 'f21 'f22 'f23 'f24 'numlock 'scroll))
-
-(define keystroke
-  (case-lambda
-    [(key) (keystroke key null)]
-    [(key modifier-list)
-     (cond
-       [(not (or (char? key) (memq key valid-key-symbols)))
-        (error key-tag "expects char or valid key symbol, given: ~e" key)]
-       [(not (list? modifier-list))
-        (error key-tag "expected a list as second argument, got: ~e" modifier-list)]
-       [(verify-list  modifier-list  legal-keystroke-modifiers)
-        => (λ (mod) (error key-tag "unknown key modifier: ~e" mod))]
-       [else
-        (run-one
-         (λ ()
-           (let ([window (get-focused-window)])
-             (cond
-               [(not window)
-                (error key-tag "no focused window")]
-               [(not (send window is-shown?))
-                (error key-tag "focused window is not shown")]
-               [(not (send window is-enabled?))
-                (error key-tag "focused window is not enabled")]
-               [(not (in-active-frame? window))
-                (error 
-                 key-tag 
-                 (string-append
-                  "focused window is not in active frame;"
-                  "active frame's label is ~s and focused window is in a frame with label ~s")
-                 (let ([f (test:get-active-top-level-window)])
-                   (and f (send (test:get-active-top-level-window) get-label)))
-                 (let loop ([p window])
-                   (cond
-                     [(is-a? p top-level-window<%>)
-                      (send p get-label)]
-                     [(is-a? p area<%>)
-                      (loop (send p get-parent))]
-                     [else #f])))]
-               [else
-                (let ([event (make-key-event key window modifier-list)])
-                  (send-key-event window event)
-                  (void))]))))])]))
-
-;; delay test for on-char until all ancestors decline on-subwindow-char.
-(define (send-key-event window event)
-  (let loop ([l (ancestor-list window #t)])
-    (cond [(null? l)
-           (cond
-             [(method-in-interface? 'on-char (object-interface window))
-              (send window on-char event)]
-             [(is-a? window text-field%)
-              (send (send window get-editor) on-char event)]
-             [else 
-              (error
-               key-tag
-               "focused window is not a text-field% and does not have on-char, ~e" window)])]
-          [(send (car l) on-subwindow-char window event) #f]
-          [else (loop (cdr l))])))
-
-;; Make full key-event% object.
-;; Shift is determined implicitly from key-code.
-;; Alt, Meta, Control come from modifier-list.
-;; get-alt-down, etc are #f unless explicitly set to #t.
-;; WILL WANT TO ADD SET-POSITION WHEN THAT GETS IMPLEMENTED.
-
-(define make-key-event
-  (λ (key window modifier-list)
-    (let ([event (make-object key-event%)])
-      (send event set-key-code key)
-      (send event set-time-stamp (time-stamp))
-      (set-key-modifiers event key modifier-list)
-      event)))
-
-(define set-key-modifiers
-  (λ (event key modifier-list)
-    (when (shifted? key) (send event set-shift-down #t))
-    (let loop ([l  modifier-list])
-      (unless (null? l)
-        (let ([mod  (car l)])
-          (cond
-            [(eq? mod 'alt)        (send event set-alt-down     #t)]
-            [(eq? mod 'control)    (send event set-control-down #t)]
-            [(eq? mod 'meta)       (send event set-meta-down    #t)]
-            [(eq? mod 'shift)      (send event set-shift-down   #t)]
-            [(eq? mod 'noalt)      (send event set-alt-down     #f)]
-            [(eq? mod 'nocontrol)  (send event set-control-down #f)]
-            [(eq? mod 'nometa)     (send event set-meta-down    #f)]
-            [(eq? mod 'noshift)    (send event set-shift-down   #f)]
-            [else  (error key-tag "unknown key modifier: ~e" mod)])
-          (loop (cdr l)))))))
-
-(define shifted?
-  (let* ([shifted-keys '(#\? #\: #\~ #\\ #\|
-                             #\< #\> #\{ #\} #\[ #\] #\( #\)
-                             #\! #\@ #\# #\$ #\% #\^ #\& #\* #\_ #\+
-                             #\A #\B #\C #\D #\E #\F #\G #\H #\I #\J #\K #\L #\M 
-                             #\N #\O #\P #\Q #\R #\S #\T #\U #\V #\W #\X #\Y #\Z)])
-    (λ (key)
-      (memq shifted-keys shifted-keys))))
-
-;;
-;; MENU ITEMS 
-;;
-;; Select menu item with: 
-;;   (send <frame> command <menu-item-id>)
-;; menu, item: strings
-;;
-;; DOESN'T HANDLE MENU CHECKBOXES YET.
-;;
-
-(define menu-tag 'test:menu-select)
-
-(define (menu-select menu-name . item-names)
-  (cond
-    [(not (string? menu-name))
-     (error menu-tag "expects string, given: ~e" menu-name)]
-    [(not (andmap string? item-names))
-     (error menu-tag "expects strings, given: ~e" item-names)]
-    [else
-     (run-one
-      (λ ()
-        (let* ([frame (test:get-active-top-level-window)]
-               [item (get-menu-item frame (cons menu-name item-names))]
-               [evt (make-object control-event% 'menu)])
-          (send evt set-time-stamp (current-milliseconds))
-          (send item command evt))))]))
-
-(define get-menu-item
-  (λ (frame item-names)
-    (cond
-      [(not frame)
-       (error menu-tag "no active frame")]
-      [(not (method-in-interface? 'get-menu-bar (object-interface frame)))
-       (error menu-tag "active frame does not have menu bar")]
-      [else
-       (let ([menu-bar  (send frame get-menu-bar)])
-         (unless menu-bar
-           (error menu-tag "active frame does not have menu bar"))
-         (send menu-bar on-demand)
-         (let* ([items (send menu-bar get-items)])
-           (let loop ([items items]
-                      [this-name (car item-names)]
-                      [wanted-names (cdr item-names)])
-             (cond
-               [(null? items)
-                (error 'menu-select "didn't find a menu: ~e, entire list: ~e" this-name item-names)]
-               [else (let ([i (car items)])
-                       (cond
-                         [(not (is-a? i labelled-menu-item<%>))
-                          (loop (cdr items)
-                                this-name
-                                wanted-names)]
-                         [(string=? this-name (send i get-plain-label))
-                          (cond
-                            [(and (null? wanted-names)
-                                  (not (is-a? i menu-item-container<%>)))
-                             i]
-                            [(and (not (null? wanted-names))
-                                  (is-a? i menu-item-container<%>))
-                             (loop (send i get-items)
-                                   (car wanted-names)
-                                   (cdr wanted-names))]
-                            [else
-                             (error menu-tag "no menu matching ~e" item-names)])]
-                         [else
-                          (loop (cdr items)
-                                this-name
-                                wanted-names)]))]))))])))
-
-
-;;
-;; SIMPLE MOUSE EVENTS
-;;
-;; Simple left-click mouse in current canvas.
-;; Sends 3 mouse-events to canvas: motion, down, up.
-;;
-;; Give ancestors (from root down) option of handling mouse event
-;; with pre-on-event.  If none want it, then send to focused window
-;; with on-event.
-;;
-;; NEED TO EXPAND: DRAGGING, DOUBLE-CLICK, MOVING TO OTHER CANVASES,
-;; MODIFIER KEYS (SHIFT, META, CONTROL, ALT).
-;; 
-
-(define mouse-tag 'test:mouse-action)
-(define legal-mouse-buttons (list 'left 'middle 'right))
-(define legal-mouse-modifiers
-  (list 'alt 'control 'meta 'shift 'noalt 'nocontrol 'nometa 'noshift))
-
-(define mouse-click
-  (case-lambda
-    [(button x y) (mouse-click button x y null)]
-    [(button x y modifier-list)
-     (cond 
-       [(verify-item button legal-mouse-buttons)
-        => (λ (button)
-             (error mouse-tag "unknown mouse button: ~e" button))]
-       [(not (real? x))
-        (error mouse-tag "expected real, given: ~e" x)]
-       [(not (real? y))
-        (error mouse-tag "expected real, given: ~e" y)]
-       [(verify-list modifier-list legal-mouse-modifiers)
-        => (λ (mod) 
-             (error mouse-tag "unknown mouse modifier: ~e" mod))]
-       [else
-        (run-one
-         (λ ()
-           (let ([window  (get-focused-window)])
-             (cond 
-               [(not window)
-                (error mouse-tag "no focused window")]
-               [(not (send window is-shown?))
-                (error mouse-tag "focused window is not shown")]
-               [(not (send window is-enabled?))
-                (error mouse-tag "focused window is not enabled")]
-               [(not (in-active-frame? window))
-                (error mouse-tag "focused window is not in active frame")]
-               [else
-                (let ([motion  (make-mouse-event 'motion x y modifier-list)]
-                      [down    (make-mouse-event (list button 'down) x y modifier-list)]
-                      [up      (make-mouse-event (list button 'up) x y modifier-list)])
-                  (send-mouse-event window motion)
-                  (send-mouse-event window down)
-                  (send-mouse-event window up)
-                  (void))]))))])]))
-
-
-;; NEED TO MOVE THE CHECK FOR 'ON-EVENT TO HERE.
-
-(define send-mouse-event
-  (λ (window event)
-    (let loop ([l  (ancestor-list window #t)])
-      (cond
-        [(null? l)
-         (if (method-in-interface? 'on-event (object-interface window))
-             (send window on-event event)
-             (error mouse-tag "focused window does not have on-event"))]
-        [(and (is-a? (car l) window<%>)
-              (send (car l) on-subwindow-event window event))
-         #f]
-        [else  (loop (cdr l))]))))
-
-;;
-;; Make mouse event.
-;;
-
-(define make-mouse-event
-  (λ (type x y modifier-list)
-    (let ([event (make-object mouse-event% (mouse-type-const type))])
-      (when (and (pair? type) (not (eq? (cadr type) 'up)))
-        (set-mouse-modifiers event (list (car type))))
-      (set-mouse-modifiers event modifier-list)
-      (send event set-x x)
-      (send event set-y y)
-      (send event set-time-stamp (time-stamp))
-      event)))
-
-(define set-mouse-modifiers
-  (λ (event modifier-list)
-    (unless (null? modifier-list)
-      (let ([mod  (car modifier-list)])
-        (cond
-          [(eq? mod 'alt)        (send event set-alt-down     #t)]
-          [(eq? mod 'control)    (send event set-control-down #t)]
-          [(eq? mod 'meta)       (send event set-meta-down    #t)]
-          [(eq? mod 'shift)      (send event set-shift-down   #t)]
-          [(eq? mod 'left)       (send event set-left-down    #t)]
-          [(eq? mod 'middle)     (send event set-middle-down  #t)]
-          [(eq? mod 'right)      (send event set-right-down   #t)]
-          [(eq? mod 'noalt)      (send event set-alt-down     #f)]
-          [(eq? mod 'nocontrol)  (send event set-control-down #f)]
-          [(eq? mod 'nometa)     (send event set-meta-down    #f)]
-          [(eq? mod 'noshift)    (send event set-shift-down   #f)]
-          [else  (error mouse-tag "unknown mouse modifier: ~e" mod)]))
-      (set-mouse-modifiers event (cdr modifier-list)))))
-
-(define mouse-type-const
-  (λ (type)
-    (cond
-      [(symbol? type)
-       (cond
-         [(eq? type 'motion)  'motion]
-         [(eq? type 'enter)   'enter]
-         [(eq? type 'leave)   'leave]
-         [else  (bad-mouse-type type)])]
-      [(and (pair? type) (pair? (cdr type)))
-       (let ([button (car type)] [action (cadr type)])
-         (cond
-           [(eq? button 'left)
-            (cond 
-              [(eq? action 'down)    'left-down]
-              [(eq? action 'up)      'left-up]
-              [(eq? action 'dclick)  'left-dclick]
-              [else  (bad-mouse-type type)])]
-           [(eq? button 'middle)
-            (cond
-              [(eq? action 'down)    'middle-down]
-              [(eq? action 'up)      'middle-up]
-              [(eq? action 'dclick)  'middle-dclick]
-              [else  (bad-mouse-type type)])]
-           [(eq? button 'right)
-            (cond
-              [(eq? action 'down)    'right-down]
-              [(eq? action 'up)      'right-up]
-              [(eq? action 'dclick)  'right-dclick]
-              [else  (bad-mouse-type type)])]
-           [else  (bad-mouse-type type)]))]
-      [else  (bad-mouse-type type)])))
-
-(define bad-mouse-type
-  (λ (type)
-    (error mouse-tag "unknown mouse event type: ~e" type)))
-
-;;
-;; Move mouse to new window.
-;; Implement with three events:
-;; leave old window, show top-level frame, enter new window, focus.
-;;
-;; NEED TO CLEAN UP ACTIONS FOR MOVING TO NEW FRAME.
-;;
-
-(define new-window
-  (let ([tag  'test:new-window])
-    (λ (new-window)
-      (cond
-        [(not (is-a? new-window window<%>))
-         (error tag "new-window is not a window<%>")]
-        [else
-         (run-one
-          (λ ()
-            (let
-                ([old-window  (get-focused-window)]
-                 [leave   (make-object mouse-event% 'leave)]
-                 [enter   (make-object mouse-event% 'enter)]
-                 [root    (car (ancestor-list new-window #t))])
-              (send leave  set-x 0)   (send leave  set-y 0)
-              (send enter  set-x 0)   (send enter  set-y 0)
-              
-              ;; SOME KLUDGES HERE TO WORK AROUND TEXT% PROBLEMS.
-              
-              (when (and old-window (method-in-interface? 'on-event (object-interface old-window)))
-                (send-mouse-event old-window leave))
-              (send root show #t)
-              (when (method-in-interface? 'on-event (object-interface new-window))
-                (send-mouse-event new-window enter))
-              (send new-window focus)
-              (void))))]))))
-
-(define (close-top-level-window tlw)
-  (when (send tlw can-close?)
-    (send tlw on-close)
-    (send tlw show #f)))
-
-;; manual renaming
-(define test:run-interval run-interval)
-(define test:number-pending-actions number-pending-actions)
-(define test:reraise-error reraise-error)
-(define test:run-one run-one)
-(define test:current-get-eventspaces current-get-eventspaces)
-(define test:close-top-level-window close-top-level-window)
-(define test:button-push button-push)
-(define test:set-radio-box! set-radio-box!)
-(define test:set-radio-box-item! set-radio-box-item!)
-(define test:set-check-box! set-check-box!)
-(define test:set-choice! set-choice!)
-(define test:set-list-box! set-list-box!)
-(define test:keystroke keystroke)
-(define test:menu-select menu-select)
-(define test:mouse-click mouse-click)
-(define test:new-window new-window)
-
-(define (label-of-enabled/shown-button-in-top-level-window? str)
-  (test:top-level-focus-window-has?
-   (λ (c)
-     (and (is-a? c button%)
-          (string=? (send c get-label) str)
-          (send c is-enabled?)
-          (send c is-shown?)))))
-
-(define (enabled-shown-button? btn)
-  (and (send btn is-enabled?)
-       (send btn is-shown?)))
-
-(define (button-in-top-level-focusd-window? btn)
-  (test:top-level-focus-window-has?
-   (λ (c) (eq? c btn))))
-
-(provide/doc
- (proc-doc/names
-  test:button-push
-  (-> (or/c (and/c string?
-                   label-of-enabled/shown-button-in-top-level-window?)
-            (and/c (is-a?/c button%)
-                   enabled-shown-button?
-                   button-in-top-level-focusd-window?))
-      void?)
-  (button)
-  @{Simulates pushing @racket[button].  If a string is supplied, the
-  primitive searches for a button labelled with that string in the
-  active frame. Otherwise, it pushes the button argument.})
- 
- (proc-doc/names
-  test:set-radio-box!
-  (-> (or/c string? regexp? (is-a?/c radio-box%)) (or/c string? number?) void?)
-  (radio-box state)
-  @{Sets the radio-box to the label matching @racket[state]. If @racket[state] is a
-         string, this function finds the choice with that label. 
-         If it is a regexp, this function finds the first choice whose label matches the regexp.
-         If it is a number, it uses the number as an index into the
-         state. If the number is out of range or if the label isn't
-         in the radio box, an exception is raised.
-
-         If @racket[radio-box] is a string, this function searches for a
-         @racket[radio-box%] object with a label matching that string,
-         otherwise it uses @racket[radio-box] itself.})
- 
- (proc-doc/names
-  test:set-radio-box-item!
-  (-> (or/c string? regexp?) void?)
-  (entry)
-  @{Finds a @racket[radio-box%] that has a label matching @racket[entry]
-          and sets the radio-box to @racket[entry].})
- 
- (proc-doc/names
-  test:set-check-box!
-  (-> (or/c string? (is-a?/c check-box%)) boolean? void?)
-  (check-box state)
-  @{Clears the @racket[check-box%] item if @racket[state] is @racket[#f], and sets it
-  otherwise.
-  
-  If @racket[check-box] is a string,
-  this function searches for a @racket[check-box%] with a label matching that string,
-  otherwise it uses @racket[check-box] itself.})
- 
- (proc-doc/names
-  test:set-choice!
-  (-> (or/c string? (is-a?/c choice%)) (or/c string? (and/c number? exact? integer? positive?))
-      void?)
-  (choice str)
-  @{Selects @racket[choice]'s item @racket[str]. If @racket[choice] is a string,
-  this function searches for a @racket[choice%] with a label matching
-  that string, otherwise it uses @racket[choice] itself.})
- 
- (proc-doc/names
-  test:set-list-box!
-  (-> (or/c string? (is-a?/c list-box%)) 
-      (or/c string? exact-nonnegative-integer?) 
-      void?)
-  (choice str/index)
-  @{Selects @racket[list-box]'s item @racket[str]. If @racket[list-box] is a string,
-  this function searches for a @racket[list-box%] with a label matching
-  that string, otherwise it uses @racket[list-box] itself.
-  
-  The @racket[str/index] field is used to control which entry in the list
-  box is chosen.})
- 
- (proc-doc/names
-  test:keystroke
-  (->* ((or/c char? symbol?))
-       ((listof (or/c 'alt 'control 'meta 'shift 
-                      'noalt 'nocontrol 'nometa 'noshift)))
-       void?)
-  ((key)
-   ((modifier-list null)))
-  @{This function simulates a user pressing a key. The argument, @racket[key],
-  is just like the argument to the
-  @method[key-event% get-key-code]
-  method of the @racket[key-event%] class. 
-  
-  @italic{Note:}
-  To send the ``Enter'' key, use @racket[#\return],
-  not @racket[#\newline].
-  
-  The @racket['shift] or @racket['noshift] modifier is implicitly set from @racket[key],
-  but is overridden by the argument list. The @racket['shift] modifier is
-  set for any capitol alpha-numeric letters and any of the following characters:
-  @racketblock[
-   #\? #\: #\~ #\\ #\|
-   #\< #\> #\{ #\} #\[ #\] #\( #\)
-   #\! #\@ #\# #\$ #\% #\^ #\& #\* #\_ #\+
-  ]
-  
-  If conflicting modifiers are provided, the ones later in the list are used.})
- 
- (proc-doc
-  test:menu-select
-  (->i ([menu string?]) () #:rest [items (listof string?)] [res void?])
-  @{Selects the menu-item named by the @racket[item]s in the menu named @racket[menu].
-  
-  @italic{Note:}
-  The string for the menu item does not include its keyboard equivalent.
-  For example, to select ``New'' from the ``File'' menu, 
-  use ``New'', not ``New Ctrl+N''.})
- 
- (proc-doc/names
-  test:mouse-click
-  (->*
-   ((or/c 'left 'middle 'right)
-    (and/c exact? integer?)
-    (and/c exact? integer?))
-   ((listof (or/c 'alt 'control 'meta 'shift 'noalt
-                  'nocontrol 'nometa 'noshift)))
-   void?)
-  ((button x y)
-   ((modifiers null)))
-  @{Simulates a mouse click at the coordinate (x,y) in the currently
-  focused @racket[window], assuming that it supports the 
-  @method[canvas<%> on-event] method.
-  Use @racket[test:button-push] to click on a button.
-  
-  Under Mac OS X, @racket['right] corresponds to holding down the command
-  modifier key while clicking and @racket['middle] cannot be generated.
-  
-  Under Windows, @racket['middle] can only be generated if the user has a
-  three button mouse.
-  
-  The modifiers later in the list @racket[modifiers] take precedence over
-  ones that appear earlier.})
-
- (proc-doc/names
-  test:run-interval
-  (case->
-   (number? . -> . void?)
-   (-> number?))
-  ((msec) ())
-  @{See also @secref{test:actions-completeness}.
-  The first case in the case-lambda sets
-  the run interval to @racket[msec] milliseconds and the second
-  returns the current setting.})
- 
- (parameter-doc
-  test:current-get-eventspaces
-  (parameter/c (-> (listof eventspace?)))
-  func
-  
-  @{This parameter that specifies which evenspaces
-         (see also @secref[#:doc '(lib "scribblings/gui/gui.scrbl") "eventspaceinfo"])
-  are considered when finding the frontmost frame.
-  The first case
-  sets the parameter to @racket[func]. The procedure @racket[func] will be
-  invoked with no arguments to determine the eventspaces to consider
-  when finding the frontmost frame for simulated user events.
-  The second case
-  returns the current value of the parameter. This will be a procedure
-  which, when invoked, returns a list of eventspaces.})
- 
- (proc-doc/names
-  test:new-window 
-  (-> (is-a?/c window<%>) void?)
-  (window)
-  @{Moves the keyboard focus to a new window within the currently active
-          frame.  Unfortunately, neither this function nor any other function in
-          the test engine can cause the focus to move from the top-most (active) frame.})
- 
- (proc-doc/names 
-  test:close-top-level-window
-  (-> (is-a?/c top-level-window<%>) void?)
-  (tlw)
-  @{Use this function to simulate clicking on the close box of a frame.
-  Closes @racket[tlw] with this expression:
-  @racketblock[
-   (when (send tlw can-close?)
-     (send tlw on-close)
-     (send tlw show #f))]})
- 
- (proc-doc/names
-  test:top-level-focus-window-has?
-  (-> (-> (is-a?/c area<%>) boolean?) boolean?)
-  (test)
-  @{Calls @racket[test] for each child of the @racket[test:get-active-top-level-window]
-          and returns @racket[#t] if @racket[test] ever does, otherwise
-          returns @racket[#f]. If there
-          is no top-level-focus-window, returns @racket[#f].})
- 
- 
- (proc-doc
-  test:number-pending-actions
-  (-> number?)
-  @{Returns the number of pending events (those that haven't completed yet)})
- 
- (proc-doc
-  test:reraise-error
-  (-> void?)
-  @{See also @secref{test:errors}.})
- 
- (proc-doc/names
-  test:run-one
-  (-> (-> void?) void?)
-  (f)
-  @{Runs the function @racket[f] as if it was a simulated event.})
- 
- (parameter-doc
-  test:use-focus-table
-  (parameter/c (or/c boolean? 'debug))
-  use-focus-table?
-  @{If @racket[#t], then the test framework uses @racket[frame:lookup-focus-table] to determine
-    which is the focused frame. If @racket[#f], then it uses @racket[get-top-level-focus-window].
-    If @racket[test:use-focus-table]'s value is @racket['debug], then it still uses 
-    @racket[frame:lookup-focus-table] but it also prints a message to the @racket[current-error-port]
-    when the two methods would give different results.})
- 
- (proc-doc/names
-  test:get-active-top-level-window
-  (-> (or/c (is-a?/c frame%) (is-a?/c dialog%) #f))
-  ()
-  @{Returns the frontmost frame, based on @racket[test:use-focus-table].})
- 
- (proc-doc/names
-  label-of-enabled/shown-button-in-top-level-window?
-  (-> string? boolean?)
-  (label)
-  @{Returns @racket[#t] when @racket[label] is
-            the label of an enabled and shown
-            @racket[button%] instance that
-            is in the top-level window that currently
-            has the focus, using @racket[test:top-level-focus-window-has?].})
- 
- (proc-doc/names
-  enabled-shown-button?
-  (-> (is-a?/c button%) boolean?)
-  (button)
-  @{Returns @racket[#t] when @racket[button]
-            is both enabled and shown.})
- 
- (proc-doc/names
-  button-in-top-level-focusd-window?
-  (-> (is-a?/c button%) boolean?)
-  (button)
-  @{Returns @racket[#t] when @racket[button] is
-            in the top-level focused window.}))
diff --git a/pkgs/gui-pkgs/gui-lib/hierlist/hierlist.rkt b/pkgs/gui-pkgs/gui-lib/hierlist/hierlist.rkt
deleted file mode 100644
index c0ae6e9c6b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/hierlist/hierlist.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scheme/base
-
-;; This is a stub for legacy code
-
-(require mrlib/hierlist)
-(provide (all-from-out mrlib/hierlist))
diff --git a/pkgs/gui-pkgs/gui-lib/icons/turn-down-click.png b/pkgs/gui-pkgs/gui-lib/icons/turn-down-click.png
deleted file mode 100644
index 2e91127976..0000000000
Binary files a/pkgs/gui-pkgs/gui-lib/icons/turn-down-click.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-lib/icons/turn-down.png b/pkgs/gui-pkgs/gui-lib/icons/turn-down.png
deleted file mode 100644
index e163ec5466..0000000000
Binary files a/pkgs/gui-pkgs/gui-lib/icons/turn-down.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-lib/icons/turn-up-click.png b/pkgs/gui-pkgs/gui-lib/icons/turn-up-click.png
deleted file mode 100644
index df807d9648..0000000000
Binary files a/pkgs/gui-pkgs/gui-lib/icons/turn-up-click.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-lib/icons/turn-up.png b/pkgs/gui-pkgs/gui-lib/icons/turn-up.png
deleted file mode 100644
index a38a83b60a..0000000000
Binary files a/pkgs/gui-pkgs/gui-lib/icons/turn-up.png and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-lib/info.rkt b/pkgs/gui-pkgs/gui-lib/info.rkt
deleted file mode 100644
index a9b19e14bd..0000000000
--- a/pkgs/gui-pkgs/gui-lib/info.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("srfi-lite-lib"
-               "data-lib"
-               "base"
-               "syntax-color-lib"
-               "draw-lib"
-               "snip-lib"
-               "wxme-lib"
-               "pict-lib"
-               "scheme-lib"
-               "scribble-lib"
-               "string-constants-lib"
-               "unstable-options-lib"
-               "unstable-2d"
-               "compatibility-lib"
-               "tex-table"
-               ("gui-i386-macosx" #:platform "i386-macosx")
-               ("gui-x86_64-macosx" #:platform "x86_64-macosx")
-               ("gui-ppc-macosx" #:platform "ppc-macosx")
-               ("gui-win32-i386" #:platform "win32\\i386")
-               ("gui-win32-x86_64" #:platform "win32\\x86_64")
-               ("gui-x86_64-linux-natipkg" #:platform "x86_64-linux-natipkg")))
-(define build-deps '("at-exp-lib"
-                     "rackunit-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"gui\"")
-
-(define pkg-authors '(mflatt robby))
-
-(define version "1.4")
diff --git a/pkgs/gui-pkgs/gui-lib/mred/Draw_and_GUI_5_1.txt b/pkgs/gui-pkgs/gui-lib/mred/Draw_and_GUI_5_1.txt
deleted file mode 100644
index 0621180eda..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/Draw_and_GUI_5_1.txt
+++ /dev/null
@@ -1,194 +0,0 @@
-GRacket, Racket, Drawing, and GUIs
-----------------------------------
-
-Version 5.1 includes two major changes to the Racket drawing and GUI
-API:
-
- * The drawing portion of the GUI toolbox is now available as a
-   separate layer: `racket/draw'. This layer can be used independent
-   of the `racket/gui/base' library, although `racket/gui' re-exports
-   `racket/draw'.
-
-   (The `racket/draw' library is built on top of the widely used Cairo
-   drawing library and Pango text-rendering library.)
-
- * The GRacket executable is no longer strictly necessary for running
-   GUI programs; the `racket/gui/base' library can be used from
-   Racket.
-
-   The GRacket executable still offers some additional GUI-specific
-   functionality however. Most notably, GRacket is a GUI application
-   on Windows (as opposed to a console application, which is
-   launched slightly differently by the OS), GRacket is a bundle on
-   Mac OS X (so the dock icon is the Racket logo, for example), and
-   GRacket manages single-instance mode for Windows and X.
-
-The drawing and GUI libraries have also changed in further small ways.
-
-
-Bitmaps
--------
-
-Drawing to a bitmap may not produce the same results as drawing to a
-canvas. Use the `make-screen-bitmap' function (from `racket/gui') or
-the `make-bitmap' method of `canvas%' to obtain a bitmap that uses the
-same drawing algorithms as a canvas.
-
-A color bitmap can have an alpha channel, instead of just a mask
-bitmap. When drawing a bitmap, alpha channels are used more
-consistently and automatically than mask bitmaps. More significantly,
-drawing into a bitmap with an alpha channel preserves the drawn
-alphas; for example, drawing a line in the middle of an empty bitmap
-produces an image with non-zero alpha only at the drawn line.
-
-Only bitmaps created with the new `make-gl-bitmap' function support
-OpenGL drawing. The `make-gl-bitmap' function takes a `gl-config%' as
-an argument, and the `get-gl-config' and `set-gl-config' methods of
-`bitmap%' have been removed.
-
-Use the new `make-bitmap', `read-bitmap', `make-monochrome-bitmap',
-`make-screen-bitmap', and `make-gl-bitmap' functions to create
-bitmaps, instead of using `make-object' with `bitmap%'. The new
-constructors are less overloaded and provide more modern defaults
-(such as alpha channels by default).
-
-Image formats can be read into a `bitmap%' from from input ports,
-instead of requiring a file path. A newly created bitmap has an empty
-content (i.e., white with zero alpha), instead of unspecified content.
-
-
-Canvases
---------
-
-Drawing to a canvas always draws into a bitmap that is kept offscreen
-and periodically flushed onto the screen. The new `suspend-flush',
-`resume-flush', and `flush' methods of `canvas%' provide some control
-over the timing of the flushes, which in many cases avoids the need
-for (additional) double buffering of canvas content.
-
-OpenGL drawing in a canvas requires supplying 'gl as a style when
-creating the `canvas%' instance. OpenGL and normal dc<%> drawing no
-longer mix reliably in a canvas.
-
-
-Drawing-Context Transformations
--------------------------------
-
-A `dc<%>' instance supports rotation (via `set-rotation'), negative
-scaling factors for flipping, and a general transformation matrix (via
-`set-initial-matrix'). A transformation matrix has the form `(vector
-xx xy yx yy x0 y0)', where a point (x1, y1) is transformed to a point
-(x2, y2) with x2 = xx*x1 + yx*y1 + x0 and y2 = xy*x1 + yy*y1 + y0,
-which is the usual convention.
-
-New methods `translate', `scale', `rotate', and `transform' simplify
-adding a further translation, scaling, rotation, or arbitrary matrix
-transformation on top of the current transformation. The new
-`get-translation' and `set-translation' methods help to capture and
-restore transformation settings.
-
-The old translation and scaling transformations apply after the
-initial matrix. The new rotation transformation applies after the
-other transformations. This layering is redundant, since all
-transformations can be expressed in a single matrix, but it is
-backward-compatible. Methods like `get-translation',
-`set-translation', `scale', etc. help hide the redundancy.
-
-
-PostScript, PDF, and SVG Drawing Contexts
------------------------------------------
-
-The dimensions for PostScript output are no longer inferred from the
-drawing. Instead, the width and height must be supplied when the
-`post-script-dc%' is created.
-
-The new `pdf-dc%' drawing context is like `post-script-dc%', but it
-generates PDF output.
-
-The new `svg-dc%' drawing context is similar to `post-script-dc%',
-but it generates SVG output.
-
-All drawing contexts, including `post-script-dc%' support smoothing
-modes, and the default is 'unsmoothed even for `post-script-dc%' ---
-which means that PostScript drawing is aligned and pen widths are
-truncated to integer sizes by default. Drawing at pen size 0 no longer
-triggers ``hairline'' mode, but instead just uses a 1/4-width pen
-when in 'smoothed mode.
-
-
-Other Drawing-Context Changes
------------------------------
-
-The alpha value of a `dc<%>' (as set by `set-alpha') is used for all
-drawing operations, including drawing a bitmap.
-
-The `draw-bitmap' and `draw-bitmap-section' methods now smooth bitmaps
-while scaling, so the `draw-bitmap-section-smooth' method of
-`bitmap-dc%' simply calls `draw-bitmap-section'.
-
-A `region%' can be created as independent of any `dc<%>', in which
-cases it uses the drawing context's current transformation at the time
-that it is installed as a clipping region.
-
-Brushes now support linear and radial gradients.
-
-The old 'xor mode for pens and brushes is no longer available (since
-it is not supported by Cairo).
-
-
-Editor Changes
---------------
-
-The `draw-caret' argument to a `snip%' or `editor<%>' `draw' or
-`refresh' method can be a pair, which indicates that the caret is
-owned by an enclosing display and the selection spans the snip or
-editor. In that case, the snip or editor should refrain from drawing a
-background for the selected region, and it should draw the foreground
-in the color specified by `get-highlight-text-color', if any.
-
-
-Other GUI Changes
------------------
-
-The `on-popup' method of `combo-field%' can be used to adjust the
-content of the combo-box popup menu, but the default implementation no
-longer triggers the popup menu; instead, the popup behavior is built
-into the control.
-
-Event callbacks are delimited by a continuation prompt using the
-default continuation prompt tag. As a result, continuations can be
-usefully captured during one event callback and applied during other
-callbacks or outside of an even callback. The continuation barrier and
-jump-defeating `dynamic-wind' that formerly guarded callbacks has been
-removed.
-
-The `on-subwindow-char' and `on-subwindow-event' methods for controls
-are somewhat more restricted in the actions they can take without
-disabling the control's handling of key and mouse events. See the
-documentation for more information.
-
-The 'mdi-child and 'mdi-parent styles for `frame%' on Windows are no
-longer supported, and the `on-mdi-activate' method has been
-removed. (The styles and method actually lingered in `racket/gui'
-until version 5.1.2.3, but they did not work.)
-
-
-Registry Functions
------------------
-
-The `get-resource' and `write-resource' functions have moved to a
-`file/resource' library that is re-exported by `racket/gui/base'.
-These function now work only for reading and writing the Windows
-registry or ".ini" files; they report failure for other platforms.
-
-
-Removed Functions
------------------
-
-The `send-event' function has been removed from `racket/gui/base'. If
-there is any demand for the removed functionality, it will be
-implemented in a new library.
-
-The `current-ps-afm-file-paths' and `current-ps-cmap-file-paths'
-functions have been removed, because they no longer apply. PostScript
-font information is obtained through Pango.
diff --git a/pkgs/gui-pkgs/gui-lib/mred/HISTORY.txt b/pkgs/gui-pkgs/gui-lib/mred/HISTORY.txt
deleted file mode 100644
index 7ec87098b0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/HISTORY.txt
+++ /dev/null
@@ -1,1725 +0,0 @@
-Version 6.0, January 2014
-
-Added get-display-backing-scale
-Added get-backing-scale to bitmap%
-Fixed key-event% get-key-release-code to return 'press instead of 'down
- for a key-down event
-Changed GUI size limit to 1000000
-Add dimension-integer?, position-integer?, spacing-integer?, and
- positive-dimension-integer?
-Framework: changed backward-containing-sexp so it returns #f in
- more situations
-Framework: syntax colorer now usees 'text' for stuff between {}s
- in scribble mode (not string)
-bitmap-dc% get-pixel and set-pixel now transmit alpha values to/from
- their arguments
-
-----------------------------------------
-
-Version 5.1, February 2011
-
-The GRacket executable is now a thin wrapper on the Racket executable,
-with the drawing and GUI libraries re-implemented as plain Racket
-libraries. See "Draw_and_GUI_5_1.txt" in the Racket release-notes
-directory. These notes will be discontinued.
-
-----------------------------------------------------------------------
-
-Version 5.0.2, October 2010
-
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 5.0.1, July 2010
-
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 5.0, May 2010
-
-Changed the executable from MrEd to GRacket
-
-----------------------------------------------------------------------
-
-Version 4.2.5, March 2010
-
-Changed radio-box% to allow #f as a selection so that no buttons are
- selected
-Added accept-tab-focus method to canvas<%> and editor-canvas%
-
-----------------------------------------------------------------------
-
-Version 4.2.4, January 2010
-
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 4.2.3, November 2009
-
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 4.2.2, September 2009
-
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 4.2.1, July 2009
-
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 4.2, May 2009
-
-Ported the editor classes (text%, snip%, editor-canvas%, etc.) from
- C++ to Scheme
-
-----------------------------------------------------------------------
-
-Version 4.1.5, March 2009
-
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 4.1.4, January 2009
-
-Changed image-snip% to implement equal<%>
-
-----------------------------------------------------------------------
-
-Version 4.1.3, November 2008
-
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 4.1.2, October 2008
-
-Changed -z/--text-repl to a configuration option
-
-----------------------------------------------------------------------
-
-Version 4.1.1, October 2008
-
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 4.1, August 2008
-
-Added auto-resize init argument and method to message%
-Added scroll-editor-to method to editor<%>
-Added on-reflow method to text%
-
-----------------------------------------------------------------------
-
-Version 4.0, June 2008
-
-Mac OS X and Windows: adjusted window refresh to draw only
- in update regiion
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 372, December 2007
-
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 371, August 2007
-
-Fixed (get-face-list 'mono) for Mac OS X and X11
-Changed begin-container-sequence to delay making windows visible
-Added 'no-focus style for canvas%
-
-----------------------------------------------------------------------
-
-Version 370, May 2007
-
-WXME file format changed to include a #reader() prefix
-Added is-maximized? method to frame% (Windows, Mac OS X)
-Improved the disabled appearance of some controls under Mac OS X
-Added use-style-background and style-background-used? methods
- to editor-snip%; changes the editor-snip WXME format
-Mac OS X printer-dc% uses scaling specified by the current ps-setup%
-
-----------------------------------------------------------------------
-
-Version 360, November 2006
-
-Added get-other-altgr-key-code and get-other-shift-altgr-key-code
- to key-event%, and adjusted Ctl- (Windows, X) and Cmd- (Mac OS X)
- mappings to preserve Shift (and Option), moving the unshifted
- version to the "other" fields; adjusted keymap% matching to use
- new "other" fields and to more precisely weight matches
-Mac OS X: fixed event handling to support CJK input and input from 
- the character palette 
-Removed on-scroll from canvas<%> and editor-canvas%
-
-----------------------------------------------------------------------
-
-Version 352, July 2006
-
-Minor bug fixes
-
-----------------------------------------------------------------------
-
-Version 351, July 2006
-
-Changed the shortcut type for selectable-menu-item<%> to allow
- key-code symbols
-Added get-shortcut-prefix and set-shortcut-prefix to menu-item
- to selectable-menu-item<%>, along with corresponding initialization
- argument to menu-item% and checkable-menu-item%
-Added get-default-shortcut-prefix
-Removed get-x-shortcut-prefix and set-x-shortcut-prefix from
- selectable-menu-item<%>
-Added get-other-shift-key-code to key-event%
-Added support for "?:" modifier to keymap state strings
-Changed internal handling of keyboard events
-
-----------------------------------------------------------------------
-
-Version 350, June 2006
-
-Default max undo history for an editor<%> is 0; use
- set-max-undo-history to enable undo
-Disabled menu-item shortcuts stay effective (to just beep)
-When no location is given for a dialog%, it is centered when
- shown
-Added 'no-sheet dialog% style
-Added |MrEd:emacsUndo| low-level preference
-
-----------------------------------------------------------------------
-
-Version 301, Decmber 2005
-
-Fixed a bug in reading non-text files whose encoding contains
- a byte string longer than 64 bytes
-
-----------------------------------------------------------------------
-
-Version 300, Decmber 2005
-
-Changed editor file format to an ASCII encoding
-Changed measurement of text for post-script-dc%
-Changed label->plain-label to strip parenthesized mneumonics
-Added 'package and 'enter-package flags to put-file, and
- changed Mac OS X put-file to use extension and filters args
-Added on-mdi-activate to frame%
-
-----------------------------------------------------------------------
-
-Version 299.400, September 2005
-
-No MrEd-specific changes
-
-----------------------------------------------------------------------
-
-Version 299.200, August 2005
-
-Added get-handle to window<%>
-Added open-output-text-editor
-Changed application-file-handler so that handler's result is
- used; #f tells Windows that the application won't quit
-
-----------------------------------------------------------------------
-
-Version 299.100, March 2005
-
-General:
- Added support for smoothed (i.e., anti-aliased) shape drawing,
-  including support for spline-based paths; under X, smoothed
-  drawing requires Cairo
- Mac OS X: switched to composite Carbon layer for widgets, added
-  support for full keyboard access
- X: modernized GUI look, added support for X clipboard (as opposed
-  to the X selection)
- Changed some methods to augmentable instead of overrideable (see
-  MzScheme_300.txt about augmentable methods):
-      top-level-window<%>: can-close?
-                           on-close
-      editor<%>:           on-change
-                           on-snip-modified
-                           can-save-file?
-                           on-save-file
-                           after-save-file
-                           can-load-file?
-                           on-load-file
-                           after-load-file
-                           on-edit-sequence
-                           after-edit-sequence
-      text%:               can-insert?
-                           on-insert
-                           after-insert
-                           can-delete?
-                           on-delete
-                           after-delete
-                           can-change-style?
-                           on-change-style
-                           after-change-style
-                           after-set-position
-                           can-set-size-constraint?
-                           on-set-size-constraint
-                           after-set-size-constraint
-      pasteboard%:         can-insert?
-                           on-insert
-                           after-insert
-                           can-delete?
-                           on-delete
-                           after-delete
-                           can-move-to?
-                           on-move-to
-                           after-move-to
-                           can-resize?
-                           on-resize
-                           after-resize
-                           can-reorder?
-                           on-reorder
-                           after-reorder
-                           can-select?
-                           on-select
-                           after-select
-                           can-interactive-move?
-                           on-interactive-move
-                           after-interactive-move
-                           can-interactive-resize?
-                           on-interactive-resize
-                           after-interactive-resize
-Widgets and Widget Features:
- Added a default callback procedure for every control<%> class
-  that has a callback
- Added combo-field%
- Added 'float and 'metal styles to frame%
- Added 'combo, 'transparent, and 'resize-corner styles to canvas%
-  and editor-canvas%; added 'no-border, 'auto-vscroll, and
-  'auto-hscroll flags to editor-canvas%; added set-resize-corner
-  to canvas<%>; added  show-scrollbars and method to canvas%
- Added set-min-width function to popup-menu%
- Added set-canvas-background and get-canvas-background to
-  canvas<%>
- Added get-item-label, set-item-label, and set to tab-panel%
- Added 'blank cursor%
- Added hide-cursor-until-moved, called by text%'s on-char
- Added message+check-box and message+check-box/custom
- Added a font intialization argument for control<%> classes
-  and popup-menu%, and added get-font method
- Removed get-label-font, get-control-font, set-label-font, 
-  set-control-front, get-label-position, and set-label-position
-  from area-container<%> and implementing classes
- Added normal-control-font, small-control-font, tiny-control-font,
-  view-control-font, and menu-control-font constants
-Drawing:
- Added set-smoothing and get-smoothing to dc<%>
- Added dc-path% class and added draw-path to dc<%>
- Added set-path to region%
- Added in-region? to region%
- Added draw-bitmap-section-smooth to bitmap-dc% (not dc<%>)
- Added variants of dc<%>'s set-{pen,brush} that accept arguments
-  like the-{pen,brush}-list's find-or-create-{pen,brush}
- Changed default of radius argument of set-rounded-rectangle 
-  in region% to -0.25 (consistent with dc<%> method)
- Changed the font% constructor so that weight and style
-  arguments are optional
- Added screen-glyph-exists? to font% and glyph-exists to dc<%>
- Removed get-afm-path and set-afm-path from ps-setup%;
-  use the PLTAFMDIR environment variable or the
-  current-ps-afm-file-paths parameter, instead
- Added can-show-native? and show-native to ps-setup%
- Changed default 'default PostScript font to Helvetica
- Changed default 'decorative PostScript font to Helvetica
- Changed gl-context% swap-buffers to use the call-as-current lock,
-  and changed the lock to be re-entrant
- Added gl-config%, a gl-config init argument to canvas%, and
-  set-gl-config and get-gl-config methods to bitmap%
- X: improved performance of bitmap scaling when RENDER is 
-  available
- Improved performance of get-argb-pixels, set-argb-pixels,
-  and loading of PNG and JPG files on some platforms
-Misc:
- Added the-x-selection-clipboard
- Added paste-x-selection and do-paste-x-selection to editor<%>
- Added "paste-x-selection" to add-editor-keymap-functions
- Changed "middlebutton" mapping in the default text keymap
-  initializer's map to use paste-x-selection
- Dropped question marks for interactive and use-paper-bbox
-  initialization arguments of post-script-dc%; added
-  as-eps initialization argument
- Added an as-eps argument to editor<%>'s print method
- Flattened text from an editor<%> always uses #\newline,
-  not a platform-specific line separator
- Added background-color argument to editor<%>'s refresh
- Added on-split-snip, on-merge-snips, and get-revision-number
-  to text%
- Changed read-one-special in readable-snip<%> to read-special
- Added get-unterminated-bytes to editor-stream-in%
- Removed >> and << from the editor-stream classes, and changed
-  "string" to "bytes" in class and method names
-
-----------------------------------------------------------------------
-
-Version 209, December 2004
-
-No significant changes.
-
-----------------------------------------------------------------------
-
-Version 208, August 2004
-
-No significant changes.
-
-----------------------------------------------------------------------
-
-Version 207, May 2004
-
-Changed Windows launching behavior to bring an existing window
- to the front and to use `application-file-handler' to deliver
- comamnd-line arguments
-
-----------------------------------------------------------------------
-
-Version 206p1, February 2004
-
- Fixed printing scale for Windows NT/2000/XP
-
-
-Version 206, January 2004
-
-Drawing:
- Changed get-argb-pixels and set-argb-pixels to row-major order:
-  left to right then top to bottom
- Added get-bitmap and get-bitmap-mask to image-snip%
- PostScript `draw-bitmap' now uses a supplied mask
- Changed the default radius for dc<%>'s draw-rounded-rectangle
-  to -0.25, and added checking and a mismatch exception
-  when the radius is out of range
-Text and fonts:
- Added optional argument to draw-text in dc<%> for rotation
- Changed text scaling to support independent X and Y scale
-  (except Windows 95/98/Me)
- Added argument to font%, etc., to make size in pixels
- Added size-in-pixels to style<%> and style-delta%
- X with fontconfig/Xft: Added remapping for the 'symbol family
-  to match Adobe symbols (like Mac OS X)
- X with fontconfig/Xft: Added substitution support via
-  comma-separated font names
- X with fontconfig/Xft: Changed default 'symbol face mapping
-  to " Standard Symbols L,Nimbus Sans L"
- Added optional 'mono argument to get-face-list
-Frames:
- X, Mac OS: minimum size and non-stretchiness of a frame
-  or dialog is enforced by the window manager
- Added optional argument to get-display-size to get the entire
-  screen's size under Windows and Mac OS
- Added get-display-left-top-inset
- Added 'hide-menu-bar frame style
- Initial location for a frame can use negative numbers, and
-  the move method can move a frame to a negative location
-Editors:
- Added an optional argument to begin-edit-sequence in
-  editor<%> to treat actions before and after sequence
-  as consecutive
-Framework collection:
- Changed the defaults for frame:standard-menus-mixin;
-  the method file-menu:between-save-as-and-print method no
-  longer creates a separator menu item
- Changed the overriding method behavior of
-   drscheme:frame:basics-mixin
- Modes are now based on the language settings, rather than
-   the filename
-
-----------------------------------------------------------------------
-
-Version 205: August, 2003
-
-Anti-aliased text:
- Text rendering uses smoothing (anti-aliasing) for Mac OS X,
- Windows, and X with Xft/fontconfig/RENDER
-PNG format and image masks:
- Added 'png and 'png/mask as load bitmap types, and added
-  optional background color argument for loading 'png
- Added 'jpeg and 'png as save bitmap types
- Changed draw-bitmap and draw-bitmap-section to accept
-  a non-monochrome bitmap as a mask (serving roughly 
-  as an inverted alpha channel)
- Changed image-snip% to use a mask attached to a
-  bitmap, if any, and to preserve the mask bitmap
-  when the file is saved
-OpenGL:
- OpenGL support now available on all platforms; see also the
-  "sgl" collection
- Changed canvas% so that 'gl style is no longer needed
-  to enable OpenGL drawing in the canvas
- Added get-gl-context method to dc<%>, which returns a
-  gl-context<%> for canvas and bitmap DCs
- Changed with-gl-context method of canvas% to use
-  call-as-current for its gl-context<%>; the difference
-  from the old behavior is that such context-setting
-  is serialized across all eventspaces
-GUI:
- Added 'no-autoclear style to canvas%
- Added 'control-border style to canvas% and editor-canvas%
- Added 'hilite style for pen% and brush%
- Windows: Use XP theme controls (under Windows XP)
- Windows: system font is Tahoma when available,
-  default font is Microsoft Sans Serif when available
- Mac OS X: Added 'toolbar-button style, on-toolbar-button-click
-  method, and modified method to frame%; the 'toolbar-button style
-  only affects the frame under OS X
- Mac OS: Added current-eventspace-has-menu-root? and support for
-  'root parent of a menu-bar% instance
- Mac OS: Added application-file-handler
- Mac OS: Key-release events now reported
- Mac OS X: Fixed menu-bar flashing bug, thanks to Paul Schlie
-Editor:
- Added write-editor-version and read-editor-version
- Changed cut-and-paste WXME format to include version
- Added on-display-size-when-ready and lock for refresh that blocks
-  an edit sequence
- Added get-text! to snip%
- Added locations-computed? to editor<%>
- Added locked-for-write?, locked-for-flow?, and
-  locked-for-read? to editor<%>
-Misc:
- Handling of --main/-C command-line flag changed
-
-----------------------------------------------------------------------
-
-Version 204: May, 2003
-
-Mac OS X: tab-panel% draws a border around its content by default
-Added 'no-border style to tab-panel%
-Windows: removed border around radio-box% buttons, changed label
- to follow requested positioning
-Added group-box-panel%
-Added eventspace-handler-thread
-Added vertical-inset and horizontal-inset methods to editor-canvas%
-Changed text-field% to have margins of 2, reduced space between
- the edit-box border and the editable text
-Windows: switched to XP-style controls under XP
-Added application-quit-handler
-
-----------------------------------------------------------------------
-
-Version 203: December, 2002
-
-Windows: corrected a source of much instability
-Added tab-panel%
-Added message-box/custom
-Added 'app, 'caution, and 'stop styles to message-box
-Added 'app, 'caution, and 'stop labels for message%
-Added value init argument to check%, selection init argument to
- radio-box%, choice%, and list-box%; in the argument order, the new
- argument follows the style argument
-Added checked init argument for checkable-menu-item%
-Added and 'deleted style to every subwindow<%> class; a window
- created with 'deleted is initially invisible and takes no
- space in its container
-Added `file-creator-and-type', useful in Mac OS
-Mac OS X: file dialogs use given starting directory, and dialog%s
- with a parent frame are shown as "sheets"
-Mac OS X: MrEd3m is now supported
-
-----------------------------------------------------------------------
-
-Version 202: August, 2002
-
-Added 'panel brush style for drawing in the current platform's panel
- background color and pattern.
-Added application-about-handler, application-preferences-handler,
- and current-eventspace-has-standard-menus?
-Mac OS X: fixed handling of the standard `Quit' menu item; it now
- invokes the `on-exit' handler of the most recently active frame in the
- initial eventspace
-
-----------------------------------------------------------------------
-
-Version 201: July, 2002
-
-Added 'unknown/mask and 'unknown/gif bitmap types and
- get-loaded-mask and set-loaded-mask methods to bitmap%;
- used for GIF files containing transparent pixels
-New load handler, text-editor-load-handler, enables MrEd to
- load source files that are stored in the graphical
- editor format
-Added open-input-text-editor, used by the load handler
-Added readable-snip<%>, which is recognized in ports created
- with open-input-text-editor to "read" special snips
-Changed file loading and saving so that a snip class name of
- the form "(lib ...)" triggers the loading of a snip class
- implementation
-Removed get-clipboard-client from clipboard<%>
-Changed set-clipboard-client to associate a clipboard-client%
- object to the current eventspace, and the-clipboard to call
- methods within the eventspace through event callbacks
-Added a variant of insert-file to editor<%> to accept
- an input port instead of a filename
-Changed load-file, save-file, and insert-file in editor<%>
- to raise exceptions instead of returning booleans
-Added can-reorder?, on-reorder, and after-reorder to
- pasteboard%
-Added on-snip-modified method to editor<%>, set-unmodified
- method on snip%, and modified method to editor-admin and
- snip-admin
-Added 'packages and 'enter-packages style flags to get-file
- and get-directory; affects only Mac OS
-
-----------------------------------------------------------------------
-
-Version 200: June, 2002
-
-Changed mouse-event% and key-event% positions (x and y) to be
- exact integers
-Added 'wheel-up and 'wheel-down "key" events
-Added 'release key events
-Added popup-menu to window<%>
-Added a popup menu to the message-box dialog that copies the contained
- message to the clipboard
-Changed methods in dc<%> classes to raise an exception if the
- DC is not ok (except for the ok? method)
-Changed dc<%>'s draw-bitmap and draw-bitmap-section to
- scale the bitmap if the dc<%> has a scale, and to accept
- a mask bitmap
-The get-resource and write-resource procedures are deprecated, and
- not supported for Mac OS; MrEd uses the preferences file that
- ismanaged by MzLib's get-preference and put-preferences
-Changed text% undo to restore the pre-modification selection
-Changed text% so that later-installed clickbacks take precedence
-Changed cursor% constructor to take image and mask bitmaps instead of
- a filename
-Restricted all label string arguments to <= 200 characters
-Added optional filters argument to get-file, put-file, and
- get-file-list (used by Windows, only)
-Added get-directory
-Fixed internal lock handling on focus and activation events
-Removed ps-setup%'s get-options and set-options
-Added a use-paper-bbox? initialization argument to post-script-dc%
-Added a 'gl style flag to canvas%, and with-gl-context and
- swap-gl-buffers methods; supported for Windows, only
-Added container-flow-modified method to area-container<%>
-Added "standard" HTML colors to the-color-database
-Added 'size-n/s, 'size-e/w, 'size-ne/sw, and 'size-nw/se icons
-Windows: removed special handling of Ctl-m, Ctl-i, and Ctl-h
-X: play-sound in Linux uses the "play" program, and under
-   Solaris, it uses the "audioplay" program
-X: Default keymap double-click time determined via the standard Xt
- function
-X: 'no-resize-border and 'no-caption work for frame% with many window
- managers
-X: too-long menus can scroll
-X: changed default preview command from "ghostview" to "gv"
-Mac OS: play-sound plays virtually any kind of sound, including
- .wav files; QuickTime 3.0 or higher is required
-
-----------------------------------------------------------------------
-
-Version 103: August 28, 2000
-
-Added 'wait as a possible argument to yield, and changed startup
- to call (yield 'wait), with new meaning for -V flag
-Removed 'anchored flag for snip% (wasn't implemented)
-Added support for loading JPEG file (but not saving)
-Added get-clipboard-bitmap and set-clipboard-bitmap to
- clipboard<%>
-Changed graphical-read-eval-print-loop to take an optional
- eventspace argument, which determines the evaluation eventspace
-Fixed menu shortcut handling to call the menu bar's `on-demand'
- method before looking for a key binding
-Fixed auto-wrapping bug in text%
-Fixed set-max-undo-history in editor<%>
-Windows: editors can paste bitmaps copied to the
- clipboard from other programs
-Windows: fixed get-file-list
-
-----------------------------------------------------------------------
-
-Version 102: June 26, 2000
-
-Changed the interaction of face and familiy settings in a font for
- drawing text
-Removed get-afm-name and set-afm-name from font-name-directory<%>,
- and changed post-script-dc% to use the PostScript font name as the
- AFM file name
-Added get-margin and set-margin to ps-setup%; post-script-dc% uses
- the margins to shrink its paper size and offset its output
-Changed pen%'s width from integer to real number (used for PS)
-Added on-superwindow-show and on-superwindow-enable to window<%>
-Added get-file-list procedure
-Added on-message to top-level-window<%>
-Added send-message-to-window procedure
-Added pop-down callback initialization argument to popup-menu%, and
- added 'menu-popdown and 'menu-popdown-none event types to
- control-event%
-Added get-popup-target method to popup-menu%
-Added popup-menu method to editor-admin% and snip-admin%
-Added can-do-edit-operation? to editor<%>
-Added "leftbuttonseq", "middlebuttonseq", and "rightbuttonseq" to
- keymap%'s map-function
-Changed the default text keymap initializer to map right button
- releases to popup an edit menu
-Changed the meaning of the on-change method in editor<%>; see the
- manual for details
-Editor reading/writing/cutting/pasting no longer relies on global
- state, so exceptions raised for one editor do not affect other
- editors
-Removed read-done and write-done from snip-class%
-Moved reading-version to snip-class% (from snip-class-list%)
-Added offset argument to dc<%>'s get-text-extent and draw-text
-Made stdio window for Windows/MacOS accept input (for `read', etc.)
-X, Mac: Fixed list-box% to handle arbitrarily many list items
-X: Fixed input of keypad characters and dead characters (such as
- accent marks)
-X: Fixed loading of amimated GIFs (shows only first image)
-
-----------------------------------------------------------------------
-
-Version 101: October 25, 1999
-
-Showing an inactive child window now raises an exception
-Added set-paragrapgh-alignment to text%
-Added 'symbol font family
-Added {set,get}-paste-text-only to editor<%>
-Added {set,get}-line-spacing and {set,get}-styles-sticky to text%
-Added {set,get}-tight-text-fit to editor-snip%
-A text-field%'s text% is in paste-text-only mode by default
-
-Framework changes:
-
-- gui-utils:get-choice accepts a new (final) parameter that controls the 
- result when the user cancels the dialog. 
-
-- added color-model:rgb-color-distance that accepts six numbers representing 
- two colors in rgb form and returns the distance between those colors. 
- Larger numbers mean that the human eye will see larger differences. 
-
-- when the framework collection has a "CVS" subdirectory, 
-  info frames show the current memory usage in the info panel.
-  Clicking the button performs three gcs and updates the memory count.
-
-- editor:basic-mixin no longer has a `default-auto-wrap?' method.
-  Just set the parameter method `auto-wrap' directly.
- 
-----------------------------------------------------------------------
-
-Version 100: August 9, 1999
-
-MrEd 100 is the successor to MrEd 53. For MrEd 100, we preserved the
-underlying windowing model, but redesigned the GUI toolbox interface
-to make it simpler and more Scheme-like. Every MrEd 53 program
-requires substantial changes to run in MrEd 100.
-
-The revised interface makes MrEd more accessible to new users: class
-and method names are more consistent; useless and redundant methods
-have been eliminated; and methods check their arguments more
-precisely.  Key portions of the documentation have been re-written,
-and a new help system called "Help Desk" makes locating information
-much easier than before.
-
-The implementation behind the revised interface is reliable. Whereas
-previous versions of MrEd were plagued by bugs and inconsistently
-implemented features, the new interface is consistently implemented
-across platforms and thoroughly tested. Of course, bugs will always
-slip through, but MrEd 100 is far more robust than its predecessors as
-a result of a cleaner implementation and a new testing process.
-
-New Application Architecture
-----------------------------
-
-MrEd 53 comprised two parts:
-
- * a core toolbox (containing names prefixed with `wx:') that was too
-   primitive for real programming (notably, no geometry management);
-   and
-
- * an application framework (containing names prefixed with `mred:')
-   that provided crucial functionality (notably, windows with geometry
-   management) but also much more, making it too heavyweight for
-   simple GUI programs.
-
-For MrEd 100, we moved the boundary between the core toolbox and the
-application framework. The name "MrEd" now refers to only the core
-toolbox, but the core toolbox now includes the most useful `mred:'
-classes from the old application framework. While merging the `wx:'
-and `mred:' classes, we eliminated the prefixes.
-
-All of the core toolbox classes are built into the MrEd executable.
-The old `mred:' classes that are not part of the core toolbox have
-been moved into a separate framework library. The framework library is
-designed for use in large and polished applications (as opposed to
-small or prototype applications), and particularly in applications
-that require coordinated groups of frames, editor frames with
-searching, or user preference dialogs.
-
-Running MrEd and Developing MrEd Applications
----------------------------------------------
-
-MrEd 100 is more consistent with MzScheme than previous releases. The
-default language for MrEd 100 is the same as MzScheme's default
-language. In contrast, MrEd 53's language had different
-case-sensitivity and cond-fallthrough behavior. Command-line handling
-for MrEd 100 is nearly the same as for MzScheme; the only difference
-is that MrEd executes `(graphical-read-eval-print-loop)' on startup
-instead of `(read-eval-print-loop)'. MrEd 100 programmers do not need
-to understand units and collections to implement a simple GUI
-application.
-
-MrEd's `graphical-read-eval-print-loop' implements a rather primitive
-REPL, unlike the relatively useful REPL provided by the old MrEd
-toolbox-framework combination. MrEd 100 provides no replacement for
-the old REPL. Instead, DrScheme 100 provides a REPL that matches
-MrEd's language exactly.
-
-Porting to MrEd 100
--------------------
-
-The remainder of this document provides an overview of MrEd 100 with
-notes for porting MrEd 53 applications. Section 0 describes a few
-highlights of the MrEd 100 revision. Section 1 shows the new
-interface/class hierarchy for windows and a few other parts of the
-toolbox. Section 2 lists the methods of the new interfaces and
-classes. Section 3 lists the complete, new set of MrEd procedures,
-showing the arguments for selected new procedures. Section 4 provides
-a mapping from the old `wx:const-XXX' constants to the new
-symbols. Finally, Section 5 lists some of the small, relatively
-subtle, and potentially confusing changes in MrEd 100 (similar to
-changes normally listed in the HISTORY notes).
-
-Further Details
----------------
-
-See plt/notes/mred/MrEd_100.txt in the PLT distribution for further
-details.
-
-----------------------------------------------------------------------
-
-Version 53: July 25, 1998
-
-IMPORTANT: Expect further major changes in the MrEd toolbox with
-version 54. See the note for version 51, below. Here are some
-more expected changes:
- * wx:text%, wx:multi-text%, wx:text-window%, mred:text%, and
-   mred:multi-text% will be removed and replaced with 
-   wx:media%-based tools, i.e., the current mred:media-text% and
-   mred:media-multi-text%
-
-Engine:
--------
-Removed wx:concat-files, wx:string-match?, wx:get-temp-file-name
- (see MzLib's new make-temporary-file)
-Procedures and methods that accept wx:const-XXX bit combinations
- now check their arguments more thoroughly; junk values are
- no longer ignored
-The wx:style-delta% initialization and wx:style-delta% set-delta
- method no longer allow a second argument with command flags
- where it used to be ignored; the second argument with 
- wx:const-change-underline is now a Boolean rather than 0 or 1
-Removed some constants:
-  wx:const-bitmap-type-default
-  wx:const-bitmap-discard-colourmap
-  wx:const-allow-auto-resize
-  wx:const-needed-sb
-  wx:const-event-type-char
-  wx:const-conter (use wx:const-centre)
-All methods that operate on bitmap files now require that the 
- bitmap type is specified
-Removed wx:key-event%'s get-event-type, since there was only
- one possible result
-Added wx:const-print-postscript, wx:const-print-standard, and
- wx:const-print-ask
-Restricted wx:find-path to fewer paths; see MzScheme's new
- find-system-path
-Changed wx:list-box%'s get-selections to just return a list
- of integers
-The following wx:command-event% methods are deprecated and
- have been removed from the documentation:
-  get-/set-command-int (use get-/set-selection)
-  get-/set-command-string (use get-/set-string)
-  get-/set-extra-long (use get-/set-selection-type)
-Cleaned up wx:list-box% multiple-selection (wx:const-multiple
- and wx:const-extended standardized across platforms)
-Cleaned up wx:command-event% field values for list-box events
-Cleaned up canvas scrollbar handling for all platforms;
- the get-scroll-units method was removed
-wx:panel%'s set-button-font and set-label-font work consistenly
-Windows: cleaned up structure of sliders and gauges
-
-System:
--------
-- Fixed minimum mred:slider% size
-
-- Cleaned up wx:command-event% field values for list-box double-click
-  events
-
-- When only one object of class mred:standard-menus-frame% exists,
-   its File|Close menu item is disabled, and its close button
-   invokes the exit handler
-
-----------------------------------------------------------------------
-
-Version 52: May 25, 1998
-
-IMPORTANT: Expect major changes in the MrEd toolbox with version 53 or
-so. See the note for version 51, below.
-
-Engine:
--------
-on-set-focus and on-kill-focus work reliably; not all windows 
- can get the focus, but those that do call the on-set-focus and
- on-kill-focus methods
-pre-on-char and pre-on-event work for all windows on all
- platforms
-wx:begin-busy-cursor no longer takes a cursor argument, but it
- now works correctly on all platforms
-set-cursor in wx:window% now accepts and returns null, indicating
- that the window's cursor is the same as its parents; most
- windows start out with the null cursor
-Added number method to wx:menu% and wx:menu-bar
-The delete methods of wx:menu% and wx:menu-bar return #t if the
- delete suceeded, #f otherwise
-
-System:
--------
-- mred:standard-menus-frame now has a windows menu. To
-  eliminate it, ovveride "windows-meun" with #f. It
-  is updated by mred:the-frame-group
-
-- added documentation for:
-    mred:constants:original-output-port, 
-    mred:constants:original-error-port, and
-    mred:constants:original-input-port.
-
-- added get-title-prefix to mred:simple-menu-frame% class
-  documented get-title, etc. in mred:simple-menu-frame% class
-  added get-complete-title to mred:simple-menu-frame% class
-
-----------------------------------------------------------------------
-
-Version 51: March 25, 1998
-
-IMPORTANT: Expect major changes in the MrEd toolbox with version 53 or
-so. Likely changes include:
- * Removing the useless size arguments for initializing mred:frame%,
-   mred:button%, etc. instances.
- * Changing the ``nothing'' value (e.g., no parent frame) from null 
-   to #f.
- * Replacing `bitwise-or'ed wx:const-XXX numerical constants with 
-   lists of 'wx:const-XXX symbols.
-
-Engine:
--------
-The wx: classes and procedures are no longer ``built-in''
- with respect to units; instead, all wx: items are now
- in the wx@ signed unit, with the signature wx^, so
- the MzScheme and MrEd languages are the same; the
- wx^ signature is in MrEd's initial environment and
- in the "wxs.ss" library of the "system" collection
-Added a --pre flag for evaluating an expression in a 
- MzScheme-only namespace at startup. This flag is intended
- for use with image dumps (see the MzScheme manual), which
- are disabled by default
-X Windows: mred now accepts a fixed set of standard X
- Windows command-line flags (it treats them the same as
- always) instead of letting the platform-specific Xt
- library decide; these flags must now be specified
- first if there is no --pre flag, or after --pre's 
- argument if there is one, otherwise the flags
- are passed on to MrEd's system (for good or ill)
-X Windows: window manager close-frame request is ignored
- when a modal dialog is in control
-Added security so that wx:snip% methods cannot be overridden 
- to crash MrEd
-Fixed wx:canvas% scrolling on all platforms; the style flags
- wx:const-hscroll and wx:const-vscroll must be used at
- canvas-creation to set up for scrolling. Removed the
- enable-scrolling method from wx:canvas%. Renamed the method
- get-scroll-page-units to get-scroll-units. Added methods
- get-scroll-pos, get-scroll-range, and get-scroll-page.
-The wx:canvas% wx:const-backingstore and wx:const-retained
- style flags have been removed.
-Pasteboard printing implemented [finally], and many pasteboard
- bugs are fixed
-Removed wx:key-event%'s position method and added get-x,
- get-y, set-x, and set-y
-Changed default pen in DC to width 0 instead of 1
-Added get-max-view method to wx:media-admin%
-Revised wx:media-buffer%'s cursor system for better 
- cooperation with embedded buffers; instead of handling
- the cursor in on-default-event, added a method adjust-cursor
- to buffers and snips, and replaced admin's set-cursor with
- update-cursor
-Added refresh-delayed? predicate to wx:media-buffer%, useful
- for deciding whether a buffer (or one of its enclosing 
- buffers) is in an edit-sequence
-Added copy-self-to method to wx:media-buffer% and made copy-self
- overrideable; copy-self creates a new buffer and copy-self-to
- copies properties of the buffer to the newly created buffer;
- now implemented for pasteboards, too
-Added number-of-visible-items to wx:list-box%
-Removed wx:copy-file; MzScheme now has copy-file
-Fixed wx:media-stream-in%'s get-string (it was adding an
- extra nul character)
-Removed error dialogs when wx:media-buffer%'s load-file or
- save-file fails
-Changed the meaning of wx:keymap%'s implies-shift method;
- mapping from ``?'', where ``?'' implies a shift, maps both
- ``?'' and ``s:?''; the idea is that only one of these
- mappings is possible, but it may be difficult to know
- which one
-Windows: fixed canvas mouse events; button-down event grabs
- the mouse until the next button-up event
-Windows: fixed initial setting of DC text mode: transparent
- instead of opaque
-X Windows: fixed wx:frame's iconize and iconized? methods,
- ignoring the X idea of not de-iconifying windows that were 
- iconified by the user
-X Windows: fixed iconification of parentless dialog boxes;
- they can't be iconified, since there's often no way to
- get them back
-Changed the initial setting of an eventspace created by the
- wx:make-eventspace procedure; now, the initial directory is
- the current directory when wx:make-eventspace is called
-Removed wx:exit
-MacOS: fixed event handling -> better response and performance
-More PostScript drawing fixes
-X Windows: added .mred.resources option `mred.forceFocus'; if
- the value is 1, bringing a frame to the foreground forces the
- focus there (good for Window Managers where the focus does
- not follow the pointer); the default is 0, the old behavior
-MacOS: removed the special -r command-line flag
-Upgraded to gc 13alpha1
-
-System:
--------
-- mred console printer improved:
-  - values printer now shows partial results.
-  - last newline inside stdout (purple) boxes ommitted
-  - more efficient
-
-- killing and breaking read (finally) works.
-
-- printing dialogs for windows and mac work better now
-
-- parenthesis matching is improved. The cache is now used much more
-  heavily.
-
-- turned off the file name printouts on splash screen
-
-  evaluate: 
-
-  (wx:write-resource "mred" "splashMessages" 1 (wx:find-path 'setup-file))
-
-  to turn them back on.
-
-- searching keybindings have changed. There are four distinct actions:
-   action1: move keyboard focus to the searching window, opening it if necessary, 
-            or if already there search forward
-   action2: move keyboard focus to the searching window, opening it if necessary, 
-            or if already there search backward.
-   action3: search again, in the same direction
-   action4: move the focus between the main window, searching window and replacment window
-   action5: hide the searching window
-
-The actions are mapped to different keys, based on the platform. 
-
-On unix:
- action1 => control-s, meta-%
- action2 => control-r
- action3 => f3
- action4 => control-i
- action5 => control-g
-
-On the macintosh:
-  action1 => command-f
-  action2 => command-r
-  action3 => command-g
-  action4 => command-o
-  action5 => command-.
-
-On windows:
- action1 => control-f
- action2 => control-r
- action3 => f3, control-g
- action4 => control-i
- action5 => escape
-
-- set-empty-callback in mred:frame-group% is now set-empty-callbacks
-  in mred:frame-group%. See the docs for more details.
-
-- initial basis now documented
-
-- provide "simple" interface to unitized apps
-
-- mred:edit-file used to return (void) when the file was already
-  open. Now it returns the (already open) frame.
-
-- fixed callback printfs from frames. They now appear in the console.
-
-- the paren shader used to fail on very large regions. It does not
-  anymore.
-
-- fixed mred:radio-box%'s enable method. It now takes two arguments.
-
-- better begin/end-edit-sequence support in mred; used by
-  info-frame and to improve the speed in the console io. There is a
-  new method of mred:media-edit: "run-after-edit-sequence".
-
-- mred:original-output-port is now called mred:constants:original-output-port
-  mred:original-input-port is now called mred:constants:original-input-port
-
-- MrEd's collections are now documented.
-
-- The command line flags have changed. Specifically:
-  the -nu flag is now called either "--non-unitized" or "-u".
-  the splash screen flag has changed.
-
-- mred no longer imports a unit of the mred:application signature. Instead, 
-  the parameter mred:current-app-name is used to get and set the
-  applications name. The eval-string and frame are not used.
-
-- CACHE-WRITE-COUNT in a console-edit is no longer used.
-
-- set-empty-callback is now set-empty-callbacks. It sets two
-  callbacks, one for when the group is about to become empty and one
-  for when the group is actually empty. See the documentation for
-  more info.
-
-- do not use the frame method on-close anymore. Use can-close? and
-  do-close.
-
-- renamed the edit-method "on-close" to "do-close"
-
-- the startup procedure has changed again. Now, applications are
-  expected to be in a collection. The -a flag has an extra first
-  argument, specifing the collection to load the files from, and 
-  a -A flag has been added. See the startup documentation for more
-  information.
-
-  Also, if you define mred:startup and use the -u (previously -nu) flag, the
-  definition of mred:startup must come after the flag on the command
-  line. For example:
-     mred -e "(define mred:startup (lambda ...))" -nu
-  no longer works.
-
-  Redefinition of mred:initialize and mred:make-invokeable-unit are
-  no longer supported. Create a new system instead, using the -s flag.
-
-- added "set-display/write-handlers" method of mred:console-edit. This
-  work used to happen during a call to the "takeover" method.
-
--  mred:get-file and mred:put-file now take a parent window as optional
-   last argument.
-
-- added kill-protect and kill-allow-protected to mred:console-edit%
-
-- the collection paths are not normalized anymore
-
-- fixed bugs in the meta-u and meta-l keybindings
-
-- if unmarshalling preferences caused an exception at startup, MrEd
-  would open up EdJr; now it recovers and uses the default value.
-
-----------------------------------------------------------------------
-
-Version 50: August 26, 1997
-
-Engine:
--------
-Changed wx:dc%'s get-size method to return size of
- destination area; old [documented] functionality
- is available via max-x and max-y
-Made button-click state visible for Xt on b&w displays
-Fixed and normalized PostScript drawing
-Removed wx:dc% methods: device-to-logical-x, etc.
-Windows wx:display-size changed to return the size of the
- screen not including the task bar
-Windows: finally fixed scale for [non-PostScript] printing
-Added wx:[un]register-collecting-blit
-X Windows: Fixed use of colormap by loaded bitmap images
-Added an optional argument to wx:media-buffer's print method
- to supporting fitting to the destination page
-X Windows: Saving as xbm works for bitmaps of any depth
-MzScheme pathname expansion performed by all wx: toolbox
- procedures that take a pathname
-X Windows Xt: removed excessive borders on wx:canvas% objects
-X Windows Xt: removed 2 pixel offset for a single auto-sized
- child in a wx:frame% or wx:dialog-box%
-Windows: Fixed scrollbars on editor buffers; they're always
- shown now, but the editor never gets confused about the size
-Fixed on-size, pre-on-char, and pre-on-event for wx:item% 
- subclasses
-Fixed confusing argument type and number error messages
- for overloaded methods of primitive classes
-
-System:
--------
-- fixed a bug in file handlers; if a predicate is supplied, that
-  predicate is only called with one argument, the filename.
-
-- added mred:get-single-choice, which takes the same arguments as
-  wx:get-single-choice. It works the same, unless the dialog is
-  resized, in which case the mred: version resizes gracefully.
-
-- All of the icons in mred are now loaded lazily (but only once),
-  and their names are prefixed with "get-". They are now:
-
-  - mred:get-anchor-bitmap
-  - mred:get-lock-bitmap
-  - mred:get-unlock-bitmap
-  - mred:get-icon
-  - mred:get-autowrap-bitmap
-  - mred:get-paren-highlight-bitmap
-  - mred:get-reset-console-bitmap
-
-- added mred:info-frame%
-
-- split out mred:edit into several edits. The choices for pasteboards
-  and edits are now:
-
-    mred:media-edit%
-    mred:info-edit%
-    mred:searching-edit%
-    mred:clever-file-format-edit%
-    mred:file-edit%
-    mred:backup-autosave-edit%
-    mred:edit%
-    mred:return-edit%
-    mred:pasteboard%
-    mred:file-pasteboard%
-    mred:backup-autosave-pasteboard%
-
-  Probably mred:edit is not the right choice for you now.
-
-- mred:media-snip% objects now defaultly carry a mred:media-edit% object 
-
-----------------------------------------------------------------------
-
-Version 49: May 31, 1997
-
-Engine:
--------
-Object system changes: see mzscheme/HISTORY for details
-Fixed Mac event-handling and many other Mac things
-Fixed garbage collection of hidden frames under Windows (!)
-Panels, canvases, and controls that are both hidden and
-  inaccessible are now garbage-collected
-Disabled controls are reliably grayed-out, including items 
-  within a disabled panel 
-Instances of wx:pen%, wx:brush%, or wx:pen% that are
-  selected into a drawing context cannot be mutated
-Immutability of objects obtained via wx:the-XXX-list is
-  enforced
-Controls for Windows, Xt are created with the "System" family
-  rather than the "Default" family (using resources)
-Single wx:bitmap% object can be used by multiple controls
-  and/or pens and/or brushes
-Fixed Motif image-label radio button
-wx:find-directory replaced with wx:find-path
-All wx:dc% instances have a default font for drawing
-wx:const-copy blit never uses the pen/background color;
-  new blit mode wx:const-colour uses current pen
-X Windows: removed mapping of Mod3 to Alt (too confusing on
-  keyboards where NumLock is Mod3)
-Fixed wx:timer% bug that caused autosaving to not work
-Fixed eventspace bugs
-Fixed .bmp reading when smaller-than-max colormap is provided
-Fixed interlaced .gif reading for Windows and MacOS
-Xt: fixed default height of wx:text% items
-Xt: In a wx:mouse-event% instance, type wx:const-type-XXX-down
-  implies get-XXX-down => #t (formerly #f)
-Removed wx:group-box% class; use a panel with a border, instead
-Removed wx:tool-bar% class
-wx:choice% get-columns and set-columns no longer supported
-Added wx:gauge% methods: get-value and get-range
-wx:media-pasteboard% bug fixes and improvements: raise, lower, 
-  set-before, and set-after methods now work
-wx:list-box% set-client-data and get-client-data work with
-  any Scheme data type
-Windows and X Windows: Break key changed back to shift-ctl-c 
-  instead of ctl-c (to avoid conflicts with Emacs-std keyboard
-  mappings)
-
-System:
--------
-- .htx files are no longer supported
-
-- the search paths for the mzlib collection have changed. The PLTHOME
-  environment variable is now given preference.
-
-- mred:editor-frames are shown by default (the documentation was wrong)
-
-- mred:pasteboard-frames initialization arguments have changed and
-  they are not shown by default
-
-- autosaving has been moved to new edit and pasteboard classes, 
-  mred:backup-autosave-edit and  mred:backup-autosave-pasteboard.
-
-- mred:add-preference-default now takes a function which determines if
-  preferences read from the disk are valid or not (if not, the default
-  is used)
-
-- the show method of mred:dialog-box% only takes one argument now. Use
-  the centre method instead of the second argument
-
-- There is only one frame group now, and all frames are registered
-  with it. It is called mred:the-frame-group.
-  Associated changes:
-  - mred:current-frames is gone
-  - mred:edit-file only takes at most two arguments now
-  - handlers do not take a group as an argument
-  - mred:editor-frame% does not take a group as an input argument
-  - classes with the method `get-edit' are treated specially in groups
-  - mred:frame-group% method open-file does not exist,
-    use the procedures mred:edit-file or mred:open-file.
-  - mred:frame-group% ask-before-closing last eliminated. 
-    Use the empty-callback method
-  - added locate-file, a method of mred:the-frame-group which
-    takes a filename and returns a frame that is editing that if one exists.
-  - mred:edit-file now consults mred:the-frame-group to see if 
-    the file is already open, based on the third argument (or the parameter
-    mred:edit-file-consult-group)
-  - mred:editor-frame
-     - medthod get-frame-group gone from mred:editor-frame%
-     - method open-file's final optional arg eliminated
-     - do-autosave method deleted
-     - register-autosave call moved to mred:std-buffer 
-       (ie mred:edit and mred:pasteboard)
-
-- The perform-updates and set-perform-update ivars in mred:panel%,
-  mred:frame%, and mred:dialog-box% have been replaced with the
-  delay-updates method in mred:frame% and mred:dialog-box%.
-
-  Added on-container-resize method to mred:panel%, etc. to handle
-  container resize events, rather than inferring a container resize via
-  on-size (which could confuse real container resizes with external
-  events).
-
-  Changed force-redraw to ignore refresh requests when the
-  redraw-requesting window is not shown. Redraw requests are now
-  propagated to the top-level frame or dialog via child-redraw-request.
-- if your application is unititized, then you need to change the
-  startup procedure. See the application startup section in the
-  toolbox manual.
-
-----------------------------------------------------------------------
-
-Version 48: Skipped to avoid confusion with Scheme48
-
-----------------------------------------------------------------------
-
-Version 47: January 11, 1997
-
-Engine:
--------
-WARNING: multiple inhertance is going away in 48
-Added overwrite-styles? arg to wx:media-buffer%'s read-from-file,
-  and added get-/set-load-overwrites-styles methods
-Modified wx:media-buffer%'s set-caret-owner to provide more
-  levels of focus control
-Controls with bitmap labels work correctly, fixed crashing bugs,
-  some Mac controls do not display yet
-wx:bitmap%'s load-file only allowed when the bitmap is not selected
-  into a wx:memory-dc% object or used by a control
-
-System:
--------
-- find-string-embedded of mred:edit% is just like find-string except it
-  searches in embedded buffers as well.
-- mred:frame-name is gone, use app-name in the application unit instead,
-  which is documented under the `Starting Up' section of the toolbox
-  manual.
-- the signature mred:application^ now contains the variable app-name.
-
-----------------------------------------------------------------------
-
-Version 46: December 5, 1996
-
-Engine:
--------
-Fixed misc. Motif control-sizing problems
-Mac & Xt: "&" stripped from control labels correctly
-wx:yield takes an optional semaphore argument
-
-System:
--------
-- pretty-print-out is gone, use display-result instead, if you want to
-  display results
-
-----------------------------------------------------------------------
-
-Version 45: November 12, 1996
-
-Engine:
--------
-IMPORTANT: let-values is now analogous to let; the old 
-  let-values is now let*-values
-Added thread-savy parameterization system; namespace system changed
-Added eventspaces
-wx:server%, wx:client%, and wx:connection% are no longer supported
-  (Better TCP support is now built into MzScheme)
-wx:the-snip-class-list was replaced by (wx:get-the-snip-class-list)
-wx:the-buffer-data-class-list was replaced by (wx:get-the-buffer-data-class-list)
-Added transparent text backing for editor text
-Added wx:dc% try-colour method
-wx:window% capture-mouse, release-mouse, and make-modal no longer supported
-  Modal dialogs can be used instead of make-modal (modal is
-  specified through the constructor). There is currently no
-  replacement for capture-mouse and release-mouse, but a replacement is
-  likely to be in 46.
-Xt and Mac: "&" stripped from control labels (matches Windows/Motif), sortof
-
-System:
--------
-- frame groups no longer set the frame title prefix
-- there is a new edit%, mred:return-edit%. It takes an extra arg at
-  initialization time, which should be a function that will be called
-  when the user types return in the edit.
-- takeover-output is now takeover and release-output is gone.
-  In the next release this should become obsolete
-- there are now two new methods of simple-menu-frame%'s, 
-  get-edit and get-canvas. These return the current "main" edit and canvas
-  in the frame. They should be used for saving, reverting, etc. If your
-  frame can have more than one "main" edit then override get-edit and 
-  get-canvas and have them return the current main canvas. Note that
-  this is different from active-canvas and active-edit. Those two functions
-  may return *any* visible edit in the frame, eg one of the searching edits
-  in the bottom of the frame, that appear while searching. 
-  active-edit and active-canvas should be used for things like pasting 
-  and copying, which should apply to all edits, not just "important" or "main"
-  ones.
-- mred:simple-frame-canvas% and mred:editor-canvas% are now obsolete.
-  Instead there are now three important canvas classes in the system:
-  mred:wrapping-canvas% : 
-    handles autowrapping, can create edits automatically, uses
-    style-flags ivar and style initialization for default styles to
-    super-init, and implements edit-modifited and edit-renamed
-  mred:one-line-canvas% 
-    is just the right height to display one line of text.
-    inherits from mred:wrapping-canvas%
-  mred:frame-title-canvas%
-    updates the title of the frame when it receives focus
-    events. inherits from mred:wrapping-canvas%
-- all of the "connection maintenence" ie edits that know which canvses
-  they are in, frames that know which canvas is the most recently
-  active canvas have been moved into into separate classes that only
-  maintain those connections, mred:connections-media-edit%,
-  mred:connections-media-canvas%, mred:connections-frame%,
-  mred:connections-dialog-box%, and mred:connections-panel%
-- all instance variables class% (e.g. edit% and canvas% on frames) 
-  have been changed to get-class%, to support inheiritance.
-- added extra optional arg to mred:local-busy-cursor and
-  mred:show-busy-cursor that specifies the timeout
-- frame title prefixes are now handled by the frame, and
-  the set-frame-prefix and set-frame-title methods correctly
-  update the graphical frame with it's new title.
-
-----------------------------------------------------------------------
-
-Version 44: September 9, 1996
-
-Engine:
--------
-wx:play-sound added
-Saving bitmaps fixed on all platforms; editor can now save 
-  "inlined" images instead of only references to images
-Hyper-text browser handles HTML files (w/o networking)
-Fixed Mac control drawing and hiding
-Fixed Xt menus (finally!)
-Fixed menu item auto-check for popup menus
-Fixed Motif canvas click event reporting (spurious drags)
-See also mzscheme/HISTORY, wxme/README, and system/HISTORY
-Upgraded to gc 11alpha3
-
-System:
--------
-- .html files (with file: links) are supported
-- system now provides and uses a better dialog buildling classes. 
-  See toolbox manual for more info
-- changed do-eval and do-save-and-eval-or-read-avail
-  to accept a range in the edit rather than a string
-- added read-snips/chars-from-buffer, a function that takes an edit and 
-  produces a thunk. That thunk returns either a snip or a character, for
-  each character and non-text snip in the edit.  
-- added a check so that edits will now save themselves in mred's format
-  if there are non-text snips in the edit.
-
-----------------------------------------------------------------------
-
-Version 43: Re-released August 12, 1996
-Under GNU LGPL license
-
-----------------------------------------------------------------------
-
-Version 43: August 9, 1996
-
-Engine:
--------
-Major system overhaul (Robby Findler); see system/HISTORY
-Windows stability greatly advanced
-Windows and MacOS versions much more "Windows-like" and "Mac-like"
-  with standard menu shortcuts and better icons
-MacOS and Windows use native print facilities
-GIF images supported under Windows
-wx:window set-client-size removed
-wx:panel%'s get-cursor renamed to get-item-cursor; added set-item-cursor
-Fixed cut-n-paste newlines under MacOS and Windows
-Xt: panel with one item no longer auto-sizes the child
-See also mzscheme/HISTORY
-
-System:
--------
-- replaced search dialogue
-- new application startup procedure
-- mred:frame% changed to mred:editor-frame%
-- mred:canvas% changed to mred:editor-canvas%
-- mred:console-frame renamed to mred:console
-- mred:console-edit and mred:console-canvas gone, use
-  (ivar mred:console edit) and (ivar mred:console canavs)
-- expanded keybindings -- most movement keys now
-  have a shifted form that selects text
-- added mred:standard-menus-frame% which gets the right keybindings for
-  the different platforms
-
-----------------------------------------------------------------------
-
-Version 42: June 8, 1996
-Documentation translated to Scheme notation, corrected
-Windows update bug fixed for embedded buffers
-MacOS memory use greatly improved
-Fixed annoying non-standard Windows beep
-Non-matching cond or case expression raises and error
-mred:platform and mred:window-system changed to wx:...
-standard system uses functors (see MzScheme)
-wx:canvas%::int-draw-line and wx:int-point% removed
-wx:list%, wx:hash-table%, wx:string-list%, wx:path-list removed
-wx:media-stream-in%::get removed for strings; use get-string
-Redundant wx: functions removed:
-  wx:dir-exists?  (use directory-exists?)
-  wx:file-exists? (use file-exists?)
-  wx:file-name-from-path (use file-name-from-path or split-path)
-  wx:path-only (use path-only or split-path)
-  wx:is-absolute-path? (use reletaive-path?)
-  wx:expand-path (use expand-path)
-  wx:get-working-directory (use current-directory)
-  wx:set-working-directory (use current-directory)
-  wx:mkdir (use make-directory)
-  wx:remove-file (use delete-file)
-  wx:rename-file (use rename-file)
-  wx:get-user-home and wx:get-home-dir (use expand-path with "~")
-  wx:execute and wx:shell (use system or process)
-  wx:find-first-file and wx:find-next-file (use get-directory-list)
-  wx:sleep (use sleep)
-  wx:sub-type? (use subclass?)
-  wx:to-lower (use char-upcase)
-  wx:to-upper (use char-downcase)
-  wx:is-wild? (use reg exps)
-  wx:match-wild? (use reg exps)
-
-Version 0.41: April 15, 1996
-Important language changes; see mzscheme/HISTORY
-Fixed bug in wxCanvas drawing methods
-Fixed wxCanvasDC and wxMemoryDC bugs in Xt version
-Pasteboards fixed
-AIX: two consecutive SIGDANGERs => exit(-1)
-wxGetMultipleChoice supported
-
-Version 0.40: March 24, 1996
-Possible improvements to memory system
-Some redundant event methods removed
-Finally fixed Windows NT/95 Scheme threads
-Stdout/stderr messages to a window instead of file for Windows/Mac+
-Fixed misc. Xt problems, including show-n-hide on frame
-
-Version 0.39: March 6, 1996
-Fixed safety from Scheme on invalidated C++ objects (stack objs, too)
-Fixed many bugs in Xt version
-Upgraded to gc version 4.10
-Reduced memory usage of buffer objects
-
-Version 0.38: February 22, 1996
-Xt port released
-Part of standard system moved to DrScheme
-See also mzscheme HISTORY and wxmedia README
-
-Version 0.37: Not released
-
-Version 0.36: January 18, 1996
-Fixed bug in MzScheme's bignum multiplication
-
-Version 0.35: January 17, 1996
-X selection protocol supported. To get the old clipboard-style
-  mechanism, add this to your .mredrc:
-     (wx:media-set-x-selection-mode #f)
- See also wxMediaEdit::SetPosition() in the wxMedia manual.
-
-Version 0.34: December 30, 1995
-Minor improvements to MzScheme and the standard system
-
-Version 0.33: December 21, 1995
-MzScheme language changes; see mzscheme/HISTORY
-Old standard system no longer compatible
-Project system improved
-Many bugs fixed in the new standard system
-
-Version 0.32: December 4, 1995
-New standard system:
-  * The console I/O is completely different. It works more
-     like an Emacs shell. Use M-p and M-n to access previously
-     entered expressions. (read) will now read from the console.
-  * All mred:std-<x> variables have been eliminated. For each
-     mred:<x>%, there is now a procedure mred:make-<x>% that takes a
-     superclass and returns a new class.
-  * The frame and buffer hierarchies have changed a little.
-  * From a mred:edit% object, you can get to its canvas or frame.
-  * The menubar/menu system is completely revised. You don't have to
-     deal with menu ids much anymore. Menus and menu items can now be 
-     dynamically added and removed.
-  * Keymap chaining works differently.
-  * The new Scheme project system is roughly in place. This will let you
-     develop Scheme programs by organizing Scheme files within a project.
-     Projects help manage loading program files into the
-     evaluator and uses Shriram's Zodiac/Aries packages to
-     provide debugging facilities. This will be improved in the near 
-     future.
- The old standard system is available in the "oldsys" directory.
-Pretty printer handles loops and graphs
-Very limited support for wxYield under XView - will be extended
-Fixed some wxMedia bugs (see wxme/README)
-Fixed some MzScheme bugs (see mzscheme/HISTORY)
-
-Version 0.31: November 14, 1995
-Fixed some wxMedia bugs (see wxme/README)
-Fixed some MzScheme bugs (see mzscheme/HISTORY)
-Parameterization for Macintosh
-
-Verion 0.30: October 25, 1995
-Added call-with-values and regexp to MzScheme
-Unix stack-checking setup code fixed in MzScheme
-wxMediaPasteboard implemented more
-Scheme-C++ object link changed; use ptr in all C++ objects
-Added tutorial section to "User Manual"
-
-Version 0.29: October 18, 1995
-Editor can save text preserving automatic CR
-Bug fix in automatic line-wrapping
-New font system can access arbitrary fonts
-Multiple displays in Motif: wx:set-display and wx:get-display-name
-MzScheme fix for forms such as (let ([x (let ...)]) ...)
-
-Version 0.28: October 3, 1995
-MzScheme bug fix: stack-checking on Unix
-wxMedia fix: Insert(unsigned char, ...) instead of Insert(char, ...)
- and proper use of `unsigned' in word-breaking array access
-
-Version 0.27: September 29, 1995
-Major MzScheme upgrade, including multiple inheritance
- (See MzScheme HISTORY for details)
-Win32: Allow deeper recursion by copying the stack
-Win32: Allow breaking with Shift-Ctl-C
-New font configuration system
-
-Version 0.26: September 8, 1995
-Very minor changes
-Bug fix to MzScheme for Win32s
-
-Version 0.25: September 7, 1995
-Upgraded to wxWindows 1.63
-Minor bug fixes
-
-Version 0.24: September 1, 1995
-Minor bug fixes
-
-Version 0.23: August 23, 1995
-Minor bug fixes
-Editor can display images (types depend on wxWindow compile flags)
-MzScheme correction: expand & expand-once
-
-Version 0.22: August 17, 1995
-Mostly MzScheme improvements
-File-format bug fixed related to portability; To make files created 
-  earlier portable, open and re-save them.
-
-Version 0.21: August 8, 1995
-Bug fixes
-triggers, hash tables, and case-lambda added to MzScheme
-MzScheme "sleeps" properly
-Connected MrEd to wxWindow's layout constraint system
-
-Version 0.20: July 26, 1995
-MzScheme Bug fixes
-
-Version 0.19: July 25, 1995
-All "!"s removed from method names!!!!!
-Full continuations and bignums added to MzScheme
-Bug Fixes
-
-Version 0.18: July 20, 1995
-Win32s kinda supported
-Bug fixes
-Added (compile ...) to MzScheme
-Added internal processes & threads to MzScheme
-wxSnipData -> wxBufferData
-Old process and system changed to process* and system*
-
-Version 0.17: July 11, 1995
-Bug fixes, especially Motif and memory bugs
-Rewrote editor line-maintenance
-Faster caret updating
-Upgraded garbage collector
-File format changed to accommodate nested buffers with
-  separate style lists
-Standard system standardized
-Code changes for compiling on MSWindows (almost works...)
-Scheme mode
-
-Version 0.16: June 16, 1995
-Fixed define-struct bug
-
-Version 0.15: June 15, 1995
-Bug fixes, especially XView
-make-input-port takes only 3 args; "unget" param dropped
-on-local-char & on-local-event renamed to on-default-char 
-  and on-default-event
-name changes: to have "!" or not to have "!". See doc/names.diff
-  for a list of changed names
-fonts configuarble through .Xdefaults; see MrEd.ad
-
-Version 0.14: June 9, 1995
-Bug fixes, including wxWindows widget table clash
-Scheme mode works
-error-handler changed to parameterizing function
-
-Version 0.13: June 5, 1995
-MzScheme replaced libscheme
-ctl-c breaks Scheme evaluation in MrEd
-libscheme/ changed to mzscheme/ - change your make.env!
-
-Version 0.12: June 1, 1995
-Bug fixes
-Revised object system: requires (inherit ...) declarations
-(pretty-print ...) installed
-
-Version 0.11: May 19, 1995
-Bug Fixes
-
-Version 0.10: May 19, 1995
-Bug fixes
-(match ...) installed
-
-Version 0.9: May 18, 1995
-wxMediaPasteboard
-
-Version 0.8: May 11, 1995
-Bug fixes
-
-Version 0.7: May 10, 1995
-mred:default-<x> changed to mred:<x> in system
-README in demo directory
-Lots of bug fixes
diff --git a/pkgs/gui-pkgs/gui-lib/mred/MrEd_100.txt b/pkgs/gui-pkgs/gui-lib/mred/MrEd_100.txt
deleted file mode 100644
index 9a9f37f182..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/MrEd_100.txt
+++ /dev/null
@@ -1,1050 +0,0 @@
-
-======================================================================
-0. Highlights of the New MrEd Toolbox
-======================================================================
-
- * The wx/mred split has been eliminated. The wx methods for manually
-   managing the position and size of windows have been eliminated;
-   containers manage all window positions and sizes. The only way to
-   set control positions explicitly is to derive a new container
-   class.
-
-   The windowing class hierarchy has been rerranged. For example,
-   dialog% (formerly dialog-box%) is no longer a subclass of panel%,
-   which is itself no longer a subclass of canvas%.
-
-   Interfaces are widely used in the toolbox. The old toolbox provided
-   many "classes" like wx:window% that could not be instantiated. The
-   new toolbox has a window<%> interface (where "<%>" is the
-   conventional suffix for interfaces).
-
- * Instead of null, #f is used for the "no appropriate value" value,
-   such as the parent argument for a frame that does not have a parent
-   window, or the result for get-label when the window does not have a
-   label.
-
-   There are no wx:const-... values. Instead, a method that used to
-   take a single (numerical) wx:const- flag now takes a symbol, and a
-   method that used to take bitwise-ior'd wx:const- integers now takes
-   a list of symbols. For example, wx:const-horizontal was replaced by
-   'horizontal, and wx:const-bitmap-type-gif was replaced with 'gif.
-
- * The old documentation described certain methods as consuming "small
-   integer" values; the implementation actually accepted any sort of
-   number and coerced it to a machine-word integer. Methods now
-   consume a precisely defined class of numbers. For example, most
-   windowing methods that formerly consumed "small integers" now
-   consume "exact integers in [0, 10000]". The implementation signals
-   an exception when provided an inexact number, a non-integer, or an
-   integer outside the range [0, 10000]. A few methods consume
-   arbitrary exact non-negative integers; those methods behave
-   correctly when provided an integer represented as a bignum.
-
-   In the windowing toolbox, object-specific out-of-range errors are
-   now signalled by a mismatch exception. (In previous versions of
-   MrEd, out-of-range errors were generally ignored.) For example, if
-   a list-box% instance contains only 10 items, calling the
-   set-selection method with the index 11 signals a mismatch
-   exception.
-
- * The menu system was turned upside-down, giving it a structure more
-   like rest of the toolbox. For example, instead of creating a menu
-   bar and then calling a frame's set-menu-bar method, a menu bar is
-   created by providing the frame as an initialization argument in
-   (make-object menu-bar% ...). Similarly, a menu is created by
-   supplying the parent menu bar as an initialization argument (or a
-   parent menu to create a submenu). Finally, a menu item is created
-   by instantiating menu-item% or checkable-menu-item% with a parent
-   menu. Integer menu IDs have been eliminated; when a menu item is
-   selected, a callback associated with the menu item is executed,
-   just as when a button is clicked.
-
- * The "media" names have changed. Roughly, we replaced "media" with
-   "editor", or dropped "media" when "editor" is not useful. The
-   following is the name mapping for some commonly used classes:
-
-            media-canvas%      =>  editor-canvas%
-            media-buffer%      =>  editor<%>
-            media-edit%        =>  text%
-            media-pasteboard%  =>  pasteboard%
-            snip%              =>  snip%
-            media-snip%        =>  editor-snip%
-            text-snip%         =>  string-snip% (to avoid confusion)
-
-   Methods of text% (formerly media-edit%) check that position, line,
-   and paragraph arguments are non-negative. In methods where -1
-   (really any negative value) had a special meaning, a symbol is now
-   used. For example, the old call
-       (send (make-object media-edit%) insert "Hello" 0 -1)
-   translates to using 'same instead of -1:
-       (send (make-object text%) insert "Hello" 0 'same)
-
-   Many of the old on-XXX methods for editors formerly returned a
-   Boolean value to indicate whether the action should proceed (e.g.,
-   on-insert in media-edit%), but that convention does not work well
-   with composing class extensions. MrEd 100 provides a parallel set
-   of can-XXX?  methods (e.g., can-insert? in text%) that first
-   determines whether an operation should proceed; if so, on-XXX is
-   called (its result is ignored), the operation is performed, and
-   after-XXX is called.
-
-   Beside renaming and checking, little else has changed in the editor
-   toolbox, but it is a little better integrated with system-wide
-   keyboard focus methods. For example, frame% provides a
-   get-focus-window method, which returns the frame's subwindow with
-   the current focus, but it also provides a get-focus-object method,
-   which returns an editor<%> object if an editor-canvas% has the
-   keyboard focus.
-
- * The text-field% control (formerly wx:text% and wx:multi-text%) now
-   works well on all platforms, because it is implemented using the
-   editor classes. (The equivalent of a wx:multi-text% instance is
-   created via a style flag for text-field%.)
-
- * The command-event% class was changed to control-event%. It has very
-   few methods, since the information that was formerly encapsulated
-   in a command-event% object can be extracted just as easily from the
-   control.
-
- * Navigating controls (in a frame or dialog) with the keyboard works
-   on all platforms. Mnemonic characters (underlined letters in a
-   control label) now work correctly under Windows, and now also work
-   under X. Windows keyboard events involving the Alt key are now
-   reported to on-char et al. (as a Meta key event).
-
- * The device context system has been changed to provide a larger set
-   of methods that paint consistently on all platforms. Most "logical
-   functions" (e.g., 'invert, 'src-and, 'no-op) have been eliminated,
-   but non-rectangular clipping regions and region operations (e.g.,
-   union and intersect) were added.
-
-   The old canvas-dc% class was eliminated. The memory-dc% class was
-   renamed to bitmap-dc%.
-
-   The blit method was replaced by draw-bitmap and draw-bitmap-region,
-   which operate directly on bitmaps. Monochrome bitmaps can be drawn
-   with either a transparent or solid background. The icon% class and
-   draw-icon method were removed, since bitmaps provide all of the
-   same functionality.
-
-   The xor drawing mode was removed from device contexts and added as
-   a style for pens and brushs. Brush stipples work on all platforms
-   (with consistent opaqueness and colorization). Pen stipples also
-   work, but are restricted to 8x8 monochrome bitmaps. The 'stipple
-   and 'opaque-stipple styles were eliminated; instead, installing a
-   stipple bitmap into a pen or brush overrides other style settings.
-
-   The arguments to draw-arc were changed; draw-arc now reliably draws
-   sections of non-circular ellipses.
-
-   The initialization arguments for post-script-dc% and printer-dc%
-   where changed. Global PostScript settings were replaced with a
-   parameter containing a ps-setup% object.
-
-   The canvas% class no longer supplies drawing methods. Instead, all
-   canvas drawing must use get-dc to get a drawing context (which
-   always had a more complete set of methods, anyway).
-
- * Initialization arguments for creating windows have been re-ordered.
-   In general, the order is as follows:
-      label [sub-labels] parent callback [init-value] style
-              ^- e.g., items in a radio box
-   where style is a list of symbols.
-
-   Some methods have been renamed to be either more (accurately)
-   descriptive or more consistent with other method names. American
-   spelling is used everywhere: colour -> color, centre -> center,
-   grey -> gray.
-
-MzScheme's class syntax also changed slightly:
-
- * In MzScheme 53, the empty list could be provided as a class's
-   "superclass", indicating that the class has no superclass. In 100,
-   every new class must have a superclass (and super-init must always
-   be called). MzScheme 100 provides a built-in empty class called
-   object%.
-
- * In MzScheme 53, a `public' instance variable declaration would
-   either override an existing instance variable or declare a new one,
-   depending on the set of instance variables provided by the
-   superclass. In 100, a `public' declaration always introduces a new
-   instance variable; if the superclass already provides the instance
-   variable, an exception is raised. The new `override' clause
-   declares instance variables to override existing definitions; an
-   exception is raised if the superclass does not provide the instance
-   variable to override.
-
-======================================================================
-1. Interface/Class Type Hierarchy (Selected Excerpts)
-======================================================================
-
-[To avoid lines that cross or go in the wrong direction, the following
-type hierarchy picture is drawn on a cylinder, with lines from
-subarea<%> and subwindow<%> wrapping from the left of the diagram to
-the right.]
-
-                           area<%>
-        _____________________|_______________
-        |               |                   |
-      subarea<%>     window<%>     area-container<%>      
-<<<____|____       _____|_________     _|__  ________________________<<<
-            |      |             |    |   |  |                  
-           subwindow<%>          |    |   |  |                  
-<<<______________|___________    |    |   pane%                     _<<<
-            |               |    |    |    |- horizontal-pane%      |
-       control<%>           |    |    |    |- vertical-pane%        |
-        |- message%         |    |    |    |- grow-box-spacer-pane% |
-        |- button%          |    |    |                             |
-        |- check-box%       |  area-container-window<%>             |
-        |- slider%          |        |                              |
-        |- gauge%           |        |            __________________|
-        |- text-field%      |        |            |   
-        |- radio-box%       |        |-------- panel%       
-        |- list-control<%>  |        |          |- horizontal-panel%
-            |- choice%      |        |          |- vertical-panel%
-            |- list-box%    |        |          
-                            |        |- top-level-window<%>
-                            |           |- frame% 
-                            |           |- dialog%
-                         canvas<%>
-                          |- canvas%
-                          |- editor-canvas%
-
-
-  menu-item<%>                menu-item-container<%>
-      |                              |
-      |- separator-menu-item%   _____|___
-      |- labelled-menu-item<%>  |       |- menu-bar%
-          _________|_________   |       |- popup-menu%
-          |                 |   | 
-          |                 menu%
-          |
-          |- selectable-menu-item<%>
-              |- menu-item%
-              |- checkable-menu-item%
-
-
-dc<%> (canvas<%>'s get-dc returns a dc<%>)
- |- bitmap-dc%  (formerly memory-dc%)
- |- printer-dc%
- |- postscript-dc%
-
-editor<%> (maybe has an edit-admin% and some editor-canvas<%>s)
- |- text%
- |- pasteboard%
-
-snip% (as a snip-admin%)
- |- text-snip%
- |    |- tab-snip%
- |- image-snip%
- |- editor-snip% (formerly media-snip%; has an editor<%>)
-
-editor-admin%  (formerly media-admin%)
- |- snip-editor-admin%
-
-snip-admin%
-
-event%
- |- control-event% (formerly command-event%; for control/menu-item callbacks)
- |- mouse-event%
- |- key-event%
- |- scroll-event% (new; used for on-scroll)
-
-======================================================================
-2. Interface/Class Methods (Selected Excerpts)
-
- Method arguments are not generally shown, but the new initialization
- arguments are listed after "<=" for classes.
-======================================================================
-
-area<%>
-    get-parent
-    get-top-level-window - returns the area's frame/dialog
-    min-width min-height
-    get-graphical-min-size
-    stretchable-width stretchable-height
-
-subarea<%> : area<%>
-    horiz-margin vert-margin
-
-window<%> : area<%>
-    focus has-focus? - focus replaces set-focus
-    on-focus - on-focus replaces on-set-focus and on-kill-focus
-    enable is-enabled?
-    on-size
-    on-subwindow-char on-subwindow-event - formerly pre-on-...
-    client->screen screen->client - takes two and returns two values
-    get-label set-label
-    get-plain-label - e.g., "Button" instead of "&Button"
-    get-client-size - returns two values
-    get-size - returns two values
-    get-width get-height get-x get-y
-    get-cursor set-cursor 
-    show is-shown?
-    refresh
-    accept-drop-files on-drop-file
-
-area-container<%> : area<%>
-    container-size
-    get-children change-children place-children
-    add-child delete-child
-    after-new-child
-    border - parameter-like
-    spacing - parameter-like
-    set-alignment - takes two syms: 'left/'center/'right 'top/'center/'bottom
-    get-alignment - returns two syms...
-
-area-container-window<%> : container<%> window<%>
-    set-control-font get-control-font
-    set-label-font get-label-font
-    set-label-position get-label-position
-
-subwindow<%> : subarea<%> window<%>
-
-panel% : area-container-window<%> subwindow<%>
-    <= parent [style null]
-       styles: 'border
-
-horizontal-panel%: panel%
-    <= parent [style null]
-       styles: 'border
-
-vertical-panel%: panel%
-    <= parent [style null]
-       styles: 'border
-
-pane% : container<%> subwindow<%>
-    <= parent
-
-horizontal-pane%: pane%
-    <= parent
-
-vertical-pane%: pane%
-    <= parent
-
-gorw-box-spacer-pane%: pane%
-    <= parent
-
-top-level-window<%> : area-container-window<%>
-    get-eventspace
-    on-activate
-    can-close? on-close
-    can-exit? on-exit - called when the OS asks MrEd to exit
-    get-focus-window - the window with the current focus (or #f)
-    get-edit-target-window - the window to last have the focus (or #f)
-    get-focus-object - the window/editor with the curent focus (or #f)
-    get-edit-target-object - the window/editor to last have the focus (or #f)
-    on-traverse-char on-system-menu-char
-    center move resize
-
-frame% : top-level-window<%>
-   <= label [parent #f] [width #f] [height #f] [x #f] [y #f] [style null]
-      styles: 'no-resize-border 'no-caption 'no-system-menu
-              'mdi-parent 'mdi-child
-   create-status-line set-status-text has-status-line?
-   get-menu-bar
-   iconize is-iconized? set-icon maximize
-   on-menu-char
-
-dialog% : top-level-window<%>
-   <= label [parent #f] [width #f] [height #f] [x #f] [y #f] [style null]
-      styles: 'no-caption 'resize-border
-
-control<%> : subwindow<%>
-   command - just invokes the callback; no longer changes the control value
-
-message% : control<%>
-   <= label parent [style null]
-      styles: none
-
-button% : control<%>
-   <= label parent callback [style null]
-      styles: 'default
-
-check-box% : control<%>
-   <= label parent callback [style null]
-      styles: none
-   set-value get-value
-
-slider% : control<%>
-   <= label min-val max-val parent callback [value min-val]
-            [style '(horizontal)]
-      styles: 'horizontal 'vertical
-   set-value get-value
-
-gauge% : control<%>
-   <= label range parent [style '(horizontal)]
-      styles: 'horizontal 'vertical
-   set-value get-value
-   set-range get-range
-
-text-field% : control<%>
-   <= label parent callback [init-val ""] [style '(single)]
-      styles: 'single, 'multiple, 'hscroll
-   get-value set-value
-   get-editor
-
-radio-box% : control<%>
-   <= label choices parent callback [style '(vertical)]
-      styles: 'horizontal 'vertical
-   get-number
-   get-item-label - label for one of the choices
-   get-item-plain-label - e.g., "Cut" intsead of "Cut  Cmd-X"
-   get-selection set-selection
-
-list-control<%> : control<%>
-   clear append
-   get-number
-   get-string find-string
-   get-selection
-   get-string-selection
-   set-selection
-   set-string-selection
-
-choice% : list-control<%>
-   <= label choices parent callback [style null]
-      styles: none
-
-list-box% : list-control<%>
-   <= label choices parent callback [style '(single)]
-      styles: 'single 'multiple 'extended 'always-vscroll 'hscroll
-   delete
-   get-data set-data
-   get-selections
-   select is-selected?
-   set set-string set-data
-   number-of-visible-items
-   get-first-visible set-first-visible
-
-canvas<%> : subwindow<%>
-    on-char on-event on-paint on-scroll on-tab-in
-    popup-menu warp-pointer get-dc
-    client-min-width client-min-height
-
-canvas% : canvas<%>
-    <= parent [style null]
-       styles: 'border 'vscroll 'hscroll
-    get-virtual-size get-view-start
-    init-manual-scrollbars init-auto-scrollbars
-    scroll
-    get-scroll-pos set-scroll-pos
-    get-scroll-range set-scroll-range
-    get-scroll-page set-scroll-page
-
-editor-canvas% : canvas<%>
-   <= parent [editor #f] [style null] [scrolls-per-page 100]
-      styles: 'no-hscroll 'no-vscroll 'hide-hscroll 'hide-vscroll
-   call-as-primary-owner
-   allow-scroll-to-last - parameter-like
-   scroll-with-bottom-base - parameter-like
-   lazy-refresh - parameter-like
-   force-display-focus - parameter-like
-   get-editor set-editor - formerly get-media and set-media
-   set-line-count
-
-menu-item<%>
-   get-parent
-   delete restore is-deleted?
-
-separator-menu-item%
-   <= parent
-
-labelled-menu-item<%>
-   get-label set-label
-   get-plain-label
-   get-help-string set-help-string
-   enable is-enabled?
-
-selectable-menu-item<%>
-   command
-   get-shortcut set-shortcut
-   get-x-shortcut-prefix set-x-shortcut-prefix
-
-menu-item%
-   <= label parent callback [shortcut #f] [help-string #f]
-
-checkable-menu-item%
-   <= label parent callback [shortcut #f] [help-string #f]
-   check is-checked?
-
-menu-item-container<%>
-   get-items
-
-menu%
-   <= label parent [help-string #f]
-
-popup-menu%
-   <= title
-
-menu-bar%
-   <= frame
-   get-frame
-   enable is-enabled?
-
-editor<%>
-   [ all the old wx:media-buffer% stuff, plus... ]
-   get-canvases - a list of canvases displaying the editor
-   get-active-canvas - the canvas that most recently had the focus (or #f)
-   get-canvas - the active canvas, or the first canva (or #f)
-   set-active-canvas add-canvas remove-canvas
-   auto-wrap - parameter-like
-   on-display-size - called when a display for the editor changes its size
-
-event%
-   <=
-   get-time-stamp set-time-stamp
-
-control-event%
-   <= event-type
-   get-event-type set-event-type
-
-mouse-event%
-   <= event-type
-   get-event-type set-event-type
-   button-down?  - specify a button with 'left, 'middle, 'right, or 'all
-   button-up?
-   dragging?
-   entering?
-   leaving?
-   moving?
-   button-changed?
-   get-left-down set-left-down
-   get-middle-down set-middle-down
-   get-right-down set-right-down
-   get-x get-y set-x set-y
-   get-shift-down set-shift-down
-   get-control-down set-control-down
-   get-meta-down set-meta-down
-   get-alt-down set-alt-down
-
-key-event%
-   <=
-   get-key-code set-key-code  - key code is a char or a symbol
-   get-shift-down set-shift-down
-   get-control-down set-control-down
-   get-meta-down set-meta-down
-   get-alt-down set-alt-down
-   get-x get-y set-x set-y
-
-scroll-event%
-   <=
-   get-position set-position
-   get-event-type set-event-type
-   get-direction set-direction
-
-======================================================================
-3. Procedures
-
-  This is a complete list, although the arguments are only shown for a
-  few procedures. 
-
-  If an old procedure isn't listed here, we got rid of it.
-======================================================================
-
-get-file
-   <= [message #f] [parent #f] [directory #f] [filename #f] [extension #f]
-      [style null]
-      styles: none
-
-put-file
-   <= [message #f] [parent #f] [directory #f] [filename #f] [extension #f]
-      [style null]
-      styles: none
-
-message-box
-   <= title message [parent #f] [style '(ok)]
-      styles: 'yes-no 'ok 'ok-cancel
-
-get-text-from-user
-   <= title message [init-val #f] [parent #f] [style null]
-      styles: none
-
-get-choices-from-user (returns index integers, not the values)
-   <= title message choices [parent #f] [init-choices null] [style null]
-      styles: 'single 'multiple 'extended
-
-get-ps-setup-from-user
-   <= [message #f] [parent #f] [init-setup #f] [style null]
-      styles: none
-
-get-color-from-user   - now supported for all platforms
-   <= [message #f] [parent #f] [init-color #f] [style null]
-      styles: none
-
-get-font-from-user   - now supported for all platforms
-   <= [message #f] [parent #f] [init-font #f] [style null]
-      styles: none
-
-color-display? get-display-depth get-display-size
-begin-busy-cursor end-busy-cursor is-busy-cursor?
-bell
-label->plain-label
-get-resource write-resource
-get-face-list - formerly wx:get-font-list
-
-yield sleep/yield flush-display
-queue-callback
-
-find-graphical-system-path - formerly wx:find-path
-
-current-ps-setup
-
-get-top-level-windows
-get-top-level-focus-window
-get-top-level-edit-target-window
-current-new-top-level-window-handler
-get-window-text-extent
-get-panel-background
-
-graphical-read-eval-print-loop
-
-make-eventspace
-eventspace?
-current-eventspace
-eventspace-shutdown?
-event-dispatch-handler
-
-check-for-break
-special-control-key
-
-read-editor-global-header
-read-editor-global-footer
-write-editor-global-header
-write-editor-global-footer
-
-append-editor-operation-menu-items
-append-editor-font-menu-items
-
-add-editor-keymap-functions
-add-text-keymap-functions
-add-pasteboard-keymap-functions
-
-current-text-keymap-initializer
-
-editor-set-x-selection-mode
-
-get-the-snip-class-list
-get-the-buffer-data-class-list
-
-======================================================================
-4. Constant Mapping
-
- The following table maps old wx:const- identifiers to new symbols.
-======================================================================
-
-  wx:const-align-bottom                      'bottom
-  wx:const-align-center                      'center
-  wx:const-align-top                         'top
-  wx:const-always-sb                         'always-hscroll
-  wx:const-and                               'and
-  wx:const-and-invert                        'and-invert
-  wx:const-and-reverse                       'and-reverse
-  wx:const-base                              'base
-  wx:const-bdiagonal-hatch                   'bdiagonal-hatch
-  wx:const-bitmap-type-bmp                   'bmp
-  wx:const-bitmap-type-bmp-resource          'bmp-resource
-  wx:const-bitmap-type-gif                   'gif
-  wx:const-bitmap-type-pict                  'pict
-  wx:const-bitmap-type-pict-resource         'pict-resource
-  wx:const-bitmap-type-xbm                   'xbm
-  wx:const-bitmap-type-xpm                   'xpm
-  wx:const-bold                              'bold
-  wx:const-border                            'border
-  wx:const-both                              'both
-  wx:const-break-for-caret                   'caret
-  wx:const-break-for-line                    'line
-  wx:const-break-for-selection               'selection
-  wx:const-break-for-user-1                  'user1
-  wx:const-break-for-user-2                  'user2
-  wx:const-cancel                            'cancel
-  wx:const-cap-butt                          'butt
-  wx:const-cap-projecting                    'projecting
-  wx:const-cap-round                         'round
-  wx:const-caption                           'caption
-  wx:const-centre                            'centre
-  wx:const-change-alignment                  'change-alignment
-  wx:const-change-bigger                     'change-bigger
-  wx:const-change-bold                       'change-bold
-  wx:const-change-family                     'change-family
-  wx:const-change-italic                     'change-italic
-  wx:const-change-normal                     'change-normal
-  wx:const-change-normal-colour              'change-normal-color
-  wx:const-change-nothing                    'change-nothing
-  wx:const-change-size                       'change-size
-  wx:const-change-smaller                    'change-smaller
-  wx:const-change-style                      'change-style
-  wx:const-change-toggle-style               'change-toggle-style
-  wx:const-change-toggle-underline           'change-toggle-underline
-  wx:const-change-toggle-weight              'change-toggle-weight
-  wx:const-change-underline                  'change-underline
-  wx:const-change-weight                     'change-weight
-  wx:const-clear                             'clear
-  wx:const-colour                            'color
-  wx:const-copy                              'copy
-  wx:const-cross-hatch                       'cross-hatch
-  wx:const-crossdiag-hatch                   'crossdiag-hatch
-  wx:const-cursor-arrow                      'arrow
-  wx:const-cursor-bullseye                   'bullseye
-  wx:const-cursor-char                       (NO LONGER USED)
-  wx:const-cursor-cross                      'cross
-  wx:const-cursor-hand                       'hand
-  wx:const-cursor-ibeam                      'ibeam
-  wx:const-cursor-left-button                (NO LONGER USED)
-  wx:const-cursor-magnifier                  (NO LONGER USED)
-  wx:const-cursor-middle-button              (NO LONGER USED)
-  wx:const-cursor-no-entry                   (NO LONGER USED)
-  wx:const-cursor-paint-brush                (NO LONGER USED)
-  wx:const-cursor-pencil                     (NO LONGER USED)
-  wx:const-cursor-point-left                 (NO LONGER USED)
-  wx:const-cursor-point-right                (NO LONGER USED)
-  wx:const-cursor-question-arrow             (NO LONGER USED)
-  wx:const-cursor-right-button               (NO LONGER USED)
-  wx:const-cursor-sizenesw                   (NO LONGER USED)
-  wx:const-cursor-sizens                     (NO LONGER USED)
-  wx:const-cursor-sizenwse                   (NO LONGER USED)
-  wx:const-cursor-sizewe                     (NO LONGER USED)
-  wx:const-cursor-sizing                     (NO LONGER USED)
-  wx:const-cursor-spraycan                   (NO LONGER USED)
-  wx:const-cursor-wait                       (NO LONGER USED)
-  wx:const-cursor-watch                      'watch
-  wx:const-decorative                        'decorative
-  wx:const-default                           'default
-  wx:const-default-select                    'default
-  wx:const-dot                               'dot
-  wx:const-dot-dash                          'dot-dash
-  wx:const-edit-buffer                       'text
-  wx:const-edit-clear                        'clear
-  wx:const-edit-copy                         'copy
-  wx:const-edit-cut                          'cut
-  wx:const-edit-insert-graphic-box           'insert-graphic-box
-  wx:const-edit-insert-image                 'insert-image
-  wx:const-edit-insert-text-box              'insert-text-box
-  wx:const-edit-kill                         'kill
-  wx:const-edit-paste                        'paste
-  wx:const-edit-redo                         'redo
-  wx:const-edit-select-all                   'select-all
-  wx:const-edit-undo                         'undo
-  wx:const-equiv                             'equiv
-  wx:const-event-type-button-command         'button
-  wx:const-event-type-checkbox-command       'checkbox
-  wx:const-event-type-choice-command         'choice
-  wx:const-event-type-enter-window           'enter
-  wx:const-event-type-kill-focus             'kill-focus
-  wx:const-event-type-leave-window           'leave
-  wx:const-event-type-left-dclick            (NO LONGER USED)
-  wx:const-event-type-left-down              'left-down
-  wx:const-event-type-left-up                'left-up
-  wx:const-event-type-listbox-command        'list-box
-  wx:const-event-type-menu-command           (NO LONGER USED)
-  wx:const-event-type-middle-dclick          (NO LONGER USED)
-  wx:const-event-type-middle-down            'middle-down
-  wx:const-event-type-middle-up              'middle-up
-  wx:const-event-type-motion                 'motion
-  wx:const-event-type-multitext-command      (NO LONGER USED)
-  wx:const-event-type-radiobox-command       'radio-box
-  wx:const-event-type-right-dclick           (NO LONGER USED)
-  wx:const-event-type-right-down             'right-down
-  wx:const-event-type-right-up               'right-up
-  wx:const-event-type-scroll-bottom          'scroll-bottom
-  wx:const-event-type-scroll-linedown        'scroll-line-down
-  wx:const-event-type-scroll-lineup          'scroll-line-up
-  wx:const-event-type-scroll-pagedown        'scroll-page-down
-  wx:const-event-type-scroll-pageup          'scroll-page-up
-  wx:const-event-type-scroll-thumbtrack      'scroll-thumb
-  wx:const-event-type-scroll-top             'scroll-top
-  wx:const-event-type-scrollbar-command      (NO LONGER USED)
-  wx:const-event-type-set-focus              'set-focus
-  wx:const-event-type-slider-command         'slider
-  wx:const-event-type-text-command           'text
-  wx:const-event-type-text-enter-command     'text-field-enter
-  wx:const-event-type-virt-listbox-command   (NO LONGER USED)
-  wx:const-extended                          'extended
-  wx:const-fdiagonal-hatch                   'fdiagonal-hatch
-  wx:const-focus-display                     'display
-  wx:const-focus-global                      'global
-  wx:const-focus-immediate                   'immediate
-  wx:const-hide-readonly                     'hide-readonly
-  wx:const-horizontal                        'horizontal
-  wx:const-horizontal-hatch                  'horizontal-hatch
-  wx:const-hscroll                           'hscroll
-  wx:const-icon-exclamation                  'icon-exclamation
-  wx:const-icon-hand                         'icon-hand
-  wx:const-icon-information                  'icon-information
-  wx:const-icon-question                     'icon-question
-  wx:const-iconize                           'iconize
-  wx:const-invert                            'invert
-  wx:const-italic                            'italic
-  wx:const-join-bevel                        'bevel
-  wx:const-join-miter                        'miter
-  wx:const-join-round                        'round
-  wx:const-k-add                             'add
-  wx:const-k-back                            (NO LONGER USED)
-  wx:const-k-cancel                          'cancel
-  wx:const-k-capital                         'capital
-  wx:const-k-clear                           'clear
-  wx:const-k-control                         'control
-  wx:const-k-decimal                         'decimal
-  wx:const-k-delete                          (NO LONGER USED)
-  wx:const-k-divide                          'divide
-  wx:const-k-down                            'down
-  wx:const-k-end                             'end
-  wx:const-k-escape                          (NO LONGER USED)
-  wx:const-k-execute                         'execute
-  wx:const-k-f1                              'f1
-  wx:const-k-f10                             'f10
-  wx:const-k-f11                             'f11
-  wx:const-k-f12                             'f12
-  wx:const-k-f13                             'f13
-  wx:const-k-f14                             'f14
-  wx:const-k-f15                             'f15
-  wx:const-k-f16                             'f16
-  wx:const-k-f17                             'f17
-  wx:const-k-f18                             'f18
-  wx:const-k-f19                             'f19
-  wx:const-k-f2                              'f2
-  wx:const-k-f20                             'f20
-  wx:const-k-f21                             'f21
-  wx:const-k-f22                             'f22
-  wx:const-k-f23                             'f23
-  wx:const-k-f24                             'f24
-  wx:const-k-f3                              'f3
-  wx:const-k-f4                              'f4
-  wx:const-k-f5                              'f5
-  wx:const-k-f6                              'f6
-  wx:const-k-f7                              'f7
-  wx:const-k-f8                              'f8
-  wx:const-k-f9                              'f9
-  wx:const-k-help                            'help
-  wx:const-k-home                            'home
-  wx:const-k-insert                          'insert
-  wx:const-k-lbutton                         'lbutton
-  wx:const-k-left                            'left
-  wx:const-k-mbutton                         'mbutton
-  wx:const-k-menu                            'menu
-  wx:const-k-multiply                        'multiply
-  wx:const-k-next                            'next
-  wx:const-k-numlock                         'numlock
-  wx:const-k-numpad0                         'numpad0
-  wx:const-k-numpad1                         'numpad1
-  wx:const-k-numpad2                         'numpad2
-  wx:const-k-numpad3                         'numpad3
-  wx:const-k-numpad4                         'numpad4
-  wx:const-k-numpad5                         'numpad5
-  wx:const-k-numpad6                         'numpad6
-  wx:const-k-numpad7                         'numpad7
-  wx:const-k-numpad8                         'numpad8
-  wx:const-k-numpad9                         'numpad9
-  wx:const-k-pause                           'pause
-  wx:const-k-print                           'print
-  wx:const-k-prior                           'prior
-  wx:const-k-rbutton                         'rbutton
-  wx:const-k-return                          (NO LONGER USED)
-  wx:const-k-right                           'right
-  wx:const-k-scroll                          'scroll
-  wx:const-k-select                          'select
-  wx:const-k-separator                       'separator
-  wx:const-k-shift                           'shift
-  wx:const-k-snapshot                        'snapshot
-  wx:const-k-space                           (NO LONGER USED)
-  wx:const-k-start                           'start
-  wx:const-k-subtract                        'subtract
-  wx:const-k-tab                             (NO LONGER USED)
-  wx:const-k-up                              'up
-  wx:const-light                             'light
-  wx:const-local-select                      'local
-  wx:const-long-dash                         'long-dash
-  wx:const-maximize                          'maximize
-  wx:const-maximize-box                      'maximize-box
-  wx:const-mcanvas-hide-h-scroll             'hide-hscroll
-  wx:const-mcanvas-hide-v-scroll             'hide-vscroll
-  wx:const-mcanvas-no-h-scroll               'no-hscroll
-  wx:const-mcanvas-no-v-scroll               'no-vscroll
-  wx:const-mdi-child                         'mdi-child
-  wx:const-mdi-parent                        'mdi-parent
-  wx:const-media-ff-copy                     'copy
-  wx:const-media-ff-guess                    'guess
-  wx:const-media-ff-same                     'same
-  wx:const-media-ff-std                      'standard
-  wx:const-media-ff-text                     'text
-  wx:const-media-ff-text-force-cr            'text-force-cr
-  wx:const-minimize                          'minimize
-  wx:const-minimize-box                      'minimize-box
-  wx:const-mm-lometric                       (NO LONGER USED)
-  wx:const-mm-metric                         (NO LONGER USED)
-  wx:const-mm-points                         (NO LONGER USED)
-  wx:const-mm-text                           (NO LONGER USED)
-  wx:const-mm-twips                          (NO LONGER USED)
-  wx:const-modern                            'modern
-  wx:const-move-line                         'line
-  wx:const-move-page                         'page
-  wx:const-move-simple                       'simple
-  wx:const-move-word                         'word
-  wx:const-msnipbox-xinset                   (NO LONGER USED: use 1)
-  wx:const-msnipbox-xmargin                  (NO LONGER USED: use 5)
-  wx:const-msnipbox-yinset                   (NO LONGER USED: use 1)
-  wx:const-msnipbox-ymargin                  (NO LONGER USED: use 5)
-  wx:const-multiple                          'multiple
-  wx:const-nand                              'nand
-  wx:const-no                                'no
-  wx:const-no-op                             'no-op
-  wx:const-nor                               'nor
-  wx:const-normal                            'normal
-  wx:const-oddeven-rule                      'odd-even
-  wx:const-ok                                'ok
-  wx:const-opaque-stipple                    'opaque-stipple
-  wx:const-open                              'open
-  wx:const-or                                'or
-  wx:const-or-invert                         'or-invert
-  wx:const-or-reverse                        'or-reverse
-  wx:const-overwrite-prompt                  'overwrite-prompt
-  wx:const-password                          (NO LONGER USED)
-  wx:const-pasteboard-buffer                 'pasteboard
-  wx:const-pos-use-minus-one                 (NO LONGER USED)
-  wx:const-print-ask                         (NO LONGER USED)
-  wx:const-print-postscript                  'postscript
-  wx:const-print-standard                    'standard
-  wx:const-process-enter                     (NO LONGER USED)
-  wx:const-ps-file                           'file
-  wx:const-ps-landscape                      'landscape
-  wx:const-ps-portrait                       'portrait
-  wx:const-ps-preview                        'preview
-  wx:const-ps-printer                        'printer
-  wx:const-readonly                          (NO LONGER USED)
-  wx:const-resize-border                     'resize-border
-  wx:const-roman                             'roman
-  wx:const-save                              'save
-  wx:const-script                            'script
-  wx:const-sdi                               'sdi
-  wx:const-set                               'set
-  wx:const-short-dash                        'short-dash
-  wx:const-single                            'single
-  wx:const-size-auto                         (NO LONGER USED)
-  wx:const-size-auto-height                  (NO LONGER USED)
-  wx:const-size-auto-width                   (NO LONGER USED)
-  wx:const-size-use-exsiting                 (NO LONGER USED)
-  wx:const-slant                             'slant
-  wx:const-snip-after                        'after
-  wx:const-snip-after-or-null                'after-or-none
-  wx:const-snip-anchored                     'anchored
-  wx:const-snip-before                       'before
-  wx:const-snip-before-or-null               'before-or-none
-  wx:const-snip-can-append                   'can-append
-  wx:const-snip-draw-no-caret                'no-caret
-  wx:const-snip-draw-show-caret              'show-caret
-  wx:const-snip-draw-show-inactive-caret     'show-inactive-caret
-  wx:const-snip-handles-events               'handles-events
-  wx:const-snip-hard-newline                 'hard-newline
-  wx:const-snip-height-depends-on-x          'height-depends-on-x
-  wx:const-snip-height-depends-on-y          'height-depends-on-y
-  wx:const-snip-invisible                    'invisible
-  wx:const-snip-is-text                      'is-text
-  wx:const-snip-newline                      'newline
-  wx:const-snip-uses-buffer-path             'uses-buffer-path
-  wx:const-snip-width-depends-on-x           'width-depends-on-x
-  wx:const-snip-width-depends-on-y           'width-depends-on-y
-  wx:const-solid                             'solid
-  wx:const-src-invert                        'src-invert
-  wx:const-stipple                           'stipple
-  wx:const-swiss                             'swiss
-  wx:const-system                            'system
-  wx:const-system-menu                       'system-menu
-  wx:const-teletype                          'teletype
-  wx:const-thick-frame                       'thick-frame
-  wx:const-transparent                       'transparent
-  wx:const-type-command-event                'command
-  wx:const-type-key-event                    'key
-  wx:const-type-mouse-event                  'mouse
-  wx:const-vertical                          'vertical
-  wx:const-vertical-hatch                    'vertical-hatch
-  wx:const-vscroll                           'vscroll
-  wx:const-winding-rule                      'winding
-  wx:const-x-select                          'x
-  wx:const-xor                               'xor
-  wx:const-yes                               'yes
-  wx:const-yes-no                            'yes-no
-
-
-======================================================================
-5. Relatively subtle and potentially confusing changes
-======================================================================
-
-Added queue-callback: (queue-callback proc [hi-priority?])
- and removed MzScheme's semaphore-callback. Added low-priority
- callbacks in addition to the old high-priority callbacks.
-
-key-event%'s key-code method was removed.
-
-key-event%'s get-key-code returns a character or a symbol
- instead of a number.
-
-window<%>'s set-cursor no longer returns the cursor; added get-cursor,
- instead.
-
-key-event% for a numpad Enter key in Xt reports 'numpad-enter for the
- key code instead of #\return.
-
-Added 'unknown image kind for bitmap%'s load-file, etc., which
- examines the file to determine the type automatically.
-
-'wx flag for MzScheme's make-namespace changed to 'mred.
-
-canvas%'s get-view-start returns values in pixels, not scroll units.
-
-dc<%>'s get-text-extent and get-size return multiple values
- instead of mutating boxes.
-
-dc<%>'s get-/set-background-mode changed to get-/set-text-mode.
-
-A text editor's selection caret now blinks; added a blink-caret method
- to editor<%> and snip%.
-
-In editor<%>'s scroll-to, text%'s scroll-to-position and
- set-position-bias-scroll, editor-admin%'s scroll-to, and
- snip-admin%'s scroll-to, bias changed from an integer to a symbol
- (see the docs for details).
-
-media-buffer%'s do-edit changed to editor<%>'s do-edit-operation,
- which takes a symbol instead of a number.
-
-Changed editor<%>'s modified? to is-modified?, added is-locked?.
-
-Added add-undo method to editor<%>, and introduced editor-undo% class.
-
-editor-wordbreak-map%'s get-map and set-map now work on characters
- instead of integers.
-
-text%'s find-string and find-string-all use symbols to specify the
- direction, 'forward or 'backward instead of -1 or 1.
-
-Changed arguments and default value of fit-on-page? for print in
- editor<%>.
-
-pasteboard%'s {on,after}-interactive-move takes a mouse-event% object.
-
-pasteboard% is now locked for writing during calls to on-paint
-
-editor-snip%'s resize method no longer calls the embedded buffer's
- set-max-size and set-min-size; now it calls on-display-size.
-
-clipboard% changed to clipboard<%> and font-name-directory% changed to
- font-name-directory<%>; there is just once instance, the-clipboard
- and the-font-name-directory.
-
-the-color-database only has a find-color method; the others were
- removed. Certain color names with mappings under X (e.g.,
- "FORESTGREEN") are no longer available; instead, the only availabale
- colors are the ones defined in the manual.
-
-Changed the syntax for keymap%'s map-function. f a modifier is not
- mentioned in a state string, it matches states where the modifier is
- pressed or not pressed. A tilde (~) preceding a modifier makes the
- string match only states where the corresponding modifier is not
- pressed.
-
-Changed keymap%'s add-key-function and add-mouse-function to
- add-function (eliminating the different namespaces for key and mouse
- event functions).
-
-Removed keymap%'s set-error-callback; the keymap errors are instead
- reported by raising an exception. The exception handler can't escape,
- but it can at least print the error to the current error port.
diff --git a/pkgs/gui-pkgs/gui-lib/mred/MrEd_100_Framework.txt b/pkgs/gui-pkgs/gui-lib/mred/MrEd_100_Framework.txt
deleted file mode 100644
index e3d26796c4..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/MrEd_100_Framework.txt
+++ /dev/null
@@ -1,297 +0,0 @@
-MrEd 100 Framework revision
-
-The framework is a streamlined version of the `mred:' names
-from MrEd version 53.
-
-Several of the old classes and proecedures are not longer in the
-framework. Some have been eliminated and some have been moved out
-into a separate application.
-
-Subtle Changes:
-
- - get-edit -> get-editor
- - get-panel -> get-area-container
- - many other mred-sympathetic names changes
-
- - removing exit callbacks is accomplished by calling the procedure that
-   exit:insert-callback returns
-
- - menus
-
- - the built in keymap functions no longer call: 
-     add-editor-keymap-functions
-     add-text-keymap-functions and
-     add-pasteboard-keymap-functions
-   automatically. Instead, the pasteboards and editor classes add them in.
-
- - the editor `auto-save?' ivar is now called `autosave?'
- - overriding `windows-menu' with #f no longer eliminates the windows
-   menu. Now, it is an error.
- - mred:original-output-port, mred:original-error-port, and 
-   mred:original-input-port are gone
- - mred:the-frame-groups method new-frame is gone. Use handler:edit-file 
-   instead.
-   
-The eliminated classes are:
-
-  :: classes that used to improve the wx: toolbox 
-  :: interface and are no longer needed
-
-  mred:button% 
-  mred:check-box% 
-  mred:choice% 
-  mred:dialog-box% 
-  mred:frame%
-  mred:gauge% 
-  mred:horizontal-panel%
-  mred:list-box%
-  mred:message% 
-  mred:multi-text% 
-  mred:panel% 
-  mred:radio-box% 
-  mred:single-panel% 
-  mred:slider% 
-  mred:text% 
-  mred:text-window%
-  mred:vertical-panel% 
-  mred:media-canvas% 
-  mred:connections-frame%
-  mred:connections-dialog-box%
-  mred:connections-media-edit%
-  mred:connections-media-pasteboard%
-  mred:connections-media-canvas%
-  mred:connections-panel%
-  mred:testable-button% 
-  mred:testable-check-box% 
-  mred:testable-choice% 
-  mred:testable-dialog-box% 
-  mred:testable-gauge% 
-  mred:testable-list-box% 
-  mred:testable-message% 
-  mred:testable-multi-text% 
-  mred:testable-panel% 
-  mred:testable-radio-box% 
-  mred:testable-slider% 
-  mred:testable-text% 
-  mred:testable-text-window% 
-  mred:menu% 
-  mred:menu-bar% 
-  mred:menu-frame% 
-  mred:media-text-edit%   (use a text-field%)
-  mred:media-text-canvas% (use a text-field%)
-  mred:media-multi-text%  (use a text-field% with 'multiple style)
-  mred:canvas-message%    (use a message%)  
-
-  mred:edit% (only the name alias is gone; mred:file-edit lives on)
-
-  :: modes have just become mixins
-
-  mred:basic-mode% 
-  mred:mode%                       
-  mred:scheme-interaction-mode% 
-  mred:scheme-mode% 
-  
-  :: just use drscheme instead of these
-    
-  mred:console-edit% 
-  mred:console-frame%
-  mred:editor-frame%
-  mred:transparent-io-edit% 
-
-  mred:autoload
-
-The moved functions and classes are:
-  
-  :: web browswer
-  
-  mred:hyper-basic-frame% 
-  mred:hyper-canvas% 
-  mred:hyper-edit% 
-  mred:hyper-make-frame% 
-  mred:hyper-view-frame% 
-  
-  :: graph
-  
-  mred:graph-pasteboard% 
-  mred:node-snip% 
-
-The remaining existent classes: 
-  
-  frame:empty% = (frame:make-empty% frame%)
-  frame:standard-menus% = (frame:make-standard-menus% frame:empty%)
-  frame:simple-menu% = (frame:make-simple-menu% frame:standard-menus%)
-  frame:searchable% = (frame:make-searchable% frame:simple-menu%)
-  frame:info% = (frame:make-info% frame:searchable%)
-  frame:info-file% = (frame:make-file% frame:info%)
-  frame:pasteboard% = (frame:make-pasteboard% frame:simple-menu%)
-  frame:pasteboard-info% = (frame:make-info% frame:pasteboard%)
-  frame:pasteboard-info-file% = (frame:make-file% frame:pasteboard-info%)
-
-  text:basic% = 
-     (text:make-basic% (editor:make-basic% text%))  
-  text:return% = (text:make-return% text:basic%)
-  text:searching% = (text:make-searching% text:basic%)
-  text:info% = 
-    (text:make-info% (editor:make-info% text:searching%))
-  text:clever-file-format% = 
-    (text:make-clever-file-format% text:info%)
-  text:file% = 
-    (editor:make-file% text:clever-file-format%)
-  text:backup-autosave% = 
-    (editor:make-backup-autosave% text:file%)
-  text:scheme% = 
-    (text:make-scheme% text:backup-autosave%)
-
-  pasteboard:basic% = (editor:make-basic% pasteboard%)
-  pasteboard:info% = (editor:make-info% pasteboard:basic%)
-  pasteboard:file% = (editor:make-file% pasteboard:info%)
-  pasteboard:backup-autosave% = (editor:make-backup-autosave% pasteboard:info%)
-  
-  editor-canvas:frame-title% = 
-    (editor-canvas:make-frame-title% editor-canvas%)
-  editor-canvas:wide-snip% =
-    (editor-canvas:make-wide-snip% editor-canvas:frame-title%)
-
-  panel:vertical-edit% = (panel:make-edit% vertical-panel%)
-  panel:horizontal-edit% = (panel:make-edit% horizontal-panel%)
-      
-  snip:basic-style% = (snip:make-basic-style% snip%)
-  snip:basic-style-media% = (snip:make-basic-style% media-snip%)
-
-  frame-group:%
-
-  match-cache:%
-
-Old to new name mapping:
-
-  mred:scheme-paren-pairs -> scheme-paren:paren-pairs
-  mred:scheme-quote-pairs -> scheme-paren:quote-pairs
-  mred:scheme-comments -> scheme-paren:comments
-  mred:scheme-backward-match -> scheme-paren:forward-match
-  mred:scheme-forward-match-> scheme-paren:backward-match
-  mred:scheme-balanced? -> scheme-paren:balanced?
-  mred:scheme-backward-containing-sexp -> scheme-paren:backward-containing-sexp
-
-  mred:setup-global-keymap -> keymap:setup-global
-  mred:setup-global-search -> keymap:setup-search
-  mred:setup-global-file -> keymap:setup-file
-	
-  mred:global-keymap -> keymap:global
-  mred:global-search-keymap -> keymap:serach
-  mred:global-file-keymap -> keyamp:file
-
-  mred:match-cache% -> match-cache:%
-
-  mred:handler? -> handler:handler?
-  mred:handler-name -> handler:handler-name
-  mred:handler-extension -> handler:handler-extension
-  mred:handler-handler -> handler:handler-handler
-  mred:format-handlers -> handler:format-handlers
-  mred:insert-format-handler -> handler:insert-format-handler
-  mred:find-format-handler  -> handler:find-format-handler 
-  mred:find-named-format-handler  -> handler:find-named-format-handler 
-  mred:edit-file -> handler:edit-file
-  mred:open-url -> handler:open-url
-  mred:open-file -> handler:open-file
-  
-  mred:register-autosave -> autosave:register
-
-  mred:make-exn -> exn:make-exn
-  mred:exn? -> exn:exn?
-  mred:make-exn:unkown-preference -> exn:make-unkown-preference
-  mred:exn:unkown-preference? -> exn:unkown-preference?
-  mred:exn:make-during-preferences -> exn:make-during-preferences
-  mred:exn:during-preferences? -> exn:during-preferences?
-  mred:exn:make-url -> exn:make-url
-  mred:exn:url? -> exn:url?
-
-  mred:insert-exit-callback -> exit:insert-callback
-  mred:remove-exit-callback -> exit:remove-callback
-  mred:run-exit-callbacks -> exit:run-callbacks
-  mred:exit -> exit:exit
-
-  mred:add-version-spec -> version:add-spec
-  mred:version -> version:version
-
-  mred:empty-frame% -> frame:basic%
-  mred:standard-menus-frame% -> frame:standard-menus%
-  mred:simple-menu-frame% -> frame:simple-menu%
-  mred:searchable-frame% -> frame:searchable%
-  mred:info-frame% -> frame:text-info%
-  mred:info-file-frame% -> frame:text-info-file%
-  mred:pasteboard-frame% -> frame:pasteboard%
-  mred:pasteboard-info-frame% -> frame:pasteboard-info%
-  mred:pasteboard-info-file-frame% -> frame:pasteboard-info-file%
-
-  mred:media-edit% -> text:basic%
-  mred:return-edit% -> text:return%
-  mred:searching-edit% -> text:searching%
-  mred:info-edit% -> text:info%
-  mred:clever-file-format-edit% -> text:clever-file-format%
-  mred:file-edit% -> text:file%
-  mred:backup-autosave-edit% -> text:backup-autosave%
-  mred:scheme-mode-edit% -> text:scheme% 
-     (The new class is now implemented differently but has the same 
-      functionality as the old.)
-
-  mred:media-pasteboard% -> pasteboard:basic%
-  mred:info-pasteboard% -> pasteboard:info%
-  mred:file-pasteboard% -> pasteboard:file%
-  mred:backup-autosave-pasteboard% -> pasteboard:backup-autosave%
-  
-  mred:wrapping-canvas% -> editor-canvas:wrapping%
-  mred:frame-title-canvas% -> editor-canvas:frame-title%
-  mred:one-line-canvas% -> editor-canvas:one-line%
-  mred:wide-snip-canvas% -> editor-canvas:wide-snip%
-
-  mred:vertical-edit-panel% -> panel:vertical-edit%
-  mred:horizontal-edit-panel% -> panel:horizontal-edit%
-      
-  mred:snip% -> snip:basic-style%
-  mred:media-snip% -> snip:basic-style-media%
-
-  mred:frame-group -> frame-group:%
-               
-  mred:match-cache% -> match-cache:%
-
-Mixins:
-
-NOTE: some used but non-existant interfaces from mred engine:
-      frame<%>, panel<%>, editor-canvas<%>, and text<%>.
-      For now, these will use some "class derived from" predicate,
-      with the corresponding engine classes. Perhaps later those
-      interfaces will be added.
-
-  frame:make-empty% : frame% -> frame:basic<%>
-  frame:make-standard-menus% : frame% -> frame:standard-menus<%>
-  frame:make-edit% : frame:empty-standard-menus<%> -> frame:edit<%>
-  frame:make-searchable% : frame:edit<%> -> frame:searchable<%>
-  frame:make-pasteboard% : frame:edit<%> -> frame:pasteboard<%>
-  frame:make-info% : frame:empty<%> -> frame:info<%>
-  frame:make-edit-info% : (interface (frame:info<%> frame:edit<%>)) -> frame:edit-info<%>
-  frame:make-file% : frame:edit<%> -> frame:info-file<%>
-  
-  ; editor:make-basic% adds keymap support, error checking on load-file
-  ;      run-after-edit-sequence, locked?, get-edit-snip, 
-  ;      get-pasteboard-snip, sets up parents for get-file and put-file
-  editor:make-basic% : editor<%> -> editor:basic<%>
-  editor:make-info% : editor:basic<%> -> editor:info<%>
-  editor:make-file% : editor:basic<%> -> editor:basic<%>
-  editor:make-backup-autosave% : editor:basic<%> -> editor:autosave<%>
-  
-  ; text:make-basic% adds ranges, wrapping, move/copy-to-edit
-  text:make-basic% : (interface (editor:basic<%> text<%>)) -> text:basic<%>
-  text:make-return% : editor:basic<%> -> editor:basic<%>
-  text:make-searching% : (interface (editor:basic<%> text<%>)) -> text:searching<%>
-  text:make-info% : (interface (editor:basic<%> text<%>)) -> (interface (editor:basic<%> text<%>))
-  text:make-clever-file-format% : text<%> -> clever-file-format<%>
-  text:make-scheme% : (interface (editor:basic<%> text<%>)) -> editor:scheme<%>
-  
-  editor-canvas:make-frame-title% : editor-canvas<%> -> editor-canvas<%>
-  editor-canvas:make-wide-snip% : editor-canvas<%> -> editor-canvas:wide-snip<%>
-  
-  panel:make-edit% : panel<%> -> panel:edit<%>
-  
-  snip:make-basic-style% : snip<%> -> snip<%>
-
-  scheme:make-text% : text:basic<%> -> scheme:text<%>
diff --git a/pkgs/gui-pkgs/gui-lib/mred/doc.txt b/pkgs/gui-pkgs/gui-lib/mred/doc.txt
deleted file mode 100644
index 3ecb6b1932..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/doc.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-_edit-main.ss_
-
-The edit-main.ss module does not export anything, but invoking the
-module opens an _editor_ frame or frames, based on the
-`current-command-line-arguments' parameter.
-
-In particular, from a command line
-
-   mred -mvqL edit-main.ss <filename> ...
-
-runs a simple editor program. If <filename> is an image file (suffix
-.gif, .xpm, .xbm, .bmp, or .jpg), the editor window display the image.
-
------------------------------------------------------------------
-
-_edit.ss_
-
-The edit.ss module exports the following function.
-
-> (new-text-frame file)
-   Creates an editor text frame, initially loading `file' if is it a
-   string. Supply #f as `file' for an initially empty editor.
-
-> (new-pasteboard-frame file)
-  Like `new-text-frame', but for a pasteboard editor.
-
-> (new-frame editor% file)
-  Takes the editor class.
diff --git a/pkgs/gui-pkgs/gui-lib/mred/edit-main.rkt b/pkgs/gui-pkgs/gui-lib/mred/edit-main.rkt
deleted file mode 100644
index 23ff4193cc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/edit-main.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-;; Uses editor.rkt to open a frame for each argument
-
-(module edit-main mzscheme
-  (require "edit.rkt"
-           mzlib/cmdline)
-
-  (module test racket/base)
-
-  (command-line
-   "Edit"
-   (current-command-line-arguments)
-   [args files
-	 (if (null? files)
-	     (new-text-frame #f)
-	     (for-each new-text-frame files))]))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/edit.rkt b/pkgs/gui-pkgs/gui-lib/mred/edit.rkt
deleted file mode 100644
index cc887bd707..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/edit.rkt
+++ /dev/null
@@ -1,168 +0,0 @@
-
-;; Simple editor implementation; provides new-text-frame
-;; and new-pasteboard-frame
-
-(module edit mzscheme
-  (require mzlib/class
-	   mred
-	   mzlib/etc)
-
-  (provide new-text-frame
-	   new-pasteboard-frame
-	   new-frame)
-
-  (define (new-text-frame file) (new-frame text% file))
-  (define (new-pasteboard-frame file) (new-frame pasteboard% file))
-
-  (define new-frame
-    (opt-lambda (editor% file [editor-canvas% editor-canvas%])
-      (define f (make-object (class frame%
-			       (inherit modified)
-			       (define/augment (can-close?)
-				 (and (or (not (modified))
-					  (let ([r (message-box/custom
-						    "Editor Modified"
-						    "The editor has been modified. Really close it?"
-						    "Close"
-						    "Cancel"
-						    "Save and Close"
-						    this
-						    '(default=2 disallow-close))])
-					    (or (and (= r 3)
-						     (send e save-file))
-						(= r 1))))
-				      (inner #t can-close?)))
-			       (super-new))
-			     "MrEdIt" #f 620 450))
-      (define c (make-object editor-canvas% f))
-      (define e (make-object (class editor%
-                               (define/override (set-modified mod?)
-				 (send f modified mod?)
-				 (super set-modified mod?))
-			       (super-new))))
-      (define mb (make-object menu-bar% f))
-
-      (define file-menu (make-object menu% "File" mb))
-      (define edit-menu (make-object menu% "Edit" mb))
-      (define font-menu (make-object menu% "Font" mb))
-      (define para-menu (make-object menu% "Paragraph" mb))
-
-      (make-object menu-item% "New Text Frame" file-menu
-		   (lambda (item event) 
-		     (new-text-frame #f))
-		   #\N)
-      (make-object menu-item% "New Pasteboard Frame" file-menu
-		   (lambda (item event) 
-		     (new-pasteboard-frame #f)))
-
-      (make-object menu-item% "Open..." file-menu
-		   (lambda (item event) 
-		     (send e load-file ""))
-		   #\O)
-      (make-object menu-item% "Save As..." file-menu
-		   (lambda (item event) 
-		     (send e save-file ""))
-		   #\S)
-      (when (eq? editor% text%)
-	(make-object menu-item% "Save As Text..." file-menu
-		     (lambda (item event) 
-		       (send e save-file "" 'text))))
-      (make-object separator-menu-item% file-menu)
-      (when (can-get-page-setup-from-user?)
-        (make-object menu-item% "Page Setup..." file-menu
-                     (lambda (item event)
-                       (let ([s (get-page-setup-from-user #f f)])
-                         (when s
-                           (send (current-ps-setup) copy-from s))))
-                     #\P
-                     #f void
-                     (cons 'shift (get-default-shortcut-prefix))))
-      (make-object menu-item% "Print..." file-menu
-		   (lambda (item event)
-		     (send e print))
-		   #\P)
-      (make-object separator-menu-item% file-menu)
-      (make-object menu-item% "Close" file-menu
-		   (lambda (item event)
-		     (when (send f can-close?)
-		       (send f on-close)
-		       (send f show #f)))
-		   #\Q)
-
-      (append-editor-operation-menu-items edit-menu #f)
-      (when (eq? editor% text%)
-	(make-object separator-menu-item% edit-menu)
-	(make-object checkable-menu-item% "Wrap Lines" edit-menu
-		     (lambda (item event)
-		       (send e auto-wrap (send item is-checked?)))))
-
-      (append-editor-font-menu-items font-menu)
-      (let ([m (make-object menu% "Smoothing" font-menu)])
-	(let ([mk (lambda (name v)
-		    (make-object menu-item% name m
-				 (lambda (i e)
-				   (let* ([o (send f get-edit-target-object)])
-				     (and o
-					  (o . is-a? . editor<%>)
-					  (send o change-style 
-						(make-object style-delta% 'change-smoothing v)))))))])
-	  (mk "Default" 'default)
-	  (mk "Partly Smoothed" 'partly-smoothed)
-	  (mk "Smoothed" 'smoothed)
-	  (mk "Not Smoothed" 'unsmoothed)))
-
-      (make-object menu-item% "Set Margins..." para-menu
-		   (lambda (i ev)
-		     (let* ([d (make-object dialog% "Margins" f)]
-			    [mk-txt (lambda (label) (make-object 
-						     text-field%
-						     label
-						     d
-						     void
-						     "0.0"))]
-			    [first-left (mk-txt "First Left")]
-			    [rest-left (mk-txt "Rest Left")]
-			    [right (mk-txt "Right")]
-			    [button-panel (new horizontal-pane% 
-					       [parent d]
-					       [alignment '(right center)])]
-			    [ok (make-object button% "Ok" button-panel
-					     (lambda (b ev)
-					       (let* ([get (lambda (field)
-							     (let ([n (string->number (send field get-value))])
-							       (and n (real? n) (not (negative? n)) n)))]
-						      [first-left (get first-left)]
-						      [rest-left (get rest-left)]
-						      [right (get right)])
-						 (if (and first-left
-							  rest-left
-							  right)
-						     (let ([start (send e position-paragraph
-									(send e get-start-position))]
-							   [end  (send e position-paragraph
-								       (send e get-end-position))])
-						       (let loop ([i start])
-							 (unless (i . > . end)
-							   (send e set-paragraph-margins 
-								 i first-left rest-left right)
-							   (loop (add1 i)))
-							 (send d show #f)))
-						     (bell))))
-					     '(border))]
-			    [cancel (make-object button% "Cancel" button-panel
-						 (lambda (b e)
-						   (send d show #f)))])
-		       (send d show #t))))
-
-      ((current-text-keymap-initializer) (send e get-keymap))
-      (send c set-editor e)
-
-      (when file
-	(if (regexp-match "[.](gif|bmp|jpe?g|xbm|xpm|png)$" (string-downcase file))
-	    (send e insert (make-object image-snip% file))
-	    (send e load-file file)))
-
-      (send e set-max-undo-history 'forever)
-      
-      (send f show #t)
-      f)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/info.rkt b/pkgs/gui-pkgs/gui-lib/mred/info.rkt
deleted file mode 100644
index 7f7cafc5d2..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define version '(400))
-(define post-install-collection "installer.rkt")
-(define copy-man-pages '("mred.1"))
-
-(define release-note-files
-  '(("GRacket and racket/gui" "HISTORY.txt"
-     0
-     (("Porting from v5.0.x to v5.1" "Draw_and_GUI_5_1.txt")
-      ("Porting to v1xxx" "MrEd_100.txt")
-      ("Porting to v1xxx" "MrEd_100_Framework.txt")))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/installer.rkt b/pkgs/gui-pkgs/gui-lib/mred/installer.rkt
deleted file mode 100644
index 79272bc781..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/installer.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-(require launcher 
-         compiler/embed
-         racket/file
-         racket/path)
-
-(provide post-installer)
-
-;; Platforms that get a `MrEd' executable:
-(define mred-exe-systems '(unix))
-
-(define (post-installer path coll user?)
-  (define variants (available-mred-variants))
-  (when (memq (system-type) mred-exe-systems)
-    (for ([v variants] #:when (memq v '(3m cgc)))
-      (parameterize ([current-launcher-variant v])
-        (create-embedding-executable
-         (prep-dir (mred-program-launcher-path "MrEd" #:user? user?))
-         #:cmdline '("-I" "scheme/gui/init")
-         #:variant v
-         #:launcher? #t
-         #:gracket? #t
-         #:aux `((relative? . ,(not user?)))))))
-  ;; add a mred-text executable that uses the -z flag (preferring a script)
-  (for ([vs '((script-3m 3m) (script-cgc cgc))])
-    (let ([v (findf (lambda (v) (memq v variants)) vs)])
-      (when v
-        (parameterize ([current-launcher-variant v])
-          (make-gracket-launcher
-           '("-I" "scheme/gui/init" "-z")
-           (prep-dir (mred-program-launcher-path "mred-text" #:user? user?))
-           `([relative? . ,(not user?)] [subsystem . console] [single-instance? . #f]))))))
-  ;; add bin/mred script under OS X
-  (when (eq? 'macosx (system-type))
-    (for ([v variants] #:when (memq v '(script-3m script-cgc)))
-      (parameterize ([current-launcher-variant v])
-        (make-gracket-launcher
-         '()
-         (prep-dir (mred-program-launcher-path "MrEd" #:user? user?))
-         '([exe-name . "GRacket"] [relative? . ,(not user?)] [exe-is-gracket . #t]))))))
-
-(define (prep-dir p)
-  (define dir (path-only p))
-  (make-directory* dir)
-  p)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/lang/main.rkt b/pkgs/gui-pkgs/gui-lib/mred/lang/main.rkt
deleted file mode 100644
index e59173cc42..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/lang/main.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module main mzscheme
-  (require mzlib/class
-           mred)
-  (provide (all-from mzscheme)
-           (all-from mzlib/class)
-           (all-from mred)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/lang/reader.rkt b/pkgs/gui-pkgs/gui-lib/mred/lang/reader.rkt
deleted file mode 100644
index de4ac1558c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-mred
diff --git a/pkgs/gui-pkgs/gui-lib/mred/main.rkt b/pkgs/gui-pkgs/gui-lib/mred/main.rkt
deleted file mode 100644
index ccbbdfa738..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/main.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-(module main racket/base
-  (require "mred.rkt")
-  (provide (all-from-out "mred.rkt")))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/mred-sig.rkt b/pkgs/gui-pkgs/gui-lib/mred/mred-sig.rkt
deleted file mode 100644
index d071cafa9f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/mred-sig.rkt
+++ /dev/null
@@ -1,224 +0,0 @@
-#lang racket/signature
-
-add-color<%>
-add-editor-keymap-functions
-add-pasteboard-keymap-functions
-add-text-keymap-functions
-append-editor-font-menu-items
-append-editor-operation-menu-items
-application-about-handler
-application-file-handler
-application-preferences-handler
-application-quit-handler
-application-start-empty-handler
-area-container-window<%>
-area-container<%>
-area<%>
-begin-busy-cursor
-bell
-bitmap%
-bitmap-dc%
-brush%
-brush-list%
-button%
-can-get-page-setup-from-user?
-canvas%
-canvas<%>
-check-box%
-check-for-break
-checkable-menu-item%
-choice%
-clipboard-client%
-clipboard<%>
-color%
-color-database<%>
-combo-field%
-column-control-event%
-control-event%
-control<%>
-current-eventspace
-current-eventspace-has-menu-root?
-current-eventspace-has-standard-menus?
-current-ps-setup
-current-text-keymap-initializer
-cursor%
-dc<%>
-dc-path%
-dialog%
-dimension-integer?
-editor-admin%
-editor-canvas%
-editor-data%
-editor-data-class%
-editor-data-class-list<%>
-editor-set-x-selection-mode
-editor-snip%
-editor-snip-editor-admin<%>
-editor-stream-in%
-editor-stream-in-base%
-editor-stream-in-bytes-base%
-editor-stream-out%
-editor-stream-out-base%
-editor-stream-out-bytes-base%
-editor-wordbreak-map%
-editor<%>
-end-busy-cursor
-event%
-event-dispatch-handler
-eventspace-event-evt
-eventspace-handler-thread
-eventspace-shutdown?
-eventspace?
-file-creator-and-type
-find-graphical-system-path
-flush-display
-font%
-font-list%
-font-name-directory<%>
-frame%
-gauge%
-get-choices-from-user
-get-color-from-user
-get-current-mouse-state
-get-default-shortcut-prefix
-get-directory
-get-display-backing-scale
-get-display-count
-get-display-depth
-get-display-left-top-inset
-get-display-size
-get-face-list
-get-family-builtin-face
-get-file
-get-file-list
-get-font-from-user
-get-page-setup-from-user
-get-panel-background
-get-ps-setup-from-user
-get-highlight-background-color
-get-highlight-text-color
-get-resource
-get-text-from-user
-get-the-editor-data-class-list
-get-the-snip-class-list
-get-top-level-edit-target-window
-get-top-level-focus-window
-get-top-level-windows
-get-window-text-extent
-gl-config%
-gl-context<%>
-graphical-read-eval-print-loop
-group-box-panel%
-grow-box-spacer-pane%
-hide-cursor-until-moved
-horizontal-pane%
-horizontal-panel%
-tab-panel%
-image-snip%
-is-busy?
-is-color-display?
-key-event%
-keymap%
-label->plain-label
-labelled-menu-item<%>
-linear-gradient%
-list-box%
-list-control<%>
-make-bitmap
-make-eventspace
-make-gl-bitmap
-make-gui-empty-namespace
-make-gui-namespace
-make-monochrome-bitmap
-make-screen-bitmap
-map-command-as-meta-key
-menu%
-menu-bar%
-menu-control-font
-menu-item%
-menu-item-container<%>
-menu-item<%>
-message%
-message-box
-message+check-box
-message-box/custom
-message+check-box/custom
-mouse-event%
-mult-color<%>
-normal-control-font
-open-input-graphical-file
-open-input-text-editor
-open-output-text-editor
-pane%
-panel%
-pasteboard%
-pdf-dc%
-pen%
-pen-list%
-play-sound
-point%
-popup-menu%
-position-integer?
-positive-dimension-integer?
-post-script-dc%
-printer-dc%
-ps-setup%
-put-file
-queue-callback
-radio-box%
-readable-snip<%>
-read-bitmap
-read-editor-global-footer
-read-editor-global-header
-read-editor-version
-radial-gradient%
-region%
-register-collecting-blit
-scroll-event%
-selectable-menu-item<%>
-send-message-to-window
-separator-menu-item%
-sleep/yield
-slider%
-small-control-font
-snip%
-snip-admin%
-snip-class%
-snip-class-list<%>
-spacing-integer?
-special-control-key
-special-option-key
-string-snip%
-style-delta%
-style-list%
-style<%>
-subarea<%>
-subwindow<%>
-svg-dc%
-system-position-ok-before-cancel?
-tab-snip%
-text%
-text-editor-load-handler
-text-field%
-the-brush-list
-the-clipboard
-the-color-database
-the-editor-wordbreak-map
-the-font-list
-the-font-name-directory
-the-pen-list
-the-style-list
-the-x-selection-clipboard
-timer%
-tiny-control-font
-top-level-window<%>
-unregister-collecting-blit
-vertical-pane%
-vertical-panel%
-view-control-font
-window<%>
-write-editor-global-footer
-write-editor-global-header
-write-editor-version
-write-resource
-yield
diff --git a/pkgs/gui-pkgs/gui-lib/mred/mred-unit.rkt b/pkgs/gui-pkgs/gui-lib/mred/mred-unit.rkt
deleted file mode 100644
index 324a05a789..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/mred-unit.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module mred-unit mzscheme
-  (require mzlib/unit
-           "mred-sig.rkt"
-           "mred.rkt")
-  (provide standard-mred@)
-  (define-unit-from-context standard-mred@ mred^))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/mred.1 b/pkgs/gui-pkgs/gui-lib/mred/mred.1
deleted file mode 100644
index ca8f355763..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/mred.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\" dummy line
-.TH MRED 1 "May 2010"
-.UC 4
-.SH NAME
-mred \- compatibility executable for GRacket
-.SH SYNOPSIS
-.B mred
-[
-.I option ...
-] [
-.I argument ...
-]
-.SH DESCRIPTION
-MrEd is the old name for the GUI Racket implementation.
-
-.PP
-For most cases, running
-.B mred
-is the same as running
-.BR gracket ,
-except that the default interaction language is slightly
-different for backward compatibility.
-
-.SH MORE INFORMATION
-For further information, run
-.PP
-   raco docs
-.PP
-to open installed documentation in your web browser.
-
-.PP
-Alternately, consult the on-line
-documentation and other information available at
-.PP
-.ce 1
-http://racket-lang.org/
-
-.SH SEE ALSO
-.BR gracket(1)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/mred.rkt b/pkgs/gui-pkgs/gui-lib/mred/mred.rkt
deleted file mode 100644
index 36b12fdcdd..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/mred.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require "private/mred.rkt")
-(provide (all-from-out "private/mred.rkt"))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/app.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/app.rkt
deleted file mode 100644
index e70d76a5a7..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/app.rkt
+++ /dev/null
@@ -1,205 +0,0 @@
-(module app racket/base
-  (require racket/class
-           (prefix-in wx: "kernel.rkt")
-           "lock.rkt"
-           "helper.rkt"
-           "wx.rkt"
-           "wxtop.rkt")
-
-  (provide application-preferences-handler
-           application-about-handler
-           application-quit-handler
-           application-file-handler
-           application-start-empty-handler
-           current-eventspace-has-standard-menus?
-           current-eventspace-has-menu-root?
-           eventspace-handler-thread)
-
-  ;; An app-handler record keeps a wrapped procedure with
-  ;; its original wrappee.
-  (define-values (struct:app-handler
-		  make-app-handler
-		  app-handler?
-		  app-handler-ref
-		  app-handler-set!)
-    (make-struct-type 'app-handler
-		      #f 2 0
-		      #f null (current-inspector)
-		      0))
-  (define (app-handler-orig ah)
-    (app-handler-ref ah 1))
-
-  (let* ([running-quit? #f]
-	 [f (entry-point
-	     (lambda ()
-	       (unless running-quit?
-		 (let ([af (weak-box-value active-main-frame)])
-		   (when af
-		     (set! running-quit? #t)
-		     (queue-window-callback
-		      af
-		      (entry-point
-		       (lambda ()
-			 (dynamic-wind
-			     void
-			     (lambda ()
-                               (as-exit (lambda ()
-                                          (send af on-exit)))
-			       (unless (null? (wx:get-top-level-windows))
-				 (wx:cancel-quit)))
-			     (lambda () 
-			       (set! running-quit? #f)))))))))))])
-    (wx:application-quit-handler (make-app-handler f f)))
-
-  (define (set-handler! who proc param arity result-filter post-set)
-    (when proc
-      (unless (and (procedure? proc)
-		   (procedure-arity-includes? proc arity))
-	(raise-argument-error who
-                              (format "(or/c (procedure-arity-includes/c ~a) #f)" arity)
-                              proc)))
-    (let ([e (wx:current-eventspace)])
-      (when (wx:main-eventspace? e)
-        (param (make-app-handler
-		(lambda args
-		  (parameterize ([wx:current-eventspace e])
-		    (wx:queue-callback
-		     (lambda () (result-filter (apply proc args)))
-		     wx:middle-queue-key)))
-		proc))
-        (post-set))))
-
-  (define application-preferences-handler
-    (case-lambda
-     [() (and (wx:main-eventspace? (wx:current-eventspace))
-	      (app-handler-orig (wx:application-pref-handler)))]
-     [(proc)
-      (set-handler! 'application-preferences-handler proc
-		    wx:application-pref-handler
-		    0
-		    values
-                    void)]))
-
-  (define application-about-handler
-    (case-lambda
-     [() (or (and (wx:main-eventspace? (wx:current-eventspace))
-		  (app-handler-orig (wx:application-about-handler)))
-	     void)]
-     [(proc)
-      (set-handler! 'application-about-handler proc
-		    wx:application-about-handler
-		    0
-		    values
-                    void)]))
-
-  (define application-quit-handler
-    (case-lambda
-     [() (or (and (wx:main-eventspace? (wx:current-eventspace))
-		  (app-handler-orig (wx:application-quit-handler)))
-	     void)]
-     [(proc)
-      (set-handler! 'application-quit-handler proc
-		    wx:application-quit-handler
-		    0
-		    (lambda (v) (unless v (wx:cancel-quit)) v)
-                    void)]))
-
-  (define saved-files null)
-
-  (define default-application-file-handler
-    (entry-point
-     (lambda (f)
-       (let ([af (weak-box-value active-main-frame)])
-	 (if af
-             (queue-window-callback
-              af
-              (entry-point
-               (lambda () (if (send af accept-drag?)
-                              (send af on-drop-file f)
-                              (set! saved-files (cons f saved-files))))))
-             (begin
-               (add-active-frame-callback! requeue-saved-files)
-               (set! saved-files (cons f saved-files))))))))
-
-  (define (requeue-saved-files)
-    (as-entry
-     (lambda ()
-       (for-each (lambda (f)
-                   (wx:queue-callback (lambda ()
-                                        ((wx:application-file-handler) f))
-                                      wx:middle-queue-key))
-                 (reverse saved-files))
-       (set! saved-files null))))
-
-  (define (install-defh)
-    (wx:application-file-handler (make-app-handler
-				  default-application-file-handler
-				  default-application-file-handler)))
-  (install-defh)
-
-  (define application-file-handler
-    (case-lambda
-     [() (or (and (wx:main-eventspace? (wx:current-eventspace))
-		  (app-handler-orig (wx:application-file-handler)))
-	     void)]
-     [(proc)
-      ;; Special case for default-application-file-handler,
-      ;; because it need not be constrained to the main eventspace:
-      (if (eq? proc default-application-file-handler)
-	  (install-defh)
-	  (set-handler! 'application-file-handler proc
-			wx:application-file-handler
-			1
-			values
-                        requeue-saved-files))]))
-
-  (define application-start-empty-handler
-    (case-lambda
-     [() (or (and (wx:main-eventspace? (wx:current-eventspace))
-		  (app-handler-orig (wx:application-start-empty-handler)))
-	     void)]
-     [(proc)
-      (set-handler! 'application-start-empty-handler proc
-		    wx:application-start-empty-handler
-		    0
-		    values
-                    void)]))
-
-  (define (current-eventspace-has-standard-menus?)
-    (and (eq? 'macosx (system-type))
-	 (wx:main-eventspace? (wx:current-eventspace))))
-
-  (define (current-eventspace-has-menu-root?)
-    (and (memq (system-type) '(macos macosx))
-	 (wx:main-eventspace? (wx:current-eventspace))))
-
-  (define (eventspace-handler-thread e)
-    (let ([t (wx:eventspace-handler-thread e)])
-      (or t
-	  ;; eventspace dead, or just no thread, yet?
-	  (with-handlers ([exn:fail?
-			   (lambda (x)
-			     (if (wx:eventspace-shutdown? e)
-				 (raise-arguments-error
-				  'eventspace-handler-thread
-				  "eventspace is shutdown"
-                                  "eventspace"
-				  e)
-				 (raise x)))])
-	    (let ([done (make-semaphore)]
-		  [t #f])
-	      (parameterize ([wx:current-eventspace e])
-		(wx:queue-callback
-		 (lambda () 
-		   (set! t (current-thread))
-		   (semaphore-post done))
-		 #t)
-		(if (sync/timeout 1.0 done)
-		    t
-		    ;; Weird - no response after 1 second.  Maybe
-		    ;; someone killed the handler thread before it could
-		    ;; do our work? Or shutdown the eventspace? Or the
-		    ;; thread is busy? In any of those cases, we'll
-		    ;; succeed on the next iteration.
-		    (eventspace-handler-thread e)))))))))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/check.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/check.rkt
deleted file mode 100644
index df0218a98b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/check.rkt
+++ /dev/null
@@ -1,221 +0,0 @@
-(module check mzscheme
-  (require mzlib/class
-           (prefix wx: "kernel.rkt")
-           "wx.rkt"
-           "const.rkt")
-  (provide (protect (all-defined)))
-
-  (define (key-code-symbol? x)
-    (and (member x '(start cancel clear shift rshift control rcontrol
-                           menu pause capital prior next end home left 
-                           up right down escape select print execute
-                           snapshot insert help numpad0 numpad1 numpad2
-                           numpad3 numpad4 numpad5 numpad6 numpad7
-                           numpad8 numpad9 numpad-enter multiply add
-                           separator subtract decimal divide f1 f2 f3
-                           f4 f5 f6 f7 f8 f9 f10 f11 f12 f13 f14 f15
-                           f16 f17 f18 f19 f20 f21 f22 f23 f24 numlock
-                           scroll wheel-up wheel-down wheel-left
-                           wheel-right release press))
-         #t))
-  
-  (define (who->name who)
-    (cond
-     [(symbol? who) who]
-     [(eq? (car who) 'method) (string->symbol (format "~a in ~a" (caddr who) (cadr who)))]
-     [(eq? (car who) 'iconstructor) (iconstructor-name (cadr who))]
-     [else (constructor-name (cadr who))]))
-
-  (define (label-string? s)
-    (and (string? s) 
-	 (let ([l (string-length s)])
-	   (and l
-		(<= 0 l 200)))))
-
-  (define (constructor-name who)
-    (string->symbol (format "initialization for ~a%" who)))
-
-  (define (iconstructor-name who)
-    (string->symbol (format "initialization for a class that implements ~a<%>" who)))
-
-  (define (check-orientation cwho l)
-    (check-style cwho '(vertical horizontal) '(vertical-label horizontal-label deleted) l))
-
-  (define (check-container-ready cwho p)
-    (when p
-      (let ([wx (mred->wx p)])
-	(unless wx
-	  (raise-arguments-error (who->name cwho)
-                                 "container is not yet fully initialized" 
-                                 "container" p)))))
-
-  (define (check-instance who class class-name false-ok? v)
-    (unless (or (and false-ok? (not v)) (is-a? v class))
-      (raise-argument-error (who->name who) 
-                            (let ([c (format "(is-a?/c ~a)" class-name)])
-                              (if false-ok?
-                                  (format "(or/c ~a #f)" c)
-                                  c))
-                            v)))
-
-  (define (check-string/false who str)
-    (unless (or (not str) (string? str))
-      (raise-argument-error (who->name who) "(or/c string? #f)" str)))
-
-  (define (check-path who str)
-    (unless (path-string? str)
-      (raise-argument-error (who->name who) "path-string?" str)))
-
-  (define (check-path/false who str)
-    (unless (or (not str) (path-string? str))
-      (raise-argument-error (who->name who) "(or/c path-string? #f)" str)))
-
-  (define (check-string who str)
-    (unless (string? str)
-      (raise-argument-error (who->name who) "string?" str)))
-
-  (define (check-label-string who str)
-    (unless (label-string? str)
-      (raise-argument-error (who->name who) "label-string?" str)))
-
-  (define (check-label-string/false who str)
-    (unless (or (not str) (label-string? str))
-      (raise-argument-error (who->name who) "(or/c label-string? #f)" str)))
-
-  (define (check-char/false who c)
-    (unless (or (not c) (char? c))
-      (raise-argument-error (who->name who) "(or/c char? #f)" c)))
-
-  (define (check-callback who callback)
-    (unless (and (procedure? callback)
-		 (procedure-arity-includes? callback 2))
-      (raise-argument-error (who->name who) "(procedure-arity-includes/c 2)" callback)))
-
-  (define (check-callback1 who callback)
-    (unless (and (procedure? callback)
-		 (procedure-arity-includes? callback 1))
-      (raise-argument-error (who->name who) "(procedure-arity-includes/c 2)" callback)))
-
-  (define (check-bounded-integer min max false-ok?)
-    (lambda (who range)
-      (unless (or (and false-ok? (not range))
-		  (and (integer? range) (exact? range) (<= min range max)))
-	(raise-argument-error (who->name who) 
-                              (let ([i (format "(integer-in ~a ~a)" min max)])
-                                (if false-ok?
-                                    (format "(or/c ~a #f)" i)
-                                    i))
-                              range))))
-  
-  (define check-slider-integer (check-bounded-integer (- GAUGE-MAX) GAUGE-MAX #f))
-
-  (define check-margin-integer (check-bounded-integer 0 1000 #f))
-
-  (define check-gauge-integer (check-bounded-integer 1 GAUGE-MAX #f))
-  (define check-gauge-range-integer (check-bounded-integer 0 GAUGE-MAX #f))
-
-  (define (check-wheel-step cwho wheel-step)
-    (when (and wheel-step
-	       (not (and (integer? wheel-step)
-			 (exact? wheel-step)
-			 (<= 1 wheel-step 10000))))
-      (raise-argument-error (who->name cwho)
-                            "(or/c #f (integer-in 1 10000))"
-                            wheel-step)))
-
-  (define (check-fraction who x)
-    (unless (and (real? x) (<= 0.0 x 1.0))
-      (raise-argument-error (who->name who) 
-                            "(real-in 0.0 1.0)"
-                            x)))
-
-  (define (-check-non-negative-integer who i false-ok?)
-    (when (or i (not false-ok?))
-      (unless (and (integer? i) (exact? i) (not (negative? i)))
-	(raise-argument-error (who->name who) 
-                              (if false-ok?
-                                  "(or/c exact-nonnegative-integer? #f)" 
-                                  "exact-nonnegative-integer?")
-                              i))))
-
-  (define (check-non-negative-integer who i)
-    (-check-non-negative-integer who i #f))
-
-  (define (check-non-negative-integer/false who i)
-    (-check-non-negative-integer who i #t))
-
-  (define check-init-dimension (check-bounded-integer 0 WIN-SIZE-MAX #t))
-  (define check-dimension (check-bounded-integer 0 WIN-SIZE-MAX #f))
-  (define check-position (check-bounded-integer (- WIN-SIZE-MAX) WIN-SIZE-MAX #f))
-  (define check-init-position (check-bounded-integer (- WIN-SIZE-MAX) WIN-SIZE-MAX #t))
-
-  (define (check-label-string-or-bitmap who label)
-    (unless (or (label-string? label) (is-a? label wx:bitmap%))
-      (raise-argument-error (who->name who)  "(or/c label-string? (is-a?/c bitmap%))" label)))
-
-  (define (check-label-string-or-bitmap-or-both who label)
-    (unless (or (label-string? label) (is-a? label wx:bitmap%)
-                (and (list? label) 
-                     (= 3 (length label)) 
-                     (is-a? (car label) wx:bitmap%)
-                     (label-string? (cadr label))
-                     (memq (caddr label) '(left right top bottom))))
-      (raise-argument-error (who->name who) 
-                            (string-append
-                             "(or/c label-string?\n"
-                             "      (is-a?/c bitmap%)\n"
-                             "      (list/c (is-a?/c bitmap%)\n"
-                             "              string\n"
-                             "              (or/c 'left 'right 'top 'bottom)))")
-                            label)))
-
-  (define (check-label-string-or-bitmap/false who label)
-    (unless (or (not label) (label-string? label) (is-a? label wx:bitmap%))
-      (raise-argument-error (who->name who) "(or/c label-string? (is-a?/c bitmap%) #f)" label)))
-
-  (define (check-label-string/bitmap/iconsym who label)
-    (unless (or (label-string? label) (is-a? label wx:bitmap%)
-		(memq label '(app caution stop)))
-      (raise-argument-error (who->name who) "(or/c label-string? (is-a?/c bitmap%) 'app 'caution 'stop)" label)))
-
-  (define (check-font who f)
-    (unless (or (eq? f no-val) (f . is-a? . wx:font%))
-      (raise-argument-error (who->name who) "(is-a?/c font%)" f)))
-
-  (define (check-style who reqd other-allowed style)
-    (unless (and (list? style) (andmap symbol? style))
-      (raise-argument-error (who->name who) "(listof symbol?)" style))
-    (when reqd
-      (unless (ormap (lambda (i) (memq i reqd)) style)
-        (letrec ([or-together (lambda (l)
-                                (if (= (length l) 2)
-                                    (format "~e or ~e" (car l) (cadr l))
-                                    (let loop ([l l])
-                                      (if (null? (cdr l))
-                                          (format "or ~e" (car l))
-                                          (format "~e, ~a" (car l) (loop (cdr l)))))))])
-          (raise-arguments-error (who->name who)
-                                 (string-append
-                                  "missing a required option in given style list\n"
-                                  "  must include: " (or-together reqd))
-                                 "given" style))))
-    (if (and (not reqd) (null? other-allowed))
-	(unless (null? style)
-	  (raise-arguments-error (who->name who) 
-                                 "empty style list required" 
-                                 "given" style))
-	(let* ([l (append (or reqd null) other-allowed)]
-	       [bad (ormap (lambda (x) (if (memq x l) #f x)) style)])
-	  (when bad
-	    (raise-arguments-error (who->name who) 
-                                   "invalid symbol in given style list"
-                                   "invalid symbol" bad
-                                   "given" style))
-	  (let loop ([l style])
-	    (unless (null? l)
-	      (when (memq (car l) (cdr l))
-		(raise-arguments-error (who->name who) 
-                                       "duplicate style in given style list"
-                                       "duplicate" (car l)
-                                       "given" style))
-	      (loop (cdr l))))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/const.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/const.rkt
deleted file mode 100644
index ed3e90821f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/const.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-(module const mzscheme
-  (require mzlib/class
-           mzlib/file
-           racket/snip/private/prefs
-           (prefix wx: "kernel.rkt"))
-  (provide (protect (all-defined)))
-
-  ;; default spacing between items.
-  (define const-default-spacing 0)
-  
-  ;; default margins:
-  (define const-default-x-margin 2)
-  (define const-default-y-margin 2)
-
-  ;; default spacing around edge of panel
-  (define const-default-border 0)
-  
-  ;; the maximum hard-min-width of a gauge
-  (define const-max-gauge-length 150)
-
-  ;; the maximum window size/position value:
-  (define WIN-SIZE-MAX 1000000)
-
-  ;; the maximum slide/gauge value:
-  (define GAUGE-MAX WIN-SIZE-MAX)
-  
-  (define side-combo-width (case (system-type)
-			     [(windows) 20]
-			     [(macosx) 18]
-			     [else 16]))
-  
-  ;; message-box, etc.:
-  (define box-width 300)
-  
-  (define err (current-error-port))
-  
-  ;; indicates init arg not supplied
-  (define no-val (gensym))
-  (define (no-val->#f v) (if (eq? v no-val) #f v))
-
-  (define ibeam (make-object wx:cursor% 'ibeam))
-  (define arrow-cursor (make-object wx:cursor% 'arrow))
-
-  (define default-x-prefix (if (eq? 'unix (system-type))
-			       (let ([v (get-preference*
-                                         '|GRacket:defaultMenuPrefix| 
-                                         (lambda () 'ctl))])
-				 (if (memq v '(meta ctl alt ctl-m))
-				     v
-				     'ctl))
-			       'ctl))
-
-  (define (menu-shortcut-in-label?)
-    (case (system-type)
-      [(unix) (not (memq default-x-prefix '(alt meta)))]
-      [else (wx:shortcut-visible-in-label? #t)]))
-
-  (define bg-color (wx:get-panel-background))
-
-  (define (scale-color c f)
-    (make-object wx:color% 
-		 (min 255 (floor (* f (send c red)))) 
-		 (min 255 (floor (* f (send c green)))) 
-		 (min 255 (floor (* f (send c blue))))))
-
-  (define black-color (make-object wx:color% 0 0 0))
-  (define disabled-color (make-object wx:color% 150 150 150))
-
-  (define trans-pen (send wx:the-pen-list find-or-create-pen "white" 0 'transparent))
-  (define light-pen (send wx:the-pen-list find-or-create-pen (scale-color bg-color #e1.35) 0 'solid))
-  (define border-pen (send wx:the-pen-list find-or-create-pen (scale-color bg-color #e0.85) 0 'solid)) 
-  (define dark-pen (send wx:the-pen-list find-or-create-pen (scale-color bg-color #e0.6) 0 'solid)) 
-  (define dark-brush (send wx:the-brush-list find-or-create-brush (scale-color bg-color #e0.8) 'solid))
-  
-  (define wx-tab-group<%> (interface ()))
-  (define wx-group-box<%> (interface ()))
-  (define wx-text-editor-canvas<%> (interface ()))
-  (define wx-basic-panel<%> (interface ()))
-  (define internal-editor<%> (interface ()))
-  (define internal-menu<%> (interface ())))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/cycle.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/cycle.rkt
deleted file mode 100644
index a0e90588fd..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/cycle.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-(module cycle mzscheme
-
-  ;; There are a few cycles that we can't eliminate without
-  ;;  using state. This module implements that state
-
-  (provide (protect get-get-file
-		    set-get-file!
-		    get-get-font-from-user
-		    set-get-font-from-user!))
-  
-  (define get-file #f)
-  (define (get-get-file) get-file)
-  (define (set-get-file! f) (set! get-file f))
-
-  (define get-font-from-user #f)
-  (define (get-get-font-from-user) get-font-from-user)
-  (define (set-get-font-from-user! f) (set! get-font-from-user f)))
-
-
-  
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/dynamic.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/dynamic.rkt
deleted file mode 100644
index 8909430336..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/dynamic.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-
-;; This module is for use by racket/gui/dynamic.
-;; It is required by mred/mred so that it gets carried
-;; along when mred/mred is attached to a new namespace.
-
-(provide kernel-initialized)
-
-(define kernel-initialized 'done)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/editor.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/editor.rkt
deleted file mode 100644
index 05296fa046..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/editor.rkt
+++ /dev/null
@@ -1,776 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/list
-         racket/file
-         racket/path
-         (for-syntax racket/base)
-         (prefix-in wx: "kernel.rkt")
-         (prefix-in wx: racket/snip/private/style)
-         (prefix-in wx: racket/snip/private/snip)
-         (prefix-in wx: "wxme/keymap.rkt")
-         (prefix-in wx: "wxme/editor.rkt")
-         (prefix-in wx: "wxme/text.rkt")
-         (prefix-in wx: "wxme/pasteboard.rkt")
-         (prefix-in wx: "wxme/editor-snip.rkt")
-         (prefix-in wx: (only-in "wxme/cycle.rkt"
-                                 set-extended-editor-snip%!
-                                 set-extended-text%!
-                                 set-extended-pasteboard%!))
-         "seqcontract.rkt"
-         "lock.rkt"
-         "check.rkt"
-         "const.rkt"
-         "helper.rkt"
-         "cycle.rkt"
-         "wx.rkt"
-         "wxtop.rkt"
-         "wxitem.rkt"
-         "wxcanvas.rkt"
-         "mrwindow.rkt"
-         "mrtop.rkt"
-         "mrcanvas.rkt"
-         "mrpopup.rkt"
-         "mrmenuintf.rkt"
-         "mrmenu.rkt")
-
-(provide editor<%>
-         text%
-         pasteboard%
-         editor-snip%
-         current-text-keymap-initializer
-         append-editor-operation-menu-items
-         append-editor-font-menu-items)
-
-(define editor<%>
-  (interface (wx:editor<%>)
-    get-canvases
-    get-active-canvas set-active-canvas
-    get-canvas
-    add-canvas remove-canvas
-    auto-wrap get-max-view-size
-    save-file))
-
-(define-local-member-name
-  -format-filter
-  -format-filter/save
-  -get-current-format
-  -get-file-format
-  -set-file-format
-  -set-position
-  -set-format)
-
-(define (check-format who format)
-  (unless (memq format '(guess standard text text-force-cr same copy))
-    (raise-argument-error (who->name who)
-                          "(or/c 'guess 'standard 'text 'text-force-cr 'same 'copy)"
-                          format)))
-
-(define-syntax (augmentize stx)
-  (syntax-case stx ()
-    [(_ (result id arg ...) ...)
-     #'(begin
-         (define/overment (id arg ...)
-           (and (super id arg ...)
-                (inner result id arg ...)))
-         ...)]))
-
-(define (make-editor-buffer% % can-wrap? get-editor%)
-                                        ; >>> This class is instantiated directly by the end-user <<<
-  (class* % (editor<%> internal-editor<%>)
-    (init-rest args)
-    (rename-super [super-get-view-size get-view-size]
-                  [super-begin-edit-sequence begin-edit-sequence]
-                  [super-end-edit-sequence end-edit-sequence]
-                  [super-insert-port insert-port]
-                  [super-save-port save-port]
-                  [super-erase erase]
-                  [super-clear-undos clear-undos]
-                  [super-get-load-overwrites-styles get-load-overwrites-styles]
-                  [super-get-filename get-filename])
-    (inherit get-max-width set-max-width get-admin
-             get-keymap get-style-list
-             set-modified set-filename
-             get-file put-file
-             get-max-undo-history)
-    (define canvases null)
-    (define active-canvas #f)
-    (define auto-set-wrap? #f)
-    (define use-text-mode? #t)
-    (private*
-     [max-view-size
-      (lambda ()
-        (let ([wb (box 0)]
-              [hb (box 0)])
-          (super-get-view-size wb hb)
-          (unless (or (null? canvases) (null? (cdr canvases)))
-            (for-each
-             (lambda (canvas)
-               (send canvas call-as-primary-owner
-                     (lambda ()
-                       (let ([wb2 (box 0)]
-                             [hb2 (box 0)])
-                         (super-get-view-size wb2 hb2)
-                         (set-box! wb (max (unbox wb) (unbox wb2)))
-                         (set-box! hb (max (unbox hb) (unbox hb2)))))))
-             canvases))
-          (values (unbox wb) (unbox hb))))])
-    (public*
-     [-format-filter (lambda (f) f)]
-     [-format-filter/save (lambda (f) f)]
-     [-set-file-format (lambda (f) (void))]
-     [-set-position (lambda () (void))]
-     [-get-file-format (lambda () 'standard)])
-
-    (override*
-     [insert-file
-      (lambda (file [format 'guess] [show-errors? #t])
-        (let ([who '(method editor<%> insert-file)])
-          (check-path who file)
-          (check-format who format))
-        (do-load-file file format #f))]
-
-     [load-file
-      (lambda ([file #f] [format 'guess] [show-errors? #t])
-        (do-load-file file format #t))])
-
-    (public*
-     [use-file-text-mode
-      (case-lambda
-        [() use-text-mode?]
-        [(v?) (set! use-text-mode? (and v? #t))])])
-
-    (private*
-     [do-load-file
-      (lambda (file format load?)
-        (let ([who '(method editor<%> load-file)])
-          (unless (equal? file "")
-            (check-path/false who file))
-          (check-format who format))
-        (let* ([temp-filename?-box (box #f)]
-               [old-filename (super-get-filename temp-filename?-box)])
-          (let* ([file (cond
-                        [(or (not (path-string? file))
-                             (equal? file ""))
-                         (if (or (equal? file "") (not old-filename) (unbox temp-filename?-box))
-                             (let ([path (if old-filename
-                                             (path-only old-filename)
-                                             #f)])
-                               (get-file path))
-                             old-filename)]
-                        [(path? file) file]
-                        [else (string->path file)])])
-            (and
-             file
-             (or (not load?)
-                 (can-load-file? file (-format-filter format)))
-             (begin
-               (or (not load?)
-                   (on-load-file file (-format-filter format)))
-               (let ([port #f]
-                     [finished? #f])
-                 (dynamic-wind
-                   void
-                   (lambda ()
-                     (set! port (open-input-file file))
-                     (wx:begin-busy-cursor)
-                     (super-begin-edit-sequence)
-                     (dynamic-wind
-                       void
-                       (lambda ()
-                         (when load?
-                           (super-erase)
-                           (unless (and (not (unbox temp-filename?-box))
-                                        (equal? file old-filename))
-                             (set-filename file #f)))
-                         (let ([format (if (eq? format 'same)
-                                           (-get-file-format)
-                                           format)])
-                           (let ([new-format
-                                  (with-handlers ([values (lambda (x)
-                                                            (set-filename #f #f)
-                                                            (raise x))])
-                                    (super-insert-port port
-                                                       (-format-filter format)
-                                                       (and load?
-                                                            (super-get-load-overwrites-styles))))])
-                             (close-input-port port) ; close as soon as possible
-                             (when load?
-                               (-set-file-format new-format)
-                               (-set-position))))) ; text% only
-                       (lambda ()
-                         (super-end-edit-sequence)
-                         (wx:end-busy-cursor)))
-                     (when load?
-                       (super-clear-undos)
-                       (set-modified #f))
-                     (set! finished? #t)
-                     #t)
-                   (lambda ()
-                     ;; In case it wasn't closed before:
-                     (when port (close-input-port port))
-                     (when load?
-                       (after-load-file finished?))))))))))])
-    (public*
-     [save-file
-      (lambda ([file #f] [format 'same] [show-errors? #t])
-        (let ([who '(method editor<%> save-file)])
-          (unless (equal? file "")
-            (check-path/false who file))
-          (check-format who format))
-        (let* ([temp-filename?-box (box #f)]
-               [old-filename (super-get-filename temp-filename?-box)])
-          (let* ([file (cond
-                        [(or (not (path-string? file))
-                             (equal? file ""))
-                         (if (or (equal? file "") (not old-filename) (unbox temp-filename?-box))
-                             (let ([path (if old-filename
-                                             (path-only old-filename)
-                                             #f)])
-                               (put-file path (and old-filename
-                                                   (file-name-from-path old-filename))))
-                             old-filename)]
-                        [(path? file) file]
-                        [else (string->path file)])]
-                 [f-format (-format-filter/save format)])
-            (and
-             file
-             (can-save-file? file f-format)
-             (begin
-               (on-save-file file f-format)
-               (let* ([actual-format (if (memq f-format '(copy same))
-                                         (-get-file-format)
-                                         f-format)]
-                      [text? (memq actual-format '(text text-force-cr))]
-                      [text-mode? (and text? use-text-mode?)])
-                 (let ([port #f]
-                       [finished? #f])
-                   (dynamic-wind
-                     void
-                     (lambda ()
-                       (set! port (open-output-file file
-                                                    #:mode (if text-mode? 'text 'binary)
-                                                    #:exists 'truncate/replace))
-                       (wx:file-creator-and-type file #"mReD" (if text? #"TEXT" #"WXME"))
-                       (wx:begin-busy-cursor)
-                       (dynamic-wind
-                         void
-                         (lambda ()
-                           (super-save-port port format #t)
-                           (close-output-port port)     ; close as soon as possible
-                           (unless (or (eq? format 'copy)
-                                       (and (not (unbox temp-filename?-box))
-                                            (equal? file old-filename)))
-                             (set-filename file #f))
-                           (unless (eq? format 'copy)
-                             (-set-file-format actual-format))) ; text% only
-                         (lambda ()
-                           (wx:end-busy-cursor)))
-                       (unless (eq? format 'copy)
-                         (set-modified #f))
-                       (set! finished? #t)
-                       #t)
-                     (lambda ()
-                       ;; In case it wasn't closed before:
-                       (when port (close-output-port port))
-                       (after-save-file finished?))))))))))])
-
-    (public*
-     [get-canvases (entry-point (lambda () (map wx->mred canvases)))]
-     [get-active-canvas (entry-point (lambda () (and active-canvas (wx->mred active-canvas))))]
-     [get-canvas
-      (entry-point
-       (lambda ()
-         (let ([c (or active-canvas
-                      (and (not (null? canvases))
-                           (car canvases)))])
-           (and c (wx->mred c)))))]
-     [set-active-canvas
-      (entry-point
-       (lambda (new-canvas)
-         (check-instance '(method editor<%> set-active-canvas) editor-canvas% 'editor-canvas% #t new-canvas)
-         (set! active-canvas (mred->wx new-canvas))))]
-
-     [add-canvas
-      (entry-point
-       (lambda (new-canvas)
-         (check-instance '(method editor<%> add-canvas) editor-canvas% 'editor-canvas% #f new-canvas)
-         (let ([new-canvas (mred->wx new-canvas)])
-           (unless (memq new-canvas canvases)
-             (set! canvases (cons new-canvas canvases))))))]
-
-     [remove-canvas
-      (entry-point
-       (lambda (old-canvas)
-         (check-instance '(method editor<%> remove-canvas) editor-canvas% 'editor-canvas% #f old-canvas)
-         (let ([old-canvas (mred->wx old-canvas)])
-           (when (eq? old-canvas active-canvas)
-             (set! active-canvas #f))
-           (set! canvases (remq old-canvas canvases)))))]
-
-     [auto-wrap (case-lambda
-                  [() auto-set-wrap?]
-                  [(on?) (as-entry
-                          (lambda ()
-                            (set! auto-set-wrap? (and on? #t))
-                            (as-exit
-                             (lambda ()
-                               (if on?
-                                   (on-display-size)
-                                   (set-max-width 'none))))))])]
-     [get-max-view-size (entry-point (lambda () (max-view-size)))])
-    (override*
-     [copy-self
-      (lambda () (let ([e (make-object (get-editor%))])
-                   (copy-self-to e)
-                   e))]
-     [copy-self-to
-      (lambda (e)
-        (super copy-self-to e)
-        (send e auto-wrap auto-set-wrap?))])
-
-    (overment*
-     [on-display-size
-      (entry-point
-       (lambda ()
-         (as-exit (lambda () (super on-display-size)))
-         (when (as-exit (lambda () (get-admin)))
-           (when (and can-wrap? auto-set-wrap?)
-             (let-values ([(current-width) (as-exit (lambda () (get-max-width)))]
-                          [(new-width new-height) (max-view-size)])
-               (when (and (not (equal? current-width new-width))
-                          (< 0 new-width))
-                 (as-exit (lambda () (set-max-width new-width)))))))
-         (as-exit (lambda () (inner (void) on-display-size)))))])
-
-    (augmentize ((void) on-change)
-                ((void) on-snip-modified snip x)
-                (#t can-save-file? p t)
-                ((void) on-save-file p t)
-                ((void) after-save-file t)
-                (#t can-load-file? p t)
-                ((void) on-load-file p t)
-                ((void) after-load-file t)
-                ((void) on-edit-sequence)
-                ((void) after-edit-sequence))
-
-    (private*
-     [sp (lambda (x y z f b? eps?)
-           ;; let super method report z errors:
-           (let ([zok? (memq z '(standard postscript))])
-             (when zok?
-               (check-top-level-parent/false '(method editor<%> print) f))
-             (let ([p (and zok? f (mred->wx f))])
-               (as-exit (lambda () (super print x y z p b? eps?))))))])
-
-    (override*
-     [print
-      (entry-point
-       (case-lambda
-         [() (sp #t #t 'standard #f #t #f)]
-         [(x) (sp x #t 'standard #f #t #f)]
-         [(x y) (sp x y 'standard #f #t #f)]
-         [(x y z) (sp x y z #f #t #f)]
-         [(x y z f) (sp x y z f #t #f)]
-         [(x y z f b?) (sp x y z f b? #f)]
-         [(x y z f b? eps?) (sp x y z f b? eps?)]))]
-
-     [on-new-box
-      (entry-point
-       (lambda (type)
-         (unless (memq type '(text pasteboard))
-           (raise-argument-error (who->name '(method editor<%> on-new-box)) "(or/c 'text 'pasteboard)" type))
-         (make-object editor-snip%
-                      (let ([e (make-object (cond
-                                             [(eq? type 'pasteboard) pasteboard%]
-                                             [else text%]))])
-                        (send e set-keymap (get-keymap))
-                        (send e set-style-list (get-style-list))
-                        (send e set-max-undo-history (get-max-undo-history))
-                        e))))])
-
-    (apply super-make-object args)))
-
-(define text%
-  (class (lock-contract-mixin
-          (es-contract-mixin
-           (make-editor-buffer% wx:text% #t  (lambda () text%))))
-    (init [line-spacing 1.0]
-          [tab-stops null]
-          [(aw? auto-wrap) #f])
-    (rename-super [super-get-file-format get-file-format]
-                  [super-set-file-format set-file-format]
-                  [super-set-position set-position]
-                  [super-auto-wrap auto-wrap])
-    (override*
-     [-get-file-format (lambda ()
-                         (super-get-file-format))]
-     [-set-file-format (lambda (format)
-                         (super-set-file-format format))]
-     [-set-position (lambda ()
-                      (super-set-position 0 0))])
-
-    (augmentize (#t can-insert? s e)
-                ((void) on-insert s e)
-                ((void) after-insert s e)
-                (#t can-delete? s e)
-                ((void) on-delete s e)
-                ((void) after-delete s e)
-                (#t can-change-style? s e)
-                ((void) on-change-style s e)
-                ((void) after-change-style s e)
-                ((void) after-set-position)
-                (#t can-set-size-constraint?)
-                ((void) on-set-size-constraint)
-                ((void) after-set-size-constraint)
-                ((void) after-split-snip s)
-                ((void) after-merge-snips s)
-                ((void) on-reflow))
-
-    (super-make-object line-spacing tab-stops)
-    (when aw?
-      (super-auto-wrap #t))))
-
-(define pasteboard%
-  (class (es-contract-mixin (make-editor-buffer% wx:pasteboard% #f (lambda () pasteboard%)))
-    (override*
-     [-format-filter (lambda (f) 'standard)]
-     [-format-filter/save (lambda (f) (if (eq? f 'copy)
-                                          f
-                                          'standard))])
-    (augmentize (#t can-insert? s s2 x y)
-                ((void) on-insert s s2 x y)
-                ((void) after-insert s s2 x y)
-                (#t can-delete? s)
-                ((void) on-delete s)
-                ((void) after-delete s)
-                (#t can-move-to? s x y ?)
-                ((void) on-move-to s x y ?)
-                ((void) after-move-to s x y ?)
-                (#t can-resize? s x y)
-                ((void) on-resize s x y)
-                ((void) after-resize s x y ?)
-                (#t can-reorder? s s2 ?)
-                ((void) on-reorder s s2 ?)
-                ((void) after-reorder s s2 ?)
-                (#t can-select? s ?)
-                ((void) on-select s ?)
-                ((void) after-select s ?)
-
-                (#t can-interactive-move? e)
-                ((void) on-interactive-move e)
-                ((void) after-interactive-move e)
-                (#t can-interactive-resize? s)
-                ((void) on-interactive-resize s)
-                ((void) after-interactive-resize s))
-    (super-new)))
-
-(define editor-snip%
-  (class wx:editor-snip% (init [editor #f]
-                               [with-border? #t]
-                               [left-margin 5]
-                               [top-margin 5]
-                               [right-margin 5]
-                               [bottom-margin 5]
-                               [left-inset 1]
-                               [top-inset 1]
-                               [right-inset 1]
-                               [bottom-inset 1]
-                               [min-width 'none]
-                               [max-width 'none]
-                               [min-height 'none]
-                               [max-height 'none])
-    (super-make-object (or editor (make-object text%))
-                       with-border?
-                       left-margin
-                       top-margin
-                       right-margin
-                       bottom-margin
-                       left-inset
-                       top-inset
-                       right-inset
-                       bottom-inset
-                       min-width
-                       max-width
-                       min-height
-                       max-height)))
-
-(wx:set-extended-editor-snip%! editor-snip%)
-(wx:set-extended-text%! text%)
-(wx:set-extended-pasteboard%! pasteboard%)
-
-;; ----------------------- Keymap ----------------------------------------
-
-(define std-keymap (make-object wx:keymap%))
-
-(let* ([k std-keymap]
-       [mouse-paste (lambda (edit event)
-                      (when (send event button-down?)
-                        (cond
-                         [(is-a? edit wx:text%)
-                          (let ([x-box (box (send event get-x))]
-                                [y-box (box (send event get-y))]
-                                [eol-box (box #f)])
-                            (send edit global-to-local x-box y-box)
-                            (let ([click-pos (send edit find-position
-                                                   (unbox x-box)
-                                                   (unbox y-box)
-                                                   eol-box)])
-                              (send edit set-position click-pos)))]
-                         [else (void)])
-                        (send edit paste-x-selection)))]
-       [mouse-popup-menu (lambda (edit event)
-                           (when (send event button-up?)
-                             (let ([a (send edit get-admin)])
-                               (when a
-                                 (let ([m (make-object popup-menu%)])
-                                   (append-editor-operation-menu-items m)
-                                   ;; Remove shortcut indicators (because they might not be correct)
-                                   (for-each
-                                    (lambda (i)
-                                      (when (is-a? i selectable-menu-item<%>)
-                                        (send i set-shortcut #f)))
-                                    (send m get-items))
-                                   (let-values ([(x y) (send edit
-                                                             dc-location-to-editor-location
-                                                             (send event get-x)
-                                                             (send event get-y))])
-                                     (send a popup-menu m (+ x 5) (+ y 5))))))))])
-  (wx:add-text-keymap-functions k)
-  (send k add-function "mouse-paste" mouse-paste)
-  (send k add-function "mouse-popup-menu" mouse-popup-menu)
-  (map
-   (lambda (key func) (send k map-function key func))
-   (append
-    (case (system-type)
-      [(windows) '(":c:c" ":c:x" ":c:v" ":c:k" ":c:z" ":c:a")]
-      [(macos macosx) '(":d:c" ":d:x" ":d:v" ":d:k" ":d:z" ":d:a")]
-      [(unix) '(":m:w" ":c:w" ":c:y" ":c:k" ":c:s:_" ":m:a")])
-    '(":middlebutton"))
-   '("copy-clipboard" "cut-clipboard" "paste-clipboard" "delete-to-end-of-line"
-     "undo" "select-all" "mouse-paste"))
-  (send k map-function ":rightbuttonseq" "mouse-popup-menu")
-  (when (eq? (system-type) 'unix)
-    (send k map-function ":c:a" "beginning-of-line")
-    (send k map-function ":c:e" "end-of-line")))
-
-(define (check-installer who)
-  (lambda (p)
-    (unless (and (procedure? p)
-                 (procedure-arity-includes? p 1))
-      (raise-argument-error who
-                            "(procedure-arity-includes/c 1)"
-                            p))
-    p))
-
-(define current-text-keymap-initializer
-  (make-parameter (let ([default-text-keymap-initializer
-                          (lambda (k)
-                            (check-instance 'default-text-keymap-initializer wx:keymap% 'keymap% #f k)
-                            ;; Level of indirection to protect std-keymap:
-                            (let ([naya (make-object wx:keymap%)])
-                              (send naya chain-to-keymap std-keymap #f)
-                              (send k chain-to-keymap naya #f)))])
-                    default-text-keymap-initializer)
-                  (check-installer 'default-text-keymap-initializer)))
-
-(define (find-item-editor item)
-  (let ([o (let loop ([i item])
-             (let ([p (send i get-parent)])
-               (cond
-                [(not p) #f]
-                [(is-a? p popup-menu%)
-                 (let ([p (send p get-popup-target)])
-                   (if (is-a? p window<%>)
-                       (let ([f (send p get-top-level-window)])
-                         (and f (send f get-edit-target-object)))
-                       p))]
-                [(is-a? p menu%) (loop p)]
-                [else (let ([f (send p get-frame)])
-                        (and f (send f get-edit-target-object)))])))])
-    (and (is-a? o wx:editor<%>)
-         o)))
-
-;; ------------------------- Menus ----------------------------------------
-
-(define (append-editor-operation-menu-items m
-                                            [text-only? #t]
-                                            #:popup-position [popup-position #f])
-  (unless (or (not popup-position)
-              (and (list? popup-position)
-                   (= 2 (length popup-position))
-                   (is-a? (list-ref popup-position 0) text%)
-                   (exact-nonnegative-integer? (list-ref popup-position 1))))
-    (raise-argument-error 'append-editor-operation-menu-items
-                          (format "~s" '(or/c #f (list/c (is-a?/c text%) exact-nonnegative-integer?)))
-                          popup-position))
-  (menu-parent-only 'append-editor-operation-menu-items m)
-  (let* ([mk (lambda (name key op [special-case? (λ () #f)] [special-go void])
-               (make-object (class menu-item%
-                              (inherit enable)
-                              (define/override (on-demand)
-                                (let ([o (find-item-editor this)])
-                                  (enable (and o
-                                               (or (send o can-do-edit-operation? op)
-                                                   (special-case?))))))
-                              (super-make-object
-                               name m
-                               (lambda (i e)
-                                 (let* ([o (find-item-editor i)])
-                                   (and o
-                                        (if (special-case?)
-                                            (special-go)
-                                            (send o do-edit-operation op)))))
-                               key))))]
-         [mk-sep (lambda () (make-object separator-menu-item% m))])
-    (define (special-case?)
-      (cond
-        [popup-position
-         (define snp (send (list-ref popup-position 0) find-snip 
-                           (list-ref popup-position 1)
-                           'after-or-none))
-         (and snp (not (is-a? snp wx:string-snip%)))]
-        [else
-         #f]))
-    (define (copy-special-go)
-      (send (list-ref popup-position 0)
-            copy #f 0 
-            (list-ref popup-position 1)
-            (+ (list-ref popup-position 1) 1)))
-    (define (cut-special-go)
-      (send (list-ref popup-position 0)
-            cut #f 0 
-            (list-ref popup-position 1)
-            (+ (list-ref popup-position 1) 1)))
-    (mk "&Undo" #\z 'undo)
-    (mk "Redo" #f 'redo)
-    (mk-sep)
-    (mk "&Copy" #\c 'copy special-case? copy-special-go)
-    (mk "Cu&t" #\x 'cut special-case? cut-special-go)
-    (mk "&Paste" #\v 'paste)
-    (if (eq? (system-type) 'windows)
-        (mk "Delete" #f 'clear)
-        (mk "Clear" #f 'clear))
-    (mk "Select &All" #\a 'select-all)
-    (unless text-only?
-      (mk-sep)
-      (mk "Insert Text Box" #f 'insert-text-box)
-      (mk "Insert Pasteboard Box" #f 'insert-pasteboard-box)
-      (mk "Insert Image..." #f 'insert-image))
-    (void)))
-
-(define (append-editor-font-menu-items m)
-  (menu-parent-only 'append-editor-font-menu-items m)
-  (let ([mk (lambda (name m cb)
-              (make-object menu-item% name m
-                           (lambda (i e)
-                             (let* ([o (find-item-editor i)])
-                               (and o (cb o))))))]
-        [mk-sep (lambda (m) (make-object separator-menu-item% m))]
-        [mk-menu (lambda (name) (make-object menu% name m))])
-    (let ([family (mk-menu "Font")]
-          [size (mk-menu "Size")]
-          [style (mk-menu "Style")]
-          [weight (mk-menu "Weight")]
-          [underline (mk-menu "Underline")]
-          [alignment (mk-menu "Alignment")]
-          [color (mk-menu "Color")]
-          [background (mk-menu "Background")])
-
-                                        ; Font menu
-      (for-each (lambda (l f)
-                  (mk l family
-                      (lambda (e)
-                        (send e change-style (make-object wx:style-delta% 'change-family f)))))
-                '("Standard" "Decorative" "Roman" "Script" "Swiss" "Fixed" "Symbol")
-                '(default decorative roman script swiss modern symbol))
-      (mk-sep family)
-      (mk "Choose..." family (lambda (e) (let ([f ((get-get-font-from-user))])
-                                           (when f
-                                             (send e change-style (font->delta f))))))
-
-                                        ; Size menu
-      (let ([bigger (make-object menu% "Bigger" size)]
-            [smaller (make-object menu% "Smaller" size)]
-            [add-change-size
-             (lambda (m ls dss xss)
-               (for-each (lambda (l ds xs)
-                           (mk l m (lambda (e)
-                                     (let ([d (make-object wx:style-delta%)])
-                                       (send d set-size-add ds)
-                                       (send d set-size-mult xs)
-                                       (send e change-style d)))))
-                         ls dss xss))])
-        (add-change-size bigger
-                         '("+1" "+2" "+4" "+8" "+16" "+32")
-                         '(1 2 4 8 16 32)
-                         '(1 1 1 1 1  1))
-        (mk-sep bigger)
-        (add-change-size bigger
-                         '("x2" "x3" "x4" "x5")
-                         '(0    0    0    0)
-                         '(2    3    4    5))
-
-        (add-change-size smaller
-                         '("-1" "-2" "-4" "-8" "-16" "-32")
-                         '(1 -2 -4 -8 -16 -32)
-                         '(1 1   1  1  1  1))
-        (mk-sep smaller)
-        (add-change-size smaller
-                         '("/2" "/3" "/5" "/5")
-                         '(0    0    0    0)
-                         '(#i1/2 #i1/3 #i1/4 #i1/5))
-
-        (for-each (lambda (s)
-                    (mk (number->string s) size (lambda (e)
-                                                  (let ([d (make-object wx:style-delta%)])
-                                                    (send d set-size-add s)
-                                                    (send d set-size-mult 0)
-                                                    (send e change-style d)))))
-                  '(9 10 12 14 16 24 32 48)))
-
-
-      (let ([mk-cg (lambda (cmd arg)
-                     (lambda (e) (send e change-style (make-object wx:style-delta% cmd arg))))])
-
-                                        ; Style
-        (for-each (lambda (name s)
-                    (mk name style (mk-cg 'change-style s)))
-                  '("Normal" "Italic" "Slant")
-                  '(normal italic slant))
-
-                                        ; Weight
-        (for-each (lambda (name s)
-                    (mk name weight (mk-cg 'change-weight s)))
-                  '("Normal" "Bold" "Light")
-                  '(normal bold light))
-
-                                        ; Underline
-        (mk "No Underline" underline (mk-cg 'change-underline #f))
-        (mk "Underline" underline (mk-cg 'change-underline #t))
-        (mk "Toggle" underline (lambda (e) (send e change-style (make-object wx:style-delta% 'change-toggle-underline))))
-
-                                        ; Alignment
-        (for-each (lambda (name s)
-                    (mk name alignment (mk-cg 'change-alignment s)))
-                  '("Top" "Center" "Bottom")
-                  '(top center bottom))
-
-        (let ([colors '("Black" "White" "Red" "Orange" "Yellow" "Green" "Blue" "Purple" "Cyan" "Magenta" "Grey")])
-
-                                        ; Colors
-          (for-each (lambda (c)
-                      (mk c color (lambda (e) (let ([d (make-object wx:style-delta%)])
-                                                (send d set-delta-foreground c)
-                                                (send e change-style d)))))
-                    colors)
-
-                                        ; Background
-          (mk "Transparent" background (lambda (e) (let ([d (make-object wx:style-delta%)])
-                                                     (send d set-transparent-text-backing-on #t)
-                                                     (send e change-style d))))
-          (for-each (lambda (c)
-                      (mk c background (lambda (e) (let ([d (make-object wx:style-delta%)])
-                                                     (send d set-delta-background c)
-                                                     (send e change-style d)))))
-                    colors))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/filedialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/filedialog.rkt
deleted file mode 100644
index 3707b12f1f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/filedialog.rkt
+++ /dev/null
@@ -1,94 +0,0 @@
-#lang racket/base
-(require racket/class
-         (prefix-in wx: "kernel.rkt")
-         (rename-in "wxme/cycle.rkt"
-                    [set-editor-get-file! wx:set-editor-get-file!]
-                    [set-editor-put-file! wx:set-editor-put-file!])
-         "lock.rkt"
-         "wx.rkt"
-         "cycle.rkt"
-         "check.rkt"
-         "mrtop.rkt"
-         "path-dialog.rkt")
-
-(provide get-file
-         get-file-list
-         put-file
-         get-directory)
-
-(define ((mk-file-selector who put? multi? dir?)
-         message parent directory filename extension style filters dialog-mixin)
-  ;; Calls from C++ have wrong kind of window:
-  (when (is-a? parent wx:window%)
-    (set! parent (as-entry (λ () (wx->mred parent)))))
-  
-  (check-label-string/false who message)
-  (check-top-level-parent/false who parent)
-  (check-path/false who directory)
-  (check-path/false who filename)
-  (check-string/false who extension)
-  (check-style who #f (cond
-                        [dir? '(common enter-packages)]
-                        [else '(common packages enter-packages)]) style)
-  (unless (and (list? filters)
-               (andmap (λ (p)
-                         (and (list? p)
-                              (= (length p) 2)
-                              (string? (car p))
-                              (string? (cadr p))))
-                       filters))
-    (raise-argument-error who "(listof (list/c string? string?))" filters))
-  (let* ([std? (memq 'common style)]
-         [style (if std? (remq 'common style) style)])
-    (if std?
-        (send (new (dialog-mixin path-dialog%)
-                   [put?      put?]
-                   [dir?      dir?]
-                   [multi?    multi?]
-                   [message   message]
-                   [parent    parent]
-                   [directory directory]
-                   [filename  filename]
-                   [filters
-                    (cond [(eq? filters default-filters) #t] ; its own defaults
-                          [dir? #f]
-                          [else filters])])
-              run)
-        (wx:file-selector
-         message directory filename extension
-         ;; file types:
-         filters
-         ;; style:
-         (cons (cond [dir?   'dir]
-                     [put?   'put]
-                     [multi? 'multi]
-                     [else   'get])
-               style)
-         ;; parent:
-         (and parent (mred->wx parent))))))
-
-(define default-filters '(("Any" "*.*")))
-
-;; We duplicate the definition for `get-file', `get-file-list', and
-;; `put-file' so that they have the right arities and names
-
-(define-syntax define-file-selector
-  (syntax-rules ()
-    [(_ name put? multi?)
-     (define (name [message #f] [parent #f] [directory #f] [filename #f]
-                   [extension #f] [style null] [filters default-filters]
-                   #:dialog-mixin [dialog-mixin values])
-       ((mk-file-selector 'name put? multi? #f)
-        message parent directory filename extension style filters dialog-mixin))]))
-
-(define-file-selector get-file      #f #f)
-(define-file-selector get-file-list #f #t)
-(define-file-selector put-file      #t #f)
-
-(define (get-directory [message #f] [parent #f] [directory #f] [style null] #:dialog-mixin [dialog-mixin values])
-  ((mk-file-selector 'get-directory #f #f #t)
-   message parent directory #f #f style null dialog-mixin))
-
-(set-get-file! get-file)
-(wx:set-editor-get-file! get-file)
-(wx:set-editor-put-file! put-file)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/fontdialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/fontdialog.rkt
deleted file mode 100644
index 636a6d5ea0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/fontdialog.rkt
+++ /dev/null
@@ -1,118 +0,0 @@
-(module fontdialog mzscheme
-  (require mzlib/class
-           mzlib/etc
-           mzlib/list
-           (prefix wx: "kernel.rkt")
-           "lock.rkt"
-           "wx.rkt"
-           "cycle.rkt"
-           "check.rkt"
-           "helper.rkt"
-           "gdi.rkt"
-           "editor.rkt"
-           "mrtop.rkt"
-           "mrcanvas.rkt"
-           "mrpopup.rkt"
-           "mrmenu.rkt"
-           "mritem.rkt"
-           "mrpanel.rkt"
-           "mrtextfield.rkt")
-
-  (provide get-font-from-user)
-
-  (define get-font-from-user 
-    (case-lambda
-     [() (get-font-from-user #f #f #f null)]
-     [(message) (get-font-from-user message #f #f null)]
-     [(message parent) (get-font-from-user message parent #f null)]
-     [(message parent font) (get-font-from-user message parent font null)]
-     [(message parent font style)
-      (check-label-string/false 'get-font-from-user message)
-      (check-top-level-parent/false 'get-font-from-user parent)
-      (check-instance 'get-font-from-user wx:font% 'font% #t font)
-      (check-style 'get-font-from-user #f null style)
-      (letrec ([ok? #f]
-	       [f (make-object dialog% "Choose Font" parent 500 300)]
-	       [refresh-sample (lambda (b e) (let ([f (get-font)])
-					       (send ok-button enable f)
-					       (when f
-						 (let ([s (send (send edit get-style-list) find-named-style "Standard")])
-						   (send s set-delta (font->delta f))))))]
-	       [p (make-object horizontal-pane% f)]
-	       [face (make-object list-box% #f (wx:get-face-list) p refresh-sample)]
-	       [p2 (make-object vertical-pane% p)]
-	       [p3 (instantiate horizontal-pane% (p2) [stretchable-width #f])]
-	       [style (let ([pnl (instantiate group-box-panel% ("Style" p3) [stretchable-height #f] [stretchable-width #f])])
-			(make-object radio-box% #f '("Normal" "Italic" "Slant") pnl refresh-sample))]
-	       [weight (let ([pnl (instantiate group-box-panel% ("Weight" p3) [stretchable-height #f] [stretchable-width #f])])
-			 (make-object radio-box% #f '("Normal" "Bold" "Light") pnl refresh-sample))]
-	       [p4 (instantiate vertical-pane% (p3) [alignment '(left center)])]
-	       [underlined (make-object check-box% "Underlined" p4 refresh-sample)]
-	       [smoothing (make-object choice% "Smoothing:" '("Default" "Some" "Full" "None") p4 refresh-sample)]
-	       [sip (make-object check-box% "Size in Pixels" p4 refresh-sample)]
-	       [sym (make-object check-box% "Map as Symbol" p4 refresh-sample)]
-	       [size (make-object slider% "Size:" 4 127 p2 refresh-sample 12)]
-	       [sample (make-object text-field% "Sample" f void 
-                                    "The quick brown fox jumped over the lazy dog\n(\u3bb (x) x)\n" 
-                                    '(multiple))]
-	       [edit (send sample get-editor)]
-	       [done (lambda (ok) (lambda (b e) (set! ok? ok) (send f show #f)))]
-	       [get-font (lambda () (let ([face (send face get-string-selection)])
-				      (and face
-					   (make-object wx:font% (send size get-value) face 
-							(if (send sym get-value)
-							    'symbol
-							    'default)
-							(case (send style get-selection) [(0) 'normal] [(1) 'italic] [(2) 'slant])
-							(case (send weight get-selection) [(0) 'normal] [(1) 'bold] [(2) 'light])
-							(send underlined get-value)
-							(case (send smoothing get-selection) 
-							  [(0) 'default] 
-							  [(1) 'partly-smoothed]
-							  [(2) 'smoothed]
-							  [(3) 'unsmoothed])
-							(send sip get-value)))))]
-	       [bp (instantiate horizontal-pane% (f) [stretchable-height #f])]
-	       [ms-button (if (eq? (wx:font-from-user-platform-mode) 'dialog)
-			      (begin0
-			       (make-object button% "Use System Dialog..." bp
-					    (lambda (b e)
-					      (let ([new-font (wx:get-font-from-user 
-							       message 
-							       (mred->wx f)
-							       (get-font))])
-						(when new-font
-						  (reset-font new-font)))))
-			       ;; Spacer:
-			       (make-object pane% bp))
-			      (void))]
-               [ok+cancel (call-with-values
-                              (lambda () 
-                                (ok-cancel
-                                 (lambda () (make-object button% "OK" bp (done #t) '(border)))
-                                 (lambda () (make-object button% "Cancel" bp (done #f)))))
-                            cons)]
-	       [ok-button (car ok+cancel)]
-	       [cancel-button (cdr ok+cancel)]
-	       [reset-font 
-		(lambda (font)
-		  (let* ([facen (if font
-				    (send font get-face)
-				    (wx:get-family-builtin-face 'default))]
-			 [f (and facen (send face find-string facen))])
-		    (and f (>= f 0) (send face set-selection f)))
-		  (when font
-		    (send style set-selection (case (send font get-style) [(normal) 0] [(italic) 1] [(slant) 2]))
-		    (send weight set-selection (case (send font get-weight) [(normal) 0] [(bold) 1] [(light) 2]))
-		    (send underlined set-value (send font get-underlined))
-		    (send size set-value (send font get-point-size))
-		    (send sip set-value (send font get-size-in-pixels)))
-		  (refresh-sample (void) (void)))])
-	(send bp set-alignment 'right 'center)
-	(send face min-width (max 200 (let-values ([(w h) (send face get-graphical-min-size)]) w)))
-	(reset-font font)
-	(send f center)
-	(send f show #t)
-	(and ok? (get-font)))]))
-
-  (set-get-font-from-user! get-font-from-user))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/gdi.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/gdi.rkt
deleted file mode 100644
index bb068109fb..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/gdi.rkt
+++ /dev/null
@@ -1,108 +0,0 @@
-(module gdi mzscheme
-  (require mzlib/class
-           mzlib/list
-           racket/draw/private/page-dc
-           (prefix wx: "kernel.rkt")
-           (rename "wxme/cycle.rkt" wx:set-printer-dc%! set-printer-dc%!)
-           "lock.rkt"
-           "check.rkt"
-           "wx.rkt"
-           "te.rkt"
-           "mrtop.rkt"
-           "mrcanvas.rkt"
-           "syntax.rkt")
-
-  (provide register-collecting-blit
-	   unregister-collecting-blit
-	   printer-dc%
-	   get-window-text-extent
-	   normal-control-font
-	   small-control-font
-	   tiny-control-font
-	   view-control-font
-	   menu-control-font)
-
-  (define register-collecting-blit
-    (case-lambda
-     [(canvas x y w h on off) (register-collecting-blit canvas x y w h on off 0 0 0 0)]
-     [(canvas x y w h on off on-x) (register-collecting-blit canvas x y w h on off on-x 0 0 0)]
-     [(canvas x y w h on off on-x on-y) (register-collecting-blit canvas x y w h on off on-x on-y 0 0)]
-     [(canvas x y w h on off on-x on-y off-x) (register-collecting-blit canvas x y w h on off on-x on-y off-x 0)]
-     [(canvas x y w h on off on-x on-y off-x off-y)
-      (define (check-real who v)
-        (unless (real? v) (raise-argument-error who "real?" v)))
-      (check-instance 'register-collecting-blit canvas% 'canvas% #f canvas)
-      (check-position 'register-collecting-blit x)
-      (check-position 'register-collecting-blit y)
-      (check-dimension 'register-collecting-blit w)
-      (check-dimension 'register-collecting-blit h)
-      (check-instance 'register-collecting-blit wx:bitmap% 'bitmap% #f on)
-      (check-instance 'register-collecting-blit wx:bitmap% 'bitmap% #f off)
-      (check-real 'register-collecting-blit on-x)
-      (check-real 'register-collecting-blit on-y)
-      (check-real 'register-collecting-blit off-x)
-      (check-real 'register-collecting-blit off-y)
-      (wx:register-collecting-blit (mred->wx canvas) x y w h on off on-x on-y off-x off-y)]))
-
-  (define unregister-collecting-blit
-    (lambda (canvas)
-      (check-instance 'unregister-collecting-blit canvas% 'canvas% #f canvas)
-      (wx:unregister-collecting-blit (mred->wx canvas))))
-
-  (define printer-dc%
-    (class (doc+page-check-mixin (class wx:printer-dc% 
-                                   (define/public (multiple-pages-ok?) #t)
-                                   (super-new))
-                                 'printer-dc%) 
-      (init [parent #f])
-
-      (let ([prim? (or (parent . is-a? . wx:frame%)
-                       (parent . is-a? . wx:dialog%))])
-        (unless prim?
-          (check-top-level-parent/false '(constructor printer-dc) parent))
-        (as-entry
-         (lambda ()
-           (let ([p (if prim?
-                        parent
-                        (and parent (mred->wx parent)))])
-             (as-exit (lambda () (super-new [parent p])))))))))
-  (wx:set-printer-dc%! printer-dc%)
-
-  (define get-window-text-extent
-    (case-lambda
-     [(string font)
-      (get-window-text-extent string font #f)]
-     [(string font combine?)
-      (check-string 'get-window-text-extent string)
-      (check-instance 'get-window-text-extent wx:font% 'font% #f font)
-      (let-values ([(w h d a) (get-window-text-extent* string font combine?)])
-        (values (inexact->exact (ceiling w)) (inexact->exact (ceiling h))))]))
-
-  (define small-delta (case (system-type)
-			[(windows) 0]
-			[(macosx) 2]
-			[else 1]))
-  (define tiny-delta (case (system-type)
-			[(windows) 1]
-			[else 2]))
-
-  (define normal-control-font (make-object wx:font% (wx:get-control-font-size) 
-					   (wx:get-control-font-face) 'system
-                                           'normal 'normal #f 'default
-                                           (wx:get-control-font-size-in-pixels?)))
-  (define small-control-font (make-object wx:font% (- (wx:get-control-font-size) small-delta) 
-					  (wx:get-control-font-face) 'system
-					  'normal 'normal #f 'default
-					  (wx:get-control-font-size-in-pixels?)))
-  (define tiny-control-font (make-object wx:font% (- (wx:get-control-font-size) tiny-delta small-delta)
-					 (wx:get-control-font-face) 'system
-					 'normal 'normal #f 'default
-					 (wx:get-control-font-size-in-pixels?)))
-  (define view-control-font (if (eq? 'macosx (system-type))
-				(make-object wx:font% (- (wx:get-control-font-size) 1) 
-					     (wx:get-control-font-face) 'system)
-				normal-control-font))
-  (define menu-control-font (if (eq? 'macosx (system-type))
-				(make-object wx:font% (+ (wx:get-control-font-size) 1) 
-					     (wx:get-control-font-face) 'system)
-				normal-control-font)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/helper.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/helper.rkt
deleted file mode 100644
index 21192ef39b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/helper.rkt
+++ /dev/null
@@ -1,341 +0,0 @@
-(module helper mzscheme
-  (require mzlib/class
-           (prefix wx: "kernel.rkt")
-           (prefix wx: racket/snip/private/style)
-           "lock.rkt")
-
-  (provide (protect (struct child-info (x-min y-min x-margin y-margin x-stretch y-stretch))
-                    get-two-int-values
-                    non-negative-number?
-                    same-dimension?
-                    list-diff
-                    key-regexp
-                    do-command
-                    double-boxed
-                    queue-window-callback
-                    param
-                    protect&
-                    find-pos
-                    no-stretch
-                    font->delta
-                    traverse
-                    object->position
-                    container->children
-                    filter-overlapping
-                    system-position-ok-before-cancel?
-                    ok-cancel))
-
-  ;; this structure holds the information that a child will need to send
-  ;; to its parent when the parent must resize itself.
-  (define-struct child-info (x-min y-min           ; includes margins!
-				   x-margin y-margin     ; requested margin space
-				   x-stretch y-stretch)) ; booleans indicating strechability
-
-  ;; get-two-int-values: a wrapper around functions that need to return
-  ;;   two results.
-  ;; input: function: a function which takes two boxes and returns results
-  ;;          in them.
-  ;; returns: the contents of the two boxes (as multiple values)
-  (define get-two-int-values
-    (lambda (function)
-      (let ([a (box 0)]
-	    [b (box 0)])
-	(function a b)
-	(values (unbox a) (unbox b)))))
-
-  (define non-negative-number?
-    (lambda (n)
-      (and (real? n) (not (negative? n)))))
-
-  (define same-dimension?
-    (lambda (new-dim current-dim)
-      (or (= new-dim current-dim)
-	  (= new-dim -1))))
-  
-  ;; list-diff: computes the difference between two lists
-  ;; input: l1, l2: two lists
-  ;; returns:  a list of all elements in l1 which are not in l2.
-  (define list-diff
-    (lambda (l1 l2)
-      (let ([table (make-hash-table)])
-	(for-each
-	 (lambda (item)
-	   (hash-table-put! table item #t))
-	 l2)
-	(let loop ([l l1])
-	  (cond
-	   [(null? l) null]
-	   [(hash-table-get table (car l) (lambda () #f))
-	    (loop (cdr l))]
-	   [else (cons (car l) (loop (cdr l)))])))))
-
-  (define (key-regexp c)
-    (regexp (format "(^|[^&])&[~a~a]" (char-downcase c) (char-upcase c))))
-  
-  (define (do-command c e)
-    (as-exit (lambda () (send c command e))))
-
-  (define double-boxed
-    (lambda (x y f)
-      (let ([x (box x)][y (box y)])
-	(f x y)
-	(values (unbox x) (unbox y)))))
-
-  (define (queue-window-callback w cb)
-    (parameterize ([wx:current-eventspace (send (send w get-top-level) get-eventspace)])
-      (wx:queue-callback cb wx:middle-queue-key)))
-
-  (define-syntax (param stx)
-    (syntax-case stx ()
-      [(_ get-obj method)
-       (syntax/loc stx
-	 (entry-point
-	  (case-lambda
-	   [() (send (get-obj) method)]
-	   [(v) (send (get-obj) method v)])))]))
-
-  (define (font->delta f)
-    (define d (make-object wx:style-delta%))
-    (let ([v (send f get-face)]
-	  [m (send f get-family)])
-      (if v
-	  (send d set-delta-face v m)
-	  (send d set-delta 'change-family m)))
-    (send d set-delta 'change-size (send f get-point-size))
-    (send d set-delta 'change-style (send f get-style))
-    (send d set-delta 'change-weight (send f get-weight))
-    (send d set-delta 'change-underline (send f get-underlined))
-    (send d set-delta 'change-smoothing (send f get-smoothing))
-    (send d set-delta 'change-size-in-pixels (send f get-size-in-pixels))
-    d)
-
-  (define protect&
-    (lambda (s)
-      (regexp-replace* #rx"&" s "\\&\\&")))
-
-  (define (find-pos l i eq?)
-    (let loop ([l l][n 0])
-      (cond
-       [(null? l) #f]
-       [(eq? (car l) i) n]
-       [else (loop (cdr l) (add1 n))])))
-
-  (define (no-stretch a) 
-    (send a stretchable-width #f) (send a stretchable-height #f))
-  
-  ;; ;;;;;;;;;;;;; Focus-tabbing helpers ;;;;;;;;;;;;;;;;;;;;
-
-  (define (traverse x y w h dir dests)
-    ;; x, y : real = starting positions
-    ;; dir : one of 'left, 'right, 'up, 'next, 'prev = desried move
-    ;; dests : list of (cons key x y w h) = destinations
-    ;; returns key or #f
-    (case dir
-      [(next prev)
-       (letrec ([get-x cadr]
-		[get-w cadddr]
-		[get-y caddr]
-		[get-h (lambda (x) (caddr (cddr x)))]
-		[backward? (eq? dir 'prev)]
-		[fail-start (if backward?
-				1000000000
-				0)]
-		[find-stripe (lambda (t stripes)
-			       (let loop ([s stripes])
-				 (cond
-				  [(null? s) #f]
-				  [(and (<= (caar s) t) (< t (cdar s)))
-				   (car s)]
-				  [else (loop (cdr s))])))]
-		[mk-stripes
-		 (lambda (get-y get-h stripes dests)
-		   (let loop ([l (append (map (lambda (x) (cons (car x) (- (cdr x) (car x))))
-					      stripes)
-					 (map (lambda (x) 
-						(cons (get-y x) (get-h x)))
-					      dests))])
-		     (if (null? l)
-			 null
-			 ;; Find longest top-most
-			 (let* ([top (let loop ([l (cdr l)][best (car l)])
-				       (cond
-					[(null? l) best]
-					[(or (< (caar l) (car best)) ; topmost
-					     (and (= (caar l) (car best)) ; at least as top
-						  (> (cdar l) (cdr best)))) ; longer
-					 (loop (cdr l) (car l))]
-					[else (loop (cdr l) best)]))]
-				[t (car top)]
-				[b (+ t (cdr top))])
-			   ;; Stripe is anything that starts before the end of `top'
-			   (let ([remaining (let loop ([l l])
-					      (cond
-					       [(null? l) null]
-					       [(find-stripe (caar l) (list (cons t b)))
-						(loop (cdr l))]
-					       [else (cons (car l) (loop (cdr l)))]))])
-			     (cons (cons t b) (loop remaining)))))))]
-		[in-stripe (lambda (stripe dests get-y get-h)
-			     (let loop ([l dests])
-			       (cond
-				[(null? l) null]
-				[(find-stripe (get-y (car l)) (list stripe))
-				 (cons (car l) (loop (cdr l)))]
-				[else (loop (cdr l))])))]
-		[next-stripe (lambda (stripe stripes)
-			       (let loop ([s stripes][best #f])
-				 (cond
-				  [(null? s) best]
-				  [(and (or (not stripe)
-					    (if backward?
-						(<= (cdar s) (car stripe))
-						(>= (caar s) (cdr stripe))))
-					(or (not best)
-					    (if backward?
-						(> (cdar s) (cdr best))
-						(< (caar s) (cdr best)))))
-				   (loop (cdr s) (car s))]
-				  [else (loop (cdr s) best)])))]
-		[find (lambda (v? get-x get-w get-y get-h use-x? x w use-y? y h dests fail)
-			;; find's variable names correspond to an h-stripe view, but everything is
-			;;  flipped to v-stripes if the args are flipped
-			(let ([h-stripes (mk-stripes get-y get-h 
-						     (if use-y? (list (cons y (+ y h))) null)
-						     dests)])
-
-			  ;; find the initial h-stripe
-			  (let sel-h-stripe-loop ([init-h-stripe (if use-y?
-								     (find-stripe y h-stripes)
-								     (next-stripe #f h-stripes))]
-						  [x x][w w][use-x? use-x?])
-			    
-			    ;; find items in the initial stripe
-			    (let ([in-init-h-stripe (in-stripe init-h-stripe dests get-y get-h)]
-				  [next (lambda ()
-					  (let ([s (next-stripe init-h-stripe h-stripes)])
-					    (if s
-						(sel-h-stripe-loop s fail-start fail-start #f)
-						(fail))))])
-
-			      (if (null? in-init-h-stripe)
-
-				  ;; no items in this stripe; try the next one
-				  (next)
-				  
-				  ;; Non-empty h-stripe; now look for items in the same or later v-stripe
-				  (if (or (null? (cdr in-init-h-stripe))
-                                          ;; If we're already in "v-stripe" mode, then flipping back
-                                          ;; to h-stripe mode is going to loop forever, so treat the
-                                          ;; current strip as having only one item. (This should
-                                          ;; happen only if the start positions overlap with the
-                                          ;; destination positions.)
-                                          v?)
-				      
-				      ;; one item in the stripe; take it unless we're using x and it's
-				      ;;  before x:
-				      (if (or (not use-x?)
-					      ((if backward? < >) (get-x (car in-init-h-stripe)) x))
-					  (car in-init-h-stripe)
-					  
-					  ;; Only item is no good; try the next stripe
-					  (next))
-				      
-				      ;; Recur to work with v-stripes
-				      (find #t get-y get-h get-x get-w use-y? y h use-x? x w in-init-h-stripe next)))))))])
-	 (if (null? dests)
-	     #f
-	     (car (find #f get-x get-w get-y get-h #t x w #t y h dests
-			(lambda ()
-			  (find #f get-x get-w get-y get-h 
-				#f fail-start fail-start 
-				#f fail-start fail-start 
-				dests void))))))]
-      [else
-       (let ([v (let loop ([d dests])
-		  (if (null? d)
-		      #f
-		      (let* ([best (loop (cdr d))]
-			     [this (car d)]
-			     [diff (lambda (v l x w)
-				     (cond
-				      [(< (+ v l) x) (- x (+ v l))]
-				      [(< (+ x w) v) (- (+ x w) v)]
-				      [else 0]))])
-			(let* ([get-x cadr]
-			       [get-w cadddr]
-			       [get-y caddr]
-			       [get-h (lambda (x) (caddr (cddr x)))]
-			       [tdx (diff x w (get-x this) (get-w this))]
-			       [tdy (diff y h (get-y this) (get-h this))]
-			       [bdx (and best (diff x w (get-x best) (get-w best)))]
-			       [bdy (and best (diff y h (get-y best) (get-h best)))]
-			       [better (lambda (tdx tdy bdy negative?)
-					 (if (and (zero? tdx) (negative? tdy)
-						  (or (not best) 
-						      (< (abs tdy) (abs bdy))))
-					     this
-					     best))])
-			  (case dir
-			    [(up) (better tdx tdy bdy negative?)]
-			    [(down) (better tdx tdy bdy positive?)]
-			    [(left) (better tdy tdx bdx negative?)]
-			    [(right) (better tdy tdx bdx positive?)])))))])
-	 (and v (car v)))]))
-
-  (define (object->position o)
-    (let-values ([(x y) (double-boxed 0 0 (lambda (x y) (send o client-to-screen x y)))]
-		 [(w h) (double-boxed 0 0 (lambda (x y) (send o get-client-size x y)))])
-      (send o tabbing-position x y w h)))
-
-  (define (container->children f except must-focus?)
-    (apply
-     append
-     (map
-      (lambda (i)
-        (append
-         (if (and (send i has-tabbing-children?)
-                  (send i is-shown-to-root?))
-             (container->children i except must-focus?)
-             null)
-         (cond
-          [(or (eq? i except) 
-               (and must-focus? (not (send i gets-focus?)))
-               (not (send i is-enabled-to-root?))
-               (not (send i is-shown-to-root?)))
-           null]
-          [else (list i)])))
-      (send f get-children))))
-
-  (define (filter-overlapping l)
-    (if (null? l)
-	null
-	(let* ([rest (filter-overlapping (cdr l))]
-	       [first (car l)]
-	       [f (cdr first)]
-	       [x (car f)]
-	       [y (cadr f)]
-	       [x2 (+ x (caddr f))]
-	       [y2 (+ y (cadddr f))])
-	  (if (ormap (lambda (other)
-		       (let* ([p (cdr other)]
-			      [px (car p)]
-			      [py (cadr p)]
-			      [px2 (+ px (caddr p))]
-			      [py2 (+ py (cadddr p))])
-			 (and (or (<= x px x2) (<= x px2 x2)
-				  (<= px x px2) (<= px x2 px2))
-			      (or (<= y py y2) (<= y py2 y2)
-				  (<= py y py2) (<= py y2 py2)))))
-		     rest)
-	      rest
-	      (cons first rest)))))
-
-  (define (system-position-ok-before-cancel?)
-    (eq? (system-type) 'windows))
-  
-  (define (ok-cancel mk-ok mk-cancel)
-    (if (system-position-ok-before-cancel?)
-        (values (mk-ok) (mk-cancel))
-        (let ([c (mk-cancel)]
-              [o (mk-ok)])
-          (values o c)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/kernel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/kernel.rkt
deleted file mode 100644
index 86253c40da..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/kernel.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket/base
-(require "wx/platform.rkt"
-         "wx/common/event.rkt"
-         "wx/common/timer.rkt"
-         "wx/common/queue.rkt"
-         "wx/common/clipboard.rkt"
-         "wx/common/cursor.rkt"
-         "wx/common/procs.rkt"
-         "wx/common/handlers.rkt"
-         racket/class
-         racket/draw)
-
-(provide (all-from-out "wx/platform.rkt")
-         clipboard<%>
-         (all-from-out "wx/common/event.rkt"
-                       "wx/common/timer.rkt"
-                       "wx/common/clipboard.rkt"
-                       "wx/common/cursor.rkt"
-                       "wx/common/procs.rkt")
-         (all-from-out racket/draw)
-
-         eventspace?
-         current-eventspace
-         queue-event
-         yield
-         make-eventspace
-         event-dispatch-handler
-         eventspace-shutdown?
-         main-eventspace?
-         eventspace-handler-thread
-         eventspace-event-evt
-         queue-callback
-         queue-refresh-event
-         middle-queue-key
-         get-top-level-windows
-         begin-busy-cursor
-         is-busy?
-         end-busy-cursor
-         application-file-handler
-         application-quit-handler
-         application-about-handler
-         application-pref-handler
-         application-start-empty-handler)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/lock.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/lock.rkt
deleted file mode 100644
index 60f49b871c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/lock.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         ffi/unsafe/atomic)
-
-(provide (protect-out as-entry    ;; alias for call-as-atomic
-                      as-exit     ;; alias for call-as-nonatomic
-                      atomically  ;; assumes no exceptions!
-                      entry-point ;; converts a proc body to use as-entry
-                      mk-param))  ;; parameter pattern --- out of place here
-
-;; We need atomic mode for a couple of reasons:
-;;
-;; * We may need to bracket some (trusted) operations so that the
-;;   queue thread doesn't poll for events during the operation.
-;;   The `atomically' form is ok for that if no exceptions will
-;;   be raised. Otherwise, use the more heavyweight `as-entry'.
-;;
-;; * The racket/gui classes have internal-consistency requirements.
-;;   When the user creates an object or calls a method, or when the
-;;   system invokes a callback, many steps may be required to
-;;   initialize or reset fields to maintain invariants. To ensure that
-;;   other threads do not call methods during a time when invariants
-;;   do not hold, we force all of the following code to be executed in
-;;   a single threaded manner, and we temporarily disable breaks.
-;;   The `as-entry' form or `entry-point' wrapper is normally used for
-;;   that case.
-;;
-;; If an exception is raised within an `enter'ed area, control is
-;; moved back outside by the exception handler, and then the exception
-;; is re-raised. The user can't tell that the exception was caught an
-;; re-raised. But without the catch-and-reraise, the user's exception
-;; handler might try to use GUI elements from a different thread, or
-;; other such things, leading to deadlock.
-
-(define as-entry call-as-atomic)
-
-(define as-exit call-as-nonatomic)
-
-(define-syntax entry-point 
-  (lambda (stx)
-    (syntax-case stx (lambda #%plain-lambda case-lambda)
-      [(_ (lambda args body1 body ...))
-       (syntax (lambda args (as-entry (lambda () body1 body ...))))]
-      [(_ (#%plain-lambda args body1 body ...))
-       (syntax (#%plain-lambda args (as-entry (lambda () body1 body ...))))]
-      [(_ (case-lambda [vars body1 body ...] ...))
-       (syntax (case-lambda 
-                [vars (as-entry (lambda () body1 body ...))]
-                ...))])))
-
-(define-syntax-rule (atomically expr ...)
-  (begin
-    (start-atomic) 
-    (begin0 (let () expr ...)
-            (end-atomic))))
-
-;; Parameter-method pattern. (Why is this in the "lock" library?)
-(define-syntax mk-param
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ val filter check force-redraw)
-       (syntax
-        (case-lambda
-         [() val]
-         [(v) (check v)
-          (let ([v2 (filter v)])
-            (unless (eq? v2 val)
-              (set! val v2)
-              (force-redraw)))]))])))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/messagebox.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/messagebox.rkt
deleted file mode 100644
index f1a2e331fb..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/messagebox.rkt
+++ /dev/null
@@ -1,318 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/string
-         (prefix-in wx: "kernel.rkt")
-         "const.rkt"
-         "check.rkt"
-         "helper.rkt"
-         "editor.rkt"
-         "mrtop.rkt"
-         "mrcanvas.rkt"
-         "mrpopup.rkt"
-         "mrmenu.rkt"
-         "mritem.rkt"
-         "mrpanel.rkt")
-
-(provide message-box
-         message-box/custom
-         message+check-box
-         message+check-box/custom)
-
-(define do-message-box/custom
-  (lambda (who title message
-               button1 button2 button3
-               parent style close-result
-               check? two-results? check-message
-               dialog-mixin)
-    (check-label-string who title)
-    (check-string/false who message)
-    (when check?
-      (check-label-string who check-message))
-    (check-label-string-or-bitmap/false who button1)
-    (check-label-string-or-bitmap/false who button2)
-    (check-label-string-or-bitmap/false who button3)
-    (check-top-level-parent/false who parent)
-    (check-style who
-                 '(default=1 default=2 default=3 no-default)
-                 (let ([l '(disallow-close number-order caution stop no-icon)])
-                   (if check?
-                       (cons 'checked l)
-                       l))
-                 style)
-
-    (let ([go (lambda ()
-                (create-message-box/custom
-                 who title message
-                 button1 button2 button3
-                 parent style close-result
-                 check? two-results? check-message
-                 dialog-mixin))]
-          [es (if parent
-                  (send parent get-eventspace)
-                  (wx:current-eventspace))])
-      (if (eq? (current-thread) (wx:eventspace-handler-thread es))
-          ;; In the right thread:
-          (go)
-          ;; Not in the right thread:
-          (let ([ch (make-channel)])
-            (parameterize ([wx:current-eventspace es])
-              (wx:queue-callback
-               (lambda ()
-                 (channel-put ch (call-with-values go list)))))
-            (apply values (channel-get ch)))))))
-
-(define create-message-box/custom
-  (lambda (who title message
-               button1 button2 button3
-               parent style close-result
-               check? two-results? check-message
-               dialog-mixin)
-    (let* ([strings (regexp-split #rx"\n" message)]
-           [single? (and (< (length strings) 10)
-                         (andmap (lambda (s) (< (string-length s) 60)) strings))]
-           [f (make-object (dialog-mixin
-                            (class dialog%
-                              (public*
-                               [get-message
-                                (lambda () message)])
-                              (augment*
-                               [can-close? (lambda ()
-                                             (if (memq 'disallow-close style)
-                                                 (begin
-                                                   (wx:bell)
-                                                   #f)
-                                                 #t))])
-                              (override*
-                               [on-subwindow-event
-                                (lambda (w e)
-                                  (if (send e button-down?)
-                                      (if (is-a? w button%)
-                                          #f
-                                          (if (or (is-a? w message%)
-                                                  (and
-                                                   (is-a? w editor-canvas%)
-                                                   (let-values ([(w h) (send w get-client-size)])
-                                                     (< (send e get-x) w))))
-                                              (begin
-                                                (send w popup-menu
-                                                      (let ([m (make-object popup-menu%)])
-                                                        (make-object menu-item%
-                                                                     "Copy Message"
-                                                                     m
-                                                                     (lambda (i e)
-                                                                       (send (wx:get-the-clipboard)
-                                                                             set-clipboard-string
-                                                                             message
-                                                                             (send e get-time-stamp))))
-                                                        m)
-                                                      (send e get-x)
-                                                      (send e get-y))
-                                                #t)
-                                              #f))
-                                      #f))])
-                              (super-make-object title parent box-width))))]
-           [result close-result]
-           [icon-id (cond
-                     [(memq 'no-icon style) #f]
-                     [(memq 'stop style) 'stop]
-                     [(memq 'caution style) 'caution]
-                     [else 'app])])
-      (let-values ([(msg-pnl btn-pnl cb-pnl extra-width btn-h-align msg-h-align msg-v-align)
-                    (case (system-type)
-                      [(macosx) (let ([p (make-object horizontal-pane% f)])
-                                  (send f min-width 300)
-                                  (send p set-alignment 'center 'top)
-                                  (when icon-id
-                                    (let ([m (make-object message% icon-id p)])
-                                      (send m horiz-margin 16)
-                                      (send m vert-margin 16)))
-                                  (let* ([rhs-pnl (make-object vertical-pane% p)]
-                                         [msg-pnl (make-object vertical-pane% rhs-pnl)]
-                                         [btn-pnl (make-object vertical-pane% rhs-pnl)])
-                                    (send msg-pnl vert-margin 16)
-                                    (when single?
-                                      (send msg-pnl horiz-margin 8))
-                                    (send btn-pnl vert-margin 8)
-                                    (send msg-pnl min-height 40)
-                                    (send msg-pnl min-width 300)
-                                    (send btn-pnl stretchable-height #f)
-                                    (values msg-pnl btn-pnl btn-pnl 96 'right 'left 'top)))]
-                      [else (let ([p (new horizontal-pane% [parent f] [alignment '(center top)])])
-                              (let ([icon-msg (and icon-id (make-object message% icon-id p))]
-                                    [msg-pnl (new vertical-pane% [parent p])])
-                                (values (if (= 1 (length strings))
-                                            (new horizontal-pane%
-                                                 [parent msg-pnl]
-                                                 [alignment '(center top)]
-                                                 [min-height (if icon-msg
-                                                                 (send icon-msg min-height)
-                                                                 1)])
-                                            msg-pnl)
-                                        f msg-pnl 0 'center 'center 'center)))])])
-        (if single?
-            (begin
-              (send msg-pnl set-alignment (if (= (length strings) 1) msg-h-align 'left) msg-v-align)
-              (for-each (lambda (s) (make-object message% (protect& s) msg-pnl)) strings)
-              (send f stretchable-width #f)
-              (send f stretchable-height #f))
-            ;; Try without scrollbar, then add one if necessary:
-            (let loop ([scroll? #f])
-              (let* ([e (make-object text%)]
-                     [c (make-object editor-canvas% msg-pnl e (if scroll?
-                                                                  '(no-hscroll)
-                                                                  '(no-hscroll no-vscroll transparent no-border)))])
-                (send c min-width 400)
-                (send c set-line-count 5)
-                (send c allow-tab-exit #t)
-                (send f reflow-container)
-                (send e auto-wrap #t)
-                (send e insert message)
-                (send e set-position 0)
-                (send e hide-caret #t)
-                (send e set-cursor (make-object wx:cursor% 'arrow) #t)
-                (send e lock #t)
-                (when (not scroll?)
-                  ;; Check whether it actually fits
-                  (let ([vh (box 0)]
-                        [eh (box 0)])
-                    (send e get-view-size #f vh)
-                    (send e get-extent #f eh)
-                    (unless ((unbox eh) . <= . (unbox vh))
-                      (send c show #f)
-                      (send msg-pnl delete-child c)
-                      (loop #t)))))))
-        (let ([check (and check?
-                          (let ([p (new vertical-pane% [parent cb-pnl]
-                                        [stretchable-height #f]
-                                        [alignment '(left center)])])
-                            (when (and single?
-                                       (eq? 'macosx (system-type)))
-                              ;; Match text-panel margin:
-                              (send p horiz-margin 8))
-                            (new check-box%
-                                 [label check-message]
-                                 [parent p]
-                                 [callback void]
-                                 [value (memq 'checked style)])))])
-          (let* ([p (make-object horizontal-pane% btn-pnl)]
-                 [mk-button (lambda (title v default?)
-                              (let ([b (make-object button% title p (lambda (b e) (set! result v) (send f show #f))
-                                                    (if default? '(border) null))])
-                                (when default? (send b focus))))])
-            (send p set-alignment btn-h-align 'center)
-            (send p stretchable-height #f)
-            (send p stretchable-width #t) ; to get panel's centering
-            (let ([mk-1 (lambda ()
-                          (when button1
-                            (mk-button button1 1 (memq 'default=1 style))))]
-                  [mk-2 (lambda ()
-                          (when button2
-                            (mk-button button2 2 (memq 'default=2 style))))]
-                  [mk-3 (lambda ()
-                          (when button3
-                            (mk-button button3 3 (memq 'default=3 style))))])
-              (cond
-               [(or (memq 'number-order style)
-                    (memq (system-type) '(windows)))
-                (mk-1)
-                (mk-2)
-                (mk-3)]
-               [else
-                (mk-3)
-                (make-object horizontal-pane% p)
-                (mk-2)
-                (mk-1)])))
-          (send f center)
-          (send f show #t)
-          (if two-results?
-              (values result (and check? (send check get-value)))
-              result))))))
-
-(define message-box/custom
-  (lambda (title message
-                 button1
-                 button2
-                 button3
-                 [parent #f]
-                 [style '(no-default)]
-                 [close-result #f]
-                 #:dialog-mixin [dialog-mixin values])
-    (do-message-box/custom 'message-box/custom
-                           title message button1 button2 button3
-                           parent style close-result
-                           #f #f #f dialog-mixin)))
-
-(define do-message-box
-  (lambda (who title message parent style check? check-message dialog-mixin)
-    (check-label-string who title)
-    (check-string/false who message)
-    (when check?
-      (check-label-string who check-message))
-    (check-top-level-parent/false who parent)
-    (check-style who
-                 '(ok ok-cancel yes-no)
-                 (let ([l '(caution stop no-icon)])
-                   (if check?
-                       (cons 'checked l)
-                       l))
-                 style)
-
-    (let-values ([(one two one-v two-v close-val default)
-                  (cond
-                   [(memq 'ok style)
-                    (values "OK" #f 'ok #f 1 'default=1)]
-                   [(memq 'ok-cancel style)
-                    (values "OK" "Cancel" 'ok 'cancel 2 'default=1)]
-                   [(memq 'yes-no style)
-                    (values "&Yes" "&No" 'yes 'no #f 'no-default)])])
-      (let-values ([(result checked?)
-                    (do-message-box/custom who
-                                           title message
-                                           one two #f
-                                           parent
-                                           (append
-                                            (cond
-                                             [(memq 'checked style) '(checked)]
-                                             [else null])
-                                            (cond
-                                             [(memq 'no-icon style) '(no-icon)]
-                                             [(memq 'stop style) '(stop)]
-                                             [(memq 'caution style) '(caution)]
-                                             [else null])
-                                            (if close-val
-                                                (list default)
-                                                (list default 'disallow-close)))
-                                           close-val
-                                           check? #t check-message
-                                           dialog-mixin)])
-        (let ([result (case result
-                        [(1) one-v]
-                        [(2) two-v])])
-          (if check?
-              (values result checked?)
-              result))))))
-
-(define message-box
-  (lambda (title message [parent #f] [style '(ok)] #:dialog-mixin [dialog-mixin values])
-    (do-message-box 'message-box title message parent style #f #f dialog-mixin)))
-
-(define message+check-box/custom
-  (lambda (title message
-                 checkbox-message
-                 button1
-                 button2
-                 button3
-                 [parent #f]
-                 [style '(no-default)]
-                 [close-result #f]
-                 #:dialog-mixin [dialog-mixin values])
-    (do-message-box/custom 'message+check-box/custom
-                           title message button1 button2 button3
-                           parent style close-result
-                           #t #t checkbox-message
-                           dialog-mixin)))
-
-(define message+check-box
-  (lambda (title message check-message [parent #f] [style '(ok)] #:dialog-mixin [dialog-mixin values])
-    (do-message-box 'message-box title message parent style #t check-message dialog-mixin)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/misc.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/misc.rkt
deleted file mode 100644
index dcd644ec17..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/misc.rkt
+++ /dev/null
@@ -1,154 +0,0 @@
-(module misc mzscheme
-  (require mzlib/class
-           mzlib/file
-           mzlib/process
-           (prefix wx: "kernel.rkt")
-           racket/snip/private/prefs)
-
-  (provide file-creator-and-type
-           hide-cursor-until-moved
-           sleep/yield
-           play-sound
-           timer%)
-
-  ;; Formerly used for PS print and preview:
-  #;
-  (wx:set-executer
-   (let ([orig-err (current-error-port)])
-     (lambda (prog . args)
-       (let ([cmd (string-append
-		   prog 
-		   (let loop ([args args])
-		     (if (null? args)
-			 ""
-			 (format " ~s~a" (car args) (loop (cdr args))))))])
-	 (let-values ([(in out pid err x) (apply values (process cmd))])
-	   (close-output-port out)
-	   (let ([echo (lambda (p)
-			 (thread (lambda ()
-				   (dynamic-wind
-				       void
-				       (lambda ()
-					 (let loop ()
-					   (let ([l (read-line p)])
-					     (unless (eof-object? l)
-					       (fprintf orig-err "~a\n" l)
-					       (loop)))))
-				       (lambda () (close-input-port p))))))])
-	     (echo in)
-	     (echo err)
-	     (void)))))))
-
-  (define (sleep/yield secs)
-    (unless (and (real? secs) (not (negative? secs)))
-      (raise-argument-error 'sleep/yield "(>=/c 0.0)" secs))
-    (let ([evt (alarm-evt (+ (current-inexact-milliseconds)
-                             (* secs 1000)))])
-      ;; First, allow at least some events to be handled even if 
-      ;; the alarm is immediately ready. This makes `sleep/yield'
-      ;; more like `sleep':
-      (wx:yield) 
-      ;; Now, really sleep:
-      (wx:yield evt))
-    (void))
-
-  (define file-creator-and-type
-    (case-lambda
-     [(fn) (wx:file-creator-and-type fn)]
-     [(fn c t) (wx:file-creator-and-type fn c t)]))
-
-  (define (hide-cursor-until-moved)
-    (wx:hide-cursor))
-
-  (define unix-play-command
-    (delay
-      (let* (;; check user-set preference first
-             ;;  (can be a string with `~a', or a name of an executable)
-             [cmd (get-preference* '|GRacket:playcmd| (lambda () #f))]
-             [cmd (cond [(not (string? cmd)) #f]
-                        [(regexp-match? #rx"~[aA]" cmd) cmd]
-                        [(find-executable-path cmd) => values]
-                        ;; maybe there are some redundant spaces?
-                        [(regexp-match #rx"^ *([^ ].*?) *$" cmd)
-                         => (lambda (m) (find-executable-path (cadr m)))]
-                        ;; bad setting: no ~a, and does not name an executable
-                        [else #f])]
-             ;; no setting => search for some known commands
-             [cmd (or cmd
-                      (ormap find-executable-path
-                             '("aplay" "play" "esdplay" "sndfile-play"
-                               "audioplay"))
-                      (error 'play-sound
-                             "not supported on this machine ~a"
-                             "(no default, and no known command found)"))]
-             [>null (open-output-file "/dev/null" 'append)]
-             [<null (open-input-file "/dev/null")]
-             [bufsize 500]) ; maximum number of chars from stderr that we show
-        (lambda (f async?)
-          (define file (path->string (expand-path f)))
-          ;; if find-executable-path was used, then cmd is a path, otherwise
-          ;; it's a string with `~a'.
-          (define cmd+args
-            (if (path? cmd)
-              (list cmd file)
-              (list "/bin/sh" "-c"
-                    (format cmd (string-append "\""
-                                               (regexp-replace*
-                                                #rx"([$\"\\])" file "\\\\\\1")
-                                               "\"")))))
-          (define-values (p pout pin perr)
-            (apply subprocess >null <null #f cmd+args))
-          (define buf (make-bytes bufsize))
-          (define (follow)
-            ;; buf holds the tail (`bufsize' chars) of the error output
-            (let loop ([i 0] [full? #f])
-              (let ([n (read-bytes! buf perr i)])
-                (cond
-                  [(eof-object? n)
-                   (let ([c (begin (subprocess-wait p) (subprocess-status p))])
-                     (if (zero? c)
-                       #t ; success => don't show error output
-                       (let ([err (current-error-port)])
-                         (cond [full?
-                                (display "...snip...\n")
-                                (write-bytes buf err i)
-                                (write-bytes buf err 0 i)]
-                               [(> i 0)
-                                (write-bytes buf err 0 i)])
-                         (unless async? ; no point in an async error
-                           (error 'play-sound
-                                  "running ~a returned an error code"
-                                  cmd+args)))))]
-                  [(= (+ n i) bufsize) (loop 0 #t)]
-                  [else (loop (+ n i) full?)]))))
-          (if async?
-            (begin (thread follow) #t)
-            (follow))))))
-
-  (define (play-sound f async?)
-    (unless (path-string? f)
-      (raise-argument-error 'play-sound "path-string?" f))
-    (unless (file-exists? f)
-      (error 'play-sound "file not found: ~e" f))
-    ((if (eq? (system-type) 'unix) (force unix-play-command) wx:play-sound)
-     f async?))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; Timers:
-
-  (define timer%
-    (class wx:timer%
-      (init [notify-callback void]
-	    [interval #f]
-	    [just-once? #f])
-      
-      (inherit start)
-      
-      (define -notify-callback notify-callback)
-      
-      (define/override (notify) (-notify-callback))
-      
-      (super-make-object)
-
-      (when interval
-	(start interval just-once?)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/moredialogs.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/moredialogs.rkt
deleted file mode 100644
index 5a1a0ab040..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/moredialogs.rkt
+++ /dev/null
@@ -1,396 +0,0 @@
-#lang racket/base
-  (require racket/class
-           (prefix-in wx: "kernel.rkt")
-	   (prefix-in wx: racket/snip/private/style)
-           "lock.rkt"
-           "const.rkt"
-           "check.rkt"
-           "wx.rkt"
-           "helper.rkt"
-           "mrtop.rkt"
-           "mrcanvas.rkt"
-           "mritem.rkt"
-           "mrpanel.rkt"
-           "mrtextfield.rkt")
-
-  (provide get-ps-setup-from-user
-           get-page-setup-from-user
-           can-get-page-setup-from-user?
-           get-text-from-user
-           get-choices-from-user
-           get-color-from-user)
-
-  (define (number->string* n)
-    (let ([s (number->string n)])
-      (regexp-replace #rx"[.]([0-9][0-9][0-9])[0-9]*$"
-		      s
-		      ".\\1")))
-
-  (define get-ps-setup-from-user
-    (case-lambda
-     [() (get-ps-setup-from-user #f #f #f null)]
-     [(message) (get-ps-setup-from-user message #f #f null)]
-     [(message parent) (get-ps-setup-from-user message parent #f null)]
-     [(message parent pss) (get-ps-setup-from-user message parent pss null)]
-     [(message parent pss-in style)
-      (define _
-	(begin
-	  ;; Calls from C++ have wrong kind of window:
-	  (when (is-a? parent wx:window%)
-	    (set! parent (as-entry (lambda () (wx->mred parent)))))
-
-	  (check-label-string/false 'get-ps-setup-from-user message)
-	  (check-top-level-parent/false 'get-ps-setup-from-user parent)
-	  (check-instance 'get-ps-setup-from-user wx:ps-setup% 'ps-setup% #t pss-in)
-	  (check-style 'get-ps-setup-from-user #f null style)))
-      
-      (define bad-fields null)
-      (define number-callback
-	(lambda (f ev)
-	  (let ([e (send f get-editor)]
-		[ok? (real? (string->number (send f get-value)))])
-	    (send e change-style 
-		  (send (make-object wx:style-delta%) 
-			set-delta-background 
-			(if ok? "white" "yellow"))
-		  0 (send e last-position))
-	    (set! bad-fields (remq f bad-fields))
-	    (unless ok?
-	      (set! bad-fields (cons f bad-fields)))
-	    (send ok enable (null? bad-fields)))))
-
-      (define pss (or pss-in (wx:current-ps-setup)))
-      (define f (make-object dialog% "PostScript Setup" parent))
-      (define papers 
-	'("A4 210 x 297 mm" "A3 297 x 420 mm" "Letter 8 1/2 x 11 in" "Legal 8 1/2 x 14 in"))
-      (define p (make-object horizontal-pane% f))
-      (define paper (make-object choice% #f papers p void))
-      (define _0 (make-object vertical-pane% p))
-      (define-values (ok cancel)
-        (ok-cancel
-         (lambda () (make-object button% "OK" p (lambda (b e) (done #t)) '(border)))
-         (lambda () (make-object button% "Cancel" p (lambda (b e) (done #f))))))
-      (define unix? (eq? (system-type) 'unix))
-      (define dp (make-object horizontal-pane% f))
-      (define orientation (make-object radio-box% "Orientation:" '("Portrait" "Landscape") dp void))
-      (define destination (and unix? (make-object radio-box% "Destination:" 
-						  '("Printer" "Preview" "File") dp void)))
-      (define ssp (make-object horizontal-pane% f))
-      (define sp (make-object vertical-pane% ssp))
-      (define def-scale "0100.000")
-      (define def-offset "0000.000")
-      (define def-margin "0016.000")
-      (define xscale (make-object text-field% "Horizontal Scale:" sp number-callback def-scale))
-      (define xoffset (make-object text-field% "Horizontal Translation:" sp number-callback def-offset))
-      (define xmargin (make-object text-field% "Horizontal Margin:" sp number-callback def-margin))
-      (define sp2 (make-object vertical-pane% ssp))
-      (define yscale (make-object text-field% "Vertical Scale:" sp2 number-callback def-scale))
-      (define yoffset (make-object text-field% "Vertical Translation:" sp2 number-callback def-offset))
-      (define ymargin (make-object text-field% "Vertical Margin:" sp2 number-callback def-margin))
-
-      (define l2 (make-object check-box% "PostScript Level 2" f void))
-
-      (define cp (and unix? (make-object horizontal-pane% f)))
-      (define command (and unix? (make-object text-field% "Print Command:" cp void)))
-      (define vcommand (and unix? (make-object text-field% "Preview Command:" f void)))
-
-      (define ok? #f)
-      (define (done ?)
-	(send f show #f)
-	(set! ok? ?))
-
-      (define-values (xsb ysb xtb ytb xmb ymb) 
-	(values (box 0) (box 0) (box 0) (box 0) (box 0) (box 0)))
-
-      (send paper set-selection (or (find-pos papers (send pss get-paper-name) equal?) 0))
-      (send orientation set-selection (if (eq? (send pss get-orientation) 'landscape) 1 0))
-      (when unix?
-	(send destination set-selection (case (send pss get-mode)
-					  [(printer) 0] [(preview) 1] [(file) 2]))
-	(send command set-value (send pss get-command))
-	(send vcommand set-value (send pss get-preview-command)))
-
-      (send sp set-alignment 'right 'top)
-      (send sp2 set-alignment 'right 'top)
-      (send pss get-scaling xsb ysb)
-      (send xscale set-value (number->string* (unbox xsb)))
-      (send yscale set-value (number->string* (unbox ysb)))
-      (send pss get-translation xtb ytb)
-      (send xoffset set-value (number->string* (unbox xtb)))
-      (send yoffset set-value (number->string* (unbox ytb)))
-      (send pss get-margin xmb ymb)
-      (send xmargin set-value (number->string* (unbox xmb)))
-      (send ymargin set-value (number->string* (unbox ymb)))
-      (send xscale stretchable-width #f)
-      (send yscale stretchable-width #f)
-      (send xoffset stretchable-width #f)
-      (send yoffset stretchable-width #f)
-      (send xmargin stretchable-width #f)
-      (send ymargin stretchable-width #f)
-
-      (send l2 set-value (send pss get-level-2))
-
-      (send f set-alignment 'center 'top)
-
-      (map no-stretch (list f xscale yscale xoffset yoffset xmargin ymargin dp))
-
-      (send f center)
-
-      (send f show #t)
-
-      (if ok?
-	  (let ([s (make-object wx:ps-setup%)]
-		[gv (lambda (c b)
-		      (or (string->number (send c get-value)) (unbox b)))])
-	    (send s set-paper-name (send paper get-string-selection))
-	    (send s set-orientation (if (positive? (send orientation get-selection))
-					'landscape
-					'portrait))
-	    (when unix?
-	      (send s set-mode (case (send destination get-selection)
-				 [(0) 'printer]
-				 [(1) 'preview]
-				 [(2) 'file])))
-	    (send s set-scaling (gv xscale xsb) (gv yscale ysb))
-	    (send s set-translation (gv xoffset xtb) (gv yoffset ytb))
-	    (send s set-margin (gv xmargin xmb) (gv ymargin ymb))
-	    (send s set-level-2 (send l2 get-value))
-	    
-	    (when (eq? (system-type) 'unix)
-	      (send s set-command (send command get-value))
-	      (send s set-preview-command (send vcommand get-value)))
-
-	    s)
-	  #f)]))
-
-  (define get-page-setup-from-user
-    (case-lambda
-     [() (get-page-setup-from-user #f #f #f null)]
-     [(message) (get-page-setup-from-user message #f #f null)]
-     [(message parent) (get-page-setup-from-user message parent #f null)]
-     [(message parent pss) (get-page-setup-from-user message parent pss null)]
-     [(message parent pss-in style)
-      (check-label-string/false 'get-page-setup-from-user message)
-      (check-top-level-parent/false 'get-page-setup-from-user parent)
-      (check-instance 'get-page-setup-from-user wx:ps-setup% 'ps-setup% #t pss-in)
-      (check-style 'get-page-setup-from-user #f null style)
-
-      (and (wx:can-show-print-setup?)
-	   (let ([s (make-object wx:ps-setup%)])
-	     (send s copy-from (or pss-in (wx:current-ps-setup)))
-	     (and (parameterize ([wx:current-ps-setup s])
-		    (wx:show-print-setup (and parent (mred->wx parent))))
-		  s)))]))
-
-  (define (can-get-page-setup-from-user?)
-    (wx:can-show-print-setup?))
-
-  (define (get-text-from-user title message
-                              [parent #f]
-                              [init-val ""]
-                              [style null]
-                              #:dialog-mixin [dialog-mixin values]
-                              #:validate [validate (λ (x) #t)])
-    (check-label-string 'get-text-from-user title)
-    (check-label-string/false 'get-text-from-user message)
-    (check-top-level-parent/false 'get-text-from-user parent)
-    (check-string 'get-text-from-user init-val)
-    (check-style 'get-text-from-user #f '(password disallow-invalid) style)
-    (define f (make-object (dialog-mixin dialog%) title parent box-width))
-    (define ok? #f)
-    (define (done ?) (set! ok? ?) (send f show #f))
-    (define t (new text-field% 
-                   [label message]
-                   [parent f]
-                   [callback (λ (t e) 
-                               (cond
-                                 [(eq? (send e get-event-type) 'text-field-enter)
-                                  (done #t)]
-                                 [else (do-validation)]))]
-                   [init-value init-val]
-                   [style (list* 'single 'vertical-label
-                                 (if (memq 'password style)
-                                     '(password)
-                                     '()))]))
-    (define default-background (send t get-field-background))
-    (define (do-validation)
-      (define valid? (validate (send t get-value)))
-      (send t set-field-background 
-            (if valid?
-                default-background
-                (send wx:the-color-database find-color "pink")))
-      (when (memq 'disallow-invalid style)
-        (send ok-button enable valid?)))
-    (define p (make-object horizontal-pane% f))
-    (send p set-alignment 'right 'center)
-    (send f stretchable-height #f)
-    (define-values (ok-button cancel-button)
-      (ok-cancel
-       (lambda () (make-object button% "OK" p (λ (b e) (done #t)) '(border)))
-       (lambda () (make-object button% "Cancel" p (λ (b e) (done #f))))))
-    (send (send t get-editor) select-all)
-    (send t focus)
-    (send f center)
-    (do-validation)
-    (send f show #t)
-    (and ok? (send t get-value)))
-
-  (define get-choices-from-user
-    (case-lambda
-     [(title message choices) (get-choices-from-user title message choices #f null '(single))]
-     [(title message choices parent) (get-choices-from-user title message choices parent null '(single))]
-     [(title message choices parent init-vals) (get-choices-from-user title message choices parent init-vals '(single))]
-     [(title message choices parent init-vals style)
-      (check-label-string 'get-choices-from-user title)
-      (check-label-string/false 'get-choices-from-user message)
-      (unless (and (list? choices) (andmap label-string? choices))
-	(raise-argument-error 'get-choices-from-user "(listof label-string?)" choices))
-      (check-top-level-parent/false 'get-choices-from-user parent)
-      (unless (and (list? init-vals) (andmap exact-nonnegative-integer? init-vals))
-	(raise-argument-error 'get-choices-from-user "(listof exact-nonnegative-integer?)" init-vals))
-      (check-style 'get-choices-from-user '(single multiple extended) null style)
-      (when (and (memq 'single style) (> (length init-vals) 1))
-	(raise-arguments-error 'get-choices-from-user 
-                               "multiple initial-selection indices provided with 'single style"
-                               "indices" init-vals))
-      (let* ([f (make-object dialog% title parent box-width (min 300 (max 150 (* 14 (length choices)))))]
-	     [ok-button #f]
-	     [update-ok (lambda (l) (send ok-button enable (not (null? (send l get-selections)))))]
-	     [ok? #f]
-	     [done (lambda (?) (lambda (b e) (set! ok? ?) (send f show #f)))])
-	(let ([l (make-object list-box% message choices f
-			      (lambda (l e)
-				(update-ok l)
-				(when (eq? (send e get-event-type) 'list-box-dclick)
-				  ((done #t) #f #f)))
-			      (cons 'vertical-label style))]
-	      [p (make-object horizontal-pane% f)])
-	  (for-each (lambda (i) 
-		      (when (>= i (send l get-number))
-			(raise-arguments-error 
-                         'get-choices-from-user 
-                         "out of range;\n inital-selection list specifies an out-of-range index"
-                         "index" i
-                         "provided choices" (send l get-number)
-                         "list..." init-vals))
-		      (send l select i #t)) init-vals)
-	  (send p set-alignment 'right 'center)
-	  (send p stretchable-height #f)
-          (ok-cancel (lambda ()
-                       (set! ok-button (make-object button% "OK" p (done #t) '(border))))
-                     (lambda ()
-                       (make-object button% "Cancel" p (done #f))))
-	  (update-ok l)
-	  (send f center)
-	  (when (and (pair? init-vals)
-		     ((car init-vals) . > . 1))
-	    ;; Make sure initial selection is visible:
-	    (send f reflow-container)
-	    (send l set-first-visible-item (sub1 (car init-vals))))
-	  (send f show #t)
-	  (and ok? (send l get-selections))))]))
-
-  (define get-color-from-user 
-    (case-lambda
-      [() (get-color-from-user #f #f #f null)]
-      [(message) (get-color-from-user message #f #f null)]
-      [(message parent) (get-color-from-user message parent #f null)]
-      [(message parent color) (get-color-from-user message parent color null)]
-      [(message parent in-color style)
-       (check-label-string/false 'get-color-from-user message)
-       (check-top-level-parent/false 'get-color-from-user parent)
-       (check-instance 'get-color-from-user wx:color% 'color% #t in-color)
-       (check-style 'get-color-from-user #f '(alpha) style)
-       (cond
-         [(eq? (wx:color-from-user-platform-mode) 'dialog)
-          (wx:get-color-from-user message (and parent (mred->wx parent)) in-color)]
-         [else
-          (define color (if (member 'alpha style)
-                            in-color
-                            (make-object wx:color%
-                              (send in-color red)
-                              (send in-color green)
-                              (send in-color blue)
-                              1.0)))
-          (define ok? #f)
-          (define f (make-object dialog% "Choose Color" parent))
-          (define (done ok) (lambda (b e) (set! ok? ok) (send f show #f)))
-          (define canvas (make-object (class canvas%
-                                        (define/override (on-paint)
-                                          (repaint void))
-                                        (super-new [parent f]))))
-          (define platform-p (and (string? (wx:color-from-user-platform-mode))
-                                  (new horizontal-panel%
-                                       [parent f]
-                                       [alignment '(right center)])))
-          (define p (make-object vertical-pane% f))
-          (define (repaint ext)
-            (let ([c (get-current-color)])
-              (ext c)
-              (wx:fill-private-color (send canvas get-dc) c)))
-          (define (update-and-repaint s e)
-            (repaint
-             (lambda (c)
-               (when platform-p
-                 (wx:get-color-from-user c)))))
-          (define (make-color-slider l) (make-object slider% l 0 255 p update-and-repaint))
-          (define red (make-color-slider "Red:"))
-          (define green (make-color-slider "Green:"))
-          (define blue (make-color-slider "Blue:"))
-          (define alpha (and (member 'alpha style)
-                             (new text-field% 
-                                  [parent p]
-                                  [label "Alpha:"]
-                                  [callback
-                                   (λ (_1 _2) 
-                                     (update-ok-button-and-background))])))
-          (define (update-ok-button-and-background)
-            (when alpha
-              (define n (string->number (send alpha get-value)))
-              (define ok? (and n (real? n) (<= 0 n 1)))
-              (send ok-button enable ok?)
-              (send alpha set-field-background
-                    (send wx:the-color-database find-color
-                          (if ok? "white" "pink")))))
-          (define bp (make-object horizontal-pane% f))
-          (define (get-current-color)
-            (make-object wx:color% 
-              (send red get-value)
-              (send green get-value)
-              (send blue get-value)
-              (if alpha
-                  (string->number (send alpha get-value))
-                  1.0)))
-          (define (install-color color)
-            (send red set-value (send color red))
-            (send green set-value (send color green))
-            (send blue set-value (send color blue))
-            (when alpha (send alpha set-value (format "~a" (send color alpha))))
-            (send canvas refresh))
-          (when platform-p
-            (new button%
-                 [parent platform-p]
-                 [label (wx:color-from-user-platform-mode)]
-                 [callback (lambda (b e) (wx:get-color-from-user 'show))])
-            (wx:get-color-from-user (or color
-                                        (make-object wx:color% 0 0 0)))
-            (send (mred->wx f) set-color-callback (lambda ()
-                                                    (install-color
-                                                     (wx:get-color-from-user 'get)))))
-          (when color (install-color color))
-          (define-values (ok-button cancel-button)
-            (ok-cancel
-             (lambda ()
-               (make-object button% "OK" bp (done #t) '(border)))
-             (lambda ()
-               (make-object button% "Cancel" bp (done #f)))))
-          (send ok-button focus)
-          (update-ok-button-and-background)
-          (send bp set-alignment 'right 'center)
-          (send p set-alignment 'right 'center)
-          (send p stretchable-height #f)
-          (send canvas min-height 50)
-          (send f center)
-          (send f show #t)
-          (and ok?
-               (get-current-color))])]))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/mrcanvas.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/mrcanvas.rkt
deleted file mode 100644
index 29a0d20228..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/mrcanvas.rkt
+++ /dev/null
@@ -1,458 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/list
-         (prefix-in wx: "kernel.rkt")
-         "lock.rkt"
-         "const.rkt"
-         "helper.rkt"
-         "check.rkt"
-         "wx.rkt"
-         "wxcanvas.rkt"
-         "mrwindow.rkt"
-         "mrcontainer.rkt"
-         "mrtop.rkt")
-
-(provide canvas<%>
-         canvas%
-         editor-canvas%)
-
-(define canvas-default-size 20) ; a default size for canvases tht fits borders without losing client sizes
-(define canvas-scroll-size 10)
-(define canvas-control-border-extra
-  (case (system-type)
-    [(windows) 2]
-    [else 0]))
-
-(define canvas<%>
-  (interface (subwindow<%>)
-    min-client-width min-client-height
-    on-char on-event on-paint on-tab-in
-    get-dc
-    set-canvas-background get-canvas-background
-    set-resize-corner))
-
-(define basic-canvas%
-  (class* (make-subwindow% (make-window% #f (make-subarea% area%))) (canvas<%>)
-    (init mk-wx mismatches parent)
-    (define/public (on-char e) (send wx do-on-char e))
-    (define/public (on-event e) (send wx do-on-event e))
-    (define/public (on-paint) (when wx (send wx do-on-paint)))
-    (define/public (on-tab-in) (void))
-      
-    (define min-client-width (param (lambda () wx) min-client-width))
-    (define min-client-height (param (lambda () wx) min-client-height))
-    (public min-client-width min-client-height)
-
-    (define get-dc (entry-point (lambda () (send wx get-dc))))
-    (public get-dc)
-    (define/public (make-bitmap w h)
-      (unless (exact-positive-integer? w)
-        (raise-argument-error (who->name '(method canvas% make-bitmap))
-                              "exact-positive-integer?"
-                              w))
-      (unless (exact-positive-integer? h)
-        (raise-argument-error (who->name '(method canvas% make-bitmap))
-                              "exact-positive-integer?"
-                              h))
-      (send wx make-compatible-bitmap w h))
-
-    (define/public (suspend-flush)
-      (send wx begin-refresh-sequence))
-    (define/public (resume-flush)
-      (send wx end-refresh-sequence))
-    (define/public (flush) (send wx flush))
-
-    (define set-canvas-background
-      (entry-point
-       (lambda (c)
-         (unless (c . is-a? . wx:color%)
-           (raise-argument-error (who->name '(method canvas<%> set-canvas-background))
-                                 "(is-a?/c color%)"
-                                 c))
-         (unless (send wx get-canvas-background)
-           (raise-arguments-error (who->name '(method canvas<%> set-canvas-background))
-                                  "cannot set a transparent canvas's background color"
-                                  "given color" c))
-         (send wx set-canvas-background c))))
-    (public set-canvas-background)
-    (define get-canvas-background
-      (entry-point
-       (lambda ()
-         (send wx get-canvas-background))))
-    (public get-canvas-background)
-
-    (define/public (set-resize-corner on?)
-      (send wx set-resize-corner on?))
-    (define wx #f)
-    (as-entry
-     (lambda ()
-       (super-make-object (lambda () (set! wx (mk-wx)) wx) (lambda () wx) (lambda () wx) mismatches #f parent #f)))))
-
-(define default-paint-cb (lambda (canvas dc) (void)))
-
-(define canvas%
-  (class basic-canvas%
-    (init parent [style null] [paint-callback default-paint-cb] [label #f] [gl-config #f]
-          ;; inherited inits
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (define paint-cb paint-callback)
-    (define has-x? (and (list? style) (memq 'hscroll style)))
-    (define has-y? (and (list? style) (memq 'vscroll style)))
-    (inherit get-client-size get-dc set-label 
-             suspend-flush resume-flush flush
-             get-canvas-background)
-    (let ([cwho '(constructor canvas)])
-      (check-container-parent cwho parent)
-      (check-style cwho #f '(border hscroll vscroll gl deleted control-border combo no-autoclear 
-                                    transparent resize-corner no-focus)
-                   style)
-      (check-callback cwho paint-callback)
-      (check-label-string/false cwho label))
-    (define/public (on-scroll e) (send wx do-on-scroll e))
-    (define/public (swap-gl-buffers)
-      (let ([ctx (send (send wx get-dc) get-gl-context)])
-        (when ctx
-          (send ctx swap-buffers))))
-    (define/public (with-gl-context
-                    thunk
-                    #:fail [fail (lambda () 
-                                   (error (who->name '(method canvas% with-gl-context))
-                                          "no gl context available"))])
-      (let ([ctx (send (send wx get-dc) get-gl-context)])
-        (if ctx
-            (send ctx call-as-current thunk)
-            (fail))))
-    (define accept-tab-focus
-      (entry-point
-       (case-lambda
-         [() (send wx get-tab-focus)]
-         [(on?) (send wx set-tab-focus (and on? #t))])))
-    (public accept-tab-focus)
-    (define get-virtual-size
-      (entry-point
-       (lambda () (double-boxed
-                   0 0
-                   (lambda (x y) (send wx get-virtual-size x y))))))
-    (public get-virtual-size)
-    (define get-view-start
-      (entry-point
-       (lambda () (double-boxed
-                   0 0
-                   (lambda (x y) (send wx view-start x y))))))
-    (public get-view-start)
-
-    (define scroll
-      (entry-point (lambda (x y) 
-                     (when x (check-fraction '(method canvas% scroll) x))
-                     (when y (check-fraction '(method canvas% scroll) y))
-                     (send wx scroll (or x -1) (or y -1)))))
-    (public scroll)
-
-    (define/public (init-auto-scrollbars w h x y)
-      (when w (check-gauge-integer '(method canvas% init-auto-scrollbars) w))
-      (when h (check-gauge-integer '(method canvas% init-auto-scrollbars) h))
-      (check-fraction '(method canvas% init-auto-scrollbars) x)
-      (check-fraction '(method canvas% init-auto-scrollbars) y)
-      (let-values ([(cw ch) (get-client-size)])
-        (send wx set-scrollbars (if w 1 0) (if h 1 0)
-              (or w 0) (or h 0) 1 1
-              (if w (inexact->exact (floor (* x (max 0 (- w cw))))) 0)
-              (if h (inexact->exact (floor (* y (max 0 (- h ch))))) 0)
-              #t)))
-      
-    (define/public (init-manual-scrollbars x-len y-len x-page y-page x-val y-val)
-      (let ([who '(method canvas% init-auto-scrollbars)])
-        (when x-len (check-gauge-integer who x-len))
-        (when y-len (check-gauge-integer who y-len))
-        (check-gauge-integer who x-page)
-        (check-gauge-integer who y-page)
-        (check-gauge-integer who x-val)
-        (check-gauge-integer who y-val)
-        (when (and x-len (< x-len x-val))
-          (raise-arguments-error (who->name who)
-                                 "horizontal value is larger than the horizontal range"
-                                 "value" x-val
-                                 "range" x-len))
-        (when (and y-len (< y-len y-val))
-          (raise-arguments-error (who->name who)
-                                 "vertical value is larger than the vertical range"
-                                 "value" y-val
-                                 "range" y-len)))
-      (send wx set-scrollbars (if x-len 1 0) (if y-len 1 0)
-            (or x-len 0) (or y-len 0) x-page y-page x-val y-val #f))
-
-    (define/public (show-scrollbars x-on? y-on?)
-      (let ([bad (lambda (which what)
-                   (raise-arguments-error 
-                    (who->name '(method canvas% show-scrollbars))
-                    (format
-                     "cannot show ~a scrollbars;\n the canvas style did not include ~a"
-                     which
-                     what)
-                    "canvas" this))])
-        (when x-on? (unless has-x? (bad "horizontal" 'hscroll)))
-        (when y-on? (unless has-y? (bad "vertical" 'vscroll)))
-        (send wx show-scrollbars x-on? y-on?)))
-
-    (define/private (check-scroll name d v must-positive?)
-      (unless (or (eq? d 'horizontal) (eq? d 'vertical))
-        (raise-argument-error (who->name `(method canvas% ,name)) "(or/c 'horizontal 'vertical)" d))
-      (let ([bottom (if must-positive? 1 0)])
-        (unless (<= bottom v GAUGE-MAX)
-          ((check-bounded-integer bottom GAUGE-MAX #f) `(method canvas% ,name) v))))
-
-    (define get-scroll-pos (entry-point (lambda (d) (check-scroll 'get-scroll-pos d 1 #f) (send wx get-scroll-pos d))))
-    (define set-scroll-pos (entry-point (lambda (d v) (check-scroll 'set-scroll-pos d v #f) (send wx set-scroll-pos d v))))
-    (define get-scroll-range (entry-point (lambda (d) (check-scroll 'get-scroll-range d 1 #f) (send wx get-scroll-range d))))
-    (define set-scroll-range (entry-point (lambda (d v) (check-scroll 'set-scroll-range d v #f) (send wx set-scroll-range d v))))
-    (define get-scroll-page (entry-point (lambda (d) (check-scroll 'get-scroll-page d 1 #t) (send wx get-scroll-page d))))
-    (define set-scroll-page (entry-point (lambda (d v) (check-scroll 'set-scroll-page d v #t) (send wx set-scroll-page d v))))
-    (public get-scroll-pos set-scroll-pos
-            get-scroll-range set-scroll-range
-            get-scroll-page set-scroll-page)
-    (define/override (on-paint)
-      (if (eq? paint-cb default-paint-cb)
-          (super on-paint)
-          (paint-cb this (get-dc))))
-    (define no-clear? (memq 'no-autoclear style))
-    (define/public (refresh-now [do-paint (lambda (dc) (on-paint))]
-                                #:flush? [flush? #t])
-      (let ([dc (get-dc)])
-        (dynamic-wind
-          (lambda ()
-            (suspend-flush))
-          (lambda ()
-            (unless no-clear?
-              (let ([bg (get-canvas-background)])
-                (if bg
-                    (let ([old-bg (send dc get-background)])
-                      (as-entry
-                       (lambda ()
-                         (send dc set-background bg)
-                         (send dc clear)
-                         (send dc set-background old-bg))))
-                    (send dc erase))))
-            (do-paint dc))
-          (lambda ()
-            (resume-flush)))
-        (when flush? (flush))))
-    (define wx #f)
-    (super-new
-     [mk-wx
-      (lambda ()
-        (let ([ds (+ (cond
-                      [(memq 'control-border style) (+ 4 canvas-control-border-extra)]
-                      [(memq 'border style) 4]
-                      [else 0])
-                     (if (or has-x? has-y?)
-                         canvas-default-size
-                         1))])
-          (set! wx (make-object wx-canvas% this this
-                                (mred->wx-container parent)
-                                -1 -1
-                                (+ ds (if (memq 'combo style) side-combo-width 0)) ds
-                                style
-                                gl-config)))
-        wx)]
-     [mismatches
-      (lambda ()
-        (let ([cwho '(constructor canvas)])
-          (check-container-ready cwho parent)))]
-     [parent parent]
-     [enabled enabled]
-     [horiz-margin horiz-margin]
-     [vert-margin vert-margin]
-     [min-width min-width]
-     [min-height min-height]
-     [stretchable-width stretchable-width]
-     [stretchable-height stretchable-height])
-    (when label
-      (set-label label))
-    (send parent after-new-child this)))
-
-(define editor-canvas%
-  (class basic-canvas%
-    (init parent [editor #f] [style null] [scrolls-per-page 100] [label #f]
-          [wheel-step no-val] [line-count no-val]
-          [horizontal-inset 5] [vertical-inset 5]
-          ;; inherited inits
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (let ([cwho '(constructor editor-canvas)])
-      (check-container-parent cwho parent)
-      (check-instance cwho internal-editor<%> "text% or pasteboard%" #t editor)
-      (check-style cwho #f '(hide-vscroll hide-hscroll no-vscroll no-hscroll auto-vscroll auto-hscroll
-                                          deleted control-border combo transparent no-border resize-corner
-                                          no-focus)
-                   style)
-      (check-gauge-integer cwho scrolls-per-page)
-      (check-label-string/false cwho label)
-      (unless (eq? wheel-step no-val)
-        (check-wheel-step cwho wheel-step))
-      (unless (or (not line-count) (eq? line-count no-val))
-        ((check-bounded-integer 1 1000 #t) cwho line-count))
-      (unless (eq? horizontal-inset 5)
-        (check-margin-integer cwho horizontal-inset))
-      (unless (eq? vertical-inset 5)
-        (check-margin-integer cwho vertical-inset)))
-    (inherit set-label)
-    (define force-focus? #f)
-    (define scroll-to-last? #f)
-    (define scroll-bottom? #f)
-    (define/public (call-as-primary-owner f) (send wx call-as-primary-owner f))
-    (define allow-scroll-to-last
-      (entry-point 
-       (case-lambda
-         [() scroll-to-last?]
-         [(on?) (set! scroll-to-last? (and on? #t))
-          (send wx allow-scroll-to-last on?)])))
-    (public allow-scroll-to-last)
-    (define scroll-with-bottom-base
-      (entry-point
-       (case-lambda
-         [() scroll-bottom?]
-         [(on?) (set! scroll-bottom? (and on? #t))
-          (send wx scroll-with-bottom-base on?)])))
-    (public scroll-with-bottom-base)
-    (define lazy-refresh
-      (entry-point
-       (case-lambda
-         [() (send wx get-lazy-refresh)]
-         [(on?) (send wx set-lazy-refresh on?)])))
-    (public lazy-refresh)
-    (define force-display-focus
-      (entry-point
-       (case-lambda
-         [() force-focus?]
-         [(on?) (set! force-focus? (and on? #t))
-          (send wx force-display-focus on?)])))
-    (public force-display-focus)
-  
-    (define accept-tab-focus
-      (entry-point
-       (case-lambda
-         [() (send wx get-tab-focus)]
-         [(on?) (send wx set-tab-focus (and on? #t))])))
-    (public accept-tab-focus)
-    (define allow-tab-exit
-      (entry-point
-       (case-lambda
-         [() (send wx is-tabable?)]
-         [(on?) (send wx set-tabable (and on? #t))])))
-    (public allow-tab-exit)
-  
-    (define set-line-count
-      (entry-point
-       (lambda (n)
-         ((check-bounded-integer 1 1000 #t) '(method editor-canvas% set-line-count) n)
-         (send wx set-line-count n))))
-    (public set-line-count)
-    (define get-line-count
-      (entry-point
-       (lambda ()
-         (send wx get-line-count))))
-    (public get-line-count)
-  
-    (define scroll-to
-      (case-lambda 
-        [(x y w h refresh?) (send wx scroll-to x y w h refresh?)]
-        [(x y w h refresh? bias) (send wx scroll-to x y w h refresh? bias)]))
-    (public scroll-to)
-  
-    (define get-editor (entry-point (lambda () (send wx get-editor))))
-    (define set-editor (entry-point 
-                        (case-lambda 
-                          [(m) (send wx set-editor m)]
-                          [(m upd?) (send wx set-editor m upd?)])))
-    (public get-editor set-editor)
-    (define ws
-      (case-lambda 
-        [() (let ([v (send wx get-wheel-step)])
-              (if (zero? v) #f v))]
-        [(wheel-step)
-         (check-wheel-step '(method editor-canvas% wheel-step) wheel-step)
-         (send wx set-wheel-step (or wheel-step 0))]))
-    (public [ws wheel-step])
-    (define vi
-      (entry-point
-       (case-lambda
-         [() (send wx get-y-margin)]
-         [(m) 
-          (check-margin-integer '(method editor-canvas% vertical-inset) m)
-          (as-exit (lambda () (send wx set-y-margin m)))])))
-    (public [vi vertical-inset])
-    (define hi
-      (entry-point
-       (case-lambda
-         [() (send wx get-x-margin)]
-         [(m) 
-          (check-margin-integer '(method editor-canvas% horizontal-inset) m)
-          (as-exit (lambda () (send wx set-x-margin m)))])))
-    (public [hi horizontal-inset]) 
-    (define wx #f)
-    (super-new
-     [mk-wx
-      (lambda ()
-        (let* ([no-h? (or (memq 'no-vscroll style)
-                          (memq 'hide-vscroll style))]
-               [no-v? (or (memq 'no-hscroll style)
-                          (memq 'hide-hscroll style))]
-               [get-ds (lambda (no-this? no-other?)
-                         (+ (if (memq 'control-border style)
-                                canvas-control-border-extra
-                                0)
-                            (cond
-                             [(and no-this? no-other?) 14]
-                             [no-this? canvas-default-size]
-                             [else (+ canvas-scroll-size canvas-default-size)])))])
-          (set! wx (make-object wx-editor-canvas% this this
-                                (mred->wx-container parent) -1 -1
-                                (+ (get-ds no-h? no-v?) (if (memq 'combo style) side-combo-width 0))
-                                (get-ds no-v? no-h?)
-                                #f
-                                (append
-                                 (if (memq 'no-border style)
-                                     null
-                                     '(border))
-                                 (remq 'no-border style))
-                                scrolls-per-page #f))
-          wx))]
-     [mismatches
-      (lambda ()
-        (let ([cwho '(constructor editor-canvas)])
-          (check-container-ready cwho parent)))]
-     [parent parent]
-     [enabled enabled]
-     [horiz-margin horiz-margin]
-     [vert-margin vert-margin]
-     [min-width min-width]
-     [min-height min-height]
-     [stretchable-width stretchable-width]
-     [stretchable-height stretchable-height])
-    (unless (eq? wheel-step no-val)
-      (ws wheel-step))
-    (when label
-      (set-label label))
-    (when editor
-      (set-editor editor))
-    (send parent after-new-child this)
-    (unless (or (not line-count) (eq? line-count no-val))
-      (set-line-count line-count))
-    (unless (or (eq? vertical-inset 5))
-      (vi vertical-inset))
-    (unless (or (eq? horizontal-inset 5))
-      (hi horizontal-inset))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/mrcontainer.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/mrcontainer.rkt
deleted file mode 100644
index d46841232e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/mrcontainer.rkt
+++ /dev/null
@@ -1,202 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/list
-         (prefix-in wx: "kernel.rkt")
-         "lock.rkt"
-         "helper.rkt"
-         "const.rkt"
-         "wx.rkt"
-         "check.rkt"
-         "wxcontainer.rkt"
-         "mrwindow.rkt")
-
-(provide area-container<%>
-         (protect-out internal-container<%>
-                      check-container-parent
-                      make-container%
-                      make-subwindow%)
-         area-container-window<%>
-         (protect-out make-area-container-window%))
-
-(define area-container<%>
-  (interface (area<%>)
-    reflow-container container-flow-modified begin-container-sequence end-container-sequence
-    container-size
-    get-children change-children place-children
-    after-new-child
-    add-child delete-child
-    border spacing
-    set-alignment get-alignment))
-
-(define internal-container<%> (interface ()))
-
-(define (check-container-parent who p)
-  (unless (is-a? p internal-container<%>)
-    (unless (is-a? p area-container<%>)
-      (raise-argument-error (who->name who) "(is-a?/c area-container<%>)" p))
-    (raise-arguments-error (who->name who) "invalid container;\n given container is not an instance of a built-in container class"
-                           "given container" p)))
-
-(define-local-member-name
-  has-wx-child?
-  adopt-wx-child
-  forget-wx-child)
-
-(define (make-container% %) ; % implements area<%>
-  (class* % (area-container<%> internal-container<%>)
-    (init mk-wx get-wx-pan get-wx-outer-pan mismatches parent
-          ;; for keyword use
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val])
-    (let ([cwho '(iconstructor area-container)])
-      (unless (eq? border no-val) (check-margin-integer cwho border))
-      (unless (eq? spacing no-val) (check-margin-integer cwho spacing))
-      (unless (eq? alignment no-val)
-        (unless (and (list? alignment)
-                     (= 2 (length alignment))
-                     (memq (car alignment) '(left center right))
-                     (memq (cadr alignment) '(top center bottom)))
-          (raise-argument-error (who->name cwho) "(list/c (or/c 'left center right) (or/c 'top 'center 'bottom))" alignment))))
-    (define get-wx-panel get-wx-pan)
-    
-    (define bdr (param get-wx-panel border))
-    (define spc (param get-wx-panel spacing))
-    (public [bdr border] [spc spacing])
-    (public*
-     [after-new-child (lambda (c)
-                        (check-instance '(method area-container<%> after-new-child) subarea<%> 'subarea<%> #f c)
-                        (void))]
-     [reflow-container (entry-point (lambda () (send (send (get-wx-panel) get-top-level) force-redraw)))]
-     [container-flow-modified (entry-point (lambda ()
-                                             (let ([p (get-wx-panel)])
-                                               (send p need-move-children)
-                                               (send p force-redraw))))]
-     [begin-container-sequence (entry-point (lambda () (send (send (get-wx-panel) get-top-level) begin-container-sequence)))]
-     [end-container-sequence (entry-point (lambda () (send (send (get-wx-panel) get-top-level) end-container-sequence)))]
-     [get-children (entry-point (lambda () (map wx->proxy
-                                                (let ([l (send (get-wx-panel) get-children)]
-                                                      [h (send (get-wx-panel) get-hidden-child)])
-                                                  (if h (remq h l) l)))))]
-     [set-alignment (entry-point (lambda (h v) (send (get-wx-panel) alignment h v)))]
-     [get-alignment (entry-point (lambda () (send (get-wx-panel) get-alignment)))]
-     [change-children (entry-point
-                       (lambda (f)
-                         (unless (and (procedure? f)
-                                      (procedure-arity-includes? f 1))
-                           (raise-argument-error (who->name '(method container<%> change-children))
-                                                 "(procedure-arity-includes/c 1)"
-                                                 f))
-                         (send (get-wx-panel) change-children
-                               (lambda (kids)
-                                 (let* ([hidden (send (get-wx-panel) get-hidden-child)]
-                                        [mred-kids (map wx->proxy (remq hidden kids))]
-                                        [l (as-exit (lambda () (f mred-kids)))])
-                                   (unless (and (list? l)
-                                                (andmap (lambda (x) (is-a? x internal-subarea<%>)) l))
-                                     (raise-arguments-error 'change-children
-                                                            "result of given procedure was not a list of subareas"
-                                                            "procedure" f
-                                                            "result" l))
-                                   (append
-                                    (if hidden (list hidden) null)
-                                    (map mred->wx l)))))))]
-     [container-size (entry-point
-                      (lambda (l)
-                                        ; Check l, even though we don't use it
-                        (unless (and (list? l)
-                                     (andmap
-                                      (lambda (l)
-                                        (and (list? l) (= (length l) 4)
-                                             (integer? (car l)) (exact? (car l)) (<= 0 (car l) WIN-SIZE-MAX)
-                                             (integer? (cadr l)) (exact? (cadr l)) (<= 0 (cadr l) WIN-SIZE-MAX)))
-                                      l))
-                          (raise-argument-error (who->name '(method area-container<%> container-size))
-                                                (format
-                                                 "(listof (list/c (integer-in 0 ~a) (integer-in 0 ~a) any/c any/c))"
-                                                 WIN-SIZE-MAX
-                                                 WIN-SIZE-MAX)
-                                                l))
-                        (let ([l (send (get-wx-panel) do-get-graphical-min-size)])
-                          (apply values l))))]
-     [place-children (entry-point (lambda (l w h) (send (get-wx-panel) do-place-children l w h)))]
-     [add-child (entry-point
-                 (lambda (c)
-                   (check-instance '(method area-container<%> add-child) subwindow<%> 'subwindow<%> #f c)
-                   (send (get-wx-panel) add-child (mred->wx c))))]
-     [delete-child (entry-point
-                    (lambda (c)
-                      (check-instance '(method area-container<%> delete-child) subwindow<%> 'subwindow<%> #f c)
-                      (send (get-wx-panel) delete-child (mred->wx c))))]
-     [has-wx-child? (lambda (child-wx) ; called in atomic mode
-                      (memq child-wx (send (get-wx-panel) get-children)))]
-     [adopt-wx-child (lambda (child-wx) ; called in atomic mode
-                       (let ([wxp (get-wx-panel)])
-                         (send child-wx set-area-parent wxp)
-                         (send wxp adopt-child child-wx)))])
-    (super-make-object mk-wx get-wx-panel get-wx-outer-pan mismatches parent)
-    (unless (eq? border no-val) (bdr border))
-    (unless (eq? spacing no-val) (spc spacing))
-    (unless (eq? alignment no-val) (set-alignment . alignment))))
-
-(define area-container-window<%>
-  (interface (window<%> area-container<%>)))
-
-(define (make-area-container-window% %) ; % implements window<%> (and area-container<%>)
-  (class* % (area-container-window<%>)
-    (init mk-wx get-wx-pan get-wx-outer-pan mismatches label parent cursor)
-    (super-make-object mk-wx get-wx-pan get-wx-outer-pan mismatches label parent cursor)))
-
-
-(define (make-subwindow% %)
-  (class %
-    (super-new)
-    (inherit set-parent
-             get-parent
-             is-shown?
-             show)
-    (define/public (reparent new-parent)
-      (check-container-parent '(method subwindow<%> reparent) new-parent)
-      (unless (as-entry
-               (lambda ()
-                 (let ([p1 (send (mred->wx this) get-top-level)]
-                       [p2 (send (mred->wx new-parent) get-top-level)])
-                   (eq? (send p1 get-eventspace) (send p1 get-eventspace)))))
-        (raise-arguments-error
-         (who->name '(method subwindow<%> reparent))
-         "current parent's eventspace is not the same as the eventspace of the new parent"
-         "subwindow" this
-         "new parent" new-parent))
-      (let loop ([p new-parent])
-        (when p
-          (when (eq? p this)
-            (raise-arguments-error
-             (who->name '(method subwindow<%> reparent))
-             (if (eq? new-parent this)
-                 "cannot set parent to self"
-                 "cannot set parent to a descedant")
-             "subwindow" this))
-          (loop (send p get-parent))))
-      (let* ([added? (memq this (send (get-parent) get-children))]
-             [shown? (and added? (is-shown?))])
-        (when added?
-          (send (get-parent) delete-child this))
-        (as-entry
-         (lambda ()
-           (let ([wx (mred->wx this)])
-             ;; double-check that delete succeeded:
-             (unless (send (get-parent) has-wx-child? wx)
-               ;; double-check that we're not creating a loop at the wx level:
-               (unless (let loop ([p (mred->wx new-parent)])
-                         (and p
-                              (or (eq? p wx)
-                                  (loop (send p get-parent)))))
-                 ;; Ok --- really reparent:
-                 (send wx ensure-forgotten)
-                 (send new-parent adopt-wx-child wx)
-                 (set-parent new-parent))))))
-        (when added?
-          (send new-parent add-child this))
-        (when shown?
-          (show #t))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/mred.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/mred.rkt
deleted file mode 100644
index 54f5e53c95..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/mred.rkt
+++ /dev/null
@@ -1,300 +0,0 @@
-(module mred mzscheme
-  (require (only racket/base
-                 define-namespace-anchor
-                 namespace-anchor->empty-namespace
-                 make-base-empty-namespace)
-           (only scheme/base) (only scheme/class) ; so that `make-gui-namespace' attaches them
-           racket/class
-           racket/draw racket/snip
-           file/resource
-           mzlib/etc
-           (prefix wx: "kernel.rkt")
-           (prefix wx: "wxme/editor.rkt")
-           (prefix wx: "wxme/text.rkt")
-           (prefix wx: "wxme/pasteboard.rkt")
-           (prefix wx: "wxme/keymap.rkt")
-           (prefix wx: "wxme/editor-admin.rkt")
-           (prefix wx: "wxme/editor-data.rkt")
-           (prefix wx: "wxme/editor-snip.rkt")
-           (prefix wx: "wxme/stream.rkt")
-           (prefix wx: "wxme/wordbreak.rkt")
-           "wxtop.rkt"
-           "app.rkt"
-           "misc.rkt"
-           "mrwindow.rkt"
-           "mrcontainer.rkt"
-           "mrtop.rkt"
-           "mrpanel.rkt"
-           "mrcanvas.rkt"
-           "mritem.rkt"
-           "mrtextfield.rkt"
-           "mrmenuintf.rkt"
-           "mrmenu.rkt"
-           "mrpopup.rkt"
-           "editor.rkt"
-           "messagebox.rkt"
-           "filedialog.rkt"
-           "fontdialog.rkt"
-           "moredialogs.rkt"
-           "gdi.rkt"
-           "snipfile.rkt"
-           "repl.rkt"
-           "helper.rkt"
-           "dynamic.rkt"
-           "check.rkt"
-           "const.rkt")
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; These functions are re-implemented in scheme/gui/base
-  ;; and racket/gui/base to attach those names, instead of
-  ;; just 'mred.
-
-  (define-namespace-anchor anchor)
-
-  (define (make-gui-empty-namespace)
-    (let ([ns (make-base-empty-namespace)])
-      (namespace-attach-module (namespace-anchor->empty-namespace anchor)
-                               'mred
-                               ns)
-      ns))
-
-  (define (make-gui-namespace)
-    (let ([ns (make-gui-empty-namespace)])
-      (parameterize ([current-namespace ns])
-        (namespace-require 'scheme/base)
-        (namespace-require 'mred)
-        (namespace-require 'scheme/class))
-      ns))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-  (define (make-eventspace)
-    (parameterize ([the-snip-class-list (make-the-snip-class-list)]
-                   [wx:the-editor-data-class-list (wx:make-the-editor-data-class-list)])
-      (wx:make-eventspace)))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-  (define-syntax propagate
-    (lambda (stx)
-      (syntax-case stx ()
-	[(_ n ...)
-	 (let ([ns (syntax->list (syntax (n ...)))])
-	   (with-syntax ([(k:n ...)
-			  (map
-			   (lambda (n)
-			     (datum->syntax-object
-			      n
-			      (string->symbol
-			       (format 
-				"wx:~a"
-				(syntax-e n)))
-			      #f))
-			   ns)])
-	     (syntax (begin
-		       ;; We can't just re-export, because kernel.rkt's
-		       ;;  exports are protected.
-		       (define n k:n) ...
-		       (provide n ...)))))])))
-
-  (propagate add-editor-keymap-functions
-	     add-text-keymap-functions
-	     add-pasteboard-keymap-functions
-	     begin-busy-cursor
-	     bell
-	     editor-data%
-	     editor-data-class%
-	     editor-data-class-list<%>
-	     check-for-break
-	     clipboard<%>
-	     clipboard-client%
-	     control-event%
-	     column-control-event%
-	     current-eventspace
-	     cursor%
-	     get-display-depth
-	     end-busy-cursor
-	     event%
-	     event-dispatch-handler
-	     eventspace?
-	     flush-display
-             get-current-mouse-state
-	     get-highlight-background-color
-             get-highlight-text-color
-	     get-the-editor-data-class-list
-	     is-busy?
-	     is-color-display?
-	     key-event%
-	     keymap%
-	     editor-admin%
-	     editor-set-x-selection-mode
-	     editor-snip-editor-admin<%>
-	     editor-stream-in%
-	     editor-stream-in-base%
-	     editor-stream-in-bytes-base%
-	     editor-stream-out%
-	     editor-stream-out-base%
-	     editor-stream-out-bytes-base%
-	     editor-wordbreak-map%
-	     mouse-event%
-	     read-editor-global-footer
-	     read-editor-global-header
-	     read-editor-version
-	     scroll-event%
-	     special-control-key
-	     special-option-key
-             map-command-as-meta-key
-	     label->plain-label
-	     write-editor-global-footer
-	     write-editor-global-header
-	     write-editor-version
-	     queue-callback
-	     yield
-	     eventspace-shutdown?
-             eventspace-event-evt
-	     get-panel-background
-
-             the-editor-wordbreak-map
-             make-screen-bitmap
-             make-gl-bitmap)
-   
-  (define the-clipboard (wx:get-the-clipboard))
-  (define the-x-selection-clipboard (wx:get-the-x-selection))
-
-  (define (find-graphical-system-path what)
-    (unless (memq what '(init-file x-display))
-      (raise-argument-error 'find-graphical-system-path "(or/c 'init-file 'x-display)" what))
-    (or (wx:find-graphical-system-path what)
-        (case what
-          [(init-file)
-           (build-path (find-system-path 'init-dir)
-                       (case (system-type)
-                         [(windows) "gracketrc.rktl"]
-                         [else ".gracketrc"]))]
-          [else #f])))
-
-  (define (dimension-integer? x) (and (exact-integer? x) (<= 0 x WIN-SIZE-MAX)))
-  (define (position-integer? x) (and (exact-integer? x) (<= (- WIN-SIZE-MAX) x WIN-SIZE-MAX)))
-  (define (spacing-integer? x) (and (exact-integer? x) (<= 0 x 1000)))
-  (define (positive-dimension-integer? x) (and (exact-integer? x) (<= 1 x WIN-SIZE-MAX)))
-
-  (provide (all-from racket/draw)
-           (all-from racket/snip)
-           (all-from file/resource))
-
-  (provide button%
-	   canvas%
-	   check-box%
-	   choice%
-	   dialog%
-	   frame%
-	   gauge%
-	   tab-panel%
-	   group-box-panel%
-	   list-box%
-	   editor-canvas%
-	   message%
-	   pane%
-	   horizontal-pane%
-	   vertical-pane%
-	   grow-box-spacer-pane%
-	   panel%
-	   horizontal-panel%
-	   vertical-panel%
-	   radio-box%
-	   slider%
-	   text-field%
-	   combo-field%
-	   window<%>
-	   area<%>
-	   top-level-window<%>
-	   subarea<%>
-	   subwindow<%>
-	   area-container<%>
-	   area-container-window<%>
-	   canvas<%>
-	   control<%>
-	   list-control<%>
-	   menu-item<%>
-	   separator-menu-item%
-	   selectable-menu-item<%>
-	   labelled-menu-item<%>
-	   menu-item%
-	   checkable-menu-item%
-	   get-default-shortcut-prefix
-	   menu-item-container<%>
-	   menu%
-	   menu-bar%
-	   popup-menu%
-	   get-top-level-windows
-	   editor-snip%
-	   editor<%>
-	   text%
-	   pasteboard%
-	   graphical-read-eval-print-loop
-	   textual-read-eval-print-loop
-	   message-box
-	   message+check-box
-	   message-box/custom
-	   message+check-box/custom
-           get-face-list
-	   get-file
-	   get-file-list
-	   put-file
-	   get-directory
-	   get-choices-from-user
-	   get-text-from-user
-	   get-ps-setup-from-user
-	   get-page-setup-from-user
-	   can-get-page-setup-from-user?
-	   play-sound
-	   get-display-size
-	   get-display-left-top-inset
-	   get-display-count
-           get-display-backing-scale
-	   get-color-from-user
-	   get-font-from-user
-           append-editor-operation-menu-items
-	   append-editor-font-menu-items
-	   get-top-level-focus-window
-	   get-top-level-edit-target-window
-	   register-collecting-blit
-	   unregister-collecting-blit
-	   printer-dc%
-	   current-text-keymap-initializer
-	   sleep/yield
-	   get-window-text-extent
-	   send-message-to-window
-	   the-clipboard
-	   the-x-selection-clipboard
-	   normal-control-font
-	   small-control-font
-	   tiny-control-font
-	   view-control-font
-	   menu-control-font
-	   timer%
-	   open-input-text-editor
-	   open-input-graphical-file
-	   open-output-text-editor
-	   text-editor-load-handler
-	   application-about-handler
-	   application-preferences-handler
-	   application-quit-handler
-	   application-file-handler
-	   application-start-empty-handler
-	   current-eventspace-has-standard-menus?
-	   current-eventspace-has-menu-root?
-	   eventspace-handler-thread
-           make-eventspace
-	   make-gui-namespace
-	   make-gui-empty-namespace
-	   file-creator-and-type
-	   hide-cursor-until-moved
-           system-position-ok-before-cancel?
-           label-string?
-           key-code-symbol?
-           find-graphical-system-path
-           dimension-integer?
-           positive-dimension-integer?
-           position-integer?
-           spacing-integer?))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/mritem.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/mritem.rkt
deleted file mode 100644
index ba81d0a094..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/mritem.rkt
+++ /dev/null
@@ -1,949 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/list
-         (prefix-in wx: "kernel.rkt")
-         "lock.rkt"
-         "const.rkt"
-         "gdi.rkt"
-         "check.rkt"
-         "helper.rkt"
-         "wx.rkt"
-         "wxitem.rkt"
-         "wxlitem.rkt"
-         "mrwindow.rkt"
-         "mrcontainer.rkt")
-
-(provide control<%>
-         (protect-out basic-control%)
-         message%
-         button%
-         check-box%
-         radio-box%
-         slider%
-         gauge%
-
-         list-control<%>
-         choice%
-         list-box%
-
-         (protect-out wrap-callback
-                      check-list-control-args
-                      check-list-control-selection
-
-                      ;; Local methods:
-                      hidden-child?
-                      label-checker))
-
-(define control<%>
-  (interface (subwindow<%>)
-    command))
-
-(define-local-member-name hidden-child? label-checker)
-
-(define basic-control%
-  (class* (make-subwindow% (make-window% #f (make-subarea% area%))) (control<%>)
-    (init mk-wx mismatches lbl parent cb cursor
-          ;; for keyword use
-          [font no-val])
-    (define label lbl)
-    (define callback cb)
-    (define can-bitmap? (or (lbl . is-a? . wx:bitmap%)
-                            (pair? lbl)))
-    (define can-string? (or (string? lbl)
-                            (pair? lbl)))
-    (override*
-     [get-label (lambda () label)]
-     [get-plain-label (lambda ()
-                        (let ([label (if (pair? label) (cadr label) label)])
-                          (and (string? label) (wx:label->plain-label label))))]
-     [set-label (entry-point
-                 (lambda (l)
-                   ((label-checker)
-                    '(method control<%> set-label) l)
-                   (let ([l (if (string? l)
-                                (string->immutable-string l)
-                                l)])
-                     (when (or (and can-bitmap?
-                                    (l . is-a? . wx:bitmap%))
-                               (and can-string?
-                                    (string? l)))
-                       (send wx set-label l)
-                       (if (pair? label)
-                           (if (string? l)
-                               (set! label (list (car label) l (caddr label)))
-                               (set! label (list l (cadr label) (caddr label))))
-                           (set! label l))))))])
-    (public*
-     [hidden-child? (lambda () #f)]   ; module-local method
-     [label-checker  (lambda () check-label-string/false)] ; module-local method
-     [command (lambda (e) (void (callback this e)))]) ; no entry/exit needed
-    (define wx #f)
-    (when (string? label)
-      (set! label (string->immutable-string label)))
-    (super-make-object (lambda () (set! wx (mk-wx)) wx) (lambda () wx) (lambda () wx) mismatches label parent cursor)
-    (unless (hidden-child?)
-      (as-exit (lambda () (send parent after-new-child this))))))
-
-(define (wrap-callback cb)
-  (if (and (procedure? cb)
-           (procedure-arity-includes? cb 2))
-      (lambda (w e) (if (or (eq? 'windows (system-type))
-                            (and (memq (system-type) '(macos macosx))
-                                 (eq? (send e get-event-type) 'slider)))
-                        ;; Mac OS slider and Windows (all): need trampoline
-                        (wx:queue-callback
-                         (lambda ()
-                           (cb (wx->proxy w) e))
-                         wx:middle-queue-key)
-                        (cb (wx->proxy w) e)))
-      cb))
-
-(define zero-bitmap #f)
-
-(define message%
-  (class* basic-control% ()
-    (init label parent [style null]
-          ;; The following are needed just because message% adds an
-          ;; init argument *after* all of its parent arguments, which
-          ;; normally can't happen.
-          [font no-val]
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val]
-          [auto-resize #f])
-    (init-rest)
-    (rename-super [super-min-width min-width]
-                  [super-min-height min-height]
-                  [super-get-label get-label])
-    (define do-auto-resize? auto-resize)
-    (define orig-font (or (no-val->#f font)
-                          normal-control-font))
-    (define dx 0)
-    (define dy 0)
-    (override*
-     [label-checker  (lambda () check-label-string-or-bitmap)] ; module-local method
-     [set-label (entry-point
-                 (lambda (l)
-                   (super set-label l)
-                   (when do-auto-resize?
-                     (do-auto-resize))))])
-    (private*
-     [strip-amp (lambda (s) (if (string? s)
-                                (regexp-replace* #rx"&(.)" s "\\1")
-                                s))]
-     [do-auto-resize (lambda ()
-                       (let ([s (strip-amp (super-get-label))])
-                         (cond
-                          [(symbol? s) (void)]
-                          [(string? s)
-                           (let ([m (mred->wx this)])
-                             (if (send m set-preferred-size)
-                                 (let ([w (box 0)] [h (box 0)])
-                                   (send m get-size w h)
-                                   (super-min-width (unbox w))
-                                   (super-min-height (unbox h)))
-                                 (let-values ([(mw mh) (get-window-text-extent s orig-font #t)])
-                                   (super-min-width (+ dx mw))
-                                   (super-min-height (+ dy mh)))))]
-                          [(s . is-a? . wx:bitmap%)
-                           (super-min-width (+ dx (send s get-width)))
-                           (super-min-height (+ dy (send s get-height)))])))])
-    (define auto-resize-parm
-      (case-lambda
-        [() do-auto-resize?]
-        [(on?)
-         (as-entry
-          (lambda ()
-            (set! do-auto-resize? (and #t))
-            (when on?
-              (do-auto-resize))))]))
-    (public (auto-resize-parm auto-resize))
-    (let ([cwho '(constructor message)])
-      (check-label-string/bitmap/iconsym cwho label)
-      (check-container-parent cwho parent)
-      (check-style cwho #f '(deleted) style)
-      (check-font cwho font))
-    (as-entry
-     (lambda ()
-       (super-instantiate
-        ((lambda ()
-           (let ([m (make-object wx-message% this this
-                                 (mred->wx-container parent)
-                                 (if do-auto-resize?
-                                     (cond
-                                      [(string? label) ""]
-                                      [(label . is-a? . wx:bitmap%)
-                                       (unless zero-bitmap
-                                         (set! zero-bitmap (make-object wx:bitmap% 1 1)))
-                                       zero-bitmap]
-                                      [else label])
-                                     label)
-                                 -1 -1 style (no-val->#f font))])
-             ;; Record dx & dy:
-             (let ([w (box 0)] [h (box 0)])
-               (send m get-size w h)
-               (let-values ([(mw mh) (cond
-                                      [(string? label)
-                                       (let ([s (if do-auto-resize?
-                                                    ""
-                                                    (strip-amp label))]
-                                             [font orig-font])
-                                         (if (equal? s "")
-                                             (let-values ([(w h) (get-window-text-extent " " font)])
-                                               (values 0 h))
-                                             (get-window-text-extent s font)))]
-                                      [(label . is-a? . wx:bitmap%)
-                                       (if do-auto-resize?
-                                           (values 1 1)
-                                           (values (send label get-width)
-                                                   (send label get-height)))]
-                                      [else (values 0 0)])])
-                 (set! dx (- (unbox w) mw))
-                 (set! dy (- (unbox h) mh))))
-             ;; If auto-resize, install label now:
-             (when (and do-auto-resize?
-                        (not (symbol? label)))
-               (send m set-label label))
-             m))
-         (lambda ()
-           (let ([cwho '(constructor message)])
-             (check-container-ready cwho parent)))
-         label parent void #f)
-        [font font]
-        [enabled enabled]
-        [horiz-margin horiz-margin]
-        [vert-margin vert-margin]
-        [min-width min-width]
-        [min-height min-height]
-        [stretchable-width stretchable-width]
-        [stretchable-height stretchable-height])
-       (when do-auto-resize?
-         (do-auto-resize))))))
-
-(define button%
-  (class* basic-control% ()
-    (init label parent [callback (lambda (b e) (void))] [style null]
-          ;; This is a vestige of the old class100 keyword macro
-          [font no-val]
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (override*
-     [label-checker  (lambda () check-label-string-or-bitmap)]) ; module-local method
-    (let ([cwho '(constructor button)])
-      (check-label-string-or-bitmap-or-both cwho label)
-      (check-container-parent cwho parent)
-      (check-callback cwho callback)
-      (check-style cwho #f '(border deleted) style)
-      (check-font cwho font))
-    (as-entry
-     (lambda ()
-       (super-new
-        [mk-wx
-         (lambda () (make-object wx-button% this this
-                                 (mred->wx-container parent) (wrap-callback callback)
-                                 label -1 -1 -1 -1 style (no-val->#f font)))]
-        [mismatches
-         (lambda ()
-           (let ([cwho '(constructor button)])
-             (check-container-ready cwho parent)))]
-        [cursor #f]
-        [lbl label]
-        [parent parent]
-        [cb callback]
-        [font font]
-        [enabled enabled]
-        [horiz-margin horiz-margin]
-        [vert-margin vert-margin]
-        [min-width min-width]
-        [min-height min-height]
-        [stretchable-width stretchable-width]
-        [stretchable-height stretchable-height])))))
-
-(define check-box%
-  (class basic-control%
-    (init label parent [callback (lambda (b e) (void))] [style null] [value #f]
-          ;; This is a vestige of the old class100 keyword macro
-          [font no-val]
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (let ([cwho '(constructor check-box)])
-      (check-label-string-or-bitmap cwho label)
-      (check-container-parent cwho parent)
-      (check-callback cwho callback)
-      (check-style cwho #f '(deleted) style)
-      (check-font cwho font))
-    (override*
-     [label-checker  (lambda () check-label-string-or-bitmap)]) ; module-local method
-    (define wx #f)
-    (public*
-     [get-value (entry-point (lambda () (send wx get-value)))]
-     [set-value (entry-point (lambda (v) (send wx set-value v)))])
-    (as-entry
-     (lambda ()
-       (super-new
-        [mk-wx
-         (lambda ()
-           (set! wx (make-object wx-check-box% this this
-                                 (mred->wx-container parent) (wrap-callback callback)
-                                 label -1 -1 -1 -1 style (no-val->#f font)))
-           wx)]
-        [mismatches
-         (lambda ()
-           (let ([cwho '(constructor check-box)])
-             (check-container-ready cwho parent)))]
-        [lbl label]
-        [parent parent]
-        [cb callback]
-        [cursor #f]
-        [font font]
-        [enabled enabled]
-        [horiz-margin horiz-margin]
-        [vert-margin vert-margin]
-        [min-width min-width]
-        [min-height min-height]
-        [stretchable-width stretchable-width]
-        [stretchable-height stretchable-height])))
-    (when value (set-value #t))))
-
-(define radio-box%
-  (class basic-control%
-    (init label choices parent [callback (lambda (b e) (void))] [style '(vertical)] [selection 0]
-          ;; This is a vestige of the old class100 keyword macro
-          [font no-val]
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (define chcs choices)
-    (let ([cwho '(constructor radio-box)])
-      (check-label-string/false cwho label)
-      (unless (and (list? chcs) (pair? chcs)
-                   (or (andmap label-string? chcs)
-                       (andmap (lambda (x) (is-a? x wx:bitmap%)) chcs)))
-        (raise-argument-error (who->name cwho) "(or/c (non-empty-listof label-string?) (non-empty-listof (is-a?/c bitmap%)))" chcs))
-      (check-container-parent cwho parent)
-      (check-callback cwho callback)
-      (check-orientation cwho style)
-      (check-non-negative-integer/false cwho selection))
-    (define wx #f)
-    (private*
-     [check-button
-      (lambda (method n false-ok?)
-        ((if false-ok?
-             check-non-negative-integer/false
-             check-non-negative-integer)
-         `(method radio-box% ,method) n)
-        (when n
-          (unless (< n (length chcs))
-            (raise-arguments-error (who->name `(method radio-box% ,method)) "no such button" 
-                                   "index" n))))])
-    (override*
-     [enable (entry-point
-              (case-lambda
-                [(on?) (send wx enable on?)]
-                [(which on?) (check-button 'enable which #f)
-                 (send wx enable which on?)]))]
-     [is-enabled? (entry-point
-                   (case-lambda
-                     [() (send wx is-enabled?)]
-                     [(which) (check-button 'is-enabled? which #f)
-                      (send wx is-enabled? which)]))])
-    (public*
-     [get-number (lambda () (length chcs))]
-     [get-item-label (lambda (n)
-                       (check-button 'get-item-label n #f)
-                       (list-ref chcs n))]
-     [get-item-plain-label (lambda (n)
-                             (check-button 'get-item-plain-label n #f)
-                             (wx:label->plain-label (list-ref chcs n)))]
-
-     [get-selection (entry-point (lambda () (let ([v (send wx get-selection)])
-                                              (if (equal? v -1)
-                                                  #f
-                                                  v))))]
-     [set-selection (entry-point
-                     (lambda (v)
-                       (check-button 'set-selection v #t)
-                       (send wx set-selection (or v -1))))])
-    (as-entry
-     (lambda ()
-       (when (andmap string? chcs)
-         (set! chcs (map string->immutable-string chcs)))
-       (super-instantiate
-        ((lambda ()
-           (set! wx (make-object wx-radio-box% this this
-                                 (mred->wx-container parent) (wrap-callback callback)
-                                 label -1 -1 -1 -1 chcs 0 style (no-val->#f font)))
-           wx)
-         (lambda ()
-           (let ([cwho '(constructor radio-box)])
-             (check-container-ready cwho parent)
-             (when selection
-               (check-list-control-selection cwho choices selection))))
-         label parent callback #f)
-        [font font]
-        [enabled enabled]
-        [horiz-margin horiz-margin]
-        [vert-margin vert-margin]
-        [min-width min-width]
-        [min-height min-height]
-        [stretchable-width stretchable-width]
-        [stretchable-height stretchable-height])))
-    (when (or (not selection) (positive? selection))
-      (set-selection selection))))
-
-(define slider%
-  (class basic-control%
-    (init label min-value max-value parent [callback (lambda (b e) (void))] [init-value min-value] [style '(horizontal)]
-          ;; This is a vestige of the old class100 keyword macro
-          [font no-val]
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (define minv min-value)
-    (define maxv max-value)
-    (let ([cwho '(constructor slider)])
-      (check-label-string/false cwho label)
-      (check-slider-integer cwho minv)
-      (check-slider-integer cwho maxv)
-      (check-container-parent cwho parent)
-      (check-callback cwho callback)
-      (check-slider-integer cwho init-value)
-      (check-style cwho '(vertical horizontal) '(plain vertical-label horizontal-label deleted) style)
-      (check-font cwho font)
-      (unless (<= minv maxv)
-        (raise-arguments-error (who->name cwho)
-                               "minumum value is greater than maximum value"
-                               "minimum" minv
-                               "maximum" maxv))
-      (unless (<= minv init-value maxv)
-        (raise-arguments-error (who->name cwho)
-                               "range error;\n initial value is not between minumum value and maximum value inclusive"
-                               "initial value" init-value
-                               "minimum" minv
-                               "maximum" maxv)))
-    (define wx #f)
-    (public*
-     [get-value (entry-point (lambda () (send wx get-value)))]
-     [set-value (entry-point
-                 (lambda (v)
-                   (check-slider-integer '(method slider% set-value) v)
-                   (unless (<= minv v maxv)
-                     (raise-arguments-error (who->name '(method slider% set-value))
-                                            "out of range;\n given value is not between minimum and maximum values"
-                                            "given" v
-                                            "minimum" minv
-                                            "maximum" maxv))
-                   (send wx set-value v)))])
-    (as-entry
-     (lambda ()
-       (super-new
-        [mk-wx
-         (lambda ()
-           (set! wx (make-object wx-slider% this this
-                                 (mred->wx-container parent) (wrap-callback callback)
-                                 label init-value minv maxv style (no-val->#f font)))
-           wx)]
-        [mismatches
-         (lambda ()
-           (let ([cwho '(constructor slider)])
-             (check-container-ready cwho parent)))]
-        [lbl label]
-        [parent parent]
-        [cb callback]
-        [cursor #f]
-        [font font]
-        [enabled enabled]
-        [horiz-margin horiz-margin]
-        [vert-margin vert-margin]
-        [min-width min-width]
-        [min-height min-height]
-        [stretchable-width stretchable-width]
-        [stretchable-height stretchable-height])))))
-
-(define gauge%
-  (class basic-control%
-    (init label range parent [style '(horizontal)]
-          ;; This is a vestige of the old class100 keyword macro
-          [font no-val]
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (let ([cwho '(constructor gauge)])
-      (check-label-string/false cwho label)
-      (check-container-parent cwho parent)
-      (check-gauge-integer cwho range)
-      (check-orientation cwho style))
-    (define wx #f)
-    (public*
-     [get-value (entry-point (lambda () (send wx get-value)))]
-     [set-value (entry-point
-                 (lambda (v)
-                   (check-gauge-range-integer '(method gauge% set-value) v)
-                   (when (> v (send wx get-range))
-                     (raise-arguments-error (who->name '(method gauge% set-value))
-                                            "out of range;\n given value is not between 0 and maximum value"
-                                            "given" v
-                                            "maximum" (send wx get-range)))
-                   (send wx set-value v)))]
-     [get-range (entry-point (lambda () (send wx get-range)))]
-     [set-range (entry-point
-                 (lambda (v)
-                   (check-gauge-integer '(method gauge% set-range) v)
-                   (send wx set-range v)))])
-    (as-entry
-     (lambda ()
-       (super-new
-        [mk-wx
-         (lambda ()
-           (set! wx (make-object wx-gauge% this this
-                                 (mred->wx-container parent)
-                                 label range style (no-val->#f font)))
-           wx)]
-        [mismatches
-         (lambda ()
-           (let ([cwho '(constructor gauge)])
-             (check-container-ready cwho parent)))]
-        [lbl label]
-        [parent parent]
-        [cb void]
-        [cursor #f]
-        [font font]
-        [enabled enabled]
-        [horiz-margin horiz-margin]
-        [vert-margin vert-margin]
-        [min-width min-width]
-        [min-height min-height]
-        [stretchable-width stretchable-width]
-        [stretchable-height stretchable-height])))))
-
-;; List controls ----------------------------------------
-
-(define list-control<%>
-  (interface (control<%>)
-    clear append
-    get-number
-    get-string find-string
-    get-selection
-    get-string-selection
-    set-selection
-    set-string-selection))
-
-(define (-1=>false v) (if (negative? v) #f v))
-
-(define-local-member-name
-  -append-list-string
-  -set-list-strings
-  -set-list-string
-  -delete-list-item)
-
-(define basic-list-control%
-  (class* basic-control% (list-control<%>)
-    (init mk-wx mismatches label parent selection callback init-choices)
-    (define content (map string->immutable-string init-choices))
-    (define -append
-      (entry-point (lambda (i)
-                     (check-label-string '(method list-control<%> append) i)
-                     (-append-list-string i)
-                     (send wx append i))))
-    (public [-append append])
-    (public*
-     [clear (entry-point (lambda () (send wx clear) (set! content null)))]
-     [get-number (entry-point (lambda () (send wx number)))]
-     [get-string (entry-point (lambda (n) (check-item 'get-string n) (list-ref content n)))]
-     [get-selection (entry-point (lambda () (and (positive? (send wx number)) (-1=>false (send wx get-selection)))))]
-     [get-string-selection (entry-point (lambda () (and (positive? (send wx number))
-                                                        (let ([v (send wx get-selection)])
-                                                          (if (= v -1)
-                                                              #f
-                                                              (list-ref content v))))))]
-     [set-selection (entry-point (lambda (s) (check-item 'set-selection s) (send wx set-selection s)))]
-     [set-string-selection (entry-point
-                            (lambda (s)
-                              (check-label-string '(method list-control<%> set-string-selection) s)
-                              (let ([pos (do-find-string s)])
-                                (if pos
-                                    (send wx set-selection pos)
-                                    (raise-arguments-error (who->name '(method list-control<%> set-string-selection))
-                                                           "no item matching the given string" 
-                                                           "given" s)))))]
-     [find-string (entry-point (lambda (x)
-                                 (check-label-string '(method list-control<%> find-string) x)
-                                 (do-find-string x)))]
-     [delete (entry-point (lambda (n)
-                            (check-item 'delete n)
-                            (send this -delete-list-item n)
-                            (send wx delete n)))]
-     [-append-list-string (lambda (i)
-                            (set! content (append content (list i))))]
-     [-set-list-string (lambda (i s)
-                         (set! content (let loop ([content content][i i])
-                                         (if (zero? i)
-                                             (cons (string->immutable-string s) (cdr content))
-                                             (cons (car content) (loop (cdr content) (sub1 i)))))))]
-     [-delete-list-item (lambda (pos)
-                          (set! content (let loop ([content content][pos pos])
-                                          (if (zero? pos)
-                                              (cdr content)
-                                              (cons (car content) (loop (cdr content) (sub1 pos)))))))]
-     [-set-list-strings (lambda (l)
-                          (set! content (map string->immutable-string l)))])
-    (define wx #f)
-    (private*
-     [do-find-string
-      (lambda (s)
-        (let loop ([l content][pos 0])
-          (cond
-           [(null? l) #f]
-           [(string=? s (car l)) pos]
-           [else (loop (cdr l) (add1 pos))])))]
-     [check-item
-      (lambda (method n)
-        (check-non-negative-integer `(method list-control<%> ,method) n)
-        (let ([m (send wx number)])
-          (unless (< n m)
-            (raise-range-error (who->name `(method list-control<%> ,method))
-                               "control" "item "
-                               n
-                               this
-                               0
-                               (sub1 m)
-                               #f))))])
-    (as-entry
-     (lambda ()
-       (super-make-object (lambda () (set! wx (mk-wx)) wx) mismatches label parent callback #f)))
-    (when selection
-      (set-selection selection))))
-
-(define (check-list-control-args cwho label choices parent callback)
-  (check-label-string/false cwho label)
-  (unless (and (list? choices) (andmap label-string? choices))
-    (raise-argument-error (who->name cwho) "(listof label-string?)" choices))
-  (check-container-parent cwho parent)
-  (check-callback cwho callback))
-
-(define (check-list-control-selection cwho choices selection)
-  (unless (< selection (length choices))
-    (raise-arguments-error (who->name cwho)
-                           "given initial selection is too large"
-                           "given" selection
-                           "choice count" (length choices))))
-
-(define choice%
-  (class basic-list-control%
-    (init label choices parent [callback (lambda (b e) (void))] [style null] [selection 0]
-          ;; This is a vestige of the old class100 keyword macro
-          [font no-val]
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (let ([cwho '(constructor choice)])
-      (check-list-control-args cwho label choices parent callback)
-      (check-style cwho #f '(vertical-label horizontal-label deleted) style)
-      (check-non-negative-integer cwho selection)
-      (check-font cwho font))
-    (super-new
-     [mk-wx
-      (lambda () (make-object wx-choice% this this
-                             (mred->wx-container parent) (wrap-callback callback)
-                             label -1 -1 -1 -1 choices style (no-val->#f font)))]
-     [mismatches
-      (lambda ()
-       (let ([cwho '(constructor choice)])
-         (check-container-ready cwho parent)
-         (unless (= 0 selection)
-           (check-list-control-selection cwho choices selection))))]
-     [label label]
-     [parent parent]
-     [selection (and (positive? selection) selection)]
-     [callback callback]
-     [init-choices choices]
-     [font font]
-     [enabled enabled]
-     [horiz-margin horiz-margin]
-     [vert-margin vert-margin]
-     [min-width min-width]
-     [min-height min-height]
-     [stretchable-width stretchable-width]
-     [stretchable-height stretchable-height])))
-
-(define list-box%
-  (class basic-list-control%
-    (init label choices parent [callback (lambda (b e) (void))] [style '(single)]
-          [selection #f] [font no-val] [label-font no-val]
-          ;; inherited inits
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val]
-          ;; post inits
-          [columns (list "Column")] [column-order #f])
-    (init-rest)
-    (let ([cwho '(constructor list-box)])
-      (check-list-control-args cwho label choices parent callback)
-      (check-style cwho '(single multiple extended)
-                   '(vertical-label horizontal-label deleted variable-columns
-                                    column-headers clickable-headers reorderable-headers)
-                   style)
-      (check-non-negative-integer/false cwho selection)
-      (check-font cwho font)
-      (check-font cwho label-font)
-      (unless (and (list? columns)
-                   (not (null? columns))
-                   (andmap label-string? columns))
-        (raise-argument-error (who->name cwho) "(non-empty-listof label-string?)" columns))
-      (when column-order
-        (check-column-order cwho column-order (length columns))))
-    (private*
-     [check-column-order
-      (lambda (cwho column-order count)
-        (unless (and (list? column-order)
-                     (andmap exact-nonnegative-integer? column-order))
-          (raise-argument-error (who->name cwho)
-                                "(listof exact-nonnegative-integer?)"
-                                column-order))
-        (unless (equal? (sort column-order <)
-                        (for/list ([i (in-range (length column-order))]) i))
-          (raise-arguments-error (who->name cwho)
-                                 "bad column-order list;\n not a permutation of integers from 0 to one less than the list length"
-                                 "list" column-order))
-        (unless (= (length column-order) count)
-          (raise-arguments-error (who->name cwho)
-                                 "column count does not match length of column-order list"
-                                 "count" count
-                                 "list" column-order)))]
-     [check-column-number
-      (lambda (who i)
-        (unless (exact-nonnegative-integer? i)
-          (raise-argument-error (who->name who) "exact-nonnegative-integer?" i))
-        (unless (i . < . num-columns)
-          (raise-arguments-error (who->name who)
-                                 "given column index is too large"
-                                 "given" i
-                                 "column count" num-columns)))])
-    (define column-labels (map string->immutable-string columns))
-    (define num-columns (length columns))
-    (define variable-columns? (memq 'variable-columns style))
-    (rename-super [super-append append])
-    (define -append
-      (entry-point
-       (case-lambda
-         [(i)
-          (super-append i)]
-         [(i d)
-          (check-label-string '(method list-control<%> append) i)
-          (send this -append-list-string i)
-          (send wx append i d)])))
-    (override [-append append])
-    (public*
-     [get-column-labels (lambda () column-labels)]
-     [get-column-order (lambda () (send wx get-column-order))]
-     [set-column-order (lambda (co)
-                         (check-column-order '(method list-box% set-column-order) co num-columns)
-                         (send wx set-column-order co))]
-     [set-column-label (lambda (i str)
-                         (let ([who '(method list-box% set-column-label)])
-                           (check-column-number who i)
-                           (check-label-string who str))
-                         (let ([str (string->immutable-string str)])
-                           (set! column-labels (let loop ([i i] [l column-labels])
-                                                 (cond
-                                                  [(zero? i) (cons str (cdr l))]
-                                                  [else (cons (car l) (loop (sub1 i) (cdr l)))])))
-                           (send wx set-column-label i str)))]
-     [set-column-width (lambda (i w min-size max-size)
-                         (let ([who '(method list-box% set-column-width)])
-                           (check-column-number who i)
-                           (check-dimension who w)
-                           (check-dimension who min-size)
-                           (check-dimension who max-size)
-                           (unless (<= min-size w)
-                             (raise-arguments-error (who->name who)
-                                                    "given size is less than mininum size"
-                                                    "given" w
-                                                    "minimum" min-size))
-                           (unless (>= max-size w)
-                             (raise-arguments-error (who->name who)
-                                                    "given size is greater than maximum size"
-                                                    "given" w
-                                                    "maximum" max-size)))
-                         (send wx set-column-size i w min-size max-size))]
-     [get-column-width (lambda (i)
-                         (check-column-number '(method list-box% get-column-width) i)
-                         (send wx get-column-size i))]
-     [delete-column (lambda (i)
-                      (let ([who '(method list-box% delete-column)])
-                        (check-column-number who i)
-                        (unless variable-columns?
-                          (raise-arguments-error
-                           (who->name who)
-                           "cannot delete column;\n list box was created without 'variable-columns style"
-                           "column" i
-                           "list box" this))
-                        (unless (num-columns . > . 1)
-                          (raise-arguments-error (who->name who)
-                                                 "cannot delete column;\n list box has only one column"
-                                                 "column" i
-                                                 "list box" this)))
-                      (as-entry
-                       (lambda ()
-                         (set! num-columns (sub1 num-columns))
-                         (set! column-labels (let loop ([i i] [l column-labels])
-                                               (cond
-                                                [(zero? i) (cdr l)]
-                                                [else (cons (car l) (loop (sub1 i) (cdr l)))])))
-                         (send wx delete-column i))))]
-     [append-column (lambda (label)
-                      (let ([who '(method list-box% append-column)])
-                        (check-label-string who label)
-                        (unless variable-columns?
-                          (raise-arguments-error
-                           (who->name who)
-                           "cannot add column;\n list box created without 'variable-columns style"
-                           "list box" this
-                           "new column" label)))
-                      (as-entry
-                       (lambda ()
-                         (set! num-columns (add1 num-columns))
-                         (set! column-labels (append column-labels (list label)))
-                         (send wx append-column label))))]
-     
-     [get-data (entry-point (lambda (n) (check-item 'get-data n) (send wx get-data n)))]
-     [get-label-font (lambda () (send wx get-label-font))]
-     [get-selections (entry-point (lambda () (send wx get-selections)))]
-     [number-of-visible-items (entry-point (lambda () (send wx number-of-visible-items)))]
-     [is-selected? (entry-point (lambda (n) (check-item 'is-selected? n) (send wx selected? n)))]
-     [set (entry-point (lambda (l . more)
-                         (let ([cwho '(method list-box% set)])
-                           (unless (= num-columns (+ 1 (length more)))
-                             (raise-arguments-error (who->name cwho)
-                                                    "column count doesn't match argument count"
-                                                    "column count" num-columns
-                                                    "argument count" (add1 (length more))))
-                           (for ([l (in-list (cons l more))])
-                             (unless (and (list? l) (andmap label-string? l))
-                               (raise-argument-error (who->name cwho) "(listof label-string?)" l)))
-                           (for ([more-l (in-list more)])
-                             (unless (= (length more-l) (length l))
-                               (raise-arguments-error
-                                (who->name cwho)
-                                "first list length does not match length of later argument"
-                                "first list length" (length l)
-                                "larger argument length" (length more-l)))))
-                         (send this -set-list-strings l)
-                         (send wx set l . more)))]
-     [set-string (entry-point
-                  (lambda (n d [col 0])
-                    (let ([cwho '(method list-box% set-string)])
-                      (check-non-negative-integer cwho n) ; int error before string
-                      (check-label-string cwho d) ; string error before range mismatch
-                      (unless (exact-nonnegative-integer? col)
-                        (raise-argument-error (who->name cwho) "exact-nonnegative-integer?" col))
-                      (unless (< -1 col num-columns)
-                        (raise-range-error (who->name cwho)
-                                           "list box" "column "
-                                           col
-                                           this
-                                           0
-                                           (sub1 num-columns)
-                                           #f)))
-                    (check-item 'set-string n)
-                    (send this -set-list-string n d)
-                    (send wx set-string n d col)))]
-     [set-data (entry-point (lambda (n d) (check-item 'set-data n) (send wx set-data n d)))]
-     [get-first-visible-item (entry-point (lambda () (send wx get-first-item)))]
-     [set-first-visible-item (entry-point (lambda (n)
-                                            (check-item 'set-first-visible-item n)
-                                            (send wx set-first-visible-item n)))]
-     [select (entry-point
-              (case-lambda
-                [(n) (check-item 'select n) (send wx select n #t)]
-                [(n on?) (check-item 'select n) (send wx select n on?)]))])
-    (define wx #f)
-    (private*
-     [check-item
-      (entry-point
-       (lambda (method n)
-         (check-non-negative-integer `(method list-box% ,method) n)
-         (let ([m (send wx number)])
-           (unless (< n m)
-             (raise-range-error (who->name `(method list-box% ,method))
-                                "list box" "item "
-                                n
-                                this
-                                0
-                                (sub1 m)
-                                #f)))))])
-    (super-new
-     [mk-wx
-      (lambda ()
-        (let-values ([(kind style)
-                      (cond
-                       [(memq 'single style) (values 'single (remq 'single style))]
-                       [(memq 'multiple style) (values 'multiple (remq 'multiple style))]
-                       [else (values 'extended (remq 'extended style))])])
-          (set! wx (make-object wx-list-box% this this
-                                (mred->wx-container parent) (wrap-callback callback)
-                                label kind
-                                -1 -1 -1 -1 choices style
-                                (no-val->#f font) (no-val->#f label-font)
-                                column-labels
-                                column-order)))
-        wx)]
-     [mismatches
-      (lambda ()
-        (let ([cwho '(constructor list-box)])
-          (check-container-ready cwho parent)
-          (when selection
-            (check-list-control-selection cwho choices selection))))]
-     [label label]
-     [parent parent]
-     [selection (and (pair? choices) selection)]
-     [callback callback]
-     [init-choices choices]
-     [font font]
-     [enabled enabled]
-     [horiz-margin horiz-margin]
-     [vert-margin vert-margin]
-     [min-width min-width]
-     [min-height min-height]
-     [stretchable-width stretchable-width]
-     [stretchable-height stretchable-height])))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/mrmenu.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/mrmenu.rkt
deleted file mode 100644
index 018a648df2..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/mrmenu.rkt
+++ /dev/null
@@ -1,470 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/list
-         (prefix-in wx: "kernel.rkt")
-         (prefix-in wx: "wxme/keymap.rkt")
-         "lock.rkt"
-         "const.rkt"
-         "helper.rkt"
-         "check.rkt"
-         "wx.rkt"
-         "app.rkt"
-         "wxmenu.rkt"
-         "mrtop.rkt"
-         "mrmenuintf.rkt"
-         "mrpopup.rkt")
-
-(provide separator-menu-item%
-         menu-item%
-         checkable-menu-item%
-         menu%
-         menu-bar%
-         get-default-shortcut-prefix
-         (protect-out menu-parent-only
-                      menu-or-bar-parent))
-
-(define root-menu-frame-used? #f)
-
-;; Most of the work is in the item. Anything that appears in a menubar or
-;;  menu has an item. Submenus are created as instances of menu%, but
-;;  menu% has a get-item method for manipulating the menu w.r.t. the parent
-;;  (e.g., changing the title or enabled state). A popup menu, created
-;;  as an instance of popup-menu%, has no item.
-;;
-;; A menu bar is created as a menu-bar%, given a frame as its parent. The
-;;  frame must not already have a menu bar.
-;;
-;;  Plain labeled items are created as instances of menu-item% or
-;;   checkable-menu-item%. The parent must be a menu-item-container<%>,
-;;   which is a menu%, popup-menu%, or menu-bar%
-
-(define separator-menu-item%
-  (class* mred% (menu-item<%>)
-    (init parent)
-    (menu-parent-only 'separator-menu-item parent)
-    (define prnt parent)
-    (define wx #f)
-    (define shown? #f)
-    (define wx-parent #f)
-    (public*
-     [get-parent (lambda () prnt)]
-     [restore (entry-point
-               (lambda ()
-                 (unless shown?
-                   (send wx-parent append-separator)
-                   (send wx-parent append-item this wx)
-                   (set! shown? #t))))]
-     [delete (entry-point
-              (lambda ()
-                (when shown?
-                  (send wx-parent delete-sep this wx)
-                  (set! shown? #f))))]
-     [is-deleted? (lambda () (not shown?))])
-    (as-entry
-     (lambda ()
-       (set! wx (make-object wx-menu-item% this #f #f))
-       (set! wx-parent (send (mred->wx prnt) get-container))
-       (super-make-object wx)))
-    (restore)))
-
-(define strip-tab
-  (if (menu-shortcut-in-label?)
-      (lambda (s)
-        (car (regexp-match #rx"^[^\t]*" s)))
-      (lambda (s)
-        (regexp-replace* #rx"&"
-                         (regexp-replace* #rx"&(.)"
-                                          (regexp-replace*
-                                           #rx" *[(]&.[)] *"
-                                           (car (regexp-match #rx"^[^\t]*" s))
-                                           "")
-                                          "\\1")
-                         "\\&\\&"))))
-
-(define basic-labelled-menu-item%
-  (class* mred% (labelled-menu-item<%>)
-    (init prnt lbl help-str wx-sub chkble?
-          keymap set-wx demand-callback
-          on-pre-delete on-post-restore)
-    (define parent prnt)
-    (define label lbl)
-    (define help-string help-str)
-    (define wx-submenu wx-sub)
-    (define checkable? chkble?)
-    (define callback demand-callback)
-    (define wx #f)
-    (define wx-parent #f)
-    (define plain-label (string->immutable-string (wx:label->plain-label label)))
-    (define in-menu? (is-a? parent internal-menu<%>))
-    (define shown? #f)
-    (define enabled? #t)
-    (define post-restore on-post-restore)
-    (define pre-delete on-pre-delete)
-    (private*
-     [do-enable (lambda (on?)
-                  (when shown?
-                    (if in-menu?
-                        (send wx-parent enable wx (send wx id) on?)
-                        (send wx-parent enable-top (send wx-parent position-of this) on?)))
-                  (set! enabled? (and on? #t)))])
-    (public*
-     [on-demand (lambda () (callback this))]
-     [get-parent (lambda () parent)]
-     [get-label (lambda () label)]
-     [set-label (entry-point
-                 (lambda (l)
-                   (check-label-string '(method labelled-menu-item<%> set-label) l)
-                   (set! label (string->immutable-string l))
-                   (set-mcar! (send wx get-menu-data) l) ; for meta-shortcuts
-                   (set! plain-label (string->immutable-string (wx:label->plain-label l)))
-                   (when shown?
-                     (if in-menu?
-                         (send wx-parent set-label (send wx id) l)
-                         (send wx-parent set-label-top (send wx-parent position-of this) label)))))]
-     [get-plain-label (lambda () plain-label)]
-     [get-help-string (lambda () help-string)]
-     [set-help-string (entry-point
-                       (lambda (s)
-                         (check-label-string/false '(method labelled-menu-item<%> set-help-string) s)
-                         (set! help-string (and s (string->immutable-string s)))
-                         (when in-menu?
-                           (send wx-parent set-help-string (send wx id) help-string))))]
-     [enable (lambda (on?) (do-enable on?))]
-     [is-enabled? (lambda () enabled?)]
-     [restore (entry-point
-               (lambda ()
-                 (unless shown?
-                   (if in-menu?
-                       (begin
-                         (if wx-submenu
-                             (send wx-parent append (send wx id) label wx-submenu help-string)
-                             (send wx-parent append (send wx id) label help-string checkable?))
-                         (send wx-parent append-item this wx))
-                       (send wx-parent append-item this wx-submenu (strip-tab label)))
-                   (send wx set-enabled #t) ; re-added item is initially enabled at wx level
-                   (set! shown? #t)
-                   (do-enable enabled?)
-                   (post-restore))))]
-     [delete (entry-point
-              (lambda ()
-                (when shown?
-                  (pre-delete)
-                  (if in-menu?
-                      (send wx-parent delete (send wx id) this)
-                      (send wx-parent delete-item this))
-                  (set! shown? #f))))]
-     [is-deleted? (lambda () (not shown?))])
-    (as-entry
-     (lambda ()
-       (when help-string
-         (set! help-string (string->immutable-string help-string)))
-       (set! wx (set-wx (make-object wx-menu-item% this (mcons label #f) #t)))
-       (set! wx-parent (send (mred->wx parent) get-container))
-       (super-make-object wx)
-       (when keymap (send wx set-keymap keymap))))
-    (restore)))
-
-(define (char-name c print?)
-  (case c
-    [(#\return) (if (eq? (system-type) 'macos) "Return" "Enter")]
-    [(#\tab) "Tab"]
-    [(#\space) "Space"]
-    [(#\backspace) "Backspace"]
-    [(#\rubout) "Delete"]
-    [(#\:) (if print? ":" "Colon")]
-    [(#\;) (if print? ";" "Semicolon")]
-    [else c]))
-
-(define key-code->keymap-name #hasheq((prior . #"pageup")
-                                      (next . #"pagedown")
-                                      (escape . #"esc")))
-
-(define (check-shortcut who c)
-  (unless (or (not c)
-              (char? c)
-              (and (symbol? c)
-                   (wx:key-symbol-to-menu-key c)))
-    ;; FIXME: `key-code-symbol?' is not exported
-    (raise-argument-error (who->name who) "(or/c char? key-code-symbol? #f)" c)))
-
-(define (check-shortcut-prefix who p)
-  (unless (and (list? p)
-               (andmap (lambda (i)
-                         (memq i '(meta alt cmd shift option ctl)))
-                       p)
-               (let loop ([p p])
-                 (cond
-                  [(null? p) #t]
-                  [(memq (car p) (cdr p)) #f]
-                  [else (loop (cdr p))])))
-    (raise-arguments-error (who->name who)
-                           (string-append
-                            "bad prefix;\n"
-                            " given prefix is not a list of unique prefix symbols\n"
-                            "  allowed symbols: 'shift, 'meta, 'alt, 'cmd, 'option, and 'ctl")
-                           "given prefix" p))
-  (let ([disallowed (case (system-type)
-                      [(unix) '(cmd option)]
-                      [(windows) '(cmd option meta)]
-                      [(macosx) '(meta alt)])])
-    (for-each (lambda (i)
-                (when (memq i p)
-                  (raise-arguments-error (who->name who)
-                                         "prefix not supported for the current platform"
-                                         "prefix" i)))
-              disallowed)
-    (when (eq? 'unix (system-type))
-      (when (and (memq 'meta p)
-                 (memq 'alt p))
-        (raise-arguments-error (who->name who)
-                               "given prefix contains both 'meta and 'alt"
-                               "given" p)))))
-
-(define default-prefix
-  (case (system-type)
-    [(unix) (list default-x-prefix)]
-    [(windows) (list 'ctl)]
-    [(macosx) (list 'cmd)]))
-
-(define (get-default-shortcut-prefix)
-  default-prefix)
-
-(define basic-selectable-menu-item%
-  (class* basic-labelled-menu-item% (selectable-menu-item<%>)
-    (init lbl checkable? mnu cb shrtcut help-string set-wx
-          demand-callback shrtcut-prefix
-          on-pre-delete on-post-restore)
-    (inherit is-enabled?)
-    (rename-super [super-restore restore]
-                  [super-set-label set-label]
-                  [super-is-deleted? is-deleted?]
-                  [super-is-enabled? is-enabled?]
-                  [super-get-label get-label])
-    (define menu mnu)
-    (define callback cb)
-    (define label lbl)
-    (define shortcut shrtcut)
-    (define wx #f)
-    (public*
-     [command (lambda (e)
-                (check-instance '(method selectable-menu-item<%> command) wx:control-event% 'control-event% #f e)
-                (void (callback this e)))])
-    (define prefix shrtcut-prefix)
-    (private*
-     [calc-labels (lambda (label)
-                    (let* ([new-label (if shortcut
-                                          (string-append
-                                           (strip-tab label)
-                                           (case (system-type)
-                                             [(unix windows)
-                                              (format "~a~a~a~a~a~a" #\tab
-                                                      (if (memq 'ctl prefix) "Ctrl+" "")
-                                                      (if (memq 'shift prefix) "Shift+" "")
-                                                      (if (memq 'meta prefix) "Meta+" "")
-                                                      (if (memq 'alt prefix) "Alt+" "")
-                                                      (if (symbol? shortcut)
-                                                          (wx:key-symbol-to-menu-key shortcut)
-                                                          (char-name
-                                                           (char-upcase shortcut)
-                                                           #t)))]
-                                             [(macosx)
-                                              (format "\tCut=~a~a"
-                                                      (integer->char
-                                                       (+ (if (memq 'shift prefix) 1 0)
-                                                          (if (memq 'option prefix) 2 0)
-                                                          (if (memq 'ctl prefix) 4 0)
-                                                          (if (memq 'cmd prefix) 0 8)
-                                                          (char->integer #\A)))
-                                                      (if (char? shortcut)
-                                                          (char->integer (char-upcase shortcut))
-                                                          (wx:key-symbol-to-menu-key shortcut)))]))
-                                          (strip-tab label))]
-                           [key-binding (and shortcut
-                                             (let ([base (if (symbol? shortcut)
-                                                             (hash-ref key-code->keymap-name shortcut (lambda () shortcut))
-                                                             (char-name (char-downcase shortcut) #f))]
-                                                   [exact (if (or (symbol? shortcut)
-                                                                  (and (char-alphabetic? shortcut)
-                                                                       ((char->integer shortcut) . < . 128))
-                                                                  (char-numeric? shortcut))
-                                                              ":"
-                                                              "")])
-                                               (case (system-type)
-                                                 [(unix windows) (format "~a~a~a~a?:~a"
-                                                                         exact
-                                                                         (if (memq 'shift prefix) "s:" "")
-                                                                         (if (or (memq 'meta prefix)
-                                                                                 (memq 'alt prefix))
-                                                                             "m:" "~m:")
-                                                                         (if (memq 'ctl prefix) "c:" "")
-                                                                         base)]
-                                                 [(macosx) (format "~a~a~a~a~a?:~a"
-                                                                   exact
-                                                                   (if (memq 'shift prefix) "s:" "")
-                                                                   (if (memq 'cmd prefix) "d:" "")
-                                                                   (if (memq 'ctl prefix) "c:" "")
-                                                                   (if (memq 'option prefix) "a:" "")
-                                                                   base)])))]
-                           [keymap (and key-binding
-                                        (let ([keymap (make-object wx:keymap%)])
-                                          (send keymap add-function "menu-item"
-                                                ;; keymap function callback already in exit mode:
-                                                (lambda (edit event)
-                                                  (if (is-enabled?)
-                                                      (begin
-                                                        (when (this . is-a? . checkable-menu-item%)
-                                                          (begin
-                                                            (send this check (not (send this is-checked?)))))
-                                                        (callback this (make-object wx:control-event% 'menu)))
-                                                      (wx:bell))))
-                                          (send keymap map-function key-binding "menu-item")
-                                          keymap))])
-                      (values new-label keymap)))])
-    (private*
-     [do-set-label (entry-point
-                    (lambda (l)
-                      (check-label-string '(method labelled-menu-item<%> set-label) l)
-                      (let-values ([(new-label keymap) (calc-labels l)])
-                        (set! label (string->immutable-string l))
-                        (super-set-label new-label)
-                        (if (super-is-deleted?)
-                            (send wx set-keymap keymap)
-                            (send wx swap-keymap menu keymap)))))])
-    (override*
-     [get-label (lambda () label)]
-     [set-label (lambda (s) (do-set-label s))])
-    (public*
-     [set-shortcut (lambda (c)
-                     (check-shortcut '(method selectable-menu-item<%> set-shortcut) c)
-                     (unless (equal? shortcut c)
-                       (set! shortcut c)
-                       (do-set-label label)))]
-     [get-shortcut (lambda () shortcut)]
-     [get-shortcut-prefix (lambda () prefix)]
-     [set-shortcut-prefix (lambda (p)
-                            (check-shortcut-prefix '(method selectable-menu-item<%> set-x-shortcut-prefix) p)
-                            (set! prefix p) (do-set-label label))])
-    (set! label (string->immutable-string label))
-    (let-values ([(new-label keymap) (calc-labels label)])
-      (super-make-object menu new-label help-string #f checkable?
-                         keymap (lambda (x) (set! wx x) (set-wx x)) demand-callback
-                         on-pre-delete on-post-restore))))
-
-(define (check-shortcut-args who label menu callback shortcut help-string demand-callback shortcut-prefix)
-  (let ([cwho `(constructor ,who)])
-    (check-label-string cwho label)
-    (menu-parent-only who menu)
-    (check-callback cwho callback)
-    (check-shortcut cwho shortcut)
-    (check-label-string/false cwho help-string)
-    (check-callback1 cwho demand-callback)
-    (check-shortcut-prefix cwho shortcut-prefix)))
-
-(define menu-item%
-  (class basic-selectable-menu-item%
-    (init label parent callback [shortcut #f] [help-string #f] [demand-callback void]
-          [shortcut-prefix default-prefix])
-    (check-shortcut-args 'menu-item label parent callback shortcut help-string demand-callback shortcut-prefix)
-    (super-make-object label #f parent callback shortcut help-string (lambda (x) x) demand-callback shortcut-prefix
-                       void void)))
-
-(define checkable-menu-item%
-  (class basic-selectable-menu-item%
-    (init label parent callback [shortcut #f]
-          [help-string #f] [demand-callback void]
-          [checked #f] [shortcut-prefix default-prefix])
-    (check-shortcut-args 'checkable-menu-item label parent callback shortcut help-string demand-callback shortcut-prefix)
-    (define mnu parent)
-    (define wx #f)
-    (define was-checked? #f)
-    (public*
-     [check (entry-point (lambda (on?) (send (send (mred->wx mnu) get-container) check (send wx id) on?)))]
-     [is-checked? (entry-point (lambda () (send (send (mred->wx mnu) get-container) checked? (send wx id))))])
-    (super-make-object label #t mnu callback shortcut help-string (lambda (x) (set! wx x) x) demand-callback shortcut-prefix
-                       (lambda () (set! was-checked? (is-checked?)))
-                       (lambda () (check was-checked?)))
-    (when checked (check #t))))
-
-(define menu%
-  (class* basic-labelled-menu-item% (menu-item-container<%> internal-menu<%>)
-    (init label parent [help-string #f] [demand-callback void])
-    (define callback demand-callback)
-    (check-label-string '(constructor menu) label)
-    (menu-or-bar-parent 'menu parent)
-    (check-label-string/false '(constructor menu) help-string)
-    (check-callback1 '(constructor menu) demand-callback)
-    (public*
-     [get-items (entry-point (lambda () (send wx-menu get-items)))])
-    (override*
-     [on-demand (lambda ()
-                  (callback this)
-                  (for-each
-                   (lambda (i)
-                     (when (is-a? i labelled-menu-item<%>)
-                       (send i on-demand)))
-                   (send wx-menu get-items)))])
-    (define wx-menu #f)
-    (as-entry
-     (lambda ()
-       (set! wx-menu (make-object wx-menu% this #f void #f))
-       (super-make-object parent label help-string wx-menu #f
-                          (send wx-menu get-keymap) (lambda (x) x) void void void)
-       (let ([wx-item (mred->wx this)])
-         (set-mcdr! (send wx-item get-menu-data) wx-menu) ; for meta-shortcuts
-         (send wx-item set-wx-menu wx-menu))))))
-
-(define menu-bar%
-  (class* mred% (menu-item-container<%>)
-    (init parent [demand-callback void])
-    (unless (or (is-a? parent frame%) (eq? parent 'root))
-      (raise-argument-error (constructor-name 'menu-bar) "(or/c (is-a?/c frame%) 'root)" parent))
-    (check-callback1 '(constructor menu-bar) demand-callback)
-    (if (eq? parent 'root)
-        (unless (current-eventspace-has-menu-root?)
-          (raise-arguments-error (constructor-name 'menu-bar) "no 'root menu bar allowed in the current eventspace"))
-        (when (as-entry (lambda () (send (mred->wx parent) get-the-menu-bar)))
-          (raise-arguments-error (constructor-name 'menu-bar) "given frame already has a menu bar" "given" parent)))
-    (define callback demand-callback)
-    (define prnt
-      (if (eq? parent 'root)
-          (begin
-            (as-entry
-             (lambda ()
-               (when root-menu-frame-used?
-                 (raise-arguments-error (constructor-name 'menu-bar) "given parent already has a menu bar" 
-                                        "given" parent))
-               (set! root-menu-frame-used? #t)))
-            root-menu-frame)
-          parent))
-    (define wx #f)
-    (define wx-parent #f)
-    (define shown? #f)
-    (public*
-     [get-frame (lambda () (if (eq? root-menu-frame prnt) 'root prnt))]
-     [get-items (entry-point (lambda () (send wx get-items)))]
-     [enable (entry-point (lambda (on?) (send wx enable-all on?)))]
-     [is-enabled? (entry-point (lambda () (send wx all-enabled?)))]
-     [on-demand (lambda ()
-                  (callback this)
-                  (for-each
-                   (lambda (i) (send i on-demand))
-                   (send wx get-items)))])
-    (as-entry
-     (lambda ()
-       (set! wx (make-object wx-menu-bar% this))
-       (set! wx-parent (mred->wx prnt))
-       (super-make-object wx)
-       (send wx-parent set-menu-bar wx)
-       (send wx-parent self-redraw-request)))))
-
-(define (menu-parent-only who p)
-  (unless (is-a? p internal-menu<%>)
-    (raise-argument-error (constructor-name who) "(or/c (is-a?/c menu%) (is-a?/c popup-menu%))" p)))
-
-(define (menu-or-bar-parent who p)
-  (unless (or (is-a? p internal-menu<%>) (is-a? p menu-bar%))
-    (unless (is-a? p menu-item-container<%>)
-      (raise-argument-error (constructor-name who) "(is-a?/c menu-item-container<%>)" p))
-    (raise-arguments-error (who->name who) "invalid parent;\n given parent is not an instance of a built-in menu item container class"
-                           "given parent" p)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/mrmenuintf.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/mrmenuintf.rkt
deleted file mode 100644
index 03856ca4bd..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/mrmenuintf.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-(module mrmenuintf mzscheme
-  (require mzlib/class)
-
-  (provide menu-item<%>
-	   labelled-menu-item<%>
-	   submenu-item<%>
-	   menu-item-container<%>
-	   selectable-menu-item<%>)
-
-  (define menu-item<%>
-    (interface ()
-      get-parent
-      delete restore is-deleted?))
-
-  (define labelled-menu-item<%>
-    (interface (menu-item<%>)
-      get-label set-label get-plain-label
-      get-help-string set-help-string
-      enable is-enabled?
-      on-demand))
-
-  (define submenu-item<%>
-    (interface (labelled-menu-item<%>) 
-      get-menu))
-
-  (define selectable-menu-item<%>
-    (interface (labelled-menu-item<%>)
-      command
-      get-shortcut set-shortcut
-      get-shortcut-prefix set-shortcut-prefix))
-  
-  (define menu-item-container<%> 
-    (interface () 
-      get-items on-demand)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/mrpanel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/mrpanel.rkt
deleted file mode 100644
index 6390584923..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/mrpanel.rkt
+++ /dev/null
@@ -1,449 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         (prefix-in wx: "kernel.rkt")
-         "lock.rkt"
-         "const.rkt"
-         "check.rkt"
-         "helper.rkt"
-         "wx.rkt"
-         "wxpanel.rkt"
-         "mrwindow.rkt"
-         "mrcontainer.rkt")
-
-(provide pane%
-         vertical-pane%
-         horizontal-pane%
-         grow-box-spacer-pane%
-         panel%
-         vertical-panel%
-         horizontal-panel%
-         tab-panel%
-         group-box-panel%)
-
-(define-local-member-name get-initial-label)
-
-(define pane%
-  (class (make-subarea% (make-container% area%))
-    (init parent
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (define wx #f)
-    (let* ([who (cond ; yuck! - we do this to make h-p and v-p subclasses of p
-                 [(is-a? this vertical-pane%) 'vertical-pane]
-                 [(is-a? this horizontal-pane%) 'horizontal-pane]
-                 [(is-a? this grow-box-spacer-pane%) 'grow-box-spacer-pane]
-                 [else 'pane])]
-           [cwho `(constructor ,who)])
-      (check-container-parent cwho parent)
-      (as-entry
-       (lambda ()
-         (super-new
-          [mk-wx
-           (lambda ()
-             (set! wx (make-object (case who
-                                     [(vertical-pane) wx-vertical-pane%]
-                                     [(horizontal-pane) wx-horizontal-pane%]
-                                     [(grow-box-spacer-pane) wx-grow-box-pane%]
-                                     [else wx-pane%])
-                                   this this (mred->wx-container parent) null
-                                   #f))
-             wx)]
-          [get-wx-pan (lambda () wx)]
-          [get-outer-wx-pan (lambda () wx)]
-          [mismatches
-           (lambda ()
-             (check-container-ready cwho parent))]
-          [parent parent]
-          [vert-margin vert-margin]
-          [horiz-margin horiz-margin]
-          [border border]
-          [spacing spacing]
-          [alignment alignment]
-          [min-width min-width]
-          [min-height min-height]
-          [stretchable-width stretchable-width]
-          [stretchable-height stretchable-height])
-         (send (send wx area-parent) add-child wx)))
-      (send parent after-new-child this))))
-
-(define vertical-pane%
-  (class pane%
-    (init parent
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (super-new [parent parent]
-               [vert-margin vert-margin]
-               [horiz-margin horiz-margin]
-               [border border]
-               [spacing spacing]
-               [alignment alignment]
-               [min-width min-width]
-               [min-height min-height]
-               [stretchable-width stretchable-width]
-               [stretchable-height stretchable-height])))
-
-(define horizontal-pane%
-  (class pane%
-    (init parent
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (super-new [parent parent]
-               [vert-margin vert-margin]
-               [horiz-margin horiz-margin]
-               [border border]
-               [spacing spacing]
-               [alignment alignment]
-               [min-width min-width]
-               [min-height min-height]
-               [stretchable-width stretchable-width]
-               [stretchable-height stretchable-height])))
-
-(define grow-box-spacer-pane%
-  (class pane%
-    (init parent
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (super-new [parent parent]
-               [vert-margin vert-margin]
-               [horiz-margin horiz-margin]
-               [border border]
-               [spacing spacing]
-               [alignment alignment]
-               [min-width min-width]
-               [min-height min-height]
-               [stretchable-width stretchable-width]
-               [stretchable-height stretchable-height])))
-
-(define panel%
-  (class* (make-subwindow%
-           (make-area-container-window%
-            (make-window% #f (make-subarea% (make-container% area%)))))
-    (subwindow<%>)
-    (init parent [style null]
-          ;; These additional init args are for the superclass
-          ;; initializations and are needed to make sure the user can supply
-          ;; these init args. They were originally handled by a class100 kw
-          ;; macro. They're handed to super-instantiate below.
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (define wx #f)
-    (public* [get-initial-label (lambda () #f)])
-    (let* ([who (cond ; yuck! - we do this to make h-p and v-p subclasses of p
-                 [(is-a? this tab-panel%) 'tab-panel]
-                 [(is-a? this group-box-panel%) 'group-box-panel]
-                 [(is-a? this vertical-panel%) 'vertical-panel]
-                 [(is-a? this horizontal-panel%) 'horizontal-panel]
-                 [else 'panel])]
-           [cwho `(constructor ,who)]
-           [can-canvas? (memq who '(vertical-panel
-                                    horizontal-panel
-                                    panel))]
-           [as-canvas? (lambda () (or (memq 'vscroll style)
-                                      (memq 'auto-vscroll style)
-                                      (memq 'hscroll style)
-                                      (memq 'auto-hscroll style)))])
-      (check-container-parent cwho parent)
-      (check-style cwho #f (append '(border deleted)
-                                   (if can-canvas?
-                                       '(hscroll vscroll auto-hscroll auto-vscroll)
-                                       null))
-                   style)
-      (as-entry
-       (lambda ()
-         (super-instantiate
-          ((lambda () (set! wx (make-object (case who
-                                              [(vertical-panel)
-                                               (if (as-canvas?)
-                                                   wx-vertical-canvas-panel%
-                                                   wx-vertical-panel%)]
-                                              [(tab-panel) wx-vertical-tab-panel%]
-                                              [(group-box-panel) wx-vertical-group-panel%]
-                                              [(horizontal-panel)
-                                               (if (as-canvas?)
-                                                   wx-horizontal-canvas-panel%
-                                                   wx-horizontal-panel%)]
-                                              [else (if (as-canvas?)
-                                                        wx-canvas-panel%
-                                                        wx-panel%)])
-                                            this this (mred->wx-container parent)
-                                            (cons 'transparent style)
-                                            (get-initial-label)))
-                   wx)
-           (lambda () wx)
-           (lambda () wx)
-           (lambda () (check-container-ready cwho parent))
-           #f parent #f)
-          [enabled enabled]
-          [vert-margin vert-margin]
-          [horiz-margin horiz-margin]
-          [border border]
-          [spacing spacing]
-          [alignment alignment]
-          [min-width min-width]
-          [min-height min-height]
-          [stretchable-width stretchable-width]
-          [stretchable-height stretchable-height])
-         (unless (memq 'deleted style)
-           (send (send wx area-parent) add-child wx))))
-      (send parent after-new-child this))))
-
-(define vertical-panel%
-  (class panel%
-    (init parent [style null] 
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (super-new [parent parent]
-               [style style]
-               [enabled enabled]
-               [vert-margin vert-margin]
-               [horiz-margin horiz-margin]
-               [border border]
-               [spacing spacing]
-               [alignment alignment]
-               [min-width min-width]
-               [min-height min-height]
-               [stretchable-width stretchable-width]
-               [stretchable-height stretchable-height])
-    (public* [set-orientation (λ (x) (send (mred->wx this) set-orientation x))]
-             [get-orientation (λ () (send (mred->wx this) get-orientation))])))
-(define horizontal-panel%
-  (class panel%
-    (init parent [style null] 
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (super-new [parent parent]
-               [style style]
-               [enabled enabled]
-               [vert-margin vert-margin]
-               [horiz-margin horiz-margin]
-               [border border]
-               [spacing spacing]
-               [alignment alignment]
-               [min-width min-width]
-               [min-height min-height]
-               [stretchable-width stretchable-width]
-               [stretchable-height stretchable-height])
-    (public* [set-orientation (λ (x) (send (mred->wx this) set-orientation x))]
-             [get-orientation (λ () (send (mred->wx this) get-orientation))])))
-
-(define list-append append)
-
-(define tab-panel%
-  (class vertical-panel%
-    (init choices parent [callback (lambda (b e) (void))] [style null] [font no-val]
-          ;; inherited inits
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (define save-choices choices)
-    (override* [get-initial-label (lambda () save-choices)])
-
-    (let ([cwho '(constructor tab-panel)])
-      (unless (and (list? choices) (andmap label-string? choices))
-        (raise-argument-error (who->name cwho) "label-string?" choices))
-      (check-callback cwho callback)
-      (check-container-parent cwho parent)
-      (check-style cwho #f '(deleted no-border) style)
-      (check-font cwho font))
-    (super-new [parent parent]
-               [style
-                (if (memq 'no-border style)
-                    (if (eq? (car style) 'no-border)
-                        (cdr style)
-                        (list (car style)))
-                    (cons 'border style))]
-               [enabled enabled]
-               [vert-margin vert-margin]
-               [horiz-margin horiz-margin]
-               [border border]
-               [spacing spacing]
-               [alignment alignment]
-               [min-width min-width]
-               [min-height min-height]
-               [stretchable-width stretchable-width]
-               [stretchable-height stretchable-height])
-    (send (mred->wx this) set-callback (lambda (wx e) (callback (wx->mred wx) e)))
-
-    (public*
-     [get-number (lambda () (length save-choices))]
-     [append (entry-point
-              (lambda (n)
-                (check-label-string '(method tab-panel% append) n)
-                (let ([n (string->immutable-string n)])
-                  (set! save-choices (list-append save-choices (list n)))
-                  (send (mred->wx this) append n))))]
-     [get-selection (lambda () (and (pair? save-choices)
-                                    (send (mred->wx this) get-selection)))]
-     [set-selection (entry-point
-                     (lambda (i)
-                       (check-item 'set-selection i)
-                       (send (mred->wx this) set-selection i)))]
-     [delete (entry-point
-              (lambda (i)
-                (check-item 'delete i)
-                (set! save-choices (let loop ([p 0][l save-choices])
-                                     (if (= p i)
-                                         (cdr l)
-                                         (cons (car l) (loop (add1 p) (cdr l))))))
-                (send (mred->wx this) delete i)))]
-     [set-item-label (entry-point
-                      (lambda (i s)
-                        (check-item 'set-item-label i)
-                        (check-label-string '(method tab-panel% set-item-label) s)
-                        (let ([s (string->immutable-string s)])
-                          (set! save-choices (let loop ([save-choices save-choices][i i])
-                                               (if (zero? i)
-                                                   (cons s (cdr save-choices))
-                                                   (cons (car save-choices) (loop (cdr save-choices) (sub1 i))))))
-                          (send (mred->wx this) set-label i s))))]
-     [set
-      (entry-point (lambda (l)
-                     (unless (and (list? l) (andmap label-string? l))
-                       (raise-argument-error (who->name '(method tab-panel% set))
-                                             "(listof label-string?)" l))
-                     (set! save-choices (map string->immutable-string l))
-                     (send (mred->wx this) set l)))]
-     [get-item-label (entry-point
-                      (lambda (i)
-                        (check-item 'get-item-label i)
-                        (list-ref save-choices i)))])
-
-    (private*
-     [check-item
-      (lambda (method n)
-        (check-non-negative-integer `(method tab-panel% ,method) n)
-        (let ([m (length save-choices)])
-          (unless (< n m)
-            (raise-range-error (who->name `(method tab-panel% ,method))
-                               "panel" "tab "
-                               n
-                               this
-                               0
-                               (sub1 m)
-                               #f))))])))
-
-(define group-box-panel%
-  (class vertical-panel%
-    (init label parent [style null] [font no-val]
-          ;; This is a vestige of the class100 keyword handling macro
-          ;; that was used. Since `horiz-margin` and `vert-margin` are
-          ;; used below, we have to supply it here (even though it's
-          ;; handled by the subarea init args)
-          [enabled #t]
-          [vert-margin no-val]
-          [horiz-margin no-val]
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (init-rest)
-    (define lbl label)
-    (override* [get-initial-label (lambda () lbl)])
-
-    (let ([cwho '(constructor group-box-panel)])
-      (check-label-string cwho label)
-      (check-container-parent cwho parent)
-      (check-style cwho #f '(deleted) style)
-      (check-font cwho font))
-
-    ;; Technically a bad way to change margin defaults, since it's
-    ;;  implemented with an update after creation:
-    (when (eq? horiz-margin no-val) (set! horiz-margin 2))
-    (when (eq? vert-margin no-val) (set! vert-margin 2))
-
-    (super-instantiate
-     (parent
-      (if (memq 'deleted style)
-          '(deleted)
-          null))
-     [enabled enabled]
-     [horiz-margin horiz-margin]
-     [vert-margin vert-margin]
-     [border border]
-     [spacing spacing]
-     [alignment alignment]
-     [min-width min-width]
-     [min-height min-height]
-     [stretchable-width stretchable-width]
-     [stretchable-height stretchable-height])
-
-    (override*
-     [set-label (entry-point
-                 (lambda (s)
-                   (check-label-string '(method group-box-panel% set-label) s)
-                   (set! lbl (if (immutable? s)
-                                 s
-                                 (string->immutable-string s)))
-                   (send (mred->wx this) set-label s)))]
-     [get-label (lambda () lbl)])))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/mrpopup.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/mrpopup.rkt
deleted file mode 100644
index 820e2741cc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/mrpopup.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/list
-         (prefix-in wx: "kernel.rkt")
-         (prefix-in wx: (only-in "wxme/cycle.rkt" set-popup-menu%!))
-         "lock.rkt"
-         "const.rkt"
-         "helper.rkt"
-         "check.rkt"
-         "wx.rkt"
-         "wxmenu.rkt"
-         "mrmenuintf.rkt")
-
-(provide popup-menu%)
-
-(define popup-menu%
-  (class* mred% (menu-item-container<%> internal-menu<%>)
-    (init [title #f][popdown-callback void][demand-callback void][font no-val])
-    (define callback demand-callback)
-    (public*
-     [get-popup-target
-      (lambda ()
-        (send wx get-popup-grabber))]
-     [get-items (entry-point (lambda () (send wx get-items)))]
-     [on-demand (lambda ()
-                  (callback this)
-                  (for-each
-                   (lambda (i)
-                     (when (is-a? i labelled-menu-item<%>)
-                       (send i on-demand)))
-                   (send wx get-items)))]
-     [set-min-width (lambda (n)
-                      (check-dimension '(method popup-menu% set-min-width) n)
-                      (send wx set-width n))]
-     [get-font (lambda ()
-                 (send wx get-font))])
-    (define wx #f)
-    (let ([cwho '(constructor popup-menu)])
-      (check-label-string/false cwho title)
-      (check-callback cwho popdown-callback)
-      (check-callback1 cwho demand-callback)
-      (check-font cwho font))
-    (as-entry
-     (lambda ()
-       (set! wx (make-object wx-menu% this title
-                             (lambda (mwx e)
-                               (let ([go
-                                      (lambda ()
-                                        (let ([wx (wx:id-to-menu-item (send e get-menu-id))])
-                                          (when wx
-                                            (send (wx->mred wx) command (make-object wx:control-event% 'menu)))
-                                          (dynamic-wind
-                                            void
-                                            (lambda ()
-                                              (popdown-callback this (make-object wx:control-event%
-                                                                                  (if wx
-                                                                                      'menu-popdown
-                                                                                      'menu-popdown-none))))
-                                            (lambda () (send mwx popup-release)))))])
-                                 (if (eq? 'windows (system-type))
-                                     (wx:queue-callback go wx:middle-queue-key)
-                                     (go))))
-                             (no-val->#f font)))
-       (super-make-object wx)))))
-
-(wx:set-popup-menu%! popup-menu%)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/mrtextfield.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/mrtextfield.rkt
deleted file mode 100644
index b49b2b8dc6..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/mrtextfield.rkt
+++ /dev/null
@@ -1,185 +0,0 @@
-(module mrtextfield racket/base
-  (require racket/class
-           racket/list
-           (prefix-in wx: "kernel.rkt")
-           "lock.rkt"
-           "const.rkt"
-           "check.rkt"
-           "helper.rkt"
-           "wx.rkt"
-           "wxtextfield.rkt"
-           "mrcontainer.rkt"
-           "mritem.rkt"
-           "mrmenu.rkt"
-           "mrpopup.rkt")
-
-  (provide text-field%
-           combo-field%)
-
-  (define combo-flag (gensym))
-
-  (define (check-text-field-args cwho
-				 label
-				 choices? choices
-				 parent
-				 callback
-				 init-value
-				 style req-styles
-				 font)
-    (check-label-string/false cwho label)
-    (when choices?
-      (unless (and (list? choices) (andmap label-string? choices))
-	(raise-argument-error (who->name cwho) "(listof label-string?)" choices)))
-    (check-container-parent cwho parent)
-    (check-callback cwho callback)
-    (check-string cwho init-value)
-    (check-style cwho 
-		 req-styles 
-		 (append
-		  (if choices? null '(hscroll password))
-		  '(vertical-label horizontal-label deleted))
-		 (remq combo-flag style))
-    (check-font cwho font))
-
-  (define text-field%
-    (class basic-control%
-      (init label parent [callback (lambda (b e) (void))] [init-value ""] [style '(single)]
-            ;; These are needed to ensure the order of init
-            ;; args is correct (we pass them to the superclass below)
-            ;; and so that this class can check the inits below.
-            [font no-val]
-            [enabled #t]
-            [vert-margin no-val]
-            [horiz-margin no-val]
-            [min-width no-val]
-            [min-height no-val]
-            [stretchable-width no-val]
-            [stretchable-height no-val])
-      (init-rest)
-      (check-text-field-args '(constructor text-field)
-                             label 
-                             #f #f
-                             parent callback init-value
-                             style '(single multiple)
-                             font)
-      (define wx #f)
-      (public*
-       [set-field-background (lambda (c)
-                               (check-instance '(method text-field% set-field-color) 
-                                               wx:color% 'color% #f c)
-                               (send wx set-field-background c))]
-       [get-field-background (lambda () (send wx get-field-background))]
-       [get-editor (entry-point (lambda () (send wx get-editor)))]
-       [get-value (lambda () (send wx get-value))] ; note: wx method doesn't expect as-entry
-       [set-value (entry-point 
-                   (lambda (v) 
-                     (check-string '(method text-field% set-value) v)
-                     (send wx set-value v)))])
-      ;; Technically a bad way to change margin defaults, since it's
-      ;;  implemented with an update after creation:
-      (when (eq? horiz-margin no-val) (set! horiz-margin 2))
-      (when (eq? vert-margin no-val) (set! vert-margin 2))
-      (as-entry
-       (lambda ()
-         (super-new
-          [mk-wx
-           (lambda ()
-            (set! wx (make-object wx-text-field% this this
-                                  (mred->wx-container parent) (wrap-callback callback)
-                                  label init-value
-                                  (if (memq combo-flag style)
-                                      (cons 'combo (remq combo-flag style))
-                                      style)
-                                  (no-val->#f font)))
-            wx)]
-          [mismatches
-           (lambda ()
-            (let ([cwho '(constructor text-field)])
-              (check-container-ready cwho parent)))]
-          [lbl label]
-          [parent parent]
-          [cb callback]
-          [cursor ibeam]
-          [font font]
-          [enabled enabled]
-          [vert-margin vert-margin]
-          [horiz-margin horiz-margin]
-          [min-width min-width]
-          [min-height min-height]
-          [stretchable-width stretchable-width]
-          [stretchable-height stretchable-height])))))
-
-  (define combo-field%
-    (class text-field%
-      (init label choices parent [callback (lambda (b e) (void))] [init-value ""] [style '()]
-            ;; this is handled by a superclass, but we put it here due to the check below
-            [font no-val]
-            [enabled #t]
-            [vert-margin no-val]
-            [horiz-margin no-val]
-            [min-width no-val]
-            [min-height no-val]
-            [stretchable-width no-val]
-            [stretchable-height no-val])
-      (init-rest)
-      (inherit set-value popup-menu get-size focus get-editor)
-      (check-text-field-args '(constructor combo-field)
-                             label 
-                             #f choices
-                             parent callback init-value
-                             style #f 
-                             font)
-      (private*
-       [prep-popup
-        (lambda ()
-          (send menu on-demand)
-          (let ([items (send menu get-items)]
-                [wx (mred->wx this)])
-            (send wx clear-combo-items)
-            (for-each 
-             (lambda (item)
-               (unless (item . is-a? . separator-menu-item%)
-                 (send wx append-combo-item
-                       (send item get-plain-label)
-                       (lambda ()
-                         (send item command 
-                               (make-object wx:control-event% 'menu-popdown))))))
-             items)))])
-      (public*
-       [on-popup (lambda (e) (void))]
-       [get-menu (lambda () menu)]
-       [append (lambda (item)
-                 (check-label-string '(method combo-field% append) item)
-                 (make-object menu-item% item menu 
-                              (lambda (i e)
-                                (handle-selected item))))])
-      (private*
-       [handle-selected (lambda (item)
-                          (focus)
-                          (set-value item)
-                          (let ([e (get-editor)])
-                            (send e set-position 0 (send e last-position)))
-                          (send (as-entry (lambda () (mred->wx this)))
-                                command
-                                (make-object wx:control-event% 'text-field)))])
-      (define menu (new popup-menu% [font font]))
-      (super-new [label label]
-                 [parent parent]
-                 [callback callback]
-                 [init-value init-value]
-                 [style (list* combo-flag 'single style)]
-                 [font font]
-                 [enabled enabled]
-                 [horiz-margin horiz-margin]
-                 [vert-margin vert-margin]
-                 [min-width min-width]
-                 [min-height min-height]
-                 [stretchable-width stretchable-width]
-                 [stretchable-height stretchable-height])
-      (send (mred->wx this) 
-            set-on-popup
-            (lambda ()
-              (on-popup (make-object wx:control-event% 'menu-popdown))
-              (prep-popup)))
-      (for-each (lambda (item) (append item))
-                choices))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/mrtop.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/mrtop.rkt
deleted file mode 100644
index 140827380e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/mrtop.rkt
+++ /dev/null
@@ -1,355 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/list
-         (prefix-in wx: "kernel.rkt")
-         "lock.rkt"
-         "helper.rkt"
-         "const.rkt"
-         "check.rkt"
-         "wx.rkt"
-         "wxtop.rkt"
-         "wxpanel.rkt"
-         "wxitem.rkt"
-         "mrwindow.rkt"
-         "mrcontainer.rkt"
-         "app.rkt")
-
-(provide top-level-window<%>
-         frame%
-         dialog%
-         (protect-out root-menu-frame)
-         get-top-level-windows
-         get-top-level-focus-window
-         get-top-level-edit-target-window
-         send-message-to-window
-         (protect-out check-top-level-parent/false
-                      check-frame-parent/false))
-
-(define top-level-window<%>
-  (interface (area-container-window<%>)
-    get-eventspace
-    on-activate on-traverse-char on-system-menu-char
-    can-close? on-close
-    can-exit? on-exit
-    get-focus-window get-edit-target-window
-    get-focus-object get-edit-target-object
-    center move resize
-    on-message
-    display-changed))
-
-(define-local-member-name
-  do-create-status-line
-  do-set-status-text)
-
-(define basic-top-level-window%
-  (class* (make-area-container-window% (make-window% #t (make-container% area%))) (top-level-window<%>)
-    (init mk-wx mismatches label parent)
-    (init-rest)
-    (inherit show)
-    (rename-super [super-set-label set-label])
-    (private*
-     [wx-object->proxy
-      (lambda (o)
-        (if (is-a? o wx:window%)
-            (wx->proxy o)
-            o))])
-    (override*
-     [set-label (entry-point
-                 (lambda (l)
-                   (check-label-string/false '(method top-level-window<%> set-label) l)
-                   (send wx set-title (or l ""))
-                   (super-set-label l)))])
-    (public*
-     [on-traverse-char (entry-point
-                        (lambda (e)
-                          (check-instance '(method top-level-window<%> on-traverse-char)
-                                          wx:key-event% 'key-event% #f e)
-                          (send wx handle-traverse-key e)))]
-     [on-system-menu-char (entry-point
-                           (lambda (e)
-                             (check-instance '(method top-level-window<%> on-system-menu-char)
-                                             wx:key-event% 'key-event% #f e)
-                             (and (eq? #\space (send e get-key-code))
-                                  (send e get-meta-down)
-                                  (eq? 'windows (system-type))
-                                  (send wx system-menu) #t)))]
-     [get-eventspace (entry-point (lambda () (send wx get-eventspace)))])
-    (pubment*
-     [can-close? (lambda () (inner #t can-close?))]
-     [on-close (lambda () (inner (void) on-close))]
-     [display-changed (λ () (inner (void) display-changed))])
-    (public*
-     [can-exit? (lambda () (can-close?))]
-     [on-exit (lambda () (on-close) (show #f))]
-     [on-activate (lambda (x) (void))]
-     [set-icon (case-lambda
-                 [(i) (send wx set-icon i)]
-                 [(i b) (send wx set-icon i b)]
-                 [(i b l?) (send wx set-icon i b l?)])]
-     [center (entry-point
-              (case-lambda
-                [() (send wx center 'both)]
-                [(dir) (send wx center dir)]))]
-     [move (entry-point
-            (lambda (x y)
-              (check-position '(method top-level-window<%> move) x)
-              (check-position '(method top-level-window<%> move) y)
-              (send wx move x y)))]
-     [resize (entry-point
-              (lambda (w h)
-                (check-dimension '(method top-level-window<%> resize) w)
-                (check-dimension '(method top-level-window<%> resize) h)
-                (send wx set-size #f #f w h)))]
-
-     [get-focus-window (entry-point
-                        (lambda () (let ([w (send wx get-focus-window)])
-                                     (and w (wx->proxy w)))))]
-     [get-edit-target-window (entry-point
-                              (lambda () (let ([w (send wx get-edit-target-window)])
-                                           (and w (wx->proxy w)))))]
-     [get-focus-object (entry-point
-                        (lambda () (let ([o (send wx get-focus-object)])
-                                     (and o (wx-object->proxy o)))))]
-     [get-edit-target-object (entry-point
-                              (lambda () (let ([o (send wx get-edit-target-object)])
-                                           (and o (wx-object->proxy o)))))]
-
-     [on-message (lambda (m) (void))])
-    (define wx #f)
-    (define mid-panel #f) ;; supports status line
-    (define wx-panel #f)
-    (define status-message #f)
-    (define finish (entry-point
-                    (lambda (top-level hide-panel?)
-                      (set! mid-panel (make-object wx-vertical-panel% #f this top-level null #f))
-                      (send mid-panel skip-subwindow-events? #t)
-		      (send mid-panel skip-enter-leave-events #t)
-                      (send (send mid-panel area-parent) add-child mid-panel)
-                      (set! wx-panel (make-object wx-vertical-panel% #f this mid-panel null #f))
-                      (send wx-panel skip-subwindow-events? #t)
-		      (send wx-panel skip-enter-leave-events #t)
-                      (send (send wx-panel area-parent) add-child wx-panel)
-                      (send top-level set-container wx-panel)
-                      (when hide-panel?
-                        (send mid-panel show #f))
-                      top-level)))
-    (public*
-     [do-create-status-line (lambda ()
-                              (unless status-message
-                                (set! status-message (make-object wx-message% this this mid-panel "" -1 -1 null #f))
-                                (send status-message stretchable-in-x #t)))]
-     [do-set-status-text (lambda (s)
-                           (when status-message
-                             (send status-message set-label s)))])
-    (override*
-     [get-client-handle (lambda () (send wx-panel get-client-handle))])
-    (super-make-object (lambda () (set! wx (mk-wx finish)) wx)
-                       (lambda () wx-panel) (lambda () mid-panel)
-                       mismatches label parent arrow-cursor)))
-
-
-(define frame%
-  (class basic-top-level-window%
-    (init label [parent #f] [width #f] [height #f] [x #f] [y #f] [style null]
-          ;; for inherited keywords
-          [enabled #t]
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (inherit on-traverse-char on-system-menu-char
-             do-create-status-line do-set-status-text)
-    (let ([cwho '(constructor frame)])
-      (check-label-string cwho label)
-      (check-frame-parent/false cwho parent)
-      (check-init-dimension cwho width)
-      (check-init-dimension cwho height)
-      (check-init-position cwho x)
-      (check-init-position cwho y)
-      (check-style cwho #f '(no-resize-border no-caption no-system-menu
-                                              toolbar-button hide-menu-bar float metal
-                                              fullscreen-button fullscreen-aux)
-                   style))
-    (rename-super [super-on-subwindow-char on-subwindow-char])
-    (define wx #f)
-    (define status-line? #f)
-    (define modified? #f)
-    (override*
-     [on-subwindow-char (lambda (w event)
-                          (super-on-subwindow-char w event)
-                          (or (on-menu-char event)
-                              (on-system-menu-char event)
-                              (on-traverse-char event)))])
-    (public*
-     [on-menu-char (entry-point
-                    (lambda (e)
-                      (check-instance '(method frame% on-menu-char) wx:key-event% 'key-event% #f e)
-                      (send wx handle-menu-key e)))]
-     [on-toolbar-button-click (lambda () (void))]
-     [create-status-line (entry-point (lambda () (unless status-line? (do-create-status-line) (set! status-line? #t))))]
-     [set-status-text (lambda (s) (do-set-status-text s))]
-     [has-status-line? (lambda () status-line?)]
-     [iconize (entry-point (lambda (on?) (send wx iconize on?)))]
-     [is-iconized? (entry-point (lambda () (send wx iconized?)))]
-     [maximize (entry-point (lambda (on?) (send wx position-for-initial-show) (send wx maximize on?)))]
-     [is-maximized? (entry-point (lambda () (send wx is-maximized?)))]
-     [fullscreen (entry-point (lambda (on?) (send wx fullscreen on?)))]
-     [is-fullscreened? (entry-point (lambda () (send wx fullscreened?)))]
-     [get-menu-bar (entry-point (lambda () (let ([mb (send wx get-the-menu-bar)])
-                                             (and mb (wx->mred mb)))))]
-     [modified (entry-point
-                (case-lambda
-                  [() modified?]
-                  [(m)
-                   (set! modified? m)
-                   (send wx set-modified m)]))])
-    (as-entry
-     (lambda ()
-       (super-new
-        [mk-wx
-         (lambda (finish)
-           (set! wx (finish (make-object wx-frame% this this
-                                         (and parent (mred->wx parent)) label
-                                         x y ; each can be #f
-                                         (or width -1) (or height -1)
-                                         style)
-                            #f))
-           (send wx set-mdi-parent #f)
-           wx)]
-        [mismatches
-         (lambda ()
-           (let ([cwho '(constructor frame)])
-             (check-container-ready cwho parent)))]
-        [label label]
-        [parent parent]
-        ;; for inherited inits
-        [enabled enabled]
-        [border border]
-        [spacing spacing]
-        [alignment alignment]
-        [min-width min-width]
-        [min-height min-height]
-        [stretchable-width stretchable-width]
-        [stretchable-height stretchable-height])))))
-
-(define dialog%
-  (class basic-top-level-window%
-    (init label [parent #f] [width #f] [height #f] [x #f] [y #f] [style null]
-          ;; for inherited keywords
-          [enabled #t]
-          [border no-val]
-          [spacing no-val]
-          [alignment no-val]
-          [min-width no-val]
-          [min-height no-val]
-          [stretchable-width no-val]
-          [stretchable-height no-val])
-    (inherit on-traverse-char on-system-menu-char center)
-    (let ([cwho '(constructor dialog)])
-      (check-label-string cwho label)
-      (check-top-level-parent/false cwho parent)
-      (check-init-position cwho x)
-      (check-init-position cwho y)
-      (check-init-dimension cwho width)
-      (check-init-dimension cwho height)
-      (check-style cwho #f '(no-caption resize-border no-sheet close-button) style))
-    (rename-super [super-on-subwindow-char on-subwindow-char])
-    (define wx #f)
-    (public*
-     [show-without-yield (lambda ()
-                           (as-entry
-                            (lambda ()
-                              (send wx call-show #t (lambda () (send wx show-without-yield))))))])
-    (override*
-     [on-subwindow-char (lambda (w event)
-                          (super-on-subwindow-char w event)
-                          (or (on-system-menu-char event)
-                              (on-traverse-char event)))])
-    (as-entry
-     (lambda ()
-       (super-new
-        [mk-wx
-         (lambda (finish)
-           (set! wx (finish (make-object wx-dialog% this this
-                                         (and parent (mred->wx parent)) label
-                                         x y ; each can be #f
-                                         (or width 0) (or height 0)
-                                         style)
-                            #f))
-           wx)]
-        [mismatches
-         (lambda ()
-           (let ([cwho '(constructor dialog)])
-             (check-container-ready cwho parent)))]
-        [label label]
-        [parent parent]
-        ;; for inherited inits
-        [enabled enabled]
-        [border border]
-        [spacing spacing]
-        [alignment alignment]
-        [min-width min-width]
-        [min-height min-height]
-        [stretchable-width stretchable-width]
-        [stretchable-height stretchable-height])))))
-
-(define (get-top-level-windows)
-  (remq root-menu-frame (map wx->mred (wx:get-top-level-windows))))
-
-(define (get-top-level-focus-window)
-  (ormap (lambda (f) (and (send f is-act-on?)
-                          (let ([f (wx->mred f)])
-                            (and f
-                                 (not (eq? f root-menu-frame))
-                                 f))))
-         (wx:get-top-level-windows)))
-
-(define (get-top-level-edit-target-window)
-  (let loop ([l (wx:get-top-level-windows)][f #f][s 0][ms 0])
-    (if (null? l)
-        f
-        (let* ([f2 (car l)]
-               [f2m (wx->mred f2)]
-               [s2 (send f2 get-act-date/seconds)]
-               [ms2 (send f2 get-act-date/milliseconds)])
-          (if (and (or (not f)
-                       (> s2 s)
-                       (and (= s2 s) (> ms2 ms)))
-                   (not (eq? f2m root-menu-frame)))
-              (loop (cdr l) f2m s2 ms2)
-              (loop (cdr l) f s ms))))))
-
-(define (send-message-to-window x y m)
-  (check-position 'send-message-to-window x)
-  (check-position 'send-message-to-window y)
-  (let ([w (wx:location->window x y)])
-    (and w (let ([f (wx->proxy w)])
-             (and f
-                  (not (eq? f root-menu-frame))
-                  (send f on-message m))))))
-
-(define (check-top-level-parent/false who p)
-  (unless (or (not p) (is-a? p frame%) (is-a? p dialog%))
-    (raise-argument-error (who->name who) "(or/c (is-a?/c frame%) (is-a?/c dialog%) #f)" p)))
-
-(define (check-frame-parent/false who p)
-  (unless (or (not p) (is-a? p frame%))
-    (raise-argument-error (who->name who) "(or/c (is-a?/c frame%) #f)" p)))
-
-(define root-menu-frame
-  (and (current-eventspace-has-menu-root?)
-       ;; The very first frame shown is somehow sticky under Cocoa,
-       ;;  so create the root frame, show it , and hide it.
-       (let* ([f (make-object (class frame%
-                                (define/override (on-exit)
-                                  (exit))
-                                (super-make-object "Root" #f 0 0 -9000 -9000
-                                                   '(no-resize-border no-caption))))]
-              [wx (mred->wx f)])
-         (set-root-menu-wx-frame! wx)
-         (send wx designate-root-frame)
-         f)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/mrwindow.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/mrwindow.rkt
deleted file mode 100644
index bd5727520c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/mrwindow.rkt
+++ /dev/null
@@ -1,238 +0,0 @@
-(module mrwindow racket/base
-  (require racket/class
-           (prefix-in wx: "kernel.rkt")
-           "lock.rkt"
-           "helper.rkt"
-           "const.rkt"
-           "check.rkt"
-           "wx.rkt"
-           "wxwindow.rkt"
-           "mrpopup.rkt")
-
-  (provide area<%>
-           area%
-           (protect-out internal-subarea<%>)
-           subarea<%>
-           (protect-out make-subarea%)
-           window<%>
-           subwindow<%>
-           (protect-out make-window%)
-           
-           (protect-out set-get-outer-panel
-                        set-parent))
-
-  (define area<%>
-    (interface ()
-      get-parent get-top-level-window
-      min-width min-height
-      get-graphical-min-size
-      stretchable-width stretchable-height))
-
-  (define-local-member-name
-    set-get-outer-panel
-    set-parent)
-
-  (define area%
-    (class* mred% (area<%>)
-      (init mk-wx get-wx-pan get-outer-wx-pan mismatches prnt
-            ;; for keyword use:
-            [min-width no-val]
-            [min-height no-val]
-            [stretchable-width no-val]
-            [stretchable-height no-val])
-      (let ([cwho '(iconstructor area)])
-        (unless (eq? min-width no-val) (check-init-dimension cwho min-width))
-        (unless (eq? min-height no-val) (check-init-dimension cwho min-height)))
-      (mismatches)
-      (define get-wx-outer-panel get-outer-wx-pan)
-      (define parent prnt)
-      (public [minw min-width]
-              [minh min-height]
-              [sw stretchable-width]
-              [sh stretchable-height])
-      (define minw (param get-wx-outer-panel min-width))
-      (define minh (param get-wx-outer-panel min-height))
-      (define sw (param get-wx-outer-panel stretchable-in-x))
-      (define sh (param get-wx-outer-panel stretchable-in-y))
-      (public*
-       [set-parent (lambda (p) (set! parent p))] ; called in atomic mode
-       [get-parent (lambda () parent)]
-       [get-top-level-window (entry-point (lambda () (wx->mred (send wx get-top-level))))]
-       [get-graphical-min-size (entry-point (lambda () 
-                                              (if (wx . is-a? . wx-basic-panel<%>)
-                                                  (apply values (send wx get-graphical-min-size))
-                                                  (send wx get-hard-minimum-size))))])
-      (define wx (mk-wx))
-      (super-make-object wx)
-      (unless (eq? min-width no-val) (when min-width (minw min-width)))
-      (unless (eq? min-height no-val) (when min-height (minh min-height)))
-      (unless (eq? stretchable-width no-val) (sw stretchable-width))
-      (unless (eq? stretchable-height no-val) (sh stretchable-height))))
-
-  (define internal-subarea<%> (interface ()))
-
-  (define subarea<%> 
-    (interface (area<%> internal-subarea<%>)
-      horiz-margin vert-margin))
-
-  (define (make-subarea% %) ; % implements area<%>
-    (class* % (subarea<%>)
-      (init mk-wx get-wx-pan get-outer-wx-pan mismatches parent
-            ;; for keyword use
-            [horiz-margin no-val]
-            [vert-margin no-val])
-      (let ([cwho '(iconstructor subarea)])
-        (unless (eq? horiz-margin no-val) (check-margin-integer cwho horiz-margin))
-        (unless (eq? vert-margin no-val) (check-margin-integer cwho vert-margin)))
-      (define get-wx-panel get-wx-pan)
-      (define hm (param get-wx-panel x-margin))
-      (define vm (param get-wx-panel y-margin))
-      (public [hm horiz-margin]
-              [vm vert-margin])
-      (super-make-object mk-wx get-wx-panel get-outer-wx-pan mismatches parent)
-      (unless (eq? horiz-margin no-val) (hm horiz-margin))
-      (unless (eq? vert-margin no-val) (vm vert-margin))))
-
-  (define window<%>
-    (interface (area<%>)
-      on-focus focus has-focus?
-      on-size on-move
-      accept-drop-files on-drop-file
-      on-subwindow-char on-subwindow-event
-      client->screen screen->client
-      enable is-enabled? on-superwindow-enable
-      get-label set-label get-plain-label
-      get-client-size get-size get-width get-height get-x get-y
-      get-cursor set-cursor popup-menu
-      show is-shown? on-superwindow-show refresh
-      warp-pointer
-      get-handle get-client-handle))
-
-  (define subwindow<%> 
-    (interface (window<%> subarea<%>)
-      reparent))
-
-  (define (make-window% top? %) ; % implements area<%>
-    (class* % (window<%>)
-      (init mk-wx get-wx-panel get-outer-wx-panel mismatches lbl parent crsr
-            ;; for keyword use
-            [enabled #t])
-      (define label lbl)
-      (define cursor crsr)
-      (public*
-       [popup-menu (entry-point 
-                    (lambda (m x y)
-                      (check-instance '(method window<%> popup-menu) popup-menu% 'popup-menu% #f m)
-                      (check-position '(method window<%> popup-menu) x)
-                      (check-position '(method window<%> popup-menu) y)
-                      (let ([mwx (mred->wx m)])
-                        (and (send mwx popup-grab this)
-                             (as-exit
-                              (lambda ()
-                                (send m on-demand)
-                                (send wx popup-menu mwx x y)))))))]
-       [on-focus (lambda (x) (void))]
-       [on-subwindow-focus (lambda (win active?) (void))]
-       [on-size (lambda (w h)
-                  (check-dimension '(method window<%> on-size) w)
-                  (check-dimension '(method window<%> on-size) h))]
-       [on-move (lambda (x y)
-                  (check-position '(method window<%> on-move) x)
-                  (check-position '(method window<%> on-move) y))]
-       [on-subwindow-char (lambda (w e)
-                            (check-instance '(method window<%> on-subwindow-char) window<%> 'window<%> #f w)
-                            (check-instance '(method window<%> on-subwindow-char) wx:key-event% 'key-event% #f e)
-                            #f)]
-       [on-subwindow-event (lambda (w e)
-                             (check-instance '(method window<%> on-subwindow-event) window<%> 'window<%> #f w)
-                             (check-instance '(method window<%> on-subwindow-event) wx:mouse-event% 'mouse-event% #f e)
-                             #f)]
-       [on-drop-file (lambda (s)
-                       (unless (path-string? s)
-                         (raise-argument-error (who->name '(method window<%> on-drop-file)) "path-string?" s)))]
-
-       [focus (entry-point (lambda () (send wx set-focus)))]
-       [has-focus? (entry-point (lambda () (send wx has-focus?)))]
-       [enable (entry-point (lambda (on?) (send wx enable on?)))]
-       [is-enabled? (entry-point (lambda () (send wx is-enabled?)))]
-	
-       [get-label (lambda () label)]
-       [set-label (lambda (l)
-                    (check-label-string/false '(method window<%> set-label) l)
-                    (set! label (if (string? l)
-                                    (string->immutable-string l)
-                                    l)))]
-       [get-plain-label (lambda () (and (string? label) (wx:label->plain-label label)))]
-
-       [get-handle (lambda () (send wx get-handle))]
-       [get-client-handle (lambda () (send wx get-client-handle))]
-
-       [accept-drop-files
-        (entry-point
-         (case-lambda
-	   [() (send wx accept-drag?)]
-	   [(on?) (send wx drag-accept-files on?)]))]
-	
-       [client->screen (entry-point
-                        (lambda (x y)
-                          (check-position '(method window<%> client->screen) x)
-                          (check-position '(method window<%> client->screen) y)
-                          (double-boxed
-                           x y
-                           (lambda (x y) (send wx client-to-screen x y)))))]
-       [screen->client (entry-point
-                        (lambda (x y)
-                          (check-position '(method window<%> screen->client) x)
-                          (check-position '(method window<%> screen->client) y)
-                          (double-boxed
-                           x y
-                           (lambda (x y) (send wx screen-to-client x y)))))]
-       [get-client-size (entry-point
-                         (lambda ()
-                           (double-boxed
-                            0 0
-                            (lambda (x y) (send wx get-client-size x y)))))]
-       [get-size (entry-point
-                  (lambda ()
-                    (double-boxed
-                     0 0
-                     (lambda (x y) (send wx get-size x y)))))]
-	
-       [get-width (entry-point (lambda () (send wx get-width)))]
-       [get-height (entry-point (lambda () (send wx get-height)))]
-       [get-x (entry-point (lambda () (- (send wx get-x) (if top? 0 (send (send wx get-parent) ext-dx)))))]
-       [get-y (entry-point (lambda () (- (send wx get-y) (if top? 0 (send (send wx get-parent) ext-dy)))))]
-	
-       [get-cursor (lambda () cursor)]
-       [set-cursor (entry-point
-                    (lambda (x)
-                      (unless (or (not x) (x . is-a? . wx:cursor%))
-                        (raise-argument-error (who->name '(method window<%> set-cursor))
-                                              "(or/c (is-a?/c cursor%) #f)"
-                                              x))
-                      (send wx set-cursor x)
-                      (set! cursor x)))]
-
-       [show (entry-point (lambda (on?) 
-                            (when on?
-                              (unless top?
-                                (unless (memq wx (send (send wx area-parent) get-children))
-                                  (raise-arguments-error 
-                                   (who->name '(method window<%> show))
-                                   "cannot show a subwindow that is not active in its parent"
-                                   "subwindow" this))))
-                            (send wx show on?)))]
-       [is-shown? (entry-point (lambda () (send wx is-shown?)))]
-       [on-superwindow-show (lambda (visible?) (void))]
-       [on-superwindow-enable (lambda (active?) (void))]
-
-       [refresh (entry-point (lambda () (send wx refresh)))]
-       
-       [warp-pointer (entry-point (lambda (x y) 
-                                    (let ([who '(method window<%> warp-pointer)])
-                                      (check-init-position who x)
-                                      (check-init-position who y))
-                                    (send wx warp-pointer x y)))])
-      (define wx #f)
-      (super-make-object (lambda () (set! wx (mk-wx)) wx) get-wx-panel get-outer-wx-panel mismatches parent)
-      (unless enabled (enable #f)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/path-dialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/path-dialog.rkt
deleted file mode 100644
index 4e16e856e8..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/path-dialog.rkt
+++ /dev/null
@@ -1,806 +0,0 @@
-(module path-dialog mzscheme
-  (require mzlib/class mzlib/list mzlib/string mzlib/file
-           (prefix wx: "kernel.rkt")
-           (prefix wx: racket/snip/private/style)
-           racket/snip/private/prefs
-           "helper.rkt" "mrtop.rkt" "mritem.rkt" "mrpanel.rkt"
-           "mrtextfield.rkt" "messagebox.rkt" "mrmenu.rkt"
-           (only racket/base compose1))
-  (provide path-dialog%)
-
-  (define last-visted-directory #f)
-
-  (define path-up-delta
-    (let ([d (make-object wx:style-delta%)])
-      (send d set-delta-foreground "BLUE")
-      (send d set-delta 'change-underline #t)
-      d))
-
-  ;; os-dependent stuff
-  (define win? (eq? 'windows (system-type)))
-  (define path-separator        (if win? "\\" "/"))
-  (define path-separator-rx-str (if win? "/\\" "/"))
-  (define (make-rx . strs)
-    (let ([l (map (lambda (s) (if (eq? / s) path-separator-rx-str s)) strs)])
-      (regexp (apply string-append l))))
-  (define end-separators-rx    (make-rx "["/"]+$"))
-  (define initial-/dir-part-rx (make-rx "^["/"]*([^"/"]+)"))
-  (define initial-dir/-part-rx (make-rx "^.*?["/"]"))
-  (define isfilter-rx #rx"[*?]")
-
-  (define default-filters (if win? '(("Any" "*.*")) '(("Any" "*"))))
-
-  (define (expand-path* p)
-    (if (equal? "" p)
-      p
-      ;; expand-user-path throws an exception on bad usernames
-      (with-handlers ([exn:fail:filesystem? (lambda (e) p)])
-        (expand-user-path p))))
-
-  (define simplify-path*
-    (if win?
-      (lambda (p . more)
-        (apply simplify-path (regexp-replace*
-                              #rx"/" (if (path? p) (path->string p) p) "\\\\")
-               more))
-      (lambda (p . more)
-        (apply simplify-path (expand-path* p) more))))
-
-  (define directory-exists*? (compose1 directory-exists? expand-path*))
-  (define file-exists*?      (compose1 file-exists? expand-path*))
-  (define absolute-path*?    (compose1 absolute-path? expand-path*))
-
-  (define (build-path* dir path)
-    (cond [(absolute-path*? path) (if (string? path) (string->path path) path)]
-          [(equal? "" path)       (if (string? dir)  (string->path dir)  dir)]
-          [else (build-path dir path)]))
-
-  ;; returns a list of a glob-regexp-list and another one without hiding dots
-  (define (glob->2regexps glob)
-    (let ([globs (remove* '("") (regexp-split #rx" *; *" glob))])
-      (map (lambda (hide-dots?)
-             (map (lambda (glob) (glob->regexp glob hide-dots?)) globs))
-           '(#t #f))))
-
-  (define-struct pname (path string isdir? okstring? nulstring))
-  (define (path->pname path isdir?)
-    (let* ([name (if (member (path->string path) '("." ".."))
-                   (path->string path) ; avoid errors
-                   (path-element->string path))]
-           [name (regexp-replace end-separators-rx name "")]
-           [name (if (<= 199 (string-length name))
-                   (string-append (substring name 0 195) "...")
-                   name)]
-           [name/ (if isdir? (string-append name path-separator) name)]
-           [goodstr?  (equal? path (string->path name))]
-           [no-globs? (not (regexp-match-positions isfilter-rx name))])
-      (make-pname path name/ (and isdir? #t) ; must be a strict boolean
-                  ;; most paths are `ok' strings, the ones that are not are
-                  ;; * paths where the string name does not correspond to the
-                  ;;   path, eg, a sequence of bytes that interprets badly when
-                  ;;   using UTF-8
-                  ;; * paths that are about 200 characters or longer (the
-                  ;;   displayed name must be truncated) (part of the above)
-                  ;; * paths that have an initial "~" in them (also part of the
-                  ;;   above)
-                  ;; * paths that contain `*' and `?', since they will be
-                  ;;   considered as filters
-                  ;; in these cases, the string is shown in the path-list gui,
-                  ;; but cannot be entered in the filename field
-                  (and goodstr? no-globs?)
-                  ;; nulstring is usually the same as string, except when
-                  ;; okstring? is #f -- in this case bad characters will be
-                  ;; "\0"s instead of "?"s, globbing chars are also turned to
-                  ;; "\0"s -- useful for completion, marking the place where
-                  ;; things become untextual
-                  ;; (note: use "\u01" due to a bug with "\0" for error char)
-                  (let* ([bad #\u01]
-                         [nulstr (if goodstr?
-                                   name/
-                                   (let ([s (bytes->string/locale
-                                             (path->bytes path) bad)])
-                                     (if isdir?
-                                       (string-append s path-separator)
-                                       s)))]
-                         [nulstr (if no-globs?
-                                   nulstr
-                                   (regexp-replace* isfilter-rx nulstr
-                                                    (string bad)))])
-                    nulstr))))
-  (define up-dir-pname (path->pname (string->path "..") #t))
-  ;; compare two pnames, use the strings according to the locael, dirs come 1st
-  (define (pname<? p1 p2)
-    (let ([d1 (pname-isdir? p1)] [d2 (pname-isdir? p2)])
-      (if (eq? d1 d2)
-        (string-locale<? (pname-string p1) (pname-string p2))
-        d1))) ; directories come first
-
-  (define (prefix? s1 s2 . proper?)
-    (and ((if (and (pair? proper?) (car proper?)) < <=)
-          (string-length s1) (string-length s2))
-         (do ([i (sub1 (string-length s1)) (sub1 i)])
-             [(or (< i 0) (not (eq? (string-ref s1 i) (string-ref s2 i))))
-              (< i 0)])))
-
-  ;; find a completion for str in the strs list
-  ;; * no strings   => #f
-  ;; * single match => (cons matching-string #f)
-  ;; * else         => (cons matching-prefix alternatives)
-  ;; the first elt of a cons is often longer that the input string
-  (define (find-completion str strs)
-    (let ([strs (filter (lambda (p) (prefix? str p)) strs)])
-      (cond [(null? strs) #f]
-            [(null? (cdr strs)) (cons (car strs) #f)]
-            [else (let ([m (apply min (map string-length strs))])
-                    (do ([i (string-length str) (add1 i)])
-                        [(or (>= i m)
-                             (not (let ([ch (string-ref (car strs) i)])
-                                    (andmap (lambda (s)
-                                              (eq? ch (string-ref s i)))
-                                            (cdr strs)))))
-                         (cons (substring (car strs) 0 i) strs)]))])))
-  ;; like the above, but removes a suffix that indicates nonstring stuff
-  (define (find-completion* str strs)
-    (let ([r (find-completion str strs)])
-      (and r (cons (regexp-replace #rx"\u01.*$" (car r) "") (cdr r)))))
-
-  ;; ==========================================================================
-  (define path-dialog%
-    (class dialog%
-      ;; ----------------------------------------------------------------------
-      ;; Arguments & Variables
-      (init [label      #f]   ; dialog title
-            [message    #f]   ; message at the top of the dialog
-            [parent     #f]   ; parent frame
-            [directory  #f]   ; initial directory
-            [filename   #f]   ; initial text for the input box
-            [put?       #f]   ; selecting a new path?
-            [dir?       #f]   ; are we selecting a directory?
-            [existing?  (not put?)] ; must select an existing path?
-            [new?       #f]   ; must select a new path?
-            [multi?     #f]   ; selecting multiple paths?
-            [can-mkdir? put?] ; is there a create-directory button?
-            ;; (list-of (list filter-name filter-glob))
-            ;; can use multiple globs with ";" separators
-            ;; #f => disable, #t => use default
-            [filters #t]
-            ;; predicates that are used to filter paths that are shown -- they
-            ;; are applied on the file/dir name (as a string) while
-            ;; current-directory is set; intended to be lightweight
-            [show-file? #f]   ; a predicate for listing a file
-            [show-dir?  #f]   ; a predicate for listing a directory
-            ;; this predicate is used like the previous two, but it is used to
-            ;; check if the "OK" button should be enabled or not; it is used
-            ;; for both files and directories
-            [ok? #f]
-            ;; a verifier for the final result -- it will receive the result
-            ;; that is about to be returned, and can return a different value
-            ;; (any value) instead; if it throws an exception, an error dialog
-            ;; is shown, and the dialog interaction continues (so it can be
-            ;; used to verify results without dismissing the menu); it can also
-            ;; throw a `(void)' value and the interaction continues but without
-            ;; an error message
-            [guard #f]
-            )
-
-      (cond [(eq? filters #t) (set! filters default-filters)]
-            [(null? filters)  (set! filters #f)])
-
-      (when (and new? existing?)
-        (error 'path-dialog% "cannot use `new?' with `existing?'"))
-
-      (when dir?
-        (if show-file?
-          (error 'path-dialog% "cannot use `show-file?' with `dir?'")
-          (set! show-file? (lambda (_) #f)))
-        (when filters (error 'path-dialog% "cannot use `filters' with `dir?'")))
-
-      (unless label
-        (set! label (if dir?
-                      (if put? "Select New Directory" "Select Directory")
-                      (if put? "Save File" "Open File"))))
-
-      (define size
-        (let ([s (get-preference* 'mred:path-dialog:size (lambda () #f))])
-          (or (and (list? s) (= 2 (length s)) (andmap integer? s) s)
-              '(300 300))))
-
-      (super-new [label label] [parent parent]
-                 [width (car size)] [height (cadr size)]
-                 [style '(resize-border)])
-
-      (define result #f)
-      (define dir    #f)
-      (define pnames '())
-      (define pnames-nulstrings '()) ; cache nulstrings of pnames
-
-      ;; ----------------------------------------------------------------------
-      ;; Utilities
-
-      (define (return r)
-        (set! result (let loop ([r r])
-                       (cond [(list? r) (map loop r)]
-                             [(path? r) r]
-                             [(string? r) (string->path r)]
-                             [(not r) r]
-                             [else (error-popup "internal error!")])))
-        (when (or (not r)    ; when returning something
-                  multi?     ; single
-                  (not put?) ; and we're in put? mode
-                  (not (or (file-exists*? r) ; and it exists
-                           (directory-exists*? r)))
-                  ;; then ask about continuing
-                  (eq? 'yes (message-box "Warning"
-                                         (format "Replace \"~a\"?" r)
-                                         this '(yes-no))))
-          (with-handlers ([exn? (lambda (e) (error-popup (exn-message e)))]
-                          [void? (lambda (e) #t)]) ; no error, and no return
-            (when guard (set! result (guard result)))
-            (send this show #f))))
-
-      (define (error-popup fmt . args)
-        (message-box (string-append label ": error") (apply format fmt args)
-                     this '(stop ok)))
-
-      (define (root? path)
-        (let-values ([(base name dir?) (split-path path)]) (eq? base #f)))
-
-      (define (name+dir path)
-        (let*-values ([(path) (if (path? path) path (string->path path))]
-                      [(path) (build-path* dir path)]
-                      [(base name dir?) (split-path path)])
-          (values (if dir? "" (path->string name))
-                  (path->string (if dir? path base)))))
-
-      ;; returns a list of strings, dirs first, all with a "/" suffix
-      (define (sorted-dirlist dir)
-        (define dotted? (send show-dotted get-value))
-        (parameterize ([current-directory dir])
-          (let loop ([paths (with-handlers ([void (lambda (x) '())])
-                              (directory-list))]
-                     [pnames '()])
-            (if (null? paths)
-              (let ([ps (sort pnames pname<?)])
-                (if (root? dir) ps (cons up-dir-pname ps)))
-              (let* ([path   (car paths)]
-                     [paths  (cdr paths)]
-                     [isdir? (directory-exists*? path)]
-                     [pname  (path->pname path isdir?)]
-                     [name   (pname-string pname)])
-                (loop paths
-                      (cond [(and (not dotted?)
-                                  ;; globs used for no-dots in files
-                                  (or (not globs) isdir?)
-                                  (eq? #\. (string-ref name 0)))
-                             pnames]
-                            [(if isdir?
-                               (or (not show-dir?) (show-dir? name))
-                               (and (or (not globs)
-                                        (ormap (lambda (glob)
-                                                 (regexp-match-positions
-                                                  glob name))
-                                               ((if dotted? cadr car)
-                                                globs)))
-                                    (or (not show-file?)
-                                        (show-file? name))))
-                             (cons pname pnames)]
-                            [else pnames])))))))
-
-      ;; ----------------------------------------------------------------------
-      ;; GUI Utilities & Handlers
-
-      ;; may be set if there is a value that is non-textual (a pname entry
-      ;; without an okstring, a directly clicked path)
-      (define nonstring-path #f)
-
-      (define set-path-list-pnames
-        (case-lambda
-          [() (set-path-list-pnames pnames)]
-          [(pnames)
-           (send path-list set (map pname-string pnames))
-           (let loop ([pnames pnames] [i 0])
-             (unless (null? pnames)
-               (send path-list set-data i (car pnames))
-               (loop (cdr pnames) (add1 i))))]))
-
-      (define (set-dir newdir)
-        (wx:begin-busy-cursor)
-        (set! dir (simplify-path* newdir))
-        ;; get a list of upward paths, display it with clickbacks
-        (let* ([sep (cons path-separator #f)]
-               [items ; a list of (cons name path)
-                (let loop ([dir dir] [r '()])
-                  (let-values ([(base name _) (split-path dir)])
-                    (let ([n (cons (path->string name) dir)])
-                      (if (path? base)
-                        (loop base (list* n sep r))
-                        (cons n r)))))]
-               [edit (send dir-text get-editor)])
-          (send dir-text unlock)
-          (send dir-text set-value (apply string-append (map car items)))
-          (let loop ([i 0] [items items])
-            (unless (null? items)
-              (let ([j (+ i (string-length (caar items)))])
-                (when (cdar items)
-                  (unless (zero? i) (send edit change-style path-up-delta i j))
-                  (send edit set-clickback i
-                        (if (zero? i) j (add1 j)) ; inclucde the sep
-                        (lambda _ (enter-text (cdar items)) (do-enter))))
-                (loop j (cdr items)))))
-          (send dir-text lock))
-        (clear-path-list-state)
-        (if (directory-exists*? dir)
-          (begin (set! pnames (sorted-dirlist dir))
-                 (set! pnames-nulstrings (map pname-nulstring pnames))
-                 (set-path-list-pnames)
-                 (send path-list enable #t))
-          (begin (set! pnames '())
-                 (set! pnames-nulstrings '())
-                 (send path-list set (list "Bad Directory:" (path->string dir)))
-                 (send path-list enable #f)))
-        (wx:end-busy-cursor))
-
-      (define (is-ok? path isdir? isfile?)
-        (let* ([exists? (or isfile? isdir?)]
-               [exists-ok? (if dir? isdir? isfile?)])
-          (and (cond [new? (not exists?)]
-                     [existing? exists-ok?]
-                     [put? (not isdir?)] ; maybe want to overwrite
-                     [else #t])
-               (or (not ok?) (ok? path)))))
-
-      (define (set-ok?)
-        ;; deal with button enabling/disabling etc
-        (define-values (value path)
-          (if nonstring-path
-            (values (path->string nonstring-path) nonstring-path)
-            (let ([val (send text get-value)])
-              (values val (build-path* dir val)))))
-        (let* ([empty? (equal? "" value)]
-               [selections (send path-list get-selections)])
-          ;; turn off other selections if there is a value
-          (when (and multi? (not empty?))
-            (let ([on? (if nonstring-path
-                         (lambda (i)
-                           (equal? nonstring-path
-                                   (pname-path (send path-list get-data i))))
-                         (lambda (i)
-                           (let ([s (send path-list get-string i)])
-                             (and (prefix? value s) ; optimize: save on replaces
-                                  (equal? value (regexp-replace
-                                                 end-separators-rx s ""))))))])
-            (for-each (lambda (i) (send path-list select i (on? i)))
-                      selections))
-            (set! selections (send path-list get-selections)))
-          (let* ([seln    (length selections)]
-                 [isdir?  (directory-exists*? path)]
-                 [isfile? (file-exists*? path)]
-                 [choose? (and dir? empty? (= 0 seln))]
-                 [go?     (and isdir? (not empty?) (<= seln 1))])
-            ;; set ok-button label
-            (send ok-button set-label
-                  (cond [choose? "Choose"]
-                        [go?     "Go"]
-                        [else    "OK"]))
-            (when create-button
-              (send create-button enable
-                    (not (or isdir? isfile? empty? (<= 1 seln)))))
-            ;; decide if the ok-button is enabled
-            (send ok-button enable
-              (or choose? go?
-                  (parameterize ([current-directory dir])
-                    (if (<= seln 1)
-                      (is-ok? (if empty? "." value) isdir? isfile?)
-                      (andmap (lambda (i)
-                                (let ([s (send path-list get-string i)])
-                                  (is-ok?
-                                   s (directory-exists*? s) (file-exists*? s))))
-                              selections))))))))
-
-      (define (new-selected-paths)
-        (let ([sel (send path-list get-selections)])
-          (when (and multi? (not dir?) (pair? sel) (pair? (cdr sel)))
-            ;; make sure no dirs are chosen when files are
-            (let ([dirs (filter (lambda (i)
-                                  (pname-isdir? (send path-list get-data i)))
-                                sel)])
-              (unless (and (equal? dirs sel) (= 1 (length dirs)))
-                (for-each (lambda (i) (send path-list select i #f))
-                          dirs)
-                (set! sel (remq* dirs sel)))))
-          (cond [(and (pair? sel) (null? (cdr sel)))
-                 (let* ([pname (send path-list get-data (car sel))]
-                        [new (cond [(not (pname-okstring? pname))
-                                    (pname-path pname)]
-                                   [(pname-isdir? pname)
-                                    (regexp-replace end-separators-rx
-                                                    (pname-string pname) "")]
-                                   [else (pname-string pname)])])
-                   (enter-text new enter-text-no-focus?))]
-                [multi? (enter-text "" enter-text-no-focus?)])))
-      ;; uncomment the following to keep the focus on the text
-      ;;   (`multi?' is problematic on Windows since it needs the focus for the
-      ;;   mouse wheel to move)
-      (define enter-text-no-focus? #t) ; (or win? multi?))
-
-      (define (create-directory path) ; return #f on failure
-        (with-handlers ([void (lambda (exn)
-                                (error-popup (exn-message exn))
-                                #f)])
-          (let loop ([path path])
-            (parameterize ([current-directory dir])
-              (let-values ([(base file dir?) (split-path path)])
-                (and (or (memq base '(#f relative)) ; root or here
-                         (directory-exists*? base)  ; or has base
-                         (create-directory base))   ; or made base
-                     (begin (make-directory* path) #t))))))) ; => create
-
-      (define (do-enter*)
-        (let ([t (send text get-value)])
-          (if (and file-filter (regexp-match isfilter-rx t))
-            (begin (send text set-value "") (set-filter t))
-            (do-enter))))
-      (define (do-enter)
-        (set-ok?)
-        (when (send ok-button is-enabled?)
-          (let* ([sel0 (if nonstring-path
-                         (path->string nonstring-path)
-                         (send text get-value))]
-                 [sel  (regexp-replace end-separators-rx sel0 "")]
-                 [/?   (not (equal? sel0 sel))]
-                 [sel/ (string-append sel path-separator)]
-                 [path (build-path* dir (or nonstring-path sel))]
-                 [isfile? (and (not /?) (file-exists*? path))]
-                 [isdir?  (directory-exists*? path)]
-                 [selections (send path-list get-selections)]
-                 [many?   (and multi? (equal? "" sel)
-                               (<= 1 (length selections)))])
-            (cond [(and isdir? (not (equal? "" sel0)))
-                   ;; chose a directory -- go there
-                   (set-dir path) (send* text* (erase) (select-all)) (set-ok?)]
-                  [(and /? isfile?)
-                   (error-popup "bad input: '~a' is a file" sel)]
-                  [(and /? (not isdir?))
-                   (error-popup "bad input: no '~a' directory~a" sel
-                                (if create-button
-                                  " (use the NewDir button)" ""))]
-                  [many? (return (map (lambda (i)
-                                        (let ([s (send path-list get-data i)])
-                                          (build-path* dir (pname-path s))))
-                                      selections))]
-                  [multi? (return (list path))]
-                  [else (return path)]))))
-
-      (define (enter-text str . no-focus?)
-        ;; str can actually be a path if selected an entry with a non-okstring,
-        ;; or a path that is set directly (eg, from the top path navigation
-        ;; thing)
-        (set! nonstring-path (and (path? str) str))
-        (send text set-value (if nonstring-path "" str))
-        (reset-last-text-state)
-        (unless (and (pair? no-focus?) (car no-focus?)) (send text focus))
-        (send text* select-all)
-        (set-ok?))
-
-      (define multi?? multi?) ; so it's accessible below
-      (define/override (on-subwindow-char r e)
-        (define key (send e get-key-code))
-        (when (eq? r text) (text-callback key)) ; make `text' aware of all keys
-        (cond [(and (eq? r text) (memq key '(up down)))
-               ;; divert up/down in text to the path-list control
-               ;; (must reimplement all list-box% functionality??)
-               (let ([i (send path-list get-selection)]
-                     [n (send path-list get-number)])
-                 (case key
-                   [(down)
-                    (let ([i (if i (min (add1 i) (sub1 n)) 0)]
-                          [v (sub1 (send path-list number-of-visible-items))])
-                      (send path-list set-selection i)
-                      (when (> (- i v) (send path-list get-first-visible-item))
-                        (send path-list set-first-visible-item (- i v))))]
-                   [(up)
-                    (let ([i (if i (max (sub1 i) 0) 0)])
-                      (send path-list set-selection i)
-                      (when (< i (send path-list get-first-visible-item))
-                        (send path-list set-first-visible-item i)))])
-                 (new-selected-paths)
-                 (when multi?? (send path-list focus))
-                 #t)]
-              ;; return is usually the same all over except for the path widget
-              [(memq key '(#\return numpad-enter))
-               (cond [(eq? r dir-text)
-                      (let ([edit (send r get-editor)])
-                        (send edit call-clickback
-                              (send edit get-start-position)
-                              (send edit get-end-position)))]
-                     [(eq? r file-filter) (set-filter #f)]
-                     [else (do-enter*)])
-               #t]
-              [else (super on-subwindow-char r e)]))
-
-      ;; remember size
-      (define/override (on-size width height)
-        (let ([new (list width height)])
-          (unless (equal? new size)
-            (set! size new)
-            (put-preferences* '(mred:path-dialog:size) (list size)))))
-
-      ;;-----------------------------------------------------------------------
-      ;; Delayed Filename Completion
-
-      (define last-text-value "")
-      (define last-text-start 0)
-      (define last-text-end   0)
-      (define last-text-completed? #f) ; is the last region a completion?
-      (define completion-disabled? #f) ; are we allowed to insert completions?
-
-      (define (reset-last-text-state)
-        (set! last-text-value "")
-        (set! last-text-start 0)
-        (set! last-text-end   0)
-        (set! last-text-completed? #f))
-
-      (define (text-callback . key)
-        (send completion-timer wait)
-        (let* ([value   (send text get-value)]
-               [len     (string-length value)]
-               [start   (send text* get-start-position)]
-               [end     (send text* get-end-position)]
-               [change? (not (equal? value last-text-value))])
-          (define (set-state!)
-            (set! last-text-value value)
-            (set! last-text-start start)
-            (set! last-text-end   end)
-            (set! last-text-completed? #f)
-            (set! completion-disabled? #f))
-          (set! nonstring-path #f)
-          (when change?
-            ;; if entered an existing directory, go there
-            (let loop ()
-              (let ([m (regexp-match-positions initial-dir/-part-rx value)])
-                (when m
-                  (let* ([pfx (substring value 0 (cdar m))]
-                         [pfx (build-path* dir pfx)])
-                    (when (directory-exists*? pfx)
-                      (set-dir pfx)
-                      (reset-last-text-state)
-                      (set! value (substring value (cdar m)))
-                      (set! start (string-length value))
-                      (set! end   start)
-                      (set! change? #t)
-                      (send text set-value value)
-                      (send text* set-position start end #f #f 'local)
-                      (loop)))))))
-          (cond [;; a b c|D E F|
-                 ;; a b c d|     => typed a character from completed text
-                 (and last-text-completed?
-                      (= len start end)
-                      (<= last-text-start len last-text-end)
-                      (prefix? value last-text-value #t))
-                 ;; in some situations this is called with the same text before
-                 ;; the new character is inserted -- do nothing in that case,
-                 ;; not even set-ok?
-                 (when (< last-text-start len last-text-end)
-                   (send completion-timer stop)
-                   ;; => shrink the completed part
-                   (send text set-value last-text-value)
-                   (send text* set-position start last-text-end #f #f 'local)
-                   (set! last-text-start start))
-                 (set! change? #f)]
-                [;; a b c d
-                 ;; a b c   => backspaced some text
-                 (and (= start end len) (prefix? value last-text-value #t))
-                 ;; filter as usual, but disallow completion text
-                 ;;   (otherwise it will pop up again, annoyingly)
-                 (send completion-timer reset)
-                 (set-state!)
-                 (set! completion-disabled? #t)]
-                [;; a b c
-                 ;; any...| => typed some new text
-                 (and (= start end len) change?)
-                 (send completion-timer reset)
-                 (set-state!)]
-                [;; something else changed? => stopped completing
-                 (not (and (= last-text-start start)
-                           (= last-text-end   end)
-                           (not change?)))
-                 (set-state!)]
-                [;; hit right at end of text and no change
-                 (and (= len start end) (pair? key) (eq? 'right (car key)))
-                 (send completion-timer fire)]
-                ;; otherwise there is no change and nothing to do
-                )
-          (when change? (set-ok?))))
-
-      ;; Use the path-list for completion options
-      (define saved-path-list-state #f)
-      (define (clear-path-list-state)
-        (set! saved-path-list-state #f))
-      (define (save-path-list-state)
-        (unless saved-path-list-state
-          (set! saved-path-list-state
-                (list (send path-list get-first-visible-item)
-                      (send path-list get-selections)))))
-      (define (restore-path-list-state)
-        (when saved-path-list-state
-          (set-path-list-pnames)
-          (for-each (lambda (i) (send path-list select i))
-                    (cadr saved-path-list-state))
-          (send path-list
-                set-first-visible-item (car saved-path-list-state))
-          (set! saved-path-list-state #f)))
-
-      ;; Timer for delaying completion
-      (define completion-timer
-        (new (class wx:timer% (super-new)
-               (define delay 400)
-               (define running? #f)
-               (define/override (start)
-                 (set! running? #t)
-                 (super start delay #t))
-               (define/override (stop)
-                 (set! running? #f)
-                 (super stop))
-               (define/public (reset)
-                 (when running? (send this stop))
-                 (start))
-               (define/public (wait) ; delay if running
-                 (when running? (reset)))
-               (define/public (fire)
-                 (stop)
-                 (notify))
-               (define/override (notify)
-                 (set! running? #f)
-                 (let* ([new (send text get-value)]
-                        [found (and (not (equal? "" new))
-                                    (find-completion* new pnames-nulstrings))]
-                        [temp-paths? #f])
-                   (when found
-                     (let* ([options (cdr found)]
-                            [found   (regexp-replace
-                                      end-separators-rx (car found) "")]
-                            [start   (string-length new)]
-                            [end     (string-length found)])
-                       (when options
-                         (save-path-list-state)
-                         (set-path-list-pnames
-                          (filter (lambda (p)
-                                    (member (pname-nulstring p) options))
-                                  pnames))
-                         (set! temp-paths? #t))
-                       (unless (or completion-disabled? (= start end))
-                         (send text set-value found)
-                         (send text* set-position start end #f #f 'local)
-                         (set! last-text-value found)
-                         (set! last-text-start start)
-                         (set! last-text-end   end)
-                         (set! last-text-completed? #t)))
-                     (set-ok?))
-                   (unless temp-paths? (restore-path-list-state)))))))
-
-      ;; ----------------------------------------------------------------------
-      ;; GUI Construction
-
-      (when message
-        (let ([p (make-object vertical-pane% this)])
-          (send p stretchable-height #f)
-          (make-object message% (protect& message) p)))
-
-      (define dir-text
-        (let* ([c%
-                (if win?
-                    (class combo-field%
-                      (super-new [choices '()])
-                      (define/override (on-popup e)
-                        (let ([m (send this get-menu)])
-                          (for-each (lambda (i) (send i delete))
-                                    (send m get-items))
-                          (for-each (lambda (r)
-                                      (define l (path->string r))
-                                      (make-object menu-item% l m
-                                                   (lambda _
-                                                     (enter-text r)
-                                                     (do-enter))))
-                                    (filesystem-root-list)))))
-                    text-field%)]
-               [c (class c%
-                    (super-new)
-                    (define editor (send this get-editor))
-                    (define/public (lock)   (send editor lock #t))
-                    (define/public (unlock) (send editor lock #f))
-                    (lock))])
-          (new c [label #f] [parent this] [init-value ""])))
-
-      (define path-list
-        (new (class list-box%
-               ;; make sure that if the focus is here, the text is synced
-               ;; (questionable behavior)
-               (define/override (on-focus on?) (when on? (new-selected-paths)))
-               (super-new))
-             [parent this] [label #f] [choices '()]
-             [min-height 100] [stretchable-width #t] [stretchable-height #t]
-             [style (if multi? '(multiple) '(single))]
-             [callback (lambda (t e)
-                         (case (send e get-event-type)
-                           [(list-box) (new-selected-paths)]
-                           [(list-box-dclick) (do-enter)]))]))
-
-      (define text
-        (new text-field% [parent this] [label "Filename:"]
-          [init-value (cond [(path? filename) (path->string filename)]
-                            [(string? filename) filename]
-                            [else ""])]
-          [callback (lambda (t e)
-                      (if (eq? (send e get-event-type) 'text-field-enter)
-                        (do-enter*) (text-callback)))]))
-      (define text* (send text get-editor))
-      (send text* select-all)
-
-      (define last-set-glob (and filters (cadar filters)))
-      (define globs         (and filters (glob->2regexps last-set-glob)))
-      (define (set-filter new . keep-focus?)
-        (when new (send file-filter set-value new))
-        (let ([filt (or new (send file-filter get-value))])
-          (unless (equal? last-set-glob filt)
-            (set! last-set-glob filt)
-            (set! globs (and (not (equal? "" filt)) (glob->2regexps filt)))
-            (set-dir dir))
-          (unless (and (pair? keep-focus?) (car keep-focus?))
-            (send text focus))))
-      (define file-filter
-        (and filters
-             (let* ([c (new (class combo-field% (super-new)
-                              (define/override (on-focus on?)
-                                (unless on? (set-filter #f #t))))
-                            [parent this] [label "Filter:"]
-                            [choices '()] [callback void]
-                            [init-value (cadar filters)])]
-                    [m (send c get-menu)])
-               (for-each (lambda (f)
-                           (make-object menu-item% (apply format "~a (~a)" f) m
-                                        (lambda _ (set-filter (cadr f)))))
-                         filters)
-               c)))
-
-      (define bp1
-        (new horizontal-pane% [parent this] [stretchable-height #f]
-             [alignment '(left center)]))
-      (define show-dotted
-        (new check-box% [parent bp1]
-          [label "Show files/directories that start with \".\""]
-          [callback (lambda (b e) (set-dir dir))]))
-      (make-object vertical-pane% bp1) ; spacer
-      (define create-button
-        (and can-mkdir?
-             (make-object button% "NewDir" bp1
-               (lambda (b e)
-                 (let ([path (simplify-path* (send text get-value) #f)])
-                   (and (create-directory path)
-                        (do-enter)))))))
-
-      (define bp2
-        (new horizontal-pane% [parent this] [stretchable-height #f]
-             [alignment '(right center)]))
-      (define cancel-button
-        (make-object button% "Cancel" bp2 (lambda (b e) (return #f))))
-      (define ok-button
-        (make-object button% "Choose" bp2 (lambda (b e) (do-enter)) '(border)))
-      (send ok-button set-label
-            (if (and dir? (equal? "" (send text get-value))) "Choose" "OK"))
-
-      ;; ----------------------------------------------------------------------
-      ;; Initialization & `run'
-
-      (set-dir (or directory last-visted-directory (current-directory)))
-      (text-callback)
-      (set-ok?)
-
-      (send this center)
-      (send text focus)
-
-      (define/public (run)
-        (send this show #t)
-        (send completion-timer stop)
-        result)))
-
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/repl.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/repl.rkt
deleted file mode 100644
index 5e73fdf79d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/repl.rkt
+++ /dev/null
@@ -1,241 +0,0 @@
-(module repl racket/base 
-  (require racket/class
-           (prefix-in wx: "kernel.rkt")
-	   (prefix-in wx: racket/snip/private/style)
-           "editor.rkt"
-           "app.rkt"
-           "mrtop.rkt"
-           "mrcanvas.rkt"
-           "mrmenu.rkt"
-           "filedialog.rkt")
-
-  (provide graphical-read-eval-print-loop
-           textual-read-eval-print-loop)
-
-  (define (-graphical-read-eval-print-loop user-esp override-ports?)
-    ;; The REPL buffer class
-    (define esq:text%
-      (class text%
-	(inherit insert last-position get-text erase change-style clear-undos set-max-undo-history)
-	(rename-super [super-on-char on-char])
-	(define prompt-pos 0)
-        (define locked? #f)
-	(augment*
-	 [can-insert? (lambda (start end) (and (>= start prompt-pos) (not locked?)))]
-	 [can-delete? (lambda (start end) (and (>= start prompt-pos) (not locked?)))])
-	(override*
-         [on-char (lambda (c)
-                    (super-on-char c)
-                    (when (and (memq (send c get-key-code) '(#\return #\newline numpad-enter))
-                               (not locked?))
-                      (set! locked? #t)
-                      (evaluate (get-text prompt-pos (last-position)))))])
-	(public*
-         [new-prompt (lambda ()
-                       (output "> ")
-                       (set! prompt-pos (last-position))
-                       (set! locked? #f)
-                       (clear-undos))]
-         [output (lambda (str)
-                   (let ([l? locked?])
-                     (set! locked? #f)
-                     (insert str)
-                     (set! locked? l?)))]
-         [reset (lambda ()
-                  (set! locked? #f)
-                  (set! prompt-pos 0)
-                  (erase)
-                  (new-prompt))])
-        (super-new)
-        (let ([s (last-position)]
-              [m (regexp-match #rx"^(.*), (Copyright.*)$" (banner))])
-          (insert (if m
-                      (format "~a." (cadr m))
-                      (let ([b (banner)])
-                        (substring b 0 (sub1 (string-length b))))))
-          (let ([e (last-position)])
-            (insert #\newline)
-            (change-style (send (make-object wx:style-delta% 'change-bold) set-delta-foreground "BLUE") s e))
-          (when m
-            (output (caddr m))))
-        (insert "This is a simple window for evaluating Racket expressions.") (insert #\newline)
-        (let ([s (last-position)])
-          (insert "Quit now and run DrRacket to get a better window.")
-          (let ([e (last-position)])
-            (insert #\newline)
-            (change-style
-             (send (make-object wx:style-delta% 'change-italic) set-delta-foreground "RED")
-             s e)))
-        (insert "The current input port always returns eof.") (insert #\newline)
-        (new-prompt)
-        (set-max-undo-history 'forever)))
-
-    ;; GUI creation
-    (define frame (make-object (class frame%
-                                 (init-rest args)
-				 (inherit accept-drop-files)
-				 (augment*
-				  [on-close (lambda () 
-					      (custodian-shutdown-all user-custodian)
-					      (semaphore-post waiting))])
-				 (override*
-                                  [on-drop-file (lambda (f) (evaluate (format "(load ~s)" (path->string f))))])
-                                 (apply super-make-object args) (accept-drop-files #t))
-			       "GRacket REPL" #f 500 400))
-    (define repl-buffer (make-object esq:text%))
-    (define repl-display-canvas (new editor-canvas% [parent frame] [style '(no-border auto-hscroll resize-corner)]))
-
-    (define esq-eventspace (wx:current-eventspace))
-    (define (queue-output proc)
-      (parameterize ((wx:current-eventspace esq-eventspace))
-	(wx:queue-callback proc #f)))
-    
-    ;; User space initialization
-    (define user-custodian (make-custodian))
-    
-    (define user-output-port
-      (let ([leftover #""]
-	    [cvt (bytes-open-converter "UTF-8-permissive" "UTF-8")])
-	(make-output-port
-	 'console
-	 always-evt
-	 (lambda (s start end flush? breakable?) 
-	   (queue-output (lambda () 
-			   ;; s might end in the middle of a UTF-8 encoding.
-			   ;;  Get a complete prefix, and save the rest.
-			   (let ([s (bytes-append leftover (subbytes s start end))])
-			     (let-values ([(res used status) (bytes-convert cvt s)])
-			       (send repl-buffer output (bytes->string/utf-8 res))
-			       (set! leftover (subbytes s used))))))
-	   (- end start))
-	 void))) ; no close action
-    
-    (define user-eventspace
-      (or user-esp
-	  (parameterize ((current-custodian user-custodian))
-	    (wx:make-eventspace))))
-
-    ;; Evaluation
-    
-    (define (evaluate expr-str)
-      (parameterize ((wx:current-eventspace user-eventspace))
-	(wx:queue-callback
-	 (lambda ()
-	   (dynamic-wind
-	       void
-	       (lambda () 
-		 (call-with-values
-		     (lambda () (call-with-continuation-prompt
-                                 (lambda () (eval (cons
-                                                   '#%top-interaction
-                                                   (read (open-input-string expr-str)))))))
-		   (lambda results
-		     (for-each 
-		      (lambda (v) 
-			(parameterize ([current-output-port user-output-port])
-			  (print v) 
-			  (newline)))
-		      results))))
-	       (lambda ()
-		 (queue-output (lambda () (send repl-buffer new-prompt)))))))))
-
-    (define waiting (make-semaphore 0))
-
-    (let ([mb (make-object menu-bar% frame)])
-      (let ([m (make-object menu% "&File" mb)])
-	(make-object menu-item% "Load File..." m (lambda (i e) (let ([f (get-file #f frame)]) 
-								 (and f 
-								      (evaluate (format "(load ~s)" (path->string f)))))))
-	(unless (current-eventspace-has-standard-menus?)
-	  (make-object menu-item% 
-		       (if (eq? (system-type) 'windows)
-			   "E&xit"
-			   "&Quit")
-		       m (lambda (i e) (send frame on-close) (send frame show #f)) #\q)))
-      (let ([m (make-object menu% "&Edit" mb)])
-	(append-editor-operation-menu-items m #f)))
-
-    ;; Just a few extra key bindings:
-    ((current-text-keymap-initializer) (send repl-buffer get-keymap))
-    (send repl-buffer auto-wrap #t)
-
-    ;; Go
-    (when override-ports?
-      (parameterize ((wx:current-eventspace user-eventspace))
-	(wx:queue-callback
-	 (lambda ()
-	   (current-output-port user-output-port)
-	   (current-error-port user-output-port)
-	   (current-input-port (open-input-bytes #"")))
-	 #t)))
-
-    (send repl-display-canvas set-editor repl-buffer)
-
-    (send frame show #t)
-    
-    (send repl-display-canvas focus)
-
-    (wx:yield waiting))
-
-  (define graphical-read-eval-print-loop
-    (case-lambda
-     [() (-graphical-read-eval-print-loop #f #t)]
-     [(esp)
-      (graphical-read-eval-print-loop esp (not esp))]
-     [(esp override-ports?)
-      (unless (or (not esp) (wx:eventspace? esp))
-	(raise-argument-error 'graphical-read-eval-print-loop "(or/c eventspace? #f)" esp))
-      (-graphical-read-eval-print-loop esp override-ports?)]))
-
-  (define (textual-read-eval-print-loop)
-    (define user-custodian (make-custodian))
-    (define user-eventspace
-      (parameterize ((current-custodian user-custodian))
-        (wx:make-eventspace)))
-    (define ready-sema (make-semaphore))
-    (define (evaluate expr)
-      (parameterize ((wx:current-eventspace user-eventspace))
-	(wx:queue-callback
-	 (lambda ()
-	   (dynamic-wind
-	       void
-	       (lambda () 
-		 (call-with-values
-		     (lambda () (call-with-continuation-prompt
-                                 (lambda () (eval (cons
-                                                   '#%top-interaction
-                                                   expr)))))
-		   (lambda results
-		     (for-each 
-		      (lambda (v) 
-                        ((current-print) v))
-		      results))))
-	       (lambda ()
-                 (semaphore-post ready-sema)))))))
-    (parameterize-break 
-     #f
-     (let loop ()
-       (let ([e (let read-loop ()
-                  (call-with-continuation-prompt
-                   ;; Enable break during reading:
-                   (lambda ()
-                     (parameterize-break 
-                      #t
-                      ((current-prompt-read))))
-                   (default-continuation-prompt-tag)
-                   (lambda args (read-loop))))])
-         (unless (eof-object? e)
-           (evaluate e)
-           ;; While waiting, redirect breaks:
-           (call-with-exception-handler
-            (lambda (exn)
-              (if (exn:break? exn)
-                  (begin
-                    (break-thread (eventspace-handler-thread user-eventspace))
-                    ((exn:break-continuation exn) (void)))
-                  exn))
-            (lambda ()
-              (parameterize-break
-               #t
-               (semaphore-wait ready-sema))))
-           (loop)))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/seqcontract.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/seqcontract.rkt
deleted file mode 100644
index 80695ed926..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/seqcontract.rkt
+++ /dev/null
@@ -1,422 +0,0 @@
-(module seqcontract mzscheme
-  (require mzlib/class)
-  (provide (protect es-contract-mixin lock-contract-mixin))
-  
-  (require-for-syntax syntax/stx
-                      syntax/boundmap)
-
-  (define-syntax (sequence-contract-mixin stx)
-    (syntax-case stx (state-machine)
-      [(_ (state-machine
-           [name exp (method-name aritiess states ...) ...] ...)
-          clauses ...)
-       (and (andmap identifier? (syntax->list (syntax (name ...))))
-            (andmap (lambda (x) (andmap identifier? (syntax->list x)))
-                    (syntax->list (syntax ((method-name ...) ...))))
-            (andmap (lambda (xs) 
-                      (andmap (lambda (x) (andmap identifier? (syntax->list x)))
-                              (syntax->list xs)))
-                    (syntax->list (syntax (((states ...) ...) ...)))))
-       (let ()
-         (define state-names (syntax->list (syntax (name ...))))
-         (define predicate-names (generate-temporaries (syntax (name ...))))
-         
-         (define state-name->predicate-name
-           (let ([mapping (make-bound-identifier-mapping)])
-             (for-each (lambda (state-name predicate-name)
-                         (bound-identifier-mapping-put! mapping state-name predicate-name))
-                       state-names
-                       predicate-names)
-             (lambda (state-name)
-               (bound-identifier-mapping-get mapping state-name))))
-         
-         (define-struct state-desc (method-name arities predicate-name state-name result-predicates) (make-inspector))
-         
-         ;; -> mapping[state-name-symbol -o> state-desc]
-         (define (build-table)
-           (let ([mapping (new-mapping)])
-             (for-each 
-              (lambda (state-name-stx predicate-name-stx method-names aritiess state-namess)
-                (for-each
-                 (lambda (method-name arities state-names-stx)
-                   (extend-mapping/at-end
-                    mapping
-                    method-name
-                    (make-state-desc method-name
-                                     arities
-                                     predicate-name-stx
-                                     state-name-stx
-                                     (syntax->list state-names-stx))))
-                 (syntax->list method-names)
-                 (syntax->list aritiess)
-                 (syntax->list state-namess)))
-              (syntax->list (syntax (name ...)))
-              predicate-names
-              (syntax->list (syntax ((method-name ...) ...)))
-              (syntax->list (syntax ((aritiess ...) ...)))
-              (syntax->list (syntax (((states ...) ...) ...))))
-             mapping))
-         
-         (define (build-overriding-method mapping state-descs)
-           (with-syntax ([method-name (state-desc-method-name (car state-descs))]
-                         [super-method-name (build-super-name (state-desc-method-name (car state-descs)))]
-                         [(predicate-name ...) (map state-desc-predicate-name state-descs)]
-                         [(predicate-result-name ...)
-                          (generate-temporaries
-                           (map state-desc-predicate-name state-descs))]
-                         [(state-name ...) (map state-desc-state-name state-descs)]
-                         [((result-predicate-state ...) ...)
-                          (map state-desc-result-predicates state-descs)]
-                         [((result-predicate-name ...) ...)
-                          (map 
-                           (lambda (state-desc)
-                             (map state-name->predicate-name
-                                  (state-desc-result-predicates state-desc)))
-                           state-descs)])
-             (with-syntax ([(cases ...)
-                            (map (lambda (arity)
-                                   (with-syntax ([formals arity])
-                                     (with-syntax ([call (if (identifier? arity)
-                                                             (syntax (super-method-name . formals))
-                                                             (with-syntax ([(x ...) arity])
-                                                               (syntax (super-method-name x ...))))]
-                                                   [args-as-list
-                                                    (if (identifier? arity)
-                                                        arity
-                                                        (with-syntax ([(x ...) arity])
-                                                          (syntax (list x ...))))])
-                                       (syntax
-                                        [formals
-                                         (let ([predicate-result-name (predicate-name)] ...)
-                                           (cond
-                                             [predicate-result-name
-                                              call
-                                              
-                                              ;; Doesn't do post-condition checking,
-                                              ;; since it isn't thread safe
-                                              #;
-                                              (begin0
-                                                call
-                                                (unless (or (result-predicate-name) ...)
-                                                  (sequence-contract-violation 
-                                                   'positive 
-                                                   "expected one of states ~s after calling ~s in state ~s"
-                                                   '(result-predicate-state ...)
-                                                   'method-name
-                                                   'state-name)))
-                                              ]
-                                             ...
-                                             [else
-                                              (sequence-contract-violation 
-                                               'negative
-                                               "method ~s cannot be called, except in states ~s~a"
-                                               'method-name
-                                               '(state-name ...)
-                                               (format-args args-as-list))]))]))))
-                                 (syntax->list (state-desc-arities (car state-descs))))])
-               (syntax
-                (begin
-                  (rename-super [super-method-name method-name])
-                  (define/override method-name
-                    (case-lambda cases ...)))))))
-         
-         ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-         ;;
-         ;; finite mapping code
-         ;;
-         
-         (define (new-mapping) (make-hash-table))
-         (define (set-mapping mapping key-stx val)
-           (hash-table-put! mapping (syntax-e key-stx) val))
-         (define get-mapping
-           (case-lambda
-             [(mapping key-stx) (get-mapping mapping key-stx (lambda () (error 'get-mapping "ack!")))]
-             [(mapping key-stx fail)
-              (hash-table-get mapping (syntax-e key-stx) fail)]))
-         (define (extend-mapping/at-end mapping key-stx ele)
-           (set-mapping mapping key-stx 
-                        (append
-                         (get-mapping mapping key-stx (lambda () null))
-                         (list ele))))
-         (define (mapping-map f mapping)
-           (hash-table-map mapping f))
-         
-         ;;
-         ;;
-         ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-         
-         (define (build-super-name name)
-           (datum->syntax-object
-            name
-            (string->symbol
-             (format 
-              "super-~a"
-              (syntax-object->datum name)))))
-         
-         (define table (build-table))
-         (with-syntax ([(predicate-names ...) predicate-names]
-                       [(overriding-method ...) (mapping-map
-                                                 (lambda (k vs) (build-overriding-method table vs))
-                                                 table)])
-           
-           (syntax
-            (lambda (%)
-              (class* % ()
-                (define/private predicate-names (lambda () exp)) ...
-                overriding-method ... 
-                clauses ...)))))]))
-  
-  (define (format-args l)
-    (cond
-      [(null? l) ""]
-      [else
-       (string-append
-        ", args "
-        (let loop ([fst (car l)]
-                   [rst (cdr l)])
-          (cond
-            [(null? rst) (format "~e" fst)]
-            [else (string-append
-                   (format "~e" fst)
-                   " "
-                   (loop (car rst) (cdr rst)))])))]))
-
-  (define (sequence-contract-violation dir fmt . args)
-    (apply error
-           'sequence-contract-violation 
-           (string-append (format "~a: " dir) fmt)
-           args))
-
-  (define es-contract-mixin 
-    (sequence-contract-mixin
-     (state-machine
-      [in-edit-sequence
-       (in-edit-sequence?)
-       (begin-edit-sequence [() (x) (x y)] in-edit-sequence)
-       (end-edit-sequence [()] in-edit-sequence out-of-edit-sequence)]
-      [out-of-edit-sequence
-       (not (in-edit-sequence?))
-       (begin-edit-sequence [() (x) (x y)] in-edit-sequence)])
-     
-     (inherit in-edit-sequence?)
-     (super-new)))
-
-#|
-
-  (define (test t)
-    (send t begin-edit-sequence)
-    (send t end-edit-sequence)
-    (send t end-edit-sequence))
-  
-  (test (new text%))
-  (test (new (es-contract-mixin text%)))
-  
-Matthew writes:
-
-> Underscore tends to mean "internal". Many variants of
-> Insert(), for example, call the main _Insert() method.
-
-So, double check the methods to make sure that a flag check
-in an underscore method means the flag is checked in the
-non-underscore methods.
-
-At Sun, 29 Jun 2003 09:26:02 -0500, Robby Findler wrote:
-> Is there some kind of invariant or ordering on these
-> flags? That is, if a method only checks the flowLocked flag,
-> is that effectively the same as checking the flowLocked flag
-> or the writeLocked flag or something like that?
-
-Yes: readLocked => flowLocked, and flowLocked => writeLocked.
-
-Matthew
-
-  |#
-  
-  ;; need to figure out
-  ;; line-start-position and friends 
-  ;; (line-start-position not valid in readlock)
-  
-  (define lock-contract-mixin
-    (sequence-contract-mixin
-     (state-machine
-      [unlocked
-       (and (not (locked-for-write?))
-            (not (locked-for-flow?))
-            (not (locked-for-read?)))
-       (set-position [(x) (x y) (x y z) (x y z p) (x y z p q) (x y z p q r)] unlocked)
-       (set-autowrap-bitmap [(bitmap)] unlocked)
-       (print-to-dc [(dc) (dc page)] unlocked)
-       (move-position [(code?) (code? extend) (code? extend kind)] unlocked)
-       (split-snip [(pos)] unlocked)
-       (set-line-spacing [(space)] unlocked)
-       (set-max-width [(width)] unlocked)
-       (set-min-width [(width)] unlocked)
-       (set-min-height [(width)] unlocked)
-       (set-max-height [(width)] unlocked)
-       (set-tabs [(tabs) (tabs tab-width) (tabs tab-width units?)] unlocked)
-       (print [()
-               (interactive?)
-               (interactive? fit-on-page?)
-               (interactive? fit-on-page? output-mode)
-               (interactive? fit-on-page? output-mode parent)
-               (interactive? fit-on-page? output-mode parent force-ps-page-bbox?)
-               (interactive? fit-on-page? output-mode parent force-ps-page-bbox? as-eps?)]
-              unlocked)
-       
-       (get-text [() (x) (x y) (x y z) (x y z p)] unlocked)
-       (get-flattened-text [()] unlocked)
-       (get-character [(start)] unlocked)
-       (find-wordbreak [(start end reason)] unlocked)
-       (save-file [() (filename) (filename format) (filename format show-errors?)] unlocked)
-       (write-to-file [(stream) (stream start) (stream start end)]  unlocked)
-       (find-position [(x y) (x y at-eol?) (x y at-eol? on-it?) (x y at-eol? on-it? edge-close?)] unlocked)
-       (scroll-line-location [(pos)] unlocked)
-       (num-scroll-lines [()] unlocked)
-       (find-scroll-line [(location)] unlocked)
-       (style-has-changed [(style)] unlocked)
-
-       (set-paragraph-margins [(para fl l r)] unlocked)
-       (set-paragraph-alignment [(para align)] unlocked)
-
-       (change-style [(x) (x y) (x y z) (x y z w)] unlocked)
-       (insert [(x) (x y) (x y z) (x y z p) (x y z p q)] unlocked)
-       (delete [() (start) (start end) (start end scroll-ok?)] unlocked)
-       (insert-port [(port) (port format) (port format show-errors?)] unlocked)
-       (read-from-file [(x) (x y) (x y z)] unlocked)
-       (set-style-list [(style-list)] unlocked)]
-      
-      [write-lock
-       (and (locked-for-write?)
-            (not (locked-for-flow?))
-            (not (locked-for-read?)))
-
-       (set-position [(x) (x y) (x y z) (x y z p) (x y z p q)] write-lock)
-       (set-autowrap-bitmap [(bitmap)] write-lock)
-       (print-to-dc [(dc)] write-lock)
-       (move-position [(code?) (code? extend) (code? extend kind)] write-lock)
-       (split-snip [(pos)] write-lock)
-       (set-line-spacing [(space)] write-lock)
-       (set-max-width [(width)] write-lock)
-       (set-min-width [(width)] write-lock)
-       (set-min-height [(width)] write-lock)
-       (set-max-height [(width)] write-lock)
-       (set-tabs [(tabs) (tabs tab-width) (tabs tab-width units?)] write-lock)
-       (print [()
-               (interactive?)
-               (interactive? fit-on-page?)
-               (interactive? fit-on-page? output-mode)
-               (interactive? fit-on-page? output-mode parent)
-               (interactive? fit-on-page? output-mode parent force-ps-page-bbox?)]
-              write-lock)
-       
-       (get-text [() (x) (x y) (x y z) (x y z p)] write-lock)
-       (get-flattened-text [()] write-lock)
-       (get-character [(start)] write-lock)
-       (find-wordbreak [(start end reason)] write-lock)
-       (save-file [() (filename) (filename format) (filename format show-errors?)] write-lock)
-       (write-to-file [(stream) (stream start end)]  write-lock)
-       (find-position [(x y) (x y at-eol? on-it? edge-close?)] write-lock)
-       (scroll-line-location [(pos)] write-lock)
-       (num-scroll-lines [()] write-lock)
-       (find-scroll-line [(location)] write-lock)
-       (style-has-changed [(style)] write-lock)]
-      
-      [flow-lock
-       (and (locked-for-flow?)
-            (not (locked-for-read?)))
-
-       (get-text [() (x) (x y) (x y z) (x y z p)] flow-lock)
-       (get-flattened-text [()] flow-lock)
-       (get-character [(start)] flow-lock)
-       (find-wordbreak [(start end reason)] flow-lock)
-       (save-file [() (filename) (filename format) (filename format show-errors?)] flow-lock)
-       (write-to-file [(stream) (stream start end)]  flow-lock)
-       (find-position [(x y) (x y at-eol? on-it? edge-close?)] flow-lock)
-       (scroll-line-location [(pos)] flow-lock)
-       (num-scroll-lines [()] flow-lock)
-       (find-scroll-line [(location)] flow-lock)
-       (style-has-changed [(style)] flow-lock)]
-
-      [read-lock
-       (locked-for-read?)])
-
-     (inherit locked-for-flow?
-              locked-for-write?
-              locked-for-read?)
-     (super-new))))
-
-  #|
-     ;; flowLocked in wx_mpriv
-     set-position ; _SetPosition
-     CheckRecalc  (only if graphicMaybeInvalid aka locations-computed?)
-     set-autowrap-bitmap ; SetAutowrapBitmap
-     Redraw 
-     BeginPrint
-     EndPrint
-     HasPrintPage
-     print-to-dc ; PrintToDC
-     
-     ;; flowlocked in wx_media.cxx
-     move-position ; MovePosition
-     split-snip ; SplitSnip
-     set-line-spacing ; SetLineSpacing
-     set-max-width ; SetMaxWidth
-     set-min-width ; SetMinWidth
-     set-min-height ; SetMinHeight
-     set-max-height ; SetMaxHeight
-     set-tabs ; SetTabs
-     resized ; Resized ;; uses the flag, but not to abort
-     
-     ;; methods that consider
-     ;; the readLocked variable,
-     ;; at the C level; they just
-     ;; return if it is set.
-     get-text ; GetText
-     get-character ; GetCharacter
-     find-wordbreak ; FindWorkbreak
-     save-file ; SaveFile
-     write-to-file ; WriteToFile
-     _FindPositionInSnip
-     find-position ; FindPosition
-     scroll-line-location ; ScrollLineLocation
-     num-scroll-lines ; NumScrollLines
-     find-scroll-line ; FindScrollLine
-     style-has-changed ; StyleHasChanged ;; maybe need to expand this to include style lists?
-
-     FindFirstVisiblePosition ;; LineStartPosition?
-     FindLastVisiblePosition
-     CheckRecalc
-     
-     ;; methods that consider the writeLocked variable,
-     ;; at the C level
-     _ChangeStyle
-     _Insert
-     _Delete
-     insert-port ; InsertPort
-     read-from-file ; ReadFromFile
-     set-style-list ; SetStyleList
-     ; Recounted
-     ReallyCanEdit -- only when op != wxEDIT_COPY
-     
-     ;; in wx_mpbrd.cxx
-     insert ; Insert
-     delete ; Delete
-     erase ; Erase
-     delete ; Delete ;; -- with arg
-     remove ; Remove
-     move-to ; MoveTo
-     move ; Move, also with arg
-     change-style ; _ChangeStyle
-     set-before ;SetBefore
-     set-after ;SetAfter
-     ;ReallyCanEdit -- only when op != wxEDIT_COPY
-     ;Refresh has weird code checking writeLocked -- what does < 0 mean?
-     do-paste ; DoPaste
-     paste ; Paste
-     insert-port ; InsertPort
-     insert-file ; InsertFile
-     read-from-file ; ReadFromFile
-     ; BeginEditSequence ;; -- weird flag check
-     ; EndEditSequence ;; -- weird flag check, like BeginEditSequence
-  
-  |#
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/snipfile.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/snipfile.rkt
deleted file mode 100644
index e0bd52e750..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/snipfile.rkt
+++ /dev/null
@@ -1,415 +0,0 @@
-(module snipfile racket/base
-  (require racket/class
-           racket/port
-           syntax/moddep
-           (prefix-in wx: "kernel.rkt")
-	   (prefix-in wx: racket/snip/private/snip)
-           "check.rkt"
-           "editor.rkt")
-
-  (provide open-input-text-editor
-           open-input-graphical-file
-           text-editor-load-handler
-           open-output-text-editor)
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-  (define empty-string (make-bytes 0))
-  
-  ;; open-input-text-editor : (instanceof text%) num num -> input-port
-  ;; creates a user port whose input is taken from the text%,
-  ;; starting at position `start-in'
-  ;; and ending at position `end'.
-  (define open-input-text-editor 
-    (lambda (text [start 0] [end 'end] [snip-filter values] [port-name text] [expect-to-read-all? #f]
-                  #:lock-while-reading? [lock-while-reading? #f])
-      ;; Check arguments:
-      (unless (text . is-a? . text%)
-        (raise-argument-error 'open-input-text-editor "(is-a?/c text%)" text))
-      (check-non-negative-integer 'open-input-text-editor start)
-      (unless (or (eq? end 'end)
-                  (and (integer? end) (exact? end) (not (negative? end))))
-        (raise-argument-error 'open-input-text-editor "(or/c exact-nonnegative-integer? 'end)" end))
-      (let ([last (send text last-position)])
-        (when (start . > . last)
-          (raise-range-error 'open-input-text-editor "editor" "starting "
-                             start text 0 last #f))
-        (unless (eq? end 'end)
-          (unless (<= start end last)
-            (raise-range-error 'open-input-text-editor "editor" "ending "
-                               end text start last 0))))
-      (let ([end (if (eq? end 'end) (send text last-position) end)]
-            [snip (send text find-snip start 'after-or-none)])
-        ;; If the region is small enough, and if the editor contains
-        ;; only string snips, then it's probably better to move
-        ;; all of the text into a string port:
-        (if (or (not snip)
-                (and (is-a? snip wx:string-snip%)
-                     (let ([s (send text find-next-non-string-snip snip)])
-                       (or (not s)
-                           ((send text get-snip-position s) . >= . end)))))
-            (if (or expect-to-read-all?
-                    ((- end start) . < . 4096))
-                ;; It's all text, and it's short enough: just read it into a string
-                (open-input-string (send text get-text start end) port-name)
-                ;; It's all text, so the reading process is simple:
-                (let ([start start])
-                  (when lock-while-reading?
-                    (send text begin-edit-sequence)
-                    (send text lock #t))
-                  (let-values ([(pipe-r pipe-w) (make-pipe)])
-                    (make-input-port/read-to-peek
-                     port-name
-                     (lambda (s)
-                       (let ([v (read-bytes-avail!* s pipe-r)])
-                         (if (eq? v 0)
-                             (let ([n (min 4096 (- end start))])
-                               (if (zero? n)
-                                   (begin
-                                     (close-output-port pipe-w)
-                                     (when lock-while-reading?
-                                       (set! lock-while-reading? #f)
-                                       (send text lock #f)
-                                       (send text end-edit-sequence))
-                                     eof)
-                                   (begin
-                                     (write-string (send text get-text start (+ start n)) pipe-w)
-                                     (set! start (+ start n))
-                                     (let ([ans (read-bytes-avail!* s pipe-r)])
-                                       (when lock-while-reading?
-                                         (when (eof-object? ans)
-                                           (set! lock-while-reading? #f)
-                                           (send text lock #f)
-                                           (send text edit-edit-sequence)))
-                                       ans))))
-                             v)))
-                     (lambda (s skip general-peek)
-                       (let ([v (peek-bytes-avail!* s skip #f pipe-r)])
-                         (if (eq? v 0)
-                             (general-peek s skip)
-                             v)))
-                     void))))
-            ;; General case, which handles non-text context:
-            (with-method ([gsp (text get-snip-position)]
-                          [grn (text get-revision-number)]
-                          [fs (text find-snip)])
-              (let-values ([(pipe-r pipe-w) (make-pipe)])
-                (let* ([get-text-generic (generic wx:snip% get-text)]
-                       [get-count-generic (generic wx:snip% get-count)]
-                       [next-generic (generic wx:snip% next)]
-                       [revision (grn)]
-                       [next? #f]
-                       [snip-end-position (+ (gsp snip) (send-generic snip get-count-generic))]
-                       [update-str-to-snip
-                        (lambda (skip to-str)
-                          (if snip
-                              (let ([snip-start (gsp snip)])
-                                (cond
-                                  [(snip-start . >= . end)
-                                   (set! snip #f)
-                                   (set! next? #f)
-                                   0]
-                                  [(is-a? snip wx:string-snip%)
-                                   (set! next? #t)
-                                   (let ([c (min (- (send-generic snip get-count-generic) skip)
-                                                 (- end snip-start))])
-                                     (write-string (send-generic snip get-text-generic skip c) pipe-w)
-                                     (read-bytes-avail!* to-str pipe-r))]
-                                  [else
-                                   (set! next? #f)
-                                   0]))
-                              (begin
-                                (set! next? #f)
-                                0)))]
-                       [next-snip
-                        (lambda (to-str)
-                          (cond
-                            [(= revision (grn))
-                             (set! snip (send-generic snip next-generic))
-                             (set! snip-end-position (and snip (+ (gsp snip) (send-generic snip get-count-generic))))
-                             (update-str-to-snip 0 to-str)]
-                            [else
-                             (set! revision (grn))
-                             (define old-snip-end-position snip-end-position)
-                             (set! snip (fs snip-end-position 'after-or-none))
-                             (define snip-start-position (and snip (gsp snip)))
-                             (set! snip-end-position (and snip (+ snip-start-position (send-generic snip get-count-generic))))
-                             (update-str-to-snip (if snip (- old-snip-end-position snip-start-position) 0) to-str)]))]
-                       [read-chars (lambda (to-str)
-                                     (cond
-                                       [next?
-                                        (next-snip to-str)]
-                                       [snip
-                                        (let ([the-snip (snip-filter snip)])
-                                          (next-snip empty-string)
-                                          (lambda (file line col ppos)
-                                            (if (is-a? the-snip wx:snip%)
-                                                (if (is-a? the-snip wx:readable-snip<%>)
-                                                    (send the-snip read-special file line col ppos)
-                                                    (send the-snip copy))
-                                                the-snip)))]
-                                       [else eof]))]
-                       [close (lambda () (void))]
-                       [port (make-input-port/read-to-peek
-                              port-name
-                              (lambda (s)
-                                (let* ([v (read-bytes-avail!* s pipe-r)]
-                                       [res (if (eq? v 0) (read-chars s) v)])
-                                  (when (eof-object? res)
-                                    (when lock-while-reading? 
-                                      (set! lock-while-reading? #f)
-                                      (send text lock #f)
-                                      (send text end-edit-sequence)))
-                                  res))
-                              (lambda (s skip general-peek)
-                                (let ([v (peek-bytes-avail!* s skip #f pipe-r)])
-                                  (if (eq? v 0)
-                                      (general-peek s skip)
-                                      v)))
-                              close)])
-                  (when lock-while-reading? 
-                    (send text begin-edit-sequence)
-                    (send text lock #t))
-                  (if (is-a? snip wx:string-snip%)
-                      ;; Special handling for initial snip string in
-                      ;; case it starts too early:
-                      (let* ([snip-start (gsp snip)]
-                             [skip (- start snip-start)]
-                             [c (min (- (send-generic snip get-count-generic) skip)
-                                     (- end snip-start))])
-                        (set! next? #t)
-                        (display (send-generic snip get-text-generic skip c) pipe-w))
-                      (update-str-to-snip 0 empty-string))
-                  port)))))))
-
-  (define (jump-to-submodule in-port expected-module k)
-    (let ([header (bytes-append #"^#~"
-                                (bytes (string-length (version)))
-                                (regexp-quote (string->bytes/utf-8 (version)))
-                                #"D")])
-      (cond
-       [(regexp-match-peek header in-port)
-        ;; The input has a submodule table:
-        (define encoded-expected
-          (apply bytes-append
-                 (for/list ([n (in-list (if (pair? expected-module)
-                                            (cdr expected-module)
-                                            '()))])
-                   (define s (string->bytes/utf-8 (symbol->string n)))
-                   (define l (bytes-length s))
-                   (bytes-append (if (l . < . 255)
-                                     (bytes l)
-                                     (bytes 255 
-                                            (bitwise-and l 255)
-                                            (bitwise-and (arithmetic-shift l -8) 255)
-                                            (bitwise-and (arithmetic-shift l -16) 255)
-                                            (bitwise-and (arithmetic-shift l -24) 255)))
-                                 s))))
-        (define (skip-bytes amt)
-          (if (file-stream-port? in-port)
-              (file-position in-port (+ (file-position in-port) amt))
-              (read-bytes amt in-port)))
-        (define len (+ 2 1 (string-length (version)) 1 4)) ; 4 for table count
-        (skip-bytes len)
-        (let loop ([pos len])
-          ;; Each node in the table's btree is <name-len> <name> <start> <len> <left> <right>
-          (define (read-num)
-            (integer-bytes->integer (read-bytes 4 in-port) #f #f))
-          (define len (read-num))
-          (define new-pos (+ pos 4))
-          (define name (read-bytes len in-port))
-          (define code-start (read-num))
-          (define code-len (read-num))
-          (define left (read-num))
-          (define right (read-num))
-          (define after-pos (+ new-pos len 16))
-          (cond
-           [(bytes=? encoded-expected name)
-            (skip-bytes (- code-start after-pos))
-            (k #f)]
-           [(bytes<? encoded-expected name)
-            (if (zero? left)
-                (void)
-                (begin
-                  (skip-bytes (- left after-pos))
-                  (loop left)))]
-           [else
-            (if (zero? right)
-                (void)
-                (begin
-                  (skip-bytes (- right after-pos))
-                  (loop right)))]))]
-       [(or (not (pair? expected-module))
-            (car expected-module))
-        ;; No table; ok to load source or full bytecode:
-        (k #t)]
-       [else
-        ;; don't load the file from source or reload useless bytecode:
-        (void)])))
-
-  (define original-load-handler (current-load))
-
-  (define (text-editor-load-handler filename expected-module)
-    (unless (path? filename)
-      (raise-argument-error 'text-editor-load-handler "path?" filename))
-    (unless (or (not expected-module)
-                (symbol? expected-module)
-                (and (pair? expected-module)
-                     (list? expected-module)
-                     (pair? (cdr expected-module))
-                     (or (not (car expected-module))
-                         (symbol? (car expected-module)))
-                     (andmap symbol? (cdr expected-module))))
-      (raise-argument-error 'text-editor-load-handler 
-                            "(or/c #f symbol? (cons/c (or/c #f symbol?) (non-empty-listof symbol?)))"
-                            expected-module))
-    (let-values ([(in-port src wxme?) (build-input-port filename expected-module)])
-      (if wxme?
-          (dynamic-wind
-              (lambda () (void))
-              (lambda ()
-                (parameterize ([read-accept-compiled #t]
-                               [read-accept-reader #t]
-                               [read-accept-lang #t]
-                               [read-on-demand-source (and (load-on-demand-enabled)
-                                                           (path->complete-path filename))])
-                  (if expected-module
-                      (with-module-reading-parameterization
-                       (lambda ()
-                         (jump-to-submodule
-                          in-port
-                          expected-module
-                          (lambda (check-second?)
-                            (with-module-reading-parameterization 
-                             (lambda ()
-                               (let* ([first (read-syntax src in-port)]
-                                      [module-ized-exp (check-module-form first expected-module filename)]
-                                      [second (if check-second?
-                                                  (read in-port)
-                                                  eof)])
-                                 (unless (eof-object? second)
-                                   (raise-syntax-error
-                                    'text-editor-load-handler
-                                    (format "expected only a `module' declaration for `~s', but found an extra expression"
-                                            expected-module)
-                                    second))
-                                 (eval module-ized-exp))))))))
-                      (let loop ([last-time-values (list (void))])
-                        (let ([exp (read-syntax src in-port)])
-                          (if (eof-object? exp)
-                              (apply values last-time-values)
-                              (call-with-values (lambda () (call-with-continuation-prompt
-                                                            (lambda () (eval 
-                                                                        (datum->syntax
-                                                                         #f
-                                                                         (cons '#%top-interaction exp)
-                                                                         exp)))
-                                                            (default-continuation-prompt-tag)
-                                                            (lambda args
-                                                              (apply
-                                                               abort-current-continuation
-                                                               (default-continuation-prompt-tag)
-                                                               args))))
-                                (lambda x (loop x)))))))))
-              (lambda ()
-                (close-input-port in-port)))
-          (begin
-            (close-input-port in-port)
-            (original-load-handler filename expected-module)))))
-
-
-  ;; build-input-port : string -> (values input any)
-  ;; constructs an input port for the load handler. Also
-  ;; returns a value representing the source of code read from the file.
-  (define (build-input-port filename expected-module)
-    (let ([p (open-input-file filename #:for-module? expected-module)])
-      (port-count-lines! p)
-      (define-values (new-p changed?)
-        (cond
-         [(regexp-match-peek #rx#"^(?:#reader[(]lib\"read[.]ss\"\"wxme\"[)])?WXME01[0-9][0-9] ##[ \r\n]" p)
-          (let ([t (make-object text%)])
-            (send t insert-port p 'standard)
-            (close-input-port p)
-            (values (open-input-text-editor t 0 'end values filename) #t))]
-         [else (values p #f)]))
-      (when changed?
-	(port-count-lines! new-p)) ; in case it's new
-      (values new-p filename changed?)))
-
-  (define (open-input-graphical-file filename)
-    (let-values ([(p name wxme?) (build-input-port filename #f)])
-      p))
-
-  (define open-output-text-editor 
-    (lambda (text [start 'end] [special-filter values] [port-name text]
-                  #:eventspace [eventspace (wx:current-eventspace)])
-      (define pos (if (eq? start 'end)
-		      (send text last-position)
-		      (min start
-			   (send text last-position))))
-      (define-values (in out) (make-pipe))
-      (define cvt (bytes-open-converter "UTF-8-permissive" "UTF-8"))
-      (define raw-buffer (make-bytes 128))
-      (define utf8-buffer (make-bytes 128))
-      (define (show s)
-        (define (insert)
-          (send text begin-edit-sequence)
-          (send text insert s pos)
-          (send text end-edit-sequence))
-        (if (and eventspace
-                 (and (not (eq? (current-thread) 
-                                (wx:eventspace-handler-thread eventspace)))))
-            (parameterize ([wx:current-eventspace eventspace])
-              (wx:queue-callback insert #f))
-            (insert))
-	(set! pos (+ (string-length s) pos)))
-      (define (flush-text)
-	(let ([cnt (peek-bytes-avail!* raw-buffer 0 #f in)])
-	  (when (positive? cnt)
-	    (let-values ([(got used status) (bytes-convert cvt raw-buffer 0 cnt utf8-buffer)])
-	      (cond
-	       [(positive? got) 
-		(read-bytes-avail!* raw-buffer in 0 used)
-		(show (bytes->string/utf-8 utf8-buffer #\? 0 got))
-		(flush-text)]
-	       [(eq? status 'error) 
-		(read-byte in)
-		(show "?")
-		(flush-text)])))))
-      (define (force-text)
-	(when (byte-ready? in)
-	  (show "?")
-	  (read-byte in)
-	  (flush-text)
-	  (force-text)))
-      (define port
-	(make-output-port
-	 text
-	 always-evt
-	 (lambda (s start end nonblock? breakable?)
-	   ;; Put bytes into pipe:
-	   (write-bytes s out start end)
-	   ;; Extract as many string characters as are ready:
-	   (flush-text)
-	   (- end start))
-	 (lambda ()
-	   (force-text))
-	 (lambda (special nonblock? breakable?)
-	   (let ([special (special-filter special)])
-	     (cond
-	      [(special . is-a? . wx:snip%)
-	       (force-text)
-	       (send text insert special pos)
-	       (set! pos (+ pos (send special get-count)))]
-	      [else
-	       (display special port)]))
-	   #t)
-	 #f #f
-	 (lambda ()
-	   (let ([line (send text position-line pos)])
-	     (values (add1 line)
-		     (- pos (send text line-start-position line))
-		     (add1 pos))))
-	 void
-	 (add1 pos)))
-      port)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/syntax.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/syntax.rkt
deleted file mode 100644
index b7b478001f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/syntax.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require racket/draw/private/syntax)
-(provide (all-from-out racket/draw/private/syntax))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/te.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/te.rkt
deleted file mode 100644
index 884c4cc1cb..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/te.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw)
-
-(provide get-window-text-extent*)
-
-(define get-window-text-extent*
-  (let ([bm #f][dc #f])
-    (case-lambda
-     [(string font) (get-window-text-extent* string font #f)]
-     [(string font combine?)
-      (unless bm
-        (set! bm (make-object bitmap% 2 2))
-        (set! dc (make-object bitmap-dc%))
-        (send dc set-bitmap bm))
-      (unless (send bm ok?)
-        (error 'get-window-text-extent "couldn't allocate sizing bitmap"))
-      (let-values ([(w h d a) (send dc get-text-extent string font combine?)])
-        (values w h d a))])))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx.rkt
deleted file mode 100644
index 41a32d7a9c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-(module wx racket/base
-  (require racket/class
-           (prefix-in wx: "kernel.rkt")
-           "lock.rkt"
-           "helper.rkt")
-
-  (provide (protect-out wx<%>
-                        wx/proxy<%>
-                        make-glue%
-                        wx->mred
-                        wx->proxy
-                        mred%
-                        mred->wx
-                        mred->wx-container))
-
-  ;; The windowing wx classes are not exposed directly.
-  ;; Instead, we expose wrapper classes that have wx instances.
-  ;; The `make-glue%' mixin adds fields and methods to map 
-  ;; wx (internal) objects to mred (external) objects.
-  ;; Sometimes, multiple wx instances have one mred instance;
-  ;; hance proxies.
-
-  (define wx<%> (interface () get-mred))
-  (define wx/proxy<%> (interface (wx<%>) get-proxy))
-  
-  (define (make-glue% %)
-    (class* % (wx/proxy<%>)
-      (init mr prxy)
-      (init-rest args)
-      (define mred mr)
-      (define proxy prxy)
-      (public*
-       [get-mred (lambda () mred)]
-       [get-proxy (lambda () proxy)])
-      (apply super-make-object args)))
-
-  (define wx-get-mred/gen (make-generic wx<%> 'get-mred))
-  (define wx-get-proxy/gen (make-generic wx/proxy<%> 'get-proxy))
-
-  (define (wx->mred w) (send-generic w wx-get-mred/gen))
-  (define (wx->proxy w) (send-generic w wx-get-proxy/gen))
-
-
-  (define-local-member-name private-wx)
-  
-  (define mred%
-    (class object%
-      (init-field private-wx)
-      (super-make-object)))
-  
-  (define mred->wx (class-field-accessor mred% private-wx))
-  
-  (define (mred->wx-container w) (send (mred->wx w) get-container)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/README.txt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/README.txt
deleted file mode 100644
index a480da26a9..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/README.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-Allocation rules:
-
- * Use `as-objc-allocation' when creating a Cocoa object. When the
-   resulting reference becomes unreachable, the Cocoa object will be
-   released.
-
- * Use `with-autorelease' in atomic mode around calls that autorelease
-   and where the release should take effect immediate. Do not create
-   an autorelease pool except in atomic mode.
-
- * Other autoreleased objects may end up in the root pool installed by
-   "pool.rkt". The root pool is periodically destroyed and replaced;
-   call `queue-autorelease-flush' if you need to encurage replacement
-   of the pool. If you need to use an object that might be autoflushed,
-   be sure that you're in atomic mode.
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/button.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/button.rkt
deleted file mode 100644
index e76b6dae84..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/button.rkt
+++ /dev/null
@@ -1,199 +0,0 @@
-#lang racket/base
-(require ffi/unsafe/objc
-         ffi/unsafe
-         racket/class
-          "../../syntax.rkt"
-         "item.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "window.rkt"
-         "../common/event.rkt"
-         "image.rkt")
-
-(provide 
- (protect-out button%
-              core-button%
-              RacketButton))
-
-;; ----------------------------------------
-
-(import-class NSButton NSView NSImageView)
-
-(define MIN-BUTTON-WIDTH 72)
-(define BUTTON-EXTRA-WIDTH 12)
-
-(define NSSmallControlSize 1)
-(define NSMiniControlSize 2)
-
-(define-objc-class RacketButton NSButton
-  #:mixins (FocusResponder KeyMouseResponder CursorDisplayer)
-  [wxb]
-  (-a _void (clicked: [_id sender])
-      (queue-window*-event wxb (lambda (wx) (send wx clicked)))))
-
-(define NSImageLeft 2)
-(define NSImageRight 3)
-(define NSImageBelow 4)
-(define NSImageAbove 5)
-
-(defclass core-button% item%
-  (init parent cb label x y w h style font
-        [button-type #f])
-  (init-field [event-type 'button])
-  (inherit get-cocoa get-cocoa-window init-font
-           register-as-child get-wx-window)
-
-  (define button-cocoa
-    (let ([cocoa 
-           (as-objc-allocation
-            (tell (tell RacketButton alloc) 
-                  initWithFrame: #:type _NSRect (make-NSRect (make-init-point x y)
-                                                             (make-NSSize w h))))])
-      (when button-type
-        (tellv cocoa setButtonType: #:type _int button-type))
-      (unless button-type
-        (tellv cocoa setBezelStyle: #:type _int (if (or (not (string? label))
-                                                        (regexp-match? #rx"\n" label))
-                                                    NSRegularSquareBezelStyle
-                                                    NSRoundedBezelStyle)))
-      (cond
-       [(string? label)
-        (tellv cocoa setTitle: #:type _NSString (strip-mnemonic label))]
-       [else
-        (if button-type
-            (tellv cocoa setTitle: #:type _NSString "")
-            (begin
-              (when (pair? label)
-                (tellv cocoa setTitle: #:type _NSString (cadr label))
-                (tellv cocoa setImagePosition: #:type _NSInteger 
-                       (case (caddr label)
-                         [(left) NSImageLeft]
-                         [(right) NSImageRight]
-                         [(top) NSImageAbove]
-                         [(bottom) NSImageBelow])))
-              (tellv cocoa setImage: (bitmap->image (if (pair? label) (car label) label)))))])
-      (init-font cocoa font)
-      (tellv cocoa sizeToFit)
-      (when (and (eq? event-type 'button)
-                 (or (string? label)
-                     (pair? label)))
-        (when font
-          (let ([n (send font get-point-size)])
-            ;; If the font is small, adjust the control size:
-            (when (n . < . sys-font-size)
-              (tellv (tell cocoa cell) 
-                     setControlSize: #:type _int 
-                     (if (n . < . (- sys-font-size 2))
-                         NSMiniControlSize
-                         NSSmallControlSize))
-              (tellv cocoa sizeToFit))
-            ;; If the font is big, use a scalable control shape:
-            (when (n . > . (+ sys-font-size 2))
-              (tellv cocoa setBezelStyle: #:type _int NSRegularSquareBezelStyle)
-              (tellv cocoa sizeToFit))))
-        (let ([frame (tell #:type _NSRect cocoa frame)])
-          (tellv cocoa setFrame: #:type _NSRect 
-                 (make-NSRect (NSRect-origin frame)
-                              (make-NSSize (+ BUTTON-EXTRA-WIDTH
-                                              (max MIN-BUTTON-WIDTH
-                                                   (NSSize-width (NSRect-size frame))))
-                                           (NSSize-height (NSRect-size frame)))))))
-      cocoa))
-
-  (when (pair? label)
-    ;; It looks better to add extra padding around the button:
-    (let ([f (tell #:type _NSRect button-cocoa frame)])
-      (tellv button-cocoa setFrame: #:type _NSRect 
-             (make-NSRect
-              (NSRect-origin f)
-              (make-NSSize (+ (NSSize-width (NSRect-size f)) 2)
-                           (+ (NSSize-height (NSRect-size f)) 4))))))
-  
-  (define-values (cocoa image-cocoa)
-    (if (and button-type
-             (not (string? label)))
-        ;; Check-box image: need a view to join a button and an image view:
-        ;; (Could we use the NSImageButtonCell from the radio-box implementation
-        ;;  instead?)
-        (let* ([frame (tell #:type _NSRect button-cocoa frame)]
-               [new-width (+ (NSSize-width (NSRect-size frame))
-                             (send label get-width))]
-               [new-height (max (NSSize-height (NSRect-size frame))
-                                (send label get-height))])
-          (let ([cocoa (as-objc-allocation
-                        (tell (tell NSView alloc)
-                              initWithFrame: #:type _NSRect
-                              (make-NSRect (NSRect-origin frame)
-                                           (make-NSSize new-width
-                                                        new-height))))]
-                [image-cocoa (as-objc-allocation
-                              (tell (tell NSImageView alloc) init))])
-            (tellv cocoa addSubview: button-cocoa)
-            (tellv cocoa addSubview: image-cocoa)
-            (tellv image-cocoa setImage: (bitmap->image label))
-            (tellv image-cocoa setFrame: #:type _NSRect 
-                   (make-NSRect (make-NSPoint (NSSize-width (NSRect-size frame))
-                                              (quotient (- new-height
-                                                           (send label get-height))
-                                                        2))
-                                (make-NSSize (send label get-width)
-                                             (send label get-height))))
-            (tellv button-cocoa setFrame: #:type _NSRect
-                   (make-NSRect (make-NSPoint 0 0)
-                                (make-NSSize new-width new-height)))
-            (set-ivar! button-cocoa wxb (->wxb this))
-            (values cocoa image-cocoa)))
-        (values button-cocoa #f)))
-
-  (super-new [parent parent]
-             [cocoa cocoa]
-             [no-show? (memq 'deleted style)]
-             [callback cb])
-
-  (define default-button? (memq 'border style))
-  (define/override (show-children)
-    (when default-button?
-      (send (get-wx-window) add-possible-default this)))
-  (define/override (hide-children)
-    (when default-button?
-      (send (get-wx-window) remove-possible-default this)))
-
-  (define/override (enable-window on?)
-    (super enable-window on?)
-    (when default-button?
-      (send (get-wx-window) queue-default-button-check)))
-
-  (define/public (be-default) ; called by frame, only when the button is shown
-    ;; return #t to indicate succes, #f to let some other button take over
-    (and (tell #:type _BOOL button-cocoa isEnabled)
-         (begin
-           (tellv (get-cocoa-window) setDefaultButtonCell: (tell button-cocoa cell))
-           #t)))
-
-  (tellv button-cocoa setTarget: button-cocoa)
-  (tellv button-cocoa setAction: #:type _SEL (selector clicked:))
-
-  (define/override (get-cocoa-control) button-cocoa)
-
-  (define/override (maybe-register-as-child parent on?)
-    (register-as-child parent on?))
-    
-  (define/override (set-label label)
-    (cond
-     [(string? label)
-      (tellv cocoa setTitle: #:type _NSString (strip-mnemonic label))]
-     [else
-      (tellv (or image-cocoa cocoa) setImage: (bitmap->image label))]))
-  
-  (define callback cb)
-  (define/public (clicked)
-    (callback this (new control-event%
-                        [event-type event-type]
-                        [time-stamp (current-milliseconds)])))
-  
-  (def/public-unimplemented set-border))
-
-(define button%
-  (class core-button% (super-new)))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/canvas.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/canvas.rkt
deleted file mode 100644
index 976d9f00a9..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/canvas.rkt
+++ /dev/null
@@ -1,953 +0,0 @@
-#lang racket/base
-(require ffi/unsafe/objc
-         ffi/unsafe
-         racket/class
-         racket/draw
-         racket/draw/private/gl-context
-         (except-in racket/draw/private/color
-                    color% make-color)
-         (only-in racket/draw/private/bitmap quartz-bitmap%)
-         "pool.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt"
-         "window.rkt"
-         "dc.rkt"
-         "cg.rkt"
-         "queue.rkt"
-         "item.rkt"
-         "gc.rkt"
-         "image.rkt"
-         "panel.rkt"
-         "../common/backing-dc.rkt"
-         "../common/canvas-mixin.rkt"
-         "../common/event.rkt"
-         "../common/queue.rkt"
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "../common/freeze.rkt")
-
-(provide 
- (protect-out canvas%
-              canvas-panel%))
-
-;; ----------------------------------------
-
-(import-class NSView NSGraphicsContext NSScroller NSComboBox NSWindow 
-              NSImageView NSTextFieldCell 
-              NSOpenGLView NSOpenGLContext NSOpenGLPixelFormat)
-
-(import-protocol NSComboBoxDelegate)
-
-(define NSWindowAbove 1)
-
-(define o (current-error-port))
-
-;; Called when a canvas has no backing store ready
-(define (clear-background wxb)
-  (let ([wx (->wx wxb)])
-    (when wx
-      (let ([bg (send wx get-canvas-background-for-clearing)])
-        (when bg
-          (let ([ctx (tell NSGraphicsContext currentContext)])
-            (tellv ctx saveGraphicsState)
-            (let ([cg (tell #:type _CGContextRef ctx graphicsPort)]
-                  [adj (lambda (v) (/ v 255.0))])
-              (CGContextSetRGBFillColor cg
-                                        (adj (color-red bg))
-                                        (adj (color-blue bg))
-                                        (adj (color-green bg))
-                                        1.0)
-              (CGContextFillRect cg (make-NSRect (make-NSPoint 0 0)
-                                                 (make-NSSize 32000 32000))))
-            (tellv ctx restoreGraphicsState)))))))
-
-(define-objc-mixin (RacketViewMixin Superclass)
-  #:mixins (KeyMouseTextResponder CursorDisplayer FocusResponder) 
-  [wxb]
-  (-a #:async-apply (box (void))
-      _void (drawRect: [_NSRect r])
-      (when wxb
-        (let ([wx (->wx wxb)])
-          (when wx
-            (send wx drawing-requested)
-            (unless (send wx paint-or-queue-paint)
-              (clear-background wxb)
-              ;; ensure that `nextEventMatchingMask:' returns
-              (post-dummy-event))))))
-  (-a _void (viewWillMoveToWindow: [_id w])
-      (when wxb
-        (let ([wx (->wx wxb)])
-          (when wx
-            (queue-window-event wx (lambda () (send wx fix-dc)))))))
-  (-a _void (onHScroll: [_id scroller])
-      (when wxb 
-        (let ([wx (->wx wxb)])
-          (when wx (send wx do-scroll 'horizontal scroller)))))
-  (-a _void (onVScroll: [_id scroller])
-      (when wxb 
-        (let ([wx (->wx wxb)])
-          (when wx (send wx do-scroll 'vertical scroller))))))
-
-(define-objc-class RacketView NSView 
-  #:mixins (RacketViewMixin)
-  [wxb])
-
-(define-objc-class RacketGLView NSOpenGLView
-  #:mixins (RacketViewMixin)
-  [wxb])
-
-(define-objc-class CornerlessFrameView NSView 
-  []
-  (-a #:async-apply (box (void))
-      _void (drawRect: [_NSRect r])
-      (let ([ctx (tell NSGraphicsContext currentContext)])
-        (tellv ctx saveGraphicsState)
-        (let ([cg (tell #:type _CGContextRef ctx graphicsPort)]
-              [r (tell #:type _NSRect self bounds)])
-          (CGContextSetRGBFillColor cg 0 0 0 1.0)
-          (let* ([l (NSPoint-x (NSRect-origin r))]
-                 [t (NSPoint-y (NSRect-origin r))]
-                 [b (+ t (NSSize-height (NSRect-size r)))]
-                 [r (+ l (NSSize-width (NSRect-size r)))])
-            (CGContextAddLines cg
-                               (vector
-                                (make-NSPoint r (+ t scroll-width))
-                                (make-NSPoint r b)
-                                (make-NSPoint l b)
-                                (make-NSPoint l t)
-                                (make-NSPoint (- r scroll-width) t))))
-          (CGContextStrokePath cg))
-        (tellv ctx restoreGraphicsState))))
-
-(define-cocoa NSSetFocusRingStyle (_fun _int -> _void))
-(define-cocoa NSRectFill (_fun _NSRect -> _void))
-
-(define bezel-cell
-  (tell (tell NSTextFieldCell alloc) initTextCell: #:type _NSString ""))
-(tellv bezel-cell setBezeled: #:type _BOOL #t)
-
-(define-objc-class FocusView NSView 
-  [on?]
-  (-a _void (setFocusState: [_BOOL is-on?])
-      (set! on? is-on?))
-  (-a #:async-apply (box (void))
-      _void (drawRect: [_NSRect r])
-      (let ([f (tell #:type _NSRect self frame)])
-        (tellv bezel-cell 
-               drawWithFrame: #:type _NSRect (make-NSRect (make-NSPoint 2 2)
-                                                          (let ([s (NSRect-size r)])
-                                                            (make-NSSize (- (NSSize-width s) 4)
-                                                                         (- (NSSize-height s) 4))))
-               inView: self))
-      (when on?
-        (let ([ctx (tell NSGraphicsContext currentContext)])
-          (tellv ctx saveGraphicsState)
-          (NSSetFocusRingStyle 0)
-          (let ([r (tell #:type _NSRect self bounds)])
-            (NSRectFill (make-NSRect (make-NSPoint
-                                      (+ (NSPoint-x (NSRect-origin r)) 2)
-                                      (+ (NSPoint-y (NSRect-origin r)) 2))
-                                     (make-NSSize
-                                      (- (NSSize-width (NSRect-size r)) 4)
-                                      (- (NSSize-height (NSRect-size r)) 4)))))
-          (tellv ctx restoreGraphicsState)))))
-
-(define-objc-class RacketComboBox NSComboBox
-  #:mixins (FocusResponder KeyMouseTextResponder CursorDisplayer) 
-  #:protocols (NSComboBoxDelegate)
-  [wxb]
-  (-a #:async-apply (box (void))
-      _void (drawRect: [_NSRect r])
-      (super-tell #:type _void drawRect: #:type _NSRect r)
-      (let ([wx (->wx wxb)])
-        (when wx
-          (unless (send wx paint-or-queue-paint)
-            (unless (send wx during-menu-click?)
-              (clear-background wxb)
-              ;; ensure that `nextEventMatchingMask:' returns
-              (post-dummy-event))))))
-  (-a _void (comboBoxWillPopUp: [_id notification])
-      (let ([wx (->wx wxb)])
-        (when wx
-          (send wx starting-combo))))
-  (-a _void (comboBoxWillDismiss: [_id notification])
-      (let ([wx (->wx wxb)])
-        (when wx
-          (send wx ending-combo))))
-  (-a _void (viewWillMoveToWindow: [_id w])
-      (when wxb
-        (let ([wx (->wx wxb)])
-          (when wx
-            (queue-window-event wx (lambda () (send wx fix-dc))))))))
-
-(define NSOpenGLPFADoubleBuffer 5)
-(define NSOpenGLPFAStereo 6)
-(define NSOpenGLPFAColorSize 8)
-(define NSOpenGLPFAAlphaSize 11)
-(define NSOpenGLPFADepthSize 12)
-(define NSOpenGLPFAStencilSize 13)
-(define NSOpenGLPFAAccumSize 14)
-(define NSOpenGLPFAOffScreen 53)
-(define NSOpenGLPFASampleBuffers 55)
-(define NSOpenGLPFASamples 56)
-(define NSOpenGLPFAMultisample 59)
-(define NSOpenGLPFAOpenGLProfile 99)
-
-(define NSOpenGLProfileVersionLegacy #x1000)
-(define NSOpenGLProfileVersion3_2Core #x3200)
-
-(define (gl-config->pixel-format conf)
-  (let ([conf (or conf (new gl-config%))])
-    (tell (tell NSOpenGLPixelFormat alloc)
-          initWithAttributes: #:type (_list i _int)
-          (append
-           (if (version-10.7-or-later?)
-             (list NSOpenGLPFAOpenGLProfile
-                   (if (send conf get-legacy?)
-                     NSOpenGLProfileVersionLegacy
-                     NSOpenGLProfileVersion3_2Core))             
-             null)
-           (if (send conf get-double-buffered) (list NSOpenGLPFADoubleBuffer) null)
-           (if (send conf get-stereo) (list NSOpenGLPFAStereo) null)
-           (list
-            NSOpenGLPFADepthSize (send conf get-depth-size)
-            NSOpenGLPFAStencilSize (send conf get-stencil-size)
-            NSOpenGLPFAAccumSize (send conf get-accum-size))
-           (let ([ms (send conf get-multisample-size)])
-             (if (zero? ms)
-                 null
-                 (list NSOpenGLPFAMultisample
-                       NSOpenGLPFASampleBuffers 1
-                       NSOpenGLPFASamples ms)))
-           (list 0)))))
-        
-  
-(define-struct scroller (cocoa [range #:mutable] [page #:mutable]))
-(define scroll-width (tell #:type _CGFloat NSScroller scrollerWidth))
-
-;; Customizing by version is a terrible idea, but I can't figure
-;; out the right way to get the content area of an NSComboBox
-(define combo-dx (if (version-10.7-or-later?)
-                     2
-                     2))
-(define combo-dy (if (version-10.7-or-later?)
-                     4
-                     2))
-(define combo-dw (if (version-10.7-or-later?)
-                     24
-                     22))
-(define combo-dh (if (version-10.7-or-later?)
-                     6
-                     5))
-;; extra height shaved off drawing; we can't just increase
-;; combo-dh, because that just creates a request for an even taller
-;; combo box whose primitive drawing overlaps the focus ring
-(define combo-backing-dh 1)
-
-(define canvas%
-  (canvas-mixin
-   (class (canvas-autoscroll-mixin window%)
-     (init parent
-           x y w h
-           style
-           [ignored-name #f]
-           [gl-config #f])
-
-     (inherit get-cocoa get-cocoa-window
-              get-eventspace
-              make-graphics-context
-              is-shown-to-root?
-              is-shown-to-before-root?
-              is-enabled-to-root?
-              is-window-enabled?
-              block-mouse-events
-              move get-x get-y
-              register-as-child
-              get-size get-position
-              set-focus
-              client-to-screen
-              is-auto-scroll? is-disabled-scroll? 
-              get-virtual-width get-virtual-height
-              reset-auto-scroll
-              refresh-for-autoscroll
-              refresh-all-children
-              flush)
-
-     (define vscroll-ok? (and (or (memq 'vscroll style) 
-                                  (memq 'auto-vscroll style)) ; 'auto variant falls through from panel
-                              #t))
-     (define vscroll? vscroll-ok?)
-     (define hscroll-ok? (and (or (memq 'hscroll style) 
-                                  (memq 'auto-hscroll style))
-                              #t))
-     (define hscroll? hscroll-ok?)
-
-     (define wants-focus? (and (not (memq 'no-focus style))
-                               (not (is-panel?))))
-     (define is-combo? (memq 'combo style))
-     (define has-control-border? (and (not is-combo?)
-                                      (memq 'control-border style)))
-
-     (define-values (x-margin y-margin x-sb-margin y-sb-margin)
-       (cond
-        [has-control-border? (values 3 3 3 3)]
-        [(memq 'border style) (values 1 1 0 0)]
-        [else (values 0 0 0 0)]))
-
-     (define canvas-style style)
-
-     (define/override (focus-is-on on?)
-       (when has-control-border?
-         (tellv cocoa setFocusState: #:type _BOOL on?)
-         (tellv cocoa setNeedsDisplay: #:type _BOOL #t))
-       (super focus-is-on on?))
-
-     ;; The `queue-paint' and `paint-children' methods
-     ;; are defined by `canvas-mixin' from ../common/canvas-mixin
-     (define/public (queue-paint) (void))
-     (define/public (request-canvas-flush-delay)
-       (unless is-gl?
-         (request-flush-delay (get-cocoa-window))))
-     (define/public (cancel-canvas-flush-delay req)
-       (unless is-gl?
-         (cancel-flush-delay req)))
-     (define/public (queue-canvas-refresh-event thunk)
-       (queue-window-refresh-event this  thunk))
-     (define/public (skip-pre-paint?) 
-       (cond
-        [is-gl?
-         ;; We can't use GL on the window until it is ready,
-         ;; as indicated by a request to draw.
-         (unless drawing-requested?
-           (sync/timeout 0.1 drawing-requested-sema))
-         (not drawing-requested?)]
-        [else #f]))
-
-     (define drawing-requested? #f)
-     (define drawing-requested-sema (make-semaphore))
-     (define/public (drawing-requested) 
-       (unless drawing-requested?
-         (set! drawing-requested? #t)
-         (semaphore-post drawing-requested-sema)))
-
-     (define/public (paint-or-queue-paint)
-       (cond
-        [is-gl? (do-canvas-backing-flush #f)
-                (queue-paint)
-                #t]
-        [(do-canvas-backing-flush #f) #t]
-        [else (queue-paint)
-              #f]))
-
-     (define/public (do-canvas-backing-flush ctx)
-       (do-backing-flush this dc (tell NSGraphicsContext currentContext)
-                         (if is-combo? combo-dx 0) (if is-combo? combo-dy 0)))
-
-     ;; not used, because Cocoa canvas refreshes do not go through
-     ;;  the eventspace queue:
-     (define/public (schedule-periodic-backing-flush)
-       (void))
-
-     (define/public (begin-refresh-sequence)
-       (send dc suspend-flush))
-     (define/public (end-refresh-sequence)
-       (send dc resume-flush))
-
-     (define/public (get-flush-window)
-       (get-cocoa-window))
-
-     (define/private (refresh-one)
-       (when is-gl?
-         (tellv content-cocoa setNeedsDisplay: #:type _BOOL #t))
-       (queue-paint))
-     (define/override (refresh)
-       ;; can be called from any thread, including the event-pump thread
-       (refresh-one)
-       (refresh-all-children))
-
-     (define/public (queue-backing-flush)
-       (unless is-gl?
-         ;; called atomically (not expecting exceptions)
-         (tellv content-cocoa setNeedsDisplay: #:type _BOOL #t)))
-
-     (define/override (get-cocoa-content) content-cocoa)
-
-     (define is-gl? (and (not is-combo?) (memq 'gl style)))
-     (define/public (can-gl?) is-gl?)
-
-     (define dc #f)
-     (define blits null)
-     (define reg-blits null)
-
-     (super-new 
-      [parent parent]
-      [cocoa
-       (as-objc-allocation
-        (tell (tell (cond
-                     [is-combo? NSView]
-                     [has-control-border? FocusView]
-                     [(memq 'border style) (if (memq 'vscroll style)
-                                               CornerlessFrameView
-                                               FrameView)]
-                     [else NSView])
-                    alloc) 
-              initWithFrame: #:type _NSRect (make-NSRect (make-init-point x y)
-                                                         (make-NSSize (max w (* 2 x-margin))
-                                                                      (max h (* 2 y-margin))))))]
-      [no-show? (memq 'deleted style)])
-
-     (define cocoa (get-cocoa))
-
-     (define content-cocoa
-       (let ([r (make-NSRect (make-NSPoint 0 0)
-                             (make-NSSize (max 0 (- w (if vscroll? scroll-width 0) (* 2 x-margin)))
-                                          (max 0 (- h (if hscroll? scroll-width 0) (* 2 y-margin)))))])
-         (as-objc-allocation
-          (if (or is-combo? (not (memq 'gl style)))
-              (tell (tell (if is-combo? RacketComboBox RacketView)
-                          alloc)
-                    initWithFrame: #:type _NSRect r)
-              (let* ([share-context (and gl-config (send gl-config get-share-context))]
-                     [context-handle (and share-context (send share-context get-handle))]
-                     [pf (gl-config->pixel-format gl-config)]
-                     [new-context (and
-                                   context-handle
-                                   (tell (tell NSOpenGLContext alloc)
-                                         initWithFormat: pf
-                                         shareContext: context-handle))]
-                     [gl-view (tell (tell RacketGLView alloc)
-                                    initWithFrame: #:type _NSRect r
-                                    pixelFormat: pf)])
-                (when new-context
-                  (tellv gl-view setOpenGLContext: new-context)
-                  ;; We're supposed to sync via `setView:' but it fails,
-                  ;; perhaps because the view isn't yet visible:
-                  ;;   (tellv new-context setView: gl-view)
-                  (tellv new-context release))
-                (tellv pf release)
-                gl-view)))))
-     (tell #:type _void cocoa addSubview: content-cocoa)
-     (set-ivar! content-cocoa wxb (->wxb this))
-
-     (when is-combo?
-       (tellv content-cocoa setEditable: #:type _BOOL #f)
-       (tellv content-cocoa setDelegate: content-cocoa)
-       (install-control-font content-cocoa #f))
-
-     (set! dc (make-object dc% this (memq 'transparent canvas-style)))
-
-     (send dc start-backing-retained)
-
-     (queue-paint)
-
-     (define/public (is-panel?) #f)
-     
-     (define/public (get-dc) dc)
-
-     (define/public (make-compatible-bitmap w h)
-       (make-window-bitmap w h (get-cocoa-window)))
-
-     (define/override (fix-dc [refresh? #t])
-       (when (dc . is-a? . dc%)
-         (send dc reset-backing-retained)
-         (send dc set-auto-scroll
-               (if (is-auto-scroll?) (scroll-pos h-scroller) 0)
-               (if (is-auto-scroll?) (scroll-pos v-scroller) 0)))
-       (when refresh? (refresh-one)))
-
-     (define/override (get-client-size xb yb)
-       (super get-client-size xb yb)
-       (when is-combo?
-         (set-box! xb (max 0 (- (unbox xb) combo-dw)))
-         (set-box! yb (max 0 (- (unbox yb) combo-dh)))))
-
-     (define/override (maybe-register-as-child parent on?)
-       (register-as-child parent on?))
-
-     (define/public (on-paint) (void))
-
-     (define/override (set-size x y w h)
-       (do-set-size x y w h))
-
-     (define tr 0)
-
-     (define/override (show on?)
-       ;; FIXME: what if we're in the middle of an on-paint?
-       (super show on?))
-
-     (define/override (hide-children)
-       (super hide-children)
-       (fix-dc #f)
-       (suspend-all-reg-blits))
-
-     (define/override (show-children)
-       (super show-children)
-       ;; (fix-dc) ; inteferes with `paint-children''
-       (resume-all-reg-blits))
-
-     (define/override (fixup-locations-children)
-       ;; in atomic mode
-       (suspend-all-reg-blits)
-       (resume-all-reg-blits))
-
-     (define/private (do-set-size x y w h)
-       (when (pair? blits)
-         (atomically (suspend-all-reg-blits)))
-       (super set-size x y w h)
-       (when tr
-         (tellv content-cocoa removeTrackingRect: #:type _NSInteger tr)
-         (set! tr #f))
-       (let ([sz (make-NSSize (- w (if vscroll? scroll-width 0) x-margin x-margin)
-                              (- h (if hscroll? scroll-width 0) y-margin y-margin))]
-             [pos (make-NSPoint x-margin (+ (if hscroll? scroll-width 0) y-margin))])
-         (tellv content-cocoa setFrame: #:type _NSRect (make-NSRect pos sz))
-         (set! tr (tell #:type _NSInteger
-                        content-cocoa
-                        addTrackingRect: #:type _NSRect (make-NSRect (make-NSPoint x-margin y-margin) sz)
-                        owner: content-cocoa
-                        userData: #f
-                        assumeInside: #:type _BOOL #f)))
-       (when v-scroller
-         (tellv (scroller-cocoa v-scroller) setFrame: #:type _NSRect
-                (make-NSRect
-                 (make-NSPoint (- w scroll-width x-sb-margin)
-                               (+ (if hscroll?
-                                      scroll-width
-                                      0)
-                                  y-sb-margin))
-                 (make-NSSize scroll-width
-                              (max 0 (- h (if hscroll? scroll-width 0)
-                                        x-sb-margin x-sb-margin))))))
-       (when h-scroller
-         (tellv (scroller-cocoa h-scroller) setFrame: #:type _NSRect
-                (make-NSRect
-                 (make-NSPoint x-sb-margin y-sb-margin)
-                 (make-NSSize (max 0 (- w (if vscroll? scroll-width 0)
-                                        x-sb-margin x-sb-margin))
-                              scroll-width))))
-       (when (and (pair? blits)
-                  (is-shown-to-root?))
-         (atomically (resume-all-reg-blits)))
-       (fix-dc)
-       (when (and (is-auto-scroll?)
-                  (not (is-panel?)))
-         (reset-auto-scroll))
-       (on-size))
-
-     ;; this `on-size' method is for `editor-canvas%', only:
-     (define/public (on-size) (void))
-
-     (define/public (show-scrollbars h? v?)
-       (let ([h? (and h? hscroll-ok?)]
-             [v? (and v? vscroll-ok?)])
-         (unless (and (eq? h? hscroll?)
-                      (eq? v? vscroll?))
-           (cond
-            [(and h? (not hscroll?))
-             (tell #:type _void cocoa addSubview: (scroller-cocoa h-scroller))]
-            [(and hscroll? (not h?))
-             (tell #:type _void (scroller-cocoa h-scroller) removeFromSuperview)])
-           (set! hscroll? h?)
-           (cond
-            [(and v? (not vscroll?))
-             (tell #:type _void cocoa addSubview: (scroller-cocoa v-scroller))]
-            [(and vscroll? (not v?))
-             (tell #:type _void (scroller-cocoa v-scroller) removeFromSuperview)])
-           (set! vscroll? v?)
-           (let ([x (box 0)] [y (box 0)] [w (box 0)] [h (box 0)])
-             (get-position x y)
-             (get-size w h)
-             (do-set-size (unbox x) (unbox y) (unbox w) (unbox h))))))
-
-     (define/override (do-set-scrollbars h-step v-step
-                                         h-len v-len
-                                         h-page v-page
-                                         h-pos v-pos)
-       (scroll-range h-scroller h-len)
-       (scroll-page h-scroller h-page)
-       (unless (= h-pos -1)
-         (scroll-pos h-scroller h-pos))
-       (when h-scroller
-         (tellv (scroller-cocoa h-scroller) setEnabled: #:type _BOOL (and h-step (positive? h-len))))
-       (scroll-range v-scroller v-len)
-       (scroll-page v-scroller v-page)
-       (unless (= v-pos -1)
-         (scroll-pos v-scroller v-pos))
-       (when v-scroller
-         (tellv (scroller-cocoa v-scroller) setEnabled: #:type _BOOL (and v-step (positive? v-len)))))
-
-     (define/override (reset-dc-for-autoscroll)
-       (fix-dc))
-
-     (define/private (update which scroll- v)
-       (if (eq? which 'vertical)
-           (scroll- v-scroller v)
-           (scroll- h-scroller v)))
-
-     (define/public (set-scroll-page which v)
-       (update which scroll-page v))
-     (define/public (set-scroll-range which v)
-       (update which scroll-range v))
-     (define/public (set-scroll-pos which v)
-       (update which scroll-pos v))
-
-     (define/private (guard-scroll skip-guard? which get-v)
-       (if skip-guard?
-           (get-v)
-           (if (or (if (eq? which 'vertical)
-                       (not vscroll-ok?)
-                       (not hscroll-ok?))
-                   (is-disabled-scroll?)
-                   (is-auto-scroll?))
-               0
-               (get-v))))
-
-     (define/public (get-scroll-page which [skip-guard? #f]) 
-       (guard-scroll skip-guard?
-                     which
-                     (lambda ()
-                       (scroll-page (if (eq? which 'vertical) v-scroller h-scroller)))))
-     (define/public (get-scroll-range which [skip-guard? #f])
-       (guard-scroll skip-guard?
-                     which
-                     (lambda ()
-                       (scroll-range (if (eq? which 'vertical) v-scroller h-scroller)))))
-     (define/public (get-scroll-pos which [skip-guard? #f])
-       (guard-scroll skip-guard?
-                     which
-                     (lambda ()
-                       (scroll-pos (if (eq? which 'vertical) v-scroller h-scroller)))))
-     
-     (define v-scroller
-       (and vscroll-ok?
-            (make-scroller
-             (as-objc-allocation
-              (tell (tell NSScroller alloc) initWithFrame: 
-                    #:type _NSRect (make-NSRect
-                                    (make-NSPoint (- w scroll-width x-sb-margin)
-                                                  (+ (if hscroll?
-                                                         scroll-width
-                                                         0)
-                                                     y-sb-margin))
-                                    (make-NSSize scroll-width
-                                                 (max (- h (if hscroll? scroll-width 0)
-                                                         y-sb-margin y-sb-margin)
-                                                      (+ scroll-width 10))))))
-             1
-             1)))
-     (define h-scroller
-       (and hscroll-ok?
-            (make-scroller
-             (as-objc-allocation
-              (tell (tell NSScroller alloc) initWithFrame: 
-                    #:type _NSRect (make-NSRect
-                                    (make-NSPoint x-sb-margin y-sb-margin)
-                                    (make-NSSize (max (- w (if vscroll? scroll-width 0)
-                                                         x-sb-margin x-sb-margin)
-                                                      (+ scroll-width 10))
-                                                 scroll-width))))
-             1
-             1)))
-
-     (when v-scroller
-       (tell #:type _void cocoa addSubview: (scroller-cocoa v-scroller))
-       (tellv (scroller-cocoa v-scroller) setTarget: content-cocoa)
-       (tellv (scroller-cocoa v-scroller) setAction: #:type _SEL (selector onVScroll:)))
-     (when h-scroller
-       (tell #:type _void cocoa addSubview: (scroller-cocoa h-scroller))
-       (tellv (scroller-cocoa h-scroller) setTarget: content-cocoa)
-       (tellv (scroller-cocoa h-scroller) setAction: #:type _SEL (selector onHScroll:)))
-     
-     (define scroll-pos
-       (case-lambda
-        [(scroller val)
-         (when scroller
-           (tellv (scroller-cocoa scroller) setFloatValue:
-                  #:type _float (max (min 1.0 (/ val (exact->inexact (scroller-range scroller))))
-                                     0.0)))]
-        [(scroller)
-         (if scroller
-             (->long (round (* (tell #:type _float (scroller-cocoa scroller) floatValue)
-                               (scroller-range scroller))))
-             0)]))
-
-     (define scroll-range
-       (case-lambda
-        [(scroller val)
-         (when scroller
-           (let ([pos (scroll-pos scroller)]
-                 [page (scroll-page scroller)])
-             (set-scroller-range! scroller val)
-             (tell (scroller-cocoa scroller) setEnabled: #:type _BOOL (positive? val))
-             (scroll-pos scroller pos)
-             (scroll-page scroller page)))]
-        [(scroller) 
-         (if scroller
-             (scroller-range scroller)
-             1)]))
-     
-     (define scroll-page
-       (case-lambda
-        [(scroller val)
-         (when scroller
-           (set-scroller-page! scroller val)
-           (let ([proportion
-                  (max (min 1.0 (/ val 
-                                   (+ val (exact->inexact (scroller-range scroller)))))
-                       0.0)])
-             (if old-cocoa?
-                 (tellv (scroller-cocoa scroller) 
-                        setFloatValue: #:type _float (tell #:type _float (scroller-cocoa scroller)  
-                                                           floatValue)
-                        knobProportion: #:type _CGFloat proportion)
-                 (tellv (scroller-cocoa scroller) setKnobProportion:
-                        #:type _CGFloat proportion))))]
-        [(scroller)
-         (if scroller
-             (scroller-page scroller)
-             1)]))
-
-     (define/override (enable-window on?)
-       ;; in atomic mode
-       (let ([on? (and on? (is-window-enabled?))])
-         (let ([w (tell content-cocoa window)])
-           (when (ptr-equal? content-cocoa (tell w firstResponder))
-             (tellv w makeFirstResponder: #f)))
-         (block-mouse-events (not on?))
-         (when is-combo?
-           (tellv content-cocoa setEnabled: #:type _BOOL on?))))
-
-     (define/public (clear-combo-items)
-       (tellv content-cocoa removeAllItems))
-     (define/public (append-combo-item str)
-       (tellv content-cocoa addItemWithObjectValue: #:type _NSString str)
-       #t)
-     (define/public (on-combo-select i) (void))
-     (define/public (popup-combo)
-       ;; Pending refresh events interfere with combo popups
-       ;; for some reason, so flush them:
-       (yield-refresh)
-       (flush)
-       ;; Beware that the `popUp:' method is undocumented:
-       (atomically
-        (tellv (tell content-cocoa cell) popUp: #f)))
-
-     (define clear-bg? (and (not (memq 'transparent canvas-style)) 
-                            (not (memq 'no-autoclear canvas-style))))
-     (define bg-col (make-object color% "white"))
-     (define/public (get-canvas-background) (if (memq 'transparent canvas-style)
-                                                #f
-                                                bg-col))
-     (define/public (set-canvas-background col) (set! bg-col col))
-     (define/public (get-canvas-background-for-backing) (and clear-bg? bg-col))
-     (define/public (get-canvas-background-for-clearing) 
-       (and clear-bg?
-            bg-col))
-
-     (define/public (reject-partial-update r)
-       ;; Called in the event-pump thread.
-       ;; A transparent canvas cannot handle a partial update.
-       (and (or 
-             ;; Multiple clipping rects?
-             (let ([i (malloc _NSInteger)]
-                   [r (malloc 'atomic _pointer)])
-               (tellv content-cocoa getRectsBeingDrawn: #:type _pointer r 
-                      count: #:type _pointer i)
-               ((ptr-ref i _NSInteger) . > . 1))
-             ;; Single clipping not whole area?
-             (let ([s1 (NSRect-size (tell #:type _NSRect content-cocoa frame))]
-                   [s2 (NSRect-size r)])
-               (or ((NSSize-width s2) . < . (NSSize-width s1))
-                   ((NSSize-height s2) . < . (NSSize-height s1)))))
-            (begin
-              (queue-window-event this (lambda () (refresh-one)))
-              #t)))
-
-     (define/public (do-scroll direction scroller)
-       ;; Called from the Cocoa handler thread
-       (let ([part (tell #:type _int scroller hitPart)])
-         (queue-window-event 
-          this
-          (lambda ()
-            (let ([kind
-                   (cond
-                    [(= part NSScrollerDecrementPage)
-                     (set-scroll-pos direction (- (get-scroll-pos direction #t)
-                                                  (get-scroll-page direction #t)))
-                     'page-up]
-                    [(= part NSScrollerIncrementPage)
-                     (set-scroll-pos direction (+ (get-scroll-pos direction #t)
-                                                  (get-scroll-page direction #t)))
-                     'page-down]
-                    [(= part NSScrollerDecrementLine)
-                     (set-scroll-pos direction (- (get-scroll-pos direction #t) 1))
-                     'line-up]
-                    [(= part NSScrollerIncrementLine)
-                     (set-scroll-pos direction (+ (get-scroll-pos direction #t) 1))
-                     'line-down]
-                    [(= part NSScrollerKnob)
-                     'thumb]
-                    [else #f])])
-              (when kind
-                (if (is-auto-scroll?)
-                    (refresh-for-autoscroll)
-                    (on-scroll (new scroll-event%
-                                    [event-type kind]
-                                    [direction direction]
-                                    [position (get-scroll-pos direction)]))))))))
-       (constrained-reply (get-eventspace)
-                          (lambda ()
-                            (let loop () (pre-event-sync #t) (when (yield/no-sync) (loop))))
-                          (void)))
-     (define/public (on-scroll e) (void))
-     
-     (define/override (definitely-wants-event? e) 
-       ;; Called in Cocoa event-handling mode
-       (when (and wants-focus?
-                  (e . is-a? . mouse-event%)
-                  (send e button-down? 'left))
-         (set-focus))
-       (and (not (is-panel?))
-            (or (not is-combo?)
-                (e . is-a? . key-event%)
-                (not (send e button-down? 'left))
-                (not (on-menu-click? e)))))
-
-     (define/override (gets-focus?)
-       wants-focus?)
-     (define/override (can-be-responder?)
-       (and wants-focus? (is-enabled-to-root?)))
-
-     (define/private (on-menu-click? e)
-       ;; Called in Cocoa event-handling mode
-       (let ([xb (box 0)]
-             [yb (box 0)])
-         (get-client-size xb yb)
-         ((send e get-x) . > . (unbox xb))))
-
-     (define/public (on-popup) (void))
-
-     (define/public (starting-combo)
-       (set! in-menu-click? #t)
-       (tellv content-cocoa setStringValue: #:type _NSString current-text)
-       (constrained-reply (get-eventspace)
-                          (lambda () (on-popup))
-                          (void)))
-       
-     (define/public (ending-combo)
-       (set! in-menu-click? #f)
-       (let ([pos (tell #:type _NSInteger content-cocoa indexOfSelectedItem)])
-         (when (pos . > . -1)
-           (queue-window-event this (lambda () (on-combo-select pos)))))
-       (refresh-one))
-
-     (define current-text "")
-     (define/public (set-combo-text t)
-       (set! current-text t))
-
-     (define in-menu-click? #f)
-
-     (define/public (during-menu-click?)
-       ;; Called in Cocoa event-handling mode
-       in-menu-click?)
-
-     (define/public (scroll x y)
-       (when (is-auto-scroll?) 
-         (when (x . >= . 0) (scroll-pos h-scroller (floor (* x (scroll-range h-scroller)))))
-         (when (y . >= . 0) (scroll-pos v-scroller (floor (* y (scroll-range v-scroller)))))
-         (refresh-for-autoscroll)))
-
-     (define/override (get-virtual-h-pos)
-       (scroll-pos h-scroller))
-
-     (define/override (get-virtual-v-pos)
-       (scroll-pos v-scroller))
-
-     (define/public (set-resize-corner on?)
-       (void))
-
-     (define/public (get-backing-size xb yb)
-       (get-client-size xb yb)
-       (when is-combo?
-         (set-box! yb (max 0 (- (unbox yb) combo-backing-dh)))))
-
-     (define/override (get-cursor-width-delta)
-       0)
-
-     (define/public (is-flipped?)
-       (tell #:type _BOOL (get-cocoa-content) isFlipped))
-
-     (define/private (suspend-all-reg-blits)
-       (let ([cocoa-win (get-cocoa-window)])
-         (for ([r (in-list reg-blits)])
-           (tellv cocoa-win removeChildWindow: (car r))
-           (release (car r))
-           (scheme_remove_gc_callback (cdr r))))
-       (set! reg-blits null))
-
-     (define/public (resume-all-reg-blits)
-       (unless (pair? reg-blits)
-         (when (pair? blits)
-           (set! reg-blits
-                 (for/list ([b (in-list blits)])
-                   (let-values ([(x y w h img) (apply values b)])
-                     (register-one-blit x y w h img)))))))
-
-     (define/private (register-one-blit x y w h img)
-       (let ([xb (box x)]
-             [yb (box y)])
-         (client-to-screen xb yb #f)
-         (let* ([cocoa-win (get-cocoa-window)])
-           (atomically
-            (let ([win (as-objc-allocation
-                        (tell (tell NSWindow alloc)
-                              initWithContentRect: #:type _NSRect (make-NSRect (make-NSPoint (unbox xb)
-                                                                                             (- (unbox yb)
-                                                                                                h))
-                                                                               (make-NSSize w h))
-                              styleMask: #:type _int NSBorderlessWindowMask
-                              backing: #:type _int NSBackingStoreBuffered
-                              defer: #:type _BOOL NO))]
-                  [iv (tell (tell NSImageView alloc) init)])
-              (tellv iv setImage: img)
-              (tellv iv setFrame: #:type _NSRect (make-NSRect (make-NSPoint 0 0)
-                                                              (make-NSSize w h)))
-              (tellv (tell win contentView) addSubview: iv)
-              (tellv win setAlphaValue: #:type _CGFloat 0.0)
-              (tellv cocoa-win addChildWindow: win ordered: #:type _int NSWindowAbove)
-              (tellv iv release)
-              (let ([r (scheme_add_gc_callback
-                        (make-gc-action-desc win (selector setAlphaValue:) 1.0)
-                        (make-gc-action-desc win (selector setAlphaValue:) 0.0))])
-                (cons win r)))))))
-     
-     (define/public (register-collecting-blit x y w h on off on-x on-y off-x off-y)
-       (let ([on (fix-bitmap-size on w h on-x on-y)])
-         (let ([img (bitmap->image on)])
-           (atomically
-            (set! blits (cons (list x y w h img) blits))
-            (when (is-shown-to-root?)
-              (set! reg-blits (cons (register-one-blit x y w h img) reg-blits)))))))
-
-     (define/public (unregister-collecting-blits)
-       (atomically
-        (suspend-all-reg-blits)
-        (set! blits null))))))
-
-(define canvas-panel%
-  (class (panel-mixin canvas%)
-    (inherit get-virtual-h-pos
-             get-virtual-v-pos
-             get-cocoa-content)
-
-    (define/override (is-panel?) #t)
-
-    (define/override (reset-dc-for-autoscroll)
-      (let* ([content-cocoa (get-cocoa-content)])
-        (tellv content-cocoa setBoundsOrigin: #:type _NSPoint
-               (make-NSPoint (get-virtual-h-pos)
-                             (- (get-virtual-v-pos)))))
-      (super reset-dc-for-autoscroll))
-
-    (super-new)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/cg.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/cg.rkt
deleted file mode 100644
index 48d148a39b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/cg.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/objc
-         ffi/unsafe/alloc
-         "types.rkt"
-         "utils.rkt")
-
-(provide (protect-out (all-defined-out)))
-
-(define-cstruct _CGAffineTransform ([a _CGFloat]
-                                    [b _CGFloat]
-                                    [c _CGFloat]
-                                    [d _CGFloat]
-                                    [e _CGFloat]
-                                    [f _CGFloat]))
-
-(define _CGContextRef (_cpointer 'CGContextRef))
-(define-appserv CGContextSynchronize (_fun _CGContextRef -> _void))
-(define-appserv CGContextFlush (_fun _CGContextRef -> _void))
-(define-appserv CGContextTranslateCTM (_fun _CGContextRef _CGFloat _CGFloat -> _void))
-(define-appserv CGContextScaleCTM (_fun _CGContextRef _CGFloat _CGFloat -> _void))
-(define-appserv CGContextRotateCTM (_fun _CGContextRef _CGFloat -> _void))
-(define-appserv CGContextSaveGState (_fun _CGContextRef -> _void))
-(define-appserv CGContextRestoreGState (_fun _CGContextRef -> _void))
-(define-appserv CGContextConcatCTM (_fun _CGContextRef _CGAffineTransform -> _void))
-(define-appserv CGContextSetRGBFillColor (_fun _CGContextRef _CGFloat _CGFloat _CGFloat _CGFloat -> _void))
-(define-appserv CGContextFillRect (_fun _CGContextRef _NSRect -> _void))
-(define-appserv CGContextClearRect (_fun _CGContextRef _NSRect -> _void))
-(define-appserv CGContextAddRect (_fun _CGContextRef _NSRect -> _void))
-(define-appserv CGContextAddLines (_fun _CGContextRef (v : (_vector i _NSPoint)) (_long = (vector-length v)) -> _void))
-(define-appserv CGContextStrokePath (_fun _CGContextRef -> _void))
-(define-appserv CGContextClipToRects (_fun _CGContextRef (_vector i _NSRect) _size -> _void))
-(define-appserv CGContextSetAlpha (_fun _CGContextRef _CGFloat -> _void))
-
-(define _CGLayerRef (_cpointer 'CGLayerRef))
-(define-appserv CGLayerRelease (_fun _CGLayerRef ->  _void)
-  #:wrap (deallocator))
-(define-appserv CGLayerCreateWithContext (_fun _CGContextRef _NSSize _pointer -> _CGLayerRef)
-  #:wrap (allocator CGLayerRelease))
-(define-appserv CGLayerGetContext (_fun _CGLayerRef -> _CGContextRef))
-(define-appserv CGLayerGetSize (_fun _CGLayerRef ->  _NSSize))
-(define-appserv CGContextDrawLayerAtPoint (_fun _CGContextRef _NSPoint _CGLayerRef -> _void))
-(define-appserv CGContextDrawLayerInRect (_fun _CGContextRef _NSRect _CGLayerRef -> _void))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/cgl.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/cgl.rkt
deleted file mode 100644
index e30806e8fc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/cgl.rkt
+++ /dev/null
@@ -1,289 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/define
-         ffi/unsafe/alloc
-         "../../lock.rkt"
-         "utils.rkt"
-         racket/draw/unsafe/cairo
-         racket/draw/private/local
-         racket/draw/private/gl-context
-         racket/draw/private/gl-config
-         racket/draw/private/bitmap)
-
-(provide (protect-out create-gl-bitmap))
-
-(define cgl-lib 
-  (ffi-lib "/System/Library/Frameworks/OpenGL.framework/OpenGL"))
-
-(define-ffi-definer define-cgl cgl-lib)
-
-(define _GLsizei _int)
-(define _GLenum _int)
-(define _GLboolean _bool)
-(define _GLint _int)
-(define _GLuint _uint)
-(define _CGLPixelFormatAttribute _int)
-(define _CGLError _int)
-(define _CGLPixelFormatObj (_cpointer/null 'CGLPixelFormatObj))
-(define _CGLContextObj (_cpointer/null 'CGLContextObj))
-
-(define (check-ok who r)
-  (unless (zero? r)
-    (error who "failed\n   error code: ~e" r)))
-
-(define-cgl CGLChoosePixelFormat (_fun (_list i _CGLPixelFormatAttribute)
-                                       (fmt : (_ptr o _CGLPixelFormatObj))
-                                       (n : (_ptr o _GLint))
-                                       -> (r : _CGLError)
-                                       -> (and (zero? r) fmt)))
-(define-cgl CGLDestroyPixelFormat (_fun _CGLPixelFormatObj
-                                        -> (r : _CGLError)
-                                        -> (check-ok 'CGLDestroyPixelFormat r)))
-
-(define-cgl CGLDestroyContext (_fun _CGLContextObj
-                                    -> (r : _CGLError)
-                                    -> (check-ok 'CGLDestroyContext r))
-  #:wrap (deallocator))
-(define-cgl CGLCreateContext (_fun _CGLPixelFormatObj
-                                   _CGLContextObj
-                                   (ctx : (_ptr o _CGLContextObj))
-                                   -> (r : _CGLError)
-                                   -> (and (zero? r) ctx))
-  #:wrap (allocator CGLDestroyContext))
-
-(define-cgl CGLSetOffScreen (_fun _CGLContextObj _GLsizei _GLsizei _GLsizei _pointer
-                                  -> (r : _CGLError)
-                                  -> (check-ok 'CGLSetOffScreen r)))
-
-(define-cgl CGLSetCurrentContext (_fun _CGLContextObj 
-                                       -> (r : _CGLError)
-                                       -> (check-ok 'CGLSetCurrentContext r)))
-
-(define-cgl glGenFramebuffersEXT (_fun _GLint (fb : (_ptr o _GLuint))
-                                       -> _void
-                                       -> fb))
-(define-cgl glBindFramebufferEXT (_fun _GLenum _GLuint
-                                       -> _void))
-
-(define-cgl glGenRenderbuffersEXT (_fun _GLsizei (txt : (_ptr o _GLuint))
-                                        -> _void
-                                        -> txt))
-(define-cgl glBindRenderbufferEXT (_fun _GLenum _GLuint
-                                        -> _void))
-(define-cgl glRenderbufferStorageEXT (_fun _GLenum _GLenum _GLsizei _GLsizei
-                                           -> _void))
-(define-cgl glFramebufferRenderbufferEXT (_fun _GLenum _GLenum _GLenum _GLuint
-                                            -> _void))
-(define-cgl glReadPixels (_fun _GLint _GLint _GLsizei _GLsizei _GLenum _GLenum _pointer
-                               -> _void))
-
-(define GL_FRAMEBUFFER_EXT #x8D40)
-(define GL_TEXTURE_2D #x0DE1)
-(define GL_RENDERBUFFER_EXT #x8D41)
-(define GL_RGBA #x1908)
-(define GL_RGBA8 #x8058)
-(define GL_DEPTH_COMPONENT16 #x81A5)
-(define GL_UNSIGNED_BYTE #x1401)
-(define GL_COLOR_ATTACHMENT0_EXT #x8CE0)
-(define GL_DEPTH_ATTACHMENT_EXT #x8D00)
-
-(define kCGLPFAAllRenderers           1)
-(define kCGLPFADoubleBuffer           5)
-(define kCGLPFAStereo                 6)
-(define kCGLPFAAuxBuffers             7)
-(define kCGLPFAColorSize              8)
-(define kCGLPFAAlphaSize             11)
-(define kCGLPFADepthSize             12)
-(define kCGLPFAStencilSize           13)
-(define kCGLPFAAccumSize             14)
-(define kCGLPFAMinimumPolicy         51)
-(define kCGLPFAMaximumPolicy         52)
-(define kCGLPFAOffScreen             53)
-(define kCGLPFAFullScreen            54)
-(define kCGLPFASampleBuffers         55)
-(define kCGLPFASamples               56)
-(define kCGLPFAAuxDepthStencil       57)
-(define kCGLPFAColorFloat            58)
-(define kCGLPFAMultisample           59)
-(define kCGLPFASupersample           60)
-(define kCGLPFASampleAlpha           61)
-(define kCGLPFARendererID            70)
-(define kCGLPFASingleRenderer        71)
-(define kCGLPFANoRecovery            72)
-(define kCGLPFAAccelerated           73)
-(define kCGLPFAClosestPolicy         74)
-(define kCGLPFARobust                75)
-(define kCGLPFABackingStore          76)
-(define kCGLPFAMPSafe                78)
-(define kCGLPFAWindow                80)
-(define kCGLPFAMultiScreen           81)
-(define kCGLPFACompliant             83)
-(define kCGLPFADisplayMask           84)
-(define kCGLPFAPBuffer               90)
-(define kCGLPFARemotePBuffer         91)
-(define kCGLPFAAllowOfflineRenderers   96)
-(define kCGLPFAAcceleratedCompute    97)
-(define kCGLPFAOpenGLProfile         99)
-(define kCGLPFAVirtualScreenCount   128)
-
-(define dummy-cgl #f)
-(define current-cgl #f)
-
-(define cgl-context%
-  (let ([orig-gl-context% gl-context%])
-    (define gl-context%
-      (class orig-gl-context%
-        (init-field cgl touched)
-
-        (define/override (get-handle)
-          cgl)
-        
-        (define/override (do-call-as-current t)
-          (dynamic-wind
-              (lambda ()
-                (set-box! touched #t)
-                (atomically
-                 (CGLSetCurrentContext cgl)
-                 (set! current-cgl cgl)))
-              t
-              (lambda () 
-                (atomically
-                 (CGLSetCurrentContext dummy-cgl)
-                 (set! current-cgl #f)))))
-
-        (define/override (do-swap-buffers)
-          (void))
-
-        (super-new)))
-    gl-context%))
-    
-
-(define cgl-bitmap%
-  (let ([orig-bitmap% bitmap%])
-    (define bitmap%
-      (class orig-bitmap%
-        (init _cgl w h)
-        (super-make-object w h)
-
-        (define cgl _cgl)
-        (define width w)
-        (define height h)
-
-        (define bstr (make-bytes (* w h 4)))
-        (define row-bstr (make-bytes (* w w)))
-
-        (define touched (box #f))
-        
-        (define ctx (make-object cgl-context% cgl touched))
-
-        (define/override (get-bitmap-gl-context)
-          ctx)
-
-        (define/override (get-cairo-surface)
-          (surface-flush)
-          (super get-cairo-surface))
-
-        (define/override (surface-flush)
-          (when (version-10.7-or-later?)
-            (define s (super get-cairo-surface))
-            (atomically
-             (CGLSetCurrentContext cgl)
-             (glReadPixels 0 0 width height GL_RGBA GL_UNSIGNED_BYTE bstr)
-             (CGLSetCurrentContext (or current-cgl dummy-cgl)))
-            (cond
-             [(system-big-endian?)
-              ;; need ARGB
-              (for ([i (in-range 0 (* width height 4) 4)])
-                (define a (bytes-ref bstr (+ i 3)))
-                (bytes-set! bstr (+ i 1) (bytes-ref bstr i))
-                (bytes-set! bstr (+ i 2) (bytes-ref bstr (+ i 1)))
-                (bytes-set! bstr (+ i 3) (bytes-ref bstr (+ i 2)))
-                (bytes-set! bstr i a))]
-             [else
-              ;; need GBRA
-              (for ([i (in-range 0 (* width height 4) 4)])
-                (define g (bytes-ref bstr i))
-                (bytes-set! bstr i (bytes-ref bstr (+ i 2)))
-                (bytes-set! bstr (+ i 2) g))])          
-            ;; flip upside-down
-            (for ([i (in-range (quotient height 2))])
-              (define above-row (ptr-add bstr (* 4 i width)))
-              (define below-row (ptr-add bstr (* 4 (- height i) width)))
-              (memcpy row-bstr above-row (* 4 width))
-              (memcpy above-row below-row (* 4 width))
-              (memcpy below-row row-bstr (* 4 width)))
-            ;; assuming that stride = width
-            (memcpy (cairo_image_surface_get_data s) bstr (* width height 4)))
-          (super surface-flush))
-
-        (define/override (release-bitmap-storage)
-          (set! ctx #f)
-          (super release-bitmap-storage))))
-    bitmap%))
-
-(define (create-gl-bitmap w h conf)
-  (let* ([share-context (send conf get-share-context)]
-         [context-handle (if share-context (send share-context get-handle) #f)]
-         [fmt (CGLChoosePixelFormat
-               (append
-                (list kCGLPFASampleAlpha
-                      kCGLPFAColorSize 32)
-                (if (version-10.7-or-later?)
-                    null ; must use framebuffers
-                    (list kCGLPFAOffScreen))
-                (if (send conf get-stereo) (list kCGLPFAStereo) null)
-                (list
-                 kCGLPFADepthSize (send conf get-depth-size)
-                 kCGLPFAStencilSize (send conf get-stencil-size))
-                (let ([as (send conf get-accum-size)])
-                  (if (or (version-10.7-or-later?) ; deprecated in 10.7 and later
-                          (zero? as))
-                      null
-                      (list kCGLPFAAccumSize as)))
-                (let ([ms (send conf get-multisample-size)])
-                  (if (zero? ms)
-                      null
-                      (list kCGLPFASampleBuffers 1
-                            kCGLPFASamples ms)))
-                (list 0)))])
-    (and fmt
-         (let ([cgl (CGLCreateContext fmt context-handle)]
-               [d-cgl (or dummy-cgl
-                          (let ([d (CGLCreateContext fmt #f)])
-                            (when d
-                              (set! dummy-cgl d)
-                              d)))])
-           (and cgl
-                d-cgl
-                (let ([bm (make-object cgl-bitmap% cgl w h #f #t)])
-                  (and (send bm ok?)
-                       (let ([s (send bm get-cairo-surface)])
-                         (and (cond
-                               [(version-10.7-or-later?)
-                                (atomically
-                                 (CGLSetCurrentContext cgl)
-
-                                 (define fb (glGenFramebuffersEXT 1))
-                                 (glBindFramebufferEXT GL_FRAMEBUFFER_EXT fb)
-
-                                 (define rb (glGenRenderbuffersEXT 1))
-                                 (glBindRenderbufferEXT GL_RENDERBUFFER_EXT rb)
-                                 (glRenderbufferStorageEXT GL_RENDERBUFFER_EXT GL_RGBA8 w h)
-                                 (glFramebufferRenderbufferEXT GL_FRAMEBUFFER_EXT GL_COLOR_ATTACHMENT0_EXT
-                                                               GL_RENDERBUFFER_EXT rb)
-                                 
-                                 (unless (zero? (send conf get-depth-size))
-                                   (define rb2 (glGenRenderbuffersEXT 1))
-                                   (glBindRenderbufferEXT GL_RENDERBUFFER_EXT rb2)
-                                   (glRenderbufferStorageEXT GL_RENDERBUFFER_EXT GL_DEPTH_COMPONENT16 w h)
-                                   (glFramebufferRenderbufferEXT GL_FRAMEBUFFER_EXT GL_DEPTH_ATTACHMENT_EXT
-                                                                 GL_RENDERBUFFER_EXT rb2))
-
-                                 (CGLSetCurrentContext (or current-cgl dummy-cgl)))]
-                               [else
-                                (CGLSetOffScreen cgl w h
-                                                 (cairo_image_surface_get_stride s)
-                                                 (cairo_image_surface_get_data s))])
-                              bm)))))))))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/check-box.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/check-box.rkt
deleted file mode 100644
index cd2ed74a1f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/check-box.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-(require ffi/unsafe/objc
-         ffi/unsafe
-         racket/class
-          "../../syntax.rkt"
-         "button.rkt"
-         "types.rkt"
-         "const.rkt")
-
-(provide 
- (protect-out check-box%))
-
-;; ----------------------------------------
-
-(defclass check-box% core-button%
-  (inherit get-cocoa)
-  (super-new [button-type NSSwitchButton]
-             [event-type 'check-box])
-
-  (define/public (set-value v)
-    (tellv (get-cocoa) setState: #:type _NSInteger (if v 1 0)))
-  (define/public (get-value)
-    (positive? (tell #:type _NSInteger (get-cocoa) state))))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/choice.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/choice.rkt
deleted file mode 100644
index c15b724fc8..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/choice.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-          "../../syntax.rkt"
-         "item.rkt"
-         "types.rkt"
-         "const.rkt"
-         "utils.rkt"
-         "window.rkt"
-         "../common/event.rkt")
-
-(provide 
- (protect-out choice%))
-
-;; ----------------------------------------
-
-(import-class NSPopUpButton)
-
-(define-objc-class RacketPopUpButton NSPopUpButton 
-  #:mixins (FocusResponder KeyMouseResponder CursorDisplayer)
-  [wxb]
-  (-a _void (clicked: [_id sender])
-      (queue-window*-event wxb (lambda (wx) (send wx clicked)))))
-
-(defclass choice% item%
-  (init parent cb label
-        x y w h
-        choices style font)
-  (inherit get-cocoa init-font register-as-child)
-
-  (super-new [parent parent]
-             [cocoa 
-              (let ([cocoa 
-                     (as-objc-allocation
-                      (tell (tell RacketPopUpButton alloc) 
-                            initWithFrame: #:type _NSRect (make-NSRect (make-init-point x y)
-                                                                       (make-NSSize w h))
-                            pullsDown: #:type _BOOL #f))])
-                (for ([lbl (in-list choices)]
-                      [i (in-naturals)])
-                  (tellv cocoa 
-                         insertItemWithTitle: #:type _NSString lbl 
-                         atIndex: #:type _NSInteger i))
-                (init-font cocoa font)
-                (tellv cocoa sizeToFit)
-                (tellv cocoa setTarget: cocoa)
-                (tellv cocoa setAction: #:type _SEL (selector clicked:))
-                cocoa)]
-             [callback cb]
-             [no-show? (memq 'deleted style)])
-
-  (define callback cb)
-  (define/public (clicked)
-    (callback this (new control-event%
-                        [event-type 'choice]
-                        [time-stamp (current-milliseconds)])))
-  
-  (define/public (set-selection i)
-    (tellv (get-cocoa) selectItemAtIndex: #:type _NSInteger i))
-  (define/public (get-selection)
-    (tell #:type _NSInteger (get-cocoa) indexOfSelectedItem))
-  (define/public (number)
-    (tell #:type _NSInteger (get-cocoa) numberOfItems))
-  (define/public (clear)
-    (tellv (get-cocoa) removeAllItems))
-  (define/public (append lbl)
-    (tellv (get-cocoa)
-           insertItemWithTitle: #:type _NSString lbl 
-           atIndex: #:type _NSInteger (number)))
-  (define/public (delete i)
-    (tellv (get-cocoa) removeItemAtIndex: #:type _NSInteger i))
-
-  (define/override (maybe-register-as-child parent on?)
-    (register-as-child parent on?)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/clipboard.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/clipboard.rkt
deleted file mode 100644
index 73a087dbd1..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/clipboard.rkt
+++ /dev/null
@@ -1,113 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-         "utils.rkt"
-         "types.rkt"
-         "image.rkt"
-         racket/draw/unsafe/bstr
-          "../../syntax.rkt"
-          "../../lock.rkt")
-
-(provide 
- (protect-out clipboard-driver%
-              has-x-selection?))
-
-(import-class NSPasteboard NSArray NSData NSImage NSGraphicsContext)
-(import-protocol NSPasteboardOwner)
-
-(define (has-x-selection?) #f)
-
-(define (map-type s)
-  (cond
-   [(string=? s "TEXT") "public.utf8-plain-text"]
-   [else (string-append "org.racket-lang." s)]))
-
-(define (unmap-type s)
-  (cond
-   [(string=? s "public.utf8-plain-text") "TEXT"]
-   [(regexp-match #rx"^org[.]racket-lang[.](.*)$" s)
-    => (lambda (m) (cadr m))]
-   [else s]))
-
-(defclass clipboard-driver% object%
-  (init x-selection?) ; always #f
-  (super-new)
-
-  (define client #f)
-  (define counter -1)
-
-  (define/public (clear-client)
-    ;; called in event-pump thread
-    (set! client #f))
-
-  (define/public (get-client) 
-    (and client
-         (let ([c (tell #:type _NSInteger (tell NSPasteboard generalPasteboard) 
-                        changeCount)])
-           (if (= c counter)
-               client
-               (begin
-                 (set! client #f)
-                 #f)))))
-
-  (define/public (set-client c types)
-    (atomically
-     (with-autorelease
-      (let ([pb (tell NSPasteboard generalPasteboard)]
-            [a (tell NSArray arrayWithObjects:
-                     #:type (_list i _NSString) (map map-type types)
-                     count: #:type _NSUInteger (length types))])
-        (set! counter (tell #:type _NSInteger pb 
-                            declareTypes: a 
-                            owner: #f))
-        (set! client c)
-        (for ([type (in-list types)])
-          (let ([bstr (send c get-data type)])
-            (when bstr
-              (let* ([bstr (if (string? bstr)
-                               (string->bytes/utf-8 bstr)
-                               bstr)]
-                     [data (tell NSData 
-                                 dataWithBytes: #:type _bytes bstr
-                                 length: #:type _NSUInteger (bytes-length bstr))])
-                (tellv (tell NSPasteboard generalPasteboard)
-                       setData: data
-                       forType: #:type _NSString (map-type type))))))))))
-  
-  (define/public (get-data-for-type type)
-    (log-error "didn't expect clipboard data request"))
-
-  (define/public (get-text-data)
-    (let ([bstr (get-data "TEXT")])
-      (or (and bstr
-               (bytes->string/utf-8 bstr #\?))
-          "")))
-  
-  (define/public (get-data type)
-    (atomically
-     (with-autorelease
-      (let* ([pb (tell NSPasteboard generalPasteboard)]
-             [data (tell pb dataForType: #:type _NSString (map-type type))])
-        (and data
-             (let ([len (tell #:type _NSUInteger data length)]
-                   [bstr (tell #:type _pointer data bytes)])
-               (scheme_make_sized_byte_string bstr len 1)))))))
-
-  (define/public (get-bitmap-data)
-    (atomically
-     (with-autorelease
-      (let ([i (tell (tell NSImage alloc) 
-                     initWithPasteboard: (tell NSPasteboard generalPasteboard))])
-        (and i
-             (image->bitmap i))))))
-
-  (define/public (set-bitmap-data bm timestamp)
-    (define image (bitmap->image bm))
-    (atomically
-     (with-autorelease
-      (let ([pasteboard (tell NSPasteboard generalPasteboard)])
-        (tell pasteboard clearContents)
-        (let ([copied-objects (tell NSArray arrayWithObject: image)])
-          (tell pasteboard writeObjects: copied-objects)
-          (void)))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/colordialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/colordialog.rkt
deleted file mode 100644
index 6a44e0f052..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/colordialog.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/objc
-         racket/class
-         racket/draw/private/color
-         "../../lock.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "queue.rkt")
-
-(provide 
- (protect-out get-color-from-user))
-
-(import-class NSColorPanel
-              NSColor)
-
-(define-cocoa NSDeviceRGBColorSpace _id)
-
-(define (get-color-from-user mode)
-  (promote-to-gui!)
-  (cond
-   [(eq? mode 'show)
-    (tellv (tell NSColorPanel sharedColorPanel)
-           orderFront: #f)]
-   [(eq? mode 'get)
-    (atomically
-     (let ([c (tell (tell (tell NSColorPanel sharedColorPanel) color)
-                    colorUsingColorSpaceName: NSDeviceRGBColorSpace)]
-           [as-color (lambda (v)
-                       (inexact->exact (floor (* 255.0 v))))])
-       (make-object color%
-                    (as-color
-                     (tell #:type _CGFloat c redComponent))
-                    (as-color
-                     (tell #:type _CGFloat c greenComponent))
-                    (as-color
-                     (tell #:type _CGFloat c blueComponent)))))]
-   [else
-    (let ([p (tell NSColorPanel sharedColorPanel)]
-          [color mode])
-      (atomically
-       (tellv p setColor: (tell NSColor
-                                colorWithDeviceRed: #:type _CGFloat (/ (color-red color) 255.0)
-                                green: #:type _CGFloat (/ (color-green color) 255.0)
-                                blue: #:type _CGFloat (/ (color-blue color) 255.0)
-                                alpha: #:type _CGFloat 1.0))))]))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/const.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/const.rkt
deleted file mode 100644
index 827c412763..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/const.rkt
+++ /dev/null
@@ -1,126 +0,0 @@
-#lang racket/base
-
-(provide (except-out (all-defined-out) <<))
-
-(define (<< a b) (arithmetic-shift a b))
-
-(define NSTitledWindowMask 1)
-(define NSBorderlessWindowMask 0)
-(define NSClosableWindowMask 2)
-(define NSMiniaturizableWindowMask 4)
-(define NSResizableWindowMask 8)
-(define NSUtilityWindowMask (1 . << . 4))
-(define NSTexturedBackgroundWindowMask 256)
-
-(define NSBackingStoreBuffered 2)
-(define NSRoundedBezelStyle 1)
-(define NSRegularSquareBezelStyle 2)
-
-(define NSLeftMouseDown 1)
-(define NSLeftMouseUp 2)
-(define NSRightMouseDown 3)
-(define NSRightMouseUp 4)
-(define NSMouseMoved 5)
-(define NSLeftMouseDragged 6)
-(define NSRightMouseDragged 7)
-(define NSMouseEntered 8)
-(define NSMouseExited 9)
-(define NSKeyDown 10)
-(define NSKeyUp 11)
-(define NSFlagsChanged 12)
-(define NSAppKitDefined 13)
-(define NSSystemDefined 14)
-(define NSApplicationDefined 15)
-(define NSPeriodic 16)
-(define NSCursorUpdate 17)
-(define NSScrollWheel 22)
-(define NSTabletPoint 23)
-(define NSTabletProximity 24)
-(define NSOtherMouseDown 25)
-(define NSOtherMouseUp 26)
-(define NSOtherMouseDragged 27)
-(define NSEventTypeGesture 29)
-(define NSEventTypeMagnify 30)
-(define NSEventTypeSwipe 31)
-(define NSEventTypeRotate 18)
-(define NSEventTypeBeginGesture 19)
-(define NSEventTypeEndGesture 20)
-
-(define MouseAndKeyEventMask
-  (bitwise-ior
-   (1 . << . NSLeftMouseDown)
-   (1 . << . NSLeftMouseUp)
-   (1 . << . NSRightMouseDown)
-   (1 . << . NSRightMouseUp)
-   (1 . << . NSMouseMoved)
-   (1 . << . NSLeftMouseDragged)
-   (1 . << . NSRightMouseDragged)
-   (1 . << . NSMouseEntered)
-   (1 . << . NSMouseExited)
-   (1 . << . NSKeyDown)
-   (1 . << . NSKeyUp)
-   (1 . << . NSScrollWheel)
-   (1 . << . NSTabletPoint)
-   (1 . << . NSTabletProximity)
-   (1 . << . NSOtherMouseDown)
-   (1 . << . NSOtherMouseUp)
-   (1 . << . NSOtherMouseDragged)
-   (1 . << . NSEventTypeGesture)
-   (1 . << . NSEventTypeMagnify)
-   (1 . << . NSEventTypeSwipe)
-   (1 . << . NSEventTypeRotate)
-   (1 . << . NSEventTypeBeginGesture)
-   (1 . << . NSEventTypeEndGesture)))
-
-(define NSAlphaShiftKeyMask (1 . << . 16))
-(define NSShiftKeyMask (1 . << . 17))
-(define NSControlKeyMask (1 . << . 18))
-(define NSAlternateKeyMask (1 . << . 19))
-(define NSCommandKeyMask (1 . << . 20))
-(define NSNumericPadKeyMask (1 . << . 21))
-(define NSHelpKeyMask (1 . << . 22))
-(define NSFunctionKeyMask (1 . << . 23))
-
-(define NSScrollerNoPart 0)
-(define NSScrollerDecrementPage 1)
-(define NSScrollerKnob 2)
-(define NSScrollerIncrementPage 3)
-(define NSScrollerDecrementLine 4)
-(define NSScrollerIncrementLine 5)
-(define NSScrollerKnobSlot 6)
-
-(define NSMomentaryLightButton 0)
-(define NSPushOnPushOffButton 1)
-(define NSToggleButton 2)
-(define NSSwitchButton 3)
-(define NSRadioButton 4)
-(define NSMomentaryChangeButton 5)
-(define NSOnOffButton 6)
-(define NSMomentaryPushInButton 7)
-(define NSMomentaryPushButton 0)
-(define NSMomentaryLight 7)
-
-(define NSFocusRingTypeDefault 0)
-(define NSFocusRingTypeNone 1)
-(define NSFocusRingTypeExterior 2)
-
-(define kCGBitmapAlphaInfoMask #x1F)
-(define kCGBitmapFloatComponents (1 . << . 8))
-(define kCGBitmapByteOrderMask #x7000)
-(define kCGBitmapByteOrderDefault (0 . << . 12))
-(define kCGBitmapByteOrder16Little (1 . << . 12))
-(define kCGBitmapByteOrder32Little (2 . << . 12))
-(define kCGBitmapByteOrder16Big (3 . << . 12))
-(define kCGBitmapByteOrder32Big (4 . << . 12))
-
-(define kCGImageAlphaNone 0)
-(define kCGImageAlphaPremultipliedLast 1)
-(define kCGImageAlphaPremultipliedFirst 2)
-(define kCGImageAlphaLast 3)
-(define kCGImageAlphaFirst 4)
-(define kCGImageAlphaNoneSkipLast 5)
-(define kCGImageAlphaNoneSkipFirst 6)
-
-(define NSWindowCollectionBehaviorFullScreenPrimary   128)
-(define NSWindowCollectionBehaviorFullScreenAuxiliary 256)
-(define NSFullScreenWindowMask (1 . << . 14))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/cursor.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/cursor.rkt
deleted file mode 100644
index 0ca120c1ba..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/cursor.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/objc
-         racket/class
-         racket/draw
-         "image.rkt"
-         "types.rkt"
-         "utils.rkt"
-         "../common/cursor-draw.rkt"
-         "../common/local.rkt")
-
-(provide 
- (protect-out cursor-driver%
-              arrow-cursor-handle
-              get-wait-cursor-handle))
-
-(import-class NSCursor)
-
-(define wait #f)
-(define bullseye #f)
-(define blank #f)
-(define size-ne/sw #f)
-(define size-nw/se #f)
-
-(define-syntax-rule (image-cursor id draw-proc)
-  (or id
-      (begin
-        (set! id (make-image-cursor draw-proc))
-        id)))
-
-(define (make-image-cursor draw-proc)
-  (let* ([bm (make-cursor-image draw-proc)])
-    (let ([image (bitmap->image bm)])
-      (tell (tell NSCursor alloc)
-            initWithImage: image
-            hotSpot: #:type _NSPoint (make-NSPoint 8 8)))))
-
-(define arrow-cursor-handle (tell NSCursor arrowCursor))
-(define (get-wait-cursor-handle)
-  (image-cursor wait draw-watch))
-
-(define cursor-driver% 
-  (class object%
-    (define handle #f)
-
-    (define/public (set-standard sym)
-      (case sym
-        [(arrow)
-         (set! handle arrow-cursor-handle)]
-        [(cross)
-         (set! handle (tell NSCursor crosshairCursor))]
-        [(hand)
-         (set! handle (tell NSCursor openHandCursor))]
-        [(ibeam)
-         (set! handle (tell NSCursor IBeamCursor))]
-        [(size-n/s)
-         (set! handle (tell NSCursor resizeUpDownCursor))]
-        [(size-e/w)
-         (set! handle (tell NSCursor resizeLeftRightCursor))]
-        [(size-nw/se)
-         (set! handle (image-cursor size-nw/se draw-nw/se))]
-        [(size-ne/sw)
-         (set! handle (image-cursor size-ne/sw draw-ne/sw))]
-        [(watch)
-         (set! handle (get-wait-cursor-handle))]
-        [(bullseye)
-         (set! handle (image-cursor bullseye draw-bullseye))]
-        [(blank)
-         (set! handle (image-cursor blank void))]))
-
-    (define/public (set-image image mask hot-spot-x hot-spot-y)
-      (let ([bm (make-object bitmap% 16 16 #f #t)])
-        (let ([dc (make-object bitmap-dc% bm)])
-          (send dc draw-bitmap image 0 0 'solid (send the-color-database find-color "black") mask)
-          (send dc set-bitmap #f))
-        (let ([image (bitmap->image bm)])
-          (set! handle
-                (as-objc-allocation
-                 (tell (tell NSCursor alloc)
-                       initWithImage: image
-                       hotSpot: #:type _NSPoint (make-NSPoint hot-spot-x hot-spot-y)))))))
-    
-    (define/public (ok?) (and handle #t))
-
-    (define/public (get-handle) handle)
-
-    (super-new)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/dc.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/dc.rkt
deleted file mode 100644
index 2a1afe13cf..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/dc.rkt
+++ /dev/null
@@ -1,297 +0,0 @@
-#lang racket/base
-(require "../../syntax.rkt"
-         racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-         racket/draw/unsafe/cairo
-         racket/draw/private/bitmap
-         racket/draw/private/local
-         racket/draw/private/gl-context
-         "types.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "window.rkt"
-         "../../lock.rkt"
-         "../common/queue.rkt"
-         "../common/backing-dc.rkt"
-         "cg.rkt")
-
-(provide 
- (protect-out dc%
-              do-backing-flush)
- display-bitmap-resolution
- make-screen-bitmap
- make-window-bitmap)
-
-(import-class NSOpenGLContext NSScreen NSGraphicsContext NSWindow)
-
-(define NSOpenGLCPSwapInterval 222)
-
-(define dc%
-  (class backing-dc%
-    (init [(cnvs canvas)]
-          transparent?)
-    (define canvas cnvs)
-
-    (inherit end-delay)
-    (super-new [transparent? transparent?])
-
-    (define gl #f)
-    (define/override (get-gl-context)
-      (and (send canvas can-gl?)
-           (let ([gl-ctx (tell (send canvas get-cocoa-content) openGLContext)])
-             (or gl
-                 (let ([g (new (class gl-context%
-                                 (define/override (get-handle) gl-ctx)
-                                 (define/override (do-call-as-current t)
-                                   (dynamic-wind
-                                       (lambda () (tellv gl-ctx makeCurrentContext))
-                                       t
-                                       (lambda () (tellv NSOpenGLContext clearCurrentContext))))
-                                 (define/override (do-swap-buffers)
-                                   (tellv gl-ctx flushBuffer))
-                                 (super-new)))])
-                   ;; Disable screen sync for GL flushBuffer; otherwise,
-                   ;; flushBuffer can take around 10 msec depending on the timing
-                   ;; of event polling, and that can be bad for examples like gears.
-                   ;; Maybe whether to sync with the screen should be a configuration
-                   ;; option, but I can't tell the difference on my screen.
-                   (tellv gl-ctx setValues: 
-                          #:type (_ptr i _long) 0
-                          forParameter: #:type _int NSOpenGLCPSwapInterval)
-                   (set! gl g)
-                   g)))))
-
-    ;; Use a quartz bitmap so that text looks good:
-    (define trans? transparent?)
-    (define/override (make-backing-bitmap w h) 
-      (make-window-bitmap w h (send canvas get-cocoa-window) 
-                          trans?
-                          (send canvas is-flipped?)))
-                   
-    (define/override (can-combine-text? sz) #t)
-
-    (define/override (get-backing-size xb yb)
-      (send canvas get-backing-size xb yb))
-
-    (define/override (get-size)
-      (let ([xb (box 0)]
-            [yb (box 0)])
-        (send canvas get-virtual-size xb yb)
-        (values (unbox xb) (unbox yb))))
-
-    (define/override (queue-backing-flush)
-      ;; Re-enable expose events so that the queued 
-      ;; backing flush will be handled:
-      (end-delay)
-      (send canvas queue-backing-flush))
-
-    (define/override (flush)
-      (send canvas flush))
-
-    (define/override (request-delay)
-      (send canvas request-canvas-flush-delay))
-    (define/override (cancel-delay req)
-      (send canvas cancel-canvas-flush-delay req))))
-
-(define-local-member-name get-layer)
-
-(define (do-backing-flush canvas dc ctx dx dy)
-  (tellv ctx saveGraphicsState)
-  (begin0
-   (send dc on-backing-flush
-         (lambda (bm)
-           (let ([w (box 0)]
-                 [h (box 0)])
-             (send canvas get-client-size w h)
-             (let ([cg (tell #:type _CGContextRef ctx graphicsPort)])
-               (cond
-                [(bm . is-a? . layer-bitmap%)
-                 (define layer (send bm get-layer))
-                 (CGContextDrawLayerAtPoint cg (make-NSPoint dx dy) layer)]
-                [else
-                 (unless (send canvas is-flipped?)
-                   (CGContextTranslateCTM cg 0 (unbox h))
-                   (CGContextScaleCTM cg 1 -1))
-                 (CGContextTranslateCTM cg dx dy)
-                 (let* ([surface (cairo_quartz_surface_create_for_cg_context cg (unbox w) (unbox h))]
-                        [cr (cairo_create surface)])
-                   (cairo_surface_destroy surface)
-                   (backing-draw-bm bm cr (unbox w) (unbox h))
-                   (cairo_destroy cr))])))))
-   (tellv ctx restoreGraphicsState)))
-
-(define (display-bitmap-resolution num fail)
-  (if (version-10.7-or-later?)
-      (let ([r (atomically
-                (with-autorelease
-                 (let ([s (if (zero? num)
-                              (tell NSScreen mainScreen)
-                              (let ([screens (tell NSScreen screens)])
-                                (if (num . < . (tell #:type _NSUInteger screens count))
-                                    (tell screens objectAtIndex: #:type _NSUInteger num)
-                                    #f)))])
-                   (and s
-                        (tell #:type _CGFloat s backingScaleFactor)))))])
-        (cond
-         [(not r) (fail)]
-         [(zero? r) 1.0]
-         [else r]))
-      1.0))
-
-(define/top (make-screen-bitmap [exact-positive-integer? w]
-                                [exact-positive-integer? h])
-  (make-object quartz-bitmap% w h #t
-               (display-bitmap-resolution 0 void)))
-
-(define (make-window-bitmap w h win [trans? #t] [flipped? #f])
-  (if win
-      (make-object layer-bitmap% w h win trans? flipped?)
-      (make-screen-bitmap w h)))
-
-(define layer-bitmap%
-  (class quartz-bitmap%
-    (init w h win trans? flipped?)
-    (inherit get-backing-scale)
-
-    (define layer (make-layer win w h))
-    (define layer-w w)
-    (define layer-h h)
-    (define/public (get-layer) layer)
-
-    (define is-trans? trans?)
-
-    (let ([bs (inexact->exact 
-               (display-bitmap-resolution 0 (lambda () 1)))])
-      (super-make-object w h trans? bs
-                         (let ([cg (CGLayerGetContext layer)])
-                           (unless flipped?
-                             (CGContextTranslateCTM cg 0 h)
-                             (CGContextScaleCTM cg 1 -1))
-                           (unless (= bs 1)
-                             (CGContextScaleCTM cg (/ 1 bs) (/ 1 bs)))
-                           cg)))
-
-    (define/override (draw-bitmap-to cr sx sy dx dy w h alpha clipping-region)
-      ;; Called when the destination rectangle is inside the clipping region
-      (define s (cairo_get_target cr))
-      (cond
-       [(and (= (cairo_surface_get_type s) CAIRO_SURFACE_TYPE_QUARTZ)
-             (= sx 0)
-             (= sy 0)
-             (let ([rs (cairo_copy_clip_rectangle_list cr)])
-               (cond
-                [(and (= CAIRO_STATUS_SUCCESS (cairo_rectangle_list_t-status rs))
-                      (< (cairo_rectangle_list_t-num_rectangles rs) 64))
-                 rs]
-                [else
-                 (cairo_rectangle_list_destroy rs)
-                 #f])))
-        =>
-        (lambda (rs)
-          ;; Use fast layer drawing:
-          (unless (or (zero? (cairo_rectangle_list_t-num_rectangles rs))
-                      (zero? alpha))
-            (atomically
-             (define m (make-cairo_matrix_t 0 0 0 0 0 0))
-             (cairo_get_matrix cr m)
-             (define trans
-               (make-CGAffineTransform (cairo_matrix_t-xx m)
-                                       (cairo_matrix_t-yx m)
-                                       (cairo_matrix_t-xy m)
-                                       (cairo_matrix_t-yy m)
-                                       (cairo_matrix_t-x0 m)
-                                       (cairo_matrix_t-y0 m)))
-             (cairo_surface_flush s)
-             (define cg (cairo_quartz_surface_get_cg_context s))
-             (begin
-               ;; A Cairo flush doesn't reset the clipping region. The
-               ;; implementation of clipping is that there's a saved
-               ;; GState that we can use to get back to the original
-               ;; clipping region, so restore (and save again) that state:
-               (CGContextRestoreGState cg)
-               (CGContextSaveGState cg))
-             (CGContextSaveGState cg)
-             (CGContextConcatCTM cg trans)
-             (let ([n (cairo_rectangle_list_t-num_rectangles rs)])
-               (define vec
-                 (for/vector #:length n ([i (in-range n)])
-                   (define r (ptr-add (cairo_rectangle_list_t-rectangles rs) i _cairo_rectangle_t))
-                   (make-NSRect (make-NSPoint (cairo_rectangle_t-x r)
-                                              (cairo_rectangle_t-y r))
-                                (make-NSSize (cairo_rectangle_t-width r)
-                                             (cairo_rectangle_t-height r)))))
-               (CGContextClipToRects cg vec n))
-             ;; Flip target, because drawing to layer was flipped
-             (CGContextTranslateCTM cg 0 (+ dy h))
-             (CGContextScaleCTM cg 1 -1)
-             (CGContextSetAlpha cg alpha)
-             (CGContextDrawLayerInRect cg
-                                       (make-NSRect (make-NSPoint dx 0)
-                                                    (make-NSSize w h))
-                                       layer)
-             
-             (CGContextRestoreGState cg)
-             (cairo_surface_mark_dirty s)))
-          (cairo_rectangle_list_destroy rs)
-          #t)]
-       [else #f]))
-
-    (define s-bm #f)
-    (define/override (get-cairo-surface)
-      ;; Convert to a platform bitmap, which Cairo understands
-      (let ([t-bm (or s-bm
-                      (let ([bm (make-object quartz-bitmap%
-                                             layer-w layer-h 
-                                             is-trans?
-                                             (get-backing-scale))])
-                        (define dc (send bm make-dc))
-                        ;; For some reason, we must touch the DC
-                        ;; to make transarent work right. It works
-                        ;; to draw beyond the visible region:
-                        (send dc draw-rectangle (+ layer-w 5) (+ layer-h 5) 1 1)
-                        (send dc draw-bitmap this 0 0)
-                        (send dc set-bitmap #f)
-                        (set! s-bm bm)
-                        bm))])
-        (send t-bm get-cairo-surface)))
-
-    (define/override (get-cairo-target-surface)
-      (super get-cairo-surface))
-
-    (define/override (drop-alpha-s)
-      (super drop-alpha-s)
-      (set! s-bm #f))
-
-    (define/override (release-bitmap-storage)
-      (super release-bitmap-storage)
-      (set! s-bm #f)
-      (atomically
-       (when layer
-         (CGLayerRelease layer)
-         (set! layer #f))))))
-
-(define (make-layer win w h)
-  (atomically
-   (with-autorelease
-    (let* ([ctx (if ((tell #:type _NSInteger win windowNumber) . <= . 0)
-                    ;; Window's device is gone, probably because it was hidden,
-                    ;; and we configure windows with setOneShot: YES.
-                    ;; Just make a new window...
-                    (let ([alt-win (make-temp-window)])
-                      (begin0
-                       (tell NSGraphicsContext graphicsContextWithWindow: alt-win)
-                       (tellv alt-win release)))
-                    ;; Use canvas's window:
-                    (tell NSGraphicsContext graphicsContextWithWindow: win))]
-           [tmp-cg (tell #:type _CGContextRef ctx graphicsPort)]
-           [layer (CGLayerCreateWithContext tmp-cg (make-NSSize w h) #f)])
-      layer))))
-
-(define (make-temp-window)
-  (tell (tell NSWindow alloc)
-        initWithContentRect: #:type _NSRect (make-NSRect (make-NSPoint 0 0)
-                                                         (make-NSSize 10 10))
-        styleMask: #:type _int 0
-        backing: #:type _int NSBackingStoreBuffered
-        defer: #:type _BOOL NO))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/dialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/dialog.rkt
deleted file mode 100644
index bfb8517ec2..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/dialog.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-(require racket/class
-          "../../syntax.rkt"
-          "../common/queue.rkt"
-          "../common/dialog.rkt"
-          "../../lock.rkt"
-         "frame.rkt")
-
-(provide 
- (protect-out dialog%))
-
-(define dialog% 
-  (class (dialog-mixin frame%)
-    (super-new [is-dialog? #t])
-
-    ;; #t result avoids children sheets
-    (define/override (get-sheet) #t)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/filedialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/filedialog.rkt
deleted file mode 100644
index f907a5379e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/filedialog.rkt
+++ /dev/null
@@ -1,113 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/objc
-         racket/class
-         racket/path
-         "../../lock.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "queue.rkt"
-         "frame.rkt")
-
-(provide (protect-out file-selector))
-
-(import-class NSOpenPanel NSSavePanel NSURL NSArray)
-
-(define (nsurl->string url)
-  (string->path (tell #:type _NSString url path)))
-
-(define (file-selector message directory filename 
-                       extension
-                       filters style parent)
-  (promote-to-gui!)
-  (let ([ns (as-objc-allocation-with-retain
-             (if (memq 'put style)
-                (tell NSSavePanel savePanel)
-                (tell NSOpenPanel openPanel)))]
-        [parent (and parent
-                     (not (send parent get-sheet))
-                     parent)])
-
-    (let* ([globs (apply append
-                         (map (lambda (f) (regexp-split #rx" *; *" (cadr f)))
-                              filters))]
-           ;; get suffixes from "*.foo" globs (and *only* such globs)
-           [extensions
-            (for/list ([g (in-list globs)]
-                       #:when (and (regexp-match #rx"[*][.][^.]+$" g)
-                                   (not (equal? g "*.*"))))
-              (car (regexp-match #rx"[^.]+$" g)))]
-           [extensions
-            (if (memq 'packages style) (cons "app" extensions) extensions)]
-           [extensions
-            (if (and extension (not (equal? "" extension)))
-              (cons extension extensions) extensions)])
-      (unless (null? extensions)
-        (when (memq 'put style)
-          (tellv ns setCanSelectHiddenExtension: #:type _BOOL #t))
-        (let ([allow-any? (member "*.*" globs)])
-          (when (or (not allow-any?)
-                    (memq 'put style))
-            (let ([a (tell NSArray
-                           arrayWithObjects: #:type (_list i _NSString) extensions
-                           count: #:type _NSUInteger (length extensions))])
-              (tellv ns setAllowedFileTypes: a))
-            (tellv ns setAllowsOtherFileTypes: #:type _BOOL allow-any?)))))
-
-    (cond
-     [(memq 'multi style)
-      (tellv ns setAllowsMultipleSelection: #:type _BOOL #t)]
-     [(memq 'dir style)
-      (tellv ns setCanChooseDirectories: #:type _BOOL #t)
-      (tellv ns setCanChooseFiles: #:type _BOOL #f)])
-
-    (when (or (memq 'put style)
-              (memq 'dir style))
-      (tellv ns setCanCreateDirectories: #:type _BOOL #t))
-
-    (when message
-      (tellv ns setMessage: #:type _NSString message))
-    (when directory
-      (let ([dir (if (string? directory)
-                     directory
-                     (path->string directory))])
-        (if (version-10.6-or-later?)
-            (tellv ns setDirectoryURL: (tell NSURL 
-                                             fileURLWithPath: #:type _NSString dir
-                                             isDirectory: #:type _BOOL #t))
-            (tellv ns setDirectory: #:type _NSString dir))))
-    (when filename
-      (when (version-10.6-or-later?)
-        (tellv ns setNameFieldStringValue: #:type _NSString (path->string
-                                                             (file-name-from-path filename)))))
-    
-    (when (memq 'enter-packages style)
-      (tellv ns setTreatsFilePackagesAsDirectories: #:type _BOOL #t))
-
-    (let ([result 
-           ;; We run the file dialog completely modally --- shutting out
-           ;; all other eventspaces and threads. It would be nice to improve
-           ;; on this, but it's good enough.
-           (atomically
-            (let ([front (get-front)]
-                  [parent (and (version-10.6-or-later?)
-                               parent)])
-              (when parent
-                (tellv ns beginSheetModalForWindow: (send parent get-cocoa-window)
-                       completionHandler: #f))
-              (begin0
-               (tell #:type _NSInteger ns runModal)
-               (when parent (tell app endSheet: ns))
-               (when front (tellv (send front get-cocoa-window)
-                                  makeKeyAndOrderFront: #f)))))])
-      (begin0
-       (if (zero? result)
-           #f
-           (if (memq 'multi style)
-               (let ([urls (tell ns URLs)])
-                 (for/list ([i (in-range (tell #:type _NSUInteger urls count))])
-                   (nsurl->string (tell urls objectAtIndex: #:type _NSUInteger i))))
-               (let ([url (tell ns URL)])
-                 (nsurl->string url))))
-       (release ns)))))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/finfo.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/finfo.rkt
deleted file mode 100644
index 15d21f913d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/finfo.rkt
+++ /dev/null
@@ -1,154 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         "utils.rkt"
-         "types.rkt")
-
-(provide 
- (protect-out file-creator-and-type))
-
-(define coreserv-lib (ffi-lib (format "/System/Library/Frameworks/CoreServices.framework/CoreServices")))
-
-(define-ffi-definer define-coreserv coreserv-lib)
-
-(define kFSCatInfoFinderInfo #x00000800)
-(define _FSCatalogInfoBitmap _uint32)
-
-(define _FSVolumeRefNum _int16)
-
-(define-cstruct _UTCDateTime
-  ([highSeconds _uint16]
-   [lowSeconds _uint32]
-   [fraction _uint16])
-  #:alignment 2)
-
-(define-cstruct _Point
-  ([v _short]
-   [h _short]))
-
-(define _OSType _uint32)
-
-(define-cstruct _FileInfo
-  ([fileType _OSType]
-   [fileCreator _OSType]
-   [finderFlags _uint16]
-   [location _Point]
-   [reservedField _uint16])
-  #:alignment 2)
-
-(define-cstruct _FSPermissionInfo
-  ([userID _uint32]
-   [groupID _uint32]
-   [word _uint32]
-   [fileSec _pointer])
-  #:alignment 2)
-
-(define-cstruct _FSCatalogInfo
-  ([nodeFlags _uint16]
-   [volume _FSVolumeRefNum]
-   [parentDirID _uint32]
-   [nodeID _uint32]
-   [sharingFlags _uint8]
-   [userPrivileges _uint8]
-   [reserved1 _uint8]
-   [reserved2 _uint8]
-   [createDate _UTCDateTime]
-   [contentModDate _UTCDateTime]
-   [attributeModDate _UTCDateTime]
-   [accessDate _UTCDateTime]
-   [backupDate _UTCDateTime]
-   [permissions _FSPermissionInfo]
-   [finderInfo _FileInfo]
-   ;; .... 144 or 148 bytes total
-   )
-  #:alignment 2)
-
-(define _FSRef _pointer) ; 80 bytes
-
-(define-coreserv FSPathMakeRef (_fun _path _FSRef (_pointer = #f) -> _OSStatus))
-
-(define-coreserv FSGetCatalogInfo
-  (_fun _FSRef
-        _FSCatalogInfoBitmap 
-        _FSCatalogInfo-pointer
-        _pointer ; outname, #f is ok
-        _pointer ; fsSpec, #f is ok
-        _pointer ; parentRef, #f is ok
-        -> _OSStatus))
-
-(define-coreserv FSSetCatalogInfo
-  (_fun _FSRef
-        _FSCatalogInfoBitmap 
-        _FSCatalogInfo-pointer
-        -> _OSStatus))
-
-(define (path->fsref s)
-  (let ([fs (malloc 80)])
-    (let ([r (FSPathMakeRef s fs)])
-      (unless (zero? r)
-        (filesystem-error 'file-creator-and-type "could not access file (~a): ~v"
-                          r
-                          s)))
-    fs))
-
-(define (int->str v)
-  (bytes (arithmetic-shift (bitwise-and v #xFF000000) -24)
-         (arithmetic-shift (bitwise-and v #xFF0000) -16)
-         (arithmetic-shift (bitwise-and v #xFF00) -8)
-         (bitwise-and v #xFF)))
-
-(define (str->int v)
-  (bitwise-ior (arithmetic-shift (bytes-ref v 0) 24)
-               (arithmetic-shift (bytes-ref v 1) 16)
-               (arithmetic-shift (bytes-ref v 2) 8)
-               (bytes-ref v 3)))
-
-(define (get-info v fs path)
-  (let ([r (FSGetCatalogInfo fs
-                             kFSCatInfoFinderInfo
-                             v
-                             #f #f #f)])
-    (unless (zero? r)
-      (filesystem-error 'file-creator-and-type "lookup failed (~a): ~e"
-                        r
-                        path))))
-
-(define file-creator-and-type
-  (case-lambda
-   [(path)
-    (unless (path-string? path)
-      (raise-type-error 'file-creator-and-type "path string" path))
-    (let ([info (let ([fs (path->fsref path)]
-                      [v (cast (malloc 256) _gcpointer (_gcable _FSCatalogInfo-pointer))])
-                  (get-info v fs path)
-                  (FSCatalogInfo-finderInfo v))])
-      (values (int->str (FileInfo-fileCreator info))
-              (int->str (FileInfo-fileType info))))]
-   [(path creator type)
-    (unless (path-string? path)
-      (raise-type-error 'file-creator-and-type "path string" path))
-    (unless (and (bytes? creator) (= 4 (bytes-length creator)))
-      (raise-type-error 'file-creator-and-type "bytes string of length 4" creator))
-    (unless (and (bytes? type) (= 4 (bytes-length type)))
-      (raise-type-error 'file-creator-and-type "bytes string of length 4" type))
-    (let ([fs (path->fsref path)]
-          [v (cast (malloc 256) _gcpointer (_gcable _FSCatalogInfo-pointer))])
-      (get-info v fs path)
-      (let ([info (FSCatalogInfo-finderInfo v)])
-        (set-FileInfo-fileCreator! info (str->int creator))
-        (set-FileInfo-fileType! info (str->int type)))
-      (let ([r (FSSetCatalogInfo fs
-                                 kFSCatInfoFinderInfo
-                                 v)])
-        (unless (zero? r)
-          (filesystem-error 'file-creator-and-type "change failed (~a): ~e"
-                            r
-                            path))))
-    (void)]))
-
-
-(define (filesystem-error sym fmt . args)
-  (raise (exn:fail:filesystem
-          (string-append (format "~a: " sym)
-                         (apply format fmt args))
-          (current-continuation-marks))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/font.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/font.rkt
deleted file mode 100644
index a27f164261..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/font.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         ffi/unsafe
-         ffi/unsafe/objc
-         "../../lock.rkt"
-         "const.rkt"
-         "utils.rkt"
-         "types.rkt")
-
-(provide 
- (protect-out font->NSFont))
-
-(import-class NSFont NSFontManager)
-
-(define NSItalicFontMask #x00000001)
-(define NSBoldFontMask #x00000002)
-
-(define (font->NSFont f)
-  (let* ([weight (send f get-weight)]
-         [style (send f get-style)]
-         [name (or (send f get-face)
-                   (send the-font-name-directory
-                         get-screen-name
-                         (send the-font-name-directory
-                               find-family-default-font-id
-                               (send f get-family))
-                         weight
-                         style))]
-         [name (regexp-replace #rx",.*" name "")])
-    (atomically
-     (with-autorelease
-      (let ([f (tell NSFont 
-                     fontWithName: #:type _NSString name
-                     size: #:type _CGFloat (send f get-point-size))])
-        (if (and (eq? 'normal weight)
-                 (eq? 'normal style))
-            (begin
-              (retain f)
-              f)
-            (let ([fm (tell NSFontManager sharedFontManager)])
-              (let ([f (tell fm
-                             convertFont: f 
-                             toHaveTrait: #:type _int (bitwise-ior
-                                                       (if (eq? weight 'bold) NSBoldFontMask 0)
-                                                       (if (eq? style 'italic) NSItalicFontMask 0)))])
-                (begin
-                  (retain f)
-                  f)))))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/frame.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/frame.rkt
deleted file mode 100644
index b974048379..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/frame.rkt
+++ /dev/null
@@ -1,723 +0,0 @@
-#lang racket/base
-(require ffi/unsafe/objc
-         ffi/unsafe
-         racket/class
-         "pool.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt"
-         "window.rkt"
-         "queue.rkt"
-         "menu-bar.rkt"
-         "cursor.rkt"
-         "../../syntax.rkt"
-         "../common/queue.rkt"
-         "../common/freeze.rkt"
-         "../../lock.rkt")
-
-(provide 
- (protect-out frame%
-              location->window
-              get-front))
-
-;; ----------------------------------------
-
-(import-class NSWindow NSGraphicsContext NSMenu NSPanel
-              NSApplication NSAutoreleasePool NSScreen
-              NSToolbar)
-
-(define NSWindowCloseButton 0)
-(define NSWindowToolbarButton 3)
-
-(define front #f)
-
-(define (get-front) front)
-
-(define empty-mb (new menu-bar%))
-(define root-fake-frame #f)
-
-;; Maps window numbers to weak boxes of frame objects;
-;;  the weak-box layer is needed to avoid GC-accounting
-;;  problems.
-(define all-windows (make-hash))
-
-;; called in atomic mode
-(define (send-screen-change-notifications flags)
-  (when (zero? (bitwise-and flags 1)) ;; discard the "about to change" notifications
-    (for ([b (in-hash-values all-windows)])
-      (define f (weak-box-value b))
-      (when f
-        (define e (send f get-eventspace))
-        (unless (eventspace-shutdown? e)
-          (parameterize ([current-eventspace e])
-            (queue-callback
-             (λ ()
-               (send f display-changed)))))))))
-
-(set-screen-changed-callback! send-screen-change-notifications)
-
-(define-objc-mixin (RacketWindowMethods Superclass)
-  [wxb]
-  [-a _scheme (getEventspace)
-      (let ([wx (->wx wxb)])
-        (and wx (send wx get-eventspace)))]
-  [-a _BOOL (canBecomeKeyWindow)
-      (let ([wx (->wx wxb)])
-        (and wx
-             (not (other-modal? wx))))]
-  [-a _BOOL (canBecomeMainWindow)
-      (let ([wx (->wx wxb)])
-        (or (not wx)
-            (not (send wx floating?))))]
-  [-a _BOOL (windowShouldClose: [_id win])
-      (queue-window*-event wxb (lambda (wx)
-                                 (unless (other-modal? wx)
-                                   (when (send wx on-close)
-                                     (atomically
-                                      (send wx direct-show #f))))))
-      #f]
-  [-a _void (windowDidResize: [_id notification])
-      (when wxb
-        (let ([wx (->wx wxb)])
-          (when wx
-            (queue-window-event wx (lambda ()
-                                     (send wx queue-on-size)
-                                     (send wx clean-up)))
-            ;; Live resize:
-            (constrained-reply (send wx get-eventspace)
-                               (lambda () 
-                                 (pre-event-sync #t)
-                                 (let loop () (when (yield/no-sync) (loop))))
-                               (void)))))]
-  [-a _void (windowDidMove: [_id notification])
-      (when wxb
-        (queue-window*-event wxb (lambda (wx)
-                                   (send wx queue-on-size))))]
-  [-a _void (windowDidBecomeMain: [_id notification])
-      ;; We check whether the window is visible because
-      ;; clicking the dock item tries to resurrect a hidden
-      ;; frame. See also `setOneShot' below.
-      (when (tell #:type _BOOL self isVisible)
-        (when wxb
-          (let ([wx (->wx wxb)])
-            (when wx
-              ;; Sometimes, a sheet becomes the main window and the parent
-              ;; still thinks that the parent is the main window. Tell
-              ;; the parent otherwise.
-              (let ([p (send wx get-parent)])
-                (when p
-                  (let ([s (send p get-sheet)])
-                    (when (eq? s wx)
-                      (let ([parent (send p get-cocoa)])
-                        (when (tell #:type _BOOL parent isMainWindow)
-                          ;; The Cocoa docs say never to call this method directly,
-                          ;; but we're trying to fix up a case where Cocoa seems
-                          ;; to be confused:
-                          (tellv parent resignMainWindow)))))))
-              (set! front wx)
-              (send wx install-wait-cursor)
-              (send wx install-mb)
-              (queue-window-event wx (lambda ()
-                                       (send wx on-activate #t)))))))]
-  [-a _void (windowDidBecomeKey: [_id notification])
-      (when (tell #:type _BOOL self isVisible)
-        (when wxb
-          (let ([wx (->wx wxb)])
-            (when wx
-              (send wx notify-responder #t)))))]
-  [-a _void (windowDidResignMain: [_id notification])
-      (when wxb
-        (let ([wx (->wx wxb)])
-          (when wx
-            (when (eq? front wx) 
-              (set! front #f)
-              (send wx uninstall-wait-cursor))
-            (if root-fake-frame
-                (send root-fake-frame install-mb)
-                (send empty-mb install))
-            (queue-window-event wx (lambda ()
-                                     (send wx on-activate #f))))))]
-  [-a _void (windowDidResignKey: [_id notification])
-      (when wxb
-        (let ([wx (->wx wxb)])
-          (when wx
-            (send wx notify-responder #f))))]
-  [-a _void (windowDidMiniaturize: [_id notification])
-      (when wxb
-        (let ([wx (->wx wxb)])
-          (when wx
-            (send wx force-window-focus))))]
-  [-a _void (windowDidEndSheet: [_id notification])
-      ;; In some cases, the window that has a sheet
-      ;; stays main even as its sheet becomes main, so
-      ;; we need to make the containing window become main
-      ;; when the sheet goes away.
-      (when (equal? self (tell app mainWindow))
-        (tell self windowDidBecomeMain: notification))]
-  [-a _void (toggleToolbarShown: [_id sender])
-      (when wxb
-        (let ([wx (->wx wxb)])
-          (when wx
-            (queue-window-event wx
-                                (lambda () (send wx on-toolbar-click))))))
-      (void)])
-
-(define-objc-class RacketWindow NSWindow
-  #:mixins (FocusResponder KeyMouseResponder RacketWindowMethods)
-  [wxb])
-
-(define-objc-class RacketPanel NSPanel
-  #:mixins (FocusResponder KeyMouseResponder RacketWindowMethods)
-  [wxb])
-
-(set-front-hook! (lambda () 
-                   (let ([f (or front
-                                root-fake-frame)])
-                     (values f
-                             (and f (send f get-eventspace))))))
-
-(set-eventspace-hook! (lambda (evt w)
-                        (define (is-mouse-or-key?)
-                          (bitwise-bit-set? MouseAndKeyEventMask
-                                            (tell #:type _NSInteger evt type)))
-                        (cond
-                         [w
-                          (and (or (not root-fake-frame)
-                                   ;; only mouse and key events in the root
-                                   ;; frame need to be dispatched in the root
-                                   ;; eventspace:
-                                   (not (ptr-equal? w (send root-fake-frame get-cocoa)))
-                                   (is-mouse-or-key?))
-                               (or (objc-is-a? w RacketWindow)
-                                   (objc-is-a? w RacketPanel))
-                               (tell #:type _scheme w getEventspace))]
-                         [front (send front get-eventspace)]
-                         [root-fake-frame 
-                          (and (is-mouse-or-key?)
-                               (send root-fake-frame get-eventspace))]
-                         [else #f])))
-
-(define frame%
-  (class window%
-    (init parent
-          label
-          x y w h
-          style)
-    (init [is-dialog? #f])
-
-    (inherit get-cocoa get-parent
-             get-eventspace
-             pre-on-char pre-on-event
-             get-x
-             on-new-child
-             is-window-enabled?)
-
-    (super-new [parent parent]
-               [cocoa
-                (let ([is-sheet? (and #f
-                                      is-dialog? 
-                                      parent
-                                      (not (send parent frame-is-dialog?)))]
-                      [init-rect (make-NSRect (make-init-point x y)
-                                              (make-NSSize (max 30 w) 
-                                                           (max (if (memq 'no-caption style)
-                                                                    1
-                                                                    22)
-                                                                h)))])
-                  (let ([c (as-objc-allocation
-                            (tell (tell (if (or is-sheet? (memq 'float style))
-                                            RacketPanel
-                                            RacketWindow)
-                                        alloc)
-                                  initWithContentRect: #:type _NSRect init-rect
-                                  styleMask: #:type _int (if (memq 'no-caption style)
-                                                             NSBorderlessWindowMask
-                                                             (bitwise-ior 
-                                                              NSTitledWindowMask
-                                                              (if is-sheet? NSUtilityWindowMask 0)
-                                                              (if is-dialog?
-                                                                  (bitwise-ior
-                                                                   (if (memq 'close-button style)
-                                                                       NSClosableWindowMask
-                                                                       0)
-                                                                   (if (memq 'resize-border style)
-                                                                       NSResizableWindowMask
-                                                                       0))
-                                                                  (bitwise-ior 
-                                                                   NSClosableWindowMask
-                                                                   NSMiniaturizableWindowMask
-                                                                   (if (memq 'no-resize-border style)
-                                                                       0
-                                                                       NSResizableWindowMask)))))
-                                  backing: #:type _int NSBackingStoreBuffered
-                                  defer: #:type _BOOL NO))])
-                    ;; use init rect as frame size, not content size
-                    (tellv c setFrame: #:type _NSRect init-rect display: #:type _BOOL #f)
-                    ;; fullscreen variants:
-                    (when (version-10.7-or-later?)
-                      (cond
-                       [(memq 'fullscreen-button style)
-                        (tellv c setCollectionBehavior: #:type _int NSWindowCollectionBehaviorFullScreenPrimary)]
-                       [(memq 'fullscreen-aux style)
-                        (tellv c setCollectionBehavior: #:type _int NSWindowCollectionBehaviorFullScreenAuxiliary)]
-                       [else (void)]))
-                    c))]
-               [no-show? #t])
-    (define cocoa (get-cocoa))
-    (tellv cocoa setDelegate: cocoa)
-
-    (unless (version-10.7-or-later?)
-      (when (memq 'toolbar-button style)
-        (atomically
-         (let ([tb (tell (tell NSToolbar alloc) initWithIdentifier: #:type _NSString "Ok")])
-           (tellv cocoa setToolbar: tb)
-           (tellv tb setVisible: #:type _BOOL #f)
-           (tellv tb release)))))
-
-    (internal-move #f (or y 0))
-
-    (tellv cocoa setAcceptsMouseMovedEvents: #:type _BOOL #t)
-
-    ;; Setting the window in one-shot mode helps prevent the
-    ;;  frame from being resurrected by a click on the dock icon.
-    (tellv cocoa setOneShot: #:type _BOOL #t)
-
-    (define/override (get-cocoa-content) 
-      (tell cocoa contentView))
-    (define/override (get-cocoa-window) cocoa)
-    (define/override (get-wx-window) this)
-
-    (define/override (make-graphics-context)
-      (tell cocoa graphicsContext)
-      #;
-      (as-objc-allocation
-       (tell NSGraphicsContext graphicsContextWithWindow: cocoa)))
-
-    (define is-a-dialog? is-dialog?)
-    (define/public (frame-is-dialog?) is-a-dialog?)
-
-    (define not-sheet? (and (memq 'no-sheet style) #t))
-
-    (define/public (frame-relative-dialog-status win) #f)
-    (define/override (get-dialog-level) 0)
-
-    (define/public (clean-up)
-      ;; When a window is resized, then any drawing that is in flight
-      ;; might draw outside the canvas boundaries. Just refresh everything.
-      (tellv cocoa display))
-
-    (when label
-      (tellv cocoa setTitle: #:type _NSString label))
-    
-    (define child-sheet #f)
-    (define/public (get-sheet) child-sheet)
-    (define/public (set-sheet s) (set! child-sheet s))
-
-    (define caption? (not (memq 'no-caption style)))
-    (define float? (memq 'float style))
-    (define/public (can-have-sheet?) caption?)
-    (define/public (floating?) float?)
-
-    (when float?
-      (tell cocoa setFloatingPanel: #:type _BOOL #t))
-
-    (define/public (direct-show on?)
-      ;; in atomic mode
-      (when on? (promote-to-gui!))
-      (when (and (not on?)
-                 (eq? front this))
-        (set! front #f)
-        (send empty-mb install))
-      (if on?
-          (show-children)
-          (hide-children))
-      (if on?
-          (if (and is-a-dialog?
-                   (not not-sheet?)
-                   (let ([p (get-parent)])
-                     (and p 
-                          (send p can-have-sheet?)
-                          (not (send p get-sheet)))))
-              (let ([p (get-parent)])
-                (send p set-sheet this)
-                (tellv (tell NSApplication sharedApplication)
-                       beginSheet: cocoa
-                       modalForWindow: (send p get-cocoa)
-                       modalDelegate: #f
-                       didEndSelector: #:type _SEL #f
-                       contextInfo: #f))
-              (if float?
-                  (tellv cocoa orderFront: #f)
-                  (tellv cocoa makeKeyAndOrderFront: #f)))
-          (begin
-            (when is-a-dialog?
-              (let ([p (get-parent)])
-                (when (and p
-                           (eq? this (send p get-sheet)))
-                  (send p set-sheet #f)
-                  (tell (tell NSApplication sharedApplication)
-                        endSheet: cocoa))))
-            (when (is-shown?) ; otherwise, `deminiaturize' can show the window
-              (tellv cocoa deminiaturize: #f)
-              (tellv cocoa orderOut: #f))
-            (force-window-focus)))
-      (register-frame-shown this on?)
-      (let ([num (tell #:type _NSInteger cocoa windowNumber)])
-        (if on?
-            (hash-set! all-windows num (make-weak-box this))
-            (hash-remove! all-windows num)))
-      (when on?
-        (let ([b (eventspace-wait-cursor-count (get-eventspace))])
-          (set-wait-cursor-mode (not (zero? b))))))
-
-    (define/override (show on?)
-      (let ([es (get-eventspace)])
-        (when on?
-          (when (eventspace-shutdown? es)
-            (error (string->symbol
-                    (format "show method in ~a" (if is-a-dialog? 'dialog% 'frame%)))
-                   "the eventspace hash been shutdown"))
-          (when saved-child
-            (if (eq? (current-thread) (eventspace-handler-thread es))
-                (do-paint-children)
-                (let ([s (make-semaphore)])
-                  (queue-callback (lambda ()
-                                    (do-paint-children)
-                                    (semaphore-post s)))
-                  (sync/timeout 1 s))))))
-      (atomically
-       (direct-show on?)))
-
-    (define/public (force-window-focus)
-      (let ([next (get-app-front-window)])
-        (cond
-         [next 
-          (tellv next makeKeyWindow)]          
-         [root-fake-frame 
-          ;; Make key focus shift to root frame:
-          (let ([root-cocoa (send root-fake-frame get-cocoa)])
-            (tellv root-cocoa orderFront: #f)
-            (tellv root-cocoa makeKeyWindow)
-            (tellv root-cocoa orderOut: #f))
-          ;; Install root frame's menu bar:
-          (send root-fake-frame install-mb)]
-         [else (void)])))
-
-    (define/private (do-paint-children)
-      (when saved-child
-        (send saved-child paint-children))
-      (yield-refresh)
-      (try-to-sync-refresh))
-
-    (define/public (destroy)
-      (when child-sheet (send child-sheet destroy))
-      (atomically
-       (direct-show #f)))
-
-    (define/override (hide-children)
-      (when saved-child
-        (send saved-child hide-children)))
-    (define/override (show-children)
-      (when saved-child
-        (send saved-child show-children)))
-    (define/override (fixup-locations-children)
-      (when saved-child
-        (send saved-child fixup-locations-children)))
-
-    (define/override (children-accept-drag on?)
-      (when saved-child
-        (send saved-child child-accept-drag on?)))
-
-    (define/override (enable-window on?)
-      (when saved-child
-        (send saved-child enable-window (and on? (is-window-enabled?)))))
-
-    (define/override (is-shown?)
-      (or (tell #:type _bool cocoa isVisible)
-          (tell #:type _bool cocoa isMiniaturized)))
-
-    (define/override (is-shown-to-root?)
-      (is-shown?))
-
-    (define/override (is-shown-to-before-root?) #t)
-
-    (define/override (is-parent-enabled-to-root?)
-      #t)
-
-    (define/override (is-view?) #f)
-
-    (define is-main? #f)
-    (define first-responder #f)
-
-    (define saved-child #f)
-    (define/override (register-child child on?)
-      (unless on? (error 'register-child-in-frame "did not expect #f"))
-      (unless (or (not saved-child) (eq? child saved-child))
-        (error 'register-child-in-frame "expected only one child"))
-      (set! saved-child child)
-      (on-new-child child #t))
-
-    (define/override (refresh-all-children)
-      (when saved-child
-        (send saved-child refresh)))
-
-    (define/override (set-cursor c)
-      (when saved-child
-        (send saved-child set-cursor c)))
-
-    (define/public (notify-responder on?)
-      (set! is-main? on?)
-      (when first-responder
-        (do-notify-responder first-responder on?)))
-
-    (define/private (do-notify-responder wx on?)
-      (send wx focus-is-on on?)
-      (queue-window-event wx
-                          (if on?
-                              (lambda () (send wx on-set-focus))
-                              (lambda () (send wx on-kill-focus)))))
-
-    (define/override (is-responder wx on?)
-      (unless (and (not on?)
-                   (not (eq? first-responder wx)))
-        (if on?
-            (set! first-responder wx)
-            (set! first-responder #f))
-        (unless on?
-          (tellv cocoa makeFirstResponder: #f))
-        (when is-main?
-          (do-notify-responder wx on?))))
-
-    (define/public (get-focus-window [even-if-not-active? #f])
-      (let ([f-cocoa (tell cocoa firstResponder)])
-        (and f-cocoa
-             (or even-if-not-active?
-                 (tell #:type _BOOL cocoa isKeyWindow))
-             (->wx (get-ivar f-cocoa wxb)))))
-
-    (define/public (install-wait-cursor)
-      (when (positive? (eventspace-wait-cursor-count (get-eventspace)))
-        (tellv (get-wait-cursor-handle) set)))
-
-    (define/public (uninstall-wait-cursor)
-      (when (positive? (eventspace-wait-cursor-count (get-eventspace)))
-        (tellv arrow-cursor-handle set)))
-
-    (define/public (set-wait-cursor-mode on?)
-      (if on?
-          (tell cocoa disableCursorRects)
-          (tell cocoa enableCursorRects))
-      (when (eq? this front)
-        (if on?
-            (install-wait-cursor)
-            (uninstall-wait-cursor))))
-
-    (define/override (start-no-cursor-rects)
-      (tell cocoa disableCursorRects))
-
-    (define/override (end-no-cursor-rects)
-      (unless (positive? (eventspace-wait-cursor-count (get-eventspace)))
-        (tell cocoa enableCursorRects)))
-
-    (define/public (flip-screen y)
-      (let ([f (tell #:type _NSRect (tell NSScreen mainScreen) frame)])
-        (- (NSSize-height (NSRect-size f)) y)))
-
-    (define/override (flip y h) (flip-screen (+ y h)))
-
-    (define/override (get-y)
-      (- (super get-y) (get-menu-bar-height)))
-
-    (define/override (set-size x y w h)
-      (unless (and (equal? x -1) (equal? y -1))
-        (internal-move x y))
-      (let ([f (tell #:type _NSRect cocoa frame)])
-        (tellv cocoa setFrame: 
-               #:type _NSRect (make-NSRect 
-                               (make-NSPoint (if (and is-a-dialog?
-                                                      (let ([p (get-parent)])
-                                                        (and p
-                                                             (eq? this (send p get-sheet)))))
-                                                 ;; need to re-center sheet:
-                                                 (let* ([p (get-parent)]
-                                                        [px (send p get-x)]
-                                                        [pw (send p get-width)])
-                                                   (+ px (/ (- pw w) 2)))
-                                                 ;; keep current x position:
-                                                 (NSPoint-x (NSRect-origin f)))
-                                             ;; keep current y position:
-                                             (- (NSPoint-y (NSRect-origin f))
-                                                (- h
-                                                   (NSSize-height (NSRect-size f)))))
-                               (make-NSSize w h))
-               display: #:type _BOOL #t)))
-    (define/override (internal-move x y)
-      (let ([x (if (not x) (get-x) x)]
-            [y (if (not y) (get-y) y)])
-        (tellv cocoa setFrameTopLeftPoint: #:type _NSPoint (make-NSPoint x (- (flip-screen y)
-                                                                              (get-menu-bar-height))))))
-
-    (define/override (center dir wrt)
-      (let ([f (tell #:type _NSRect cocoa frame)]
-            [w (if wrt
-                   (tell #:type _NSRect (send wrt get-cocoa) frame)
-                   (tell #:type _NSRect (tell cocoa screen) frame))])
-        (tellv cocoa setFrame: 
-               #:type _NSRect (make-NSRect (make-NSPoint 
-                                            (if (or (eq? dir 'both)
-                                                    (eq? dir 'horizontal))
-                                                (+ (quotient (- (NSSize-width (NSRect-size w))
-                                                                (NSSize-width (NSRect-size f)))
-                                                             2)
-                                                   (NSPoint-x (NSRect-origin w)))
-                                                (NSPoint-x (NSRect-origin f)))
-                                            (if (or (eq? dir 'both)
-                                                    (eq? dir 'vertical))
-                                                (+ (quotient (- (NSSize-height (NSRect-size w))
-                                                                (NSSize-height (NSRect-size f)))
-                                                             2)
-                                                   (NSPoint-y (NSRect-origin w)))
-                                                (NSPoint-x (NSRect-origin f))))
-                                           (NSRect-size f))
-               display: #:type _BOOL #t)))
-
-    (define/public (enforce-size min-x min-y max-x max-y inc-x inc-y)
-      (define (adj v) (if (negative? v) 32000 v))
-      (tellv cocoa setMinSize: #:type _NSSize (make-NSSize (max min-x 1)
-                                                           (max min-y 1)))
-      (tellv cocoa setMaxSize: #:type _NSSize (make-NSSize (adj max-x)
-                                                           (adj max-y)))
-      (tellv cocoa setResizeIncrements: #:type _NSSize (make-NSSize inc-x inc-y)))
-
-    (define hide-mb? (and (memq 'hide-menu-bar style) #t))
-    (define mb #f)
-    (define/public (get-menu-bar) mb)
-    (define/public (set-menu-bar _mb) 
-      (set! mb _mb)
-      (send mb set-top-window this)
-      (when (or (tell #:type _BOOL cocoa isMainWindow)
-                (and (eq? this root-fake-frame)
-                     (not (get-app-front-window))))
-        (promote-to-gui!)
-        (install-mb)))
-
-    (define/public (install-mb)
-      (tellv NSMenu setMenuBarVisible: #:type _BOOL (not hide-mb?))
-      (if mb
-          (send mb install)
-          (send empty-mb install)))
-
-    (define/public (on-activate on?) (void))
-
-    (define/public (set-icon bm1 [bm2 #f] [mode 'both]) (void)) ;; FIXME
-
-    (define default-buttons (make-hasheq))
-    (define checking-default? #f)
-    (define/public (add-possible-default button)
-      (hash-set! default-buttons button #t)
-      (queue-default-button-check))
-    (define/public (remove-possible-default button)
-      (hash-remove! default-buttons button)
-      (queue-default-button-check))
-    (define/public (queue-default-button-check)
-      (when (atomically
-             (if checking-default?
-                 #f
-                 (begin
-                   (set! checking-default? #t)
-                   #t)))
-        (queue-window-event 
-         this
-         (lambda ()
-           (set! checking-default? #f)
-           (for/or ([button (in-hash-keys default-buttons)])
-             (send button be-default))))))
-
-    (define/override (call-pre-on-event w e)
-      (pre-on-event w e))
-    (define/override (call-pre-on-char w e)
-      (pre-on-char w e))
-
-    (define/public (on-menu-click) (void))
-
-    (define/public (on-toolbar-click) (void))
-    (define/public (on-menu-command c) (void))
-    (def/public-unimplemented on-mdi-activate)
-    (define/public (on-close) #t)
-    (define/public (designate-root-frame)
-      (set! root-fake-frame this)
-      ;; The first window shown is somehow sticky, so that it becomes
-      ;; the main window if no windows are shown:
-      (tellv cocoa orderFront: #f)
-      (tellv cocoa orderOut: #f)
-      (sync-cocoa-events))
-    (def/public-unimplemented system-menu)
-
-    (define/public (set-modified on?)
-      (let ([b (tell cocoa standardWindowButton: #:type _NSInteger NSWindowCloseButton)])
-        (tellv b setDocumentEdited: #:type _BOOL on?)))
-    
-    (define/public (is-maximized?)
-      (tell #:type _BOOL cocoa isZoomed))
-    (define/public (maximize on?)
-      (unless (eq? (tell #:type _BOOL cocoa isZoomed)
-                   (and on? #t))
-        (tellv cocoa zoom: cocoa)))
-
-    (define/public (iconized?)
-      (tell #:type _BOOL cocoa isMiniaturized))
-    (define/public (iconize on?)
-      (if on?
-          (tellv cocoa miniaturize: cocoa)
-          (tellv cocoa deminiaturize: cocoa)))
-
-    (define/public (fullscreened?)
-      (positive? (bitwise-and (tell #:type _NSUInteger cocoa styleMask) NSFullScreenWindowMask)))
-    (define/public (fullscreen on?)
-      (unless (eq? (and on? #t) (fullscreened?))
-        (tellv cocoa toggleFullScreen: #f)))
-
-    (define/public (set-title s)
-      (tellv cocoa setTitle: #:type _NSString s))
-
-    (define color-callback void)
-    (define/public (set-color-callback cb)
-      (set! color-callback cb))
-    (define/override (on-color-change)
-      (queue-window-event this (lambda () (color-callback))))
-    
-    (define/public (display-changed) (void))))
-
-;; ----------------------------------------
-
-(define (get-app-front-window)
-  (atomically
-   (with-autorelease
-    (let ([wins (tell (tell NSApplication sharedApplication) orderedWindows)])
-      (begin0
-       (for/or ([i (in-range (tell #:type _NSUInteger wins count))])
-         (let ([win (tell wins objectAtIndex: #:type _NSUInteger i)])
-           (and (tell #:type _BOOL win isVisible)
-                (tell #:type _BOOL win canBecomeMainWindow)
-                (not (tell win parentWindow))
-                (or (not root-fake-frame)
-                    (not (ptr-equal? win (send root-fake-frame get-cocoa))))
-                win))))))))
-
-(define (location->window x y)
-  (let ([n (tell #:type _NSInteger NSWindow 
-                 windowNumberAtPoint: #:type _NSPoint 
-                 (let ([f (tell #:type _NSRect (tell NSScreen mainScreen) frame)])
-                   (make-NSPoint x (- (NSSize-height (NSRect-size f)) y)))
-                 belowWindowWithWindowNumber: #:type _NSInteger 0)])
-    (atomically (let ([b (hash-ref all-windows n #f)])
-                  (and b (weak-box-value b))))))
-
-(set-fixup-window-locations!
- (lambda ()
-   ;; in atomic mode
-   (for ([b (in-hash-values all-windows)])
-     (let ([f (weak-box-value b)])
-       (when f
-         (send f fixup-locations-children))))))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/gauge.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/gauge.rkt
deleted file mode 100644
index 7265bce32c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/gauge.rkt
+++ /dev/null
@@ -1,71 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         racket/math
-         ffi/unsafe/objc
-          "../../syntax.rkt"
-         "item.rkt"
-         "types.rkt"
-         "const.rkt"
-         "utils.rkt"
-         "window.rkt")
-
-(provide 
- (protect-out gauge%))
-
-;; ----------------------------------------
-
-(import-class NSProgressIndicator)
-
-(define-objc-class RacketProgressIndicator NSProgressIndicator
-  #:mixins (KeyMouseResponder CursorDisplayer)
-  [wxb])
-
-(defclass gauge% item%
-  (init parent
-        label
-        rng
-        x y w h
-        style
-        font)
-  (inherit get-cocoa)
-
-  (super-new [parent parent]
-             [cocoa (let ([cocoa (as-objc-allocation
-                                  ;; Beware that a gauge may be finally deallocated in 
-                                  ;; a separate OS-level thread
-                                  (tell (tell RacketProgressIndicator alloc) init))])
-                      (tellv cocoa setIndeterminate: #:type _BOOL #f)
-                      (tellv cocoa setMaxValue: #:type _double* rng)
-                      (tellv cocoa setDoubleValue: #:type _double* 0.0)
-                      (tellv cocoa sizeToFit)
-                      (when (memq 'vertical style)
-                        (let ([r (tell #:type _NSRect cocoa frame)])
-                          (printf "height ~s\n" (NSSize-height (NSRect-size r)))
-                          (tellv cocoa setFrame: 
-                                 #:type _NSRect (make-NSRect
-                                                 (NSRect-origin r)
-                                                 (make-NSSize
-                                                  (NSSize-height (NSRect-size r))
-                                                  (NSSize-width (NSRect-size r)))))
-                          (tellv cocoa rotateByAngle: #:type _CGFloat -90)))
-                      cocoa)]
-             [callback void]
-             [no-show? (memq 'deleted style)])
-  
-  (define cocoa (get-cocoa))
-
-  (define/override (enable on?) (void))
-  (define/override (is-window-enabled?) #t)
-
-  (define/public (get-range)
-    (inexact->exact (floor (tell #:type _double cocoa maxValue))))
-  (define/public (set-range rng)
-    (tellv cocoa setMaxValue: #:type _double* rng)
-    (tellv cocoa setDoubleValue: #:type _double* (min rng (tell #:type _double cocoa doubleValue))))
-
-  (define/public (set-value v)
-    (tellv cocoa setDoubleValue: #:type _double* v))
-  (define/public (get-value)
-    (min (inexact->exact (floor (tell #:type _double cocoa doubleValue)))
-         (get-range))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/gc.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/gc.rkt
deleted file mode 100644
index 8e384f3713..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/gc.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/objc
-         "utils.rkt"
-         "types.rkt")
-
-(provide 
- (protect-out scheme_add_gc_callback
-              scheme_remove_gc_callback
-              make-gc-action-desc))
-
-(define objc-lib (ffi-lib "libobjc"))
-
-(define msg-send-proc (get-ffi-obj 'objc_msgSend objc-lib _fpointer))
-
-(define-mz scheme_add_gc_callback (_fun _racket _racket -> _racket))
-(define-mz scheme_remove_gc_callback (_fun _racket -> _void))
-
-(define (make-gc-action-desc win sel val)
-  (vector
-   (vector (if (= (ctype-sizeof _CGFloat) 4)
-               'ptr_ptr_float->void
-               'ptr_ptr_double->void)
-           msg-send-proc 
-           win
-           sel
-           val)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/group-panel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/group-panel.rkt
deleted file mode 100644
index 763d1615f5..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/group-panel.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-          "../../syntax.rkt"
-          "types.rkt"
-          "utils.rkt"
-          "window.rkt"
-          "panel.rkt")
-
-(provide 
- (protect-out group-panel%))
-
-(import-class NSBox)
-
-(define-objc-class RacketBox NSBox
-  #:mixins (FocusResponder KeyMouseResponder CursorDisplayer)
-  [wxb])
-
-(defclass group-panel% (panel-mixin window%)
-  (init parent
-        x y w h
-        style
-        label)
-  (inherit get-cocoa)
-
-  (super-new [parent parent]
-             [cocoa
-              (let ([cocoa (as-objc-allocation
-                            (tell (tell RacketBox alloc) init))])
-                (when label
-                  (tellv cocoa setTitle: #:type _NSString label)
-                  (tellv cocoa sizeToFit))
-                cocoa)]
-             [no-show? (memq 'deleted style)])
-
-  (define/override (get-cocoa-content) 
-    (tell (get-cocoa) contentView))
-  (define/override (get-cocoa-cursor-content) 
-    (get-cocoa))
-
-  (define/public (set-label l)
-    (tellv (get-cocoa) setTitle: #:type _NSString l)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/image.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/image.rkt
deleted file mode 100644
index 78a1b3e363..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/image.rkt
+++ /dev/null
@@ -1,157 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/objc
-         racket/class
-         racket/draw/unsafe/cairo
-         racket/draw/private/local
-         racket/draw/unsafe/bstr
-         racket/draw/private/bitmap
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "cg.rkt"
-         "../../lock.rkt"
-         (only-in '#%foreign ffi-callback))
-
-(provide 
- (protect-out bitmap->image
-              image->bitmap))
-
-(import-class NSImage NSGraphicsContext)
-
-(define NSCompositeCopy 1)
-
-(define _CGImageRef (_cpointer 'CGImageRef))
-(define _CGColorSpaceRef (_cpointer 'CGColorSpaceRef))
-(define _CGDataProviderRef (_cpointer 'GCDataProviderRef))
-
-(define _CGRect _NSRect)
-
-(define _size_t _long)
-(define _off_t _long)
-
-(define-appserv CGColorSpaceCreateDeviceRGB (_fun -> _CGColorSpaceRef))
-(define-appserv CGColorSpaceRelease (_fun _CGColorSpaceRef -> _void))
-
-(define-appserv CGImageCreate (_fun _size_t ; w
-                                    _size_t ; h
-                                    _size_t ; bitsPerComponent
-                                    _size_t ; bitsPerPixel
-                                    _size_t ; bytesPerRow
-                                    _CGColorSpaceRef ; colorspace
-                                    _int ; bitmapInfo
-                                    _CGDataProviderRef ; provider
-                                    _pointer ; CGFloat decode[]
-                                    _bool ; shouldInterpolate
-                                    _int ; intent
-                                    -> _CGImageRef))
-
-(define-appserv CGContextDrawImage (_fun _CGContextRef _CGRect _CGImageRef -> _void))
-
-(define free-it
-  (ffi-callback free (list _pointer) _void #f #t))
-
-(define-appserv CGDataProviderCreateWithData (_fun _pointer _pointer _size_t _fpointer
-                                                   -> _CGDataProviderRef))
-(define-appserv CGDataProviderRelease (_fun _CGDataProviderRef -> _void))
-
-(define (get-image-bytes info)
-  info)
-(define (release-image-bytes info bytes)
-  (void))
-(define (get-bytes-at-position bytes dest-bytes start count)
-  (memcpy dest-bytes (ptr-add bytes start) count))
-(define (release-info info)
-  (free info))
-
-(define (bitmap->image bm)
-  (define w (send bm get-width))
-  (define h (send bm get-height))
-  (define s (if (version-10.6-or-later?)
-                (send bm get-backing-scale)
-                ;; In 10.5, `NSImage setSize:` clips instead of
-                ;; scaling, so just use scale of 1:
-                1))
-  (cond
-   [(= s 1) (bitmap->image* bm w h w h)]
-   [else 
-    (define (scale v) (inexact->exact (ceiling (* s v))))
-    (define sw (scale w))
-    (define sh (scale h))
-    (define bm2 (make-bitmap sw sh))
-    (define dc (send bm2 make-dc))
-    (send dc set-scale s s)
-    (send dc draw-bitmap bm 0 0)
-    (bitmap->image* bm2 sw sh w h)]))
-
-(define (bitmap->image* bm w h iw ih)
-  (let ([str (make-bytes (* w h 4) 255)])
-    (send bm get-argb-pixels 0 0 w h str #f)
-    (let ([mask (send bm get-loaded-mask)])
-      (when mask
-        (send mask get-argb-pixels 0 0 w h str #t)))
-    (atomically
-     (let ([rgba (scheme_make_sized_byte_string (malloc (* w h 4) 'raw) (* w h 4) 0)])
-       (memcpy rgba str (sub1 (* w h 4)))
-       (let* ([cs (CGColorSpaceCreateDeviceRGB)]
-              [provider (CGDataProviderCreateWithData #f rgba (* w h 4) free-it)]
-              [image (CGImageCreate w
-                                    h
-                                    8
-                                    32
-                                    (* 4 w)
-                                    cs
-                                    (bitwise-ior kCGImageAlphaFirst
-                                                 kCGBitmapByteOrder32Big)
-                                    provider ; frees `rgba'
-                                    #f
-                                    #f
-                                    0)])
-         (CGDataProviderRelease provider)
-         (CGColorSpaceRelease cs)
-         ;; This works on 10.6 and later:
-         #;
-         (as-objc-allocation
-          (tell (tell NSImage alloc) 
-                initWithCGImage: #:type _CGImageRef image
-                size: #:type _NSSize (make-NSSize w h)))
-         ;; To work with older versions:
-         (let* ([size (make-NSSize w h)]
-                [i (as-objc-allocation
-                    (tell (tell NSImage alloc) 
-                          initWithSize: #:type _NSSize size))])
-           (tellv i lockFocus)
-           (CGContextDrawImage
-            (tell #:type _CGContextRef (tell NSGraphicsContext currentContext) graphicsPort)
-            (make-NSRect (make-NSPoint 0 0) size)
-            image)
-           (tellv i unlockFocus)
-           (tellv i setSize: #:type _NSSize (make-NSSize iw ih))
-           i))))))
-
-(define (image->bitmap i)
-  (let* ([s (tell #:type _NSSize i size)]
-         [w (NSSize-width s)]
-         [h (NSSize-height s)]
-         [bm (make-object quartz-bitmap% 
-                          (inexact->exact (ceiling w))
-                          (inexact->exact (ceiling h)))]
-         [surface (let ([s (send bm get-cairo-surface)])
-                    (cairo_surface_flush s)
-                    s)]
-         [cg (cairo_quartz_surface_get_cg_context surface)]
-         [gc (tell NSGraphicsContext
-                   graphicsContextWithGraphicsPort: #:type _pointer cg
-                   flipped: #:type _BOOL #f)])
-    (CGContextSaveGState cg)
-    (CGContextTranslateCTM cg 0 h)
-    (CGContextScaleCTM cg 1 -1)
-    (tellv NSGraphicsContext saveGraphicsState)
-    (tellv NSGraphicsContext setCurrentContext: gc)
-    (let ([r (make-NSRect (make-NSPoint 0 0) (make-NSSize w h))])
-      (tellv i drawInRect: #:type _NSRect r fromRect: #:type _NSRect r 
-             operation: #:type _int NSCompositeCopy fraction: #:type _CGFloat 1.0))
-    (tellv NSGraphicsContext restoreGraphicsState)
-    (CGContextRestoreGState cg)
-    (cairo_surface_mark_dirty surface)
-    bm))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/init.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/init.rkt
deleted file mode 100644
index 4764cc1f22..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/init.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-(require "pool.rkt"
-         "queue.rkt")
-
-(define pump-thread (cocoa-start-event-pump))
-(cocoa-install-event-wakeup)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/item.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/item.rkt
deleted file mode 100644
index 6760e2e8dc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/item.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "window.rkt"
-         "const.rkt"
-         "types.rkt"
-         "font.rkt")
-
-(provide 
- (protect-out item%
-              install-control-font
-              sys-font-size
-              strip-mnemonic))
-
-(import-class NSFont)
-
-(define sys-font-size 13)
-(define sys-font 
-  (atomically
-   (let ([f (tell NSFont systemFontOfSize: #:type _CGFloat sys-font-size)])
-     (tellv f retain)
-     f)))
-
-(define (install-control-font cocoa font)
-  (if font
-      (tellv cocoa setFont: (font->NSFont font))
-      (tellv cocoa setFont: sys-font)))
-
-(define (strip-mnemonic s)
-  (regexp-replace #rx"[&](.)" s "\\1"))
-
-(defclass item% window%
-  (inherit get-cocoa
-           is-window-enabled?)
-
-  (init-field callback)
-
-  (define/public (get-cocoa-control) (get-cocoa))
-
-  (define/override (enable-window on?)
-    (let ([on? (and on? (is-window-enabled?))])
-      (tellv (get-cocoa-control) setEnabled: #:type _BOOL on?)))
-
-  (define/override (gets-focus?)
-    (tell #:type _BOOL (get-cocoa-control) canBecomeKeyView))
-
-  (define/public (command e)
-    (callback this e))
-
-  (def/public-unimplemented set-label)
-  (def/public-unimplemented get-label)
-  (super-new)
-
-  (define/public (init-font cocoa font)
-    (install-control-font cocoa font)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/keycode.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/keycode.rkt
deleted file mode 100644
index af549ff0db..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/keycode.rkt
+++ /dev/null
@@ -1,199 +0,0 @@
-#lang racket/base
-
-(provide map-key-code
-         key-symbol-to-menu-key)
-
-(define (map-key-code v)
-  (hash-ref
-   #hash((122 . f1)
-         (120 . f2)
-         (99 . f3)
-         (118 . f4)
-         (96 . f5)
-         (97 . f6)
-         (98 . f7)
-         (100 . f8)
-         (101 . f9)
-         (109 . f10)
-         (103 . f11)
-         (111 . f12)
-         (105 . f13)
-         (107 . f14)
-         (113 . f15)
-         (#x35 . escape)
-         (#x7e . up)
-         (#x7d . down)
-         (#x3d . down)
-         (#x7b . left)
-         (#x3b . left)
-         (#x7c . right)
-         (#x3c . right)
-         (#x24 . #\return)
-         (#x30 . #\tab)
-         (#x33 . #\backspace)
-         (#x75 . #\rubout)
-         (#x73 . home)
-         (#x77 . end)
-         (#x74 . prior)
-         (#x79 . next)
-         (#x45 . add)
-         (78 . subtract)
-         (#x43 . multiply)
-         (#x4b . divide)
-         (71 . separator)
-         (65 . decimal)
-         (76 . numpad-enter) ; was #\u3 in earlier versions
-         (82 . numpad0)
-         (83 . numpad1)
-         (84 . numpad2)
-         (85 . numpad3)
-         (86 . numpad4)
-         (87 . numpad5)
-         (88 . numpad6)
-         (89 . numpad7)
-         (91 . numpad8)
-         (92 . numpad9))
-   v
-   #f))
-
-(define (key-symbol-to-menu-key k)
-  (hash-ref keysyms k #f))
-
-(define keysyms
-  (let ()
-    (define NSUpArrowFunctionKey #xF700)
-    (define NSDownArrowFunctionKey #xF701)
-    (define NSLeftArrowFunctionKey #xF702)
-    (define NSRightArrowFunctionKey #xF703)
-    (define NSF1FunctionKey #xF704)
-    (define NSF2FunctionKey #xF705)
-    (define NSF3FunctionKey #xF706)
-    (define NSF4FunctionKey #xF707)
-    (define NSF5FunctionKey #xF708)
-    (define NSF6FunctionKey #xF709)
-    (define NSF7FunctionKey #xF70A)
-    (define NSF8FunctionKey #xF70B)
-    (define NSF9FunctionKey #xF70C)
-    (define NSF10FunctionKey #xF70D)
-    (define NSF11FunctionKey #xF70E)
-    (define NSF12FunctionKey #xF70F)
-    (define NSF13FunctionKey #xF710)
-    (define NSF14FunctionKey #xF711)
-    (define NSF15FunctionKey #xF712)
-    (define NSF16FunctionKey #xF713)
-    (define NSF17FunctionKey #xF714)
-    (define NSF18FunctionKey #xF715)
-    (define NSF19FunctionKey #xF716)
-    (define NSF20FunctionKey #xF717)
-    (define NSF21FunctionKey #xF718)
-    (define NSF22FunctionKey #xF719)
-    (define NSF23FunctionKey #xF71A)
-    (define NSF24FunctionKey #xF71B)
-    (define NSF25FunctionKey #xF71C)
-    (define NSF26FunctionKey #xF71D)
-    (define NSF27FunctionKey #xF71E)
-    (define NSF28FunctionKey #xF71F)
-    (define NSF29FunctionKey #xF720)
-    (define NSF30FunctionKey #xF721)
-    (define NSF31FunctionKey #xF722)
-    (define NSF32FunctionKey #xF723)
-    (define NSF33FunctionKey #xF724)
-    (define NSF34FunctionKey #xF725)
-    (define NSF35FunctionKey #xF726)
-    (define NSInsertFunctionKey #xF727)
-    (define NSDeleteFunctionKey #xF728)
-    (define NSHomeFunctionKey #xF729)
-    (define NSBeginFunctionKey #xF72A)
-    (define NSEndFunctionKey #xF72B)
-    (define NSPageUpFunctionKey #xF72C)
-    (define NSPageDownFunctionKey #xF72D)
-    (define NSPrintScreenFunctionKey #xF72E)
-    (define NSScrollLockFunctionKey #xF72F)
-    (define NSPauseFunctionKey #xF730)
-    (define NSSysReqFunctionKey #xF731)
-    (define NSBreakFunctionKey #xF732)
-    (define NSResetFunctionKey #xF733)
-    (define NSStopFunctionKey #xF734)
-    (define NSMenuFunctionKey #xF735)
-    (define NSUserFunctionKey #xF736)
-    (define NSSystemFunctionKey #xF737)
-    (define NSPrintFunctionKey #xF738)
-    (define NSClearLineFunctionKey #xF739)
-    (define NSClearDisplayFunctionKey #xF73A)
-    (define NSInsertLineFunctionKey #xF73B)
-    (define NSDeleteLineFunctionKey #xF73C)
-    (define NSInsertCharFunctionKey #xF73D)
-    (define NSDeleteCharFunctionKey #xF73E)
-    (define NSPrevFunctionKey #xF73F)
-    (define NSNextFunctionKey #xF740)
-    (define NSSelectFunctionKey #xF741)
-    (define NSExecuteFunctionKey #xF742)
-    (define NSUndoFunctionKey #xF743)
-    (define NSRedoFunctionKey #xF744)
-    (define NSFindFunctionKey #xF745)
-    (define NSHelpFunctionKey #xF746)
-    (define NSModeSwitchFunctionKey #xF747)
-
-    (hasheq
-     'start NSResetFunctionKey
-     'cancel NSStopFunctionKey
-     'clear NSClearDisplayFunctionKey
-     'menu NSMenuFunctionKey
-     'pause NSPauseFunctionKey
-     'prior NSPrevFunctionKey
-     'next NSNextFunctionKey
-     'end NSEndFunctionKey
-     'home NSHomeFunctionKey
-     'left NSLeftArrowFunctionKey
-     'up NSUpArrowFunctionKey
-     'right NSRightArrowFunctionKey
-     'down NSDownArrowFunctionKey
-     'escape 0
-     'select NSSelectFunctionKey
-     'print NSPrintFunctionKey
-     'execute NSExecuteFunctionKey
-     'snapshot 0
-     'insert NSInsertFunctionKey
-     'help NSHelpFunctionKey
-     'numpad0 0
-     'numpad1 0
-     'numpad2 0
-     'numpad3 0
-     'numpad4 0
-     'numpad5 0
-     'numpad6 0
-     'numpad7 0
-     'numpad8 0
-     'numpad9 0
-     'numpad-enter 0
-     'multiply 0
-     'add 0
-     'separator 0
-     'subtract 0
-     'decimal 0
-     'divide 0
-     'f1 NSF1FunctionKey
-     'f2 NSF2FunctionKey
-     'f3 NSF3FunctionKey
-     'f4 NSF4FunctionKey
-     'f5 NSF5FunctionKey
-     'f6 NSF6FunctionKey
-     'f7 NSF7FunctionKey
-     'f8 NSF8FunctionKey
-     'f9 NSF9FunctionKey
-     'f10 NSF10FunctionKey
-     'f11 NSF11FunctionKey
-     'f12 NSF12FunctionKey
-     'f13 NSF13FunctionKey
-     'f14 NSF14FunctionKey
-     'f15 NSF15FunctionKey
-     'f16 NSF16FunctionKey
-     'f17 NSF17FunctionKey
-     'f18 NSF18FunctionKey
-     'f19 NSF19FunctionKey
-     'f20 NSF20FunctionKey
-     'f21 NSF21FunctionKey
-     'f22 NSF22FunctionKey
-     'f23 NSF23FunctionKey
-     'f24 NSF24FunctionKey
-     'scroll NSScrollLockFunctionKey)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/list-box.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/list-box.rkt
deleted file mode 100644
index 778e030778..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/list-box.rkt
+++ /dev/null
@@ -1,380 +0,0 @@
-#lang racket/base
-(require ffi/unsafe/objc
-         ffi/unsafe
-         racket/class
-         (only-in racket/list take drop)
-          "../../syntax.rkt"
-          "../../lock.rkt"
-         "item.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "window.rkt"
-         "font.rkt"
-         "../common/event.rkt")
-
-(provide 
- (protect-out list-box%))
-
-;; ----------------------------------------
-
-(import-class NSScrollView NSTableView NSTableColumn NSCell NSIndexSet)
-(import-protocol NSTableViewDataSource)
-
-(define NSLineBreakByTruncatingTail 4)
-
-(define-objc-class RacketTableView NSTableView
-  #:mixins (FocusResponder KeyMouseResponder CursorDisplayer)
-  [wxb]
-  [-a _id (preparedCellAtColumn: [_NSInteger column] row: [_NSInteger row])
-      (let ([wx (->wx wxb)])
-        (tell
-         (let ([c (tell (tell NSCell alloc) initTextCell: #:type _NSString 
-                        (if wx (send wx get-cell column row) "???"))]
-               [font (and wx (send wx get-cell-font))])
-           (tellv c setLineBreakMode: #:type _NSUInteger NSLineBreakByTruncatingTail)
-           (when font
-             (tellv c setFont: font))
-           c)
-         autorelease))]
-  [-a _void (doubleClicked: [_id sender])
-      (queue-window*-event wxb (lambda (wx) (send wx clicked 'list-box-dclick)))]
-  [-a _void (tableViewSelectionDidChange: [_id aNotification])
-      (queue-window*-event wxb (lambda (wx) (send wx clicked 'list-box)))]
-  [-a _void (tableView: [_id view] didClickTableColumn: [_id col])
-      (queue-window*-event wxb (lambda (wx) (send wx clicked-column col)))]
-  [-a _void (tableViewColumnDidMove: [_id view])
-      (let ([wx (->wx wxb)])
-        (when wx (send wx reset-column-order)))])
-
-(define-objc-class RacketDataSource NSObject
-  #:protocols (NSTableViewDataSource)
-  [wxb]
-  [-a _NSInteger (numberOfRowsInTableView: [_id view])
-      (let ([wx (->wx wxb)])
-        (send wx number))]
-  [-a _NSString (tableView: [_id aTableView]
-                            objectValueForTableColumn: [_id aTableColumn]
-                            row: [_NSInteger rowIndex])
-      (let ([wx (->wx wxb)])
-        (if wx
-            (send wx get-cell aTableColumn rowIndex)
-            "???"))])
-
-(define (remove-nth data i)
-  (cond
-   [(zero? i) (cdr data)]
-   [else (cons (car data) (remove-nth (cdr data) (sub1 i)))]))
-
-(defclass list-box% item%
-  (init parent cb
-        label kind x y w h
-        choices style
-        font label-font 
-        columns column-order)
-  (inherit set-size init-font
-           register-as-child)
-
-  (define source (as-objc-allocation
-                  (tell (tell RacketDataSource alloc) init)))
-  (set-ivar! source wxb (->wxb this))
-
-  (define itemss (cons choices
-                       (for/list ([i (in-list (cdr columns))])
-                         (for/list ([i choices])
-                           ""))))
-  (define num-columns (length columns))
-  (define data (map (lambda (x) (box #f)) choices))
-  (define count (length choices))
-
-  (define cocoa (as-objc-allocation
-                 (tell (tell NSScrollView alloc) init)))
-  (define-values (content-cocoa column-cocoas)
-    (let ([content-cocoa 
-           (as-objc-allocation
-            (tell (tell RacketTableView alloc) init))])
-      (tellv content-cocoa setDelegate: content-cocoa)
-      (tellv content-cocoa setDataSource: source)
-      (define cols
-        (for/list ([title (in-list columns)])
-          (let ([col (as-objc-allocation
-                      (tell (tell NSTableColumn alloc) initWithIdentifier: #:type _NSString title))])
-            (tellv content-cocoa addTableColumn: col)
-            (tellv (tell col headerCell) setStringValue: #:type _NSString title)
-            col)))
-      (init-font content-cocoa font)
-      (values content-cocoa cols)))
-  (set-ivar! content-cocoa wxb (->wxb this))
-
-  (tellv cocoa setDocumentView: content-cocoa)
-  (tellv cocoa setHasVerticalScroller: #:type _BOOL #t)
-  (tellv cocoa setHasHorizontalScroller: #:type _BOOL #t)
-  (unless (memq 'column-headers style)
-    (tellv content-cocoa setHeaderView: #f))
-  (define allow-multi? (not (eq? kind 'single)))
-  (when allow-multi?
-    (tellv content-cocoa setAllowsMultipleSelection: #:type _BOOL #t))
-  (unless (memq 'reorderable-headers style)
-    (tellv content-cocoa setAllowsColumnReordering: #:type _BOOL #f))
-
-  (when column-order
-    (set-column-order column-order))
-  (define/public (set-column-order column-order)
-    (atomically
-     (for ([c (in-list column-cocoas)])
-       (tellv c retain)
-       (tellv content-cocoa removeTableColumn: c))
-     (for ([pos (in-list column-order)])
-       (let ([c (list-ref column-cocoas pos)])
-         (tellv content-cocoa addTableColumn: c)
-         (tellv c release)))
-     (reset-column-order)))
-
-  (define/public (set-column-label i s)
-    (let ([col (list-ref column-cocoas i)])
-      (tellv (tell col headerCell) setStringValue: #:type _NSString s)
-      (reset)))
-
-  (define/public (set-column-size i w min-w max-w)
-    (let ([col (list-ref column-cocoas i)])
-      (tellv col setMinWidth: #:type _CGFloat min-w)
-      (tellv col setMaxWidth: #:type _CGFloat max-w)
-      (tellv col setWidth: #:type _CGFloat w)))
-
-  (define/public (get-column-size i)
-    (let ([col (list-ref column-cocoas i)]
-          [int (lambda (v) (inexact->exact (round v)))])
-      (values
-       (int (tell #:type _CGFloat col width))
-       (int (tell #:type _CGFloat col minWidth))
-       (min 10000 (int (tell #:type _CGFloat col maxWidth))))))
-
-  (define/override (get-cocoa-content) content-cocoa)
-  (define/override (get-cocoa-control) content-cocoa)
-
-  (super-new [parent parent]
-             [cocoa cocoa]
-             [no-show? (memq 'deleted style)]
-             [callback cb])
-
-  (set-size 0 0 32 50)
-  ; (tellv content-cocoa sizeToFit)
-
-  (tellv content-cocoa setTarget: content-cocoa)
-  (tellv content-cocoa setDoubleAction: #:type _SEL (selector doubleClicked:))
-
-  (def/public-unimplemented get-label-font)
-
-  (define cell-font (and font (font->NSFont font)))
-  (when cell-font
-    (tellv content-cocoa setRowHeight: #:type _CGFloat
-           (+ (tell #:type _CGFloat cell-font defaultLineHeightForFont) 2)))
-
-  (define/public (get-cell-font)
-    cell-font)
-
-  (define/public (get-selection)
-    (if allow-multi?
-        (let ([l (get-selections)])
-          (if (null? l)
-              -1
-              (car l)))
-        (tell #:type _NSInteger content-cocoa selectedRow)))
-  (define/public (get-selections)
-    (atomically
-     (with-autorelease
-      (let ([v (tell content-cocoa selectedRowIndexes)])
-        (begin0
-         (let loop ([i (tell #:type _NSInteger v firstIndex)])
-           (cond
-            [(= i NSNotFound) null]
-            [else (cons i (loop (tell #:type _NSInteger v 
-                                      indexGreaterThanIndex: #:type _NSInteger i)))])))))))
-    
-  (define/private (header-height)
-    (let ([hv (tell content-cocoa headerView)])
-      (if hv
-          (NSSize-height (NSRect-size (tell #:type _NSRect hv frame)))
-          0)))
-
-  (define/public (number-of-visible-items)
-    (define doc (tell #:type _NSRect cocoa documentVisibleRect))
-    (define h (+ (tell #:type _CGFloat content-cocoa rowHeight)
-                 (NSSize-height (tell #:type _NSSize content-cocoa intercellSpacing))))
-    (define doc-h (- (NSSize-height (NSRect-size doc))
-                     (header-height)))
-    (define n (floor (/ doc-h h)))
-    (if (rational? n)
-        (max 1 (inexact->exact n))
-        1))
-  (define/public (get-first-item)
-    (define doc (tell #:type _NSRect cocoa documentVisibleRect))
-    (define h (header-height))
-    (NSRange-location (tell #:type _NSRange content-cocoa 
-                            rowsInRect: #:type _NSRect 
-                            (if (zero? h)
-                                doc
-                                (make-NSRect (NSRect-origin doc)
-                                             (make-NSSize (NSSize-width (NSRect-size doc))
-                                                          (- (NSSize-height (NSRect-size doc)) h)))))))
-
-  (define/public (set-first-visible-item i)
-    (define num-vis (number-of-visible-items))
-    (define start (max 0 (min i (- count num-vis))))
-    (tellv content-cocoa scrollRowToVisible: #:type _NSInteger start)
-    (tellv content-cocoa scrollRowToVisible: #:type _NSInteger (+ start (sub1 num-vis))))
-
-  (define/private (replace items i s)
-    (append (take items i)
-            (list s)
-            (drop items (add1 i))))
-
-  (define/public (set-string i s [col 0])
-    (let ([new-itemss (replace 
-                       itemss
-                       col
-                       (replace (list-ref itemss col)
-                                i
-                                s))])
-      (set! itemss new-itemss))
-    (reset))
-
-  (define/public (number)
-    ;; Can be called by event-handling thread
-    count)
-  (define/public (get-cell col n)
-    ;; Can be called by event-handling thread
-    (let ([col (if (number? col)
-                   (order->number col)
-                   (col->number col))])
-      (if (col . > . num-columns) ; can happen as column is deleted
-          ""
-          (list-ref (list-ref itemss col) n))))
-
-  (define/private (col->number col)
-    (let loop ([l column-cocoas] [pos 0])
-      (cond
-       [(null? l) #f]
-       [(ptr-equal? (car l) col) pos]
-       [else (loop (cdr l) (add1 pos))])))
-
-  ;; When columns are rearranged, we have to be able to map
-  ;; from current column numbers to original column numbers
-  (define order-vector #f)
-  (define/private (order->number col)
-    (prep-order-vector)
-    (vector-ref order-vector col))
-  (define/private (prep-order-vector)
-    (unless order-vector
-      (let ([vec (make-vector (length column-cocoas))])
-        (let ([array (tell content-cocoa tableColumns)])
-          (for/list ([i (in-range (tell #:type _NSUInteger array count))])
-            (let ([col (tell array objectAtIndex: #:type _NSUInteger i)])
-              (vector-set! vec i (col->number col)))))
-        (set! order-vector vec))))
-  (define/public (reset-column-order)
-    (set! order-vector #f))
-
-  (define/public (get-column-order)
-    (prep-order-vector)
-    (vector->list order-vector))
-
-  (define/public (append-column title)
-    (atomically
-     (let ([col (as-objc-allocation
-                 (tell (tell NSTableColumn alloc) initWithIdentifier: content-cocoa))])
-       (tellv content-cocoa addTableColumn: col)
-       (tellv (tell col headerCell) setStringValue: #:type _NSString title)
-       (set! column-cocoas (append column-cocoas (list col)))
-       (set! itemss (append itemss
-                            (list (for/list ([i (in-list (car itemss))])
-                                    ""))))
-       (set! num-columns (add1 num-columns))
-       (reset-column-order)))
-    (reset))
-
-  (define/public (delete-column i)
-    (atomically
-     (let ([c (list-ref column-cocoas i)])
-       (define (drop-nth l i)
-         (cond
-          [(zero? i) (cdr l)]
-          [else (cons (car l) (drop-nth (cdr l) (sub1 i)))]))
-       (set! num-columns (sub1 num-columns))
-       (tellv content-cocoa removeTableColumn: c)
-       (set! column-cocoas (drop-nth column-cocoas i))
-       (set! itemss (drop-nth itemss i))
-       (reset-column-order)))
-    (reset))
-
-  (define callback cb)
-  (define/public (clicked event-type)
-    (unless (zero? count)
-      (callback this (new control-event%
-                          [event-type event-type]
-                          [time-stamp (current-milliseconds)]))))
-
-  (define can-click-column? (memq 'clickable-headers style))
-  (define/public (clicked-column col)
-    (when can-click-column?
-      (let ([pos (col->number col)])
-        (callback this (new column-control-event%
-                            [event-type 'list-box-column]
-                            [time-stamp (current-milliseconds)]
-                            [column pos])))))
-
-  (define/public (set-data i v) (set-box! (list-ref data i) v))
-  (define/public (get-data i) (unbox (list-ref data i)))
-
-  (define/public (selected? i)
-    (tell #:type _BOOL content-cocoa isRowSelected: #:type _NSInteger i))
-
-  (define/public (select i [on? #t] [extend? #t])
-    (if on?
-        (atomically
-         (with-autorelease
-          (let ([index (tell (tell NSIndexSet alloc) initWithIndex: #:type _NSUInteger i)])
-            (tellv content-cocoa 
-                   selectRowIndexes: index
-                   byExtendingSelection: #:type _BOOL (and extend? allow-multi?)))))
-        (tellv content-cocoa deselectRow: #:type _NSInteger i)))
-  (define/public (set-selection i)
-    (select i #t #f))
-
-  (define/public (delete i)
-    (atomically
-     (set! count (sub1 count))
-     (set! itemss (for/list ([items (in-list itemss)])
-                    (remove-nth items i)))
-     (set! data (remove-nth data i)))
-    (reset))
-  (define/public (clear)
-    (atomically
-     (set! count 0)
-     (set! itemss (for/list ([items (in-list itemss)])
-                    null))
-     (set! data null))
-    (reset))
-  (define/public (set choices . more-choices)
-    (atomically
-     (set! itemss (cons choices more-choices))
-     (set! data (map (lambda (x) (box #f)) choices))
-     (set! count (length choices)))
-    (reset))
-
-  (public [append* append])
-  (define (append* s [v #f])
-    (atomically
-     (set! count (add1 count))
-     (set! itemss (cons (append (car itemss) (list s))
-                        (for/list ([items (in-list (cdr itemss))])
-                          (append items (list "")))))
-     (set! data (append data (list (box v)))))
-    (reset))
-
-  (define/public (reset)
-    (tellv content-cocoa noteNumberOfRowsChanged)
-    (tellv content-cocoa reloadData))
-
-  (define/override (maybe-register-as-child parent on?)
-    (register-as-child parent on?)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/menu-bar.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/menu-bar.rkt
deleted file mode 100644
index d6ebaf2f7f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/menu-bar.rkt
+++ /dev/null
@@ -1,207 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-         (only-in racket/list take drop)
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "queue.rkt")
-
-(provide 
- (protect-out menu-bar%
-              get-menu-bar-height))
-
-(import-class NSApplication NSMenu NSMenuItem NSProcessInfo NSScreen)
-
-(define-cf CFBundleGetMainBundle (_fun -> _pointer))
-(define-cf CFBundleGetInfoDictionary (_fun _pointer -> _id))
-
-(define app-name
-  (or
-   (let ([dict (CFBundleGetInfoDictionary (CFBundleGetMainBundle))])
-     (and dict
-          (let ([appName (tell dict objectForKey: #:type _NSString "CFBundleName")]
-                [alt (lambda ()
-                       (tell #:type _NSString (tell NSProcessInfo processInfo) processName))])
-            (if (not appName)
-                (alt)
-                (let ([appName (cast appName _id _NSString)])
-                  (if (equal? appName "")
-                      (alt)
-                      appName))))))
-   "MrEd"))
-
-(define the-apple-menu #f)
-(define recurring-for-command (make-parameter #f))
-
-(define-objc-class RacketBarMenu NSMenu
-  []
-  ;; Disable automatic handling of keyboard shortcuts, except for
-  ;;  the Apple menu
-  (-a _BOOL (performKeyEquivalent: [_id evt])
-      (or (and the-apple-menu
-               (tell #:type _BOOL the-apple-menu performKeyEquivalent: evt))
-          ;; Explicity send the event to the keyWindow:
-          (and
-           ;; Don't go into an infinite loop:
-           (not (recurring-for-command))
-           ;; Don't handle Cmd-` for cycling through windows:
-           ;; [Is this right for all locales?]
-           (not (equal? "`" (tell #:type _NSString evt characters)))
-           ;; Otherwise, try to dispatch to the first respnder:
-           (let ([w (tell app keyWindow)])
-             (and w
-                  (let ([r (tell w firstResponder)])
-                    (and r
-                         (begin
-                           (parameterize ([recurring-for-command #t])
-                             (let ([evt-type (tell #:type _NSInteger evt type)])
-                               (cond
-                                [(= NSKeyDown evt-type)
-                                 (tell r keyDown: evt)]
-                                [(= NSKeyUp evt-type)
-                                 (tell r keyUp: evt)])))
-                           #t)))))))))
-
-(define cocoa-mb (tell (tell RacketBarMenu alloc) init))
-(define current-mb #f)
-
-;; Used to detect mouse click on the menu bar:
-(define in-menu-bar-range
-  (let ([f (tell #:type _NSRect 
-                 (tell (tell NSScreen screens) objectAtIndex: #:type _NSUInteger 0)
-                 frame)])
-    (let ([x (NSPoint-x (NSRect-origin f))]
-          [w (NSSize-width (NSRect-size f))]
-          [y (+ (NSPoint-y (NSRect-origin f))
-                (NSSize-height (NSRect-size f)))])
-      (lambda (p)
-        (let ([h (tell #:type _CGFloat cocoa-mb menuBarHeight)])
-          (and (<= x (NSPoint-x p) (+ x w))
-               (<= (- y h) (NSPoint-y p) y)))))))
-
-(set-menu-bar-hooks! in-menu-bar-range)
-
-;; Init menu bar
-(let ([app (tell NSApplication sharedApplication)]
-      [add-one (lambda (mb menu)
-                 (let ([item (tell (tell NSMenuItem alloc) 
-                                   initWithTitle: #:type _NSString ""
-                                   action: #:type _SEL #f 
-                                   keyEquivalent: #:type _NSString "")])
-                   (tellv item setSubmenu: menu)
-                   (tellv mb addItem: item)
-                   (tellv item release)))])
-  (let ([apple (tell (tell NSMenu alloc) initWithTitle: #:type _NSString "")])
-    (let ([std (lambda (title sel [shortcut ""] [mods #f] [delegate? #f])
-                 (let ([item (tell (tell NSMenuItem alloc) 
-                                   initWithTitle: #:type _NSString title
-                                   action: #:type _SEL sel
-                                   keyEquivalent: #:type _NSString shortcut)])
-                   (when mods
-                     (tellv item setKeyEquivalentModifierMask: #:type _NSInteger mods))
-                   (tellv item setTarget: (if delegate?
-                                              (tell app delegate)
-                                              app))
-                   (tellv apple addItem: item)
-                   (tellv item release)))])
-      (std (format "About ~a" app-name) (selector openAbout:) "" #f #t)
-      (std "Preferences..."  (selector openPreferences:) "," #f #t)
-      (tellv apple addItem: (tell NSMenuItem separatorItem))
-      (let ([services (tell (tell NSMenu alloc) initWithTitle: #:type _NSString "Services")])
-        (tellv app setServicesMenu: services)
-        (let ([item (tell (tell NSMenuItem alloc) 
-                          initWithTitle: #:type _NSString "Services"
-                          action: #:type _SEL #f
-                          keyEquivalent: #:type _NSString "")])
-          (tellv item setSubmenu: services)
-          (tellv apple addItem: item)
-          (tellv item release)))
-      (tellv apple addItem: (tell NSMenuItem separatorItem))
-      (std (format "Hide ~a" app-name) (selector hide:) "h")
-      (std "Hide Others" (selector hideOtherApplications:) "h" (bitwise-ior
-                                                                NSAlternateKeyMask
-                                                                NSCommandKeyMask))
-      (std "Show All" (selector unhideAllApplications:))
-      (tellv apple addItem: (tell NSMenuItem separatorItem))
-      (std (format "Quit ~a" app-name) (selector terminate:) "q"))
-    (add-one cocoa-mb apple)
-    (tellv app setAppleMenu: apple)
-    (tellv apple release)
-    (tellv app setMainMenu: cocoa-mb)
-    (set! the-apple-menu apple)))
-
-(tellv cocoa-mb setAutoenablesItems: #:type _BOOL #f)
-
-(defclass menu-bar% object%
-  (define menus null)
-
-  (define/public (enable-top pos on?)
-    (set-box! (cddr (list-ref menus pos)) on?)
-    (when (eq? current-mb this)
-      (tellv (tell cocoa-mb itemAtIndex: #:type _NSInteger (add1 pos))
-             setEnabled: #:type _BOOL on?)))
-
-  (define/public (delete which pos)
-    (atomically
-     (when (eq? current-mb this)
-       (tellv cocoa-mb removeItem: 
-              (tell cocoa-mb itemAtIndex: #:type _NSInteger (add1 pos))))
-     (set! menus (let loop ([menus menus]
-                            [pos pos])
-                   (cond
-                    [(null? menus) menus]
-                    [(zero? pos) (cdr menus)]
-                    [else (cons (car menus)
-                                (loop (cdr menus)
-                                      (sub1 pos)))])))))
-
-  (public [append-menu append])
-  (define (append-menu menu title)
-    (set! menus (append menus (list (list* menu title (box #t)))))
-    (send menu set-parent this)
-    (when (eq? current-mb this)
-      (send menu install cocoa-mb title #t)))
-
-  (define/public (install)
-    (let loop ()
-      (when ((tell #:type _NSInteger cocoa-mb numberOfItems) . > . 1)
-        (tellv cocoa-mb removeItem: (tell cocoa-mb itemAtIndex: #:type _NSInteger 1))
-        (loop)))
-    (for-each (lambda (menu)
-                (send (car menu) install cocoa-mb (cadr menu) (unbox (cddr menu))))
-              menus)
-    (set! current-mb this))
-
-  (define top-wx #f)
-  (define/public (set-top-window top)
-    (set! top-wx top))
-  (define/public (get-top-window)
-    top-wx)
-
-  (define/public (set-label-top pos str)
-    (set! menus (append
-                 (take menus pos)
-                 (let ([i (list-ref menus pos)])
-                   (list (cons (car i) (cons str (cddr i)))))
-                 (drop menus (add1 pos))))
-    (when (eq? current-mb this)
-      (tellv (tell cocoa-mb itemAtIndex: #:type _NSInteger 1)
-             setTitle: #:type _NSString (clean-menu-label str))))
-
-  (define/public (do-on-menu-click)
-    (let ([es (send top-wx get-eventspace)])
-      (when es
-        (queue-event es (lambda ()
-                          (send top-wx on-menu-click))))))
-
-  (super-new))
-
-(define initial-menubar-height 
-  (inexact->exact (floor (tell #:type _CGFloat cocoa-mb menuBarHeight))))
-
-(define (get-menu-bar-height)
-  initial-menubar-height)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/menu-item.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/menu-item.rkt
deleted file mode 100644
index 0c2825a84c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/menu-item.rkt
+++ /dev/null
@@ -1,101 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-         "../../syntax.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt")
-
-(provide 
- (protect-out menu-item%
-              set-menu-item-shortcut))
-
-(import-class NSMenuItem)
-
-(define-objc-class RacketMenuItem NSMenuItem
-  [wxb]
-  (-a _void (selected: [_id sender]) 
-      (let ([wx (->wx wxb)])
-        (when wx
-          (send wx selected))))
-  (-a _void (selectedCheckable: [_id sender]) 
-      (let ([wx (->wx wxb)])
-        (when wx
-          (send wx selected-checkable self)))))
-
-
-(defclass menu-item% object%
-  (define/public (id) this)
-  
-  (define parent #f)
-  (define/public (selected)
-    ;; called in Cocoa thread
-    (send parent item-selected this))
-  (define/public (selected-checkable cocoa)
-    ;; called in Cocoa thread
-    (set! checked? (not checked?))
-    (tellv cocoa setState: #:type _int (if checked? 1 0))
-    (send parent item-selected this))
-
-  (define/public (set-parent p)
-    (set! parent p))
-
-  (define label #f)
-  (define/public (set-label l) (set! label l))
-  (define/public (get-label) label)
-
-  (define checked? #f)
-  (define/public (set-checked c?) (set! checked? c?))
-  (define/public (get-checked) checked?)
-
-  (define enabled? #t)
-  (define/public (set-enabled-flag e?) (set! enabled? e?))
-  (define/public (get-enabled-flag) enabled?)
-
-  (define submenu #f)
-  (define/public (set-submenu m) (set! submenu m))
-
-  (define/public (install menu checkable?)
-    (if submenu
-        (send submenu install menu label enabled?)
-        (let ([item (as-objc-allocation
-                     (tell (tell RacketMenuItem alloc) 
-                           initWithTitle: #:type _NSString (clean-menu-label (regexp-replace #rx"\t.*" label ""))
-                           action: #:type _SEL #f
-                           keyEquivalent: #:type _NSString ""))])
-          (set-ivar! item wxb (->wxb this))
-          (tellv menu addItem: item)
-          (tellv item setEnabled: #:type _BOOL enabled?)
-          (when checked?
-            (tellv item setState: #:type _int 1))
-          (tellv item setTarget: item)
-          (tellv item setAction: #:type _SEL (if checkable?
-                                                 (selector selectedCheckable:)
-                                                 (selector selected:)))
-          (set-menu-item-shortcut item label)
-          (release item))))
-
-  (super-new))
-
-(define (set-menu-item-shortcut item label)
-  (let ([shortcut (regexp-match #rx"\tCut=(.)(.*)" label)])
-    (if shortcut
-        (let* ([s (string-downcase (string (integer->char (string->number (caddr shortcut)))))]
-               [flags (- (char->integer (string-ref (cadr shortcut) 0))
-                         (char->integer #\A))]
-               [mods (+ (if (positive? (bitwise-and flags 1))
-                            NSShiftKeyMask
-                            0)
-                        (if (positive? (bitwise-and flags 2))
-                            NSAlternateKeyMask
-                            0)
-                        (if (positive? (bitwise-and flags 4))
-                            NSControlKeyMask
-                            0)
-                        (if (positive? (bitwise-and flags 8))
-                            0
-                            NSCommandKeyMask))])
-          (tellv item setKeyEquivalent: #:type _NSString s)
-          (tellv item setKeyEquivalentModifierMask: #:type _NSUInteger mods))
-        (tellv item setKeyEquivalent: #:type _NSString ""))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/menu.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/menu.rkt
deleted file mode 100644
index e4145a32b8..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/menu.rkt
+++ /dev/null
@@ -1,194 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-         (only-in racket/list drop take)
-         "../common/event.rkt"
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "window.rkt"
-         "menu-item.rkt")
-
-(provide 
- (protect-out menu%))
-
-(import-class NSMenu NSMenuItem NSEvent)
-
-(define-struct mitem (item checkable?))
-
-(defclass menu% object%
-  (init-field label
-              callback
-              font)
-
-  (super-new)
-
-  (define items null)
-
-  (define cocoa #f)
-  (define cocoa-menu #f)
-
-  (define/public (create-menu label)
-    (unless cocoa
-      (set! cocoa
-            (as-objc-allocation
-             (tell (tell NSMenuItem alloc)
-                   initWithTitle: #:type _NSString (clean-menu-label label)
-                   action: #:type _SEL #f
-                   keyEquivalent: #:type _NSString "")))
-      (set! cocoa-menu
-            (as-objc-allocation
-             (tell (tell NSMenu alloc)
-                   initWithTitle: #:type _NSString (clean-menu-label label))))
-      (tellv cocoa-menu setAutoenablesItems: #:type _BOOL #f)
-      (tellv cocoa setSubmenu: cocoa-menu)
-      (for-each (lambda (item)
-                  (if item
-                      (send (mitem-item item) install cocoa-menu (mitem-checkable? item))
-                      (tellv cocoa-menu addItem: (tell NSMenuItem separatorItem))))
-                items)))
-
-  (define/public (install cocoa-parent label enabled?)
-    (create-menu label)
-    (tellv cocoa-parent addItem: cocoa)
-    (tellv cocoa setEnabled: #:type _BOOL enabled?))
-
-  (define popup-box #f)
-
-  (define/public (do-popup v win x y queue-cb)
-    (unless (null? items)
-      (create-menu "menu")
-      (let ([b (box #f)])
-        (set! popup-box b)
-        (if (not (version-10.6-or-later?))
-            ;; For 10.5 and earlier:
-            (let ([p (tell #:type _NSPoint v
-                           convertPoint: #:type _NSPoint (make-NSPoint x y)
-                           toView: #f)])
-              (atomically
-               (with-autorelease
-                (tellv NSMenu popUpContextMenu: cocoa-menu 
-                       withEvent: (tell NSEvent 
-                                        mouseEventWithType: #:type _int NSLeftMouseDown
-                                        location: #:type _NSPoint p
-                                        modifierFlags: #:type _NSUInteger 0 
-                                        timestamp: #:type _double 0.0
-                                        windowNumber: #:type _NSUInteger 
-                                        (tell #:type _NSInteger win windowNumber)
-                                        context: #:type _pointer #f
-                                        eventNumber: #:type _NSInteger 0
-                                        clickCount: #:type _NSInteger 1
-                                        pressure: #:type _float 1.0)
-                       forView: v))))
-            ;; 10.6 and later:
-            (tellv cocoa-menu 
-                   popUpMenuPositioningItem: (tell cocoa-menu itemAtIndex: #:type _NSUInteger 0)
-                   atLocation: #:type _NSPoint (make-NSPoint x y)
-                   inView: v))
-        (set! popup-box #f)
-        (let* ([i (unbox b)]
-               [e (new popup-event% [event-type 'menu-popdown])])
-          (send e set-menu-id i)
-          (queue-cb (lambda () (callback this e)))))))
-  
-  (define/public (item-selected menu-item)
-    ;; called in Cocoa thread
-    (cond
-     [popup-box
-      (set-box! popup-box menu-item)]
-     [(parent . is-a? . menu%)
-      (send parent item-selected menu-item)]
-     [else
-      (let ([top (get-top-parent)])
-        (when top
-          (queue-window-event
-           top
-           (lambda () (send top on-menu-command menu-item)))))]))
-
-  (define parent #f)
-  (define/public (set-parent p) (set! parent p))
-  (define/public (get-top-parent)
-    ;; called in Cocoa thread
-    (and parent
-         (if (parent . is-a? . menu%)
-             (send parent get-top-parent)
-             (send parent get-top-window))))
-
-  (public [append-item append])
-  (define (append-item i label help-str-or-submenu chckable?)
-    (send i set-label label)
-    (when (help-str-or-submenu . is-a? . menu%)
-      (send i set-submenu help-str-or-submenu)
-      (send help-str-or-submenu set-parent this))
-    (set! items (append items (list (make-mitem i chckable?))))
-    (send i set-parent this)
-    (when cocoa-menu
-      (send i install cocoa-menu chckable?)))
-
-  (define/public (append-separator)
-    (set! items (append items (list #f)))
-    (when cocoa-menu
-      (tellv cocoa-menu addItem: (tell NSMenuItem separatorItem))))
-
-  (def/public-unimplemented select)
-  (def/public-unimplemented get-font)
-  (def/public-unimplemented set-width)
-  (def/public-unimplemented set-title)
-
-  (define/public (set-help-string m s) (void))
-
-  (def/public-unimplemented number)
-
-  (define/private (find-pos item)
-    (for/or ([i (in-list items)]
-             [pos (in-naturals)])
-      (and i
-           (eq? (mitem-item i) item) 
-           pos)))
-
-  (define/public (adjust item cocoa-cb cb)
-    (let ([pos (find-pos item)])
-      (when pos
-        (when cocoa-menu
-          (cocoa-cb (tell cocoa-menu itemAtIndex: #:type _NSInteger pos)))
-        (cb (list-ref items pos)))))
-  
-  (define/public (set-label item label)
-    (adjust item
-            (lambda (item-cocoa)
-              (tellv item-cocoa setTitle: #:type _NSString (clean-menu-label (regexp-replace #rx"\t.*" label "")))
-              (set-menu-item-shortcut item-cocoa label))
-            (lambda (mitem)
-              (send (mitem-item mitem) set-label (clean-menu-label label)))))
-
-  (define/public (check item on?)
-    (adjust item
-            (lambda (item-cocoa)
-              (tellv item-cocoa setState: #:type _int (if on? 1 0)))
-            (lambda (mitem)
-              (send (mitem-item mitem) set-checked (and on? #t)))))
-                  
-  (define/public (enable item on?)
-    (adjust item
-            (lambda (item-cocoa)
-              (tellv item-cocoa setEnabled: #:type _BOOL on?))
-            (lambda (mitem)
-              (send (mitem-item mitem) set-enabled-flag (and on? #t)))))
-    
-  (define/public (checked? item)
-    (send item get-checked))
-
-  (define/public (delete-by-position pos)
-    (let ([mitem (list-ref items pos)])
-      (set! items (append (take items pos)
-                          (drop items (add1 pos))))
-      (when cocoa-menu
-        (tellv cocoa-menu removeItemAtIndex: #:type _NSInteger pos))))
-
-  (define/public (delete item)
-    (let ([pos (find-pos item)])
-      (when pos
-        (delete-by-position pos)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/message.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/message.rkt
deleted file mode 100644
index 360f4e8fad..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/message.rkt
+++ /dev/null
@@ -1,127 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-         racket/draw/private/bitmap
-          "../../syntax.rkt"
-          "../../lock.rkt"
-          "window.rkt"
-          "item.rkt"
-          "utils.rkt"
-          "types.rkt"
-          "image.rkt")
-
-(provide 
- (protect-out message%))
-
-;; ----------------------------------------
-
-(import-class NSTextField NSImageView NSWorkspace NSRunningApplication)
-
-(define _OSType _uint32)
-
-(define-cocoa NSFileTypeForHFSTypeCode (_fun _OSType -> _id))
-
-(define (get-app-icon)
-  (tell (tell NSRunningApplication currentApplication) icon))
-
-(define (make-icon label)
-  (let ([icon
-         (if (eq? label 'app)
-             (get-app-icon)
-             (let ([id (integer-bytes->integer
-                        (case label
-                          [(caution) #"caut"]
-                          [(stop) #"stop"])
-                        #f
-                        #t)])
-               (tell (tell NSWorkspace sharedWorkspace)
-                     iconForFileType:
-                     (NSFileTypeForHFSTypeCode id))))])
-    (tellv icon retain) 
-    (tellv icon setSize: #:type _NSSize (make-NSSize 64 64))
-    (unless (eq? label 'app)
-      ;; Add badge:
-      (let ([app-icon (get-icon 'app)])
-        (tellv icon lockFocus)
-        (tellv app-icon drawInRect: #:type _NSRect (make-NSRect (make-NSPoint 32 0)
-                                                                (make-NSSize 32 32))
-               fromRect: #:type _NSRect (make-NSRect (make-NSPoint 0 0)
-                                                     (make-NSSize 64 64))
-               operation: #:type _int 2 ; NSCompositeSourceOver 
-               fraction: #:type _CGFloat 1.0)
-        (tellv icon unlockFocus)))
-    icon))
-
-(define icons (make-hash))
-(define (get-icon label)
-  (or (hash-ref icons label #f)
-      (let ([icon (atomically (make-icon label))])
-        (hash-set! icons label icon)
-        icon)))
-
-;; ----------------------------------------
-
-(define-objc-class RacketTextField NSTextField
-  #:mixins (KeyMouseResponder CursorDisplayer)
-  [wxb])
-
-(define-objc-class RacketImageView NSImageView
-  #:mixins (KeyMouseResponder CursorDisplayer)
-  [wxb])
-
-(defclass message% item%
-  (init parent label
-        x y
-        style font)
-  (inherit get-cocoa init-font)
-  
-  (super-new [parent parent]
-             [cocoa (let* ([label (cond
-                                   [(string? label) label]
-                                   [(symbol? label) (get-icon label)]
-                                   [else label])]
-                           [cocoa
-                            (if (string? label)
-                                (as-objc-allocation
-                                 (tell (tell RacketTextField alloc) init))
-                                (as-objc-allocation
-                                 (tell (tell RacketImageView alloc) init)))])
-                      (cond
-                       [(string? label)
-                        (init-font cocoa font)
-                        (tellv cocoa setSelectable: #:type _BOOL #f)
-                        (tellv cocoa setEditable: #:type _BOOL #f)
-                        (tellv cocoa setBordered: #:type _BOOL #f)
-                        (tellv cocoa setDrawsBackground: #:type _BOOL #f)
-                        (tellv cocoa setStringValue: #:type _NSString (strip-mnemonic label))
-                        (tellv cocoa sizeToFit)]
-                       [else
-                        (tellv cocoa setImage: (if (label . is-a? . bitmap%)
-                                                   (bitmap->image label)
-                                                   label))
-                        (tellv cocoa setFrame: #:type _NSRect 
-                               (make-NSRect (make-NSPoint 0 0)
-                                            (if (label . is-a? . bitmap%)
-                                                (make-NSSize (send label get-width)
-                                                             (send label get-height))
-                                                (tell #:type _NSSize label size))))])
-                      cocoa)]
-             [callback void]
-             [no-show? (memq 'deleted style)])
-
-  (define/override (set-label label)
-    (cond
-     [(string? label)
-      (tellv (get-cocoa) setStringValue: #:type _NSString (strip-mnemonic label))]
-     [else
-      (tellv (get-cocoa) setImage: (bitmap->image label))]))
-
-  (define/override (gets-focus?) #f)
-
-  (define/public (set-preferred-size)
-    (tellv (get-cocoa) sizeToFit)
-    #t)
-
-  (def/public-unimplemented get-font))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/panel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/panel.rkt
deleted file mode 100644
index bdb3043c7b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/panel.rkt
+++ /dev/null
@@ -1,154 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-         "../../syntax.rkt"
-         "types.rkt"
-         "utils.rkt"
-         "cg.rkt"
-         "window.rkt")
-
-(provide 
- (protect-out panel%
-              panel-mixin
-
-              FrameView))
-
-(import-class NSView NSGraphicsContext)
-
-(define-objc-class RacketPanelView NSView
-  #:mixins (KeyMouseTextResponder CursorDisplayer)
-  [wxb])
-
-(define-objc-class FrameView NSView 
-  []
-  (-a #:async-apply (box (void))
-      _void (drawRect: [_NSRect r])
-      (let ([ctx (tell NSGraphicsContext currentContext)])
-        (tellv ctx saveGraphicsState)
-        (let ([cg (tell #:type _CGContextRef ctx graphicsPort)]
-              [r (tell #:type _NSRect self bounds)])
-          (CGContextSetRGBFillColor cg 0 0 0 1.0)
-          (CGContextAddRect cg r)
-          (CGContextStrokePath cg))
-        (tellv ctx restoreGraphicsState))))
-
-(define (panel-mixin %)
-  (class %
-    (inherit register-as-child on-new-child
-             is-window-enabled? get-cocoa)
-
-    (define lbl-pos 'horizontal)
-    (define children null)
-
-    (super-new)
-    
-    (define/public (get-label-position) lbl-pos)
-    (define/public (set-label-position pos) (set! lbl-pos pos))
-
-    (define/public (adopt-child p)
-      ;; in atomic mode
-      (send p set-parent this))
-
-    (define/override (fix-dc)
-      (super fix-dc)
-      (for ([child (in-list children)])
-        (send child fix-dc)))
-
-    (define/override (hide-children)
-      (for ([child (in-list children)])
-        (send child hide-children)))
-
-    (define/override (show-children)
-      (for ([child (in-list children)])
-        (send child show-children)))
-
-    (define/override (fixup-locations-children)
-      (for ([child (in-list children)])
-        (send child fixup-locations-children)))
-    
-    (define/override (paint-children)
-      (for ([child (in-list children)])
-        (send child paint-children)))
-
-    (define/override (children-accept-drag on?)
-      (for ([child (in-list children)])
-        (send child child-accept-drag on?)))
-
-    (define/override (enable-window on?)
-      (super enable-window on?)
-      (let ([on? (and on? (is-window-enabled?))])
-        (for ([child (in-list children)])
-          (send child enable-window on?))))
-    
-    (define/override (set-size x y w h)
-      (super set-size x y w h)
-      (fix-dc))
-    
-    (define/override (maybe-register-as-child parent on?)
-      (register-as-child parent on?))
-    
-    (define/override (register-child child on?)
-      (let ([now-on? (and (memq child children) #t)])
-        (unless (eq? on? now-on?)
-          (set! children 
-                (if on?
-                    (cons child children)
-                    (remq child children)))
-          (on-new-child child on?))))
-
-    (define/override (show on?)
-      (super show on?)
-      (fix-dc))
-
-    (define/override (refresh-all-children)
-      (for ([child (in-list children)])
-        (send child refresh)))
-    
-    (define/public (set-item-cursor x y) (void))))
-
-(defclass panel% (panel-mixin window%)
-  (inherit get-cocoa)
-  (init parent
-        x y w h
-        style
-        label)
-
-  (define has-border? (memq 'border style))
-
-  (super-new [parent parent]
-             [cocoa
-              (as-objc-allocation
-               (tell (tell (if has-border? FrameView RacketPanelView) alloc)
-                     initWithFrame: #:type _NSRect (make-NSRect (make-init-point x y)
-                                                                (make-NSSize (max (if has-border? 3 1) w) 
-                                                                             (max (if has-border? 3 1) h)))))]
-             [no-show? (memq 'deleted style)])
-
-  (define content-cocoa
-    (and has-border?
-         (let* ([c (get-cocoa)]
-                [f (tell #:type _NSRect c frame)])
-           (as-objc-allocation
-            (tell (tell RacketPanelView alloc)
-                  initWithFrame: #:type _NSRect (make-NSRect (make-init-point 1 1)
-                                                             (let ([s (NSRect-size f)])
-                                                               (make-NSSize (max 1 (- (NSSize-width s) 2))
-                                                                            (max 1 (- (NSSize-height s) 2))))))))))
-  (when has-border?
-    (let ([cocoa (get-cocoa)])
-      (tell #:type _void cocoa addSubview: content-cocoa)
-      (set-ivar! content-cocoa wxb (->wxb this))))
-
-  (define/override (get-cocoa-content)
-    (if has-border?
-        content-cocoa
-        (super get-cocoa-content)))
-
-  (define/override (set-size x y w h)
-    (super set-size x y w h)
-    (when has-border?
-      (tellv content-cocoa setFrame: #:type _NSRect (make-NSRect (make-NSPoint 1 1)
-                                                                (make-NSSize (max 1 (- w 2)) (max 1 (- h 2))))))))
-
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/platform.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/platform.rkt
deleted file mode 100644
index 99d3b54d89..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/platform.rkt
+++ /dev/null
@@ -1,94 +0,0 @@
-#lang racket/base
-(require "init.rkt"
-         "button.rkt"
-         "canvas.rkt"
-         "check-box.rkt"
-         "choice.rkt"
-         "clipboard.rkt"
-         "cursor.rkt"
-         "dialog.rkt"
-         "frame.rkt"
-         "gauge.rkt"
-         "group-panel.rkt"
-         "item.rkt"
-         "list-box.rkt"
-         "menu.rkt"
-         "menu-bar.rkt"
-         "menu-item.rkt"
-         "message.rkt"
-         "panel.rkt"
-         "printer-dc.rkt"
-         "radio-box.rkt"
-         "slider.rkt"
-         "tab-panel.rkt"
-         "window.rkt"
-         "procs.rkt")
-(provide (protect-out platform-values))
-
-(define (platform-values)
-  (values
-   button%
-   canvas%
-   canvas-panel%
-   check-box%
-   choice%
-   clipboard-driver%
-   cursor-driver%
-   dialog%
-   frame%
-   gauge%
-   group-panel%
-   item%
-   list-box%
-   menu%
-   menu-bar%
-   menu-item%
-   message%
-   panel%
-   printer-dc%
-   radio-box%
-   slider%
-   tab-panel%
-   window%
-   can-show-print-setup?
-   show-print-setup
-   id-to-menu-item
-   file-selector
-   is-color-display?
-   get-display-depth
-   has-x-selection?
-   hide-cursor
-   bell
-   display-size
-   display-origin
-   display-count
-   display-bitmap-resolution
-   flush-display
-   get-current-mouse-state
-   fill-private-color
-   cancel-quit
-   get-control-font-face
-   get-control-font-size
-   get-control-font-size-in-pixels?
-   get-double-click-time
-   file-creator-and-type
-   location->window
-   shortcut-visible-in-label?
-   unregister-collecting-blit
-   register-collecting-blit
-   find-graphical-system-path
-   play-sound
-   get-panel-background
-   font-from-user-platform-mode
-   get-font-from-user
-   color-from-user-platform-mode
-   get-color-from-user
-   special-option-key
-   special-control-key
-   get-highlight-background-color
-   get-highlight-text-color
-   make-screen-bitmap
-   make-gl-bitmap
-   check-for-break
-   key-symbol-to-menu-key
-   needs-grow-box-spacer?))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/pool.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/pool.rkt
deleted file mode 100644
index 070719d284..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/pool.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/objc
-         ffi/unsafe/atomic
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt")
-
-(provide 
- (protect-out queue-autorelease-flush
-              autorelease-flush))
-
-(import-class NSAutoreleasePool)
-
-;; This pool manages all objects that would otherwise not
-;; have a pool:
-(define pool (tell (tell NSAutoreleasePool alloc) init))
-
-;; We need to periodically flush the main pool, otherwise
-;; object autoreleased through the pool live until the
-;; end of execution:
-(define (autorelease-flush)
-  (start-atomic)
-  (tellv pool drain)
-  (set! pool (tell (tell NSAutoreleasePool alloc) init))
-  (end-atomic))
-
-(define queued? #f)
-(define autorelease-evt (make-semaphore))
-
-(define (queue-autorelease-flush)
-  (start-atomic)
-  (unless queued?
-    (semaphore-post autorelease-evt)
-    (set! queued? #t))
-  (end-atomic))
-
-;; Create a thread to periodically flush:
-(void
- (thread (lambda ()
-           (let loop ()
-             (sync autorelease-evt)
-             (set! queued? #f)
-             (autorelease-flush)
-             (loop)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/printer-dc.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/printer-dc.rkt
deleted file mode 100644
index 9bd8308e1c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/printer-dc.rkt
+++ /dev/null
@@ -1,215 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/math
-         racket/draw/private/local
-         racket/draw/private/dc
-         racket/draw/unsafe/cairo
-         racket/draw/private/bitmap
-         racket/draw/private/bitmap-dc
-         racket/draw/private/record-dc
-         racket/draw/private/ps-setup
-         ffi/unsafe
-         ffi/unsafe/objc
-         "../../lock.rkt"
-         "dc.rkt"
-         "frame.rkt"
-         "cg.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "queue.rkt")
-
-(provide 
- (protect-out printer-dc%
-              show-print-setup))
-
-(import-class NSPrintOperation NSView NSGraphicsContext
-              NSPrintInfo NSDictionary NSPageLayout
-              NSNumber)
-
-(define NSPortraitOrientation  0)
-(define NSLandscapeOrientation 1)
-
-(define-cocoa NSPrintScalingFactor _id)
-
-(define-objc-class PrinterView NSView
-  [wxb]
-  [-a _BOOL (knowsPageRange: [_NSRange-pointer rng])
-      (set-NSRange-location! rng 1)
-      (set-NSRange-length! rng (let ([wx (->wx wxb)])
-                                 (if wx
-                                     (send wx get-page-count)
-                                     0)))
-      #t]
-  [-a _NSRect (rectForPage: [_NSInteger n])
-      (let ([wx (->wx wxb)])
-        (if wx
-            (send wx get-rect-for-page n)
-            (make-NSRect (make-NSPoint 0 0)
-                         (make-NSSize 10 10))))]
-  [-a _void (beginPageInRect: [_NSRect aRect] atPlacement: [_NSPoint location])
-      (let ([wx (->wx wxb)])
-        (when wx
-          (send wx start-page-at aRect)))
-      (super-tell #:type _void beginPageInRect: #:type _NSRect aRect atPlacement:  #:type _NSPoint location)]
-  [-a _void (drawPageBorderWithSize: [_NSSize size])
-      (let ([wx (->wx wxb)])
-        (when wx
-          (send wx draw-print-page self size)))])
-
-(define (make-print-info [prev #f])
-  (as-objc-allocation-with-retain
-   (tell (tell NSPrintInfo alloc)
-         initWithDictionary:
-         (if prev
-             (tell prev dictionary)
-             (tell NSDictionary dictionary)))))
-
-(define (get-scaling-factor print-info)
-  ;; 10.6 only:
-  #;
-  (tell #:type _CGFloat print-info scalingFactor)
-  (atomically
-   (with-autorelease
-    (tell #:type _double
-          (tell (tell print-info dictionary) 
-                objectForKey: NSPrintScalingFactor)
-          doubleValue))))
-
-(define (install-pss-to-print-info pss print-info)
-  (tellv print-info setOrientation: #:type _int (if (eq? (send pss get-orientation) 'landscape)
-                                                    NSLandscapeOrientation
-                                                    NSPortraitOrientation))
-  (let ([scale (let ([x (box 0)]
-                     [y (box 0)])
-                 (send pss get-scaling x y)
-                 (unbox y))])
-    ;; 10.6 only:
-    #;
-    (tellv print-info setScalingFactor: #:type _CGFloat scale)
-    (atomically
-     (with-autorelease
-      (tellv (tell print-info dictionary) 
-             setObject: (tell NSNumber numberWithDouble: #:type _double scale)
-             forKey: NSPrintScalingFactor)))))
-
-(define NSOkButton 1)
-
-(define (show-print-setup parent)
-  (promote-to-gui!)
-  (let* ([pss (current-ps-setup)]
-         [print-info (let ([pi (send pss get-native)])
-                       (or pi
-                           (let ([pi (make-print-info)])
-                             (send pss set-native pi make-print-info)
-                             pi)))])
-    (install-pss-to-print-info pss print-info)
-    (if (atomically
-         (let ([front (get-front)])
-           (begin0
-            (= (tell #:type _NSInteger (tell NSPageLayout pageLayout) runModalWithPrintInfo: print-info)
-               NSOkButton)
-            (when front
-              (tellv (send front get-cocoa-window) makeKeyAndOrderFront: #f)))))
-        (begin
-          (let ([o (tell #:type _int print-info orientation)])
-            (send pss set-orientation (if (= o NSLandscapeOrientation)
-                                          'landscape
-                                          'portrait)))
-          (let ([s (get-scaling-factor print-info)])
-            (send pss set-scaling s s))
-          #t)
-        #f)))
-
-(define printer-dc%
-  (class (record-dc-mixin (dc-mixin bitmap-dc-backend%))
-    (init [parent #f])
-
-    (super-make-object (make-object quartz-bitmap% 1 1))
-
-    (inherit get-recorded-command
-             reset-recording)
-
-    (define pages null)
-    (define/override (end-page)
-      (set! pages (cons (get-recorded-command) pages))
-      (reset-recording))
-
-    (define print-info (or (let-values ([(pi copier)
-                                         (send (current-ps-setup)
-                                               get-native-copy)])
-                             pi)
-                           (make-print-info)))
-      
-    (install-pss-to-print-info (current-ps-setup) print-info)
-
-    (define-values (page-width page-height page-scaling)
-      (let ([s (NSRect-size (tell #:type _NSRect print-info imageablePageBounds))]
-            [scaling (get-scaling-factor print-info)])
-        (values (NSSize-width s)
-                (NSSize-height s)
-                scaling)))
-
-    (define/override (get-size)
-      (values (/ page-width page-scaling) (/ page-height page-scaling)))
-
-    (define/override (get-device-scale)
-      (values page-scaling page-scaling))
-
-    (define current-page 0)
-
-    (define/public (get-page-count) (length pages))
-    (define/public (get-rect-for-page i)
-      (make-NSRect (make-NSPoint 0 (* (sub1 i) page-height))
-                   (make-NSSize page-width page-height)))
-    (define/public (start-page-at r)
-      (set! current-page (inexact->exact (round (/ (NSPoint-y (NSRect-origin r)) page-height)))))
-    (define/public (draw-print-page view-cocoa s)
-      (let ([f (tell #:type _NSRect view-cocoa frame)])
-        (tellv view-cocoa lockFocus)
-
-        (let ([cg (tell #:type _CGContextRef (tell NSGraphicsContext currentContext) graphicsPort)]
-              [s (tell #:type _NSSize print-info paperSize)]
-              [b (tell #:type _NSRect print-info imageablePageBounds)])
-          (CGContextTranslateCTM cg 0 (/ (NSSize-height s) page-scaling))
-          (CGContextScaleCTM cg 1 -1)
-          (CGContextTranslateCTM cg 
-                                 (/ (NSPoint-x (NSRect-origin b)) page-scaling)
-                                 (/ (- (NSSize-height s)
-                                       (+ (NSPoint-y (NSRect-origin b))
-                                          (NSSize-height (NSRect-size b))))
-                                    page-scaling))
-          (let* ([surface (cairo_quartz_surface_create_for_cg_context 
-                           cg 
-                           (inexact->exact (ceiling (/ page-width page-scaling)))
-                           (inexact->exact (ceiling (/ page-height page-scaling))))]
-                 [cr (cairo_create surface)])
-            (cairo_surface_destroy surface)
-            (let ([dc (make-object (dc-mixin
-                                    (class default-dc-backend%
-                                      (define/override (get-cr) cr)
-                                      (super-new))))])
-              (let ([proc (list-ref (reverse pages) current-page)])
-                (proc dc)))
-            (cairo_destroy cr)))
-
-        (tellv view-cocoa unlockFocus)))
-
-    (define/override (end-doc)
-      (promote-to-gui!)
-
-      (define view-cocoa (as-objc-allocation-with-retain
-                          (tell (tell PrinterView alloc) 
-                                initWithFrame: #:type _NSRect (make-NSRect
-                                                               (make-NSPoint 0 0)
-                                                               (make-NSSize 10 10)))))
-      (define op-cocoa (as-objc-allocation-with-retain
-                        (tell NSPrintOperation printOperationWithView: view-cocoa
-                              printInfo: print-info)))
-
-      (set-ivar! view-cocoa wxb (->wxb this))
-
-      (atomically
-       (let ([front (get-front)])
-         (tellv op-cocoa runOperation)
-         (when front
-           (tellv (send front get-cocoa-window) makeKeyAndOrderFront: #f)))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/procs.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/procs.rkt
deleted file mode 100644
index dc318f9789..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/procs.rkt
+++ /dev/null
@@ -1,226 +0,0 @@
-#lang racket/base
-(require "../../syntax.rkt"
-         racket/class
-         racket/draw
-         (only-in racket/draw/private/bitmap quartz-bitmap%)
-         ffi/unsafe
-         ffi/unsafe/objc
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt"
-         "frame.rkt"
-         "window.rkt"
-         "finfo.rkt" ; file-creator-and-type
-         "filedialog.rkt"
-         "colordialog.rkt"
-         "dc.rkt"
-         "printer-dc.rkt"
-         "menu-bar.rkt"
-         "cgl.rkt"
-         "sound.rkt"
-         "keycode.rkt"
-         "../../lock.rkt"
-         "../common/handlers.rkt"
-         (except-in "../common/default-procs.rkt"
-                    special-control-key
-                    special-option-key
-                    file-creator-and-type))
-
-
-(provide
- (protect-out
-  color-from-user-platform-mode
-  font-from-user-platform-mode
-  get-font-from-user
-  find-graphical-system-path
-  register-collecting-blit
-  unregister-collecting-blit
-  shortcut-visible-in-label?
-  get-double-click-time
-  get-control-font-face
-  get-control-font-size
-  get-control-font-size-in-pixels?
-  cancel-quit
-  display-origin
-  display-size
-  display-count
-  bell
-  hide-cursor
-  get-display-depth
-  is-color-display?
-  id-to-menu-item
-  can-show-print-setup?
-  get-highlight-background-color
-  get-highlight-text-color
-  check-for-break)
- display-bitmap-resolution
- make-screen-bitmap
- make-gl-bitmap
- show-print-setup
- get-color-from-user
- get-panel-background
- fill-private-color
- flush-display
- play-sound
- file-creator-and-type
- file-selector
- key-symbol-to-menu-key
- needs-grow-box-spacer?
- get-current-mouse-state)
-
-(import-class NSScreen NSCursor NSMenu NSEvent)
-
-(define (find-graphical-system-path what)
-  #f)
-
-(define (color-from-user-platform-mode) "Show Picker")
-
-(define-unimplemented get-font-from-user)
-(define (font-from-user-platform-mode) #f)
-
-(define (register-collecting-blit canvas x y w h on off on-x on-y off-x off-y)
-  (send canvas register-collecting-blit x y w h on off on-x on-y off-x off-y))
-(define (unregister-collecting-blit canvas)
-  (send canvas unregister-collecting-blits))
-(define (shortcut-visible-in-label? [x #f]) #f)
-
-(define (get-double-click-time)
-  500)
-(define (get-control-font-face)
-  ;; Using `(tell NSFont systemFontOfSize: ...)` gives us an OS-determined
-  ;; font, but my attempts to extract the name give something like ".LucidaGrandeUI"
-  ;; instead of "Lucida Grande"
-  (cond
-   [(version-10.10-or-later?) "Helvetica Neue"]
-   [else "Lucida Grande"]))
-(define (get-control-font-size) 13)
-(define (get-control-font-size-in-pixels?) #f)
-(define (cancel-quit) (void))
-
-(define (check-for-break) #f)
-
-(define (display-origin xb yb all? num fail)
-  (if (or all? (positive? num))
-      (unless (atomically
-               (with-autorelease
-                (let ([screens (tell NSScreen screens)])
-                  (if (num . < . (tell #:type _NSUInteger screens count))
-                      (let* ([screen (tell screens objectAtIndex: #:type _NSUInteger num)]
-                             [f (if (zero? num)
-                                    (tell #:type _NSRect screen visibleFrame)
-                                    (tell #:type _NSRect screen frame))])
-                        (set-box! xb ((if (and all? (zero? num)) + -) (->long (NSPoint-x (NSRect-origin f)))))
-                        (unless (zero? num)
-                          (let* ([screen0 (tell screens objectAtIndex: #:type _NSUInteger 0)]
-                                 [f0 (tell #:type _NSRect screen0 frame)])
-                            (set-box! yb (->long (- (+ (NSPoint-y (NSRect-origin f))
-                                                       (NSSize-height (NSRect-size f)))
-                                                    (NSSize-height (NSRect-size f0)))))))
-                        #t)
-                      #f))))
-        (fail))
-      (set-box! xb 0))
-  (when (zero? num)
-    (set-box! yb 0))
-  (set-box! yb (+ (unbox yb) (get-menu-bar-height))))
-
-(define (display-size xb yb all? num fail)
-  (unless (atomically
-           (with-autorelease
-            (let ([screens (tell NSScreen screens)])
-              (if (num . < . (tell #:type _NSUInteger screens count))
-                  (let* ([screen (tell screens objectAtIndex: #:type _NSUInteger num)]
-                         [f (if all?
-                                (tell #:type _NSRect screen frame)
-                                (tell #:type _NSRect screen visibleFrame))])
-                    (set-box! xb (->long (NSSize-width (NSRect-size f))))
-                    (set-box! yb (->long (- (NSSize-height (NSRect-size f))
-                                            (cond
-                                             [all? 0]
-                                             [(positive? num) 0]
-                                             [(tell #:type _BOOL NSMenu menuBarVisible) 0]
-                                             ;; Make result consistent when menu bar is hidden:
-                                             [else 
-                                              (get-menu-bar-height)]))))
-                    #t)
-                  #f))))
-    (fail)))
-
-
-(define (display-count)
-  (atomically
-   (with-autorelease
-    (let ([screens (tell NSScreen screens)])
-      (tell #:type _NSUInteger screens count)))))
-
-(define-appkit NSBeep (_fun -> _void))  
-(define (bell) (NSBeep))
-
-(define (hide-cursor) 
-  (tellv NSCursor setHiddenUntilMouseMoves: #:type _BOOL #t))
-
-(define (get-display-depth) 32)
-(define (is-color-display?) #t)
-(define (id-to-menu-item id) id)
-(define (can-show-print-setup?) #t)
-
-(define/top (make-gl-bitmap [exact-positive-integer? w]
-                            [exact-positive-integer? h]
-                            [gl-config% c])
-  (create-gl-bitmap w h c))
-
-;; ------------------------------------------------------------
-;; Text & highlight color
-
-(import-class NSColor)
-
-(define-cocoa NSDeviceRGBColorSpace _id)
-
-(define (get-highlight-background-color)
-  (let ([hi (as-objc-allocation-with-retain
-             (tell (tell NSColor selectedTextBackgroundColor) 
-                   colorUsingColorSpaceName: NSDeviceRGBColorSpace))]
-        [as-color (lambda (v)
-                    (inexact->exact (floor (* 255.0 v))))])
-    (begin0
-     (make-object color%
-                  (as-color
-                   (tell #:type _CGFloat hi redComponent))
-                  (as-color
-                   (tell #:type _CGFloat hi greenComponent))
-                  (as-color
-                   (tell #:type _CGFloat hi blueComponent)))
-     (release hi))))
-
-(define (get-highlight-text-color)
-  #f)
-
-(define (needs-grow-box-spacer?)
-  (not (version-10.7-or-later?)))
-
-;; ------------------------------------------------------------
-;; Mouse and modifier-key state
-
-(define (get-current-mouse-state)
-  (define posn (tell #:type _NSPoint NSEvent mouseLocation))
-  (define buttons (if (version-10.6-or-later?)
-                      (tell #:type _NSUInteger NSEvent pressedMouseButtons)
-                      0))
-  (define mods (tell #:type _NSUInteger NSEvent modifierFlags))
-  (define (maybe v mask sym)
-    (if (zero? (bitwise-and v mask))
-        null
-        (list sym)))
-  (define h (let ([f (tell #:type _NSRect (tell NSScreen mainScreen) frame)])
-              (NSSize-height (NSRect-size f))))
-  (values (make-object point% 
-                       (->long (NSPoint-x posn))
-                       (->long (- (- h (NSPoint-y posn)) (get-menu-bar-height))))
-          (append
-           (maybe buttons #x1 'left)
-           (maybe buttons #x2 'right)
-           (maybe mods NSShiftKeyMask 'shift)
-           (maybe mods NSCommandKeyMask 'meta)
-           (maybe mods NSAlternateKeyMask 'alt)
-           (maybe mods NSControlKeyMask 'control)
-           (maybe mods NSAlphaShiftKeyMask 'caps))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/queue.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/queue.rkt
deleted file mode 100644
index 796caa3c85..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/queue.rkt
+++ /dev/null
@@ -1,488 +0,0 @@
-#lang racket/base
-(require ffi/unsafe/objc
-         ffi/unsafe
-         racket/class
-         racket/draw/private/dc
-         "pool.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt"
-         "../common/queue.rkt"
-         "../common/handlers.rkt"
-         "../../lock.rkt"
-         "../common/freeze.rkt")
-
-(provide 
- (protect-out app
-              promote-to-gui!
-              cocoa-start-event-pump
-              cocoa-install-event-wakeup
-              set-eventspace-hook!
-              set-front-hook!
-              set-menu-bar-hooks!
-              set-fixup-window-locations!
-              post-dummy-event
-
-              try-to-sync-refresh
-              sync-cocoa-events
-              set-screen-changed-callback!)
-
- ;; from common/queue:
- current-eventspace
- queue-event
- yield)
-
-(import-class NSApplication NSAutoreleasePool NSColor NSProcessInfo NSArray)
-(import-protocol NSApplicationDelegate)
-
-;; Extreme hackery to hide original arguments from
-;; NSApplication, because NSApplication wants to turn 
-;; the arguments into `application:openFile:' calls.
-;; To hide the arguments, we replace the implementation
-;; of `arguments' in the NSProcessInfo object.
-(define (hack-argument-replacement self method)
-  (tell NSArray 
-        arrayWithObjects: #:type (_vector i _NSString) (vector (path->string (find-system-path 'exec-file)))
-        count: #:type _NSUInteger 1))
-(let ([m (class_getInstanceMethod NSProcessInfo (selector arguments))])
-  (void (method_setImplementation m hack-argument-replacement)))
-
-(define app (tell NSApplication sharedApplication))
-
-(define got-file? #f)
-
-(define-objc-class RacketApplicationDelegate NSObject #:protocols (NSApplicationDelegate)
-  []
-  [-a _NSUInteger (applicationShouldTerminate: [_id app])
-      (queue-quit-event)
-      0]
-  [-a _BOOL (openPreferences: [_id app])
-      (queue-prefs-event)
-      #t]
-  [-a _BOOL (validateMenuItem: [_id menuItem])
-      (cond 
-       [(ptr-equal? (selector openPreferences:) 
-                    (tell #:type _SEL menuItem action))
-        (not (eq? (application-pref-handler) nothing-application-pref-handler))]
-       [(ptr-equal? (selector openAbout:) 
-                    (tell #:type _SEL menuItem action))
-        #t]
-       [else
-        (super-tell #:type _BOOL validateMenuItem: menuItem)])]
-  [-a _BOOL (openAbout: [_id sender])
-      (if (eq? nothing-application-about-handler
-               (application-about-handler))
-          (tellv app orderFrontStandardAboutPanel: sender)
-          (queue-about-event))
-      #t]
-  [-a _BOOL (application: [_id theApplication] openFile: [_NSString filename])
-      (set! got-file? #t)
-      (queue-file-event (string->path filename))
-      (post-dummy-event)]
-  [-a _void (applicationDidFinishLaunching: [_id notification])
-      (unless got-file?
-        (queue-start-empty-event))]
-  [-a _BOOL (applicationShouldHandleReopen: [_id app] hasVisibleWindows: [_BOOL has-visible?])
-      ;; If we have any visible windows, return #t to do the default thing.
-      ;; Otherwise return #f, because we don't want any invisible windows resurrected.
-      has-visible?]
-  [-a _void (applicationDidChangeScreenParameters: notification)
-      ;; Screen changes sometimes make the event loop get stuck;
-      ;; hack: schedule a wake-up call in 5 seconds
-      (let ([priviledged-custodian ((get-ffi-obj 'scheme_make_custodian #f (_fun _pointer -> _scheme)) #f)])
-        (parameterize ([current-custodian priviledged-custodian])
-          (thread (lambda () (sleep 5.0)))))
-      ;; Also need to reset blit windows, since OS may move them incorrectly:
-      (fixup-window-locations)]
-  [-a _void (tryDockToFront: o)
-      (try-dock-to-front)]
-  [-a _void (retrySelfToFront: o)
-      (tellv app activateIgnoringOtherApps: #:type _BOOL #t)])
-
-(define fixup-window-locations void)
-(define (set-fixup-window-locations! f) (set! fixup-window-locations f))
-
-;; In case we were started in an executable without a bundle,
-;; explicitly register with the dock so the application can receive
-;; keyboard events.
-(define-cstruct _ProcessSerialNumber
-  ([highLongOfPSN _uint32]
-   [lowLongOfPSN _uint32]))
-(define kCurrentProcess 2)
-(define kProcessTransformToForegroundApplication 1)
-(define-appserv TransformProcessType (_fun _ProcessSerialNumber-pointer
-                                           _uint32
-                                           -> _OSStatus))
-(define NSApplicationActivationPolicyRegular 0)
-(define NSApplicationActivationPolicyAccessory 1)
-(unless (scheme_register_process_global "PLT_IS_FOREGROUND_APP" #f)
-  (cond
-   [(version-10.6-or-later?)
-    ;; When a frame or root menu bar is created, we promote to
-    ;; NSApplicationActivationPolicyRegular:
-    (tellv app setActivationPolicy: #:type _int NSApplicationActivationPolicyAccessory)]
-   [else
-    (let ([v (TransformProcessType (make-ProcessSerialNumber 0 kCurrentProcess)
-                                   kProcessTransformToForegroundApplication)])
-      (unless (zero? v)
-        (log-error (format "error from TransformProcessType: ~a" v))))]))
-
-(define app-delegate (tell (tell RacketApplicationDelegate alloc) init))
-(tellv app setDelegate: app-delegate)
-
-(define (bring-to-front)
-  (unless (scheme_register_process_global "Racket-GUI-no-front" #f)
-    (tellv app activateIgnoringOtherApps: #:type _BOOL #t)
-    ;; It may not be that easy...
-    (when (version-10.7-or-later?)
-      (with-autorelease
-          (import-class NSRunningApplication)
-        (unless (tell #:type _BOOL (tell NSRunningApplication currentApplication) ownsMenuBar)
-          ;; Looks like we haven't yet convinced the system to give us
-          ;; the menu bar. Perform a menu-bar dance that is based on
-          ;; http://stackoverflow.com/questions/7596643/when-calling-transformprocesstype-the-app-menu-doesnt-show-up
-          (tellv app-delegate performSelector: #:type _SEL (selector tryDockToFront:) 
-                 withObject: #f
-                 afterDelay: #:type _double 0.1))))))
-(define (promote-to-gui!)
-  (when (version-10.6-or-later?)
-    (tellv app setActivationPolicy: #:type _int NSApplicationActivationPolicyRegular))
-  (bring-to-front))
-
-(define (try-dock-to-front)
-  ;; Phase 2 of the 10.9 menu-bar dance started above:
-  (with-autorelease
-   (import-class NSRunningApplication)
-   (define docks (tell NSRunningApplication 
-                       runningApplicationsWithBundleIdentifier: #:type _NSString "com.apple.dock"))
-   (when (positive? (tell #:type _NSUInteger docks count))
-     (define dock (tell docks firstObject))
-     (define NSApplicationActivateIgnoringOtherApps 2)
-     (tell #:type _BOOL dock 
-           activateWithOptions: #:type _NSUInteger NSApplicationActivateIgnoringOtherApps)
-     (tellv app-delegate performSelector: #:type _SEL (selector retrySelfToFront:) 
-            withObject: #f 
-            afterDelay: #:type _double 0.1))))
-
-;; For some reason, nextEventMatchingMask:... gets stuck if the
-;;  display changes, and it doesn't even send the 
-;;  `applicationDidChangeScreenParameters:' callback. Unstick
-;;  it by posting a dummy event, since we fortunately can receive
-;;  a callback via CGDisplayRegisterReconfigurationCallback().
-;; This seems to unstick things enough that `applicationDidChangeScreenParameters:'
-;;  is called, but sometimes the event loop gets stuck after
-;;  that, so there's an additional hack above.
-(define-appserv CGDisplayRegisterReconfigurationCallback 
-  (_fun (_fun #:atomic? #t _uint32 _uint32 -> _void) _pointer -> _int32))
-(define (on-screen-changed display flags) 
-  (screen-changed-callback flags)
-  (post-dummy-event))
-(define screen-changed-callback void)
-(define (set-screen-changed-callback! c) (set! screen-changed-callback c))
-(let ([v (CGDisplayRegisterReconfigurationCallback on-screen-changed #f)])
-  (unless (zero? v)
-    (log-error (format "error from CGDisplayRegisterReconfigurationCallback: ~a" v))))
-
-(tellv app finishLaunching)
-
-(when (version-10.9-or-later?)
-  (define NSActivityIdleSystemSleepDisabled (arithmetic-shift 1 20))
-  (define NSActivityUserInitiated #x00FFFFFF)
-  (tellv
-   (tell (tell NSProcessInfo processInfo)
-         beginActivityWithOptions: #:type _uint64 (- NSActivityUserInitiated
-                                                     NSActivityIdleSystemSleepDisabled)
-         reason: #:type _NSString "Racket default")
-   retain))
-
-;; ------------------------------------------------------------
-;; Create an event to post when Racket has been sleeping but is
-;;  ready to wake up
-
-(import-class NSEvent)
-(define wake-evt
-  (tell NSEvent 
-        otherEventWithType: #:type _NSUInteger NSApplicationDefined
-        location: #:type _NSPoint (make-NSPoint 0.0 0.0)
-        modifierFlags: #:type _NSUInteger 0 
-        timestamp: #:type _double 0.0
-        windowNumber: #:type _NSUInteger 0
-        context: #:type _pointer #f
-        subtype: #:type _short 0
-        data1: #:type _NSInteger 0
-        data2: #:type _NSInteger 0))
-(retain wake-evt)
-(define (post-dummy-event)
-  (tell #:type _void app postEvent: wake-evt atStart: #:type _BOOL YES))
-
-;; This callback will be invoked by the CoreFoundation run loop
-;; when data is available on `ready_sock', which is used to indicate
-;; that Racket would like to wake up (and posting a Cocoa event
-;; causes the event-getting function to unblock).
-(define (socket_callback)
-  (read2 ready_sock read-buf 1)
-  (post-dummy-event))
-
-;; ------------------------------------------------------------
-;; Create a pipe's pair of file descriptors, used to communicate
-;; from the Racket-sleep thread to the CoreFoundation run loop.
-
-(define pipe2 (get-ffi-obj 'pipe #f (_fun _pointer -> _int)))
-(define write2 (get-ffi-obj 'write #f (_fun _int _pointer _long -> _long)))
-(define read2 (get-ffi-obj 'read #f (_fun _int _pointer _long -> _long)))
-(define read-buf (make-bytes 1))
-(define-values (ready_sock write_sock)
-  (let ([s (malloc 'raw 2 _int)])
-    (unless (zero? (pipe2 s))
-      (error "pipe didn't create fds"))
-    (let ([r (ptr-ref s _int 0)]
-          [w (ptr-ref s _int 1)])
-      (free s)
-      (values r w))))
-
-;; ------------------------------------------------------------
-;; Register the event-posting callback on `ready_sock' with
-;; the CoreFoundation run loop
-
-(define _CFIndex _uint)
-(define _CFStringRef _NSString)
-(define-cstruct _CFSocketContext ([version _CFIndex]
-                                  [info _pointer]
-                                  [retain (_fun _pointer -> _pointer)]
-                                  [release (_fun _pointer -> _void)]
-                                  [copyDescription (_fun _pointer -> _CFStringRef)]))
-(define (sock_retain v) #f)
-(define (sock_release v) (void))
-(define (sock_copy_desc v) "sock")
-(define sock-context (make-CFSocketContext 0 #f sock_retain sock_release sock_copy_desc))
-
-(define _CFRunLoopRef _pointer)
-(define _CFAllocatorRef _pointer)
-(define _CFSocketRef _pointer)
-(define _CFRunLoopSourceRef _pointer)
-(define _CFSocketNativeHandle _int)
-(define _CFOptionFlags _uint)
-(define _CFSocketCallBack (_fun -> _void))
-(define-cf CFAllocatorGetDefault (_fun -> _pointer))
-(define-cf CFSocketCreateWithNative (_fun _CFAllocatorRef
-                                          _CFSocketNativeHandle
-                                          _CFOptionFlags
-                                          _CFSocketCallBack
-                                          _CFSocketContext-pointer
-                                          -> _CFSocketRef))
-(define-cf CFSocketCreateRunLoopSource (_fun _CFAllocatorRef
-                                             _CFSocketRef
-                                             _CFIndex
-                                             -> _CFRunLoopSourceRef))
-(define-cf CFRunLoopAddSource (_fun _CFRunLoopRef
-                                    _CFRunLoopSourceRef
-                                    _CFStringRef
-                                    -> _void))
-(define-cf kCFRunLoopDefaultMode _CFStringRef)
-
-(define kCFSocketReadCallBack 1)
-
-(import-class NSRunLoop)
-(let* ([rl (tell #:type _CFRunLoopRef (tell NSRunLoop currentRunLoop) getCFRunLoop)]
-       [cfs (CFSocketCreateWithNative (CFAllocatorGetDefault) ready_sock kCFSocketReadCallBack
-                                      socket_callback sock-context)]
-       [source (CFSocketCreateRunLoopSource (CFAllocatorGetDefault) cfs 0)])
-  (CFRunLoopAddSource rl source kCFRunLoopDefaultMode))
-
-;; ------------------------------------------------------------
-;; Another hack:
-;; Install a run-loop observer that noticed when the core run loop
-;; is exited multiple times during a single wait for a Cocoa event.
-;; When that happens, it's a sign that something has gone wrong,
-;; and we should interrupt the event wait and try again. This happens
-;; when the user hides the application and then clicks on the dock
-;; icon. (But why does that happen?)
-
-(define _Boolean _BOOL)
-(define-cf kCFRunLoopCommonModes _pointer)
-(define-cf CFRunLoopObserverCreate (_fun _pointer ; CFAllocatorRef
-                                         _int ; CFOptionFlags
-                                         _Boolean ; repeats?
-                                         _CFIndex ; order
-                                         (_fun #:atomic? #t _pointer _int _pointer -> _void)
-                                         _pointer ; CFRunLoopObserverContext
-                                         -> _pointer))
-(define-cf CFRunLoopAddObserver (_fun _pointer _pointer _pointer -> _void))
-(define-cf CFRunLoopGetMain (_fun -> _pointer))
-(define kCFRunLoopExit (arithmetic-shift 1 7))
-(define-mz scheme_signal_received (_fun -> _void))
-(define already-exited? #f)
-(define sleeping? #f)
-(define (exiting-run-loop x y z)
-  (when sleeping?
-    (if already-exited?
-        (scheme_signal_received)
-        (set! already-exited? #t))))
-(let ([o (CFRunLoopObserverCreate #f kCFRunLoopExit #t 0 exiting-run-loop #f)])
-  (CFRunLoopAddObserver (CFRunLoopGetMain) o kCFRunLoopCommonModes))
-
-;; ------------------------------------------------------------
-;; Cocoa event pump
-
-(define-cocoa NSDefaultRunLoopMode _id) ; more specifically an _NSString, but we don't need a conversion
-
-(import-class NSDate)
-(define distantFuture (tell NSDate distantFuture))
-
-(define eventspace-hook (lambda (e v) #f))
-(define (set-eventspace-hook! proc) (set! eventspace-hook proc))
-
-(define front-hook (lambda () (values #f #f)))
-(define (set-front-hook! proc) (set! front-hook proc))
-
-(define in-menu-bar-range? (lambda (p) #f))
-(define (set-menu-bar-hooks! r?) 
-  (set! in-menu-bar-range? r?))
-
-(define events-suspended? #f)
-(define was-menu-bar #f)
-
-(define avoid-mouse-key-until #f)
-
-(define (check-menu-bar-click evt)
-  (if (and evt 
-           (= 14 (tell #:type _NSUInteger evt type))
-           (= 7 (tell #:type _short evt subtype))
-           (not (tell evt window))
-           (in-menu-bar-range? (tell #:type _NSPoint evt locationInWindow)))
-      ;; Mouse down in the menu bar:
-      (let-values ([(f e) (front-hook)])
-        (when e
-          ;; Avoid spiral of on-demand calls:
-          (unless (and was-menu-bar
-                       (eq? e (weak-box-value was-menu-bar)))
-            ;; Don't handle further events until we've made an effort
-            ;; at on-demand notifications.
-            (set! was-menu-bar (make-weak-box e))
-            (set! events-suspended? #t)
-            (let* ([c (make-custodian)]
-                   [t (parameterize ([current-custodian c])
-                        (thread (lambda ()
-                                  (sleep 2)
-                                  ;; on-demand took too long, so wait
-                                  ;; until the application can catch up
-                                  (set! events-suspended? #f))))])
-              (queue-event e (lambda ()
-                               (send f on-menu-click)
-                               (set! events-suspended? #f)
-                               (custodian-shutdown-all c)))))))
-      (set! was-menu-bar #f)))
-
-(define NSAnyEventMask (sub1 (arithmetic-shift 1 (* 8 (ctype-sizeof _NSUInteger)))))
-
-;; Call this function only in atomic mode:
-(define (check-one-event wait? dequeue?)
-  (pre-event-sync wait?)
-  (clean-up-deleted)
-  (let ([pool (tell (tell NSAutoreleasePool alloc) init)])
-    (when (and events-suspended? wait?)
-      (set! was-menu-bar #f)
-      (set! events-suspended? #f))
-    (when (and avoid-mouse-key-until
-               ((current-inexact-milliseconds) . > . avoid-mouse-key-until))
-      (set! avoid-mouse-key-until #f))
-    (begin0
-     (let ([evt (if events-suspended?
-                    #f
-                    (tell app nextEventMatchingMask: #:type _NSUInteger (if (and (not wait?)
-                                                                                 avoid-mouse-key-until)
-                                                                            (- NSAnyEventMask
-                                                                               MouseAndKeyEventMask)
-                                                                            NSAnyEventMask)
-                          untilDate: (if wait? distantFuture #f)
-                          inMode: NSDefaultRunLoopMode
-                          dequeue: #:type _BOOL dequeue?))])
-       (when evt (check-menu-bar-click evt))
-       (and evt
-            (or (not dequeue?)
-                (let ([e (eventspace-hook evt (tell evt window))])
-                  (if e
-                      (let ([mouse-or-key?
-                             (bitwise-bit-set? MouseAndKeyEventMask
-                                               (tell #:type _NSInteger evt type))])
-                        ;; If it's a mouse or key event, delay further
-                        ;;  dequeue of mouse and key events until this
-                        ;;  one can be handled.
-                        (when mouse-or-key?
-                          (set! avoid-mouse-key-until
-                                (+ (current-inexact-milliseconds) 200.0)))
-                        (retain evt)
-                        (queue-event e (lambda () 
-                                         (call-as-nonatomic-retry-point
-                                          (lambda ()
-                                            ;; in atomic mode
-                                            (with-autorelease
-                                             (tellv app sendEvent: evt)
-                                             (release evt))))
-                                         (when mouse-or-key?
-                                           (set! avoid-mouse-key-until #f)))))
-                      (tellv app sendEvent: evt)))
-                #t)))
-     (tellv pool release))))
-
-;; Call this function only in atomic mode:
-(define (dispatch-all-ready)
-  (when (check-one-event #f #t)
-    (dispatch-all-ready)))
-
-(define (cocoa-start-event-pump)
-  (thread (lambda ()
-            (let loop ()
-              ;; Wait 50 msecs between event polling, unless nothing
-              ;; else is going on:
-              (sync/timeout 0.05 (system-idle-evt))
-              ;; Wait until event is ready --- but waiting is implemented
-              ;; by polling:
-              (sync queue-evt)
-              ;; Something is ready, so dispatch:
-              (atomically (dispatch-all-ready))
-              ;; Periodically free everything in the default allocation pool:
-              (queue-autorelease-flush)
-              (loop)))))
-
-(set-check-queue!
- ;; Called through an atomic callback:
- (lambda () (check-one-event #f #f)))
-
-(define (try-to-sync-refresh)
-  ;; atomically => outside of the event loop
-  (atomically
-   (pre-event-sync #t)))
-
-(set-platform-queue-sync!
- (lambda ()
-   ;; in atomic mode
-   (dispatch-all-ready)))
-
-(define (sync-cocoa-events)
-  (atomically
-   (dispatch-all-ready)))
-
-;; ------------------------------------------------------------
-;; Install an alternate "sleep" function (in the Racket core)
-;; that wakes up if any Cocoa event is ready.
-  
-(define-mz scheme_start_sleeper_thread (_fun _fpointer _float _pointer _int -> _void))
-(define-mz scheme_end_sleeper_thread (_fun -> _void))
-
-(define-mz scheme_sleep _pointer)
-(define-mz scheme_set_place_sleep (_fun _pointer -> _void))
-
-;; Called through an atomic callback:
-(define (sleep-until-event secs fds)
-  (set! sleeping? #t)
-  (set! already-exited? #f)
-  (scheme_start_sleeper_thread scheme_sleep secs fds write_sock)
-  (check-one-event #t #f) ; blocks until an event is ready
-  (scheme_end_sleeper_thread)
-  (set! sleeping? #f))
-
-(define (cocoa-install-event-wakeup)
-  (post-dummy-event) ; why do we need this? 'nextEventMatchingMask:' seems to hang if we don't use it
-  (scheme_set_place_sleep (function-ptr sleep-until-event 
-                                        (_fun #:atomic? #t _float _gcpointer -> _void))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/radio-box.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/radio-box.rkt
deleted file mode 100644
index e3c5068bee..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/radio-box.rkt
+++ /dev/null
@@ -1,159 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-          "../../syntax.rkt"
-         "item.rkt"
-         "button.rkt"
-         "types.rkt"
-         "const.rkt"
-         "utils.rkt"
-         "window.rkt"
-         "../common/event.rkt"
-         "image.rkt")
-
-(provide 
- (protect-out radio-box%))
-
-;; ----------------------------------------
-
-(import-class NSMatrix NSButtonCell)
-
-(define NSRadioModeMatrix 0)
-(define NSListModeMatrix 2)
-
-(define-objc-class RacketMatrix NSMatrix
-  #:mixins (FocusResponder KeyMouseResponder CursorDisplayer)
-  [wxb]
-  (-a _void (clicked: [_id sender])
-      ;; In case we were in 0-item mode, switch to Radio mode to
-      ;; ensure that only one button is selected:
-      (tellv self setAllowsEmptySelection: #:type _BOOL #f)
-      (queue-window*-event wxb (lambda (wx) (send wx clicked)))))
-
-(define-objc-class RacketImageButtonCell NSButtonCell
-  [img]
-  [-a _NSSize (cellSize)
-      (let ([s (super-tell #:type _NSSize cellSize)])
-        (if img
-            (let ([s2 (tell #:type _NSSize img size)])
-              (make-NSSize (+ (NSSize-width s) (NSSize-width s2))
-                           (max (NSSize-height s) (NSSize-height s2))))
-            s))]
-  [-a _void (drawInteriorWithFrame: [_NSRect f] inView: [_id view])
-      (super-tell #:type _void drawInteriorWithFrame: #:type _NSRect f inView: view)
-      (when img
-        (let ([size (tell #:type _NSSize img size)])
-          (tellv img 
-                 drawInRect: #:type _NSRect (make-NSRect
-                                             (make-NSPoint 
-                                              (+ (NSPoint-x (NSRect-origin f))
-                                                 (- (NSSize-width (NSRect-size f))
-                                                    (NSSize-width size)))
-                                              (+ (NSPoint-y (NSRect-origin f))
-                                                 (quotient (- (NSSize-height (NSRect-size f))
-                                                              (NSSize-height size))
-                                                           2)))
-                                             size)
-                 fromRect: #:type _NSRect (make-NSRect (make-NSPoint 0 0) size)
-                 operation: #:type _int 1
-                 fraction: #:type _CGFloat 1.0)))])
-
-(defclass radio-box% item%
-  (init parent cb label
-        x y w h
-        labels
-        val
-        style
-        font)
-  (inherit get-cocoa set-focus init-font register-as-child)
-
-  (define horiz? (and (memq 'horizontal style) #t))
-
-  (super-new [parent parent]
-             [cocoa
-              (let ([cocoa
-                     (as-objc-allocation
-                      (tell (tell RacketMatrix alloc) 
-                            initWithFrame: #:type _NSRect (make-NSRect (make-init-point x y)
-                                                                       (make-NSSize w h))
-                            mode: #:type _int NSRadioModeMatrix
-                            cellClass: (if (andmap string? labels)
-                                           NSButtonCell
-                                           RacketImageButtonCell)
-                            numberOfRows: #:type _NSInteger (if horiz? 1 (length labels))
-                            numberOfColumns: #:type _NSInteger (if horiz? (length labels) 1)))])
-                (tellv cocoa setIntercellSpacing: #:type _NSSize (make-NSSize 2 2))
-                (for ([label (in-list labels)]
-                      [i (in-naturals)])
-                  (let ([button (tell cocoa 
-                                      cellAtRow: #:type _NSInteger (if horiz? 0 i)
-                                      column: #:type _NSInteger (if horiz? i 0))])
-                    (if (not (string? label))
-                        (begin
-                          (tellv button setTitle: #:type _NSString "")
-                          (set-ivar! button img (bitmap->image label)))
-                        (begin
-                          (init-font button font)
-                          (tellv button setTitle: #:type _NSString (if (string? label)
-                                                                       (strip-mnemonic label)
-                                                                       "<bad>"))))
-                    (tellv button setButtonType: #:type _int NSRadioButton)))
-                (tellv cocoa sizeToFit)
-                (tellv cocoa setTarget: cocoa)
-                (tellv cocoa setAction: #:type _SEL (selector clicked:))
-                cocoa)]
-             [callback cb]
-             [no-show? (memq 'deleted style)])
-
-  (define count (length labels))
-
-  (define callback cb)
-  (define/public (clicked)
-    (callback this (new control-event%
-                        [event-type 'radio-box]
-                        [time-stamp (current-milliseconds)])))
-
-  (define/public (button-focus i)
-    (if (= i -1)
-        (if horiz?
-            (tell #:type _NSInteger (get-cocoa) selectedColumn)
-            (tell #:type _NSInteger (get-cocoa) selectedRow))
-        (let ([which (get-selection)])
-          (set-focus)
-          (tellv (get-cocoa) 
-                 selectCellAtRow: #:type _NSInteger (if horiz? 0 i) 
-                 column: #:type _NSInteger (if horiz? i 0))
-          (unless (equal? which (get-selection))
-            (queue-window-event this (lambda () (clicked)))))))
-
-  (define/private (get-button i)
-    (tell (get-cocoa)
-          cellAtRow: #:type _NSUInteger (if horiz? 0 i)
-          column: #:type _NSUInteger (if horiz? i 0)))
-
-  (define/public (enable-button i on?)
-    (tellv (get-button i) setEnabled: #:type _BOOL on?))
-
-  (define/public (set-selection i)
-    (if (= i -1)
-        (begin
-          (tellv (get-cocoa) setAllowsEmptySelection: #:type _BOOL #t)
-          (tellv (get-cocoa) deselectAllCells))
-        (begin
-          (tellv (get-cocoa) selectCellAtRow: #:type _NSInteger (if horiz? 0 i)
-                 column: #:type _NSInteger (if horiz? i 0))
-          (tellv (get-cocoa) setAllowsEmptySelection: #:type _BOOL #f))))
-  (define/public (get-selection)
-    (let ([c (tell (get-cocoa) selectedCell)]
-          [pos (if horiz?
-                   (tell #:type _NSInteger (get-cocoa) selectedColumn)
-                   (tell #:type _NSInteger (get-cocoa) selectedRow))])
-      (if (and c
-               (positive? (tell #:type _NSInteger c state)))
-          pos
-          -1)))
-  (define/public (number) count)
-
-  (define/override (maybe-register-as-child parent on?)
-    (register-as-child parent on?)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/slider.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/slider.rkt
deleted file mode 100644
index ac07d28bf8..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/slider.rkt
+++ /dev/null
@@ -1,177 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-          "../../syntax.rkt"
-         "item.rkt"
-         "types.rkt"
-         "const.rkt"
-         "utils.rkt"
-         "window.rkt"
-         "queue.rkt"
-         "../common/event.rkt"
-         "../common/queue.rkt"
-         "../common/freeze.rkt"
-         "../../lock.rkt")
-
-(provide 
- (protect-out slider%))
-
-;; ----------------------------------------
-
-(import-class NSSlider NSTextField NSView)
-
-(define-objc-class RacketSlider NSSlider
-  #:mixins (FocusResponder KeyMouseResponder CursorDisplayer)
-  [wxb]
-  (-a _void (changed: [_id sender])
-      (let ([wx (->wx wxb)])
-        (when wx
-          (send wx update-message)
-          (queue-window-event wx (lambda () (send wx changed)))
-          (constrained-reply
-           (send wx get-eventspace)
-           (lambda () (let loop () (pre-event-sync #t) (when (yield/no-sync) (loop))))
-           (void))))))
-
-(defclass slider% item%
-  (init parent cb
-        label
-        val lo hi
-        x y w
-        style
-        font)
-  (inherit get-cocoa register-as-child
-           init-font)
-
-  (define vert? (memq 'vertical style))
-
-  (define slider-lo lo)
-  (define slider-hi hi)
-
-  (define slider-cocoa
-    (let ([cocoa (as-objc-allocation
-                  (tell (tell RacketSlider alloc) init))])
-      (tellv cocoa setMinValue: #:type _double* lo)
-      (tellv cocoa setMaxValue: #:type _double* hi)
-      (tellv cocoa setDoubleValue: #:type _double* (flip val))
-      ;; heuristic: show up to tick marks:
-      (when ((- hi lo) . < . 64)
-        (tellv cocoa setNumberOfTickMarks: #:type _NSUInteger (add1 (- hi lo)))
-        (tellv cocoa setAllowsTickMarkValuesOnly: #:type _BOOL #t))
-      (tellv cocoa setFrame: #:type _NSRect (make-NSRect 
-                                             (make-NSPoint 0 0)
-                                             (make-NSSize (if vert? 24 32)
-                                                          (if vert? 64 24))))
-      (tellv cocoa setContinuous: #:type _BOOL #t)
-      ;; (tellv cocoa sizeToFit)
-      cocoa))
-
-  (define-values (message-cocoa message-w message-h)
-    (if (memq 'plain style)
-        (values #f #f #f)
-        (let ([cocoa (as-objc-allocation
-                      (tell (tell NSTextField alloc) init))])
-          (init-font cocoa font)
-          (tellv cocoa setSelectable: #:type _BOOL #f)
-          (tellv cocoa setEditable: #:type _BOOL #f)
-          (tellv cocoa setBordered: #:type _BOOL #f)
-          (tellv cocoa setDrawsBackground: #:type _BOOL #f)
-          (tellv cocoa setStringValue: #:type _NSString (format "~a" hi))
-          (tellv cocoa sizeToFit)
-          (let ([r1 (tell #:type _NSRect cocoa frame)])
-            (tellv cocoa setStringValue: #:type _NSString (format "~a" lo))
-            (tellv cocoa sizeToFit)
-            (let ([r2 (tell #:type _NSRect cocoa frame)])
-              (tellv cocoa setStringValue: #:type _NSString (format "~a" val))
-              (values cocoa
-                      (max (NSSize-width (NSRect-size r1))
-                           (NSSize-width (NSRect-size r2)))
-                      (max (NSSize-height (NSRect-size r1))
-                           (NSSize-height (NSRect-size r2)))))))))
-
-  (define cocoa
-    (if message-cocoa
-        (let* ([f (tell #:type _NSRect slider-cocoa frame)]
-               [w (+ (if vert?
-                         message-w
-                         0)
-                     (NSSize-width (NSRect-size f)))]
-               [h (+ (if vert?
-                         0
-                         message-h)
-                     (NSSize-height (NSRect-size f)))])
-          (let ([cocoa (as-objc-allocation
-                        (tell (tell NSView alloc)
-                              initWithFrame: #:type _NSRect (make-NSRect 
-                                                             (make-init-point x y)
-                                                             (make-NSSize w h))))])
-            (tellv cocoa addSubview: slider-cocoa)
-            (tellv cocoa addSubview: message-cocoa)
-            (arrange-parts w h)
-            cocoa))
-        slider-cocoa))
-
-  (define/private (arrange-parts w h)
-    (tellv slider-cocoa setFrame: #:type _NSRect (make-NSRect
-                                                  (make-NSPoint 0
-                                                                (if vert? 0 message-h))
-                                                  (make-NSSize (- w (if vert? message-w 0))
-                                                               (- h (if vert? 0 message-h)))))
-    (tellv message-cocoa setFrame: #:type _NSRect (make-NSRect
-                                                   (make-NSPoint (if vert? 
-                                                                     (- w message-w)
-                                                                     (/ (- w message-w) 2))
-                                                                 (if vert?
-                                                                     (/ (- h message-h) 2)
-                                                                     0))
-                                                   (make-NSSize message-w message-h))))
-
-  (define/override (set-size x y w h)
-    (super set-size x y w h)
-    (when message-cocoa
-      (arrange-parts w h)))
-  
-  (when message-cocoa
-    (set-ivar! slider-cocoa wxb (->wxb this)))
-
-  (super-new [parent parent]
-             [cocoa cocoa]
-             [callback cb]
-             [no-show? (memq 'deleted style)])
-
-  (define/override (get-cocoa-control) slider-cocoa)
-
-  (tellv slider-cocoa setTarget: slider-cocoa)
-  (tellv slider-cocoa setAction: #:type _SEL (selector changed:))
-
-  (define callback cb)
-  (define/public (changed)
-    (callback this (new control-event%
-                        [event-type 'slider]
-                        [time-stamp (current-milliseconds)])))
-
-  (define/private (flip v)
-    (if vert?
-        (+ slider-lo (- slider-hi v))
-        v))
-
-  (define/public (set-value v)
-    (atomically
-     (tellv slider-cocoa setDoubleValue: #:type _double* (flip v))
-     (update-message v)))
-  (define/public (get-value)
-    (flip (inexact->exact (floor (tell #:type _double slider-cocoa doubleValue)))))
-
-  (define/public (update-message [val (get-value)])
-    (tellv message-cocoa setStringValue: #:type _NSString (format "~a" val)))
-
-  (inherit get-cocoa-window)
-  (define/override (post-mouse-down)
-    ;; For some reason, dragging a slider disabled mouse-moved
-    ;;  events for the window, so turn them back on:
-    (tellv (get-cocoa-window) setAcceptsMouseMovedEvents: #:type _BOOL #t))
-
-  (define/override (maybe-register-as-child parent on?)
-    (register-as-child parent on?)))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/sound.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/sound.rkt
deleted file mode 100644
index 0f55683325..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/sound.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/objc
-         "utils.rkt"
-         "types.rkt")
-
-(provide 
- (protect-out play-sound))
-
-(import-class NSSound)
-
-(define-objc-class RacketSound NSSound
-  [result
-   sema]
-  [-a _void (sound: [_id sound] didFinishPlaying: [_BOOL ok?])
-      (set! result ok?)
-      (semaphore-post sema)
-      (tellv self release)])
-
-(define (play-sound path async?)
-  (let ([s (as-objc-allocation
-            (tell (tell RacketSound alloc)
-                  initWithContentsOfFile: #:type _NSString (path->string 
-                                                            (path->complete-path path))
-                  byReference: #:type _BOOL #t))]
-        [sema (make-semaphore)])
-    (tellv s setDelegate: s)
-    (set-ivar! s sema sema)
-
-    ; use the `retain' method instead of the `retain' function, because we
-    ; don't want a finalization-triggered release:
-    (tellv s retain)
-    
-    (and (tell #:type _BOOL s play)
-         (if async?
-             #t
-             (begin
-               (semaphore-wait sema)
-               (get-ivar s result))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/tab-panel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/tab-panel.rkt
deleted file mode 100644
index 7dbb8633df..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/tab-panel.rkt
+++ /dev/null
@@ -1,225 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/objc
-         racket/runtime-path
-         "../../syntax.rkt"
-         "types.rkt"
-         "utils.rkt"
-         "window.rkt"
-         "panel.rkt"
-         "queue.rkt"
-         "../common/event.rkt"
-         "../common/procs.rkt"
-         "../../lock.rkt"
-         (for-syntax racket/base))
-
-(provide 
- (protect-out tab-panel%))
-
-(define-runtime-path psm-tab-bar-dir
-  '(so "PSMTabBarControl.framework"))
-
-;; Load PSMTabBarControl:
-(void (ffi-lib (build-path psm-tab-bar-dir "PSMTabBarControl")))
-(define NSNoTabsNoBorder 6)
-
-(define NSDefaultControlTint 0)
-(define NSClearControlTint 7)
-
-(import-class NSView NSTabView NSTabViewItem PSMTabBarControl)
-(import-protocol NSTabViewDelegate)
-
-(define NSOrderedAscending -1)
-(define NSOrderedSame 0)
-(define NSOrderedDescending 1)
-(define (order-content-first a b data)
-  (cond
-   [(ptr-equal? a data) NSOrderedDescending]
-   [(ptr-equal? b data) NSOrderedAscending]
-   [else NSOrderedSame]))
-(define order_content_first (function-ptr order-content-first
-                                          (_fun #:atomic? #t _id _id _id -> _int)))
-
-(define-objc-class RacketTabView NSTabView
-  #:mixins (FocusResponder KeyMouseResponder CursorDisplayer)
-  [wxb]
-  (-a _void (tabView: [_id cocoa] didSelectTabViewItem: [_id item-cocoa])
-      (let ([wx (->wx wxb)])
-        (when (and wx (send wx callbacks-enabled?))
-          (queue-window*-event wxb (lambda (wx) (send wx do-callback)))))))
-
-(define-objc-class RacketPSMTabBarControl PSMTabBarControl
-  #:mixins (FocusResponder KeyMouseResponder CursorDisplayer)
-  [wxb]
-  (-a _void (tabView: [_id cocoa] didSelectTabViewItem: [_id item-cocoa])
-      (super-tell #:type _void tabView: cocoa didSelectTabViewItem: item-cocoa)
-      (queue-window*-event wxb (lambda (wx) (send wx do-callback)))))
-
-(defclass tab-panel% (panel-mixin window%)
-  (init parent
-        x y w h
-        style
-        labels)
-  (inherit get-cocoa register-as-child
-           is-window-enabled?
-           block-mouse-events)
-
-  (define tabv-cocoa (as-objc-allocation
-                      (tell (tell RacketTabView alloc) init)))
-  (define cocoa (if (not (memq 'border style))
-                    (as-objc-allocation
-                     (tell (tell NSView alloc) init))
-                    tabv-cocoa))
-
-  (define control-cocoa
-    (and (not (memq 'border style))
-         (let ([i (as-objc-allocation
-                   (tell (tell RacketPSMTabBarControl alloc)
-                         initWithFrame: #:type _NSRect (make-NSRect (make-NSPoint 0 0)
-                                                                    (make-NSSize 200 22))))])
-           (tellv cocoa addSubview: i)
-           (tellv cocoa addSubview: tabv-cocoa)
-           (tellv tabv-cocoa setDelegate: i)
-           (tellv tabv-cocoa setTabViewType: #:type _int NSNoTabsNoBorder)
-           (tellv i setTabView: tabv-cocoa)
-           (tellv i setStyleNamed: #:type _NSString "Aqua")
-           ;;(tellv i setSizeCellsToFit: #:type _BOOL #t)
-           (tellv i setDisableTabClose: #:type _BOOL #t)
-           i)))
-
-  (define item-cocoas
-    (for/list ([lbl (in-list labels)])
-      (let ([item (as-objc-allocation
-                   (tell (tell NSTabViewItem alloc) initWithIdentifier: #f))])
-        (tellv item setLabel: #:type _NSString (label->plain-label lbl))
-        (tellv tabv-cocoa addTabViewItem: item)
-        item)))
-  (if control-cocoa
-      (tellv cocoa setFrame: #:type _NSRect (make-NSRect (make-init-point x y) 
-                                                         (make-NSSize 50 22)))
-      (let ([sz (tell #:type _NSSize tabv-cocoa minimumSize)])
-        (tellv tabv-cocoa setFrame: #:type _NSRect (make-NSRect (make-init-point x y) sz))
-        (tellv tabv-cocoa setDelegate: tabv-cocoa)))
-  
-  (define content-cocoa 
-    (as-objc-allocation
-     (tell (tell NSView alloc)
-           initWithFrame: #:type _NSRect (tell #:type _NSRect tabv-cocoa contentRect))))
-  (tellv tabv-cocoa addSubview: content-cocoa)
-
-  (define/override (get-cocoa-content) content-cocoa)
-  (define/override (get-cocoa-cursor-content) tabv-cocoa)
-  (define/override (set-size x y w h)
-    (super set-size x y w h)
-    (when control-cocoa
-      (let ([r (tell #:type _NSRect cocoa frame)])
-        (tellv control-cocoa setFrame: #:type _NSRect (make-NSRect (make-NSPoint
-                                                                    0
-                                                                    (- (NSSize-height (NSRect-size r)) 22))
-                                                                   (make-NSSize
-                                                                    (NSSize-width (NSRect-size r))
-                                                                    22)))
-        (tellv tabv-cocoa setFrame: #:type _NSRect (make-NSRect (make-NSPoint 0 0)
-                                                                (make-NSSize
-                                                                 (NSSize-width (NSRect-size r))
-                                                                 (- (NSSize-height (NSRect-size r)) 22))))))
-    (tellv content-cocoa setFrame: #:type _NSRect (tell #:type _NSRect tabv-cocoa contentRect)))
-
-  (define/public (set-label i str)
-    (tellv (list-ref item-cocoas i) setLabel: #:type _NSString (label->plain-label str)))
-
-  (define callbacks-ok? #t)
-  (define/public (callbacks-enabled?) callbacks-ok?)
-  
-  (define/private (direct-set-selection i)
-    (tellv tabv-cocoa selectTabViewItem: (list-ref item-cocoas i)))
-  (define/public (set-selection i)
-    (atomically
-     (set! callbacks-ok? #f)
-     (direct-set-selection i)
-     (set! callbacks-ok? #t)))
-  (define/public (get-selection)
-    (item->index (tell tabv-cocoa selectedTabViewItem)))
-
-  (define (item->index tv)
-    (for/or ([c (in-list item-cocoas)]
-             [i (in-naturals)])
-      (and (ptr-equal? c tv) i)))
-
-  (public [append* append])
-  (define (append* lbl)
-    (atomically
-     (set! callbacks-ok? #f)
-     (do-append lbl)
-     (set! callbacks-ok? #t)))
-
-  (define (do-append lbl)
-    (let ([item (as-objc-allocation
-                 (tell (tell NSTabViewItem alloc) initWithIdentifier: #f))])
-      (tellv item setLabel: #:type _NSString (label->plain-label lbl))
-      (tellv tabv-cocoa addTabViewItem: item)
-      (set! item-cocoas (append item-cocoas (list item)))
-      ;; Sometimes the sub-view for the tab buttons gets put in front
-      ;; of the content view, so fix the order:
-      (tellv tabv-cocoa sortSubviewsUsingFunction: #:type _fpointer order_content_first
-             context: #:type _pointer content-cocoa)))
-
-  (define/public (delete i)
-    (atomically
-     (set! callbacks-ok? #f)
-     (let ([item-cocoa (list-ref item-cocoas i)])
-       (tellv tabv-cocoa removeTabViewItem: item-cocoa)
-       (set! item-cocoas (remq item-cocoa item-cocoas)))
-     (set! callbacks-ok? #t)))
-
-  (define/public (set choices)
-    (atomically
-     (set! callbacks-ok? #f)
-     (for ([item-cocoa (in-list item-cocoas)])
-       (tellv tabv-cocoa removeTabViewItem: item-cocoa))
-     (set! item-cocoas null)
-     (for ([lbl (in-list choices)])
-       (do-append lbl))
-     (set! callbacks-ok? #t)))
-
-  (define callback void)
-  (define/public (set-callback cb) (set! callback cb))
-  (define/public (do-callback)
-    (callback this (new control-event%
-                        [event-type 'tab-panel]
-                        [time-stamp (current-milliseconds)])))
-
-  (super-new [parent parent]
-             [cocoa cocoa]
-             [no-show? (memq 'deleted style)])
-  
-  (when control-cocoa
-    (set-ivar! control-cocoa wxb (->wxb this)))
-
-  (define/override (enable-window on?)
-    (super enable-window on?)
-    (let ([on? (and on? (is-window-enabled?))])
-      (block-mouse-events (not on?))
-      (tellv tabv-cocoa setControlTint: #:type _int
-             (if on? NSDefaultControlTint NSClearControlTint))
-      (when control-cocoa
-        (tellv control-cocoa setEnabled: #:type _BOOL on?))))
-
-  (define/override (gets-focus?)
-    (and (not control-cocoa)
-         (tell #:type _BOOL tabv-cocoa canBecomeKeyView)))
-  (define/override (get-cocoa-focus)
-    (if control-cocoa
-        content-cocoa
-        tabv-cocoa))
-
-  (define/public (number) (length item-cocoas))
-  (define/public (button-focus n)
-    (if (= n -1)
-        (get-selection)
-        (direct-set-selection n)))
-
-  (define/override (maybe-register-as-child parent on?)
-    (register-as-child parent on?)))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/types.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/types.rkt
deleted file mode 100644
index 2679f30a30..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/types.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-(require ffi/unsafe/objc
-         ffi/unsafe
-         ffi/unsafe/nsstring
-         "../../lock.rkt"
-         "utils.rkt")
-
-(provide 
- (protect-out _NSInteger _NSUInteger _OSStatus
-              _CGFloat
-              _NSPoint _NSPoint-pointer (struct-out NSPoint)
-              _NSSize _NSSize-pointer (struct-out NSSize)
-              _NSRect _NSRect-pointer (struct-out NSRect)
-              _NSRange _NSRange-pointer (struct-out NSRange)
-              NSObject
-              NSNotFound)
- _NSString)
-
-(define _NSInteger _long)
-(define _NSUInteger _ulong)
-
-(define _OSStatus _sint32)
-
-(define 64-bit? (= (ctype-sizeof _long) 8))
-
-(define _CGFloat (make-ctype (if 64-bit? _double _float)
-                             (lambda (v) (if (and (number? v)
-                                                  (exact? v))
-                                             (exact->inexact v)
-                                             v))
-                             #f))
-
-(define-cstruct _NSPoint ([x _CGFloat]
-                          [y _CGFloat]))
-(define-cstruct _NSSize ([width _CGFloat]
-                         [height _CGFloat]))
-
-(define-cstruct _NSRect ([origin _NSPoint][size _NSSize]))
-
-(define-cstruct _NSRange ([location _NSUInteger]
-                          [length _NSUInteger]))
-
-(import-class NSObject NSString)
-
-(define NSNotFound (if 64-bit?
-                       #x7fffffffffffffff
-                       #x7fffffff))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/utils.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/utils.rkt
deleted file mode 100644
index 044951da7e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/utils.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang racket/base
-(require ffi/unsafe/objc
-         ffi/unsafe
-         ffi/unsafe/alloc
-         ffi/unsafe/define
-         ffi/unsafe/nsalloc
-         "../common/utils.rkt"
-         "../../lock.rkt")
-
-(provide 
- (protect-out cocoa-lib
-              cf-lib
-              define-cocoa
-              define-cf
-              define-appserv
-              define-appkit
-              as-objc-allocation
-              as-objc-allocation-with-retain
-              clean-up-deleted
-              retain release
-              clean-menu-label
-              ->wxb
-              ->wx
-              old-cocoa?
-              version-10.6-or-later?
-              version-10.7-or-later?
-              version-10.9-or-later?
-              version-10.10-or-later?)
- with-autorelease
- call-with-autorelease
- define-mz)
-
-(define cocoa-lib (ffi-lib (format "/System/Library/Frameworks/Cocoa.framework/Cocoa")))
-(define cf-lib (ffi-lib (format "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation")))
-(define appserv-lib (ffi-lib (format "/System/Library/Frameworks/ApplicationServices.framework/ApplicationServices")))
-(define appkit-lib (ffi-lib (format "/System/Library/Frameworks/AppKit.framework/AppKit")))
-
-(define-ffi-definer define-cocoa cocoa-lib)
-(define-ffi-definer define-cf cf-lib)
-(define-ffi-definer define-appserv appserv-lib)
-(define-ffi-definer define-appkit appkit-lib)
-
-(define delete-me null)
-
-(define (objc-delete o)
-  (tellv o release))
-
-(define (clean-up-deleted)
-  (free-remembered-now objc-delete))
-
-(define objc-allocator (allocator remember-to-free-later))
-
-(define-syntax-rule (as-objc-allocation expr)
-  ((objc-allocator (lambda () expr))))
-
-(define-syntax-rule (as-objc-allocation-with-retain expr)
-  ((objc-allocator (lambda () (let ([v expr])
-                                (tellv v retain)
-                                v)))))
-
-(define release ((deallocator) objc-delete))
-(define retain ((retainer release car)
-                (lambda (obj)
-                  (tellv obj retain))))
-
-(define (clean-menu-label str)
-  (regexp-replace* #rx"&(.)" str "\\1"))
-
-(define (->wxb wx)
-  (make-weak-box wx))
-
-(define (->wx wxb)
-  (and wxb
-       (weak-box-value wxb)))
-
-(define-appkit NSAppKitVersionNumber _double)
-
-(define old-cocoa? 
-  ; earlier than 10.5?
-  (NSAppKitVersionNumber . < . 949))
-(define (version-10.6-or-later?)
-  (NSAppKitVersionNumber . >= . 1038))
-(define (version-10.7-or-later?)
-  (NSAppKitVersionNumber . >= . 1138))
-(define (version-10.9-or-later?)
-  (NSAppKitVersionNumber . >= . 1265))
-(define (version-10.10-or-later?)
-  (NSAppKitVersionNumber . >= . 1331))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/window.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/window.rkt
deleted file mode 100644
index e2ebf146eb..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/window.rkt
+++ /dev/null
@@ -1,988 +0,0 @@
-#lang racket/base
-(require ffi/unsafe/objc
-         ffi/unsafe
-         racket/class
-         "queue.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt"
-         "keycode.rkt"
-         "pool.rkt"
-         "cursor.rkt"
-         "../common/local.rkt"
-         "../../lock.rkt"
-         "../common/event.rkt"
-         "../common/queue.rkt"
-         "../common/delay.rkt"
-         "../../syntax.rkt"
-         "../common/freeze.rkt")
-
-(provide 
- (protect-out window%
-
-              FocusResponder
-              KeyMouseResponder
-              KeyMouseTextResponder
-              CursorDisplayer
-
-              queue-window-event
-              queue-window-refresh-event
-              queue-window*-event
-              request-flush-delay
-              cancel-flush-delay
-              make-init-point
-              flush-display
-
-              special-control-key
-              special-option-key))
-
-(define-local-member-name flip-client)
-
-;; ----------------------------------------
-
-(define special-control-key? #f)
-(define special-control-key
-  (case-lambda
-   [() special-control-key?]
-   [(on?) (set! special-control-key? (and on? #t))]))
-
-(define special-option-key? #f)
-(define special-option-key
-  (case-lambda
-   [() special-option-key?]
-   [(on?) (set! special-option-key? (and on? #t))]))
-
-;; ----------------------------------------
-
-(define-objc-mixin (FocusResponder Superclass)
-  [wxb]
-  [-a _BOOL (acceptsFirstResponder)
-      (let ([wx (->wx wxb)])
-        (or (not wx)
-            (send wx can-be-responder?)))]
-  [-a _BOOL (becomeFirstResponder)
-      (and (super-tell becomeFirstResponder)
-           (let ([wx (->wx wxb)])
-             (when wx (send wx is-responder wx #t))
-             #t))]
-  [-a _BOOL (resignFirstResponder)
-      (and (super-tell resignFirstResponder)
-           (let ([wx (->wx wxb)])
-             (when wx
-               (send wx is-responder wx #f)
-               (send wx set-saved-marked #f #f))
-             #t))]
-  [-a _void (changeColor: [_id sender])
-      (let ([wx (->wx wxb)])
-        (when wx (send wx on-color-change)))])
-
-(import-class NSArray NSPanel NSTextView)
-(import-protocol NSTextInput)
-
-(define current-insert-text (make-parameter #f))
-(define current-set-mark (make-parameter #f))
-
-(define NSDragOperationCopy 1)
-
-(import-class NSAttributedString)
-(define _NSStringOrAttributed
-  (make-ctype _id
-              (lambda (v)
-                (cast v _NSString _id))
-              (lambda (v)
-                (if (tell #:type _BOOL v isKindOfClass: (tell NSAttributedString class))
-                    (tell #:type _NSString v string)
-                    (cast v _id _NSString)))))
-
-(define-objc-mixin (KeyMouseResponder Superclass)
-  [wxb]
-  [-a _void (mouseDown: [_id event]) 
-      (unless (do-mouse-event wxb event 'left-down #t #f #f 'right-down)
-        (super-tell #:type _void mouseDown: event)
-        (let ([wx (->wx wxb)])
-         (when wx
-           (send wx post-mouse-down))))]
-  [-a _void (mouseUp: [_id event]) 
-      (unless (do-mouse-event wxb event 'left-up #f #f #f 'right-up)
-        (super-tell #:type _void mouseUp: event))]
-  [-a _void (mouseDragged: [_id event]) 
-      (unless (do-mouse-event wxb event 'motion #t #f #f)
-        (super-tell #:type _void mouseDragged: event))]
-  [-a _void (mouseMoved: [_id event]) 
-      ;; This event is sent to the first responder, instead of the
-      ;; view under the mouse.
-      (let* ([win (tell event window)]
-             [view (and win (tell win contentView))]
-             [hit (and view (tell view hitTest: #:type _NSPoint 
-                                  (tell #:type _NSPoint event locationInWindow)))])
-        (let loop ([hit hit])
-          (when hit
-            (if (tell #:type _BOOL hit respondsToSelector: #:type _SEL (selector doMouseMoved:))
-                (unless (tell #:type _BOOL hit doMouseMoved: event)
-                  (super-tell #:type _void mouseMoved: event))
-                (loop (tell hit superview))))))]
-  [-a _BOOL (doMouseMoved: [_id event]) 
-      ;; called by mouseMoved:
-      (and 
-       ;; Make sure we're in the right eventspace:
-       (let ([wx (->wx wxb)])
-         (and wx
-              (eq? (current-thread)
-                   (eventspace-handler-thread
-                    (send wx get-eventspace)))))
-       ;; Right event space, so handle the event:
-       (do-mouse-event wxb event 'motion #f #f #f))]
-  [-a _void (mouseEntered: [_id event]) 
-      (unless (do-mouse-event wxb event 'enter 'check 'check 'check)
-        (super-tell #:type _void mouseEntered: event))]
-  [-a _void (mouseExited: [_id event]) 
-      (unless (do-mouse-event wxb event 'leave 'check 'check 'check)
-        (super-tell #:type _void mouseExited: event))]
-  [-a _void (rightMouseDown: [_id event]) 
-      (unless (do-mouse-event wxb event 'right-down #f #f #t)
-        (super-tell #:type _void rightMouseDown: event))]
-  [-a _void (rightMouseUp: [_id event]) 
-      (unless (do-mouse-event wxb event 'right-up #f #f #f)
-        (super-tell #:type _void rightMouseUp: event))]
-  [-a _void (rightMouseDragged: [_id event]) 
-      (unless (do-mouse-event wxb event 'motion #f #f #t)
-        (super-tell #:type _void rightMouseDragged: event))]
-  [-a _void (otherMouseDown: [_id event]) 
-      (unless (do-mouse-event wxb event 'middle-down #f #t #f)
-        (super-tell #:type _void otherMouseDown: event))]
-  [-a _void (otherMouseUp: [_id event]) 
-      (unless (do-mouse-event wxb event 'middle-up #f #f #f)
-        (super-tell #:type _void otherMouseUp: event))]
-  [-a _void (otherMouseDragged: [_id event]) 
-      (unless (do-mouse-event wxb event 'motion #f #t #f)
-        (super-tell #:type _void otherMouseDragged: event))]
-
-  [-a _void (scrollWheel: [_id event])
-      (let ([delta-y (tell #:type _CGFloat event deltaY)]
-            [delta-x (tell #:type _CGFloat event deltaX)])
-        (let ([evts (append (cond
-                             [(zero? delta-y) '()]
-                             [(positive? delta-y) '(wheel-up)]
-                             [else '(wheel-down)])
-                            (cond
-                             [(zero? delta-x) '()]
-                             [(positive? delta-x) '(wheel-left)]
-                             [else '(wheel-right)]))])
-          (unless (and (pair? evts)
-                       (do-key-event wxb event self #f #f evts))
-            (super-tell #:type _void scrollWheel: event))))]
-  
-  [-a _void (keyDown: [_id event])
-      (unless (do-key-event wxb event self #t #f #f)
-        (super-tell #:type _void keyDown: event))]
-  [-a _void (keyUp: [_id event])
-      (unless (do-key-event wxb event self #f #f #f)
-        (super-tell #:type _void keyUp: event))]
-  [-a _void (flagsChanged: [_id event])
-      (unless (do-key-event wxb event self #f #t #f)
-        (super-tell #:type _void flagsChanged: event))]
-  [-a _void (insertText: [_NSStringOrAttributed str])
-      (set-saved-marked! wxb #f #f)
-      (let ([cit (current-insert-text)])
-        (if cit
-            (set-box! cit str)
-            (let ([wx (->wx wxb)])
-              (post-dummy-event) ;; to wake up in case of character palette insert 
-              (when wx
-                (queue-window-event wx (lambda ()
-                                         (send wx key-event-as-string str)))))))]
-
-  ;; for NSTextInput:
-  [-a _BOOL (hasMarkedText) (get-saved-marked wxb)]
-  [-a _id (validAttributesForMarkedText)
-      (tell NSArray array)]
-  [-a _void (unmarkText) 
-      (set-saved-marked! wxb #f #f)]
-  [-a _NSRange (markedRange)
-      (let ([saved-marked (get-saved-marked wxb)])
-        (make-NSRange 0 (if saved-marked (string-length saved-marked) 0)))]
-  [-a _NSRange (selectedRange) 
-      (or (let ([s (get-saved-selected wxb)])
-            (and s
-                 (make-NSRange (car s) (cdr s))))
-          (make-NSRange 0 0))]
-  [-a _void (setMarkedText: [_NSStringOrAttributed aString] selectedRange: [_NSRange selRange])
-      ;; We interpreter a call to `setMarkedText:' as meaning that the
-      ;; key is a dead key for composing some other character.
-      (let ([m (current-set-mark)]) (when m (set-box! m #t)))
-      ;; At the same time, we need to remember the text:
-      (set-saved-marked! wxb aString (cons (NSRange-location selRange) 
-                                           (NSRange-length selRange)))
-      (void)]
-  [-a _id (validAttributesForMarkedText) #f]
-  [-a _id (attributedSubstringFromRange: [_NSRange theRange])
-      (let ([saved-marked (get-saved-marked wxb)])
-        (and saved-marked
-             (let ([s (tell (tell NSAttributedString alloc) 
-                            initWithString: #:type _NSString
-                            (range-substring saved-marked theRange))])
-               (tellv s autorelease)
-               s)))]
-
-  [-a _NSUInteger (characterIndexForPoint: [_NSPoint thePoint]) 0]
-  [-a _NSInteger (conversationIdentifier) 0]
-  [-a _void (doCommandBySelector: [_SEL aSelector]) (void)]
-  [-a _NSRect (firstRectForCharacterRange: [_NSRange r]) 
-      ;; This location is used to place a window for multi-character
-      ;; input, such as when typing Chinese with Pinyin
-      (let ([f (tell #:type _NSRect self frame)]
-            [pt (tell #:type _NSPoint (tell self window)
-                      convertBaseToScreen:
-                      #:type _NSPoint
-                      (tell #:type _NSPoint self
-                            convertPoint: #:type _NSPoint
-                            (make-NSPoint 0 0)
-                            toView: #f))])
-        (make-NSRect pt (NSRect-size f)))]
-
-  ;; Dragging:
-  [-a _int (draggingEntered: [_id info])
-      NSDragOperationCopy]
-  [-a _BOOL (prepareForDragOperation: [_id info])
-      #t]
-  [-a _BOOL (performDragOperation: [_id info])
-      (let ([wx (->wx wxb)])
-        (when wx
-          (with-autorelease
-           (let ([pb (tell info draggingPasteboard)])
-             (let ([data (tell pb propertyListForType: NSFilenamesPboardType)])
-               (when data
-                 (for ([i (in-range (tell #:type _NSUInteger data count))])
-                   (let ([s (tell #:type _NSString data objectAtIndex: #:type _NSUInteger i)])
-                     (queue-window-event wx 
-                                         (lambda ()
-                                           (send wx do-on-drop-file s)))))))))))
-      #t])
-(define (set-saved-marked! wxb str sel)
-  (let ([wx (->wx wxb)])
-    (when wx
-      (send wx set-saved-marked str sel))))
-(define (get-saved-marked wxb)
-  (let ([wx (->wx wxb)])
-    (and wx
-         (send wx get-saved-marked))))
-(define (get-saved-selected wxb)
-  (let ([wx (->wx wxb)])
-    (and wx
-         (send wx get-saved-selected))))
-(define (range-substring s range)
-  (let ([start (min (max 0 (NSRange-location range)) (string-length s))])
-    (substring s start (max (+ start (NSRange-length range)) 
-                            (string-length s)))))
-
-(define-objc-class InputMethodPanel NSPanel
-  []
-  [-a _BOOL (canBecomeKeyWindow) #f]
-  [-a _BOOL (canBecomeMainWindow) #f]
-  [-a _void (windowDidResize: [_id notification])
-      (reset-input-method-window-size)])
-
-(define-objc-mixin (KeyMouseTextResponder Superclass)
-  #:mixins (KeyMouseResponder)
-  #:protocols (NSTextInput)
-  [wxb])
-
-(define-objc-mixin (CursorDisplayer Superclass)
-  [wxb]
-  [-a _void (resetCursorRects)
-      (let ([wx (->wx wxb)])
-        (when wx
-          (send wx reset-cursor-rects)))])
-
-(define (do-key-event wxb event self down? mod-change? wheel)
-  (let ([wx (->wx wxb)])
-    (and
-     wx
-     (let ([inserted-text (box #f)]
-           [set-mark (box #f)]
-           [had-saved-text? (and (send wx get-saved-marked) #t)])
-       (when down?
-         ;; Calling `interpretKeyEvents:' allows key combinations to be
-         ;; handled, such as option-e followed by e to produce é. The
-         ;; call to `interpretKeyEvents:' typically calls `insertText:',
-         ;; so we set `current-insert-text' to tell `insertText:' to just 
-         ;; give us back the text in the parameter. For now, we ignore the
-         ;; text and handle the event as usual, though probably we should
-         ;; be doing something with it.
-         (parameterize ([current-insert-text inserted-text]
-                        [current-set-mark set-mark])
-           (let ([array (tell (tell NSArray alloc) 
-                              initWithObjects: #:type (_ptr i _id) event
-                              count: #:type _NSUInteger 1)])
-             (tellv self interpretKeyEvents: array)
-             (tellv array release))))
-       (let* ([modifiers (tell #:type _NSUInteger event modifierFlags)]
-              [bit? (lambda (m b) (positive? (bitwise-and m b)))]
-              [pos (tell #:type _NSPoint event locationInWindow)]
-              [str (cond
-                    [wheel #f]
-                    [mod-change? #f]
-                    [(unbox set-mark) ""] ; => dead key for composing characters
-                    [(unbox inserted-text)]
-                    [else
-                     (tell #:type _NSString event characters)])]
-              [dead-key? (unbox set-mark)]
-              [control? (bit? modifiers NSControlKeyMask)]
-              [option? (bit? modifiers NSAlternateKeyMask)]
-              [codes (cond
-                      [wheel wheel]
-                      [mod-change? (case (tell #:type _ushort event keyCode)
-                                     [(56) '(shift)]
-                                     [(59) '(control)]
-                                     [(60) '(rshift)]
-                                     [(62) '(rcontrol)]
-                                     [else '()])]
-                      [had-saved-text? str]
-                      [(map-key-code (tell #:type _ushort event keyCode))
-                       => list]
-                      [(string=? "" str) '(#\nul)]
-                      [(and (= 1 (string-length str))
-                            (let ([c (string-ref str 0)])
-                              (or (and control?
-                                       (char<=? #\u00 c #\u1F)
-                                       (let ([alt-str (tell #:type _NSString event charactersIgnoringModifiers)])
-                                         (and (string? alt-str)
-                                              (= 1 (string-length alt-str))
-                                              (string-ref alt-str 0)))))))
-                       => list]
-                      [else str])])
-         (for/fold ([result dead-key?]) ([one-code codes])
-           (or
-            ;; Handle one key event
-            (let-values ([(x y) (send wx window-point-to-view pos)])
-              (let ([k (new key-event%
-                            [key-code one-code]
-                            [shift-down (bit? modifiers NSShiftKeyMask)]
-                            [control-down control?]
-                            [meta-down (bit? modifiers NSCommandKeyMask)]
-                            [alt-down option?]
-                            [x (->long x)]
-                            [y (->long y)]
-                            [time-stamp (->long (* (tell #:type _double event timestamp) 1000.0))]
-                            [caps-down (bit? modifiers NSAlphaShiftKeyMask)])])
-                (unless (or wheel mod-change?)
-                  (let ([alt-str (tell #:type _NSString event charactersIgnoringModifiers)])
-                    (when (and (string? alt-str)
-                               (= 1 (string-length alt-str)))
-                      (let ([alt-code (string-ref alt-str 0)])
-                        (unless (equal? alt-code (send k get-key-code))
-                          (send k set-other-altgr-key-code alt-code)))))
-                  (when (and (or (and option? 
-                                      special-option-key?)
-                                 (and control?
-                                      (equal? (send k get-key-code) #\u00)))
-                             (send k get-other-altgr-key-code))
-                    ;; swap altenate with main
-                    (let ([other (send k get-other-altgr-key-code)])
-                      (send k set-other-altgr-key-code (send k get-key-code))
-                      (send k set-key-code other))))
-                (unless wheel
-                  (unless (or down? (and mod-change?
-                                         (case (send k get-key-code)
-                                           [(shift rshift) (send k get-shift-down)]
-                                           [(control rcontrol) (send k get-control-down)]
-                                           [else #t])))
-                    ;; swap altenate with main
-                    (send k set-key-release-code (send k get-key-code))
-                    (send k set-key-code 'release)))
-                (if (send wx definitely-wants-event? k)
-                    (begin
-                      (queue-window-event wx (lambda ()
-                                               (send wx dispatch-on-char/sync k)))
-                      #t)
-                    (constrained-reply (send wx get-eventspace)
-                                       (lambda () (send wx dispatch-on-char k #t))
-                                       #t))))
-            result)))))))
-
-(define (do-mouse-event wxb event kind l? m? r? [ctl-kind kind])
-  (let ([wx (->wx wxb)])
-    (and
-     wx
-     (let* ([modifiers (tell #:type _NSUInteger event modifierFlags)]
-            [bit? (lambda (m b) (positive? (bitwise-and m b)))]
-            [pos (tell #:type _NSPoint event locationInWindow)])
-       (let-values ([(x y) (send wx window-point-to-view pos)]
-                    [(control-down) (bit? modifiers NSControlKeyMask)]
-                    [(l?) (if (eq? l? 'check)
-                              (send wx get-last-left-button)
-                              l?)]
-                    [(m?) (if (eq? m? 'check)
-                              (send wx get-last-middle-button)
-                              m?)]
-                    [(r?) (if (eq? r? 'check)
-                              (send wx get-last-right-button)
-                              r?)])
-         (let ([l? (and l? (not control-down))]
-               [r? (or r? (and l? control-down))])
-           (send wx set-last-buttons l? m? r?)
-           (let ([m (new mouse-event%
-                         [event-type (if control-down ctl-kind kind)]
-                         [left-down l?]
-                         [middle-down m?]
-                         [right-down r?]
-                         [x (->long x)]
-                         [y (->long y)]
-                         [shift-down (bit? modifiers NSShiftKeyMask)]
-                         [meta-down (bit? modifiers NSCommandKeyMask)]
-                         [alt-down (bit? modifiers NSAlternateKeyMask)]
-                         [time-stamp (->long (* (tell #:type _double event timestamp) 1000.0))]
-                         [caps-down (bit? modifiers NSAlphaShiftKeyMask)])])
-             (cond
-              [(send m dragging?) (void)]
-              [(send m button-down?) 
-               (send wx set-sticky-cursor)
-               (send wx start-no-cursor-rects)]
-              [(or l? m? r?) (void)]
-              [else (send wx end-no-cursor-rects)])
-             (if (send wx definitely-wants-event? m)
-                 (begin
-                   (queue-window-event wx (lambda ()
-                                            (send wx dispatch-on-event/sync m)))
-                   #t)
-                 (constrained-reply (send wx get-eventspace)
-                                    (lambda () (send wx dispatch-on-event m #t))
-                                    #t)))))))))
-
-(define-cocoa NSFilenamesPboardType _id)
-
-(define _CGError _int32)
-(define-appserv CGWarpMouseCursorPosition (_fun _NSPoint -> _CGError))
-(define-appserv CGAssociateMouseAndMouseCursorPosition (_fun _BOOL -> _CGError))
-
-(define window%
-  (class object%
-    (init-field parent 
-                cocoa
-                [no-show? #f])
-
-    (define is-on? #f)
-    (define accept-drag? #f)
-    (define accept-parent-drag? #f)
-
-    (super-new)
-
-    (queue-autorelease-flush)
-
-    (define eventspace (if parent
-                           (send parent get-eventspace)
-                           (current-eventspace)))
-
-    (when (eventspace-shutdown? eventspace)
-      (error '|GUI object initialization| "the eventspace has been shutdown"))
-
-    (set-ivar! cocoa wxb (->wxb this))
-
-    (unless no-show?
-      (show #t)) 
-
-    (define/public (focus-is-on on?)
-      (void))
-    
-    (define is-responder? #f)
-
-    (define/public (is-responder wx on?)
-      (unless (eq? on? is-responder?)
-        (set! is-responder? (and on? #t))
-        (send parent is-responder wx on?)))
-
-    (define/public (hide-children)
-      (is-responder this #f)
-      (focus-is-on #f))
-    (define/public (show-children)
-      (void))
-    (define/public (fixup-locations-children)
-      (void))
-    (define/public (fix-dc) 
-      (void))
-    (define/public (paint-children)
-      (void))
-
-    (define/public (get-cocoa) cocoa)
-    (define/public (get-cocoa-content) cocoa)
-    (define/public (get-cocoa-focus) (get-cocoa-content))
-    (define/public (get-cocoa-cursor-content) (get-cocoa-content))
-    (define/public (get-cocoa-window) (send parent get-cocoa-window))
-    (define/public (get-wx-window) (send parent get-wx-window))
-
-    (define/public (get-dialog-level) 
-      ;; called in event-pump thread
-      (send parent get-dialog-level))
-
-    (define/public (make-graphics-context)
-      (and parent
-           (send parent make-graphics-context)))
-
-    (define/public (get-parent)
-      parent)
-
-    (define/public (set-parent p)
-      (set! parent p))
-
-    (define/public (get-eventspace) eventspace)
-
-    (define/public (show on?)
-      (atomically
-       (unless (eq? (and on? #t) is-on?)
-         (if on?
-             (tellv (send parent get-cocoa-content) addSubview: cocoa)
-             (with-autorelease
-              (tellv cocoa removeFromSuperview)))
-         (set! is-on? (and on? #t))
-         (maybe-register-as-child parent on?)
-         (if on?
-             (show-children)
-             (begin
-               (hide-children)
-               (is-responder this #f))))))
-    (define/public (maybe-register-as-child parent on?)
-      ;; override this to call register-as-child if the window
-      ;; can have the focus or otherwise needs show-state notifications.
-      (void))
-    (define/public (register-as-child parent on?)
-      (send parent register-child this on?))
-    (define/public (register-child child on?)
-      (void))
-
-    (define/public (on-new-child child on?)
-      (if on?
-          (queue-window-event
-           child
-           (lambda ()
-             (atomically
-              (with-autorelease
-               (send child child-accept-drag (or accept-drag? accept-parent-drag?))))))
-          (send child child-accept-drag #f)))
-
-    (define/public (is-shown?)
-      (and (tell cocoa superview) #t))
-
-    (define/public (is-shown-to-root?)
-      (and (is-shown?)
-           (send parent is-shown-to-root?)))
-
-    (define/public (is-shown-to-before-root?)
-      (and (is-shown?)
-           (send parent is-shown-to-before-root?)))
-
-    (define enabled? #t)
-    (define/public (is-enabled-to-root?)
-      (and (is-window-enabled?) (is-parent-enabled-to-root?)))
-    (define/public (is-parent-enabled-to-root?)
-      (send parent is-enabled-to-root?))
-    (define/public (is-window-enabled?)
-      enabled?)
-    (define/public (enable on?)
-      (atomically
-       (set! enabled? on?)
-       (when (is-parent-enabled-to-root?)
-         (enable-window on?))))
-    (define/public (enable-window on?)
-      ;; in atomic mode
-      (void))
-
-    (define skip-enter-leave? #f)
-    (define/public (skip-enter-leave-events skip?)
-      (set! skip-enter-leave? skip?))
-
-    (define block-all-mouse-events? #f)
-    (define/public (block-mouse-events block?)
-      (set! block-all-mouse-events? block?))
-
-    (define/private (get-frame)
-      (let ([v (tell #:type _NSRect cocoa frame)])
-        v))
-
-    (define/public (flip y h)
-      (if parent
-          (let ([b (tell #:type _NSRect (send parent get-cocoa-content) bounds)])
-            (- (NSSize-height (NSRect-size b)) (+ y h)))
-          y))
-
-    (define/public (flip-client y)
-      (if (tell #:type _BOOL (get-cocoa-content) isFlipped)
-          y
-          (let ([r (tell #:type _NSRect (get-cocoa-content) bounds)])
-            (- (NSSize-height (NSRect-size r)) 
-               (- y (client-y-offset))))))
-    (define/public (client-y-offset) 0)
-
-    (define event-position-wrt-wx #f)
-    (define/public (set-event-positions-wrt wx)
-      (set! event-position-wrt-wx wx))
-
-    (define/public (is-view?) #t)
-    (define/public (window-point-to-view pos)
-      (let ([pos (if (is-view?)
-                     (tell #:type _NSPoint (get-cocoa-content) 
-                           convertPoint: #:type _NSPoint pos
-                           fromView: #f)
-                     pos)])
-        (define x (NSPoint-x pos))
-        (define y (flip-client (NSPoint-y pos)))
-        (cond
-         [event-position-wrt-wx
-          (define xb (box (->long x)))
-          (define yb (box (->long y)))
-          (internal-client-to-screen xb yb)
-          (send event-position-wrt-wx internal-screen-to-client xb yb)
-          (values (unbox xb) (unbox yb))]
-         [else (values x y)])))
-                
-
-    (define/public (get-x)
-      (->long (NSPoint-x (NSRect-origin (get-frame)))))
-    (define/public (get-y)
-      (let ([r (get-frame)])
-        (->long (flip (NSPoint-y (NSRect-origin r))
-                      (NSSize-height (NSRect-size r))))))
-    (define/public (get-width)
-      (->long (NSSize-width (NSRect-size (get-frame)))))
-    (define/public (get-height)
-      (->long (NSSize-height (NSRect-size (get-frame)))))
-    (define/public (get-position x y)
-      (let* ([r (get-frame)]
-             [p (NSRect-origin r)])
-        (set-box! x (->long (NSPoint-x p)))
-        (set-box! y (->long (flip (NSPoint-y p) (NSSize-height (NSRect-size r)))))))
-    (define/public (get-size w h)
-      (let ([s (NSRect-size (get-frame))])
-        (set-box! w (->long (NSSize-width s)))
-        (set-box! h (->long (NSSize-height s)))))
-
-    (define/public (get-client-size w h)
-      ;; May be called in Cocoa event-handling mode
-      (let ([s (NSRect-size (tell #:type _NSRect (get-cocoa-content) bounds))])
-        (set-box! w (->long (NSSize-width s)))
-        (set-box! h (->long (NSSize-height s)))))
-
-    (define/public (set-size x y w h)
-      (let ([x (if (not x) (get-x) x)]
-            [y (if (not y) (get-y) y)])
-        ;; old location will need refresh:
-        (tellv cocoa setNeedsDisplay: #:type _BOOL #t)
-        (tellv cocoa setFrame: #:type _NSRect (make-NSRect (make-NSPoint x (flip y h))
-                                                           (make-NSSize w h)))
-        ;; new location needs refresh:
-        (tellv cocoa setNeedsDisplay: #:type _BOOL #t))
-      (queue-on-size))
-
-    (define/public (internal-move x y)
-      (set-size x y (get-width) (get-height)))
-    (define/public (move x y)
-      (internal-move x y))
-
-    (define/public (on-drop-file f) (void))
-    (define/public (do-on-drop-file f)
-      (if accept-drag?
-          (on-drop-file (string->path f))
-          (when parent
-            (send parent do-on-drop-file f))))
-
-    (define/public (drag-accept-files on?) 
-      (unless (eq? (and on? #t) accept-drag?)
-        (atomically
-         (with-autorelease
-          (set! accept-drag? (and on? #t))
-          (accept-drags-everywhere (or accept-drag? accept-parent-drag?))))))
-
-    (define/public (accept-drags-everywhere on?) 
-      (if on?
-          (tellv (get-cocoa-content) registerForDraggedTypes:
-                 (let ([a (tell NSArray arrayWithObjects: #:type (_list i _id) (list NSFilenamesPboardType)
-                                count: #:type _NSUInteger 1)])
-                   a))
-          (tellv (get-cocoa-content) unregisterDraggedTypes))
-      (children-accept-drag on?))
-
-    (define/public (children-accept-drag on?)
-      (void))
-    (define/public (child-accept-drag on?)
-      (unless (eq? (and on? #t) accept-parent-drag?)
-        (set! accept-parent-drag? (and on? #t))
-        (accept-drags-everywhere (or accept-drag? accept-parent-drag?))))
-
-    (define/public (set-focus)
-      (when (and (gets-focus?)
-                 (is-enabled-to-root?))
-        (let ([w (tell cocoa window)])
-          (when w
-            (tellv w makeFirstResponder: (get-cocoa-focus))))))
-    (define/public (on-set-focus) (void))
-    (define/public (on-kill-focus) (void))
-
-    (define/public (definitely-wants-event? e) 
-      ;; Called in Cocoa event-handling mode
-      #f)
-
-    (define/private (pre-event-refresh key?)
-      ;; Since we break the connection between the
-      ;; Cocoa queue and event handling, we
-      ;; re-sync the display in case a stream of
-      ;; events (e.g., key repeat) have a corresponding
-      ;; stream of screen updates.
-      (try-to-sync-refresh)
-      (flush))
-
-    (define/public (flush)
-      (let ([cocoa-win (get-cocoa-window)])
-        (when cocoa-win
-          (tellv cocoa-win displayIfNeeded)
-          (tellv cocoa-win flushWindowIfNeeded))))
-
-    (define/public (dispatch-on-char/sync e)
-      (pre-event-refresh #t)
-      (dispatch-on-char e #f))
-    (define/public (dispatch-on-char e just-pre?) 
-      (cond
-       [(other-modal? this) #t]
-       [(call-pre-on-char this e) #t]
-       [just-pre? #f]
-       [else (when enabled? (on-char e)) #t]))
-
-    (define/public (dispatch-on-event/sync e)
-      (pre-event-refresh #f)
-      (dispatch-on-event e #f))
-    (define/public (dispatch-on-event e just-pre?) 
-      (cond
-       [(other-modal? this e) #t]
-       [(call-pre-on-event this e) #t]
-       [just-pre? block-all-mouse-events?]
-       [else (when enabled? (on-event e)) #t]))
-
-    (define/public (call-pre-on-event w e)
-      (or (send parent call-pre-on-event w e)
-          (pre-on-event w e)))
-    (define/public (call-pre-on-char w e)
-      (or (send parent call-pre-on-char w e)
-          (pre-on-char w e)))
-    (define/public (pre-on-event w e) #f)
-    (define/public (pre-on-char w e) #f)
-
-    (define/public (key-event-as-string s)
-      (dispatch-on-char (new key-event%
-                             [key-code (string-ref s 0)]
-                             [shift-down #f]
-                             [control-down #f]
-                             [meta-down #f]
-                             [alt-down #f]
-                             [x 0]
-                             [y 0]
-                             [time-stamp (current-milliseconds)] ; FIXME
-                             [caps-down #f])
-                        #f))
-
-    (define/public (post-mouse-down) (void))
-
-    (define/public (on-char s) (void))
-    (define/public (on-event m) (void))
-    (define/public (queue-on-size) (void))
-
-    (define last-l? #f)
-    (define last-m? #f)
-    (define last-r? #f)
-    (define/public (set-last-buttons l? m? r?)
-      (set! last-l? l?)
-      (set! last-m? m?)
-      (set! last-r? r?))
-    (define/public (get-last-left-button) last-l?)
-    (define/public (get-last-middle-button) last-m?)
-    (define/public (get-last-right-button) last-r?)
-
-    (define/public (set-sticky-cursor)
-      (set! sticky-cursor? #t))
-
-    (define/public (start-no-cursor-rects)
-      (send (get-parent) start-no-cursor-rects))
-    (define/public (end-no-cursor-rects)
-      (set! sticky-cursor? #f)
-      (send (get-parent) end-no-cursor-rects))
-
-    (define/public (get-handle) (get-cocoa))
-    (define/public (get-client-handle) (get-cocoa-content))
-
-    (define/public (popup-menu m x y)
-      (send m do-popup (get-cocoa-content) (get-cocoa-window) x (flip-client y)
-            (lambda (thunk)
-              (queue-window-event this thunk))))
-
-    (define/public (center a b) (void))
-    (define/public (refresh) (refresh-all-children))
-
-    (define/public (refresh-all-children) (void))
-
-    (define/public (screen-to-client xb yb)
-      (internal-screen-to-client xb yb))
-    (define/public (internal-screen-to-client xb yb)
-      (let ([p (tell #:type _NSPoint (get-cocoa-content) 
-                     convertPoint: #:type _NSPoint
-                     (tell #:type _NSPoint (get-cocoa-window)
-                           convertScreenToBase:
-                           #:type _NSPoint (make-NSPoint (unbox xb) 
-                                                         (send (get-wx-window) flip-screen (unbox yb))))
-                     fromView: #f)])
-        (set-box! xb (inexact->exact (floor (NSPoint-x p))))
-        (set-box! yb (inexact->exact (floor (flip-client (NSPoint-y p)))))))
-
-    (define/public (client-to-screen xb yb [flip-y? #t])
-      (internal-client-to-screen xb yb flip-y?))
-    (define/public (internal-client-to-screen xb yb [flip-y? #t])
-      (let* ([p (tell #:type _NSPoint (get-cocoa-window)
-                      convertBaseToScreen:
-                      #:type _NSPoint
-                      (tell #:type _NSPoint (get-cocoa-content) 
-                            convertPoint: #:type _NSPoint
-                            (make-NSPoint (unbox xb) (flip-client (unbox yb)))
-                            toView: #f))])
-        (let ([new-y (if flip-y?
-                         (send (get-wx-window) flip-screen (NSPoint-y p))
-                         (NSPoint-y p))])
-          (set-box! xb (inexact->exact (floor (NSPoint-x p))))
-          (set-box! yb (inexact->exact (floor new-y))))))
-      
-    (define cursor-handle #f)
-    (define sticky-cursor? #f)
-    (define/public (set-cursor c)
-      (let ([h (if c
-                   (send (send c get-driver) get-handle)
-                   #f)])
-        (unless (eq? h cursor-handle)
-          (atomically
-           (set! cursor-handle h)
-           (when sticky-cursor? (tellv h set))
-           (tellv (get-cocoa-window) invalidateCursorRectsForView: (get-cocoa-cursor-content))))))
-    (define/public (reset-cursor-rects)
-      ;; called in event-pump thread
-      (when cursor-handle
-        (let ([content (get-cocoa-cursor-content)])
-          (let* ([r (tell #:type _NSRect content frame)]
-                 [r (make-NSRect (make-NSPoint 0 0)
-                                 (make-NSSize
-                                  (- (NSSize-width (NSRect-size r))
-                                     (get-cursor-width-delta))
-                                  (NSSize-height (NSRect-size r))))])
-            (tellv content addCursorRect: #:type _NSRect r cursor: cursor-handle)))))
-    (define/public (get-cursor-width-delta) 0)
-    
-    (define/public (gets-focus?) #f)
-    (define/public (can-be-responder?) (is-enabled-to-root?))
-
-    (define/public (on-color-change)
-      (send parent on-color-change))
-
-    ;; For multi-key character composition:
-    (define saved-marked #f)
-    (define saved-sel #f)
-    (define/public (set-saved-marked v sel) 
-      (set! saved-marked v) 
-      (set! saved-sel sel)
-      (if (and v 
-               (not (string=? v ""))
-               ;; Don't show the window for an empty string or certain
-               ;; simple combinations (probably a better way than this);
-               (not (member v '("¨" "ˆ" "´" "`" "˜"))))
-          (create-compose-window)
-          (when compose-cocoa
-            (tellv compose-cocoa orderOut: #f))))
-    (define/public (get-saved-marked) saved-marked)
-    (define/public (get-saved-selected) saved-sel)
-
-    (define/public (warp-pointer x y)
-      (define xb (box x))
-      (define yb (box y))
-      (client-to-screen xb yb)
-      (void (CGWarpMouseCursorPosition (make-NSPoint (unbox xb) (unbox yb))))
-      (void (CGAssociateMouseAndMouseCursorPosition #t)))
-
-    (define/private (create-compose-window)
-      (unless compose-cocoa
-        (set! compose-cocoa (tell (tell InputMethodPanel alloc)
-                                  initWithContentRect: #:type _NSRect (make-NSRect
-                                                                       (make-NSPoint 0 20)
-                                                                       (make-NSSize 300 20))
-                                  styleMask: #:type _int (bitwise-ior NSUtilityWindowMask
-                                                                      NSResizableWindowMask
-                                                                      NSClosableWindowMask)
-                                  backing: #:type _int NSBackingStoreBuffered
-                                  defer: #:type _BOOL NO))
-        (set! compose-text (tell (tell NSTextView alloc)
-                                 initWithFrame: #:type _NSRect (make-NSRect
-                                                                (make-NSPoint 0 0)
-                                                                (make-NSSize 10 10))))
-        (tellv compose-cocoa setFloatingPanel: #:type _BOOL #t)
-        (tellv (tell compose-cocoa contentView) addSubview: compose-text)
-        (tellv compose-text sizeToFit)
-        (tellv compose-cocoa setContentBorderThickness: #:type _CGFloat 5.0 forEdge: #:type _int 1)
-        (let ([h (+ (NSSize-height
-                     (NSRect-size
-                      (tell #:type _NSRect
-                            compose-cocoa frameRectForContentRect: 
-                            #:type _NSRect (make-NSRect (make-NSPoint 0 0)
-                                                        (make-NSSize 0 0)))))
-                    (NSSize-height (NSRect-size (tell #:type _NSRect compose-text frame))))])
-          (tellv compose-cocoa setMinSize: #:type _NSSize (make-NSSize 1 h))
-          (tellv compose-cocoa setMaxSize: #:type _NSSize (make-NSSize 32000 h))
-          (tellv compose-cocoa setFrame: #:type _NSRect (make-NSRect (make-NSPoint 0 20)
-                                                                     (make-NSSize 300 h))
-                 display: #:type _BOOL #t))
-        (reset-input-method-window-size)
-        (tellv compose-cocoa setDelegate: compose-cocoa))
-      (tellv compose-text 
-             setMarkedText: #:type _NSString saved-marked 
-             selectedRange: #:type _NSRange (make-NSRange (car saved-sel) (cdr saved-sel)))
-      (tellv compose-cocoa orderFront: #f))))
-
-(define (reset-input-method-window-size)
-  (when compose-text
-    (tell compose-text setFrame: #:type _NSRect
-          (tell #:type _NSRect (tell compose-cocoa contentView) frame))))
-
-(define compose-cocoa #f)
-(define compose-text #f)
-
-;; ----------------------------------------
-
-(define (queue-window-event wx thunk)
-  (queue-event (send wx get-eventspace) thunk))
-
-(define (queue-window-refresh-event wx thunk)
-  (queue-refresh-event (send wx get-eventspace) thunk))
-
-(define (queue-window*-event wxb proc)
-  (let ([wx (->wx wxb)])
-    (when wx
-      (queue-event (send wx get-eventspace) (lambda () (proc wx))))))
-
-(define (request-flush-delay cocoa-win)
-  (do-request-flush-delay 
-   cocoa-win
-   (lambda (cocoa-win)
-     (and (tell #:type _bool cocoa-win isVisible)
-          (tellv cocoa-win disableFlushWindow)
-          #t))
-   (lambda (cocoa-win)
-     (tellv cocoa-win enableFlushWindow))))
-
-(define (cancel-flush-delay req)
-  (do-cancel-flush-delay 
-   req
-   (lambda (cocoa-win)
-     (tellv cocoa-win enableFlushWindow))))
-
-(define (make-init-point x y)
-  (make-NSPoint (if (not x)
-                    0
-                    x)
-                (if (not y)
-                    0
-                    y)))
-
-(define (flush-display)
-  (try-to-sync-refresh)
-  (for ([win (in-list (get-top-level-windows))])
-    (send win flush)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/backing-dc.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/backing-dc.rkt
deleted file mode 100644
index 5bc6ef6c6d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/backing-dc.rkt
+++ /dev/null
@@ -1,246 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw/private/dc
-         racket/draw/private/bitmap-dc
-         racket/draw/private/bitmap
-         racket/draw/private/local
-         racket/draw/private/record-dc
-         racket/draw/unsafe/cairo
-         "../../lock.rkt"
-         "queue.rkt")
-
-(provide 
- (protect-out backing-dc%
-              backing-draw-bm
-              
-              ;; scoped method names:
-              clean-slate
-              get-backing-size
-              queue-backing-flush
-              on-backing-flush
-              start-backing-retained
-              end-backing-retained
-              reset-backing-retained
-              make-backing-bitmap
-              request-delay
-              cancel-delay
-              end-delay))
-
-(define-local-member-name
-  clean-slate
-  get-backing-size
-  queue-backing-flush
-  on-backing-flush
-  start-backing-retained
-  end-backing-retained
-  reset-backing-retained
-  make-backing-bitmap
-  request-delay
-  cancel-delay
-  end-delay)
-
-(define backing-dc%
-  (class (record-dc-mixin (dc-mixin bitmap-dc-backend%))
-    (init transparent?)
-
-    (inherit internal-get-bitmap
-             internal-set-bitmap
-             reset-cr
-             set-recording-limit
-             get-recorded-command
-             get-clear-operator)
-
-    (super-new)
-
-    (set-recording-limit (if transparent? 1024 -1))
-
-    (define/override (ok?) #t)
-
-    ;; Override this method to get the right size
-    (define/public (get-backing-size xb yb)
-      (set-box! xb 1)
-      (set-box! yb 1))
-
-    ;; override this method to set up a callback to
-    ;;  `on-backing-flush' when the backing store can be rendered
-    ;;  to the screen; called atomically (expecting no exceptions)
-    (define/public (queue-backing-flush)
-      (void))
-
-    (define retained-cr #f)
-    (define retained-counter 0)
-    (define needs-flush? #f)
-    (define nada? #t)
-
-    ;; called with a procedure that is applied to a bitmap;
-    ;;  returns #f if there's nothing to flush
-    (define/public (on-backing-flush proc)
-      (cond
-       [(not retained-cr) #f]
-       [(positive? retained-counter) 
-        (unless nada?
-          (proc (or (get-recorded-command)
-                    (internal-get-bitmap))))
-        #t]
-       [else 
-        (reset-backing-retained proc)
-        #t]))
-    
-    (define/public (can-backing-flush?)
-      (and retained-cr #t))
-
-    (define/public (reset-backing-retained [proc void])
-      (let ([cr retained-cr])
-        (when cr 
-          (let ([bm (internal-get-bitmap)])
-            (set! retained-cr #f)
-            (internal-set-bitmap #f #t)
-            (super release-cr retained-cr)
-            (proc bm)
-            (release-backing-bitmap bm)))))
-
-    (define/public (start-backing-retained)
-      (as-entry
-       (lambda () 
-         (set! retained-counter (add1 retained-counter)))))
-
-    (define/public (end-backing-retained)
-      (as-entry
-       (lambda () 
-         (if (zero? retained-counter)
-             (log-error "unbalanced end-on-paint")
-             (set! retained-counter (sub1 retained-counter))))))
-
-    (define/public (make-backing-bitmap w h)
-      (make-object bitmap% w h #f #t))
-
-    (define/public (ensure-ready) (get-cr))
-
-    (define/override (get-cr)
-      (or retained-cr
-          (let ([w (box 0)]
-                [h (box 0)])
-            (get-backing-size w h)
-            (let ([bm (get-backing-bitmap (lambda (w h) (make-backing-bitmap w h)) (unbox w) (unbox h))])
-              (internal-set-bitmap bm #t))
-            (let ([cr (super get-cr)])
-              (set! retained-cr cr)
-              (reset-cr cr)
-              cr))))
-
-    (define/override (release-cr cr)
-      (set! nada? #f)
-      (when (zero? flush-suspends)
-        (queue-backing-flush)))
-
-    (define/override (erase)
-      (super erase)
-      (when (= (get-clear-operator)
-               CAIRO_OPERATOR_CLEAR)
-        (set! nada? #t)))
-
-    (define/public (clean-slate)
-      (super erase)
-      (set! nada? #t))
-
-    (define flush-suspends 0)
-    (define req #f)
-
-    (define/public (request-delay) (void))
-    (define/public (cancel-delay req) (void))
-
-    (define/override (suspend-flush) 
-      (atomically
-       (when (zero? flush-suspends)
-         (when req (cancel-delay req))
-         (set! req (request-delay)))
-       (set! flush-suspends (add1 flush-suspends))))
-
-    (define/override (resume-flush)  
-      (atomically 
-       (unless (zero? flush-suspends)
-         (set! flush-suspends (sub1 flush-suspends))
-         (when (zero? flush-suspends)
-           (queue-backing-flush)))))
-
-    (define/public (end-delay)
-      ;; call in atomic mode
-      (when (and (zero? flush-suspends) req)
-        (cancel-delay req)
-        (set! req #f)))))
-
-(define (get-backing-bitmap make-bitmap w h)
-  (make-bitmap w h))
-
-(define (release-backing-bitmap bm)
-  (send bm release-bitmap-storage))
-
-(define (scale-mixin %)
-  (class %
-    (define backing-scale 1.0)
-
-    (super-new)
-    
-    (define/override (init-cr-matrix cr)
-      (unless (= backing-scale 1.0)
-        (cairo_scale cr backing-scale backing-scale))
-      (super init-cr-matrix cr))
-
-    (define/override (init-effective-matrix mx)
-      (unless (= backing-scale 1.0)
-        (cairo_matrix_scale mx backing-scale backing-scale))
-      (super init-effective-matrix mx))
-    
-    (define/override (reset-config s)
-      (set! backing-scale s)
-      (super reset-config))))
-
-(define cairo-dc
-  (make-object (scale-mixin
-		(dc-mixin
-		 (class default-dc-backend%
-                   (inherit reset-cr)
-
-                   (define cr #f)
-                   (define w 0)
-                   (define h 0)
-
-                   (super-new)
-
-                   (define/public (set-cr new-cr new-w new-h)
-                     (set! cr new-cr)
-                     (set! w new-w)
-                     (set! h new-h)
-                     (when cr
-                       (reset-cr cr)))
-
-                   (define/override (get-cr) cr)
-
-                   (define/override (reset-clip cr)
-                     (super reset-clip cr)
-                     (cairo_rectangle cr 0 0 w h)
-                     (cairo_clip cr)))))))
-
-(define (backing-draw-bm bm cr w h [dx 0] [dy 0] [backing-scale 1.0])
-  (if (procedure? bm)
-      (begin
-        (send cairo-dc reset-config backing-scale)
-        (send cairo-dc set-cr cr w h)
-	(unless (and (zero? dx) (zero? dy))
-	  (send cairo-dc translate dx dy))
-        (bm cairo-dc)
-        (send cairo-dc set-cr #f 0 0))
-      (let ([s (cairo_get_source cr)])
-	(unless (and (zero? dx) (zero? dy))
-	  (cairo_translate cr dx dy))
-        (cairo_pattern_reference s)
-        (cairo_set_source_surface cr (send bm get-cairo-surface) 0 0)
-        (let ([sc (send bm get-cairo-device-scale)])
-          (unless (= sc 1)
-            (let ([m (make-cairo_matrix_t 0.0 0.0 0.0 0.0 0.0 0.0)])
-              (cairo_matrix_init_translate m 0 0)
-              (cairo_matrix_scale m sc sc)
-              (cairo_pattern_set_matrix (cairo_get_source cr) m))))
-        (cairo_paint cr)
-        (cairo_set_source cr s)
-        (cairo_pattern_destroy s))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/canvas-mixin.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/canvas-mixin.rkt
deleted file mode 100644
index d604988cf4..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/canvas-mixin.rkt
+++ /dev/null
@@ -1,210 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         "../common/queue.rkt"
-         "backing-dc.rkt")
-
-(provide 
- (protect-out canvas-autoscroll-mixin
-              canvas-mixin
-              fix-bitmap-size))
-
-;; Implements canvas autoscroll, applied *before* platform-specific canvas
-;; methods:
-(define (canvas-autoscroll-mixin %)
-  (class %
-    (super-new)
-
-    (inherit get-client-size
-             refresh)
-
-    (define any-scroll? #f)
-    (define auto-scroll? #f)
-    (define virtual-height #f)
-    (define virtual-width #f)
-
-    (define/public (is-auto-scroll?) auto-scroll?)
-    (define/public (is-disabled-scroll?) (not any-scroll?))
-    (define/public (get-virtual-height) virtual-height)
-    (define/public (get-virtual-width) virtual-width)
-    
-    (define/public (set-scrollbars h-step v-step
-                                   h-len v-len
-                                   h-page v-page
-                                   h-pos v-pos
-                                   auto?)
-       (set! any-scroll? #t)
-       (cond
-        [auto?
-         (set! auto-scroll? #t)
-         (set! virtual-width (and (positive? h-len) h-len))
-         (set! virtual-height (and (positive? v-len) v-len))
-         (reset-auto-scroll h-pos v-pos)
-         (refresh-for-autoscroll)]
-        [else
-         (let ([a? auto-scroll?])
-           (set! auto-scroll? #f)
-           (set! virtual-width #f)
-           (set! virtual-height #f)
-           (when a? (reset-dc-for-autoscroll))) ; disable scroll offsets
-         (do-set-scrollbars h-step v-step
-                            h-len v-len
-                            h-page v-page
-                            h-pos v-pos)]))
-
-    ;; To be overridden:
-    (define/public (do-set-scrollbars h-step v-step
-                                      h-len v-len
-                                      h-page v-page
-                                      h-pos v-pos)
-      (void))
-
-    (define/public (reset-auto-scroll [h-pos -1] [v-pos -1])
-      (let ([xb (box 0)]
-            [yb (box 0)])
-        (get-client-size xb yb)
-        (let ([cw (unbox xb)]
-              [ch (unbox yb)])
-          (let ([h-len (if virtual-width
-                           (max 0 (- virtual-width cw))
-                           0)]
-                [v-len (if virtual-height
-                           (max 0 (- virtual-height ch))
-                           0)]
-                [h-page (if virtual-width
-                            cw
-                            0)]
-                [v-page (if virtual-height
-                            ch
-                            0)])
-            (do-set-scrollbars 1 1
-                               h-len v-len
-                               h-page v-page
-                               h-pos v-pos)))))
-
-    ;; To be overridden:
-    (define/public (reset-dc-for-autoscroll)
-      (void))
-
-    (define/public (refresh-for-autoscroll)
-      (reset-dc-for-autoscroll)
-      (refresh))
-    
-    (define/public (view-start xb yb)
-      (if auto-scroll?
-          (begin
-            (set-box! xb (if virtual-width
-                             (get-virtual-h-pos)
-                             0))
-            (set-box! yb (if virtual-height
-                             (get-virtual-v-pos)
-                             0)))
-          (begin
-            (set-box! xb 0)
-            (set-box! yb 0))))
-    
-    ;; To be overridden:
-    (define/public (get-virtual-h-pos) 0)
-    (define/public (get-virtual-v-pos) 0)
-    
-    (define/public (get-virtual-size xb yb)
-      (get-client-size xb yb)
-      (when virtual-width (set-box! xb virtual-width))
-      (when virtual-height (set-box! yb virtual-height)))))
-
-;; Implements canvas refresh, applied *after* platform-specific canvas
-;; methods:
-(define (canvas-mixin %)
-  (class %
-    (inherit request-canvas-flush-delay
-             cancel-canvas-flush-delay
-             queue-canvas-refresh-event
-             is-shown-to-root?
-             on-paint
-             queue-backing-flush
-             get-dc
-             get-canvas-background-for-backing
-             skip-pre-paint?)
-    
-    ;; Avoid multiple queued paints, and also allow cancel
-    ;; of queued paint:
-    (define paint-queued #f) ; #f or (box #t)
-
-    (super-new)
-
-    (define/override (queue-paint)
-      ;; can be called from any thread, including the event-pump thread
-      (unless paint-queued
-        (let ([b (box #t)])
-          (set! paint-queued b)
-          (let ([req (request-canvas-flush-delay)])
-            (queue-canvas-refresh-event
-             (lambda () (do-on-paint req b)))))))
-
-    (define/private (do-on-paint req b)
-      ;; only called in the handler thread
-      (when (or (not b) (unbox b))
-        (let ([pq paint-queued])
-          (when pq (set-box! pq #f)))
-        (set! paint-queued #f)
-        (cond
-         [(or (not b) (is-shown-to-root?))
-          (let ([dc (get-dc)])
-            (send dc suspend-flush)
-            (send dc ensure-ready)
-            (send dc clean-slate)
-            (let ([bg (get-canvas-background-for-backing)])
-              (when bg 
-                (let ([old-bg (send dc get-background)])
-                  (send dc set-background bg)
-                  (send dc clear)
-                  (send dc set-background old-bg))))
-            (on-paint)
-            (send dc resume-flush)
-            (queue-backing-flush))]
-         [b ; => not shown to root
-          ;; invalidate dc so that it's refresh
-          ;; when it's shown again
-          (send (get-dc) reset-backing-retained)]))
-      (when req
-        (cancel-canvas-flush-delay req)))
-
-    (define/override (paint-children)
-      (unless (skip-pre-paint?)
-        (when (or paint-queued
-                  (not (send (get-dc) can-backing-flush?)))
-          (do-on-paint #f #f))))
-
-
-    (define flush-box #f)
-    
-    ;; Periodic flush is needed for Windows, where
-    ;; updates otherwise happen only via the eventspace's queue
-    (define/override (schedule-periodic-backing-flush)
-      (unless flush-box
-        (set! flush-box (box #t))
-        (add-event-boundary-sometimes-callback! 
-         flush-box
-         (lambda (b)
-           (when (unbox b)
-             (do-canvas-backing-flush #f))))))
-
-     (define/override (do-canvas-backing-flush ctx)
-       ;; cancel scheduled flush, if any:
-       (when flush-box 
-         (set-box! flush-box #f) 
-         (set! flush-box #f))
-       (super do-canvas-backing-flush ctx))))
-
-;; useful for fixing the size of a collecting blit:
-(define (fix-bitmap-size on w h on-x on-y)
-  (if (and (zero? on-x)
-           (zero? on-y)
-           (= (send on get-width) w)
-           (= (send on get-height) h))
-      on
-      (let ([bm (make-object bitmap% w h)])
-        (let ([dc (make-object bitmap-dc% on)])
-          (send dc draw-bitmap-section on 0 0 on-x on-y w h)
-          (send dc set-bitmap #f)
-          bm))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/clipboard.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/clipboard.rkt
deleted file mode 100644
index 1acafb9559..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/clipboard.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang racket/base
-(require racket/class
-         (only-in racket/draw bitmap%)
-         "../../syntax.rkt"
-         "../platform.rkt"
-         "local.rkt"
-         "queue.rkt")
-
-(provide 
- (protect-out clipboard<%>
-              clipboard-client%
-              get-the-clipboard
-              get-the-x-selection))
-
-(define pre-client%
-  (class object%
-    (super-new)
-
-    (def/pubment (get-data [string? format])
-      (let ([d (inner #f get-data format)])
-        (when d
-          (unless (or (string? d) (bytes? d))
-            (raise-mismatch-error 
-             '|get-data method of clipboard-client%|
-             "result is not #f, a string, or byte string: "
-             d)))
-        d))))
-
-(defclass clipboard-client% pre-client%
-  (define types null)
-  (define es (current-eventspace))
-  (define/public (get-client-eventspace) es)
-  (define/public (set-client-eventspace e) (set! es e))
-  (def/public (same-eventspace? [eventspace? e])
-    (eq? e es))
-  (def/public (get-types)
-    types)
-  (def/public (add-type [string? str])
-    (set! types (cons (string->immutable-string str) types)))
-  (define/augride (get-data format)
-    #f)
-  (def/public (on-replaced)
-    (void))
-  (super-new))
-
-(define string-clipboard-client%
-  (class clipboard-client%
-    (init-field the-bytes)
-    (super-new)
-    (define/override (get-types) (list "TEXT"))
-    (define/override (get-data s)
-      (and (equal? s "TEXT") the-bytes))))
-
-(defclass clipboard% object%
-  (init x-selection?)
-
-  (define driver (new clipboard-driver%
-                      [x-selection? x-selection?]))
-
-  (def/public (same-clipboard-client? [clipboard-client% c])
-    (eq? c (send driver get-client)))
-
-  (def/public (get-clipboard-bitmap [exact-integer? timestamp])
-    (send driver get-bitmap-data))
-  (def/public (set-clipboard-bitmap [bitmap% bm] [exact-integer? timestamp])
-    (send driver set-bitmap-data bm timestamp))
-  (def/public (get-clipboard-data [string? type]
-                                  [exact-integer? timestamp])
-    (send driver get-data type))
-  (def/public (get-clipboard-string [exact-integer? timestamp])
-    (send driver get-text-data))
-  (def/public (set-clipboard-client [clipboard-client% c]
-                                    [exact-integer? timestamp])
-    (send c set-client-eventspace (current-eventspace))
-    (send driver set-client c (send c get-types)))
-  (def/public (set-clipboard-string [string? str]
-                                    [exact-integer? timestamp])
-    (set-clipboard-client (make-object string-clipboard-client% 
-                                       (string->bytes/utf-8 str))
-                          timestamp))
-
-  (super-new))
-
-(define clipboard<%> (class->interface clipboard%))
-
-(define the-clipboard (new clipboard% [x-selection? #f]))
-(define the-x-selection
-  (if has-x-selection?
-      (new clipboard% [x-selection? #t])
-      the-clipboard))
-
-(define (get-the-clipboard)
-  the-clipboard)
-(define (get-the-x-selection)
-  the-x-selection)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/cursor-draw.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/cursor-draw.rkt
deleted file mode 100644
index 7814955447..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/cursor-draw.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw)
-
-(provide make-cursor-image
-         draw-watch
-         draw-nw/se
-         draw-ne/sw
-         draw-bullseye)
-
-(define (make-cursor-image draw-proc [smoothing 'aligned])
-  (let* ([bm (make-object bitmap% 16 16 #f #t)]
-         [dc (make-object bitmap-dc% bm)])
-    (send dc set-smoothing smoothing)
-    (draw-proc dc 16 16)
-    (send dc set-bitmap #f)
-    bm))
-
-(define (draw-watch dc w h)
-  (send dc set-brush "black" 'solid)
-  (send dc draw-rectangle 5 0 6 4)
-  (send dc draw-rectangle 5 12 6 4)
-  (send dc set-brush "white" 'solid)
-  (send dc draw-ellipse 3 3 10 10)
-  (send dc draw-line 7 5 7 8)
-  (send dc draw-line 7 8 9 8))
-
-(define (draw-nw/se dc w h)
-  (bolden
-   dc
-   (lambda ()
-     (send dc set-smoothing 'unsmoothed)
-     (send dc draw-line 0 16 16 0)
-     (send dc draw-line 0 0 16 16)
-     (send dc draw-line 1 4 1 1)
-     (send dc draw-line 1 1 4 1)
-     (send dc draw-line 12 15 15 15)
-     (send dc draw-line 15 15 15 12))))
-   
-(define (draw-ne/sw dc w h)
-  (bolden
-   dc
-   (lambda ()
-     (send dc set-smoothing 'unsmoothed)
-     (send dc draw-line 0 16 16 0)
-     (send dc draw-line 0 0 16 16)
-     (send dc draw-line 12 1 15 1)
-     (send dc draw-line 15 1 15 4)
-     (send dc draw-line 1 12 1 15)
-     (send dc draw-line 1 15 4 15))))
-
-(define (draw-bullseye dc w h)
-  (send dc draw-ellipse 1 1 (- w 2) (- h 2))
-  (send dc draw-ellipse 4 4 (- w 8) (- h 8))
-  (send dc draw-ellipse 7 7 2 2))
-
-(define (bolden dc draw)
-  (send dc set-pen "white" 4 'solid)
-  (draw)
-  (send dc set-pen "black" 2 'solid)
-  (draw))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/cursor.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/cursor.rkt
deleted file mode 100644
index f8aa09acdc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/cursor.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         "local.rkt"
-         (only-in "../platform.rkt" cursor-driver%)
-          "../../syntax.rkt")
-
-(provide cursor%)
-
-(define standards (make-hash))
-
-(define (is-16x16? image)
-  (and (not (send image is-color?))
-       (= 16 (send image get-width))
-       (= 16 (send image get-height))))
-
-(defclass cursor% object%
-
-  (init-rest args)
-  (define driver
-    (case-args 
-     args
-     [([(symbol-in arrow bullseye cross hand ibeam watch blank
-                   size-n/s size-e/w size-ne/sw size-nw/se
-                   arrow+watch) 
-        sym])
-      (or (hash-ref standards sym #f)
-          (let ([c (new cursor-driver%)])
-            (send c set-standard sym)
-            (hash-set! standards sym c)
-            c))]
-     [([bitmap% image]
-       [bitmap% mask]
-       [(integer-in 0 15) [hot-spot-x 0]]
-       [(integer-in 0 15) [hot-spot-y 0]])
-      (unless (is-16x16? image)
-        (raise-type-error (init-name 'cursor%) '|bitmap (16x16 monochrome)| image))
-      (unless (is-16x16? mask)
-        (raise-type-error (init-name 'cursor%) '|bitmap (16x16 monochrome)| mask))
-      (let ([c (new cursor-driver%)])
-        (send c set-image image mask hot-spot-x hot-spot-y)
-        c)]
-     (init-name 'cursor%)))
-
-  (define/public (get-driver) driver)
-
-  (def/public (ok?) (send driver ok?))
-  (super-new))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/default-procs.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/default-procs.rkt
deleted file mode 100644
index 52598374b4..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/default-procs.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw/private/color)
-(provide special-control-key
-         special-option-key
-         file-creator-and-type
-         get-panel-background
-         fill-private-color)
-
-(define special-control-key? #f)
-(define special-control-key
-  (case-lambda
-   [() special-control-key?]
-   [(on?) (set! special-control-key? (and on? #t))]))
-
-(define special-option-key? #f)
-(define special-option-key
-  (case-lambda
-   [() special-option-key?]
-   [(on?) (set! special-option-key? (and on? #t))]))
-
-(define file-creator-and-type
-  (case-lambda
-   [(path cr ty) (void)]
-   [(path) (values #"????" #"????")]))
-
-(define (get-panel-background)
-  (make-object color% "gray"))
-
-(define (fill-private-color dc col)
-  (send dc set-background col)
-  (send dc clear))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/delay.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/delay.rkt
deleted file mode 100644
index ef8d704432..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/delay.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket/base
-(require "../../lock.rkt"
-         "queue.rkt")
-
-(provide 
- (protect-out do-request-flush-delay
-              do-cancel-flush-delay))
-
-;; Auto-cancel schedules a cancel of a request flush
-;; on event boundaries. It makes sense if you don't
-;; trust a program to un-delay important refreshes,
-;; but auto-cancel is currently disabled because
-;; bad refresh-delay effects are confined to the enclosing
-;; window on all platforms.
-(define AUTO-CANCEL-DELAY? #f)
-
-(define (do-request-flush-delay win disable enable)
-  (atomically
-   (let ([req (box win)])
-     (and 
-      (disable win)
-      (begin
-        (when AUTO-CANCEL-DELAY?
-          (add-event-boundary-sometimes-callback! 
-           req
-           (lambda (v) 
-             ;; in atomic mode
-             (when (unbox req) 
-               (set-box! req #f)
-               (enable win)))))
-        req)))))
-
-(define (do-cancel-flush-delay req enable)
-  (atomically
-   (let ([win (unbox req)])
-     (when win
-       (set-box! req #f)
-       (enable win)
-       (when AUTO-CANCEL-DELAY?
-         (remove-event-boundary-callback! req))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/dialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/dialog.rkt
deleted file mode 100644
index 834e869549..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/dialog.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/base
-(require racket/class
-         "../../lock.rkt"
-         "queue.rkt")
-
-(provide (protect-out dialog-mixin))
-
-(define dialog-level-counter 0)
-
-(define (dialog-mixin %)
-  (class %
-    (super-new)
-
-    (define close-sema #f)
-    (define close-sema-ready? #f)
-
-    (define dialog-level 0)
-    (define/override (get-dialog-level) dialog-level)
-    
-    (define/override (frame-relative-dialog-status win) 
-      (let ([dl (send win get-dialog-level)])
-        (cond
-         [(= dl dialog-level) 'same]
-         [(dl . > . dialog-level) #f]
-         [else 'other])))
-  
-    (define/override (direct-show on?)
-      ;; atomic mode
-      (when on?
-        (set! dialog-level-counter (add1 dialog-level-counter))
-        (set! dialog-level dialog-level-counter))
-      (unless on?
-        (set! dialog-level 0))
-      (unless on?
-        (when close-sema-ready?
-          (semaphore-post close-sema)
-          (set! close-sema #f)
-          (set! close-sema-ready? #f)))
-      (when on?
-        ;; mark `close-sema' as having a corresponding `show #t'
-        ;; so that a future `show #f' can clear it; without this
-        ;; extra flag, `close-sema' could be set, `show #f' could
-        ;; post it, and then the `show #t' that created hte sema
-        ;; could happen after the `show #f'
-        (set! close-sema-ready? #t))
-      (super direct-show on?))
-
-    (define/private (get-show-semaphore)
-      (atomically
-       (let ([s (or close-sema (make-semaphore))])
-         (unless close-sema (set! close-sema s))
-         (semaphore-peek-evt s))))
-
-    (define/public (show-without-yield)
-      (get-show-semaphore) ; in case some other thread wants to wait
-      (super show #t))
-
-    (define/override (show on?)
-      (if on?
-          (let ([s (get-show-semaphore)])
-            (super show on?)
-            (yield s)
-            (void))
-          (super show on?)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/event.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/event.rkt
deleted file mode 100644
index d224ffb01e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/event.rkt
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang racket/base
-(require racket/class
-         "../../syntax.rkt")
-
-(provide event%
-         mouse-event%
-         key-event%
-         control-event%
-         column-control-event%
-         scroll-event%
-         popup-event%)
-
-(defclass event% object%
-  (init-properties [[exact-integer? time-stamp] 0])
-  (super-new))
-
-(defclass mouse-event% event%
-  (init-properties [[(symbol-in enter leave left-down left-up
-                                middle-down middle-up
-                                right-down right-up motion)
-                     event-type]]
-                   [[bool? left-down] #f]
-                   [[bool? middle-down] #f]
-                   [[bool? right-down] #f]
-                   [[exact-integer? x] 0]
-                   [[exact-integer? y] 0]
-                   [[bool? shift-down] #f]
-                   [[bool? control-down] #f]
-                   [[bool? meta-down] #f]
-                   [[bool? alt-down] #f])
-  (init [time-stamp 0])
-  (init-properties [[bool? caps-down] #f]
-                   [[bool? mod3-down] #f]
-                   [[bool? mod4-down] #f]
-                   [[bool? mod5-down] #f])
-  (super-new [time-stamp time-stamp])
-
-  (def/public (button-changed? [(symbol-in left middle right any) [button 'any]])
-    (and (memq event-type
-               (case button
-                 [(any) '(left-down left-up middle-down middle-up right-down right-up)]
-                 [(left) '(left-down left-up)]
-                 [(middle) '(middle-down middle-up)]
-                 [(right) '(right-down right-up)]))
-         #t))
-
-  (def/public (button-down? [(symbol-in left middle right any) [button 'any]])
-    (and (memq event-type
-               (case button
-                 [(any) '(left-down middle-down right-down)]
-                 [(left) '(left-down)]
-                 [(middle) '(middle-down)]
-                 [(right) '(right-down)]))
-         #t))
-
-  (def/public (button-up? [(symbol-in left middle right any) [button 'any]])
-    (and (memq event-type
-               (case button
-                 [(any) '(left-up middle-up right-up)]
-                 [(left) '(left-up)]
-                 [(middle) '(middle-up)]
-                 [(right) '(right-up)]))
-         #t))
-
-  (def/public (dragging?)
-    (and (eq? event-type 'motion)
-         (or left-down middle-down right-down)))
-
-  (def/public (entering?)
-    (eq? event-type 'enter))
-
-  (def/public (leaving?)
-    (eq? event-type 'leave))
-
-  (def/public (moving?)
-    (eq? event-type 'motion)))
-
-(defclass key-event% event%
-  (init-properties [[(make-alts symbol? char?) key-code] #\nul]
-                   [[bool? shift-down] #f]
-                   [[bool? control-down] #f]
-                   [[bool? meta-down] #f]
-                   [[bool? alt-down] #f]
-                   [[exact-integer? x] 0]
-                   [[exact-integer? y] 0])
-  (init [time-stamp 0])
-  (init-properties [[bool? caps-down] #f]
-                   [[bool? mod3-down] #f]
-                   [[bool? mod4-down] #f]
-                   [[bool? mod5-down] #f]
-		   [[bool? control+meta-is-altgr] #f])
-  (properties [[(make-alts symbol? char?) key-release-code] 'press]
-              [[(make-or-false (make-alts symbol? char?)) other-shift-key-code] #f]
-              [[(make-or-false (make-alts symbol? char?)) other-altgr-key-code] #f]
-              [[(make-or-false (make-alts symbol? char?)) other-shift-altgr-key-code] #f]
-              [[(make-or-false (make-alts symbol? char?)) other-caps-key-code] #f])
-  (super-new [time-stamp time-stamp]))
-
-(defclass control-event% event%
-  (init-properties [[(symbol-in button check-box choice
-                                list-box list-box-dclick list-box-column text-field
-                                text-field-enter slider radio-box
-                                menu-popdown menu-popdown-none tab-panel) 
-                     event-type]])
-  (init [time-stamp 0])
-  (super-new [time-stamp time-stamp]))
-
-(defclass column-control-event% control-event%
-  (init-properties [[exact-nonnegative-integer? column]])
-  (init event-type
-        [time-stamp 0])
-  (unless (eq? event-type 'list-box-column)
-    (raise-type-error (init-name 'column-control-event%)
-                      "'list-box-column"
-                      event-type))
-  (super-new [event-type event-type]
-             [time-stamp time-stamp]))
-
-(defclass popup-event% control-event%
-  (properties [[any? menu-id] 0])
-  (super-new))
-
-(defclass scroll-event% event%
-  (init-properties [[(symbol-in top bottom line-up line-down page-up page-down thumb) event-type]
-                    'thumb]
-                   [[(symbol-in horizontal vertical) direction] 'vertical]
-                   [[(integer-in 0 10000) position] 0])
-  (init [time-stamp 0])
-  (super-new [time-stamp time-stamp]))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/freeze.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/freeze.rkt
deleted file mode 100644
index 7ee55836a3..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/freeze.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-(require ffi/unsafe/try-atomic
-         "queue.rkt")
-
-(provide 
- call-as-nonatomic-retry-point
- (protect-out constrained-reply))
-
-(define (internal-error str)
-  (log-error
-   (apply string-append
-          (format "internal error: ~a" str)
-          (append
-           (for/list ([c (continuation-mark-set->context (current-continuation-marks))])
-             (let ([name (car c)]
-                   [loc (cdr c)])
-               (cond
-                [loc
-                 (string-append
-                  "\n"
-                  (cond 
-                   [(srcloc-line loc)
-                    (format "~a:~a:~a" 
-                            (srcloc-source loc)
-                            (srcloc-line loc)
-                            (srcloc-column loc))]
-                   [else
-                    (format "~a::~a" 
-                            (srcloc-source loc)
-                            (srcloc-position loc))])
-                  (if name (format " ~a" name) ""))]
-                [else (format "\n ~a" name)])))
-           '("\n")))))
-
-;; FIXME: waiting 200msec is not a good enough rule.
-(define (constrained-reply es thunk default 
-                           #:fail-result [fail-result default])
-  (cond
-   [(not (can-try-atomic?))
-    ;; Ideally, this would count as an error that we can fix. It seems that we
-    ;; don't always have enough control to use the right eventspace with a
-    ;; retry point, though, so just bail out with the default.
-    #;(internal-error (format "constrained-reply not within an unfreeze point for ~s" thunk))
-    fail-result]
-   [(not (eq? (current-thread) (eventspace-handler-thread es)))
-    (internal-error "wrong eventspace for constrained event handling\n")
-    fail-result]
-   [else
-    (try-atomic thunk default)]))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/handlers.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/handlers.rkt
deleted file mode 100644
index 7c57414d51..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/handlers.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang racket/base
-
-(provide
- (protect-out application-file-handler
-              application-start-empty-handler
-              application-quit-handler
-              application-about-handler
-              application-pref-handler
-              
-              nothing-application-pref-handler
-              nothing-application-about-handler))
-
-(define saved-files null)
-(define orig-afh (lambda (f)
-                   (if (eq? afh orig-afh)
-                       (set! saved-files (cons f saved-files))
-                       ;; handler has changed between time a call here
-                       ;;  was queued and the call happened
-                       (let ([sf (cons f saved-files)])
-                         (set! saved-files null)
-                         (for-each afh (reverse sf))))))
-(define afh orig-afh)
-(define application-file-handler
-  (case-lambda
-   [(proc) 
-    (set! afh proc)
-    (let ([sf saved-files])
-      (set! saved-files null)
-      (for-each proc (reverse sf)))]
-   [() afh]))
-
-(define started-empty? #f)
-(define orig-aseh (lambda ()
-                    (if (eq? aseh orig-aseh)
-                        (set! started-empty? #t)
-                        (aseh))))
-(define aseh orig-aseh)
-(define application-start-empty-handler
-  (case-lambda
-   [(proc) 
-    (set! aseh proc)
-    (when started-empty?
-      (set! started-empty? #f)
-      (proc))]
-   [() aseh]))
-
-(define aqh void)
-(define application-quit-handler
-  (case-lambda
-   [(proc) (set! aqh proc)]
-   [() aqh]))
-
-(define (nothing-application-about-handler) (void))
-(define aah nothing-application-about-handler)
-(define application-about-handler
-  (case-lambda
-   [(proc) (set! aah proc)]
-   [() aah]))
-
-(define (nothing-application-pref-handler) (void))
-(define aph nothing-application-pref-handler)
-(define application-pref-handler
-  (case-lambda
-   [(proc) (set! aph proc)]
-   [() aph]))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/local.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/local.rkt
deleted file mode 100644
index 82a8c6b6e3..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/local.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require racket/class)
-
-(provide (protect-out (all-defined-out)))
-
-(define-local-member-name
-  ;; clipboard-client%:
-  get-client-eventspace
-  set-client-eventspace
-
-  ;; cursor%
-  get-driver)
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/once.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/once.rkt
deleted file mode 100644
index d416754157..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/once.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require ffi/unsafe)
-
-(provide (protect-out scheme_register_process_global))
-
-;; This module must be instantiated only once:
-
-(define scheme_register_process_global
-  (get-ffi-obj 'scheme_register_process_global #f (_fun _string _pointer -> _pointer)))
-
-(let ([v (scheme_register_process_global "GRacket-support-initialized"
-                                         (cast 1 _scheme _pointer))])
-  (when v
-    (error "cannot instantiate `racket/gui/base' a second time in the same process")))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/procs.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/procs.rkt
deleted file mode 100644
index 5631fd6106..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/procs.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require "../../syntax.rkt")
-
-(provide
- label->plain-label)
-
-(define/top (label->plain-label [string? s])
-  (regexp-replace* #rx"&(.)" 
-                   (regexp-replace 
-                    #rx" *[(]&.[)] *"
-                    (regexp-replace #rx"\t.*$" s "") 
-                    "")
-                   "\\1"))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/queue.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/queue.rkt
deleted file mode 100644
index b445134e53..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/queue.rkt
+++ /dev/null
@@ -1,677 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/draw/private/utils
-         ffi/unsafe/atomic
-         racket/class
-         racket/port
-         "rbtree.rkt"
-         "../../lock.rkt"
-         "handlers.rkt"
-         "once.rkt")
-
-(provide 
- (protect-out queue-evt
-              set-check-queue!
-              set-queue-wakeup!
-
-              add-event-boundary-callback!
-              add-event-boundary-sometimes-callback!
-              remove-event-boundary-callback!
-              pre-event-sync
-              boundary-tasks-ready-evt
-              sometimes-delay-msec
-              set-platform-queue-sync!
-
-              eventspace?
-              current-eventspace
-              queue-event
-              queue-refresh-event
-              yield
-              yield/no-sync
-              yield-refresh
-              eventspace-event-evt
-              (rename-out [make-new-eventspace make-eventspace])
-
-              event-dispatch-handler
-              eventspace-shutdown?
-              main-eventspace?
-              eventspace-handler-thread
-              eventspace-event-evt
-              eventspace-wait-cursor-count
-              eventspace-extra-table
-              eventspace-adjust-external-modal!
-
-              queue-callback
-              middle-queue-key
-
-              make-timer-callback
-              add-timer-callback
-              remove-timer-callback
-
-              register-frame-shown
-              get-top-level-windows
-              other-modal?
-
-              queue-quit-event
-              queue-prefs-event
-              queue-about-event
-              queue-file-event
-              queue-start-empty-event
-
-              begin-busy-cursor
-              end-busy-cursor
-              is-busy?)
-
- scheme_register_process_global)
-
-;; ------------------------------------------------------------
-;; Create a Scheme evt that is ready when a queue is nonempty
-
-(define _Scheme_Type _short)
-(define-mz scheme_make_type (_fun _string -> _Scheme_Type))
-(define event-queue-type (scheme_make_type "event-queue"))
-
-(define-mz scheme_add_evt (_fun _Scheme_Type
-                                (_fun #:atomic? #t _scheme -> _int)
-                                (_fun #:atomic? #t _scheme _gcpointer -> _void)
-                                _pointer
-                                _int
-                                -> _void))
-
-(define (do-check-queue) #f)
-(define (do-queue-wakeup fds) #f)
-
-(define (check-queue o)
-  (if (do-check-queue) 1 0))
-(define (queue-wakeup o fds)
-  (do-queue-wakeup fds))
-(scheme_add_evt event-queue-type check-queue queue-wakeup #f 0)
-(define queue-evt (let ([p (malloc 16)]
-                        [p2 (malloc 'nonatomic _pointer)])
-                    (memset p 0 16)
-                    (ptr-set! p _Scheme_Type event-queue-type)
-                    (ptr-set! p2 _pointer p)
-                    (ptr-ref p2 _scheme)))
-
-(define (set-check-queue! check)
-  (set! do-check-queue check))
-(define (set-queue-wakeup! wake)
-  (set! do-queue-wakeup wake))
-
-;; ------------------------------------------------------------
-;; Pre-event sync
-
-(define boundary-ht (make-hasheq))
-(define sometimes-boundary-ht (make-hasheq))
-
-(define tasks-ready? #f)
-(define task-ready-sema (make-semaphore))
-(define boundary-tasks-ready-evt (semaphore-peek-evt task-ready-sema))
-
-(define (alert-tasks-ready)
-  (let ([ready? (or (positive? (hash-count boundary-ht))
-                    (positive? (hash-count sometimes-boundary-ht)))])
-    (unless (eq? ready? tasks-ready?)
-      (set! tasks-ready? ready?)
-      (if ready?
-          (semaphore-post task-ready-sema)
-          (semaphore-wait task-ready-sema)))))
-
-(define (add-event-boundary-callback! v proc)
-  (atomically
-   (hash-set! boundary-ht v proc)
-   (alert-tasks-ready)))
-(define (add-event-boundary-sometimes-callback! v proc) 
-  (atomically
-   (when (zero? (hash-count sometimes-boundary-ht))
-     (set! last-time (current-inexact-milliseconds)))
-   (hash-set! sometimes-boundary-ht v proc)
-   (alert-tasks-ready)))
-
-(define (remove-event-boundary-callback! v) 
-  (atomically
-   (hash-remove! boundary-ht v)
-   (hash-remove! sometimes-boundary-ht v)
-   (alert-tasks-ready)))
-
-(define last-time -inf.0)
-(define sometimes-delay-msec 100)
-
-;; Call this function only in atomic mode:
-(define (pre-event-sync force?)
-  (let ([now (current-inexact-milliseconds)])
-    (when (or (now . > . (+ last-time sometimes-delay-msec)) 
-              force?)
-      (set! last-time now)
-      (hash-for-each sometimes-boundary-ht 
-                     (lambda (v p) (hash-remove! sometimes-boundary-ht v) (p v)))))
-  (hash-for-each boundary-ht (lambda (v p) (hash-remove! boundary-ht v) (p v)))
-  (alert-tasks-ready))
-
-;; ------------------------------------------------------------
-;; Eventspaces
-
-(define-struct eventspace (handler-thread 
-                           queue-proc 
-                           frames-hash 
-                           done-evt 
-                           [shutdown? #:mutable] 
-                           done-sema 
-                           [wait-cursor-count #:mutable]
-                           extra-table
-                           [external-modal #:mutable])
-  #:property prop:evt (lambda (v)
-                        (wrap-evt (eventspace-done-evt v)
-                                  (lambda (_) v))))
-(define-struct timed (alarm-evt msecs val [id #:mutable]))
-
-(define (make-timer-callback msecs thunk)
-  (make-timed (alarm-evt msecs)
-              msecs
-              thunk
-              0))
-
-(define (timed-compare a b)
-  (if (eq? a b)
-      0
-      (let ([am (timed-msecs a)]
-            [bm (timed-msecs b)])
-        (cond
-         [(= am bm) (if ((timed-id a) . < . (timed-id b))
-                        -1
-                        1)]
-         [(< am bm) -1]
-         [else 1]))))
-
-;; This table refers to handle threads of eventspaces
-;;  that have an open window, etc., so that the eventspace
-;;  isn't GCed
-(define active-eventspaces (make-hasheq))
-
-(define current-cb-box (make-parameter #f))
-
-(define-mz scheme_add_managed (_fun _racket ; custodian
-                                    _racket ; object
-                                    (_fun #:atomic? #t #:keep (lambda (v) (set-box! (current-cb-box) v))
-                                          _racket _racket -> _void)
-                                    _racket ; data
-                                    _int ; strong?
-                                    -> _gcpointer))
-
-(define (shutdown-eventspace! e ignored)
-  ;; atomic mode
-  (unless (eventspace-shutdown? e)
-    (set-eventspace-shutdown?! e #t)
-    (semaphore-post (eventspace-done-sema e))
-    (for ([f (in-list (get-top-level-windows e))])
-      (send f destroy))
-    (hash-remove! active-eventspaces (eventspace-handler-thread e))))
-
-(define platform-queue-sync void)
-(define (set-platform-queue-sync! proc)
-  (set! platform-queue-sync proc))
-
-(define (make-eventspace* th)
-  (let ([done-sema (make-semaphore 1)]
-        [done-set? #t]
-        [frames (make-hasheq)])
-    (let ([e
-           (make-eventspace th
-                            (let ([count 0])
-                              (let ([lo (mcons #f #f)]
-                                    [refresh (mcons #f #f)]
-                                    [med (mcons #f #f)]
-                                    [hi (mcons #f #f)]
-                                    [timer (box '())]
-                                    [timer-counter 0]
-                                    [newly-posted-sema (make-semaphore)])
-                                (let* ([check-done
-                                        (lambda ()
-                                          (if (or (positive? count)
-                                                  (positive? (hash-count frames))
-                                                  (not (null? (unbox timer))))
-                                              (when done-set?
-                                                (hash-set! active-eventspaces th #t)
-                                                (set! done-set? #f)
-                                                (semaphore-try-wait? done-sema))
-                                              (unless done-set?
-                                                (hash-remove! active-eventspaces th)
-                                                (set! done-set? #t)
-                                                (semaphore-post done-sema))))]
-                                       [enqueue (lambda (v q)
-                                                  (set! count (add1 count))
-                                                  (check-done)
-                                                  (let ([p (mcons v #f)])
-                                                    (if (mcdr q)
-                                                        (set-mcdr! (mcdr q) p)
-                                                        (set-mcar! q p))
-                                                    (set-mcdr! q p)))]
-                                       [first (lambda (q peek?)
-                                                (and (mcar q)
-                                                     (if peek?
-                                                         always-evt
-                                                         (wrap-evt
-                                                          always-evt
-                                                          (lambda (_)
-                                                            (start-atomic)
-                                                            (set! count (sub1 count))
-                                                            (check-done)
-                                                            (let ([result (mcar (mcar q))])
-                                                              (set-mcar! q (mcdr (mcar q)))
-                                                              (unless (mcar q)
-                                                                (set-mcdr! q #f))
-                                                              (end-atomic)
-                                                              result))))))]
-                                       [remove-timer
-                                        (lambda (v timer)
-                                          (set-box! timer (rbtree-remove 
-                                                           timed-compare
-                                                           v
-                                                           (unbox timer)))
-                                          (check-done))]
-                                       [timer-first-ready
-                                        (lambda (timer peek?)
-                                          (let ([rb (unbox timer)])
-                                            (and (not (null? rb))
-                                                 (let* ([v (rbtree-min (unbox timer))]
-                                                        [evt (timed-alarm-evt v)])
-                                                   (and (sync/timeout 0 evt)
-                                                        ;; It's ready
-                                                        (if peek?
-                                                            always-evt
-                                                            (wrap-evt
-                                                             always-evt
-                                                             (lambda (_)
-                                                               (start-atomic)
-                                                               (remove-timer v timer)
-                                                               (end-atomic)
-                                                               (timed-val v)))))))))]
-                                       [timer-first-wait
-                                        (lambda (timer peek?)
-                                          (let ([rb (unbox timer)])
-                                            (and (not (null? rb))
-                                                 (wrap-evt
-                                                  (timed-alarm-evt (rbtree-min (unbox timer)))
-                                                  (lambda (_) #f)))))]
-                                       [make-event-choice
-                                        (lambda (peek? sync?)
-                                          (choice-evt
-                                           (wrap-evt (semaphore-peek-evt newly-posted-sema)
-                                                     (lambda (_) #f))
-                                           (or (first hi peek?)
-                                               (timer-first-ready timer peek?)
-                                               (first refresh peek?)
-                                               (first med peek?)
-                                               (and (not peek?)
-                                                    sync?
-                                                    ;; before going with low-priority events,
-                                                    ;; make sure we're sync'ed up with the
-                                                    ;; GUI platform's event queue:
-                                                    (platform-queue-sync)
-                                                    (first med peek?))
-                                               (first lo peek?)
-                                               (timer-first-wait timer peek?)
-                                               ;; nothing else ready...
-                                               never-evt)))])
-                                  (case-lambda
-                                   [(v)
-                                    ;; Enqueue
-                                    (start-atomic)
-                                    (let ([val (cdr v)])
-                                      (case (car v)
-                                        [(lo) (enqueue val lo)]
-                                        [(refresh) (enqueue val refresh)]
-                                        [(med) (enqueue val med)]
-                                        [(hi) (enqueue val hi)]
-                                        [(timer-add) 
-                                         (set! timer-counter (add1 timer-counter))
-                                         (set-timed-id! val timer-counter)
-                                         (set-box! timer
-                                                   (rbtree-insert
-                                                    timed-compare
-                                                    val
-                                                    (unbox timer)))
-                                         (check-done)]
-                                        [(timer-remove) (remove-timer val timer)]
-                                        [(frame-add) (hash-set! frames val #t) (check-done)]
-                                        [(frame-remove) (hash-remove! frames val) (check-done)]))
-                                    (semaphore-post newly-posted-sema)
-                                    (set! newly-posted-sema (make-semaphore))
-                                    (check-done)
-                                    (end-atomic)]
-                                   [()
-                                    ;; Dequeue as evt
-                                    (start-atomic)
-                                    (begin0 
-                                     (make-event-choice #f #t)
-                                     (end-atomic))]
-                                   [(only-refresh? peek? sync?)
-                                    (start-atomic)
-                                    (begin0
-                                     (cond
-                                      [only-refresh?
-                                       ;; Dequeue only refresh event
-                                       (or (first refresh peek?) never-evt)]
-                                      [else
-                                       (make-event-choice peek? sync?)])
-                                     (end-atomic))]))))
-                            frames
-                            (semaphore-peek-evt done-sema)
-                            #f
-                            done-sema
-                            0
-                            (make-hash)
-                            0)]
-          [cb-box (box #f)])
-      (parameterize ([current-cb-box cb-box])
-        (scheme_add_managed (current-custodian) 
-                            e
-                            shutdown-eventspace!
-                            cb-box ; retain callback until it's called
-                            0))
-      e)))
-
-(define main-eventspace (make-eventspace* (current-thread)))
-(define current-eventspace (make-parameter main-eventspace))
-
-;; So we can get from a thread to the eventspace that
-;;  it handles (independent of the `current-eventspace'
-;;  parameter):
-(define handler-thread-of (make-thread-cell #f))
-(thread-cell-set! handler-thread-of main-eventspace)
-
-(define make-new-eventspace
-  (let ([make-eventspace
-         (lambda ()
-           (define pause (make-semaphore))
-           (define break-paramz (current-break-parameterization))
-           (define es
-             (make-eventspace*
-              (parameterize-break 
-               #f ; disable breaks until we're in the yield loop
-               (thread
-                (lambda ()
-                  (sync pause) ; wait until `es' has a value
-                  (thread-cell-set! handler-thread-of es)
-                  (current-eventspace es)
-                  (let loop ()
-                    (call-with-continuation-prompt
-                     (lambda ()
-                       ;; re-enable breaks (if they are supposed to be enabled):
-                       (call-with-break-parameterization
-                        break-paramz
-                        (lambda () 
-                          ;; yield; any abort (including a break exception)
-                          ;; will get caught and the loop will yield again
-                          (yield (make-semaphore))))))
-                    (loop)))))))
-           (semaphore-post pause) ; `es' has a value
-           es)])
-    make-eventspace))
-
-(define (queue-event eventspace thunk [level 'med])
-  ((eventspace-queue-proc eventspace) (cons level thunk)))
-
-(define (queue-refresh-event eventspace thunk)
-  ((eventspace-queue-proc eventspace) (cons 'refresh thunk)))
-
-(define dispatch-event-prompt (make-continuation-prompt-tag))
-(define dispatch-event-key (gensym))
-
-(define (really-dispatch-event e)
-  (let ([b (continuation-mark-set-first
-            #f
-            dispatch-event-key
-            #f
-            dispatch-event-prompt)])
-    (unless b
-      (error 'default-event-dispatch-handler
-             "not in an event-dispatch context"))
-    (let ([thunk (atomically
-                  (begin0
-                   (unbox b)
-                   (set-box! b #f)))])
-      (unless thunk
-        (error 'default-event-dispatch-handler
-               "event in current context was already dispatched"))
-      (thunk))))
-
-(define event-dispatch-handler (make-parameter really-dispatch-event))
-
-(define event-logger (make-logger 'gui-event (current-logger)))
-;; start? : boolean -- indicates if this is a start of an event being handled or not
-;; msec : start time if start? is #t, delta from start to end if start? is #f
-;; name : (or/c #f symbol?)
-(struct gui-event (start end name) #:prefab)
-
-(define (handle-event thunk e)
-  (call-with-continuation-prompt ; to delimit continuations
-   (lambda ()
-     (call-with-continuation-prompt ; to delimit search for dispatch-event-key
-      (lambda ()
-        ;; communicate the thunk to `really-dispatch-event':
-        (define before (current-inexact-milliseconds))
-        (when (log-level? event-logger 'debug)
-          (log-message event-logger 'debug 
-                       (format "starting to handle an event from ~a" (object-name thunk))
-                       (gui-event before #f (object-name thunk))))
-        (let ([b (box thunk)])
-          ;; use the event-dispatch handler:
-          (with-continuation-mark dispatch-event-key b
-            ((event-dispatch-handler) e))
-          ;; if the event-dispatch handler doesn't chain
-          ;; to the original one, then do so now:
-          (when (unbox b)
-            (set-box! b #f)
-            (thunk)))
-        (define after (current-inexact-milliseconds))
-        (when (log-level? event-logger 'debug)
-          (log-message event-logger 'debug 
-                       (format "handled an event: ~a msec"  
-                               (- after before))
-                       (gui-event before after (object-name thunk)))))
-      dispatch-event-prompt))))
-
-(define yield
-  (case-lambda
-   [() 
-    (let ([e (current-eventspace)])
-      (if (eq? (current-thread) (eventspace-handler-thread e))
-          (let ([v (sync/timeout 0 ((eventspace-queue-proc e)))])
-            (if v
-                (begin (handle-event v e) #t)
-                #f))
-          #f))]
-   [(evt)
-    (unless (or (evt? evt)
-                (eq? evt 'wait))
-      (raise-type-error 'yield "evt or 'wait" evt))
-    (let* ([e (current-eventspace)]
-           [handler? (eq? (current-thread) (eventspace-handler-thread e))])
-      (cond
-       [(and (eq? evt 'wait)
-             (not handler?))
-        #t]
-       [else
-        (define (wait-now)
-          (if handler?
-              (sync (if (eq? evt 'wait) 
-                        (wrap-evt e (lambda (_) #t))
-                        evt)
-                    (handle-evt ((eventspace-queue-proc e))
-                                (lambda (v)
-                                  (when v (handle-event v e))
-                                  (yield evt))))
-              (sync evt)))
-        (if (evt? evt)
-            ;; `yield' is supposed to return immediately if the
-            ;; event is already ready:
-            (sync/timeout wait-now evt)
-            (wait-now))]))]))
-
-(define (yield/no-sync)
-  (let ([e (current-eventspace)])
-    (when (eq? (current-thread) (eventspace-handler-thread e))
-      (let ([v (sync/timeout 0 ((eventspace-queue-proc e) #f #f #f))])
-        (if v
-            (begin (handle-event v e) #t)
-            #f)))))
-
-(define yield-refresh
-  (lambda ()
-    (let ([e (current-eventspace)])
-      (and (eq? (current-thread) (eventspace-handler-thread e))
-           (let loop ([result #f])
-             (let ([v (sync/timeout 0 ((eventspace-queue-proc e) #t #f #t))])
-               (if v
-                   (begin
-                     (handle-event v e)
-                     (loop #t))
-                   result)))))))
-
-(define (eventspace-event-evt [e (current-eventspace)])
-  (unless (eventspace? e)
-    (raise-type-error 'eventspace-event-evt "eventspace" e))
-  (wrap-evt ((eventspace-queue-proc e) #f #t #t)
-            (lambda (_) e)))
-
-(define (main-eventspace? e)
-  (eq? e main-eventspace))
-
-(define (queue-callback thunk [high? #t])
-  (let ([es (current-eventspace)])
-    (when (eventspace-shutdown? es)
-      (error 'queue-callback "eventspace is shutdown: ~e" es))
-    (queue-event es thunk (cond
-                           [(not high?) 'lo]
-                           [(eq? high? middle-queue-key) 'med]
-                           [else 'hi]))))
-
-(define middle-queue-key (gensym 'middle))
-
-
-(define (add-timer-callback cb es)
-  ;; in atomic mode
-  (queue-event es cb 'timer-add))
-(define (remove-timer-callback cb es)
-  ;; in atomic mode
-  (unless (eventspace-shutdown? es)
-    (queue-event es cb 'timer-remove)))
-
-(define (register-frame-shown f on?)
-  (queue-event (send f get-eventspace) f (if on?
-                                             'frame-add
-                                             'frame-remove)))
-
-(define (get-top-level-windows [e (current-eventspace)])
-  ;; called in event-pump thread
-  (hash-map (eventspace-frames-hash e)
-            (lambda (k v) k)))
-
-(define (other-modal? win [e #f] [ignore-win #f])
-  ;; called in atomic mode in eventspace's thread
-  (and
-   ;; deliver mouse-motion events even if a modal window
-   ;; is open
-   (or (not e)
-       (not (or (send e leaving?)
-                (send e entering?)
-                (send e moving?))))
-   ;; for any other kind of mouse or key event, deliver only
-   ;; if no model dialog is open
-   (let ([es (send win get-eventspace)])
-     (or (positive? (eventspace-external-modal es))
-         (let loop ([frames (get-top-level-windows es)]) 
-           (and (pair? frames)
-                (let ([status (if (eq? ignore-win (car frames))
-                                  #f
-                                  (send (car frames) frame-relative-dialog-status win))])
-                  (case status
-                    [(#f) (loop (cdr frames))]
-                    [(same) (loop (cdr frames))]
-                    [(other) #t]))))))))
-
-(define (eventspace-adjust-external-modal! es amt)
-  (atomically
-   (set-eventspace-external-modal! 
-    es
-    (+ (eventspace-external-modal es) amt))))
-
-(define (queue-quit-event)
-  ;; called in event-pump thread
-  (queue-event main-eventspace (application-quit-handler) 'med))
-
-(define (queue-prefs-event)
-  ;; called in event-pump thread
-  (queue-event main-eventspace (application-pref-handler) 'med))
-
-(define (queue-about-event)
-  ;; called in event-pump thread
-  (queue-event main-eventspace (application-about-handler) 'med))
-
-(define (queue-file-event file)
-  ;; called in event-pump thread
-  (queue-event main-eventspace (lambda ()
-                                 ((application-file-handler) file))
-               'med))
-
-(define (queue-start-empty-event)
-  ;; called in event-pump thread
-  (queue-event main-eventspace (application-start-empty-handler)
-               'med))
-
-(define (begin-busy-cursor) 
-  (let ([e (current-eventspace)])
-    (atomically 
-     (set-eventspace-wait-cursor-count!
-      e
-      (add1 (eventspace-wait-cursor-count e)))
-     (when (= (eventspace-wait-cursor-count e) 1)
-       (for ([e (in-list (get-top-level-windows))])
-         (send e set-wait-cursor-mode #t))))))
-
-(define (end-busy-cursor) 
-  (let ([e (current-eventspace)])
-    (atomically 
-     (set-eventspace-wait-cursor-count!
-      e
-      (sub1 (eventspace-wait-cursor-count e)))
-     (when (zero? (eventspace-wait-cursor-count e))
-       (for ([e (in-list (get-top-level-windows))])
-         (send e set-wait-cursor-mode #f))))))
-
-(define (is-busy?) (positive? (eventspace-wait-cursor-count (current-eventspace))))
-
-;; ----------------------------------------
-
-;; Before exiting, wait until frames are closed, etc.:
-(executable-yield-handler
- (let ([old-eyh (executable-yield-handler)])
-   (lambda (v)
-     (yield main-eventspace)
-     (old-eyh v))))
-
-;; When using a REPL in a thread that has an eventspace,
-;; yield to events when the port would block.
-(current-get-interaction-input-port
- (let ([orig (current-get-interaction-input-port)])
-   (lambda ()
-     (let ([e (thread-cell-ref handler-thread-of)])
-       (if e
-           (let ([filter (lambda (v)
-                           (cond
-                            [(eq? v 0) (yield) 0]
-                            [(evt? v)
-                             (parameterize ([current-eventspace e])
-                               (yield))
-                             (choice-evt v
-                                         (wrap-evt (eventspace-event-evt e)
-                                                   (lambda (_) 0)))]
-                            [else v]))])
-             (filter-read-input-port
-              (orig)
-              (lambda (str v)
-                (filter v))
-              (lambda (s skip evt v)
-                (filter v))))
-           (orig))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/rbtree.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/rbtree.rkt
deleted file mode 100644
index 884cc91bd3..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/rbtree.rkt
+++ /dev/null
@@ -1,316 +0,0 @@
-#lang racket/base
-
-;;; red-black-tree.rkt -- Jens Axel S�gaard and Carl Eastlund -- 3rd nov 2003
-
-;;; PURPOSE
-
-; This is an implementation of red/black trees, based on the galore.plt code
-
-;;; HISTORY
-
-; This is direct port of Jean-Christophe Filliatre's implementation
-; of red-black trees in Ocaml.
-
-;; 13th jan 2010 [mflatt]
-;   - simplified for incorporation into MrEd;
-;     something like this should be in `scheme', instead.
-;; 22nd jan 2004 [soegaard]
-;   - added set?
-;   - fixed bug in inter-list reported by Pinku Surana 
-;; 15th feb 2005 [soegaard]
-;   - numerous modifications to handle the case were
-;     elm= is finer than elm> and elm<
-;   - fixed serious bug in unbalanced-left
-;     (one sub tree was discarded, the other cloned)
-;  17th feb 2005 [soegaard]
-;   - fixed bug in diff-list introduced (hopefully) the 15th
-;  2nd nov 2005 [soegaard]
-;   - changed from unit to module/compare approach
-;   - renamed from red-black-tree-set.scm to raw-red-black-tree-set.scm
-;  5th apr 2006 [cce]
-;   - copied from module to class approach
-;   - renamed to red-black-tree (from raw-red-black-tree-set)
-;   - inlined the provide declaration
-;   - fixed errors in the commented contracts for empty and get
-;  2nd may 2006 [sstrickl]
-;   - fixed error in insert/combiner (replacing a black node turned it red)
-;  5th may 2006 [cce]
-;   - udpated license statement regarding permission to use LGPL v2.1
-
-;;; LICENSE
-
-;  Rbset: Sets implemented as red-black trees.
-;  Copyright (C) 2000 Jean-Christophe FILLIATRE
-; 
-;  This software is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU Library General Public
-;  License version 2, as published by the Free Software Foundation.
-;
-;  5th May 2006: Jean-Christophe Filliatre has given express written
-;  permission to redistribute and/or modify this software under the terms
-;  of any newer version of the GNU LGPL.
-; 
-;  This software is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-; 
-;  See the GNU Library General Public License version 2 for more details
-;  (enclosed in the file LGPL).
-;
-
-;; SETS IMPLEMENTED AS REB-BLACK TREES.
-
-(require racket/match
-         (for-syntax racket/base))
-(define-match-expander $
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ id pat ...) #'(struct id (pat ...))])))
-
-(define-syntax-rule (if3 v less same more)
-  (let ([x v])
-    (cond
-     [(x . < . 0) less]
-     [(x . = . 0) same]
-     [else more])))
-
-(provide rbtree-get                   ; compare element set -> element/f
-         rbtree-insert                ; compare element set -> set
-         rbtree-remove                ; compare element set -> set
-         rbtree-min                   ; set -> element
-         )
-  
-  
-;; DATA DEFINITION
-  
-;; A RED/BLACK TREE is either
-;;     1.  empty
-;; or  2.  (make-B l x r)    
-;; or  3.  (make-R l x r)
-;; where l and r are red/black trees and x is an element.
-
-(define empty '())                         ; considered black
-(define empty? null?)
-  
-(define-struct B (l x r) #:transparent)   ; Black tree
-(define-struct R (l x r) #:transparent)   ; Red tree
-;; Constructor shorthands
-(define (B- l x r) (make-B l x r))
-(define (R- l x r) (make-R l x r))
-  
-;; type predicate
-(define (red-black-tree? s)
-  (or (null? s) (B? s) (R? s)))
-
- 
-;; for debugging
-(define (->sexp t)
-  (define -> ->sexp)
-  (match t
-    ['() '()]
-    [($ B l x r) `(B ,(-> l) ,x ,(-> r))]
-    [($ R l x r) `(R ,(-> l) ,x ,(-> r))]))
-
-  
-;; INVARIANTS
-  
-;;  (* Invariants: (1) a red node has no red son, and (2) any path from the
-;;     root to a leaf has the same number of black nodes *)
-;;
-;;  (* Note the use of two constructors [Black] and [Red] to save space
-;;     (resulting in longer code at a few places, e.g. in function [remove]).
-;;     These red-black trees saves 20\% of space w.r.t Ocaml's AVL, which
-;;     store the height into a fourth argument. *)
-
-;;  type elt = Ord.t
-;;  type t = Empty | Black of t * elt * t | Red of t * elt * t
-
-;;  (*s For debug only: checks whether a tree is properly colored *)
-
-;; check : rbt -> integer
-;;   checks invariants and return black height,
-;;   if the invariants are fulfilled
-#;
-(define (check s)
-  (match s
-    ['()    0]
-    [($ R ($ R _ _ _) _ _)  (error "Red node with red parent" s)]
-    [($ R _ _ ($ R _ _ _))  (error "Red node with red parent" s)]
-    [($ B l _ r)            (let ([height-left  (check l)]
-                                  [height-right (check r)])
-                              (if (not (= height-left height-right))
-                                  (error)
-                                  (+ height-left 1)))]
-    [($ R l _ r)            (let ([height-left  (check l)]
-                                  [height-right (check r)])
-                              (if (not (= height-left height-right))
-                                  (error)
-                                  height-left))]))
-  
-;; SET OPERATIONS
-  
-(define (rbtree-get cmp x s)
-  (match s
-    ['()            #f]
-    [($ B l v r)   (if3 (cmp x v)
-                        (rbtree-get cmp x l)
-                        v
-                        (rbtree-get cmp x r))]
-    [($ R l v r)   (if3 (cmp x v)
-                        (rbtree-get cmp x l)
-                        v
-                        (rbtree-get cmp x r))]))
-  
-(define (rbtree-min s)
-  (match s
-    [($ B '() v _) v]
-    [($ R '() v _) v]
-    [($ B l _ _)  (rbtree-min l)]
-    [($ R l _ _)  (rbtree-min l)]
-    ['()          (error 'rbtree-min "an empty set does not have an mimimum element")]))
-
-;; BALANCING
-  
-(define (lbalance x1 x2 x3)
-  (let ([z x2] [d x3])
-    (match x1
-      [($ R ($ R a x b) y c)  (R- (B- a x b) y (B- c z d))]
-      [($ R a x ($ R b y c))  (R- (B- a x b) y (B- c z d))]
-      [_                      (B- x1 x2 x3)])))
-  
-(define (rbalance x1 x2 x3)
-  (let ([a x1] [x x2])
-    (match x3
-      [($ R ($ R b y c) z d)  (R- (B- a x b) y (B- c z d))]
-      [($ R b y ($ R c z d))  (R- (B- a x b) y (B- c z d))]
-      [_                      (B- x1 x2 x3)])))
-
-;; INSERTION
-  
-(define (rbtree-insert cmp x s)
-  (define (ins s)
-    (match s
-      ['()          (R- empty x empty)]
-      [($ R a y b)  (if3 (cmp x y)
-                         (R- (ins a) y b)
-                         s
-                         (R- a y (ins b)))]
-      [($ B a y b)  (if3 (cmp x y)
-                         (lbalance (ins a) y b)
-                         s
-                         (rbalance a y (ins b)))]))
-  (let ([s1 (ins s)])
-                                        ; color the root black
-    (match s1
-      [($ B _ _ _) s1]
-      [($ R a y b) (B- a y b)]
-      ['()         (error)])))
-  
-;; REMOVAL
-  
-;;  (* [unbalanced_left] repares invariant (2) when the black height of the
-;;     left son exceeds (by 1) the black height of the right son *)
-;; [original spelling kept -- a quote is a quote ]
-  
-(define (unbalanced-left s)
-  (match s
-    [($ R ($ B t1 x1 t2) x2 t3)              (values (lbalance (R- t1 x1 t2) x2 t3) #f)]
-    [($ B ($ B t1 x1 t2) x2 t3)              (values (lbalance (R- t1 x1 t2) x2 t3) #t)]
-    [($ B ($ R t1 x1 ($ B t2 x2 t3)) x3 t4)  (values (B- t1 x1 (lbalance (R- t2 x2 t3) x3 t4)) #f)]
-    [_                                       (error 'unbalanced-left
-                                                    (format "Black height of both sons were the same: ~a"
-                                                            (->sexp s)))]))
-  
-;;  (* [unbalanced_right] repares invariant (2) when the black height of the
-;;     right son exceeds (by 1) the black height of the left son *)
-
-(define (unbalanced-right s)
-  (match s
-    [($ R t1 x1 ($ B t2 x2 t3))             (values (rbalance t1 x1 (R- t2 x2 t3)) #f)]
-    [($ B t1 x1 ($ B t2 x2 t3))             (values (rbalance t1 x1 (R- t2 x2 t3)) #t)]
-    [($ B t1 x1 ($ R ($ B t2 x2 t3) x3 t4)) (values (B- (rbalance t1 x1 (R- t2 x2 t3)) x3 t4) #f)]
-    [_                                      (error 'unbalanced-right 
-                                                   (format "Black height of both sons were the same: ~a"
-                                                           (->sexp s)))]))
-  
-  
-
-;;  (* [remove_min s = (s',m,b)] extracts the minimum [m] of [s], [s'] being the
-;;     resulting set, and indicates with [b] whether the black height has
-;;     decreased *)
-
-(define (remove-min s)
-  (match s
-    ['()                         (error "remove-min: Called on empty set")]
-    ;;  minimum is reached
-    [($ B '() x '())           (values empty x #t)]
-    [($ B '() x ($ R l y r))  (values (B- l y r) x #f)]
-    [($ B '() _ ($ B _ _ _))  (error)]
-    [($ R '() x r)            (values r x #f)]
-    ;; minimum is recursively extracted from [l]
-    [($ B l x r)                (let-values ([(l1 m d) (remove-min l)])
-                                  (let ([t (B- l1 x r)])
-                                    (if d
-                                        (let-values ([(t d1) (unbalanced-right t)])
-                                          (values t m d1))
-                                        (values t m #f))))]
-    [($ R l x r)                (let-values ([(l1 m d) (remove-min l)])
-                                  (let ([t (R- l1 x r)])
-                                    (if d
-                                        (let-values ([(t d1) (unbalanced-right t)])
-                                          (values t m d1))
-                                        (values t m #f))))]))
-
-
-(define (blackify s)
-  (match s
-    [($ R l x r)  (values (B- l x r) #f)]
-    [_            (values s #t)]))
-
-;;  (* [remove_aux x s = (s',b)] removes [x] from [s] and indicates with [b]
-;;     whether the black height has decreased *)
-  
-(define (rbtree-remove cmp x s)
-  (define (remove-aux s)
-    (match s
-      ['()          (values empty #f)]
-      [($ B l y r)  (if3 (cmp x y)
-                         (let-values ([(l1 d) (remove-aux l)])
-                           (let ([t (B- l1 y r)])
-                             (if d
-                                 (unbalanced-right t)
-                                 (values t #f))))
-                         
-                         (match r
-                           ['()   (blackify l)]
-                           [_     (let-values ([(r1 m d) (remove-min r)])
-                                    (let ([t (B- l m r1)])
-                                      (if d
-                                          (unbalanced-left t)
-                                          (values t #f))))])
-                         
-                         (let-values ([(r1 d) (remove-aux r)])
-                           (let ([t (B- l y r1)])
-                             (if d
-                                 (unbalanced-left t)
-                                 (values t #f)))))]
-      [($ R l y r)  (if3 (cmp x y)
-                         (let-values ([(l1 d) (remove-aux l)])
-                           (let ([t (R- l1 y r)])
-                             (if d
-                                 (unbalanced-right t)
-                                 (values t #f))))
-                         (match r
-                           ['()  (values l #f)]
-                           [_    (let-values ([(r1 m d) (remove-min r)])
-                                   (let ([t (R- l m r1)])
-                                     (if d
-                                         (unbalanced-left t)
-                                         (values t #f))))])
-                         (let-values ([(r1 d) (remove-aux r)])
-                           (let ([t (R- l y r1)])
-                             (if d
-                                 (unbalanced-left t)
-                                 (values t #f)))))]))
-  (let-values ([(s1 ignore) (remove-aux s)])
-    s1))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/timer.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/timer.rkt
deleted file mode 100644
index 289eb65196..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/timer.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang racket/base
-(require racket/class
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "queue.rkt")
-
-(provide timer%)
-
-;; FIXME: need checks
-(defclass timer% object%
-  (init [notify-callback void]
-        [(ival interval) #f]
-        [just-once? #f])
-  (define notify-cb notify-callback)
-  (define current-interval ival)
-  (define current-once? (and just-once? #t))
-  (define cb #f)
-  (define es (current-eventspace))
-
-  (when (eventspace-shutdown? es)
-    (error (method-name 'timer% 'start) "current eventspace is shutdown: ~e" es))
-
-  (def/public (interval) current-interval)
-  (define/private (do-start msec once?)
-    (as-entry
-     (lambda ()
-       (do-stop)
-       (when (eventspace-shutdown? es)
-         (error (method-name 'timer% 'start) "current eventspace is shutdown: ~e" es))
-       (set! current-interval msec)
-       (set! current-once? (and once? #t))
-       (letrec ([new-cb
-                 (make-timer-callback (+ msec (current-inexact-milliseconds))
-                                      (lambda ()
-                                        (when (eq? cb new-cb)
-                                          (notify)
-                                          (as-entry
-                                           (lambda ()
-                                             (unless once?
-                                               (when (eq? cb new-cb)
-                                                 (do-start msec #f))))))))])
-         (set! cb new-cb)
-         (add-timer-callback new-cb es)))))
-  (def/public (start [(integer-in 0 1000000000) msec] [any? [once? #f]])
-    (do-start msec once?))
-  (define/private (do-stop)
-    (as-entry
-     (lambda ()
-       (when cb
-         (remove-timer-callback cb es)
-         (set! cb #f)))))
-  (def/public (stop) (do-stop))
-  (def/public (notify) (notify-cb) (void))
-  (super-new)
-  (when ival
-    (start ival just-once?)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/utils.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/utils.rkt
deleted file mode 100644
index 2fcf5748b6..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/common/utils.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         ffi/unsafe/atomic
-         "once.rkt")
-
-(provide (protect-out define-mz
-
-                      remember-to-free-later
-                      free-remembered-now))
-
-(define-ffi-definer define-mz #f)
-
-;; ----------------------------------------
-
-(define to-free null)
-
-;; Remember to free an object that might currently be in use during a
-;; callback:
-(define (remember-to-free-later o)
-  (start-atomic) 
-  (set! to-free (cons o to-free))
-  (end-atomic))
-
-;; Called outside the event loop to actually free objects that might
-;; otherwise be in use during a callback:
-(define (free-remembered-now free)
-  (start-atomic)
-  (for ([o (in-list (begin0
-                     to-free
-                     (set! to-free null)))])
-    (free o))
-  (end-atomic))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/README.txt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/README.txt
deleted file mode 100644
index 2f55c326d2..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/README.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Allocation rules:
-
- * Use `as-gtk-allocation' when creating a Gtk widget that is the main
-   container for a given window<%> object. When the resulting
-   reference becomes unreachable, the widget will be released with
-   gtk_widget_destroy() through a finalizer.
-
- * Use `atomically' to create and attach a sub-widget within the main
-   widget.  Don't use gtk_widget_destroy(); the containing widget will
-   destroy the enclosing widget.
-
- * For temporary objects, use `atomically' to wrap both the allocation
-   and release.
-
-Every call to a function whose name contains "new" needs to be in one
-of those cases.
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/button.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/button.rkt
deleted file mode 100644
index 957f90dbad..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/button.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-          "../../syntax.rkt"
-          "../../lock.rkt"
-         "item.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "window.rkt"
-         "const.rkt"
-         "pixbuf.rkt"
-         "message.rkt"
-         "../common/event.rkt")
-
-(provide 
- (protect-out button%
-              button-core%))
-
-;; ----------------------------------------
-
-(define-gtk gtk_button_new_with_mnemonic (_fun _string -> _GtkWidget))
-(define-gtk gtk_button_new (_fun -> _GtkWidget))
-(define-gtk gtk_window_set_default (_fun _GtkWidget (_or-null _GtkWidget) -> _void))
-(define-gtk gtk_button_set_label (_fun _GtkWidget _string -> _void))
-(define-gtk gtk_button_set_image (_fun _GtkWidget _GtkWidget -> _void))
-(define-gtk gtk_button_set_image_position (_fun _GtkWidget _int -> _void))
-
-(define GTK_POS_LEFT 0)
-(define GTK_POS_RIGHT 1)
-(define GTK_POS_TOP 2)
-(define GTK_POS_BOTTOM 3)
-
-(define-gtk gtk_container_remove (_fun _GtkWidget _GtkWidget -> _void))
-(define-gtk gtk_bin_get_child (_fun _GtkWidget -> _GtkWidget))
-
-(define _GtkSettings (_cpointer 'GtkSettings))
-(define-gtk gtk_settings_get_default (_fun -> _GtkSettings))
-(define-gobj g_object_set/boolean 
-  (_fun _GtkSettings _string _gboolean (_pointer = #f) -> _void)
-  #:c-id g_object_set)
-(define (force-button-images-on gtk)
-  ;; Globally turning on button images isn't really the right thing.
-  ;; Is there a way to enable image just for the widget `gtk'?
-  (g_object_set/boolean (gtk_settings_get_default) "gtk-button-images" #t))
-
-(define-signal-handler connect-clicked "clicked"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx queue-clicked)))))
-
-(defclass button-core% item%
-  (init parent cb label x y w h style font
-        [gtk_new_with_mnemonic gtk_button_new_with_mnemonic]
-        [gtk_new gtk_button_new])
-  (init-field [event-type 'button])
-  (inherit get-gtk get-client-gtk set-auto-size is-window-enabled?
-           get-window-gtk)
-
-  (super-new [parent parent]
-             [gtk (cond
-                   [(or (string? label) (not label))
-                    (as-gtk-allocation
-                     (gtk_new_with_mnemonic (or (mnemonic-string label) "")))]
-                   [else
-                    (let ([pixbuf (bitmap->pixbuf (if (pair? label) 
-                                                      (car label)
-                                                      label))])
-                      (atomically
-                       (let ([gtk (if (pair? label)
-                                      (as-gtk-allocation (gtk_new_with_mnemonic (cadr label)))
-                                      (as-gtk-allocation (gtk_new)))]
-                             [image-gtk (gtk_image_new_from_pixbuf pixbuf)])
-                         (release-pixbuf pixbuf)
-                         (if (pair? label)
-                             (begin
-			       (force-button-images-on gtk)
-			       (gtk_button_set_image gtk image-gtk)
-                               (gtk_button_set_image_position 
-                                gtk
-                                (case (caddr label)
-                                  [(left) GTK_POS_LEFT]
-                                  [(right) GTK_POS_RIGHT]
-                                  [(top) GTK_POS_TOP]
-                                  [(bottom) GTK_POS_BOTTOM])))
-                             (begin
-                               (gtk_container_add gtk image-gtk)
-                               (gtk_widget_show image-gtk)))
-                         gtk)))])]
-             [callback cb]
-             [font font]
-             [no-show? (memq 'deleted style)])
-  (define gtk (get-gtk))
-
-  (define both-labels? (pair? label))
-  
-  (when (eq? event-type 'button)
-    (set-gtk-object-flags! gtk (bitwise-ior (get-gtk-object-flags gtk)
-                                            GTK_CAN_DEFAULT)))
-
-  (set-auto-size)
-  
-  (connect-clicked gtk)
-
-  (when (memq 'border style) (set-border #t))
-
-  (define callback cb)
-  (define/public (clicked)
-    (when (is-window-enabled?)
-      (callback this (new control-event%
-                          [event-type event-type]
-                          [time-stamp (current-milliseconds)]))))
-  (define/public (queue-clicked)
-    ;; Called from event-handling thread
-    (queue-window-event this (lambda () (clicked))))
-
-  (define/override (get-label-gtk)
-    (gtk_bin_get_child (get-client-gtk)))
-
-  (define the-font font)
-  (define/override (set-label s)
-    (cond
-     [(string? s)
-      (gtk_button_set_label gtk (mnemonic-string s))
-      (when the-font (install-control-font (get-label-gtk) the-font))]
-     [else
-      (let ([pixbuf (bitmap->pixbuf s)])
-        (atomically
-         (let ([image-gtk (gtk_image_new_from_pixbuf pixbuf)])
-           (release-pixbuf pixbuf)
-           (if both-labels?
-               (gtk_button_set_image gtk image-gtk)
-               (begin
-                 (gtk_container_remove gtk (gtk_bin_get_child gtk))
-                 (gtk_container_add gtk image-gtk)
-                 (gtk_widget_show image-gtk))))))]))
-
-  (define/public (set-border on?)
-    (gtk_window_set_default (get-window-gtk) (if on? gtk #f))))
-
-(defclass button% button-core%
-  (super-new))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/canvas.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/canvas.rkt
deleted file mode 100644
index afc5348d95..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/canvas.rkt
+++ /dev/null
@@ -1,835 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         racket/draw
-         ffi/unsafe/alloc
-         (except-in racket/draw/private/color
-                    color% make-color)
-         racket/draw/private/local
-         "../common/backing-dc.rkt"
-         "../common/canvas-mixin.rkt"
-         "../../syntax.rkt"
-	 "../../lock.rkt"
-         "../common/event.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt"
-         "window.rkt"
-         "client-window.rkt"
-         "widget.rkt"
-         "dc.rkt"
-         "gl-context.rkt"
-         "combo.rkt"
-         "pixbuf.rkt"
-         "gcwin.rkt"
-         "panel.rkt")
-
-(provide 
- (protect-out canvas%
-              canvas-panel%))
-
-;; ----------------------------------------
-
-(define-gobj g_object_freeze_notify (_fun _GtkWidget -> _void))
-(define-gobj g_object_thaw_notify (_fun _GtkWidget -> _void))
-
-(define-gobj g_object_set_double (_fun _GtkWidget _string _double* (_pointer = #f) -> _void)
-  #:c-id g_object_set)
-(define-gobj g_object_get_double (_fun _GtkWidget _string (r : (_ptr o _double)) (_pointer = #f) 
-				       -> _void -> r)
-  #:c-id g_object_get)
-
-(define-gtk gtk_drawing_area_new (_fun -> _GtkWidget))
-
-(define-gtk gtk_combo_box_entry_new_text (_fun -> _GtkWidget))
-(define-gtk gtk_combo_box_append_text (_fun _GtkWidget _string -> _void))
-(define-gtk gtk_combo_box_remove_text (_fun _GtkWidget _int -> _void))
-(define-gtk gtk_combo_box_popup (_fun _GtkWidget -> _void))
-
-(define-gtk gtk_widget_queue_draw (_fun _GtkWidget -> _void))
-
-(define-gtk gtk_fixed_set_has_window (_fun _GtkWidget _gboolean -> _void))
-
-(define-gtk gtk_hscrollbar_new (_fun _pointer -> _GtkWidget))
-(define-gtk gtk_vscrollbar_new (_fun _pointer -> _GtkWidget))
-
-(define-gtk gtk_widget_set_double_buffered (_fun _GtkWidget _gboolean -> _void))
-
-(define _GtkAdjustment _GtkWidget) ; no, actually a GtkObject
-(define-gtk gtk_adjustment_new (_fun _double* _double* _double* _double* _double* _double* -> _GtkAdjustment))
-(define-gtk gtk_adjustment_configure (_fun _GtkAdjustment _double* _double* _double* _double* _double* _double* -> _void)
-  #:fail (lambda ()
-	   ;; This by-hand version doesn't produce quite the same notifications.
-	   (lambda (gtk value lower upper step-inc page-inc page-size)
-	     (atomically
-              (g_object_freeze_notify gtk)
-              (g_object_set_double gtk "lower" lower)
-              (g_object_set_double gtk "upper" upper)
-              (g_object_set_double gtk "step-increment" step-inc)
-              (g_object_set_double gtk "page-increment" page-inc)
-              (g_object_set_double gtk "page-size" page-size)
-              (let ([value (max lower (min value (- upper page-size)))])
-                (gtk_adjustment_set_value gtk value))
-              (g_object_thaw_notify gtk)))))
-(define-gtk gtk_adjustment_get_value (_fun _GtkAdjustment -> _double*))
-(define-gtk gtk_adjustment_set_value (_fun _GtkAdjustment _double* -> _void))
-(define-gtk gtk_adjustment_get_upper (_fun _GtkAdjustment -> _double*)
-  #:fail (lambda ()
-	   (lambda (gtk)
-	     (g_object_get_double gtk "upper"))))
-(define-gtk gtk_adjustment_set_upper (_fun _GtkAdjustment _double* -> _void)
-  #:fail (lambda ()
-	   (lambda (gtk upper)
-	     (g_object_set_double gtk "upper" upper))))
-(define-gtk gtk_adjustment_get_page_size (_fun _GtkAdjustment -> _double*)
-  #:fail (lambda ()
-	   (lambda (gtk)
-	     (g_object_get_double gtk "page-size"))))
-(define-gtk gtk_adjustment_set_page_size (_fun _GtkAdjustment _double* -> _void)
-  #:fail (lambda ()
-	   (lambda (gtk page-size)
-	     (g_object_set_double gtk "page-size" page-size))))
-(define-gtk gtk_adjustment_get_page_increment (_fun _GtkAdjustment -> _double*)
-  #:fail (lambda ()
-	   (lambda (gtk)
-	     (g_object_get_double gtk "page-increment"))))
-(define-gtk gtk_adjustment_set_page_increment (_fun _GtkAdjustment _double* -> _void)
-  #:fail (lambda ()
-	   (lambda (gtk page-inc)
-	     (g_object_set_double gtk "page-increment" page-inc))))
-
-(define-gtk gtk_container_remove (_fun _GtkWidget _GtkWidget -> _void))
-(define-gtk gtk_bin_get_child (_fun _GtkWidget -> _GtkWidget))
-
-(define-gobj g_object_set_bool (_fun _GtkWidget _string _gboolean [_pointer = #f] -> _void)
-  #:c-id g_object_set)
-
-(define _GtkIMContext (_cpointer 'GtkIMContext))
-(define-gtk gtk_im_multicontext_new (_fun -> _GtkIMContext))
-(define-gtk gtk_im_context_set_use_preedit (_fun _GtkIMContext _gboolean -> _void))
-(define-gtk gtk_im_context_focus_in (_fun _GtkIMContext -> _void))
-(define-gtk gtk_im_context_focus_out (_fun _GtkIMContext -> _void))
-(define-gtk gtk_im_context_filter_keypress (_fun _GtkIMContext _GdkEventKey-pointer -> _gboolean))
-(define-gtk gtk_im_context_set_client_window (_fun _GtkIMContext _GdkWindow -> _void))
-(define-gtk gtk_im_context_set_cursor_location (_fun _GtkIMContext _GdkRectangle-pointer -> _void))
-
-(define im-string-result #f)
-(define im-filtering? #f)
-(define im-canvas #f)
-
-(define-signal-handler connect-commit "commit"
-  (_fun _GtkIMContext _string -> _void)
-  (lambda (im str)
-    (cond
-     [im-filtering?
-      ;; filtering an event => we can handle the string
-      ;; result directly
-      (set! im-string-result str)]
-     [(and im-canvas
-	   (weak-box-value im-canvas))
-      ;; not filtering, but there's a target canvas =>
-      ;; queue a made-up key press event for each character
-      ;; of the string
-      => (lambda (wx)
-	   (for ([c (in-string str)])
-	     (let ([e (new key-event%
-			   [key-code c]
-			   [shift-down #f]
-			   [control-down #f]
-			   [meta-down #f]
-			   [alt-down #f]
-			   [x 0]
-			   [y 0]
-			   [time-stamp 0]
-			   [caps-down #f])])
-	       (queue-window-event wx (lambda () 
-					(send wx dispatch-on-char e #f))))))])))
-
-(define im (gtk_im_multicontext_new))
-(void (connect-commit (cast im _pointer _GtkWidget)))
-
-(gtk_im_context_set_use_preedit im #f)
-
-;; We rely some on the implementation of GtkComboBoxEntry to replace
-;; the drawing routine.
-(define-cstruct _GList ([data _pointer]))
-(define-gdk gdk_window_get_children (_fun _pointer -> _GList-pointer/null))
-(define-gdk gdk_window_hide (_fun _pointer -> _void))
-(define (get-subwindow gtk)
-  (let* ([win (widget-window gtk)]
-         [subs (gdk_window_get_children win)])
-    (if subs
-        (GList-data subs)
-        win)))
-
-(define-signal-handler connect-changed "changed"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx combo-maybe-clicked)))))
-
-(define-gtk gtk_combo_box_set_active (_fun _GtkWidget _int -> _void))
-(define-gtk gtk_combo_box_get_active (_fun _GtkWidget -> _int))
-(define-gtk gtk_combo_box_set_button_sensitivity (_fun _GtkWidget _int -> _void)
-  #:fail (lambda () 
-	   ;; Not available? Too bad. A combo-field% will in rare
-	   ;;  cases not be enabled as it should be.
-	   (lambda (w m) (void))))
-(define GTK_SENSITIVITY_ON 1)
-
-(define-signal-handler connect-expose "expose-event"
-  (_fun _GtkWidget _GdkEventExpose-pointer -> _gboolean)
-  (lambda (gtk event)
-    (let ([wx (gtk->wx gtk)])
-      (if wx
-          (begin
-            (unless (send wx paint-or-queue-paint)
-              (let ([gc (send wx get-canvas-background-for-clearing)])      
-                (when gc
-                  (gdk_draw_rectangle (widget-window gtk) gc #t
-                                      0 0 32000 32000)
-                  (gdk_gc_unref gc))))
-            (not (send wx is-panel?)))
-          #f))))
-
-(define-signal-handler connect-value-changed-h "value-changed"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (do-value-changed gtk 'horizontal)))
-
-(define-signal-handler connect-value-changed-v "value-changed"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (do-value-changed gtk 'vertical)))
-
-(define-signal-handler connect-unrealize "unrealize"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx unrealize)))))
-
-(define-signal-handler connect-unmap "unmap"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx unrealize)))))
-
-(define (do-value-changed gtk dir)
-  (let ([wx (gtk->wx gtk)])
-    (when wx
-      (when (send wx deliver-scroll-callbacks?)
-        (queue-window-event wx (lambda () 
-                                 (send wx do-scroll dir)
-                                 (flush-display))))))
-  #t)
-
-(define canvas%
-  (canvas-mixin
-   (class (canvas-autoscroll-mixin (client-size-mixin window%))
-     (init parent
-           x y w h
-           style
-           [ignored-name #f]
-           [gl-config #f])
-
-     (inherit get-gtk get-size get-client-size 
-              get-top-win
-              set-auto-size 
-              adjust-client-delta infer-client-delta
-              is-auto-scroll? is-disabled-scroll?
-              get-virtual-width get-virtual-height
-              refresh-for-autoscroll refresh-all-children
-	      reset-auto-scroll
-              get-eventspace
-	      register-extra-gtk)
-
-     (define is-combo? (memq 'combo style))
-     (define has-border? (or (memq 'border style)
-                             (memq 'control-border style)))
-
-     (define margin (if has-border? 1 0))
-
-     (define-values (client-gtk container-gtk gtk 
-                                hscroll-adj vscroll-adj hscroll-gtk vscroll-gtk resize-box
-                                combo-button-gtk
-                                scroll-width)
-       (atomically ;; need to connect all children to gtk to avoid leaks
-        (cond
-         [(or (memq 'hscroll style)
-              (memq 'auto-hscroll style)
-              (memq 'vscroll style)
-              (memq 'auto-vscroll style))
-          (let* ([client-gtk (if (is-panel?)
-                                 (gtk_fixed_new)
-                                 (gtk_drawing_area_new))]
-                 [container-gtk (if (is-panel?)
-                                    (gtk_fixed_new)
-                                    client-gtk)]
-                 [hadj (gtk_adjustment_new 0.0 0.0 1.0 1.0 1.0 1.0)]
-                 [vadj (gtk_adjustment_new 0.0 0.0 1.0 1.0 1.0 1.0)]
-                 [hs? (or (memq 'hscroll style)
-                          (memq 'auto-hscroll style))]
-                 [vs? (or (memq 'vscroll style)
-                          (memq 'auto-vscroll style))])
-            (let ([h (as-gtk-allocation (gtk_hbox_new #f 0))]
-                  [v (gtk_vbox_new #f 0)]
-                  [v2 (gtk_vbox_new #f 0)]
-                  [h2 (gtk_vbox_new #f 0)]
-                  [hscroll (gtk_hscrollbar_new hadj)]
-                  [vscroll (gtk_vscrollbar_new vadj)]
-                  [resize-box (gtk_drawing_area_new)])
-              ;; |------------------------------------|
-              ;; | h |-----------------| |-----------||
-              ;; |   | v               | | v2        ||
-              ;; |   |                 | | [vscroll] ||
-              ;; |   | [h2 [hscroll]]  | | [resize]  ||
-              ;; |   |-----------------| |-----------|| 
-              ;; |------------------------------------|
-              (unless (eq? client-gtk container-gtk)
-                (gtk_fixed_set_has_window client-gtk #t)) ; imposes clipping
-              (when has-border?
-                (gtk_container_set_border_width h margin)
-                (connect-expose-border h))
-              (gtk_box_pack_start h v #t #t 0)
-              (gtk_box_pack_start v client-gtk #t #t 0)
-              (gtk_box_pack_start h v2 #f #f 0)
-              (gtk_box_pack_start v2 vscroll #t #t 0)
-              (gtk_box_pack_start v h2 #f #f 0)
-              (gtk_box_pack_start h2 hscroll #t #t 0)
-              (gtk_box_pack_start v2 resize-box #f #f 0)
-              (when hs?
-                (gtk_widget_show hscroll))
-              (gtk_widget_show vscroll)
-              (gtk_widget_show h)
-              (gtk_widget_show v)
-              (when vs?
-                (gtk_widget_show v2))
-              (gtk_widget_show h2)
-              (when hs?
-                (gtk_widget_show resize-box))
-              (gtk_widget_show client-gtk)
-              (unless (eq? client-gtk container-gtk)
-                (gtk_container_add client-gtk container-gtk)
-                (gtk_widget_show container-gtk))
-              (let ([req (make-GtkRequisition 0 0)])
-                (gtk_widget_size_request vscroll req)
-                (values client-gtk container-gtk h hadj vadj 
-                        (and hs? h2)
-                        (and vs? v2)
-                        (and hs? vs? resize-box)
-                        #f
-                        (GtkRequisition-width req)))))]
-         [is-combo?
-          (let* ([gtk (as-gtk-allocation (gtk_combo_box_entry_new_text))]
-                 [orig-entry (gtk_bin_get_child gtk)])
-	    (gtk_combo_box_set_button_sensitivity gtk GTK_SENSITIVITY_ON)
-            (values orig-entry gtk gtk #f #f #f #f #f (extract-combo-button gtk) 0))]
-         [has-border?
-          (let ([client-gtk (gtk_drawing_area_new)]
-                [h (as-gtk-allocation (gtk_hbox_new #f 0))])
-            (gtk_box_pack_start h client-gtk #t #t 0)
-            (gtk_container_set_border_width h margin)
-            (connect-expose-border h)
-            (gtk_widget_show client-gtk)
-            (values client-gtk client-gtk h #f #f #f #f #f #f 0))]
-         [else
-          (let ([client-gtk (as-gtk-allocation (gtk_drawing_area_new))])
-            (values client-gtk client-gtk client-gtk #f #f #f #f #f #f 0))])))
-
-     (define for-gl? (memq 'gl style))
-     (when for-gl?
-       (prepare-widget-gl-context client-gtk gl-config)
-       (gtk_widget_set_double_buffered client-gtk #f))
-
-     (define dc #f)
-
-     (super-new [parent parent]
-                [gtk gtk]
-                [client-gtk client-gtk]
-                [no-show? (memq 'deleted style)]
-                [extra-gtks (append
-                             (if (eq? client-gtk container-gtk)
-                                 null
-                                 (list container-gtk))
-                             (if (eq? client-gtk gtk)
-                                 null
-                                 (if hscroll-adj
-                                     (list client-gtk hscroll-adj vscroll-adj)
-                                     (if combo-button-gtk
-                                         (list client-gtk combo-button-gtk)
-                                         (list client-gtk)))))])
-
-     (define/private (check-combo)
-       (when is-combo?
-	 (set! combo-button-gtk (re-extract-combo-button gtk combo-button-gtk this))))
-
-     (set-size x y w h)
-
-     (define/override (set-size x y w h)
-       (super set-size x y w h)
-       (when (and (is-auto-scroll?)
-                  (not (is-panel?)))
-         (reset-auto-scroll))
-       (on-size))
-     
-     (set! dc (new dc% [canvas this] [transparent? (memq 'transparent style)]))
-
-     (gtk_widget_realize gtk)
-     (gtk_widget_realize client-gtk)
-
-     (when resize-box 
-       (let ([r (make-GtkRequisition 0 0)])
-         (gtk_widget_size_request hscroll-gtk r)
-         (gtk_widget_set_size_request resize-box 
-                                      (GtkRequisition-height r)
-                                      (GtkRequisition-height r))))
-
-     (connect-expose client-gtk)
-     #;(gtk_widget_set_double_buffered client-gtk #f)
-     (connect-key-and-mouse client-gtk)
-     (connect-focus client-gtk)
-     (gtk_widget_add_events client-gtk (bitwise-ior GDK_KEY_PRESS_MASK
-                                                    GDK_KEY_RELEASE_MASK
-                                                    GDK_BUTTON_PRESS_MASK
-                                                    GDK_BUTTON_RELEASE_MASK
-                                                    GDK_POINTER_MOTION_MASK
-                                                    GDK_FOCUS_CHANGE_MASK
-                                                    GDK_ENTER_NOTIFY_MASK
-                                                    GDK_LEAVE_NOTIFY_MASK))
-     (unless (or (memq 'no-focus style)
-                 (is-panel?))
-       (set-gtk-object-flags! client-gtk (bitwise-ior (get-gtk-object-flags client-gtk)
-                                                      GTK_CAN_FOCUS)))
-     (check-combo)
-     (when combo-button-gtk
-       (connect-combo-key-and-mouse combo-button-gtk))
-     (connect-unrealize client-gtk)
-     (connect-unmap client-gtk)
-
-     (when hscroll-adj (connect-value-changed-h hscroll-adj))
-     (when vscroll-adj (connect-value-changed-v vscroll-adj))
-
-     (set-auto-size)
-     (adjust-client-delta (+ (* 2 margin) 
-                             (if (or (memq 'vscroll style)
-                                     (memq 'auto-vscroll style))
-                                 scroll-width
-                                 0))
-                          (+ (* 2 margin) 
-                             (if (or (memq 'hscroll style)
-                                     (memq 'auto-hscroll style))
-                                 scroll-width
-                                 0)))
-
-     (define/public (is-panel?) #f)
-
-     ;; Direct update is ok for a canvas, and it
-     ;; allows pushing updates to the screen even
-     ;; if the eventspace thread is busy indefinitely
-     (define/override (direct-update?) #t)
-
-     (define/public (get-dc) dc)
-
-     (define/public (make-compatible-bitmap w h)
-       (send dc make-backing-bitmap w h))
-
-     (define/override (get-client-gtk) client-gtk)
-     (define/override (get-container-gtk) container-gtk)
-     (define/override (handles-events? gtk) (not (ptr-equal? gtk combo-button-gtk)))
-
-     (define/override (internal-pre-on-event gtk e)
-       (if (and (ptr-equal? gtk combo-button-gtk)
-                (send e button-down?))
-           (begin
-             (on-popup)
-             #t)
-           #f))
-     (define/public (popup-combo)
-       ;; Unfortunately, the user has to hold the mouse 
-       ;; button down when popping up the menu this way,
-       ;; whereas the default handler (that we subvert in
-       ;; `internal-pre-on-event') keeps the menu open if
-       ;; the user release the mouse button right away.
-       (gtk_combo_box_popup gtk))
-
-     (define/override (get-client-delta)
-       (values margin margin))
-
-     ;; The `queue-paint' and `paint-children' methods
-     ;; are defined by `canvas-mixin' from ../common/canvas-mixin
-     (define/public (queue-paint) (void))
-     (define/public (request-canvas-flush-delay)
-       (request-flush-delay (get-flush-window)))
-     (define/public (cancel-canvas-flush-delay req)
-       (cancel-flush-delay req))
-     (define/public (queue-canvas-refresh-event thunk)
-       (queue-window-refresh-event this thunk))
-     (define/public (skip-pre-paint?) #f)
-
-     (define/public (paint-or-queue-paint)
-       ;; in atomic mode
-       (if for-gl?
-	   (queue-paint)
-	   (or (do-canvas-backing-flush #f)
-	       (begin
-		 (queue-paint)
-		 #f))))
-
-     ;; overridden to extend for scheduled periodic flushes:
-     (define/public (schedule-periodic-backing-flush)
-       (void))
-     (define/public (do-canvas-backing-flush ctx)
-       (do-backing-flush this dc (if is-combo?
-                                     (get-subwindow client-gtk)
-                                     (widget-window client-gtk))))
-
-     (define/public (on-paint) (void))
-
-     (define flush-win-box (mcons #f 0))
-     (define/public (get-flush-window) 
-       (atomically
-	(if (zero? (bitwise-and (get-gtk-object-flags client-gtk) 
-				GTK_MAPPED))
-	    (mcons #f #f)
-	    (if (win-box-valid? flush-win-box)
-		flush-win-box
-		(begin
-		  (set! flush-win-box (window->win-box (widget-window client-gtk)))
-		  flush-win-box)))))
-     (define/public (unrealize)
-       (unrealize-win-box flush-win-box))
-
-     (define/public (begin-refresh-sequence)
-       (send dc suspend-flush))
-     (define/public (end-refresh-sequence)
-       (send dc resume-flush))
-
-     ;; The `flush' method should be improved to flush local
-     ;; to the enclosing frame, instead of flushing globally.
-     (define/public (flush)
-       (flush-display))
-
-     (define/private (refresh-one)
-       (queue-paint))
-     (define/override (refresh)
-       (refresh-one)
-       (refresh-all-children))
-
-     (define/public (queue-backing-flush)
-       ;; called atomically
-       (unless for-gl?
-         (gtk_widget_queue_draw client-gtk)))
-     
-     (define/override (reset-child-dcs)
-       (when (dc . is-a? . dc%)
-         (reset-dc)))
-
-     (send dc start-backing-retained)
-
-     (define/private (reset-dc)
-       (send dc reset-backing-retained)
-       (refresh-one)
-       (send dc set-auto-scroll
-             (if (get-virtual-width)
-                 (gtk_adjustment_get_value hscroll-adj)
-                 0)
-             (if (get-virtual-height)
-                 (gtk_adjustment_get_value vscroll-adj)
-                 0)))
-
-     (define/override (internal-on-client-size w h)
-       (reset-dc))
-     (define/override (on-client-size w h) 
-       (on-size))
-
-     ;; this `on-size' method is for `editor-canvas%', only:
-     (define/public (on-size) (void))
-
-     (define/public (show-scrollbars h? v?)
-       (when hscroll-gtk
-         (if h?
-             (gtk_widget_show hscroll-gtk)
-             (gtk_widget_hide hscroll-gtk)))
-       (when vscroll-gtk
-         (if v?
-             (gtk_widget_show vscroll-gtk)
-             (gtk_widget_hide vscroll-gtk)))
-       (when (and hscroll-gtk vscroll-gtk)
-         (cond
-          [(and v? h?)
-           (gtk_widget_show resize-box)]
-          [(and v? (not h?))
-           ;; remove corner 
-           (gtk_widget_hide resize-box)]))
-       (adjust-client-delta (+ (* 2 margin) (if v? scroll-width 0))
-                            (+ (* 2 margin) (if h? scroll-width 0))))
-
-     (define suspend-scroll-callbacks? #f)
-     (define/public (deliver-scroll-callbacks?) (not suspend-scroll-callbacks?))
-     (define/private (as-scroll-change thunk)
-       (atomically
-        (set! suspend-scroll-callbacks? #t)
-        (begin0
-         (thunk)
-         (set! suspend-scroll-callbacks? #f))))
-
-
-     (define/private (configure-adj adj scroll-gtk len page pos)
-       (when (and scroll-gtk adj)
-         (as-scroll-change
-          (lambda ()
-            (if (zero? len)
-                (gtk_adjustment_configure adj 0 0 1 1 1 1)
-                (let ([pos (if (= pos -1)
-                               (gtk_adjustment_get_value adj)
-                               pos)])
-                  (gtk_adjustment_configure adj pos 0 (+ len page) 1 page page)))))))
-
-     (define/override (do-set-scrollbars h-step v-step
-                                         h-len v-len
-                                         h-page v-page
-                                         h-pos v-pos)
-       (configure-adj hscroll-adj hscroll-gtk h-len h-page h-pos)
-       (configure-adj vscroll-adj vscroll-gtk v-len v-page v-pos))
-
-     (define/override (reset-dc-for-autoscroll)
-       (reset-dc))
-
-     (define/private (dispatch which proc [default (void)])
-       (if (eq? which 'vertical)
-           (if vscroll-adj (proc vscroll-adj) default)
-           (if hscroll-adj (proc hscroll-adj) default)))
-
-     (define/public (set-scroll-page which v)
-       (dispatch which (lambda (adj)
-                         (let ([old (gtk_adjustment_get_page_size adj)])
-                           (unless (= old v)
-                             (as-scroll-change
-                              (lambda ()
-                                (gtk_adjustment_set_page_size adj v)
-                                (gtk_adjustment_set_page_increment adj v)
-                                (gtk_adjustment_set_upper adj (+ (- v old)
-                                                                 (gtk_adjustment_get_upper adj))))))))))
-     (define/public (set-scroll-range which v)
-       (dispatch which (lambda (adj)
-                         (as-scroll-change
-                          (lambda ()
-                            (gtk_adjustment_set_upper adj (+ v (gtk_adjustment_get_page_size adj))))))))
-     (define/public (set-scroll-pos which v)
-       (dispatch which (lambda (adj) 
-                         (as-scroll-change
-                          (lambda ()
-                            (gtk_adjustment_set_value adj v))))))
-
-     (define/private (is-disabled-scroll-dir? which)
-       (or (if (eq? which 'vertical)
-               (not vscroll-gtk)
-               (not hscroll-gtk))
-           (is-disabled-scroll?)))
-
-     (define/public (get-scroll-page which) 
-       (if (or (is-disabled-scroll-dir? which) (is-auto-scroll?))
-           0
-           (->long (dispatch which gtk_adjustment_get_page_size 0))))
-     (define/public (get-scroll-range which)
-       (if (or (is-disabled-scroll-dir? which) (is-auto-scroll?))
-           0
-           (->long (dispatch which (lambda (adj)
-                                     (- (gtk_adjustment_get_upper adj)
-                                        (gtk_adjustment_get_page_size adj)))
-                             0))))
-     (define/public (get-scroll-pos which)
-       (if (or (is-disabled-scroll-dir? which) (is-auto-scroll?))
-           0
-           (->long (dispatch which gtk_adjustment_get_value 0))))
-     
-     (define clear-bg?
-       (and (not (memq 'transparent style)) 
-            (not (memq 'no-autoclear style))))
-     (define transparent?
-       (memq 'transparent style))
-     (define gc #f)
-     (define bg-col (make-object color% "white"))
-     (define/public (get-canvas-background) (if transparent?
-                                                #f
-                                                bg-col))
-     (define/public (set-canvas-background col) (set! bg-col col))
-     (define/public (get-canvas-background-for-backing) (and clear-bg? bg-col))
-     (define/public (get-canvas-background-for-clearing) 
-       ;; called in event-dispatch mode
-       (if clear-bg?
-           (let* ([conv (lambda (x) (bitwise-ior x (arithmetic-shift x 8)))]
-                  [w (widget-window gtk)]
-                  [gc (gdk_gc_new w)])
-             (gdk_gc_set_rgb_fg_color gc (make-GdkColor 0
-                                                        (conv (color-red bg-col))
-                                                        (conv (color-green bg-col))
-                                                        (conv (color-blue bg-col))))
-             gc)
-           #f))
-
-     (when is-combo?
-       (connect-changed client-gtk))
-
-     (define combo-count 0)
-     (define/public (clear-combo-items)
-       (atomically
-        (for ([n (in-range combo-count)])
-          (gtk_combo_box_remove_text gtk 0))
-        (set! combo-count 0)))
-     (define/public (append-combo-item str)
-       (atomically
-        (set! combo-count (add1 combo-count))
-        (gtk_combo_box_append_text gtk str)))
-
-     (when is-combo? (append-combo-item "..."))
-
-     (define/public (on-popup) (void))
-
-     (define/public (combo-maybe-clicked)
-       (let ([i (gtk_combo_box_get_active gtk)])
-         (when (i . > . -1)
-	   (set-no-active-item)
-           (queue-window-event this (lambda () (on-combo-select i))))))
-     (define/public (on-combo-select i) (void))
-
-     (define/private (set-no-active-item)
-       ;; (gtk_combo_box_set_active gtk -1) should work,
-       ;; or using (.._iter #f) should work, but neither
-       ;; causes the "changed" signal to be emitted when the
-       ;; currently active item is re-selected, so we
-       ;; hack around the problem by adding an item, making
-       ;; it active, then removing it
-       (atomically
-	(gtk_combo_box_append_text gtk "dummy")
-	(gtk_combo_box_set_active gtk combo-count)
-	(gtk_combo_box_remove_text gtk combo-count)))
-
-     (define/public (set-combo-text t) (void))
-
-     (define/override (focus-change on?)
-       ;; input-method management
-       (if on?
-	   (begin
-	     (set! im-canvas (make-weak-box this))
-	     (gtk_im_context_focus_in im)
-	     (gtk_im_context_set_client_window im (widget-window client-gtk))
-	     (let ([w (box 0)]
-		   [h (box 0)])
-	       (get-client-size w h)
-	       (gtk_im_context_set_cursor_location 
-		im 
-		(make-GdkRectangle 0 0 (unbox w) (unbox h)))))
-	   (when (and im-canvas
-		      (eq? this (weak-box-value im-canvas)))
-	     (gtk_im_context_focus_out im)
-	     (set! im-canvas #f))))
-
-     (define/override (filter-key-event e)
-       ;; give the input method a chance to handle the
-       ;; key event; see call in "window.rkt" for
-       ;; information on the results
-       (if (and im-canvas
-		(eq? this (weak-box-value im-canvas)))
-	   (begin
-	     (set! im-filtering? #t)
-	     (set! im-string-result #f)
-	     (if (begin0
-		  (gtk_im_context_filter_keypress im e)
-		  (set! im-filtering? #f))
-		 im-string-result
-		 'none))
-	   'none))
-     
-     (define/public (do-scroll direction)
-       (if (is-auto-scroll?)
-           (refresh-for-autoscroll)
-           (on-scroll (new scroll-event%
-                           [event-type 'thumb]
-                           [direction direction]
-                           [position (get-scroll-pos direction)]))))
-     (define/public (on-scroll e) (void))
-
-     (define/public (scroll x y)
-       (when (is-auto-scroll?) 
-         (as-scroll-change
-          (lambda ()
-            (when (and hscroll-adj (>= x 0))
-              (gtk_adjustment_set_value 
-               hscroll-adj 
-               (floor
-                (* x (- (gtk_adjustment_get_upper hscroll-adj)
-                        (gtk_adjustment_get_page_size hscroll-adj))))))
-            (when (and vscroll-adj  (>= y 0))
-              (gtk_adjustment_set_value 
-               vscroll-adj
-               (floor
-                (* y (- (gtk_adjustment_get_upper vscroll-adj)
-                        (gtk_adjustment_get_page_size vscroll-adj))))))))
-         (refresh-for-autoscroll)))
-
-     (define/override (get-virtual-h-pos)
-       (inexact->exact (ceiling (gtk_adjustment_get_value hscroll-adj))))
-     (define/override (get-virtual-v-pos)
-       (inexact->exact (ceiling (gtk_adjustment_get_value vscroll-adj))))
-
-     (define/public (set-resize-corner on?) (void))
-
-     (define reg-blits null)
-     
-     (define/private (register-one-blit x y w h on-pixbuf off-pixbuf)
-       (let* ([cwin (widget-window client-gtk)])
-         (atomically
-          (let ([win (create-gc-window cwin x y w h)])
-            (let ([r (scheme_add_gc_callback
-                      (make-gc-show-desc win on-pixbuf w h)
-                      (make-gc-hide-desc win off-pixbuf w h))])
-              (cons win r))))))
-     
-     (define/public (register-collecting-blit x y w h on off on-x on-y off-x off-y)
-       (let ([on (fix-bitmap-size on w h on-x on-y)]
-             [off (fix-bitmap-size off w h off-x off-y)])
-         (let ([on-pixbuf (bitmap->pixbuf on)]
-               [off-pixbuf (bitmap->pixbuf off)])
-           (atomically
-            (set! reg-blits (cons (register-one-blit x y w h on-pixbuf off-pixbuf) reg-blits))))))
-     
-     (define/public (unregister-collecting-blits)
-       (atomically
-        (for ([r (in-list reg-blits)])
-          (g_object_unref (car r))
-          (scheme_remove_gc_callback (cdr r)))
-        (set! reg-blits null))))))
-
-;; ----------------------------------------
-
-(define canvas-panel%
-  (class (panel-container-mixin (panel-mixin canvas%))
-    (inherit get-container-gtk
-             get-client-gtk
-             get-virtual-h-pos
-             get-virtual-v-pos)
-    (define/override (is-panel?) #t)
-
-    (define/override (set-child-size child-gtk x y w h)
-      ;; ensure that container is big enough to hold the child:
-      (let ([container-gtk (get-container-gtk)]
-            [req (make-GtkRequisition 0 0)])
-        (gtk_widget_size_request container-gtk req)
-        (gtk_widget_set_size_request container-gtk
-                                     (max (GtkRequisition-width req)
-                                          (+ x w))
-                                     (max (GtkRequisition-height req)
-                                          (+ y h))))
-      (super set-child-size child-gtk x y w h))
-
-    (define/override (reset-dc-for-autoscroll)
-      (super reset-dc-for-autoscroll)
-      (gtk_fixed_move (get-client-gtk) (get-container-gtk) 
-                      (- (get-virtual-h-pos))
-                      (- (get-virtual-v-pos))))
-
-    (super-new)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/check-box.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/check-box.rkt
deleted file mode 100644
index f9efa58044..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/check-box.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-          "../../syntax.rkt"
-         "button.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "../../lock.rkt")
-
-(provide 
- (protect-out check-box%))
-
-;; ----------------------------------------
-
-(define-gtk gtk_check_button_new_with_mnemonic (_fun _string -> _GtkWidget))
-(define-gtk gtk_check_button_new (_fun -> _GtkWidget))
-(define-gtk gtk_toggle_button_get_active (_fun _GtkWidget -> _gboolean))
-(define-gtk gtk_toggle_button_set_active (_fun _GtkWidget _gboolean -> _void))
-
-(defclass check-box% button-core%
-  (super-new [gtk_new_with_mnemonic gtk_check_button_new_with_mnemonic]
-             [gtk_new gtk_check_button_new]
-             [event-type 'check-box])
-  (inherit get-gtk)
-
-  (define/public (set-value v)
-    (atomically
-     (set! no-clicked? #t)
-     (gtk_toggle_button_set_active (get-gtk) v)
-     (set! no-clicked? #f)))
-
-  (define no-clicked? #f)
-  (define/override (queue-clicked)
-    (unless no-clicked? (super queue-clicked)))
-       
-  (define/public (get-value)
-    (gtk_toggle_button_get_active (get-gtk))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/choice.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/choice.rkt
deleted file mode 100644
index c36da47757..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/choice.rkt
+++ /dev/null
@@ -1,107 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-          "../../syntax.rkt"
-          "../../lock.rkt"
-         "item.rkt"
-         "types.rkt"
-         "utils.rkt"
-         "window.rkt"
-         "combo.rkt"
-         "../common/event.rkt"
-         "../common/queue.rkt")
-
-(provide 
- (protect-out choice%))
-
-;; ----------------------------------------
-
-(define-gtk gtk_combo_box_new_text (_fun -> _GtkWidget))
-(define-gtk gtk_combo_box_append_text (_fun _GtkWidget _string -> _void))
-(define-gtk gtk_combo_box_remove_text (_fun _GtkWidget _int -> _void))
-(define-gtk gtk_combo_box_set_active (_fun _GtkWidget _int -> _void))
-(define-gtk gtk_combo_box_get_active (_fun _GtkWidget -> _int))
-(define-gtk gtk_bin_get_child (_fun _GtkWidget -> _GtkWidget))
-
-(define-signal-handler connect-changed "changed"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx queue-clicked)))))
-
-(defclass choice% item%
-  (init parent cb label
-        x y w h
-        choices style font)
-  (inherit get-gtk set-auto-size)
-
-  (define gtk (as-gtk-allocation (gtk_combo_box_new_text)))
-  (define count (length choices))
-
-  (for ([l (in-list choices)])
-    (gtk_combo_box_append_text gtk l))
-
-  ;; Hack to access the combobox's private child, where is
-  ;;  where the keyboard focus goes.
-  (define button-gtk (extract-combo-button gtk))
-
-  (super-new [parent parent]
-             [gtk gtk]
-             [extra-gtks (list button-gtk)]
-             [callback cb]
-             [no-show? (memq 'deleted style)])
-
-  (gtk_combo_box_set_active gtk 0)
-
-  (install-control-font (gtk_bin_get_child gtk) font)
-
-  (set-auto-size)
-
-  (connect-changed gtk)
-  (set! button-gtk (re-extract-combo-button gtk button-gtk this))
-  (connect-focus button-gtk)
-  (connect-combo-key-and-mouse button-gtk)
-
-  (define callback cb)
-  (define/public (clicked)
-    (callback this (new control-event%
-                        [event-type 'choice]
-                        [time-stamp (current-milliseconds)])))
-  (define ignore-clicked? #f)
-  (define/public (queue-clicked)
-    ;; called in event-handling thread
-    (unless ignore-clicked?
-      (queue-window-event this (lambda () (clicked)))))
-
-  (define/public (set-selection i)
-    (atomically
-     (set! ignore-clicked? #t)
-     (gtk_combo_box_set_active gtk i)
-     (set! ignore-clicked? #f)))
-
-  (define/public (get-selection)
-    (gtk_combo_box_get_active gtk))
-
-  (define/public (number) count)
-
-  (define/public (clear)
-    (atomically
-     (set! ignore-clicked? #t)
-     (for ([i (in-range count)])
-       (gtk_combo_box_remove_text gtk 0))
-     (set! count 0)
-     (set! ignore-clicked? #f)))
-
-  (public [-append append])
-  (define (-append l)
-    (atomically
-     (set! ignore-clicked? #t)
-     (set! count (add1 count))
-     (gtk_combo_box_append_text gtk l)
-     (when (= count 1)
-       (set-selection 0))
-     (set! ignore-clicked? #f)))
-
-  (define/public (delete i)
-    (gtk_combo_box_remove_text gtk i)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/client-window.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/client-window.rkt
deleted file mode 100644
index 2f5b569c0a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/client-window.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         "../../syntax.rkt"
-         "widget.rkt"
-         "window.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt")
-
-(provide 
- (protect-out client-size-mixin))
-
-;; ----------------------------------------
-
-(define-signal-handler connect-size-allocate "size-allocate"
-  (_fun _GtkWidget _GtkAllocation-pointer -> _gboolean)
-  (lambda (gtk a)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx save-client-size 
-              (GtkAllocation-x a)
-              (GtkAllocation-y a)
-              (GtkAllocation-width a)
-              (GtkAllocation-height a))))
-    #t))
-
-(define (client-size-mixin %)
-  (class %
-    (init client-gtk)
-
-    (connect-size-allocate client-gtk)
-
-    (define client-x 0)
-    (define client-y 0)
-
-    (define/public (on-client-size w h) (void))
-
-    (define client-size-key #f)
-
-    (define/public (save-client-size x y w h)
-      ;; Called in the Gtk event-loop thread
-      (set! client-x x)
-      (set! client-y y)
-      (when client-size-key (set-box! client-size-key #f))
-      (let ([key (box #t)])
-        (set! client-size-key key)
-        (queue-window-event this (lambda () 
-                                   (when (unbox key)
-                                     (internal-on-client-size w h)
-                                     (on-client-size w h))))))
-
-    (define/public (internal-on-client-size w h)
-      (void))
-
-    (define/override (get-client-delta)
-      (values client-x client-y))
-
-    (super-new)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/clipboard.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/clipboard.rkt
deleted file mode 100644
index 2da8584029..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/clipboard.rkt
+++ /dev/null
@@ -1,311 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/alloc
-         racket/draw/unsafe/bstr
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "../common/queue.rkt"
-         "../common/local.rkt"
-         "../common/freeze.rkt"
-          "utils.rkt"
-          "types.rkt"
-          "pixbuf.rkt")
-
-(provide 
- (protect-out clipboard-driver%
-              has-x-selection?
-              _GtkSelectionData
-              gtk_selection_data_get_length
-              gtk_selection_data_get_data
-	      primary-atom
-	      get-selection-eventspace))
-
-(define (has-x-selection?) #t)
-
-(define _GtkClipboard (_cpointer 'GtkClipboard))
-(define _GtkDisplay _pointer)
-
-;; Recent versions of Gtk provide function calls to
-;;  access data, but use structure when the functions are
-;;  not available
-(define-cstruct _GtkSelectionDataT ([selection _GdkAtom]
-				    [target _GdkAtom]
-				    [type _GdkAtom]
-				    [format _int]
-				    [data _pointer]
-				    [length _int]
-				    [display _GtkDisplay]))
-				  
-(define _GtkSelectionData _GtkSelectionDataT-pointer)
-
-(define-gdk gdk_atom_intern (_fun _string _gboolean -> _GdkAtom))
-
-(define-gtk gtk_clipboard_get (_fun _GdkAtom -> _GtkClipboard))
-(define-gtk gtk_clipboard_set_with_data (_fun _GtkClipboard _pointer _uint
-                                              _fpointer _fpointer 
-                                              _pointer
-                                              -> _void))
-(define-gtk gtk_selection_data_set (_fun _GtkSelectionData
-                                         _GdkAtom
-                                         _int
-                                         _bytes
-                                         _int
-                                         -> _void))
-(define-gtk gtk_selection_data_free (_fun _GtkSelectionData -> _void))
-(define-gtk gtk_selection_data_get_length (_fun _GtkSelectionData -> _int)
-  #:fail (lambda () GtkSelectionDataT-length))
-(define-gtk gtk_selection_data_get_data (_fun _GtkSelectionData -> _pointer)
-  #:fail (lambda () GtkSelectionDataT-data))
-
-(define-cstruct _GtkTargetEntry ([target _pointer]
-                                 [flags _uint]
-                                 [info _uint]))
-
-(define (get-data cb sel-data info self-box)
-  (send (ptr-ref self-box _scheme) provide-data info sel-data))
-(define get_data
-  (function-ptr get-data (_fun #:atomic? #t _GtkClipboard _GtkSelectionData _int _pointer -> _void)))
-
-(define (clear-owner cb self-box)
-  (send (ptr-ref self-box _scheme) replaced self-box))
-(define clear_owner
-  (function-ptr clear-owner (_fun #:atomic? #t _GtkClipboard _pointer -> _void)))
-
-(define primary-atom (gdk_atom_intern "PRIMARY" #t))
-(define clipboard-atom (gdk_atom_intern "CLIPBOARD" #t))
-
-(define the-x-selection-driver #f)
-
-;; ----------------------------------------
-
-(define _request-fun (_fun #:atomic? #t _GtkClipboard (_or-null _GtkSelectionData) _pointer -> _void))
-(define _request-string-fun (_fun #:atomic? #t _GtkClipboard _string _pointer -> _void))
-(define _request-image-fun (_fun #:atomic? #t _GtkClipboard _GdkPixbuf _pointer -> _void))
-
-(define (handle-receipt backref data convert)
-  (let ([l (ptr-ref backref _racket)])
-    (free-immobile-cell backref)
-    (set-box! (car l) (and data (convert data)))
-    (semaphore-post (cdr l))))
-
-(define (make-request-backref)
-  (let ([l (cons (box #f) (make-semaphore))])
-    (values l (malloc-immobile-cell l))))
-
-(define (wait-request-backref l)
-  (semaphore-wait (cdr l))
-  (unbox (car l)))
-
-(define (request-received cb data backref)
-  (handle-receipt backref 
-		  data
-		  (lambda (v)
-		    (let ([bstr (scheme_make_sized_byte_string
-				 (gtk_selection_data_get_data v)
-				 (gtk_selection_data_get_length v)
-				 1)])
-		      bstr))))
-
-(define (string-request-received cb str backref)
-  (handle-receipt backref 
-		  str
-		  (lambda (str) str)))
-
-(define (image-request-received cb pix backref)
-  (handle-receipt backref 
-		  pix
-		  pixbuf->bitmap))
-
-(define request_received (function-ptr request-received _request-fun))
-(define string_request_received (function-ptr string-request-received _request-string-fun))
-(define image_request_received (function-ptr image-request-received _request-image-fun))
-
-(define-gtk gtk_clipboard_request_contents 
-  (_fun _GtkClipboard _GdkAtom (_fpointer = request_received) _pointer -> _void))
-(define-gtk gtk_clipboard_request_text 
-  (_fun _GtkClipboard (_fpointer = string_request_received) _pointer -> _void))
-(define-gtk gtk_clipboard_request_image 
-  (_fun _GtkClipboard (_fpointer = image_request_received) _pointer -> _void))
-(define-gtk gtk_clipboard_set_image 
-  (_fun _GtkClipboard _GdkPixbuf -> _void))
-
-;; ----------------------------------------
-
-(defclass clipboard-driver% object%
-  (init-field [x-selection? #f])
-
-  (when x-selection?
-    (set! the-x-selection-driver this))
-
-  (define client #f)
-  (define client-data #f)
-  (define client-types #f)
-  (define client-orig-types #f)
-
-  (define cb (gtk_clipboard_get
-              (if x-selection?
-                  primary-atom
-		  clipboard-atom)))
-  (define self-box #f)
-
-  (define/public (get-client) client)
-
-  (define/public (set-client c orig-types)
-    (let ([all-data (if x-selection?
-                        ;; In X selection mode, get the data on demand:
-			#f
-                        ;; In clipboard mode, we can get the data
-                        ;; now, so it's ready if anyone asks:
-			(for/list ([t (in-list orig-types)])
-			  (send c get-data t)))]
-	  [types (for/list ([t (in-list orig-types)])
-		   (if (equal? t "TEXT")
-		       "UTF8_STRING"
-		       t))])
-      (let-values ([(orig-types types all-data)
-                    ;; For "TEXT", provide "UTF8_STRING", "STRING", and "TEXT":
-                    (if (member "TEXT" orig-types)
-                        (values (append orig-types (list "TEXT" "TEXT"))
-                                (append types (list "STRING" "TEXT"))
-                                (and all-data (append all-data
-                                                      (let loop ([all-data all-data]
-                                                                 [orig-types orig-types])
-                                                        (if (equal? "TEXT" (car orig-types))
-                                                            (list (car all-data) (car all-data))
-                                                            (loop (cdr all-data) (cdr orig-types)))))))
-                        (values orig-types types all-data))])
-        (let ([target-strings (malloc 'raw _byte (+ (length types)
-                                                    (apply + (map string-utf-8-length types))))]
-              [targets (malloc _GtkTargetEntry (length types))])
-          (for/fold ([offset 0]) ([str (in-list types)]
-                                  [i (in-naturals)])
-            (let ([t (ptr-add targets i _GtkTargetEntry)])
-              (cpointer-push-tag! t 'GtkTargetEntry)
-              (set-GtkTargetEntry-target! t (ptr-add target-strings offset))
-              (set-GtkTargetEntry-flags! t 0)
-              (set-GtkTargetEntry-info! t i))
-            (let ([bstr (string->bytes/utf-8 str)])
-              (memcpy target-strings offset bstr 0 (bytes-length bstr))
-              (let ([offset (+ offset (bytes-length bstr))])
-                (ptr-set! (ptr-add target-strings offset) _byte 0)
-                (+ offset 1))))
-          (set! client c)
-          (set! client-data all-data)
-          (set! client-types types)
-          (set! client-orig-types orig-types)
-          
-          (atomically
-           (let ([this-box (malloc-immobile-cell this)])
-             (set! self-box this-box)
-             (gtk_clipboard_set_with_data cb
-                                          targets 
-                                          (length types)
-                                          get_data 
-                                          clear_owner
-                                          this-box)))
-
-          (free target-strings)))))
-
-  (define/public (replaced s-box)
-    ;; In atomic mode
-    (when (ptr-equal? s-box self-box)
-      (set! self-box #f)
-      (let ([c client])
-        (when c
-          (set! client #f)
-          (set! client-data #f)
-          (set! client-types #f)
-          (set! client-orig-types #f)
-          (queue-event (send c get-client-eventspace)
-                       (lambda ()
-                         (send c on-replaced))))))
-    (free-immobile-cell s-box))
-  
-  (define/public (provide-data i sel-data)
-    ;; In atomic mode; if it's the selection (not clipboard),
-    ;; then hopefully we're in the right eventspace
-    (let ([bstr (if client
-		    (if client-data
-			(list-ref client-data i)
-			(constrained-reply (send client get-client-eventspace)
-					   (lambda () 
-                                             (send client get-data 
-                                                   (list-ref client-orig-types i)))
-					   #f))
-                    #f)])
-      (when bstr
-        (let ([bstr (if (string? bstr)
-                        (string->bytes/utf-8 bstr)
-                        bstr)])
-          (gtk_selection_data_set sel-data
-                                  (gdk_atom_intern (list-ref client-types i) #t)
-                                  8
-                                  bstr
-                                  (bytes-length bstr))))))
-
-  (define/private (self-data data-format)
-    ;; Due to the way we block for X-selection data and 
-    ;; provide only when the request arrives in the right
-    ;; eventspace, we handle self-X-selection specially:
-    (and x-selection?
-         self-box
-         (let ([c client]
-               [types client-types]
-               [orig-types client-orig-types])
-           (for/or ([t (in-list types)]
-                    [o (in-list orig-types)])
-             (and (equal? t data-format)
-                  (let ([e (send c get-client-eventspace)])
-                    (if (eq? (current-eventspace) e)
-                        (send client get-data t)
-                        (let ([s #f]
-                              [done (make-semaphore)])
-                          (parameterize ([current-eventspace e])
-                            (queue-callback
-                             (lambda ()
-                               (set! s (send client get-data t))
-                               (semaphore-post done))))
-                          (sync/timeout 0.1 done)
-                          s))))))))
-
-  (define/public (get-data data-format)
-    (let* ([data-format (if (equal? data-format "TEXT")
-			    "UTF8_STRING"
-			    data-format)]
-	   [atom (gdk_atom_intern data-format #t)])
-      (or (self-data data-format)
-          (wait-request-backref 
-           (atomically
-            (let-values ([(l backref) (make-request-backref)])
-              (gtk_clipboard_request_contents cb atom backref)
-              l))))))
-
-  (define/public (get-text-data)
-    (or (let ([s (self-data "UTF8_STRING")])
-          (and s (bytes->string/utf-8 s #\?)))
-        (wait-request-backref 
-         (atomically
-          (let-values ([(l backref) (make-request-backref)])
-            (gtk_clipboard_request_text cb backref)
-            l)))
-        ""))
-
-  (define/public (get-bitmap-data)
-    (wait-request-backref 
-     (atomically
-      (let-values ([(l backref) (make-request-backref)])
-	(gtk_clipboard_request_image cb backref)
-	l))))
-
-  (define/public (set-bitmap-data bm timestamp)
-    (define pb (bitmap->pixbuf bm))
-    (gtk_clipboard_set_image cb pb))
-  
-  (super-new))
-
-(define (get-selection-eventspace)
-  (and the-x-selection-driver
-       (let ([c (send the-x-selection-driver get-client)])
-	 (and c
-	      (send c get-client-eventspace)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/colordialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/colordialog.rkt
deleted file mode 100644
index 7087d27d54..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/colordialog.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         racket/draw/private/color
-         "types.rkt"
-         "utils.rkt"
-         "stddialog.rkt")
-
-(provide 
- (protect-out get-color-from-user
-	      color-dialog-works?))
-
-(define-gtk gtk_color_selection_dialog_new (_fun _string -> _GtkWidget))
-
-(define-gtk gtk_color_selection_dialog_get_color_selection (_fun _GtkWidget -> _GtkWidget)
-  #:fail (lambda () #f))
-(define-gtk gtk_color_selection_get_current_color (_fun _GtkWidget (c : (_ptr o _GdkColor)) -> _void -> c))
-(define-gtk gtk_color_selection_set_current_color (_fun _GtkWidget _GdkColor-pointer -> _void))
-
-(define (color-dialog-works?)
-  (and gtk_color_selection_dialog_get_color_selection #t))
-
-(define (get-color-from-user message parent color)
-  (let ([d (as-gtk-window-allocation
-            (gtk_color_selection_dialog_new (or message "Choose Color")))]
-        [to-gdk (lambda (c) (arithmetic-shift c 8))])
-    (when color
-      (gtk_color_selection_set_current_color
-       (gtk_color_selection_dialog_get_color_selection d)
-       (make-GdkColor
-        0
-        (to-gdk (color-red color))
-        (to-gdk (color-green color))
-        (to-gdk (color-blue color)))))
-    (and (eq? (show-dialog d) 'ok)
-         (let ([c (gtk_color_selection_get_current_color
-                   (gtk_color_selection_dialog_get_color_selection d))])
-           (make-object color% 
-                        (arithmetic-shift (GdkColor-red c) -8)
-                        (arithmetic-shift (GdkColor-green c) -8)
-                        (arithmetic-shift (GdkColor-blue c) -8))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/combo.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/combo.rkt
deleted file mode 100644
index 4bd0aee606..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/combo.rkt
+++ /dev/null
@@ -1,147 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-          "../../syntax.rkt"
-         "types.rkt"
-         "utils.rkt"
-         "window.rkt")
-
-;; Hacks for working with GtkComboBox[Entry]
-
-(provide 
- (protect-out extract-combo-button
-	      re-extract-combo-button
-              connect-combo-key-and-mouse))
-
-;; ----------------------------------------
-
-(define-gtk gtk_container_foreach (_fun _GtkWidget (_fun _GtkWidget -> _void) _pointer -> _void))
-(define-gtk gtk_container_forall (_fun _GtkWidget (_fun _GtkWidget -> _void) _pointer -> _void))
-
-(define-gtk gtk_widget_get_name (_fun _GtkWidget -> _string))
-
-(define-gobj g_signal_parse_name (_fun _string
-                                       _GType
-                                       (id : (_ptr o _uint))
-                                       (_ptr o _GQuark)
-                                       _gboolean
-                                       -> (r : _gboolean)
-                                       -> (and r id)))
-
-(define-gobj g_type_from_name (_fun _string -> _GType))
-
-(define _GSignalMatchType _int)
-(define _GQuark _uint32)
-(define _GClosure _int)
-(define-gobj g_signal_handler_find (_fun _GtkWidget 
-                                         _GSignalMatchType 
-                                         _uint ; signal_id
-                                         _GQuark ; detail
-                                         _GClosure ; closure
-                                         _pointer ; func
-                                         _pointer ; data
-                                         -> _ulong))
-(define-gobj g_signal_handler_disconnect (_fun _GtkWidget _uint -> _void))
-(define-gobj g_signal_handler_block (_fun _GtkWidget _uint -> _void))
-(define-gobj g_signal_handler_unblock (_fun _GtkWidget _uint -> _void))
-
-(define-gobj g_signal_emit (_fun _GtkWidget
-                                 _uint
-                                 _GQuark
-                                 _pointer
-                                 (r : (_ptr o _gboolean))
-                                 -> _void
-                                 -> r))
-
-(define G_SIGNAL_MATCH_ID 1)
-
-(define button-press-id #f)
-
-(define unblocked? #f)
-(define-signal-handler connect-reorder-button-press "button-press-event"
-  (_fun _GtkWidget _GdkEventButton-pointer _long -> _gboolean)
-  (lambda (gtk event other-id)
-    (if unblocked?
-        #f
-        (let ([v (do-button-event gtk event #f #f)])
-          (or v
-              (begin
-                (g_signal_handler_unblock gtk other-id)
-		(set! unblocked? #t)
-                (let ([r (g_signal_emit gtk
-                                        button-press-id
-                                        0
-                                        event)])
-                  (g_signal_handler_block gtk other-id)
-		  (set! unblocked? #f)
-                  r)))))))
-
-;; Dependence on the implemenation of GtkComboBox:
-;; Keyboard focus and other actions are based on a private button widget
-;; inside a GtkComboBox, so we extract it.
-(define (extract-combo-button gtk)
-  (let ([all null]
-        [ext null])
-    (gtk_container_forall gtk (lambda (c) (set! all (cons c all))) #f)
-    (gtk_container_foreach gtk (lambda (c) (set! ext (cons c ext))) #f)
-    (for-each (lambda (e)
-                (set! all (filter (lambda (a)
-				    (not (ptr-equal? a e)))
-                                  all)))
-              ext)
-    (define combo-gtk
-      (cond
-       [(= 1 (length all))
-	;; most common case:
-	(car all)]
-       [(and (= 2 (length all))
-	     (equal? '("GtkFrame" "GtkToggleButton")
-		     (map gtk_widget_get_name all)))
-	(define inner null)
-	(gtk_container_forall (car all) (lambda (c) (set! inner (cons c inner))) #f)
-	(and (= 1 (length inner))
-	     (car inner))]
-       [else #f]))
-    (unless combo-gtk
-      (error "unrecognized Gtk combobox implementation"))
-    combo-gtk))
-
-(define (re-extract-combo-button gtk combo-button-gtk win)
-  (define c-gtk (extract-combo-button gtk))
-  (cond
-   [(ptr-equal? c-gtk combo-button-gtk)
-    ;; combo button hasn't changed:
-    combo-button-gtk]
-   [else
-    (send win register-extra-gtk gtk c-gtk)
-    c-gtk]))
-
-;; More dependence on the implemenation of GtkComboBox:
-;; The menu-popup action is implemented by seeting a button-press-event
-;; signal handler on `button-gtk'. Since Gtk calls signal handlers in the
-;; order that they're registered, our button-press-event handler doesn't
-;; get called first, so it can't cancel the button press due to modality
-;; or an `on-subwindow-event' result. We effectively reorder the callbacks
-;; by finding the old one, blocking it, and then unblocking during a
-;; redispatch.  
-(define (connect-combo-key-and-mouse button-gtk)
-  (unless button-press-id
-    (set! button-press-id
-          (g_signal_parse_name "button-press-event" (g_type_from_name "GtkWidget") #f)))
-  (let ([hand-id
-         (and button-press-id
-              (let ([hand-id (g_signal_handler_find button-gtk
-                                                    G_SIGNAL_MATCH_ID
-                                                    button-press-id
-                                                    0
-                                                    0
-                                                    #f
-                                                    #f)])
-                (if (zero? hand-id)
-                    #f
-                    (begin
-                      (g_signal_handler_block button-gtk hand-id)
-                      hand-id))))])
-    (connect-key-and-mouse button-gtk (and hand-id #t))
-    (when hand-id
-      (connect-reorder-button-press button-gtk (cast hand-id _long _pointer)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/const.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/const.rkt
deleted file mode 100644
index 4e1f12d5fc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/const.rkt
+++ /dev/null
@@ -1,139 +0,0 @@
-#lang racket/base
-
-(provide (except-out (all-defined-out) <<))
-
-(define GTK_WINDOW_TOPLEVEL 0)
-(define GTK_WINDOW_POPUP 1)
-
-(define << arithmetic-shift)
-
-(define GDK_EXPOSURE_MASK (1 . << . 1))
-(define GDK_POINTER_MOTION_MASK (1 . << . 2))
-(define GDK_POINTER_MOTION_HINT_MASK (1 . << . 3))
-(define GDK_BUTTON_MOTION_MASK (1 . << . 4))
-(define GDK_BUTTON1_MOTION_MASK (1 . << . 5))
-(define GDK_BUTTON2_MOTION_MASK (1 . << . 6))
-(define GDK_BUTTON3_MOTION_MASK (1 . << . 7))
-(define GDK_BUTTON_PRESS_MASK (1 . << . 8))
-(define GDK_BUTTON_RELEASE_MASK (1 . << . 9))
-(define GDK_KEY_PRESS_MASK (1 . << . 10))
-(define GDK_KEY_RELEASE_MASK (1 . << . 11))
-(define GDK_ENTER_NOTIFY_MASK (1 . << . 12))
-(define GDK_LEAVE_NOTIFY_MASK (1 . << . 13))
-(define GDK_FOCUS_CHANGE_MASK (1 . << . 14))
-(define GDK_STRUCTURE_MASK (1 . << . 15))
-(define GDK_PROPERTY_CHANGE_MASK (1 . << . 16))
-(define GDK_VISIBILITY_NOTIFY_MASK (1 . << . 17))
-(define GDK_PROXIMITY_IN_MASK (1 . << . 18))
-(define GDK_PROXIMITY_OUT_MASK (1 . << . 19))
-(define GDK_SUBSTRUCTURE_MASK (1 . << . 20))
-(define GDK_SCROLL_MASK (1 . << . 21))
-(define GDK_ALL_EVENTS_MASK #x3FFFFE)
-
-
-(define GTK_TOPLEVEL (1 . << . 4))
-(define GTK_NO_WINDOW (1 . << . 5))
-(define GTK_REALIZED (1 . << . 6))
-(define GTK_MAPPED   (1 . << . 7))
-(define GTK_VISIBLE  (1 . << . 8))
-(define GTK_SENSITIVE (1 . << . 9))
-(define GTK_PARENT_SENSITIVE (1 . << . 10))
-(define GTK_CAN_FOCUS (1 . << . 11))
-(define GTK_HAS_FOCUS (1 . << . 12))
-(define GTK_CAN_DEFAULT (1 . << . 13))
-(define GTK_HAS_DEFAULT (1 . << . 14))
-(define GTK_HAS_GRAB (1 . << . 15))
-(define GTK_RC_STYLE (1 . << . 16))
-(define GTK_COMPOSITE_CHILD (1 . << . 17))
-(define GTK_NO_REPARENT (1 . << . 18))
-(define GTK_APP_PAINTABLE (1 . << . 19))
-(define GTK_RECEIVES_DEFAULT (1 . << . 20))
-(define GTK_DOUBLE_BUFFERED (1 . << . 21))
-(define GTK_NO_SHOW_ALL (1 . << . 22))
-
-(define GDK_SHIFT_MASK (1 . << . 0))
-(define GDK_LOCK_MASK (1 . << . 1))
-(define GDK_CONTROL_MASK (1 . << . 2))
-(define GDK_MOD1_MASK (1 . << . 3))
-(define GDK_MOD2_MASK (1 . << . 4))
-(define GDK_MOD3_MASK (1 . << . 5))
-(define GDK_MOD4_MASK (1 . << . 6))
-(define GDK_MOD5_MASK (1 . << . 7))
-(define GDK_BUTTON1_MASK (1 . << . 8))
-(define GDK_BUTTON2_MASK (1 . << . 9))
-(define GDK_BUTTON3_MASK (1 . << . 10))
-(define GDK_BUTTON4_MASK (1 . << . 11))
-(define GDK_BUTTON5_MASK (1 . << . 12))
-(define GDK_SUPER_MASK (1 . << . 26))
-(define GDK_HYPER_MASK (1 . << . 27))
-(define GDK_META_MASK (1 . << . 28))
-(define GDK_RELEASE_MASK (1 . << . 30))
-
-(define GDK_NOTHING -1)
-(define GDK_DELETE 0)
-(define GDK_DESTROY 1)
-(define GDK_EXPOSE 2)
-(define GDK_MOTION_NOTIFY 3)
-(define GDK_BUTTON_PRESS 4)
-(define GDK_2BUTTON_PRESS 5)
-(define GDK_3BUTTON_PRESS 6)
-(define GDK_BUTTON_RELEASE 7)
-(define GDK_KEY_PRESS 8)
-(define GDK_KEY_RELEASE 9)
-(define GDK_ENTER_NOTIFY 10)
-(define GDK_LEAVE_NOTIFY 11)
-(define GDK_FOCUS_CHANGE 12)
-(define GDK_CONFIGURE 13)
-(define GDK_MAP 14)
-(define GDK_UNMAP 15)
-(define GDK_PROPERTY_NOTIFY 16)
-(define GDK_SELECTION_CLEAR 17)
-(define GDK_SELECTION_REQUEST 18)
-(define GDK_SELECTION_NOTIFY 19)
-(define GDK_PROXIMITY_IN 20)
-(define GDK_PROXIMITY_OUT 21)
-(define GDK_DRAG_ENTER 22)
-(define GDK_DRAG_LEAVE 23)
-(define GDK_DRAG_MOTION 24)
-(define GDK_DRAG_STATUS 25)
-(define GDK_DROP_START 26)
-(define GDK_DROP_FINISHED 27)
-(define GDK_CLIENT_EVENT 28)
-(define GDK_VISIBILITY_NOTIFY 29)
-(define GDK_NO_EXPOSE 30)
-(define GDK_SCROLL 31)
-(define GDK_WINDOW_STATE 32)
-(define GDK_SETTING 33)
-(define GDK_OWNER_CHANGE 34)
-(define GDK_GRAB_BROKEN 35)
-(define GDK_DAMAGE 36)
-
-(define G_TYPE_STRING (16 . << . 2))
-
-(define GTK_POLICY_ALWAYS 0)
-(define GTK_POLICY_AUTOMATIC 1)
-(define GTK_POLICY_NEVER 2)
-
-(define GDK_WINDOW_STATE_WITHDRAWN  (1 . << . 0))
-(define GDK_WINDOW_STATE_ICONIFIED  (1 . << . 1))
-(define GDK_WINDOW_STATE_MAXIMIZED  (1 . << . 2))
-(define GDK_WINDOW_STATE_STICKY     (1 . << . 3))
-(define GDK_WINDOW_STATE_FULLSCREEN (1 . << . 4))
-(define GDK_WINDOW_STATE_ABOVE      (1 . << . 5))
-(define GDK_WINDOW_STATE_BELOW      (1 . << . 6))
-
-(define GDK_HINT_POS (1 . << . 0))
-(define GDK_HINT_MIN_SIZE (1 . << . 1))
-(define GDK_HINT_MAX_SIZE (1 . << . 2))
-(define GDK_HINT_BASE_SIZE (1 . << . 3))
-(define GDK_HINT_ASPECT (1 . << . 4))
-(define GDK_HINT_RESIZE_INC (1 . << . 5))
-(define GDK_HINT_WIN_GRAVITY (1 . << . 6))
-(define GDK_HINT_USER_POS (1 . << . 7))
-(define GDK_HINT_USER_SIZE (1 . << . 8))
-
-(define GDK_SCROLL_UP 0)
-(define GDK_SCROLL_DOWN 1)
-(define GDK_SCROLL_LEFT 2)
-(define GDK_SCROLL_RIGHT 3)
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/cursor.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/cursor.rkt
deleted file mode 100644
index da92895a57..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/cursor.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         racket/draw
-         "utils.rkt"
-         "types.rkt"
-         "pixbuf.rkt"
-         "../common/cursor-draw.rkt"
-          "../../syntax.rkt")
-
-(provide 
- (protect-out cursor-driver%
-              get-arrow-cursor-handle
-              get-watch-cursor-handle))
-
-(define GDK_ARROW 2) ; ugly!
-(define GDK_CROSSHAIR 34)
-(define GDK_HAND2 60)
-(define GDK_SB_H_DOUBLE_ARROW 108)
-(define GDK_SB_V_DOUBLE_ARROW 116)
-(define GDK_XTERM 152)
-(define GDK_TARGET 128)
-(define GDK_WATCH 150)
-
-(define gdk-cursors
-  (make-hasheq (list
-                (cons 'arrow GDK_ARROW)
-                (cons 'cross GDK_CROSSHAIR)
-                (cons 'ibeam GDK_XTERM)
-                (cons 'bullseye GDK_TARGET)
-                (cons 'watch 150)
-                (cons 'size-e/w GDK_SB_H_DOUBLE_ARROW)
-                (cons 'size-n/s GDK_SB_V_DOUBLE_ARROW)
-                (cons 'size-ne/sw draw-ne/sw)
-                (cons 'size-nw/se draw-nw/se)
-                (cons 'blank void)
-                (cons 'hand GDK_HAND2))))
-
-(define _GdkCursor (_cpointer 'GdkCursor))
-(define-gdk gdk_cursor_new  (_fun _int -> _GdkCursor))
-(define-gdk gdk_display_get_default (_fun -> _GdkDisplay))
-(define-gdk gdk_cursor_new_from_pixbuf (_fun _GdkDisplay _GdkPixbuf _int _int -> _GdkCursor))
-
-(define (get-arrow-cursor-handle)
-  (hash-ref gdk-cursors 'arrow #f))
-
-(define (get-watch-cursor-handle)
-  (let ([v (hash-ref gdk-cursors 'watch #f)])
-    (if (number? v)
-        (begin
-          (send (new cursor-driver%) set-standard 'watch)
-          (get-watch-cursor-handle))
-        v)))
-
-(defclass cursor-driver% object%
-
-  (define handle #f)
-
-  (define/public (ok?) (and handle #t))
-
-  (define/public (set-standard sym)
-    (let ([v (hash-ref gdk-cursors sym #f)])
-      (cond
-       [(not v) (void)]
-       [(number? v)
-        (let ([c (gdk_cursor_new v)])
-          (hash-set! gdk-cursors sym c)
-          (set! handle c))]
-       [(procedure? v)
-        (let ([bm (make-cursor-image v)])
-          (let ([c (gdk_cursor_new_from_pixbuf
-                    (gdk_display_get_default)
-                    (bitmap->pixbuf bm)
-                    8
-                    8)])
-            (hash-set! gdk-cursors sym c)
-            (set! handle c)))]
-       [else (set! handle v)])))
-
-  (define/public (set-image image mask hot-spot-x hot-spot-y)
-    (let ([bm (make-object bitmap% 16 16 #f #t)])
-      (let ([dc (make-object bitmap-dc% bm)])
-        (send dc draw-bitmap image 0 0 'solid (send the-color-database find-color "black") mask)
-        (send dc set-bitmap #f))
-      (let ([pixbuf (bitmap->pixbuf bm)])
-        (set! handle
-              (gdk_cursor_new_from_pixbuf
-               (gdk_display_get_default)
-               pixbuf
-               hot-spot-x
-               hot-spot-y)))))
-
-  (define/public (get-handle) handle)
-    
-  (super-new))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/dc.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/dc.rkt
deleted file mode 100644
index 6b42b5be75..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/dc.rkt
+++ /dev/null
@@ -1,176 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         "utils.rkt"
-         "types.rkt"
-         "window.rkt"
-         "x11.rkt"
-         "win32.rkt"
-         "gl-context.rkt"
-	 "../../lock.rkt"
-         "../common/backing-dc.rkt"
-         racket/draw/unsafe/cairo
-         racket/draw/private/dc
-         racket/draw/private/bitmap
-         racket/draw/private/local
-         ffi/unsafe/alloc)
-
-(provide 
- (protect-out dc%
-              do-backing-flush
-              x11-bitmap%
-
-              gdk_gc_new
-              gdk_gc_unref
-              gdk_gc_set_rgb_fg_color
-              gdk_draw_rectangle))
-
-(define-gdk gdk_cairo_create (_fun _pointer -> _cairo_t)
-  #:wrap (allocator cairo_destroy))
-
-(define-gdk gdk_gc_unref (_fun _pointer -> _void)
-  #:wrap (deallocator))
-(define-gdk gdk_gc_new (_fun _GdkWindow -> _pointer)
-  #:wrap (allocator gdk_gc_unref))
-(define-gdk gdk_gc_set_rgb_fg_color (_fun _pointer _GdkColor-pointer -> _void))
-(define-gdk gdk_draw_rectangle (_fun _GdkWindow _pointer _gboolean _int _int _int _int -> _void))
-
-(define-cstruct _GdkVisual-rec ([type-instance _pointer]
-				[ref_count _uint]
-				[qdata _pointer]
-				[type _int]
-				[depth _int]))
-(define-gdk gdk_visual_get_system (_fun -> _GdkVisual-rec-pointer))
-
-(define x11-bitmap%
-  (class bitmap%
-    (init w h gdk-win)
-    (super-make-object (make-alternate-bitmap-kind w h 1.0))
-
-    (define pixmap (gdk_pixmap_new gdk-win 
-				   (min (max 1 w) 32000)
-				   (min (max 1 h) 32000)
-				   (if gdk-win 
-				       -1
-				       (GdkVisual-rec-depth
-					(gdk_visual_get_system)))))
-    (define s
-      (cairo_xlib_surface_create (gdk_x11_display_get_xdisplay
-                                  (gdk_drawable_get_display pixmap))
-                                 (gdk_x11_drawable_get_xid pixmap)
-				 (gdk_x11_visual_get_xvisual
-				  (gdk_drawable_get_visual pixmap))
-                                 w
-                                 h))
-
-    ;; initialize bitmap to white:
-    (let ([cr (cairo_create s)])
-      (cairo_set_source_rgba cr 1.0 1.0 1.0 1.0)
-      (cairo_paint cr)
-      (cairo_destroy cr))
-
-    ;; `get-gdk-pixmap' and `install-gl-context' are
-    ;; localized in "gl-context.rkt"
-    (define/public (get-gdk-pixmap) pixmap)
-    (define/public (install-gl-context new-gl) (set! gl new-gl))
-
-    (define gl #f)
-    (define/override (get-bitmap-gl-context) gl)
-
-    (define/override (ok?) #t)
-    (define/override (is-color?) #t)
-    (define/override (has-alpha-channel?) #f)
-    
-    (define/override (get-cairo-surface) s)
-
-    (define/override (release-bitmap-storage)
-      (atomically
-       (cairo_surface_destroy s)
-       (gobject-unref pixmap)
-       (set! s #f)))))
-
-(define win32-bitmap%
-  (class bitmap%
-    (init w h gdk-win)
-    (super-make-object (make-alternate-bitmap-kind w h))
-
-    (define s
-      (if (not gdk-win)
-	  (cairo_win32_surface_create_with_dib CAIRO_FORMAT_RGB24 w h)
-	  (atomically
-	   (let ([hdc (GetDC (gdk_win32_drawable_get_handle gdk-win))])
-	     (begin0
-	      (cairo_win32_surface_create_with_ddb hdc
-						   CAIRO_FORMAT_RGB24 w h)
-	      (ReleaseDC hdc))))))
-
-    (define/override (ok?) #t)
-    (define/override (is-color?) #t)
-    (define/override (has-alpha-channel?) #f)
-
-    (define/override (get-cairo-surface) s)
-
-    (define/override (release-bitmap-storage)
-      (atomically
-       (cairo_surface_destroy s)
-       (set! s #f)))))
-
-(define dc%
-  (class backing-dc%
-    (init [(cnvs canvas)]
-          transparent?)
-    (inherit end-delay)
-    (define canvas cnvs)
-
-    (super-new [transparent? transparent?])
-
-    (define gl #f)
-    (define/override (get-gl-context)
-      (or gl
-          (let ([v (create-widget-gl-context (send canvas get-client-gtk))])
-	    (when v (set! gl v))
-	    v)))
-
-    (define/override (make-backing-bitmap w h)
-      (cond
-       [(and (eq? 'unix (system-type))
-             (send canvas get-canvas-background))
-	(make-object x11-bitmap% w h (widget-window (send canvas get-client-gtk)))]
-       [(and (eq? 'windows (system-type))
-             (send canvas get-canvas-background))
-	(make-object win32-bitmap% w h (widget-window (send canvas get-client-gtk)))]
-       [else
-	(super make-backing-bitmap (max 1 w) (max 1 h))]))
-
-    (define/override (get-backing-size xb yb)
-      (send canvas get-client-size xb yb))
-
-    (define/override (get-size)
-      (let ([xb (box 0)]
-            [yb (box 0)])
-        (send canvas get-virtual-size xb yb)
-        (values (unbox xb) (unbox yb))))
-
-    (define/override (queue-backing-flush)
-      ;; Re-enable expose events so that the queued 
-      ;; backing flush will be handled:
-      (end-delay)
-      (send canvas queue-backing-flush))
-
-    (define/override (flush)
-      (send canvas flush))
-
-    (define/override (request-delay)
-      (request-flush-delay (send canvas get-flush-window)))
-    (define/override (cancel-delay req)
-      (cancel-flush-delay req))))
-
-(define (do-backing-flush canvas dc win)
-  (send dc on-backing-flush
-        (lambda (bm)
-          (let ([w (box 0)]
-                [h (box 0)])
-            (send canvas get-client-size w h)
-            (let ([cr (gdk_cairo_create win)])
-              (backing-draw-bm bm cr (unbox w) (unbox h))
-              (cairo_destroy cr))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/dialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/dialog.rkt
deleted file mode 100644
index 209930d98a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/dialog.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-          "../../syntax.rkt"
-          "../common/queue.rkt"
-          "../common/dialog.rkt"
-          "../../lock.rkt"
-          "types.rkt"
-          "utils.rkt"
-          "frame.rkt")
-
-(provide 
- (protect-out dialog%))
-
-(define GTK_WIN_POS_CENTER 1)
-(define GTK_WIN_POS_CENTER_ON_PARENT 4)
-
-(define GDK_WINDOW_TYPE_HINT_DIALOG 1)
-
-(define-gtk gtk_window_set_position (_fun _GtkWidget _int -> _void))
-(define-gtk gtk_window_set_transient_for (_fun _GtkWidget _GtkWidget -> _void))
-(define-gtk gtk_window_set_type_hint (_fun _GtkWidget _int -> _void))
-
-(define dialog% 
-  (class (dialog-mixin frame%)
-    (inherit get-gtk
-             get-parent)
-
-    (super-new [is-dialog? #t])
-
-    (gtk_window_set_type_hint (get-gtk) GDK_WINDOW_TYPE_HINT_DIALOG)
-
-    (let ([p (get-parent)])
-      (when p
-        (gtk_window_set_transient_for (get-gtk) (send p get-gtk))))
-    
-    (define/override (center dir wrt)
-      (if (eq? dir 'both)
-          (gtk_window_set_position (get-gtk) 
-                                   (if (get-parent)
-                                       GTK_WIN_POS_CENTER_ON_PARENT
-                                       GTK_WIN_POS_CENTER))
-          (super center dir wrt)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/filedialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/filedialog.rkt
deleted file mode 100644
index f47932a7ab..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/filedialog.rkt
+++ /dev/null
@@ -1,105 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         racket/class
-         racket/match
-         "types.rkt"
-         "utils.rkt"
-         "widget.rkt"
-         "queue.rkt"
-         "stddialog.rkt"
-         "../common/handlers.rkt"
-         "../common/queue.rkt")
-
-(provide 
- (protect-out file-selector))
-
-(define _GtkFileChooserDialog _GtkWidget)
-(define _GtkFileChooser (_cpointer 'GtkFileChooser))
-(define _GtkFileChooserAction 
-  (_enum (list 'open 'save 'select-folder 'create-folder)))
-
-;; FIXME: really there are varargs here, but we don't need them for
-;; our purposes
-(define-gtk gtk_file_chooser_dialog_new 
-  (_fun _string (_or-null _GtkWindow) 
-        _GtkFileChooserAction
-        _string _GtkResponse
-        _string _GtkResponse
-        (_or-null _pointer)
-        -> _GtkFileChooserDialog))
-;; FIXME - should really be _GtkDialog but no subtyping
-(define-gtk gtk_dialog_run (_fun _GtkFileChooserDialog -> _int))
-;; FIXME ;; these should really be _GtkFileChooser but no subtyping
-(define-gtk gtk_file_chooser_get_filename 
-  (_fun _GtkFileChooserDialog -> _gpath/free))
-(define-gtk gtk_file_chooser_get_filenames
-  (_fun _GtkFileChooserDialog -> (_GSList _gpath/free)))
-(define-gtk gtk_file_chooser_set_current_name
-  (_fun _GtkFileChooserDialog _path -> _void))
-(define-gtk gtk_file_chooser_set_current_folder
-  (_fun _GtkFileChooserDialog _path -> _void))
-(define-gtk gtk_file_chooser_set_do_overwrite_confirmation
-  (_fun _GtkFileChooserDialog _gboolean -> _void))
-(define-gtk gtk_file_chooser_set_select_multiple
-  (_fun _GtkFileChooserDialog _gboolean -> _void))
-
-(define _GtkFileFilter (_cpointer 'GtkFileFilter))
-(define-gtk gtk_file_filter_new (_fun -> _GtkFileFilter))
-(define-gtk gtk_file_filter_set_name
-  (_fun _GtkFileFilter _string -> _void))
-(define-gtk gtk_file_filter_add_pattern
-  (_fun _GtkFileFilter _string -> _void))
-
-(define-gtk gtk_file_chooser_add_filter
-  (_fun _GtkFileChooserDialog _GtkFileFilter -> _void))
-
-(define (file-selector message directory filename 
-                       extension ;; always ignored
-                       filters style parent)
-  (define type (car style)) ;; the rest of `style' is irrelevant on Gtk
-  (define dlg (as-gtk-window-allocation
-               (gtk_file_chooser_dialog_new 
-                message (and parent (send parent get-gtk))
-                (case type
-                  [(dir) 'select-folder]
-                  [(put) 'save]
-                  [else 'open])
-                "gtk-cancel" 'cancel
-                ;; no stock names for "Select"
-                (case type
-                  [(dir) "Choose"]
-                  [(put) "gtk-save"]
-                  [(get) "gtk-open"]
-                  [(multi) "Choose"])
-                'accept
-                #f)))
-  (when (eq? 'multi type)
-    (gtk_file_chooser_set_select_multiple dlg #t))
-  (when filename
-    (gtk_file_chooser_set_current_name dlg filename))
-  (when directory
-    (gtk_file_chooser_set_current_folder dlg directory))
-  (when (eq? 'put type)
-    (gtk_file_chooser_set_do_overwrite_confirmation dlg #t))
-  (for ([f (in-list filters)])
-    (match f
-      [(list name glob)
-       (let ([ff (gtk_file_filter_new)]
-             [glob (if (equal? glob "*.*") "*" glob)])
-         (gtk_file_filter_set_name ff (if (equal? glob "*")
-                                          name
-                                          (format "~a (~a)" name glob)))
-         (for ([glob (in-list (regexp-split #rx" *; *" glob))]
-               #:when ((string-length glob) . > . 0))
-           (gtk_file_filter_add_pattern ff glob))
-         (gtk_file_chooser_add_filter dlg ff))]))
-  (define ans (and (eq? 'accept (show-dialog dlg))
-                   (if (eq? type 'multi)
-                       (gtk_file_chooser_get_filenames dlg)
-                       (gtk_file_chooser_get_filename dlg))))
-  (gtk_widget_destroy dlg)
-  ans)
-
-(define-gtk gtk_main_iteration_do (_fun _gboolean -> _gboolean))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/frame.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/frame.rkt
deleted file mode 100644
index 5ff715e212..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/frame.rkt
+++ /dev/null
@@ -1,639 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         racket/promise
-         racket/runtime-path
-         racket/draw
-         (for-syntax (only-in racket/base quote))
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt"
-         "window.rkt"
-         "client-window.rkt"
-         "widget.rkt"
-         "cursor.rkt"
-         "pixbuf.rkt"
-         "../common/queue.rkt")
-
-(provide 
- (protect-out frame%
-              display-origin
-              display-size
-	      display-count
-              display-bitmap-resolution
-              location->window
-              get-current-mouse-state))
-
-;; ----------------------------------------
-
-(define GDK_GRAVITY_NORTH_WEST 1)
-(define GDK_GRAVITY_STATIC 10)
-
-(define _GList (_cpointer/null 'GList))
-(define-glib g_list_insert (_fun _GList _pointer _int -> _GList))
-(define-glib g_list_free (_fun _GList -> _void))
-
-(define-gtk gtk_window_new (_fun _int -> _GtkWidget))
-(define-gtk gtk_window_set_title (_fun _GtkWindow _string -> _void))
-(define-gtk gtk_fixed_new (_fun -> _GtkWidget))
-(define-gtk gtk_fixed_move (_fun _GtkWidget _GtkWidget _int _int -> _void))
-(define-gtk gtk_window_get_size (_fun _GtkWidget (w : (_ptr o _int)) (h : (_ptr o _int))
-                                      -> _void
-                                      -> (values w h)))
-(define-gtk gtk_window_set_decorated (_fun _GtkWidget _gboolean -> _void))
-(define-gtk gtk_window_set_keep_above (_fun _GtkWidget _gboolean -> _void))
-(define-gtk gtk_window_set_focus_on_map (_fun _GtkWidget _gboolean -> _void))
-(define-gtk gtk_window_maximize (_fun _GtkWidget -> _void))
-(define-gtk gtk_window_unmaximize (_fun _GtkWidget -> _void))
-(define-gtk gtk_widget_set_uposition (_fun _GtkWidget _int _int -> _void))
-(define-gtk gtk_window_get_position (_fun _GtkWidget (x : (_ptr o _int)) (y : (_ptr o _int)) 
-                                          -> _void
-                                          -> (values x y)))
-(define-gtk gtk_window_set_gravity (_fun _GtkWindow _int -> _void))
-(define-gtk gtk_window_set_icon_list (_fun _GtkWindow _GList -> _void))
-(define-gtk gtk_window_fullscreen (_fun _GtkWindow -> _void))
-(define-gtk gtk_window_get_focus (_fun _GtkWindow -> (_or-null _GtkWidget)))
-
-(define-gtk gtk_window_resize (_fun _GtkWidget _int _int -> _void))
-
-(define-gdk gdk_window_set_cursor (_fun _GdkWindow _pointer -> _void))
-(define-gdk gdk_screen_get_root_window (_fun _GdkScreen -> _GdkWindow))
-(define-gdk gdk_window_get_pointer (_fun _GdkWindow 
-                                         (x : (_ptr o _int))
-                                         (y : (_ptr o _int))
-                                         (mods : (_ptr o _uint))
-                                         -> _GdkWindow
-                                         -> (values x y mods)))
-
-(define-gtk gtk_window_iconify (_fun _GtkWindow -> _void))
-(define-gtk gtk_window_deiconify (_fun _GtkWindow -> _void))
-
-(define-cstruct _GdkGeometry ([min_width _int]
-                              [min_height _int]
-                              [max_width _int]
-                              [max_height _int]
-                              [base_width _int]
-                              [base_height _int]
-                              [width_inc _int]
-                              [height_inc _int]
-                              [min_aspect _double]
-                              [max_aspect _double]
-                              [win_gravity _int]))
-(define-gtk gtk_window_set_geometry_hints (_fun _GtkWindow _GtkWidget _GdkGeometry-pointer _int -> _void))
-
-
-(define-signal-handler connect-delete "delete-event"
-  (_fun _GtkWidget -> _gboolean)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (queue-window-event wx (lambda () 
-                                 (unless (other-modal? wx)
-                                   (when (send wx on-close)
-                                     (send wx direct-show #f)))))))))
-
-(define-signal-handler connect-configure "configure-event"
-  (_fun _GtkWidget _GdkEventConfigure-pointer -> _gboolean)
-  (lambda (gtk a)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx remember-size 
-              (GdkEventConfigure-x a)
-              (GdkEventConfigure-y a)
-              (GdkEventConfigure-width a)
-              (GdkEventConfigure-height a))))
-    #f))
-
-(define-cstruct _GdkEventWindowState ([type _int]
-                                      [window _GtkWindow]
-                                      [send_event _int8]
-                                      [changed_mask _int]
-                                      [new_window_state _int]))
-
-
-(define-signal-handler connect-window-state "window-state-event"
-  (_fun _GtkWidget _GdkEventWindowState-pointer -> _gboolean)
-  (lambda (gtk evt)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx on-window-state 
-              (GdkEventWindowState-changed_mask evt)
-              (GdkEventWindowState-new_window_state evt))))
-    #f))
-
-(define-runtime-path plt-16x16-file '(lib "icons/plt-16x16.png"))
-(define-runtime-path plt-32x32-file '(lib "icons/plt-32x32.png"))
-(define-runtime-path plt-48x48-file '(lib "icons/plt-48x48.png"))
-
-(define icon-pixbufs+glist
-  (delay
-    (let ([icons (map
-                  (lambda (fn)
-                    (bitmap->pixbuf (make-object bitmap% fn 'png/alpha)))
-                  (list plt-16x16-file
-                        plt-32x32-file
-                        plt-48x48-file))])
-      (cons 
-       ;; keep pixbuf pointers to avoid GC:
-       icons
-       ;; a glist:
-       (for/fold ([l #f]) ([i (in-list icons)])
-	 (g_list_insert l i -1))))))
-
-;; used for location->window
-(define all-frames (make-weak-hasheq))
-
-(define frame%
-  (class (client-size-mixin window%)
-    (init parent
-          label
-          x y w h
-          style)
-    (init [is-dialog? #f])
-
-    (inherit get-gtk set-size
-             pre-on-char pre-on-event
-             get-client-delta get-size
-             get-parent get-eventspace
-             adjust-client-delta
-             queue-on-size)
-
-    (define floating? (memq 'float style))
-
-    (define gtk (as-gtk-window-allocation
-                 (gtk_window_new (if floating?
-				     GTK_WINDOW_POPUP
-				     GTK_WINDOW_TOPLEVEL))))
-    (when (memq 'no-caption style)
-      (gtk_window_set_decorated gtk #f))
-    (when floating?
-      (gtk_window_set_keep_above gtk #t)
-      (gtk_window_set_focus_on_map gtk #f))
-    (define-values (vbox-gtk panel-gtk)
-      (atomically
-       (let ([vbox-gtk (gtk_vbox_new #f 0)]
-             [panel-gtk (gtk_fixed_new)])
-         (gtk_container_add gtk vbox-gtk)
-         (gtk_box_pack_end vbox-gtk panel-gtk #t #t 0)
-         (values vbox-gtk panel-gtk))))
-    (gtk_widget_show vbox-gtk)
-    (gtk_widget_show panel-gtk)
-    (connect-enter-and-leave gtk)
-
-    ;; Enable key events on the panel to catch events
-    ;; that would otherwise go undelivered:
-    (set-gtk-object-flags! panel-gtk
-			   (bitwise-ior (get-gtk-object-flags panel-gtk)
-					GTK_CAN_FOCUS))
-    (gtk_widget_add_events panel-gtk (bitwise-ior GDK_KEY_PRESS_MASK
-						  GDK_KEY_RELEASE_MASK))
-    (connect-key panel-gtk)
-
-    (unless is-dialog?
-      (gtk_window_set_icon_list gtk (cdr (force icon-pixbufs+glist))))
-
-    (define/override (get-client-gtk) panel-gtk)
-    (define/override (get-window-gtk) gtk)
-
-    (define/override (in-floating?) floating?)
-
-    (super-new [parent parent]
-               [gtk gtk]
-               [client-gtk panel-gtk]
-               [no-show? #t]
-               [add-to-parent? #f]
-               [extra-gtks (list panel-gtk)]
-               [connect-size-allocate? #f])
-
-    (set-size x y w h)
-
-    (when (memq 'hide-menu-bar style)
-      (gtk_window_fullscreen gtk))
-
-    (connect-delete gtk)
-    (connect-configure gtk)
-    (connect-focus gtk)
-    (connect-window-state gtk)
-
-    (define saved-title (or label ""))
-    (define is-modified? #f)
-
-    (when label
-      (gtk_window_set_title gtk label))
-
-    ;(gtk_window_add_accel_group (widget-window gtk) the-accelerator-group)
-
-    (define/override (set-child-size child-gtk x y w h)
-      (gtk_fixed_move panel-gtk child-gtk x y)
-      (gtk_widget_set_size_request child-gtk w h))
-
-    (define/public (on-close) #t)
-
-    (define/public (set-menu-bar mb)
-      (let ([mb-gtk (send mb get-gtk)])
-        (gtk_box_pack_start vbox-gtk mb-gtk #t #t 0)
-        (gtk_widget_show mb-gtk))
-      (let ([h (send mb set-top-window this)])
-        ;; adjust client delta right away, so that we make
-        ;; better assumptions about the client size and more
-        ;; quickly converge to the right size of the frame
-        ;; based on its content
-        (adjust-client-delta 0 h))
-      ;; Hack: calls back into the mred layer to re-compute
-      ;;  sizes. By calling this early enough, the frame won't 
-      ;;  grow if it doesn't have to grow to accommodate the menu bar.
-      (send this resized))
-
-    (define/public (reset-menu-height h)
-      (adjust-client-delta 0 h))
-
-    (define saved-enforcements (vector 0 0 -1 -1))
-
-    (define/public (enforce-size min-x min-y max-x max-y inc-x inc-y)
-      (define (to-max v) (if (= v -1) #x3FFFFF v))
-      (set! saved-enforcements (vector min-x min-y max-x max-y))
-      (gtk_window_set_geometry_hints gtk gtk 
-                                     (make-GdkGeometry min-x min-y
-                                                       (to-max max-x) (to-max max-y)
-                                                       0 0
-                                                       inc-x inc-y
-                                                       0.0 0.0
-                                                       0)
-                                     (bitwise-ior GDK_HINT_MIN_SIZE
-                                                  GDK_HINT_MAX_SIZE
-                                                  GDK_HINT_RESIZE_INC)))
-
-    (define/override (get-top-win) this)
-
-    (define dc-lock (and (eq? 'windows (system-type)) (make-semaphore 1)))
-    (define/public (get-dc-lock) dc-lock)
-
-    (define/override (get-dialog-level) 0)
-    (define/public (frame-relative-dialog-status win) #f)
-
-    (define/override (get-unset-pos) #f)
-
-    (define/override (center dir wrt)
-      (let ([w-box (box 0)]
-            [h-box (box 0)]
-            [sx-box (box 0)]
-            [sy-box (box 0)]
-            [sw-box (box 0)]
-            [sh-box (box 0)])
-        (get-size w-box h-box)
-        (let ([p (get-parent)])
-          (if p
-              (begin
-                (send p get-size sw-box sh-box)
-                (set-box! sx-box (send p get-x))
-                (set-box! sy-box (send p get-y)))
-              (display-size sw-box sh-box #t 0 void)))
-        (let* ([sw (unbox sw-box)]
-               [sh (unbox sh-box)]
-               [fw (unbox w-box)]
-               [fh (unbox h-box)])
-          (set-top-position (if (or (eq? dir 'both)
-                                    (eq? dir 'horizontal))
-                                (+ (unbox sx-box) (quotient (- sw fw) 2))
-                                #f)
-                            (if (or (eq? dir 'both)
-                                    (eq? dir 'vertical))
-                                (+ (unbox sy-box) (quotient (- sh fh) 2))
-                                #f)))))
-
-    (define/public (set-top-position x y)
-      (unless (and (not x) (not y))
-        (gtk_widget_set_uposition gtk
-                                  (or x -2)
-                                  (or y -2))))
-
-    (define/override (really-set-size gtk x y processed-x processed-y w h)
-      (set-top-position x y)
-      (gtk_window_resize gtk (max 1 w) (max 1 h)))
-
-    (define/override (show on?)
-      (let ([es (get-eventspace)])
-        (when (and on?
-                   (eventspace-shutdown? es))
-          (error (string->symbol
-                  (format "show method in ~a"
-                          (if (frame-relative-dialog-status this)
-                              'dialog%
-                              'frame%)))
-                 "eventspace has been shutdown")
-          (when saved-child
-            (if (eq? (current-thread) (eventspace-handler-thread es))
-                (send saved-child paint-children)
-                (let ([s (make-semaphore)])
-                  (queue-callback (lambda ()
-                                    (when saved-child
-                                      (send saved-child paint-children))
-                                    (semaphore-post s)))
-                  (sync/timeout 1 s))))))
-      (super show on?))
-
-    (define saved-child #f)
-    (define/override (register-child child on?)
-      (unless on? (error 'register-child-in-frame "did not expect #f"))
-      (unless (or (not saved-child) (eq? child saved-child))
-        (error 'register-child-in-frame "expected only one child"))
-      (set! saved-child child))
-    (define/override (register-child-in-parent on?)
-      (void))
-
-    (define/override (refresh-all-children)
-      (when saved-child
-        (send saved-child refresh)))
-
-    (define/override (direct-show on?)
-      ;; atomic mode
-      (if on?
-          (hash-set! all-frames this #t)
-          (hash-remove! all-frames this))
-      (super direct-show on?)
-      (when on? (gtk_window_deiconify gtk))
-      (register-frame-shown this on?))
-
-    (define/public (destroy)
-      ;; atomic mode
-      (direct-show #f))
-
-    (define/override (on-client-size w h)
-      (void))
-
-    (define/augment (is-enabled-to-root?) #t)
-
-    (define big-icon #f)
-    (define small-icon #f)
-    (define/public (set-icon bm [mask #f] [mode 'both])
-      (let ([bm (if mask
-		    (let* ([nbm (make-object bitmap%
-					     (send bm get-width)
-					     (send bm get-height)
-					     #f
-					     #t)]
-			   [dc (make-object bitmap-dc% nbm)])
-		      (send dc draw-bitmap bm 0 0
-			    'solid (make-object color% "black")
-			    mask)
-		      (send dc set-bitmap #f)
-		      nbm)
-		    bm)])
-	(case mode
-	  [(small) (set! small-icon bm)]
-	  [(big) (set! big-icon bm)]
-	  [(both) 
-	   (set! small-icon bm)
-	   (set! big-icon bm)])
-	(let ([small-pixbuf
-	       (if small-icon
-		   (bitmap->pixbuf small-icon)
-		   (car (car (force icon-pixbufs+glist))))]
-	      [big-pixbufs
-	       (if big-icon
-		   (list (bitmap->pixbuf big-icon))
-		   (cdr (car (force icon-pixbufs+glist))))])
-          (atomically
-           (let ([l (for/fold ([l #f]) ([i (cons small-pixbuf big-pixbufs)])
-                      (g_list_insert l i -1))])
-             (gtk_window_set_icon_list gtk l)
-             (g_list_free l))))))
-    
-    (define child-has-focus? #f)
-    (define reported-activate #f)
-    (define queued-active? #f)
-    (define/public (on-focus-child on?)
-      ;; atomic mode
-      (set! child-has-focus? on?)
-      (unless queued-active?
-	(set! queued-active? #t)
-	(queue-window-event this
-			    (lambda ()
-			      (let ([on? child-has-focus?])
-				(set! queued-active? #f)
-				(unless (eq? on? reported-activate)
-				  (set! reported-activate on?)
-				  (on-activate on?)))))))
-
-    (define treat-focus-out-as-menu-click? #f)
-    (define/public (treat-focus-out-as-menu-click)
-      (set! treat-focus-out-as-menu-click? #t))
-
-    (define focus-here? #f)
-    (define/override (on-focus? on?)
-      (when (and (not on?) treat-focus-out-as-menu-click?)
-        (on-menu-click))
-      (on-focus-child on?)
-      (cond
-       [on?
-	(if (ptr-equal? (gtk_window_get_focus gtk) gtk)
-	    (begin
-	      (set! focus-here? #t)
-	      (super on-focus? on?))
-	    #f)]
-       [focus-here?
-	(set! focus-here? #f)
-	(super on-focus? on?)]
-       [else #f]))
-
-    (define/public (get-focus-window [even-if-not-active? #f])
-      (let ([f-gtk (gtk_window_get_focus gtk)])
-        (and f-gtk
-             (or even-if-not-active?
-                 (positive? (bitwise-and (get-gtk-object-flags f-gtk)
-                                         GTK_HAS_FOCUS)))
-             (gtk->wx f-gtk))))
-    
-    (define/override (call-pre-on-event w e)
-      (pre-on-event w e))
-    (define/override (call-pre-on-char w e)
-      (pre-on-char w e))
-
-    (define/override (internal-client-to-screen x y)
-      (gtk_window_set_gravity gtk GDK_GRAVITY_STATIC)
-      (let-values ([(dx dy) (gtk_window_get_position gtk)]
-                   [(cdx cdy) (get-client-delta)])
-        (gtk_window_set_gravity gtk GDK_GRAVITY_NORTH_WEST)
-        (set-box! x (+ (unbox x) dx cdx))
-        (set-box! y (+ (unbox y) dy cdy))))
-
-    (define/public (on-toolbar-click) (void))
-    (define/public (on-menu-click) (void))
-
-    (define/public (on-menu-command c) (void))
-
-    (def/public-unimplemented on-mdi-activate)
-
-    (define/public (on-activate on?) (void))
-
-    (define/public (designate-root-frame) (void))
-
-    (def/public-unimplemented system-menu)
-
-    (define/public (set-modified mod?)
-      (unless (eq? is-modified? (and mod? #t))
-        (set! is-modified? (and mod? #t))
-        (set-title saved-title)))
-
-    (define waiting-cursor? #f)
-    (define/public (set-wait-cursor-mode on?)
-      (set! waiting-cursor? on?)
-      (when in-window
-        (send in-window enter-window)))
-
-    (define current-cursor-handle #f)
-    (define in-window #f)
-    (define/override (set-parent-window-cursor in-win c)
-      (set! in-window in-win)
-      (let ([c (if waiting-cursor?
-                   (get-watch-cursor-handle)
-                   c)])
-        (unless (eq? c current-cursor-handle)
-          (atomically
-           (set! current-cursor-handle c)
-           (gdk_window_set_cursor (widget-window (get-gtk)) (if (eq? c (get-arrow-cursor-handle))
-                                                                #f
-                                                                c))))))
-    (define/override (enter-window) (void))
-    (define/override (leave-window) (void))
-
-    (define/override (check-window-cursor win)
-      (when in-window
-        (send in-window enter-window)))
-      
-    (define maximized? #f)
-    (define is-iconized? #f)
-    
-    (define/public (is-maximized?)
-      maximized?)
-    (define/public (maximize on?)
-      ((if on? gtk_window_maximize gtk_window_unmaximize) gtk))
-
-    (define/public (on-window-state changed value)
-      (when (positive? (bitwise-and changed GDK_WINDOW_STATE_MAXIMIZED))
-        (set! maximized? (positive? (bitwise-and value GDK_WINDOW_STATE_MAXIMIZED))))
-      (when (positive? (bitwise-and changed GDK_WINDOW_STATE_ICONIFIED))
-        (set! is-iconized? (positive? (bitwise-and value GDK_WINDOW_STATE_ICONIFIED)))))
-
-    (define/public (iconized?)
-      is-iconized?)
-    (define/public (iconize on?)
-      (if on?
-          (gtk_window_iconify gtk)
-          (gtk_window_deiconify gtk)))
-
-    (define/public (fullscreened?) #f)
-    (define/public (fullscreen on?) (void))
-      
-    (def/public-unimplemented get-menu-bar)
-
-    (define/public (set-title s)
-      (set! saved-title s)
-      (gtk_window_set_title gtk (if is-modified?
-                                    (string-append s "*")
-                                    s)))
-    
-    (define/public (display-changed) (void))))
-
-;; ----------------------------------------
-
-(define-gdk gdk_screen_get_width (_fun _GdkScreen -> _int))
-(define-gdk gdk_screen_get_height (_fun _GdkScreen -> _int))
-
-(define-gdk gdk_screen_get_monitor_geometry (_fun _GdkScreen _int _GdkRectangle-pointer -> _void))
-(define-gdk gdk_screen_get_n_monitors (_fun _GdkScreen -> _int))
-
-(define (monitor-rect num fail)
-  (let ([s (gdk_screen_get_default)]
-	[r (make-GdkRectangle 0 0 0 0)])
-    (unless (num . < . (gdk_screen_get_n_monitors s))
-      (fail))
-    (gdk_screen_get_monitor_geometry s num r)
-    r))
-
-(define (display-origin x y all? num fail)
-  (let ([r (monitor-rect num fail)])
-    (set-box! x (- (GdkRectangle-x r)))
-    (set-box! y (- (GdkRectangle-y r)))))
-
-(define (display-size w h all? num fail)
-  (let ([r (monitor-rect num fail)])
-    (set-box! w (GdkRectangle-width r))
-    (set-box! h (GdkRectangle-height r))))
-
-(define (display-count)
-  (gdk_screen_get_n_monitors (gdk_screen_get_default)))
-
-(define (display-bitmap-resolution num fail)
-  (if (zero? num)
-      1.0
-      (if (num . < . (gdk_screen_get_n_monitors (gdk_screen_get_default)))
-          1.0
-          (fail))))
-
-(define (location->window x y)
-  (for/or ([f (in-hash-keys all-frames)])
-    (let ([fx (send f get-x)]
-          [fw (send f get-width)])
-      (and (<= fx x (+ fx fw))
-           (let ([fy (send f get-y)]
-                 [fh (send f get-height)])
-             (<= fy y (+ fy fh)))
-           f))))
-
-;; ----------------------------------------
-
-(define (get-current-mouse-state)
-  (define-values (x y mods) (gdk_window_get_pointer
-                             (gdk_screen_get_root_window
-                              (gdk_screen_get_default))))
-  (define (maybe mask sym)
-    (if (zero? (bitwise-and mods mask))
-        null
-        (list sym)))
-  (values (make-object point% x y)
-          (append
-           (maybe GDK_BUTTON1_MASK 'left)
-           (maybe GDK_BUTTON2_MASK 'middle)
-           (maybe GDK_BUTTON3_MASK 'right)
-           (maybe GDK_SHIFT_MASK 'shift)
-           (maybe GDK_LOCK_MASK 'caps)
-           (maybe GDK_CONTROL_MASK 'control)
-           (maybe GDK_MOD1_MASK 'alt)
-           (maybe GDK_META_MASK 'meta))))
-
-(define (tell-all-frames-signal-changed n)
-  (define frames (for/list ([f (in-hash-keys all-frames)]) f))
-  (for ([f (in-hash-keys all-frames)])
-    (define e (send f get-eventspace))
-    (unless (eventspace-shutdown? e)
-      (parameterize ([current-eventspace e])
-        (queue-callback
-         (λ () 
-           (send f display-changed)))))))
-
-(define-signal-handler 
-  connect-monitor-changed-signal
-  "monitors-changed"
-  (_fun _GdkScreen -> _void)
-  (λ (screen) (tell-all-frames-signal-changed 1)))
-
-(define-signal-handler 
-  connect-screen-changed-signal
-  "screen-changed"
-  (_fun _GdkScreen -> _void)
-  (λ (screen) (tell-all-frames-signal-changed 2)))
-
-(define-signal-handler 
-  connect-composited-changed-signal
-  "composited-changed"
-  (_fun _GdkScreen -> _void)
-  (λ (screen) (tell-all-frames-signal-changed 3)))
-
-(define (screen-size-signal-connect connect-signal)
-  (void (connect-signal (cast (gdk_screen_get_default) _GdkScreen _GtkWidget))))
-(screen-size-signal-connect connect-monitor-changed-signal)
-(screen-size-signal-connect connect-screen-changed-signal)
-(screen-size-signal-connect connect-composited-changed-signal)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/gauge.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/gauge.rkt
deleted file mode 100644
index dda1a9a5c6..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/gauge.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-          "../../syntax.rkt"
-         "item.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "window.rkt"
-         "const.rkt")
-
-(provide 
- (protect-out gauge%))
-
-;; ----------------------------------------
-
-(define-gtk gtk_progress_bar_new (_fun _pointer -> _GtkWidget))
-(define-gtk gtk_progress_bar_set_fraction (_fun _GtkWidget _double* -> _void))
-(define-gtk gtk_progress_bar_set_orientation (_fun _GtkWidget _int -> _void))
-
-(define GTK_PROGRESS_BOTTOM_TO_TOP 2)
-
-(defclass gauge% item%
-  (init parent
-        label
-        rng
-        x y w h
-        style
-        font)
-  (inherit get-gtk set-auto-size)
-
-  (super-new [parent parent]
-             [gtk (as-gtk-allocation (gtk_progress_bar_new #f))]
-             [no-show? (memq 'deleted style)])
-  (define gtk (get-gtk))
-
-  (when (memq 'vertical style)
-    (gtk_progress_bar_set_orientation gtk GTK_PROGRESS_BOTTOM_TO_TOP))
-
-  (set-auto-size)
-
-  (define range rng)
-  (define value 0)
-
-  (define/private (reset)
-    (gtk_progress_bar_set_fraction gtk
-                                   (if (zero? range)
-                                       0.0
-                                       (/ value range))))
-
-  (define/public (get-range)
-    range)
-  (define/public (set-range r)
-    (set! range r)
-    (set! value (min value r))
-    (reset))
-
-  (define/public (set-value v)
-    (set! value v)
-    (reset))
-  (define/public (get-value)
-    value))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/gcwin.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/gcwin.rkt
deleted file mode 100644
index d017aeba40..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/gcwin.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         "utils.rkt"
-         "types.rkt"
-         "window.rkt")
-
-(provide 
- (protect-out scheme_add_gc_callback
-              scheme_remove_gc_callback
-              create-gc-window
-              make-gc-show-desc
-              make-gc-hide-desc))
-
-(define-cstruct _GdkWindowAttr
-  ([title _string]
-   [event_mask _int]
-   [x _int]
-   [y _int]
-   [width _int]
-   [height _int]
-   [wclass _int] ; GDK_INPUT_OUTPUT
-   [visual _pointer]
-   [colormap _pointer]
-   [window_type _int] ; GDK_WINDOW_CHILD
-   [cursor _pointer]
-   [wmclass_name _string]
-   [wmclass_class _string]
-   [override_redirect _gboolean]
-   [type_hint _int]))
-
-(define << arithmetic-shift)
-
-(define GDK_WA_TITLE (1 . << . 1))
-(define GDK_WA_X (1 . << . 2))
-(define GDK_WA_Y (1 . << . 3))
-(define GDK_WA_CURSOR (1 . << . 4))
-(define GDK_WA_COLORMAP (1 . << . 5))
-(define GDK_WA_VISUAL (1 . << . 6))
-(define GDK_WA_WMCLASS (1 . << . 7))
-(define GDK_WA_NOREDIR (1 . << . 8))
-(define GDK_WA_TYPE_HINT (1 . << . 9))
-
-(define GDK_INPUT_OUTPUT 0)
-
-(define GDK_WINDOW_CHILD 2)
-
-(define-gdk gdk_window_new (_fun _GdkWindow _GdkWindowAttr-pointer _uint
-                                 -> _GdkWindow))
-
-(define-gdk gdk_window_show _fpointer)
-(define-gdk gdk_window_hide _fpointer)
-(define-gdk gdk_display_flush _fpointer)
-(define-gdk gdk_draw_pixbuf _fpointer)
-
-(define-mz scheme_add_gc_callback (_fun _racket _racket -> _racket))
-(define-mz scheme_remove_gc_callback (_fun _racket -> _void))
-
-(define (create-gc-window cwin x y w h)
-  (let ([win (gdk_window_new cwin (make-GdkWindowAttr
-                                   ""
-                                   0
-                                   x y w h
-                                   GDK_INPUT_OUTPUT
-                                   #f #f 
-                                   GDK_WINDOW_CHILD
-                                   #f
-                                   "" "" #f 0)
-                             (bitwise-ior GDK_WA_X
-                                          GDK_WA_Y))])
-    win))
-
-(define (make-draw win pixbuf w h)
-  (vector 'ptr_ptr_ptr_int_int_int_int_int_int_int_int_int->void
-          gdk_draw_pixbuf
-          win #f pixbuf
-          0 0 0 0 w h
-          0 0 0))
-
-(define (make-flush)
-  (vector 'ptr_ptr_ptr->void gdk_display_flush (gdk_display_get_default) #f #f))
-
-(define (make-gc-show-desc win pixbuf w h)
-  (vector
-   (vector 'ptr_ptr_ptr->void gdk_window_show win #f #f)
-   (make-draw win pixbuf w h)
-   (make-flush)))
-
-(define (make-gc-hide-desc win pixbuf w h)
-  (vector
-   ;; draw the ``off'' bitmap so we can flush immediately
-   (make-draw win pixbuf w h)
-   (make-flush)
-   ;; hide the window; it may take a while for the underlying canvas
-   ;; to refresh:
-   (vector 'ptr_ptr_ptr->void gdk_window_hide win #f #f)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt
deleted file mode 100644
index 0cb6f9358d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt
+++ /dev/null
@@ -1,446 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/promise
-         racket/string
-         ffi/unsafe
-         ffi/unsafe/define
-         ffi/unsafe/alloc
-         ffi/cvector
-         (prefix-in draw: racket/draw/private/gl-context)
-         racket/draw/private/gl-config
-         "../../lock.rkt"
-         "types.rkt"
-         "utils.rkt"
-         "window.rkt"
-         "x11.rkt")
-
-(provide
- (protect-out prepare-widget-gl-context
-              create-widget-gl-context
-
-              create-and-install-gl-context
-              get-gdk-pixmap
-              install-gl-context))
-
-(define (ffi-lib/complaint-on-failure name vers)
-  (ffi-lib name vers
-           #:fail (lambda ()
-                    (log-warning "could not load library ~a ~a"
-                                 name vers)
-                    #f)))
-
-;; ===================================================================================================
-;; X11/GLX FFI
-
-(define x-lib (ffi-lib/complaint-on-failure "libX11" '("")))
-(define gl-lib (ffi-lib/complaint-on-failure "libGL" '("1" "")))
-
-(define-ffi-definer define-x x-lib
-  #:default-make-fail make-not-available)
-
-(define-ffi-definer define-glx gl-lib
-  #:default-make-fail make-not-available)
-
-;; X #defines/typedefs/enums
-(define _Display (_cpointer 'Display))
-(define _XErrorEvent (_cpointer 'XErrorEvent))
-(define _XID _ulong)
-(define True 1)
-(define False 0)
-(define None 0)
-(define Success 0)
-
-;; GLX #defines/typedefs/enums
-(define _GLXFBConfig (_cpointer 'GLXFBConfig))
-(define _GLXContext (_cpointer/null 'GLXContext))
-(define _XVisualInfo (_cpointer 'XVisualInfo))
-;; Attribute tokens for glXGetConfig variants (all GLX versions):
-(define GLX_DOUBLEBUFFER     5)
-(define GLX_STEREO           6)
-(define GLX_DEPTH_SIZE       12)
-(define GLX_STENCIL_SIZE     13)
-(define GLX_ACCUM_RED_SIZE   14)
-(define GLX_ACCUM_GREEN_SIZE 15)
-(define GLX_ACCUM_BLUE_SIZE  16)
-(define GLX_ACCUM_ALPHA_SIZE 17)
-;; GLX 1.3 and later:
-(define GLX_X_RENDERABLE     #x8012)
-(define GLX_RGBA_TYPE        #x8014)
-;; GLX 1.4 and later:
-(define GLX_SAMPLES          #x186a1)
-(define GLX_SAMPLE_BUFFERS   #x186a0)
-;; Attribute tokens for glXCreateContextAttribsARB (also GLX 1.4 and later):
-(define GLX_CONTEXT_MAJOR_VERSION_ARB #x2091)
-(define GLX_CONTEXT_MINOR_VERSION_ARB #x2092)
-(define GLX_CONTEXT_FLAGS_ARB         #x2094)
-(define GLX_CONTEXT_PROFILE_MASK_ARB  #x9126)
-;; GLX_CONTEXT_FLAGS_ARB bits
-(define GLX_CONTEXT_DEBUG_BIT_ARB              #x1)
-(define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB #x2)
-;; GLX_CONTEXT_PROFILE_MASK_ARB bits
-(define GLX_CONTEXT_CORE_PROFILE_BIT_ARB          #x1)
-(define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB #x2)
-
-(define-x XFree (_fun _pointer -> _int)
-  #:wrap (deallocator))
-
-(define-x XSetErrorHandler
-  (_fun (_fun _Display _XErrorEvent -> _int)
-        -> (_fun _Display _XErrorEvent -> _int)))
-
-(define-x XSync
-  (_fun _Display _int -> _void))
-
-(define-glx glXQueryVersion
-  (_fun _Display (major : (_ptr o _int)) (minor : (_ptr o _int))
-        -> (ret : _bool)
-        -> (values ret major minor)))
-
-(define-glx glXQueryExtensionsString
-  (_fun _Display _int -> _string/utf-8))
-
-(define-glx glXChooseFBConfig
-  (_fun _Display _int (_list i _int) (len : (_ptr o _int))
-        -> (_cvector o _GLXFBConfig len))
-  #:wrap (allocator (λ (v) (XFree (cvector-ptr v)))))
-
-(define-glx glXGetFBConfigAttrib
-  (_fun _Display _GLXFBConfig _int (out : (_ptr o _int))
-        -> (ret : _int)
-        -> (values ret out)))
-
-(define-glx glXCreateNewContext
-  (_fun _Display _GLXFBConfig _int _GLXContext _bool -> _GLXContext))
-
-(define-glx glXDestroyContext
-  (_fun _Display _GLXContext -> _void))
-
-(define-glx glXMakeCurrent
-  (_fun _Display _XID _GLXContext -> _bool))
-
-(define-glx glXSwapBuffers
-  (_fun _Display _XID -> _void))
-
-(define-glx glXIsDirect
-  (_fun _Display _GLXContext -> _bool))
-
-(define-glx glXGetVisualFromFBConfig
-  (_fun _Display _GLXFBConfig -> _XVisualInfo)
-  #:wrap (allocator XFree))
-
-(define-glx glXCreateGLXPixmap
-  (_fun _Display _XVisualInfo _XID -> _XID))
-
-(define-glx glXDestroyGLXPixmap
-  (_fun _Display _XID -> _void))
-
-(define-glx glXGetProcAddressARB
-  (_fun _string -> _pointer))
-
-(define lazy-glXCreateContextAttribsARB
-  (delay
-    (function-ptr (glXGetProcAddressARB "glXCreateContextAttribsARB")
-                  (_fun _Display _GLXFBConfig _GLXContext _bool (_list i _int)
-                        -> _GLXContext))))
-
-(define (glXCreateContextAttribsARB . args)
-  (apply (force lazy-glXCreateContextAttribsARB) args))
-
-(define-gtk gtk_widget_get_display (_fun _GtkWidget -> _GdkDisplay))
-(define-gtk gtk_widget_get_screen (_fun _GtkWidget -> _GdkScreen))
-(define-gtk gtk_widget_get_window (_fun _GtkWidget -> _GtkWindow))
-
-;; ===================================================================================================
-;; GLX versions and extensions queries
-
-(define lazy-get-glx-version
-  (delay
-    (define-values (worked? glx-major glx-minor)
-      (glXQueryVersion (gdk_x11_display_get_xdisplay (gdk_display_get_default))))
-    
-    (unless worked?
-      (error 'get-glx-version "can't get GLX version using default display"))
-    
-    (define glx-version (+ glx-major (/ glx-minor 10)))
-    
-    (when (< glx-version #e1.3)
-      (error 'get-glx-version "need GLX version 1.3 or greater; given version ~a.~a"
-             glx-major glx-minor))
-    
-    glx-version))
-
-;; -> positive-exact-rational
-(define (get-glx-version)
-  (force lazy-get-glx-version))
-
-(define lazy-glx-extensions
-  (delay
-    (define str
-      (glXQueryExtensionsString (gdk_x11_display_get_xdisplay (gdk_display_get_default))
-                                (gdk_x11_screen_get_screen_number (gdk_screen_get_default))))
-    (string-split str)))
-
-(define lazy-GLX_ARB_create_context?
-  (delay (member "GLX_ARB_create_context"
-                 (force lazy-glx-extensions))))
-
-(define lazy-GLX_ARB_create_context_profile?
-  (delay (member "GLX_ARB_create_context_profile"
-                 (force lazy-glx-extensions))))
-
-;; ===================================================================================================
-;; Wrapper for the _GLXContext (if we can get one from GLX)
-
-(define gl-context% 
-  (class draw:gl-context%
-    (init-field gl display drawable pixmap)
-    
-    (define/override (get-handle) gl)
-    
-    (define/public (get-gtk-display) display)
-    (define/public (get-gtk-drawable) drawable)
-    (define/public (get-glx-pixmap) pixmap)
-    
-    (define (get-drawable-xid)
-      (if pixmap pixmap (gdk_x11_drawable_get_xid drawable)))
-    
-    (define/override (draw:do-call-as-current t)
-      (define xdisplay (gdk_x11_display_get_xdisplay display))
-      (dynamic-wind
-       (lambda ()
-         (glXMakeCurrent xdisplay (get-drawable-xid) gl))
-       t
-       (lambda ()
-         (glXMakeCurrent xdisplay 0 #f))))
-    
-    (define/override (draw:do-swap-buffers)
-      (glXSwapBuffers (gdk_x11_display_get_xdisplay display)
-                      (get-drawable-xid)))
-    
-    (super-new)))
-
-;; ===================================================================================================
-;; Getting OpenGL contexts
-
-;; STUPIDITY ALERT
-
-;; Apparently, the designers of glXCreateNewContext and glXCreateContextAttribsARB didn't trust us to
-;; check return values or output arguments, so when these functions fail, they raise an X error and
-;; send an error code to the X error handler. X errors, by default, *terminate the program* and print
-;; an annoyingly vague, barely helpful error message.
-
-;; This is especially bad with glXCreateContextAttribsARB, which always fails (i.e. crashes the
-;; program) if we ask for an unsupported OpenGL version. Worse, this is the only way to find out
-;; which OpenGL versions are available!
-
-;; So we override the X error handler to silently fail, and sync right after the calls to make sure
-;; the errors are processed immediately. With glXCreateContextAttribsARB, we then try the next lowest
-;; OpenGL version. If all attempts to get a context fail, we return #f.
-
-(define (null-x-error-handler xdisplay xerrorevent)
-  ;; Do nothing
-  0)
-
-;; _Display _GLXFBConfig _GLXContext -> _GLXContext
-(define (glx-create-new-context xdisplay cfg share-gl)
-  ;; Sync right now, or the sync further on could crash Racket with an [xcb] error about events
-  ;; happening out of sequence
-  (XSync xdisplay False)
-  (define old-handler #f)
-  (dynamic-wind
-   (λ ()
-     (set! old-handler (XSetErrorHandler null-x-error-handler)))
-   (λ ()
-     (define gl (glXCreateNewContext xdisplay cfg GLX_RGBA_TYPE share-gl #t))
-     (unless gl (log-warning "gl-config: unable to get OpenGL context"))
-     gl)
-   (λ ()
-     ;; Sync to ensure errors are processed while we're throwing them away
-     (XSync xdisplay False)
-     (XSetErrorHandler old-handler))))
-
-;; OpenGL core versions we'll try to get, in order
-(define core-gl-versions '((4 5) (4 4) (4 3) (4 2) (4 1) (4 0) (3 3) (3 2) (3 1) (3 0)))
-
-;; _Display _GLXFBConfig _GLXContext -> _GLXContext
-(define (glx-create-core-context xdisplay cfg share-gl)
-  ;; Sync right now, or the sync further on could crash Racket with an [xcb] error about events
-  ;; happening out of sequence
-  (XSync xdisplay False)
-  (let/ec return
-    (define old-handler #f)
-    (dynamic-wind
-     (λ ()
-       (set! old-handler (XSetErrorHandler null-x-error-handler)))
-     (λ ()
-       (for ([gl-version  (in-list core-gl-versions)])
-         (define gl-major (car gl-version))
-         (define gl-minor (cadr gl-version))
-         (define context-attribs
-           (list GLX_CONTEXT_MAJOR_VERSION_ARB gl-major
-                 GLX_CONTEXT_MINOR_VERSION_ARB gl-minor
-                 GLX_CONTEXT_PROFILE_MASK_ARB GLX_CONTEXT_CORE_PROFILE_BIT_ARB
-                 None))
-         (define gl
-           (glXCreateContextAttribsARB xdisplay cfg share-gl #t context-attribs))
-         (when gl (return gl))))
-     (λ ()
-       ;; Sync to ensure errors are processed while we're throwing them away
-       (XSync xdisplay False)
-       (XSetErrorHandler old-handler)))
-    (log-warning "gl-config: unable to get core context; falling back")
-    (glx-create-new-context xdisplay cfg share-gl)))
-
-;; ===================================================================================================
-
-;; (or/c #f _GtkWidget) -> _GdkDisplay
-(define (gtk-maybe-widget-get-display widget)
-  (cond [widget  (gtk_widget_get_display widget)]
-        [else    (gdk_display_get_default)]))
-
-;; (or/c #f _GtkWidget) -> _GdkScreen
-(define (gtk-maybe-widget-get-screen widget)
-  (cond [widget  (gtk_widget_get_screen widget)]
-        [else    (gdk_screen_get_default)]))
-
-;; _Display _GLXFBConfig int int -> int
-(define (glx-get-fbconfig-attrib xdisplay cfg attrib bad-value)
-  (define-values (err value) (glXGetFBConfigAttrib xdisplay cfg attrib))
-  (if (= err Success) value bad-value))
-
-;; (or/c #f _GtkWidget) _GdkDrawable gl-config% boolean? -> gl-context%
-;;   where _GdkDrawable = (or/c _GtkWindow _GdkPixmap)
-(define (make-gtk-drawable-gl-context widget drawable conf wants-double?)
-  (define glx-version (get-glx-version))
-  
-  ;; If widget isn't #f, use its display and screen
-  (define display (gtk-maybe-widget-get-display widget))
-  (define screen (gtk-maybe-widget-get-screen widget))
-  
-  ;; Get the X objects wrapped by the GDK objects
-  (define xdisplay (gdk_x11_display_get_xdisplay display))
-  (define xscreen (gdk_x11_screen_get_screen_number screen))
-  
-  ;; Create an attribute list using the GL config
-  (define xattribs
-    (append
-     ;; Be aware: we may get double buffering even if we don't ask for it
-     (if wants-double?
-         (if (send conf get-double-buffered) (list GLX_DOUBLEBUFFER True) null)
-         null)
-     (if (send conf get-stereo) (list GLX_STEREO True) null)
-     ;; Finish out with standard GLX 1.3 attributes
-     (list
-      GLX_X_RENDERABLE True  ; yes, we want to use OpenGL to render today
-      GLX_DEPTH_SIZE (send conf get-depth-size)
-      GLX_STENCIL_SIZE (send conf get-stencil-size)
-      GLX_ACCUM_RED_SIZE (send conf get-accum-size)
-      GLX_ACCUM_GREEN_SIZE (send conf get-accum-size)
-      GLX_ACCUM_BLUE_SIZE (send conf get-accum-size)
-      GLX_ACCUM_ALPHA_SIZE (send conf get-accum-size)
-      ;; GLX_SAMPLES is handled below - GLX regards it as an absolute lower bound, which makes it
-      ;; too easy for user programs to fail to get a context
-      None)))
-  
-  (define multisample-size (send conf get-multisample-size))
-  
-  ;; Get all framebuffer configs for this display and screen that match the requested attributes,
-  ;; then sort them to put the best in front
-  ;; GLX already sorts them pretty well, so we just need a stable sort on multisamples at the moment
-  (define cfgs
-    (let* ([cfgs  (cvector->list (glXChooseFBConfig xdisplay xscreen xattribs))]
-           ;; Keep all configs with multisample size <= requested (i.e. make multisample-size an
-           ;; abolute upper bound)
-           [cfgs  (if (< glx-version #e1.4)
-                      cfgs
-                      (filter (λ (cfg)
-                                (define m (glx-get-fbconfig-attrib xdisplay cfg GLX_SAMPLES 0))
-                                (<= m multisample-size))
-                              cfgs))]
-           ;; Sort all configs by multisample size, decreasing
-           [cfgs  (if (< glx-version #e1.4)
-                      cfgs
-                      (sort cfgs >
-                            #:key (λ (cfg) (glx-get-fbconfig-attrib xdisplay cfg GLX_SAMPLES 0))
-                            #:cache-keys? #t))])
-      cfgs))
-  
-  (cond
-    [(null? cfgs)  #f]
-    [else
-     ;; The framebuffer configs are sorted best-first, so choose the first
-     (define cfg (car cfgs))
-     (define share-gl
-       (let ([share-ctxt  (send conf get-share-context)])
-         (and share-ctxt (send share-ctxt get-handle))))
-     
-     ;; Get a GL context
-     (define gl
-       (if (and (>= glx-version #e1.4)
-                (not (send conf get-legacy?))
-                (force lazy-GLX_ARB_create_context?)
-                (force lazy-GLX_ARB_create_context_profile?))
-           ;; If the GLX version is high enough, legacy? is #f, and GLX has the right extensions,
-           ;; try to get a core-profile context
-           (glx-create-core-context xdisplay cfg share-gl)
-           ;; Otherwise use the old method
-           (glx-create-new-context xdisplay cfg share-gl)))
-     ;; The above will return a direct rendering context when it can
-     ;; If it doesn't, the context will be version 1.4 or lower, unless GLX is implemented with
-     ;; proprietary extensions (NVIDIA's drivers sometimes do this)
-     
-     ;; Now wrap the GLX context in a gl-context%
-     (cond
-       [gl
-        ;; If there's no widget, this is for a pixmap, so get the stupid GLX wrapper for it or
-        ;; indirect rendering may crash on some systems (notably mine)
-        (define pixmap
-          (if widget #f (glXCreateGLXPixmap xdisplay
-                                            (glXGetVisualFromFBConfig xdisplay cfg)
-                                            (gdk_x11_drawable_get_xid drawable))))
-        
-        (define ctxt (new gl-context% [gl gl] [display display] [drawable drawable] [pixmap pixmap]))
-        ;; Refcount these so they don't go away until the finalizer below destroys the GLXContext
-        (g_object_ref display)
-        (g_object_ref drawable)
-        (register-finalizer
-         ctxt
-         (λ (ctxt)
-           (define gl (send ctxt get-handle))
-           (define display (send ctxt get-gtk-display))
-           (define drawable (send ctxt get-gtk-drawable))
-           (define pixmap (send ctxt get-glx-pixmap))
-           (define xdisplay (gdk_x11_display_get_xdisplay display))
-           (when pixmap (glXDestroyGLXPixmap xdisplay pixmap))
-           (glXDestroyContext xdisplay gl)
-           (g_object_unref drawable)
-           (g_object_unref display)))
-        ctxt]
-       [else  #f])]))
-
-(define (make-gtk-widget-gl-context widget conf)
-  (atomically
-   (make-gtk-drawable-gl-context widget (gtk_widget_get_window widget) conf #t)))
-
-(define (make-gtk-pixmap-gl-context pixmap conf)
-  (atomically
-   (make-gtk-drawable-gl-context #f pixmap conf #f)))
-
-;; ===================================================================================================
-
-(define widget-config-hash (make-weak-hasheq))
-
-(define (prepare-widget-gl-context widget conf)
-  (hash-set! widget-config-hash widget (if conf conf (make-object gl-config%))))
-
-(define (create-widget-gl-context widget)
-  (define conf (hash-ref widget-config-hash widget #f))
-  (and conf (make-gtk-widget-gl-context widget conf)))
-
-(define-local-member-name
-  get-gdk-pixmap
-  install-gl-context)
-
-(define (create-and-install-gl-context bm conf)
-  (define ctxt (make-gtk-pixmap-gl-context (send bm get-gdk-pixmap) conf))
-  (and ctxt (send bm install-gl-context ctxt)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/group-panel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/group-panel.rkt
deleted file mode 100644
index f1595127ef..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/group-panel.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-          "../../syntax.rkt"
-          "../../lock.rkt"
-         "window.rkt"
-         "client-window.rkt"
-         "panel.rkt"
-         "utils.rkt"
-         "types.rkt")
-
-(provide
- (protect-out group-panel%))
-
-(define-gtk gtk_frame_new (_fun _string -> _GtkWidget))
-
-(define-gtk gtk_frame_set_label (_fun _GtkWidget _string -> _void))
-(define-gtk gtk_frame_get_label_widget (_fun _GtkWidget ->  _GtkWidget))
-
-(define group-panel%
-  (class (client-size-mixin (panel-container-mixin (panel-mixin window%)))
-    (init parent
-          x y w h
-          style
-          label)
-    
-    (inherit set-size set-auto-size infer-client-delta
-             get-gtk get-height)
-
-    (define gtk (as-gtk-allocation (gtk_frame_new label)))
-    (define client-gtk 
-      (atomically (let ([client-gtk (gtk_fixed_new)])
-                    (gtk_container_add gtk client-gtk)
-                    client-gtk)))
-    (gtk_widget_show client-gtk)
-    
-    (super-new [parent parent]
-               [gtk gtk]
-               [client-gtk client-gtk]
-               [extra-gtks (list client-gtk)]
-               [no-show? (memq 'deleted style)])
-
-    (infer-client-delta #t #t (gtk_frame_get_label_widget gtk))
-    (set-auto-size)
-
-    (define/public (set-label s)
-      (gtk_frame_set_label gtk s))
-
-    (define/override (gets-focus?) #f)
-    
-    (define/override (get-client-gtk) client-gtk)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/init.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/init.rkt
deleted file mode 100644
index ded4146bb8..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/init.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         "utils.rkt"
-         "types.rkt"
-         "queue.rkt")
-
-(define-gtk gtk_rc_parse_string (_fun _string -> _void))
-(define-gtk gtk_rc_add_default_file (_fun _path -> _void))
-
-(when (eq? 'windows (system-type))
-  (let ([dir (simplify-path (build-path (collection-path "racket") 'up 'up "lib"))])
-    (gtk_rc_parse_string (format "module_path \"~a\"\n" dir))
-    (gtk_rc_add_default_file (build-path dir "gtkrc"))))
-
-(define pump-thread (gtk-start-event-pump))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/item.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/item.rkt
deleted file mode 100644
index dbfd10bdb7..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/item.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         racket/draw/private/local
-          "../../syntax.rkt"
-         "window.rkt"
-         "utils.rkt"
-         "types.rkt")
-
-(provide
- (protect-out item%
-              install-control-font))
-
-(define _PangoFontDescription _pointer)
-(define-gtk gtk_widget_modify_font (_fun _GtkWidget _PangoFontDescription -> _void))
-
-(define (install-control-font gtk font)
-  (when font
-    (gtk_widget_modify_font gtk (send font get-pango))))
-
-(defclass item% window%
-  (inherit get-client-gtk)
-
-  (init-field [callback void])
-  (init [font #f])
-
-  (super-new)
-
-  (let ([client-gtk (get-client-gtk)])
-    (connect-focus client-gtk)
-    (connect-key-and-mouse client-gtk))
-  (install-control-font (get-label-gtk) font)
-  
-  (define/public (get-label-gtk) (get-client-gtk))
-
-  (def/public-unimplemented set-label)
-  (def/public-unimplemented get-label)
-
-  (define/public (command e)
-    (callback this e)))
-
-
-
-
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/keycode.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/keycode.rkt
deleted file mode 100644
index 818aaebd23..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/keycode.rkt
+++ /dev/null
@@ -1,123 +0,0 @@
-#lang racket/base
-
-(provide map-key-code
-         key-symbol-to-menu-key)
-
-(define (map-key-code v)
-  (hash-ref
-   #hash((#xff08 . #\backspace)
-         (#xffff . #\rubout)
-         (#xff09 . #\tab)
-         (#xfe20 . #\tab) ; left tab (sometimes from ctl-shift-tab)
-         (#xff0a . #\newline)
-         (#xff0d . #\return)
-         (#xff1b . escape) ; escape
-         (#xff50 . home)
-         (#xff51 . left)
-         (#xff52 . up)
-         (#xff53 . right)
-         (#xff54 . down)
-         (#xff55 . prior)
-         (#xff56 . next)
-         (#xff57 . end)
-         (#xff63 . insert)
-         (#xff80 . #\space) ; keypad
-         (#xff89 . #\tab) ; keypad
-         (#xff8d . numpad-enter) ; was #\u3 in earlier versions
-         (#xff91 . f1)
-         (#xff92 . f2)
-         (#xff93 . f3)
-         (#xff94 . f4)
-         (#xff95 . home) ; keypad
-         (#xff96 . left) ; keypad
-         (#xff97 . up) ; keypad
-         (#xff98 . right) ; keypad
-         (#xff99 . down) ; keypad
-         (#xff9a . prior) ; keypad
-         (#xff9b . next) ; keypad
-         (#xff9c . end) ; keypad
-         (#xff9e . insert) ; keypad
-         (#xff9f . #\rubout) ; keypad
-         (#xffaa . multiply)
-         (#xffab . add)
-         (#xffad . subtract)
-         (#xffaf . divide)
-         (#xffb0 . numpad0)
-         (#xffb1 . numpad1)
-         (#xffb2 . numpad2)
-         (#xffb3 . numpad3)
-         (#xffb4 . numpad4)
-         (#xffb5 . numpad5)
-         (#xffb6 . numpad6)
-         (#xffb7 . numpad7)
-         (#xffb8 . numpad8)
-         (#xffb9 . numpad9)
-         (#xffbe . f1)
-         (#xffbf . f2)
-         (#xffc0 . f3)
-         (#xffc1 . f4)
-         (#xffc2 . f5)
-         (#xffc3 . f6)
-         (#xffc4 . f7)
-         (#xffc5 . f8)
-         (#xffc6 . f9)
-         (#xffc7 . f10)
-         (#xffc8 . f11)
-         (#xffc9 . f12)
-         (#xffca . f13)
-         (#xffcb . f14)
-         (#xffcc . f15)
-         (#xffe1 . shift)
-         (#xffe2 . rshift)
-         (#xffe3 . control)
-         (#xffe4 . rcontrol))
-   v
-   #f))
-
-(define (key-symbol-to-menu-key v)
-  (hash-ref
-   #hash((escape . #xff1b)
-         (home . #xff50)
-         (left . #xff51)
-         (up . #xff52)
-         (right . #xff53)
-         (down . #xff54)
-         (prior . #xff55)
-         (next . #xff56)
-         (end . #xff57)
-         (insert . #xff63)
-         (f1 . #xff91)
-         (f2 . #xff92)
-         (f3 . #xff93)
-         (f4 . #xff94)
-         (multiply . #xffaa)
-         (add . #xffab)
-         (subtract . #xffad)
-         (divide . #xffaf)
-         (numpad0 . #xffb0)
-         (numpad1 . #xffb1)
-         (numpad2 . #xffb2)
-         (numpad3 . #xffb3)
-         (numpad4 . #xffb4)
-         (numpad5 . #xffb5)
-         (numpad6 . #xffb6)
-         (numpad7 . #xffb7)
-         (numpad8 . #xffb8)
-         (numpad9 . #xffb9)
-         (f1 . #xffbe)
-         (f2 . #xffbf)
-         (f3 . #xffc0)
-         (f4 . #xffc1)
-         (f5 . #xffc2)
-         (f6 . #xffc3)
-         (f7 . #xffc4)
-         (f8 . #xffc5)
-         (f9 . #xffc6)
-         (f10 . #xffc7)
-         (f11 . #xffc8)
-         (f12 . #xffc9)
-         (f13 . #xffca)
-         (f14 . #xffcb)
-         (f15 . #xffcc))
-   v
-   #f))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/keymap.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/keymap.rkt
deleted file mode 100644
index 80ff0c4e6f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/keymap.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt")
-
-(provide 
- (protect-out get-alts))
-
-(define _GdkKeymap (_cpointer 'GdkKeymap))
-
-(define-gdk gdk_keymap_get_default (_fun -> _GdkKeymap))
-
-(define-gdk gdk_keymap_translate_keyboard_state
-  (_fun _GdkKeymap
-        _uint ; hardware_keycode
-        _int ; GdkModifierType state
-        _int ; group
-        (keyval : (_ptr o _uint))
-        (effective_group : (_ptr o _int))
-        (level : (_ptr o _int))
-        (consumed_modifiers : (_ptr o _int))
-        -> (r : _gboolean)
-        -> (and r keyval)))
-                
-(define (get-alts event)
-  (define (get-one-alt mask)
-    (gdk_keymap_translate_keyboard_state (gdk_keymap_get_default)
-                                         (GdkEventKey-hardware_keycode event)
-                                         (let ([mods (GdkEventKey-state event)])
-                                           (bitwise-ior (- mods (bitwise-and mods mask))
-                                                        (bitwise-and mask (bitwise-not (bitwise-and mods mask)))))
-                                         (GdkEventKey-group event)))
-  (let ([alt-gr? (eq? (= (bitwise-and (GdkEventKey-state event) GDK_CONTROL_MASK)
-                         GDK_CONTROL_MASK)
-                      (= (bitwise-and (GdkEventKey-state event) GDK_MOD1_MASK)
-                         GDK_MOD1_MASK))])
-    (values (get-one-alt GDK_SHIFT_MASK)
-            (and alt-gr?
-                 (get-one-alt (bitwise-ior GDK_MOD1_MASK GDK_CONTROL_MASK)))
-            (and alt-gr?
-                 (get-one-alt (bitwise-ior GDK_SHIFT_MASK GDK_MOD1_MASK GDK_CONTROL_MASK)))
-            (get-one-alt GDK_LOCK_MASK))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/list-box.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/list-box.rkt
deleted file mode 100644
index 2b0f1043b9..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/list-box.rkt
+++ /dev/null
@@ -1,470 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-	 ffi/unsafe/define
-         racket/class
-         (only-in racket/list take drop)
-          "../../syntax.rkt"
-          "../../lock.rkt"
-         "item.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "window.rkt"
-         "const.rkt"
-         "../common/event.rkt")
-
-(provide 
- (protect-out list-box%))
-
-;; ----------------------------------------
-
-(define-cstruct _GtkTreeIter ([stamp _int]
-                              [user_data _pointer]
-                              [user_data2 _pointer]
-                              [user_data3 _pointer]))
-
-(define _GtkListStore (_cpointer 'GtkListStore))
-(define _GtkCellRenderer (_cpointer 'GtkCellRenderer))
-(define _GtkTreeViewColumn _GtkWidget) ; (_cpointer 'GtkTreeViewColumn)
-
-(define GTK_SELECTION_SINGLE 1)
-(define GTK_SELECTION_MULTIPLE 3)
-
-(define GTK_TREE_VIEW_COLUMN_AUTOSIZE 1)
-(define GTK_TREE_VIEW_COLUMN_FIXED 2)
-
-(define-gtk gtk_scrolled_window_new (_fun _pointer _pointer -> _GtkWidget))
-(define-gtk gtk_scrolled_window_set_policy (_fun _GtkWidget _int _int -> _void))
-
-(define-gtk gtk_list_store_newv (_fun _int (_list i _long) -> _GtkListStore))
-(define-gtk gtk_list_store_clear (_fun _GtkListStore -> _void))
-(define-gtk gtk_list_store_append (_fun _GtkListStore _GtkTreeIter-pointer _pointer -> _void))
-(define-gtk gtk_list_store_set (_fun _GtkListStore _GtkTreeIter-pointer _int _string _int -> _void))
-(define-gtk gtk_tree_view_new_with_model (_fun _GtkListStore -> _GtkWidget))
-(define-gtk gtk_tree_view_set_model (_fun _GtkWidget _GtkListStore -> _void))
-(define-gtk gtk_tree_view_set_headers_visible (_fun _GtkWidget _gboolean -> _void))
-(define-gtk gtk_cell_renderer_text_new (_fun -> _GtkCellRenderer))
-(define-gtk gtk_tree_view_column_new_with_attributes (_fun _string _GtkCellRenderer _string _int _pointer -> _GtkTreeViewColumn))
-(define-gtk gtk_tree_view_column_set_attributes (_fun _GtkTreeViewColumn _GtkCellRenderer _string _int _pointer -> _void))
-(define-gtk gtk_tree_view_column_set_resizable (_fun _GtkTreeViewColumn _gboolean -> _void))
-(define-gtk gtk_tree_view_column_set_clickable (_fun _GtkTreeViewColumn _gboolean -> _void))
-(define-gtk gtk_tree_view_column_set_reorderable (_fun _GtkTreeViewColumn _gboolean -> _void))
-(define-gtk gtk_tree_view_append_column (_fun _GtkWidget _GtkTreeViewColumn -> _void))
-(define-gtk gtk_tree_view_remove_column (_fun _GtkWidget _GtkTreeViewColumn -> _void))
-(define-gtk gtk_tree_view_get_selection (_fun _GtkWidget -> _GtkWidget))
-(define-gtk gtk_tree_selection_set_mode (_fun _GtkWidget _int -> _void))
-(define-gtk gtk_list_store_remove (_fun _GtkListStore _GtkTreeIter-pointer -> _gboolean))
-(define-gtk gtk_tree_model_get_iter (_fun _GtkListStore _GtkTreeIter-pointer _pointer -> _gboolean))
-(define-gtk gtk_tree_view_scroll_to_cell (_fun _GtkWidget _pointer _pointer _gboolean _gfloat _gfloat -> _void))
-(define-gtk gtk_tree_view_get_column (_fun _GtkWidget _int -> _GtkTreeViewColumn))
-(define-gtk gtk_tree_view_move_column_after (_fun _GtkWidget _GtkTreeViewColumn (_or-null _GtkTreeViewColumn) -> _void))
-(define-gtk gtk_tree_view_column_set_title  (_fun _GtkTreeViewColumn _string -> _void))
-(define-gtk gtk_tree_view_column_set_sizing (_fun _GtkTreeViewColumn _int -> _void))
-(define-gtk gtk_tree_view_column_get_width (_fun _GtkTreeViewColumn -> _int))
-(define-gtk gtk_tree_view_column_get_min_width (_fun _GtkTreeViewColumn -> _int))
-(define-gtk gtk_tree_view_column_get_max_width (_fun _GtkTreeViewColumn -> _int))
-(define-gtk gtk_tree_view_column_set_fixed_width (_fun _GtkTreeViewColumn _int -> _void))
-(define-gtk gtk_tree_view_column_set_min_width (_fun _GtkTreeViewColumn _int -> _void))
-(define-gtk gtk_tree_view_column_set_max_width (_fun _GtkTreeViewColumn _int -> _void))
-
-(define _GList (_cpointer 'List))
-(define-glib g_list_foreach (_fun _GList (_fun _pointer -> _void) _pointer -> _void))
-(define-glib g_list_free (_fun _GList -> _void))
-(define-gtk gtk_tree_selection_get_selected_rows (_fun _GtkWidget _pointer -> (_or-null _GList)))
-(define-gtk gtk_tree_selection_path_is_selected (_fun _GtkWidget _pointer -> _gboolean))
-(define-gtk gtk_tree_selection_unselect_all (_fun  _GtkWidget -> _void))
-(define-gtk gtk_tree_selection_select_path (_fun  _GtkWidget _pointer -> _void))
-(define-gtk gtk_tree_selection_unselect_path (_fun  _GtkWidget _pointer -> _void))
-(define-gtk gtk_tree_path_new_from_indices (_fun _int _int -> _pointer))
-(define-gtk gtk_tree_path_free (_fun _pointer -> _void))
-(define-gtk gtk_tree_path_get_indices (_fun _pointer -> _pointer))
-
-(define-gtk gtk_tree_view_get_visible_range (_fun _GtkWidget [sp : (_ptr o _pointer)] [ep : (_ptr o _pointer)]
-                                                  -> [ok? : _gboolean]
-                                                  -> (values (if ok? sp #f) (if ok? ep #f))))
-
-(define-signal-handler connect-changed "changed"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx queue-changed)))))
-
-(define-signal-handler connect-clicked "clicked"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx column-clicked gtk)))))
-
-(define-signal-handler connect-activated "row-activated"
-  (_fun _GtkWidget _pointer _pointer -> _void)
-  (lambda (gtk path column)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx queue-activated)))))
-
-(defclass list-box% item%
-  (init parent cb
-        label kind x y w h
-        choices style
-        font label-font
-        columns
-        column-order)
-  (inherit get-gtk set-auto-size is-window-enabled?)
-
-  (define empty-columns (for/list ([l (in-list (cdr columns))])
-                          ""))
-  (define itemss (for/list ([i (in-list choices)])
-                   (cons i empty-columns)))
-  
-  (define data (map (lambda (c) (box #f)) choices))
-
-  
-  (define (make-store count)
-    (as-gobject-allocation 
-     (gtk_list_store_newv count
-                          (for/list ([i (in-range count)])
-                            G_TYPE_STRING))))
-  (define store (make-store (length columns)))
-
-  (define (reset-content)
-    (let ([iter (make-GtkTreeIter 0 #f #f #f)])
-      (for ([items (in-list itemss)])
-        (gtk_list_store_append store iter #f)
-        (for ([item (in-list items)]
-              [col (in-naturals 0)])
-          (gtk_list_store_set store iter col item -1))))
-    (maybe-init-select))
-
-  (define/private (maybe-init-select)
-    ;; For consistency with other platforms,
-    ;; don't try to select an item initially.
-    (when #f
-      (when (and (= (get-selection) -1)
-                 (pair? data))
-        (set-selection 0))))
-    
-  (define gtk (as-gtk-allocation (gtk_scrolled_window_new #f #f)))
-  (gtk_scrolled_window_set_policy gtk GTK_POLICY_AUTOMATIC GTK_POLICY_ALWAYS)
-
-  (define headers? (memq 'column-headers style))
-  (define click-headers? (and headers?
-                              (memq 'clickable-headers style)))
-  (define reorder-headers? (and headers?
-                                (memq 'reorderable-headers style)))
-
-  (define renderer (gtk_cell_renderer_text_new))
-
-  (define/private (make-column label col)
-    (let* ([column
-            (gtk_tree_view_column_new_with_attributes
-             label
-             renderer
-             "text"
-             col
-             #f)])
-      (when headers?
-        (gtk_tree_view_column_set_resizable column #t)
-        (gtk_tree_view_column_set_min_width column 1)
-        (when click-headers?
-          (gtk_tree_view_column_set_clickable column #t))
-        (when reorder-headers?
-          (gtk_tree_view_column_set_reorderable column #t)))
-      column))
-
-  (define-values (client-gtk column-gtks)
-    (atomically
-     (let* ([client-gtk (gtk_tree_view_new_with_model store)]
-            [columns (for/list ([label (in-list columns)]
-                                [col (in-naturals)])
-                       (make-column label col))])
-       (gobject-unref store)
-       (unless headers?
-         (gtk_tree_view_set_headers_visible client-gtk #f))
-       (for ([column (in-list columns)])
-         (gtk_tree_view_append_column client-gtk column))
-       (values client-gtk columns))))
-
-  (when column-order
-    (set-column-order column-order))
-  (define/public (set-column-order column-order)
-    (let loop ([prev #f] [l column-order])
-      (unless (null? l)
-        (let ([column-gtk (list-ref column-gtks (car l))])
-          (gtk_tree_view_move_column_after client-gtk column-gtk prev)
-          (loop column-gtk (cdr l))))))
-
-  (gtk_container_add gtk client-gtk)
-  (gtk_widget_show client-gtk)
-
-  (define selection
-    (gtk_tree_view_get_selection client-gtk))
-
-  (gtk_tree_selection_set_mode selection (if (or (eq? kind 'extended)
-                                                 (eq? kind 'multiple))
-                                             GTK_SELECTION_MULTIPLE
-                                             GTK_SELECTION_SINGLE))
-
-  (super-new [parent parent]
-             [gtk gtk]
-             [extra-gtks (list* client-gtk selection
-                                (if (memq 'clickable-headers style)
-                                    column-gtks
-                                    null))]
-             [callback cb]
-             [font font]
-             [no-show? (memq 'deleted style)])
-
-  (set-auto-size 32) ; 32 is extra width
-
-  (connect-changed selection)
-  (connect-activated client-gtk)
-  (for ([column (in-list column-gtks)])
-    (column-finish column))
-
-  (define/private (column-finish column)
-    (connect-clicked column)
-    (let ([w (gtk_tree_view_column_get_width column)])
-      (gtk_tree_view_column_set_sizing column GTK_TREE_VIEW_COLUMN_FIXED)
-      (gtk_tree_view_column_set_fixed_width column (max 50 w))))
-
-  (define/override (get-client-gtk) client-gtk)
-
-  (define callback cb)
-  (define ignore-click? #f)
-  (define/private (do-queue-changed type)
-    ;; Called from event-handling thread
-    (unless ignore-click?
-      (queue-window-event
-       this
-       (lambda ()
-         (unless (null? itemss)
-           (callback this (new control-event%
-                               [event-type type]
-                               [time-stamp (current-milliseconds)])))))))
-
-  (define/public (queue-changed)
-    (do-queue-changed 'list-box))
-
-  (define/public (queue-activated)
-    (do-queue-changed 'list-box-dclick))
-
-  (define/private (column->pos col)
-    (let loop ([l column-gtks]
-               [pos 0])
-      (cond
-       [(null? l) #f]
-       [(ptr-equal? (car l) col) pos]
-       [else (loop (cdr l) (add1 pos))])))
-
-  (define/public (column-clicked col)
-    (let ([pos (column->pos col)])
-      (when pos
-        (queue-window-event
-         this
-         (lambda ()
-           (callback this (new column-control-event%
-                               [event-type 'list-box-column]
-                               [column pos]
-                               [time-stamp (current-milliseconds)])))))))
-
-  (define/public (get-column-order)
-    (for/list ([i (in-range (length column-gtks))])
-      (column->pos (gtk_tree_view_get_column client-gtk i))))
-
-  (define/private (get-iter i)
-    (atomically
-     (let ([iter (make-GtkTreeIter 0 #f #f #f)]
-           [p (gtk_tree_path_new_from_indices i -1)])
-       (gtk_tree_model_get_iter store iter p)
-       (gtk_tree_path_free p)
-       iter)))
-
-  (def/public-unimplemented get-label-font)
-
-  (define/private (replace-nth items i s)
-    (append (take items i)
-            (list s)
-            (drop items (add1 i))))
-
-  (define/public (set-string i s [col 0])
-    (set! itemss
-          (replace-nth itemss
-                       i
-                       (replace-nth (list-ref itemss i)
-                                    col
-                                    s)))
-    (gtk_list_store_set store (get-iter i) col s -1))
-
-  (define/public (set-column-label i s)
-    (gtk_tree_view_column_set_title (list-ref column-gtks i) s))
-
-  (define/public (set-column-size i w mn mx)
-    (let ([col (list-ref column-gtks i)])
-      (gtk_tree_view_column_set_min_width col mn)
-      (gtk_tree_view_column_set_max_width col mx)
-      (gtk_tree_view_column_set_fixed_width col w)))
-
-  (define/public (get-column-size i)
-    (let ([col (list-ref column-gtks i)])
-      (values
-       (gtk_tree_view_column_get_width col)
-       (max (gtk_tree_view_column_get_min_width col) 0)
-       (let ([v (gtk_tree_view_column_get_max_width col)])
-         (if (negative? v)
-             10000
-             v)))))
-
-  (define/public (set-first-visible-item i)
-    (atomically
-     (let ([p (gtk_tree_path_new_from_indices i -1)])
-       (gtk_tree_view_scroll_to_cell client-gtk p #f #t 0.0 0.0)
-       (gtk_tree_path_free p))))
-
-  (define/public (set choices . more-choices)
-    (atomically
-     (set! ignore-click? #t)
-     (clear)
-     (set! itemss (apply map 
-                         (lambda (i . rest)
-                           (cons i rest))
-                         choices
-                         more-choices))
-     (set! data (map (lambda (x) (box #f)) choices))
-     (reset-content)
-     (set! ignore-click? #f)))
-
-  (define/public (get-selections)
-    (atomically
-     (let ([list (gtk_tree_selection_get_selected_rows selection #f)])
-       (if list
-           (let ([v null])
-             (g_list_foreach list 
-                             (lambda (t) 
-                               (set! v (cons (ptr-ref (gtk_tree_path_get_indices t) _int)
-                                             v)))
-                             #f)
-             (g_list_foreach list gtk_tree_path_free #f)
-             (g_list_free list)
-             (reverse v))
-           null))))
-  (define/public (get-selection)
-    (let ([l (get-selections)])
-      (if (null? l)
-          -1
-          (car l))))
-
-  (define/private (get-visible-range)
-    (atomically
-     (let-values ([(sp ep) (gtk_tree_view_get_visible_range client-gtk)])
-       (begin0
-        (values (if sp (ptr-ref (gtk_tree_path_get_indices sp) _int) 0)
-                (if ep (ptr-ref (gtk_tree_path_get_indices ep) _int) 0))
-        (when sp (gtk_tree_path_free sp))
-        (when ep (gtk_tree_path_free ep))))))
-
-  (define/public (get-first-item)
-    (let-values ([(start end) (get-visible-range)])
-      start))
-  (define/public (number-of-visible-items)
-    (let-values ([(start end) (get-visible-range)])
-      (add1 (- end start))))
-
-  (define/public (number) (length itemss))
-
-  (define/public (set-data i v) (set-box! (list-ref data i) v))
-  (define/public (get-data i) (unbox (list-ref data i)))
-
-  (define/public (selected? i)
-    (atomically
-     (let ([p (gtk_tree_path_new_from_indices i -1)])
-       (begin0
-        (gtk_tree_selection_path_is_selected selection p)
-        (gtk_tree_path_free p)))))
-
-  (define/public (select i [on? #t] [extend? #t])
-    (atomically
-     (set! ignore-click? #t)
-     (let ([p (gtk_tree_path_new_from_indices i -1)])
-       (if on?
-           (begin
-             (unless extend?
-               (gtk_tree_selection_unselect_all selection))
-             (gtk_tree_selection_select_path selection p))
-           (gtk_tree_selection_unselect_path selection p))
-       (gtk_tree_path_free p))
-     (set! ignore-click? #f)))
-
-  (define/public (set-selection i)
-    (select i #t #f))
-
-  (define/public (delete i)
-    (set! itemss (append (take itemss i) (drop itemss (add1 i))))
-    (set! data (append (take data i) (drop data (add1 i))))
-    (gtk_list_store_remove store (get-iter i))
-    (void))
-
-  (define/public (clear)
-    (set! itemss null)
-    (set! data null)
-    (gtk_list_store_clear store))
-
-  (public [append* append])
-  (define (append* s [v #f])
-    (atomically
-     (set! ignore-click? #t)
-     (set! itemss (append itemss 
-                          (list (cons s empty-columns))))
-     (set! data (append data (list (box v))))
-     (let ([iter (make-GtkTreeIter 0 #f #f #f)])
-       (gtk_list_store_append store iter #f)
-       (gtk_list_store_set store iter 0 s -1))
-     (maybe-init-select)
-     (set! ignore-click? #f)))
-
-  (define/public (append-column label)
-    (let ([col (add1 (length empty-columns))])
-      (set! store (make-store (add1 col)))
-      (set! empty-columns (cons "" empty-columns))
-      (set! itemss
-            (for/list ([items (in-list itemss)])
-              (append items (list ""))))
-      (gtk_tree_view_set_model client-gtk store)
-      (let ([renderer (gtk_cell_renderer_text_new)])
-        (gtk_tree_view_column_new_with_attributes
-         label
-         renderer
-         "text"
-         col
-         #f))
-      (let ([column-gtk (make-column label col)])
-        (g_object_set_data column-gtk "wx" (g_object_get_data client-gtk "wx"))
-        (set! column-gtks (append column-gtks (list column-gtk)))
-        (gtk_tree_view_append_column client-gtk column-gtk)
-        (reset-content)
-        (column-finish column-gtk))))
-
-  (define/public (delete-column i)
-    (define (remove-nth l i)
-      (cond
-       [(zero? i) (cdr l)]
-       [else (cons (car l) (remove-nth (cdr l) (sub1 i)))]))
-    (set! empty-columns (cdr empty-columns))
-    (set! itemss
-          (for/list ([items (in-list itemss)])
-            (remove-nth items i)))
-    (let ([old (list-ref column-gtks i)])
-      (set! column-gtks (remove-nth column-gtks i))
-      (gtk_tree_view_remove_column client-gtk old))
-    (for ([column-gtk (in-list column-gtks)]
-          [pos (in-naturals)])
-      (when (pos . >= . i)
-        (gtk_tree_view_column_set_attributes column-gtk
-                                             renderer
-                                             "text"
-                                             pos
-                                             #f)))
-    (gtk_list_store_clear store)
-    (reset-content))
-
-  (atomically (reset-content)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/menu-bar.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/menu-bar.rkt
deleted file mode 100644
index 29dac48a4c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/menu-bar.rkt
+++ /dev/null
@@ -1,180 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-          "../../syntax.rkt"
-          "../../lock.rkt"
-          "../common/freeze.rkt"
-          "../common/queue.rkt"
-          "widget.rkt"
-          "window.rkt"
-          "utils.rkt"
-          "types.rkt")
-
-(provide
- (protect-out menu-bar%
-              gtk_menu_item_new_with_mnemonic
-              gtk_menu_shell_append
-              fixup-mnemonic))
-
-(define-gtk gtk_menu_bar_new (_fun -> _GtkWidget))
-(define-gtk gtk_menu_shell_append (_fun _GtkWidget _GtkWidget -> _void))
-(define-gtk gtk_menu_item_new_with_mnemonic (_fun _string -> _GtkWidget))
-(define-gtk gtk_menu_item_set_submenu (_fun _GtkWidget (_or-null _GtkWidget) -> _void))
-(define-gtk gtk_container_remove (_fun _GtkWidget _GtkWidget -> _void))
-(define-gtk gtk_label_set_text_with_mnemonic (_fun _GtkWidget _string -> _void))
-(define-gtk gtk_bin_get_child (_fun _GtkWidget -> _GtkWidget))
-
-(define-gtk gtk_widget_set_usize (_fun _GtkWidget _int _int -> _void))
-
-(define-gtk ubuntu_menu_proxy_get _fpointer
-  #:fail (lambda () #f))
-
-(define (fixup-mnemonic title)
-  (mnemonic-string (regexp-replace #rx"\t.*$" title "")))
-
-(define-signal-handler connect-select "select"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (let ([frame (send wx get-top-window)])
-          (when frame
-            (constrained-reply (send frame get-eventspace)
-                               (lambda () (send frame on-menu-click))
-                               (void))))))))
-
-(define-signal-handler connect-ubuntu-local "notify::ubuntu-local"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-	(send wx reset-menu-height)))))
-
-(define top-menu%
-  (class widget%
-    (init-field parent)
-    (define/public (get-top-window) (send parent get-top-window))
-    (super-new)))
-
-(define-signal-handler connect-menu-key-press "key-press-event"
-  (_fun _GtkWidget _GdkEventKey-pointer -> _gboolean)
-  (lambda (gtk event)
-    (let ([wx (gtk->wx gtk)])
-      (or (not wx)
-          (other-modal? wx)))))
-
-(define-signal-handler connect-menu-button-press "button-press-event"
-  (_fun _GtkWidget _GdkEventButton-pointer -> _gboolean)
-  (lambda (gtk event)
-    (let ([wx (gtk->wx gtk)])
-      (or (not wx)
-          (other-modal? wx)))))
-
-(defclass menu-bar% widget%
-  (inherit install-widget-parent)
-
-  (define menus null)
-
-  (define gtk (as-gtk-allocation (gtk_menu_bar_new)))
-  (super-new [gtk gtk])
-
-  (define/public (get-gtk) gtk)
-
-  (connect-menu-key-press gtk)
-  (connect-menu-button-press gtk)
-
-  ;; Ubuntu patches Gtk so that a menu bar starts
-  ;; as "remote" instead of appearing in a frame.
-  ;; For configurations that put the menu bar in a frame,
-  ;; the "notify::ubuntu-local" signal is issued.
-  (connect-ubuntu-local gtk)
-
-  ; (gtk_menu_set_accel_group gtk the-accelerator-group)
-
-  (define top-wx #f)
-
-  (define/public (set-top-window top)
-    (set! top-wx top)
-    (when ubuntu_menu_proxy_get
-      (send top treat-focus-out-as-menu-click))
-    (install-widget-parent top)
-    (fix-menu-height))
-
-  (define/public (reset-menu-height)
-    (when top-wx
-      (send top-wx reset-menu-height (fix-menu-height))))
-
-  (define/private (fix-menu-height)
-    ;; a menu to make sure there is one,
-    ;; and force the menu bar to be at least that tall always
-    (atomically
-     (define item 
-       (and (null? menus)
-	    (gtk_menu_item_new_with_mnemonic "Xyz")))
-     (when item
-       (gtk_menu_shell_append gtk item)
-       (gtk_widget_show item))
-     (define req (make-GtkRequisition 0 0))
-     (gtk_widget_size_request gtk req)
-     (define height (GtkRequisition-height req))
-     (gtk_widget_set_usize gtk -1 height)
-     (when item
-       (gtk_container_remove gtk item))
-     height))
-
-  (define/public (get-top-window)
-    top-wx)
-
-  (define/public (get-dialog-level) 
-    (send top-wx get-dialog-level))
-
-  (define/public (set-label-top pos str)
-    (let ([l (list-ref menus pos)])
-      (let ([item-gtk (car l)])
-	(gtk_label_set_text_with_mnemonic (gtk_bin_get_child item-gtk) 
-                                          (fixup-mnemonic str)))))
-    
-  (define/public (enable-top pos on?)
-    (gtk_widget_set_sensitive (car (list-ref menus pos)) on?))
-
-  (define/public (delete which pos)
-    (atomically
-     (set! menus (let loop ([menus menus]
-                            [pos pos])
-                   (cond
-                    [(null? menus) menus]
-                    [(zero? pos) 
-                     (gtk_container_remove gtk (caar menus))
-                     (gtk_menu_item_set_submenu (caar menus) #f)
-                     (cdr menus)]
-                    [else (cons (car menus)
-                                (loop (cdr menus)
-                                      (sub1 pos)))])))))
-
-  (public [append-menu append])
-  (define (append-menu menu title)
-    (send menu set-parent this)
-    (atomically
-     (let* ([item (let ([title (fixup-mnemonic title)])
-                    (as-gtk-allocation
-                     (gtk_menu_item_new_with_mnemonic title)))]
-            [item-wx (new top-menu% [parent this] [gtk item])])
-       (connect-select item)
-       (set! menus (append menus (list (list item menu item-wx))))
-       (let ([gtk (send menu get-gtk)])
-         (g_object_ref gtk)
-         (gtk_menu_item_set_submenu item gtk))
-       (gtk_menu_shell_append gtk item)
-       (gtk_widget_show item))))
-
-  (define/public (activate-item menu)
-    ;; Gtk takes care of menu activation as appropriate;
-    ;; return #f to indcate that the key wasn't handled
-    #f
-    #;
-    (let loop ([menus menus])
-      (cond
-       [(null? menus) (void)]
-       [(eq? menu (cadar menus))
-	(gtk_menu_shell_select_item gtk (caar menus))]
-       [else (loop (cdr menus))]))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/menu-item.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/menu-item.rkt
deleted file mode 100644
index a6b6c34283..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/menu-item.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require racket/class
-          "../../syntax.rkt")
-
-(provide 
- (protect-out menu-item%))
-
-(defclass menu-item% object%
-  (define/public (id) this)
-  (super-new))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/menu.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/menu.rkt
deleted file mode 100644
index 78f93bfee2..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/menu.rkt
+++ /dev/null
@@ -1,307 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         "widget.rkt"
-         "window.rkt"
-          "../../syntax.rkt"
-          "../../lock.rkt"
-         "types.rkt"
-         "const.rkt"
-         "utils.rkt"
-         "menu-bar.rkt"
-         "../common/event.rkt")
-
-(provide 
- (protect-out menu%))
-
-(define-gtk gtk_menu_new (_fun -> _GtkWidget))
-(define-gtk gtk_check_menu_item_new_with_mnemonic (_fun _string -> _GtkWidget))
-(define-gtk gtk_separator_menu_item_new (_fun -> _GtkWidget))
-(define-gdk gdk_unicode_to_keyval (_fun _uint32 -> _uint))
-(define-gtk gtk_menu_item_set_accel_path (_fun _GtkWidget _string -> _void))
-(define-gtk gtk_accel_map_add_entry (_fun _string _uint _int -> _void))
-(define-gtk gtk_check_menu_item_set_active (_fun _GtkWidget _gboolean -> _void))
-(define-gtk gtk_check_menu_item_get_active (_fun _GtkWidget -> _gboolean))
-(define-gtk gtk_container_remove (_fun _GtkWidget _GtkWidget -> _void))
-(define-gtk gtk_label_set_text_with_mnemonic (_fun _GtkWidget _string -> _void))
-(define-gtk gtk_bin_get_child (_fun _GtkWidget -> _GtkWidget))
-(define-gtk gtk_menu_item_set_submenu (_fun _GtkWidget (_or-null _GtkWidget) -> _void))
-
-(define-gtk gtk_get_current_event_time (_fun -> _uint32))
-(define-gtk gtk_menu_popup (_fun _GtkWidget _pointer _pointer 
-                                 (_fun _GtkWidget _pointer _pointer _pointer -> _void)
-                                 _pointer _uint _uint32
-                                 -> _void))
-
-(define-gtk gtk_widget_get_screen (_fun _GtkWidget -> _GdkScreen))
-(define-gdk gdk_screen_get_width (_fun _GdkScreen -> _int))
-(define-gdk gdk_screen_get_height (_fun _GdkScreen -> _int))
-
-(define-signal-handler connect-menu-item-activate "activate"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx do-on-select)))))
-
-(define-signal-handler connect-menu-deactivate "deactivate"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx do-no-selected)))))
-
-(define menu-item-handler%
-  (class widget%
-    (init gtk)
-    (init-field menu
-                menu-item)
-    (super-new [gtk gtk])
-
-    (connect-menu-item-activate gtk)
-
-    (define/public (get-item) menu-item)
-
-    (define/public (removing-item) (void))
-
-    (define/public (do-on-select)
-      (send menu do-selected menu-item))
-
-    (define/public (on-select)
-      (send menu on-select-item menu-item))))
-
-(define separator-item-handler%
-  (class object%
-    (define/public (get-item) #f)
-    (define/public (removing-item) (void))
-    (super-new)))
-
-(defclass menu% widget%
-  (init label
-        callback
-        font)
-
-  (inherit install-widget-parent)
-
-  (define cb callback)
-  
-  (define gtk (as-gtk-allocation (gtk_menu_new)))
-  (define/public (get-gtk) gtk)
-
-  (super-new [gtk gtk])
-
-  (connect-menu-deactivate gtk)
-
-  (gtk_menu_set_accel_group gtk the-accelerator-group)
-
-  (define items null)
-
-  (define parent #f)
-  (define/public (set-parent p)
-    (set! parent p)
-    (install-widget-parent p))
-  (define/public (get-top-parent)
-    ;; Maybe be called in Gtk event-handler thread
-    (and parent
-         (if (parent . is-a? . menu%)
-             (send parent get-top-parent)
-             (send parent get-top-window))))
-
-  (define self-item #f)
-  (define remover void)
-  (define/public (set-self-item i r) (set! self-item i) (set! remover r))
-  (define/public (get-item) self-item)
-  (define/public (removing-item) 
-    (set! self-item #f)
-    (remover)
-    (set! remover void))
-
-  (define on-popup #f)
-  (define cancel-none-box (box #t))
-
-  (define/public (popup x y queue-cb)
-    (set! on-popup queue-cb)
-    (set! cancel-none-box (box #f))
-    (gtk_menu_popup gtk 
-                    #f 
-                    #f
-                    (lambda (menu _x _y _push)
-                      (let ([r (make-GtkRequisition 0 0)])
-                        (gtk_widget_size_request menu r)
-                        ;; Try to keep the menu on the screen:
-                        (let* ([s (gtk_widget_get_screen menu)]
-                               [sw (gdk_screen_get_width s)]
-                               [sh (gdk_screen_get_height s)])
-                          (ptr-set! _x _int (min x
-                                                 (max 0
-                                                      (- sw
-                                                         (GtkRequisition-width r)))))
-                          (ptr-set! _y _int (min y
-                                                 (max 0
-                                                      (- sh
-                                                         (GtkRequisition-height r)))))))
-                      (ptr-set! _push _gboolean #t))
-                    #f
-                    0
-                    (gtk_get_current_event_time)))
-
-  (define ignore-callback? #f)
-
-  (define/public (do-selected menu-item)
-    ;; Called in event-pump thread
-    (unless ignore-callback?
-      (let ([top (get-top-parent)])
-        (cond
-         [top
-          (queue-window-event
-           top
-           (lambda () (send top on-menu-command menu-item)))]
-         [on-popup
-          (let* ([e (new popup-event% [event-type 'menu-popdown])]
-                 [pu on-popup]
-                 [cnb cancel-none-box])
-            (set! on-popup #f)
-            (set-box! cancel-none-box #t)
-            (send e set-menu-id menu-item)
-            (pu (lambda () (cb this e))))]
-         [parent (send parent do-selected menu-item)]))))
-
-  (define/public (do-no-selected)
-    ;; Queue a none-selected event, but only tentatively, because
-    ;; the selection event may come later and cancel the none-selected
-    ;; event.
-    (when on-popup
-      (let* ([e (new popup-event% [event-type 'menu-popdown])]
-             [pu on-popup]
-             [cnb cancel-none-box])
-        (send e set-menu-id #f)
-        (pu (lambda () 
-              (when (eq? on-popup pu)
-                (set! on-popup #f))
-              (unless (unbox cnb) 
-                (cb this e)))))))
-  
-  (define/private (adjust-shortcut item-gtk title need-clear?)
-    (let ([m (regexp-match #rx"\t(Ctrl[+])?(Shift[+])?(Meta[+])?(Alt[+])?(.|[0-9]+)$" 
-                           title)])
-      (if m
-          (let ([mask (+ (if (list-ref m 1) GDK_CONTROL_MASK 0)
-                         (if (list-ref m 2) GDK_SHIFT_MASK 0)
-                         (if (list-ref m 3) GDK_MOD1_MASK 0)
-                         (if (list-ref m 4) GDK_META_MASK 0))]
-                [code (let ([s (list-ref m 5)])
-                        (if (= 1 (string-length s))
-                            (gdk_unicode_to_keyval 
-                             (char->integer (string-ref s 0)))
-                            (string->number s)))])
-            (unless (zero? code)
-              (let ([accel-path (format "<GRacket>/Hardwired/~a" title)])
-                (gtk_accel_map_add_entry accel-path
-                                         code
-                                         mask)
-                (gtk_menu_item_set_accel_path item-gtk accel-path))))
-          (when need-clear?
-            (gtk_menu_item_set_accel_path item-gtk #f)))))
-  
-  (public [append-item append])
-  (define (append-item i label help-str-or-submenu chckable?)
-    (atomically
-     (let ([item-gtk (let ([label (fixup-mnemonic label)])
-                       (as-gtk-allocation
-                        ((if (and chckable?
-                                  (not (help-str-or-submenu . is-a? . menu%)))
-                             gtk_check_menu_item_new_with_mnemonic
-                             gtk_menu_item_new_with_mnemonic)
-                         label)))])
-       (if (help-str-or-submenu . is-a? . menu%)
-           (let ([submenu help-str-or-submenu])
-             (let ([gtk (send submenu get-gtk)])
-               (g_object_ref gtk)
-               (gtk_menu_item_set_submenu item-gtk gtk)
-               (send submenu set-parent this)
-               (send submenu set-self-item i
-                     (lambda () (gtk_menu_item_set_submenu item-gtk #f)))
-               (set! items (append items (list (list submenu item-gtk label chckable?))))))
-           (let ([item (new menu-item-handler% 
-                            [gtk item-gtk]
-                            [menu this]
-                            [menu-item i]
-                            [parent this])])
-             (set! items (append items (list (list item item-gtk label chckable?))))
-             (adjust-shortcut item-gtk label #f)))
-       (gtk_menu_shell_append gtk item-gtk)
-       (gtk_widget_show item-gtk))))
-
-  (define/public (append-separator)
-    (atomically
-     (let ([item-gtk (as-gtk-allocation (gtk_separator_menu_item_new))])
-       (set! items (append items (list (list (new separator-item-handler%) item-gtk #f #f))))
-       (gtk_menu_shell_append gtk item-gtk)
-       (gtk_widget_show item-gtk))))
-
-  (define/public (select bm)
-    (send parent activate-item this))
-
-  (def/public-unimplemented get-font)
-  (def/public-unimplemented set-width)
-  (def/public-unimplemented set-title)
-
-  (define/public (set-help-string m s) (void))
-
-  (define/public (number) (length items))
-
-  (define/private (find-gtk item)
-    (for/or ([i items])
-      (and (car i)
-           (eq? (send (car i) get-item) item)
-           (cadr i))))
-
-  (define/public (set-label item str)
-    (let ([gtk (find-gtk item)])
-      (when gtk
-        (gtk_label_set_text_with_mnemonic (gtk_bin_get_child gtk) 
-                                          (fixup-mnemonic str))
-        (adjust-shortcut gtk str #t))))
-
-  (define/public (enable item on?)
-    (let ([gtk (find-gtk item)])
-      (when gtk
-        (gtk_widget_set_sensitive gtk on?))))
-
-  (define/public (check item on?)
-    (let ([gtk (find-gtk item)])
-      (when gtk
-        (atomically
-         (set! ignore-callback? #t)
-         (gtk_check_menu_item_set_active gtk on?)
-         (set! ignore-callback? #f)))))
-    
-  (define/public (checked? item)
-    (let ([gtk (find-gtk item)])
-      (when gtk
-        (gtk_check_menu_item_get_active gtk))))
-
-  (define/public (delete-by-position pos)
-    (set! items
-          (let loop ([items items]
-                     [pos pos])
-            (cond
-             [(null? items) null]
-             [(zero? pos)
-              (send (caar items) removing-item)
-              (gtk_container_remove gtk (cadar items))
-              (cdr items)]
-             [else (cons (car items)
-                         (loop (cdr items) (sub1 pos)))]))))
-  
-  (define/public (delete item)
-    (set! items
-          (let loop ([items items])
-            (cond
-             [(null? items) null]
-             [(eq? (send (caar items) get-item) item)
-              (send (caar items) removing-item)
-              (gtk_container_remove gtk (cadar items))
-              (cdr items)]
-             [else (cons (car items)
-                         (loop (cdr items)))])))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/message.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/message.rkt
deleted file mode 100644
index 549fb4b249..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/message.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "item.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "pixbuf.rkt"
-         "window.rkt")
-
-(provide 
- (protect-out message%
-              
-              gtk_label_new_with_mnemonic
-              gtk_label_set_text_with_mnemonic))
-
-;; ----------------------------------------
-
-(define-gtk gtk_label_new (_fun _string -> _GtkWidget))
-(define-gtk gtk_label_set_text (_fun _GtkWidget _string -> _void))
-(define-gtk gtk_label_set_text_with_mnemonic (_fun _GtkWidget _string -> _void))
-(define-gtk gtk_image_new_from_stock (_fun _string _int -> _GtkWidget))
-(define-gtk gtk_misc_set_alignment (_fun _GtkWidget _float _float -> _void))
-(define-gtk gtk_image_set_from_pixbuf (_fun _GtkWidget _GdkPixbuf -> _void))
-
-(define (gtk_label_new_with_mnemonic s)
-  (let ([l (gtk_label_new s)])
-    (when (regexp-match? #rx"&" s)
-      (let ([s (mnemonic-string s)])
-        (gtk_label_set_text_with_mnemonic l s)))
-    l))
-
-(define icon-size 6) ; = GTK_ICON_SIZE_DIALOG
-
-(defclass message% item%
-  (init parent label
-        x y
-        style font)
-  (inherit set-auto-size get-gtk)
-
-  (super-new [parent parent]
-             [gtk (if (or (string? label)
-                          (not label))
-                      (as-gtk-allocation (gtk_label_new_with_mnemonic (or label "")))
-                      (if (symbol? label)
-                          (as-gtk-allocation
-                           (case label
-                             [(caution) (gtk_image_new_from_stock "gtk-dialog-warning" icon-size)]
-                             [(stop) (gtk_image_new_from_stock "gtk-dialog-error" icon-size)]
-                             [else (gtk_image_new_from_stock "gtk-dialog-question" icon-size)]))
-                          (let ([pixbuf (bitmap->pixbuf label)])
-                            (begin0
-                             (as-gtk-allocation
-                              (gtk_image_new_from_pixbuf pixbuf))
-                             (release-pixbuf pixbuf)))))]
-             [font font]
-             [no-show? (memq 'deleted style)])
-
-  (when (string? label)
-    (gtk_misc_set_alignment (get-gtk) 0.0 0.0))
-
-  (set-auto-size)
-
-  (define/override (set-label s)
-    (cond
-     [(string? s)
-      (gtk_label_set_text_with_mnemonic (get-gtk) (mnemonic-string s))]
-     [else
-      (let ([pixbuf (bitmap->pixbuf s)])
-        (atomically
-         (gtk_image_set_from_pixbuf (get-gtk) pixbuf)
-         (release-pixbuf pixbuf)))]))
-
-  (define/public (set-preferred-size)
-    (gtk_widget_set_size_request (get-gtk) -1 -1)
-    (set-auto-size)
-    #t)
-
-  (define/override (gets-focus?) #f)
-
-  (def/public-unimplemented get-font))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/panel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/panel.rkt
deleted file mode 100644
index 4109c47f62..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/panel.rkt
+++ /dev/null
@@ -1,153 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-          "../../syntax.rkt"
-          "../../lock.rkt"
-         "window.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "dc.rkt")
-
-(provide 
- (protect-out panel%
-              panel-mixin
-              panel-container-mixin
-
-              gtk_fixed_new
-              gtk_fixed_move
-
-              gtk_container_set_border_width
-              connect-expose-border))
-
-(define-gtk gtk_fixed_new (_fun -> _GtkWidget))
-(define-gtk gtk_event_box_new (_fun -> _GtkWidget))
-
-(define-gtk gtk_fixed_move (_fun _GtkWidget _GtkWidget _int _int -> _void))
-
-(define-gtk gtk_container_set_border_width (_fun _GtkWidget _int -> _void))
-
-(define-signal-handler connect-expose-border "expose-event"
-  (_fun _GtkWidget _GdkEventExpose-pointer -> _gboolean)
-  (lambda (gtk event)
-    (let* ([win (widget-window gtk)]
-           [gc (gdk_gc_new win)]
-           [gray #x8000])
-      (when gc
-        (gdk_gc_set_rgb_fg_color gc (make-GdkColor 0 gray gray gray))
-        (let* ([a (widget-allocation gtk)]
-               [w (sub1 (GtkAllocation-width a))]
-               [h (sub1 (GtkAllocation-height a))])
-          (let loop ([gtk gtk] [x 0] [y 0] [can-super? #t])
-            (if (and can-super?
-		     (not (zero? (bitwise-and (get-gtk-object-flags gtk) GTK_NO_WINDOW))))
-                ;; no window:
-                (let ([a (widget-allocation gtk)])
-                  (loop (widget-parent gtk) (+ x (GtkAllocation-x a)) (+ y (GtkAllocation-y a))
-			;; It seems that a widget's allocation is with respect
-			;; to a window, not its parent.
-			#f))
-                ;; found window:
-                (gdk_draw_rectangle win gc #f x y w h))))
-        (gdk_gc_unref gc)))
-    #f))
-
-(define (panel-mixin %)
-  (class %
-
-    (define lbl-pos 'horizontal)
-    (define children null)
-
-    (super-new)
-
-    (define/public (get-label-position) lbl-pos)
-    (define/public (set-label-position pos) (set! lbl-pos pos))
-
-    (define/public (adopt-child child)
-      ;; in atomic mode
-      (send child set-parent this))
-
-    (define/override (reset-child-dcs)
-      (super reset-child-dcs)
-      (when (pair? children)
-        (for ([child (in-list children)])
-          (send child reset-child-dcs))))
-    
-    (define/override (paint-children)
-      (super paint-children)
-      (when (pair? children)
-        (for ([child (in-list children)])
-          (send child paint-children))))
-    
-    (define/override (set-size x y w h)
-      (super set-size x y w h)
-      (reset-child-dcs))
-
-    (define/override (register-child child on?)
-      (let ([now-on? (and (memq child children) #t)])
-        (unless (eq? on? now-on?)
-          (set! children 
-                (if on?
-                    (cons child children)
-                    (remq child children))))))
-
-    (define/override (refresh-all-children)
-      (for ([child (in-list children)])
-        (send child refresh)))
-
-    (define/public (set-item-cursor x y) (void))))
-
-(define (panel-container-mixin %)
-  (class %
-    (inherit get-container-gtk)
-    (super-new)
-    (define/override (set-child-size child-gtk x y w h)
-      (gtk_fixed_move (get-container-gtk) child-gtk x y)
-      (gtk_widget_set_size_request child-gtk w h))))
-
-(define panel%
-  (class (panel-container-mixin (panel-mixin window%))
-    (init parent
-          x y w h
-          style
-          label)
-    
-    (inherit get-gtk set-auto-size set-size
-             adjust-client-delta)
-    
-    (define gtk (as-gtk-allocation (gtk_event_box_new)))
-    (define border-gtk (atomically
-                        (and (memq 'border style)
-                             (let ([border-gtk (gtk_fixed_new)])
-                               (gtk_container_add gtk border-gtk)
-                               (gtk_container_set_border_width border-gtk 1)
-                               (connect-expose-border border-gtk)
-                               (gtk_widget_show border-gtk)
-                               border-gtk))))
-    (define client-gtk (atomically
-                        (let ([client (gtk_fixed_new)])
-                          (gtk_container_add (or border-gtk gtk) client)
-                          (gtk_widget_show client)
-                          client)))
-    
-    (define/override (get-client-gtk) client-gtk)
-
-    (define/override (gets-focus?) #f)
-
-    (super-new [parent parent]
-               [gtk gtk]
-               [extra-gtks (list client-gtk)]
-               [no-show? (memq 'deleted style)])
-
-    ;; Start with a minimum size:
-    (set-size 0 0 (if border-gtk 3 1) (if border-gtk 3 1))
-    (when border-gtk
-      (adjust-client-delta 2 2))
-    
-    (connect-key-and-mouse gtk)
-    (gtk_widget_add_events gtk (bitwise-ior GDK_BUTTON_PRESS_MASK
-                                            GDK_BUTTON_RELEASE_MASK
-                                            GDK_POINTER_MOTION_HINT_MASK
-                                            GDK_FOCUS_CHANGE_MASK
-                                            GDK_ENTER_NOTIFY_MASK
-                                            GDK_LEAVE_NOTIFY_MASK))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/pixbuf.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/pixbuf.rkt
deleted file mode 100644
index c875a4feee..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/pixbuf.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/alloc
-         racket/draw
-         racket/draw/private/local
-         racket/draw/unsafe/cairo
-         "../../lock.rkt"
-         racket/draw/unsafe/bstr
-         "utils.rkt"
-         "types.rkt"
-         (only-in '#%foreign ffi-callback))
-
-(provide 
- (protect-out bitmap->pixbuf
-              pixbuf->bitmap
-              
-              _GdkPixbuf
-              gtk_image_new_from_pixbuf
-              release-pixbuf))
-
-(define _GdkPixbuf (_cpointer/null 'GdkPixbuf))
-
-(define release-pixbuf ((deallocator) g_object_unref))
-
-(define-gtk gtk_image_new_from_pixbuf (_fun _GdkPixbuf -> _GtkWidget))
-(define-gdk_pixbuf gdk_pixbuf_new_from_data (_fun _pointer ; data
-						  _int ; 0  =RGB
-						  _gboolean ; has_alpha?
-						  _int ; bits_per_sample
-						  _int ; width
-						  _int ; height
-						  _int ; rowstride
-						  _fpointer ; destroy
-						  _pointer  ; destroy data
-						  -> _GdkPixbuf)
-  #:wrap (allocator release-pixbuf))
-
-(define-gdk gdk_cairo_set_source_pixbuf (_fun _cairo_t _GdkPixbuf _double* _double* -> _void))
-(define-gdk_pixbuf gdk_pixbuf_get_width (_fun _GdkPixbuf -> _int))
-(define-gdk_pixbuf gdk_pixbuf_get_height (_fun _GdkPixbuf -> _int))
-
-(define free-it (ffi-callback free
-                              (list _pointer)
-                              _void
-                              #f
-                              #t))
-
-(define (bitmap->pixbuf bm)
-  (let* ([w (send bm get-width)]
-         [h (send bm get-height)]
-         [str (make-bytes (* w h 4) 255)])
-    (send bm get-argb-pixels 0 0 w h str #f)
-    (let ([mask (send bm get-loaded-mask)])
-      (when mask
-        (send mask get-argb-pixels 0 0 w h str #t)))
-    (atomically
-     (let ([rgba (scheme_make_sized_byte_string (malloc (* w h 4) 'raw) (* w h 4) 0)])
-       (memcpy rgba (ptr-add str 1) (sub1 (* w h 4)))
-       (for ([i (in-range 0 (* w h 4) 4)])
-         (bytes-set! rgba (+ i 3) (bytes-ref str i)))
-       (gdk_pixbuf_new_from_data rgba
-                                 0
-                                 #t
-                                 8
-                                 w
-                                 h
-                                 (* w 4)
-                                 free-it
-                                 #f)))))
-
-(define (pixbuf->bitmap pixbuf)
-  (let* ([w (gdk_pixbuf_get_width pixbuf)]
-         [h (gdk_pixbuf_get_height pixbuf)]
-         [bm (make-object bitmap% w h #f #t)]
-         [s (send bm get-cairo-surface)]
-         [cr (cairo_create s)])
-    (gdk_cairo_set_source_pixbuf cr pixbuf 0 0)
-    (cairo_rectangle cr 0 0 w h)
-    (cairo_fill cr)
-    (cairo_destroy cr)
-    bm))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/platform.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/platform.rkt
deleted file mode 100644
index 125744392b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/platform.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang racket/base
-(require "init.rkt"
-         "button.rkt"
-         "canvas.rkt"
-         "check-box.rkt"
-         "choice.rkt"
-         "clipboard.rkt"
-         "cursor.rkt"
-         "dialog.rkt"
-         "frame.rkt"
-         "gauge.rkt"
-         "group-panel.rkt"
-         "item.rkt"
-         "list-box.rkt"
-         "menu.rkt"
-         "menu-bar.rkt"
-         "menu-item.rkt"
-         "message.rkt"
-         "panel.rkt"
-         "printer-dc.rkt"
-         "radio-box.rkt"
-         "slider.rkt"
-         "tab-panel.rkt"
-         "window.rkt"
-         "procs.rkt")
-(provide 
- (protect-out platform-values))
-
-(define (platform-values)
-  (values
-   button%
-   canvas%
-   canvas-panel%
-   check-box%
-   choice%
-   clipboard-driver%
-   cursor-driver%
-   dialog%
-   frame%
-   gauge%
-   group-panel%
-   item%
-   list-box%
-   menu%
-   menu-bar%
-   menu-item%
-   message%
-   panel%
-   printer-dc%
-   radio-box%
-   slider%
-   tab-panel%
-   window%
-   can-show-print-setup?
-   show-print-setup
-   id-to-menu-item
-   file-selector
-   is-color-display?
-   get-display-depth
-   has-x-selection?
-   hide-cursor
-   bell
-   display-size
-   display-origin
-   display-count
-   display-bitmap-resolution
-   flush-display
-   get-current-mouse-state
-   fill-private-color
-   cancel-quit
-   get-control-font-face
-   get-control-font-size
-   get-control-font-size-in-pixels?
-   get-double-click-time
-   file-creator-and-type
-   location->window
-   shortcut-visible-in-label?
-   unregister-collecting-blit
-   register-collecting-blit
-   find-graphical-system-path
-   play-sound
-   get-panel-background
-   font-from-user-platform-mode
-   get-font-from-user
-   color-from-user-platform-mode
-   get-color-from-user
-   special-option-key
-   special-control-key
-   get-highlight-background-color
-   get-highlight-text-color
-   make-screen-bitmap
-   make-gl-bitmap
-   check-for-break
-   key-symbol-to-menu-key
-   needs-grow-box-spacer?))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/printer-dc.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/printer-dc.rkt
deleted file mode 100644
index c3021119f9..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/printer-dc.rkt
+++ /dev/null
@@ -1,234 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw/private/local
-         racket/draw/private/dc
-         racket/draw/unsafe/cairo
-         racket/draw/private/bitmap
-         racket/draw/private/bitmap-dc
-         racket/draw/private/record-dc
-         racket/draw/private/ps-setup
-         ffi/unsafe
-         ffi/unsafe/alloc
-         "../common/queue.rkt"
-         "widget.rkt"
-         "utils.rkt"
-         "types.rkt")
-
-(provide 
- (protect-out printer-dc%
-              show-print-setup))
-
-(define GTK_UNIT_POINTS 1)
-
-(define GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG 0)
-
-(define GTK_PRINT_OPERATION_RESULT_ERROR 0)
-(define GTK_PRINT_OPERATION_RESULT_APPLY 1)
-(define GTK_PRINT_OPERATION_RESULT_CANCEL 2)
-(define GTK_PRINT_OPERATION_RESULT_IN_PROGRESS 3)
-
-(define GTK_PAGE_ORIENTATION_PORTRAIT 0)
-(define GTK_PAGE_ORIENTATION_LANDSCAPE 1)
-(define GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT 2)
-(define GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE 3)
-
-(define _GtkPageSetup (_cpointer/null 'GtkPageSetup))
-(define _GtkPrintSettings (_cpointer/null 'GtkPrintSettings))
-(define _GtkPrintOperation _GtkWidget) ; not really, but we connect signals...
-(define _GtkPrintContext (_cpointer/null 'GtkPrintContext))
-
-(define-gtk gtk_page_setup_new (_fun -> _GtkPageSetup)
-  #:wrap (allocator gobject-unref))
-(define-gtk gtk_page_setup_copy (_fun _GtkPageSetup -> _GtkPageSetup)
-  #:wrap (allocator gobject-unref))
-(define allocated-page-setup ((allocator gobject-unref) values))
-
-(define-gtk gtk_print_settings_new (_fun -> _GtkPrintSettings)
-  #:wrap (allocator gobject-unref))
-
-(define-gtk gtk_page_setup_get_paper_height (_fun _GtkPageSetup _int -> _double))
-(define-gtk gtk_page_setup_get_paper_width (_fun _GtkPageSetup _int -> _double))
-(define-gtk gtk_page_setup_get_left_margin (_fun _GtkPageSetup _int -> _double))
-(define-gtk gtk_page_setup_get_right_margin (_fun _GtkPageSetup _int -> _double))
-(define-gtk gtk_page_setup_get_top_margin (_fun _GtkPageSetup _int -> _double))
-(define-gtk gtk_page_setup_get_bottom_margin (_fun _GtkPageSetup _int -> _double))
-
-(define-gtk gtk_page_setup_get_orientation (_fun _GtkPageSetup -> _int))
-(define-gtk gtk_page_setup_set_orientation (_fun _GtkPageSetup _int -> _void))
-
-(define-gtk gtk_print_operation_new (_fun -> _GtkPrintOperation)
-  #:wrap (allocator gobject-unref))
-
-(define-gtk gtk_print_operation_set_default_page_setup (_fun _GtkPrintOperation _GtkPageSetup
-                                                             -> _void))
-(define-gtk gtk_print_operation_run (_fun _GtkPrintOperation
-                                          _int
-                                          (_or-null _GtkWindow)
-                                          (_ptr o _pointer)
-                                          -> _int))
-
-(define-gtk gtk_print_operation_set_allow_async (_fun _GtkPrintOperation _gboolean -> _void))
-(define-gtk gtk_print_operation_set_n_pages (_fun _GtkPrintOperation _int -> _void))
-
-(define-gtk gtk_print_context_get_cairo_context (_fun _GtkPrintContext -> _cairo_t))
-
-(define-gtk gtk_print_run_page_setup_dialog_async (_fun (_or-null _GtkWindow)
-                                                        _GtkPageSetup
-                                                        _GtkPrintSettings
-                                                        _fpointer
-                                                        _pointer
-                                                        -> _void))
-
-(define (print-setup-done page-setup cb)
-  ((ptr-ref cb _racket) page-setup))
-(define print_setup_done (function-ptr print-setup-done
-                                       (_fun _GtkPageSetup _pointer -> _void)))
-
-(define (pss-install-page-setup pss page-setup)
-  (gtk_page_setup_set_orientation page-setup (if (eq? (send pss get-orientation) 'landscape)
-                                                 GTK_PAGE_ORIENTATION_LANDSCAPE
-                                                 GTK_PAGE_ORIENTATION_PORTRAIT)))
-
-(define (show-print-setup parent)
-  (let* ([pss (current-ps-setup)]
-         [page-setup (or (send pss get-native)
-                         (let ([ps (gtk_page_setup_new)])
-                           (send pss set-native ps gtk_page_setup_copy)
-                           ps))]
-         [print-settings (gtk_print_settings_new)]
-         [sema (make-semaphore)]
-         [done-page-setup #f]
-         [cell (malloc-immobile-cell (lambda (ps)
-                                       (set! done-page-setup (and ps
-                                                                  (allocated-page-setup ps)))
-                                       (semaphore-post sema)))])
-    (pss-install-page-setup pss page-setup)
-    (gtk_print_run_page_setup_dialog_async (and parent
-                                                (send parent get-gtk))
-                                           page-setup
-                                           print-settings
-                                           print_setup_done
-                                           cell)
-    (yield sema)
-    ;; `ptr-set!'s are a hack to ensure that the objects are not GCed:
-    (ptr-set! cell _racket page-setup)
-    (ptr-set! cell _racket print-settings)
-    (free-immobile-cell cell)
-    (and done-page-setup
-         (begin
-           (send pss set-native done-page-setup gtk_page_setup_copy)
-           (send pss set-orientation (if (member
-                                          (gtk_page_setup_get_orientation done-page-setup)
-                                          (list GTK_PAGE_ORIENTATION_LANDSCAPE
-                                                GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE))
-                                         'landscape
-                                         'portrait))
-           #t))))
-     
-(define-signal-handler connect-begin-print "begin-print"
-  (_fun _GtkPrintOperation _GtkPrintContext -> _void)
-  (lambda (op-gtk ctx-gtk)
-    (void)))
-
-(define-signal-handler connect-draw-page "draw-page"
-  (_fun _GtkPrintOperation _GtkPrintContext _int -> _void)
-  (lambda (op-gtk ctx-gtk page-no)
-    (let ([wx (gtk->wx op-gtk)])
-      (when wx
-        (send wx draw-page ctx-gtk page-no)))))
-
-(define-signal-handler connect-done "done"
-  (_fun _GtkPrintOperation _int -> _void)
-  (lambda (op-gtk res)
-    (when (= res GTK_PRINT_OPERATION_RESULT_CANCEL)
-      (let ([wx (gtk->wx op-gtk)])
-        (when wx
-          (send wx done))))))
-
-(define-signal-handler connect-end-print "end-print"
-  (_fun _GtkPrintOperation _GtkPrintContext -> _void)
-  (lambda (op-gtk ctx-gtk)
-    (let ([wx (gtk->wx op-gtk)])
-      (when wx
-        (send wx done)))))
-
-(define printout%
-  (class widget%
-    (init-field op-gtk
-                pages
-                page-setup)
-    (super-new [gtk op-gtk])
-
-    (connect-begin-print op-gtk)
-    (connect-draw-page op-gtk)
-    (connect-done op-gtk)
-    (connect-end-print op-gtk)
-
-    (gtk_print_operation_set_n_pages op-gtk (length pages))
-    (gtk_print_operation_set_allow_async op-gtk #t)
-    (gtk_print_operation_set_default_page_setup op-gtk page-setup)
-
-    (define done-sema (make-semaphore))
-
-    (define/public (go)
-      (let ([res (gtk_print_operation_run op-gtk
-                                          GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG
-                                          #f)])
-        (yield done-sema)))
-
-    (define/public (draw-page ctx-gtk pageno)
-      (let ([cr (gtk_print_context_get_cairo_context ctx-gtk)])
-        ((list-ref pages pageno)
-         (make-object
-          (class (dc-mixin default-dc-backend%)
-            (super-new)
-            (define orig-matrix (make-cairo_matrix_t 0.0 0.0 0.0 0.0 0.0 0.0))
-            (cairo_get_matrix cr orig-matrix)
-            (define/override (init-cr-matrix cr) (cairo_set_matrix cr orig-matrix))
-            (define/override (get-cr) cr))))))
-
-    (define/public (done)
-      (semaphore-post done-sema))))
-
-(define printer-dc%
-  (class (record-dc-mixin (dc-mixin bitmap-dc-backend%))
-    (init [parent #f])
-
-    (super-make-object (make-object bitmap% 1 1))
-
-    (inherit get-recorded-command
-             reset-recording)
-
-    (define pages null)
-    (define/override (end-page)
-      (set! pages (cons (get-recorded-command) pages))
-      (reset-recording))
-
-    (define page-setup (or (let-values ([(ps copier)
-                                         (send (current-ps-setup)
-                                               get-native-copy)])
-                             ps)
-                           (gtk_page_setup_new)))
-    (pss-install-page-setup (current-ps-setup) page-setup)
-
-    (define page-width (- (gtk_page_setup_get_paper_width page-setup GTK_UNIT_POINTS)
-                          (gtk_page_setup_get_left_margin page-setup GTK_UNIT_POINTS)
-                          (gtk_page_setup_get_right_margin page-setup GTK_UNIT_POINTS)))
-    (define page-height (- (gtk_page_setup_get_paper_height page-setup GTK_UNIT_POINTS)
-                           (gtk_page_setup_get_top_margin page-setup GTK_UNIT_POINTS)
-                           (gtk_page_setup_get_bottom_margin page-setup GTK_UNIT_POINTS)))
-    (define page-scaling 1.0) ; scale from gtk_print_operation_run is too late
-
-    (define/override (get-size)
-      (values (/ page-width page-scaling) (/ page-height page-scaling)))
-
-    (define/override (get-device-scale)
-      (values page-scaling page-scaling))
-
-    (define/override (end-doc)
-      (send (new printout% 
-                 [op-gtk (gtk_print_operation_new)]
-                 [pages (reverse pages)]
-                 [page-setup page-setup])
-            go)
-      (void))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/procs.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/procs.rkt
deleted file mode 100644
index c9f84e17a5..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/procs.rkt
+++ /dev/null
@@ -1,161 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         racket/class
-         racket/draw
-         "filedialog.rkt"
-         "colordialog.rkt"
-         "types.rkt"
-         "utils.rkt"
-         "style.rkt"
-         "widget.rkt"
-         "window.rkt"
-         "frame.rkt"
-         "dc.rkt"
-         "queue.rkt"
-         "printer-dc.rkt"
-         "gl-context.rkt"
-         "keycode.rkt"
-         "../common/default-procs.rkt"
-         "../common/handlers.rkt")
-
-(provide
- (protect-out
-  color-from-user-platform-mode
-  get-font-from-user
-  font-from-user-platform-mode
-  play-sound
-  find-graphical-system-path
-  register-collecting-blit
-  unregister-collecting-blit
-  shortcut-visible-in-label?
-  get-double-click-time
-  get-control-font-face
-  get-control-font-size
-  get-control-font-size-in-pixels?
-  cancel-quit
-  bell
-  hide-cursor
-  get-display-depth
-  is-color-display?
-  id-to-menu-item
-  can-show-print-setup?
-  get-highlight-background-color
-  get-highlight-text-color
-  check-for-break)
- file-selector
- show-print-setup
- display-origin
- display-size
- display-bitmap-resolution
- flush-display
- location->window
- make-screen-bitmap
- make-gl-bitmap
- file-creator-and-type
- special-control-key
- special-option-key
- get-panel-background
- fill-private-color
- get-color-from-user
- key-symbol-to-menu-key
- needs-grow-box-spacer?)
-
-(define (find-graphical-system-path what)
-  (case what
-    [(x-display) (string->path x11-display)]
-    [else #f]))
-
-(define (cancel-quit) (void))
-
-(define-unimplemented play-sound)
-
-(define (color-from-user-platform-mode) 
-  (and (color-dialog-works?)
-       'dialog))
-
-(define (font-from-user-platform-mode) #f)
-(define-unimplemented get-font-from-user)
-
-(define (register-collecting-blit canvas x y w h on off on-x on-y off-x off-y)
-  (send canvas register-collecting-blit x y w h on off on-x on-y off-x off-y))
-(define (unregister-collecting-blit canvas)
-  (send canvas unregister-collecting-blits))
-(define (shortcut-visible-in-label? [mbar? #f]) #t)
-
-(define _GtkSettings (_cpointer 'GtkSettings))
-(define-gtk gtk_settings_get_default (_fun -> _GtkSettings))
-(define-gobj g_object_get/int (_fun _GtkSettings _string (r : (_ptr o _int)) (_pointer = #f) 
-				    -> _void
-				    -> r)
-  #:c-id g_object_get)
-(define-gobj g_object_get/string (_fun _GtkSettings _string (r : (_ptr o _pointer)) (_pointer = #f)
-				       -> _void
-				       -> r)
-  #:c-id g_object_get)
-
-(define (get-double-click-time)
-  (let ([s (gtk_settings_get_default)])
-    (if s
-	(g_object_get/int s "gtk-double-click-time")
-	250)))
-(define (get-control-font proc default)
-  (or
-   (let ([s (gtk_settings_get_default)])
-     (and s
-	  (let ([f (g_object_get/string s "gtk-font-name")])
-	    (and f
-		 (begin0
-		  (cond
-		   [(regexp-match #rx"^(.*) ([0-9]+)$" (cast f _pointer _string))
-		    => (lambda (m) (proc (cdr m)))]
-		   [else #f])
-		  (g_free f))))))
-   default))
-(define (get-control-font-size)
-  (get-control-font (lambda (m) (string->number (cadr m)))
-		    10))
-(define (get-control-font-face)
-  (get-control-font (lambda (m) (car m))
-		    "Sans"))
-(define (get-control-font-size-in-pixels?) #f)
-
-(define (get-display-depth) 32)
-
-(define-gdk gdk_display_beep (_fun _GdkDisplay -> _void))
-(define (bell) (gdk_display_beep (gdk_display_get_default)))
-
-(define (hide-cursor) (void))
-
-(define (is-color-display?) #t)
-
-(define (id-to-menu-item i) i)
-(define (can-show-print-setup?) #t)
-
-(define (get-highlight-background-color)
-  (let-values ([(r g b) (get-selected-background-color)])
-    (make-object color% r g b)))
-
-(define (get-highlight-text-color)
-  (let-values ([(r g b) (get-selected-text-color)])
-    (if (and (zero? r) (zero? g) (zero? b))
-	#f
-	(make-object color% r g b))))
-
-(define/top (make-screen-bitmap [exact-positive-integer? w]
-                                [exact-positive-integer? h])
-  (if (eq? 'unix (system-type))
-      (make-object x11-bitmap% w h #f)
-      (make-object bitmap% w h #f #t)))
-
-(define/top (make-gl-bitmap [exact-positive-integer? w]
-                            [exact-positive-integer? h]
-                            [gl-config% c])
-  (let ([bm (make-object x11-bitmap% w h #f)])
-    (create-and-install-gl-context bm c)
-    bm))
-
-(define (check-for-break) #f)
-
-(define (needs-grow-box-spacer?) #f)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/queue.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/queue.rkt
deleted file mode 100644
index 9f6a0d6259..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/queue.rkt
+++ /dev/null
@@ -1,232 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         "utils.rkt"
-         "types.rkt"
-         "../../lock.rkt"
-         "../common/queue.rkt"
-         "../common/freeze.rkt"
-         "clipboard.rkt"
-         "const.rkt"
-	 "w32.rkt"
-         "unique.rkt")
-
-(provide (protect-out gtk-start-event-pump
-                      try-to-sync-refresh
-                      set-widget-hook!
-                      x11-display)
-         ;; from common/queue:
-         current-eventspace
-         queue-event
-         yield)
-
-
-;; ------------------------------------------------------------
-;; Gtk initialization
-
-;; When IBus is used for GtkIMContext (see "canvas.rkt"), recent
-;; versions may use a asynchronous mode that somehow doesn't
-;; cooperate with `g_main_context_query` Specifically, the
-;; asynchronous result doesn't wake up a sleeping Racket main
-;; thread, and so the effect of a key is delayed. The following
-;; enviornment variable is consulted by IBus on startup to
-;; disable asynchronous mode.
-(void (putenv "IBUS_ENABLE_SYNC_MODE" "y"))
-
-(define-gtk gtk_init_check (_fun (_ptr io _int) (_ptr io _gcpointer) -> _gboolean))
-(define-gdk gdk_set_program_class (_fun _string -> _void))
-
-(define x11-display
-  (let* ([argc-ptr (scheme_register_process_global "PLT_X11_ARGUMENT_COUNT" #f)]
-         [argc (or (and argc-ptr (cast argc-ptr _pointer _long)) 0)]
-         [argv (and (positive? argc)
-                    (scheme_register_process_global "PLT_X11_ARGUMENTS" #f))]
-         [display (getenv "DISPLAY")])
-    ;; Convert X11 arguments, if any, to Gtk form:
-    (let-values ([(args single-instance?)
-                  (if (zero? argc)
-                      (values null #f)
-                      (let loop ([i 1][si? #f])
-                        (if (= i argc) 
-                            (values null si?)
-                            (let ([s (ptr-ref argv _bytes i)])
-                              (cond
-                               [(bytes=? s #"-display")
-                                (let-values ([(args si?) (loop (+ i 2) si?)]
-                                             [(d) (ptr-ref argv _bytes (add1 i))])
-                                  (set! display (bytes->string/utf-8 d #\?))
-                                  (values (list* #"--display" d args)
-                                          si?))]
-                               [(bytes=? s #"-synchronous")
-                                (let-values ([(args si?) (loop (+ i 1) si?)])
-                                  (values (cons #"--sync" args)
-                                          si?))]
-                               [(bytes=? s #"-singleInstance")
-                                (loop (add1 i) #t)]
-                               [(or (bytes=? s #"-iconic")
-                                    (bytes=? s #"-rv")
-                                    (bytes=? s #"+rv")
-                                    (bytes=? s #"-reverse"))
-                                ;; ignored with 0 arguments
-                                (loop (add1 i) #t)]
-                               [else
-                                ;; all other ignored flags have a single argument
-                                (loop (+ i 2) #t)])))))])
-      (let-values ([(new-argc new-argv)
-                    (values (add1 (length args))
-                            (cast (cons (path->bytes (find-system-path 'run-file))
-                                        args)
-                                  (_list i _bytes)
-                                  _pointer))])
-        (unless (gtk_init_check new-argc new-argv)
-          (error (format
-                  "Gtk initialization failed for display ~s"
-                  (or display ":0"))))
-        (when single-instance?
-          (do-single-instance))
-        (let ([v (scheme_register_process_global "Racket-GUI-wm-class" #f)])
-          (when v
-            (gdk_set_program_class (cast v _pointer _string))))
-        display))))
-
-;; ------------------------------------------------------------
-;; Gtk event pump
-
-(define-gtk gtk_events_pending (_fun -> _gboolean))
-(define-gtk gtk_main_iteration_do (_fun _gboolean -> _gboolean))
-
-(define _GMainContext (_cpointer 'GMainContext))
-(define _GdkEvent (_cpointer 'GdkEvent))
-
-(define-cstruct _GPollFD ([fd _int]
-                          [events _short]
-                          [revents _short]))
-
-(define-glib g_main_context_default (_fun -> _GMainContext))
-(define-glib g_main_context_query (_fun _GMainContext
-					_int
-					_pointer
-					_pointer ;; GPollFD array
-					_int
-					-> _int))
-
-(define-gdk gdk_event_handler_set (_fun (_fun _GdkEvent _pointer -> _void)
-                                        _pointer
-                                        (_fun _pointer -> _void)
-                                        -> _void))
-(define-gdk gdk_event_copy (_fun _GdkEvent -> _GdkEvent))
-(define-gdk gdk_event_free (_fun _GdkEvent -> _void))
-(define-gtk gtk_main_do_event (_fun _GdkEvent -> _void))
-(define-gtk gtk_get_event_widget (_fun _GdkEvent -> (_or-null _GtkWidget)))
-
-(define poll-fd-count 1)
-(define poll-fds (make-GPollFD 0 0 0))
-(define timeout (malloc _int))
-
-;; These are OS-specific, but they tend to be the same across OSes:
-(define POLLIN #x1)
-(define POLLOUT #x4)
-(define POLLERR #x8)
-(define POLLHUP #x10)
-
-(define-mz scheme_get_fdset (_fun _pointer _int -> _gcpointer))
-(define-mz scheme_fdset (_fun _gcpointer _int -> _void))
-(define-mz scheme_set_wakeup_time (_fun _gcpointer _double -> _void))
-(define-mz scheme_add_fd_eventmask (_fun _gcpointer _int -> _void)
-  #:fail #f)
-
-(define (install-wakeup fds)
-  (let ([n (g_main_context_query (g_main_context_default)
-                                 #x7FFFFFFF ; max-int, hopefully
-                                 timeout
-                                 poll-fds
-                                 poll-fd-count)])
-    (let ([to (ptr-ref timeout _int)])
-      (when (to . >= . 0)
-        (scheme_set_wakeup_time fds (+ (current-inexact-milliseconds) to))))
-    (if (n . > . poll-fd-count)
-        (begin
-          (set! poll-fds (malloc _GPollFD n))
-          (set! poll-fd-count n)
-          (install-wakeup fds))
-	(if (eq? 'windows (system-type))
-	    ;; We don't know how to deal with GLib FDs under
-	    ;;  Windows, but we should wake up on any Windows event
-	    (scheme_add_fd_eventmask fds QS_ALLINPUT)
-	    ;; Normal FD handling under Unix variants:
-            (for ([i (in-range n)])
-              (let* ([gfd (ptr-ref poll-fds _GPollFD i)]
-                     [fd (GPollFD-fd gfd)]
-                     [events (GPollFD-events gfd)])
-                (when (not (zero? (bitwise-and events POLLIN)))
-                  (scheme_fdset (scheme_get_fdset fds 0) fd))
-                (when (not (zero? (bitwise-and events POLLOUT)))
-                  (scheme_fdset (scheme_get_fdset fds 1) fd))
-                (when (not (zero? (bitwise-and events (bitwise-ior POLLERR POLLHUP))))
-                  (scheme_fdset (scheme_get_fdset fds 2) fd))))))))
-
-(set-check-queue! gtk_events_pending)
-(set-queue-wakeup! install-wakeup)
-
-(define widget-hook (lambda (gtk) #f))
-(define (set-widget-hook! proc) (set! widget-hook proc))
-
-(define (event-dispatch evt ignored)
-  (let* ([gtk (gtk_get_event_widget evt)]
-         [wx (and gtk (widget-hook gtk))])
-    (cond
-     [(and (= (ptr-ref evt _GdkEventType) GDK_EXPOSE)
-           wx
-           (send wx direct-update?))
-      (gtk_main_do_event evt)]
-     [(or
-       ;; event for a window that we control?
-       (and wx (send wx get-eventspace))
-       ;; event to get X selection data?
-       (and (= (ptr-ref evt _GdkEventType) GDK_SELECTION_REQUEST)
-            (let ([s (cast evt _pointer _GdkEventSelection-pointer)])
-              (= (GdkEventSelection-selection s)
-                 primary-atom))
-            (get-selection-eventspace)))
-      => (lambda (e)
-           (let ([evt (gdk_event_copy evt)])
-             (queue-event e (lambda () 
-                              (call-as-nonatomic-retry-point
-                               (lambda ()
-                                 (gtk_main_do_event evt)
-                                 (gdk_event_free evt)))))))]
-     [else
-      (gtk_main_do_event evt)])))
-(define (uninstall ignored)
-  (printf "uninstalled!?\n"))
-
-(gdk_event_handler_set event-dispatch
-                       #f
-                       uninstall)
-
-(define (dispatch-all-ready)
-  (pre-event-sync #f)
-  (clean-up-destroyed)
-  (when (gtk_events_pending)
-    (gtk_main_iteration_do #f)
-    (dispatch-all-ready)))
-
-(define-gdk gdk_window_process_all_updates (_fun -> _void))
-
-(define (gtk-start-event-pump)
-  (thread (lambda ()
-            (let loop ()
-              (unless (let ([any-tasks? (sync/timeout 0 boundary-tasks-ready-evt)])
-                        (sync/timeout (and any-tasks? (* sometimes-delay-msec 0.001))
-                                      queue-evt 
-                                      (if any-tasks?
-                                          (wrap-evt (system-idle-evt)
-                                                    (lambda (v) #f))
-                                          boundary-tasks-ready-evt)))
-                (pre-event-sync #t))
-              (atomically (dispatch-all-ready))
-              (loop)))))
-
-(define (try-to-sync-refresh)
-  (atomically
-   (pre-event-sync #t)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/radio-box.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/radio-box.rkt
deleted file mode 100644
index f610cc7eef..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/radio-box.rkt
+++ /dev/null
@@ -1,131 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-          "../../syntax.rkt"
-         "item.rkt"
-         (except-in "utils.rkt" _GSList)
-         "types.rkt"
-         "widget.rkt"
-         "window.rkt"
-         "pixbuf.rkt"
-         "message.rkt"
-         "../common/event.rkt"
-         "../../lock.rkt")
-
-(provide 
- (protect-out radio-box%))
-
-;; ----------------------------------------
-
-(define _GSList (_cpointer/null 'GSList))
-
-(define-gtk gtk_radio_button_new_with_mnemonic (_fun _GSList _string -> _GtkWidget))
-(define-gtk gtk_radio_button_new (_fun _GSList -> _GtkWidget))
-(define-gtk gtk_radio_button_get_group (_fun _GtkWidget -> _GSList))
-(define-gtk gtk_radio_button_set_group (_fun _GtkWidget _GSList -> _void))
-(define-gtk gtk_toggle_button_set_active (_fun _GtkWidget _gboolean -> _void))
-(define-gtk gtk_toggle_button_get_active (_fun _GtkWidget -> _gboolean))
-(define-gtk gtk_widget_is_focus (_fun _GtkWidget -> _gboolean))
-(define-gtk gtk_bin_get_child (_fun _GtkWidget -> _GtkWidget))
-
-(define-signal-handler connect-clicked "clicked"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx queue-clicked)))))
-
-(defclass radio-box% item%
-  (init parent cb label
-        x y w h
-        labels
-        val
-        style
-        font)
-  (inherit set-auto-size
-           on-set-focus)
-
-  (define gtk (as-gtk-allocation
-               (if (memq 'horizontal style)
-                   (gtk_hbox_new #f 0)
-                   (gtk_vbox_new #f 0))))
-  (define radio-gtks (for/list ([lbl (in-list labels)])
-                       (atomically
-                        (let ([radio-gtk (cond
-                                          [(string? lbl)
-                                           (gtk_radio_button_new_with_mnemonic #f (mnemonic-string lbl))]
-                                          [else
-                                           (let ([pixbuf (bitmap->pixbuf lbl)])
-                                             (let ([radio-gtk (gtk_radio_button_new #f)]
-                                                   [image-gtk (gtk_image_new_from_pixbuf pixbuf)])
-                                               (release-pixbuf pixbuf)
-                                               (gtk_container_add radio-gtk image-gtk)
-                                               (gtk_widget_show image-gtk)
-                                               radio-gtk))])])
-                          (gtk_box_pack_start gtk radio-gtk #t #t 0)
-                          (install-control-font (gtk_bin_get_child radio-gtk) font)
-                          (gtk_widget_show radio-gtk)
-                          radio-gtk))))
-  (for ([radio-gtk (in-list (cdr radio-gtks))])
-    (let ([g (gtk_radio_button_get_group (car radio-gtks))])
-      (gtk_radio_button_set_group radio-gtk g)))
-
-  (define dummy-gtk #f)
-                    
-  (super-new [parent parent]
-             [gtk gtk]
-             [extra-gtks radio-gtks]
-             [callback cb]
-             [no-show? (memq 'deleted style)])
-
-  (set-auto-size)
-  (for ([radio-gtk (in-list radio-gtks)])
-    (connect-clicked radio-gtk)
-    (connect-key-and-mouse radio-gtk)
-    (connect-focus radio-gtk))
-
-  (define callback cb)
-  (define/public (clicked)
-    (callback this (new control-event%
-                        [event-type 'radio-box]
-                        [time-stamp (current-milliseconds)])))
-  (define no-clicked? #f)
-  (define/public (queue-clicked)
-    (unless no-clicked?
-      (queue-window-event this (lambda () (clicked)))))
-
-  (define/public (button-focus i)
-    (if (= i -1)
-        (or (for/or ([radio-gtk (in-list radio-gtks)]
-                     [i (in-naturals)])
-              (and (gtk_widget_is_focus radio-gtk)
-                   i))
-            0)
-        (gtk_widget_grab_focus (list-ref radio-gtks i))))
-  (define/override (set-focus)
-    (button-focus (max 0 (get-selection))))
-  (define/public (set-selection i)
-    (atomically
-     (set! no-clicked? #t)
-     (if (= i -1)
-         (when (pair? radio-gtks)
-           (unless dummy-gtk 
-             (set! dummy-gtk (as-gtk-allocation
-                              (gtk_radio_button_new
-                               (gtk_radio_button_get_group (car radio-gtks))))))
-           (gtk_toggle_button_set_active dummy-gtk #t))
-         (gtk_toggle_button_set_active (list-ref radio-gtks i) #t))
-     (set! no-clicked? #f)))
-
-  (define/public (get-selection)
-    (or (for/or ([radio-gtk (in-list radio-gtks)]
-                 [i (in-naturals)])
-          (and (gtk_toggle_button_get_active radio-gtk)
-               i))
-        -1))
-
-  (define/public (enable-button i on?)
-    (gtk_widget_set_sensitive (list-ref radio-gtks i) on?))
-
-  (define count (length labels))
-  (define/public (number) count))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/slider.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/slider.rkt
deleted file mode 100644
index 8ba67182f2..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/slider.rkt
+++ /dev/null
@@ -1,83 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-          "../../syntax.rkt"
-         "item.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "window.rkt"
-         "const.rkt"
-         "../common/event.rkt"
-         "../../lock.rkt")
-
-(provide 
- (protect-out slider%))
-
-;; ----------------------------------------
-
-(define-gtk gtk_hscale_new (_fun _pointer -> _GtkWidget))
-(define-gtk gtk_vscale_new (_fun _pointer -> _GtkWidget))
-(define-gtk gtk_range_set_range (_fun _GtkWidget _double* _double* -> _void))
-(define-gtk gtk_range_set_increments (_fun _GtkWidget _double* _double* -> _void))
-(define-gtk gtk_range_set_value (_fun _GtkWidget _double* -> _void))
-(define-gtk gtk_range_get_value (_fun _GtkWidget -> _double))
-(define-gtk gtk_scale_set_digits (_fun _GtkWidget _int -> _void))
-(define-gtk gtk_scale_set_draw_value (_fun _GtkWidget _gboolean -> _void))
-
-(define-signal-handler connect-changed "value-changed"
-  (_fun _GtkWidget -> _void)
-  (lambda (gtk)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx queue-changed)))))
-
-(defclass slider% item%
-  (init parent cb
-        label
-        val lo hi
-        x y w
-        style
-        font)
-  (inherit get-gtk set-auto-size)
-
-  (super-new [parent parent]
-             [gtk (as-gtk-allocation
-                   (if (memq 'vertical style)
-                       (gtk_vscale_new #f)
-                       (gtk_hscale_new #f)))]
-             [callback cb]
-             [no-show? (memq 'deleted style)])
-  (define gtk (get-gtk))
-
-  (gtk_scale_set_digits gtk 0)
-  (gtk_range_set_range gtk lo hi)
-  (gtk_range_set_increments gtk 1.0 1.0)
-  (gtk_range_set_value gtk val)
-
-  (when (memq 'plain style)
-    (gtk_scale_set_draw_value gtk #f))
-
-  (set-auto-size)
-
-  (connect-changed gtk)
-  
-  (define callback cb)
-  (define ignore-click? #f)
-  (define/public (queue-changed)
-    ;; Called in event-dispatch thread
-    (gtk_range_set_value gtk (floor (gtk_range_get_value gtk)))
-    (unless ignore-click?
-      (queue-window-event 
-       this
-       (lambda ()
-         (callback this (new control-event%
-                             [event-type 'slider]
-                             [time-stamp (current-milliseconds)]))))))
-
-  (define/public (set-value v)
-    (atomically
-     (set! ignore-click? #t)
-     (gtk_range_set_value gtk v)
-     (set! ignore-click? #f)))
-  (define/public (get-value)
-    (inexact->exact (floor (gtk_range_get_value gtk)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/stddialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/stddialog.rkt
deleted file mode 100644
index f2a2dc7800..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/stddialog.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         "types.rkt"
-         "utils.rkt"
-         "widget.rkt"
-         "queue.rkt"
-         "../common/queue.rkt")
-
-(provide 
- (protect-out show-dialog
-              _GtkResponse))
-
-(define _GtkResponse
-  (_enum 
-   '(none = -1
-     reject = -2
-     accept = -3
-     delete-event = -4
-     ok = -5
-     cancel = -6
-     close = -7
-     yes = -8
-     no = -9
-     apply = -10
-     help = -11)
-   _fixint))
-
-(define-signal-handler connect-response "response"
-  (_fun _GtkWidget _GtkResponse _pointer -> _void)
-  (lambda (gtk id data)
-    (let* ([p (ptr-ref data _racket)]
-           [response-sema (car p)]
-           [response-box (cdr p)])
-      (set-box! response-box id)
-      (semaphore-post response-sema))))
-
-(define (show-dialog dlg-gtk
-                     [validate? (lambda (val) #t)])
-  (let* ([response-sema (make-semaphore)]
-         [response-box (box #f)]
-         [cell (malloc-immobile-cell (cons response-sema
-                                           response-box))]
-         [es (current-eventspace)])
-    (connect-response dlg-gtk cell)
-    (eventspace-adjust-external-modal! es 1)
-    (gtk_widget_show dlg-gtk)
-    (let loop ()
-      (yield response-sema)
-      (unless (validate? (unbox response-box))
-        (loop)))
-    (eventspace-adjust-external-modal! es -1)
-    (free-immobile-cell cell) ;; FIXME : don't leak
-    (gtk_widget_hide dlg-gtk)
-    (unbox response-box)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/style.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/style.rkt
deleted file mode 100644
index 4cc7f1e6c6..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/style.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         "types.rkt"
-         "utils.rkt"
-         "init.rkt")
-
-(provide 
- (protect-out get-selected-text-color
-              get-selected-background-color))
-
-(define-cstruct _GTypeInstance
-  ([class _pointer]))
-
-(define-cstruct _GObject
-  ([g_type_instance _GTypeInstance]
-   [ref_count _uint]
-   [qdata _pointer]))
-
-(define-cstruct _GtkStyle
-  ([obj _GObject]
-   [fg1 _GdkColor]
-   [fg2 _GdkColor]
-   [fg3 _GdkColor]
-   [fg4 _GdkColor]
-   [fg5 _GdkColor]
-   [bg1 _GdkColor]
-   [bg2 _GdkColor]
-   [bg3 _GdkColor]
-   [bg4 _GdkColor]
-   [bg5 _GdkColor]
-   [light1 _GdkColor]
-   [light2 _GdkColor]
-   [light3 _GdkColor]
-   [light4 _GdkColor]
-   [light5 _GdkColor]
-   [dark1 _GdkColor]
-   [dark2 _GdkColor]
-   [dark3 _GdkColor]
-   [dark4 _GdkColor]
-   [dark5 _GdkColor]
-   [mid1 _GdkColor]
-   [mid2 _GdkColor]
-   [mid3 _GdkColor]
-   [mid4 _GdkColor]
-   [mid5 _GdkColor]
-   [text1 _GdkColor]
-   [text2 _GdkColor]
-   [text3 _GdkColor]
-   [text4 _GdkColor]
-   [text5 _GdkColor]
-   [base1 _GdkColor]
-   [base2 _GdkColor]
-   [base3 _GdkColor]
-   [base4 _GdkColor]
-   [base5 _GdkColor]
-   [text_aa1 _GdkColor]
-   [text_aa2 _GdkColor]
-   [text_aa3 _GdkColor]
-   [text_aa4 _GdkColor]
-   [text_aa5 _GdkColor]
-   [black _GdkColor]
-   [white _GdkColor]
-   [font_desc _pointer] ; PangoFontDescription *
-   ; ...
-   ))
-
-(define-gtk gtk_widget_get_style (_fun  _GtkWidget -> _GtkStyle-pointer))
-(define-gtk gtk_rc_get_style (_fun  _GtkWidget -> _GtkStyle-pointer))
-(define-gtk gtk_text_view_new (_fun -> _GtkWidget))
-
-(define the-text-style
-  (let ([w (gtk_text_view_new)])
-    (let ([style (gtk_rc_get_style w)])
-      (g_object_ref style)
-      (begin0
-       style
-       (g_object_ref_sink w)
-       (g_object_unref w)))))
-
-(define (extract-color-values c)
-  (define (s v) (arithmetic-shift v -8))
-  (values (s (GdkColor-red c))
-          (s (GdkColor-green c))
-          (s (GdkColor-blue c))))
-
-(define (get-selected-text-color)
-  (extract-color-values (GtkStyle-text4 the-text-style)))
-  
-(define (get-selected-background-color)
-  (extract-color-values (GtkStyle-base4 the-text-style)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/tab-panel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/tab-panel.rkt
deleted file mode 100644
index 345bb9c44c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/tab-panel.rkt
+++ /dev/null
@@ -1,201 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-          "../../syntax.rkt"
-         "window.rkt"
-         "client-window.rkt"
-         "utils.rkt"
-         "panel.rkt"
-         "types.rkt"
-         "widget.rkt"
-         "message.rkt"
-         "../../lock.rkt"
-         "../common/event.rkt")
-
-(provide 
- (protect-out tab-panel%))
-
-(define-gtk gtk_notebook_new (_fun -> _GtkWidget))
-
-(define-gtk gtk_notebook_append_page (_fun _GtkWidget _GtkWidget (_or-null _GtkWidget) -> _void))
-(define-gtk gtk_notebook_remove_page (_fun _GtkWidget _int -> _void))
-(define-gtk gtk_notebook_set_scrollable (_fun _GtkWidget _gboolean -> _void))
-(define-gtk gtk_notebook_get_current_page (_fun _GtkWidget -> _int))
-(define-gtk gtk_notebook_set_current_page (_fun _GtkWidget _int -> _void))
-(define-gtk gtk_notebook_get_tab_label  (_fun _GtkWidget _GtkWidget -> _GtkWidget))
-
-(define-gtk gtk_container_remove (_fun _GtkWidget _GtkWidget -> _void))
-
-(define-gtk gtk_widget_ref (_fun _GtkWidget -> _void))
-(define-gtk gtk_widget_unref (_fun _GtkWidget -> _void))
-
-(define-struct page (bin-gtk label-gtk))
-
-(define-signal-handler connect-changed "switch-page"
-  (_fun _GtkWidget _pointer _int -> _void)
-  (lambda (gtk ignored i)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx page-changed i)))))
-
-(define tab-panel%
-  (class (client-size-mixin (panel-container-mixin (panel-mixin window%)))
-    (init parent
-          x y w h
-          style
-          labels)
-    
-    (inherit set-size set-auto-size infer-client-delta get-gtk
-             reset-child-dcs get-height)
-
-    (define gtk (gtk_notebook_new))
-    ;; Reparented so that it's always in the current page's bin:
-    (define client-gtk (gtk_fixed_new))
-
-    (gtk_notebook_set_scrollable gtk #t)
-
-    (super-new [parent parent]
-               [gtk gtk]
-               [client-gtk client-gtk]
-               [extra-gtks (list client-gtk)]
-               [no-show? (memq 'deleted style)])
-
-    ; Once without tabs to set client-width delta:
-    (infer-client-delta #t #f)
-    
-    (define empty-bin-gtk (gtk_hbox_new #f 0))
-    (define current-bin-gtk #f)
-
-    (define (select-bin bin-gtk)
-      (set! current-bin-gtk bin-gtk)
-      (gtk_box_pack_start bin-gtk client-gtk #t #t 0)
-      ;; re-parenting can change the underlying window dc:
-      (reset-child-dcs))
-
-    (define pages
-      (for/list ([lbl labels])
-        (let ([bin-gtk (gtk_hbox_new #f 0)]
-              [label-gtk (gtk_label_new_with_mnemonic lbl)])
-          (gtk_notebook_append_page gtk bin-gtk label-gtk)
-          (gtk_widget_show bin-gtk)
-          (make-page bin-gtk label-gtk))))
-
-    (define/private (install-empty-page)
-      (gtk_notebook_append_page gtk empty-bin-gtk #f)
-      (gtk_widget_show empty-bin-gtk))
-
-    (if (null? pages)
-        (begin
-          (select-bin empty-bin-gtk)
-          (install-empty-page))
-        (begin
-          (select-bin (page-bin-gtk (car pages)))))
-    (gtk_widget_show client-gtk)
-    
-    (connect-key-and-mouse gtk)
-    (connect-focus gtk)
-
-    ; With tabs to set client-width delta:
-    (infer-client-delta #f #t)
-
-    (set-auto-size)
-
-    (define callback void)
-    (define/public (set-callback cb) (set! callback cb))
-    (define/private (do-callback)
-      (callback this (new control-event%
-                          [event-type 'tab-panel]
-                          [time-stamp (current-milliseconds)])))
-
-    (define/public (swap-in bin-gtk)
-      (gtk_widget_ref client-gtk)
-      (gtk_container_remove current-bin-gtk client-gtk)
-      (select-bin bin-gtk)
-      (gtk_widget_unref client-gtk))
-
-    (define callback-ok? #t)
-
-    (define/public (page-changed i)
-      ; range check works around spurious callbacks:
-      (when (< -1 i (length pages))
-        (swap-in (page-bin-gtk (list-ref pages i)))
-        (when callback-ok?
-          (queue-window-event this (lambda () (do-callback))))))
-    (connect-changed gtk)
-    
-    (define/override (get-client-gtk) client-gtk)
-
-    (public [append* append])
-    (define (append* lbl)
-      (atomically
-       (set! callback-ok? #f)
-       (do-append lbl)
-       (set! callback-ok? #t)))
-
-    (define/private (do-append lbl)
-      (let ([page
-             (let ([bin-gtk (gtk_hbox_new #f 0)]
-                   [label-gtk (gtk_label_new_with_mnemonic lbl)])
-               (gtk_notebook_append_page gtk bin-gtk label-gtk)
-               (gtk_widget_show bin-gtk)
-               (make-page bin-gtk label-gtk))])
-        (set! pages (append pages (list page)))
-        (when (null? (cdr pages))
-          (swap-in (page-bin-gtk (car pages)))
-          (g_object_ref empty-bin-gtk)
-          (gtk_notebook_remove_page gtk 0))))
-
-    (define/private (do-delete i)
-      (let ([page (list-ref pages i)])
-        (when (ptr-equal? current-bin-gtk (page-bin-gtk page))
-          (let ([cnt (length pages)])
-            (if (= i (sub1 cnt))
-                (if (null? (cdr pages))
-                    (begin
-                      (install-empty-page)
-                      (set! pages null)
-                      (gtk_notebook_set_current_page gtk 1)
-                      (swap-in empty-bin-gtk))
-                    (gtk_notebook_set_current_page gtk (sub1 i)))
-                (gtk_notebook_set_current_page gtk (add1 i)))))
-        (gtk_notebook_remove_page gtk i)
-        (set! pages (remq page pages))))
-
-    (define/public (delete i)
-      (atomically
-       (set! callback-ok? #f)
-       (do-delete i)
-       (set! callback-ok? #t)))
-
-    (define/public (set choices)
-      (atomically
-       (set! callback-ok? #f)
-       (for ([page (in-list pages)])
-         (do-delete 0))
-       (for ([lbl (in-list choices)])
-         (append* lbl))
-       (set! callback-ok? #t)))
-
-    (define/public (set-label i str)
-      (gtk_label_set_text_with_mnemonic (page-label-gtk (list-ref pages i)) 
-                                        (mnemonic-string str)))
-
-    (define/public (number) (length pages))
-    (define/public (button-focus n)
-      (if (= n -1)
-          (get-selection)
-          (direct-set-selection n)))
-
-    (define/override (gets-focus?) #t)
-    (define/override (set-focus)
-      (gtk_widget_grab_focus gtk))
-
-    (define/private (direct-set-selection i)
-      (gtk_notebook_set_current_page gtk i))
-    (define/public (set-selection i)
-      (atomically
-       (set! callback-ok? #f)
-       (direct-set-selection i)
-       (set! callback-ok? #t)))
-    (define/public (get-selection)
-      (gtk_notebook_get_current_page gtk))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/types.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/types.rkt
deleted file mode 100644
index 15841e0799..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/types.rkt
+++ /dev/null
@@ -1,164 +0,0 @@
-#lang racket/base
-(require ffi/unsafe)
-
-(provide 
- (protect-out _GdkWindow
-              _GtkWidget _GtkWindow
-              _GdkDisplay
-              _GdkScreen
-              _gpointer
-              _GType
-              _GdkEventType
-              _GdkAtom
-
-              _fnpointer
-              _gboolean
-              _gfloat
-
-              _GdkEventButton _GdkEventButton-pointer
-              (struct-out GdkEventButton)
-              _GdkEventKey _GdkEventKey-pointer
-              (struct-out GdkEventKey)
-              _GdkEventScroll _GdkEventScroll-pointer
-              (struct-out GdkEventScroll)
-              _GdkEventMotion _GdkEventMotion-pointer
-              (struct-out GdkEventMotion)
-              _GdkEventCrossing _GdkEventCrossing-pointer
-              (struct-out GdkEventCrossing)
-              _GdkEventConfigure _GdkEventConfigure-pointer
-              (struct-out GdkEventConfigure)
-              _GdkEventExpose _GdkEventExpose-pointer
-              (struct-out GdkEventExpose)
-              _GdkEventFocus _GdkEventFocus-pointer
-              (struct-out GdkEventFocus)
-              _GdkEventSelection _GdkEventSelection-pointer
-              (struct-out GdkEventSelection)
-              _GdkRectangle _GdkRectangle-pointer
-              (struct-out GdkRectangle)
-              _GdkColor _GdkColor-pointer
-              (struct-out GdkColor)))
-
-(define _GType _long)
-
-(define _GdkWindow (_cpointer/null 'GdkWindow))
-
-(define _GtkWidget (_cpointer 'GtkWidget))
-(define _GtkWindow _GtkWidget)
-
-(define _GdkDisplay (_cpointer 'GdkDisplay))
-(define _GdkScreen (_cpointer 'GdkScreen))
-
-(define _gpointer _GtkWidget)
-
-(define _GdkDevice (_cpointer 'GdkDevice))
-
-(define _fnpointer _pointer) ; a function pointer that can be NULL
-(define _gboolean _bool)
-(define _gfloat _float)
-(define _GdkEventType _int)
-
-(define _GdkAtom _intptr)
-
-(define-cstruct _GdkEventButton ([type _GdkEventType]
-                                 [window _GdkWindow]
-                                 [send_event _byte]
-                                 [time _uint32]
-                                 [x _double]
-                                 [y _double]
-                                 [axes _pointer] ; array of _double
-                                 [state _uint]
-                                 [button _uint]
-                                 [device _GdkDevice]
-                                 [x_root _double]
-                                 [y_root _double]))
-
-
-(define-cstruct _GdkEventKey ([type _GdkEventType]
-                              [window _GdkWindow]
-                              [send_event _byte]
-                              [time _uint32]
-                              [state _uint]
-                              [keyval _uint]
-                              [length _int]
-                              [string _pointer] ; do not use
-                              [hardware_keycode _uint16]
-                              [group _ubyte]
-                              [is_modifier _byte])) ; just 1 bit
-
-(define-cstruct _GdkEventScroll ([type _GdkEventType]
-                                 [window _GdkWindow]
-                                 [send_event _byte]
-                                 [time _uint32]
-                                 [x _double]
-                                 [y _double]
-                                 [state _uint]
-                                 [direction _uint]
-                                 [device _GdkDevice]
-                                 [x_root _double]
-                                 [y_root _double]))
-
-(define-cstruct _GdkEventMotion ([type _GdkEventType]
-                                 [window _GdkWindow]
-                                 [send_event _byte]
-                                 [time _uint32]
-                                 [x _double]
-                                 [y _double]
-                                 [axes _pointer]
-                                 [state _uint]
-                                 [is_hint _int16]
-                                 [device _GdkDevice]
-                                 [x_root _double]
-                                 [y_root _double]))
-
-(define-cstruct _GdkEventCrossing ([type _GdkEventType]
-                                   [window _GdkWindow]
-                                   [send_event _byte]
-                                   [subwindow _GdkWindow]
-                                   [time _uint32]
-                                   [x _double]
-                                   [y _double]
-                                   [x_root _double]
-                                   [y_root _double]
-                                   [mode _int]
-                                   [detail _int]
-                                   [focus _gboolean]
-                                   [state _uint]))
-
-(define-cstruct _GdkEventConfigure ([type _GdkEventType]
-                                    [window _GdkWindow]
-                                    [send_event _byte]
-                                    [x _int]
-                                    [y _int]
-                                    [width _int]
-                                    [height _int]))
-
-(define-cstruct _GdkEventSelection ([type _GdkEventType]
-                                    [window _GdkWindow]
-                                    [send_event _byte]
-                                    [selection _GdkAtom]
-                                    [target _GdkAtom]
-                                    [property _GdkAtom]
-                                    [time _uint32]
-                                    [requestor _pointer]))
-
-(define-cstruct _GdkRectangle ([x _int]
-                               [y _int]
-                               [width _int]
-                               [height _int]))
-
-(define-cstruct _GdkEventExpose ([type _GdkEventType]
-                                 [window _GdkWindow]
-                                 [send_event _byte]
-                                 [area _GdkRectangle]
-                                 [region _pointer]
-                                 [count _int]))
-
-(define-cstruct _GdkEventFocus ([type _GdkEventType]
-                                [window _GdkWindow]
-                                [send_event _byte]
-                                [in _short]))
-
-(define-cstruct _GdkColor ([pixel _uint32]
-                           [red _uint16]
-                           [green _uint16]
-                           [blue _uint16]))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/unique.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/unique.rkt
deleted file mode 100644
index 9be844355d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/unique.rkt
+++ /dev/null
@@ -1,114 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         racket/draw/unsafe/bstr
-         net/base64
-	 "../common/queue.rkt"
-         "types.rkt"
-         "utils.rkt")
-
-(provide 
- (protect-out do-single-instance))
-
-(define unique-lib-name "libunique-1.0")
-
-(define unique-lib
-  (with-handlers ([exn:fail? (lambda (exn) #f)])
-    (ffi-lib unique-lib-name '("0"))))
-
-(define-ffi-definer define-unique unique-lib
-  #:default-make-fail make-not-available)
-
-(define _gsize _ulong)
-
-(define UNIQUE_RESPONSE_OK 1)
-
-(define _UniqueApp _GtkWidget) ; not a widget, but we want to connect a signal
-(define _UniqueMessageData (_cpointer 'UniqueMessageData))
-
-(define-unique unique_app_new (_fun _string _string -> _UniqueApp)
-  #:fail (lambda () (lambda args
-                      (unless unique-lib
-                        (log-error "~s not found; single-instance mode disabled"
-                                   unique-lib-name))
-                      #f)))
-(define-unique unique_app_add_command (_fun _UniqueApp _string _int -> _void))
-(define-unique unique_app_is_running (_fun _UniqueApp -> _gboolean))
-(define-unique unique_app_send_message (_fun _UniqueApp _int _UniqueMessageData -> _int))
-
-(define-unique unique_message_data_new (_fun -> _UniqueMessageData))
-(define-unique unique_message_data_free (_fun _UniqueMessageData -> _void))
-(define-unique unique_message_data_set (_fun _UniqueMessageData _pointer _gsize -> _void))
-(define-unique unique_message_data_get (_fun _UniqueMessageData (len : (_ptr o _gsize))
-                                             -> (data : _bytes)
-                                             -> (scheme_make_sized_byte_string
-                                                 data
-                                                 len
-                                                 0)))
-
-(define-signal-handler connect-message-received "message-received"
-  (_fun _UniqueApp _int _UniqueMessageData _uint -> _int)
-  (lambda (app cmd data time)
-    (let ([d (unique_message_data_get data)])
-      (with-handlers ([exn:fail? (lambda (exn)
-				   (log-error 
-				    (format "error handling single-instance message: ~s"
-					    (exn-message exn))))])
-	(let* ([p (open-input-bytes d)]
-	       [vec (read p)])
-	  (for-each
-	   queue-file-event
-	   (map (lambda (s) (if (bytes? s)
-                                (bytes->path s)
-                                (string->path s)))
-                (vector->list vec))))))
-    UNIQUE_RESPONSE_OK))
-
-(define-mz gethostname (_fun _pointer _long -> _int)
-  #:fail (lambda () #f))
-
-(define HOSTLEN 256)
-
-(define (build-app-name)
-  (let-values ([(path) (simplify-path
-                        (path->complete-path
-                         (or (find-executable-path (find-system-path 'run-file) #f)
-                             (find-system-path 'run-file))
-                         (current-directory)))]
-               [(host) (or (and gethostname
-                                (let ([b (make-bytes HOSTLEN)])
-                                  (and (zero? (gethostname b HOSTLEN))
-                                       (bytes->string/utf-8 (car (regexp-match #rx#"^[^\0]*" b)) #\?))))
-                           "")])
-    (string->bytes/utf-8
-     (format "org.racket-lang.~a"
-             (encode
-              (format "~a~a~a" host path (version)))))))
-
-(define (encode s)
-  (regexp-replace* #rx"=|\r\n" (base64-encode (string->bytes/utf-8 s)) ""))
-
-(define (send-command-line app)
-  (let ([msg (unique_message_data_new)]
-        [b (let ([o (open-output-bytes)])
-             (write (for/vector ([p (in-vector (current-command-line-arguments))])
-                      (define cp (path->complete-path p))
-                      (define s (path->string cp))
-                      (if (equal? cp (string->path s))
-                          s
-                          ;; can't represent as string; use bytes
-                          (path->bytes cp)))
-                    o)
-             (get-output-bytes o))])
-    (unique_message_data_set msg b (bytes-length b))
-    (unique_app_send_message app 42 msg)))
-
-(define (do-single-instance)
-  (let ([app (unique_app_new (build-app-name) #f)])
-    (when app
-      (unique_app_add_command app "startup" 42)
-      (when (unique_app_is_running app)
-        (when (= (send-command-line app)
-                 UNIQUE_RESPONSE_OK)
-          (exit 0)))
-      (void (connect-message-received app)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/utils.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/utils.rkt
deleted file mode 100644
index 2b4e09a082..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/utils.rkt
+++ /dev/null
@@ -1,198 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         ffi/unsafe/alloc
-         racket/string
-         racket/draw/unsafe/glib
-         (only-in '#%foreign ctype-c->scheme)
-         "../common/utils.rkt"
-         "types.rkt")
-
-(provide 
- define-mz
- define-gobj
- define-glib
- (protect-out define-gtk
-              define-gdk
-              define-gdk_pixbuf
-
-              g_object_ref
-              g_object_ref_sink
-              g_object_unref
-
-              gobject-ref
-              gobject-unref
-              as-gobject-allocation
-
-              as-gtk-allocation
-              as-gtk-window-allocation
-              clean-up-destroyed
-
-              g_free
-              _gpath/free
-              _GSList
-              gfree
-
-              g_object_set_data
-              g_object_get_data
-
-              g_object_new
-
-              (rename-out [g_object_get g_object_get_window])
-
-              get-gtk-object-flags
-              set-gtk-object-flags!
-
-              define-signal-handler
-
-              gdk_screen_get_default
-
-              ;; for declaring derived structures:
-              _GtkObject)
- mnemonic-string)
-
-(define gdk-lib 
-  (case (system-type)
-    [(windows) 
-     (ffi-lib "libatk-1.0-0")
-     (ffi-lib "libgio-2.0-0")
-     (ffi-lib "libgdk_pixbuf-2.0-0")
-     (ffi-lib "libgdk-win32-2.0-0")]
-    [else (ffi-lib "libgdk-x11-2.0" '("0" ""))]))
-(define gdk_pixbuf-lib 
-  (case (system-type)
-    [(windows)
-     (ffi-lib "libgdk_pixbuf-2.0-0")]
-    [(unix)
-     (ffi-lib "libgdk_pixbuf-2.0" '("0" ""))]
-    [else gdk-lib]))
-(define gtk-lib
-  (case (system-type)
-    [(windows) 
-     (ffi-lib "libgtk-win32-2.0-0")]
-    [else (ffi-lib "libgtk-x11-2.0" '("0" ""))]))
-
-(define-ffi-definer define-gtk gtk-lib)
-(define-ffi-definer define-gdk gdk-lib)
-(define-ffi-definer define-gdk_pixbuf gdk_pixbuf-lib)
-
-(define-gobj g_object_ref (_fun _pointer -> _pointer))
-(define-gobj g_object_unref (_fun _pointer -> _void))
-(define-gobj g_object_ref_sink (_fun _pointer -> _pointer))
-
-(define gobject-unref ((deallocator) g_object_unref))
-(define gobject-ref ((allocator gobject-unref) g_object_ref))
-
-(define-syntax-rule (as-gobject-allocation expr)
-  ((gobject-allocator (lambda () expr))))
-
-(define gobject-allocator (allocator gobject-unref))
-
-(define-gtk gtk_widget_destroy (_fun _GtkWidget -> _void))
-
-(define gtk-destroy ((deallocator) (lambda (v)
-                                     (gtk_widget_destroy v)
-                                     (g_object_unref v))))
-
-(define gtk-allocator (allocator remember-to-free-later))
-(define (clean-up-destroyed)
-  (free-remembered-now gtk-destroy))
-
-(define-syntax-rule (as-gtk-allocation expr)
-  ((gtk-allocator (lambda () (let ([v expr])
-                               (g_object_ref_sink v)
-                               v)))))
-(define-syntax-rule (as-gtk-window-allocation expr)
-  ((gtk-allocator (lambda () (let ([v expr])
-                               (g_object_ref v)
-                               v)))))
-
-(define-glib g_free (_fun _pointer -> _void))
-(define gfree ((deallocator) g_free))
-
-(define-gobj g_object_set_data (_fun _GtkWidget _string _pointer -> _void))
-(define-gobj g_object_get_data (_fun _GtkWidget _string -> _pointer))
-
-(define-gobj g_signal_connect_data (_fun _gpointer _string _fpointer _pointer _fnpointer _int -> _ulong))
-(define (g_signal_connect obj s proc user-data)
-  (g_signal_connect_data obj s proc user-data #f 0))
-
-(define-gobj g_object_get (_fun _GtkWidget (_string = "window") 
-				[w : (_ptr o _GdkWindow)]
-				(_pointer = #f) -> _void -> w))
-
-(define-gobj g_object_new (_fun _GType _pointer -> _GtkWidget))
-
-;; This seems dangerous, since the shape of GtkObject is not
-;;  documented. But it seems to be the only way to get and set
-;;  flags.
-(define-cstruct _GtkObject ([type-instance _pointer]
-                            [ref_count _uint]
-                            [qdata _pointer]
-                            [flags _uint32]))
-(define (get-gtk-object-flags gtk)
-  (GtkObject-flags (cast gtk _pointer _GtkObject-pointer)))
-(define (set-gtk-object-flags! gtk v)
-  (set-GtkObject-flags! (cast gtk _pointer _GtkObject-pointer) v))
-
-(define-gmodule g_module_open (_fun _path _int -> _pointer))
-
-(define-syntax-rule (define-signal-handler 
-                      connect-name
-                      signal-name
-                      (_fun . args)
-                      proc)
-  (begin
-    (define handler-proc proc)
-    (define handler_function
-      (function-ptr handler-proc (_fun #:atomic? #t . args)))
-    (define (connect-name gtk [user-data #f])
-      (g_signal_connect gtk signal-name handler_function user-data))))
-
-
-(define _gpath/free
-  (make-ctype _pointer
-              path->bytes ; a Racket bytes can be used as a pointer
-              (lambda (x)
-                (let ([b (bytes->path (make-byte-string x))])
-                  (g_free x)
-                  b))))
-
-(define-cstruct _g-slist
-  ([data _pointer]
-   [next (_or-null _g-slist-pointer)]))
-
-(define-glib g_slist_free (_fun _g-slist-pointer -> _void))
-;; This should probably be provided by Racket
-(define make-byte-string
-  (get-ffi-obj 'scheme_make_byte_string #f (_fun _pointer -> _racket)))
-
-(define (_GSList elem)
-  (make-ctype (_or-null _g-slist-pointer)
-              (lambda (l)
-                (let L ([l l])
-                  (if (null? l) 
-                      #f
-                      (make-g-slist (car l) (L (cdr l))))))
-              (lambda (gl)
-                (begin0
-                 (let L ([gl gl])
-                   (if (not gl) 
-                       null
-                       (cons ((ctype-c->scheme elem) (g-slist-data gl))
-                             (L (g-slist-next gl)))))
-                 (g_slist_free gl)))))
-
-(define-gdk gdk_screen_get_default (_fun -> _GdkScreen))
-
-(define (mnemonic-string orig-s)
-  (string-join
-   (for/list ([s (in-list (regexp-split #rx"&&" orig-s))])
-     (regexp-replace*
-      #rx"&(.)"
-      (regexp-replace*
-       #rx"_" 
-       s
-       "__")
-      "_\\1"))
-   "&"))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/w32.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/w32.rkt
deleted file mode 100644
index 8e995ba602..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/w32.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-
-(provide QS_ALLINPUT)
-
-(define QS_KEY              #x0001)
-(define QS_MOUSEMOVE        #x0002)
-(define QS_MOUSEBUTTON      #x0004)
-(define QS_POSTMESSAGE      #x0008)
-(define QS_TIMER            #x0010)
-(define QS_PAINT            #x0020)
-(define QS_SENDMESSAGE      #x0040)
-(define QS_HOTKEY           #x0080)
-(define QS_ALLPOSTMESSAGE   #x0100)
-(define QS_RAWINPUT         #x0400)
-(define QS_MOUSE           (bitwise-ior QS_MOUSEMOVE
-                                        QS_MOUSEBUTTON))
-
-(define QS_INPUT           (bitwise-ior QS_MOUSE
-                                        QS_KEY
-                                        QS_RAWINPUT))
-(define QS_ALLEVENTS       (bitwise-ior QS_INPUT
-                                        QS_POSTMESSAGE
-                                        QS_TIMER
-                                        QS_PAINT
-                                        QS_HOTKEY))
-
-(define QS_ALLINPUT        (bitwise-ior QS_INPUT
-                                        QS_POSTMESSAGE
-                                        QS_TIMER
-                                        QS_PAINT
-                                        QS_HOTKEY
-                                        QS_SENDMESSAGE))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/widget.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/widget.rkt
deleted file mode 100644
index 0b44df28d4..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/widget.rkt
+++ /dev/null
@@ -1,83 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "../common/queue.rkt"
-         "queue.rkt"
-         "utils.rkt"
-         "types.rkt")
-
-(provide 
- (protect-out widget%
-              gtk->wx
-
-              gtk_widget_show
-              gtk_widget_hide
-              gtk_widget_destroy
-
-              gtk_vbox_new
-              gtk_hbox_new
-              gtk_box_pack_start
-              gtk_box_pack_end))
-
-(define-gtk gtk_widget_show (_fun _GtkWidget -> _void))
-(define-gtk gtk_widget_hide (_fun _GtkWidget -> _void))
-
-(define-gtk gtk_widget_destroy (_fun _pointer -> _void))
-
-(define-gtk gtk_vbox_new (_fun _gboolean _int -> _GtkWidget))
-(define-gtk gtk_hbox_new (_fun _gboolean _int -> _GtkWidget))
-(define-gtk gtk_box_pack_start (_fun _GtkWidget _GtkWidget _gboolean _gboolean _uint -> _void))
-(define-gtk gtk_box_pack_end (_fun _GtkWidget _GtkWidget _gboolean _gboolean _uint -> _void))
-(define-gtk gtk_widget_get_parent (_fun _GtkWidget -> (_or-null _GtkWidget)))
-
-(define-signal-handler connect-destroy "destroy"
-  (_fun _GtkWidget _pointer -> _void)
-  (lambda (gtk cell)
-    (free-immobile-cell cell)))
-
-(define widget%
-  (class object%
-    (init gtk
-          [extra-gtks null]
-          [parent #f])
-    (init-field [eventspace (if parent
-                                (send parent get-eventspace)
-                                (current-eventspace))])
-
-    (when (eventspace-shutdown? eventspace)
-      (error '|GUI object initialization| "the eventspace has been shutdown"))
-
-    (define/public (get-eventspace) eventspace)
-    (define/public (direct-update?) #t)
-
-    (define/public (install-widget-parent p)
-      (set! eventspace (send p get-eventspace)))
-    
-    (super-new)
-
-    (define/public (register-extra-gtk gtk extra-gtk)
-      (define cell (g_object_get_data gtk "wx"))
-      (g_object_set_data extra-gtk "wx" cell))
-
-    (atomically
-     (let ([cell (malloc-immobile-cell (make-weak-box this))])
-       (g_object_set_data gtk "wx" cell)
-       (for ([gtk (in-list extra-gtks)])
-         (g_object_set_data gtk "wx" cell))
-       (connect-destroy gtk cell)))))
-
-(define (gtk->wx gtk)
-  (let ([ptr (g_object_get_data gtk "wx")])
-    (and ptr 
-         (let ([wb (ptr-ref ptr _scheme)])
-           (and wb (weak-box-value wb))))))
-
-(set-widget-hook! (lambda (gtk)
-                    (let loop ([gtk gtk])
-                      (and gtk
-                           (let ([wx (gtk->wx gtk)])
-                             (or wx
-                                 (loop (gtk_widget_get_parent gtk))))))))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/win32.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/win32.rkt
deleted file mode 100644
index 2ca6e23d77..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/win32.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         ffi/winapi
-         "utils.rkt")
-
-(provide gdk_win32_drawable_get_handle
-	 GetDC
-	 ReleaseDC)
-
-(define user32-lib
-  (cond
-   [(eq? 'windows (system-type))
-    (ffi-lib "user32.dll")]
-   [else #f]))
-
-(define-ffi-definer define-user32 user32-lib)
-
-(define _GdkDrawable _pointer)
-
-(define-gdk gdk_win32_drawable_get_handle (_fun _GdkDrawable -> _pointer)
-  #:make-fail make-not-available)
-
-(define-user32 GetDC (_fun #:abi winapi _pointer -> _pointer)
-  #:make-fail make-not-available)
-(define-user32 ReleaseDC (_fun #:abi winapi _pointer -> _void)
-  #:make-fail make-not-available)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/window.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/window.rkt
deleted file mode 100644
index 7830dd47f0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/window.rkt
+++ /dev/null
@@ -1,833 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         net/uri-codec
-         ffi/unsafe/atomic
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "../common/event.rkt"
-         "../common/freeze.rkt"
-         "../common/queue.rkt"
-         "../common/local.rkt"
-         "../common/delay.rkt"
-         racket/draw/unsafe/bstr
-         "keycode.rkt"
-         "keymap.rkt"
-         "queue.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt"
-         "widget.rkt"
-         "clipboard.rkt")
-
-(provide 
- (protect-out window%
-              queue-window-event
-              queue-window-refresh-event
-
-              gtk_widget_realize 
-              gtk_container_add
-              gtk_widget_add_events
-              gtk_widget_size_request
-              gtk_widget_set_size_request
-              gtk_widget_grab_focus
-              gtk_widget_set_sensitive
-
-              connect-focus
-              connect-key
-              connect-key-and-mouse
-              connect-enter-and-leave
-              do-button-event
-
-              (struct-out GtkRequisition) _GtkRequisition-pointer
-              (struct-out GtkAllocation) _GtkAllocation-pointer
-
-              widget-window
-              widget-allocation
-              widget-parent
-
-              the-accelerator-group
-              gtk_window_add_accel_group
-              gtk_menu_set_accel_group
-
-              flush-display
-              gdk_display_get_default
-
-              request-flush-delay
-              cancel-flush-delay
-              win-box-valid?
-              window->win-box
-              unrealize-win-box)
- gtk->wx
- gtk_widget_show
- gtk_widget_hide)
-
-;; ----------------------------------------
-
-(define-gtk gtk_container_add (_fun _GtkWidget _GtkWidget -> _void))
-(define-gtk gtk_container_remove (_fun _GtkWidget _GtkWidget -> _void))
-(define-gtk gtk_widget_realize (_fun _GtkWidget -> _void))
-(define-gtk gtk_widget_add_events (_fun _GtkWidget _int -> _void))
-
-(define-gdk gdk_keyval_to_unicode (_fun _uint -> _uint32))
-
-(define-gtk gtk_widget_get_display (_fun _GtkWidget -> _GdkDisplay))
-(define-gtk gtk_widget_get_screen (_fun _GtkWidget -> _GdkScreen))
-(define-gdk gdk_display_warp_pointer (_fun _GdkDisplay _GdkScreen _int _int -> _void))
-
-(define-cstruct _GtkRequisition ([width _int]
-                                 [height _int]))
-(define-cstruct _GtkAllocation ([x _int]
-                                [y _int]
-                                [width _int]
-                                [height _int]))
-
-(define-gtk gtk_widget_size_request (_fun _GtkWidget _GtkRequisition-pointer -> _void))
-(define-gtk gtk_widget_size_allocate (_fun _GtkWidget _GtkAllocation-pointer -> _void))
-(define-gtk gtk_widget_set_size_request (_fun _GtkWidget _int _int -> _void))
-(define-gtk gtk_widget_grab_focus (_fun _GtkWidget -> _void))
-(define-gtk gtk_widget_is_focus (_fun _GtkWidget -> _gboolean))
-(define-gtk gtk_widget_set_sensitive (_fun _GtkWidget _gboolean -> _void))
-
-(define-gdk gdk_keyboard_grab (_fun _GdkWindow _gboolean _int -> _void))
-(define-gdk gdk_keyboard_ungrab (_fun _int -> _void))
-
-(define _GtkAccelGroup (_cpointer 'GtkAccelGroup))
-(define-gtk gtk_accel_group_new (_fun -> _GtkAccelGroup))
-(define-gtk gtk_window_add_accel_group (_fun _GtkWindow _GtkAccelGroup -> _void))
-(define-gtk gtk_menu_set_accel_group (_fun _GtkWidget _GtkAccelGroup -> _void))
-
-(define the-accelerator-group (gtk_accel_group_new))
-
-(define-cstruct _GtkWidgetT ([obj _GtkObject]
-                             [private_flags _uint16]
-                             [state _byte]
-                             [saved_state _byte]
-                             [name _pointer]
-                             [style _pointer]
-                             [req _GtkRequisition]
-                             [alloc _GtkAllocation]
-                             [window _GdkWindow]
-                             [parent _GtkWidget]))
-
-(define (widget-window gtk)
-  (GtkWidgetT-window (cast gtk _GtkWidget _GtkWidgetT-pointer)))
-
-(define (widget-parent gtk)
-  (GtkWidgetT-parent (cast gtk _GtkWidget _GtkWidgetT-pointer)))
-
-(define (widget-allocation gtk)
-  (GtkWidgetT-alloc (cast gtk _GtkWidget _GtkWidgetT-pointer)))
-
-(define-gtk gtk_drag_dest_add_uri_targets (_fun _GtkWidget -> _void))
-(define-gtk gtk_drag_dest_set (_fun _GtkWidget _int (_pointer = #f) (_int = 0) _int -> _void))
-(define-gtk gtk_drag_dest_unset (_fun _GtkWidget -> _void))
-
-(define GTK_DEST_DEFAULT_ALL #x07)
-(define GDK_ACTION_COPY (arithmetic-shift 1 1))
-
-(define-signal-handler connect-drag-data-received "drag-data-received"
-  (_fun _GtkWidget _pointer _int _int _GtkSelectionData _uint _uint -> _void)
-  (lambda (gtk context x y data info time)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (let ([bstr (scheme_make_sized_byte_string
-                     (gtk_selection_data_get_data data)
-                     (gtk_selection_data_get_length data)
-                     1)])
-          (for ([m (regexp-match* #rx#"file://([^\r]*)\r\n" bstr
-                       #:match-select cadr)])
-            (queue-window-event wx
-                                (lambda ()
-                                  (let ([path
-                                         (string->path
-                                          (uri-decode
-                                           (bytes->string/utf-8 m)))])
-                                    (send wx on-drop-file path))))))))))
-
-;; ----------------------------------------
-
-(define-signal-handler connect-focus-in "focus-in-event"
-  (_fun _GtkWidget _GdkEventFocus-pointer -> _gboolean)
-  (lambda (gtk event)
-    (let ([wx (gtk->wx gtk)])
-      (when wx 
-        (send wx focus-change #t)
-        (when (send wx on-focus? #t)
-          (queue-window-event wx (lambda () (send wx on-set-focus)))))
-      #f)))
-(define-signal-handler connect-focus-out "focus-out-event"
-  (_fun _GtkWidget _GdkEventFocus-pointer -> _gboolean)
-  (lambda (gtk event)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx focus-change #f)
-        (when (send wx on-focus? #f)
-          (queue-window-event wx (lambda () (send wx on-kill-focus)))))
-      #f)))
-(define (connect-focus gtk)
-  (connect-focus-in gtk)
-  (connect-focus-out gtk))
-
-(define-signal-handler connect-size-allocate "size-allocate"
-  (_fun _GtkWidget _GtkAllocation-pointer -> _gboolean)
-  (lambda (gtk a)
-    (let ([wx (gtk->wx gtk)])
-      (when wx
-        (send wx save-size 
-              (GtkAllocation-x a)
-              (GtkAllocation-y a)
-              (GtkAllocation-width a)
-              (GtkAllocation-height a))))
-    #t))
-;; ----------------------------------------
-
-(define-signal-handler connect-key-press "key-press-event"
-  (_fun _GtkWidget _GdkEventKey-pointer -> _gboolean)
-  (lambda (gtk event)
-    (do-key-event gtk event #t #f)))
-
-(define-signal-handler connect-key-release "key-release-event"
-  (_fun _GtkWidget _GdkEventKey-pointer -> _gboolean)
-  (lambda (gtk event)
-    (do-key-event gtk event #f #f)))
-
-(define-signal-handler connect-scroll "scroll-event"
-  (_fun _GtkWidget _GdkEventScroll-pointer -> _gboolean)
-  (lambda (gtk event)
-    (do-key-event gtk event #f #t)))
-
-(define (do-key-event gtk event down? scroll?)
-  (let ([wx (gtk->wx gtk)])
-    (and
-     wx
-     (let ([im-str (if scroll?
-                       'none
-                       ;; Result from `filter-key-event' is one of
-                       ;;  - #f => drop the event
-                       ;;  - 'none => no replacement; handle as usual
-                       ;;  - a string => use as the keycode
-                       (send wx filter-key-event event))])
-       (when im-str
-         (let* ([modifiers (if scroll?
-                               (GdkEventScroll-state event)
-                               (GdkEventKey-state event))]
-                [bit? (lambda (m v) (positive? (bitwise-and m v)))]
-                [keyval->code (lambda (kv)
-                                (or
-                                 (map-key-code kv)
-                                 (integer->char (gdk_keyval_to_unicode kv))))]
-                [key-code (if scroll?
-                              (let ([dir (GdkEventScroll-direction event)])
-                                (cond
-                                 [(= dir GDK_SCROLL_UP) 'wheel-up]
-                                 [(= dir GDK_SCROLL_DOWN) 'wheel-down]
-                                 [(= dir GDK_SCROLL_LEFT) 'wheel-left]
-                                 [(= dir GDK_SCROLL_RIGHT) 'wheel-right]))
-                              (keyval->code (GdkEventKey-keyval event)))]
-                [k (new key-event%
-                        [key-code (if (and (string? im-str)
-                                           (= 1 (string-length im-str)))
-                                      (string-ref im-str 0)
-                                      key-code)]
-                        [shift-down (bit? modifiers GDK_SHIFT_MASK)]
-                        [control-down (bit? modifiers GDK_CONTROL_MASK)]
-                        [meta-down (bit? modifiers GDK_MOD1_MASK)]
-                        [mod3-down (bit? modifiers GDK_MOD3_MASK)]
-                        [mod4-down (bit? modifiers GDK_MOD4_MASK)]
-                        [mod5-down (bit? modifiers GDK_MOD5_MASK)]
-                        [alt-down (bit? modifiers GDK_META_MASK)]
-                        [x 0]
-                        [y 0]
-                        [time-stamp (if scroll?
-                                        (GdkEventScroll-time event)
-                                        (GdkEventKey-time event))]
-                        [caps-down (bit? modifiers GDK_LOCK_MASK)])])
-           (when (or (and (not scroll?)
-                          (let-values ([(s ag sag cl) (get-alts event)]
-                                       [(keyval->code*) (lambda (v)
-                                                          (and v
-                                                               (let ([c (keyval->code v)])
-                                                                 (and (not (equal? #\u0000 c))
-                                                                      c))))])
-                            (let ([s (keyval->code* s)]
-                                  [ag (keyval->code* ag)]
-                                  [sag (keyval->code* sag)]
-                                  [cl (keyval->code* cl)])
-                              (when s (send k set-other-shift-key-code s))
-                              (when ag (send k set-other-altgr-key-code ag))
-                              (when sag (send k set-other-shift-altgr-key-code sag))
-                              (when cl (send k set-other-caps-key-code cl))
-                              (or s ag sag cl))))
-                     (not (equal? #\u0000 key-code)))
-             (unless (or scroll? down?)
-               ;; swap altenate with main
-               (send k set-key-release-code (send k get-key-code))
-               (send k set-key-code 'release))
-             (if (send wx handles-events? gtk)
-                 (begin
-                   (queue-window-event wx (lambda () (send wx dispatch-on-char k #f)))
-                   #t)
-                 (constrained-reply (send wx get-eventspace)
-                                    (lambda () (send wx dispatch-on-char k #t))
-                                    #t)))))))))
-
-(define-signal-handler connect-button-press "button-press-event"
-  (_fun _GtkWidget _GdkEventButton-pointer -> _gboolean)
-  (lambda (gtk event)
-    (unless (gtk_widget_is_focus gtk)
-      (let ([wx (gtk->wx gtk)])
-        (when wx
-          (unless (other-modal? wx)
-            (gtk_widget_grab_focus gtk)))))
-    (do-button-event gtk event #f #f)))
-
-(define-signal-handler connect-button-release "button-release-event"
-  (_fun _GtkWidget _GdkEventButton-pointer -> _gboolean)
-  (lambda (gtk event)
-    (do-button-event gtk event #f #f)))
-
-(define-signal-handler connect-pointer-motion "motion-notify-event"
-  (_fun _GtkWidget _GdkEventMotion-pointer -> _gboolean)
-  (lambda (gtk event)
-    (do-button-event gtk event #t #f)))
-
-(define-signal-handler connect-enter "enter-notify-event"
-  (_fun _GtkWidget _GdkEventCrossing-pointer -> _gboolean)
-  (lambda (gtk event)
-    (let ([wx (gtk->wx gtk)]) (when wx (send wx enter-window)))
-    (do-button-event gtk event #f #t)))
-
-(define-signal-handler connect-leave "leave-notify-event"
-  (_fun _GtkWidget _GdkEventCrossing-pointer -> _gboolean)
-  (lambda (gtk event)
-    (let ([wx (gtk->wx gtk)]) (when wx (send wx leave-window)))
-    (do-button-event gtk event #f #t)))
-
-(define (connect-enter-and-leave gtk)
-  (connect-enter gtk)
-  (connect-leave gtk))
-
-(define (connect-key gtk)
-  (connect-key-press gtk)
-  (connect-key-release gtk))
-
-(define (connect-key-and-mouse gtk [skip-press? #f])
-  (connect-key gtk)
-  (connect-scroll gtk)
-  (connect-button-press gtk)
-  (unless skip-press? (connect-button-release gtk))
-  (connect-pointer-motion gtk)
-  (connect-enter-and-leave gtk))
-
-(define (do-button-event gtk event motion? crossing?)
-  (let ([type (if motion?
-                  GDK_MOTION_NOTIFY
-                  (if crossing?
-                      (GdkEventCrossing-type event)
-                      (GdkEventButton-type event)))])
-    (let ([wx (gtk->wx gtk)])
-      (when (or (= type GDK_BUTTON_PRESS)
-                (= type GDK_2BUTTON_PRESS)
-                (= type GDK_3BUTTON_PRESS))
-        (let ([floating? (send wx in-floating?)])
-          (if floating?
-              (gdk_keyboard_grab (widget-window gtk) #t 0)
-              (gdk_keyboard_ungrab 0))))
-      (and
-       wx
-       (if (or (= type GDK_2BUTTON_PRESS)
-               (= type GDK_3BUTTON_PRESS)
-               (and (or (= type GDK_ENTER_NOTIFY)
-                        (= type GDK_LEAVE_NOTIFY))
-                    (send wx skip-enter-leave-events)))
-           #t
-           (let* ([modifiers (if motion?
-                                 (GdkEventMotion-state event)
-                                 (if crossing?
-                                     (GdkEventCrossing-state event)
-                                     (GdkEventButton-state event)))]
-                  [bit? (lambda (m v) (positive? (bitwise-and m v)))]
-                  [type (cond
-                          [(= type GDK_MOTION_NOTIFY)
-                           'motion]
-                          [(= type GDK_ENTER_NOTIFY)
-                           'enter]
-                          [(= type GDK_LEAVE_NOTIFY)
-                           'leave]
-                          [(= type GDK_BUTTON_PRESS)
-                           (case (GdkEventButton-button event)
-                             [(1) 'left-down]
-                             [(3) 'right-down]
-                             [else 'middle-down])]
-                          [else
-                           (case (GdkEventButton-button event)
-                             [(1) 'left-up]
-                             [(3) 'right-up]
-                             [else 'middle-up])])]
-                  [m (let-values ([(x y)
-                                   (send wx
-                                         adjust-event-position
-                                         (->long ((if motion? 
-                                                      GdkEventMotion-x 
-                                                      (if crossing? GdkEventCrossing-x GdkEventButton-x))
-                                                  event))
-                                         (->long ((if motion? GdkEventMotion-y 
-                                                      (if crossing? GdkEventCrossing-y GdkEventButton-y))
-                                                  event)))])
-                       (new mouse-event%
-                            [event-type type]
-                            [left-down (case type
-                                         [(left-down) #t]
-                                         [(left-up) #f]
-                                         [else (bit? modifiers GDK_BUTTON1_MASK)])]
-                            [middle-down (case type
-                                           [(middle-down) #t]
-                                           [(middle-up) #f]
-                                           [else (bit? modifiers GDK_BUTTON2_MASK)])]
-                            [right-down (case type
-                                          [(right-down) #t]
-                                          [(right-up) #f]
-                                          [else (bit? modifiers GDK_BUTTON3_MASK)])]
-                            [x x]
-                            [y y]
-                            [shift-down (bit? modifiers GDK_SHIFT_MASK)]
-                            [control-down (bit? modifiers GDK_CONTROL_MASK)]
-                            [meta-down (bit? modifiers GDK_META_MASK)]
-                            [alt-down (bit? modifiers GDK_MOD1_MASK)]
-                            [mod3-down (bit? modifiers GDK_MOD3_MASK)]
-                            [mod4-down (bit? modifiers GDK_MOD4_MASK)]
-                            [mod5-down (bit? modifiers GDK_MOD5_MASK)]
-                            [time-stamp ((if motion? GdkEventMotion-time 
-                                             (if crossing? GdkEventCrossing-time GdkEventButton-time))
-                                         event)]
-                            [caps-down (bit? modifiers GDK_LOCK_MASK)]))])
-             (if (send wx handles-events? gtk)
-                 (begin
-                   (queue-window-event wx (lambda ()
-                                            (send wx dispatch-on-event m #f)))
-                   #t)
-                 (constrained-reply (send wx get-eventspace)
-                                    (lambda () (or (send wx dispatch-on-event m #t)
-                                                   (send wx internal-pre-on-event gtk m)))
-                                    #t
-                                    #:fail-result 
-                                    ;; an enter event is synthesized when a button is
-                                    ;; enabled and the mouse is over the button, and the
-                                    ;; event is not dispatched via the eventspace; leave
-                                    ;; events are perhaps similarly synthesized, so allow
-                                    ;; them, too
-                                    (if (or (eq? type 'enter) (eq? type 'leave))
-                                        #f
-                                        #t)))))))))
-
-;; ----------------------------------------
-
-(define (internal-error str)
-  (log-error
-   (apply string-append
-          (format "internal error: ~a" str)
-          (append
-           (for/list ([c (continuation-mark-set->context (current-continuation-marks))])
-             (let ([name (car c)]
-                   [loc (cdr c)])
-               (cond
-                [loc
-                 (string-append
-                  "\n"
-                  (cond 
-                   [(srcloc-line loc)
-                    (format "~a:~a:~a" 
-                            (srcloc-source loc)
-                            (srcloc-line loc)
-                            (srcloc-column loc))]
-                   [else
-                    (format "~a::~a" 
-                            (srcloc-source loc)
-                            (srcloc-position loc))])
-                  (if name (format " ~a" name) ""))]
-                [else (format "\n ~a" name)])))
-           '("\n")))))
-
-(define window%
-  (class widget%
-    (init-field parent
-                gtk)
-    (init [no-show? #f]
-          [extra-gtks null]
-          [add-to-parent? #t]
-          [connect-size-allocate? #t])
-
-    (super-new [gtk gtk]
-               [extra-gtks extra-gtks]
-               [parent parent])
-
-    (define save-x (get-unset-pos))
-    (define save-y (get-unset-pos))
-    (define save-w 0)
-    (define save-h 0)
-
-    (define/public (get-unset-pos) 0)
-
-    (when connect-size-allocate?
-      (connect-size-allocate gtk))
-
-    (when add-to-parent?
-      (gtk_container_add (send parent get-container-gtk) gtk))
-
-    (define/public (get-gtk) gtk)
-    (define/public (get-client-gtk) gtk)
-    (define/public (get-container-gtk) (get-client-gtk))
-    (define/public (get-window-gtk) (send parent get-window-gtk))
-
-    (define/public (move x y)
-      (set-size x y -1 -1))
-
-    (define/public (set-size x y w h)
-      (unless (and (or (not x) (equal? save-x x))
-                   (or (not y) (equal? save-y y))
-                   (or (= w -1) (= save-w (max w client-delta-w)))
-                   (or (= h -1) (= save-h (max h client-delta-h))))
-        (unless (not x) (set! save-x x))
-        (unless (not y) (set! save-y y))
-        (unless (= w -1) (set! save-w w))
-        (unless (= h -1) (set! save-h h))
-        (set! save-w (max save-w client-delta-w))
-        (set! save-h (max save-h client-delta-h))
-        (really-set-size gtk x y (or save-x 0) (or save-y 0) save-w save-h)
-        (queue-on-size)))
-
-    (define/public (save-size x y w h)
-      (set! save-w w)
-      (set! save-h h))
-
-    (define/public (really-set-size gtk given-x given-y x y w h)
-      (send parent set-child-size gtk x y w h))
-
-    (define/public (set-child-size child-gtk x y w h)
-      (gtk_widget_set_size_request child-gtk w h)
-      (gtk_widget_size_allocate child-gtk (make-GtkAllocation x y w h)))
-
-    (define/public (remember-size x y w h)
-      ;; called in event-pump thread
-      (unless (and (= save-w w)
-                   (= save-h h)
-                   (equal? save-x x)
-                   (equal? save-y y))
-        (set! save-w w)
-        (set! save-h h)
-        (set! save-x x)
-        (set! save-y y)
-        (queue-on-size)))
-
-    (define/public (queue-on-size) (void))
-
-    (define client-delta-w 0)
-    (define client-delta-h 0)
-
-    (define/public (adjust-client-delta dw dh)
-      (set! client-delta-w dw)
-      (set! client-delta-h dh))
-
-    (define/public (infer-client-delta [w? #t] [h? #t] [sub-h-gtk #f])
-      (let ([req (make-GtkRequisition 0 0)]
-            [creq (make-GtkRequisition 0 0)]
-            [hreq (make-GtkRequisition 0 0)])
-        (gtk_widget_size_request gtk req)
-        (gtk_widget_size_request (get-container-gtk) creq)
-        (when sub-h-gtk
-          (gtk_widget_size_request sub-h-gtk hreq))
-        (when w?
-          (set! client-delta-w (- (GtkRequisition-width req)
-                                  (max (GtkRequisition-width creq)
-                                       (GtkRequisition-width hreq)))))
-        (when h?
-          (set! client-delta-h (- (GtkRequisition-height req)
-                                  (GtkRequisition-height creq))))))
-
-    (define/public (set-auto-size [dw 0] [dh 0])
-      (let ([req (make-GtkRequisition 0 0)])
-        (gtk_widget_size_request gtk req)
-        (set-size #f
-                  #f
-                  (+ (GtkRequisition-width req) dw)
-                  (+ (GtkRequisition-height req) dh))))
-
-    (define shown? #f)
-    (define/public (direct-show on?)
-      ;; atomic mode
-      (if on?
-          (gtk_widget_show gtk)
-          (gtk_widget_hide gtk))
-      (set! shown? (and on? #t))
-      (register-child-in-parent on?)
-      (when on? (reset-child-dcs)))
-    (define/public (show on?)
-      (atomically
-       (direct-show on?)))
-    (define/public (reset-child-dcs) (void))
-    (define/public (is-shown?) shown?)
-    (define/public (is-shown-to-root?)
-      (and shown?
-           (if parent
-               (send parent is-shown-to-root?)
-               #t)))
-
-    (unless no-show? (show #t))
-
-    (define/public (get-x) (or save-x 0))
-    (define/public (get-y) (or save-y 0))
-    (define/public (get-width) save-w)
-    (define/public (get-height) save-h)
-
-    (define/public (get-parent) parent)
-    (define/public (set-parent p)
-      ;; in atomic mode
-      (g_object_ref gtk)
-      (gtk_container_remove (send parent get-container-gtk) gtk)
-      (set! parent p)
-      (gtk_container_add (send parent get-container-gtk) gtk)
-      (set! save-x 0)
-      (set! save-y 0)
-      (g_object_unref gtk))
-
-    (define/public (get-top-win) (send parent get-top-win))
-
-    (define/public (get-dialog-level) (send parent get-dialog-level))
-
-    (define/public (get-size xb yb)
-      (set-box! xb save-w)
-      (set-box! yb save-h))
-    (define/public (get-client-size xb yb)
-      (get-size xb yb)
-      (set-box! xb (max 0 (- (unbox xb) client-delta-w)))
-      (set-box! yb (max 0 (- (unbox yb) client-delta-h))))
-
-    (define enabled? #t)
-    (define/pubment (is-enabled-to-root?)
-      (and enabled?
-           (inner (send parent is-enabled-to-root?)
-                  is-enabled-to-root?)))
-    (define/public (enable on?)
-      (set! enabled? on?)
-      (gtk_widget_set_sensitive gtk on?))
-    (define/public (is-window-enabled?) enabled?)
-
-    (define drag-connected? #f)
-    (define/public (drag-accept-files on?)
-      (if on?
-          (begin
-            (unless drag-connected?
-              (connect-drag-data-received gtk)
-              (set! drag-connected? #t))
-            (gtk_drag_dest_set gtk GTK_DEST_DEFAULT_ALL GDK_ACTION_COPY)
-            (gtk_drag_dest_add_uri_targets gtk))
-          (gtk_drag_dest_unset gtk)))
-      
-    (define/public (in-floating?)
-      (send parent in-floating?))
-
-    (define/public (set-focus)
-      (gtk_widget_grab_focus (get-client-gtk)))
-
-    (define cursor-handle #f)
-    (define/public (set-cursor v)
-      (set! cursor-handle (and v
-                               (send (send v get-driver) get-handle)))
-      (check-window-cursor this))
-    (define/public (enter-window)
-      (set-window-cursor this #f))
-    (define/public (leave-window)
-      (when parent
-        (send parent enter-window)))
-    (define/public (set-window-cursor in-win c)
-      (set-parent-window-cursor in-win (or c cursor-handle)))
-    (define/public (set-parent-window-cursor in-win c)
-      (when parent
-        (send parent set-window-cursor in-win c)))
-    (define/public (check-window-cursor win)
-      (when parent
-        (send parent check-window-cursor win)))
-
-    (define/public (on-set-focus) (void))
-    (define/public (on-kill-focus) (void))
-
-    (define/public (focus-change on?) (void))
-    (define/public (filter-key-event e) 'none)
-
-    (define/public (on-focus? on?) #t)
-
-    (define/private (pre-event-refresh)
-      ;; Since we break the connection between the
-      ;; Gtk queue and event handling, we
-      ;; re-sync the display in case a stream of
-      ;; events (e.g., key repeat) have a corresponding
-      ;; stream of screen updates.
-      (flush-display))
-
-    (define/public (handles-events? gtk) #f)
-    (define/public (dispatch-on-char e just-pre?) 
-      (pre-event-refresh)
-      (cond
-       [(other-modal? this) #t]
-       [(call-pre-on-char this e) #t]
-       [just-pre? #f]
-       [else (when enabled? (on-char e)) #t]))
-    (define/public (dispatch-on-event e just-pre?) 
-      (pre-event-refresh)
-      (cond
-       [(other-modal? this e) #t]
-       [(call-pre-on-event this e) #t]
-       [just-pre? #f]
-       [else (when enabled? (on-event e)) #t]))
-
-    (define/public (internal-pre-on-event gtk e) #f)
-
-    (define/public (call-pre-on-event w e)
-      (or (send parent call-pre-on-event w e)
-          (pre-on-event w e)))
-    (define/public (call-pre-on-char w e)
-      (or (send parent call-pre-on-char w e)
-          (pre-on-char w e)))
-    (define/public (pre-on-event w e) #f)
-    (define/public (pre-on-char w e) #f)
-
-    (define/public (on-char e) (void))
-    (define/public (on-event e) (void))
-
-    (define skip-enter-leave? #f)
-    (define/public skip-enter-leave-events 
-      (case-lambda
-       [(skip?) (set! skip-enter-leave? skip?)]
-       [else skip-enter-leave?]))
-
-    (define/public (register-child child on?)
-      (void))
-    (define/public (register-child-in-parent on?)
-      (when parent
-        (send parent register-child this on?)))
-
-    (define/public (paint-children)
-      (void))
-
-    (define/public (on-drop-file path) (void))
-
-    (define/public (get-handle) (get-gtk))
-    (define/public (get-client-handle) (get-container-gtk))
-
-    (define/public (popup-menu m x y)
-      (let ([gx (box x)]
-            [gy (box y)])
-        (client-to-screen gx gy)
-        (send m popup (unbox gx) (unbox gy)
-              (lambda (thunk) (queue-window-event this thunk)))))
-
-    (define/public (center a b) (void))
-    (define/public (refresh) (refresh-all-children))
-
-    (define/public (refresh-all-children) (void))
-
-    (define/public (screen-to-client x y)
-      (internal-screen-to-client x y))
-    (define/public (internal-screen-to-client x y)
-      (let ([xb (box 0)]
-            [yb (box 0)])
-        (internal-client-to-screen xb yb)
-        (set-box! x (- (unbox x) (unbox xb)))
-        (set-box! y (- (unbox y) (unbox yb)))))
-    (define/public (client-to-screen x y)
-      (internal-client-to-screen x y))
-    (define/public (internal-client-to-screen x y)
-      (let-values ([(dx dy) (get-client-delta)])
-        (send parent internal-client-to-screen x y)
-        (set-box! x (+ (unbox x) save-x dx))
-        (set-box! y (+ (unbox y) save-y dy))))
-
-    (define event-position-wrt-wx #f)
-    (define/public (set-event-positions-wrt wx)
-      (set! event-position-wrt-wx wx))
-    
-    (define/public (adjust-event-position x y)
-      (if event-position-wrt-wx
-          (let ([xb (box x)]
-                [yb (box y)])
-            (internal-client-to-screen xb yb)
-            (send event-position-wrt-wx internal-screen-to-client xb yb)
-            (values (unbox xb) (unbox yb)))
-          (values x y)))
-
-    (define/public (get-client-delta)
-      (values 0 0))
-
-    (define/public (warp-pointer x y)
-      (define xb (box x))
-      (define yb (box y))
-      (client-to-screen xb yb)
-      (gdk_display_warp_pointer (gtk_widget_get_display gtk)
-                                (gtk_widget_get_screen gtk)
-                                (unbox xb)
-                                (unbox yb)))
-
-    (define/public (gets-focus?) #t)))
-
-(define (queue-window-event win thunk)
-  (queue-event (send win get-eventspace) thunk))
-(define (queue-window-refresh-event win thunk)
-  (queue-refresh-event (send win get-eventspace) thunk))
-
-(define-gdk gdk_display_flush (_fun _GdkDisplay -> _void))
-(define-gdk gdk_display_get_default (_fun -> _GdkDisplay))
-(define (flush-display)
-  (try-to-sync-refresh)
-  (gdk_window_process_all_updates)
-  (gdk_display_flush (gdk_display_get_default)))
-
-(define-gdk gdk_window_freeze_updates (_fun _GdkWindow -> _void))
-(define-gdk gdk_window_thaw_updates (_fun _GdkWindow -> _void))
-(define-gdk gdk_window_invalidate_rect (_fun _GdkWindow _pointer _gboolean -> _void))
-(define-gdk gdk_window_process_all_updates (_fun -> _void))
-(define-gdk gdk_window_ensure_native (_fun _GdkWindow -> _gboolean)
-  ;; Requires 2.18
-  #:fail (lambda () (lambda (win) #f)))
-
-(define (win-box-valid? win-box)
-  (mcar win-box))
-(define (window->win-box win)
-  (mcons win 0))
-(define (unrealize-win-box win-box)
-  (let ([win (mcar win-box)])
-    (when win
-      (set-mcar! win-box #f)
-      (for ([i (in-range (mcdr win-box))])
-        (gdk_window_thaw_updates win)))))
-
-(define (request-flush-delay win-box)
-  (do-request-flush-delay 
-   win-box
-   (lambda (win-box)
-     (let ([win (mcar win-box)])
-       (and win
-            ;; The freeze/thaw state is actually with the window's
-            ;; implementation, so force a native implementation of the
-            ;; window to try to avoid it changing out from underneath
-            ;; us between the freeze and thaw actions.
-            (gdk_window_ensure_native win)
-            (begin
-              (gdk_window_freeze_updates win)
-              (set-mcdr! win-box (add1 (mcdr win-box)))
-              #t))))
-   (lambda (win-box)
-     (let ([win (mcar win-box)])
-       (when win
-         (gdk_window_thaw_updates win)
-         (set-mcdr! win-box (sub1 (mcdr win-box))))))))
-
-(define (cancel-flush-delay req)
-  (when req
-    (do-cancel-flush-delay 
-     req
-     (lambda (win-box)
-       (let ([win (mcar win-box)])
-         (when win
-           (gdk_window_thaw_updates win)
-           (set-mcdr! win-box (sub1 (mcdr win-box)))))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/x11.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/x11.rkt
deleted file mode 100644
index d069e8ce81..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/x11.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/define
-         ffi/unsafe/alloc
-         "utils.rkt")
-
-(provide 
- (protect-out gdk_pixmap_new
-              gdk_drawable_get_display
-              gdk_drawable_get_visual
-              gdk_x11_drawable_get_xid
-              gdk_x11_display_get_xdisplay
-              gdk_x11_visual_get_xvisual
-              gdk_x11_screen_get_screen_number))
-
-(define _GdkDrawable _pointer)
-(define _GdkDisplay (_cpointer 'GdkDisplay))
-(define _GdkScreen (_cpointer 'GdkScreen))
-(define _GdkVisual (_cpointer 'GdkVisual))
-(define _GdkPixmap (_cpointer 'GdkPixmap))
-(define _Visual (_cpointer 'Visual))
-(define _Display (_cpointer 'Display))
-(define _Drawable _ulong)
-
-(define-gdk gdk_pixmap_new (_fun _GdkDrawable _int _int _int -> _GdkPixmap)
-  #:wrap (allocator gobject-unref))
-
-(define-gdk gdk_drawable_get_display (_fun _GdkDrawable -> _GdkDisplay))
-(define-gdk gdk_drawable_get_visual (_fun _GdkDrawable -> _GdkVisual))
-
-(define-gdk gdk_x11_drawable_get_xid (_fun _GdkDrawable -> _Drawable)
-  #:make-fail make-not-available)
-
-(define-gdk gdk_x11_display_get_xdisplay (_fun _GdkDisplay -> _Display)
-  #:make-fail make-not-available)
-
-(define-gdk gdk_x11_visual_get_xvisual (_fun _GdkVisual -> _Visual)
-  #:make-fail make-not-available)
-
-(define-gdk gdk_x11_screen_get_screen_number (_fun _GdkScreen -> _int)
-  #:make-fail make-not-available)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/info.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/info.rkt
deleted file mode 100644
index a5b71b1dd7..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-omit-paths 'all)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/platform.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/platform.rkt
deleted file mode 100644
index 8029396a56..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/platform.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-(require racket/runtime-path 
-         (for-syntax racket/base))
-(provide 
- (protect-out (all-defined-out)))
-
-(define-runtime-module-path-index platform-lib
-  (let ([gtk-lib
-         '(lib "mred/private/wx/gtk/platform.rkt")])
-    (case (system-type)
-      [(windows) (if (getenv "PLT_WIN_GTK")
-                     gtk-lib
-                     '(lib "mred/private/wx/win32/platform.rkt"))]
-      [(macosx) '(lib "mred/private/wx/cocoa/platform.rkt")]
-      [(unix) gtk-lib])))
-
-(define-values (button%
-                canvas%
-                canvas-panel%
-                check-box%
-                choice%
-                clipboard-driver%
-                cursor-driver%
-                dialog%
-                frame%
-                gauge%
-                group-panel%
-                item%
-                list-box%
-                menu%
-                menu-bar%
-                menu-item%
-                message%
-                panel%
-                printer-dc%
-                radio-box%
-                slider%
-                tab-panel%
-                window%
-                can-show-print-setup?
-                show-print-setup
-                id-to-menu-item
-                file-selector
-                is-color-display?
-                get-display-depth
-                has-x-selection?
-                hide-cursor
-                bell
-                display-size
-                display-origin
-		display-count
-                display-bitmap-resolution
-                flush-display
-                get-current-mouse-state
-                fill-private-color
-                cancel-quit
-                get-control-font-face
-                get-control-font-size
-                get-control-font-size-in-pixels?
-                get-double-click-time
-                file-creator-and-type
-                location->window
-                shortcut-visible-in-label?
-                unregister-collecting-blit
-                register-collecting-blit
-                find-graphical-system-path
-                play-sound
-                get-panel-background
-                font-from-user-platform-mode
-                get-font-from-user
-                color-from-user-platform-mode
-                get-color-from-user
-                special-option-key
-                special-control-key
-                get-highlight-background-color
-                get-highlight-text-color
-                make-screen-bitmap
-                make-gl-bitmap
-                check-for-break
-                key-symbol-to-menu-key
-                needs-grow-box-spacer?)
-  ((dynamic-require platform-lib 'platform-values)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/button.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/button.rkt
deleted file mode 100644
index 04d568388c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/button.rkt
+++ /dev/null
@@ -1,183 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-	 racket/draw/private/xp
-         ffi/unsafe
-          "../../syntax.rkt"
-          "../../lock.rkt"
-          "../common/event.rkt"
-         "item.rkt"
-	 "utils.rkt"
-	 "const.rkt"
-	 "window.rkt"
-	 "wndclass.rkt"
-         "hbitmap.rkt"
-         "types.rkt")
-
-(provide 
- (protect-out base-button%
-              button%))
-
-(define BM_SETSTYLE #x00F4)
-
-(define base-button% 
-  (class item%
-    (inherit set-control-font auto-size get-hwnd
-             remember-label-bitmap set-size)
-
-    (init parent cb label x y w h style font)
-
-    (define callback cb)
-
-    (define bitmap? (or (label . is-a? . bitmap%)
-			(pair? label)))
-    (define orientation (and (pair? label)
-			     (caddr label)))
-
-    (define/public (get-class) "PLTBUTTON")
-    (define/public (get-flags) BS_PUSHBUTTON)
-    
-    (super-new [callback cb]
-               [parent parent]
-               [hwnd 
-                (CreateWindowExW/control 0
-                                         (get-class)
-                                         (cond
-					  [(string? label) label]
-					  [(pair? label) (cadr label)]
-					  [else "<image>"])
-                                         (bitwise-ior (get-flags) WS_CHILD WS_CLIPSIBLINGS
-                                                      (if bitmap?
-							  (case (and (not xp?) 
-								     orientation)
-							    [(#f) BS_BITMAP]
-							    [(left) BS_LEFT]
-							    [(right) BS_RIGHT]
-							    [(top) BS_TOP]
-							    [(bottom) BS_BOTTOM])
-                                                          BS_MULTILINE))
-                                         0 0 0 0
-                                         (send parent get-content-hwnd)
-                                         #f
-                                         hInstance
-                                         #f)]
-               [style style])
-
-    (when bitmap?
-      (let ([hbitmap (bitmap->hbitmap (if (pair? label)
-					  (if xp?
-					      (collapse-to-bitmap label font)
-					      (car label))
-					  label)
-				      #:bg (get-button-background))])
-        (remember-label-bitmap hbitmap)
-        (SendMessageW (get-hwnd) BM_SETIMAGE IMAGE_BITMAP 
-                      (cast hbitmap _HBITMAP _LPARAM))))
-
-    (define/private (collapse-to-bitmap label font)
-      ;; XP doesn't handle a combination of string
-      ;; and bitmap labels
-      (let-values ([(w h) (auto-size-button font label
-					    #:resize (lambda (w h)
-						       (values w h)))])
-	 (let* ([bm (make-object bitmap% w h #f #f)]
-		[dc (make-object bitmap-dc% bm)]
-		[h? (memq (caddr label) '(left right))])
-	   (send dc draw-bitmap (car label)
-		 (if h?
-		     (if (eq? (caddr label) 'left)
-			 3
-			 (- w (send (car label) get-width) 3))
-		     (quotient (- w (send (car label) get-width)) 2))
-		 (if h?
-		     (quotient (- h (send (car label) get-height)) 2)
-		     (if (eq? (caddr label) 'top)
-			 3
-			 (- h (send (car label) get-height) 3))))
-	   (send dc set-font (or font (get-default-control-font)))
-	   (let-values ([(tw th ta td) (send dc get-text-extent (cadr label))])
-	     (send dc draw-text (cadr label)
-		   (if h?
-		       (if (eq? (caddr label) 'left)
-			   (- w tw 3)
-			   3)
-		       (quotient (- w tw) 2))
-		   (if h?
-		       (quotient (- h th) 2)
-		       (if (eq? (caddr label) 'top)
-			   (- h th 3)
-			   3))))
-	   (send dc set-bitmap #f)
-	   bm)))
-
-    (set-control-font font)
-
-    (define/public (get-button-background)
-      #xFFFFFF)
-
-    (define/public (auto-size-button 
-		    font 
-		    label
-		    #:resize [resize (lambda (w h) (set-size #f #f w h))])
-      (cond
-       [orientation
-	(let ([h? (memq orientation '(left right))])
-	  (auto-size font (list (car label) (cadr label))
-		     0 0 12 8
-		     resize
-		     #:combine-width (if h? + max)
-		     #:combine-height (if h? max +)))]
-       [bitmap?
-        (auto-size font label 0 0 4 4)]
-       [else
-        (auto-size font label 60 20 12 0 #:scale-w 1.1 #:scale-h 1.1)]))
-    (auto-size-button font label)
-
-    (define/override (size->screen v) (->screen* v))
-
-    ;; XP doesn't show both bitmap and string labels,
-    ;; so we synthesize a bitmap label when we have both
-    (define xp-label-bitmap (and xp? orientation (car label)))
-    (define xp-label-string (and xp? orientation (string->immutable-string (cadr label))))
-    (define xp-label-font (and xp? orientation font))
-
-    (define/override (set-label s)
-      (if (and orientation xp?)
-	  (atomically
-	   (begin
-	     (if (string? s) 
-		 (set! xp-label-string s)
-		 (set! xp-label-bitmap s))
-	     (super
-	      set-label
-	      (collapse-to-bitmap (list xp-label-bitmap
-					xp-label-string
-					orientation)
-				  xp-label-font))))
-	  (super set-label s)))
-
-    ;; Avoid passing any key event to a button or checkbox. The
-    ;; `pre-on-char` of the frame will take care of changing space to
-    ;; a control action, but the control itself may use WM_KEYDOWN
-    ;; instead of WM_CHAR.
-    (define/override (capture-all-key-events?)
-      #t)
-
-    (define/override (is-command? cmd)
-      (= cmd BN_CLICKED))
-
-    (define/override (do-command cmd control-hwnd)
-      (queue-window-event this (lambda ()
-                                 (callback this
-                                           (new control-event%
-                                                [event-type 'button]
-                                                [time-stamp (current-milliseconds)])))))
-
-    (define/public (set-border on?)
-      (SendMessageW (get-hwnd) BM_SETSTYLE
-                    (if on? BS_DEFPUSHBUTTON BS_PUSHBUTTON)
-                    1))))
-
-(define button% 
-  (class base-button%
-    (super-new)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/canvas.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/canvas.rkt
deleted file mode 100644
index 4a9a7937ce..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/canvas.rkt
+++ /dev/null
@@ -1,655 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         racket/draw
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "../common/canvas-mixin.rkt"
-         "../common/backing-dc.rkt"
-         "../common/event.rkt"
-         "../common/freeze.rkt"
-         "../common/queue.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "wndclass.rkt"
-         "window.rkt"
-         "dc.rkt"
-         "item.rkt"
-         "hbitmap.rkt"
-         "gcwin.rkt"
-         "theme.rkt"
-         "panel.rkt")
-
-(provide 
- (protect-out canvas%
-              canvas-panel%))
-
-(define WS_EX_STATICEDGE        #x00020000)
-(define WS_EX_CLIENTEDGE        #x00000200)
-
-(define-user32 BeginPaint (_wfun _HWND _pointer -> _HDC))
-(define-user32 EndPaint (_wfun _HWND _pointer -> _BOOL))
-(define-user32 ShowScrollBar (_wfun _HWND _int _BOOL -> (r : _BOOL)
-                                    -> (unless r (failed 'ShowScrollbar))))
-
-(define-gdi32 CreateSolidBrush (_wfun _COLORREF -> _HBRUSH))
-(define-user32 FillRect (_wfun _HDC _RECT-pointer _HBRUSH -> (r : _int)
-                               -> (when (zero? r) (failed 'FillRect))))
-
-(define _HRGN _pointer)
-(define-user32 GetDCEx (_wfun _HWND _HRGN _DWORD -> _HDC))
-(define DCX_WINDOW           #x00000001)
-(define DCX_CACHE            #x00000002)
-(define DCX_INTERSECTRGN     #x00000080)
-
-(define EP_EDITTEXT 1)
-(define ETS_NORMAL 1)
-(define ETS_DISABLE 4)
-
-(define HTHSCROLL           6)
-(define HTVSCROLL           7)
-
-(define CB_SHOWDROPDOWN #x014F)
-
-(define-cstruct _SCROLLINFO
-  ([cbSize _UINT]
-   [fMask _UINT]
-   [nMin  _int]
-   [nMax  _int]
-   [nPage _UINT]
-   [nPos  _int]
-   [nTrackPos _int]))
-
-(define-user32 SetScrollInfo (_wfun _HWND _int _SCROLLINFO-pointer _BOOL -> _int))
-(define-user32 GetScrollPos (_wfun _HWND _int -> _int))
-(define-user32 SetScrollPos (_wfun _HWND _int _int _BOOL -> _int))
-(define-user32 GetScrollInfo (_wfun _HWND _int (i : _SCROLLINFO-pointer
-                                                  = (make-SCROLLINFO (ctype-sizeof _SCROLLINFO)
-                                                                     (bitwise-ior SIF_RANGE SIF_POS 
-                                                                                  SIF_PAGE SIF_TRACKPOS)
-                                                                     0 0 0 0 0))
-                                    -> (r : _BOOL)
-                                    -> (if r i (failed 'GetScrollInfo))))
-
-(define COMBO-WIDTH 18)
-
-(define canvas% 
-  (canvas-mixin
-   (class (canvas-autoscroll-mixin (item-mixin window%))
-     (init parent
-           x y w h
-           style
-           [ignored-name #f]
-           [gl-conf #f])
-
-     (inherit get-hwnd
-              get-client-size
-              get-eventspace
-              set-control-font
-              is-auto-scroll? is-disabled-scroll?
-              get-virtual-width get-virtual-height
-              reset-auto-scroll
-              refresh-for-autoscroll
-	      try-mouse)
-
-     (define hscroll? (or (memq 'hscroll style)
-                          (memq 'auto-hscroll style)))
-     (define vscroll? (or (memq 'vscroll style)
-                          (memq 'auto-vscroll style)))
-     (define for-gl? (memq 'gl style))
-
-     (define panel-hwnd
-       (and (memq 'combo style)
-            (CreateWindowExW 0
-                             "PLTTabPanel"
-                             #f
-                             (bitwise-ior WS_CHILD)
-                             0 0 (->screen w) (->screen h)
-                             (send parent get-content-hwnd)
-                             #f
-                             hInstance
-                             #f)))
-
-     (define canvas-hwnd
-       (CreateWindowExW (cond
-                         [(memq 'border style) WS_EX_STATICEDGE]
-                         [(memq 'control-border style) WS_EX_CLIENTEDGE]
-                         [else 0])
-                        "PLTCanvas"
-                        #f
-                        (bitwise-ior WS_CHILD 
-                                     (if panel-hwnd WS_VISIBLE 0)
-                                     (if hscroll? WS_HSCROLL 0)
-                                     (if vscroll? WS_VSCROLL 0))
-                        0 0 (->screen w) (->screen h)
-                        (or panel-hwnd (send parent get-content-hwnd))
-                        #f
-                        hInstance
-                        #f))
-     (define combo-hwnd
-       (and panel-hwnd
-            (CreateWindowExW/control 0
-                                     "PLTCOMBOBOX"
-                                     ""
-                                     (bitwise-ior WS_CHILD WS_VISIBLE
-                                                  CBS_DROPDOWNLIST 
-                                                  WS_HSCROLL WS_VSCROLL
-                                                  WS_BORDER WS_CLIPSIBLINGS)
-                                     0 0 (->screen w) (->screen h)
-                                     panel-hwnd
-                                     #f
-                                     hInstance
-                                     #f)))
-
-     (define content-hwnd
-       (if (is-panel?)
-           (CreateWindowExW 0
-                            "PLTTabPanel"
-                            #f
-                            (bitwise-ior WS_CHILD WS_CLIPSIBLINGS WS_VISIBLE)
-                            0 0 (->screen w) (->screen h)
-                            canvas-hwnd
-                            #f
-                            hInstance
-                            #f)
-           canvas-hwnd))
-
-     (define hwnd (or panel-hwnd canvas-hwnd))
-     (define dc #f)
-
-     (define next-scroll-is-change? #f)
-
-     (super-new [parent parent]
-                [hwnd hwnd]
-                [extra-hwnds (if panel-hwnd
-                                 (list canvas-hwnd combo-hwnd)
-                                 (if (eq? content-hwnd canvas-hwnd)
-                                     null
-                                     (list content-hwnd)))]
-                [style style])
-
-     (when combo-hwnd
-       (set-control-font #f combo-hwnd))
-
-     (define control-border-theme
-       (and (memq 'control-border style)
-            (OpenThemeData canvas-hwnd "Edit")))
-
-     (define/override (get-content-hwnd)
-       content-hwnd)
-
-     (define/override (wndproc w msg wParam lParam default)
-       (cond
-        [(= msg WM_PAINT)
-         (let* ([ps (malloc 128)]
-                [hdc (BeginPaint w ps)])
-	   (when hdc
-             (if for-gl?
-                 (queue-paint)
-                 (if (positive? paint-suspended)
-                     (set! suspended-refresh? #t)
-                     (let ([erase
-                            (lambda ()
-                              (let* ([hbrush (if no-autoclear?
-                                                 #f
-                                                 (if transparent?
-                                                     background-hbrush
-                                                     (CreateSolidBrush bg-colorref)))])
-                                (when hbrush
-                                  (let ([r (GetClientRect canvas-hwnd)])
-                                    (FillRect hdc r hbrush))
-                                  (unless transparent?
-                                    (DeleteObject hbrush)))))])
-                       (when transparent? (erase))
-                       (unless (do-canvas-backing-flush hdc)
-                         (unless transparent? (erase))
-                         (queue-paint)))))
-             (EndPaint w ps)))
-         0]
-        [(= msg WM_NCPAINT)
-         (if control-border-theme
-             (let* ([r (GetWindowRect canvas-hwnd)]
-                    [res (default w msg wParam lParam)]
-		    [hrgn (if (= wParam 1) ;; check is needed for Win7
-			      #f
-			      (cast wParam _intptr _HRGN))]
-                    [hdc (GetDCEx canvas-hwnd hrgn
-                                  (bitwise-ior DCX_CACHE DCX_WINDOW
-				               (if hrgn
-						   DCX_INTERSECTRGN
-						   0)))]
-                    [wr (make-RECT 0 0
-                                   (- (RECT-right r) (RECT-left r))
-                                   (- (RECT-bottom r) (RECT-top r)))])
-               (DrawThemeBackground control-border-theme
-                                    hdc
-                                    EP_EDITTEXT
-                                    ETS_NORMAL ;; or ETS_DISABLED?
-                                    wr
-                                    #f)
-               (ReleaseDC canvas-hwnd hdc)
-               1)
-             (default w msg wParam lParam))]
-        [(= msg WM_HSCROLL)
-         (when hscroll?
-           (on-scroll-change SB_HORZ (LOWORD wParam)))
-         0]
-        [(= msg WM_VSCROLL)
-         (when vscroll?
-           (on-scroll-change SB_VERT (LOWORD wParam)))
-         0]
-        [else
-	 (when (= msg WM_GESTURE)
-	   ;; The fall-though wndproc might generate a WM_*SCROLL
-	   ;; event for us, but we need to force an update,
-	   ;; because the generated event happens after the position
-	   ;; is changed. And if it doesn't generate a scroll, then
-	   ;; it's ok to have an occassional spurious update.
-	   (set! next-scroll-is-change? #t))
-	 (super wndproc w msg wParam lParam default)]))
-     
-     (define/override (wndproc-for-ctlproc w msg wParam lParam default)
-       ;; act on clicks for a combo field:
-       (if (try-mouse w msg wParam lParam)
-	   0
-	   (default w msg wParam lParam)))
-     
-     (set! dc (new dc% [canvas this] [transparent? (memq 'transparent style)]))
-     (send dc start-backing-retained)
-
-     (define/public (get-dc) dc)
-
-     (define gl-config gl-conf)
-     (define/public (get-gl-config) gl-config)
-
-     (define/override (on-resized)
-       (reset-dc))
-
-     (define/private (reset-dc [refresh? #t])
-       (send dc reset-backing-retained)
-       (send dc set-auto-scroll
-             (if (get-virtual-width)
-                 (get-virtual-h-pos)
-                 0)
-             (if (get-virtual-height)
-                 (get-virtual-v-pos)
-                 0))
-       (when refresh? (refresh-one)))
-
-     (define/override (show-children)
-       (when (dc . is-a? . dc<%>)
-         ;; if the canvas was never shown, then it has never
-         ;; been refreshed --- but it may have been drawn
-         ;; outside `on-paint', so force a refresh
-         (reset-dc)))
-
-     (define/override (get-client-hwnd)
-       canvas-hwnd)
-
-     (define/override (set-size x y w h)
-       (super set-size x y w h)
-       (when panel-hwnd
-         (let* ([r (and (or (= w -1) (= h -1))
-                        (GetWindowRect hwnd))]
-                [w (if (= w -1) (->normal (- (RECT-right r) (RECT-left r))) w)]
-                [h (if (= h -1) (->normal (- (RECT-bottom r) (RECT-top r))) h)])
-           (MoveWindow canvas-hwnd 0 0 (->screen (max 1 (- w COMBO-WIDTH))) (->screen h) #t)
-           (MoveWindow combo-hwnd 0 0 (->screen (max 1 w)) (->screen (- h 2)) #t)))
-       (when (and (is-auto-scroll?)
-                  (not (is-panel?)))
-         (reset-auto-scroll))
-       (on-size))
-
-     ;; this `on-size' method is for `editor-canvas%', only:
-     (define/public (on-size) (void))
-
-     ;; The `queue-paint' and `paint-children' methods
-     ;; are defined by `canvas-mixin' from ../common/canvas-mixin
-     (define/public (queue-paint) (void))
-     (define/public (request-canvas-flush-delay)
-       (request-flush-delay this))
-     (define/public (cancel-canvas-flush-delay req)
-       (cancel-flush-delay req))
-     (define/public (queue-canvas-refresh-event thunk)
-       (queue-window-refresh-event this thunk))
-     (define/public (skip-pre-paint?) #f)
-
-     (define/public (get-flush-window) canvas-hwnd)
-
-     (define/public (begin-refresh-sequence)
-       (send dc suspend-flush))
-     (define/public (end-refresh-sequence)
-       (send dc resume-flush))
-
-     ;; Improve this method to flush locally
-     ;; instead of globally:
-     (define/public (flush)
-       (flush-display))
-
-     (define/public (on-paint) (void))
-     (define/override (refresh-one) (queue-paint))
-
-     (define/public (queue-backing-flush)
-       (unless for-gl?
-         (InvalidateRect canvas-hwnd #f #f)
-         (schedule-periodic-backing-flush)))
-
-     ;; overridden to extend for scheduled periodic flushes:
-     (define/public (schedule-periodic-backing-flush)
-       (void))
-     (define/public (do-canvas-backing-flush hdc)
-       (if hdc
-           (do-backing-flush this dc hdc)
-           (if (positive? paint-suspended)
-               ;; suspended => try again later
-               (schedule-periodic-backing-flush)
-               ;; not suspended
-               (let ([hdc (GetDC canvas-hwnd)])
-                 (do-backing-flush this dc hdc)
-                 (ReleaseDC canvas-hwnd hdc)
-                 ;; We'd like to validate the region that
-                 ;; we just updated, so we can potentially
-                 ;; avoid a redundant refresh. For some reason,
-                 ;; vadilation can cancel an update that hasn't
-                 ;; happened, yet; this problem needs further
-                 ;; invesitigation.
-                 #;
-                 (ValidateRect canvas-hwnd #f)))))
-
-     (define/public (make-compatible-bitmap w h)
-       (send dc make-backing-bitmap w h))
-
-     (define paint-suspended 0)
-     (define suspended-refresh? #f)
-     (define/public (suspend-paint-handling)
-       (atomically
-        (set! paint-suspended (add1 paint-suspended))))
-     (define/public (resume-paint-handling)
-       (atomically
-        (unless (zero? paint-suspended)
-          (set! paint-suspended (sub1 paint-suspended))
-          (when (and (zero? paint-suspended)
-                     suspended-refresh?)
-            (set! suspended-refresh? #f)
-            (InvalidateRect canvas-hwnd #f #f)))))
-
-     (define no-autoclear? (memq 'no-autoclear style))
-     (define transparent? (memq 'transparent style))
-     (define bg-col (make-object color% "white"))
-     (define bg-colorref #xFFFFFF)
-     (define/public (get-canvas-background) (if transparent?
-                                                #f
-                                                bg-col))
-     (define/public (get-canvas-background-for-backing) (and (not transparent?)
-                                                             (not no-autoclear?)
-                                                             bg-col))
-     (define/public (set-canvas-background col)
-       (atomically
-        (set! bg-col col)
-        (set! bg-colorref (make-COLORREF (send col red)
-                                         (send col green)
-                                         (send col blue)))))
-
-     (define wants-focus? (and (not (is-panel?))
-                               (not (memq 'no-focus style))))
-     (define/override (can-accept-focus?)
-       wants-focus?)
-
-     (define/public (is-panel?) #f)
-
-     (define h-scroll-visible? hscroll?)
-     (define v-scroll-visible? vscroll?)
-     (define/public (show-scrollbars h? v?)
-       (when hscroll?
-         (atomically
-          (set! h-scroll-visible? (and h? #t))
-          (ShowScrollBar canvas-hwnd SB_HORZ h?)))
-       (when vscroll?
-         (atomically
-          (set! v-scroll-visible? (and v? #t))
-          (ShowScrollBar canvas-hwnd SB_VERT v?)))
-       (reset-dc))
-
-     (define/override (do-set-scrollbars h-step v-step
-                                         h-len v-len
-                                         h-page v-page
-                                         h-pos v-pos)
-       (define (make-info len page pos vis?)
-         (make-SCROLLINFO (ctype-sizeof _SCROLLINFO)
-                          (bitwise-ior (if vis? SIF_DISABLENOSCROLL 0)
-                                       SIF_RANGE
-                                       SIF_POS
-                                       SIF_PAGE)
-                          0 (+ len page -1) page pos 0))
-       (when hscroll?
-         (SetScrollInfo canvas-hwnd SB_HORZ (make-info h-len h-page h-pos h-scroll-visible?) #t))
-       (when vscroll?
-         (SetScrollInfo canvas-hwnd SB_VERT (make-info v-len v-page v-pos v-scroll-visible?) #t))
-       (void))
-
-    (define/override (reset-dc-for-autoscroll)
-      (reset-dc)
-      (refresh-one))
-
-    (define/override (get-virtual-h-pos)
-      (GetScrollPos canvas-hwnd SB_HORZ))
-    (define/override (get-virtual-v-pos)
-      (GetScrollPos canvas-hwnd SB_VERT))
-
-    (define/private (is-disabled-scroll-dir? which)
-      (or (if (eq? which 'vertical)
-              (not vscroll?)
-              (not hscroll?))
-          (is-disabled-scroll?)))
-
-     (define/public (get-scroll-pos which)
-       (if (or (is-disabled-scroll-dir? which) (is-auto-scroll?))
-           0
-           (GetScrollPos canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ))))
-     (define/public (get-scroll-range which)
-       (if (or (is-disabled-scroll-dir? which) (is-auto-scroll?))
-           0
-           (get-real-scroll-range which)))
-     (define/public (get-real-scroll-range which)
-       (let ([i (GetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ))])
-         (+ (- (SCROLLINFO-nMax i)
-               (SCROLLINFO-nPage i))
-            1)))
-     (define/public (get-scroll-page which)
-       (if (or (is-disabled-scroll-dir? which) (is-auto-scroll?))
-           0
-           (let ([i (GetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ))])
-             (SCROLLINFO-nPage i))))
-
-     (define/public (set-scroll-pos which v)
-       (void (SetScrollPos canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ) v #t)))
-     (define/public (set-scroll-range which v)
-       (let ([i (GetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ))])
-         (set-SCROLLINFO-fMask! i (bitwise-ior SIF_RANGE 
-                                               (if (if (eq? which 'vertical)
-                                                       v-scroll-visible?
-                                                       h-scroll-visible?)
-                                                   SIF_DISABLENOSCROLL
-                                                   0)))
-         (set-SCROLLINFO-nMax! i (+ v (SCROLLINFO-nPage i) -1))
-         (SetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ) i #t)
-         (void)))
-     (define/public (set-scroll-page which v)
-       (let ([i (GetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ))])
-         (set-SCROLLINFO-fMask! i (bitwise-ior SIF_RANGE SIF_PAGE
-                                               (if (if (eq? which 'vertical)
-                                                       v-scroll-visible?
-                                                       h-scroll-visible?)
-                                                   SIF_DISABLENOSCROLL
-                                                   0)))
-         (set-SCROLLINFO-nMax! i (+ (- (SCROLLINFO-nMax i) (SCROLLINFO-nPage i))
-                                    v))
-         (set-SCROLLINFO-nPage! i v)
-         (SetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ) i #t)
-         (void)))
-
-     (define/public (on-scroll e) (void))
-     (define/private (on-scroll-change dir part)
-       (let ([i (GetScrollInfo canvas-hwnd dir)])
-         (let ([new-pos
-                (cond
-                 [(= part SB_TOP) 0]
-                 [(= part SB_BOTTOM) (SCROLLINFO-nMax i)]
-                 [(= part SB_LINEUP) (max 0 (sub1 (SCROLLINFO-nPos i)))]
-                 [(= part SB_LINEDOWN) (min (SCROLLINFO-nMax i) (add1 (SCROLLINFO-nPos i)))]
-                 [(= part SB_PAGEUP) (max 0 (- (SCROLLINFO-nPos i) (SCROLLINFO-nPage i)))]
-                 [(= part SB_PAGEDOWN) (min (SCROLLINFO-nMax i) (+ (SCROLLINFO-nPos i) (SCROLLINFO-nPage i)))]
-                 [(= part SB_THUMBTRACK) (SCROLLINFO-nTrackPos i)]
-                 [else (SCROLLINFO-nPos i)])])
-           (unless (or (= new-pos (SCROLLINFO-nPos i))
-		       next-scroll-is-change?)
-	     (set! next-scroll-is-change? #f)
-             (set-SCROLLINFO-nPos! i new-pos)
-             (set-SCROLLINFO-fMask! i SIF_POS)
-             (SetScrollInfo canvas-hwnd dir i #t)
-             (if (is-auto-scroll?)
-                 (refresh-for-autoscroll)
-                 (queue-window-event
-                  this
-                  (lambda ()
-                    (on-scroll (new scroll-event%
-                                    [event-type 'thumb]
-                                    [direction (if (= dir SB_HORZ) 'horizontal 'vertical)]
-                                    [position new-pos])))))
-             (constrained-reply (get-eventspace)
-                                (lambda ()
-                                  (let loop () (pre-event-sync #t) (when (yield) (loop))))
-                                (void))))))
-
-     (define/override (wants-mouse-capture? control-hwnd)
-       (ptr-equal? canvas-hwnd control-hwnd))
-
-     (define/override (definitely-wants-event? w msg wParam e) 
-       (cond
-        [(is-panel?) #f]
-        [(e . is-a? . key-event%)
-         ;; All key events to canvas, event for combo:
-         #t]
-        [(and (or (= wParam HTVSCROLL)
-                  (= wParam HTHSCROLL))
-              (or (= msg WM_NCLBUTTONDOWN)
-                  (= msg WM_NCRBUTTONDOWN)
-                  (= msg WM_NCMBUTTONDOWN)
-                  (= msg WM_NCLBUTTONDBLCLK)
-                  (= msg WM_NCRBUTTONDBLCLK)
-                  (= msg WM_NCMBUTTONDBLCLK)
-                  (= msg WM_NCLBUTTONUP)
-                  (= msg WM_NCRBUTTONUP)
-                  (= msg WM_NCMBUTTONUP)))
-         ;; let scrollbar handle event:
-         #f]
-        [else
-         ;; otherwise, just handle events to canvas:
-         (ptr-equal? w canvas-hwnd)]))
-
-     (define/public (on-combo-select i) (void))
-     (define/public (set-combo-text s) (void))
-     (define/public (append-combo-item s)
-       (SendMessageW/str combo-hwnd CB_ADDSTRING 0 s))
-     (define/public (clear-combo-items)
-       (SendMessageW combo-hwnd CB_RESETCONTENT 0 0))
-
-     (define/public (on-popup) (void))
-
-     (define/override (is-command? cmd)
-       (or (= cmd CBN_SELENDOK)
-           (= cmd CBN_DROPDOWN)))
-
-     (define/override (do-command cmd control-hwnd)
-       (cond
-        [(= cmd CBN_SELENDOK)
-         (let ([i (SendMessageW combo-hwnd CB_GETCURSEL 0 0)])
-           (queue-window-event this (lambda () (on-combo-select i))))]
-        [(= cmd CBN_DROPDOWN)
-         (constrained-reply (get-eventspace) (lambda () (on-popup)) (void))]))
-
-     (define/public (popup-combo)
-       (SendMessageW combo-hwnd CB_SHOWDROPDOWN 1 0))
-
-     (define/override (is-hwnd? a-hwnd)
-       (or (ptr-equal? panel-hwnd a-hwnd)
-           (ptr-equal? canvas-hwnd a-hwnd)
-           (ptr-equal? combo-hwnd a-hwnd)))
-
-     (define/public (scroll x y)
-       (when (is-auto-scroll?) 
-         (when (x . >= . 0)
-           (set-scroll-pos 'horizontal 
-                           (->long (* x (get-real-scroll-range 'horizontal)))))
-         (when (y . >= . 0)
-           (set-scroll-pos 'vertical 
-                           (->long (* y (get-real-scroll-range 'vertical)))))
-         (refresh-for-autoscroll)))
-
-     (define/public (set-resize-corner on?)
-       (void))
-
-     (define reg-blits null)
-     
-     (define/private (register-one-blit x y w h on-hbitmap off-hbitmap)
-       (atomically
-        (let ([hdc (create-gc-dc canvas-hwnd)])
-          (let ([r (scheme_add_gc_callback
-                    (make-gc-show-desc hdc on-hbitmap x y w h)
-                    (make-gc-hide-desc hdc off-hbitmap x y w h))])
-            (cons hdc r)))))
-     
-     (define/public (register-collecting-blit x y w h on off on-x on-y off-x off-y)
-       (let ([on (fix-bitmap-size on w h on-x on-y)]
-             [off (fix-bitmap-size off w h off-x off-y)])
-         (let ([on-hbitmap (bitmap->hbitmap on)]
-               [off-hbitmap (bitmap->hbitmap off)])
-           (atomically
-            (set! reg-blits (cons (register-one-blit x y w h on-hbitmap off-hbitmap) reg-blits))))))
-     
-     (define/public (unregister-collecting-blits)
-       (atomically
-        (for ([r (in-list reg-blits)])
-          (ReleaseDC canvas-hwnd (car r))
-          (scheme_remove_gc_callback (cdr r)))
-        (set! reg-blits null))))))
-
-
-;; ----------------------------------------
-
-(define canvas-panel%
-  (class (panel-mixin canvas%)
-    (inherit get-content-hwnd
-             get-client-hwnd
-             get-virtual-h-pos
-             get-virtual-v-pos)
-
-    (define/override (is-panel?) #t)
-
-    (define/override (notify-child-extent x y)
-      (let* ([content-hwnd (get-content-hwnd)]
-             [r (GetWindowRect content-hwnd)]
-             [w (->normal (- (RECT-right r) (RECT-left r)))]
-             [h (->normal (- (RECT-bottom r) (RECT-top r)))])
-        (when (or (> x w) (> y h))
-          (let ([pr (GetWindowRect (get-client-hwnd))])
-            (MoveWindow content-hwnd 
-                        (- (RECT-left r) (RECT-left pr))
-                        (- (RECT-top r) (RECT-top pr))
-                        (->screen (max w x)) (->screen (max y h))
-                        #t)))))
-
-    (define/override (reset-dc-for-autoscroll)
-      (super reset-dc-for-autoscroll)
-      (let* ([content-hwnd (get-content-hwnd)]
-             [r (GetWindowRect content-hwnd)]
-             [w (- (RECT-right r) (RECT-left r))]
-             [h (- (RECT-bottom r) (RECT-top r))])
-        (MoveWindow content-hwnd 
-                    (->screen (- (get-virtual-h-pos)))
-                    (->screen (- (get-virtual-v-pos)))
-                    w h
-                    #t)))
-
-    (super-new)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/check-box.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/check-box.rkt
deleted file mode 100644
index e4548b7db1..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/check-box.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-(require racket/class
-         "../../syntax.rkt"
-         "button.rkt"
-         "item.rkt"
-         "utils.rkt"
-         "const.rkt")
-
-(provide 
- (protect-out check-box%))
-
-(define BM_GETCHECK #x00F0)
-(define BM_SETCHECK #x00F1)
-
-(defclass check-box% base-button%
-  (inherit auto-size
-           get-hwnd)
-
-  (super-new)
-
-  (define/override (get-flags) (bitwise-ior BS_AUTOCHECKBOX))
-
-  (define/override (get-button-background)
-    (GetSysColor COLOR_BTNFACE))
-
-  (define/override (auto-size-button font label)
-    (auto-size font label 0 0 20 0))
-
-  (define/override (size->screen v) (->screen v))
-
-  (define/public (set-value v)
-    (void (SendMessageW (get-hwnd) BM_SETCHECK (if v 1 0) 0)))
-
-  (define/public (get-value)
-    (positive? (bitwise-and #x3 (SendMessageW (get-hwnd) BM_GETCHECK 0 0)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/choice.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/choice.rkt
deleted file mode 100644
index 568d3eeaba..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/choice.rkt
+++ /dev/null
@@ -1,115 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         ffi/unsafe
-          "../../syntax.rkt"
-          "../../lock.rkt"
-          "../common/event.rkt"
-         "item.rkt"
-	 "utils.rkt"
-	 "const.rkt"
-	 "window.rkt"
-	 "wndclass.rkt"
-         "types.rkt")
-
-(provide 
- (protect-out choice%))
-
-(define choice% 
-  (class item%
-    (init parent cb label
-          x y w h
-          choices style font)
-    (inherit auto-size set-control-font
-             set-size)
-
-    (define callback cb)
-    
-    (define hwnd
-      (CreateWindowExW/control 0
-                               "PLTCOMBOBOX"
-                               label
-                               (bitwise-ior WS_CHILD CBS_DROPDOWNLIST 
-                                            WS_HSCROLL WS_VSCROLL
-                                            WS_BORDER WS_CLIPSIBLINGS)
-                               0 0 0 0
-                               (send parent get-content-hwnd)
-                               #f
-                               hInstance
-                               #f))
-
-    (define num-choices (length choices))
-
-    (for ([s (in-list choices)]
-          [i (in-naturals)])
-      (SendMessageW/str hwnd CB_INSERTSTRING i s))
-
-    (SendMessageW hwnd CB_SETCURSEL 0 0)
-
-    (define choice-dropped? #f)
-
-    (super-new [callback cb]
-               [parent parent]
-               [hwnd hwnd]
-               [style style])
-
-    (set-control-font font)
-    ;; setting the choice height somehow sets the 
-    ;; popup-menu size, not the control that you see
-    (auto-size font
-               (if (null? choices) (list "Choice") choices)
-               0 0 40 0
-               (lambda (w h)
-                 (set-size #f #f w (* h 8))))
-
-    (define/override (size->screen v) (->screen* v))
-
-    (define/override (ctlproc w msg wParam lParam default)
-      (cond
-       [(and choice-dropped?
-             (or (= msg WM_KEYDOWN)
-                 (= msg WM_KEYUP)
-                 (= msg WM_SYSCHAR)
-                 (= msg WM_CHAR)))
-        (default w msg wParam lParam)]
-       [else (super ctlproc w msg wParam lParam default)]))
-
-    (define/override (is-command? cmd)
-      (when (= cmd CBN_DROPDOWN)
-        (set! choice-dropped? #t))
-      (when (= cmd CBN_CLOSEUP)
-        (queue-window-event this (lambda ()
-                                   (set! choice-dropped? #f))))
-      (= cmd CBN_SELENDOK))
-
-    (define/override (do-command cmd control-hwnd)
-      (queue-window-event this (lambda ()
-                                 (callback this
-                                           (new control-event%
-                                                [event-type 'choice]
-                                                [time-stamp (current-milliseconds)])))))
-
-    
-    (define/public (set-selection i)
-      (void (SendMessageW hwnd CB_SETCURSEL i 0)))
-
-    (define/public (get-selection)
-      (SendMessageW hwnd CB_GETCURSEL 0 0))
-
-    (define/public (number) num-choices)
-
-    (define/public (clear)
-      (atomically
-       (SendMessageW hwnd CB_RESETCONTENT 0 0)
-       (set! num-choices 0)))
-
-    (public [append* append])
-    (define (append* str)
-      (atomically
-       (SendMessageW/str hwnd CB_ADDSTRING 0 str)
-       (set! num-choices (add1 num-choices))
-       (when (= 1 num-choices) (set-selection 0))))
-
-    (define/public (delete i)
-      (set! num-choices (sub1 num-choices))
-      (void (SendMessageW hwnd CB_DELETESTRING i 0)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/clipboard.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/clipboard.rkt
deleted file mode 100644
index 70d6771bf9..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/clipboard.rkt
+++ /dev/null
@@ -1,279 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/alloc
-         racket/draw/unsafe/bstr
-         "../common/queue.rkt"
-         "../../lock.rkt"
-         "types.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "../../syntax.rkt"
-         "wndclass.rkt"
-         "hbitmap.rkt"
-         "../common/local.rkt")
-
-(provide 
- (protect-out clipboard-driver%
-              has-x-selection?))
-
-(define (has-x-selection?) #f)
-
-;; Dummy window to own the clipboard:
-(define clipboard-owner-hwnd 
-  (CreateWindowExW 0 "PLTFrame" ""
-                   WS_POPUP
-                   0 0 10 10
-                   #f
-                   #f
-                   hInstance
-                   #f))
-
-(define CF_UNICODETEXT      13)
-(define CF_BITMAP           2)
-(define CF_DIB              8)
-
-(define DIB_RGB_COLORS      0)
-(define SRCCOPY             #x00CC0020)
-(define BI_BITFIELDS        3)
-
-(define-cstruct _BITMAPINFOHEADER
-  ([biSize _DWORD]
-   [biWidth _LONG]
-   [biHeight _LONG]
-   [biPlanes _WORD]
-   [biBitCount _WORD]
-   [biCompression _DWORD]
-   [biSizeImage _DWORD]
-   [biXPelsPerMeter _LONG]
-   [biYPelsPerMeter _LONG]
-   [biClrUsed _DWORD]
-   [biClrImportant _DWORD]))
-
-(define-cstruct _BITMAPCOREHEADER
-  ([bcSize _DWORD]
-   [bcWidth _LONG]
-   [bcHeight _LONG]
-   [bcPlanes _WORD]
-   [bcBitCount _WORD]))
-
-(define-user32 GetClipboardOwner (_wfun -> _HWND))
-(define-user32 OpenClipboard (_wfun _HWND -> _BOOL))
-(define-user32 CloseClipboard (_wfun -> _BOOL))
-(define-user32 EmptyClipboard (_wfun -> (r : _BOOL) -> (unless r (failed 'EmptyClipboard))))
-
-(define-user32 RegisterClipboardFormatW (_wfun _string/utf-16 -> (r : _UINT)
-                                               -> (if (zero? r)
-                                                      (failed 'RegisterClipboardFormatW)
-                                                      r)))
-
-(define-kernel32 GlobalFree (_wfun _HANDLE -> (r : _HANDLE)
-                                   -> (unless r (failed 'GlobalFree)))
-  #:wrap (deallocator))
-(define-kernel32 GlobalAlloc (_wfun _UINT _SIZE_T -> (r : _HANDLE)
-                                    -> (or r (failed 'GlobalAlloc)))
-  #:wrap (allocator GlobalFree))
-
-(define-kernel32 GlobalLock (_wfun _HANDLE -> (r : _pointer)
-                                   -> (or r (failed 'GlobalLock))))
-(define-kernel32 GlobalUnlock (_wfun _HANDLE -> _BOOL))
-(define-kernel32 GlobalSize (_wfun _HANDLE -> (r : _SIZE_T)
-                                   -> (if (zero? r)
-                                          (failed 'GlobalSize)
-                                          r)))
-
-(define-user32 SetClipboardData (_wfun _UINT _HANDLE -> (r : _HANDLE)
-                                       -> (unless r (failed 'SetClipboardData)))
-  ;; SetClipboardData accepts responsibility for the handle:
-  #:wrap (deallocator cadr))
-
-(define-user32 GetClipboardData (_wfun _UINT -> _HANDLE))
-
-(define-gdi32 StretchDIBits(_wfun _HDC _int _int _int _int _int _int _int _int
-                                  _pointer _BITMAPINFOHEADER-pointer _UINT _DWORD
-                                  -> _int))
-
-(define GHND #x0042)
-
-(defclass clipboard-driver% object%
-  (init x-selection?) ; always #f
-
-  (define client #f)
-  (define counter -1)
-
-  (define/public (clear-client)
-    ;; called in event-pump thread
-    (set! client #f))
-
-  (define/public (get-client) 
-    (and client
-         (if (ptr-equal? clipboard-owner-hwnd
-                         (GetClipboardOwner))
-             client
-             (let ([c client])
-               (set! client #f)
-               (drop-client c)
-               #f))))
-
-  (define/private (drop-client c)
-    (queue-event (send c get-client-eventspace)
-                 (lambda ()
-                   (send c on-replaced))))
-
-  (define/public (set-client c types)
-    (let* ([type-ids (for/list ([t (in-list types)])
-                       (if (string=? t "TEXT")
-                           CF_UNICODETEXT
-                           (RegisterClipboardFormatW t)))]
-           [all-data (for/list ([t (in-list types)]
-                                [t-id (in-list type-ids)])
-                       (let ([d (let ([d (send c get-data t)])
-                                  (if (string? d)
-                                      (string->bytes/utf-8 d)
-                                      d))])
-                         (cond
-                          [(equal? t-id CF_UNICODETEXT)
-                           ;; convert UTF-8 to UTF-16:
-                           (let ([p (cast (bytes->string/utf-8 d #\?)
-                                          _string/utf-16 
-                                          _gcpointer)])
-                             (let ([len (let loop ([i 0])
-                                          (if (and (zero? (ptr-ref p _byte i))
-                                                   (zero? (ptr-ref p _byte (add1 i))))
-                                              (+ i 2)
-                                              (loop (+ i 2))))])
-                               (scheme_make_sized_byte_string p
-                                                              len
-                                                              0)))]
-                          [else
-                           ;; no conversion:
-                           d])))]
-           [all-handles (for/list ([d (in-list all-data)])
-			  (and d
-			       (let ([h (GlobalAlloc GHND (bytes-length d))])
-				 (let ([p (GlobalLock h)])
-				   (memcpy p d (bytes-length d)))
-				 (GlobalUnlock h)
-				 h)))])
-      (if (null? types)
-          (drop-client c)
-          (atomically
-           (if (OpenClipboard clipboard-owner-hwnd)
-               (begin
-                 (EmptyClipboard)
-                 (for ([t (in-list type-ids)]
-                       [h (in-list all-handles)])
-		   (when h
-		     (SetClipboardData t h)))
-                 (if (CloseClipboard)
-                     (set! client c)
-                     (drop-client c)))
-               (drop-client c))))))
-
-  (define/public (get-data format [as-text? #f])
-    (let ([t (if (string=? format "TEXT")
-                 CF_UNICODETEXT
-                 (RegisterClipboardFormatW format))])
-      (atomically
-       (and (OpenClipboard clipboard-owner-hwnd)
-            (let ([d (GetClipboardData t)])
-              (begin0
-               (and d
-                    (let ([hsize (GlobalSize d)]
-                          [p (GlobalLock d)])
-                      (begin0
-                       (if as-text?
-                           (cast p _pointer _string/utf-16)
-                           (scheme_make_sized_byte_string p hsize 1))
-                       (GlobalUnlock d))))
-               (CloseClipboard)))))))
-
-  (define/public (get-text-data)
-    (or (get-data "TEXT" #t) ""))
-
-  (define/public (get-bitmap-data)
-    (atomically
-     (and (OpenClipboard clipboard-owner-hwnd)
-          (begin0
-           (get-bitmap-from-clipboard)
-           (CloseClipboard)))))
-
-  (define/public (set-bitmap-data bm timestamp)
-    (define h (bitmap->hbitmap bm))
-    (set-cpointer-tag! h '(HBITMAP HANDLE))
-    (atomically
-     (when (OpenClipboard clipboard-owner-hwnd)
-       (EmptyClipboard)
-       (SetClipboardData CF_BITMAP h)
-       (CloseClipboard)
-       (void))))
-
-  (super-new))
-
-
-(define (get-bitmap-from-clipboard)
-  ;; atomic mode
-  (cond
-   ;; I think we should be able to use CF_BITMAP always, but
-   ;; it doesn't work right under Windows XP with a particular 
-   ;; image created by copying in Firefox. So, we do things the
-   ;; hard way.
-   [(GetClipboardData CF_DIB)
-    => (lambda (bits)
-         (let ([bmi (cast (GlobalLock bits) _pointer _BITMAPINFOHEADER-pointer)])
-           (let ([w (BITMAPINFOHEADER-biWidth bmi)]
-                 [h (BITMAPINFOHEADER-biHeight bmi)]
-                 [bits/pp (BITMAPINFOHEADER-biBitCount bmi)])
-             (let* ([screen-hdc (GetDC #f)]
-                    [hdc (CreateCompatibleDC screen-hdc)]
-                    [hbitmap (if (= bits/pp 1)
-                                 (CreateBitmap w h 1 1 #f)
-                                 (CreateCompatibleBitmap screen-hdc w h))]
-                    [old-hbitmap (SelectObject hdc hbitmap)]
-                    [psize (PaletteSize bmi)])
-               (ReleaseDC #f screen-hdc)
-               (StretchDIBits hdc 0 0 w h
-                              0 0 w h
-                              (ptr-add bmi (+ (BITMAPINFOHEADER-biSize bmi) psize
-					      (if (= (BITMAPINFOHEADER-biCompression bmi) BI_BITFIELDS)
-						  12
-						  0)))
-                              bmi DIB_RGB_COLORS SRCCOPY)
-               (SelectObject hdc old-hbitmap)
-               (GlobalUnlock bits)
-               (DeleteDC hdc)
-               (begin0
-                (hbitmap->bitmap hbitmap)
-                (DeleteObject hbitmap))))))]
-   [(GetClipboardData CF_BITMAP)
-    => (lambda (hbitmap)
-         (hbitmap->bitmap hbitmap))]
-   [else #f]))
-
-;; Copied from MS example:
-
-(define (DibNumColors bmc? bmi)
-  ;; /*  With the BITMAPINFO format headers, the size of the palette
-  ;;  *  is in biClrUsed, whereas in the BITMAPCORE - style headers, it
-  ;;  *  is dependent on the bits per pixel ( = 2 raised to the power of
-  ;;  *  bits/pixel).
-  ;;  */
-  (if (and (not bmc?)
-           (not (zero? (BITMAPINFOHEADER-biClrUsed bmi))))
-      (BITMAPINFOHEADER-biClrUsed bmi)
-      (let ([bits (BITMAPINFOHEADER-biBitCount bmi)])
-        (case bits
-          [(1) 2]
-          [(4) 16]
-          [(8) 256]
-          [else
-           ;; A 24 bitcount DIB has no color table
-           0]))))
-
-(define (PaletteSize bmi)
-  (let* ([bmc? (= (BITMAPINFOHEADER-biSize bmi)
-                  (ctype-sizeof _BITMAPCOREHEADER))]
-         [num-colors (DibNumColors bmc? bmi)])
-    (if bmc?
-        (* num-colors 3)
-        (* num-colors 4))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/colordialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/colordialog.rkt
deleted file mode 100644
index 8a99959ce3..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/colordialog.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         racket/string
-         racket/draw/private/color
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "wndclass.rkt"
-	 "../../lock.rkt")
-
-(provide 
- (protect-out get-color-from-user))
-
-(define-cstruct _CHOOSECOLOR
-  ([lStructSize _DWORD]
-   [hwndOwner _HWND]
-   [hInstance _HWND]
-   [rgbResult _COLORREF]
-   [lpCustColors _pointer]
-   [Flags _DWORD]
-   [lCustData _LPARAM]
-   [lpfnHook _fpointer]
-   [lpTemplateName _fpointer]))
-
-(define CC_RGBINIT #x00000001)
-
-(define-comdlg32 ChooseColorW (_wfun _CHOOSECOLOR-pointer -> _BOOL))
-
-(define custom-colors (malloc 'raw 16 _COLORREF))
-(memset custom-colors 255 16 _COLORREF)
-
-(define (get-color-from-user message parent color)
-  (atomically
-   (let ([p (malloc 'raw _CHOOSECOLOR)])
-     (memset p 0 1 _CHOOSECOLOR)
-     (set-cpointer-tag! p CHOOSECOLOR-tag)
-     (set-CHOOSECOLOR-lStructSize! p (ctype-sizeof _CHOOSECOLOR))
-     (when parent
-       (set-CHOOSECOLOR-hwndOwner! p (send parent get-hwnd)))
-     (when color
-       (set-CHOOSECOLOR-rgbResult! p (make-COLORREF
-                                      (color-red color)
-                                      (color-green color)
-                                      (color-blue color)))
-       (set-CHOOSECOLOR-Flags! p CC_RGBINIT))
-     (set-CHOOSECOLOR-lpCustColors! p custom-colors)
-     (begin0
-      (and (ChooseColorW p)
-           (let ([c (CHOOSECOLOR-rgbResult p)])
-             (make-object color% (GetRValue c) (GetGValue c) (GetBValue c))))
-      (free p)))))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/const.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/const.rkt
deleted file mode 100644
index db8a20c746..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/const.rkt
+++ /dev/null
@@ -1,630 +0,0 @@
-#lang racket/base
-(provide (all-defined-out))
-
-(define WM_NULL                         #x0000)
-(define WM_CREATE                       #x0001)
-(define WM_DESTROY                      #x0002)
-(define WM_MOVE                         #x0003)
-(define WM_SIZE                         #x0005)
-
-(define WM_ACTIVATE                     #x0006)
-
-
-;; WM_ACTIVATE state values
-(define     WA_INACTIVE     0)
-(define     WA_ACTIVE       1)
-(define     WA_CLICKACTIVE  2)
-
-(define WM_SETFOCUS                     #x0007)
-(define WM_KILLFOCUS                    #x0008)
-(define WM_ENABLE                       #x000A)
-(define WM_SETREDRAW                    #x000B)
-(define WM_SETTEXT                      #x000C)
-(define WM_GETTEXT                      #x000D)
-(define WM_GETTEXTLENGTH                #x000E)
-(define WM_PAINT                        #x000F)
-(define WM_CLOSE                        #x0010)
-(define WM_QUIT                         #x0012)
-(define WM_ERASEBKGND                   #x0014)
-(define WM_SYSCOLORCHANGE               #x0015)
-(define WM_SHOWWINDOW                   #x0018)
-(define WM_WININICHANGE                 #x001A)
-(define WM_SETTINGCHANGE                WM_WININICHANGE)
-
-(define WM_DEVMODECHANGE                #x001B)
-(define WM_ACTIVATEAPP                  #x001C)
-(define WM_FONTCHANGE                   #x001D)
-(define WM_TIMECHANGE                   #x001E)
-(define WM_CANCELMODE                   #x001F)
-(define WM_SETCURSOR                    #x0020)
-(define WM_MOUSEACTIVATE                #x0021)
-(define WM_CHILDACTIVATE                #x0022)
-(define WM_QUEUESYNC                    #x0023)
-
-(define WM_GETMINMAXINFO                #x0024)
-
-(define WM_PAINTICON                    #x0026)
-(define WM_ICONERASEBKGND               #x0027)
-(define WM_NEXTDLGCTL                   #x0028)
-(define WM_SPOOLERSTATUS                #x002A)
-(define WM_DRAWITEM                     #x002B)
-(define WM_MEASUREITEM                  #x002C)
-(define WM_DELETEITEM                   #x002D)
-(define WM_VKEYTOITEM                   #x002E)
-(define WM_CHARTOITEM                   #x002F)
-(define WM_SETFONT                      #x0030)
-(define WM_GETFONT                      #x0031)
-(define WM_SETHOTKEY                    #x0032)
-(define WM_GETHOTKEY                    #x0033)
-(define WM_QUERYDRAGICON                #x0037)
-(define WM_COMPAREITEM                  #x0039)
-(define WM_GETOBJECT                    #x003D)
-(define WM_COMPACTING                   #x0041)
-(define WM_WINDOWPOSCHANGING            #x0046)
-(define WM_WINDOWPOSCHANGED             #x0047)
-
-(define WM_POWER                        #x0048)
-
-(define WM_GESTURE                      #x0119)
-
-;; wParam for WM_POWER window message and DRV_POWER driver notification
-(define PWR_OK              1)
-(define PWR_FAIL            -1)
-(define PWR_SUSPENDREQUEST  1)
-(define PWR_SUSPENDRESUME   2)
-(define PWR_CRITICALRESUME  3)
-
-(define WM_COPYDATA                     #x004A)
-(define WM_CANCELJOURNAL                #x004B)
-
-(define WM_NOTIFY                       #x004E)
-(define WM_INPUTLANGCHANGEREQUEST       #x0050)
-(define WM_INPUTLANGCHANGE              #x0051)
-(define WM_TCARD                        #x0052)
-(define WM_HELP                         #x0053)
-(define WM_USERCHANGED                  #x0054)
-(define WM_NOTIFYFORMAT                 #x0055)
-
-(define NFR_ANSI                             1)
-(define NFR_UNICODE                          2)
-(define NF_QUERY                             3)
-(define NF_REQUERY                           4)
-
-(define WM_CONTEXTMENU                  #x007B)
-(define WM_STYLECHANGING                #x007C)
-(define WM_STYLECHANGED                 #x007D)
-(define WM_DISPLAYCHANGE                #x007E)
-(define WM_GETICON                      #x007F)
-(define WM_SETICON                      #x0080)
-
-(define WM_NCCREATE                     #x0081)
-(define WM_NCDESTROY                    #x0082)
-(define WM_NCCALCSIZE                   #x0083)
-(define WM_NCHITTEST                    #x0084)
-(define WM_NCPAINT                      #x0085)
-(define WM_NCACTIVATE                   #x0086)
-(define WM_GETDLGCODE                   #x0087)
-(define WM_NCMOUSEMOVE                  #x00A0)
-(define WM_NCLBUTTONDOWN                #x00A1)
-(define WM_NCLBUTTONUP                  #x00A2)
-(define WM_NCLBUTTONDBLCLK              #x00A3)
-(define WM_NCRBUTTONDOWN                #x00A4)
-(define WM_NCRBUTTONUP                  #x00A5)
-(define WM_NCRBUTTONDBLCLK              #x00A6)
-(define WM_NCMBUTTONDOWN                #x00A7)
-(define WM_NCMBUTTONUP                  #x00A8)
-(define WM_NCMBUTTONDBLCLK              #x00A9)
-
-(define WM_NCXBUTTONDOWN                #x00AB)
-(define WM_NCXBUTTONUP                  #x00AC)
-(define WM_NCXBUTTONDBLCLK              #x00AD)
-
-(define WM_INPUT                        #x00FF)
-
-(define WM_KEYFIRST                     #x0100)
-(define WM_KEYDOWN                      #x0100)
-(define WM_KEYUP                        #x0101)
-(define WM_CHAR                         #x0102)
-(define WM_DEADCHAR                     #x0103)
-(define WM_SYSKEYDOWN                   #x0104)
-(define WM_SYSKEYUP                     #x0105)
-(define WM_SYSCHAR                      #x0106)
-(define WM_SYSDEADCHAR                  #x0107)
-(define WM_UNICHAR                      #x0109)
-(define WM_KEYLAST                      #x0109)
-(define UNICODE_NOCHAR                  #xFFFF)
-
-(define WM_IME_STARTCOMPOSITION         #x010D)
-(define WM_IME_ENDCOMPOSITION           #x010E)
-(define WM_IME_COMPOSITION              #x010F)
-(define WM_IME_KEYLAST                  #x010F)
-
-(define WM_INITDIALOG                   #x0110)
-(define WM_COMMAND                      #x0111)
-(define WM_SYSCOMMAND                   #x0112)
-(define WM_TIMER                        #x0113)
-(define WM_HSCROLL                      #x0114)
-(define WM_VSCROLL                      #x0115)
-(define WM_INITMENU                     #x0116)
-(define WM_INITMENUPOPUP                #x0117)
-(define WM_MENUSELECT                   #x011F)
-(define WM_MENUCHAR                     #x0120)
-(define WM_ENTERIDLE                    #x0121)
-(define WM_MENURBUTTONUP                #x0122)
-(define WM_MENUDRAG                     #x0123)
-(define WM_MENUGETOBJECT                #x0124)
-(define WM_UNINITMENUPOPUP              #x0125)
-(define WM_MENUCOMMAND                  #x0126)
-
-(define WM_CHANGEUISTATE                #x0127)
-(define WM_UPDATEUISTATE                #x0128)
-(define WM_QUERYUISTATE                 #x0129)
-
-;; LOWORD(wParam) values in WM_*UISTATE*
-(define UIS_SET                         1)
-(define UIS_CLEAR                       2)
-(define UIS_INITIALIZE                  3)
-
-;; HIWORD(wParam) values in WM_*UISTATE*
-(define UISF_HIDEFOCUS                  #x1)
-(define UISF_HIDEACCEL                  #x2)
-(define UISF_ACTIVE                     #x4)
-
-(define WM_CTLCOLORMSGBOX               #x0132)
-(define WM_CTLCOLOREDIT                 #x0133)
-(define WM_CTLCOLORLISTBOX              #x0134)
-(define WM_CTLCOLORBTN                  #x0135)
-(define WM_CTLCOLORDLG                  #x0136)
-(define WM_CTLCOLORSCROLLBAR            #x0137)
-(define WM_CTLCOLORSTATIC               #x0138)
-(define MN_GETHMENU                     #x01E1)
-
-(define WM_MOUSEFIRST                   #x0200)
-(define WM_MOUSEMOVE                    #x0200)
-(define WM_LBUTTONDOWN                  #x0201)
-(define WM_LBUTTONUP                    #x0202)
-(define WM_LBUTTONDBLCLK                #x0203)
-(define WM_RBUTTONDOWN                  #x0204)
-(define WM_RBUTTONUP                    #x0205)
-(define WM_RBUTTONDBLCLK                #x0206)
-(define WM_MBUTTONDOWN                  #x0207)
-(define WM_MBUTTONUP                    #x0208)
-(define WM_MBUTTONDBLCLK                #x0209)
-(define WM_MOUSEWHEEL                   #x020A)
-(define WM_XBUTTONDOWN                  #x020B)
-(define WM_XBUTTONUP                    #x020C)
-(define WM_XBUTTONDBLCLK                #x020D)
-(define WM_MOUSEHWHEEL                  #x020E)
-
-;; Value for rolling one detent
-(define WHEEL_DELTA                     120)
-;; (define WHEEL_PAGESCROLL                UINT_MAX)
-
-;; XButton values are WORD flags
-(define XBUTTON1      #x0001)
-(define XBUTTON2      #x0002)
-
-(define WM_PARENTNOTIFY                 #x0210)
-(define WM_ENTERMENULOOP                #x0211)
-(define WM_EXITMENULOOP                 #x0212)
-
-(define WM_NEXTMENU                     #x0213)
-(define WM_SIZING                       #x0214)
-(define WM_CAPTURECHANGED               #x0215)
-(define WM_MOVING                       #x0216)
-
-(define WM_DEVICECHANGE                 #x0219)
-
-(define WM_MDICREATE                    #x0220)
-(define WM_MDIDESTROY                   #x0221)
-(define WM_MDIACTIVATE                  #x0222)
-(define WM_MDIRESTORE                   #x0223)
-(define WM_MDINEXT                      #x0224)
-(define WM_MDIMAXIMIZE                  #x0225)
-(define WM_MDITILE                      #x0226)
-(define WM_MDICASCADE                   #x0227)
-(define WM_MDIICONARRANGE               #x0228)
-(define WM_MDIGETACTIVE                 #x0229)
-
-
-(define WM_MDISETMENU                   #x0230)
-(define WM_ENTERSIZEMOVE                #x0231)
-(define WM_EXITSIZEMOVE                 #x0232)
-(define WM_DROPFILES                    #x0233)
-(define WM_MDIREFRESHMENU               #x0234)
-
-
-(define WM_IME_SETCONTEXT               #x0281)
-(define WM_IME_NOTIFY                   #x0282)
-(define WM_IME_CONTROL                  #x0283)
-(define WM_IME_COMPOSITIONFULL          #x0284)
-(define WM_IME_SELECT                   #x0285)
-(define WM_IME_CHAR                     #x0286)
-(define WM_IME_REQUEST                  #x0288)
-(define WM_IME_KEYDOWN                  #x0290)
-(define WM_IME_KEYUP                    #x0291)
-
-(define WM_MOUSEHOVER                   #x02A1)
-(define WM_MOUSELEAVE                   #x02A3)
-(define WM_NCMOUSEHOVER                 #x02A0)
-(define WM_NCMOUSELEAVE                 #x02A2)
-
-(define WM_WTSSESSION_CHANGE            #x02B1)
-
-(define WM_TABLET_FIRST                 #x02c0)
-(define WM_TABLET_LAST                  #x02df)
-
-(define WM_CUT                          #x0300)
-(define WM_COPY                         #x0301)
-(define WM_PASTE                        #x0302)
-(define WM_CLEAR                        #x0303)
-(define WM_UNDO                         #x0304)
-(define WM_RENDERFORMAT                 #x0305)
-(define WM_RENDERALLFORMATS             #x0306)
-(define WM_DESTROYCLIPBOARD             #x0307)
-(define WM_DRAWCLIPBOARD                #x0308)
-(define WM_PAINTCLIPBOARD               #x0309)
-(define WM_VSCROLLCLIPBOARD             #x030A)
-(define WM_SIZECLIPBOARD                #x030B)
-(define WM_ASKCBFORMATNAME              #x030C)
-(define WM_CHANGECBCHAIN                #x030D)
-(define WM_HSCROLLCLIPBOARD             #x030E)
-(define WM_QUERYNEWPALETTE              #x030F)
-(define WM_PALETTEISCHANGING            #x0310)
-(define WM_PALETTECHANGED               #x0311)
-(define WM_HOTKEY                       #x0312)
-
-(define WM_USER                         #x0400)
-
-;; Class styles
-(define CS_VREDRAW          #x0001)
-(define CS_HREDRAW          #x0002)
-(define CS_DBLCLKS          #x0008)
-(define CS_OWNDC            #x0020)
-(define CS_CLASSDC          #x0040)
-(define CS_PARENTDC         #x0080)
-(define CS_NOCLOSE          #x0200)
-(define CS_SAVEBITS         #x0800)
-(define CS_BYTEALIGNCLIENT  #x1000)
-(define CS_BYTEALIGNWINDOW  #x2000)
-(define CS_GLOBALCLASS      #x4000)
-
-;; Window styles
-(define WS_OVERLAPPED   #x00000000)
-(define WS_POPUP        #x80000000)
-(define WS_CHILD        #x40000000)
-(define WS_CLIPSIBLINGS #x04000000)
-(define WS_CLIPCHILDREN #x02000000)
-(define WS_VISIBLE      #x10000000)
-(define WS_DISABLED     #x08000000)
-(define WS_MINIMIZE     #x20000000)
-(define WS_MAXIMIZE     #x01000000)
-(define WS_CAPTION      #x00C00000)
-(define WS_BORDER       #x00800000)
-(define WS_DLGFRAME     #x00400000)
-(define WS_VSCROLL      #x00200000)
-(define WS_HSCROLL      #x00100000)
-(define WS_SYSMENU      #x00080000)
-(define WS_THICKFRAME   #x00040000)
-(define WS_MINIMIZEBOX  #x00020000)
-(define WS_MAXIMIZEBOX  #x00010000)
-(define WS_GROUP        #x00020000)
-(define WS_TABSTOP      #x00010000)
-
-(define WS_OVERLAPPEDWINDOW (bitwise-ior WS_OVERLAPPED  WS_CAPTION  WS_SYSMENU 
-					 WS_THICKFRAME  WS_MINIMIZEBOX  WS_MAXIMIZEBOX))
-
-(define PM_NOREMOVE         #x0000)
-(define PM_REMOVE           #x0001)
-(define PM_NOYIELD          #x0002)
-
-(define QS_KEY              #x0001)
-(define QS_MOUSEMOVE        #x0002)
-(define QS_MOUSEBUTTON      #x0004)
-(define QS_POSTMESSAGE      #x0008)
-(define QS_TIMER            #x0010)
-(define QS_PAINT            #x0020)
-(define QS_SENDMESSAGE      #x0040)
-(define QS_HOTKEY           #x0080)
-(define QS_ALLPOSTMESSAGE   #x0100)
-(define QS_RAWINPUT         #x0400)
-(define QS_MOUSE           (bitwise-ior QS_MOUSEMOVE
-                                        QS_MOUSEBUTTON))
-
-(define QS_INPUT           (bitwise-ior QS_MOUSE
-                                        QS_KEY
-                                        QS_RAWINPUT))
-(define QS_ALLEVENTS       (bitwise-ior QS_INPUT
-                                        QS_POSTMESSAGE
-                                        QS_TIMER
-                                        QS_PAINT
-                                        QS_HOTKEY))
-
-(define QS_ALLINPUT        (bitwise-ior QS_INPUT
-                                        QS_POSTMESSAGE
-                                        QS_TIMER
-                                        QS_PAINT
-                                        QS_HOTKEY
-                                        QS_SENDMESSAGE))
-
-(define GWLP_WNDPROC        -4)
-(define GWLP_USERDATA       -21)
-
-
-(define COLOR_SCROLLBAR         0)
-(define COLOR_BACKGROUND        1)
-(define COLOR_ACTIVECAPTION     2)
-(define COLOR_INACTIVECAPTION   3)
-(define COLOR_MENU              4)
-(define COLOR_WINDOW            5)
-(define COLOR_WINDOWFRAME       6)
-(define COLOR_MENUTEXT          7)
-(define COLOR_WINDOWTEXT        8)
-(define COLOR_CAPTIONTEXT       9)
-(define COLOR_ACTIVEBORDER      10)
-(define COLOR_INACTIVEBORDER    11)
-(define COLOR_APPWORKSPACE      12)
-(define COLOR_HIGHLIGHT         13)
-(define COLOR_HIGHLIGHTTEXT     14)
-(define COLOR_BTNFACE           15)
-(define COLOR_BTNSHADOW         16)
-(define COLOR_GRAYTEXT          17)
-(define COLOR_BTNTEXT           18)
-(define COLOR_INACTIVECAPTIONTEXT 19)
-(define COLOR_BTNHIGHLIGHT      20)
-
-(define BS_PUSHBUTTON       #x00000000)
-(define BS_DEFPUSHBUTTON    #x00000001)
-(define BS_CHECKBOX         #x00000002)
-(define BS_AUTOCHECKBOX     #x00000003)
-(define BS_RADIOBUTTON      #x00000004)
-(define BS_3STATE           #x00000005)
-(define BS_AUTO3STATE       #x00000006)
-(define BS_GROUPBOX         #x00000007)
-(define BS_USERBUTTON       #x00000008)
-(define BS_AUTORADIOBUTTON  #x00000009)
-(define BS_PUSHBOX          #x0000000A)
-(define BS_OWNERDRAW        #x0000000B)
-(define BS_TYPEMASK         #x0000000F)
-(define BS_LEFTTEXT         #x00000020)
-(define BS_TEXT             #x00000000)
-(define BS_ICON             #x00000040)
-(define BS_BITMAP           #x00000080)
-(define BS_LEFT             #x00000100)
-(define BS_RIGHT            #x00000200)
-(define BS_CENTER           #x00000300)
-(define BS_TOP              #x00000400)
-(define BS_BOTTOM           #x00000800)
-(define BS_VCENTER          #x00000C00)
-(define BS_PUSHLIKE         #x00001000)
-(define BS_MULTILINE        #x00002000)
-(define BS_NOTIFY           #x00004000)
-(define BS_FLAT             #x00008000)
-(define BS_RIGHTBUTTON      BS_LEFTTEXT)
-
-(define CW_USEDEFAULT       (- #x80000000)) ; minus sign => int instead of uint
-
-(define WS_EX_LAYERED       #x00080000)
-(define WS_EX_TRANSPARENT   #x00000020)
-
-(define LWA_ALPHA #x00000002)
-
-(define MB_OK                       #x00000000)
-(define MB_OKCANCEL                 #x00000001)
-(define MB_ABORTRETRYIGNORE         #x00000002)
-(define MB_YESNOCANCEL              #x00000003)
-(define MB_YESNO                    #x00000004)
-(define MB_RETRYCANCEL              #x00000005)
-
-(define SIZE_RESTORED       0)
-(define SIZE_MINIMIZED      1)
-(define SIZE_MAXIMIZED      2)
-(define SIZE_MAXSHOW        3)
-(define SIZE_MAXHIDE        4)
-
-(define SB_LINEUP           0)
-(define SB_LINELEFT         0)
-(define SB_LINEDOWN         1)
-(define SB_LINERIGHT        1)
-(define SB_PAGEUP           2)
-(define SB_PAGELEFT         2)
-(define SB_PAGEDOWN         3)
-(define SB_PAGERIGHT        3)
-(define SB_THUMBPOSITION    4)
-(define SB_THUMBTRACK       5)
-(define SB_TOP              6)
-(define SB_LEFT             6)
-(define SB_BOTTOM           7)
-(define SB_RIGHT            7)
-(define SB_ENDSCROLL        8)
-
-(define SB_HORZ             0)
-(define SB_VERT             1)
-(define SB_CTL              2)
-(define SB_BOTH             3)
-
-(define SIF_RANGE           #x0001)
-(define SIF_PAGE            #x0002)
-(define SIF_POS             #x0004)
-(define SIF_DISABLENOSCROLL #x0008)
-(define SIF_TRACKPOS        #x0010)
-(define SIF_ALL             (bitwise-ior SIF_RANGE SIF_PAGE SIF_POS SIF_TRACKPOS))
-
-(define VK_LBUTTON        #x01)
-(define VK_RBUTTON        #x02)
-(define VK_CANCEL         #x03)
-(define VK_MBUTTON        #x04)
-(define VK_XBUTTON1       #x05)
-(define VK_XBUTTON2       #x06)
-(define VK_BACK           #x08)
-(define VK_TAB            #x09)
-(define VK_CLEAR          #x0C)
-(define VK_RETURN         #x0D)
-(define VK_SHIFT          #x10)
-(define VK_CONTROL        #x11)
-(define VK_MENU           #x12)
-(define VK_PAUSE          #x13)
-(define VK_CAPITAL        #x14)
-(define VK_KANA           #x15)
-(define VK_HANGUL         #x15)
-(define VK_JUNJA          #x17)
-(define VK_FINAL          #x18)
-(define VK_HANJA          #x19)
-(define VK_KANJI          #x19)
-(define VK_ESCAPE         #x1B)
-(define VK_CONVERT        #x1C)
-(define VK_NONCONVERT     #x1D)
-(define VK_ACCEPT         #x1E)
-(define VK_MODECHANGE     #x1F)
-(define VK_SPACE          #x20)
-(define VK_PRIOR          #x21)
-(define VK_NEXT           #x22)
-(define VK_END            #x23)
-(define VK_HOME           #x24)
-(define VK_LEFT           #x25)
-(define VK_UP             #x26)
-(define VK_RIGHT          #x27)
-(define VK_DOWN           #x28)
-(define VK_SELECT         #x29)
-(define VK_PRINT          #x2A)
-(define VK_EXECUTE        #x2B)
-(define VK_SNAPSHOT       #x2C)
-(define VK_INSERT         #x2D)
-(define VK_DELETE         #x2E)
-(define VK_HELP           #x2F)
-(define VK_LWIN           #x5B)
-(define VK_RWIN           #x5C)
-(define VK_APPS           #x5D)
-(define VK_SLEEP          #x5F)
-(define VK_NUMPAD0        #x60)
-(define VK_NUMPAD1        #x61)
-(define VK_NUMPAD2        #x62)
-(define VK_NUMPAD3        #x63)
-(define VK_NUMPAD4        #x64)
-(define VK_NUMPAD5        #x65)
-(define VK_NUMPAD6        #x66)
-(define VK_NUMPAD7        #x67)
-(define VK_NUMPAD8        #x68)
-(define VK_NUMPAD9        #x69)
-(define VK_MULTIPLY       #x6A)
-(define VK_ADD            #x6B)
-(define VK_SEPARATOR      #x6C)
-(define VK_SUBTRACT       #x6D)
-(define VK_DECIMAL        #x6E)
-(define VK_DIVIDE         #x6F)
-(define VK_F1             #x70)
-(define VK_F2             #x71)
-(define VK_F3             #x72)
-(define VK_F4             #x73)
-(define VK_F5             #x74)
-(define VK_F6             #x75)
-(define VK_F7             #x76)
-(define VK_F8             #x77)
-(define VK_F9             #x78)
-(define VK_F10            #x79)
-(define VK_F11            #x7A)
-(define VK_F12            #x7B)
-(define VK_F13            #x7C)
-(define VK_F14            #x7D)
-(define VK_F15            #x7E)
-(define VK_F16            #x7F)
-(define VK_F17            #x80)
-(define VK_F18            #x81)
-(define VK_F19            #x82)
-(define VK_F20            #x83)
-(define VK_F21            #x84)
-(define VK_F22            #x85)
-(define VK_F23            #x86)
-(define VK_F24            #x87)
-(define VK_NUMLOCK        #x90)
-(define VK_SCROLL         #x91)
-(define VK_LSHIFT         #xA0)
-(define VK_RSHIFT         #xA1)
-(define VK_LCONTROL       #xA2)
-(define VK_RCONTROL       #xA3)
-(define VK_LMENU          #xA4)
-(define VK_RMENU          #xA5)
-(define VK_OEM_1          #xBA)
-(define VK_OEM_PLUS       #xBB)
-(define VK_OEM_COMMA      #xBC)
-(define VK_OEM_MINUS      #xBD)
-(define VK_OEM_PERIOD     #xBE)
-(define VK_OEM_2          #xBF)
-(define VK_OEM_3          #xC0)
-(define VK_OEM_4          #xDB)
-(define VK_OEM_5          #xDC)
-(define VK_OEM_6          #xDD)
-(define VK_OEM_7          #xDE)
-(define VK_OEM_8          #xDF)
-
-(define KF_EXTENDED       #x0100)
-(define KF_DLGMODE        #x0800)
-(define KF_MENUMODE       #x1000)
-(define KF_ALTDOWN        #x2000)
-(define KF_REPEAT         #x4000)
-(define KF_UP             #x8000)
-
-(define GW_HWNDFIRST        0)
-(define GW_HWNDLAST         1)
-(define GW_HWNDNEXT         2)
-(define GW_HWNDPREV         3)
-(define GW_OWNER            4)
-(define GW_CHILD            5)
-
-(define MF_INSERT           #x00000000)
-(define MF_CHANGE           #x00000080)
-(define MF_APPEND           #x00000100)
-(define MF_DELETE           #x00000200)
-(define MF_REMOVE           #x00001000)
-(define MF_BYCOMMAND        #x00000000)
-(define MF_BYPOSITION       #x00000400)
-(define MF_SEPARATOR        #x00000800)
-(define MF_ENABLED          #x00000000)
-(define MF_GRAYED           #x00000001)
-(define MF_DISABLED         #x00000002)
-(define MF_UNCHECKED        #x00000000)
-(define MF_CHECKED          #x00000008)
-(define MF_USECHECKBITMAPS  #x00000200)
-(define MF_STRING           #x00000000)
-(define MF_BITMAP           #x00000004)
-(define MF_OWNERDRAW        #x00000100)
-(define MF_POPUP            #x00000010)
-(define MF_MENUBARBREAK     #x00000020)
-(define MF_MENUBREAK        #x00000040)
-(define MF_UNHILITE         #x00000000)
-(define MF_HILITE           #x00000080)
-
-(define BM_SETIMAGE        #x00F7)
-(define IMAGE_BITMAP        0)
-(define BN_CLICKED          0)
-
-(define SW_SHOW 5)
-(define SW_HIDE 0)
-(define SW_SHOWNORMAL       1)
-(define SW_SHOWMINIMIZED    2)
-(define SW_SHOWMAXIMIZED    3)
-(define SW_MAXIMIZE         3)
-(define SW_SHOWNOACTIVATE   4)
-(define SW_MINIMIZE         6)
-(define SW_SHOWMINNOACTIVE  7)
-(define SW_RESTORE          9)
-(define SW_SHOWDEFAULT      10)
-(define SW_FORCEMINIMIZE    11)
-
-(define HORZRES       8)
-(define VERTRES       10)
-(define LOGPIXELSX    88)
-(define LOGPIXELSY    90)
-
-(define CBS_DROPDOWNLIST #x0003)
-(define CB_INSERTSTRING #x014A)
-(define CB_SETCURSEL #x014E)
-(define CB_GETCURSEL #x0147)
-(define CB_ADDSTRING #x0143)
-(define CB_DELETESTRING #x0144)
-(define CB_RESETCONTENT #x014B)
-
-(define CBN_SELENDOK 9)
-(define CBN_DROPDOWN        7)
-(define CBN_CLOSEUP         8)
-(define CBN_SELENDCANCEL    10)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/cursor.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/cursor.rkt
deleted file mode 100644
index c9808bba83..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/cursor.rkt
+++ /dev/null
@@ -1,96 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "wndclass.rkt"
-	 "icons.rkt"
-         "../common/cursor-draw.rkt"
-          "../../syntax.rkt")
-
-(provide 
- (protect-out cursor-driver%
-              get-arrow-cursor
-              get-wait-cursor))
-
-(define-user32 CreateCursor (_wfun _HINSTANCE
-                                   _int ; x
-                                   _int ; y
-                                   _int ; width
-                                   _int ; height
-                                   _pointer ; AND
-                                   _pointer ; XOR
-                                   -> _HCURSOR))
-
-(define handles (make-hasheq))
-(define (load-cursor num)
-  (or (hash-ref handles num #f)
-      (let ([h (LoadCursorW #f num)])
-        (hash-set! handles num h)
-        h)))
-
-(define (get-arrow-cursor)
-  (load-cursor IDC_ARROW))
-(define (get-wait-cursor)
-  (load-cursor IDC_APPSTARTING))
-
-(defclass cursor-driver% object%
-  (define handle #f)
-
-  (define/public (set-standard sym)
-    (case sym
-      [(arrow)
-       (set! handle (load-cursor IDC_ARROW))]
-      [(cross)
-       (set! handle (load-cursor IDC_CROSS))]
-      [(hand)
-       (set! handle (load-cursor IDC_HAND))]
-      [(ibeam)
-       (set! handle (load-cursor IDC_IBEAM))]
-      [(size-n/s)
-       (set! handle (load-cursor IDC_SIZENS))]
-      [(size-e/w)
-       (set! handle (load-cursor IDC_SIZEWE))]
-      [(size-nw/se)
-       (set! handle (load-cursor IDC_SIZENWSE))]
-      [(size-ne/sw)
-       (set! handle (load-cursor IDC_SIZENESW))]
-      [(watch)
-       (set! handle (load-cursor IDC_APPSTARTING))]
-      [(bullseye)
-       (set-image (make-cursor-image draw-bullseye 'unsmoothed) #f 8 8)]
-      [(blank)
-       (set-image #f #f 0 0)]))
-
-  (define/public (set-image image mask hot-spot-x hot-spot-y
-                            [ai (make-bytes (/ (* 16 16) 8) 255)]
-                            [xi (make-bytes (/ (* 16 16) 8) 0)])
-    (let ([s (make-bytes (* 16 16 4) 0)])
-      (when image
-        (send image get-argb-pixels 0 0 16 16 s)
-        (if mask
-            (send mask get-argb-pixels 0 0 16 16 s #t)
-            (send image get-argb-pixels 0 0 16 16 s #t)))
-      (for* ([i (in-range 16)]
-             [j (in-range 16)])
-        (let ([pos (* 4 (+ (* j 16) i))])
-          (when (positive? (bytes-ref s pos))
-            ;; black bit in mask
-            (let ([bpos (+ (* j (/ 16 8)) (quotient i 8))]
-                  [bit (arithmetic-shift 1 (- 7 (modulo i 8)))])
-              (bytes-set! ai bpos (- (bytes-ref ai bpos) bit))
-              (unless (and (zero? (bytes-ref s (+ 1 pos)))
-                           (zero? (bytes-ref s (+ 2 pos)))
-                           (zero? (bytes-ref s (+ 3 pos))))
-                ;; white cursor pixel
-                (bytes-set! xi bpos (+ (bytes-ref xi bpos) bit)))))))
-      (set! handle
-            (CreateCursor hInstance hot-spot-x hot-spot-y
-                          16 16
-                          ai xi))))
-
-  (define/public (ok?) (and handle #t))
-  (define/public (get-handle) handle)
-
-  (super-new))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/dc.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/dc.rkt
deleted file mode 100644
index 15d05b8690..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/dc.rkt
+++ /dev/null
@@ -1,188 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-	 ffi/winapi
-         racket/class
-         "utils.rkt"
-         "types.rkt"
-         "gl-context.rkt"
-	 "../../lock.rkt"
-         "../common/backing-dc.rkt"
-         "../common/delay.rkt"
-         racket/draw/unsafe/cairo
-         racket/draw/private/dc
-         racket/draw/private/bitmap
-         racket/draw/private/local
-         ffi/unsafe/alloc)
-
-(provide 
- (protect-out dc%
-              win32-bitmap%
-              do-backing-flush
-              request-flush-delay
-              cancel-flush-delay))
-
-(define-gdi32 SelectClipRgn (_wfun _pointer _pointer -> _int))
-
-(define-gdi32 GetClipBox (_wfun _pointer _RECT-pointer -> _int))
-(define SIMPLEREGION 2)
-
-(define-gdi32 BitBlt (_wfun _pointer _int _int _int _int _pointer _int _int _DWORD -> _BOOL))
-(define SRCCOPY #X00cc0020)
-
-(define hwnd-param (make-parameter #f))
-
-(define need-clip-text-workaround? #t)
-(define need-clip-refresh-workaround? #f) ; patched Cairo
-
-(define win32-bitmap%
-  (class win32-no-hwnd-bitmap%
-    (init w h hwnd [gl-config #f])
-    (inherit get-cairo-surface)
-    (parameterize ([hwnd-param hwnd])
-      (super-new [w w] [h h] [backing-scale (->screen 1.0)]))
-    
-    (define/override (build-cairo-surface w h backing-scale)
-      (define hwnd (hwnd-param))
-      (if hwnd
-          (atomically
-           (let ([hdc (GetDC hwnd)])
-             (begin0
-	      (let ([sw (inexact->exact (floor (* backing-scale w)))]
-		    [sh (inexact->exact (floor (* backing-scale h)))])
-		(cairo_win32_surface_create_with_ddb hdc
-						     CAIRO_FORMAT_RGB24 sw sh))
-               (ReleaseDC hwnd hdc))))
-          (super build-cairo-surface w h backing-scale)))
-    
-    (define gl (and gl-config
-                    (let ([hdc (cairo_win32_surface_get_dc (get-cairo-surface))])
-                      (set-cpointer-tag! hdc 'HDC)
-                      (create-gl-context hdc 
-                                         gl-config
-                                         #t))))
-    (define/override (get-bitmap-gl-context) gl)))
-
-(define dc%
-  (class backing-dc%
-    (init [(cnvs canvas)]
-          transparent?)
-    (inherit end-delay)
-    (define canvas cnvs)
-
-    (super-new [transparent? transparent?])
-
-    (inherit internal-get-bitmap)
-    (define/override (reset-clip cr)
-      (super reset-clip cr)
-      ;; Work around a Cairo(?) bug. When a clipping
-      ;; region is set, we draw text, and then the clipping
-      ;; region is changed, the change doesn't take
-      ;; until we draw more text --- but only with DDB surfaces.
-      (when need-clip-text-workaround?
-	(let ([bm (internal-get-bitmap)])
-	  (when (bm . is-a? . win32-bitmap%)
-	    (SelectClipRgn (cairo_win32_surface_get_dc
-			    (send bm get-cairo-surface))
-			   #f)))))
-
-    (define gl #f)
-    (define/override (get-gl-context)
-      (or gl
-          (let ([v (create-gl-context (GetDC (send canvas get-client-hwnd))
-                                      (send canvas get-gl-config)
-                                      #f)])
-	    (when v (set! gl v))
-	    v)))
-
-    (define/override (make-backing-bitmap w h)
-      (if (send canvas get-canvas-background)
-          (make-object win32-bitmap% w h (send canvas get-hwnd))
-	  (make-object bitmap% w h #f #t (->screen 1.0))))
-
-    (define/override (get-backing-size xb yb)
-      (send canvas get-client-size xb yb))
-
-    (define/override (get-size)
-      (let ([xb (box 0)]
-            [yb (box 0)])
-        (send canvas get-virtual-size xb yb)
-        (values (unbox xb) (unbox yb))))
-
-    (define/override (queue-backing-flush)
-      ;; Re-enable expose events so that the queued 
-      ;; backing flush will be handled:
-      (end-delay)
-      (send canvas queue-backing-flush))
-
-    (define/override (flush)
-      (send canvas flush))
-
-    (define/override (request-delay)
-      (request-flush-delay canvas))
-    (define/override (cancel-delay req)
-      (cancel-flush-delay req))))
-
-(define (do-backing-flush canvas dc hdc)
-  (send dc on-backing-flush
-        (lambda (bm)
-          (let ([w (box 0)]
-                [h (box 0)])
-            (send canvas get-client-size w h)
-	    (define sw (->screen (unbox w)))
-	    (define sh (->screen (unbox h)))
-	    (define r (make-RECT 0 0 sw sh))
-	    (define clip-type
-	      (if need-clip-refresh-workaround?
-		  (GetClipBox hdc r)
-		  SIMPLEREGION))
-	    (cond
-	     [(and need-clip-refresh-workaround?
-		   (not (and (= clip-type SIMPLEREGION)
-			     (= (RECT-left r) 0)
-			     (= (RECT-top r) 0)
-			     (= (RECT-right r) sw)
-			     (= (RECT-bottom r) sh))))
-	      ;; Another workaround: a clipping region installed by BeginPaint()
-	      ;; seems to interfere with Cairo drawing. So, draw to a
-	      ;; fresh context and copy back and forth using Win32.
-	      (define cw (- (RECT-right r) (RECT-left r)))
-	      (define ch (- (RECT-bottom r) (RECT-top r)))
-	      (let* ([surface (cairo_win32_surface_create_with_ddb hdc
-								   CAIRO_FORMAT_RGB24
-								   cw
-								   ch)]
-		     [cr (cairo_create surface)]
-		     [hdc2 (cairo_win32_surface_get_dc surface)])
-		(BitBlt hdc2 0 0 cw ch hdc (RECT-left r) (RECT-top r) SRCCOPY)
-		(cairo_scale cr (->screen 1.0) (->screen 1.0))
-		(backing-draw-bm bm cr (->normal sw) (->normal sh)
-				 (->normal (- (RECT-left r))) (->normal (- (RECT-top r)))
-				 (->screen 1.0))
-		(cairo_surface_flush surface)
-		(BitBlt hdc (RECT-left r) (RECT-top r) cw ch hdc2 0 0 SRCCOPY)
-		(cairo_surface_destroy surface)
-		(cairo_destroy cr))]
-	     [else
-	      (let* ([surface (cairo_win32_surface_create hdc)]
-		     [cr (cairo_create surface)])
-		(cairo_surface_destroy surface)
-		(cairo_scale cr (->screen 1.0) (->screen 1.0))
-		(backing-draw-bm bm cr (->normal sw) (->normal sh)
-				 0 0
-				 (->screen 1.0))
-		(cairo_destroy cr))])))))
-
-(define (request-flush-delay canvas)
-  (do-request-flush-delay 
-   canvas
-   (lambda (gtk)
-     (send canvas suspend-paint-handling))
-   (lambda (gtk)
-     (send canvas resume-paint-handling))))
-
-(define (cancel-flush-delay req)
-  (when req
-    (do-cancel-flush-delay 
-     req
-     (lambda (canvas)
-       (send canvas resume-paint-handling)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/dialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/dialog.rkt
deleted file mode 100644
index dcf23770c4..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/dialog.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang racket/base
-(require racket/class
-         (only-in racket/list last)
-         ffi/unsafe
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "../common/queue.rkt"
-         "../common/freeze.rkt"
-         "../common/dialog.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt"
-         "window.rkt"
-         "frame.rkt"
-         "wndclass.rkt")
-
-(provide dialog%)
-
-(define-cstruct _DLGTEMPLATE
-  ([style _DWORD]
-   [dwExtendedStyle _DWORD]
-   [cdit _WORD]
-   [x _short]
-   [y _short]
-   [cx _short]
-   [cy _short]
-   [menu _short] ; 0
-   [class _short] ; 0
-   [title _short])) ; 0
-
-(define DS_MODALFRAME #x80)
-
-(define dialog% 
-  (class (dialog-mixin frame%)
-    (super-new)
-    (inherit get-eventspace)
-
-    (define/override (create-frame parent label x y w h style)
-      (let ([hwnd
-             (CreateDialogIndirectParamW hInstance
-                                         (make-DLGTEMPLATE
-                                          (bitwise-ior DS_MODALFRAME WS_CAPTION WS_SYSMENU WS_THICKFRAME)
-                                          0 0
-                                          0 0 w h
-                                          0 0 0)
-                                         (and parent (send parent get-hwnd))
-                                         dialog-proc
-                                         0)])
-        (SetWindowTextW hwnd label)
-        (let ([x (or x 0)]
-              [y (or y 0)])
-          (MoveWindow hwnd x y w h #t))
-        hwnd))
-
-    (define/override (is-dialog?) #t)
-
-    (define/override (direct-show on?)
-      ;; atomic mode
-      (when on? (super direct-show on?))
-      (for ([f (in-list (get-top-level-windows (get-eventspace)))])
-        (send f modal-enable (and (not on?) this)))
-      (when (not on?) (super direct-show on?)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/filedialog.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/filedialog.rkt
deleted file mode 100644
index 2fc3d712ed..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/filedialog.rkt
+++ /dev/null
@@ -1,229 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         racket/string
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "wndclass.rkt"
-	 "../../lock.rkt")
-
-(provide 
- (protect-out file-selector))
-
-(define-cstruct _OPENFILENAME
-  ([lStructSize _DWORD]
-   [hwndOwner _HWND]
-   [hInstance _HINSTANCE]
-   [lpstrFilter _permanent-string/utf-16]
-   [lpstrCustomFilter _permanent-string/utf-16]
-   [nMaxCustFilter _DWORD]
-   [nFilterIndex _DWORD]
-   [lpstrFile _pointer]
-   [nMaxFile _DWORD]
-   [lpstrFileTitle _pointer]
-   [nMaxFileTitle _DWORD]
-   [lpstrInitialDir _permanent-string/utf-16]
-   [lpstrTitle _permanent-string/utf-16]
-   [Flags _DWORD]
-   [nFileOffset _WORD]
-   [nFileExtension _WORD]
-   [lpstrDefExt _permanent-string/utf-16]
-   [lCustData _LPARAM]
-   [lpfnHook _fpointer]
-   [lpTemplateName _permanent-string/utf-16]
-   [pvReserved _pointer]
-   [dwReserved _DWORD]
-   [FlagsEx _DWORD]))
-
-(define-comdlg32 GetSaveFileNameW (_wfun _OPENFILENAME-pointer -> _BOOL))
-(define-comdlg32 GetOpenFileNameW (_wfun _OPENFILENAME-pointer -> _BOOL))
-
-(define OFN_READONLY                 #x00000001)
-(define OFN_OVERWRITEPROMPT          #x00000002)
-(define OFN_HIDEREADONLY             #x00000004)
-(define OFN_NOCHANGEDIR              #x00000008)
-(define OFN_SHOWHELP                 #x00000010)
-(define OFN_ENABLEHOOK               #x00000020)
-(define OFN_ENABLETEMPLATE           #x00000040)
-(define OFN_ENABLETEMPLATEHANDLE     #x00000080)
-(define OFN_ALLOWMULTISELECT         #x00000200)
-(define OFN_EXTENSIONDIFFERENT       #x00000400)
-(define OFN_PATHMUSTEXIST            #x00000800)
-(define OFN_FILEMUSTEXIST            #x00001000)
-(define OFN_NOREADONLYRETURN         #x00008000)
-(define OFN_EXPLORER                 #x00080000)
-
-(define BUFFER-LEN 4096)
-
-(define-cstruct _BROWSEINFO
-  ([hwndOwner _HWND]
-   [pidlRoot _pointer]
-   [pszDisplayName _pointer]
-   [lpszTitle _permanent-string/utf-16]
-   [ulFlags _UINT]
-   [lpfn _pointer]
-   [lParam _LPARAM]
-   [iImage _int]))
-
-(define BIF_RETURNONLYFSDIRS #x00000001)
-(define BIF_NEWDIALOGSTYLE #x00000040)
-
-(define-cstruct _IUnknownVtbl
-  ([QueryInterface _fpointer]
-   [AddRef _fpointer]
-   [Release (_wfun _pointer -> _ULONG)]))
-
-(define-cstruct (_IMallocVtbl _IUnknownVtbl)
-  ([Alloc _fpointer]
-   [Realloc _fpointer]
-   [Free (_wfun _pointer _pointer -> _void)]
-   [GetSize _fpointer]
-   [DidAlloc _fpointer]
-   [HeapMinimize _fpointer]))
-
-(define-cstruct _IMalloc
-  ([vtbl _IMallocVtbl-pointer]))
-
-(define (IMalloc-Free im p)
-  ((IMallocVtbl-Free (IMalloc-vtbl im)) im p))
-(define (IMalloc-Release im)
-  ((IUnknownVtbl-Release (IMalloc-vtbl im)) im))
-
-(define-shell32 SHBrowseForFolderW (_wfun _BROWSEINFO-pointer -> _pointer))
-(define-shell32 SHGetPathFromIDListW (_wfun _pointer _pointer -> _BOOL))
-(define-shell32 SHGetMalloc (_wfun (p : (_ptr o _IMalloc-pointer)) -> (r : _HRESULT)
-                                   -> (if (negative? r)
-                                          (error 'SHGetMalloc "failed: ~s" (bitwise-and #xFFFF r))
-                                          p)))
-
-(define (file-selector message directory filename 
-                       extension
-                       filters style parent)
-  (if (memq 'dir style)
-      (dialog-selector message directory
-                       style parent)
-      (do-file-selector message directory filename 
-                        extension
-                        filters style parent)))
-
-(define (do-file-selector message directory filename 
-                          extension
-                          filters style parent)
-  (atomically
-   (let* ([pre-ofn
-           (make-OPENFILENAME
-            (ctype-sizeof _OPENFILENAME)
-            (and parent
-                 (send parent get-hwnd))
-            hInstance
-            (string-append
-             (string-join
-              (for/list ([f (in-list filters)])
-                (format "~a\0~a" (car f) (cadr f)))
-              "\0")
-             "\0")
-            #f
-            0 
-            0 ; nFilterIndex
-            (malloc 'raw (* BUFFER-LEN (ctype-sizeof _short)))
-            BUFFER-LEN
-            #f
-            0
-            (and directory
-                 (path->string (simplify-path directory #f)))
-            message
-            (bitwise-ior
-             OFN_HIDEREADONLY
-             (if (memq 'put style) OFN_OVERWRITEPROMPT 0)
-             (if (memq 'multi style) (bitwise-ior OFN_ALLOWMULTISELECT OFN_EXPLORER) 0)
-             (if directory OFN_NOCHANGEDIR 0))
-            0
-            0
-            extension
-            0
-            #f
-            #f
-            #f
-            0
-            0)]
-          [ofn (malloc 'raw (ctype-sizeof _OPENFILENAME))])
-     (set-cpointer-tag! ofn OPENFILENAME-tag)
-     (memcpy ofn pre-ofn 1 _OPENFILENAME)
-     (if filename
-         (let* ([filename (path->string (simplify-path filename #f))]
-                [len (utf-16-length filename)])
-           (memcpy (OPENFILENAME-lpstrFile ofn)
-                   (cast filename _string/utf-16 _gcpointer)
-                   (+ len 1)
-                   _uint16))
-         (ptr-set! (OPENFILENAME-lpstrFile ofn) _uint16 0))
-     (let ([r (if (memq 'put style)
-                  (GetSaveFileNameW ofn)
-                  (GetOpenFileNameW ofn))])
-       (begin0
-        (and r
-             (if (memq 'multi style)
-                 (let ([strs
-                        (let ([p (OPENFILENAME-lpstrFile ofn)])
-                          (let loop ([pos 0])
-                            (cond
-                             [(and (zero? (ptr-ref p _byte pos))
-                                   (zero? (ptr-ref p _byte (add1 pos))))
-                              null]
-                             [else (let ([end-pos
-                                          (let loop ([pos (+ pos 2)])
-                                            (cond
-                                             [(and (zero? (ptr-ref p _byte pos))
-                                                   (zero? (ptr-ref p _byte (add1 pos))))
-                                              pos]
-                                             [else (loop (+ pos 2))]))])
-                                     (cons
-                                      (cast (ptr-add p pos) _pointer _string/utf-16)
-                                      (loop (+ end-pos 2))))])))])
-		   (let ([len (length strs)])
-		     (cond
-		      [(len . < . 1) #f]
-		      [(= len 1) (list (string->path (car strs)))]
-		      [else
-		       (map (lambda (p) (build-path (car strs) p))
-			    (cdr strs))])))
-                 (string->path (cast (OPENFILENAME-lpstrFile ofn) _pointer _string/utf-16))))
-        (when directory
-          (free (OPENFILENAME-lpstrInitialDir ofn)))
-        (when message
-          (free (OPENFILENAME-lpstrTitle ofn)))
-        (free (OPENFILENAME-lpstrFilter ofn))
-        (free (OPENFILENAME-lpstrFile ofn)))))))
-
-(define MAX_PATH 4096)
-
-(define (dialog-selector message directory
-                         style parent)
-  (atomically
-   (let ([pre-bi (make-BROWSEINFO
-                  (and parent
-                       (send parent get-hwnd))
-                  #f
-                  (malloc 'raw MAX_PATH _uint16)
-                  message
-                  (bitwise-ior BIF_NEWDIALOGSTYLE BIF_RETURNONLYFSDIRS)
-                  #f
-                  0
-                  0)]
-         [bi (malloc 'raw (ctype-sizeof _BROWSEINFO))])
-     (set-cpointer-tag! bi BROWSEINFO-tag)
-     (memcpy bi pre-bi 1 _BROWSEINFO)
-     (let ([r (SHBrowseForFolderW bi)])
-       (begin0
-        (and r
-             (let ([ok (SHGetPathFromIDListW r (BROWSEINFO-pszDisplayName bi))])
-               (and ok
-                    (let ([mi (SHGetMalloc)])
-                      (IMalloc-Free mi r)
-                      (IMalloc-Release mi))
-                    (string->path
-                     (cast (BROWSEINFO-pszDisplayName bi) _pointer _string/utf-16)))))
-        (free (BROWSEINFO-pszDisplayName bi))
-        (when message
-          (free (BROWSEINFO-lpszTitle bi))))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/font.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/font.rkt
deleted file mode 100644
index 25c1a799fb..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/font.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang racket/base
-(require racket/class
-	 racket/draw
-         ffi/unsafe
-         racket/draw/private/local
-         racket/draw/unsafe/pango
-         "types.rkt"
-         "utils.rkt")
-
-(provide 
- (protect-out font->hfont
-              logfont->pango-family
-              (struct-out LOGFONTW) _LOGFONTW _LOGFONTW-pointer))
-
-
-(define display-font-map
-  (pango_win32_font_map_for_display))
-
-(define display-context
-  (pango_font_map_create_context display-font-map))
-
-(define font-cache (pango_win32_font_cache_new))
-
-(define (scale-font f)
-  (if (= 1 (->screen 1))
-      f
-      (make-font #:size (->screen (send f get-point-size))
-		 #:face (send f get-face)
-		 #:family (send f get-family)
-		 #:style (send f get-style)
-		 #:weight (send f get-weight)
-		 #:underlined? (send f get-underlined)
-		 #:smoothing (send f get-smoothing)
-		 #:size-in-pixels? (send f get-size-in-pixels)
-		 #:hinting (send f get-hinting))))
-
-(define (font->hfont f)
-  (let* ([pfont (or (pango_font_map_load_font display-font-map
-					      display-context
-					      (send (scale-font f) get-pango))
-		    ;; font load failed, so fall back to default
-		    ;; font with the same size and style:
-		    (pango_font_map_load_font display-font-map
-					      display-context
-					      (send (make-font 
-						     #:size (send f get-point-size)
-						     #:style (send f get-style)
-						     #:weight (send f get-weight)
-						     #:size-in-pixels? (send f get-size-in-pixels))
-						    get-pango)))]
-         [logfont (and pfont
-		       (pango_win32_font_logfont pfont))])
-    (and logfont
-	 (begin0
-	  (pango_win32_font_cache_load font-cache logfont)
-	  (g_free logfont)))))
-
-;; ----------------------------------------
-
-(define-cstruct _LOGFONTW
-  ([lfHeight  _LONG]
-   [lfWidth  _LONG]
-   [lfEscapement  _LONG]
-   [lfOrientation  _LONG]
-   [lfWeight  _LONG]
-   [lfItalic  _BYTE]
-   [lfUnderline  _BYTE]
-   [lfStrikeOut  _BYTE]
-   [lfCharSet  _BYTE]
-   [lfOutPrecision  _BYTE]
-   [lfClipPrecision  _BYTE]
-   [lfQuality  _BYTE]
-   [lfPitchAndFamily  _BYTE]
-   [lfFaceName (_array _uint16 32)]))
-
-(define (logfont->pango-family logfontw)
-  ;; We'll allocate `logfont' as LOGFONTW but use it as LOGFONTA:
-  (define logfont (cast (malloc _LOGFONTW) _pointer (_gcable _LOGFONTW-pointer)))
-  (memcpy logfont logfontw (ctype-sizeof _LOGFONTW))
-  (WideCharToMultiByte 0 0 
-                       (array-ptr (LOGFONTW-lfFaceName logfontw)) -1
-                       (array-ptr (LOGFONTW-lfFaceName logfont)) 32
-                       #f #f)
-  (define desc
-    (pango_win32_font_description_from_logfont logfont))
-  (if desc
-      (pango_font_description_get_family desc)
-      ;; random fallback:
-      "Arial"))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/frame.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/frame.rkt
deleted file mode 100644
index 1f511cf715..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/frame.rkt
+++ /dev/null
@@ -1,690 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         (only-in racket/list last)
-         ffi/unsafe
-         ffi/unsafe/alloc
-	 "../../syntax.rkt"
-	 "../../lock.rkt"
-	 "../common/queue.rkt"
-	 "../common/freeze.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt"
-         "theme.rkt"
-	 "window.rkt"
-         "wndclass.rkt"
-         "hbitmap.rkt"
-         "cursor.rkt"
-	 "menu-item.rkt")
-
-(provide 
- (protect-out frame%
-              display-size
-              display-origin
-	      display-count
-              display-bitmap-resolution))
-
-(define-user32 SetLayeredWindowAttributes (_wfun _HWND _COLORREF _BYTE _DWORD -> _BOOL))
-(define-user32 GetActiveWindow (_wfun -> _HWND))
-(define-user32 SetFocus (_wfun _HWND -> _HWND))
-(define-user32 BringWindowToTop (_wfun _HWND -> (r : _BOOL) -> (unless r (failed 'BringWindowToTop))))
-
-(define-user32 DrawMenuBar (_wfun _HWND -> (r : _BOOL)
-                                  -> (unless r (failed 'DrawMenuBar))))
-
-(define-user32 IsZoomed (_wfun _HWND -> _BOOL))
-
-(define-user32 EnumDisplayMonitors (_wfun _HDC 
-					  _pointer 
-					  (_wfun #:atomic? #t _pointer _HDC _RECT-pointer _pointer 
-						 -> _BOOL)
-					  _pointer -> _BOOL))
-
-(define-user32 SystemParametersInfoW (_wfun _UINT _UINT _pointer _UINT -> (r : _BOOL)
-                                            -> (unless r (failed 'SystemParametersInfo))))
-(define-cstruct _MINMAXINFO ([ptReserved _POINT]
-                             [ptMaxSize _POINT]
-                             [ptMaxPosition _POINT]
-                             [ptMinTrackSize _POINT]
-                             [ptMaxTrackSize _POINT]))
-
-(define-cstruct _ICONINFO ([fIcon _BOOL]
-                           [xHotspot _DWORD]
-                           [yHotspot _DWORD]
-                           [hbmMask _HBITMAP]
-                           [hbmColor _HBITMAP]))
-
-(define-user32 DestroyIcon (_wfun _HICON -> (r : _BOOL)
-                                  -> (unless r (failed 'DestroyIcon)))
-  #:wrap (deallocator))
-(define-user32 CreateIconIndirect (_wfun _ICONINFO-pointer -> (r : _HICON)
-                                         -> (or r (failed 'CreateIconIndirect)))
-  #:wrap (allocator DestroyIcon))
-
-(define-cstruct _MONITORINFO ([cbSize _DWORD]
-			      [rcMonitor _RECT]
-			      [rcWork _RECT]
-			      [dwFlags _DWORD]))
-
-(define-user32 GetMonitorInfoW (_wfun _pointer _MONITORINFO-pointer 
-				      -> (r : _BOOL)
-				      -> (unless r (failed 'GetMonitorInfoW))))
-
-(define SPI_GETWORKAREA            #x0030)
-
-(define MA_NOACTIVATEANDEAT 4)
-
-(define MONITORINFOF_PRIMARY 1)
-
-(define (get-all-screen-rects)
-  (let ([rects null]
-	[pos 0])
-    (EnumDisplayMonitors #f #f (lambda (mon dc r ptr)
-				 (define mi (cast (malloc _MONITORINFO)
-						  _pointer
-						  _MONITORINFO-pointer))
-				 (set-MONITORINFO-cbSize! mi (ctype-sizeof _MONITORINFO))
-				 (GetMonitorInfoW mon mi)
-				 (set! pos (add1 pos))
-				 (set! rects (cons
-					      (list*
-					       ;; sort first by main monitor:
-					       (positive?
-						(bitwise-and MONITORINFOF_PRIMARY
-							     (MONITORINFO-dwFlags mi)))
-					       ;; otherwise, preserve order:
-					       pos
-					       ;; monitor rectangle, which is the goal:
-					       (list (->normal (RECT-left r))
-						     (->normal (RECT-top r))
-						     (->normal (RECT-right r))
-						     (->normal (RECT-bottom r))))
-					      rects))
-				 #t)
-			 #f)
-    (map
-     cddr
-     (sort rects (lambda (a b)
-		   (cond
-		    [(and (car a) (not (car b))) #t]
-		    [(and (car b) (not (car a))) #f]
-		    [else (< (cadr a) (cadr b))]))))))
-
-(define (display-size xb yb all? num fail)
-  (cond
-   [(positive? num)
-    (let ([rs (get-all-screen-rects)])
-      (unless (num . < . (length rs))
-        (fail))
-      (let ([r (list-ref rs num)])
-	(set-box! xb (- (caddr r) (car r)))
-	(set-box! yb (- (cadddr r) (cadr r)))))]
-   [all?
-    (atomically
-     (let ([hdc (GetDC #f)])
-       (set-box! xb (->normal (GetDeviceCaps hdc HORZRES)))
-       (set-box! yb (->normal (GetDeviceCaps hdc VERTRES)))
-       (ReleaseDC #f hdc)))]
-   [else
-    (let ([r (make-RECT 0 0 0 0)])
-      (SystemParametersInfoW SPI_GETWORKAREA 0 r 0)
-      (set-box! xb (->normal (- (RECT-right r) (RECT-left r))))
-      (set-box! yb (->normal (- (RECT-bottom r) (RECT-top r)))))]))
-
-(define (display-origin xb yb avoid-bars? num fail)
-  (cond
-   [(positive? num)
-    (let ([rs (get-all-screen-rects)])
-      (unless (num . < . (length rs))
-	(fail))
-      (let ([r (list-ref rs num)])
-	(set-box! xb (- (car r)))
-	(set-box! yb (- (cadr r)))))]
-   [avoid-bars?
-    (let ([r (make-RECT 0 0 0 0)])
-      (SystemParametersInfoW SPI_GETWORKAREA 0 r 0)
-      (set-box! xb (->normal (RECT-left r)))
-      (set-box! yb (->normal (RECT-top r))))]
-   [else
-    (set-box! xb 0)
-    (set-box! yb 0)]))
-
-(define (display-count)
-  (let ([pos 0])
-    (EnumDisplayMonitors #f #f (lambda (mon dc r ptr)
-                                 (set! pos (add1 pos))
-                                 #t)
-                         #f)
-    pos))
-
-(define (display-bitmap-resolution num fail)
-  (if (or (zero? num)
-          (num . < . (display-count)))
-      (->screen 1.0)
-      (fail)))
-
-(define mouse-frame #f)
-
-(define WS_EX_TOOLWINDOW        #x00000080)
-(define WS_EX_TOPMOST           #x00000008)
-(define WS_EX_WINDOWEDGE        #x00000100)
-(define WS_EX_PALETTEWINDOW     (bitwise-ior WS_EX_WINDOWEDGE 
-                                             WS_EX_TOOLWINDOW 
-                                             WS_EX_TOPMOST))
-
-(define-cstruct _WINDOWPLACEMENT
-  ([length _UINT]
-   [flags _UINT]
-   [showCmd _UINT]
-   [ptMinPosition _POINT]
-   [ptMaxPosition _POINT]
-   [rcNormalPosition _RECT]))
-
-(define-user32 GetWindowPlacement (_wfun _HWND _WINDOWPLACEMENT-pointer -> (r : _BOOL)
-                                         -> (unless r (failed 'GetWindowPlacement))))
-
-(define-user32 IsIconic (_fun _HWND -> _BOOL))
-
-(defclass frame% window%
-  (init parent
-	label
-	x y w h
-	style)
-  
-  (inherit get-hwnd 
-	   is-shown?
-	   get-eventspace
-           queue-on-size
-           pre-on-char pre-on-event
-           reset-cursor-in-child)
-
-  (define/public (create-frame parent label x y w h style)
-    (CreateWindowExW (if (memq 'float style)
-                         (bitwise-ior WS_EX_TOOLWINDOW
-                                      (if (memq 'no-caption style)
-                                          WS_EX_TOPMOST
-                                          WS_EX_PALETTEWINDOW))
-                         0)
-                     "PLTFrame"
-                     (if label label "")
-                     (bitwise-ior
-                      WS_POPUP
-                      (if (memq 'no-resize-border style)
-                          0
-                          (bitwise-ior WS_THICKFRAME
-                                       WS_BORDER
-                                       WS_MAXIMIZEBOX))
-                      (if (memq 'no-system-menu style)
-                          0
-                          WS_SYSMENU)
-                      (if (memq 'no-caption style)
-                          0
-                          (bitwise-ior WS_CAPTION
-                                       WS_MINIMIZEBOX)))
-                     (if x (->screen x) CW_USEDEFAULT)
-                     (if y (->screen y) CW_USEDEFAULT)
-                     (->screen w) (->screen h)
-                     #f
-                     #f
-                     hInstance
-                     #f))
-
-  (define saved-title (or label ""))
-  (define hidden-zoomed? #f)
-  (define float-without-caption? (and (memq 'float style)
-                                      (memq 'no-caption style)))
-
-  (define min-width #f)
-  (define min-height #f)
-  (define max-width #f)
-  (define max-height #f)
-
-  (super-new [parent #f]
-	     [hwnd (create-frame parent label x y w h style)]
-	     [style (cons 'deleted style)])
-
-  (define hwnd (get-hwnd))
-  (SetLayeredWindowAttributes hwnd 0 255 LWA_ALPHA)
-
-  ;; record delta between size and client size
-  ;; for getting the client size when the frame 
-  ;; is iconized:
-  (define-values (client-dw client-dh)
-    (let ([w (box 0)] [h (box 0)]
-          [cw (box 0)] [ch (box 0)])
-      (get-size w h)
-      (get-client-size cw ch)
-      (values (- (unbox w) (unbox cw)) 
-              (- (unbox h) (unbox  ch)))))
-
-  (define/public (is-dialog?) #f)
-
-  (define/override (show on?)
-    (let ([es (get-eventspace)])
-      (when on?
-        (when (eventspace-shutdown? es)
-          (error (string->symbol
-                  (format "show method in ~a"
-                          (if (is-dialog?)
-                              'dialog%
-                              'frame%)))
-                 "eventspace has been shutdown"))
-        (when saved-child
-          (if (eq? (current-thread) (eventspace-handler-thread es))
-              (do-paint-children)
-              (let ([s (make-semaphore)])
-                (queue-callback (lambda ()
-                                  (do-paint-children)
-                                  (semaphore-post s)))
-                (sync/timeout 1 s))))))
-    ;; calling `direct-show' instead of `show' avoids
-    ;;  calling `show-children':
-    (atomically (direct-show on?)))
-
-  (define/private (do-paint-children)
-    (when saved-child
-      (send saved-child paint-children)))
-
-  (define/override (direct-show on?)
-    ;; atomic mode
-    (when (eq? mouse-frame this) (set! mouse-frame #f))
-    (register-frame-shown this on?)
-    (when (and (not on?) (is-shown?))
-      (set! hidden-zoomed? (is-maximized?)))
-    (super direct-show on? (if hidden-zoomed?
-                               SW_SHOWMAXIMIZED
-                               (if float-without-caption?
-                                   SW_SHOWNOACTIVATE
-                                   SW_SHOW)))
-    (when (and on? (iconized?))
-      (ShowWindow hwnd SW_RESTORE))
-    (when on?
-      (unless float-without-caption?
-        (BringWindowToTop hwnd))))
-
-  (define/public (destroy)
-    (direct-show #f))
-
-  (define/private (stdret f d)
-    (if (is-dialog?) d f))
-
-  (define/override (wndproc w msg wParam lParam default)
-    (cond
-     [(= msg WM_CLOSE)
-      (unless (other-modal? this)
-        (queue-window-event this (lambda () 
-                                   (when (on-close)
-                                     (atomically
-                                      (direct-show #f))))))
-      0]
-     [(and (= msg WM_SIZE)
-           (not (= wParam SIZE_MINIMIZED)))
-      (queue-window-event this (lambda () (queue-on-size)))
-      ;; for live resize:
-      (constrained-reply (get-eventspace)
-			 (lambda ()
-			   (let loop () (pre-event-sync #t) (when (yield) (loop))))
-			 (void))
-      (stdret 0 1)]
-     [(= msg WM_MOVE)
-      (unless (iconized?)
-        (queue-window-event this (lambda () (queue-on-size))))
-      (stdret 0 1)]
-     [(= msg WM_ACTIVATE)
-      (let ([state (LOWORD wParam)]
-            [minimized (HIWORD wParam)])
-        (unless (not (zero? minimized))
-          (let ([on? (or (= state WA_ACTIVE)
-                         (= state WA_CLICKACTIVE))])
-            (when on? (set-frame-focus))
-            (queue-window-event this (lambda () (on-activate on?))))))
-      0]
-     [(and (= msg WM_COMMAND)
-           (zero? (HIWORD wParam)))
-      (let ([id (LOWORD wParam)])
-	(let ([item (id-to-menu-item id)])
-	  (when item (send item auto-check)))
-	(queue-window-event this (lambda () (on-menu-command id))))
-      0]
-     [(= msg WM_INITMENU)
-      (constrained-reply (get-eventspace)
-                         (lambda () (on-menu-click))
-                         (void))
-      0]
-     [(= msg WM_GETMINMAXINFO)
-      (let ([mmi (cast lParam _LPARAM _MINMAXINFO-pointer)])
-        (when (or max-width max-height)
-          (set-MINMAXINFO-ptMaxTrackSize!
-           mmi
-           (make-POINT (or (->screen max-width)
-                           (POINT-x (MINMAXINFO-ptMaxTrackSize mmi)))
-                       (or (->screen max-height)
-                           (POINT-y (MINMAXINFO-ptMaxTrackSize mmi))))))
-        (when (or min-width min-height)
-          (set-MINMAXINFO-ptMinTrackSize!
-           mmi
-           (make-POINT (or (->screen min-width)
-                           (POINT-x (MINMAXINFO-ptMinTrackSize mmi)))
-                       (or (->screen min-height)
-                           (POINT-y (MINMAXINFO-ptMinTrackSize mmi)))))))
-      0]
-     [(= msg WM_DISPLAYCHANGE)
-      (parameterize ([current-eventspace (get-eventspace)])
-        (queue-callback (lambda () (display-changed))))
-      0]
-     [else
-      (super wndproc w msg wParam lParam default)]))
-
-  (define/override (try-nc-mouse w msg wParam lParam)
-    #f)
-
-  (define/override (set-size x y w h)
-    (unless (and (= w -1) (= h -1))
-      (maximize #f))
-    (super set-size x y w h))
-
-  (define/public (on-close) #t)
-
-  (define/override (is-shown-to-root?)
-    (is-shown?))
-  (define/override (is-enabled-to-root?)
-    #t)
-
-  (define/public (on-toolbar-click) (void))
-  (define/public (on-menu-click) (void))
-
-  (define/public (on-menu-command i) (void))
-
-  (def/public-unimplemented on-mdi-activate)
-
-  (define/public (enforce-size min-x min-y max-x max-y step-x step-y)
-    (set! min-width (max 1 min-x))
-    (set! min-height (max 1 min-y))
-    (set! max-width (and (positive? max-x) max-x))
-    (set! max-height (and (positive? max-y) max-y)))
-
-  (define focus-window-path #f)
-  (define/override (not-focus-child v)
-    (when (and focus-window-path
-               (memq v focus-window-path))
-      (set! focus-window-path #f)))
-  (define/override (set-top-focus win win-path child-hwnd)
-    (set! focus-window-path (cons this win-path))
-    (when (ptr-equal? hwnd (GetActiveWindow))
-      (void (SetFocus child-hwnd))))
-
-  (define/private (set-frame-focus)
-    (let ([p focus-window-path])
-      (when (pair? p)
-        (SetFocus (send (last p) get-focus-hwnd)))))
-
-  (define/public (get-focus-window [even-if-not-active? #f])
-    (let ([p focus-window-path])
-      (and (pair? p)
-           (or even-if-not-active?
-               (ptr-equal? hwnd (GetActiveWindow)))
-           (last p))))
-
-  (define/override (can-accept-focus?)
-    #f)
-  (define/override (child-can-accept-focus?)
-    #t)
-
-  (define/public (on-activate on?) (void))
-
-  (define/override (call-pre-on-event w e)
-    (pre-on-event w e))
-  (define/override (call-pre-on-char w e)
-    (pre-on-char w e))
-
-  (define modal-enabled? #t)
-  (define otherwise-enabled? #t)
-  (define/public (modal-enable ignoring)
-    (define on? (not (other-modal? this #f ignoring)))
-    (unless (eq? modal-enabled? on?)
-      (set! modal-enabled? on?)
-      (update-enabled)))
-  (define/override (internal-enable on?)
-    (set! otherwise-enabled? on?)
-    (update-enabled))
-  (define/private (update-enabled)
-    (super internal-enable (and modal-enabled? otherwise-enabled?)))
-
-  (define/override (generate-parent-mouse-ins mk)
-    ;; assert: in-window is always the panel child
-    (unless (eq? mouse-frame this)
-      (when mouse-frame
-        (let ([win mouse-frame])
-          (set! mouse-frame #f)
-          (send win send-leaves mk)))
-      (set! mouse-frame this))
-    #f)
-
-  (define/override (send-child-leaves mk)
-    (if (eq? mouse-frame this)
-        (if saved-child
-            (send saved-child send-leaves mk)
-            #f)
-        #f))
-
-  (define/override (reset-cursor default)
-    (if wait-cursor-on?
-        (void (SetCursor (get-wait-cursor)))
-        (when saved-child
-          (reset-cursor-in-child saved-child default))))
-  
-  (define/override (refresh-all-children)
-    (when saved-child
-      (send saved-child refresh)))
-
-  (define/override (get-dialog-level) 0)
-
-  (define/public (frame-relative-dialog-status win) 
-    #f)
-
-  (define wait-cursor-on? #f)
-  (define/public (set-wait-cursor-mode on?)
-    (set! wait-cursor-on? on?)
-    (when (eq? mouse-frame this)
-      (if on?
-          (void (SetCursor (get-wait-cursor)))
-          (reset-cursor (get-arrow-cursor)))))
-  (define/public (is-wait-cursor-on?)
-    wait-cursor-on?)
-
-  (define/override (center mode wrt)
-    (let ([sw (box 0)]
-          [sh (box 0)]
-          [w (box 0)]
-          [h (box 0)]
-          [x (box 0)]
-          [y (box 0)]
-	  [ww (box 0)]
-	  [wh (box 0)]
-	  [wx (box 0)]
-	  [wy (box 0)])
-      (display-size sw sh #f 0 void)
-      (if wrt
-	  (begin
-	    (send wrt get-size ww wh)
-	    (set-box! wx (send wrt get-x))
-	    (set-box! wy (send wrt get-y)))
-	  (begin
-	    (set-box! ww (unbox sw))
-	    (set-box! wh (unbox sh))))
-      (get-size w h)
-      (MoveWindow hwnd
-		  (->screen
-		   (if (or (eq? mode 'both)
-			   (eq? mode 'horizontal))
-		       (max 0 
-			    (min (- (unbox sw) (unbox w))
-				 (+ (quotient (- (unbox ww) (unbox w)) 2) 
-				    (unbox wx))))
-		       (get-x)))
-		  (->screen
-		   (if (or (eq? mode 'both)
-			   (eq? mode 'vertical))
-		       (max 0
-			    (min (- (unbox sh) (unbox h))
-				 (+ (quotient (- (unbox wh) (unbox h)) 2) 
-				    (unbox wy))))
-		       (get-x)))
-                  (->screen (unbox w))
-                  (->screen (unbox h))
-                  #t)))
-
-  (define saved-child #f)
-  (define/override (register-child child on?)
-    (unless on? (error 'register-child-in-frame "did not expect #f"))
-    (unless (or (not saved-child) (eq? child saved-child))
-      (error 'register-child-in-frame "expected only one child"))
-    (set! saved-child child)
-    (send child set-arrow-cursor))
-  (define/override (register-child-in-parent on?)
-    (void))
-
-  (define/override (get-top-frame) this)
-
-  (define/public (designate-root-frame) (void))
-
-  (define modified? #f)
-  (define/public (set-modified on?)
-    (unless (eq? modified? (and on? #t))
-      (set! modified? (and on? #t))
-      (set-title saved-title)))
-
-  (define/public (is-maximized?)
-    (if (is-shown?)
-        (IsZoomed hwnd)
-        hidden-zoomed?))
-  
-  (define/public (maximize on?)
-    (if (is-shown?)
-        (ShowWindow hwnd (if on?
-                             SW_MAXIMIZE
-                             SW_RESTORE))
-        (set! hidden-zoomed? (and on? #t))))
-    
-  (define/public (iconized?)
-    (IsIconic hwnd))
-
-  (define/public (iconize on?)
-    (when (is-shown?)
-      (unless (eq? (and on? #t) (iconized?))
-        (ShowWindow hwnd (if on? SW_MINIMIZE SW_RESTORE)))))
-
-  (define/public (fullscreened?) #f)
-  (define/public (fullscreen on?) (void))
-
-  (define/private (get-placement)
-    (let ([wp (make-WINDOWPLACEMENT 
-               (ctype-sizeof _WINDOWPLACEMENT)
-               0
-               0
-               (make-POINT 0 0)
-               (make-POINT 0 0)
-               (make-RECT 0 0 0 0))])
-      (GetWindowPlacement hwnd wp)
-      wp))
-
-  (define/override (get-size w h)
-    (if (iconized?)
-        (let ([wp (get-placement)])
-          (let ([r (WINDOWPLACEMENT-rcNormalPosition wp)])
-            (set-box! w (->normal (- (RECT-right r) (RECT-left r))))
-            (set-box! h (->normal (- (RECT-bottom r) (RECT-top r))))))
-        (super get-size w h)))
-
-  (define/override (get-client-size w h)
-    (if (iconized?)
-        (begin
-          (get-size w h)
-          (set-box! w (max 1 (- (unbox w) client-dw)))
-          (set-box! h (max 1 (- (unbox h) client-dh))))
-        (super get-client-size w h)))
-
-  (define/override (get-x)
-    (if (iconized?)
-        (let ([wp (get-placement)])
-          (->normal (RECT-left (WINDOWPLACEMENT-rcNormalPosition wp))))
-        (->normal (RECT-left (GetWindowRect hwnd)))))
-
-  (define/override (get-y)
-    (if (iconized?)
-        (let ([wp (get-placement)])
-          (->normal (RECT-top (WINDOWPLACEMENT-rcNormalPosition wp))))
-        (->normal (RECT-top (GetWindowRect hwnd)))))
-
-  (define/override (get-width)
-    (if (iconized?)
-        (let ([w (box 0)])
-          (get-size w (box 0))
-          (unbox w))
-        (super get-width)))
-
-  (define/override (get-height)
-    (if (iconized?)
-        (let ([h (box 0)])
-          (get-size (box 0) h)
-          (unbox h))
-        (super get-height)))
-
-  (def/public-unimplemented get-menu-bar)
-
-  (define menu-bar #f)
-  (define/public (set-menu-bar mb)
-    (atomically
-     (set! menu-bar mb)
-     (send mb set-parent this)))
-
-  (define/public (draw-menu-bar)
-    (DrawMenuBar hwnd))
-  
-  (define/override (is-frame?) #t)
-
-  ;; Retain to aviod GC of the icon:
-  (define small-hicon #f)
-  (define big-hicon #f)
-
-  (define/public (set-icon bm [mask #f] [mode 'both])
-    (let* ([bg-hbitmap
-            (let* ([bm (make-object bitmap% (send bm get-width) (send bm get-height))]
-                   [dc (make-object bitmap-dc% bm)])
-              (send dc set-brush "black" 'solid)
-              (send dc draw-rectangle 0 0 (send bm get-width) (send bm get-height))
-              (send dc set-bitmap #f)
-              (bitmap->hbitmap bm #:b&w? #t))]
-           [main-hbitmap (bitmap->hbitmap bm #:mask mask)]
-           [hicon (CreateIconIndirect
-                   (make-ICONINFO
-                    #t 0 0
-                    bg-hbitmap
-                    main-hbitmap))])
-      (DeleteObject bg-hbitmap)
-      (DeleteObject main-hbitmap)
-      (when (or (eq? mode 'small)
-                (eq? mode 'both))
-        (atomically
-         (set! small-hicon hicon)
-         (SendMessageW hwnd WM_SETICON 0 (cast hicon _HICON _LPARAM))))
-      (when (or (eq? mode 'big)
-                (eq? mode 'both))
-        (atomically
-         (set! big-hicon hicon)
-         (SendMessageW hwnd WM_SETICON 1 (cast hicon _HICON _LPARAM))))))
-
-  (define/public (set-title s)
-    (atomically
-     (set! saved-title s)
-     (SetWindowTextW (get-hwnd) (string-append s (if modified? "*" "")))))
-
-  (define/public (popup-menu-with-char c)
-    (DefWindowProcW hwnd WM_SYSKEYDOWN (char->integer c) (arithmetic-shift 1 29))
-    (DefWindowProcW hwnd WM_SYSCHAR (char->integer c) (arithmetic-shift 1 29)))
-
-  (define/public (system-menu)
-    (popup-menu-with-char #\space))
-
-  (define/public (display-changed) (void)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/gauge.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/gauge.rkt
deleted file mode 100644
index 86479fc09c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/gauge.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-          "../../syntax.rkt"
-          "../common/event.rkt"
-         "item.rkt"
-	 "utils.rkt"
-	 "const.rkt"
-	 "window.rkt"
-	 "wndclass.rkt"
-         "types.rkt")
-
-(provide
- (protect-out gauge%))
-
-(define PBS_VERTICAL #x04)
-(define PBM_SETRANGE (+ WM_USER 1))
-(define PBM_SETPOS (+ WM_USER 2))
-(define PBM_GETRANGE (+ WM_USER 7));wParam = return (TRUE ? low : high). lParam = PPBRANGE or NULL
-(define PBM_GETPOS (+ WM_USER 8))
-
-(define gauge%
-  (class item%
-    (inherit set-size)
-
-    (init parent
-          label
-          rng
-          x y w h
-          style
-          font)
-
-    (define hwnd
-      (CreateWindowExW/control 0
-                               "PLTmsctls_progress32"
-                               label
-                               (bitwise-ior WS_CHILD WS_CLIPSIBLINGS
-                                            (if (memq 'vertical style)
-                                                PBS_VERTICAL
-                                                0))
-                               0 0 0 0
-                               (send parent get-content-hwnd)
-                               #f
-                               hInstance
-                               #f))
-
-    (super-new [callback void]
-               [parent parent]
-               [hwnd hwnd]
-               [style style])
-
-    (set-range rng)
-
-    (if (memq 'horizontal style)
-        (set-size #f #f 100 24)
-        (set-size #f #f 24 100))
-
-    (define/override (size->screen v) (->screen* v))
-
-    (define/public (get-value)
-      (SendMessageW hwnd PBM_GETPOS 0 0))
-    (define/public (set-value v)
-      (void (SendMessageW hwnd PBM_SETPOS v 0)))
-    (define/public (get-range)
-      (SendMessageW hwnd PBM_GETRANGE 0 0))
-    (define/public (set-range v)
-      (void (SendMessageW hwnd PBM_SETRANGE 0 (MAKELPARAM 0 v))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/gcwin.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/gcwin.rkt
deleted file mode 100644
index 1fde4f6e9f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/gcwin.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "wndclass.rkt")
-
-(provide 
- (protect-out scheme_add_gc_callback
-              scheme_remove_gc_callback
-              create-gc-dc
-              make-gc-show-desc
-              make-gc-hide-desc))
-
-(define-mz scheme_add_gc_callback (_fun _racket _racket -> _racket))
-(define-mz scheme_remove_gc_callback (_fun _racket -> _void))
-
-(define-gdi32 BitBlt/raw _fpointer
-  #;
-  (_wfun _HDC _int _int _int _int _HDC _int _int _DWORD -> _BOOL)
-  #:c-id BitBlt)
-(define-gdi32 SelectObject/raw _fpointer
-  #:c-id SelectObject)
-
-(define SRCCOPY #x00CC0020)
-
-(define blit-hdc (CreateCompatibleDC #f))
-
-(define (create-gc-dc hwnd)
-  (GetDC hwnd))
-
-(define (make-draw hdc hbitmap x y w h)
-  (vector
-   (vector 'osapi_ptr_ptr->void SelectObject/raw blit-hdc hbitmap)
-   (vector 'osapi_ptr_int_int_int_int_ptr_int_int_long->void
-           BitBlt/raw hdc (->screen x) (->screen y) (->screen w) (->screen h) blit-hdc 0 0 SRCCOPY)
-   (vector 'ptr_ptr->void SelectObject/raw blit-hdc #f)))
-
-(define (make-gc-show-desc hdc hbitmap x y w h)
-  (make-draw hdc hbitmap x y w h))
-
-(define (make-gc-hide-desc hdc hbitmap x y w h)
-  (make-draw hdc hbitmap x y w h))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/gl-context.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/gl-context.rkt
deleted file mode 100644
index b79981677f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/gl-context.rkt
+++ /dev/null
@@ -1,289 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/define
-         ffi/unsafe/alloc
-         racket/draw/private/gl-config
-         (prefix-in draw: racket/draw/private/gl-context)
-	 "../../lock.rkt"
-	 "wndclass.rkt"
-	 "const.rkt"
-         "types.rkt"
-         "utils.rkt")
-
-(provide
- (protect-out create-gl-context))
-
-(define opengl32-lib (ffi-lib "opengl32.dll"))
-
-(define-ffi-definer define-opengl32 opengl32-lib)
-
-(define _HGLRC (_cpointer/null 'HGLRC))
-
-(define-cstruct _PIXELFORMATDESCRIPTOR
-  ([nSize _WORD]
-   [nVersion _WORD]
-   [dwFlags _DWORD]
-   [iPixelType _BYTE]
-   [cColorBits _BYTE]
-   [cRedBits _BYTE]
-   [cRedShift _BYTE]
-   [cGreenBits _BYTE]
-   [cGreenShift _BYTE]
-   [cBlueBits _BYTE]
-   [cBlueShift _BYTE]
-   [cAlphaBits _BYTE]
-   [cAlphaShift _BYTE]
-   [cAccumBits _BYTE]
-   [cAccumRedBits _BYTE]
-   [cAccumGreenBits _BYTE]
-   [cAccumBlueBits _BYTE]
-   [cAccumAlphaBits _BYTE]
-   [cDepthBits _BYTE]
-   [cStencilBits _BYTE]
-   [cAuxBuffers _BYTE]
-   [iLayerType _BYTE]
-   [bReserved _BYTE]
-   [dwLayerMask _DWORD]
-   [dwVisibleMask _DWORD]
-   [dwDamageMask _DWORD]))
-
-(define-gdi32 ChoosePixelFormat (_wfun _HDC _PIXELFORMATDESCRIPTOR-pointer -> _int))
-(define-gdi32 SetPixelFormat (_wfun _HDC _int _PIXELFORMATDESCRIPTOR-pointer -> _BOOL))
-(define-gdi32 DescribePixelFormat (_wfun _HDC _int _UINT _PIXELFORMATDESCRIPTOR-pointer -> (r : _int)
-                                         -> (if (zero? r)
-                                                (failed 'DescribePixelFormat)
-                                                r)))
-(define-gdi32 SwapBuffers (_wfun _HDC -> _BOOL))
-
-(define-opengl32 wglDeleteContext (_wfun _HGLRC -> (r : _BOOL)
-                                         -> (unless r (failed 'wglDeleteContext)))
-  #:wrap (deallocator))
-(define-opengl32 wglCreateContext (_wfun _HDC -> _HGLRC)
-  #:wrap (allocator wglDeleteContext))
-
-(define-opengl32 wglMakeCurrent (_wfun _HDC _HGLRC -> _BOOL))
-(define-opengl32 wglGetCurrentContext (_wfun -> _HGLRC))
-(define-opengl32 wglGetCurrentDC (_wfun -> _HDC))
-
-(define-opengl32 wglGetProcAddress (_wfun _string -> _fpointer))
-
-(define tried-multisample? #f)
-(define wglChoosePixelFormatARB #f)
-
-(define looked-for-createcontextattribs? #f)
-(define wglCreateContextAttribsARB #f)
-
-;; ----------------------------------------
-
-(define gl-context% 
-  (class draw:gl-context%
-    (init-field [hglrc hglrc]
-                [hdc hdc])
-
-    (define/override (get-handle) hglrc)
-
-    (define/override (draw:do-call-as-current t)
-      (dynamic-wind
-          (lambda ()
-            (wglMakeCurrent hdc hglrc))
-	  t
-          (lambda ()
-            (wglMakeCurrent #f #f))))
-        
-    (define/override (draw:do-swap-buffers)
-      (SwapBuffers hdc))
-    
-    (super-new)))
-
-(define (call-with-context hdc hglrc f)
-  (atomically
-   (let ([old-hdc (wglGetCurrentDC)]
-	 [old-hglrc (wglGetCurrentContext)])
-     (dynamic-wind
-	 (lambda ()
-	   (wglMakeCurrent hdc hglrc))
-	 f
-	 (lambda ()
-	   (wglMakeCurrent old-hdc old-hglrc))))))
-
-;; ----------------------------------------
-
-(define PFD_DOUBLEBUFFER            #x00000001)
-(define PFD_STEREO                  #x00000002)
-(define PFD_DRAW_TO_WINDOW          #x00000004)
-(define PFD_DRAW_TO_BITMAP          #x00000008)
-(define PFD_SUPPORT_GDI             #x00000010)
-(define PFD_SUPPORT_OPENGL          #x00000020)
-(define PFD_NEED_PALETTE            #x00000080)
-(define PFD_NEED_SYSTEM_PALETTE     #x00000100)
-(define PFD_GENERIC_ACCELERATED     #x00001000)
-(define PFD_TYPE_RGBA    0)
-(define PFD_MAIN_PLANE   0)
-
-(define (create-gl-context hdc config offscreen? 
-                           #:try-ms? [try-ms? (not offscreen?)])
-  (when try-ms? (unless tried-multisample? (init-multisample! config)))
-  (unless looked-for-createcontextattribs? (init-createcontextattribs! config))
-  (let* ([config (or config (new gl-config%))]
-         [accum (send config get-accum-size)]
-         [pfd
-          (make-PIXELFORMATDESCRIPTOR
-           (ctype-sizeof _PIXELFORMATDESCRIPTOR)
-           1 ; version
-           (bitwise-ior
-            PFD_SUPPORT_OPENGL
-            (if (send config get-stereo) PFD_STEREO 0)
-            (if (and (not offscreen?) 
-                     (send config get-double-buffered))
-                PFD_DOUBLEBUFFER
-                0)
-            (if offscreen?
-                (bitwise-ior PFD_DRAW_TO_BITMAP
-                             PFD_SUPPORT_GDI)
-                (bitwise-ior PFD_DRAW_TO_WINDOW)))
-           PFD_TYPE_RGBA ; color type
-           (if offscreen? 32 24) ; preferred color depth
-           0 0 0 0 0 0 ; color bits (ignored)
-           0 ; no alpha buffer
-           0 ; alpha bits (ignored)
-           (* 4 accum) ; no accumulation buffer
-           accum accum accum accum ; accum bits
-           (if offscreen? 32 (send config get-depth-size)) ; depth buffer
-           (send config get-stencil-size) ; stencil buffer
-           0 ; no auxiliary buffers
-           PFD_MAIN_PLANE ; main layer
-           0 ; reserved 
-           0 0 0 ; no layer, visible, damage masks
-           )]
-         [ms (send config get-multisample-size)]
-         [pixelFormat (or
-		       (and try-ms?
-			    wglChoosePixelFormatARB 
-			    (or (choose-multisample hdc config offscreen? ms)
-				(choose-multisample hdc config offscreen? 2)))
-		       (ChoosePixelFormat hdc pfd))]
-         [share-context (send config get-share-context)]
-         [context-handle (if share-context (send share-context get-handle) #f)])
-    (and (not (zero? pixelFormat))
-	 (and (SetPixelFormat hdc pixelFormat pfd)
-	      (begin
-		(DescribePixelFormat hdc pixelFormat (ctype-sizeof _PIXELFORMATDESCRIPTOR) pfd)
-		(when (not (zero? (bitwise-and (PIXELFORMATDESCRIPTOR-dwFlags pfd)
-					       PFD_NEED_PALETTE)))
-		      (log-error "don't know how to create a GL palette, yet"))
-		(let ([hglrc (if wglCreateContextAttribsARB
-                                 (wglCreateContextAttribsARB hdc context-handle (vector 0))
-                                 (wglCreateContext hdc))])
-		  (and hglrc
-		       (new gl-context% [hglrc hglrc] [hdc hdc]))))))))
-
-(define (with-dummy-context config thunk)
-  ;; To create a gl context, we need a separate window 
-  ;; (because you can't change a window's pixel format
-  ;; after it is set).
-  ;; So, create a dummy window to make a context to
-  ;; try to do whatever needs doing.
-  (let ([hwnd (CreateWindowExW 0
-			       "PLTFrame"
-			       ""
-			       WS_POPUP
-			       0 0 1 1
-			       #f
-			       #f
-			       hInstance
-			       #f)])
-    (when hwnd
-      (let ([hdc (GetDC hwnd)])
-	(let ([c (create-gl-context hdc config #f #:try-ms? #f)])
-	  (when c
-	    (call-with-context
-	     (get-field hdc c)
-	     (get-field hglrc c)
-             thunk)))
-        (ReleaseDC hwnd hdc)))))
-
-(define (init-createcontextattribs! config)
-  ;; look for wglCreateContextAttribsARB which is a beefed
-  ;; up version of wglCreateContext
-  (set! looked-for-createcontextattribs? #t)
-  (with-dummy-context config
-    (lambda ()
-      (set! wglCreateContextAttribsARB
-            (let ([f (wglGetProcAddress "wglCreateContextAttribsARB")])
-              (and f
-                   ((allocator wglDeleteContext)
-                    (function-ptr f (_wfun _HDC
-                                           _HGLRC
-                                           (_vector i _int)
-                                           -> _HGLRC)))))))))
-
-(define (init-multisample! config)
-  ;; To create a multisampled context, we need
-  ;; wglChoosePixelFormatARB().
-  ;; To look up wglChoosePixelFormatARB(), we need
-  ;; an existing gl context.
-  (with-dummy-context config
-    (lambda ()
-      (set! wglChoosePixelFormatARB
-            (let ([f (wglGetProcAddress "wglChoosePixelFormatARB")])
-              (and f
-                   (function-ptr f (_wfun _HDC 
-                                          (_vector i _int)
-                                          (_vector i _float)
-                                          (_UINT  = 1)
-                                          (formats : (_ptr o _int))
-                                          (num-formats : (_ptr o _UINT))
-                                          -> (r : _BOOL)
-                                          -> (and r formats))))))
-      (set! tried-multisample? #t))))
-
-(define GL_TRUE 1)
-(define GL_FALSE 0)
-(define WGL_DRAW_TO_WINDOW_ARB    #x2001)
-(define WGL_DRAW_TO_BITMAP_ARB    #x2002)
-(define WGL_SUPPORT_OPENGL_ARB    #x2010)
-(define WGL_ACCELERATION_ARB      #x2003)
-(define WGL_FULL_ACCELERATION_ARB #x2027)
-(define WGL_COLOR_BITS_ARB        #x2014)
-(define WGL_ALPHA_BITS_ARB        #x201B)
-(define WGL_DEPTH_BITS_ARB        #x2022)
-(define WGL_STENCIL_BITS_ARB      #x2023)
-(define WGL_DOUBLE_BUFFER_ARB     #x2011)
-(define WGL_SAMPLE_BUFFERS_ARB    #x2041)
-(define WGL_SAMPLES_ARB           #x2042)
-
-;; The multisampling substitute for ChoosePixelFormat:
-(define (choose-multisample hdc config offscreen? ms)
-  (and 
-   wglChoosePixelFormatARB 
-   (wglChoosePixelFormatARB 
-    hdc
-    (vector (if offscreen?
-		WGL_DRAW_TO_BITMAP_ARB
-		WGL_DRAW_TO_WINDOW_ARB)
-	    GL_TRUE
-	    WGL_SUPPORT_OPENGL_ARB
-	    GL_TRUE
-	    WGL_ACCELERATION_ARB
-	    WGL_FULL_ACCELERATION_ARB
-	    WGL_COLOR_BITS_ARB
-	    24
-	    WGL_ALPHA_BITS_ARB
-	    8
-	    WGL_DEPTH_BITS_ARB
-	    (send config get-depth-size) ; 32 for offscreen?
-	    WGL_STENCIL_BITS_ARB
-	    (send config get-stencil-size)
-	    WGL_DOUBLE_BUFFER_ARB
-	    (if (and (not offscreen?)
-		     (send config get-double-buffered))
-		GL_TRUE
-		GL_FALSE)
-	    WGL_SAMPLE_BUFFERS_ARB
-	    GL_TRUE
-	    WGL_SAMPLES_ARB
-	    ms
-	    0
-	    0)
-    (vector 0.0 0.0))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/group-panel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/group-panel.rkt
deleted file mode 100644
index fb1fa128ce..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/group-panel.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         "../../syntax.rkt"
-         "../common/event.rkt"
-         "item.rkt"
-	 "utils.rkt"
-	 "const.rkt"
-	 "window.rkt"
-	 "panel.rkt"
-	 "wndclass.rkt"
-         "types.rkt")
-
-(provide
- (protect-out group-panel%))
-
-
-(define group-panel% 
-  (class (item-mixin (panel-mixin window%))
-    (init parent
-          x y w h
-          style
-          label)
-
-    (inherit auto-size set-control-font)
-
-    (define hwnd
-      (CreateWindowExW/control 0
-                               "PLTBUTTON"
-                               (or label "")
-                               (bitwise-ior BS_GROUPBOX WS_CHILD WS_CLIPSIBLINGS)
-                               0 0 0 0
-                               (send parent get-client-hwnd)
-                               #f
-                               hInstance
-                               #f))
-
-    (define client-hwnd
-      (CreateWindowExW 0
-                       "PLTTabPanel"
-                       #f
-                       (bitwise-ior WS_CHILD WS_VISIBLE)
-                       0 0 (->screen w) (->screen h)
-                       hwnd
-                       #f
-                       hInstance
-                       #f))
-
-    (super-new [callback void]
-               [parent parent]
-               [hwnd hwnd]
-               [extra-hwnds (list client-hwnd)]
-               [style style])
-
-    (define/override (get-client-hwnd)
-      client-hwnd)
-
-    (define label-h 0)
-    
-    (set-control-font #f)
-    (auto-size #f label 0 0 0 0
-               (lambda (w h)
-                 (set! label-h h)
-                 (set-size #f #f (+ w 10) (+ h 10))))
-
-    (define/public (set-label lbl)
-      (SetWindowTextW hwnd lbl))
-    
-    (define/override (set-size x y w h)
-      (super set-size x y w h)
-      (unless (or (= w -1) (= h -1))
-        (MoveWindow client-hwnd (->screen 3) (->screen (+ label-h 3))
-		    (->screen (- w 6)) (->screen (- h label-h 6)) #t)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/hbitmap.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/hbitmap.rkt
deleted file mode 100644
index 560295e8eb..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/hbitmap.rkt
+++ /dev/null
@@ -1,120 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/draw/unsafe/cairo
-         racket/draw
-         racket/draw/private/local
-         racket/class
-	 "dc.rkt"
-         "types.rkt"
-         "utils.rkt"
-         "const.rkt")
-
-(provide
- (protect-out bitmap->hbitmap
-              hbitmap->bitmap))
-
-(define (bitmap->hbitmap bm 
-                         #:mask [mask-bm #f]
-                         #:b&w? [b&w? #f] 
-                         #:bg [bg (GetSysColor COLOR_BTNFACE)])
-  (let* ([w (send bm get-width)]
-         [h (send bm get-height)]
-	 [bm (if (bm . is-a? . win32-bitmap%)
-		 ;; Windows wants to use the result bitmap
-		 ;; as an ARGB bitmap, but Cairo seems to transfer
-		 ;; RGB win32 bitmaps to RGB win32 bitmaps in a
-		 ;; way that sometimes mangles the alpha; avoid the
-		 ;; problem by first copying to a Cairo memory bitmap.
-		 (let* ([new-b (make-object bitmap% w h #f #f (send bm get-backing-scale))]
-			[dc (make-object bitmap-dc% new-b)])
-		   (send dc draw-bitmap bm 0 0)
-		   (send dc set-bitmap #f)
-		   new-b)
-		 bm)]
-         [mask-bm (or mask-bm
-                      (send bm get-loaded-mask))]
-         [to-frac (lambda (v) (/ v 255.0))]
-         [screen-hdc (GetDC #f)]
-         [hdc (CreateCompatibleDC screen-hdc)]
-	 [sc (->screen 1.0)]
-	 [scaled (lambda (v) (inexact->exact (ceiling (* v sc))))]
-         [hbitmap (if b&w?
-                      (CreateBitmap w h 1 1 #f)
-                      (CreateCompatibleBitmap screen-hdc (scaled w) (scaled h)))]
-         [old-hbitmap (SelectObject hdc hbitmap)])
-    (ReleaseDC #f screen-hdc)
-    (let* ([s (cairo_win32_surface_create hdc)]
-           [cr (cairo_create s)])
-      (cairo_surface_destroy s)
-      (unless (= sc 1)
-	(cairo_scale cr sc sc))
-      (cairo_set_source_rgba cr 
-                             (to-frac (GetRValue bg))
-                             (to-frac (GetGValue bg))
-                             (to-frac (GetBValue bg))
-                             1.0)
-      (cairo_paint cr)
-      (let ([mask-p (and mask-bm
-                         (cairo_pattern_create_for_surface 
-                          (send mask-bm get-cairo-alpha-surface)))])
-        (let ([p (cairo_get_source cr)])
-          (cairo_pattern_reference p)
-          (cairo_set_source_surface cr (send bm get-cairo-surface) 0 0)
-          (let ([sc (send bm get-cairo-device-scale)])
-            (unless (= sc 1)
-              (let ([m (make-cairo_matrix_t 0.0 0.0 0.0 0.0 0.0 0.0)])
-                (cairo_matrix_init_translate m 0 0)
-                (cairo_matrix_scale m sc sc)
-                (cairo_pattern_set_matrix (cairo_get_source cr) m))))
-          (if mask-p
-              (cairo_mask cr mask-p)
-              (begin
-                (cairo_new_path cr)
-                (cairo_rectangle cr 0 0 w h)
-                (cairo_fill cr)))
-          (when mask-p
-            (cairo_pattern_destroy mask-p))
-          (cairo_set_source cr p)
-          (cairo_pattern_destroy p)))
-      (cairo_destroy cr)
-      (SelectObject hdc old-hbitmap)
-      (DeleteDC hdc)
-      hbitmap)))
-
-(define-cstruct _BITMAP
-  ([bmType _LONG]
-   [bmWidth _LONG]
-   [bmHeight _LONG]
-   [bmWidthBytes _LONG]
-   [bmPlanes _WORD]
-   [bmBitsPixel _WORD]
-   [bmBits _pointer]))
-
-(define-gdi32 GetObjectW (_wfun _pointer _int _pointer -> (r : _int)
-                                -> (when (zero? r) (failed 'GetObject))))
-
-(define (hbitmap->bitmap hbitmap)
-  (let* ([bmi (let ([b (make-BITMAP 0 0 0 0 0 0 #f)])
-                (GetObjectW hbitmap (ctype-sizeof _BITMAP) b)
-                b)]
-         [w (BITMAP-bmWidth bmi)]
-         [h (BITMAP-bmHeight bmi)]
-         [screen-hdc (GetDC #f)]
-         [hdc (CreateCompatibleDC screen-hdc)]
-         [old-hbitmap (SelectObject hdc hbitmap)]
-         [bm (make-object bitmap% w h (= 1 (BITMAP-bmBitsPixel bmi)) #t)])
-    (ReleaseDC #f screen-hdc)
-    (let* ([s (cairo_win32_surface_create hdc)]
-           [cr (cairo_create (send bm get-cairo-surface))])
-      (let ([p (cairo_get_source cr)])
-        (cairo_pattern_reference p)
-        (cairo_set_source_surface cr s 0 0)
-        (cairo_new_path cr)
-        (cairo_rectangle cr 0 0 w h)
-        (cairo_fill cr)
-        (cairo_set_source cr p)
-        (cairo_pattern_destroy p))
-      (cairo_destroy cr)
-      (SelectObject hdc old-hbitmap)
-      (DeleteDC hdc)
-      bm)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/icons.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/icons.rkt
deleted file mode 100644
index 161252c358..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/icons.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-	 "types.rkt"
-	 "utils.rkt")
-
-(provide (protect-out (all-defined-out)))
-
-(define-user32 LoadCursorW (_wfun _HINSTANCE _intptr -> _HCURSOR))
-(define-user32 LoadIconW (_wfun _HINSTANCE _intptr -> _HICON))
-
-(define (MAKEINTRESOURCE n) n)
-
-(define IDI_APPLICATION     (MAKEINTRESOURCE 32512))
-(define IDI_HAND            (MAKEINTRESOURCE 32513))
-(define IDI_QUESTION        (MAKEINTRESOURCE 32514))
-(define IDI_EXCLAMATION     (MAKEINTRESOURCE 32515))
-(define IDI_WINLOGO         (MAKEINTRESOURCE 32517))
-(define IDI_WARNING         IDI_EXCLAMATION)
-(define IDI_ERROR           IDI_HAND)
-
-(define IDC_ARROW           (MAKEINTRESOURCE 32512))
-(define IDC_CROSS           (MAKEINTRESOURCE 32515))
-(define IDC_HAND            (MAKEINTRESOURCE 32649))
-(define IDC_IBEAM           (MAKEINTRESOURCE 32513))
-(define IDC_WAIT            (MAKEINTRESOURCE 32514))
-(define IDC_APPSTARTING     (MAKEINTRESOURCE 32650))
-(define IDC_UPARROW         (MAKEINTRESOURCE 32516))
-(define IDC_SIZENWSE        (MAKEINTRESOURCE 32642))
-(define IDC_SIZENESW        (MAKEINTRESOURCE 32643))
-(define IDC_SIZEWE          (MAKEINTRESOURCE 32644))
-(define IDC_SIZENS          (MAKEINTRESOURCE 32645))
-(define IDC_SIZEALL         (MAKEINTRESOURCE 32646))
-(define IDC_NO              (MAKEINTRESOURCE 32648))
-(define IDC_HELP            (MAKEINTRESOURCE 32651))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/init.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/init.rkt
deleted file mode 100644
index f0c23c10a9..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/init.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-;; Registers the window class:
-(require "wndclass.rkt"
-         "queue.rkt")
-
-(define pump-thread (win32-start-event-pump))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/item.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/item.rkt
deleted file mode 100644
index 5fedef7d8a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/item.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         ffi/unsafe
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "../common/event.rkt"
-	 "utils.rkt"
-	 "const.rkt"
-	 "window.rkt"
-	 "wndclass.rkt"
-         "hbitmap.rkt"
-         "types.rkt")
-
-(provide
- (protect-out item-mixin
-              item%))
-
-(define (item-mixin %)
-  (class %
-    (inherit on-set-focus
-             on-kill-focus
-             wndproc)
-
-    (init-field [callback void])
-    (define/public (command e)
-      (callback this e))
-
-    (super-new)
-    
-    (define/public (ctlproc w msg wParam lParam default)
-     (cond
-      [(= msg WM_SETFOCUS)
-       (queue-window-event this (lambda () (on-set-focus)))
-       (default w msg wParam lParam)]
-      [(= msg WM_KILLFOCUS)
-       (queue-window-event this (lambda () (on-kill-focus)))
-       (default w msg wParam lParam)]
-      [else
-       (wndproc-for-ctlproc w msg wParam lParam default)]))
-
-    (define/public (wndproc-for-ctlproc w msg wParam lParam default)
-      (wndproc w msg wParam lParam default))))
-
-(define item% 
-  (class (item-mixin window%)
-    (inherit get-hwnd)
-    
-    (super-new)
-    
-    (define/override (gets-focus?) #t)
-
-    ;; Retain to avoid GC of the bitmaps:
-    (define label-hbitmap #f)
-    (define/public (remember-label-bitmap hbitmap)
-      (set! label-hbitmap hbitmap))
-    
-    (define/public (set-label s)
-      (if (s . is-a? . bitmap%)
-          (let ([hbitmap (bitmap->hbitmap s)])
-            (atomically
-             (set! label-hbitmap hbitmap)
-             (SendMessageW (get-hwnd) 
-                           (get-setimage-message)
-                           IMAGE_BITMAP 
-                           (cast hbitmap _HBITMAP _LPARAM))))
-          (SetWindowTextW (get-hwnd) s)))
-
-    (define/public (get-setimage-message) BM_SETIMAGE)
-    
-    (def/public-unimplemented get-label)))
-
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/key.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/key.rkt
deleted file mode 100644
index 059bf5086e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/key.rkt
+++ /dev/null
@@ -1,343 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "../common/event.rkt")
-
-(provide
- (protect-out maybe-make-key-event
-              generates-key-event?
-	      reset-key-mapping
-              key-symbol-to-menu-key))
-
-(define-user32 GetKeyState (_wfun _int -> _SHORT))
-(define-user32 MapVirtualKeyW (_wfun _UINT _UINT -> _UINT))
-(define-user32 VkKeyScanW (_wfun _WCHAR -> _SHORT))
-
-(define (generates-key-event? msg)
-  (let ([message (MSG-message msg)])
-    (and (or (eq? message WM_KEYDOWN)
-             (eq? message WM_SYSKEYDOWN)
-             (eq? message WM_KEYUP)
-             (eq? message WM_SYSKEYUP))
-         (maybe-make-key-event #t 
-                               (MSG-wParam msg)
-                               (MSG-lParam msg)
-                               #f
-                               (or (= message WM_KEYUP)
-                                   (= message WM_SYSKEYUP))
-                               (MSG-hwnd msg)))))
-
-(define (THE_SCAN_CODE lParam)
-  (bitwise-and (arithmetic-shift lParam -16) #x1FF))
-
-(define generic_ascii_code (make-hasheq))
-
-;; The characters in find_shift_alts are things that we'll try
-;; to include in keyboard events as char-if-Shift-weren't-pressed,
-;; char-if-AltGr-weren't-pressed, etc.
-(define find_shift_alts (string-append
-			 "!@#$%^&*()_+-=\\|[]{}:\";',.<>/?~`"
-			 "abcdefghijklmnopqrstuvwxyz"
-			 "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-			 "0123456789"))
-(define other-key-codes #f)
-(define (get-other-key-codes)
-  (or other-key-codes
-      (begin
-	(set! other-key-codes
-	      (list->vector
-	       (for/list ([i (in-string find_shift_alts)])
-		 (VkKeyScanW (char->integer i)))))
-	other-key-codes)))
-(define (reset-key-mapping)
-  (set! other-key-codes #f))
-(define (other-orig j)
-  (char->integer (string-ref find_shift_alts j)))
-
-;; If a virtual key code has no mapping here, then the key should be
-;; ignored by WM_KEYDOWN and processed by WM_CHAR instead
-(define win32->symbol
-  (hasheq VK_CANCEL 'cancel
-          VK_BACK #\backspace
-          VK_TAB #\tab
-          VK_CLEAR 'clear
-          VK_RETURN #\return
-          VK_SHIFT 'shift
-          VK_CONTROL 'control
-          VK_MENU  'menu
-          VK_PAUSE 'pause
-          VK_SPACE #\space
-          VK_ESCAPE 'escape
-          VK_PRIOR 'prior
-          VK_NEXT  'next
-          VK_END 'end
-          VK_HOME  'home
-          VK_LEFT  'left
-          VK_UP 'up
-          VK_RIGHT 'right
-          VK_DOWN  'down
-          VK_SELECT 'select
-          VK_PRINT 'print
-          VK_EXECUTE 'execute
-          VK_INSERT 'insert
-          VK_DELETE #\rubout
-          VK_HELP  'help
-          VK_NUMPAD0 'numpad0
-          VK_NUMPAD1 'numpad1
-          VK_NUMPAD2 'numpad2
-          VK_NUMPAD3 'numpad3
-          VK_NUMPAD4 'numpad4
-          VK_NUMPAD5 'numpad5
-          VK_NUMPAD6 'numpad6
-          VK_NUMPAD7 'numpad7
-          VK_NUMPAD8 'numpad8
-          VK_NUMPAD9 'numpad9
-          VK_MULTIPLY 'multiply
-          VK_ADD 'add
-          VK_SUBTRACT 'subtract
-          VK_DECIMAL 'decimal
-          VK_DIVIDE 'divide
-          VK_F1 'f1
-          VK_F2 'f2
-          VK_F3 'f3
-          VK_F4 'f4
-          VK_F5 'f5
-          VK_F6 'f6
-          VK_F7 'f7
-          VK_F8 'f8
-          VK_F9 'f9
-          VK_F10 'f10
-          VK_F11 'f11
-          VK_F12 'f12
-          VK_F13 'f13
-          VK_F14 'f14
-          VK_F15 'f15
-          VK_F16 'f16
-          VK_F17 'f17
-          VK_F18 'f18
-          VK_F19 'f19
-          VK_F20 'f20
-          VK_F21 'f21
-          VK_F22 'f22
-          VK_F23 'f23
-          VK_F24 'f24
-          VK_NUMLOCK 'numlock
-          VK_SCROLL 'scroll))
-
-
-(define (maybe-make-key-event just-check? wParam lParam is-char? is-up? hwnd)
-  (let* ([control-down? (not (zero? (arithmetic-shift (GetKeyState VK_CONTROL) -1)))]
-         [rcontrol-down? (and control-down?
-                              (not (zero? (arithmetic-shift (GetKeyState VK_RCONTROL) -1))))]
-         [lcontrol-down? (and control-down?
-                              (not (zero? (arithmetic-shift (GetKeyState VK_LCONTROL) -1))))]
-         [shift-down? (not (zero? (arithmetic-shift (GetKeyState VK_SHIFT) -1)))]
-	 [rshift-down? (and shift-down?
-                            (not (zero? (arithmetic-shift (GetKeyState VK_RSHIFT) -1))))]
-         [caps-down? (not (zero? (arithmetic-shift (GetKeyState VK_CAPITAL) -1)))]
-         [alt-down? (= (bitwise-and (HIWORD lParam) KF_ALTDOWN) KF_ALTDOWN)]
-         [ralt-down? (and alt-down?
-			  (not (zero? (arithmetic-shift (GetKeyState VK_RMENU) -1))))]
-         [lalt-down? (and alt-down?
-			  (not (zero? (arithmetic-shift (GetKeyState VK_LMENU) -1))))])
-    (let-values ([(id other-shift other-altgr other-shift-altgr)
-                  (cond
-		   [(symbol? wParam)
-		    (values wParam #f #f #f)]
-		   [is-char?
-		      ;; wParam is a character or symbol
-		      (let ([id wParam]
-                            [sc (THE_SCAN_CODE lParam)])
-                        ;; Remember scan codes to help with some key-release events:
-                        (when (byte? id)
-                          (hash-set! generic_ascii_code id sc))
-                        ;; Look for elements of find_shift_alts that have a different
-                        ;; shift/AltGr state:
-                        (let ([k (MapVirtualKeyW sc 1)])
-                          (if (zero? k)
-                              (values (integer->char id) #f #f #f)
-                              (for/fold ([id id][s #f][a #f][sa #f]) ([o (in-vector (get-other-key-codes))]
-                                                                      [j (in-naturals)])
-                                (if (= (bitwise-and o #xFF) k)
-                                    ;; Figure out whether it's different in the shift
-                                    ;; for AltGr dimension, or both:
-                                    (if (eq? (zero? (bitwise-and o #x100)) shift-down?)
-                                        ;; different Shift
-                                        (if (eq? (= (bitwise-and o #x600) #x600)
-                                                 (and control-down? alt-down?))
-                                            ;; same AltGr
-                                            (values id (other-orig j) a sa)
-                                            ;; different AltGr
-                                            (values id s a (other-orig j)))
-                                        ;; same Shift
-                                        (if (eq? (= (bitwise-and o #x600) #x600)
-                                                 (and control-down? alt-down?))
-                                            ;; same AltGr
-                                            (values id s a sa)
-                                            ;; different AltGr
-                                            (values id s (other-orig j) sa)))
-                                    (values id s a sa))))))]
-		   [else
-                      ;; wParam is a virtual key code
-                      (let ([id (hash-ref win32->symbol wParam #f)]
-                            [override-mapping? (and control-down?
-						    ;; not AltGR:
-						    (not (and lcontrol-down?
-							      ralt-down?)))]
-                            [try-generate-release
-                             (lambda ()
-                               (let ([sc (THE_SCAN_CODE lParam)])
-                                 (for/fold ([id #f]) ([i (in-range 256)] #:when (not id))
-                                   (and (equal? sc (hash-ref generic_ascii_code i #f))
-                                        (let ([id i])
-                                          (if (id . < . 127)
-                                              (char->integer (char-downcase (integer->char id)))
-                                              id))))))])
-                        (if (not id)
-                            (if (or override-mapping? is-up?)
-                                ;; Non-AltGr Ctl- combination, or a release event: 
-                                ;; map manually, because the default mapping is
-                                ;; unsatisfactory
-                                ;; Set id to the unshifted key:
-                                (let* ([id (bitwise-and (MapVirtualKeyW wParam 2) #xFFFF)]
-                                       [id (cond
-                                            [(zero? id) #f]
-                                            [(id . < . 128)
-                                             (char->integer (char-downcase (integer->char id)))]
-                                            [else id])])
-                                  (let-values ([(s a sa)
-                                                ;; Look for shifted alternate:
-                                                (for/fold ([s #f][a #f][sa #f]) ([o (in-vector (get-other-key-codes))]
-                                                                                 [j (in-naturals)])
-                                                  (if (= (bitwise-and o #xFF) wParam)
-                                                      (if (not (zero? (bitwise-and o #x100)))
-                                                          (if (= (bitwise-and o #x600) #x600)
-                                                              (values s a (other-orig j))
-                                                              (values (other-orig j) a sa))
-                                                          (if (= (bitwise-and o #x600) #x600)
-                                                              (values s (other-orig j) sa)
-                                                              (values s a sa)))
-                                                      (values s a sa)))])
-                                    (if (and id shift-down?)
-                                        ;; shift was pressed, so swap role of shifted and unshifted
-                                        (values s id sa a)
-                                        (values id s a sa))))
-                                (values (and is-up? (try-generate-release)) #f #f #f))
-                            (cond
-                             [(and (not override-mapping?) (not is-up?)
-                                   ;; Let these get translated to WM_CHAR or skipped
-                                   ;; entirely:
-                                   (memq wParam
-                                         (list VK_ESCAPE VK_SPACE VK_RETURN VK_TAB VK_BACK)))
-                              (values #f #f #f #f)]
-                             [(and (not id) is-up?)
-                              (values (try-generate-release) #f #f #f)]
-                             [else
-                              (values id #f #f #f)])))])])
-      (and id
-           (if just-check?
-               #t
-               (let* ([id (if (number? id) (integer->char id) id)]
-		      [key-id (case id
-                                [(#\033) 'escape]
-                                [(shift) (if rshift-down?
-                                             'rshift
-                                             id)]
-                                [(control) (if rcontrol-down?
-                                               'rcontrol
-                                               id)]
-                                [else id])]
-                      [e (new key-event%
-                              [key-code (if is-up?
-                                           'release
-                                           key-id)]
-                              [shift-down shift-down?]
-                              [control-down control-down?]
-                              [meta-down alt-down?]
-                              [alt-down #f]
-                              [x 0]
-                              [y 0]
-                              [time-stamp 0]
-                              [caps-down caps-down?]
-			      [control+meta-is-altgr (and control-down?
-                                                          alt-down?
-							  (not rcontrol-down?)
-							  (not lalt-down?))])]
-		      [as-key (lambda (v)
-				(if (integer? v) (integer->char v) v))])
-		 (when is-up?
-		   (send e set-key-release-code key-id))
-		 (when other-shift 
-		   (send e set-other-shift-key-code (as-key other-shift)))
-		 (when other-altgr 
-		   (send e set-other-altgr-key-code (as-key other-altgr)))
-		 (when other-shift-altgr 
-		   (send e set-other-shift-altgr-key-code (as-key other-shift-altgr)))
-                 e))))))
-
-(define (key-symbol-to-menu-key k)
-  (hash-ref keysyms k #f))
-
-(define keysyms
-  '#hash((numpad5 . |Numpad 5|)
-         (numpad1 . |Numpad 1|)
-         (escape . Escape)
-         (right . Right)
-         (prior . Prior)
-         (cancel . Cancel)
-         (start . Start)
-         (f22 . F22)
-         (f17 . F17)
-         (f13 . F13)
-         (f8 . F8)
-         (f3 . F3)
-         (divide . Divide)
-         (add . Add)
-         (numpad8 . |Numpad 8|)
-         (numpad3 . |Numpad 3|)
-         (select . Select)
-         (down . Down)
-         (next . Next)
-         (clear . Clear)
-         (scroll . Scroll)
-         (f21 . F21)
-         (f16 . F16)
-         (f12 . F12)
-         (f9 . F9)
-         (f4 . F4)
-         (f1 . F1)
-         (separator . Separator)
-         (numpad9 . |Numpad 9|)
-         (numpad4 . |Numpad 4|)
-         (help . Help)
-         (execute . Execute)
-         (left . Left)
-         (end . End)
-         (menu . Menu)
-         (print . Print)
-         (f23 . F23)
-         (f18 . F18)
-         (f14 . F14)
-         (f7 . F7)
-         (f2 . F2)
-         (decimal . Decimal)
-         (multiply . Multiply)
-         (numpad7 . |Numpad 7|)
-         (numpad2 . |Numpad 2|)
-         (insert . Insert)
-         (snapshot . Snapshot)
-         (up . Up)
-         (home . Home)
-         (pause . Pause)
-         (f24 . F24)
-         (f19 . F19)
-         (f15 . F15)
-         (f11 . F11)
-         (f6 . F6)
-         (f5 . F5)
-         (subtract . Subtract)
-         (numpad-enter . |Numpad Enter|)
-         (numpad6 . |Numpad 6|)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/list-box.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/list-box.rkt
deleted file mode 100644
index 797c41b54b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/list-box.rkt
+++ /dev/null
@@ -1,544 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         (only-in racket/list take drop)
-         ffi/unsafe
-          "../../syntax.rkt"
-          "../../lock.rkt"
-          "../common/event.rkt"
-         "item.rkt"
-	 "utils.rkt"
-	 "const.rkt"
-	 "window.rkt"
-	 "wndclass.rkt"
-         "types.rkt")
-
-(provide
- (protect-out list-box%))
-
-(define WS_EX_CLIENTEDGE        #x00000200)
-
-(define LBS_NOTIFY            #x0001)
-(define LBS_MULTIPLESEL       #x0008)
-(define LBS_HASSTRINGS        #x0040)
-(define LBS_MULTICOLUMN       #x0200)
-(define LBS_WANTKEYBOARDINPUT #x0400)
-(define LBS_EXTENDEDSEL       #x0800)
-(define LBS_DISABLENOSCROLL   #x1000)
-
-(define LBN_SELCHANGE       1)
-(define LBN_DBLCLK          2)
-
-(define LB_ERR -1)
-
-(define LB_ADDSTRING          #x0180)
-(define LB_RESETCONTENT       #x0184)
-(define LB_INSERTSTRING       #x0181)
-(define LB_DELETESTRING       #x0182)
-(define LB_GETTOPINDEX        #x018E)
-(define LB_SETTOPINDEX        #x0197)
-(define LB_GETITEMHEIGHT      #x01A1)
-(define LB_GETSELCOUNT        #x0190)
-(define LB_GETSELITEMS        #x0191)
-(define LB_GETCURSEL          #x0188)
-(define LB_SETSEL             #x0185)
-(define LB_SETCURSEL          #x0186)
-(define LB_GETSEL             #x0187)
-(define LB_SELITEMRANGE       #x019B)
-
-(define LVCF_WIDTH              #x0002)
-(define LVCF_TEXT               #x0004)
-(define LVCF_MINWIDTH           #x0040)
-
-(define LVS_REPORT              #x0001)
-(define LVS_SINGLESEL           #x0004)
-(define LVS_NOCOLUMNHEADER      #x4000)
-(define LVS_SHOWSELALWAYS       #x0008)
-
-(define LVS_EX_HEADERDRAGDROP   #x00000010)
-(define LVS_EX_FULLROWSELECT    #x00000020)
-
-(define LVIF_TEXT               #x0001)
-(define LVIF_DI_SETITEM         #x1000)
-
-(define LVM_FIRST               #x1000)
-(define LVM_INSERTITEMW         (+ LVM_FIRST 77))
-(define LVM_GETSTRINGWIDTHW     (+ LVM_FIRST 87))
-(define LVM_INSERTCOLUMNW       (+ LVM_FIRST 97))
-(define LVM_DELETECOLUMN        (+ LVM_FIRST 28))
-(define LVM_SETCOLUMNW          (+ LVM_FIRST 96))
-(define LVM_GETCOLUMNW          (+ LVM_FIRST 95))
-(define LVM_SETITEMTEXTW        (+ LVM_FIRST 116))
-(define LVM_DELETEALLITEMS      (+ LVM_FIRST 9))
-(define LVM_GETTOPINDEX         (+ LVM_FIRST 39))
-(define LVM_GETCOUNTPERPAGE     (+ LVM_FIRST 40))
-(define LVM_ENSUREVISIBLE       (+ LVM_FIRST 19))
-(define LVM_DELETEITEM          (+ LVM_FIRST 8))
-(define LVM_GETSELECTEDCOUNT    (+ LVM_FIRST 50))
-(define LVM_GETNEXTITEM         (+ LVM_FIRST 12))
-(define LVM_GETITEMSTATE        (+ LVM_FIRST 44))
-(define LVM_SETITEMSTATE        (+ LVM_FIRST 43))
-(define LVM_SETEXTENDEDLISTVIEWSTYLE (+ LVM_FIRST 54))
-(define LVM_SETCOLUMNORDERARRAY (+ LVM_FIRST 58))
-(define LVM_GETCOLUMNORDERARRAY (+ LVM_FIRST 59))
-
-(define LVN_FIRST               -100)
-(define LVN_ITEMCHANGED         (- LVN_FIRST 1))
-(define LVN_COLUMNCLICK         (- LVN_FIRST 8))
-
-(define NM_FIRST                0)
-(define NM_DBLCLK               (- NM_FIRST 3))
-
-(define LVNI_SELECTED           #x0002)
-(define LVIS_SELECTED           #x0002)
-
-(define-cstruct _LVCOLUMN
-  ([mask _UINT]
-   [fmt _int]
-   [cx _int]
-   [pszText _permanent-string/utf-16]
-   [cchTextMax _int]
-   [iSubItem _int]
-   [iImage _int]
-   [iOrder _int]
-   [cxMin _int]
-   [cxDefault _int]
-   [cxIdeal _int]))
-
-(define (make-lvcolumn flags label)
-  (make-LVCOLUMN flags
-                 0 0 
-                 label
-                 0 0 0 0 0 0 0))
-
-(define (free-lvcolumn lv)
-  (let ([s (LVCOLUMN-pszText lv)])
-    (when s (free s))))
-
-(define column-desc (cast (malloc (ctype-sizeof _LVCOLUMN) 'raw)
-                          _pointer 
-                          _LVCOLUMN-pointer))
-(memset column-desc 0 (ctype-sizeof _LVCOLUMN))
-
-;; Microsoft docs say to add padding to a ListView
-;; item's width, but it doesn't say how much padding:
-(define COLUMN-PADDING 16)
-
-(define-cstruct _LVITEM
-  ([mask _UINT]
-   [iItem _int]
-   [iSubItem _int]
-   [state _UINT]
-   [stateMask _UINT]
-   [pszText _permanent-string/utf-16]
-   [cchTextMax _int]
-   [iImage _int]
-   [lParam _LPARAM]
-   [iIndent _int]
-   [iGroupId _int]
-   [cColumns _UINT]
-   [puColumns _UINT]
-   [piColFmt _int]
-   [iGroup _int]))
-
-(define (make-lvitem flags pos col label)
-  (make-LVITEM flags
-               pos col
-               0 0 ; state & statemask
-               label
-               0 0 
-               0 ; lParam
-               0 0 0
-               0 0 0))
-
-(define (free-lvitem lv)
-  (let ([s (LVITEM-pszText lv)])
-    (when s (free s))))
-
-(define-cstruct _NMLISTVIEW
-  ([hdr _NMHDR]
-   [iItem _int]
-   [iSubItem _int]
-   ;; ....
-   ))
-
-;; ------------------------------------------------------------
-
-(define list-box%
-  (class item%
-    (init parent cb
-          label kind x y w h
-          choices style
-          font label-font
-          columns column-order)
-
-    (inherit set-size set-control-font
-             get-client-size)
-
-    (define num-columns (length columns))
-    (define single-column? (and (= 1 num-columns)
-                                (not (memq 'column-headers style))
-                                (not (memq 'variable-columns style))))
-    (define single? (eq? 'single kind))
-
-    (define hwnd
-      (CreateWindowExW/control WS_EX_CLIENTEDGE
-                               (if single-column?
-                                   "PLTLISTBOX"
-                                   "PLTSysListView32")
-                               label
-                               (if single-column?
-                                   (bitwise-ior WS_CHILD WS_CLIPSIBLINGS LBS_NOTIFY
-                                                WS_VSCROLL
-                                                (if (memq 'hscroll style) WS_HSCROLL 0)
-                                                (cond
-                                                 ;; Win32 sense of "multiple" and "extended" is backwards
-                                                 [(eq? kind 'extended) LBS_MULTIPLESEL]
-                                                 [(eq? kind 'multiple) LBS_EXTENDEDSEL]
-                                                 [else 0]))
-                                   (bitwise-ior WS_CHILD WS_CLIPSIBLINGS
-                                                LVS_REPORT 
-                                                (if (memq 'column-headers style)
-                                                    0
-                                                    LVS_NOCOLUMNHEADER)
-                                                LVS_SHOWSELALWAYS
-                                                WS_VSCROLL
-                                                (if (memq 'hscroll style) WS_HSCROLL 0)
-                                                (cond
-                                                 [(eq? kind 'extended) 0]
-                                                 [(eq? kind 'multiple) 0]
-                                                 [else LVS_SINGLESEL])))
-                               0 0 0 0
-                               (send parent get-content-hwnd)
-                               #f
-                               hInstance
-                               #f))
-
-    (when single-column?
-      (for ([s (in-list choices)])
-        (SendMessageW/str hwnd LB_ADDSTRING 0 s)))
-    
-    (unless single-column?
-      (for ([label (in-list columns)]
-            [col (in-naturals)])
-        (atomically
-         (let ([col-desc (make-lvcolumn LVCF_TEXT label)])
-           (SendMessageW/ptr hwnd LVM_INSERTCOLUMNW col col-desc)
-           (free-lvcolumn col-desc)))
-        (let* ([label-width
-                (SendMessageW/str hwnd LVM_GETSTRINGWIDTHW 0 label)]
-               [max-width
-                (if (zero? col)
-                    ;; size column based on the content:
-                    (for/fold ([w label-width]) ([s (in-list choices)]
-                                                 [i (in-naturals)])
-                      (atomically
-                       (let ([lv (make-lvitem (bitwise-ior LVIF_DI_SETITEM
-                                                           LVIF_TEXT)
-                                              i
-                                              col
-                                              s)])
-                         (if (zero? col)
-                             (SendMessageW/ptr hwnd LVM_INSERTITEMW 0 lv)
-                             (SendMessageW/ptr hwnd LVM_SETITEMTEXTW i lv))
-                         (free-lvitem lv)))
-                      (max w 
-                           (SendMessageW/str hwnd LVM_GETSTRINGWIDTHW 0 s)))
-                    ;; size column based on the label, only:
-                    label-width)])
-          (let ([col-desc (make-lvcolumn LVCF_WIDTH #f)])
-            (set-LVCOLUMN-cx! col-desc (+ max-width COLUMN-PADDING))
-            (SendMessageW/ptr hwnd LVM_SETCOLUMNW col col-desc)))))
-
-    (unless single-column?
-      (SendMessageW hwnd LVM_SETEXTENDEDLISTVIEWSTYLE 0 
-                    (bitwise-ior LVS_EX_FULLROWSELECT
-                                 (if (memq 'reorderable-headers style)
-                                     LVS_EX_HEADERDRAGDROP
-                                     0))))
-
-    (when column-order
-      (set-column-order column-order))
-
-    (super-new [callback cb]
-               [parent parent]
-               [hwnd hwnd]
-               [style style])
-
-    (set-control-font font)
-    (set-size #f #f 40 60)
-
-    (define/override (size->screen v) (->screen* v))
-
-    (define callback cb)
-
-    (define/override (is-command? cmd)
-      (if single-column?
-          (or (= cmd LBN_SELCHANGE)
-              (= cmd LBN_DBLCLK))
-          (or (= cmd LVN_ITEMCHANGED)
-              (= cmd NM_DBLCLK)
-              (= cmd LVN_COLUMNCLICK))))
-    
-    (define pending-changed (box #f))
-    (define/override (do-command cmd control-hwnd)
-      ;; LVN_ITEMCHANGED notifications, in particular, get
-      ;; set for each item that changes in a selection change.
-      ;; Use a box to cancel pending callbacks to collapse the
-      ;; multiple callbacks into one.
-      (set-box! pending-changed #f)
-      (let ([b (box #t)]
-            [t (if (if single-column?
-                       (= cmd LBN_SELCHANGE)
-                       (= cmd LVN_ITEMCHANGED))
-                   'list-box
-                   'list-box-dclick)])
-        (unless (eq? t 'list-box-dclick)
-          (set! pending-changed b))
-        (queue-window-event 
-         this 
-         (lambda ()
-           (when (unbox b)
-             (callback this
-                       (new control-event%
-                            [event-type t]
-                            [time-stamp (current-milliseconds)])))))))
-    
-    (define/override (do-command-ex cmd control-hwnd nmhdr)
-      (if (and (not single-column?)
-               (= cmd LVN_COLUMNCLICK))
-          (let ([col (NMLISTVIEW-iSubItem
-                      (cast nmhdr _pointer _NMLISTVIEW-pointer))])
-            (queue-window-event this (lambda ()
-                                       (callback this
-                                                 (new column-control-event%
-                                                      [column col]
-                                                      [event-type 'list-box-column]
-                                                      [time-stamp (current-milliseconds)])))))
-          (super do-command-ex cmd control-hwnd nmhdr)))
-    
-    (define num (length choices))
-    (define/public (number) num)
-
-    (define data (map (lambda (x) (box #f)) choices))
-    (define/public (get-data i) (unbox (list-ref data i)))
-    (define/public (set-data i v) (set-box! (list-ref data i) v))
-
-    (define/public (set-string i str [col 0])
-      (atomically
-       (if single-column?
-           (begin
-             (SendMessageW/str hwnd LB_INSERTSTRING i str)
-             (SendMessageW hwnd LB_DELETESTRING (add1 i) 0))
-           (let ([lv (make-lvitem 0
-                                  0
-                                  col
-                                  str)])
-             (SendMessageW/ptr hwnd LVM_SETITEMTEXTW i lv)
-             (free-lvitem lv)))
-       (void)))
-
-
-    (define/public (set-column-order column-order)
-      (unless single-column?
-        (let* ([count num-columns]
-               [a (malloc _int count)])
-          (for ([n (in-list column-order)]
-                [i (in-range count)])
-            (ptr-set! a _int i n))
-          (SendMessageW/ptr hwnd LVM_SETCOLUMNORDERARRAY count a)
-          (InvalidateRect hwnd #f #f))))
-
-    (define/public (get-column-order)
-      (if single-column?
-          '(0)
-          (let* ([count num-columns]
-                 [a (malloc _int count)])
-            (SendMessageW/ptr hwnd LVM_GETCOLUMNORDERARRAY count a)
-            (cast a _gcpointer (_list o _int count)))))
-
-    (define/public (set-column-label col s)
-      (unless single-column?
-        (atomically
-         (let ([col-desc (make-lvcolumn LVCF_TEXT s)])
-           (SendMessageW/ptr hwnd LVM_SETCOLUMNW col col-desc)
-           (free-lvcolumn col-desc)))))
-
-    (define min-col-width 0) ; not kept for us by XP
-    (define max-col-width 10000)
-    (define/public (set-column-size col w mn mx)
-      (if single-column?
-          (atomically
-           (set! min-col-width mn)
-           (set! max-col-width mx))
-          (atomically
-           (let ([col-desc (make-lvcolumn (bitwise-ior LVCF_WIDTH LVCF_MINWIDTH) #f)])
-             (set-LVCOLUMN-cx! col-desc (->screen w))
-             (set-LVCOLUMN-cxMin! col-desc (->screen mn))
-             (SendMessageW/ptr hwnd LVM_SETCOLUMNW col col-desc)
-             (set! min-col-width mn)
-             (set! max-col-width mx)))))
-
-    (define/public (get-column-size col)
-      (atomically
-       (let ([col-desc (make-lvcolumn (bitwise-ior LVCF_WIDTH LVCF_MINWIDTH) #f)])
-         (SendMessageW/ptr hwnd LVM_GETCOLUMNW col col-desc)
-         (let ([v (->normal (LVCOLUMN-cx col-desc))])
-           (values (max v min-col-width) ; in XP, may have been sized too small
-                   min-col-width
-                   max-col-width)))))
-
-    (define/public (append-column label)
-      (atomically
-       (let ([col-desc (make-lvcolumn (bitwise-ior LVCF_TEXT
-                                                   LVCF_WIDTH)
-                                      label)])
-         (set-LVCOLUMN-cx! col-desc 
-                           (SendMessageW/str hwnd LVM_GETSTRINGWIDTHW 0 label))
-         (SendMessageW/ptr hwnd LVM_INSERTCOLUMNW num-columns col-desc)
-         (free-lvcolumn col-desc))
-       (set! num-columns (add1 num-columns))))
-
-    (define/public (delete-column col)
-      (atomically
-       (SendMessageW hwnd LVM_DELETECOLUMN col 0)
-       (set! num-columns (sub1 num-columns))))
-
-    (define/public (set-first-visible-item i)
-      (if single-column?
-          (void (SendMessageW hwnd LB_SETTOPINDEX i 0))
-          (let ([c (SendMessageW hwnd LVM_GETCOUNTPERPAGE 0 0)])
-            (unless (= c i)
-              (if (> (SendMessageW hwnd LVM_GETTOPINDEX 0 0)
-                     i)
-                  (void (SendMessageW hwnd LVM_ENSUREVISIBLE i 0))
-                  (void (SendMessageW hwnd LVM_ENSUREVISIBLE (sub1 (min num (+ i c))) 0)))))))
-
-    (define/public (get-first-item)
-      (SendMessageW hwnd (if single-column? LB_GETTOPINDEX LVM_GETTOPINDEX) 0 0))
-
-    (define/public (number-of-visible-items)
-      (if single-column?
-          (let ([ih (->normal (SendMessageW hwnd LB_GETITEMHEIGHT 0 0))])
-            (let ([w (box 0)]
-                  [h (box 0)])
-              (get-client-size w h)
-              (quotient (unbox h) ih)))
-          (SendMessageW hwnd LVM_GETCOUNTPERPAGE 0 0)))
-
-    (define/public (clear)
-      (atomically
-       (set! data null)
-       (set! num 0)
-       (void (SendMessageW hwnd (if single-column? 
-                                    LB_RESETCONTENT 
-                                    LVM_DELETEALLITEMS)
-                           0 0))))
-
-    (define/public (set choices . more-choices)
-      (atomically
-       (ShowWindow hwnd SW_HIDE)
-       (clear)
-       (if single-column?
-           (for ([s (in-list choices)])
-             (SendMessageW/str hwnd LB_ADDSTRING 0 s))
-           (for ([choices (in-list (cons choices more-choices))]
-                 [col (in-naturals)])
-             (for ([s (in-list choices)]
-                   [i (in-naturals)])
-             (atomically
-              (let ([lv (make-lvitem (bitwise-ior LVIF_DI_SETITEM
-                                                           LVIF_TEXT)
-                                     i
-                                     col
-                                     s)])
-                (if (zero? col)
-                    (SendMessageW/ptr hwnd LVM_INSERTITEMW 0 lv)
-                    (SendMessageW/ptr hwnd LVM_SETITEMTEXTW i lv))
-                (free-lvitem lv))))))
-       (set! data (map (lambda (s) (box #f)) choices))
-       (set! num (length choices))
-       (ShowWindow hwnd SW_SHOW)))
-
-    (public [append* append])
-    (define (append* s [v #f])
-      (atomically
-       (if single-column?
-           (SendMessageW/str hwnd LB_ADDSTRING 0 s)
-           (let ([lv (make-lvitem (bitwise-ior LVIF_DI_SETITEM
-                                               LVIF_TEXT)
-                                  num
-                                  0
-                                  s)])
-             (SendMessageW/ptr hwnd LVM_INSERTITEMW 0 lv)
-             (free-lvitem lv)))
-       (set! num (add1 num))
-       (set! data (append data (list (box v))))))
-
-    (define/public (delete i)
-      (atomically
-       (set! data (append (take data i) (drop data (add1 i))))
-       (set! num (sub1 num))
-       (void (SendMessageW hwnd (if single-column?
-                                    LB_DELETESTRING
-                                    LVM_DELETEITEM)
-                           i 0))))
-
-    (define/public (get-selections)
-      (atomically
-       (if single-column?
-           (if single?
-               (let ([v (SendMessageW hwnd LB_GETCURSEL 0 0)])
-                 (if (= v LB_ERR)
-                     null
-                     (list v)))
-               (let ([n (SendMessageW hwnd LB_GETSELCOUNT 0 0)])
-                 (if (zero? n)
-                     null
-                     (let ([selections (malloc n _LONG 'raw)])
-                       (SendMessageW hwnd LB_GETSELITEMS n (cast selections _pointer _LPARAM))
-                       (begin0
-                        (for/list ([i (in-range n)])
-                          (ptr-ref selections _LONG i))
-                        (free selections))))))
-           (let loop ([c (SendMessageW hwnd LVM_GETSELECTEDCOUNT 0 0)]
-                      [pos -1])
-             (cond
-              [(zero? c) null]
-              [else (let ([pos (SendMessageW hwnd LVM_GETNEXTITEM pos LVNI_SELECTED)])
-                      (cons pos (loop (sub1 c) pos)))])))))
-
-    (define/public (get-selection)
-      (let ([l (get-selections)])
-        (if (null? l)
-            -1
-            (car l))))
-
-    (define/public (selected? i)
-      (if single-column?
-          (not (zero? (SendMessageW hwnd LB_GETSEL i 0)))
-          (not (zero? (SendMessageW hwnd LVM_GETITEMSTATE i LVIS_SELECTED)))))
-
-    (define/public (select i [on? #t] [one? #t])
-      (void
-       (if single-column?
-           (if single?
-               (SendMessageW hwnd LB_SETCURSEL (if on? i -1) 0)
-               (begin
-                 (unless one?
-                   (SendMessageW hwnd LB_SELITEMRANGE 0 (MAKELPARAM 0 num)))
-                 (SendMessageW hwnd LB_SETSEL (if on? 1 0) i)))
-           (let ([lv (make-lvitem 0 0 0 #f)])
-             (define (set-one i on?)
-               (set-LVITEM-stateMask! lv LVIS_SELECTED)
-               (set-LVITEM-state! lv (if on? LVIS_SELECTED 0))
-               (SendMessageW/ptr hwnd LVM_SETITEMSTATE i lv))
-             (when (and on? (not single?) (not one?))
-               (for ([i (in-list (get-selections))])
-                 (set-one i #f)))
-             (set-one i on?)))))
-
-    (define/public (set-selection i)
-      (void (select i #t #f)))
-
-    (def/public-unimplemented get-label-font)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/menu-bar.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/menu-bar.rkt
deleted file mode 100644
index 089b8301a8..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/menu-bar.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang racket/base
-(require racket/class
-         (only-in racket/list take drop)
-         ffi/unsafe
-         "../../lock.rkt"
-         "../../syntax.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt")
-
-(provide
- (protect-out menu-bar%))
-
-(define-user32 CreateMenu (_wfun -> _HMENU))
-(define-user32 SetMenu (_wfun _HWND _HMENU -> (r : _BOOL)
-                              -> (unless r (failed 'SetMenu))))
-(define-user32 DrawMenuBar (_wfun _HWND -> (r : _BOOL)
-                                  -> (unless r (failed 'DrawMenuBar))))
-
-(define menu-bar% 
-  (class object%
-    (super-new)
-
-    (define hmenu (CreateMenu))
-
-    (define menus null)
-    (define parent #f)
-
-    (define/public (set-label-top pos str)
-      (send (list-ref menus pos) set-menu-label hmenu pos str)
-      (refresh))
-      
-    (define/public (number) (length menus))
-
-    (define/public (enable-top pos on?)
-      (send (list-ref menus pos) enable-self hmenu pos on?)
-      (refresh))
-
-    (define/public (delete which pos)
-      (atomically
-       (set! menus (append (take menus pos)
-                           (drop menus (add1 pos))))
-       (RemoveMenu hmenu pos MF_BYPOSITION)
-       (refresh)))
-
-    (define/private (refresh)
-      (when parent
-        (send parent draw-menu-bar)))
-
-    (public [append-item append])
-    (define (append-item m lbl)
-      (let ([l (append menus (list m))])
-        (atomically
-         (set! menus l)
-         (send m set-parent this lbl hmenu)))
-      (refresh))
-
-    (define/public (popup-menu-with-char c)
-      (when parent
-	(send parent popup-menu-with-char c)))
-
-    (define/public (set-parent f)
-      (SetMenu (send f get-hwnd) hmenu)
-      (set! parent f)
-      (send parent draw-menu-bar))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/menu-item.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/menu-item.rkt
deleted file mode 100644
index e57fbd4b60..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/menu-item.rkt
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-          "../../lock.rkt"
-          "../../syntax.rkt")
-
-(provide
- (protect-out menu-item%
-              id-to-menu-item))
-
-;; Menu itens are identified by 16-bit numbers, so we have
-;;  to keep a hash mapping them to menu items.
-(define ids (make-hash))
-
-(define (id-to-menu-item id)
-  (let ([wb (atomically (hash-ref ids id #f))])
-    (and wb (weak-box-value wb))))
-
-(defclass menu-item% object%
-
-  (define id
-    (let loop ()
-      (let ([id (add1 (random #x7FFE))])
-        (let ([wb (atomically (hash-ref ids id #f))])
-          (if (and wb
-                   (weak-box-value wb))
-              (loop)
-              (begin
-                (atomically (hash-set! ids id (make-weak-box this)))
-                id))))))
-
-  (define parent #f)
-  (define label #f)
-  (define checkable? #f)
-  (define submenu #f)
-
-  (define/public (set-parent p lbl chkbl? subm)
-    (set! parent p)
-    (set! label lbl)
-    (set! checkable? chkbl?)
-    (set! submenu subm)
-    id)
-
-  (define/public (set-label hmenu pos str)
-    (if submenu
-        (ModifyMenuW hmenu pos
-                     (bitwise-ior MF_BYPOSITION MF_STRING MF_POPUP)
-                     (cast (send submenu get-hmenu) _HMENU _UINT_PTR)
-                     str)
-        (ModifyMenuW hmenu pos
-                     (bitwise-ior MF_BYPOSITION MF_STRING 
-                                  (GetMenuState hmenu pos MF_BYPOSITION))
-                     id
-                     str)))
-
-  (define/public (set-check hmenu pos on?)
-    (void
-     (CheckMenuItem hmenu pos (bitwise-ior MF_BYPOSITION
-                                           (if on?
-                                               MF_CHECKED
-                                               MF_UNCHECKED)))))
-
-  (define/public (get-check hmenu pos)
-    (let ([s (GetMenuState hmenu pos MF_BYPOSITION)])
-      (not (zero? (bitwise-and s MF_CHECKED)))))
-
-  (define/public (auto-check)
-    (when checkable?
-      (send parent auto-check id)))
-
-  (public [get-id id])
-  (define (get-id) id)
-
-  (super-new))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/menu.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/menu.rkt
deleted file mode 100644
index 20923036da..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/menu.rkt
+++ /dev/null
@@ -1,172 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         (only-in racket/list drop take)
-         "../../lock.rkt"
-         "../../syntax.rkt"
-         "../common/event.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "menu-item.rkt")
-
-(provide
- (protect-out menu%))
-
-(define-user32 CreatePopupMenu (_wfun -> _HMENU))
-(define-user32 AppendMenuW (_wfun _HMENU _UINT _pointer _string/utf-16 -> (r : _BOOL)
-                                  -> (unless r (failed 'AppendMenuW))))
-(define-user32 EnableMenuItem (_wfun _HMENU _UINT _UINT -> _BOOL))
-
-(define-user32 TrackPopupMenu(_wfun _HMENU _UINT _int _int _int _HWND (_or-null _RECT-pointer)
-                                    -> _int))
-
-(define TPM_LEFTBUTTON  #x0000)
-(define TPM_RIGHTBUTTON #x0002)
-(define TPM_NONOTIFY    #x0080)
-(define TPM_RETURNCMD   #x0100)
-
-(defclass menu% object%
-  (init lbl
-        cb
-        font)
-
-  (define label lbl)
-  (define parent #f)
-  (define items null)
-
-  (define callback cb)
-
-  (define hmenu (CreatePopupMenu))
-
-  (define/public (get-hmenu) hmenu)
-
-  (define/public (set-parent p lbl parent-hmenu)
-    (set! label lbl)
-    (set! parent p)
-    (AppendMenuW parent-hmenu 
-                 (bitwise-ior MF_POPUP MF_STRING)
-                 hmenu
-                 lbl))
-
-  (define/public (select mb)
-    (when parent
-      (let ([m (regexp-match #rx"&[^&]" label)])
-        (when m
-          (send parent popup-menu-with-char (string-ref (car m) 1)))))
-    #t)
-
-  (def/public-unimplemented get-font)
-  (def/public-unimplemented set-width)
-  (def/public-unimplemented set-title)
-
-  (define/public (popup gx gy hwnd call-callback)
-    (let ([cmd (TrackPopupMenu hmenu
-                               (bitwise-ior
-                                TPM_LEFTBUTTON
-                                TPM_RIGHTBUTTON
-                                TPM_NONOTIFY
-                                TPM_RETURNCMD)
-                               (->screen gx) (->screen gy)
-                               0 hwnd #f)])
-      (let* ([e (new popup-event% [event-type 'menu-popdown])])
-        (unless (zero? cmd)
-          (send e set-menu-id cmd))
-        (call-callback (lambda () (callback this e))))))
-
-  (define/private (with-item id proc)
-    (let loop ([items items] [pos 0])
-      (cond
-       [(null? items) (void)]
-       [(and (car items)
-             (eq? id (send (car items) id)))
-        (proc (car items) pos)]
-       [else (loop (cdr items) (add1 pos))])))
-
-  (define/public (set-menu-label bar-hmenu pos str)
-    (ModifyMenuW bar-hmenu pos
-                 (bitwise-ior MF_BYPOSITION MF_STRING MF_POPUP)
-                 (cast hmenu _HMENU _UINT_PTR)
-                 str))
-
-  (define/public (set-label id str)
-    (with-item
-     id
-     (lambda (i pos)
-       (send i set-label hmenu pos str))))
-
-  (define/public (set-help-string id str)
-    (void))
-
-  (define/public (number) (length items))
-
-  (define/public (enable id on?)
-    (with-item
-     id
-     (lambda (i pos)
-       (void
-        (EnableMenuItem hmenu pos 
-                        (bitwise-ior MF_BYPOSITION
-                                     (if on? MF_ENABLED MF_GRAYED)))))))
-
-  (define/public (enable-self parent-hmenu pos on?)
-    (EnableMenuItem parent-hmenu pos  
-                    (bitwise-ior MF_BYPOSITION
-                                 (if on? MF_ENABLED MF_GRAYED))))
-
-  (define/public (check id on?)
-    (with-item
-     id
-     (lambda (i pos)
-       (send i set-check hmenu pos on?))))
-
-  (define/public (checked? id)
-    (with-item
-     id
-     (lambda (i pos)
-       (send i get-check hmenu pos))))
-
-  (define/public (auto-check id)
-    (with-item
-     id
-     (lambda (i pos)
-       (send i set-check hmenu pos (not (send i get-check hmenu pos))))))
-
-  (define/private (remove-item! pos)
-    (set! items 
-          (append (take items pos)
-                  (drop items (add1 pos)))))
-
-  (define/public (delete-by-position pos)
-    (atomically
-     (remove-item! pos)
-     (RemoveMenu hmenu pos MF_BYPOSITION)))
-
-  (define/public (delete id)
-    (with-item
-     id
-     (lambda (i pos)
-       (atomically
-        (remove-item! pos)
-        (RemoveMenu hmenu pos MF_BYPOSITION)))))
-
-  (public [append-item append])
-  (define (append-item id label help-str-or-submenu chckable?)
-    (let ([i (id-to-menu-item id)])
-      (when i
-        (let* ([submenu (and (help-str-or-submenu . is-a? . menu%)
-                             help-str-or-submenu)]
-               [id (send i set-parent this label chckable?
-                         submenu)])
-          (atomically
-           (set! items (append items (list i)))
-           (if submenu
-               (AppendMenuW hmenu (bitwise-ior MF_POPUP MF_STRING) (send submenu get-hmenu) label)
-               (AppendMenuW hmenu (bitwise-ior MF_STRING) (cast id _intptr _pointer) label)))))))
-
-  (define/public (append-separator) 
-    (atomically
-     (set! items (append items (list #f)))
-     (AppendMenuW hmenu MF_SEPARATOR #f #f)))
-
-  (super-new))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/message.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/message.rkt
deleted file mode 100644
index 0ed6e15cb6..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/message.rkt
+++ /dev/null
@@ -1,96 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         racket/promise
-         ffi/unsafe
-          "../../syntax.rkt"
-          "../common/event.rkt"
-         "item.rkt"
-	 "utils.rkt"
-	 "const.rkt"
-	 "window.rkt"
-	 "wndclass.rkt"
-         "hbitmap.rkt"
-         "types.rkt"
-	 "icons.rkt")
-
-(provide
- (protect-out message%))
-
-(define STM_SETIMAGE        #x0172)
-
-(define SS_LEFT #x00000000)
-(define SS_LEFTNOWORDWRAP #x0000000C)
-(define SS_BITMAP #x0000000E)
-(define SS_ICON #x00000003)
-
-(define IMAGE_ICON 1)
-
-(define warning-icon
-  (delay
-    (LoadIconW #f IDI_WARNING)))
-(define error-icon
-  (delay
-    (LoadIconW #f IDI_ERROR)))
-
-(define message%
-  (class item%
-    (inherit auto-size set-size set-control-font get-hwnd
-             remember-label-bitmap)
-
-    (init parent label
-          x y
-          style font)
-
-    (define bitmap? (label . is-a? . bitmap%))
-
-    (define/public (get-class) "PLTSTATIC")
-    
-    (super-new [callback void]
-               [parent parent]
-               [hwnd 
-                (CreateWindowExW/control 0
-                                         (get-class)
-                                         (if (string? label)
-                                             label
-                                             "<image>")
-                                         (bitwise-ior (if (string? label)
-							  SS_LEFTNOWORDWRAP
-							  SS_LEFT)
-						      WS_CHILD WS_CLIPSIBLINGS
-                                                      (if bitmap?
-                                                          SS_BITMAP
-                                                          (if (symbol? label)
-                                                              SS_ICON
-                                                              0)))
-                                         0 0 0 0
-                                         (send parent get-content-hwnd)
-                                         #f
-                                         hInstance
-                                         #f)]
-               [style style])
-
-    (when bitmap?
-      (let ([hbitmap (bitmap->hbitmap label)])
-        (remember-label-bitmap hbitmap)
-        (SendMessageW (get-hwnd) STM_SETIMAGE IMAGE_BITMAP 
-                      (cast hbitmap _HBITMAP _LPARAM))))
-
-    (when (symbol? label)
-      (SendMessageW (get-hwnd) STM_SETIMAGE IMAGE_ICON
-                    (cast (case label
-			    [(caution) (force warning-icon)]
-			    [(stop) (force error-icon)]
-			    [else app-icon])
-                          _HICON _LPARAM)))
-    
-    (set-control-font font)
-
-    (if (symbol? label)
-        (set-size #f #f 32 32)
-        (auto-size font (strip-& label) 0 0 0 0))
-
-    (define/public (set-preferred-size) #f)
-
-    (define/override (get-setimage-message)
-      STM_SETIMAGE)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/panel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/panel.rkt
deleted file mode 100644
index 6f5385a8fe..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/panel.rkt
+++ /dev/null
@@ -1,128 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-          "../../syntax.rkt"
-         "window.rkt"
-         "wndclass.rkt"
-         "utils.rkt"
-	 "const.rkt"
-         "cursor.rkt")
-
-(provide
- (protect-out panel-mixin
-              panel%))
-
-(define (panel-mixin %)
-  (class %
-    (inherit is-enabled-to-root?
-             reset-cursor-in-child
-             get-client-hwnd)
-
-    (super-new)
-
-    (define/public (adopt-child child)
-      ;; in atomic mode
-      (send child set-parent this))
-
-    (define children null)
-    (define/override (register-child child on?)
-      (let ([on? (and on? #t)]
-            [now-on? (and (memq child children) #t)])
-        (unless (eq? on? now-on?)
-          (unless on?
-            (when (eq? child mouse-in-child)
-              (send child send-leaves #f)
-              (set! mouse-in-child #f)))
-          (set! children 
-                (if on?
-                    (cons child children)
-                    (remq child children)))
-          (when on?
-            (send child parent-enable (is-enabled-to-root?))))))
-
-    (define/override (internal-enable on?)
-      (super internal-enable on?)
-      (for ([c (in-list children)])
-        (send c parent-enable on?)))
-
-    (define mouse-in-child #f)
-    (define/override (generate-mouse-ins in-window mk)
-      (unless (eq? in-window this)
-        (unless (eq? in-window mouse-in-child)
-          (when mouse-in-child
-            (send mouse-in-child send-leaves mk))
-          (set! mouse-in-child in-window)))
-      (super generate-mouse-ins in-window mk))
-
-    (define/override (reset-cursor default)
-      (if mouse-in-child
-          (reset-cursor-in-child mouse-in-child default)
-          (super reset-cursor default)))
-
-    (define/override (send-leaves mk)
-      (when mouse-in-child
-        (let ([w mouse-in-child])
-          (set! mouse-in-child #f)
-          (send w send-leaves mk)))
-      (super send-leaves mk))
-
-    (define/override (send-child-leaves mk)
-      (if mouse-in-child
-          (let ([w mouse-in-child])
-            (set! mouse-in-child #f)
-            (send w send-leaves mk)
-            #t)
-          #f))
-
-    (define/override (show-children)
-      (for ([c (in-list children)])
-        (send c show-children)))
-    (define/override (paint-children)
-      (for ([c (in-list children)])
-        (send c show-children)))
-
-    (define/override (refresh-all-children)
-      (for ([child (in-list children)])
-        (send child refresh)))
-
-    (define/override (wants-mouse-capture? control-hwnd)
-      (ptr-equal? (get-client-hwnd) control-hwnd))
-
-    (define lbl-pos 'horizontal)
-    (define/public (get-label-position) lbl-pos)
-    (define/public (set-label-position pos) (set! lbl-pos pos))
-    
-    (define/public (set-item-cursor x y) (void))))
-
-(define panel% 
-  (class (panel-mixin window%)
-    (init parent
-          x y w h
-          style
-          label)
-
-    (super-new [parent parent]
-               [hwnd 
-                (CreateWindowExW 0
-                                 (if (send parent is-frame?)
-                                     "PLTPanel"
-                                     "PLTTabPanel")
-                                 #f
-                                 (bitwise-ior WS_CHILD WS_CLIPSIBLINGS
-                                              (if (memq 'border style)
-                                                  WS_BORDER
-                                                  0))
-                                 0 0 (->screen w) (->screen h)
-                                 (send parent get-content-hwnd)
-                                 #f
-                                 hInstance
-                                 #f)]
-               [style style])
-
-    ;; For panel in a frame, adjust default cursor to arrow:
-    (define arrow-cursor? #f)
-    (define/public (set-arrow-cursor) (set! arrow-cursor? #t))
-    (define/override (generate-parent-mouse-ins mk)
-      (or (super generate-parent-mouse-ins mk)
-          (and arrow-cursor?
-               (get-arrow-cursor))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/platform.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/platform.rkt
deleted file mode 100644
index 1461b2b100..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/platform.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang racket/base
-(require "init.rkt"
-	 "button.rkt"
-         "canvas.rkt"
-         "check-box.rkt"
-         "choice.rkt"
-         "clipboard.rkt"
-         "cursor.rkt"
-         "dialog.rkt"
-         "frame.rkt"
-         "gauge.rkt"
-         "gl-context.rkt"
-         "group-panel.rkt"
-         "item.rkt"
-         "list-box.rkt"
-         "menu.rkt"
-         "menu-bar.rkt"
-         "menu-item.rkt"
-         "message.rkt"
-         "panel.rkt"
-         "printer-dc.rkt"
-         "radio-box.rkt"
-         "slider.rkt"
-         "tab-panel.rkt"
-         "window.rkt"
-         "procs.rkt")
-(provide (protect-out platform-values))
-
-(define (platform-values)
-  (values
-   button%
-   canvas%
-   canvas-panel%
-   check-box%
-   choice%
-   clipboard-driver%
-   cursor-driver%
-   dialog%
-   frame%
-   gauge%
-   group-panel%
-   item%
-   list-box%
-   menu%
-   menu-bar%
-   menu-item%
-   message%
-   panel%
-   printer-dc%
-   radio-box%
-   slider%
-   tab-panel%
-   window%
-   can-show-print-setup?
-   show-print-setup
-   id-to-menu-item
-   file-selector
-   is-color-display?
-   get-display-depth
-   has-x-selection?
-   hide-cursor
-   bell
-   display-size
-   display-origin
-   display-count
-   display-bitmap-resolution
-   flush-display
-   get-current-mouse-state
-   fill-private-color
-   cancel-quit
-   get-control-font-face
-   get-control-font-size
-   get-control-font-size-in-pixels?
-   get-double-click-time
-   file-creator-and-type
-   location->window
-   shortcut-visible-in-label?
-   unregister-collecting-blit
-   register-collecting-blit
-   find-graphical-system-path
-   play-sound
-   get-panel-background
-   font-from-user-platform-mode
-   get-font-from-user
-   color-from-user-platform-mode
-   get-color-from-user
-   special-option-key
-   special-control-key
-   get-highlight-background-color
-   get-highlight-text-color
-   make-screen-bitmap
-   make-gl-bitmap
-   check-for-break
-   key-symbol-to-menu-key
-   needs-grow-box-spacer?))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/printer-dc.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/printer-dc.rkt
deleted file mode 100644
index 486b26ee56..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/printer-dc.rkt
+++ /dev/null
@@ -1,256 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         ffi/unsafe/alloc
-         racket/draw/private/dc
-         racket/draw/private/local
-         racket/draw/unsafe/cairo
-         racket/draw/private/record-dc
-         racket/draw/private/bitmap-dc
-         racket/draw/private/ps-setup
-         "../../lock.rkt"
-         "dc.rkt"
-         "types.rkt"
-         "utils.rkt"
-         "const.rkt")
-
-(provide
- (protect-out printer-dc%
-              show-print-setup))
-
-(define _HGLOBAL _pointer)
-
-(define-cstruct _PAGESETUPDLG
-  ([lStructSize _DWORD]
-   [hwndOwner _HWND]
-   [hDevMode _HGLOBAL]
-   [hDevNames _HGLOBAL]
-   [Flags _DWORD]
-   [ptPaperSize _POINT]
-   [rtMinMargin _RECT]
-   [rtMargin _RECT]
-   [hInstance _HINSTANCE]
-   [lCustData _LPARAM]
-   [lpfnPageSetupHook _fpointer]
-   [lpfnPagePaintHook _fpointer]
-   [lpPageSetupTemplateName _pointer]
-   [hPageSetupTemplate _HGLOBAL]))
-
-(define-cstruct _PRINTDLG
-  ([lStructSize _DWORD]
-   [hwndOwner _HWND]
-   [hDevMode _HGLOBAL]
-   [hDevNames _HGLOBAL]
-   [hDC _HDC]
-   [Flags _DWORD]
-   [nFromPage _WORD]
-   [nToPage _WORD]
-   [nMinPage _WORD]
-   [nMaxPage _WORD]
-   [nCopies _WORD]
-   [hInstance _HINSTANCE]
-   [lCustData _LPARAM]
-   [lpfnPrintHook _fpointer]
-   [lpfnSetupHook _fpointer]
-   [lpPrintTemplateName _pointer]
-   [lpSetupTemplateName _pointer]
-   [hPrintTemplate _HGLOBAL]
-   [hSetupTemplate _HGLOBAL])
-  #:alignment (if is-win64? #f 2))
-
-(define-cstruct _DOCINFO
-  ([cbSize _int]
-   [lpszDocName _permanent-string/utf-16]
-   [lpszOutput _pointer]
-   [lpszDatatype _pointer]
-   [fwType _DWORD]))
-
-(define PD_RETURNDC #x00000100)
-
-(define PSD_INTHOUSANDTHSOFINCHES         #x00000004)
-(define PSD_INHUNDREDTHSOFMILLIMETERS     #x00000008)
-
-(define-comdlg32 PageSetupDlgW (_wfun _PAGESETUPDLG-pointer -> _BOOL))
-(define-comdlg32 PrintDlgW (_wfun _PRINTDLG-pointer -> _BOOL))
-
-(define-gdi32 StartDocW (_wfun _HDC _DOCINFO-pointer -> _int))
-(define-gdi32 StartPage (_wfun _HDC -> (r : _int) -> (unless (positive? r) (failed 'StartPage))))
-(define-gdi32 EndPage (_wfun _HDC -> (r : _int) -> (unless (positive? r) (failed 'EndPage))))
-(define-gdi32 EndDoc (_wfun _HDC -> (r : _int) -> (unless (positive? r) (failed 'EndDoc))))
-
-(define PHYSICALOFFSETX 112)
-(define PHYSICALOFFSETY 113)
-
-(define needs-delete ((allocator DeleteDC) values))
-
-(define (clone-page-setup p)
-  (let ([new-p (malloc 1 _PAGESETUPDLG)])
-    (set-cpointer-tag! new-p PAGESETUPDLG-tag)
-    (memcpy new-p 0 p 1 _PAGESETUPDLG)
-    new-p))
-
-(define PSD_RETURNDEFAULT #x00000400)
-(define PSD_MARGINS                       #x00000002)
-
-(define (show-print-setup parent [just-create? #f])
-  (let* ([pss (current-ps-setup)]
-         [ps (send pss get-native)])
-    (atomically
-     (let ([p (malloc 'raw 1 _PAGESETUPDLG)])
-       (set-cpointer-tag! p PAGESETUPDLG-tag)
-       (if ps
-           (memcpy p 0 ps 1 _PAGESETUPDLG)
-           (begin
-             (memset p 0 1 _PAGESETUPDLG)
-             (set-PAGESETUPDLG-lStructSize! p (ctype-sizeof _PAGESETUPDLG))))
-       (set-PAGESETUPDLG-Flags! p (bitwise-ior 
-				   (if just-create?
-				       PSD_RETURNDEFAULT
-				       0)
-				   PSD_MARGINS))
-       (set-PAGESETUPDLG-hwndOwner! p (and parent
-					   (send parent is-shown?)
-					   (send parent get-hwnd)))
-       (let ([r (PageSetupDlgW p)])
-         (when r
-           (let ([new-p (clone-page-setup p)])
-             (send pss set-native new-p values)))
-         (free p)
-         ;; FIXME: `r' leaks handles through
-         ;; the hDevModes and hDevNames fields
-         r)))))
-
-;; Make on drawing unit in a printing context match the relative drawing
-;; unit for the screen, where the conceptual drawing unit is always 96dpi
-(define SCREEN-DPI 96)
-
-(define printer-dc%
-  (class (record-dc-mixin (dc-mixin bitmap-dc-backend%))
-    (init [parent #f])
-
-    (define parent-frame parent)
-
-    (super-make-object (make-object win32-bitmap% 1 1 #f))
-
-    (inherit get-recorded-command
-             reset-recording)
-
-    (define pages null)
-    (define/override (end-page)
-      (set! pages (cons (get-recorded-command) pages))
-      (reset-recording))
-
-    (define page-setup (or (send (current-ps-setup) get-native)
-                           (begin
-                             (show-print-setup #f #t)
-                             (send (current-ps-setup) get-native))))
-
-    (define-values (page-width page-height margin-left margin-top)
-      ;; We would like to make the size of the DC match the
-      ;; printable area of the device. Unfortunately, we can't get
-      ;; the printable area until after we get a DC, which is too
-      ;; late for determining a page count (that can depend on the page
-      ;; size). So, we treat the area within the user's chosen margins
-      ;; are the printable area; starting out with PSD_MARGINS with 0 margins
-      ;; and PSD_RETURNDEFAULT seems to fill in the minimum margins,
-      ;; which is probably as good an approximation as any to the value
-      ;; that we want. See also `set-point-scale' below, which has to bridge
-      ;; the printable-area coordinate system and the within-paper-margins
-      ;; coordinate system.
-      (let ([scale (if (zero? (bitwise-and (PAGESETUPDLG-Flags page-setup)
-                                           PSD_INTHOUSANDTHSOFINCHES))
-                       ;; 100ths of mm
-                       (/ SCREEN-DPI (* 1000.0 2.54))
-                       ;; 1000ths of in
-                       (/ SCREEN-DPI 1000.0))]
-	    [r (PAGESETUPDLG-rtMargin page-setup)]
-	    [p (PAGESETUPDLG-ptPaperSize page-setup)])
-	(values
-	 (* scale (- (POINT-x p) (RECT-left r) (RECT-right r)))
-	 (* scale (- (POINT-y p) (RECT-top r) (RECT-bottom r)))
-	 (* scale (RECT-left r))
-	 (* scale (RECT-top r)))))
-
-    (define/override (get-size) (values page-width page-height))
-
-    (define start-doc-message #f)
-    (define/override (start-doc s)
-      (super start-doc s)
-      (set! start-doc-message (and s (string->immutable-string s))))
-    
-    (define/override (end-doc)
-      (let-values ([(hdc from-page to-page)
-                    (atomically
-                     (let ([p (malloc 'raw 1 _PRINTDLG)])
-                       (set-cpointer-tag! p PRINTDLG-tag)
-                       (memset p 0 1 _PRINTDLG)
-                       (set-PRINTDLG-lStructSize! p (ctype-sizeof _PRINTDLG))
-		       (set-PRINTDLG-hwndOwner! p (and parent-frame
-						       (send parent-frame is-shown?)
-						       (send parent-frame get-hwnd)))
-                       (set-PRINTDLG-hDevMode! p (PAGESETUPDLG-hDevMode page-setup))
-                       (set-PRINTDLG-hDevNames! p (PAGESETUPDLG-hDevNames page-setup))
-                       (set-PRINTDLG-Flags! p (bitwise-ior PD_RETURNDC))
-                       (set-PRINTDLG-nFromPage! p 1)
-                       (set-PRINTDLG-nToPage! p (length pages))
-                       (set-PRINTDLG-nMinPage! p 1)
-                       (set-PRINTDLG-nMaxPage! p (length pages))
-                       (set-PRINTDLG-nCopies! p 1)
-                       (let ([r (PrintDlgW p)])
-                         (begin0
-                          (if r 
-                              (values (needs-delete (PRINTDLG-hDC p))
-                                      (PRINTDLG-nFromPage p)
-                                      (PRINTDLG-nToPage p))
-                              (values #f #f #f))
-                          (free p)))))])
-        (when hdc
-          (atomically
-           (let ([job
-                  (let ([di (make-DOCINFO (ctype-sizeof _DOCINFO)
-                                          start-doc-message
-                                          #f
-                                          #f
-                                          0)])
-                    (begin0
-                     (StartDocW hdc di)
-                     (when start-doc-message
-                       (free (DOCINFO-lpszDocName di)))))])
-             (when (positive? job)
-               (for ([proc (in-list (reverse pages))]
-                     [page-no (in-naturals 1)])
-                 (when (<= from-page page-no to-page)
-                   (StartPage hdc)
-                   (let* ([s (cairo_win32_printing_surface_create hdc)]
-                          [cr (cairo_create s)])
-                     (set-point-scale hdc cr margin-left margin-top)
-                     (proc
-                      (make-object
-                       (class (dc-mixin default-dc-backend%)
-                         (super-new)
-                         (define/override (init-cr-matrix cr)
-                           (set-point-scale hdc cr margin-left margin-top))
-                         (define/override (get-cr) cr))))
-                     (cairo_destroy cr)
-                     (cairo_surface_destroy s))
-                   (EndPage hdc)))
-               (EndDoc hdc))
-             (DeleteDC hdc))))))))
-
-(define (set-point-scale hdc cr margin-left margin-top)
-  (let* ([lpx (GetDeviceCaps hdc LOGPIXELSX)]
-         [lpy (GetDeviceCaps hdc LOGPIXELSY)]
-         [dpx (GetDeviceCaps hdc PHYSICALOFFSETX)]
-         [dpy (GetDeviceCaps hdc PHYSICALOFFSETY)]
-         [lx (/ (if (zero? lpx) 300 lpx) SCREEN-DPI)]
-         [ly (/ (if (zero? lpy) 300 lpy) SCREEN-DPI)])
-    ;; We declared the size of the page based on paper,
-    ;; while DC reflcts just the printable area for the device,
-    ;; so compensate by shifting (and assume that margins
-    ;; are use appropriately)
-    (cairo_translate cr (- dpx) (- dpy))
-    ;; Scale to make printer scale simulate screen resolution:
-    (cairo_scale cr lx ly)
-    ;; Shift again to skip over th emargin, which we subtracted
-    ;; from the paper size:
-    (cairo_translate cr margin-left margin-top)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/procs.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/procs.rkt
deleted file mode 100644
index 8851fb8db6..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/procs.rkt
+++ /dev/null
@@ -1,143 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-	 "../../syntax.rkt"
-	 "theme.rkt"
-         "types.rkt"
-         "utils.rkt"
-         "const.rkt"
-         "menu-item.rkt"
-         "frame.rkt"
-         "window.rkt"
-         "dc.rkt"
-         "printer-dc.rkt"
-         (except-in "../common/default-procs.rkt"
-                    get-panel-background)
-         "filedialog.rkt"
-         "colordialog.rkt"
-         "sound.rkt"
-         "key.rkt"
-	 racket/draw)
-
-(provide
- (protect-out 
-  color-from-user-platform-mode
-  get-font-from-user
-  font-from-user-platform-mode
-  get-panel-background
-  find-graphical-system-path
-  register-collecting-blit
-  unregister-collecting-blit
-  shortcut-visible-in-label?
-  get-double-click-time
-  get-control-font-face
-  get-control-font-size
-  get-control-font-size-in-pixels?
-  cancel-quit
-  bell
-  hide-cursor
-  get-display-depth
-  is-color-display?
-  can-show-print-setup?
-  get-highlight-background-color
-  get-highlight-text-color
-  check-for-break)
- flush-display
- get-current-mouse-state
- fill-private-color
- play-sound
- location->window
- file-selector
- show-print-setup
- id-to-menu-item
- file-creator-and-type
- display-origin
- display-size
- display-bitmap-resolution
- make-screen-bitmap
- make-gl-bitmap
- special-control-key
- special-option-key
- get-color-from-user
- key-symbol-to-menu-key
- needs-grow-box-spacer?)
-
-(define (find-graphical-system-path what)
-  #f)
-
-(define (cancel-quit) (void))
-
-(define (color-from-user-platform-mode) 'dialog)
-
-(define (font-from-user-platform-mode) #f)
-(define-unimplemented get-font-from-user)
-
-(define (get-panel-background)
-  (let ([c (GetSysColor COLOR_BTNFACE)])
-    (make-object color% (GetRValue c) (GetGValue c) (GetBValue c))))
-
-(define (register-collecting-blit canvas x y w h on off on-x on-y off-x off-y)
-  (send canvas register-collecting-blit x y w h on off on-x on-y off-x off-y))
-(define (unregister-collecting-blit canvas)
-  (send canvas unregister-collecting-blits))
-(define (shortcut-visible-in-label? [? #f]) #t)
-
-(define (get-double-click-time) 500)
-(define (get-control-font-face) (get-theme-font-face))
-(define (get-control-font-size) (->normal (get-theme-font-size)))
-(define (get-control-font-size-in-pixels?) #t)
-
-(define-user32 MessageBeep (_wfun _UINT -> _BOOL))
-(define (bell)
-  (void (MessageBeep MB_OK)))
-
-(define (hide-cursor) (void))
-
-(define (get-display-depth) 32)
-
-(define (is-color-display?) #t)
-
-(define (can-show-print-setup?) #t)
-
-(define (get-highlight-background-color)
-  (let ([c (GetSysColor COLOR_HIGHLIGHT)])
-    (make-object color% (GetRValue c) (GetGValue c) (GetBValue c))))
-(define (get-highlight-text-color)
-  (let ([c (GetSysColor COLOR_HIGHLIGHTTEXT)])
-    (make-object color% (GetRValue c) (GetGValue c) (GetBValue c))))
-
-(define/top (make-screen-bitmap [exact-positive-integer? w]
-                                [exact-positive-integer? h])
-  (make-object win32-bitmap% w h #f))
-
-(define/top (make-gl-bitmap [exact-positive-integer? w]
-                            [exact-positive-integer? h]
-                            [gl-config% c])
-  (make-object win32-bitmap% w h #f c))
-
-(define (check-for-break) #f)
-
-(define (needs-grow-box-spacer?) #f)
-
-(define-user32 GetCursorPos (_wfun (p : (_ptr o _POINT)) -> (r : _BOOL)
-                                   -> (if r
-                                          p
-                                          (failed 'GetCursorPos))))
-(define-user32 GetAsyncKeyState (_wfun _int -> _SHORT))
-(define-user32 GetSystemMetrics (_wfun _int -> _int))
-(define SM_SWAPBUTTON 23)
-(define (get-current-mouse-state)
-  (define p (GetCursorPos))
-  (define (maybe vk sym)
-    (if (negative? (GetAsyncKeyState vk))
-        (list sym)
-        null))
-  (define swapped? (not (zero? (GetSystemMetrics SM_SWAPBUTTON))))
-  (values (make-object point% (POINT-x p) (POINT-y p))
-          (append
-           (maybe (if swapped? VK_RBUTTON VK_LBUTTON) 'left)
-           (maybe (if swapped? VK_LBUTTON VK_RBUTTON) 'right)
-           (maybe VK_LSHIFT 'shift)
-           (maybe VK_CONTROL 'control)
-           (maybe VK_MENU 'alt)
-           (maybe VK_CAPITAL 'caps))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/queue.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/queue.rkt
deleted file mode 100644
index d6a2a689bb..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/queue.rkt
+++ /dev/null
@@ -1,159 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-         ffi/unsafe/alloc
-         ffi/unsafe/try-atomic
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "key.rkt"
-         "wndclass.rkt"
-         "../../lock.rkt"
-         "../common/queue.rkt")
-
-(provide (protect-out win32-start-event-pump)
-
-         ;; from common/queue:
-         current-eventspace
-         queue-event
-         queue-refresh-event
-         yield)
-
-;; ------------------------------------------------------------
-;; Win32 event pump
-
-(define _LPMSG _pointer)
-
-(define-user32 GetQueueStatus (_wfun _UINT -> _DWORD))
-(define-user32 GetMessageW (_wfun _LPMSG _HWND _UINT _UINT -> _BOOL))
-(define-user32 PeekMessageW (_wfun _LPMSG _HWND _UINT _UINT _UINT -> _BOOL))
-(define-user32 TranslateMessage (_wfun _LPMSG -> _BOOL))
-(define-user32 DispatchMessageW (_wfun _LPMSG -> _LRESULT))
-(define-user32 PostQuitMessage (_wfun _int -> _void))
-(define-user32 EnumThreadWindows (_wfun _DWORD _fpointer _LPARAM -> _BOOL))
-(define-user32 GetWindow (_wfun _HWND _UINT -> _HWND))
-(define-kernel32 GetCurrentThreadId (_wfun -> _DWORD))
-
-(define _enum_proc (_wfun _HWND _LPARAM -> _BOOL))
-
-(define-mz scheme_add_fd_eventmask (_fun _pointer _int -> _void))
-
-(define free-msg
-  ((deallocator)
-   (lambda (msg) 
-     (free msg))))
-
-(define malloc-msg
-  ((allocator free-msg)
-   (lambda ()
-     (malloc _MSG 'raw))))
-
-(define (events-ready?)
-  ;; Check for events only since the last PeekMessage:
-  (not (zero? (LOWORD (GetQueueStatus QS_ALLINPUT)))))
-
-(define (install-wakeup fds)
-  (pre-event-sync #t)
-  (scheme_add_fd_eventmask fds QS_ALLINPUT))
-
-(set-check-queue! events-ready?)
-(set-queue-wakeup! install-wakeup)
-
-(define other-peek-evt (make-semaphore))
-(define peek-other-peek-evt (semaphore-peek-evt other-peek-evt))
-
-(define (message-dequeue es hwnd)
-  ;; Called in the eventspace for hwnd:
-  (let ([t (eventspace-extra-table es)]
-        [id (cast hwnd _HWND _intptr)])
-    (atomically (hash-remove! t id))
-    (let ([msg (malloc-msg)])
-      (let loop ()
-        (let ([v (PeekMessageW msg hwnd 0 0 PM_REMOVE)])
-          ;; Since we called PeekMeessage in a thread other than the
-          ;;  event-pump thread, set `other-peek-evt' so the pump
-          ;;  knows to check again.
-          (unless (sync/timeout 0 peek-other-peek-evt)
-            (semaphore-post other-peek-evt))
-          ;; Now handle the event:
-          (when v
-            (unless (generates-key-event? (cast msg _pointer _MSG-pointer))
-              (TranslateMessage msg))
-            (call-as-nonatomic-retry-point
-             (lambda ()
-               ;; in atomic mode:
-               (DispatchMessageW msg)))
-            ;; Maybe there's another event for this window:
-            (loop))))
-      (free-msg msg))))
-
-(define (queue-message-dequeue es hwnd)
-  ;; in atomic mode
-  (let ([t (eventspace-extra-table es)]
-        [id (cast hwnd _HWND _intptr)])
-    (unless (hash-ref t id #f)
-      (hash-set! t id #t)
-      (queue-event es (lambda () (message-dequeue es hwnd))))))
-
-;; For use only in the event-pump thread:
-(define msg (malloc-msg))
-
-(define (check-window-event hwnd data)
-  ;; in atomic mode
-  (let* ([root (let loop ([hwnd hwnd])
-                 (let ([p (GetWindow hwnd GW_OWNER)])
-                   (if p
-                       (loop p)
-                       hwnd)))]
-         [wx (any-hwnd->wx root)])
-    (if wx
-        ;; One of our windows, so make sure its eventspace
-        ;; asks for the message:
-        (let ([v (PeekMessageW msg hwnd 0 0 PM_NOREMOVE)])
-          (when v
-            (queue-message-dequeue (send wx get-eventspace)
-                                   hwnd)))
-        ;; Not our window, so dispatch any available events
-        (let loop ()
-          (let ([v (PeekMessageW msg hwnd 0 0 PM_REMOVE)])
-            (when v
-              (TranslateMessage msg)
-              (DispatchMessageW msg)
-              (loop)))))
-    #t))
-
-(define check_window_event (function-ptr check-window-event _enum_proc))
-
-(define (dispatch-all-ready)
-  ;; in atomic mode
-  (pre-event-sync #f)
-  (clean-up-destroyed)
-
-  ;; Windows uses messages above #x4000 to hilite items in the task bar,
-  ;; etc. In any case, these messages won't be handled by us, so they
-  ;; can't trigger callbacks.
-  (let loop ()
-    (let ([v (PeekMessageW msg #f #x4000 #xFFFF PM_REMOVE)])
-      (when v
-        (TranslateMessage msg)
-        (DispatchMessageW msg)
-        (loop))))
-
-  ;; Per-window checking lets us put an event in the right
-  ;; eventspace:
-  (EnumThreadWindows (GetCurrentThreadId) check_window_event 0))
-
-(define (win32-start-event-pump)
-  (thread (lambda ()
-            (let loop ()
-              (unless (let ([any-tasks? (sync/timeout 0 boundary-tasks-ready-evt)])
-                        (sync/timeout (and any-tasks? (* sometimes-delay-msec 0.001))
-                                      queue-evt 
-                                      other-peek-evt
-                                      (if any-tasks?
-                                          (wrap-evt (system-idle-evt)
-                                                    (lambda (v) #f))
-                                          boundary-tasks-ready-evt)))
-                (atomically (pre-event-sync #t)))
-              (as-entry dispatch-all-ready)
-              (loop)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/radio-box.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/radio-box.rkt
deleted file mode 100644
index 4d6ae04ad1..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/radio-box.rkt
+++ /dev/null
@@ -1,167 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         ffi/unsafe
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "../common/event.rkt"
-         "item.rkt"
-	 "utils.rkt"
-	 "const.rkt"
-	 "window.rkt"
-	 "wndclass.rkt"
-         "hbitmap.rkt"
-         "types.rkt")
-
-(provide
- (protect-out radio-box%))
-
-(define SEP 4)
-(define BM_SETCHECK #x00F1)
-
-(define radio-box% 
-  (class item%
-    (init parent cb label
-          x y w h
-          labels
-          val
-          style
-          font)
-
-    (inherit auto-size set-control-font
-             is-enabled-to-root?
-             set-focus)
-
-    (define callback cb)
-    (define current-value val)
-
-    (define hwnd
-      (CreateWindowExW 0
-                       "PLTTabPanel"
-                       #f
-                       (bitwise-ior WS_CHILD)
-                       0 0 w h
-                       (send parent get-content-hwnd)
-                       #f
-                       hInstance
-                       #f))
-
-    (define label-bitmaps null)
-
-    (define radio-hwnds
-      (let ([horiz? (memq 'horizontal style)])
-        (let loop ([y 0] [w 0] [labels labels])
-          (if (null? labels)
-              (begin
-                (MoveWindow hwnd 0 0 (->screen w) (->screen y) #t)
-                null)
-              (let* ([label (car labels)]
-                     [bitmap? (label . is-a? . bitmap%)]
-                     [radio-hwnd 
-                      (CreateWindowExW/control 0
-                                               "PLTBUTTON"
-                                               (if (string? label)
-                                                   label
-                                                   "<image>")
-                                               (bitwise-ior BS_RADIOBUTTON WS_CHILD WS_CLIPSIBLINGS
-                                                            (if bitmap?
-                                                                BS_BITMAP
-                                                                0))
-                                               0 0 0 0
-                                               hwnd
-                                               #f
-                                               hInstance
-                                               #f)])
-                (when bitmap?
-                  (let ([hbitmap (bitmap->hbitmap label)])
-                    (set! label-bitmaps (cons hbitmap label-bitmaps))
-                    (SendMessageW radio-hwnd BM_SETIMAGE IMAGE_BITMAP 
-                                  (cast hbitmap _HBITMAP _LPARAM))))
-                (ShowWindow radio-hwnd SW_SHOW)
-                (set-control-font font radio-hwnd)
-                (let-values ([(w1 h) 
-                              (auto-size font label 0 0 20 4
-                                         (lambda (w1 h1)
-                                           (if horiz?
-                                               (MoveWindow radio-hwnd (->screen (+ w SEP)) 0
-							   (->screen w1) (->screen h1)
-							   #t)
-                                               (MoveWindow radio-hwnd 0 (->screen (+ y SEP))
-							   (->screen w1) (->screen h1)
-							   #t))
-                                           (values w1 h1)))])
-                  (cons radio-hwnd
-                        (loop (if horiz? (max y h) (+ y SEP h))
-                              (if horiz? (+ w SEP w1) (max w1 w))
-                              (cdr labels)))))))))
-
-    (unless (= val -1)
-      (SendMessageW (list-ref radio-hwnds val) BM_SETCHECK 1 0))
-    
-    (super-new [callback cb]
-               [parent parent]
-               [hwnd hwnd]
-               [extra-hwnds radio-hwnds]
-               [style style])
-
-    (define/override (is-hwnd? a-hwnd)
-      (or (ptr-equal? hwnd a-hwnd)
-          (for/or ([radio-hwnd (in-list radio-hwnds)])
-            (ptr-equal? a-hwnd radio-hwnd))))
-
-    (define/override (is-command? cmd)
-      (= cmd BN_CLICKED))
-    
-    (define/override (do-command cmd control-hwnd)
-      (let ([val (for/fold ([i 0]) ([radio-hwnd (in-list radio-hwnds)]
-                                    [pos (in-naturals)])
-                   (if (ptr-equal? control-hwnd radio-hwnd)
-                       pos
-                       i))])
-        (unless (= val current-value)
-          (set-selection val)
-          (queue-window-event this (lambda ()
-                                     (callback this
-                                               (new control-event%
-                                                    [event-type 'radio-box]
-                                                    [time-stamp (current-milliseconds)])))))))
-
-
-    (define focused 0)
-
-    (define/public (button-focus i)
-      (if (= i -1)
-          (min focused (length radio-hwnds))
-          (begin
-            (set! focused i)
-            (set-focus (list-ref radio-hwnds i)))))
-
-    (define/override (get-focus-hwnd)
-      (if (= focused -1)
-          hwnd
-          (list-ref radio-hwnds focused)))
-
-    (define/public (set-selection val)
-      (atomically
-       (unless (= val current-value)
-         (unless (= current-value -1)
-           (SendMessageW (list-ref radio-hwnds current-value) BM_SETCHECK 0 0))
-         (unless (= val -1)
-           (SendMessageW (list-ref radio-hwnds val) BM_SETCHECK 1 0))
-         (set! current-value val))))
-
-    (define buttons-enabled (make-vector (length radio-hwnds) #t))
-    (define/public (enable-button i on?)
-      (unless (eq? (and on? #t) (vector-ref buttons-enabled i))
-        (vector-set! buttons-enabled i (and on? #t))
-        (when (is-enabled-to-root?)
-          (void (EnableWindow (list-ref radio-hwnds i) on?)))))
-    (define/override (internal-enable on?)
-      (for ([radio-hwnd (in-list radio-hwnds)]
-            [radio-on? (in-vector buttons-enabled)])
-        (void (EnableWindow radio-hwnd (and on? radio-on?)))))
-
-    (define/public (get-selection) current-value)
-
-    (define/public (number) (length radio-hwnds))))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/slider.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/slider.rkt
deleted file mode 100644
index 946c14d465..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/slider.rkt
+++ /dev/null
@@ -1,167 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         ffi/unsafe
-          "../../syntax.rkt"
-          "../common/event.rkt"
-         "item.rkt"
-	 "utils.rkt"
-	 "const.rkt"
-	 "window.rkt"
-	 "wndclass.rkt"
-         "types.rkt")
-
-(provide
- (protect-out slider%))
-
-(define TBS_VERT                #x0002)
-(define TBS_HORZ                #x0000)
-
-(define TBM_GETPOS              WM_USER)
-(define TBM_GETRANGEMIN         (+ WM_USER 1))
-(define TBM_GETRANGEMAX         (+ WM_USER 2))
-(define TBM_GETTIC              (+ WM_USER 3))
-(define TBM_SETTIC              (+ WM_USER 4))
-(define TBM_SETPOS              (+ WM_USER 5))
-(define TBM_SETRANGE            (+ WM_USER 6))
-(define TBM_SETRANGEMIN         (+ WM_USER 7))
-(define TBM_SETRANGEMAX         (+ WM_USER 8))
-
-(define SS_CENTER            #x00000001)
-
-(define THICKNESS 24)
-(define MIN_LENGTH 80)
-
-(defclass slider% item%
-  (init parent cb
-        label
-        val lo hi
-        x y w
-        style
-        font)
-  (inherit set-control-font
-           auto-size)
-
-  (define callback cb)
-  (define vertical? (memq 'vertical style))
-
-  (define panel-hwnd
-    (if (memq 'plain style)
-        #f
-        (CreateWindowExW 0
-                         "PLTPanel"
-                         #f
-                         (bitwise-ior WS_CHILD)
-                         0 0 0 0
-                         (send parent get-content-hwnd)
-                         #f
-                         hInstance
-                         #f)))
-
-  (define slider-hwnd
-    (CreateWindowExW/control 0
-                             "PLTmsctls_trackbar32"
-                             label
-                             (bitwise-ior WS_CHILD WS_CLIPSIBLINGS
-                                          (if vertical?
-                                              TBS_VERT
-                                              TBS_HORZ)
-                                          (if panel-hwnd
-                                              WS_VISIBLE
-                                              0))
-                             0 0 0 0
-                             (or panel-hwnd 
-                                 (send parent get-content-hwnd))
-                             #f
-                             hInstance
-                             #f))
-
-  (define value-hwnd
-    (and panel-hwnd
-         (CreateWindowExW/control 0
-                                  "STATIC"
-                                  (format "~s" val)
-                                  (bitwise-ior SS_CENTER WS_CHILD WS_CLIPSIBLINGS WS_VISIBLE)
-                                  0 0 0 0
-                                  panel-hwnd
-                                  #f
-                                  hInstance
-                                  #f)))
-
-  (define hwnd (or panel-hwnd slider-hwnd))
-
-  (super-new [callback cb]
-             [parent parent]
-             [hwnd hwnd]
-             [extra-hwnds
-              (if panel-hwnd
-                  (list slider-hwnd value-hwnd)
-                  null)]
-             [style style])
-
-  (define/override (is-hwnd? a-hwnd)
-    (or (ptr-equal? hwnd a-hwnd)
-        (and panel-hwnd
-             (or (ptr-equal? slider-hwnd a-hwnd)
-                 (ptr-equal? value-hwnd a-hwnd)))))
-  
-  (when value-hwnd
-    (set-control-font font value-hwnd))
-
-  (define value-w 0)
-  (define value-h 0)
-
-  (if panel-hwnd
-      (auto-size font
-                 (list (format "~s" lo)
-                       (format "~s" hi))
-                 0 0 0 0 (lambda (w h)
-                           (set! value-w w)
-                           (set! value-h h)
-                           (if vertical?
-                               (set-size #f #f (+ THICKNESS w) (max h MIN_LENGTH))
-                               (set-size #f #f (max w MIN_LENGTH) (+ THICKNESS h)))))
-      (if vertical?
-          (set-size #f #f THICKNESS MIN_LENGTH)
-          (set-size #f #f MIN_LENGTH THICKNESS)))
-
-  (SendMessageW slider-hwnd TBM_SETRANGE 1 (MAKELPARAM lo hi))
-  (set-value val)
-
-  (define/override (set-size x y w h)
-    (super set-size x y w h)
-    (when panel-hwnd
-      (unless (or (= w -1) (= h -1))
-        (if vertical?
-            (let ([dx (quotient (- w THICKNESS value-w) 2)])
-              (MoveWindow slider-hwnd (->screen dx) 0
-			  (->screen THICKNESS) (->screen h) #t)
-              (MoveWindow value-hwnd (->screen (+ dx THICKNESS)) (->screen (quotient (- h value-h) 2))
-			  (->screen value-w) (->screen value-h) #t))
-            (let ([dy (quotient (- h THICKNESS value-h) 2)])
-              (MoveWindow slider-hwnd 0 (->screen dy)
-			  (->screen w) (->screen THICKNESS) #t)
-              (MoveWindow value-hwnd (->screen (quotient (- w value-w) 2)) (->screen (+ dy THICKNESS))
-			  (->screen value-w) (->screen value-h) #t))))))
-
-  (define/override (size->screen v) (->screen* v))
-
-  (define/override (control-scrolled)
-    (when value-hwnd
-      (set-text (get-value)))
-    (queue-window-event this (lambda ()
-                               (callback this
-                                         (new control-event%
-                                              [event-type 'slider]
-                                              [time-stamp (current-milliseconds)])))))
-
-  (define/public (set-value val)
-    (SendMessageW slider-hwnd TBM_SETPOS 1 val)
-    (when value-hwnd
-      (set-text val)))
-  
-  (define/private (set-text val)
-    (SetWindowTextW value-hwnd (format "~s" val)))
-    
-  (define/public (get-value)
-    (SendMessageW slider-hwnd TBM_GETPOS 0 0)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/sound.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/sound.rkt
deleted file mode 100644
index 6d291ec428..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/sound.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/class
-	 "../../lock.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt")
-
-(provide
- (protect-out play-sound))
-
-(define-winmm PlaySoundW (_wfun _string/utf-16 _pointer _DWORD -> _BOOL))
-
-(define SND_SYNC   #x0000)
-(define SND_ASYNC  #x0001)
-(define SND_NOSTOP #x0010)
-
-(define previous-done-sema #f)
-
-(define (play-sound path async?)
-  (let ([path (simplify-path path #f)]
-	[done (make-semaphore)])
-    (and (let ([p (path->string
-		   (cleanse-path (path->complete-path path)))])
-	   (atomically
-	    (when previous-done-sema (semaphore-post previous-done-sema))
-	    (set! previous-done-sema done)
-	    (PlaySoundW p #f SND_ASYNC)))
-	 (or async?
-	     ;; Implement synchronous playing by polling, where
-	     ;; PlaySound with no sound file and SND_NOSTOP polls.
-	     (let loop ()
-	       (sleep 0.1)
-	       (or (semaphore-try-wait? done)
-		   (PlaySoundW #f #f (bitwise-ior SND_ASYNC SND_NOSTOP))
-		   (loop)))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/tab-panel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/tab-panel.rkt
deleted file mode 100644
index 6c3458222b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/tab-panel.rkt
+++ /dev/null
@@ -1,185 +0,0 @@
-#lang racket/base
-(require racket/class
-         ffi/unsafe
-         "../../syntax.rkt"
-         "../../lock.rkt"
-         "../common/event.rkt"
-         "item.rkt"
-	 "utils.rkt"
-	 "const.rkt"
-	 "window.rkt"
-	 "panel.rkt"
-	 "wndclass.rkt"
-         "types.rkt")
-
-(provide
- (protect-out tab-panel%))
-
-(define TCIF_TEXT            #x0001)
-(define TCM_SETUNICODEFORMAT #x2005)
-(define TCM_FIRST            #x1300)
-(define TCM_INSERTITEMW  (+ TCM_FIRST 62))
-(define TCM_SETITEMW     (+ TCM_FIRST 61))
-(define TCM_SETCURSEL    (+ TCM_FIRST 12))
-(define TCM_GETCURSEL    (+ TCM_FIRST 11))
-(define TCM_GETITEMCOUNT (+ TCM_FIRST 4))
-(define TCM_DELETEITEM   (+ TCM_FIRST 8))
-(define TCM_DELETEALLITEMS (+ TCM_FIRST 9))
-(define TCM_GETCURFOCUS (+ TCM_FIRST 47))
-(define TCM_SETCURFOCUS (+ TCM_FIRST 48))
-
-(define-cstruct _TCITEMW
-  ([mask _UINT]
-   [dwState _DWORD]
-   [dwStateMask _DWORD]
-   [pszText _permanent-string/utf-16]
-   [cchTextMax _int]
-   [iImage _int]
-   [lParam _LPARAM]))
-
-(define tab-panel% 
-  (class (item-mixin (panel-mixin window%))
-    (init parent
-          x y w h
-          style
-          choices)
-
-    (define callback void)
-
-    (inherit auto-size set-control-font
-             is-shown-to-root?)
-
-    (define hwnd
-      (CreateWindowExW/control 0
-                               "PLTSysTabControl32"
-                               ""
-                               (bitwise-ior WS_CHILD WS_CLIPSIBLINGS)
-                               0 0 0 0
-                               (send parent get-content-hwnd)
-                               #f
-                               hInstance
-                               #f))
-
-    (define client-hwnd
-      (CreateWindowExW 0
-                       "PLTTabPanel"
-                       #f
-                       (bitwise-ior WS_CHILD WS_VISIBLE)
-                       0 0 (->screen w) (->screen h)
-                       hwnd
-                       #f
-                       hInstance
-                       #f))
-
-    (super-new [callback (lambda (c) (callback c))]
-               [extra-hwnds (list client-hwnd)]
-               [parent parent]
-               [hwnd hwnd]
-               [style style])
-
-    (define/override (get-client-hwnd)
-      client-hwnd)
-
-    (SendMessageW hwnd TCM_SETUNICODEFORMAT 1 0)
-
-    (define/private (with-item proc)
-      (atomically
-       (let ([item (cast (malloc _TCITEMW 'raw) _pointer _TCITEMW-pointer)])
-         (set-TCITEMW-mask! item TCIF_TEXT)
-         (proc item 
-               (lambda () (free (TCITEMW-pszText item)))
-               (lambda (msg w)
-                 (SendMessageW hwnd msg w (cast item _pointer _LPARAM))))
-         (free item))))
-
-    (set choices)
-
-    (define tab-height 0)
-
-    (set-control-font #f)
-    (auto-size #f
-               (if (null? choices)
-                   '("Choice")
-                   choices)
-               0 0 0 0 #:combine-width +
-               (lambda (w h)
-                 (set! tab-height (+ h 6))
-                 (set-size #f #f
-                           (+ w (* 6 (length choices))) 
-                           (+ h 12))))
-    
-    (define/override (set-size x y w h)
-      (super set-size x y w h)
-      (unless (or (= w -1) (= h -1))
-        (MoveWindow client-hwnd (->screen 1) (->screen (+ tab-height 2))
-		    (->screen (- w 4)) (->screen (- h tab-height 6))
-		    #t)))
-
-    (define/override (is-command? cmd)
-      (= cmd -551))
-
-    (define/override (do-command cmd control-hwnd)
-      (queue-window-event this (lambda ()
-                                 (callback this
-                                           (new control-event%
-                                                [event-type 'tab-panel]
-                                                [time-stamp (current-milliseconds)])))))
-
-    ;; Needed after some actions:
-    (define/private (refresh)
-      (InvalidateRect hwnd #f #f))
-
-    (define/public (set-label pos str)
-      (with-item
-       (lambda (item done-str send-msg)
-         (set-TCITEMW-pszText! item str)
-         (send-msg TCM_SETITEMW pos)
-         (done-str)))
-      (refresh))
-
-    (define/public (set-selection pos)
-      (SendMessageW hwnd TCM_SETCURSEL pos 0)
-      (refresh))
-
-    (define/public (get-selection)
-      (SendMessageW hwnd TCM_GETCURSEL 0 0))
-
-    (define/public (number)
-      (SendMessageW hwnd TCM_GETITEMCOUNT 0 0))
-
-    (define/public (delete pos)
-      (SendMessageW hwnd TCM_DELETEITEM pos 0)
-      (refresh))
-
-    (public [append* append])
-    (define (append* str)
-      (with-item
-       (lambda (item done-str send-msg)
-         (set-TCITEMW-pszText! item str)
-         (send-msg TCM_INSERTITEMW (number))
-         (done-str)))
-      (refresh))
-
-    (define/public (set choices)
-      (let ([sel (get-selection)])
-        (SendMessageW hwnd TCM_DELETEALLITEMS 0 0)
-        (with-item
-         (lambda (item done-str send-msg)
-           (for ([str (in-list choices)]
-                 [pos (in-naturals)])
-             (set-TCITEMW-pszText! item str)
-             (send-msg TCM_INSERTITEMW pos)
-             (done-str))))
-        (let ([sel (max 0 (min (length choices) sel))])
-          (set-selection sel))))
-
-    (define/override (gets-focus?) #t)
-    
-    (define/public (button-focus i)
-      (if (= i -1)
-	  (SendMessageW hwnd TCM_GETCURFOCUS 0 0)
-	  (SendMessageW hwnd TCM_SETCURFOCUS i 0)))
-
-    (define/public (set-callback cb)
-      (set! callback cb))))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/theme.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/theme.rkt
deleted file mode 100644
index 8ba83870a2..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/theme.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/alloc
-         "utils.rkt"
-         "const.rkt"
-         "types.rkt"
-         "font.rkt")
-
-(provide
- (protect-out get-theme-logfont
-              get-theme-font-face
-              get-theme-font-size
-              OpenThemeData
-              CloseThemeData
-              DrawThemeParentBackground
-              DrawThemeBackground
-              DrawThemeEdge
-              EnableThemeDialogTexture))
-
-(define _HTHEME (_cpointer 'HTHEME))
-
-(define-uxtheme CloseThemeData (_wfun _HTHEME -> (r : _HRESULT)
-				      -> (when (negative? r)
-					   (error 'CloseThemeData "failed: ~s" (bitwise-and #xFFFF r))))
-  #:wrap (deallocator))
-(define (maybe-CloseThemeData v) (when v (CloseThemeData v)))
-(define-uxtheme OpenThemeData (_wfun _HWND _string/utf-16 -> (_or-null _HTHEME))
-  #:wrap (allocator maybe-CloseThemeData))
-
-(define-uxtheme GetThemeFont (_wfun _HTHEME _HDC _int _int _int (f : (_ptr o _LOGFONTW))
-				    -> (r : _HRESULT)
-				    -> (if (negative? r) 
-					   (error 'GetThemeFont "failed: ~s" (bitwise-and #xFFFF r))
-					   f)))
-
-(define-uxtheme GetThemeSysFont(_wfun (_or-null _HTHEME) _int (f : (_ptr o _LOGFONTW))
-				      -> (r : _HRESULT)
-				      -> (if (negative? r) 
-					     (error 'GetThemeSysFont "failed: ~s" (bitwise-and #xFFFF r))
-					     f)))
-
-(define-uxtheme DrawThemeBackground (_wfun _HTHEME _HDC _int _int _RECT-pointer (_or-null _RECT-pointer) -> (r : _HRESULT)
-                                           -> (when (negative? r)
-                                                (error 'DrawThemeBackground "failed: ~s" (bitwise-and #xFFFF r)))))
-(define-uxtheme DrawThemeParentBackground (_wfun _HWND _HDC _pointer -> (r : _HRESULT)
-                                                 -> (when (negative? r)
-                                                      (error 'DrawThemeParentBackground "failed: ~s" (bitwise-and #xFFFF r)))))
-(define-uxtheme DrawThemeEdge (_wfun _HWND _HDC _int _int _RECT-pointer _int _int _RECT-pointer -> (r : _HRESULT)
-                                     -> (when (negative? r)
-                                          (error 'DrawThemeEdge "failed: ~s" (bitwise-and #xFFFF r)))))
-
-(define-uxtheme EnableThemeDialogTexture (_wfun _HWND _DWORD -> (r : _HRESULT)
-                                                -> (when (negative? r)
-                                                     (error 'EnableThemeDialogTexture "failed: ~s" (bitwise-and #xFFFF r)))))
-
-(define BP_PUSHBUTTON 1)
-(define PBS_NORMAL 1)
-(define TMT_FONT 210)
-(define TMT_BODYFONT 809)
-
-(define TMT_MSGBOXFONT 805)
-
-(define theme-logfont (GetThemeSysFont #f TMT_MSGBOXFONT))
-
-(define (get-theme-logfont)
-  theme-logfont)
-
-(define (get-theme-font-face)
-  (cast (array-ptr (LOGFONTW-lfFaceName theme-logfont)) _pointer _string/utf-16))
-
-(define (get-theme-font-size)
-  (abs (LOGFONTW-lfHeight theme-logfont)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/types.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/types.rkt
deleted file mode 100644
index 6fbfee9712..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/types.rkt
+++ /dev/null
@@ -1,141 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/winapi)
-
-(provide
- (protect-out _wfun
-              
-              _WORD
-              _DWORD
-              _UDWORD
-              _ATOM
-              _WPARAM
-              _LPARAM
-              _LRESULT
-              _BOOL
-              _UINT
-              _UINT_PTR
-              _BYTE
-              _LONG
-              _ULONG
-              _SHORT
-              _HRESULT
-              _WCHAR
-              _SIZE_T
-              _INT_PTR
-
-              _HINSTANCE
-              _HWND
-              _HMENU
-              _HICON
-              _HCURSOR
-              _HBRUSH
-              _HDC
-              _HFONT
-              _HBITMAP
-              _HANDLE
-
-              _COLORREF
-
-              _fnpointer
-
-              _permanent-string/utf-16
-              utf-16-length
-
-              (struct-out POINT) _POINT _POINT-pointer 
-              (struct-out RECT) _RECT _RECT-pointer
-              (struct-out MSG) _MSG _MSG-pointer
-
-              HIWORD
-              LOWORD
-              MAKELONG
-              MAKELPARAM))
-
-(define-syntax-rule (_wfun . a)
-  (_fun #:abi winapi . a))
-
-(define _WORD _int16)
-(define _DWORD _int32)
-(define _UDWORD _uint32)
-(define _ATOM _int)
-(define _UINT_PTR _uintptr)
-(define _WPARAM _intptr) ; supposed to be _UINT_PTR, but we have some sign mismatch
-(define _LONG_PTR _intptr)
-(define _LPARAM _LONG_PTR)
-(define _LRESULT _LONG_PTR)
-(define _BOOL (make-ctype _int (lambda (v) (if v 1 0)) (lambda (v) (not (zero? v)))))
-(define _UINT _uint)
-(define _BYTE _uint8)
-(define _HRESULT _long)
-(define _WCHAR _int16)
-(define _SIZE_T _long)
-(define _INT_PTR _intptr)
-
-(define _HINSTANCE (_cpointer/null 'HINSTANCE))
-(define _HWND (_cpointer/null 'HWND))
-(define _HMENU (_cpointer/null 'HMENU))
-(define _HICON (_cpointer/null 'HICON))
-(define _HCURSOR (_cpointer/null 'HCURSOR))
-(define _HBRUSH (_cpointer/null 'HBRUSH))
-(define _HDC (_cpointer/null 'HDC))
-(define _HFONT (_cpointer/null 'HFONT))
-(define _HBITMAP (_cpointer/null 'HBITMAP))
-(define _HANDLE (_cpointer/null 'HANDLE))
-
-(define _COLORREF _DWORD)
-
-(define _fnpointer (_or-null _fpointer))
-
-(define (utf-16-length s)
-  (for/fold ([len 0]) ([c (in-string s)])
-    (+ len
-       (if ((char->integer c) . > . #xFFFF)
-           2
-           1))))
-
-(define _permanent-string/utf-16
-  (make-ctype _pointer
-              (lambda (s)
-                (and s
-                     (let ([v (malloc _gcpointer)])
-                       (ptr-set! v _string/utf-16 s)
-                       (let ([p (ptr-ref v _gcpointer)])
-                         (let ([len (+ 1 (utf-16-length s))])
-                           (let ([c (malloc len _uint16 'raw)])
-                             (memcpy c p len _uint16)
-                             c))))))
-              (lambda (p) p)))
-
-(define _LONG _long)
-(define _ULONG _ulong)
-(define _SHORT _short)
-
-(define-cstruct _POINT ([x _LONG]
-                        [y _LONG]))
-
-(define-cstruct _RECT ([left _LONG]
-                       [top _LONG]
-                       [right _LONG]
-                       [bottom _LONG]))
-
-(define-cstruct _MSG ([hwnd _HWND]
-                      [message _UINT]
-                      [wParam _WPARAM]
-                      [lParam _LPARAM]
-                      [time _DWORD]
-                      [pt _POINT]))
-
-(define (short v)
-  (if (zero? (bitwise-and #x8000 v))
-      v
-      (bitwise-ior v (arithmetic-shift -1 15))))
-
-(define (HIWORD v)
-  (short (arithmetic-shift v -16)))
-(define (LOWORD v)
-  (short (bitwise-and v #xFFFF)))
-
-(define (MAKELONG a b)
-  (bitwise-ior (arithmetic-shift b 16) 
-               (bitwise-and a #xFFFF)))
-(define (MAKELPARAM a b) (MAKELONG a b))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/utils.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/utils.rkt
deleted file mode 100644
index 0b176eaf5d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/utils.rkt
+++ /dev/null
@@ -1,205 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-	 ffi/unsafe/define
-	 ffi/unsafe/alloc
-         "../common/utils.rkt"
-	 "../../lock.rkt"
-         "types.rkt"
-	 "const.rkt")
-
-(provide
- define-mz
- (protect-out define-gdi32
-              define-user32
-              define-kernel32
-              define-comctl32
-              define-comdlg32
-              define-shell32
-              define-uxtheme
-              define-winmm
-              failed
-	      is-win64?
-
-              GetLastError
-
-              GetWindowLongPtrW
-              SetWindowLongPtrW
-              SendMessageW SendMessageW/str SendMessageW/ptr
-              GetSysColor GetRValue GetGValue GetBValue make-COLORREF
-              CreateBitmap
-              CreateCompatibleBitmap
-              DeleteObject
-              CreateCompatibleDC
-              DeleteDC
-              MoveWindow
-              ShowWindow
-              EnableWindow
-              SetWindowTextW
-              SetCursor
-              GetDC
-              ReleaseDC
-              InvalidateRect
-              ValidateRect
-              GetMenuState
-              CheckMenuItem
-              ModifyMenuW
-              RemoveMenu
-              SelectObject
-              WideCharToMultiByte
-	      GetDeviceCaps
-	      strip-&
-	      ->screen
-	      ->screen*
-	      ->normal))
-
-(define gdi32-lib (ffi-lib "gdi32.dll"))
-(define user32-lib (ffi-lib "user32.dll"))
-(define kernel32-lib (ffi-lib "kernel32.dll"))
-(define comctl32-lib (ffi-lib "comctl32.dll"))
-(define comdlg32-lib (ffi-lib "comdlg32.dll"))
-(define shell32-lib (ffi-lib "shell32.dll"))
-(define uxtheme-lib (ffi-lib "uxtheme.dll"))
-(define winmm-lib (ffi-lib "winmm.dll"))
-
-(define-ffi-definer define-gdi32 gdi32-lib)
-(define-ffi-definer define-user32 user32-lib)
-(define-ffi-definer define-kernel32 kernel32-lib)
-(define-ffi-definer define-comctl32 comctl32-lib)
-(define-ffi-definer define-comdlg32 comdlg32-lib)
-(define-ffi-definer define-shell32 shell32-lib)
-(define-ffi-definer define-uxtheme uxtheme-lib)
-(define-ffi-definer define-winmm winmm-lib)
-
-(define-kernel32 GetLastError (_wfun -> _DWORD))
-
-(define (failed who)
-  ;; There's a race condition between this use of GetLastError()
-  ;;  and other Racket threads that may have run since
-  ;;  the call in this thread that we're reporting as failed.
-  ;;  In the rare case that we lose a race, though, it just
-  ;;  means a bad report for an error that shouldn't have happened
-  ;;; anyway.
-  (error who "call failed (~s)"
-         (GetLastError)))
-
-(define is-win64?
-  (equal? "win32\\x86_64" 
-	  (path->string (system-library-subpath #f))))
-
-(define GetWindowLongPtrW
-  (get-ffi-obj (if is-win64? 'GetWindowLongPtrW 'GetWindowLongW) user32-lib
-	       (_wfun _HWND _int -> _pointer)))
-(define SetWindowLongPtrW
-  (get-ffi-obj (if is-win64? 'SetWindowLongPtrW 'SetWindowLongW) user32-lib
-	       (_wfun _HWND _int _pointer -> _pointer)))
-
-(define-user32 SendMessageW (_wfun _HWND _UINT _WPARAM _LPARAM -> _LRESULT))
-(define-user32 SendMessageW/str (_wfun _HWND _UINT _WPARAM _string/utf-16 -> _LRESULT)
-  #:c-id SendMessageW)
-(define-user32 SendMessageW/ptr (_wfun _HWND _UINT _WPARAM _pointer -> _LRESULT)
-  #:c-id SendMessageW)
-
-(define-user32 GetSysColor (_wfun _int -> _DWORD))
-
-(define (GetRValue v) (bitwise-and v #xFF))
-(define (GetGValue v) (bitwise-and (arithmetic-shift v -8) #xFF))
-(define (GetBValue v) (bitwise-and (arithmetic-shift v -16) #xFF))
-(define (make-COLORREF r g b) (bitwise-ior
-                               r
-                               (arithmetic-shift g 8)
-                               (arithmetic-shift b 16)))
-
-(define-user32 MoveWindow(_wfun _HWND _int _int _int _int _BOOL -> (r : _BOOL)
-                                -> (unless r (failed 'MoveWindow))))
-
-(define-user32 ShowWindow (_wfun _HWND _int -> (previously-shown? : _BOOL) -> (void)))
-(define-user32 EnableWindow (_wfun _HWND _BOOL -> _BOOL))
-
-(define-user32 SetWindowTextW (_wfun _HWND _string/utf-16 -> (r : _BOOL)
-                                     -> (unless r (failed 'SetWindowText))))
-
-(define-user32 SetCursor (_wfun _HCURSOR -> _HCURSOR))
-
-(define-user32 _GetDC (_wfun  _HWND -> _HDC)
-  #:c-id GetDC)
-(define (GetDC hwnd)
-  (((allocator (lambda (hdc) (ReleaseDC hwnd hdc)))
-    _GetDC)
-   hwnd))
-
-(define-user32 ReleaseDC (_wfun _HWND _HDC -> _int)
-  #:wrap (deallocator cadr))
-
-(define-gdi32 DeleteObject (_wfun _pointer -> (r : _BOOL)
-                                  -> (unless r (failed 'DeleteObject)))
-  #:wrap (deallocator))
-
-(define-gdi32 CreateCompatibleBitmap (_wfun _HDC _int _int -> _HBITMAP)
-  #:wrap (allocator DeleteObject))
-(define-gdi32 CreateBitmap (_wfun _int _int _UINT _UINT _pointer -> _HBITMAP)
-  #:wrap (allocator DeleteObject))
-
-(define-gdi32 DeleteDC (_wfun _HDC -> (r : _BOOL)
-                              -> (unless r (failed 'DeleteDC)))
-  #:wrap (deallocator))
-(define-gdi32 CreateCompatibleDC (_wfun _HDC -> _HDC)
-  #:wrap (allocator DeleteDC))
-
-(define-user32 InvalidateRect (_wfun _HWND (_or-null _RECT-pointer) _BOOL -> (r : _BOOL)
-                                     -> (unless r (failed 'InvalidateRect))))
-(define-user32 ValidateRect (_wfun _HWND (_or-null _RECT-pointer) -> (r : _BOOL)
-                                   -> (unless r (failed 'ValidateRect))))
-
-(define-user32 GetMenuState (_wfun _HMENU _UINT _UINT -> _UINT))
-(define-user32 CheckMenuItem (_wfun _HMENU _UINT _UINT -> _DWORD))
-(define-user32 ModifyMenuW (_wfun _HMENU _UINT _UINT _UINT_PTR _string/utf-16
-                                  -> (r : _BOOL)
-                                  -> (unless r (failed 'ModifyMenuW))))
-(define-user32 RemoveMenu (_wfun _HMENU _UINT _UINT -> (r : _BOOL)
-                                 -> (unless r (failed 'RemoveMenu))))
-
-(define-gdi32 SelectObject (_wfun _HDC _pointer -> _pointer))
-
-(define-kernel32 WideCharToMultiByte (_wfun _UINT _DWORD _pointer _int
-                                            _pointer _int _pointer _pointer
-                                            -> _int))
-;; ----------------------------------------
-
-(define (strip-& s)
-  (if (string? s)
-      (regexp-replace* #rx"&(.)" s "\\1")
-      s))
-
-;; ----------------------------------------
-
-(define-gdi32 GetDeviceCaps (_wfun _HDC _int -> _int))
-
-(define screen-dpi
-  (atomically
-   (let ([hdc (GetDC #f)])
-     (begin0
-      (GetDeviceCaps hdc LOGPIXELSX)
-      (ReleaseDC #f hdc)))))
-
-;; Convert a normalized (conceptually 96-dpi) measure into a screen measure
-(define (->screen x)
-  (and x
-       (if (= screen-dpi 96)
-	   x
-	   (if (exact? x)
-	       (ceiling (/ (* x screen-dpi) 96))
-	       (/ (* x screen-dpi) 96)))))
-(define (->screen* x)
-  (if (and (not (= screen-dpi 96))
-	   (exact? x))
-      (floor (/ (* x screen-dpi) 96))
-      (->screen x)))
-
-;; Convert a screen measure to a normalize (conceptually 96-dpi) measure
-(define (->normal x)
-  (and x
-       (if (= screen-dpi 96)
-	   x
-	   (if (exact? x)
-	       (floor (/ (* x 96) screen-dpi))
-	       (/ (* x 96) screen-dpi)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/window.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/window.rkt
deleted file mode 100644
index 0982520b60..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/window.rkt
+++ /dev/null
@@ -1,874 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-	 racket/class
-	 racket/draw
-	 racket/draw/unsafe/bstr
-         "../../syntax.rkt"
-         "../common/freeze.rkt"
-         "../common/queue.rkt"
-         "../common/event.rkt"
-         "../common/local.rkt"
-         "../../lock.rkt"
-         "utils.rkt"
-         "types.rkt"
-         "const.rkt"
-         "wndclass.rkt"
-         "queue.rkt"
-         "theme.rkt"
-         "cursor.rkt"
-         "key.rkt"
-	 "dc.rkt"
-         "font.rkt")
-
-(provide
- (protect-out window%
-              queue-window-event
-              queue-window-refresh-event
-              location->window
-              flush-display
-	      get-default-control-font
-
-              GetWindowRect
-              GetClientRect
-
-              _NMHDR))
-
-(define (unhide-cursor) (void))
-
-(define WM_PRINT                        #x0317)
-(define WM_PRINTCLIENT                  #x0318)
-
-(define MK_LBUTTON          #x0001)
-(define MK_RBUTTON          #x0002)
-(define MK_SHIFT            #x0004)
-(define MK_CONTROL          #x0008)
-(define MK_MBUTTON          #x0010)
-(define MK_XBUTTON1         #x0020)
-(define MK_XBUTTON2         #x0040)
-
-(define HTHSCROLL           6)
-(define HTVSCROLL           7)
-
-(define-user32 GetWindowRect (_wfun _HWND (rect : (_ptr o _RECT)) -> (r : _BOOL) ->
-                                    (if r rect (failed 'GetWindowRect))))
-(define-user32 GetClientRect (_wfun _HWND (rect : (_ptr o _RECT)) -> (r : _BOOL) ->
-                                    (if r rect (failed 'GetClientRect))))
-
-(define-user32 ClientToScreen (_wfun _HWND _POINT-pointer -> (r : _BOOL)
-                                     -> (unless r (failed 'ClientToScreen))))
-(define-user32 ScreenToClient (_wfun _HWND _POINT-pointer -> (r : _BOOL)
-                                     -> (unless r (failed 'ClientToScreen))))
-
-(define-gdi32 CreateFontIndirectW (_wfun _LOGFONTW-pointer -> _HFONT))
-
-(define-shell32 DragAcceptFiles (_wfun _HWND _BOOL -> _void))
-
-(define _HDROP _pointer)
-(define-shell32 DragQueryFileW (_wfun _HDROP _UINT _pointer _UINT -> _UINT))
-(define-shell32 DragFinish (_wfun _HDROP -> _void))
-
-(define-user32 SetCapture (_wfun _HWND -> _HWND))
-(define-user32 ReleaseCapture (_wfun -> _BOOL))
-
-(define-user32 WindowFromPoint (_wfun _POINT -> _HWND))
-(define-user32 GetParent (_wfun _HWND -> _HWND))
-(define-user32 SetParent (_wfun _HWND _HWND -> (r : _HWND)
-                                -> (unless r (failed 'SetParent))))
-
-(define-user32 SetCursorPos (_wfun _int _int -> _BOOL))
-
-(define-cstruct _NMHDR
-  ([hwndFrom _HWND]
-   [idFrom _pointer]
-   [code _UINT]))
-
-(define-user32 GetDialogBaseUnits (_fun -> _LONG))
-(define measure-dc #f)
-
-(define theme-hfont #f)
-
-#;
-(define-values (dlu-x dlu-y)
-  (let ([v (GetDialogBaseUnits)])
-    (values (* 1/4 (bitwise-and v #xFFFF))
-	    (* 1/8 (arithmetic-shift v -16)))))
-
-(define-cstruct _LOGBRUSH
-  ([lbStyle _UINT]
-   [lbColor _COLORREF]
-   [lbHatch _pointer]))
-
-(define BS_NULL 1)
-(define transparent-logbrush (make-LOGBRUSH BS_NULL 0 #f))
-
-(define-gdi32 CreateBrushIndirect (_wfun _LOGBRUSH-pointer -> _HBRUSH))
-
-(define TRANSPARENT 1)
-(define-gdi32 SetBkMode (_wfun _HDC _int -> (r : _int)
-                               -> (when (zero? r) (failed 'SetBkMode))))
-
-(define-user32 BeginPaint (_wfun _HWND _pointer -> _HDC))
-(define-user32 EndPaint (_wfun _HDC _pointer -> _BOOL))
-
-(define WM_IS_GRACKET (cast (scheme_register_process_global "PLT_WM_IS_GRACKET" #f)
-                            _pointer
-                            _UINT_PTR))
-(define GRACKET_GUID (cast (scheme_register_process_global "PLT_GRACKET_GUID" #f)
-                           _pointer
-                           _bytes))
-(define-cstruct _COPYDATASTRUCT
-  ([dwData _pointer]
-   [cbData _DWORD]
-   [lpData _pointer]))
-
-(define-cstruct _TRACKMOUSEEVENT
-  ([cbSize _DWORD]
-   [dwFlags _DWORD]
-   [hwndTrack _HWND]
-   [dwHoverTime _DWORD]))
-
-(define TME_LEAVE #x02)
-(define TME_NONCLIENT #x10)
-
-(define-user32 TrackMouseEvent (_wfun _TRACKMOUSEEVENT-pointer -> (r : _BOOL)
-                                      -> (unless r (failed 'TrackMouseEvent))))
-(define-user32 GetCursorPos (_wfun _POINT-pointer -> _BOOL))
-
-(defclass window% object%
-  (init-field parent hwnd)
-  (init style
-        [extra-hwnds null])
-
-  (define enabled? #t)
-  (define parent-enabled? #t)
-
-  (super-new)
-  
-  (define eventspace (if parent
-                         (send parent get-eventspace)
-                         (current-eventspace)))
-
-  (set-hwnd-wx! hwnd this)
-  (for ([extra-hwnd (in-list extra-hwnds)])
-    (set-hwnd-wx! extra-hwnd this))
-
-  (define/public (get-hwnd) hwnd)
-  (define/public (get-client-hwnd) hwnd)
-  (define/public (get-content-hwnd) (get-client-hwnd))
-  (define/public (get-focus-hwnd) hwnd)
-  (define/public (get-eventspace) eventspace)
-
-  (define/public (is-hwnd? a-hwnd)
-    (ptr-equal? hwnd a-hwnd))
-  
-  (define/public (wndproc w msg wParam lParam default)
-    (if (try-mouse w msg wParam lParam)
-        0
-        (cond
-         [(= msg WM_SETFOCUS)
-          (set-top-focus this null w)
-          (queue-window-event this (lambda () (on-set-focus)))
-          0]
-         [(= msg WM_KILLFOCUS)
-          (queue-window-event this (lambda () (on-kill-focus)))
-          0]
-         [(= msg WM_SYSKEYDOWN)
-          (let ([result (if (or (= wParam VK_MENU) (= wParam VK_F4)) ;; F4 is close
-			    (begin
-			      (unhide-cursor)
-			      (default w msg wParam lParam))
-			    0)])
-	    (do-key w msg wParam lParam #f #f void)
-	    result)]
-         [(= msg WM_KEYDOWN)
-          (do-key w msg wParam lParam #f #f default)]
-         [(= msg WM_KEYUP)
-          (do-key w msg wParam lParam #f #t default)]
-         [(= msg WM_SYSCHAR)
-	  (let ([result (if (= wParam VK_MENU)
-			    (begin
-			      (unhide-cursor)
-			      (default w msg wParam lParam))
-			    0)])
-	    (do-key w msg wParam lParam #t #f void)
-	    result)]
-         [(= msg WM_CHAR)
-          (do-key w msg wParam lParam #t #f default)]
-	 [(= msg WM_MOUSEWHEEL)
-          (gen-wheels w msg lParam (HIWORD wParam) 'wheel-down 'wheel-up)
-	  0]
-         [(= msg WM_MOUSEHWHEEL) ; Vista and later
-          (gen-wheels w msg lParam (HIWORD wParam) 'wheel-left 'wheel-right)
-          0]
-         [(= msg WM_COMMAND)
-          (let* ([control-hwnd (cast lParam _LPARAM _HWND)]
-                 [wx (any-hwnd->wx control-hwnd)]
-                 [cmd (HIWORD wParam)])
-            (if (and wx (send wx is-command? cmd))
-                (begin
-                  (send wx do-command cmd control-hwnd)
-                  0)
-                (default w msg wParam lParam)))]
-         [(= msg WM_NOTIFY)
-          (let* ([nmhdr (cast lParam _LPARAM _NMHDR-pointer)]
-                 [control-hwnd (NMHDR-hwndFrom nmhdr)]
-                 [wx (any-hwnd->wx control-hwnd)]
-                 [cmd (LOWORD (NMHDR-code nmhdr))])
-            (if (and wx (send wx is-command? cmd))
-                (begin
-                  (send wx do-command-ex cmd control-hwnd nmhdr)
-                  0)
-                (default w msg wParam lParam)))]
-         [(or (= msg WM_HSCROLL)
-              (= msg WM_VSCROLL))
-          (let* ([control-hwnd (cast lParam _LPARAM _HWND)]
-                 [wx (any-hwnd->wx control-hwnd)])
-            (if wx
-                (begin
-                  (send wx control-scrolled)
-                  0)
-                (default w msg wParam lParam)))]
-         [(= msg WM_DROPFILES)
-          (handle-drop-files wParam)
-          0]
-         ;; for single-instance applications:
-         [(and (= msg WM_IS_GRACKET)
-               (positive? WM_IS_GRACKET))
-          ;; return 79 to indicate that this is a GRacket window
-          79]
-         ;; also for single-instance:
-         [(= msg WM_COPYDATA)
-          (handle-copydata lParam)
-          0]
-	 [(= msg WM_INPUTLANGCHANGE)
-	  (reset-key-mapping)
-	  0]
-         [else
-          (default w msg wParam lParam)])))
-
-  (define/public (is-command? cmd) #f)
-  (define/public (control-scrolled) #f)
-
-  (define/public (do-command cmd control-hwnd)
-    (void))
-  (define/public (do-command-ex cmd control-hwnd nmhdr)
-    (do-command cmd control-hwnd))
-
-  (define/public (show on?)
-    (when on? (show-children))
-    (atomically (direct-show on?)))
-
-  (define shown? #f)
-  (define/public (direct-show on? [on-mode SW_SHOW])
-    ;; atomic mode
-    (set! shown? (and on? #t))
-    (register-child-in-parent on?)
-    (unless on? (not-focus-child this))
-    (ShowWindow hwnd (if on? on-mode SW_HIDE)))
-  (unless (memq 'deleted style)
-    (show #t))
-  
-  (define/public (queue-on-size) (void))
-
-  (define/public (on-set-focus) (void))
-  (define/public (on-kill-focus) (void))
-  (define/public (get-handle) hwnd)
-  (define/public (get-client-handle) (get-content-hwnd))
-
-  (define/public (enable on?)
-    (unless (eq? enabled? (and on? #t))
-      (atomically
-       (let ([prev? (and enabled? parent-enabled?)])
-         (set! enabled? (and on? #t))
-         (let ([now? (and parent-enabled? enabled?)])
-           (unless (eq? now? prev?)
-             (internal-enable now?)))))))
-  (define/public (parent-enable on?)
-    (unless (eq? on? parent-enabled?)
-      (let ([prev? (and enabled? parent-enabled?)])
-        (set! parent-enabled? (and on? #t))
-        (let ([now? (and parent-enabled? enabled?)])
-          (unless (eq? prev? now?)
-            (internal-enable now?))))))
-  (define/public (internal-enable on?)
-    (void (EnableWindow hwnd on?)))
-
-  (define/public (is-window-enabled?) enabled?)
-  (define/public (is-enabled-to-root?)
-    (and enabled? parent-enabled?))
-
-  (define/public (is-shown-to-root?)
-    (and shown?
-	 (send parent is-shown-to-root?)))
-
-  (define/public (is-shown?)
-    shown?)
-
-  (define/public (get-x)
-    (let ([r (GetWindowRect hwnd)]
-          [pr (GetWindowRect (send parent get-content-hwnd))])
-      (->normal (- (RECT-left r) (RECT-left pr)))))
-  (define/public (get-y)
-    (let ([r (GetWindowRect hwnd)]
-          [pr (GetWindowRect (send parent get-content-hwnd))])
-      (->normal (- (RECT-top r) (RECT-top pr)))))
-
-  (define/public (get-width)
-    (let ([r (GetWindowRect hwnd)])
-      (->normal (- (RECT-right r) (RECT-left r)))))
-  (define/public (get-height)
-    (let ([r (GetWindowRect hwnd)])
-      (->normal (- (RECT-bottom r) (RECT-top r)))))
-
-  (define/public (notify-child-extent x y)
-    (void))
-
-  ;; Converting from normalized to screen coordinates
-  ;; with just `->screen` can cause a child's right edge
-  ;; to extend beyond the parent's right edge, due to
-  ;; rounding via `ceiling`. Allow controls that would
-  ;; look bad to round down, instead.
-  (define/public (size->screen v) (->screen v))
-
-  (define/public (set-size x y w h)
-    (let-values ([(x y w h)
-                  (if (or (not x)
-                          (not y)
-                          (= w -1)
-                          (= h -1))
-                      (let ([r (GetWindowRect hwnd)])
-                        (values (or x (->normal (RECT-left r)))
-                                (or y (->normal (RECT-top r)))
-                                (if (= w -1) (->normal (- (RECT-right r) (RECT-left r))) w)
-                                (if (= h -1) (->normal (- (RECT-bottom r) (RECT-top r))) h)))
-                      (values x y w h))])
-      (when parent (send parent notify-child-extent (+ x w) (+ y h)))
-      (MoveWindow hwnd (->screen x) (->screen y) (size->screen w) (size->screen h) #t))
-    (unless (and (= w -1) (= h -1))
-      (on-resized))
-    (queue-on-size)
-    (refresh-one))
-  (define/public (move x y)
-    (set-size x y -1 -1))
-
-  (define/public (set-control-font font [hwnd hwnd])
-    (unless theme-hfont
-      (set! theme-hfont (CreateFontIndirectW (get-theme-logfont))))
-    (let ([hfont (if font
-                     (or (font->hfont font)
-			 theme-hfont)
-                     theme-hfont)])
-      (SendMessageW hwnd WM_SETFONT (cast hfont _HFONT _LPARAM) 0)))
-
-  (define/public (auto-size font label min-w min-h dw dh
-                            [resize
-                             (lambda (w h) (set-size #f #f w h))]
-                            #:combine-width [combine-w max]
-                            #:combine-height [combine-h max]
-                            #:scale-w [scale-w 1]
-                            #:scale-h [scale-h 1])
-    (atomically
-     (unless measure-dc
-       (let* ([bm (make-object win32-bitmap% 1 1 #f)]
-              [dc (make-object bitmap-dc% bm)])
-         (set! measure-dc dc)))
-     (send measure-dc set-font (or font
-				   (get-default-control-font)))
-     (let-values ([(w h d a) (let loop ([label label])
-                               (cond
-                                [(null? label) (values 0 0 0 0)]
-                                [(label . is-a? . bitmap%)
-                                 (values (send label get-width)
-                                         (send label get-height)
-                                         0
-                                         0)]
-                                [(pair? label)
-                                 (let-values ([(w1 h1 d1 a1)
-                                               (loop (car label))]
-                                              [(w2 h2 d2 a2)
-                                               (loop (cdr label))])
-                                   (values (combine-w w1 w2) (combine-h h1 h2)
-                                           (combine-h d1 d1) (combine-h a1 a2)))]
-                                [else
-                                 (define strs (regexp-split #rx"\n" label))
-                                 (for/fold ([w 0][h 0][d 0] [a 0]) ([str (in-list strs)])
-                                   (define-values (tw th d a) (send measure-dc get-text-extent label #f #t))
-                                   (values (max w tw) (+ h th) 0 0))]))]
-                  [(->int) (lambda (v) (inexact->exact (ceiling v)))])
-       (resize (->int (* scale-h (max (+ w dw) min-w)))
-               (->int (* scale-w (max (+ h dh) min-h)))))))
-
-  (define/public (popup-menu m x y)
-    (let ([gx (box x)]
-          [gy (box y)])
-      (client-to-screen gx gy)
-      (send m popup (unbox gx) (unbox gy)
-            hwnd
-            (lambda (thunk) (queue-window-event this thunk)))))
-
-  (define/public (center a b) (void))
-
-  (define/public (get-parent) parent)
-  (define/public (set-parent p) 
-    ;; in atomic mode
-    (set! parent p)
-    (SetParent hwnd (send parent get-content-hwnd)))
-
-  (define/public (is-frame?) #f)
-
-  (define/public (refresh-one) (void))
-  (define/public (refresh)
-    (refresh-one)
-    (refresh-all-children))
-  (define/public (refresh-all-children) (void))
-
-  (define/public (on-resized) (void))
-
-  (define event-position-wrt-wx #f)
-  (define/public (set-event-positions-wrt wx)
-    (set! event-position-wrt-wx wx))
-
-  (define/private (adjust-event-position x y)
-    (if event-position-wrt-wx
-        (let ([xb (box x)]
-              [yb (box y)])
-          (internal-client-to-screen xb yb)
-          (send event-position-wrt-wx internal-screen-to-client xb yb)
-          (values (unbox xb) (unbox yb)))
-        (values x y)))
-
-  (define/public (screen-to-client x y)
-    (internal-screen-to-client x y))
-  (define/public (internal-screen-to-client x y)
-    (let ([p (make-POINT (->screen (unbox x)) (->screen (unbox y)))])
-      (ScreenToClient (get-client-hwnd) p)
-      (set-box! x (->normal (POINT-x p)))
-      (set-box! y (->normal (POINT-y p)))))
-  (define/public (client-to-screen x y)
-    (internal-client-to-screen x y))
-  (define/public (internal-client-to-screen x y)
-    (let ([p (make-POINT (->screen (unbox x)) (->screen (unbox y)))])
-      (ClientToScreen (get-client-hwnd) p)
-      (set-box! x (->normal (POINT-x p)))
-      (set-box! y (->normal (POINT-y p)))))
-
-  (define/public (warp-pointer x y)
-    (define xb (box x))
-    (define yb (box y))
-    (client-to-screen xb yb)
-    (void (SetCursorPos (->screen (unbox xb)) (->screen (unbox yb)))))
-
-  (define/public (in-content? p)
-    (ScreenToClient (get-client-hwnd) p)
-    (let ([r (GetClientRect (get-client-hwnd))])
-      (and (< 0 (POINT-x p) (- (RECT-right r)
-			       (RECT-left r)))
-	   (< 0 (POINT-y p) (- (RECT-bottom r)
-			       (RECT-top r))))))
-
-  (define/public (drag-accept-files on?)
-    (DragAcceptFiles (get-hwnd) on?))
-
-  (define/private (handle-drop-files wParam)
-    (let* ([hdrop (cast wParam _WPARAM _HDROP)]
-           [count (DragQueryFileW hdrop #xFFFFFFFF #f 0)])
-      (for ([i (in-range count)])
-        (let* ([len (DragQueryFileW hdrop i #f 0)]
-               [b (malloc (add1 len) _int16)])
-          (DragQueryFileW hdrop i b (add1 len))
-          (let ([s (cast b _gcpointer _string/utf-16)])
-            (queue-window-event this (lambda () (on-drop-file (string->path s)))))))
-      (DragFinish hdrop)))
-
-  (define/public (on-drop-file p) (void))
-
-  (define/public (get-client-size w h)
-    (let ([r (GetClientRect (get-client-hwnd))])
-      (set-box! w (->normal (- (RECT-right r) (RECT-left r))))
-      (set-box! h (->normal (- (RECT-bottom r) (RECT-top r))))))
-
-  (define/public (get-size w h)
-    (let ([r (GetWindowRect (get-client-hwnd))])
-      (set-box! w (->normal (- (RECT-right r) (RECT-left r))))
-      (set-box! h (->normal (- (RECT-bottom r) (RECT-top r))))))
-
-  (define cursor-handle #f)
-  (define/public (set-cursor c)
-    (set! cursor-handle (and c (send (send c get-driver) get-handle)))
-    (when mouse-in?
-      (cursor-updated-here)))
-
-  (define/public (cursor-updated-here)
-    (when mouse-in?
-      (send (get-top-frame) reset-cursor (get-arrow-cursor))))
-
-  (define/public (reset-cursor-in-child child default)
-    (send child reset-cursor (or cursor-handle default)))
-
-  (define effective-cursor-handle #f)
-  (define/public (reset-cursor default)
-    (let ([c (or cursor-handle default)])
-      (set! effective-cursor-handle c)
-      (SetCursor c)))
-
-  (define/public (no-cursor-handle-here)
-    (send parent cursor-updated-here))
-
-  (define/public (set-focus [child-hwnd hwnd])
-    (when (can-accept-focus?)
-      (set-top-focus this null child-hwnd)))
-
-  (define/public (can-accept-focus?)
-    (child-can-accept-focus?))
-
-  (define/public (child-can-accept-focus?)
-    (and shown?
-         (send parent child-can-accept-focus?)))
-
-  (define/public (set-top-focus win win-path hwnd)
-    (send parent set-top-focus win (cons this win-path) hwnd))
-  (define/public (not-focus-child v)
-    (send parent not-focus-child v))
-
-  (define/public (gets-focus?) #f)
-
-  (define/public (register-child child on?)
-    (void))
-  (define/public (register-child-in-parent on?)
-    (when parent
-      (send parent register-child this on?)))
-
-  (define/public (show-children) (void))
-  (define/public (paint-children) (void))
-
-  (define/public (get-top-frame)
-    (send parent get-top-frame))
-
-  (define/private (gen-wheels w msg lParam val down up)
-    (let ([orig-delta (quotient val WHEEL_DELTA)])
-      (let loop ([delta (abs orig-delta)])
-        (unless (zero? delta)
-          (do-key w msg (if (negative? orig-delta)
-                            down
-                            up)
-                  lParam #f #f void)
-          (loop (sub1 delta))))))
-  
-  (define/private (do-key w msg wParam lParam is-char? is-up? default)
-    (let ([e (maybe-make-key-event #f wParam lParam is-char? is-up? hwnd)])
-      (if (or (and e
-		   (if (definitely-wants-event? w msg wParam e)
-		       (begin
-			 (queue-window-event this (lambda () (dispatch-on-char/sync e)))
-			 #t)
-		       (constrained-reply eventspace
-					  (lambda () (dispatch-on-char e #t))
-					  #t)))
-	      (capture-all-key-events?))
-          0
-          (default w msg wParam lParam))))
-
-  (define/public (try-mouse w msg wParam lParam)
-    (cond
-     [(= msg WM_RBUTTONDOWN)
-      (do-mouse w msg #f 'right-down wParam lParam)]
-     [(= msg WM_RBUTTONUP)
-      (do-mouse w msg #f 'right-up wParam lParam)]
-     [(= msg WM_RBUTTONDBLCLK)
-      (do-mouse w msg #f 'right-down wParam lParam)]
-     [(= msg WM_MBUTTONDOWN)
-      (do-mouse w msg #f 'middle-down wParam lParam)]
-     [(= msg WM_MBUTTONUP)
-      (do-mouse w msg #f 'middle-up wParam lParam)]
-     [(= msg WM_MBUTTONDBLCLK)
-      (do-mouse w msg #f 'middle-down wParam lParam)]
-     [(= msg WM_LBUTTONDOWN)
-      (do-mouse w msg #f 'left-down wParam lParam)]
-     [(= msg WM_LBUTTONUP)
-      (do-mouse w msg #f 'left-up wParam lParam)]
-     [(= msg WM_LBUTTONDBLCLK)
-      (do-mouse w msg #f 'left-down wParam lParam)]
-     [(= msg WM_MOUSEMOVE)
-      (do-mouse w msg #f 'motion wParam lParam)]
-     [(= msg WM_MOUSELEAVE)
-      (let ([p (make-POINT 0 0)])
-        (let ([f (and (GetCursorPos p)
-		      (location->window* (POINT-x p) (POINT-y p)))])
-          (unless (and (eq? f (get-top-frame))
-		       (send f in-content? p))
-            (do-mouse w msg #f 'leave wParam lParam))))
-      ;; send message on to default handling (e.g., for buttons):
-      #f]
-     [else (try-nc-mouse w msg wParam lParam)]))
-
-  ;; Breaking out NC mouse operations lets us not handle
-  ;; them for frames (where this method is overridden), 
-  ;; since handling them intereferes with the cursor and
-  ;; resize handling for frames.
-  (define/public (try-nc-mouse w msg wParam lParam)
-    (cond
-     [(= msg WM_NCRBUTTONDOWN)
-      (do-mouse w msg #t 'right-down wParam (lp-screen->client w lParam))]
-     [(= msg WM_NCRBUTTONUP)
-      (do-mouse w msg #t 'right-up wParam (lp-screen->client w lParam))]
-     [(= msg WM_NCRBUTTONDBLCLK)
-      (do-mouse w msg #t 'right-down wParam (lp-screen->client w lParam))]
-     [(= msg WM_NCMBUTTONDOWN)
-      (do-mouse w msg #t 'middle-down wParam (lp-screen->client w lParam))]
-     [(= msg WM_NCMBUTTONUP)
-      (do-mouse w msg #t 'middle-up wParam (lp-screen->client w lParam))]
-     [(= msg WM_NCMBUTTONDBLCLK)
-      (do-mouse w msg #t 'middle-down wParam (lp-screen->client w lParam))]
-     [(= msg WM_NCLBUTTONDOWN)
-      (do-mouse w msg #t 'left-down wParam (lp-screen->client w lParam))]
-     [(= msg WM_NCLBUTTONUP)
-      (do-mouse w msg #t 'left-up wParam (lp-screen->client w lParam))]
-     [(= msg WM_NCLBUTTONDBLCLK)
-      (do-mouse w msg #t 'left-down wParam (lp-screen->client w lParam))]
-     [(and (= msg WM_NCMOUSEMOVE)
-           (not (= wParam HTVSCROLL))
-           (not (= wParam HTHSCROLL)))
-      (do-mouse w msg #t 'motion wParam (lp-screen->client w lParam))]
-     [else #f]))
-
-  (define/private (lp-screen->client w lParam)
-    (let ([p (make-POINT (LOWORD lParam) (HIWORD lParam))])
-      (ScreenToClient w p)
-      (MAKELPARAM (POINT-x p) (POINT-y p))))
-
-  (define/private (do-mouse control-hwnd msg nc? type wParam lParam)
-    (let ([x (LOWORD lParam)]
-          [y (HIWORD lParam)]
-          [flags (if nc? 0 wParam)]
-          [bit? (lambda (v b) (not (zero? (bitwise-and v b))))])
-      (let ([make-e 
-             (lambda (type)
-               (define-values (mx my) (adjust-event-position (->normal x) (->normal y)))
-               (new mouse-event%
-                    [event-type type]
-                    [left-down (case type
-                                 [(left-down) #t]
-                                 [(left-up) #f]
-                                 [else (bit? flags MK_LBUTTON)])]
-                    [middle-down (case type
-                                   [(middle-down) #t]
-                                   [(middle-up) #f]
-                                   [else (bit? flags MK_MBUTTON)])]
-                    [right-down (case type
-                                  [(right-down) #t]
-                                  [(right-up) #f]
-                                  [else (bit? flags MK_RBUTTON)])]
-                    [x mx]
-                    [y my]
-                    [shift-down (bit? flags MK_SHIFT)]
-                    [control-down (bit? flags MK_CONTROL)]
-                    [meta-down #f]
-                    [alt-down #f]
-                    [time-stamp 0]
-                    [caps-down #f]))])
-        (if (eq? type 'leave)
-            (let ([t (get-top-frame)])
-              (send t send-child-leaves make-e)
-              (send t send-leaves make-e))
-            (begin
-              (unless nc?
-                (when (wants-mouse-capture? control-hwnd)
-                  (when (memq type '(left-down right-down middle-down))
-                    (SetCapture control-hwnd))
-                  (when (memq type '(left-up right-up middle-up))
-                    (ReleaseCapture))))
-              (if mouse-in?
-                  (if (send-child-leaves make-e)
-                      (cursor-updated-here)
-                      (if (send (get-top-frame) is-wait-cursor-on?)
-                          (void (SetCursor (get-wait-cursor)))
-                          (when effective-cursor-handle
-                            (void (SetCursor effective-cursor-handle)))))
-                  (let ([c (generate-mouse-ins this (lambda (type) (make-e type)))])
-                    (TrackMouseEvent (make-TRACKMOUSEEVENT 
-                                      (ctype-sizeof _TRACKMOUSEEVENT)
-                                      (bitwise-ior TME_LEAVE)
-                                      control-hwnd
-                                      0))
-                    (when c
-                      (set! effective-cursor-handle c)
-                      (void (SetCursor (if (send (get-top-frame) is-wait-cursor-on?)
-                                           (get-wait-cursor)
-                                           c))))))
-              (when (memq type '(left-down right-down middle-down))
-                (set-focus))
-              (handle-mouse-event control-hwnd msg wParam (make-e type)))))))
-
-  (define/private (handle-mouse-event w msg wParam e)
-    (if (definitely-wants-event? w msg wParam e)
-        (begin
-          (queue-window-event this (lambda () (dispatch-on-event/sync e)))
-          #t)
-        (constrained-reply eventspace
-                           (lambda () (dispatch-on-event e #t))
-                           #t)))
-
-  (define skip-enter-leave? #f)
-  (define/public (skip-enter-leave-events skip?)
-    (set! skip-enter-leave? skip?))
-
-  (define mouse-in? #f)
-  (define/public (generate-mouse-ins in-window mk)
-    (if mouse-in?
-        effective-cursor-handle
-        (begin
-          (set! mouse-in? #t)
-          (let ([parent-cursor (generate-parent-mouse-ins mk)])
-	    (unless skip-enter-leave?
-              (handle-mouse-event (get-client-hwnd) 0 0 (mk 'enter)))
-            (let ([c (or cursor-handle parent-cursor)])
-              (set! effective-cursor-handle c)
-              c)))))
-
-  (define/public (generate-parent-mouse-ins mk)
-    (send parent generate-mouse-ins this mk))
-
-  (define/public (send-leaves mk)
-    (when mouse-in?
-      (set! mouse-in? #f)
-      (unless skip-enter-leave?
-        (when mk
-          (let ([e (mk 'leave)])
-	    (if (eq? (current-thread) 
-		     (eventspace-handler-thread eventspace))
-		(handle-mouse-event (get-client-hwnd) 0 0 e)
-		(queue-window-event this
-				    (lambda () (dispatch-on-event/sync e)))))))))
-
-  (define/public (send-child-leaves mk)
-    #f)
-
-  (define/public (wants-mouse-capture? control-hwnd)
-    #f)
-
-  (define/public (definitely-wants-event? w msg wParam e)
-    #f)
-  (define/public (capture-all-key-events?)
-    #f)
-
-  (define/public (dispatch-on-char/sync e)
-    (pre-event-refresh #t)
-    (dispatch-on-char e #f))
-  (define/public (dispatch-on-char e just-pre?) 
-    (cond
-     [(other-modal? this) #t]
-     [(call-pre-on-char this e) #t]
-     [just-pre? #f]
-     [else (when (is-enabled-to-root?) (on-char e)) #t]))
-  
-  (define/public (dispatch-on-event/sync e)
-    (pre-event-refresh #f)
-    (dispatch-on-event e #f))
-  (define/public (dispatch-on-event e just-pre?) 
-    (cond
-     [(other-modal? this e) #t]
-     [(call-pre-on-event this e) #t]
-     [just-pre? #f]
-     [else (when (is-enabled-to-root?) (on-event e)) #t]))
-  
-  (define/public (call-pre-on-event w e)
-    (or (send parent call-pre-on-event w e)
-        (pre-on-event w e)))
-  (define/public (call-pre-on-char w e)
-    (or (send parent call-pre-on-char w e)
-        (pre-on-char w e)))
-  (define/public (pre-on-event w e) #f)
-  (define/public (pre-on-char w e) #f)
-
-  (define/public (on-char e) (void))
-  (define/public (on-event e) (void))
-
-  (define/private (pre-event-refresh key?)
-    ;; Since we break the connection between the
-    ;; Win32 queue and event handling, we
-    ;; re-sync the display in case a stream of
-    ;; events (e.g., key repeat) have a corresponding
-    ;; stream of screen updates.
-    (flush-display))
-
-  (define/public (get-dialog-level) (send parent get-dialog-level)))
-
-;; ----------------------------------------
-
-(define (handle-copydata lParam)
-  (let* ([cd (cast lParam _LPARAM _COPYDATASTRUCT-pointer)]
-         [data (COPYDATASTRUCT-lpData cd)]
-         [guid-len (bytes-length GRACKET_GUID)]
-         [data-len (COPYDATASTRUCT-cbData cd)])
-    (when (and (data-len
-                . >= . 
-                (+ guid-len 4 (ctype-sizeof _DWORD)))
-               (bytes=? GRACKET_GUID
-                        (scheme_make_sized_byte_string data
-                                                       guid-len
-                                                       0))
-               (bytes=? #"OPEN"
-                        (scheme_make_sized_byte_string (ptr-add data guid-len)
-                                                       4
-                                                       0)))
-      ;; The command line's argv (sans argv[0]) is
-      ;; expressed as a DWORD for the number of args,
-      ;; followed by each arg. Each arg is a DWORD
-      ;; for the number of chars and then the chars
-      (let ([args
-             (let ([count (ptr-ref data _DWORD 'abs (+ guid-len 4))])
-               (let loop ([i 0] [delta (+ guid-len 4 (ctype-sizeof _DWORD))])
-                 (if (or (= i count)
-                         ((+ delta (ctype-sizeof _DWORD)) . > . data-len))
-                     null
-                     (let ([len (ptr-ref (ptr-add data delta) _DWORD)]
-                           [delta (+ delta (ctype-sizeof _DWORD))])
-                       (if ((+ delta len) . > . data-len)
-                           null
-                           (let ([s (scheme_make_sized_byte_string 
-                                     (ptr-add data delta)
-                                     len
-                                     1)])
-                             (if (or (bytes=? s #"")
-                                     (regexp-match? #rx"\0" s))
-                                 null
-                                 (cons (bytes->path s)
-                                       (loop (add1 i) (+ delta len))))))))))])
-        (map queue-file-event args)))))
-
-;; ----------------------------------------
-
-(define default-control-font #f)
-(define (get-default-control-font)
-  (unless default-control-font
-    (set! default-control-font
-	  (make-object font%
-		       (->normal (get-theme-font-size))
-                       (logfont->pango-family
-                         (get-theme-logfont))
-		       'system
-		       'normal 'normal #f 'default
-		       #t)))
-  default-control-font)
-
-(define (queue-window-event win thunk)
-  (queue-event (send win get-eventspace) thunk))
-
-(define (queue-window-refresh-event win thunk)
-  (queue-refresh-event (send win get-eventspace) thunk))
-
-;; arguments in screen coordinates
-(define (location->window* x y)
-  (let ([hwnd (WindowFromPoint (make-POINT x y))])
-    (let loop ([hwnd hwnd])
-      (and hwnd
-           (or (let ([wx (any-hwnd->wx hwnd)])
-                 (and wx (send wx get-top-frame)))
-               (loop (GetParent hwnd)))))))
-
-(define (location->window x y)
-  (location->window* (->screen x) (->screen y)))
-
-(define (flush-display)
-  (atomically
-   (pre-event-sync #t)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/wndclass.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/wndclass.rkt
deleted file mode 100644
index 19201b466f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/win32/wndclass.rkt
+++ /dev/null
@@ -1,331 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/unsafe/alloc
-	 racket/class
-         "../../lock.rkt"
-         "../common/utils.rkt"
-	 "utils.rkt"
-	 "types.rkt"
-	 "const.rkt"
-	 "icons.rkt")
-
-(provide
- (protect-out hInstance
-              DefWindowProcW
-              background-hbrush
-              set-hwnd-wx!
-              hwnd->wx
-              hwnd->ctlproc
-              any-hwnd->wx
-              CreateWindowExW
-              CreateWindowExW/control
-              CreateDialogIndirectParamW dialog-proc
-              clean-up-destroyed
-              MessageBoxW
-              _WndProc
-	      app-icon))
-
-;; ----------------------------------------
-;; We use the "user data" field of an HWND to
-;;  store a weak pointer back to the Racket object.
-;;  The weak pointer must be wrapped in an immuable cell.
-;;  In addition, if we need to save a control's old
-;;  ctlproc, we put it in the same immutable cell.
-
-(define all-hwnds (make-hash))
-
-;; call in atomic mode:
-(define (register-hwnd! hwnd)
-  (hash-set! all-hwnds (cast hwnd _pointer _intptr) #t)
-  (let ([c (malloc-immobile-cell (vector #f #f #f))])
-    (void (SetWindowLongPtrW hwnd GWLP_USERDATA c))))
-  
-(define (set-hwnd-wx! hwnd wx)
-  (let* ([c (GetWindowLongPtrW hwnd GWLP_USERDATA)]
-         [v (ptr-ref c _racket)])
-    (vector-set! v 0 (make-weak-box wx))))
-
-(define (set-hwnd-ctlproc! hwnd save-ptr ctlproc)
-  (let* ([c (GetWindowLongPtrW hwnd GWLP_USERDATA)]
-         [v (ptr-ref c _racket)])
-    (vector-set! v 1 ctlproc)
-    (vector-set! v 2 save-ptr)))
-
-(define (hwnd->wx hwnd)
-  (let ([c (GetWindowLongPtrW hwnd GWLP_USERDATA)])
-    (and c (let ([v (ptr-ref c _racket)])
-             (and v
-                  (let ([wb (vector-ref v 0)])
-                    (and wb
-                         (weak-box-value wb))))))))
-
-(define (any-hwnd->wx hwnd)
-  (and
-   (atomically (hash-ref all-hwnds (cast hwnd _pointer _intptr) #f))
-   (let ([wx (hwnd->wx hwnd)])
-     (and wx
-          (send wx is-hwnd? hwnd)
-          wx))))
-
-(define (hwnd->ctlproc hwnd)
-  (let ([c (GetWindowLongPtrW hwnd GWLP_USERDATA)])
-    (and c (let ([v (ptr-ref c _racket)])
-             (and v (vector-ref v 1))))))
-
-(define (hwnd->ctlproc-fptr hwnd)
-  (let ([c (GetWindowLongPtrW hwnd GWLP_USERDATA)])
-    (and c (let ([v (ptr-ref c _racket)])
-             (and v (vector-ref v 2))))))
-
-;; call in atomic mode:
-(define (can-unregister-hwnd? hwnd)
-  (hash-ref all-hwnds (cast hwnd _pointer _intptr) #f))
-
-;; call in atomic mode:
-(define (unregister-hwnd! hwnd)
-  (let ([c (GetWindowLongPtrW hwnd GWLP_USERDATA)])
-    (when c
-      (free-immobile-cell c)
-      (SetWindowLongPtrW hwnd GWLP_USERDATA #f))
-    (hash-remove! all-hwnds (cast hwnd _pointer _intptr))))
-
-;; ----------------------------------------
-
-(define-cstruct _INITCOMMONCONTROLSEX
-  ([dwSize _DWORD]
-   [dwICC _DWORD]))
-
-(define-comctl32 InitCommonControlsEx (_wfun _INITCOMMONCONTROLSEX-pointer -> _BOOL))
-
-(void
- (InitCommonControlsEx (make-INITCOMMONCONTROLSEX
-			(ctype-sizeof _INITCOMMONCONTROLSEX)
-			0)))
-
-;; ----------------------------------------
-
-(define _WndProc (_wfun #:atomic? #t #:keep (box null)
-			_HWND _UINT _WPARAM _LPARAM -> _LRESULT))
-
-(define (wind-proc w msg wparam lparam)
-  (if (= msg WM_DESTROY)
-      (begin
-        (unregister-hwnd! w)
-        (DefWindowProcW w msg wparam lparam))
-      (let ([wx (hwnd->wx w)])
-        (if wx
-            (send wx wndproc w msg wparam lparam DefWindowProcW)
-            (DefWindowProcW w msg wparam lparam)))))
-
-(define wind-proc-ptr (function-ptr wind-proc _WndProc))
-
-(define-user32 CallWindowProcW (_wfun _fpointer _HWND _UINT _WPARAM _LPARAM -> _LRESULT))
-
-(define (control-proc w msg wParam lParam)
-  (let ([default-ctlproc (hwnd->ctlproc-fptr w)])
-    (if (= msg WM_DESTROY)
-        (begin
-          (SetWindowLongPtrW w GWLP_WNDPROC (hwnd->ctlproc-fptr w))
-          (unregister-hwnd! w)
-          (CallWindowProcW default-ctlproc w msg wParam lParam))
-        (let ([wx (hwnd->wx w)])
-          (if wx
-              (send wx ctlproc w msg wParam lParam
-                    (lambda (w msg wParam lParam)
-                      (CallWindowProcW default-ctlproc w msg wParam lParam)))
-              (CallWindowProcW default-ctlproc w msg wParam lParam))))))
-
-(define control_proc (function-ptr control-proc _WndProc))
-
-(define (subclass-control hwnd)
-  (let* ([fptr (GetWindowLongPtrW hwnd GWLP_WNDPROC)]
-         [old-control-proc (function-ptr fptr _WndProc)])
-    (set-hwnd-ctlproc! hwnd fptr old-control-proc)
-    (SetWindowLongPtrW hwnd GWLP_WNDPROC control_proc)))
-
-
-(define _DialogProc (_wfun _HWND _UINT _WPARAM _LPARAM -> _INT_PTR))
-
-(define (dlgproc w msg wParam lParam)
-  (if (= msg WM_DESTROY)
-      (begin
-        (unregister-hwnd! w)
-        0)
-      (let ([wx (hwnd->wx w)])
-        (if wx
-            (send wx wndproc w msg wParam lParam
-                  (lambda (w msg wParam lParam) 0))
-            0))))
-
-(define dialog-proc (function-ptr dlgproc _DialogProc))
-
-;; ----------------------------------------
-
-(define-user32 DestroyWindow (_wfun _HWND -> (r : _BOOL)
-                                    -> (unless r (failed 'DestroyWindow))))
-
-(define (maybe-destroy-window hwnd)
-  (atomically
-   (when (can-unregister-hwnd? hwnd)
-     (DestroyWindow hwnd))))
-
-(define (clean-up-destroyed)
-  (free-remembered-now maybe-destroy-window))
-
-(define-user32 _CreateWindowExW (_wfun _DWORD
-                                       _string/utf-16
-                                       _string/utf-16
-                                       _UDWORD
-                                       _int _int _int _int
-                                       _HWND _HMENU _HINSTANCE _pointer
-                                       -> _HWND)
-  #:c-id CreateWindowExW)
-
-(define (make-CreateWindowEx register!)
-  ((allocator remember-to-free-later)
-   (lambda (dwExStyle lpClassName lpWindowName dwStyle 
-                      x y nWidth nHeight 
-                      hWndParent hMenu hInstance lpParam)
-     (let ([hwnd (_CreateWindowExW dwExStyle lpClassName lpWindowName dwStyle 
-                                   x y nWidth nHeight 
-                                   hWndParent hMenu hInstance lpParam)])
-       (register! hwnd)
-       hwnd))))
-
-(define CreateWindowExW (make-CreateWindowEx register-hwnd!))
-(define CreateWindowExW/control (make-CreateWindowEx (lambda (hwnd)
-                                                       (register-hwnd! hwnd)
-                                                       (subclass-control hwnd))))
-
-
-(define-user32 _CreateDialogIndirectParamW (_wfun _HINSTANCE
-                                                  _pointer ; _DLGTEMPLATE-pointer
-                                                  _HWND
-                                                  _fpointer
-                                                  _LPARAM
-                                                  -> _HWND)
-  #:c-id CreateDialogIndirectParamW)
-
-(define CreateDialogIndirectParamW
-  ((allocator remember-to-free-later)
-   (lambda (hInstance lpTemplate hWndParent lpDialogFunc lParamInit)
-     (let ([hwnd (_CreateDialogIndirectParamW
-                  hInstance lpTemplate hWndParent lpDialogFunc lParamInit)])
-       (register-hwnd! hwnd)
-       hwnd))))
-
-;; ----------------------------------------
-
-(define-cstruct _WNDCLASS ([style _UINT]
-			   [lpfnWndProc _fpointer]
-			   [cbClsExtra _int]
-			   [cbWndExtra _int]
-			   [hInstace _HINSTANCE]
-			   [hIcon _HICON]
-			   [hCursor _HCURSOR]
-			   [hbrBackground _HBRUSH]
-			   [lpszMenuName _permanent-string/utf-16]
-			   [lpszClassName _permanent-string/utf-16]))
-
-(define-user32 RegisterClassW (_wfun _WNDCLASS-pointer -> _ATOM))
-(define-kernel32 GetModuleHandleW (_wfun _pointer -> _HINSTANCE))
-
-(define-user32 GetClassInfoW (_wfun _HINSTANCE _string/utf-16 (i : (_ptr o _WNDCLASS)) -> (r : _BOOL)
-                                    -> (if r i (failed 'GetClassInfoW))))
-
-(define-user32 DefWindowProcW (_wfun _HWND _UINT _WPARAM _LPARAM -> _LRESULT))
-(define-user32 DefWindowProcW/raw _fpointer
-  #:c-id DefWindowProcW)
-
-#;(define-user32 PostQuitMessage (_wfun _int -> _void))
-
-(define hInstance (GetModuleHandleW #f))
-
-(define background-hbrush (let ([p (ptr-add #f (+ COLOR_BTNFACE 1))])
-                            (cpointer-push-tag! p 'HBRUSH)
-                            p))
-
-(define-kernel32 GetModuleFileNameW (_wfun #:save-errno 'windows _pointer _pointer _DWORD -> _DWORD))
-(define ERROR_INSUFFICIENT_BUFFER 122)
-(define-shell32 ExtractIconW (_wfun _HINSTANCE _string/utf-16 _UINT -> (r : _HICON)
-                                    -> (or r (failed 'ExtractIconW))))
-
-(define app-icon
-  (let ([path
-	 (let loop ([size 1024])
-	   (let ([p (make-bytes (* (ctype-sizeof _WCHAR) 1024))])
-	     (let ([r (GetModuleFileNameW #f p size)])
-	       (cond
-		[(and (or (zero? r) (= r size))
-		      (= (saved-errno) ERROR_INSUFFICIENT_BUFFER))
-		 (loop (* size 2))]
-		[(zero? r) (failed 'GetModuleFileNameW)]
-		[else (cast p _gcpointer _string/utf-16)]))))])
-    (if path
-	(ExtractIconW hInstance path 0)
-	(LoadIconW #f IDI_APPLICATION))))
-
-(void (RegisterClassW (make-WNDCLASS CS_OWNDC
-				     wind-proc-ptr
-				     0
-                                     0
-				     hInstance
-				     app-icon
-                                     #f
-                                     background-hbrush
-				     #f ; menu
-				     "PLTFrame")))
-
-(void (RegisterClassW (make-WNDCLASS 0 ; using CS_OWNDC creates trouble when resizing?
-				     wind-proc-ptr
-				     0
-                                     0
-				     hInstance
-				     #f
-                                     #f
-                                     #f ; transparent
-				     #f ; menu
-				     "PLTCanvas")))
-
-(void (RegisterClassW (make-WNDCLASS 0
-				     wind-proc-ptr
-				     0
-                                     0
-				     hInstance
-				     #f
-				     #f
-                                     background-hbrush
-				     #f ; menu
-				     "PLTPanel")))
-
-(define controls-are-transparent? #f)
-
-(void (RegisterClassW (make-WNDCLASS 0
-				     wind-proc-ptr
-				     0
-                                     0
-				     hInstance
-				     #f
-				     #f
-                                     (if controls-are-transparent?
-                                         #f  ; transparent
-                                         background-hbrush)
-				     #f ; menu
-				     "PLTTabPanel")))
-
-(define-user32 MessageBoxW (_fun _HWND _string/utf-16 _string/utf-16 _UINT -> _int))
-
-(define (register-no-cursor orig-name)
-  (let ([i (GetClassInfoW hInstance orig-name)])
-    (set-WNDCLASS-lpszClassName! i (string-append "PLT" orig-name))
-    (set-WNDCLASS-hCursor! i #f)
-    (void (RegisterClassW i))))
-
-(register-no-cursor "BUTTON")
-(register-no-cursor "STATIC")
-(register-no-cursor "LISTBOX")
-(register-no-cursor "COMBOBOX")
-(register-no-cursor "msctls_trackbar32")
-(register-no-cursor "msctls_progress32")
-(register-no-cursor "SysTabControl32")
-(register-no-cursor "SysListView32")
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxcanvas.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxcanvas.rkt
deleted file mode 100644
index 59f309f647..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxcanvas.rkt
+++ /dev/null
@@ -1,225 +0,0 @@
-(module wxcanvas racket/base
-  (require racket/class
-           (prefix-in wx: "kernel.rkt")
-           (prefix-in wx: "wxme/text.rkt")
-           (prefix-in wx: "wxme/editor-canvas.rkt")
-           "lock.rkt"
-           "helper.rkt"
-           "wx.rkt"
-           "wxwindow.rkt"
-           "wxitem.rkt")
-
-  (provide (protect-out make-canvas-glue%
-                        wx-canvas%
-                        wx-editor-canvas%))
-
-  (define (make-canvas-glue% default-tabable? %) ; implies make-window-glue%
-    (class (make-window-glue% %)
-      (init mred proxy)
-      (init-rest args)
-      (inherit get-mred get-top-level clear-margins)
-      (public*
-       [do-on-char (lambda (e) (super on-char e))]
-       [do-on-event (lambda (e) (super on-event e))]
-       [do-on-scroll (lambda (e) (super on-scroll e))]
-       [do-on-paint (lambda () (super on-paint))])
-      (define tabable? default-tabable?)
-      (define on-popup-callback void)
-      (public*
-       [get-tab-focus (lambda () tabable?)]
-       [set-tab-focus (lambda (v) (set! tabable? v))]
-       [on-tab-in (lambda () 
-                    (let ([mred (wx->mred this)])
-                      (when mred
-                        (send mred on-tab-in))))]
-       [set-on-popup (lambda (proc) (set! on-popup-callback proc))])
-      (override*
-       [gets-focus? (lambda () tabable?)]
-       [handles-key-code
-        (lambda (code alpha? meta?)
-          (if default-tabable?
-              (super handles-key-code code alpha? meta?)
-              (or meta? (not tabable?))))])
-      (define clear-and-on-paint
-        (lambda (mred)
-          (clear-margins)
-          (send mred on-paint)))
-      (override*
-       [on-char (entry-point
-                 (lambda (e)
-                   (let ([mred (get-mred)])
-                     (if mred
-                         (as-exit (lambda () (send mred on-char e)))
-                         (super on-char e)))))]
-       [on-event (entry-point
-                  (lambda (e)
-                    (let ([mred (get-mred)])
-                      (if mred
-                          (as-exit (lambda () (send mred on-event e)))
-                          (as-exit (lambda () (super on-event e)))))))]
-       ;; only called for canvas%, not editor-canvas%:
-       [on-scroll (entry-point
-                   (lambda (e)
-                     (let ([mred (get-mred)])
-                       (if mred
-                           (send mred on-scroll e)
-                           (as-exit (lambda () (super on-scroll e)))))))]
-       [on-paint (entry-point
-                  (lambda ()
-                    (let ([mred (get-mred)])
-                      (if mred
-                          (as-exit (lambda () (clear-and-on-paint mred)))
-                          (as-exit (lambda () (clear-margins) (super on-paint)))))))]
-       ;; for 'combo canvases:
-       [on-popup (lambda () (on-popup-callback))])
-      (apply super-make-object mred proxy args)))
-
-  (define wx-canvas% 
-    (make-canvas-glue%
-     #f
-     (class (make-control% wx:canvas% 0 0 #t #t)
-       (init parent x y w h style gl-config)
-       (inherit get-top-level)
-       (public*
-        [clear-margins (lambda () (void))])
-       (super-make-object style parent x y w h (cons 'deleted style) "canvas" gl-config)
-       (unless (memq 'deleted style)
-         (send (get-top-level) show-control this #t)))))
-
-  (define (make-editor-canvas% %)
-    (class %
-      (init parent x y w h name style spp init-buffer)
-      (inherit get-editor force-redraw
-	       call-as-primary-owner min-height get-size
-	       get-hard-minimum-size set-min-height
-               get-top-level)
-      (define fixed-height? #f)
-      (define fixed-height-lines 0)
-      (define orig-hard #f)
-      (define single-line-canvas? #f)
-      (define tabable? #f)
-      (override*
-       [on-container-resize (lambda ()
-                              (let ([edit (get-editor)])
-                                (when edit
-                                  (as-exit (lambda () (send edit on-display-size-when-ready))))))]
-       [on-scroll-on-change (lambda ()
-                              (queue-window-callback
-                               this
-                               (lambda ()
-                                 (let ([edit (get-editor)])
-                                   (when edit
-                                     (send edit on-display-size-when-ready))))))]
-       [on-set-focus
-        (entry-point
-         (lambda ()
-           (as-exit (lambda () (super on-set-focus)))
-           (let ([m (get-editor)])
-             (when m 
-               (let ([mred (wx->mred this)])
-                 (when mred
-                   (as-exit (lambda () (send m set-active-canvas mred)))))))))]
-       [set-editor
-        (letrec ([l (case-lambda
-		      [(edit) (l edit #t)]
-		      [(edit redraw?)
-		       (let ([old-edit (get-editor)])
-                         ;; An exception here means we end up in a bad state:
-			 (as-exit (lambda () 
-                                    ;; set-editor can invoke callbacks:
-                                    (super set-editor edit redraw?)))
-			 
-			 (let ([mred (wx->mred this)])
-			   (when mred
-			     (when old-edit
-			       (as-exit
-				(lambda () (send old-edit remove-canvas mred))))
-			     (when edit
-			       (as-exit
-				(lambda () (send edit add-canvas mred))))))
-
-			 (update-size)
-			 
-			 ;; force-redraw causes on-container-resize to be called,
-			 ;;  but only when the size of the canvas really matters
-			 ;;  (i.e., when it is shown)
-			 (force-redraw))])])
-          l)]
-       [handles-key-code 
-        (lambda (x alpha? meta?)
-          (case x
-            [(#\tab #\return escape) (and (not tabable?)
-                                          (not single-line-canvas?))]
-            [else (not meta?)]))]
-
-
-       [popup-for-editor (entry-point
-                          (lambda (e m)
-                            (let ([mwx (mred->wx m)])
-                              (and (send mwx popup-grab e)
-                                   (as-exit (lambda () (send m on-demand) #t))
-                                   mwx))))])
-      (public*
-       [set-tabable (lambda (on?) (set! tabable? on?))]
-       [is-tabable? (lambda () tabable?)]
-       [set-single-line (lambda () (set! single-line-canvas? #t))]
-       [is-single-line? (lambda () single-line-canvas?)]
-       [set-line-count (lambda (n)
-                         (if n
-                             (begin
-                               (unless orig-hard
-                                 (let-values ([(hmw hmh) (get-hard-minimum-size)])
-                                   (set! orig-hard hmh)))
-                               (set! fixed-height? #t)
-                               (set! fixed-height-lines n))
-                             (when orig-hard
-                               (set! fixed-height? #f)
-                               (set-min-height orig-hard)))
-                         (update-size))]
-       [get-line-count (lambda () (and fixed-height? fixed-height-lines))]
-       [update-size
-        (lambda ()
-          (let ([edit (get-editor)])
-            (when (and edit fixed-height?)
-              (let* ([top (if (is-a? edit wx:text%)
-                              (send edit line-location 0 #t)
-                              0)]
-                     [bottom (if (is-a? edit wx:text%)
-                                 (send edit line-location 0 #f)
-                                 14)]
-                     [height (- bottom top)])
-                (let* ([ch (box 0)]
-                       [h (box 0)])
-                  (call-as-primary-owner
-                   (lambda ()
-                     (send (send edit get-admin) 
-                           get-view #f #f #f ch)))
-                  (get-size (box 0) h)
-                  (let ([new-min-height (+ (* fixed-height-lines height) 
-                                           (- (unbox h) (unbox ch)))])
-                    (set-min-height (inexact->exact (round new-min-height)))
-                    (force-redraw)))))))])
-      (override*
-       [set-y-margin (lambda (m)
-                       (super set-y-margin m)
-                       (when fixed-height? (update-size)))])
-      
-      (super-make-object style parent x y w h (or name "") (cons 'deleted style) spp init-buffer)
-      (unless (memq 'deleted style)
-        (send (get-top-level) show-control this #t))
-      (when init-buffer
-        (let ([mred (wx->mred this)])
-          (when mred
-            (as-exit (lambda () (send init-buffer add-canvas mred))))))))
-
-  (define wx-editor-canvas% 
-    (class (make-canvas-glue%
-            #t
-            (make-editor-canvas% (make-control% wx:editor-canvas%
-                                                0 0 #t #t)))
-      (inherit editor-canvas-on-scroll
-               set-no-expose-focus)
-      (define/override (on-scroll e)
-        (editor-canvas-on-scroll))
-      (super-new)
-      #;(set-no-expose-focus))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxcontainer.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxcontainer.rkt
deleted file mode 100644
index 79a97bce03..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxcontainer.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-(module wxcontainer racket/base
-  (require racket/class
-           racket/list
-           (prefix-in wx: "kernel.rkt")
-           "lock.rkt"
-           "helper.rkt"
-           "wx.rkt")
-
-  (provide (protect-out make-container-glue%
-                        wx-make-container%))
-
-  (define (make-container-glue% %)
-    (class %
-      (init mr prxy)
-      (init-rest args)
-      (inherit do-place-children do-get-graphical-min-size get-children-info get-hidden-child)
-      (define mred mr)
-      (define proxy prxy)
-      (override*
-       [get-graphical-min-size (lambda () 
-                                 (cond
-                                  [mred (let ([info
-                                               (map (lambda (i)
-                                                      (list (child-info-x-min i) (child-info-y-min i)
-                                                            (child-info-x-stretch i) (child-info-y-stretch i)))
-                                                    (get-children-info))])
-                                          (let-values ([(w h) (as-exit (lambda () (send mred container-size 
-                                                                                        (if (get-hidden-child)
-                                                                                            (cdr info) ; hidden child is first
-                                                                                            info))))])
-                                            (list w h)))]
-                                  [else (do-get-graphical-min-size)]))]
-       [place-children (lambda (l w h) 
-                         (cond
-                          [(null? l) null]
-                          [mred (as-exit (lambda () (send mred place-children l w h)))]
-                          [else (do-place-children l w h)]))])
-      (apply super-make-object mred proxy args)))
-
-  ;; make-container% - for panels and top-level windows
-  (define (wx-make-container% %) %))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxitem.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxitem.rkt
deleted file mode 100644
index 7eae727afc..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxitem.rkt
+++ /dev/null
@@ -1,252 +0,0 @@
-(module wxitem racket/base
-  (require racket/class
-           racket/function
-           (prefix-in wx: "kernel.rkt")
-           "lock.rkt"
-           "helper.rkt"
-           "const.rkt"
-           "wx.rkt"
-           "check.rkt"
-           "wxwindow.rkt")
-
-  (provide (protect-out make-item%
-                        make-control%
-                        make-simple-control%
-                        wx-button%
-                        wx-check-box%
-                        wx-message%))
-
-  ;; make-item%: creates items which are suitable for placing into
-  ;;  containers.
-  ;; input: item%: a wx:item% descendant (but see below) from which the
-  ;;          new class will be derived.
-  ;;        stretch-x/stretch-y: booleans which specify the default
-  ;;          stretchability behavior for the new class.
-  ;; returns: a class, descended from wx:item%, which is suitable for
-  ;;            placing in a container.
-  ;; Note: the item% parameter does not necessarily HAVE to be a
-  ;; descendant of wx:item%, so long as it contains the identifiers in the
-  ;; inherit section below.  You will note below that I ran wx:panel%
-  ;; through this function to create panel%.
-
-  (define make-item%
-    (lambda (item% x-margin-w y-margin-h stretch-x stretch-y)
-      (class (wx-make-window% item% #f)
-        (init window-style)
-        (init-rest args)
-	(inherit get-width get-height get-x get-y
-		 get-parent get-client-size get-top-level)
-	(define enabled? #t)
-	(override*
-         [enable
-          (lambda (b)
-            (set! enabled? (and b #t))
-            (super enable b))]
-
-         ;; set-size: caches calls to set-size to avoid unnecessary work,
-         ;;           and works with windowsless panels
-         ;; input: x/y: new position for object
-         ;;        width/height: new size for object
-         ;; returns: nothing
-         ;; effect: if arguments mark a different geometry than the object's
-         ;;   current geometry, passes args to super-class's set-size.
-         ;;   Otherwise, does nothing.
-         [set-size
-          (lambda (x y width height)
-	    (set! x (if (not x)
-			(get-x)
-			(+ x (send (area-parent) dx))))
-	    (set! y (if (not y)
-			(get-y)
-			(+ y (send (area-parent) dy))))
-            (unless (and (same-dimension? x (get-x))
-                         (same-dimension? y (get-y))
-                         (same-dimension? width (get-width))
-                         (same-dimension? height (get-height)))
-              (super set-size x y width height)))])
-
-	(public*
-         [is-enabled? (lambda () enabled?)])
-
-	;; Store minimum size of item.  
-	;; This will never change after the item is created.
-	(define hard-min-width (void))
-        (define hard-min-height (void))
-	(public*
-         [set-min-height (lambda (v) (set! hard-min-height v) (min-height v))]
-         [set-min-width (lambda (v) (set! hard-min-width v) (min-width v))]
-         [get-hard-minimum-size (lambda () (values hard-min-width hard-min-height))]
-	  
-         [client-inset
-          (lambda (h?)
-            (let ([h #f][w #f])
-              (unless h
-                (let ([w-box (box 0)]
-                      [h-box (box 0)])
-                  (get-client-size w-box h-box)
-                  (set! h (- (get-height) (unbox h-box)))
-                  (set! w (- (get-width) (unbox w-box)))))
-              (if h? h w)))]
-
-         ;; gets/sets user's requirement for minimum width.  Errors out
-         ;; if new value is not a non-negative real number.  Forces a
-         ;; redraw upon a set.
-         [min-client-width
-          (case-lambda 
-	    [() (- (min-width) (client-inset #f))]
-	    [(new-width)
-	     (check-dimension '(method canvas<%> min-client-width) new-width)
-	     (min-width (+ new-width (client-inset #f)))])]
-         [min-client-height
-          (case-lambda 
-	    [() (- (min-height) (client-inset #t))]
-	    [(new-height) 
-	     (check-dimension '(method canvas<%> min-client-height) new-height)
-	     (min-height (+ new-height (client-inset #t)))])])
-
-        (define -mw 0)
-        (define -mh 0)
-        (define -xm x-margin-w)
-        (define -ym y-margin-h)
-        (define -sx stretch-x)
-        (define -sy stretch-y)
-        (define first-arg (car args))
-
-	(public*
-         [min-width
-          (mk-param
-           -mw identity
-           (lambda (v)
-             (check-dimension '(method area<%> min-width) v))
-           force-redraw)]
-         [min-height
-          (mk-param
-           -mh identity
-           (lambda (v)
-             (check-dimension '(method area<%> min-height) v))
-           force-redraw)]
-	  
-         [x-margin
-          (mk-param
-           -xm identity
-           (lambda (v)
-             (check-margin-integer '(method subarea<%> horiz-margin) v)
-             v)
-           force-redraw)]
-         [y-margin
-          (mk-param
-           -ym identity
-           (lambda (v) 
-             (check-margin-integer '(method subarea<%> vert-margin) v)
-             v)
-           force-redraw)]
-
-         [stretchable-in-x
-          (mk-param -sx (lambda (x) (and x #t)) void force-redraw)]
-         [stretchable-in-y
-          (mk-param -sy (lambda (x) (and x #t)) void force-redraw)]
-	  
-         ;; get-info: passes necessary info up to parent.
-         ;; input: none
-         ;; returns: child-info struct containing the info about this
-         ;;   item.
-         ;; intended to be called by item's parent upon resize.
-         [get-info
-          (lambda ()
-            (let* ([min-size (get-min-size)]
-                   [result (make-child-info (car min-size) (cadr min-size)
-                                            (x-margin) (y-margin)
-                                            (stretchable-in-x)
-                                            (stretchable-in-y))])
-              result))]
-	  
-         [area-parent (lambda () first-arg)]
-
-         ;; force-redraw: unconditionally trigger redraw.
-         ;; input: none
-         ;; returns: nothing
-         ;; effects: forces the item's parent (if it exists) to redraw
-         ;;   itself. This will recompute the min-size cache if it is
-         ;;   invalid.
-         [force-redraw
-          (lambda ()
-            (let ([parent (area-parent)])
-              (when parent
-                (send parent child-redraw-request this))))]
-	  
-         [on-container-resize (lambda () (void))] ; This object doesn't contain anything
-
-         [init-min (lambda (x) x)]
-	  
-         ;; get-min-size: computes the minimum size the item can
-         ;;   reasonably assume.
-         ;; input: none
-         ;; returns: a list containing the minimum width & height.
-         [get-min-size
-          (lambda ()
-            (let ([w (+ (* 2 (x-margin)) (max hard-min-width (min-width)))]
-                  [h (+ (* 2 (y-margin)) (max hard-min-height (min-height)))])
-              (list w h)))])
-
-        (public*
-         [set-area-parent (lambda (p) (set! first-arg p))])
-	
-        (apply super-make-object (send (car args) get-window) (cdr args))
-        (set-min-width (init-min (get-width)))
-        (set-min-height (init-min (get-height)))
-
-        (unless (memq 'deleted window-style)
-          (send (get-top-level) show-control this #t)
-          ;; For a pane[l], the creator must call the equivalent of the following,
-          ;;  delaying to let the panel's wx field get initialized before
-          ;;  panel-sizing methods are called
-          (unless (is-a? this wx-basic-panel<%>)
-            (send (area-parent) add-child this))))))
-
-  ;; make-control% - for non-panel items
-  (define (make-control% item% x-margin y-margin
-			 stretch-x stretch-y)
-    (class (make-item% item% x-margin y-margin stretch-x stretch-y)
-      (init-rest args)
-      (inherit get-parent)
-      (apply super-make-object args)
-      (send (get-parent) set-item-cursor 0 0)))
-
-  (define (make-simple-control% item% [x-m const-default-x-margin] [y-m const-default-y-margin])
-    (make-control% item% x-m y-m #f #f))
-
-  (define wx-button% (make-window-glue% 
-		      (class (make-simple-control% wx:button%)
-                        (init parent cb label x y w h style font)
-			(inherit command set-border get-top-level)
-                        (define border? (memq 'border style))
-                        (define border-on? border?)
-			(public*
-                         [defaulting (lambda (on?)
-                                       (set! border-on? on?)
-                                       (set-border border-on?))] 
-                         [has-border? (lambda () border-on?)])
-			(override*
-                         [char-to (lambda ()
-                                    (as-exit
-                                     (lambda ()
-                                       (command (make-object wx:control-event% 'button)))))])
-			(super-make-object style parent cb label x y w h (cons 'deleted style) font)
-                        (when border?
-                          (send (get-top-level) add-border-button this)))))
-  (define wx-check-box% (class (make-window-glue% (make-simple-control% wx:check-box%))
-                          (init mred proxy parent cb label x y w h style font)
-			  (inherit set-value get-value command)
-			  (override*
-                           [char-to (lambda ()
-                                      (as-exit
-                                       (lambda ()
-                                         (set-value (not (get-value)))
-                                         (command (make-object wx:control-event% 'check-box)))))])
-			  (super-make-object mred proxy style parent cb label x y w h (cons 'deleted style) font)))
-
-  (define wx-message% (class (make-window-glue% (make-simple-control% wx:message%))
-                        (init mred proxy parent label x y style font)
-			(override* [gets-focus? (lambda () #f)])
-			(super-make-object mred proxy style parent label x y (cons 'deleted style) font))))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxlitem.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxlitem.rkt
deleted file mode 100644
index 78077b7ba6..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxlitem.rkt
+++ /dev/null
@@ -1,413 +0,0 @@
-(module wxlitem racket/base
-  (require racket/class
-           racket/file
-           (only-in racket/base remq)
-           racket/snip/private/prefs
-           (prefix-in wx: "kernel.rkt")
-           "lock.rkt"
-           "helper.rkt"
-           "const.rkt"
-           "wx.rkt"
-           "check.rkt"
-           "wxwindow.rkt"
-           "wxitem.rkt"
-           "wxpanel.rkt")
-
-  (provide (protect-out wx-choice%
-                        wx-list-box%
-                        wx-radio-box%
-                        wx-gauge%
-                        wx-slider%))
-
-  ;; ----------------------------------------
-
-  (define (is-horiz? style parent)
-    (cond
-     [(memq 'vertical-label style) #f]
-     [(memq 'horizontal-label style) #t]
-     [else (eq? (send (send parent get-window) get-label-position) 'horizontal)]))
-
-  (define (make-sub horiz? proxy this ha va)
-    (if horiz?
-        (begin
-          (send this alignment ha va)
-          this)
-        (let ([p (make-object wx-vertical-pane% #f proxy this null #f)])
-	  (send p skip-enter-leave-events #t)
-          (send p skip-subwindow-events? #t)
-          (send (send p area-parent) add-child p)
-          (send p alignment ha va)
-          p)))
-
-  (define (make-label label proxy p font)
-    (and label 
-         (let ([l (make-object wx-message% #f proxy p label -1 -1 null font)])
-           (send l x-margin 0) (send l y-margin 0)
-	   (send l skip-enter-leave-events #t)
-           (send l skip-subwindow-events? #t)
-           l)))
-
-  (define (filter-style style)
-    (remq 'deleted style))
-
-  (define-syntax-rule (bounce c (m . args) ...)
-    (begin
-      (define/public m (lambda args (send c m . args)))
-      ...))
-
-  ;; ----------------------------------------
-  
-  (define wx-label-panel%
-    (class wx-control-horizontal-panel% 
-      (init proxy parent label style font halign valign)
-      (inherit area-parent skip-enter-leave-events set-event-positions-wrt)
-      (define c #f)
-
-      (define/override (enable on?) (if c (send c enable on?) (void)))
-      (define/override (is-enabled?) (if c (send c is-enabled?) #t))
-      (define/override (is-window-enabled?) (if c (send c is-window-enabled?) #t))
-
-      (super-make-object #f proxy parent (if (memq 'deleted style) '(deleted) null) #f)
-      (skip-enter-leave-events #t)
-      (unless (memq 'deleted style)
-        (send (area-parent) add-child this))
-      (define horiz? (is-horiz? style parent))
-      (define p (make-sub horiz? proxy this (if horiz? 'left halign) valign))
-
-      (define l (make-label label proxy p font))
-      (define/public (set-label s) (when l (send l set-label s)))
-      (define/public (get-label) (and l (send l get-label)))
-
-      (define/override (client-to-screen x y)
-        (if c
-            (send c client-to-screen x y)
-            (super client-to-screen x y)))
-      (define/override (screen-to-client x y)
-        (if c
-            (send c screen-to-client x y)
-            (super screen-to-client x y)))
-
-      (define/public (get-p) p)
-      (define/public (set-c v sx? sy?) 
-        (set! c v)
-        (set-event-positions-wrt c)
-        (when l (send l set-event-positions-wrt c))
-        (when p (send p set-event-positions-wrt c))
-        (send c stretchable-in-x sx?)
-        (send c stretchable-in-y sy?)
-        (send c skip-subwindow-events? #t))))
-
-  ;; ----------------------------------------
-
-  (define wx-internal-choice% 
-    (class (make-window-glue% (make-simple-control% wx:choice% 0 0))
-      (init mred proxy parent cb label x y w h choices style font)
-      (override*
-       [handles-key-code 
-        (lambda (x alpha? meta?) 
-          (or (memq x '(up down))
-              (and alpha? (not meta?))))])
-      (super-make-object mred proxy style parent cb label x y w h choices (cons 'deleted style) font)))
-
-  (define wx-choice%
-    (class wx-label-panel% 
-      (init mred proxy parent cb label x y w h choices style font)
-      (inherit stretchable-in-y stretchable-in-x get-p set-c)
-
-      (super-make-object proxy parent label style font 'left 'center)
-
-      (define c (make-object wx-internal-choice% mred proxy (get-p) cb label x y w h choices 
-                             (filter-style style) font))
-      (set-c c #t #f)
-
-      (bounce 
-       c
-       (set-selection i)
-       (get-selection)
-       (number)
-       (clear)
-       (append lbl)
-       (delete i))
-
-      (stretchable-in-y #f)
-      (stretchable-in-x #f)))
-
-  ;; ----------------------------------------
-
-  (define list-box-wheel-step #f)
-
-  (define wx-internal-list-box%
-    (make-window-glue% 
-     (class (make-control% wx:list-box% 0 0 #t #t)
-       (init parent cb label kind x y w h choices style font 
-             label-font columns column-order)
-       (inherit get-first-item
-		set-first-visible-item
-                number-of-visible-items)
-       (private*
-        [scroll (lambda (dir)
-                  (unless list-box-wheel-step
-                    (set! list-box-wheel-step (get-preference* '|GRacket:wheelStep| (lambda () 3)))
-                    (unless (and (number? list-box-wheel-step)
-                                 (exact? list-box-wheel-step)
-                                 (integer? list-box-wheel-step)
-                                 (<= 1 list-box-wheel-step 100))
-                      (set! list-box-wheel-step 3)))
-                  (let ([top (get-first-item)])
-                    (set-first-visible-item
-                     (max 0 (+ top (* (min list-box-wheel-step (number-of-visible-items)) dir))))))])
-       (override*
-        [handles-key-code (lambda (x alpha? meta?)
-                            (case x
-                              [(up down) #t]
-                              [else (and alpha? (not meta?))]))]
-        [pre-on-char (lambda (w e)
-                       (or (super pre-on-char w e)
-                           (and (not (eq? (system-type) 'macosx)) ; scrolling is built into NSListView 
-                                (case (send e get-key-code)
-                                  [(wheel-up) (scroll -1) #t]
-                                  [(wheel-down) (scroll 1) #t]
-                                  [else #f]))))])
-       (super-make-object style parent cb label kind x y w h choices (cons 'deleted style) font 
-                          label-font columns column-order))))
-
-  (define wx-list-box%
-    (class wx-label-panel% 
-      (init mred proxy parent cb label kind x y w h choices style font label-font columns column-order)
-      (inherit get-p set-c)
-
-      (super-make-object proxy parent label style font 'left 'top)
-
-      (define c (make-object wx-internal-list-box% mred proxy (get-p) cb label kind x y w h choices 
-                             (filter-style style) font label-font columns column-order))
-      (set-c c #t #t)
-
-      (bounce
-       c
-       (get-label-font)
-       (set-string i s col)
-       (set-selection i)
-       (get-selection)
-       (get-selections)
-       (visible-range)
-       (get-first-item)
-       (number-of-visible-items)
-       (set-first-visible-item i)
-       (number)
-       (get-row n)
-       (set-data i v)
-       (get-data i)
-       (selected? i)
-       (delete i)
-       (clear)
-       (set choices . more)
-       (reset)
-       (get-column-order)
-       (set-column-order l)
-       (set-column-label i l)
-       (set-column-size i w mn mx)
-       (get-column-size i)
-       (delete-column i)
-       (append-column l))
-      (define/public select 
-        (case-lambda
-         [(i) (send c select i)]
-         [(i on?) (send c select i on?)]
-         [(i on? extend?) (send c select i on? extend?)]))
-      (define/public append
-        (case-lambda
-         [(s) (send c append s)]
-         [(s v) (send c append s v)]))))
-
-  ;; ----------------------------------------
-
-  (define wx-internal-radio-box%
-    (make-window-glue% 
-     (class (make-simple-control% wx:radio-box% 0 0)
-       (init parent cb label x y w h choices major style font)
-       (inherit number orig-enable set-selection command)
-       (override*
-        [enable
-         (case-lambda
-	   [(on?) (super enable on?)]
-	   [(which on?) (when (< -1 which (number))
-			  (vector-set! enable-vector which (and on? #t))
-			  (orig-enable which on?))])]
-        [is-enabled?
-         (case-lambda
-	   [() (super is-enabled?)]
-	   [(which) (and (< -1 which (number))
-			 (vector-ref enable-vector which))])])
-
-       (define is-vertical? (memq 'vertical style))
-       (public*
-        [vertical? (lambda () is-vertical?)]
-        [char-to-button (lambda (i)
-                          (as-exit
-                           (lambda ()
-                             (set-selection i)
-                             (command (make-object wx:control-event% 'radio-box)))))])
-
-       (super-make-object style parent cb label x y w h choices major (cons 'deleted style) font)
-
-       (define enable-vector (make-vector (number) #t)))))
-
-  (define wx-radio-box%
-    (class wx-label-panel% 
-      (init mred proxy parent cb label x y w h choices major style font)
-      (inherit stretchable-in-y stretchable-in-x get-p set-c)
-
-      (super-make-object proxy parent label style font 'left 'center)
-
-      (define c (make-object wx-internal-radio-box% mred proxy (get-p) cb label x y w h choices 
-                             major (filter-style style) font))
-      (set-c c #t #t)
-
-      (define enable-vector (make-vector (length choices) #t))
-
-      (define/override enable
-        (case-lambda
-         [(on?) (super enable on?)]
-         [(i on?) 
-          (when (< -1 i (vector-length enable-vector))
-            (vector-set! enable-vector i on?)
-            (send c enable-button i on?))]))
-      
-      (define/override is-enabled?
-        (case-lambda
-         [() (super is-enabled?)]
-         [(which) (and (< -1 which (vector-length enable-vector))
-                       (vector-ref enable-vector which))]))
-
-      (bounce 
-       c
-       (button-focus i)
-       (set-selection i)
-       (get-selection))
-      (stretchable-in-y #f)
-      (stretchable-in-x #f)))
-
-  ;; ----------------------------------------
-
-  (define wx-internal-gauge%
-    (make-window-glue% 
-     (class (make-control% wx:gauge% 0 0 #f #f)
-       (init parent label range style font)
-       (inherit get-client-size get-width get-height set-size 
-		stretchable-in-x stretchable-in-y set-min-height set-min-width
-		get-parent)
-       (override* [gets-focus? (lambda () #f)])
-       ;; # pixels per unit of value.
-       (define pixels-per-value 1)
-       (super-make-object style parent label range -1 -1 -1 -1 (cons 'deleted style) font)
-
-       (let-values ([(client-width client-height) (get-two-int-values 
-                                                   (lambda (a b) (get-client-size a b)))])
-         (let ([delta-w (- (get-width) client-width)]
-               [delta-h (- (get-height) client-height)]
-               [vertical-labels? (eq? (send (send (get-parent) get-window) get-label-position) 'vertical)]
-               [horizontal? (memq 'horizontal style)])
-           (set-min-width (if horizontal?
-                              (let ([cw (min const-max-gauge-length
-                                             (* range pixels-per-value))])
-                                (max (if vertical-labels?
-                                         cw
-                                         (+ cw delta-w))
-                                     (get-width)))
-                              ;; client-height is the default
-                              ;; dimension in the minor direction.
-                              (+ client-width delta-w)))
-           (set-min-height (if horizontal?
-                               (+ client-height delta-h)
-                               (let ([ch (min const-max-gauge-length
-                                              (* range pixels-per-value))])
-                                 (max (if vertical-labels?
-                                          (+ ch delta-h)
-                                          ch)
-                                      (get-height)))))))
-
-       (if (memq 'horizontal style)
-           (begin
-             (stretchable-in-x #t)
-             (stretchable-in-y #f))
-           (begin
-             (stretchable-in-x #f)
-             (stretchable-in-y #t))))))
-
-  (define wx-gauge%
-    (class wx-label-panel% 
-      (init mred proxy parent label range style font)
-      (inherit stretchable-in-y stretchable-in-x get-p set-c)
-      
-      (super-make-object proxy parent label style font 'center 'center)
-      
-      (define c (make-object wx-internal-gauge% mred proxy (get-p) label range
-                             (filter-style style) font))
-      (set-c c 
-             (memq 'horizontal style)
-             (memq 'vertical style))
-
-      (bounce 
-       c
-       (get-range)
-       (set-range rng)
-       (get-value)
-       (set-value v))
-      (let ([h? (and (memq 'horizontal style) #t)])
-        (stretchable-in-x h?)
-        (stretchable-in-y (not h?)))))
-
-  ;; ----------------------------------------
-
-  (define wx-internal-slider%
-    (make-window-glue% 
-     (class (make-control% wx:slider% 0 0 #f #f)
-       (init parent func label value min-val max-val style font)
-       (inherit set-min-width set-min-height stretchable-in-x stretchable-in-y
-		get-client-size get-width get-height get-parent)
-       ;; # pixels per possible setting.
-       (define pixels-per-value 3)
-       ;; 3 is good because with horizontal sliders under Xt, with 1 or 2
-       ;; pixels per value, the thumb is too small to display the number,
-       ;; which looks bad.
-       
-       (super-make-object style parent func label value min-val max-val -1 -1 -1 (cons 'deleted style) font)
-	 
-       (let-values ([(client-w client-h) (get-two-int-values (lambda (a b)
-                                                               (get-client-size a b)))])
-         (let* ([horizontal? (memq 'horizontal style)]
-                [vertical-labels? (eq? (send (send (get-parent) get-window) get-label-position) 'vertical)]
-                [range (+ (* pixels-per-value (add1 (- max-val min-val)))
-                          (cond
-                           [(and horizontal? (not vertical-labels?)) (- (get-width) client-w)]
-                           [(and (not horizontal?) vertical-labels?) (- (get-height) client-h)]
-                           [else 0]))])
-           ((if horizontal? (lambda (v) (set-min-width v)) (lambda (v) (set-min-height v)))
-            (max ((if horizontal? (lambda () (get-width)) (lambda () (get-height))))
-                 (min const-max-gauge-length range)))
-           (stretchable-in-x horizontal?)
-           (stretchable-in-y (not horizontal?)))))))
-
-  (define wx-slider%
-    (class wx-label-panel% 
-      (init mred proxy parent func label value min-val max-val style font)
-      (inherit stretchable-in-y stretchable-in-x get-p set-c)
-
-      (super-make-object proxy parent label style font 'center 'center)
-
-      (define c (make-object wx-internal-slider% mred proxy (get-p) func label value min-val max-val
-                             (filter-style style) font))
-      
-      (set-c c 
-             (memq 'horizontal style)
-             (memq 'vertical style))
-      
-      (bounce 
-       c
-       (get-value)
-       (set-value v))
-      (let ([h? (and (memq 'horizontal style) #t)])
-        (stretchable-in-x h?)
-        (stretchable-in-y (not h?)))))
-  
-)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/const.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/const.rkt
deleted file mode 100644
index cc9dfe1ab0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/const.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-
-(provide (all-defined-out))
-
-(define CURSOR-WIDTH 2)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/cycle.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/cycle.rkt
deleted file mode 100644
index 0823028435..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/cycle.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-
-(define-syntax-rule (decl id set-id)
-  (begin
-    (provide id set-id)
-    (define id #f)
-    (define (set-id v) (set! id v))))
-
-(decl text% set-text%!)
-(decl pasteboard% set-pasteboard%!)
-(decl editor-stream-in% set-editor-stream-in%!)
-(decl editor-stream-out% set-editor-stream-out%!)
-(decl editor-snip% set-editor-snip%!)
-(decl editor-snip-editor-admin% set-editor-snip-editor-admin%!)
-
-(decl extended-editor-snip% set-extended-editor-snip%!)
-(decl extended-text% set-extended-text%!)
-(decl extended-pasteboard% set-extended-pasteboard%!)
-
-(decl get-editor-data-class set-get-editor-data-class!)
-
-(decl editor-get-file set-editor-get-file!)
-(decl editor-put-file set-editor-put-file!)
-
-(decl popup-menu% set-popup-menu%!)
-
-(decl printer-dc% set-printer-dc%!)
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-admin.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-admin.rkt
deleted file mode 100644
index 8d3267d1b6..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-admin.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/base
-(require racket/class
-         "../syntax.rkt"
-         "private.rkt"
-         racket/snip/private/private
-         (only-in "cycle.rkt" popup-menu%))
-
-(provide editor-admin%)
-
-(defclass editor-admin% object%
-  (super-new)
-
-  (define standard 0) ; used to recognize standard display
-  (define/public (get-s-standard) standard)
-  (define/public (set-s-standard v) (set! standard v))
-  
-  (def/public (get-dc [maybe-box? [x #f]] [maybe-box? [y #f]])
-    (when x (set-box! x 0.0))
-    (when y (set-box! y 0.0))
-    #f)
-
-  (define/private (do-get-view x y w h)
-    (when x (set-box! x 0.0))
-    (when y (set-box! y 0.0))
-    (when w (set-box! w 0.0))
-    (when h (set-box! h 0.0)))
-
-  (def/public (get-view [maybe-box? x] [maybe-box? y]
-                        [maybe-box? w] [maybe-box? h]
-                        [any? [full? #f]])
-    (do-get-view x y w h))
-
-  (def/public (get-max-view [maybe-box? x] [maybe-box? y]
-                            [maybe-box? w] [maybe-box? h]
-                            [any? [full? #f]])
-    (get-view x y w h full?))
-
-  (def/public (scroll-to [real? localx] [real? localy] [real? w] [real? h] [any? [refresh? #t]] 
-                         [(symbol-in start none end) [bias 'none]])
-    (void))
-
-  (def/public (grab-caret [(symbol-in immediate display global) [dist 'global]])
-    (void))
-
-  (def/public (resized [any? redraw-now]) (void))
-  
-  (def/public (needs-update [real? x] [real? y]
-                            [nonnegative-real? w] [nonnegative-real? h])
-    (void))
-
-  (def/public (update-cursor) (void))
-
-  (def/public (refresh-delayed?) #f)
-
-  (def/public (popup-menu [popup-menu% m] [real? x] [real? y]) #f)
-
-  (def/public (modified [any? mod?]) (void)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-canvas.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-canvas.rkt
deleted file mode 100644
index ecbbb67af4..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-canvas.rkt
+++ /dev/null
@@ -1,1279 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/file
-         "../syntax.rkt"
-         "editor.rkt"
-         "editor-admin.rkt"
-         "private.rkt"
-         racket/snip/private/prefs
-         racket/snip/private/private
-         (only-in "cycle.rkt" popup-menu%)
-         (only-in "../kernel.rkt" queue-refresh-event)
-         "wx.rkt")
-
-(provide editor-canvas%)
-
-;; FIXME: need contracts on public classes
-
-(define (object/bool=? a b)
-  (and a b (object=? a b)))
-
-;; ----------------------------------------
-
-(define simple-scroll%
-  (class object%
-    (define horizontal #f)
-    (define count 0)
-    (define page-step 0)
-    (define value 0)
-
-    (init canvas
-          style
-          length
-          steps-per-page
-          position)
-
-    (super-new)
-
-    (set! count length)
-    (set! page-step steps-per-page)
-    (set! value position)
-
-    (set! horizontal (and (memq 'horizontal style) #t))
-    (set-scroll length steps-per-page position)
-    
-    (define/public (set-value position)
-      (set! value (max 0 (min count position))))
-
-    (define/public (set-scroll length steps-per-page position)
-      (when (length . > . -1)
-        (set! count length))
-      (when (steps-per-page . > . 0)
-        (set! page-step steps-per-page))
-      (when (position . > . -1)
-        (set! value position))
-      
-      (when (value . < . 0)
-        (set! value 0))
-      (when (value . > . count)
-        (set! value count)))
-
-    (define/public (get-value)
-      value)))
-
-;; ----------------------------------------
-
-(define update-cursor-timer%
-  (class timer%
-    (inherit start stop)
-    (init-field admin)
-
-    (super-new)
-
-    (define/override (notify)
-      (stop)
-      (when admin
-        (send admin clear-update-cursor-timer)
-        (send (send admin get-canvas) update-cursor-now)))
-
-    (define/public (cancel)
-      (set! admin #f))))
-
-;; ----------------------------------------
-
-(define BLINK-DELAY 500)
-
-(define blink-timer%
-  (class timer%
-    (inherit stop)
-    (init-field canvas)
-
-    (super-new)
-    
-    (define/override (notify)
-      (when canvas
-        (send canvas blink-caret)))
-
-    (define/public (kill)
-      (set! canvas #f)
-      (stop))))
-
-;; ----------------------------------------
-
-(define AUTO-DRAG-DELAY 100)
-
-(define auto-drag-timer%
-  (class timer% 
-    (inherit start stop)
-    (init-field canvas event)
-
-    (super-new)
-
-    (start AUTO-DRAG-DELAY #t)
-
-    (define/override (notify)
-      (when canvas
-        (let ([e (make-object mouse-event% (send event get-event-type))])
-          (send e set-alt-down (send event get-alt-down))
-          (send e set-caps-down (send event get-caps-down))
-          (send e set-control-down (send event get-control-down))
-          (send e set-left-down (send event get-left-down))
-          (send e set-meta-down (send event get-meta-down))
-          (send e set-middle-down (send event get-middle-down))
-          (send e set-right-down (send event get-right-down))
-          (send e set-shift-down (send event get-shift-down))
-          (send e set-x (send event get-x))
-          (send e set-y (send event get-y))
-          (send e set-time-stamp
-                (+ (send e get-time-stamp) AUTO-DRAG-DELAY))
-          (send canvas on-event event))))
-
-    (define/public (kill)
-      (set! canvas #f)
-      (stop))))
-
-;; ----------------------------------------
-
-(define default-wheel-amt
-  (let ([v (get-preference* 'GRacket:wheelStep)])
-    (if (exact-integer? v)
-        (max 3 (min 1000 v))
-        3)))
-
-(define (INIT-SB style)
-  (append
-   (if (or (memq 'no-hscroll style)
-           (memq 'hide-hscroll style))
-       null
-       '(hscroll))
-   (if (or (memq 'no-vscroll style)
-           (memq 'hide-vscroll style))
-       null
-       '(vscroll))))
-
-(define (memq? s l) (and (memq s l) #t))
-
-(define (keep-style l s) (if (memq s l) (list s) null))
-
-(defclass editor-canvas% canvas%
-
-  (inherit refresh get-canvas-background get-dc
-           get-client-size get-size set-cursor
-           get-scroll-pos set-scroll-pos 
-           get-scroll-page set-scroll-page
-           get-scroll-range set-scroll-range
-           is-shown-to-root?
-           show-scrollbars
-	   set-focus
-           begin-refresh-sequence
-           end-refresh-sequence)
-
-  (define blink-timer #f)
-  (define noloop? #f)
-
-  (define focuson? #f)
-  (define focusforcedon? #f)
-  (define/public (get-focusforcedon?) focusforcedon?)
-  (define lazy-refresh? #f)
-  (define need-refresh? #f)
-
-  (define auto-dragger #f)
-
-  (define custom-cursor #f)
-  (define custom-cursor-on? #f)
-
-  (define scroll-to-last? #f)
-  (define scroll-bottom-based? #f)
-  (define scroll-offset 0)
-
-  (define lastwidth -1)
-  (define lastheight -1)
-
-  (define last-x 0)
-  (define last-y 0)
-
-  (define bg-color #f)
-
-  (define wheel-amt default-wheel-amt)
-  (define xmargin 5)
-  (define ymargin 5)
-
-  (define/public (set-wheel-step v) (set! wheel-amt v))
-  (define/public (get-wheel-step) wheel-amt)
-
-  (set! noloop? #t)
-  (init parent x y width height
-        name style 
-        [scrolls-per-page 100]
-        [editor #f]
-        [gl-config #f])
-
-  (super-make-object parent
-                     x y width height
-                     (append (keep-style style 'border)
-                             (INIT-SB style)
-                             (keep-style style 'invisible)
-                             (if (memq 'transparent style)
-                                 '(transparent)
-                                 '(no-autoclear))
-                             (keep-style style 'control-border)
-                             (keep-style style 'combo)
-                             (keep-style style 'resize-corner)
-                             (keep-style style 'no-focus))
-                     name
-                     gl-config)
-
-  (define given-h-scrolls-per-page scrolls-per-page)
-
-  (define allow-x-scroll? (not (memq 'no-hscroll style)))
-  (define allow-y-scroll? (not (memq 'no-vscroll style)))
-
-  (define fake-x-scroll? (or (not allow-x-scroll?)
-                             (memq? 'hide-hscroll style)))
-  (define fake-y-scroll? (or (not allow-y-scroll?)
-                             (memq? 'hide-vscroll style)))
-
-  (define auto-x? (and (not fake-x-scroll?)
-                       (memq? 'auto-hscroll style)))
-  (define auto-y? (and (not fake-y-scroll?)
-                       (memq? 'auto-vscroll style)))
-
-  (define xscroll-on? (and (not fake-x-scroll?) (not auto-x?)))
-  (define yscroll-on? (and (not fake-y-scroll?) (not auto-y?)))
-
-  (show-scrollbars xscroll-on? yscroll-on?)
-  (super set-scrollbars 
-         1 1 ;; Windows fake-{x,y}-scroll => -1 instead of 1 !? 
-         1 1 ;;
-         1 1 0 0 #f)
-  
-  (define hscroll
-    (if fake-x-scroll?
-        (new simple-scroll%
-             [canvas this]
-             [style '(horizontal)]
-             [length 0]
-             [steps-per-page 1]
-             [position 0])
-        #f))
-  (define vscroll
-    (if fake-y-scroll?
-        (new simple-scroll%
-             [canvas this]
-             [style '(vertical)]
-             [length 0]
-             [steps-per-page 1]
-             [position 0])
-        #f))
-
-  (define scroll-width (if fake-x-scroll? 1 1)) ;; else used to be 0
-  (define scroll-height (if fake-y-scroll? 1 1))
-
-  (define hscrolls-per-page 1)
-  (define vscrolls-per-page 1)
-  (define hpixels-per-scroll 0)
-
-  (set! noloop? #f)
-
-  (define admin (new canvas-editor-admin%
-                     [canvas this]))
-  (send admin adjust-std-flag)
-
-  (define media editor)
-  (when media (set-editor media))
-  
-  ;; FIXME: needed?
-  (define/public (~)
-    (when auto-dragger
-      (send auto-dragger kill)
-      (set! auto-dragger #f))
-    (when blink-timer
-      (send blink-timer kill)
-      (set! blink-timer #f))
-    (send admin set-canvas #f)
-    #|(super ~)|#)
-  
-  (define/override (on-size)
-    (unless noloop?
-      (queue-refresh-event
-       (get-eventspace)
-       (lambda ()
-         (unless (and media
-                      (send media get-printing))
-           (maybe-reset-size))))))
-
-  (define/private (maybe-reset-size)
-    (begin-refresh-sequence)
-    (let-boxes ([w 0]
-                [h 0])
-        (get-size w h)
-      (unless (and (= w lastwidth)
-                   (= h lastheight))
-        (reset-size)))
-    (end-refresh-sequence))
-
-  (define/private (reset-size)
-    (reset-visual #f)
-    (refresh))
-
-  (define/public (set-x-margin x)
-    (unless (= x xmargin)
-      (set! xmargin x)
-      (reset-size)))
-  (define/public (set-y-margin y)
-    (unless (= y ymargin)
-      (set! ymargin y)
-      (reset-size)))
-  (define/public (get-x-margin) xmargin)
-  (define/public (get-y-margin) ymargin)
-
-  (define/override (set-canvas-background c)
-    (super set-canvas-background c)
-    (refresh))
-
-  (define-syntax-rule (using-admin body ...)
-    (let ([oldadmin (send media get-admin)])
-      (unless (eq? admin oldadmin)
-        (send media set-admin admin))
-      (begin0
-       (begin body ...)
-       (when media
-         (unless (eq? admin oldadmin)
-           ;; FIXME: how do we know that this adminstrator
-           ;; still wants the editor?
-           (send media set-admin oldadmin))))))
-
-  (define/private (get-eventspace)
-    (send (send this get-top-level) get-eventspace))
-
-  (define/private (on-focus focus?)
-    (unless (eq? focus? focuson?)
-      (set! focuson? focus?)
-      (when (and media
-                 (not (send media get-printing)))
-        (using-admin
-         (when media
-           (send media own-caret focus?))))
-      (when focuson?
-        (unless blink-timer
-          (set! blink-timer (parameterize ([current-eventspace (get-eventspace)])
-                              (new blink-timer% [canvas this]))))
-        (send blink-timer start BLINK-DELAY #t))))
-
-  (define/public (blink-caret)
-    (when focuson?
-      (when media
-        (using-admin
-         (when media
-           (send media blink-caret))))
-      (send blink-timer start BLINK-DELAY #t)))
-
-  (define/public (call-as-primary-owner thunk)
-    (if media
-        (using-admin
-         (thunk))
-        (thunk)))
-
-  (define/override (on-set-focus)
-    (super on-set-focus)
-    (on-focus #t))
-  (define/override (on-kill-focus)
-    (super on-kill-focus)
-    (on-focus #f))
-
-  (define/public (is-focus-on?) focuson?)
-
-  (define/public (force-display-focus on?)
-    (let ([old-on? focusforcedon?])
-      (set! focusforcedon? on?)
-      (send admin adjust-std-flag)
-      (when (not (equal? (or focuson? focusforcedon?)
-                         (or focuson? old-on?)))
-        (refresh))))
-
-  (define/override (on-event event)
-    ;; Turn off auto-dragger, if there is one
-    (when auto-dragger
-      (send auto-dragger kill)
-      (set! auto-dragger #f))
-
-    (let ([x (send event get-x)]
-          [y (send event get-y)])
-      (set! last-x x)
-      (set! last-y y)
-
-      #;
-      (when (and (eq? 'windows (system-type))
-		 (not focuson?)
-		 (send event button-down?))
-	(set-focus)
-	(on-focus #t))
-
-      (let ([out-of-client?
-             (let-boxes ([cw 0]
-                         [ch 0])
-                 (get-client-size cw ch)
-               (or (x . < . 0)
-                   (y . < . 0)
-                   (x . > . cw)
-                   (y . > . ch)))])
-
-        (when (and media
-                   (not (send media get-printing)))
-          (using-admin
-           (when media
-             (set-custom-cursor
-              (and (or (not out-of-client?)
-                       (send event dragging?))
-                   (send media adjust-cursor event))))
-           (when media
-             (send media on-event event))))
-        
-        (when (send event dragging?)
-          (when out-of-client?
-            ;; Dragging outside the canvas: auto-generate more events because the buffer
-            ;; is probably scrolling. But make sure we're shown.
-            (when (is-shown-to-root?)
-              (set! auto-dragger (parameterize ([current-eventspace (get-eventspace)])
-                                   (new auto-drag-timer% 
-                                        [canvas this]
-                                        [event event])))))))))
-
-  (define/private (update-cursor-now)
-    (when media
-      (let ([e (new mouse-event% [type 'motion])])
-        (send e set-x last-x)
-        (send e set-y last-y)
-        (send e set-timestamp 0)
-
-        (using-admin
-         (when media
-           (set-custom-cursor (send media adjust-cursor e)))))))
-
-  (define/public (popup-for-editor b m) #f)
-
-  (define/override (on-char event)
-    (let ([code (send event get-key-code)])
-      (case (and (positive? wheel-amt)
-                 code)
-        [(wheel-up wheel-down)
-         (when (and allow-y-scroll?
-                    (not fake-y-scroll?))
-           (let-boxes ([x 0]
-                       [y 0])
-               (get-scroll x y)
-             (let ([old-y y]
-                   [y (max (+ y
-                              (* wheel-amt
-                                 (if (eq? code 'wheel-up)
-                                     -1
-                                     1)))
-                           0)])
-               (do-scroll x y #t x old-y))))]
-        [(wheel-left wheel-right)
-         (when (and allow-x-scroll?
-                    (not fake-x-scroll?))
-           (let-boxes ([x 0]
-                       [y 0])
-               (get-scroll x y)
-             (let ([old-x x]
-                   [x (max (+ x
-                              (* wheel-amt
-                                 (if (eq? code 'wheel-left)
-                                     -1
-                                     1)))
-                           0)])
-               (do-scroll x y #t old-x y))))]
-        [else
-         (when (and media (not (send media get-printing)))
-           (using-admin
-            (when media
-              (send media on-char event))))])))
-
-  (define/public (clear-margins)
-    ;; This method is called by `on-paint' in `editor-canvas%'
-    ;; before it calls the `on-paint' in `canvas%'. It's
-    ;; essentially a compromise between autoclear mode and
-    ;; no-autoclear mode.
-
-    (when (or (positive? xmargin)
-              (positive? ymargin))
-      (let ([bg (get-canvas-background)])
-        (when bg
-          (let ([cw (box 0)]
-                [ch (box 0)]
-                [b (send the-brush-list find-or-create-brush bg 'solid)]
-                [p (send the-pen-list find-or-create-pen "BLACK" 0 'transparent)]
-                [dc (get-dc)])
-            (get-client-size cw ch)
-            (let ([ob (send dc get-brush)]
-                  [op (send dc get-pen)]
-                  [cw (unbox cw)]
-                  [ch (unbox ch)])
-              (send dc set-brush b)
-              (send dc set-pen p)
-              
-              (send dc draw-rectangle 0 0 xmargin ch)
-              (send dc draw-rectangle (- cw xmargin) 0 cw ch)
-              (send dc draw-rectangle 0 0 cw ymargin)
-              (send dc draw-rectangle 0 (- ch ymargin) cw ch)
-
-              (send dc set-brush ob)
-              (send dc set-pen op)))))))
-
-  (define/override (on-paint)
-    (set! need-refresh? #f)
-    (if media
-        (when (not (send media get-printing))
-          (redraw 'view 'view 'view 'view #f))
-        (let ([bg (get-canvas-background)])
-          (when bg
-            (let ([adc (get-dc)])
-              (send adc set-background bg)
-              (send adc clear)))))
-    (super on-paint))
-
-  (define/public (repaint)
-    (unless need-refresh?
-      (if (or lazy-refresh? (not (get-canvas-background)))
-          (begin
-            (set! need-refresh? #t)
-            (refresh))
-          (on-paint))))
-  
-  (define/private (paint-scrolls) (void))
-
-  (define/public (set-lazy-refresh on?)
-    (set! lazy-refresh? on?)
-    (when (and (not on?)
-               need-refresh?)
-      (on-paint)))
-
-  (define/public (get-lazy-refresh) lazy-refresh?)
-
-  (define/public (set-custom-cursor cursor)
-    (if (not cursor)
-        (no-custom-cursor)
-        (begin
-          (set! custom-cursor-on? #t)
-          (set! custom-cursor cursor)
-          (set-cursor custom-cursor))))
-
-  (define arrow #f)
-  (define/public (no-custom-cursor)
-    (when (not arrow)
-      (set! arrow (make-object cursor% 'arrow)))
-    (when custom-cursor-on?
-      (set! custom-cursor-on? #f)
-      (set-cursor arrow)))
-
-
-  (define/public (get-dc-and-offset fx fy)
-    (when (or fx fy)
-      (let-boxes ([x 0]
-                  [y 0])
-          (get-scroll x y)
-        (convert-scroll-to-location x y fx fy)))
-    (get-dc))
-
-  (define/private (convert-scroll-to-location x y fx fy)
-    (when fx
-      (set-box! fx (- (* x hpixels-per-scroll) xmargin)))
-    (when fy
-      (if (and media
-               (or (positive? y)
-                   scroll-bottom-based?))
-          (let ([v (- (if (send media locked-for-read?)
-                          0.0
-                          (send media scroll-line-location (+ y scroll-offset)))
-                      ymargin)])
-            (set-box! fy v)
-            (when (and scroll-bottom-based?
-                       (or (positive? scroll-height)
-                           scroll-to-last?))
-              (let-boxes ([w 0] [h 0])
-                  (get-client-size w h)
-                (let ([h (max (- h (* 2 ymargin))
-                              0)])
-                  (set-box! fy (- (unbox fy) h))))))
-          (set-box! fy (- ymargin)))))
-
-  (define/public (get-view fx fy fw fh [unused-full? #f])
-    (let ([w (box 0)]
-          [h (box 0)])
-      (get-client-size w h)
-      (get-dc-and-offset fx fy)
-      (when fx
-        (set-box! fx (+ (unbox fx) xmargin)))
-      (when fy
-        (set-box! fy (+ (unbox fy) ymargin)))
-      (when fh
-        (set-box! fh (max 0 (- (unbox h) (* 2 ymargin)))))
-      (when fw
-        (set-box! fw (max 0 (- (unbox w) (* 2 xmargin)))))))
-
-  (define/public (redraw localx localy fw fh clear?)
-    (when (and media
-               (not (send media get-printing)))
-      (begin-refresh-sequence)
-      (let-values ([(localx localy fw fh)
-                    (if (eq? localx 'view)
-                        (let-boxes ([x 0][y 0][w 0][h 0])
-                            (get-view x y w h)
-                          (values x y w h))
-                        (values localx localy fw fh))])
-        (when clear?
-          (let ([bg (get-canvas-background)])
-            (when bg
-              (let ([adc (get-dc)])
-                (let ([b (send adc get-brush)]
-                      [p (send adc get-pen)])
-                  (send adc set-brush bg 'solid)
-                  (send adc set-pen bg 1 'transparent)
-                  (send adc draw-rectangle localx localy fw fh)
-                  (send adc set-brush b)
-                  (send adc set-pen p))))))
-        (let ([x (box 0)]
-              [y (box 0)]
-              [w (box 0)]
-              [h (box 0)])
-          (get-view x y w h)        
-          (let ([x (unbox x)]
-                [y (unbox y)]
-                [w (unbox w)]
-                [h (unbox h)])
-            (let ([right (+ x w)]
-                  [bottom (+ y h)])
-              (let ([x (max x localx)]
-                    [y (max y localy)]
-                    [right (min right (+ localx fw))]
-                    [bottom (min bottom (+ localy fh))])
-                (let ([w (max 0 (- right x))]
-                      [h (max 0 (- bottom y))])
-                  (when (or (positive? w)
-                            (positive? h))
-                    (using-admin
-                     (when media
-                       (send media refresh
-                             x y w h
-                             (if (or focuson? focusforcedon?)
-                                 'show-caret
-                                 'show-inactive-caret)
-                             (get-canvas-background)))))))))))
-      (end-refresh-sequence)))
-
-
-  (def/public (scroll-to [real? localx] [real? localy] [real? fw] [real? fh] [any? refresh?] 
-                         [(symbol-in start none end) [bias 'none]])
-    (let ([med media])
-      (if (or (not med)
-              (send med get-printing)
-              (and (not allow-x-scroll?)
-                   (not allow-y-scroll?)))
-          #f
-          (let-boxes ([x 0]
-                      [y 0]
-                      [iw 0]
-                      [ih 0])
-              (get-view x y iw ih)
-            (if (or (zero? iw)
-                    (zero? ih))
-                #f
-                (let ([find-dy (if scroll-bottom-based?
-                                   ih
-                                   0)])
-                  (let-boxes ([cx 0]
-                              [cy 0])
-                      (get-scroll cx cy)
-                    (let ([sy
-                           (if allow-y-scroll?
-                               (cond
-                                [(or
-                                  ;; doesn't fit and bias is set:
-                                  (and (eq? bias 'start) (fh . > . ih))
-                                  ;; fits, need to shift down into view:
-                                  (and (fh . <= . ih) (localy . < . y) )
-                                  ;; doesn't fit, no conflicting bias, can shift up to see more:
-                                  (and (fh . > . ih) (not (eq? bias 'end)) (localy . < . y)))
-                                 (- (send med find-scroll-line (+ find-dy localy))
-                                    scroll-offset)]
-                                [(or
-                                  ;; doesn't fit, bias is set:
-                                  (and (eq? bias 'end) (fh . > . ih))
-                                  ;; fits, need to shift up into view:
-                                  (and (fh . <= . ih) ((+ y ih) . < . (+ localy fh))))
-                                 (let ([l (+ find-dy localy (- fh ih))])
-                                   ;; find scroll pos for top of region to show:
-                                   (let ([sy (send med find-scroll-line l)])
-                                     ;; unless l is exactly the top of a line, move down to the next whole line:
-                                     (let ([sy (if (= (send med scroll-line-location sy) l)
-                                                   sy
-                                                   (+ sy 1))])
-                                       (- sy scroll-offset))))]
-                                [(or
-                                  ;; doesn't fit, no conflicting bias, maybe shift down to see more:
-                                  (and (fh . > . ih)
-                                       (not (eq? bias 'start))
-                                       ((+ localy fh) .  > . (+ y ih))))
-                                 ;; shift to one more than the first scroll position that shows last line
-                                 (let ([my (+ (send med find-scroll-line (+ find-dy localy (- fh ih)))
-                                              (- 1 scroll-offset))])
-                                   ;; but only shift down the extra line if doing so doesn't skip the whole area
-                                   (cond
-                                    [((send med scroll-line-location my) . < . (+ find-dy localy fh))
-                                     my]
-                                    [(my . > . 0)
-                                     (- my 1)]
-                                    [else 0]))]
-                                [else cy])
-                               cy)]
-                          [sx
-                           (if allow-x-scroll?
-                               (if (positive? hpixels-per-scroll)
-                                   (cond
-                                    [(or (and (eq? bias 'start) (fw . > . iw))
-                                         (and (fw . < . iw) (localx . < . x))
-                                         (and (fw . > . iw) (not (eq? bias 'end)) (localx . < . x)))
-                                     (->long (/ localx hpixels-per-scroll))]
-                                    [(or (and (eq? bias 'end) (fw . > . iw))
-                                         (and (fw . < . iw) ((+ x iw) . < . (+ localx fw)))
-                                         (and (fw . > . iw) (not (eq? bias 'start)) ((+ localx fw) . > . (+ x iw))))
-                                     (+ (->long (/ (+ localx (- fw iw)) hpixels-per-scroll)) 1)]
-                                    [else cx])
-                                   0)
-                               cx)])
-                      (if (or (not (= sy cy))
-                              (not (= sx cx)))
-                          (begin
-                            (when hscroll
-                              (send hscroll set-value sx))
-                            (when vscroll
-                              (send vscroll set-value sy))
-                            (do-scroll sx sy refresh? cx cy)
-                            #t)
-                          #f)))))))))
-
-  (define/public (reset-visual reset-scroll?)
-    (if (given-h-scrolls-per-page . < . 0)
-        (begin
-          (set! given-h-scrolls-per-page -2)
-          #f)
-        (let loop ([retval #f] [iters 0])
-          (let-boxes ([sx 0]
-                      [sy 0])
-              (get-scroll sx sy)
-            (let-boxes ([lw 0]
-                        [lh 0])
-                (get-size lw lh)
-              (set! lastwidth lw)
-              (set! lastheight lh)
-              
-              (let-values ([(x y vnum-scrolls hnum-scrolls vspp hspp)
-                            (if (and media (or allow-x-scroll? allow-y-scroll?))
-
-                                (let ([med media])
-                                  (let-values ([(x y)
-                                                (if reset-scroll?
-                                                    (values 0 0)
-                                                    (values sx sy))])
-                                    
-                                    (let-boxes ([w 0.0]
-                                                [h 0.0])
-                                        (get-view #f #f w h)
-                                      (let-boxes ([total-width 0.0]
-                                                  [total-height 0.0])
-                                          (send med get-extent total-width total-height)
-
-                                        (let-values ([(vnum-scrolls -scroll-offset)
-                                                      (if (or (zero? h)
-                                                              (and (not scroll-to-last?)
-                                                                   (h . >= . total-height)))
-                                                          (values 0 0)
-
-                                                          (if scroll-bottom-based?
-                                                              (let ([vnum-scrolls (- (send med num-scroll-lines) 1)])
-                                                                (if scroll-to-last?
-                                                                    (values vnum-scrolls 1)
-                                                                    (let ([start (- (send med find-scroll-line (+ h 1)) 1)])
-                                                                      (values (- vnum-scrolls start)
-                                                                              (+ 1 start)))))
-                                                              (let ([top (max 0
-                                                                              (- (->long (- total-height
-                                                                                            (if scroll-to-last?
-                                                                                                0
-                                                                                                h)))
-                                                                                 1))])
-                                                                (let ([vnum-scrolls (+ (send med find-scroll-line top) 1)]
-                                                                      [nsl (send med num-scroll-lines)])
-                                                                  (values (if (vnum-scrolls . >= . nsl)
-                                                                              (- nsl 1)
-                                                                              vnum-scrolls)
-                                                                          0)))))])
-
-                                          (set! scroll-offset -scroll-offset)
-
-                                          (let-values ([(vnum-scrolls vspp)
-                                                        (if (positive? vnum-scrolls)
-                                                            (let ([num-lines (- (send med num-scroll-lines) 1)])
-                                                              (values vnum-scrolls
-                                                                      (max 1
-                                                                           (- (->long
-                                                                               (/ (* h num-lines)
-                                                                                  total-height))
-                                                                              1))))
-                                                            (values 0 1))])
-
-                                            (let-values ([(hnum-scrolls hspp)
-                                                          (if (total-width . >= . w)
-                                                              (let ([tw (->long (- total-width w))])
-                                                                (set! hpixels-per-scroll 
-                                                                      (let ([v (->long (/ w given-h-scrolls-per-page))])
-                                                                        (if (zero? v) 2 v)))
-                                                                (let ([tw
-                                                                       (if (modulo tw hpixels-per-scroll)
-                                                                           (+ tw (- hpixels-per-scroll (modulo tw hpixels-per-scroll)))
-                                                                           tw)])
-                                                                  (values (->long (/ tw hpixels-per-scroll))
-                                                                          given-h-scrolls-per-page)))
-                                                              (values 0 1))])
-
-                                              (values x y vnum-scrolls hnum-scrolls vspp hspp))))))))
-
-                                (begin0
-                                 (values 0 0 0 0 1 1)
-                                 (when (not media)
-                                   (let ([dc (get-dc)])
-                                     (let ([bg (get-canvas-background)])
-                                       (when bg
-                                         (send dc set-background bg)
-                                         (send dc clear)))))))])
-
-                (if (not (and (= scroll-width hnum-scrolls)
-                              (= scroll-height vnum-scrolls)
-                              (= vspp vscrolls-per-page)
-                              (= hspp hscrolls-per-page)
-                              (= x sx)
-                              (= y sy)))
-                    (begin
-                      (when hscroll
-                        (send hscroll set-scroll hnum-scrolls hspp x))
-                      (when vscroll
-                        (send vscroll set-scroll vnum-scrolls vspp y))
-                      (let ([savenoloop? noloop?]
-                            [save-h-s-p-p given-h-scrolls-per-page])
-                        (set! noloop? #t)
-                        (set! given-h-scrolls-per-page -1)
-                        
-                        (let ([xon? (and (not fake-x-scroll?) (not (zero? hnum-scrolls)))]
-                              [yon? (and (not fake-y-scroll?) (not (zero? vnum-scrolls)))])
-                          (let ([go-again?
-                                 (if (or (and auto-x? (not (eq? xon? xscroll-on?)))
-                                         (and auto-y? (not (eq? yon? yscroll-on?))))
-                                     (begin
-                                       (when auto-x?
-                                         (set! xscroll-on? xon?))
-                                       (when auto-y?
-                                         (set! yscroll-on? yon?))
-                                       (show-scrollbars xscroll-on? yscroll-on?)
-                                       (on-scroll-on-change)
-                                       #t)
-                                     #f)])
-
-                            (unless fake-x-scroll?
-                              (let ([x (min x hnum-scrolls)])
-                                (when (hspp . < . hscrolls-per-page)
-                                  (set-scroll-page 'horizontal (min hspp 10000000)))
-                                (when (x . < . sx)
-                                  (set-scroll-pos 'horizontal x))
-                                (when (not (= scroll-width hnum-scrolls))
-                                  (set-scroll-range 'horizontal (min hnum-scrolls 10000000)))
-                                (when (x . > . sx)
-                                  (set-scroll-pos 'horizontal (min x 10000000)))
-                                (when (hspp . > . hscrolls-per-page)
-                                  (set-scroll-page 'horizontal (min hspp 10000000)))))
-                            
-                            (unless fake-y-scroll?
-                              (let ([y (min y vnum-scrolls)])
-                                (when (vspp . < . vscrolls-per-page)
-                                  (set-scroll-page 'vertical (min vspp 10000000)))
-                                (when (y . < . sy)
-                                  (set-scroll-pos 'vertical (min y 10000000)))
-                                (when (not (= scroll-height vnum-scrolls))
-                                  (set-scroll-range 'vertical (min vnum-scrolls 10000000)))
-                                (when (y . > . sy)
-                                  (set-scroll-pos 'vertical (min y 10000000)))
-                                (when (vspp . > . vscrolls-per-page)
-                                  (set-scroll-page 'vertical (min vspp 10000000)))))
-
-                            (let ([go-again? (or go-again?
-                                                 (given-h-scrolls-per-page . < . -1))])
-                              (set! given-h-scrolls-per-page save-h-s-p-p)
-                              (set! noloop? savenoloop?)
-                              (set! hscrolls-per-page hspp)
-                              (set! vscrolls-per-page vspp)
-                              (set! scroll-width hnum-scrolls)
-                              (set! scroll-height vnum-scrolls)
-
-                              (when (and go-again? (iters . > . 2))
-                                ;; we're not reaching a fixpoint, so
-                                ;; it seems that a horizontal scroll
-                                ;; is needed iff there's a vertical
-                                ;; scrollbar; force a fixpoint
-                                (cond
-                                 [(and auto-x? auto-y?)
-                                  (set! xscroll-on? #f)
-                                  (set! yscroll-on? #f)]
-                                 ;; I don't think these cases are possible,
-                                 ;; but in case I have it wrong, conservatively
-                                 ;; force scrollbars on.
-                                 [auto-x? (set! xscroll-on? #t)]
-                                 [auto-y? (set! yscroll-on? #t)])
-                                (show-scrollbars xscroll-on? yscroll-on?))
-
-                              (if go-again?
-                                  (loop #t (add1 iters))
-                                  #t))))))
-
-                    retval)))))))
-
-  (define/private (do-scroll x y refresh? old-x old-y)
-    (let ([savenoloop? noloop?])
-      (set! noloop? #t)
-      
-      (maybe-reset-size)
-
-      (define change?
-        (or
-         ;; Set x
-         (and (x . > . -1)
-              (not fake-x-scroll?)
-              (positive? scroll-width)
-              (let ([x (min (->long (min x scroll-width)) 10000000)])
-                (and (not (= x old-x))
-                     (begin (set-scroll-pos 'horizontal x)
-                            #t))))
-         ;; Set y
-         (and (y . > . -1)
-              (not fake-y-scroll?)
-              (positive? scroll-height)
-              (let ([y (min (->long (min y scroll-height))  10000000)])
-                (and (not (= y old-y))
-                     (begin
-                       (set-scroll-pos 'vertical y)
-                       #t))))))
-      
-      (set! noloop? savenoloop?)
-
-      (when (and change? refresh?)
-        (if (and #f ;; special scrolling disabled: not faster with Cocoa, broken for Windows
-                 (not need-refresh?)
-                 (not lazy-refresh?)
-                 (get-canvas-background)
-                 (= x old-x)) ; could handle horizontal scrolling in the future
-            (let-boxes ([fx 0]
-                        [old-fy 0]
-                        [new-fy 0])
-                (begin
-                  (convert-scroll-to-location x y fx new-fy)
-                  (convert-scroll-to-location old-x old-y #f old-fy))
-              (let-boxes ([vx 0][vy 0][vw 0][vh 0])
-                  (get-view vx vy vw vh) ; editor coords
-                (cond
-                 [(and (new-fy . < . old-fy)
-                       (old-fy . < . (+ new-fy vh)))
-                  (let ([dc (get-dc)])
-                    (send dc copy
-                          xmargin ymargin
-                          vw (- (+ new-fy vh) old-fy)
-                          xmargin (+ ymargin (- old-fy new-fy)))
-                    (redraw xmargin ymargin 
-                            vw (- old-fy new-fy)
-                            #t))]
-                 [(and (old-fy . < . new-fy)
-                       (new-fy . < . (+ old-fy vh)))
-                  (let ([dc (get-dc)])
-                    (send dc copy
-                          xmargin (+ ymargin (- new-fy old-fy))
-                          vw (- (+ old-fy vh) new-fy)
-                          xmargin ymargin)
-                    (let ([d (- (+ old-fy vh) new-fy)])
-                      (redraw xmargin (+ ymargin d)
-                              vw (- vh d)
-                              #t)))]
-                 [else (repaint)])))
-            (repaint)))))
-
-  (define/override (set-scrollbars x y x2 y2 x3 y3 x4 y4 ?) (void))
-
-  (define/public (get-scroll x y)
-    ;; get fake scroll values if available
-    (set-box! x (if hscroll
-                    (send hscroll get-value)
-                    (get-scroll-pos 'horizontal)))
-    (set-box! y (if vscroll
-                    (send vscroll get-value)
-                    (get-scroll-pos 'vertical))))
-
-  (define/public (editor-canvas-on-scroll)
-    (unless noloop?
-      (repaint)))
-
-  (define/public (on-scroll-on-change) 
-    (void))
-
-  (define/public (get-editor) media)
-
-  (define/public (set-editor m [update? #t])
-    (unless (eq? media m)
-      (when media
-        (when (object/bool=? admin (send media get-admin))
-          (send media set-admin 
-                (or (send admin get-nextadmin)
-                    (send admin get-prevadmin))))
-
-        (let ([a (send admin get-nextadmin)])
-          (when a
-            (send a set-prevadmin (send admin get-prevadmin))
-            (send a adjust-std-flag)))
-        (let ([a (send admin get-prevadmin)])
-          (when a
-            (send a set-nextadmin (send admin get-nextadmin))
-            (send a adjust-std-flag)))
-        (send admin set-nextadmin #f)
-        (send admin set-prevadmin #f)
-        (when custom-cursor
-          (no-custom-cursor)
-          (set! custom-cursor #f)))
-      (set! media m)
-      (when media
-        (let ([oldadmin (send media get-admin)])
-          (if (and oldadmin
-                   (not (send oldadmin get-s-standard)))
-              (set! media #f)
-              (if oldadmin
-                  (begin
-                    (unless (in-chain? admin oldadmin)
-                      (send admin set-nextadmin oldadmin)
-                      (send admin set-prevadmin (send oldadmin get-prevadmin))
-                      (send oldadmin set-prevadmin admin)
-                      (send oldadmin adjust-std-flag)
-                      (let ([a (send admin get-prevadmin)])
-                        (when a
-                          (send a set-nextadmin admin)
-                          (send a adjust-std-flag))))
-                    ;; get the right cursor:
-                    (send admin update-cursor))
-                  (begin
-                    (send admin set-nextadmin #f)
-                    (send admin set-prevadmin #f)
-                    (send media set-admin admin)
-                    (send media own-caret focuson?))))))
-      (send admin adjust-std-flag)
-      (reset-visual #t)
-      (when update?
-        (repaint))))
-
-  (define/private (in-chain? admin oldadmin)
-    (or (let loop ([oldadmin oldadmin])
-          (and oldadmin
-               (or (object/bool=? admin oldadmin)
-                   (loop (send oldadmin get-prevadmin)))))
-        (let loop ([oldadmin oldadmin])
-          (and oldadmin
-               (or (object/bool=? admin oldadmin)
-                   (loop (send oldadmin get-nextadmin)))))))
-
-  (define/public (allow-scroll-to-last to-last?)
-    (set! scroll-to-last? to-last?)
-    (reset-visual #f)
-    (repaint))
-
-  (define/public (scroll-with-bottom-base bottom?)
-    (set! scroll-bottom-based? bottom?)
-    (reset-visual #f)
-    (repaint)))
-
-;; ----------------------------------------
-
-(defclass canvas-editor-admin% editor-admin%
-  (init-field canvas)
-
-  (super-new)
-
-  (inherit set-s-standard)
-  
-  (define reset? #f)
-  (properties [[any? nextadmin] #f]
-              [[any? prevadmin] #f])
-
-  (define update-cursor-timer #f)
-
-  (define update-block? #f)
-  (define resized-block? #f)
-
-  ;; FIXME: needed?
-  (define/private (~)
-    (when update-cursor-timer
-      (send update-cursor-timer cancel)
-      (set! update-cursor-timer #f))
-    (set! canvas #f))
-
-  (define/public (do-get-canvas) canvas)
-
-  (define canvasless-offscreen #f)
-
-  (define/override (get-dc [fx #f] [fy #f])
-    (cond
-     [(not canvas)
-      (unless canvasless-offscreen
-        (set! canvasless-offscreen (new bitmap-dc%)))
-      (when fx (set-box! fx 0))
-      (when fy (set-box! fy 0))
-      canvasless-offscreen]
-     [(let ([m (send canvas get-editor)])
-        (and m (send m get-printing)))
-      => (lambda (p)
-           (when fx (set-box! fx 0))
-           (when fy (set-box! fy 0))
-           p)]
-     [else
-      (send canvas get-dc-and-offset fx fy)]))
-
-  (define/override (get-view fx fy fh fw [full? #f])
-    (cond
-     [(not canvas)
-      (when fx (set-box! fx 0))
-      (when fy (set-box! fy 0))
-      (when fh (set-box! fh 1))
-      (when fw (set-box! fw 1))]
-     [(let ([m (send canvas get-editor)])
-        (and m (send m get-printing)))
-      (when fx (set-box! fx 0))
-      (when fy (set-box! fy 0))
-      (when fh (set-box! fh 10000))
-      (when fw (set-box! fw 10000))]
-     [else
-      (send canvas get-view fx fy fh fw full?)]))
-
-  (define/override (get-max-view fx fy fw fh [full? #f])
-    (if (or (and (not nextadmin)
-                 (not prevadmin))
-            (not canvas)
-            (and (let ([m (send canvas get-editor)])
-                   (and m (send m get-printing)))))
-        (get-view fx fy fw fh full?)
-        (let ([a (let loop ([a this])
-                   (let ([a2 (send a get-prevadmin)])
-                     (if a2
-                         (loop a2)
-                         a)))])
-          (let-boxes ([cx 0] [cy 0] [cw 0] [ch 0])
-              (send a get-view cx cy cw ch)
-            (let loop ([a (send a get-nextadmin)]
-                       [cx cx][cy cy][cr (+ cx cw)][cb (+ cy ch)])
-              (if (not a)
-                  (let ([cw (- cr cx)]
-                        [ch (- cb cy)])
-                    (when fx (set-box! fx cx))
-                    (when fy (set-box! fy cy))
-                    (when fw (set-box! fw cw))
-                    (when fh (set-box! fh ch)))
-                  (let-boxes ([x 0] [y 0] [w 0] [h 0])
-                      (send a get-view x y w h)
-                    (loop (send a get-nextadmin)
-                          (min x cx)
-                          (min y cy)
-                          (max (+ x w) cr)
-                          (max (+ y h) cb)))))))))
-
-  (def/override (scroll-to [real? localx] [real? localy] [real? w] [real? h] [any? [refresh? #t]] 
-                           [(symbol-in start none end) [bias 'none]])
-    (let ([v (do-scroll-to localx localy w h refresh? bias #t #t #f)])
-      (and v (car v))))
-
-  (define/public (do-scroll-to localx localy w h refresh? bias prev? next? only-focus?)
-    (and canvas
-         (or (and (not (send canvas is-focus-on?))
-                  (or
-                   (and prev? 
-                        prevadmin
-                        (send prevadmin do-scroll-to localx localy w h refresh? bias #t #f #t))
-                   (and next? 
-                        nextadmin
-                        (send nextadmin do-scroll-to localx localy w h refresh? bias #f #t #t))))
-             (and (or (not only-focus?)
-                      (send canvas is-focus-on?))
-                  (list (send canvas scroll-to localx localy w h refresh? bias))))))
-
-  (def/override (grab-caret [(symbol-in immediate display global) [dist 'global]])
-    (when canvas
-      (when (eq? dist 'global)
-        (send canvas set-focus))))
-
-  (define/public all-in-chain
-    (case-lambda
-     [(proc) (all-in-chain proc #t #t)]
-     [(proc backward? forward?)
-      (proc this)
-      (when (and forward? nextadmin)
-        (send nextadmin all-in-chain proc #f #t))
-      (when (and backward? prevadmin)
-        (send prevadmin all-in-chain proc #t #f))]))
-
-  (def/override (needs-update [real? localx] [real? localy]
-                              [nonnegative-real? w] [nonnegative-real? h])
-    (all-in-chain (lambda (a) (send a do-needs-update localx localy w h))))
-
-  (define/public (do-needs-update localx localy w h)
-    (when canvas
-      (let ([is-shown? (send canvas is-shown-to-root?)])
-        
-        (cond
-         [reset?
-          (when is-shown? (send canvas repaint))
-          (set! reset? #f)]
-         [is-shown?
-          (if (not (send canvas get-canvas-background))
-              (send canvas repaint)
-              (send canvas redraw localx localy w h #f))]))))
-
-  (define/override (resized update?)
-    (all-in-chain (lambda (a) (send a do-resized update?))))
-
-  (define/public (do-resized update?)
-    (when canvas 
-      (when (send canvas reset-visual #f)
-        (set! reset? #t))
-      
-      (when update?
-        (send canvas repaint)
-        (set! reset? #f))))
-
-  (define/override (update-cursor)
-    (all-in-chain (lambda (a) (send a do-update-cursor))))
-
-  (define/public (do-update-cursor)
-    (when (not update-cursor-timer)
-      (set! update-cursor-timer (new update-cursor-timer% [admin this]))))
-
-  (def/override (popup-menu [popup-menu% m] [real? x] [real? y])
-    (and canvas
-         (let ([e (send canvas get-editor)])
-           (and e
-                (let ([m (send canvas popup-for-editor e m)])
-                  (let-boxes ([dx 0.0]
-                              [dy 0.0])
-                      (send canvas get-dc-and-offset dx dy)
-                    (send canvas popup-menu m (->long (- x dx)) (->long (- y dy)))))))))
-  
-  (define/public (adjust-std-flag)
-    ;; 1 indicates that this is the sole, main admin. 
-    ;; this info is used for quick (xor) caret refreshing
-    ;; by an editor buffer
-    (set-s-standard (if (or nextadmin 
-                            prevadmin 
-                            (and canvas (send canvas get-focusforcedon?)))
-                        -1
-                        1)))
-
-  (def/override (modified [bool? modified?]) (void)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-data.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-data.rkt
deleted file mode 100644
index 1d07db510c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-data.rkt
+++ /dev/null
@@ -1,170 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/file file/convertible
-         "../syntax.rkt"
-         "private.rkt"
-         racket/snip/private/snip-flags
-         racket/snip/private/private
-         racket/snip/private/style
-         racket/snip/private/load-one
-         (only-in "cycle.rkt"
-                  editor-stream-in% editor-stream-out%
-                  get-editor-data-class set-get-editor-data-class!)
-         "../wx/common/event.rkt"
-         racket/draw)
-
-(provide get-the-editor-data-class-list
-         editor-data%
-         editor-data-class%
-         location-editor-data%
-         editor-data-class-list<%>
-         the-editor-data-class-list ;; parameter
-         make-the-editor-data-class-list
-         (struct-out editor-data-class-link))
-
-;; ------------------------------------------------------------
-
-(defclass editor-data% object%
-  (properties [[(make-or-false editor-data-class%) dataclass] #f]
-              [[(make-or-false editor-data%) next] #f])
-  (super-new)
-  (def/public (write [editor-stream-out% f])
-    (error 'write "should have overridden"))
-
-  (define/public (get-s-dataclass) dataclass)
-  (define/public (get-s-next) next)
-  (define/public (set-s-next v) (set! next v)))
-
-
-(defclass location-editor-data% editor-data%
-  (inherit set-dataclass)
-  (init-field x y)
-  (super-new)
-  (set-dataclass the-location-editor-data-class)
-
-  (define/public (get-x) x)
-  (define/public (get-y) y)
-
-  (def/override (write [editor-stream-out% f])
-    (send f put x)
-    (send f put y)
-    #t))
-
-;; ------------------------------------------------------------
-
-(defclass editor-data-class% object%
-  (define classname "wxbad")  
-  (def/public (set-classname [string? s])
-    (set! classname (string->immutable-string s)))
-  (def/public (get-classname) classname)
-
-  (properties [[bool? required?] #f])
-  (define/public (get-s-required?) required?)
-
-  (def/public (read [editor-stream-in% f]) (void))
-
-  (super-new))
-
-(defclass location-editor-data-class% editor-data-class%
-  (inherit set-classname
-           set-required?)
-
-  (super-new)
-
-  (set-classname "wxloc")
-  (set-required? #t)
-
-  (def/override (read [editor-stream-in% f])
-    (let ([x (send f get-inexact)]
-          [y (send f get-inexact)])
-      (new location-editor-data% [x x][y y]))))
-
-(define the-location-editor-data-class
-  (new location-editor-data-class%))
-
-;; ------------------------------------------------------------
-
-(define-struct editor-data-class-link ([c #:mutable] [name #:mutable] map-position))
-
-(defclass editor-data-class-list% object%
-  (define ht (make-hash))
-  (define pos-ht (make-hash))
-  (define rev-pos-ht (make-hash))
-
-  (super-new)
-
-  (add the-location-editor-data-class)
-
-  (def/public (find [string? name])
-    (let ([c (hash-ref ht name #f)])
-      (or c
-          (let ([c (get-editor-data-class name)])
-            (when c (add c))
-            c))))
-  
-  (def/public (find-position [editor-data-class% c])
-    (hash-ref pos-ht c 0))
-  
-  (def/public (add [editor-data-class% c])
-    (let ([name (send c get-classname)])
-      (hash-set! ht name c)
-      (let ([n (add1 (hash-count pos-ht))])
-        (hash-set! pos-ht c n)
-        (hash-set! rev-pos-ht n c))))
-
-  (def/public (number) (hash-count ht))
-
-  (def/public (nth [exact-nonnegative-integer? n]) (hash-ref rev-pos-ht n #f))
-
-  (def/public (write [editor-stream-out% f])
-    (let ([n (number)])
-      (send f put n)
-      (for ([i (in-range 1 (add1 n))])
-        (let ([c (nth i)])
-          (send f put (string->bytes/utf-8 (send c get-classname)))
-
-          (send f add-dl (make-editor-data-class-link c
-                                                      #f
-                                                      i)))))
-    #t)
-
-  (def/public (read [editor-stream-in% f])
-    (let-boxes ([count 0])
-        (send f get count)
-      (for/and ([i (in-range count)])
-        (let ([s (send f get-bytes)])
-          (and (send f ok?)
-               (send f add-dl (make-editor-data-class-link
-                               #f
-                               (bytes->string/utf-8 s #\?)
-                               (add1 i)))
-               #t)))))
-
-  (define/public (find-by-map-position f n)
-    (ormap (lambda (s)
-             (and (= n (editor-data-class-link-map-position s))
-                  (begin
-                    (when (editor-data-class-link-name s)
-                      (let ([c (find (editor-data-class-link-name s))])
-                        (when (not c)
-                          ;; unknown class/version
-                          (log-error (format "unknown editor data class: ~e" 
-                                             (editor-data-class-link-name s))))
-                        (set-editor-data-class-link-name! s #f)
-                        (set-editor-data-class-link-c! s c)))
-                    (editor-data-class-link-c s))))
-           (send f get-dl))))
-
-(define editor-data-class-list<%> (class->interface editor-data-class-list%))
-
-(define (make-the-editor-data-class-list)
-  (new editor-data-class-list%))
-
-(define the-editor-data-class-list (make-parameter (make-the-editor-data-class-list)))
-(define (get-the-editor-data-class-list)
-  (the-editor-data-class-list))
-
-(set-get-editor-data-class!
- (lambda (name)
-   (load-one name 'editor-data-class editor-data-class%)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-snip-class.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-snip-class.rkt
deleted file mode 100644
index 45ca3b4964..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-snip-class.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/file file/convertible
-         "../syntax.rkt"
-         racket/snip/private/snip-flags
-         "private.rkt"
-         racket/snip/private/private
-         racket/snip/private/snip
-         (only-in "cycle.rkt"
-                  editor-stream-in% editor-stream-out%
-                  extended-text% extended-pasteboard% extended-editor-snip% 
-                  get-editor-data-class)
-         "../wx/common/event.rkt"
-         racket/draw)
-
-(provide the-editor-snip-class)
-;; ------------------------------------------------------------
-
-(defclass editor-snip-class% snip-class%
-  (inherit set-classname
-           set-version)
-  (inherit-field s-required?)
-
-  (super-new)
-  
-  (set-classname "wxmedia")
-  (set-version 4)
-  (set! s-required? #t)
-
-  (def/override (read [editor-stream-in% f])
-    (let ([vers (send f do-reading-version this)])
-      (let ([ed% (case (send f get-exact)
-                   [(1) extended-text%]
-                   [(2) extended-pasteboard%]
-                   [else #f])]
-            [border? (positive? (send f get-exact))]
-            [lm (max 0 (send f get-exact))]
-            [tm (max 0 (send f get-exact))]
-            [rm (max 0 (send f get-exact))]
-            [bm (max 0 (send f get-exact))]
-            [li (max 0 (send f get-exact))]
-            [ti (max 0 (send f get-exact))]
-            [ri (max 0 (send f get-exact))]
-            [bi (max 0 (send f get-exact))]
-            [min-w (send f get-inexact)]
-            [max-w (send f get-inexact)]
-            [min-h (send f get-inexact)]
-            [max-h (send f get-inexact)]
-            [tf? (and (vers . > . 1)
-                      (positive? (send f get-exact)))]
-            [atl? (and (vers . > . 2)
-                       (positive? (send f get-exact)))]
-            [ubs? (and (vers . > . 3)
-                       (positive? (send f get-exact)))])
-        (let ([e (and ed% (new ed%))])
-          (let ([snip (make-object extended-editor-snip%
-                                   e
-                                   border?
-                                   lm tm rm bm li ti ri bi
-                                   (if (negative? min-w) 'none min-w)
-                                   (if (negative? max-w) 'none max-w)
-                                   (if (negative? min-h) 'none min-h)
-                                   (if (negative? max-h) 'none max-h))])
-            (send snip do-set-graphics tf? atl? ubs?)
-            (if e
-                (begin
-                  (send e get-style-list)
-                  (send e read-from-file f #t))
-                (send snip set-editor #f))
-            snip))))))
-
-(define the-editor-snip-class (new editor-snip-class%))
-
-(send (get-the-snip-class-list) add the-editor-snip-class)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-snip.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-snip.rkt
deleted file mode 100644
index d29442be9c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor-snip.rkt
+++ /dev/null
@@ -1,731 +0,0 @@
-#lang racket/base
-(require racket/class
-         "../syntax.rkt"
-         "private.rkt"
-         racket/snip/private/private
-         "const.rkt"
-         racket/snip/private/snip
-         racket/snip/private/snip-admin
-         racket/snip/private/snip-flags
-         "standard-snip-admin.rkt"
-         "editor.rkt"
-         "editor-admin.rkt"
-         "editor-snip-class.rkt"
-         "text.rkt"
-         "pasteboard.rkt"
-         "wx.rkt"
-         (except-in "cycle.rkt"
-                    text%
-                    pasteboard%
-                    editor-snip%
-                    editor-snip-editor-admin%))
-
-(provide editor-snip%
-         editor-snip-editor-admin<%>)
-
-;; FIXME: use "type"s
-(define-syntax-rule (private-inits [[type id] val] ...)
-  (begin
-    (define-init id val)
-    ...))
-(define-syntax-rule (define-init id v)
-  (begin
-    (init [(init-tmp id) v])
-    (define id init-tmp)))
-
-;; see also "private.rkt"
-(define-local-member-name
-  with-dc
-  do-get-left-margin do-get-right-margin do-get-bottom-margin do-get-top-margin
-  do-get-extent)
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defclass editor-snip% snip%
-  (private-inits
-   [[(make-or-false editor<%>) editor] #f]
-   [[bool? with-border?] #t]
-   [[exact-nonnegative-integer? left-margin] 5]
-   [[exact-nonnegative-integer? top-margin] 5]
-   [[exact-nonnegative-integer? right-margin] 5]
-   [[exact-nonnegative-integer? bottom-margin] 5]
-   [[exact-nonnegative-integer? left-inset] 1]
-   [[exact-nonnegative-integer? top-inset] 1]
-   [[exact-nonnegative-integer? right-inset] 1]
-   [[exact-nonnegative-integer? bottom-inset] 1]
-   [[(make-alts (symbol-in none) nonnegative-real?) min-width] 'none]
-   [[(make-alts (symbol-in none) nonnegative-real?) max-width] 'none]
-   [[(make-alts (symbol-in none) nonnegative-real?) min-height] 'none]
-   [[(make-alts (symbol-in none) nonnegative-real?) max-height] 'none])
-
-  (unless (symbol? min-width) (set! min-width (exact->inexact min-width)))
-  (unless (symbol? max-width) (set! max-width (exact->inexact max-width)))
-  (unless (symbol? min-height) (set! min-height (exact->inexact min-height)))
-  (unless (symbol? max-height) (set! max-height (exact->inexact max-height)))
-
-  (define align-top-line? #f)
-  (define tight-fit? #f)
-  (define use-style-bg? #f)
-
-  (super-new)
-
-  (inherit set-snipclass
-           do-copy-to)
-  (inherit-field s-admin
-                 s-flags
-                 s-style)
-
-  (set-snipclass the-editor-snip-class)
-
-  (when (and editor (send editor get-admin))
-    (set! editor #f))
-  (unless editor
-    (set! editor (new extended-text%)))
-
-  (define my-admin (new editor-snip-editor-admin% [owner this]))
-
-  (set! s-flags (add-flag s-flags HANDLES-EVENTS))
-  (when (no-permanent-filename? editor)
-    (set! s-flags (add-flag s-flags USES-BUFFER-PATH)))
-
-  (send editor own-caret #f)
-
-  ;; ----------------------------------------
-
-  (define/private (no-permanent-filename? editor)
-    (let ([temp (box #f)])
-      (let ([fn (send editor get-filename temp)])
-        (or (not fn) (unbox temp)))))
-
-  (def/override (set-admin [(make-or-false snip-admin%) a])
-
-    (when (not (eq? a s-admin))
-      (super set-admin a)
-      (when editor
-        (if a
-            (begin
-              (when (send editor get-admin)
-                ;; traitor! - get rid of it
-                (set! editor #f))
-              (send editor set-admin my-admin))
-            (send editor set-admin #f))))
-
-    (when (and s-admin
-               (has-flag? s-flags USES-BUFFER-PATH))
-      ;; propagate a filename change:
-      (if (and editor
-               (no-permanent-filename? editor))
-          (let ([b (send s-admin get-editor)])
-            (when b
-              (let ([fn (send b get-filename)])
-                (when fn
-                  (send editor set-filename fn #t)))))
-          (set! s-flags (remove-flag s-flags USES-BUFFER-PATH)))) ;; turn off the flag; not needed
-  
-    (void))
-  
-  (def/public (set-editor [editor<%> b])
-    (unless (eq? editor b)
-      (when (and editor s-admin)
-        (send editor set-admin #f))
-      (set! editor b)
-      (when b
-        (cond
-         [(send b get-admin)
-          (set! editor #f)]
-         [s-admin
-          (send editor set-admin my-admin)]))
-      (when s-admin
-        (send s-admin resized this #t))))
-
-  (def/public (get-editor)
-    editor)
-
-  (def/override (adjust-cursor [dc<%> dc] [real? x] [real? y] [real? ex] [real? ey] [mouse-event% event])
-    (if (not editor)
-        #f
-        (send my-admin
-              with-dc
-              dc x y
-              (lambda ()
-                (send editor adjust-cursor event)))))
-
-  (def/override (on-event [dc<%> dc] [real? x] [real? y] [real? ex] [real? ey] [mouse-event% event])
-    (when editor
-      (send my-admin
-            with-dc
-            dc x y
-            (lambda ()
-              (send editor on-event event)))))
-  
-  (def/override (on-char [dc<%> dc] [real? x] [real? y] [real? ex] [real? ey] [key-event% event])
-    (when editor
-      (send my-admin
-            with-dc
-            dc x y
-            (lambda ()
-              (send editor on-char event)))))
-
-  (def/override (own-caret [bool? own?])
-    (when editor
-      (send editor own-caret own?)))
-
-  (def/override (blink-caret [dc<%> dc] [real? x] [real? y])
-    (when editor
-      (send my-admin
-            with-dc
-            dc x y
-            (lambda ()
-              (send editor blink-caret)))))
-
-  (def/override (do-edit-operation [symbol? op] [any? [recur? #t]] [exact-integer? [timestamp 0]])
-    (when editor
-      (send editor do-edit-operation op recur? timestamp)))
-
-  (def/override (can-do-edit-operation? [symbol? op] [any? [recur? #t]])
-    (and editor
-         (send editor can-do-edit-operation? op recur?)))
-
-  (def/override (match? [snip% s])
-    #f)
-
-  (def/override (size-cache-invalid)
-    (when editor
-      (send editor size-cache-invalid)))
-
-  (def/override (get-text [exact-nonnegative-integer? offset] [exact-integer? num] 
-                          [any? [flattened? #f]])
-    (cond
-     [(or (offset . >= . 1)
-          (zero? num))
-      ""]
-     [(not flattened?)
-      "."]
-     [editor
-      (send editor get-flattened-text)]
-     [else ""]))
-
-  (define/public (do-get-extent dc x y w h -descent -space lspace rspace)
-    (send my-admin
-          with-dc
-          dc x y
-          (lambda ()
-            (let ([h2 (or h (box 0.0))])
-              (if editor
-                  (send editor get-extent w h2)
-                  (begin
-                    (when w (set-box! w 0.0))
-                    (set-box! h2 0.0)))
-              (let ([orig-h (if align-top-line?
-                                (unbox h2)
-                                0.0)])
-                
-                (when w
-                  (when (editor . is-a? . text%)
-                    (set-box!
-                     w
-                     (- (unbox w)
-                        (if tight-fit?
-                            CURSOR-WIDTH
-                            1)))) ;; it still looks better to subtract 1
-                  (when ((unbox w) . < . (if (symbol? min-width) -inf.0 min-width))
-                    (set-box! w min-width))
-                  (when ((unbox w) . > . (if (symbol? max-width) +inf.0 max-width))
-                    (set-box! w max-width))
-                  (set-box! w (+ (unbox w) (+ right-margin left-margin))))
-
-                (when h
-                  (when (editor . is-a? . text%)
-                    (when tight-fit?
-                      (set-box! h
-                                (max 0.0
-                                     (- (unbox h)
-                                        (send editor get-line-spacing))))))
-                  (when ((unbox h) . < . (if (symbol? min-height) -inf.0 min-height))
-                    (set-box! h min-height))
-                  (when ((unbox h) . > . (if (symbol? max-height) +inf.0 max-height))
-                    (set-box! h max-height))
-                  (set-box! h (+ (unbox h) (+ top-margin bottom-margin))))
-
-                (let* ([descent (+ (if editor
-                                       (send editor get-descent)
-                                       0.0)
-                                   bottom-margin)]
-                       [descent
-                        (if (editor . is-a? . text%)
-                            (let ([descent (if align-top-line?
-                                               (- orig-h
-                                                  (+ (send editor get-top-line-base)
-                                                     bottom-margin))
-                                               descent)])
-                              (if tight-fit?
-                                  (max (- descent (send editor get-line-spacing)) 0.0)
-                                  descent))
-                            descent)]
-                       [space (+ (if editor 
-                                     (send editor get-space)
-                                     0.0)
-                                 top-margin)])
-                  (let-values ([(space descent)
-                                (if (and (not (symbol? max-height))
-                                         ((+ descent space) . >= . (+ max-height top-margin bottom-margin)))
-                                    ;; just give up on spaces in this case:
-                                    (values top-margin bottom-margin)
-                                    (values space descent))])
-                    (when -descent (set-box! -descent descent))
-                    (when -space (set-box! -space space))))
-
-                (when lspace (set-box! lspace left-margin))
-                (when rspace (set-box! rspace right-margin)))))))
-
-  (def/override (get-extent [dc<%> dc] [real? x] [real? y] 
-                            [maybe-box? [w #f]] [maybe-box? [h #f]]
-                            [maybe-box? [-descent #f]] [maybe-box? [-space #f]]
-                            [maybe-box? [lspace #f]] [maybe-box? [rspace #f]])
-    (do-get-extent dc x y w h -descent -space lspace rspace))
-
-  (def/override (draw [dc<%> dc] [real? x] [real? y] 
-                      [real? left] [real? top] [real? right] [real? bottom] 
-                      [real? dx] [real? dy] [caret-status? caret])
-    (send my-admin
-          with-dc
-          dc x y
-          (lambda ()
-            (let-boxes ([w 0.0]
-                        [h 0.0])
-                (when editor
-                  (send editor get-extent w h)
-                  (when (editor . is-a? . text%)
-                    (set-box! w (max 0.0
-                                     (- (unbox w) 
-                                        (if tight-fit?
-                                            CURSOR-WIDTH
-                                            1)))) ;; it still looks better to subtract 1
-                    (when tight-fit?
-                      (set-box! h (max 0.0
-                                       (- (unbox h)
-                                          (send editor get-line-spacing)))))))
-              (let* ([w (min (max w (if (symbol? min-width) -inf.0 min-width))
-                             (if (symbol? max-width) +inf.0 max-width))]
-                     [h (min (max h (if (symbol? min-height) -inf.0 min-height))
-                             (if (symbol? max-height) +inf.0 max-height))]
-                     [orig-x x]
-                     [orig-y y]
-                     [x (+ x left-margin)]
-                     [y (+ y top-margin)]
-                     [r (+ x w)]
-                     [b (+ y h)]
-                     [l (max x left)]
-                     [t (max y top)]
-                     [r (min r right)]
-                     [b (min b bottom)])
-
-                (let ([bg-color
-                       (cond
-                        [(pair? caret) #f]
-                        [(not use-style-bg?)
-                         (make-object color% 255 255 255)]
-                        [(send s-style get-transparent-text-backing)
-                         #f]
-                        [else
-                         (let ([bg-color (send s-style get-background)])
-                           (let ([l (+ orig-x left-inset)]
-                                 [t (+ orig-y top-inset)]
-                                 [r (+ l w left-margin right-margin 
-                                       (- (+ left-inset right-inset))
-                                       -1)]
-                                 [b (+ t h top-margin bottom-margin 
-                                       (- (+ top-inset bottom-inset))
-                                       -1)])
-                             (let ([trans-pen (send the-pen-list
-                                                    find-or-create-pen
-                                                    bg-color 0 'transparent)]
-                                   [fill (send the-brush-list
-                                               find-or-create-brush
-                                               bg-color 'solid)]
-                                   [savep (send dc get-pen)]
-                                   [saveb (send dc get-brush)])
-                               (send dc set-pen trans-pen)
-                               (send dc set-brush fill)
-
-                               (send dc draw-rectangle l t (- r l) (- b t))
-
-                               (send dc set-brush saveb)
-                               (send dc set-pen savep)))
-                           bg-color)])])
-
-                  (when editor
-                    (send editor refresh
-                          (- l x) (- t y) (max 0.0 (- r l)) (max 0.0 (- b t))
-                          caret bg-color))
-
-                  (when with-border?
-                    (let ([pen (send dc get-pen)])
-                      (when (and (pair? caret)
-                                 (send s-admin get-selected-text-color))
-                        (send dc set-pen (send s-admin get-selected-text-color) 1 'solid))
-                      (let* ([l (+ orig-x left-inset)]
-                             [t (+ orig-y top-inset)]
-                             [r (+ l w left-margin right-margin 
-                                   (- (+ left-inset right-inset))
-                                   -1)]
-                             [b (+ t h top-margin bottom-margin 
-                                   (- (+ top-inset bottom-inset))
-                                   -1)])
-                        (let ([ml (max (min l right) left)]
-                              [mr (max (min r right) left)]
-                              [mt (max (min t bottom) top)]
-                              [mb (max (min b bottom) top)])
-                          (when (and (l . >= . left)
-                                     (l . < . right)
-                                     (mt . < . mb))
-                            (send dc draw-line l mt l mb))
-                          (when (and (r . >= . left)
-                                     (r . < . right)
-                                     (mt . < . mb))
-                            (send dc draw-line r mt r mb))
-                          (when (and (t . >= . top)
-                                     (t . < . bottom)
-                                     (ml . < . mr))
-                            (send dc draw-line ml t mr t))
-                          (when (and (b . >= . top)
-                                     (b . < . bottom)
-                                     (ml . < . mr))
-                            (send dc draw-line ml b mr b))))
-                      (when (pair? caret)
-                        (send dc set-pen pen))))))))))
-
-  (def/override (copy)
-    (let* ([mb (and editor
-                    (send editor copy-self))]
-           [ms (make-object extended-editor-snip%
-                            mb
-                            with-border?
-                            left-margin top-margin
-                            right-margin bottom-margin
-                            left-inset top-inset
-                            right-inset bottom-inset
-                            min-width max-width
-                            min-height max-height)])
-      (do-copy-to ms)
-
-      (send ms do-set-graphics tight-fit? align-top-line? use-style-bg?)
-      (when (not editor)
-        (send ms set-editor #f))
-      ms))
-
-  (define/public (do-set-graphics tf? atl? usb?)
-    (set! tight-fit? tf?)
-    (set! align-top-line? atl?)
-    (set! use-style-bg? usb?))
-
-  (def/override (write [editor-stream-out% f])
-    (send f put (if editor
-                    (if (editor . is-a? . pasteboard%) 2 1)
-                    0))
-    (send f put (if with-border? 1 0))
-    (send f put left-margin)
-    (send f put top-margin)
-    (send f put right-margin)
-    (send f put bottom-margin)
-    (send f put left-inset)
-    (send f put top-inset)
-    (send f put right-inset)
-    (send f put bottom-inset)
-    (send f put (if (symbol? min-width) -1.0 min-width))
-    (send f put (if (symbol? max-width) -1.0 max-width))
-    (send f put (if (symbol? min-height) -1.0 min-height))
-    (send f put (if (symbol? max-height) -1.0 max-height))
-    (send f put (if tight-fit? 1 0))
-    (send f put (if align-top-line? 1 0))
-    (send f put (if use-style-bg? 1 0))
-    (when editor
-      (send editor write-to-file f)))
-
-  (define/private (resize-me)
-    (when s-admin (send s-admin resized this #t)))
-
-  (def/public (set-max-width [(make-alts (symbol-in none) nonnegative-real?) w])
-    (set! max-width w)
-    (resize-me))
-
-  (def/public (set-min-width [(make-alts (symbol-in none) nonnegative-real?) w])
-    (set! min-width w)
-    (resize-me))
-
-  (def/public (set-max-height [(make-alts (symbol-in none) nonnegative-real?) h])
-    (set! max-height h)
-    (resize-me))
-
-  (def/public (set-min-height [(make-alts (symbol-in none) nonnegative-real?) h])
-    (set! min-height h)
-    (resize-me))
-
-  (def/public (get-max-width) max-width)
-  (def/public (get-min-width) min-width)
-  (def/public (get-max-height) max-height)
-  (def/public (get-min-height) min-height)
-
-  (def/public (get-tight-text-fit)
-    tight-fit?)
-  (def/public (set-tight-text-fit [bool? t])
-    (set! tight-fit? t)
-    (resize-me))
-
-  (def/public (get-align-top-line)
-    align-top-line?)
-  (def/public (set-align-top-line [bool? t])
-    (set! align-top-line? t)
-    (resize-me))
-
-  (def/public (style-background-used?)
-    use-style-bg?)
-  (def/public (use-style-background [bool? u])
-    (unless (eq? use-style-bg? u)
-      (set! use-style-bg? u)
-      (request-refresh)))
-
-  (def/override (resize [real? w] [real? h])
-    (let ([w (max 0.0 (- w (+ left-margin right-margin)))]
-          [h (max 0.0 (- h (+ top-margin bottom-margin)))])
-      (set! min-width w)
-      (set! max-width w)
-      (set! min-height h)
-      (set! max-height h)
-
-      (when editor
-        (send editor set-max-width w)
-        (send editor set-min-width w))
-
-      (resize-me)
-      #t))
-
-  (define/private (request-refresh)
-    (when s-admin
-      (let ([dc (send s-admin get-dc)])
-        (when dc
-          (let-boxes ([w 0.0]
-                      [h 0.0])
-              (get-extent dc 0 0 w h)
-            (send s-admin needs-update
-                  this left-inset top-inset
-                  (+ w (- right-margin right-inset))
-                  (+ h (- bottom-margin bottom-inset))))))))
-
-  (def/public (show-border [bool? show])
-    (unless (eq? with-border? show)
-      (set! with-border? show)
-      (request-refresh)))
-  (def/public (border-visible?)
-    with-border?)
-
-  (def/public (set-margin [exact-nonnegative-integer? lm]
-                          [exact-nonnegative-integer? tm]
-                          [exact-nonnegative-integer? rm]
-                          [exact-nonnegative-integer? bm])
-    (set! left-margin lm)
-    (set! top-margin tm)
-    (set! right-margin rm)
-    (set! bottom-margin bm)
-    (resize-me))
-
-  (def/public (get-margin [box? lm] [box? tm] [box? rm] [box? bm])
-    (set-box! lm left-margin)
-    (set-box! tm top-margin)
-    (set-box! rm right-margin)
-    (set-box! bm bottom-margin))
-
-  (def/public (set-inset [exact-nonnegative-integer? lm]
-                         [exact-nonnegative-integer? tm]
-                         [exact-nonnegative-integer? rm]
-                         [exact-nonnegative-integer? bm])
-    (set! left-margin lm)
-    (set! top-margin tm)
-    (set! right-margin rm)
-    (set! bottom-margin bm)
-    (request-refresh))
-
-  (def/public (get-inset [box? lm] [box? tm] [box? rm] [box? bm])
-    (set-box! lm left-inset)
-    (set-box! tm top-inset)
-    (set-box! rm right-inset)
-    (set-box! bm bottom-inset))
-
-  (def/override (get-num-scroll-steps)
-    (if editor
-        (if (send editor locked-for-read?)
-            1
-            (send editor num-scroll-lines))
-        1))
-
-  (def/override (find-scroll-step [real? y])
-    (if editor
-        (if (send editor locked-for-read?)
-            0
-            (send editor find-scroll-line (- y top-margin)))
-        0))
-
-  (def/override (get-scroll-step-offset [exact-integer? n])
-    (if editor
-        (if (send editor locked-for-read?)
-            0
-            (+ (send editor scroll-line-location n) top-margin))
-        0))
-
-  (def/override (set-unmodified)
-    (when editor
-      (send editor set-modified #f)))
-
-  (def/public (do-get-left-margin) left-margin)
-  (def/public (do-get-right-margin) right-margin)
-  (def/public (do-get-bottom-margin) bottom-margin)
-  (def/public (do-get-top-margin) top-margin))
-
-(set-editor-snip%! editor-snip%)
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-struct state (dc x y))
-
-(defclass editor-snip-editor-admin% editor-admin%
-  (init owner)
-  (define snip owner)
-  (define state #f)
-
-  (super-new)
-
-  (define/public (get-snip) snip)
-
-  (define/public (with-dc dc x y thunk)
-    (let* ([other (make-state dc 
-                              (+ x (send snip do-get-left-margin))
-                              (+ y (send snip do-get-top-margin)))]
-           [swap (lambda ()
-                   (let ([s state])
-                     (set! state other)
-                     (set! other s)))])
-      (dynamic-wind swap thunk swap)))
-  
-  (def/override (get-dc [maybe-box? [x #f]] [maybe-box? [y #f]])
-    (let-values ([(xv yv)
-                  (if state
-                      (values (- (state-x state))
-                              (- (state-y state)))
-                      (values 0 0))])
-      (when x (set-box! x xv))
-      (when y (set-box! y yv))
-      (if state
-          (state-dc state)
-          (let ([sadmin (send snip get-admin)])
-            (if sadmin
-                (send sadmin get-dc)
-                #f)))))
-
-  (def/override (get-view [maybe-box? x] [maybe-box? y]
-                          [maybe-box? w] [maybe-box? h]
-                          [any? [full? #f]])
-    (let ([sadmin (send snip get-admin)])
-      (cond
-       [(not sadmin)
-        (when x (set-box! x 0.0))
-        (when y (set-box! y 0.0))
-        (when w (set-box! w 0.0))
-        (when h (set-box! h 0.0))]
-       [full?
-        (send sadmin get-view x y w h #f)]
-       [else
-        (let-boxes ([sx 0.0]
-                    [sy 0.0]
-                    [sw 0.0]
-                    [sh 0.0])
-            (send sadmin get-view sx sy sw sh snip)
-          (when x
-            (set-box! x (max 0.0 (- sx (send snip do-get-left-margin)))))
-          (when y
-            (set-box! y (max 0.0 (- sy (send snip do-get-top-margin)))))
-          (when (or w h)
-            (if (or (positive? sw) (positive? sh))
-                ;; w and h might be too big due to margins - but
-                ;; they might be small enough already because 
-                ;; part of the snip itself is not viewed
-                (let-boxes ([rw 0.0]
-                            [rh 0.0])
-                    ;; we want the internal, non-overridden method:
-                    (send snip do-get-extent (and state (state-dc state)) 0 0 rw rh #f #f #f #f)
-                  
-                  ;; remember: sx and sy are in snip coordinates
-
-                  (when w
-                    (let* ([left-margin (max 0.0 (- (send snip do-get-left-margin) sx))]
-                           [sw (- sw left-margin)]
-                           [rw (- rw (send snip do-get-left-margin))]
-                           [right-margin (max 0.0 (- (send snip do-get-right-margin) (- rw sw)))]
-                           [sw (max 0.0 (- sw right-margin))])
-                      (set-box! w sw)))
-
-                  (when h
-                    (let* ([top-margin (max 0.0 (- (send snip do-get-top-margin) sy))]
-                           [sh (- sh top-margin)]
-                           [rh (- rh (send snip do-get-top-margin))]
-                           [bottom-margin (max 0.0 (- (send snip do-get-bottom-margin) (- rh sh)))]
-                           [sh (max 0.0 (- sh bottom-margin))])
-                      (set-box! h sh))))
-                
-                (begin
-                  (when w (set-box! w 0.0))
-                  (when h (set-box! h 0.0))))))])))
-  
-  (def/override (scroll-to [real? localx] [real? localy] [real? w] [real? h] [any? [refresh? #t]] 
-                           [(symbol-in start none end) [bias 'none]])
-    (let ([sadmin (send snip get-admin)])
-      (and sadmin
-           (send sadmin scroll-to snip (+ localx (send snip do-get-left-margin))
-                 (+ localy (send snip do-get-top-margin))
-                 w h refresh? bias))))
-  
-  (def/override (grab-caret [(symbol-in immediate display global) dist])
-    (let ([sadmin (send snip get-admin)])
-      (when sadmin
-        (send sadmin set-caret-owner snip dist))))
-
-  (def/override (resized [any? redraw-now])
-    (let ([sadmin (send snip get-admin)])
-      (when sadmin
-        (send sadmin resized snip redraw-now))))
-
-  (def/override (needs-update [real? localx] [real? localy]
-                              [nonnegative-real? w] [nonnegative-real? h])
-    (let ([sadmin (send snip get-admin)])
-      (when sadmin
-        (send sadmin needs-update snip
-              (+ localx (send snip do-get-left-margin))
-              (+ localy (send snip do-get-top-margin))
-              w h))))
-
-  (def/override (update-cursor)
-    (let ([sadmin (send snip get-admin)])
-      (when sadmin
-        (send sadmin update-cursor))))
-
-  (def/override (popup-menu [popup-menu% m] [real? x] [real? y])
-    (let ([sadmin (send snip get-admin)])
-      (and sadmin
-           (send sadmin popup-menu m snip
-                 (+ x (send snip do-get-left-margin))
-                 (+ y (send snip do-get-top-margin))))))
-  
-  (def/override (refresh-delayed?)
-    (let ([sadmin (send snip get-admin)])
-      (or (not sadmin)
-          (and (sadmin . is-a? . standard-snip-admin%)
-               (send (send sadmin get-editor) refresh-delayed?)))))
-
-  (def/override (modified [any? mod?])
-    (let ([sadmin (send snip get-admin)])
-      (when sadmin
-        (send sadmin modified snip mod?)))))
-
-(set-editor-snip-editor-admin%! editor-snip-editor-admin%)
-
-(define editor-snip-editor-admin<%> (class->interface editor-snip-editor-admin%))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor.rkt
deleted file mode 100644
index 8ecc38d35c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/editor.rkt
+++ /dev/null
@@ -1,1880 +0,0 @@
-#lang racket/base
-(require racket/class
-         (for-syntax racket/base)
-         racket/file
-         racket/port
-         "../syntax.rkt"
-         "private.rkt"
-         racket/snip/private/snip
-         racket/snip/private/private
-         racket/snip/private/style
-         racket/snip/private/snip-flags
-         racket/snip/private/prefs
-         "editor-admin.rkt"
-         "stream.rkt"
-         "undo.rkt"
-         "keymap.rkt"
-         "editor-data.rkt"
-         (only-in "cycle.rkt"
-                  printer-dc%
-                  text%
-                  pasteboard%
-                  editor-snip%
-                  editor-snip-editor-admin%
-                  editor-get-file
-                  editor-put-file)
-         "wx.rkt")
-
-(provide editor%
-         editor<%>
-         add-editor-keymap-functions
-         ALLOW-X-STYLE-SELECTION?
-         copy-style-list
-         set-common-copy-region-data!
-         cons-common-copy-buffer!
-         cons-common-copy-buffer2!
-         editor-set-x-selection-mode
-         editor-x-selection-allowed
-         editor-x-selection-mode?
-         editor-x-selection-owner
-         detect-wxme-file
-         read-editor-version
-         read-editor-global-header
-         read-editor-global-footer
-         write-editor-version
-         write-editor-global-header
-         write-editor-global-footer
-         write-snips-to-file
-         get-default-print-size)
-
-;; ----------------------------------------
-
-(define RIDICULOUS-SIZE 2000)
-(define ALLOW-X-STYLE-SELECTION? (eq? 'unix (system-type)))
-
-(defclass offscreen% object%
-  (define bitmap #f)
-  (define dc (make-object bitmap-dc%))
-  (define bm-width 0)
-  (define bm-height 0)
-  (define in-use? #f)
-  (define last-used #f)
-
-  (define/public (is-in-use?) in-use?)
-  (define/public (set-in-use v) (set! in-use? (and v #t)))
-  (define/public (get-bitmap) bitmap)
-  (define/public (get-dc) dc)
-  (define/public (get-last-used) last-used)
-  (define/public (set-last-used v) (set! last-used v))
-
-  (define/public (ready-offscreen width height)
-    (if (or #t ; disable on all  platforms
-            (width . > . RIDICULOUS-SIZE)
-            (height . > . RIDICULOUS-SIZE)
-            (eq? (system-type) 'macosx))
-        #f
-        (if (and (not in-use?)
-                 (or (height . > . bm-height)
-                     (width . > . bm-width)))
-            (let ([oldbm bitmap])
-              (set! bm-height (max (add1 (->long height)) bm-height))
-              (set! bm-width (max (add1 (->long width)) bm-width))
-              (set! bitmap (make-object bitmap% bm-width bm-height))
-              (send dc set-bitmap #f)
-              (when (send bitmap ok?)
-                (send dc set-bitmap bitmap))
-              #t)
-            #f)))
-
-  (super-new))
-
-(define the-offscreen (new offscreen%))
-
-;; ----------------------------------------
-
-;; 8.5" x 11" paper, 0.5" margin; usually not used
-(define PAGE-WIDTH 612)
-(define PAGE-HEIGHT 792)
-
-(define (get-printer-orientation)
-  (send (current-ps-setup)  get-orientation))
-
-(define (get-default-print-size w h)
-  (set-box! w PAGE-WIDTH)
-  (set-box! h PAGE-HEIGHT)
-  (when (eq? (get-printer-orientation) 'landscape)
-    (let ([tmp (unbox h)])
-      (set-box! h (unbox w))
-      (set-box! w tmp))))
-
-;; ----------------------------------------
-
-(define default-emacs-style-undo? (and (get-preference* 'GRacket:emacs-undo) #t))
-(define (max-undo-value? v) (or (exact-nonnegative-integer? v)
-                                (eq? v 'forever)))
-
-(define global-lock (make-semaphore 1))
-
-(defclass editor% object%
-
-  (field [s-offscreen the-offscreen]
-         [s-admin #f]
-         [s-keymap (new keymap%)]
-         [s-own-caret? #f]
-         [s-temp-filename? #f]
-         [s-user-locked? #f]
-         [s-modified? #f]
-         [s-noundomode 0])
-  (def/public (is-modified?) s-modified?)
-  
-  (define undomode? #f)
-  (define redomode? #f)
-  (define interceptmode? #f)
-  (define loadoverwritesstyles? #t)
-  (define emacs-style-undo? default-emacs-style-undo?)
-
-  (field [s-custom-cursor-overrides? #f]
-         [s-need-on-display-size? #f])
-  (define paste-text-only? #f)
-
-  (define num-parts-modified 0)
-
-  (field [s-caret-snip #f]
-         [s-style-list (new style-list%)])
-  (define/public (get-focus-snip) s-caret-snip)
-  (define/public (get-s-style-list) s-style-list)
-
-  (send s-style-list new-named-style "Standard" (send s-style-list basic-style))
-  (define notify-id
-    (send s-style-list notify-on-change (lambda (which) (style-has-changed which))))
-  
-  (field [s-filename #f]) ; last loaded file
-
-  (define max-undos 0)
-
-  (define changes #())
-  (define changes-start 0)
-  (define changes-end 0)
-  (define changes-size 0)
-
-  (define redochanges #())
-  (define redochanges-start 0)
-  (define redochanges-end 0)
-  (define redochanges-size 0)
-  
-  (define savedchanges #f) ;; for emacs-style undo
-  (define intercepted null)
-
-  (field [s-custom-cursor #f]
-         [s-inactive-caret-threshold 'show-inactive-caret])
-
-  (define printing #f)
-  (define/public (get-printing) printing)
-
-  (define num-extra-headers 0)
-  (define seq-lock #f)
-
-  (super-new)
-
-  (define/public (is-printing?) (and printing #t))
-
-  ;; ----------------------------------------
-
-  (def/public (blink-caret) (void))
-
-  (def/public (size-cache-invalid) (void))
-  (def/public (locked-for-read?) #f)
-  (def/public (locked-for-write?) #f)
-  (def/public (locked-for-flow?) #f)
-
-  (def/public (resized) (void))
-  (def/public (recounted) (void))
-  (define/public (invalidate-bitmap-cache) (void))
-  (def/public (needs-update) (void))
-  (def/public (release-snip) (void))
-
-  (def/public (scroll-line-location) (void))
-  (def/public (num-scroll-lines) (void))
-  (def/public (find-scroll-line) (void))
-
-  ;; ----------------------------------------
-
-  (define/public (on-event event) (void))
-  (define/public (on-char event) (void))
-
-  (def/public (on-local-event [mouse-event% event])
-    (unless (and s-keymap
-                 (or (send s-keymap handle-mouse-event this event)
-                     (begin
-                       (when (not (send event moving?))
-                         (send s-keymap break-sequence))
-                       #f)))
-      (on-default-event event)))
-  
-  (def/public (on-local-char [key-event% event])
-    (unless (and s-keymap
-                 (or (send s-keymap handle-key-event this event)
-                     (begin
-                       (send s-keymap break-sequence)
-                       #f)))
-      (on-default-char event)))
-
-  (define/public (on-default-event event) (void))
-  (define/public (on-default-char event) (void))
-  
-  (def/public (on-focus [any? on?]) (void))
-
-  ;; ----------------------------------------
-
-  (def/public (set-admin [(make-or-false editor-admin%) administrator])
-    (setting-admin administrator)
-
-    (set! s-admin administrator)
-    (when (not s-admin)
-      (set! s-own-caret? #f))
-    (when s-admin
-      (init-new-admin)))
-
-  (def/public (setting-admin [(make-or-false editor-admin%) a]) (void))
-
-  (def/public (init-new-admin) (void))
-
-  (def/public (get-admin) s-admin)
-
-  ;; ----------------------------------------
-
-  (def/public (own-caret [any? ownit?]) (void))
-
-  (def/public (do-own-caret [any? ownit?])
-    (let ([ownint? (and ownit? #t)])
-      (let ([refresh? (and (not s-caret-snip)
-                           (not (eq? s-own-caret? ownit?)))])
-        (set! s-own-caret? ownit?)
-        (when s-caret-snip
-          (send s-caret-snip own-caret ownit?))
-        (when (and s-keymap (not ownint?) refresh?)
-          (send s-keymap break-sequence))
-
-        (when ALLOW-X-STYLE-SELECTION?
-          (cond
-           [(and ownit? (not s-caret-snip))
-            (set! editor-x-selection-allowed this)]
-           [(eq? editor-x-selection-allowed this)
-            (set! editor-x-selection-allowed #f)]))
-
-        (when s-admin
-          (send s-admin update-cursor))
-
-        refresh?)))
-
-  (def/public (get-dc)
-    ;; this can be called by snips to get a DC appropriate for
-    ;; sizing text, etc., outside of draws. it isn't the destination 
-    ;; for draws, though
-    (if s-admin
-        (send s-admin get-dc #f #f)
-        #f))
-
-  (def/public (get-view-size [(make-or-false box?) w][(make-or-false box?) h])
-    (if s-admin
-        (send s-admin get-view #f #f w h)
-        (begin
-          (when w (set-box! w 0.0))
-          (when h (set-box! h 0.0)))))
-
-  (define/public (get-snip-location snip x y)
-    (when x (set-box! x 0.0))
-    (when y (set-box! y 0.0))
-    #t)
-
-  (def/public (do-set-caret-owner [(make-or-false snip%) snip] [symbol? dist])
-    (let ([same? (eq? snip s-caret-snip)])
-      (if (and same?
-               (or (not s-admin) (eq? dist 'immediate)))
-          #f
-          (begin
-            (when same?
-              (send s-admin grab-caret dist))
-
-            (let ([vis-caret? s-own-caret?])
-              (cond
-               [(or (not snip)
-                    (not (has-flag? (snip->flags snip) HANDLES-EVENTS)))
-                
-                (let ([old-caret s-caret-snip]
-                      [refresh? #f])
-                  (set! s-caret-snip #f)
-                  (when old-caret
-                    (send old-caret own-caret #f)
-                    (when vis-caret?
-                      (set! refresh? #t)))
-                  (when ALLOW-X-STYLE-SELECTION?
-                    (set! editor-x-selection-allowed this))
-                  (when s-admin
-                    (send s-admin update-cursor))
-                  refresh?)]
-               [(not (get-snip-location snip #f #f)) #f]
-               [else
-                (let ([had-caret? (and s-own-caret?
-                                       (not s-caret-snip))]
-                      [old-caret s-caret-snip]
-                      [refresh? #f])
-
-                  (set! s-caret-snip snip)
-
-                  (begin-edit-sequence)
-                  (cond
-                   [old-caret (send old-caret own-caret #f)]
-                   [vis-caret? (set! refresh? #t)])
-                  (send snip own-caret s-own-caret?)
-                  (end-edit-sequence)
-
-                  (when (and s-admin
-                             (not (eq? dist 'immediate)))
-                    (send s-admin grab-caret dist))
-
-                  (when s-admin
-                    (send s-admin update-cursor))
-
-                  refresh?)]))))))
-
-  (define/private (convert-coords admin x y to-local?)
-    (let-values ([(lx ly)
-                  (if admin
-                      (if (admin . is-a? . editor-snip-editor-admin%)
-                          (let* ([snip (send admin get-snip)]
-                                 [sa (send snip get-admin)])
-                            (if sa
-                                (let ([mbuf (send sa get-editor)])
-                                  (if mbuf 
-                                      (let-boxes ([bx 0.0][by 0.0]
-                                                  [lx 0.0][ly 0.0]
-                                                  [l 0.0][t 0.0][r 0.0][b 0.0])
-                                          (begin
-                                            (send mbuf local-to-global bx by)
-                                            (send mbuf get-snip-location snip lx ly #f)
-                                            (send snip get-margin l t r b))
-                                        (values (+ lx bx l)
-                                                (+ ly by t)))
-                                      (values 0.0 0.0)))
-                                (values 0.0 0.0)))
-                          (let-boxes ([lx 0.0][ly 0.0])
-                              (send admin get-dc lx ly)
-                            (values (- lx) (- ly))))
-                      (values 0.0 0.0))])
-      (when x (set-box! x (+ (unbox x) (if to-local? (- lx) lx))))
-      (when y (set-box! y (+ (unbox y) (if to-local? (- ly) ly))))))
-
-  (def/public (editor-location-to-dc-location [real? x] [real? y])
-    (let-boxes ([x x] [y y])
-        (local-to-global x y)
-      (values x y)))
-
-  (def/public (dc-location-to-editor-location [real? x] [real? y])
-    (let-boxes ([x x] [y y])
-        (global-to-local x y)
-      (values x y)))
-
-  (def/public (global-to-local [maybe-box? x] [maybe-box? y])
-    (convert-coords s-admin x y #t))
-
-  (def/public (local-to-global [maybe-box? x] [maybe-box? y])
-    (convert-coords s-admin x y #f))
-
-  (def/public (set-cursor [(make-or-false cursor%) c] [any? [override? #t]])
-    (set! s-custom-cursor c)
-    (set! s-custom-cursor-overrides? override?)
-    (when s-admin
-      (send s-admin update-cursor)))
-
-  (def/public (adjust-cursor [mouse-event% event]) (void))
-
-  ;; ----------------------------------------
-
-  (def/public (set-keymap [(make-or-false keymap%) [k #f]])
-    (set! s-keymap k))
-  (def/public (get-keymap) s-keymap)
-  (def/public (get-style-list) s-style-list)
-
-  (def/public (set-style-list [style-list% new-list])
-    (send s-style-list forget-notification notify-id)
-    (set! notify-id
-          (send new-list notify-on-change (lambda (which) (style-has-changed which))))
-    (set! s-style-list new-list)
-    ;; create "Standard" if it's not there:
-    (send s-style-list new-named-style "Standard" (send s-style-list basic-style))
-    (void))
-
-  (define/public (style-has-changed which) (void))
-  
-  (def/public (default-style-name) "Standard")
-
-  (def/public (get-default-style)
-    (send s-style-list find-named-style (default-style-name)))
-
-  ;; ----------------------------------------
-
-  (define/public (set-max-width w) (void))
-  (define/public (set-min-width v) (void))
-  (define/public (get-max-width) 0.0)
-  (define/public (get-min-width) 0.0)
-  (define/public (set-min-height w) (void))
-  (define/public (set-max-height w) (void))
-  (define/public (get-min-height) 0.0)
-  (define/public (get-max-height) 0.0)
-
-  (define/public (find-first-snip) #f)
-
-  (define/public (get-extent) (void))
-  (define/public (get-descent) (void))
-  (define/public (get-space) (void))
-
-  (define/public (get-flattened-text) (void))
-
-  ;; ----------------------------------------
-
-  (define/public (clear) (void))
-  (define/public (cut ? time) (void))
-  (define/public (copy ? time) (void))
-  (define/public (paste time) (void))
-  (define/public (paste-x-selection time) (void))
-  (define/public (kill time) (void))
-  (define/public (select-all) (void))
-  (define/public (insert snip) (void))
-  (define/public (insert-paste-snip snip) (void))
-  (define/public (insert-paste-string str) (void))
-  (define/public (do-read-insert snip) (void))
-  (define/public (set-caret-owner snip focus) (void))
-  (define/public (read-from-file mf) #f)
-
-  (def/public (do-edit-operation [symbol? op] [any? [recursive? #t]] [exact-integer? [time 0]])
-    (if (and recursive?
-             s-caret-snip)
-        (send s-caret-snip do-edit-operation op #t time)
-        (case op
-          [(undo) (undo)]
-          [(redo) (redo)]
-          [(clear) (clear)]
-          [(cut) (cut #f time)]
-          [(copy) (copy #f time)]
-          [(paste) (paste time)]
-          [(kill) (kill time)]
-          [(insert-text-box) (insert-box 'text)]
-          [(insert-pasteboard-box) (insert-box 'pasteboard)]
-          [(insert-image) (insert-image)]
-          [(select-all) (select-all)])))
-
-  (def/public (can-do-edit-operation? [symbol? op] [any? [recursive? #t]])
-    (if (and recursive?
-             s-caret-snip)
-        (send s-caret-snip can-do-edit-operation? op #t)
-        (cond
-         [(and (is-locked?)
-               (not (or (eq? op 'copy) (eq? op 'select-all))))
-          #f]
-         [(and (eq? op 'undo)
-               (= changes-start changes-end))
-          #f]
-         [(and (eq? op 'redo)
-               (= redochanges-start redochanges-end))
-          #f]
-         [else (really-can-edit? op)])))
-
-  (define/public (really-can-edit?) #f)
-
-  (def/public (insert-box [symbol? [type 'text]])
-    (let ([snip (on-new-box type)])
-      (when snip
-        (let ([sname (default-style-name)])
-
-          (begin-edit-sequence)
-          (send snip set-s-style (or (send s-style-list find-named-style sname)
-                                     (send s-style-list basic-style)))
-          (insert snip)
-          (set-caret-owner snip)
-          (end-edit-sequence)))))
-
-  (def/public (on-new-box [symbol? type])
-    (let* ([media (if (eq? type 'text)
-                      (new text%)
-                      (new pasteboard%))]
-           [snip (make-object editor-snip% media)])
-      (send media set-keymap s-keymap)  
-      (send media set-style-list s-style-list)
-      snip))
-
-  (def/public (insert-image [(make-or-false path-string?) [filename #f]]
-                            [image-type? [type 'unknown/alpha]]
-                            [any? [relative? #f]]
-                            [any? [inline-img? #t]])
-    (let ([filename (or filename
-                        (get-file #f))])
-      (when filename
-        (let ([snip (on-new-image-snip filename type 
-                                       (and relative? #t) 
-                                       (and inline-img? #t))])
-          (insert snip)))))
-
-  (def/public (on-new-image-snip [path-string? filename]
-                                 [image-type? type]
-                                 [any? relative?]
-                                 [any? inline-img?])
-    (make-object image-snip% filename type relative? inline-img?))
-
-  ;; ----------------------------------------
-
-  (def/public (get-snip-data [snip% s]) #f)
-  (def/public (set-snip-data [snip% s] [editor-data% v]) (void))
-  
-  ;; ----------------------------------------
-
-  (def/public (read-header-from-file [editor-stream-in% f] [string? header-name])
-    (error 'read-header-from-file "unknown header data: ~s" header-name))
-  (def/public (read-footer-from-file [editor-stream-in% f] [string? header-name])
-    (error 'read-header-from-file "unknown footer data: ~s" header-name))
-  (def/public (write-headers-to-file [editor-stream-out% f]) #t)
-  (def/public (write-footers-to-file [editor-stream-out% f]) #t)
-
-  (def/public (begin-write-header-footer-to-file [editor-stream-out% f]
-                                                 [string? header-name]
-                                                 [box? data-buffer])
-    (set-box! data-buffer (send f tell))
-    (send f put-fixed 0)
-    (send f put-unterminated (string->bytes/utf-8 header-name))
-    #t)
-
-  (def/public (end-write-header-footer-to-file [editor-stream-out% f]
-                                               [exact-integer? data])
-    (let ([end (send f tell)])
-      (send f jump-to data)
-      (send f put-fixed 0)
-      (let ([pos (send f tell)])
-        (send f jump-to data)
-        (send f put-fixed (- end pos))
-        (send f jump-to end)
-        (set! num-extra-headers (add1 num-extra-headers))
-        #t)))
-
-  (def/public (read-headers-footers [editor-stream-in% f] [any? headers?])
-    (let-boxes ([num-headers 0])
-        (send f get-fixed num-headers)
-      (for/fold ([ok? #t]) ([i (in-range num-headers)] #:when ok?)
-        (let-boxes ([len 0])
-            (send f get-fixed len)
-          (and (send f ok?)
-               (if (positive? len)
-                   (let ([pos (send f tell)])
-                     (send f set-boundary len)
-                     (let ([header-name (bytes->string/utf-8 (send f get-unterminated-bytes) #\?)])
-                       (and (if headers?
-                                (read-header-from-file f header-name)
-                                (read-footer-from-file f header-name))
-                            (send f ok?)
-                            (begin
-                              (send f remove-boundary)
-                              (let ([len (- len (- (send f tell) pos))])
-                                (when (positive? len)
-                                  (send f skip len))
-                                (send f ok?))))))
-                   #t))))))
-
-  (define/public (do-write-headers-footers f headers?)
-    (let ([all-start (send f tell)])
-      (send f put-fixed 0)
-      (set! num-extra-headers 0)
-
-      (and
-       (if headers?
-           (write-headers-to-file f)
-           (write-footers-to-file f))
-       (begin
-         (when (positive? num-extra-headers)
-           (let ([all-end (send f tell)])
-             (send f jump-to all-start)
-             (send f put-fixed num-extra-headers)
-             (send f jump-to all-end))
-           #t)))))
-
-  ;; ----------------------------------------
-
-  (def/public (read-snips-from-file [editor-stream-in% f]
-                                    [any? overwritestylename?])
-    (and (read-headers-footers f #t)
-         (let* ([list-id (box 0)]
-                [new-list (read-styles-from-file s-style-list f overwritestylename? list-id)])
-           (and new-list 
-                (begin
-                  (unless (eq? new-list s-style-list)
-                    (set-style-list new-list))
-                  (let-boxes ([num-headers 0])
-                      (send f get-fixed num-headers)
-                    (and
-                     ;; Read headers
-                     (for/and ([i (in-range num-headers)])
-                       (let ([n (send f get-exact)]
-                             [len (send f get-fixed-exact)])
-                         (and (send f ok?)
-                              (or (zero? len)
-                                  (let ([sclass (send (send f get-s-scl) find-by-map-position f n)])
-                                    (and
-                                     (if sclass
-                                         (let ([start (send f tell)])
-                                           (send f set-boundary len)
-                                           (and (send sclass read-header f)
-                                                (send f ok?)
-                                                (begin
-                                                  (send f do-set-header-flag sclass)
-                                                  (let ([rcount (- (send f tell) start)])
-                                                    (when (rcount . < . len)
-                                                      (error 'read-snips-from-file "underread (caused by file corruption?)"))
-                                                    (send f skip (- len rcount)))
-                                                  (send f remove-boundary)
-                                                  #t)))
-                                         (begin (send f skip len) #t))
-                                     (send f ok?)))))))
-                     ;; Read snips
-                     (let-boxes ([num-snips 0])
-                         (send f get num-snips)
-                       (let ([accum? (this . is-a? . text%)])
-                         (let ([accum
-                                (for/fold ([accum null]) ([i (in-range num-snips)] #:when accum)
-                                  (let ([n (send f get-exact)])
-                                    (let ([sclass (if (n . >= . 0)
-                                                      (send (send f get-s-scl) find-by-map-position f n)
-                                                      #f)]) ; -1 => unknown
-                                      (let ([len (if (or (not sclass)
-                                                         (not (send sclass get-s-required?)))
-                                                     (send f get-fixed-exact)
-                                                     -1)])
-                                        (and (send f ok?)
-                                             (or (and (zero? len) accum)
-                                                 (and
-                                                  (if sclass
-                                                      (let ([start (send f tell)])
-                                                        (when (len . >= . 0)
-                                                          (send f set-boundary len))
-                                                        (let ([style-index (send f get-exact)])
-                                                          (let ([snip (send sclass read f)])
-                                                            (and 
-                                                             snip
-                                                             (begin
-                                                               (when (has-flag? (snip->flags snip) OWNED)
-                                                                 (send snip set-s-flags (remove-flag (snip->flags snip) OWNED)))
-                                                               (send snip set-s-style
-                                                                     (or
-                                                                      (send s-style-list map-index-to-style f style-index (unbox list-id))
-                                                                      (send s-style-list basic-style)))
-                                                               (let* ([zero-length? (zero? (snip->count snip))]
-                                                                      [accum
-                                                                       (if zero-length?
-                                                                           ;; A 0-length snip is a bug in the input, but 
-                                                                           ;;  we continue anyway to recover from bad
-                                                                           ;;  files generated by version 4.2.
-                                                                           accum
-                                                                           (if accum?
-                                                                               (cons snip accum)
-                                                                               (do-read-insert snip)))])
-                                                                 (and
-                                                                  accum
-                                                                  (let ([data (read-buffer-data f)])
-                                                                    (and
-                                                                     (send f ok?)
-                                                                     (let ([accum
-                                                                            (if zero-length?
-                                                                                accum
-                                                                                (if accum?
-                                                                                    (cons (cons (car accum) data) (cdr accum))
-                                                                                    (when data
-                                                                                      (set-snip-data snip data))))])
-                                                                       (and
-                                                                        accum
-                                                                        (begin
-                                                                          (when (len . >= . 0)
-                                                                            (let ([rcount (- (send f tell) start)])
-                                                                              (when (rcount . < . len)
-                                                                                (error 'read-snips-from-file
-                                                                                       "underread (caused by file corruption?)"))
-                                                                              (send f skip (- len rcount))
-                                                                              (send f remove-boundary)))
-                                                                          accum))))))))))))
-                                                      (begin
-                                                        (send f skip len)
-                                                        (and (send f ok?)
-                                                             accum))))))))))])
-                           (and accum
-                                (begin
-                                  (when accum?
-                                    (let ([accum (reverse accum)])
-                                      (send this do-read-insert (map car accum))
-                                      (for ([p (in-list accum)])
-                                        (when (cdr p)
-                                          (set-snip-data (car p) (cdr p))))))
-                                  
-                                  (read-headers-footers f #f)))))))))))))
-
-  ;; ----------------------------------------
-
-  (define/public (insert-port) (void))
-  (define/public (insert-file) (void))
-  (define/public (save-port) (void))
-  (define/public (load-file) (void))
-  (define/public (set-filename) (void))
-  (define/public (write-to-file) (void))
-
-  (def/public (get-filename [(make-or-false box?) [temp #f]])
-    (when temp (set-box! temp s-temp-filename?))
-    s-filename)
-
-  (define/private (extract-parent)
-    (and s-admin
-         ((send s-admin get-s-standard) . > . 0)
-         (let ([w (send s-admin do-get-canvas)])
-           (send w get-top-level))))
-
-  (define/public (do-begin-print) (void))
-  (define/public (print-to-dc) (void))
-  (define/public (do-end-print) (void))
-  (define/public (do-has-print-page?) (void))
-
-  (define/private (run-printout
-                   parent
-                   interactive? ; currently ignored
-                   fit-to-page? ; ignored
-                   begin-doc-proc
-                   has-page?-proc
-                   print-page-proc
-                   end-doc-proc)
-    (let ([dc (make-object printer-dc% parent)])
-      (send dc start-doc "printing")
-      (begin-doc-proc dc)
-      (let loop ([i 1])
-        (when (has-page?-proc dc i)
-          (begin
-            (send dc start-page)
-            (print-page-proc dc i)
-            (send dc end-page)
-            (loop (add1 i)))))
-      (end-doc-proc)
-      (send dc end-doc)))
-
-  (def/public (print [bool? [interactive? #t]]
-                     [bool? [fit-to-page? #t]]
-                     [(symbol-in standard postscript pdf) [output-mode 'standard]]
-                     [any? [parent #f]] ; checked in ../editor.rkt
-                     [bool? [force-page-bbox? #t]]
-                     [bool? [as-eps? #f]])
-    (let ([ps? (or (eq? output-mode 'postscript)
-                   (eq? output-mode 'pdf))]
-          [parent (or parent
-                      (extract-parent))])
-      (cond
-       [ps?
-        (let* ([ps-dc% (if (eq? output-mode 'postscript) post-script-dc% pdf-dc%)]
-               [dc (if as-eps?
-                       ;; just for size:
-                       (new ps-dc% [interactive #f] [output (open-output-nowhere)])
-                       ;; actual target:
-                       (make-object ps-dc% interactive? parent force-page-bbox? #f))])
-          (when (send dc ok?)
-            (send dc start-doc "printing buffer")
-            (set! printing dc)
-            (let ([data (do-begin-print dc fit-to-page?)])
-              (let ([new-dc 
-                     (if as-eps?
-                         ;; now that we know the size, create the actual target:
-                         (let ([w (box 0)]
-                               [h (box 0)]
-                               [sx (box 0)]
-                               [sy (box 0)])
-                           (get-extent w h)
-                           (send (current-ps-setup) get-scaling sx sy)
-                           (let ([dc (make-object ps-dc% interactive? parent force-page-bbox?
-                                                  #t 
-                                                  (* (unbox w) (unbox sx))
-                                                  (* (unbox h) (unbox sy)))])
-                             (and (send dc ok?)
-                                  (send dc start-doc "printing buffer")
-                                  (set! printing dc)
-                                  dc)))
-                         dc)])
-                (when new-dc
-                  (print-to-dc new-dc (if as-eps? 0 -1))
-                  (when as-eps?
-                    (send new-dc end-doc)))
-                (set! printing #f)
-                (do-end-print dc data)
-                (send dc end-doc)
-                (invalidate-bitmap-cache 0.0 0.0 'end 'end)))))]
-       [else
-        (let ([data #f])
-          (run-printout ;; from wx
-           parent
-           interactive?
-           fit-to-page?
-           ;; begin-doc:
-           (lambda (dc)
-             (set! printing dc)
-             (set! data (do-begin-print printing fit-to-page?)))
-           ;; has page?:
-           (lambda (dc n) (do-has-print-page? dc n))
-           ;; print-page:
-           (lambda (dc n) (print-to-dc dc n))
-           ;; end-doc
-           (lambda ()
-             (let ([pr printing])
-               (set! printing #f)
-               (do-end-print printing data))
-             (invalidate-bitmap-cache 0.0 0.0 'end 'end))))])))
-
-  (def/public (undo)
-    (when (and (not undomode?)
-               (not redomode?))
-      (set! undomode? #t)
-      (perform-undos #f)
-      (set! undomode? #f)))
-
-  (def/public (redo)
-    (when (and (not undomode?)
-               (not redomode?))
-      (set! redomode? #t)
-      (perform-undos #t)
-      (set! redomode? #f)))
-
-  (define/private (do-clear-undos changes start end size)
-    (let loop ([i start])
-      (unless (= i end)
-        (send (vector-ref changes i) cancel)
-        (vector-set! changes i #f)
-        (loop (modulo (+ i 1) size)))))
-
-  (define/public (add-undo-rec rec)
-    (cond
-     [interceptmode?
-      (send intercepted append rec)]
-     [undomode?
-      (append-undo rec #t)]
-     [(zero? s-noundomode)
-      (when (not redomode?)
-        (cond
-         [emacs-style-undo?
-          (when (not (= redochanges-start redochanges-end))
-            (let loop ([e redochanges-end])
-              (unless (= redochanges-start e)
-                (let ([e (modulo (+ e -1 redochanges-size) redochanges-size)])
-                  (append-undo (send (vector-ref redochanges e) inverse) #f)
-                  (loop e))))
-            (let loop ()
-              (unless (= redochanges-start redochanges-end)
-                (append-undo (vector-ref redochanges redochanges-start) #f)
-                (vector-set! redochanges redochanges-start #f)
-                (set! redochanges-start (modulo (add1 redochanges-start) redochanges-size))
-                (loop)))
-            (set! redochanges-start 0)
-            (set! redochanges-end 0))]
-         [else
-          (do-clear-undos redochanges redochanges-start redochanges-end redochanges-size)
-          (set! redochanges-start 0)
-          (set! redochanges-end 0)]))
-      (append-undo rec #f)]
-     [else (send rec cancel)]))
-
-  (def/public (add-undo [(make-procedure 0) proc])
-    (add-undo-rec (new proc-record% [proc proc])))
-
-  (define/private (append-undo rec redos?)
-    (if (or (eq? max-undos 'forever) (positive? max-undos))
-        (let-values ([(start end size c) (get-undos redos?)])
-          (let-values ([(size c) (if (zero? size)
-                                     (let ([size (min 128 (if (eq? max-undos 'forever) 128 max-undos))])
-                                       (values size
-                                               (make-vector size #f)))
-                                     (values size c))])
-            (vector-set! c end rec)
-            (let ([end (modulo (add1 end) size)])
-              (let-values ([(start end size c)
-                            (if (= end start)
-                                (if (or (eq? max-undos 'forever)
-                                        (size . < . max-undos)
-                                        emacs-style-undo?)
-                                    ;; make more room
-                                    (let* ([s (min (* size 2) (if (or (eq? max-undos 'forever)
-                                                                      emacs-style-undo?)
-                                                                  (* size 2)
-                                                                  max-undos))]
-                                           [naya (make-vector s #f)])
-                                      (for ([j (in-range size)])
-                                        (vector-set! naya j (vector-ref c (modulo (+ start j) size))))
-                                      (values 0 size s naya))
-                                    ;; no room to grow, so drop an undo record
-                                    (begin
-                                      (send (vector-ref c start) cancel)
-                                      (vector-set! c start #f)
-                                      (values (modulo (add1 start) size)
-                                              end
-                                              size
-                                              c)))
-                                (values start end size c))])
-                (put-undos-back redos? start end size c)))))
-        (send rec cancel)))
-
-  (define/private (get-undos redos?)
-    (if redos?
-        (values redochanges-start redochanges-end redochanges-size redochanges)
-        (values changes-start changes-end changes-size changes)))
-
-  (define/private (put-undos-back redos? start end size c)
-    (if redos?
-        (begin
-          (set! redochanges-start start)
-          (set! redochanges-end end)
-          (set! redochanges-size size)
-          (set! redochanges c))
-        (begin
-          (set! changes-start start)
-          (set! changes-end end)
-          (set! changes-size size)
-          (set! changes c))))
-
-  (def/public (begin-edit-sequence) (void))
-  (def/public (end-edit-sequence) (void))
-  (def/public (in-edit-sequence?) #f)
-  (def/public (refresh-delayed?) #f)
-  (def/public (locations-computed?) #f)
-
-  (define/private (perform-undos redos?)
-    (let ([id #f] [parity #f])
-      (let-values ([(start end size c) (get-undos redos?)])
-        (begin-edit-sequence)
-        (let loop ([end end])
-          (unless (= start end)
-            (let ([end (modulo (+ end -1 size) size)])
-              (let ([rec (vector-ref c end)])
-                (vector-set! c end #f)
-                (put-undos-back redos? start end size c)
-                (when emacs-style-undo?
-                  (set! id (send rec get-id))
-                  (set! parity (send rec get-parity)))
-                (when (send rec undo this)
-                  (loop end))))))
-        (end-edit-sequence)
-        (when (and emacs-style-undo?
-                   (not redos?))
-          ;; combine all new steps into one undo record, and
-          ;; set/generate id
-          (let-values ([(start end size c) (get-undos #t)])
-            (unless (= start end)
-              (let ([cnt (let loop ([e end][cnt 0])
-                           (if (= start e)
-                               cnt
-                               (let ([e (modulo (+ e -1 size) size)])
-                                 (if (send (vector-ref c e) is-composite?)
-                                     cnt
-                                     (loop e (add1 cnt))))))])
-                (when (positive? cnt)
-                  (let ([cu (new composite-record% [count cnt] [id id] [parity? (not parity)])])
-                    (for ([i (in-range cnt)])
-                      (let ([e (modulo (+ (- end cnt) i size) size)])
-                        (send cu add-undo i (vector-ref c e))
-                        (vector-set! c e #f)))
-                    (let ([e (modulo (+ (- end cnt) size) size)])
-                      (vector-set! c e cu)
-                      (set! redochanges-end (modulo (add1 e) size))))))))))))
-
-  (define/public (perform-undo-list changes)
-    (begin-edit-sequence)
-    (let loop ([changes changes])
-      (unless (null? changes)
-        (when (send (car changes) undo this)
-          (loop (cdr changes)))))
-    (end-edit-sequence))
-
-  (define/public (clear-undos)
-    (do-clear-undos changes changes-start changes-end changes-size)
-    (set! changes-start 0)
-    (set! changes-end 0)
-    (do-clear-undos redochanges redochanges-start redochanges-end redochanges-size)
-    (set! redochanges-start 0)
-    (set! redochanges-end 0))
-
-  (def/public (set-max-undo-history [max-undo-value? v])
-    (unless (or undomode?
-                redomode?
-                (eq? v max-undos))
-      (when (equal? 0 v)
-        (clear-undos)
-        (set! changes #f)
-        (set! redochanges #f)
-        (set! changes-size 0)
-        (set! redochanges-size 0))
-      ;;  should we bother downsizing if max-undos gets smaller but stays
-      ;; non-0?
-      (set! max-undos v)))
-
-  (def/public (get-max-undo-history) max-undos)
-
-  (def/public (s-start-intercept)
-    (set! interceptmode? #t)
-    (set! intercepted null))
-  
-  (def/public (s-end-intercept)
-    (begin0
-     intercepted
-     (set! interceptmode? #f)
-     (set! intercepted null)))
-
-  (define/public (undo-preserves-all-history?)
-    emacs-style-undo?)
-  (define/public (set-undo-preserves-all-history on?)
-    (set! emacs-style-undo? (and on? #t)))
-  
-  ;; ----------------------------------------
-
-  ;; see top-level functions below, at "copy ring"
-
-  (define/public (copy-ring-next)
-    (vector-set! copy-ring-buffer1 copy-ring-pos common-copy-buffer)
-    (vector-set! copy-ring-buffer2 copy-ring-pos common-copy-buffer2)
-    (vector-set! copy-ring-data copy-ring-pos common-copy-region-data)
-    (vector-set! copy-ring-style copy-ring-pos copy-style-list)
-
-    (set! copy-ring-pos (sub1 copy-ring-pos))
-    (when (copy-ring-pos . < . 0)
-      (set! copy-ring-pos (sub1 copy-ring-max)))
-
-    (set! common-copy-buffer (vector-ref copy-ring-buffer1 copy-ring-pos))
-    (set! common-copy-buffer2 (vector-ref copy-ring-buffer2 copy-ring-pos))
-    (set! common-copy-region-data (vector-ref copy-ring-data copy-ring-pos))
-    (set! copy-style-list (vector-ref copy-ring-style copy-ring-pos)))
-
-  (define/public (begin-copy-buffer)
-    (set! copy-depth (add1 copy-depth)))
-  (define/public (end-copy-buffer)
-    (set! copy-depth (sub1 copy-depth)))
-
-  (define/public (free-old-copies)
-    (when copy-style-list
-      (if (copy-depth . > . 1)
-          ;; delete current "ring" occupant:
-          (begin
-            (set! common-copy-buffer null)
-            (set! common-copy-buffer2 null)
-            (set! common-copy-region-data #f)
-            (set! copy-style-list #f))
-
-          (begin
-            (vector-set! copy-ring-buffer1 copy-ring-pos common-copy-buffer)
-            (vector-set! copy-ring-buffer2 copy-ring-pos common-copy-buffer2)
-            (vector-set! copy-ring-data copy-ring-pos common-copy-region-data)
-            (vector-set! copy-ring-style copy-ring-pos copy-style-list)
-            
-            (when (copy-ring-max . > . copy-ring-dest)
-              ;; no more space: delete current ring occupant:
-              (vector-set! copy-ring-buffer1 copy-ring-dest #f)
-              (vector-set! copy-ring-buffer2 copy-ring-dest #f)
-              (vector-set! copy-ring-data copy-ring-dest #f))
-
-            (set! common-copy-buffer null)
-            (set! common-copy-buffer2 null)
-            (set! common-copy-region-data #f)
-            (set! copy-style-list #f)
-            (set! copy-ring-pos copy-ring-dest)
-
-            (set! copy-ring-dest (add1 copy-ring-dest))
-            (when (copy-ring-max . < . copy-ring-dest)
-              (set! copy-ring-max copy-ring-dest))
-            (when (copy-ring-dest . >= . copy-ring-size)
-              (set! copy-ring-dest 0))))))
-  
-  (define/public (install-copy-buffer time sl)
-    (set! copy-style-list sl)
-
-    (when (not (= copying-self copy-depth))
-      (when (or (not ALLOW-X-STYLE-SELECTION?)
-                (not x-clipboard-hack?))
-        (send the-clipboard set-clipboard-client the-editor-clipboard-client time))))
-
-  (define/public (do-buffer-paste cb time local?)
-    ;; cut and paste to ourself? (same eventspace?)
-    (if (or local?
-            (and (not paste-text-only?)
-                 (send cb same-clipboard-client? the-editor-clipboard-client)
-                 (send the-editor-clipboard-client same-eventspace? (current-eventspace))))
-        ;; local direct copy:
-        (begin
-          (set! copy-depth (add1 copy-depth))
-          (map (lambda (snip bd)
-                 (insert-paste-snip (send snip copy) bd))
-               (reverse common-copy-buffer)
-               (reverse common-copy-buffer2))
-          (set! copy-depth (sub1 copy-depth))
-          (when (and common-copy-region-data
-                     (this . is-a? . text%))
-            (send this paste-region-data common-copy-region-data)))
-        ;; general paste:
-        (or
-         (and (not paste-text-only?)
-              (let ([str (send cb get-clipboard-data "WXME" time)])
-                (and str
-                     (let* ([b (make-object editor-stream-in-bytes-base% str)]
-                            [mf (make-object editor-stream-in% b)])
-                       (and (read-editor-version mf b #t #f)
-                            (begin
-                              (when (read-editor-global-header mf)
-                                (when (send mf ok?)
-                                  (when (read-from-file mf)
-                                    (let ([data (read-buffer-data mf)])
-                                      (and data
-                                           (this . is-a? . text%)
-                                           (send this paste-region-data data))))))
-                              (read-editor-global-footer mf)
-                              #t))))))
-         (and (not paste-text-only?)
-              (let ([bm (send cb get-clipboard-bitmap time)])
-                (and bm
-                     (begin
-                       (insert-paste-snip (make-object image-snip% bm) #f)
-                       #t))))
-         (let ([str (send cb get-clipboard-string time)])
-           ;; no data => empty string
-           (insert-paste-string str)))))
-
-  (def/public (copy-self) (void))
-
-  (def/public (copy-self-to [editor<%> m])
-    ;; copy style list
-    (send (send m get-s-style-list) copy s-style-list)
-    ;; copy all the snips:
-    (let ([save-buffer common-copy-buffer]
-          [save-buffer2 common-copy-buffer2]
-          [save-styles copy-style-list]
-          [save-data common-copy-region-data]
-          [save-cs copying-self])
-      
-      (send m begin-edit-sequence)
-
-      (set! common-copy-buffer null)
-      (set! common-copy-buffer2 null)
-      (set! copy-style-list #f)
-      (set! common-copy-region-data #f)
-      (set! copying-self (add1 copy-depth))
-      
-      (cond
-       [(this . is-a? . text%)
-        (send this copy #t 0 0 (send this last-position))]
-       [(this . is-a? . pasteboard%)
-        (begin-edit-sequence)
-        (let ([unselect
-               (let loop ([s (send this find-first-snip)])
-                 (if s
-                     (if (send this is-selected? s)
-                         (loop (snip->next s))
-                         (begin
-                           (send this add-selected s)
-                           (cons s (loop (snip->next s)))))
-                     null))])
-          (send this copy #t 0)
-          (for-each (lambda (s)
-                      (send this remove-selected s))
-                    unselect))
-        (end-edit-sequence)])
-
-      (let ([copy-snips (reverse common-copy-buffer)]
-            [copy-snips2 (reverse common-copy-buffer2)])
-      
-        (set! common-copy-buffer save-buffer)
-        (set! common-copy-buffer2 save-buffer2)
-        (set! copy-style-list save-styles)
-        (set! common-copy-region-data save-data)
-        (set! copying-self save-cs)
-
-        (when (this . is-a? . text%)
-          (send m do-insert-snips copy-snips 0))
-
-        (for-each (lambda (s bfd)
-                    (unless (this . is-a? . text%)
-                      (send m insert s #f))
-                    (when bfd
-                      (send m set-snip-data s bfd)))
-                  copy-snips
-                  copy-snips2)
-
-        (send m size-cache-invalid)
-
-        (send m set-min-width (get-min-width))
-        (send m set-max-width (get-max-width))
-        (send m set-min-height (get-min-height))
-        (send m set-max-height (get-max-height))
-
-        (let-boxes ([temp? (box #f)]
-                    [f (box #f)])
-            (set-box! f (get-filename temp?))
-          (send m set-filename f temp?))
-
-        (send m set-max-undo-history (get-max-undo-history))
-        
-        (send m set-keymap (get-keymap))
-
-        (send m set-inactive-caret-threshold (get-inactive-caret-threshold))
-        (send m set-load-overwrites-styles (get-load-overwrites-styles))
-
-        (send m end-edit-sequence))))
-  
-  ;; ----------------------------------------
-
-  (define/public (own-x-selection) (void))
-
-  (define/public (do-own-x-selection on? force?)
-    (if on?
-        (if (and (not force?)
-                 (not (eq? editor-x-selection-allowed this)))
-            #f
-            (begin
-              (when editor-x-selection-owner
-                (send editor-x-selection-owner own-x-selection #f #t #f)
-                (set! editor-x-selection-owner #f))
-              (set! x-selection-copied? #f)
-              (send the-x-selection-clipboard set-clipboard-client the-editor-x-clipboard-client 0)
-              (set! editor-x-selection-owner this)
-              #t))
-        (begin
-          (when (eq? this editor-x-selection-owner)
-            (set! editor-x-selection-owner #f)
-            (when (and (not x-selection-copied?)
-                       (send the-x-selection-clipboard same-clipboard-client?
-                             the-editor-x-clipboard-client))
-              (send the-x-selection-clipboard set-clipboard-string "" 0)))
-          #t)))
-
-  (define/public (copy-out-x-selection)
-    (when (eq? this editor-x-selection-owner)
-      (copy-into-selection)
-      (set! x-selection-copied? #t)))
-
-  (def/public (get-paste-text-only)
-    paste-text-only?)
-
-  (def/public (set-paste-text-only [any? pto?])
-    (set! paste-text-only? (and pto? #t)))
-
-  ;; ----------------------------------------
-
-  (def/public (lock [any? lock?])
-    (set! s-user-locked? (and lock? #t)))
-
-  (def/public (is-locked?) s-user-locked?)
-
-  (def/public (modified?) s-modified?)
-
-  (def/public (set-modified [any? mod?])
-    (let ([mod? (and mod? #t)])
-      (unless (eq? mod? s-modified?)
-        (set! s-modified? mod?)
-        (when mod?
-          (set! num-parts-modified 1))
-
-        (when (and (not mod?)
-                   (not undomode?))
-          ;; get rid of undos that reset the modification state
-          (set! num-parts-modified 0)
-          (let loop ([i changes-end])
-            (unless (= i changes-start)
-              (let ([i (modulo (+ i -1 changes-size) changes-size)])
-                (send (vector-ref changes i) drop-set-unmodified)
-                (loop i))))
-          (let loop ([i redochanges-end])
-            (unless (= i redochanges-start)
-              (let ([i (modulo (+ i -1 redochanges-size) redochanges-size)])
-                (send (vector-ref redochanges i) drop-set-unmodified)
-                (loop i)))))
-
-        (when s-admin
-          (send s-admin modified s-modified?))
-        
-        (when (and (not mod?) (not undomode?))
-          ;; tell all snips that they should now consider themselves unmodified:
-          (let loop ([snip (find-first-snip)])
-            (when snip
-              (send snip set-unmodified)
-              (loop (snip->next snip))))))))
-
-  (def/public (on-snip-modified [snip% s] [any? mod?])
-    (if (not mod?)
-        (when (= num-parts-modified 1)
-          (set! num-parts-modified 0)
-          (when s-modified?
-            (set-modified #f)))
-        (if s-modified?
-            (set! num-parts-modified (add1 num-parts-modified))
-            (set-modified #t))))
-
-  (def/public (get-inactive-caret-threshold)
-    s-inactive-caret-threshold)
-
-  (def/public (set-inactive-caret-threshold [(symbol-in no-caret show-inactive-caret show-caret) v])
-    (set! s-inactive-caret-threshold v))
-
-  (define/public (scroll-editor-to localx localy w h refresh? bias)
-    (if s-admin
-        (send s-admin scroll-to localx localy w h refresh? bias)
-        #f))
-
-  (def/public (refresh [real? left] [real? top] [nonnegative-real? width] [nonnegative-real? height]
-                       [caret-status? show-caret]
-                       [(make-or-false color%) bg-color])
-    (void))
-
-  (def/public (on-paint [any? pre?] [dc<%> dc]
-                        [real? l] [real? t] [real? r] [real? b]
-                        [real? dx] [real? dy]
-                        [caret-status? show-caret])
-    (void))
-
-  (def/public (can-save-file? [path-string? filename]
-                              [symbol? format])
-    #t)
-
-  (def/public (on-save-file [path-string? filename]
-                            [symbol? format])
-    (void))
-
-  (def/public (after-save-file [any? ok?])
-    (void))
-
-  (def/public (can-load-file? [path-string? filename]
-                              [symbol? format])
-    #t)
-
-  (def/public (on-load-file [path-string? filename]
-                            [symbol? format])
-    (void))
-
-  (def/public (after-load-file [any? ok?])
-    (void))
-
-  (def/public (on-edit-sequence) (void))
-
-  (def/public (after-edit-sequence) (void))
-
-  (def/public (on-display-size) (void))
-
-  (def/public (on-change) (void))
-
-  (def/public (on-display-size-when-ready)
-    (cond
-     [(in-edit-sequence?)
-      (set! s-need-on-display-size? #t)]
-     [(or (not seq-lock)
-          (semaphore-try-wait? seq-lock))
-      (when seq-lock
-        (semaphore-post seq-lock))
-      (on-display-size)]
-     [else (set! s-need-on-display-size? #t)]))
-
-  (def/public (begin-sequence-lock)
-    (call-with-semaphore
-     global-lock
-     (lambda ()
-       (unless seq-lock
-         (set! seq-lock (make-semaphore 1)))))
-    
-    ;; "Try" really should succeed, because multiple refreshes are
-    ;; prevented through other flags. Still, we don't want to block if
-    ;; someone previously escaped from a repaint.
-    (void (semaphore-try-wait? seq-lock)))
-
-  (def/public (end-sequence-lock)
-    (semaphore-post seq-lock))
-
-  (def/public (wait-sequence-lock)
-    (cond
-     [seq-lock
-      (sync seq-lock)
-      (lambda ()
-        (semaphore-post seq-lock))]
-     [else void]))
-
-  (def/public (get-file [(make-or-false path-string?) path])
-    (editor-get-file "choose a file" (extract-parent) #f path))
-
-  (def/public (put-file [(make-or-false path-string?) dir]
-                        [(make-or-false path-string?) suggested-name])
-    (editor-put-file "save file as" (extract-parent) dir suggested-name))
-  
-  (def/public (set-load-overwrites-styles [any? b?])
-    (set! loadoverwritesstyles? (and b? #t)))
-
-  (def/public (get-load-overwrites-styles) loadoverwritesstyles?))
-
-(define editor<%> (class->interface editor%))
-
-;; ------------------------------------------------------------
-
-(define/top (add-editor-keymap-functions [keymap% tab])
-  (let ([add (lambda (n f)
-               (send tab add-function n f))])
-    (add "copy-clipboard" (lambda (e event) (send e copy #f (send event get-time-stamp))))
-    (add "copy-append-clipboard" (lambda (e event) (send e copy #t (send event get-time-stamp))))
-    (add "paste-clipboard" (lambda (e event) (send e paste (send event get-time-stamp))))
-    (add "paste-x-selection" (lambda (e event) (send e paste-x-selection (send event get-time-stamp))))
-    (add "cut-clipboard"  (lambda (e event) (send e cut #f (send event get-time-stamp))))
-    (add "cut-append-clipboard" (lambda (e event) (send e cut #t (send event get-time-stamp))))
-    (add "delete-to-end-of-line" (lambda (e event) (send e kill (send event get-time-stamp))))
-    (add "undo" (lambda (e event) (send e undo)))
-    (add "redo" (lambda (e event) (send e redo)))
-    (add "delete-selection" (lambda (e event) (send e clear)))
-    (add "clear-selection" (lambda (e event) (send e clear)))
-    (add "select-all" (lambda (e event) (send e select-all)))))
-
-;; ------------------------------------------------------------
-
-(define (write-buffer-data f data)
-  (let loop ([data data])
-    (if data
-        (let ([mp (send f do-map-position (send data get-s-dataclass))])
-          (send f put mp)
-          (let ([req? (send (send data get-s-dataclass) get-s-required?)])
-            (let-values ([(data-start data-pos)
-                          (if req?
-                              (values #f #f)
-                              (values (send f tell)
-                                      (begin
-                                        (send f put-fixed 0)
-                                        (send f tell))))])
-              (if (not (send data write f))
-                  #f
-                  (begin
-                    (unless req?
-                      (let ([data-end (send f tell)])
-                        (send f jump-to data-start)
-                        (send f put-fixed (- data-end data-pos))
-                        (send f jump-to data-end)))
-                    (loop (send data get-s-next)))))))
-        (begin
-          (send f put 0)
-          #t))))
-
-(define (write-snips-to-file f style-list snip-list
-                             start-snip end-snip
-                             extra-data buffer)
-  (and 
-   (write-styles-to-file style-list f)
-   (let ([all-start (send f tell)])
-     (send f put-fixed 0)
-
-     (let ([snip-list
-            (if snip-list
-                (reverse snip-list)
-                (let loop ([snip start-snip])
-                  (if (and snip
-                           (not (eq? snip end-snip)))
-                      (cons snip (loop (snip->next snip)))
-                      null)))])
-
-       (let ([num-headers
-              (let loop ([num-headers 0]
-                         [snips snip-list])
-                (if (null? snips)
-                    num-headers
-                    (let ([snip (car snips)])
-                      (let ([sclass (snip->snipclass snip)])
-                        (unless sclass
-                          (error 'write-snips-to-file "snip has no snipclass"))
-                        (if (not (send f do-get-header-flag sclass))
-                            (begin
-                              (send f put (send f do-map-position sclass))
-                              (let ([header-start (send f tell)])
-                                (send f put-fixed 0)
-                                (let ([header-pos (send f tell)])
-                                  (if (not (send sclass write-header f))
-                                      #f
-                                      (begin
-                                        (send f do-set-header-flag sclass)
-                                        (let ([header-end (send f tell)])
-                                          (send f jump-to header-start)
-                                          (send f put-fixed (- header-end header-pos))
-                                          (send f jump-to header-end)
-                                          (if (send f ok?)
-                                              (loop (add1 num-headers)
-                                                    (cdr snips))
-                                              #f)))))))
-                            (loop num-headers (cdr snips)))))))])
-
-         (and
-          num-headers
-          (let ([all-end (send f tell)])
-            (send f jump-to all-start)
-            (send f put-fixed num-headers)
-            (send f jump-to all-end)
-
-            (send f put (length snip-list))
-            
-            (andmap
-             (lambda (snip data)
-               (let ([sclass (snip->snipclass snip)])
-                 (if sclass
-                     (send f put (send f do-map-position sclass))
-                     (send f put -1))
-                 (let-values ([(snip-start snip-pos)
-                               (if (or (not sclass)
-                                       (not (send sclass get-s-required?)))
-                                   (values (send f tell)
-                                           (begin
-                                             (send f put-fixed 0)
-                                             (send f tell)))
-                                   (values #f #f))])
-                   (let ([style-index (send style-list style-to-index (snip->style snip))])
-                     (when (not style-index)
-                       (error 'write-snips-to-file "bad style discovered"))
-                     (send f put style-index))
-                   (send snip write f)
-                   (and (write-buffer-data f data)
-                        (begin
-                          (when snip-start
-                            (let ([snip-end (send f tell)])
-                              (send f jump-to snip-start)
-                              (send f put-fixed (- snip-end snip-pos))
-                              (send f jump-to snip-end)))
-                          (send f ok?))))))
-             snip-list
-             (if extra-data
-                 (reverse extra-data)
-                 (map (lambda (snip)
-                        (send buffer get-snip-data snip))
-                      snip-list))))))))))
-
-;; ------------------------------------------------------------
-
-;; Copy and the copy ring: the current clipboard content is stored in
-;; common-copy-buffer, etc. to implement the copy ring, then when a
-;; copy is started, we moved the wxmb_common-copy-buffer, etc. values
-;; into a copy ring. yanking from the ring swaps the values in
-;;  wxmb_common-copy-buffer, etc.  and the ring values and adjust the
-;; pointer into the ring.
-
-(define copy-depth 0)
-
-(define copy-ring-size 30)
-(define copy-ring-pos 0)
-(define copy-ring-max 1)
-(define copy-ring-dest 1)
-
-(define copy-ring-buffer1 (make-vector copy-ring-size #f))
-(define copy-ring-buffer2 (make-vector copy-ring-size #f))
-
-(define copy-ring-style (make-vector copy-ring-size #f))
-(define copy-ring-data (make-vector copy-ring-size #f))
-
-(define common-copy-buffer null)
-(define common-copy-buffer2 null)
-(define copy-style-list #f)
-(define common-copy-region-data #f)
-
-(define selection-copy-buffer #f)
-(define selection-copy-buffer2 #f)
-(define selection-copy-style-list #f)
-(define selection-copy-region-data #f)
-
-(define (set-common-copy-region-data! v) (set! common-copy-region-data v))
-(define (cons-common-copy-buffer! v) (set! common-copy-buffer (cons v common-copy-buffer)))
-(define (cons-common-copy-buffer2! v) (set! common-copy-buffer2 (cons v common-copy-buffer2)))
-
-(define copying-self 0)
-
-(define editor-x-selection-mode? ALLOW-X-STYLE-SELECTION?)
-(define editor-x-selection-owner #f)
-(define editor-x-selection-allowed #f)
-(define x-selection-copied? #f)
-(define x-clipboard-hack? #f)
-
-(define (generic-get-data fformat copy-buffer copy-buffer2 copy-styles copy-region-data)
-  (cond
-   [(equal? fformat "TEXT")
-    (string->bytes/utf-8
-     (let ([out (open-output-string)])
-       (for-each (lambda (snip)
-                   (let ([s (send snip get-text 0 (snip->count snip) #t)])
-                     (display s out)))
-                 (reverse copy-buffer))
-       (let ([s (get-output-string out)])
-         (cond
-          [(eq? 'macosx (system-type))
-           ;; change newline to return
-           (regexp-replace* #rx"\r" s "\n")]
-          [(eq? 'windows (system-type))
-           ;; change newline to return-newline:
-           (regexp-replace* #rx"\n" s "\r\n")]
-          [else s]))))]
-   [(equal? fformat "WXME")
-    (let* ([b (make-object editor-stream-out-bytes-base%)]
-           [mf (make-object editor-stream-out% b)])
-      (write-editor-version mf b)
-      (write-editor-global-header mf)
-      (and (send mf ok?)
-           (begin
-            (send mf put-fixed 0)
-            (and (write-snips-to-file mf copy-styles copy-buffer #f #f copy-buffer2 #f)
-                 (begin
-                   (send mf put-fixed 0)
-                   (write-buffer-data mf copy-region-data))))
-           (write-editor-global-footer mf)
-           (send b get-bytes)))]
-   [else #""]))
-
-(defclass editor-clipboard-client% clipboard-client%
-  (inherit add-type)
-  (super-new)
-  (add-type "TEXT")
-  (add-type "WXME")
-  (define/override (get-data format)
-    (generic-get-data format
-                      common-copy-buffer
-                      common-copy-buffer2
-                      copy-style-list
-                      common-copy-region-data))
-  (define/override (on-replaced)
-    (void)))
-
-(defclass editor-x-clipboard-client% clipboard-client%
-  (inherit add-type)
-  (super-new)
-  (add-type "TEXT")
-  (add-type "WXME")
-  (define/override (get-data format)
-    (cond
-     [(and (not x-selection-copied?)
-           (not editor-x-selection-owner))
-      ""]
-     [else
-      (when (or (not x-selection-copied?)
-                editor-x-selection-owner)
-        (copy-into-selection))
-      
-      ;; if nothing is copied (e.g., do-copy is overriden to not copy anything
-      ;; or copies directly to clipboard):
-      (if (not selection-copy-style-list)
-          (if (send the-x-selection-clipboard same-clipboard-client? this)
-              #f
-              (send the-x-selection-clipboard get-clipboard-data format 0))
-          (generic-get-data format
-                            selection-copy-buffer
-                            selection-copy-buffer2
-                            selection-copy-style-list
-                            selection-copy-region-data))]))
-  (define/override (on-replaced)
-    (if editor-x-selection-owner
-        ;; in case this client replaced itself somewhere along the way:
-        (when (not (send the-x-selection-clipboard same-clipboard-client? this))
-          (let ([b editor-x-selection-owner])
-            (set! editor-x-selection-owner #f)
-            (set! x-selection-copied? #f)
-            (send b own-x-selection #f #t #f)))
-        (set! x-selection-copied? #f))))
-
-(define the-editor-clipboard-client
-  (new editor-clipboard-client%))
-(define the-editor-x-clipboard-client
-  (new editor-x-clipboard-client%))
-
-(define/top (editor-set-x-selection-mode [any? on?])
-  (when ALLOW-X-STYLE-SELECTION?
-    (set! editor-x-selection-mode? (and on? #t))
-    (when (and (not on?)
-               (send the-x-selection-clipboard same-clipboard-client?
-                     the-editor-x-clipboard-client))
-      (send the-x-selection-clipboard set-clipboard-string "" 0))))
-
-(define (copy-into-selection)
-  ;; copy all the snips:
-  (set! x-clipboard-hack? #t)
-  
-  ;; save normal buffers:
-  (let ([save-buffer common-copy-buffer]
-        [save-buffer2 common-copy-buffer2]
-        [save-styles copy-style-list]
-        [save-data common-copy-region-data])
-    
-    ;; set up new selection buffers, and redirect:
-    (set! common-copy-buffer null)
-    (set! common-copy-buffer2 null)
-    (set! copy-style-list #f)
-    (set! common-copy-region-data #f)
-    
-    (send editor-x-selection-owner copy #f 0)
-    
-    ;; move "normal" buffers to selection:
-    (set! selection-copy-buffer common-copy-buffer)
-    (set! selection-copy-buffer2 common-copy-buffer2)
-    (set! selection-copy-style-list copy-style-list)
-    (set! selection-copy-region-data common-copy-region-data)
-
-    ;; restore normal buffers:
-    (set! common-copy-buffer save-buffer)
-    (set! common-copy-buffer2 save-buffer2)
-    (set! copy-style-list save-styles)
-    (set! common-copy-region-data save-data))
-  
-  (set! x-clipboard-hack? #f))
-
-;; ------------------------------------------------------------
-
-(define (read-buffer-data f)
-  (let loop ([data #f])
-    (let-boxes ([extra-data-index 0])
-        (send f get extra-data-index)
-      (if (zero? extra-data-index)
-          data
-          (let ([dclass (send (send f get-s-bdl) find-by-map-position f extra-data-index)])
-            (let ([datalen (if (or (not dclass)
-                                   (not (send dclass get-s-required?)))
-                               (let-boxes ([datalen 0])
-                                   (send f get datalen)
-                                 datalen)
-                               -1)])
-              (if dclass
-                  (let ([start (send f tell)])
-                    (when (datalen . >= . 0)
-                      (send f set-boundary datalen))
-                    (let ([newdata (send dclass read f)])
-                      (and 
-                       newdata
-                       (begin
-                         (send newdata set-s-next data)
-                         (let ([data newdata])
-                           (when (datalen . >= . 0)
-                             (let ([rcount (- (send f tell) start)])
-                               (when (rcount . < . datalen)
-                                 (error 'read-buffer-data "underread (caused by file corruption?)"))
-                               (send f skip (- datalen rcount)))
-                             (send f remove-boundary))
-                           (and (send f ok?)
-                                (loop data)))))))
-                  ;; unknown extra data
-                  (begin
-                    (send f skip datalen)
-                    (and (send f ok?)
-                         (loop data))))))))))
-
-;; ------------------------------------------------------------
-
-(define MRED-READER-STR #"#reader(lib\"read.ss\"\"wxme\")")
-(define MRED-START-STR #"WXME")
-(define MRED-FORMAT-STR #"01")
-(define MRED-VERSION-STR #"08")
-(define MRED-VERSION-RX #rx"^0[1-8]$")
-
-(define (write-editor-version f b)
-  (send b write-bytes MRED-READER-STR)
-  (send b write-bytes MRED-START-STR)
-  (send b write-bytes MRED-FORMAT-STR)
-  (send b write-bytes MRED-VERSION-STR)
-  (send b write-bytes #" ## ")
-  (not (send b bad?)))
-
-(define MRED-READER+START-STR (bytes-append MRED-READER-STR MRED-START-STR))
-
-(define (detect-wxme-file who f peek?)
-  (let* ([l1 (bytes-length MRED-START-STR)]
-         [s (if peek?
-                (peek-bytes l1 0 f)
-                (read-bytes l1 f))])
-    (or (equal? s MRED-START-STR)
-        (and (equal? s (subbytes MRED-READER-STR 0 l1))
-             (let ([s (bytes-append
-                       s
-                       (let ([v (if peek?                           
-                                    (peek-bytes (- (bytes-length MRED-READER+START-STR) l1) l1 f)
-                                    (read-bytes (- (bytes-length MRED-READER+START-STR) l1) f))])
-                         (if (eof-object? v)
-                             ""
-                             v)))])
-               (equal? s MRED-READER+START-STR))))))
-
-(define (read-editor-version mf b parse-format? [show-errors? #t])
-  (and
-   (or
-    (not parse-format?)
-    (let* ([n1 (bytes-length MRED-START-STR)]
-           [vbuf (make-vector n1)])
-      (let ([n (send b read vbuf)])
-        (or (and (= n (vector-length vbuf))
-                 (bytes=? MRED-START-STR (string->bytes/latin-1 (list->string (vector->list vbuf)))))
-            ;; maybe we have a #reader... prefix?
-            (let* ([n2 (bytes-length MRED-READER-STR)]
-                   [vbuf2 (make-vector (- n2 n1))])
-              (let ([n (send b read vbuf2)])
-                (and (= n (- n2 n1))
-                     (bytes=? MRED-READER-STR
-                              (string->bytes/latin-1 
-                               (string-append (list->string (vector->list vbuf))
-                                              (list->string (vector->list vbuf2)))))
-                     ;; yes, so try reading start again.
-                     (let ([n (send b read vbuf)])
-                       (and (= n (vector-length vbuf))
-                            (bytes=? MRED-START-STR (string->bytes/latin-1 (list->string (vector->list vbuf)))))))))
-            (if show-errors?
-                (error (method-name 'pasteboard%: 'insert-file) "not a WXME file")
-                #f)))))
-   (begin
-     (let* ([n1 (bytes-length MRED-FORMAT-STR)]
-            [vbuf (make-vector n1)])
-       (let ([n (send b read vbuf)])
-         (send mf set-s-read-format (string->bytes/latin-1 (list->string (vector->list vbuf))))))
-     (let* ([n1 (bytes-length MRED-VERSION-STR)]
-            [vbuf (make-vector n1)])
-       (let ([n (send b read vbuf)])
-         (and (= n n1)
-              (send mf set-s-read-version (string->bytes/latin-1 (list->string (vector->list vbuf)))))))
-     (check-format-and-version mf b show-errors?))))
-
-(define (read-editor-global-header f)
-  (send (send f get-s-scl) reset-header-flags f)
-  (if (not (send (send f get-s-scl) read f))
-      #f
-      (begin
-        (setup-style-reads-writes f)
-        (send (send f get-s-bdl) read f))))
-
-(define (read-editor-global-footer f)
-  (done-style-reads-writes f)
-  (send (send f get-s-scl) reset-header-flags f)
-  #t)
-
-(define (write-editor-global-header f)
-  (send f pretty-start)
-  (send (send f get-s-scl) reset-header-flags f)
-  (if (not (send (send f get-s-scl) write f))
-      #f
-      (begin
-        (setup-style-reads-writes f)
-        (send (send f get-s-bdl) write f))))
-
-(define (write-editor-global-footer f)
-  (done-style-reads-writes f)
-  (send (send f get-s-scl) reset-header-flags f)
-  (send f pretty-finish)
-  #t)
-
-(define (check-format-and-version s b show-errors?)
-  (and
-   (or (bytes=? (send s get-s-read-format) MRED-FORMAT-STR)
-       (if show-errors?
-           (error 'load-file "unknown format number in WXME file format: ~s"
-                  (send s get-s-read-format))
-           #f))
-   (or (regexp-match MRED-VERSION-RX (send s get-s-read-format))
-       (if show-errors?
-           (error 'load-file "unknown version number in WXME file format")
-           #f))
-   (if ((send s get-wxme-version) . > . 3)
-       ;; need to skip " ## "
-       (let* ([v (make-vector 4)]
-              [n (send b read v)])
-         (or (and (= n 4)
-                  (char=? (vector-ref v 0) #\space)
-                  (char=? (vector-ref v 1) #\#)
-                  (char=? (vector-ref v 2) #\#)
-                  (member (vector-ref v 3) '(#\space #\return #\newline)))
-             (if show-errors?
-                 (error 'load-file "WXME file missing ' ## ' mark")
-                 #f)))
-       #t)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/keymap.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/keymap.rkt
deleted file mode 100644
index 27c9431412..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/keymap.rkt
+++ /dev/null
@@ -1,773 +0,0 @@
-#lang racket/base
-(require racket/class
-         "../syntax.rkt"
-         "wx.rkt")
-
-(provide keymap%
-         map-command-as-meta-key)
-
-(define map-command-as-meta? #f)
-
-(define/top (map-command-as-meta-key [bool? v])
-  (set! map-command-as-meta? v))
-
-(define (as-meta-key k)
-  (case (system-type)
-    [(macosx) (if map-command-as-meta?
-                  k
-                  #f)]
-    [else k]))
-
-(define (as-cmd-key k)
-  (case (system-type)
-    [(macosx) k]
-    [else #f]))
-
-(define keylist
-  #hash(("leftbutton" . mouse-left)
-        ("rightbutton" . mouse-right)
-        ("middlebutton" . mouse-middle)
-        ("leftbuttondouble" . mouse-left-double)
-        ("rightbuttondouble" . mouse-right-double)
-        ("middlebuttondouble" . mouse-middle-double)
-        ("leftbuttontriple" . mouse-left-triple)
-        ("rightbuttontriple" . mouse-right-triple)
-        ("middlebuttontriple" . mouse-middle-triple)
-        ("leftbuttonseq" . mouse-left)
-        ("rightbuttonseq" . mouse-right)
-        ("middlebuttonseq" . mouse-middle)
-        ("wheelup" . wheel-up)
-        ("wheeldown" . wheel-down)
-        ("wheelleft" . wheel-left)
-        ("wheelright" . wheel-right)
-        ("esc" . escape) 
-        ("delete" . #\rubout)
-        ("del" . #\rubout)
-        ("insert" . insert)
-        ("ins" . insert)
-        ("add" . add)
-        ("subtract" . subtract)
-        ("multiply" . multiply)
-        ("divide" . divide)
-        ("backspace" . #\backspace)
-        ("back" . #\backspace)
-        ("return" . #\return)
-        ("enter" . #\return)
-        ("tab" . #\tab)
-        ("space" . #\space)
-        ("right" . right)
-        ("left" . left)
-        ("up" . up)
-        ("down" . down)
-        ("home" . home)
-        ("end" . end)
-        ("pageup" . prior)
-        ("pagedown" . next)
-        ("semicolon" . #\;)
-        ("colon" . #\:)
-        ("numpad0" . numpad0)
-        ("numpad1" . numpad1)
-        ("numpad2" . numpad2)
-        ("numpad3" . numpad3)
-        ("numpad4" . numpad4)
-        ("numpad5" . numpad5)
-        ("numpad6" . numpad6)
-        ("numpad7" . numpad7)
-        ("numpad8" . numpad8)
-        ("numpad9" . numpad9)
-        ("numpadenter" . numpad-enter)
-        ("f1" . f1)
-        ("f2" . f2)
-        ("f3" . f3)
-        ("f4" . f4)
-        ("f5" . f5)
-        ("f6" . f6)
-        ("f7" . f7)
-        ("f8" . f8)
-        ("f9" . f9)
-        ("f10" . f10)
-        ("f11" . f11)
-        ("f12" . f12)
-        ("f13" . f13)
-        ("f14" . f14)
-        ("f15" . f15)
-        ("f16" . f16)
-        ("f17" . f17)
-        ("f18" . f18)
-        ("f19" . f19)
-        ("f20" . f20)
-        ("f21" . f21)
-        ("f22" . f22)
-        ("f23" . f23)
-        ("f24" . f24)))
-(define rev-keylist
-  (make-immutable-hash
-   (hash-map keylist (lambda (k v) (cons v k)))))
-
-(define-struct kmfunc (name f))
-
-(define-struct key (code
-
-                    shift-on?
-                    shift-off?
-                    ctrl-on?
-                    ctrl-off?
-                    alt-on?
-                    alt-off?
-                    meta-on?
-                    meta-off?
-                    cmd-on?
-                    cmd-off?
-                    caps-on?
-                    caps-off?
-                    altgr-on?
-                    altgr-off?
-
-                    score
-
-                    check-other?
-                    fullset?
-
-                    [fname #:mutable]
-
-                    isprefix?
-                    seqprefix))
-
-(define-local-member-name 
-  chain-handle-key-event
-  get-best-score
-  chain-handle-mouse-event
-  get-best-mouse-score
-  cycle-check
-  chain-check-grab)
-
-(defclass keymap% object%
-  
-  (super-new)
-
-  (define functions (make-hash))
-  (define keys (make-hash))
-
-  (define prefix #f)
-  (define prefixed? #f)
-
-  (define active-mouse-function #f)
-
-  (define grab-key-function #f)
-  (define grab-mouse-function #f)
-  (define on-break #f)
-
-  (define chain-to null)
-
-  (define last-time 0)
-  (define last-x 0)
-  (define last-y 0)
-  (define click-count 0)
-  (define last-code #f)
-  (define last-button #f)
-
-  (define double-interval (get-double-click-threshold))
-
-  (def/public (reset)
-    (set! prefix #f)
-    (set! prefixed? #f)
-
-    (for-each (lambda (c)
-                (send c reset))
-              chain-to))
-
-  (def/public (break-sequence)
-    (set! prefix #f)
-
-    (when on-break
-      (let ([f on-break])
-        (set! on-break #f)
-        (f)))
-    
-    (for-each (lambda (c)
-                (send c break-sequence))
-              chain-to))
-
-  (def/public (set-break-sequence-callback [(make-procedure 0) f])
-    (let ([old on-break])
-      (set! on-break f)
-      (when old (old))))
-
-  (define/private (find-key code other-code alt-code other-alt-code caps-code
-                            shift? ctrl? alt? meta? cmd? caps? altgr?
-                            prefix)
-    (for*/fold ([best-key #f]
-                [best-score -1])
-        ([findk (in-list (list code other-code alt-code other-alt-code caps-code))]
-         [key (in-list (hash-ref keys findk null))])
-      (if (and (or (eqv? (key-code key) code)
-                   (and (key-check-other? key)
-                        (or (eqv? (key-code key) other-code)
-                            (eqv? (key-code key) alt-code)
-                            (eqv? (key-code key) other-alt-code)
-                            (eqv? (key-code key) caps-code))))
-               (or (and (key-shift-on? key) shift?)
-                   (and (key-shift-off? key) (not shift?))
-                   (and (not (key-shift-on? key)) (not (key-shift-off? key))))
-               (or (and (key-ctrl-on? key) ctrl?)
-                   (and (key-ctrl-off? key) (not ctrl?))
-                   (and (not (key-ctrl-on? key)) (not (key-ctrl-off? key))))
-               (or (and (key-alt-on? key) alt?)
-                   (and (key-alt-off? key) (not alt?))
-                   (and (not (key-alt-on? key)) (not (key-alt-off? key))))
-               (or (and (key-meta-on? key) meta?)
-                   (and (key-meta-off? key) (not meta?))
-                   (and (not (key-meta-on? key)) (not (key-meta-off? key))))
-               (or (and (key-cmd-on? key) cmd?)
-                   (and (key-cmd-off? key) (not cmd?))
-                   (and (not (key-cmd-on? key)) (not (key-cmd-off? key))))
-               (or (and (key-caps-on? key) caps?)
-                   (and (key-caps-off? key) (not caps?))
-                   (and (not (key-caps-on? key)) (not (key-caps-off? key))))
-               (or (and (key-altgr-on? key) altgr?)
-                   (and (key-altgr-off? key) (not altgr?))
-                   (and (not (key-altgr-on? key)) (not (key-altgr-off? key))))
-               (eq? (key-seqprefix key) prefix))
-          (let ([score (+ (key-score key)
-                          (if (eqv? (key-code key) code)
-                              0
-                              (if (eqv? (key-code key) other-alt-code)
-                                  -4
-                                  -2)))])
-            (if (score . > . best-score)
-                (values key score)
-                (values best-key best-score)))
-          (values best-key best-score))))
-
-  (define/private (do-map-function code shift ctrl alt meta cmd caps altgr check-other?
-                                   fname prev isprefix? fullset?)
-    ;; look for existing key mapping:
-    (let ([key
-           (ormap (lambda (key)
-                    (and (eqv? (key-code key) code)
-                         (eq? (key-shift-on? key) (shift . > . 0))
-                         (eq? (key-shift-off? key) (shift . < . 0))
-                         (eq? (key-ctrl-on? key) (ctrl . > . 0))
-                         (eq? (key-ctrl-off? key) (ctrl . < . 0))
-                         (eq? (key-alt-on? key) (alt . > . 0))
-                         (eq? (key-alt-off? key) (alt . < . 0))
-                         (eq? (key-meta-on? key) (meta . > . 0))
-                         (eq? (key-meta-off? key) (meta . < . 0))
-                         (eq? (key-cmd-on? key) (cmd . > . 0))
-                         (eq? (key-cmd-off? key) (cmd . < . 0))
-                         (eq? (key-caps-on? key) (caps . > . 0))
-                         (eq? (key-caps-off? key) (caps . < . 0))
-                         (eq? (key-altgr-on? key) (altgr . > . 0))
-                         (eq? (key-altgr-off? key) (altgr . < . 0))
-                         (eq? (key-check-other? key) check-other?)
-                         (eq? (key-seqprefix key) prev)
-                         key))
-                  (hash-ref keys code null))])
-
-      (if key
-          ;; Found existing
-          (if (not (eq? isprefix? (key-isprefix? key)))
-              ;; prefix vs no-prefix mismatch:
-              (let ([s
-                     (string-append
-                      (if (meta . > . 0) "m:" "")
-                      (if (meta . < . 0) "~m:" "")
-                      (if (cmd . > . 0) "d:" "")
-                      (if (cmd . < . 0) "~d:" "")
-                      (if (alt . > . 0) "a:" "")
-                      (if (alt . < . 0) "~a:" "")
-                      (if (ctrl . > . 0) "c:" "")
-                      (if (ctrl . < . 0) "~c:" "")
-                      (if (shift . > . 0) "s:" "")
-                      (if (shift . < . 0) "~s:" "")
-                      (if (caps . > . 0) "l:" "")
-                      (if (caps . < . 0) "~l:" "")
-                      (if (altgr . > . 0) "g:" "")
-                      (if (altgr . < . 0) "~g:" "")
-                      (or (hash-ref rev-keylist code)
-                          (format "~c" code)))])
-                (error (method-name 'keymap% 'map-function)
-                       "~s is already mapped as a ~aprefix key"
-                       s (if isprefix? "non-" "")))
-              (begin
-                (set-key-fname! key (string->immutable-string fname))
-                key))
-          ;; Create new
-          (let ([newkey (make-key
-                         code
-                         (shift . > . 0) (shift . < . 0)
-                         (ctrl . > . 0) (ctrl . < . 0)
-                         (alt . > . 0) (alt . < . 0)
-                         (meta . > . 0) (meta . < . 0)
-                         (cmd . > . 0) (cmd . < . 0)
-                         (caps . > . 0) (caps . < . 0)
-                         (altgr . > . 0) (altgr . < . 0)
-                         (+ (if (shift . > . 0) 1 0)
-                            (if (shift . < . 0) 5 0)
-                            (if (ctrl . > . 0) 1 0)
-                            (if (ctrl . < . 0) 5 0)
-                            (if (alt . > . 0) 1 0)
-                            (if (alt . < . 0) 5 0)
-                            (if (meta . > . 0) 1 0)
-                            (if (meta . < . 0) 5 0)
-                            (if (cmd . > . 0) 1 0)
-                            (if (cmd . < . 0) 5 0)
-                            (if (caps . > . 0) 1 0)
-                            (if (caps . < . 0) 5 0)
-                            (if (altgr . > . 0) 1 0)
-                            (if (altgr . < . 0) 5 0)
-                            (if check-other? 6 30))
-                         check-other?
-                         fullset?
-                         (string->immutable-string fname)
-                         isprefix?
-                         prev)])
-            (hash-set! keys code (cons newkey (hash-ref keys code null)))
-            newkey))))
-
-  (define/private (get-code str)
-    (let ([code (hash-ref keylist (string-downcase str) #f)])
-      (if code
-          (values code (member str '("leftbuttonseq"
-                                     "middlebuttonseq"
-                                     "rightbuttonseq")))
-          (if (= 1 (string-length str))
-              (values (string-ref str 0)
-                      #f)
-              (values #f #f)))))
-
-  (def/public (map-function [string? keys]
-                            [string? fname])
-    (if (string=? keys "")
-        (error (method-name 'keymap% 'map-function)
-               "bad key string: ~e"
-               keys)
-        (let loop ([seq (regexp-split #rx";" keys)]
-                   [prev-key #f])
-          (let ([str (car seq)])
-            (define (bad-string msg)
-              (error (method-name 'keymap% 'map-function)
-                     "bad keymap string: ~e~a: ~a"
-                     str
-                     (if (equal? str keys)
-                         ""
-                         (format " within ~e" keys))
-                     msg))
-            (let-values ([(str default-off?)
-                          (if (regexp-match? #rx"^:" str)
-                              (values (substring str 1) #t)
-                              (values str #f))])
-              (let sloop ([str str]
-                          [downs null]
-                          [ups null]
-                          [others? #f])
-                (cond
-                 [(regexp-match? #rx"^[?]:" str)
-                  (sloop (substring str 2) downs ups #t)]
-                 [(regexp-match? #rx"^~[SsCcAaMmDdLlGg]:" str)
-                  (let ([c (char-downcase (string-ref str 1))])
-                    (if (memv c downs)
-                        (bad-string (format "inconsistent ~a: modifier state" c))
-                        (sloop (substring str 3) downs (cons c ups) others?)))]
-                 [(regexp-match? #rx"^[SsCcAaMmDdLlGg]:" str)
-                  (let ([c (char-downcase (string-ref str 0))])
-                    (if (memv c ups)
-                        (bad-string (format "inconsistent ~a: modifier state" c))
-                        (sloop (substring str 2) (cons c downs) ups others?)))]
-                 [else
-                  (let-values ([(code fullset?) (get-code str)])
-                    (if (not code)
-                        (bad-string "unrecognized key name")
-                        (let-values ([(downs code)
-                                      (if (and (char? code)
-                                               ((char->integer code) . > . 0)
-                                               ((char->integer code) . < . 127)
-                                               (char-alphabetic? code))
-                                          (cond
-                                           [(memq #\s downs)
-                                            (if (or (and (eq? (system-type) 'macosx)
-                                                         (not (memq #\m downs))
-                                                         (not (memq #\d downs)))
-                                                    (and (eq? (system-type) 'windows)
-                                                         (or (not (memq #\c downs))
-                                                             (memq #\m downs))))
-                                                (values downs (char-upcase code))
-                                                (values downs code))]
-                                           [(char-upper-case? code)
-                                            (values (cons #\s downs) code)]
-                                           [else
-                                            (values downs code)])
-                                          (values downs code))])
-                          (let ([newkey
-                                 (let ([modval (lambda (c [default-off? default-off?])
-                                                 (cond
-                                                  [(memq c downs) 1]
-                                                  [(memq c ups) -1]
-                                                  [else (if default-off? -1 0)]))])
-                                   (do-map-function code
-                                                    (modval #\s)
-                                                    (modval #\c)
-                                                    (modval #\a)
-                                                    (modval #\m)
-                                                    (modval #\d)
-                                                    (modval #\l #f)
-                                                    (modval #\g #f)
-                                                    others?
-                                                    fname
-                                                    prev-key
-                                                    (not (null? (cdr seq)))
-                                                    fullset?))])
-                            (if (null? (cdr seq))
-                                (void)
-                                (loop (cdr seq) newkey))))))])))))))
-
-  (define/private (handle-event code other-code alt-code other-alt-code caps-code
-                                shift? ctrl? alt? meta? cmd? caps? altgr?
-                                score)
-    (let-values ([(key found-score)
-                  (find-key code other-code alt-code other-alt-code caps-code
-                            shift? ctrl? alt? meta? cmd? caps? altgr? prefix)])
-      (set! prefix #f)
-
-      (if (and key (found-score . >= . score))
-          (if (key-isprefix? key)
-              (begin
-                (set! prefix key)
-                (values #t #f #f))
-              (values #t
-                      (key-fname key)
-                      (key-fullset? key)))
-          (values #f #f #f))))
-
-  (define/public (get-best-score code other-code alt-code other-alt-code caps-code
-                                 shift? ctrl? alt? meta? cmd? caps? altgr?)
-    (let-values ([(key score)
-                  (find-key code other-code alt-code other-alt-code caps-code
-                            shift? ctrl? alt? meta? cmd? caps? altgr? prefix)])
-      (for/fold ([s (if key score -1)])
-          ([c (in-list chain-to)])
-        (max s
-             (send c get-best-score code other-code alt-code other-alt-code caps-code
-                   shift? ctrl? alt? meta? cmd? caps? altgr?)))))
-
-  (def/public (set-grab-key-function [(make-procedure 4) grab])
-    (set! grab-key-function grab))
-  
-  (def/public (remove-grab-key-function)
-    (set! grab-key-function #f))
-
-  (def/public (handle-key-event [any? obj] [key-event% event])
-    (let ([code (send event get-key-code)])
-      (if (or (eq? code 'shift)
-              (eq? code 'rshift)
-              (eq? code 'control)
-              (eq? code 'rcontrol)
-              (eq? code 'release))
-          (or prefixed?
-              (chain-check-grab obj event))
-          (let ([score (get-best-score 
-                        code
-                        (send event get-other-shift-key-code)
-                        (send event get-other-altgr-key-code)
-                        (send event get-other-shift-altgr-key-code)
-                        (send event get-other-caps-key-code)
-                        (send event get-shift-down)
-                        (send event get-control-down)
-                        (send event get-alt-down)
-                        (as-meta-key (send event get-meta-down))
-                        (as-cmd-key (send event get-meta-down))
-                        (send event get-caps-down)
-                        (send event get-control+meta-is-altgr))])
-            (let ([was-prefixed? prefixed?])
-              
-              (let* ([r (chain-handle-key-event obj event #f prefixed? score)]
-                     [r (if (and (zero? r)
-                                 was-prefixed?)
-                            (begin
-                              (reset)
-                              ;; try again without prefix:
-                              (chain-handle-key-event obj event #f #f score))
-                            r)])
-                (when (r . >= . 0)
-                  (reset))
-                (not (zero? r))))))))
-
-  (define/private (other-handle-key-event obj event grab try-prefixed? score)
-    (for/fold ([r 0])
-        ([c (in-list chain-to)]
-         #:when (r . <= . 0))
-      (let ([r2 (send c chain-handle-key-event obj event grab try-prefixed? score)])
-        (if (r2 . > . 0)
-            (begin
-              (reset)
-              r2)
-            (if (r2 . < . 0)
-                r2
-                r)))))
-
-  (define/public (chain-handle-key-event obj event grab only-prefixed? score)
-    ;; results: 0 = no match, 1 = match, -1 = matched prefix
-    (set! last-time (send event get-time-stamp))
-    (set! last-button #f)
-    (let ([grab (or grab-key-function
-                    grab)])
-      (if (and only-prefixed? (not prefixed?))
-          0
-          (let ([sub-result (other-handle-key-event obj event grab only-prefixed? score)])
-            (if (sub-result . > . 0)
-                sub-result
-                (let-values ([(h? fname fullset?)
-                              (handle-event (send event get-key-code)
-                                            (send event get-other-shift-key-code)
-                                            (send event get-other-altgr-key-code)
-                                            (send event get-other-shift-altgr-key-code)
-                                            (send event get-other-caps-key-code)
-                                            (send event get-shift-down)
-                                            (send event get-control-down)
-                                            (send event get-alt-down)
-                                            (as-meta-key (send event get-meta-down))
-                                            (as-cmd-key (send event get-meta-down))
-                                            (send event get-caps-down)
-                                            (send event get-control+meta-is-altgr)
-                                            score)])
-                  (if h?
-                      (if fname
-                          (begin
-                            (reset)
-                            (if (and grab
-                                     (grab fname this obj event))
-                                1
-                                (if (call-function fname obj event)
-                                    1
-                                    0)))
-                          (if prefix
-                              (begin
-                                (set! prefixed? #t)
-                                -1)
-                              ;; shouldn't get here
-                              0))
-                      (let ([result
-                             (if (sub-result . < . 0)
-                                 (begin
-                                   (set! prefixed? #t)
-                                   -1)
-                                 0)])
-                        (if (and (zero? result)
-                                 grab-key-function
-                                 (grab-key-function #f this obj event))
-                            1
-                            result)))))))))
-
-  (define/public (chain-check-grab obj event)
-    (or (and grab-key-function #t)
-        (for/or ([c (in-list chain-to)])
-          (send c chain-check-grab obj event))))
-
-  (def/public (set-grab-mouse-function [(make-procedure 4) grab])
-    (set! grab-mouse-function grab))
-
-  (def/public (remove-grab-mouse-function)
-    (set! grab-mouse-function #f))
-
-  (define/private (adjust-button-code code click-count)
-    (case click-count
-      [(0) code]
-      [(1) (case code
-             [(mouse-right) 'mouse-right-double]
-             [(mouse-left) 'mouse-left-double]
-             [(mouse-middle) 'mouse-middle-double])]
-      [else (case code
-              [(mouse-right) 'mouse-right-triple]
-              [(mouse-left) 'mouse-left-triple]
-              [(mouse-middle) 'mouse-middle-triple])]))
-
-  (def/public (handle-mouse-event [any? obj][mouse-event% event])
-    (let ([score (get-best-mouse-score event)])
-      (not (zero? (chain-handle-mouse-event obj event #f 0 score)))))
-
-  (define/public (get-best-mouse-score event)
-    (cond
-     [(not (send event button-down?))
-      (if active-mouse-function
-          100
-          (or (ormap (lambda (c)
-                       (and (not (zero? (send c get-best-mouse-score event)))
-                            100))
-                     chain-to)
-              -1))]
-     [else
-      (let ([code (cond
-                   [(send event get-right-down) 'mouse-right]
-                   [(send event get-left-down) 'mouse-left]
-                   [(send event get-middle-down) 'mouse-middle]
-                   [else #f])])
-        (if (not code)
-            -1
-            (let ([code
-                   (if (and (eq? code last-button)
-                            (= (send event get-x) last-x)
-                            (= (send event get-y) last-y)
-                            ((abs (- (send event get-time-stamp) last-time)) . < . double-interval))
-                       (adjust-button-code code click-count)
-                       code)])
-              (get-best-score code #f #f #f #f
-                              (send event get-shift-down)
-                              (send event get-control-down)
-                              (send event get-alt-down)
-                              (as-meta-key (send event get-meta-down))
-                              (as-cmd-key (send event get-meta-down))
-                              (send event get-caps-down)
-			      #f))))]))
-
-  (define/private (other-handle-mouse-event obj event grab try-state score)
-    (for/fold ([result 0])
-        ([c (in-list chain-to)]
-         #:when (result . <= . 0))
-      (let ([r (send c chain-handle-mouse-event obj event grab try-state score)])
-        (cond
-         [(r . > . 0)
-          (reset)
-          r]
-         [(zero? r) result]
-         [else r]))))
-
-  (define/public (chain-handle-mouse-event obj event grab try-state score)
-    (let ([grab (or grab-mouse-function grab)])
-      (define (step1)
-        (cond
-         [(and (not prefix)
-               (try-state . >= . 0))
-          (let ([r (other-handle-mouse-event obj event grab 1 score)])
-            (cond
-             [(r . > . 0) r]
-             [(try-state . > . 0) r]
-             [else (step2 -1)]))]
-         [(and prefix (try-state . < . 0))
-          (other-handle-mouse-event obj event grab -1 score)]
-         [else (step2 try-state)]))
-      (define (step2 try-state)
-        (cond
-         [(not (send event button-down?))
-          (when (and (not (send event dragging?))
-                     (not (send event button-up?)))
-            ;; we must have missed the button-up
-            (set! active-mouse-function #f))
-          (if (not active-mouse-function)
-              (other-handle-mouse-event obj event grab -1 score)
-              (let ([v (if (and grab 
-                                (grab active-mouse-function this obj event))
-                           1
-                           (if (call-function active-mouse-function obj event)
-                               1
-                               0))])
-                (when (send event button-up?)
-                  (set! active-mouse-function #f))
-                v))]
-         [else
-          (let ([code (cond
-                       [(send event get-right-down) 'mouse-right]
-                       [(send event get-left-down) 'mouse-left]
-                       [(send event get-middle-down) 'mouse-middle]
-                       [else #f])])
-            (if (not code)
-                0 ;; FIXME: should we call grab here?
-                (let ([orig-code code]
-                      [code
-                       (if (and (eq? code last-button)
-                                (= (send event get-x) last-x)
-                                (= (send event get-y) last-y))
-                           (if ((abs (- (send event get-time-stamp) last-time)) . < . double-interval)
-                               (begin0
-                                (adjust-button-code code click-count)
-                                (set! click-count (add1 click-count)))
-                               (begin
-                                 (set! click-count 1)
-                                 code))
-                           (begin
-                             (set! last-button code)
-                             (set! click-count 1)
-                             code))])
-                  (set! last-time (send event get-time-stamp))
-                  (set! last-x (send event get-x))
-                  (set! last-y (send event get-y))
-
-                  (let loop ([code code])
-                    (let-values ([(h? fname fullset?) (handle-event code
-                                                                    #f #f #f #f
-                                                                    (send event get-shift-down)
-                                                                    (send event get-control-down)
-                                                                    (send event get-alt-down)
-                                                                    (as-meta-key (send event get-meta-down))
-                                                                    (as-cmd-key (send event get-meta-down))
-                                                                    (send event get-caps-down)
-                                                                    #f
-                                                                    score)])
-                      (cond
-                       [(and h? fname)
-                        (reset)
-                        (when fullset?
-                          (set! active-mouse-function fname))
-                        (cond
-                         [(and grab (grab fname this obj event)) 1]
-                         [(call-function fname obj event) 1]
-                         [else 0])]
-                       [h?
-                        (let ([r (other-handle-mouse-event obj event grab try-state score)])
-                          (if (r . > . 0)
-                              r
-                              -1))]
-                       [else
-                        (set! last-code code)
-                        (if (not (eqv? last-code orig-code))
-                            (loop orig-code)
-                            (let ([result (other-handle-mouse-event obj event grab try-state score)])
-                              (if (and (zero? result)
-                                       grab-mouse-function
-                                       (grab-mouse-function #f this obj event))
-                                  1
-                                  result)))]))))))]))
-      (step1)))
-
-  (def/public (add-function [string? name] [(make-procedure 2) f])
-    (hash-set! functions
-               (string->immutable-string name)
-               f))
-
-  (def/public (call-function [string? name] [any? obj] [event% event] [any? [try-chained? #f]])
-    (let ([f (hash-ref functions name #f)])
-      (cond
-       [f 
-        (f obj event)
-        #t]
-       [try-chained?
-        (ormap (lambda (c)
-                 (send c call-function name obj event #t))
-               chain-to)]
-       [else
-        (error 'keymap "no function ~e" name)])))
-  
-  (def/public (is-function-added? [string? name])
-    (and (hash-ref functions name #f) #t))
-
-  (def/public (get-double-click-interval)
-    double-interval)
-
-  (def/public (set-double-click-interval [exact-positive-integer? d])
-    (set! double-interval d))
-
-  (define/public (cycle-check km)
-    (ormap (lambda (c)
-             (or (eq? km c)
-                 (send c cycle-check km)))
-           chain-to))
-
-  (def/public (chain-to-keymap [keymap% km] [any? prefix?])
-    (unless (or (eq? km this)
-                (cycle-check km)
-                (send km cycle-check this))
-      (set! chain-to (if prefix?
-                         (cons km chain-to)
-                         (append chain-to (list km))))))
-
-  (def/public (remove-chained-keymap [keymap% km])
-    (set! chain-to (remq km chain-to))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/mline.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/mline.rkt
deleted file mode 100644
index a1f72a4db7..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/mline.rkt
+++ /dev/null
@@ -1,1263 +0,0 @@
-#lang racket/base
-(require racket/class
-         "../syntax.rkt"
-         "const.rkt"
-         racket/snip/private/snip
-         racket/snip/private/snip-flags
-         "private.rkt"
-         racket/snip/private/private)
-
-(provide create-mline
-         (struct-out mline)
-         (struct-out paragraph)
-         mline-next
-         mline-prev
-         (prefix-out
-          mline-
-          (for-meta
-           0
-           NIL
-           clone-paragraph
-           get-line-max-width
-           adjust-offsets
-           deadjust-offsets
-           move-parent!
-           rotate-left
-           rotate-right
-           insert
-           delete
-           find-line
-           find-position
-           find-scroll
-           find-location
-           find-paragraph
-           get-line
-           get-position
-           get-scroll
-           get-location
-           get-paragraph
-           get-paragraph-style
-           set-length
-           set-scroll-length
-           set-height
-           calc-line-length
-           adjust-line-length
-           set-starts-paragraph
-           starts-paragraph
-           adjust-max-width
-           set-width
-           scroll-offset
-           find-extra-scroll
-           mark-recalculate
-           adjust-need-calc
-           mark-check-flow
-           adjust-need-flow
-           update-flow
-           update-graphics
-           get-root
-           check-consistent
-           first
-           last
-           get-left-location
-           get-right-location
-           number)))
-
-(define RED #x1)
-(define BLACK #x2)
-(define MAX-W-HERE #x4)
-(define MAX-W-LEFT #x8)
-(define MAX-W-RIGHT #x10)
-(define CALC-HERE #x20)
-(define CALC-LEFT #x40)
-(define CALC-RIGHT #x80)
-(define FLOW-HERE #x100)
-(define FLOW-LEFT #x200)
-(define FLOW-RIGHT #x400)
-(define STARTS-PARA #x800)
-
-(define MAX-W-MASK (bitwise-ior MAX-W-HERE MAX-W-LEFT MAX-W-RIGHT))
-(define COLOR-MASK (bitwise-ior RED BLACK))
-(define CALC-MASK (bitwise-ior CALC-HERE CALC-LEFT CALC-RIGHT))
-(define FLOW-MASK (bitwise-ior FLOW-HERE FLOW-LEFT FLOW-RIGHT))
-
-(define-struct mline (prev next parent left right
-
-                           flags paragraph
-                           
-                           ;; relative values:
-                           line pos scroll parno y
-                           
-                           max-width
-
-                           snip last-snip scroll-snip
-                           
-                           len numscrolls
-                           last-h last-w ;; height/width of last snip in line
-                           h w ;; height/width of line
-                           bottombase topbase ;; bottom baseline, top baseline (relative)
-                           )
-  #:mutable #:transparent)
-
-(define NIL #f)
-
-(define (create-mline)
-  (make-mline #f #f NIL NIL NIL
-              (bitwise-ior BLACK MAX-W-HERE CALC-HERE) #f
-              0 0 0 0 0.0
-              0.0
-              #f #f #f
-              0 1
-              0.0 0.0
-              0.0 0.0
-              0.0 0.0))
-
-(set! NIL (create-mline))
-(set-mline-parent! NIL NIL)
-(set-mline-left! NIL NIL)
-(set-mline-right! NIL NIL)
-
-(define (mline-destroy! m)
-  ;; Doesn't need to to anything, but this may be helpful for debugging
-  (begin
-    (set-mline-prev! m 'BAD)
-    (set-mline-parent! m 'BAD)
-    (set-mline-left! m 'BAD)
-    (set-mline-right! m 'BAD)
-    (set-mline-flags! m 'BAD)
-    (set-mline-paragraph! m 'BAD)
-    (set-mline-line! m 'BAD)
-    (set-mline-pos! m 'BAD)
-    (set-mline-scroll! m 'BAD)
-    (set-mline-parno! m 'BAD)
-    (set-mline-y! m 'BAD)
-    (set-mline-max-width! m 'BAD)
-    (set-mline-snip! m 'BAD)
-    (set-mline-last-snip! m 'BAD)
-    (set-mline-scroll-snip! m 'BAD)
-    (set-mline-len! m 'BAD)
-    (set-mline-numscrolls! m 'BAD)
-    (set-mline-last-h! m 'BAD)
-    (set-mline-last-w! m 'BAD)
-    (set-mline-h! m 'BAD)
-    (set-mline-w! m 'BAD)
-    (set-mline-bottombase! m 'BAD)
-    (set-mline-topbase! m 'BAD))
-  (void))
-
-(define (set-red! mline)
-  (set-mline-flags! mline (bitwise-ior RED (bitwise-and (mline-flags mline) 
-                                                        (bitwise-not COLOR-MASK)))))
-(define (set-black! mline)
-  (set-mline-flags! mline (bitwise-ior BLACK (bitwise-and (mline-flags mline) 
-                                                          (bitwise-not COLOR-MASK)))))
-
-(define (bit-overlap? a b)
-  (not (zero? (bitwise-and a b))))
-
-(define (red? mline)
-  (bit-overlap? (mline-flags mline) RED))
-(define (black? mline)
-  (bit-overlap? (mline-flags mline) BLACK))
-
-(define (starts-paragraph mline)
-  (if (bit-overlap? STARTS-PARA (mline-flags mline))
-      1
-      0))
-
-;; ----------------------------------------
-
-(define-struct paragraph (left-margin-first
-                          left-margin
-                          right-margin
-                          alignment)
-  #:mutable)
-
-(define plain-paragraph (make-paragraph 0.0 0.0 0.0 'left))
-
-(define (clone-paragraph p)
-  (make-paragraph (paragraph-left-margin-first p)
-                  (paragraph-left-margin p)
-                  (paragraph-right-margin p)
-                  (paragraph-alignment p)))
-
-(define (get-line-max-width p max-width first?)
-  (if (max-width . <= . 0)
-      max-width
-      (max 1
-           (- max-width
-              (if first?
-                  (paragraph-left-margin-first p)
-                  (paragraph-left-margin p))
-              (paragraph-right-margin p)))))
-
-;; ----------------------------------------
-
-(define (adjust-offsets mline newchild)
-  (unless (eq? newchild NIL)
-    ;; Adjust relative values:
-    (set-mline-line! newchild (- (mline-line newchild) (+ (mline-line mline) 1)))
-    (set-mline-pos! newchild (- (mline-pos newchild) (+ (mline-pos mline) (mline-len mline))))
-    (set-mline-scroll! newchild (- (mline-scroll newchild) (+ (mline-scroll mline) (mline-numscrolls mline))))
-    (set-mline-y! newchild (- (mline-y newchild) (+ (mline-y mline) (mline-h mline))))
-    (set-mline-parno! newchild (- (mline-parno newchild) (+ (mline-parno mline) (starts-paragraph mline))))))
-
-(define (deadjust-offsets mline oldchild)
-  (unless (eq? oldchild NIL)
-    ;; Adjust relative values:
-    (set-mline-line! oldchild (+ (mline-line oldchild) (+ (mline-line mline) 1)))
-    (set-mline-pos! oldchild (+ (mline-pos oldchild) (+ (mline-pos mline) (mline-len mline))))
-    (set-mline-scroll! oldchild (+ (mline-scroll oldchild) (+ (mline-scroll mline) (mline-numscrolls mline))))
-    (set-mline-y! oldchild (+ (mline-y oldchild) (+ (mline-y mline) (mline-h mline))))
-    (set-mline-parno! oldchild (+ (mline-parno oldchild) (+ (mline-parno mline) (starts-paragraph mline))))))
-
-(define (move-parent! v x root-box)
-  ;; replace v with x
-  (let ([parent (mline-parent v)])
-    (set-mline-parent! x parent) ; x can be NIL!
-    (cond
-     [(eq? parent NIL)
-      (set-box! root-box x)]
-     [(eq? v (mline-left parent))
-      (set-mline-left! parent x)]
-     [else
-      (set-mline-right! parent x)])))
-
-(define (rotate-left mline root-box)
-  (let ([oldright (mline-right mline)])
-    (deadjust-offsets mline oldright)
-  
-    (let ([right (mline-left oldright)])
-      (set-mline-right! mline right)
-      (unless (eq? right NIL)
-        (set-mline-parent! right mline)))
-    
-    (move-parent! mline oldright root-box)
-
-    (set-mline-left! oldright mline)
-    (set-mline-parent! mline oldright)
-
-    (adjust-max-width mline)
-    (adjust-need-calc mline)
-    (adjust-need-flow mline)
-    (adjust-max-width oldright)
-    (adjust-need-calc oldright)
-    (adjust-need-flow oldright)))
-
-(define (rotate-right mline root-box)
-  (let ([oldleft (mline-left mline)])
-    (adjust-offsets oldleft mline)
-  
-    (let ([left (mline-right oldleft)])
-      (set-mline-left! mline left)
-      (unless (eq? left NIL)
-        (set-mline-parent! left mline)))
-    
-    (move-parent! mline oldleft root-box)
-
-    (set-mline-right! oldleft mline)
-    (set-mline-parent! mline oldleft)
-
-    (adjust-max-width mline)
-    (adjust-need-calc mline)
-    (adjust-need-flow mline)
-    (adjust-max-width oldleft)
-    (adjust-need-calc oldleft)
-    (adjust-need-flow oldleft)))
-
-(define (insert mline root-box before?)
-  (let ([newline (create-mline)])
-    (if (eq? (unbox root-box) NIL)
-        (begin
-          (set-box! root-box newline)
-          newline)
-        (begin
-          (set-red! newline)
-
-          (if before?
-              (let ([prev (mline-prev mline)])
-                (set-mline-prev! newline prev)
-                (when prev
-                  (set-mline-next! prev newline))
-                (set-mline-next! newline mline)
-                (set-mline-prev! mline newline))
-              (let ([next (mline-next mline)])
-                (set-mline-prev! newline mline)
-                (set-mline-next! newline next)
-                (when next
-                  (set-mline-prev! next newline))
-                (set-mline-next! mline newline)))
-
-          (let ([node
-                 (if before?
-                     (let ([left (mline-left mline)])
-                       (if (eq? left NIL)
-                           (begin
-                             (set-mline-left! mline newline)
-                             mline)
-                           (let loop ([node left])
-                             (let ([right (mline-right node)])
-                               (if (not (eq? right NIL))
-                                   (loop right)
-                                   (begin
-                                     (set-mline-right! node newline)
-                                     node))))))
-                     (let ([right (mline-right mline)])
-                       (if (eq? right NIL)
-                           (begin
-                             (set-mline-right! mline newline)
-                             mline)
-                           (let loop ([node right])
-                             (let ([left (mline-left node)])
-                               (if (not (eq? left NIL))
-                                   (loop left)
-                                   (begin
-                                     (set-mline-left! node newline)
-                                     node)))))))])
-            (set-mline-parent! newline node)
-            (adjust-need-calc node #t))
-
-          (let loop ([node newline])
-            (let ([parent (mline-parent node)])
-              (unless (eq? parent NIL)
-                (when (eq? node (mline-left parent))
-                  (deadjust-offsets newline parent))
-                (loop parent))))
-
-          (let loop ([node newline])
-            (when (and (not (eq? node (unbox root-box)))
-                       (red? (mline-parent node)))
-              (let ([parent (mline-parent node)])
-                (if (eq? parent (mline-left (mline-parent parent)))
-                    (let ([v (mline-right (mline-parent parent))])
-                      (if (red? v)
-                          (begin
-                            (set-black! parent)
-                            (set-black! v)
-                            (let ([node (mline-parent parent)])
-                              (set-red! node)
-                              (loop node)))
-                          (let* ([node (if (eq? node (mline-right parent))
-                                           (begin
-                                             (rotate-left parent root-box)
-                                             parent)
-                                           node)]
-                                 [parent (mline-parent node)])
-                            (set-black! parent)
-                            (let ([node (mline-parent parent)])
-                              (set-red! node)
-                              (rotate-right node root-box)
-                              (loop node)))))
-                    (let ([v (mline-left (mline-parent parent))])
-                      (if (red? v)
-                          (begin
-                            (set-black! parent)
-                            (set-black! v)
-                            (let ([node (mline-parent parent)])
-                              (set-red! node)
-                              (loop node)))
-                          (let* ([node (if (eq? node (mline-left parent))
-                                           (begin
-                                             (rotate-right parent root-box)
-                                             parent)
-                                           node)]
-                                 [parent (mline-parent node)])
-                            (set-black! parent)
-                            (let ([node (mline-parent parent)])
-                              (set-red! node)
-                              (rotate-left node root-box)
-                              (loop node)))))))))
-
-          (set-black! (unbox root-box))
-
-          newline))))
-
-(define (delete mline root-box)
-
-  ;; adjust ancestor offsets
-  (let ([len (mline-len mline)]
-        [numscrolls (mline-numscrolls mline)]
-        [h (mline-h mline)])
-    (let loop ([v mline])
-      (let ([parent (mline-parent v)])
-        (unless (eq? parent NIL)
-          (if (eq? v (mline-right parent))
-              (loop parent)
-              (let ([v parent])
-                (set-mline-line! v (- (mline-line v) 1))
-                (set-mline-pos! v (- (mline-pos v) len))
-                (set-mline-scroll! v (- (mline-scroll v) numscrolls))
-                (set-mline-y! v (- (mline-y v) h))
-                (set-mline-parno! v (- (mline-parno v) (starts-paragraph mline)))
-                (loop v)))))))
-
-  (let ([v (if (or (eq? (mline-left mline) NIL)
-                   (eq? (mline-right mline) NIL))
-               mline
-               (let ([v (mline-next mline)])
-                 (let loop ([x v])
-                   (unless (eq? mline (mline-parent x))
-                     (let ([parent (mline-parent x)])
-                       (if (eq? x (mline-right parent))
-                           (loop parent)
-                           (let ([x parent])
-                             (set-mline-line! x (- (mline-line x) 1))
-                             (set-mline-pos! x (- (mline-pos x) (mline-len v)))
-                             (set-mline-scroll! x (- (mline-scroll x) (mline-numscrolls v)))
-                             (set-mline-y! x (- (mline-y x) (mline-h v)))
-                             (set-mline-parno! x (- (mline-parno x) (starts-paragraph v)))
-                             (loop x))))))
-                 v))])
-
-    (let ([x (if (eq? (mline-left v) NIL)
-                 (mline-right v)
-                 (mline-left v))])
-      (move-parent! v x root-box)
-
-      (let ([was-black? (black? v)])
-        
-        (if (not (eq? v mline))
-            (let ([oldparent (mline-parent v)])
-              (if (black? mline)
-                  (set-black! v)
-                  (set-red! v))
-              
-              (let ([left (mline-left mline)])
-                (set-mline-left! v left)
-                (unless (eq? left NIL)
-                  (set-mline-parent! left v)))
-              (let ([right (mline-right mline)])
-                (set-mline-right! v right)
-                (unless (eq? right NIL)
-                  (set-mline-parent! right v)))
-              (move-parent! mline v root-box)
-              (let ([prev (mline-prev mline)])
-                (set-mline-prev! v prev)
-                (when prev
-                  (set-mline-next! prev v)))
-
-              (set-mline-line! v (mline-line mline))
-              (set-mline-pos! v (mline-pos mline))
-              (set-mline-scroll! v (mline-scroll mline))
-              (set-mline-y! v (mline-y mline))
-              (set-mline-parno! v (mline-parno mline))
-
-              (adjust-max-width oldparent #t)
-              (adjust-need-calc oldparent #t)
-              (adjust-need-flow oldparent #t)
-              
-              (adjust-max-width v #t)
-              (adjust-need-calc v #t)
-              (adjust-need-flow v #t)
-
-              (when (eq? (mline-parent x) mline)
-                (set-mline-parent! x v)))
-            (begin
-              (let ([prev (mline-prev mline)]
-                    [next (mline-next mline)])
-                (when prev
-                  (set-mline-next! prev next))
-                (when next
-                  (set-mline-prev! next prev)))))
-
-        (when was-black?
-          ;; fixup 
-          (let loop ([x x])
-            (if (and (not (eq? x (unbox root-box)))
-                     (black? x))
-                (let ([parent (mline-parent x)])
-                  (if (eq? x (mline-left parent))
-                      (let* ([z (mline-right parent)]
-                             [z (if (red? z)
-                                    (begin
-                                      (set-black! z)
-                                      (set-red! parent)
-                                      (rotate-left parent root-box)
-                                      (mline-right (mline-parent x)))
-                                    z)]
-                             [x (if (and (black? (mline-left z))
-                                         (black? (mline-right z)))
-                                    (begin
-                                      (set-red! z)
-                                      (mline-parent x))
-                                    (let ([z (if (black? (mline-right z))
-                                                 (begin
-                                                   (set-black! (mline-left z))
-                                                   (set-red! z)
-                                                   (rotate-right z root-box)
-                                                   (mline-right (mline-parent x)))
-                                                 z)])
-                                      (if (red? (mline-parent x))
-                                          (set-red! z)
-                                          (set-black! z))
-                                      (set-black! (mline-parent x))
-                                      (set-black! (mline-right z))
-                                      (rotate-left (mline-parent x) root-box)
-                                      (unbox root-box)))])
-                        (loop x))
-                      (let* ([z (mline-left parent)]
-                             [z (if (red? z)
-                                    (begin
-                                      (set-black! z)
-                                      (set-red! parent)
-                                      (rotate-right parent root-box)
-                                      (mline-left (mline-parent x)))
-                                    z)]
-                             [x (if (and (black? (mline-right z))
-                                         (black? (mline-left z)))
-                                    (begin
-                                      (set-red! z)
-                                      (mline-parent x))
-                                    (let ([z (if (black? (mline-left z))
-                                                 (begin
-                                                   (set-black! (mline-right z))
-                                                   (set-red! z)
-                                                   (rotate-left z root-box)
-                                                   (mline-left (mline-parent x)))
-                                                 z)])
-                                      (if (red? (mline-parent x))
-                                          (set-red! z)
-                                          (set-black! z))
-                                      (set-black! (mline-parent x))
-                                      (set-black! (mline-left z))
-                                      (rotate-right (mline-parent x) root-box)
-                                      (unbox root-box)))])
-                        (loop x))))
-                (set-black! x)))))))
-
-  ;; In case we set the parent of NIL:
-  (set-mline-parent! NIL NIL)
-
-  (mline-destroy! mline))
-
-;; ----------------------------------------
-
-(define (search mline v v-sel size-sel)
-  (let loop ([v v][node mline][prev #f])
-    (if (not (eq? node NIL))
-        (let ([v2 (v-sel node)]
-              [size (size-sel node)])
-          (cond
-           [(v . < . v2)
-            (loop v (mline-left node) node)]
-           [(v . >= . (+ v2 size))
-            (loop (- v (+ v2 size))
-                  (mline-right node) node)]
-           [else node]))
-        prev)))
-
- (define (find-line mline line)
-  (search mline line mline-line (lambda (mline) 1)))
-
-(define (find-position mline pos)
-  (search mline pos mline-pos mline-len))
-
-(define (find-scroll mline scroll)
-  (search mline scroll mline-scroll mline-numscrolls))
-
-(define (find-location mline y)
-  (search mline y mline-y mline-h))
-
-(define (find-paragraph mline parno)
-  (search mline parno mline-parno starts-paragraph))
-
-;; ----------------------------------------
-
-(define (sum mline v-sel size-sel)
-  (let loop ([node mline][v (v-sel mline)])
-    (let ([parent (mline-parent node)])
-      (if (not (eq? parent NIL))
-          (if (eq? node (mline-left parent))
-              (loop parent v)
-              (loop parent (+ v (v-sel parent) (size-sel parent))))
-          v))))
-
-(define (get-line mline)
-  (sum mline mline-line (lambda (mline) 1)))
-
-(define (get-position mline)
-  (sum mline mline-pos mline-len))
-
-(define (get-scroll mline)
-  (sum mline mline-scroll mline-numscrolls))
-
-(define (get-location mline)
-  (sum mline mline-y mline-h))
-
-(define (get-paragraph mline)
-  (+ (sum mline mline-parno starts-paragraph)
-     (sub1 (starts-paragraph mline))))
-
-(define (get-paragraph-style mline [first-box #f])
-  (if (bit-overlap? (mline-flags mline) STARTS-PARA)
-      (begin
-        (when first-box (set-box! first-box #t))
-        (mline-paragraph mline))
-      (begin
-        (when first-box (set-box! first-box #f))
-        (let ([root (get-root mline)]
-              [p (get-paragraph mline)])
-          (let ([pstart (find-paragraph root p)])
-            (mline-paragraph pstart))))))
-
-;; ----------------------------------------
-
-(define (adjust mline new-val val-sel val-mut! sel mut!)
-  (define delta (- new-val (val-sel mline)))
-  (define val-changed? 
-    (cond
-      [(= (val-sel mline) new-val) #f]
-      [else
-       (val-mut! mline new-val)
-       #t]))
-  (or (let loop ([node mline])
-        (let ([parent (mline-parent node)])
-          (cond
-            [(eq? parent NIL) #f]
-            [else
-             (if (eq? node (mline-left parent))
-                 (cond
-                   [(= delta 0)
-                    (loop parent)]
-                   [else
-                    (mut! parent (+ delta (sel parent)))
-                    (loop parent)
-                    #t])
-                 (loop parent))])))
-      val-changed?))
-
-(define (set-length mline len)
-  (adjust mline
-          len mline-len set-mline-len! 
-          mline-pos set-mline-pos!))
-
-(define (set-scroll-length mline numscrolls)
-  (adjust mline
-          numscrolls mline-numscrolls set-mline-numscrolls!
-          mline-scroll set-mline-scroll!))
-
-(define (set-height mline h)
-  (adjust mline
-          h mline-h set-mline-h!
-          mline-y set-mline-y!))
-
-(define (set-paragraph-ends mline)
-  (let ([next (mline-next mline)])
-    (cond
-     [(and next
-           (has-flag? (snip->flags (mline-last-snip mline))
-                      HARD-NEWLINE))
-      (when (zero? (starts-paragraph next))
-        (set-starts-paragraph next #t))]
-     [next
-      (when (starts-paragraph next)
-        (set-starts-paragraph next #f))]))
-  
-  (let ([prev (mline-prev mline)])
-    (cond
-     [(or (not prev)
-          (has-flag? (snip->flags (mline-last-snip prev))
-                     HARD-NEWLINE))
-      (when (zero? (starts-paragraph mline))
-        (set-starts-paragraph mline #t))]
-     [(positive? (starts-paragraph mline))
-      (set-starts-paragraph mline #f)])))
-
-(define (calc-line-length mline)
-  (let ([l
-         (let ([nexts (snip->next (mline-last-snip mline))])
-           (let loop ([asnip (mline-snip mline)][l 0])
-             (if (eq? asnip nexts)
-                 l
-                 (let ([l (+ l (snip->count asnip))])
-                   (when (has-flag? (snip->flags asnip) WIDTH-DEPENDS-ON-X)
-                     (send asnip size-cache-invalid))
-                   (loop (snip->next asnip) l)))))])
-
-    (when (not (= l (mline-len mline)))
-      (set-length mline l)))
-  (set-paragraph-ends mline))
-
-;; A scalable variant of `calc-line-lengt`, but doesn't
-;; check WIDTH-DEPENDS-ON-X flags:
-(define (adjust-line-length mline delta)
-  (set-length mline (+ (mline-len mline) delta))
-  (set-paragraph-ends mline))
-
-(define (set-starts-paragraph mline starts?)
-  (unless (= (if starts? 1 0) (starts-paragraph mline))
-    (if starts?
-        (begin
-          (set-mline-flags! mline
-                            (bitwise-ior (mline-flags mline) STARTS-PARA))
-          (unless (mline-paragraph mline)
-            (set-mline-paragraph! mline plain-paragraph)))
-        (begin
-          (set-mline-flags! mline (- (mline-flags mline) STARTS-PARA))
-          (set-mline-paragraph! mline #f)))
-
-    (let loop ([node mline])
-      (let ([parent (mline-parent node)])
-        (unless (eq? parent NIL)
-          (when (eq? node (mline-left parent))
-            (set-mline-parno! parent (+ (mline-parno parent)
-                                        (if starts? 1 -1))))
-          (loop parent))))))
-
-;; ------------------------------------------------------------
-
-(define (adjust-max-width mline [recur? #f])
-  (define anything-changed? #f)
-  (unless (eq? mline NIL)
-    (let loop ([node mline])
-      (define old (bitwise-and (mline-flags node) MAX-W-MASK))
-      (define-values (new-max-width which)
-        (cond
-          [(and (not (eq? (mline-right node) NIL))
-                ((mline-max-width (mline-right node)) . > . (mline-w node))
-                (or (eq? (mline-left node) NIL)
-                    ((mline-max-width (mline-right node)) . > . (mline-max-width (mline-left node)))))
-           (values (mline-max-width (mline-right node)) MAX-W-RIGHT)]
-          [(and (not (eq? (mline-left node) NIL))
-                ((mline-max-width (mline-left node)) . > . (mline-w node)))
-           (values (mline-max-width (mline-left node)) MAX-W-LEFT)]
-          [else
-           (values (mline-w node) MAX-W-HERE)]))
-      (unless (= (mline-max-width node) new-max-width)
-        (set! anything-changed? #t)
-        (set-mline-max-width! node new-max-width))
-      (unless (= old which)
-        (set-mline-flags! node
-                          (bitwise-ior
-                           (bitwise-and (mline-flags node)
-                                        (bitwise-not MAX-W-MASK))
-                           which)))
-      (when recur?
-        (let ([parent (mline-parent node)])
-          (unless (eq? parent NIL)
-            (loop parent))))))
-  anything-changed?)
-
-(define (set-width mline w)
-  (define w-same? (= (mline-w mline) w))
-  (unless w-same? (set-mline-w! mline w))
-  (or (adjust-max-width mline #t) (not w-same?)))
-
-;; ----------------------------------------
-
-(define (scroll-offset mline p)
-  (let ([scroll-snip (mline-scroll-snip mline)])
-    (cond
-     [(not scroll-snip)
-      0.0]
-     [(p . >= . (mline-numscrolls mline))
-      (mline-h mline)]
-     [else
-      (send scroll-snip get-scroll-step-offset p)])))
-
-(define (find-extra-scroll mline y)
-  (cond
-   [(y . >= . (mline-h mline))
-    (mline-numscrolls mline)]
-   [(y . <= . 0)
-    0]
-   [else
-    (let ([scroll-snip (mline-scroll-snip mline)])
-      (if (not scroll-snip)
-          0
-          (send scroll-snip find-scroll-step y)))]))
-
-;; ----------------------------------------
-
-(define (mark-need mline HERE recur)
-  (unless (bit-overlap? (mline-flags mline) HERE)
-    (set-mline-flags! mline (bitwise-ior (mline-flags mline) HERE))
-    (let ([parent (mline-parent mline)])
-      (unless (eq? parent NIL)
-        (recur parent #t)))))
-
-(define (adjust-need-flag mline MASK HERE RIGHT LEFT recur?)
-  (let loop ([node mline])
-    (let ([old (bitwise-and (mline-flags node) MASK)])
-      (let* ([which (bitwise-and old HERE)]
-             [which (if (and (not (eq? (mline-right node) NIL))
-                             (bit-overlap? (mline-flags (mline-right node)) MASK))
-                        (bitwise-ior which RIGHT)
-                        which)]
-             [which (if (and (not (eq? (mline-left node) NIL))
-                             (bit-overlap? (mline-flags (mline-left node)) MASK))
-                        (bitwise-ior which LEFT)
-                        which)])
-        (when (not (= old which))
-          (set-mline-flags! node
-                            (bitwise-ior
-                             (bitwise-and (mline-flags node)
-                                          (bitwise-not MASK))
-                             which))
-          (when recur?
-            (let ([parent (mline-parent node)])
-              (unless (eq? parent NIL)
-                (loop parent)))))))))
-
-(define (mark-recalculate mline)
-  (mark-need mline CALC-HERE adjust-need-calc))
-
-(define (adjust-need-calc mline [recur? #f])
-  (adjust-need-flag mline CALC-MASK CALC-HERE CALC-RIGHT CALC-LEFT recur?))
-
-(define (mark-check-flow mline)
-  (mark-need mline FLOW-HERE adjust-need-flow))
-
-(define (adjust-need-flow mline [recur? #f])
-  (adjust-need-flag mline FLOW-MASK FLOW-HERE FLOW-RIGHT FLOW-LEFT recur?))
-
-;; ----------------------------------------
-
-(define (get-root mline)
-  (let ([parent (mline-parent mline)])
-    (if (not (eq? parent NIL))
-        (get-root parent)
-        mline)))
-
-;; ----------------------------------------
-
-(define (check-consistent root)
-  (unless (black? root)
-    (error "root is not black"))
-  (let ([l1 (let loop ([mline root])
-              (if (eq? mline NIL)
-                  null
-                  (begin
-                    (when (red? mline)
-                      (unless (black? (mline-left mline))
-                        (error "red left child is not black"))
-                      (unless (black? (mline-right mline))
-                        (error "red right child is not black")))
-                    (unless (or (eq? (mline-left mline) NIL)
-                                (eq? (mline-parent (mline-left mline)) mline))
-                      (error "left and up doesn't work"))
-                    (unless (or (eq? (mline-right mline) NIL)
-                                (eq? (mline-parent (mline-right mline)) mline))
-                      (error "right and up doesn't work"))
-                    (append
-                     (loop (mline-left mline))
-                     (list mline)
-                     (loop (mline-right mline))))))]
-        [l2 (let loop ([mline root])
-              (let ([prev (mline-prev mline)])
-                (if prev
-                    (begin
-                      (unless (eq? (mline-next prev) mline)
-                        (error "back doesn't go forward"))
-                      (loop prev))
-                    (let loop ([mline mline])
-                      (if mline
-                          (cons mline (loop (mline-next mline)))
-                          null)))))])
-    (unless (= (length l1) (length l2))
-      (error 'check-consistent "different lengths: ~s ~s" (length l1) (length l2)))
-    (unless (andmap eq? l1 l2)
-      (error "different elems")))
-  (let loop ([mline root])
-    (if (eq? mline NIL)
-        0
-        (let ([left (loop (mline-left mline))]
-              [right (loop (mline-right mline))])
-          (unless (= left right)
-            (error "different black counts:" left right))
-          (if (black? mline)
-              (+ 1 left)
-              left))))
-  (unless (eq? (mline-parent root) NIL)
-    (error "root has non-NIL parent"))
-  (unless (black? NIL)
-    (error "NIL is non-black"))
-  (unless (eq? NIL (mline-parent NIL))
-    (error "NIL parent changed"))
-  (unless (eq? NIL (mline-left NIL))
-    (error "NIL left changed"))
-  (unless (eq? NIL (mline-left NIL))
-    (error "NIL right changed")))
-
-#|
-
-Debugging tools:
-
-(define (draw p)
-  (for-each (lambda (l)
-              (display l)
-              (newline))
-            (paint p)))
-
-(define (paint p)
-  (if (eq? p NIL)
-      '("*")
-      (let ([l (paint (mline-left p))]
-            [r (paint (mline-right p))])
-        (let ([ll (string-length (car l))]
-              [rl (string-length (car r))]
-              [s ((if (red? p) string-upcase values) (format "~s" (mline-sym p)))])
-          (cons
-           (string-append (make-string ll #\space)
-                          s
-                          (make-string rl #\space))
-           (let loop ([l l][r r])
-             (cond
-              [(null? l) (if (null? r)
-                             null
-                             (map (lambda (r)
-                                    (string-append 
-                                     (make-string (+ ll (string-length s)) #\space)
-                                     r))
-                                  r))]
-              [(null? r) (map (lambda (l)
-                                    (string-append 
-                                     l
-                                     (make-string (+ rl (string-length s)) #\space)))
-                                  l)]
-              [else (cons (string-append (car l)
-                                         (make-string (string-length s) #\space)
-                                         (car r))
-                          (loop (cdr l) (cdr r)))])))))))
-
-(define (find? root m)
-  (or (eq? root m)
-      (if (eq? root NIL)
-          #f
-          (or (find? (mline-left root) m)
-              (find? (mline-right root) m)))))
-
-|#
-
-;; ------------------------------------------------------------
-
-(define (update-flow mline root-box media max-width dc notify-delete notify-insert)
-  (define (flow-left)
-    (if (bit-overlap? (mline-flags mline) FLOW-LEFT)
-        (if (and (not (eq? (mline-left mline) NIL))
-                 (update-flow (mline-left mline) root-box media max-width dc
-                              notify-delete notify-insert))
-            #t
-            (begin
-              (set-mline-flags! mline (- (mline-flags mline) FLOW-LEFT))
-              (flow-here)))
-        (flow-here)))
-  (define (flow-here)
-    (if (bit-overlap? (mline-flags mline) FLOW-HERE)
-        (begin
-          (set-mline-flags! mline (- (mline-flags mline) FLOW-HERE))
-          (let* ([first-line (box #f)]
-                 [para (get-paragraph-style mline first-line)]
-                 [line-max-width (get-line-max-width para max-width (unbox first-line))])
-            (assert (send media consistent-snip-lines 'pre-check-flow))
-            (if (send media check-flow line-max-width dc (get-location mline) (get-position mline) (mline-snip mline))
-                (do-flow)
-                (flow-right))))
-        (flow-right)))
-  (define (flow-right)
-    (if (bit-overlap? (mline-flags mline) FLOW-RIGHT)
-        (if (and (not (eq? (mline-right mline) NIL))
-                 (update-flow (mline-right mline) root-box media max-width dc
-                              notify-delete notify-insert))
-            #t
-            (begin
-              (set-mline-flags! mline (- (mline-flags mline) FLOW-RIGHT))
-              #f))
-        #f))
-  (define (do-flow)
-    (let loop ([asnip (mline-snip mline)])
-      (if (eq? asnip (mline-last-snip mline))
-          (begin
-            (do-extend-line mline asnip)
-            (assert (send media consistent-snip-lines 'post-do-extend-line))
-            #t)
-          (if (has-flag? (snip->flags asnip) NEWLINE)
-              (begin
-                (do-new-line asnip)
-                (assert (send media consistent-snip-lines 'post-do-new-line))
-                #t)
-              (begin
-                (set-snip-line! asnip mline)
-                (loop (snip->next asnip)))))))
-  (define (do-new-line asnip)
-    ;; items pushed to next line or new line was inserted;
-    ;; current line now ends with ansip (which used to be in the middle of the current line)
-    (let ([next (mline-next mline)])
-      (let ([nextsnip (if next
-                          (let loop ([nextsnip (snip->next asnip)])
-                            (if (and nextsnip
-                                     (not (eq? nextsnip (mline-last-snip next)))
-                                     (not (has-flag? (snip->flags nextsnip) NEWLINE)))
-                                (loop (snip->next nextsnip))
-                                nextsnip))
-                          #f)])
-        (if (or (not next)
-                (not (eq? nextsnip (mline-last-snip next))))
-            ;; it was a new line
-            (let ([newline (insert mline root-box #f)])
-              (set-mline-snip! newline (snip->next asnip))
-              (set-mline-last-snip! newline (mline-last-snip mline))
-              (set-mline-last-snip! mline asnip)
-
-              (snips-to-line! newline)
-
-              (notify-insert newline))
-            ;; some of this line pushed to next line --- or maybe multiple lines pushed
-            ;;  together into a later line
-            (begin
-              (set-mline-last-snip! mline asnip)
-              (set-snip-line! asnip mline)
-              
-              (let ([nextsnip (snip->next asnip)])
-                (set-mline-snip! next nextsnip)
-                (do-extend-line next nextsnip))))
-
-        (calc-line-length mline)
-        (mark-recalculate mline))))
-  (define (snips-to-line! next)
-    (let ([nextsnip (snip->next (mline-last-snip next))])
-      (let loop ([asnip (mline-snip next)])
-        (unless (eq? asnip nextsnip)
-          (set-snip-line! asnip next)
-          (loop (snip->next asnip)))))
-    (mark-check-flow next)
-    (mark-recalculate next)
-    (calc-line-length next))
-  (define (maybe-delete-line! asnip mline)
-    (if (and (mline-next mline)
-             (eq? asnip (mline-last-snip (mline-next mline))))
-        ;; a line was deleted
-        (let ([next (mline-next mline)])
-          (delete next root-box) 
-          (notify-delete next)
-          #t)
-        #f))
-  (define (do-extend-line mline asnip)
-    ;; this line was extended
-    (let ([asnip
-           (if asnip
-               (let loop ([asnip asnip])
-                 (if (and (snip->next asnip)
-                          (not (has-flag? (snip->flags asnip) NEWLINE)))
-                     (begin
-                       (set-snip-line! asnip mline)
-                       (maybe-delete-line! asnip mline)
-                       (loop (snip->next asnip)))
-                     (begin
-                       (maybe-delete-line! asnip mline)
-                       (set-mline-last-snip! mline asnip)
-                       asnip)))
-               (begin
-                 (set-mline-last-snip! mline (send media get-s-last-snip))
-                 (let loop ()
-                   (let ([next (mline-next mline)])
-                     (when next
-                       (delete next root-box)
-                       (notify-delete delete)
-                       (loop))))
-                 #f))])
-
-      (set-snip-line! (mline-last-snip mline) mline)
-
-      (when (mline-next mline)
-        (let ([asnip (snip->next asnip)]
-              [next (mline-next mline)])
-          (when (or (not (eq? (mline-snip next) asnip))
-                    (not (has-flag? (snip->flags (mline-last-snip next)) NEWLINE)))
-            ;; Effect can propagate to more lines, merging the
-            ;; next several. (Handle prefixing the remains of the source of
-            ;; the extension to this line onto the next line. Implemented
-            ;; as the next line eating the next->next line.) 
-            (set-mline-snip! next asnip)
-            (let ([asnip
-                   (let loop ([asnip asnip])
-                     (if (and (snip->next asnip)
-                              (not (has-flag? (snip->flags asnip) NEWLINE)))
-                         (begin
-                           (maybe-delete-line! asnip next)
-                           (set-snip-line! asnip next)
-                           (loop (snip->next asnip)))
-                         asnip))])
-              (set-snip-line! asnip next)
-              (set-mline-last-snip! next asnip)
-              (when (mline-next next)
-                (unless (maybe-delete-line! asnip next)
-                  (set-mline-snip! (mline-next next) (snip->next asnip))))
-              (calc-line-length next)
-              (mark-recalculate next)
-              (mark-check-flow next)))))
-
-      (calc-line-length mline)
-      (mark-recalculate mline)))
-  ;; Try left first....
-  (flow-left))
-
-;; ----------------------------------------
-(define (update-graphics mline media dc padding-l padding-t max-line-width)
-  (define (update-left)
-    (cond
-      [(and (bit-overlap? (mline-flags mline) CALC-LEFT)
-            (not (eq? (mline-left mline) NIL)))
-       (update-graphics (mline-left mline) media dc padding-l padding-t max-line-width)]
-      [else (values #f #f)]))
-  (define (update-here)
-    (cond
-      [(bit-overlap? (mline-flags mline) CALC-HERE)
-       (let ([y (+ (get-location mline) padding-t)]
-             [nextsnip (snip->next (mline-last-snip mline))]
-             [sizing-changed? #f])
-         (let loop ([asnip (mline-snip mline)]
-                    [maxbase 0.0]
-                    [maxdescent 0.0]
-                    [maxspace 0.0]
-                    [maxantidescent 0.0]
-                    [maxantispace 0.0]
-                    [totalwidth padding-l]
-                    [maxscroll 1]
-                    [scroll-snip #f]
-                    [last-w 0.0]
-                    [last-h 0.0])
-           (if (not (eq? asnip nextsnip))
-               (let-boxes ([w 0.0]
-                           [h 0.0]
-                           [descent 0.0]
-                           [space 0.0])
-                          (send asnip get-extent dc totalwidth y w h descent space #f #f)
-                          (let* ([align (send (snip->style asnip) get-alignment)]
-                                 [scroll (send asnip get-num-scroll-steps)]
-                                 [maxbase (max maxbase (- h descent space))]
-                                 [maxdescent (if (eq? align 'bottom)
-                                                 (max maxdescent descent)
-                                                 maxdescent)]
-                                 [maxantispace (if (eq? align 'bottom)
-                                                   maxantispace
-                                                   (max maxantispace (- h space)))]
-                                 [maxspace (if (eq? align 'top)
-                                               (max maxspace space)
-                                               maxspace)]
-                                 [maxantidescent (if (eq? align 'top)
-                                                     maxantidescent
-                                                     (max maxantidescent (- h descent)))]
-                                 [scroll-snip (if (scroll . > . maxscroll)
-                                                  asnip
-                                                  scroll-snip)]
-                                 [maxscroll (max maxscroll scroll)]
-                                 [totalwidth (+ w totalwidth)])
-                            (loop (snip->next asnip)
-                                  maxbase maxdescent maxspace maxantidescent maxantispace
-                                  totalwidth maxscroll scroll-snip
-                                  w h)))
-               (let ([maxspace (max maxspace (- maxantidescent maxbase))]
-                     [maxdescent (max maxdescent (- maxantispace maxbase))])
-                 (unless (eq? (mline-scroll-snip mline) scroll-snip)
-                   (set! sizing-changed? #t)
-                   (set-mline-scroll-snip! mline scroll-snip))
-                 (unless (= (mline-last-h mline) last-h)
-                   (set! sizing-changed? #t)
-                   (set-mline-last-h! mline last-h))
-                 (unless (= (mline-last-w mline) last-w)
-                   (set! sizing-changed? #t)
-                   (set-mline-last-w! mline last-w))
-                 (unless (= (mline-topbase mline) maxspace)
-                   (set! sizing-changed? #t)
-                   (set-mline-topbase! mline maxspace))
-                 (let ([bottombase (+ maxspace maxbase)])
-                   (unless (= (mline-bottombase mline) bottombase)
-                     (set! sizing-changed? #t)
-                     (set-mline-bottombase! mline bottombase)))
-                 (let ([maxh (+ maxbase 
-                                maxdescent
-                                maxspace
-                                (send media get-s-line-spacing))]
-                       [bigwidth (+ (if ((mline-w mline) . > . totalwidth)
-                                        (mline-w mline)
-                                        totalwidth)
-                                    CURSOR-WIDTH
-                                    (let-boxes ([is-first? #f]
-                                                [para #f])
-                                               (set-box! para (get-paragraph-style mline is-first?))
-                                               (if is-first?
-                                                   (paragraph-left-margin-first para)
-                                                   (paragraph-left-margin para))))])
-                   (when (set-width mline (- totalwidth padding-l))
-                     (set! sizing-changed? #t))
-                   (unless (= maxscroll (mline-numscrolls mline))
-                     (when (set-scroll-length mline maxscroll)
-                       (set! sizing-changed? #t)))
-                   (define (send-refresh-box w h)
-                     (define x-delta
-                       (case (if max-line-width
-                                 (let-boxes ([is-first? #f]
-                                             [para #f])
-                                            (set-box! para (get-paragraph-style mline is-first?))
-                                            (paragraph-alignment para))
-                                 'left)
-                         [(left) 0]
-                         [(right) (max 0 (- max-line-width w))]
-                         [else (max 0 (/ (- max-line-width w) 2))]))
-                     (send media refresh-box (+ padding-l x-delta) y w h))
-                   (if (= maxh (mline-h mline))
-                       (send-refresh-box bigwidth maxh)
-                       (begin
-                         (when (set-height mline maxh)
-                           (set! sizing-changed? #t))
-                         (let ([bigwidth (max 1e5 ;; really want viewable width, but > ok
-                                              (send media get-s-total-width))]
-                               [bigheight (+ maxh (send media get-s-total-height))])
-                           (send-refresh-box bigwidth bigheight))))))))
-         (values sizing-changed? #t))]
-      [else (values #f #f)]))
-  (define (update-right)
-    (cond
-      [(and (bit-overlap? (mline-flags mline) CALC-RIGHT)
-            (not (eq? (mline-right mline) NIL)))
-       (update-graphics (mline-right mline) media dc padding-l padding-t max-line-width)]
-      [else
-       (values #f #f)]))
-
-  (define-values (sizing-left? left?) (update-left))
-  (define-values (sizing-here? here?) (update-here))
-  (define-values (sizing-right? right?) (update-right))
-  (set-mline-flags! mline (bitwise-and
-                           (mline-flags mline)
-                           (bitwise-not CALC-MASK)))
-  (values (or sizing-left? sizing-here? sizing-right?)
-          (or left? here? right?)))
-
-;; ------------------------------------------------------------
-
-(define (number mline)
-  (add1 (get-line (last mline))))
-
-(define (first mline)
-  (let ([left (mline-left mline)])
-    (if (eq? left NIL)
-        mline
-        (first left))))
-    
-(define (last mline)
-  (let ([right (mline-right mline)])
-    (if (eq? right NIL)
-        mline
-        (last right))))
-
-;; ------------------------------------------------------------
-
-(define (get-left-location mline max-width)
-  (let-values ([(para left)
-                (if (bit-overlap? (mline-flags mline) STARTS-PARA)
-                    (let ([para (mline-paragraph mline)])
-                      (values para
-                              (paragraph-left-margin-first para)))
-                    (let ([para (get-paragraph-style mline)])
-                      (values para
-                              (paragraph-left-margin para))))])
-    (if (and (max-width . > . 0)
-             (not (eq? (paragraph-alignment para) 'left)))
-        (let ([delta (max 0 (- max-width (mline-w mline)))])
-          (if (eq? (paragraph-alignment para) 'right)
-              (+ left delta)
-              (+ left (/ delta 2))))
-        left)))
-
-(define (get-right-location mline max-width)
-  (+ (get-left-location mline max-width) (mline-w mline)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/pasteboard.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/pasteboard.rkt
deleted file mode 100644
index 69f8ea8856..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/pasteboard.rkt
+++ /dev/null
@@ -1,2179 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/port
-         racket/file
-         "../syntax.rkt"
-         "const.rkt"
-         "private.rkt"
-         racket/snip/private/private
-         "editor.rkt"
-         "editor-data.rkt"
-         "undo.rkt"
-         racket/snip/private/snip
-         racket/snip/private/snip-flags
-         racket/snip/private/style
-         "standard-snip-admin.rkt"
-         "keymap.rkt"
-         (only-in "cycle.rkt"
-                  printer-dc%
-                  set-pasteboard%!)
-         "wordbreak.rkt"
-         "stream.rkt"
-         "wx.rkt")
-
-(provide pasteboard%
-         add-pasteboard-keymap-functions)
-
-;; ----------------------------------------
-
-(define LINE-HEIGHT 16.0)
-
-(define DOT-WIDTH 5.0)
-(define HALF-DOT-WIDTH 2.0)
-
-(define (inbox? lx x)
-  (and ((- lx HALF-DOT-WIDTH) . <= . x)
-       ((+ (- lx HALF-DOT-WIDTH) DOT-WIDTH) . >= . x)))
-
-(define black-brush (send the-brush-list find-or-create-brush "black" 'xor))
-(define white-brush (send the-brush-list find-or-create-brush "white" 'solid))
-(define invisi-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-(define invisi-brush (send the-brush-list find-or-create-brush "black" 'transparent))
-(define rb-pen (send the-pen-list find-or-create-pen (get-highlight-background-color) 1 'xor-dot))
-(define rb-brush (send the-brush-list find-or-create-brush (get-highlight-background-color) 'solid))
-
-(define arrow (make-object cursor% 'arrow))
-
-;; ----------------------------------------
-
-(define-struct loc (x y w h r b hm vm
-                      startx starty
-                      selected? need-resize?
-                      snip)
-  #:mutable)
-
-;; ----------------------------------------
-
-(defclass pasteboard% editor%
-  (inherit-field s-admin
-                 s-custom-cursor
-                 s-custom-cursor-overrides?
-                 s-own-caret?
-                 s-caret-snip
-                 s-keymap
-                 s-style-list
-                 s-noundomode
-                 s-modified?
-                 s-offscreen
-                 s-filename
-                 s-temp-filename?
-                 s-user-locked?
-                 s-need-on-display-size?)
-  (inherit on-change
-           get-default-style
-           set-modified
-           on-paint
-           wait-sequence-lock
-           begin-sequence-lock
-           end-sequence-lock
-           do-own-caret
-           on-focus
-           scroll-editor-to
-           do-set-caret-owner
-           install-copy-buffer
-           begin-copy-buffer
-           end-copy-buffer
-           free-old-copies
-           do-write-headers-footers
-           read-snips-from-file
-           do-own-x-selection
-           do-buffer-paste
-           add-undo-rec
-           get-dc
-           on-local-event
-           on-local-char
-           on-edit-sequence
-           after-edit-sequence
-           on-display-size)
-
-  (define dragable? #t)
-  (define selection-visible? #t)
-
-  (define snips #f)
-  (define last-snip #f)
-
-  (define (in-snip-locs)
-    (make-do-sequence
-     (lambda () (values snip->loc
-                        snip->next
-                        snips
-                        values
-                        #f
-                        #f))))
-
-  (define snip-admin (new standard-snip-admin% [editor this]))
-  
-  (define last-time 0)
-  (define start-x 0.0)
-  (define start-y 0.0)
-  (define last-x 0.0)
-  (define last-y 0.0)
-
-  (define orig-x 0.0)
-  (define orig-y 0.0)
-  (define orig-w 0.0)
-  (define orig-h 0.0)
-  
-  (define max-width 'none)
-  (define min-width 'none)
-  (define max-height 'none)
-  (define min-height 'none)
-
-  (define keep-size? #f)
-  (define dragging? #f)
-  (define rubberband? #f)
-
-  (define rb-x 0.0)
-  (define rb-y 0.0)
-  (define rb-w 0.0)
-  (define rb-h 0.0)
-
-  (define need-resize? #f)
-
-  (define resizing #f) ; a snip
-  (define sizedxm 0.0)
-  (define sizedym 0.0)
-
-  (define scroll-step LINE-HEIGHT)
-
-  (define total-width 0.0)
-  (define total-height 0.0)
-  (define real-width 0.0)
-  (define real-height 0.0)
-
-  (define update-left 0.0)
-  (define update-right 0.0)
-  (define update-right-end #f)
-  (define update-top 0.0)
-  (define update-bottom 0.0)
-  (define update-bottom-end #f)
-  (define update-nonempty? #f)
-  (define no-implicit-update? #f)
-
-  (define size-cache-invalid? #f)
-  (define write-locked 0)
-  (define flow-locked? #f)
-
-  (define sequence 0)
-
-  (define delayedscrollbias 'none)
-  (define delayedscrollsnip #f)
-  (define delayedscroll-x 0.0)
-  (define delayedscroll-y 0.0)
-  (define delayedscroll-w 0.0)
-  (define delayedscroll-h 0.0)
-
-  (define sequence-streak? #f)
-
-  (define changed? #f)
-
-  (define prev-mouse-snip #f)
-
-  (super-new)
-
-  ;; ----------------------------------------
-
-  (define/private (rubber-band-update x y w h)
-    (when (and s-admin
-               (not (zero? w))
-               (not (zero? h)))
-      (let-values ([(x w)
-                    (if (w . < . 0)
-                        (values (+ x w) (- w))
-                        (values x w))]
-                   [(y h)
-                    (if (h . < . 0)
-                        (values (+ y h) (- h))
-                        (values y h))])
-        (let ([r (+ x w)]
-              [b (+ y h)])
-          (let-boxes ([vx 0.0]
-                      [vy 0.0]
-                      [vw 0.0]
-                      [vh 0.0])
-              (send s-admin get-view vx vy vw vh)
-            (let ([x (max x vx)]
-                  [y (max y vy)]
-                  [r (min r (+ vx vw))]
-                  [b (min b (+ vy vh))])
-              (unless (or (x . >= . r)
-                          (y . >= . b))
-                (set! rb-x x)
-                (set! rb-y y)
-                (set! rb-w (- r x))
-                (set! rb-h (- b y))
-                (update rb-x rb-y rb-w rb-h))))))))
-
-  (def/override (adjust-cursor [mouse-event% event])
-    (if (not s-admin)
-        #f
-        (let-boxes ([scrollx 0.0]
-                    [scrolly 0.0]
-                    [dc #f])
-            (set-box! dc (send s-admin get-dc scrollx scrolly))
-          (if (not dc)
-              #f
-              (let ([x (+ (send event get-x) scrollx)]
-                    [y (+ (send event get-y) scrolly)])
-                (or (and (not s-custom-cursor-overrides?)
-                         (or (and s-caret-snip (send event dragging?)
-                                  (let-boxes ([x 0.0]
-                                              [y 0.0])
-                                      (get-snip-location s-caret-snip x y)
-                                    (let ([c (send s-caret-snip adjust-cursor dc
-                                                   (- x scrollx) (- y scrolly)
-                                                   x y event)])
-                                      c)))
-                             ;; find snip:
-                             (let ([snip (find-snip x y)])
-                               (and snip
-                                    (eq? snip s-caret-snip)
-                                    (let-boxes ([x 0.0] [y 0.0])
-                                        (get-snip-location snip x y)
-                                      (let ([c (send snip adjust-cursor dc (- x scrollx) (- y scrolly) 
-                                                     x y event)])
-                                        c))))))
-                    s-custom-cursor
-                    arrow))))))
-
-  (def/override (on-event [mouse-event% event])
-    (when s-admin
-      (let-values ([(dc x y scrollx scrolly)
-                    ;; first, find clicked-on snip:
-                    (let ([x (send event get-x)]
-                          [y (send event get-y)])
-                      (let-boxes ([scrollx 0.0]
-                                  [scrolly 0.0]
-                                  [dc #f])
-                          (set-box! dc (send s-admin get-dc scrollx scrolly))
-                        ;; FIXME: old code returned if !dc
-                        (values dc (+ x scrollx) (+ y scrolly) scrollx scrolly)))])
-        (let ([snip (find-snip x y)])
-          (when (and prev-mouse-snip
-                     (not (eq? snip prev-mouse-snip)))
-            (let ([loc (snip->loc prev-mouse-snip)])
-              (send prev-mouse-snip on-event
-                    dc (- (loc-x loc) scrollx) (- (loc-y loc) scrolly) 
-                    (loc-x loc) (loc-y loc)
-                    event)))
-          (set! prev-mouse-snip #f)
-          (when (and snip
-                     (has-flag? (snip->flags snip) HANDLES-ALL-MOUSE-EVENTS)
-                     (not (eq? snip s-caret-snip)))
-            (let ([loc (snip->loc snip)])
-              (set! prev-mouse-snip snip)
-              (send snip on-event
-                    dc (- (loc-x loc) scrollx) (- (loc-y loc) scrolly) 
-                    (loc-x loc) (loc-y loc)
-                    event)))
-          (if (and s-caret-snip
-                   (or (not (send event button-down?))
-                       (eq? snip s-caret-snip)))
-              (let ([loc (snip->loc s-caret-snip)])
-                (send s-caret-snip on-event
-                      dc (- (loc-x loc) scrollx) (- (loc-y loc) scrolly) 
-                      (loc-x loc) (loc-y loc)
-                      event))
-              (on-local-event event))))))
-
-  (def/override (on-default-event [mouse-event% event])
-    (when s-admin
-      (let-boxes ([scrollx 0.0]
-                  [scrolly 0.0]
-                  [dc #f])
-          (set-box! dc (send s-admin get-dc scrollx scrolly))
-        (when dc
-          (let-boxes ([x (+ (send event get-x) scrollx)]
-                      [y (+ (send event get-y) scrolly)])
-              
-              (interactive-adjust-mouse x y)
-            
-            (when (or (send event button-down?)
-                      (and (send event moving?) (not (send event dragging?)))
-                      (send event button-up?))
-              (set! keep-size? #f)
-              
-              (when dragging?
-                (if resizing
-                    (begin
-                      (begin-edit-sequence)
-                      ;; move & resize back without undo
-                      (when (or (sizedxm . < . 0.0)
-                                (sizedym . < . 0.0))
-                        (move-to resizing orig-x orig-y))
-                      (resize resizing orig-w orig-h)
-                      (set! dragging? #f)
-                      ;; re-move and re-size with undo:
-                      (do-event-resize last-x last-y)
-                      (after-interactive-resize resizing)
-                      (end-edit-sequence)
-                      (set! resizing #f))
-                    (finish-dragging event)))
-
-              (when rubberband?
-                (set! rubberband? #f)
-                (rubber-band-update start-x start-y (- last-x start-x) (- last-y start-y))
-                (add-selected start-x start-y (- last-x start-x) (- last-y start-y))
-                (update-all)))
-
-            (if (or (send event button-down?)
-                    (and (send event dragging?)
-                         (not dragging?)
-                         (not rubberband?)))
-
-                (let ([snip (find-snip x y)])
-                  (if dragable?
-                      (begin
-                        (if snip
-                            (let ([loc (snip->loc snip)])
-                              (set! orig-x (loc-x loc))
-                              (set! orig-y (loc-y loc))
-                              (set! orig-w (loc-w loc))
-                              (set! orig-h (loc-h loc))
-                              (if (not (loc-selected? loc))
-                                  (begin
-                                    (unless (send event get-shift-down)
-                                      (no-selected))
-                                    (set-caret-owner #f)
-                                    (add-selected snip)
-                                    (init-dragging event))
-                                  (let ([interval (abs (- (send event get-time-stamp)
-                                                          last-time))])
-                                    (if (and (send event button-down?)
-                                             (interval . < . (if s-keymap
-                                                                 (send s-keymap get-double-click-interval)
-                                                                 (get-double-click-threshold))))
-                                        (on-double-click snip event)
-                                        (let-boxes ([dx sizedxm]
-                                                    [dy sizedym]
-                                                    [f? #f])
-                                            (set-box! f? (find-dot loc x y dx dy))
-                                          (set! sizedxm dx)
-                                          (set! sizedym dy)
-                                          (when f?
-                                            (set! resizing snip))
-                                          (init-dragging event)))))
-                              (when (send event button-down?)
-                                (set! last-time (send event get-time-stamp))))
-                            (begin
-                              (unless (send event get-shift-down)
-                                (no-selected))
-                              (set-caret-owner #f)
-                              (set! rubberband? #t)))
-                        (set! start-x x)
-                        (set! last-x x)
-                        (set! start-y y)
-                        (set! last-y y))
-                      ;; not dragable:
-                      (set-caret-owner snip)))
-
-                ;; not a new click:
-                (when dragable?
-                  (when (send event dragging?)
-                    (cond
-                     [rubberband?
-                      (begin-edit-sequence)
-                      ;; erase old
-                      (rubber-band-update start-x start-y (- last-x start-x) (- last-y start-y))
-                      ;; draw new:
-                      (rubber-band-update start-x start-y (- x start-x) (- y start-y))
-                      (end-edit-sequence)]
-                     [resizing
-                      (do-event-resize x y)]
-                     [else
-                      (do-event-move x y)]))
-                  (set! last-x x)
-                  (set! last-y y))))))))
-
-  (def/public (on-double-click [snip% snip] [mouse-event% evt])
-    (when (has-flag? (snip->flags snip) HANDLES-EVENTS)
-      (no-selected)
-      (set-caret-owner snip)))
-
-  (def/override (on-char [key-event% event])
-    (when s-admin
-      (let-boxes ([scrollx 0.0]
-                  [scrolly 0.0]
-                  [dc #f])
-          (set-box! dc (send s-admin get-dc scrollx scrolly))
-        (when dc
-          (let ([x (+ (send event get-x) scrollx)]
-                [y (+ (send event get-y) scrolly)])
-            (if s-caret-snip
-                (let ([loc (snip->loc s-caret-snip)])
-                  (send s-caret-snip on-char
-                        dc (loc-x loc) (loc-y loc) (- x scrollx) (- y scrolly)
-                        event))
-                (on-local-char event)))))))
-
-  (def/override (on-default-char [key-event% event])
-    (when s-admin
-      (let ([code (send event get-key-code)])
-        (case code
-          [(#\rubout #\backspace)
-           (delete)]
-          [(right)
-           (move 1 0)]
-          [(left)
-           (move -1 0)]
-          [(up)
-           (move 0 -1)]
-          [(down)
-           (move 0 1)]))))
-
-  (define/private (init-dragging e)
-    (define (phase1)
-      (if resizing
-          (if (not (can-interactive-resize? resizing))
-              (set! resizing #f)
-              (begin
-                (on-interactive-resize resizing)
-                (phase2)))
-          (when (can-interactive-move? e)
-            (on-interactive-move e)
-            (phase2))))
-    (define (phase2)
-      (set! dragging? #t)
-      (set! keep-size? #t)
-      (let loop ([s #f])
-        (let ([s (find-next-selected-snip s)])
-          (when s
-            (let ([loc (snip->loc s)])
-              (set-loc-startx! loc (loc-x loc))
-              (set-loc-starty! loc (loc-y loc)))
-            (loop s)))))
-    (phase1))
-
-  (define/private (finish-dragging e)
-    (begin-edit-sequence)
-
-    ;; move back without undo and remember final
-    (let loop ([s #f])
-      (let ([s (find-next-selected-snip s)])
-        (when s
-          (let* ([loc (snip->loc s)]
-                 [x (loc-startx loc)]
-                 [y (loc-starty loc)])
-            (set-loc-startx! loc (loc-x loc))
-            (set-loc-starty! loc (loc-y loc))
-            (move-to s x y))
-          (loop s))))
-
-    (set! dragging? #f)
-
-    ;; move to final position with undo:
-    (let loop ([s #f])
-      (let ([s (find-next-selected-snip s)])
-        (when s
-          (let* ([loc (snip->loc s)])
-            (move-to s (loc-startx loc) (loc-starty loc)))
-          (loop s))))
-
-    (after-interactive-move e)
-    (end-edit-sequence))
-
-  (define/private (do-event-move event-x event-y)
-    (let ([dx (- event-x start-x)]
-          [dy (- event-y start-y)])
-      (begin-edit-sequence)
-      
-      (let loop ([s #f])
-        (let ([s (find-next-selected-snip s)])
-          (when s
-            (let ([loc (snip->loc s)])
-              (let-boxes ([x (+ (loc-startx loc) dx)]
-                          [y (+ (loc-starty loc) dy)])
-                  (interactive-adjust-move s x y)
-                (move-to s x y)))
-            (loop s))))
-
-      (end-edit-sequence)))
-
-  (define/private (do-event-resize event-x event-y)
-    (let ([dx (- event-x start-x)]
-          [dy (- event-y start-y)])
-      (let-boxes ([w (max 0.0 (+ orig-w (* dx sizedxm)))]
-                  [h (max 0.0 (+ orig-h (* dy sizedym)))])
-          (interactive-adjust-resize resizing w h)
-        (let ([w (max 0.0 w)]
-              [h (max 0.0 h)])
-          (let ([x (+ orig-x
-                      (if (sizedxm . < . 0)
-                          (- orig-w w)
-                          0.0))]
-                [y (+ orig-y
-                      (if (sizedym . < . 0)
-                          (- orig-h h)
-                          0.0))])
-  
-            (begin-edit-sequence)
-  
-            (when (resize resizing w h)
-              (when (or (sizedxm . < . 0)
-                        (sizedym . < . 0))
-                (move-to resizing x y)))
-
-            (end-edit-sequence))))))
-
-  (def/public (interactive-adjust-mouse [(make-box real?) x] [(make-box real?) y])
-    (set-box! x (max 0.0 (unbox x)))
-    (set-box! y (max 0.0 (unbox y))))
-
-  (def/public (interactive-adjust-resize [snip% s] [(make-box real?) w] [(make-box real?) h])
-    (void))
-
-  (def/public (interactive-adjust-move [snip% s][(make-box real?) x] [(make-box real?) y])
-    (set-box! x (max 0.0 (unbox x)))
-    (set-box! y (max 0.0 (unbox y))))
-  
-  ;; ----------------------------------------
-  
-  (def/public (set-selected [snip% snip])
-    (begin-edit-sequence)
-    (no-selected)
-    (add-selected snip)
-    (end-edit-sequence))
-
-  (define/private (do-select snip on?)
-    (let ([loc (and snip (snip->loc snip))])
-      (when (and loc
-                 (not (eq? (loc-selected? loc) on?)))
-        (set! write-locked (add1 write-locked))
-        (if (can-select? snip on?)
-            (begin
-              (on-select snip on?)
-              (set! write-locked (sub1 write-locked))
-              (set-loc-selected?! loc on?)
-              (after-select snip on?)
-              (update-location loc))
-            (set! write-locked (sub1 write-locked))))))
-
-  (def/public (remove-selected [snip% snip])
-    (do-select snip #f))
-  
-  (define/private (add-selected-region x y w h)
-    (let-values ([(x w)
-                  (if (w . < . 0)
-                      (values (+ x w) (- w))
-                      (values x w))]
-                 [(y h)
-                  (if (h . < . 0)
-                      (values (+ y h) (- h))
-                      (values y h))])
-      (let ([r (+ x w)]
-            [b (+ y h)])
-        
-        (begin-edit-sequence)
-
-        (let loop ([s snips])
-          (when s
-            (let ([loc (snip->loc s)])
-              (when (and
-                     loc
-                     (not (loc-selected? loc))
-                     ((loc-x loc) . <= . r)
-                     ((loc-y loc) . <= . b)
-                     ((loc-r loc) . >= . x)
-                     ((loc-b loc) . >= . y))
-                (add-selected s)))
-            (loop (snip->next s))))
-
-        (end-edit-sequence))))
-
-  (define/public (add-selected . args)
-    (case-args
-     args
-     [([real? x] [real? y] [real? w] [real? h])
-      (add-selected-region x y w h)]
-     [([snip% snip])
-      (do-select snip #t)]
-     (method-name 'pasteboard% 'add-selected)))
-  
-  (def/override (select-all)
-    (begin-edit-sequence)
-    (let loop ([s snips])
-      (when s
-        (add-selected s)
-        (loop (snip->next s))))
-    (end-edit-sequence))
-				  
-  (def/public (no-selected)
-    (begin-edit-sequence)
-    (let loop ([s snips])
-      (when s
-        (remove-selected s)
-        (loop (snip->next s))))
-    (end-edit-sequence))
-
-  ;; ----------------------------------------
-
-  (define/private (do-insert snip before x y)
-    (unless (or s-user-locked?
-                (not (zero? write-locked))
-                (send snip is-owned?))
-      (when (not (snip->snipclass snip))
-        (error (method-name 'pasteboard% 'insert)
-               "cannot insert a snip without a snipclass: ~e" 
-               snip))
-
-      (set! write-locked (add1 write-locked))
-      (begin-edit-sequence)
-      (let ([ok?
-             (or (can-insert? snip before x y)
-                 (begin
-                   (end-edit-sequence)
-                   (set! write-locked (sub1 write-locked))
-                   #f))])
-        (when ok?
-          (on-insert snip before x y)
-          (set! write-locked (sub1 write-locked))
-
-          (let ([snip (if (send snip is-owned?)
-                          ;; disaster: can/on-insert made the snip owned
-                          (new image-snip%)
-                          snip)])
-            
-            (let ([search (and before
-                               (snip->loc before)
-                               before)])
-  
-              (set-snip-next! snip search)
-              (if search
-                  (begin
-                    (set-snip-prev! snip (snip->prev search))
-                    (set-snip-prev! search snip))
-                  (begin
-                    (set-snip-prev! snip last-snip)
-                    (set! last-snip snip)))
-              (if (snip->prev snip)
-                  (set-snip-next! (snip->prev snip) snip)
-                  (set! snips snip)))
-            
-            (let ([loc (make-loc
-                        x y 0.0 0.0 0.0 0.0 0.0 0.0
-                        0.0 0.0
-                        #f #t
-                        snip)])
-              (set-snip-loc! snip loc)
-            
-              (set-snip-style! snip (send s-style-list convert (snip->style snip)))
-              (when (eq? (snip->style snip)
-                         (send s-style-list basic-style))
-                (let ([s (get-default-style)])
-                  (when s
-                    (set-snip-style! snip s))))
-              
-              (send snip size-cache-invalid)
-              
-              (snip-set-admin snip snip-admin)
-              
-              (when (zero? s-noundomode)
-                (let ([is (make-object insert-snip-record% snip sequence-streak?)])
-                  (add-undo-rec is)))
-              (when (positive? sequence)
-                (set! sequence-streak? #t))
-              
-              (set! changed? #t)
-              
-              (unless s-modified?
-                (set-modified #t))
-            
-              (set! need-resize? #t)
-              (update-location loc)
-              
-              (set! write-locked (add1 write-locked))
-              (end-edit-sequence)
-              (set! write-locked (sub1 write-locked))
-              
-              (when (zero? sequence)
-                (update-needed))
-              
-              (after-insert snip before x y)))))))
-
-  (define/override (insert . args)
-    (case-args
-     args
-     [([snip% snip] [(make-or-false snip%) [before #f]])
-      (let-values ([(x y) (get-center)])
-        (do-insert snip before x y))]
-     [([snip% snip] [(make-or-false snip%) before] [real? x] [real? y])
-      (do-insert snip before x y)]
-     [([snip% snip] [real? x] [real? y])
-      (do-insert snip #f x y)]
-     (method-name 'pasteboard% 'insert)))
-
-  (define/private (delete-some del?)
-    (unless (or s-user-locked?
-                (not (zero? write-locked)))
-      (let ([del (make-object delete-snip-record% sequence-streak?)])
-        (when (positive? sequence)
-          (set! sequence-streak? #t))
-
-        (begin-edit-sequence)
-
-        (let loop ([s snips])
-          (when s
-            (let ([next (snip->next s)])
-              (when (del? s)
-                (-delete s del))
-              (loop next))))
-        
-        (when (zero? s-noundomode)
-          (add-undo-rec del))
-
-        (end-edit-sequence))))
-
-  (define/public (delete . args)
-    (case-args
-     args
-     [()
-      (delete-some (lambda (s) 
-                     (let ([l (and s (snip->loc s))])
-                       (and l ;; deleted already!
-                            (loc-selected? l)))))]
-     [([snip% s])
-      (unless (or s-user-locked?
-                  (not (zero? write-locked)))
-        (let ([del (make-object delete-snip-record% sequence-streak?)])
-          (when (positive? sequence)
-            (set! sequence-streak? #t))
-          (-delete s del)
-          (when (zero? s-noundomode)
-            (add-undo-rec del))))]
-     (method-name 'pasteboard% 'insert)))
-
-  (def/public (erase)
-    (delete-some (lambda (s) #t)))
-  
-  (define/private (-delete del-snip del)
-    (when (snip->loc del-snip)
-      (when (and prev-mouse-snip
-                 (object=? del-snip prev-mouse-snip))
-        (set! prev-mouse-snip #f))
-      (set! write-locked (add1 write-locked))
-      (begin-edit-sequence)
-      (let ([ok? (or (can-delete? del-snip)
-                     (begin
-                       (end-edit-sequence)
-                       (set! write-locked (sub1 write-locked))
-                       #f))])
-        (and 
-         ok?
-         (begin
-           (on-delete del-snip)
-           (set! write-locked (sub1 write-locked))
-           
-           (let ([update-cursor?
-                  (and (and s-caret-snip
-                            (object=? del-snip s-caret-snip))
-                       (begin
-                         (send s-caret-snip own-caret #f)
-                         (set! s-caret-snip #f)
-                         #t))])
-
-             (update-snip del-snip)
-             
-             (if (snip->prev del-snip)
-                 (set-snip-next! (snip->prev del-snip) (snip->next del-snip))
-                 (set! snips (snip->next del-snip)))
-             (if (snip->next del-snip)
-                 (set-snip-prev! (snip->next del-snip) (snip->prev del-snip))
-                 (set! last-snip (snip->prev del-snip)))
-
-             (let ([loc (snip->loc del-snip)])
-               (set-snip-loc! del-snip #f)
-               (when del
-                 (send del insert-snip del-snip (snip->next del-snip) (loc-x loc) (loc-y loc))))
-             
-             (set-snip-next! del-snip #f)
-             (set-snip-prev! del-snip #f)
-             
-             (set-snip-flags! del-snip (add-flag (snip->flags del-snip) CAN-DISOWN))
-             (snip-set-admin del-snip #f)
-             (set-snip-flags! del-snip (remove-flag (snip->flags del-snip) CAN-DISOWN))
-             (unless del
-               (unless (send del-snip get-admin)
-                 (set-snip-flags! del-snip (remove-flag (snip->flags del-snip) OWNED))))
-             
-             (unless s-modified?
-               (set-modified #t))
-
-             (after-delete del-snip)
-             (set! changed? #t)
-
-             (set! need-resize? #t)
-
-             (set! write-locked (add1 write-locked))
-             (end-edit-sequence)
-             (set! write-locked (sub1 write-locked))
-
-             (when (zero? sequence)
-               (update-needed))
-             
-             (when update-cursor?
-               (when s-admin
-                 (send s-admin update-cursor)))
-
-             #t))))))
-
-  (def/public (remove [snip% del-snip])
-    (unless (or s-user-locked?
-                (not (zero? write-locked)))
-      (-delete del-snip #f)))
-
-  ;; ----------------------------------------
-
-
-  (def/public (move-to [snip% snip] [real? x] [real? y])
-    (unless (or s-user-locked?
-                (not (zero? write-locked)))
-      (let ([loc (snip->loc snip)])
-        (when (and loc
-                   (not (and
-                         (= (loc-x loc) x)
-                         (= (loc-y loc) y))))
-          (set! write-locked (add1 write-locked))
-          (begin-edit-sequence)
-          (if (not (can-move-to? snip x y dragging?))
-              (begin
-                (end-edit-sequence)
-                (set! write-locked (sub1 write-locked)))
-              (begin
-                (on-move-to snip x y dragging?)
-                (set! write-locked (sub1 write-locked))
-
-                (update-location loc)
-
-                (unless dragging?
-                  (let ([rec (make-object move-snip-record%
-                                          snip
-                                          (loc-x loc)
-                                          (loc-y loc) 
-                                          #f
-                                          sequence-streak?)])
-                    (when (positive? sequence)
-                      (set! sequence-streak? #t))
-                    (when (zero? s-noundomode)
-                      (add-undo-rec rec))))
-                
-                (set-loc-x! loc x)
-                (set-loc-y! loc y)
-                (set-loc-r! loc (+ x (loc-w loc)))
-                (set-loc-b! loc (+ y (loc-h loc)))
-                (set-loc-hm! loc (+ x (/ (loc-w loc) 2)))
-                (set-loc-vm! loc (+ y (/ (loc-h loc) 2)))
-                (update-location loc)
-
-                (when (and (not dragging?)
-                           (not s-modified?))
-                  (set-modified #t))
-
-                (after-move-to snip x y dragging?)
-
-                (set! need-resize? #t)
-
-                (set! write-locked (add1 write-locked))
-                (end-edit-sequence)
-                (set! write-locked (sub1 write-locked))
-
-                (set! changed? #t)
-
-                (when (zero? sequence)
-                  (update-needed))))))))
-  
-  (define/public (move . args)
-    (case-args
-     args
-     [([snip% snip] [real? dx] [real? dy])
-      (unless (or s-user-locked?
-                  (not (zero? write-locked)))
-        (let ([loc (snip->loc snip)])
-          (when loc
-            (move-to snip (+ (loc-x loc) dx) (+ (loc-y loc) dy)))))]
-     [([real? dx] [real? dy])
-      (unless (or s-user-locked?
-                  (not (zero? write-locked)))
-        (begin-edit-sequence)
-        (for ([loc (in-snip-locs)])
-          (when (loc-selected? loc)
-            (move (loc-snip loc) dx dy)))
-        (end-edit-sequence))]
-     (method-name 'pasteboard% 'move)))
-
-  (def/public (resize [snip% snip] [real? w] [real? h])
-    (if (not s-admin)
-        #f
-        (let ([loc (snip->loc snip)])
-          (if (not loc)
-              #f
-              (let ([oldw (loc-w loc)]
-                    [oldh (loc-h loc)])
-                (set! write-locked (add1 write-locked))
-                (begin-edit-sequence)
-                (if (not (can-resize? snip w h))
-                    (begin
-                      (end-edit-sequence)
-                      (set! write-locked (sub1 write-locked))
-                      #f)
-                    (begin
-                      (on-resize snip w h)
-                      (set! write-locked (sub1 write-locked))
-
-                      (update-location loc)
-
-                      (let ([rv? 
-                             (and (send snip resize w h)
-                                  (begin
-                                    (when (not dragging?)
-                                      (when (zero? s-noundomode)
-                                        (let ([rs (make-object resize-snip-record%
-                                                               snip oldw oldh
-                                                               sequence-streak?)])
-                                          (add-undo-rec rs))
-                                        (when (positive? sequence)
-                                          (set! sequence-streak? #t))))
-                                    #t))])
-                        (when (and rv?
-                                   (not dragging?)
-                                   (not s-modified?))
-                          (set-modified #t))
-
-                        (after-resize snip w h rv?)
-
-                        (update-location loc)
-
-                        (set! write-locked (add1 write-locked))
-                        (end-edit-sequence)
-                        (set! write-locked (sub1 write-locked))
-
-                        (set! changed? #t)
-
-                        (when (zero? sequence)
-                          (update-needed))
-
-                        rv?))))))))
-
-  ;; ----------------------------------------
-
-  (define/private (do-change-style style delta snip)
-    (unless (or s-user-locked?
-                  (not (zero? write-locked)))
-      (let ([rec (make-object style-change-snip-record% sequence-streak?)])
-        (when (positive? sequence)
-          (set! sequence-streak? #t))
-
-        (let ([style (or style
-                         (and (not delta)
-                              (or (get-default-style)
-                                  (send s-style-list basic-style))))])
-
-          (begin-edit-sequence)
-
-          (let ([didit?
-                 (if snip
-                     (begin
-                       (send rec add-style-change snip (snip->style snip))
-                       (set-snip-style!
-                        snip
-                        (or style
-                            (send s-style-list find-or-create-style (snip->style snip) delta)))
-                       (send snip size-cache-invalid)
-                       (update-snip snip)
-                       #t)
-                     (for/fold ([didit? #f]) ([loc (in-snip-locs)])
-                       (if (loc-selected? loc)
-                           (let ([snip (loc-snip loc)])
-                             (send rec add-style-change (loc-snip loc) (snip->style snip))
-                             (set-snip-style!
-                              snip
-                              (or style
-                                  (send s-style-list find-or-create-style (snip->style snip) delta)))
-                             (send snip size-cache-invalid)
-                             (set-loc-need-resize?! loc #t)
-                             (set! need-resize? #t)
-                             (update-location loc)
-                             #t)
-                           didit?)))])
-
-            (when didit?
-              (when (zero? s-noundomode)
-                (add-undo-rec rec))
-
-              (set! changed? #t)
-              (when (not s-modified?)
-                (set-modified #t))))
-          
-          (end-edit-sequence)))))
-
-  (define/public (change-style . args)
-    (case-args
-     args
-     [()                                  (do-change-style #f    #f    #f)]
-     [([not delta])                       (do-change-style #f    #f    #f)]
-     [([style-delta% delta])              (do-change-style #f    delta #f)]
-     [([style-delta% delta] [snip% snip]) (do-change-style #f    delta snip)]
-     [([style<%> style]     [snip% snip]) (do-change-style style #f    snip)]
-     [([style-delta% delta] [not snip])   (do-change-style #f    delta #f)]
-     [([style<%> style]     [not snip])   (do-change-style style #f    #f)]
-     [([not style]          [snip% snip]) (do-change-style style #f    snip)]
-     [([not style]          [not snip])   (do-change-style #f    #f    snip)]
-     (method-name 'pasteboard% 'change-style)))
-
-  ;; ----------------------------------------
-
-  (define/private (set-between snip before after)
-    (unless (or s-user-locked?
-                (not (zero? write-locked))
-                (not (snip->loc snip))
-                (and before (object=? snip before))
-                (and after (object=? snip after))
-                (and before (not (snip->loc before)))
-                (and after (not (snip->loc after))))
-      (set! write-locked (add1 write-locked))
-      (if (not (can-reorder? snip (or before after) (and before #t)))
-          (set! write-locked (sub1 write-locked))
-          (begin
-            (on-reorder snip (or before after) (and before #t))
-            (set! write-locked (sub1 write-locked))
-
-            ;; remove snip from current pos:
-            (if (snip->prev snip)
-                (set-snip-next! (snip->prev snip) (snip->next snip))
-                (set! snips (snip->next snip)))
-            (if (snip->next snip)
-                (set-snip-prev! (snip->next snip) (snip->prev snip))
-                (set! last-snip (snip->prev snip)))
-
-            ;; insert before `before' or after `after':
-            (if before
-                (begin
-                  (set-snip-prev! snip (snip->prev before))
-                  (set-snip-next! snip before)
-                  (set-snip-prev! before snip)
-                  (if (snip->prev snip)
-                      (set-snip-next! (snip->prev snip) snip)
-                      (set! snips snip)))
-                (begin
-                  (set-snip-next! snip (snip->next after))
-                  (set-snip-prev! snip after)
-                  (set-snip-next! after snip)
-                  (if (snip->next snip)
-                      (set-snip-prev! (snip->next snip) snip)
-                      (set! last-snip snip))))
-
-            (set! changed? #t)
-            (unless s-modified?
-              (set-modified #t))
-
-            (update-snip snip)
-
-            (after-reorder snip (or before after) (and before #t))))))
-
-  (def/public (set-before [snip% snip] [(make-or-false snip%) before])
-    (set-between snip (or before snips) #f))
-
-  (def/public (set-after [snip% snip] [(make-or-false snip%) after])
-    (set-between snip #f (or after last-snip)))
-
-  (def/public (raise [snip% snip])
-    (set-between snip (snip->prev snip) #f))
-
-  (def/public (lower [snip% snip])
-    (set-between snip #f (snip->next snip)))
-
-  ;; ----------------------------------------
-
-  (define/private (snip-set-admin snip a)
-    (let ([orig-admin (snip->admin snip)])
-      ;; lock during set-admin! [???]
-      (send snip set-admin a)
-
-      (if (not (eq? (send snip get-admin) a))
-          ;; something went wrong
-          (cond
-           [(and (not a)
-                 (eq? (snip->admin snip) orig-admin))
-            ;; force admin to null
-            (set-snip-admin! snip #f)
-            snip]
-           [a
-            ;; snip didn't accept membership into this editor; give up on it
-            (let ([naya (new snip%)])
-              (set-snip-prev! naya (snip->prev snip))
-              (set-snip-next! naya (snip->next snip))
-              (if (snip->prev snip)
-                  (set-snip-next! (snip->prev naya) naya)
-                  (set! snips naya))
-              (if (snip->next snip)
-                  (set-snip-prev! (snip->next naya) naya)
-                  (set! last-snip naya))
-              (set-snip-admin! snip #f)
-              (send naya set-admin a)
-              naya)]
-           [else snip])
-          snip)))
-  
-  ;; ----------------------------------------
-  
-  (define/override (really-can-edit? op)
-    (if (and (not (eq? op 'copy))
-             (positive? write-locked))
-        #f
-        (case op
-          [(clear cut copy kill)
-           (and (find-next-selected-snip #f)
-                #t)]
-          [(select-all)
-           (and snips #t)]
-          [else #t])))
-  
-  ;; ----------------------------------------
-  
-  (define/private (find-dot loc x y dxm dym)
-    (define (check-y can-mid?)
-      (cond
-       [(inbox? (loc-y loc) y)
-        (set-box! dym -1) #t]
-       [(and can-mid? (inbox? (loc-vm loc) y))
-        (set-box! dym 0) #t]
-       [(inbox? (loc-b loc) y)
-        (set-box! dym 1) #t]
-       [else #f]))
-    (cond
-     [(inbox? (loc-x loc) x)
-      (set-box! dxm -1)
-      (check-y #t)]
-     [(inbox? (loc-hm loc) x)
-      (set-box! dxm 0)
-      (check-y #f)]
-     [(inbox? (loc-r loc) x)
-      (set-box! dxm 1)
-      (check-y #t)]
-     [else #f]))
-
-  (def/public (find-snip [real? x] [real? y] [(make-or-false snip%) [after #f]])
-    (let ([dummy (box 0)])
-      (let loop ([s (if after 
-                        (if (snip->loc after)
-                            (snip->next after)
-                            #f)
-                        snips)])
-        (and s
-             (let ([loc (snip->loc s)])
-               (cond
-                [(and ((loc-x loc) . <= . x)
-                      ((loc-y loc) . <= . y)
-                      ((loc-r loc) . >= . x)
-                      ((loc-b loc) . >= . y))
-                 s]
-                [(and (loc-selected? loc)
-                      (find-dot loc x y dummy dummy))
-                 s]
-                [else (loop (snip->next s))]))))))
-  
-  (def/override (find-first-snip) snips)
-  
-  (def/public (is-selected? [snip% asnip])
-    (let ([loc (snip->loc asnip)])
-      (and loc
-           (loc-selected? loc))))
-  
-  (def/public (find-next-selected-snip [(make-or-false snip%) start])
-    (let loop ([s (if start 
-                      (if (snip->loc start)
-                          (snip->next start)
-                          #f)
-                      snips)])
-      (and s
-           (if (loc-selected? (snip->loc s))
-               s
-               (loop (snip->next s))))))
-
-  ;; ----------------------------------------
-  
-  (define/private (draw dc dx dy cx cy cw ch show-caret bg-color)
-    (when s-admin
-      (set! write-locked (add1 write-locked))
-      (set! flow-locked? #t)
-
-      (let ([dcx (+ cx dx)]
-            [dcy (+ cy dy)]
-            [cr (+ cx cw)]
-            [cb (+ cy ch)])
-        (let ([dcr (+ dcx cw)]
-              [dcb (+ dcy ch)])
-
-          (when bg-color
-            (let ([save-pen (send dc get-pen)]
-                  [save-brush (send dc get-brush)])
-              
-              (let ([wb (if (and (= 255 (send bg-color red))
-                                 (= 255 (send bg-color green))
-                                 (= 255 (send bg-color blue)))
-                            white-brush
-                            (send the-brush-list find-or-create-brush bg-color 'solid))])
-                (send dc set-brush wb)
-                (send dc set-pen invisi-pen)
-                (send dc draw-rectangle dcx dcy cw ch)
-                (send dc set-brush save-brush)
-                (send dc set-pen save-pen))))
-
-          (on-paint #t dc cx cy cr cb dx dy 
-                    (if (not s-caret-snip)
-                        show-caret
-                        'no-caret))
-
-          (let loop ([snip last-snip]
-                     [old-style #f])
-            (if snip
-                (let ([loc (snip->loc snip)])
-                  (when (and ((loc-x loc) . <= . cr)
-                             ((loc-y loc) . <= . cb)
-                             ((loc-r loc) . >= . cx)
-                             ((loc-b loc) . >= . cy))
-                    (send (snip->style snip) switch-to dc old-style)
-                    (let ([old-style (snip->style snip)])
-                      (let ([x (+ (loc-x loc) dx)]
-                            [y (+ (loc-y loc) dy)])
-                        
-                        (send snip draw
-                              dc x y dcx dcy dcr dcb dx dy 
-                              (if (eq? snip s-caret-snip)
-                                  show-caret
-                                  'no-caret))
-
-                        (when (and (eq? show-caret 'show-caret)
-                                   s-own-caret?
-                                   selection-visible?
-                                   (loc-selected? loc))
-                          (let ([oldbrush (send dc get-brush)]
-                                [oldpen (send dc get-pen)])
-                            (send dc set-brush black-brush)
-                            (send dc set-pen invisi-pen)
-
-                            (let ([r (+ (loc-r loc) dx)]
-                                  [b (+ (loc-b loc) dy)]
-                                  [hm (+ (loc-hm loc) dx)]
-                                  [vm (+ (loc-vm loc) dy)]
-                                  [rect
-                                   (lambda (x y)
-                                     (send dc draw-rectangle 
-                                           (- x HALF-DOT-WIDTH) (- y HALF-DOT-WIDTH)
-                                           DOT-WIDTH DOT-WIDTH))])
-                              (rect x y)
-                              (rect hm y)
-                              (rect r y)
-                              (rect r vm)
-                              (rect r b)
-                              (rect hm b)
-                              (rect x b)
-                              (rect x vm))
-
-                            (send dc set-pen oldpen)
-                            (send dc set-brush oldbrush))))))
-
-                  (loop (snip->prev snip) old-style))
-                (let ([bs (send s-style-list basic-style)])
-                  (send bs switch-to dc old-style))))
-
-          (on-paint #f dc cx cy cr cb dx dy 
-                    (if (not s-caret-snip)
-                        show-caret
-                        'no-caret))
-
-          (when rubberband?
-            (let ([a (send dc get-alpha)])
-              (send dc set-alpha (* a 0.5))
-              (send dc set-brush rb-brush)
-              (send dc set-pen invisi-pen)
-              (send dc draw-rectangle (+ rb-x dx) (+ rb-y dy) rb-w rb-h)
-              (send dc set-pen rb-pen)
-              (send dc set-alpha a)
-              (send dc set-brush invisi-brush)
-              (send dc draw-rectangle (+ rb-x dx) (+ rb-y dy) rb-w rb-h)))
-
-          (set! flow-locked? #f)
-          (set! write-locked (sub1 write-locked))))))
-
-  ;; called by the administrator to trigger a redraw
-  (def/override (refresh [real? left] [real? top] [nonnegative-real? width] [nonnegative-real? height]
-                         [caret-status? show-caret]
-                         [(make-or-false color%) bg-color])
-
-    (cond
-     [(not s-admin) (void)]
-     [(or (width . <= . 0) (height . <= . 0)) (void)]
-     [(or flow-locked? (positive? sequence))
-      ;; we're busy. invalidate so that everything is refreshed later.
-      (update left top width height)]
-     [else
-      (let-boxes ([x 0.0]
-                  [y 0.0]
-                  [dc #f])
-          (set-box! dc (send s-admin get-dc x y))
-        (when dc
-          (begin-sequence-lock)
-          
-          (send s-offscreen ready-offscreen width height)
-
-          ;; make sure all location information is integral,
-          ;; so we can shift the coordinate system and generally
-          ;; update on pixel boundaries
-          (let ([x (->long (floor x))]
-                [y (->long (floor y))]
-                [bottom (->long (ceiling (+ top height)))]
-                [right (->long (ceiling (+ left width)))]
-                [top (->long (floor top))]
-                [left (->long (floor left))])
-            (let ([width (- right left)]
-                  [height (- bottom top)]
-                  [ps? (or (dc . is-a? . post-script-dc%)
-                           (dc . is-a? . printer-dc%))])
-
-              (if (and bg-color
-                       (not (send s-offscreen is-in-use?))
-                       (send s-offscreen get-bitmap)
-                       (send (send s-offscreen get-bitmap) ok?)
-                       (send (send s-offscreen get-dc) ok?)
-                       (not ps?))
-                  ;; draw to offscreen
-                  (begin
-                    (send s-offscreen set-in-use #t)
-                    (draw (send s-offscreen get-dc) (- left) (- top) left top width height show-caret bg-color)
-                    
-                    (send dc draw-bitmap-section 
-                          (send (send s-offscreen get-dc) get-bitmap) 
-                          (- left x) (- top y) 
-                          0 0 width height 'solid)
-                    
-                    (send s-offscreen set-last-used #f)
-                    (send s-offscreen set-in-use #f))
-                  ;; draw directly
-                  (let ([pen (send dc get-pen)]
-                        [brush (send dc get-brush)]
-                        [font (send dc get-font)]
-                        [fg (send dc get-text-foreground)]
-                        [bg (send dc get-text-background)]
-                        [bgmode (send dc get-text-mode)]
-                        [rgn (send dc get-clipping-region)])
-
-                    (send dc suspend-flush)
-
-                    (send dc set-clipping-rect (- left x) (- top y) width height)
-                    
-                    (dynamic-wind
-                        void
-                        (lambda ()
-                          (draw dc (- x) (- y) left top width height show-caret bg-color))
-                        (lambda ()
-                          (send dc set-clipping-region rgn)
-                          
-                          (send dc set-brush brush)
-                          (send dc set-pen pen)
-                          (send dc set-font font)
-                          (send dc set-text-foreground fg)
-                          (send dc set-text-background bg)
-                          (send dc set-text-mode bgmode)
-                          
-                          (send dc resume-flush)))))))
-
-          (end-sequence-lock)))]))
-  ;; ----------------------------------------
-
-  (define/private (loc-resize loc dc)
-    (let-boxes ([ww 0.0]
-                [hh 0.0])
-        (send (loc-snip loc) get-extent dc (loc-x loc) (loc-y loc) ww hh #f #f #f #f)
-      (set-loc-w! loc ww)
-      (set-loc-h! loc hh)
-      (set-loc-r! loc (+ (loc-x loc) ww))
-      (set-loc-b! loc (+ (loc-y loc) hh))
-      (set-loc-hm! loc (+ (loc-x loc) (/ ww 2)))
-      (set-loc-vm! loc (+ (loc-y loc) (/ hh 2)))
-      (set-loc-need-resize?! loc #f)))
-  
-  (define/private (check-recalc)
-    (when s-admin
-      (let ([dc (send s-admin get-dc)])
-        (when dc
-          (when need-resize?
-            (let-values ([(r b)
-                          (for/fold ([r 0.0]
-                                     [b 0.0])
-                              ([loc (in-snip-locs)])
-                            (when size-cache-invalid?
-                              (send (loc-snip loc) size-cache-invalid)
-                              (set-loc-need-resize?! loc #t))
-                            (when (loc-need-resize? loc)
-                              (loc-resize loc dc))
-                            (values (max r (+ (loc-r loc) HALF-DOT-WIDTH))
-                                    (max b (+ (loc-b loc) HALF-DOT-WIDTH))))])
-
-              (set! real-width (max (min r (if (symbol? max-width) +inf.0 max-width))
-                                    (if (symbol? min-width) -inf.0 min-width)))
-              (set! real-height (max (min b (if (symbol? max-height) +inf.0 max-height))
-                                     (if (symbol? min-height) -inf.0 min-height)))
-
-              (set! need-resize? #f)))
-
-          (set! size-cache-invalid? #f)
-
-          (when (not keep-size?)
-            (when (or (not (= real-width total-width))
-                      (not (= real-height total-height)))
-              (set! total-width real-width)
-              (set! total-height real-height)
-              (send s-admin resized #f)))))))
-
-  (define/private (update x y w h)
-    (unless (and delayedscrollsnip
-                 (zero? sequence)
-                 (not flow-locked?)
-                 (let ([s delayedscrollsnip])
-                   (set! delayedscrollsnip #f)
-                   (scroll-to s
-                              delayedscroll-x delayedscroll-y
-                              delayedscroll-w delayedscroll-h
-                              #t delayedscrollbias)))
-      (let ([r (if (symbol? w) x (+ x w))]
-            [b (if (symbol? h) y (+ y h))])
-        (let ([x (max x 0.0)]
-              [y (max y 0.0)]
-              [r (max r 0.0)]
-              [b (max b 0.0)])
-          
-          (set! no-implicit-update? #f)
-
-          (if (not update-nonempty?)
-              (begin
-                (set! update-top y)
-                (set! update-left x)
-                (set! update-bottom b)
-                (set! update-bottom-end (and (symbol? h) h))
-                (set! update-right r)
-                (set! update-right-end (and (symbol? w) w))
-                (set! update-nonempty? #t))
-              (begin
-                (set! update-top (min y update-top))
-                (set! update-left (min x update-left))
-                (set! update-bottom (max b update-bottom))
-                (when (symbol? h)
-                  (if (eq? h 'display-end)
-                      (set! update-bottom-end 'display-end)
-                      (unless (eq? update-bottom-end 'display-end)
-                        (set! update-bottom-end 'end))))
-                (set! update-right (max r update-right))
-                (when (symbol? w)
-                  (if (eq? w 'display-end)
-                      (set! update-right-end 'display-end)
-                      (unless (eq? update-right-end 'display-end)
-                        (set! update-right-end 'end))))))
-
-          (unless (or (positive? sequence)
-                      (not s-admin)
-                      flow-locked?)
-            (check-recalc)
-
-            (let-boxes ([vx 0.0] [vy 0.0] [vw 0.0] [vh 0.0])
-                (when (or (eq? update-bottom-end 'display-end)
-                          (eq? update-right-end 'display-end))
-                  (send s-admin get-max-view x y w h))
-              (case update-bottom-end
-                [(end) (set! update-bottom (max update-bottom real-height))]
-                [(display-end) (set! update-bottom (max update-bottom vh))])
-              (case update-right-end
-                [(end) (set! update-right (max update-right real-width))]
-                [(display-end) (set! update-right (max update-right vw))]))
-
-            (set! update-nonempty? #f)
-
-            (when changed?
-              (set! changed? #f)
-              (set! write-locked (add1 write-locked))
-              (on-change)
-              (set! write-locked (sub1 write-locked)))
-
-            (when (or (not (= update-top update-bottom))
-                      (not (= update-left update-right)))
-              (let ([w (+ (- update-right update-left) 1)]
-                    [h (+ (- update-bottom update-top) 1)])
-                (when (and (w . > . 0) (h . > . 0))
-                  (send s-admin needs-update update-left update-top w h)))))))))
-
-  
-  (define/private (update-location loc)
-    (when s-admin
-      (when (loc-need-resize? loc)
-        (let ([dc (send s-admin get-dc)])
-          (when dc
-            (loc-resize loc dc))
-          ;; otherwise, still need resize...
-          ))
-      (update (- (loc-x loc) HALF-DOT-WIDTH)
-              (- (loc-y loc) HALF-DOT-WIDTH)
-              (+ (loc-w loc) DOT-WIDTH)
-              (+ (loc-h loc) DOT-WIDTH))))
-  
-  (define/private (update-snip snip)
-    (let ([loc (snip->loc snip)])
-      (when loc
-        (update-location loc))))
-
-  (define/private (update-selected)
-    (begin-edit-sequence)
-    (for ([loc (in-snip-locs)])
-      (when (loc-selected? loc)
-	(update-location loc)))
-    (end-edit-sequence))
-
-  (define/private (update-all)
-    (update 0.0 0.0 -1.0 -1.0))
-
-  (define/private (update-needed)
-    (when (or (and update-nonempty?
-                   (not no-implicit-update?))
-              delayedscrollsnip)
-      (update update-left update-top 0 0)))
-
-  (def/override (invalidate-bitmap-cache [real? [x 0.0]] 
-                                         [real? [y 0.0]]
-                                         [(make-alts nonnegative-real? (symbol-in end display-end)) [w 'end]]
-                                         [(make-alts nonnegative-real? (symbol-in end display-end)) [h 'end]])
-    (update x y w h))
-
-  ;; ----------------------------------------
-
-  (def/override (own-caret [any? ownit?])
-    (when (do-own-caret ownit?)
-      (update-selected)
-      (on-focus ownit?)))
-
-  (def/override (blink-caret)
-    (when s-caret-snip
-      (let-boxes ([dc #f]
-                  [dx 0.0]
-                  [dy 0.0])
-          (set-box! dc (send s-admin get-dc dx dy))
-        (when dc
-          (let-boxes ([x 0.0]
-                      [y 0.0]
-                      [ok? #f])
-              (set-box! ok? (get-snip-location s-caret-snip y))
-            (when ok?
-              (send s-caret-snip blink-caret dc (- x dx) (- y dy))))))))
-
-  (def/override (size-cache-invalid)
-    (set! size-cache-invalid? #t)
-    (set! need-resize? #t))
-
-  (def/override (get-extent [maybe-box? w] [maybe-box? h])
-    (check-recalc)
-    (when w (set-box! w total-width))
-    (when h (set-box! h total-height)))
-
-  ;; ----------------------------------------
-
-  (def/public (scroll-to [snip% snip] [real? localx] [real? localy]
-                         [nonnegative-real? w] [nonnegative-real? h]
-                         [any? refresh?]
-                         [(symbol-in start end none) [bias 'none]])
-    (cond
-     [(positive? sequence)
-      (set! delayedscrollsnip snip)
-      (set! delayedscroll-x localx)
-      (set! delayedscroll-y localy)
-      (set! delayedscroll-w w)
-      (set! delayedscroll-h h)
-      #f]
-     [s-admin
-      (let-boxes ([x 0.0]
-                  [y 0.0])
-          (get-snip-location snip x y)
-        (if (scroll-editor-to (+ x localx) (+ y localy) w h refresh? bias)
-            (begin
-              (set! update-top 0.0)
-              (set! update-left 0.0)
-              (set! update-bottom -1.0)
-              (set! update-right -1.0)
-              (set! update-nonempty? #t)
-              #t)
-            #f))]
-     [else #f]))
-  
-  (def/override (set-caret-owner [(make-or-false snip%) snip] 
-                                 [(symbol-in immediate display global) [dist 'immediate]])
-    (when (do-set-caret-owner snip dist)
-      (update-all)
-      (on-focus (not snip))))
-
-  (def/override (resized [snip% snip] [any? redraw-now?])
-    (let ([loc (snip->loc snip)])
-      (when (and loc
-                 (not (loc-need-resize? loc)))
-        (set! changed? #t)
-
-        (let ([niu? (or (not update-nonempty?)
-                        no-implicit-update?)])
-          
-          (when (not redraw-now?)
-            (set! sequence (add1 sequence)))
-          (begin-edit-sequence)
-          
-          (update-location loc)
-
-          (set-loc-need-resize?! loc #t)
-          (set! need-resize? #t)
-
-          (update-location loc)
-
-          (end-edit-sequence)
-          (when (not redraw-now?)
-            (set! sequence (sub1 sequence)))
-          (when niu?
-            (set! no-implicit-update? #t))))))
-  
-  (def/override (recounted [snip% snip] [any? redraw-now?])
-    (resized snip redraw-now?)
-    #t)
-
-  (def/override (needs-update [snip% snip]
-                              [real? localx] [real? localy]
-                              [nonnegative-real? w] [nonnegative-real? h])
-    (let-boxes ([x 0.0]
-                [y 0.0])
-        (get-snip-location snip x y)
-      (update (+ x localx) (+ y localy) w h)))
-  
-  (def/override (release-snip [snip% snip])
-    (if (-delete snip #f) 
-        (begin
-          (when (and (not (snip->admin snip))
-                     (has-flag? (snip->flags snip) OWNED))
-            (set-snip-flags! snip (remove-flag (snip->flags snip) OWNED)))
-          #t)
-        #f))
-
-  ;; ----------------------------------------
-
-  (def/override (scroll-line-location [exact-integer? line])
-    (* line scroll-step))
-
-  (def/override (num-scroll-lines)
-    (->long (/ (- (+ total-height scroll-step) 1) scroll-step)))
-  
-  (def/override (find-scroll-line [real? y])
-    (let ([y (max 0 y)])
-      (->long (/ y scroll-step))))
-
-  (def/public (set-scroll-step [real? s])
-    (unless (= scroll-step s)
-      (set! scroll-step s)
-      (when s-admin
-        (send s-admin resized #t))))
-
-  (def/public (get-scroll-step)
-    scroll-step)
-
-  ;; ----------------------------------------
-  
-  (def/override (set-min-width [(make-alts real? (symbol-in none)) w])
-    (set! min-width (if (and (real? w) (w . <= . 0)) 'none w))
-    (set! need-resize? #t)
-    (update-all))
-  
-  (def/override (set-max-width [(make-alts real? (symbol-in none)) w])
-    (set! max-width (if (and (real? w) (w . <= . 0)) 'none w))
-    (set! need-resize? #t)
-    (update-all))
-  
-  (def/override (set-min-height [(make-alts real? (symbol-in none)) h])
-    (set! min-height (if (and (real? h) (h . <= . 0)) 'none h))
-    (set! need-resize? #t)
-    (update-all))
-  
-  (def/override (set-max-height [(make-alts real? (symbol-in none)) h])
-    (set! max-height (if (and (real? h) (h . <= . 0)) 'none h))
-    (set! need-resize? #t)
-    (update-all))
-  
-  (def/override (get-min-width) min-width)
-  (def/override (get-max-width) max-width)
-  (def/override (get-min-height) min-height)
-  (def/override (get-max-height) max-height)
-
-  ;; ----------------------------------------
-
-  (def/override (copy-self)
-    (let ([pb (new pasteboard%)])
-      (copy-self-to pb)
-      pb))
-  
-  (def/override (copy-self-to [editor<%> pb])
-    (when (pb . is-a? . pasteboard%)
-      (super copy-self-to pb)
-      (send pb set-dragable (get-dragable))
-      (send pb set-selection-visible (get-selection-visible))
-      (send pb set-scroll-step (get-scroll-step))))
-  
-  ;; ----------------------------------------
-
-  (def/override (get-descent) 0.0)
-  (def/override (get-space) 0.0)
-
-  (def/public (get-center)
-    (let-boxes ([x 0.0]
-                [y 0.0]
-                [w 0.0]
-                [h 0.0])
-        (if (not s-admin)
-            (begin
-              (set-box! w total-width)
-              (set-box! h total-height))
-            (send s-admin get-view x y w h #t))
-      (let ([w (if (w . > . 1000.0)
-                   500.0 ; don't believe it
-                   w)]
-            [h (if (h . > . 1000.0)
-                   500.0 ; don't believe it
-                   h)])
-        (values (/ w 2)
-                (/ h 2)))))
-
-  ;; ----------------------------------------
-
-  (def/override (get-flattened-text)
-    (let ([p (open-output-string)])
-      (let loop ([s snips])
-        (when s
-          (display (send s get-text 0 (snip->count s) #t) p)
-          (loop (snip->next s))))
-      (get-output-string p)))
-
-  (def/override (clear) (delete))
-
-  (def/override (cut [any? [extend? #f]] [exact-integer? [time 0]])
-    (copy extend? time)
-    (clear))
-
-  (def/public (do-copy [exact-integer? time] [bool? extend?])
-    (set-common-copy-region-data! #f)
-    (let ([sl (if (and extend?
-                       copy-style-list)
-                  copy-style-list
-                  s-style-list)])
-      (let loop ([snip snips])
-        (when snip
-          (let ([loc (snip->loc snip)])
-            (when (loc-selected? loc)
-              (let ([asnip (send snip copy)])
-                (send asnip set-admin #f)
-                (set-snip-style! asnip (send sl convert (snip->style asnip)))
-                (cons-common-copy-buffer! asnip)
-                (cons-common-copy-buffer2! (get-snip-data snip)))))
-          (loop (snip->next snip))))
-      (install-copy-buffer time sl)))
-  
-  (def/override (copy [bool? [extend? #f]] [exact-integer? [time 0]])
-    (begin-copy-buffer)
-    (when (not extend?)
-      (free-old-copies))
-    (do-copy time extend?)
-    (end-copy-buffer))
-
-  (define/private (do-generic-paste cb time)
-    (unless (or s-user-locked?
-                (positive? write-locked))
-      (let-values ([(start) snips]
-                   [(cx cy) (get-center)])
-
-        (do-buffer-paste cb time #f)
-        
-        (if (and s-admin
-                 (not (eq? snips start)))
-            (let ([dc (get-dc)])
-              (when dc
-                ;; get top/left/bottom/right of pasted group:
-                (let loop ([snip snips]
-                           [left +inf.0]
-                           [top +inf.0]
-                           [right -inf.0]
-                           [bottom -inf.0])
-                  (if (eq? snip start)
-                      (let ([dx (- cx (/ (+ left right) 2))]
-                            [dy (- cy (/ (+ top bottom) 2))])
-                        ;; shift the pasted group to center:
-                        (move dx dy))
-                      (let ([loc (snip->loc snip)])
-                        (add-selected snip)
-                        (when (loc-need-resize? loc)
-                          (loc-resize loc dc))
-                        (loop (snip->next snip)
-                              (min (loc-x loc) left)
-                              (min (loc-y loc) top)
-                              (max (loc-r loc) right)
-                              (max (loc-b loc) bottom)))))))
-            ;; just select them:
-            (let loop ([snip snips])
-              (unless (eq? snip start)
-                (add-selected snip)
-                (loop (snip->next snip))))))))
-
-  (def/public (do-paste [exact-integer? time])
-    (do-generic-paste the-clipboard time))
-
-  (def/public (do-paste-x-selection [exact-integer? time])
-    (do-generic-paste the-x-selection-clipboard time))
-  
-  (define/private (generic-paste x-sel? time)
-    (unless (or s-user-locked?
-                (positive? write-locked))
-      (begin-edit-sequence)
-      (no-selected)
-      (if x-sel?
-          (do-paste-x-selection time)
-          (do-paste time))
-      (end-edit-sequence)))
-  
-  (def/override (paste [exact-integer? [time 0]])
-    (generic-paste #f time))
-
-  (def/override (paste-x-selection [exact-integer? [time 0]])
-    (generic-paste #t time))
-
-  (define/override (insert-paste-snip snip data)
-    (insert snip snip)
-    (set-snip-data snip data))
-
-  (define/override (insert-paste-string str)
-    (let ([snip (new string-snip%)])
-      (set-snip-style! snip (or (get-default-style)
-                                (send s-style-list basic-style)))
-      (send snip insert str)
-      (insert-paste-snip snip #f)))
-  
-  (def/override (kill [exact-integer? [time 0]])
-    (cut time))
-
-  (define/override (own-x-selection on? update? force?)
-    (do-own-x-selection on? force?))
-  
-  ;; ----------------------------------------
-
-  (def/override (get-snip-location [snip% thesnip]
-                                   [maybe-box? [x #f]]
-                                   [maybe-box? [y #f]]
-                                   [bool? [bottom-right? #f]])
-    (if (and bottom-right?
-             (not s-admin))
-        #f
-        (begin
-          (when bottom-right?
-            (check-recalc))
-
-          (let ([loc (snip->loc thesnip)])
-            (and loc
-                 (begin
-                   (when x (set-box! x (+ (loc-x loc)
-                                          (if bottom-right?
-                                              (loc-w loc)
-                                              0.0))))
-                   (when y (set-box! y (+ (loc-y loc)
-                                          (if bottom-right?
-                                              (loc-h loc)
-                                              0.0))))
-                   #t))))))
-
-  ;; ----------------------------------------
-
-  (def/override (get-snip-data [snip% snip])
-    (let ([loc (snip->loc snip)]
-          [sup (super get-snip-data snip)])
-      (if (not loc)
-          sup
-          (let ([data (new location-editor-data%
-                           [x (loc-x loc)]
-                           [y (loc-y loc)])])
-            (send data set-next sup)
-            data))))
-
-  (def/override (set-snip-data [snip% snip] [(make-or-false editor-data%) data])
-    (let loop ([data data])
-      (when data
-        (let ([c (send data get-dataclass)])
-          (when c
-            (let ([name (send c get-classname)])
-              (when (equal? name "wxloc")
-                (move-to snip (send data get-x) (send data get-y))))))
-        (loop (send data get-next)))))
-
-  (def/override (insert-port [input-port? f] 
-                             [(symbol-in guess same copy standard text text-force-cr) [format 'guess]]
-                             [any? [replace-styles? #f]])
-    (if (or s-user-locked? 
-            (not (zero? write-locked)))
-        'standard
-        (do-insert-file (method-name 'pasteboard% 'insert-file) f replace-styles?)))
-  
-  (define/private (do-insert-file who f clear-styles?)
-    (when (not (detect-wxme-file who f #f))
-      (error who "not a WXME file"))
-    (let* ([b (make-object editor-stream-in-file-base% f)]
-           [mf (make-object editor-stream-in% b)])
-      (when (not (and (read-editor-version mf b #f #t)
-                      (read-editor-global-header mf)
-                      (send mf ok?)
-                      (read-from-file mf clear-styles?)
-                      (read-editor-global-footer mf)
-                      (begin
-                        ;; if STD-STYLE wasn't loaded, re-create it:
-                        (send s-style-list new-named-style "Standard" (send s-style-list basic-style))
-                        (send mf ok?))))
-        (error who "error loading the file")))
-    'standard)
-
-  (def/override (save-port [output-port? f]
-                           [(symbol-in guess same copy standard text text-force-cr) [format 'same]]
-                           [any? [show-errors? #t]])
-
-    (let* ([b (make-object editor-stream-out-file-base% f)]
-           [mf (make-object editor-stream-out% b)])
-      (when (not (and (write-editor-version mf b)
-                      (write-editor-global-header mf)
-                      (send mf ok?)
-                      (write-to-file mf)
-                      (write-editor-global-footer mf)
-                      (send mf ok?)))
-        (error (method-name 'pasteboard% 'save-port) "error writing the file"))
-      #t))
-
-  (def/override (write-to-file [editor-stream-out% f])
-    (and (do-write-headers-footers f #t)
-         (write-snips-to-file f s-style-list #f snips #f #f this)
-         (do-write-headers-footers f #f)))
-
-  (def/override (read-from-file [editor-stream-in% f]
-                                [bool? [overwritestyle? #f]])
-    (if (or s-user-locked? 
-            (not (zero? write-locked)))
-        #f
-        (read-snips-from-file f overwritestyle?)))
-
-  (define/override (do-read-insert snip)
-    (insert snip #f)
-    #t)
-
-  (def/override (set-filename [(make-or-false path-string?) name][any? [temp? #f]])
-    (set! s-filename (if (string? name)
-                         (string->path name)
-                         name))
-    (set! s-temp-filename? temp?)
-    (let loop ([snip snips])
-      (when snip
-        (when (has-flag? (snip->flags snip) USES-BUFFER-PATH)
-          ;; just a notification
-          (send snip set-admin snip-admin))
-        (loop (snip->next snip)))))
-
-  ;; ----------------------------------------
-  
-  (def/override (style-has-changed [(make-or-false style<%>) style])
-    (when (not style)
-      (set! changed? #t)
-      (update-all)))
-  
-  ;; ----------------------------------------
-
-  (def/override (begin-edit-sequence [any? [undoable? #t]] [any? [interrupt-seqs? #t]])
-    (define ready! (wait-sequence-lock))
-    (when (or (positive? s-noundomode)
-              (not undoable?))
-      (set! s-noundomode (add1 s-noundomode)))
-    (when (and (zero? sequence)
-               (zero? write-locked))
-      (on-edit-sequence))
-    (set! sequence (add1 sequence))
-    (ready!))
-
-  (def/override (end-edit-sequence)
-    (set! sequence (sub1 sequence))
-    (when (and (zero? sequence)
-               (zero? write-locked))
-      (set! sequence-streak? #f)
-      (update-needed)
-      (after-edit-sequence))
-    (when (positive? s-noundomode)
-      (set! s-noundomode (sub1 s-noundomode)))
-    (when (and (zero? sequence)
-               s-need-on-display-size?)
-      (set! s-need-on-display-size? #f)
-      (on-display-size)))
-
-  (def/override (refresh-delayed?)
-    (or (positive? sequence)
-        (not s-admin)
-        (send s-admin refresh-delayed?)))
-
-  (def/override (in-edit-sequence?)
-    (positive? sequence))
-
-  (def/override (locations-computed?)
-    (not need-resize?))
-
-  ;; ----------------------------------------
-
-  (def/public (get-dragable) dragable?)
-
-  (def/public (set-dragable [bool? d?])
-    (set! dragable? d?))
-
-  (def/public (get-selection-visible) selection-visible?)
-
-  (def/public (set-selection-visible [bool? v])
-    (set! selection-visible? v))
-
-  ;; ----------------------------------------
-
-  (def/public (can-insert? [snip% a] [(make-or-false snip%) b] [real? x] [real? y])
-    #t)
-  (def/public (on-insert [snip% a] [(make-or-false snip%) b] [real? x] [real? y])
-    (void))
-  (def/public (after-insert [snip% a] [(make-or-false snip%) b] [real? x] [real? y])
-    (void))
-
-  (def/public (can-delete? [snip% s])
-    #t)
-  (def/public (on-delete [snip% s])
-    (void))
-  (def/public (after-delete [snip% s])
-    (void))
-
-  (def/public (can-move-to? [snip% s] [real? x] [real? y] [bool? dragging?])
-    #t)
-  (def/public (on-move-to [snip% s] [real? x] [real? y] [bool? dragging?])
-    (void))
-  (def/public (after-move-to [snip% s] [real? x] [real? y] [bool? dragging?])
-    (void))
-
-  (def/public (can-resize? [snip% s] [real? w] [real? h])
-    #t)
-  (def/public (on-resize [snip% s] [real? w] [real? h])
-    (void))
-  (def/public (after-resize [snip% s] [real? w] [real? h] [any? resized?])
-    (void))
-
-  (def/public (can-select? [snip% s] [bool? on?])
-    #t)
-  (def/public (on-select [snip% s] [bool? on?])
-    (void))
-  (def/public (after-select [snip% s] [bool? on?])
-    (void))
-
-  (def/public (can-reorder? [snip% s] [(make-or-false snip%) other] [bool? before?])
-    #t)
-  (def/public (on-reorder [snip% s] [(make-or-false snip%) other] [bool? before?])
-    (void))
-  (def/public (after-reorder [snip% s] [(make-or-false snip%) other] [bool? before?])
-    (void))
-
-  (def/public (can-interactive-move? [mouse-event% e])
-    #t)
-  (def/public (on-interactive-move [mouse-event% e])
-    (void))
-  (def/public (after-interactive-move [mouse-event% e])
-    (void))
-
-  (def/public (can-interactive-resize? [snip% s])
-    #t)
-  (def/public (on-interactive-resize [snip% s])
-    (void))
-  (def/public (after-interactive-resize [snip% s])
-    (void))
-
-  (define/override (do-begin-print dc fit?)
-    (size-cache-invalid)
-    (set! write-locked (add1 write-locked))
-    (on-change)
-    (set! write-locked (sub1 write-locked))
-    #f)
-
-  (define/override (do-end-print dc data)
-    (size-cache-invalid)
-    (set! write-locked (add1 write-locked))
-    (on-change)
-    (set! write-locked (sub1 write-locked)))
-
-  (define/override (do-has-print-page? dc page)
-    (do-has/print-page dc page #f))
-
-  (def/override (print-to-dc [dc<%> dc] [exact-integer? [page -1]])
-    (do-has/print-page dc page #t)
-    (void))
-
-  (define/private (do-has/print-page dc page print?)
-    (check-recalc)
-    
-    (let-values ([(w h) (send dc get-size)])
-      (let-boxes ([w w]
-                  [h h]
-                  [hm 0]
-                  [vm 0])
-          (begin
-            (when (or (zero? (unbox w))
-                      (zero? (unbox h)))
-              (get-default-print-size w h))
-            (unless (zero? page)
-              (send (current-ps-setup) get-editor-margin hm vm)))
-        (let ([W (- w (* 2 hm))]
-              [H (- h (* 2 vm))]
-              [eps? (zero? page)])
-          (let-boxes ([w 0.0]
-                      [h 0.0])
-              (get-extent w h)
-
-            (let ([hcount (if eps? 1 (->long (ceiling (/ w W))))]
-                  [vcount (if eps? 1 (->long (ceiling (/ h H))))])
-
-              (if (not print?)
-                  (page . <= . (* hcount vcount))
-                  (let-values ([(start end)
-                                (cond
-                                 [(zero? page) (values 1 1)]
-                                 [(negative? page)
-                                  (values 1 (* hcount vcount))]
-                                 [else
-                                  (values page page)])])
-                    (for ([p (in-range start (add1 end))])
-                      (let ([vpos (quotient (- p 1) hcount)]
-                            [hpos (modulo (- p 1) hcount)])
-                        (let ([x (* hpos W)]
-                              [y (* vpos H)])
-                          (when (page . <= . 0)
-                            (send dc start-page))
-                            
-                          (draw dc (+ (- x) hm) (+ (- y) vm)
-                                x y (+ x (if eps? w W)) (+ y (if eps? h H))
-                                'no-caret
-                                #f)
-
-                          (when (page . <= . 0)
-                            (send dc end-page)))))))))))))
-
-  ;; ----------------------------------------
-  )
-
-(set-pasteboard%! pasteboard%)
-
-;; ------------------------------------------------------------
-
-(define/top (add-pasteboard-keymap-functions [keymap% tab])
-  (void))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/private.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/private.rkt
deleted file mode 100644
index fdd9f7e30b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/private.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-(require racket/class)
-
-(provide (all-defined-out))
-
-;; editor-data%
-(define-local-member-name
-  get-s-dataclass
-  get-s-next)
-
-;; editor%
-(define-local-member-name
-  s-offscreen
-  s-custom-cursor
-  s-custom-cursor-overrides?
-  s-keymap
-  s-style-list
-  get-s-style-list
-  s-user-locked?
-  s-modified?
-  s-noundomode
-  s-caret-snip
-  s-inactive-caret-threshold
-  s-filename
-  s-need-on-display-size?
-  really-can-edit?
-  copy-out-x-selection
-  own-x-selection
-  do-own-x-selection
-  perform-undo-list
-  copy-ring-next
-  begin-copy-buffer
-  end-copy-buffer
-  free-old-copies
-  install-copy-buffer
-  add-undo-rec
-  read-snips-from-file
-  admin-scroll-to
-  do-buffer-paste
-  insert-paste-snip
-  insert-paste-string
-  paste-region-data
-  setting-admin
-  init-new-admin
-  do-read-insert
-  do-set-caret-owner
-  do-own-caret
-  s-start-intercept
-  s-end-intercept
-  wait-sequence-lock
-  begin-sequence-lock
-  end-sequence-lock
-  check-flow
-  get-printing
-  do-begin-print
-  do-end-print
-  do-has-print-page?)
-
-;; text%
-(define-local-member-name
-  get-s-line-spacing
-  get-s-last-snip
-  get-s-total-width
-  get-s-total-height
-  get-s-snips
-  refresh-box
-  add-back-clickback
-  do-insert-snips
-  consistent-snip-lines)
-
-;; editor-admin%
-(define-local-member-name
-  get-s-standard
-  set-s-standard)
-
-;; editor-canvas-editor-admin%
-(define-local-member-name
-  do-get-canvas
-  do-scroll-to)
-
-;; editor-stream-in%
-(define-local-member-name
-  set-s-read-format
-  get-s-read-format
-  set-s-read-version)
-
-;; editor-snip%
-(define-local-member-name
-  do-set-graphics)
-
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/standard-snip-admin.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/standard-snip-admin.rkt
deleted file mode 100644
index d6b410b30c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/standard-snip-admin.rkt
+++ /dev/null
@@ -1,132 +0,0 @@
-#lang racket/base
-(require racket/class
-         "../syntax.rkt"
-         racket/snip/private/snip
-         racket/snip/private/snip-admin
-         (only-in "cycle.rkt"
-                  popup-menu%)
-         (prefix-in wx: "wx.rkt"))
-
-(provide standard-snip-admin%)
-
-(define TAB-WIDTH 20)
-
-
-(defclass standard-snip-admin% snip-admin%
-  (init-field editor)
-
-  (super-new)
-
-  (def/override (get-editor) editor)
-  (def/override (get-dc) (send editor get-dc))
-  (def/override (get-view-size [maybe-box? w] [maybe-box? h])
-    (get-view #f #f w h #f))
-
-  (def/override (get-view [maybe-box? x] [maybe-box? y] [maybe-box? w] [maybe-box? h] 
-                          [(make-or-false snip%) [snip #f]])
-    (let ([admin (send editor get-admin)]
-          [zeros (lambda ()
-                   (when x (set-box! x 0.0))
-                   (when y (set-box! y 0.0))
-                   (when w (set-box! w 0.0))
-                   (when h (set-box! h 0.0)))])
-      (if snip
-          (if admin
-              (let-boxes ([mx 0.0] [my 0.0]
-                          [mw 0.0] [mh 0.0])
-                  (send admin get-view mx my mw mh #f)
-                (let ([mb (+ my mh)]
-                      [mr (+ mx mw)])
-                  (let-boxes ([ok? #f]
-                              [sl 0.0]
-                              [st 0.0])
-                      (set-box! ok? (if (send editor locked-for-read?)
-                                        #f
-                                        (send editor get-snip-location snip sl st #f)))
-                    (if ok?
-                        (let-boxes ([sr 0.0][sb 0.0])
-                            (send editor get-snip-location snip sr sb #t)
-                          (let ([l (max mx sl)]
-                                [t (max my st)]
-                                [r (min mr sr)]
-                                [b (min mb sb)])
-                            (when x (set-box! x (- l sl)))
-                            (when y (set-box! y (- t st)))
-                            (when w (set-box! w (max 0 (- r l))))
-                            (when h (set-box! h (max 0 (- b t))))))
-                        (zeros)))))
-              (zeros))
-          (if admin
-              (send admin get-view x y w h #t)
-              (zeros)))))
-
-  (def/override (scroll-to [snip% s]
-                           [real? localx] [real? localy]
-                           [nonnegative-real? w] [nonnegative-real? h]
-                           [any? [refresh? #t]]
-                           [(symbol-in start end none) [bias 'none]])
-    (and (eq? (send s get-admin) this)
-         (send editor scroll-to s localx localy w h refresh? bias)))
-
-  (def/override (set-caret-owner [snip% s] [(symbol-in imeditorte display global) dist])
-    (when (eq? (send s get-admin) this)
-      (send editor set-caret-owner s dist)))
-
-  (def/override (resized [snip% s] [any? redraw?])
-    (when (eq? (send s get-admin) this)
-      (send editor resized s redraw?)))
-
-  (def/override (recounted [snip% s] [any? redraw?])
-    (when (eq? (send s get-admin) this)
-      (send editor recounted s redraw?)))
-
-  (def/override (needs-update [snip% s] [real? localx] [real? localy]
-                              [nonnegative-real? w] [nonnegative-real? h])
-    (when (eq? (send s get-admin) this)
-      (send editor needs-update s localx localy w h)))
-
-  (def/override (release-snip [snip% s])
-    (and (eq? (send s get-admin) this)
-         (send editor release-snip s)))
-
-  (def/override (update-cursor)
-    (let ([admin (send editor get-admin)])
-      (when admin
-        (send admin update-cursor))))
-
-  (def/override (popup-menu [popup-menu% m][snip% snip][real? x][real? y])
-    (let ([admin (send editor get-admin)])
-      (and admin
-           (let-boxes ([sl 0.0]
-                       [st 0.0]
-                       [ok? #f])
-               (set-box! ok? (send editor get-snip-location snip sl st #f))
-             (and ok?
-                  (send admin popup-menu m (+ x sl) (+ y st)))))))
-
-  (def/override (modified [snip% s] [any? modified?])
-    (when (eq? (send s get-admin) this)
-      (send editor on-snip-modified s modified?)))
-  
-  (def/override (get-line-spacing)
-    (if (object-method-arity-includes? editor 'get-line-spacing 0)
-        (send editor get-line-spacing)
-        0))
-  
-  (def/override (get-tabs [maybe-box? [length #f]] [maybe-box? [tab-width #f]] [maybe-box? [in-units #f]])
-    (if (object-method-arity-includes? editor 'get-tabs 3)
-        (send editor get-tabs length tab-width in-units)
-        (begin (when length (set-box! length 0))
-               (when tab-width (set-box! tab-width TAB-WIDTH))
-               (when in-units (set-box! in-units #t))
-               null)))
-  
-  (def/override (get-selected-text-color)
-    (wx:get-highlight-text-color))
-  
-  (def/override (call-with-busy-cursor [procedure? thunk])
-    (dynamic-wind
-     wx:begin-busy-cursor
-     thunk
-     wx:end-busy-cursor))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/stream.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/stream.rkt
deleted file mode 100644
index bb1882608b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/stream.rkt
+++ /dev/null
@@ -1,788 +0,0 @@
-#lang racket/base
-(require racket/class
-         "../syntax.rkt"
-         "private.rkt"
-         racket/snip/private/private
-         racket/snip/private/snip
-         "editor-data.rkt"
-         (only-in "cycle.rkt"
-                  set-editor-stream-in%!
-                  set-editor-stream-out%!))
-
-(provide editor-stream-in%
-         editor-stream-out%
-         editor-stream-in-base%
-         editor-stream-in-bytes-base%
-         editor-stream-in-file-base%
-         editor-stream-out-base%
-         editor-stream-out-bytes-base%
-         editor-stream-out-file-base%)
-
-;; ----------------------------------------
-
-(defclass editor-stream% object%
-
-  (super-new)
-
-  (define scl (get-the-snip-class-list))
-  (define bdl (get-the-editor-data-class-list))
-  (define/public (get-s-scl) scl)
-  (define/public (get-s-bdl) bdl)
-
-  (define sl null)
-  (define dl null)
-
-  (define/public (get-sl) sl)
-  (define/public (get-dl) dl)
-  (define/public (set-sl n) (set! sl n))
-  (define/public (set-dl n) (set! dl n))
-  (define/public (add-sl v) (set! sl (cons v sl)))
-  (define/public (add-dl v) (set! dl (cons v dl)))
-
-  (define sll null)
-  (define style-count 0)
-  (define/public (get-s-sll) sll)
-  (define/public (set-s-sll v) (set! sll v))
-  (define/public (get-s-style-count) style-count)
-  (define/public (set-s-style-count v) (set! style-count v))
-
-  (define/public (do-reading-version sclass)
-    (or (ormap (lambda (scl)
-                 (and (eq? (snip-class-link-c scl) sclass)
-                      (snip-class-link-reading-version scl)))
-               sl)
-        ;; Class didn't show up in the header?
-        ;; Assume we're reading the current version.
-        (send sclass get-version)))
-
-  (define/public (do-map-position sclass-or-dclass)
-    (if (sclass-or-dclass . is-a? . snip-class%)
-        (or (ormap (lambda (scl)
-                     (and (eq? (snip-class-link-c scl) sclass-or-dclass)
-                          (snip-class-link-map-position scl)))
-                   sl)
-            -1)
-        (or (ormap (lambda (dcl)
-                     (and (eq? (editor-data-class-link-c dcl) sclass-or-dclass)
-                          (editor-data-class-link-map-position dcl)))
-                   dl)
-            -1)))
-
-  (define/public (do-get-header-flag sclass)
-    (or (ormap (lambda (scl)
-                 (and (eq? (snip-class-link-c scl) sclass)
-                      (snip-class-link-header-flag scl)))
-               sl)
-        0))
-
-  (define/public (do-set-header-flag sclass)
-    (ormap (lambda (scl)
-             (and (eq? (snip-class-link-c scl) sclass)
-                  (begin
-                    (set-snip-class-link-header-flag! scl #t)
-                    #t)))
-           sl)
-    (void)))
-
-;; ----------------------------------------
-
-(defclass editor-stream-in-base% object%
-  (super-new)
-  (def/public (tell) 0)
-  (def/public (seek [exact-nonnegative-integer? i]) (void))
-  (def/public (skip [exact-nonnegative-integer? i]) (void))
-  (def/public (bad?) #t)
-  (def/public (read [vector? v])
-    (let ([s (make-bytes (vector-length v))])
-      (let ([n (read-bytes s)])
-        (for ([i (in-range n)])
-          (vector-set! v i (integer->char (bytes-ref s i))))
-        n)))
-  (def/public (read-bytes [bytes? v]
-                          [exact-nonnegative-integer? [start 0]]
-                          [exact-nonnegative-integer? [end (bytes-length v)]]) 
-    0)
-  (def/public (read-byte)
-    (let ([s (make-bytes 1)])
-      (and (= 1 (read-bytes s 0 1))
-           (bytes-ref s 0)))))
-
-(defclass editor-stream-out-base% object%
-  (super-new)
-  (def/public (tell) 0)
-  (def/public (seek [exact-nonnegative-integer? i]) (void))
-  (def/public (skip [exact-nonnegative-integer? i]) (void))
-  (def/public (bad?) #t)
-  (def/public (write [(make-list char?) v])
-    (write-bytes (string->bytes/latin-1 (list->string v) (char->integer #\?))))
-  (def/public (write-bytes [bytes? v]
-                           [exact-nonnegative-integer? [start 0]]
-                           [exact-nonnegative-integer? [end (bytes-length v)]])
-    (void)))
-
-;; ----------------------------------------
-
-(define mz:read-byte read-byte)
-
-(defclass editor-stream-in-port-base% editor-stream-in-base%
-  (init-field port)
-  (super-new)
-
-  (def/override (tell)
-    (file-position port))
-
-  (def/override (seek [exact-nonnegative-integer? i])
-    (file-position port i))
-
-  (def/override (skip [exact-nonnegative-integer? i])
-    (file-position port (+ i (file-position port))))
-
-  (def/override (bad?) #f)
-
-  (def/override (read-bytes [bytes? v]
-                            [exact-nonnegative-integer? [start 0]]
-                            [exact-nonnegative-integer? [end (bytes-length v)]]) 
-    (let ([r (read-bytes! v port start end)])
-      (if (eof-object? r)
-          0
-          r)))
-
-  (def/override (read-byte)
-    (let ([v (mz:read-byte port)])
-      (if (eof-object? v) #f v))))
-
-(defclass editor-stream-in-file-base% editor-stream-in-port-base%
-  (super-new))
-
-(defclass editor-stream-in-bytes-base% editor-stream-in-port-base%
-  (init s)
-  (super-new [port (open-input-bytes s)]))
-
-;; ----------------------------------------
-
-(define write-bytes-proc write-bytes)
-
-(defclass editor-stream-out-port-base% editor-stream-out-base%
-  (init-field port)
-  (super-new)
-
-  (def/override (tell)
-    (file-position port))
-
-  (def/override (seek [exact-nonnegative-integer? i])
-    (file-position port i))
-
-  (def/override (skip [exact-nonnegative-integer? i])
-    (file-position port (+ i (file-position port))))
-
-  (def/override (bad?) #f)
-
-  (def/override (write-bytes [bytes? v]
-                             [exact-nonnegative-integer? [start 0]]
-                             [exact-nonnegative-integer? [end (bytes-length v)]]) 
-    (write-bytes-proc v port start end)
-    (void)))
-
-(defclass editor-stream-out-file-base% editor-stream-out-port-base%
-  (super-new))
-
-(defclass editor-stream-out-bytes-base% editor-stream-out-port-base%
-  (define s (open-output-bytes))
-  (super-new [port s])
-
-  (def/public (get-bytes)
-    (get-output-bytes s)))
-
-;; ----------------------------------------
-
-(define in-read-byte (generic editor-stream-in-base% read-byte))
-
-(defclass editor-stream-in% editor-stream%
-  (init-rest args)
-
-  (define f
-    (case-args
-     args
-     [([editor-stream-in-base% base]) base]
-     (init-name 'editor-stream-in%)))
-
-  (define boundaries null)
-  (define is-bad? #f)
-  (define items 0)
-  (define pos-map (make-hash))
-
-  (define read-version 8)
-  (define s-read-version #"08")
-
-  (super-new)
-
-  (define/public (set-s-read-version bstr)
-    (set! s-read-version bstr)
-    (set! read-version (or (string->number (bytes->string/utf-8 bstr)) 0)))
-  (define/public (get-wxme-version) read-version)
-
-  (define s-read-format #"WXME")
-  (define/public (set-s-read-format bstr)
-    (set! s-read-format bstr))
-  (define/public (get-s-read-format)
-    s-read-format)
-
-  (define/private (do-skip-whitespace)
-    (define (bad!) (set! is-bad? #t) 0)
-    (if is-bad?
-        0
-        (let loop ([prev-byte 0])
-          (let ([b (send-generic f in-read-byte)])
-            (if (not b)
-                (bad!)
-                (case (integer->char b)
-                  [(#\#)
-                   (let ([pos (send f tell)]
-                         [b (send-generic f in-read-byte)])
-                     (if (and b
-                              (= b (char->integer #\|)))
-                         ;; skip to end of comment
-                         (let cloop ([saw-bar? #f]
-                                     [saw-hash? #f]
-                                     [nesting 0])
-                           (let ([b (send-generic f in-read-byte)])
-                             (if (not b)
-                                 (bad!)
-                                 (cond
-                                  [(and saw-bar? (= b (char->integer #\#)))
-                                   (if (zero? nesting)
-                                       (loop (char->integer #\space))
-                                       (cloop #f #f (sub1 nesting)))]
-                                  [(and saw-hash? (= b (char->integer #\|)))
-                                   (cloop #t #f (add1 nesting))]
-                                  [else (cloop (= b (char->integer #\|))
-                                               (= b (char->integer #\#))
-                                               nesting)]))))
-                         (begin
-                           (send f seek pos)
-                           (char->integer #\#))))]
-                  [(#\;)
-                   ;; skip to end of comment
-                   (let cloop ()
-                     (let ([b (send-generic f in-read-byte)])
-                       (if (not b)
-                           (bad!)
-                           (if (or (= b (char->integer #\newline))
-                                   (= b (char->integer #\return)))
-                               (loop (char->integer #\space))
-                               (cloop)))))]
-                  [else
-                   (if (char-whitespace? (integer->char b))
-                       (loop b)
-                       b)]))))))
-
-  (define/private (skip-whitespace [buf #f])
-    (let ([c (do-skip-whitespace)])
-      (when buf
-        (bytes-set! buf 0 c))
-      c))
-
-  (define/private (is-delim? b)
-    (cond
-     [(char-whitespace? (integer->char b)) #t]
-     [(= b (char->integer #\#))
-      (let ([pos (send f tell)]
-            [b (send-generic f in-read-byte)])
-        (let ([d? (= b (char->integer #\|))])
-          (send f seek (if d? (sub1 pos) pos))
-          d?))]
-     [(= b (char->integer #\;))
-      (send f seek (sub1 (send f tell)))
-      #t]
-     [else #f]))
-
-  (define/private (get-number get-exact?)
-    (let ([c0 (skip-whitespace)])
-      (if (check-boundary)
-          (if get-exact? 0 0.0)
-          (let* ([l 
-                  ;; As fast path, accum integer result
-                  (let loop ([counter 50][c c0][v 0])
-                    (if (zero? counter)
-                        null
-                        (if (or (not c) 
-                                (is-delim? c))
-                            (or v null)
-                            (let ([rest (loop (sub1 counter) 
-                                              (send-generic f in-read-byte)
-                                              (and v
-                                                   (c . >= . (char->integer #\0))
-                                                   (c . <= . (char->integer #\9))
-                                                   (+ (* v 10) (- c (char->integer #\0)))))])
-                              (if (exact-integer? rest)
-                                  rest
-                                  (cons (integer->char c) rest))))))])
-            (inc-item-count)
-            (let ([n (if (exact-integer? l)
-                         l
-                         (string->number (list->string l)))])
-              (cond
-               [(and get-exact? (exact-integer? n)) n]
-               [(real? n) (exact->inexact n)]
-               [else
-                (set! is-bad? #t)
-                (if get-exact? 0 0.0)]))))))
-
-  (define/private (get-a-string limit recur?)
-    (let* ([orig-len (if recur?
-                         (if (limit . < . 16)
-                             limit
-                             16)
-                         (let ([v (get-exact)])
-                           (if (check-boundary)
-                               0
-                               v)))]
-           [buf (make-bytes 32)]
-           [fail (lambda ()
-                   (set! is-bad? #t)
-                   #"")])
-      (if recur?
-          (bytes-set! buf 0 (char->integer #\#))
-          (begin
-            (skip-whitespace buf)
-            (when is-bad?
-              (bytes-set! buf 0 0))))
-      (cond
-       [(= (bytes-ref buf 0) (char->integer #\#))
-        (if (and (= (send f read-bytes buf 1 2) 1)
-                 (= (bytes-ref buf 1) (char->integer #\")))
-            (let-values ([(si s) (make-pipe)]
-                         [(tmp) (make-bytes (+ orig-len 2))])
-              (display "#\"" s)
-              (let loop ([get-amt (add1 orig-len)]) ;; add 1 for closing quote
-                (let ([got-amt (send f read-bytes tmp 0 get-amt)])
-                  (if (not (= got-amt get-amt))
-                      (fail)
-                      (begin
-                        (write-bytes tmp s 0 got-amt)
-                        (let ([done?
-                               (let loop ([i 0])
-                                 (cond
-                                  [(= i got-amt) #f]
-                                  [(= (bytes-ref tmp i) (char->integer #\")) #t]
-                                  [(= (bytes-ref tmp i) (char->integer #\\))
-                                   (if (= (add1 i) got-amt)
-                                       ;; need to read escaped character
-                                       (if (not (= (send f read-bytes tmp got-amt (add1 got-amt)) 1))
-                                           (fail)
-                                           (begin
-                                             (write-bytes tmp s got-amt (add1 got-amt))
-                                             #f))
-                                       (loop (+ i 2)))]
-                                  [else (loop (+ i 1))]))])
-                          (if done?
-                              (begin
-                                (close-output-port s)
-                                (unless recur? (inc-item-count))
-                                (let ([s (with-handlers ([exn:fail:read? (lambda (x) #f)]) 
-                                           (read si))])
-                                  (if (or (not s)
-                                          (not (eof-object? (read-byte si))))
-                                      (fail)
-                                      (if (if recur?
-                                              ((bytes-length s) . <= . limit)
-                                              (= (bytes-length s) orig-len))
-                                          s
-                                          (fail)))))
-                              (loop 1))))))))
-            (fail))]
-       [(and (not recur?) (= (bytes-ref buf 0) (char->integer #\()))
-        ;; read a sequence of strings
-        (let loop ([accum null]
-                   [left-to-get orig-len])
-          (skip-whitespace buf)
-          (if (or is-bad? 
-                  (negative? left-to-get))
-              (fail)
-              (cond
-               [(= (bytes-ref buf 0) (char->integer #\)))
-                ;; got all byte strings
-                (if (zero? left-to-get)
-                    (begin
-                      (inc-item-count)
-                      (apply bytes-append (reverse accum)))
-                    (fail))]
-               [(= (bytes-ref buf 0) (char->integer #\#))
-                (let ([v (get-a-string left-to-get #t)])
-                  (if is-bad?
-                      (fail)
-                      (loop (cons v accum)
-                            (- left-to-get (bytes-length v)))))]
-               [else (fail)])))]
-       [else (fail)])))
-
-  (define/private (inc-item-count)
-    (set! items (add1 items))
-    (tell))
-
-  (define/private (skip-one recur?)
-    (let ([buf (make-bytes 1)]
-          [fail (lambda () (set! is-bad? #t) (void))]
-          [success (lambda () (unless recur? (inc-item-count)))])
-      (if recur?
-          (bytes-set! buf 0 (char->integer #\#))
-          (skip-whitespace buf))
-      (unless is-bad?
-        (cond
-         [(= (bytes-ref buf 0) (char->integer #\#))
-          ;; byte string
-          (if (and (= 1 (send f read-bytes buf))
-                   (= (bytes-ref buf 0) (char->integer #\")))
-              (let loop ()
-                (if (= 1 (send f read-bytes buf))
-                    (cond
-                     [(= (bytes-ref buf 0) (char->integer #\\))
-                      (if (= 1 (send f read-bytes buf))
-                          (loop)
-                          (fail))]
-                     [(= (bytes-ref buf 0) (char->integer #\"))
-                      (success)]
-                     [else (loop)])
-                    (fail)))
-              (fail))]
-         [(= (bytes-ref buf 0) (char->integer #\)))
-          ;; list of byte strings
-          (let loop ()
-            (if is-bad?
-                (fail)
-                (if (not (= (send f read-bytes buf) 1))
-                    (fail)
-                    (if (is-delim? (bytes-ref buf 0))
-                        (cond
-                         [(= (bytes-ref buf 0) (char->integer #\)))
-                          (success)]
-                         [(= (bytes-ref buf 0) (char->integer #\#))
-                          (skip-one #t)
-                          (loop)]
-                         [else (fail)])
-                        (loop)))))]
-         [else
-          ;; number -- skip anything delimited
-          (let loop ()
-            (if (not (= (send f read-bytes buf) 1))
-                (fail)
-                (if (is-delim? (bytes-ref buf 0))
-                    (success)
-                    (loop))))]))))
-
-  (def/public (get-fixed-exact)
-    (if (check-boundary)
-        0
-        (if (read-version . < . 8)
-            (let ([buf (make-bytes 4)])
-              (send f read-bytes buf)
-              (integer-bytes->integer
-               buf
-               #t
-               (if (= read-version 1)
-                   (system-big-endian?)
-                   #t)))
-            (get-exact))))
-
-  (def/public (get-fixed [box? vb])
-    (set-box! vb (get-fixed-exact)))
-
-  #|
-   integer format specified by first byte:
-     bit 8: 0 - read 7-bit (positive) number
-     bit 8: 1 - ...
-        bit 7: 0 - read abother byte for 15-bit (positive) number
-	bit 7: 1 - negative and long numbers...
-	 bit 1: 1 - read another 8-bit (signed) number
-	 bit 1: 0 - ...
-	   bit 2: 1 - read another 16-bit (signed) number
-	   bit 2: 0 - read another 32-bit (signed) number
-  |#
-
-  (def/public (get-exact)
-    (if (check-boundary)
-        0
-        (if (read-version . < . 8)
-            (let ([buf (make-bytes 4)]
-                  [fail (lambda () (set! is-bad? #t) 0)])
-              (if (not (= 1 (send f read-bytes buf 0 1)))
-                  (fail)
-                  (let ([b (bytes-ref buf 0)])
-                    (if (positive? (bitwise-and b #x80))
-                        (if (positive? (bitwise-and b #x40))
-                            (cond
-                             [(positive? (bitwise-and b #x01))
-                              (if (= 1 (send f read-bytes buf 0 1))
-                                  (let ([b (bytes-ref buf 0)])
-                                    (if (b . > . 127)
-                                        (- b 256)
-                                        b))
-                                  (fail))]
-                             [(positive? (bitwise-and b #x02))
-                              (if (= 2 (send f read-bytes buf 0 2))
-                                  (integer-bytes->integer buf #t #t 0 2)
-                                  (fail))]
-                             [else
-                              (if (= 4 (send f read-bytes buf 0 4))
-                                  (integer-bytes->integer buf #t #t)
-                                  (fail))])
-                            (if (= 1 (send f read-bytes buf 0 1))
-                                (+ (arithmetic-shift (bitwise-and b #x3F) 8)
-                                   (bytes-ref buf 0))
-                                (fail)))
-                        b))))
-            (get-number #t))))
-
-  (def/public (get-inexact)
-    (if (check-boundary)
-        0
-        (if (read-version . < . 8)
-            (let ([buf (make-bytes 8)])
-              (send f read-bytes buf)
-              (floating-point-bytes->real
-               buf
-               (if (= read-version 1)
-                   (system-big-endian?)
-                   #t)))
-            (get-number #f))))
-
-  (define/private (do-get-bytes)
-    (if (check-boundary)
-        #""
-        (if (read-version . < . 8)
-            (let* ([len (get-exact)]
-                   [s (make-bytes len)])
-              (send f read-bytes s)
-              s)
-            (get-a-string #f #f))))
-  
-  (def/public (get-bytes [maybe-box? [len #f]])
-    (let ([s (do-get-bytes)])
-      (when len
-        (set-box! len (max 1 (bytes-length s))))
-      (subbytes s 0 (max 0 (sub1 (bytes-length s))))))
-  
-  (def/public (get-unterminated-bytes [maybe-box? [len #f]])
-    (let ([s (do-get-bytes)])
-      (when len
-        (set-box! len (bytes-length s)))
-      s))
-
-  (def/public (get-unterminated-bytes! [(make-box exact-nonnegative-integer?) len] 
-                                       [(lambda (s) (and (bytes? s) (not (immutable? s)))) s])
-    (let ([s2 (do-get-bytes)])
-      (if ((bytes-length s2) . <= . (unbox len))
-          (begin
-            (bytes-copy! s 0 s2)
-            (set-box! len (bytes-length s2)))
-          (set! is-bad? #t))))
-
-  (def/public (get [(make-box real?) b])
-    (unless (check-boundary)
-      (if (exact-integer? (unbox b))
-          (set-box! b (get-exact))
-          (set-box! b (get-inexact)))))
-
-  (def/public (set-boundary [exact-nonnegative-integer? n])
-    (set! boundaries (cons (+ (tell) n) boundaries)))
-
-  (def/public (remove-boundary)
-    (set! boundaries (cdr boundaries)))
-
-  (define/private (check-boundary)
-    (if is-bad?
-        #t
-        (cond
-         [(and (pair? boundaries)
-               (items . >= . (car boundaries)))
-          (set! is-bad? #t)
-          (error 'editor-stream-in%
-                 "overread (caused by file corruption?; ~a vs ~a)" items (car boundaries))]
-         [(send f bad?)
-          (set! is-bad? #t)
-          (error 'editor-stream-in% "stream error")]
-         [else #f])))
-
-  (def/public (skip [exact-nonnegative-integer? n])
-    (if (read-version . < . 8)
-        (send f skip n)
-        (jump-to (+ n items))))
-
-  (def/public (tell)
-    (if (read-version . < . 8)
-        (send f tell)
-        (let ([pos (send f tell)])
-          (when (not (equal? (hash-ref pos-map items pos) pos))
-            (error "again"))
-          (hash-set! pos-map items pos)
-          items)))
-
-  (def/public (jump-to [exact-nonnegative-integer? pos])
-    (if (read-version . < . 8)
-        (send f seek pos)
-        (let ([p (hash-ref pos-map pos #f)])
-          (if (not p)
-              (begin
-                (let loop ()
-                  (when (and (items . < . pos) (not is-bad?))
-                    (skip-one #f)
-                    (loop)))
-                (unless (= items pos)
-                  (set! is-bad? #t)))
-              (begin
-                (send f seek p)
-                (set! items pos))))))
-
-  (def/public (ok?) (not is-bad?)))
-
-(set-editor-stream-in%! editor-stream-in%)
-
-;; ----------------------------------------
-
-(defclass editor-stream-out% editor-stream%
-  (init-rest args)
-
-  (define f
-    (case-args
-     args
-     [([editor-stream-out-base% base]) base]
-     (init-name 'editor-stream-out%)))
-
-  (define is-bad? #f)
-  (define col 72)
-  (define items 0)
-  (define pos-map (make-hash))
-
-  (super-new)
-
-  (define/private (check-ok)
-    (unless is-bad?
-      (when (send f bad?)
-        (error 'editor-stream-out% "stream error"))))
-
-  (def/public (put-fixed [exact-integer? v])
-    (check-ok)
-    (let-values ([(new-col spc)
-                  (if ((+ col 12) . > . 72)
-                      (values 11 #"\n")
-                      (values (+ col 12) #" "))])
-      (let ([s (number->string v)])
-        (send f
-              write-bytes
-              (bytes-append spc
-                            (make-bytes (- 11 (string-length s)) (char->integer #\space))
-                            (string->bytes/latin-1 s))))
-      (set! col new-col)
-      (set! items (add1 items)))
-    this)
-
-  (define/public (put . args)
-    (case-args
-     args
-     [([exact-nonnegative-integer? n][bytes? s])
-      (do-put-bytes (subbytes s 0 n))]
-     [([bytes? s])
-      (do-put-bytes (bytes-append s #"\0"))]
-     [([exact-integer? n])
-      (do-put-number n)]
-     [([real? n])
-      (do-put-number (exact->inexact n))]
-     (method-name 'editor-stream-out% 'put)))
-
-  (def/public (put-unterminated [bytes? s])
-    (do-put-bytes s))
-
-  (define/private (do-put-bytes orig-s)
-    (define (single-string)
-      (if ((bytes-length orig-s) . < . 72)
-          (let ([s (open-output-bytes)])
-            (write orig-s s)
-            (let* ([v (get-output-bytes s)]
-                   [len (bytes-length v)])
-              (if (len . >= . 72)
-                  (multiple-strings)
-                  (begin
-                    (if ((+ col len 1) . > . 72)
-                        (send f write-bytes #"\n")
-                        (send f write-bytes #" "))
-                    (send f write-bytes v)
-                    (set! col 72))))) ;; forcing a newline after every string makes the file more readable
-          (multiple-strings)))
-    (define (multiple-strings)
-      (send f write-bytes #"\n(")
-      (let loop ([offset 0][remain (bytes-length orig-s)])
-        (unless (zero? remain)
-          (let lloop ([amt (min 50 remain)][retry? #t])
-            (let ([s (open-output-bytes)])
-              (write (subbytes orig-s offset (+ offset amt)) s)
-              (let* ([v (get-output-bytes s #t)]
-                     [len (bytes-length v)])
-                (if (len . <= . 71)
-                    (if (and (len . < . 71) 
-                             retry?
-                             (amt . < . remain))
-                        (lloop (add1 amt) #t)
-                        (begin
-                          (send f write-bytes #"\n ")
-                          (send f write-bytes v)
-                          (loop (+ offset amt) (- remain amt))))
-                    (lloop (quotient amt 2) #f)))))))
-      (send f write-bytes #"\n)")
-      (set! col 1))
-
-    (check-ok)
-    (do-put-number (bytes-length orig-s))
-    (single-string)
-    (set! items (add1 items))
-    this)
-
-  (define/private (do-put-number v)
-    (check-ok)
-    (let* ([s (string->bytes/latin-1 (format " ~a" v))]
-           [len (bytes-length s)])
-      (if ((+ col len) . > . 72)
-          (begin
-            (set! col (sub1 len))
-            (bytes-set! s 0 (char->integer #\newline)))
-          (set! col (+ col len)))
-      (send f write-bytes s)
-      (set! items (add1 items))
-      this))
-
-  (def/public (tell)
-    (let ([pos (send f tell)])
-      (hash-set! pos-map items (cons pos col))
-      items))
-
-  (def/public (jump-to [exact-nonnegative-integer? icount])
-    (unless is-bad?
-      (let ([p (hash-ref pos-map icount #f)])
-        (when p
-          (send f seek (car p))
-          (set! col (cdr p))
-          (set! items icount)))))
-  
-  (def/public (ok?) (not is-bad?))
-
-  (def/public (pretty-finish)
-    (unless is-bad?
-      (when (positive? col)
-        (send f write-bytes #"\n")
-        (set! col 0))))
-
-  (def/public (pretty-start)
-    (define (show s)
-      (send f write-bytes (if (string? s) (string->bytes/latin-1 s) s)))
-    (when (positive? col)
-      (show #"\n"))
-    (show #"#|\n   This file uses the GRacket editor format.\n")
-    (show (format "   Open this file in DrRacket version ~a or later to read it.\n" (version)))
-    (show #"\n")
-    (show #"   Most likely, it was created by saving a program in DrRacket,\n")
-    (show #"   and it probably contains a program with non-text elements\n")
-    (show #"   (such as images or comment boxes).\n")
-    (show #"\n")
-    (show #"            http://racket-lang.org/\n|#\n")
-    (set! col 0)))
-
-(set-editor-stream-out%! editor-stream-out%)
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/text.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/text.rkt
deleted file mode 100644
index fcc9c165a9..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/text.rkt
+++ /dev/null
@@ -1,5946 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/port
-         racket/file
-         (for-syntax racket/base)
-         "../syntax.rkt"
-         "const.rkt"
-         "mline.rkt"
-         "private.rkt"
-         racket/snip/private/private
-         racket/snip/private/prefs
-         "editor.rkt"
-         "editor-data.rkt"
-         "undo.rkt"
-         racket/snip/private/snip
-         racket/snip/private/snip-flags
-         racket/snip/private/style
-         "standard-snip-admin.rkt"
-         "keymap.rkt"
-         (only-in "cycle.rkt"
-                  printer-dc%
-                  set-text%!
-                  editor-snip%)
-         "wordbreak.rkt"
-         "stream.rkt"
-         "wx.rkt")
-
-(provide text%
-         add-text-keymap-functions
-         
-         ;; for the test suite
-         do-find-string-all)
-
-;; ----------------------------------------
-
-(define flash-timer% 
-  (class timer%
-    (init editor)
-    (define for-editor editor)
-    (super-new)
-    (define/override (notify)
-      (send for-editor flash-off))))
-
-;; ----------------------------------------
-
-(define arrow (make-object cursor% 'arrow))
-(define i-beam (make-object cursor% 'ibeam))
-
-(define MAX-COUNT-FOR-SNIP 500)
-(define A-VERY-BIG-NUMBER 1e50)
-
-(define TAB-WIDTH 20.0)
-
-;; Used when max-width is set, but padding takes up
-;; all available space:
-(define ZERO-LINE-WIDTH 0.1)
-
-(define show-outline-for-inactive?
-  (and (get-preference* 'GRacket:outline-inactive-selection) #t))
-
-(define caret-pen (send the-pen-list find-or-create-pen "BLACK" 1 'xor))
-(define outline-pen (send the-pen-list find-or-create-pen "BLACK" 0 'transparent))
-(define outline-inactive-pen (send the-pen-list find-or-create-pen (get-highlight-background-color) 1 'solid))
-(define outline-brush (send the-brush-list find-or-create-brush (get-highlight-background-color) 'solid))
-(define outline-nonowner-brush outline-brush)
-(define clear-brush (send the-brush-list find-or-create-brush "WHITE" 'solid))
-
-(define (showcaret>= a b)
-  (memq a (memq b '(no-caret show-inactive-caret show-caret))))
-
-(define-struct clickback (start end f call-on-down? delta hilited? unhilite) #:mutable)
-
-(define in-delayed-refresh (make-parameter #f))
-
-(define-local-member-name do-find-string-all do-find-string)
-
-(defclass text% editor%
-  (inherit-field s-admin
-                 s-offscreen
-                 s-custom-cursor
-                 s-custom-cursor-overrides?
-                 s-keymap
-                 s-own-caret?
-                 s-style-list
-                 s-user-locked?
-                 s-modified?
-                 s-noundomode
-                 s-caret-snip
-                 s-inactive-caret-threshold
-                 s-filename
-                 s-temp-filename?
-                 s-need-on-display-size?)
-  (inherit on-change
-           on-local-event
-           on-local-char
-           free-old-copies
-           install-copy-buffer
-           begin-copy-buffer
-           end-copy-buffer
-           do-buffer-paste
-           copy-ring-next
-           do-write-headers-footers
-           do-set-caret-owner
-           perform-undo-list
-           s-start-intercept
-           s-end-intercept
-           do-own-x-selection
-           copy-out-x-selection
-           add-undo-rec
-           set-modified
-           get-default-style
-           get-snip-data
-           set-snip-data
-           read-snips-from-file
-           on-paint
-           on-focus
-           default-style-name
-           wait-sequence-lock
-           begin-sequence-lock
-           end-sequence-lock
-           do-own-caret
-           on-edit-sequence
-           after-edit-sequence
-           on-display-size)
-  
-  (define read-locked? #t)
-  (define flow-locked? #t)
-  (define write-locked? #t)
-
-  (define hilite-on? #t)
-
-  (define changed? #f) ;; set if on-change() needs to be called 
-
-  (define flash? #f)
-  (define flashautoreset? #f)
-  (define flashdirectoff? #f)
-
-  (define posateol? #f) ;; display the caret at the end of a line?
-  (define flashposateol? #f)
-  (define flashscroll? #f) ;; scroll back after unflashing?
-
-  (define graphics-invalid? #f)
-  (define flow-invalid? #f)
-  (define snip-cache-invalid? #f)
-  (define graphic-maybe-invalid? #f)
-  (define graphic-maybe-invalid-force? #f)
-
-  (define typing-streak? #f)
-  (define deletion-streak? #f)
-  (define delayed-streak? #f)
-  (define vcursor-streak? #f)
-  (define kill-streak? #f)
-  (define anchor-streak? #f)
-  (define extend-streak? #f)
-  (define insert-force-streak? #f)
-  (define delete-force-streak? #f)
-
-  (define keep-anchor-streak? #f)
-
-  (define streaks-pushed? #f)
-  (define save-typing-streak? #f)
-  (define save-deletion-streak? #f)
-  (define save-delayed-streak? #f)
-  (define save-vcursor-streak? #f)
-  (define save-kill-streak? #f)
-  (define save-anchor-streak? #f)
-  (define save-extend-streak? #f)
-
-  (define dragging? #f)
-  (define tracking? #f)
-  (define extra-line? #f) ;; empty line at end of file with no representative
-
-  (define delayedscrollateol? #f)
-  (define delayedscrollbox? #f)
-  (define draw-cached-in-bitmap? #f)
-  (define refresh-unset? #f)
-  (define refresh-box-unset? #f)
-  (define refresh-all? #f)
-
-  (define tab-space-in-units? #f)
-  (define sticky-styles? #t)
-  (define overwrite-mode? #f)
-
-  (define prev-mouse-snip #f)
-
-  (def/public (set-styles-sticky [bool? s?]) (set! sticky-styles? (and s? #t)))
-  (def/public (get-styles-sticky) sticky-styles?)
-
-  (def/public (get-overwrite-mode) overwrite-mode?)
-  (def/public (set-overwrite-mode [bool? v]) (set! overwrite-mode? (and v #t)))
-
-  (def/public (get-sticky-styles) sticky-styles?)
-  (def/public (set-sticky-styles [bool? v]) (set! sticky-styles? (and v #t)))
-
-  (define need-x-copy? #f)
-
-  (define caret-blinked? #f) ;; whether we want to hide an active caret or not
-
-  (define initial-style-needed? #t)
-
-  (define last-draw-caret 0)
-  (define last-draw-x-sel? #f)
-
-  (define max-width 0.0)
-  (define min-width 0.0)
-  (define max-height 0.0)
-  (define min-height 0.0)
-  (define wrap-bitmap-width 0.0)
-
-  (define max-line-width 0.0)
-  
-  (define padding-l 0.0) ; space conceptually at the left of each line,
-  (define padding-t 0.0) ; space conceptually added to the top of the first line,
-  (define padding-r 0.0) ; etc. --- locations in mline do not take this
-  (define padding-b 0.0) ;          padding into account
-
-  (define auto-wrap-bitmap #f)
-
-  (define delay-refresh 0)
-
-  (define len 0) ; total length in "characters" == number of positions - 1
-
-  (define startpos 0)
-  (define endpos 0)
-  (define extendstartpos 0)
-  (define extendendpos 0) ; for extendstreak
-  (define vcursorloc 0.0) ; for vcursor-streak
-
-  (define flash-timer #f)
-  (define flashstartpos 0)
-  (define flashendpos 0)
-
-  (define snips #f)
-  (define last-snip #f) ; the contents of this edit session
-  (define snip-count 0)
-
-  (define snip-admin (new standard-snip-admin% [editor this]))
-  
-  (define line-root-box (box #f))
-  (define first-line #f)
-  (define last-line #f)
-  (define num-valid-lines 0)
-
-  (define extra-line-h 0.0)
-
-  (define total-height 0.0) ; total height/width in canvas units, not including padding
-  (define total-width 0.0)
-  (define final-descent 0.0) ; descent of last line
-  (define initial-space 0.0) ; space from first line
-  (define initial-line-base 0.0) ; inverse descent from first line
-  (define reported-padding (vector 0.0 0.0 0.0 0.0))
-
-  (define/public (get-s-snips) snips)
-  (define/public (get-s-last-snip) last-snip)
-  (define/public (get-s-total-width) total-width)
-  (define/public (get-s-total-height) total-height)
-
-  (define/public (consistent-snip-lines who)
-    (unless (eq? first-line (mline-first (unbox line-root-box)))
-      (error who "bad first line"))
-    (unless (eq? last-line (mline-last (unbox line-root-box)))
-      (error who "bad last line"))
-    (let loop ([line first-line]
-               [snip snips]
-               [snip-num 0])
-      (unless (eq? snips (mline-snip first-line))
-        (error who "bad start snip"))
-      (let sloop ([snip snip][snip-num snip-num])
-        (when (zero? (snip->count snip))
-          (unless (zero? len)
-            (error who "snip count is 0 at ~s" snip-num)))
-        (unless (eq? line (snip->line snip))
-          (error who "snip's line is wrong: ~s ~s" snip (snip->line snip)))
-        (if (eq? snip (mline-last-snip line))
-            (if (mline-next line)
-                (begin
-                  (unless (has-flag? (snip->flags snip) NEWLINE)
-                    (error who "strange line ending"))
-                  (loop (mline-next line) (snip->next snip) (add1 snip-num)))
-                (unless (eq? last-snip snip)
-                  (error who "bad last snip")))
-            (begin
-              (when (or (has-flag? (snip->flags snip) NEWLINE)
-                        (has-flag? (snip->flags snip) HARD-NEWLINE))
-                (error who "mid-line NEWLINE"))
-              (sloop (snip->next snip) (add1 snip-num))))))
-    #t)
-
-  (define caret-style #f)
-
-  (define dragstart 0)
-
-  (define track-clickback #f)
-
-  (define refresh-start 0)
-  (define refresh-end 0)
-  (define refresh-l 0.0)
-  (define refresh-t 0.0)
-  (define refresh-r 0.0) ; can be 'display-end
-  (define refresh-b 0.0) ; can be 'display-end
-
-  (define refresh-box-lock (make-semaphore 1)) ; protects refresh-{l,t,r,b} and refresh-box-unset?
-
-  (define last-draw-l 0.0)
-  (define last-draw-t 0.0)
-  (define last-draw-r 0.0)
-  (define last-draw-b 0.0)
-  (define last-draw-red 0)
-  (define last-draw-green 0)
-  (define last-draw-blue 0)
-
-  (define delayedscroll -1)
-  (define delayedscrollend 0)
-  (define delayedscrollbias 'none)
-  (define delayedscrollsnip #f)
-  (define delayedscroll-x 0.0)
-  (define delayedscroll-y 0.0)
-  (define delayedscroll-w 0.0)
-  (define delayedscroll-h 0.0)
-
-  (define clickbacks null)
-
-  (define file-format 'standard)
-
-  (define between-threshold 2.0)
-
-  (define tab-space TAB-WIDTH) ; inexact
-  
-  (define read-insert 0)
-  (define read-insert-start 0)
-
-  (define prev-paste-start 0)
-  (define prev-paste-end 0)
-  (define save-prev-paste-start 0)
-  (define save-prev-paste-end 0)
-
-  (define revision-count 0.0)
-
-  (define word-break standard-wordbreak)
-  (define word-break-map the-editor-wordbreak-map)
-
-  (define offscreen-key (gensym))
-
-  (init [(ls line-spacing) 1.0]
-        [tab-stops null]
-        [auto-wrap #f])
-
-  (super-new)
-
-  (define line-spacing ls)
-  (define/public (get-s-line-spacing) line-spacing)
-  (define tabs (list->vector tab-stops))
-  
-  (make-only-snip)
-  
-  (set! read-locked? #f)
-  (set! flow-locked? #f)
-  (set! write-locked? #f)
-  ;;; from here on, it is only method definitions, 
-  ;;; so we can unlock the editor now. If code with
-  ;;; effects is added below, be sure to move the
-  ;;; unlocking.
-
-  (def/override (copy-self)
-    (let ([m (new text% [line-spacing line-spacing])])
-      (copy-self-to m)
-      m))
-
-  (def/override (copy-self-to [editor<%> m])
-    (when (m . is-a? . text%)
-      ;; copy parameters, such as tab settings: */
-      (send m set-tabs (vector->list tabs) tab-space tab-space-in-units?)
-      (super copy-self-to m)
-      (when (zero? (send m last-position))
-        ;; make sure only snip in m has a good style (since we called
-        ;; (send m->style-list copy) in copy-self-to).
-        (let* ([sname (default-style-name)]
-               [bs (send (send m get-s-style-list) find-named-style sname)])
-          (set-snip-style! (send m get-s-snips) 
-                           (or bs
-                               (send (send m get-s-style-list) basic-style)))))
-
-      (send m set-file-format (get-file-format))
-      
-      (send m set-wordbreak-func word-break)
-      (send m set-wordbreak-map (get-wordbreak-map))
-      (send m set-between-threshold (get-between-threshold))
-      (send m hide-caret (caret-hidden?))
-      (send m set-overwrite-mode (get-overwrite-mode))
-
-      (send m set-autowrap-bitmap auto-wrap-bitmap)
-
-      (send m set-sticky-styles sticky-styles?)))
-
-  ;; ----------------------------------------
-
-  (def/override (adjust-cursor [mouse-event% event])
-    (if (not s-admin)
-        #f
-        (let-boxes ([scrollx 0.0]
-                    [scrolly 0.0]
-                    [dc #f])
-            (set-box! dc (send s-admin get-dc scrollx scrolly))
-          (if (not dc)
-              #f
-              (let ([x (+ (send event get-x) scrollx)]
-                    [y (+ (send event get-y) scrolly)])
-                (if tracking?
-                    (or s-custom-cursor arrow)
-                    (if (too-busy-to-refresh?)
-                        ;; we're too busy; ask again later
-                        (or (and s-custom-cursor-overrides? s-custom-cursor)
-                            i-beam)
-                        (begin
-                          (begin-sequence-lock)
-                          (begin0
-                           (or (and (not s-custom-cursor-overrides?)
-                                    (or (and s-caret-snip (send event dragging?)
-                                             (let-boxes ([x 0.0]
-                                                         [y 0.0])
-                                                 (get-snip-position-and-location s-caret-snip #f x y)
-                                               (let ([c (send s-caret-snip adjust-cursor dc
-                                                              (- x scrollx) (- y scrolly)
-                                                              x y event)])
-                                                 c)))
-                                        ;; find snip:
-                                        (let-boxes ([onit? #f]
-                                                    [how-close 0.0]
-                                                    [pos 0])
-                                            (set-box! pos (find-position x y #f onit? how-close))
-                                          ;; FIXME: the following refinement of `onit?' seems pointless
-                                          (let ([onit? (and onit?
-                                                            (not (zero? how-close))
-                                                            ((abs how-close) . > . between-threshold))])
-                                            (let ([snip (and onit?
-                                                             (do-find-snip pos 'after))])
-                                              (and snip
-                                                   (let-boxes ([x 0.0] [y 0.0])
-                                                       (get-snip-position-and-location snip #f x y)
-                                                     (let ([c (send snip adjust-cursor dc (- x scrollx) (- y scrolly) 
-                                                                    x y event)])
-                                                       c))))))))
-                               s-custom-cursor
-                               (if (x . >= . 0)
-                                   (let ([cb? (find-clickback (find-position x y #f) y)])
-                                     (if cb? arrow i-beam))
-                                   i-beam))
-                           (end-sequence-lock))))))))))
-
-  (def/override (on-event [mouse-event% event])
-    (when s-admin
-      (when (and (not (send event moving?))
-                 (not (send event entering?))
-                 (not (send event leaving?)))
-        (end-streaks '(except-key-sequence cursor delayed)))
-      (let-values ([(dc x y scrollx scrolly)
-                    ;; first, find clicked-on snip:
-                    (let ([x (send event get-x)]
-                          [y (send event get-y)])
-                      (let-boxes ([scrollx 0.0]
-                                  [scrolly 0.0]
-                                  [dc #f])
-                          (set-box! dc (send s-admin get-dc scrollx scrolly))
-                        ;; FIXME: old code returned if !dc
-                        (values dc (+ x scrollx) (+ y scrolly) scrollx scrolly)))])
-          (let ([snip
-                 (let-boxes ([onit? #f]
-                             [how-close 0.0]
-                             [now 0])
-                     (set-box! now (find-position x y #f onit? how-close))
-                   ;; FIXME: the following refinement of `onit?' seems pointless
-                   (let ([onit? (and onit?
-                                     (not (zero? how-close))
-                                     ((abs how-close) . > . between-threshold))])
-                     (if onit?
-                         ;; we're in the snip's horizontal region...
-                         (let ([snip (do-find-snip now 'after)])
-                           ;; ... but maybe the mouse is above or below it.
-                           (let-boxes ([top 0.0]
-                                       [bottom 0.0]
-                                       [dummy 0.0])
-                               (begin
-                                 (get-snip-location snip dummy top #f)
-                                 (get-snip-location snip dummy bottom #t))
-                             (if (or (top . > . y) (y . > . bottom))
-                                 #f
-                                 snip)))
-                         #f)))])
-            (when (send event button-down?)
-              (set-caret-owner snip))
-            (when (and prev-mouse-snip
-                       (not (eq? snip prev-mouse-snip)))
-              (let-boxes ([x 0.0] [y 0.0])
-                  (get-snip-position-and-location prev-mouse-snip #f x y)
-                (send prev-mouse-snip on-goodbye-event dc (- x scrollx) (- y scrolly) x y event)))
-            (set! prev-mouse-snip #f)
-            (if (and s-caret-snip (has-flag? (snip->flags s-caret-snip) HANDLES-EVENTS))
-                (let-boxes ([x 0.0] [y 0.0])
-                    (get-snip-position-and-location s-caret-snip #f x y)
-                  (send s-caret-snip on-event dc (- x scrollx) (- y scrolly) x y event))
-                (begin
-                  (when (and snip
-                             (has-flag? (snip->flags snip) HANDLES-ALL-MOUSE-EVENTS))
-                    (let-boxes ([x 0.0] [y 0.0])
-                        (get-snip-position-and-location snip #f x y)
-                      (set! prev-mouse-snip snip)
-                      (send snip on-event dc (- x scrollx) (- y scrolly) x y event)))
-                  (on-local-event event)))))))
-
-  (def/override (on-default-event [mouse-event% event])
-    (when s-admin
-      (let-boxes ([scrollx 0.0]
-                  [scrolly 0.0]
-                  [dc #f])
-          (set-box! dc (send s-admin get-dc scrollx scrolly))
-        (let ([x (+ (send event get-x) scrollx)]
-              [y (+ (send event get-y) scrolly)])
-          (when dc
-
-            (let-boxes ([now 0]
-                        [ateol? #f]
-                        [how-close 0.0])
-                (set-box! now (find-position x y ateol? #f how-close))
-              (let ([now (if (and (how-close . > . 0)
-                                  (how-close . <= . between-threshold))
-                             (add1 now)
-                             now)])
-                (cond
-                 [(send event button-down?)
-                  (set! tracking? #f)
-                  (let ([click (and (x . >= . 0) (find-clickback now y))])
-                    (if click
-                        (if (clickback-call-on-down? click)
-                            ((clickback-f click) this (clickback-start click) (clickback-end click))
-                            (begin
-                              (set! tracking? #t)
-                              (set! track-clickback click)
-                              (when s-admin
-                                (send s-admin update-cursor))
-                              (set-clickback-hilited?! track-clickback #t)))
-                        (begin
-                          (set! dragstart now)
-                          (set! dragging? #t)
-                          (when (send event get-shift-down)
-                            (if (dragstart . > . startpos)
-                                (set! dragstart startpos)
-                                (set! dragstart endpos)))
-                          (if (now . < . dragstart)
-                              (set-position-bias-scroll 'start-only now dragstart ateol?)
-                              (set-position-bias-scroll 'end-only dragstart now ateol?)))))]
-                 [(send event dragging?)
-                  (cond
-                   [dragging?
-                    (if (now . < . dragstart)
-                        (when (or (not (= startpos now)) (not (= endpos dragstart)))
-                          (set-position-bias-scroll 'start-only now dragstart ateol?))
-                        (when (or (not (= endpos now)) (not (= startpos dragstart)))
-                          (set-position-bias-scroll 'end-only dragstart now ateol?)))]
-                   [tracking?
-                    (let ([cb (if (x . >= . 0)
-                                  (find-clickback now y)
-                                  #f)])
-                      (set-clickback-hilited?! track-clickback (eq? cb track-clickback)))])]
-                 [(send event button-up?)
-                  (cond
-                   [dragging?
-                    (set! dragging? #f)]
-                   [tracking?
-                    (set! tracking? #f)
-                    (when (clickback-hilited? track-clickback)
-                      (set-clickback-hilited?! track-clickback #f)
-                      (let ([click track-clickback])
-                        ((clickback-f click) this (clickback-start click) (clickback-end click))))
-                    (when s-admin
-                      (send s-admin update-cursor))])]
-                 [(send event moving?)
-                  (set! dragging? #f)
-                  (when tracking?
-                    (set! tracking? #f)
-                    (when (clickback-hilited? track-clickback)
-                      (set-clickback-hilited?! track-clickback #f)
-                      (let ([click track-clickback])
-                        ((clickback-f click) this (clickback-start click) (clickback-end click)))))
-                  (when s-admin
-                    (send s-admin update-cursor))]))))))))
-
-  (def/override (on-char [key-event% event])
-    (when s-admin
-      (if (and s-caret-snip
-               (has-flag? (snip->flags s-caret-snip) HANDLES-EVENTS))
-          (let-boxes ([scrollx 0.0]
-                      [scrolly 0.0]
-                      [dc #f])
-              (set-box! dc (send s-admin get-dc scrollx scrolly))
-            (let-boxes ([x 0.0] [y 0.0])
-                (get-snip-position-and-location s-caret-snip #f x y)
-              (send s-caret-snip on-char dc (- x scrollx) (- y scrolly) x y event)))
-          (let ([code (send event get-key-code)])
-            (when (and (not (eq? 'release code))
-                       (not (eq? 'shift code))
-                       (not (eq? 'control code))
-                       (not (eq? 'menu code))
-                       (not (equal? code #\nul)))
-              (hide-cursor))
-            (on-local-char event)))))
-
-  (def/override (on-default-char [key-event% event])
-    (when s-admin
-      (let ([code (send event get-key-code)]
-            [ins (lambda (ch)
-                   (if (and overwrite-mode? (= endpos startpos))
-                       (insert ch startpos (add1 startpos))
-                       (insert ch)))])
-        (case code
-          [(#\backspace) (delete)]
-          [(#\rubout)
-           (if (= endpos startpos)
-               (when (endpos . < . len)
-                 (delete endpos (add1 endpos)))
-               (delete))]
-          [(right left up down home end prior next)
-           (move-position code (send event get-shift-down))]
-          [(numpad0) (ins #\0)]
-          [(numpad1) (ins #\1)]
-          [(numpad2) (ins #\2)]
-          [(numpad3) (ins #\3)]
-          [(numpad4) (ins #\4)]
-          [(numpad5) (ins #\5)]
-          [(numpad6) (ins #\6)]
-          [(numpad7) (ins #\7)]
-          [(numpad8) (ins #\8)]
-          [(numpad9) (ins #\9)]
-          [(multiply) (ins #\*)]
-          [(divide) (ins #\/)]
-          [(add) (ins #\+)]
-          [(subtract) (ins #\-)]
-          [(decimal) (ins #\.)]
-          [(numpad-enter) (ins #\return)]
-          [(#\return #\tab) (ins code)]
-          [else
-           (let ([vcode (if (char? code)
-                            (char->integer code)
-                            0)])
-             (when (and (vcode . >= . 32)
-                        (or (vcode . <= . #xd800)
-                            (vcode . > . #xdf00)))
-               (ins code)))]))))
-  
-  (def/override (own-caret [any? ownit?])
-    (when (do-own-caret (and ownit? #t))
-      (need-caret-refresh)
-      (on-focus (and ownit? #t))))
-
-  (def/override (blink-caret)
-    (if s-caret-snip
-        (when s-admin
-          (let-boxes ([dx 0.0]
-                      [dy 0.0]
-                      [dc #f])
-              (set-box! dc (send s-admin get-dc dx dy))
-            (when dc
-              (let-boxes ([x 0.0] [y 0.0])
-                  (get-snip-location s-caret-snip x y)
-                (send s-caret-snip blink-caret dc (- x dx) (- y dy))))))
-        (if (too-busy-to-refresh?)
-            ;; we're busy; go away
-            (void)
-            (when (and (= endpos startpos) 
-                       (not flash?)
-                       hilite-on?)
-              (set! caret-blinked? (not caret-blinked?))
-              (need-caret-refresh)))))
-
-  (def/override (size-cache-invalid)
-    (set! graphic-maybe-invalid? #t)
-    (set! graphics-invalid? #t)
-    (when (max-width . > . 0.0)
-      (set! flow-invalid? #t))
-    (set! snip-cache-invalid? #t))
-
-  (def/override-final (locked-for-read?)
-    read-locked?)
-  (def/override-final (locked-for-flow?)
-    flow-locked?)
-  (def/override-final (locked-for-write?)
-    write-locked?)
-
-  ;; ----------------------------------------
-
-  (def/public (can-insert? [exact-nonnegative-integer? start]
-                           [exact-nonnegative-integer? len])
-    #t)
-  (def/public (on-insert [exact-nonnegative-integer? start]
-                         [exact-nonnegative-integer? len])
-    (void))
-  (def/public (after-insert [exact-nonnegative-integer? start]
-                            [exact-nonnegative-integer? len])
-    (void))
-
-  (def/public (can-delete? [exact-nonnegative-integer? start]
-                           [exact-nonnegative-integer? len])
-    #t)
-  (def/public (on-delete [exact-nonnegative-integer? start]
-                         [exact-nonnegative-integer? len])
-    (void))
-  (def/public (after-delete [exact-nonnegative-integer? start]
-                            [exact-nonnegative-integer? len])
-    (void))
-
-  (def/public (can-change-style? [exact-nonnegative-integer? start]
-                                 [exact-nonnegative-integer? len])
-    #t)
-  (def/public (on-change-style [exact-nonnegative-integer? start]
-                               [exact-nonnegative-integer? len])
-    (void))
-  (def/public (after-change-style [exact-nonnegative-integer? start]
-                                  [exact-nonnegative-integer? len])
-    (void))
-
-  (def/public (after-set-position) (void))
-
-  (def/public (can-set-size-constraint?) #t)
-  (def/public (on-set-size-constraint) (void))
-  (def/public (after-set-size-constraint) (void))
-
-  (def/public (after-split-snip [exact-nonnegative-integer? pos]) (void))
-  (def/public (after-merge-snips [exact-nonnegative-integer? pos]) (void))
-
-  ;; ----------------------------------------
-
-  (def/override (begin-edit-sequence [any? [undoable? #t]] [any? [interrupt-seqs? #t]])
-    (define ready! (wait-sequence-lock))
-
-    (when (and (zero? delay-refresh)
-               (not interrupt-seqs?))
-      (push-streaks))
-
-    (end-streaks '(delayed))
-
-    (when (or (positive? s-noundomode)
-              (not undoable?))
-      (set! s-noundomode (add1 s-noundomode)))
-    
-    (if (zero? delay-refresh)
-        (begin
-          (when ALLOW-X-STYLE-SELECTION?
-            (set! need-x-copy? #t))
-          (set! delay-refresh 1)
-          (on-edit-sequence))
-        (set! delay-refresh (add1 delay-refresh)))
-    
-    (ready!))
-
-  (def/override (end-edit-sequence)
-    (if (zero? delay-refresh)
-        (log-error "end-edit-sequence without begin-edit-sequence")
-        (let ([new-delay-refresh (sub1 delay-refresh)])
-          (cond
-           [(zero? new-delay-refresh)
-            (end-streaks null)
-            (pop-streaks)
-            (parameterize ([in-delayed-refresh #t])
-              (redraw))
-            (when s-need-on-display-size?
-              (set! s-need-on-display-size? #f)
-              (on-display-size))
-            (set! delay-refresh 0)
-            (when ALLOW-X-STYLE-SELECTION?
-              (set! need-x-copy? #f))
-            (after-edit-sequence)]
-           [else
-            (set! delay-refresh new-delay-refresh)])
-          (when (positive? s-noundomode)
-            (set! s-noundomode (sub1 s-noundomode))))))
-
-  (def/override (refresh-delayed?)
-    (or (and (delay-refresh . > . 0)
-             (not (in-delayed-refresh)))
-        (not s-admin)
-        (send s-admin refresh-delayed?)))
-
-  (def/override-final (in-edit-sequence?)
-    (and (delay-refresh . > . 0)
-         (not (in-delayed-refresh))))
-
-  (def/override (locations-computed?)
-    (not graphic-maybe-invalid?))
-
-  (def/public (recalculate) (void))
-  
-  (def/public (get-position [maybe-box? start] [maybe-box? [end #f]])
-    (when start (set-box! start startpos))
-    (when end (set-box! end endpos)))
-  
-  (def/public (get-start-position) startpos)
-  (def/public (get-end-position) endpos)
-
-  (def/public (set-position [exact-nonnegative-integer? start]
-                            [(make-alts exact-nonnegative-integer? (make-literal 'same)) [end 'same]]
-                            [any? [ateol? #f]]
-                            [any? [scroll? #t]]
-                            [(symbol-in default x local) [seltype 'default]])
-    (do-set-position #f 'none start end ateol? scroll? seltype #f))
-
-  (def/public (set-position-bias-scroll [symbol? bias]
-                                        [exact-nonnegative-integer? start]
-                                        [(make-alts exact-nonnegative-integer? (make-literal 'same)) [end 'same]]
-                                        [any? [ateol? #f]]
-                                        [any? [scroll? #t]]
-                                        [(symbol-in default x local) [seltype 'default]])
-    (do-set-position #f bias start end ateol? scroll? seltype #f))
-
-  (define/private (do-set-position setflash? bias start end ateol? scroll? seltype dont-end-cursor?)
-    (unless flow-locked?
-      (when (and (not setflash?)
-                 (or (not flash?) (not flashautoreset?) (not flashdirectoff?)))
-        (end-streaks (if dont-end-cursor? '(cursor delayed) '(delayed))))
-      
-      (unless (or (start . < . 0) 
-                  (and (number? end)
-                       (start . > . end)))
-        (let* ([start (min start len)]
-               [end (if (symbol? end)
-                        start
-                        (min end len))]
-               [ateol?
-                (and ateol?
-                     (= end start)
-                     (let-values ([(snip s-pos)
-                                   (find-snip/pos start 'before)])
-                       (and (has-flag? (snip->flags snip) NEWLINE) 
-                            (not (has-flag? (snip->flags snip) INVISIBLE))
-                            (= start (+ s-pos (snip->count snip))))))])
-          (let-values ([(oldstart oldend oldateol?)
-                        (if flash?
-                            (values flashstartpos flashendpos flashposateol?)
-                            (values startpos endpos posateol?))])
-            (when (and (not setflash?)
-                       flash?
-                       flashautoreset?)
-              (set! flash? #f)
-              (when flash-timer
-                (send flash-timer stop)
-                (set! flash-timer #f)))
-            (let* ([need-refresh? (not (and (= oldstart start)
-                                            (= oldend end)
-                                            (eq? oldateol? ateol?)))]
-                   [changed-pos? need-refresh?])
-
-              (if setflash?
-                  (begin
-                    (set! flashstartpos start)
-                    (set! flashendpos end)
-                    (set! flashposateol? ateol?))
-                  (begin
-                    (when ALLOW-X-STYLE-SELECTION?
-                      (when (or (= end start)
-                                (not (eq? editor-x-selection-allowed this))
-                                (eq? 'local seltype))
-                        (when (or (not (in-edit-sequence?))
-                                  need-x-copy?)
-                          (set! need-x-copy? #f)
-                          (copy-out-x-selection))))
-                    
-                    (check-merge-snips startpos)
-                    (check-merge-snips endpos)
-    
-                    (set! caret-style #f)
-                    (set! startpos start)
-                    (set! endpos end)
-                    (set! posateol? ateol?)))
-
-              (let-values ([(need-refresh? need-full-refresh?)
-                            (let ([refresh? (and ALLOW-X-STYLE-SELECTION?
-                                                 (not setflash?)
-                                                 editor-x-selection-mode?
-                                                 (or (and (not (eq? 'local seltype))
-                                                          (not (= start end ))
-                                                          (not (eq? editor-x-selection-owner this))
-                                                          (eq? (own-x-selection #t #f seltype) 'x))
-                                                     (and (or (= start end)
-                                                              (not (eq? editor-x-selection-allowed this))
-                                                              (eq? 'local seltype))
-                                                          (eq? editor-x-selection-owner this)
-                                                          (own-x-selection #f #f #f))))])
-                              (values (or refresh? need-refresh?)
-                                      refresh?))])
-                (when setflash?
-                  (set! flash? #t))
-
-                (let ([need-refresh?
-                       (or
-                        (and scroll?
-                             (let-values ([(scroll-start scroll-end bias)
-                                           (cond
-                                            [(eq? bias 'start-only)
-                                             (values start start 'none)]
-                                            [(eq? bias 'end-only)
-                                             (values end end 'none)]
-                                            [else
-                                             (values start end bias)])])
-                               (let ([was-blinked? caret-blinked?])
-                                 (set! caret-blinked? #f)
-                                 (if (scroll-to-position/refresh scroll-start posateol? #t scroll-end bias)
-                                     #t
-                                     (begin
-                                       (set! caret-blinked? was-blinked?)
-                                       #f)))))
-                        need-refresh?)])
-
-                  (when need-refresh?
-                    (set! caret-blinked? #f)
-                    (if (or (start . >= . oldend)
-                            (end . <= . oldstart)
-                            need-full-refresh?)
-                        (begin
-                          ;; no overlap:
-                          (need-refresh oldstart oldend)
-                          (need-refresh start end))
-                        (begin
-                          (when (start . < . oldstart)
-                            (need-refresh start oldstart))
-                          (when (oldstart . < . start)
-                            (need-refresh oldstart start))
-                          (when (end . < . oldend)
-                            (need-refresh end oldend))
-                          (when (oldend . < . end)
-                            (need-refresh oldend end)))))))
-
-              (when (and changed-pos? (not setflash?))
-                (after-set-position))))))))
-
-  (define/private (scroll-to-position/refresh start
-                                              [ateol? #f]
-                                              [refresh? #t]
-                                              [end 'same]
-                                              [bias 'none])
-    (and 
-     (not flow-locked?)
-     (let ([end (if (eq? end 'same) start (max start end))])
-       (cond
-        [(in-edit-sequence?)
-         (when s-admin
-           (set! delayedscrollbox? #f)
-           (set! delayedscroll start)
-           (set! delayedscrollend end)
-           (set! delayedscrollateol? ateol?)
-           (set! delayedscrollbias bias))
-         #f]
-        [(not (check-recalc #t #f))
-         #f]
-        [else
-         (set! delayedscroll -1)
-  
-         (let-boxes ([topx 0.0] [topy 0.0]
-                     [botx 0.0] [boty 0.0])
-             (begin
-               (position-location start topx topy #t ateol? #t)
-               (position-location end botx boty #f ateol? #t))
-           (let-values ([(topx botx)
-                         (if (botx . < . topx)
-                             ;; when the end position is to the left of the start position 
-                             (values 0 (+ total-width padding-t padding-b))
-                             (values topx botx))])
-             (scroll-editor-to topx topy (- botx topx) (- boty topy) refresh? bias)))]))))
-
-  (def/public (scroll-to-position [exact-nonnegative-integer? start]
-                                  [any? [ateol? #f]]
-                                  [(make-alts exact-nonnegative-integer? (make-literal 'same)) [end 'same]]
-                                  [(symbol-in start end none) [bias 'none]])
-    (scroll-to-position/refresh start ateol? #t end bias))
-
-  (define/private (get-visible-X-range start end all? find)
-    (when (check-recalc #t #f)
-      (let-boxes ([x 0.0] [y 0.0] [w 0.0] [h 0.0])
-          (if all?
-              (send s-admin get-max-view x y w h)
-              (send s-admin get-view x y w h))
-        (begin
-          (when start
-            (set-box! start (find x y)))
-          (when end
-            (set-box! end (find (+ x w) (+ y h))))))))
-
-  (def/public (get-visible-position-range [maybe-box? start] [maybe-box? end] [any? [all? #t]])
-    (get-visible-X-range start end all? (lambda (x y) (find-position x y))))
-
-  (def/public (get-visible-line-range [maybe-box? start] [maybe-box? end] [any? [all? #t]])
-    (get-visible-X-range start end all? (lambda (x y) (find-line y))))
-
-  ;; ----------------------------------------
-
-  (def/public (extend-position [exact-nonnegative-integer? dest])
-    (cond
-      [extend-streak?
-       (values extendstartpos extendendpos)]
-      [anchor-streak?
-       (set! extend-streak? #t)
-       (values extendstartpos extendendpos)]
-      [else
-       (set! extend-streak? #t)
-       (set! extendstartpos startpos)
-       (set! extendendpos endpos)])
-
-    (define-values (start end bias)
-      (cond
-        [(dest . < . extendstartpos)
-         (values dest extendendpos 'start)]
-        [(dest . > . extendendpos)
-         (values extendstartpos dest 'end)]
-        [else
-         (values extendstartpos extendendpos 'none)]))
-    (do-set-position #f bias start end #f #t 'default #t))
-  
-  (def/public (move-position [(make-alts symbol? char?) code]
-                             [any? [extend-selection? #f]]
-                             [(symbol-in simple word page line) [kind 'simple]])
-    (unless (or flow-locked?
-                (not (check-recalc (max-width . > . 0.0) #f #t)))
-
-      (let-values ([(anchor?) anchor-streak?]
-                   [(vcursor?) vcursor-streak?]
-                   [(extendstart extendend)
-                    (if (or extend-streak? anchor-streak?)
-                        (values extendstartpos extendendpos)
-                        (values startpos endpos))]
-                   [(kas?) keep-anchor-streak?])
-
-        (set! keep-anchor-streak? anchor-streak?)
-        
-        (end-streaks '(delayed))
-
-        (let* ([extend? (or anchor? extend-selection?)]
-               ;; rightshrink: motion to right shrinks the selected region
-               [rightshrink? (and extend? (startpos . < . extendstart))]
-               [leftshrink? (and extend? (endpos . > . extendend))])
-          (let-values ([(code kind)
-                        (cond
-                         [(eq? 'prior code) (values 'up 'page)]
-                         [(eq? 'next code) (values 'down 'page)]
-                         [else (values code kind)])])
-            (cond
-             [(eq? 'home code)
-              (if leftshrink?
-                  (set-position-bias-scroll 'start-only extendstart extendend)
-                  (set-position-bias-scroll 'start-only 0 (if extend? extendend 0)))]
-             [(eq? 'end code)
-              (if rightshrink?
-                  (set-position-bias-scroll 'end-only extendstart extendend)
-                  (set-position-bias-scroll 'end-only (if extend? extendstart len) len))]
-             [(eq? 'left code)
-              (if (and (not (eq? 'line kind))
-                       (not (eq? 'word kind))
-                       (not extend?)
-                       (not (= endpos startpos)))
-                  (set-position startpos)
-                  (begin
-                    ;; pick a starting place
-                    (let ([start 
-                           (let ([start (if leftshrink?
-                                            endpos
-                                            startpos)])
-                             (cond
-                              [(eq? 'word kind)
-                               (let-boxes ([start start])
-                                   (find-wordbreak start #f 'caret)
-                                 start)]
-                              [(eq? 'line kind)
-                               (line-start-position (position-line start posateol?))]
-                              [else (max 0 (sub1 start))]))])
-                      (let-values ([(start end)
-                                    (if extend?
-                                        (if leftshrink?
-                                            (let ([start (max start extendend)]) ;; collapse to original
-                                              (values startpos start))
-                                            (values start endpos))
-                                        (values start start))])
-                        (set-position-bias-scroll 'start-only start end)))))]
-             [(eq? 'right code)
-              (if (and (not (eq? 'line kind))
-                       (not (eq? 'word kind))
-                       (not extend?)
-                       (not (= endpos startpos)))
-                  (set-position endpos endpos #t)
-                  (begin
-                    ;; pick a starting place
-                    (let ([end
-                           (let ([end (if rightshrink?
-                                          startpos
-                                          endpos)])
-                             (cond
-                              [(eq? 'word kind)
-                               (let-boxes ([end end])
-                                   (find-wordbreak #f end 'caret)
-                                 end)]
-                              [(eq? 'line kind)
-                               (line-end-position (position-line end posateol?))]
-                              [else (add1 end)]))])
-                      (let-values ([(start end)
-                                    (if extend?
-                                        (if rightshrink?
-                                            (let ([end (min end extendstart)]) ;; collapse to original
-                                              (values end endpos))
-                                            (values startpos end))
-                                        (values end end))])
-                        (set-position-bias-scroll 'end-only start end #t)))))]
-             [(or (eq? 'up code) (eq? 'down code))
-              (let ([special-scroll? (eq? 'page kind)]) ;; used when paging
-                (let-values ([(start end ateol? special-scroll?
-                                     scroll-left scroll-top scroll-width scroll-height
-                                     bias)
-                              (if (eq? 'up code)
-                                  (let ([start (if leftshrink?
-                                                   endpos
-                                                   startpos)])
-                                    (let-boxes ([vcl vcursorloc])
-                                        (when (not vcursor?)
-                                          (position-location start vcl #f #t posateol? #t))
-                                      (set! vcursorloc vcl)
-                                      (let ([cline (position-line start posateol?)])
-                                        (let-values ([(i scroll-left scroll-top scroll-width scroll-height)
-                                                      (if (eq? 'page kind)
-                                                          ;; the current top line should become the next-to bottom line.
-                                                          ;; the caret should go to line above current top line, but
-                                                          ;; watch out for:
-                                                          ;;   - especially tall lines
-                                                          ;;   - already at top
-                                                          (let-boxes ([scroll-left 0.0] [vy 0.0]
-                                                                      [scroll-width 0.0] [scroll-height 0.0])
-                                                              (when s-admin
-                                                                (send s-admin get-view scroll-left vy scroll-width scroll-height))
-                                                            ;; top line should be completely visible as bottom line after
-                                                            ;;   scrolling
-                                                            (let* ([top (find-scroll-line vy)]
-                                                                   [ty (scroll-line-location (+ top 1))]
-                                                                   [newtop (find-scroll-line (- ty scroll-height))]
-                                                                   [y (scroll-line-location newtop)]
-                                                                   [newtop (if (y . < . (- ty scroll-height))
-                                                                               (add1 newtop)
-                                                                               newtop)]
-                                                                   [y (scroll-line-location newtop)]
-                                                                   ;; y is the new top location
-                                                                   [y (if (y . >= . vy)
-                                                                          ;; no or backward progess
-                                                                          (scroll-line-location (max 0 (sub1 top)))
-                                                                          y)])
-                                                              (let ([i (if (= vy y)
-                                                                           ;; must be at the top:
-                                                                           (find-line y)
-                                                                           (let ([i (find-line (+ y scroll-height))])
-                                                                             (if ((line-location (max 0 (- i 1))) . > . y)
-                                                                                 (sub1 i)
-                                                                                 i)))])
-                                                                (values i scroll-left y scroll-width scroll-height))))
-                                                          (values (- cline 1) 0.0 0.0 0.0 0.0))])
-                                          (let-boxes ([start 0] [ateol? #f])
-                                              (if (i . >= . 0)
-                                                  (set-box! start (find-position-in-line i vcursorloc ateol?))
-                                                  (begin (set-box! start 0) (set-box! ateol? #f)))
-                                            (let-values ([(start end special-scroll?)
-                                                          (if extend?
-                                                              (if leftshrink?
-                                                                  (if (start . < . extendend)
-                                                                      (if (and (not (eq? 'page kind))
-                                                                               (start . < . extendstart))
-                                                                          ;; inversion!
-                                                                          (values start extendend special-scroll?)
-                                                                          ;; Collapse to original
-                                                                          (values startpos extendend #f))
-                                                                      (values startpos start special-scroll?))
-                                                                  (values start endpos special-scroll?))
-                                                              (values start start special-scroll?))])
-                                              (values start end ateol? special-scroll?
-                                                      scroll-left scroll-top scroll-width scroll-height
-                                                      (if leftshrink? 'end-only 'start-only))))))))
-                                  ;; (eq? code 'down)
-                                  (let ([end (if rightshrink?
-                                                 startpos
-                                                 endpos)])
-                                    (let-boxes ([vcl vcursorloc])
-                                        (when (not vcursor?)
-                                          (position-location end vcl #f #t posateol? #t))
-                                      (set! vcursorloc vcl)
-                                      (let ([cline (position-line end posateol?)])
-                                        (let-values ([(i scroll-left scroll-top scroll-width scroll-height)
-                                                      (if (eq? 'page kind)
-                                                          (let-boxes ([scroll-left 0.0] [vy 0.0]
-                                                                      [scroll-width 0.0] [scroll-height 0.0])
-                                                              (when s-admin
-                                                                (send s-admin get-view scroll-left vy scroll-width scroll-height))
-                                                            ;; last fully-visible line is the new top line 
-                                                            (let* ([newtop (find-scroll-line (+ vy scroll-height))]
-                                                                   [y (scroll-line-location (+ newtop 1))]
-                                                                   [newtop (if (y . > . (+ vy scroll-height))
-                                                                               (sub1 newtop)
-                                                                               newtop)]
-                                                                   [y (scroll-line-location newtop)])
-                                                              ;; y is the new top location
-                                                              (let-values ([(newtop y)
-                                                                            (if (y . <= . vy)
-                                                                                ;; no or backwards movement; scroll back one
-                                                                                (let ([newtop (+ (find-scroll-line vy) 1)])
-                                                                                  (values newtop (scroll-line-location newtop)))
-                                                                                (values newtop y))])
-                                                                ;; compute top line, for caret
-                                                                (let* ([i (find-line y)]
-                                                                       [i (if ((line-location i #t) . < . y)
-                                                                              (add1 i)
-                                                                              i)])
-                                                                  ;; Now, suppose we're scrolling down while extending the
-                                                                  ;; selection. We want to be able to see that we're
-                                                                  ;; selecting. So try moving the line `i' down one more, if
-                                                                  ;; there's room:
-                                                                  (let ([i (if ((line-location (+ i 1) #f) . < . (+ y scroll-height))
-                                                                               (add1 i)
-                                                                               i)])
-                                                                    (values i scroll-left (- y 1) scroll-width scroll-height))))))
-                                                          (values (+ cline 1) 0.0 0.0 0.0 0.0))])
-                                          (let-values ([(end ateol?)
-                                                        (if (i . <= . (sub1 num-valid-lines))
-                                                            (let-boxes ([ateol? #f] [end 0])
-                                                                (set-box! end (find-position-in-line i vcursorloc ateol?))
-                                                              (values end ateol?))
-                                                            (values len #f))])
-                                            (let-values ([(start end special-scroll?)
-                                                          (if extend?
-                                                              (if rightshrink?
-                                                                  (if (end . > . extendstart)
-                                                                      (if (and (not (eq? 'page kind))
-                                                                               (end . > . extendend))
-                                                                          ;; inversion!
-                                                                          (values extendstart end special-scroll?)
-                                                                          ;; collapse to original
-                                                                          (values extendstart endpos #f))
-                                                                      (values end endpos special-scroll?))
-                                                                  (values startpos end special-scroll?))
-                                                              (values end end special-scroll?))])
-                                              (values start end ateol? special-scroll?
-                                                      scroll-left scroll-top scroll-width scroll-height
-                                                      (if rightshrink? 'start-only 'end-only)))))))))])
-                  (when special-scroll?
-                    (begin-edit-sequence))
-                  
-                  ;; scroll only if !special-scroll
-                  (set-position-bias-scroll bias start end ateol? (not special-scroll?))
-
-                  (when special-scroll?
-                    ;; special scrolling intructions:
-                    (do-scroll-to #f scroll-left scroll-top scroll-width scroll-height #f 'none)
-
-                    (end-edit-sequence))
-
-                  (set! vcursor-streak? #t)))])
-
-            (set! keep-anchor-streak? kas?)
-            (when extend?
-              (set! extend-streak? #t))
-
-            (when (or extend-streak? anchor-streak?)
-              (set! extendendpos extendend)
-              (set! extendstartpos extendstart)))))))
-
-  (def/public (set-anchor [any? on?])
-    (let ([wason? anchor-streak?])
-      (set! anchor-streak? (and on? #t))
-      (when (and on? (not wason?))
-        (set! extendendpos endpos)
-        (set! extendstartpos startpos))))
-
-  (def/public (get-extend-start-position) (if (or extend-streak? anchor-streak?) extendstartpos startpos))
-  (def/public (get-extend-end-position) (if (or extend-streak? anchor-streak?) extendendpos endpos))
-  
-  (def/public (get-anchor)
-    anchor-streak?)
-
-  ;; ----------------------------------------
-
-  (define/private (do-insert isnip str snipsl start end scroll-ok?)
-    (assert (consistent-snip-lines 'do-insert))
-    (unless (or write-locked?
-                s-user-locked?
-                (start . < . 0))
-      (let ([start (min start len)]
-            [str (and str (positive? (string-length str)) str)])
-        ;; turn off pending style, if it doesn't apply
-        (when caret-style
-          (when (or (not (equal? end start)) (not (= startpos start)))
-            (set! caret-style #f)))
-        (let ([deleted? (and (not (eq? end 'same))
-                             (start . < . end)
-                             (begin
-                               (when ALLOW-X-STYLE-SELECTION?
-                                 (when (not (in-edit-sequence?))
-                                   (set! need-x-copy? #t)))
-                               (when (or isnip str snipsl)
-                                 (begin-edit-sequence))
-                               (delete start end scroll-ok?)
-                               (when ALLOW-X-STYLE-SELECTION?
-                                 (when (not (in-edit-sequence?))
-                                   (set! need-x-copy? #f)))
-                               #t))])
-          (when (or isnip str snipsl)
-            (set! write-locked? #t)
-            (let ([success-finish
-                   (lambda (addlen inserted-line?)
-                     (set! initial-style-needed? #f)
-                     (set! revision-count (add1 revision-count))
-
-                     (adjust-clickbacks start start addlen #f)
-
-                     (unless s-modified?
-                       (add-undo-rec (make-object unmodify-record% delayed-streak?)))
-                     (unless (positive? s-noundomode)
-                       (add-undo-rec
-                        (make-object insert-record%
-                                     start addlen
-                                     (or deleted? typing-streak? delayed-streak?
-                                         insert-force-streak?
-                                         (not s-modified?))
-                                     startpos endpos)))
-                     (when (in-edit-sequence?)
-                       (set! delayed-streak? #t))
-
-                     (let ([scroll? (= start startpos)])
-
-                       (when (startpos . >= . start)
-                         (set! startpos (+ startpos addlen)))
-                       (when (endpos . >= . start)
-                         (set! endpos (+ endpos addlen)))
-                       (unless refresh-unset?
-                         (when (refresh-start . >= . start)
-                           (set! refresh-start (+ refresh-start addlen)))
-                         (when (refresh-end . >= . start)
-                           (set! refresh-end (+ refresh-end addlen))))
-
-                       (set! extra-line? (has-flag? (snip->flags last-snip) NEWLINE))
-
-                       (set! write-locked? #f)
-                       (set! flow-locked? #f)
-
-                       (when scroll?
-                         (set! caret-blinked? #f))
-
-                       (when (and scroll? scroll-ok?)
-                         (set! delay-refresh (add1 delay-refresh))
-                         (parameterize ([in-delayed-refresh #f])
-                           (scroll-to-position/refresh startpos))
-                         (set! delay-refresh (sub1 delay-refresh)))
-
-                       (set! changed? #t)
-
-                       (set! caret-style #f)
-
-                       (if inserted-line?
-                           (begin
-                             (set! graphic-maybe-invalid? #t)
-                             (need-refresh start))
-                           (refresh-by-line-demand))
-
-                       (when deleted?
-                         (end-edit-sequence))
-
-                       (unless s-modified?
-                         (set-modified #t))
-
-                       (assert (consistent-snip-lines 'pre-after-insert))
-                       
-                       (after-insert start addlen)))]
-                  [fail-finish
-                   (lambda ()
-                     (set! write-locked? #f)
-                     (set! flow-locked? #f)
-                     (when deleted?
-                       (end-edit-sequence)))])
-              (cond
-                [(or isnip snipsl) 
-                 (insert-snips (if isnip (list isnip) snipsl) start success-finish fail-finish)]
-                [else (insert-string str start success-finish fail-finish)])))))
-      (assert (consistent-snip-lines 'post-do-insert))))
-  
-  (define/private (insert-snips snipsl start success-finish fail-finish)
-    (let ([addlen (for/fold ([addlen 0])
-                      ([isnip (in-list snipsl)]
-                       #:when addlen)
-                    (let ([c (snip->count isnip)])
-                      (and (positive? c)
-                           (not (send isnip is-owned?))
-                           (+ addlen c))))])
-
-      (if (or (not addlen)
-              (zero? addlen)
-              (not (can-insert? start addlen)))
-          (fail-finish)
-          (begin
-            (on-insert start addlen)
-
-            (set! flow-locked? #t)
-
-            ;; make sure on-insert didn't do something bad to the snips:
-            (if (not (for/and ([isnip (in-list snipsl)])
-                       (and (positive? (snip->count isnip))
-                            (not (send isnip is-owned?)))))
-
-                (fail-finish)
-
-                (let loop ([did-one? #f]
-                           [before-snip #f]
-                           [inserted-line? #f]
-                           [snipsl snipsl])
-
-                  (if (null? snipsl)
-                      (success-finish addlen inserted-line?)
-                      (let ([isnip (car snipsl)])
-                        (when (and (has-flag? (snip->flags isnip) NEWLINE)
-                                   (not (has-flag? (snip->flags isnip) HARD-NEWLINE)))
-                          (set-snip-flags! isnip (remove-flag (snip->flags isnip) NEWLINE)))
-
-                        (assert (consistent-snip-lines 'inner-insert))
-                                
-
-                        (let-values ([(before-snip inserted-new-line?)
-                                      (if (and (zero? len) (not did-one?))
-                                          
-                                          ;; special case: ignore the empty snip
-                                          (begin
-                                            (set! snips isnip)
-                                            (set! last-snip isnip)
-                                            (let ([line-root (create-mline)])
-                                              (set-box! line-root-box line-root)
-                                              (set-snip-line! isnip line-root)
-                                              (set-mline-snip! line-root isnip)
-                                              (set-mline-last-snip! line-root isnip)
-                                              (when (max-width . > . 0)
-                                                (mline-mark-check-flow line-root)))
-                                            (values before-snip #f))
-
-                                          (let* ([gsnip (if (not did-one?)
-                                                            (begin
-                                                              (make-snipset start start)
-                                                              (do-find-snip start 'after-or-none))
-                                                            before-snip)]
-                                                 [before-snip (or before-snip gsnip)]
-                                                 [inserted-new-line?
-                                                  (if (not gsnip)
-                                                      (begin
-                                                        (append-snip isnip)
-                                                        (let ([gsnip (mline-last-snip last-line)])
-                                                          (if (and gsnip (has-flag? (snip->flags gsnip) HARD-NEWLINE))
-                                                              (let ([line (mline-insert last-line line-root-box #f)])
-                                                                (set-snip-line! isnip line)
-                                                                (set-mline-snip! line isnip)
-                                                                (set-mline-last-snip! line isnip)
-                                                                (set! num-valid-lines (add1 num-valid-lines))
-                                                                #t)
-                                                              (begin
-                                                                ;; The former last snip might still have a NEWLINE
-                                                                ;;  flag due to line-flowing
-                                                                (when (has-flag? (snip->flags gsnip) NEWLINE)
-                                                                  (set-snip-flags! gsnip (remove-flag (snip->flags gsnip) NEWLINE)))
-                                                                (set-snip-line! isnip last-line)
-                                                                (when (not (mline-snip last-line))
-                                                                  (set-mline-snip! last-line isnip))
-                                                                (set-mline-last-snip! last-line isnip)
-                                                                ;; maybe added extra ghost line:
-                                                                (has-flag? (snip->flags isnip) HARD-NEWLINE)))))
-                                                      (begin
-                                                        (insert-snip gsnip isnip)
-                                                        (if (has-flag? (snip->flags isnip) HARD-NEWLINE)
-                                                            (let* ([gline (snip->line gsnip)]
-                                                                   [line (mline-insert gline line-root-box #t)])
-                                                              (set-snip-line! isnip line)
-                                                              (set! num-valid-lines (add1 num-valid-lines))
-                                                              (if (eq? gsnip (mline-snip gline))
-                                                                  (set-mline-snip! line isnip)
-                                                                  (set-mline-snip! line (mline-snip gline)))
-                                                              (set-mline-last-snip! line isnip)
-                                                              (set-mline-snip! gline gsnip)
-                                                              
-                                                              (let loop ([c-snip (mline-snip line)])
-                                                                (unless (eq? c-snip isnip)
-                                                                  (set-snip-line! c-snip line)
-                                                                  (loop (snip->next c-snip))))
-                                                              
-                                                              (mline-calc-line-length gline)
-                                                              (mline-mark-recalculate gline)
-                                                              #t)
-                                                            (let ([gline (snip->line gsnip)])
-                                                              (set-snip-line! isnip gline)
-                                                              (when (eq? (mline-snip gline) gsnip)
-                                                                (set-mline-snip! gline isnip))
-                                                              #f))))])
-                                            
-                                            (when (max-width . > . 0)
-                                              (mline-mark-check-flow (snip->line isnip))
-                                              (let ([prev (snip->prev isnip)])
-                                                (when (and prev
-                                                           (not (has-flag? (snip->flags isnip) NEWLINE)))
-                                                  (mline-mark-check-flow (snip->line prev))))
-                                              (let ([next (mline-next (snip->line isnip))])
-                                                (when (and next
-                                                           (has-flag? (snip->flags isnip) HARD-NEWLINE))
-                                                  (mline-mark-check-flow next))))
-
-                                            (values before-snip inserted-new-line?)))])
-                          
-                          (set-snip-style! isnip (send s-style-list convert (or (snip->style isnip)
-                                                                                (send s-style-list basic-style))))
-                          
-                          (send isnip size-cache-invalid)
-
-                          (mline-calc-line-length (snip->line isnip))
-                          (mline-mark-recalculate (snip->line isnip))
-
-                          (set! len (+ len (snip->count isnip)))
-                          
-                          (snip-set-admin isnip snip-admin)
-
-                          (set! first-line (mline-first (unbox line-root-box)))
-                          (set! last-line (mline-last (unbox line-root-box)))
-
-                          (assert (consistent-snip-lines 'inner-insert2))
-
-                          (loop #t
-                                before-snip
-                                (or inserted-line? inserted-new-line?)
-                                (cdr snipsl)))))))))))
-
-  (define/private (insert-string str start success-finish fail-finish)
-    (let ([addlen (string-length str)])
-      (if (not (can-insert? start addlen))
-          (fail-finish)
-          (begin
-            (on-insert start addlen)      
-    
-            (set! flow-locked? #t)
-
-            (let-values ([(snip s-pos inserted-line?)
-                          (if (zero? len)
-                              
-                              (let* ([style (if (and sticky-styles?
-                                                     (not initial-style-needed?))
-                                                (snip->style snips)
-                                                (get-default-style))]
-                                     [snip (insert-text-snip start style)])
-                                (set! caret-style #f)
-                                (set-mline-snip! (unbox line-root-box) snip)
-                                (set-mline-last-snip! (unbox line-root-box) snip)
-                                (values snip 0 #f))
-
-                              (let-values ([(gsnip s-pos)
-                                            (if (positive? start)
-                                                (find-snip/pos start 'before)
-                                                (values #f 0))])
-                                (let-values ([(snip s-pos)
-                                              (if (or (not gsnip)
-                                                      (and caret-style (not (eq? caret-style (snip->style gsnip))))
-                                                      (not (has-flag? (snip->flags gsnip) IS-TEXT))
-                                                      ((+ (snip->count gsnip) addlen) . > . MAX-COUNT-FOR-SNIP)
-                                                      (and (not sticky-styles?)
-                                                           (not (eq? (snip->style gsnip) (get-default-style)))))
-                                                  
-                                                  (let ([style (or caret-style
-                                                                   (if sticky-styles?
-                                                                       (if gsnip
-                                                                           (snip->style gsnip)
-                                                                           (snip->style snips))
-                                                                       (get-default-style)))])
-                                                    (let ([snip (insert-text-snip start style)])
-                                                      (set! caret-style #f)
-                                                      (values snip start)))
-                                                  
-                                                  (let ([snip gsnip])
-                                                    (if (has-flag? (snip->flags snip) CAN-APPEND)
-                                                        (values snip s-pos)
-                                                        (let ([style (if sticky-styles?
-                                                                         (snip->style snip)
-                                                                         (get-default-style))])
-                                                          (values (insert-text-snip start style)
-                                                                  start)))))])
-
-                                  (if (and gsnip
-                                           (has-flag? (snip->flags gsnip) HARD-NEWLINE)
-                                           (eq? (snip->next gsnip) snip))
-                                      ;; preceding snip was a newline, so the new slip belongs on the next line:
-                                      (let* ([oldline (snip->line gsnip)]
-                                             [inserted-new-line?
-                                              (if (mline-next oldline)
-                                                  #f
-                                                  (begin
-                                                    (mline-insert oldline line-root-box #f)
-                                                    (set! num-valid-lines (add1 num-valid-lines))
-                                                    (set-mline-last-snip! (mline-next oldline) snip)
-                                                    #t))])
-                                        (let ([newline (mline-next oldline)])
-                                          (set-snip-line! snip newline)
-                                          
-                                          (set-mline-last-snip! oldline gsnip)
-                                          (set-mline-snip! newline snip)
-                                          
-                                          (mline-calc-line-length oldline)
-                                          (mline-mark-recalculate oldline)
-                                          (values snip s-pos inserted-new-line?)))
-                                      
-                                      (values snip s-pos #f)))))])
-
-              (let ([s (- start s-pos)])
-                (set-snip-flags! snip (add-flag (snip->flags snip) CAN-SPLIT))
-                (send snip insert str addlen s)
-                (when (has-flag? (snip->flags snip) CAN-SPLIT)
-                  (set-snip-flags! snip (remove-flag (snip->flags snip) CAN-SPLIT)))
-
-                (mline-calc-line-length (snip->line snip))
-                (mline-mark-recalculate (snip->line snip))
-
-                (when (max-width . > . 0)
-                  (mline-mark-check-flow (snip->line snip))
-                  (let ([prev (mline-prev (snip->line snip))])
-                    (when (and prev
-                               (not (has-flag? (snip->flags (mline-last-snip prev)) HARD-NEWLINE)))
-                      (mline-mark-check-flow prev))))
-                
-                ;; If the snip is too large, divide it up:
-                (define-values (initial-snip initial-s)
-                  (cond
-                   [((+ s addlen) . > . MAX-COUNT-FOR-SNIP)
-                    (let loop ([pos (- start s)] [snip snip] [size (+ addlen s)])
-                      (cond
-                       [(size . > . MAX-COUNT-FOR-SNIP)
-                        (define half (quotient size 2))
-                        
-                        (define intm-snip
-                          (split-one half snip #f))
-                        
-                        (define-values (next-snip next-pos)
-                          (loop pos intm-snip half))
-                        (loop next-pos next-snip (- size half))]
-                       [else
-                        (define new-snip (split-one* size snip))
-                        (values (snip->next new-snip) (+ pos size))]))
-                    (find-snip/pos start 'after)]
-                   [else (values snip s)]))
-
-                ;; If the inserted text contains any newlines or tabs,
-                ;; we need to split it up to use tab snips or the
-                ;; HARD-NEWLINE flag:
-                (let loop ([the-snip initial-snip]
-                           [the-s s]
-                           [snip-start-pos start]
-                           [str (string-snip-buffer initial-snip)]
-                           [sp (+ s (string-snip-dtext initial-snip))]
-                           [i 0]
-                           [cnt 0]
-                           [inserted-line (and inserted-line?
-                                               (snip->line initial-snip))]
-                           [sniplen (- (snip->count initial-snip) s)])
-                  (cond
-                   [(= i addlen)
-                    (set! first-line (mline-first (unbox line-root-box)))
-                    (set! last-line (mline-last (unbox line-root-box)))
-                    (set! len (+ len addlen))
-                    (assert (= (last-position) (+ (mline-get-position last-line)
-                                                  (mline-len last-line))))
-                    (when inserted-line
-                      ;; The last added line could have snips with WIDTH-DEPENDS-ON-X,
-                      ;; but we've only called `adjust-line-length` so far.
-                      (mline-calc-line-length inserted-line))
-                    (success-finish addlen (and inserted-line #t))]
-                   [(= cnt sniplen)
-                    ;; move to next snip
-                    (define snip (snip->next the-snip))
-                    (loop snip
-                          0
-                          (+ i start)
-                          (string-snip-buffer snip)
-                          (string-snip-dtext snip)
-                          i
-                          0
-                          inserted-line
-                          (snip->count snip))]
-                   [else
-                    (when (equal? (string-ref str sp) #\return)
-                      (string-set! str sp #\newline))
-                    (define c (string-ref str sp))
-                    (cond
-                     [(or (equal? c #\newline) (equal? c #\tab))
-                      (let ([newline? (equal? c #\newline)])
-                        (define long-char-snip
-                          (if (zero? (+ cnt the-s))
-                              the-snip
-                              (snip->next (split-one* (+ cnt the-s) the-snip))))
-                        (define char-snip (split-one* 1 long-char-snip))
-                        (define new-snip
-                          (let ([snip char-snip])
-                            (if newline?
-
-                                ;; forced return - split the line
-                                (begin
-                                  (set-snip-flags! snip
-                                                   (remove-flag
-                                                    (add-flag (add-flag (add-flag (snip->flags snip)
-                                                                                  NEWLINE)
-                                                                        HARD-NEWLINE)
-                                                              INVISIBLE)
-                                                    CAN-APPEND))
-                                  (if (not (eq? snip (mline-last-snip (snip->line snip))))
-                                      (let* ([old-line (snip->line snip)]
-                                             [line (mline-insert old-line line-root-box #t)])
-                                        (set-snip-line! snip line)
-                                        (set! num-valid-lines (add1 num-valid-lines))
-                                        (set-mline-last-snip! line snip)
-                                        (set-mline-snip! line (mline-snip old-line))
-
-                                        ;; retarget snips moved to new line:
-                                        (define delta
-                                          (let loop ([c-snip (mline-snip old-line)] [delta 0])
-                                            (cond
-                                             [(eq? c-snip snip)
-                                              (+ delta (snip->count snip))]
-                                             [else
-                                              (set-snip-line! c-snip line)
-                                              (loop (snip->next c-snip)
-                                                    (+ delta (snip->count c-snip)))])))
-                                        
-                                        (set-mline-snip! old-line (snip->next snip))
-
-                                        (mline-adjust-line-length old-line (- delta))
-                                        (mline-mark-recalculate old-line)
-                                        (when (max-width . > . 0)
-                                          (mline-mark-check-flow old-line))
-
-                                        (mline-adjust-line-length line delta)
-                                        (mline-mark-recalculate line)
-                                        (when (max-width . > . 0)
-                                          (mline-mark-check-flow line)))
-
-                                      ;; carriage-return inserted at the end of a auto-wrapped line;
-                                      ;; line lengths stay the same, but next line now starts
-                                      ;; a paragraph
-                                      (let ([next (mline-next (snip->line snip))])
-                                        (when next
-                                          (when (zero? (mline-starts-paragraph next))
-                                            (mline-set-starts-paragraph next #t)))))
-                                  
-                                  snip)
-
-                                ;; convert a tab to a tab-snip%
-                                (let ([tabsnip (let ([ts (on-new-tab-snip)])
-                                                 (if (or (send ts is-owned?)
-                                                         (positive? (snip->count ts)))
-                                                     ;; uh-oh
-                                                     (new tab-snip%)
-                                                     ts))])
-                                  (set-snip-style! tabsnip (snip->style snip))
-                                  (let* ([rsnip (snip-set-admin tabsnip snip-admin)]
-                                         [tabsnip (if (not (eq? rsnip tabsnip))
-                                                      ;; uh-oh
-                                                      (let ([tabsnip (new tab-snip%)])
-                                                        (set-snip-style! tabsnip (snip->style snip))
-                                                        (send tabsnip set-admin snip-admin)
-                                                        tabsnip)
-                                                      tabsnip)])
-                                    
-                                    (set-snip-flags! tabsnip 
-                                                     (add-flag (snip->flags tabsnip) CAN-SPLIT))
-                                    (send tabsnip insert "\t" 1 0)
-                                    (when (has-flag? (snip->flags tabsnip) CAN-SPLIT)
-                                      (set-snip-flags! tabsnip 
-                                                       (remove-flag (snip->flags tabsnip) CAN-SPLIT)))
-                                    (when (has-flag? (snip->flags snip) NEWLINE)
-                                      (set-snip-flags! tabsnip (add-flag (snip->flags tabsnip) NEWLINE)))
-
-                                    (splice-snip tabsnip (snip->prev snip) (snip->next snip))
-                                    (set-snip-line! tabsnip (snip->line snip))
-                                    (when (eq? (mline-snip (snip->line snip)) snip)
-                                      (set-mline-snip! (snip->line tabsnip) tabsnip))
-                                    (when (eq? (mline-last-snip (snip->line snip)) snip)
-                                      (set-mline-last-snip! (snip->line tabsnip) tabsnip))
-                                    tabsnip)))))
-
-                        (let ([snip (snip->next new-snip)])
-                          (let ([i (add1 i)])
-                            (loop snip
-                                  0
-                                  (+ i start)
-                                  (if (= i addlen) #f (string-snip-buffer snip))
-                                  (if (= i addlen) #f (string-snip-dtext snip))
-                                  i
-                                  0
-                                  (if newline?
-                                      (snip->line (or snip new-snip))
-                                      inserted-line)
-                                  (if (= i addlen) 0 (snip->count snip))))))]
-                     
-                     [else
-                      (loop the-snip the-s
-                            start str (+ sp 1) (+ i 1) (+ cnt 1)
-                            inserted-line sniplen)])]))))))))
-
-  (define/private (check-len str len)
-    (unless (len . <= . (string-length str))
-      (raise-mismatch-error (method-name 'text% 'insert)
-                            (format "length ~e too large for given string: "
-                                    len)
-                            str)))
-
-  (define/override (insert . args)
-    (case-args
-     args
-     [([string? str])
-      (do-insert #f str #f startpos endpos #t)]
-     [([string? str] 
-       [exact-nonnegative-integer? start] 
-       [(make-alts exact-nonnegative-integer? (symbol-in same)) [end 'same]]
-       [any? [scroll-ok? #t]])
-      (do-insert #f str #f start end scroll-ok?)]
-     [([exact-nonnegative-integer? len] 
-       [string? str])
-      (check-len str len)
-      (do-insert #f (substring str 0 len) #f startpos endpos #t)]
-     [([exact-nonnegative-integer? len] 
-       [string? str] 
-       [exact-nonnegative-integer? start] 
-       [(make-alts exact-nonnegative-integer? (symbol-in same)) [end 'same]]
-       [any? [scroll-ok? #t]])
-      (check-len str len)
-      (do-insert #f (substring str 0 len) #f start end scroll-ok?)]
-     [([snip% snip])
-      (do-insert snip #f #f startpos endpos #t)]
-     [([snip% snip]
-       [exact-nonnegative-integer? [start startpos]]
-       [(make-alts exact-nonnegative-integer? (symbol-in same)) [end 'same]]
-       [any? [scroll-ok? #t]])
-      (do-insert snip #f #f start end scroll-ok?)]
-     [([char? ch])
-      (do-insert-char ch startpos endpos)]
-     [([char? ch] 
-       [exact-nonnegative-integer? start] 
-       [(make-alts exact-nonnegative-integer? (symbol-in same)) [end 'same]])
-      (do-insert-char ch start end)]
-     (method-name 'text% 'insert)))
-
-  (define/public (do-insert-snips snips pos)
-    (do-insert #f #f snips pos pos #t))
-
-  (define/private (do-insert-char ch start end)
-    (let ([streak? typing-streak?]
-          [ifs? insert-force-streak?])
-      (end-streaks '(delayed))
-      (set! insert-force-streak? streak?)
-      (do-insert #f (string ch) #f start end #t)
-      (set! insert-force-streak? ifs?)
-      (set! typing-streak? #t)))
-
-  (define/private (do-delete start end with-undo? [scroll-ok? #t])
-    (assert (consistent-snip-lines 'do-delete))
-    (unless (or write-locked? s-user-locked?)
-      (let-values ([(start end set-caret-style?)
-                    (if (eq? end 'back)
-                        (if (zero? start)
-                            (values 0 0 #f)
-                            (values (sub1 start) start #t))
-                        (values start end (and (= start startpos)
-                                               (= end endpos))))])
-        (unless (or (start . >= . end)
-                    (start . < . 0)
-                    (start . >= . len))
-          (let ([end (min end len)])
-            (when ALLOW-X-STYLE-SELECTION?
-              (when (and (start . <= . startpos) (end . >= . endpos))
-                (when (or (not (in-edit-sequence?))
-                          need-x-copy?)
-                  (set! need-x-copy? #f)
-                  (copy-out-x-selection))))
-
-            (set! write-locked? #t)
-
-            (if (not (can-delete? start (- end start)))
-                (set! write-locked? #f)
-                (begin
-                  (on-delete start (- end start))
-
-                  (set! flow-locked? #t)
-
-                  (make-snipset start end)
-                  (set! revision-count (add1 revision-count))
-
-                  (let* ([start-snip (do-find-snip start 'before-or-none)]
-                         [end-snip (do-find-snip end 'before)]
-                         [with-undo? (and with-undo?
-                                          (zero? s-noundomode))]
-                         [rec (if with-undo?
-                                  (begin
-                                    (when (not s-modified?)
-                                      (add-undo-rec (make-object unmodify-record% delayed-streak?)))
-                                    (make-object delete-record%
-                                                 start  end
-                                                 (or deletion-streak? delayed-streak?
-                                                     delete-force-streak? (not s-modified?))
-                                                 startpos endpos))
-                                  #f)])
-
-                    (when (and set-caret-style? sticky-styles?)
-                      (set! caret-style (if start-snip
-                                            (snip->style (snip->next start-snip))
-                                            (snip->style snips))))
-
-                    (let-values ([(deleted-line? update-cursor?)
-                                  (let loop ([snip end-snip]
-                                             [deleted-line? #f]
-                                             [update-cursor? #f])
-                                    (if (eq? snip start-snip)
-                                        (values deleted-line? update-cursor?)
-                                        (let ([update-cursor?
-                                               (or (and (eq? snip s-caret-snip)
-                                                        (let ([rl? read-locked?])
-                                                          (set! read-locked? #t)
-                                                          (send s-caret-snip own-caret #f)
-                                                          (set! read-locked? rl?)
-                                                          (set! s-caret-snip #f)
-                                                          #t))
-                                                   update-cursor?)])
-                                          
-                                          (when with-undo?
-                                            (send rec insert-snip snip))
-                                          
-                                          (let* ([prev (snip->prev snip)]
-                                                 [deleted-another-line?
-                                                  (let ([line (snip->line snip)])
-                                                    (cond
-                                                     [(eq? (mline-snip line) snip)
-                                                      (if (eq? (mline-last-snip line) snip)
-                                                          (begin
-                                                            (mline-delete line line-root-box)
-                                                            (set! num-valid-lines (sub1 num-valid-lines))
-                                                            #t)
-                                                          (begin
-                                                            (set-mline-snip! line (snip->next snip))
-                                                            #f))]
-                                                     [(eq? (mline-last-snip line) snip)
-                                                      (if (mline-next line)
-                                                          (begin
-                                                            (set-mline-last-snip! line (mline-last-snip (mline-next line)))
-                                                            (mline-delete (mline-next line) line-root-box)
-                                                            (set! num-valid-lines (sub1 num-valid-lines))
-                                                            #t)
-                                                          (begin
-                                                            (set-mline-last-snip! line prev)
-                                                            ;; maybe deleted extra ghost line:
-                                                            extra-line?))]
-                                                     [else 
-                                                      #f]))])
-                                            (delete-snip snip)
-                                            (loop prev 
-                                                  (or deleted-line?
-                                                      deleted-another-line?)
-                                                  update-cursor?)))))])
-
-                      (when (zero? snip-count)
-                        (make-only-snip)
-                        (when caret-style
-                          (set-snip-style! snips caret-style)
-                          (set! caret-style #f)))
-
-                      (set! first-line (mline-first (unbox line-root-box)))
-                      (set! last-line (mline-last (unbox line-root-box)))
-
-                      (let-values ([(line moved-to-next?)
-                                    (if start-snip
-                                        (if (has-flag? (snip->flags start-snip) NEWLINE)
-                                            (if (mline-next (snip->line start-snip))
-                                                (values (mline-next (snip->line start-snip))
-                                                        #t)
-                                                (begin
-                                                  (mline-mark-check-flow (snip->line start-snip))
-                                                  (values #f #f)))
-                                            (values (snip->line start-snip) #f))
-                                        (values first-line #f))])
-                        
-                        (when line
-                          ;; fix line references from possibly moved snips:
-                          (let ([next (snip->next (mline-last-snip line))])
-                            (let loop ([snip (mline-snip line)])
-                              (unless (eq? snip next)
-                                (set-snip-line! snip line)
-                                (loop (snip->next snip)))))
-
-                          (mline-calc-line-length line)
-                          (mline-mark-recalculate line)
-
-                          (when (max-width . >= . 0)
-                            (mline-mark-check-flow line)
-                            (let ([next (mline-next line)])
-                              (when next (mline-mark-check-flow next)))
-                            (let ([prev (mline-prev line)])
-                              (when (and prev
-                                         (has-flag? (snip->flags (mline-last-snip prev)) HARD-NEWLINE))
-                                (mline-mark-check-flow prev)
-                                (when (and moved-to-next?
-                                           deleted-line?
-                                           (mline-prev prev)
-                                           (not (has-flag? (snip->flags (mline-last-snip (mline-prev prev))) 
-                                                           HARD-NEWLINE)))
-                                  ;; maybe the deleted object was in the middle of a long word,
-                                  ;; and maybe now the long word can be folded into the previous
-                                  ;; line
-                                  (mline-mark-check-flow (mline-prev prev)))))))
-
-                        (adjust-clickbacks start end (- start end) rec)
-
-                        (when with-undo?
-                          (add-undo-rec rec)
-                          (when (in-edit-sequence?)
-                            (set! delayed-streak? #t)))
-
-                        (let ([dellen (- end start)])
-                          (set! len (- len dellen))
-
-                          (check-merge-snips start)
-
-                          (set! flow-locked? #f)
-                          (set! write-locked? #f)
-
-                          (cond
-                           [(and (startpos . >= . start) (startpos . <= . end))
-                            (set! caret-blinked? #f)
-                            (set! startpos start)]
-                           [(startpos . > . end)
-                            (set! caret-blinked? #f)
-                            (set! startpos (- startpos dellen))])
-
-                          (cond
-                           [(and (endpos . >= . start) (endpos . <= . end))
-                            (set! endpos start)]
-                           [(endpos . > . end)
-                            (set! endpos (- endpos dellen))])
-
-                          (unless refresh-unset?
-                            (cond
-                             [(and (refresh-start . >= . start) (refresh-start . <= . end))
-                              (set! refresh-start start)]
-                             [(refresh-start . >= . end)
-                              (set! refresh-start (- refresh-start dellen))])
-                            (cond
-                             [(and (refresh-end . >= . start) (refresh-end . <= . end))
-                              (set! refresh-end start)]
-                             [(refresh-end . >= . end)
-                              (set! refresh-end (- refresh-end dellen))]))
-
-                          (set! extra-line? (has-flag? (snip->flags last-snip) NEWLINE))
-
-                          (when (and scroll-ok? (= start startpos))
-                            (set! delay-refresh (add1 delay-refresh))
-                            (parameterize ([in-delayed-refresh #f])
-                              (scroll-to-position/refresh startpos))
-                            (set! delay-refresh (sub1 delay-refresh)))
-
-                          (set! changed? #t)
-
-                          (unless set-caret-style?
-                            (set! caret-style #f))
-
-                          (when (= len start)
-                            ;; force recheck extra line state:
-                            (set! graphic-maybe-invalid? #t)
-                            (set! graphic-maybe-invalid-force? #t))
-
-                          (if deleted-line?
-                              (begin
-                                (set! graphic-maybe-invalid? #t)
-                                (need-refresh start))
-                              (refresh-by-line-demand))
-
-                          (unless s-modified?
-                            (set-modified #t))
-
-                          (after-delete start dellen)
-
-                          (when update-cursor?
-                            (when s-admin
-                              (send s-admin update-cursor))))))))))))
-      (assert (consistent-snip-lines 'post-do-delete))))
-
-  (define/public (delete . args)
-    (case-args
-     args
-     [()
-      (let ([streak? (= endpos startpos)]
-            [dstreak? deletion-streak?]
-            [dfs? delete-force-streak?])
-        (end-streaks '(delayed))
-        (set! delete-force-streak? dstreak?)
-        
-        (delete startpos (if (= startpos endpos) 'back endpos))
-
-        (set! delete-force-streak? dfs?)
-        (set! deletion-streak? streak?))]
-     [([(make-alts exact-nonnegative-integer? (symbol-in start)) start]
-       [(make-alts exact-nonnegative-integer? (symbol-in back)) [end 'back]]
-       [any? [scroll-ok? #t]])
-      (do-delete (if (symbol? start) startpos start) end #t scroll-ok?)]
-     (method-name 'text% 'delete)))
-
-  (def/public (erase)
-    (do-delete 0 len #t #t))
-  
-  (def/override (clear)
-    (delete startpos endpos #t))
-  
-  ;; ----------------------------------------
-
-  (def/override (cut [any? [extend? #f]] [exact-integer? [time 0]]
-                     [(make-alts exact-nonnegative-integer? (symbol-in start)) [start 'start]]
-                     [(make-alts exact-nonnegative-integer? (symbol-in end)) [end 'end]])
-    (let* ([start (if (symbol? start)
-                      startpos
-                      start)]
-           [end (if (symbol? end)
-                    endpos
-                    end)]
-           [end (min end len)])
-      (unless (start . >= . end)
-        (copy extend? time start end)
-        (delete start end))))
-
-  (def/public (do-copy [exact-nonnegative-integer? startp] 
-                       [exact-nonnegative-integer? endp] 
-                       [exact-integer? time] 
-                       [bool? extend?])
-    (let ([startp (max startp 0)]
-          [endp (min endp len)])
-      (unless (endp . <= . startp)
-
-        (make-snipset startp endp)
-  
-        (let ([sl (or (and extend? copy-style-list)
-                      s-style-list)])
-          (set-common-copy-region-data! (get-region-data startp endp))
-
-          (let ([start (do-find-snip startp 'after)]
-                [end (do-find-snip endp 'after-or-none)]
-                [wl? write-locked?]
-                [fl? flow-locked?])
-
-            (set! write-locked? #t)
-            (set! flow-locked? #t)
-
-            (let loop ([snip start])
-              (unless (eq? snip end)
-                (let ([asnip (send snip copy)])
-                  (snip-set-admin asnip #f)
-                  (set-snip-style! asnip (send sl convert (snip->style asnip)))
-                  (cons-common-copy-buffer! asnip)
-                  (cons-common-copy-buffer2! (get-snip-data snip)))
-                (loop (snip->next snip))))
-
-            (set! write-locked? wl?)
-            (set! flow-locked? fl?)
-
-            (install-copy-buffer time sl))))))
-
-  (def/override (copy [any? [extend? #f]] [exact-integer? [time 0]]
-                      [(make-alts exact-nonnegative-integer? (symbol-in start)) [start 'start]]
-                      [(make-alts exact-nonnegative-integer? (symbol-in end)) [end 'end]])
-    (let* ([start (if (symbol? start)
-                      startpos
-                      start)]
-           [end (if (symbol? end)
-                    endpos
-                    end)]
-           [end (min end len)])
-      (unless (start . >= . end)
-        (begin-copy-buffer)
-        (unless extend?
-          (free-old-copies))
-        (do-copy start end time extend?)
-        (end-copy-buffer))))
-
-  (define/private (do-generic-paste cb start time)
-    (set! read-insert start)
-    (set! read-insert-start start)
-    (let ([orig-len len])
-      (do-buffer-paste cb time #f)
-      (let ([delta (- len orig-len)])
-        (set! prev-paste-start start)
-        (set! prev-paste-end (+ start delta)))))
-
-  (define/public (do-paste start time)
-    (do-generic-paste the-clipboard start time))
-
-  (define/public (do-paste-x-selection start time)
-    (do-generic-paste the-x-selection-clipboard start time))
-
-  (define/private (generic-paste x-sel? time start end)
-    (let* ([end (if (symbol? end)
-                    (if (symbol? start)
-                        endpos
-                        start)
-                    end)]
-           [start (if (eq? start 'start)
-                      startpos
-                      (if (symbol? start)
-                          endpos
-                          start))]
-           [end (min end len)])
-      (unless (start . > . end)
-
-        (begin-edit-sequence)
-        (when (start . < . end)
-          (delete start end))
-
-        (if x-sel?
-            (do-paste-x-selection start time)
-            (do-paste start time))
-
-        (let ([save-prev-paste prev-paste-start])
-          (end-edit-sequence)
-          (set! prev-paste-start save-prev-paste)))))
-
-  (def/override (paste [exact-integer? [time 0]]
-                       [(make-alts exact-nonnegative-integer? (symbol-in start end)) [start 'start]]
-                       [(make-alts exact-nonnegative-integer? (symbol-in same)) [end 'same]])
-    (generic-paste #f time start end))
-
-  (def/override (paste-x-selection [exact-integer? [time 0]]
-                                   [(make-alts exact-nonnegative-integer? (symbol-in start end)) [start 'start]]
-                                   [(make-alts exact-nonnegative-integer? (symbol-in same)) [end 'same]])
-    (generic-paste #t time start end))
-  
-  (define/override (insert-paste-snip snip data)
-    (let ([addpos (snip->count snip)])
-      (insert snip read-insert)
-      (when data
-        (let ([snip (do-find-snip read-insert 'after)])
-          (set-snip-data snip data)))
-      (set! read-insert (+ read-insert addpos))))
-
-  (define/public (paste-region-data data)
-    (set-region-data read-insert-start read-insert data))
-
-  (define/override (insert-paste-string str)
-    (let* ([str (if (eq? 'windows (system-type))
-                    (regexp-replace* #rx"\r\n" str "\n")
-                    str)]
-           ;; change non-breaking space to space:
-           [str (regexp-replace* #rx"\xA0" str " ")])
-
-      (insert str read-insert)
-      (set! read-insert (+ read-insert (string-length str)))))
-
-  (def/public (paste-next)
-    (unless (prev-paste-start . < . 0)
-      (let ([start prev-paste-start]
-            [end prev-paste-end])
-
-        (copy-ring-next)
-        (begin-edit-sequence)
-        (delete start end)
-        (set! read-insert start)
-        (set! read-insert-start start)
-
-        (let ([orig-len len])
-          (do-buffer-paste the-clipboard 0 #t)
-
-          (end-edit-sequence)
-          
-          (let ([delta (- len orig-len)])
-            
-            (set! prev-paste-start start)
-            (set! prev-paste-end (+ start delta)))))))
-
-  (define/private (do-kill time start end)
-    (let ([streak? kill-streak?])
-
-      (begin-edit-sequence)
-      (let-values ([(start end)
-                    (if (symbol? start)
-                        (let ([newend (paragraph-end-position (position-paragraph endpos posateol?))])
-                          (if (= newend startpos)
-                              (set-position startpos (+ startpos 1) #f #t 'local)
-                              (begin
-                                (set-position startpos newend #f #t 'local)
-                                
-                                (let ([text (get-text startpos endpos)])
-                                  (let loop ([i (- endpos startpos)])
-                                    (if (zero? i)
-                                        ;; line has all spaces: move one more
-                                        (set-position startpos (+ endpos 1) #f #t 'local)
-                                        (let ([i (sub1 i)])
-                                          (when (char-whitespace? (string-ref text i))
-                                            (loop i))))))))
-                          (values startpos endpos))
-                        (values start end))])
-
-        (cut streak? time start end)
-        (end-edit-sequence)
-
-        (set! kill-streak? #t))))
-
-  (define/override (kill . args)
-    (case-args
-     args
-     [([exact-integer? [time 0]])
-      (do-kill 0 'start 'end)]
-     [([exact-integer? time]
-       [exact-nonnegative-integer? start]
-       [exact-nonnegative-integer? end])
-      (do-kill time start end)]
-     (method-name 'text% 'kill)))
-
-  (def/override (select-all)
-    (set-position 0 len))
-
-  (define/override (really-can-edit? op)
-    (cond
-     [read-locked? #f]
-     [(and (not (eq? 'copy op))
-           (or flow-locked? write-locked?))
-      #f]
-     [else
-      (case op
-        [(clear cut copy)
-         (not (= endpos startpos))]
-        [(kill)
-         (not (= len endpos))]
-        [(select-all)
-         (positive? len)]
-        [else #t])]))
-
-  ;; ----------------------------------------
-
-  (def/public (split-snip [exact-nonnegative-integer? pos])
-    (unless (or flow-locked?
-                (pos . <= . 0)
-                (pos . >= . len))
-      (let ([wl? write-locked?])
-
-        (set! write-locked? #t)
-        (set! flow-locked? #t)
-        (make-snipset pos pos)
-        (set! write-locked? wl?)
-        (set! flow-locked? #f))))
-
-  (def/public (get-revision-number)
-    revision-count)
-
-  (def/override (get-flattened-text)
-    (get-text 0 'eof #t #f))
-
-  (def/public (get-text [exact-nonnegative-integer? [start 0]]
-                        [(make-alts exact-nonnegative-integer? (symbol-in eof)) [end 'eof]]
-                        [any? [flat? #f]]
-                        [any? [force-cr? #f]])
-    (if read-locked? 
-        ""
-        (let* ([end (if (eq? end 'eof)
-                        len
-                        end)]
-               [start (min start len)]
-               [end (max end start)]
-               [end (min end len)]
-               [count (- end start)])
-          (if (zero? count)
-              ""
-              (let ([wl? write-locked?]
-                    [fl? flow-locked?]
-                    [p (open-output-string)])
-                (set! write-locked? #t)
-                (set! flow-locked? #t)
-
-                (let-values ([(snip s-pos) (find-snip/pos start 'after)])
-                  (let loop ([snip snip]
-                             [offset (- start s-pos)]
-                             [count count])
-                    (let ([num (min (- (snip->count snip) offset)
-                                    count)])
-                      (if (not flat?)
-                          (display (send-generic snip snip%-get-text offset num #f) p)
-                          (begin
-                            (display (send-generic snip snip%-get-text offset num #t) p)
-                            (when (and force-cr?
-                                       (has-flag? (snip->flags snip) NEWLINE)
-                                       (not (has-flag? (snip->flags snip) HARD-NEWLINE)))
-                              (display "\n" p))))
-                      (let ([count (- count num)])
-                        (if (zero? count)
-                            (begin
-                              (set! write-locked? wl?)
-                              (set! flow-locked? fl?)
-                              (get-output-string p))
-                            (loop (snip->next snip)
-                                  0
-                                  count)))))))))))
-  
-  (def/public (get-character [exact-nonnegative-integer? start])
-    (if read-locked?
-        #\nul
-        (let-values ([(snip s-pos) (find-snip/pos (max 0 (min start len)) 'after)])
-          (let ([delta (- start s-pos)])
-            (if (delta . >= . (snip->count snip))
-                #\nul
-                (let ([buffer (make-string 1)])
-                  (send snip get-text! buffer delta 1 0)
-                  (string-ref buffer 0)))))))
-
-  ;; ----------------------------------------
-
-  (def/public (set-clickback [exact-nonnegative-integer? start]
-                             [exact-nonnegative-integer? end]
-                             [procedure? f]
-                             [(make-or-false style-delta%) [c-delta #f]]
-                             [any? [call-on-down? #f]])
-    (let ([delta (make-object style-delta%)])
-      (when c-delta
-        (send delta copy c-delta))
-      
-      (let ([cb (make-clickback start
-                                end
-                                f
-                                call-on-down?
-                                delta
-                                #f
-                                null)])
-        (set! clickbacks (cons cb clickbacks)))))
-
-  (define/public (add-back-clickback cb)
-    (set! clickbacks (cons cb clickbacks)))
-
-  (def/public (remove-clickback [exact-nonnegative-integer? start]
-                                [exact-nonnegative-integer? end])
-    (set! clickbacks
-          (filter (lambda (cb)
-                    (not (and (= start (clickback-start cb))
-                              (= end (clickback-end cb)))))
-                  clickbacks)))
-
-  (def/public (call-clickback [exact-nonnegative-integer? start]
-                              [exact-nonnegative-integer? end])
-    (for-each (lambda (cb)
-                (when (and ((clickback-start cb) . <= . start)
-                           ((clickback-end cb) . >= . end))
-                  ((clickback-f cb)  this (clickback-start cb)  (clickback-end cb))))
-              clickbacks))
-
-  
-  (define/private (adjust-clickbacks start end d rec)
-    (when (pair? clickbacks)
-      (set! clickbacks
-            (filter (lambda (c)
-                      (if (and ((clickback-start c) . >= . start) 
-                               ((clickback-end c) . <= . end))
-                          (begin
-                            (when rec
-                              (send rec add-clickback c))
-                            #f)
-                          #t))
-                    clickbacks))
-      (for-each (lambda (c)
-                  (cond
-                   [((clickback-start c) . >= . end)
-                    (set-clickback-start! c (+ (clickback-start c) d))
-                    (set-clickback-end! c (+ (clickback-end c) d))]
-                   [(and ((clickback-start c) . <= . start)
-                         ((clickback-end c) . >= . end))
-                    (when (or (d . < . 0) ((clickback-end c) . > . end))
-                      (set-clickback-end! c (+ (clickback-end c) d)))]
-                   [(and ((clickback-start c) . > . start) 
-                         ((clickback-end c) . > . end))
-                    (set-clickback-start! c start)
-                    (set-clickback-end! c (+ (clickback-end c) d))]))
-                clickbacks)
-      (set! clickbacks
-            (filter (lambda (c)
-                      (if (= (clickback-start c) (clickback-end c))
-                          (when rec
-                            (send rec add-clickback c)
-                            #f)
-                          #t))
-                    clickbacks))))
-
-  (define/private (find-clickback start y)
-    (ormap (lambda (c)
-             (and ((clickback-start c) . <= . start)
-                  ((clickback-end c) . > . start)
-                  ;; we're in the right horizontal region, but maybe the mouse
-                  ;; is above or below the clickback
-                  (let ([start (do-find-snip (clickback-start c) 'after)]
-                        [end (do-find-snip (clickback-end c) 'before)])
-                    (and start
-                         end
-                         (let-boxes ([top 0.0]
-                                     [bottom 0.0])
-                             (begin
-                               (get-snip-location start #f top #f)
-                               (get-snip-location start #f bottom #t))
-                           (let loop ([start start]
-                                      [top top]
-                                      [bottom bottom])
-                             (if (eq? end start)
-                                 (and (y . >= . top)
-                                      (y . <= . bottom)
-                                      c)
-                                 (let ([start (snip->next start)])
-                                   (let-boxes ([ntop 0.0]
-                                               [nbottom 0.0])
-                                       (begin
-                                         (get-snip-location start #f ntop #f)
-                                         (get-snip-location start #f nbottom #t))
-                                     (loop start
-                                           (min ntop top)
-                                           (max nbottom bottom)))))))))))
-           clickbacks))
-
-  (define/private (set-clickback-hilited c on?)
-    (when (not (eq? (and on? #t)
-                    (clickback-hilited? c)))
-      (cond
-       [on? 
-        (s-start-intercept)
-        
-        (begin-edit-sequence)
-        (flash-on (clickback-start c) (clickback-end c) #f #f 0)
-        (do-change-style (clickback-start c) (clickback-end c) #f (clickback-delta c) #f)
-        (end-edit-sequence)
-
-        (set-clickback-unhilite! c (s-end-intercept))]
-       [else
-        (perform-undo-list (clickback-unhilite c))
-        (set-clickback-unhilite! c null)
-        (flash-off)])
-      (set-clickback-hilited?! (and on? #t))))
-
-  ;; ----------------------------------------
-
-  (def/public (flash-on [exact-nonnegative-integer? start]
-                        [exact-nonnegative-integer? end]
-                        [any? [ateol? #f]]
-                        [any? [scroll? #t]]
-                        [exact-nonnegative-integer? [timeout 500]])
-    (do-set-position #t 'none start end ateol? scroll? 'default #f)
-    (when (timeout . > . 0)
-      (set! flashautoreset? #t)
-      (when flash-timer
-        (send flash-timer stop))
-      (set! flash-timer (new flash-timer% [editor this]))
-      (send flash-timer start timeout))
-    (set! flashscroll? scroll?))
-
-  (def/public (flash-off)
-    (when flash?
-      (set! flashautoreset? #t)
-      (set! flashdirectoff? #t)
-      (do-set-position #f 'none startpos endpos posateol? flashscroll? 'default #f)))
-
-  ;; ----------------------------------------
-
-  (def/public (set-wordbreak-func [procedure? f])
-    (set! word-break f))
-
-  (def/public (find-wordbreak [(make-or-false (make-box exact-nonnegative-integer?)) start] 
-                              [(make-or-false (make-box exact-nonnegative-integer?)) end] 
-                              [(symbol-in caret line selection user1 user2) reason])
-    (unless read-locked?
-      (let ([oldstart (if start (unbox start) 0)]
-            [oldend (if end (unbox end) 0)])
-        (word-break this start end reason)
-
-        (when (and start ((unbox start) . > . oldstart))
-          (set-box! start oldstart))
-        (when (and end ((unbox end) . < . oldend))
-          (set-box! end oldend)))))
-
-  (def/public (get-wordbreak-map)
-    word-break-map)
-
-  (def/public (set-wordbreak-map [(make-or-false editor-wordbreak-map%) map])
-    (set! word-break-map map))
-
-  ;; ----------------------------------------
-
-  (def/public (set-line-spacing [nonnegative-real? s])
-    (unless (or flow-locked?
-                (= line-spacing s))
-      (set! line-spacing s)
-      (size-cache-invalid)
-      (set! changed? #t)
-      (need-refresh -1 -1)))
-
-  (def/public (get-line-spacing) line-spacing)
-
-  (def/public (get-padding)
-    (values padding-l padding-t padding-r padding-b))
-  (def/public (set-padding [nonnegative-real? l]
-                           [nonnegative-real? t]
-                           [nonnegative-real? r]
-                           [nonnegative-real? b])
-    (unless (and (= l padding-l)
-                 (= t padding-t)
-                 (= r padding-r)
-                 (= b padding-b))
-      (set! padding-l (exact->inexact l))
-      (set! padding-t (exact->inexact t))
-      (set! padding-r (exact->inexact r))
-      (set! padding-b (exact->inexact b))
-      (unless (= 0.0 max-width)
-        (set! max-line-width (max (- max-width padding-t padding-r)
-                                  ZERO-LINE-WIDTH)))
-      (set! flow-invalid? #t)
-      (set! graphic-maybe-invalid? #t)
-      (set! changed? #t)
-      (need-refresh -1 -1)))
-
-  (def/override (get-max-width)
-    (if (max-width . <= . 0)
-        'none
-        (+ max-width wrap-bitmap-width)))
-
-  (def/override (get-min-width)
-    (if (min-width . <= . 0)
-        'none
-        min-width))
-
-  (def/override (set-max-width [(make-alts nonnegative-real? (symbol-in none)) w])
-    (unless flow-locked?
-      (let* ([w (if (eq? w 'none) 0.0 w)]
-             [w (if (and (positive? wrap-bitmap-width) (w . > . 0))
-                    (let ([w (- w wrap-bitmap-width)])
-                      (if (w . <= . 0.0)
-                          (+ CURSOR-WIDTH 1)
-                          w))
-                    w)])
-        (unless (or (= max-width w) 
-                    (and (w . <= . 0) (max-width . <= . 0))
-                    (not (can-set-size-constraint?)))
-          (on-set-size-constraint)
-          
-          (let ([w (if (and (w . > . 0)
-                            (w . < . (+ CURSOR-WIDTH 1)))
-                       (+ CURSOR-WIDTH 1)
-                       w)])
-            (set! max-width w)
-            (set! max-line-width (if (= w 0.0)
-                                     0.0
-                                     (max (- w padding-t padding-r)
-                                          ZERO-LINE-WIDTH)))
-            (set! flow-invalid? #t)
-            (set! graphic-maybe-invalid? #t)
-            (set! changed? #t)
-            (need-refresh -1 -1)
-
-            (after-set-size-constraint))))))
-
-  (define/private (set-m-x v current setter)
-    (let ([v (if (eq? v 'none) 0.0 v)])
-      (unless (or flow-locked?
-                  (= current v)
-                  (and (v . <= . 0) (current . <= . 0))
-                  (not (can-set-size-constraint?)))
-        (on-set-size-constraint)
-
-        (set! graphic-maybe-invalid? #t)
-        (set! graphic-maybe-invalid-force? #t)
-        (setter v)
-        (set! changed? #t)
-        (need-refresh -1 -1)
-
-        (after-set-size-constraint))))
-
-  (def/override (set-min-width [(make-alts nonnegative-real? (symbol-in none)) w])
-    (set-m-x w min-width (lambda (w) (set! min-width w))))
-
-  (def/override (set-min-height [(make-alts nonnegative-real? (symbol-in none)) h])
-    (set-m-x h min-height (lambda (h) (set! min-height h))))
-
-  (def/override (set-max-height [(make-alts nonnegative-real? (symbol-in none)) h])
-    (set-m-x h max-height (lambda (h) (set! max-height h))))
-
-  (def/override (get-min-height)
-    (if (min-height . <= . 0)
-        'none
-        min-height))
-
-  (def/override (get-max-height)
-    (if (max-height . <= . 0)
-        'none
-        max-height))
-
-  ;; ----------------------------------------
-
-  (def/override (insert-port [input-port? f] 
-                             [(symbol-in guess same copy standard text text-force-cr) [format 'guess]]
-                             [any? [replace-styles? #t]])
-    (if (or write-locked? s-user-locked?)
-        (if (not (detect-wxme-file (method-name 'text% 'insert-file) f #t))
-            'text
-            'standard)
-        (do-insert-file (method-name 'text% 'insert-file) f format replace-styles?)))
-
-  (define/private (do-insert-file who f fmt clear-styles?)
-    (let ([fmt
-           (cond
-            [(or (eq? 'guess fmt) (eq? 'same fmt) (eq? 'copy fmt))
-             (if (not (detect-wxme-file who f #t))
-                 'text
-                 'standard)]
-            [else fmt])])
-
-      (let ([fileerr?
-             (cond
-              [(eq? 'standard fmt)
-               (if (not (detect-wxme-file who f #f))
-                   (error who "not a WXME file")
-                   (let* ([b (make-object editor-stream-in-file-base% f)]
-                          [mf (make-object editor-stream-in% b)])
-                     (or (and (not (read-editor-version mf b #f #t))
-                              'read-editor-version-failed)
-                         (and (not (read-editor-global-header mf))
-                              'read-editor-global-head-failed)
-                         (and (not (send mf ok?))
-                              'mf-not-ok)
-                         (and (not (read-from-file mf clear-styles?))
-                              'read-from-file-failed)
-                         (and (not (read-editor-global-footer mf))
-                              'read-editor-gobal-footer-failed)
-                         (begin
-                           ;; if STD-STYLE wasn't loaded, re-create it:
-                           (send s-style-list new-named-style "Standard" (send s-style-list basic-style))
-                           (and (not (send mf ok?))
-                                'mf-not-okay-after-adding-standard-style)))))]
-              [(or (eq? fmt 'text) (eq? fmt 'text-force-cr))
-               (let ([s (make-string 1024)])
-                 (let loop ([saved-cr? #f])
-                   (let ([len (read-string! s f)])
-                     (unless (eof-object? len)
-                       (let* ([s1 (if (= len (string-length s))
-                                      s
-                                      (substring s 0 len))]
-                              [s2 (if (equal? #\return (string-ref s1 (sub1 len)))
-                                      (substring s1 0 (sub1 len))
-                                      s1)])
-                         (insert (regexp-replace* #rx"\r\n" 
-                                                  (if saved-cr? (string-append "\r" s2) s2)
-                                                  "\n"))
-                         (loop (not (eq? s1 s2))))))))
-               #f])])
-        
-        (when fileerr?
-          (error who "error loading the file~a" (if (boolean? fileerr?)
-                                                    ""
-                                                    (format " (~a)" fileerr?))))
-
-        fmt)))
-
-  (def/override (save-port [output-port? f]
-                           [(symbol-in guess same copy standard text text-force-cr) [format 'same]]
-                           [any? [show-errors? #t]])
-    (when read-locked?
-      (error (method-name 'text% 'save-file) "editor locked for reading"))
-
-    (let ([format 
-           (cond
-            [(or (eq? 'same format) (eq? 'guess format) (eq? 'copy format))
-             file-format]
-            [else format])])
-
-      (let ([fileerr?
-             (cond
-              [(or (eq? 'text format) (eq? 'text-force-cr format))
-               (display (get-text 0 'eof #t (eq? format 'text-force-cr)) f)
-               #f]
-              [else
-               (let* ([b (make-object editor-stream-out-file-base% f)]
-                      [mf (make-object editor-stream-out% b)])
-                 (not (and (write-editor-version mf b)
-                           (write-editor-global-header mf)
-                           (send mf ok?)
-                           (write-to-file mf)
-                           (write-editor-global-footer mf)
-                           (send mf ok?))))])])
-        (when fileerr?
-          (error (method-name 'text% 'save-port) "error writing editor content"))
-        #t)))
-  
-  (define/private (do-read-from-file f start overwritestyle?)
-    (if write-locked?
-        #f
-        (let ([start (if (symbol? start)
-                         startpos
-                         start)])
-          (set! read-insert start)
-          (let ([result (read-snips-from-file f overwritestyle?)])
-
-            (when (zero? len)
-              ;; we probably destructively changed the style list; reset the dummy snip
-              (set-snip-style! snips (or (get-default-style)
-                                         (send s-style-list basic-style))))
-
-            result))))
-
-  (define/override (read-from-file . args)
-    (case-args
-     args
-     [([editor-stream-in% f] [exact-nonnegative-integer? start] [any? [overwritestyle? #f]])
-      (do-read-from-file f start overwritestyle?)]
-     [([editor-stream-in% f] [any? [overwritestyle? #f]])
-      (do-read-from-file f 'start overwritestyle?)]
-     (method-name 'text% 'read-from-file)))
-
-  (define/override (do-read-insert snip)
-    (if (list? snip)
-        (let ([oldlen len])
-          (do-insert #f #f snip startpos startpos #t)
-          (set! read-insert (+ read-insert (- len oldlen)))
-          #t)
-        (let ([addpos (snip->count snip)])
-          (do-insert snip #f #f startpos startpos #t)
-          (set! read-insert (+ addpos read-insert))
-          #t)))
-
-  (def/override (write-to-file [editor-stream-out% f]
-                               [exact-nonnegative-integer? [start 0]]
-                               [(make-alts exact-nonnegative-integer? (symbol-in eof)) [end 'eof]])
-    (if read-locked?
-        #f
-        (let ([end (max (if (eq? end 'eof)
-                            len
-                            end)
-                        start)])
-          (let ([start-snip (if (zero? len) #f (do-find-snip start 'after))]
-                [end-snip (if (zero? len) #f (do-find-snip end 'after-or-none))])
-            (and (do-write-headers-footers f #t)
-                 (write-snips-to-file f s-style-list #f start-snip end-snip #f this)
-                 (do-write-headers-footers f #f))))))
-
-  (def/public (get-file-format) file-format)
-  (def/public (set-file-format [(symbol-in standard text text-force-cr) format])
-    (set! file-format format))
-
-  (def/override (set-filename [(make-or-false path-string?) name][any? [temp? #f]])
-    (set! s-filename (if (string? name)
-                         (string->path name)
-                         name))
-    (set! s-temp-filename? temp?)
-    (let ([wl? write-locked?]
-          [fl? flow-locked?])
-      (set! write-locked? #t)
-      (set! flow-locked? #t)
-
-      (let loop ([snip snips])
-        (when snip
-          (when (has-flag? (snip->flags snip) USES-BUFFER-PATH)
-            (send snip set-admin snip-admin))
-          (loop (snip->next snip))))
-      
-      (set! write-locked? wl?)
-      (set! flow-locked? fl?)))
-
-  ;; ----------------------------------------
-
-  (def/public (get-region-data [exact-nonnegative-integer? start]
-                               [exact-nonnegative-integer? end])
-    #f)
-
-  (def/public (set-region-data [exact-nonnegative-integer? start]
-                               [exact-nonnegative-integer? end]
-                               [editor-data% d])
-    (void))
-
-  ;; ----------------------------------------
-
-  (def/public (get-tabs [maybe-box? [count #f]] 
-                        [maybe-box? [space #f]] 
-                        [maybe-box? [in-units #f]])
-    (when count
-      (set-box! count (vector-length tabs)))
-    (when space
-      (set-box! space (if (symbol? tab-space)
-                          #f
-                          tab-space)))
-    (when in-units
-      (set-box! in-units tab-space-in-units?))
-
-    (vector->list tabs))
-
-  (def/public (set-tabs [(make-list real?) newtabs]
-                        [(make-alts real? (symbol-in tab-width)) [tab-width 20]]
-                        [any? [in-units? #t]])
-    (unless flow-locked?
-      (set! tabs (list->vector newtabs))
-
-      (if (and (number? tab-width) (tab-width . >= . 1))
-          (set! tab-space (exact->inexact tab-width))
-          (set! tab-space TAB-WIDTH))
-
-      (set! tab-space-in-units? in-units?)
-      
-      (size-cache-invalid)
-      (set! changed? #t)
-      (need-refresh -1 -1)))
-
-  ;; ----------------------------------------
-
-  (define/private (do-find-position-in-line internal? i x ateol?-box onit?-box how-close-box)
-    (when onit?-box
-      (set-box! onit?-box #f))
-    (when ateol?-box
-      (set-box! ateol?-box #f))
-    (when how-close-box
-      (set-box! how-close-box 100.0))
-
-    (cond
-     [(and (not internal?) (not (check-recalc #t #f)))
-      0]
-     [(i . < . 0) 0]
-     [(i . >= . num-valid-lines) len]
-     [else
-      (let* ([line (mline-find-line (unbox line-root-box) i)]
-             [x (- x padding-l (mline-get-left-location line max-line-width))])
-        (if (x . <= . 0)
-            (find-first-visible-position line)
-            (let ([p (mline-get-position line)])
-              (let-values ([(snip s-pos p)
-                            (if (x . >= . (mline-w line))
-                                ;; snip == the last one
-                                (let ([snip (mline-last-snip line)])
-                                  (values snip
-                                          (+ p (- (mline-len line) (snip->count snip)))
-                                          (+ p (mline-len line))))
-                                (begin
-                                  (when onit?-box
-                                    (set-box! onit?-box #t))
-
-                                  (let ([dc (send s-admin get-dc)]
-                                        [X 0]
-                                        [wl? write-locked?]
-                                        [fl? flow-locked?])
-                                    (set! write-locked? #t)
-                                    (set! flow-locked? #t)
-
-                                    ;; linear search for snip
-                                    (let ([topy (mline-get-location line)])
-                                      (let loop ([snip (mline-snip line)]
-                                                 [X X]
-                                                 [x x]
-                                                 [p p])
-                                        (let-boxes ([w 0.0])
-                                            (when dc (send snip get-extent dc X topy w #f #f #f #f #f))
-                                          (if (and (x . > . w) (snip->next snip) dc)
-                                              (loop (snip->next snip)
-                                                    (+ X w)
-                                                    (- x w)
-                                                    (+ p (snip->count snip)))
-                                              ;; found the right snip
-                                              (let ([s-pos p]
-                                                    [p (+ p (do-find-position-in-snip dc X topy snip x how-close-box))])
-                                                (set! write-locked? wl?)
-                                                (set! flow-locked? fl?)
-                                                (values snip s-pos p)))))))))])
-
-                ;; back up over invisibles
-                (let ([atsnipend? (- (- p s-pos) (snip->count snip))])
-                  (let-boxes ([p p]
-                              [snip snip])
-                      (when atsnipend?
-                        (find-last-visible-position line p snip))
-                    (when (and ateol?-box 
-                               atsnipend?
-                               snip 
-                               (eq? snip (mline-last-snip line)))
-                      (set-box! ateol?-box #t))
-                    p))))))]))
-
-  (define/private (find-first-visible-position line [snip #f])
-    (if read-locked?
-        0
-        (let* ([snip (or snip (mline-snip line))]
-               [startp (mline-get-position line)]
-               [p startp]
-               [next-snip (snip->next (mline-last-snip line))])
-          (let loop ([snip snip]
-                     [p p])
-            (cond
-             [(eq? snip next-snip)
-              ;; if everything is invisible, then presumably the CR is forced,
-              ;; so go to the beginning of the line anyway
-              startp]
-             [(has-flag? (snip->flags snip) INVISIBLE)
-              (loop (snip->next snip) (+ p (snip->count snip)))]
-             [else p])))))
-
-  (define/private (find-last-visible-position line p-box [snip-box #f])
-    (unless read-locked?
-      (let ([snip (or (if snip-box
-                          (unbox snip-box)
-                          #f)
-                      (mline-last-snip line))]
-            [p (unbox p-box)])
-        (let loop ([p p]
-                   [snip snip])
-          (let ([p (if (has-flag? (snip->flags snip) INVISIBLE)
-                       (- p (snip->count snip))
-                       p)])
-            (if (eq? snip (mline-snip line))
-                (begin
-                  (set-box! p-box p)
-                  (when snip-box
-                    (set-box! snip-box snip)))
-                (loop p (snip->prev snip))))))))
-
-  (def/public (find-position-in-line [exact-nonnegative-integer? i]
-                                     [real? x]
-                                     [maybe-box? [ateol? #f]]
-                                     [maybe-box? [onit? #f]]
-                                     [maybe-box? [how-close #f]])
-    (do-find-position-in-line #f i x ateol? onit? how-close))
-
-  (define/private (do-find-position-in-snip dc X Y snip x how-close)
-    (cond
-     [read-locked? 0]
-     [(x . < . 0)
-      (when how-close
-        (set-box! how-close -100.0))
-      0]
-     [else
-      (let ([wl? write-locked?]
-            [fl? flow-locked?])
-        (set! write-locked? #t)
-        (set! flow-locked? #t)
-
-        (let ([c (snip->count snip)])
-          (if ((send snip partial-offset dc X Y c) . <= . x)
-              (begin
-                (when how-close
-                  (set-box! how-close 100.0))
-                (set! write-locked? wl?)
-                (set! flow-locked? fl?)
-                c)
-            
-              ;; binary search for position within snip:
-              (let loop ([range c]
-                         [i (quotient c 2)]
-                         [offset 0])
-                (let ([dl (send snip partial-offset dc X Y (+ offset i))])
-                  (if (dl . > . x)
-                      (loop i (quotient i 2) offset)
-                      (let ([dr (send snip partial-offset dc X Y (+ offset i 1))])
-                        (if (dr . <= . x)
-                            (let ([range (- range i)])
-                              (loop range (quotient range 2) (+ offset i)))
-                            (begin
-                              (when how-close
-                                (set-box! how-close
-                                          (if ((- dr x) . < . (- x dl))
-                                              (- dr x)
-                                              (- dl x))))
-                              (set! write-locked? wl?)
-                              (set! flow-locked? fl?)
-                              (+ i offset))))))))))]))
-
-  (def/public (find-line [real? y] [maybe-box? [onit? #f]])
-    (when onit?
-      (set-box! onit? #f))
-    
-    (let ([y (- y padding-t)])
-      (cond
-       [(not (check-recalc #t #f)) 0]
-       [(y . <= . 0) 0]
-       [(or (y . >= . total-height) (and extra-line? (y . >= . (- total-height extra-line-h))))
-        (- num-valid-lines (if extra-line? 0 1))]
-       [else
-        (when onit?
-          (set-box! onit? #t))
-        (mline-get-line (mline-find-location (unbox line-root-box) y))])))
-
-  (def/public (find-position [real? x] [real? y]
-                             [maybe-box? [ateol? #f]]
-                             [maybe-box? [onit? #f]]
-                             [maybe-box? [how-close #f]])
-    (if read-locked?
-        0
-        (begin
-          (when ateol?
-            (set-box! ateol? #f))
-
-          (let* ([online (box #f)]
-                 [i (find-line y online)])
-            (if (and (i . >= . (- num-valid-lines 1))
-                     (not (unbox online))
-                     (y . > . 0))
-                (begin
-                  (when onit?
-                    (set-box! onit? #f))
-                  (when how-close
-                    (set-box! how-close 100.0))
-                  len)
-                (let ([p (find-position-in-line i x ateol? onit? how-close)])
-                  (when onit?
-                    (set-box! onit? (and (unbox online) (unbox onit?))))
-                  p))))))
-
-  (def/public (position-line [exact-nonnegative-integer? start]
-                             [any? [eol? #f]])
-    (cond
-     [(not (check-recalc (max-width . > . 0) #f #t)) 0]
-     [(start . <= . 0) 0]
-     [(start . >= . len)
-      (if (and extra-line? (not eol?))
-          num-valid-lines
-          (- num-valid-lines 1))]
-     [else
-      (let* ([line (mline-find-position (unbox line-root-box) start)]
-             [line (if (and eol? (= (mline-get-position line) start))
-                       (mline-prev line)
-                       line)])
-        (mline-get-line line))]))
-
-  
-  (def/public-final (get-snip-position-and-location [snip% thesnip] [maybe-box? pos] 
-                                                    [maybe-box? [x #f]] [maybe-box? [y #f]])
-    (cond
-     [(not (check-recalc (or x y) #f))
-      #f]
-     [(or (not (snip->line thesnip))
-          (not (eq? (mline-get-root (snip->line thesnip)) (unbox line-root-box))))
-      #f]
-     [(or pos x y)
-      (let* ([line (snip->line thesnip)]
-             [p (mline-get-position line)])
-        (let loop ([snip (mline-snip line)]
-                   [p p])
-          (if (object=? snip thesnip)
-              (begin
-                (when pos
-                  (set-box! pos p))
-                (when (or x y)
-                  (position-location p x y))
-                #t)
-              (loop (snip->next snip)
-                    (+ p (snip->count snip))))))]
-     [else #t]))
-
-  (def/override (get-snip-location [snip% thesnip] [maybe-box? [x #f]] [maybe-box? [y #f]] [any? [bottom-right? #f]])
-    (let ([x (or x (and bottom-right? (box 0.0)))]
-          [y (or y (and bottom-right? (box 0.0)))])
-      (if (get-snip-position-and-location thesnip #f x y)
-          (if bottom-right?
-              (let ([wl? write-locked?]
-                    [fl? flow-locked?])
-                (set! write-locked? #t)
-                (set! flow-locked? #t)
-      
-                (let ([dc (send s-admin get-dc)])
-                  (let-boxes ([w 0.0]
-                              [h 0.0])
-                      (when dc
-                        (send thesnip get-extent dc (unbox x) (unbox y) w h #f #f #f #f))
-
-                    (set! write-locked? wl?)
-                    (set! flow-locked? fl?)
-
-                    (set-box! x (+ (unbox x) w))
-                    (set-box! y (+ (unbox y) h))
-                    #t)))
-              #t)
-          #f)))
-
-  (def/public (get-snip-position [snip% thesnip])
-    (let-boxes ([pos 0])
-        (unless (get-snip-position-and-location thesnip pos)
-          (set-box! pos #f))
-      pos))
-  
-  (def/public (position-locations [exact-nonnegative-integer? start]
-                                  [maybe-box? [tx #f]]
-                                  [maybe-box? [ty #f]]
-                                  [maybe-box? [bx #f]]
-                                  [maybe-box? [by #f]]
-                                  [any? [eol? #f]]
-                                  [any? [whole-line? #f]])
-    (when (check-recalc #t #f)
-
-      ;; handle boundary cases first:
-      (let ([line
-             (cond
-              [(start . <= . 0)
-               (if whole-line?
-                   (begin
-                     (when (or tx bx)
-                       (let ([xl (+ (mline-get-left-location first-line max-line-width)
-                                    padding-l)])
-                         (when tx (set-box! tx xl))
-                         (when bx (set-box! bx xl))))
-                     (when (or ty by)
-                       (let ([yl (+ (mline-get-location first-line)
-                                    padding-t)])
-                         (when ty (set-box! ty yl))
-                         (when by (set-box! by (+ yl (mline-h first-line))))))
-                     #f)
-                   first-line)]
-              [(start . >= . len)
-               (if (and extra-line? (not eol?))
-                   (begin
-                     (when ty (set-box! ty (+ (- total-height extra-line-h) padding-t)))
-                     (when by (set-box! by (+ total-height padding-t)))
-                     (when tx (set-box! tx padding-l))
-                     (when bx (set-box! bx padding-l))
-                     #f)
-                   (if (or whole-line? (zero? len))
-                       (begin
-                         (when (or tx bx)
-                           (let ([xl (+ (mline-get-right-location last-line max-line-width)
-                                        padding-l)])
-                             (when tx (set-box! tx xl))
-                             (when bx (set-box! bx xl))))
-                         (when (or ty by)
-                           (let ([yl (+ (mline-get-location last-line)
-                                        padding-t)])
-                             (when ty (set-box! ty yl))
-                             (when by (set-box! by (+ yl (mline-h last-line))))))
-                         #f)
-                       last-line))]
-              [else
-               (let ([line (mline-find-line (unbox line-root-box) (position-line start eol?))])
-                 (if whole-line?
-                     (begin
-                       (when (or by ty)
-                         (let ([yl (+ (mline-get-location line) padding-t)])
-                           (when ty (set-box! ty yl))
-                           (when by (set-box! by (+ yl (mline-h line))))))
-                       (if (not (or tx bx))
-                           #f
-                           line))
-                     line))])])
-        (when line
-          (let ([wl? write-locked?]
-                [fl? flow-locked?])
-            (set! write-locked? #t)
-            (set! flow-locked? #t)
-
-            (let ([horiz (+ (mline-get-left-location line max-line-width) padding-l)]
-                  [topy (+ (mline-get-location line) padding-t)]
-                  [start (- start (mline-get-position line))])
-              (let-values ([(snip horiz start dc)
-                            (cond
-                             [(zero? start) (values (mline-snip line) horiz start #f)]
-                             [(start . >= . (mline-len line))
-                              (values (mline-last-snip line) (+ horiz (- (mline-w line) (mline-last-w line)))
-                                      start #f)]
-                             [else
-                              ;; linear search for snip
-                              (let loop ([snip (mline-snip line)]
-                                         [start start]
-                                         [horiz horiz]
-                                         [dc #f])
-                                (if (or (start . > . (snip->count snip))
-                                        (and (or whole-line? (positive? start))
-                                             (= start (snip->count snip))))
-                                    (let* ([start (- start (snip->count snip))]
-                                           [dc (or dc (send s-admin get-dc))])
-                                      (let-boxes ([v 1.0])
-                                          (when dc
-                                            (send snip get-extent dc horiz topy v #f #f #f #f #f))
-                                        (loop (snip->next snip) start (+ horiz v) dc)))
-                                    ;; found snip
-                                    (values snip horiz start dc)))])])
-                (let ([dc
-                       (if (or tx bx)
-                           (let ([dc (or dc
-                                         (and (positive? start)
-                                              (send s-admin get-dc)))])
-                             (let ([xv (+ horiz
-                                          (if (and dc (positive? start))
-                                              (send snip partial-offset dc horiz topy start)
-                                              0))])
-                               (when tx (set-box! tx xv))
-                               (when bx (set-box! bx xv)))
-                             dc)
-                           dc)])
-                  (when (and (not whole-line?)
-                             (or ty by))
-                    (let ([dc (or dc (send s-admin get-dc))])
-                      (let-boxes ([h 0.0]
-                                  [descent 0.0]
-                                  [space 0.0])
-                          (when dc
-                            (send snip get-extent dc horiz topy #f h descent space #f #F))
-                        (let ([align (send (snip->style snip) get-alignment)])
-                          (cond
-                           [(eq? 'bottom align)
-                            (let ([yl (+ topy (mline-bottombase line) descent)])
-                              (when ty (set-box! ty (- yl h)))
-                              (when by (set-box! by yl)))]
-                           [(eq? 'top align)
-                            (let ([yl (- (+ topy (mline-topbase line)) space)])
-                              (when ty (set-box! ty yl))
-                              (when by (set-box! by (+ yl h))))]
-                           [else
-                            (let* ([h (/ (- h descent space) 2)]
-                                   [yl (+ topy (/ (+ (mline-topbase line) (mline-bottombase line)) 2))])
-                              (when ty (set-box! ty (- yl h space)))
-                              (when by (set-box! by (+ yl h descent))))])))))
-
-                  (set! write-locked? wl?)
-                  (set! flow-locked? fl?)))))))))
-
-  (def/public (position-location [exact-nonnegative-integer? start]
-                                 [maybe-box? [x #f]]
-                                 [maybe-box? [y #f]]
-                                 [any? [top? #t]]
-                                 [any? [eol? #f]]
-                                 [any? [whole-line? #f]])
-    (position-locations start
-                        (if top? x #f) (if top? y #f)
-                        (if top? #f x) (if top? #f y)
-                        eol? whole-line?))
-
-  (def/public (line-location [exact-nonnegative-integer? i]
-                             [any? [top? #t]])
-    (cond
-     [(not (check-recalc #t #f)) 0.0]
-     [(i . < . 0) padding-t]
-     [(i . > . num-valid-lines) (+ padding-t total-height)]
-     [(= num-valid-lines i)
-      (+ padding-t
-         (if extra-line?
-             (- total-height extra-line-h)
-             total-height))]
-     [else
-      (let* ([line (mline-find-line (unbox line-root-box) i)]
-             [y (mline-get-location line)])
-        (+ padding-t
-           (if top?
-               y
-               (+ y (mline-h line)))))]))
-
-  (define/private (do-line-position start? i visible-only?)
-    (cond
-     [(not (check-recalc (max-width . > . 0) #f #t))
-      0]
-     [(and (i . >= . num-valid-lines) extra-line?)
-      len]
-     [else (let* ([i (max 0 (min i (sub1 num-valid-lines)))]
-                  [line (mline-find-line (unbox line-root-box) i)])
-             (if start?
-                 (if visible-only?
-                     (find-first-visible-position line)
-                     (mline-get-position line))
-                 (let ([p (+ (mline-get-position line) (mline-len line))])
-                   (if visible-only?
-                       (let-boxes ([p p])
-                           (find-last-visible-position line p)
-                         p)
-                       p))))]))
-
-  (def/public (line-start-position [exact-nonnegative-integer? i]
-                                   [any? [visible-only? #t]])
-    (do-line-position #t i visible-only?))
-
-  (def/public (line-end-position [exact-nonnegative-integer? i]
-                                 [any? [visible-only? #t]])
-    (do-line-position #f i visible-only?))
-
-
-  (def/public (line-length [exact-nonnegative-integer? i])
-    (cond
-     [(not (check-recalc (max-width . > . 0) #f #t))
-      0]
-     [(i . < . 0) 0]
-     [(i . >= . num-valid-lines) 0]
-     [else (let ([line (mline-find-line (unbox line-root-box) i)])
-             (mline-len line))]))
-
-  (def/public (position-paragraph [exact-nonnegative-integer? i]
-                                  [any? [at-eol? #f]])
-    (cond
-     [(not (check-recalc #f #f #t)) 0]
-     [else (let ([delta (if (and (i . >= . len) extra-line?)
-                            1
-                            0)]
-                 [i (max 0 (min i len))])
-             (let ([line (mline-find-position (unbox line-root-box) i)])
-               (+ (mline-get-paragraph line) delta)))]))
-
-  (def/public (paragraph-start-position [exact-nonnegative-integer? i]
-                                        [any? [visible-only? #t]])
-    (if (not (check-recalc #f #f #t))
-        0
-        (if (i . > . (+ (last-paragraph) (if extra-line? -1 0)))
-            len
-            (let* ([i (max 0 i)]
-                   [l (mline-find-paragraph (unbox line-root-box) i)]
-                   [l (if (not l)
-                          (if extra-line?
-                              len
-                              (let loop ([l last-line])
-                                (if (and (mline-prev l)
-                                         (not (mline-starts-paragraph l)))
-                                    (loop (mline-prev l))
-                                    l)))
-                          l)])
-              (if visible-only?
-                  (find-first-visible-position l)
-                  (mline-get-position l))))))
-
-  (def/public (paragraph-end-position [exact-nonnegative-integer? i]
-                                      [any? [visible-only? #t]])
-    (if (not (check-recalc #f #f #t))
-        0
-        (if (i . > . (+ (last-paragraph) (if extra-line? -1 0)))
-            len
-            (let* ([i (max 0 i)]
-                   [l (mline-find-paragraph (unbox line-root-box) i)]
-                   [l (if l
-                          (let loop ([l l])
-                            (if (and (mline-next l)
-                                     (zero? (mline-starts-paragraph (mline-next l))))
-                                (loop (mline-next l))
-                                l))
-                          (if extra-line?
-                              len
-                              last-line))])
-              (if (mline? l)
-                  (let ([p (+ (mline-get-position l) (mline-len l))])
-                    (if visible-only?
-                        (let-boxes ([p p])
-                            (find-last-visible-position l p)
-                          p)
-                        p))
-                  l)))))
-
-  (def/public (line-paragraph [exact-nonnegative-integer? i])
-    (cond
-     [(not (check-recalc (max-width . > . 0) #f #t))
-      0]
-     [(i . < . 0) 0]
-     [(i . >= . num-valid-lines)
-      (+ (mline-get-paragraph last-line) (if extra-line? 1 0))]
-     [else
-      (let ([l (mline-find-line (unbox line-root-box) i)])
-        (mline-get-paragraph l))]))
-
-  (def/public (paragraph-start-line [exact-nonnegative-integer? i])
-    (if (not (check-recalc (max-width . > . 0) #f #t))
-        0
-        (let* ([i (max i 0)]
-               [l (mline-find-paragraph (unbox line-root-box) i)])
-          (if (not l)
-              (last-line)
-              (mline-get-line l)))))
-
-  (def/public (paragraph-end-line [exact-nonnegative-integer? i])
-    (if (not (check-recalc (max-width . > . 0) #f #t))
-        0
-        (let* ([i (max i 0)]
-               [l (mline-find-paragraph (unbox line-root-box) i)])
-          (mline-get-line
-           (if l
-               (let loop ([l l])
-                 (if (and (mline-next l)
-                          (not (mline-starts-paragraph (mline-next l))))
-                     (loop (mline-next l))
-                     l))
-               last-line)))))
-
-  (def/public (last-position) len)
-  
-  (public [/last-line last-line])
-  (define (/last-line)
-    (if (not (check-recalc (max-width . > . 0) #f #t))
-        0
-        (- num-valid-lines (if extra-line? 0 1))))
-
-  (def/public (last-paragraph)
-    (if (not (check-recalc #f #f #t))
-        0
-        (+ (mline-get-paragraph last-line) (if extra-line? 1 0))))
-
-  ;; ----------------------------------------
-
-  (def/override (get-extent [maybe-box? w] [maybe-box? h])
-    (check-recalc #t #f)
-    (when w (set-box! w (+ total-width padding-l padding-r)))
-    (when h (set-box! h (+ total-height padding-t padding-b))))
-
-  (def/override (get-descent)
-    (check-recalc #t #f)
-    (+ final-descent padding-b))
-  
-  (def/override (get-space)
-    (check-recalc #t #f)
-    (+ initial-space padding-t))
-  
-  (def/public (get-top-line-base)
-    (check-recalc #t #f)
-    (+ initial-line-base padding-t))
-  
-  (def/override (scroll-line-location [exact-nonnegative-integer? scroll])
-    (if read-locked?
-        0.0
-        (begin
-          (check-recalc #t #f)
-          (+ padding-t
-             (let ([total (+ (mline-get-scroll last-line) (mline-numscrolls last-line))])
-               (cond
-                [(= total scroll)
-                 (if extra-line?
-                     (- total-height extra-line-h)
-                     (+ total-height padding-b))]
-                [(scroll . > . total)
-                 (+ total-height padding-b)]
-                [else
-                 (let* ([line (mline-find-scroll (unbox line-root-box) scroll)]
-                        [p (mline-get-scroll line)]
-                        [y (mline-get-location line)])
-                   (if (p . < . scroll)
-                       (+ y (mline-scroll-offset line (- scroll p)))
-                       y))]))))))
-
-  (def/override (num-scroll-lines)
-    (if read-locked?
-        0
-        (begin
-          (check-recalc (max-width . > . 0) #f #t)
-          (+ (mline-get-scroll last-line)
-             (mline-numscrolls last-line)
-             (if extra-line? 1 0)))))
-
-  (def/override (find-scroll-line [real? p])
-    (if read-locked?
-        0
-        (begin
-          (check-recalc #t #f)
-          (if (and extra-line?
-                   (p . >= . (- total-height extra-line-h padding-t)))
-              (- (num-scroll-lines) 1)
-              (let* ([line (mline-find-location (unbox line-root-box) (- p padding-t))]
-                     [s (mline-get-scroll line)])
-                (if ((mline-numscrolls line) . > . 1)
-                    (let ([y (+ (mline-get-location line) padding-t)])
-                      (+ s (mline-find-extra-scroll line (- p y))))
-                    s))))))
-
-  ;; ----------------------------------------
-
-  (def/public (find-string [string? str]
-                           [(symbol-in forward backward) [direction 'forward]]
-                           [(make-alts exact-nonnegative-integer? (symbol-in start)) [start 'start]]
-                           [(make-alts exact-nonnegative-integer? (symbol-in eof)) [end 'eof]]
-                           [any? [bos? #t]]
-                           [any? [case-sens? #t]])
-    (if (check-recalc #f #f)
-        (do-find-string-all str direction start end #t bos? case-sens? #f)
-        #f))
-
-  (def/public (find-string-all [string? str]
-                               [(symbol-in forward backward) [direction 'forward]]
-                               [(make-alts exact-nonnegative-integer? (symbol-in start)) [start 'start]]
-                               [(make-alts exact-nonnegative-integer? (symbol-in eof)) [end 'eof]]
-                               [any? [bos? #t]]
-                               [any? [case-sens? #t]])
-    (if (check-recalc #f #f)
-        (do-find-string-all str direction start end #f bos? case-sens? #f)
-        null))
-  
-  (def/public (find-string-embedded [string? str]
-                                    [(symbol-in forward backward) [direction 'forward]]
-                                    [(make-alts exact-nonnegative-integer? (symbol-in start)) [start 'start]]
-                                    [(make-alts exact-nonnegative-integer? (symbol-in eof)) [end 'eof]]
-                                    [any? [bos? #t]]
-                                    [any? [case-sens? #t]])
-    (if (check-recalc #f #f)
-        (do-find-string-all str direction start end #t bos? case-sens? #t)
-        #f))
-
-  (def/public (find-string-embedded-all [string? str]
-                                        [(symbol-in forward backward) [direction 'forward]]
-                                        [(make-alts exact-nonnegative-integer? (symbol-in start)) [start 'start]]
-                                        [(make-alts exact-nonnegative-integer? (symbol-in eof)) [end 'eof]]
-                                        [any? [bos? #t]]
-                                        [any? [case-sens? #t]])
-    (if (check-recalc #f #f)
-        (do-find-string-all str direction start end #f bos? case-sens? #t)
-        null))
-
-  (def/public (find-newline [(symbol-in forward backward) [direction 'forward]]
-                            [(make-alts exact-nonnegative-integer? (symbol-in start)) [start 'start]]
-                            [(make-alts exact-nonnegative-integer? (symbol-in eof)) [end 'eof]])
-    (let* ([para (position-paragraph (if (symbol? start)
-                                         startpos
-                                         start)
-                                     (eq? direction 'backward))]
-           [pos (if (eq? direction 'backward)
-                    (paragraph-start-position para)
-                    (if (para . >= . (last-paragraph))
-                        len
-                        (paragraph-start-position (add1 para))))]
-           [end (if (symbol? end) len end)])
-      (if (eq? direction 'forward)
-          (if (pos . > . end)
-              #f
-              pos)
-          (if (pos . < . end)
-              #f
-              pos))))
-
-  ;; this is only public for the test suite
-  ; (do-find-string-all is bound by define-local-member-name)
-  (define/public (do-find-string-all _word direction
-                                     _start _end
-                                     just-one? beginning-of-match? case-sens? recur-inside?)
-    (define end 
-      (cond
-        [(equal? _end 'eof) (if (equal? direction 'forward) (last-position) 0)]
-        [else _end]))
-    (define start
-      (cond
-        [(equal? _start 'start)
-         (get-start-position)]
-        [else _start]))
-    (define forward? (equal? direction 'forward))
-    (define word
-      (cond
-        [forward? _word]
-        [else
-         (define l (string-length _word))
-         (define s (make-string l))
-         (for ([i (in-range (string-length _word))])
-           (string-set! s i (string-ref _word (- l i 1))))
-         s]))
-    
-    (do-find-string word start end
-                    just-one? case-sens? forward? recur-inside? beginning-of-match?))
-  
-  (define/private (convert-result m word forward? beginning-of-match?)
-    (cond
-      [forward?
-       (if beginning-of-match?
-           m
-           (+ m (string-length word)))]
-      [else
-       (define len (last-position))
-       (if beginning-of-match?
-           (- len m)
-           (- len m (string-length word)))]))
-  
-  ;; this uses the Knuth-Morris-Pratt string search algorithm, according to
-  ;; wikipedia: http://en.wikipedia.org/wiki/Knuth–Morris–Pratt_algorithm
-  ;; this is a define-local-member-name to support the recur-inside? functionality
-  (define/public (do-find-string _word _start _end
-                                 just-one? case-sens? forward? recur-inside? beginning-of-match?)
-    (define word (if case-sens?
-                     _word
-                     (string-downcase _word)))
-    (define latest-snip-str #f)
-    (define latest-snip-len #f)
-    (define latest-snip-position #f)
-    (define latest-snip #f)
-    (define last-pos (last-position))
-    
-    (define start (if forward? _start (- last-pos _start)))
-    (define end (if forward? _end (- last-pos _end)))
-    
-    ;; the algorithm may consider the same position
-    ;; multiple times, so we track which positions that
-    ;; have embedded editors that are already considered.
-    (define embedded-editors-considered (make-hash))
-    
-    (define (get-char _i)
-      (define i (if forward? _i (- last-pos _i 1)))
-      (cond
-        [(and latest-snip-str
-              (< -1
-                 (- i latest-snip-position)
-                 latest-snip-len)) 
-         (string-ref latest-snip-str (- i latest-snip-position))]
-        [else
-         (define-values (guess-snip guess-snip-position guess-snip-len)
-           (cond
-             [(not latest-snip)
-              (define fst (find-first-snip))
-              (values fst (and fst 0) (and fst (send fst get-count)))]
-             [forward?
-              (define next (send latest-snip next))
-              (values next
-                      (and next (+ latest-snip-position latest-snip-len))
-                      (and next (send next get-count)))]
-             [else
-              (define prev (send latest-snip previous))
-              (define pc (and prev (send prev get-count)))
-              (values prev
-                      (and prev (- latest-snip-position pc))
-                      pc)]))
-         (cond
-           [(and guess-snip
-                 (<= guess-snip-position i)
-                 (< i (+ guess-snip-position guess-snip-len)))
-            (set! latest-snip guess-snip)
-            (set! latest-snip-position guess-snip-position)
-            (set! latest-snip-len guess-snip-len)]
-           [else
-            (define b (box #f))
-            (set! latest-snip (find-snip i 'after-or-none b))
-            (when latest-snip
-              (set! latest-snip-position (unbox b))
-              (set! latest-snip-len (send latest-snip get-count)))])
-         
-         (when (or (not latest-snip-str)
-                   (< (string-length latest-snip-str)
-                      latest-snip-len))
-           (set! latest-snip-str (make-string latest-snip-len)))
-         (send latest-snip get-text! latest-snip-str 0 latest-snip-len 0)
-         (unless case-sens?
-           (for ([c (in-range latest-snip-len)])
-             (string-set! latest-snip-str c (char-downcase (string-ref latest-snip-str c)))))
-         (cond
-           [(and recur-inside?
-                 (is-a? latest-snip editor-snip%))
-            (cond
-              [(hash-ref embedded-editors-considered i #f) #f]
-              [else
-               (hash-set! embedded-editors-considered i #t)
-               (let loop ([snip latest-snip])
-                 (define ed (send snip get-editor))
-                 (cond
-                   [(is-a? ed text%)
-                    (define lp (send ed last-position))
-                    (define result
-                      (send ed do-find-string _word 
-                            (if forward? 0 lp) (if forward? lp 0)
-                            just-one? case-sens? forward? recur-inside? beginning-of-match?))
-                    (and result (not (null? result)) (cons ed result))]
-                   [(not ed) #f]
-                   [else 
-                    (define inner-result
-                      (let inner-loop ([inner-snip (send ed find-first-snip)])
-                            (cond
-                              [(is-a? inner-snip editor-snip%)
-                               (define this-one (loop inner-snip))
-                               (if just-one?
-                                   (or this-one
-                                       (inner-loop (send inner-snip next)))
-                                   (if this-one
-                                       (cons this-one
-                                             (inner-loop (send inner-snip next)))
-                                       (inner-loop (send inner-snip next))))]
-                              [(not inner-snip) (if just-one? #f '())]
-                              [else (inner-loop (send inner-snip next))])))
-                    (and inner-result 
-                         (pair? inner-result) 
-                         (cons ed inner-result))]))])]
-           [else
-            (string-ref latest-snip-str (- i latest-snip-position))])]))
-    
-    (define t (build-table word))
-    (define word-len-minus-one (- (string-length word) 1))
-    
-    (let loop ([m start]
-               [i 0])
-      (define m-plus-i (+ m i))
-      (cond
-        [(< m-plus-i end)
-         (define the-char (get-char m-plus-i))
-         (cond
-           [(pair? the-char)
-            ;; found an embedded editor with a search result; transmit it
-            (if just-one?
-                the-char
-                (cons the-char (loop (+ m 1) 0)))]
-           [(and (char? the-char) (char=? (string-ref word i) the-char))
-            (cond
-              [(= i word-len-minus-one)
-               (if just-one?
-                   (convert-result m word forward? beginning-of-match?)
-                   (cons (convert-result m word forward? beginning-of-match?)
-                         (loop (+ m 1) 0)))]
-              [else
-               (loop m (+ i 1))])]
-           [else
-            (define t-i (vector-ref t i))
-            (cond
-              [t-i
-               (loop (- m-plus-i t-i) t-i)]
-              [else
-               (loop (+ m 1) 0)])])]
-        [else
-         (if just-one? #f '())])))
-  
-  (define/private (build-table word)
-    (define t (make-vector (string-length word) #f))
-    (when ((string-length word) . > . 1)
-      (vector-set! t 1 0)
-      (let loop ([pos 2]
-                 [cnd 0])
-        (when (< pos (string-length word))
-          (cond
-            [(char=? (string-ref word (- pos 1))
-                     (string-ref word cnd))
-             (vector-set! t pos (+ cnd 1))
-             (loop (+ pos 1) (+ cnd 1))]
-            [(> cnd 0)
-             (loop pos (vector-ref t cnd))]
-            [else
-             (vector-set! t pos 0)
-             (loop (+ pos 1) cnd)]))))
-    t)
-
-  ;; ----------------------------------------
-  
-  (define/private (do-change-style start end new-style delta restore-sel? counts-as-mod?)
-    (assert (consistent-snip-lines 'do-change-style))
-    (unless (or write-locked?
-                s-user-locked?
-                (and new-style
-                     (not (send s-style-list style-to-index new-style))))
-      (let* ([start (max 0 (min len start))]
-             [end (min end len)])
-        (unless (start . > . end)
-          (let ([new-style (if (and (not new-style) (not delta))
-                               (or (get-default-style)
-                                   (send s-style-list basic-style))
-                               new-style)])
-            (cond
-             [(and (= start startpos) (= end endpos) (= end start) (positive? len))
-              (when sticky-styles?
-                (set! caret-style 
-                      (cond
-                       [new-style new-style]
-                       [caret-style (send s-style-list find-or-create-style caret-style delta)]
-                       [else (let ([gsnip (do-find-snip start 'before)])
-                               (send s-style-list find-or-create-style (snip->style gsnip) delta))])))]
-             [else
-              (set! write-locked? #t)
-
-              (if (not (can-change-style? start (- end start)))
-                  (set! write-locked? #f)
-                  
-                  (begin
-                    (on-change-style start (- end start))
-                    
-                    (set! flow-locked? #t)
-
-                    (make-snipset start end)
-                    
-                    (let-values ([(start-snip end-snip)
-                                  (if (zero? len)
-                                      (begin
-                                        (set! initial-style-needed? #f)
-                                        (values snips #f))
-                                      (values (do-find-snip start 'after) (do-find-snip end 'after-or-none)))]
-                                 [(rec)
-                                  (and (zero? s-noundomode)
-                                       (make-object style-change-record% start end 
-                                                    (or delayed-streak? (not s-modified?))
-                                                    startpos endpos restore-sel?))])
-                      (let loop ([something? #f]
-                                 [extra-check-pos #f]
-                                 [prev-style #f]
-                                 [prev-style-pos start]
-                                 [p start]
-                                 [gsnip start-snip])
-                        (if (not (eq? gsnip end-snip))
-                            ;; Change a snip style:
-                            (let* ([style (snip->style gsnip)]
-                                   [style2 (or new-style
-                                               (send s-style-list find-or-create-style style delta))])
-                              (if (not (eq? style style2))
-                                  (begin
-                                    (set-snip-style! gsnip style2)
-                                    (let-values ([(prev-style prev-style-pos)
-                                                  (if (and rec (not (eq? prev-style style)))
-                                                      (begin
-                                                        (when prev-style
-                                                          (send rec add-style-change prev-style-pos p prev-style))
-                                                        (values style p))
-                                                      (values prev-style prev-style-pos))])
-                                      (send gsnip size-cache-invalid)
-                                      (mline-mark-recalculate (snip->line gsnip))
-                                      (when (max-width . > . 0)
-                                        (mline-mark-check-flow (snip->line gsnip)))
-                                      (loop #t
-                                            p
-                                            prev-style
-                                            prev-style-pos
-                                            (+ p (snip->count gsnip))
-                                            (snip->next gsnip))))
-                                  (let ([prev-style
-                                         (if (and rec prev-style)
-                                             (begin
-                                               (send rec add-style-change prev-style-pos p prev-style)
-                                               #f)
-                                             prev-style)])
-                                    (loop something?
-                                          extra-check-pos
-                                          prev-style
-                                          prev-style-pos
-                                          (+ p (snip->count gsnip))
-                                          (snip->next gsnip)))))
-                            ;; All snips changed
-                            (begin
-                              (when (and rec prev-style)
-                                (send rec add-style-change prev-style-pos p prev-style))
-
-                              (if something?
-                                  ;; Something changed, so recalc and refresh:
-                                  (let ([line (snip->line start-snip)])
-                                    (when (and (mline-prev line)
-                                               (not (has-flag? (snip->flags (mline-snip (mline-prev line))) HARD-NEWLINE)))
-                                      (mline-mark-check-flow (mline-prev line)))
-                                    (when (not s-modified?)
-                                      (add-undo-rec (make-object unmodify-record% delayed-streak?)))
-                                    (when rec
-                                      (add-undo-rec rec))
-                                    (when (in-edit-sequence?)
-                                      (set! delayed-streak? #t))
-                                    
-                                    (check-merge-snips start)
-                                    (when extra-check-pos
-                                      (check-merge-snips extra-check-pos))
-                                    (when (not (= end extra-check-pos))
-                                      (check-merge-snips end))
-                                    
-                                    (when (and (not s-modified?) counts-as-mod?)
-                                      (set-modified #t))
-
-                                    (set! write-locked? #f)
-                                    (set! flow-locked? #f)
-                                  
-                                    (refresh-by-line-demand))
-                                  ;; Nothing changed after all:
-                                  (begin
-                                    (set! write-locked? #f)
-                                    (set! flow-locked? #f)
-
-                                    (check-merge-snips start)
-                                    (check-merge-snips end)))
-
-                              (after-change-style start (- end start))))))))]))))
-      (assert (consistent-snip-lines 'post-do-change-style))))
-
-  (def/public (change-style [(make-or-false (make-alts style<%> style-delta%)) st]
-                            [(make-alts exact-nonnegative-integer? (symbol-in start)) [start 'start]]
-                            [(make-alts exact-nonnegative-integer? (symbol-in end)) [end 'end]]
-                            [any? [counts-as-mod? #t]])
-    (do-change-style (if (symbol? start) startpos start)
-                     (if (symbol? end) (if (symbol? start) endpos len) end)
-                     (and (st . is-a? . style<%>) st)
-                     (and (st . is-a? . style-delta%) st)
-                     1
-                     counts-as-mod?))
-
-  (def/override (set-style-list [style-list% new-list])
-    (unless write-locked?
-      (let ([delta (new style-delta%)]
-            [count (send s-style-list number)])
-        (when (positive? count)
-          (let ([smap (make-vector count #f)])
-            (vector-set! smap 0 (send new-list index-to-style 0))
-            (for ([index (in-range 1 count)])
-              (let* ([style (send s-style-list index-to-style index)]
-                     [name (send style get-name)])
-                (vector-set!
-                 smap
-                 index
-                 (cond
-                  [(and name (send new-list find-named-style name))
-                   => (lambda (new-style) new-style)]
-                  [else
-                   (let ([new-style
-                          (let* ([base-style (send style get-base-style)]
-                                 [base-index (send s-style-list style-to-index base-style)])
-                            (if (send style is-join?)
-                                (let* ([ss (send style get-shift-style)]
-                                       [shift-index (send s-style-list style-to-index ss)])
-                                  (send new-list find-or-create-join-style 
-                                        (vector-ref smap base-index)
-                                        (vector-ref smap shift-index)))
-                                (begin
-                                  (send style get-delta delta)
-                                  (send new-list find-or-create-style 
-                                        (vector-ref smap base-index)
-                                        delta))))])
-                     (if name
-                         (send new-list new-named-style name new-style)
-                         new-style))]))))
-            (let loop ([snip snips])
-              (when snip
-                (let* ([index (send s-style-list style-to-index (snip->style snip))]
-                       [index (if (not index)
-                                  ;; bad! snip had style not from this buffer's style list
-                                  0
-                                  index)])
-                  (set-snip-style! snip (vector-ref smap index)))
-                (loop (snip->next snip))))))
-          
-        (super set-style-list new-list)
-        
-        (size-cache-invalid)
-        (set! changed? #t)
-        (need-refresh -1 -1))))
-
-  (def/override (style-has-changed [(make-or-false style<%>) style])
-    (unless read-locked?
-      (if (not style)
-          ;; our cue to repaint
-          (begin
-            (set! changed? #t)
-            (need-refresh -1 -1))
-          ;; notify snips:
-          (let ([wl? write-locked?]
-                [fl? flow-locked?])
-            (set! write-locked? #t)
-            (set! flow-locked? #t)
-
-            (let loop ([snip snips])
-              (when snip
-                (when (eq? style (snip->style snip))
-                  (send snip size-cache-invalid)
-                  (let ([line (snip->line snip)])
-                    (mline-mark-recalculate line)
-                    (when (max-width . >= . 0)
-                      (mline-mark-check-flow line)
-                      (when (and (mline-prev line)
-                                 (not (has-flag? (snip->flags (mline-last-snip (mline-prev line)))
-                                                 HARD-NEWLINE)))
-                        (mline-mark-check-flow (mline-prev line))))))
-                (loop (snip->next snip))))
-            (set! write-locked? wl?)
-            (set! flow-locked? fl?)))))
-
-  ;; ----------------------------------------
-
-  (define/private (do-scroll-to snip localx localy w h refresh? [bias 'none])
-    (cond
-     [flow-locked? #f]
-     [(in-edit-sequence?)
-      (when s-admin
-        (set! delayedscroll -1)
-        (set! delayedscrollbox? #t)
-        (set! delayedscrollsnip snip)
-        (set! delayedscroll-x localx)
-        (set! delayedscroll-y localy)
-        (set! delayedscroll-w w)
-        (set! delayedscroll-h h)
-        (set! delayedscrollbias bias))
-      #f]
-     [else
-      (let-boxes ([x 0.0]
-                  [y 0.0]
-                  [ok? #t])
-          (when snip
-            (set-box! ok? (get-snip-position-and-location snip #f x y)))
-        (cond
-         [(not ok?) #f]
-         [(scroll-editor-to (+ x localx) (+ y localy) w h refresh? bias)
-          (unless refresh?
-            (set! refresh-all? #t))
-          #t]
-         [else #f]))]))
-
-  (define/override (scroll-editor-to localx localy w h refresh? bias)
-    (super scroll-editor-to 
-           (- localx padding-l)
-           (- localy padding-t)
-           (+ w padding-l padding-r)
-           (+ h padding-t padding-b)
-           refresh? bias))
-
-  (def/public (scroll-to [snip% snip] [real? localx] [real? localy]
-                         [nonnegative-real? w] [nonnegative-real? h]
-                         [any? refresh?]
-                         [(symbol-in start end none) [bias 'none]])
-    (do-scroll-to snip localx localy w h refresh? bias))
-
-  (def/override (resized [snip% snip] [any? redraw-now?])
-    (when (get-snip-position-and-location snip #f #f #f)
-
-      (let ([line (snip->line snip)])
-        (mline-mark-recalculate line)
-        (when (max-width . >= . 0)
-          (mline-mark-check-flow line)
-          ;; maybe something can now move to the previous line
-          (when (and (mline-prev line)
-                     (not (has-flag? (snip->flags (mline-last-snip (mline-prev line)))
-                                     HARD-NEWLINE)))
-            (mline-mark-check-flow (mline-prev line)))))
-
-      (set! graphic-maybe-invalid? #t)
-
-      (let ([redraw-now? (and redraw-now?
-                              (not flow-locked?))])
-
-        (set! changed? #t)
-
-        (unless redraw-now? (set! delay-refresh (add1 delay-refresh)))
-        (parameterize ([in-delayed-refresh #f])
-          (refresh-by-line-demand))
-        (unless redraw-now? (set! delay-refresh (sub1 delay-refresh))))))
-
-  (def/override (recounted [snip% snip] [any? redraw-now?])
-    (if write-locked?
-        #f
-        (begin
-          (set! revision-count (add1 revision-count))
-          (resized snip redraw-now?)
-          #t)))
-
-  (def/override (set-caret-owner [(make-or-false snip%) snip] 
-                                 [(symbol-in immediate display global) [dist 'immediate]])
-    (when (do-set-caret-owner snip dist)
-      (need-refresh startpos endpos) ;; (need-caret-refresh); <- doesn't work; local caret ownership weirdness
-      (on-focus (not snip))))
-
-  (def/override (release-snip [snip% snip])
-    (let ([pos (get-snip-position snip)])
-      (and pos
-           (begin
-             (do-delete pos (+ pos (snip->count snip)) #f #f)
-             (when (and (not (snip->admin snip))
-                        (has-flag? (snip->flags snip) OWNED))
-               (set-snip-flags! snip (remove-flag (snip->flags snip) OWNED)))
-             #t))))
-  
-  (define/public (refresh-box L T w h)
-    ;; This method can be called while updating is locked out,
-    ;; possibly because another thread is in an edit sequence.
-    (call-with-semaphore
-     refresh-box-lock
-     (lambda ()
-       (let ([B (if (eq? h 'display-end) h (+ T h))]
-             [R (if (eq? w 'display-end) w (+ L w))])
-         (if refresh-box-unset?
-             (begin
-               (set! refresh-l L)
-               (set! refresh-r R)
-               (set! refresh-t T)
-               (set! refresh-b B)
-               (set! refresh-box-unset? #f))
-             (begin
-               (when (L . < . refresh-l)
-                 (set! refresh-l L))
-               (unless (eq? refresh-r 'display-end)
-                 (when (or (eq? R 'display-end)
-                           (R . > . refresh-r))
-                   (set! refresh-r R)))
-               (when (T . < . refresh-t)
-                 (set! refresh-t T))
-               (unless (eq? refresh-b 'display-end)
-                 (when (or (eq? B 'display-end)
-                           (B . > . refresh-b))
-                   (set! refresh-b B)))))
-         
-         (set! draw-cached-in-bitmap? #f)))))
-
-  (def/override (needs-update [snip% snip]
-                              [real? localx] [real? localy]
-                              [nonnegative-real? w] [nonnegative-real? h])
-    (let-boxes ([x 0.0]
-                [y 0.0]
-                [ok? #t])
-        (set-box! ok? (get-snip-location snip x y))
-      (when ok?
-        (refresh-box (+ x localx) (+ y localy) w h)
-        (unless (in-edit-sequence?)
-          (redraw)))))
-
-  (def/override (invalidate-bitmap-cache [real? [x 0.0]] 
-                                         [real? [y 0.0]]
-                                         [(make-alts nonnegative-real? (symbol-in end display-end)) [w 'end]]
-                                         [(make-alts nonnegative-real? (symbol-in end display-end)) [h 'end]])
-    (let ([w (if (eq? w 'end) (- (+ total-width padding-l padding-r) x) w)]
-          [h (if (eq? h 'end) (- (+ total-height padding-t padding-b) y) h)])
-
-      (refresh-box x y w h)
-      (unless (in-edit-sequence?)
-        (redraw))))
-
-  (def/public (hide-caret [any? hide?])
-    (unless (eq? hilite-on? (not hide?))
-      (set! hilite-on? (not hide?))
-      (when (or s-own-caret? (not (= endpos startpos)))
-        (need-caret-refresh))))
-
-  (def/public (caret-hidden?) (not hilite-on?))
-
-  (def/public (get-between-threshold) between-threshold)
-
-  (def/public (set-between-threshold [nonnegative-real? t])
-    (set! between-threshold (min t 99.0)))
-
-  ;; ----------------------------------------
-
-  (define/private (make-only-snip)
-    (set! snips (new string-snip%))
-    (set-snip-style! snips (or (get-default-style)
-                               (send s-style-list basic-style)))
-    (set-snip-count! snips 0)
-    (send snips set-s-admin snip-admin)
-
-    (let ([line (create-mline)])
-      (set-snip-line! snips line)
-      (set-box! line-root-box line)
-      (set! first-line line)
-      (set! last-line line)
-      (mline-set-starts-paragraph line #t)
-
-      (set-mline-snip! line snips)
-      (set-mline-last-snip! line snips)
-
-      (set! last-snip snips)
-      (set! snip-count 1)
-
-      (set! num-valid-lines 1)))
-
-  (define/private (splice-snip snip prev next)
-    (if prev
-        (set-snip-next! prev snip)
-        (set! snips snip))
-    (set-snip-prev! snip prev)
-    (set-snip-next! snip next)
-    (if next
-        (set-snip-prev! next snip)
-        (set! last-snip snip)))
-
-  (define/private (insert-snip before snip)
-    (if (and (eq? snips last-snip) (zero? (snip->count snips)))
-        (append-snip snip)
-        (begin
-          (splice-snip snip (snip->prev before) before)
-          (set! snip-count (add1 snip-count)))))
-  
-  (define/private (append-snip snip)
-    (if (and (eq? snips last-snip) (zero? (snip->count snips))) 
-        ;; get rid of empty snip
-        (begin
-          (set! snips snip)
-          (set! last-snip snip))
-        (begin
-          (splice-snip snip last-snip #f)
-          (set! snip-count (add1 snip-count)))))
-  
-  (define/private (delete-snip snip)
-    (when (eq? snip prev-mouse-snip)
-      (set! prev-mouse-snip #f))
-    (cond
-     [(snip->next snip)
-      (splice-snip (snip->next snip) (snip->prev snip) (snip->next (snip->next snip)))]
-     [(snip->prev snip)
-      (splice-snip (snip->prev snip) (snip->prev (snip->prev snip)) (snip->next snip))]
-     [else
-      (set! last-snip #f)
-      (set! snips #f)])
-    (set! snip-count (sub1 snip-count))
-    (set-snip-flags! snip (add-flag (snip->flags snip) CAN-DISOWN))
-    (snip-set-admin snip #f)
-    (set-snip-line! snip #f)
-    (set-snip-prev! snip #f)
-    (set-snip-next! snip #f)
-    (set-snip-flags! snip (remove-flag (snip->flags snip) CAN-DISOWN)))
-  
-  (define/private (snip-set-admin snip a)
-    (let ([orig-count (snip->count snip)]
-          [line (snip->line snip)]
-          [orig-admin (snip->admin snip)]
-          [wl? write-locked?]
-          [fl? flow-locked?])
-
-      (set! read-locked? #t)
-      (set! write-locked? #t)
-      (set! flow-locked? #t)
-
-      (send snip set-admin a)
-      
-      (set! read-locked? #f) 
-      (set! write-locked? wl?) 
-      (set! flow-locked? fl?)
-
-      (let ([snip
-             (if (not (eq? (snip->admin snip) a))
-                 ;; something went wrong
-                 (cond
-                  [(and (not a) (eq? (snip->admin snip) orig-admin))
-                   ;; force admin to NULL
-                   (send snip set-s-admin #f)
-                   snip]
-                  [a
-                   ;; snip didn't accept membership into this editor; give up on it
-                   (let ([naya (new snip%)])
-                     (set-snip-count! naya orig-count)
-                     (splice-snip naya (snip->prev snip) (snip->next snip))
-                     (set-snip-line! naya line)
-                     
-                     (when line
-                       (when (eq? (mline-snip line) snip)
-                         (set-mline-snip! line naya))
-                       (when (eq? (mline-last-snip line) snip)
-                         (set-mline-last-snip! line naya)))
-                     
-                     (send snip set-s-admin #f)
-                     
-                     (send naya set-admin a)
-                     (set! snip naya)
-                     naya)]
-                  [else snip])
-                 snip)])
-
-        ;; force count to be consistent:
-        (when (and a (not (= (snip->count snip) orig-count)))
-          (set-snip-count! snip orig-count))
-
-        snip)))
-
-  (define/private (snip-split snip pos a-ptr b-ptr)
-    (let ([c (snip->count snip)]
-          [nl? (has-flag? (snip->flags snip) NEWLINE)]
-          [hnl? (has-flag? (snip->flags snip) HARD-NEWLINE)]
-          [orig snip])
-
-      (set-snip-flags! snip (add-flag (snip->flags snip) CAN-SPLIT))
-
-      (delete-snip snip)
-
-      (set-snip-flags! orig (remove-flag (snip->flags orig) OWNED))
-
-      (set! revision-count (add1 revision-count))
-
-      (let ([wl? write-locked?]
-            [fl? flow-locked?])
-
-        (set! read-locked? #t)
-        (set! write-locked? #t)
-        (set! flow-locked? #t)      
-
-        (send snip split pos a-ptr b-ptr)
-
-        (set! read-locked? #f)
-        (set! write-locked? wl?)
-        (set! flow-locked? fl?))
-
-      (let* ([a (or (unbox a-ptr)
-                    (new snip%))]
-             [a (if (send a is-owned?)
-                    (new snip%)
-                    a)]
-             [b (or (unbox b-ptr)
-                    (new snip%))]
-             [b (if (send b is-owned?)
-                    (new snip%)
-                    b)])
-
-        (set-box! a-ptr a)
-        (set-box! b-ptr b)
-
-        (set-snip-flags! a (remove-flag (snip->flags a) CAN-SPLIT))
-        (set-snip-flags! b (remove-flag (snip->flags b) CAN-SPLIT))
-        (set-snip-flags! orig (remove-flag (snip->flags orig) CAN-SPLIT))
-
-        ;; make sure that count is right
-        (set-snip-count! a pos)
-        (set-snip-count! b (- c pos))
-
-        ;; make sure that NEWLINE & HARD-NEWLINE is consistent:
-        (when nl?
-          (set-snip-flags! b (add-flag (snip->flags b) NEWLINE)))
-        (when hnl?
-          (set-snip-flags! b (add-flag (snip->flags b) HARD-NEWLINE)))
-        (set-snip-flags! a (remove-flag (remove-flag (snip->flags b) NEWLINE)
-                                        HARD-NEWLINE)))))
-
-    (define/private (split-one* amt snip)
-      (if (or (= 0 amt)
-              (= amt (snip->count snip)))
-          snip
-          (split-one amt snip #f)))
-
-    (define/private (split-one amt snip extra)
-      (let ([line (snip->line snip)]
-            [prev (snip->prev snip)]
-            [next (snip->next snip)]
-            [style (snip->style snip)])
-        (let ([at-start? (eq? (mline-snip line) snip)]
-              [at-end? (eq? (mline-last-snip line) snip)]
-              [orig snip])
-          (let-boxes ([ins-snip #f]
-                      [snip #f])
-              (snip-split orig amt ins-snip snip)
-
-            (set-snip-style! snip style)
-            (set-snip-style! ins-snip style)
-      
-            (set-snip-line! snip line)
-            (set-snip-line! ins-snip line)
-
-            (when at-start?
-              (set-mline-snip! line ins-snip))
-            (when at-end?
-              (set-mline-last-snip! line snip))
-      
-            (splice-snip snip prev next)
-            (set! snip-count (add1 snip-count))
-            (insert-snip snip ins-snip)
-            (when extra
-              (extra snip))
-                  
-            (snip-set-admin snip snip-admin)
-            (snip-set-admin ins-snip snip-admin)
-            
-            (after-split-snip amt)
-            
-            ins-snip))))
-
-  (define/private (make-snipset start end) 
-    ;; BEWARE: `len' may not be up-to-date
-    (when (positive? start)
-      (let-values ([(snip s-pos) (find-snip/pos start 'after-or-none)])
-        (when snip
-          (unless (= s-pos start)
-            (split-one (- start s-pos) snip #f)))))
-    (when (positive? end)
-      (let-values ([(snip s-pos) (find-snip/pos end 'before)])
-        (unless (= (+ s-pos (snip->count snip)) end)
-          (split-one (- end s-pos) snip #f)))))
-
-  (define/private (insert-text-snip start style)
-    (let* ([snip (on-new-string-snip)]
-           [snip (if (or (send snip is-owned?)
-                         (positive? (snip->count snip)))
-                     ;; uh-oh; resort to string-snip%
-                     (new string-snip%)
-                     snip)]
-           [style (or style
-                      (get-default-style)
-                      (send s-style-list basic-style))])
-      (set-snip-style! snip style)
-      (let ([snip (let ([rsnip (snip-set-admin snip snip-admin)])
-                    (if (not (eq? snip rsnip))
-                        ;; uh-oh; resort to string-snip%:
-                        (let ([snip (new string-snip%)])
-                          (set-snip-style! snip style)
-                          (send snip set-s-admin snip-admin))
-                        snip))])
-        (set-snip-count! snip 0)
-        
-        (let-values ([(gsnip s-pos) (find-snip/pos start 'before-or-none)])
-          (if (and gsnip
-                   (= (+ (snip->count gsnip) s-pos) start)
-                   (has-flag? (snip->flags gsnip) NEWLINE)
-                   (not (has-flag? (snip->flags gsnip) HARD-NEWLINE)))
-              (begin
-                ;; we want the snip on the same line as the preceding snip:
-                (if (snip->next gsnip)
-                    (insert-snip (snip->next gsnip) snip)
-                    (append-snip snip))
-                (set-snip-flags! gsnip (remove-flag (snip->flags gsnip) NEWLINE))
-                (set-snip-flags! snip (add-flag (snip->flags snip) NEWLINE))
-                (set-snip-line! snip (snip->line gsnip))
-                (set-mline-last-snip! (snip->line snip) snip)
-                snip)
-              (let-values ([(gsnip s-pos) (find-snip/pos start 'after-or-none)])
-                (cond
-                 [(not gsnip)
-                  (append-snip snip)
-                  (set-snip-line! snip last-line)
-                  (when (eq? (mline-last-snip last-line) last-snip)
-                    (set! last-snip snip))
-                  (set-mline-last-snip! last-line snip)
-                  snip]
-                 [(= s-pos start)
-                  (insert-snip gsnip snip)
-                  (set-snip-line! snip (snip->line gsnip))
-                  (when (eq? (mline-snip (snip->line snip)) gsnip)
-                    (set-mline-snip! (snip->line snip) snip))
-                  snip]
-                 [else
-                  (split-one (- start s-pos) gsnip
-                             (lambda (gsnip)
-                               (set-snip-line! snip (snip->line gsnip))
-                               (insert-snip gsnip snip)))
-                  snip])))))))
-
-  (define/private (check-merge-snips start)
-    (when (let loop ([did-something? #f])
-            (let-values ([(snip1 s-pos1) (find-snip/pos start 'before)]
-                         [(snip2 s-pos2) (find-snip/pos start 'after)])
-              (if (eq? snip1 snip2)
-                  did-something?
-                  (if (not (and (snip->snipclass snip1)
-                                (eq? (snip->snipclass snip1) (snip->snipclass snip2))
-                                (eq? (snip->style snip1) (snip->style snip2))))
-                      did-something?
-                      (if (not (and
-                                (not (has-flag? (snip->flags snip1) NEWLINE))
-                                (has-flag? (snip->flags snip1) CAN-APPEND)
-                                (has-flag? (snip->flags snip2) CAN-APPEND)
-                                ((+ (snip->count snip1) (snip->count snip2)) . < . MAX-COUNT-FOR-SNIP)
-                                (eq? (snip->line snip1) (snip->line snip2))))
-                          did-something?
-                          (cond
-                           [(zero? (snip->count snip1))
-                            (when (eq? (mline-snip (snip->line snip1)) snip1)
-                              (set-mline-snip! (snip->line snip1) snip2))
-                            (delete-snip snip1)
-                            (set-snip-flags! snip1 (remove-flag (snip->flags snip1) OWNED))
-                            (loop #t)]
-                           [(zero? (snip->count snip2))
-                            (when (eq? (mline-last-snip (snip->line snip2)) snip2)
-                              (set-mline-last-snip! (snip->line snip2) snip1)
-                              (mline-mark-recalculate (snip->line snip1)) ; need last-w updated
-                              (set! graphic-maybe-invalid? #t))
-                            (delete-snip snip2)
-                            (set-snip-flags! snip2 (remove-flag (snip->flags snip2) OWNED))
-                            (loop #t)]
-                           [else
-                            (let ([c (+ (snip->count snip1) (snip->count snip2))]
-                                  [prev (snip->prev snip1)]
-                                  [next (snip->next snip2)]
-                                  [line (snip->line snip1)])
-                              (let ([at-start? (eq? (mline-snip line) snip1)]
-                                    [at-end? (eq? (mline-last-snip line) snip2)]
-                                    [wl? write-locked?]
-                                    [fl? flow-locked?])
-                                (set! read-locked? #t)
-                                (set! write-locked? #t)
-                                (set! flow-locked? #t)
-
-                                (set-snip-flags! snip2 (add-flag (snip->flags snip2) CAN-SPLIT))
-                                (let ([naya (send snip2 merge-with snip1)])
-                                  (set! read-locked? #f)
-                                  (set! write-locked? wl?)
-                                  (set! flow-locked? fl?)
-                                  
-                                  (if naya
-                                      (begin
-                                        ;; claim snip1 & snip2 unowned for naya test:
-                                        (set-snip-flags! snip1 (remove-flag (remove-flag (snip->flags snip1) CAN-SPLIT)
-                                                                            OWNED))
-                                        (set-snip-flags! snip2 (remove-flag (remove-flag (snip->flags snip2) CAN-SPLIT)
-                                                                            OWNED))
-                                        
-                                        (let ([naya (if (send naya is-owned?)
-                                                        ;; uh-oh; make dummy
-                                                        (new snip%)
-                                                        naya)])
-                                          (set-snip-flags! naya (remove-flag (snip->flags naya) CAN-SPLIT))
-                                          (set-snip-flags! snip1 (add-flag (snip->flags snip1) OWNED))
-                                          (set-snip-flags! snip2 (add-flag (snip->flags snip2) OWNED))
-
-                                          (delete-snip snip1)
-                                          (set-snip-flags! snip1 (remove-flag (snip->flags snip1) OWNED))
-                                          (delete-snip snip2)
-                                          (set-snip-flags! snip2 (remove-flag (snip->flags snip2) OWNED))
-                                          
-                                          (splice-snip naya prev next)
-                                          (set! snip-count (add1 snip-count))
-                                          
-                                          ;; make sure that count is right:
-                                          (set-snip-count! naya c)
-
-                                          (set! revision-count (add1 revision-count))
-
-                                          (let ([naya (snip-set-admin naya snip-admin)])
-                                            
-                                            (set-snip-line! naya line)
-                                            (when at-start?
-                                              (set-mline-snip! line naya))
-                                            (when at-end?
-                                              (set-mline-last-snip! line naya)
-                                              (mline-mark-recalculate line) ;; need last-w updated
-                                              (set! graphic-maybe-invalid? #t))
-                                            #t)))
-                                      (begin
-                                        (set-snip-flags! snip2 (remove-flag (snip->flags snip2) CAN-SPLIT))
-                                        #t)))))]))))))
-      (after-merge-snips start)))
-
-  ;; ----------------------------------------
-
-  (def/public (on-new-string-snip)
-    (new string-snip%))
-
-  (def/public (on-new-tab-snip)
-    (new tab-snip%))
-  
-  ;; ----------------------------------------
-
-  (def/override (find-first-snip)
-    (if (zero? len)
-        #f
-        snips))
-  
-  (define/private (do-find-snip p direction)
-    ;; BEWARE: `len' may not be up-to-date
-    (let-values ([(snip pos) (find-snip/pos p direction)])
-      snip))
-
-  (def/public (find-snip [exact-nonnegative-integer? p]
-                         [(symbol-in before-or-none before after after-or-none) direction]
-                         [maybe-box? [s-pos #f]])
-    ;; BEWARE: `len' may not be up-to-date
-    (let-values ([(snip pos) (find-snip/pos p direction)])
-      (when s-pos (set-box! s-pos pos))
-      snip))
-
-  (define/private (find-snip/pos p direction)
-    ;; BEWARE: `len' may not be up-to-date
-    (cond
-     [(and (eq? direction 'before-or-none) (zero? p))
-      (values #f 0)]
-     [else
-      (let* ([line (mline-find-position (unbox line-root-box) p)]
-             [pos (mline-get-position line)]
-             [p (- p pos)])
-        (if (and (eq? direction 'after-or-none) 
-                 (not (mline-next line))
-                 (p . >= . (mline-len line)))
-            ;; past the end:
-            (values #f 0)
-            ;; within the line:
-            (let-values ([(snip pos p)
-                          (let ([snip (mline-snip line)])
-                            (if (and (zero? p) (snip->prev snip))
-                                ;; back up one:
-                                (let ([snip (snip->prev snip)])
-                                  (values snip
-                                          (- pos (snip->count snip))
-                                          (+ p (snip->count snip))))
-                                (values snip pos p)))])
-
-              (let loop ([snip snip]
-                         [pos pos]
-                         [p p])
-                (if snip
-                    (let ([p (- p (snip->count snip))])
-                      (cond
-                       [(or (and (eq? direction 'on)
-                                 (zero? p))
-                            (and (or (eq? direction 'before)
-                                     (eq? direction 'before-or-none))
-                                 (p . <= . 0))
-                            (and (or (eq? direction 'after)
-                                     (eq? direction 'after-or-none))
-                                 (p . < . 0)))
-                        (values snip pos)]
-                       [(and (eq? direction 'on)
-                             (p . < . 0))
-                        (values #f 0)]
-                       [else
-                        (loop (snip->next snip) (+ pos (snip->count snip)) p)]))
-                    (if (not (eq? direction 'after-or-none))
-                        (values last-snip (- pos (snip->count last-snip)))
-                        (values #f 0)))))))]))
-
-  (def/public (find-next-non-string-snip [(make-or-false snip%) snip])
-    (if (or (and snip
-                 (not (eq? (snip->admin snip) snip-admin)))
-            (zero? len))
-        #f
-        (let loop ([snip (if snip
-                             (snip->next snip)
-                             snips)])
-          (if (and snip (snip . is-a? . string-snip%))
-              (loop (snip->next snip))
-              snip))))
-
-  ;; ----------------------------------------
-
-  (define/override (setting-admin admin) (void))
-
-  (define/override (init-new-admin)
-    (when (and (not (in-edit-sequence?))
-               (or (not s-admin) (not (send s-admin refresh-delayed?))))
-      (redraw)))
-
-  (define/private (end-streaks exceptions)
-    (when (and s-keymap 
-               (not (memq 'key-sequence exceptions))
-               (not streaks-pushed?))
-      (send s-keymap break-sequence))
-    (when (and flash? flashautoreset? (not flashdirectoff?))
-      (flash-off))
-
-    (set! typing-streak? #f)
-    (set! deletion-streak? #f)
-    (when (not (memq 'cursor exceptions))
-      (set! vcursor-streak? #f)
-      (set! extend-streak? #f))
-    
-    (when (and anchor-streak? (not keep-anchor-streak?))
-      (set-anchor #f))
-
-    (when (not (memq 'delayed exceptions))
-      (set! delayed-streak? #f))
-
-    (set! kill-streak? #f)
-    
-    (set! prev-paste-start -1))
-
-  (define/private (push-streaks)
-    (set! streaks-pushed? #t)
-    (set! save-typing-streak? typing-streak?)
-    (set! save-deletion-streak? deletion-streak?)
-    (set! save-delayed-streak? delayed-streak?)
-    (set! save-vcursor-streak? vcursor-streak?)
-    (set! save-kill-streak? kill-streak?)
-    (set! save-anchor-streak? anchor-streak?)
-    (set! save-extend-streak? extend-streak?)
-    (set! save-prev-paste-start prev-paste-start)
-    (set! save-prev-paste-end prev-paste-end))
-
-  (define/private (pop-streaks)
-    (when streaks-pushed?
-      (set! streaks-pushed? #f)
-      (set! typing-streak? save-typing-streak?)
-      (set! deletion-streak? save-deletion-streak?)
-      (set! delayed-streak? save-delayed-streak?)
-      (set! vcursor-streak? save-vcursor-streak?)
-      (set! kill-streak? save-kill-streak?)
-      (set! anchor-streak? save-anchor-streak?)
-      (set! extend-streak? save-extend-streak?)
-      (set! prev-paste-start save-prev-paste-start)
-      (set! prev-paste-end save-prev-paste-end)))
-
-  ;; ----------------------------------------
-
-  (define/private (check-recalc [need-graphic? #t] [need-write? #t] [no-display-ok? #f])
-    (and (not read-locked?)
-         (not (and write-locked? need-write?))
-         (if (not need-graphic?)
-             #t
-             (if (not s-admin)
-                 no-display-ok?
-                 (if (not graphic-maybe-invalid?)
-                     #t
-                     (if flow-locked?
-                         #f
-                         (let ([dc (send s-admin get-dc)])
-                           (if (not dc)
-                               no-display-ok?
-                               (recalc-lines dc need-graphic?)))))))))
-
-  (define/public (check-flow maxw dc Y startp start)
-    ;; this method is called with write-locked and flow-locked already #t
-    (let ([p startp]
-          [checking-underflow? #f] ;; start by ensuring no overflow
-          [checking-underflow-at-next? #f]
-          [no-change-if-end-of-snip? #t] ;; because an immediate overflow can't be helped
-          [no-change-if-start-of-snip? #f]
-          [the-first-snip? #t]
-          [first-underflow? #f]
-          [deleted-a-newline? #f]
-          [had-newline? #f])
-
-      (define (done snip)
-        (cond
-         [(and (not snip)
-               (has-flag? (snip->flags last-snip) NEWLINE)
-               (not (has-flag? (snip->flags last-snip) HARD-NEWLINE)))
-          (begin
-            (set-snip-flags! last-snip (remove-flag (snip->flags last-snip) NEWLINE))
-            (set! refresh-all? #t)
-            #t)]
-         [(or (not checking-underflow?) no-change-if-end-of-snip?)
-          deleted-a-newline?]
-         [else
-          (set! refresh-all? #t)
-          #t]))
-
-      (let loop ([snip start]
-                 [p p]
-                 [_total-width padding-l])
-        (if (and snip (not (has-flag? (snip->flags snip) HARD-NEWLINE)))
-            (begin
-              (when (not checking-underflow?)
-                (set! checking-underflow? checking-underflow-at-next?)
-                (when checking-underflow?
-                  (set! first-underflow? #t)))
-              (set! no-change-if-start-of-snip? no-change-if-end-of-snip?)
-              
-              (if (has-flag? (snip->flags snip) NEWLINE)
-                  (begin
-                    (set! no-change-if-end-of-snip? (not checking-underflow?))
-                    (set-snip-flags! snip (remove-flag (snip->flags snip) NEWLINE))
-                    (set! checking-underflow-at-next? #t)
-                    (set! had-newline? #t)
-                    (set! deleted-a-newline? #t)
-                    ;; note: if the newline is restored, then
-                    ;; we leave the loop
-                    )
-                  (begin
-                    (set! no-change-if-end-of-snip? #f)
-                    (set! checking-underflow-at-next? #f)
-                    (set! had-newline? #f)))
-              
-              (let-boxes ([w 0.0])
-                  (send snip get-extent dc _total-width Y w #f #f #f #f #f)
-                (let ([_total-width (+ _total-width w)])
-                  (if (_total-width . > . maxw)
-                      (let ([_total-width (- _total-width w)])
-                        ;; get best breaking position:
-                        ;; (0.1 is hopefully a positive value smaller than any character)
-                        (let ([origc (do-find-position-in-snip dc _total-width Y snip (- maxw _total-width 0.1) #f)])
-                          ;; get legal breaking position before optimal:
-                          (let-boxes ([b (+ p origc 1)])
-                              (find-wordbreak b #f 'line)
-                            (let ([c (min (- b p) origc)])
-                              (let ([p
-                                     (if (c . <= . 0)
-                                         (cond
-                                          [(and (b . <= . startp) checking-underflow? (positive? origc))
-                                           ;; the word was currently force-broken; shift some part to here
-                                           (+ p origc)]
-                                          [(or (and checking-underflow?
-                                                    first-underflow?
-                                                    (or (b . <= . startp) (c . >= . 0)))
-                                               (and (not the-first-snip?)
-                                                    (or (zero? c)
-                                                        (and (zero? origc)
-                                                             (c . < . 0)
-                                                             (b . <= . startp)))))
-                                           ;; can't fit this snip in the line
-                                           (when (snip->prev snip)
-                                             (set-snip-flags! (snip->prev snip) (add-flag (snip->flags (snip->prev snip)) NEWLINE)))
-                                           (when (and had-newline? (snip->next snip))
-                                             (set-snip-flags! snip (add-flag (snip->flags snip) NEWLINE)))
-                                           (if (and no-change-if-start-of-snip?
-                                                    (or (not had-newline?)
-                                                        (snip->next snip)))
-                                               #f
-                                               (begin
-                                                (set! refresh-all? #t)
-                                                #t))]
-                                          [(and (c . < . 0) (b . > . startp))
-                                           ;; overflow, but previous wordbreak was before this snip
-                                           (when had-newline?
-                                             (set-snip-flags! snip (add-flag (snip->flags snip) NEWLINE)))
-                                           b]
-                                          [else
-                                           ;; overflow: we have to break the word anyway
-                                           (if (zero? origc)
-                                               (if (and (= (snip->count snip) 1)
-                                                        (snip->next snip)
-                                                        (has-flag? (snip->flags (snip->next snip)) NEWLINE))
-                                                   ;; don't insert a break before a real newline
-                                                   (done snip)
-                                                   (+ p 1))
-                                               (+ p origc))])
-                                         (+ p c))])
-                                (if (not (number? p))
-                                    p ;; the result
-                                    (begin
-                                      (make-snipset p p)
-                                      (let ([snip (find-snip p 'before)])
-                                        (when (snip->next snip)
-                                          (set-snip-flags! snip (add-flag (snip->flags snip) NEWLINE)))
-                                        (set! refresh-all? #t)
-                                        #t))))))))
-                      (begin
-                        (set! the-first-snip? #f)
-                        (set! first-underflow? #f)
-                        (loop (snip->next snip)
-                              (+ p (snip->count snip))
-                              _total-width))))))
-            (done snip)))))
-
-  (define/private (recalc-lines dc [calc-graphics? #t])
-    (when calc-graphics?
-      (when snip-cache-invalid?
-        (let loop ([snip snips])
-          (when snip
-            (send snip size-cache-invalid)
-            (loop (snip->next snip)))))
-
-      (let ([old-max-width max-width])
-        (when (and flow-invalid?
-                   (max-width . <= . 0))
-          (set! max-width A-VERY-BIG-NUMBER))
-
-        (when (or graphics-invalid?
-                  flow-invalid?
-                  snip-cache-invalid?)
-          ;; set all lines invalid
-          (let loop ([line first-line])
-            (when line
-              (mline-mark-recalculate line)
-              (when flow-invalid?
-                (mline-mark-check-flow line))
-              (loop (mline-next line)))))
-        
-        (let ([-changed?
-               (if (max-width . > . 0)
-                   (let ([wl? write-locked?]
-                         [fl? flow-locked?])
-                     ;; if any flow is updated, snip sizing methods will be called
-                     (set! write-locked? #t)
-                     (set! flow-locked? #t)
-                     
-                     (let ([w (- max-width padding-l padding-t CURSOR-WIDTH)])
-                       (let loop ([-changed? #f])
-                         (if (begin0
-                              (mline-update-flow (unbox line-root-box) line-root-box this w dc
-                                                 (lambda (del-line)
-                                                   (when (eq? del-line first-line)
-                                                     (set! first-line (mline-first (unbox line-root-box))))
-                                                   (when (eq? del-line last-line)
-                                                     (set! last-line (mline-last (unbox line-root-box)))))
-                                                 (lambda (ins-line)
-                                                   (when (not (mline-prev ins-line))
-                                                     (set! first-line ins-line))
-                                                   (when (not (mline-next ins-line))
-                                                     (set! last-line ins-line))))
-                              (assert (consistent-snip-lines 'post-update-flow)))
-
-                             (loop #t)
-                             
-                             (begin
-                               (set! flow-locked? fl?)
-                               (set! write-locked? wl?)
-                               -changed?)))))
-                   #f)])
-
-          (when (not (= max-width old-max-width))
-            (set! max-width old-max-width))
-
-          (when -changed?
-            (set! refresh-all? #t)
-            (set! first-line (mline-first (unbox line-root-box)))
-            (set! last-line (mline-last (unbox line-root-box)))
-            (set! num-valid-lines (mline-number (unbox line-root-box))))
-
-          (let*-values ([(snip-sizes-changed? this-changed?)
-                         (mline-update-graphics (unbox line-root-box) this dc
-                                                padding-l padding-t
-                                                max-line-width)]
-                        [(-changed?) (or this-changed? -changed?)])
-
-            (if (and (not -changed?)
-                     (not graphic-maybe-invalid-force?))
-                (begin
-                  (set! graphic-maybe-invalid? #f)
-                  (void))
-                (begin
-                  (set! graphic-maybe-invalid? #f)
-                  (set! graphic-maybe-invalid-force? #f)
-
-                  (let* ([Y (+ (mline-get-location last-line) (mline-h last-line))]
-                         [Y (if (has-flag? (snip->flags last-snip) NEWLINE)
-                                (begin
-                                  (set! extra-line? #t)
-                                  (set! extra-line-h (+ (mline-last-h last-line) line-spacing))
-                                  (+ Y extra-line-h))
-                                (begin
-                                  (set! extra-line? #f)
-                                  (set! extra-line-h 0)
-                                  Y))]
-                         [X (+ (mline-max-width (unbox line-root-box)) CURSOR-WIDTH)]
-                         [X (if (min-width . > . 0.0)
-                                (max X min-width)
-                                X)]
-                         [Y (if (min-height . > . 0.0)
-                                (max Y min-height)
-                                Y)]
-                         [Y (if (max-height . > . 0.0)
-                                (min Y max-height)
-                                Y)])
-                    (let ([descent (- (mline-h last-line) (mline-bottombase last-line))]
-                          [space (mline-topbase first-line)]
-                          [line-base (mline-bottombase first-line)])
-                      (let ([resized?
-                             (if (or (not (= total-height Y))
-                                     (not (= total-width X))
-                                     (not (= final-descent descent))
-                                     (not (= initial-space space))
-                                     (not (= line-base initial-line-base))
-                                     (not (equal? reported-padding
-                                                  (vector padding-l padding-t padding-r padding-b))))
-                                 (begin
-                                   (set! total-height Y)
-                                   (set! total-width X)
-                                   (set! final-descent descent)
-                                   (set! initial-space space)
-                                   (set! initial-line-base line-base)
-                                   (set! reported-padding
-                                         (vector padding-l padding-t padding-r padding-b))
-                                   #t)
-                                 #f)])
-
-                        (set! graphics-invalid? #f)
-                        (set! flow-invalid? #f)
-                        (set! snip-cache-invalid? #f)
-
-                        (set! draw-cached-in-bitmap? #f)
-
-                        (when (and resized? s-admin)
-                          (send s-admin resized #f))
-                        (when (or resized? snip-sizes-changed?)
-                          (on-reflow))))))))))))
-
-  (def/public (on-reflow) (void))
-
-  (def/public (set-autowrap-bitmap [(make-or-false bitmap%) bm])
-    (if flow-locked?
-        #f
-        (let ([old auto-wrap-bitmap]
-              [old-width wrap-bitmap-width])
-
-          (set! auto-wrap-bitmap bm)
-          (if auto-wrap-bitmap
-              (set! wrap-bitmap-width (exact->inexact (send auto-wrap-bitmap get-width)))
-              (set! wrap-bitmap-width 0.0))
-
-          (when (max-width . > . 0)
-            (set-max-width (+ max-width old-width)))
-
-          old)))
-
-  (def/public (get-autowrap-bitmap-width) wrap-bitmap-width)
-
-  ;; ----------------------------------------
-
-  ;; notifies the administrator that we need to be redrawn
-  (define/private (redraw)
-
-    (unless (or flow-locked? (not s-admin))
-      (let-values ([(continue? notify?)
-                    (if (send s-admin refresh-delayed?)
-                        ;; does the admin know the refresh box already?
-                        (if (and (not (= delayedscroll -1))
-                                 (not delayedscrollbox?)
-                                 (or refresh-all? refresh-unset?))
-                            ;; yes...
-                            (if (and (not refresh-all?) refresh-box-unset?)
-                                ;; nothing to do
-                                (values #f #f)
-                                (values #t #t))
-                            (values #t #t))
-                        (values #t #f))])
-        (when continue?
-          
-          (when notify?
-            (let-boxes ([x 0.0] [y 0.0] [w 0.0] [h 0.0])
-                (send s-admin get-max-view x y w h)
-              (let ([top y]
-                    [bottom (+ y h)]
-                    [left x]
-                    [right (+ x w)])
-                (let-values ([(left right top bottom)
-                              (call-with-semaphore
-                               refresh-box-lock
-                               (lambda ()
-                                 (begin0
-                                  (if refresh-all?
-                                      (values left right top bottom)
-                                      (values
-                                       (max refresh-l left)
-                                       (if (eq? refresh-r 'display-end)
-                                           right
-                                           (min refresh-r right))
-                                       (max refresh-t top)
-                                       (if (eq? refresh-b 'display-end)
-                                           bottom
-                                           (min refresh-b bottom))))
-                                  (set! refresh-unset? #t)
-                                  (set! refresh-box-unset? #t)
-                                  (set! refresh-all? #f))))])
-                  (let ([height (- bottom top)]
-                        [width (- right left)])
-                    (when (and (width . > . 0) (height . > . 0))
-                      (send s-admin needs-update left top width height)))))))
-
-          (let-boxes ([dc #f]
-                      [x 0.0]
-                      [y 0.0])
-              (set-box! dc (send s-admin get-dc x y))
-            (if (not dc)
-                (begin
-                  (set! delayedscroll -1)
-                  (set! delayedscrollbox? #f))
-
-                (let ([origx x]
-                      [origy y])
-
-                  (recalc-lines dc) 
-
-                  (cond
-                   [(not (= delayedscroll -1))
-                    (when (scroll-to-position/refresh delayedscroll delayedscrollateol? #f
-                                                      delayedscrollend delayedscrollbias)
-                      (set! refresh-all? #t))]
-                   [delayedscrollbox?
-                    (set! delayedscrollbox? #f)
-                    (when (do-scroll-to delayedscrollsnip delayedscroll-x delayedscroll-y
-                                        delayedscroll-w delayedscroll-h #f delayedscrollbias)
-                      (set! refresh-all? #t))])
-                  (let-boxes ([x 0.0]
-                              [y 0.0])
-                      (send s-admin get-dc x y)
-                    (when (or (not (= origx x)) (not (= origy y)))
-                      (set! refresh-all? #t)))
-
-                  (let-boxes ([x 0.0] [y 0.0] [w 0.0] [h 0.0])
-                      (send s-admin get-max-view x y w h)
-                    (let ([top y]
-                          [bottom (+ y h)]
-                          [left x]
-                          [right (+ x w)])
-
-                      ;; figure out the minimal refresh area; the refresh area may be
-                      ;; determined by character position ranges, box coordinates, or
-                      ;; both; if neither is specified, we have to assume that everything
-                      ;; needs to be refreshed
-                      (let-values ([(left top right bottom needs-update?)
-                                    (call-with-semaphore
-                                     refresh-box-lock
-                                     (lambda ()
-                                       (begin0
-                                        (if (and (not refresh-all?)
-                                                 (or (not refresh-unset?) (not refresh-box-unset?)))
-                                            (if (not refresh-unset?)
-                                                (let ([top (if (refresh-start . > . -1)
-                                                               (let-boxes ([fy 0.0])
-                                                                   (position-location refresh-start #f fy #t #t #t)
-                                                                 (max top fy))
-                                                               top)]
-                                                      [bottom (if (refresh-end . > . -1)
-                                                                  (let-boxes ([fy 0.0])
-                                                                      (position-location refresh-end #f fy #f #f #t)
-                                                                    (min bottom fy))
-                                                                  bottom)])
-                                                  (values left (if (not refresh-box-unset?)
-                                                                   (min refresh-t top)
-                                                                   top)
-                                                          right (if (not refresh-box-unset?)
-                                                                    (if (eq? refresh-b 'display-end)
-                                                                        bottom
-                                                                        (max bottom refresh-b))
-                                                                    bottom)
-                                                          #t))
-                                                (values (max refresh-l left)
-                                                        (max top refresh-t)
-                                                        (if (eq? refresh-r 'display-end)
-                                                            right
-                                                            (min right refresh-r))
-                                                        (if (eq? refresh-b 'display-end)
-                                                            bottom
-                                                            (min bottom refresh-b))
-                                                        #t))
-                                            (values left top right bottom refresh-all?))
-                                        (set! refresh-unset? #t)
-                                        (set! refresh-box-unset? #t)
-                                        (set! refresh-all? #f))))])
-
-                        (let ([height (- bottom top)]
-                              [width (- right left)])
-
-                          (when changed? 
-                            (set! changed? #f)
-                            (let ([wl? write-locked?]
-                                  [fl? flow-locked?])
-                              
-                              (set! write-locked? #t)
-                              (set! flow-locked? #t)
-                              (on-change)
-                              (set! write-locked? wl?)
-                              (set! flow-locked? fl?)))
-
-                          (when (and needs-update?
-                                     (width . > . 0)
-                                     (height . > . 0))
-                            (send s-admin needs-update left top width height)))))))))))))
-
-  (define/private (too-busy-to-refresh?)
-    (or graphic-maybe-invalid?
-        flow-locked?
-        (in-edit-sequence?)))
-
-  ;; called by the administrator to trigger a redraw
-  (def/override (refresh [real? left] [real? top] [nonnegative-real? width] [nonnegative-real? height]
-                         [caret-status? show-caret]
-                         [(make-or-false color%) bg-color])
-    (cond
-     [(or (width . <= . 0) (height . <= . 0)) (void)]
-     [(too-busy-to-refresh?)
-      ;; this refresh command was not requested by us and we're busy
-      ;; (probably in the middle of a begin-/end-edit-sequnce);
-      ;; add the given region to our own invalid-region tracking, and
-      ;; we'll get back to it when we're done with whatever
-      (refresh-box left top width height)
-      ;; Double-check that we didn't finish being busy while
-      ;; setting the box:
-      (unless (too-busy-to-refresh?) (redraw))]
-     [(not s-admin)
-      (void)]
-     [else
-      (let-boxes ([x 0.0]
-                  [y 0.0]
-                  [dc #f])
-          (set-box! dc (send s-admin get-dc x y))
-        (when dc
-          (begin-sequence-lock)
-
-          (let ([show-caret
-                 (if (and caret-blinked?
-                          (not (pair? show-caret))
-                          (not (eq? show-caret 'no-caret))
-                          (not s-caret-snip))
-                     ;; maintain caret-blinked invariant
-                     'no-caret
-                     show-caret)])
-
-            (when (send s-offscreen ready-offscreen width height)
-              (set! draw-cached-in-bitmap? #f))
-
-            ;; make sure all location information is integral,
-            ;; so we can shift the coordinate system and generally
-            ;; update on pixel boundaries
-            (let ([x (->long (floor x))]
-                  [y (->long (floor y))]
-                  [bottom (->long (ceiling (+ top height)))]
-                  [right (->long (ceiling (+ left width)))]
-                  [top (->long (floor top))]
-                  [left (->long (floor left))])
-              (let ([width (- right left)]
-                    [height (- bottom top)]
-                    [ps? (or (dc . is-a? . post-script-dc%)
-                             (dc . is-a? . printer-dc%))]
-                    [show-xsel?
-                     (and ALLOW-X-STYLE-SELECTION?
-                          (or (and (not (eq? 'show-caret show-caret)) 
-                                   (not (pair? show-caret)))
-                              s-caret-snip)
-                          (eq? this editor-x-selection-owner)
-                          (not flash?)
-                          (not (= endpos startpos)))])
-
-                (if (and bg-color
-                         (not (send s-offscreen is-in-use?))
-                         (send s-offscreen get-bitmap)
-                         (send (send s-offscreen get-bitmap) ok?)
-                         (send (send s-offscreen get-dc) ok?)
-                         (not ps?))
-                    ;; draw to offscreen
-                    (let ([red (send bg-color red)]
-                          [green (send bg-color green)]
-                          [blue (send bg-color blue)])
-                      (send s-offscreen set-in-use #t)
-                      
-                      (when (or
-                             (not draw-cached-in-bitmap?)
-                             (not (eq? offscreen-key (send s-offscreen get-last-used)))
-                             (not (= last-draw-t top))
-                             (not (= last-draw-b bottom))
-                             (not (= last-draw-l left))
-                             (not (= last-draw-r right))
-                             (not (eq? show-caret last-draw-caret))
-                             (not (eq? show-xsel? last-draw-x-sel?))
-                             (not (= last-draw-red red))
-                             (not (= last-draw-green green))
-                             (not (= last-draw-blue blue)))
-                        
-                        (do-redraw (send s-offscreen get-dc) top bottom left right 
-                                   (- top) (- left) show-caret show-xsel? bg-color)
-                        
-                        (set! last-draw-l left)
-                        (set! last-draw-t top)
-                        (set! last-draw-r right)
-                        (set! last-draw-b bottom)
-                        (set! last-draw-caret show-caret)
-                        (set! last-draw-x-sel? show-xsel?)
-                        (set! last-draw-red red)
-                        (set! last-draw-green green)
-                        (set! last-draw-blue blue)
-                        (set! draw-cached-in-bitmap? #t))
-
-                      (send dc draw-bitmap-section 
-                            (send (send s-offscreen get-dc) get-bitmap) 
-                            (- left x) (- top y) 
-                            0 0 width height 'solid)
-                      
-                      (send s-offscreen set-last-used offscreen-key)
-                      (send s-offscreen set-in-use #f))
-                    
-                    ;; draw to given DC:
-                    (let ([pen (send dc get-pen)]
-                          [brush (send dc get-brush)]
-                          [font (send dc get-font)]
-                          [fg (make-object color% (send dc get-text-foreground))]
-                          [bg (make-object color% (send dc get-text-background))]
-                          [bgmode (send dc get-text-mode)]
-                          [rgn (send dc get-clipping-region)])
-
-                      (send dc set-clipping-rect (- left x) (- top y) width height)
-
-                      (send dc suspend-flush)
-
-                      (dynamic-wind
-                          void
-                          (lambda ()
-                            (do-redraw dc top bottom left right (- y) (- x) show-caret show-xsel? bg-color))
-                          (lambda ()
-                            (send dc set-clipping-region rgn)
-                            
-                            (send dc set-brush brush)
-                            (send dc set-pen pen)
-                            (send dc set-font font)
-                            (send dc set-text-foreground fg)
-                            (send dc set-text-background bg)
-                            (send dc set-text-mode bgmode)
-
-                            (send dc resume-flush))))))))
-
-          (end-sequence-lock)))]))
-  
-  ;; performs the actual drawing operations
-  (define/private (do-redraw dc starty endy leftx rightx dy dx show-caret show-xsel? bg-color)
-    (let ([wl? write-locked?])
-
-      (set! flow-locked? #t)
-      (set! write-locked? #t)
-
-      (let-values ([(-startpos -endpos pos-at-eol?)
-                    (if flash?
-                        (values flashstartpos flashendpos flashposateol?)
-                        (values startpos endpos posateol?))])
-
-        (send dc set-text-mode 'solid)
-
-        (let ([line (mline-find-location (unbox line-root-box) (- starty padding-t))])
-
-          (when (and bg-color
-                     (not (pair? show-caret)))
-            (let ([lsave-pen (send dc get-pen)]
-                  [lsave-brush (send dc get-brush)])
-              (let ([wb (if (and (= 255 (send bg-color red))
-                                 (= 255 (send bg-color green))
-                                 (= 255 (send bg-color blue)))
-                            clear-brush
-                            (send the-brush-list find-or-create-brush bg-color 'solid))])
-                (send dc set-brush wb)
-                (send dc set-pen outline-pen)
-
-                (send dc draw-rectangle
-                      (+ leftx dx) (+ starty dy)
-                      (- rightx leftx) (- endy starty))
-
-                (send dc set-brush lsave-brush)
-                (send dc set-pen lsave-pen))))
-
-          (let* ([call-on-paint
-                  (lambda (pre?)
-                    (on-paint pre? dc leftx starty rightx endy dx dy
-                              (if (or (pair? show-caret)
-                                      (not s-caret-snip))
-                                  show-caret
-                                  'no-caret)))]
-                 [paint-done
-                  (lambda ()
-                    (call-on-paint #f)
-                    (set! write-locked? wl?)
-                    (set! flow-locked? #f))]
-
-                 [local-caret-pen
-                  (if bg-color
-                      (let ([r (send bg-color red)]
-                            [g (send bg-color green)]
-                            [b (send bg-color blue)])
-                        (if (and (= r 255) (= g 255) (= b 255))
-                            caret-pen
-                            (make-object pen% (make-object color% 
-                                                           (- 255 r)
-                                                           (- 255 g)
-                                                           (- 255 b))
-                                         (send caret-pen get-width) 
-                                         'solid)))
-                      caret-pen)])
-
-            (call-on-paint #t)
-            
-            (when line
-              (let ([tleftx (+ leftx dx)]
-                    [tstarty (+ starty dy)]
-                    [trightx (+ rightx dx)]
-                    [tendy (+ endy dy)])
-                (let lloop ([line line]
-                            [old-style #f]
-                            [ycounter (+ (mline-get-location line) padding-t)]
-                            [pcounter (mline-get-position line)]
-                            [prevwasfirst 0.0])
-                  (cond
-                   [(not line)
-                    (send (send s-style-list basic-style) switch-to dc old-style)
-                    (when (and (eq? 'show-caret show-caret) 
-                               (not s-caret-snip)
-                               extra-line?
-                               (not pos-at-eol?)
-                               (= len -startpos)
-                               (= -endpos -startpos)
-                               hilite-on?)
-                      (let ([y ycounter]
-                            [save-pen (send dc get-pen)])
-                        (send dc set-pen local-caret-pen)
-                        (send dc draw-line 
-                              (+ dx padding-l) (+ y dy)
-                              (+ dx padding-l) (sub1 (+ y extra-line-h dy)))
-                        (send dc set-pen save-pen)))
-                    (paint-done)]
-                   [(ycounter . >= . endy)
-                    (paint-done)]
-                   [line
-                    (let ([first (mline-snip line)]
-                          [last (snip->next (mline-last-snip line))]
-                          [bottombase (+ ycounter (mline-bottombase line))]
-                          [topbase (+ ycounter (mline-topbase line))])
-                      (define (process-snips draw? maybe-hilite? old-style)
-                        (let sloop ([snip first]
-                                    [p pcounter]
-                                    [x (+ (mline-get-left-location line max-line-width) padding-l)]
-                                    [hilite-some? #f]
-                                    [hsxs 0.0]
-                                    [hsxe 0.0]
-                                    [hsys 0.0]
-                                    [hsye 0.0]
-                                    [old-style old-style])
-                          (if (eq? snip last)
-                              (values hilite-some? hsxs hsxe hsys hsye old-style)
-                              (begin
-                                (send (snip->style snip) switch-to dc old-style)
-                                (let ([old-style (snip->style snip)])
-                                  (let-boxes ([w 0.0] [h 0.0] [descent 0.0] [space 0.0])
-                                      (send snip get-extent dc x ycounter w h descent space #f #f)
-                                    (let* ([align (style->alignment (snip->style snip))]
-                                           [down
-                                            (cond
-                                             [(eq? 'bottom align)
-                                              (+ (- bottombase h) descent)]
-                                             [(eq? 'top align)
-                                              (- topbase space)]
-                                             [else
-                                              (- (/ (+ topbase bottombase) 2) 
-                                                 (/ (- h descent space) 2)
-                                                 space)])])
-
-                                      (when draw?
-                                        (when (and (x . <= . rightx)
-                                                   ((+ x w) . >= . leftx))
-                                          (send snip draw dc (+ x dx) (+ down dy)
-                                                tleftx tstarty trightx tendy
-                                                dx dy
-                                                (if (pair? show-caret)
-                                                    (cons p (+ p (snip->count snip)))
-                                                    (if (eq? snip s-caret-snip)
-                                                        show-caret
-                                                        (if (and maybe-hilite?
-                                                                 (-endpos . > . p)
-                                                                 (-startpos . < . (+ p (snip->count snip))))
-                                                            (cons (max 0 (- -startpos p))
-                                                                  (min (snip->count snip) (- -endpos p)))
-                                                            'no-caret))))))
-
-                                      ;; the rules for hiliting are surprisingly complicated:
-                                      (let ([hilite?
-                                             (and
-                                              hilite-on?
-                                              (or show-xsel?
-                                                  (and (not s-caret-snip)
-                                                       (or (eq? 'show-caret show-caret)
-                                                           (and (show-caret . showcaret>= . s-inactive-caret-threshold)
-                                                                (not (= -endpos -startpos))))))
-                                              (if pos-at-eol?
-                                                  (= -startpos (+ p (snip->count snip)))
-                                                  (or (and (-startpos . < . (+ p (snip->count snip)))
-                                                           (-endpos . >= . p)
-                                                           (or (= -endpos -startpos) (-endpos . > . p)))
-                                                      (and (= (+ p (snip->count snip)) len)
-                                                           (= len -startpos))))
-                                              (or (not (has-flag? (snip->flags snip) NEWLINE))
-                                                  ;; end of line:
-                                                  (or (not (= -startpos (+ p (snip->count snip))))
-                                                      (and (= -endpos -startpos) pos-at-eol?)
-                                                      (and (not (= -endpos -startpos)) 
-                                                           (-startpos . < . (+ p (snip->count snip))))))
-                                              (or (not (eq? snip first))
-                                                  ;; beginning of line:
-                                                  (or (not (= p -endpos))
-                                                      (and (= -endpos -startpos) (not pos-at-eol?))
-                                                      (and (not (= -endpos -startpos))
-                                                           (-endpos . > . p)))))])
-                                        
-                                        (if hilite?
-                                            (let*-values ([(bottom) (+ down h)]
-                                                          [(hxs) (if (-startpos . <= . p)
-                                                                     (if (-startpos . < . p)
-                                                                         0
-                                                                         x)
-                                                                     (+ x (send snip partial-offset dc x ycounter
-                                                                                (- -startpos p))))]
-                                                          [(hxe bottom) (if (-endpos . >= . (+ p (snip->count snip)))
-                                                                            (if (has-flag? (snip->flags snip) NEWLINE)
-                                                                                (if (= -startpos -endpos)
-                                                                                    (values hxs bottom)
-                                                                                    (values rightx
-                                                                                            (+ ycounter (mline-h line))))
-                                                                                (values (+ x w) bottom))
-                                                                            (values (+ x (send snip partial-offset dc x ycounter
-                                                                                               (- -endpos p)))
-                                                                                    bottom))])
-                                              
-                                              (let-values ([(hsxs hsxe hsys hsye)
-                                                            (if (not hilite-some?)
-                                                                (values hxs hxe down bottom)
-                                                                (values hsxs hxe (min down hsys) (max hsye bottom)))])
-                                                (sloop (snip->next snip)
-                                                       (+ p (snip->count snip))
-                                                       (+ x w)
-                                                       #t hsxs hsxe hsys hsye
-                                                       old-style)))
-                                            (sloop (snip->next snip)
-                                                   (+ p (snip->count snip))
-                                                   (+ x w)
-                                                   hilite-some? hsxs hsxe hsys hsye
-                                                   old-style))))))))))
-                      (let*-values ([(draw-first?)
-                                     (or (and (or (not (showcaret>= show-caret 'show-caret))
-						  (and s-caret-snip (not (pair? show-caret)))
-						  (not hilite-on?))
-					      (not show-xsel?))
-                                         (= -startpos -endpos)
-                                         (-endpos . < . pcounter)
-                                         (-startpos . > . (+ pcounter (mline-len line))))]
-                                    [(hilite-some? hsxs hsxe hsys hsye old-style)
-                                     (process-snips draw-first? #f old-style)])
-                        (let ([prevwasfirst
-                               (if hilite-some?
-                                   (if (not (= hsxs hsxe))
-                                       (if (and (hsxs . <= . rightx) (hsxe . >= . leftx))
-                                           (let ([save-pen (send dc get-pen)]
-                                                 [hxsx (max hsxs leftx)]
-                                                 [hsxe (min hsxe rightx)])
-                                             (begin0
-                                              (if (and (not show-xsel?)
-                                                       (not (showcaret>= show-caret 'show-caret)))
-                                                  (if show-outline-for-inactive?
-                                                      (let ([first-hilite? (-startpos . >= . pcounter)]
-                                                            [last-hilite? (-endpos . <= . (+ pcounter (mline-len line)))])
-                                                        (send dc set-pen outline-inactive-pen)
-                                                        (let ([prevwasfirst
-                                                               (cond
-                                                                [first-hilite?
-                                                                 (send dc draw-line (+ hsxs dx) (+ hsys dy) (+ hsxe (sub1 dx)) (+ hsys dy))
-                                                                 hsxs]
-                                                                [(positive? prevwasfirst)
-                                                                 (send dc draw-line dx (+ hsys dy) (+ prevwasfirst dx) (+ hsys dy))
-                                                                 0.0]
-                                                                [else 0.0])])
-                                                          (send dc draw-line (+ hsxs dx) (+ hsys dy) (+ hsxs dx) (+ hsye (sub1 dy)))
-                                                          (send dc draw-line (+ hsxe (sub1 dx)) (+ hsys dy) 
-                                                                (+ hsxe (sub1 dx)) (+ hsye (sub1 dy)))
-                                                          (when last-hilite?
-                                                            (send dc draw-line (+ hsxs dx) (+ hsye dy) (+ hsxe (sub1 dx)) (+ hsye dy)))
-                                                          (when (not first-hilite?)
-                                                            (send dc draw-line (+ hsxe dx) (+ hsys dy) (+ rightx dx) (+ hsys dy)))
-                                                          prevwasfirst))
-                                                      prevwasfirst)
-                                                  (let ([save-brush (send dc get-brush)])
-                                                    (send dc set-pen outline-pen)
-                                                    (send dc set-brush outline-brush)
-                                                    
-                                                    (send dc draw-rectangle (+ hsxs dx) (+ hsys dy) 
-                                                          (max 0.0 (- hsxe hsxs)) (max 0.0 (- hsye hsys)))
-                                                    (when ALLOW-X-STYLE-SELECTION?
-                                                      (when show-xsel?
-                                                        (send dc set-brush outline-nonowner-brush)
-                                                        (send dc draw-rectangle (+ hsxs dx) (+ hsys dy) 
-                                                              (max 0.0 (- hsxe hsxs)) (max 0.0 (- hsye hsys)))))
-                                                    (send dc set-brush save-brush)
-                                                    prevwasfirst))
-                                              (send dc set-pen save-pen)))
-                                           prevwasfirst)
-                                       (begin
-                                         (when (eq? 'show-caret show-caret)
-                                           (when (and (hsxs . <= . rightx) (hsxs . >= . leftx))
-                                             (let ([save-pen (send dc get-pen)])
-                                               (send dc set-pen local-caret-pen)
-                                               (send dc draw-line (+ hsxs dx) (+ hsys dy) 
-                                                     (+ hsxs dx) 
-                                                     (+ hsye (sub1 dy)))
-                                               (send dc set-pen save-pen))))
-                                         prevwasfirst))
-                                   prevwasfirst)])
-                          
-                          (when (and (positive? wrap-bitmap-width)
-                                     (not (has-flag? (snip->flags (mline-last-snip line)) HARD-NEWLINE))
-                                     last
-                                     (rightx . >= . max-width)
-                                     (send auto-wrap-bitmap ok?))
-                            (let ([h (min (->long (send auto-wrap-bitmap get-height))
-                                          (mline-bottombase line))]
-                                  [osfg (send old-style get-foreground)])
-                              (send dc draw-bitmap-section
-                                    auto-wrap-bitmap 
-                                    (sub1 (+ max-width dx)) (+ (- bottombase h) dy)
-                                    0 0 wrap-bitmap-width h
-                                    'solid osfg)))
-
-                          (let ([old-style
-                                 (if draw-first?
-                                     old-style
-                                     (let-values ([(_hilite-some? _hsxs _hsxe _hsys _hsye old-style)
-                                                   (process-snips #t #t old-style)])
-                                       old-style))])
-                            (lloop (mline-next line)
-                                   old-style
-                                   (+ ycounter (mline-h line))
-                                   (+ pcounter (mline-len line))
-                                   prevwasfirst)))))])))))))))
-
-  ;; ----------------------------------------
-
-  ;; used internally to delay refreshes:
-  (define/private (need-refresh start [end -1])
-    (if refresh-unset?
-        (begin
-          (set! refresh-start start)
-          (set! refresh-end end)
-          (set! refresh-unset? #f))
-        (begin
-          (set! refresh-start (min start refresh-start))
-          (cond
-           [(= end -1)
-            (set! refresh-end -1)]
-           [(= refresh-end -1)
-            (void)]
-           [else (set! refresh-end (max end refresh-end))])))
-
-    (set! draw-cached-in-bitmap? #f)
-    
-    (continue-refresh))
-
-  (define/private (refresh-by-line-demand)
-    (set! graphic-maybe-invalid? #t)
-    (continue-refresh))
-
-  (define/private (continue-refresh)
-    (if (and (not (in-edit-sequence?))
-             (not (super is-printing?))
-             (or (not s-admin) (not (send s-admin refresh-delayed?))))
-        (redraw)
-        (begin
-          (when (and (not (in-edit-sequence?))
-                     (or (= delayedscroll -1) 
-                         delayedscrollbox?))
-            (if (and (not (super is-printing?)) s-admin)
-                ;; although the administrator says to delay,
-                ;; we can't just drop scroll requests
-                (redraw)
-                (begin
-                  (set! delayedscroll -1)
-                  (set! delayedscrollbox? #f))))
-          (when (and s-admin (zero? (send s-admin get-s-standard)))
-            (send s-admin resized #f)))))
-
-  (define/private (need-caret-refresh)
-    (need-refresh startpos endpos))
-
-  ;; ----------------------------------------
-
-  (define/override (own-x-selection on? update? force?)
-    (and (do-own-x-selection on? force?)
-         (begin
-           (when update?
-             (need-caret-refresh))
-           #t)))
-
-  ;; ----------------------------------------
-
-  (def/public (set-paragraph-margins [exact-nonnegative-integer? i]
-                                     [nonnegative-real? first-left]
-                                     [nonnegative-real? left]
-                                     [nonnegative-real? right])
-    (let ([l (mline-find-paragraph (unbox line-root-box) i)])
-      (when l
-        (let ([p (mline-clone-paragraph (mline-paragraph l))])
-          (set-mline-paragraph! l p)
-
-          (set-paragraph-left-margin-first! p first-left)
-          (set-paragraph-left-margin! p left)
-          (set-paragraph-right-margin! p right)
-
-          (if (max-width . > . 0)
-              (begin
-                (mline-mark-check-flow l)
-                (let loop ([l (mline-next l)])
-                  (when (and l
-                             (zero? (mline-starts-paragraph l)))
-                    (mline-mark-check-flow l)
-                    (loop (mline-next l)))))
-              (need-refresh (paragraph-start-position i) (paragraph-end-position i)))
-
-          (refresh-by-line-demand)))))
-  
-  (def/public (set-paragraph-alignment [exact-nonnegative-integer? i] [(symbol-in left center right) align])
-    (let ([l (mline-find-paragraph (unbox line-root-box) i)])
-      (when l
-        (let ([p (mline-clone-paragraph (mline-paragraph l))])
-          (set-mline-paragraph! l p)
-          
-          (set-paragraph-alignment! p align)
-
-          (need-refresh (paragraph-start-position i) (paragraph-end-position i))
-
-          (refresh-by-line-demand)))))
-
-  ;; ----------------------------------------
-
-  (def/override (is-printing?) (super is-printing?))
-
-  (define/override (do-begin-print dc fit?)
-    (if flow-locked?
-        #f
-        (begin
-          (check-recalc)
-          (size-cache-invalid)
-
-          (let ([save-info (if fit?
-                               (cons (get-max-width)
-                                     (set-autowrap-bitmap #f))
-                               #f)])
-            (when fit?
-              (let-values ([(w h) (send dc get-size)])
-                (let-boxes ([hm 0]
-                            [vm 0])
-                    (send (current-ps-setup) get-editor-margin hm vm)
-                  (set-max-width (- w (* 2 hm))))))
-
-            (recalc-lines dc #t)
-
-            (let ([wl? write-locked?]
-                  [fl? flow-locked?])
-              (set! write-locked? #t)
-              (set! flow-locked? #t)
-              (on-change)
-              (set! write-locked? wl?)
-              (set! flow-locked? fl?))
-
-            save-info))))
-
-  (define/override (do-end-print dc data)
-    (unless flow-locked?
-      (size-cache-invalid)
-
-      (when data
-        (set-max-width (car data))
-        (set-autowrap-bitmap (cdr data)))
-
-      (let ([wl? write-locked?]
-            [fl? flow-locked?])
-        (set! write-locked? #t)
-        (set! flow-locked? #t)
-        (on-change)
-        (set! write-locked? wl?)
-        (set! flow-locked? fl?))))
-
-  (define/private (new-page-line? line)
-    (let ([len (mline-len line)])
-      (and (<= 1 len 2)
-           (let* ([pos (mline-get-position line)]
-                  [s (get-text pos (+ pos len))])
-             (or (equal? s "\f")
-                 (equal? s "\f\n"))))))
-
-  (define/private (has/print-page dc page print?)
-    (if flow-locked?
-        #f
-        (begin
-          (recalc-lines dc #t)
-          (let-values ([(W H) (send dc get-size)])
-            (let-boxes ([W W]
-                        [H H]
-                        [hm 0]
-                        [vm 0])
-              (begin
-                (when (or (zero? (unbox W)) (zero? (unbox H)))
-                  (get-default-print-size W H))
-                (when (not (zero? page))
-                  (send (current-ps-setup) get-editor-margin hm vm)))
-              (let ([H (- H (* 2 vm))]
-                    [W (- W (* 2 hm))])
-
-                ;; H is the total page height;
-                ;; line is the line that we haven't finished printing;
-                ;; y is the starting location to print for this page;
-                ;; h is the height that we're hoping to fit into the page
-                ;; i is the line number
-                (let ploop ([this-page 1]
-                            [line first-line]
-                            [y 0.0]
-                            [next-h 0.0]
-                            [i 0])
-                  (and 
-                   line
-                   (let ([h next-h]
-                         [next-h 0.0])
-                     (let loop ([h h]
-                                [i i]
-                                [line line]
-                                [can-continue? #t]
-                                [unline 0.0])
-                       (cond
-                         [(or (zero? h)
-                              (and (i . < . num-valid-lines)
-                                   (or (zero? page)
-                                       ((mline-h line) . < . (- H h)))
-                                   can-continue?))
-                          (let ([lh (mline-h line)]
-                                [new-page? (new-page-line? line)])
-                            (loop (+ h lh)
-                                  (add1 i)
-                                  (mline-next line)
-                                  (not new-page?)
-                                  (if new-page? lh unline)))]
-                         [else
-                          (let-values ([(h i line)
-                                        (cond
-                                          [(and (not (zero? page))
-                                                (h . < . H)
-                                                (i . < . num-valid-lines)
-                                                ((mline-h line) . > . H))
-                                           ;; we'll have to break it up anyway; start now?
-                                           (let* ([pos (find-scroll-line (+ y H))]
-                                                  [py (scroll-line-location pos)])
-                                             (if (py . > . (+ y h))
-                                                 ;; yes, at least one line will fit
-                                                 (values (+ h (mline-h line))
-                                                         (add1 i)
-                                                         (mline-next line))
-                                                 (values h i line)))]
-                                          [else
-                                           (values h i line)])])
-                            (let-values ([(next-h h)
-                                          (if (and (not (zero? page))
-                                                   (h . > . H))
-                                              ;; only happens if we have something that's too big to fit on a page;
-                                              ;; look for internal scroll positions
-                                              (let* ([pos (find-scroll-line (+ y H))]
-                                                     [py (scroll-line-location pos)])
-                                                (if (py . > . y)
-                                                    (let ([new-h (- py y)])
-                                                      (values (- h new-h)
-                                                              new-h))
-                                                    (values next-h h)))
-                                              (values next-h h))])
-                              (or (if print?
-                                      (begin
-                                        (when (or (page . <= . 0)
-                                                  (= this-page page))
-                                          (begin
-                                            (when (page . <= . 0)
-                                              (send dc start-page))
-                                            (do-redraw dc 
-                                                       (+ y (if (zero? i) 0 1))
-                                                       (+ y (- h 1 unline))
-                                                       0 W (+ (- y) vm) hm
-                                                       'no-caret #f #f)
-                                            (when (page . <= . 0)
-                                              (send dc end-page))))
-                                        #f)
-                                      (= this-page page))
-                                  (ploop (add1 this-page)
-                                         line
-                                         (+ y h)
-                                         next-h 
-                                         i))))])))))))))))
-
-  (define/override (do-has-print-page? dc page)
-    (has/print-page dc page #f))
-
-  (def/override (print-to-dc [dc<%> dc] [exact-integer? [page -1]])
-    (has/print-page dc page #t)
-    (void)))
-
-(set-text%! text%)
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define/top (add-text-keymap-functions [keymap% tab])
-  (let ([add (lambda (n f)
-               (send tab add-function n
-                     (lambda (e evt)
-                       (if (e . is-a? . text%)
-                           (begin (f e evt) #t)
-                           #f))))])
-    (add "forward-character" (lambda (t evt) (send t move-position 'right)))
-    (add "backward-character" (lambda (t evt) (send t move-position 'left)))
-    (add "previous-line" (lambda (t evt) (send t move-position 'up)))
-    (add "next-line" (lambda (t evt) (send t move-position 'down)))
-    (add "previous-page" (lambda (t evt) (send t move-position 'up #f 'page)))
-    (add "next-page" (lambda (t evt) (send t move-position 'down #f 'page)))
-    (add "forward-word" (lambda (t evt) (send t move-position 'right #f 'word)))
-    (add "backward-word" (lambda (t evt) (send t move-position 'left #f 'word)))
-
-    (add "forward-select" (lambda (t evt) (send t move-position 'right #t)))
-    (add "backward-select" (lambda (t evt) (send t move-position 'left #t)))
-    (add "select-down" (lambda (t evt) (send t move-position 'down #t)))
-    (add "select-up" (lambda (t evt) (send t move-position 'up #t)))
-    (add "select-page-up" (lambda (t evt) (send t move-position 'up #t 'page)))
-    (add "select-page-down" (lambda (t evt) (send t move-position 'down #t 'page)))
-    (add "forward-select-word" (lambda (t evt) (send t move-position 'right #t 'word)))
-    (add "backward-select-word" (lambda (t evt) (send t move-position 'left #t 'word)))
-
-    (add "beginning-of-file" (lambda (t evt) (send t move-position 'home)))
-    (add "end-of-file" (lambda (t evt) (send t move-position 'end)))
-    (add "beginning-of-line" (lambda (t evt) (send t move-position 'left #f 'line)))
-    (add "end-of-line" (lambda (t evt) (send t move-position 'right #f 'line)))
-
-    (add "select-to-beginning-of-file" (lambda (t evt) (send t move-position 'home #t)))
-    (add "select-to-end-of-file" (lambda (t evt) (send t move-position 'end #t)))
-    (add "select-to-beginning-of-line" (lambda (t evt) (send t move-position 'left #t 'line)))
-    (add "select-to-end-of-line" (lambda (t evt) (send t move-position 'right #t 'line)))
-
-    (add "delete-previous-character" (lambda (t evt) (send t delete)))
-    (add "delete-next-character" (lambda (t evt)
-                                   (let-boxes ([s 0]
-                                               [e 0])
-                                       (send t get-position s e)
-                                     (if (not (= s e))
-                                         (send t delete)
-                                         (send t delete s (+ s 1))))))
-    
-    (add "clear-buffer" (lambda (t evt) (send t erase)))
-    (add "delete-next-word" (lambda (t evt)
-                              (send t begin-edit-sequence)
-                              (send t move-position 'right #t 'word)
-                              (send t delete)
-                              (send t end-edit-sequence)))
-    (add "delete-previous-word" (lambda (t evt)
-                                  (send t begin-edit-sequence)
-                                  (send t move-position 'left #t 'word)
-                                  (send t delete)
-                                  (send t end-edit-sequence)))
-    (add "delete-line" (lambda (t evt)
-                         (send t begin-edit-sequence)
-                         (send t move-position 'left #f 'line)
-                         (send t move-position 'right #t 'line)
-                         (send t delete)
-                         (send t end-edit-sequence)))
-
-    (add "paste-next" (lambda (t evt) (send t paste-next)))
-
-    (add-editor-keymap-functions tab)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/undo.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/undo.rkt
deleted file mode 100644
index 130d2ba3e3..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/undo.rkt
+++ /dev/null
@@ -1,313 +0,0 @@
-#lang racket/base
-(require racket/class
-         "private.rkt"
-         racket/snip/private/private
-         racket/snip/private/snip
-         racket/snip/private/snip-flags)
-
-(provide change-record%
-         proc-record%
-         unmodify-record%
-         insert-record%
-         insert-snip-record%
-         delete-record%
-         delete-snip-record%
-         style-change-record%
-         style-change-snip-record%
-         move-snip-record%
-         resize-snip-record%
-         composite-record%)
-
-(define (disown snip)
-  (when (has-flag? (snip->flags snip) OWNED)
-    (send snip set-s-flags (remove-flag (snip->flags snip) OWNED))))
-
-(define change-record%
-  (class object%
-    (super-new)
-    (define/public (cancel) (void))
-    (define/public (undo editor) #f)
-    (define/public (drop-set-unmodified) (void))
-    (define/public (is-composite?) #f)
-    (define/public (get-id) #f)
-    (define/public (get-parity) 0)
-    (define/public (inverse) #f)))
-
-(define proc-record%
-  (class change-record%
-    (init-field proc)
-    (super-new)
-    
-    (define/override (undo editor)
-      (proc))))
-
-(define unmodify-record%
-  (class change-record%
-    (init-field cont?)
-    (define ok? #t)
-    (super-new)
-
-    (define/override (undo editor)
-      (when ok?
-        (send editor set-modified #f))
-      cont?)
-
-    (define/override (drop-set-unmodified)
-      (set! ok? #f))))
-
-(define insert-record%
-  (class change-record%
-    (init-field start)
-    (init       length)
-    (init-field cont?
-                startsel
-                endsel)
-    (define end (+ start length))
-    (super-new)
-
-    (define/override (undo editor)
-      (send editor delete start end)
-      (send editor set-position startsel endsel)
-      cont?)))
-
-(define insert-snip-record%
-  (class change-record%
-    (init-field snip 
-                cont?)
-    (super-new)
-    
-    (define/override (undo editor)
-      (send editor delete snip)
-      (unless cont?
-        (send editor set-selected snip))
-      cont?)))
-
-(define-struct delete-snip-item (snip before x y))
-
-(define delete-snip-record%
-  (class change-record%
-    (init-field cont?)
-    (define deletions null)
-    (define undid? #f)
-    (super-new)
-
-    (define/public (insert-snip snip before x y)
-      (set! deletions (cons (make-delete-snip-item snip before x y)
-                            deletions)))
-
-    (define/override (cancel)
-      (unless undid?
-        (for-each (lambda (i)
-                    (let ([snip (delete-snip-item-snip i)])
-                      (disown snip)
-                      (send snip set-admin #f)))
-                  deletions)))
-
-    (define/override (undo editor)
-      (unless cont?
-        (send editor no-selected))
-
-      (for-each 
-       (lambda (del)
-         (let ([snip (delete-snip-item-snip del)])
-           ;; have to turn off the owned flag; we know that it's really ours
-           (disown snip)
-           
-           (send editor insert snip 
-                 (delete-snip-item-before del)
-                 (delete-snip-item-x del)
-                 (delete-snip-item-y del))
-
-           (unless cont?
-             (send editor add-selected snip))))
-       deletions)
-      
-      (set! undid? #t)
-
-      cont?)))
-
-(define delete-record% 
-  (class change-record% 
-    (init-field start
-                end
-                cont?
-                startsel
-                endsel)
-    (define deletions null)
-    (define clickbacks null)
-    (define undid? #f)
-    (super-new)
-
-    (define/public (insert-snip snip)
-      (set! deletions (cons snip deletions)))
-
-    (define/public (add-clickback click)
-      (set! clickbacks (cons click clickbacks)))
-
-    (define/override (cancel)
-      (unless undid?
-        (for-each (lambda (snip)
-                    (disown snip)
-                    (send snip set-admin #f))
-                  deletions)))
-
-    (define/override (undo editor)
-      ;; have to turn off the owned flag; we know that it's really ours
-      (for-each disown deletions)
-      (send editor do-insert-snips deletions start)
-      (for-each (lambda (cb)
-                  (send editor add-back-clickback cb))
-                clickbacks)
-
-      (send editor set-position startsel endsel)
-
-      (set! undid? #t)
-
-      cont?)))
-
-(define style-change-record%
-  (class change-record% 
-    (init-field start
-                end
-                cont?
-                startsel
-                endsel
-                restore-selection?)
-    (define changes null)
-    (super-new)
-
-    (define/public (add-style-change start end style)
-      (set! changes (cons (vector start end style)
-                          changes)))
-
-    (define/override (undo editor)
-      (for-each (lambda (c)
-                  (send editor change-style
-                        (vector-ref c 2)
-                        (vector-ref c 0)
-                        (vector-ref c 1)))
-                (reverse changes))
-      
-      (when restore-selection?
-        (send editor set-position startsel endsel))
-      
-      cont?)))
-
-(define style-change-snip-record%
-  (class change-record%
-    (init-field cont?)
-    (define changes null)
-    (super-new)
-
-    (define/public (add-style-change snip style)
-      (set! changes (cons (cons snip style) changes)))
-
-    (define/override (undo editor)
-      (unless cont?
-        (send editor no-selected))
-      
-      (for-each (lambda (s)
-                  (send editor change-style (cdr s) (cdr s))
-                  (unless cont?
-                    (send editor add-selected (car s))))
-                (reverse changes))
-
-      cont?)))
-
-(define move-snip-record%
-  (class change-record%
-    (init-field snip
-                x
-                y
-                delta?
-                cont?)
-    (super-new)
-
-    (define/override (undo editor)
-      (if delta?
-          (send editor move snip x y)
-          (send editor move-to snip x y))
-      cont?)))
-
-(define resize-snip-record%
-  (class change-record%
-    (init-field snip
-                x
-                y
-                cont?)
-    (super-new)
-
-    (define/override (undo editor)
-      (send editor resize snip x y)
-      cont?)))
-
-;; Used for Emac-style undo: eventually pairs an undo action with
-;; its inverse without requiring snips to be duplicated, etc.
-(define composite-record%
-  (class change-record%
-    (init       count)
-    (init-field id
-                parity?)
-    (unless id (set! id (mcons #f #f)))
-    ((if parity? set-mcar! set-mcdr!) id this)
-    (define seq (make-vector count))
-    (super-new)
-
-    (define/override (cancel)
-      (for ([c (in-vector seq)])
-        (send c cancel)))
-
-    (define/override (undo editor)
-      (for ([c (in-vector seq)])
-        (send c undo editor))
-      #f)
-
-    (define/override (drop-set-unmodified)
-      (for ([c (in-vector seq)])
-        (send c drop-set-unmodified)))
-
-    (define/public (add-undo pos c)
-      (vector-set! seq (- (vector-length seq) pos 1) c))
-
-    (define/override (is-composite?) #t)
-
-    (define/override (get-id) id)
-
-    (define/override (get-parity) parity?)
-
-    (define/override (inverse)
-      (make-object inverse-record% id (not parity?)))))
-
-;; An indirection to help with the inverse mapping in
-;; `composite-record%` an isolate it from an extra
-;; "finalization" via `cancel`:
-(define inverse-record%
-  (class change-record%
-    (init-field id
-                parity?)
-
-    (super-new)
-
-    (define/private (get)
-      (if parity?
-          (mcar id)
-          (mcdr id)))
-
-    (define/override (cancel)
-      ;; Avoid double-finalization by not doing anything
-      (void))
-
-    (define/override (undo editor)
-      (send (get) undo editor))
-
-    (define/override (drop-set-unmodified)
-      (let ([c (get)])
-        (when c
-          (send c drop-set-unmodified))))
-
-    (define/override (get-id) id)
-
-    (define/override (get-parity) parity?)
-
-    (define/override (inverse)
-      (send (get) inverse))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/wordbreak.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/wordbreak.rkt
deleted file mode 100644
index b56f02c41a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/wordbreak.rkt
+++ /dev/null
@@ -1,155 +0,0 @@
-#lang racket/base
-(require racket/class
-         "../syntax.rkt"
-         "cycle.rkt")
-
-(provide editor-wordbreak-map%
-         the-editor-wordbreak-map
-         standard-wordbreak)
-
-(defclass editor-wordbreak-map% object%
-  (define char-map (make-hash))
-
-  (super-new)
-
-  (hash-set! char-map #\- '(line))
-
-  (def/public (set-map [char? ch] [(make-list (symbol-in caret line selection user1 user2)) mask])
-    (hash-set! char-map ch mask))
-
-  (def/public (get-map [char? ch])
-    (or (hash-ref char-map ch #f)
-        (cond
-         [(or (char-alphabetic? ch)
-              (char-numeric? ch))
-          '(caret line selection)]
-         [(not (char-whitespace? ch))
-          '(line)]
-         [else null]))))
-
-(define the-editor-wordbreak-map (new editor-wordbreak-map%))
-
-(define MAX-DIST-TRY 30)
-
-(define wb-get-map (generic editor-wordbreak-map% get-map))
-
-(define (string-ref* str n)
-  (if (n . >= . (string-length str))
-      #\nul
-      (string-ref str n)))
-
-(define/top (standard-wordbreak [text% win] 
-                                [(make-or-false (make-box exact-nonnegative-integer?)) startp]
-                                [(make-or-false (make-box exact-nonnegative-integer?)) endp]
-                                [(symbol-in caret line selection user1 user2) reason])
-  (let ([wb (send win get-wordbreak-map)])
-    (when wb
-      (with-method ([get-map (wb get-map)])
-          (define (nonbreak? ch) (memq reason (get-map ch)))
-
-        (when startp
-          (let* ([start (unbox startp)]
-                 [pstart start]
-                 [lstart (send win find-newline 'backward start 0)]
-                 [lstart (if lstart
-                             (if (eq? 'caret reason)
-                                 (or (and (positive? lstart)
-                                          (send win find-newline 'backward (sub1 lstart) 0))
-                                     0)
-                                 lstart)
-                             0)]
-                 [lend (min (+ start 1) (send win last-position))]
-                 [tstart (if ((- start lstart) . > . MAX-DIST-TRY)
-                             (- start MAX-DIST-TRY)
-                             lstart)]
-                 [text (send win get-text tstart lend)]
-                 [start (- start tstart)]
-                 [pstart (- pstart tstart)])
-
-            (let ploop ([phase1-complete? #f]
-                        [phase2-complete? #f]
-                        [start start]
-                        [pstart pstart]
-                        [text text]
-                        [tstart tstart])
-              (let*-values ([(start phase1-complete?)
-                             (if phase1-complete?
-                                 (values start #t)
-                                 (let ([start (if (and (positive? start)
-                                                       (nonbreak? (string-ref* text start)))
-                                                  (sub1 start)
-                                                  start)])
-                                   (values start
-                                           (not (nonbreak? (string-ref* text start))))))]
-                            [(start phase2-complete?)
-                             (if (not (eq? 'selection reason))
-                                 (if (not phase2-complete?)
-                                     (let loop ([start start])
-                                       (if (and (positive? start)
-                                                (not (nonbreak? (string-ref* text start))))
-                                           (loop (sub1 start))
-                                           (if (nonbreak? (string-ref* text start))
-                                               (values start #t)
-                                               (values start #f))))
-                                     (values start #t))
-                                 (values start phase2-complete?))])
-                (let loop ([start start])
-                  (if (and (positive? start)
-                           (nonbreak? (string-ref* text start)))
-                      (loop (sub1 start))
-                      (let ([start (if (and (start . < . pstart)
-                                            (not (nonbreak? (string-ref* text start))))
-                                       (add1 start)
-                                       start)])
-                        (if (and (zero? start)
-                                 (not (= lstart tstart)))
-                            (ploop phase1-complete?
-                                   phase2-complete?
-                                   (+ start (- tstart lstart))
-                                   (+ pstart (- tstart lstart))
-                                   (send win get-text lstart lend)
-                                   lstart)
-                            (set-box! startp (+ start tstart))))))))))
-        
-        (when endp
-          (let* ([end (unbox endp)]
-                 [lstart end]
-                 [lend (send win find-newline 'forward end)]
-                 [lend (if lend
-                           (if (eq? 'caret reason)
-                               (or (send win find-newline 'forward (+ lend 1))
-                                   (send win last-position))
-                               lend)
-                           (send win last-position))]
-                 [tend (if ((- lend end) . > . MAX-DIST-TRY)
-                           (+ end MAX-DIST-TRY)
-                           lend)]
-                 [text (send win get-text lstart tend)]
-                 [end (- end lstart)]
-                 [lend (- lend lstart)]
-                 [tend (- tend lstart)])
-            
-            (let ploop ([phase1-complete? #f]
-                        [text text]
-                        [tend tend]
-                        [end end])
-              (let-values ([(end phase1-complete?)
-                            (if phase1-complete?
-                                (values end #t)
-                                (let loop ([end end])
-                                  (if (and (end . < . tend) 
-                                           (not (nonbreak? (string-ref* text end))))
-                                      (loop (add1 end))
-                                      (if (end . < . tend)
-                                          (values end #t)
-                                          (values end #f)))))])
-                (let loop ([end end])
-                  (if (and (end . < . tend)
-                           (nonbreak? (string-ref* text end)))
-                      (loop (add1 end))
-                      (if (and (= tend end) (not (= lend tend)))
-                          (ploop phase1-complete?
-                                 (send win get-text lstart (+ lstart lend))
-                                 lend
-                                 end)
-                          (set-box! endp (+ end lstart)))))))))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/wx.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/wx.rkt
deleted file mode 100644
index ebe2544585..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/wx.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-(require "../kernel.rkt" racket/draw/private/font-syms)
-
-(define the-clipboard (get-the-clipboard))
-(define the-x-selection-clipboard (get-the-x-selection))
-
-(define (size? v) (and (exact-positive-integer? v)
-                       (byte? v)))
-
-(provide (all-from-out racket/draw/private/font-syms)
-         event%
-         mouse-event%
-         key-event%
-         timer%
-         canvas%
-         bitmap-dc%
-         color%
-         the-color-database
-         pen%
-         the-pen-list
-         brush%
-         the-brush-list
-         font%
-         the-font-list
-         the-font-name-directory
-         cursor%
-         bitmap%
-         dc<%>
-         post-script-dc%
-         pdf-dc%
-         current-eventspace
-         clipboard-client%
-         clipboard<%>
-         the-clipboard
-         the-x-selection-clipboard
-         get-double-click-threshold
-         begin-busy-cursor
-         end-busy-cursor
-         hide-cursor
-         current-ps-setup
-         get-highlight-background-color
-         get-highlight-text-color)
-
-(define (get-double-click-threshold)
-  (get-double-click-time))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxmenu.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxmenu.rkt
deleted file mode 100644
index 5fa5cb91c4..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxmenu.rkt
+++ /dev/null
@@ -1,158 +0,0 @@
-(module wxmenu racket/base
-  (require racket/class
-           racket/list
-           (prefix-in wx: "kernel.rkt")
-           (prefix-in wx: "wxme/keymap.rkt")
-           "lock.rkt"
-           "const.rkt"
-           "helper.rkt"
-           "wx.rkt")
-
-  (provide (protect-out wx-menu-item%
-                        wx-menu-bar%
-                        wx-menu%))
-
-  (define wx-menu-item%
-    (class* wx:menu-item% (wx<%>)
-      (init mr mn-dat can-enable?)
-      (define menu-data mn-dat)
-      (define mred mr)
-      (define keymap #f)
-      (define wx-menu #f)
-      (define enabled? #t)
-      (define ever-enabled? can-enable?)
-      (public*
-       [get-keymap (lambda () keymap)]
-       [set-keymap (lambda (k) (set! keymap k))]
-       [swap-keymap (lambda (parent k) 
-                      (send (send (mred->wx parent) get-container) swap-item-keymap keymap k) 
-                      (set-keymap k))]
-       [get-mred (lambda () mred)]
-       [get-menu-data (lambda () menu-data)] ; for meta-shortcuts
-       [get-container (lambda () wx-menu)]
-       [set-wx-menu (lambda (wx) (set! wx-menu wx))]
-       [is-enabled? (lambda () enabled?)]
-       [set-enabled (lambda (on?) (set! enabled? on?))]
-       [ignore-enabled? (lambda () (not ever-enabled?))])
-      (super-make-object)))
-
-  (define wx-menu-bar%
-    (class* wx:menu-bar% (wx<%>)
-      (init mr)
-      (inherit delete)
-      (rename-super [super-append append]
-	            [super-enable-top enable-top])
-      (define mred mr)
-      (define items null)
-      (define disabled null)
-      (define disabled? #f)
-      (define keymap (make-object wx:keymap%))
-      (public*
-       [get-container (lambda () this)]
-       [handle-key (lambda (event) 
-                     (as-exit 
-                      (lambda () 
-                        (or (send keymap handle-key-event this event)
-                            (and (menu-shortcut-in-label?)
-                                 (send event get-meta-down)
-                                 (char? (send event get-key-code))
-                                 (let ([c (send event get-key-code)])
-                                   (and (or (char-alphabetic? c)
-                                            (char-numeric? c))
-                                        (let ([re (key-regexp c)])
-                                          (ormap
-                                           (lambda (i)
-                                             (let* ([data (send (mred->wx i) get-menu-data)]
-                                                    [label (mcar data)]
-                                                    [menu (mcdr data)])
-                                               (if (regexp-match re label)
-                                                   (send menu select this)
-                                                   #f)))
-                                           items)))))))))]
-       [on-demand (lambda () (as-exit (lambda () (send mred on-demand))))]
-       [get-mred (lambda () mred)]
-       [get-items (lambda () items)]
-       [append-item (lambda (item menu title)
-                      (super-append menu title)
-                      (when disabled?
-                        (super-enable-top (length items) #f))
-                      (set! items (append items (list item)))
-                      (send keymap chain-to-keymap (send (mred->wx item) get-keymap) #f))]
-       [all-enabled? (lambda () (not disabled?))]
-       [enable-all (lambda (on?)
-                     (set! disabled? (not on?))
-                     (let loop ([n (sub1 (length items))])
-                       (unless (negative? n)
-                         (if on?
-                             (unless (memq (list-ref items n) disabled)
-                               (super-enable-top n #t))
-                             (super-enable-top n #f))
-                         (loop (sub1 n)))))]
-       [delete-item (lambda (i)
-                      (let ([p (position-of i)])
-                        (set! items (remq i items))
-                        (set! disabled (remq i disabled))
-                        (delete #f p)
-                        (send keymap remove-chained-keymap (send (mred->wx i) get-keymap))))]
-       [position-of (lambda (i) (find-pos items i eq?))])
-      (override*
-       [enable-top (lambda (p on?)
-                     (let ([i (list-ref items p)])
-                       (if on?
-                           (when (memq i disabled)
-                             (set! disabled (remq i disabled))
-                             (unless disabled?
-                               (super-enable-top p #t)))
-                           (unless (memq i disabled)
-                             (set! disabled (cons i disabled))
-                             (super-enable-top p #f)))))])
-      (super-make-object)))
-
-  (define wx-menu%
-    (class* wx:menu% (wx<%>)
-      (init mr popup-label popup-callback font)
-      (define mred mr)
-      (define items null)
-      (define keymap (make-object wx:keymap%))
-      (define popup-grabber #f)
-      (inherit delete-by-position)
-      (rename-super [super-delete delete]
-	            [super-enable enable])
-      (public*
-       [get-container (lambda () this)]
-       [get-keymap (lambda () keymap)]
-       [get-mred (lambda () mred)]
-       [get-items (lambda () items)]
-       [append-item (lambda (i iwx) 
-                      (set! items (append items (list i)))
-                      (let ([k (send iwx get-keymap)])
-                        (when k
-                          (send keymap chain-to-keymap k #f))))]
-       [delete-sep (lambda (i iwx)
-                     (delete-by-position (find-pos items i eq?))
-                     (set! items (remq i items)))]
-       [swap-item-keymap (lambda (old-k new-k)
-                           (when old-k (send keymap remove-chained-keymap old-k))
-                           (when new-k (send keymap chain-to-keymap new-k #f)))]
-
-       [popup-grab (lambda (c)
-                     (if popup-grabber
-                         #f
-                         (begin
-                           (set! popup-grabber c)
-                           #t)))]
-       [popup-release (lambda () (set! popup-grabber #f))]
-       [get-popup-grabber (lambda () popup-grabber)])
-      (override*
-       [delete (lambda (id i) 
-                 (super-delete id) 
-                 (set! items (remq i items))
-                 (let ([k (send (mred->wx i) get-keymap)])
-                   (when k
-                     (send keymap remove-chained-keymap k))))]
-       [enable (lambda (iwx id on?)
-                 ;; Only called if the item is not deleted
-                 (unless (eq? (send iwx is-enabled?) (and on? #t))
-                   (send iwx set-enabled (and on? #t))
-                   (super-enable id on?)))])
-      (super-make-object popup-label popup-callback font))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxpanel.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxpanel.rkt
deleted file mode 100644
index 88321d85c4..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxpanel.rkt
+++ /dev/null
@@ -1,888 +0,0 @@
-(module wxpanel racket/base
-  (require racket/class
-           racket/list
-           (prefix-in wx: "kernel.rkt")
-           "lock.rkt"
-           "const.rkt"
-           "helper.rkt"
-           "check.rkt"
-           "wx.rkt"
-           "wxwindow.rkt"
-           "wxitem.rkt"
-           "wxcontainer.rkt")
-
-  (provide (protect-out wx-panel%
-                        wx-vertical-panel%
-                        wx-vertical-tab-panel%
-                        wx-vertical-group-panel%
-                        wx-horizontal-panel%
-                        wx-control-horizontal-panel%
-                        wx-pane%
-                        wx-vertical-pane%
-                        wx-horizontal-pane%
-                        wx-grow-box-pane%
-                        wx-canvas-panel%
-                        wx-vertical-canvas-panel%
-                        wx-horizontal-canvas-panel%))
-
-  (define wx:windowless-panel%
-    (class object%
-      (init prnt x y w h style label)
-      (define-values (pos-x pos-y width height parent)
-        (values 0 0 1 1 prnt))
-      (public*
-       [drag-accept-files (lambda () (void))]
-       [on-drop-file (lambda () (void))]
-       [on-set-focus (lambda () (void))]
-       [on-kill-focus (lambda () (void))]
-       [set-focus (lambda () (void))]
-       [gets-focus? (lambda () #f)]
-       [enable (lambda () (void))]
-       [show (lambda (on?) (void))]
-       [is-shown? (lambda () #f)]
-       [is-shown-to-root? (lambda () (send parent is-shown-to-root?))]
-       [is-enabled-to-root? (lambda () (send parent is-enabled-to-root?))]
-       [get-parent (lambda () parent)]
-       [get-client-size (lambda (wb hb)
-                          (when wb (set-box! wb width))
-                          (when hb (set-box! hb height)))]
-       [skip-enter-leave-events (lambda (skip?) (void))]
-       [set-size (lambda (x y w h) 
-                   (unless (negative? x) (set! pos-x x))
-                   (unless (negative? y) (set! pos-y y))
-                   (unless (negative? w) (set! width w))
-                   (unless (negative? h) (set! height h)))]
-       [get-x (lambda () pos-x)]
-       [get-y (lambda () pos-y)]
-       [set-event-positions-wrt (lambda (c) (void))]
-       [get-width (lambda () width)]
-       [get-height (lambda () height)]
-       [adopt-child (lambda (c) (send (get-parent) adopt-child c))])
-      (super-make-object)))
-
-  (define tab-h-border (if (eq? (system-type) 'unix)
-			   2
-			   3))
-  (define tab-v-bottom-border (if (memq (system-type) '(macosx macos))
-				  0
-				  2))
-
-  (define (wx-make-basic-panel% wx:panel% stretch? [x-m 0] [y-m 0])
-    (class* (wx-make-container% (make-item% wx:panel% x-m y-m stretch? stretch?)) (wx-basic-panel<%>)
-      (init parent style label)
-      (inherit get-x get-y get-width get-height
-               min-width min-height set-min-width set-min-height
-               x-margin y-margin
-               get-client-size area-parent
-               get-hard-minimum-size
-               get-top-level)
-	       
-      (rename-super [super-set-focus set-focus])
-	       
-      ;; cache to prevent on-size from recomputing its result every
-      ;; time. when curr-width is #f, cache invalid.
-      (define curr-width (void))
-      (define curr-height (void))
-		
-      ;; list of child-info structs corresponding to the children.  (#f
-      ;;  if no longer valid.)
-      (define children-info null)
-		
-      ;; Not used by linear panels
-      (define h-align 'center)
-      (define v-align 'center)
-
-      ;; Needed for windowless panes
-      (define move-children? #f)
-
-      (define ignore-redraw-request? #f)
-
-
-      (define auto-scroll-x? (and (memq 'auto-hscroll style) #t))
-      (define auto-scroll-y? (and (memq 'auto-vscroll style) #t))
-
-      (define can-scroll-x? (or auto-scroll-x?
-                                (and (memq 'hscroll style) #t)))
-      (define can-scroll-y? (or auto-scroll-y?
-                                (and (memq 'vscroll style) #t)))
-                
-      (define scroll-x? can-scroll-x?)
-      (define scroll-y? can-scroll-y?)
-	       
-      (override*
-       [has-tabbing-children? (lambda () #t)]
-
-       [set-focus                    ; dispatch focus to a child panel
-        (lambda ()
-          (if (focus-on-self?)
-              (super-set-focus)
-              (if (null? children)
-                  (super-set-focus)
-                  (send (car children) set-focus))))]
-
-       [ext-dx (lambda () (if hidden-child
-                              tab-h-border
-                              0))]
-       [ext-dy (lambda () (if hidden-child
-                              (let-values ([(mw mh) (get-hard-minimum-size)])
-                                (- mh tab-v-bottom-border 1))
-                              0))])
-	       
-      ;; list of panel's contents.
-      (define children null)
-      (define hidden-child #f)
-      (define curr-border const-default-border)
-      (define border? (memq 'border style))
-	       
-      (public*
-       [need-move-children (lambda () (set! move-children? #t))]
-       [focus-on-self? (lambda () #f)]
-
-       [get-children (lambda () children)]
-       [get-hidden-child (lambda () hidden-child)]
-       [set-first-child-is-hidden (lambda ()
-                                    (set! hidden-child (car children))
-                                    (let ([i (send hidden-child get-info)])
-                                      (set-min-width (child-info-x-min i))
-                                      (set-min-height (child-info-y-min i))))])
-      
-      (override*
-       [ensure-forgotten (lambda ()
-                           (for ([c (in-list children)])
-                             (send c ensure-forgotten))
-                           (super ensure-forgotten))])
-
-      (public*         
-       [border
-        (case-lambda
-          [() curr-border]
-          [(new-val)
-           (check-margin-integer '(method area-container<%> border) new-val)
-           (set! curr-border new-val)
-           (force-redraw)])]
-
-       ;; add-child: adds an existing child to the panel.
-       ;; input: new-child: item% descendant to add
-       ;; returns: nothing
-       ;; effects: adds new-child to end of list of children.
-       [add-child
-        (lambda (new-child)
-          (unless (eq? this (send new-child area-parent))
-            (raise-arguments-error 'add-child 
-                                   "subwindow is not a child of this container"
-                                   "subwindow" (wx->proxy new-child)))
-          (when (memq new-child children)
-            (raise-arguments-error 'add-child "subwindow area is already active"
-                                   "subwindow" (wx->proxy new-child)))
-          (change-children
-           (lambda (l)
-             (append l (list new-child)))))]
-		 
-       ;; change-children: changes the list of children.
-       ;; input: f is a function which takes the current list of children
-       ;;   and returns a new list of children.
-       ;; returns: nothing
-       ;; effects: sets the list of children to the value of applying f.
-       [change-children
-        (lambda (f)
-          (let ([new-children (f children)]) ;; hidden child, if any , must be first!
-            (unless (andmap (lambda (child)
-                              (eq? this (send child area-parent)))
-                            new-children)
-              (raise-arguments-error 'change-children
-                                     (string-append 
-                                      "not all members of the returned list are "
-                                      "children of the container")
-                                     "container" (wx->proxy this)
-                                     "list" (map wx->proxy (remq hidden-child new-children))))
-            (let loop ([l new-children])
-              (unless (null? l)
-                (if (memq (car l) (cdr l))
-                    (raise-arguments-error 'change-children 
-                                           "child appears  multiple times in the returned list" 
-                                           "child" (wx->proxy (car l))
-                                           "list" (map wx->proxy (remq hidden-child new-children)))
-                    (loop (cdr l)))))
-            ;; show all new children, hide all deleted children.
-            (let ([added-children (list-diff new-children children)]
-                  [removed-children (list-diff children new-children)])
-              (let ([non-window (ormap (lambda (child)
-                                         (and (not (is-a? child wx:window%))
-                                              child))
-                                       removed-children)])
-                (when non-window
-                  (raise-arguments-error 'change-children
-                                         "cannot delete non-window area"
-                                         "area" non-window
-                                         "container" (wx->proxy this))))
-              
-              ;; Newly-added children may have been removed when
-              ;;  disabled, or now added into a disabled panel:
-              (for-each (lambda (child) (send child queue-active))
-                        added-children)
-
-              (let ([top (get-top-level)])
-                (for-each (lambda (child) (send top show-child child #f))
-                          removed-children)
-                (set! children new-children)
-                (force-redraw)
-                (for-each (lambda (child) (send top show-child child #t))
-                          added-children)))))]
-		 
-       ;; delete-child: removes a child from the panel.
-       ;; input: child: child to delete.
-       ;; returns: nothing
-       ;; effects: removes child from list; forces redraw.
-       [delete-child
-        (lambda (child)
-          (unless (memq child children)
-            (raise-arguments-error 'delete-child 
-                                   "subwindow is not a child of this container or child is not active" 
-                                   "subwindow" (wx->proxy child)))
-          (change-children (lambda (child-list)
-                             (remq child child-list))))]
-		 
-       ;; get-children-info: returns children info list, recomputing it
-       ;;   if needed.
-       ;; input: none
-       ;; returns: list of child-info structs.
-       ;; effects: upon exit, children-info is eq? to result.
-       [get-children-info
-        (lambda ()
-          (unless children-info
-            (let* ([childs children]
-                   [info (map (lambda (child)
-                                (send child get-info))
-                              childs)])
-              (if (and (= (length childs) (length children))
-                       (andmap eq? childs children))
-                  ;; Got the info for the right set of children
-                  (set! children-info info)
-			    
-                  ;; During the call to some get-info, the set of children changed;
-                  ;; try again
-                  (get-children-info))))
-          children-info)]
-		 
-       [child-redraw-request
-        (lambda (from)
-          (unless (or ignore-redraw-request?
-                      (not (memq from children)))
-            (force-redraw)))]
-		 
-       ;; do-graphical-size: creates a function which returns the minimum
-       ;;   possible size for a horizontal-panel% or vertical-panel% object.
-       ;; input: compute-x/compute-y: functions which take the current x/y
-       ;;          location, the amount of spacing which will come after the
-       ;;          current object, and the list of child-info structs beginning
-       ;;          with the current object, and return the new x/y locations.
-       ;; returns: a thunk which returns the minimum possible size of the
-       ;;   entire panel (not just client) as a list of two elements:
-       ;;   (min-x min-y). 
-       [do-graphical-size
-        (lambda (ignore-scroll? compute-x compute-y)
-          (letrec ([gms-help
-                    (lambda (kid-info x-accum y-accum first?)
-                      (if (null? kid-info)
-                          (list x-accum y-accum)
-                          (gms-help
-                           (cdr kid-info)
-                           (if (and can-scroll-x? (not ignore-scroll?))
-                               x-accum
-                               (compute-x x-accum kid-info (and hidden-child first?)))
-                           (if (and can-scroll-y? (not ignore-scroll?))
-                               y-accum
-                               (compute-y y-accum kid-info (and hidden-child first?)))
-                           #f)))])
-            (let-values ([(client-w client-h)
-                          (get-two-int-values (lambda (a b) (get-client-size a b)))])
-              (let* ([border (border)]
-                     [min-client-size
-                      (gms-help (get-children-info)
-                                (* 2 border) (* 2 border)
-                                #t)]
-                     [delta-w (if ignore-scroll? 0 (- (get-width) client-w))]
-                     [delta-h (if ignore-scroll? 0 (- (get-height) client-h))])
-                (list (+ delta-w (car min-client-size) (if hidden-child (* 2 tab-h-border) 0))
-                      (+ delta-h (cadr min-client-size)))))))]
-		 
-       ;; do-get-min-graphical-size: poll children and return minimum possible
-       ;;   size, as required by the graphical representation of the tree,
-       ;;   of the panel.
-       ;; input: none
-       ;; returns: minimum full size (as a list, width & height) of the
-       ;;   container.
-       ;; effects: none
-       [get-graphical-min-size (lambda () (void))]
-       [do-get-graphical-min-size
-        (lambda ([ignore-scroll? #f])
-          (do-graphical-size 
-           ignore-scroll?
-           (lambda (x-accum kid-info first?)
-             (max x-accum (+ (* 2 (border))
-                             (child-info-x-min (car kid-info)))))
-           (lambda (y-accum kid-info first?)
-             (max y-accum (+ (* 2 (border))
-                             (child-info-y-min (car kid-info)))))))])
-	       
-      (override*
-       [force-redraw
-        (lambda ()
-          (set! children-info #f)
-          (set! curr-width #f)
-          (let ([parent (area-parent)])
-            (send parent child-redraw-request this)))]
-
-       ;; get-min-size: poll children and return minimum possible size
-       ;;   for the container which considers the user min sizes.
-       ;; input: none
-       ;; returns: minimum full size (as a list, width & height) of
-       ;;   container.
-       ;; effects: none.
-       [get-min-size
-        (lambda ()
-          (let ([graphical-min-size (get-graphical-min-size)])
-            (list (+ (* 2 (x-margin))
-                     (max (car graphical-min-size) (min-width)))
-                  (+ (* 2 (y-margin))
-                     (max (cadr graphical-min-size) (min-height))))))]
-		 
-       [on-container-resize
-        (lambda ()
-          (let-values ([(client-width client-height)
-                        (get-two-int-values (lambda (a b) (get-client-size a b)))])
-            (unless (and (number? curr-width)
-                         (number? curr-height)
-                         (= curr-width client-width)
-                         (= curr-height client-height)
-                         (not move-children?))
-              (set! curr-width client-width)
-              (set! curr-height client-height)
-              (set! move-children? #f)
-              (redraw client-width client-height))))]
-
-       [init-min (lambda (x) (if border? 8 0))])
-	       
-      (public*
-       ;; place-children: determines where each child of panel should be
-       ;; placed.
-       ;; input: children-info: list of (int int bool bool)
-       ;;        width/height: size of panel's client area.
-       ;; returns: list of placement info for children; each item in list
-       ;;   is a list of 4 elements, consisting of child's x-posn,
-       ;;   y-posn, x-size, y-size (including margins).  Items are in same 
-       ;;   order as children-info list.
-       [place-children (lambda (l w h) (void))]
-       [check-place-children
-        (lambda (children-info width height)
-          (unless (and (list? children-info)
-                       (andmap (lambda (x) (and (list? x)
-                                                (= 4 (length x))
-                                                (integer? (car x)) (not (negative? (car x))) (exact? (car x))
-                                                (integer? (cadr x)) (not (negative? (cadr x))) (exact? (cadr x))))
-                               children-info))
-            (raise-argument-error (who->name '(method area-container-window<%> place-children))
-                                  "(listof (list/c exact-nonnegative-integer? exact-nonnegative-integer? any/c any/c))"
-                                  children-info))
-          (check-non-negative-integer '(method area-container-window<%> place-children) width)
-          (check-non-negative-integer '(method area-container-window<%> place-children) height))]
-       [do-place-children
-        (lambda (children-info width height)
-          (check-place-children children-info width height)
-          (define m (border))
-          (define w (- width (* 2 m)))
-          (define h (- height (* 2 m)))
-          (let loop ([children-info children-info])
-            (if (null? children-info)
-                null
-                (let ([curr-info (car children-info)])
-                  (define cw (car curr-info))
-                  (define ch (cadr curr-info))
-                  (define w-stretch? (caddr curr-info))
-                  (define h-stretch? (cadddr curr-info))
-                  (cons
-                   (list
-                    (if w-stretch?
-                        m
-                        (case h-align
-                          [(center) (quotient (- w cw) 2)]
-                          [(right) (- w cw)]
-                          [else 0]))
-                    (if h-stretch?
-                        m
-                        (case v-align
-                          [(center) (quotient (- h ch) 2)]
-                          [(bottom) (- h ch)]
-                          [else 0]))
-                    (if w-stretch?
-                        w
-                        cw)
-                    (if h-stretch?
-                        h
-                        ch))
-                   (loop (cdr children-info)))))))])
-
-      (define curr-spacing const-default-spacing)
-	       
-      (public*
-       [spacing                         ; does nothing!
-        (case-lambda
-          [() curr-spacing]
-          [(new-val)
-           (check-margin-integer '(method area-container<%> spacing) new-val)
-           (set! curr-spacing new-val)])]
-
-       [do-align (lambda (h v set-h set-v)
-                   (unless (memq h '(left center right))
-                     (raise-argument-error 'set-alignment "(or/c 'left 'center 'right)" h))
-                   (unless (memq v '(top center bottom))
-                     (raise-argument-error 'set-alignment "(or/c 'top 'center 'bottom)" v))
-                   (set-h h)
-                   (set-v (case v [(top) 'left] [(center) 'center] [(bottom) 'right])))]
-       [alignment (lambda (h v) 
-                    (do-align h v (lambda (h) (set! h-align h)) (lambda (h) (set! v-align v)))
-                    (force-redraw))]
-       [get-alignment (lambda () (values h-align v-align))]
-
-       [adjust-panel-size (lambda (w h) 
-                            (if (or can-scroll-x? can-scroll-y?)
-                                (let ([ms (do-get-graphical-min-size #t)])
-                                  ;; loop for fix-point on x and y scroll
-                                  (let loop ([w w] [h h] [iters 0])
-                                    (let ([want-scroll-x?
-                                           (if auto-scroll-x?
-                                               ((car ms) . > . w)
-                                               scroll-x?)]
-                                          [want-scroll-y?
-                                           (if auto-scroll-y?
-                                               ((cadr ms) . > . h)
-                                               scroll-y?)])
-                                      (if (and (eq? scroll-x? want-scroll-x?)
-                                               (eq? scroll-y? want-scroll-y?))
-                                          (values (if can-scroll-x?
-                                                      (max w (car ms))
-                                                      w)
-                                                  (if can-scroll-y?
-                                                      (max h (cadr ms))
-                                                      h))
-                                          (begin
-                                            (set! scroll-x? want-scroll-x?)
-                                            (set! scroll-y? want-scroll-y?)
-                                            (send this show-scrollbars scroll-x? scroll-y?)
-                                            (let-values ([(w h)
-                                                          (get-two-int-values (lambda (a b) (get-client-size a b)))])
-                                              (if (= iters 2)
-                                                  (values w h)
-                                                  (loop w h (add1 iters)))))))))
-                                (values w h)))]
-
-       ;; redraw: redraws panel and all children
-       ;; input: width, height: size of area area in panel.
-       ;; returns: nothing
-       ;; effects: places children at default positions in panel.
-       [redraw
-        (lambda (in-width in-height)
-          (let-values ([(children-info) (get-children-info)]
-                       [(children) children] ; keep list of children matching children-info
-                       [(width height) (adjust-panel-size in-width in-height)])
-            (let ([l (place-children (map (lambda (i)
-                                            (list (child-info-x-min i) (child-info-y-min i)
-                                                  (child-info-x-stretch i) (child-info-y-stretch i)))
-                                          (if hidden-child
-                                              (cdr children-info)
-                                              children-info))
-                                     (if hidden-child
-                                         (- width (* 2 tab-h-border))
-                                         width)
-                                     (if hidden-child
-                                         (- height (child-info-y-min (car children-info))) ;; 2-pixel border here, too
-                                         height))])
-              (define expected-length (- (length children-info) (if hidden-child 1 0)))
-              (unless (and (list? l)
-                           (= (length l) expected-length)
-                           (andmap (lambda (x) (and (list? x)
-                                                    (= 4 (length x))
-                                                    (andmap exact-integer? x)))
-                                   l))
-                (raise-arguments-error
-                 'container-redraw 
-                 (format
-                  (string-append 
-                   "result from place-children is not a list of length ~a (matching the"
-                   " input list length) whose elements are lists of length 4 of exact integers")
-                  expected-length)
-                 "result" l))
-              (panel-redraw children children-info (if hidden-child
-                                                       (cons (list 0 0 width height)
-                                                             (let ([dy (child-info-y-min (car children-info))])
-                                                               (map (lambda (i)
-                                                                      (list (+ (car i) tab-h-border)
-                                                                            (+ dy (cadr i) (- tab-v-bottom-border) -1)
-                                                                            (caddr i)
-                                                                            (cadddr i)))
-                                                                    l)))
-                                                       l)))))]
-       [panel-redraw
-        (lambda (childs child-infos placements)
-          (when (or scroll-y? scroll-x?)
-            (let ([w (if scroll-x?
-                         (+ (for/fold ([x 0]) ([p (in-list placements)]
-                                               [i (in-list child-infos)])
-                              (max x (+ (max 0 (car p))
-                                        (max (+ (child-info-x-min i)
-                                                (* 2 (child-info-x-margin i)))
-                                             (caddr p)))))
-                            (* 2 (border)))
-                         0)]
-                  [h (if scroll-y?
-                         (+ (for/fold ([y 0]) ([p (in-list placements)]
-                                               [i (in-list child-infos)])
-                              (max y (+ (max 0 (cadr p))
-                                        (max (+ (child-info-y-min i)
-                                                (* 2 (child-info-y-margin i)))
-                                             (cadddr p)))))
-                            (* 2 (border)))
-                         0)]
-                  [wb (box 0)]
-                  [hb (box 0)])
-              (get-client-size wb hb)
-              (let ([do-x-scroll? (w . > . (unbox wb))]
-                    [do-y-scroll? (h . > . (unbox hb))])
-                (send this set-scrollbars
-                      (if do-x-scroll? 1 0) (if do-y-scroll? 1 0)
-                      w h
-                      (unbox wb) (unbox hb)
-                      -1 -1
-                      #t))))
-          (for-each
-           (lambda (child info placement)
-             (let-values ([(x y w h) (apply values placement)])
-               (let ([minw (child-info-x-min info)]
-                     [minh (child-info-y-min info)]
-                     [xm (child-info-x-margin info)]
-                     [ym (child-info-y-margin info)])
-                 (dynamic-wind
-                   (lambda () (set! ignore-redraw-request? #t))
-                   (lambda ()
-                     (send child set-size
-                           (max 0 (+ x xm)) (max 0 (+ y ym))
-                           (- (max minw w) (* 2 xm))
-                           (- (max minh h) (* 2 ym))))
-                   (lambda () (set! ignore-redraw-request? #f)))
-                 (send child on-container-resize))))
-           childs
-           child-infos
-           placements))])
-      (super-make-object style parent -1 -1
-                         (if can-scroll-y? 20 (if can-scroll-x? 1 0))
-                         (if can-scroll-x? 20 (if can-scroll-y? 1 0))
-                         (cons 'deleted style) label)
-      (unless (memq 'deleted style)
-        (send (get-top-level) show-control this #t))))
-
-  (define (wx-make-pane% wx:panel% stretch?)
-    (class (make-container-glue% (make-glue% (wx-make-basic-panel% wx:panel% stretch?)))
-      (init-rest args)
-      (inherit get-parent get-x get-y need-move-children get-children)
-      (rename-super [super-set-size set-size])
-      (override*
-       [on-visible
-        (lambda ()
-          (for-each (lambda (c) (send c queue-visible)) (get-children)))]
-       [on-active
-        (lambda ()
-          (for-each (lambda (c) (send c queue-active)) (get-children)))]
-
-       [get-window (lambda () (send (get-parent) get-window))]
-       [set-size (lambda (x y w h) 
-                   (super-set-size x y w h)
-                   (need-move-children))]
-       [dx (lambda () (get-x))]
-       [dy (lambda () (get-y))])
-      (apply super-make-object args)))
-
-  (define (wx-make-panel% wx:panel% [x-m 0] [y-m 0])
-    (class (make-container-glue% (make-window-glue% (wx-make-basic-panel% wx:panel% #t x-m y-m)))
-      (init-rest args)
-      (rename-super [super-on-visible on-visible]
-	            [super-on-active on-active])
-      (inherit get-children)
-      (override*
-       [on-visible
-        (lambda ()
-          (for-each (lambda (c) (send c queue-visible)) (get-children))
-          (super-on-visible))]
-       [on-active
-        (lambda ()
-          (for-each (lambda (c) (send c queue-active)) (get-children))
-          (super-on-active))])
-      (apply super-make-object args)))
-
-  (define (wx-make-linear-panel% wx-panel%)
-    (class wx-panel%
-      (init-rest args)
-      (define major-align-pos 'left)
-      (define minor-align-pos 'center)
-      
-      (inherit force-redraw border get-width get-height
-               do-get-graphical-min-size)
-      (define curr-spacing const-default-spacing)
-      (override*
-       [spacing
-        (case-lambda
-	  [() curr-spacing]
-	  [(new-val)
-	   (check-margin-integer '(method area-container<%> spacing) new-val)
-	   (set! curr-spacing new-val)
-	   (force-redraw)])])
-      (public*
-       [minor-align (lambda (a) (set! minor-align-pos a) (force-redraw))]
-       [major-align (lambda (a) (set! major-align-pos a) (force-redraw))]
-       [major-offset (lambda (space)
-                       (case major-align-pos
-                         [(center) (quotient space 2)]
-                         [(left) 0]
-                         [(right) space]))]
-       [minor-offset (lambda (width size)
-                       (case minor-align-pos
-                         [(center) (quotient (- width size) 2)]
-                         [(left) 0]
-                         [(right) (- width size)]))]
-	
-       [do-get-alignment (lambda (pick) (values (pick major-align-pos minor-align-pos)
-                                                (case (pick minor-align-pos major-align-pos)
-                                                  [(left) 'top] [(center) 'center] [(right) 'bottom])))]
-
-       ;; place-linear-children: implements place-children functions for
-       ;; horizontal-panel% or vertical-panel% classes.
-       ;; input: child-major-size: function which takes a child-info struct
-       ;;          and returns the child's minimum size in the major direction
-       ;;          of the panel.
-       ;;        child-major-stretch: function which takes a child-info
-       ;;          struct and returns the child's stretchability in the major
-       ;;          direction of the panel.
-       ;;        child-minor-size/child-minor-stretch: see above.
-       ;;        major-dim/minor-dim: functions which take the width and the
-       ;;          height of the panel and return the panel's major and minor
-       ;;          dimensions, respectively.
-       ;;        get-h-info/get-v-info: functions which take info lists
-       ;;          describing the major and minor directions and select the
-       ;;          appropriate one.
-       ;; returns: a function which takes the children info, the width and the
-       ;;   height of the panel's client and returns a list which contains
-       ;;   posn&size info for each child. 
-       [place-linear-children
-        (lambda (kid-info width height
-                          child-major-size
-                          child-major-stretch
-                          child-major-offset
-                          child-minor-size
-                          child-minor-stretch
-                          child-minor-position
-                          major-dim minor-dim
-                          get-x-info get-y-info)
-          (letrec ([count-stretchable
-                    (lambda (kid-info)
-                      (if (null? kid-info)
-                          0
-                          (let ([curr-info (car kid-info)])
-                            (if (child-major-stretch curr-info)
-                                (add1 (count-stretchable (cdr kid-info)))
-                                (count-stretchable (cdr kid-info))))))])
-            (let* ([spacing (spacing)]
-                   [border (border)]
-                   [num-stretchable (count-stretchable kid-info)]
-                   [extra-space (max 0
-                                     (- (major-dim width height)
-                                        (apply 
-                                         major-dim
-                                         (do-get-graphical-min-size #t))))]
-                   [extra-per-stretchable (if (zero? num-stretchable)
-                                              0
-                                              (inexact->exact
-                                               (floor
-                                                (/ extra-space
-                                                   num-stretchable))))]
-                   [leftover (- extra-space (* extra-per-stretchable num-stretchable))]
-                   [num-children (length kid-info)]
-                   [major-offset (if (= num-stretchable 0)
-                                     (child-major-offset extra-space)
-                                     0)])
-              (letrec
-                  ([pc-help
-                    (lambda (kid-info left-edge leftover)
-                      (if (null? kid-info)
-                          null
-                          (let* ([curr-info (car kid-info)]
-                                 [rest (cdr kid-info)]
-                                 [major-posn left-edge]
-                                 [next-leftover (if (zero? leftover)
-                                                    0
-                                                    (- leftover 1))]
-                                 [extra-this-stretchable (if (zero? leftover)
-                                                             extra-per-stretchable
-                                                             (+ extra-per-stretchable 1))]
-                                 [major-size
-                                  (if (child-major-stretch curr-info)
-                                      (+ extra-this-stretchable
-                                         (child-major-size curr-info))
-                                      (child-major-size curr-info))]
-                                 [minor-posn (if (child-minor-stretch
-                                                  curr-info)
-                                                 border
-                                                 (inexact->exact
-                                                  (round
-                                                   (child-minor-position 
-                                                    (minor-dim width height) 
-                                                    (child-minor-size curr-info)))))]
-                                 [minor-size (if (child-minor-stretch
-                                                  curr-info)
-                                                 (- (minor-dim width height)
-                                                    (* 2 border))
-                                                 (child-minor-size
-                                                  curr-info))])
-                            (cons
-                             (list
-                              (get-x-info major-posn minor-posn)
-                              (get-y-info major-posn minor-posn)
-                              (get-x-info major-size minor-size)
-                              (get-y-info major-size minor-size))
-                             (pc-help rest
-                                      (+ major-size major-posn spacing)
-                                      next-leftover)))))])
-                (pc-help kid-info (+ border major-offset) leftover)))))])
-      
-      (apply super-make-object args)))
-
-  
-  (define (wx-make-horizontal/vertical-panel% wx-linear-panel% init-horizontal?)
-    (class wx-linear-panel%
-      (init-rest args)
-      (inherit major-align minor-align do-align do-get-alignment major-offset minor-offset
-	       spacing border do-graphical-size place-linear-children check-place-children
-               force-redraw)
-      (define horizontal? init-horizontal?)
-      (public* [get-orientation (λ () horizontal?)]
-               [set-orientation (λ (h?) 
-                                   (unless (equal? h? horizontal?)
-                                     (set! horizontal? h?)
-                                     (force-redraw)))])
-      (override*
-       [alignment (lambda (h v) 
-                    (if horizontal?
-                        (do-align h v 
-                                  (lambda (x) (major-align x)) 
-                                  (lambda (x) (minor-align x)))
-                        (do-align h v 
-                                  (lambda (x) (minor-align x)) 
-                                  (lambda (x) (major-align x)))))]
-       [get-alignment (λ () (do-get-alignment (if horizontal? (λ (x y) x) (λ (x y) y))))]
-        
-       [do-get-graphical-min-size
-        (lambda ([ignore-scroll? #f])
-          (if horizontal?
-              (do-graphical-size 
-               ignore-scroll?
-               (lambda (x-accum kid-info hidden?)
-                 (+ x-accum (child-info-x-min (car kid-info))
-                    (if (or hidden? (null? (cdr kid-info)))
-                        0
-                        (spacing))))
-               (lambda (y-accum kid-info hidden?)
-                 (max y-accum
-                      (+ (child-info-y-min (car kid-info))
-                         (* 2 (border))))))
-              (do-graphical-size
-               ignore-scroll?
-               (lambda (x-accum kid-info hidden?)
-                 (max x-accum
-                      (+ (child-info-x-min (car kid-info))
-                         (* 2 (border)))))
-               (lambda (y-accum kid-info hidden?)
-                 (+ y-accum (child-info-y-min (car kid-info))
-                    (if (or (null? (cdr kid-info)) hidden?)
-                        0
-                        (spacing)))))))]
- 
-       [do-place-children
-        (lambda (l w h)
-          (cond
-           [horizontal?
-            (check-place-children l w h)
-            (place-linear-children l w h
-                                   car   ; child-info-x-min
-                                   caddr ; child-info-x-stretch
-                                   (lambda (s) (major-offset s))
-                                   cadr   ; child-info-y-min
-                                   cadddr ; child-info-y-stretch
-                                   (lambda (s t) (minor-offset s t))
-                                   (lambda (width height) width)
-                                   (lambda (width height) height)
-                                   (lambda (major minor) major)
-                                   (lambda (major minor) minor))]
-           [else
-            (check-place-children l w h)
-            (place-linear-children l w h
-                                   cadr   ; child-info-y-min
-                                   cadddr ; child-info-y-stretch
-                                   (lambda (s) (major-offset s))
-                                   car   ; child-info-x-min
-                                   caddr ; child-info-x-stretch
-                                   (lambda (s t) (minor-offset s t))
-                                   (lambda (width height) height)
-                                   (lambda (width height) width)
-                                   (lambda (major minor) minor)
-                                   (lambda (major minor) major))]))])
-      (apply super-make-object args)))
-  
-  
-  ;; horizontal-panel%: a panel which arranges its children in an evenly
-  ;; spaced horizontal row.  Items are vertically centered (or stretched
-  ;; to fit the dialog box if they are stretchable).  The items are evenly
-  ;; spaced horizontally, with any extra space divided evenly among the
-  ;; stretchable items. 
-  (define (wx-make-horizontal-panel% wx-linear-panel%) (wx-make-horizontal/vertical-panel% wx-linear-panel% #t))
-
-  ;; vertical-panel%.  See horizontal-panel%, but reverse
-  ;; "horizontal" and "vertical."
-  (define (wx-make-vertical-panel% wx-linear-panel%) (wx-make-horizontal/vertical-panel% wx-linear-panel% #f))
-
-  (define (wx-make-tab% %)
-    (class %
-      (inherit gets-focus?)
-      (super-new)
-      (define/override (tabbing-position x y w h)
-        ;; claim that the panel is short and starts above its client area:
-        (list this x (- y 16) w 16))
-      (define/override (focus-on-self?) (gets-focus?))))
-
-  (define wx-panel% (wx-make-panel% wx:panel%))
-  (define wx-control-panel% (wx-make-panel% wx:panel% const-default-x-margin const-default-y-margin))
-  (define wx-canvas-panel% (wx-make-panel% wx:canvas-panel%))
-  (define wx-tab-panel% (wx-make-tab% (wx-make-panel% wx:tab-panel%)))
-  (define wx-group-panel% (wx-make-panel% wx:group-panel%))
-  (define wx-linear-panel% (wx-make-linear-panel% wx-panel%))
-  (define wx-linear-canvas-panel% (wx-make-linear-panel% wx-canvas-panel%))
-  (define wx-control-linear-panel% (wx-make-linear-panel% wx-control-panel%))
-  (define wx-linear-tab-panel% (wx-make-tab% (wx-make-linear-panel% wx-tab-panel%)))
-  (define wx-linear-group-panel% (wx-make-linear-panel% wx-group-panel%))
-  (define wx-horizontal-panel% (wx-make-horizontal-panel% wx-linear-panel%))
-  (define wx-vertical-panel% (wx-make-vertical-panel% wx-linear-panel%))
-  (define wx-vertical-tab-panel% (wx-make-tab% (wx-make-vertical-panel% wx-linear-tab-panel%)))
-  (define wx-vertical-group-panel% (wx-make-vertical-panel% wx-linear-group-panel%))
-  (define wx-control-horizontal-panel% (wx-make-horizontal-panel% wx-control-linear-panel%))
-  (define wx-horizontal-canvas-panel% (wx-make-horizontal-panel% wx-linear-canvas-panel%))
-  (define wx-vertical-canvas-panel% (wx-make-vertical-panel% wx-linear-canvas-panel%))
-
-  (define wx-pane% (wx-make-pane% wx:windowless-panel% #t))
-  (define wx-grow-box-pane%
-    (class (wx-make-pane% wx:windowless-panel% #f)
-      (init mred proxy parent style label)
-      (override*
-       [init-min (lambda (x) (if (wx:needs-grow-box-spacer?)
-                                 15
-                                 0))])
-      (super-make-object mred proxy parent style label)))
-  (define wx-linear-pane% (wx-make-linear-panel% wx-pane%))
-  (define wx-horizontal-pane% (wx-make-horizontal-panel% wx-linear-pane%))
-  (define wx-vertical-pane% (wx-make-vertical-panel% wx-linear-pane%)))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxtextfield.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxtextfield.rkt
deleted file mode 100644
index 4cd10d9c64..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxtextfield.rkt
+++ /dev/null
@@ -1,336 +0,0 @@
-(module wxtextfield racket/base
-  (require racket/class
-           (prefix-in wx: "kernel.rkt")
-           (prefix-in wx: "wxme/text.rkt")
-           (prefix-in wx: racket/snip/private/snip)
-           (prefix-in wx: "wxme/editor-canvas.rkt")
-           "lock.rkt"
-           "const.rkt"
-           "check.rkt"
-           "helper.rkt"
-           "gdi.rkt"
-           "wx.rkt"
-           "wxwindow.rkt"
-           "wxitem.rkt"
-           "wxcanvas.rkt"
-           "wxpanel.rkt"
-           "editor.rkt"
-           "mrpopup.rkt")
-
-  (provide (protect-out wx-text-field%))
-
-  (define no-pen (send wx:the-pen-list find-or-create-pen "white" 1 'transparent))
-  (define black-brush (send wx:the-brush-list find-or-create-brush "black" 'solid))
-
-  (define password-string-snip%
-    (class wx:string-snip%
-      (inherit get-count
-               get-style
-               get-text)
-      (super-new)
-
-      (define delta 3)
-      (define hdelta 2)
-      (define (get-size)
-        (max 4 (send (send (get-style) get-font) get-point-size)))
-               
-      (define/override (get-extent dc x y [w #f] [h #f] [descent #f] [space #f] [lspace #f] [rspace #f])
-        (let ([s (get-size)])
-          (when w (set-box! w (* (max 1.0 (- s hdelta hdelta)) (get-count))))
-          (when h (set-box! h (+ s 2.0)))
-          (when descent (set-box! descent 1.0))
-          (when space (set-box! space 1.0))
-          (when lspace (set-box! lspace 0.0))
-          (when rspace (set-box! rspace 0.0))))
-      (define/override (partial-offset dc x y pos)
-        (let ([s (get-size)])
-          (* (max 1.0 (- s hdelta hdelta)) pos)))
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (let ([s (get-size)]
-              [b (send dc get-brush)]
-              [p (send dc get-pen)]
-              [m (send dc get-smoothing)])
-          (send dc set-pen no-pen)
-          (send dc set-brush black-brush)
-          (send dc set-smoothing 'aligned)
-          (for/fold ([x x]) ([i (in-range (get-count))])
-            (send dc draw-ellipse (- (+ x delta) hdelta) (+ y delta 1) (- s delta delta) (- s delta delta))
-            (+ x (- s hdelta hdelta)))
-          (send dc set-pen p)
-          (send dc set-brush b)
-          (send dc set-smoothing m)))
-      (define/override (split pos first second)
-        (let ([a (new password-string-snip%)]
-              [b (new password-string-snip%)]
-              [c (get-count)])
-          (send a insert (get-text 0 pos) pos)
-          (send b insert (get-text pos c) (- c pos))
-          (set-box! first a)
-          (set-box! second b)))))
-
-  (define text-field-text% 
-    (class text%
-      (init cb ret-cb control set-cb-mgrs! record-text pw?)
-      (rename-super [super-on-char on-char])
-      (inherit get-text last-position set-max-undo-history get-flattened-text)
-      (define return-cb ret-cb)
-      (define password? pw?)
-      (define block-callback 1)
-      (define callback
-        (lambda (type)
-          (as-exit (lambda () (record-text (get-flattened-text))))
-          (when (zero? block-callback)
-            (let ([e (make-object wx:control-event% type)])
-              (as-exit (lambda ()
-                         (cb control e)))))))
-      (override*
-       [on-char
-        (entry-point
-         (lambda (e)
-           (let ([c (send e get-key-code)])
-             (unless (and (or (eq? c #\return) 
-                              (eq? c #\newline)
-                              (eq? c 'numpad-enter))
-                          return-cb
-                          (return-cb (lambda () (callback 'text-field-enter) #t)))
-               (as-exit (lambda () (super-on-char e)))))))]
-       [on-new-string-snip
-        (lambda ()
-          (if password?
-              (new password-string-snip%)
-              (super on-new-string-snip)))])
-      (augment*
-       [after-insert
-	(lambda args
-	  (as-entry
-	   (lambda ()
-	     (callback 'text-field))))]
-       [after-delete
-	(lambda args
-	  (as-entry
-	   (lambda ()
-	     (callback 'text-field))))])
-      (set-cb-mgrs!
-       (lambda (thunk)
-         (dynamic-wind
-           (lambda () (set! block-callback (add1 block-callback)))
-           thunk
-           (lambda () (set! block-callback (sub1 block-callback)))))
-       (lambda () 
-         (set! block-callback 0)))
-      (super-make-object)
-      (set-max-undo-history 'forever)))
-  
-  (define wx-text-editor-canvas% 
-    (class* wx-editor-canvas% (wx-text-editor-canvas<%>)
-      (init mred proxy control parent style)
-      (super-make-object mred proxy parent -1 -1 100 30 #f style 100 #f)))
-
-  (define wx-text-field%
-    (class wx-horizontal-panel%
-      (init mred proxy parent fun label value style _font)
-      (send (send parent get-top-level) begin-container-sequence)
-      ;; Make text field first because we'll have to exit
-      ;;  for keymap initializer
-      (define func fun)
-      (define font (or _font normal-control-font))
-      (define without-callback #f)
-      (define callback-ready #f)
-      (define e
-        (make-object text-field-text%
-                     func
-                     (lambda (do-cb)
-                       (if multi?
-                           #f
-                           (do-cb)))
-                     this
-                     (lambda (wc cr)
-                       (set! without-callback wc)
-                       (set! callback-ready cr))
-                     (lambda (t)
-                       (send c set-combo-text t))
-                     (memq 'password style)))
-      (as-exit
-       (lambda ()
-         ((current-text-keymap-initializer) (send e get-keymap))))
-      (inherit alignment stretchable-in-y area-parent
-	       get-min-size set-min-width set-min-height
-               spacing)
-      (rename-super [super-place-children place-children])
-      (public*
-       [command (lambda (e)             ; No entry/exit needed
-                  (check-instance '(method text-field% command) wx:control-event% 'control-event% #f e)
-                  (func this e)
-                  (void))]
-
-       [get-editor (lambda () e)]
-	
-       [get-value (lambda () (send e get-text))] ; note: not as-entry when called
-       [set-value (lambda (v) (without-callback
-                               (lambda () (send e insert v 0 (send e last-position)))))]
-
-       [set-label (lambda (str) (when l (send l set-label str)))]
-       [get-canvas-width (lambda ()
-                           (let ([tw (box 0)])
-                             (send c get-size tw (box 0))
-                             (unbox tw)))]
-        
-       [set-field-background (lambda (col)
-                               (send c set-canvas-background col))]
-       [get-field-background (lambda ()
-                               (send c get-canvas-background))])
-      (override*
-       ;; These might be called before we are fully initialized
-
-       [set-cursor (lambda (c) (send e set-cursor c #t))]
-       [set-focus (lambda () (when (object? c) (send c set-focus)))]
-	
-       [place-children
-        (lambda (children-info width height)
-          (if (null? children-info)
-              null
-              (let ([r (super-place-children children-info width height)])
-                (if horiz?
-                    ;; Line up label right with text:
-                    (cons (list* (caar r) (+ (cadar r) dy) (cddar r))
-                          (cdr r))
-                    r))))])
-      (super-make-object #f proxy parent (if (memq 'deleted style) '(deleted) null) #f)
-      (unless (memq 'deleted style)
-        (send (area-parent) add-child this))
-      (define multi? (memq 'multiple style))
-      (define horiz?
-        (cond
-         [(memq 'vertical-label style) #f]
-         [(memq 'horizontal-label style) #t]
-         [else (eq? (send (send parent get-window) get-label-position) 'horizontal)]))
-      (define dy 0)
-      (define p
-        (if horiz?
-            this
-            (let ([p (make-object wx-vertical-pane% #f proxy this null #f)])
-              (send p skip-subwindow-events? #t)
-              (send (send p area-parent) add-child p)
-              p)))
-      (alignment 'left 'top)
-      (unless horiz? (send p alignment 'left 'top))
-      (unless multi? (stretchable-in-y #f))
-      ;; For Windows:
-      ; (wx:set-combo-box-font font)
-      (spacing 3)
-      (define l (and label
-                     (make-object wx-message% #f proxy p label -1 -1 null font)))
-      (define combo-callback #f)
-      (define c
-        (make-object (class wx-text-editor-canvas% 
-                       (define/override (on-combo-select i)
-                         (let ([len (length callbacks)])
-                           (when (< -1 i len)
-                             ((list-ref callbacks (- len i 1))))))
-                       (super-new))
-                     #f proxy this p
-                     (append
-                      '(control-border)
-                      (if (memq 'combo style)
-                          '(combo)
-                          null)
-                      (if multi?
-                          (if (memq 'hscroll style)
-                              null
-                              '(hide-hscroll))
-                          '(hide-vscroll hide-hscroll)))))
-      (define callbacks null)
-      (override*
-       [pre-on-event (lambda (w e)
-                       (or (super pre-on-event w e)
-                           (and combo-callback
-                                (eq? w c)
-                                (send e button-down?)
-                                (let ([w (box 0)]
-                                      [h (box 0)])
-                                  (send c get-client-size w h)
-                                  (not (and (<= 0 (send e get-x) (unbox w))
-                                            (<= 0 (send e get-y) (unbox h)))))
-                                (begin
-                                  (do-popup-callback)
-                                  #t))))])
-      (private*
-       [do-popup-callback (lambda ()
-                            (wx:queue-callback (lambda ()
-                                                 (when (send c is-enabled-to-root?)
-                                                   (combo-callback)
-                                                   (send c popup-combo)))
-                                               wx:middle-queue-key))])
-      (public*
-       [set-on-popup (lambda (proc) 
-                       (set! combo-callback proc) 
-                       (send c set-on-popup (lambda () (do-popup-callback))))]
-       [clear-combo-items (lambda () (set! callbacks null) (send c clear-combo-items))]
-       [append-combo-item (lambda (s cb)
-                            (and (send c append-combo-item s)
-                                 (set! callbacks (cons cb callbacks))
-                                 #t))])
-      (send c skip-subwindow-events? #t)
-      (when l
-        (send l skip-subwindow-events? #t)
-        (send l x-margin 0))
-      (send c set-x-margin 2)
-      (send c set-y-margin 2)
-      (send e set-line-spacing 0)
-      (send e set-paste-text-only #t)
-      (send e auto-wrap (and multi? (not (memq 'hscroll style))))
-      (let ([f font]
-            [s (send (send e get-style-list) find-named-style "Standard")])
-        (send s set-delta (font->delta f)))
-      (send c set-editor e)
-      (send c set-line-count (if multi? 3 1))
-      (unless multi? (send c set-single-line))
-
-      (when (and l horiz?)
-        ;; Minimize vertical space around the label:
-        (send l y-margin 0)
-        ;; Find amount to drop label down to line up the baselines:
-        (let ([wbox (box 0)]
-              [hbox (box 0)]
-              [ybox (box 0)]
-              [abox (box 0)])
-          ;; To bottom of first line
-          (send (send e get-admin) get-dc #f ybox)
-          (set! dy (+ (abs (unbox ybox)) (send e line-location 0 #f)))
-	    
-          ;; Add diff for client size
-          (send c get-client-size wbox hbox)
-          (let ([d (- (send c get-height) (unbox hbox))])
-            (set! dy (+ dy (quotient d 2))))
-	    
-          ;; Subtract descent of canvas-drawn text
-          (let ([font (send (send (send e get-style-list) find-named-style "Standard") get-font)])
-            (send c get-text-extent "hi" wbox hbox ybox #f font)
-            (set! dy (- dy (unbox ybox))))
-	    
-          ;; Subtract ascent of label
-          (send l get-text-extent "hi" wbox hbox ybox abox font)
-          (set! dy (- dy (- (unbox hbox) (unbox ybox))))
-	    
-          ;; Subtract space above label
-          (set! dy (- dy (quotient (- (send l get-height) (unbox hbox)) 2)))
-
-          ;; Exact
-          (set! dy (inexact->exact dy))))
-
-      (when value
-        (set-value value)
-        (unless (string=? value "")
-          (let* ([ew (box 0)]
-                 [cw (box 0)]
-                 [tw (box 0)])
-            (send e get-extent ew #f)
-            (send (send e get-admin) get-view #f #f cw #f)
-            (send c get-size tw (box 0))
-            (let ([new-min-width (+ (unbox ew) (- (unbox tw) (unbox cw)))])
-              (send c set-min-width (inexact->exact new-min-width))))))
-      (let ([min-size (get-min-size)])
-        (set-min-width (car min-size))
-        (set-min-height (cadr min-size)))
-      (send (send parent get-top-level) end-container-sequence)
-      (callback-ready))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxtop.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxtop.rkt
deleted file mode 100644
index c0a9b8299e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxtop.rkt
+++ /dev/null
@@ -1,761 +0,0 @@
-(module wxtop racket/base
-  (require racket/class
-           racket/list
-           (prefix-in wx: "kernel.rkt")
-           (prefix-in wx: "wxme/editor-canvas.rkt")
-           (prefix-in wx: "wxme/editor-snip.rkt")
-           "lock.rkt"
-           "helper.rkt"
-           "const.rkt"
-           "check.rkt"
-           "wx.rkt"
-           "wxwindow.rkt"
-           "wxcontainer.rkt")
-
-  (provide (protect-out active-main-frame
-			set-root-menu-wx-frame!
-                        add-active-frame-callback!)
-	   get-display-size
-	   get-display-left-top-inset
-	   get-display-count
-	   get-display-backing-scale
-	   (protect-out make-top-container%
-			make-top-level-window-glue%
-			wx-frame%
-			wx-dialog%))
-
-  ;; Weak boxed:
-  (define active-main-frame (make-weak-box #f))
-
-  (define active-frame-callbacks null)
-  (define (add-active-frame-callback! cb)
-    (set! active-frame-callbacks (cons cb active-frame-callbacks)))
-  
-  (define root-menu-wx-frame #f)
-  (define (set-root-menu-wx-frame! f)
-    (set! root-menu-wx-frame f))
-
-  (define get-display-size
-    (lambda ([full-screen? #f] #:monitor [monitor 0])
-      (unless (exact-nonnegative-integer? monitor)
-	(raise-argument-error 'get-display-size "exact-nonnegative-integer?" monitor))
-      (let/ec esc
-        (let ([xb (box 0)]
-              [yb (box 0)])
-          (wx:display-size xb yb full-screen? monitor
-                           (lambda () (esc #f #f)))
-          (values (unbox xb) (unbox yb))))))
-
-  (define get-display-left-top-inset
-    (lambda ([advisory? #f] #:monitor [monitor 0])
-      (unless (exact-nonnegative-integer? monitor)
-	(raise-argument-error 'get-display-left-top-inset "exact-nonnegative-integer?" monitor))
-      (let/ec esc
-        (let ([xb (box 0)]
-              [yb (box 0)])
-          (wx:display-origin xb yb advisory? monitor (lambda () (esc #f #f)))
-          (values (unbox xb) (unbox yb))))))
-
-  (define get-display-count
-    (lambda ()
-      (wx:display-count)))
-
-  (define get-display-backing-scale
-    (lambda (#:monitor [monitor 0])
-      (unless (exact-nonnegative-integer? monitor)
-	(raise-argument-error 'get-display-backing-scale "exact-nonnegative-integer?" monitor))
-      (wx:display-bitmap-resolution monitor (lambda () #f))))
-
-  (define-values (left-margin top-margin init-top-x init-top-y)
-    (let-values ([(x y) (get-display-left-top-inset #f)]
-		 [(x2 y2) (get-display-left-top-inset #t)])
-      (values (- x2 x)
-              (- y2 y)
-              (+ 1 (- x2 x))
-	      (+ 1 (- y2 y)))))
-
-  (define top-x init-top-x)
-  (define top-y init-top-y)
-  
-  ;; make-top-container%: adds the necessary functionality to wx:frame% and 
-  ;; wx:dialog%.
-  ;; input: base%: the base class from which to descend the new class.
-  ;;          Intended to be either wx:frame% or wx:dialog%, but can
-  ;;          be anything which contains all methods in the inherit section
-  ;;          below.
-  ;; returns: a new class, descended from base%, which possesses the added
-  ;;            capabilities necessary to serve as the frame/dialog which
-  ;;            contains container classes.
-  (define (make-top-container% base% dlg?)
-    (class (wx-make-container% (wx-make-window% base% #t))
-      (init parent)
-      (init-rest args)
-      (inherit get-x get-y get-width get-height set-size
-	       get-client-size is-shown? on-close enforce-size
-               get-eventspace get-focus-window)
-      ;; have we had any redraw requests while the window has been
-      ;; hidden?
-      (define pending-redraws? #t)
-
-      (define perform-updates? #t)
-      (define seq-count 0)
-       
-      (define ignore-redraw-request? #f)
-       
-      (define already-trying? #f)
-      (define was-bad? #f)    ; hack around min-frame-size limitations
-      (define tried-sizes #hash())
-       
-      ;; pointer to panel in the frame for use in on-size
-      (define panel #f)
-
-      (define use-default-position? (and (not (list-ref args 2))
-                                         (not (list-ref args 1))))
-       
-      (define enabled? #t)
-      (define focus #f)
-
-      (define border-buttons null)
-
-      (define parent-for-center parent)
-
-      (define show-ht (make-hasheq))
-      (define fake-show-ht (make-hasheq))
-      
-      (override*
-       [enable
-        (lambda (b)
-          (set! enabled? (and b #t))
-          (super enable b))])
-
-      (public*
-
-       [is-enabled?
-        (lambda () enabled?)]
-
-       [set-focus-window
-        (lambda (w)
-          (unless (eq? 'macosx (system-type))
-            (set! border-buttons (filter weak-box-value border-buttons))
-            (if (not w)
-                ;; Non-border button losing focus?
-                (when (and (focus . is-a? . wx:button%)
-                           (not (memq focus (map weak-box-value border-buttons))))
-                  (send focus defaulting #f))
-                ;; Something gaining focus... adjust border buttons
-                (begin
-                  (for-each (lambda (bb)
-                              (let ([b (weak-box-value bb)])
-                                (when b
-                                  (send b defaulting (or (not (w . is-a? . wx:button%))
-                                                         (eq? b w))))))
-                            border-buttons)
-                  (when (w . is-a? . wx:button%)
-                    (send w defaulting #t))))
-            (set! focus w)))]
-	
-       [get-edit-target-window
-        (lambda () (get-focus-window #t))]
-       [get-focus-object
-        (lambda ()
-          (window->focus-object (get-focus-window)))]
-       [get-edit-target-object
-        (lambda ()
-          (window->focus-object (get-focus-window #t)))]
-
-       [window->focus-object
-        (lambda (w)
-          (and w
-               (if (is-a? w wx:editor-canvas%)
-                   (let loop ([m (send w get-editor)]
-                              [prev w])
-                     (if m
-                         (let ([snip (send m get-focus-snip)])
-                           (if (and snip (is-a? snip wx:editor-snip%))
-                               (loop (send snip get-editor) m)
-                               m))
-                         w))
-                   focus)))]
-
-       [add-border-button
-        (lambda (b)
-          (set! border-buttons (filter weak-box-value border-buttons))
-          (set! border-buttons (cons (make-weak-box b) border-buttons)))]
-
-       ;; add-child: update panel pointer.
-       ;; input: new-panel: panel in frame (descendant of
-       ;;   panel%) 
-       ;; returns: nothing
-       ;; effects: sets panel to new-panel
-       ;;          if new-panel is not a descendant of
-       ;;            panel%, calls error; panel not updated.
-       [add-child
-        (lambda (new-panel)
-          (set! panel new-panel)
-          (set! pending-redraws? #t)
-          (let-values ([(client-w client-h)
-                        (get-two-int-values (lambda (a b) (get-client-size a b)))])
-            (send panel set-size 0 0 client-w client-h))
-          (self-redraw-request))]
-
-       [area-parent (lambda () #f)]
-	
-       [get-top-panel
-        (lambda ()
-          panel)]
-
-       [delay-updates
-        (case-lambda
-	  [() (not perform-updates?)]
-	  [(f) 
-	   (set! perform-updates? (not f))
-	   (when perform-updates?
-	     (when pending-redraws?
-	       (force-redraw))
-	     (when (positive? (hash-count fake-show-ht))
-	       (let ([t fake-show-ht])
-		 (set! fake-show-ht (make-hasheq))
-		 (hash-for-each
-		  t
-		  (lambda (win v?)
-		    (send win really-show #t)))))
-	     (when (positive? (hash-count show-ht))
-	       (let ([t show-ht])
-		 (set! show-ht (make-hasheq))
-		 (hash-for-each
-		  t
-		  (lambda (win v?)
-		    (send win show v?))))))])]
-       [begin-container-sequence
-        (lambda ()
-          (when (zero? seq-count)
-            (delay-updates #t))
-          (set! seq-count (add1 seq-count)))]
-       [end-container-sequence
-        (lambda ()
-          (set! seq-count (sub1 seq-count))
-          (when (zero? seq-count)
-            (delay-updates #f)))]
-
-       [forget-child
-        (lambda (child)
-          (unless (hash-ref show-ht child #t)
-            (send child show #f))
-          (hash-remove! show-ht child))]
-
-       [show-child
-        (lambda (child show?)
-          (if perform-updates?
-              (send child show show?)
-              (hash-set! show-ht child show?)))]
-
-       [show-control
-        (lambda (child on?)
-          (if (or perform-updates?
-                  (not on?)
-                  (child . is-a? . wx-frame%)
-                  (child . is-a? . wx-dialog%))
-              (begin
-                (hash-remove! fake-show-ht child)
-                (send child really-show on?))
-              (begin
-                (hash-set! fake-show-ht child #t)
-                (send child fake-show on?))))]
-
-       ;; force-redraw: receives a message from to redraw the
-       ;; entire frame.
-       ;; input: none
-       ;; returns: nothing
-       ;; effects: redraws the frame at its current size (changing size
-       ;;            as necessary).
-       [child-redraw-request
-        ;; since there's only one panel, we assume that `from' is the
-        ;; panel and the request should be granted
-        (lambda (from) 
-          (unless ignore-redraw-request?
-            (self-redraw-request)))]
-       [self-redraw-request
-        (lambda ()
-          (if (and (is-shown?) perform-updates?)
-              (force-redraw)
-              (set! pending-redraws? #t)))]
-       [force-redraw
-        (lambda ()
-          (if panel
-              (dynamic-wind
-                (lambda () (set! ignore-redraw-request? #t))
-                (lambda () (resized))
-                (lambda () (set! ignore-redraw-request? #f)))
-	       
-              (set! pending-redraws? #f)))]
-
-       [correct-size
-        (lambda (frame-w frame-h)
-          (if (not panel)
-              (values frame-w frame-h)
-              (let-values ([(f-client-w f-client-h) (get-two-int-values 
-                                                     (lambda (a b) (get-client-size a b)))])
-                (let* ([panel-info (send panel get-info)]
-			
-                       ;; difference between panel's full size & 
-                       ;; frame's full size
-                       [delta-w (max 0 (- (get-width) f-client-w))]
-                       [delta-h (max 0 (- (get-height) f-client-h))]
-
-                       ;; minimum frame size:
-                       [min-w (+ delta-w (child-info-x-min panel-info))]
-                       [min-h (+ delta-h (child-info-y-min panel-info))]
-			
-                       ;; correct size for frame
-                       [new-w
-                        (cond
-                         [(< frame-w min-w) min-w]
-                         [(and (> frame-w min-w) (not (child-info-x-stretch panel-info))) min-w]
-                         [else frame-w])]
-                       [new-h
-                        (cond
-                         [(< frame-h min-h) min-h]
-                         [(and (> frame-h min-h) (not (child-info-y-stretch panel-info))) min-h]
-                         [else frame-h])])
-                  (values (max new-w 1) (max new-h 1)
-                          (max min-w 1) (max min-h 1)
-                          (child-info-x-stretch panel-info) (child-info-y-stretch panel-info))))))]
-
-       [set-panel-size
-        (lambda ()
-          (when panel
-            (let-values ([(f-client-w f-client-h) (get-two-int-values 
-                                                   (lambda (a b) (get-client-size a b)))]
-                         [(panel-info) (send panel get-info)]
-                         [(sel) (lambda (nsize psize stretch?)
-                                  (if stretch?
-                                      (max nsize psize)
-                                      psize))])
-              (send panel set-size 0 0 
-                    (sel f-client-w (child-info-x-min panel-info)
-                         (child-info-x-stretch panel-info))
-                    (sel f-client-h (child-info-y-min panel-info)
-                         (child-info-y-stretch panel-info)))
-              (set! pending-redraws? #f)
-              (send panel on-container-resize))))]
-
-
-       [resized
-        (entry-point
-         (lambda ()
-           (unless already-trying?
-             (let ([new-width (get-width)]
-                   [new-height (get-height)])
-               (let-values ([(correct-w correct-h min-w min-h sx? sy?) (correct-size new-width new-height)])
-                 (cond
-                  [(and (= new-width correct-w) (= new-height correct-h))
-                   ;; Good size; do panel
-                   (set! was-bad? #f)
-		   (set! tried-sizes #hash())
-                   (enforce-size min-w min-h
-                                 (if sx? -1 min-w) (if sy? -1 min-h)
-                                 1 1)
-                   (set-panel-size)]
-                  [(and (hash-ref tried-sizes (cons correct-w correct-h) #f)
-                        was-bad?)
-                   ;; We give up; do panel
-                   (set-panel-size)]
-                  [else
-                   ;; Too large/small; try to fix it, but give up after a while
-                   (set! was-bad? #t)
-		   (set! tried-sizes (hash-set tried-sizes (cons correct-w correct-h) #t))
-                   (set! already-trying? #t)
-                   (enforce-size -1 -1 -1 -1 1 1)
-                   (set-size #f #f correct-w correct-h)
-                   (enforce-size min-w min-h
-                                 (if sx? -1 min-w) (if sy? -1 min-h)
-                                 1 1)
-                   (set! already-trying? #f)
-                   (resized)]))))))])
-
-      (public*
-       [call-show
-        (lambda (on? do-show)
-          (when on?
-            (position-for-initial-show))
-          (as-exit ; as-exit because there's an implicit wx:yield for dialogs
-           do-show))])
-      
-      (override*
-       ;; show: add capability to set perform-updates
-       ;; input: now : boolean
-       ;; returns: nothing
-       ;; effects: if we're showing for the first time, unblock updates
-       ;;            and force an update.  If we're hiding, block updates.
-       ;;          pass now to superclass's show.
-       [show
-        (lambda (on?)
-          (call-show
-           on?
-           (lambda () (super show on?))))]
-
-       [on-visible
-        (lambda ()
-          (send panel queue-visible)
-          (super on-visible))]
-       [on-active
-        (lambda ()
-          (send panel queue-active)
-          (super on-active))]
-	
-       [move (lambda (x y) (set! use-default-position? #f) (super move x y))]
-       [center (lambda (dir)
-                 (when pending-redraws? (force-redraw))
-                 (set! use-default-position? #f)
-                 (super center dir parent-for-center))] ; 2nd argument is for Mac OS X
-	
-       ;; on-size: ensures that size of frame matches size of content
-       ;; input: new-width/new-height: new size of frame
-       ;; returns: nothing
-       ;; effects: if new size is smaller than allowed size of
-       ;;            contents, frame resized to smallest possible size.
-       ;;            If frame is larger than contents and contents
-       ;;            aren't stretchable, frame resized to size of
-       ;;            contents.  Each direction is handled
-       ;;            independently.
-       [queue-on-size
-        (lambda ()
-          (unless (and already-trying? (not (eq? 'unix (system-type))))
-            (parameterize ([wx:current-eventspace (get-eventspace)])
-              (wx:queue-callback (lambda () (resized)) wx:middle-queue-key))))])
-
-      (public*
-       [position-for-initial-show
-        (lambda ()
-          (when pending-redraws?
-            (force-redraw))
-          (when use-default-position?
-            (set! use-default-position? #f)
-            (if dlg?
-                (center 'both)
-                (let*-values ([(w) (get-width)]
-                              [(h) (get-height)]
-                              [(sw sh) (get-display-size)]
-                              [(x x-reset?) (if (< (+ top-x w) (+ sw left-margin))
-                                                (values top-x #f)
-                                                (values (max init-top-x (- sw w 10)) #t))]
-                              [(y y-reset?) (if (< (+ top-y h) (+ sh top-margin))
-                                                (values top-y #f)
-                                                (values (max init-top-y (- sh h 20)) #t))])
-                  (move x y)
-                  (set! top-x (if x-reset? init-top-x (+ top-x 10)))
-                  (set! top-y (if y-reset? init-top-y (+ top-y 20)))))))]
-       [handle-traverse-key
-        (lambda (e)
-          (and panel
-               (let ([code (send e get-key-code)])
-                 (case code
-                   [(#\return) 
-                    (let ([o (get-focus-window)])
-                      (if (and o (send o handles-key-code code #f #f))
-                          #f
-                          (let ([objs (container->children panel #f #f)])
-                            (or (ormap
-                                 (lambda (x)
-                                   (and (is-a? x wx:button%)
-                                        (send x has-border?)
-                                        (let ([v (make-object wx:control-event% 'button)])
-                                          (do-command x v)
-                                          #t)))
-                                 objs)
-                                (not (is-a? o wx:editor-canvas%))))))]
-                   [(escape #\.)
-                    (and (is-a? this wx:dialog%)
-                         (or (eq? code 'escape)
-                             (and (memq (system-type) '(macos macosx))
-                                  (send e get-meta-down)))
-                         (let ([o (get-focus-window)])
-                           (if (and o (send o handles-key-code code #f (send e get-meta-down)))
-                               #f
-                               (begin
-                                 (when (on-close)
-                                   (show #f))
-                                 #t))))]
-                   [(#\space)
-                    (let ([o (get-focus-window)])
-                      (cond
-                       [(is-a? o wx:button%)
-                        (do-command o (make-object wx:control-event% 'button))
-                        #t]
-                       [(is-a? o wx:check-box%) 
-                        (send o set-value (not (send o get-value)))
-                        (do-command o (make-object wx:control-event% 'check-box))
-                        #t]
-                       [(is-a? o wx:radio-box%)
-                        (let ([s (send o button-focus -1)])
-                          (unless (negative? s)
-                            (send o set-selection s)
-                            (do-command o (make-object wx:control-event% 'radio-box))))
-                        #t]
-                       [(is-a? o wx-tab-group<%>)
-                        (let ([s (send o button-focus -1)])
-                          (unless (negative? s)
-                            (send o set-selection s)
-                            (do-command (wx->mred o) (make-object wx:control-event% 'tab-panel))))
-                        #t]
-                       [else #f]))]
-                   [(#\tab left up down right) 
-                    (let ([o (get-focus-window)])
-                      (if (and o (send o handles-key-code code #f #f))
-                          #f
-                          (let* ([shift? (send e get-shift-down)]
-                                 [forward? (or (and (eq? code #\tab) (not shift?))
-                                               (memq code '(right down)))]
-                                 [normal-move
-                                  (lambda ()
-                                    (let* ([o (if (or (is-a? o wx:canvas%) 
-                                                      (is-a? o wx:item%)
-                                                      (is-a? o wx:tab-panel%))
-                                                  (if (is-a? o wx-group-box<%>)
-                                                      #f
-                                                      o)
-                                                  #f)]
-                                           [candidates 
-                                            (map object->position (container->children panel o #t))]
-                                           [dests (filter-overlapping candidates)]
-                                           [pos (if o (object->position o) (list 'x 0 0 1 1))]
-                                           [o (traverse (cadr pos) (caddr pos) (cadddr pos) (list-ref pos 4)
-                                                        (case code
-                                                          [(#\tab) (if shift? 'prev 'next)]
-                                                          [else code])
-                                                        dests)])
-                                      (when o
-                                        (if (or (is-a? o wx:radio-box%)
-                                                (is-a? o wx-tab-group<%>))
-                                            (send o button-focus (max 0 (send o button-focus -1)))
-                                            (begin
-                                              (send o set-focus)
-                                              (if (and (is-a? o wx-text-editor-canvas<%>)
-                                                       (send o is-single-line?))
-                                                  (let ([e (send o get-editor)])
-                                                    (as-exit
-                                                     (lambda ()
-                                                       (send e set-position 0 (send e last-position) #f #t 'local))))
-                                                  ;; Not a text field; a canvas?
-                                                  (when (or (is-a? o wx:canvas%)
-                                                            (is-a? o wx:editor-canvas%))
-                                                    (as-exit (lambda () (send o on-tab-in))))))))))])
-                            (if (and (not (eqv? code #\tab))
-                                     (or (is-a? o wx:radio-box%)
-                                         (is-a? o wx:tab-panel%)))
-                                (let ([n (send o number)]
-                                      [s (send o button-focus -1)]
-                                      [v-move? (memq code '(up down))]
-                                      [h-move? (memq code '(left right))]
-                                      [v? (and (is-a? o wx:radio-box%)
-                                               (send o vertical?))])
-                                  (cond
-                                   [(or (negative? s) 
-                                        (and v? h-move?) 
-                                        (and (not v?) v-move?))
-                                    (normal-move)]
-                                   [(and forward? (< s (sub1 n)))
-                                    (send o button-focus (add1 s))]
-                                   [(and (not forward?) (positive? s))
-                                    (send o button-focus (sub1 s))]
-                                   [else (normal-move)]))
-                                (normal-move))
-                            #t)))]
-                   [else (if (and (wx:shortcut-visible-in-label?)
-                                  (char? code)
-                                  (or (char-alphabetic? code)
-                                      (char-numeric? code))
-                                  (not (send e get-shift-down))
-                                  (not (send e get-control-down))
-                                  (not (send e get-alt-down)))
-                             (let ([o (get-focus-window)]
-                                   [meta? (send e get-meta-down)])
-                               (if (and o (send o handles-key-code code #t meta?))
-                                   #f
-                                   ;; Move selection/hit control based on & shortcuts
-                                   (let* ([objs (container->children panel #f #t)]
-                                          [re (key-regexp code)])
-                                     (ormap
-                                      (lambda (o)
-                                        (let* ([win (wx->proxy o)]
-                                               [l (send win get-label)])
-                                          (cond
-                                           [(and (string? l)
-                                                 (regexp-match re l))
-                                            (send o set-focus)
-                                            (send o char-to)
-                                            #t]
-                                           [(is-a? o wx:radio-box%)
-                                            (let ([n (send o number)])
-                                              (let loop ([i 0])
-                                                (if (= i n)
-                                                    #f
-                                                    (let ([l (send win get-item-label i)])
-                                                      (if (and (string? l)
-                                                               (regexp-match re l))
-                                                          (begin
-                                                            (send o button-focus i)
-                                                            (send o char-to-button i)
-                                                            #t)
-                                                          (loop (add1 i)))))))]
-                                           [else #f])))
-                                      objs))))
-                             #f)]))))])
-      
-      (apply super-make-object parent args)))
-
-  (define (make-top-level-window-glue% style-pos %) ; implies make-window-glue%
-    (class (make-window-glue% %)
-      (init mred proxy)
-      (init-rest args)
-      (inherit is-shown? get-mred queue-visible get-eventspace)
-      (define act-date/seconds 0)
-      (define act-date/milliseconds 0)
-      (define act-on? #f)
-      (define activate-refresh-wins null)
-      (define floating-window?
-        (and ((length args) . >= . style-pos)
-             (memq 'float (list-ref args style-pos))))
-      (public*
-       [on-exit (entry-point
-                 (lambda ()
-                   (and (is-shown?)
-                        (let ([mred (get-mred)])
-                          (and (and mred (as-exit (lambda () (send mred can-exit?))))
-                               (as-exit (lambda () (send mred on-exit))))))))])
-      (override*
-       [on-close (entry-point
-                  (lambda ()
-                    (let ([mred (get-mred)])
-                      (if mred
-                          (if (as-exit (lambda () (send mred can-close?)))
-                              (begin
-                                (as-exit (lambda () (send mred on-close)))
-                                (queue-visible)
-                                #t)
-                              #f)
-                          #t))))]
-       [on-activate (entry-point
-                     (lambda (on?)
-                       (set! act-on? on?)
-                       (when on?
-                         (set! act-date/seconds (current-seconds))
-                         (set! act-date/milliseconds (current-milliseconds))
-                         (when (and (wx:main-eventspace? (get-eventspace))
-                                    (not (eq? this root-menu-wx-frame))
-                                    (not floating-window?))
-                           (set! active-main-frame (make-weak-box this))
-                           (let ([cbs (reverse active-frame-callbacks)])
-                             (set! active-frame-callbacks null)
-                             (for ([cb (in-list cbs)]) (cb)))))
-                       ;; Send refresh to subwindows that need it
-                       (set! activate-refresh-wins (filter weak-box-value activate-refresh-wins))
-                       (for-each (lambda (b)
-                                   (let ([win (weak-box-value b)])
-                                     (when win
-                                       (send win refresh))))
-                                 activate-refresh-wins)
-                       ;; Windows needs trampoline:
-                       (queue-window-callback
-                        this
-                        (lambda () (send (get-mred) on-activate on?)))
-                       (as-exit
-                        (lambda ()
-                          (super on-activate on?)))))]
-       [display-changed
-        (λ () 
-          (send (get-mred) display-changed))])
-      (public*
-       [is-act-on? (lambda () act-on?)]
-       [add-activate-update (lambda (win) (set! activate-refresh-wins  
-                                                (cons (make-weak-box win)
-                                                      activate-refresh-wins)))]
-       [get-act-date/seconds (lambda () act-date/seconds)]
-       [get-act-date/milliseconds (lambda () act-date/milliseconds)])
-      (apply super-make-object mred proxy args)))
-
-  (define function-keys #hasheq((f1 . #t)
-				(f2 . #t)
-				(f3 . #t)
-				(f4 . #t)
-				(f5 . #t)
-				(f6 . #t)
-				(f7 . #t)
-				(f8 . #t)
-				(f9 . #t)
-				(f10 . #t)
-				(f11 . #t)
-				(f12 . #t)
-				(f13 . #t)
-				(f14 . #t)
-				(f15 . #t)
-				(f16 . #t)
-				(f17 . #t)
-				(f18 . #t)
-				(f19 . #t)
-				(f20 . #t)
-				(f21 . #t)
-				(f22 . #t)
-				(f23 . #t)
-				(f24 . #t)))
-
-  (define wx-frame%
-    (make-top-level-window-glue% 
-     6
-     (class (make-top-container% wx:frame% #f)
-       (init-rest args)
-       (define-values (menu-bar is-mdi-parent?)
-         (values #f #f))
-       (public*
-        [get-the-menu-bar (lambda () menu-bar)]
-        [get-mdi-parent (lambda () is-mdi-parent?)]
-        [set-mdi-parent (lambda (x) (and (set! is-mdi-parent? x) #t))])
-       (override*
-        [set-menu-bar
-         (lambda (mb)
-           (when mb (set! menu-bar mb))
-           (super set-menu-bar mb))]
-        [on-menu-command
-         (entry-point
-          (lambda (id)
-            (let ([wx (wx:id-to-menu-item id)])
-              (when wx
-                (do-command (wx->mred wx) (make-object wx:control-event% 'menu))))))]
-        [on-menu-click
-         (entry-point
-          (lambda ()
-            ;; Windows: no trampoline needed
-            (and menu-bar (send menu-bar on-demand))))]
-        [on-toolbar-click 
-         (entry-point
-          (lambda ()
-            (as-exit (lambda () (send (wx->mred this) on-toolbar-button-click)))))]
-        [on-mdi-activate
-         (entry-point
-          (lambda (on?)
-            (let ([mr (wx->mred this)])
-              (queue-window-callback
-               this
-               (lambda () (send mr on-mdi-activate on?))))))])
-       (public*
-        [handle-menu-key
-         (lambda (event)
-           (and menu-bar 
-                (send menu-bar all-enabled?)
-                ;; It can't be a menu event without a
-                ;; control, meta, alt key, or function key
-                (or (send event get-control-down)
-                    (send event get-meta-down)
-                    (send event get-alt-down)
-                    (hash-ref function-keys (send event get-key-code) #f))
-                (begin
-                  (send menu-bar on-demand)
-                  (send menu-bar handle-key event))))])
-       (apply super-make-object args))))
-
-  (define wx-dialog%
-    (make-top-level-window-glue% 
-     6
-     (class (make-top-container% wx:dialog% #t)
-       (init-rest args)
-       (apply super-make-object args)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxwindow.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxwindow.rkt
deleted file mode 100644
index 0d3a9dd575..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wxwindow.rkt
+++ /dev/null
@@ -1,256 +0,0 @@
-(module wxwindow racket/base
-  (require racket/class
-           (prefix-in wx: "kernel.rkt")
-           "te.rkt"
-           "lock.rkt"
-           "helper.rkt"
-           "const.rkt"
-           "wx.rkt")
-
-  (provide (protect-out wx-make-window%
-                        make-window-glue%))
-
-  (define wx-make-window%
-    (lambda (% top?)
-      (class %
-        (init-rest args)
-	(inherit is-shown-to-root? is-enabled-to-root?)
-        (define top-level #f)
-        (define focus? #f)
-        (define container this)
-        (define visible? #f)
-        (define active? #f)
-        (define skip-sub-events? #f)
-	(public*
-         [on-visible
-          (lambda ()
-            (let ([vis? (is-shown-to-root?)])
-              (unless (eq? vis? visible?)
-                (set! visible? vis?)
-                (unless skip-sub-events?
-                  (as-exit
-                   (lambda ()
-                     (send (wx->proxy this) on-superwindow-show vis?)))))))]
-         [queue-visible
-          (lambda ()
-            (parameterize ([wx:current-eventspace (send (get-top-level) get-eventspace)])
-              (wx:queue-callback (entry-point (lambda () (on-visible))) wx:middle-queue-key)))]
-         [skip-subwindow-events?
-          (case-lambda
-            [() skip-sub-events?]
-            [(skip?) (set! skip-sub-events? skip?)])])
-	(public*
-         [get-text-extent (lambda (s wb hb db ab font)
-                            (let-values ([(w h d a) (get-window-text-extent* s font #t)])
-                              (let ([set (lambda (b v)
-                                           (when b (set-box! b (inexact->exact (ceiling v)))))])
-                                (set wb w)
-                                (set hb h)
-                                (set db d)
-                                (set ab a))))]
-         [on-active
-          (lambda ()
-            (let ([act? (is-enabled-to-root?)])
-              (unless (eq? act? active?)
-                (set! active? act?)
-                (unless skip-sub-events?
-                  (as-exit
-                   (lambda ()
-                     (send (wx->proxy this) on-superwindow-enable act?)))))))]
-         [queue-active
-          (lambda ()
-            (parameterize ([wx:current-eventspace (send (get-top-level) get-eventspace)])
-              (wx:queue-callback (entry-point (lambda () (on-active))) wx:middle-queue-key)))]
-
-         ;; Needed for radio boxes:
-         [orig-enable
-          (lambda args (super-enable . args))])
-	(rename-super [super-enable enable])
-	
-        (define can-accept-drag? #f)
-        (define fake-shown? #f)
-
-	(public*
-         [accept-drag? (lambda () can-accept-drag?)]
-         [get-container (lambda () container)]
-         [set-container (lambda (c) (set! container c))]
-         [get-window (lambda () this)]
-         [tabbing-position (lambda (x y w h) (list this x y w h))]
-         [has-tabbing-children? (lambda () #f)]
-         [dx (lambda () 0)]
-         [dy (lambda () 0)]
-         [ext-dx (lambda () (dx))]
-         [ext-dy (lambda () (dy))]
-         [handles-key-code (lambda (x alpha? meta?) #f)]
-         [char-to (lambda () (void))]
-         [get-top-level
-          (lambda ()
-            (unless top-level
-              (let loop ([window this])
-                (cond
-                 [(or (is-a? window wx:frame%)
-                      (is-a? window wx:dialog%)) 
-                  (set! top-level window)]
-                 [else (loop (send window get-parent))])))
-            top-level)]
-         [ensure-forgotten
-          (lambda ()
-            ;; This value or its ancestor is going to be adopted elsewhere,
-            ;; so really forget it, make sure it's hidden, etc.
-            (send (get-top-level) forget-child this))])
-        (public*
-         [really-show
-          (lambda (on?)
-            (set! fake-shown? #f)
-            (super show on?))]
-         [fake-show
-          (lambda (on?)
-            (set! fake-shown? on?))])
-	(override*
-         [show
-          (lambda (on?)
-            (queue-visible)
-            (send (get-top-level) show-control this on?))]
-         [is-shown?
-          (lambda ()
-            (or fake-shown?
-                (super is-shown?)))]
-
-         [enable
-          (lambda (on?)
-            (queue-active)
-            (super enable on?))]
-
-         [drag-accept-files
-          (lambda (on?)
-            (set! can-accept-drag? (and on? #t))
-            (super drag-accept-files on?))]
-         [on-set-focus
-          (entry-point
-           (lambda ()
-             (send (get-top-level) set-focus-window this)
-             (set! focus? #t)
-             (as-exit (lambda () (super on-set-focus)))))]
-         [on-kill-focus
-          (entry-point
-           (lambda ()
-             (send (get-top-level) set-focus-window #f)
-             (set! focus? #f)
-             (as-exit (lambda () (super on-kill-focus)))))])
-	(public*
-         [has-focus? (lambda () focus?)])
-        (apply super-make-object args)
-        (unless top?
-          (set! visible? (is-shown-to-root?))
-          (set! active? (is-enabled-to-root?))))))
-
-  (define (make-window-glue% %)  ; implies make-glue%
-    (class (make-glue% %)
-      (init mred proxy)
-      (init-rest  args)
-      (inherit get-x get-y get-width get-height area-parent get-mred get-proxy skip-subwindow-events? get-parent)
-      (define/private (pre-wx->proxy orig-w e k)
-        ;; MacOS: w may not be something the user knows
-        ;; Look for a parent, and shift coordinates
-        (let loop ([w orig-w])
-          (if w
-              (if (is-a? w wx/proxy<%>)
-                  (if (eq? w orig-w)
-                      (k (wx->proxy w) e)
-                      (let ([bx (box (send e get-x))]
-                            [by (box (send e get-y))])
-                        (send orig-w client-to-screen bx by)
-                        (send w screen-to-client bx by)
-                        (let ([new-e (if (e . is-a? . wx:key-event%)
-                                         (instantiate wx:key-event% ()
-                                           [key-code (send e get-key-code)])
-                                         (instantiate wx:mouse-event% ()
-                                           [event-type (send e get-event-type)]
-                                           [left-down (send e get-left-down)]
-                                           [right-down (send e get-right-down)]
-                                           [middle-down (send e get-middle-down)]))])
-                          (when (e . is-a? . wx:key-event%)
-                            (send new-e set-key-release-code (send e get-key-release-code)))
-                          (send new-e set-time-stamp (send e get-time-stamp))
-                          (send new-e set-alt-down (send e get-alt-down))
-                          (send new-e set-control-down (send e get-control-down))
-                          (send new-e set-meta-down (send e get-meta-down))
-                          (send new-e set-shift-down (send e get-shift-down))
-                          (send new-e set-x (unbox bx))
-                          (send new-e set-y (unbox by))
-                          (k (wx->proxy w) new-e))))
-                  (loop (send w get-parent)))
-              #f)))
-      (define old-w -1)
-      (define old-h -1)
-      (define old-x -1)
-      (define old-y -1)
-      (define expose-focus? #t)
-      (public*
-       [set-no-expose-focus (lambda () (set! expose-focus? #f))])
-      (override*
-       [on-drop-file (entry-point
-                      (lambda (f)
-                        (as-exit
-                         (lambda ()
-                           (send (get-proxy) on-drop-file f)))))]
-       [queue-on-size
-        (lambda ()
-          (super queue-on-size)
-          (queue-window-callback
-           this
-           (entry-point
-            (lambda ()
-              (let ([mred (get-mred)])
-                (when mred 
-                  (let* ([w (get-width)]
-                         [h (get-height)])
-                    (when (not (and (= w old-w) (= h old-h)))
-                      (set! old-w w)
-                      (set! old-h h)
-                      (as-exit (lambda () (send mred on-size w h)))))
-                  (let* ([p (area-parent)]
-                         [x (max (- WIN-SIZE-MAX) (min WIN-SIZE-MAX (- (get-x) (or (and p (send p dx)) 0))))]
-                         [y (max (- WIN-SIZE-MAX) (min WIN-SIZE-MAX (- (get-y) (or (and p (send p dy)) 0))))])
-                    (when (not (and (= x old-x) (= y old-y)))
-                      (set! old-x x)
-                      (set! old-y y)
-                      (as-exit (lambda () (send mred on-move x y)))))))))))]
-       [on-set-focus (lambda () 
-                       (super on-set-focus)
-                       (when expose-focus? 
-                         (let ([p (get-proxy)])
-                           (send p on-focus #t)
-                           (on-subwindow-focus p #t))))]
-       [on-kill-focus (lambda () 
-                        (super on-kill-focus)
-                        (when expose-focus? 
-                          (let ([p (get-proxy)])
-                            (send p on-focus #f)
-                            (on-subwindow-focus p #f))))]
-       [pre-on-char (lambda (w e)
-                      (or (super pre-on-char w e)
-                          (if (skip-subwindow-events?)
-                              #f
-                              (as-entry
-                               (lambda ()
-                                 (pre-wx->proxy w e
-                                                (lambda (m e)
-                                                  (as-exit (lambda () 
-                                                             (send (get-proxy) on-subwindow-char m e))))))))))]
-       [pre-on-event (entry-point
-                      (lambda (w e)
-                        (if (skip-subwindow-events?)
-			    #f
-                            (pre-wx->proxy w e
-                                           (lambda (m e) 
-                                             (as-exit (lambda () 
-                                                        (send (get-proxy) on-subwindow-event m e))))))))])
-      (public*
-       [on-subwindow-focus (lambda (win on?)
-                             (unless (or (is-a? this wx:frame%)
-                                         (is-a? this wx:dialog%))
-                               (send (get-parent) on-subwindow-focus win on?))
-                             (unless (skip-subwindow-events?)
-                               (send (get-proxy) on-subwindow-focus win on?)))])
-      (apply super-make-object mred proxy args))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/aligned-pasteboard.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/aligned-pasteboard.rkt
deleted file mode 100644
index c88ff632dd..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/aligned-pasteboard.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-(module aligned-pasteboard mzscheme
-  (require
-    "private/aligned-pasteboard/aligned-pasteboard.rkt"
-    "private/aligned-pasteboard/aligned-editor-container.rkt"
-    "private/aligned-pasteboard/interface.rkt"
-    "private/aligned-pasteboard/stretchable-editor-snip.rkt")
-  (provide
-    vertical-pasteboard%
-    horizontal-pasteboard%
-    aligned-editor-snip%
-    aligned-editor-canvas%
-    aligned-pasteboard<%>
-    aligned-pasteboard-parent<%>
-    stretchable-snip<%>
-    stretchable-editor-snip%
-    stretchable-editor-snip-mixin))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/bitmap-label.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/bitmap-label.rkt
deleted file mode 100644
index 36b5e3df2d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/bitmap-label.rkt
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class
-         racket/contract)
-
-(provide/contract
- [make-bitmap-label (->* (string?
-                          (or/c path-string?
-                                (is-a?/c bitmap%)))
-                         ((is-a?/c font%))
-                         (is-a?/c bitmap%))]
- [bitmap-label-maker (-> string?
-                         (or/c path-string? (is-a?/c bitmap%))
-                         (-> any/c (is-a?/c bitmap%)))])
-
-(define (make-bitmap-label text filename-or-bitmap [font normal-control-font])
-  (define outside-margin 2)
-  (define-values (img-bitmap img-width img-height)
-    (let ([q (if (filename-or-bitmap . is-a? . bitmap%)
-                 filename-or-bitmap
-                 (make-object bitmap% filename-or-bitmap 'unknown/mask))])
-      (if (send q ok?)
-          (values q
-                  (send q get-width)
-                  (send q get-height))
-          (let* ([b (make-object bitmap% 1 1)]
-                 [bdc (make-object bitmap-dc% b)])
-            (send bdc clear)
-            (send bdc set-bitmap #f)
-            (values b 0 0)))))
-  (define-values (width height _1 _2) 
-    (let ([tmp-bitmap-dc (make-object bitmap-dc% (make-bitmap 1 1))])
-      (send tmp-bitmap-dc get-text-extent text font)))
-  (define middle-margin (if (and (zero? img-width)
-                                 (zero? img-height))
-                            0
-                            3))
-  (define new-width (inexact->exact
-                     (floor
-                      (+ outside-margin
-                         img-width
-                         middle-margin
-                         width
-                         outside-margin))))
-  (define new-height (inexact->exact
-                      (floor (+ outside-margin
-                                (max img-height height)
-                                outside-margin))))
-  
-  (define new-bitmap (make-screen-bitmap new-width new-height))
-  (define bitmap-dc (make-object bitmap-dc% new-bitmap))
-  (send bitmap-dc clear)
-  
-  (send bitmap-dc draw-bitmap
-        img-bitmap
-        outside-margin
-        (- (/ new-height 2) (/ img-height 2))
-        'solid
-        (send the-color-database find-color "black")
-        (send img-bitmap get-loaded-mask))
-  
-  (send bitmap-dc set-font font)
-  (send bitmap-dc draw-text text 
-        (+ outside-margin img-width middle-margin)
-        (- (/ new-height 2) (/ height 2)))
-  
-  (send bitmap-dc set-bitmap #f)
-  
-  new-bitmap)
-
-(define (bitmap-label-maker text filename-or-bitmap)
-  (let ([bm (make-bitmap-label text filename-or-bitmap)])
-    (lambda (area-container-window)
-      bm)))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/cache-image-snip.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/cache-image-snip.rkt
deleted file mode 100644
index 01582bc21d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/cache-image-snip.rkt
+++ /dev/null
@@ -1,849 +0,0 @@
-#lang racket/base
-  (require racket/draw
-           racket/snip
-           racket/class
-           racket/contract
-           racket/promise
-           (for-syntax racket/base)
-           mzlib/string)
-  
-  (provide cache-image-snip%
-           cache-image-snip-class%
-           snip-class
-
-           coerce-to-cache-image-snip
-           snip-size
-           bitmaps->cache-image-snip)
-           
-  ;; type argb = (make-argb (vectorof rational[between 0 & 255]) int int)
-  (define-struct argb (vector width height))
-  
-  #|
-
-    The true meaning of an image is a vector of rationals,
-    between 0 & 255, representing color and alpha channel
-    information. The vector's contents are analogous to
-    the last argument to the get-argb-pixels method. That is,
-    there are (* 4 w h) entries in the vector for an image
-    of width w and height h, and the entries represent the
-    alpha, red, green, & blue channels, resp.
-
-    When drawn to the screen, the rationals are rounded to
-    their nearest integer, but the true meaning is kept inside
-    the image.
-
-  note to self:
-    mask of zero means this image dominates
-    mask of 255 means this image contributes nothing
-
-    black is 0
-    white is 255
-
-    a cleared out bitmap is full of 255s (white)
-
-    an alpha of 1 means the pixel value is 0
-    an alpha of 0 means the pixel value is 255
- |#
-
-  (define cache-image-snip%
-    (class image-snip%
-      
-      ;; dc-proc : (union #f ((is-a?/c dc<%>) int[dx] int[dy] -> void))
-      ;; used for direct drawing
-      (init-field dc-proc)
-      (define/public (get-dc-proc) dc-proc)
-      
-      ;; argb-proc : ((vectorof rational[0 <= x <= 255]) int[dx] int[dy] -> void)
-      ;; used for drawing into a bitmap
-      (init-field argb-proc)
-      (define/public (get-argb-proc) argb-proc)
-      
-      ;; the pinhole's coordinates
-      (init-field px py)
-      (when (inexact? px)
-        (set! px (floor (inexact->exact px))))
-      (when (inexact? py)
-        (set! py (floor (inexact->exact py))))
-      (define/public (get-pinhole) (values px py))
-
-      (init-field (width #f)
-                  (height #f))
-      (define/public (get-size)
-        (values width height))
-      
-      ;; argb : (union #f argb)
-      (init-field [argb #f])
-
-      ;; bitmap : (union #f (is-a?/c bitmap%))
-      ;; the way that this image is be drawn, on its own
-      (define bitmap #f)
-      
-      (define/override (copy)
-        (new cache-image-snip% 
-             (dc-proc dc-proc)
-             (argb-proc argb-proc)
-             (width width)
-             (height height)
-             (argb argb)
-             (px px)
-             (py py)))
-      
-      ;; get-bitmap : -> bitmap or false
-      ;; returns a bitmap showing what the image would look like, 
-      ;; if it were drawn
-      (define/override (get-bitmap)
-        (cond
-          [(or (zero? width) (zero? height))
-           #f]
-          [else
-           (unless bitmap
-             (set! bitmap (argb->bitmap (get-argb))))
-           bitmap]))
-      
-      ;; get-argb : -> argb
-      (define/public (get-argb)
-        (unless argb
-          (set! argb (make-argb (make-vector (* 4 width height) 255) width height))
-          (argb-proc argb 0 0))
-        argb)
-      
-      ;; get-argb/no-compute : -> (union #f argb)
-      (define/public (get-argb/no-compute)
-        argb)
-      
-      (define/override (get-extent dc x y w h descent space lspace rspace)
-        (set-box/f! w width)
-        (set-box/f! h height)
-        (set-box/f! descent 0)
-        (set-box/f! space 0)
-        (set-box/f! lspace 0)
-        (set-box/f! rspace 0))
-      
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (cond
-          [argb 
-           (let ([bitmap (get-bitmap)])
-             (when bitmap
-               (send dc draw-bitmap bitmap x y 'solid 
-                     (send the-color-database find-color "black")
-                     (send bitmap get-loaded-mask))))]
-          [dc-proc 
-           (let ([smoothing (send dc get-smoothing)])
-             (send dc set-smoothing 'aligned)
-             (dc-proc dc x y)
-             (send dc set-smoothing smoothing))]
-          [else (void)]))
-      
-      (define/override (write f)
-        (let ([str (string->bytes/utf-8
-                    (format "~s"
-                            (list (argb-vector (get-argb))
-                                  width
-                                  height
-                                  px 
-                                  py)))])
-          (send f put str)))
-      
-      (define/override (get-num-scroll-steps) (inexact->exact (+ (floor (/ height 20)) 1)))
-      (define/override (find-scroll-step y) (inexact->exact (floor (/ y 20))))
-      (define/override (get-scroll-step-offset offset) (* offset 20))
-
-      (define/override (equal-to? snip recur)
-        (if (snip . is-a? . cache-image-snip%)
-            ;; Support extensions of cache-image-snip%:
-            (send snip other-equal-to? this recur)
-            ;; Use ths object's extension:
-            (other-equal-to? snip recur)))
-      (define/override (other-equal-to? snip recur)
-        (image=? this snip))
-      
-      (super-new)
-      (inherit set-snipclass)
-      (set-snipclass snip-class)))
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;; snip-class
-  ;;
-
-  (define cache-image-snip-class%
-    (class snip-class%
-      (define/override (read f)
-        (data->snip (read-from-string (send f get-bytes) (lambda () #f))))
-      (define/public (data->snip data)
-        (cond
-          [(not (list? data)) (make-null-cache-image-snip)]
-          [(= (length data) 4)
-           ;; this is the case for old save files
-           ;; if the width is zero, the height 
-           ;; will automatically also be zero
-           (let ([argb-vec (list-ref data 0)]
-                 [width (list-ref data 1)]
-                 [px (list-ref data 2)]
-                 [py (list-ref data 3)])
-             (argb->cache-image-snip (make-argb argb-vec
-                                                width 
-                                                (if (zero? width)
-                                                    0
-                                                    (/ (vector-length argb-vec) width 4)))
-                                     px 
-                                     py))]
-          [(= (length data) 5)
-           ;; this is the new saved data and it has the width and the height separately.
-           (let ([argb-vec (list-ref data 0)]
-                 [width (list-ref data 1)]
-                 [height (list-ref data 2)]
-                 [px (list-ref data 3)]
-                 [py (list-ref data 4)])
-             (argb->cache-image-snip (make-argb argb-vec width height) px py))]))
-      (super-new)))
-
-  (define snip-class (new cache-image-snip-class%))
-  (send snip-class set-version 1)
-  (send snip-class set-classname (format "~s" `(lib "cache-image-snip.ss" "mrlib")))
-  
-  ;; ***** WARNING: illegal activities **** -- MF 
-  (define the-drscheme-snip-class  (get-the-snip-class-list))
-  (send the-drscheme-snip-class add snip-class)
-  (provide the-drscheme-snip-class)
-  ;; ***** WARNING: illegal activities ****
-  
-  (define (make-null-cache-image-snip)
-    (define size 10)
-    (define (draw dc dx dy)
-      (with-pen/brush
-       dc
-       "black" 'solid
-       "black" 'transparent
-       (send dc draw-ellipse dx dy size size)
-       (send dc draw-line dx (+ dy size -1) (+ dx size -1) dy)))
-    (define bm (build-bitmap (lambda (dc) (draw dc 0 0))
-                             size
-                             size))
-    (new cache-image-snip%
-         (width size)
-         (height size)
-         (draw-proc draw)
-         (px (/ size 2))
-         (py (/ size 2))
-         (argb-proc 
-          (lambda (argb dx dy)
-            (overlay-bitmap argb size size dx dy bm bm)))))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;; image equality
-  ;;
-
-  (define size-dc (delay (make-object bitmap-dc% (make-object bitmap% 1 1))))
-  
-  (define (snip-size a)
-    (cond
-      [(is-a? a cache-image-snip%)
-       (send a get-size)]
-      [else
-       (let* ([dc (force size-dc)]
-              [wb (box 0)]
-              [hb (box 0)])
-         (send a get-extent dc 0 0 wb hb #f #f #f #f)
-         (values (unbox wb) 
-                 (unbox hb)))]))
-         
-  (define (image=? a-raw b-raw)
-    (let ([a (coerce-to-cache-image-snip a-raw)]
-          [b (coerce-to-cache-image-snip b-raw)])
-      (let-values ([(aw ah) (snip-size a)]
-                   [(bw bh) (snip-size b)]
-                   [(apx apy) (send a get-pinhole)]
-                   [(bpx bpy) (send b get-pinhole)])
-        (and (= aw bw)
-             (= ah bh)
-             (= apx bpx)
-             (= apy bpy)
-             (same/alpha? (argb-vector (send a get-argb))
-                          (argb-vector (send b get-argb)))))))
-  
-  (define (same/alpha? v1 v2)
-    (let loop ([i (vector-length v1)])
-      (or (zero? i)
-          (let ([a1 (vector-ref v1 (- i 4))]
-                [a2 (vector-ref v2 (- i 4))])
-            (and (or (= a1 a2 255)
-                     (and (= a1 a2)
-                          (= (vector-ref v1 (- i 3)) (vector-ref v2 (- i 3)))
-                          (= (vector-ref v1 (- i 2)) (vector-ref v2 (- i 2)))
-                          (= (vector-ref v1 (- i 1)) (vector-ref v2 (- i 1)))))
-                 (loop (- i 4)))))))
-  
-  (define image-snip-cache (make-weak-hasheq))
-  ;; coerce-to-cache-image-snip : image -> (is-a?/c cache-image-snip%)
-  (define (coerce-to-cache-image-snip snp)
-    (cond
-      [(is-a? snp cache-image-snip%) snp]
-      [(hash-ref image-snip-cache snp (λ () #f)) => values]
-      [(is-a? snp image-snip%)
-       (let* ([bmp (send snp get-bitmap)]
-              [cis
-               (if bmp
-                   (let ([bmp-mask (or (send bmp get-loaded-mask)
-                                       (send snp get-bitmap-mask)
-                                       (bitmap->mask bmp))])
-                     (bitmaps->cache-image-snip (copy-bitmap bmp)
-                                                (copy-bitmap bmp-mask)
-                                                (floor (/ (send bmp get-width) 2))
-                                                (floor (/ (send bmp get-height) 2))))
-                   (let-values ([(w h) (snip-size snp)])
-                     (let* ([bmp (make-object bitmap% 
-                                   (inexact->exact (floor w))
-                                   (inexact->exact (floor h)))]
-                            [bdc (make-object bitmap-dc% bmp)])
-                       (send bdc clear)
-                       (send snp draw bdc 0 0 0 0 w h 0 0 'no-caret)
-                       (send bdc set-bitmap #f)
-                       (bitmaps->cache-image-snip bmp 
-                                                  (bitmap->mask bmp)
-                                                  (floor (/ w 2))
-                                                  (floor (/ h 2))))))])
-         (hash-set! image-snip-cache snp cis)
-         cis)]
-      [else snp]))
-    
-  ;; copy-bitmap : bitmap -> bitmap
-  ;; does not copy the mask.
-  (define (copy-bitmap bitmap)
-    (let* ([w (send bitmap get-width)]
-           [h (send bitmap get-height)]
-           [copy (make-object bitmap% w h)]
-           [a-dc (make-object bitmap-dc% copy)])
-      (send a-dc clear)
-      (send a-dc draw-bitmap bitmap 0 0)
-      (send a-dc set-bitmap #f)
-      copy))
-  
-  ;; bitmap->mask : bitmap -> bitmap
-  (define (bitmap->mask bitmap)
-    (let* ([w (send bitmap get-width)]
-           [h (send bitmap get-height)]
-           [s (make-bytes (* 4 w h))]
-           [new-bitmap (make-object bitmap% w h)]
-           [dc (make-object bitmap-dc% new-bitmap)])
-      (send dc clear)
-      (send dc draw-bitmap bitmap 0 0)
-      (send dc get-argb-pixels 0 0 w h s)
-      (let loop ([i (* 4 w h)])
-        (unless (zero? i)
-          (let ([r (- i 3)]
-                [g (- i 2)]
-                [b (- i 1)])
-            (unless (and (eq? 255 (bytes-ref s r))
-                         (eq? 255 (bytes-ref s g))
-                         (eq? 255 (bytes-ref s b)))
-              (bytes-set! s r 0)
-              (bytes-set! s g 0)
-              (bytes-set! s b 0))
-            (loop (- i 4)))))
-      (send dc set-argb-pixels 0 0 w h s)
-      (begin0
-        (send dc get-bitmap)
-        (send dc set-bitmap #f))))
-  
-  (define (bitmaps->cache-image-snip color mask px py)
-    (let ([w (send color get-width)]
-          [h (send color get-height)])
-      (new cache-image-snip%
-           [width w]
-           [height h]
-           [dc-proc
-            (lambda (dc dx dy)
-              (send dc draw-bitmap color dx dy 'solid 
-                    (send the-color-database find-color "black")
-                    mask))]
-           [argb-proc
-            (lambda (argb-vector dx dy)
-              (overlay-bitmap argb-vector dx dy color mask))]
-           [px px]
-           [py py])))
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;; misc. utilities
-  ;;
-  
-  ;; takes a bitmap with a mask and flattens the colors and the mask
-  ;; drawing them as they would appear on the screen.
-  (define (flatten-bitmap bm)
-    (let* ([w (send bm get-width)]
-           [h (send bm get-height)]
-           [new-bm (make-object bitmap% w h)]
-           [bdc (make-object bitmap-dc% new-bm)])
-      (send bdc clear)
-      (send bdc draw-bitmap bm 0 0 'solid 
-            (send the-color-database find-color "black")
-            (send bm get-loaded-mask))
-      (send bdc set-bitmap #f)
-      new-bm))
-  
-  ;; build-bitmap : (dc -> void) number number -> bitmap
-  (define (build-bitmap draw w h)
-    (let* ([bm (make-object bitmap% w h)]
-           [bdc (make-object bitmap-dc% bm)])
-      (send bdc clear)
-      ; (send bdc set-smoothing 'aligned) ; causes image-inside? to fail in test suite.
-      (draw bdc)
-      (send bdc set-bitmap #f)
-      bm))
-
-  (define-syntax (with-pen/brush stx)
-    (syntax-case stx ()
-      [(_ dc pen-color pen-style brush-color brush-style code ...)
-       (syntax
-        (let ([old-pen (send dc get-pen)]
-              [old-brush (send dc get-brush)])
-          (send dc set-pen (send the-pen-list find-or-create-pen pen-color 1 pen-style))
-          (send dc set-brush (send the-brush-list find-or-create-brush brush-color brush-style))
-          code ...
-          (send dc set-pen old-pen)
-          (send dc set-brush old-brush)))]))
-  
-  (define (set-box/f! b v) (when (box? b) (set-box! b v)))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;; argb vector utilties
-  ;;
-  
-  ;; argb->cache-image-snip : argb number number -> cache-image-snip
-  (define (argb->cache-image-snip argb px py)
-    (let* ([width (argb-width argb)]
-           [height (argb-height argb)]
-           [argb-vector (argb-vector argb)]
-           [bitmap (argb->bitmap argb)]
-           [mask (and bitmap (send bitmap get-loaded-mask))])
-      (new cache-image-snip%
-           (width width)
-           (height height)
-           (argb argb)
-           (px px)
-           (py py)
-           (argb-proc (if (or (zero? width) (zero? height))
-                          void
-                          (lambda (argb dx dy) (overlay-bitmap argb dx dy bitmap mask))))
-           (dc-proc (if (or (zero? width) (zero? height))
-                        void
-                        (lambda (dc dx dy)
-                          (send dc draw-bitmap bitmap dx dy 'solid 
-                                (send the-color-database find-color "black")
-                                mask)))))))
-  
-  ;; argb-vector->bitmap : argb -> bitmap or false
-  ;; flattens the argb vector into a bitmap
-  (define (argb->bitmap argb)
-    (let* ([argb-vector (argb-vector argb)]
-           [w (argb-width argb)]
-           [h (argb-height argb)])
-      (cond
-        [(or (zero? w) (zero? h)) #f]
-        [else
-         (let* ([bm (make-object bitmap% w h)]
-                [mask-bm (make-object bitmap% w h)]
-                [bdc (new bitmap-dc% (bitmap bm))]
-                [bytes (make-bytes (vector-length argb-vector) 255)]
-                [mask-bytes (make-bytes (vector-length argb-vector) 255)])
-           (let loop ([i (- (vector-length argb-vector) 1)])
-             (cond
-               [(zero? (modulo i 4))
-                (let ([av (round (vector-ref argb-vector i))])
-                  (bytes-set! mask-bytes (+ i 1) av)
-                  (bytes-set! mask-bytes (+ i 2) av)
-                  (bytes-set! mask-bytes (+ i 3) av))]
-               [else
-                (bytes-set! bytes i (round (vector-ref argb-vector i)))])
-             (unless (zero? i)
-               (loop (- i 1))))
-           (send bdc set-argb-pixels 0 0 w h bytes)
-           (send bdc set-bitmap mask-bm)
-           (send bdc set-argb-pixels 0 0 w h mask-bytes)
-           (send bdc set-bitmap #f)
-           (send bm set-loaded-mask mask-bm)
-           bm)])))
-  
-  ;; overlay-bitmap : argb int int bitmap bitmap -> void
-  ;; assumes that the mask bitmap only has greyscale in it
-  ;; (ie, that looking at the red component of the mask is enough)
-  (define (overlay-bitmap argb dx dy color mask)
-    (let* ([argb-vector (argb-vector argb)]
-           [argb-w (argb-width argb)]
-           [w (send color get-width)]
-           [h (send color get-height)]
-           [color-bytes (make-bytes (* w h 4) 0)]
-           [mask-bytes (make-bytes (* w h 4) 0)]
-           [dc (make-object bitmap-dc%)])
-      (send dc set-bitmap color)
-      (send dc get-argb-pixels 0 0 w h color-bytes)
-      (send dc set-bitmap #f) ;; in case mask and color are the same bitmap....
-      (send dc set-bitmap mask)
-      (send dc get-argb-pixels 0 0 w h mask-bytes)
-      (send dc set-bitmap #f)
-      (let yloop ([y 0]
-                  [str-i 0])
-        (unless (= y h)
-          (let xloop ([x 0]
-                      [str-i str-i])
-            (if (= x w)
-                (yloop (add1 y) str-i)
-                (begin
-                  (when (and (<= 0 (+ x dx))
-                             (< (+ x dx) argb-w))
-                    (let ([argb-i (* 4 (+ (+ dx x) (* (+ dy y) argb-w)))])
-                      (when (and (<= 0 argb-i)
-                                 (< argb-i (vector-length argb-vector)))
-                        (let* ([m1 (vector-ref argb-vector argb-i)]
-                               [m2 (bytes-ref mask-bytes (+ str-i 1))] ;; get red coordinate
-                               [m3 (build-m3 m1 m2)]
-			       [bang (lambda (i v) (vector-set! argb-vector i (floor v)))]
-                               [do-b
-                                (lambda (off)
-                                  (bang (+ argb-i off)
-					(build-b3 m1
-						  (vector-ref argb-vector (+ argb-i off))
-						  m2
-						  (bytes-ref color-bytes (+ str-i off))
-						  m3)))])
-                          (bang argb-i m3)
-                          (do-b 1)
-                          (do-b 2)
-                          (do-b 3)))))
-                  (xloop (+ x 1) (+ str-i 4)))))))))
-  
-#|
-From Matthew's computation in PR 6930:
-> m3 is (m1+m2-m1*m2) and 
-> b3 is (m1*b1*(1-m2) + m2*b2)/m3
-
-but that's for values between 0 and 1 and we
-need values between 0 and 255. Worse, the values
-sense are reversed. That is,
-1 above corresponds to 0 in pixel values and
-0 above corresponds to 255.
-
-;; the spec
-(define (build-m3-0 big-m1 big-m2)
-  (let ([m1 (- 1 (/ big-m1 255))]
-        [m2 (- 1 (/ big-m2 255))])
-    (let ([m3 (+ m1 m2 (- (* m1 m2)))])
-      (* 255 (- 1 m3)))))
-
-; = substitute in lets
-(define (build-m3-1 m1 m2)
-  (* 255 (- 1 (+ (- 1 (/ m1 255))
-                 (- 1 (/ m2 255))
-                 (- (* (- 1 (/ m1 255))
-                       (- 1 (/ m2 255))))))))
-
-;= multiply out last product
-(define (build-m3-2 m1 m2)
-  (* 255 (- 1 (+ (- 1 (/ m1 255))
-                 (- 1 (/ m2 255))
-                 (- (+ 1 
-                       (- (/ m1 255))
-                       (- (/ m2 255))
-                       (* (- (/ m1 255)) (- (/ m2 255)))))))))
-
-; = lift out the neagtives into topmost sum
-(define (build-m3-3 m1 m2)
-  (* 255 (- 1 (+ (- (/ m1 255))
-                 1
-                 (- (/ m2 255))
-                 1
-                 -1
-                 (/ m1 255)
-                 (/ m2 255)
-                 (- (* (/ m1 255) (/ m2 255)))))))
-
-; = push in topmost subtraction
-(define (build-m3-4 m1 m2)
-  (* 255 (+ 1
-            (/ m1 255)
-            -1
-            (/ m2 255)
-            -1
-            1
-            (- (/ m1 255))
-            (- (/ m2 255))
-            (* (/ m1 255) (/ m2 255)))))
-
-; = simplify sum:
-
-(define (build-m3-5 m1 m2)
-  (* 255 (* (/ m1 255) (/ m2 255))))
-
-; = distribute 255
-
-(define (build-m3-6 m1 m2) (* m1 m2 1/255))
-
-(define (test-m3 m1 m2)
-  (values (build-m3-0 m1 m2)
-          (build-m3-1 m1 m2)
-          (build-m3-2 m1 m2)
-          (build-m3-3 m1 m2)
-          (build-m3-4 m1 m2)
-          (build-m3-5 m1 m2)
-          (build-m3-6 m1 m2)))
-
-(test-m3 0 0)
-(test-m3 255 255)
-(test-m3 100 200)
-
-for b3, we have:
-
-(define (build-m3-6 m1 m2) (* m1 m2 1/255))
-
-;; the spec
-(define (build-b3-0 big-m1 big-b1 big-m2 big-b2 big-m3)
-  (let ([m1 (- 1 (/ big-m1 255))]
-        [b1 (- 1 (/ big-b1 255))]
-        [m2 (- 1 (/ big-m2 255))]
-        [b2 (- 1 (/ big-b2 255))]
-        [m3 (- 1 (/ big-m3 255))])
-    (let ([ans (/ (+ (* m1 b1 (- 1 m2)) (* m2 b2)) m3)])
-      (* 255 (- 1 ans)))))
-
-;; = substitute in for let.
-(define (build-b3-1 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (+ (* (- 1 (/ m1 255)) (- 1 (/ b1 255)) (- 1 (- 1 (/ m2 255)))) 
-                    (* (- 1 (/ m2 255)) (- 1 (/ b2 255))))
-                 (- 1 (/ m3 255))))))
-
-;; = simple substitution
-(define (build-b3-2 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (+ (* (- 1 (/ m1 255)) (- 1 (/ b1 255)) (/ m2 255))
-                    (* (- 1 (/ m2 255)) (- 1 (/ b2 255))))
-                 (- 1 (/ m3 255))))))
-
-;; = multiply out first part of first *
-(define (build-b3-3 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (+ (* (+ 1
-                          (- (/ m1 255))
-                          (- (/ b1 255))
-                          (* (/ m1 255) (/ b1 255))) 
-                       (/ m2 255))
-                    (* (- 1 (/ m2 255)) (- 1 (/ b2 255))))
-                 (- 1 (/ m3 255))))))
-
-;; = distribute out newly created product 
-(define (build-b3-4 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (+ (/ m2 255)
-                    (* (- (/ m1 255)) (/ m2 255))
-                    (* (- (/ b1 255)) (/ m2 255))
-                    (* (/ m1 255) (/ b1 255) (/ m2 255))
-                    (* (- 1 (/ m2 255)) (- 1 (/ b2 255))))
-                 (- 1 (/ m3 255))))))
-
-;; = multiply out product of sum
-(define (build-b3-5 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (+ (/ m2 255)
-                    (* (- (/ m1 255)) (/ m2 255))
-                    (* (- (/ b1 255)) (/ m2 255))
-                    (* (/ m1 255) (/ b1 255) (/ m2 255))
-                    (+ 1
-                       (- (/ m2 255))
-                       (- (/ b2 255))
-                       (* (/ m2 255) (/ b2 255))))
-                 (- 1 (/ m3 255))))))
-
-;; = flatten out sum of sum & simplify
-(define (build-b3-6 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (+ (* (- (/ m1 255)) (/ m2 255))
-                    (* (- (/ b1 255)) (/ m2 255))
-                    (* (/ m1 255) (/ b1 255) (/ m2 255))
-                    1
-                    (- (/ b2 255))
-                    (* (/ m2 255) (/ b2 255)))
-                 (- 1 (/ m3 255))))))
-
-;; = rearrange denom
-(define (build-b3-7 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (+ (* (- (/ m1 255)) (/ m2 255))
-                    (* (- (/ b1 255)) (/ m2 255))
-                    (* (/ m1 255) (/ b1 255) (/ m2 255))
-                    1
-                    (- (/ b2 255))
-                    (* (/ m2 255) (/ b2 255)))
-                 (/ (- 255 m3) 255)))))
-
-;; = move 255 to numerator
-(define (build-b3-8 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (* 255 (+ (* (- (/ m1 255)) (/ m2 255))
-                           (* (- (/ b1 255)) (/ m2 255))
-                           (* (/ m1 255) (/ b1 255) (/ m2 255))
-                           1
-                           (- (/ b2 255))
-                           (* (/ m2 255) (/ b2 255))))
-                 (- 255 m3)))))
-
-;; cancel out 255s in numerator
-(define (build-b3-9 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (+ (* (- m1) (/ m2 255))
-                    (* (- b1) (/ m2 255))
-                    (* m1 (/ b1 255) (/ m2 255))
-                    255
-                    (- b2)
-                    (* m2 (/ b2 255)))
-                 (- 255 m3)))))
-
-;; rearrange numerator
-(define (build-b3-10 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (+ (/ (* (- m1) m2) 255)
-                    (/ (* (- b1) m2) 255)
-                    (/ (* m1 b1 (/ m2 255)) 255)
-                    (/ (* 255 255) 255)
-                    (/ (* 255 (- b2)) 255)
-                    (/ (* m2 b2) 255))
-                 (- 255 m3)))))
-
-;; pull out 255 in num
-(define (build-b3-11 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (/ (+ (* (- m1) m2)
-                       (* (- b1) m2)
-                       (* m1 b1 (/ m2 255))
-                       (* 255 255)
-                       (* 255 (- b2))
-                       (* m2 b2))
-                    255)
-                 (- 255 m3)))))
-
-;; push 255 into denom
-(define (build-b3-12 m1 b1 m2 b2 m3)
-  (* 255 (- 1 (/ (+ (* (- m1) m2)
-                    (* (- b1) m2)
-                    (* m1 b1 (/ m2 255))
-                    (* 255 255)
-                    (* 255 (- b2))
-                    (* m2 b2))
-                 (* 255 (- 255 m3))))))
-
-;; turn 1 into (/ (* 255 (- 255 m3)) (* 255 (- 255 m3)))
-;; and add into numerator
-(define (build-b3-13 m1 b1 m2 b2 m3)
-  (* 255 (/ (- (* 255 (- 255 m3))
-               (+ (* (- m1) m2)
-                  (* (- b1) m2)
-                  (* m1 b1 (/ m2 255))
-                  (* 255 255)
-                  (* 255 (- b2))
-                  (* m2 b2)))
-            (* 255 (- 255 m3)))))
-
-;; cancel out outer 255
-(define (build-b3-14 m1 b1 m2 b2 m3)
-  (/ (- (* 255 (- 255 m3))
-        (+ (* (- m1) m2)
-           (* (- b1) m2)
-           (* m1 b1 (/ m2 255))
-           (* 255 255)
-           (* 255 (- b2))
-           (* m2 b2)))
-     (- 255 m3)))
-
-;; push negative thru to make big sum in numerator
-(define (build-b3-15 m1 b1 m2 b2 m3)
-  (/ (+ (* 255 (- 255 m3))
-        (* m1 m2)
-        (* b1 m2)
-        (- (* m1 b1 (/ m2 255)))
-        (- (* 255 255))
-        (* 255 b2)
-        (- (* m2 b2)))
-     (- 255 m3)))
-
-;; distribute 255 in first num term
-(define (build-b3-16 m1 b1 m2 b2 m3)
-  (/ (+ (* 255 255)
-        (- (* 255 m3))
-        (* m1 m2)
-        (* b1 m2)
-        (- (* m1 b1 (/ m2 255)))
-        (- (* 255 255))
-        (* 255 b2)
-        (- (* m2 b2)))
-     (- 255 m3)))
-
-;; simplify num
-(define (build-b3-17 m1 b1 m2 b2 m3)
-  (/ (+ (* m1 m2)
-        (* b1 m2)
-        (- (* m2 b2))
-        (- (* m1 b1 m2 1/255))
-        (* 255 b2)
-        (- (* 255 m3)))
-     (- 255 m3)))
-
-;; simplify num, some more
-(define (build-b3-18 m1 b1 m2 b2 m3)
-  (/ (+ (* (+ m1 b1 (- b2)) m2) 
-        (* m1 b1 m2 -1/255)
-        (* 255 b2)
-        (* -255 m3))
-     (- 255 m3)))
-
-(define (test-b3 m1 b1 m2 b2)
-  (let ([m3 (build-m3-6 m1 m2)])
-    (values (build-b3-0 m1 b1 m2 b2 m3)
-            (build-b3-1 m1 b1 m2 b2 m3)
-            (build-b3-2 m1 b1 m2 b2 m3)
-            (build-b3-3 m1 b1 m2 b2 m3)
-            (build-b3-4 m1 b1 m2 b2 m3)
-            (build-b3-5 m1 b1 m2 b2 m3)
-            (build-b3-6 m1 b1 m2 b2 m3)
-            (build-b3-7 m1 b1 m2 b2 m3)
-            (build-b3-8 m1 b1 m2 b2 m3)
-            (build-b3-9 m1 b1 m2 b2 m3)
-            (build-b3-10 m1 b1 m2 b2 m3)
-            (build-b3-11 m1 b1 m2 b2 m3)
-            (build-b3-12 m1 b1 m2 b2 m3)
-            (build-b3-13 m1 b1 m2 b2 m3)
-            (build-b3-14 m1 b1 m2 b2 m3)
-            (build-b3-15 m1 b1 m2 b2 m3)
-            (build-b3-16 m1 b1 m2 b2 m3)
-            (build-b3-17 m1 b1 m2 b2 m3)
-            (build-b3-18 m1 b1 m2 b2 m3)
-            )))
-
-(test-b3 255 100 0 250)
-(test-b3 0 150 255 100)
-(test-b3 100 200 75 150)
-
-
-|#
-  
-  (define (build-m3 m1 m2) (* m1 m2 1/255))
-  
-  (define (build-b3 m1 b1 m2 b2 m3)
-    (if (= m3 255)
-        0
-        (/ (+ (* (+ m1 b1 (- b2)) m2) 
-              (* m1 b1 m2 -1/255)
-              (* 255 b2)
-              (* -255 m3))
-           (- 255 m3))))
-
-  (define bitmap-size/c (and/c integer? exact? (between/c 1 10000)))
-  
-  (provide/contract
-   [overlay-bitmap (argb? exact-integer?
-                          exact-integer?
-                          (is-a?/c bitmap%)
-                          (is-a?/c bitmap%)
-                          . -> .
-                          any)]
-   [build-bitmap (((is-a?/c dc<%>) . -> . any) bitmap-size/c bitmap-size/c . -> . (is-a?/c bitmap%))]
-   [flatten-bitmap ((is-a?/c bitmap%) . -> . (is-a?/c bitmap%))]
-
-   [argb->cache-image-snip (argb? number? number? . -> . (is-a?/c cache-image-snip%))]
-   [argb->bitmap (argb? . -> . (or/c #f (is-a?/c bitmap%)))]
-           
-   [argb? (any/c . -> . boolean?)]
-   [make-argb ((vectorof byte?) exact-nonnegative-integer? exact-nonnegative-integer? . -> . argb?)]
-   [argb-vector (argb? . -> . (vectorof byte?))]
-   [argb-width (argb? . -> . exact-nonnegative-integer?)]
-   [argb-height (argb? . -> . exact-nonnegative-integer?)])
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/click-forwarding-editor.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/click-forwarding-editor.rkt
deleted file mode 100644
index 5b7a653824..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/click-forwarding-editor.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-(module click-forwarding-editor mzscheme
-  
-  (require
-   mzlib/class
-   mzlib/contract
-   mzlib/etc
-   mred)
-  
-  (provide/contract
-   (click-forwarding-editor-mixin mixin-contract))
-  
-  ;; mixin to forward clicks to children snips within the editor
-  (define (click-forwarding-editor-mixin super%)
-    (class super%
-      (inherit get-snip-location global-to-local local-to-global
-               find-snip get-dc set-caret-owner)
-      
-      ;; on-event ((is-a?/c mouse-event%) . -> . void?)
-      ;; overridden to give focus to child snips when clicked
-      (define/override (on-event event)
-        (if (memq (send event get-event-type)
-                  '(left-down left-up middle-down middle-up right-down right-up))
-            (let ([snip (find-snip/global (send event get-x) (send event get-y))])
-              (if (is-a? snip snip%)
-                  (forward-event snip event)
-                  (super on-event event)))
-            (super on-event event)))
-      
-      ;; forward-event ((is-a?/c snip%) (is-a?/c mouse-event%) . -> . void?)
-      ;; send the event to the snip
-      (define/private (forward-event snip event)
-        (let ([editorx (box 0)]
-              [editory (box 0)])
-          (get-snip-location snip editorx editory false)
-          (let ([x (box (unbox editorx))]
-                [y (box (unbox editory))])
-            (local-to-global x y)
-            (send snip on-event (get-dc) (unbox x) (unbox y)
-                  (unbox editorx) (unbox editory) event)
-            (set-caret-owner snip 'display))))
-      
-      ;; find-snip/global (number? number? . -> . (union (is-a?/c snip%) false?))
-      ;; finds the snip in the pasteboard that is at x y in the global display
-      (define/private (find-snip/global x y)
-        (let ([new-x (box x)]
-              [new-y (box y)])
-          (global-to-local new-x new-y)
-          (cond
-            [(is-a? this text%)
-             (let ([pos (send this find-position (unbox new-x) (unbox new-y))])
-               (find-snip pos 'after-or-none))]
-            [(is-a? this pasteboard%)
-             (find-snip (unbox new-x) (unbox new-y))])))
-      
-      (super-instantiate ())
-      ))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/close-icon.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/close-icon.rkt
deleted file mode 100644
index b0a4bdabc2..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/close-icon.rkt
+++ /dev/null
@@ -1,96 +0,0 @@
-#lang scheme/base
-(require scheme/gui/base
-         scheme/class
-         scheme/runtime-path
-         (for-syntax scheme/base))
-(provide close-icon%)
-
-(define-runtime-path icon-path '(lib "close.png" "icons"))
-  
-(define icon 'icon-not-yet-init)
-
-(define (init-icon)
-  (when (symbol? icon)
-    (set! icon (read-bitmap icon-path #:try-@2x? #t))))
-
-(define close-icon%
-  (class canvas%
-    (inherit get-dc min-width min-height stretchable-width stretchable-height
-             get-client-size refresh)
-    (init-field [callback void]
-                [bg-color #f])
-    (init [horizontal-pad 4]
-          [vertical-pad 4])
-    (init-icon)
-    
-    (define mouse-in? #f)
-    (define mouse-down? #f)
-    
-    (define/override (on-event evt)
-      (cond
-        [(send evt leaving?)
-         (set! mouse-in? #f)
-         (refresh)]
-        [(send evt entering?)
-         (set! mouse-in? #t)
-         (refresh)]
-        [(send evt button-down?)
-         (set! mouse-down? #t)
-         (refresh)]
-        [(send evt button-up?)
-         (set! mouse-down? #f)
-         (refresh)
-         (when mouse-in? 
-           (callback))]
-        [(send evt moving?)
-         (let ([new-mouse-in?
-                (and (<= 0
-                         (send evt get-x)
-                         (send icon get-width))
-                     (<= 0
-                         (send evt get-y)
-                         (send icon get-height)))])
-           (unless (equal? new-mouse-in? mouse-in?)
-             (set! mouse-in? new-mouse-in?)
-             (refresh)))]))
-    
-    (define/override (on-paint)
-      (let ([dc (get-dc)])
-        (let-values ([(cw ch) (get-client-size)])
-          (when bg-color
-            (send dc set-brush bg-color 'solid)
-            (send dc set-pen bg-color 1 'transparent)
-            (let-values ([(w h) (get-client-size)])
-              (send dc draw-rectangle 0 0 w h)))
-          (send dc set-alpha (cond
-                              [(and mouse-in?
-                                    mouse-down?)
-                               0.5]
-                              [(and mouse-in?
-                                    (not mouse-down?))
-                               0.75]
-                              [else
-                               1]))
-          (send dc draw-bitmap icon 
-                (- (/ cw 2) (/ (send icon get-width) 2))
-                (- (/ ch 2) (/ (send icon get-height) 2))
-                'solid
-                (send the-color-database find-color "black")))))
-
-    (define/override (on-superwindow-show on?)
-      (unless on?
-        (set! mouse-in? #f)
-        (set! mouse-down? #f)))
-    
-    (super-new [style '(transparent no-focus)])
-    (min-width (+ horizontal-pad horizontal-pad (send icon get-width)))
-    (min-height (+ vertical-pad vertical-pad (send icon get-height)))
-    (stretchable-width #f)
-    (stretchable-height #f)))
-
-#;
-(begin
-  (define f (new frame% [label "test"]))
-  (define c (new close-icon% [parent f] [callback (λ () (printf "hi\n"))]))
-  (define gb (new grow-box-spacer-pane% [parent f]))
-  (send f show #t))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/gif.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/gif.rkt
deleted file mode 100644
index 895c7596ed..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/gif.rkt
+++ /dev/null
@@ -1,96 +0,0 @@
-#lang racket/base
-
-;; A library for creating gifs out of bitmap%s
-
-(require racket/gui/base
-         racket/class
-         racket/list
-         net/gifwrite
-         racket/contract)
-
-(provide write-gif)
-
-(define (force-bm bm) (if (procedure? bm) (bm) bm))
-
-(define (split-bytes b len offset)
-  (if (= offset (bytes-length b))
-      null
-      (cons (subbytes b offset (+ offset len))
-            (split-bytes b len (+ offset len)))))
-
-(define (write-gifs bms delay filename one-at-a-time? last-frame-delay loop? disposal)
-  (let* ([init (force-bm (car bms))]
-         [w (send init get-width)]
-         [h (send init get-height)])
-    (let ([argb-thunks
-           (map (lambda (bm)
-                  (lambda ()
-                    (let ([bm (force-bm bm)]
-                          [argb (make-bytes (* w h 4) 255)])
-                      (send bm get-argb-pixels 0 0 w h argb)
-                      (let ([mask (send bm get-loaded-mask)])
-                        (when mask
-                          (send mask get-argb-pixels 0 0 w h argb #t)))
-                      argb)))
-                (cons init (cdr bms)))])
-      (if one-at-a-time?
-          ;; Quantize individually, and stream the images through
-          (call-with-output-file*
-           filename
-           (lambda (p)
-             (let* ([gif (gif-start p w h 0 #f)])
-               (when loop?
-                 (gif-add-loop-control gif 0))
-               (let ([last-argb-thunk (last argb-thunks)])
-                 (for-each (lambda (argb-thunk)
-                             (let-values ([(pixels colormap transparent)
-                                           (quantize (argb-thunk))])
-                               (when (or transparent delay)
-                                 (gif-add-control gif disposal #f (or delay 0) transparent))
-                               (gif-add-image gif 0 0 w h #f colormap pixels)
-                               (when (and last-frame-delay (eq? argb-thunk last-argb-thunk))
-                                 (gif-add-control gif disposal #f last-frame-delay transparent)
-                                 (gif-add-image gif 0 0 w h #f colormap pixels))))
-                           argb-thunks))
-               (gif-end gif))))
-          ;; Build images and quantize all at once:
-          (let-values ([(pixels colormap transparent)
-                        (quantize (apply bytes-append (map (lambda (t) (t)) argb-thunks)))])
-            (call-with-output-file*
-             filename
-             (lambda (p)
-               (let* ([gif (gif-start p w h 0 colormap)])
-                 (when delay
-                   (gif-add-loop-control gif 0))
-                 (let* ([pixelss (split-bytes pixels (* w h) 0)]
-                        [last-pixels (last pixelss)])
-                   (for-each (lambda (pixels)
-                               (when (or transparent delay)
-                                 (gif-add-control gif 'any #f (or delay 0) transparent))
-                               (gif-add-image gif 0 0 w h #f #f pixels)
-                               (when (and last-frame-delay (eq? pixels last-pixels))
-                                 (gif-add-control gif disposal #f last-frame-delay transparent)
-                                 (gif-add-image gif 0 0 w h #f colormap pixels)))
-                             pixelss))
-                 (gif-end gif)))))))))
-
-(define (write-gif bm filename)
-  (write-gifs (list bm) #f filename #f #f #f))
-
-(provide/contract
- [write-animated-gif
-  (->i ((bms (and/c (listof (or/c (is-a?/c bitmap%) (-> (is-a?/c bitmap%)))) pair?))
-        (delay (integer-in 0 4294967295))
-        (filename (or/c path? string?)))
-       (#:one-at-a-time? (one-at-a-time? any/c)
-        #:last-frame-delay (last-frame-delay (or/c (integer-in 0 4294967295) false/c))
-        #:loop? (Loop? (delay) (lambda (x) (and delay #t)))
-        #:disposal (disposal (or/c 'any 'keep 'restore-bg 'restore-prev)))
-       any)])
-
-(define (write-animated-gif bms delay filename
-                            #:one-at-a-time? [one-at-a-time? #f]
-                            #:last-frame-delay [last-frame-delay #f]
-                            #:loop? [loop? (and delay #t)]
-                            #:disposal [disposal 'any])
-  (write-gifs bms delay filename one-at-a-time? last-frame-delay loop? disposal))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/graph.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/graph.rkt
deleted file mode 100644
index 82c363e8c4..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/graph.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         racket/class
-         racket/gui/base
-         "private/dot.rkt" 
-         "private/graph.rkt")
-
-(provide
- (contract-out
-  [dot-positioning (->* ((is-a?/c pasteboard%)) 
-                        ((or/c dot-label neato-label neato-hier-label neato-ipsep-label)
-                         boolean?)
-                        void?)]
-  [find-dot (->* () (boolean?) (or/c path? #f))]))
-
-(provide dot-label neato-label neato-hier-label neato-ipsep-label)
-
-(provide graph-snip<%>
-         graph-snip-mixin
-         graph-pasteboard<%>
-         graph-pasteboard-mixin)
-
-(provide
- (contract-out
-  [add-links
-   (case->
-    (-> (is-a?/c graph-snip<%>) (is-a?/c graph-snip<%>) void?)
-    (-> (is-a?/c graph-snip<%>)
-        (is-a?/c graph-snip<%>)
-        (or/c #f (is-a?/c pen%))
-        (or/c #f (is-a?/c pen%))
-        (or/c #f (is-a?/c brush%))
-        (or/c #f (is-a?/c brush%))
-        void?)
-    (-> (is-a?/c graph-snip<%>)
-        (is-a?/c graph-snip<%>)
-        (or/c #f (is-a?/c pen%))
-        (or/c #f (is-a?/c pen%))
-        (or/c #f (is-a?/c brush%))
-        (or/c #f (is-a?/c brush%))
-        (or/c #f string?)
-        void?)
-    (-> (is-a?/c graph-snip<%>)
-        (is-a?/c graph-snip<%>)
-        (or/c #f (is-a?/c pen%))
-        (or/c #f (is-a?/c pen%))
-        (or/c #f (is-a?/c brush%))
-        (or/c #f (is-a?/c brush%))
-        number?
-        number?
-        void?)
-    (-> (is-a?/c graph-snip<%>)
-        (is-a?/c graph-snip<%>)
-        (or/c #f (is-a?/c pen%))
-        (or/c #f (is-a?/c pen%))
-        (or/c #f (is-a?/c brush%))
-        (or/c #f (is-a?/c brush%))
-        number?
-        number?
-        (or/c #f string?)
-        void?))]
-  [add-links/text-colors
-   (-> (is-a?/c graph-snip<%>)
-       (is-a?/c graph-snip<%>)
-       (or/c #f (is-a?/c pen%))
-       (or/c #f (is-a?/c pen%))
-       (or/c #f (is-a?/c brush%))
-       (or/c #f (is-a?/c brush%))
-       (or/c #f (is-a?/c color%))
-       (or/c #f (is-a?/c color%))
-       number?
-       number?
-       (or/c #f string?)
-       void?)]
-  [remove-links
-   (-> (is-a?/c graph-snip<%>)
-       (is-a?/c graph-snip<%>)
-       void?)]
-  [set-link-label
-   (-> (is-a?/c graph-snip<%>)
-       (is-a?/c graph-snip<%>)
-       (or/c #f string?)
-       void?)]))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/hierlist.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/hierlist.rkt
deleted file mode 100644
index 1c3baf6073..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/hierlist.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang scheme/base
-
-(require mzlib/unit
-         scheme/gui/base
-         "hierlist/hierlist-sig.rkt"
-         "hierlist/hierlist-unit.rkt")
-
-(define-values/invoke-unit/infer hierlist@)
-
-(provide-signature-elements hierlist^)
-
-#|
-
-;; Testing
-(define f (make-object frame% "test"))
-(define p (make-object horizontal-panel% f))
-(define c (make-object (class hierarchical-list% args
-			 (override
-			   [on-item-opened
-			    (lambda (i)
-			      (let ([f (send i user-data)])
-				(when f (f i))))]
-			   [on-select
-			    (lambda (i)
-			      (printf "Selected: ~a\n"
-				      (if i 
-					  (send (send i get-editor) get-flattened-text)
-					  i)))]
-			   [on-double-select
-			    (lambda (s)
-			      (printf "Double-click: ~a\n"
-				      (send (send s get-editor) get-flattened-text)))])
-			 (sequence (apply super-init args)))
-		       p))
-
-(define a (send c new-list))
-(send (send a get-editor) insert "First Item: List")
-(send (send (send a new-item) get-editor) insert "Sub1")
-(send (send (send a new-item) get-editor) insert "Sub2")
-(define a.1 (send a new-list))
-(send (send a.1 get-editor) insert "Deeper List")
-(send (send (send a.1 new-item) get-editor) insert "Way Down")
-
-(define b (send c new-item))
-(send (send b get-editor) insert "Second Item")
-
-(define d (send c new-list))
-(send (send d get-editor) insert "dynamic")
-(send d user-data (lambda (d)
-		    (time (let loop ([i 30])
-			    (unless (zero? i)
-				    (send (send (send d new-item) get-editor) insert (number->string i))
-				    (loop (sub1 i)))))))
-
-(define x (send c new-list))
-(send (send x get-editor) insert "x")
-
-(define y (send c new-item))
-(send (send y get-editor) insert "y")
-
-(send f show #t)
-
-(yield (make-semaphore))
-
-|#
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/hierlist/hierlist-sig.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/hierlist/hierlist-sig.rkt
deleted file mode 100644
index 1983d1b8f9..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/hierlist/hierlist-sig.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scheme/signature
-
-hierarchical-list%
-hierarchical-list-item<%>
-hierarchical-list-item%
-hierarchical-list-compound-item<%>
-hierarchical-list-compound-item%
-
-hierarchical-item-snip%
-hierarchical-list-snip%
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/hierlist/hierlist-unit.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/hierlist/hierlist-unit.rkt
deleted file mode 100644
index 211f6976c0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/hierlist/hierlist-unit.rkt
+++ /dev/null
@@ -1,888 +0,0 @@
-(module hierlist-unit racket/base
-  (require racket/class
-           racket/unit
-           mred/mred-sig
-           mrlib/include-bitmap
-           "hierlist-sig.rkt")
-
-  ;; Previously was a rename-in from mzlib/list, but
-  ;; now it's imported from racket/base
-  (define sort* sort)
-
-  (define turn-up (include-bitmap "../../icons/turn-up.png" 'png/mask))
-  (define turn-down (include-bitmap "../../icons/turn-down.png" 'png/mask))
-  (define turn-up-click (include-bitmap "../../icons/turn-up-click.png" 'png/mask))
-  (define turn-down-click (include-bitmap "../../icons/turn-down-click.png" 'png/mask))
-
-  (provide hierlist@)
-  (define-unit hierlist@
-    (import mred^)
-    (export hierlist^)
-    (init-depend mred^)
-
-      (define-local-member-name
-	;; In hierarchical-list%
-	ensure-not-selected)
-
-      (define transparent (make-object brush% "WHITE" 'transparent))
-      (define transparent-pen (make-object pen% "WHITE" 1 'transparent))
-      (define black-xor-pen (make-object pen% (get-highlight-background-color) 1 'solid))
-      (define red (make-object brush% "RED" 'solid))
-      (define blue (make-object brush% "BLUE" 'solid))
-      (define black-xor (make-object brush% (get-highlight-background-color) 'solid))
-      (define arrow-cursor (make-object cursor% 'arrow))
-
-      (define-values (up-bitmap down-bitmap up-click-bitmap down-click-bitmap)
-	(values turn-up turn-down turn-up-click turn-down-click))
-
-      ;; Hack for implementing auto-wrapping items:
-      (define arrow-size 0)
-
-      (define orig-size (max (send up-click-bitmap get-width) (send up-click-bitmap get-height)))
-
-      ;; Private arrow snip class:
-      (define arrow-snip-class (make-object snip-class%))
-      (send arrow-snip-class set-classname "hier-arrow")
-      (define arrow-snip%
-	(class snip%
-          (init callback)
-          (inherit get-admin set-flags get-flags set-count set-snipclass get-style)
-          (rename-super [super-get-extent get-extent])
-          (define size-calculated? #f)
-          (define size orig-size)
-          (define width-fraction 1/2)
-          (define on? #f)
-          (define click-callback callback)
-          (define clicked? #f)
-          (private*
-            [set-sizes
-             (lambda (dc)
-               (let* ([s (get-style)]
-                      [h (send s get-text-height dc)]
-                      [d (send s get-text-descent dc)]
-                      [a (send s get-text-space dc)])
-                 (set! size (max orig-size (- h d a)))
-                 (set! size-calculated? #t)
-		 (set! arrow-size size)))]
-            [get-width (lambda () size)]
-            [get-height (lambda () size)]
-            [update
-             (lambda ()
-               (send (get-admin) needs-update this 0 0 (get-width) (get-height)))])
-          (override*
-            [get-extent (lambda (dc x y w h descent space lspace rspace)
-                          (super-get-extent dc x y w h descent space lspace rspace)
-                          (unless size-calculated? (set-sizes dc))
-                          (when w (set-box! w (get-width)))
-                          (when h (set-box! h (get-height)))
-                          (when descent (set-box! descent 0))
-                          (when space (set-box! space 0)))]
-            [partial-offset (lambda (dc x y len)
-                              (unless size-calculated? (set-sizes dc))
-                              (if (zero? len)
-                                  0 
-                                  (get-width)))]
-            [draw (lambda (dc x y left top right bottom dx dy draw-caret)
-                    (unless size-calculated? (set-sizes dc))
-                    (let* ([bitmap (if clicked?
-                                       (if on? down-click-bitmap up-click-bitmap)
-                                       (if on? down-bitmap up-bitmap))]
-                           [bw (send bitmap get-width)]
-                           [bh (send bitmap get-height)])
-                      (send dc draw-bitmap-section bitmap 
-                            (+ x (max 0 (- (/ size 2) (/ bw 2))))
-                            (+ y (max 0 (- (/ size 2) (/ bh 2))))
-			    0 0 (min bw (+ size 2)) (min bh (+ size 2))
-                            'solid
-                            (send the-color-database find-color "black")
-                            (send bitmap get-loaded-mask))))]
-            [size-cache-invalid (lambda () (set! size-calculated? #f))]
-            [on-event
-             (lambda (dc x y mediax mediay event)
-               (let ([in-range?
-                      (and (<= 0 (- (send event get-x) x) (get-width))
-                           (<= 0 (- (send event get-y) y) (get-height)))])
-                 (cond
-                   [(send event button-down?)
-                    (when in-range?
-                      (unless clicked?
-                        (set! clicked? #t)
-                        (update)))]
-                   [(send event button-up?)
-                    (when clicked?
-                      (set! clicked? #f)
-                      (update))
-                    (when in-range?
-                      (on (not on?))
-                      (click-callback this))]
-                   [(send event dragging?)
-                    (unless (or (and clicked? in-range?)
-                                (and (not clicked?) (not in-range?)))
-                      (set! clicked? (not clicked?))
-                      (update))]
-                   [else (when clicked?
-                           (set! clicked? #f)
-                           (update))])))]
-            [copy (lambda () (make-object arrow-snip% click-callback))])
-          (public*
-            [on (case-lambda 
-                 [(v) (set! on? v) (update)]
-                 [() on?])])
-          
-          (super-make-object)
-          (set-snipclass arrow-snip-class)
-          (set-count 1)
-          (set-flags (cons 'handles-events (get-flags)))))
-
-      ;; Hack to get whitespace matching width of arrow: derive a new
-      ;; class that overrides the `draw' method to do nothing. 
-      (define whitespace-snip%
-	(class arrow-snip%
-	  (override* [draw (lambda (dc x y left top right bottom dx dy draw-caret) (void))])
-          (super-make-object void)))
-
-      ;; Keymap to map clicks and double-clicks
-      (define item-keymap (make-object keymap%))
-
-      (send item-keymap add-function "mouse-select"
-	    (lambda (edit event) (when (send event button-down?)
-                                   (send edit click-select #t)
-				   ;; To handle hypertext clicks:
-				   (send edit on-default-event event))))
-      (send item-keymap add-function "mouse-double-select"
-	    (lambda (edit event) (when (send event button-down?)
-				   (send edit double-select))))
-      
-      (send item-keymap map-function "leftbutton" "mouse-select")
-      (send item-keymap map-function "leftbuttondouble" "mouse-double-select")
-
-      (define hierarchical-list-item<%>
-	(interface ()
-	  get-editor 
-          is-selected?
-          select
-          user-data
-          get-allow-selection?
-          set-allow-selection
-          get-clickable-snip
-          get-parent))
-
-      (define hierarchical-list-item%
-	(class* object% (hierarchical-list-item<%>)
-          (init snp)
-          (define snip snp)
-          (define data #f)
-          (define allow-selection #t)
-          (public*
-            [get-allow-selection? (lambda () allow-selection)]
-            [set-allow-selection (lambda (_a) (set! allow-selection _a))]
-            
-            [get-clickable-snip (lambda () snip)]
-            [get-editor (lambda () (send snip get-item-buffer))]
-            
-            ;; the `get-editor' method is overridden
-            [is-selected? (lambda () (send (get-editor) is-selected?))]
-            
-            [select (lambda (on?) (send snip select on?))]
-            [click-select (lambda (on?) (send snip click-select on?))]
-            [scroll-to (lambda () (let* ([admin (send snip get-admin)]
-                                         [dc (and admin (send admin get-dc))]
-                                         [h-box (box 0.0)])
-                                    (when dc
-                                      (send snip get-extent dc 0 0 #f h-box #f #f #f #f)
-                                      (send admin
-                                            scroll-to
-                                            snip
-                                            0 0 0 (unbox h-box) #t))))]
-            [user-data (case-lambda [() data][(x) (set! data x)])]
-            [get-parent (lambda () 
-                          (let ([parent-of-snip (send snip get-parent)])
-                            (and parent-of-snip
-                                 (let ([parent-snip (send parent-of-snip get-parent-snip)])
-                                   (and parent-snip
-                                        (send parent-snip get-item))))))])
-          (super-make-object)))
-
-      (define hierarchical-list-compound-item<%>
-	(interface (hierarchical-list-item<%>)
-	  new-item 
-          new-list
-          delete-item
-          get-items
-          open
-          close
-          toggle-open/closed
-          is-open?
-          get-arrow-snip))
-
-      (define hierarchical-list-compound-item%
-	(class* hierarchical-list-item% (hierarchical-list-compound-item<%>)
-          (init snp)
-          (define snip snp)
-          (override*
-            [get-editor (lambda () (send snip get-title-buffer))])
-          (public*
-            [get-arrow-snip (lambda () (send snip get-arrow-snip))]
-            [open
-             (lambda ()
-               (send snip open))]
-            [close
-             (lambda ()
-               (send snip close))]
-            [toggle-open/closed
-             (lambda ()
-               (send snip toggle-open/closed))]
-            [is-open?
-             (lambda ()
-               (send snip is-open?))]
-            [new-item 
-             (lambda x
-               (begin0
-                 (send (send snip get-content-buffer) new-item . x)
-                 (send snip not-empty-anymore)))]
-	    [set-no-sublists (lambda x (send (send snip get-content-buffer) set-no-sublists . x))]
-            [new-list 
-             (lambda x
-               (begin0 
-                 (send (send snip get-content-buffer) new-list . x)
-                 (send snip not-empty-anymore)))]
-            [delete-item (lambda (i) (begin0
-                                       (send (send snip get-content-buffer) delete-item i)
-                                       (send snip check-empty-now)))]
-            [get-items (lambda () (send (send snip get-content-buffer) get-items))])
-          (super-make-object snip)))
-
-      ;; Buffer for a single list item
-      (define hierarchical-item-text%
-	(class text%
-          (init tp tp-select itm snp dpth)
-          (inherit hide-caret
-                   last-position set-position set-keymap
-                   invalidate-bitmap-cache set-max-width
-                   get-view-size)
-          (rename-super [super-auto-wrap auto-wrap]
-                        [super-on-default-event on-default-event])
-          
-          (define top tp)
-          (define top-select tp-select)
-          (define item itm)
-          (define snip snp)
-          (define depth dpth)
-          (define selected? #f)
-          (public*
-            [is-selected? (lambda () selected?)]
-            [show-select (lambda (on?)
-                           (set! selected? on?)
-                           (invalidate-bitmap-cache))])
-          (override*
-            [auto-wrap (case-lambda
-                        [() (super-auto-wrap)]
-                        [(on?) (super-auto-wrap on?)
-                         (when on?
-                           (let ([wbox (box 0)])
-                             (send (send top get-editor) get-view-size wbox (box 0))
-                             ;; These icky constants should be eliminated
-                             (let ([w (- (unbox wbox) 8 (* depth arrow-size))])
-                               (set-max-width (if (positive? w)
-                                                  w
-                                                  'none)))))])]
-            [refresh (lambda (x y width height draw-caret background)
-                       (super refresh x y width height
-                              (if (and selected?
-                                       (or (not (send top show-focus))
-                                           (send top has-focus?)))
-                                  (cons 0 1)
-                                  draw-caret)
-                              background))]
-            [on-paint
-             (lambda (pre? dc left top_ right bottom dx dy caret)
-               (when (and pre? selected?)
-                 (let ([b (send dc get-brush)]
-                       [p (send dc get-pen)]
-                       [filled? (or (not (send top show-focus))
-                                    (send top has-focus?))])
-                   (unless filled?
-                     ;; To draw the right outline, we need the display area
-                     (set! left 0)
-                     (set! top_ 0)
-                     (let ([wbox (box 0)]
-                           [hbox (box 0)])
-                       (get-view-size wbox hbox)
-                       (set! right (unbox wbox))
-                       (set! bottom (unbox hbox))))
-                   (send dc set-brush (if filled? black-xor transparent))
-                   (send dc set-pen (if filled? transparent-pen black-xor-pen))
-                   (send dc draw-rectangle (+ dx left) (+ dy top_) (- right left) (- bottom top_))
-		   (unless (or filled? ((- right left) . < . 2) ((- bottom top_) . < . 2))
-		     (send dc draw-rectangle (+ dx left 1) (+ dy top_ 1) (- right left 2) (- bottom top_ 2)))
-                   (send dc set-pen p)
-                   (send dc set-brush b))))])
-	  (private*
-            ;; need to use top-select anyway, because it might want to react to
-            ;; all clicks
-	    [do-select (lambda (on? clicked?)
-			 (top-select (if on? item #f) snip clicked?
-                                     (not (eq? (not selected?) (not on?)))))])
-          (public*
-            [select (lambda (on?) (do-select on? #f))]
-            [click-select (lambda (on?) (do-select on? #t))]
-            [double-select (lambda () (send top on-double-select item))]
-            [select-prev (lambda () (send top select-prev))])
-          (override*
-            [on-default-char (lambda (x) (void))]
-	    [can-do-edit-operation? (lambda (x [r? #t]) 
-				      (and (super can-do-edit-operation? x r?)
-					   (send top can-do-edit-operation? x r?)))]
-	    [do-edit-operation (lambda (x [r? #t] [time 0]) (send top do-edit-operation x r? time))])
-          (super-make-object)
-          (hide-caret #t)
-          (set-keymap item-keymap)))
-      
-      ;; Buffer for a compound list item (and the top-level list)
-      (define (make-hierarchical-list-text% super%)
-	(class super%
-          (init tp tp-select dpth parent-snp)
-          (inherit hide-caret erase
-                   last-position insert delete line-start-position line-end-position
-                   begin-edit-sequence end-edit-sequence get-style-list)
-          (define top tp)
-          (define top-select tp-select)
-          (define depth dpth)
-          (define parent-snip parent-snp)
-          (define children null)
-	  (define new-children null)
-	  (define no-sublists? #f)
-          (define transparent? #f)
-          (private*
-            [append-children! (lambda ()
-                                (unless (null? new-children)
-                                  (set! children (append children (reverse new-children)))
-                                  (set! new-children null)))]
-            [make-whitespace (lambda () (make-object whitespace-snip%))]
-            [insert-item 
-             (lambda (mixin snip% whitespace?)
-               (let ([s (make-object snip% this top top-select (add1 depth) mixin)])
-                 (send s use-style-background transparent?)
-                 (begin-edit-sequence)
-                 (unless (and (null? children)
-                              (null? new-children))
-                   (insert #\newline (last-position)))
-                 (when whitespace?
-                   (insert (make-whitespace) (last-position)))
-                 (insert s (last-position))
-                 (end-edit-sequence)
-                 (set! new-children (cons s new-children))
-                 (send s get-item)))])
-          (public*
-            [set-transparent (λ (t?) (set! transparent? (and t? #t)))]
-            [get-parent-snip (lambda () parent-snip)]
-            [deselect-all 
-             (lambda () 
-               (append-children!)
-               (for-each (lambda (x) (send x deselect-all)) children))]
-            [new-item 
-             (case-lambda
-              [() (new-item (lambda (x) x))]
-              [(mixin)
-               (insert-item mixin hierarchical-item-snip% (not no-sublists?))])]
-            [new-list
-             (case-lambda
-              [() (new-list (lambda (x) x))]
-              [(mixin)
-	       (when no-sublists?
-		 (error 'new-list "this list has been designated with `set-no-sublists' as having no sublists"))
-               (insert-item mixin hierarchical-list-snip% #f)])]
-	    [set-no-sublists
-	     (lambda (no?)
-               (append-children!)
-	       (unless (null? children)
-		 (error 'set-no-sublists "cannot change sublist mode because the list is non-empty"))
-	       (set! no-sublists? (and no? #t)))]
-            [get-items (lambda () 
-                         (append-children!)
-                         (map (lambda (x) (send x get-item)) children))]
-            [delete-item
-             (lambda (i)
-               (append-children!)
-               (let loop ([pos 0][l children][others null])
-                 (cond
-                   [(null? l) (error 'hierarchical-list-compound-item::delete-item "item not found: ~a" i)]
-                   [(eq? (send (car l) get-item) i)
-		    (send top ensure-not-selected i)
-                    (send (car l) deselect-all)
-                    (set! children (append (reverse others) (cdr l)))
-                    (let ([s (line-start-position pos)]
-                          [e (line-end-position pos)])
-                      (delete (if (zero? s) s (sub1 s)) (if (zero? s) (add1 e) e)))]
-                   [else (loop (add1 pos) (cdr l) (cons (car l) others))])))]
-            [sort (lambda (less-than? [recur? #t])
-                    (append-children!)
-                    (let ([l (sort* children
-                                    (lambda (a b)
-                                      (less-than? (send a get-item)
-                                                  (send b get-item))))])
-                      (begin-edit-sequence)
-		      (when recur?
-			(for-each (lambda (child)
-				    (when (is-a? child hierarchical-list-snip%)
-				      (let ([ed (send child get-content-buffer)])
-					(when (is-a? ed hierarchical-list-text%)
-					  (send ed sort less-than?)))))
-				  children))
-                      (erase)
-                      (let ([to-scroll-to #f])
-                        (for-each
-                         (lambda (s)
-                           (unless to-scroll-to
-                             (when (and (is-a? (send s get-item) hierarchical-list-item<%>)
-                                        (send (send s get-item) is-selected?))
-                               (set! to-scroll-to s)))
-                           (unless (or no-sublists?
-				       (is-a? s hierarchical-list-snip%))
-                             (insert (make-whitespace)))
-                           (insert s)
-                           (insert #\newline))
-                         l)
-                        (unless (null? l)
-                          (delete)) ; delete last #\newline
-                        (set! children l)
-                        (when to-scroll-to
-                          (send (send to-scroll-to get-item) scroll-to)))
-                      (end-edit-sequence)))]
-            [reflow-items
-             (lambda ()
-               (append-children!)
-               (for-each
-                (lambda (c)
-                  (send c reflow-item))
-                children))])
-          (override*
-            [on-default-char (lambda (x) (void))]
-            [on-default-event (lambda (x) (void))]
-	    [can-do-edit-operation? (lambda (x [r? #t]) 
-				      (and (super can-do-edit-operation? x r?)
-					   (send top can-do-edit-operation? x r?)))]
-	    [do-edit-operation (lambda (x [r? #t] [time 0]) (send top do-edit-operation x r? time))])
-          (super-make-object)
-          (hide-caret #t)))
-
-      (define hierarchical-list-text% (make-hierarchical-list-text% text%))
-
-      ;; Snip for a single list item
-      (define hierarchical-item-snip%
-	(class editor-snip%
-          (init prnt top top-select depth mixin)
-          (define parent prnt)
-	  (public*
-	    [get-parent (lambda () parent)]
-	    [get-item-text% (lambda () hierarchical-item-text%)]
-	    [select (lambda (on?) (send item-buffer select on?))]
-	    [click-select (lambda (on?) (send item-buffer click-select on?))]
-	    [deselect-all (lambda () (select #f))]
-	    [show-select (lambda (on?) (send item-buffer show-select on?))]
-	    [get-item-buffer (lambda () item-buffer)]
-	    [get-item (lambda () item)]
-	    [reflow-item (lambda () 
-			   (when (send item-buffer auto-wrap)
-			     (send item-buffer auto-wrap #t)))])
-          
-	  (define item (make-object (mixin hierarchical-list-item%) this))
-	  (define item-buffer (make-object (get-item-text%) top top-select item this depth))
-	  (super-make-object item-buffer #f 0 0 0 0 0 0 0 0)))
-
-      ;; Snip for a compound list item
-      (define hierarchical-list-snip%
-        (class editor-snip%
-          (init prnt tp top-select depth mixin [title #f][content #f])
-          (define parent prnt)
-          (define top tp)
-	  (public*
-	    [get-parent (lambda () parent)]
-	    [get-main-text% (lambda () (class text%
-                                         (init-rest args)
-					 (override*
-					   [on-default-char (lambda (x) (void))]
-					   [on-default-event (lambda (x) (void))]
-					   [can-do-edit-operation? (lambda (x [r? #t]) 
-								     (and (super can-do-edit-operation? x r?)
-									  (send top can-do-edit-operation? x r?)))]
-					   [do-edit-operation (lambda (x [r? #t] [time 0]) (send top do-edit-operation x r? time))])
-                                         (apply super-make-object args)))]
-	    [get-title-text% (lambda () hierarchical-item-text%)]
-	    [get-content-text% (lambda () hierarchical-list-text%)]
-	    [get-arrow-snip% (lambda () arrow-snip%)]
-	    [select (lambda (on?) (send title-buffer select on?))]
-	    [click-select (lambda (on?) (send title-buffer click-select on?))]
-	    [deselect-all (lambda ()
-			    (select #f)
-			    (send content-buffer deselect-all))]
-	    [show-select (lambda (on?) (send title-buffer show-select on?))]
-	    [not-empty-anymore (lambda ()
-				 (when was-empty?
-				   (set! was-empty? #f)
-				   (set! was-non-empty? #t)
-				   (send main-buffer begin-edit-sequence)
-				   (send main-buffer insert #\newline 2)
-				   (send main-buffer insert whitespace 3)
-				   (send main-buffer insert content-snip 4)
-				   (send main-buffer end-edit-sequence)))]
-	    [check-empty-now (lambda ()
-			       (when (and was-non-empty? 
-					  (zero? (send content-buffer last-position)))
-				 (set! was-empty? #t)
-				 (set! was-non-empty? #f)
-				 (send main-buffer delete 2 5)))]
-	    [open (lambda () (handle-open #t))]
-	    [close (lambda () (handle-close #t))]
-	    [is-open? (lambda () open?)]
-	    [toggle-open/closed
-	     (lambda ()
-	       (if open?
-		   (handle-close #t)
-		   (handle-open #t)))]
-	    [on-arrow (lambda (a)
-			(if (send a on)
-			    (handle-open #f)
-			    (handle-close #f)))]
-	    [get-title-buffer (lambda () title-buffer)]
-	    [get-content-buffer (lambda () content-buffer)]
-	    [get-item (lambda () item)]
-	    [reflow-item (lambda () 
-			   (when (send title-buffer auto-wrap)
-			     (send title-buffer auto-wrap #t))
-			   (send (send content-snip get-editor) reflow-items))])
-          (define open? #f)
-	  (private*
-	    [handle-open
-	     (lambda (update-arrow?)
-	       (unless open?
-		 (set! open? #t)
-		 (when update-arrow? (send arrow on #t))
-		 (send main-buffer begin-edit-sequence)
-		 (send top on-item-opened (get-item))
-		 (if (zero? (send content-buffer last-position))
-		     (set! was-empty? #t)
-		     (begin
-		       (set! was-non-empty? #t)
-		       (send main-buffer insert #\newline 2)
-		       (send main-buffer insert whitespace 3)
-		       (send main-buffer insert content-snip 4)))
-		 (send main-buffer scroll-to-position 0
-		       #f
-		       (send main-buffer last-position)
-		       'start)
-		 (send main-buffer end-edit-sequence)))]
-	    [handle-close
-	     (lambda (update-arrow?)
-	       (when open?
-		 (set! open? #f)
-		 (when update-arrow? (send arrow on #f))
-		 (set! was-empty? #f)
-		 (set! was-non-empty? #f)
-		 (send main-buffer begin-edit-sequence)
-		 (send content-buffer deselect-all)
-		 (send main-buffer delete 2 5)
-		 (send top on-item-closed (get-item))
-		 (send main-buffer end-edit-sequence)))])
-	  (define was-empty? #f)
-	  (define was-non-empty? #f)
-	  (define item (make-object (mixin hierarchical-list-compound-item%) this))
-	  (define main-buffer (make-object (get-main-text%)))
-	  (define title-buffer (make-object (get-title-text%) top top-select item this depth))
-	  (define content-buffer (make-object (get-content-text%) top top-select depth this))
-	  (define title-snip (make-object editor-snip% title-buffer #f 0 0 0 0 0 0 0 0))
-	  (define content-snip (make-object editor-snip% content-buffer #f 4 0 0 0 0 0 0 0))
-	  (define arrow (make-object (get-arrow-snip%) (lambda (a) (on-arrow a))))
-	  (define whitespace (make-object whitespace-snip%))
-          (override*
-            [use-style-background
-             (λ (x)
-               (super use-style-background x)
-               (send title-snip use-style-background x)
-               (send content-snip use-style-background x)
-               (send content-buffer set-transparent x))])
-          (public*
-            [get-arrow-snip (lambda () arrow)])
-          (inherit style-background-used?)
-	  (super-make-object main-buffer #f 0 0 0 0 0 0 0 0)
-          (send main-buffer hide-caret #t)
-	  (send main-buffer insert arrow)
-	  (when title (send title-buffer insert title))
-	  (when content (send content-buffer insert content))
-	  (send main-buffer insert title-snip)
-	  (send main-buffer change-style (make-object style-delta% 'change-alignment 'top) 0 2)))
-
-      (define list-keymap (make-object keymap%))
-
-      (send list-keymap add-function "select-in"
-	    (lambda (list event) (send list select-in)))
-      (send list-keymap add-function "select-out"
-	    (lambda (list event) (send list select-out)))
-      (send list-keymap add-function "select-prev"
-	    (lambda (list event) (send list select-prev)))
-      (send list-keymap add-function "select-next"
-	    (lambda (list event) (send list select-next)))
-      (send list-keymap add-function "select-first"
-	    (lambda (list event) (send list select-first)))
-      (send list-keymap add-function "select-last"
-	    (lambda (list event) (send list select-last)))
-      (send list-keymap add-function "page-up"
-	    (lambda (list event) (send list page-up)))
-      (send list-keymap add-function "page-down"
-	    (lambda (list event) (send list page-down)))
-
-      (send list-keymap map-function "right" "select-in")
-      (send list-keymap map-function "left" "select-out")
-      (send list-keymap map-function "up" "select-prev")
-      (send list-keymap map-function "down" "select-next")
-      (send list-keymap map-function "home" "select-first")
-      (send list-keymap map-function "end" "select-last")
-      (send list-keymap map-function "pageup" "page-up")
-      (send list-keymap map-function "pagedown" "page-down")
-      (send list-keymap map-function "a:up" "page-up")
-      (send list-keymap map-function "a:down" "page-down")
-      (send list-keymap map-function "m:up" "page-up")
-      (send list-keymap map-function "m:down" "page-down")
-      (send list-keymap map-function "d:up" "select-first")
-      (send list-keymap map-function "d:down" "select-last")
-      (send list-keymap map-function "esc;v" "page-up")
-      (send list-keymap map-function "c:v" "page-down")
-      (send list-keymap map-function "esc;>" "select-last")
-      (send list-keymap map-function "esc;<" "select-first")
-      
-      (send list-keymap add-function "toggle-open/closed"
-	    (lambda (list event) (send list toggle-open/closed)))
-      (send list-keymap map-function "return" "toggle-open/closed")
-
-      (define hierarchical-list%
-        (class editor-canvas%
-          (init parent [style '(no-hscroll)])
-          (inherit min-width min-height allow-tab-exit refresh)
-          (rename-super [super-on-char on-char]
-                        [super-on-focus on-focus])
-          (public*
-            [selectable
-             (case-lambda
-              [() selectable?]
-              [(on?) (set! selectable? on?)])]
-            [get-selected (lambda () selected-item)]
-            [on-item-opened (lambda (i) (void))]
-            [on-item-closed (lambda (i) (void))]
-            [on-double-select (lambda (i) (void))]
-            [on-select (lambda (i) (void))]
-            [on-click (lambda (i) (void))]
-            [new-item (lambda x (send top-buffer new-item . x))]
-            [set-no-sublists (lambda x (send top-buffer set-no-sublists . x))]
-            [new-list (lambda x (send top-buffer new-list . x))]
-            [delete-item (lambda (i) (send top-buffer delete-item i))]
-            [sort (lambda (less-than? [recur? #t]) (send top-buffer sort less-than? recur?))]
-            [get-items (lambda () (send top-buffer get-items))]
-            [toggle-open/closed
-             (lambda ()
-               (cond
-                 [(and selected (is-a? selected hierarchical-list-snip%))
-                  (send selected toggle-open/closed)]
-                 [else
-                  (void)]))]
-            [select-out (lambda () 
-                          (when selected
-                            (let* ([parent-snip (send (send selected get-parent) get-parent-snip)])
-                              (cond
-                                [parent-snip
-                                 (let ([parent (send parent-snip get-item)])
-                                   (when (send parent get-allow-selection?)
-                                     (send parent click-select #t)
-                                     (send parent scroll-to)))]
-                                [else
-                                 (void)]))))]
-            [select-in (lambda () 
-                         (cond
-                           [(and selected (is-a? selected hierarchical-list-snip%)) 
-                            (let ([edit-sequence-text (send selected get-editor)])
-                              (send edit-sequence-text begin-edit-sequence)
-                              (send selected open)
-                              (let ([items (send selected-item get-items)])
-                                (unless (null? items)
-                                  (send (car items) click-select #t)
-                                  (send (car items) scroll-to)))
-                              (send edit-sequence-text end-edit-sequence))]
-                           [else (void)]))]
-            [select-next (lambda () (move +1))]
-            [select-prev (lambda () (move -1))]
-            [select-first (lambda () (let ([l (get-items)])
-                                       (unless (null? l)
-                                         (send (car l) click-select #t)
-                                         (send (car l) scroll-to))))]
-            [select-last (lambda () (let loop ([l (get-items)])
-                                      (cond
-                                        [(null? l) (void)]
-                                        [(null? (cdr l))
-                                         (send (car l) click-select #t)
-                                         (send (car l) scroll-to)]
-                                        [else (loop (cdr l))])))]
-	    [select (lambda (i) 
-                      (cond
-                       [i
-                        (send i select #t)
-                        (send i scroll-to)]
-                       [(allow-deselect)
-                        (when selected
-                          (send selected show-select #f)
-                          (set! selected #f)
-                          (set! selected-item #f))]
-                       [else
-                        (error 'hierarchical-list%::select 
-                               "can only pass #f when allow-deselect has been called with #t")]))]
-            [click-select (lambda (i) 
-			    (send i click-select #t)
-			    (send i scroll-to))]
-            [page-up (lambda () (page 'up))]
-            [page-down (lambda () (page 'down))]
-            [show-focus
-             (case-lambda
-              [() show-focus?]
-              [(on?) (set! show-focus? on?)])]
-	    [can-do-edit-operation? (lambda (x [r? #t]) #f)]
-	    [do-edit-operation (lambda (x [r? #t] [time 0]) (void))])
-	  (public* ;; ---- local to this module! ----
-	    [ensure-not-selected (lambda (i)
-				   (when (eq? i selected)
-				     (set! selected #f))
-				   (when (eq? i selected-item)
-				     (set! selected-item #f)))])
-          (override*
-            [on-char
-             (lambda (e)
-               (unless (send list-keymap handle-key-event this e)
-                 (super-on-char e)))]
-            [on-size
-             (lambda (w h)
-               (send top-buffer begin-edit-sequence)
-               (send top-buffer reflow-items)
-               (send top-buffer end-edit-sequence))]
-            [on-focus
-             (lambda (on?)
-               (when (and selected show-focus?)
-                 (send selected show-select #t))
-               (super-on-focus on?))])
-          (private*
-            [move (lambda (dir) 
-                    (define (find i l)
-                      (let loop ([l l][pos 0])
-                        (if (null? l)
-                            #f
-                            (if (eq? (car l) i)
-                                pos
-                                (loop (cdr l) (add1 pos))))))
-                    (define (find-next-selectable-item i vec)
-                      (let loop ([pos (+ i dir)])
-                        (cond
-                          [(= pos -1)
-                           i]
-                          [(= pos (vector-length vec))
-                           i]
-                          [(send (vector-ref vec pos) get-allow-selection?)
-                           pos]
-                          [else (loop (+ pos dir))])))
-                    ;; Scrolling works differently depending on whether selections
-                    ;;  are involved:
-                    (if selectable?
-                        (let* ([l (if selected
-                                      (send (send selected get-parent) get-items)
-                                      (get-items))]
-                               [vec (list->vector l)]
-                               [pos (let ([found (find selected-item l)])
-                                      (if (and selected-item found)
-                                          (find-next-selectable-item found vec)
-                                          (if (negative? dir)
-                                              (sub1 (length l))
-                                              0)))])
-                          (when (< -1 pos (length l))
-                            (let ([i (vector-ref vec pos)])
-                              (when (send i get-allow-selection?)
-                                (send i click-select #t)
-                                (send i scroll-to)))))
-                        (let ([y-box (box 0.0)]
-                              [x-box (box 0.0)]
-                              [w-box (box 0.0)]
-                              [h-box (box 0.0)])
-                          (send (send top-buffer get-admin) get-view x-box y-box w-box h-box)
-                          (let ([y (if (negative? dir)
-                                       (- (unbox y-box) 2)
-                                       (+ (unbox y-box) (unbox h-box) 1))])
-                            (send (send top-buffer get-admin) scroll-to
-                                  (unbox x-box) y
-                                  (unbox w-box) 1)))))]
-            [page (lambda (dir)
-                    ;; Scrolling works differently depending on whether selections
-                    ;;  are involved:
-                    (if selectable?
-                        (let ([items (get-items)])
-                          (unless (null? items)
-                            (let ([sbox (box 0)]
-                                  [ebox (box 0)])
-                              (send top-buffer get-visible-line-range sbox ebox)
-                              (let* ([len (max 1 (sub1 (- (unbox ebox) (unbox sbox))))]
-                                     [l (if (eq? dir 'up)
-                                            (max 0 (- (unbox sbox) len))
-                                            (min (sub1 (length items)) (+ (unbox ebox) len)))]
-                                     [i (list-ref items l)])
-                                (send i click-select #t)
-                                (send i scroll-to)))))
-                        (send top-buffer move-position dir #f 'page)))])
-          (define selectable? #t)
-          (define show-focus? #f)
-	  (define on-select-always? #t)
-	  (define on-click-always? #f)
-	  (define allow-deselect? #f)
-	  (public*
-	    [on-select-always
-	     (case-lambda 
-	      [() on-select-always?]
-	      [(v) (set! on-select-always? (and v #t))])]
-	    [on-click-always
-	     (case-lambda 
-	      [() on-click-always?]
-	      [(v) (set! on-click-always? (and v #t))])]
-	    [allow-deselect
-	     (case-lambda 
-	      [() allow-deselect?]
-	      [(v) (set! allow-deselect? (and v #t))])])
-          (private*
-            [do-select (lambda (item s clicked? selected?)
-                         (when (and item clicked? on-click-always?)
-                           (on-click item))
-                         (cond
-                           [(not selected?)
-                            ;; this wasn't really a selection, only useful if
-                            ;; on-click-always? made us do an on-click above
-                            (void)]
-                           [(and selectable?
-                                 item
-                                 (send item get-allow-selection?))
-                            (unless (eq? item selected-item)
-                              (when selected (send selected show-select #f))
-                              (set! selected (if item s #f))
-                              (set! selected-item item)
-                              (when selected (send selected show-select #t))
-			      (when (or clicked? on-select-always?)
-				(on-select item)))]
-                           [(and item clicked?)
-                            (unless on-click-always? ; already called above
-                              (on-click item))]
-			   [allow-deselect?
-			    (when selected-item
-			      (send selected show-select #f)
-			      (set! selected #f)
-			      (set! selected-item #f))
-			    (when (or clicked? on-select-always?)
-			      (on-select #f))]))])
-          (define top-buffer (make-object hierarchical-list-text% this (lambda (i s c? s?) (do-select i s c? s?)) 0 #f))
-          (define selected #f)
-          (define selected-item #f)
-          (send top-buffer set-transparent (member 'transparent style))
-          (super-make-object parent top-buffer style)
-	  (allow-tab-exit #t)
-          (send top-buffer set-cursor arrow-cursor) 
-          (min-width 150)
-          (min-height 200)))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/image-core-wxme.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/image-core-wxme.rkt
deleted file mode 100644
index 630878b200..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/image-core-wxme.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-(require racket/class
-         wxme
-         "private/image-core-snipclass.rkt"
-         "image-core.rkt")
-(provide reader image<%>)
-
-(define reader
-  (new 
-   (class* object% (snip-reader<%>)
-     (define/public (read-header vers stream) (void))
-     (define/public (read-snip text? cvers stream)
-       (define bytes (send stream read-raw-bytes '2htdp/image))
-       (if text?
-           #"."
-           (snipclass-bytes->image bytes)))
-     (super-new))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/image-core.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/image-core.rkt
deleted file mode 100644
index 1f0e10a670..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/image-core.rkt
+++ /dev/null
@@ -1,1392 +0,0 @@
-#lang racket/base
-
-#|
-
-This library is the part of the 2htdp/image 
-teachpack that has to be shared between drracket
-and the user's program to make copy and paste
-work right.
-
-Most of the exports are just for use in 2htdp/image
-(technically, 2htdp/private/image-more). The main
-use of this library is the snip class addition it
-does (and any code that does not depend on
-has been moved out).
-
-
--- in the middle of text:
-
-  - bounding boxes
-  - rotating (and bounding boxes)
-  - hbl append(?)
-  - this doesn't work (how to test?)
-(beside/places "baseline"
-                 (text "ijy" 12 'black)
-                 (text "ijy" 24 'black))
-  - /places => /align
-
-|#
-
-(require racket/class
-         (except-in racket/draw 
-                    make-pen make-color)
-         (for-syntax racket/base)
-         file/convertible
-         pict/convert
-         (prefix-in pict: (only-in pict dc))
-         racket/math
-         racket/contract
-         "private/image-core-bitmap.rkt"
-         "private/image-core-snipclass.rkt"
-         "private/regmk.rkt"
-         racket/snip
-         (prefix-in cis: "cache-image-snip.rkt"))
-
-
-
-
-;                                                                
-;                                                                
-;                                                                
-;                                                                
-;                                                                
-;                                                                
-;       ;;           ;;                  ;;           ;;;        
-;       ;;          ;;;                  ;;          ;;;         
-;    ;;;;;   ;;;;  ;;;;;  ;;;;        ;;;;;   ;;;;  ;;;;; ;; ;;; 
-;   ;;;;;;  ;;  ;;  ;;;; ;;  ;;      ;;;;;;  ;;  ;; ;;;;  ;;;;;; 
-;  ;;;  ;;    ;;;;  ;;;    ;;;;     ;;;  ;; ;;;;;;;; ;;   ;;  ;; 
-;  ;;;  ;;  ;;; ;;  ;;;  ;;; ;;     ;;;  ;; ;;;      ;;   ;;  ;; 
-;   ;;;;;; ;;;  ;;  ;;;;;;;  ;;      ;;;;;;  ;;; ;;  ;;   ;;  ;; 
-;    ;;;;;  ;;;;;;   ;;; ;;;;;;       ;;;;;   ;;;;   ;;   ;;  ;; 
-;                                                                
-;                                                                
-;                                                                
-;                                                         
-
-
-;; a image is 
-;;  (make-image shape bb boolean (or/c point #f))
-;; NOTE: the shape field is mutated when normalized, as
-;;       is the normalized? field.
-(define (make-image shape bb normalized? [pinhole #f])
-  (new image% [shape shape] [bb bb] [normalized? normalized?] [pinhole pinhole]))
-(define (image-shape p) (send p get-shape))
-(define (image-bb p) (send p get-bb))
-(define (image-normalized? p) (send p get-normalized?))
-(define (set-image-shape! p s) (send p set-shape s))
-(define (set-image-normalized?! p n?) (send p set-normalized? n?))
-(define (image? p) 
-  (or (is-a? p image<%>)
-      (is-a? p image-snip%)
-      (is-a? p bitmap%)))
-
-(define (un/cache-image img bitmap-cache?)
-  (unless (image? img)
-    (raise-argument-error 'un/cache-image
-                          "image?"
-                          0
-                          img bitmap-cache?))
-  (cond
-    [(is-a? img snip%)
-     (define res (send img copy))
-     (when (is-a? res image%)
-       (send res set-use-bitmap-cache?! (and bitmap-cache? #t)))
-     res]
-    [else img]))
-
-(define (compute-image-cache img)
-  (unless (image? img)
-    (error 'compute-cached-bitmap "expected an image as the first argument, got ~e" img))
-  (when (is-a? img image<%>)
-    (send img compute-cached-bitmap))
-  (void))
-  
-;; a shape is either:
-;;
-;;  - (make-overlay shape shape)
-;;    the shapes are in the order passed to the overlay or beside,
-;;    which means the bottom one should be drawn first so as to appear
-;;    underneath the top one.
-(define-struct/reg-mk overlay (top bottom) #:transparent #:omit-define-syntaxes) 
-;;
-;;  - (make-translate dx dy shape)
-(define-struct/reg-mk translate (dx dy shape) #:transparent #:omit-define-syntaxes)
-;;
-;;  - (make-scale x-factor y-factor shape)
-(define-struct/reg-mk scale (x y shape) #:transparent #:omit-define-syntaxes)
-;;
-;;  - (make-crop (listof vector) shape)
-(define-struct/reg-mk crop (points shape) #:transparent #:omit-define-syntaxes)
-;;
-;;  - atomic-shape
-
-;; an atomic-shape is either:
-;;  - polygon
-;;  - line-segment
-;;  - curve-segment
-;;  - bitmap
-;;  - np-atomic-shape
-
-;; a np-atomic-shape is:
-;;
-;;  - (make-ellipse width height angle mode color)
-(define-struct/reg-mk ellipse (width height angle mode color) #:transparent #:omit-define-syntaxes)
-;;
-;;  - (make-text string angle number color
-;;               number (or/c #f string) family 
-;;               (or/c 'normal 'italic) (or/c 'normal 'light 'bold) boolean)
-;;    NOTE: font can't be the raw mred font or else copy & paste won't work
-(define-struct/reg-mk text (string angle y-scale color size face family style weight underline) 
-  #:omit-define-syntaxes #:transparent)
-;;
-;;  - flip
-
-;; a bitmap is:
-;;  - (make-ibitmap (and/c (is-a?/c bitmap%) (lambda (x) (send x has-alpha-channel?)))
-;;                  angle positive-real 
-;;                  hash[(list boolean[flip] number[x-scale] number[y-scale] number[angle])
-;;                       -o> (is-a?/c bitmap%)])
-;;    NOTE: bitmap copying needs to happen in 'write' and 'read' methods
-(define-struct/reg-mk ibitmap #:reflect-id bitmap (raw-bitmap angle x-scale y-scale cache)
-  #:omit-define-syntaxes #:transparent
-  #:property prop:custom-write (λ (x y z) (bitmap-write x y z)))
-
-;; a flip is:
-;;   - (make-flip boolean bitmap)
-;; * the boolean is #t if the bitmap should be flipped vertically
-;;   (after applying whatever rotation is in there)
-;; * this struct is here to avoid adding a field to bitmaps, so that old save files
-;;   from when the library did not support flipping still load
-;;   (since normalization will add a flip structure if necessary)
-(define-struct/reg-mk flip (flipped? shape) #:transparent)
-
-;; a polygon is:
-;;
-;;  - (make-polygon (listof vector) mode color)
-(define-struct/reg-mk polygon (points mode color) #:transparent #:omit-define-syntaxes)
-
-;; a line-segment is
-;;
-;;  - (make-line-segment point point color)
-(define-struct/reg-mk line-segment (start end color) #:transparent #:omit-define-syntaxes)
-
-;; a curve-segment is
-;;
-;;  - (make-curve-segment point real real point real real color)
-(define-struct/reg-mk curve-segment (start s-angle s-pull end e-angle e-pull color)
-  #:transparent #:omit-define-syntaxes)
-
-;; a normalized-shape (subtype of shape) is either
-;;  - (make-overlay normalized-shape cn-or-simple-shape)
-;;  - cn-or-simple-shape
-
-;; an cn-or-simple-shape is either:
-;;  - simple-shape
-;;  - (make-crop (listof points) normalized-shape)
-
-;; a simple-shape (subtype of shape) is
-;;  - (make-translate dx dy np-atomic-shape)
-;;  - polygon
-;;  - line-segment
-;;  - curve-segment
-
-;; an angle is a number between 0 and 360 (degrees)
-
-;; a mode is either 'solid or 'outline (indicating a pen width for outline mode)
-
-;; a pen is
-;;  - (make-pen color?  ;; <- the struct, not a string
-;;              (<=/c 0 255)
-;;              (or/c 'solid 'dot 'long-dash 'short-dash 'dot-dash)
-;;              (or/c 'round 'projecting 'butt)
-;;              (or/c 'round 'bevel 'miter))
-(define-struct/reg-mk pen (color width style cap join) #:transparent)
-
-;; an color is
-;;  - (make-color (<=/c 0 255) (<=/c 0 255) (<=/c 0 255))
-;;  - string
-(define-struct/reg-mk color (red green blue alpha) #:transparent)
-(define -make-color
-  ;; this let is here just for the name
-  (let ([make-color
-         (λ (r g b [a 255])
-           (make-color r g b a))])
-    make-color))
-;                                                   
-;                                                   
-;                                                   
-;   ;;                                    ;;   ;;   
-;   ;;                                   ;;;;  ;    
-;   ;                                    ; ;; ;     
-;   ;;  ;;;;;;;;; ;;;;;   ;;;;;;  ;;;;   ; ;; ;     
-;   ;;  ;; ;;; ;;;;   ;;  ;; ;;  ;;; ;;   ;; ;      
-;   ;;  ;; ;;; ;;;  ;;;; ;;; ;;  ;;;;;;      ; ;;;  
-;   ;;  ;; ;;; ;;;;;  ;;   ;;;   ;;          ;;; ;; 
-;   ;;  ;; ;;; ;;;;;  ;;  ;;;;;  ;;;  ;     ; ;; ;; 
-;   ;;  ;; ;;; ;;;;;;;;;; ;;;;;;  ;;;;     ;;  ;;;  
-;                        ;;   ;;                    
-;                        ;;   ;                     
-;                         ;;;;                      
-
-(define skip-image-equality-fast-path (make-parameter #f))
-(define render-normalized (make-parameter #f))
-
-(define convertible<%>
-  (interface* ()
-              ([prop:convertible
-                (lambda (img format default)
-                  (case format
-                    [(png-bytes)
-                     (let ([s (open-output-bytes)])
-                       (send (to-bitmap (to-img img)) save-file s 'png)
-                       (get-output-bytes s))]
-                    [(svg-bytes) (to-svg-bytes img)]
-                    [else default]))]
-               [prop:pict-convertible
-                (λ (image)
-                  (define the-bb (send image get-bb))
-                  (pict:dc
-                   (λ (dc dx dy)
-                     (render-image image dc dx dy))
-                   (ceiling (inexact->exact (bb-right the-bb)))
-                   (ceiling (inexact->exact (bb-bottom the-bb)))
-                   0
-                   (ceiling (inexact->exact (- (bb-bottom the-bb) 
-                                               (bb-baseline the-bb))))))])))
-
-;; these are used when building a bitmap to render the final image
-;; they are probably smaller than the allowed maximum, but they are
-;; still huge
-(define maximum-width 5000)
-(define maximum-height 5000)
-
-(define (to-bitmap img)
-  (define bb (send img get-bb))
-  (define w (min (inexact->exact (ceiling (bb-right bb))) maximum-width))
-  (define h (min (inexact->exact (ceiling (bb-bottom bb))) maximum-height)) 
-  (define bm (make-bitmap w h))
-  (define bdc (new bitmap-dc% [bitmap bm]))
-  (render-image img bdc 0 0)
-  (send bdc set-bitmap #f)
-  bm)
-
-(define (to-svg-bytes img)
-  (define bb (send img get-bb))
-  (define w (min (inexact->exact (ceiling (bb-right bb))) maximum-width))
-  (define h (min (inexact->exact (ceiling (bb-bottom bb))) maximum-height)) 
-  (define s (open-output-bytes))
-  (define svg-dc (new svg-dc% [width w] [height h] [output s]))
-  (send svg-dc start-doc "")
-  (send svg-dc start-page)
-  (render-image img svg-dc 0 0)
-  (send svg-dc end-page)
-  (send svg-dc end-doc)
-  (get-output-bytes s))
-
-(define-local-member-name 
-  set-use-bitmap-cache?!
-  set-cached-bitmap
-  compute-cached-bitmap)
-
-(define image%
-  (class* snip% (convertible<%> image<%>)
-    (init-field shape bb normalized? pinhole)
-    
-    (define/override (equal-to? that eq-recur) (compare-em that eq-recur))
-    (define/override (other-equal-to? that eq-recur) (compare-em that eq-recur))
-    
-    (define/private (compare-em that eq-recur)
-      (or (eq? this that)
-          (let ([that 
-                 (cond
-                   [(is-a? that image-snip%) (image-snip->image that)]
-                   [(is-a? that bitmap%) (bitmap->image that)]
-                   [else that])])
-            (and (is-a? that image%)
-                 (same-width/height? bb (send that get-bb))
-                 (equal? pinhole (send that get-pinhole))
-                 (or (and (not (skip-image-equality-fast-path))  ;; this makes testing more effective
-                          (equal? (get-normalized-shape) (send that get-normalized-shape)))
-                     
-                     ;; some shapes (ie, rectangles) draw 1 outside the bounding box
-                     ;; so we make the bitmap slightly bigger to accommodate that.
-                     (let ([w (+ 1 (round (inexact->exact (bb-right bb))))]
-                           [h (+ 1 (round (inexact->exact (bb-bottom bb))))])
-                       (or ;(zero? w)
-                           ;(zero? h)
-                           (let ([bm1 (make-bitmap w h #t)]
-                                 [bm2 (make-bitmap w h #t)]
-                                 [bytes1 (make-bytes (* w h 4) 0)]
-                                 [bytes2 (make-bytes (* w h 4) 0)]
-                                 [bdc (make-object bitmap-dc%)])
-                             (draw-into bm1 bdc bytes1 this)
-                             (draw-into bm2 bdc bytes2 that)
-                             (equal? bytes1 bytes2)))))))))
-    
-    (define/private (draw-into bm bdc bytes obj)
-      (send bdc set-bitmap bm)
-      (send bdc erase)
-      (render-image obj bdc 0 0)
-      (send bdc get-argb-pixels 0 0 (send bm get-width) (send bm get-height) bytes #f #t))
-    
-    ;; this could render the image into a bitmap and then get the hash code of the bytes
-    ;; cannot render the tree into a string and then get the hash code of that string
-    ;;   b/c that might make equal things have the same code.
-    (define/override (equal-hash-code-of y) 42)
-    (define/override (equal-secondary-hash-code-of y) 3)
-
-    (define/public (get-shape) shape)
-    (define/public (set-shape s) (set! shape s))
-    (define/public (get-bb) bb)
-    (define/public (get-pinhole) pinhole)
-    (define/public (get-normalized?) normalized?)
-    (define/public (set-normalized? n?) (set! normalized? n?))
-    
-    (define/public (get-normalized-shape)
-      (unless normalized?
-        (set! shape (normalize-shape shape))
-        (set! normalized? #t))
-      shape)
-    
-    (inherit get-admin)
-    (define scroll-step #f)
-    (define/private (calc-scroll-step)
-      (unless scroll-step
-        ;; try to set scroll step by font size of the standard style
-        (let ([admin (get-admin)])
-          (when admin
-            (let* ([ed (send admin get-editor)]
-                   [sl (send ed get-style-list)]
-                   [standard (send sl find-named-style "Standard")])
-              (when standard
-                (let ([dc (make-object bitmap-dc% (make-object bitmap% 1 1))])
-                  (let-values ([(w h d a) (send dc get-text-extent "X" (send standard get-font))])
-                    (set! scroll-step (+ h (send admin get-line-spacing)))))))))
-        ;; if that didn't happen, set it to 12.
-        (unless scroll-step (set! scroll-step 12))))
-    
-    (define/override (get-num-scroll-steps)
-      (calc-scroll-step)
-      (inexact->exact (ceiling (/ (bb-bottom bb) scroll-step))))
-    (define/override (get-scroll-step-offset offset)
-      (calc-scroll-step)
-      (min (inexact->exact (ceiling (* offset scroll-step))) 
-           (bb-bottom bb)))
-    (define/override (find-scroll-step y)
-      (calc-scroll-step)
-      (inexact->exact (ceiling (/ y scroll-step))))
-
-    (define/override (copy) 
-      (define res (make-image shape bb normalized? pinhole))
-      (when cached-bitmap
-        (send res set-cached-bitmap cached-bitmap))
-      res)
-    
-    (define cached-bitmap #f)
-    (define use-cached-bitmap? #t)
-    
-    ;; this method is only used by the 'copy' method
-    (define/public (set-cached-bitmap bm) (set! cached-bitmap bm))
-    
-    (define/public (compute-cached-bitmap)
-      (when use-cached-bitmap?
-        (unless cached-bitmap
-          (set! cached-bitmap
-                (make-bitmap (min (+ (inexact->exact (round (bb-right bb))) 1) maximum-width) 
-                             (min (+ (inexact->exact (round (bb-bottom bb))) 1) maximum-height)))
-          (define bdc (make-object bitmap-dc% cached-bitmap))
-          (send bdc erase)
-          (render-image this bdc 0 0)
-          (send bdc set-bitmap #f))))
-    
-    (define/public (set-use-bitmap-cache?! u-b-c?) 
-      (set! use-cached-bitmap? u-b-c?)
-      (unless use-cached-bitmap?
-        (set! cached-bitmap #f)))
-    
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (compute-cached-bitmap)
-      
-      (let ([alpha (send dc get-alpha)])
-        (when (pair? draw-caret)
-          (send dc set-alpha (* alpha .5)))
-        (if use-cached-bitmap?
-            (send dc draw-bitmap cached-bitmap x y)
-            (render-image this dc x y))
-        (send dc set-alpha alpha)))
-    
-    (define/override (get-extent dc x y [w #f] [h #f] [descent #f] [space #f] [lspace #f] [rspace #f])
-      (send (get-the-snip-class-list) add snip-class)
-      (let ([bottom (round (bb-bottom bb))]
-            [right (round (bb-right bb))])
-        (set-box/f! w right)
-        (set-box/f! h bottom)
-        (set-box/f! descent (- bottom (round (bb-baseline bb))))
-        (set-box/f! space 0)
-        (set-box/f! lspace 0)
-        (set-box/f! rspace 0)))
-
-    (define/override (write f) 
-      (let ([bytes (string->bytes/utf-8 (format "~s" (list shape bb pinhole)))])
-        (send f put (bytes-length bytes) bytes)))
-    
-    (super-new)
-    
-    (inherit set-snipclass)
-    (set-snipclass snip-class)))
-
-(define (same-bb? bb1 bb2)
-  (and (same-width/height? bb1 bb2)
-       (= (round (bb-baseline bb1)) (round (bb-baseline bb2)))))
-
-(define (same-width/height? bb1 bb2)
-  (and (= (round (bb-right bb1)) (round (bb-right bb2)))
-       (= (round (bb-bottom bb1)) (round (bb-bottom bb2)))))
-
-(define racket/base:read read)
-(define image-snipclass% 
-  (class snip-class%
-    (define/override (read f) (snipclass-bytes->image (send f get-unterminated-bytes)))
-    (super-new)))
-
-(define (snipclass-bytes->image bytes)
-  (define lst (parse (fetch bytes)))
-  (cond
-    [(not lst)
-     (make-image (make-translate 50 50 (make-ellipse 100 100 0 'solid "black"))
-                 (make-bb 100 100 100)
-                 #f
-                 #f)]
-    [else
-     (make-image (list-ref lst 0)
-                 (list-ref lst 1)
-                 #f
-                 (list-ref lst 2))]))
-
-(provide snip-class) 
-(define snip-class (new image-snipclass%))
-(send snip-class set-classname (format "~s" (list '(lib "image-core.ss" "mrlib")
-                                                  '(lib "image-core-wxme.rkt" "mrlib"))))
-(send snip-class set-version 1)
-(send (get-the-snip-class-list) add snip-class)
-
-(define (set-box/f! b v) (when (box? b) (set-box! b v)))
- 
-(define (parse sexp)
-  (let/ec k
-    (let loop ([sexp sexp])
-      (cond
-        [(pair? sexp) (cons (loop (car sexp)) (loop (cdr sexp)))]
-        [(and (immutable? sexp) (hash? sexp))
-         (hash-copy sexp)]
-        [(vector? sexp)
-         (if (= (vector-length sexp) 0)
-             (k #f)
-             (cond
-               [(bytes? (vector-ref sexp 0))
-                ;; bitmaps are vectors with a bytes in the first field
-                (apply bytes->bitmap (vector->list sexp))]
-               [else
-                (let* ([tag (vector-ref sexp 0)]
-                       [args (cdr (vector->list sexp))]
-                       [constructor (id->constructor tag)]
-                       [arg-count (length args)]
-                       [parsed-args (map loop args)])
-                  (cond
-                    [(and constructor (procedure-arity-includes? constructor arg-count))
-                     (apply constructor parsed-args)]
-                    [(and (eq? tag 'struct:bitmap)
-                          (= arg-count 7))
-                     ;; we changed the arity of the bitmap constructor from old versions,
-                     ;; so fix it up here.
-                     (make-ibitmap (list-ref parsed-args 0)
-                                   (list-ref parsed-args 2)
-                                   (list-ref parsed-args 3)
-                                   (list-ref parsed-args 4)
-                                   (make-hash))]
-                    [(and (eq? tag 'struct:bitmap)
-                          (= arg-count 6))
-                     ;; we changed the arity of the bitmap constructor from old versions,
-                     ;; so fix it up here. it used to have these fields: 
-                     ;; (raw-bitmap raw-mask angle x-scale y-scale cache)
-                     ;; and the mask field was dropped in favor of always having an alpha bitmap in
-                     ;; the raw-bitmap field. The bytes that were written out always had the mask
-                     ;; factored in, tho (which led to a bug) so we can just ignore the mask here
-                     (make-ibitmap (list-ref parsed-args 0)
-                                   (list-ref parsed-args 2)
-                                   (list-ref parsed-args 3)
-                                   (list-ref parsed-args 4)
-                                   (make-hash))]
-                    [(and (eq? tag 'struct:color)
-                          (= arg-count 3))
-                     ;; we changed the arity of the color constructor from old versions,
-                     ;; so fix it up here.
-                     (make-color (list-ref parsed-args 0)
-                                 (list-ref parsed-args 1)
-                                 (list-ref parsed-args 2)
-                                 255)]
-                    [else
-                     (k #f)]))]))]
-        [else sexp]))))
-
-(define (normalized-shape? s)
-  (cond
-    [(overlay? s)
-     (and (normalized-shape? (overlay-top s))
-          (cn-or-simple-shape? (overlay-bottom s)))]
-    [else
-     (cn-or-simple-shape? s)]))
-
-(define (cn-or-simple-shape? s)
-  (cond
-    [(crop? s)
-     (normalized-shape? (crop-shape s))]
-    [else
-     (simple-shape? s)]))
-
-(define (simple-shape? shape)
-  (or (and (translate? shape)
-           (np-atomic-shape? (translate-shape shape)))
-      (polygon? shape)
-      (line-segment? shape)
-      (curve-segment? shape)))
-
-(define (atomic-shape? shape)
-  (or (polygon? shape)
-      (line-segment? shape)
-      (curve-segment? shape)
-      (ibitmap? shape)
-      (np-atomic-shape? shape)))
-
-(define (np-atomic-shape? shape)
-  (or (ellipse? shape)
-      (text? shape)
-      (and (flip? shape)
-           (boolean? (flip-flipped? shape))
-           (ibitmap? (flip-shape shape)))))
-
-;; normalize-shape : shape -> normalized-shape
-;; normalizes 'shape', calling 'f' on each atomic shape in the normalized shape.
-(define/contract (normalize-shape shape)
-  (-> any/c ;; should be shape?
-      normalized-shape?)
-  (let loop ([shape shape]
-             [dx 0]
-             [dy 0]
-             [x-scale 1]
-             [y-scale 1]
-             [bottom #f])
-    (define (scale-point p)
-      (make-point (+ dx (* x-scale (point-x p)))
-                  (+ dy (* y-scale (point-y p)))))
-    (cond
-      [(translate? shape)
-       (loop (translate-shape shape)
-             (+ dx (* x-scale (translate-dx shape)))
-             (+ dy (* y-scale (translate-dy shape)))
-             x-scale
-             y-scale
-             bottom)]
-      [(scale? shape)
-       (loop (scale-shape shape)
-             dx
-             dy
-             (* x-scale (scale-x shape))
-             (* y-scale (scale-y shape))
-             bottom)]
-      [(overlay? shape)
-       (loop (overlay-bottom shape)
-             dx dy x-scale y-scale 
-             (loop (overlay-top shape)
-                   dx dy x-scale y-scale 
-                   bottom))]
-      [(crop? shape)
-       (let* ([inside (loop (crop-shape shape)
-                            dx dy x-scale y-scale 
-                            #f)]
-              [this-one
-               (make-crop (map scale-point (crop-points shape))
-                          inside)])
-         (if bottom
-             (make-overlay bottom this-one)
-             this-one))]
-      [(polygon? shape)
-       (let* ([this-one 
-               (make-polygon (map scale-point (polygon-points shape))
-                             (polygon-mode shape)
-                             (scale-color (polygon-color shape) x-scale y-scale))])
-         (if bottom
-             (make-overlay bottom this-one)
-             this-one))]
-      [(line-segment? shape)
-       (let ([this-one 
-              (make-line-segment (scale-point (line-segment-start shape))
-                                 (scale-point (line-segment-end shape))
-                                 (scale-color (line-segment-color shape) x-scale y-scale))])
-         (if bottom
-             (make-overlay bottom this-one)
-             this-one))]
-      [(curve-segment? shape)
-       ;; the pull is multiplied by the distance 
-       ;; between the two points when it is drawn,
-       ;; so we don't need to scale it here
-       (let ([this-one 
-              (make-curve-segment (scale-point (curve-segment-start shape))
-                                  (curve-segment-s-angle shape)
-                                  (curve-segment-s-pull shape)
-                                  (scale-point (curve-segment-end shape))
-                                  (curve-segment-e-angle shape)
-                                  (curve-segment-e-pull shape)
-                                  (scale-color (curve-segment-color shape) x-scale y-scale))])
-         (if bottom
-             (make-overlay bottom this-one)
-             this-one))]
-      [(or (ibitmap? shape) (np-atomic-shape? shape))
-       (let ([shape (if (ibitmap? shape) 
-                        (make-flip #f shape)
-                        shape)])
-         (let ([this-one 
-                (make-translate dx dy (scale-np-atomic x-scale y-scale shape))])
-           (if bottom
-               (make-overlay bottom this-one)
-               this-one)))]
-      [else 
-       (error 'normalize-shape "unknown shape ~s\n" shape)])))
-
-(define/contract (scale-np-atomic x-scale y-scale shape)
-  (-> number? number? np-atomic-shape? np-atomic-shape?)
-  (cond
-    [(ellipse? shape)
-     (make-ellipse (* x-scale (ellipse-width shape))
-                   (* y-scale (ellipse-height shape))
-                   (ellipse-angle shape)
-                   (ellipse-mode shape)
-                   (scale-color (ellipse-color shape) x-scale y-scale))]
-    [(text? shape)
-     ;; should probably do something different here so that
-     ;; the y-scale is always greater than 1
-     ;; (or else always smaller than 1)
-     (make-text (text-string shape)
-                (text-angle shape)
-                (* (text-y-scale shape) (/ y-scale x-scale))
-                (text-color shape)
-                (* (text-size shape) x-scale)
-                (text-face shape)
-                (text-family shape)
-                (text-style shape)
-                (text-weight shape)
-                (text-underline shape))]
-    [(flip? shape)
-     (cond
-       [(and (= 1 x-scale) (= 1 y-scale))
-        shape]
-       [else
-        (let ([bitmap (flip-shape shape)])
-          (make-flip (flip-flipped? shape)
-                     (make-ibitmap (ibitmap-raw-bitmap bitmap)
-                                   (ibitmap-angle bitmap)
-                                   (* x-scale (ibitmap-x-scale bitmap))
-                                   (* y-scale (ibitmap-y-scale bitmap))
-                                   (ibitmap-cache bitmap))))])]))
-
-(define (scale-color color x-scale y-scale)
-  (cond
-    [(pen? color)
-     (make-pen (pen-color color)
-               (* (pen-width color) (/ (+ x-scale y-scale) 2))
-               (pen-style color)
-               (pen-cap color)
-               (pen-join color))]
-    [else color]))
-
-;                                                                
-;                                                                
-;                                                                
-;                                                                
-;                                                                
-;                                                                
-;                            ;;               ;;                 
-;                            ;;               ;;                 
-;   ;;;;  ;;;;   ;; ;;;   ;;;;;   ;;;;   ;;;;;;;  ;; ;;;  ;;;;;; 
-;   ;;;; ;;  ;;  ;;;;;;  ;;;;;;  ;;  ;;  ;;;; ;;  ;;;;;;  ;;;;;; 
-;   ;;  ;;;;;;;; ;;  ;; ;;;  ;; ;;;;;;;; ;;   ;;  ;;  ;; ;;;  ;; 
-;   ;;  ;;;      ;;  ;; ;;;  ;; ;;;      ;;   ;;  ;;  ;; ;;;  ;; 
-;   ;;   ;;; ;;  ;;  ;;  ;;;;;;  ;;; ;;  ;;   ;;  ;;  ;;  ;;;;;; 
-;   ;;    ;;;;   ;;  ;;   ;;;;;   ;;;;   ;;   ;;  ;;  ;;   ;;;;; 
-;                                                         ;; ;;; 
-;                                                         ;;;;;  
-;                                                                
-;                                                         
-
-;; render-image : image dc dx dy -> void
-(define (render-image image dc dx dy)
-  (let ([pen (send dc get-pen)]
-        [brush (send dc get-brush)]
-        [font (send dc get-font)]
-        [fg (send dc get-text-foreground)]
-        [smoothing (send dc get-smoothing)]
-        [alpha (send dc get-alpha)])
-    (cond
-      [(is-a? image bitmap%)
-       (send dc draw-bitmap image dx dy)]
-      [(is-a? image image-snip%)
-       (send dc draw-bitmap (send image get-bitmap) dx dy)]
-      [else
-       (if (render-normalized)
-           (render-normalized-shape (send image get-normalized-shape) dc dx dy)
-           (render-arbitrary-shape (send image get-shape) dc dx dy))
-       (let ([ph (send image get-pinhole)])
-         (when ph
-           (let* ([px (point-x ph)]
-                  [py (point-y ph)]
-                  [bb (image-bb image)]
-                  [w (bb-right bb)]
-                  [h (bb-bottom bb)])
-             (send dc set-alpha (* alpha .5))
-             (send dc set-smoothing 'smoothed)
-             
-             (send dc set-pen "white" 1 'solid)
-             (send dc draw-line (+ dx px .5) (+ dy .5) (+ dx px .5) (+ dy h -.5))
-             (send dc draw-line (+ dx .5) (+ dy py .5) (+ dx w -.5) (+ dy py .5))
-             
-             (send dc set-pen "black" 1 'solid)
-             (send dc draw-line (+ dx px -.5) (+ dy .5) (+ dx px -.5) (+ dy h -.5))
-             (send dc draw-line (+ dx .5) (+ dy py -.5) (+ dx w -.5) (+ dy py -.5)))))])
-    (send dc set-pen pen)
-    (send dc set-brush brush)
-    (send dc set-font font)
-    (send dc set-text-foreground fg)
-    (send dc set-smoothing smoothing)
-    (send dc set-alpha alpha)))
-
-(define (save-image-as-bitmap image filename kind)
-  (let* ([bb (send image get-bb)]
-         [bm (make-object bitmap% 
-               (+ 1 (ceiling (inexact->exact (bb-right bb))))
-               (+ 1 (ceiling (inexact->exact (bb-bottom bb)))))]
-         [bdc (make-object bitmap-dc% bm)])
-    (send bdc erase)
-    (render-image image bdc 0 0)
-    (send bdc set-bitmap #f)
-    (send bm save-file filename kind)))
-
-(define (render-normalized-shape shape dc dx dy)
-  (cond
-    [(overlay? shape)
-     (render-cn-or-simple-shape (overlay-bottom shape) dc dx dy)
-     (render-normalized-shape (overlay-top shape) dc dx dy)]
-    [else
-     (render-cn-or-simple-shape shape dc dx dy)]))
-
-(define last-cropped-points (make-parameter #f))
-
-(define (render-cn-or-simple-shape shape dc dx dy)
-  (cond
-    [(crop? shape)
-     (render-cropped-shape (crop-points shape)
-                           (crop-shape shape)
-                           (λ (s) (render-normalized-shape s dc dx dy))
-                           dc dx dy)]
-    [else
-     (render-simple-shape shape dc dx dy)]))
-
-(define (render-cropped-shape points inner-shape continue dc dx dy)
-  (cond
-    [(equal? points (last-cropped-points))
-     (continue inner-shape)]
-    [else
-     (let ([old-region (send dc get-clipping-region)]
-           [new-region (new region% [dc dc])]
-           [path (polygon-points->path points)])
-       (send new-region set-path path dx dy)
-       (when old-region (send new-region intersect old-region))
-       (send dc set-clipping-region new-region)
-       (parameterize ([last-cropped-points points])
-         (continue inner-shape))
-       (send dc set-clipping-region old-region))]))
-
-(define (render-simple-shape simple-shape dc dx dy)
-  (cond
-    [(translate? simple-shape)
-     (let ([dx (+ dx (translate-dx simple-shape))]
-           [dy (+ dy (translate-dy simple-shape))]
-           [np-atomic-shape (translate-shape simple-shape)])
-       (render-np-atomic-shape np-atomic-shape
-                               dc
-                               dx dy))]
-    [else
-     (render-poly/line-segment/curve-segment simple-shape dc dx dy)]))
-
-(define (render-arbitrary-shape shape dc dx dy)
-  (let loop ([shape shape]
-             [dx dx]
-             [dy dy]
-             [x-scale 1]
-             [y-scale 1])
-    (define (scale-point p)
-      (make-point (* x-scale (point-x p))
-                  (* y-scale (point-y p))))
-    (cond
-      [(translate? shape)
-       (loop (translate-shape shape)
-             (+ dx (* x-scale (translate-dx shape)))
-             (+ dy (* y-scale (translate-dy shape)))
-             x-scale
-             y-scale)]
-      [(scale? shape)
-       (loop (scale-shape shape)
-             dx
-             dy
-             (* x-scale (scale-x shape))
-             (* y-scale (scale-y shape)))]
-      [(overlay? shape)
-       (loop (overlay-bottom shape) dx dy x-scale y-scale)
-       (loop (overlay-top shape) dx dy x-scale y-scale)]
-      [(crop? shape)
-       (render-cropped-shape
-        (map scale-point (crop-points shape))
-        (crop-shape shape)
-        (λ (s) (loop s dx dy x-scale y-scale)) dc dx dy)]
-      [(polygon? shape)
-       (let* ([this-one 
-               (make-polygon (map scale-point (polygon-points shape))
-                             (polygon-mode shape)
-                             (scale-color (polygon-color shape) x-scale y-scale))])
-         (render-poly/line-segment/curve-segment this-one dc dx dy))]
-      [(line-segment? shape)
-       (let ([this-one 
-              (make-line-segment (scale-point (line-segment-start shape))
-                                 (scale-point (line-segment-end shape))
-                                 (scale-color (line-segment-color shape) x-scale y-scale))])
-         (render-poly/line-segment/curve-segment this-one dc dx dy))]
-      [(curve-segment? shape)
-       ;; the pull is multiplied by the distance 
-       ;; between the two points when it is drawn,
-       ;; so we don't need to scale it here
-       (let ([this-one 
-              (make-curve-segment (scale-point (curve-segment-start shape))
-                                  (curve-segment-s-angle shape)
-                                  (curve-segment-s-pull shape)
-                                  (scale-point (curve-segment-end shape))
-                                  (curve-segment-e-angle shape)
-                                  (curve-segment-e-pull shape)
-                                  (scale-color (curve-segment-color shape) x-scale y-scale))])
-         (render-poly/line-segment/curve-segment this-one dc dx dy))]
-      [(or (ibitmap? shape) (np-atomic-shape? shape))
-       (let* ([shape (if (ibitmap? shape) 
-                         (make-flip #f shape)
-                         shape)]
-              [this-one (scale-np-atomic x-scale y-scale shape)])
-         (render-np-atomic-shape this-one dc dx dy))]
-      [else 
-       (error 'normalize-shape "unknown shape ~s\n" shape)])))
-
-(define/contract (render-poly/line-segment/curve-segment simple-shape dc dx dy)
-  (-> (or/c polygon? line-segment? curve-segment?) any/c any/c any/c void?)
-  (cond
-    [(polygon? simple-shape)
-     (let ([mode (polygon-mode simple-shape)]
-           [color (polygon-color simple-shape)]
-           [path (polygon-points->path (polygon-points simple-shape))])
-       (send dc set-pen (mode-color->pen mode color))
-       (send dc set-brush (mode-color->brush mode color))
-       (send dc set-smoothing (mode-color->smoothing mode color))
-       (send dc draw-path path dx dy 'winding))]
-    [(line-segment? simple-shape)
-     (let* ([start (line-segment-start simple-shape)]
-            [end (line-segment-end simple-shape)]
-            [path (new dc-path%)]
-            [sx (point-x start)]
-            [sy (point-y start)]
-            [ex (point-x end)]
-            [ey (point-y end)])
-       (send path move-to sx sy)
-       (send path line-to ex ey)
-       (send dc set-pen (mode-color->pen 'outline (line-segment-color simple-shape)))
-       (send dc set-brush "black" 'transparent)
-       (send dc set-smoothing 'smoothed)
-       (send dc draw-path path dx dy))]
-    [(curve-segment? simple-shape)
-     (define path (curve-segment->path simple-shape))
-     (send dc set-pen (mode-color->pen 'outline (curve-segment-color simple-shape)))
-     (send dc set-brush "black" 'transparent)
-     (send dc set-smoothing 'smoothed)
-     (send dc draw-path path dx dy)]))
-
-(define (curve-segment->path simple-shape)
-  (define start (curve-segment-start simple-shape))
-  (define end (curve-segment-end simple-shape))
-  (define sx (point-x start))
-  (define sy (point-y start))
-  (define ex (point-x end))
-  (define ey (point-y end))
-  (define sa (degrees->radians (curve-segment-s-angle simple-shape)))
-  (define ea (degrees->radians (curve-segment-e-angle simple-shape)))
-
-  (define path (new dc-path%))
-  (define d (sqrt (+ (sqr (- ey sy)) (sqr (- ex sx)))))
-  (define sp (* (curve-segment-s-pull simple-shape) d))
-  (define ep (* (curve-segment-e-pull simple-shape) d))
-  (send path move-to sx sy)
-  (send path curve-to
-        (+ sx (* sp (cos sa)))
-        (- sy (* sp (sin sa)))
-        (- ex (* ep (cos ea)))
-        (+ ey (* ep (sin ea)))
-        ex
-        ey)
-  path)
-
-(define (render-np-atomic-shape np-atomic-shape dc dx dy)
-  (cond
-    [(ellipse? np-atomic-shape)
-     (let* ([path (new dc-path%)]
-            [ew (ellipse-width np-atomic-shape)]
-            [eh (ellipse-height np-atomic-shape)]
-            [θ (degrees->radians (ellipse-angle np-atomic-shape))]
-            [color (ellipse-color np-atomic-shape)]
-            [mode (ellipse-mode np-atomic-shape)])
-       (let-values ([(rotated-width rotated-height) (ellipse-rotated-size ew eh θ)])
-         (send path ellipse 0 0 ew eh)
-         (send path translate (- (/ ew 2)) (- (/ eh 2)))
-         (send path rotate θ)
-         (send dc set-pen (mode-color->pen mode color))
-         (send dc set-brush (mode-color->brush mode color))
-         (send dc set-smoothing (mode-color->smoothing mode color))
-         (send dc draw-path path dx dy)))]
-    [(flip? np-atomic-shape) 
-     (cond
-       [(flip-flipped? np-atomic-shape)
-        (define key (get-bitmap-cache-key np-atomic-shape))
-        (define bm (lookup/calc-rendered-bitmap np-atomic-shape key))
-        (send dc set-smoothing 'smoothed)
-        (send dc draw-bitmap 
-              bm
-              (- dx (/ (send bm get-width) 2))
-              (- dy (/ (send bm get-height) 2)))]
-       [else
-        (define transformation (send dc get-transformation))
-        (define bitmap (flip-shape np-atomic-shape))
-        (define bitmap-obj (ibitmap-raw-bitmap bitmap))
-         
-        (define θ (degrees->radians (ibitmap-angle bitmap)))
-        
-        (send dc translate dx dy)
-        (send dc rotate θ)
-        
-        (define bw (send bitmap-obj get-width))
-        (define bh (send bitmap-obj get-height))
-  
-        (send dc translate 
-              (* (ibitmap-x-scale bitmap) (- (/ bw 2)))
-              (* (ibitmap-y-scale bitmap) (- (/ bh 2))))
-        (send dc set-scale (ibitmap-x-scale bitmap) (ibitmap-y-scale bitmap))
-        
-        (send dc draw-bitmap bitmap-obj 0 0)
-        
-        (send dc set-transformation transformation)
-        bitmap-obj])]
-    [(text? np-atomic-shape)
-     (let ([θ (degrees->radians (text-angle np-atomic-shape))]
-           [font (send dc get-font)])
-       (send dc set-font (text->font np-atomic-shape))
-       (send dc set-smoothing 'aligned) ;; should this be smoothed?
-       (let ([color (get-color-arg (text-color np-atomic-shape))])
-         (send dc set-text-foreground 
-               (cond
-                 [(equal? color "transparent") transparent-color]
-                 [(string? color)
-                  (or (send the-color-database find-color color)
-                      (send the-color-database find-color "black"))]
-                 [else color])))
-       (let-values ([(w h _1 _2) (send dc get-text-extent (text-string np-atomic-shape))])
-         (let ([p (- (make-rectangular dx dy)
-                     (* (make-polar 1 (- θ)) (make-rectangular (/ w 2) (/ h 2))))])
-           (send dc draw-text (text-string np-atomic-shape) 
-                 (real-part p)
-                 (imag-part p) 
-                 #f 0 θ))))]))
-
-(define (polygon-points->path points)
-  (let ([path (new dc-path%)])
-    (send path move-to (point-x (car points)) (point-y (car points)))
-    (let loop ([points (cdr points)])
-      (unless (null? points)
-        (send path line-to 
-              (point-x (car points))
-              (point-y (car points)))
-        (loop (cdr points))))
-    (send path close)
-    ;(send path line-to (round (point-x (car points))) (round (point-y (car points))))
-    path))
-
-(define (points->bb-path points)
-  (let ([path (new dc-path%)])
-    (let-values ([(left top right bottom) (points->ltrb-values points)])
-      (send path move-to left top)
-      (send path line-to right top)
-      (send path line-to right bottom)
-      (send path line-to left bottom)
-      (send path line-to left top)
-      path)))
-
-;; points->ltrb-values : (cons point (listof points)) -> (values number number number number)
-(define (points->ltrb-values points)
-  (let* ([fx (point-x (car points))]
-         [fy (point-y (car points))]
-         [left fx]
-         [top fy]
-         [right fx]
-         [bottom fy])
-    (for-each (λ (point)
-                (let ([new-x (point-x point)]
-                      [new-y (point-y point)])
-                  (set! left (min new-x left))
-                  (set! top (min new-y top))
-                  (set! right (max new-x right))
-                  (set! bottom (max new-y bottom))))
-              (cdr points))
-    (values left top right bottom)))
-  
-#|
-
-the mask bitmap and the original bitmap are all together in a single bytes!
-
-|#
-
-
-(define (get-bitmap-cache-key flip-bitmap)
-  (define bm (flip-shape flip-bitmap))
-  (list (flip-flipped? flip-bitmap)
-        (ibitmap-x-scale bm)
-        (ibitmap-y-scale bm)
-        (ibitmap-angle bm)))
-
-(define (lookup/calc-rendered-bitmap flip-bitmap key)
-  (let ([bitmap (flip-shape flip-bitmap)])
-    (cond
-      [(hash-ref (ibitmap-cache bitmap) key #f) => values]
-      [else
-       (let ([flipped? (flip-flipped? flip-bitmap)])
-         (define orig-bitmap-obj (ibitmap-raw-bitmap bitmap))
-         (define bitmap-obj
-           (cond
-             [(<= (* (ibitmap-x-scale bitmap) 
-                     (ibitmap-y-scale bitmap))
-                  1)
-              ;; since we prefer to rotate big things, we rotate first
-              (do-scale bitmap (do-rotate bitmap orig-bitmap-obj flipped?))]
-             [else
-              ;; since we prefer to rotate big things, we scale first
-              (do-rotate bitmap (do-scale bitmap orig-bitmap-obj) flipped?)]))
-         (hash-set! (ibitmap-cache bitmap) key bitmap-obj)
-         bitmap-obj)])))
-
-(define (do-rotate bitmap bitmap-obj flip?)
-  (cond
-    [(and (not flip?) (zero? (ibitmap-angle bitmap)))
-     ;; don't rotate anything in this case.
-     bitmap-obj]
-    ;; speed up rotated (but not flipped) bitmaps
-    [(not flip?)
-     (define θ (degrees->radians (ibitmap-angle bitmap)))
-     (define ow (send bitmap-obj get-width))
-     (define oh (send bitmap-obj get-height))
-     (define unrotated-pts
-       (list (make-rectangular 0 0)
-             (make-rectangular ow 0)
-             (make-rectangular ow oh)
-             (make-rectangular 0 oh)))
-     (define pts (map (λ (p) (* p (make-polar 1 θ))) unrotated-pts))
-     (define longitudes (map real-part pts))
-     (define latitudes (map imag-part pts))
-     (define east (apply max longitudes))
-     (define west (apply min longitudes))
-     (define nrth (apply min latitudes))
-     (define sth  (apply max latitudes))
-     (define new-w (ceiling (inexact->exact (- east west))))
-     (define new-h (ceiling (inexact->exact (- sth nrth))))
-
-     (define new-bm (make-bitmap new-w new-h))
-     (define bdc (make-object bitmap-dc% new-bm))
-     (send bdc set-smoothing 'smoothed)
-     (send bdc rotate (- θ))
-     
-     ;; would like to just translate by 'tp', but
-     ;; the dc applies the translations before applying
-     ;; the rotation, so we have to unrotate the translation
-     ;; before telling the dc about it
-     (define tp (make-rectangular (- west) (- nrth)))
-     (define tp-translated (* tp (make-polar 1 (- θ))))
-     
-     (send bdc translate (real-part tp-translated) (imag-part tp-translated))
-     
-     (send bdc draw-bitmap bitmap-obj 0 0)
-     (send bdc set-bitmap #f)
-     new-bm]
-    
-    [else
-     (define θ (degrees->radians (ibitmap-angle bitmap)))
-     (define-values (bytes w h) (bitmap->bytes bitmap-obj #f))
-     (define-values (rotated-bytes rotated-w rotated-h) (rotate-bytes bytes w h θ))
-     (define flipped-bytes (if flip?
-                               (flip-bytes rotated-bytes rotated-w rotated-h)
-                               rotated-bytes))
-     (define bm (bytes->bitmap flipped-bytes rotated-w rotated-h))
-     bm]))
-
-(define (do-scale bitmap orig-bm)
-  (define x-scale (ibitmap-x-scale bitmap))
-  (define y-scale (ibitmap-y-scale bitmap))
-  (cond
-    [(and (= 1 x-scale) (= 1 y-scale))
-     ;; no need to scale in this case
-     orig-bm]
-    [else
-     (define bdc (make-object bitmap-dc%))
-     (define orig-w (send orig-bm get-width))
-     (define orig-h (send orig-bm get-height))
-     (define scale-w (ceiling (inexact->exact (* x-scale (send orig-bm get-width)))))
-     (define scale-h (ceiling (inexact->exact (* y-scale (send orig-bm get-height)))))
-     (define new-bm (make-bitmap scale-w scale-h))
-     
-     (send bdc set-bitmap new-bm)
-     (send bdc set-scale x-scale y-scale)
-     (send bdc erase)
-     (send bdc draw-bitmap orig-bm 0 0)
-     
-     (send bdc set-bitmap #f)
-     
-     new-bm]))
-
-(define (text->font text)
-  (define adjusted-size (min (max (inexact->exact (round (text-size text))) 1) 255))
-  (cond
-    [(text-face text)
-     (send the-font-list find-or-create-font
-           adjusted-size
-           (text-face text)
-           (text-family text)
-           (text-style text) 
-           (text-weight text)
-           (text-underline text)
-           'default
-           #t)]
-    [else
-     (send the-font-list find-or-create-font
-           adjusted-size
-           (text-family text)
-           (text-style text) 
-           (text-weight text)
-           (text-underline text)
-           'default
-           #t)]))
-
-(define (ellipse-rotated-size ew eh θ)
-  (cond
-    [(and (zero? ew) (zero? eh))
-     (values 0 0)]
-    [(zero? eh)
-     (values (* (cos θ) ew)
-             (* (sin θ) ew))]
-    [(zero? ew)
-     (values (* (sin θ) eh)
-             (* (cos θ) eh))]
-    [else
-     (let* ([t1 (atan (/ eh ew (exact->inexact (tan θ))))]
-            ; a*cos(t1),b*sin(t1) is the point on *original* ellipse which gets rotated to top.
-            [t2 (atan (/ (* (- eh) (tan θ)) ew))] ; the original point rotated to right side.
-            [rotated-height (+ (* ew (sin θ) (cos t1)) (* eh (cos θ) (sin t1)))]
-            [rotated-width  (- (* ew (cos θ) (cos t2)) (* eh (sin θ) (sin t2)))])
-       (values (abs rotated-width)
-               (abs rotated-height)))]))
-
-(define (mode-color->smoothing mode color)
-  (cond
-    [(and (eq? mode 'outline)
-          (not (pen? color)))
-     'aligned]
-    [else 'smoothed]))
-
-(define (mode-color->pen mode color)
-  (cond
-    [(eq? mode 'outline)
-     (cond
-       [(pen? color)
-        (pen->pen-obj/cache color)]
-       [else
-        (send the-pen-list find-or-create-pen (get-color-arg color) 0 'solid 'round 'miter)])]
-    [else
-     (send the-pen-list find-or-create-pen "black" 1 'transparent)]))
-
-(define (mode-color->brush mode color)
-  (cond
-    [(eq? mode 'outline)
-     (send the-brush-list find-or-create-brush "black" 'transparent)]
-    [else
-     ;; this should only be 'solid if we have an old image from a save file somewhere
-     (define extra-alpha (if (eq? mode 'solid)
-                             255
-                             mode))
-     (send the-brush-list find-or-create-brush (get-color-arg color extra-alpha) 'solid)]))
-
-(define (get-color-arg color [extra-alpha 255])
-  (cond
-    [(equal? color "transparent") transparent-color]
-    [(string? color) 
-     (define color-obj 
-       (or (send the-color-database find-color color)
-           (send the-color-database find-color "black")))
-     (make-object color%
-       (send color-obj red)
-       (send color-obj green)
-       (send color-obj blue)
-       (/ extra-alpha 255))]
-    [else
-     (make-object color% 
-       (color-red color)
-       (color-green color)
-       (color-blue color)
-       (* (/ (color-alpha color) 255)
-          (/ extra-alpha 255)))]))
-
-(define transparent-color (make-object color% 255 255 255 0))
-
-(define (pen->pen-obj/cache pen)
-  (send the-pen-list find-or-create-pen 
-        (get-color-arg (pen-color pen))
-        (pen-width pen)
-        (pen-style pen)
-        (pen-cap pen)
-        (pen-join pen)))
-       
-(define (to-img arg)
-  (cond
-    [(is-a? arg image-snip%) (image-snip->image arg)]
-    [(is-a? arg bitmap%) (bitmap->image arg)]
-    [else arg]))
-
-(define (image-snip->image is)
-  (let ([bm (send is get-bitmap)])
-    (cond
-      [(not bm)
-       ;; this might mean we have a cache-image-snip% 
-       ;; or it might mean we have a useless snip.
-       (let-values ([(w h) (if (is-a? is cis:cache-image-snip%)
-                               (send is get-size)
-                               (values 0 0))])
-         (make-image (make-polygon
-                      (list (make-point 0 0)
-                            (make-point w 0)
-                            (make-point w h)
-                            (make-point 0 h))
-                      'solid "black")
-                     (make-bb w h h)
-                     #f))]
-      [else
-       (bitmap->image bm
-                      (or (send is get-bitmap-mask)
-                          (send bm get-loaded-mask)))])))
-
-(define (bitmap->image bm [mask-bm (send bm get-loaded-mask)])
-  (define w (send bm get-width))
-  (define h (send bm get-height))
-  (define alpha-bm
-    (cond
-      [(send bm has-alpha-channel?)
-       bm]
-      [else
-       (define new-bm (make-bitmap w h))
-       (define bdc (make-object bitmap-dc% new-bm))
-       (send bdc draw-bitmap bm 0 0 'solid
-             (send the-color-database find-color "black")
-             mask-bm)
-       (send bdc set-bitmap #f)
-       new-bm]))
-  (make-image (make-translate (/ w 2)
-                              (/ h 2)
-                              (make-ibitmap alpha-bm 0 1 1 (make-hash)))
-              (make-bb w h h)
-              #f))
-
-(define (bitmap-write bitmap port mode)
-  (let* ([v (struct->vector bitmap)]
-         [recur (case mode
-                  [(#t) write]
-                  [(#f) display]
-                  [else (lambda (p port) (print p port mode))])]
-         [update 
-          (λ (i)
-            (let ([o (vector-ref v i)])
-              (let ([nv (and o 
-                             (call-with-values (λ () (bitmap->bytes o #f)) vector))])
-                (vector-set! v i nv))))])
-    (update 1)
-    ;; don't save the cache
-    (vector-set! v 5 (make-hash))
-    (recur v port)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-(provide make-image image-shape image-bb image-normalized? image%
-        
-         un/cache-image compute-image-cache
-         
-         (struct-out bb)
-         (struct-out point)
-         make-overlay overlay? overlay-top overlay-bottom
-         make-translate translate? translate-dx translate-dy translate-shape
-         make-scale scale? scale-x scale-y scale-shape
-         make-crop crop? crop-points crop-shape
-         make-ellipse ellipse? ellipse-width ellipse-height ellipse-angle ellipse-mode ellipse-color
-         make-text text? text-string text-angle text-y-scale text-color
-         text-angle text-size text-face text-family text-style text-weight text-underline
-         make-polygon polygon? polygon-points polygon-mode polygon-color
-         make-line-segment line-segment? line-segment-start line-segment-end line-segment-color
-         make-curve-segment curve-segment? 
-         curve-segment-start curve-segment-s-angle curve-segment-s-pull
-         curve-segment-end curve-segment-e-angle curve-segment-e-pull 
-         curve-segment-color
-         make-pen pen? pen-color pen-width pen-style pen-cap pen-join pen
-         
-         make-ibitmap ibitmap? ibitmap-raw-bitmap ibitmap-angle ibitmap-x-scale ibitmap-y-scale 
-         ibitmap-cache
-
-         make-flip flip? flip-flipped? flip-shape
-         
-         (except-out (struct-out color) make-color)
-         (rename-out [-make-color make-color]) 
-         
-         degrees->radians
-         normalize-shape
-         ellipse-rotated-size
-         points->ltrb-values
-
-         image?
-         
-         text->font
-         render-image
-         save-image-as-bitmap
-         
-         skip-image-equality-fast-path
-         render-normalized
-         
-         scale-np-atomic
-         
-         to-img
-         bitmap->image
-         image-snip->image
-         image-snip%
-         
-         curve-segment->path
-         mode-color->pen
-         
-         snipclass-bytes->image)
-
-;; method names
-(provide get-shape get-bb get-pinhole get-normalized? get-normalized-shape)
-
-(provide np-atomic-shape? atomic-shape? simple-shape? cn-or-simple-shape? normalized-shape?)
-
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/include-bitmap.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/include-bitmap.rkt
deleted file mode 100644
index 60952ea9c6..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/include-bitmap.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class
-         racket/file
-         setup/main-collects)
-(require (for-syntax racket/base
-                     syntax/path-spec
-                     compiler/cm-accomplice
-                     setup/main-collects))
-
-(provide include-bitmap
-         include-bitmap/relative-to)
-
-(define-syntax (-include-bitmap stx)
-  (syntax-case stx ()
-    [(_ orig-stx source path-spec type)
-     (let* ([c-file (resolve-path-spec #'path-spec #'source #'orig-stx)]
-            [content
-             (with-handlers ([exn:fail?
-                              (lambda (exn)
-                                (error 'include-bitmap
-                                       "could not load ~e: ~a"
-                                       c-file
-                                       (if (exn? exn)
-                                           (exn-message exn)
-                                           (format "~e" exn))))])
-               (with-input-from-file c-file
-                 (lambda ()
-                   (read-bytes (file-size c-file)))))])
-       (register-external-file c-file)
-       (with-syntax ([content content]
-                     [c-file (path->main-collects-relative c-file)])
-         (syntax/loc stx
-           (get-or-load-bitmap content 'path-spec type))))]))
-
-(define-syntax (include-bitmap/relative-to stx)
-  (syntax-case stx ()
-    [(_ source path-spec) #`(-include-bitmap #,stx source path-spec 'unknown/mask)]
-    [(_ source path-spec type) #`(-include-bitmap #,stx source path-spec type)]))
-
-(define-syntax (include-bitmap stx)
-  (syntax-case stx ()
-    [(_ path-spec) #`(-include-bitmap #,stx #,stx path-spec 'unknown/mask)]
-    [(_ path-spec type) #`(-include-bitmap #,stx #,stx path-spec type)]))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Run-time support
-
-(define cached (make-hash))
-
-(define (get-or-load-bitmap content orig type)
-  (hash-ref cached 
-            (cons content type)
-            (λ ()
-              (define-values (in out) (make-pipe))
-              (thread
-               (λ () 
-                 (display content out)
-                 (close-output-port out)))
-              
-              (define bm (make-object bitmap% in type))
-              (unless (send bm ok?)
-                (error 'include-bitmap
-                       "unable to parse image, originated from: ~a"
-                       (path->string (main-collects-relative->path orig))))
-              (hash-set! cached (cons content type) bm)
-              bm)))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/info.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/info.rkt
deleted file mode 100644
index a297bb927f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all (mflatt robby))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/interactive-value-port.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/interactive-value-port.rkt
deleted file mode 100644
index 566faf280c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/interactive-value-port.rkt
+++ /dev/null
@@ -1,91 +0,0 @@
-(module interactive-value-port mzscheme
-  (require mzlib/pretty
-           mred
-           mzlib/class
-           "syntax-browser.rkt")
-  (provide set-interactive-display-handler
-           set-interactive-write-handler
-           set-interactive-print-handler)
-
-  (define op (current-output-port))
-  (define (oprintf . x) (apply fprintf op x))
-  
-  (define (set-interactive-display-handler port)
-    (let ([original-port-display-handler (port-display-handler port)])
-      (port-display-handler
-       port
-       (λ (val port)
-         (cond
-           [(string? val) (original-port-display-handler val port)]
-           [else
-            (do-printing pretty-display val port)])))))
-  
-  (define (set-interactive-write-handler port)
-    (port-write-handler
-     port
-     (λ (val port)
-       (do-printing pretty-print val port))))
-  
-  (define (set-interactive-print-handler port)
-    (port-print-handler
-      port
-      (λ (val port)
-        (do-printing pretty-print val port))))
-            
-  (define (use-number-snip? x)
-    (and #f
-         (number? x)
-         (exact? x)
-         (real? x)
-         (not (integer? x))))
-
-  (define default-pretty-print-current-style-table (pretty-print-current-style-table))
-
-  (define (do-printing pretty value port)
-    (parameterize (;; these handlers aren't used, but are set to override the user's settings
-                   [pretty-print-print-line (λ (line-number op old-line dest-columns) 
-                                                (when (and (not (equal? line-number 0))
-                                                           (not (equal? dest-columns 'infinity)))
-                                                  (newline op))
-                                                0)]
-                   [pretty-print-pre-print-hook (λ (val port) (void))]
-                   [pretty-print-post-print-hook (λ (val port) (void))]
-                   [pretty-print-columns 'infinity]
-                   [pretty-print-exact-as-decimal #f]
-                   [pretty-print-depth #f]
-                   [pretty-print-.-symbol-without-bars #f]
-                   [pretty-print-show-inexactness #f]
-                   [pretty-print-abbreviate-read-macros #t]
-                   [pretty-print-current-style-table default-pretty-print-current-style-table]
-                   [pretty-print-remap-stylable (λ (x) #f)]
-                   [pretty-print-print-line
-                    (lambda (line port offset width)
-                      (when (and (number? width)
-                                 (not (eq? 0 line)))
-                        (newline port))
-                      0)]
-                   
-                   [pretty-print-size-hook
-                    (λ (value display? port)
-                      (cond
-                        [(not (port-writes-special? port)) #f]
-                        [(is-a? value snip%) 1]
-                        ;[(use-number-snip? value) 1]
-                        [(syntax? value) 1]
-                        [else #f]))]
-                   [pretty-print-print-hook
-                    (λ (value display? port)
-                      (cond
-                        [(is-a? value snip%)
-                         (write-special value port)
-                         1]
-                        #;
-                        [(use-number-snip? value)
-                         (write-special
-                          (number-snip:make-repeating-decimal-snip value #f)
-                          port)
-                         1]
-                        [(syntax? value)
-                         (write-special (render-syntax/snip value))]
-                        [else (void)]))])
-      (pretty value port))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/matrix-snip.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/matrix-snip.rkt
deleted file mode 100644
index c383d56801..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/matrix-snip.rkt
+++ /dev/null
@@ -1,101 +0,0 @@
-#lang scheme/base 
-
-(require scheme/class
-         (prefix-in scheme: (only-in scheme/base read))
-         mrlib/cache-image-snip)
-
-(provide visible-matrix%
-         matrix-snip-class%
-         (rename-out (matrix-snip-class snip-class))
-         v?
-         v-m
-         matrix<%>
-         build-bitmap ;; from cache-image-snip
-         overlay-bitmap
-         )
-
-(define matrix<%> 
-  (interface ()
-    ->rectangle ;; -> [Listof [Listof X]]
-    ))
-
-(define visible-matrix<%> 
-  (interface ()
-    get-M ;; -> matrix<%> u [Listof [Listof X]]
-    ))
-
-;; ---------------------------------------------------------------------------
-
-(define (v-m VM) (send VM get-M))
-(define (v? VM) (is-a? VM visible-matrix%))
-
-;; representing a matrix that renders itself as an image, as in "image.rkt"
-(define visible-matrix%
-  (class cache-image-snip%
-    (inherit set-snipclass get-argb)
-    (inherit-field dc-proc argb-proc width height argb px py)
-    
-    (init M_0)
-    (field 
-     [M (if (is-a? M_0 matrix<%>) M_0 #f)]
-     [R (cond
-          [M #f]
-          [(pair? M_0) M_0]
-          [else
-           (error 'visible% "expects matrix or rectangle, given: ~e" M_0)])])
-
-    (define/public (get-M) (if M M R))
-    
-    ;; create a matrix from this instance 
-    (define/override (copy)
-      (new visible-matrix%
-           (M_0 (get-M)) (dc-proc dc-proc) (argb-proc argb-proc)
-           (width width) (height height) (px px) (py py) (argb argb)))
-
-    (define/private (->s-expr)
-      (list (if R R (send M ->rectangle))
-            (list (argb-vector (get-argb)) width px py)))
-    
-    (define/override (write f)
-      (define x (format "~s" (->s-expr)))
-      (define y (string->bytes/utf-8 x))
-      (send f put y))
-    
-    (super-new)
-    (set-snipclass matrix-snip-class)))
-
-;; the snip class for matrices
-(define matrix-snip-class% 
-  (class cache-image-snip-class% 
-    (super-new)
-    (define/override (read f)
-      (define b (send f get-bytes))
-      (data->snip 
-       (and b
-            (not (equal? b #""))
-            (with-handlers ((exn:fail:read? (λ (x) #f)))
-              (scheme:read (open-input-bytes b))))))
-    (define/override (data->snip data) 
-      (define _ (unless data (error 'read "in matrix-snip-class% failed")))
-      (define new-cache-image-snip (super data->snip (cadr data)))
-      (define-values (w h) (send new-cache-image-snip get-size))
-      (define M (car data))
-      ;; .. but we need to produce a visible-matrix% instead
-      (new visible-matrix% 
-           (M_0 M)
-           (dc-proc (send new-cache-image-snip get-dc-proc))
-           (argb-proc (send new-cache-image-snip get-argb-proc))
-           (width w)
-           (height h)
-           (argb (get-argb new-cache-image-snip))
-           (px (get-px new-cache-image-snip))
-           (py (get-py new-cache-image-snip))))))
-(define get-argb (class-field-accessor cache-image-snip% argb))
-(define get-px (class-field-accessor cache-image-snip% px))
-(define get-py (class-field-accessor cache-image-snip% py))
-
-;; setting up the 'snip class' 
-(define matrix-snip-class (new matrix-snip-class%))
-(send matrix-snip-class set-version 1)
-(send matrix-snip-class set-classname (format "~s" `(lib "matrix.ss" "htdp")))
-(send the-drscheme-snip-class #;(get-the-snip-class-list) add matrix-snip-class)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/name-message.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/name-message.rkt
deleted file mode 100644
index f0f085cc3e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/name-message.rkt
+++ /dev/null
@@ -1,340 +0,0 @@
-#lang racket/gui
-
-(define (get-left-side-padding) (+ button-label-inset circle-spacer))
-(define button-label-inset 1)
-(define black-color (make-object color% "BLACK"))
-
-(define triangle-width 10)
-(define triangle-height 14)
-(define triangle-color (make-object color% 50 50 50))
-
-(define border-inset 1)
-(define circle-spacer 4)
-(define rrect-spacer 3)
-
-(provide/contract
- [get-left-side-padding (-> number?)]
- [pad-xywh (-> number? number? (>=/c 0) (>=/c 0)
-               (values number? number? (>=/c 0) (>=/c 0)))]
- [draw-button-label
-  (->i ([dc (is-a?/c dc<%>)]
-        [label (or/c false/c string?)]
-        [x number?]
-        [y number?]
-        [w number?]
-        [h (and/c number? (>=/c (* 2 border-inset)))]
-        [mouse-over? boolean?]
-        [grabbed? boolean?]
-        [button-label-font (is-a?/c font%)]
-        [bkg-color (or/c false/c (is-a?/c color%) string?)])
-       #:pre (w h)
-       (w . > . (- h (* 2 border-inset)))
-       [result void?])]
- 
- [calc-button-min-sizes
-  (->* ((is-a?/c dc<%>) string?)
-       ((is-a?/c font%))
-       (values number? number?))])
-
-(provide name-message%)
-
-(define name-message%
-  (class canvas% 
-    (init-field [string-constant-untitled "Untitled"]
-                [string-constant-no-full-name-since-not-saved 
-                 "The file does not have a full name because it has not yet been saved."])
-    (inherit popup-menu get-dc get-size get-client-size min-width min-height
-             stretchable-width stretchable-height
-             get-top-level-window refresh)
-  
-    (define short-title? #f)
-    
-    (define hidden? #f)
-    (define/public (set-hidden? d?) 
-      (unless (eq? hidden? d?)
-        (set! hidden? d?)
-        (refresh)))
-    
-    (define allow-to-shrink #f)
-    (define/public (set-allow-shrinking w) 
-      (unless (eq? w allow-to-shrink)
-        (set! allow-to-shrink w)
-        (set! to-draw-message #f)
-        (update-min-sizes)))
-    
-    (define paths #f)
-    
-    ;; label : string
-    (init-field [label string-constant-untitled]
-                [font small-control-font])
-    
-    (define/private (get-label)
-      (if short-title?
-          "/"
-          label))
-    
-    (define full-name-window #f)
-    
-    (define mouse-grabbed? #f)
-    (define mouse-over? #f)
-    
-    (define/public (on-choose-directory dir)
-      (void))
-    
-    ;; set-message : boolean (union #f path string) -> void
-    ;; if file-name? is #t, path-name should be a path (or #f)
-    ;; if file-name? is #f, path-name should be a string (or #f)
-    (define/public (set-message file-name? path-name)
-      (set! paths (if (and file-name? 
-                           path-name 
-                           (file-exists? path-name))
-                      (map path->string (explode-path (simple-form-path path-name)))
-                      #f))
-      (let ([new-label (cond
-                         [(and paths (not (null? paths))) (last paths)]
-                         [path-name path-name]
-                         [else string-constant-untitled])])
-        (unless (equal? label new-label)
-          (set! label new-label)
-          (set! to-draw-message #f)
-          (update-min-sizes)
-          (refresh))))
-    
-    (define/public (set-short-title st?) 
-      (set! short-title? st?)
-      (set! to-draw-message #f)
-      (update-min-sizes)
-      (refresh))
-    
-    (define/public (fill-popup menu reset)
-      (if (and paths (not (null? paths)))
-          (let loop ([paths (cdr (reverse paths))])
-            (cond
-              [(null? paths) (void)]
-              [else 
-               (make-object menu-item% (car paths) menu
-                 (lambda (evt item)
-                   (reset)
-                   (on-choose-directory (apply build-path (reverse paths)))))
-               (loop (cdr paths))]))
-          (let ([i (make-object menu-item% 
-                     string-constant-no-full-name-since-not-saved
-                     menu void)])
-            (send i enable #f))))
-    
-    (define/override (on-event evt)
-      (unless hidden?
-        (let-values ([(max-x max-y) (get-size)])
-          (let ([inside? (and (not (send evt leaving?))
-                              (<= 0 (send evt get-x) max-x)
-                              (<= 0 (send evt get-y) max-y))])
-            (unless (eq? inside? mouse-over?)
-              (set! mouse-over? inside?)
-              (refresh))))
-        
-        (cond
-          [(send evt button-down?)
-           (let-values ([(width height) (get-size)]
-                        [(reset) (lambda ()
-                                   (set! mouse-grabbed? #f)
-                                   (set! mouse-over? #f)
-                                   (refresh))])
-             (set! mouse-over? #t)
-             (set! mouse-grabbed? #t)
-             (let ([menu (make-object popup-menu% #f
-                           (lambda x
-                             (reset)))])
-               (fill-popup menu reset)
-               
-               ;; Refresh the screen (wait for repaint)
-               (set! paint-sema (make-semaphore))
-               (refresh) 
-               (yield paint-sema)
-               (set! paint-sema #f)
-               
-               ;; Popup menu
-               (popup-menu menu
-                           0
-                           height)))])))
-    
-    (define paint-sema #f)
-    
-    (inherit get-parent)
-    (define/private (update-min-sizes)
-      (let-values ([(w h) (calc-button-min-sizes (get-dc) (get-label) font)])
-        (cond
-          [allow-to-shrink
-           (cond
-             [(< w allow-to-shrink)
-              (stretchable-width #f)
-              (min-width w)]
-             [else
-              (stretchable-width #t)
-              (min-width allow-to-shrink)])]
-          [else
-           (min-width w)])
-        (min-height h)
-        (send (get-parent) reflow-container)))
-    
-    (define/override (on-paint)
-      (when paint-sema
-        (semaphore-post paint-sema))
-      (unless to-draw-message
-        (compute-new-string))
-      (let ([dc (get-dc)])
-        (let-values ([(w h) (get-client-size)])
-          (cond
-            [hidden? 
-             #;
-             (let ([pen (send dc get-pen)]
-                   [brush (send dc get-brush)])
-               (send dc set-brush (send the-brush-list find-or-create-brush (get-panel-background) 'panel))
-               (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-               (send dc draw-rectangle 0 0 w h)
-               (send dc set-pen pen)
-               (send dc set-brush brush))]
-            [else
-             (when (and (> w 5) (> h 5))
-               (draw-button-label dc to-draw-message 0 0 w h mouse-over? mouse-grabbed? font (get-background-color)))]))))
-    
-    (define/public (get-background-color) #f)
-    
-    (define to-draw-message #f)
-    (define/private (compute-new-string)
-      (let ([label (get-label)])
-        (let-values ([(cw ch) (get-client-size)])
-          (let ([width-to-use (- cw (get-left-side-padding) triangle-width circle-spacer)])
-            (let loop ([c (string-length label)])
-              (cond
-                [(= c 0) (set! to-draw-message "")]
-                [else 
-                 (let ([candidate (if (= c (string-length label))
-                                      label
-                                      (string-append (substring label 0 c) "..."))])
-                   (let-values ([(tw th _1 _2) (send (get-dc) get-text-extent candidate small-control-font)])
-                     (cond
-                       [(tw . <= . width-to-use) (set! to-draw-message candidate)]
-                       [else
-                        (loop (- c 1))])))]))))))
-    
-    (define/override (on-size w h)
-      (compute-new-string)
-      (refresh))
-    
-    (super-new [style '(transparent no-focus)])
-    (update-min-sizes)
-    (stretchable-width #f)
-    (stretchable-height #f)
-    (send (get-dc) set-smoothing 'aligned)))
-
-(define (offset-color color offset-one)
-  (make-object color%
-    (offset-one (send color red))
-    (offset-one (send color green))
-    (offset-one (send color blue))))
-
-(define mouse-over-color (case (system-type)
-                           [(macosx) "darkgray"]
-                           [else (make-object color% 230 230 230)]))
-(define mouse-grabbed-color (make-object color% 100 100 100))
-(define grabbed-fg-color (make-object color% 220 220 220))
-
-(define (calc-button-min-sizes dc label [button-label-font (send dc get-font)])
-  (let-values ([(w h a d) (send dc get-text-extent label button-label-font)])
-    (let-values ([(px py pw ph) (pad-xywh 0 0 w h)])
-      (values pw ph))))
-
-(define (pad-xywh tx ty tw th)
-  (let* ([ans-h
-          (+ button-label-inset
-             (max 0 
-                  (+ 2 (inexact->exact (ceiling th)))
-                  (+ 2 triangle-height))
-             button-label-inset)]
-         [ans-w
-          (+ border-inset 
-             circle-spacer
-             button-label-inset
-             (if (eq? (system-type) 'windows) 1 0)  ;; because "(define ...)" has the wrong size under windows
-             (max 0 (inexact->exact (ceiling tw)))
-             button-label-inset
-             triangle-width
-             circle-spacer 
-             border-inset)])
-    (values 
-     (- tx (quotient (ceiling (- ans-w tw)) 2))
-     (- ty (quotient (ceiling (- ans-h th)) 2))
-     ans-w
-     ans-h)))
-
-(define (draw-button-label dc label dx dy full-w h mouse-over? grabbed? button-label-font bkg-color)
-  
-  (define label-width
-    (if label
-        (let-values ([(w _1 _2 _3) (send dc get-text-extent label button-label-font)])
-          w)
-        0))
-  
-  (define w (+ border-inset circle-spacer button-label-inset label-width button-label-inset triangle-width circle-spacer border-inset))
-
-  (when (and bkg-color
-             (and (not (or mouse-over? grabbed?))))
-    (send dc set-pen bkg-color 1 'solid)
-    (send dc set-brush bkg-color 'solid)
-    (send dc draw-rectangle dx dy w h))
-  
-  (when (or mouse-over? grabbed?)
-    (let ([color (if grabbed?
-                     mouse-grabbed-color
-                     mouse-over-color)]
-          [xh (- h (* 2 border-inset))])
-      (case (system-type)
-        [(macosx)
-         (send dc set-pen (send the-pen-list find-or-create-pen color 1 'solid))
-         (send dc set-brush (send the-brush-list find-or-create-brush color 'solid))
-         
-         (send dc draw-ellipse (+ dx border-inset) (+ dy border-inset) xh xh)
-         (send dc draw-ellipse (+ dx (- w xh)) (+ dy border-inset) xh xh)
-
-         (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-         (send dc draw-rectangle (+ dx (quotient xh 2)) (+ dy border-inset) (- w xh) xh)
-         (send dc set-pen (send the-pen-list find-or-create-pen color 1 'solid))
-         (send dc draw-line 
-               (+ dx (quotient xh 2))
-               (+ dy border-inset)
-               (+ dx (- w (quotient xh 2)))
-               (+ dy border-inset))
-         (send dc draw-line 
-               (+ dx (quotient xh 2))
-               (+ dy (- h 1 border-inset))
-               (+ dx (- w (quotient xh 2)))
-               (+ dy (- h 1 border-inset)))]
-        [else
-         (send dc set-pen (send the-pen-list find-or-create-pen triangle-color 1 'solid))
-         (send dc set-brush (send the-brush-list find-or-create-brush color 'solid))
-         (send dc draw-rounded-rectangle (+ dx rrect-spacer) (+ dy border-inset) (- w border-inset rrect-spacer) xh 2)])))
-  
-  (when label
-    (send dc set-text-foreground (if grabbed? grabbed-fg-color black-color))
-    (send dc set-font button-label-font)
-    (let-values ([(tw th _1 _2) (send dc get-text-extent label)])
-      (send dc draw-text label
-            (+ dx (+ border-inset circle-spacer button-label-inset))
-            (+ dy (- (/ h 2) (/ th 2)))
-            #t)))
-  
-  (send dc set-pen (send the-pen-list find-or-create-pen 
-                         (if grabbed? grabbed-fg-color triangle-color)
-                         1 'solid))
-  (let ([x (- w triangle-width circle-spacer border-inset)]
-        [y (- (/ h 2) (/ triangle-height 2))])
-    (let loop ([x-off 0][off-y 5])
-      (unless (= 5 x-off)
-        (send dc draw-line 
-              (+ dx (+ x 1 x-off))
-              (+ dy (+ y off-y))
-              (+ dx (+ x (- triangle-width 1 x-off)))
-              (+ dy (+ y off-y)))
-        (loop (+ x-off 1) (+ off-y 1)))))
-  
-  (void))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/path-dialog.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/path-dialog.rkt
deleted file mode 100644
index c21b433fa8..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/path-dialog.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-(module path-dialog mzscheme
-  (require mred/private/path-dialog)
-  (provide path-dialog%))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/plot.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/plot.rkt
deleted file mode 100644
index c1716e156e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/plot.rkt
+++ /dev/null
@@ -1,178 +0,0 @@
-(module plot mzscheme
-  (require mred
-           mzlib/class
-           mzlib/contract)
-
-  
-  (define-struct data-set (points connected? pen min-x max-x min-y max-y))
-  
-  (define-struct plot-setup (axis-label-font axis-number-font axis-pen grid? grid-pen
-                             x-axis-marking y-axis-marking x-axis-label y-axis-label))
-
-  (provide/contract
-   (struct data-set ((points (listof (is-a?/c point%)))
-                     (connected? any/c)
-                     (pen (is-a?/c pen%))
-                     (min-x number?)
-                     (max-x number?)
-                     (min-y number?)
-                     (max-y number?)))
-   (struct plot-setup ((axis-label-font (is-a?/c font%))
-                       (axis-number-font (is-a?/c font%))
-                       (axis-pen (is-a?/c pen%))
-                       (grid? any/c)
-                       (grid-pen (is-a?/c pen%))
-                       (x-axis-marking (listof number?))
-                       (y-axis-marking (listof number?))
-                       (x-axis-label string?)
-                       (y-axis-label string?)))
-   (plot ((is-a?/c dc<%>) (listof data-set?) plot-setup? . -> . void?)))
-
-  (define (draw-text-sideways dc text x y font big-chars? offset)
-    (let-values (((width height bot-dist top-dist)
-                  (send (make-object bitmap-dc% (make-object bitmap% 1 1 #f))
-                        get-text-extent text font big-chars? offset)))
-      (let* ((width (inexact->exact (ceiling width)))
-             (height (inexact->exact (ceiling (+ height bot-dist top-dist))))
-             (bc (make-object bitmap-dc% (make-object bitmap% width height #f)))
-             (new-bc (make-object bitmap-dc% (make-object bitmap% height width #f)))
-             (c (make-object color%)))
-        (send bc set-font font)
-        (send bc clear)
-        (send new-bc clear)
-        (send bc draw-text text 0 0 big-chars? offset)
-        (let loop ((i 0)
-                   (j 0))
-          (cond
-            ((>= i (+ height top-dist bot-dist))
-             (send dc draw-bitmap (send new-bc get-bitmap) x y))
-            ((>= j width) (loop (add1 i) 0))
-            (else
-             (send bc get-pixel j i c)
-             (send new-bc set-pixel i (- width j) c)
-             (loop i (add1 j))))))))
-  
-  
-  
-  #cs
-  (define (plot dc data-sets ps)
-    (let-values (((canvas-width canvas-height) (send dc get-size))
-                 ((_ label-height label-bottom-dist label-top-dist)
-                  (send dc get-text-extent "" (plot-setup-axis-label-font ps) #f 0))
-                 ((number-width number-height number-bottom-dist number-top-dist)
-                  (send dc get-text-extent "00.00e-10" (plot-setup-axis-number-font ps) #f 0)))
-      (let* ((label-height (+ label-height label-bottom-dist label-top-dist))
-             (number-height (+ number-height number-bottom-dist number-top-dist))
-             (bottom-space (+ (* 1.5 number-height) label-height))
-             (side-space (+ number-width (* .5 number-height) label-height)))
-        (cond
-          ((not (null? data-sets))
-           (let* ((mx (apply min (map data-set-min-x data-sets)))
-                  (my (apply min (map data-set-min-y data-sets)))
-                  (Mx (apply max (map data-set-max-x data-sets)))
-                  (My (apply max (map data-set-max-y data-sets)))
-                  (w-scale (/ (- canvas-width side-space) (- Mx mx)))
-                  (h-scale (/ (- canvas-height bottom-space) (- my My)))
-                  (transform-point
-                   (lambda (p)
-                     (make-object point%
-                       (+ side-space (* (- (send p get-x) mx) w-scale))
-                       (* (- (send p get-y) My) h-scale)))))
-             
-             ;; Draw axes
-             (send dc set-pen (plot-setup-axis-pen ps))
-             (send dc draw-lines
-                   (map transform-point 
-                        (list (make-object point% mx my)
-                              (make-object point% Mx my))))
-             (send dc draw-lines
-                   (map transform-point 
-                        (list (make-object point% mx my)
-                              (make-object point% mx My))))
-             
-             ;; draw axis markings
-             (send dc set-font (plot-setup-axis-number-font ps))
-             (for-each 
-              (lambda (x)
-                (let* ((p (transform-point (make-object point% x my)))
-                       (draw-x (send p get-x))
-                       (draw-y-start (+ (send p get-y) (* .5 number-height)))
-                       (draw-y-stop (- (send p get-y) (* .5 number-height)))
-                       (str (number->string x)))
-                  (send dc draw-line draw-x draw-y-start draw-x draw-y-stop)
-                  (let-values (((number-width x1 x2 x3)
-                                (send dc get-text-extent
-                                      str (plot-setup-axis-number-font ps) #f 0)))
-                    (let ((start-x (- draw-x (* .5 number-width))))
-                      (send dc draw-text str start-x (+ 2 draw-y-start))))))
-              (plot-setup-x-axis-marking ps))
-             (for-each 
-              (lambda (y)
-                (let* ((p (transform-point (make-object point% mx y)))
-                       (draw-y (send p get-y))
-                       (draw-x-start (- (send p get-x) (* .5 number-height)))
-                       (draw-x-stop (+ (send p get-x) (* .5 number-height)))
-                       (str (number->string y)))
-                  (send dc draw-line draw-x-start draw-y draw-x-stop draw-y)
-                  (let-values (((number-width x1 x2 x3)
-                                (send dc get-text-extent
-                                      str (plot-setup-axis-number-font ps) #f 0)))
-                    (let ((start-x (- draw-x-start 2 number-width))
-                          (start-y (- draw-y (* .5 number-height))))
-                      (send dc draw-text str start-x start-y)))))
-              (plot-setup-y-axis-marking ps))
-             
-             ;; draw axis labels
-             (send dc set-font (plot-setup-axis-label-font ps))
-             (let-values (((x-label-width x1 x2 x3)
-                           (send dc get-text-extent
-                                 (plot-setup-x-axis-label ps)
-                                 (plot-setup-axis-label-font ps) #f 0)))
-               (send dc draw-text
-                     (plot-setup-x-axis-label ps)
-                     (- (+ side-space (* .5 (- canvas-width side-space))) (* .5 x-label-width))
-                     (- canvas-height label-height)))
-             (let-values (((y-label-width y1 y2 y3)
-                           (send dc get-text-extent
-                                 (plot-setup-y-axis-label ps)
-                                 (plot-setup-axis-label-font ps) #f 0)))
-               (draw-text-sideways dc (plot-setup-y-axis-label ps)
-                                   0
-                                   (- (* .5 (- canvas-height bottom-space))
-                                      (* .5 y-label-width))
-                                   (plot-setup-axis-label-font ps)
-                                   #f
-                                   0))
-             
-             ;; draw-grid
-             (cond
-               ((plot-setup-grid? ps)
-                (send dc set-pen (plot-setup-grid-pen ps))
-                (for-each (lambda (x)
-                            (send dc draw-lines
-                                  (map transform-point
-                                       (list (make-object point% x my)
-                                             (make-object point% x My)))))
-                          (plot-setup-x-axis-marking ps))
-                (for-each (lambda (y)
-                            (send dc draw-lines
-                                  (map transform-point
-                                       (list (make-object point% mx y)
-                                             (make-object point% Mx y)))))
-                          (plot-setup-y-axis-marking ps))))
-             
-             ;; draw data
-             (for-each
-              (lambda (data)
-                (send dc set-pen (data-set-pen data))
-                (cond
-                  ((data-set-connected? data)
-                   (send dc draw-lines (map transform-point (data-set-points data))))
-                  (else
-                   (for-each
-                    (lambda (p)
-                      (let ((tp (transform-point p)))
-                        (send dc draw-point (send tp get-x) (send tp get-y))))
-                    (data-set-points data)))))
-              data-sets)))))))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/aligned-editor-container.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/aligned-editor-container.rkt
deleted file mode 100644
index ceabd22d3b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/aligned-editor-container.rkt
+++ /dev/null
@@ -1,193 +0,0 @@
-(module aligned-editor-container mzscheme
-  
-  (require
-   mzlib/class
-   mred
-   mzlib/etc
-   mzlib/list
-   "snip-lib.rkt"
-   "interface.rkt"
-   "constants.rkt")
-
-  (provide
-   aligned-editor-canvas%
-   aligned-editor-snip%)
-
-  ;; a canvas that can contain an aligned-pasteboard<%>
-  ;; STATUS: When both min-width and min-height change the size of the canvas
-  ;;         I might be getting two on-size method invocations inside
-  ;;         set-aligned-min-sizes.
-  ;;           Also, I might not need to call realign-to-alloted in
-  ;;         set-aligned-min-sizes of the canvas because realign is called from
-  ;;         within on-size. This is true if and only if realignment needs to
-  ;;         be called only when the canvas size changes.
-  (define aligned-editor-canvas%
-    (class* editor-canvas% (aligned-pasteboard-parent<%>)
-      (inherit get-editor get-size min-width min-height)
-      (init-field (style empty))
-      
-      (field
-       (width-diff 0)
-       (height-diff 0))
-      
-      ;; set-aligned-min-size (-> (void))
-      ;; sets the aligned min width and height of all aligned children
-      (define/public (aligned-min-sizes-invalid)
-        (let ([editor (get-editor)])
-          (when (memq 'no-hscroll style)
-            (min-width
-             (+ (inexact->exact
-                 (send editor get-aligned-min-width))
-                machenrys-constant width-diff)))
-          (when (memq 'no-vscroll style)
-            (min-height
-             (+ (inexact->exact
-                 (send editor get-aligned-min-height))
-                machenrys-constant height-diff)))
-          ;; I might need to call realign not realign-to-alloted, but with what values?
-          (send editor realign-to-alloted)))
-      
-      ;; on-size (number? number? . -> . (void))
-      ;; called when the canvas's parent size changes
-      (define/override (on-size width height)
-        (super on-size width height)
-        (let ([w (- width width-diff machenrys-constant)]
-              [h (- height height-diff machenrys-constant)])
-          (when (and (positive? w) (positive? h))
-            (send* (get-editor)
-              (set-aligned-min-sizes)
-              (realign w h)))))
-      
-      ;; calc-view-client-diff (-> (void))
-      ;; calculates and sets the difference between client-size and view-size of the editor
-      (define/private (calc-view-client-diff)
-        (let-values ([(width height) (get-size)])
-          (let ([view-width (box 0)]
-                [view-height (box 0)])
-            (send (get-editor) get-view-size
-                  view-width view-height)
-            (set! width-diff
-                  (- width
-                     (inexact->exact
-                      (unbox view-width))))
-            (set! height-diff
-                  (- height
-                     (inexact->exact
-                      (unbox view-height)))))))
-      
-      (super-new (style style))
-      (calc-view-client-diff)))
-  
-  ;; a snip that can contain an aligned-pasteboard<%> and also be stretched within an aligned-pasteboard<%>
-  (define aligned-editor-snip%
-    (class* editor-snip% (aligned-pasteboard-parent<%> stretchable-snip<%>)
-      (inherit get-editor get-margin set-min-width set-min-height)
-      
-      (init
-       (stretchable-width true)
-       (stretchable-height true))
-      
-      (field
-       (stretchable-width-field stretchable-width)
-       (stretchable-height-field stretchable-height))
-      
-      (public (stretchable-width-method stretchable-width)
-              (stretchable-height-method stretchable-height))
-      
-      ;; stretchable-width (case-> (Boolean . -> . (void)) (-> Boolean))
-      ;; get or set the stretchablity of the pasteboards width
-      (define stretchable-width-method
-        (case-lambda
-          [(value) (set! stretchable-width-field value)]
-          [() stretchable-width-field]))
-      
-      ;; stretchable-height (case-> (Boolean . -> .(void)) (-> Boolean))
-      ;; get or set the stretchablity of the pasteboards height
-      (define stretchable-height-method
-        (case-lambda
-          [(value) (set! stretchable-height-field value)]
-          [() stretchable-height-field]))
-      
-      ;; (positive? positive? . -> . void?)
-      ;; called to resize the snip to a given size without effecting its alignd-min-sizes
-      ;; STATUS: Do I need to override resize and have it set the aligned-min-sizes?
-      (inherit resize)
-      (define/public (stretch width height)
-        (resize width height)
-        (let ([left (box 0)]
-              [top (box 0)]
-              [right (box 0)]
-              [bottom (box 0)])
-          (get-margin left top right bottom)
-          (let ([w (- width (unbox left) (unbox right))]
-                [h (- height (unbox top) (unbox bottom))])
-            (when (and (positive? w) (positive? h))
-              (send (get-editor) realign w h)))))
-      
-      ;; get-aligned-min-width (-> number?)
-      ;; the minimum width of the snip based on the children
-      (define/public (get-aligned-min-width)
-        (let ([left (box 0)]
-              [top (box 0)]
-              [right (box 0)]
-              [bottom (box 0)])
-          (get-margin left top right bottom)
-          (+ (unbox left)
-             (unbox right)
-             (send (get-editor) get-aligned-min-width)
-             machenrys-constant)))
-      
-      ;; get-aligned-min-height (-> number?)
-      ;; the minimum height of the snip based on the children
-      (define/public (get-aligned-min-height)
-        (let ([left (box 0)]
-              [top (box 0)]
-              [right (box 0)]
-              [bottom (box 0)])
-          (get-margin left top right bottom)
-          (+ (unbox top)
-             (unbox bottom)
-             (send (get-editor) get-aligned-min-height)
-             machenrys-constant)))
-      
-      ;; (-> void?)
-      ;; sets the aligned-min-sizes of all the editors and snips in this snip
-      (define/public (set-aligned-min-sizes)
-        (send (get-editor) set-aligned-min-sizes))
-      
-      ;; (-> void?)
-      ;; calculates and stores the minimum height and width of the snip
-      ;; note: more efficient to check for parent ahead of time and not
-      ;; calculate the margins when I don't have one.
-      (define/public (aligned-min-sizes-invalid)
-        (let ([parent (snip-parent this)])
-          (cond
-            [(not parent) (void)]
-            [(is-a? parent aligned-pasteboard<%>)
-             (send parent aligned-min-sizes-invalid)]
-            [else (align-to-min)])))
-      
-      ;; This code is needed to probe the tree of editors for their real sizes when they
-      ;; finally know them. This happens when the top level snip gets an admin.
-      (define/override (set-admin admin)
-        (super set-admin admin)
-        (let ([parent (snip-parent this)])
-          (when (and parent (not (is-a? parent aligned-pasteboard<%>)))
-            (set-aligned-min-sizes)
-            (align-to-min))))
-      
-      (define (align-to-min)
-        ;; Note: Not setting the min-width might improve efficientcy and
-        ;;       may not be necessary since snips grow to the size of
-        ;;       the things they contain. I'm going to try it so the
-        ;;       following two lines are commented out.
-        ;(set-min-width aligned-min-width)
-        ;(set-min-height aligned-min-height)
-        (let* ([ed (get-editor)]
-               [w (send ed get-aligned-min-width)]
-               [h (send ed get-aligned-min-height)])
-          (when (and (positive? w) (positive? h))
-            (send ed realign w h))))
-      
-      (super-new)))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/aligned-pasteboard.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/aligned-pasteboard.rkt
deleted file mode 100644
index b437f0cc8e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/aligned-pasteboard.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-(module aligned-pasteboard mzscheme
-  
-  (require
-   mrlib/click-forwarding-editor
-   "geometry-managed-pasteboard.rkt"
-   "locked-pasteboard.rkt")
-  
-  (provide
-   vertical-pasteboard%
-   horizontal-pasteboard%)
-  
-  ;; contruct the basic mixin that both pasteboards will be created from
-  (define (click/lock type)
-    (click-forwarding-editor-mixin
-     (locked-pasteboard-mixin
-      (make-aligned-pasteboard type))))
-  
-  (define vertical-pasteboard%
-    (click/lock 'vertical))
-  
-  (define horizontal-pasteboard%
-    (click/lock 'horizontal)))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/alignment.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/alignment.rkt
deleted file mode 100644
index 784e268fab..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/alignment.rkt
+++ /dev/null
@@ -1,167 +0,0 @@
-#|
-This code computes the sizes for the rectangles in the space using the
-on dimension off dimension method of referencing sizes. This means for
-example instead of saying width we say off dimension for vertical
-alignment. Inorder to consume and return the values in terms of width
-and height manipulation had to be done. I chose to create a struct
-abs-rect (abstract rectangle) and have code map horizontal and vertical
-rect stucts on to them. This code is a bit long but more readable than
-the other two options I came up with.
-  1) define all functions to be letrec bound functions inside align.
-     align then take accessors for the rect struct. The caller of align
-     swaps the order of ondimension and off dimension accessors for
-     vertical or horizontal code. This method does not allow the use of
-     the readable, short, consis pattern matching code. As some of the
-     matching code is easily removed this may be a good option but a
-     large letrec is harder to write tests for.
-  2) define a pattern matcher syntax that will match the struct rect but
-     swap the fields based on wich on is the on or off dimension. This
-     would have been shorter but much more confusing.
-The current implementation requires align to map over the rects and
-allocate new stucts for each one on both passing into and returning from
-stretch-to-fit; This is not a bottle neck and it is the most readable
-solution.
-|#
-
-(module alignment mzscheme
-  
-  (require
-   mzlib/match
-   mzlib/contract
-   mzlib/etc
-   mzlib/list)
-  
-  (define-struct rect (x y))
-  (define-struct abs-rect (ondim offdim))
-  (define-struct dim (pos size stretchable?))
-  
-  (define (nonnegative? n)
-    (and (number? n)
-         (or (positive? n)
-             (zero? n))))
-  
-  (provide/contract
-   (struct rect ((x dim?) (y dim?)))
-   (struct abs-rect ((ondim dim?) (offdim dim?)))
-   (struct dim ((pos nonnegative?) (size nonnegative?) (stretchable? boolean?)))
-   (align ((symbols 'horizontal 'vertical)
-           positive? positive? (listof rect?)
-           . -> . (listof rect?)))
-   (rect-print ((listof rect?) . -> . void?)))
-  
-  ;; align the rectangles within the given space
-  (define (align type width height rects)
-    (cond
-      [(symbol=? type 'horizontal)
-       (map abs->horiz (stretch-to-fit width height (map horiz->abs rects)))]
-      [(symbol=? type 'vertical)
-       (map abs->vert (stretch-to-fit height width (map vert->abs rects)))]))
-  
-  ;; abs->horiz (abs-rect? . -> . rect?)
-  ;; convert an abstract rect to a horizontal rect
-  (define abs->horiz
-    (match-lambda
-      [($ abs-rect ondim offdim)
-       (make-rect ondim offdim)]))
-  
-  ;; abs->vert (abs-rect? . -> . rect?)
-  ;; convert an abstract rect to a vertical rect
-  (define abs->vert
-    (match-lambda
-      [($ abs-rect ondim offdim)
-       (make-rect offdim ondim)]))
-  
-  ;; horiz->abs (rect? . -> . abs-rect?)
-  ;; convert a horizontal rect to an abstract rect
-  (define horiz->abs
-    (match-lambda
-      [($ rect x y)
-       (make-abs-rect x y)]))
-  
-  ;; vert->abs (rect? . -> . abs-rect?)
-  ;; convert a vertical rect to an abstract rect
-  (define vert->abs
-    (match-lambda
-      [($ rect x y)
-       (make-abs-rect y x)]))
-  
-  ;; stretch-to-fit (positive? positive? (listof abs-rect?) . -> (listof abs-rect?))
-  ;; stretch the rectangles to fit with the given space
-  (define (stretch-to-fit onsize offsize rects)
-    (let-values ([(total-unstretchable-size stretchable-sizes)
-                  (get-onsizes rects)])
-      (let-values ([(extra-div extra-mod)
-                    (get-extra/rect
-                     (- onsize total-unstretchable-size)
-                     (sort stretchable-sizes >))])
-        (allocate-evenly/position extra-div extra-mod offsize rects))))
-  
-  ;; get-onsizes (((listof rect?)) . ->* . (nonnegative? (listof nonnegative?)))
-  ;; gets the unstretchable total size and a list of the stretchable sizes
-  (define (get-onsizes init-rects)
-    (let loop ([extra 0]
-               [stretchables empty]
-               [rects init-rects])
-      (match rects
-        [() (values extra stretchables)]
-        [(($ abs-rect ($ dim _ onsize #f) _) rest-rects ...)
-         (loop (+ onsize extra) stretchables rest-rects)]
-        [(($ abs-rect ($ dim _ onsize #t) _) rest-rects ...)
-         (loop extra (cons onsize stretchables) rest-rects)])))
-  
-  ;; get-extra/rect ((nonnegative? (listof nonnegative?)) . ->* . (nonnegative? nonnegative?))
-  ;; get the space that each stretchable snip will have
-  (define (get-extra/rect init-extra init-sizes)
-    (let loop ([sizes init-sizes]
-               [extra init-extra]
-               [count (length init-sizes)])
-      (cond
-        [(empty? sizes) (values 0 0)]
-        [else
-         (let ([extra/rect (quotient (floor extra) count)]
-               [onsize (first sizes)])
-           (if (> onsize extra/rect)
-               (loop (rest sizes) (- extra onsize) (sub1 count))
-               (values extra/rect (modulo (floor extra) count))))])))
-  
-  ;; allocate-evenly/position ((cons/p nonnegative? nonnegative?) positive? (listof abs-rect?) . -> .
-  ;;                           (listof abs->rect?))
-  ;; allocate the extra per rectangle to the stretchable rects and move them to their positions
-  (define (allocate-evenly/position extra-div extra-mod offsize init-rects)
-    (let ([mod (waner extra-mod)])
-      (let loop ([rects init-rects]
-                 [onpos 0])
-        (match rects
-          [() empty]
-          [(($ abs-rect ($ dim _ min-onsize onstretch?)
-               ($ dim _ min-offsize offstretch?)) rest-rects ...)
-           (let ([onsize (if (and onstretch?
-                                  (< min-onsize extra-div))
-                             (+ extra-div (mod)) min-onsize)]
-                 [offsize (if offstretch? offsize min-offsize)])
-             (cons (make-abs-rect (make-dim onpos onsize onstretch?)
-                                  (make-dim 0 offsize offstretch?))
-                   (loop rest-rects (+ onpos onsize))))]))))
-  
-  ;; waner (natural-number? . -> . (-> (union 1 0)))
-  ;; makes a thunk that returns 1 for its first n applications, zero otherwise
-  (define (waner n)
-    (lambda ()
-      (if (zero? n)
-          0
-          (begin
-            (set! n (sub1 n))
-            1))))
-  
-  (define rect-print
-    (match-lambda
-      [() (void)]
-      [(($ rect
-           ($ dim x width stretchable-width?)
-           ($ dim y height stretchable-height?))
-        others ...)
-       (printf "(make-rect (make-dim ~s ~s ~s) (make-dim ~s ~s ~s))\n"
-               x width stretchable-width?
-               y height stretchable-height?)
-       (rect-print others)]))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/constants.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/constants.rkt
deleted file mode 100644
index f15c05eb68..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/constants.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-(module constants mzscheme
-  (provide machenrys-constant)
-  
-  ;; machenrys-constant nonnegative?
-  ;; the differents between the size a pasteboard is alloted by
-  ;; get-view-size and the size it needs to avoid scollbars
-  (define machenrys-constant 2))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.rkt
deleted file mode 100644
index 9277541de8..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.rkt
+++ /dev/null
@@ -1,181 +0,0 @@
-(module geometry-managed-pasteboard mzscheme
-  
-  (require
-   mzlib/class
-   mzlib/contract
-   mzlib/list
-   mzlib/etc
-   mzlib/match
-   mred
-   "aligned-editor-container.rkt"
-   "interface.rkt"
-   "alignment.rkt"
-   "snip-lib.rkt"
-   "pasteboard-lib.rkt")
-  
-  (provide/contract (make-aligned-pasteboard ((symbols 'vertical 'horizontal) . -> . class?)))
-  
-  ;;  mixin to add geometry management to pasteboard with the give type of alignement
-  (define (make-aligned-pasteboard type)
-    (class* pasteboard% (aligned-pasteboard<%>)
-      
-      (inherit resize move-to find-first-snip refresh-delayed?
-               begin-edit-sequence end-edit-sequence is-locked? lock)
-      
-      (field
-       [needs-realign? false]
-       [ignore-resizing? false]
-       [alloted-width false]
-       [alloted-height false]
-       [aligned-min-width 0]
-       [aligned-min-height 0]
-       [aligned-rects empty])
-      
-      ;; get-aligned-min-width (-> number?)
-      ;; the aligned-min-width of the pasteboard
-      (define/public (get-aligned-min-width) aligned-min-width)
-      
-      ;; get-aligned-min-height (-> number?)
-      ;; the aligned-min-height of the pasteboard
-      (define/public (get-aligned-min-height) aligned-min-height)
-      
-      (define/public (set-aligned-min-sizes)
-        (dynamic-let ([ignore-resizing? true])
-          (for-each-snip
-           (lambda (s)
-             (if (is-a? s aligned-editor-snip%)
-                 (send s set-aligned-min-sizes)))
-           (find-first-snip))
-          (set!-values (aligned-min-width aligned-min-height)
-                       (get-aligned-min-sizes type (find-first-snip)))))
-      
-      ;; set-algined-min-sizes (-> void?)
-      ;; set the aligned min width and height of the pasteboard based on its children snips
-      (inherit in-edit-sequence?)
-      (define/public (aligned-min-sizes-invalid)
-        ;; This in-edit-sequence? is not sound. It causes me to percollate invalidation
-        ;; up the spin of my tree even when it is not visible (which refresh-delayed?
-        ;; checks for. However, for some types of refreshed-delayed? blocks, like a
-        ;; parent editor's edit-sequence, I have not yet figured out a way to reshedule
-        ;; an alignment. With in-edit-sequence? blocking, I know I'll always get the
-        ;; after-edit-sequence call where I can invoke alignment.
-        (if (in-edit-sequence?) ;(refresh-delayed?)
-            (set! needs-realign? true)
-            (begin
-              (set! needs-realign? false)
-              (set!-values (aligned-min-width aligned-min-height)
-                           (get-aligned-min-sizes type (find-first-snip)))
-              (let ([parent (pasteboard-parent this)])
-                (when parent (send parent aligned-min-sizes-invalid))))))
-      
-      ;; realign (case-> (-> void?) (positive? positive? . -> . void?))
-      ;; called by the parent to realign the pasteboard's children
-      (define/public (realign width height)
-        (set! alloted-width width)
-        (set! alloted-height height)
-        (realign-to-alloted))
-      
-      ;; realign-to-alloted (-> void?)
-      ;; realign the snips to fill the alloted width and height
-      (define/public (realign-to-alloted)
-        (when (and alloted-width alloted-height)
-          (when (not (and (positive? alloted-width) (positive? alloted-height)))
-            (error "allotted width or height is not positive"))
-          (dynamic-let ([ignore-resizing? true])
-            (let* ([first-snip (find-first-snip)]
-                   [aligned-rects
-                    (align type alloted-width alloted-height
-                           (map-snip build-rect first-snip))])
-              (begin-edit-sequence)
-              (let ([was-locked? (is-locked?)])
-                (lock false)
-                (for-each-snip move/resize first-snip aligned-rects)
-                (lock was-locked?))
-              (end-edit-sequence)))))
-      
-      ;;move/resize (snip-pos? rect? . -> . void?)
-      ;;moves and resizes the snips with in pasteboard
-      (define move/resize
-        (match-lambda*
-          [(snip ($ rect
-                    ($ dim x width stretchable-width?)
-                    ($ dim y height stretchable-height?)))
-           (move-to snip x y)
-           (when (is-a? snip stretchable-snip<%>)
-             (send snip stretch width height))]))
-      
-      ;;;;;;;;;;
-      ;; Events
-      
-      ;; after-insert ((is-a?/c snip%) (is-a?/c snip%) number? number? . -> . void?)
-      ;; called after a snip is inserted to the pasteboard
-      (define/augment (after-insert snip before x y)
-        (aligned-min-sizes-invalid)
-        (inner (void) after-insert snip before x y))
-      
-      ;; after-delete ((is-a?/c snip%) . -> . void?)
-      ;; called after a snip is deleted from the pasteboard%
-      (define/augment (after-delete snip)
-        (aligned-min-sizes-invalid)
-        (inner (void) after-delete snip))
-      
-      ; after-reorder ((is-a?/c snip%) (is-a?/c snip%) boolean? . -> . void?)
-      ;; called after a snip is moved in the front to back snip order
-      (define/augment (after-reorder snip to-snip before?)
-        (realign-to-alloted)
-        (inner (void) after-reorder snip to-snip before?))
-      
-      ;; resized ((is-a?/c snip%) . -> . void?)
-      ;; called when a snip inside the editor is resized
-      (define/override (resized snip redraw-now?)
-        (super resized snip redraw-now?)
-        (unless ignore-resizing?
-          (aligned-min-sizes-invalid)))
-      
-      ;; after-edit-sequence (-> void?)
-      ;; called after an edit-sequence ends
-      (define/augment (after-edit-sequence)
-        (when needs-realign? (aligned-min-sizes-invalid))
-        (inner (void) after-edit-sequence))
-      
-      (super-new)))
-  
-  ;; build-rect ((is-a?/c snip%) . -> . rect?)
-  ;; makes a new default rect out of a snip
-  (define (build-rect snip)
-    (make-rect
-     (make-dim 0 (snip-min-width snip) (stretchable-width? snip))
-     (make-dim 0 (snip-min-height snip) (stretchable-height? snip))))
-  
-  ;; get-aligned-min-sizes (((symbols 'horizontal vertical) (is-a?/c snip%)) . ->* . (number? number?))
-  ;; calculate the aligned min sizes for the pasteboard containing the given snips
-  (define (get-aligned-min-sizes type init-snip)
-    (let-values ([(x-func y-func)
-                  (if (symbol=? type 'horizontal)
-                      (values + max)
-                      (values max +))])
-      (let loop ([snip init-snip]
-                 [width 0]
-                 [height 0])
-        (cond
-          [(boolean? snip) (values width height)]
-          [else
-           (loop (send snip next)
-                 (x-func (snip-min-width snip) width)
-                 (y-func (snip-min-height snip) height))]))))
-  
-  ;; dynamic-let is just like fluid-let but is less expensive and not safe over continuations
-  (define-syntax (dynamic-let stx)
-    (syntax-case stx ()
-      [(_ ((x y) ...) body body2 ...)
-       (andmap identifier? (syntax-e #'(x ...)))
-       (with-syntax ([(old-x ...) (generate-temporaries #'(x ...))])
-         #'(let ((old-x x) ...)
-             (begin
-               (set! x y) ...
-               (begin0
-                 (begin
-                   body
-                   body2 ...)
-                 (set! x old-x) ...))))]))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/info.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/info.rkt
deleted file mode 100644
index a383220ec3..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("tests"))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/interface.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/interface.rkt
deleted file mode 100644
index f685a18d5f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/interface.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-(module interface mzscheme
-  
-  (require
-   mzlib/class
-   mred)
-  
-  (provide
-    aligned-pasteboard<%>
-    aligned-pasteboard-parent<%>
-    stretchable-snip<%>)
-  
-  ;; the interface that must be implemented for a pasteboard to be contained in an aligned-pasteboard-parent<%>
-  (define aligned-pasteboard<%>
-    (interface (editor<%>)
-      
-      ;; (positive? positive? -> void?)
-      ;; called by the parent to resize and position the pasteboard's children
-      realign
-      
-      ;; (-> void?)
-      ;; called to realign a pasteboard to the already alloted width and height
-      realign-to-alloted
-   
-      ;; (-> void?)
-      ;; calculates the minimum width and height of the of the pasteboard
-      set-aligned-min-sizes
-      
-      ;; (-> void?)
-      ;; Called by a child snip to alert the parent that it's is now invalid due
-      ;; to a change in its own minimum size.
-      aligned-min-sizes-invalid
-      
-      ;; get-aligned-min-width: (-> number?)
-      ;; the minimum width of the pasteboard determined by its children
-      get-aligned-min-width
-      
-      ;; get-aligned-min-height: (-> number?)
-      ;; the minimum width of the pasteboard determined by its children
-      get-aligned-min-height
-      
-      ;; get-alignment (-> (values symbol? symbol?))
-      ;; get the pasteboards current alignment specification
-      ;; status: possible future feature
-      ;get-alignment
-      
-      ;; set-alignment (symbol? symbol? . -> . (void))
-      ;; sets the alignement which determines how children are placed in the pasteboard
-      ;; status: possible future feature
-      ;set-alignment
-      
-      ;; spacing (case-> (number? . -> .(void)) (-> number?))
-      ;; get or set the spacing in pixels placed between each child snip of the pasteboard
-      ;; status: possible future feature
-      ;spacing
-      ))
-  
-  ;; the interface that must be implemented by a class to be the parent of an aligned-pasteboard<%>
-  (define aligned-pasteboard-parent<%>
-    (interface ()
-      ;; (-> void?)
-      ;; sets the aligned min width and height of all aligned children
-      aligned-min-sizes-invalid
-      
-      ;; (-> void?)
-      ;; sets the aligned min sizes of this snip and its child editor
-      ;; required only for the aligned-editor-snip%
-      ;set-aligned-min-sizes
-      ))
-  
-  ;; the interface that must be implemented by a class to be inserted into an aligned-pasteboard<%> and
-  ;; be stretched and shrunk according to the geometry managment. note: any snip may be insert... those
-  ;; that do not implement stretchable-snip<%> will simply not be stretched.
-  (define stretchable-snip<%>
-    (interface ()
-      ;; (positive? positive? . ->  . void?)
-      ;; called by the parent editor to stretch the snip to an specific size
-      stretch
-      
-      ;; get-aligned-min-width (-> positive?)
-      ;; get the minimum width of the snip
-      get-aligned-min-width
-      
-      ;; get-aligned-min-height (-> positive?)
-      ;; get the minmum height of the snip
-      get-aligned-min-height
-      
-      ;; stretchable-width (case-> (boolean . -> . void?) (-> boolean?))
-      ;; get or set the stretchablity of the pasteboards width
-      stretchable-width
-      
-      ;; stretchable-height (case-> (boolean . -> . void?) (-> boolean?))
-      ;; get or set the stretchablity of the pasteboards height
-      stretchable-height
-      ))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/locked-pasteboard.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/locked-pasteboard.rkt
deleted file mode 100644
index 5305f0588c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/locked-pasteboard.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-;; This module provides a mixin that locks a pasteboard to all mouse interaction. This
-;; means that there is no interactive dragging, no keyboard deletion, no handles drawn
-;; at the corners of the snips for dragging, and anything else that must be added.
-
-(module locked-pasteboard mzscheme
-  
-  (require
-   mzlib/class
-   mred
-   mzlib/etc
-   mzlib/contract)
-  
-  (provide/contract
-   (locked-pasteboard-mixin mixin-contract))
-  
-  ;; mixin to remove interactive movement of snips from pasteboards
-  ;; STATUS: Look into and make sure I don't need to deal with the following.
-  ;;           interactive-adjust-mouse, interactive-adjust-move, on-default-event
-  ;;           interactive-adjust-resize
-  (define locked-pasteboard-mixin
-    (mixin ((class->interface pasteboard%)) ()
-      (define/override (on-default-event event) (void))
-      ;; The rest of the methods I believe to be redundant but
-      ;; are overriden anyway for consistancy.
-      (define/augment (can-interactive-move? event) false)
-      (define/augment (can-interactive-resize? snip) false)
-      (define/override (get-dragable) false)
-      (define/override (get-selection-visible) false)
-      (super-new)))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/pasteboard-lib.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/pasteboard-lib.rkt
deleted file mode 100644
index a585c70d3d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/pasteboard-lib.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-(module pasteboard-lib mzscheme
-  
-  (require
-   mzlib/class
-   mred
-   mzlib/contract
-   mzlib/etc
-   "interface.rkt"
-   "snip-lib.rkt")
-  
-  (provide/contract
-   (pasteboard-root ((is-a?/c aligned-pasteboard<%>) . -> . (is-a?/c aligned-pasteboard<%>)))
-   (pasteboard-parent
-    ((is-a?/c pasteboard%) . -> . (or/c (is-a?/c editor-canvas%) (is-a?/c editor-snip%) false/c))))
-  
-  ;; gets the top most aligned pasteboard in the tree of pasteboards and containers
-  (define (pasteboard-root pasteboard)
-    (let ([parent (pasteboard-parent pasteboard)])
-      (cond
-        [(is-a? parent canvas%)
-         pasteboard]
-        [(is-a? parent snip%)
-         (let ([grand-parent (snip-parent parent)])
-           (if (is-a? grand-parent aligned-pasteboard<%>)
-               (pasteboard-root grand-parent)
-               pasteboard))]
-        [else pasteboard])))
-
-  ;; gets the canvas or snip that the pasteboard is displayed in
-  ;; status: what if there is more than one canvas? should this be allowed? probably not.
-  (define (pasteboard-parent pasteboard)
-    (let ([admin (send pasteboard get-admin)])
-      (cond
-        [(is-a? admin editor-snip-editor-admin<%>)
-         (send admin get-snip)]
-        [(is-a? admin editor-admin%)
-         (send pasteboard get-canvas)]
-        [else false]))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/snip-lib.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/snip-lib.rkt
deleted file mode 100644
index b371e51b35..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/snip-lib.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-(module snip-lib mzscheme
-  
-  (require
-   mzlib/class
-   mzlib/etc
-   mred
-   mzlib/list
-   mzlib/contract
-   "interface.rkt")
-  
-  ;; a snip
-  (define snip? (is-a?/c snip%))
-  ;; a snip to act as the varying argument to a recursive functions
-  (define linked-snip? (or/c snip? false/c))
-  ;; a function to act on snips being mapped
-  (define snip-visitor? any/c #;((snip?) (listof any/c) . ->* . (void)))
-  ;; the rest of the lists passed to a snip mapping function
-  (define rest-lists? (listof (listof any/c)))
-  ;; a class that contains a snip
-  (define editor? (is-a?/c editor<%>))
-  
-  (provide/contract
-   (snip-width (snip? . -> . number?))
-   (snip-height (snip? . -> . number?))
-   (snip-min-width (snip? . -> . number?))
-   (snip-min-height (snip? . -> . number?))
-   (snip-parent (snip? . -> . (or/c editor? false/c)))
-   (fold-snip ((snip? any/c . -> . any/c) any/c linked-snip? . -> . any/c))
-   (for-each-snip any/c #;((snip-visitor? linked-snip?) rest-lists? . ->* . (void)))
-   (map-snip any/c #;((snip-visitor? linked-snip?) rest-lists? . ->* . ((listof any/c))))
-   (stretchable-width? (snip? . -> . boolean?))
-   (stretchable-height? (snip? . -> . boolean?)))
-  
-  ;; the width of a snip in the parent pasteboard
-  (define (snip-width snip)
-    (let ([left (box 0)]
-          [right (box 0)]
-          [pasteboard (snip-parent snip)])
-      (send pasteboard get-snip-location snip left (box 0) false)
-      (send pasteboard get-snip-location snip right (box 0) true)
-      (- (unbox right) (unbox left))))
-    
-  ;; the height of a snip in the parent pasteboard
-  (define (snip-height snip)
-    (let ([top (box 0)]
-          [bottom (box 0)]
-          [pasteboard (snip-parent snip)])
-      (send pasteboard get-snip-location snip (box 0) top false)
-      (send pasteboard get-snip-location snip (box 0) bottom true)
-      (- (unbox bottom) (unbox top))))
-  
-  ;; the minimum width of the snip
-  (define (snip-min-width snip)
-    (cond
-      [(is-a? snip stretchable-snip<%>)
-       (send snip get-aligned-min-width)]
-      [else (snip-width snip)]))
-  
-  ;; the minimum height of the snip
-  (define (snip-min-height snip)
-    (cond
-      [(is-a? snip stretchable-snip<%>)
-       (send snip get-aligned-min-height)]
-      [else (snip-height snip)]))
-  
-  ;; the pasteboard that contains the snip
-  (define (snip-parent snip)
-    (let ([admin (send snip get-admin)])
-      (if admin
-          (send admin get-editor)
-          false)))
-  
-  ;; the application of f on all snips from snip to the end in a foldl foldr mannor
-  (define (fold-snip f init-acc snip)
-    (let loop ([snip snip]
-               [acc init-acc])
-      (cond
-        [(is-a? snip snip%)
-         (loop (send snip next) (f snip acc))]
-        [else acc])))
-  
-  ;; applies the function to all the snips
-  (define (for-each-snip f first-snip . init-lists)
-    (let loop ([snip first-snip]
-               [lists init-lists])
-      (cond
-        [(is-a? snip snip%)
-         (apply f (cons snip (map first lists)))
-         (loop (send snip next)
-               (map rest lists))]
-        [else (void)])))
-  
-  ;; a list of f applied to each snip
-  (define (map-snip f first-snip . init-lists)
-    (let loop ([snip first-snip]
-               [lists init-lists])
-      (cond
-        [(is-a? snip snip%)
-         (cons (apply f (cons snip (map first lists)))
-               (loop (send snip next)
-                     (map rest lists)))]
-        [else empty])))
-  
-  ;; true if the snip can be resized in the x dimention
-  (define (stretchable-width? snip)
-    (cond
-      [(is-a? snip stretchable-snip<%>)
-       (send snip stretchable-width)]
-      [else false]))
-  
-  ;; true if the snip can be resized in the y dimention
-  (define (stretchable-height? snip)
-    (cond
-      [(is-a? snip stretchable-snip<%>)
-       (send snip stretchable-height)]
-      [else false]))
-  )
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/stretchable-editor-snip.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/stretchable-editor-snip.rkt
deleted file mode 100644
index 597d4fffdf..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/stretchable-editor-snip.rkt
+++ /dev/null
@@ -1,109 +0,0 @@
-(module stretchable-editor-snip mzscheme
-  
-  (provide
-   stretchable-editor-snip%
-   stretchable-editor-snip-mixin)
-  
-  (require
-   mzlib/class
-   mred
-   mzlib/etc
-   "snip-lib.rkt"
-   "interface.rkt")
-  
-  (define (stretchable-editor-snip-mixin super%)
-    (class* super% (stretchable-snip<%>)
-      
-      (init
-       (stretchable-width true)
-       (stretchable-height true))
-      
-      (field
-       (aligned-min-width 0)
-       (aligned-min-height 0)
-       (stretchable-width-field stretchable-width)
-       (stretchable-height-field stretchable-height))
-      
-      (public (stretchable-width-method stretchable-width)
-              (stretchable-height-method stretchable-height))
-      
-      ;; stretchable-width (case-> (Boolean . -> . (void)) (-> Boolean))
-      ;; get or set the stretchablity of the pasteboards width
-      (define stretchable-width-method
-        (case-lambda
-          [(value) (set! stretchable-width-field value)]
-          [() stretchable-width-field]))
-      
-      ;; stretchable-height (case-> (Boolean . -> .(void)) (-> Boolean))
-      ;; get or set the stretchablity of the pasteboards height
-      (define stretchable-height-method
-        (case-lambda
-          [(value) (set! stretchable-height-field value)]
-          [() stretchable-height-field]))
-      
-      (define/public (get-aligned-min-width) aligned-min-width)
-      (define/public (get-aligned-min-height) aligned-min-height)
-      
-      (inherit get-margin get-editor get-admin)
-      (define/override (resize w h)
-        (set! aligned-min-width w)
-        (set! aligned-min-height h)
-        (super-resize w h))
-        
-      (define/public (stretch w h)
-        (super-resize w h))
-      
-      (define/override (get-extent dc x y w h descent space lspace rspace)
-        (super get-extent dc x y w h descent space lspace rspace)
-        (when (is-a? (get-editor) text%)
-          (set-box! w (sub1 (unbox w))))
-        (go))
-      
-      (define/override (set-min-width w)
-        ;; account for margin !!!!!!
-        (send (get-editor) set-min-width w))
-      
-      (define/override (set-min-height h)
-        ;; account for margin !!!!!!
-        (send (get-editor) set-min-height h))
-      
-      (define/public (super-resize w h)
-        (let ((top (box 0))
-              (bot (box 0))
-              (lef (box 0))
-              (rit (box 0)))
-          (get-margin top bot lef rit)
-          (let ((w (max (- w (unbox lef) (unbox rit)) 0))
-                (h (max (- h (unbox top) (unbox bot)) 0))
-                (e (get-editor))
-                (a (get-admin)))
-            ;; subtracting 1 from W seems to make it act more like the editor-snip
-            ;; because the C code has a hack to sub1 to make it look better. I am not
-            ;; sure if this change here is sound and works for every part of this
-            ;; class.
-            (super set-min-width w)
-            (super set-min-height h)
-            (when a (send a resized this #t)))))
-      
-      ;; call this from within get extent and use the values it produces by subtracting the
-      ;; margin instead of calling the editors get-extent and adding the margin.
-      (define (go)
-        (let ([w (box 0)]
-              [h (box 0)]
-              (top (box 0))
-              (bot (box 0))
-              (lef (box 0))
-              (rit (box 0)))
-          (get-margin top bot lef rit)
-          (send (get-editor) get-extent w h)
-          (set! aligned-min-width (+ (unbox w) (unbox lef) (unbox rit)))
-          (set! aligned-min-height (+ (unbox h) (unbox top) (unbox rit)))))
-            
-      (super-new)
-      (inherit get-min-width get-min-height)
-      (set-min-width (get-min-width))
-      (set-min-height (get-min-height))))
-  
-  (define stretchable-editor-snip%
-    (stretchable-editor-snip-mixin
-     editor-snip%)))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/actual-bigger.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/actual-bigger.rkt
deleted file mode 100644
index 7c767553e9..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/actual-bigger.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-editor-container.rkt" "../aligned-pasteboard.rkt"
-         "../snip-lib.rkt")
-
-(define f (new frame% [label "test"] [width 200] [height 200]))
-(define e (new text%))
-(define c (new editor-canvas% [editor e] [parent f]))
-
-(define vpb1 (new vertical-pasteboard%))
-(define aes1 (new aligned-editor-snip% [editor vpb1]))
-
-(define vpb2 (new vertical-pasteboard%))
-(define aes2 (new aligned-editor-snip% [editor vpb2]))
-
-(define t  (new text%))
-(define es (new editor-snip% (editor t)))
-
-(send vpb1 insert aes2 false)
-(send vpb2 insert es)
-(send e insert aes1)
-(send f show #t)
-(sleep 0.2)
-(send f show #f)
-
-(send t begin-edit-sequence)
-(send e begin-edit-sequence)
-(send t insert "1\n")
-(send t insert "1")
-(send e end-edit-sequence)
-(send t end-edit-sequence)
-
-(>= (send vpb1 get-aligned-min-height)
-    (send vpb2 get-aligned-min-height)
-    (snip-height es))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/debug.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/debug.rkt
deleted file mode 100644
index 9640e8994e..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/debug.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/gui
-
-(provide debug-snip debug-pasteboard debug-canvas)
-
-;; debug-snip: -> (void)
-;; get the relevant info about the snip that contains the two others
-;; pasteboards
-(define (debug-snip snip)
-  (printf "--- aligned-editor-snip% --\n")
-  (let ([l (box 0)] [t (box 0)] [r (box 0)] [b (box 0)])
-    (send snip get-inset l t r b)
-    (printf "get-inset: ~sX~s  ~sX~s\n"
-            (unbox l) (unbox r) (unbox t) (unbox b)))
-  (let ([l (box 0)] [t (box 0)] [r (box 0)] [b (box 0)])
-    (send snip get-margin l t r b)
-    (printf "get-margin: ~sX~s  ~sX~s\n"
-            (unbox l) (unbox r) (unbox t) (unbox b)))
-  (printf "get-max-height: ~s\n" (send snip get-max-height))
-  (printf "get-max-width:  ~s\n" (send snip get-max-width))
-  (printf "get-min-height: ~s\n" (send snip get-min-height))
-  (printf "get-min-width:  ~s\n" (send snip get-min-width))
-  ;; (printf "snip-width:     ~s\n" (send pasteboard snip-width snip))
-  ;; (printf "snip-height:    ~s\n" (send pasteboard snip-height snip))
-  )
-
-;; debug-pasteboard: -> (void)
-;; displays to the repl the sizes i'm interested in
-(define (debug-pasteboard pasteboard)
-  (printf "--- aligned-pasteboard% ---\n")
-  (let ([t1 (box 0)] [t2 (box 0)])
-    (send pasteboard get-extent t1 t2)
-    (printf "get-extent: ~sX~s\n" (unbox t1) (unbox t2)))
-  (printf "get-max-height: ~s\n" (send pasteboard get-max-height))
-  (let ([t (call-with-values (λ () (send pasteboard get-max-view-size)) cons)])
-    (printf "get-max-view-size: ~sX~s\n" (car t) (cdr t)))
-  (printf "get-max-width: ~s\n"  (send pasteboard get-max-width))
-  (printf "get-min-height: ~s\n" (send pasteboard get-min-height))
-  (printf "get-min-width: ~s\n"  (send pasteboard get-min-width))
-  (let ([t1 (box 0)] [t2 (box 0)])
-    (send pasteboard get-view-size t1 t2)
-    (printf "get-view-size: ~sX~s\n" (unbox t1) (unbox t2))))
-
-;; debug-canvas: -> (void)
-;; just some help counting pixels
-(define (debug-canvas canvas)
-  (printf "--- aligned-editor-canvas% ---\n")
-  ;; values
-  (define-syntax-rule (show* what ...)
-    (begin (let ([t (call-with-values (λ () (send canvas what)) cons)])
-             (printf "~a: ~sX~s\n" 'what (car t) (cdr t)))
-           ...))
-  (show* get-client-size get-graphical-min-size get-size)
-  ;; 1 value
-  (define-syntax-rule (show1 what ...)
-    (begin (printf "~a: ~s\n" 'what (send canvas what)) ...))
-  (show1 get-height get-width horiz-margin min-client-height min-client-width
-         min-height min-width vert-margin))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/edit-sequence-loop.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/edit-sequence-loop.rkt
deleted file mode 100644
index 7f4bea8220..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/edit-sequence-loop.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-pasteboard.rkt" "../aligned-editor-container.rkt")
-
-(define f        (new frame% (label "test")))
-(define e        (new text%))
-(define c        (new editor-canvas% (editor e) (parent f)))
-(define pb       (new vertical-pasteboard%))
-(define actual   (new text%))
-(define act-line (new aligned-editor-snip% (editor (new vertical-pasteboard%))))
-(define t        (new aligned-editor-snip% (editor pb)))
-(send e insert t)
-(send* pb (begin-edit-sequence) (insert act-line #f) (end-edit-sequence))
-
-;; Eli: for some reason, this used to pass the result into this
-;; function:
-;;   (define (converges? x) #t)
-;; I take it that the requirement is that it finishes after some time,
-;; so there's no need for the function.
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/example-min.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/example-min.rkt
deleted file mode 100644
index b8423f6b4c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/example-min.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-pasteboard.rkt" "../aligned-editor-container.rkt")
-
-(define f (new frame% (label "") (width 400) (height 400)))
-(define e (new horizontal-pasteboard%))
-(define c (new aligned-editor-canvas% (parent f) (editor e)))
-(define vp1 (new vertical-pasteboard%))
-(define ae-snip1 (new aligned-editor-snip% (editor vp1)))
-(define t-snip1 (new editor-snip% (editor (new text%))))
-(send e insert ae-snip1 false)
-(send vp1 insert t-snip1 false)
-(send f show true)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/example.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/example.rkt
deleted file mode 100644
index 9c0d9968b5..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/example.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-pasteboard.rkt" "../aligned-editor-container.rkt")
-
-(define frame (new frame% [label "Frame"] [width 400] [height 400]))
-(define pasteboard (new horizontal-pasteboard%))
-(define canvas (new aligned-editor-canvas% [parent frame] [editor pasteboard]))
-
-(define vp1      (new vertical-pasteboard%))
-(define ae-snip1 (new aligned-editor-snip% [editor vp1]))
-(define vp2      (new vertical-pasteboard%))
-(define ae-snip2 (new aligned-editor-snip% [editor vp2]))
-(define vp3      (new vertical-pasteboard%))
-(define ae-snip3 (new aligned-editor-snip% [editor vp3]))
-(define vp4      (new vertical-pasteboard%))
-(define ae-snip4 (new aligned-editor-snip% [editor vp4]))
-(define vp5      (new vertical-pasteboard%))
-(define ae-snip5 (new aligned-editor-snip% [editor vp5]))
-(define t-snip1  (new editor-snip% [editor (instantiate text% ())]))
-(define t-snip2  (new editor-snip% [editor (instantiate text% ())]))
-
-(send pasteboard insert ae-snip1 false)
-(send pasteboard insert ae-snip2 false)
-(send pasteboard insert ae-snip5 false)
-(send vp2 insert ae-snip3 false)
-(send vp2 insert ae-snip4 false)
-(send vp1 insert t-snip1 false)
-(send vp5 insert t-snip2 false)
-(send frame show true)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/info.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/info.rkt
deleted file mode 100644
index 5a32056e4a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define test-omit-paths '("example-min.rkt"
-                          "example.rkt"
-                          "minimal.rkt"
-                          "more-tests-margin-aligned.rkt"
-                          "more-tests-margin.rkt"
-                          "more-tests-min-stretchable.rkt"
-                          "more-tests-min.rkt"
-                          "more-tests-text.rkt"
-                          "more-tests.rkt"
-                          "old-bugs"
-                          "stretchable-editor-snip-test-min.rkt"
-                          "stretchable-editor-snip-test.rkt"
-                          "test-locked-pasteboard.rkt"))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/insertion-without-display.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/insertion-without-display.rkt
deleted file mode 100644
index d6e82fbc7f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/insertion-without-display.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/gui
-
-(require mrlib/aligned-pasteboard)
-
-(with-handlers ([exn? (lambda (x) #f)])
-  (send (new pasteboard%)
-        insert (new aligned-editor-snip% [editor (new horizontal-pasteboard%)]))
-  #t)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/minimal.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/minimal.rkt
deleted file mode 100644
index f81944a991..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/minimal.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-editor-container.rkt" "../aligned-pasteboard.rkt")
-
-(define f  (new frame% [label "test"] [width 200] [height 200]))
-(define e  (new vertical-pasteboard%))
-(define c  (new aligned-editor-canvas% [editor e] [parent f]))
-(define pb (new vertical-pasteboard%))
-(define s  (new aligned-editor-snip%
-                [editor pb] [stretchable-height #f] [stretchable-width #f]))
-(send pb insert (make-object string-snip% "Long snip"))
-(send pb insert (make-object string-snip% "Longer snip"))
-(send e insert s)
-(send f show #t)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-margin-aligned.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-margin-aligned.rkt
deleted file mode 100644
index 04c991b084..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-margin-aligned.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-editor-container.rkt" "../aligned-pasteboard.rkt")
-
-(define pb (new horizontal-pasteboard%))
-(send* pb
-  (insert (make-object string-snip% "Call") #f)
-  (insert (new editor-snip% [editor (new text%)]) #f))
-(define z (new aligned-editor-snip%
-               [editor pb] [stretchable-height #f] [stretchable-width #f]))
-(define f (new frame% [label "more-tests-text"] [width 200] [height 200]))
-(define e (new vertical-pasteboard%))
-(define c (new aligned-editor-canvas% [editor e] [parent f]))
-(send e insert z)
-(send f show #t)
-
-;;;;;;;;;;
-;; exploration
-(require "../snip-lib.rkt")
-(define (margin snip)
-  (define left   (box 0))
-  (define top    (box 0))
-  (define right  (box 0))
-  (define bottom (box 0))
-  (send snip get-margin left top right bottom)
-  (list (cons 'left   (unbox left))
-        (cons 'right  (unbox right))
-        (cons 'top    (unbox top))
-        (cons 'bottom (unbox bottom))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-margin.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-margin.rkt
deleted file mode 100644
index 98f542f83d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-margin.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-editor-container.rkt" "../aligned-pasteboard.rkt")
-
-(define pb (new horizontal-pasteboard%))
-(send* pb
-  (insert (make-object string-snip% "Call") #f)
-  (insert (new editor-snip% [editor (new text%)]) #f))
-(define z (new aligned-editor-snip% [editor pb]))
-(define f (new frame% [label "more-tests-text"] [width 200] [height 200]))
-(define e (new pasteboard%))
-(define c (new editor-canvas% [editor e] [parent f]))
-(send e insert z)
-(send f show #t)
-
-;;;;;;;;;;
-;; exploration
-(require "../snip-lib.rkt")
-(define (margin snip)
-  (define left   (box 0))
-  (define top    (box 0))
-  (define right  (box 0))
-  (define bottom (box 0))
-  (send snip get-margin left top right bottom)
-  (list (cons 'left   (unbox left))
-        (cons 'right  (unbox right))
-        (cons 'top    (unbox top))
-        (cons 'bottom (unbox bottom))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-min-stretchable.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-min-stretchable.rkt
deleted file mode 100644
index c1185a48b1..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-min-stretchable.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-editor-container.rkt" "../aligned-pasteboard.rkt")
-
-(define editor (new vertical-pasteboard%))
-(define pb (new horizontal-pasteboard%))
-(send* pb
-  (insert (make-object string-snip% "Call") #f)
-  (insert (new editor-snip% [editor (new text%)]) #f))
-(send editor insert (new aligned-editor-snip% [editor pb]))
-(define f (new frame% [label "more-test-jacob"] [width 200] [height 200]))
-(define e (new vertical-pasteboard%))
-(define c (new aligned-editor-canvas% [editor e] [parent f]))
-(define t (new aligned-editor-snip% [editor editor]))
-(send e insert t)
-(send f show #t)
-
-;;;;;;;;;;
-;; exploration
-(require "../snip-lib.rkt")
-(define t-e (send t get-editor))
-(send t-e get-aligned-min-width)
-(send t get-aligned-min-width)
-(define fs (send t-e find-first-snip))
-(define fs-e (send fs get-editor))
-(send fs-e find-first-snip)
-(send fs-e get-aligned-min-width)
-(send fs get-aligned-min-width)
-(define (margin snip)
-  (define left   (box 0))
-  (define top    (box 0))
-  (define right  (box 0))
-  (define bottom (box 0))
-  (send snip get-margin left top right bottom)
-  (list (cons 'left   (unbox left))
-        (cons 'right  (unbox right))
-        (cons 'top    (unbox top))
-        (cons 'bottom (unbox bottom))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-min.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-min.rkt
deleted file mode 100644
index 7fc0e97a5a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-min.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-editor-container.rkt" "../aligned-pasteboard.rkt")
-
-(define editor (new vertical-pasteboard%))
-(define pb (new horizontal-pasteboard%))
-(send* pb
-  (insert (make-object string-snip% "Call") #f)
-  (insert (new editor-snip% [editor (new text%)]) #f))
-(send editor insert (new aligned-editor-snip% [editor pb]))
-(define f (new frame% [label "more-test-jacob"] [width 200] [height 200]))
-(define e (new vertical-pasteboard%))
-(define c (new aligned-editor-canvas% [editor e] [parent f]))
-(define t (new aligned-editor-snip%
-               [editor editor] [stretchable-height #f] [stretchable-width #f]))
-(send e insert t)
-(send f show #t)
-
-;;;;;;;;;;
-;; exploration
-(require "../snip-lib.rkt")
-(define t-e (send t get-editor))
-(send t-e get-aligned-min-width)
-(send t get-aligned-min-width)
-(define fs (send t-e find-first-snip))
-(define fs-e (send fs get-editor))
-(send fs-e find-first-snip)
-(send fs-e get-aligned-min-width)
-(send fs get-aligned-min-width)
-(define (margin snip)
-  (define left   (box 0))
-  (define top    (box 0))
-  (define right  (box 0))
-  (define bottom (box 0))
-  (send snip get-margin left top right bottom)
-  (list (cons 'left   (unbox left))
-        (cons 'right  (unbox right))
-        (cons 'top    (unbox top))
-        (cons 'bottom (unbox bottom))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-text.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-text.rkt
deleted file mode 100644
index 4d18327ef7..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests-text.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/gui
-
-;; Note this test case fails when the snip 'y' is stretchable. There is
-;; lots of extra space. Finding out why will probably fix the test
-;; case's extra space.
-(require "../aligned-editor-container.rkt" "../aligned-pasteboard.rkt")
-
-(define editor (new vertical-pasteboard%))
-(define pb (new horizontal-pasteboard%))
-(define z (new editor-snip% [editor (new text%)]))
-(send* pb
-  (insert (make-object string-snip% "Call") #f)
-  (insert z #f))
-(define y (new aligned-editor-snip%
-               [editor pb] [stretchable-width #t] [stretchable-height #t]))
-(send editor insert y)
-(define f (new frame% [label "more-tests-text"] [width 200] [height 200]))
-(define e (new pasteboard%))
-(define c (new editor-canvas% [editor e] [parent f]))
-(define t (new aligned-editor-snip%
-               [editor editor] [stretchable-height #f] [stretchable-width #f]))
-(send e insert t)
-(send f show #t)
-
-;;;;;;;;;;
-;; exploration
-(eq-hash-code y)
-(eq-hash-code t)
-(require "../snip-lib.rkt")
-(define (margin snip)
-  (define left   (box 0))
-  (define top    (box 0))
-  (define right  (box 0))
-  (define bottom (box 0))
-  (send snip get-margin left top right bottom)
-  (list (cons 'left   (unbox left))
-        (cons 'right  (unbox right))
-        (cons 'top    (unbox top))
-        (cons 'bottom (unbox bottom))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests.rkt
deleted file mode 100644
index c3fa3f8e40..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/more-tests.rkt
+++ /dev/null
@@ -1,83 +0,0 @@
-#lang racket/gui
-
-;; some more advanced aligned-pasteboard tests take from the
-;; test-case-boxes
-
-(require "../aligned-editor-container.rkt" "../aligned-pasteboard.rkt")
-
-;; a text-case snip
-(define test-case-box%
-  (class aligned-editor-snip%
-    ;; these edit-sequences are looping
-    (define/public (hide-entries)
-      (send* editor
-        (begin-edit-sequence)
-        (release-snip call-line)
-        (release-snip exp-line)
-        (release-snip act-line)
-        (end-edit-sequence)))
-    ;; these edit-sequences are looping
-    (define/public (show-entries)
-      (send* editor
-        (begin-edit-sequence)
-        (insert call-line false)
-        (insert exp-line false)
-        (insert act-line false)
-        (end-edit-sequence)))
-    (field [editor      (new vertical-pasteboard%)]
-           [turn-button (new image-snip%)]
-           [comment     (new text%)]
-           [result      (new image-snip%)]
-           [call        (new text%)]
-           [expected    (new text%)]
-           [actual      (new text%)]
-           [top-line    (make-top-line turn-button comment result)]
-           [call-line   (make-line "Call" call)]
-           [exp-line    (make-line "Expected" expected)]
-           [act-line    (make-line "Actual" actual)])
-    (send editor insert top-line)
-    (show-entries)
-    (super-new [editor editor] [stretchable-height #f] [stretchable-width #f])))
-
-;; the top line of the test-case
-(define (make-top-line turn-snip comment result-snip)
-  (define pb (new horizontal-pasteboard%))
-  (send* pb
-    (insert turn-snip false)
-    (insert (text-field comment) false)
-    (insert result-snip false))
-  (new aligned-editor-snip% [stretchable-height false] [editor pb]))
-
-;; a line labeled with the given string and containing a given text
-(define (make-line str text)
-  (define pb (new horizontal-pasteboard%))
-  (send* pb
-    (insert (make-object string-snip% str) false)
-    (insert (text-field text) false))
-  (new aligned-editor-snip% [editor pb]))
-
-;; a text field fit to be in a test-case (no borders or margins etc.)
-;; STATUS: this should really return a stretchable-snip<%> not an
-;; editor-snip% of fixed size.
-(define (text-field text)
-  (new editor-snip% [editor text]))
-
-;; To make case 3 work, I need to send the forward set-aligned-min-sizes
-;; from the snip. Currently that call only originates in the on-size of
-;; the canvas but in case 3 the canvas does not belong to the aligned-*
-;; collection. I think the place to call this forward set-aligned-min-sizes
-;; is from within size-cache-invalid of the aligned-editor-snip
-(define top
-  (case 3
-    [(1) (cons vertical-pasteboard% aligned-editor-canvas%)]
-    [(2) (cons text% editor-canvas%)]
-    [(3) (cons pasteboard% editor-canvas%)]))
-
-(define f (new frame% [label "test"] [width 200] [height 250]))
-(define e (new (car top)))
-(define c (new (cdr top) (editor e) (parent f)))
-(define t (new test-case-box%))
-(send e insert t)
-(send f show #t)
-;; (send t hide-entries)
-;; (send t show-entries)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/old-bugs/big-min.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/old-bugs/big-min.rkt
deleted file mode 100644
index b5c21dce49..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/old-bugs/big-min.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/gui
-
-(require mrlib/aligned-pasteboard)
-
-(define frame (new frame% [label "big-min"] [width 400] [height 500]))
-(define test-suite (new vertical-pasteboard%))
-(new aligned-editor-canvas% [parent frame] [editor test-suite])
-
-(define top-string #f)
-
-(define (new*)
-  (define main-pb (new horizontal-pasteboard%))
-  (define pb      (new vertical-pasteboard%))
-  (define snip    (new aligned-editor-snip% [editor pb]))
-  (define string   (make-object string-snip% "Testing String Snip"))
-  (set! top-string string)
-  (send main-pb insert snip false)
-  (send main-pb insert string false)
-  (new aligned-editor-snip% [editor main-pb]))
-
-(send frame show #t)
-(define (add) (send test-suite insert (new*)))
-(add)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/old-bugs/missing-min.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/old-bugs/missing-min.rkt
deleted file mode 100644
index 29a6b37a94..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/old-bugs/missing-min.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/gui
-
-(require mrlib/aligned-pasteboard)
-
-(define f (new frame% [label "test"] [width 400] [height 500]))
-(define pb1 (new vertical-pasteboard%))
-(define ec (new aligned-editor-canvas%
-                [parent f] [editor pb1] [style '(no-hscroll)]))
-
-(define pb2 (new vertical-pasteboard%))
-(define es2 (new aligned-editor-snip% [editor pb2]))
-
-(define t (new text%))
-(define es3 (new editor-snip% [editor t]))
-
-(send pb1 insert es2)
-(send pb2 insert es3)
-(send f show true)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/snip-dumper.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/snip-dumper.rkt
deleted file mode 100644
index 4640c17370..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/snip-dumper.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/gui
-
-(provide dump-children (struct-out snip-dump) dump=?)
-
-;;dump=?: ((union snip-dump? (listof snip-dump?)) . -> . boolean?)
-(define (dump=? dump1 dump2)
-  (cond [(and (list? dump1) (list? dump2) (eq? (length dump1) (length dump2)))
-         (andmap dump=? dump1 dump2)]
-        [(and (snip-dump? dump1) (snip-dump? dump2))
-         (and (dump=? (snip-dump-left   dump1) (snip-dump-left   dump2))
-              (dump=? (snip-dump-top    dump1) (snip-dump-top    dump2))
-              (dump=? (snip-dump-right  dump1) (snip-dump-right  dump2))
-              (dump=? (snip-dump-bottom dump1) (snip-dump-bottom dump2))
-              (dump=? (snip-dump-children dump1) (snip-dump-children dump2)))]
-        [else (equal? dump1 dump2)]))
-
-;; type snip-dump =
-;;   (make-single number number number number (union #f (listof snip-dump)))
-;; if children is #f, this indicates that the snip was not an
-;; editor-snip. In contrast, if it is null, this indicates that
-;; the snip is an editor-snip, but has no children.
-(define-struct snip-dump (left top right bottom children))
-
-;; dump-pb : snip -> snip-dump
-(define (dump-snip snip)
-  (define outer-pb (send (send snip get-admin) get-editor))
-  (define bl (box 0))
-  (define bt (box 0))
-  (define br (box 0))
-  (define bb (box 0))
-  (send outer-pb get-snip-location snip bl bt #t)
-  (send outer-pb get-snip-location snip br bb #f)
-  (make-snip-dump (unbox bl) (unbox bt) (unbox br) (unbox bb)
-                  (dump-snips snip)))
-
-;; dump-snips : snip -> (union #f (listof snip-dump))
-(define (dump-snips snip)
-  (and (is-a? snip editor-snip%) (dump-children (send snip get-editor))))
-
-;; dump-children : editor<%> -> (listof snip-dump)
-(define (dump-children editor)
-  (let loop ([snip (send editor find-first-snip)])
-    (if snip
-      (cons (dump-snip snip) (loop (send snip next)))
-      '())))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/stretchable-editor-snip-test-min.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/stretchable-editor-snip-test-min.rkt
deleted file mode 100644
index 41850cda64..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/stretchable-editor-snip-test-min.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-pasteboard.rkt" "../aligned-editor-container.rkt"
-         "../stretchable-editor-snip.rkt" "../snip-lib.rkt")
-
-(define f (new frame% [label ""] [width 500] [height 500]))
-(define e (new vertical-pasteboard%))
-(define c (new aligned-editor-canvas% [parent f] [editor e]))
-
-(define pb  (new vertical-pasteboard%))
-(define aes (new aligned-editor-snip%
-                 [editor pb] [stretchable-width #f] [stretchable-height #f]))
-(define t2  (new text%))
-(define ses (new stretchable-editor-snip%
-                 [editor t2] [min-width 100]
-                 [stretchable-width #t] [stretchable-height #f]))
-(send e insert aes)
-(send pb insert ses)
-
-(send f show #t)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/stretchable-editor-snip-test.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/stretchable-editor-snip-test.rkt
deleted file mode 100644
index a7cf3ff990..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/stretchable-editor-snip-test.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-pasteboard.rkt" "../aligned-editor-container.rkt"
-         "../stretchable-editor-snip.rkt" "../snip-lib.rkt")
-
-(define f (new frame% [label ""] [width 500] [height 500]))
-(define e (new vertical-pasteboard%))
-(define c (new aligned-editor-canvas% [parent f] [editor e]))
-
-(define pb  (new vertical-pasteboard%))
-(define aes (new aligned-editor-snip%
-                 [editor pb] [stretchable-width #f] [stretchable-height #f]))
-(define t1  (new text%))
-(define es  (new editor-snip% [editor t1]))
-(define t2  (new text%))
-(define ses (new stretchable-editor-snip%
-                 [editor t2] [stretchable-width #t] [stretchable-height #f]))
-
-(send t1 insert "String")
-(send e insert aes)
-(send pb insert es)
-(send pb insert ses)
-
-(send f show #t)
-(equal? (snip-width es) (snip-width ses))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-alignment.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-alignment.rkt
deleted file mode 100644
index 4625061c8f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-alignment.rkt
+++ /dev/null
@@ -1,159 +0,0 @@
-#lang racket/gui
-
-(require mzlib/etc mzlib/list mzlib/match)
-(require "../alignment.rkt" "test-macro.rkt")
-
-;;los-equal? ((listof rect?) (listof rect?) . -> . boolean?)
-;;tests the equality of the list of structures
-(define (los-equal? a b)
-  (equal? (map rect->list a) (map rect->list b)))
-
-;;rect->list (rect? . -> . vector?)
-;;a vector of the fields in the rect
-(define rect->list
-  (match-lambda
-    [($ rect ($ dim x width stretchable-width?)
-             ($ dim y height stretchable-height?))
-     (list x width stretchable-width? y height stretchable-height?)]))
-
-;; empty pasteboard
-(test los-equal? (align 'vertical 100 100 empty) '())
-
-;; empty pasteboard
-(test los-equal? (align 'horizontal 100 100 empty) '())
-
-;; one unstretchable snip
-(test los-equal?
-      (align 'vertical 100 100
-             (list (make-rect (make-dim 0 10 false) (make-dim 0 10 false))))
-      (list (make-rect (make-dim 0 10 false) (make-dim 0 10 false))))
-
-(test los-equal?
-      (align 'horizontal 100 100
-             (list (make-rect (make-dim 0 10 false) (make-dim 0 10 false))))
-      (list (make-rect (make-dim 0 10 false) (make-dim 0 10 false))))
-
-;;one stretchable snip
-(test los-equal?
-      (align 'vertical 100 100
-             (list (make-rect (make-dim 0 10 true) (make-dim 0 10 true))))
-      (list (make-rect (make-dim 0 100 true) (make-dim 0 100 true))))
-
-;; two stretchable snips
-(test los-equal?
-      (align 'vertical 10 10
-             (list (make-rect (make-dim 0 0 true) (make-dim 0 0 true))
-                   (make-rect (make-dim 0 0 true) (make-dim 0 0 true))))
-      (list (make-rect (make-dim 0 10 true) (make-dim 0 5 true))
-            (make-rect (make-dim 0 10 true) (make-dim 5 5 true))))
-
-;; three stretchable, one too big
-(test los-equal?
-      (align 'vertical 50 100
-             (list (make-rect (make-dim 0 0 true) (make-dim 0 50 true))
-                   (make-rect (make-dim 0 0 true) (make-dim 0 0 true))
-                   (make-rect (make-dim 0 0 true) (make-dim 0 0 true))))
-      (list (make-rect (make-dim 0 50 true) (make-dim 0 50 true))
-            (make-rect (make-dim 0 50 true) (make-dim 50 25 true))
-            (make-rect (make-dim 0 50 true) (make-dim 75 25 true))))
-
-;; three stetchable, one too big, and an unstetchable
-(test los-equal?
-      (align 'vertical 50 100
-             (list (make-rect (make-dim 0 0 true) (make-dim 0 50 true))
-                   (make-rect (make-dim 0 0 true) (make-dim 0 0 true))
-                   (make-rect (make-dim 0 0 true) (make-dim 0 0 true))
-                   (make-rect (make-dim 0 50 false) (make-dim 0 10 false))))
-      (list (make-rect (make-dim 0 50 true) (make-dim 0 50 true))
-            (make-rect (make-dim 0 50 true) (make-dim 50 20 true))
-            (make-rect (make-dim 0 50 true) (make-dim 70 20 true))
-            (make-rect (make-dim 0 50 false) (make-dim 90 10 false))))
-
-;; failure from test-suite frame
-;; wrong answer given was (list (make-rect 0 0 335.0 10 #t))
-(test los-equal?
-      (align 'vertical 335.0 563.0
-             (list (make-rect (make-dim 0 10.0 #t) (make-dim 0 10.0 #t))))
-      (list (make-rect (make-dim 0 335.0 true) (make-dim 0 563.0 true))))
-
-;; sort of like the previous failed test but with a nonsizable snip
-(test los-equal?
-      (align 'vertical 563.0 335.0
-             (list (make-rect (make-dim 0 10.0 #t) (make-dim 0 10.0 #t))
-                   (make-rect (make-dim 0 10.0 false) (make-dim 0 10.0 false))))
-      (list (make-rect (make-dim 0 563.0 true) (make-dim 0 325.0 true))
-            (make-rect (make-dim 0 10.0 false) (make-dim 325.0 10.0 false))))
-
-;; something that requires a little modulo in division
-(test los-equal?
-      (align 'vertical 10 10
-             (list (make-rect (make-dim 0 0 true) (make-dim 0 0 true))
-                   (make-rect (make-dim 0 0 true) (make-dim 0 0 true))
-                   (make-rect (make-dim 0 0 true) (make-dim 0 0 true))))
-      (list (make-rect (make-dim 0 10 true) (make-dim 0 4 true))
-            (make-rect (make-dim 0 10 true) (make-dim 4 3 true))
-            (make-rect (make-dim 0 10 true) (make-dim 7 3 true))))
-
-;; 1 snip only stretches in off dimention
-(test los-equal?
-      (align 'vertical 100 400
-             (list (make-rect (make-dim 0 10 true) (make-dim 0 30 false))))
-      (list (make-rect (make-dim 0 100 true) (make-dim 0 30 false))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; The following examples of usage were taken from the test-suite tool ;;
-;; and turned into test cases                                          ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(test los-equal? (align 'vertical 563.0 335.0 (list)) '())
-
-(test los-equal?
-      (align 'vertical 563.0 335.0
-             (list (make-rect (make-dim 0 241 #t) (make-dim 0 114 #f))))
-      (list (make-rect (make-dim 0 563.0 #t) (make-dim 0 114 #f))))
-
-(test los-equal?
-      (align 'vertical 551.0 102.0
-             (list (make-rect (make-dim 0 34 #t) (make-dim 0 47 #t))
-                   (make-rect (make-dim 0 231 #t) (make-dim 0 57 #t))))
-      (list (make-rect (make-dim 0 551.0 #t) (make-dim 0 47 #t))
-            (make-rect (make-dim 0 551.0 #t) (make-dim 47 57 #t))))
-
-(test los-equal?
-      (align 'vertical 539.0 35.0
-             (list (make-rect (make-dim 0 24 #f) (make-dim 0 13 #f))
-                   (make-rect (make-dim 0 11 #f) (make-dim 0 24 #f))))
-      (list (make-rect (make-dim 0 24 #f) (make-dim 0 13 #f))
-            (make-rect (make-dim 0 11 #f) (make-dim 13 24 #f))))
-
-(test los-equal?
-      (align 'horizontal 539.0 45.0
-             (list (make-rect (make-dim 0 65 #t) (make-dim 0 47 #t))
-                   (make-rect (make-dim 0 48 #t) (make-dim 0 47 #t))
-                   (make-rect (make-dim 0 63 #t) (make-dim 0 47 #t))
-                   (make-rect (make-dim 0 45 #f) (make-dim 0 44 #f))))
-      (list (make-rect (make-dim 0 165.0 true) (make-dim 0 45.0 true))
-            (make-rect (make-dim 165.0 165.0 true) (make-dim 0 45.0 true))
-            (make-rect (make-dim 330.0 164.0 true) (make-dim 0 45.0 true))
-            (make-rect (make-dim 494.0 45 false) (make-dim 0 44 false))))
-
-(test los-equal?
-      (align 'vertical 153.0 33.0
-             (list (make-rect (make-dim 0 55 #f) (make-dim 0 13 #f))
-                   (make-rect (make-dim 0 11 #f) (make-dim 0 24 #f))))
-      (list (make-rect (make-dim 0 55 false) (make-dim 0 13 false))
-            (make-rect (make-dim 0 11 false) (make-dim 13 24 false))))
-
-(test los-equal?
-      (align 'vertical 153.0 33.0
-             (list (make-rect (make-dim 0 38 #f) (make-dim 0 13 #f))
-                   (make-rect (make-dim 0 11 #f) (make-dim 0 24 #f))))
-      (list (make-rect (make-dim 0 38 false) (make-dim 0 13 false))
-            (make-rect (make-dim 0 11 false) (make-dim 13 24 false))))
-
-(test los-equal?
-      (align 'vertical 152.0 33.0
-             (list (make-rect (make-dim 0 26 #f) (make-dim 0 13 #f))
-                   (make-rect (make-dim 0 53 #f) (make-dim 0 24 #f))))
-      (list (make-rect (make-dim 0 26 false) (make-dim 0 13 false))
-            (make-rect (make-dim 0 53 false) (make-dim 13 24 false))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.rkt
deleted file mode 100644
index cd51713453..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket/gui
-
-(require "../locked-pasteboard.rkt" mrlib/click-forwarding-editor)
-
-(define f (new frame% [width 400] [height 500] [label "test"]))
-(define e (new (click-forwarding-editor-mixin
-                (locked-pasteboard-mixin pasteboard%))))
-(define c (new editor-canvas% [parent f] [editor e]))
-(define t (new text%))
-(define s (new editor-snip% [editor t]))
-(send e insert s 0 100)
-(define t2 (new text%))
-(define s2 (new editor-snip% [editor t2]))
-(send e insert s2 100 0)
-(send f show #t)
-;; This test is not automated. To test it try to use the pasteboard that
-;; appears.
-;; (test:mouse-click 'left 0 100)
-;; (test:keystroke #\A)
-;; (string=? (send s get-text) "A")
-;; (send f show #f)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-macro.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-macro.rkt
deleted file mode 100644
index 6431d91176..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-macro.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-
-(provide test)
-
-;; test: (lambda (a?) ((a? a? . -> . boolean?) a? a? . -> . (void))
-;; tests to see if the expression is true and prints and error if it's not
-(define-syntax test
-  (syntax-rules (identity)
-    [(_ = actual expected)
-     (let ([result (with-handlers ([exn? (λ (x) x)]) actual)])
-       (unless (and (not (exn? result)) (= result expected))
-         (eprintf "test failed: ~s != ~s\n" result expected)))]))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-pasteboard-lib.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-pasteboard-lib.rkt
deleted file mode 100644
index 2c0d1a7d17..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-pasteboard-lib.rkt
+++ /dev/null
@@ -1,113 +0,0 @@
-#lang racket/gui
-
-(require "test-macro.rkt" "../pasteboard-lib.rkt"
-         "../aligned-pasteboard.rkt" "../aligned-editor-container.rkt")
-
-;; (printf "running tests for pasteboard-lib.rkt\n")
-
-;; pasteboard-root:
-;; ((is-a?/c aligned-pasteboard<%>) -> (is-a?/c aligned-pasteboard<%>))
-;; gets the top most aligned pasteboard in the tree of pasteboards and
-;; containers
-
-(let* ([pb1 (new vertical-pasteboard%)]
-       [pb2 (new horizontal-pasteboard%)]
-       [pb3 (new vertical-pasteboard%)]
-       [es2 (new aligned-editor-snip% [editor pb2])]
-       [es3 (new aligned-editor-snip% [editor pb3])]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new aligned-editor-canvas% [parent frame] [editor pb1])])
-  (send pb1 insert es2)
-  (send pb2 insert es3)
-  ;;
-  (test equal? (pasteboard-root pb3) pb1)
-  (test equal? (pasteboard-root pb2) pb1)
-  (test equal? (pasteboard-root pb1) pb1))
-
-(let* ([pb1 (new vertical-pasteboard%)]
-       [pb2 (new horizontal-pasteboard%)]
-       [pb3 (new vertical-pasteboard%)]
-       [es1 (new aligned-editor-snip% [editor pb1])]
-       [es3 (new aligned-editor-snip% [editor pb3])]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new aligned-editor-canvas% [parent frame] [editor pb2])])
-  (send pb2 insert es1)
-  (send pb2 insert es3)
-  ;;
-  (test equal? (pasteboard-root pb3) pb2)
-  (test equal? (pasteboard-root pb2) pb2)
-  (test equal? (pasteboard-root pb1) pb2))
-
-;;pasteboard-parent: ((is-a?/c pasteboard%) . -> . (is-a?/c aligned-editor-container<%>))
-;;gets the canvas or snip that the pasteboard is displayed in
-(let* ([pb1 (new vertical-pasteboard%)]
-       [pb2 (new horizontal-pasteboard%)]
-       [pb3 (new vertical-pasteboard%)]
-       [es2 (new aligned-editor-snip% [editor pb2])]
-       [es3 (new aligned-editor-snip% [editor pb3])]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new aligned-editor-canvas% [parent frame] [editor pb1])])
-  (send pb1 insert es2)
-  (send pb2 insert es3)
-  ;;
-  (test equal? (pasteboard-parent pb1) canvas)
-  (test equal? (pasteboard-parent pb2) es2)
-  (test equal? (pasteboard-parent pb3) es3))
-
-(let* ([pb1 (new vertical-pasteboard%)]
-       [pb2 (new horizontal-pasteboard%)]
-       [pb3 (new vertical-pasteboard%)]
-       [es2 (new aligned-editor-snip% [editor pb2])]
-       [es3 (new aligned-editor-snip% [editor pb3])]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new aligned-editor-canvas% [parent frame] [editor pb1])])
-  (send pb1 insert es2)
-  (send pb1 insert es3)
-  ;;
-  (test equal? (pasteboard-parent pb1) canvas)
-  (test equal? (pasteboard-parent pb2) es2)
-  (test equal? (pasteboard-parent pb3) es3))
-
-#|
-;; num-sizeable: ((is-a?/c aligned-pasteboard<%>) . -> . number?)
-;; the number of snips in the pasteboard that can be resized
-(let* ([pb1 (new vertical-pasteboard% ())]
-       [es1 (new editor-snip% [editor (new text%)])]
-       [es2 (new editor-snip% [editor (new text%)])]
-       [es3 (new editor-snip% [editor (new text%)])]
-       [es4 (new editor-snip% [editor (new text%)])]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new aligned-editor-canvas% [parent frame] [editor pb1])])
-  (send frame show #t)
-  (send pb1 insert es1)
-  (send pb1 insert es2)
-  (send pb1 insert es3)
-  (send pb1 insert es4)
-  ;;
-  (test = (num-sizeable pb1) 0)
-  (send pb1 delete es1)
-  (test = (num-sizeable pb1) 0)
-  (send frame show #f))
-
-(let* ([pb1 (new vertical-pasteboard%)]
-       [es1 (new aligned-editor-snip% [editor (new vertical-pasteboard%)])]
-       [es2 (new aligned-editor-snip% [editor (new vertical-pasteboard%)])]
-       [es3 (new aligned-editor-snip% [editor (new vertical-pasteboard%)])]
-       [es4 (new aligned-editor-snip% [editor (new vertical-pasteboard%)])]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new aligned-editor-canvas% [parent frame] [editor pb1])])
-  (send frame show #t)
-  (send pb1 insert es1)
-  (send pb1 insert es2)
-  (send pb1 insert es3)
-  (send pb1 insert es4)
-  ;;
-  (test = (num-sizeable pb1) 4)
-  (send pb1 delete es1)
-  (test = (num-sizeable pb1) 3)
-  (send pb1 erase)
-  (test = (num-sizeable pb1) 0)
-  (send frame show #f))
-
-(printf "tests done\n")
-|#
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-snip-lib.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-snip-lib.rkt
deleted file mode 100644
index a1449dcbca..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-snip-lib.rkt
+++ /dev/null
@@ -1,128 +0,0 @@
-#lang racket/gui
-
-(require "test-macro.rkt" "../snip-lib.rkt"
-         "../aligned-pasteboard.rkt" "../aligned-editor-container.rkt")
-
-;; (printf "running tests for snip-lib.rkt\n")
-
-;; snip-width: ((is-a?/c aligned-pasteboard<%>) (is-a?/c snip%) . -> . number?)
-;; the width of a snip in the given pasteboard
-(let* ([pb1 (new vertical-pasteboard%)]
-       [es1 (new editor-snip% [editor pb1])]
-       [pb2 (new vertical-pasteboard%)]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new aligned-editor-canvas% [parent frame] [editor pb2])])
-  (send frame show #t)
-  (send pb2 insert es1)
-  (send es1 resize 20 20)
-  (sleep/yield 0.3)
-  (test equal? (snip-width #;pb2 es1) 20.0)
-  (send es1 resize 200 90)
-  (sleep/yield 0.3)
-  (test equal? (snip-width #;pb2 es1) 200.0)
-  (send frame show #f))
-
-;; snip-height:
-;; ((is-a?/c aligned-pasteboard<%>) (is-a?/c snip%) . -> . number?)
-;; the height of a snip in the given pasteboard
-(let* ([pb1 (new vertical-pasteboard%)]
-       [es1 (new editor-snip% [editor pb1])]
-       [pb2 (new vertical-pasteboard%)]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new aligned-editor-canvas% [parent frame] [editor pb2])])
-  (send frame show #t)
-  (send pb2 insert es1)
-  (send es1 resize 20 20)
-  (sleep/yield 0.3)
-  (test equal? (snip-height #;pb2 es1) 20.0)
-  (send es1 resize 200 90)
-  (sleep/yield 0.3)
-  (test equal? (snip-height #;pb2 es1) 90.0)
-  (send frame show #f))
-
-;; snip-min-width: ((is-a?/c snip%) . -> . number?)
-;; the minimum width of the snip
-
-;; snip-min-height: ((is-a?/c snip%) . -> . number?)
-;; the minimum height of the snip
-
-;; snip-parent: ((is-a?/c snip%) . -> . (is-a?/c editor<%>))
-;; the pasteboard that contains the snip
-(let* ([pb1 (new pasteboard%)]
-       [es1 (new editor-snip% [editor pb1])]
-       [pb2 (new pasteboard%)]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new editor-canvas% [parent frame] [editor pb2])])
-  (send frame show #t)
-  (send pb2 insert es1)
-  (test equal? (snip-parent es1) pb2)
-  (send frame show #f))
-
-(let* ([pb1 (new horizontal-pasteboard%)]
-       [pb2 (new horizontal-pasteboard%)]
-       [pb3 (new horizontal-pasteboard%)]
-       [pb4 (new horizontal-pasteboard%)]
-       [pb5 (new horizontal-pasteboard%)]
-       [es2 (new aligned-editor-snip% [editor pb2])]
-       [es3 (new aligned-editor-snip% [editor pb3])]
-       [es4 (new aligned-editor-snip% [editor pb4])]
-       [es5 (new aligned-editor-snip% [editor pb5])]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new aligned-editor-canvas% [parent frame] [editor pb1])])
-  (send frame show #t)
-  (send pb1 insert es2)
-  (send pb2 insert es3)
-  (send pb3 insert es4)
-  (send pb4 insert es5)
-  (test equal? (snip-parent es2) pb1)
-  (test equal? (snip-parent es3) pb2)
-  (test equal? (snip-parent es4) pb3)
-  (test equal? (snip-parent es5) pb4)
-  (send frame show #f))
-
-;; fold-snip: (lambda (b?) ((any? b? . -> . b?) b? (is-a?/c snip%) . -> . b?))
-;; the application of f on all snips from snip to the end in a foldl
-;; foldr mannor
-(let* ([pb1 (new vertical-pasteboard%)]
-       [es1 (new editor-snip% [editor (new text%)])]
-       [es2 (new editor-snip% [editor (new text%)])]
-       [es3 (new editor-snip% [editor (new text%)])]
-       [es4 (new editor-snip% [editor (new text%)])]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new aligned-editor-canvas% [parent frame] [editor pb1])])
-  (send frame show #t)
-  (send pb1 insert es1)
-  (send pb1 insert es2)
-  (send pb1 insert es3)
-  (send pb1 insert es4)
-  (send es1 resize 100 100)
-  (send es2 resize 100 100)
-  (send es3 resize 100 100)
-  (send es4 resize 100 100)
-  (test = (fold-snip (λ (snip total-height)
-                       (+ (snip-height #;pb1 snip) total-height))
-                     0 es1)
-        400)
-  (send frame show #f))
-
-;; for-each-snip:
-;; (((is-a?/c snip%) . -> . (void)) (is-a/c? snip%) . -> . (void))
-;; applies the function to all the snips
-(let* ([pb1 (new vertical-pasteboard%)]
-       [es1 (new editor-snip% [editor (new text%)])]
-       [es2 (new editor-snip% [editor (new text%)])]
-       [es3 (new editor-snip% [editor (new text%)])]
-       [es4 (new editor-snip% [editor (new text%)])]
-       [frame (new frame% [label "l"] [width 10] [height 10])]
-       [canvas (new aligned-editor-canvas% [parent frame] [editor pb1])]
-       [count 0])
-  (send frame show #t)
-  (send pb1 insert es1)
-  (send pb1 insert es2)
-  (send pb1 insert es3)
-  (send pb1 insert es4)
-  (for-each-snip (λ (snip) (set! count (add1 count))) es1)
-  (test = count 4)
-  (send frame show #f))
-
-;; (printf "tests done\n")
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test.rkt
deleted file mode 100644
index 087829fa70..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test.rkt
+++ /dev/null
@@ -1,147 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-pasteboard.rkt" "../aligned-editor-container.rkt"
-         "snip-dumper.rkt")
-
-
-;                                     ;;
-;                                      ;
-;                                      ;
-;  ;;;;; ;;  ;;  ;;;;;;;;;;;;;; ;;;    ;     ;;;;;  ;;;;
-; ;    ;  ;;;;      ; ;  ;  ; ;;  ;;   ;    ;    ; ;   ;
-; ;;;;;;   ;;    ;;;; ;  ;  ; ;    ;   ;    ;;;;;; ;;;;
-; ;        ;;   ;   ; ;  ;  ; ;    ;   ;    ;          ;
-; ;;   ;  ;  ;  ;   ; ;  ;  ; ;;  ;;   ;    ;;   ; ;   ;
-;  ;;;;  ;;  ;;  ;;;;;;; ;; ;;; ;;;  ;;;;;   ;;;;  ;;;;
-;                             ;
-;                            ;;;
-
-(printf "running test.rkt\n")
-
-(define frame (new frame% [label "Frame"] [width 400] [height 400]))
-(define pasteboard (new horizontal-pasteboard%))
-(define canvas (new aligned-editor-canvas% [parent frame] [editor pasteboard]))
-(define insider  (new vertical-pasteboard%))
-(define insider2 (new vertical-pasteboard%))
-(define insider3 (new vertical-pasteboard%))
-(define insider4 (new vertical-pasteboard%))
-(define insider5 (new vertical-pasteboard%))
-(define insider6 (new vertical-pasteboard%))
-(define insider7 (new vertical-pasteboard%))
-(define pb-snip  (new aligned-editor-snip% [editor insider]))
-(define pb-snip2 (new aligned-editor-snip% [editor insider2]))
-(define pb-snip3 (new aligned-editor-snip% [editor insider3]))
-(define pb-snip4 (new aligned-editor-snip% [editor insider4]))
-(define pb-snip5 (new aligned-editor-snip% [editor insider5]))
-(define pb-snip6 (new aligned-editor-snip% [editor insider6]))
-(define pb-snip7 (new aligned-editor-snip% [editor insider7]))
-(define t-snip   (new editor-snip% [editor (new text%)]))
-(define i-snip   (new image-snip%))
-(define i-snip2  (new image-snip%))
-(define t-snip2  (new editor-snip% [editor (new text%)]))
-(define t-snip3  (new editor-snip% [editor (new text%)]))
-
-(send pasteboard begin-edit-sequence)
-(send frame show #t)
-(send pasteboard insert pb-snip)
-(send pasteboard insert t-snip)
-(send pasteboard insert i-snip)
-(send pasteboard insert i-snip2)
-(send pasteboard insert pb-snip2)
-(send pasteboard insert t-snip2)
-(send insider insert t-snip3)
-(send insider2 insert pb-snip3)
-(send insider2 insert pb-snip4)
-(send pasteboard insert pb-snip5)
-(send pasteboard insert pb-snip6)
-(send pasteboard insert pb-snip7)
-(send pasteboard end-edit-sequence)
-
-
-; ;                    ;
-; ;                    ;
-;;;;;;;   ;;;;;  ;;;; ;;;;;    ;;;;
-; ;      ;    ; ;   ;  ;      ;   ;
-; ;      ;;;;;; ;;;;   ;      ;;;;
-; ;      ;          ;  ;          ;
-; ;      ;;   ; ;   ;  ;      ;   ;
-; ;;;;;   ;;;;  ;;;;   ;;;;;  ;;;;
-
-;; Eli: Looks like these tests are supposed to return #t, so most are
-;; failing (wasn't visible when this was running via "gracket -f")
-
-(dump=?
- (dump-children pasteboard)
- (list
-  (make-snip-dump 57.0 368.0 0.0 0.0 '())
-  (make-snip-dump 114.0 368.0 57.0 0.0 '())
-  (make-snip-dump 171.0 368.0 114.0 0.0 '())
-  (make-snip-dump 182.0 24.0 171.0 0.0 '())
-  (make-snip-dump 249.0 368.0 182.0 0.0
-                  (list (make-snip-dump 55.0 178.0 0.0 0.0 '())
-                        (make-snip-dump 55.0 356.0 0.0 178.0 '())))
-  (make-snip-dump 269.0 20.0 249.0 0.0 #f)
-  (make-snip-dump 289.0 20.0 269.0 0.0 #f)
-  (make-snip-dump 300.0 24.0 289.0 0.0 '())
-  (make-snip-dump 368.0 368.0 300.0 0.0
-                  (list (make-snip-dump 11.0 24.0 0.0 0.0 '())))))
-
-(send frame resize 0 0)
-(sleep/yield 0.5)
-
-(dump=?
- (dump-children pasteboard)
- (list
-  (make-snip-dump 10.0 34.0 0.0 0.0 '())
-  (make-snip-dump 20.0 34.0 10.0 0.0 '())
-  (make-snip-dump 30.0 34.0 20.0 0.0 '())
-  (make-snip-dump 41.0 24.0 30.0 0.0 '())
-  (make-snip-dump 61.0 34.0 41.0 0.0
-                  (list (make-snip-dump 10.0 11.0 0.0 0.0 '())
-                        (make-snip-dump 10.0 22.0 0.0 11.0 '())))
-  (make-snip-dump 81.0 20.0 61.0 0.0 #f)
-  (make-snip-dump 101.0 20.0 81.0 0.0 #f)
-  (make-snip-dump 112.0 24.0 101.0 0.0 '())
-  (make-snip-dump 133.0 34.0 112.0 0.0
-                  (list (make-snip-dump 11.0 24.0 0.0 0.0 '())))))
-
-(send frame resize 800 600)
-(sleep/yield 0.5)
-
-(dump=?
- (dump-children pasteboard)
- (list (make-snip-dump 137.0 568.0 0.0 0.0 '())
-       (make-snip-dump 274.0 568.0 137.0 0.0 '())
-       (make-snip-dump 411.0 568.0 274.0 0.0 '())
-       (make-snip-dump 422.0 24.0 411.0 0.0 '())
-       (make-snip-dump 569.0 568.0 422.0 0.0
-                       (list (make-snip-dump 135.0 278.0 0.0 0.0 '())
-                             (make-snip-dump 135.0 556.0 0.0 278.0 '())))
-       (make-snip-dump 589.0 20.0 569.0 0.0 #f)
-       (make-snip-dump 609.0 20.0 589.0 0.0 #f)
-       (make-snip-dump 620.0 24.0 609.0 0.0 '())
-       (make-snip-dump 768.0 568.0 620.0 0.0
-                       (list (make-snip-dump 11.0 24.0 0.0 0.0 '())))))
-
-(send frame resize 400 400)
-(send pasteboard delete i-snip)
-(send pasteboard delete i-snip2)
-
-(dump=?
- (dump-children pasteboard)
- (list (make-snip-dump 65.0 368.0 0.0 0.0 '())
-       (make-snip-dump 130.0 368.0 65.0 0.0 '())
-       (make-snip-dump 195.0 368.0 130.0 0.0 '())
-       (make-snip-dump 206.0 24.0 195.0 0.0 '())
-       (make-snip-dump 281.0 368.0 206.0 0.0
-                       (list (make-snip-dump 63.0 178.0 0.0 0.0 '())
-                             (make-snip-dump 63.0 356.0 0.0 178.0 '())))
-       (make-snip-dump 292.0 24.0 281.0 0.0 '())
-       (make-snip-dump 368.0 368.0 292.0 0.0
-                       (list (make-snip-dump 11.0 24.0 0.0 0.0 '())))))
-
-(send pasteboard erase)
-(dump=? (dump-children pasteboard) '())
-
-(send frame show #f)
-(printf "done\n")
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test2.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test2.rkt
deleted file mode 100644
index c804b6570c..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test2.rkt
+++ /dev/null
@@ -1,114 +0,0 @@
-#lang racket/gui
-
-(require "../aligned-pasteboard.rkt" "../aligned-editor-container.rkt"
-         "snip-dumper.rkt")
-
-;                                       ;;
-;                                        ;
-;                                        ;
-;    ;;;;; ;;  ;;  ;;;;;;;;;;;;;; ;;;    ;     ;;;;;  ;;;;
-;   ;    ;  ;;;;      ; ;  ;  ; ;;  ;;   ;    ;    ; ;   ;
-;   ;;;;;;   ;;    ;;;; ;  ;  ; ;    ;   ;    ;;;;;; ;;;;
-;   ;        ;;   ;   ; ;  ;  ; ;    ;   ;    ;          ;
-;   ;;   ;  ;  ;  ;   ; ;  ;  ; ;;  ;;   ;    ;;   ; ;   ;
-;    ;;;;  ;;  ;;  ;;;;;;; ;; ;;; ;;;  ;;;;;   ;;;;  ;;;;
-;                               ;
-;                              ;;;
-
-(printf "running test2.rkt\n")
-
-(define frame (new frame% [label "Frame"] [width 400] [height 400]))
-(define pasteboard (new horizontal-pasteboard%))
-(define canvas (new aligned-editor-canvas% [parent frame] [editor pasteboard]))
-(define vp1      (new vertical-pasteboard%))
-(define ae-snip1 (new aligned-editor-snip% [editor vp1]))
-(define vp2      (new vertical-pasteboard%))
-(define ae-snip2 (new aligned-editor-snip% [editor vp2]))
-(define vp3      (new vertical-pasteboard%))
-(define ae-snip3 (new aligned-editor-snip% [editor vp3]))
-(define vp4      (new vertical-pasteboard%))
-(define ae-snip4 (new aligned-editor-snip% [editor vp4]))
-(define vp5      (new vertical-pasteboard%))
-(define ae-snip5 (new aligned-editor-snip% [editor vp5]))
-
-(send pasteboard insert ae-snip1)
-(send pasteboard insert ae-snip2)
-(send pasteboard insert ae-snip5)
-(send vp2 insert ae-snip3)
-(send vp2 insert ae-snip4)
-(send frame show #t)
-
-
-;   ;                    ;
-;   ;                    ;
-;  ;;;;;    ;;;;;  ;;;; ;;;;;    ;;;;
-;   ;      ;    ; ;   ;  ;      ;   ;
-;   ;      ;;;;;; ;;;;   ;      ;;;;
-;   ;      ;          ;  ;          ;
-;   ;      ;;   ; ;   ;  ;      ;   ;
-;   ;;;;;   ;;;;  ;;;;   ;;;;;  ;;;;
-
-;; Eli: Looks like these tests are supposed to return #t, so most are
-;; failing (wasn't visible when this was running via "gracket -f")
-
-(sleep/yield 0.5)
-(dump=?
- (dump-children pasteboard)
- (list (make-snip-dump 120.0 368.0 0.0 0.0 '())
-       (make-snip-dump 249.0 368.0 120.0 0.0
-                       (list (make-snip-dump 117.0 178.0 0.0 0.0 '())
-                             (make-snip-dump 117.0 356.0 0.0 178.0 '())))
-       (make-snip-dump 368.0 368.0 249.0 0.0 '())))
-
-(send frame resize 0 0)
-(sleep/yield 0.5)
-(dump=?
- (dump-children pasteboard)
- (list (make-snip-dump 10.0 30.0 0.0 0.0 '())
-       (make-snip-dump 30.0 30.0 10.0 0.0
-                       (list (make-snip-dump 10.0 10.0 0.0 0.0 '())
-                             (make-snip-dump 10.0 19.0 0.0 9.0 '())))
-       (make-snip-dump 40.0 30.0 30.0 0.0 '())))
-
-(send frame resize 800 600)
-(sleep/yield 0.5)
-(dump=?
- (dump-children pasteboard)
- (list
-  (make-snip-dump 253.0 568.0 0.0 0.0 '())
-  (make-snip-dump 516.0 568.0 253.0 0.0
-                  (list (make-snip-dump 251.0 278.0 0.0 0.0 '())
-                        (make-snip-dump 251.0 556.0 0.0 278.0 '())))
-  (make-snip-dump 768.0 568.0 516.0 0.0 '())))
-
-(send pasteboard delete ae-snip5)
-(dump=?
- (dump-children pasteboard)
- (list (make-snip-dump 389.0 568.0 0.0 0.0
-                       (list (make-snip-dump 377.0 278.0 0.0 0.0 '())
-                             (make-snip-dump 377.0 556.0 0.0 278.0 '())))
-       (make-snip-dump 768.0 568.0 389.0 0.0 '())))
-
-(send pasteboard insert ae-snip5)
-(dump=?
- (dump-children pasteboard)
- (list
-  (make-snip-dump 253.0 568.0 0.0 0.0 '())
-  (make-snip-dump 516.0 568.0 253.0 0.0
-                  (list (make-snip-dump 251.0 278.0 0.0 0.0 '())
-                        (make-snip-dump 251.0 556.0 0.0 278.0 '())))
-  (make-snip-dump 768.0 568.0 516.0 0.0 '())))
-
-(send pasteboard delete ae-snip5)
-(send pasteboard delete ae-snip1)
-(dump=?
- (dump-children pasteboard)
- (list (make-snip-dump 768.0 568.0 0.0 0.0
-                       (list (make-snip-dump 756.0 278.0 0.0 0.0 '())
-                             (make-snip-dump 756.0 556.0 0.0 278.0 '())))))
-
-(send pasteboard erase)
-(dump=? (dump-children pasteboard) '())
-
-(send frame show #f)
-(printf "done\n")
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/dot.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/dot.rkt
deleted file mode 100644
index e8ee7bdda3..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/dot.rkt
+++ /dev/null
@@ -1,321 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/system
-         "graph.rkt")
-
-(provide dot-positioning find-dot
-         dot-label neato-label neato-hier-label neato-ipsep-label)
-(define dot-label "dot")
-(define neato-label "neato")
-(define neato-hier-label "neato – hier")
-(define neato-ipsep-label "neato – ipsep")
-
-;; the code that finds the dot executable is the same as
-;; pkg/contract-profile/dot.rkt; please check the other 
-;; place if you find a bug here. the only reason it isn't
-;; shared is dependencies and lack of an obvious common
-;; place in between to put it.
-
-;; these paths are explicitly checked (when find-executable-path
-;; fails) because starting drracket from the finder (or the dock) 
-;; under mac os x generally does not get the path right.
-(define dot-paths 
-  '("/usr/bin"
-    "/bin"
-    "/usr/local/bin"
-    "/opt/local/bin/"))
-
-(define dot.exe (if (eq? (system-type) 'windows) "dot.exe" "dot"))
-(define neato.exe (if (eq? (system-type) 'windows) "neato.exe" "neato"))
-
-(define (find-dot [neato? #f])
-  (with-handlers ([(lambda (e) ; may not have permission
-                     (and (exn:fail? e)
-                          (regexp-match "access denied" (exn-message e))))
-                   (λ (x) #f)])
-    (define dp (find-executable-path dot.exe))
-    (define np (find-executable-path neato.exe))
-    (cond
-      [(and dp np)
-       (if neato? np dp)]
-      [else
-       (ormap (λ (x) (and (file-exists? (build-path x dot.exe))
-                          (file-exists? (build-path x neato.exe))
-                          (build-path x (if neato? neato.exe dot.exe))))
-              dot-paths)])))
-
-(define (dot-positioning pb [option dot-label] [overlap? #f])
-  (define dot-path (find-dot (regexp-match #rx"neato" option)))
-  (when dot-path
-    (define info (snip-info pb))
-    (define-values (positions max-y) (run-dot dot-path info option overlap?))
-    (send pb begin-edit-sequence)
-    (for ([position-line (in-list positions)])
-      (define id (list-ref position-line 0))
-      (define x (list-ref position-line 1))
-      (define y (list-ref position-line 2))
-      (define snip (car (hash-ref info id)))
-      (send pb move-to snip x (- max-y y)))
-    (send pb invalidate-bitmap-cache)
-    (send pb end-edit-sequence)))
-
-;; with-snips : pasteboard% 
-;;           -> hash-table[snip -> (list i number[width] number[height] (listof number))]
-(define (snip-info pb)
-  (let ([num-ht (make-hasheq)]
-        [children-ht (make-hasheq)])
-    (let loop ([snip (send pb find-first-snip)]
-               [i 0])
-      (when snip
-        (when (is-a? snip graph-snip<%>)
-          (hash-set! num-ht snip i))
-        (loop (send snip next) (+ i 1))))
-    (let ([lb (box 0)]
-          [tb (box 0)]
-          [rb (box 0)]
-          [bb (box 0)])
-      (hash-for-each
-       num-ht
-       (λ (snip num)
-         (send pb get-snip-location snip lb tb #f)
-         (send pb get-snip-location snip rb bb #t)
-         (hash-set! children-ht
-                    (hash-ref num-ht snip)
-                    (list 
-                     snip
-                     (- (unbox rb) (unbox lb))
-                     (- (unbox bb) (unbox tb))
-                     (filter
-                      values
-                      (map (λ (c) (hash-ref num-ht c #f))
-                           (send snip get-children)))))))
-      children-ht)))
-
-;; run-dot : hash-table[snip -> (list i (listof number))] string -> void
-(define (run-dot dot-path ht option overlap?)
-  (define info (sort (hash-map ht (λ (k v) (cons k v)))
-                     (λ (x y) (< (car x) (car y)))))
-  (let-values ([(in1 out1) (make-pipe)]
-               [(in2 out2) (make-pipe)])
-    (thread
-     (λ ()
-       (parameterize ([current-output-port out1])
-         (graph->dot info option overlap?))
-       (close-output-port out1)))
-    (thread
-     (λ ()
-       (parameterize ([current-input-port in1]
-                      [current-output-port out2])
-         (system (format "~a -Tplain" (path->string dot-path))))
-       (close-output-port out2)
-       (close-input-port in1)))
-    (parse-plain in2)))
-
-;; graph->dot (listof (list snip number (listof number)) -> void
-;; prints out the dot input file based on `g'
-(define (graph->dot g option overlap?)
-  (printf "digraph {\n")
-  (cond
-    [(equal? option dot-label)
-     (printf "  rankdir=\"~a\"\n" (if overlap? "LR" "TB"))]
-    [(equal? option neato-label)
-     (printf "  overlap=\"~a\"\n" (if overlap? "true" "false"))
-     (printf "  splines=\"true\"\n")]
-    [(equal? option neato-hier-label)
-     (printf "  overlap=\"~a\"\n" (if overlap? "true" "false"))
-     (printf "  mode=\"hier\"\n")
-     (printf "  splines=\"true\"\n")]
-    [(equal? option neato-ipsep-label)
-     (printf "  mode=\"ipsep\"\n")
-     (printf "  splines=\"true\"\n")
-     (printf "  overlap=\"~a\"\n" (if overlap? "true" "ipsep"))])
-  (for-each
-   (λ (line)
-     (let* ([snip (list-ref line 1)]
-            [id (list-ref line 0)]
-            [w (list-ref line 2)]
-            [h (list-ref line 3)]
-            [children (list-ref line 4)])
-       (printf "  ~a [width=~a height=~a shape=box label=\"\"]\n" 
-               (num->id id) 
-               (format-number (pixels->inches w))
-               (format-number (pixels->inches h)))
-       (for-each
-        (λ (child)
-          (printf "  ~a -> ~a\n" (num->id id) (num->id child)))
-        children)))
-   g)
-  (printf "}\n"))
-
-(define (num->id n) (format "s~a" n))
-(define (id->num s) (string->number (substring s 1 (string-length s))))
-
-(define (format-number n)
-  (let ([candidate (number->string (exact->inexact n))])
-    (cond
-      [(regexp-match #rx"^([0-9]*)\\.([0-9]*)$" candidate)
-       =>
-       (λ (m)
-         (let ([prefix (list-ref m 1)]
-               [suffix (list-ref m 2)])
-           (if (< (string-length suffix) 5)
-               candidate
-               (string-append prefix "." (substring suffix 0 4)))))]
-      [else
-       candidate])))
-  
-(define (parse-plain port)
-  
-  (define max-y 0)
-  
-  (define positions '())
-  
-  (define (main)
-    (let ([graph-line (read-line port)])
-      (let loop ()
-        (let ([line (read-line port)])
-          (cond
-            [(regexp-match #rx"^node" line)
-             (join (parse-node line)
-                   (loop))]
-            [(regexp-match #rx"^edge" line)
-             (join (parse-edge draw-edges possibly-update-max-y line)
-                   (loop))]
-            [(regexp-match #rx"stop" line)
-             void]
-            [else
-             (error 'mrlib/private/dot "didn't recognize line:\n  ~s" line)])))))
-  
-  (define (possibly-update-max-y y)
-    (set! max-y (max y max-y)))
-  
-  (define (join p1 p2)
-    (cond
-      [(eq? p1 void) p2]
-      [(eq? p2 void) p1]
-      [else 
-       (λ (dc left top right bottom dx dy) 
-         (p1 dc left top right bottom dx dy)
-         (p2 dc left top right bottom dx dy))]))
-
-  (define (parse-node line) 
-    (let*-values ([(node line) (chomp line)]
-                  [(id line) (chomp line)]
-                  [(raw-x line) (chomp line)]
-                  [(raw-y line) (chomp line)]
-                  [(raw-w line) (chomp line)]
-                  [(raw-h line) (chomp line)]
-                  [(label line) (chomp line)]
-                  [(style line) (chomp line)]
-                  [(raw-shape line) (chomp line)]
-                  [(color line) (chomp line)]
-                  [(fillcolor line) (chomp line)])
-      
-      (define x (inches->pixels (string->number raw-x)))
-      (define y (inches->pixels (string->number raw-y)))
-      (define w (inches->pixels (string->number raw-w)))
-      (define h (inches->pixels (string->number raw-h)))
-      (define shape (string->symbol raw-shape))
-      
-      (set! positions (cons (list (id->num id) 
-                                  (- x (/ w 2)) 
-                                  (+ y (/ h 2)))
-                            positions))
-      
-      (set! max-y (max (+ y h) max-y))
-      void))
-  
-  ;; chomp : string -> (values string (union #f string))
-  ;; returns the first word at the beginning of the string
-  ;; and the remainder of the string (or #f is there is no more)
-  (define (chomp s)
-    (let ([s (regexp-replace #rx"^ *" s "")])
-      (cond
-        [(equal? s "")
-         (values "" #f)]
-        [else
-         (case (string-ref s 0)
-           [(#\") (let ([m (regexp-match #rx"^\"([^\"]*)\"(.*)$" s)])
-                    (values (list-ref m 1)
-                            (list-ref m 2)))]
-           [else
-            (cond
-              [(regexp-match #rx"^([^ ]*) (.*)$" s)
-               =>
-               (λ (m)
-                 (values (list-ref m 1)
-                         (list-ref m 2)))]
-              [(regexp-match #rx"^([^ ]*)$" s)
-               =>
-               (λ (m)
-                 (values (list-ref m 1)
-                         #f))]
-              [else
-               (error 'mrlib/private/dot "~s" s)])])])))
-            
-  (define (draw-edges dc dx dy raw-points)
-    (let ([points (map (λ (x) (list (inches->pixels (car x))
-                                    (inches->pixels (list-ref x 1))))
-                       raw-points)])
-      (send dc set-pen "blue" 1 'solid)
-      (send dc set-brush "black" 'transparent)
-      (let ([path (new dc-path%)])
-        (send path move-to 
-              (car (car points))
-              (- max-y (cadr (car points))))
-        (let loop ([points (cdr points)])
-          (cond
-            [(null? points) (void)]
-            [else (let ([p1 (list-ref points 0)]
-                        [p2 (list-ref points 1)]
-                        [p3 (list-ref points 2)])
-                    (send path curve-to 
-                          (list-ref p1 0) (- max-y (list-ref p1 1))
-                          (list-ref p2 0) (- max-y (list-ref p2 1))
-                          (list-ref p3 0) (- max-y (list-ref p3 1)))
-                    (loop (cdddr points)))]))
-        (send dc draw-path path dx dy))))
-  (main)
-  (values positions
-          max-y))
-
-(define (parse-edge draw-edges possibly-update-max-y line)
-  (define (give-up)
-    (error 'mrlib/private/dot "could not parse edge line:\n  ~s\n" line))
-  (define m (regexp-match #rx"edge ([^ ]+) ([^ ]+) ([0-9]+) (.*)$" line))
-  (unless m (give-up))
-  (define from (list-ref m 1))
-  (define to (list-ref m 2))
-  (define point-count (string->number (list-ref m 3)))
-  (define rest (list-ref m 4))
-  (define points 
-    (let loop ([pts point-count]
-               [rest rest])
-      (cond
-        [(zero? pts) '()]
-        [else
-         (define m (regexp-match #rx"^([-0-9e.]+) ([-0-9e.]+) (.*)$" rest))
-         (unless m (give-up))
-         (define x (string->number (list-ref m 1)))
-         (define y (string->number (list-ref m 2)))
-         (unless x (give-up))
-         (unless y (give-up))
-         (possibly-update-max-y y)
-         (cons (list x y)
-               (loop (- pts 1)
-                     (list-ref m 3)))])))
-  (λ (dc left top right bottom dx dy)
-    (draw-edges dc dx dy points)))
-
-(module+ test
-  (parse-edge
-   void
-   void
-   (string-append
-    "edge s0 s2 13 1.4555 4.7222 1.1487 4.6131 0.81639 4.4528 0.56944 4.2222 0.15175 3.8322"
-    " 3.7007e-17 3.6409 0 3.0694 0 3.0694 0 3.0694 0 2.0972 0 1.1469 1.2205 0.56102 1.7932 0.33843"
-    " solid black")))
-
-(define (pixels->inches x) (/ x 72))
-(define (inches->pixels x) (* x 72))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/graph.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/graph.rkt
deleted file mode 100644
index 8cd89bec34..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/graph.rkt
+++ /dev/null
@@ -1,892 +0,0 @@
-#lang racket/base
-  (require racket/class
-           racket/list
-           racket/math
-           racket/gui/base
-           racket/match
-           (for-syntax racket/base)
-           racket/contract)
-
-(provide graph-snip<%>
-         graph-snip-mixin
-         graph-pasteboard<%>
-         graph-pasteboard-mixin)
-(provide add-links add-links/text-colors remove-links set-link-label)
-  
-  (define-local-member-name invalidate-edge-cache)
-  
-  (define graph-snip<%>
-    (interface ()
-      get-children 
-      add-child
-      remove-child
-
-      get-parents
-      add-parent
-      remove-parent
-      has-self-loop?
-
-      set-parent-link-label
-
-      find-shortest-path))
-  
-  (define-local-member-name get-parent-links)
-  
-  (define self-offset 10)
-  
-  ;; (or-2v arg ...)
-  ;; like `or', except each `arg' returns two values. The
-  ;; truth value of each arg is #t if both args are #t and
-  ;; #f otherwise
-  (define-syntax (or-2v stx)
-    (syntax-case stx ()
-      [(_ arg)
-       (syntax arg)]
-      [(_ arg args ...)
-       (syntax
-        (let-values ([(one two) arg])
-          (if (and one two)
-              (values one two)
-              (or-2v args ...))))]))
-  
-  (define snipclass (make-object snip-class%))
-  
-  (define default-dark-pen (send the-pen-list find-or-create-pen "blue" 1 'solid))
-  (define default-light-pen (send the-pen-list find-or-create-pen "light blue" 1 'solid))
-  (define default-dark-brush (send the-brush-list find-or-create-brush "light blue" 'solid))
-  (define default-light-brush (send the-brush-list find-or-create-brush "white" 'solid))
-  (define default-dark-text (send the-color-database find-color "blue"))
-  (define default-light-text (send the-color-database find-color "light blue"))
-  
-  
-  ;; label is boolean or string
-  (define-struct link (snip dark-pen light-pen dark-brush light-brush dark-text light-text dx dy [label #:mutable]))
-  
-  ;; add-links : (is-a?/c graph-snip<%>) (is-a?/c graph-snip<%>) -> void
-  ;;           : (is-a?/c graph-snip<%>) (is-a?/c graph-snip<%>) pen pen brush brush -> void
-  (define add-links 
-    (case-lambda
-      [(parent child) (add-links parent child #f #f #f #f)]
-      [(parent child dark-pen light-pen dark-brush light-brush)
-       (add-links parent child dark-pen light-pen dark-brush light-brush 0 0)]
-      [(parent child dark-pen light-pen dark-brush light-brush label)
-       (add-links parent child dark-pen light-pen dark-brush light-brush 0 0 label)]
-      [(parent child dark-pen light-pen dark-brush light-brush dx dy)
-       (add-links parent child dark-pen light-pen dark-brush light-brush dx dy #f)]
-      [(parent child dark-pen light-pen dark-brush light-brush dx dy label)
-       (add-links/text-colors parent child
-                              dark-pen light-pen dark-brush light-brush
-                              #f #f 
-                              dx dy
-                              label)]))
-  
-  (define (add-links/text-colors parent child
-                                 dark-pen light-pen dark-brush light-brush
-                                 dark-text light-text 
-                                 dx dy
-                                 label)
-    (send parent add-child child)
-    (send child add-parent parent dark-pen light-pen dark-brush light-brush dark-text light-text dx dy label))
-
-  (define (remove-links parent child)
-    (send parent remove-child child)
-    (send child remove-parent parent))
-
-  (define (set-link-label parent child label)
-    (send child set-parent-link-label parent label))
-
-  (define graph-snip-mixin
-    (mixin ((class->interface snip%)) (graph-snip<%>)
-      (inherit get-admin)
-      
-      (define children null)
-      (define/public (get-children) children)
-      (define/public (add-child child)
-        (unless (memq child children)
-          (set! children (cons child children))))
-      (define/public (remove-child child)
-        (when (memq child children)
-          (set! children (remq child children))))
-      
-      (define parent-links null)
-      (define/public (get-parent-links) parent-links)
-      (define/public (get-parents) (map link-snip parent-links))
-      (define/public add-parent
-        (case-lambda
-          [(parent) (add-parent parent #f #f #f #f)]
-          [(parent dark-pen light-pen dark-brush light-brush)
-           (add-parent parent dark-pen light-pen dark-brush light-brush 0 0)]
-          [(parent dark-pen light-pen dark-brush light-brush dx dy)
-           (add-parent parent dark-pen light-pen dark-brush light-brush #f #f dx dy #f)]
-          [(parent dark-pen light-pen dark-brush light-brush dark-text light-text dx dy label)
-           (unless (memf (lambda (parent-link) (eq? (link-snip parent-link) parent)) parent-links)
-             (define admin (get-admin))
-             (when admin
-               (define ed (send admin get-editor))
-               (when (is-a? ed graph-pasteboard<%>)
-                 (send ed invalidate-edge-cache)))
-             (set! parent-links 
-                   (cons (make-link parent
-                                    (or dark-pen default-dark-pen)
-                                    (or light-pen default-light-pen)
-                                    (or dark-brush default-dark-brush)
-                                    (or light-brush default-light-brush)
-                                    (or dark-text default-dark-text)
-                                    (or light-text default-light-text)
-                                    dx 
-                                    dy
-                                    label)
-                         parent-links)))]))
-      (define/public (remove-parent parent) 
-        (when (memf (lambda (parent-link) (eq? (link-snip parent-link) parent)) parent-links)
-          (set! parent-links
-                (remove
-                 parent
-                 parent-links
-                 (lambda (parent parent-link) (eq? (link-snip parent-link) parent))))))
-      (define/public (set-parent-link-label parent label)
-        (let ([parent-link
-               (cond [(memf (lambda (parent-link)
-                              (eq? (link-snip parent-link) parent))
-                            parent-links)
-                      => car]
-                     [else #f])])
-          (when parent-link
-            (set-link-label! parent-link label))))
-      
-      (define/public (has-self-loop?)
-        (memq this (get-children)))
-      
-      (define/public (find-shortest-path other)
-        (define visited-ht (make-hasheq))
-        (define (first-view? n) 
-          (hash-ref visited-ht n (lambda () 
-                                   (hash-set! visited-ht n #f)
-                                   #t)))
-        (let loop ((horizon (list (list this))))
-          (cond
-            [(null? horizon) #f]
-            [(assq other horizon) => (lambda (winner) winner)]
-            [else
-             (let inner-loop ((paths horizon)
-                              (acc '()))
-               (cond
-                 [(null? paths) (loop (apply append acc))]
-                 [else
-                  (let ((path (car paths)))
-                    (inner-loop 
-                     (cdr paths)
-                     (cons 
-                      (map (lambda (child) (cons child path)) (filter first-view? (send (car path) get-children)))
-                      acc)))]))])))
-      
-      (super-new)
-      
-      (inherit set-snipclass)
-      (set-snipclass snipclass)))
-  
-  (define graph-pasteboard<%>
-    (interface ()
-      on-mouse-over-snips
-      set-arrowhead-params
-      get-arrowhead-params
-      set-draw-arrow-heads?
-      set-flip-labels?
-      draw-edges))
-  
-  (define-struct rect (left top right bottom))
-  
-  (define graph-pasteboard-mixin
-    (mixin ((class->interface pasteboard%)) (graph-pasteboard<%>)
-      (inherit find-first-snip find-next-selected-snip)
-      
-      (init-field [edge-label-font #f]
-                  [edge-labels? #t]
-                  [cache-arrow-drawing? #f])
-      
-      (define/public (set-edge-label-font f)
-        (set! edge-label-font f)
-        (invalidate-bitmap-cache))
-      (define/public (get-edge-label-font) edge-label-font)
-      
-      (define draw-arrow-heads? #t)
-      (define flip-labels?      #t)
-      (inherit refresh get-admin)
-      (define (refresh*)
-        (let ([admin (get-admin)])
-          (when admin
-            (let ([xb (box 0)] [yb (box 0)] [wb (box 0)] [hb (box 0)])
-              (send admin get-view xb yb wb hb)
-              (send admin needs-update
-                    (unbox xb) (unbox yb) (unbox wb) (unbox hb))))))
-      (define/public (set-draw-arrow-heads? x)
-        (set! draw-arrow-heads? x)
-        (refresh*))
-      (define/public (set-flip-labels? x)
-        (set! flip-labels? x)
-        (refresh*))
-      
-      (define arrowhead-angle-width (* 1/4 pi))
-      (define arrowhead-short-side 8)
-      (define arrowhead-long-side 12)
-      
-      (define/public (set-arrowhead-params angle-width long-side short-side)
-        (set! arrowhead-angle-width angle-width)
-        (set! arrowhead-short-side short-side)
-        (set! arrowhead-long-side long-side))
-      (define/public (get-arrowhead-params)
-        (values arrowhead-angle-width
-                arrowhead-long-side
-                arrowhead-short-side))
-    
-      (inherit dc-location-to-editor-location get-canvas get-dc)
-      (field (currently-overs null))
-      (define/override (on-event evt)
-        (cond
-          [(send evt leaving?)
-           (change-currently-overs null (get-dc))
-           (super on-event evt)]
-          [(or (send evt entering?)
-               (send evt moving?))
-           (let ([ex (send evt get-x)]
-                 [ey (send evt get-y)])
-             (let-values ([(x y) (dc-location-to-editor-location ex ey)])
-               (change-currently-overs (find-snips-under-mouse x y) (get-dc))))
-           (super on-event evt)]
-          [else 
-           (super on-event evt)]))
-      
-      (define/augment (on-interactive-move evt)
-        (invalidate-selected-snips)
-        (inner (void) on-interactive-move evt))
-      
-      (define/augment (after-interactive-move evt)
-        (invalidate-selected-snips)
-        (inner (void) on-interactive-move evt))
-      
-      (define/override (interactive-adjust-move snip x y)
-        (let ([dc (get-dc)])
-          (when dc
-            (invalidate-to-children/parents snip dc)))
-        (super interactive-adjust-move snip x y))
-      
-      (define/augment (after-insert snip before x y)
-        (let ([dc (get-dc)])
-          (when dc
-            (invalidate-to-children/parents snip dc)))
-        (inner (void) after-insert snip before x y))
-      
-      ;; invalidate-selected-snips : -> void
-      ;; invalidates the region around the selected
-      ;; snips and their parents and children
-      (define/private (invalidate-selected-snips)
-        (let ([dc (get-dc)])
-          (when dc
-            (let loop ([snip (find-next-selected-snip #f)])
-              (when snip
-                (invalidate-to-children/parents snip dc)
-                (loop (find-next-selected-snip snip)))))))
-      
-      (define/private (add-to-rect from to rect)
-        (let-values ([(xf yf wf hf) (get-position from)]
-                     [(xt yt wt ht) (get-position to)])
-          (make-rect
-           (if rect 
-               (min xf xt (rect-left rect))
-               (min xf xt))
-           (if rect
-               (min yf yt (rect-top rect))
-               (min yf yt))
-           (if rect
-               (max (+ xf wf) (+ xt wt) (rect-right rect))
-               (max (+ xf wf) (+ xt wt)))
-           (if rect
-               (max (+ yf hf) (+ yt ht) (rect-bottom rect))
-               (max (+ yf hf) (+ yt ht))))))
-      
-      ;; find-snips-under-mouse : num num -> (listof graph-snip<%>)
-      (define/private (find-snips-under-mouse x y)
-        (let loop ([snip (find-first-snip)])
-          (cond
-            [snip
-             (let-values ([(sx sy sw sh) (get-position snip)])
-               (if (and (<= sx x (+ sx sw))
-                        (<= sy y (+ sy sh))
-                        (is-a? snip graph-snip<%>))
-                   (cons snip (loop (send snip next)))
-                   (loop (send snip next))))]
-            [else null])))
-      
-      ;; change-currently-overs : (listof snip) -> void
-      (define/private (change-currently-overs new-currently-overs dc)
-        (unless (set-equal new-currently-overs currently-overs)
-          (let ([old-currently-overs currently-overs])
-            (set! currently-overs new-currently-overs)
-            
-            (on-mouse-over-snips currently-overs)
-            (for-each 
-             (lambda (old-currently-over)
-               (invalidate-to-children/parents old-currently-over dc))
-             old-currently-overs)
-            (for-each
-             (lambda (new-currently-over)
-               (invalidate-to-children/parents new-currently-over dc))
-             new-currently-overs))))
-      
-      (define/public (on-mouse-over-snips snips) (void))
-        
-      ;; set-equal : (listof snip) (listof snip) -> boolean
-      ;; typically lists will be small (length 1),
-      ;; so use andmap/memq rather than hash-tables
-      (define/private (set-equal los1 los2)
-        (and (andmap (lambda (s1) (memq s1 los2)) los1)
-             (andmap (lambda (s2) (memq s2 los1)) los2)
-             #t))
-      
-      ;; invalidate-to-children/parents : snip dc -> void
-      ;; invalidates the region containing this snip and
-      ;; all of its children and parents.
-      (define/private (invalidate-to-children/parents snip dc)
-        (when (is-a? snip graph-snip<%>)
-          (define-values (_1 text-height _2 _3) (send dc get-text-extent "Label" #f #f 0))
-          (define parents-and-children (append (get-all-parents snip)
-                                               (get-all-children snip)))
-          (define rects (get-rectangles snip parents-and-children))
-          (for ([rect (in-list rects)])
-            (save-rectangle-to-invalidate
-             (- (rect-left rect) text-height)
-             (- (rect-top rect)  text-height)
-             (+ (rect-right rect) text-height)
-             (+ (rect-bottom rect) text-height)))))
-      
-      (define pending-invalidate-rectangle #f)
-      (define pending-invalidate-rectangle-timer #f)
-      (inherit invalidate-bitmap-cache)
-      (define/private (run-pending-invalidate-rectangle)
-        (define the-pending-invalidate-rectangle pending-invalidate-rectangle)
-        (set! pending-invalidate-rectangle #f)
-        (invalidate-bitmap-cache . the-pending-invalidate-rectangle))
-      
-      (define/private (save-rectangle-to-invalidate l t r b)
-        (unless pending-invalidate-rectangle-timer
-          (set! pending-invalidate-rectangle-timer 
-                (new timer% [notify-callback
-                             (λ () (run-pending-invalidate-rectangle))])))
-        (add-to-pending-indvalidate-rectangle l t r b)
-        (send pending-invalidate-rectangle-timer start 20 #t))
-      
-      (define/private (add-to-pending-indvalidate-rectangle l t r b)
-        (set! pending-invalidate-rectangle
-              (match pending-invalidate-rectangle
-                [(list l2 t2 r2 b2)
-                 (list (min l l2) (min t t2) (max r r2) (max b b2))]
-                [#f
-                 (list l t r b)])))
-
-      ;; get-rectangles : snip (listof snip) -> rect
-      ;; computes the rectangles that need to be invalidated for connecting 
-      (define/private (get-rectangles main-snip c/p-snips)
-        (let ([main-snip-rect (snip->rect main-snip)])
-          (let loop ([c/p-snips c/p-snips])
-            (cond
-              [(null? c/p-snips) null]
-              [else 
-               (let* ([c/p (car c/p-snips)]
-                      [rect
-                       (if (eq? c/p main-snip)
-                           (let-values ([(sx sy sw sh) (get-position c/p)]
-                                        [(_1 h _2 _3) (send (get-dc) get-text-extent "yX")])
-                             (make-rect (- sx self-offset)
-                                        sy
-                                        (+ (+ sx sw) self-offset)
-                                        (+ (+ sy sh) self-offset h)))
-                           (or/c-rects (list main-snip-rect
-                                              (snip->rect c/p))))])
-                 (cons rect (loop (cdr c/p-snips))))]))))
-
-      (define/private (snip->rect snip)
-        (let-values ([(sx sy sw sh) (get-position snip)])
-          (let* ([dc (get-dc)]
-                 [h (if dc
-                        (let-values ([(_1 h _2 _3) (send dc get-text-extent "yX")])
-                          h)
-                        10)])
-            (make-rect sx 
-                       sy 
-                       (+ sx sw) 
-                       (max (+ sy sh)
-                            (+ sy (/ sh 2) (* 2
-                                              (sin (/ arrowhead-angle-width 2)) 
-                                              arrowhead-long-side) h))))))
-
-      (define/private (rect-area rect)
-        (* (- (rect-right rect)
-              (rect-left rect))
-           (- (rect-bottom rect)
-              (rect-top rect))))
-      
-      (define/private (or/c-rects rects)
-        (cond
-          [(null? rects) (make-rect 0 0 0 0)]
-          [else
-           (let loop ([rects (cdr rects)]
-                      [l (rect-left (car rects))]
-                      [t (rect-top (car rects))]
-                      [r (rect-right (car rects))]
-                      [b (rect-bottom (car rects))])
-             (cond
-               [(null? rects) (make-rect l t r b)]
-               [else
-                (let ([rect (car rects)])
-                  (loop (cdr rects)
-                        (min l (rect-left rect))
-                        (min t (rect-top rect))
-                        (max r (rect-right rect))
-                        (max b (rect-bottom rect))))]))]))
-      
-      (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-        (when before?
-          (let ([old-font (send dc get-font)])
-            (when edge-label-font
-              (send dc set-font edge-label-font))
-            (cond
-              [pending-invalidate-rectangle
-               (add-to-pending-indvalidate-rectangle left top right bottom)]
-              [else
-               (draw-edges dc left top right bottom dx dy)])
-            (when edge-label-font
-              (send dc set-font old-font))))
-        (super on-paint before? dc left top right bottom dx dy draw-caret))
-      
-      (define/public (draw-edges dc left top right bottom dx dy)
-        (cond
-          [cache-arrow-drawing?
-           (define admin (get-admin))
-           (when admin
-             (define-values (x y w h)
-               (let ([xb (box 0)]
-                     [yb (box 0)]
-                     [wb (box 0)]
-                     [hb (box 0)])
-                 (send admin get-max-view xb yb wb hb)
-                 (values (unbox xb) (unbox yb) (unbox wb) (unbox hb))))
-             (define this-time (list x y w h))
-             (unless (and edges-cache (equal? this-time edges-cache-last-time))
-               (set! edges-cache-last-time this-time)
-               (set! edges-cache (make-bitmap (inexact->exact (ceiling w))
-                                              (inexact->exact (ceiling h))))
-               (define bdc (make-object bitmap-dc% edges-cache))
-               (draw-edges/compute bdc x y (+ x w) (+ y h) dx dy #f)
-               (send bdc set-bitmap #f))
-             (send dc draw-bitmap edges-cache 0 0)
-             (draw-edges/compute dc left top right bottom dx dy #t))]
-          [else 
-           (draw-edges/compute dc left top right bottom dx dy #f)
-           (draw-edges/compute dc left top right bottom dx dy #t)]))
-      
-      (define/augment (on-change)
-        (set! edges-cache #f)
-        (inner (void) on-change))
-      
-      (define/public (invalidate-edge-cache) (set! edges-cache #f))
-      (define edges-cache #f)
-      (define edges-cache-last-time #f)
-        
-      (define/private (draw-edges/compute dc left top right bottom dx dy draw-dark-lines?)
-          ;; draw-connection : link snip boolean boolean -> void
-          ;; sets the drawing context (pen and brush)
-          ;; determines if the connection is between a snip and itself or two different snips
-          ;;  and calls draw-self-connection or draw-non-self-connection
-          (define (draw-connection from-link to dark-lines?)
-            (let ([from (link-snip from-link)])
-              (when (send from get-admin)
-                (let ([dx (+ dx (link-dx from-link))]
-                      [dy (+ dy (link-dy from-link))])
-                  (cond
-                    [(eq? from to)
-                     (set-pen/brush from-link dark-lines?)
-                     (draw-self-connection dx dy (link-snip from-link) from-link dark-lines?)]
-                    [else
-                     (draw-non-self-connection dx dy from-link dark-lines? to)])))))
-          
-          (define (get-text-length txt) 
-            (let-values ([(text-len h d v) (send dc get-text-extent txt)])
-              text-len))
-          
-          (define (draw-self-connection dx dy snip the-link dark-lines?)
-            (let*-values ([(sx sy sw sh) (get-position snip)]
-                          [(s1x s1y) (values (+ sx sw) (+ sy (* sh 1/2)))]
-                          [(s2x s2y) (values (+ sx sw self-offset) (+ sy (* 3/4 sh) (* 1/2 self-offset)))]
-                          [(s3x s3y) (values (+ sx sw) (+ sy sh self-offset))]
-                          [(b12x b12y) (values s2x s1y)]
-                          [(b23x b23y) (values s2x s3y)]
-                          
-                          [(s4x s4y) (values (- sx arrowhead-short-side)
-                                             (+ sy (* sh 1/2)))]
-                          [(s5x s5y) (values (- sx arrowhead-short-side self-offset)
-                                             (+ sy (* 3/4 sh) (* 1/2 self-offset)))]
-                          [(s6x s6y) (values (- sx arrowhead-short-side)
-                                             (+ sy sh self-offset))]
-                          [(b45x b45y) (values s5x s4y)]
-                          [(b56x b56y) (values s5x s6y)])
-              
-              (update-arrowhead-polygon s4x s4y sx s4y point1 point2 point3 point4)
-              (send dc draw-spline (+ dx s1x) (+ dy s1y) (+ dx b12x) (+ dy b12y) (+ dx s2x) (+ dy s2y))
-              (send dc draw-spline (+ dx s2x) (+ dy s2y) (+ dx b23x) (+ dy b23y) (+ dx s3x) (+ dy s3y))
-              (send dc draw-line (+ dx s3x) (+ dy s3y) (+ dx s6x) (+ dy s6y))
-              
-              (when (and edge-labels? (link-label the-link))
-                (let* ((textlen (get-text-length (link-label the-link)))
-                       (linelen (- s6x s3x))
-                       (offset (* 1/2 (- linelen textlen))))
-                  (when (or #t (> sw textlen))
-                    (send dc draw-text 
-                          (link-label the-link)
-                          (+ dx s3x offset)
-                          (+ dy s3y)
-                          #f
-                          0
-                          0))))
-              
-              (send dc draw-spline (+ dx s4x) (+ dy s4y) (+ dx b45x) (+ dy b45y) (+ dx s5x) (+ dy s5y))
-              (send dc draw-spline (+ dx s5x) (+ dy s5y) (+ dx b56x) (+ dy b56y) (+ dx s6x) (+ dy s6y))
-              (send dc draw-polygon points dx dy)))
-          
-          (define (draw-non-self-connection dx dy from-link dark-lines? to)
-            (let ([from (link-snip from-link)])
-              (let*-values ([(xf yf wf hf) (get-position from)]
-                            [(xt yt wt ht) (get-position to)]
-                            [(lf tf rf bf) (values xf yf (+ xf wf) (+ yf hf))]
-                            [(lt tt rt bt) (values xt yt (+ xt wt) (+ yt ht))])
-                (let ([x1 (+ xf (/ wf 2))]
-                      [y1 (+ yf (/ hf 2))]
-                      [x2 (+ xt (/ wt 2))]
-                      [y2 (+ yt (/ ht 2))])
-                  
-                  (set-pen/brush from-link dark-lines?)
-                  (let-values ([(from-x from-y)
-                                (or-2v (find-intersection x1 y1 x2 y2 
-                                                          lf tf rf tf)
-                                       (find-intersection x1 y1 x2 y2 
-                                                          lf bf rf bf)
-                                       (find-intersection x1 y1 x2 y2 
-                                                          lf tf lf bf)
-                                       (find-intersection x1 y1 x2 y2 
-                                                          rf tf rf bf))]
-                               [(to-x to-y)
-                                (or-2v (find-intersection x1 y1 x2 y2 
-                                                          lt tt rt tt)
-                                       (find-intersection x1 y1 x2 y2 
-                                                          lt bt rt bt)
-                                       (find-intersection x1 y1 x2 y2 
-                                                          lt tt lt bt)
-                                       (find-intersection x1 y1 x2 y2 
-                                                          rt tt rt bt))])
-                    (when (and from-x from-y to-x to-y)
-                      (let ((from-pt (make-rectangular from-x from-y))
-                            (to-pt   (make-rectangular to-x to-y)))
-                        (define (arrow-point-ok? point-x point-y)
-                          (and (in-rectangle? point-x point-y
-                                              (min lt rt lf rf) (min tt bt tf bf)
-                                              (max lt rt lf rf) (max tt bt tf bf))
-                               (not (strict-in-rectangle? point-x point-y 
-                                                          (min lt rt) (min tt bt) 
-                                                          (max lt rt) (max tt bt)))
-                               (not (strict-in-rectangle? point-x point-y
-                                                          (min lf rf) (min tf bf)
-                                                          (max lf rf) (max tf bf)))))
-                        (cond
-                          [(or (in-rectangle? from-x from-y lt tt rt bt)
-                               (in-rectangle? to-x to-y lf tf rf bf))
-                           ;; the snips overlap, draw nothing
-                           (void)]
-                          [else
-                           (draw-single-edge dc dx dy from to from-x from-y to-x to-y arrow-point-ok?)
-                           (when (and edge-labels? (link-label from-link))
-                             (let-values ([(text-len h d v) (send dc get-text-extent (link-label from-link))])
-                               (let* ([arrow-end-x (send point3 get-x)]
-                                      [arrow-end-y (send point3 get-y)]
-                                      [arrowhead-end (make-rectangular arrow-end-x arrow-end-y)]
-                                      [vec (- arrowhead-end from-pt)]
-                                      [angle (- (angle vec))]
-                                      [flip? (and flip-labels?
-                                                  (not (< (/ pi -2) angle (/ pi 2))))]
-                                      [angle (if flip? (+ angle pi) angle)]
-                                      [middle (+ from-pt
-                                                 (- (* 1/2 vec)
-                                                    (make-polar (/ text-len 2) (- angle))))])
-                                 (when (> (sqrt (+ (sqr (- arrow-end-x from-x))
-                                                        (sqr (- arrow-end-y from-y))))
-                                               text-len)
-                                   (send dc draw-text (link-label from-link)
-                                         (+ dx (real-part middle))
-                                         (+ dy (imag-part middle))
-                                         #f
-                                         0
-                                         angle)))))]))))))))
-          
-          (define (set-pen/brush from-link dark-lines?)
-            (send dc set-brush 
-                  (if dark-lines?
-                      (link-dark-brush from-link)
-                      (link-light-brush from-link)))
-            (send dc set-pen
-                  (if dark-lines?
-                      (link-dark-pen from-link)
-                      (link-light-pen from-link)))
-            (send dc set-text-foreground
-                  (if dark-lines?
-                      (link-dark-text from-link)
-                      (link-light-text from-link))))
-          
-          (let ([old-pen (send dc get-pen)]
-                [old-brush (send dc get-brush)]
-                [old-fg (send dc get-text-foreground)]
-                [os (send dc get-smoothing)])
-            (send dc set-smoothing 'aligned)
-            
-            (let ([pairs '()])
-              (for-each-to-redraw 
-               left top right bottom 
-               (lambda (from-link to)
-                 (let ([from (link-snip from-link)])
-                   (when (and (or (memq from currently-overs)
-                                  (memq to currently-overs))
-                              draw-dark-lines?)
-                     (set! pairs (cons (cons from-link to) pairs)))
-                   (unless draw-dark-lines?
-                     (draw-connection from-link to #f)))))
-              (for-each (lambda (pr)
-                          (draw-connection (car pr) (cdr pr) #t))
-                        pairs))
-            
-            (send dc set-smoothing os)
-            (send dc set-pen old-pen)
-            (send dc set-text-foreground old-fg)
-            (send dc set-brush old-brush)))
-      
-      (define/public (draw-single-edge dc dx dy from to from-x from-y to-x to-y arrow-point-ok?)
-        (send dc draw-line
-              (+ dx from-x) (+ dy from-y) 
-              (+ dx to-x) (+ dy to-y))
-        (update-arrowhead-polygon from-x from-y to-x to-y point1 point2 point3 point4)
-        (when (and draw-arrow-heads?
-                   (arrow-point-ok? (send point1 get-x) (send point1 get-y))
-                   (arrow-point-ok? (send point2 get-x) (send point2 get-y))
-                   (arrow-point-ok? (send point3 get-x) (send point3 get-y))
-                   (arrow-point-ok? (send point4 get-x) (send point4 get-y)))
-          ;; the arrowhead is not overlapping the snips, so draw it
-          ;; (this is only an approximate test, but probably good enough)
-          (send dc draw-polygon points dx dy)))
-      
-      ;; for-each-to-redraw : number number number number (link snip -> void)
-      (define/private (for-each-to-redraw left top right bottom f)
-          ;;  : link snip boolean boolean -> void
-          ;; sets the drawing context (pen and brush)
-          ;; determines if the connection is between a snip and itself or two different snips
-          ;;  and calls draw-self-connection or draw-non-self-connection
-          (define (maybe-call-f from-link to)
-            (let ([from (link-snip from-link)])
-              (when (send from get-admin)
-                (cond
-                  [(eq? from to)
-                   (f from-link to)]
-                  [else
-                   (let*-values ([(xf yf wf hf) (get-position from)]
-                                 [(xt yt wt ht) (get-position to)]
-                                 [(lf tf rf bf) (values xf yf (+ xf wf) (+ yf hf))]
-                                 [(lt tt rt bt) (values xt yt (+ xt wt) (+ yt ht))])
-                     (let ([x1 (+ xf (/ wf 2))]
-                           [y1 (+ yf (/ hf 2))]
-                           [x2 (+ xt (/ wt 2))]
-                           [y2 (+ yt (/ ht 2))])
-                       
-                       (unless (or (and (x1 . <= . left)
-                                        (x2 . <= . left))
-                                   (and (x1 . >= . right)
-                                        (x2 . >= . right))
-                                   (and (y1 . <= . top)
-                                        (y2 . <= . top))
-                                   (and (y1 . >= . bottom)
-                                        (y2 . >= . bottom)))
-                         (f from-link to))))]))))
-          
-          (let loop ([snip (find-first-snip)])
-            (when snip
-              (when (and (send snip get-admin)
-                         (is-a? snip graph-snip<%>))
-                (for-each (lambda (parent-link) (maybe-call-f parent-link snip))
-                          (send snip get-parent-links)))
-              (loop (send snip next)))))
-      
-      
-      (field 
-       [point1 (make-object point% 0 0)]
-       [point2 (make-object point% 0 0)]
-       [point3 (make-object point% 0 0)]
-       [point4 (make-object point% 0 0)]
-       [points (list point1 point2 point3 point4)])
-      
-      ;; update-arrowhead-polygon : number^4 -> void
-      ;; updates points1, 2, and 3 with the arrow head's
-      ;; points. Use a turtle-like movement to find the points.
-      ;; point3 is the point where the line should end.
-      (define/public (update-arrowhead-polygon from-x from-y to-x to-y point1 point2 point3 point4)
-        (define (move tx ty ta d) (values (+ tx (* d (cos ta)))
-                                          (+ ty (* d (sin ta)))
-                                          ta))
-        (define (turn tx ty ta a) (values tx
-                                          ty
-                                          (+ ta a)))
-        (define init-angle 
-          (cond
-            [(and (from-x . = . to-x)
-                  (from-y . < . to-y))
-             (* pi 3/2)]
-            [(from-x . = . to-x)
-             (* pi 1/2)]
-            [(from-x . < . to-x)
-             (+ pi (atan (/ (- from-y to-y) (- from-x to-x))))]
-            [else
-             (atan (/ (- from-y to-y) (- from-x to-x)))]))
-        (let*-values ([(t1x t1y t1a) (values to-x to-y init-angle)]
-                      [(t2x t2y t2a) (turn t1x t1y t1a (/ arrowhead-angle-width 2))]
-                      [(t3x t3y t3a) (move t2x t2y t2a arrowhead-long-side)]
-                      [(t4x t4y t4a) (turn t1x t1y t1a (- (/ arrowhead-angle-width 2)))]
-                      [(t5x t5y t5a) (move t4x t4y t4a arrowhead-long-side)]
-                      [(t6x t6y t6a) (move t1x t1y t1a arrowhead-short-side)])
-          (send point1 set-x t1x)
-          (send point1 set-y t1y)
-          (send point2 set-x t3x)
-          (send point2 set-y t3y)
-          (send point3 set-x t6x)
-          (send point3 set-y t6y)
-          (send point4 set-x t5x)
-          (send point4 set-y t5y)))
-      
-      (define/private (should-hilite? snip)
-        (let ([check-one-way
-               (lambda (way)
-                 (let loop ([snip snip])
-                   (or (memq snip currently-overs)
-                       (and (is-a? snip graph-snip<%>)
-                            (loop (car (way snip)))))))])
-          (or (check-one-way (lambda (snip) (send snip get-children)))
-              (check-one-way (lambda (snip) (send snip get-parents))))))
-      
-      (inherit get-snip-location)
-      (field [lb (box 0)]
-             [tb (box 0)]
-             [rb (box 0)]
-             [bb (box 0)])
-      (define/private (get-position snip)
-        (get-snip-location snip lb tb #f)
-        (get-snip-location snip rb bb #t)
-        (values (unbox lb)
-                (unbox tb)
-                (- (unbox rb) (unbox lb))
-                (- (unbox bb) (unbox tb))))
-      
-      (super-new)))
-  
-  ;; in-rectangle? : number^2 number^2 number^2 -> boolean
-  ;; determines if (x,y) is in the rectangle described
-  ;; by (p1x,p1y) and (p2x,p2y).
-  (define (in-rectangle? x y p1x p1y p2x p2y)
-    (and (<= (min p1x p2x) x (max p1x p2x))
-         (<= (min p1y p2y) y (max p1y p2y))))
-  
-  ;; strict-in-rectangle? : number^2 number^2 number^2 -> boolean
-  ;; determines if (x,y) is in the rectangle described
-  ;; by (p1x,p1y) and (p2x,p2y), but not on the border
-  (define (strict-in-rectangle? x y p1x p1y p2x p2y)
-    (and (< (min p1x p2x) x (max p1x p2x))
-         (< (min p1y p2y) y (max p1y p2y))))
-  
-  ;; find-intersection : number^8 -> (values (or/c #f number) (or/c #f number))
-  ;; calculates the intersection between two line segments, 
-  ;; described as pairs of points. Returns #f if they do not intersect
-  (define (find-intersection x1 y1 x2 y2 x3 y3 x4 y4)
-    (let-values ([(m1 b1) (find-mb x1 y1 x2 y2)]
-                 [(m2 b2) (find-mb x3 y3 x4 y4)])
-      (let-values ([(int-x int-y)
-                    (cond
-                      [(and m1 m2 b1 b2
-                            (= m1 0)
-                            (= m2 0))
-                       (values #f #f)]
-                      [(and m1 m2 b1 b2
-                            (= m1 0))
-                       (let* ([y y1]
-                              [x (/ (- y b2) m2)])
-                         (values x y))]
-                      [(and m1 m2 b1 b2
-                            (= m2 0))
-                       (let* ([y y3]
-                              [x (/ (- y b1) m1)])
-                         (values x y))]
-                      [(and m1 m2 b1 b2
-                            (not (= m1 m2)))
-                       (let* ([y (/ (- b2 b1) (- m1 m2))]
-                              [x (/ (- y b1) m1)])
-                         (values x y))]
-                      [(and m1 b1)
-                       (let* ([x x3]
-                              [y (+ (* m1 x) b1)])
-                         (values x y))]
-                      [(and m2 b2)
-                       (let* ([x x1]
-                              [y (+ (* m2 x) b2)])
-                         (values x y))]
-                      [else 
-                       (values #f #f)])])
-        
-        (if (and int-x
-                 int-y
-                 (<= (min x1 x2) int-x (max x1 x2))
-                 (<= (min y1 y2) int-y (max y1 y2))
-                 (<= (min x3 x4) int-x (max x3 x4))
-                 (<= (min y3 y4) int-y (max y3 y4)))
-            (values int-x int-y)
-            (values #f #f)))))
-  
-  ;; find-mb : number number number number -> (values (or/c #f number) (or/c #f number))
-  ;; finds the "m" and "b" constants that describe the
-  ;; lines from (x1, y1) to (x2, y2)
-  (define (find-mb x1 y1 x2 y2)
-    (if (= x1 x2)
-        (values #f #f)
-        (let-values ([(xl yl xr yr)
-                      (if (x1 . <= . x2)
-                          (values x1 y1 x2 y2)
-                          (values x2 y2 x1 y1))])
-          (let* ([m (/ (- yr yl) (- xr xl))]
-                 [b (- y1 (* m x1))])
-            (values m b)))))
-  
-  ;; get-all-relatives : (snip -> (listof snip)) snip -> (listof snip)
-  ;; returns all editor-snip relatives (of a particular sort), including
-  ;; any regular snip relatives along the way.
-  (define (get-all-relatives get-relatives snip)
-    (let loop ([flat-relatives (get-relatives snip)]
-               [relatives null])
-      (cond
-        [(null? flat-relatives) relatives]
-        [else
-         (let i-loop ([dummy (car flat-relatives)]
-                      [acc relatives])
-           (cond
-             [(is-a? dummy graph-snip<%>)
-              (loop (cdr flat-relatives) (cons dummy acc))]
-             [else
-              (i-loop (car (get-relatives dummy))
-                      (cons dummy acc))]))])))
-  
-  ;; get-all-children : snip -> (listof snip)
-  (define (get-all-children snip)
-    (get-all-relatives (lambda (snip) (send snip get-children)) snip))
-  
-  ;; get-all-parents : snip -> (listof snip)
-  (define (get-all-parents snip)
-    (get-all-relatives (lambda (snip) (send snip get-parents)) snip))
-  
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/image-core-bitmap.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/image-core-bitmap.rkt
deleted file mode 100644
index 2ac019aeac..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/image-core-bitmap.rkt
+++ /dev/null
@@ -1,304 +0,0 @@
-#lang scheme/base
-(require racket/draw
-         scheme/class)
-
-
-(provide rotate-bytes ;; : bytes int[width] int[height] radians[radians] -> bytes
-         flip-bytes ;; : bytes int[width] int[height] -> bytes
-         bitmap->bytes
-         bytes->bitmap
-         linear-transform)
-;; rotate-bitmap : (-> bytes? natural-number/c natural-number/c real? bytes?)
-;; avoid a dependency on scheme/contract, which pulls in too much
-
-;; for the test suite:
-(provide clamp-1 build-bytes bmbytes-ref/safe interpolate)
-
-(define pi (atan 0 -1))
-(define i 0+1i)
-
-#|
-
-instead of this scaling code, we use the dc<%>'s scaling code.
-
-(provide/contract [scale-bitmap
-                   (-> bytes? natural-number/c natural-number/c (and/c real? (not/c negative?)) 
-                       bytes?)])
-
-
-; bmbytes: a bytes which represents an image -- 
-; its size is a multiple of 4, and each
-; four consecutive bytes represent alpha,r,g,b.
-
-
-; scale: given a bmbytes,
-; return a new bmbytes scaled by k in each direction.
-;
-; TODO: this code is meant for scaling by (>= k 1);
-; if (< k 1) then the result will ignore ~ (1-k) of the original's pixels.
-; We should really do a proper averaging for that case.
-;
-(define (scale-bitmap bmbytes w h k)
-  (let* {[new-w (round/e (* w k))]
-         [new-h (round/e (* h k))]
-         }
-         (values (build-bmbytes new-w
-                                new-h
-                                (λ (x y) (interpolate bmbytes w h
-                                                      ; You'd think x would map to (x/(kw))*w,
-                                                      ; but we actually use (x/(kw-1))*(w-1).
-                                                      ; It's because the distance between left- and right-most samples
-                                                      ; is one less than the number of samples,
-                                                      ; and we want the end-samples at the far ends of the new bitmap.
-                                                      (* (/ x (sub1 (* k w))) (sub1 w))
-                                                      (* (/ y (sub1 (* k h))) (sub1 h)))))
-                 new-w
-                 new-h)))
-|#
-
-(define (bitmap->bytes bm [mask (send bm get-loaded-mask)])
-  (let* ([w (send bm get-width)]
-         [h (send bm get-height)]
-         [bytes (make-bytes (* w h NUM-CHANNELS) 0)])
-    (send bm get-argb-pixels 0 0 w h bytes #f)
-    (when mask
-      (send mask get-argb-pixels 0 0 w h bytes #t))
-    (values bytes w h)))
-
-(define (bytes->bitmap bytes w h)
-  (unless (= (bytes-length bytes) (* w h NUM-CHANNELS))
-    (error 'bytes->bitmap "wrong sizes, got ~a bytes, w ~a h ~a (which should be ~a bytes)"
-           (bytes-length bytes)
-           w
-           h
-           (* w h NUM-CHANNELS)))
-  (let* ([bm (make-bitmap w h)])
-    (send bm set-argb-pixels 0 0 w h bytes)
-    bm))
-
-(define (flip-bytes bmbytes w h)
-  (build-bmbytes 
-   w h 
-   (λ (x y)
-     (let ([new-x x]
-           [new-y (- h y 1)])
-       (bmbytes-ref/safe bmbytes w h new-x new-y)))))
-
-#;
-(define (rotate-bytes bmbytes w h theta)
-  (let* {[theta-rotation (exp (* i theta))]
-         [theta-unrotation (make-rectangular (real-part theta-rotation)
-                                             (- (imag-part theta-rotation)))]
-         [ne (* theta-rotation w)]
-         [sw (* theta-rotation (* i (- h)))]
-         [se (* theta-rotation (make-rectangular w (- h)))]
-         [nw 0]
-         [pts (list ne sw se nw)]
-         [longitudes (map real-part pts)]
-         [latitudes  (map imag-part pts)]
-         [east (apply max longitudes)]
-         [west (apply min longitudes)]
-         [nrth (apply max latitudes)]
-         [sth  (apply min latitudes)]
-         [new-w (round/e (- east west))]
-         [new-h (round/e (- nrth sth))]
-         }
-    (values (build-bmbytes new-w
-                           new-h
-                           (λ (x y)
-                             (let* {[pre-image (* (make-rectangular (+ west x 1/2) (- nrth y 1/2))
-                                                  theta-unrotation)]
-                                    }
-                               (interpolate bmbytes w h
-                                            (real-part pre-image)
-                                            (- (imag-part pre-image))))))
-            new-w
-            new-h)))
-
-;; linear transform: bytes width height <matrix coodinates> -> (values bytes width height)
-;; The matrix is read like this:
-;;  +-   -+
-;;  | a b |
-;;  | c d |
-;;  +-   -+
-;; The ai, bi, ci, and di are the coordinates of the inverse matrix
-(define (linear-transform bmbytes w h a b c d)
-  (let-values ([(ai bi ci di)
-                (let ([k (/ (- (* a d) (* b c)))])
-                  (values (* k d) (* k (- b))
-                          (* k (- c)) (* k a)))])
-    ;; mapp : <matrix> complex -> complex
-    ;; applies the matrix represented by abcd(as in the picture above) to p
-    (define (mapp a b c d p)
-      (let ([x (real-part p)]
-            [y (imag-part p)])
-        (make-rectangular (+ (* a x) (* b y))
-                          (+ (* c x) (* d y)))))
-    (let* {[f-rotation (λ (p) (mapp a b c d p))]
-           [f-unrotation (λ (p) (mapp ai bi ci di p))]
-           [ne (f-rotation w)]
-           [sw (f-rotation (* i (- h)))]
-           [se (f-rotation (make-rectangular w (- h)))]
-           [nw 0]
-           [pts (list ne sw se nw)]
-           [longitudes (map real-part pts)]
-           [latitudes  (map imag-part pts)]
-           [east (apply max longitudes)]
-           [west (apply min longitudes)]
-           [nrth (apply max latitudes)]
-           [sth  (apply min latitudes)]
-           [new-w (round/e (- east west))]
-           [new-h (round/e (- nrth sth))]}
-      (values (build-bmbytes new-w
-                             new-h
-                             (λ (x y)
-                               (let* {[pre-image (f-unrotation (make-rectangular (+ west x 1/2) (- nrth y 1/2)))]}
-                                 (interpolate bmbytes w h
-                                              (real-part pre-image)
-                                              (- (imag-part pre-image))))))
-              new-w
-              new-h))))
-
-(define (rotate-bytes bmbytes w h theta)
-  (let* ([theta-rotation (exp (* i theta -1))]
-         [x (real-part theta-rotation)]
-         [y (imag-part theta-rotation)])
-    (linear-transform 
-     bmbytes w h 
-     x (- y) y x)))
-
-#;
-(define (rotate-bytes bmbytes w h theta)
-  (let* {[theta-rotation (exp (* i theta))]
-         [theta-unrotation (make-rectangular (real-part theta-rotation)
-                                             (- (imag-part theta-rotation)))]
-         [f-rotation (λ (p) (* theta-rotation p))]
-         [f-unrotation (λ (p) (* theta-unrotation p))]
-         [ne (f-rotation w)]
-         [sw (f-rotation (* i (- h)))]
-         [se (f-rotation (make-rectangular w (- h)))]
-         [nw 0]
-         [pts (list ne sw se nw)]
-         [longitudes (map real-part pts)]
-         [latitudes  (map imag-part pts)]
-         [east (apply max longitudes)]
-         [west (apply min longitudes)]
-         [nrth (apply max latitudes)]
-         [sth  (apply min latitudes)]
-         [new-w (round/e (- east west))]
-         [new-h (round/e (- nrth sth))]}
-    (values (build-bmbytes new-w
-                           new-h
-                           (λ (x y)
-                             (let* {[pre-image (f-unrotation (make-rectangular (+ west x 1/2) (- nrth y 1/2)))]}
-                               (interpolate bmbytes w h
-                                            (real-part pre-image)
-                                            (- (imag-part pre-image))))))
-            new-w
-            new-h)))
-
-;; Why the offsets of 1/2 in `rotate-bytes` and `interpolate`?
-;; We consider a pixel's RGB as a point-sample taken from the 'true' image,
-;; where the RGB is the sample at the *center* of the square covered by the pixel.
-;; (When we assume the sample had been from the NW corner instead of the center,
-;; we got weird artifacts upon rotation:
-;; Consider a 1x1 bitmap rotated by 90 degrees.
-;; The NW corner of our new value would be derived from the *NE* corner of
-;; the original bitmap, which is a full pixel-width away from the original sample.
-;; So a 1x1 bitmap being rotated would counterintuitively give a different bitmap.)
-
-
-
-; interpolate: bytes natnum natum real real -> bytes
-;
-; Given a bitmap (bytes of size (* w h NUM-CHANNELS)), return a pixel (bytes of size NUM-CHANNELS)
-; corresponding to the interpolated color at x,y
-; where x,y are *real-valued* coordinates in [0,w), [0,h).
-;
-(define (interpolate bmbytes w h x y)
-  (let* {[x0 (floor/e (- x 1/2))]
-         [y0 (floor/e (- y 1/2))]
-         [dx (- (- x 1/2) x0)]
-         [dy (- (- y 1/2) y0)]
-         [1-dx (- 1 dx)]
-         [1-dy (- 1 dy)]
-         [nw (bmbytes-ref/safe bmbytes w h       x0        y0 )]
-         [ne (bmbytes-ref/safe bmbytes w h (add1 x0)       y0 )]
-         [sw (bmbytes-ref/safe bmbytes w h       x0  (add1 y0))]
-         [se (bmbytes-ref/safe bmbytes w h (add1 x0) (add1 y0))]
-         }
-    (build-bytes 
-     NUM-CHANNELS
-     (λ (i) (inexact->exact (round/e (+ (* (bytes-ref nw i) 1-dx 1-dy)
-                                        (* (bytes-ref ne i) dx   1-dy)
-                                        (* (bytes-ref sw i) 1-dx dy)
-                                        (* (bytes-ref se i) dx   dy))))))))
-    
-
-
-
-
-; Return pixel (i,j) from a bytes representation.
-; However, if i,j refers to an off-board location,
-; return the nearest board location where alpha has been set to 0.
-; (That is, conceptually extend the picture's edge colors
-; infinitely, but make them transparent.)
-; This is helpful when trying to interpolate just beyond
-; an edge pixel.
-;
-(define (bmbytes-ref/safe bytes w h i j)
-  (let* {[i/safe (clamp-1 0 i w)]
-         [j/safe (clamp-1 0 j h)]
-         [offset (flatten-bm-coord w h i/safe j/safe)]
-         [pixel (subbytes bytes offset (+ offset NUM-CHANNELS))]
-         }
-    (if (and (= i i/safe) (= j j/safe))
-        pixel
-        (let {[new-pixel (bytes-copy pixel)]}
-          (begin (bytes-set! new-pixel 0 0)
-                 new-pixel)))))
-
-; Create a bytes representation from
-; a function f mapping locations to pixels.
-;
-; f : [0,w), [0,h) -> (bytes a r g b)
-;
-(define (build-bmbytes w h f)
-  (do {[bm (make-bytes (* NUM-CHANNELS w h))]
-       [y 0 (add1 y)]
-       }
-    [(>= y h) bm]
-    (do {[x 0 (add1 x)]
-         }
-      [(>= x w)]
-      (bytes-copy! bm (flatten-bm-coord w h x y) (f x y)))))
-
-; build-bytes, analogous to build-list.
-;
-(define (build-bytes sz f)
-  (do {[b (make-bytes sz)]
-       [i 0 (add1 i)]
-       }
-    [(>= i sz) b]
-    (bytes-set! b i (f i))))
-
-;;;; Some utility functions
-
-
-(define round/e (compose inexact->exact round))
-(define floor/e (compose inexact->exact floor))
-(define ceiling/e (compose inexact->exact ceiling))
-
-(define NUM-CHANNELS 4) ; alpha, r, g, b
-
-; Return n, clamped to the range [a,b).
-; (note the open interval; for integers.)
-;
-(define (clamp-1 a n b)
-  (min (max a n) (sub1 b)))
-
-
-; Convert an x,y pixel coordinate into its offset into a bytes.
-;
-(define (flatten-bm-coord w h x y) (* (+ (* y w) x) NUM-CHANNELS))
-
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/image-core-snipclass.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/image-core-snipclass.rkt
deleted file mode 100644
index eac28521f1..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/image-core-snipclass.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/base
-(require racket/class)
-(provide fetch image<%>
-         get-shape set-shape get-bb get-pinhole 
-         get-normalized? set-normalized get-normalized-shape)
-
-(define-local-member-name
-  get-shape set-shape get-bb get-pinhole 
-  get-normalized? set-normalized get-normalized-shape)
-
-(define image<%>
-  (interface ()
-    get-shape set-shape get-bb get-pinhole 
-    get-normalized? get-normalized-shape))
-
-(define (fetch bytes)
-  (let* ([str 
-          (and bytes
-               (with-handlers ((exn:fail? (λ (x) #f)))
-                 (bytes->string/utf-8 bytes)))]
-         [lst (and str
-                   (with-handlers ((exn:fail:read? (λ (x) #f)))
-                     (racket/base:read
-                      (open-input-string
-                       str))))])
-    (cond
-      [(and (list? lst)
-            (= 2 (length lst)))
-       ;; backwards compatibility for saved images that didn't have a pinhole
-       (list (list-ref lst 0)
-             (list-ref lst 1)
-             #f)]
-      [else
-       lst])))
-
-(define racket/base:read read)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/regmk.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/regmk.rkt
deleted file mode 100644
index a6401351ca..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/private/regmk.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base))
-
-(provide define-struct/reg-mk
-         id->constructor
-         (struct-out point)
-         (struct-out bb))
-
-(define id-constructor-pairs '())
-(define (add-id-constructor-pair a b)
-  (set! id-constructor-pairs (cons (list a b) id-constructor-pairs)))
-
-(define-syntax (define-struct/reg-mk stx)
-  (syntax-case stx ()
-    [(_ id #:reflect-id reflect-id rest ...)
-     (let ([build-name
-            (λ (fmt id)
-              (datum->syntax id (string->symbol (format fmt (syntax->datum id)))))])
-       #`(begin
-           (define-struct id rest ... #:reflection-name 'reflect-id)
-           (add-id-constructor-pair '#,(build-name "struct:~a" #'reflect-id)
-                                    #,(build-name "make-~a" #'id))))]
-    [(_ id . rest) #'(define-struct/reg-mk id #:reflect-id id . rest)]))
-
-(define (id->constructor id)
-  (let ([line (assoc id id-constructor-pairs)])
-    (and line
-         (list-ref line 1))))
-
-(define-struct/reg-mk point (x y) #:transparent)
-
-;; a bb is  (bounding box)
-;;  (make-bb number number number)
-(define-struct/reg-mk bb (right bottom baseline) #:transparent)
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/switchable-button.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/switchable-button.rkt
deleted file mode 100644
index 04ba305e61..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/switchable-button.rkt
+++ /dev/null
@@ -1,401 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class)
-
-(provide switchable-button%)
-(define gap 4) ;; space between the text and the icon
-(define margin 2)
-(define w-circle-space 6)
-(define h-circle-space 6)
-
-;; extra space outside the bitmap, 
-;; but inside the mouse highlighting (on the right)
-(define rhs-pad 2) 
-
-(define half-gray (make-object color% 127 127 127))
-(define one-fifth-gray (make-object color% 200 200 200))
-
-(define yellow-message%
-  (class canvas%
-    (init-field label)
-    
-    (define/override (on-paint)
-      (let ([dc (get-dc)])
-        (let ([pen (send dc get-pen)]
-              [brush (send dc get-brush)]
-              [font (send dc get-font)]
-              [yellow (make-object color% 255 255 200)])
-          
-          (send dc set-pen yellow 1 'transparent)
-          (send dc set-brush yellow 'solid)
-          (let-values ([(cw ch) (get-client-size)])
-            (send dc draw-rectangle 0 0 cw ch)
-          
-            (send dc set-font small-control-font)
-            
-            (let-values ([(tw th _1 _2) (send dc get-text-extent label)])
-              (send dc draw-text 
-                    label
-                    (- (/ cw 2) (/ tw 2))
-                    (- (/ ch 2) (/ th 2)))))
-          
-          (send dc set-pen pen)
-          (send dc set-brush brush)
-          (send dc set-font font))))
-    
-    (define/override (on-event evt)
-      (send (get-top-level-window) show #f))
-        
-    (inherit stretchable-width stretchable-height
-             min-width min-height
-             get-client-size get-dc
-             get-top-level-window)
-    (super-new)
-    (let-values ([(tw th _1 _2) (send (get-dc) get-text-extent label small-control-font)])
-      (min-width (floor (inexact->exact (+ tw 4))))
-      (min-height (floor (inexact->exact (+ th 4)))))))
-
-(define switchable-button%
-  (class canvas%
-    (init-field label 
-                bitmap
-                callback
-                [alternate-bitmap bitmap]
-                [vertical-tight? #f]
-                [min-width-includes-label? #f])
-    
-    (define/public (get-button-label) label)
-    
-    (when (and (is-a? label bitmap%)
-               (not (send label ok?)))
-      (error 'switchable-button% "label bitmap is not ok?"))
-    
-    (define/override (get-label) label)
-    
-    (define disable-bitmap (make-dull-mask bitmap))
-    
-    (define alternate-disable-bitmap
-      (if (eq? bitmap alternate-bitmap)
-          disable-bitmap
-          (make-dull-mask alternate-bitmap)))
-    
-    (inherit get-dc min-width min-height get-client-size refresh
-	     client->screen)
-    
-    (define down? #f)
-    (define in? #f)
-    (define disabled? #f)
-    (define with-label? (string? label))
-  
-    (define/override (enable e?)
-      (unless (equal? disabled? (not e?))
-        (set! disabled? (not e?))
-        (set! down? #f)
-        (set! in? #f)
-        (refresh)))
-    (define/override (is-enabled?) (not disabled?))
-
-    (define/override (on-superwindow-show show?)
-      (unless show?
-        (set! in? #f)
-        (set! down? #f)
-                (update-float #f)
-        (refresh))
-      (super on-superwindow-show show?))
-    
-    (define/override (on-event evt)
-      (cond
-        [(send evt button-down? 'left)
-         (set! down? #t)
-         (set! in? #t)
-         (refresh)
-         (update-float #t)]
-        [(send evt button-up? 'left)
-         (set! down? #f)
-         (update-in evt)
-         (refresh)
-         (when (and in?
-                    (not disabled?))
-           (update-float #f)
-           (callback this))]
-        [(send evt entering?)
-         (set! in? #t)
-         (update-float #t)
-         (unless disabled?
-           (refresh))]
-        [(send evt leaving?)
-         (set! in? #f)
-         (update-float #f)
-         (unless disabled?
-           (refresh))]
-        [(send evt moving?)
-         (update-in evt)]))
-
-    (define/public (command)
-      (callback this)
-      (void))
-    
-    (define float-window #f)
-    (inherit get-width get-height)
-    (define timer (new timer% 
-                       [just-once? #t] 
-                       [notify-callback
-                        (λ ()
-                          (unless with-label?
-                            (unless (equal? (send float-window is-shown?) in?)
-                              (send float-window show in?)))
-                          (set! timer-running? #f))]))
-    (define timer-running? #f)
-    
-    (define/private (update-float new-value?)
-      (when label
-        (cond
-          [with-label?
-           (when float-window
-             (send float-window show #f))]
-          [else
-           (unless (and float-window
-                        (equal? new-value? (send float-window is-shown?)))
-             (cond
-               [new-value?
-                (unless float-window
-                  (set! float-window (new frame% 
-                                          [label ""]
-                                          [style '(no-caption no-resize-border float)]
-                                          [stretchable-width #f]
-                                          [stretchable-height #f]))
-                  (new yellow-message% [parent float-window] [label (or label "")]))
-                
-                (send float-window reflow-container)
-                
-                ;; position the floating window
-                (let-values ([(dw dh) (get-display-size)]
-                             [(x y) (client->screen (floor (get-width))
-                                                    (floor
-                                                     (- (/ (get-height) 2)
-                                                        (/ (send float-window get-height) 2))))]
-                             [(dx dy) (get-display-left-top-inset)])
-                  (let ([rhs-x (- x dx)]
-                        [rhs-y (- y dy)])
-                    (cond
-                      [(< (+ rhs-x (send float-window get-width)) dw)
-                       (send float-window move rhs-x rhs-y)]
-                      [else
-                       (send float-window move
-                             (- rhs-x (send float-window get-width) (get-width))
-                             rhs-y)])))
-                (unless timer-running?
-                  (set! timer-running? #t)
-                  (send timer start 500 #t))]
-               [else
-                (when float-window
-                  (send float-window show #f))]))])))
-    
-    (define/private (update-in evt)
-      (let-values ([(cw ch) (get-client-size)])
-        (let ([new-in?
-               (and (<= 0 (send evt get-x) cw)
-                    (<= 0 (send evt get-y) ch))])
-          (unless (equal? new-in? in?)
-            (set! in? new-in?)
-            (refresh))
-          (update-float new-in?))))
-    
-    (define/override (on-paint)
-      (let ([dc (get-dc)])
-        (let-values ([(cw ch) (get-client-size)])
-          (let ([alpha (send dc get-alpha)]
-                [pen (send dc get-pen)]
-                [brush (send dc get-brush)])
-            
-            ;; Draw background. Use alpha blending if it can work,
-            ;;  otherwise fall back to a suitable color.
-            (let ([color (cond
-                           [disabled? #f]
-                           [in? (if (eq? (send dc get-smoothing) 'aligned)
-                                    (if down? 0.5 0.2)
-                                    (if down?
-                                        half-gray
-                                        one-fifth-gray))]
-                           [else #f])])
-              (when color
-                (send dc set-pen "black" 1 'transparent)
-                (send dc set-brush (if (number? color) "black" color) 'solid)
-                (when (number? color)
-                  (send dc set-alpha color))
-                (send dc draw-rounded-rectangle 
-                      margin
-                      margin 
-                      (max 0 (- cw margin margin))
-                      (max 0 (- ch margin margin)))
-                (when (number? color)
-                  (send dc set-alpha alpha))))
-            
-            (send dc set-font normal-control-font)
-            
-            (when disabled?
-              (send dc set-alpha .5))
-            
-            (cond
-              [with-label?
-               (cond
-                 [(<= cw (get-small-width))
-                  (draw-the-bitmap (- (/ cw 2) (/ (send bitmap get-width) 2)) 
-                                   (- (/ ch 2) (/ (send bitmap get-height) 2)))]
-                 [else
-                  (define-values (tw th _1 _2) (send dc get-text-extent label))
-                  (define text-start (+ (/ cw 2) 
-                                        (- (/ tw 2))
-                                        (- (/ (send bitmap get-width) 2))
-                                        (- rhs-pad)))
-                  (send dc draw-text label text-start (- (/ ch 2) (/ th 2)))
-                  (draw-the-bitmap (+ text-start tw gap) 
-                                   (- (/ ch 2) (/ (send bitmap get-height) 2)))])]
-              [else
-               (draw-the-bitmap 
-                (- (/ cw 2) 
-                   (/ (send (if with-label? bitmap alternate-bitmap) get-width) 
-                      2))
-                (- (/ ch 2)
-                   (/ (send (if with-label? bitmap alternate-bitmap) get-height)
-                      2)))])
-            
-            (send dc set-pen pen)
-            (send dc set-alpha alpha)
-            (send dc set-brush brush)))))
-            
-    (define/private (draw-the-bitmap x y)
-      (let ([bm (if with-label? bitmap alternate-bitmap)])
-        (send (get-dc)
-              draw-bitmap
-              bm
-              x y
-              'solid
-              (send the-color-database find-color "black")
-              (if disabled?
-                  (if with-label? disable-bitmap alternate-disable-bitmap)
-                  (send bm get-loaded-mask)))))
-    
-    (define/public (set-label-visible in-h?)
-      (define h? (and in-h? #t))
-      (unless (equal? with-label? h?)
-        (set! with-label? h?)
-        (update-sizes)
-        (update-float (and with-label? in?))
-        (refresh)))
-    (define/public (get-label-visible) with-label?)
-    
-    (define/private (update-sizes)
-      (define dc (get-dc))
-      (define-values (tw th _1 _2) (send dc get-text-extent label normal-control-font))
-      (define h 
-        (inexact->exact 
-         (floor
-          (+ (max th
-                  (send alternate-bitmap get-height)
-                  (send bitmap get-height))
-             h-circle-space margin margin 
-             (if vertical-tight? -6 0)))))
-      (cond
-        [with-label?
-         (cond
-           [min-width-includes-label?
-            (min-width (get-large-width))]
-           [else
-            (min-width (get-small-width))])
-         (min-height h)]
-        [else
-         (min-width (get-without-label-small-width))
-         (min-height h)]))
-    
-    (define/public (get-large-width)
-      (define dc (get-dc))
-      (define-values (tw th _1 _2) (send dc get-text-extent label normal-control-font))
-      (inexact->exact
-       (floor
-        (+ (+ tw gap (send bitmap get-width) rhs-pad)
-           w-circle-space
-           margin
-           margin))))
-    
-    (define/public (get-without-label-small-width)
-      (inexact->exact
-       (floor
-        (+ (send alternate-bitmap get-width)
-           w-circle-space
-           margin
-           margin))))
-    
-    (define/public (get-small-width)
-      (inexact->exact
-       (floor
-        (+ (send bitmap get-width)
-           w-circle-space
-           margin
-           margin))))
-    
-    (super-new [style '(transparent no-focus)])
-    (send (get-dc) set-smoothing 'aligned)
-    
-    (inherit stretchable-width stretchable-height)
-    (stretchable-width #f)
-    (stretchable-height #f)
-    (inherit get-graphical-min-size)
-    (update-sizes)))
-
-(define (make-dull-mask bitmap)
-  (let ([alpha-bm (send bitmap get-loaded-mask)])
-    (and alpha-bm
-         (let* ([w (send alpha-bm get-width)]
-                [h (send alpha-bm get-height)]
-                [disable-bm (make-object bitmap% w h)]
-                [pixels (make-bytes (* 4 w h))]
-                [bdc (make-object bitmap-dc% alpha-bm)])
-           (send bdc get-argb-pixels 0 0 w h pixels)
-           (let loop ([i 0])
-             (when (< i (* 4 w h))
-               (bytes-set! pixels i (- 255 (quotient (- 255 (bytes-ref pixels i)) 2)))
-               (loop (+ i 1))))
-           (send bdc set-bitmap disable-bm)
-           (send bdc set-argb-pixels 0 0 w h pixels)
-           (send bdc set-bitmap #f)
-           disable-bm))))
-
-#;
-(begin
-  (define f (new frame% [label ""]))
-  (define vp (new vertical-pane% [parent f]))
-  (define p (new horizontal-panel% [parent vp] [alignment '(right top)]))
-  
-  (define label "Run")
-  (define bitmap (make-object bitmap% (build-path (collection-path "icons") "run.png") 'png/mask))
-  (define foot (make-object bitmap% (build-path (collection-path "icons") "foot.png") 'png/mask))
-  (define foot-up 
-    (make-object bitmap% (build-path (collection-path "icons") "foot-up.png") 'png/mask))
-  
-  (define b1 (new switchable-button% [parent p] [label label] [bitmap bitmap] [callback void]))
-  (define b2 (new switchable-button% [parent p] [label label] [bitmap bitmap] [callback void]))
-  (define b3 (new switchable-button% [parent p] [label "Step"] [bitmap foot]
-                  [alternate-bitmap foot-up] 
-                  [callback void]))
-  (define sb (new button% [parent p] [stretchable-width #t] [label "b"]))
-  (define swap-button
-    (new button% 
-         [parent f] 
-         [label "swap"]
-         [callback
-          (let ([state #t])
-            (λ (a b)
-              (set! state (not state))
-              (send b1 set-label-visible state)
-              (send b2 set-label-visible state)
-              (send b3 set-label-visible state)))]))
-  (define disable-button
-    (new button% 
-         [parent f] 
-         [label "disable"]
-         [callback
-          (λ (a b)
-            (send sb enable (not (send sb is-enabled?)))
-            (send b1 enable (not (send b1 is-enabled?))))]))
-  (send f show #t))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/syntax-browser.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/syntax-browser.rkt
deleted file mode 100644
index b40177101d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/syntax-browser.rkt
+++ /dev/null
@@ -1,654 +0,0 @@
-#lang racket/base
-#|
-
-needed to really make this work:
-
-  - marshallable syntax objects (compile and write out the compiled form)
-
-|#
-
-  (require racket/pretty
-           racket/class
-           racket/gui/base
-           racket/match
-           "include-bitmap.rkt")
-
-  (define orig-output-port (current-output-port))
-  (define (oprintf . args) (apply fprintf orig-output-port args))
-  
-  (provide render-syntax/snip render-syntax/window snip-class)
-  
-  ;; this is doing the same thing as the class in
-  ;; the framework by the same name, but we don't
-  ;; use the framework here because it would 
-  ;; introduce a cyclic dependency
-  (define text:hide-caret/selection% 
-    (class text%
-      (inherit get-start-position get-end-position hide-caret)
-      (define/augment (after-set-position)
-        (hide-caret (= (get-start-position) (get-end-position))))
-      (super-new)))
-  
-  (define (render-syntax/window syntax)
-    (define es (render-syntax/snip syntax))
-    (define f (new frame% [label "frame"] [width 850] [height 500]))
-    (define mb (new menu-bar% [parent f]))
-    (define edit-menu (new menu% [label "Edit"] [parent mb]))
-    (define t (new text%))
-    (define ec (new editor-canvas% [parent f] [editor t]))
-    (append-editor-operation-menu-items edit-menu)
-    (send t insert es)
-    (send f show #t))
-
-  (define (render-syntax/snip stx) (make-object syntax-snip% stx))
-  
-  (define syntax-snipclass%
-    (class snip-class%
-      (define/override (read stream)
-        (make-object syntax-snip%
-          (unmarshall-syntax (read (open-input-string (send stream get-bytes))))))
-      (super-new)))
-  
-  (define snip-class (new syntax-snipclass%))
-  (send snip-class set-version 1)
-  (send snip-class set-classname (format "~s" '(lib "syntax-browser.ss" "mrlib")))
-  (send (get-the-snip-class-list) add snip-class)
-  
-  (define-struct range (stx start end))
-
-  (define syntax-snip%
-    (class editor-snip%
-      (init-field main-stx)
-      
-      (unless (syntax? main-stx)
-        (error 'syntax-snip% "got non-syntax object"))
-      
-      (define/public (get-syntax) main-stx)
-      
-      (define/override (copy) (make-object syntax-snip% main-stx))
-      (define/override (write stream)
-        (send stream put (string->bytes/utf-8 (format "~s" (marshall-syntax main-stx)))))
-      
-      (define path '())
-      (define next-push 0)
-      (define-values (datum paths-ht) (syntax-object->datum/record-paths main-stx))
-      
-      (define output-text (new text:hide-caret/selection%))
-      (define output-port (make-text-port output-text))
-      (define info-text (new text:hide-caret/selection%))
-      (define info-port (make-text-port info-text))
-      
-      ;; range-start-ht : hash-table[obj -o> number]
-      (define range-start-ht (make-hasheq))
-
-      ;; range-ht : hash-table[obj -o> (listof (cons number number))]
-      (define range-ht (make-hasheq))
-      
-      (define/private (make-modern text)
-        (send text change-style
-              (make-object style-delta% 'change-family 'modern)
-              0
-              (send text last-position)))
-      
-      (define/private (push!)
-        (set! path (cons next-push path))
-        (set! next-push 0))
-      (define/private (pop!)
-        (set! next-push (+ (car path) 1))
-        (set! path (cdr path)))
-      ;; record-paths : val -> hash-table[path -o> syntax-object]
-      (define/private (syntax-object->datum/record-paths val)
-        (set! path '())
-        (set! next-push 0)
-        (let* ([ht (make-hash)]
-               [record
-                (λ (val enclosing-stx)
-                  (hash-set! ht path enclosing-stx))])
-          (values
-           (let loop ([val val]
-                      [enclosing-stx #f])
-             (cond
-               [(syntax? val)
-                (loop (syntax-e val)
-                      val)]
-               [(pair? val) 
-                (push!)
-                (record val enclosing-stx)
-                (begin0
-                  (let lst-loop ([val val])
-                    (cond
-                      [(pair? val) 
-                       (cons (loop (car val) #f)
-                             (lst-loop (cdr val)))]
-                      [(null? val) '()]
-                      [else
-                       (loop val enclosing-stx)]))
-                  (pop!))]
-               [(vector? val) 
-                (push!)
-                (record val enclosing-stx)
-                (begin0
-                  (apply
-                   vector
-                   (let lst-loop ([val (vector->list val)])
-                     (cond
-                       [(pair? val) 
-                        (cons (loop (car val) #f)
-                              (lst-loop (cdr val)))]
-                       [(null? val) '()])))
-                  (pop!))]
-               [(hash? val)
-                (push!)
-                (record val enclosing-stx)
-                (begin0
-                  (for/hash ([(k v) (in-hash val)])
-                    (values (loop k #f)
-                            (loop v #f)))
-                  (pop!))]
-               [else
-                (push!)
-                (record val enclosing-stx)
-                (pop!)
-                val]))
-           ht)))
-      
-      (let* ([range-pretty-print-pre-hook 
-              (λ (x port)
-                (push!)
-                (let ([stx-object (hash-ref paths-ht path (λ () #f))])
-                  (hash-set! range-start-ht stx-object (send output-text last-position))))]
-             [range-pretty-print-post-hook 
-              (λ (x port)
-                (let ([stx-object (hash-ref paths-ht path (λ () #f))])
-                  (when stx-object
-                    (let ([range-start (hash-ref range-start-ht stx-object (λ () #f))])
-                      (when range-start
-                        (hash-set! range-ht 
-                                   stx-object 
-                                   (cons
-                                    (cons
-                                     range-start
-                                     (send output-text last-position))
-                                    (hash-ref range-ht stx-object (λ () null))))))))
-                (pop!))])
-
-        ;; reset `path' and `next-push' for use in pp hooks.
-        (set! path '())
-        (set! next-push 0)
-        (parameterize ([current-output-port output-port]
-                       [pretty-print-pre-print-hook range-pretty-print-pre-hook]
-                       [pretty-print-post-print-hook range-pretty-print-post-hook]
-                       [pretty-print-columns 30])
-          (pretty-print datum)
-          (make-modern output-text)))
-      
-      (define/private (show-info stx)
-        (insert/big "General Info\n")
-        (piece-of-info "Source" (syntax-source stx))
-        (piece-of-info "Source module" (syntax-source-module stx))
-        (piece-of-info "Position" (syntax-position stx))
-        (piece-of-info "Line" (syntax-line stx))
-        (piece-of-info "Column" (syntax-column stx))
-        (piece-of-info "Span" (syntax-span stx))
-        (piece-of-info "Original?" (syntax-original? stx))
-        (when (identifier? stx)
-          (piece-of-info "Identifier-binding" (identifier-binding stx))
-          (piece-of-info "Identifier-transformer-binding" (identifier-transformer-binding stx))
-	  (piece-of-info "Identifier-template-binding" (identifier-template-binding stx)))
-        
-	(let ([properties (syntax-property-symbol-keys stx)])
-	  (unless (null? properties)
-	    (insert/big "Known properties\n")
-	    (for-each
-	     (λ (prop) (show-property stx prop))
-	     properties))))
-      
-      (define/private (render-mpi mpi)
-        (string-append
-         "#<module-path-index "
-         (let loop ([mpi mpi])
-           (cond
-             [(module-path-index? mpi)
-              (let-values ([(x y) (module-path-index-split mpi)])
-                (string-append
-                 "("
-                 (format "~s" x)
-                 " . "
-                 (loop y)
-                 ")"))]
-             [else (format "~s" mpi)]))
-         ">"))
-      
-      (define/private (show-property stx prop)
-        (piece-of-info (format "'~a" prop) (syntax-property stx prop)))
-      
-      (define/private (piece-of-info label info)
-        (let ([small-newline 
-               (λ (port text)
-                 (let ([before-newline (send text last-position)])
-                   (newline port)
-                   (send info-text change-style small-style before-newline (+ before-newline 1))))])
-          
-          (insert/bold label)
-          (newline info-port)
-          
-          ;; should just be using generic `print'
-          ;; but won't work without built-in support for
-          ;; editors as output ports
-          (parameterize ([pretty-print-size-hook
-                          (λ (val d/p port)
-                            (if (is-a? val syntax-snip%)
-                                (+ (string-length (format "~a" (send val get-syntax))) 2)
-                                #f))]
-                         [pretty-print-print-hook
-                          (λ (val d/p port)
-                            (send info-text insert (send val copy) 
-                                  (send info-text last-position)
-                                  (send info-text last-position)))])
-            (pretty-print (replace-syntaxes info) info-port))
-          
-          (optional-newline)
-          (small-newline info-port info-text)))
-      
-      (define/private (replace-syntaxes obj)
-        (let loop ([obj obj])
-          (cond
-            [(pair? obj) (cons (loop (car obj)) (loop (cdr obj)))]
-            [(syntax? obj) (make-object syntax-snip% obj)]
-            [(hash? obj)
-             (for/hash ([(k v) (in-hash obj)])
-               (values (loop k) (loop v)))]
-            [(vector? obj)
-             (for/vector ([v (in-vector obj)])
-               (loop v))]
-            [else obj])))
-      
-      (define/private (insert/bold str)
-        (let ([pos (send info-text last-position)])
-          (send info-text insert str 
-                (send info-text last-position)
-                (send info-text last-position))
-          (send info-text change-style
-                (make-object style-delta% 'change-bold)
-                pos 
-                (send info-text last-position))))
-      
-      (define/private (insert/big str)
-        (let ([sd (make-object style-delta% 'change-bold)])
-          (send sd set-delta-foreground "Navy")
-          (let ([pos (send info-text last-position)])
-            (send info-text insert str 
-                  (send info-text last-position)
-                  (send info-text last-position))
-            (send info-text change-style
-                  sd
-                  pos 
-                  (send info-text last-position)))))
-      
-      (define/private (optional-newline)
-        (unless (equal?
-                 (send info-text get-character (- (send info-text last-position) 1))
-                 #\newline)
-          (send info-text insert "\n" (send info-text last-position))))
-      
-      (define/private (show-range stx start end)
-        (send output-text begin-edit-sequence)
-        (send output-text lock #f)
-        (send output-text change-style black-style-delta 0 (send output-text last-position))
-        (send output-text change-style green-style-delta start end)
-        (send output-text lock #t)
-        (send output-text end-edit-sequence)
-        
-        (send info-text begin-edit-sequence)
-        (send info-text lock #f)
-        (send info-text erase)
-        (show-info stx)
-        (make-modern info-text)
-        (send info-text lock #t)
-        (send info-text end-edit-sequence))
-      
-      (define outer-t (new text:hide-caret/selection%))
-      
-      (super-instantiate ()
-        (editor outer-t)
-        (with-border? #f)
-        (left-margin 3)
-        (top-margin 0)
-        (right-margin 0)
-        (bottom-margin 0)
-        (left-inset 1)
-        (top-inset 0)
-        (right-inset 0)
-        (bottom-inset 0))
-      
-      (define inner-t (new text:hide-caret/selection%))
-      (define inner-es (instantiate editor-snip% ()
-                         (editor inner-t)
-                         (with-border? #f)
-                         (left-margin 0)
-                         (top-margin 0)
-                         (right-margin 0)
-                         (bottom-margin 0)
-                         (left-inset 0)
-                         (top-inset 0)
-                         (right-inset 0)
-                         (bottom-inset 0)))
-      
-      (define details-shown? #t)
-      
-      (inherit show-border set-tight-text-fit)
-      (define/private (hide-details)
-        (when details-shown?
-          (send outer-t lock #f)
-          (show-border #f)
-          (set-tight-text-fit #t)
-          (send outer-t release-snip inner-es)
-          (send outer-t delete (send outer-t last-position))
-          (send outer-t lock #t)
-          (set! details-shown? #f)))
-      
-      (define/private (show-details)
-        (unless details-shown?
-          (send outer-t lock #f)
-          (show-border #t)
-          (set-tight-text-fit #f)
-          (send outer-t insert #\newline
-                (send outer-t last-position)
-                (send outer-t last-position))
-          (send outer-t insert inner-es
-                (send outer-t last-position)
-                (send outer-t last-position))
-          (send outer-t lock #t)
-          (set! details-shown? #t)))
-      
-      (let ([ranges
-             (sort
-              (apply append
-                     (hash-map
-                      range-ht
-                      (λ (k vs)
-                        (map (λ (v) (make-range k (car v) (cdr v)))
-                             vs))))
-              (λ (x y)
-                (>= (- (range-end x) (range-start x))
-                    (- (range-end y) (range-start y)))))])
-        (for-each
-         (λ (range)
-           (let* ([stx (range-stx range)]
-                  [start (range-start range)]
-                  [end (range-end range)])
-             (when (syntax? stx)
-               (send output-text set-clickback start end 
-                     (λ (_1 _2 _3)
-                       (show-range stx start end))))))
-         ranges)
-        
-        (send outer-t insert (new turn-snip% 
-                                  [on-up (λ () (hide-details))]
-                                  [on-down (λ () (show-details))]))
-        (send outer-t insert (format "~s\n" main-stx))
-        (send outer-t insert inner-es)
-        (make-modern outer-t)
-        
-        (send inner-t insert (instantiate editor-snip% ()
-                               (editor output-text)
-                               (with-border? #f)
-                               (left-margin 0)
-                               (top-margin 0)
-                               (right-margin 0)
-                               (bottom-margin 0)
-                               (left-inset 0)
-                               (top-inset 0)
-                               (right-inset 0)
-                               (bottom-inset 0)))
-        (send inner-t insert (make-object editor-snip% info-text))
-        (send inner-t change-style (make-object style-delta% 'change-alignment 'top) 0 2)
-        
-        (send info-text auto-wrap #t)
-        (send info-text set-styles-sticky #f)
-        (unless (null? ranges)
-          (let ([rng (car ranges)])
-            (show-range (range-stx rng) (range-start rng) (range-end rng)))))
-      
-      (send output-text lock #t)
-      (send info-text lock #t)
-      (send inner-t lock #t)
-      (send outer-t lock #t)
-      
-      (hide-details)
-      
-      (inherit set-snipclass)
-      (set-snipclass snip-class)))
-  
-  (define black-style-delta (make-object style-delta% 'change-normal-color))
-  (define green-style-delta (make-object style-delta%))
-  (void (send green-style-delta set-delta-foreground "forest green"))
-  (define small-style (make-object style-delta% 'change-size 4))
-  
-  (define turn-snip%
-    (class snip%
-      
-      (init-field on-up on-down)
-      
-      ;; state : (union 'up 'down 'up-click 'down-click))
-      (init-field [state 'up])
-      
-      (define/override (copy)
-        (instantiate turn-snip% ()
-          (on-up on-up)
-          (on-down on-down)
-          (state state)))
-      
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (let ([bitmap (case state
-                        [(up) up-bitmap]
-                        [(down) down-bitmap]
-                        [(up-click) up-click-bitmap]
-                        [(down-click) down-click-bitmap])])
-          (cond
-            [(send bitmap ok?)
-             (send dc draw-bitmap bitmap x y)]
-            [(send dc draw-rectangle x y 10 10)
-             (send dc drawline x y 10 10)])))
-             
-
-      (define/override (get-extent dc x y w h descent space lspace rspace)
-        (set-box/f! descent 0)
-        (set-box/f! space 0)
-        (set-box/f! lspace 0)
-        (set-box/f! rspace 0)
-        (set-box/f! w arrow-snip-width)
-        (set-box/f! h arrow-snip-height))
-      
-      (define/override (on-event dc x y editorx editory evt)
-        (let ([snip-evt-x (- (send evt get-x) x)]
-              [snip-evt-y (- (send evt get-y) y)])
-          (cond
-            [(send evt button-down? 'left)
-             (set-state (case state
-                          [(up) 'up-click]
-                          [(down) 'down-click]
-                          [else 'down-click]))]
-            [(and (send evt button-up? 'left)
-                  (<= 0 snip-evt-x arrow-snip-width)
-                  (<= 0 snip-evt-y arrow-snip-height))
-             (set-state (case state
-                          [(up up-click) 
-                           (on-down)
-                           'down]
-                          [(down down-click)
-                           (on-up)
-                           'up]
-                          [else 'down]))]
-            [(send evt button-up? 'left)
-             (set-state (case state
-                          [(up up-click) 'up]
-                          [(down down-click) 'down]
-                          [else 'up]))]
-            [(and (send evt get-left-down)
-                  (send evt dragging?)
-                  (<= 0 snip-evt-x arrow-snip-width)
-                  (<= 0 snip-evt-y arrow-snip-height))
-             (set-state (case state
-                          [(up up-click) 'up-click]
-                          [(down down-click) 'down-click]
-                          [else 'up-click]))]
-            [(and (send evt get-left-down)
-                  (send evt dragging?))
-             (set-state (case state
-                          [(up up-click) 'up]
-                          [(down down-click) 'down]
-                          [else 'up-click]))]
-            [else
-             (super on-event dc x y editorx editory evt)])))
-
-      (inherit get-admin)
-      (define/private (set-state new-state)
-        (unless (eq? state new-state)
-          (set! state new-state)
-          (let ([admin (get-admin)])
-            (when admin
-              (send admin needs-update this 0 0 arrow-snip-width arrow-snip-height)))))
-      
-      (define/override (adjust-cursor dc x y editorx editory event) arrow-snip-cursor)
-      
-      (super-instantiate ())
-      
-      (inherit get-flags set-flags)
-      (set-flags (cons 'handles-events (get-flags)))))
-  
-  (define (set-box/f! b v) (when (box? b) (set-box! b v)))
-  
-  (define down-bitmap (include-bitmap (lib "icons/turn-down.png") 'png))
-  (define up-bitmap (include-bitmap (lib "icons/turn-up.png") 'png))
-  (define down-click-bitmap (include-bitmap (lib "icons/turn-down-click.png") 'png))
-  (define up-click-bitmap (include-bitmap (lib "icons/turn-up-click.png") 'png))
-  (define arrow-snip-height
-    (max 10
-         (send up-bitmap get-height)
-         (send down-bitmap get-height)
-         (send up-click-bitmap get-height)
-         (send down-click-bitmap get-height)))
-  (define arrow-snip-width
-    (max 10
-         (send up-bitmap get-width)
-         (send down-bitmap get-width)
-         (send up-click-bitmap get-width)
-         (send down-click-bitmap get-width)))
-  (define arrow-snip-cursor (make-object cursor% 'arrow))
-  
-  (define (syntax-properties stx)
-    (let ([is-property? (λ (prop) (syntax-property stx prop))])
-      (filter is-property?
-              '(inferred-name
-                bound-in-source
-                origin
-                disappeared-binding
-                disappeared-use
-                bind-as-variable
-                module-variable-provides
-                module-syntax-provides
-                module-indirect-provides
-                module-kernel-reprovide-hint
-                module-self-path-index))))
-
-  ;; make-text-port : text -> port
-  ;; builds a port from a text object.  
-  (define (make-text-port text)
-    (make-output-port #f
-                      always-evt
-                      (λ (s start end flush? breaks?) 
-                        (send text insert (bytes->string/utf-8 (subbytes s start end))
-                              (send text last-position)
-                              (send text last-position))
-                        (- end start))
-                      void))
-  
-  ;; marshall-syntax : syntax -> printable
-  (define (marshall-syntax stx)
-    (unless (syntax? stx)
-      (error 'marshall-syntax "not syntax: ~s\n" stx))
-    `(syntax
-      (source ,(marshall-object (syntax-source stx)))
-      (source-module ,(marshall-object (syntax-source-module stx)))
-      (position ,(syntax-position stx))
-      (line ,(syntax-line stx))
-      (column ,(syntax-column stx))
-      (span ,(syntax-span stx))
-      (original? ,(syntax-original? stx))
-      (properties 
-       ,@(map (λ (x) `(,x ,(marshall-object (syntax-property stx x))))
-              (syntax-property-symbol-keys stx)))
-      (contents
-       ,(marshall-object (syntax-e stx)))))
-
-  ;; marshall-object : any -> printable
-  ;; really only intended for use with marshall-syntax
-  (define (marshall-object obj)
-    (cond
-      [(syntax? obj) (marshall-syntax obj)]
-      [(pair? obj) 
-       `(pair ,(cons (marshall-object (car obj))
-                     (marshall-object (cdr obj))))]
-      [(or (symbol? obj)
-           (char? obj)
-           (number? obj)
-           (string? obj)
-           (boolean? obj)
-           (null? obj))
-       `(other ,obj)]
-      [else (string->symbol (format "unknown-object: ~s" obj))]))
-  
-  (define (unmarshall-syntax stx)
-    (match stx
-      [`(syntax
-         (source ,src)
-         (source-module ,source-module) ;; marshalling
-         (position ,pos)
-         (line ,line)
-         (column ,col)
-         (span ,span)
-         (original? ,original?)
-         (properties ,properties ...)
-         (contents ,contents))
-       (foldl
-        add-properties
-        (datum->syntax
-         #'here ;; ack
-         (unmarshall-object contents)
-         (list (unmarshall-object src)
-               line
-               col
-               pos
-               span))
-        properties)]
-      [else #'unknown-syntax-object]))
-
-  ;; add-properties : syntax any -> syntax
-  (define (add-properties prop-spec stx)
-    (match prop-spec
-      [`(,(and sym (? symbol?))
-         ,prop)
-       (syntax-property stx sym (unmarshall-object prop))]
-      [else stx]))
-  
-  (define (unmarshall-object obj)
-    (let ([unknown (λ () (string->symbol (format "unknown: ~s" obj)))])
-      (if (and (pair? obj)
-               (symbol? (car obj)))
-          (case (car obj)
-            [(pair) 
-             (if (pair? (cdr obj))
-                 (let ([raw-obj (cadr obj)])
-                   (if (pair? raw-obj)
-                       (cons (unmarshall-object (car raw-obj))
-                             (unmarshall-object (cdr raw-obj)))
-                       (unknown)))
-                 (unknown))]
-            [(other) 
-             (if (pair? (cdr obj))
-                 (cadr obj)
-                 (unknown))]
-            [(syntax) (unmarshall-syntax obj)]
-            [else (unknown)])
-          (unknown))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/tab-choice.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/tab-choice.rkt
deleted file mode 100644
index 571b427de6..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/tab-choice.rkt
+++ /dev/null
@@ -1,123 +0,0 @@
-
-;; This code is not yet complete...
-
-;; !!!!!! FIXME: code copied from framework !!!!!!
-;;  -- The copy in framework should be removed --
-
-(module tab-choice mzscheme
-  (require mzlib/class
-	   mred
-	   mzlib/list)
-
-  (provide auto-tab-panel%
-	   single<%> single-mixin)
-  
-  (define single<%> (interface (area-container<%>) active-child))
-  (define single-mixin
-    (mixin (area-container<%>) (single<%>)
-	   (inherit get-alignment change-children)
-	   (define/override (after-new-child c)
-	     (unless (is-a? c window<%>)
-
-	       ;; would like to remove the child here, waiting on a PR submitted
-	       ;; about change-children during after-new-child
-	       (change-children
-		(lambda (l)
-		  (remq c l)))
-
-	       (error 'single-mixin::after-new-child
-		      "all children must implement window<%>, got ~e"
-		      c))
-	     (if current-active-child
-		 (send c show #f)
-		 (set! current-active-child c)))
-	   [define/override (container-size l)
-	     (if (null? l)
-		 (values 0 0)
-		 (values (apply max (map car l))
-			 (apply max (map cadr l))))]
-	   [define/override (place-children l width height)
-	     (let-values ([(h-align-spec v-align-spec) (get-alignment)])
-	       (let ([align
-		      (lambda (total-size spec item-size)
-			(floor
-			 (case spec
-			   [(center) (- (/ total-size 2) (/ item-size 2))]
-			   [(left top) 0]
-			   [(right bottom) (- total-size item-size)]
-			   [else (error 'place-children
-					"alignment spec is unknown ~a\n" spec)])))])
-		 (map (lambda (l) 
-			(let*-values ([(min-width min-height v-stretch? h-stretch?)
-				       (apply values l)]
-				      [(x this-width)
-				       (if h-stretch?
-					   (values 0 width)
-					   (values (align width h-align-spec min-width)
-						   min-width))]
-				      [(y this-height)
-				       (if v-stretch?
-					   (values 0 height)
-					   (values (align height v-align-spec min-height)
-						   min-height))])
-			  (list x y this-width this-height)))
-		      l)))]
-
-	   (inherit get-children begin-container-sequence end-container-sequence)
-	   [define current-active-child #f]
-	   (define/public active-child
-	     (case-lambda
-	      [() current-active-child]
-	      [(x) 
-	       (unless (memq x (get-children))
-		 (error 'active-child "got a panel that is not a child: ~e" x))
-	       (unless (eq? x current-active-child)
-		 (begin-container-sequence)
-		 (for-each (lambda (x) (send x show #f))
-			   (get-children))
-		 (set! current-active-child x)
-		 (send current-active-child show #t)
-		 (end-container-sequence))]))
-	   (super-instantiate ())))
-
-  (define auto-tab-panel%
-    (class tab-panel%
-      (init choices
-	    parent 
-	    [callback (lambda (b e) (void))])
-
-      (inherit get-selection)
-
-      (super-new [choices choices]
-		 [parent parent]
-		 [callback
-		  (lambda (b e)
-		    (send single-panel active-child (list-ref panels (get-selection)))
-		    (callback b e))])
-
-      (define single-panel (new (single-mixin pane%)
-				[parent this]))
-
-      (inherit get-number)
-      (define panels (let loop ([i (get-number)])
-		       (unless (zero? i)
-			 (cons (new vertical-panel% [parent single-panel])
-			       (loop (sub1 i))))))
-
-      (define/public (get-panel i)
-	(list-ref panels i))
-
-      (define/public active-child
-	(case-lambda
-	 [() (send single-panel active-child)]
-	 [(c)
-	  (send single-panel active-child c)
-	  (let loop ([i 0][l panels])
-	    (unless (null? l)
-	      (if (eq? (car l) c)
-		  (super set-selection i)
-		  (loop (add1 i) (cdr l)))))]))
-
-      (define/override (set-selection i)
-	(super set-selection i)
-	(send single-panel active-child (list-ref panels i))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/terminal.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/terminal.rkt
deleted file mode 100644
index 7f5e1aa9dd..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/terminal.rkt
+++ /dev/null
@@ -1,270 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class
-         racket/contract
-         framework
-         string-constants)
-
-(provide 
- (contract-out
-  [on-terminal-run (parameter/c (-> void?))]
-  [in-terminal (->* ((-> eventspace? (or/c #f (is-a?/c top-level-window<%>)) void?))
-                    (#:container (is-a?/c area-container<%>)
-                     #:title string?
-                     #:abort-label string?
-                     #:aborted-message string?
-                     #:cleanup-thunk (-> void?)
-                     #:canvas-min-width (or/c #f exact-nonnegative-integer?)
-                     #:canvas-min-height (or/c #f exact-nonnegative-integer?)
-                     #:close-button? boolean?
-                     #:close-label string?
-                     #:close-callback (-> any))
-                    (is-a?/c terminal<%>))])
- terminal<%>)
-
-(define terminal<%>
-  (interface ()
-    is-closed?
-    close
-    can-close?
-    can-close-evt))
-
-(define on-terminal-run (make-parameter void))
-
-;; creates a frame and sets up the current error and output ports
-;; before calling `do-install'. 
-;; runs the installer in a separate thread and returns immediately,
-;; before the installation is complete. The cleanup thunk is called when installation completes
-(define (in-terminal do-install
-                     #:container [container #f]
-                     #:title [title "mrlib/terminal"]
-                     #:abort-label [abort-label (string-constant plt-installer-abort-installation)]
-                     #:aborted-message [aborted-message (string-constant plt-installer-aborted)]
-                     #:cleanup-thunk [cleanup-thunk void]
-                     #:canvas-min-width [canvas-min-width #f]
-                     #:canvas-min-height [canvas-min-height #f]
-                     #:close-button? [close-button? #t]
-                     #:close-label [close-button-label (string-constant close)]
-                     #:close-callback [user-close-callback void])
-  (define orig-eventspace (current-eventspace))
-  (define orig-custodian (current-custodian))
-  (define inst-eventspace (if container
-                              (send (send container get-top-level-window) get-eventspace)
-                              (make-eventspace)))
-
-  (define on-terminal-run-proc (on-terminal-run))
-  
-  (define frame #f)
-  (define sub-container #f)
-  (define text #f)
-  (define close-button #f)
-  (define kill-button #f)
-  (define setup-sema (make-semaphore 0))
-  (define can-close-sema (make-semaphore))
-  (define currently-can-close? #t)
-  
-  (define (close)
-    (if frame
-        (send frame show #f)
-        (send container delete-child sub-container))
-    (close-callback)
-    (user-close-callback))
-  (define (close-callback)
-    (custodian-shutdown-all installer-cust))
-  
-  (define saved-button-panel #f)
-
-  (parameterize ([current-eventspace inst-eventspace])
-    (queue-callback
-     (λ ()
-        (unless container
-          (set! frame
-                (new (class frame%
-                       (define/augment (can-close?) currently-can-close?)
-                       (define/augment (on-close)
-                         (close-callback)
-                         (user-close-callback))
-                       (super-new [label title]
-                                  [width 600]
-                                  [height 300]))))
-          (set! container frame)
-          (define mb (new menu-bar% [parent frame]))
-          (define edit-menu (new menu% 
-                                 [label (string-constant edit-menu)]
-                                 [parent mb]))
-          (define copy-menu-item
-            (new menu-item%
-                 [parent edit-menu]
-                 [label (string-constant copy-menu-item)]
-                 [shortcut #\c]
-                 [demand-callback
-                  (λ (item)
-                     (send copy-menu-item enable
-                           (not (= (send text get-start-position)
-                                   (send text get-end-position)))))]
-                 [callback
-                  (λ (item evt)
-                     (send text copy))]))
-          (new menu-item%
-               [parent edit-menu]
-               [label (string-constant select-all-menu-item)]
-               [shortcut #\a]
-               [callback
-                (λ (item evt)
-                   (send text set-position 0 (send text last-position)))]))
-        
-        (when container
-          (send container begin-container-sequence))
-
-        (set! sub-container
-              (or frame
-                  (new (class vertical-panel%
-                         (super-new)
-                         (define/override (on-superwindow-show on?)
-                           (unless on?
-                             (close-callback))))
-                       [parent container])))
-        
-        (set! text (new (text:hide-caret/selection-mixin text:standard-style-list%)))
-        (define canvas (new editor-canvas%
-                            [parent sub-container]
-                            [editor text]
-                            [min-width canvas-min-width]
-                            [min-height canvas-min-height]))
-        (define button-panel (new horizontal-panel%
-                                  [parent sub-container]
-                                  [stretchable-height #f]
-                                  [alignment '(center center)]))
-        (set! kill-button (new button%
-                               [label abort-label]
-                               [parent button-panel]
-                               [callback (λ (b e) (kill-callback))]))
-        (when close-button?
-          (set! close-button (new button% 
-                                  [label close-button-label]
-                                  [parent button-panel]
-                                  [callback (λ (b e) (close))])))
-
-        (define (kill-callback)
-          (custodian-shutdown-all installer-cust)
-          (fprintf output-port "\n~a\n" aborted-message))
-        (set! currently-can-close? #f)
-        (when close-button (send close-button enable #f))
-        (send canvas allow-tab-exit #t)
-        ((current-text-keymap-initializer) (send text get-keymap))
-        (send text set-styles-sticky #f)
-        (send text lock #t)
-        (send text hide-caret #t)
-        (set! saved-button-panel button-panel)
-        (semaphore-post setup-sema)
-        (when container
-          (send container end-container-sequence))
-        (when frame
-          (send frame show #t)))))
-  
-  (if (equal? inst-eventspace (current-eventspace))
-      (yield setup-sema)
-      (semaphore-wait setup-sema))
-  
-  (define (mk-port style)
-    (make-output-port
-     #f
-     always-evt
-     (lambda (bytes start end flush? enable-break?)
-       (define str (bytes->string/utf-8 (subbytes bytes start end)))
-       (parameterize ([current-eventspace inst-eventspace])
-         (queue-callback
-          (lambda ()
-            (define lp (send text last-position))
-            (send text begin-edit-sequence)
-            (send text lock #f)
-            (send text insert
-                  str
-                  (send text last-position)
-                  'same 
-                  ; Scroll on newlines only:
-                  (regexp-match? #rx"\n" str))
-            (send text change-style style lp (send text last-position))
-            (send text lock #t)
-            (send text end-edit-sequence))))
-       (- end start))
-     void))
-  
-  (define plain-style (send (editor:get-standard-style-list) find-named-style "Standard"))
-  (define red-delta (make-object style-delta% 'change-italic))
-  (send red-delta set-delta-foreground "red")
-  (define error-style (send (editor:get-standard-style-list) find-or-create-style 
-                            plain-style
-                            red-delta))
-  
-  (define output-port (mk-port plain-style))
-  (define error-port (mk-port error-style))
-  
-  (define completed-successfully? #f)
-  
-  (define installer-cust (make-custodian))
-    
-  (parameterize ([current-custodian installer-cust])
-    (parameterize ([current-eventspace (make-eventspace)])
-      (queue-callback
-       (lambda ()
-         
-         (let ([installer-thread (current-thread)])
-           (parameterize ([current-custodian orig-custodian])
-             (thread
-              (lambda ()
-                (thread-wait installer-thread)
-                (parameterize ([current-eventspace inst-eventspace])
-                  (queue-callback
-                   (λ () 
-                     (send kill-button enable #f)
-                     (when close-button (send close-button enable #t))
-                     (set! currently-can-close? #t)
-                     (semaphore-post can-close-sema))))
-                (unless completed-successfully? 
-                  (parameterize ([current-eventspace orig-eventspace])
-                    (queue-callback
-                     (lambda ()
-                       (cleanup-thunk)))))))))
-         
-         (let/ec k
-           (parameterize ([current-output-port output-port]
-                          [current-error-port error-port]
-                          [error-escape-handler
-                           (let ([oh (error-escape-handler)]
-                                 [ct (current-thread)])
-                             (λ () 
-                               (if (equal? (current-thread) ct)
-                                   (k (void))
-                                   (oh))))]
-                          [exit-handler
-                           (λ (x)
-                             (unless (equal? x 0)
-                               (eprintf "exited with code: ~s\n" x))
-                             (custodian-shutdown-all installer-cust))])
-             (do-install inst-eventspace frame)))
-         (parameterize ([current-eventspace orig-eventspace])
-           (queue-callback
-            (lambda ()
-              (set! completed-successfully? #t)
-              (parameterize ([current-output-port output-port]
-                             [current-error-port error-port])
-                (on-terminal-run-proc))
-              (cleanup-thunk)
-              (custodian-shutdown-all installer-cust))))))))
-  
-  (define (outside-close) (close))
-  
-  (new (class* object% (terminal<%>)
-         (super-new)
-         (define/public (get-button-panel)
-           saved-button-panel)
-         (define/public (can-close-evt)
-           (semaphore-peek-evt can-close-sema))
-         (define/public (is-closed?)
-           (not (send sub-container is-shown?)))
-         (define/public (can-close?) 
-           currently-can-close?)
-         (define/public (close)
-           (unless (is-closed?)
-             (outside-close))))))
diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/text-string-style-desc.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/text-string-style-desc.rkt
deleted file mode 100644
index 906e943b3a..0000000000
--- a/pkgs/gui-pkgs/gui-lib/mrlib/text-string-style-desc.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang scheme/base
-
-(provide get-string/style-desc)
-(require scheme/gui/base
-         scheme/class)
-
-;; get-string/style-desc : text -> (listof str/ann)
-(define (get-string/style-desc text [start 0] [end (send text last-position)])
-  (let* ([snips (get-snips text start end)]
-         [str/ann (map snip->str/ann snips)]
-         [joined-str/ann (join-like str/ann)])
-    joined-str/ann))
-
-;; get-snips : text -> (listof snip)
-;; extracts the snips from a text
-(define (get-snips text start end)
-  (send text split-snip start)
-  (send text split-snip end)
-  (let loop ([snip (send text find-snip start 'after-or-none)])
-    (cond
-      [(not snip) null]
-      [(< (send text get-snip-position snip) end)
-       (cons snip (loop (send snip next)))]
-      [else null])))
-
-;; snip->str/ann : snip -> str/ann
-;; extracts the style type from the snip
-(define (snip->str/ann snip)
-  (let* ([str (cond
-                [(is-a? snip string-snip%)
-                 (send snip get-text 0 (send snip get-count))]
-                [(is-a? snip image-snip%)
-                 'image]
-                [else 'unknown])]
-         [style (send snip get-style)]
-         [style-name (send style get-name)]
-         [style-desc (if style-name
-                         (translate-name style-name)
-                         (describe-style style))])
-    (list str style-desc)))
-
-;; describe-style : style -> (listof symbol)
-(define (describe-style style)
-  (list
-   'alignment (send style get-alignment)
-   'background (symbolic-color (send style get-background))
-   'face (send style get-face)
-   'family (send style get-family)
-   'foreground (symbolic-color (send style get-foreground))
-   'size (send style get-size)
-   'underlined (send style get-underlined)))
-
-(define (symbolic-color color)
-  (list (send color red)
-        (send color green)
-        (send color blue)))
-
-;; translate-name : (union #f string) -> symbol
-;; translates the style name to a symbol
-(define (translate-name str)
-  (and str
-       (let ([m (regexp-match re:translate-name str)])
-         (and m
-              (string->symbol (cadr m))))))
-
-;; re:translate-name : regexp
-(define re:translate-name (regexp "^.*:([^:]*)$"))
-
-;; join-like : (listof str/ann) -> (listof str/ann)
-;; joins same styles to form largest groups
-(define (join-like str/anns)
-  (cond
-    [(null? str/anns) null]
-    [else 
-     (let loop ([first (car str/anns)]
-                [rest (cdr str/anns)])
-       (cond
-         [(null? rest) (list first)]
-         [else
-          (let ([second (car rest)])
-            (if (and (equal? (cadr first) (cadr second))
-                     (string? (car first))
-                     (string? (car second)))
-                (loop (list (string-append (car first) (car second))
-                            (cadr first))
-                      (cdr rest))
-                (cons first
-                      (loop second
-                            (cdr rest)))))]))]))
diff --git a/pkgs/gui-pkgs/gui-lib/racket/gui.rkt b/pkgs/gui-pkgs/gui-lib/racket/gui.rkt
deleted file mode 100644
index 58531f4786..0000000000
--- a/pkgs/gui-pkgs/gui-lib/racket/gui.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-(module gui racket
-  (require racket/gui/base)
-  (provide (all-from-out racket)
-           (all-from-out racket/gui/base)))
diff --git a/pkgs/gui-pkgs/gui-lib/racket/gui/base.rkt b/pkgs/gui-pkgs/gui-lib/racket/gui/base.rkt
deleted file mode 100644
index dcdad62068..0000000000
--- a/pkgs/gui-pkgs/gui-lib/racket/gui/base.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-(require (except-in mred
-                    make-gui-namespace
-                    make-gui-empty-namespace))
-
-(provide (all-from-out mred)
-         make-gui-namespace
-         make-gui-empty-namespace)
-
-(define-namespace-anchor anchor)
-
-(define (make-gui-empty-namespace)
-  (let ([ns (make-base-empty-namespace)])
-    (namespace-attach-module (namespace-anchor->empty-namespace anchor)
-                             'racket/gui/base
-                             ns)
-    ns))
-
-(define (make-gui-namespace)
-  (let ([ns (make-gui-empty-namespace)])
-    (parameterize ([current-namespace ns])
-      (namespace-require 'racket/base)
-      (namespace-require 'racket/gui/base)
-      (namespace-require 'racket/class))
-    ns))
diff --git a/pkgs/gui-pkgs/gui-lib/racket/gui/gracket.1 b/pkgs/gui-pkgs/gui-lib/racket/gui/gracket.1
deleted file mode 100644
index 9f89b570bd..0000000000
--- a/pkgs/gui-pkgs/gui-lib/racket/gui/gracket.1
+++ /dev/null
@@ -1,61 +0,0 @@
-\" dummy line
-.TH GRACKET 1 "May 2010"
-.UC 4
-.SH NAME
-gracket \- the GUI Racket implementation
-.SH SYNOPSIS
-.B gracket
-[
-.I option ...
-] [
-.I argument ...
-]
-
-.SH DESCRIPTION
-GRacket is the GUI-application variant of
-.BR racket .
-
-.PP
-Run
-.PP
-   gracket --help
-.PP
-for a list of command-line options and other start-up information.
-
-.PP
-Supplying no arguments to
-.B gracket
-is the same as supplying the
-.B -i
-option for interactive evaluation.
-
-.PP
-Supplying non-switch, non-configuration arguments to
-.B gracket
-is the same as putting
-.B -u
-before the arguments to run the first one as a module-based script.
-
-.SH MORE INFORMATION
-For further information, run
-.PP
-   raco docs
-.PP
-to open installed documentation in your web browser.
-
-.PP
-Alternately, consult the on-line
-documentation and other information available at
-.PP
-.ce 1
-http://racket-lang.org/
-
-.SH AUTHOR
-GRacket was implemented by Matthew Flatt (mflatt@racket-lang.org),
-Robert Bruce Findler (robby@racket-lang.org),
-John Clements (clements@racket-lang.org), and PLT.
-
-.SH SEE ALSO
-.BR raco(1),
-.BR drracket(1),
-.BR racket(1)
diff --git a/pkgs/gui-pkgs/gui-lib/racket/gui/info.rkt b/pkgs/gui-pkgs/gui-lib/racket/gui/info.rkt
deleted file mode 100644
index 481f2b13c0..0000000000
--- a/pkgs/gui-pkgs/gui-lib/racket/gui/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define post-install-collection "installer.rkt")
-(define copy-man-pages '("gracket.1"))
diff --git a/pkgs/gui-pkgs/gui-lib/racket/gui/init.rkt b/pkgs/gui-pkgs/gui-lib/racket/gui/init.rkt
deleted file mode 100644
index 1afce33164..0000000000
--- a/pkgs/gui-pkgs/gui-lib/racket/gui/init.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-(module init scheme/gui
-  (require scheme/init)
-
-  (current-load text-editor-load-handler)
-
-  (provide (all-from-out scheme/gui)
-           (all-from-out scheme/init)))
diff --git a/pkgs/gui-pkgs/gui-lib/racket/gui/installer.rkt b/pkgs/gui-pkgs/gui-lib/racket/gui/installer.rkt
deleted file mode 100644
index adc4318348..0000000000
--- a/pkgs/gui-pkgs/gui-lib/racket/gui/installer.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-(require launcher
-         racket/path
-         racket/file)
-
-(provide post-installer)
-
-(define (post-installer path collection user?)
-  (define variants (available-mred-variants))
-  ;; add a gracket-text executable that uses the -z flag (preferring a script)
-  (for ([vs '((script-3m 3m) (script-cgc cgc))])
-    (let ([v (findf (lambda (v) (memq v variants)) vs)])
-      (when v
-        (parameterize ([current-launcher-variant v])
-          (make-mred-launcher
-           '("-z")
-           (prep-dir
-            (mred-program-launcher-path "gracket-text" #:user? user?))
-           `([subsystem . console] [single-instance? . #f]
-             [relative? . ,(not user?)]))))))
-  ;; add a bin/gracket (in addition to lib/gracket)
-  (for ([vs '((script-3m 3m) (script-cgc cgc))])
-    (let ([v (findf (lambda (v) (memq v variants)) vs)])
-      (when v
-        (parameterize ([current-launcher-variant v])
-          (make-mred-launcher null
-                              (prep-dir
-                               (mred-program-launcher-path "GRacket" #:user? user?))
-                              '([exe-name . "GRacket"] [relative? . ,(not user?)]
-                                [exe-is-gracket . #t])))))))
-
-(define (prep-dir p)
-  (define dir (path-only p))
-  (make-directory* dir)
-  p)
diff --git a/pkgs/gui-pkgs/gui-lib/racket/gui/lang/reader.rkt b/pkgs/gui-pkgs/gui-lib/racket/gui/lang/reader.rkt
deleted file mode 100644
index c883c78807..0000000000
--- a/pkgs/gui-pkgs/gui-lib/racket/gui/lang/reader.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang s-exp syntax/module-reader
-racket/gui
-
-#:language-info '#(racket/language-info get-info #f)
diff --git a/pkgs/gui-pkgs/gui-lib/scheme/gui.rkt b/pkgs/gui-pkgs/gui-lib/scheme/gui.rkt
deleted file mode 100644
index 380e2bdd77..0000000000
--- a/pkgs/gui-pkgs/gui-lib/scheme/gui.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-(module gui scheme
-  (require scheme/gui/base)
-  (provide (all-from-out scheme)
-           (all-from-out scheme/gui/base)))
diff --git a/pkgs/gui-pkgs/gui-lib/scheme/gui/base.rkt b/pkgs/gui-pkgs/gui-lib/scheme/gui/base.rkt
deleted file mode 100644
index 3a8c89773f..0000000000
--- a/pkgs/gui-pkgs/gui-lib/scheme/gui/base.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang scheme/base
-(require (except-in mred
-                    make-gui-namespace
-                    make-gui-empty-namespace))
-
-(provide (all-from-out mred)
-         make-gui-namespace
-         make-gui-empty-namespace)
-
-(define-namespace-anchor anchor)
-
-(define (make-gui-empty-namespace)
-  (let ([ns (make-base-empty-namespace)])
-    (namespace-attach-module (namespace-anchor->empty-namespace anchor)
-                             'scheme/gui/base
-                             ns)
-    ns))
-
-(define (make-gui-namespace)
-  (let ([ns (make-gui-empty-namespace)])
-    (parameterize ([current-namespace ns])
-      (namespace-require 'scheme/base)
-      (namespace-require 'scheme/gui/base)
-      (namespace-require 'scheme/class))
-    ns))
diff --git a/pkgs/gui-pkgs/gui-lib/scheme/gui/init.rkt b/pkgs/gui-pkgs/gui-lib/scheme/gui/init.rkt
deleted file mode 100644
index c56704037d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/scheme/gui/init.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/gui/init
diff --git a/pkgs/gui-pkgs/gui-lib/scheme/gui/lang/reader.rkt b/pkgs/gui-pkgs/gui-lib/scheme/gui/lang/reader.rkt
deleted file mode 100644
index 140e7eadd5..0000000000
--- a/pkgs/gui-pkgs/gui-lib/scheme/gui/lang/reader.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang s-exp syntax/module-reader
-scheme/gui
-
-#:language-info '#(scheme/language-info get-info #f)
diff --git a/pkgs/gui-pkgs/gui-lib/scribble/private/indentation.rkt b/pkgs/gui-pkgs/gui-lib/scribble/private/indentation.rkt
deleted file mode 100644
index 125d28c77b..0000000000
--- a/pkgs/gui-pkgs/gui-lib/scribble/private/indentation.rkt
+++ /dev/null
@@ -1,693 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         framework)
-
-(define surrogate%
-  (class (racket:text-mode-mixin 
-          (color:text-mode-mixin
-           mode:surrogate-text%))
-    (define/override (on-enable-surrogate txt)
-      (send (send txt get-keymap) chain-to-keymap at-exp-keymap #f)
-      (super on-enable-surrogate txt))
-    (define/override (on-disable-surrogate txt)
-      (keymap:remove-chained-keymap txt at-exp-keymap)
-      (super on-disable-surrogate txt))
-    (super-new)))
-
-(define at-exp-keymap (new keymap:aug-keymap%))
-(define (reindent-paragraph t evt)
-  (unless (send t is-stopped?)
-    (define sp (send t get-start-position))
-    (when (= sp (send t get-end-position))
-      (paragraph-indentation t sp 60))))
-
-(send at-exp-keymap add-function "reindent-paragraph" reindent-paragraph)
-(send at-exp-keymap map-function "esc;q" "reindent-paragraph")
-(send at-exp-keymap map-function "?:a:q" "reindent-paragraph")
-
-;;(paragraph-indentation a-racket:text posi width) → void?
-;; posi : exact-integer? = current given position
-;; width : exact-integer? = user defined line width limitation
-;; Indent a whole paragraph(multiple lines that contains the given position
-(define (paragraph-indentation txt posi width)
-  (let* ([current-line (send txt position-paragraph posi)]
-         [guess-start-posi (send txt find-up-sexp posi)])
-    (if guess-start-posi ;;inside a parenthesis
-        (let* ([guess-start-line (send txt position-paragraph guess-start-posi)])
-          (paragraph-indent-start txt guess-start-line current-line width))
-        (paragraph-indent-start txt current-line current-line width))));;handle text, no boundry guess
-
-;;(paragraph-indent-start a-racket:text guess-start current-line) → void?
-;; guess-start : exact-integer? = (send text find-up-sexp posi)
-;; current-line : exact-integer? = current line number
-;; Indent a whole paragraph starts with empty line or guess-start, end with empty line
-(define (paragraph-indent-start text guess-start current-line width)
-  (define para-start-line (for/first ([line (in-range guess-start 0 -1)]
-                                      #:when (empty-line? text line))
-                            line))
-  (when para-start-line
-    (send text begin-edit-sequence)
-    (let loop ([i (+ para-start-line 1)])
-      (unless (and (empty-line? text i) (> i current-line))
-        (define posi (send text paragraph-start-position i))
-        (define amount (determine-spaces text posi))
-        (when amount
-          (adjust-spaces text i amount posi))
-        (adjust-para-width text posi width)
-        (loop (+ i 1))))
-    (send text end-edit-sequence)))                              
-
-;;(empty-line? a-racket:text line) → boolean?
-;; line : exact-integer? = current line number
-(define (empty-line? txt line)
-  (let* ([line-start (send txt paragraph-start-position line)]
-         [line-end (send txt paragraph-end-position line)]
-         [line-classify (txt-position-classify txt line-start line-end)])
-    (not (para-not-empty? line-classify))))
-
-;;(rest-empty? a-racket:text line start) → boolean?
-;; line : exact-integer? = (send text position-paragraph start)
-;; start : exact-intefer? = the start position
-(define (rest-empty? txt line start)
-  (let* ([line-start (add1 start)]
-         [line-end (send txt paragraph-end-position line)]
-         [line-classify (txt-position-classify txt line-start line-end)])
-    (not (para-not-empty? line-classify))))
-
-;;(determine-spaces : a-racket:text position) → exact-integer?/boolean?
-;; position : exact-integer? = current position
-;; Return exact integer represents number of #\space to put in front of current paragraph(line) or #f
-(define (determine-spaces txt posi)
-  (define current-para (send txt position-paragraph posi))
-  (if (not (empty-line? txt current-para));not an empty paragraph/comment string
-      (let* ([para-start (send txt paragraph-start-position current-para)]
-             [para-start-skip-space (start-skip-spaces txt current-para 'forward)]
-             [char-classify (send txt classify-position para-start-skip-space)]
-             [prev-posi (send txt find-up-sexp para-start-skip-space)])
-        (cond (prev-posi
-               (let ([this-para (send txt position-paragraph prev-posi)])
-                 (cond ((equal? #\[ (send txt get-character prev-posi))
-                        (let ((this-para-start (send txt paragraph-start-position this-para)))
-                          (if (= current-para this-para)
-                              0
-                              (if (rest-empty? txt this-para prev-posi)
-                                  1
-                                  (add1 (- prev-posi this-para-start))))))
-                       ;;if it is inside a racket function and not the first line of the racket function
-                       ((equal? #\( (send txt get-character prev-posi))
-                        (send txt tabify para-start) #f);call corresponding function to indent racket stuff
-                       (else (count-parens txt prev-posi)))))
-              ((equal? 'text char-classify) 0) ;;0 space if line is just a "outside" text
-              (else (send txt tabify para-start) #f)));;call tabify
-      #f));;empty line, do nothing 
-
-;;(adjust-para-width a-racket:text position width) → boolean?
-;; position : exact-integer? = current position 
-;; width : exact-integer? = predefined value
-;;Modify the given paragraph(line) if it exceed width limit by inserting #\newline to proper position
-(define (adjust-para-width txt posi width)
-  (let* ([para-num (send txt position-paragraph posi)]
-         [para-start (send txt paragraph-start-position para-num)]
-         [para-end (send txt paragraph-end-position para-num)]
-         [para-len (add1 (- para-end para-start))]
-         [para-classify (txt-position-classify txt para-start para-end)])
-    (if (para-not-empty? para-classify) ;continue when current paragraph is not empty
-        (cond ((> para-len width) ;paragraph too long
-               (define new-line-created (select-cut-option txt para-start para-len width para-classify))
-               (when (equal? new-line-created #t)
-                 (let* ([next-para-num (+ para-num 2)]
-                        [next-para-start (send txt paragraph-start-position next-para-num)]
-                        [next-para-end (send txt paragraph-end-position next-para-num)]
-                        [next-para-classify (txt-position-classify txt next-para-start next-para-end)])
-                   (if (para-not-empty? next-para-classify) ;; next paragraph not empty
-                       (begin (delete-end-spaces txt (+ para-num 1))
-                              (delete-start-spaces txt (+ para-num 2))
-                              (let* ([nxt-para-num (+ para-num 2)]
-                                     [nxt-para-start (send txt paragraph-start-position nxt-para-num)]
-                                     [nxt-para-end (send txt paragraph-end-position nxt-para-num)]
-                                     [nxt-para-classify (txt-position-classify txt nxt-para-start nxt-para-end)])
-                                (when (equal? 'text (car nxt-para-classify))
-                                  ;now text
-                                  (send txt delete nxt-para-start 'back)
-                                  (send txt insert #\space (sub1 nxt-para-start)))))     
-                       #t))))
-              ;;push up the next paragraph if not empty, and it is text
-              ((< para-len width) 
-               (push-back-lines txt para-num para-start width)
-               (let* ([new-end (send txt paragraph-end-position para-num)]
-                      [new-len (add1 (- new-end para-start))])
-                 (when (> new-len width)
-                   (adjust-para-width txt para-start width))
-                 ))
-              (else #t))
-        #t)))
-
-;;(txt-position-classify a-racket:text start end) → void?
-;; start : exact-integer? = position to start classify
-;; end : exact-integer? = position to end classify
-;; Basic position classify method that classify text within certain range
-(define (txt-position-classify txt start end)
-  (for/list ([x (in-range start end 1)])
-    (send txt classify-position x)))
-
-;;(is-at-sign? a-racket:text posi) → boolean?
-;; posi : exact-integer? = a position in the text
-;; Check if the given position is an @
-(define (is-at-sign? txt posi)
-  (and (equal? (send txt classify-position posi) 'parenthesis)
-       (let-values ([(start end) (send txt get-token-range posi)])
-         (and (equal? start posi)
-              (equal? end (+ posi 1))))
-       (equal? #\@ (send txt get-character posi))))
-
-;;(para-not-empty? a-racket:text classify-lst) → boolean?
-;; classify-lst : list? = (txt-position-classify text start end)
-;; Check if current paragraph(line) is empty, we consider comment line as empty line
-(define (para-not-empty? classify-lst) ;;we consider 'other  and 'comment as empty
-  (if (or (member 'parenthesis classify-lst)
-          (member 'string classify-lst)
-          (member 'symbol classify-lst)
-          (member 'text classify-lst))
-      #t
-      #f))
-
-;;(start-skip-spaces a-racket:text para direction) → exact-integer?
-;;para : exact-integer? = paragraph(line) number
-;;direction : symbol? = 'forward/'backward
-;;Return the first non-empty(#\space #\tab) character's position in given paragraph(line)
-(define (start-skip-spaces txt para direction)
-  (let* ([para-start (send txt paragraph-start-position para)]
-         [para-end (send txt paragraph-end-position para)])
-    (if (equal? direction 'forward)
-        (for/first ([start-skip-space (in-range para-start para-end 1)]
-                    #:when (not (member (send txt get-character start-skip-space) (list #\space #\tab))))
-          start-skip-space)
-        (for/first ([start-skip-space (in-range (sub1 para-end) para-start -1)];;ignore the newline
-                    #:when (not (member (send txt get-character start-skip-space)  (list #\space #\tab))))
-          start-skip-space))))
-
-;;(delete-end-spaces a-racket:text para) → void?
-;;para : exact-integer? = paragraph(line) number
-;;Delete all #\space and #\tab at the end of given paragraph
-(define (delete-end-spaces txt para)
-  (let* ([para-end (send txt paragraph-end-position para)]
-         [last-non-white (start-skip-spaces txt para 'backward)])
-    (if last-non-white
-        (send txt delete (+ last-non-white 1) para-end)
-        #f)))
-
-;;(delete-start-spaces a-racket:text para) → void?
-;;para : exact-integer? = paragraph(line) number
-;;Delete all #\space and #\tab at the beginning of given paragraph
-(define (delete-start-spaces txt para)
-  (let* ([para-start (send txt paragraph-start-position para)]
-         [first-non-white (start-skip-spaces txt para 'forward)])
-    (when (> first-non-white para-start)
-      (send txt delete para-start first-non-white))))
-
-;;(count-parens a-racket:text posi) → exact-integer?
-;;posi : exact-integer? = a position in given text 
-;;Return number of parenthesis till the outmost @ annotation,
-;;if the there is "[", we check if it has "@" after at the same
-;;line, if so, we add the number of characters between "[" and
-;;the beginning of the line it appears
-(define (count-parens txt posi)
-  (define count 0)
-  (do ([p posi (send txt find-up-sexp p)]);backward-containing-sexp p 0)])
-    ((not p) count)
-    (cond [(equal? #\{ (send txt get-character p)) (set! count (add1 count))]
-          [(equal? #\[ (send txt get-character p))
-           (let* ([this-para (send txt position-paragraph p)]
-                  [this-para-start (send txt paragraph-start-position this-para)])
-             (if (rest-empty? txt this-para p)
-                 (set! count (add1 count))
-                 (set! count (+ (add1 (- p this-para-start)) count))))]
-          [else #t])))
-
-;;(push-back-check? a-racket:text posi) → Boolean?
-;;posi : exact-integer? = a position in given text which is the @'s position 
-;;Return #f if we see:
-;; 1) "[" with muptiple lines after
-;; 2) keyworld "codeblock" or "verbatim"
-;; otherwise return #t
-(define (push-back-check? t posi)
-  (define key-words (list "codeblock" "verbatim"))
-  (if (is-at-sign? t posi)
-      (let* ([first-char-posi (add1 posi)]
-             [open-paren-posi (send t get-forward-sexp first-char-posi)]);start from the first char after @
-        (cond 
-          [(equal? #\[ (send t get-character open-paren-posi))
-           (let* ([close-paren-posi-plus-one (send t get-forward-sexp open-paren-posi)]
-                  [start-line (send t position-paragraph open-paren-posi)])
-             (if close-paren-posi-plus-one
-                 (let* ([close-paren-posi (sub1 close-paren-posi-plus-one)]
-                        [end-line (send t position-paragraph close-paren-posi)])
-                   (equal? start-line end-line))
-                 #f))]
-          [(equal? #\{ (send t get-character open-paren-posi))
-           (define key-word (send t get-text first-char-posi open-paren-posi))
-           (if (member key-word key-words)
-               #f
-               #t)]
-          [else #f]))
-      #t)) ;; e.g @verbatim|{}|
-
-;;(push-back-line a-racket:text para width) → void?
-;;para : exact-integer? = paragraph(line) number
-;;para-start : exact-integer? = start position of given paragraph(line)
-;;width : exact-intefer? = predefined paragrah width
-(define (push-back-lines txt para para-start width)
-  (let* ([para-end (send txt paragraph-end-position para)]
-         [new-width (add1 (- para-end para-start))];;init with original line length
-         [nxt-para (add1 para)]
-         [nxt-para-end (send txt paragraph-end-position nxt-para)])
-    (if (or (equal? para-end nxt-para-end) (equal? para-end (sub1 nxt-para-end))) ;;reach/exceed the last line
-        #t;;all done
-        (let* ([nxt-para-start (start-skip-spaces txt nxt-para 'forward)] 
-               [nxt-para-classify (txt-position-classify txt nxt-para-start nxt-para-end)])
-          (unless (not nxt-para-start) ;next line empty, start-skip-spaces returns #f
-            (if (and (para-not-empty? nxt-para-classify) (push-back-check? txt nxt-para-start)
-                     (equal? (send txt classify-position (sub1 para-end)) 'text);;previous line end with text 
-                     (< new-width width))
-                ;;we only push back those lines satisfy push-back-check rules
-                (begin (delete-end-spaces txt para)
-                       (delete-start-spaces txt nxt-para)
-                       (let ([new-nxt-start (send txt paragraph-start-position nxt-para)])
-                         (send txt delete new-nxt-start 'back)
-                         (send txt insert #\space (sub1 new-nxt-start)))
-                       (push-back-lines txt para para-start width)) ;;keep pushing back lines
-                #t)))))) ;;done
-
-;;Deprecated
-;;(indent-racket-fuc a-racket:text posi) → exact-integer?/boolean?
-;;posi : exact-integer? = a position in given text
-;;Return 1 if the position is within first #\( of racket function, or #f
-(define (indent-racket-func txt posi)
-  (let* ([prev-posi (sub1 posi)]
-         [back-one-level (send txt backward-containing-sexp prev-posi 0)])
-    (if back-one-level
-        (let ([paren (sub1 back-one-level)])
-          (cond ((equal? #\{ (send txt get-character paren)) 1)
-                ((equal? #\[ (send txt get-character paren));might be inside cond etc
-                 (let ([back-two-level (send txt backward-containing-sexp (sub1 paren) 0)])
-                   (if back-two-level
-                       #f
-                       1)))
-                (else #f)))
-        #f)));;#f needs to be replaced by racket indentation function
-
-;;(select-cut-option a-racket:text start len width classify-lst) → boolean?
-;; start : exact-integer? = (send text paragraph-start-position given-paragraph-number)
-;; len : exact-integer? = length of current paragraph(line)
-;; width : exact-integer? = predefined value
-;; classify-lst: list? = (txt-position-classify text start end) here end is the end position
-;;               of current paragraph(line)
-;; Put #\newline to shorten given paragraph if necessary, return #t if #\newline inserted
-;; Situations:
-;;1) breake whole @... to next line, 
-;;2) keep @.... in current line 
-;;3) if it is a simple text, just cut it
-(define (select-cut-option txt start len width classify-lst)
-  (let ([adjust-result (list-ref classify-lst (sub1 width))]);;get the "end" position adjust result
-    (cond [(equal? adjust-result 'text) 
-           (let ([new-break (insert-break-text txt start (+ start width) (+ start len))])
-             (if new-break
-                 ;replace the #\space with #\newline 
-                 (begin (send txt delete (add1 new-break) 'back)
-                        (send txt insert #\newline new-break)
-                        #t)
-                 #f))]
-          ;;'symbol 'parenthesis 'string or 'space
-          ;;1)went backward to find @
-          ;;2)went forward to find first 'text
-          [else 
-           (let ([posi (insert-break-func txt start len width classify-lst)])
-             (if posi
-                 (begin (send txt insert #\newline posi);;directly insert before @ or 'text
-                        #t)
-                 #f))])))
-
-;;(insert-break-text a-racket:text start width-end end) → exact-integer?/boolean?
-;; start : exact-integer? = (send text paragraph-start-position given-paragraph-number)
-;; width-end : exact-integer? = (+ start width) here width is the user defined line width limit
-;; end : exact-integer? = (send text paragraph-end-position given-paragraph-number)
-;;Return the proper position to insert #\newline into given text line, #f if not found
-(define (insert-break-text text start width-end end)
-  (for/first ([break-ls (in-range width-end start -1)]
-              #:when (equal? #\space (send text get-character break-ls)))
-    break-ls))
-
-;;(insert-break-func a-racket:text start len width classify-lst) → exact-integer?/boolean?
-;; start : exact-integer? = (send text paragraph-start-position given-paragraph-number)
-;; len : exact-integer? = length of current paragraph(line)
-;; width : exact-integer? = predefined value
-;; classify-lst: list? = (txt-position-classify text start end) here end is the end position
-;;               of current paragraph(line)
-;;Return the proper position to insert #\newline into given line, #f if not found
-(define (insert-break-func text start len width classify-lst)
-  (let ([at-sign-posi
-         (for/first ([sign-posi (in-range (+ start width) start -1)]
-                     #:when (is-at-sign? text sign-posi))
-           sign-posi)])
-    (if (and at-sign-posi
-             (not (equal? 'white-space (list-ref classify-lst (sub1 (- at-sign-posi start))))))
-        at-sign-posi
-        (for/first ([posi (in-range width (- len 1))] 
-                    #:when (equal? 'text (list-ref classify-lst posi)))
-          posi))))
-
-;;adjust-spaces for text
-;;(adjust-spaces : a-racket:text para amount posi) → boolean?
-;; para : exact-integer? = given paragraph(line) number
-;; amount : exact-integer? = (determine-spaces text posi)
-;; posi : exact-integer? = a position in the text
-;; Delete #\spaces and #\tab in front of given paragraph(line) if not 
-;;  equal to the amount given by determine-spaces. Then insert new amount of #\space
-;;  in front of the paragraph(line)
-(define (adjust-spaces text para amount posi)
-  (define posi-skip-space (start-skip-spaces text para 'forward))
-  (define origin-amount (- posi-skip-space posi))
-  (when (and amount (not (= origin-amount amount)))
-    (send text delete posi posi-skip-space)
-    (when (> amount 0)
-      (send text insert (make-string amount #\space) posi))) 
-  #t)
-
-;;test cases
-(module+ test
-  (require rackunit framework)
-  
-  ;test start-skip-spaces
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "test1 test2\n @test3\n")
-                  (start-skip-spaces t 1 'forward)) 13)
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "{abcd\n@efgh\n}")
-                  (start-skip-spaces t 1 'forward)) 6)
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "{abcd\n  efgh\n}")
-                  (start-skip-spaces t 1 'forward)) 8)
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "{abc\n       \n}")
-                  (start-skip-spaces t 1 'forward)) #f)
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "{abc\nefgh   \n}")
-                  (start-skip-spaces t 1 'backward)) 8)
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "{abcd\n\t\tefgh\n}");tab
-                  (start-skip-spaces t 1 'forward)) 8)
-  (define txt_1 (new racket:text%))
-  (send txt_1 insert "#lang scribble/base\n@f{x}\n@;ghj\ntyty\n\n")
-  
-  ;test para-not-empty?
-  (check-equal? (let ([result (txt-position-classify txt_1 0 5)])
-                  (para-not-empty? result))
-                #f);;consider 'other as empty line
-  
-  (check-equal? (let ([result (txt-position-classify txt_1 20 24)])
-                  (para-not-empty? result))
-                #t)
-  
-  (check-equal? (let ([result (txt-position-classify txt_1 27 31)])
-                  (para-not-empty? result))
-                #f);comment
-  
-  (check-equal? (let ([result (txt-position-classify txt_1 37 38)])
-                  (para-not-empty? result))
-                #f);empty line
-  ;test is-at-sign
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "(x)")
-                  (is-at-sign? t 0))
-                #f)
-  (check-equal? (is-at-sign? txt_1 20) #t)
-  (check-equal? (is-at-sign? txt_1 22) #f) 
-  
-  ;test determine-spaces
-  (check-equal? (determine-spaces txt_1 15) #f)
-  (check-equal? (determine-spaces txt_1 21) #f)
-  
-  (define txt_2 (new racket:text%))
-  (send txt_2 insert "#lang scribble/base\n@f{\n @a\n@b\n}")
-  (check-equal? (determine-spaces txt_2 25) 1)
-  (check-equal? (determine-spaces txt_2 28) 1)
-  
-  (define txt_3 (new racket:text%))
-  (send txt_3 insert "#lang scribble/base\n@f[@x\n@y\n]")
-  (check-equal? (determine-spaces txt_3 24) #f) 
-  (check-equal? (determine-spaces txt_3 27) 3)
-  
-  (define txt_4 (new racket:text%))
-  (send txt_4 insert "#lang scribble/base\n@itemlist[@item{item1}\n@item{item2}\n]")
-  (check-equal? (determine-spaces txt_4 22) #f)
-  (check-equal? (determine-spaces txt_4 44) 10)
-  
-  (define txt_5 (new racket:text%))
-  (send txt_5 insert "#lang scribble/base\n@boldlist{@me{item1}\n@me{item2}\n}")
-  (check-equal? (determine-spaces txt_5 31) #f)
-  (check-equal? (determine-spaces txt_5 46) 1)
-  
-  (define txt_6 (new racket:text%))
-  (send txt_6 insert "@list{@me{item1}\n\n@me{item2}\n}")
-  (check-equal? (determine-spaces txt_6 16) #f)
-  (check-equal? (determine-spaces txt_6 17) #f);empty line!
-  (check-equal? (determine-spaces txt_6 18) 1)
-  
-  (check-equal? (let ([txt_7 (new racket:text%)])
-                  (send txt_7 insert "@(define (foo . a)\n(bar b))")
-                  (determine-spaces txt_7 19)) #f)
-  
-  (define txt_8 (new racket:text%))
-  (send txt_8 insert "@a{me}\n@b[\n@c{@d{e} f\ng\nh}\n")
-  (check-equal? (count-parens txt_8 22) 2)
-  (check-equal? (count-parens txt_8 13) 2);;include current parenthesis
-  (check-equal? (determine-spaces txt_8 22) 2)
-  (check-equal? (determine-spaces txt_8 12) 1) 
-  
-  (define txt_9 (new racket:text%))
-  (send txt_9 insert "@a[\n(b c)\n(d\n[(e) f]\n[g h])\n]\n")
-  (check-equal? (indent-racket-func txt_9 4) 1)
-  (check-equal? (indent-racket-func txt_9 6) #f)
-  (check-equal? (determine-spaces txt_9 13) #f) 
-  (check-equal? (determine-spaces txt_9 4) 1)
-  
-  ;;two test cases for count-parens
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "@a[@b{c d\ne f g}\n@h{i j}]")
-                  (count-parens t 5)) 4)
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "@a[@b{\n@c{d e f}\ng}]")
-                  (count-parens t 9)) 5)
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "(d f\n(l [()\n(f ([a (b c)])\n(d e)))])")
-                  (indent-racket-func t 12)) #f)      
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "@a[\n     ]\n")
-                  (determine-spaces t 4))
-                1)      
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n\ntest1\n     test2\n")
-                  (determine-spaces t 28))
-                0)
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n\ntestcase @a{b\n\n\n\n\n      c}\n\n")
-                  (determine-spaces t 39))
-                1)
-  ;;test cases for:delete-end-spaces delete-start-spaces
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "{abcde   \nfgh\n}")
-                  (delete-end-spaces t 0)
-                  (send t get-text)) "{abcde\nfgh\n}")
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "{abcde\t\t\t\t\nfgh\n}")
-                  (delete-end-spaces t 0)
-                  (send t get-text)) "{abcde\nfgh\n}")
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "{abcde   \n\n3\n}")
-                  (delete-end-spaces t 0)
-                  (send t get-text)) "{abcde\n\n3\n}")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "  {abcde\nfgh\n}")
-                  (delete-start-spaces t 0)
-                  (send t get-text)) "{abcde\nfgh\n}")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "@a[\n      ]\n")
-                  (delete-start-spaces t 1)
-                  (send t get-text)) "@a[\n]\n")
-  
-  ;;adjust-spaces
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "@a[\n     ]\n")
-                  (adjust-spaces t 1 1 4)
-                  (adjust-spaces t 1 1 4)
-                  (send t get-text)) "@a[\n ]\n")
-  ;;push-back-check?
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n@test[@a{}]\n")
-                  (push-back-check? t 20))
-                #t)
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n@test[@a{}\n@b{}]\n")
-                  (push-back-check? t 20))
-                #f)
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n @test{}\n@test{}\n")
-                  (push-back-check? t 21))
-                #t)
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n@codeblockfake{}\n")
-                  (push-back-check? t 20))
-                #t)
-  
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n\n@codeblock{}\n")
-                  (push-back-check? t 21))
-                #f)
-  
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n@verbatim{}\n")
-                  (push-back-check? t 20))
-                #f)
-  
-  ;;push-back-lines
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\ntest1\n     test2\n @test3\n")
-                  (push-back-lines t 1 20 22)
-                  (send t get-text))
-                "#lang scribble/base\ntest1 test2\n @test3\n")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\ntest1\n     test2\n\t\ttest3\n")
-                  (push-back-lines t 1 20 12)
-                  (send t get-text))
-                "#lang scribble/base\ntest1 test2\n\t\ttest3\n")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\ntest1\n     test2\n\t\ttest3\ntest4\n")
-                  (push-back-lines t 1 20 18)
-                  (send t get-text))
-                "#lang scribble/base\ntest1 test2 test3\ntest4\n")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\ntest1\n     test2\n\t\ttest3\n")
-                  (push-back-lines t 1 20 22)
-                  (send t get-text))
-                "#lang scribble/base\ntest1 test2 test3\n")
-  
-  ;;paragraph indentation
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n\naaa bbb ccc\n  @ddd[eee] fff\n ggg hhh iii jjj\n")
-                  (paragraph-indentation t 23 23)
-                  (send t get-text))
-                "#lang scribble/base\n\naaa bbb ccc @ddd[eee]\nfff ggg hhh iii jjj\n")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n\n@itemlist[@item{aaa bbb ccc\n                eee fff}\n          @item{ggg hhh iii\n  jjj kkk lll mmm nnn ooo\n  ppp qqq\nrrr\nsss ttt uuu vvv}]")
-                  (paragraph-indentation t 38 29)
-                  (send t get-text))
-                "#lang scribble/base\n\n@itemlist[@item{aaa bbb ccc\n           eee fff}\n          @item{ggg hhh iii\n           jjj kkk lll mmm\n           nnn ooo ppp qqq\n           rrr sss ttt uuu\n           vvv}]")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n\n@itemlist[@item{aaa bbb ccc\n                eee fff\n          @item{ggg hhh iii\n  jjj kkk lll mmm nnn ooo\n  ppp qqq\nrrr\nsss ttt uuu vvv}}]")
-                  (paragraph-indentation t 38 29)
-                  (send t get-text))
-                "#lang scribble/base\n\n@itemlist[@item{aaa bbb ccc\n           eee fff @item{ggg\n            hhh iii jjj kkk\n            lll mmm nnn ooo\n            ppp qqq rrr sss\n            ttt uuu vvv}}]")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\naaa bbb\n @ccc ddd")
-                  (adjust-para-width t 22 12) 
-                  (send t get-text))
-                "#lang scribble/base\naaa bbb\n @ccc ddd")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n\ntest1\n     test2\n\t\ttest3\n")
-                  (paragraph-indentation t 22 6)
-                  (send t get-text))
-                "#lang scribble/base\n\ntest1\ntest2\ntest3\n")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n\ntest1\n     test2\n\t\ttest3\n")
-                  (paragraph-indentation t 22 20)
-                  (send t get-text))
-                "#lang scribble/base\n\ntest1 test2 test3\n")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n\ntest1\n     test2\n\t\ttest3 test4\n")
-                  (paragraph-indentation t 22 20)
-                  (send t get-text))
-                "#lang scribble/base\n\ntest1 test2 test3\ntest4\n")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\n\ntestcase @a{b\n\n\n\n\n      c}\n\n")
-                  (paragraph-indentation t 39 14)
-                  (send t get-text))
-                "#lang scribble/base\n\ntestcase @a{b\n\n\n\n\n c}\n\n")
-  
-  ;;test case for adjust paragraph width
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\naaa bbb\n @ccc ddd")
-                  (adjust-para-width t 22 12) 
-                  (send t get-text))
-                "#lang scribble/base\naaa bbb\n @ccc ddd")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\naaa bbb\nccc ddd @e[f @g{h}]")
-                  (adjust-para-width t 22 12) 
-                  (send t get-text))
-                "#lang scribble/base\naaa bbb ccc\nddd @e[f @g{h}]")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\naaa bbb ccc ddd @e[f @g{h}]")
-                  (adjust-para-width t 22 12) 
-                  (send t get-text))
-                "#lang scribble/base\naaa bbb ccc\nddd @e[f @g{h}]")
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\na b c d @e[f @g{h}]")
-                  (adjust-para-width t 21 9) 
-                  (send t get-text))
-                "#lang scribble/base\na b c d \n@e[f @g{h}]");;keep the space, does not matter
-  
-  (check-equal? (let ([t (new racket:text%)])
-                  (send t insert "#lang scribble/base\na b c d @e{}\n f g\n")
-                  (adjust-para-width t 21 9) 
-                  (send t get-text))
-                "#lang scribble/base\na b c d \n@e{} f g\n")
-  
-  ;;test insert-break
-  (check-equal? (let ((t (new racket:text%)))
-                  (send t insert "aaa bbb ccc ddd")
-                  (let ([new-break (insert-break-text t 0 6 14)])
-                    (send t delete (add1 new-break) 'back)
-                    (send t insert #\newline new-break)
-                    (send t get-text))) "aaa\nbbb ccc ddd");;prefer shorter than the "width limit"
-  
-  ;;for the situation there isn't any #\space on right side 
-  (check-equal? (let ((t (new racket:text%)))
-                  (send t insert "aaaa bbbb")
-                  (let ([new-break (insert-break-text t 0 5 8)])
-                    (send t delete (add1 new-break) 'back)
-                    (send t insert #\newline new-break)
-                    (send t get-text))) "aaaa\nbbbb") 
-  )
-
-(provide determine-spaces adjust-para-width paragraph-indentation
-         surrogate%)
\ No newline at end of file
diff --git a/pkgs/gui-pkgs/gui-lib/unstable/gui/notify.rkt b/pkgs/gui-pkgs/gui-lib/unstable/gui/notify.rkt
deleted file mode 100644
index 13808ed44d..0000000000
--- a/pkgs/gui-pkgs/gui-lib/unstable/gui/notify.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang racket/base
-;; owner: ryanc
-(require racket/class
-         racket/gui/base
-         "../private/notify.rkt")
-(provide (all-from-out "../private/notify.rkt")
-         menu-option/notify-box
-         menu-group/notify-box
-         check-box/notify-box
-         choice/notify-box)
-
-;; GUI elements tied to notify-boxes
-;; See unstable/private/notify.rkt for the non-gui parts of notify-boxes.
-
-(define (menu-option/notify-box parent label nb)
-  (define menu-item
-    (new checkable-menu-item%
-         (label label)
-         (parent parent)
-         (demand-callback
-          (lambda (i)
-            (send i check (send nb get))))
-         (callback
-          (lambda _ 
-            #;(send nb set (send menu-item is-checked?))
-            (send nb set (not (send nb get)))))))
-  menu-item)
-
-(define (check-box/notify-box parent label nb)
-  (define checkbox
-    (new check-box%
-         (label label)
-         (parent parent)
-         (value (send nb get))
-         (callback
-          (lambda (c e) (send nb set (send c get-value))))))
-  (send nb listen (lambda (value) (send checkbox set-value value)))
-  checkbox)
-
-(define (choice/notify-box parent label choices nb)
-  (define choice
-    (new choice%
-         (label label)
-         (parent parent)
-         (style '(horizontal-label))
-         (choices choices)
-         (callback (lambda (c e) (send nb set (send c get-string-selection))))))
-  (send choice set-string-selection (send nb get))
-  (send nb listen (lambda (value) (send choice set-string-selection value)))
-  choice)
-
-(define (menu-group/notify-box parent labels nb)
-  (map (lambda (option)
-         (define label (if (pair? option) (car option) option))
-         (define menu-item
-           (new checkable-menu-item%
-                (label label)
-                (parent parent)
-                (checked (eq? (send nb get) option))
-                (callback
-                 (lambda _ (send nb set option)))))
-         (send nb listen
-               (lambda (value) (send menu-item check (eq? value option))))
-         menu-item)
-       labels))
diff --git a/pkgs/gui-pkgs/gui-lib/unstable/gui/prefs.rkt b/pkgs/gui-pkgs/gui-lib/unstable/gui/prefs.rkt
deleted file mode 100644
index f25c0ecaad..0000000000
--- a/pkgs/gui-pkgs/gui-lib/unstable/gui/prefs.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-;; owner: ryanc
-(require framework/preferences)
-(provide pref:get/set)
-
-(define (pref:get/set sym)
-  (case-lambda
-    [() (preferences:get sym)]
-    [(v) (preferences:set sym v)]))
diff --git a/pkgs/gui-pkgs/gui-lib/unstable/private/notify.rkt b/pkgs/gui-pkgs/gui-lib/unstable/private/notify.rkt
deleted file mode 100644
index fa63a89098..0000000000
--- a/pkgs/gui-pkgs/gui-lib/unstable/private/notify.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang racket/base
-;; owner: ryanc
-(require (for-syntax racket/base syntax/parse racket/syntax)
-         racket/class)
-(provide define-notify
-         notify-box%
-         notify-box/pref)
-
-;; Non-gui parts of notify-boxes
-;; Worth splitting into two libraries?
-;; Probably not, very few non-gui uses of classes.
-
-(define-for-syntax (mk-init name)
-  (format-id name "init-~a" (syntax-e name)))
-(define-for-syntax (mk-get name)
-  (format-id name "get-~a" (syntax-e name)))
-(define-for-syntax (mk-set name)
-  (format-id name "set-~a" (syntax-e name)))
-(define-for-syntax (mk-listen name)
-  (format-id name "listen-~a" (syntax-e name)))
-
-(define-syntax (define-notify stx)
-  (syntax-parse stx
-    [(define-notify name:id
-       (~optional value:expr
-                  #:defaults ([value #'(new notify-box% (value #f))]))
-       (~optional (~and #:init-method init-method)))
-     (with-syntax ([init-name (mk-init #'name)]
-                   [get-name (mk-get #'name)]
-                   [set-name (mk-set #'name)]
-                   [listen-name (mk-listen #'name)])
-       (with-syntax ([(init-expr init-method-decl)
-                      (if (attribute init-method)
-                          (list #'(init-name)
-                                #'(define/public (init-name) value))
-                          (list #'value
-                                #'(begin)))])
-         (quasisyntax/loc stx
-           (begin (field [name init-expr])
-                  init-method-decl
-                  (define/public-final (get-name)
-                    (send name get))
-                  (define/public-final (set-name new-value)
-                    (send name set new-value))
-                  (define/public-final (listen-name listener)
-                    (send name listen listener))))))]))
-
-(define notify-box%
-  (class object%
-    (init value)
-    (define v value)
-    (define listeners null)
-
-    ;; get : -> value
-    ;; Fetch current value
-    (define/public (get)
-      v)
-
-    ;; set : value -> void
-    ;; Update value and notify listeners
-    (define/public (set nv)
-      (set! v nv)
-      (for-each (lambda (p) (p nv)) listeners))
-
-    ;; listen : (value -> void) -> void
-    ;; Add a listener
-    (define/public (listen p)
-      (set! listeners (cons p listeners)))
-
-    ;; remove-listener : (value -> void) -> void
-    (define/public (remove-listener p)
-      (set! listeners (remq p listeners)))
-
-    ;; remove-all-listeners : -> void
-    (define/public (remove-all-listeners)
-      (set! listeners null))
-
-    (super-new)))
-
-
-(define (notify-box/pref pref #:readonly? [readonly? #f])
-  (define nb (new notify-box% (value (pref))))
-  (send nb listen pref)
-  nb)
diff --git a/pkgs/gui-pkgs/gui-test/LICENSE.txt b/pkgs/gui-pkgs/gui-test/LICENSE.txt
deleted file mode 100644
index 13858009c3..0000000000
--- a/pkgs/gui-pkgs/gui-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-gui-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/gui-pkgs/gui-test/framework/info.rkt b/pkgs/gui-pkgs/gui-test/framework/info.rkt
deleted file mode 100644
index bb17d7a170..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all robby)))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/README b/pkgs/gui-pkgs/gui-test/framework/tests/README
deleted file mode 100644
index a039bfa326..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/README
+++ /dev/null
@@ -1,94 +0,0 @@
-(#|
-                      Framework Test Suite Overview
-
-Each test will rely on the successfully completion of all of the ones
-before it. In addition, all test suites rely on the sucessful
-completion of the engine test suites and the mzscheme test suites.
-
-All of these tests reside in PLTHOME/collects/tests/framework/
-
-There will be a main mzscheme process which will start up a new gracket
-as necessary for the test suites. Since some tests actually require
-gracket to exit in order to pass, this governor is required.
-
-To run a test use:
-
-   framework-test <test.rkt> ...
-
-where <test.rkt> is the name of one of the tests below.  Alternatively,
-pass no command-line arguments to run all of the tests.
-
-Some of the tests in this file are not yet present in the
-testing directory. They are planned future expansions of
-this test suite (and have been for some time....)
-
-OS X: you will have to click on the newly started gracket
-processes in the doc while the test suite runs or it will
-signal failures when there aren't any.
-
-- load: |# load.rkt #|
-
-  | This tests that the advertised ways of loading the framework at
-  | its components all work.
-
-- exit: |# exit.rkt #|
-
-  | This tests that exit:exit really exits and that the exit callbacks
-  | are actually run.
-
-- preferences: |# prefs.rkt #|
-
-  | This tests that preferences are saved and restored correctly, both
-  | immediately and across reboots of gracket.
-
-
-- individual object tests:
-
-  | These tests are simple object creation and basic operations.
-  | Each test assumes that the others pass; this may yield strange
-  | error messages when one fails.
-
-  - frames: |# frame.rkt #|
-  - canvases: |# canvas.rkt #|
-  - texts: |# text.rkt #|
-  - pasteboards: |# pasteboard.rkt #|
-
-- keybindings: |# keys.rkt #|
-
-  | This tests the misc (non-scheme) keybindings
-
-- searching: |# search.rkt #|
-
-  | This tests the search results
-
-- group tests: |# group-test.rkt #|
-
-  | make sure that mred:the-frame-group records frames correctly.
-  | fake user input expected.
-
-- number snip: |# number-snip.rkt #|
-
-  | some tests for the number-snip% class
-
-- scheme tests:
-
-  | Tests the scheme: section
-
-  |# racket.rkt #|
-
-- panel tests:
-
- |# panel.rkt #|
-
-- |# (interactive #| tests
-
-  | these tests require intervention by people. Clicking and whatnot
-
-  - panel:single |# panel-single.rkt #|
-
-  - garbage collection: |# mem.rkt #|
-
-    | These tests will create objects in various configurations and
-    | make sure that they are garbage collected
-
-|#))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/canvas.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/canvas.rkt
deleted file mode 100644
index cebe496e7c..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/canvas.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-(require "test-suite-utils.rkt")
-
-(module test racket/base)
-
-(define (test-creation class name)
-  (test
-   name
-   (lambda (x) (eq? 'passed x))
-   (lambda ()
-     (queue-sexp-to-mred
-      `(let* ([f (make-object frame:basic% "test canvas" #f 300 300)]
-	      [c (make-object ,class (send f get-area-container))])
-	 (send c set-editor (make-object text:wide-snip%))
-	 (send f show #t)))
-      (wait-for-frame "test canvas")
-      (queue-sexp-to-mred
-       `(send (get-top-level-focus-window) show #f))
-      'passed)))
-
-(test-creation '(canvas:basic-mixin editor-canvas%)
-	       'canvas:basic-mixin-creation)
-(test-creation 'canvas:basic%
-	       'canvas:basic%-creation)
-
-(test-creation '(canvas:wide-snip-mixin canvas:basic%)
-	       'canvas:wide-snip-mixin-creation)
-(test-creation 'canvas:wide-snip%
-	       'canvas:wide-snip%-creation)
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/debug.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/debug.rkt
deleted file mode 100644
index dc3332dffd..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/debug.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-(provide debug-printf debug-when)
-
-(module test racket/base)
-
-;; all of the steps in the tcp connection
-(define mz-tcp? #f)
-(define mr-tcp? mz-tcp?)
-
-;; administrative messages about preferences files and
-;; command line flags
-(define admin? #t)
-
-;; tests that passed and those that failed
-(define schedule? #t)
-
-;; all of the sexpression transactions between mz and mred
-(define messages? #f)
-
-(define-syntax (debug-when stx)
-  (syntax-case stx (mr-tcp mz-tcp admin schedule messages)
-    [(_ mr-tcp rest ...)   #'(when mr-tcp?      (let () rest ...))]
-    [(_ mz-tcp rest ...)   #'(when mz-tcp?      (let () rest ...))]
-    [(_ admin rest ...)    #'(when admin?       (let () rest ...))]
-    [(_ schedule rest ...) #'(when schedule?    (let () rest ...))]
-    [(_ messages rest ...) #'(when messages?    (let () rest ...))]
-    [(_ unk rest ...) (raise-syntax-error #f "unknown flag" stx #'unk)]))
-
-(define-syntax (debug-printf stx)
-  (syntax-case stx ()
-    [(_ flag fmt x ...)
-     #'(debug-when flag (printf ">> ~a: ~a" 'flag (format fmt x ...)))]))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/exit.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/exit.rkt
deleted file mode 100644
index 20452fd885..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/exit.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang racket/base
-(require "test-suite-utils.rkt")
-
-(module test racket/base)
-
-(test 'exit/no-prompt
-      (lambda (x)
-	(and (eq? x 'passed)
-	     (not (mred-running?))))
-      (lambda ()
-	(with-handlers ([eof-result? (lambda (x) 'passed)])
-	  (send-sexp-to-mred '(begin (exit:exit) (sleep/yield 1)))
-	  'failed)))
-
-(define tmp-file (build-path (find-system-path 'temp-dir) "framework-exit-test-suite"))
-;; need to test "on" callbacks
-(test 'exit-callback-called
-      (lambda (x)
-	(begin0 (and (file-exists? tmp-file) (not (mred-running?)))
-		(when (file-exists? tmp-file) (delete-file tmp-file))))
-
-      (lambda ()
-	(when (file-exists? tmp-file) (delete-file tmp-file))
-	(with-handlers ([eof-result? (lambda (x) 'passed)])
-	  (send-sexp-to-mred
-	   `(begin
-	      (exit:insert-can?-callback (lambda () (call-with-output-file (bytes->path ,(path->bytes tmp-file)) void) #t))
-	      (begin (exit:exit) (sleep/yield 1)))))))
-
-(test 'exit-callback-removed
-      (lambda (x) (and (eq? x 'passed) (not (mred-running?))))
-      (lambda ()
-	(with-handlers ([eof-result? (lambda (x) 'passed)])
-	  (send-sexp-to-mred
-	   `(begin
-	      ((exit:insert-can?-callback (lambda () (error 'called-exit-callback))))
-	      (begin (exit:exit) (sleep/yield 1)))))))
-
-(test 'exit-callback-stops-exit
-      (lambda (x) (eq? x 'passed))
-      (lambda ()
-	(begin0
-	 (send-sexp-to-mred
-	  `(begin
-	     (let ([rm-callback (exit:insert-can?-callback (lambda () #f))])
-	       (exit:exit)
-	       (rm-callback)
-	       'passed)))
-	 (with-handlers ([eof-result? (lambda (x) 'passed)])
-	   (send-sexp-to-mred
-	    `(exit:exit))))))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/frame.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/frame.rkt
deleted file mode 100644
index cb6caf5ce8..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/frame.rkt
+++ /dev/null
@@ -1,150 +0,0 @@
-#lang racket/base
-
-  (require "test-suite-utils.rkt")
-
-  (module test racket/base)
-  
-  (send-sexp-to-mred '(send (make-object frame:basic%
-                              "dummy to keep from quitting")
-                            show #t))
-  
-  (define (test-creation name class-expression . args)
-    (test
-     name
-     (lambda (x) (eq? 'passed x))
-     (lambda ()
-       (let ([frame-label
-              (queue-sexp-to-mred
-               `(let ([f (instantiate ,class-expression () ,@args)])
-                  (send f show #t)
-                  (send f get-label)))])
-         (wait-for-frame frame-label)
-         (queue-sexp-to-mred
-          '(send (get-top-level-focus-window) close))
-         'passed))))
-  
-  (test-creation
-   'basic%-creation
-   'frame:basic%
-   '(label "test"))
-  (test-creation
-   'basic-mixin-creation
-   '(frame:basic-mixin frame%)
-   '(label "test"))
-  
-  (test-creation
-   'info-mixin-creation
-   '(frame:info-mixin frame:basic%)
-   '(label "test"))
-  
-  (test-creation
-   'info%-creation
-   'frame:info%
-   '(label "test"))
-  
-  (test-creation
-   'text-info-mixin-creation
-   '(frame:text-info-mixin frame:info%)
-   '(label "test"))
-  (test-creation
-   'text-info%-creation
-   'frame:text-info%
-   '(label "test"))
-  
-  (test-creation
-   'pasteboard-info-mixin-creation
-   '(frame:pasteboard-info-mixin frame:info%)
-   '(label "test"))
-  
-  (test-creation
-   'pasteboard-info%-creation
-   'frame:pasteboard-info%
-   '(label "test"))
-  
-  (test-creation
-   'standard-menus%-creation
-   'frame:standard-menus%
-   '(label "test"))
-  
-  (test-creation
-   'standard-menus-mixin
-   '(frame:standard-menus-mixin frame:basic%)
-   '(label "test"))
-  
-  (test-creation
-   'text%-creation
-   'frame:text%)
-  (test-creation
-   'text-mixin-creation
-   '(frame:text-mixin frame:editor%))
-  (test-creation
-   'text-mixin-creation
-   '(frame:text-mixin frame:editor%))
-  
-  (test-creation
-   'searchable%-creation
-   'frame:searchable%)
-  (test-creation
-   'searchable-mixin
-   '(frame:searchable-mixin frame:text%))
-  
-  (test-creation
-   'pasteboard-mixin-creation
-   '(frame:pasteboard-mixin frame:editor%))
-  (test-creation
-   'pasteboard-mixin-creation
-   '(frame:pasteboard-mixin (frame:editor-mixin frame:standard-menus%)))
-  (test-creation
-   'pasteboard%-creation
-   'frame:pasteboard%)
-  
-  (define (test-open name class-expression)
-    (let* ([test-file-contents "test"]
-           [tmp-file-name "framework-tmp"]
-           [tmp-file (collection-file-path tmp-file-name "framework" "tests")])
-      (test
-       name
-       (lambda (x)
-         (when (file-exists? tmp-file)
-           (delete-file tmp-file))
-         (equal? x test-file-contents))
-       (lambda ()
-         (let ([frame-name 
-                (queue-sexp-to-mred
-                 `(let ([frame (new ,class-expression)])
-                    (preferences:set 'framework:file-dialogs 'common)
-                    (send frame show #t)
-                    (send frame get-label)))])
-           (wait-for-frame frame-name)
-           (send-sexp-to-mred
-            `(test:menu-select "File" "Open..."))
-           (wait-for-frame "Open File")
-           (call-with-output-file tmp-file
-             (lambda (port)
-               (display test-file-contents port))
-             #:exists 'truncate)
-           (queue-sexp-to-mred
-            `(send (find-labelled-window "Filename:") focus))
-           (send-sexp-to-mred
-            `(begin ,(case (system-type)
-                       [(macos macosx) `(test:keystroke #\a '(meta))]
-                       [(unix) `(test:keystroke #\a '(meta))]
-                       [(windows) `(test:keystroke #\a '(control))]
-                       [else (error 'file-open-dialog "unknown system type: ~a" (system-type))])
-                    (for-each test:keystroke
-                              (string->list ,(path->string tmp-file)))
-                    (test:keystroke #\return)))
-           (wait-for-frame tmp-file-name)
-           (begin0
-             (queue-sexp-to-mred
-              `(let* ([w (get-top-level-focus-window)])
-                 (send (send w get-editor) get-text)))
-             (send-sexp-to-mred
-              `(test:close-top-level-window (get-top-level-focus-window)))
-             (wait-for-frame frame-name)
-             (queue-sexp-to-mred
-              `(send (get-top-level-focus-window) close))))))))
-  
-  (test-open "frame:searchable open" 'frame:searchable%)
-  (test-open "frame:text open" 'frame:text%)
-
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/framework-test b/pkgs/gui-pkgs/gui-test/framework/tests/framework-test
deleted file mode 100755
index d7a8b64027..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/framework-test
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# {{{ here
-# Make this PATH-independent
-saveP="$PATH"
-PATH="/usr/bin:/bin"
-
-# imitate possibly-missing readlink
-readlink() {
-  ls -l -- "$1" | sed -e "s/^.* -> //"
-}
-
-# Remember current directory
-saveD=`pwd`
-
-# Find absolute path to this script,
-# resolving symbolic references to the end
-# (changes the current directory):
-D=`dirname "$0"`
-F=`basename "$0"`
-cd "$D"
-while test -h "$F"; do
-  P=`readlink "$F"`
-  D=`dirname "$P"`
-  F=`basename "$P"`
-  cd "$D"
-done
-D=`pwd`
-
-# Restore current directory
-cd "$saveD"
-
-here="$D"
-PATH="$saveP"
-# }}} here
-
-exec "$here/../../../bin/mzscheme" "$here/main.ss" "$@"
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/framework-test-engine b/pkgs/gui-pkgs/gui-test/framework/tests/framework-test-engine
deleted file mode 100755
index 911b88cf6e..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/framework-test-engine
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec gracket -u framework-test-engine.rkt "$@"
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/framework-test-engine.icns b/pkgs/gui-pkgs/gui-test/framework/tests/framework-test-engine.icns
deleted file mode 100644
index 4dbb8be9d3..0000000000
Binary files a/pkgs/gui-pkgs/gui-test/framework/tests/framework-test-engine.icns and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/framework-test-engine.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/framework-test-engine.rkt
deleted file mode 100644
index eb30250400..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/framework-test-engine.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-(require mzlib/pconvert
-         racket/tcp
-         racket/class
-         racket/gui/base
-         "debug.rkt")
-
-(module test racket/base)
-
-(define errs null)
-(define sema (make-semaphore 1))
-(define (protect f)
-  (semaphore-wait sema)
-  (begin0 (f)
-          (semaphore-post sema)))
-
-(define (exception->string x)
-  (if (exn? x)
-      (let ([p (open-output-string)])
-        (parameterize ([current-error-port p])
-          ((error-display-handler) (exn-message x) x))
-        (get-output-string p))
-      (format "uncaught exn: ~s" x)))
-
-(namespace-require 'racket/gui)
-
-(eval '(define (queue-callback/res thunk)
-         (define c (make-channel))
-         (queue-callback (λ () (channel-put c (thunk))))
-         (channel-get c)))
-
-(void
- (thread
-  (lambda ()
-    (with-handlers ([(lambda (x) #t)
-                     (lambda (x)
-                       (printf "test suite thread died: ~a\n"
-                               (if (exn? x)
-                                   (exception->string x)
-                                   (format "~s" x))))])
-      (let ([port (call-with-input-file
-                      (build-path (find-system-path 'temp-dir)
-                                  "framework-tests-receive-sexps-port.rkt")
-                    read)])
-        (debug-printf mr-tcp "about to connect to ~a\n" port)
-        (let*-values ([(in out) (tcp-connect "127.0.0.1" port)])
-          (let loop ()
-            (debug-printf mr-tcp "about to read\n")
-            (let ([sexp (read in)])
-              (if (eof-object? sexp)
-                  (begin
-                    (debug-printf mr-tcp "got eof\n")
-                    (close-input-port in)
-                    (close-output-port out)
-                    (exit))
-                  (begin
-                    (debug-printf mr-tcp "got expression to evaluate\n")
-                    (write
-                     (let ([these-errs (protect (lambda () (begin0 errs (set! errs null))))])
-                       (if (null? these-errs)
-                           (with-handlers ([(lambda (x) #t)
-                                            (lambda (x) (list 'error (exception->string x)))])
-                             (list 'normal (print-convert (eval sexp))))
-                           (list 'last-error
-                                 (apply string-append
-                                        (map (lambda (x) (string-append (exception->string x) (string #\newline)))
-                                             these-errs)))))
-                     out)
-                    (newline out)
-                    (flush-output out)
-                    (loop)))))))))))
-
-(let ([od (event-dispatch-handler)]
-      [port (current-output-port)])
-  (event-dispatch-handler
-   (lambda (evt)
-     (parameterize ([uncaught-exception-handler
-                     (let ([oe (uncaught-exception-handler)])
-                       (lambda (exn)
-                         (protect
-                          (lambda ()
-                            (set! errs (cons exn errs))))
-                         (oe exn)))])
-       (call-with-exception-handler
-        (lambda (exn)
-          ((uncaught-exception-handler) exn))
-        (lambda ()
-          (od evt)))))))
-
-(yield (make-semaphore 0))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/group-test.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/group-test.rkt
deleted file mode 100644
index cd717b7f63..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/group-test.rkt
+++ /dev/null
@@ -1,188 +0,0 @@
-#lang racket/base
-(require "test-suite-utils.rkt")
-
-(module test racket/base)
-
-(define windows-menu-prefix 
-  (let ([basics (list "Bring Frame to Front..." "Most Recent Window" 
-                      #f)])
-    (if (eq? (system-type) 'macosx)
-        (list* "Minimize" "Zoom" basics)
-        basics)))
-(send-sexp-to-mred
- '(define-syntax car*
-    (syntax-rules ()
-      [(car* x) (if (pair? x)
-                    (car x)
-                    (error 'car* "got a non-pair for ~s" 'x))])))
-
-;; this test uses a new eventspace so that the gracket function
-;; current-eventspace-has-standard-menus? returns #f and thus
-;; all of the platforms behave the same way.
-(test
- 'exit-on
- (lambda (x) (equal? x '("first")))
- (lambda ()
-   (send-sexp-to-mred `(define new-eventspace (make-eventspace)))
-   (send-sexp-to-mred
-    '(begin (parameterize ([current-eventspace new-eventspace])
-              (send (make-object frame:basic% "first") show #t))
-            (preferences:set 'framework:verify-exit #t)))
-   (wait-for-frame "first" 'new-eventspace)
-   (send-sexp-to-mred
-    `(queue-callback (lambda () 
-                       (parameterize ([current-eventspace new-eventspace])
-                         (send (get-top-level-focus-window) close)))))
-   (wait-for-frame "Warning" 'new-eventspace)
-   (send-sexp-to-mred
-    `(parameterize ([current-eventspace new-eventspace])
-       (test:button-push "Cancel")))
-   (wait-for-frame "first" 'new-eventspace)
-   (send-sexp-to-mred
-    `(parameterize ([current-eventspace new-eventspace])
-       (map (lambda (x) (send x get-label))
-            (send (group:get-the-frame-group) get-frames))))))
-
-;; after the first test, we should have one frame that will always
-;; be in the group.
-
-(test
- 'one-frame-registered
- (lambda (x) (equal? x (list "test" "first")))
- (lambda ()
-   (queue-sexp-to-mred
-    `(send (make-object frame:basic% "test") show #t))
-   (wait-for-frame "test")
-   (queue-sexp-to-mred
-    `(begin0 (map (lambda (x) (send x get-label))
-                  (send (group:get-the-frame-group) get-frames))
-             (send (get-top-level-focus-window) close)))))
-
-(test
- 'two-frames-registered
- (lambda (x) (equal? x (list "test2" "test1" "first")))
- (lambda ()
-   (queue-sexp-to-mred
-    '(send (make-object frame:basic% "test1") show #t))
-   (wait-for-frame "test1")
-   (queue-sexp-to-mred
-    '(send (make-object frame:basic% "test2") show #t))
-   (wait-for-frame "test2")
-   (queue-sexp-to-mred
-    `(begin0 (let ([frames (send (group:get-the-frame-group) get-frames)])
-               (for-each (lambda (x)
-                           (unless (equal? (send x get-label) "first")
-                             (send x close)))
-                         frames)
-               (map (lambda (x) (send x get-label)) frames))))))
-
-(test
- 'one-frame-unregistered
- (lambda (x) (equal? x (list "test1" "first")))
- (lambda ()
-   (queue-sexp-to-mred
-    '(send (make-object frame:basic% "test1") show #t))
-   (wait-for-frame "test1")
-   (queue-sexp-to-mred
-    '(send (make-object frame:basic% "test2") show #t))
-   (wait-for-frame "test2")
-   (queue-sexp-to-mred
-    `(send (get-top-level-focus-window) close))
-   (queue-sexp-to-mred
-    `(let ([frames (send (group:get-the-frame-group) get-frames)])
-       (for-each (lambda (x)
-                   (unless (equal? (send x get-label) "first")
-                     (send x close)))
-                 frames)
-       (map (lambda (x) (send x get-label)) frames)))))
-
-(when (eq? (system-type) 'macosx)
-  
-  (test
-   'windows-menu
-   (lambda (x)
-     (equal? x (append windows-menu-prefix (list "first" "test"))))
-   (λ ()
-     (queue-sexp-to-mred
-      '(let ([frame (make-object frame:basic% "test")])
-         (send frame show #t)))
-     (wait-for-frame "test")
-     (queue-sexp-to-mred
-      '(let ([mb (send (get-top-level-focus-window) get-menu-bar)])
-         (send mb on-demand)
-         (define labels
-           (for/list ([x (send (car* (send mb get-items)) get-items)])
-             (and (is-a? x labelled-menu-item<%>) (send x get-label))))
-         (send (get-top-level-focus-window) close)
-         labels))))
-  
-  (test
-   'windows-menu-unshown
-   (lambda (x)
-     (equal? x (append windows-menu-prefix (list "first" "test"))))
-   (lambda ()
-     (queue-sexp-to-mred
-      '(let ([frame1 (make-object frame:basic% "test")]
-             [frame2 (make-object frame:basic% "test-not-shown")])
-         (send frame1 show #t)))
-     (wait-for-frame "test")
-     (queue-sexp-to-mred
-      '(let ([mb (send (get-top-level-focus-window) get-menu-bar)])
-         (send mb on-demand)
-         (define items
-           (for/list ([x (send (car* (send mb get-items)) get-items)])
-             (and (is-a? x labelled-menu-item<%>) (send x get-label))))
-         (send (get-top-level-focus-window) close)
-         items))))
-  
-  (test
-   'windows-menu-sorted1
-   (lambda (x)
-     (equal? x (append windows-menu-prefix (list "aaa" "bbb" "first"))))
-   (lambda ()
-     (queue-sexp-to-mred
-      '(let ([frame (make-object frame:basic% "aaa")])
-         (send frame show #t)))
-     (wait-for-frame "aaa")
-     (queue-sexp-to-mred
-      '(let ([frame (make-object frame:basic% "bbb")])
-         (send frame show #t)))
-     (wait-for-frame "bbb")
-     (queue-sexp-to-mred
-      `(let ([frames (send (group:get-the-frame-group) get-frames)])
-         (define mb (send (car* frames) get-menu-bar))
-         (send mb on-demand)
-         (begin0 (map (lambda (x)
-                        (and (is-a? x labelled-menu-item<%>) (send x get-label)))
-                      (send (car* (send mb get-items))
-                            get-items))
-                 (for-each (lambda (x)
-                             (unless (equal? (send x get-label) "first")
-                               (send x close)))
-                           frames))))))
-  
-  (test
-   'windows-menu-sorted2
-   (lambda (x)
-     (equal? x (append windows-menu-prefix (list "aaa" "bbb" "first"))))
-   (lambda ()
-     (queue-sexp-to-mred
-      '(let ([frame (make-object frame:basic% "bbb")])
-         (send frame show #t)))
-     (wait-for-frame "bbb")
-     (queue-sexp-to-mred
-      '(let ([frame (make-object frame:basic% "aaa")])
-         (send frame show #t)))
-     (wait-for-frame "aaa")
-     (queue-sexp-to-mred
-      `(let ([frames (send (group:get-the-frame-group) get-frames)])
-         (define mb (send (car* frames) get-menu-bar))
-         (send mb on-demand)
-         (begin0 (map (lambda (x)
-                        (and (is-a? x labelled-menu-item<%>) (send x get-label)))
-                      (send (car* (send mb get-items))
-                            get-items))
-                 (for-each (lambda (x)
-                             (unless (equal? (send x get-label) "first")
-                               (send x close)))
-                           frames)))))))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/handler-test.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/handler-test.rkt
deleted file mode 100644
index dd1d229a99..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/handler-test.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-(module handler-test mzscheme
-  (require "test-suite-utils.rkt")
-
-(module test racket/base)
-
-(let* ([filename "framework-group-test.rkt"]
-       [tmp-filename (build-path (find-system-path 'temp-dir) filename)])
-
-  (test
-   'file-opened
-   (lambda (x) (equal? (list filename "GRacket REPL") x))
-   (lambda ()
-     (send-sexp-to-mred
-      `(begin (handler:edit-file ,tmp-filename)
-	      (void)))
-     (wait-for-frame filename)
-     (send-sexp-to-mred
-      `(begin0 (map (lambda (x) (send x get-label)) (get-top-level-windows))
-               (send (car (get-top-level-windows)) close)))))
-
-  (test
-   'files-opened-twice
-   (lambda (x) (equal? (list filename "GRacket REPL") x))
-   (lambda ()
-     (send-sexp-to-mred
-      `(begin (handler:edit-file ,tmp-filename)
-	      (void)))
-     (wait-for-frame filename)
-     (send-sexp-to-mred
-      `(begin (handler:edit-file ,tmp-filename)
-	      (void)))
-     (wait-for-frame filename)
-     (send-sexp-to-mred
-      `(begin0 (map (lambda (x) (send x get-label)) (get-top-level-windows))
-               (send (car (get-top-level-windows)) close)))))
-
-  (test
-   'file-opened-in-editor
-   (lambda (x) (equal? filename x))
-   (lambda ()
-     (send-sexp-to-mred
-      `(begin (handler:edit-file ,tmp-filename)
-	      (void)))
-     (wait-for-frame filename)
-     (send-sexp-to-mred
-      `(let ([f (car (get-top-level-windows))])
-	 (send (send f get-editor) get-filename))))))
-
-)
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/keys.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/keys.rkt
deleted file mode 100644
index b635de3c37..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/keys.rkt
+++ /dev/null
@@ -1,449 +0,0 @@
-#lang racket/base
-
-(require "test-suite-utils.rkt")
-
-(module test racket/base)
-  
-  (test
-   'keymap:aug-keymap%/get-table
-   (lambda (x)
-     (equal? '((c:k "abc")) x))
-   (lambda ()
-     (queue-sexp-to-mred
-      '(let ([k (make-object keymap:aug-keymap%)])
-         (send k add-function "abc" void)
-         (send k map-function "c:k" "abc")
-         (hash-map (send k get-map-function-table) list)))))
-  
-  (test
-   'keymap:aug-keymap%/get-table/ht
-   (lambda (x)
-     (equal? x '((c:k "def"))))
-   (lambda ()
-     (queue-sexp-to-mred
-      '(let ([k (make-object keymap:aug-keymap%)]
-             [ht (make-hasheq)])
-         (send k add-function "abc" void)
-         (send k map-function "c:k" "abc")
-         (hash-set! ht 'c:k "def")
-         (hash-map (send k get-map-function-table/ht ht) list)))))
-  
-  (test
-   'keymap:aug-keymap%/get-table/chain1
-   (lambda (x)
-     (equal? x '((c:k "abc-k2"))))
-   (lambda ()
-     (queue-sexp-to-mred
-      '(let ([k (make-object keymap:aug-keymap%)]
-             [k1 (make-object keymap:aug-keymap%)]
-             [k2 (make-object keymap:aug-keymap%)])
-         (send k1 add-function "abc-k1" void)
-         (send k1 map-function "c:k" "abc-k1")
-         (send k2 add-function "abc-k2" void)
-         (send k2 map-function "c:k" "abc-k2")
-         (send k chain-to-keymap k1 #t)
-         (send k chain-to-keymap k2 #t)
-         (hash-map (send k get-map-function-table) list)))))
-  
-  (test
-   'keymap:aug-keymap%/get-table/chain/2
-   (lambda (x)
-     (equal? x '((c:k "abc-k"))))
-   (lambda ()
-     (queue-sexp-to-mred
-      '(let ([k (make-object keymap:aug-keymap%)]
-             [k1 (make-object keymap:aug-keymap%)])
-         (send k1 add-function "abc-k1" void)
-         (send k1 map-function "c:k" "abc-k1")
-         (send k add-function "abc-k" void)
-         (send k map-function "c:k" "abc-k")
-         (send k chain-to-keymap k1 #t)
-         (hash-map (send k get-map-function-table) list)))))
-  
-  (test
-   'keymap:aug-keymap%/get-table/normalize-case
-   (lambda (x)
-     (equal? x '((|esc;p| "abc-k2"))))
-   (lambda ()
-     (queue-sexp-to-mred
-      '(let ([k (make-object keymap:aug-keymap%)]
-             [k1 (make-object keymap:aug-keymap%)])
-         (send k1 add-function "abc-k1" void)
-         (send k1 map-function "esc;p" "abc-k1")
-         (send k add-function "abc-k2" void)
-         (send k map-function "ESC;p" "abc-k2")
-         (send k chain-to-keymap k1 #t)
-         (hash-map (send k get-map-function-table) list)))))
-  
-  (define (test-canonicalize name str1 str2)
-    (test
-     (string->symbol (format "keymap:canonicalize-keybinding-string/~a" name))
-     (lambda (x)
-       (string=? x str2))
-     (lambda ()
-       (queue-sexp-to-mred
-        `(keymap:canonicalize-keybinding-string ,str1)))))
-  
-  (test-canonicalize 1 "c:a" "c:a")
-  (test-canonicalize 2 "d:a" "d:a")
-  (test-canonicalize 3 "m:a" "m:a")
-  (test-canonicalize 4 "a:a" "a:a")
-  (test-canonicalize 5 "s:a" "s:a")
-  (test-canonicalize 6 "c:a" "c:a")
-  (test-canonicalize 7 "s:m:d:c:a:a" "a:c:d:m:s:a")
-  (test-canonicalize 8 "~s:~m:~d:~c:~a:a" "~a:~c:~d:~m:~s:a")
-  (test-canonicalize 9 ":a" "~a:~c:~d:~m:~s:a")
-  (test-canonicalize 10 ":d:a" "~a:~c:d:~m:~s:a")
-  (test-canonicalize 11 "esc;s:a" "esc;s:a")
-  (test-canonicalize 12 "s:a;esc" "s:a;esc")
-  (test-canonicalize 13 "ESC;p" "esc;p")
-  (test-canonicalize 14 "?:a:v" "?:a:v")
-  (test-canonicalize 15 "a:?:v" "?:a:v")
-  (test-canonicalize 16 "l:v" "l:v")
-  (test-canonicalize 17 "c:l:v" "c:l:v")
-  
-  
-  ;; a key-spec is (make-key-spec buff-spec buff-spec (listof ?) (listof ?) (listof ?))
-  ;; a key-spec represents a test case for a key; 'before' contains the
-  ;; content of a buffer, and 'after' represents the desired content of the
-  ;; buffer after the keypress.  The keypress(es) in question are specified
-  ;; independently for the three platforms by the respective 'macos', 'unix',
-  ;; and 'windows' fields.
-  (define-struct key-spec (before after macos unix windows) #:prefab)
-  
-  ;; an abstraction to use when all platforms have the same sequence of keys
-  (define (make-key-spec/allplatforms before after keys)
-    (make-key-spec before after keys keys keys))
-  
-  ;; a buff-spec is (make-buff-spec string nat nat)
-  ;; a buff-spec represents a buffer state; the content of the buffer,
-  ;; and the start and end of the highlighted region.
-  ;; the overwrite? field specifies if the overwrite mode is enabled during the test
-  ;;    (its value is ignored for the result checking)
-  (define-struct buff-spec (string start end overwrite?) #:prefab)
-  
-  (define (build-buff-spec string start end #:overwrite? [overwrite? #f])
-    (make-buff-spec string start end overwrite?))
-
-  ;; the keybindings test cases applied to frame:text% editors
-  (define global-specs
-    (list
-     (make-key-spec (build-buff-spec "abc" 1 1)
-                    (build-buff-spec "abc" 2 2)
-                    (list '((#\f control)) '((right)))
-                    (list '((#\f control)) '((right)))
-                    (list '((#\f control)) '((right))))
-     
-     (make-key-spec/allplatforms (build-buff-spec "\n\n\n\n" 2 2)
-                                 (build-buff-spec "\n" 0 0)
-                                 '(((#\x control) (#\o control))))
-     (make-key-spec/allplatforms (build-buff-spec "  \n  \n  \n  \n" 7 7)
-                                 (build-buff-spec "  \n" 1 1)
-                                 '(((#\x control) (#\o control))))
-     (make-key-spec/allplatforms (build-buff-spec "\n\n\n\n" 0 0)
-                                 (build-buff-spec "\n" 0 0)
-                                 '(((#\x control) (#\o control))))
-     (make-key-spec/allplatforms (build-buff-spec "abcdef\n\n\n\nxyzpdq\n" 8 8)
-                                 (build-buff-spec "abcdef\n\nxyzpdq\n" 7 7)
-                                 '(((#\x control) (#\o control))))
-     
-     ;; TeX-compress tests
-     (make-key-spec/allplatforms 
-      (build-buff-spec "\\ome" 4 4)
-      (build-buff-spec "ω" 1 1)
-      '(((#\\ control))))
-     (make-key-spec/allplatforms 
-      (build-buff-spec "\\sub" 4 4)
-      (build-buff-spec "\\subset" 7 7)
-      '(((#\\ control))))
-     (make-key-spec/allplatforms 
-      (build-buff-spec "\\subset" 7 7)
-      (build-buff-spec "⊂" 1 1)
-      '(((#\\ control))))
-     (make-key-spec/allplatforms 
-      (build-buff-spec "\\sub" 4 4)
-      (build-buff-spec "⊆" 1 1)
-      '(((#\\ control) (#\e) (#\\ control))))))
-  
-  (define (build-open-bracket-spec str pos char)
-    (make-key-spec (build-buff-spec str pos pos)
-                   (build-buff-spec 
-                    (string-append (substring str 0 pos)
-                                   (string char)
-                                   (substring str pos (string-length str)))
-                    (+ pos 1)
-                    (+ pos 1))
-                   (list (list (list #\[)))
-                   (list (list (list #\[)))
-                   (list (list (list #\[)))))
-  
-  (define (ascii-art-box-spec before after)
-    (make-key-spec/allplatforms (build-buff-spec before 0 0) 
-                                (build-buff-spec after 0 0)
-                                (list '((#\x control) (#\r) (#\a)))))
-  
-  ;; the keybindings test cases applied to racket:text% editors
-  (define scheme-specs
-    (list 
-     (make-key-spec (build-buff-spec "(abc (def))" 4 4)
-                    (build-buff-spec "(abc (def))" 10 10)
-                    (list '((right alt)))
-                    (list '((right alt)))
-                    (list '((right alt))))
-     (make-key-spec (build-buff-spec "'(abc (def))" 1 1)
-                    (build-buff-spec "'(abc (def))" 12 12)
-                    (list '((right alt)))
-                    (list '((right alt)))
-                    (list '((right alt))))
-     #|
-     (make-key-spec (build-buff-spec "'(abc (def))" 0 0)
-                    (build-buff-spec "'(abc (def))" 12 12)
-                    (list '(right alt))
-                    (list '(right alt))
-                    (list '(right alt)))
-     (make-key-spec (build-buff-spec "'(abc (def))" 12 12)
-                    (build-buff-spec "'(abc (def))" 0 0)
-                    (list '(left alt))
-                    (list '(left alt))
-                    (list '(left alt)))
-|#
-     (build-open-bracket-spec "" 0 #\()
-     (build-open-bracket-spec "(f cond " 8 #\()
-     (build-open-bracket-spec "(f let (" 8 #\()
-     (build-open-bracket-spec "(let (" 6 #\[)
-     (build-open-bracket-spec "(let (" 5 #\()
-     (build-open-bracket-spec "(provide/contract " 18 #\[)
-     (build-open-bracket-spec "(kond " 5 #\()
-     (build-open-bracket-spec "(cond " 5 #\[)
-     (build-open-bracket-spec "(case-lambda " 13 #\[)
-     (build-open-bracket-spec "(let ([]" 8 #\[)
-     (build-open-bracket-spec "(let ({}" 8 #\{)
-     (build-open-bracket-spec "()" 2 #\()
-     (build-open-bracket-spec "(let (;;" 8 #\[)
-     (build-open-bracket-spec ";" 1 #\[)
-     (build-open-bracket-spec "\"" 1 #\[)
-     (build-open-bracket-spec "\"\"" 1 #\[)
-     (build-open-bracket-spec "||" 1 #\[)
-     (build-open-bracket-spec "" 0 #\()
-     (build-open-bracket-spec "(let (" 6 #\[)
-     (build-open-bracket-spec "(new x% " 8 #\[)
-     (build-open-bracket-spec "#\\" 2 #\[)
-     (build-open-bracket-spec "#\\a" 2 #\[)
-     (build-open-bracket-spec "(let ([let (" 12 #\()
-     (build-open-bracket-spec "ab" 1 #\()
-     (build-open-bracket-spec "|ab|" 2 #\[)
-     (build-open-bracket-spec "(let loop " 10 #\()
-     (build-open-bracket-spec "(let loop (" 11 #\[)
-     (build-open-bracket-spec "(case x " 8 #\[)
-     (build-open-bracket-spec "(case x [" 9 #\()
-     (build-open-bracket-spec "(let ([])(" 10 #\()
-     (build-open-bracket-spec "(local " 7 #\[)
-     (build-open-bracket-spec "(local []" 9 #\()
-     ;; test to show that multi-keystrokes works:
-     (make-key-spec/allplatforms
-      (build-buff-spec "" 0 0) 
-      (build-buff-spec "zx" 2 2)
-      (list '((#\z) (#\x))))
-     ;; remove-enclosing-parens :
-     (make-key-spec/allplatforms
-      (build-buff-spec "(abc def)" 1 1)
-      (build-buff-spec "abc" 0 0)
-      (list '((#\c control) (#\o control))))
-     ;; (is this the desired behavior?):
-     (make-key-spec/allplatforms
-      (build-buff-spec "(abc def)" 2 3)
-      (build-buff-spec "bc" 0 0)
-      (list '((#\c control) (#\o control))))
-     ;; insert-()-pair :
-     (make-key-spec
-      (build-buff-spec "abc" 0 0)
-      (build-buff-spec "()abc" 1 1)
-      (list '((escape) (#\()))
-      (list '((#\( meta)))
-      (list '((escape) (#\())))
-     (make-key-spec
-      (build-buff-spec "abc" 0 2)
-      (build-buff-spec "(ab)c" 1 1)
-      (list '((escape) (#\()))
-      (list '((#\( meta)))
-      (list '((escape) (#\())))
-     ;; toggle-square-round-parens :
-     ; () -> []
-     (make-key-spec/allplatforms
-      (build-buff-spec "(a)" 0 0)
-      (build-buff-spec "[a]" 0 0)
-      (list '((#\c control) (#\[ control))))
-     ; [] -> ()
-     (make-key-spec/allplatforms
-      (build-buff-spec "[a]" 0 0)
-      (build-buff-spec "(a)" 0 0)
-      (list '((#\c control) (#\[ control))))
-     ; enclosed sexps
-     (make-key-spec/allplatforms
-      (build-buff-spec "[a (def )b]" 0 0)
-      (build-buff-spec "(a (def )b)" 0 0)
-      (list '((#\c control) (#\[ control))))
-     ; extra preceding whitespace
-     (make-key-spec/allplatforms
-      (build-buff-spec "  \n [a (def )b]" 0 0)
-      (build-buff-spec "  \n (a (def )b)" 0 0)
-      (list '((#\c control) (#\[ control))))
-     ; cursor not at beginning of buffer
-     (make-key-spec/allplatforms
-      (build-buff-spec "  \n [a (def )b]" 1 1)
-      (build-buff-spec "  \n (a (def )b)" 1 1)
-      (list '((#\c control) (#\[ control))))
-     ; intervening non-paren sexp
-     (make-key-spec/allplatforms
-      (build-buff-spec "  \nf [a (def )b]" 1 1)
-      (build-buff-spec "  \nf [a (def )b]" 1 1)
-      (list '((#\c control) (#\[ control))))
-     ;; at end of buffer (hence sexp-forward returns #f):
-     (make-key-spec/allplatforms
-      (build-buff-spec "[a]" 3 3)
-      (build-buff-spec "[a]" 3 3)
-      (list '((#\c control) (#\[ control))))
-     
-     (make-key-spec/allplatforms
-      (build-buff-spec "a" 0 0 #:overwrite? #t)
-      (build-buff-spec "b" 1 1)
-      (list '((#\b))))
-     
-     (make-key-spec/allplatforms
-      (build-buff-spec "a" 0 0 #:overwrite? #t)
-      (build-buff-spec "|" 1 1)
-      (list '((#\|))))
-     
-     (make-key-spec/allplatforms
-      (build-buff-spec "a" 0 0 #:overwrite? #t)
-      (build-buff-spec "(" 1 1)
-      (list '((#\())))
-     
-     (make-key-spec/allplatforms
-      (build-buff-spec "a" 0 0 #:overwrite? #t)
-      (build-buff-spec ")" 1 1)
-      (list '((#\)))))
-     
-     ;; needs to be in auto-adjut open paren mode
-     (make-key-spec/allplatforms
-      (build-buff-spec "a" 0 0 #:overwrite? #t)
-      (build-buff-spec "(" 1 1)
-      (list '((#\[))))
-     
-     (ascii-art-box-spec "+" "═")
-     (ascii-art-box-spec "x" "x")
-     (ascii-art-box-spec "+-+" "═══")
-     (ascii-art-box-spec "+\n|\n+\n" "║\n║\n║\n")
-     (ascii-art-box-spec (string-append "+-+\n"
-                                        "| |\n"
-                                        "+-+\n")
-                         (string-append "╔═╗\n"
-                                        "║ ║\n"
-                                        "╚═╝\n"))
-     (ascii-art-box-spec (string-append "+---+\n"
-                                        "| - |\n"
-                                        "|+ ||\n"
-                                        "+---+\n")
-                         (string-append "╔═══╗\n"
-                                        "║ - ║\n"
-                                        "║+ |║\n"
-                                        "╚═══╝\n"))
-     (ascii-art-box-spec (string-append "+-+-+\n"
-                                        "| | |\n"
-                                        "+-+-+\n"
-                                        "| | |\n"
-                                        "+-+-+\n")
-                         (string-append "╔═╦═╗\n"
-                                        "║ ║ ║\n"
-                                        "╠═╬═╣\n"
-                                        "║ ║ ║\n"
-                                        "╚═╩═╝\n"))))
-  
-  (define automatic-scheme-specs
-    (list (make-key-spec/allplatforms (build-buff-spec "" 0 0) 
-                                      (build-buff-spec "()" 1 1)
-                                      '(((#\())))
-          (make-key-spec/allplatforms (build-buff-spec "" 0 0) 
-                                      (build-buff-spec "[]" 1 1)
-                                      '(((#\[))))
-          (make-key-spec/allplatforms (build-buff-spec "" 0 0) 
-                                      (build-buff-spec "{}" 1 1)
-                                      '(((#\{))))
-          (make-key-spec/allplatforms (build-buff-spec "" 0 0) 
-                                      (build-buff-spec "\"\"" 1 1)
-                                      '(((#\"))))
-          (make-key-spec/allplatforms (build-buff-spec "" 0 0) 
-                                      (build-buff-spec "||" 1 1)
-                                      '(((#\|))))))
-  
-  (queue-sexp-to-mred `(send (make-object frame:basic% "dummy to trick frame group") show #t))
-  (wait-for-frame "dummy to trick frame group")
-  
-  ;; test-key : key-spec -> 
-  ;;   evaluates a test case represented as a key-spec
-  (define (test-key key-spec i)
-    (let* ([key-sequences 
-            ((case (system-type)
-               [(macos macosx) key-spec-macos]
-               [(unix) key-spec-unix]
-               [(windows) key-spec-windows])
-             key-spec)]
-           [before (key-spec-before key-spec)]
-           [after (key-spec-after key-spec)]
-           [process-key-sequence
-            (lambda (key-sequence)
-              (let ([text-expect (buff-spec-string after)]
-                    [start-expect (buff-spec-start after)]
-                    [end-expect (buff-spec-end after)])
-                (test (list key-sequence i)
-                      (lambda (x) (equal? x (vector text-expect start-expect end-expect)))
-                      `(let* ([qc (λ (t) (let ([c (make-channel)])
-                                           (queue-callback (λ () (channel-put c (t))))
-                                           (channel-get c)))]
-                              [text (qc (λ () (send (get-top-level-focus-window) get-editor)))])
-                         (qc (λ () 
-                               (send text set-overwrite-mode ,(buff-spec-overwrite? before))
-                               (send text erase)
-                               (send text insert ,(buff-spec-string before))
-                               (send text set-position ,(buff-spec-start before) ,(buff-spec-end before))))
-                         ,@(map (lambda (key) `(test:keystroke ',(car key) ',(cdr key)))
-                                key-sequence)
-                         (qc (λ ()
-                               (vector (send text get-text)
-                                       (send text get-start-position)
-                                       (send text get-end-position))))))))])
-      (for-each process-key-sequence key-sequences)))
-  
-  
-  (define (test-specs frame-name frame-class specs)
-    (queue-sexp-to-mred `(send (make-object ,frame-class ,frame-name) show #t))
-    (wait-for-frame frame-name)
-    (for ([spec (in-list specs)]
-          [i (in-naturals)])
-      (test-key spec i))
-    (queue-sexp-to-mred `(send (get-top-level-focus-window) close)))
-
-(define old-paren-adjusting-prefs
-  (queue-sexp-to-mred `(list (preferences:get 'framework:fixup-open-parens)
-                             (preferences:get 'framework:automatic-parens))))
-
-  
-  (queue-sexp-to-mred `(preferences:set 'framework:fixup-open-parens #t))
-  (queue-sexp-to-mred `(preferences:set 'framework:automatic-parens #f))
-  (test-specs "global keybindings test" 'frame:text% global-specs)
-  (test-specs "scheme mode keybindings test" 
-              '(class frame:editor%
-                 (define/override (get-editor%) racket:text%)
-                 (super-new))
-              scheme-specs)
-  (queue-sexp-to-mred `(preferences:set 'framework:automatic-parens #t))
-  (queue-sexp-to-mred `(preferences:set 'framework:fixup-open-parens #f))
-  (test-specs "scheme mode automatic-parens on keybindings test" 
-              '(class frame:editor%
-                 (define/override (get-editor%) racket:text%)
-                 (super-new))
-              automatic-scheme-specs)
-
-(queue-sexp-to-mred
- `(begin (preferences:set 'framework:fixup-open-parens ,(list-ref old-paren-adjusting-prefs 0))
-         (preferences:set 'framework:automatic-parens ,(list-ref old-paren-adjusting-prefs 1))))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/load.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/load.rkt
deleted file mode 100644
index 3f4987746f..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/load.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-(require "test-suite-utils.rkt")
-
-(module test racket/base)
-
-  (load-framework-automatically #f)
-
-  (define (test/load file exp)
-    (test
-     (string->symbol file)
-     void?
-     `(let ([mred-name ((current-module-name-resolver) 'mred #f #f #t)]
-            [orig-namespace (current-namespace)])
-        (parameterize ([current-namespace (make-base-namespace)])
-          (namespace-attach-module orig-namespace mred-name)
-          (eval '(require (lib ,file "framework")))
-          (with-handlers ([(lambda (x) #t)
-                           (lambda (x)
-                             (if (exn? x)
-                                 (exn-message x)
-                                 (format "~s" x)))])
-            (eval ',exp)
-            (void))))))
-
- 
-  (test/load "gui-utils.rkt" 'gui-utils:next-untitled-name)
-  (test/load "test.rkt" 'test:run-interval)
-  (test/load "splash.rkt" 'start-splash)
-  (test/load "framework-sig.rkt" '(begin (eval '(require mzlib/unit))
-                                        (eval '(define-signature dummy-signature^ ((open framework^))))))
-  (test/load "framework-unit.rkt" 'framework@)
-  (test/load "framework.rkt" '(list test:button-push
-                                    gui-utils:next-untitled-name
-                                    frame:basic-mixin))
-  
-  ;; ensures that all of the names in the signature are provided
-  ;; by (require framework)
-  (test/load
-   "framework.rkt"
-   ;; these extra evals let me submit multiple, independent top-level
-   ;; expressions in the newly created namespace.
-   '(begin (eval '(require mzlib/unit))
-           (eval '(require (for-syntax scheme/base)))
-           (eval '(require (for-syntax scheme/unit-exptime)))
-           (eval '(define-syntax (signature->symbols stx)
-                    (syntax-case stx ()
-                      [(_ sig)
-                       (let-values ([(_1 eles _2 _3) (signature-members #'sig #'whatever)])
-                         (with-syntax ([eles eles])
-                           #''eles))])))
-           (eval '(require framework/framework-sig))
-           (eval '(for-each eval (signature->symbols framework^)))))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/main.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/main.rkt
deleted file mode 100644
index 14e625d92b..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/main.rkt
+++ /dev/null
@@ -1,124 +0,0 @@
-#lang racket/base
-(require launcher
-         racket/cmdline
-         racket/unit
-         "debug.rkt"
-         "test-suite-utils.rkt")
-
-(define preferences-file (find-system-path 'pref-file))
-
-(define old-preferences-file
-  (let-values ([(base name _2) (split-path preferences-file)])
-    (build-path base (string-append (path-element->string name) ".save"))))
-
-(define-values (all-files interactive-files)
-  (let* ([files (call-with-input-file (collection-file-path "README" "framework" "tests")
-                  read)]
-         [files (map (lambda (x)
-                       (cond [(symbol? x) (symbol->string x)]
-                             [(pair? x) (cons (car x) (map symbol->string
-                                                           (cdr x)))]
-                             [else (error "bad specs in README")]))
-                     files)]
-         [all (map (lambda (x) (if (pair? x) (cdr x) (list x))) files)]
-         [interactive (map (lambda (x)
-                             (if (and (pair? x) (eq? 'interactive (car x)))
-                               (cdr x) '()))
-                           files)])
-    (values (apply append all) (apply append interactive))))
-
-(define all? #f)
-(define batch? #f) ; non-interactive (implied by no test-file args)
-(define files-to-process null)
-(define command-line-flags
-  `((once-each
-     [("-a" "--all")
-      ,(lambda (flag) (set! all? #t))
-      ("Run all of the tests")])
-    (multi
-     [("-o" "--only")
-      ,(lambda (flag _only-these-tests)
-         (set-only-these-tests! (cons (string->symbol _only-these-tests)
-                                      (or (get-only-these-tests) null))))
-      ("Only run test named <test-name>" "test-name")])))
-
-(parse-command-line
- "framework-test" (current-command-line-arguments) command-line-flags
- (lambda (collected . files)
-   (when (null? files) (set! batch? #t))
-   (let* ([throwouts (remove* all-files files)]
-          [files (remove* throwouts files)])
-     (when (not (null? throwouts))
-       (debug-printf admin "   ignoring files that don't occur in all-files: ~s\n" throwouts))
-     (set! files-to-process
-           (cond [all?   all-files]
-                 [batch? (remove* interactive-files all-files)]
-                 [else   files]))))
- `("Names of the tests; defaults to all non-interactive tests"))
-
-(when (file-exists? preferences-file)
-  (debug-printf admin "   saving prefs file ~a\n" preferences-file)
-  (debug-printf admin "                  to ~a\n" old-preferences-file)
-  (if (file-exists? old-preferences-file)
-    (debug-printf admin "   backup prefs file exists, using that one\n")
-    (begin (copy-file preferences-file old-preferences-file)
-           (debug-printf admin "   saved prefs file\n"))))
-
-(define jumped-out-tests '())
-
-(for-each
- (lambda (x)
-   (shutdown-mred)
-   (load-framework-automatically #t)
-   (let/ec k
-     (dynamic-wind
-       (lambda ()
-         (set! jumped-out-tests (cons x jumped-out-tests))
-         (set-section-name! x)
-         (set-section-jump! k))
-       (lambda ()
-         (with-handlers ([(lambda (_) #t)
-                          (lambda (exn)
-                            (debug-printf schedule "~a\n"
-                                          (if (exn? exn)
-                                              (exn->str exn)
-                                              exn)))])
-           (debug-printf schedule "beginning ~a test suite\n" x)
-           (dynamic-require `(lib ,x "framework" "tests") #f)
-           (set! jumped-out-tests (remq x jumped-out-tests))
-           (debug-printf schedule "PASSED ~a test suite\n" x)))
-       (lambda ()
-         (reset-section-name!)
-         (reset-section-jump!)))))
- files-to-process)
-
-(debug-printf schedule "ran ~a test~a\n" number-of-tests (if (= 1 number-of-tests) "" "s"))
-
-(when (file-exists? old-preferences-file)
-  (debug-printf admin "   restoring prefs file ~a\n" old-preferences-file)
-  (debug-printf admin "                     to ~a\n" preferences-file)
-  (delete-file preferences-file)
-  (copy-file old-preferences-file preferences-file)
-  (delete-file old-preferences-file)
-  (debug-printf admin "   restored prefs file\n"))
-
-(shutdown-listener)
-
-(exit (cond
-        [(not (null? jumped-out-tests))
-         (eprintf "Test suites ended with exns ~s\n" jumped-out-tests)
-         1]
-        [(null? failed-tests)
-         (printf "All tests passed.\n")
-         0]
-        [else
-         (eprintf "FAILED tests:\n")
-         (for-each (lambda (failed-test)
-                     (eprintf "  ~a // ~a\n"
-                              (car failed-test) (cdr failed-test)))
-                   failed-tests)
-         1]))
-
-(module+ test
-  (module config info
-    (define timeout 360)))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/mem.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/mem.rkt
deleted file mode 100644
index 891b3fe254..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/mem.rkt
+++ /dev/null
@@ -1,174 +0,0 @@
-#lang racket/base
-(require "test-suite-utils.rkt")
-
-(module test racket/base)
-
-; mem-boxes : (list-of (list string (list-of (weak-box TST))))
-(send-sexp-to-mred '(define mem-boxes null))
-
-(define mem-count 10)
-
-(define (test-allocate tag open close)
-  (queue-sexp-to-mred
-   `(let ([new-boxes
-           (let loop ([n ,mem-count])
-             (cond
-               [(zero? n) null]
-               [else
-                (let* ([o (,open)]
-                       [b (make-weak-box o)])
-                  (,close o)
-
-                  ;; break at least that link.
-                  (set! o #f)
-
-                  ;; flush pending events
-                  (let ([s (make-semaphore 0)])
-                    (queue-callback (lambda () (semaphore-post s)) #f)
-                    (yield s))
-
-                  (cons b (loop (- n 1))))]))])
-      (sleep/yield 1/10) (collect-garbage)
-      (sleep/yield 1/10) (collect-garbage)
-      (sleep/yield 1/10) (collect-garbage)
-      (set! mem-boxes (cons (list ,tag new-boxes) mem-boxes)))))
-
-(define (done)
-  (queue-sexp-to-mred
-   `(begin
-      (yield) (collect-garbage)
-      (yield) (collect-garbage)
-      (yield) (collect-garbage)
-      (yield) (collect-garbage)
-      (yield) (collect-garbage)
-      (yield) (collect-garbage)
-      (let* ([f (make-object dialog% "Results" #f 300 500)]
-             [text (make-object text%)]
-             [ec (make-object editor-canvas% f text)]
-             [hp (instantiate horizontal-panel% () 
-                   (parent f)
-                   (stretchable-width #f)
-                   (stretchable-height #f))]
-             [vp (instantiate vertical-panel% ()
-                   (parent hp)
-                   (stretchable-width #f)
-                   (stretchable-height #f))]
-             [gc-canvas (make-object canvas% hp '(border))]
-             [anything? #f])
-
-        (define (update-gui)
-          (send text erase)
-          (let ([anything? #f])
-            (send text begin-edit-sequence)
-            (for-each
-             (lambda (boxl)
-               (let* ([tag (car boxl)]
-                      [boxes (cadr boxl)]
-                      [calc-results
-                       (lambda ()
-                         (let loop ([boxes boxes]
-                                    [n 0])
-                           (cond
-                             [(null? boxes) n]
-                             [else (if (weak-box-value (car boxes))
-                                     (loop (cdr boxes) (+ n 1))
-                                     (loop (cdr boxes) n))])))])
-                 (let ([res (calc-results)])
-                   (when (> res 0)
-                     (set! anything? #t)
-                     (send text insert (format "~a: ~a of ~a\n" tag res ,mem-count))))))
-             (reverse mem-boxes))
-            (unless anything?
-              (send text insert "Nothing!\n"))
-            (send text end-edit-sequence)))
-
-        (update-gui)
-
-        (let ([onb (icon:get-gc-on-bitmap)]
-              [offb (icon:get-gc-off-bitmap)])
-          (when (and (send onb ok?)
-                     (send offb ok?))
-            (send* gc-canvas
-              (min-client-width (max (send gc-canvas min-width) (send onb get-width)))
-              (min-client-height (max (send gc-canvas min-height) (send onb get-height)))
-              (stretchable-width #f)
-              (stretchable-height #f))
-            (register-collecting-blit gc-canvas 
-                                      0 0
-                                      (send onb get-width)
-                                      (send onb get-height)
-                                      onb offb)))
-
-        (make-object button% "Collect" vp
-                     (lambda (x y)
-                       (send text erase)
-                       (send text insert "Collecting Garbage\n")
-                       (collect-garbage)(collect-garbage)(collect-garbage)
-                       (collect-garbage)(collect-garbage)(collect-garbage)
-                       (collect-garbage)(collect-garbage)(collect-garbage)
-                       (update-gui)))
-        (make-object button% "Close" vp (lambda (x y) (send f show #f)))
-        (send f show #t)))))
-
-(define (test-frame-allocate %)
-  (let ([name (format "~s" %)])
-    (queue-sexp-to-mred '(preferences:set 'framework:exit-when-no-frames #f))
-    (test-allocate name
-                   `(lambda ()
-                      (let ([f (make-object ,% ,name)])
-                        (send f show #t)
-                        (yield) (yield)
-                        f))
-                   `(lambda (f)
-                      (yield) (yield)
-                      (send f close)
-                      (when (send f is-shown?)
-                        (error 'test-frame-allocate "~a instance didn't close" ',%))
-                      (yield) (yield)))
-    (queue-sexp-to-mred '(preferences:set 'framework:exit-when-no-frames #t))))
-
-(test-allocate "frame%"
-               '(lambda ()
-                  (let ([f (make-object frame% "test frame")])
-                    (send f show #t)
-                    f))
-               '(lambda (f) (send f show #f)))
-
-(define (test-editor-allocate object-name)
-  (test-allocate (symbol->string object-name)
-                 `(lambda () (make-object ,object-name))
-                 '(lambda (e) (send e on-close))))
-
-(test-editor-allocate 'text:basic%)
-(test-editor-allocate 'text:keymap%)
-(test-editor-allocate 'text:autowrap%)
-(test-editor-allocate 'text:file%)
-(test-editor-allocate 'text:clever-file-format%)
-(test-editor-allocate 'text:backup-autosave%)
-(test-editor-allocate 'text:searching%)
-(test-editor-allocate 'text:info%)
-
-(test-editor-allocate 'pasteboard:basic%)
-(test-editor-allocate 'pasteboard:keymap%)
-(test-editor-allocate 'pasteboard:file%)
-(test-editor-allocate 'pasteboard:backup-autosave%)
-(test-editor-allocate 'pasteboard:info%)
-
-(test-editor-allocate 'racket:text%)
-
-(test-allocate "text:return%"
-               '(lambda () (make-object text:return% void))
-               '(lambda (t) (void)))
-
-(test-frame-allocate '(class frame% (inherit show) (define/public (close) (show #f)) (super-new)))
-(test-frame-allocate 'frame:basic%)
-(test-frame-allocate 'frame:info%)
-(test-frame-allocate 'frame:text-info%)
-(test-frame-allocate 'frame:pasteboard-info%)
-(test-frame-allocate 'frame:standard-menus%)
-
-(test-frame-allocate 'frame:text%)
-(test-frame-allocate 'frame:searchable%)
-
-(test-frame-allocate 'frame:pasteboard%)
-(done)
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/number-snip.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/number-snip.rkt
deleted file mode 100644
index 6804361a88..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/number-snip.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-(require "test-suite-utils.rkt")
-
-(test
- 'number-snip-convert-text
- (λ (x) (equal? "1/2" x))
- (lambda ()
-   (queue-sexp-to-mred
-    `((dynamic-require 'file/convertible 'convert)
-      (number-snip:make-fraction-snip 1/2 #f)
-      'text
-      #f))))
-
-(test
- 'number-snip-convert-png
- bytes?
- (lambda ()
-   (queue-sexp-to-mred
-    `((dynamic-require 'file/convertible 'convert)
-      (number-snip:make-fraction-snip 1/2 #f)
-      'png-bytes
-      #f))))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/panel-single.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/panel-single.rkt
deleted file mode 100644
index 1fd168c4d7..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/panel-single.rkt
+++ /dev/null
@@ -1,137 +0,0 @@
-#lang racket/base
-(require "test-suite-utils.rkt")
-
-(module test racket/base)
-
-(test 
- 'single-panel
- (lambda (x) (eq? x 'passed))
- (λ ()
-   (queue-sexp-to-mred
-    `(let* ([semaphore (make-semaphore 0)]
-            [semaphore-frame%
-             (class frame% 
-               (define/augment (on-close) (semaphore-post semaphore))
-               (super-new))]
-            [f (make-object semaphore-frame% "Single Panel Test")]
-            [blue-brush (send the-brush-list find-or-create-brush "navy" 'solid)]
-            [green-brush (send the-brush-list find-or-create-brush "lightblue" 'solid)]
-            [grid-canvas%
-             (class canvas% 
-               (init-field lines)
-               (init label)
-               (inherit get-dc get-client-size)
-               (override on-paint)
-               (define (on-paint)
-                 (let-values ([(width height) (get-client-size)])
-                   (let ([dc (get-dc)]
-                         [single-width (/ width lines)]
-                         [single-height (/ height lines)])
-                     (send dc set-pen "black" 1 'transparent)
-                     (let loop ([i lines])
-                       (cond
-                         [(zero? i) (void)]
-                         [else
-                          (let loop ([j lines])
-                            (cond
-                              [(zero? j) (void)]
-                              [else 
-                               (send dc set-brush
-                                     (if (= 0 (modulo (+ i j) 2))
-                                         blue-brush green-brush))
-                               (send dc draw-rectangle
-                                     (* single-width (- i 1))
-                                     (* single-height (- j 1))
-                                     single-width
-                                     single-height)
-                               (loop (- j 1))]))
-                          (loop (- i 1))])))))
-               (super-instantiate ())
-               
-               ;; soon to be obsolete, hopefully.
-               (inherit set-label)
-               (set-label label)
-               
-               (inherit min-width min-height)
-               (min-width 50)
-               (min-height 50))]
-            [border-panel (make-object horizontal-panel% f '(border))]
-            [single-panel (make-object panel:single% border-panel)]
-            [children
-             (list
-              (new grid-canvas% (lines 3) (parent single-panel) (label "Small") (stretchable-width #f) (stretchable-height #f))
-              (new grid-canvas% (lines 3) (parent single-panel) (label "Wide") (stretchable-width #t) (stretchable-height #f))
-              (new grid-canvas% (lines 3) (parent single-panel) (label "Tall") (stretchable-width #f) (stretchable-height #t))
-              (new grid-canvas% (lines 3) (parent single-panel) (label "Wide and Tall") (stretchable-width #t) (stretchable-height #t)))]
-            [active-child (car children)]
-            [radios (make-object horizontal-panel% f)]
-            [make-radio
-             (lambda (label choices callback)
-               (let* ([panel (make-object vertical-panel% radios '(border))]
-                      [message (make-object message% label panel)]
-                      [radio (make-object radio-box% #f choices panel (lambda (radio _) (callback radio)))]
-                      [button (make-object button%
-                                "Cycle" panel
-                                (lambda (_1 _2)
-                                  (let ([before (send radio get-selection)]
-                                        [tot (send radio get-number)])
-                                    (let loop ([n tot])
-                                      (unless (zero? n)
-                                        (send radio set-selection (- tot n))
-                                        (callback radio)
-                                        (sleep/yield 1)
-                                        (loop (- n 1))))
-                                    (send radio set-selection before)
-                                    (callback radio))))])
-                 radio))]
-            [radio
-             (make-radio
-              "Active Child"
-              (map (lambda (x) (send x get-label)) children)
-              (lambda (radio)
-                (let loop ([n (length children)]
-                           [cs children])
-                  (cond
-                    [(null? cs) (void)]
-                    [else (let ([c (car cs)])
-                            (if (string=? (send radio get-item-label (send radio get-selection))
-                                          (send c get-label))
-                                (begin (set! active-child c)
-                                       (send single-panel active-child active-child))
-                                (loop (- n 1)
-                                      (cdr cs))))]))))]
-            [vertical-alignment 'center]
-            [horizontal-alignment 'center]
-            [update-alignment (lambda () 
-                                (send single-panel set-alignment horizontal-alignment vertical-alignment))]
-            [horiz
-             (make-radio 
-              "Horizontal Alignment"
-              (list "left" "center" "right")
-              (lambda (radio)
-                (set! horizontal-alignment (string->symbol (send radio get-item-label (send radio get-selection))))
-                (update-alignment)))]
-            [vert
-             (make-radio
-              "Vertical Alignment"
-              (list "top" "center" "bottom")
-              (lambda (radio)
-                (set! vertical-alignment (string->symbol (send radio get-item-label (send radio get-selection))))
-                (update-alignment)))]
-            [buttons (make-object horizontal-panel% f)]
-            [result 'failed]
-            [failed (make-object button% "Failed" buttons (lambda (_1 _2) (semaphore-post semaphore)))]
-            [passed (make-object button% "Passed" buttons (lambda (_1 _2) 
-                                                            (set! result 'passed)
-                                                            (semaphore-post semaphore)))])
-       (send border-panel min-width 100)
-       (send border-panel min-height 100)
-       (send vert set-selection 1)
-       (send horiz set-selection 1)
-       (send buttons stretchable-height #f)
-       (send buttons set-alignment 'right 'center)
-       (send radios stretchable-height #f)
-       (send f show #t)
-       (yield semaphore)
-       (send f show #f)
-       result))))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/panel.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/panel.rkt
deleted file mode 100644
index c850777f5e..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/panel.rkt
+++ /dev/null
@@ -1,118 +0,0 @@
-#lang racket/base
-(require "test-suite-utils.rkt")
-
-(module test racket/base)
-
-(test
- 'dragable-min-size1
- (λ (min-w/min-h) (equal? min-w/min-h '(10 20)))
- `(call-with-values (λ () (panel:dragable-container-size '((10 20 #f #f)) 0 #t))
-                    list))
-
-(test
- 'dragable-min-size2
- (λ (min-w/min-h) (equal? min-w/min-h '(10 20)))
- `(call-with-values (λ () (panel:dragable-container-size '((10 20 #f #f)) 0 #f))
-                    list))
-
-(test
- 'dragable-min-size3
- (λ (min-w/min-h) (equal? min-w/min-h '(30 60)))
- `(call-with-values (λ () (panel:dragable-container-size '((10 20 #f #f) (30 40 #f #f)) 0 #t))
-                    list))
-
-(test
- 'dragable-min-size4
- (λ (min-w/min-h) (equal? min-w/min-h '(40 40)))
- `(call-with-values (λ () (panel:dragable-container-size '((10 20 #f #f) (30 40 #f #f)) 0 #f))
-                    list))
-
-(test
- 'dragable-min-size5
- (λ (min-w/min-h) (equal? min-w/min-h '(30 65)))
- `(call-with-values (λ () (panel:dragable-container-size '((10 20 #f #f) (30 40 #f #f)) 5 #t))
-                    list))
-
-(test
- 'dragable-min-size6
- (λ (min-w/min-h) (equal? min-w/min-h '(45 40)))
- `(call-with-values (λ () (panel:dragable-container-size '((10 20 #f #f) (30 40 #f #f)) 5 #f))
-                    list))
-
-(test
- 'dragable-place-children1
- (λ (l) (equal? l '(() ())))
- `(call-with-values (λ () (panel:dragable-place-children '() 100 200 '() 0 #t))
-                    list))
-
-(test
- 'dragable-place-children2
- (λ (l) (equal? l '(((0 0 100 200)) ())))
- `(call-with-values (λ () (panel:dragable-place-children '((10 10 #t #f)) 100 200 '(1) 0 #t))
-                    list))
-
-(test
- 'dragable-place-children3
- (λ (l) (equal? l '(((0 0 100 200)) ())))
- `(call-with-values (λ () (panel:dragable-place-children '((10 10 #t #f)) 100 200 '(1) 0 #f))
-                    list))
-
-(test
- 'dragable-place-children4
- (λ (l) (equal? l '(((0 0 100 150) (0 150 100 150)) ((150 150)))))
- `(call-with-values (λ () (panel:dragable-place-children '((10 10 #t #f) (10 10 #t #f)) 100 300 '(1/2 1/2) 0 #t))
-                    list))
-
-(test
- 'dragable-place-children5
- (λ (l) (equal? l '(((0 0 50 300) (50 0 50 300)) ((50 50)))))
- `(call-with-values (λ () (panel:dragable-place-children '((10 10 #t #f) (10 10 #t #f)) 100 300 '(1/2 1/2) 0 #f))
-                    list))
-
-(test
- 'dragable-place-children5
- (λ (l) (equal? l '(((0 0 100 100) (0 100 100 200)) ((100 100)))))
- `(call-with-values (λ () (panel:dragable-place-children '((10 10 #t #f) (10 10 #t #f)) 100 300 '(1/3 2/3) 0 #t))
-                    list))
-
-(test
- 'dragable-place-children6
- (λ (l) (equal? l '(((0 0 10 300) (10 0 90 300)) ((10 10)))))
- `(call-with-values (λ () (panel:dragable-place-children '((10 10 #t #f) (10 10 #t #f)) 100 300 '(1/10 9/10) 0 #f))
-                    list))
-
-(test
- 'dragable-place-children7
- (λ (l) (equal? l '(((0 0 10 300) (20 0 90 300)) ((10 20)))))
- `(call-with-values (λ () (panel:dragable-place-children '((10 10 #t #f) (10 10 #t #f)) 110 300 '(1/10 9/10) 10 #f))
-                    list))
-
-(test
- 'dragable-place-children8
- (λ (l) (equal? l '(((0 0 10 300) (20 0 20 300) (50 0 70 300)) ((10 20) (40 50)))))
- `(call-with-values (λ () (panel:dragable-place-children '((10 10 #t #f) (10 10 #t #f) (10 10 #t #f)) 120 300 '(1/10 2/10 7/10) 10 #f))
-                    list))
-
-(test
- 'dragable-place-children9
- (λ (l) (equal? l '(((0 0 30 300) (30 0 70 300)) ((30 30)))))
- `(call-with-values (λ () (panel:dragable-place-children '((10 10 #t #f) (70 10 #t #f)) 100 300 '(1/2 1/2) 0 #f))
-                    list))
-
-(test
- 'dragable-place-children10
- (λ (l) (equal? l '(((0 0 70 300) (70 0 30 300)) ((70 70)))))
- `(call-with-values (λ () (panel:dragable-place-children '((70 10 #t #f) (10 10 #t #f)) 100 300 '(1/2 1/2) 0 #f))
-                    list))
-
-(test
- 'dragable-place-children11
- (λ (l) (equal? l '(((0 0 70 300) (70 0 10 300) (80 0 20 300)) ((70 70) (80 80)))))
- `(call-with-values (λ () (panel:dragable-place-children '((70 10 #t #f) (10 10 #t #f) (20 10 #t #f)) 100 300 '(1/2 1/4 1/4) 0 #f))
-                    list))
-
-(test
- 'dragable-place-children12
- (λ (l) (equal? l '(((0 0 242 629) (247 0 243 629)) ((242 247)))))
- `(call-with-values (λ () (panel:dragable-place-children '((30 30 #t #t) (30 30 #t #t)) 490 629 '(1/2 1/2) 5 #f))
-                    list))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/pasteboard.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/pasteboard.rkt
deleted file mode 100644
index 9fc1a2c33a..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/pasteboard.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-(require "test-suite-utils.rkt")
-
-(module test racket/base)
-
-(define (test-creation frame class name)
-  (test
-   name
-   (lambda (x) #t)
-   (lambda ()
-     (let ([frame-label
-	    (queue-sexp-to-mred
-             `(let* ([f (new (class ,frame
-                               (define/override (get-editor%) ,class)
-                               (super-new)))])
-		(preferences:set 'framework:exit-when-no-frames #f)
-		(send f show #t)
-		(send f get-label)))])
-       (wait-for-frame frame-label)
-       (queue-sexp-to-mred
-	`(send (get-top-level-focus-window) close))))))
-
-(test-creation 'frame:editor%
-	       '(editor:basic-mixin pasteboard%)
-	       'editor:basic-mixin-creation)
-(test-creation 'frame:editor%
-	       'pasteboard:basic%
-	       'pasteboard:basic-creation)
-
-(test-creation 'frame:editor%
-	       '(editor:file-mixin pasteboard:keymap%)
-	       'editor:file-mixin-creation)
-(test-creation 'frame:editor%
-	       'pasteboard:file%
-	       'pasteboard:file-creation)
-
-(test-creation 'frame:editor%
-	       '(editor:backup-autosave-mixin pasteboard:file%)
-	       'editor:backup-autosave-mixin-creation)
-(test-creation 'frame:editor%
-	       'pasteboard:backup-autosave%
-	       'pasteboard:backup-autosave-creation)
-
-(test-creation 'frame:pasteboard%
-	       '(editor:info-mixin pasteboard:backup-autosave%)
-	       'editor:info-mixin-creation)
-(test-creation 'frame:pasteboard%
-	       'pasteboard:info%
-	       'pasteboard:info-creation)
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/prefs.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/prefs.rkt
deleted file mode 100644
index ef38932761..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/prefs.rkt
+++ /dev/null
@@ -1,141 +0,0 @@
-#lang racket/base
-(require "test-suite-utils.rkt")
-
-(module test racket/base)
-  
-  (define ((check-equal? x) y) (equal? x y))
-  (define pref-sym 'plt:not-a-real-preference)
-  (define marshalling-pref-sym 'plt:not-a-real-preference-marshalling)
-  (define default-test-sym 'plt:not-a-real-preference-default-test)
-  
-  (shutdown-mred)
-  
-  (test
-   'preference-unbound
-   (check-equal? 'passed)
-   `(with-handlers ([exn:unknown-preference?
-                     (lambda (x)
-                       'passed)])
-      (preferences:get ',pref-sym)))
-  (test 'preference-set-default/get
-        (check-equal? 'passed)
-        `(begin (preferences:set-default ',pref-sym 'passed symbol?)
-                (preferences:get ',pref-sym)))
-  (test 'preference-set/get
-        (check-equal? 'new-pref)
-        `(begin (preferences:set ',pref-sym 'new-pref)
-                (preferences:get ',pref-sym)))
-
-  (test 'preference-marshalling
-        (check-equal? 'the-answer)
-        `(begin (preferences:set-default ',marshalling-pref-sym (lambda () 'the-answer) procedure?)
-                (preferences:set-un/marshall ',marshalling-pref-sym
-                                             (lambda (f) (f))
-                                             (lambda (v) (lambda () v)))
-                (begin0 ((preferences:get ',marshalling-pref-sym))
-                        (preferences:set ',marshalling-pref-sym (lambda () 2)))))
-  (shutdown-mred)
-  (test 'preference-marshalling
-        (check-equal? 2)
-        `(begin (preferences:set-default ',marshalling-pref-sym (lambda () 'the-answer) procedure?)
-                (preferences:set-un/marshall ',marshalling-pref-sym
-                                             (lambda (f) (f))
-                                             (lambda (v) (lambda () v)))
-                ((preferences:get ',marshalling-pref-sym))))
-  
-  (with-handlers ([eof-result? (lambda (x) (void))])
-    (send-sexp-to-mred '(begin (preferences:set 'framework:verify-exit #f)
-                               (exit:exit)
-                               
-                               ;; do this yield here so that exit:exit
-                               ;; actually exits on this interaction.
-                               ;; right now, exit:exit queue's a new event to exit
-                               ;; instead of just exiting immediately.
-                               (yield (make-semaphore 0)))))
-  
-  (test 'preference-get-after-restart
-        (check-equal? 'new-pref)
-        `(begin (preferences:set-default ',pref-sym 'passed symbol?)
-                (preferences:get ',pref-sym)))
-
-  (test 'preference-no-set-default-stage1
-        (check-equal? 'stage1)
-        `(begin (preferences:set-default ',default-test-sym 'default symbol?)
-                (preferences:set ',default-test-sym 'new-value)
-                'stage1))
-  (shutdown-mred)
-  (test 'preference-no-set-default-stage2
-        (check-equal? 'stage2)
-        `(begin 'stage2))
-  (shutdown-mred)
-  (test 'preference-no-set-default-stage3
-        (check-equal? 'new-value)
-        `(begin (preferences:set-default ',default-test-sym 'default symbol?)
-                (preferences:get ',default-test-sym)))
-  
-  (test 'preference-add-callback
-        (check-equal? 2)
-        `(begin 
-           (let ([x 1])
-             (define remove-it (preferences:add-callback ',default-test-sym (λ (a b) (set! x (+ x 1)))))
-             (preferences:set ',default-test-sym 'xyz)
-             (remove-it)
-             (preferences:set ',default-test-sym 'pdq)
-             x)))
-  
-  (test 'preference-add-weak-callback
-        (check-equal? 2)
-        `(begin 
-           (let ([x 1])
-             (define f (λ (a b) (set! x (+ x 1))))
-             (define remove-it (preferences:add-callback ',default-test-sym f #t))
-             (preferences:set ',default-test-sym 'xyz)
-             (remove-it)
-             (preferences:set ',default-test-sym 'pdq)
-             x)))
-  
-  (test 'preference-add-weak-callback2
-        (check-equal? 3)
-        `(begin 
-           (let ([x 1])
-             (define f (λ (a b) (set! x (+ x 1))))
-             (unless (zero? (random 1)) (set! f 'not-a-proc)) ;; try to stop inlining
-             (define remove-it (preferences:add-callback ',default-test-sym f #t))
-             (collect-garbage) (collect-garbage) (collect-garbage)
-             (preferences:set ',default-test-sym 'xyz)
-             (remove-it)
-             (preferences:set ',default-test-sym 'pdq)
-             (f 'a 'b)  ;; make sure safe-for-space doesn't free 'f' earlier
-             x)))
-  
-  (test 'preference-weak-callback-is-weak
-        (check-equal? #t)
-        `(begin 
-           (let ([x 1])
-             (define f (λ (a b) (set! x (+ x 1))))
-             (define wb (make-weak-box f))
-             (define remove-it (preferences:add-callback ',default-test-sym f #t))
-             (set! f #f)
-             (begin0
-               (let loop ([n 10])
-                 (cond
-                   [(not (weak-box-value wb)) #t]
-                   [(zero? n) 'f-still-alive]
-                   [else
-                    (collect-garbage)
-                    (loop (- n 1))]))
-               (remove-it)))))
-  
-  (test 'dialog-appears
-        (check-equal? 'passed)
-        (lambda ()
-          (queue-sexp-to-mred '(begin (send (make-object frame:basic% "frame") show #t)
-                                      (preferences:show-dialog)))
-          (wait-for-frame "Preferences")
-          (queue-sexp-to-mred '(begin (preferences:hide-dialog)
-                                      (let ([f (get-top-level-focus-window)])
-                                        (if f
-                                            (if (string=? "Preferences" (send f get-label))
-                                                'failed
-                                                'passed)
-                                            'passed))))))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/private/gui.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/private/gui.rkt
deleted file mode 100644
index b4709ac1bb..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/private/gui.rkt
+++ /dev/null
@@ -1,125 +0,0 @@
-#lang racket/base
-
-  (require racket/gui/base
-           racket/class)
-  (provide find-labelled-window 
-           find-labelled-windows
-           whitespace-string=?)
-  
-  ;; whitespace-string=? : string string -> boolean
-  ;; determines if two strings are equal, up to their whitespace.
-  ;; each string is required to have whitespace in the same place,
-  ;; but not necessarily the same kinds or amount.
-  (define (whitespace-string=? string1 string2)
-    (let loop ([i 0]
-               [j 0]
-               [in-whitespace? #t])
-      (cond
-        [(= i (string-length string1)) (only-whitespace? string2 j)]
-        [(= j (string-length string2)) (only-whitespace? string1 i)]
-        [else (let ([c1 (string-ref string1 i)]
-                    [c2 (string-ref string2 j)])
-                (cond
-                  [in-whitespace?
-                   (cond
-                     [(whitespace? c1)
-                      (loop (+ i 1)
-                            j
-                            #t)]
-                     [(whitespace? c2)
-                      (loop i
-                            (+ j 1)
-                            #t)]
-                     [else (loop i j #f)])]
-                  [(and (whitespace? c1)
-                        (whitespace? c2))
-                   (loop (+ i 1)
-                         (+ j 1)
-                         #t)]
-                  [(char=? c1 c2)
-                   (loop (+ i 1)
-                         (+ j 1)
-                         #f)]
-                  [else #f]))])))
-  
-  ;; whitespace? : char -> boolean
-  ;; deteremines if `c' is whitespace
-  (define (whitespace? c)
-    (or (char=? c #\newline)
-        (char=? c #\space)
-        (char=? c #\tab)
-        (char=? c #\return)))
-  
-  ;; only-whitespace? : string number -> boolean
-  ;; returns true if string only contains whitespace, from index `i' onwards
-  (define (only-whitespace? str i)
-    (let loop ([n i])
-      (cond
-        [(= n (string-length str))
-         #t]
-        [(whitespace? (string-ref str n))
-         (loop (+ n 1))]
-        [else #f])))
-  
-  ;; whitespace-string=? tests
-  (module+ test
-    (require rackunit)
-    (check-equal? #t (whitespace-string=? "a" "a"))
-    (check-equal? #f (whitespace-string=? "a" "A"))
-    (check-equal? #f (whitespace-string=? "a" " "))
-    (check-equal? #f (whitespace-string=? " " "A"))
-    (check-equal? #t (whitespace-string=? " " " "))
-    (check-equal? #t (whitespace-string=? " " "  "))
-    (check-equal? #t (whitespace-string=? "  " "  "))
-    (check-equal? #t (whitespace-string=? "  " " "))
-    (check-equal? #t (whitespace-string=? "a a" "a a"))
-    (check-equal? #t (whitespace-string=? "a a" "a  a"))
-    (check-equal? #t (whitespace-string=? "a  a" "a a"))
-    (check-equal? #t (whitespace-string=? " a" "a"))
-    (check-equal? #t (whitespace-string=? "a" " a"))
-    (check-equal? #t (whitespace-string=? "a " "a"))
-    (check-equal? #t (whitespace-string=? "a" "a ")))
-
-  ;;; find-labelled-window : (union ((union #f string) -> window<%>)
-  ;;;                               ((union #f string) (union #f class) -> window<%>)
-  ;;;                               ((union #f string) (union class #f) area-container<%> -> window<%>))
-  ;;;;  may call error, if no control with the label is found
-  (define (find-labelled-window label 
-                                [class #f]
-                                [window (get-top-level-focus-window)]
-                                [failure (λ ()
-                                           (error 'find-labelled-window "no window labelled ~e in ~e~a"
-                                                  label
-                                                  window 
-                                                  (if class
-                                                      (format " matching class ~e" class)
-                                                      "")))])
-    (define windows (find-labelled-windows label class window))
-    (cond
-      [(null? windows) (failure)]
-      [else (car windows)]))
- 
-  (define (find-labelled-windows label [class #f] [window (get-top-level-focus-window)])
-    (unless (or (not label)
-                (string? label))
-      (error 'find-labelled-windows "first argument must be a string or #f, got ~e; other args: ~e ~e"
-             label class window))
-    (unless (or (class? class)
-                (not class))
-      (error 'find-labelled-windows "second argument must be a class or #f, got ~e; other args: ~e ~e"
-             class label window))
-    (unless (is-a? window area-container<%>)
-      (error 'find-labelled-windows "third argument must be a area-container<%>, got ~e; other args: ~e ~e"
-             window label class))
-    (let loop ([window window])
-      (cond
-        [(and (or (not class)
-                  (is-a? window class))
-              (let ([win-label (and (is-a? window window<%>)
-                                    (send window get-label))])
-                (equal? label win-label)))
-         (list window)]
-        [(is-a? window area-container<%>) (apply append (map loop (send window get-children)))]
-        [else '()])))
-  
-  
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/racket.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/racket.rkt
deleted file mode 100644
index 9239f8b0cf..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/racket.rkt
+++ /dev/null
@@ -1,556 +0,0 @@
-#lang racket/base
-
-(require "test-suite-utils.rkt"
-         (for-syntax racket/base))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; testing inserting parens and the automatic-parens prefs
-;;
-
-(define (test-type-string/proc line to-type expected-result [control-down #f])
-  (test
-   (string->symbol (format "test-type-string line ~a" line))
-   (λ (x) (equal? x expected-result))
-   (λ ()
-     (queue-sexp-to-mred
-      `(let ()
-         (define f (new frame:basic% [label ""]))
-         (define t (new racket:text%))
-         (define ec (new canvas:basic%
-                         [parent (send f get-area-container)]
-                         [editor t]))
-         (send t on-char (new key-event% [key-code ,to-type] [control-down ,control-down]))
-         (send t get-text))))))
-
-(define-syntax (test-type-string stx)
-  (syntax-case stx ()
-    [(_ . rst)
-     (with-syntax ([line (syntax-line stx)])
-       #'(test-type-string/proc line . rst))]))
-
-(begin
-  (queue-sexp-to-mred `(preferences:set 'framework:fixup-parens #f))
-  (queue-sexp-to-mred `(preferences:set 'framework:fixup-open-parens #f))
-  
-  (queue-sexp-to-mred `(preferences:set 'framework:automatic-parens #f))
-  (test-type-string #\( "(")
-  (test-type-string #\[ "[")
-  (test-type-string #\" "\"")
-  (queue-sexp-to-mred `(preferences:set 'framework:automatic-parens #t))
-  (test-type-string #\( "()")
-  (test-type-string #\[ "[]")
-  (test-type-string #\" "\"\""))
-
-
-(begin
-  (queue-sexp-to-mred `(preferences:set 'framework:fixup-parens #f))
-  (queue-sexp-to-mred `(preferences:set 'framework:fixup-open-parens #t))
-  
-  (queue-sexp-to-mred `(preferences:set 'framework:automatic-parens #f))
-  (test-type-string #\( "(")
-  (test-type-string #\[ "(")
-  (test-type-string #\[ "[" #t)
-  (test-type-string #\" "\"")
-  (queue-sexp-to-mred `(preferences:set 'framework:automatic-parens #t))
-  (test-type-string #\( "()")
-  (test-type-string #\[ "()")
-  (test-type-string #\[ "[]" #t)
-  (test-type-string #\" "\"\""))
-
-(begin
-  (queue-sexp-to-mred `(preferences:set 'framework:fixup-parens #t))
-  (queue-sexp-to-mred `(preferences:set 'framework:fixup-open-parens #f))
-  
-  (queue-sexp-to-mred `(preferences:set 'framework:automatic-parens #f))
-  (test-type-string #\( "(")
-  (test-type-string #\[ "[")
-  (test-type-string #\" "\"")
-  (queue-sexp-to-mred `(preferences:set 'framework:automatic-parens #t))
-  (test-type-string #\( "()")
-  (test-type-string #\[ "[]")
-  (test-type-string #\" "\"\""))
-
-(begin
-  (queue-sexp-to-mred `(preferences:set 'framework:fixup-parens #t))
-  (queue-sexp-to-mred `(preferences:set 'framework:fixup-open-parens #t))
-  
-  (queue-sexp-to-mred `(preferences:set 'framework:automatic-parens #f))
-  (test-type-string #\( "(")
-  (test-type-string #\[ "(")
-  (test-type-string #\" "\"")
-  (queue-sexp-to-mred `(preferences:set 'framework:automatic-parens #t))
-  (test-type-string #\( "()")
-  (test-type-string #\[ "()")
-  (test-type-string #\" "\"\""))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; testing highlight-range method
-;;
-
-
-(define (test-text-balanced? number str start end expected)
-  (test
-   (string->symbol (format "racket:text-balanced?-~a" number))
-   (lambda (x) 
-     (equal? x expected))
-   (λ ()
-     (queue-sexp-to-mred
-      `(let ([t (new racket:text%)])
-         (send t insert ,str)
-         (racket:text-balanced? t ,start ,end))))))
-
-(test-text-balanced? 0 "" 0 #f #f)
-(test-text-balanced? 1 "  \n " 0 #f #f)
-(test-text-balanced? 2 "foo)" 0 #f #t)
-(test-text-balanced? 3 "(foo" 0 #f #f)
-(test-text-balanced? 4 "(foo)" 0 #f #t)
-(test-text-balanced? 5 "(foo 'bar))" 0 #f #t)
-(test-text-balanced? 6 "(foo) bar ([buz])" 0 #f #t)
-(test-text-balanced? 7 "(foo]" 0 #f #t)
-(test-text-balanced? 8 "{foo} ((bar) [5.9])" 0 #f #t)
-(test-text-balanced? 9 "#(1 2 . 3)" 0 #f #t)
-
-(define-syntax (test-indentation stx) 
-  (syntax-case stx () 
-    [(_ . args) 
-     (with-syntax ([line (syntax-line stx)])
-       #'(test-indentation/proc line . args))]))
-
-(define (test-indentation/proc line before after)
-  (test
-   (string->symbol (format "racket:test-indentation-line-~a" line))
-   (λ (x) (equal? x after))
-   (λ ()
-     (queue-sexp-to-mred
-      `(let* ([t (new racket:text%)]
-              [f (new frame% [label ""] [width 600] [height 600])]
-              [ec (new editor-canvas% [parent f] [editor t])])
-         (send f reflow-container)
-         (send t insert ,before)
-         (send t tabify-all)
-         (send t get-text))))))
-
-(test-indentation "a" "a")
-(test-indentation "(a\n b)" "(a\n b)")
-(test-indentation "(a\nb)" "(a\n b)")
-(test-indentation "(a b\nc)" "(a b\n   c)")
-(test-indentation "(a ...\nb)" "(a ...\n b)")
-(test-indentation "(lambda (x)\nb)" "(lambda (x)\n  b)")
-(test-indentation "(lambdaa (x)\nb)" "(lambdaa (x)\n         b)")
-(test-indentation "(define x\n  (let/ec return\n    (when 1\n      (when 2\n\t\t      3))\n    2))"
-                  "(define x\n  (let/ec return\n    (when 1\n      (when 2\n        3))\n    2))")
-(test-indentation "(for/fold ([x 1])\n([y 2])\n3\n4)"
-                  "(for/fold ([x 1])\n          ([y 2])\n  3\n  4)")
-
-(define (test-magic-square-bracket which before after)
-  (test
-   (string->symbol (format "racket:test-magic-square-bracket-~a" which))
-   (λ (x) (equal? x after))
-   (λ ()
-     (queue-sexp-to-mred
-      `(let* ([t (new racket:text%)]
-              [f (new frame% [label ""] [width 600] [height 600])]
-              [ec (new editor-canvas% [parent f] [editor t])])
-         (send f reflow-container)
-         (send t insert ,before)
-         (send (racket:get-keymap) call-function "maybe-insert-[]-pair-maybe-fixup-[]" t (new event%))
-         (send t get-text))))))
-
-(queue-sexp-to-mred `(preferences:set 'framework:automatic-parens #f))
-(queue-sexp-to-mred `(preferences:set 'framework:fixup-open-parens #t))
-(test-magic-square-bracket 'mt "" "(")
-(test-magic-square-bracket 'mt2 "(() " "(() (")
-(test-magic-square-bracket 'mt3 "([] " "([] [")
-(test-magic-square-bracket 'mt4 "(\"" "(\"[")
-(test-magic-square-bracket 'mt4 "(#\\" "(#\\[")
-(test-magic-square-bracket 'let1 "(let " "(let (")
-(test-magic-square-bracket 'let2 "(let (" "(let ([")
-(test-magic-square-bracket 'let3 "(let loop " "(let loop (")
-(test-magic-square-bracket 'let3 "(let loop (" "(let loop ([")
-(test-magic-square-bracket 'let4 "(let rec (" "(let rec ([")
-(test-magic-square-bracket 'cond1 "(cond " "(cond [")
-(test-magic-square-bracket 'cond2 "(cond [" "(cond [(")
-(test-magic-square-bracket 'with-syntax1 "(syntax-case x " "(syntax-case x (")
-(test-magic-square-bracket 'with-syntax2 "(syntax-case x () " "(syntax-case x () [")
-(test-magic-square-bracket 'with-syntax3 "(syntax-case 'x " "(syntax-case 'x (")
-(test-magic-square-bracket 'with-syntax4 "(syntax-case 'x () " "(syntax-case 'x () [")
-(test-magic-square-bracket 'with-syntax3 "(syntax-case #'x " "(syntax-case #'x (")
-(test-magic-square-bracket 'with-syntax4 "(syntax-case #'x () " "(syntax-case #'x () [")
-(test-magic-square-bracket 'local1 "(local " "(local [")
-(test-magic-square-bracket 'local2 "(local [" "(local [(")
-(test-magic-square-bracket 'local2 "(local [(define x 1)] " "(local [(define x 1)] (")
-(test-magic-square-bracket 'for/fold1 "(for/fold (" "(for/fold ([")
-(test-magic-square-bracket 'for/fold2 "(for/fold ([x 1]) (" "(for/fold ([x 1]) ([")
-
-
-(define (test-message-send/proc line before expected pos msg
-                                #:check-result? [check-result? #f] 
-                                . args)
-  (define (maybe-quote x)
-    (cond
-      [(or (number? x) (boolean? x) (string? x)) x]
-      [else `',x]))
-  (test
-   (string->symbol (format "line ~a: ~s"
-                           line
-                           `(,msg ,@(map maybe-quote args))))
-   (λ (x) (equal? x expected))
-   (λ ()
-     (queue-sexp-to-mred
-      `(let ()
-         (define f (new frame% [label ""]))
-         (define t (new racket:text%))
-         (define ec (new editor-canvas% [parent f] [editor t]))
-         (send t insert ,before)
-         (send t set-position ,pos)
-         (define ans (send t ,msg ,@(map maybe-quote args)))
-         ,(if check-result?
-              'ans
-              '(send t get-text)))))))
-(define-syntax (test-message-send stx)
-  (syntax-case stx ()
-    [(_ before expected pos mth . args)
-     (with-syntax ([line (syntax-line stx)])
-       #'(test-message-send/proc line before expected pos 'mth . args))]))
-
-(test-message-send ""  "]"  0 insert-close-paren 0 #\] #t #t 'adjacent)
-(test-message-send ""  "]"  0 insert-close-paren 0 #\] #t #t #f)
-(test-message-send "(" "()" 1 insert-close-paren 1 #\] #t #t #f)
-(test-message-send "(" "(]" 1 insert-close-paren 1 #\] #f #f #f)
-(test-message-send ""  "]"  0 insert-close-paren 0 #\] #t #t 'forward)
-
-(test-message-send "(1)" "1" 1 kill-enclosing-parens 1)
-(test-message-send "(1 2 3)" "1 2 3" 3 kill-enclosing-parens 3)
-(test-message-send "()" "" 1 kill-enclosing-parens 1)
-(test-message-send "(1\n 2\n 3)" "1\n2\n3" 1 kill-enclosing-parens 1) ;; test tabify call
-
-(test-message-send "abc" #f 1 backward-containing-sexp #:check-result? #t 1 3)
-
-;; tests what happens when a given key/s is/are typed in an editor with initial
-;;       text and cursor position, under different settings of the auto-parentheses and
-;;       smart-skip-parentheses preferences   .nah.
-
-;; test-auto-parens-behavior
-;;    : any string 
-;;      [or num (list num num)] [or char symbol 1string (list char) (list key-event%)]
-;;      [or num (list num num)] string
-(define (test-auto-parens-behavior which initial-text initial-pos keys final-text final-pos
-                                   [auto-parens? #f])
-  (test
-   (string->symbol (format "racket:test-auto-parens-behavior ~a" which))
-   (λ (x) (if (list? final-pos)
-              (equal? x (list (car final-pos) (cadr final-pos) final-text))
-              (equal? x (list final-pos final-pos final-text))))
-   (λ ()
-     (queue-sexp-to-mred
-      `(let* ([t (new racket:text%)]
-              [f (new frame% [label ""] [width 600] [height 600])]
-              [ec (new editor-canvas% [parent f] [editor t])])
-         (preferences:set 'framework:fixup-parens #t)
-         (preferences:set 'framework:automatic-parens ,auto-parens?)
-         (send f reflow-container)
-         (send t insert ,initial-text)
-         ,(if (number? initial-pos)
-              `(send t set-position ,initial-pos)
-              `(send t set-position ,(car initial-pos) ,(cadr initial-pos)))
-         ,@(map
-            (lambda (k)
-              (cond [(char? k)
-                     `(send (racket:get-keymap)
-                            handle-key-event t (new key-event% [key-code ,k]))]
-                    [(string? k)
-                     `(send (racket:get-keymap)
-                            handle-key-event t (new key-event% [key-code ,(car (string->list k))]))]
-                    [(symbol? k)
-                     `(send (racket:get-keymap)
-                            handle-key-event t (new key-event% [key-code (quote ,k)]))]
-                    [else `(send (racket:get-keymap) handle-key-event t ,k)]))
-            (if (list? keys) keys (list keys)))
-         (list (send t get-start-position) (send t get-end-position) (send t get-text)))))))
-
-
-;; this takes an initial editor state (specified by the text before the cursor,
-;;   some selected text (may be blank string), and text after the cursor), and
-;;   a key(s), and runs tests to check what happens when that key(s) is/are
-;;   typed - in both possible settings of the 'automatic-parens preference
-;;
-;; final-states is a list of 2-pairs of strings. each pair is the final text before
-;;   and after the cursor, for auto-parens disabled and enabled respectively
-;;  (NB. final-states could also contain 3-pairs of strings, the middle portion 
-;;       representing text that is selected after the insertion)
-(define (test-parens-behavior/full which
-                               init-text-before init-text-selected init-text-after
-                               keys
-                               final-states)
-  (define initial-text (string-append init-text-before init-text-selected init-text-after))
-  (define initial-start-pos (string-length init-text-before))
-  (define initial-end-pos (+ initial-start-pos (string-length init-text-selected)))
-  (for-each
-   (lambda (label auto? final-pair)
-     (test-auto-parens-behavior (format "~a (~a)" which label)
-                             initial-text (list initial-start-pos initial-end-pos) keys
-                             (apply string-append final-pair)
-                             (if (= 3 (length final-pair)) 
-                                 ; final-pair could actually be a triplet 
-                                 ; to indicate residual selection after insertion
-                                 (list (string-length (car final-pair))
-                                       (string-length (string-append (car final-pair)
-                                                                     (cadr final-pair))))
-                                 (string-length (car final-pair)))
-                             auto?))
-   '("no-auto-parens" "with-auto-parens")
-   '(#f #t)
-   final-states))
-
-
-(define SPECIAL-CHARS '(#\( #\) #\[ #\] #\" #\| #\{ #\}))
-
-(for ([k SPECIAL-CHARS])
-  ;; test that character literals never result in a pair of characters typed...
-  (test-parens-behavior/full (format "literal-~a" k)
-                             "(list 1 #\\" "" ")"
-                             k
-                             `([,(string-append "(list 1 #\\" (string k)) ")"]
-                               [,(string-append "(list 1 #\\" (string k)) ")"]))
-  ;; test that escaped characters in a string never result in a pair of characters typed...
-  ;; except for | which is a hard case to detect, because the tokenizer ends up
-  ;; in an error state
-  (unless (or (eq? #\| k))
-      (test-parens-behavior/full (format "literal-~a-in-string" k)
-                             "\"abc \\" "" "def\""
-                             k
-                             `([,(string-append "\"abc \\" (string k)) "def\""]
-                               [,(string-append "\"abc \\" (string k)) "def\""])))
-  ;; test that auto-parens has no effect in strings, *except for double quotes*
-  (unless (eq? #\" k)
-    (test-parens-behavior/full (format "~a-in-string" k)
-                               "\" abc def " "" " \""
-                               k
-                               `([,(string-append "\" abc def " (string k)) " \""]
-                                 [,(string-append "\" abc def " (string k)) " \""])))
-
-  ;; test that auto-parens has no effect in various comment situations
-  (define scenarios
-    ;    description     before-cursor    after-cursor
-    '(("in-line-comment"  ";; abc def "    " ghi ")
-      ("end-of-line-comment" ";; abc def " "")
-      ("end-of-line-comment-with-close-paren" ";; abc def " "   ) \n )")
-      ("in-block-comment" "#| abc def "  " ghi |#")
-      ))
-  (for ([s scenarios])
-    (let* ([before (cadr s)]
-           [after (caddr s)]
-           [before-final (string-append before (string k))]
-           [result (list before-final after)])
-      (test-parens-behavior/full (format "~a-~a" k (car s))
-                                 before "" after k `(,result ,result)))))
-
-;;; assorted other scenarios...
-(test-parens-behavior/full 'open-parens
-                           "abcd" "" "efg"  ; editor state: before, selected, after
-                           #\(              ; key(s) pressed
-                           '(["abcd(" "efg"]  ; result state sep by cursor, no auto-parens
-                             ["abcd(" ")efg"])) ; result state with auto-parens
-
-(test-parens-behavior/full 'close-1
-                           "abcd" "" "efg"
-                           #\)
-                           '(["abcd)" "efg"]  ["abcd)" "efg"]))
-(test-parens-behavior/full 'close-2
-                           "(abcd" "" "efg"
-                           #\)
-                           '(["(abcd)" "efg"]  ["(abcd)" "efg"]))
-(test-parens-behavior/full 'close-3
-                           "(abcd" "" ")efg"
-                           #\)
-                           '(["(abcd)" ")efg"]  ["(abcd)" "efg"]))
-(test-parens-behavior/full 'close-4
-                           "(abcd efg " "" "   ) efg"
-                           #\)
-                           '(["(abcd efg )" "   ) efg"]
-                             ["(abcd efg    )" " efg"]))
-(test-parens-behavior/full 'close-5
-                           "(define before+afters `([\"\" abc \"efg\" 12345 xyz]) [84])"
-                           ""
-                           ""
-                           #\)
-                           '(["(define before+afters `([\"\" abc \"efg\" 12345 xyz]) [84]))" ""]
-                             ["(define before+afters `([\"\" abc \"efg\" 12345 xyz]) [84]))" ""]))
-(test-parens-behavior/full 'close-6
-                           "(define before+afters `([\"\" abc \"efg\""
-                           ""
-                           " 12345 xyz]) [84])"
-                           #\)
-                           '(["(define before+afters `([\"\" abc \"efg\"]" " 12345 xyz]) [84])"]
-                             ["(define before+afters `([\"\" abc \"efg\"]" " 12345 xyz]) [84])"]))
-
-
-(test-parens-behavior/full 'close-skip-1
-                           "(define before+afters `([\"\" abc \"efg\" 12345 xyz]"
-                           ""
-                           "  ) [84])"
-                           #\)
-                           '(["(define before+afters `([\"\" abc \"efg\" 12345 xyz])" "  ) [84])"]
-                             ["(define before+afters `([\"\" abc \"efg\" 12345 xyz]  )" " [84])"]))
-(test-parens-behavior/full 'close-skip-fixup-1
-                           "(define before+afters `{[abc 123]"
-                           ""
-                           "  ) [84])"
-                           #\)   ; here the next close after ) doesn't match the {, so no skip happens
-                           '(["(define before+afters `{[abc 123]}" "  ) [84])"]
-                             ["(define before+afters `{[abc 123]}" "  ) [84])"]))
-(test-parens-behavior/full 'close-skip-fixup-2
-                           "(define before+afters `{[abc 123]"
-                           ""
-                           "  } [84])"
-                           #\)   ; here the next close does match the {, so  skip
-                           '(["(define before+afters `{[abc 123]}" "  } [84])"]
-                             ["(define before+afters `{[abc 123]  }" " [84])"]))
-
-(test-parens-behavior/full 'surround-open-1
-                           "abcd" "ef" "g"
-                           #\(
-                           '(["abcd(" "g"]  ["abcd(" "ef)g"]))
-
-(test-parens-behavior/full 'double-quote-1
-                           "" "" ""
-                           #\"
-                           '(["\"" ""] ["\"" "\""]))
-(test-parens-behavior/full 'double-quote-2
-                           "abc " "" ""
-                           #\"
-                           '(["abc \"" ""] ["abc \"" "\""]))
-(test-parens-behavior/full 'double-quote-selection-1
-                           "(abc " "def 123" " xyz]"
-                           #\"
-                           '(["(abc \"" " xyz]"] ["(abc \"" "def 123\" xyz]"]))
-(test-parens-behavior/full 'double-quote-skip-1
-                           "\"abc def " "" "\" 123"
-                           #\"
-                           '(["\"abc def \"" "\" 123"] ["\"abc def \"" " 123"]))
-(test-parens-behavior/full 'double-quote-escaped-1
-                           "\"abcd \\" "" ""
-                           #\"
-                           '(["\"abcd \\\"" ""]
-                             ["\"abcd \\\"" "\""])) ; this inserts double since string was not closed
-(test-parens-behavior/full 'double-quote-escaped-2
-                           "\"abcd \\" "" "\""
-                           #\"
-                           '(["\"abcd \\\"" "\""]
-                             ["\"abcd \\\"" "\""]))
-
-(test-parens-behavior/full 'bar
-                           "abc " "" "123"
-                           #\|
-                           '(["abc |" "123"] ["abc |" "|123"]))
-(test-parens-behavior/full 'bar-literal
-                           "(list 1 #\\" "" ")"
-                           #\|
-                           '(["(list 1 #\\|" ")"] ["(list 1 #\\|" ")"]))
-(test-parens-behavior/full 'bar-skip
-                           "abc |def" "" "|123"
-                           #\|
-                           '(["abc |def|" "|123"] ["abc |def|" "123"]))
-(test-parens-behavior/full 'bar-selection
-                           "abc |def " "hij" "|123"
-                           #\|
-                           '(["abc |def |" "|123"] ["abc |def |" "hij||123"]))
-
-
-(test-parens-behavior/full 'block-comment-1
-                           " #" "" ""
-                           #\|
-                           '([" #|" ""]
-                             [" #|" "|#"]))
-(test-parens-behavior/full 'block-comment-2
-                           "(123 abc#" "" " def 456)"
-                           #\|
-                           '(["(123 abc#|" " def 456)"]
-                             ["(123 abc#|" "|# def 456)"]))
-(test-parens-behavior/full 'block-comment-skip-1
-                           "#| (123 abc" "" "|# def 456)"
-                           #\|
-                           '(["#| (123 abc|" "|# def 456)"]
-                             ["#| (123 abc|#" " def 456)"]))
-
-(test-parens-behavior/full 'close-adjusts-properly-when-space-follows-paren
-                           "( x" "" ""
-                           #\]
-                           '(["( x)" "" ""]
-                             ["( x)" "" ""]))
-(test-parens-behavior/full 'close-adjusts-properly-when-inside-a-comment
-                           "[();" "" ""
-                           #\)
-                           '(["[();)" "" ""]
-                             ["[();)" "" ""]))
-(test-parens-behavior/full 'close-adjusts-properly-when-inside-a-comment.2
-                           "[;" "" "\n"
-                           #\)
-                           '(["[;)" "" "\n"]
-                             ["[;)" "" "\n"]))
-(test-parens-behavior/full 'close-adjusts-properly-when-inside-an-unclosed-string
-                           "[()\"" "" ""
-                           #\)
-                           '(["[()\")" "" ""]
-                             ["[()\")" "" ""]))
-(test-parens-behavior/full 'close-adjusts-properly-when-inside-a-string
-                           "[()\"" "" "\""
-                           #\)
-                           '(["[()\")" "" "\""]
-                             ["[()\")" "" "\""]))
-
-(test-parens-behavior/full 'close-adjusts-properly-when-no-containing-sexp
-                           ")" "" ""
-                           #\]
-                           '([")]" "" ""]
-                             [")]" "" ""]))
-
-(test-parens-behavior/full '|"-splits-string|
-                           " \"abcd" "" "efg\" "
-                           #\"
-                           '([" \"abcd\""     "efg\" "]
-                             [" \"abcd\" "    "\"efg\" "]))
-(test-parens-behavior/full '|"-splits-string-at-beginning|
-                           " \"" "" "abcdefg\" "
-                           #\"
-                           '([" \"\""     "abcdefg\" "]
-                             [" \"\" "    "\"abcdefg\" "]))
-(test-parens-behavior/full '|"-splits-out-selected-string|
-                           " \"abc" "def" "ghi\" "
-                           #\"
-                           '([" \"abc\"" "" "ghi\" "]
-                             ; test that "def" remains selected afterwards...
-                             [" \"abc\" "   "\"def\""    " \"ghi\" "]))
-
-
-
-#| for these, the key-event with meta-down doesn't seem to work... maybe a Mac OS
-  issue; and may cause problems with these tests on another platform? .nah. |#
-(when (equal? 'macosx (system-type))
-  (test-parens-behavior/full 'meta-open-1
-                             "abcd" "" "efg"
-                             '(escape #\()   ; '((new key-event% [key-code #\(] [meta-down #t]))
-                             '(["abcd(" ")efg"]  ["abcd(" ")efg"]))
-
-  (test-parens-behavior/full 'meta-close-skip-1
-                             "(define before (list 1 2" "" " 3 4)"
-                             '(escape #\))   ; '((new key-event% [key-code #\)] [meta-down #t]))
-                             '(["(define before (list 1 2 3 4)" ""]
-                               ["(define before (list 1 2 3 4)" ""]))
-  (test-parens-behavior/full
-   'meta-close-skip-2
-   "#lang racket\n(define before+afters `([\"\" abc \"efg\""
-   ""
-   " 12345 xyz] [84])"
-   '(escape #\))    ;'((new key-event% [key-code #\)] [meta-down #t]))
-   '(["#lang racket\n(define before+afters `([\"\" abc \"efg\" 12345 xyz]" " [84])"]
-     ["#lang racket\n(define before+afters `([\"\" abc \"efg\" 12345 xyz]" " [84])"]))
-  (test-parens-behavior/full 'meta-close-skip-3
-                             "(define before" "" " (list 1 2 3 4)"
-                             '(escape #\))   ; '((new key-event% [key-code #\)] [meta-down #t]))
-                             '(["(define before (list 1 2 3 4)" ""]
-                               ["(define before (list 1 2 3 4)" ""])))
-
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/search.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/search.rkt
deleted file mode 100644
index 3b0fb20a3c..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/search.rkt
+++ /dev/null
@@ -1,168 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         "test-suite-utils.rkt")
-
-(module test racket/base)
-
-(define-syntax (test-search stx)
-  (syntax-case stx ()
-    [(_ args ...)
-     (with-syntax ([line (syntax-line stx)])
-       #'(test-search/proc line args ...))]))
-
-;; creates a search text, binds it to 't' and then, 
-;; for each expression in 'commands', evaluates it in a let 
-;; binding 't'. In between each call to commands, it waits
-;; for the search text to quiesce and then finally gets
-;; the search bubbles, comparing them to 'bubble-table'
-(define (test-search/proc line commands bubble-table)
-  ;(printf "running test on line ~s\n" line)
-  (test
-   (string->symbol (format "search.rkt: line ~a pos immediately" line))
-   (lambda (x) (equal? bubble-table x))
-   (lambda ()
-     (send-sexp-to-mred
-      `(let ([c (make-channel)])
-         (queue-callback
-          (λ () (channel-put c (new (text:searching-mixin (editor:keymap-mixin text:basic%))))))
-         (define t (channel-get c))
-         (define (wait)
-           (let loop ()
-             (queue-callback 
-              (λ ()
-                (channel-put c (send t search-updates-pending?)))
-              #f)
-             (when (channel-get c)
-               (loop))))
-         ,@(apply
-            append
-            (for/list ([command (in-list commands)])
-              (list `(queue-callback (λ () ,command (channel-put c #f)))
-                    '(channel-get c)
-                    '(wait))))
-         (queue-callback 
-          (λ ()
-            (channel-put c (send t get-search-bubbles)))
-          #f)
-         (channel-get c))))))
-
-(test-search (list '(begin (send t insert "") 
-                           (send t set-searching-state "aba" #t #f)
-                           (send t set-position 0 0)))
-             '())
-(test-search (list '(begin (send t insert "") 
-                           (send t set-searching-state "aba" #t #f))
-                   '(send t set-position 0 0))
-             '())
-(test-search (list '(begin (send t insert "aba") 
-                           (send t set-searching-state "aba" #t #f) 
-                           (send t set-position 0 0)))
-             `(((0 . 3) normal-search-color)))
-(test-search (list '(begin (send t insert "aba") 
-                           (send t set-searching-state "aba" #t #f) )
-                   '(send t set-position 0 0))
-             `(((0 . 3) normal-search-color)))
-
-(test-search (list '(begin (send t insert "aba aba")
-                           (send t set-searching-state "aba" #t #f)
-                           (send t set-position 0 0)))
-             `(((0 . 3) normal-search-color)
-               ((4 . 7) normal-search-color)))
-(test-search (list '(begin (send t insert "aba aba")
-                           (send t set-searching-state "aba" #t #f))
-                   '(send t set-position 0 0))
-             `(((0 . 3) normal-search-color)
-               ((4 . 7) normal-search-color)))
-
-
-(test-search (list '(begin (send t insert "abaaba")
-                           (send t set-searching-state "aba" #t #f)
-                           (send t set-position 0 0)))
-             `(((0 . 3) normal-search-color)
-               ((3 . 6) normal-search-color)))
-(test-search (list '(begin (send t insert "abaaba")
-                           (send t set-searching-state "aba" #t #f))
-                   '(send t set-position 0 0))
-             `(((0 . 3) normal-search-color)
-               ((3 . 6) normal-search-color)))
-
-(test-search (list '(begin (send t insert "abababa")
-                           (send t set-searching-state "aba" #t #f)
-                           (send t set-position 0 0)))
-             `(((0 . 3) normal-search-color)
-               ((4 . 7) normal-search-color)))
-(test-search (list '(begin (send t insert "abababa")
-                           (send t set-searching-state "aba" #t #f))
-                   '(send t set-position 0 0))
-             `(((0 . 3) normal-search-color)
-               ((4 . 7) normal-search-color)))
-
-(test-search (list '(begin (send t insert "Aba")
-                           (send t set-searching-state "aba" #t #f)
-                           (send t set-position 0 0)))
-             '())
-(test-search (list '(begin (send t insert "Aba")
-                           (send t set-searching-state "aba" #t #f))
-                   '(send t set-position 0 0))
-             '())
-(test-search (list '(begin (send t insert "Aba")
-                           (send t set-searching-state "aba" #f #f)
-                           (send t set-position 0 0)))
-             `(((0 . 3) normal-search-color)))
-(test-search (list '(begin (send t insert "Aba")
-                           (send t set-searching-state "aba" #f #f))
-                   '(send t set-position 0 0))
-             `(((0 . 3) normal-search-color)))
-
-(test-search (list '(begin (send t set-searching-state "aba" #t 0)
-                           (send t set-position 0)))
-             '())
-
-(test-search (list '(begin (send t insert "aba")
-                           (send t set-searching-state "aba" #f #t)
-                           (send t set-position 0 0)))
-             `(((0 . 3) dark-search-color)))
-(test-search (list '(begin (send t insert "aba")
-                           (send t set-searching-state "aba" #f #t))
-                   '(send t set-position 0 0))
-             `(((0 . 3) dark-search-color)))
-
-(test-search (list '(begin (send t insert "abababa")
-                           (send t set-searching-state "aba" #f #t)
-                           (send t set-position 0 0)))
-             `(((0 . 3) dark-search-color) 
-               ((4 . 7) light-search-color)))
-(test-search (list '(begin (send t insert "abababa")
-                           (send t set-searching-state "aba" #f #t))
-                   '(send t set-position 0 0))
-             `(((0 . 3) dark-search-color) 
-               ((4 . 7) light-search-color)))
-
-(test-search (list '(begin (send t insert "aba aba aba")
-                           (send t set-searching-state "aba" #f #t)
-                           (send t set-position 1 1)))
-             `(((0 . 3) light-search-color)
-               ((4 . 7) dark-search-color)
-               ((8 . 11) light-search-color)))
-(test-search (list '(begin (send t insert "aba aba aba")
-                           (send t set-searching-state "aba" #f #t))
-                   '(send t set-position 1 1))
-             `(((0 . 3) light-search-color)
-               ((4 . 7) dark-search-color)
-               ((8 . 11) light-search-color)))
-
-(test-search (list '(begin (send t insert "aba")
-                           (send t set-searching-state "aba" #f #t))
-                   '(send t set-position 0 0)
-                   '(send t set-position 3 3))
-             `(((0 . 3) light-search-color)))
-(test-search (list '(begin (send t insert "aba")
-                           (send t set-searching-state "aba" #f #t))
-                   '(send t set-position 0 0)
-                   '(send t set-position 1 1))
-             `(((0 . 3) light-search-color)))
-
-(test-search (list '(begin (send t insert "aba")
-                           (send t set-searching-state "aba" #f #t))
-                   '(send t set-searching-state #f #f #f))
-             `())
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/test-docs-complete.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/test-docs-complete.rkt
deleted file mode 100644
index b51c5c330a..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote framework/test))
-(check-docs (quote framework/splash))
-(check-docs (quote framework/preferences))
-(check-docs (quote framework))
-(check-docs (quote framework/gui-utils))
-(check-docs (quote framework/framework))
-(check-docs (quote framework/framework-unit))
-(check-docs (quote framework/framework-sig))
-(check-docs (quote framework/decorated-editor-snip))
-(check-docs (quote framework/comment-snip) #:skip '(snip-class))
-(check-docs (quote framework/collapsed-snipclass) #:skip '(snip-class))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/test-suite-utils.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/test-suite-utils.rkt
deleted file mode 100644
index b5daf8cb48..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/test-suite-utils.rkt
+++ /dev/null
@@ -1,314 +0,0 @@
-#lang racket/base
-
-(require (only-in mzscheme fluid-let)
-         launcher
-         racket/system
-         racket/tcp
-         racket/pretty
-         compiler/find-exe
-         "debug.rkt")
-
-(provide
- test-name
- failed-tests
- number-of-tests
- 
- ;(struct eof-result ())
- eof-result?
- 
- load-framework-automatically
- shutdown-listener shutdown-mred mred-running?
- send-sexp-to-mred queue-sexp-to-mred
- test
- wait-for-frame
- 
- ;; sexp -> void
- ;; grabs the frontmost window, executes the sexp and waits for a new frontmost window
- wait-for-new-frame
- 
- wait-for
- 
- reset-section-jump!
- set-section-jump!
- reset-section-name!
- set-section-name!
- set-only-these-tests!
- get-only-these-tests
- debug-printf
- 
- exn->str)
-
-(define section-jump void)
-(define (set-section-jump! _s) (set! section-jump _s))
-(define (reset-section-jump!) (set! section-jump #f))
-
-(define section-name "<<setup>>")
-(define (set-section-name! _s) (set! section-name _s))
-(define (reset-section-name!) (set! section-name "<<setup>>"))
-
-(define only-these-tests #f)
-(define (get-only-these-tests) only-these-tests)
-(define (set-only-these-tests! _t) (set! only-these-tests _t))
-
-(define test-name "<<setup>>")
-(define failed-tests null)
-(define number-of-tests 0)
-
-(define-struct eof-result ())
-
-(define load-framework-automatically? #t)
-
-(define initial-port 6012)
-(define port-filename
-  (build-path (find-system-path 'temp-dir)
-              "framework-tests-receive-sexps-port.rkt"))
-
-(unless (file-exists? port-filename)
-  (call-with-output-file port-filename
-    (lambda (port) (write initial-port port))))
-
-(define listener
-  (let loop ([port (call-with-input-file port-filename read)])
-    (let ([l (with-handlers ([exn:fail? (lambda (_) #f)])
-               (tcp-listen port))])
-      (if l
-          (begin (debug-printf mz-tcp "listening to ~a\n" port)
-                 (call-with-output-file port-filename
-                   (lambda (p) (write port p))
-                   #:exists 'truncate)
-                 l)
-          (begin (debug-printf mz-tcp "  tcp-listen failed for port ~a\n" port)
-                 (loop (add1 port)))))))
-
-(define in-port #f)
-(define out-port #f)
-
-(define (restart-mred)
-  (shutdown-mred)
-  (thread
-   (lambda ()
-     (define racket-bin (find-exe))
-     (unless (system*
-              racket-bin
-              (path->string
-               (collection-file-path "framework-test-engine.rkt" "framework" "tests")))
-       (eprintf "starting gracket failed; used path ~s\n"
-                racket-bin))))
-  (debug-printf mz-tcp "accepting listener\n")
-  (let-values ([(in out) (tcp-accept listener)])
-    (set! in-port in)
-    (set! out-port out))
-  (when load-framework-automatically?
-    (queue-sexp-to-mred
-     '(begin (eval '(require framework))
-             (eval '(require framework/tests/private/gui))))))
-
-(define load-framework-automatically
-  (case-lambda
-    [(new-load-framework-automatically?)
-     (unless (eq? (not (not new-load-framework-automatically?))
-                  load-framework-automatically?)
-       (set! load-framework-automatically? (not (not new-load-framework-automatically?)))
-       (shutdown-mred))]
-    [() load-framework-automatically?]))
-
-(define shutdown-listener
-  (lambda ()
-    (shutdown-mred)
-    (debug-printf mz-tcp "closing listener\n")
-    (tcp-close listener)))
-
-(define shutdown-mred
-  (lambda ()
-    (when (and in-port
-               out-port)
-      (with-handlers ([exn:fail? (lambda (x) (void))])
-        (close-output-port out-port))
-      (with-handlers ([exn:fail? (lambda (x) (void))])
-        (close-input-port in-port))
-      (set! in-port #f)
-      (set! in-port #f))))
-
-(define (mred-running?)
-  (if (char-ready? in-port)
-      (not (eof-object? (peek-char in-port)))
-      #t))
-
-(define queue-sexp-to-mred
-  (lambda (sexp)
-    (send-sexp-to-mred
-     `(let ([thunk (lambda () ,sexp)]  ;; low tech hygiene
-            [c (make-channel)])
-        (queue-callback (lambda () (channel-put c (with-handlers ((exn:fail? (λ (x) (list 'exn x)))) (list 'normal (thunk))))))
-        (let ([res (channel-get c)])
-          (if (eq? (list-ref res 0) 'normal)
-              (list-ref res 1)
-              (raise (list-ref res 1))))))))
-
-(define re:tcp-read-error (regexp "tcp-read:"))
-(define re:tcp-write-error (regexp "tcp-write:"))
-(define (tcp-error? exn)
-  (or (regexp-match re:tcp-read-error (exn-message exn))
-      (regexp-match re:tcp-write-error (exn-message exn))))
-
-(namespace-require 'racket) ;; in order to make the eval below work right.
-(define (send-sexp-to-mred sexp)
-  (let/ec k
-    (let ([show-text
-           (lambda (sexp)
-             (debug-when messages
-                         (parameterize ([pretty-print-print-line
-                                         (let ([prompt "  "]
-                                               [old-liner (pretty-print-print-line)])
-                                           (lambda (ln port ol cols)
-                                             (let ([ov (old-liner ln port ol cols)])
-                                               (if ln 
-                                                   (begin (display prompt port)
-                                                          (+ (string-length prompt) ov))
-                                                   ov))))])
-                           (pretty-print sexp)
-                           (newline))))])
-      (unless (and in-port
-                   out-port
-                   (with-handlers ([tcp-error? (lambda (x) #f)])
-                     (or (not (char-ready? in-port))
-                         (not (eof-object? (peek-char in-port))))))
-        (restart-mred))
-      (debug-printf messages "  ~a // ~a: sending to framework side to eval:\n"
-                    section-name test-name)
-      (show-text sexp)
-      (with-handlers ([exn:fail?
-                       (lambda (x)
-                         (cond
-                           ;; this means that gracket was closed
-                           ;; so we can restart it and try again.
-                           [(tcp-error? x)
-                            (restart-mred)
-                            (write sexp out-port)
-                            (newline out-port)
-                            (flush-output out-port)]
-                           [else (raise x)]))])
-        (write sexp out-port)
-        (newline out-port)
-        (flush-output out-port))
-      (let ([answer
-             (with-handlers ([exn:fail?
-                              (lambda (x)
-                                (if (tcp-error? x);; assume tcp-error means app closed
-                                    eof
-                                    (list 'cant-read
-                                          (string-append
-                                           (exn->str x)
-                                           "; rest of string: "
-                                           (format
-                                            "~s"
-                                            (apply
-                                             string
-                                             (let loop ()
-                                               (if (char-ready? in-port)
-                                                   (let ([char (read-char in-port)])
-                                                     (if (eof-object? char)
-                                                         null
-                                                         (cons char (loop))))
-                                                   null))))))))])
-               (read in-port))])
-        (debug-printf messages "  ~a // ~a: received from gracket:\n" section-name test-name)
-        (show-text answer)
-        (unless (or (eof-object? answer)
-                    (and (list? answer)
-                         (= 2 (length answer))
-                         (memq (car answer)
-                               '(error last-error cant-read normal))))
-          (error 'send-sexp-to-mred "unpected result from gracket: ~s\n" answer))
-        (if (eof-object? answer)
-            (raise (make-eof-result))
-            (case (car answer)
-              [(error)
-               (error 'send-sexp-to-mred "gracket raised \"~a\"" (list-ref answer 1))]
-              [(last-error)
-               (error 'send-sexp-to-mred "gracket (last time) raised \"~a\"" (list-ref answer 1))]
-              [(cant-read) (error 'mred/cant-parse (list-ref answer 1))]
-              [(normal) 
-               (eval (list-ref answer 1))]))))))
-
-(define test
-  (case-lambda
-    [(in-test-name passed? sexp/proc) (test in-test-name passed? sexp/proc 'section)]
-    [(in-test-name passed? sexp/proc jump)
-     (fluid-let ([test-name in-test-name])
-       (when (or (not only-these-tests)
-                 (memq test-name only-these-tests))
-         (let* ([result
-                 (with-handlers ([exn:fail?
-                                  (lambda (x)
-                                    (if (exn? x)
-                                        (exn->str x)
-                                        x))])
-                   (if (procedure? sexp/proc)
-                       (sexp/proc)
-                       (begin0 (send-sexp-to-mred sexp/proc)
-                               (send-sexp-to-mred ''check-for-errors))))]
-                [failed (with-handlers ([exn:fail?
-                                         (lambda (x)
-                                           (string-append
-                                            "passed? test raised exn: "
-                                            (if (exn? x)
-                                                (exn->str x)
-                                                (format "~s" x))))])
-                          (not (passed? result)))])
-           (set! number-of-tests (+ number-of-tests 1))
-           (when failed
-             (debug-printf schedule "FAILED ~a:\n  ~s\n" test-name result)
-             (set! failed-tests (cons (cons section-name test-name) failed-tests))
-             (case jump
-               [(section) (section-jump)]
-               [(continue) (void)]
-               [else (jump)])))))]))
-
-(define (exn->str exn)
-  (let ([sp (open-output-string)])
-    (parameterize ([current-error-port sp])
-      ((error-display-handler) (exn-message exn) exn))
-    (get-output-string sp)))
-
-(define (wait-for/wrapper wrapper sexp)
-  (let ([timeout 10]
-        [pause-time 1/2])
-    (send-sexp-to-mred
-     (wrapper
-      `(let ([test (lambda () ,sexp)])
-         (let loop ([n ,(/ timeout pause-time)])
-           (if (zero? n)
-               (error 'wait-for
-                      ,(format "after ~a seconds, ~s didn't come true" timeout sexp))
-               (unless (test)
-                 (sleep ,pause-time)
-                 (loop (- n 1))))))))))
-
-(define (wait-for sexp #:queue? [queue? #f]) 
-  (wait-for/wrapper
-   (lambda (x) x)
-   (if queue?
-       `(let ([t (λ () ,sexp)]
-              [c (make-channel)])
-          (queue-callback (λ () (channel-put c (t))))
-          (channel-get c))
-       sexp)))
-
-(define (wait-for-new-frame sexp)
-  (wait-for/wrapper
-   (lambda (w)
-     `(let ([frame (get-top-level-focus-window)])
-        ,sexp
-        ,w))
-   `(not (eq? frame (get-top-level-focus-window)))))
-
-(define (wait-for-frame name [eventspace #f])
-  (let ([exp `(let ([win (get-top-level-focus-window)])
-                (and win
-                     (string=? (send win get-label) ,name)))])
-    (if eventspace
-        (wait-for
-         `(parameterize ([current-eventspace ,eventspace])
-            ,exp))
-        (wait-for exp))))
diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/text.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/text.rkt
deleted file mode 100644
index 33651486ad..0000000000
--- a/pkgs/gui-pkgs/gui-test/framework/tests/text.rkt
+++ /dev/null
@@ -1,468 +0,0 @@
-#lang racket/base
-
-(require racket/file
-         "test-suite-utils.rkt")
-
-(module test racket/base)
-
-(define dummy-frame-title "dummy to avoid quitting")
-(queue-sexp-to-mred `(send (make-object frame:basic% ,dummy-frame-title) show #t))
-
-(define (test-creation frame% class name)
-  (test
-   name
-   (lambda (x) 
-     (equal? x (list dummy-frame-title))) ;; ensure no frames left
-   (lambda ()
-     (let ([label
-            (queue-sexp-to-mred
-             `(let ([f (new (class ,frame%
-                              (define/override (get-editor%) ,class)
-                              (super-new)))])
-                (send (send f get-editor) set-max-undo-history 10)
-                (send f show #t)
-                (send f get-label)))])
-       (wait-for-frame label)
-       (send-sexp-to-mred `(test:keystroke #\a))
-       (wait-for #:queue? #t `(string=? "a" (send (send (get-top-level-focus-window) get-editor) get-text)))
-       (queue-sexp-to-mred
-        `(begin 
-           ;; remove the `a' to avoid save dialog boxes (and test them, I suppose)
-           (send (send (get-top-level-focus-window) get-editor) undo) 
-           (send (send (get-top-level-focus-window) get-editor) undo)
-           
-           (send (send (get-top-level-focus-window) get-editor) lock #t)
-           (send (send (get-top-level-focus-window) get-editor) lock #f)
-           (send (get-top-level-focus-window) close)))
-       (queue-sexp-to-mred `(map (lambda (x) (send x get-label)) (get-top-level-windows)))))))
-
-#|
-  (test-creation 'frame:text%
-                 '(text:basic-mixin (editor:basic-mixin text%))
-                 'text:basic-mixin-creation)
-  (test-creation 'frame:text%
-                 'text:basic%
-                 'text:basic-creation)
-  |#
-(test-creation 'frame:text%
-               '(editor:file-mixin text:keymap%)
-               'editor:file-mixin-creation)
-
-(test-creation 'frame:text%
-               'text:file%
-               'text:file-creation)
-(test-creation 'frame:text%
-               '(text:clever-file-format-mixin text:file%)
-               'text:clever-file-format-mixin-creation)
-(test-creation 'frame:text%
-               'text:clever-file-format%
-               'text:clever-file-format-creation)
-(test-creation 'frame:text%
-               '(editor:backup-autosave-mixin text:clever-file-format%)
-               'editor:backup-autosave-mixin-creation)
-(test-creation 'frame:text%
-               'text:backup-autosave%
-               'text:backup-autosave-creation)
-(test-creation 'frame:text%
-               '(text:searching-mixin text:backup-autosave%)
-               'text:searching-mixin-creation)
-(test-creation 'frame:text%
-               'text:searching%
-               'text:searching-creation)
-(test-creation '(frame:searchable-mixin frame:text%)
-               '(text:info-mixin (editor:info-mixin text:searching%))
-               'text:info-mixin-creation)
-(test-creation '(frame:searchable-mixin frame:text%)
-               'text:info%
-               'text:info-creation)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; testing highlight-range method
-;;
-
-
-
-(test
- 'highlight-range1
- (lambda (x) (equal? x 1))
- (λ ()
-   (queue-sexp-to-mred
-    `(let ([t (new text:basic%)])
-       (send t insert "abc")
-       (send t highlight-range 1 2 "red")
-       (length (send t get-highlighted-ranges))))))
-
-(test
- 'highlight-range2
- (lambda (x) (equal? x 0))
- (λ ()
-   (queue-sexp-to-mred
-    `(let ([t (new text:basic%)])
-       (send t insert "abc")
-       ((send t highlight-range 1 2 "red"))
-       (length (send t get-highlighted-ranges))))))
-
-
-(test
- 'highlight-range3
- (lambda (x) (equal? x 0))
- (λ ()
-   (queue-sexp-to-mred
-    `(let ([t (new text:basic%)])
-       (send t insert "abc")
-       (send t highlight-range 1 2 "red")
-       (send t unhighlight-range 1 2 "red")
-       (length (send t get-highlighted-ranges))))))
-
-
-(test
- 'highlight-range4
- (lambda (x) (equal? x 1))
- (λ ()
-   (queue-sexp-to-mred
-    `(let ([t (new text:basic%)])
-       (send t insert "abc")
-       (send t highlight-range 1 2 "red")
-       (send t highlight-range 1 2 "red")
-       (send t unhighlight-range 1 2 "red")
-       (length (send t get-highlighted-ranges))))))
-
-
-
-(test
- 'highlight-range5
- (lambda (x) (equal? x 0))
- (λ ()
-   (queue-sexp-to-mred
-    `(let ([t (new text:basic%)])
-       (send t insert "abc")
-       (send t highlight-range 1 2 "red")
-       (send t highlight-range 1 2 "red")
-       (send t unhighlight-range 1 2 "red")
-       (send t unhighlight-range 1 2 "red")
-       (length (send t get-highlighted-ranges))))))
-
-(let ([tmp-file (path->string (make-temporary-file "fwtesttmp~a"))])
-  (test
-   'highlight-range/revert
-   (lambda (x)
-     (delete-file tmp-file)
-     (equal? x 0))
-   (λ ()
-     (queue-sexp-to-mred
-      `(let ([t (new text:basic%)])
-         (send t insert "abc")
-         (send t save-file ,tmp-file)
-         (send t highlight-range 0 3 "red")
-         (call-with-output-file ,tmp-file
-           (lambda (port) (display "x\n" port))
-           #:exists 'truncate)
-         (send t load-file)
-         (length (send t get-highlighted-ranges)))))))
-
-(test
- 'highlight-range-delegate-1
- (lambda (x) (equal? x 0))
- (λ ()
-   (queue-sexp-to-mred
-    `(let ([t (new text:delegate%)])
-       (send t insert "abc")
-       (send t highlight-range 1 2 "red")
-       (send t unhighlight-range 1 2 "red")
-       (length (send t get-highlighted-ranges))))))
-
-(test
- 'highlight-range-delegate-1
- (lambda (x) (equal? x 0))
- (λ ()
-   (queue-sexp-to-mred
-    `(let ([t (new text:delegate%)])
-       (send t set-delegate (new text:basic%))
-       (send t insert "abc")
-       (send t highlight-range 1 2 "red")
-       (send t unhighlight-range 1 2 "red")
-       (length (send t get-highlighted-ranges))))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  testing get-pos/text method
-;;
-
-(test
-  'get-pos/text-1
-  (λ (x) x)
-  (λ ()
-    (queue-sexp-to-mred
-      '(let* ([f (new frame% [label "Test frame"])]
-              [t (new text:basic%)]
-              [c (new editor-canvas% [parent f] [editor t])]
-              [snip (make-object string-snip% "Test string")])
-          (send t insert snip)
-          (define-values (x-box y-box) (values (box 0) (box 0)))
-          (send t get-snip-location snip x-box y-box)
-          (send t local-to-global x-box y-box)
-          (define event (new mouse-event% [event-type 'motion]
-                                          [x (add1 (unbox x-box))]
-                                          [y (add1 (unbox y-box))]))
-          (let-values ([(pos edit) (send t get-pos/text event)])
-            (and (real? (car p)) (is-a? (cdr p) text%)))))))
-
-(test
-  'get-pos/text-2
-  (λ (x) x)
-  (λ ()
-    (queue-sexp-to-mred
-      '(let* ([f (new frame% [label "Test frame"])]
-              [t (new text:basic%)]
-              [c (new editor-canvas% [parent f] [editor t])]
-              [snip (make-object string-snip% "Test string")])
-          (send t insert snip)
-          (define-values (x-box y-box) (values (box 0) (box 0)))
-          (send t get-snip-location snip x-box y-box)
-          (send t local-to-global x-box y-box)
-          (define event (new mouse-event% [event-type 'motion]
-                                          [x (+ 9999 (unbox x-box))]
-                                          [y (+ 9999 (unbox y-box))]))
-          (let-values ([(pos edit) (send t get-pos/text event)])
-            (and (false? pos) (false? edit)))))))
-
-(test
-  'get-pos/text-3
-  (λ (x) x)
-  (λ ()
-    (queue-sexp-to-mred
-      '(let* ([f (new frame% [label "Test frame"])]
-              [t (new text:basic%)]
-              [c (new editor-canvas% [parent f] [editor t])]
-              [p (new pasteboard%)]
-              [s-snip (make-object string-snip% "Test string")]
-              [e-snip (new editor-snip% [editor p])])
-          (send p insert s-snip)
-          (send t insert e-snip)
-          (define-values (x-box y-box) (values (box 0) (box 0)))
-          (send t get-snip-location e-snip x-box y-box)
-          (send t local-to-global x-box y-box)
-          (define event (new mouse-event% [event-type 'motion]
-                                          [x (add1 (unbox x-box))]
-                                          [y (add1 (unbox y-box))]))
-          (let-values ([(pos edit) (send t get-pos/text event)])
-            (and (false? pos) (is-a? edit pasteboard%)))))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  print-to-dc
-;;
-
-(test
- 'print-to-dc
- (λ (x) (equal? x 'no-error))
- (λ ()
-   (queue-sexp-to-mred
-    '(let* ([t (new text:basic%)]
-            [bmp (make-object bitmap% 100 40)]
-            [dc (new bitmap-dc% (bitmap bmp))])
-       (send t insert "Hello world")
-       (send dc clear)
-       (send t print-to-dc dc 1)
-       'no-error))))
-
-
-(test
- 'print-to-dc2
- (λ (x) (equal? x 'no-error))
- (λ ()
-   (queue-sexp-to-mred
-    `(let* ([f (new frame% [label ""])]
-            [t (new text:basic%)]
-            [ec (new editor-canvas% [parent f] [editor t])]
-            [bmp (make-object bitmap% 100 40)]
-            [dc (new bitmap-dc% (bitmap bmp))])
-       (send t insert "Hello world")
-       (send t highlight-range 2 5 "orange")
-       (send f reflow-container)
-       (send dc clear)
-       (send t print-to-dc dc 1)
-       'no-error))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  text:ports
-;;
-
-;; there is an internal buffer of this size, so writes that are larger and smaller are interesting
-(define buffer-size 4096)
-
-(let ()
-  (define big-str
-    (build-string (* buffer-size 2) (λ (i) (integer->char (+ (modulo i 26) (char->integer #\a))))))
-  (define non-ascii-str "λαβ一二三四五")
-  (define (do/separate-thread str mtd)
-    (queue-sexp-to-mred
-     `(let* ([t (new (text:ports-mixin text:wide-snip%))]
-             [op (send t ,mtd)]
-             [exn #f])
-        (yield
-         (thread
-          (λ () 
-            (with-handlers ((exn:fail? (λ (x) (set! exn x))))
-              (display ,str op)
-              (flush-output op)))))
-        (when exn (raise exn))
-        (send t get-text 0 (send t last-position)))))
-  
-  (test 
-   'text:ports%.1
-   (λ (x) (equal? x "abc"))
-   (λ () (do/separate-thread "abc" 'get-out-port)))
-  
-  (test 
-   'text:ports%.2
-   (λ (x) (equal? x big-str))
-   (λ () (do/separate-thread big-str 'get-out-port)))
-  
-  (test 
-   'text:ports%.3
-   (λ (x) (equal? x non-ascii-str))
-   (λ () (do/separate-thread non-ascii-str 'get-out-port)))
-  
-  (test 
-   'text:ports%.4
-   (λ (x) (equal? x "abc"))
-   (λ () (do/separate-thread "abc" 'get-err-port)))
-  
-  (test 
-   'text:ports%.5
-   (λ (x) (equal? x big-str))
-   (λ () (do/separate-thread big-str 'get-err-port)))
-  
-  (test 
-   'text:ports%.6
-   (λ (x) (equal? x non-ascii-str))
-   (λ () (do/separate-thread non-ascii-str 'get-err-port)))
-  
-  
-  (test 
-   'text:ports%.7
-   (λ (x) (equal? x "abc"))
-   (λ () (do/separate-thread "abc" 'get-value-port)))
-  
-  (test 
-   'text:ports%.8
-   (λ (x) (equal? x big-str))
-   (λ () (do/separate-thread big-str 'get-value-port)))
-  
-  (test 
-   'text:ports%.9
-   (λ (x) (equal? x non-ascii-str))
-   (λ () (do/separate-thread non-ascii-str 'get-value-port)))
-  
-  ;; display the big string, one char at a time
-  (test
-   'text:ports%.10
-   (λ (x) (equal? x big-str))
-   (λ () 
-     (queue-sexp-to-mred
-      `(let* ([t (new (text:ports-mixin text:wide-snip%))]
-              [op (send t get-out-port)]
-              [big-str ,big-str]
-              [exn #f])
-         (yield
-          (thread
-           (λ () 
-             (with-handlers ((exn:fail? (λ (x) (set! exn x))))
-               (let loop ([i 0])
-                 (when (< i (string-length big-str))
-                   (display (string-ref big-str i) op)
-                   (loop (+ i 1))))
-               (flush-output op)))))
-         (when exn (raise exn))
-         (send t get-text 0 (send t last-position))))))
-  
-  (let ([s "五"])
-    (test
-     'text:ports%.partial-encoding
-     (λ (x) (equal? x s))
-     (λ ()
-       (define bts (string->bytes/utf-8 s))
-       (queue-sexp-to-mred
-        `(let ()
-           (define t (new (text:ports-mixin text:wide-snip%)))
-           (define p (send t get-out-port))
-           (void (write-bytes (bytes ,(bytes-ref bts 0)) p))
-           (flush-output p)
-           (void (write-bytes ,(subbytes bts 1 (bytes-length bts)) p))
-           (flush-output p)
-           (send t get-text))))))
-  
-  (let ([b (bytes 195 195 (char->integer #\a))])
-    (test
-     'text:ports%.broken-encoding
-     (λ (x) 
-       (define c (bytes-open-converter "UTF-8-permissive" "UTF-8"))
-       (define-values (result-bytes src-read-amt termination) (bytes-convert c b))
-       (equal? x (bytes->string/utf-8 result-bytes)))
-     (λ ()
-       (queue-sexp-to-mred
-        `(let ()
-           (define t (new (text:ports-mixin text:wide-snip%)))
-           (define p (send t get-out-port))
-           (yield
-            (thread
-             (λ ()
-               (write-bytes ,b p)
-               (flush-output p))))
-           (send t get-text))))))
-
-     
-  ;; the next tests test the interaction when the current
-  ;; thread is the same as the handler thread of the eventspace
-  ;; where the text was created
-  
-  (test 
-   'text:ports%.thd1
-   (λ (x) (equal? x "abc"))
-   (λ ()
-     (queue-sexp-to-mred
-      `(let* ([t (new (text:ports-mixin text:wide-snip%))]
-              [op (send t get-out-port)]
-              [exn #f])
-         (display "abc" op)
-         (flush-output op)
-         (send t get-text 0 (send t last-position))))))
-  
-  (test 
-   'text:ports%.thd2
-   (λ (x) (equal? x big-str))
-   (λ ()
-     (queue-sexp-to-mred
-      `(let* ([t (new (text:ports-mixin text:wide-snip%))]
-              [op (send t get-out-port)])
-         (display ,big-str op)
-         (flush-output op)
-         (send t get-text 0 (send t last-position))))))
-  
-  (test 
-   'text:ports%.thd3
-   (λ (x) (equal? x non-ascii-str))
-   (λ ()
-     (queue-sexp-to-mred
-      `(let* ([t (new (text:ports-mixin text:wide-snip%))]
-              [op (send t get-out-port)])
-         (display ,non-ascii-str op)
-         (flush-output op)
-         (send t get-text 0 (send t last-position))))))
-  
-  (test 
-   'text:ports%.thd4
-   (λ (x) (equal? x non-ascii-str))
-   (λ ()
-     (queue-sexp-to-mred
-      `(let* ([t (new (text:ports-mixin text:wide-snip%))]
-              [op (send t get-out-port)])
-         (display ,non-ascii-str op)
-         (flush-output op)
-         (send t get-text 0 (send t last-position)))))))
diff --git a/pkgs/gui-pkgs/gui-test/info.rkt b/pkgs/gui-pkgs/gui-test/info.rkt
deleted file mode 100644
index d44f485555..0000000000
--- a/pkgs/gui-pkgs/gui-test/info.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-(define build-deps '("racket-index"
-                     "scheme-lib"
-                     "draw-lib"
-                     "racket-test"
-                     "sgl"
-                     "snip-lib"
-                     "wxme-lib"
-                     "gui-lib"
-                     "rackunit-lib"
-                     "pconvert-lib"
-                     "compatibility-lib"
-                     "sandbox-lib"))
-(define update-implies '("gui-lib"))
-
-(define pkg-desc "tests for \"gui\"")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/gui-pkgs/gui-test/mrlib/tests/image-core.rkt b/pkgs/gui-pkgs/gui-test/mrlib/tests/image-core.rkt
deleted file mode 100644
index e8bf39beb8..0000000000
--- a/pkgs/gui-pkgs/gui-test/mrlib/tests/image-core.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-
-(require rackunit 
-         mrlib/image-core
-         (only-in racket/gui/base make-bitmap))
-
-;; just check there is no error
-(check-equal? (begin (un/cache-image (make-bitmap 1 1) #t)
-                     (void))
-              (void))
\ No newline at end of file
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/.gitignore b/pkgs/gui-pkgs/gui-test/tests/gracket/.gitignore
deleted file mode 100644
index ee4173f0a4..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/tmp*
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/README b/pkgs/gui-pkgs/gui-test/tests/gracket/README
deleted file mode 100644
index a9259ec48c..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/README
+++ /dev/null
@@ -1,22 +0,0 @@
-
-The "item.rkt" test (use `require') creates a frame to select among
-several types of control-testing frames. Click the `Get Instructions'
-button in the top-left for more information.
-
----------------------------------------------------------------------------
-
-The "draw.rkt" test (use load/cd) tests drawing commands. Click the
-"What Should I See?" button for further details.
-
----------------------------------------------------------------------------
-
-The "mem.rkt" test
-  gracket mem.rkt
-creates a lot of frames and instance of other objects, reporting
-memory information along the way. At the end, before the last memory
-dump, objects that are still allocated are displayed like this:
-  (frame (1 . 5))
-This means that the frame allocated by thread #1 at cycle 5
-(counting down from some number) hasn't been garbage-collected.
-If there's a few of these lines (around 10), that's ok.
-A large number of lines (say, 50) indicates a GC problem.
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/bitmap-stress.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/bitmap-stress.rkt
deleted file mode 100644
index 1089a3ed23..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/bitmap-stress.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         racket/file)
-
-;; Check memory-management in the bitmap/PNG/JPEG/etc. library by reading
-;; and writing in many threads at the same time.
-
-(define (check src save-type [read-type 'unknown/alpha])
-  (define ts
-    (for/list ([i (in-range 40)])
-      (thread
-       (lambda()
-         (for ([i (in-range 10)])
-           (define bm (read-bitmap (collection-file-path src "icons")))
-           (define t (make-temporary-file))
-           (send bm save-file t save-type)
-           (define bm2 (read-bitmap t read-type))
-           (define w (send bm get-width))
-           (define h (send bm get-width))
-           (define s1 (make-bytes (* w h 4)))
-           (define s2 (make-bytes (* w h 4)))
-           (send bm get-argb-pixels 0 0 w h s1)
-           (send bm2 get-argb-pixels 0 0 w h s2)
-           (case save-type
-             [(jpeg)
-              ;; JPEG is lossy, so use a fuzzy compare:
-              (define diff (for/sum ([b1 (in-bytes s1)]
-                                     [b2 (in-bytes s2)])
-                                    (- b2 b1)))
-              (unless ((abs diff) . < . (* w h 1))
-                (error 'bitmap-stress "mismatch for ~s ~s: ~s ~s ~e" 
-                       src save-type 
-                       w h diff))]
-             [else
-              (unless (equal? s1 s2)
-                (error 'bitmap-stress "mismatch for ~s ~s" src save-type))])
-           (delete-file t))))))
-  
-  (for ([t (in-list ts)]) (sync t)))
-
-(check "PLT-206.png" 'png)
-(check "plt.jpg" 'jpeg)
-(check "htdp-icon.gif" 'png 'unknown)
-(check "help16x16.xpm" 'png 'unknown)
-(check "help16x16.xbm" 'png 'unknown)
-(check "help.bmp" 'png 'unknown)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/blits.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/blits.rkt
deleted file mode 100644
index d7d2b9034d..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/blits.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang scheme/gui
-
-(define ok-frame (make-object frame% "Ok"))
-(define ok-panel #f)
-
-(define (try path mode color bg-color sx sy)
-  (let ([bm (if (is-a? path bitmap%)
-		path
-		(make-object bitmap% path 'unknown/mask))])
-    (let ([w (inexact->exact (ceiling (* sx (send bm get-width))))]
-          [h (inexact->exact (ceiling (* sy (send bm get-height))))])
-      (let* ([dest1 (make-object bitmap% w h)]
-             [dest2 (make-object bitmap% w h)]
-             [dc1 (make-object bitmap-dc% dest1)]
-             [dc2 (make-object bitmap-dc% dest2)]
-             [s1 (make-bytes (* w h 4))]
-             [s2 (make-bytes (* w h 4))])
-        (send dc1 clear)
-        (send dc2 clear)
-	(send dc1 set-brush bg-color 'solid)
-	(send dc1 draw-rectangle 0 0 w h)
-	(send dc2 set-brush bg-color 'solid)
-	(send dc2 draw-rectangle 0 0 w h)
-	(send dc1 set-scale sx sy)
-	(send dc2 set-scale sx sy)
-        (send dc1 draw-bitmap bm 0 0 
-              mode color (send bm get-loaded-mask))
-        (send dc2 draw-bitmap bm 0 0 
-              mode color (send bm get-loaded-mask))
-        (send dc1 get-argb-pixels 0 0 w h s1)
-        (send dc2 get-argb-pixels 0 0 w h s2)
-	(send dc1 set-bitmap #f)
-	(send dc2 set-bitmap #f)
-        (if (bytes=? s1 s2)
-	    (make-object message% dest1 ok-panel)
-	    (let ([f (make-object frame% "Different!")])
-	      (make-object message% dest1 f)
-	      (make-object message% dest2 f)
-	      (send f show #t)))))))
-
-(define (self-mask path)
-  (let ([bm (make-object bitmap% path)])
-    (send bm set-loaded-mask bm)
-    bm))
-
-(define (plus-mask path mpath)
-  (let ([bm (make-object bitmap% path)]
-	[xmbm (make-object bitmap% mpath)])
-    (let* ([w (send bm get-width)]
-	   [h (send bm get-height)]
-	   [mbm (make-object bitmap% w h (= 1 (send xmbm get-depth)))]
-	   [dc (make-object bitmap-dc% mbm)])
-      (send dc clear)
-      (send dc draw-bitmap-section xmbm 0 0 0 0 w h)
-      (send dc set-bitmap #f)
-      (send bm set-loaded-mask mbm)
-      bm)))
-
-(define targets
-  (list
-   ;; (collection-file-path "clock.png" "frtime" "tool")
-   ;; (self-mask (collection-file-path "clock.png" "frtime" "tool"))
-   (collection-file-path "foot-up.png" "icons")
-   (collection-file-path "mred.xbm" "icons")
-   (self-mask (collection-file-path "mred.xbm" "icons"))
-   (plus-mask (collection-file-path "mred.xbm" "icons")
-	      (collection-file-path "PLT-206.png" "icons"))
-   ;; (plus-mask (collection-file-path "clock.png" "frtime" "tool")
-   ;;            (collection-file-path "mred.xbm" "icons"))
-   (collection-file-path "htdp-icon.gif" "icons")
-   ))
-
-(for-each 
- (lambda (mode)
-   (for-each (lambda (sx sy)
-	       (set! ok-panel (make-object horizontal-panel% ok-frame))
-	       (for-each 
-		(lambda (fg)
-		  (for-each (lambda (target)
-			      (try target
-				   mode
-				   fg
-				   (make-object color% "green")
-				   sx sy))
-			    targets))
-		(list (make-object color% "black")
-		      (make-object color% "red"))))
-	     '(1 3/2 1/2)
-	     '(1 1/2 3/2)))
- '(solid opaque xor))
-
-
-(send ok-frame show #t)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/button-steps.txt b/pkgs/gui-pkgs/gui-test/tests/gracket/button-steps.txt
deleted file mode 100644
index e2e233ace2..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/button-steps.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Click the "Hit Me" button. "Callback Ok" should appear in the console.
-
-Click "Check". "All Ok" should appear in the console.
-
-Repeat the above two steps.
-
-Click "Disable Test" and quickly click "Hit Me". The button should
- become disabled for a second, then become re-enabled, but the
- click on "Hit Me" should not invoke the callback.
-
-Repeat the first two steps above.
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/cache-image-snip-test.rktl b/pkgs/gui-pkgs/gui-test/tests/gracket/cache-image-snip-test.rktl
deleted file mode 100644
index 089b45d82a..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/cache-image-snip-test.rktl
+++ /dev/null
@@ -1,290 +0,0 @@
-(load (collection-file-path "loadtest.rktl" "tests/racket"))
-
-(require racket/gui/base
-         mrlib/cache-image-snip
-         mzlib/unit)
-
-(invoke-unit
- (unit 
-   (import)
-   (export)
-   
-   (define (overlay-bitmap/ret argb dx dy b1 b2)
-     (overlay-bitmap argb dx dy b1 b2)
-     (argb-vector argb))
-
-   (let ([argb (make-argb (vector 100 10 20 30) 1 1)]
-         [bm (build-bitmap void 1 1)])
-     (test #(100 10 20 30) overlay-bitmap/ret argb 0 0 bm bm))
-
-   (let ([argb (make-argb (make-vector 4 0) 1 1)]
-         [bm (build-bitmap 
-              (lambda (dc)
-                (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-                (send dc draw-line 0 0 0 0))
-              1 1)])
-     (test #4(0) overlay-bitmap/ret argb 0 0 bm bm))
-   
-   (let ([argb (make-argb (make-vector 4 100) 1 1)]
-         [bm (build-bitmap 
-              (lambda (dc)
-                (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-                (send dc draw-line 0 0 0 0))
-              1 1)])
-     (test #4(0) overlay-bitmap/ret argb 0 0 bm bm))
-   
-   (let ([argb (make-argb (make-vector 8 254) 1 1)]
-         [bm (build-bitmap void 1 2)])
-     (test #8(254) overlay-bitmap/ret argb 0 0 bm bm))
-   
-   (let ([argb (make-argb (make-vector 8 0) 1 1)]
-         [bm (build-bitmap 
-              (lambda (dc)
-                (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-                (send dc draw-line 0 0 0 1))
-              1 2)])
-     (test #8(0) overlay-bitmap/ret argb 0 0 bm bm))
-      
-   (let ([argb (make-argb (make-vector 16 100) 2 2)]
-         [bm (build-bitmap 
-              (lambda (dc)
-                (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-                (send dc draw-line 0 0 0 0))
-              2 2)])
-     (test #16(0 0 0 0
-               100 100 100 100
-               100 100 100 100
-               100 100 100 100)
-           overlay-bitmap/ret argb 0 0 bm bm))
-   
-   (let ([argb (make-argb (make-vector 16 100) 2 2)]
-         [bm (build-bitmap 
-              (lambda (dc)
-                (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-                (send dc draw-line 1 0 1 0))
-              2 2)])
-     (test #16(100 100 100 100
-               0 0 0 0
-               100 100 100 100
-               100 100 100 100)
-           overlay-bitmap/ret argb 0 0 bm bm))
-   
-   (let ([argb (make-argb (make-vector 16 100) 2 2)]
-         [bm (build-bitmap 
-              (lambda (dc)
-                (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-                (send dc draw-line 0 1 0 1))
-              2 2)])
-     (test #16(100 100 100 100
-               100 100 100 100
-               0 0 0 0
-               100 100 100 100)
-           overlay-bitmap/ret argb 0 0 bm bm))
-   
-   (let ([argb (make-argb (make-vector 16 100) 2 2)]
-         [bm (build-bitmap 
-              (lambda (dc)
-                (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-                (send dc draw-line 1 1 1 1))
-              2 2)])
-     (test #16(100 100 100 100
-               100 100 100 100
-               100 100 100 100
-               0 0 0 0)
-           overlay-bitmap/ret argb 0 0 bm bm))
-   
-   (let ([argb (make-argb (make-vector 4 200) 1 1)]
-         [c (build-bitmap 
-             (lambda (dc)
-               (send dc set-pen 
-                     (send the-pen-list find-or-create-pen (make-object color% 0 0 100) 1 'solid))
-               (send dc draw-line 0 0 0 0))
-             1 1)]
-         [m (build-bitmap 
-             (lambda (dc)
-               (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-               (send dc draw-line 0 0 0 0))
-             1 1)])
-     (test #4(0 0 0 100) overlay-bitmap/ret argb 0 0 c m))
-   
-   (let ([argb (make-argb (make-vector 4 200) 1 1)]
-         [c (build-bitmap 
-             (lambda (dc)
-               (send dc set-pen 
-                     (send the-pen-list find-or-create-pen (make-object color% 0 100 0) 1 'solid))
-               (send dc draw-line 0 0 0 0))
-             1 1)]
-         [m (build-bitmap 
-             (lambda (dc)
-               (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-               (send dc draw-line 0 0 0 0))
-             1 1)])
-     (test #4(0 0 100 0) overlay-bitmap/ret argb 0 0 c m))
-   
-   (let ([argb (make-argb (make-vector 4 200) 1 1)]
-         [c (build-bitmap 
-             (lambda (dc)
-               (send dc set-pen 
-                     (send the-pen-list find-or-create-pen (make-object color% 100 0 0) 1 'solid))
-               (send dc draw-line 0 0 0 0))
-             1 1)]
-         [m (build-bitmap 
-             (lambda (dc)
-               (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-               (send dc draw-line 0 0 0 0))
-             1 1)])
-     (test #4(0 100 0 0) overlay-bitmap/ret argb 0 0 c m))
-   
-   (let ([argb (make-argb (make-vector (* 2 2 4) 200) 2 2)]
-         [bm (build-bitmap 
-              (lambda (dc)
-                (send dc set-pen 
-                      (send the-pen-list find-or-create-pen "black" 1 'solid))
-                (send dc draw-line 0 0 0 1))
-             1 1)])
-     (test #(200 200 200 200 000 000 000 000 
-             200 200 200 200 200 200 200 200)
-           overlay-bitmap/ret
-           argb
-           1 0
-           bm bm))
-   
-   (let ([argb (make-argb (make-vector (* 2 2 4) 200) 2 2)]
-         [bm (build-bitmap 
-              (lambda (dc)
-                (send dc set-pen 
-                      (send the-pen-list find-or-create-pen "black" 1 'solid))
-                (send dc draw-line 0 0 0 1))
-             1 1)])
-     (test #(200 200 200 200 200 200 200 200 
-             000 000 000 000 200 200 200 200)
-           overlay-bitmap/ret
-           argb
-           0 1
-           bm bm))
-   
-   ;; used to test argb->bitmap
-   (define (argb->bitmap->string argb)
-     (bitmap->string (argb->bitmap argb)))
-   
-   ;; extracts the argb strings from the bitmap and its mask for comparison
-   (define (bitmap->string main-bm)
-     (let* ([w (send main-bm get-width)]
-            [h (send main-bm get-height)]
-            [get-one
-             (lambda (bm)
-               (let ([dc (make-object bitmap-dc% bm)]
-                     [str (make-bytes (* 4 w h) 0)])
-                 (send dc get-argb-pixels 0 0 w h str)
-                 (send dc set-bitmap #f)
-                 str))])
-       (list (and (send main-bm get-loaded-mask)
-                  (get-one (send main-bm get-loaded-mask)))
-             (get-one main-bm))))
-   
-   (test '(#"\377\377\377\377" #"\377\377\377\377") argb->bitmap->string (make-argb #(255 255 255 255) 1 1))
-   (test '(#"\377\377\377\377" #"\377\0\0\0") argb->bitmap->string (make-argb #(255 0 0 0) 1 1))
-   (test '(#"\377\1\1\1" #"\377\100\100\100") argb->bitmap->string (make-argb #(1 64 64 64) 1 1))
-   (test '(#"\377\001\001\001\377\010\010\010\377\377\377\377\377\000\000\000"
-           #"\377\100\100\100\377\001\010\100\377\377\377\377\377\000\000\000") 
-         argb->bitmap->string
-         (make-argb #(1 64 64 64 
-                      8 1 8 64
-                      255 255 255 255
-                      0 0 0 0)
-                    2 2))
-   
-   (define (show-bitmap bm mask title)
-     (define f (new frame% (label title) (width 200) (height 200)))
-     (define c (new canvas%
-                    (parent f)
-                    (paint-callback
-                     (lambda (c dc)
-                       (send dc draw-bitmap bm 0 0 'solid 
-                             (send the-color-database find-color "black")
-                             mask)))))
-     (send f show #t))
-   
-   (let* ([font (send the-font-list find-or-create-font 12 'default 'normal 'normal #f 'partly-smoothed)]
-          [black (send the-color-database find-color "black")]
-          [bkg-color "plum"]
-          [font-color (send the-color-database find-color "forestgreen")]
-          [str "xXxXx"]
-          [w 100]
-          [h 30]
-          [argb-vector (make-vector (* w h 4) 0)]
-          [argb (make-argb argb-vector w h)]
-          [c1 (build-bitmap 
-               (lambda (dc)
-                 (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-                 (send dc set-brush (send the-brush-list find-or-create-brush bkg-color 'solid))
-                 (send dc draw-rectangle 0 0 w h))
-               w h)]
-          [m1 (build-bitmap 
-               (lambda (dc)
-                 (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-                 (send dc set-brush (send the-brush-list find-or-create-brush "black" 'solid))
-                 (send dc draw-rectangle 0 0 w h))
-               w h)]
-          [c2 (build-bitmap 
-               (lambda (dc)
-                 (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-                 (send dc set-brush (send the-brush-list find-or-create-brush font-color 'solid))
-                 (send dc draw-rectangle 0 0 w h))
-               w h)]
-          [m2 (build-bitmap
-               (lambda (dc)
-                 (send dc set-font font)
-                 (send dc set-text-mode 'solid)
-                 (send dc set-text-foreground black)
-                 (send dc draw-text str 2 2))
-               w h)]
-          [final
-           (build-bitmap
-            (lambda (dc)
-              (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-              (send dc set-brush (send the-brush-list find-or-create-brush bkg-color 'solid))
-              (send dc draw-rectangle 0 0 w h)
-              (send dc set-font font)
-              (send dc set-text-mode 'transparent)
-              (send dc set-text-foreground font-color)
-              (send dc draw-text str 2 2))
-            w h)])
-     
-     (overlay-bitmap argb 0 0 c1 m1)
-     (overlay-bitmap argb 0 0 c2 m2)
-
-     ;; at this point, the `final' bitmap should be the same as argb,
-     ;; but it isn't, due to rounding error (final is actually wrong!)
-     ;; the stuff below just makes sure that each entry is within 3
-     
-     
-     ;; the expression below shows the truncated bitmap, 
-     ;; the true bitmap (after rounding) and the difference, as a bitmap
-     #;
-     (let* ([argb-bitmap (flatten-bitmap (argb->bitmap argb))]
-            [argb-str (cadr (bitmap->string argb-bitmap))]
-            [bitmap-str (cadr (bitmap->string final))]
-            [new-bitmap-str (make-string (string-length argb-str) #\000)]
-            [new-bitmap (make-object bitmap% w h)]
-            [dc (make-object bitmap-dc% new-bitmap)])
-       (let loop ([i 0])
-         (when (< i (string-length argb-str))
-           (unless (equal? (string-ref argb-str i)
-                           (string-ref bitmap-str i))
-             (string-set! new-bitmap-str i #\377))
-           (loop (+ i 1))))
-       (send dc set-argb-pixels 0 0 w h new-bitmap-str)
-       (send dc set-bitmap #f)
-       (show-bitmap argb-bitmap #f "argb")
-       (show-bitmap final #f "final")
-       (show-bitmap new-bitmap #f "difference"))
-     
-     (let* ([argb-bitmap (flatten-bitmap (argb->bitmap argb))]
-            [argb-ents (bytes->list (cadr (bitmap->string argb-bitmap)))]
-            [bitmap-ents (bytes->list (cadr (bitmap->string final)))])
-       (test #t (lambda (x) x) (andmap (lambda (x y) (<= (abs (- x y)) 3))
-                                       argb-ents
-                                       bitmap-ents))))
-  
-   (report-errs)))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/cache-image8.mre b/pkgs/gui-pkgs/gui-test/tests/gracket/cache-image8.mre
deleted file mode 100644
index 2aac0bd226..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/cache-image8.mre
+++ /dev/null
@@ -1,229 +0,0 @@
-WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket, or DrScheme version 4 or later
-   to read it.
-
-            http://racket-lang.org/
-|#
- 44 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wxmedia\0"
-3 1 8 #"wximage\0"
-2 0 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 56
-(
- #"(lib \"hrule-snip.ss\" \"macro-debugger\" \"syntax-browse"
- #"r\")\0"
-) 1 0 60
-(
- #"(lib \"implementation.ss\" \"macro-debugger\" \"syntax-br"
- #"owser\")\0"
-) 2 0 18 #"java-comment-box%\0"
-1 0 23 #"java-interactions-box%\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55
-(
- #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private"
- #"\")\0"
-) 1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 1 6 #"wxloc\0"
-00000000000 1 48 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 12 #"Courier New\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 27
-#"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 40
-#"framework:syntax-coloring:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 41
-#"framework:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-41 #"framework:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 40
-#"framework:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 42
-#"framework:syntax-coloring:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 45
-#"framework:syntax-coloring:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 39
-#"framework:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 39
-#"framework:syntax-coloring:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 14
-#"Html Standard\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-49 #"drscheme:check-syntax:lexically-bound-identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 42
-#"drscheme:check-syntax:imported-identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 39
-#"profj:syntax-coloring:scheme:prim-type\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 40
-#"profj:syntax-coloring:scheme:identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 36
-#"profj:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:literal\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-35 #"profj:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:default\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 39
-#"profj:syntax-coloring:scheme:uncovered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:covered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 4
-#"XML\0"
-0 70 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 4 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 -1 -1 0 1
-#"\0"
-0 75 12 #"Courier New\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1
-00000000002 0 00000000000 12 00000000000 8 0 16 3 1 #"("
-0 0 9 3 6 #"define"
-0 0 4 3 1 #" "
-0 0 8 3 1 #"x"
-0 0 4 3 1 #" "
-0 12 00000000004 4 1015
-(
- #"(#400(0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #") 10 5 5)\0"
-) 0 0 16 3 1 #")"
-0 0 4 29 1 #"\n"
-0 00000000000
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/canvas-steps.txt b/pkgs/gui-pkgs/gui-test/tests/gracket/canvas-steps.txt
deleted file mode 100644
index c77366424b..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/canvas-steps.txt
+++ /dev/null
@@ -1,175 +0,0 @@
-
-Overview
---------
-
-This canvas test frame is for checking the behavior of the
-scrollbars. Canvas scrollbars work in one of two modes:
-  1) Managing: the scrollbar determines the size and offset of
-     the canvas's drawing area.
-  2) Non-managing: the scrollbars are simply placed next to the
-     canvas; the canvas's size and offset are not affected by
-     the scrollbar values.
-In the test frame, the top canvas is initially unmanaged, and the
-bottom is managed.
-
-An HVCanvas has both horizontal and vertical scrollbars, but the
-scrollbars are initially disabled. Clicking the "Enable Vertical"
-checkbox enables the vertical scroll. A VCanvas has only a vertical
-scrollbar; clicking "Enable Horizontal" in this case has no effect.
-When a canvas is managed by its scrollbars and a scrollbar is missing
-in a particular direction, it should act the same as an unmanaged
-canvas in that direction.
-
-On each canvas, the following are painted at 0,0:
- * The name of the canvas
- * Three values per scroll bar, for UNMANAGED canvases:
-    - The current value of the scroll
-    - The maximum value of the scroll
-    - The page step of the scroll
-   These should all be 0 for MANAGED canvases and for
-   disabled directions
- * Two size measurements:
-    - The client size of the canvas
-    - The drawing area of the canvas
-   These should be the same for UNMANAGED canvases/directions
- * Two lines showing what each `virtual boundary' of the canvas would
-   be if it is managed and the scrollbar is enabled. (Initially, the
-   bottom canvas's boundaries are probably beyond the visible region.)
-   When the canvas is managed with a vertical scrollbar, the bottom
-   boundary line might not be visible, i.e., it might be clipped - but
-   it must be clipped exactly in that case.
-
-As the scroll is changed for the managed canvas, the information will
-move, because the scrolls automatically adjust the offset of the
-canvas. For the unmanaged canvas, the information is always visible in
-the same place; it is just updated.
-
-The top's scrollbars have a range of 10 and a page step of 3.  The
-bottom's scrollbars have a range of 20 and a page step of 3 (although
-the page step is sometimes ignored for a managed canvas).  In managed
-mode:
-
- * In the bottom canvas, one vertical scroll step is mapped to 10
-   pixels and one horizontal step to 25 pixels, making the virtual
-   area 200 pixels high and 500 pixels wide.
-
-   When the "Small" checkbox is checked, the range is changed to 2
-   instead of 20, making the virtual size 20 high by 50 wide.
-
- * In the bottom canvas, one vertical or horizontal scroll step is
-   mapped to 1 pixel, making the virtual area 10x10.
-
-Initially, the top canvas is unmanaged and the bottom is managed.
-Checking the "swap" checkbox makes the top canvas unmanaged and the
-bottom canvas managed.
-
-The steps below assume an HVCanvas. Don't resize the window before
-starting the steps.
-
-HVCanvas Steps
---------------
- 
-Enable vertical scroll. The scroll should be at position 1 for both
- canvases. The bottom canvas should be scrolled up 10 pixels.  The
- displayed info should change:
-    -------------------------------------------
-    | Unmanaged Scroll                        |
-    | V: p: 1 r: 10 g: 3 H: 0 0 0             |
-    | Client: <m> x <n> Virtual: <m> x <n>    | ; for some <m> and <n>
-    -------------------------------------------
-    | Automanaged Scroll                      | ; <- actually, scrolled up
-    | V: p: 0 r: 0 g: 0 H: 0 0 0              | ; all zero for managed
-    | Client: <m> x <n'> Virtual: <m> x 200   | ; <n'> within 1 of <n>
-    -------------------------------------------
-  (You might not be able to read 200 in the lower right.)
-  Make the window slightly wider. Make sure the <m> gets bigger to
-  reflect the new width of the canvases.
-
-Set the bottom canvas's vertical scroll to 0. The "Automanaged Scroll"
- should scroll back down into the original location.
-
-Scroll the bottom canvas's vertical scroll to its maximum value (which
- is less than 10) You may see the bottom border close to the bottom
- edge of the canvas.
-
-Adjust the top canvas's scroll, and watch the `p' value change each
- time. The maximum value is 10. Use the `page up/down' areas and make
- sure the `p' value changes by 3.
-
-Turn off the vertical scroll. The bottom canvas's image should snap
- back to its original place. All the `V:' values in the top should
- return to zeros.
-
-Perform the above steps for horizontal scrolling.
-
-Turn on both vertical and horizontal scrolling. You should see the
- obvious combined effect. In particular, the bottom canvas's text
- should be scrolled both up and to the left.
-
-Move all scrolls to 1 step beyond the smallest setting.  
-
-Make the frame larger. The top canvas's scrolls should still have 10
- steps, but the bottom canvas's scrolls will have fewer steps,
- reflecting the fact that less scrolling is needed to see the same
- virtual area.
-
-Test the bottom canvas's scrolls to ensure that the maximum values of
- the scrolls show the edges of the canvas's virtual area.
-
-Make the frame large enough to see the whole bottom canvas's virtual
-  area. The scrollbars should become disabled in both directions.
-
-Make the frame smaller again. The bottom canvas's scrolls should
- adjust correctly. Make the frame small enough that all scrollbars are
- active.
-
-Move all scrolls to 1 step beyond the smallest setting.  
-
-Check "swap". Now, the top canvas is managed and the bottom canvas is
- unmanaged. But the top canvas's area is so small that its scrollbars
- are always disabled. (It may also be clipped to the tiny 10x10 box.)
- The bottom canvas's scrollbars should now act the top ones used
- to: there are 20 steps in each direction and the `V:' and `H:' values
- change as the scrolls are moved.
-
-Uncheck "swap". The scrollbars should all go back to the 1 position.
- The bottom canvas should be scrolled in the usual way.
-
-Check "small". The top canvas should be unaffected. The bottom canvas
- should scroll back to 0,0, the scrollbars should be disabled, and a
- 50x20 box should be drawn in the upper left (or the entire canvas is
- clipped to that box).
-
-Check "swap". The bottom canvas should not be clipped.
-
-Check "swap". The bottom canvas might be clipped again.
-
-Uncheck "small". The bottom canvas should not be clipped.
-
-Check "small" and disable vertical scrolls. The bottom canvas should
- be clipped horizontally or the boundary drawn at a small offset from
- the left.
-
-Enable vertical and disable horizontal. The bottom canvas will be
- narrowly clipped of have a short boundary from the top.
-
-HCanvas Steps
---------------
-
-A vertical scrollbar should not be visible at all.
-
-Check both "Enable Vertical" and "Enable Horizontal". Verify that the
- canvases act exactly like an HVCanvas with vertical scrolls disabled.
-
-VCanvas Steps
---------------
-
-Transpose the approve appropriately
-
-Canvas Steps
-------------
-
-No scrollbars, checking the enabler boxes has no effect.
-
-Click "small" and make sure the bottom canvas is not clipped.
-
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/checkbox-steps.txt b/pkgs/gui-pkgs/gui-test/tests/gracket/checkbox-steps.txt
deleted file mode 100644
index 0ee77b2374..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/checkbox-steps.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Check the "On" checkbox. "Callback Ok" should appear in the console.
-
-Uncheck the "On" checkbox. "Callback Ok" should appear in the console.
-
-Click "Check". "All Ok" should appear in the console.
-
-Repeat the above three steps.
-
-Click "Toggle". The checkbox should become checked.
-
-Click "Toggle". The checkbox should become unchecked.
-
-Check the "On" checkbox. "Callback Ok" should appear in the console.
-
-Click "Toggle". The checkbox should become unchecked.
-
-Repeat the above four steps with "Simulation Toggle" instead of "Toggle".
- However, with "Simulation Toggle", "Callback Ok" should be printed
- each time "Simulation Toggle" is hit.
-
-Click "Check". "All Ok" should appear in the console.
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/choice-list-steps.txt b/pkgs/gui-pkgs/gui-test/tests/gracket/choice-list-steps.txt
deleted file mode 100644
index 087700926d..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/choice-list-steps.txt
+++ /dev/null
@@ -1,236 +0,0 @@
-Set Up, Callbacks, Appending
-----------------------------
-
-The choice/list should contain "Alpha" "Beta" and "Gamma" for
- starters, unless and empty choice/list was created. In a choice,
- "Alpha" should be initially selected.
-
-If there are no items:
-
-   * Click on the choice box. Make sure that nothing prints to the
-     console as a result. 
-
-   * Click "Append"; "Extra 1" should appear in the list of items.
-     For a choice, it should be immediately selected.
-
-   * Click "Append" again. The selection should not change.
-   
-   * Start over with a fresh frame. Click the "Clear" button and
-     nothing should happen.
-
-   * If its an empty list, start over with a fresh frame. Click the
-     "Reset" button and make sure "Alpha" "Beta" and "Gamma" are
-     added.
-
-   * Start over with a fresh frame again; jump down to the `Clearing'
-     section (but don't click "Clear").
-
-For a multi-selection list, jump down to "Multiple Selections".
-
-If there are items, select each once in order (single-click for
- lists). After each selection, "Changed N" should appear in the
- console (where N is the position of the item, counting from 0) for a
- choice item, "Change (N)" for a list box; in either case, the
- "Changed" line is followed by "Callback Ok". This should be printed
- even if the selection is technically unchanged. Select the last one a
- second time to make sure.
-
-For a choice, click to pop-up the menu, but don't select anything. for
- a list, click in an area without items and in the scroll bar(s). In
- both cases, the selection should not change and nothing should print
- in the console.
-
-Click the "Append" button. The selection should not change, but a new
- item "Extra 1" should appear.
-
-Click the "Append" button again.
-
-Select the first newly added item.
-
-Click on the "check" button. In the console, "content: " would be
- printed along with a list of strings. That list should match the
- items in the choice/list.
-
-Selections
-----------
-
-Click "Select First". The selection should change to "Alpha", but
- nothing should appear in the console.
-
-Click "Select Middle".  The selection should change to "Gamma", but
- nothing should appear in the console.
-
-Click "Select Last".  The selection should change to "Extra 2"", but
- nothing should appear in the console.
-
-Click "Select Bad -1" and Select Bad X". In both cases, nothing should
- happen, and nothing should appear in the console.
-
-Repeat the above four steps for the "by name" buttons. (There's
- nothing equivalent to -1 for the "by name" buttons.)
-
-Repeat the four steps for the "by Simulate" buttons; in addition to
- having the selections change, the "Changed N" and "Callback Ok"
- messages should print in the console. For the -1 and X cases, "event
- selection value mismatch" should print in the console, and the
- selection should not change.
-
-Click on the "check" button and check the content list.
-
-Clearing
---------
-
-Choose clear. All items should disappear.
-
-Choose clear again. Nothing should happen.
-
-Click on all parts of the control. The callback should never be
- invoked.
-
-Click on all the "Select" buttons. For the top buttons and "by
- Simulate" buttons (but not the "bad" ones), an exception should be
- reported. Nothing should happened for the "by Name" buttons.
-
-Click on "Check". The empty item list should be reported in the
- console.
-
-Click on "Append". For a choice, "Extra 3" should be immediately
- selected. For a list box, nothing should be selected.
-
-Click "Append" again. The selection should not change.
-
-Select the second item, "Extra 4". Note the callback message in
- the console for item 1.
-
-Click "Check" and see the list in the console: ("Extra 3" "Extra 4")
-
-Append one more, "Extra 5", and try all the selecting buttons again.
-
-Append 5 more items. The last one is very long, but it should look ok:
- "This is a Really Long Named Item That Would Have Used the Short
- Name, Yes This is a Really Long Named Item That Would Have Used the
- Short Name Extra 10"
-
-Select the long-name item.
-
-Click "Check". The long name should be printed ok in the console.
-
->> No More Tests for Choice Frames <<
-
-Visible Range >> Lists Only <<
--------------
-
-Scroll to the top and select the first item. Click "Visible
- Indices". In the console, the top should be 0, and the visible count
- equal to the number of items that are completely visible in the
- item. If an item is only partly visible, it should not be counted.
-
-Scroll down exactly one item's height without changing the
- selection. Click "Visible Indices" again. The top should change to 1
- but the count should be the same.
-
-On some platforms, you can scroll to partially show the first item.
- Try it and hit "Visible Indices"; the partially shown item should
- count as unshown. The visible count should not change.
-
-Make the window taller to show at least one more item. Try "Visible
- Indices" again and make sure it changed.
-
-Click "Select Last". The list should scroll to the end. Try "Visible
- Indices" again.
-
-Make the list box taller than all its items. (It may be necessary to
- delete some items by selecting them and hitting the "Delete" button.)
- Click "Visible Indices" and make sure that the visible count is still
- more than the number of items.
-
-Deleting  >> Lists Only <<
---------
-
-Select an item in the middle of the list.
-
-Hit "Delete". The item should disappear, and nothing should be
- selected.
-
-Append a new item.
-
-Select the third item in the list. Hit "Delete Above"; the second item
- should disappear, and the selection should stick with its item as it
- moves into 2nd place. Hit "Delete Above" again and the first item
- should disappear, and the new first item should still be selected.
- Click "Delete Above" one more time, and nothing should happen.
-
-Append two new items.
-
-Select the third to last item in the list. Test "Delete Below" by
- clicking it three times, just like to "Delete Above".
-
-Append two new items.
-
-Click "Check" and inspect the item list in the console.
-
-Select the first item. Click the "Reset" button. The list should
- contain "Alpha" "Beta" and "Gamma" with no selection.
-
-Click "Check" and inspect the item list in the console.
-
-Double-Click  >> Lists Only <<
-------------
-
-Double-click on "Alpha". The console should report the first click
- in the normal way, and then report "Changed -1" followed by
- "Double-click", then "Callback Ok".
-
-Double-click on "Gamma". Same as above, except that the initial
- click is reported for position 2 instead of 0.
-
-Click "Check" and inspect the item list in the console.
-
->> No More Tests for Single-Selection List Frames <<
-
-Multiple Selections >> Multiple-Selection Lists Only <<
--------------------
-
-Click on each of the three items and make sure that "Changed"
- and "Callback Ok" are printed in the console:
-
-  * For regular MultiLists, each click should unhilite the
-    old selection as it hilites the new one
-
-  * For MultiExtendLists, each click should extend the
-    selection.
-
-Click on a selected item to make sure "Changed" is printed again.
-
-Click "Check" and verify the item list *and* the selection list.
- (Remember that the items are numbered from 0).
-
-Clear the selection except for one item, somehow. (You may need to use
- the Ctl key)
-
-Use the shift key to select a second item. The console should show
- "Changed" and "Callback Ok" as usual.
-
-Click "Check" and verify that the selection list now has the right
- two items.
-
-Shift-click on a selected item. The console should show "Changed"
- and "Callback Ok" as usual.
-
-Shift-click to select the remaining item. The console should show
- "Changed" and "Callback Ok" as usual.
-
-Control-click on a selected item. It should become unselected (and the
- other two selected items should remain so). The console should report
- "Changed" and "Callback Ok".
-
-Click "Check" and verify the selection list.
-
-Try the "Select N" buttons. They should always extend the selection.
-
-Try the "by Simulate" buttons; they should should act like clicking,
- either extending the selection or restarting it.
-
-Try dragging (and shift-dragging and ctl-dragging) and make sure the
- console reports are appropriate.
-
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/combo-steps.txt b/pkgs/gui-pkgs/gui-test/tests/gracket/combo-steps.txt
deleted file mode 100644
index 80a569cdb8..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/combo-steps.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Set Up, Callbacks, Appending
-----------------------------
-
-The choice/list should contain "Apple" and "Banana" for
- starters.
-
-Watch for "Popup!" printed to stdout when you click the choice item.
-
-When you use "Reset", the content should change to "Alpha", "Beta",
- and "Gamma", and selecting them should install the word plus
- "for Reset" into the text field.
-
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/dc.rktl b/pkgs/gui-pkgs/gui-test/tests/gracket/dc.rktl
deleted file mode 100644
index da20a6d628..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/dc.rktl
+++ /dev/null
@@ -1,855 +0,0 @@
-(load-relative "loadtest.rktl")
-
-(require racket/gui/base)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                               DC Tests                                     ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define mdc (make-object bitmap-dc%))
-(define bm (make-object bitmap% 10 10))
-(define bm2 (make-object bitmap% 10 10))
-
-(test #t 'is-color? (send bm is-color?))
-
-(define (bad m . args)
-  (with-handlers ([exn:fail:contract?
-		   (lambda (x)
-		     (test '("ok")
-			   `(send <bad-dc> ,m ...)
-			   (regexp-match "ok" (exn-message x))))])
-    (send-generic mdc (make-generic (object-interface mdc) m) . args)
-    (error 'bad-dc "~a shouldn't succeed" `(send <bad-dc> ,m ...))))
-
-(define (good m . args)
-  (send-generic mdc (make-generic (object-interface mdc) m) . args))
-
-(define (test-all mdc try try-ok)
-  (try 'erase)
-  (try 'clear)
-  (try 'draw-arc 0 0 10 10 0.1 0.2)
-  (try 'draw-bitmap bm2 0 0)
-  (try 'draw-bitmap-section bm2 0 0 0 0 5 5)
-  (try 'draw-ellipse 0 0 10 10)
-  (try 'draw-line 0 0 10 10)
-  (try 'draw-lines (list (make-object point% 0 0) (make-object point% 10 10)))
-  (try 'draw-point 5 5)
-  (try 'draw-polygon (list (make-object point% 0 0) (make-object point% 10 10) (make-object point% 5 10)))
-  (try 'draw-rectangle 0 0 10 10)
-  (try 'draw-rounded-rectangle 0 0 10 10)
-  (try 'draw-spline 0 0 10 10 5 10)
-  (try 'draw-text "Hello" 0 0)
-
-  (try 'start-doc "Ok")
-  (try 'start-page)
-  (try 'end-page)
-  (try 'end-doc)
-
-  (try 'get-size)
-
-  (try-ok 'get-background)
-  (try-ok 'get-brush)
-  (try-ok 'get-clipping-region)
-  (try-ok 'get-font)
-  (try-ok 'get-pen)
-  (try-ok 'get-text-background)
-  (try-ok 'get-text-foreground)
-  (try-ok 'get-text-mode)
-  (try-ok 'get-alpha)
-  (try-ok 'get-scale)
-  (try-ok 'get-origin)
-  (try-ok 'get-rotation)
-
-  (try-ok 'set-background (make-object color% "Yellow"))
-  (try-ok 'set-brush (make-object brush% "Yellow" 'solid))
-  (try-ok 'set-clipping-rect 0 0 10 10)
-  (try-ok 'set-clipping-region (make-object region% mdc))
-  (try-ok 'set-font (make-object font% 12 'default 'normal 'normal))
-  (try-ok 'set-origin 0 0)
-  (try-ok 'set-pen (make-object pen% "Yellow" 1 'solid))
-  (try-ok 'set-scale 2 2)
-  (try-ok 'set-alpha 0.75)
-  (try-ok 'set-text-background (make-object color% "Yellow"))
-  (try-ok 'set-text-foreground (make-object color% "Yellow"))
-  (try-ok 'set-text-mode 'transparent)
-
-  (try-ok 'get-char-height)
-  (try-ok 'get-char-width)
-
-  (try 'try-color (make-object color% "Yellow") (make-object color%)))
-
-(st #f mdc ok?)
-(test-all mdc bad good)
-
-(send mdc set-bitmap bm)
-
-(test-all mdc 
-          (lambda (m . args)
-            (send-generic mdc (make-generic (object-interface mdc) m) . args))
-          (lambda (m . args)
-            (send-generic mdc (make-generic (object-interface mdc) m) . args)))
-
-(send mdc set-bitmap #f)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Get-pixel, set-pixel, get-argb-pixels, etc.
-
-(require mzlib/etc)
-
-(define (pixel-tests b&w?)
-  (begin-with-definitions
-
-   (define bm3 (make-object bitmap% 10 10 b&w?))
-
-   (define mdc (make-object bitmap-dc% bm3))
-   (send mdc clear)
-
-   (define col (make-object color%))
-   (define bts (make-bytes 40))
-
-   (st #f mdc get-pixel 30 4 col)
-   (st #t mdc get-pixel 3 4 col)
-   (st 255 col red)
-   (st 255 col green)
-   (st 255 col blue)
-   (stv mdc get-argb-pixels 0 0 2 5 bts)
-   (test #t 'same-str (equal? (make-bytes 40 255) bts))
-
-   (send col set 30 40 50)
-   (send mdc try-color col col)
-   (send mdc set-pixel 3 4 col)
-   (when b&w?
-     (st 0 col red)
-     (st 0 col green)
-     (st 0 col blue))
-
-   (stv mdc get-argb-pixels 2 1 2 5 bts)
-   (test #t 'same-str (equal? (bytes-append (make-bytes 28 255)
-					    (bytes 255
-						   (send col red)
-						   (send col green)
-						   (send col blue))
-					    (make-bytes 8 255))
-			      bts))
-
-   (define col2 (make-object color% 130 140 150))
-   (send mdc try-color col2 col2)
-   (let loop ([i 0])
-     (unless (= i 10)
-       (bytes-set! bts (+ 0 (* i 4)) 255)
-       (bytes-set! bts (+ 1 (* i 4)) (send col2 red))
-       (bytes-set! bts (+ 2 (* i 4)) (send col2 green))
-       (bytes-set! bts (+ 3 (* i 4)) (send col2 blue))
-       (loop (add1 i))))
-   (stv mdc set-argb-pixels 5 5 5 2 bts)
-   (let ([col3 (make-object color%)]
-	 [white (make-object color% 255 255 255)]
-	 [check-col (lambda (what a b)
-		      (test #t `(same red ,what, (send a red) ,(send b red)) (= (send a red) (send b red)))
-		      (test #t `(same green ,what) (= (send a green) (send b green)))
-		      (test #t `(same blue ,what) (= (send a blue) (send b blue))))])
-     (let i-loop ([i 0])
-       (unless (= i 10)
-	 (let j-loop ([j 0])
-	   (if (= j 10)
-	       (i-loop (add1 i))
-	       (begin
-		 (st #t mdc get-pixel i j col3)
-		 (cond
-		  [(and (= i 3) (= j 4))
-		   (check-col '(3 4) col col3)]
-		  [(and (<= 5 i 9)
-			(<= 5 j 6))
-		   (check-col `(,i ,j) col2 col3)]
-		  [else
-		   (check-col `(,i ,j) white col3)])
-		 (j-loop (add1 j))))))))))
-
-(pixel-tests #f)
-(pixel-tests #t)
-
-;; ----------------------------------------
-
-;; Extra get-argb-pixels on monochrome text (from PR 8821):
-
-(let* ((bm (make-object bitmap% 5 5 #t))
-       (bm2 (make-object bitmap% 5 5 #t))
-       (dc (new bitmap-dc% (bitmap bm)))
-       (pt (lambda (x y) (make-object point% x y)))
-       (bs (make-bytes 100))
-       (bs2 (make-bytes 100)))
-  (send dc clear)
-  (send dc set-brush (make-object color% 0 0 0) 'solid)
-  (send dc draw-polygon (list (pt 2 0) (pt 2 4)
-                              (pt 4 4) (pt 4 0)))
-  (send dc set-bitmap #f)
-  (send bm get-argb-pixels 0 0 5 5 bs)
-  (send dc set-bitmap bm2)
-  (send dc set-argb-pixels 0 0 5 5 bs)
-  (send dc get-argb-pixels 0 0 5 5 bs2)
-  (send dc set-bitmap #f)
-  (test #t 'mono-bits
-        (equal?
-         bs
-         (bytes-append 
-          #"\377\377\377\377\377\377\377\377\377\0\0\0\377\0\0\0\377\0\0\0\377\377\377\377\377"
-          #"\377\377\377\377\0\0\0\377\0\0\0\377\0\0\0\377\377\377\377\377\377\377\377\377\0\0\0"
-          #"\377\0\0\0\377\0\0\0\377\377\377\377\377\377\377\377\377\0\0\0\377\0\0\0\377\0\0\0"
-          #"\377\377\377\377\377\377\377\377\377\0\0\0\377\0\0\0\377\0\0\0")))
-  (test #t 'same-bits (equal? bs bs2)))
-
-;; ----------------------------------------
-;; Test draw-bitmap-section-smooth
-
-(let* ([bm (make-bitmap 100 100)]
-       [dc (make-object bitmap-dc% bm)]
-       [bm2 (make-bitmap 70 70)]
-       [dc2 (make-object bitmap-dc% bm2)]
-       [bm3 (make-bitmap 70 70)]
-       [dc3 (make-object bitmap-dc% bm3)])
-  (send dc draw-ellipse 0 0 100 100)
-  (send dc2 draw-bitmap-section-smooth bm 
-        10 10 50 50
-        0 0 100 100)
-  (send dc3 scale 0.5 0.5)
-  (send dc3 set-smoothing 'aligned)
-  (send dc3 draw-bitmap bm 20 20)
-  (let ([s2 (make-bytes (* 4 70 70))]
-        [s3 (make-bytes (* 4 70 70))])
-    (send bm2 get-argb-pixels 0 0 70 70 s2)
-    (send bm3 get-argb-pixels 0 0 70 70 s3)
-    (test #t 'same-scaled (equal? s2 s3))))
-
-;; ----------------------------------------
-;; Test some masking combinations
-
-(let ()
-  (define u (make-object bitmap% 2 2))
-  (define mu (make-object bitmap% 2 2))
-  (send u set-argb-pixels 0 0 2 2
-        (bytes 255 100 0 0
-               255 0 0 0
-               255 100 0 0
-               255 255 255 255))
-  (send mu set-argb-pixels 0 0 2 2
-        (bytes 255 0 0 0
-               255 255 255 255
-               255 0 0 0
-               255 255 255 255))
-  (send u set-loaded-mask mu)
-  (define (try-draw nonce-color mode expect 
-                    #:bottom? [bottom? #f])
-    (let* ((b&w? (not (eq? mode 'color)))
-           (bm (make-object bitmap% 2 2 b&w?))
-           (dc (make-object bitmap-dc% bm)))
-      (send dc clear)
-      (when (eq? mode 'black)
-        (send dc set-brush "black" 'solid)
-        (send dc draw-rectangle 0 0 2 2))
-      ;; Check that draw-bitmap-section really uses the
-      ;; section, even in combination with a mask.
-      (send dc draw-bitmap-section u 
-            0 (if bottom? 1 0)
-            0 (if bottom? 1 0) 2 1
-            'solid nonce-color (send u get-loaded-mask))
-      (send dc set-bitmap #f)
-      (let ([s (make-bytes (* 2 2 4))])
-        (send bm get-argb-pixels 0 0 2 2 s)
-        (when b&w? (send bm get-argb-pixels 0 0 2 2 s #t))
-        (test expect 'masked-draw s))))
-  (define usual-expect (bytes 255 100 0 0
-                              255 255 255 255
-                              255 255 255 255
-                              255 255 255 255))
-  (try-draw (make-object color% "green") 'color usual-expect)
-  (try-draw (make-object color%) 'color usual-expect)
-  (try-draw (make-object color%) 'white
-            ;; For b&w destination, check that the
-            ;;  alpha is consistent with the drawn pixels
-            (bytes 255 0 0 0
-                   0 255 255 255
-                   0 255 255 255
-                   0 255 255 255))
-  (send mu set-argb-pixels 0 0 2 2
-        (bytes 255 255 255 255
-               255 255 255 255
-               255 0 0 0
-               255 0 0 0))
-  (try-draw (make-object color%) 'black
-            #:bottom? #t
-            ;; Another b&w destination test, this time
-            ;; with a mask that forces black pixels to
-            ;; white:
-            (bytes 255 0 0 0
-                   255 0 0 0
-                   255 0 0 0
-                   0 255 255 255))
-  (send mu set-argb-pixels 0 0 2 2
-        (bytes 255 255 255 255
-               255 0 0 0
-               255 255 255 255
-               255 0 0 0))
-  (try-draw (make-object color%) 'color
-            (bytes 255 255 255 255
-                   255 0 0 0
-                   255 255 255 255
-                   255 255 255 255))
-  (let ([dc (make-object bitmap-dc% mu)])
-    (send dc erase)
-    (send dc set-pen "white" 1 'transparent)
-    (send dc set-brush "black" 'solid)
-    (send dc draw-rectangle 0 0 1 1)
-    (send dc set-bitmap #f))
-  (try-draw (make-object color%) 'color usual-expect))
-
-;; ----------------------------------------
-;; 0 alpha should make the RGB components irrelevant
-
-(let ()
-  (define bm1 (make-bitmap 1 2))
-  (define bm2 (make-bitmap 1 2))
-
-  (send bm1 set-argb-pixels 0 0 1 2 (bytes 0   0 0 0
-                                           255 0 0 255))
-  (send bm2 set-argb-pixels 0 0 1 2 (bytes 255 255 0 0
-                                           0   0   0 0))
-
-  (define the-bytes (make-bytes 8 0))
-
-  (define bm3 (make-bitmap 1 2))
-  (define bdc (make-object bitmap-dc% bm3))
-  (void (send bdc draw-bitmap bm1 0 0))
-  (void (send bdc draw-bitmap bm2 0 0))
-
-  (send bdc get-argb-pixels 0 0 1 2 the-bytes)
-  (test (bytes 255 255 0 0
-               255 0   0 255)
-        values
-        the-bytes))
-
-;; ----------------------------------------
-
-;; Check B&W drawing to B&W, 'solid vs. 'opaque
-(let ([mk
-       (lambda (expect style bg-col col mask?)
-         (let* ((bm1 (make-object bitmap% 2 2 #t))
-                (bm2 (make-object bitmap% 2 2 #t))
-                (bm3 (make-object bitmap% 2 2 #t))
-                (dc1 (new bitmap-dc% (bitmap bm1)))
-                (dc2 (new bitmap-dc% (bitmap bm2)))
-                (dc3 (new bitmap-dc% (bitmap bm3)))
-                (s (make-bytes 16)))
-           (send dc1 clear)
-           (send dc1 set-argb-pixels 0 0 2 1 #"\xFF\0\0\0\xFF\0\0\0")
-           (send dc2 clear)
-           (send dc2 set-argb-pixels 0 1 2 1 #"\xFF\0\0\0\xFF\0\0\0")
-           (send dc3 set-argb-pixels 0 0 2 2 (bytes-append #"\xFF\0\0\0\xFF\xFF\xFF\xFF"
-                                                           #"\xFF\0\0\0\xFF\xFF\xFF\xFF"))
-           (send dc2 set-background bg-col)
-           (send dc2 draw-bitmap bm1 0 0 style col (and mask? bm3))
-           (send dc2 set-bitmap #f)
-           (send bm2 get-argb-pixels 0 0 2 2 s)
-           (let ([col->str (lambda (c)
-                             (if (zero? (send c red)) "black" "white"))])
-             (test expect `(mk ,style ,(col->str bg-col) ,(col->str col), mask?) s))))]
-      [black (make-object color%)]
-      [white (make-object color% 255 255 255)])
-  (mk #"\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" 'solid white black #f)
-  (mk #"\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" 'solid black black #f)
-  (mk #"\377\377\377\377\377\377\377\377\377\0\0\0\377\0\0\0" 'solid black white #f)
-  (mk #"\377\0\0\0\377\377\377\377\377\0\0\0\377\0\0\0" 'solid white black #t)
-  (mk #"\377\377\377\377\377\377\377\377\377\0\0\0\377\0\0\0" 'solid white white #t)
-  (mk #"\377\0\0\0\377\0\0\0\377\377\377\377\377\377\377\377" 'opaque white black #f)
-  (mk #"\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" 'opaque black black #f)
-  (mk #"\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377" 'opaque white white #f)
-  (mk #"\377\0\0\0\377\377\377\377\377\377\377\377\377\0\0\0" 'opaque white black #t)
-  (mk #"\377\377\377\377\377\377\377\377\377\0\0\0\377\0\0\0" 'opaque black white #t))
-
-;; ----------------------------------------
-;; check get-alpha mode of `get-argb-pixels'
-
-(let ()
-  (define (get-column-alpha bm x y)
-    (define bs (make-bytes 4))
-    (send bm get-argb-pixels x y 1 1 bs #t)
-    bs)
-  (define abm (make-object bitmap% 2 2 #f #t))
-  (define nbm (make-object bitmap% 2 2 #f #f))
-  (define (avg bstr) (- 255
-                        (quotient (+ (bytes-ref bstr 0)
-                                     (bytes-ref bstr 1)
-                                     (bytes-ref bstr 2))
-                                  3)))
-  (send abm set-argb-pixels 0 0 2 2 #"0123456789abcdef")
-  (send nbm set-argb-pixels 0 0 2 2 #"0123456789abcdef") ; alphas ignored
-
-  (test (bytes (char->integer #\0) 0 0 0) 'a0+0 (get-column-alpha abm 0 0))
-  (test (bytes (char->integer #\4) 0 0 0) 'a1+0 (get-column-alpha abm 1 0))
-  (test (bytes (char->integer #\8) 0 0 0) 'a0+1 (get-column-alpha abm 0 1))
-  (test (bytes (char->integer #\c) 0 0 0) 'a1+1 (get-column-alpha abm 1 1))
-
-  (test (bytes (avg #"123") 0 0 0) 'n0+0 (get-column-alpha nbm 0 0))
-  (test (bytes (avg #"567") 0 0 0) 'n1+0 (get-column-alpha nbm 1 0))
-  (test (bytes (avg #"9ab") 0 0 0) 'n0+1 (get-column-alpha nbm 0 1))
-  (test (bytes (avg #"def") 0 0 0) 'n1+1 (get-column-alpha nbm 1 1)))
-
-;; ----------------------------------------
-;; check pre-mult mode of `{get,set}-argb-pixels'
-
-(let ()
-  (define abm (make-object bitmap% 2 2 #f #t))
-  (define nbm (make-object bitmap% 2 2 #f #f))
-  (send abm set-argb-pixels 0 0 2 2 #"30127456b89afcde" #f #t)
-  (send nbm set-argb-pixels 0 0 2 2 #"0123456789abcdef" #f #t) ; alphas ignored
-
-  (define (get-pixels bm pre-mult?)
-    (define bs (make-bytes 16))
-    (send bm get-argb-pixels 0 0 2 2 bs #f pre-mult?)
-    bs)
-
-  (define (unmul b)
-    (define (um v) (inexact->exact (round (/ (* v 255.) (bytes-ref b 0)))))
-    (bytes (bytes-ref b 0)
-           (um (bytes-ref b 1))
-           (um (bytes-ref b 2))
-           (um (bytes-ref b 3))))
-
-  (test #"\xFF123\xFF567\xFF9ab\xFFdef" 'no-alpha (get-pixels nbm #f))
-  (test #"\xFF123\xFF567\xFF9ab\xFFdef" 'no-alpha (get-pixels nbm #t))
-
-  (test (apply bytes-append (map unmul '(#"3012" #"7456" #"b89a" #"fcde")))
-        'alpha-normal (get-pixels abm #f))
-  (test #"30127456b89afcde" 'alpha-premult (get-pixels abm #t)))
-
-;; ----------------------------------------
-;; check consistency of pre-multiplication, drawing, etc.
-
-(let ()
-  (define gray-cols (make-bitmap 256 256 #f)) ; no alpha channel
-  (let ([s (make-bytes (* 256 256 4))])
-    (for* ([i 256] [j 256])
-      (bytes-set! s (+ (* 4 i) (* j 256 4)) 255)
-      (bytes-set! s (+ (* 4 i) 1 (* j 256 4)) (- 255 i))
-      (bytes-set! s (+ (* 4 i) 2 (* j 256 4)) (- 255 i))
-      (bytes-set! s (+ (* 4 i) 3 (* j 256 4)) (- 255 i)))
-    (send gray-cols set-argb-pixels 0 0 256 256 s))
-
-  (define rainbow-rows (make-bitmap 256 256))
-  (let ([s (make-bytes (* 256 256 4))])
-    (for* ([i 256] [j 256])
-      (bytes-set! s (+ (* 4 i) (* j 256 4)) 255)
-      (bytes-set! s (+ (* 4 i) 1 (* j 256 4)) j)
-      (bytes-set! s (+ (* 4 i) 2 (* j 256 4)) (modulo (+ j 10) 256))
-      (bytes-set! s (+ (* 4 i) 3 (* j 256 4)) (modulo (+ j 20) 256)))
-    (send rainbow-rows set-argb-pixels 0 0 256 256 s))
-
-  (define rainbow-rows-alpha-cols (make-bitmap 256 256))
-  (let ([s (make-bytes (* 256 256 4))])
-    (for* ([i 256] [j 256])
-      (bytes-set! s (+ (* 4 i) (* j 256 4)) i)
-      (bytes-set! s (+ (* 4 i) 1 (* j 256 4)) j)
-      (bytes-set! s (+ (* 4 i) 2 (* j 256 4)) (modulo (+ j 10) 256))
-      (bytes-set! s (+ (* 4 i) 3 (* j 256 4)) (modulo (+ j 20) 256)))
-    (send rainbow-rows-alpha-cols set-argb-pixels 0 0 256 256 s))
-
-  (define rainbow-rows-alpha-cols-premult (make-bitmap 256 256))
-  (let ([s (make-bytes (* 256 256 4))])
-    (for* ([i 256] [j 256])
-      (bytes-set! s (+ (* 4 i) (* j 256 4)) i)
-      (bytes-set! s (+ (* 4 i) 1 (* j 256 4)) (min i j))
-      (bytes-set! s (+ (* 4 i) 2 (* j 256 4)) (min i (modulo (+ j 10) 256)))
-      (bytes-set! s (+ (* 4 i) 3 (* j 256 4)) (min i (modulo (+ j 20) 256))))
-    (send rainbow-rows-alpha-cols-premult set-argb-pixels 0 0 256 256 s #f #t))
-
-  ;; Check that drawing with a mask is consistent with `set-argb-pixels'
-  ;; in non-premultiplied mode:
-  (let ([target (make-bitmap 256 256)])
-    (define dc (make-object bitmap-dc% target))
-    (send dc draw-bitmap rainbow-rows 0 0
-          'solid
-          (send the-color-database find-color "black")
-          gray-cols)
-    (let ([s1 (make-bytes (* 256 256 4))]
-          [s2 (make-bytes (* 256 256 4))])
-      (send target get-argb-pixels 0 0 256 256 s1 #f #t)
-      (send rainbow-rows-alpha-cols get-argb-pixels 0 0 256 256 s2 #f #t)
-      (for ([i (in-range (* 256 256))])
-        (unless (= (bytes-ref s1 i) (bytes-ref s2 i))
-          (printf "~a ~a ~a\n" i (bytes-ref s1 i) (bytes-ref s2 i))))
-      (test #t 'consistent-mult (equal? s1 s2))))
-
-  ;; Check that getting non-premult values out and putting them back in
-  ;; gives consistent premult results:
-  (let ([target (make-bitmap 256 256)])
-    (let ([s1 (make-bytes (* 256 256 4))]
-          [s2 (make-bytes (* 256 256 4))])
-      (send rainbow-rows-alpha-cols-premult get-argb-pixels 0 0 256 256 s1 #f #f)
-      (send target set-argb-pixels 0 0 256 256 s1 #f #f)
-      
-      (send target get-argb-pixels 0 0 256 256 s1 #f #t)
-      (send rainbow-rows-alpha-cols-premult get-argb-pixels 0 0 256 256 s2 #f #t)
-      (test #t 'consistent-premult (equal? s1 s2))))
-
-  (void))
-
-;; ----------------------------------------
-
-(let ()
-  (define bm (make-screen-bitmap 100 100))
-  (define dc (make-object bitmap-dc% bm))
-  (define-values (aw ah aa ad) (send dc get-text-extent "x " #f #t))
-  (define-values (bw bh ba bd) (send dc get-text-extent "x ⇒ y" #f #t))
-  (test #t 'no-missing-glyph-truncation (bw . > . aw)))
-
-;; ----------------------------------------
-
-(test #f 'no-commas (ormap (lambda (s) (regexp-match? #rx"," s)) (get-face-list)))
-(test #t 'all-commas (andmap (lambda (s) (regexp-match? #rx"," s)) (get-face-list #:all-variants? #t)))
-
-;; ----------------------------------------
-
-(define (check-immutable v)
-  (test 'immutable 'immutable
-        (with-handlers ([exn:fail? (lambda (x) 
-                                     (if (regexp-match #rx"immutable" (exn-message x))
-                                         'immutable
-                                         x))])
-          (send v set-color "red"))))
-
-(check-immutable (send the-brush-list find-or-create-brush "white" 'solid))
-(check-immutable (send the-pen-list find-or-create-pen "white" 1 'solid))
-
-;; ----------------------------------------
-
-(let ([color (new color%)])
-  (test #f 'color (send color is-immutable?))
-  (test 0 'color (send color red))
-  (test 0 'color (send color green))
-  (test 0 'color (send color blue))
-  (test 1.0 'color (send color alpha)))
-
-(let ([color (make-color 101 102 103 0.9)])
-  (test #t 'color (send color is-immutable?))
-  (test 101 'color (send color red))
-  (test 102 'color (send color green))
-  (test 103 'color (send color blue))
-  (test 0.9 'color (send color alpha)))
-
-(let ([color (make-color 0 0 0)])
-  (test #t 'color (send color is-immutable?))
-  (test 0 'color (send color red))
-  (test 0 'color (send color green))
-  (test 0 'color (send color blue))
-  (test 1.0 'color (send color alpha)))
-
-;; ----------------------------------------
-
-(let ([brush (new brush%)])
-  (test #f 'brush (send brush is-immutable?)))
-
-(let ([brush (make-brush)])
-  (test #t 'brush (send brush is-immutable?))
-  (test #t 'brush (eq? brush (send the-brush-list find-or-create-brush "black" 'solid))))
-
-(let ([brush (make-brush #:immutable? #f)])
-  (test #f 'brush (send brush is-immutable?)))
-
-;; ----------------------------------------
-
-(let ([pen (new pen%)])
-  (test #f 'pen (send pen is-immutable?)))
-
-(let ([pen (make-pen)])
-  (test #t 'pen (send pen is-immutable?))
-  (test #t 'pen (eq? pen (send the-pen-list find-or-create-pen "black" 0 'solid))))
-
-(let ([pen (make-pen #:immutable? #f)])
-  (test #f 'pen (send pen is-immutable?)))
-
-;; ----------------------------------------
-
-(let ()
-  (define config (new gl-config%))
-  (define bm1 (make-gl-bitmap 100 100 config))
-  (define bm2 (make-gl-bitmap 100 100 config))
-  (define dc1 (make-object bitmap-dc% bm1))
-  (define dc2 (make-object bitmap-dc% bm2))
-  (define gl1 (send dc1 get-gl-context))
-  (define gl2 (send dc2 get-gl-context))
-  (when (and gl1 gl2)
-    (send gl1 call-as-current
-          (lambda ()
-            (test 5 'alt (send gl2 call-as-current
-                               (lambda () (error "not in this context!"))
-                               (wrap-evt always-evt (lambda (v) 5))))
-            (sync
-             (thread
-              (lambda ()
-                (test 8 'thread/alts
-                      (send gl1 call-as-current
-                            (lambda () (error "not in this thread!"))
-                            (wrap-evt always-evt (lambda (v) 8)))))))
-            (test 8 'reenter (send gl1 call-as-current
-                                   (lambda () 8)))))
-    (with-handlers ([exn? void])
-      (send gl1 call-as-current (lambda () (error "fail"))))
-    (test 12 'post-exn (send gl1 call-as-current (lambda () 12)))))
-
-
-;; ----------------------------------------
-;; check clipping
-
-(let ()
-  (define rdc (new record-dc%))
-  (send rdc set-brush "green" 'solid)
-  (send rdc set-clipping-rect 2 2 5 5)
-  (send rdc draw-rectangle 0 0 9 9)
-
-  (define bm (make-bitmap 25 25))
-  (define bm-dc (make-object bitmap-dc% bm))
-
-  (send bm-dc set-clipping-rect 10 10 5 5)
-
-  ((send rdc get-recorded-procedure) bm-dc)
-
-  (define s (make-bytes (* 20 20 4)))
-  (send bm get-argb-pixels 0 0 20 20 s)
-  (for ([i (in-range 0 (* 20 20 4) 4)])
-    (test 0 'record-dc-clipping-byte (bytes-ref s i))))
-
-;; ----------------------------------------
-
-(let ([bm (make-object bitmap% 1 1)])
-  (test #t 'load-file (send bm load-file (collection-file-path "sk.jpg" "icons"))))
-
-;; ----------------------------------------
-;; Check save & load of monochrome PNG:
-
-(let ()
-  (define N 5)
-
-  (define bm (make-object bitmap% N N #t #f))
-  (define dc (make-object bitmap-dc% bm))
-  
-  (send dc draw-rectangle 2 2 (- N 2) (- N 2))
-  
-  (define-values (i o) (make-pipe))
-  (send bm save-file o 'png)
-  (close-output-port o)
-  
-  (define bm2 (make-object bitmap% 10 10))
-  (send bm2 load-file i 'png)
-
-  (define-values (i2 o2) (make-pipe))
-  (send bm save-file o2 'png)
-  (close-output-port o2)
-
-  (define bm3 (read-bitmap i2))
-  
-  (define s1 (make-bytes (* N N 4)))
-  (define s2 (make-bytes (* N N 4)))
-  (define s3 (make-bytes (* N N 4)))
-  
-  (send bm get-argb-pixels 0 0 N N s1)
-  (send bm2 get-argb-pixels 0 0 N N s2)
-  (send bm3 get-argb-pixels 0 0 N N s3)
-  
-  (test #t 'same (equal? s1 s2))
-  (test #t 'same (equal? s1 s3))
-  (test 1 'mono (send bm2 get-depth))
-  (test 1 'mono (send bm3 get-depth))
-  (test #f 'b&w (send bm2 is-color?))
-  (test #f 'b&w (send bm3 is-color?))
-  (test #f 'no-alpha (send bm2 has-alpha-channel?))
-  (test #f 'no-alpha (send bm3 has-alpha-channel?)))
-
-;; ----------------------------------------
-;; Check `in-region?'
-
-(let ()
-  (define r (new region%))
-  (send r set-rectangle 0 0 100 100)
-  (test #t 'yes/r (send r in-region? 10 10))
-  (test #f 'no/r (send r in-region? 110 110))
-  (test #f 'no/r (send r in-region? 10 110))
-
-  (define r2 (new region%))
-  (send r2 set-rectangle 120 120 10 10)
-  (send r2 union r)
-  
-  (test #t 'yes/r (send r in-region? 10 10))
-  (test #t 'yes/r2 (send r2 in-region? 10 10))
-  (test #f 'no/r (send r in-region? 125 125))
-  (test #t 'yes/r2 (send r2 in-region? 125 125))
-  (test #f 'no/r2 (send r2 in-region? 110 110)))
-
-(let ()
-  (define bm (make-bitmap 50 50))
-  (define dc (send bm make-dc))
-  (send dc translate 10 10)
-  (define r (make-object region% dc))
-  (send r set-rectangle 0 0 100 100)
-  (test #t 'yes (send r in-region? 5 5))
-  (test #f 'no (send r in-region? 110 110)))
-
-(let ()
-  (define bm (make-bitmap 50 50))
-  (define dc (send bm make-dc))
-  (send dc translate 10 10)
-  ;; dc's translation at creation of region sticks:
-  (define r (make-object region% dc))
-  (send r set-rectangle 0 0 100 100)
-  (send dc translate -10 -10)
-  (test #f 'no (send r in-region? 5 5))
-  (test #t 'yes (send r in-region? 105 105)))
-
-;; ----------------------------------------
-;; Test get-path-bounding-box
-
-(define (test-square-bounding-boxes)
-  (define-syntax (box stx)
-    (syntax-case stx ()
-      [(_ expr ...)
-       #'(let-values ([(left top width height) expr ...])
-           (list left top width height))]))
-  (define dp ; a-square-path
-    (let ([dp (new dc-path%)])
-      (send dp move-to 10 20)
-      (send dp line-to 30 20)
-      (send dp line-to 30 50)
-      (send dp line-to 10 50)
-      (send dp line-to 10 20)
-      (send dp close)
-      dp))
-  
-  (define bm (make-object bitmap% 100 100))
-  (define dc (new bitmap-dc% [bitmap bm]))
-  (send dc set-brush (send the-brush-list find-or-create-brush "red" 'solid))
-  (send dc set-smoothing 'smoothed)
-  
-  (define (bbs pen-width)
-    (send dc set-pen (send the-pen-list find-or-create-pen "black" pen-width 'solid 
-                           'projecting 'round))
-    (define bb        (box (send dp get-bounding-box)))
-    (define bb-path   (box (send dc get-path-bounding-box dp 'path)))
-    (define bb-stroke (box (send dc get-path-bounding-box dp 'stroke)))
-    (define bb-fill   (box (send dc get-path-bounding-box dp 'fill)))
-    (values bb bb-path bb-stroke bb-fill))
-  (define (inside? b1 b2) ; is b2 inside b1? 
-    (match-define (list x y w h) b1)
-    (match-define (list s t a b) b2)
-    (and (< x s) (< y t) (> w a) (> h a)))
-  (define (test w)
-    (define-values (n p s f) (bbs w))
-    (when (= w 0) (set! w 1)) ; 1 is the hair line width
-    (and (inside? s p) ; p ignores pen width, s does not
-         (equal? n (list 10. 20. 20. 30.))
-         (equal? p n); no control points outside the convex hull
-         (equal? s (list (- 10. (/ w 2)) (- 20. (/ w 2)) (+ 20. w) (+ 30. w)))
-         (equal? p f)))
-  (and (test 10) (test 1) (test 0)))
-
-(test #t 'get-path-bounding-box (test-square-bounding-boxes))
-
-;; -----------------------------------------------------------
-;; Check pixel operations on a bitmap with a x2 backing scale
-
-(define (scaled-bm-test alpha?)
-  (let ([bm (make-bitmap 10 11 alpha? #:backing-scale 2)])
-    (test 2.0 'scale (send bm get-backing-scale))
-    (test 10 'width (send bm get-width))
-    (test 11 'height (send bm get-height))
-
-    (define dc (send bm make-dc))
-    (send dc set-pen "black" 0 'transparent)
-    (send dc set-brush (make-color 100 100 200) 'solid)
-    (send dc draw-rectangle 0 0 3 3)
-    (send dc draw-rectangle 9 9 1 1)
-
-    (let ([s (make-bytes 4)])
-      (send bm get-argb-pixels 2 2 1 1 s)
-      (test (list 255 100 100 200) 'scaled (bytes->list s))
-      (send bm get-argb-pixels 4 4 1 1 s)
-      (test (if alpha? 0 255) 'scaled (bytes-ref s 0))
-      (send bm get-argb-pixels 2 2 1 1 s #:unscaled? #t)
-      (test (list 255 100 100 200) 'unscaled (bytes->list s))
-
-      (bytes-copy! s 0 (bytes 0 1 2 3))
-      (send bm get-argb-pixels 2 2 1 1 s #:unscaled? #t 'just-alpha)
-      ;; for (not alpha?), 122 is the mask equivalent of the brush color
-      (test (list (if alpha? 255 122) 1 2 3) 'unscaled-alpha (bytes->list s))
-
-      (bytes-copy! s 0 (bytes 0 1 2 3))
-      (send bm get-argb-pixels 9 9 1 1 s #:unscaled? #t 'just-alpha)
-      (test (list 0 1 2 3) 'unscaled-alpha-miss (bytes->list s))
-      (send bm get-argb-pixels 18 18 1 1 s #:unscaled? #t 'just-alpha)
-      (test (list (if alpha? 255 122) 1 2 3) 'unscaled-alpha-hit (bytes->list s))
-
-      (send bm set-argb-pixels 0 0 2 1 #"\xff\x0\x0\x0\xff\x0\x0\x0"
-            #:unscaled? #t)
-      (send bm get-argb-pixels 0 0 1 1 s #:unscaled? #t)
-      (test (list 255 0 0 0) 'unscaled (bytes->list s))
-      ;; scaled is average of black and blue:
-      (send bm get-argb-pixels 0 0 1 1 s)
-      (test (list 255 50 50 100) 'scaled (bytes->list s))
-
-      (send bm set-argb-pixels 0 0 2 1 #"\xff\x0\x0\x0\xff\x0\x0\x0")
-      (send bm get-argb-pixels 0 0 1 1 s)
-      (test (list 255 0 0 0) 'scaled (bytes->list s))
-
-      (when (not alpha?)
-        (bytes-copy! s 0 (bytes 100 1 2 3))
-        (send bm set-argb-pixels 9 9 1 1 s #:unscaled? #t 'just-alpha)
-        (send bm get-argb-pixels 9 9 1 1 s #:unscaled? #t)
-        (test (list 255 155 155 155) 'unscaled-alpha-set (bytes->list s))
-        (bytes-copy! s 0 (bytes 100 1 2 3))
-        (send bm set-argb-pixels 18 18 1 1 s #:unscaled? #t 'just-alpha)
-        (send bm get-argb-pixels 18 18 1 1 s #:unscaled? #t)
-        (test (list 255 155 155 155) 'unscaled-alpha-set-far (bytes->list s))))))
-
-
-(scaled-bm-test #t)
-(scaled-bm-test #f)
-
-(let ([p (collection-file-path "sk.jpg" "icons")])
-  (let ([bm1 (read-bitmap p)]
-        [bm2 (read-bitmap p #:backing-scale 2)])
-    (test 2.0 'scale (send bm2 get-backing-scale))
-    (test (ceiling (* 1/2 (send bm1 get-width))) 'read-width (send bm2 get-width))
-    (test (ceiling (* 1/2 (send bm1 get-height))) 'read-height (send bm2 get-height))))
-
-(let ([p (collection-file-path "very-small-planet.png" "icons")])
-  (define-syntax-rule (test-fail rx body)
-    (test #t 
-          'error
-          (with-handlers ([exn? (lambda (e)
-                                  (regexp-match? rx (exn-message e)))])
-            body
-            #f)))
-  (test-fail "mask.*backing scale" (read-bitmap p 
-                                                'png/mask
-                                                #:backing-scale 2))
-  (test-fail "can only install a mask.*backing scale"
-             (send (read-bitmap p #:backing-scale 2)
-                   set-loaded-mask
-                   (read-bitmap p)))
-  (test-fail "can only load a file.*backing scale"
-             (send (read-bitmap p #:backing-scale 2)
-                   load-file
-                   p)))
-
-;; ----------------------------------------
-;; No error on too-large bitmap:
-
-(st #f (make-bitmap 1000000 1000000) ok?)
-
-;; ----------------------------------------
-;; No #<unsafe-undefined> checks on certain class instances
-
-(test #f 'undef-pen (impersonator? (new pen%)))
-(test #f 'undef-brush (impersonator? (new brush%)))
-(test #f 'undef-color (impersonator? (new color%)))
-
-;; ----------------------------------------
-
-(report-errs)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/draw-info.txt b/pkgs/gui-pkgs/gui-test/tests/gracket/draw-info.txt
deleted file mode 100644
index eb09cb3a79..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/draw-info.txt
+++ /dev/null
@@ -1,302 +0,0 @@
-The drawing area should have the following features:
-
-  At the top-left, when the window is opened for the first time, you
-    should see a hollow box with a line sticking out to the bottom
-    left. Repainting the canvas should produce instead a solid box and
-    no line. Repainting with Pixmap or Bitmap should always produce
-    the hollow box and line.
-
-  At the top, "Pen 0 x 0" in a consistent font (i.e., re-painting
-    should not change the font; clicking *2 should make it twice
-    a big, and unclicking should restore it)
-  "Pen 1 x 1" in a possibly different font
-  "Pen 2 x 2" in a bold red font (bold version of 1x1 font) on yellow
-  
-  A line should appear across each of "Pen 0 x 0" and "Pen 1 x 1"
-    (if the line is missing, it was probably erased when the text
-     was repainted, and that is bad)
-  A little bit of a black line should appear before "Pen 2 x 2", but
-    the yellow background should have covered up the rest of the line
-
-  To the right of the Pen text, a black and red pair of splines should
-    form a squashed "S", twice as wide as high. The "S" is formed by
-    two splines.
-
-  Under the splines should be two blue polygons, the top with a square
-    hole (odd-even fill) and the bottom all solid (winding fill). The
-    black lines forming the polygon should be the same in each shape
-    (strictly on borders for the top polygon, drawn over blue in the
-    bottom polygon).
-
-  Toward the right should be three columns of boxes, with a fourth
-    column that starts with a box. All boxes should have a red border.
-    In the first three columns, the boxes should contain lines on a
-    background that matches the normal background (i.e., either white
-    or cyan). The lines should be black for the left column, and green
-    for the second and third columns. In the fourth column, the shapes
-    should be filled with the platform-specific panel background
-    pattern; the third shape should be a semi-circle with no outline
-    on the bottom edge.
-
-  Further right (to the right of the columns) should appear an
-    X, a cross, and an narrow X tilted NW. Each should be drawn in
-    green (5 pixels wide) with a thin black line centered along each
-    green line.  Scaling the picture should make the green line thicker,
-    but not the black line, and the black line should stay centered.
-
-  Under the columns of boxes, a black box should be filled with an 25%
-    black B&W bitmap, and a red box frame should be draw with a 50%
-    red stipple.
-
-  To the right of those two boxes should appear two little boxes,
-    black pixels on a tan background, the top one 8x8 and the bottom
-    on 6x10.  The black pixels in the top one should form a vertical
-    line right or center with a kind of semi-spring on the left
-    edge. The black pixels in 6x10 should be just a longer semi-spring
-    to the left.
-
-  At the far right should appear six stars, drawn once as lines (left
-    column) and once as a polygon outline (right column). The first row
-    uses 'projecting cap and 'miter join, the second uses 'round and
-    'round, and the last uses 'butt and 'bevel.
-
-  The drawings under "0 x 0" and "1 x 1" should look nearly the same:
-
-    TopLeft: h-line should be left-aligned with box below it, but
-             extend 1 extra pixel. v-line similarly should be
-             top-aligned and 1 pixel longer. The lines should not
-             touch the box - there should be 2 pixels of space.
-
-    Top: Lines for the rotated L's should join in a sharp corner
-
-    Second from Top: like top-left, but lines should touch the box (so
-                     only the vertical overhang is visible)
-
-    Second from top, right: For 0x0, the X should never be more than 1
-                            pixel wide; this is a case where 1x1 may
-                            be different (i.e., it may have areas
-                            two-pixels wide)
-
-    Four shape rows: First (solid brush, solid pen) and second (solid
-             brush, solid pen) columns should be the same shape, with
-             the first hollow and the second filled. Third (solid
-             brush, no pen) column should look like the second column.
-             The fourth column should be the xor of the first and
-             third columns. The precise results are ill-defined for
-             the "2 x 2 Pen" shapes.
-
-    Octagons: two hollow octagons exactly the same shape.
-
-    Dot (after octagons): a single pixel (uses draw-point)
-
-    Another Dot (below the first one): a single pixel (created as a
-       0-length line from draw-line)
-
-    Line: actually two lines, but they should form a single
-             unbroken line
-
-    Arcs: The leftmost should be the top half of an ellipse (it's
-          formed via two arcs); the rightmost should be a filled wedge
-          from 90 degrees to 180 degrees. The arcs are part of an
-          ellipse 40 tall and 30 wide (i.e., stretched slightly in the
-          vertical direction from a circle).
-
-  The drawings under 2x2 should be reasonable extensions of the
-  0x0 and 1x1 pictures for a double-wide pen.
-
-  Big octagon: The octagon defines the region for octagon clipping.
-          Also, it's drawn in xor mode, so it should flip black to
-          white wherever the octagon line runs over the shapes of the
-          middle section. The bitmaps of the bottom region are drawn
-          afterwards, and will therefore hide parts of the octagon
-          line, although the MrEd logo is also drawn in XOR mode so it
-          shouldn't obscure the octagon line.
-
-  Bottom section:
-
-    Images: MrEd logo (b & w), drawn in XOR mode, so the octagon line
-              should be toggled where the black part of the MrEd logo
-              intersects with the line. This changes with the
-              "MrEd XOR" choice control (see below).
-            BB logo (color)
-            Top subrow:
-              Down-left arrow (with a thin horizontal line), black on
-                background
-              Down-left arrow, red on background
-              Down-left arrow, red on background
-            Bottom subrow, on blue field in black-bordered roundrect:
-              Down-left arrow (with a thin horizontal line), black on
-                blue
-              Down-left arrow, red on blue
-              Down-left arrow, red on background (cyan or white)
-            BB logo, same as before
-            Down-left arrow - red on black
-
-    Stippled boxes, in a blue box w/black border, four black-outlined
-      shapes:
-        Sqaure - green down-arrows on blue field
-        Circle - green down-arrows on background (cyan or white) field
-        Square - bb logo
-        Square - green cross-hatch on blue
-		    
-    Dashed lines: each half green and half black with the background
-       color (white or cyan) between the dots/dashes, two of each:
-           Solid line
-           Dot line
-           Long Dash line
-           Short Dash line
-           Dot Dash line
-
-   Long line: On the screen in unsmoothed or aligned mode, the line 
-       should be 1 pixel wide, except that the last 1/9th should be
-       two pixels wide. In postscript or smooth mode, the line should
-       consist of 9 segments, growing in width from 0.0 to 2.0
-       (inclusive) in 0.25 increments. When the image is scaled by a
-       factor of 2, the first 1/9th on the screen should still be 1
-       pixel, the next 7/9ths should be 2 pixels, and the last 1/9
-       should be 4 pixels wide.
-
-   Red shapes with black outlines (below long line): square, round
-      square, circle, and triangle without a top line; these are drawn
-      as paths.
-
-   Four lines (to right of red shapes): in 'unsmoothed or 'aligned
-      mode, the lines should appear equally spaced at scale 1, but
-      scale 2 should show the middle lines closer by two pixels; the
-      'smoothed mode should approximate this at scale 1. At scale 2,
-      'unsmoothed and 'aligned should look the same.
-
-   Thick blue-line round rects with red center: the left one has pen
-      size 7, and the right pen size 8. At scale 1, the two should be
-      separated by a blank column of pixels in 'unsmoothed and
-      'smoothed mode, but in 'smoothed mode or at scale 2, they should
-      touch.
-
-    Four squares with overbar (bottom of drawing): the squares,
-      which are stretched bitmaps, should touch, and the four squares
-      should have the same span as the overbar line.
-
-The image should look the same regardless of the top radio button
-setting --- Canvas, Pixmap, or Bitmap --- except that the Bitmap
-setting must produce a black-and-white image.  When you go from Pixmap
-+ *2 ("*2" is described next) back to Pixmap, there may be junk from
-the *2 drawing left around the right and bottom. That's ok. Same for
-going from Canvas + Cyan ("Cyan" is described later) to Pixmap + Cyan.
-
-Clicking on the "*2" checkbox should double the size of everything,
-including the pen widths, but not the bitmaps. The 0x0 pen should be
-the same width as before (1 pixel).
-
-Clicking on "+10" should shift everything 10 pixels down and across.
-(Even when "*2" is checked, it should be a 10 pixel offset).
-
-Clicking on "Cyan" should change the background to cyan instead of
-white. When Pixmap or Bitmap is used, the background will be set in
-the Pixmap/Bitmap, not the canvas, so a white background should frame
-the cyan area to the right and bottom (if you make the window big
-enough).
-
-Clipping should slip the drawing to a particular shape:
-
-   rectangle - a 10-pixel strip 100 pixels from the left
- 
-   octagon - the content of the big outlined octagon; some
-     part of the octagon outline is clipped
-
-   circle - a circle inscribed in the octagon's bounding
-     box
-
-   wedge - pi/4 to 3pi/4 of circle
-
-   round rectangle - a rounded rect inscribed in the blue box for
-     testing stipples
-
-   unions, intersects, subtracts - hopefully obvious
-
-   polka - purple field with holes showing the normal drawing
-
-   lambda - a region in the shape of a lambda
-
-When the "Clip Pre-Scale" checkbox is not checked, then when a scale
-such as "*2" is selected, the clipping region should scale
-accordingly. "+10" should move the clipping region. (In either the
-"*2" or "+10" case, the content of the clipped region should be the
-same.) When the "Clip Pre-Scale" checkbox is checked, then the
-clipping region should not scale with the rest of the drawing. Be sure
-to try both scaling modes with smoothing both on and off.
-
-The "Clock" button tests a range of wedges. Each wedge has a 1-pixel
- black background and orange filling. A sequence of wedges is
- produced.  Imagine the following:
-   The two hands of a clock start at 0 radians (i.e., 3:15). For each
-   step, the minute hand is moved back (counter-clockwise) pi/4
-   radians, while the hour hand moves back pi/8 radians, and
-   everything between the minute hand moving counter-clockwise to the
-   hour hand is filled in. So after drawing the full circle on the 0th
-   step, the wedge includes everything except a small slice on the 1st
-   step. The empty slice grows ever larger while shifting
-   counter-clockwise. By the time the minute hand wraps to 0 radians
-   (at which point the hour hand is a pi radians), the wedge covers
-   only the top half of the clock. It keeps going until the wedge
-   nearly disappears (but instead of disappearing, the whole circle is
-   filled in again). The same pattern is then repeated, but reversing
-   the wedge part and empty part (so the wedge starts small and grows
-   larger this time around).
- The orange wedge is drawn just before the bitmaps, so they appear on
- top of the orange wedge, but the wedge paints over other things. If
- the "Pixmap" box is checked and the "Polka" clipping region is
- selected, the result is an animation where you can only see the
- wedge grow and move through the polka-dot holes in the purple field.
-
-The "Clip Clock" button is similar to "Clock", except that all drawing
- is clipped to the area to be painted orange. "Clip Clock" clipping
- overrides any other clipping setting.
-
-Clicking on "PostScript" should produce the image described above in a
-PostScript file.
-
-The "icons" and "stipple" boxes enable those parts of the
-drawing. These checkboxes are provided because PostScript drawing of
-icons and stipples can be slow.
-
-The "MrEd XOR" menu selects a icon:
-
-  - "MrEd XOR" : initial icon, as described above
-
-  - "PLT Middle" : middle area of the PLT logo (used when starting
-    DrRacket), same size as the MrEd icon. Make sure scaling works
-    right (i.e., same section shown and scaled).
-
- - "PLT ^ MrEd" : "PLT Middle" masked by the MrEd icon.
-
- - "MrEd ^ PLT" : MrEd icon masked by the "PLT Middle" image (so it's
-   translucent).
-
- - "MrEd ^ MrEd" : MrEd icon masked by itself... non-black parts
-   should be transparent.
-
- - "MrEd~" - Upside-down MrEd icon. Besides PLT Middle, this
-   one should blank out whatever is behind it (using cyan in
-   cyan mode)
-
- - "MrEd ^ MrEd~" - MrEd icons masked by upside-down MrEd icon.
-   Note that the parens should be fully intact.
-
- - "M^M~ Opaque" - Same as previous; drawn with 'opaque, but that
-   should have no visible effect.
-
- - "M^M~ Red" - Same as two previous, but drawn red instead of black.
-
- - "PLT^PLT" - The PLT Middle image, but translucent
-
-----------
-
-Finally, print these instructions by hitting the "Print" button at the
-top of the "What Should I See?" window. The following lines are for
-the printing test; they should wrap around neatly on the printed
-page. (Don't add any newlines.) Check to make sure no lines are
-skipped or duplicated across page breaks. Try different page
-orientations.
-
-0         1         2         3         4         5         6         7         8         9         X         O         T         T         F
-012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/draw-mem.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/draw-mem.rkt
deleted file mode 100644
index 547ff02eae..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/draw-mem.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket
-
-;; Check for a leak via multiple `racket/draw' instantiations.
-
-(define my-ns-channel (make-parameter #f))
-
-(define N 20)
-
-(define-values (incs m ns)
-  (for/fold ([incs 0] [max-mem 0] [accum #f]) ([i N])
-    (define ns (make-base-namespace))
-    (parameterize ([current-namespace ns]
-                   [my-ns-channel ns])
-      (dynamic-require 'racket/draw #f))
-    (collect-garbage)
-    (sync (system-idle-evt))
-    (collect-garbage)
-    (let ([m (current-memory-use)])
-      (printf "~s\n" m)
-      (if (m . > . (* 1.1 max-mem))
-          (values (add1 incs) m accum)
-          (values incs max-mem accum)))))
-
-(unless (incs . < . (/ N 3))
-  (error "multiple `racket/draw' instantiations seem to accumulate memory"))
-
-(module+ test
-  (module config info
-    (define random? #t)))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/draw.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/draw.rkt
deleted file mode 100644
index 9228d01e63..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/draw.rkt
+++ /dev/null
@@ -1,1501 +0,0 @@
-#lang scheme/gui
-(require "unsafe-draw.rkt")
-
-(define manual-chinese? #f)
-
-(when manual-chinese?
-  (send the-font-name-directory set-post-script-name 
-	(send the-font-name-directory find-or-create-font-id "MOESung-Regular" 'default)
-	'normal
-	'normal
-	"MOESung-Regular"))
-
-(define sys-path 
-  (lambda (f)
-    (collection-file-path f "icons")))
-
-(define (get-icon)
-  (make-object bitmap% (sys-path "mred.xbm") 'xbm))
-
-(define get-plt
-  (let ([i #f])
-    (lambda ()
-      (unless i
-	(set! i (make-object bitmap% (sys-path "plt.gif"))))
-      i)))
-
-(define get-rotated
-  (let ([i #f])
-    (lambda ()
-      (unless i
-	(set! i (let* ([icon (get-icon)]
-                       [w (send icon get-width)]
-                       [h (send icon get-height)])
-                  (let ([bm (make-object bitmap% w h #t)])
-                    (let ([src (make-object bitmap-dc% icon)]
-                          [dest (make-object bitmap-dc% bm)]
-                          [c (make-object color%)])
-                      (let loop ([i 0])
-                        (unless (= i w)
-                          (let loop ([j 0])
-                            (unless (= j h)
-                              (send src get-pixel i j c)
-                              (send dest set-pixel i (- h j 1) c)
-                              (loop (add1 j))))
-                          (loop (add1 i))))
-                      (send src set-bitmap #f)
-                      (send dest set-bitmap #f)
-                      bm)))))
-      i)))
-
-(define (show-instructions file)
-  (letrec ([f (make-object frame% (path->string file) #f 400 400)]
-	   [print (make-object button% "Print" f
-			       (lambda (b ev)
-				 (send e print)))]
-	   [c (make-object editor-canvas% f)]
-	   [e (make-object text%)])
-    (send e load-file file)
-    (send e lock #t)
-    (send c set-editor e)
-    (send f show #t)))
-
-(define star
-  ;; uses pairs instead of point%s
-  (list (cons 30 0)
-	(cons 48 60)
-	(cons 0 20)
-	(cons 60 20)
-	(cons 12 60)))
-
-(define octagon
-  (list (make-object point% 60 60)
-	(make-object point% 120 60)
-	(make-object point% 180 120)
-	(make-object point% 180 180)
-	(make-object point% 120 240)
-	(make-object point% 60 240)
-	(make-object point% 0 180)
-	(make-object point% 0 120)
-	(make-object point% 60 60)))
-
-(define (get-b&w-light-stipple)
-  (make-object bitmap%
-	       (list->bytes '(#x88 0 #x22 0 #x88 0 #x22 0))
-	       8 8))
-
-(define (get-b&w-half-stipple)
-  (make-object bitmap%
-	       (list->bytes '(#xcc #x33 #xcc #x33 #xcc #x33 #xcc #x33))
-	       8 8))
-
-
-(define lambda-path
-  (let ()
-    (define left-lambda-path
-      (let ([p (new dc-path%)])
-	(send p move-to 148 670)
-
-	;; top corner
-	(send p line-to 156.5 654)
-	
-	;; left edge spline
-	(send p curve-to 197.5 665 225 672 240 653)
-	(send p curve-to 275.06 608.59 282.5 573 291.5 528)
-	(send p curve-to 296.12 504.92 294.11 490.62 288.96 470)
-	(send p curve-to 276.34 419.46 254.18 382.39 228.5 339)
-	(send p curve-to 193.21 279.37 159.68 208.41 120.5 150)
-	
-	(send p line-to 130 142)
-
-	p))
-
-    (define bottom-lambda-path
-      (let ([p (new dc-path%)])
-	(send p move-to 130 142)
-
-	;; bottom left foot
-	(send p line-to 183.5 150)
-	
-	;; bottom middle spline
-	(send p curve-to 203.5 197 225.91 248.79 246 294)
-	(send p curve-to 262 330 273.5 366 291.5 402)
-	(send p curve-to 296.01 411.02 313 456 324 440)
-	(send p curve-to 333.89 425.61 346 400 353 382)
-	(send p curve-to 372.28 332.42 390.57 284.39 409 237)
-	(send p curve-to 423 201 431.5 174 444.5 141)
-	
-	;; bottom right foot
-	(send p line-to 460 134)
-	(send p line-to 524 169)
-
-	p))
-
-    (define right-lambda-path
-      (let ([p (new dc-path%)])
-	(send p move-to 148 670)
-
-	;; right edge spline
-	(send p curve-to 187.21 683.31 228.21 699.77 270 694)
-	(send p curve-to 323.6 686.6 345.23 610.92 359 563)
-	(send p curve-to 373.75 511.68 395.5 470 413 420)
-	(send p curve-to 441.56 338.4 489.5 258 525.5 177)
-
-	(send p line-to 524 169)
-
-	(send p reverse)
-
-	p))
-
-    (let ([p (new dc-path%)])
-      (send p append left-lambda-path)
-      (send p append bottom-lambda-path)
-      (send p append right-lambda-path)
-      
-      (send p translate -5 -86)
-      (send p scale 1 -1)
-      (send p translate 0 630)
-      (send p scale 0.5 0.5)
-      p)))
-
-
-(define fancy-path
-  (let ([p (new dc-path%)]
-	[p2 (new dc-path%)])
-    (send p2 move-to 10 80)
-    (send p2 line-to 80 80)
-    (send p2 line-to 80 10)
-    (send p2 line-to 10 10)
-    (send p2 close)
-    
-    (send p move-to 1 1)
-    (send p line-to 90 1)
-    (send p line-to 90 90)
-    (send p line-to 1 90)
-    (send p close)
-    (send p append p2)
-    (send p arc 50 50 100 120 0 (* pi 1/2) #f)
-
-    p))
-
-(define square-bm
-  (let* ([bm (make-object bitmap% 10 10)]
-	 [dc (make-object bitmap-dc% bm)])
-    (send dc clear)
-    (send dc set-brush "white" 'transparent)
-    (send dc set-pen "black" 1 'solid)
-    (send dc draw-rectangle 0 0 10 10)
-    (send dc set-bitmap #f)
-    bm))
-
-(define (show-error . args)
-  (with-handlers ([exn? (lambda (exn)
-                          (printf "~a\n" (exn-message exn)))])
-    (apply error args)))
-
-(define DRAW-WIDTH 550)
-(define DRAW-HEIGHT 375)
-
-(let* ([f (make-object frame% "Graphics Test" #f 600 550)]
-       [vp (make-object vertical-panel% f)]
-       [hp0 (make-object horizontal-panel% vp)]
-       [hp (make-object horizontal-panel% vp)]
-       [hp2.75 (new horizontal-panel% [parent vp]
-                    [stretchable-height #f])]
-       [hp3 (make-object horizontal-panel% vp)]
-       [hp2 hp]
-       [hp2.5 hp0]
-       [hp4 (new horizontal-panel% [parent vp]
-                 [stretchable-height #f])]
-       [bb (make-object bitmap% (sys-path "bb.gif") 'gif)]
-       [return (let* ([bm (make-object bitmap% (sys-path "return.xbm") 'xbm)]
-		      [dc (make-object bitmap-dc% bm)])
-		 (send dc draw-line 0 3 20 3)
-		 (send dc set-bitmap #f)
-		 bm)]
-       [clock-start #f]
-       [clock-end #f]
-       [clock-clip? #f]
-       [do-clock #f]
-       [use-bitmap? #f]
-       [platform-bitmap? #f]
-       [screen-bitmap? #f]
-       [compat-bitmap? #f]
-       [scaled-bitmap? #f]
-       [use-record? #f]
-       [serialize-record? #f]
-       [use-bad? #f]
-       [depth-one? #f]
-       [cyan? #f]
-       [multi-page? #f]
-       [smoothing 'unsmoothed]
-       [align-scale 1.0]
-       [save-filename #f]
-       [save-file-format #f]
-       [clip 'none]
-       [current-alpha 1.0]
-       [current-c-alpha 1.0]
-       [current-rotation 0.0]
-       [current-skew? #f])
-  (send hp0 stretchable-height #f)
-  (send hp stretchable-height #f)
-  (send hp2.5 stretchable-height #f)
-  (send hp3 stretchable-height #f)
-  (make-object button% "What Should I See?" hp0
-	       (lambda (b e)
-		 (show-instructions (collection-file-path "draw-info.txt" "tests/gracket"))))
-  (let ([canvas
-	 (make-object
-	  (class canvas%
-	    (init parent)
-	    (inherit get-dc refresh init-auto-scrollbars)
-	    (define no-bitmaps? #f)
-	    (define no-stipples? #f)
-	    (define pixel-copy? #f)
-	    (define kern? #f)
-	    (define clip-pre-scale? #f)
-            (define c-clip #f)
-	    (define mask-ex-mode 'mred)
-	    (define xscale 1)
-	    (define yscale 1)
-	    (define offset 0)
-	    (define c-xscale 1)
-	    (define c-yscale 1)
-	    (define c-offset 0)
-	    (define c-rotate 0)
-            (define c-gray? #f)
-	    (public*
-	     [set-bitmaps (lambda (on?) (set! no-bitmaps? (not on?)) (refresh))]
-	     [set-stipples (lambda (on?) (set! no-stipples? (not on?)) (refresh))]
-	     [set-pixel-copy (lambda (on?) (set! pixel-copy? on?) (refresh))]
-	     [set-kern (lambda (on?) (set! kern? on?) (refresh))]
-	     [set-clip-pre-scale (lambda (on?) (set! clip-pre-scale? on?) (refresh))]
-	     [set-canvas-clip (lambda (mode) (set! c-clip mode) (refresh))]
-	     [set-mask-ex-mode (lambda (mode) (set! mask-ex-mode mode) (refresh))]
-	     [set-canvas-scale (lambda (xs ys) (set! c-xscale xs) (set! c-yscale ys) (refresh))]
-	     [set-scale (lambda (xs ys) (set! xscale xs) (set! yscale ys) (refresh))]
-	     [set-offset (lambda (o) (set! offset o) (refresh))]
-	     [set-canvas-offset (lambda (o) (set! c-offset o) (refresh))]
-	     [set-canvas-rotation (lambda (r) (set! c-rotate r) (refresh))]
-	     [set-canvas-gray (lambda (g?) (set! c-gray? g?) (refresh))])
-	    (override*
-	     [on-paint
-	      (case-lambda
-	       [() (time (on-paint #f))]
-	       [(kind)
-		(let* ([can-dc (get-dc)]
-		       [pen0s (make-object pen% "BLACK" 0 'solid)]
-		       [pen1s (make-object pen% "BLACK" 1 'solid)]
-		       [pen2s (make-object pen% "BLACK" 2 'solid)]
-		       [pen0t (make-object pen% "BLACK" 0 'transparent)]
-		       [pen1t (make-object pen% "BLACK" 1 'transparent)]
-		       [pen2t (make-object pen% "BLACK" 2 'transparent)]
-		       [pen0x (make-object pen% "BLACK" 0 'xor)]
-		       [pen1x (make-object pen% "BLACK" 1 'xor)]
-		       [pen2x (make-object pen% "BLACK" 2 'xor)]
-		       [brushs (make-object brush% "BLACK" 'solid)]
-		       [brusht (make-object brush% "BLACK" 'transparent)]
-		       [brushb (make-object brush% "BLUE" 'solid)]
-		       [mem-dc (if use-bitmap?
-				   (make-object bitmap-dc%)
-				   #f)]
-		       [bm (if use-bitmap?
-			       (if use-bad?
-				   (make-object bitmap% "no such file")
-                                   (let ([w (ceiling (* xscale DRAW-WIDTH))]
-                                         [h (ceiling (* yscale DRAW-HEIGHT))])
-                                     (cond
-                                      [platform-bitmap?
-                                       (make-platform-bitmap w h)]
-                                      [screen-bitmap?
-                                       (make-screen-bitmap w h)]
-                                      [compat-bitmap?
-                                       (send this make-bitmap w h)]
-                                      [scaled-bitmap?
-                                       (make-bitmap w h #:backing-scale 3.0)]
-                                      [else
-                                       (make-object bitmap% w h depth-one? c-gray?)])))
-			       #f)]
-		       [draw-series
-			(lambda (dc pens pent penx size x y flevel last?)
-			  (let* ([ofont (send dc get-font)]
-				 [otfg (send dc get-text-foreground)]
-				 [otbg (send dc get-text-background)]
-				 [obm (send dc get-text-mode)])
-			    (when (positive? flevel)
-                              (send dc set-font
-                                    (make-object font%
-                                                 10 'decorative
-                                                 'normal 
-                                                 (if (> flevel 1)
-                                                     'bold
-                                                     'normal)
-                                                 #t)))
-			    (send dc set-pen pens)
-			    (send dc set-brush brusht)
-			    
-			    ; Text should overlay this line (except for 2x2)
-			    (send dc draw-line 
-				  (+ x 3) (+ y 12)
-				  (+ x 40) (+ y 12))
-
-			    (send dc set-text-background (make-object color% "YELLOW"))
-			    (when (= flevel 2)
-			      (send dc set-text-foreground (make-object color% "RED"))
-			      (send dc set-text-mode 'solid))
-
-			    (send dc draw-text (string-append size " P\uE9n") ; \uE9 is e with '
-				  (+ x 5) (+ y 8))
-			    (send dc set-font ofont)
-			    
-			    (when (= flevel 2)
-			      (send dc set-text-foreground otfg)
-			      (send dc set-text-mode obm))
-			    (send dc set-text-background otbg)
-			    
-			    (send dc draw-line
-				  (+ x 5) (+ y 27) (+ x 10) (+ 27 y))
-			    (send dc draw-rectangle
-				  (+ x 5) (+ y 30) 5 5)
-			    (send dc draw-line
-				  (+ x 12) (+ y 30) (+ x 12) (+ y 35))
-			    
-			    (send dc draw-line
-				  (+ x 5) (+ y 40) (+ x 10) (+ 40 y))
-			    (send dc draw-rectangle
-				  (+ x 5) (+ y 41) 5 5)
-			    (send dc draw-line
-				  (+ x 10) (+ y 41) (+ x 10) (+ 46 y))
-			    
-			    (send dc draw-line
-				  (+ x 15) (+ y 25) (+ x 20) (+ 25 y))
-			    (send dc draw-line
-				  (+ x 20) (+ y 30) (+ x 20) (+ 25 y))
-			    
-			    (send dc draw-line
-				  (+ x 30) (+ y 25) (+ x 25) (+ 25 y))
-			    (send dc draw-line
-				  (+ x 25) (+ y 30) (+ x 25) (+ 25 y))
-			    
-			    (send dc draw-line
-				  (+ x 35) (+ y 30) (+ x 40) (+ 30 y))
-			    (send dc draw-line
-				  (+ x 40) (+ y 25) (+ x 40) (+ 30 y))
-			    
-			    (send dc draw-line
-				  (+ x 50) (+ y 30) (+ x 45) (+ 30 y))
-			    (send dc draw-line
-				  (+ x 45) (+ y 25) (+ x 45) (+ 30 y))
-
-			    ; Check line thickness with "X"
-			    (send dc draw-line
-				  (+ x 20) (+ y 45) (+ x 40) (+ 39 y))
-			    (send dc draw-line
-				  (+ x 20) (+ y 39) (+ x 40) (+ 45 y))
-			    
-			    (send dc draw-rectangle
-				  (+ x 5) (+ y 50) 10 10)
-			    (send dc draw-rounded-rectangle
-				  (+ x 5) (+ y 65) 10 10 3)
-			    (send dc draw-ellipse
-				  (+ x 5) (+ y 80) 10 10)
-			    
-			    (send dc set-brush brushs)
-			    (send dc draw-rectangle
-				  (+ x 17) (+ y 50) 10 10)
-			    (send dc draw-rounded-rectangle
-				  (+ x 17) (+ y 65) 10 10 3)
-			    (send dc draw-ellipse
-				  (+ x 17) (+ y 80) 10 10)
-			    
-			    (send dc set-pen pent)
-			    (send dc draw-rectangle
-				  (+ x 29) (+ y 50) 10 10)
-			    (send dc draw-rounded-rectangle
-				  (+ x 29) (+ y 65) 10 10 3)
-			    (send dc draw-ellipse
-				  (+ x 29) (+ y 80) 10 10)
-			    
-			    (send dc set-pen penx)
-			    (send dc draw-rectangle
-				  (+ x 41) (+ y 50) 10 10)
-			    (send dc draw-rounded-rectangle
-				  (+ x 41) (+ y 65) 10 10 3)
-			    (send dc draw-ellipse
-				  (+ x 41) (+ y 80) 10 10)
-			    
-			    (send dc set-pen pens)
-			    (send dc draw-rectangle
-				  (+ x 17) (+ y 95) 10 10)
-			    ; (send dc set-logical-function 'clear)
-			    (send dc draw-rectangle
-				  (+ x 18) (+ y 96) 8 8)
-			    ; (send dc set-logical-function 'copy)
-			    
-			    (send dc draw-rectangle
-				  (+ x 29) (+ y 95) 10 10)
-			    ; (send dc set-logical-function 'clear)
-			    (send dc set-pen pent)
-			    (send dc draw-rectangle
-				  (+ x 30) (+ y 96) 8 8)
-
-			    (send dc set-pen pens)
-			    (send dc draw-rectangle
-				  (+ x 5) (+ y 95) 10 10)
-			    ; (send dc set-logical-function 'xor)
-			    (send dc draw-rectangle
-				  (+ x 5) (+ y 95) 10 10)
-			    ; (send dc set-logical-function 'copy)
-			    
-			    (send dc draw-line
-				  (+ x 5) (+ y 110) (+ x 8) (+ y 110))
-			    (send dc draw-line
-				  (+ x 8) (+ y 110) (+ x 11) (+ y 113))
-			    (send dc draw-line
-				  (+ x 11) (+ y 113) (+ x 11) (+ y 116))
-			    (send dc draw-line
-				  (+ x 11) (+ y 116) (+ x 8) (+ y 119))
-			    (send dc draw-line
-				  (+ x 8) (+ y 119) (+ x 5) (+ y 119))
-			    (send dc draw-line
-				  (+ x 5) (+ y 119) (+ x 2) (+ y 116))
-			    (send dc draw-line
-				  (+ x 2) (+ y 116) (+ x 2) (+ y 113))
-			    (send dc draw-line
-				  (+ x 2) (+ y 113) (+ x 5) (+ y 110))
-			    
-			    (send dc draw-lines
-				  (list
-				   (make-object point% 5 95)
-				   (make-object point% 8 95)
-				   (make-object point% 11 98)
-				   (make-object point% 11 101)
-				   (make-object point% 8 104)
-				   (make-object point% 5 104)
-				   (make-object point% 2 101)
-				   (make-object point% 2 98)
-				   (make-object point% 5 95))
-				  (+ x 12) (+ y 15))
-
-			    (send dc draw-point (+ x 35) (+ y 115))
-			    (send dc draw-line (+ x 35) (+ y 120) (+ x 35) (+ y 120))
-			    
-			    (send dc draw-line
-				  (+ x 5) (+ y 125) (+ x 10) (+ y 125))
-			    (send dc draw-line
-				  (+ x 11) (+ y 125) (+ x 16) (+ y 125))
-
-			    (send dc set-brush brusht)
-			    (send dc draw-arc 
-				  (+ x 5) (+ y 135)
-				  30 40
-				  0 (/ pi 2))
-			    (send dc draw-arc 
-				  (+ x 5) (+ y 135)
-				  30 40
-				  (/ pi 2) pi)
-			    (send dc set-brush brushs)
-			    (send dc draw-arc 
-				  (+ x 45) (+ y 135)
-				  30 40
-				  (/ pi 2) pi)
-			    (send dc set-brush brusht)      
-
-			    
-			    (when last?
-			      (let ([p (send dc get-pen)])
-				(send dc set-pen (make-object pen% "BLACK" 1 'xor))
-				(send dc draw-polygon octagon)
-				(send dc set-pen p))
-
-			      (when clock-start
-				(let ([b (send dc get-brush)])
-				  (send dc set-brush (make-object brush% "ORANGE" 'solid))
-				  (send dc draw-arc 0. 60. 180. 180. clock-start clock-end)
-				  (send dc set-brush b))))
-
-			    (when last?
-			      (let ([op (send dc get-pen)])
-
-				; Splines
-				(define (draw-ess dx dy)
-				  (send dc draw-spline 
-					(+ dx 200) (+ dy 10)
-					(+ dx 218) (+ dy 12)
-					(+ dx 220) (+ dy 20))
-				  (send dc draw-spline 
-					(+ dx 220) (+ dy 20)
-					(+ dx 222) (+ dy 28)
-					(+ dx 240) (+ dy 30)))
-				(send dc set-pen pen0s)
-				(draw-ess 0 0)
-				(send dc set-pen (make-object pen% "RED" 0 'solid))
-				(draw-ess -2 2)
-			      
-				; Polygons: odd-even vs. winding
-				(let ([polygon
-				       (list (make-object point% 12 0)
-					     (make-object point% 40 0)
-					     (make-object point% 40 28)
-					     (make-object point% 0 28)
-					     (make-object point% 0 12)
-					     (make-object point% 28 12)
-					     (make-object point% 28 40)
-					     (make-object point% 12 40)
-					     (make-object point% 12 0))]
-				      [ob (send dc get-brush)]
-				      [op (send dc get-pen)])
-				  (send dc set-pen pen1s)
-				  (send dc set-brush (make-object brush% "BLUE" 'solid))
-				  (send dc draw-polygon polygon 200 40 'odd-even)
-				  (send dc draw-polygon polygon 200 90 'winding)
-				  (send dc set-pen op)
-				  (send dc set-brush ob))
-
-
-				; Brush patterns:
-				(let ([pat-list (list 'bdiagonal-hatch
-						      'crossdiag-hatch
-						      'fdiagonal-hatch
-						      'cross-hatch
-						      'horizontal-hatch
-						      'vertical-hatch)]
-				      [b (make-object brush% "BLACK" 'solid)]
-				      [ob (send dc get-brush)]
-				      [obg (send dc get-background)]
-				      [blue (make-object color% "BLUE")])
-				  (let loop ([x 245][y 10][l pat-list])
-				    (unless (null? l)
-				      (send b set-color "BLACK")
-				      (send b set-style (car l))
-				      (send dc set-brush b)
-				      (send dc draw-rectangle x y 20 20)
-				      (send dc set-brush ob)
-				      (send b set-color "GREEN")
-				      (send dc set-brush b)
-				      (send dc draw-rectangle (+ x 25) y 20 20)
-				      (send dc set-background blue)
-				      (send dc draw-rectangle (+ x 50) y 20 20)
-				      (send dc set-background obg)
-				      (send dc set-brush ob)
-				      (loop x (+ y 25) (cdr l))))
-
-				  (send b set-style 'panel)
-				  (send b set-color (get-panel-background))
-				  (send dc set-brush b)
-				  (send dc draw-rectangle 320 10 20 20)
-				  (send dc draw-ellipse 320 35 20 20)
-				  (send dc draw-arc 320 60 20 20 0 3.14)
-				  (send dc draw-rounded-rectangle 320 85 20 20 2)
-
-				  (send dc set-brush ob))
-				
-				(send dc set-pen op))
-
-			      ; Thick-line centering:
-			      (let ([thick (make-object pen% "GREEN" 5 'solid)])
-				(define (draw-lines)
-				  (send dc draw-line 360 10 400 50)
-				  (send dc draw-line 360 50 400 10)
-				  (send dc draw-line 360 80 400 80)
-				  (send dc draw-line 380 60 380 100)
-				  (send dc draw-line 360 120 400 140)
-				  (send dc draw-line 370 110 390 150))
-				(let ([op (send dc get-pen)])
-				  (send dc set-pen thick)
-				  (draw-lines)
-				  (send dc set-pen pen0s)
-				  (draw-lines)
-				  (send dc set-pen op)))
-				
-			      ; B&W 8x8 stipple:
-			      (unless no-bitmaps?
-				(let ([bml (get-b&w-light-stipple)]
-				      [bmh (get-b&w-half-stipple)]
-				      [orig-b (send dc get-brush)]
-				      [orig-pen (send dc get-pen)])
-				  (send dc set-brush brusht)
-				  (send dc set-pen pen1s)
-				  (send dc draw-rectangle 244 164 18 18)
-				  (send dc draw-bitmap bml 245 165)
-				  (send dc draw-bitmap bml 245 173)
-				  (send dc draw-bitmap bml 253 165)
-				  (send dc draw-bitmap bml 253 173)
-
-				  (let ([p (make-object pen% "RED" 1 'solid)])
-				    (send p set-stipple bmh)
-				    (send dc set-pen p)
-				    (send dc draw-rectangle 270 164 18 18))
-
-				  (send dc set-brush orig-b)
-				  (send dc set-pen orig-pen))))
-			    
-			    (unless no-bitmaps?
-			      (let ([obg (send dc get-background)]
-				    [tan (make-object color% "TAN")])
-				(send dc set-background tan)
-				(let* ([bits #"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789/+"]
-				       [bm (make-object bitmap% bits 64 8)])
-				  (send dc draw-bitmap bm 306 164 'opaque))
-				(let* ([bits #"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567"]
-				       [bm (make-object bitmap% bits 48 10)])
-				  (send dc draw-bitmap bm 306 184 'opaque))
-				(send dc set-background obg)))
-
-			    (when last?
-			      ; Test get-text-extent
-			      (let ([save-pen (send dc get-pen)]
-				    [save-fnt (send dc get-font)])
-				(send dc set-pen (make-object pen% "YELLOW" 1 'solid))
-				(let loop ([fam '(default default modern modern decorative roman)]
-					   [stl '(normal  slant   slant  italic normal     normal)]
-					   [wgt '(normal  bold    normal normal bold       normal)]
-					   [sze '(12      12      12     12     12         32)]
-					   [x 244]
-					   [y 210]
-					   [chinese? #t])
-				  (unless (null? fam)
-				    (let ([fnt (make-object font% (car sze) (car fam) (car stl) (car wgt))]
-					  [s "AvgflfiMh"])
-				      (send dc set-font fnt)
-				      (send dc draw-text s x y kern?)
-				      (send dc set-font save-fnt)
-				      (let-values ([(w h d a) (send dc get-text-extent s fnt kern?)])
-					(send dc draw-rectangle x y w h)
-					(send dc draw-line x (+ y (- h d)) (+ x w) (+ y (- h d)))
-					(when chinese?
-					  (let ([s "\u7238"]
-						[x (+ x (* 1.5 w))]
-						[cfnt (if (and (dc . is-a? . post-script-dc%)
-							       manual-chinese?)
-							  (make-object font% 12 "MOESung-Regular" 'default)
-							  fnt)])
-					    (send dc set-font cfnt)
-					    (send dc draw-text s x y kern?)
-					    (send dc set-font fnt)
-					    (let-values ([(w h d a) (send dc get-text-extent s cfnt kern?)])
-					      (send dc draw-rectangle x y w h)
-					      (send dc draw-line x (+ y (- h d)) (+ x w) (+ y (- h d)))
-                                              ;; Rotated Chinese character:
-                                              (send dc draw-text s (+ x h (- d)) (+ y h 2) kern? 0 (* pi -1/2))
-					      ;; Mathematical "A" (beyond UCS-2)
-					      (let ([s "\U1D670"]
-						    [x (+ x (* 1.5 w))])
-						(send dc set-font fnt)
-						(send dc draw-text s x y kern?)
-						(send dc set-font fnt)
-						(let-values ([(w h d a) (send dc get-text-extent s cfnt kern?)])
-						  (send dc draw-rectangle x y w h)
-						  (send dc draw-line x (+ y (- h d)) (+ x w) (+ y (- h d))))))))
-					(loop (cdr fam) (cdr stl) (cdr wgt) (cdr sze) x (+ y h) #f)))))
-				(send dc set-pen save-pen)))
-
-                            ;; Text paths:
-                            (let ([p (make-object dc-path%)]
-                                  [old-pen (send dc get-pen)]
-                                  [old-brush (send dc get-brush)])
-                              (send p text-outline (make-font #:size 32) "A8" 360 190)
-                              (send dc set-pen "black" 1 'solid)
-                              (send dc set-brush "pink" 'solid)
-                              (send dc draw-path p)
-                              (send dc set-pen old-pen)
-                              (send dc set-brush old-brush))
-
-			    ; Bitmap copying:
-			    (when (and (not no-bitmaps?) last?)
-			      (let ([x 5] [y 165])
-				(let ([bg (send dc get-background)]
-                                      [mred-icon (get-icon)])
-                                  (send dc set-background "YELLOW")
-				  (case mask-ex-mode
-				    [(plt plt-mask plt^plt mred^plt)
-				     (let* ([plt (get-plt)]
-					    [ww (send mred-icon get-width)]
-                                            [hh (send mred-icon get-height)]
-					    [tmp-bm (make-object bitmap% ww hh #f)]
-					    [tmp-dc (make-object bitmap-dc% tmp-bm)]
-                                            [mask-bm tmp-bm])
-				       (send tmp-dc draw-bitmap plt
-					     (/ (- (send mred-icon get-width)
-						   (send plt get-width))
-						2)
-					     (/ (- (send mred-icon get-height)
-						   (send plt get-height))
-						2))
-                                       (when (memq mask-ex-mode '(plt^plt mred^plt))
-                                         ;; Convert to grayscale
-                                         (let ([s (make-bytes (* 4 ww hh))])
-                                           (send tmp-bm get-argb-pixels 0 0 ww hh s)
-                                           (for* ([i (in-range 0 ww)]
-                                                  [j (in-range 0 hh)])
-                                             (let* ([p (* 4 (+ (* j ww) i))]
-                                                    [v (quotient (+ (bytes-ref s (+ p 1))
-                                                                    (bytes-ref s (+ p 2))
-                                                                    (bytes-ref s (+ p 3)))
-                                                                 3)])
-                                               (bytes-set! s (+ p 1) v)
-                                               (bytes-set! s (+ p 2) v)
-                                               (bytes-set! s (+ p 3) v)))
-                                           (set! mask-bm (make-object bitmap% ww hh #f))
-                                           (send tmp-dc set-bitmap mask-bm)
-                                           (send tmp-dc set-argb-pixels 0 0 ww hh s)))
-				       (if (eq? mask-ex-mode 'mred^plt)
-					   (send dc draw-bitmap mred-icon x y
-						 'solid
-						 (send the-color-database find-color "BLACK")
-						 mask-bm)
-					   (send dc draw-bitmap tmp-bm x y 'solid 
-						 (send the-color-database find-color "BLACK")
-						 (cond
-						  [(eq? mask-ex-mode 'plt-mask) mred-icon]
-						  [(eq? mask-ex-mode 'plt^plt) mask-bm]
-						  [else #f]))))]
-                                    [(mred^mred)
-                                     (send dc draw-bitmap mred-icon x y
-                                           'solid
-                                           (send the-color-database find-color "BLACK")
-                                           mred-icon)]
-                                    [(mred~)
-                                     (send dc draw-bitmap (get-rotated) x y 'opaque)]
-                                    [(mred^mred~ opaque-mred^mred~ red-mred^mred~ opaque-red-mred^mred~)
-                                     (send dc draw-bitmap mred-icon x y 
-                                           (if (memq mask-ex-mode '(opaque-mred^mred~ opaque-red-mred^mred~))
-                                               'opaque
-                                               'solid)
-                                           (send the-color-database find-color 
-                                                 (if (memq mask-ex-mode '(red-mred^mred~ opaque-red-mred^mred~))
-                                                     "RED"
-                                                     "BLACK"))
-                                           (get-rotated))]
-                                    [else
-                                     ;; simple draw
-                                     (send dc draw-bitmap mred-icon x y 'xor)])
-                                  (send dc set-background bg))
-				(set! x (+ x (send (get-icon) get-width)))
-				(let ([black (send the-color-database find-color "BLACK")]
-				      [red (send the-color-database find-color "RED")]
-				      [do-one
-				       (lambda (bm mode color)
-					 (if (send bm ok?)
-					     (begin
-					       (let ([h (send bm get-height)]
-						     [w (send bm get-width)])
-						 (send dc set-pen (make-object pen% "YELLOW" 1 'solid))
-						 (send dc draw-line 3 3 40 40)
-						 (send dc draw-bitmap-section
-						       bm x y 
-						       0 0 w h
-						       mode color)
-						 (set! x (+ x w 10))))
-					     (printf "bad bitmap\n")))])
-				  ;; BB icon
-				  (do-one bb 'solid black)
-				  (let ([start x])
-				    ;; First three return icons:
-				    (do-one return 'solid black)
-				    (do-one return 'solid red)
-				    (do-one return 'opaque red)
-				    ;; Next three, on a blue background
-				    (let ([end x]
-					  [b (send dc get-brush)])
-				      (send dc set-brush (make-object brush% "BLUE" 'solid))
-				      (send dc draw-rounded-rectangle (- start 5) (+ y 15) (- end start) 15 -0.2)
-				      (send dc set-brush b)
-				      (set! x start)
-				      (set! y (+ y 18))
-				      (do-one return 'solid black)
-				      (do-one return 'solid red)
-				      (do-one return 'opaque red)
-				      (set! y (- y 18))))
-				  ;; Another BB icon, make sure color has no effect
-				  (do-one bb 'solid red)
-				  ;; Another return, blacnk on red
-				  (let ([bg (send dc get-background)])
-				    (send dc set-background (send the-color-database find-color "BLACK"))
-				    (do-one return 'opaque red)
-				    (send dc set-background bg))
-				  ;; Return by drawing into color, copying color to monochrome, then
-				  ;;  monochrome back oonto canvas:
-				  (let* ([w (send return get-width)]
-					 [h (send return get-height)]
-					 [color (make-object bitmap% w h)]
-					 [mono (make-object bitmap% w h #t)]
-					 [cdc (make-object bitmap-dc% color)]
-					 [mdc (make-object bitmap-dc% mono)])
-				    (send cdc clear)
-				    (send cdc draw-bitmap return 0 0)
-				    (send mdc clear)
-				    (send mdc draw-bitmap color 0 0)
-				    (send dc draw-bitmap mono
-					  (- x w 10) (+ y 18)))
-				  (send dc set-pen pens))))
-
-			    (when (and (not no-stipples?) last?)
-			      ; Blue box as background:
-			      (send dc set-brush brushb)
-			      (send dc draw-rectangle 80 200 125 40)
-			      (when (send return ok?)
-				(let ([b (make-object brush% "GREEN" 'solid)])
-				  (send b set-stipple return)
-				  (send dc set-brush b)
-				  ; First stipple (transparent background)
-				  (send dc draw-rectangle 85 205 30 30)
-				  (send dc set-brush brushs)
-				  (send b set-style 'opaque)
-				  (send dc set-brush b)
-				  ; Second stipple (opaque)
-				  (send dc draw-ellipse 120 205 30 30)
-				  (send dc set-brush brushs)
-				  (send b set-stipple bb)
-				  (send dc set-brush b)
-				  ; Third stipple (BB logo)
-				  (send dc draw-rectangle 155 205 20 30)
-				  (send dc set-brush brushs)
-				  (send b set-stipple #f)
-				  (send b set-style 'cross-hatch)
-				  (send dc set-brush b)
-				  ; Green cross hatch (white BG) on blue field
-				  (send dc draw-rectangle 180 205 20 20)
-				  (send dc set-brush brushs))))
-			    
-			    (when (and pixel-copy? last? (not (or kind (eq? dc can-dc))))
-			      (let* ([x 100]
-				     [y 170]
-				     [x2 245] [y2 188]
-				     [w 40] [h 20]
-				     [c (make-object color%)]
-				     [bm (make-object bitmap% w h depth-one?)]
-				     [mdc (make-object bitmap-dc%)])
-				(send mdc set-bitmap bm)
-				(let iloop ([i 0])
-				  (unless (= i w)
-				    (let jloop ([j 0])
-				      (if (= j h)
-					  (iloop (add1 i))
-					  (begin
-					    (send dc get-pixel (+ i x) (+ j y) c)
-					    (send mdc set-pixel i j c)
-					    (jloop (add1 j)))))))
-				(send dc draw-bitmap bm x2 y2)
-				(let ([p (send dc get-pen)]
-				      [b (send dc get-brush)])
-				  (send dc set-pen (make-object pen% "BLACK" 0 'xor-dot))
-				  (send dc set-brush brusht)
-				  (send dc draw-rectangle x y w h)
-				  (send dc set-pen p)
-				  (send dc set-brush b))))
-			    
-			    (let ([styles (list 'solid
-						'dot
-						'long-dash
-						'short-dash
-						'dot-dash)]
-				  [obg (send dc get-background)]
-				  [red (make-object color% "RED")])
-			      (let loop ([s styles][y 250])
-				(unless (null? s)
-				  (let ([p (make-object pen% "GREEN" flevel (car s))])
-				    (send dc set-pen p)
-				    (send dc draw-line (+ x 5) y (+ x 30) y)
-				    (send dc set-background red)
-				    (send dc draw-line (+ x 5) (+ 4 y) (+ x 30) (+ y 4))
-				    (send dc set-background obg)
-				    (send pens set-style (car s))
-				    (send dc set-pen pens)
-				    (send dc draw-line (+ x 30) y (+ x 55) y)
-				    (send dc set-background red)
-				    (send dc draw-line (+ x 30) (+ y 4) (+ x 55) (+ y 4))
-				    (send dc set-background obg)
-				    (send dc set-pen pent)
-				    (send pens set-style 'solid)
-				    (loop (cdr s) (+ y 8))))))
-
-			    (when (= flevel 2)
-			      (let ([lens '(0 0.25 0.5 0.75 1.0 1.25 1.5 1.75 2.0)])
-				(let loop ([l lens][x 10])
-				  (unless (null? l)
-				    (let ([p (make-object pen% "BLACK" (car l) 'solid)])
-				      (send dc set-pen p)
-				      (send dc draw-line x 300 (+ x 19) 300)
-				      (send dc set-pen pent)
-				      (loop (cdr l) (+ x 20)))))))
-
-			    (when last?
-			      (let ()
-				(define (pen cap join)
-				  (let ([p (make-object pen% "blue" 4 'solid)])
-				    (send p set-cap cap)
-				    (send p set-join join)
-				    (send dc set-pen p)))
-				(send dc set-brush (make-object brush% "white" 'transparent))
-				(pen 'projecting 'miter)
-				(send dc draw-lines star 410 10)
-				(send dc draw-polygon star 480 10)
-				(pen 'round 'round)
-				(send dc draw-lines star 410 80)
-				(send dc draw-polygon star 480 80)
-				(pen 'butt 'bevel)
-				(send dc draw-lines star 410 150)
-				(send dc draw-polygon star 480 150))
-
-			      (send dc set-pen (make-object pen% "green" 3 'solid))
-			      (send dc set-brush (make-object brush% "yellow" 'solid))
-			      (send dc draw-path (let ([p (new dc-path%)])
-						   (send p append fancy-path)
-						   (send p scale 0.5 0.5)
-						   (send p translate 410 230)
-						   p))
-			      (send dc set-pen (make-object pen% "black" 0 'solid))
-			      (send dc set-brush (make-object brush% "red" 'solid))
-			      (send dc draw-path (let ([p (new dc-path%)])
-						   (send p append lambda-path)
-						   (send p scale 0.3 0.3)
-						   p)
-				    465 230)
-
-			      (send dc draw-path (let ([p (new dc-path%)])
-						   (send p rectangle 10 310 20 20)
-						   (send p rounded-rectangle 40 310 20 20 5)
-						   (send p ellipse 70 310 20 20)
-						   (send p move-to 100 310)
-						   (send p lines (list (make-object point% 0 0)
-								       (make-object point% 0 20)
-								       (make-object point% 20 10))
-							 100 310)
-						   p))
-
-                              (let ([p (send dc get-pen)])
-                                (send dc set-pen (make-object color% 0 0 0 0.1) 1 'solid)
-                                (send dc set-brush (make-object color% 255 0 200 0.5) 'solid)
-                                (send dc draw-rectangle 250 320 20 20)
-                                (send dc set-brush (make-object color% 0 255 200 0.5) 'solid)
-                                (send dc draw-rectangle 260 330 20 20)
-                                (send dc set-pen p))
-
-                              (let ([p (send dc get-pen)])
-                                (send dc set-pen "white" 1 'transparent)
-                                (send dc set-brush (new brush%
-                                                        [gradient
-                                                         (make-object linear-gradient%
-                                                                      300 0 380 0
-                                                                      (list (list 0.0
-                                                                                  (make-object color% 255 0 0))
-                                                                            (list 0.5
-                                                                                  (make-object color% 0 255 0))
-                                                                            (list 1.0
-                                                                                  (make-object color% 0 0 255 0.0))))]))
-                                (send dc draw-rectangle 300 320 80 20)
-                                (send dc set-pen p))
-
-                              (let ([p (send dc get-pen)])
-                                (send dc set-pen "black" 1 'solid)
-                                (send dc set-brush surface-brush)
-                                (send dc draw-rectangle 400 320 30 40)
-                                (send dc set-pen p))
-
-                              (let ([p (send dc get-pen)])
-                                (send dc set-pen "white" 1 'transparent)
-                                (send dc set-brush (new brush%
-                                                        [gradient
-                                                         (make-object radial-gradient%
-                                                                      360 250 5
-                                                                      365 245 25
-                                                                      (list (list 0.0
-                                                                                  (make-object color% 255 0 0))
-                                                                            (list 0.5
-                                                                                  (make-object color% 0 255 0))
-                                                                            (list 1.0
-                                                                                  (make-object color% 0 0 255 0.0))))]))
-                                (send dc draw-rectangle 338 228 44 44)
-                                (send dc set-pen p))
-
-			      (send dc draw-line 130 310 150 310)
-			      (send dc draw-line 130 312.5 150 312.5)
-			      (send dc draw-line 130 314.3 150 314.3)
-			      (send dc draw-line 130 316.7 150 316.7)
-
-			      (let-values ([(xs ys) (send dc get-scale)])
-				(send dc set-scale (* xs 1.25) (* ys 1.25))
-				(let ([x (/ 10 1.25)]
-				      [y (/ 340 1.25)])
-				  (send dc draw-bitmap square-bm x y)
-				  (send dc draw-bitmap square-bm (+ x 10) y)
-				  (send dc draw-bitmap square-bm (+ x 20) y)
-				  (send dc draw-bitmap square-bm (+ x 30) y))
-				(send dc set-scale xs ys)
-				(send dc set-pen "black" 0 'solid)
-				(send dc draw-line 10 337 59 337))
-
-			      (let ([p (send dc get-pen)])
-				(send dc set-pen "blue" 8 'solid)
-				(send dc draw-rectangle 160 310 20 20)
-				(send dc set-pen "blue" 7 'solid)
-				(send dc draw-rectangle 187 310 20 20)
-				(send dc set-pen p)))
-			      
-                            (when (and last? 
-                                       (or (and (not (or kind (eq? dc can-dc)))
-                                                (send mem-dc get-bitmap))
-                                           use-record?))
-                              (when c-gray?
-                                (let ([b (send can-dc get-brush)]
-                                      [p (send can-dc get-pen)])
-                                  (send can-dc set-brush "gray" 'solid)
-                                  (send can-dc set-pen "black" 1 'transparent)
-                                  (send can-dc draw-rectangle 0 0 1024 1024)
-                                  (send can-dc set-brush b)
-                                  (send can-dc set-pen p)))
-                              (send can-dc set-origin c-offset c-offset)
-                              (send can-dc set-rotation c-rotate)
-                              (send can-dc set-scale c-xscale c-yscale)
-                              (send can-dc set-alpha current-c-alpha)
-                              (when c-clip
-                                (define r (new region%))
-                                (case c-clip
-                                  [(square) (send r set-rectangle 0 0 200 200)]
-                                  [(squares)
-                                   (define r2 (new region%))
-                                   (send r set-rectangle 0 0 200 200)
-                                   (send r2 set-rectangle 210 210 40 40)
-                                   (send r union r2)]
-                                  [(octagon) (send r set-polygon octagon)])
-                                (send can-dc set-clipping-region r))
-                              (if use-record?
-                                  (if serialize-record?
-                                      (let ()
-                                        (define-values (i o) (make-pipe))
-                                        (write (send dc get-recorded-datum) o)
-                                        ((recorded-datum->procedure (read i)) can-dc))
-                                      ((send dc get-recorded-procedure) can-dc))
-                                  (send can-dc draw-bitmap (send mem-dc get-bitmap) 0 0 'opaque))
-                              (send can-dc set-origin 0 0)
-                              (send can-dc set-scale 1 1)
-                              (send can-dc set-alpha 1.0)
-                              (send can-dc set-clipping-region #f)))
-
-			  'done)])
-
-		  (send (get-dc) set-scale 1 1)
-		  (send (get-dc) set-origin 0 0)
-
-		  (let ([dc (if kind
-				(let ([dc (case kind
-                                            [(print) (make-object printer-dc%)]
-                                            [(svg)
-                                             (let ([fn (put-file)])
-                                               (and fn
-                                                    (new svg-dc%
-                                                         [width (* xscale DRAW-WIDTH)]
-                                                         [height (* yscale DRAW-HEIGHT)]
-                                                         [output fn]
-                                                         [exists 'truncate])))]
-                                            [(ps pdf)
-                                             (let ([page?
-                                                    (eq? 'yes (message-box
-                                                               "Bounding Box"
-                                                               "Use paper bounding box?"
-                                                               #f
-                                                               '(yes-no)))])
-                                               (new (if (eq? kind 'ps)
-                                                        post-script-dc% 
-                                                        pdf-dc%)
-                                                    [width (* xscale DRAW-WIDTH)]
-                                                    [height (* yscale DRAW-HEIGHT)]
-                                                    [as-eps (not page?)]
-                                                    [use-paper-bbox page?]))])])
-				  (and (send dc ok?) dc))
-                                (if use-record?
-                                    (make-object record-dc% (* xscale DRAW-WIDTH) (* yscale DRAW-HEIGHT))
-                                    (if (and use-bitmap?)
-                                        (begin
-                                          (send mem-dc set-bitmap bm)
-                                          mem-dc)
-                                        (get-dc))))])
-		    (when dc
-                      (send dc start-doc "Draw Test")
-		      (send dc start-page)
-
-                      (send dc erase)
-
-		      (send dc set-alpha current-alpha)
-                      (send dc set-rotation (- current-rotation))
-                      (send dc set-initial-matrix (if current-skew?
-                                                      (vector 1 0 0.2 1 3 0)
-                                                      (vector 1 0 0 1 0 0)))
-
-		      (if clip-pre-scale?
-			  (begin
-			    (send dc set-scale 1 1)
-			    (send dc set-origin 0 0))
-			  (begin
-			    (send dc set-scale xscale yscale)
-			    (send dc set-origin offset offset)))
-		      (send dc set-smoothing smoothing)
-		      (send dc set-alignment-scale align-scale)
-		      
-		      (send dc set-background
-			    (if cyan?
-				(send the-color-database find-color "CYAN")
-				(send the-color-database find-color "WHITE")))
-
-		      ;(send dc set-clipping-region #f)
-		      (send dc erase)
-
-                      (let ([clip-dc dc])
-                        (if clock-clip?
-                            (let ([r (make-object  region% clip-dc)])
-                              (send r set-arc 0. 60. 180. 180. clock-start clock-end)
-                              (send dc set-clipping-region r))
-                            (let ([mk-poly (lambda (mode)
-                                             (let ([r (make-object region% clip-dc)])
-                                               (send r set-polygon octagon 0 0 mode) r))]
-                                  [mk-circle (lambda ()
-                                               (let ([r (make-object region% clip-dc)])
-                                                 (send r set-ellipse 0. 60. 180. 180.) r))]
-                                  [mk-rect (lambda ()
-                                             (let ([r (make-object region% clip-dc)])
-                                               (send r set-rectangle 100 -25 10 400) r))])
-                              (case clip
-                                [(none) (void)]
-                                [(rect) (send dc set-clipping-rect 100 -25 10 400)]
-                                [(rect2) (send dc set-clipping-rect 50 -25 10 400)]
-                                [(poly) (send dc set-clipping-region (mk-poly 'odd-even))]
-                                [(circle) (send dc set-clipping-region (mk-circle))]
-                                [(wedge) (let ([r (make-object region% clip-dc)])
-                                           (send r set-arc 0. 60. 180. 180. (* 1/4 pi) (* 3/4 pi))
-                                           (send dc set-clipping-region r))]
-                                [(lam) (let ([r (make-object region% clip-dc)])
-                                         (send r set-path lambda-path)
-                                         (send dc set-clipping-region r))]
-                                [(A) (let ([p (new dc-path%)]
-                                           [r (make-object region% clip-dc)])
-                                       (send p text-outline (make-font #:size 256) "A" 10 10)
-                                       (send r set-path p)
-                                       (send dc set-clipping-region r))]
-                                [(rect+poly) (let ([r (mk-poly 'winding)])
-                                               (send r union (mk-rect))
-                                               (send dc set-clipping-region r))]
-                                [(rect+circle) (let ([r (mk-circle)])
-                                                 (send r union (mk-rect))
-                                                 (send dc set-clipping-region r))]
-                                [(poly-rect) (let ([r (mk-poly 'odd-even)])
-                                               (send r subtract (mk-rect))
-                                               (send dc set-clipping-region r))]
-                                [(poly&rect) (let ([r (mk-poly 'odd-even)])
-                                               (send r intersect (mk-rect))
-                                               (send dc set-clipping-region r))]
-                                [(poly^rect) (let ([r (mk-poly 'odd-even)])
-                                               (send r xor (mk-rect))
-                                               (send dc set-clipping-region r))]
-                                [(roundrect) (let ([r (make-object region% clip-dc)])
-                                               (send r set-rounded-rectangle 80 200 125 40 -0.25)
-                                               (send dc set-clipping-region r))]
-                                [(empty) (let ([r (make-object region% clip-dc)])
-                                           (send dc set-clipping-region r))]
-                                [(polka) 
-                                 (let ([c (send dc get-background)])
-                                   (send dc set-background (send the-color-database find-color "PURPLE"))
-                                   (send dc clear)
-                                   (send dc set-background c))
-                                 (let ([r (make-object region% clip-dc)]
-                                       [w 30]
-                                       [s 10])
-                                   (let xloop ([x 0])
-                                     (if (> x 300)
-                                         (send dc set-clipping-region r)
-                                         (let yloop ([y 0])
-                                           (if (> y 500)
-                                               (xloop (+ x w s))
-                                               (let ([r2 (make-object region% clip-dc)])
-                                                 (send r2 set-ellipse x y w w)
-                                                 (send r union r2)
-                                                 (yloop (+ y w s))))))))
-                                 (send dc clear)]))))
-
-		      (when clip-pre-scale?
-			(send dc set-scale xscale yscale)
-			(send dc set-origin offset offset)
-
-			(let ([r (send dc get-clipping-region)])
-			  (send dc set-clipping-rect 0 0 20 20)
-			  (if r
-			      (let ([r2 (make-object region% dc)])
-				(send r2 set-rectangle 0 0 0 0)
-				(send r xor r2)
-				(send r2 xor r)
-				(send dc set-clipping-region r2))
-			      (send dc set-clipping-region #f))))
-
-                      (unless clock-clip?
-                        (let ([r (send dc get-clipping-region)])
-                          (when r
-                            (when (send r get-dc)
-                              (unless (eq? (send r is-empty?) (eq? clip 'empty))
-                                (show-error 'draw-text "region `is-empty?' mismatch"))))))
-                      
-                      (define (mutate-region)
-                        (when (and (not clock-clip?)
-                                   (not (eq? clip 'none)))
-                          ;; To be uncooperative, mutate the clipping region:
-                          (define r (send dc get-clipping-region))
-                          (define r2 (make-object region% (send r get-dc)))
-                          (send r2 union r)
-                          (send dc set-clipping-region #f)
-                          (send r set-rectangle 0 0 10 10)
-                          (send dc set-clipping-region r2)))
-
-		      ;; check default pen/brush:
-		      (send dc draw-rectangle 0 0 5 5)
-		      (send dc draw-line 0 0 20 6)
-
-		      (send dc set-font (make-object font% 10 'default))
-
-		      (draw-series dc pen0s pen0t pen0x "0 x 0" 5 0 0 #f)
-
-                      (mutate-region)
-		      
-		      (draw-series dc pen1s pen1t pen1x "1 x 1" 70 0 1 #f)
-		      
-		      (draw-series dc pen2s pen2t pen2x "2 x 2" 135 0 2 #t)
-
-		      (unless clock-clip?
-			(let ([r (send dc get-clipping-region)])
-                          (if (eq? clip 'none)
-			      (when r
-				(show-error 'draw-test "shouldn't have been a clipping region"))
-			      (let*-values ([(x y w h) (send r get-bounding-box)]
-					    [(l) (list x y w h)]
-					    [(=~) (lambda (x y)
-						    (or (not y)
-                                                        (<= (- x 2) y (+ x 2))))])
-				(unless (andmap =~ l
-						(let ([l
-						       (case clip
-							 [(rect) '(100. -25. 10. 400.)]
-							 [(rect2) '(50. -25. 10. 400.)]
-							 [(poly circle poly-rect) '(0. 60. 180. 180.)]
-							 [(wedge) '(26. 60. 128. 90.)]
-							 [(lam) '(58. 10. 202. 281.)]
-							 [(A) '(#f #f #f #f)]
-							 [(rect+poly rect+circle poly^rect) '(0. -25. 180. 400.)]
-							 [(poly&rect) '(100. 60. 10. 180.)]
-							 [(roundrect) '(80. 200. 125. 40.)]
-							 [(polka) '(0. 0. 310. 510.)]
-							 [(empty) '(0. 0. 0. 0.)])])
-						  (if clip-pre-scale?
-						      (list (- (/ (car l) xscale) offset)
-							    (- (/ (cadr l) yscale) offset)
-							    (- (/ (caddr l) xscale) offset)
-							    (- (/ (cadddr l) yscale) offset))
-						      l)))
-				  (show-error 'draw-test "clipping region changed badly: ~a" l))))))
-
-		      (let-values ([(w h) (send dc get-size)])
-			(unless (cond
-				 [kind #t]
-				 [use-bad? #t]
-				 [use-bitmap? (and (= w (ceiling (* xscale DRAW-WIDTH))) (= h (ceiling (* yscale DRAW-HEIGHT))))]
-				 [else (and (= w (* 2 DRAW-WIDTH)) (= h (* 2 DRAW-HEIGHT)))])
-			  (show-error 'x "wrong size reported by get-size: ~a ~a (not ~a)" w h
-                                      (if use-bitmap?
-                                          (list (* xscale DRAW-WIDTH) (* yscale DRAW-HEIGHT))
-                                          (list (* 2 DRAW-WIDTH) (* 2 DRAW-HEIGHT))))))
-
-                      (send dc set-clipping-region #f)
-
-                      (send dc end-page)
-                      (when (and kind multi-page?)
-                        (send dc start-page)
-                        (send dc draw-text "Page 2" 0 0)
-                        (send dc end-page))
-		      (send dc end-doc)))
-		  
-		  (when save-filename
-		    (send bm save-file save-filename save-file-format)
-		    (set! save-filename #f))
-
-		  'done)])])
-	    (super-new [parent parent][style '(hscroll vscroll)])
-	    (init-auto-scrollbars (* 2 DRAW-WIDTH) (* 2 DRAW-HEIGHT) 0 0))
-	  vp)])
-    (make-object choice% #f '("Canvas" "Pixmap" "Bitmap" "Platform" "Screen" "Compatible" "Backing x3" "Record" "Serialize" "Bad") hp0
-		 (lambda (self event)
-		   (set! use-bitmap? (< 0 (send self get-selection)))
-		   (set! depth-one? (= 2 (send self get-selection)))
-		   (set! platform-bitmap? (= 3 (send self get-selection)))
-		   (set! screen-bitmap? (= 4 (send self get-selection)))
-		   (set! compat-bitmap? (= 5 (send self get-selection)))
-		   (set! scaled-bitmap? (= 6 (send self get-selection)))
-		   (set! use-record? (<= 7 (send self get-selection) 8))
-		   (set! serialize-record? (= 8 (send self get-selection)))
-		   (set! use-bad? (< 9 (send self get-selection)))
-		   (send canvas refresh)))
-    (make-object choice% #f
-		 '("MrEd XOR" "PLT Middle" "PLT ^ MrEd" "MrEd ^ PLT" "MrEd ^ MrEd" 
-		   "MrEd~ Opaque" "MrEd ^ MrEd~" "M^M~ Opaque" "M^M~ Red" "M^M~ Rd Opq"
-		   "PLT^PLT")
-		 hp
-		 (lambda (self event)
-		   (send canvas set-mask-ex-mode 
-			 (list-ref '(mred plt plt-mask mred^plt mred^mred 
-					  mred~ mred^mred~ opaque-mred^mred~ 
-                                          red-mred^mred~ opaque-red-mred^mred~
-					  plt^plt)
-				   (send self get-selection)))))
-    (make-object check-box% "Kern" hp
-		 (lambda (self event)
-		   (send canvas set-kern (send self get-value))))
-    (make-object check-box% "Cyan" hp
-		 (lambda (self event)
-		   (set! cyan? (send self get-value))
-		   (send canvas refresh)))
-    (send (make-object check-box% "Icons" hp2
-		       (lambda (self event)
-			 (send canvas set-bitmaps (send self get-value))))
-	  set-value #t)
-    (send (make-object check-box% "Stipples" hp2
-		       (lambda (self event)
-			 (send canvas set-stipples (send self get-value))))
-	  set-value #t)
-    (make-object check-box% "Pixset" hp2
-		 (lambda (self event)
-		   (send canvas set-pixel-copy (send self get-value))))
-    (make-object button% "Save" hp
-		 (lambda (b e)
-		   (unless use-bitmap?
-		     (error 'save-file "only available for pixmap/bitmap mode"))
-		   (let ([f (put-file)])
-		     (when f
-		       (let ([format
-			      (cond 
-			       [(regexp-match "[.]xbm$" f) 'xbm]
-			       [(regexp-match "[.]xpm$" f) 'xpm]
-			       [(regexp-match "[.]jpe?g$" f) 'jpeg]
-			       [(regexp-match "[.]png$" f) 'png]
-			       [else (error 'save-file "unknown suffix: ~e" f)])])
-			 (set! save-filename f)
-			 (set! save-file-format format)
-			 (send canvas refresh))))))
-    (make-object choice% #f '("Unsmoothed" "Smoothed" "Aligned") hp2.5
-		 (lambda (self event)
-		   (set! smoothing (list-ref '(unsmoothed smoothed aligned)
-					     (send self get-selection)))
-		   (send canvas refresh)))
-    (make-object choice% #f '("Align 1.0" "Align 2.0" "Align 3.0" "Align 0.5") hp2.5
-		 (lambda (self event)
-		   (set! align-scale (list-ref '(1.0 2.0 3.0 0.5)
-                                               (send self get-selection)))
-		   (send canvas refresh)))
-    (make-object button% "Clock" hp2.5 (lambda (b e) (do-clock #f)))
-    (make-object choice% "Clip" 
-		 '("None" "Rectangle" "Rectangle2" "Octagon" 
-		   "Circle" "Wedge" "Round Rectangle" "Lambda" "A"
-		   "Rectangle + Octagon" "Rectangle + Circle" 
-		   "Octagon - Rectangle" "Rectangle & Octagon" "Rectangle ^ Octagon" "Polka"
-		   "Empty")
-		 hp2.75
-		 (lambda (self event)
-		   (set! clip (list-ref
-		               '(none rect rect2 poly circle wedge roundrect lam A 
-				      rect+poly rect+circle poly-rect poly&rect poly^rect 
-				      polka empty)
-		               (send self get-selection)))
-		   (send canvas refresh)))
-    (make-object check-box% "Clip Pre-Scale" hp2.75
-		 (lambda (self event)
-		   (send canvas set-clip-pre-scale (send self get-value))))
-    (make-object choice% #f '("1" "*2" "/2" "1,*2" "*2,1") hp2.75
-		 (lambda (self event)
-		   (send canvas set-scale 
-			 (list-ref '(1 2 1/2 1 2) (send self get-selection))
-			 (list-ref '(1 2 1/2 2 1) (send self get-selection)))))
-    (make-object check-box% "+10" hp2.75
-		 (lambda (self event)
-		   (send canvas set-offset (if (send self get-value) 10 0))))
-    (make-object choice% #f '("Cvs 1" "Cvs *2" "Cvs /2" "Cvs 1,*2" "Cvs *2,1") hp3
-		 (lambda (self event)
-		   (send canvas set-canvas-scale 
-			 (list-ref '(1 2 1/2 1 2) (send self get-selection))
-			 (list-ref '(1 2 1/2 2 1) (send self get-selection)))))
-    (make-object check-box% "Cvs +10" hp3
-		 (lambda (self event)
-		   (send canvas set-canvas-offset (if (send self get-value) 10 0))))
-    (make-object check-box% "Cvs rot" hp3
-		 (lambda (self event)
-		   (send canvas set-canvas-rotation (if (send self get-value) (* pi -1/5) 0))))
-    (make-object choice% "Cvs Clip" '("None" "Empty" "Square" "Squares" "Octagon") hp3
-		 (lambda (self event)
-		   (send canvas set-canvas-clip (case (send self get-selection)
-                                                  [(0) #f]
-                                                  [(1) 'empty]
-                                                  [(2) 'square]
-                                                  [(3) 'squares]
-                                                  [(4) 'octagon]))))
-    (make-object check-box% "Cvs Gray" hp3
-		 (lambda (self event)
-		   (send canvas set-canvas-gray (send self get-value))))
-    (make-object button% "PS" hp3
-		 (lambda (self event)
-		   (send canvas on-paint 'ps)))
-    (make-object button% "PDF" hp3
-		 (lambda (self event)
-		   (send canvas on-paint 'pdf)))
-    (make-object button% "SVG" hp3
-		 (lambda (self event)
-		   (send canvas on-paint 'svg)))
-    (let ([clock (lambda (clip?)
-		   (thread (lambda ()
-			     (set! clock-clip? clip?)
-			     (let loop ([c 0][swapped? #f][start 0.][end 0.])
-			       (if (= c 32)
-				   (if swapped?
-				       (void)
-				       (loop 0 #t 0. 0.))
-				   (begin
-				     (set! clock-start (if swapped? end start))
-				     (set! clock-end (if swapped? start end))
-				     (send canvas on-paint)
-				     (sleep 0.25)
-				     (loop (add1 c) swapped? (+ start (/ pi 8)) (+ end (/ pi 16))))))
-			     (set! clock-clip? #f)
-			     (set! clock-start #f)
-			     (set! clock-end #f)
-			     (send canvas refresh))))])
-      (set! do-clock clock)
-      (make-object button% "Clip Clock" hp2.75 (lambda (b e) (clock #t)))
-      (make-object check-box% "Multiple Pages" hp2.75
-                   (lambda (self event)
-                     (set! multi-page? (send self get-value))))
-      (make-object button% "Print" hp4 (lambda (self event) (send canvas on-paint 'print)))
-      (make-object button% "Print Setup" hp4 (lambda (b e) (let ([c (get-page-setup-from-user)])
-                                                             (when c
-                                                               (send (current-ps-setup) copy-from c)))))
-      (make-object slider% "Alpha" 0 10 hp4
-                   (lambda (s e)
-                     (let ([a (/ (send s get-value) 10.0)])
-                       (unless (= a current-alpha)
-                         (set! current-alpha a)
-                         (send canvas refresh))))
-                   10 '(horizontal plain))
-      (make-object check-box% "Cvs Fade" hp4
-                   (lambda (c e)
-                     (set! current-c-alpha (if (send c get-value) 0.5 1.0))
-                     (send canvas refresh)))
-      (make-object slider% "Rotation" 0 100 hp4
-                   (lambda (s e)
-                     (let ([a (* pi 1/4 (/ (send s get-value) 100.0))])
-                       (unless (= a current-rotation)
-                         (set! current-rotation a)
-                         (send canvas refresh))))
-                   0 '(horizontal plain))
-      (make-object check-box% "Skew" hp4
-                   (lambda (c e)
-                     (set! current-skew? (send c get-value))
-                     (send canvas refresh)))))
-
-  (send f show #t))
-
-;; For test mode, check that we can at least start,
-;; but exit right away:
-(module+ test 
-  (queue-callback (lambda () (exit)) #f))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/editor.rktl b/pkgs/gui-pkgs/gui-test/tests/gracket/editor.rktl
deleted file mode 100644
index 901d15cbc0..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/editor.rktl
+++ /dev/null
@@ -1,675 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(require racket/gui/base)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                            Editor Tests                                    ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;;;;; File and port save/load tests
-
-(define (run-save/load-tests editor% insert reset?)
-  (when reset?
-    (map (lambda (f)
-	   (when (file-exists? f) (delete-file f)))
-	 '("tmp99" "tmp98" "tmp97" "tmp96" "tmp95")))
-  (let* ([mode #f]
-	 [editor+% (class editor%
-		     (define/augment (on-load-file path -mode)
-		       (set! mode -mode))
-		     (define/augment (on-save-file path -mode)
-		       (set! mode -mode))
-		     (super-new))]
-	 [e (make-object editor+%)]
-	 [ck-text (lambda (path)
-		    (when (eq? editor% text%)
-		      (st 'text e get-file-format)
-		      (when path
-			(test "Hello" 'content (with-input-from-file path
-						 (lambda ()
-						   (read-string 100)))))))]
-	 [ck-binary (lambda (path)
-		      (when (eq? editor% text%)
-			(st 'standard e get-file-format))
-		      (when path
-			(test #"#reader(lib\"read.ss\"\"wxme\")WXME" 'content (with-input-from-file path
-                                                                                (lambda ()
-                                                                                  (read-bytes 31))))))]
-	 [ck-mode (lambda (-mode)
-		    (test (if (eq? editor% pasteboard%) 
-			      (if (eq? -mode 'copy)
-				  'copy
-				  'standard) 
-			      -mode) 
-			  'mode mode))])
-    (insert e "Hello")
-    (st #t e is-modified?)
-    (st #f e get-filename)
-    (when (eq? editor% text%)
-      (st 'standard e get-file-format))
-    (st #t e save-file "tmp99" 'text)
-    (ck-mode 'text)
-    (st (string->path "tmp99") e get-filename)
-    (st #f e is-modified?)
-    (ck-text "tmp99")
-    (insert e "Ack")
-    (st #t e is-modified?)
-    (st #t e load-file "tmp99" 'guess)
-    (ck-mode 'guess)
-    (ck-text #f)
-    (st #f e is-modified?)
-    (st "Hello" e get-flattened-text)
-    (let ([now (file-or-directory-modify-seconds "tmp99")])
-      (st #t e save-file "tmp99" 'same)
-      (ck-text "tmp99")
-      (st (string->path "tmp99") e get-filename)
-      (let ([later (file-or-directory-modify-seconds "tmp99")])
-	(test #t 'file-date (now . <= . later))
-	(st #t e save-file "tmp98" 'standard)
-	(test #f 'file-date (later . < . (file-or-directory-modify-seconds "tmp99")))
-	(ck-binary "tmp98")
-	(st #t e load-file "tmp98" 'guess)
-	(ck-mode 'guess)
-	(ck-binary #f)
-	(st #t e load-file "tmp98" 'text)
-	(ck-mode 'text)
-	(ck-text #f)
-	(when (eq? editor% text%)
-          (st "#reader(lib\"read.ss\"\"wxme\")WXME"  e get-text 0 31))
-	(st #t e load-file "tmp98" 'same)
-	(ck-mode 'same)
-	(ck-text #f)
-        (when (eq? editor% text%)
-          (st "#reader(lib\"read.ss\"\"wxme\")WXME"  e get-text 0 31))
-	(st #t e load-file "tmp98" 'guess)
-	(ck-mode 'guess)
-	(ck-binary #f)
-	(st "Hello" e get-flattened-text)))
-    (let ([target "tmp97"])
-      ;; Check [non-]temporary file names
-      (set! e (make-object (class editor+%
-			     (define/override (put-file file dir)
-			       (string->path target))
-			     (super-new))))
-      (insert e "Howdy")
-      (st #t e is-modified?)
-      (set! mode #f)
-      (st #t e save-file #f 'copy)
-      (ck-mode 'copy)
-      (set! target "tmp95")
-      (st #t e is-modified?)
-      (ck-binary "tmp97")
-      (stv e set-filename "tmp96")
-      (st #t e save-file #f)
-      (st #f e is-modified?)
-      (st (string->path "tmp96") e get-filename)
-      (ck-binary "tmp96")
-      (stv e set-filename "tmp96" #t)
-      (st #t e save-file #f)
-      (ck-mode 'same)
-      (st (string->path "tmp95") e get-filename)
-      (stv e set-filename "tmp96" #t)
-      (st #t e save-file "")
-      (st (string->path "tmp95") e get-filename)
-      (ck-binary "tmp95")
-      (st "Howdy" e get-flattened-text)
-      (when (eq? editor% text%)
-	(stv e set-position 100))
-      (st #t e insert-file "tmp98")
-      (st "HowdyHello" e get-flattened-text)
-      (st #t e insert-file "tmp99")
-      (st "HowdyHelloHello" e get-flattened-text)
-      (st (string->path "tmp95") e get-filename))))
-    
-(define text-insert (lambda (e t) (send e insert t)))
-(define pb-insert (lambda (e t) (send e insert (make-object string-snip% t))))
-
-(map (lambda (reset?)
-       (run-save/load-tests text% text-insert reset?)
-       (run-save/load-tests pasteboard% pb-insert reset?))
-     '(#t #f))
-
-;; Test DrRacket-style format change in `on-save':
-(define (run-on-save-tests editor% insert)
-  (let* ([editor+% (if (eq? editor% text%)
-		       (class editor%
-			 (inherit set-file-format)
-			 (define/augment (on-save-file path -mode)
-			   (set-file-format 'standard))
-			 (super-new))
-		       editor%)]
-	 [e (make-object editor+%)])
-    (insert e "Hello")
-    (st #t e is-modified?)
-    (st #f e get-filename)
-    (when (eq? editor% text%)
-      (stv e set-file-format 'text)
-      (st 'text e get-file-format))
-    (st #t e save-file "tmp99" 'same)
-    (when (eq? editor% text%)
-      (st 'standard e get-file-format))
-    (send e load-file "tmp99" 'guess)
-    (st "Hello" e get-flattened-text)))
-(run-on-save-tests text% text-insert)
-(run-on-save-tests pasteboard% pb-insert)
-
-;;;;;; Undo tests
-
-(define e (make-object text%))
-(send e set-max-undo-history 1024)
-
-(stv e insert "Hello")
-(st #t e is-modified?)
-(stv e undo)
-(st #f e is-modified?)
-(stv e redo)
-(st #t e is-modified?)
-(stv e set-modified #f)
-(st #f e is-modified?)
-(stv e undo)
-(st #t e is-modified?)
-(stv e redo)
-(st #f e is-modified?)
-(stv e undo)
-(st #t e is-modified?)
-(stv e redo)
-(st #f e is-modified?)
-(stv e undo)
-(st "" e get-text)
-(stv e set-modified #f)
-(st #f e is-modified?)
-(stv e redo) ; somehow cancel's redo action to set modified to #f...
-(st #t e is-modified?)
-(st "Hello" e get-text)
-(define undone? #f)
-(stv e add-undo (letrec ([f (lambda ()
-			      (set! undone? #t)
-			      (send e add-undo f) ; reinstall self!
-			      #f)])
-		  f))
-(stv e undo)
-(st "Hello" e get-text)
-(test #t 'undone? undone?)
-(stv e undo)
-(st "" e get-text)
-(set! undone? #f)
-(stv e redo)
-(st "Hello" e get-text)
-(test #f 'undone? undone?)
-(stv e redo)
-(st "Hello" e get-text)
-(test #t 'undone? undone?)
-(set! undone? #f)
-(stv e redo)
-(st "Hello" e get-text)
-(test #f 'undone? undone?)
-(stv e insert "x")
-(st "Hellox" e get-text)
-(stv e add-undo (lambda ()
-		  (set! undone? #t)
-		  #t)) ; do next one, too
-(stv e undo)
-(test #t 'undone? undone?)
-(st "Hello" e get-text)
-
-;; Editor ports
-
-(let ([e (make-object text%)]
-      [res-mode? #f])
-  (stv e insert "hello")
-  (let ([p (open-input-text-editor e)])
-    (test 'hello 'read (read p))
-    (test eof 'read (read p)))
-  (stv e insert " there")
-  (let ([p (open-input-text-editor e)])
-    (test 'hello 'read (read p))
-    (test 'there 'read (read p))
-    (test eof 'read (read p)))
-  (stv e insert (make-object
-		 (class* snip% 
-		   (readable-snip<%>)
-		   (define/public (read-special src line col pos)
-		     (if res-mode?
-			 'res
-			 (error 'ack)))
-		   (super-new))))
-  (let ([p (open-input-text-editor e)])
-    (port-count-lines! p)
-    (test '(1 0 1) 'pos (call-with-values (lambda () (port-next-location p)) list))
-    (test 'hello 'read (read p))
-    (test '(1 5 6) 'pos (call-with-values (lambda () (port-next-location p)) list))
-    (test 'there 'read (read p))
-    (test '(1 11 12) 'pos (call-with-values (lambda () (port-next-location p)) list))
-    (test 'got-ack 'read (with-handlers ([exn:fail? (lambda (x)
-						      'got-ack)])
-			   (read p)))
-    (test '(1 12 13) 'pos (call-with-values (lambda () (port-next-location p)) list))
-    (test eof 'read (read p)))
-  (set! res-mode? #t)
-  (let ([p (open-input-text-editor e)])
-    (port-count-lines! p)
-    (test 'hello 'read (read p))
-    (test 'there 'read (read p))
-    (test 'res 'read (read p))
-    (test '(1 12 13) 'pos (call-with-values (lambda () (port-next-location p)) list))
-    (test eof 'read (read p)))
-  (stv e insert (make-object image-snip% (build-path
-					  (collection-path "icons") 
-					  "plt.gif")))
-  (let ([p (open-input-text-editor e)])
-    (test 'hello 'read (read p))
-    (test 'there 'read (read p))
-    (test 'res 'read (read p))
-    (test #t 'read (is-a? (read p) image-snip%)))
-  
-  
-  (let ()
-    (define t (new text%))
-    (send t insert (make-string 5000 #\a))
-    (define p (open-input-text-editor t #:lock-while-reading? #t))
-    (define locked-first (send t is-locked?))
-    (void (read p))  ;; read the (big) symbol
-    (void (read p))  ;; read eof
-    (define locked-last (send t is-locked?))
-    (test #t 'lock-while-reading?1 (and locked-first (not locked-last))))
-  
-  (let ()
-    (define t (new text%))
-    (send t insert (make-string 5000 #\a))
-    (send t insert (make-object image-snip%))
-    (define p (open-input-text-editor t #:lock-while-reading? #t))
-    (define locked-first (send t is-locked?))
-    (void (read p))  ;; read the (big) symbol
-    (void (read p))  ;; read the image
-    (void (read p))  ;; read eof
-    (define locked-last (send t is-locked?))
-    (test #t 'lock-while-reading?2 
-          (and locked-first
-               (not locked-last)))))
-
-(let ()
-  (define x (new text%))
-  (define s (make-object image-snip% "no-such-image.jpg" 
-			 'unknown #f #f))
-  (define t (make-object image-snip% "no-such-image.jpg" 
-			 'unknown #f #f))
-  (send x insert s 0 'same #t)
-  (send x insert t 1 'same #t)
-  (send x insert "1" 2 'same #t)
-  
-  (let ([i (open-input-text-editor x 0 'end (lambda (x) (eq? x s)))])
-    (test #t 'peek-s (peek-byte-or-special i 0))
-    (test #t 'read-s (read-byte-or-special i))
-    (test #f 'peek-t (peek-byte-or-special i 0))
-    (test 49 'read-1 (peek-byte-or-special i 1))))
-
-(let ()
-  (define t (new text%))
-  (send t insert "aa\nbb\ncc\ndd\nee\nff\n")
-  (send t insert (make-object image-snip%
-                   (collection-file-path "recycle.png" "icons")))
-  
-  (define p (open-input-text-editor t))
-  
-  (define rev-at-start (send t get-revision-number))
-  (define line1 (read-line p))
-  
-  (define sl (send t get-style-list))
-  (define d (make-object style-delta% 'change-bold))
-  (define s (send sl find-or-create-style (send sl basic-style) d))
-  (send t change-style s 6 7)
-  
-  (define rev-after-cs (send t get-revision-number))
-  (define line2 (read-line p))
-  
-  (test #t 'revision-changed (> rev-after-cs rev-at-start))
-  (test "aa" 'revision-changed-line1 line1)
-  (test "bb" 'revision-changed-line1 line2))
-
-(let ()
-  (define t (new text%))
-  (send t insert "abcd\n")
-  (send t insert (make-object image-snip%
-                   (collection-file-path "recycle.png" "icons")))
-  
-  (define (count-snips)
-    (let loop ([s (send t find-first-snip)])
-      (cond
-        [s (+ 1 (loop (send s next)))]
-        [else 0])))
-  
-  (send t split-snip 1)
-  (define before-snip-count (count-snips))
-  (define rev-at-start (send t get-revision-number))
-  
-  (define p (open-input-text-editor t))
-  
-  (define char1 (read-char p))
-  
-  (define s (send (send t get-style-list) basic-style))
-  (send t change-style s 0 4)
-  (define after-snip-count (count-snips))
-  (define rev-after-cs (send t get-revision-number))
-  
-  (define chars (string (read-char p) (read-char p) (read-char p)))
-  
-  (test 4     'snips-joined1 before-snip-count)
-  (test 3     'snips-joined2 after-snip-count)
-  (test #t     'snips-joined3 (> rev-after-cs rev-at-start))
-  (test #\a    'snips-joined4 char1)
-  (test "bcd" 'snips-joined5 chars))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                            Snips and Streams                               ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (mk-number-snip-class% term?)
-  (class snip-class%
-    (define/override (read f)
-      (let* ([number-str (if term?
-			     (send f get-bytes)
-			     (send f get-unterminated-bytes))]
-             [number (string->number (bytes->string/utf-8 number-str))]
-             [decimal-prefix (bytes->string/utf-8 (if term?
-						      (send f get-bytes)
-						      (send f get-unterminated-bytes)))]
-             [snip
-              (instantiate number-snip% ()
-                [number number]
-                [decimal-prefix decimal-prefix])])
-        snip))
-    (super-instantiate ())))
-
-
-(define snip-class (make-object (mk-number-snip-class% #t)))
-(send snip-class set-classname (format "~s" `(lib "number-snip.ss" "drscheme" "private")))
-(send (get-the-snip-class-list) add snip-class)
-
-(define snip-class2 (make-object (mk-number-snip-class% #f)))
-(send snip-class2 set-classname (format "~s" `(lib "number-snip-two.ss" "drscheme" "private")))
-(send (get-the-snip-class-list) add snip-class2)
-
-(define (mk-number-snip% snip-class term?)
-  (define self%
-    (class snip%
-      (init-field number)
-      (define/public (get-number) number)
-      (define/public (get-prefix) decimal-prefix)
-      (init-field [decimal-prefix ""])
-      (define/override (write f)
-	(let ([num (string->bytes/utf-8 (number->string number))]
-	      [pfx (string->bytes/utf-8 decimal-prefix)])
-	  (if term?
-	      (begin
-		(send f put num)
-		(send f put pfx))
-	      (begin
-		(unless (eq? 'ok
-			     (with-handlers ([exn:fail? (lambda (x) 'ok)])
-			       (send f put 5 #"123")
-			       'not-ok))
-		  (error "too-long write should have failed"))
-		(send f put (bytes-length num) num)
-		(send f put (bytes-length pfx) pfx)))))
-      (define/override (copy)
-	(instantiate self% ()
-		     [number number]
-		     [decimal-prefix decimal-prefix]))
-      (inherit get-style)
-      (super-instantiate ())
-      (inherit set-snipclass set-flags get-flags)
-      (set-snipclass snip-class)))
-  self%)
-
-(define number-snip% (mk-number-snip% snip-class #t))
-(define number-snip2% (mk-number-snip% snip-class2 #f))
-
-(define (snip-test term?)
-  (define t (new text%))
-  (define t2 (new text%))
-  (send t insert (new (if term? number-snip% number-snip2%)
-		      [number 1/2]))
-  (send t set-position 0 1)
-  (send t copy)
-  ;; Under X, force snip to be marshalled:
-  (let ([s (send the-clipboard get-clipboard-data "WXME" 0)])
-    (send the-clipboard set-clipboard-client
-	  (make-object (class clipboard-client%
-			 (define/override (get-data fmt)
-			   (and (string=? fmt "WXME")
-				s))
-			 (inherit add-type)
-			 (super-new)
-			 (add-type "WXME")))
-	  0))
-  (send t2 paste)
-  (let ([s (send t2 find-first-snip)])
-    (st 1/2 s get-number)
-    (st "" s get-prefix)))
-
-(snip-test #t)
-(snip-test #f)
-
-(let ()
-  (define orig-snip (make-object string-snip% "hello"))
-  
-  (define out (make-object editor-stream-out-bytes-base%))
-  (define out-stream (make-object editor-stream-out% out))
-  
-  (define _ (send orig-snip write out-stream))
-  
-  (define in (make-object editor-stream-in-bytes-base% (send out get-bytes)))
-  (define in-stream (make-object editor-stream-in% in))
-  
-  (define new-snip
-    (send (send (get-the-snip-class-list) 
-		find 
-		(send (send (new string-snip%) get-snipclass) get-classname))
-	  read in-stream))
-  
-  (st "hello" new-snip get-text 0 10))
-
-;; ----------------------------------------
-;; Check CRLF conversion
-
-(let ([crlf-s (apply
-	       string-append
-	       (let loop ([n 100])
-		 (if (zero? n)
-		     null
-		     (cons (make-string (random 40) #\a)
-			   (cons "\r\n"
-				 (loop (sub1 n)))))))]
-      [e (new text%)])
-  (let ([lf-s (regexp-replace* #rx"\r\n" crlf-s "\n")]
-	[lflf-s (regexp-replace* #rx"\r\n" crlf-s "\n\n")])
-    (st "" e get-text 0 'eof)
-    (send e insert-port (open-input-string crlf-s))
-    (st lf-s e get-text 0 'eof)
-    (send e erase)
-    (send e insert crlf-s)
-    (st lflf-s e get-text 0 'eof)))
-
-;; ----------------------------------------
-;; Check lines and paras without display, but with a max width
-
-(define t (new text%))
-(send t insert "abc\ndef\nghi\n")
-(send t set-max-width 955)
-(st 0 t line-start-position 0)
-(st 4 t line-start-position 1)
-(st 8 t line-start-position 2)
-(st 0 t paragraph-start-position 0)
-(st 4 t paragraph-start-position 1)
-(st 8 t paragraph-start-position 2)
-(st 3 t paragraph-end-position 0)
-(st 7 t paragraph-end-position 1)
-(st 11 t paragraph-end-position 2)
-(st 0 t paragraph-start-line 0)
-(st 1 t paragraph-start-line 1)
-(st 2 t paragraph-start-line 2)
-(st 0 t line-paragraph 0)
-(st 1 t line-paragraph 1)
-(st 2 t line-paragraph 2)
-(st 0 t position-paragraph 0)
-(st 0 t position-paragraph 3)
-(st 1 t position-paragraph 4)
-(st 1 t position-paragraph 7)
-(st 2 t position-paragraph 8)
-(st 2 t position-paragraph 11)
-
-;; ----------------------------------------
-
-;; More undo tests, checking mainly that internal undo array grows
-;;  correctly
-
-(define (test-undos local-undo?)
-  
-  (define e (new text%))
-
-  (send e insert (make-string 1024 #\x))
-
-  (send e set-max-undo-history 10240)
-  (send e set-position 0)
-
-  (let loop ([n 1024])
-    (unless (zero? n)
-      (send e set-position (add1 (send e get-start-position)))
-      (send e delete)
-      (send e insert #\y)
-      (when local-undo?
-	(send e undo)
-	(send e redo))
-      (loop (sub1 n))))
-
-  (st (make-string 1024 #\y) e get-text 0 'eof)
-  
-  (let loop ([n 1023])
-    (unless (zero? n)
-      (send e undo)
-      (send e undo)
-      (loop (sub1 n))))
-
-  (st (string-append "y" (make-string 1023 #\x) )
-      e get-text 0 'eof))
-
-(test-undos #f)
-(test-undos #t)
-
-;; ----------------------------------------
-
-(let ([pb (new pasteboard%)]
-      [es (new editor-snip%)])
-  (send pb insert es)
-  (st es pb find-first-snip)
-  (send pb remove es)
-  (st #f es is-owned?)
-  (st #f pb find-first-snip)
-  (send pb insert es)
-  (st es pb find-first-snip)
-  (st #t es is-owned?))
-
-;; ----------------------------------------
-;; edit-sequences and undo
-
-(let ([t (new text%)])
-  (send t set-max-undo-history 100)
-  (send t begin-edit-sequence)
-  (send t begin-edit-sequence)
-  (send t insert "abcd\n")
-  (send t set-modified #f)
-  (send t end-edit-sequence)
-  (send t delete 0 1)
-  (send t end-edit-sequence)
-  (send t undo)
-  (st "" t get-text))
-  
-(let ([t (new text%)])
-  (send t set-max-undo-history 100)
-  (send t begin-edit-sequence)
-  (send t begin-edit-sequence)
-  (send t insert "abcd\n")
-  (send t end-edit-sequence)
-  (send t set-position 0 1)
-  (send t delete)
-  (send t set-position 0 1)
-  (send t delete)
-  (send t end-edit-sequence)
-  (send t undo)
-  (st "" t get-text))
-
-;; ----------------------------------------
-;; undo and clickbacks
-
-(let ([t (new text%)])
-  (send t set-max-undo-history 100)
-  (send t insert "abcdef")
-  (send t set-clickback 1 3 void)
-  (send t delete 0 5)
-  (send t undo))
-
-;; ----------------------------------------
-;; notification callbacks, weak links, and chaperones:
-
-(let ()
-  (define id 0)
-  (define count 0)
-  (define count2 0)
-
-  (define sl (new style-list%))
-
-  (define N 100)
-
-  (define cbs
-    (for/list ([i (in-range N)])
-      (define cb (lambda (x) (set! id i) (set! count (add1 count))))
-      ;; procedure retained:
-      (void (send sl notify-on-change (chaperone-procedure cb (lambda (v) v))))
-      ;; procedure not retained:
-      (void (send sl notify-on-change (lambda (x) (set! id i) (set! count2 (add1 count2)))))
-      cb))
-
-  (define (try name)
-    (send sl new-named-style name (send sl find-named-style "Basic")))
-
-  (try "X")
-  (set! count 0)
-  (set! count2 0)
-
-  (collect-garbage)
-  (try "Y") ;; expect 2 callbacks per notifier
-
-  (define v #f)
-  (set! v cbs) ;; forces retention of `cbs'
-  (unless (= (length v) N) (error "test is broken"))
-
-  (unless (= count (* 2 N))
-    (error 'notifications "too weak? ~e" count))
-  (unless (<= 0 count2 (/ N 2))
-    (error 'notifications "not weak enough? ~e" count2)))
-
-;; ----------------------------------------
-;; make sure splitting a large string snip works:
-
-(void
- (send (make-object string-snip% (make-string 100000 #\a))
-       split
-       50000
-       (box #f)
-       (box #f)))
-
-;; ----------------------------------------
-;; No #<unsafe-undefined> checks on certain class instances
-
-(test #f 'undef-snip (impersonator? (new snip%)))
-(test #f 'undef-string-snip% (impersonator? (new string-snip%)))
-(test #f 'undef-tab-snip% (impersonator? (new tab-snip%)))
-(test #f 'undef-image-snip% (impersonator? (new image-snip%)))
-(test #f 'undef-style-delta% (impersonator? (new style-delta%)))
-(test #f 'undef-style<%> (impersonator? (send (new style-list%) basic-style)))
-
-;; ----------------------------------------
-
-(report-errs)
-
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/flush-stress.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/flush-stress.rkt
deleted file mode 100644
index cddbaff663..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/flush-stress.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/gui
-
-(define SIZE 600)
-
-(define f (new frame%
-               [label "Color Bars"]
-               [width SIZE]
-               [height SIZE]))
-
-(define c (new canvas% [parent f]))
-
-(send f show #t)
-
-;; If sync is turned off, then expect the drawing
-;; to flicker horribly:
-(define sync? #t)
-
-;; If flush-on-sync is disabled, the expect refresh
-;; to starve, so that the image moves very rarely, if
-;; at all:
-(define flush-on-sync? #t)
-
-(define (start-drawing dc)
-  (when sync?
-    (send dc suspend-flush)))
-
-(define (end-drawing dc)
-  (when sync?
-    (send dc resume-flush)
-    (when flush-on-sync?
-      (send dc flush))))
-
-(define (go)
-  (let ([dc (send c get-dc)])
-    (for ([d (in-naturals)])
-      (start-drawing dc)
-      (send dc erase)
-      ;; Draw somthing slow that changes with d
-      (for ([n (in-range 0 SIZE)])
-        (send dc set-pen 
-              (make-object color% 
-                           (remainder (+ n d) 256)
-                           (remainder (* 2 (+ n d)) 256)
-                           (remainder (* 3 (+ n d)) 256))
-              1
-              'solid)
-        (send dc draw-line n 0 n SIZE))
-      (end-drawing dc))))
-
-(thread go)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/font-maps.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/font-maps.rkt
deleted file mode 100644
index fc9a789be4..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/font-maps.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket
-(require racket/draw)
-
-;; Check for pollution of font metrics from differently
-;; scaled contexts.
-
-(define font (make-font #:face "Times"))
-
-;; Running `go` might affect the result of `go2`
-(define (go)
-  (define bm (make-bitmap 1 1))
-  (send (send bm make-dc) get-text-extent
-	"Extra regexp"
-	font
-	#t))
-
-;; `go2` is like `go`, but for a different scale
-(define (go2)
-  (define bm2 (make-platform-bitmap 1 1))
-  (define dc (send bm2 make-dc))
-  (send dc scale 1.25 1.25)
-  (send dc get-text-extent
-	"Extra regexp"
-	font
-	#t))
-
-;; Running `go2` again in a separate place might produce
-;; results unaffected by `go`:
-(define (go2/p)
-  (place pch (place-channel-put pch (call-with-values go2 list))))
-
-(module+ test
-  (call-with-values go void)
-  (define l1 (call-with-values go2 list))
-  (define l2 (sync (go2/p)))
-  (unless (equal? l1 l2)
-    (error 'different "~s ~s" l1 l2)))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/frame-steps.txt b/pkgs/gui-pkgs/gui-test/tests/gracket/frame-steps.txt
deleted file mode 100644
index 3e3a161e5d..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/frame-steps.txt
+++ /dev/null
@@ -1,295 +0,0 @@
-
-These instructions go with the "item.ss" MrEd test file. You probably
-got them by clicking on the "Get Instructions" button.
-
-This file mostly contains instructions for running the "Make Big
-Frame" and "Make Medium Frame" tests. "Big" and "Medium" are silly
-names; they're essentially the same set of tests, but for different
-sets of controls. There are just too many kinds of controls to fit in
-one frame.
-
-The clock in the upper right of the "Test Selector" frame should
-increment every second.
-
-The buttons at the bottom of the Selector frame open little frames for
-testing individual control types in detail. Those frames come with
-their own instructions.
-
-Make XXX Frame
---------------
-
-Big Frame should contain the following on the left:
-
-  Message (a message) <down-left arrow> (a message)
-  Hello (a button)
-  <BB logo> (a button)
-  List (a list box)
-   Apple
-   Banana
-   Coconut & Donut
-  Check (a check box)
-  <MrEd logo> (a check box)
-  Radio (a radio box)
-   First
-   Second
-   Third
-  Image Radio (a check box)
-   <down-left arrow>
-   <down-right arrow> 
-  Choice (a choice item)
-   Alpha
-   Beta
-   Gamma
-   Delta & Rest
- Text (a text field)
-   initial & starting
-
-Medium Frame should contain:
-
- H Slider (a horizontal slider)
- V Slider (a vertical slider)
- H Gauge (a horizontal slider)
- V Gauge (a vertical slider)
- Text (a multi-line text field)
-   initial & starting
- A tab panel with two tabs
-   
-
-The names on labels must match the above exactly, except that most
-labels have an "e" or "i" that gets an accent mark to test Latin-1
-labels. Also, <> above indicates an image. Watch out for letters that
-are dropped or &s that are dropped.
-
-Make sure all the controls with moving parts work.
-
-Tabbing and arrow keys should work correctly. The canvas in the bottom
-middle area does not receive the focus via tabs in Big Frame, but it
-does in Medium Frame. When it receives the focus via a tab, "Tab in"
-is drawn in the canvas; when the focus leaves the canvas for any reason
-(tab out, mouse click somewhere else, etc.), "Tab in" is erased.
-
-Window Resizing
----------------
-
-Stretch the window vertically. Stretch it horizontally.  Unless the
-frame was created with "all stechy" on, then messages, buttons, check
-boxes, and radio boxes should not stretch. Choice and text items 
-should only stretch horizontally. Sliders and gauges should only
-resize in the major direction.
-
-If "all stretchy" was on, then everything in the left column should
-stretch both directions.
-
-Show and Hide
--------------
-
-The second column in the window starts with "Hide and Show".  Click it
-and see that the frame disappears and reappears.  The remaining
-checkboxes can be un-checked to hide items.  The first two hide
-everything in the left column. The remained hide the corresponding
-item on the left.
-
-Click on the canvas at the bottom of the second column. A popup menu
-should accurately report the local visibility of each control. (If a
-control is shown but the panel is hidden, the menu should still say
-SHOWN.)
-
-
-  * hide/show all the controls through each panel
-    checkbox; the menu should say SHOWN for all
-    items
-
-  * click each checkbox to hide an item, then click 
-    again to show it before moving to the next item;
-    check the popup menu for accuracy before and after
-    re-showing
-
-  * hide all of the controls, then hide and unhide the
-    whole panel (one of the top checkboxes); unhiding
-    should not show the hidden controls; unhide one
-    or two to convince yourself that the panel is
-    unhid
-
-  * hide the panel and unhide all of the controls;
-    you should not see any of them; then unhide the
-    panel; they should all appear
-
-  * hide the panel; hide all the controls; unhide the
-    panel (the controls should not appear); unhide
-    all the controls
-
-  * repeat the three steps above with the other panel checkbox
-
-Enable and Disable
-------------------
-
-The third column contains checkboxes for enabling things. Note that
-each radio button has its own enabler, as well as the whole radio
-box. Try each one, clicking on the item to make sure it's really
-disabled.
-
-  * enable/disable all the controls through each panel
-    checkbox
-
-  * click each checkbox to disable an item; click on the
-    item to make sure it's disabled; recheck the checkbox;
-    make sure the item is re-enabled
-
-  * disable all the controls; disable and re-enable the
-    whole panel; make sure the controls are still disabled
-
-  * disable the panel; re-enable the individual controls;
-    make sure the controls are still not enabled; re-enable
-    the panel and check that the controls are enabled
-
-  * disable the panel; disable all the controls; enable the
-    panel and make sure the controls are still disabled;
-    enable all the controls
-
-  * repeat the three steps above with the other panel checkbox
-
-  * repeat the three steps for radioboxes and radio items,
-    instead of panels and controls
-
-Relabeling
-----------
-
-The buttons in the fourth column toggle the labels on items.  The
-control should not resize itself for the new label.
-
-For text labels, the new label is XXXXXXXXX. For icon labels,
-it depends:
-
-  - message: <down-right arrow>
-  - button: <down-left arrow>
-  - checkbox: <BB icon>
-
-Note that radio items can't be relabeled.
-
-Be sure to click each button twice, to make sure that the original
-label is restored.
-
-Cursors
--------
-
-Checking "Control Bullseye Cursors" should change the cursor over
-every control in the left column, plus the canvas in the second
-column.  The cursor should only apply to the "client area" of a
-control, not the label if it is outside the control. The cursor should
-be normal everywhere else.
-
-Checking "Frame Cross Cursor" should change the cursor in the
-frame to a cross. It sets the cursor for the controls only when
-"Controls Bullseye Cursors" is not set.
-
-Checking "Busy Cursor" should change the cursor to a watch everywhere
-in the frame's eventspace. It overrides all other cursor settings.
-
-Combinations to try:
-
-   * Bull only - just controls changed
-   * Cross only - all of frame changed
-   * Bull + Cross - controls are bullseye, cross everywhere else
-       - Uncheck Cross and make sure Bull still works
-       - Recheck Cross, uncheck Bull and make sure Cross works on
-          controls
-   * Busy only - everywhere changed
-   * Busy + Cross - everywhere changed
-       - Uncheck Busy and make sure Cross still works
-       - Recheck Busy, uncheck cross and make sure Busy still works
-       - Uncheck Busy and make sure Cross is still off
-   * Busy + Bull - everywhere changed
-       (same as above, but for Bull)
-   * Busy + Bull + Cross - everywhere changed
-       - Uncheck Busy and verify Bull + Cross
-       (that's enough)
-
-Also, while the busy cursor is on, try creating a new Big/Medium Frame
-and make sure that the busy cursor is active in the new frame and over
-all controls in the new frame.
-
-Deleted Adds
--------------
-
-The "New Deleted" popup creates subwindow<%>s and adds them to the
-same panel as the "New Deleted" control, but each subwindow<%> is
-created with the 'deleted style, which means that the subwindow<%> is
-initially hidden and deleted. The "*Activate Last*" item activates
-the last-created subwindow<%>, i.e., it shows the subwindow<%> and
-adjusts the panel size to accommodate the activated window<%>. The key
-part of this test is that no deleted subwindow<%> is shown, and no
-deleted subwindow<%> affects the panel's geometry.
-      
-Popup Menus (Big Frame)
------------
-
-Hide something. Left-click on the canvas to see the SHOW state.
-Unhide that something. RIGHT-click on the canvas to get the old
- SHOW state. Then left-click to see the new SHOW state.
-Left-click and pick some item; verify that the canvas shows the
- select index (counting from 1)
-Right-click and pick some item; verify that the canvas shows the
- selected index (counting from 1)
-
-Focus Info
-----------
-
-Under "Enable Text", the current focus is show as:
-     label value
- Sometimes label is () for null (no label)
- Sometimes value is just #<object> (no known class)
-but usually you can tell what it means.
-
-Click on various controls. Watch how the focus changes (some controls
-on some platforms never get the focus). Verify that the focus
-indicator is always right. (There's about a 1 second delay.)
-
-Event Info
-----------
-
-Under the focus indicator, the last event is reported. If the label of
-the destination is non-null, the label is shown, otherwise the value
-is shown.
-
-As the mouse is moved over a control's client area, the event
-indicator should report the control under the mouse and `mouse' for
-mouse event. This is independent of the location of the focus.
-
-Press a key. Instead of `mouse', the event indicator should say `key',
-and report the item that currently has the focus. (Unfortunately,
-under windows, the key info is immediately replaced with mouse info.)
-
-Event Filtering
----------------
-
-When "Drop Mouse Events" is checked at the bottom of the third column,
-all other controls (except "Drop Mouse Events" and "Drop Key Events")
-should cease to respond to mouse events. The event indicator will still
-work. Keyboard events should not be affected (though it may be hard to
-get the focus somewhere interesting).
-
-Try every control with mouse events dropped.
-
-"Drop Key Events" does the obvious thing. Try every keyboard-responding
-control with events dropped. Try dialog navigation keys on other
-controls, such as TAB or left-arrow.
-
-Different Configurations
-------------------------
-
-Each Frame can be created in several different configurations (32 or
-64 of them!).
-
-Step through the first 16 configurations, create a frame each time,
-and make sure the resulting controls look right. Resize each frame and
-check stretchiness before closing it.
-
-Go back to the default configuration and try the 3 other combinations
-of label and button fonts. The big label font should apply to external
-control labels, and to message items. The button font should apply to
-the content of controls (names within a button, checkbox, listbox,
-choice, or text control). The "Initially" radio box controls whether
-the control-containing panel is initially enabled (before the controls
-it contains are created). The "Selection" radio box controls the
-initial-value setting for check boxes, radio buttons, list boxes, and
-choices.
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/gauge-steps.txt b/pkgs/gui-pkgs/gui-test/tests/gracket/gauge-steps.txt
deleted file mode 100644
index 7f5610b365..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/gauge-steps.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-
-The gauge should be initially empty (i.e., set to 0), and have a
-  maximum value of 10 (although there's no indication of the maximum).
-
-Click "+". The gauge should go up by one.
-
-Click "-". It should go back down to zero.
-
-Click "+" five times. The gauge should be at the halfway point.
-
-Click "-" ten times. (Five type errors.)  Click "+" once. The gauge
- should be at one.
-
-Click "+" twelve times. (Three mismatch errors.)  Click "-" once. The
- gauge should be at nine.
-
-Click "-" four times. The gauge should be at the halfway point.
-
-Click "Bigger". The range is now 11 instead of 10, so the gauge
- should be below halfway.
-
-Click "Smaller". The range is back to 10, so the gauge should be at
- the halfway point.
-
-Click "Smaller" five times. The range is now 5, so the gauge should
- be full.
-
-Click "Smaller" once more. The range is now 4, so the gauge value
- should be 4 also.
-
-Click "Bigger" and the gauge should be 80% full.
-
-Click "Smaller" six times. (Two type errors.)  The minimum gauge range
- is 1, so click "Bigger" once and the gauge should be at halfway.
-
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/gl-bitmap.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/gl-bitmap.rkt
deleted file mode 100644
index 3f64308cc9..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/gl-bitmap.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang racket/gui
-
-(require sgl/gl
-         rackunit)
-
-;; Test 1: Make sure creating multiple GL bitmaps doesn't crash
-
-(for ([_  (in-range 5)])
-  (define bm (make-gl-bitmap 32 32 (new gl-config%)))
-  (send (send (make-object bitmap-dc% bm) get-gl-context)
-        call-as-current
-        (λ ()
-          (glClearColor 0.0 0.0 0.0 0.0)
-          (glClear GL_COLOR_BUFFER_BIT)
-          (glBegin GL_TRIANGLES)
-          (glVertex2f -1.0 -1.0)
-          (glVertex2f +1.0 -1.0)
-          (glVertex2f -1.0 +1.0)
-          (glEnd)
-          (glFinish)))
-  (set! bm #f)
-  (collect-garbage))
-
-;; Test 2: make sure `get-current-gl-context` returns non-#f only within the dynamic extent of
-;; `call-as-current` - in particular, that it returns #f on other threads
-
-(define bm (make-gl-bitmap 32 32 (new gl-config%)))
-(define ctxt (send (make-object bitmap-dc% bm) get-gl-context))
-
-(define outside-context #f)
-(define inside-context #f)
-
-(define ch (make-channel))
-
-(define th
-  (thread
-   (λ ()
-     (channel-get ch)
-     (set! outside-context (get-current-gl-context))
-     (channel-put ch #t))))
-
-(send ctxt call-as-current
-      (λ ()
-        (set! inside-context (get-current-gl-context))
-        (channel-put ch #t)
-        (channel-get ch)
-        (void)))
-
-(check-false (get-current-gl-context))
-(check-false outside-context)
-(check-eq? inside-context ctxt)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/gl-refresh.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/gl-refresh.rkt
deleted file mode 100644
index adb2a57eae..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/gl-refresh.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/gui
-(require sgl)
-
-(define c%
-   (class canvas%
-     (inherit with-gl-context swap-gl-buffers)
-     (define/override (on-paint)
-       (with-gl-context
-        (lambda ()
-          (gl-clear-color (random) (random) (random) 1)
-          (gl-clear 'color-buffer-bit)
-          (swap-gl-buffers)
-          (gl-flush))))
-     (super-new (style '(gl no-autoclear)))))
-
-(define f (new frame% [label ""] [width 100] [height 300]))
-(define c (new c% [parent f]))
-(new message% [parent f] [label "Canvas changes color on refresh,"])
-(new message% [parent f] [label "so check that it's not too often."])
-(new button% [parent f] [label "Refresh"] [callback (lambda (b e) (send c refresh))])
-(send f show #t)
-
-(module test racket/base)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/image-snip-unmarshalling.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/image-snip-unmarshalling.rkt
deleted file mode 100644
index 28d4d42531..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/image-snip-unmarshalling.rkt
+++ /dev/null
@@ -1,141 +0,0 @@
-#lang racket/gui
-(require wxme
-         wxme/image)
-
-#|
-
-This file tests the wxme image-snip reader against the normal
-image-snip reader (ie image-snip-class%'s read method)
-
-It creates a bunch of different image-snip% objects 
-(the try-perms and below functions)
-and then feeds them thru both paths to get two new image snips 
-(in the beginning of test-wxme-image-snip-reader/proc)
-and compares a bunch of properties of them
-(the end of that function).
-
-|#
-
-(define-syntax (test-wxme-image-snip-reader stx)
-  (syntax-case stx ()
-    [(_ is)
-     (with-syntax ([line (syntax-line stx)])
-       #'(test-wxme-image-snip-reader/proc line is))]))
-
-(define tests 0)
-(define (test-wxme-image-snip-reader/proc line is)
-  (set! tests (+ tests 1))
-  (define t (new text%))
-  (send t insert is)
-  (define sp (open-output-string))
-  (void (send t save-port sp))
-  (define wp (wxme-port->port (open-input-string (get-output-string sp))))
-  (define wxme-is (read-char-or-special wp))
-  
-  (define t2 (new text%))
-  (send t2 insert-port (open-input-string (get-output-string sp)))
-  (define copy-is (send t2 find-first-snip))
-  
-  (define (warn . args)
-    (eprintf (string-append (format "FAILED test-wxme-image-snip-reader.rkt line ~a: " line)
-                            (apply format args))))
-  
-  (define-syntax-rule (cmp mtd) (cmp/proc (λ (x) (send x mtd)) 'mtd))
-  (define (cmp/proc call-mtd mtd)
-    (let ([is-ans (call-mtd is)]
-          [wxme-is-ans (call-mtd wxme-is)]
-          [copy-is-ans (call-mtd copy-is)])
-      (unless (same? copy-is-ans wxme-is-ans)
-        (warn "~a returned different results; copy-is: ~s wxme-is: ~s\n"
-              mtd
-              copy-is-ans 
-              wxme-is-ans))
-      #;
-      (unless (same? is-ans copy-is-ans)
-        (warn "~a returned different results; is: ~s copy-is: ~s\n"
-              mtd
-              is-ans 
-              copy-is-ans))))
-  
-  (when (is-a? is image%)
-    (warn "the input image-snip% is an image%\n"))
-  
-  (unless (is-a? wxme-is image%)
-    (warn "new image snip is not an image%\n"))
-  
-  (cmp get-filename)
-  (cmp get-filetype)
-  (cmp get-bitmap)
-  (cmp get-bitmap-mask))
-
-(define (same? x y)
-  (cond
-    [(and (is-a? x bitmap%)
-          (is-a? y bitmap%))
-     (and (= (send x get-width)
-             (send y get-width))
-          (= (send x get-height)
-             (send y get-height))
-          (= (send x get-depth)
-             (send y get-depth))
-          (check? (bitmap->bytes x #f)
-                  (bitmap->bytes y #f)
-                  'bitmap/#f)
-          (check? (bitmap->bytes x #t)
-                  (bitmap->bytes y #t)
-                  'bitmap/#t))]
-    [else (equal? x y)]))
-
-
-(define (check? a b what)
-  (cond
-    [(equal? a b) #t]
-    [else 
-     ;(eprintf "checking ~s, doesn't match\n~s\nvs\n~s\n\n" what a b)
-     #f]))
-
-(define (bitmap->bytes bmp alpha?)
-  (define w (send bmp get-width))
-  (define h (send bmp get-height))
-  (define bytes (make-bytes (* 4 w h) 0))
-  (send bmp get-argb-pixels 0 0 w h bytes alpha?)
-  bytes)
-
-(define (try-perms files kinds relative-path?s inline?s)
-  (for* ([file (in-list files)]
-         [kind (in-list kinds)]
-         [relative-path? (in-list relative-path?s)]
-         [inline? (in-list inline?s)])
-    (test-wxme-image-snip-reader (make-object image-snip% file kind relative-path? inline?))))
-
-(try-perms (list (collection-file-path "b-run.png" "icons"))
-           '(unknown unknown/mask unknown/alpha
-                     png png/mask png/alpha)
-           '(#f)
-           '(#f #t))
-
-(parameterize ([current-directory (build-path (collection-file-path "b-run.png" "icons") "..")])
-  (try-perms (list "b-run.png")
-             '(unknown unknown/mask unknown/alpha
-                       png png/mask png/alpha)
-             '(#f)
-             '(#f #t)))
-
-(define (draw-circle bm)
-  (define bdc (make-object bitmap-dc% bm))
-  (send bdc set-smoothing 'smoothed)
-  (send bdc set-brush "red" 'solid)
-  (send bdc draw-ellipse 1 1 8 8)
-  (send bdc set-bitmap #f))
-
-(let ([bm (make-bitmap 10 10 #f)])
-  (draw-circle bm)
-  (test-wxme-image-snip-reader (make-object image-snip% bm))
-  (test-wxme-image-snip-reader (make-object image-snip% bm #f))
-  (test-wxme-image-snip-reader (make-object image-snip% bm bm)))
-
-(let ([bm (make-bitmap 10 10)])
-  (draw-circle bm)
-  (test-wxme-image-snip-reader (make-object image-snip% bm)))
-
-(printf "ran ~a tests\n" tests)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/info.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/info.rkt
deleted file mode 100644
index fb5bb36062..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define test-omit-paths '("blits.rkt"
-                          "flush-stress.rkt"
-                          "mem.rkt"
-                          "showkey.rkt"
-                          "unflushed-circle.rkt"
-                          "wxme-random.rkt"))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/item.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/item.rkt
deleted file mode 100644
index c5af4fc4e6..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/item.rkt
+++ /dev/null
@@ -1,2622 +0,0 @@
-#lang racket/gui
-
-(require racket/class
-	 mzlib/etc)
-
-(define my-txt #f)
-(define my-lb #f)
-(define noisy? #f)
-
-(define mdi-frame #f)
-(define (mdi)
-  (set! mdi-frame (make-object frame% "Item Test" #f
-			       #f #f #f #f
-			       '(mdi-parent)))
-  (send mdi-frame maximize #t)
-  (send mdi-frame show #t))
-
-(define default-parent-frame #f)
-(define (parent-frame)
-  (set! default-parent-frame (make-object frame% "Item Test Parent" #f
-			       100 100))
-  (send default-parent-frame show #t))
-
-(when (namespace-variable-value 'mdi? #t (lambda () #f))
-  (mdi))
-
-(define (add-frame-style style)
-  (let* ([style (if use-metal?
-		    (cons 'metal style)
-		    style)]
-	 [style (if float-frame?
-		    (cons 'float style)
-		    style)]
-	 [style (if no-caption?
-		    (cons 'no-caption style)
-		    style)])
-    style))
-
-(define make-frame
-  (opt-lambda (% name [parent #f] [w #f] [h #f] [x #f] [y #f] [style '()])
-    (make-object % name
-		 (or parent mdi-frame default-parent-frame)
-		 w h x y 
-		 (if mdi-frame
-		     (cons 'mdi-child style)
-		     (add-frame-style style)))))
-
-(define special-font (send the-font-list find-or-create-font
-			   20 'decorative 
-			   'normal 'bold
-			   #f))
-(define italic-font (send the-font-list find-or-create-font
-                          13 'roman
-                          'italic 'normal
-                          #f))
-(define ($ font) (or font normal-control-font))
-
-(define (make-h&s cp f)
-  (make-object button% "Hide and Show" cp
-	       (lambda (b e) (send f show #f) (send f show #t))))
-
-(define (add-hide name w cp)
-  (let ([c (make-object check-box% (format "Show ~a" name) cp
-			(lambda (c e) (send w show (send c get-value))))])
-    (send c set-value #t)))
-
-(define (add-disable name w ep)
-  (let ([c (make-object check-box% (format "Enable ~a" name) ep
-			(lambda (c e) (send w enable (send c get-value))))])
-    (send c set-value (send w is-enabled?))))
-
-(define (add-disable-radio name w i ep)
-  (let ([c (make-object check-box% (format "Enable ~a" name) ep
-			(lambda (c e) (send w enable i (send c get-value))))])
-    (send c set-value #t)))
-
-(define (add-change-label name w lp orig other)
-  (make-object button% (format "Relabel ~a" name) lp
-	       (let ([orig-name (if orig orig (send w get-label))]
-		     [changed? #f])
-		 (lambda (b e)
-		   (if changed?
-		       (unless (null? orig-name)
-			 (send w set-label orig-name))
-		       (send w set-label other))
-		   (set! changed? (not changed?))))))
-
-(define (add-focus-note frame panel)
-  (define m (make-object message% "focus: ??????????????????????????????" panel))
-  (send
-   (make-object
-    (class timer%
-      (super-new)
-      (inherit start)
-      (override*
-	[notify
-	 (lambda ()
-	   (when (send frame is-shown?)
-	     (send m set-label
-		   (let* ([w (with-handlers ([void (lambda (x) #f)])
-			       (let ([f (get-top-level-focus-window)])
-				 (and f (send f get-focus-window))))]
-			  [l (and w (send w get-label))])
-		     (let ([s (format "focus: ~a ~a" (or l "") w)])
-		       (substring s 0 (min 200 (string-length s))))))
-	     (start 1000 #t)))])))
-   start 1000 #t))
-
-(define (add-pre-note frame panel)
-  (define m (make-object message% "pre: ??????????????????????????????" panel))
-  (define cm (make-object check-box% "Drop Mouse Events" panel void))
-  (define ck (make-object check-box% "Drop Key Events" panel void))
-  (lambda (win e)
-    (let ([m? (is-a? e mouse-event%)])
-      (send m set-label
-	    (let ([s (format "pre: ~a ~a ~a,~a"
-			     (if m? "mouse" "key")
-			     (let ([l (send win get-label)])
-			       (if (not l)
-				   win
-				   l))
-			     (send e get-x)
-			     (send e get-y))])
-	      (substring s 0 (min 200 (string-length s)))))
-      (and (not (or (eq? win cm) (eq? win ck)))
-	   (or (and m? (send cm get-value))
-	       (and (not m?) (send ck get-value)))))))
-
-(define (add-enter/leave-note frame panel)
-  (define m (make-object message% "enter: ??????????????????????????????" panel))
-  (lambda (win e)
-    (when (memq (send e get-event-type) '(enter leave))
-      (let ([s (format "~a: ~a"
-		    (send e get-event-type)
-		    (let ([l (send win get-label)])
-		      (if (not l)
-			  win
-			  l)))])
-	(when noisy? (printf "~a\n" s))
-	(send m set-label (substring s 0 (min 200 (string-length s))))))))
-
-(define (add-click-intercept frame panel)
-  (define cp (make-object check-box% "Popup on Click" panel void))
-  (lambda (win e)
-    (if (and (send e button-down?)
-	     (not (eq? cp win))
-	     (send cp get-value))
-	(let ([m (make-object popup-menu%)])
-	  (make-object menu-item% (format "Click on ~a" win)
-		       m (lambda (i e)
-			   (unless (eq? (send m get-popup-target) win)
-			     (printf "Wrong owner!\n"))))
-	  (send win popup-menu m 
-		(inexact->exact (send e get-x))
-		(inexact->exact (send e get-y)))
-	  #t)
-	#f)))
-
-(define (add-cursors frame panel ctls)
-  (let ([old #f]
-	[f-old #f]
-	[bc (make-object cursor% 'bullseye)]
-	[cc (make-object cursor% 'cross)])
-    (make-object check-box% "Control Bullseye Cursors" panel
-		 (lambda (c e)
-		   (printf "~a\n" e)
-		   (if (send c get-value)
-		       (set! old 
-			     (map (lambda (b) 
-				    (begin0
-				     (send b get-cursor)
-				     (send b set-cursor bc)))
-				  ctls))
-		       (map (lambda (b c) (send b set-cursor c))
-			    ctls old))))
-    (make-object check-box% "Frame Cross Cursor" panel
-		 (lambda (c e)
-		   (if (send c get-value)
-		       (begin
-			 (set! f-old (send frame get-cursor))
-			 (send frame set-cursor cc))
-		       (send frame set-cursor f-old))))
-    (make-object check-box% "Busy Cursor" panel
-		 (lambda (c e)
-		   (if (send c get-value)
-		       (begin-busy-cursor)
-		       (end-busy-cursor))))))
-		       
-(define OTHER-LABEL "XXXXXXXXXXXXXXXXXXXXXX")
-
-(define-values (icons-path local-path)
-  (let ([d (this-expression-source-directory)])
-    (values
-     (lambda (n)
-       (collection-file-path n "icons"))
-     (lambda (n)
-       (build-path d n)))))
-
-(define on-demand-menu-item%
-  (class menu-item%
-    (init -name)
-    (init-rest args)
-    (define name -name)
-    (override*
-      [on-demand
-       (lambda ()
-	 (printf "Menu item ~a demanded\n" name))])
-    (apply super-make-object name args)))
-
-(define popup-test-canvas%
-  (class canvas%
-    (init -objects -names)
-    (init-rest args)
-    (inherit popup-menu get-dc refresh)
-    (define objects -objects)
-    (define names -names)
-    (define tab-in? #f)
-    (define last-m null)
-    (define last-choice #f)
-    (override*
-     [on-paint
-      (lambda ()
-        (let ([dc (get-dc)])
-          (send dc clear)
-          (send dc draw-text "Left: popup hide state" 0 0)
-          (send dc draw-text "Right: popup previous" 0 20)
-          (send dc draw-text (format "Last pick: ~s" last-choice) 0 40)
-          (when tab-in?
-            (send dc draw-text "Tab in" 0 60))))]
-     [on-event
-      (lambda (e)
-        (when (send e button-down?)
-          (let ([x (send e get-x)]
-                [y (send e get-y)]
-                [m (if (or (null? last-m)
-                           (send e button-down? 'left)
-                           (send e button-down? 'middle))
-                       (let ([m (make-object popup-menu% "T&itle"
-                                             (lambda (m e)
-                                               (unless (is-a? m popup-menu%)
-                                                 (error "bad menu object"))
-                                               (unless (and (is-a? e control-event%)
-                                                            (memq (send e get-event-type)
-                                                                  '(menu-popdown menu-popdown-none)))
-                                                 (error "bad event object"))
-                                               (printf "popdown ok\n")))]
-                             [make-callback 
-                              (let ([id 0])
-                                (lambda ()
-                                  (set! id (add1 id))
-                                  (let ([id id])
-                                    (lambda (m e)
-                                      (set! last-choice id)
-                                      (on-paint)))))])
-                         (for-each
-                          (lambda (obj name)
-                            (make-object menu-item%
-                                         (string-append
-                                          name ": "
-                                          (if (send obj is-shown?)
-                                              "SHOWN"
-                                              "<h i d d e n>"))
-                                         m
-                                         (make-callback)))
-                          objects names)
-                         (make-object on-demand-menu-item%
-                                      "[on-demand hook]"
-                                      m
-                                      void)
-                         (make-object menu-item%
-                                      "6 && Half-D&ozen"
-                                      m
-                                      void)
-                         (make-object menu-item%
-                                      "&&_A"
-                                      m
-                                      void)
-                         (let mloop ([m m][sub-at-50? #t])
-                           (let ([sm (if (and sub-at-50?
-                                              (send e button-down? 'middle))
-                                         m
-                                         (make-object menu% "Too Tall" m))])
-                             (let loop ([n 1])
-                               (unless (= n 101)
-                                 (if (and sub-at-50? (= n 50))
-                                     (let ([m (make-object menu% "Item 50" sm)])
-                                       (mloop m #f))
-                                     (make-object menu-item% (format "Item ~a" n) sm void))
-                                 (when (zero? (modulo (- n 5) 10))
-                                   (make-object separator-menu-item% sm))
-                                 (loop (add1 n))))))
-                         m)
-                       last-m)])
-            (set! last-m m)
-            (popup-menu m (inexact->exact x) (inexact->exact y)))))]
-     [on-tab-in (lambda () (set! tab-in? #t) (refresh))]
-     [on-focus (lambda (on?)
-                 (when (and tab-in? (not on?))
-                   (set! tab-in? #f)
-                   (refresh)))])
-    (apply super-make-object args)))
-
-(define prev-frame #f)
-
-(define bitmap2%
-  (class bitmap%
-    (init-rest args)
-    (inherit ok?)
-    (apply super-make-object args)
-    (unless (ok?)
-      (printf "bitmap failure: ~s\n" args))))
-
-(define (active-mixin %)
-  (class %
-    (define pre-on void)
-    (define click-i void)
-    (define el void)
-    (override* [on-subwindow-event (lambda args 
-                                     (apply el args)
-                                     (or (apply pre-on args)
-                                         (apply click-i args)
-                                         (super on-subwindow-event . args)))]
-               [on-subwindow-char (lambda args 
-                                    (or (apply pre-on args)
-                                        (super on-subwindow-char . args)))]
-               [on-subwindow-focus (lambda (win on?)
-                                     (printf "focus ~s ~s\n" (send win get-label) on?))]
-               [on-activate (lambda (on?) (printf "active: ~a\n" on?))]
-               [on-move (lambda (x y) (printf "moved: ~a ~a\n" x y))]
-               [on-size (lambda (x y) (printf "sized: ~a ~a\n" x y))])
-    (public* [set-info
-              (lambda (ep)
-                (set! pre-on (add-pre-note this ep))
-                (set! click-i (add-click-intercept this ep))
-                (set! el (add-enter/leave-note this ep)))])
-    (super-new)))
-
-(define active-frame% (active-mixin frame%))
-(define active-dialog% (active-mixin dialog%))
-
-(define (trace-mixin c%)
-  (class c%
-    (init -name)
-    (init-rest args)
-    (define name -name)
-    (override*
-      [on-superwindow-show
-       (lambda (on?)
-	 (printf "~a ~a\n" name (if on? "show" "hide")))]
-      [on-superwindow-enable
-       (lambda (on?)
-	 (printf "~a ~a\n" name (if on? "on" "off")))])
-    (apply super-make-object name args)))
-
-(define (auto-mixin c% v)
-  (class c%
-    (super-new [auto-resize v])))
-
-(define return-bmp 
-  (make-object bitmap2% (icons-path "return.xbm") 'xbm))
-(define bb-bmp
-  (read-bitmap (icons-path "bomb-32x32.png") #:try-@2x? #t))
-(define mred-bmp
-  (make-object bitmap2% (icons-path "mred.xbm") 'xbm))
-(define nruter-bmp
-  (make-object bitmap2% (local-path "nruter.xbm") 'xbm))
-(define gc-bmp
-  (read-bitmap (icons-path "recycle.png") #:try-@2x? #t))
-
-(define (add-label-direction label-h? l)
-  (if (not label-h?)
-      (cons 'vertical-label l)
-      l))
-
-(define (make-ctls ip cp lp add-testers ep radio-h? label-h? null-label? stretchy? alt-inits? msg-auto? font)
-  
-  (define-values (l il)
-    (let ([p (make-object horizontal-panel% ip)])
-      (send p stretchable-width stretchy?)
-      (send p stretchable-height stretchy?)
-      
-      (let ()
-	(define l (make-object (trace-mixin (auto-mixin message% msg-auto?)) "L\u03B9&st" p null ($ font)))
-	(define il (make-object (trace-mixin (auto-mixin message% msg-auto?)) return-bmp p null ($ font)))
-	
-	(add-testers "Message" l)
-	(add-change-label "Message" l lp #f OTHER-LABEL)
-	
-	(add-testers "Image Message" il)
-	(add-change-label "Image Message" il lp return-bmp nruter-bmp)
-	
-	(values l il))))
-  
-  (define b (make-object (trace-mixin button%)
-			 "H\u03A3&llo" ip ; \u03A3 is eta
-			 (lambda (b e)
-			   (send b enable #f)
-			   (sleep/yield 5)
-			   (send b enable #t))
-			 null ($ font)))
-  
-  (define ib (make-object (trace-mixin button%) bb-bmp ip void null ($ font)))
-  
-  ; (define ib2 (make-object button% return-bmp ip void))
-  
-  (define lb (make-object (trace-mixin list-box%)
-			  (if null-label? #f "L\u03B9&st") ; \u03B9 is iota
-			  '("Appl\u03A3" "Banana" "Coconut & Donuts" "Eclair" "French Fries" "Gatorade" "Huevos Rancheros") ; \u03A3 is eta
-			  ip void
-			  (add-label-direction label-h? '(single))
-			  (if alt-inits? 2 #f)
-			  (or font view-control-font) ($ font)))
-  
-  (define cb (make-object (trace-mixin check-box%) "C&h\u03A3ck" ip void null alt-inits? ($ font))) ; \u03A3 is eta
-  
-  (define icb (make-object (trace-mixin check-box%) mred-bmp ip void null alt-inits? ($ font)))
-  
-  (define rb (make-object (trace-mixin radio-box%)
-			  (if null-label? #f "R&ad\u03B9o") ; \u03B9 is iota
-			  '("F\u03B9rst" "Dos" "T&rio")
-			  ip void 
-			  (add-label-direction 
-			   label-h? 
-			   (if radio-h?
-			       '(horizontal)
-			       '(vertical)))
-			  (if alt-inits? 2 0)
-			  ($ font)))
-  
-  (define irb (make-object (trace-mixin radio-box%)
-			   (if null-label? #f "Image Ra&dio")
-			   (list return-bmp nruter-bmp)
-			    ip void 
-			    (add-label-direction 
-			     label-h? 
-			     (if radio-h?
-				 '(horizontal)
-				 '(vertical)))
-			  (if alt-inits? 1 0)
-			  ($ font)))
-  
-  (define ch (make-object (trace-mixin choice%)
-			  (if null-label? #f "Ch&o\u03B9ce") ; \u03B9 is iota
-			  '("Alpha" "Beta" "Gamma" "Delta & R\u03A3st") ; \u03A3 is eta
-			  ip void
-			  (add-label-direction label-h? null)
-			  (if alt-inits? 3 0)
-			  ($ font)))
-  
-  (define txt (make-object (trace-mixin text-field%)
-			   (if null-label? #f "T\u03A3&xt") ; \u03A3 is eta
-			   ip void
-			   "initial & starting"
-			   (add-label-direction label-h? '(single))
-			   ($ font)))
-  
-  (set! my-txt txt)
-  (set! my-lb lb)
-
-  (add-testers "Button" b)
-  (add-change-label "Button" b lp #f OTHER-LABEL)
-  
-  (add-testers "Image Button" ib)
-  (add-change-label "Image Button" ib lp bb-bmp return-bmp)
-  
-  (add-testers "List" lb)
-  (add-change-label "List" lb lp #f OTHER-LABEL)
-  
-  (add-testers "Checkbox" cb)
-  (add-change-label "Checkbox" cb lp #f OTHER-LABEL)
-  
-  (add-testers "Image Checkbox" icb)
-  (add-change-label "Image Checkbox" icb lp mred-bmp bb-bmp)
-  
-  (add-testers "Radiobox" rb)
-  (add-disable-radio "Radio Item `First'" rb 0 ep)
-  (add-disable-radio "Radio Item `Dos'" rb 1 ep)
-  (add-disable-radio "Radio Item `Trio'" rb 2 ep)
-  (add-change-label "Radiobox" rb lp #f OTHER-LABEL)
-  
-  (add-testers "Image Radiobox" irb)
-  (add-disable-radio "Radio Image Item 1" irb 0 ep)
-  (add-disable-radio "Radio Image Item 2" irb 1 ep)
-  (add-change-label "Image Radiobox" irb lp #f OTHER-LABEL)
-  
-  (add-testers "Choice" ch)
-  (add-change-label "Choice" ch lp #f OTHER-LABEL)
-  
-  (add-testers "Text" txt)
-  (add-change-label "Text" txt lp #f OTHER-LABEL)
-  
-  (let ([items (list ip
-                     l il 
-		     b ib 
-		     lb
-		     cb icb 
-		     rb irb 
-		     ch
-		     txt)]
-	[names (list "panel"
-                     "label" "image label"
-		     "button" "image button"
-		     "list box"
-		     "checkbox" "image checkbox"
-		     "radio box" "image radiobox"
-		     "choice"
-		     "text")])
-    (make-object choice%
-		 "Set Focus"
-		 (cons "..." names)
-		 lp
-		 (lambda (c e)
-		   (let ([v (send c get-selection)])
-		     (when (positive? v)
-		       (send (list-ref items (sub1 v)) focus)
-		       (send c set-selection 0)))))
-    (make-object choice%
-		 "Reparent"
-		 (cons "..." names)
-		 lp
-		 (lambda (c e)
-		   (let ([v (send c get-selection)])
-		     (when (positive? v)
-                       (define f (new frame% [label "New Parent"]))
-                       (define p (if (zero? (random 2))
-                                     (new vertical-pane% [parent f])
-                                     f))
-		       (send (list-ref items (sub1 v)) reparent p)
-                       (send f show #t)
-		       (send c set-selection 0)))))
-    (cons (make-object popup-test-canvas% 
-		       items
-		       names
-		       cp)
-	  items)))
-
-(define (add-deleted-adds panel l)
-  (define v #f)
-  
-  (make-object choice% "New Deleted"
-	       (list*
-		"..."
-		"*Activate Last*"
-		(map car l))
-	       panel
-	       (lambda (c e)
-		 (let ([i (send c get-selection)])
-		   (send c set-selection 0)
-		   (case i
-		     [(0) (void)]
-		     [(1) (send (send v get-parent) add-child v)]
-		     [else (set! v ((cadr (list-ref l (- i 2)))))])))))
-
-(define (add-big-deleted-adds panel)
-  (add-deleted-adds
-   panel
-   (list (list "Message" (lambda () (instantiate message% ("Hello" panel) [style '(deleted)])))
-	 (list "Bitmap Message" (lambda () (instantiate message% (bb-bmp panel) [style '(deleted)])))
-	 (list "Icon Message" (lambda () (instantiate message% ('app panel) [style '(deleted)])))
-	 (list "Button" (lambda () (instantiate button% ("Hello" panel void) [style '(deleted)])))
-	 (list "Bitmap Button" (lambda () (instantiate button% (bb-bmp panel void) [style '(deleted)])))
-	 (list "Checkbox" (lambda () (instantiate check-box% ("Hello" panel void) [style '(deleted)])))
-	 (list "Bitmap Checkbox" (lambda () (instantiate check-box% (bb-bmp panel void) [style '(deleted)])))
-	 (list "Radio Box" (lambda () (instantiate radio-box% ("Hello" (list "A" "B" "C") panel void) [style '(vertical deleted)])))
-	 (list "Bitmap Radio Box" (lambda () (instantiate radio-box% ("Hello" (list bb-bmp bb-bmp) panel void) [style '(vertical deleted)]))))))
-
-(define (add-med-deleted-adds panel)
-  (add-deleted-adds
-   panel
-   (list (list "Canvas" (lambda () (instantiate canvas% (panel) [style '(deleted)])))
-	 (list "Editor Canvas" (lambda () (instantiate editor-canvas% (panel) [style '(deleted)])))
-	 (list "Slider" (lambda () (instantiate slider% ("Hello" 1 3 panel void) [style '(deleted vertical)])))
-	 (list "Gauge" (lambda () (instantiate gauge% ("Hello" 3 panel) [style '(deleted vertical)])))
-	 (list "Tab Panel" (lambda () (instantiate tab-panel% ('("Hello" "Bye") panel void) [style '(deleted)])))
-	 (list "Group Box Panel" (lambda () (instantiate group-box-panel% ('"Hello" panel) [style '(deleted)])))
-	 (list "Panel" (lambda () (instantiate panel% (panel) [style '(deleted border)]))))))
-
-(define use-dialogs? #f)
-(define use-metal? #f)
-(define float-frame? #f)
-(define no-caption? #f)
-
-(define (big-frame h-radio? v-label? null-label? stretchy? font initially-disabled? 
-                   alternate-init? msg-auto? panel-style)
-  (define f (make-frame (if use-dialogs?
-			    active-dialog%
-			    active-frame%)
-			"T\u03A3ster"  ; \u03A3 is eta
-                        #f #f 100))
-  
-  (define hp (make-object horizontal-panel% f))
-  
-  (define ip (new vertical-panel% [parent hp] [style panel-style]))
-  (define cp (new vertical-panel% [parent hp] [style panel-style]))
-  (define ep (new vertical-panel% [parent hp] [style panel-style]))
-  (define lp (new vertical-panel% [parent hp] [style panel-style]))
-  
-  (define (basic-add-testers name w)
-    (add-hide name w cp)
-    (add-disable name w ep))
-  
-  (define add-testers
-    (if stretchy?
-	(lambda (name control)
-	  (send control stretchable-width #t)
-	  (send control stretchable-height #t)
-	  (basic-add-testers name control))
-	basic-add-testers))
-  
-  (define fp (make-object vertical-panel% ip))
-  
-  (define tp 
-    (if #f
-	(make-object group-box-panel% "Sub" fp null (or font small-control-font))
-	(make-object tab-panel% '("Sub" "Panel") fp void '(no-border) ($ font))))
-
-  (when initially-disabled?
-    (send tp enable #f))
-    
-  (make-h&s cp f)
-  
-  (add-testers "Sub-panel" fp)
-  
-  (send tp set-label "Sub-sub panel")
-  (add-testers "Sub-sub-panel" tp)
-
-  (let ([ctls (make-ctls tp cp lp add-testers ep h-radio? v-label? null-label? stretchy? alternate-init? msg-auto? font)])
-    (add-focus-note f ep)
-    (send f set-info ep)
-    
-    (add-cursors f lp ctls)
-
-    (add-big-deleted-adds lp))
-
-  (send f show #t)
-  (set! prev-frame f)
-  f)
-
-(define (med-frame plain-slider? label-h? null-label? stretchy? font initially-disabled? 
-                   alternate-init? msg-auto? panel-style)
-  (define f2 (make-frame (if use-dialogs?
-			    active-dialog%
-			    active-frame%)
-			 "Tester2"
-                         #f #f 100))
-
-  (define hp2 (make-object horizontal-panel% f2))
-  
-  (define ip2-0 (new vertical-panel% [parent hp2] [style panel-style]))
-  (define cp2 (new vertical-panel% [parent hp2] [style panel-style]))
-  (define ep2 (new vertical-panel% [parent hp2] [style panel-style]))
-  (define lp2 (new vertical-panel% [parent hp2] [style panel-style]))
-  
-  (define (basic-add-testers2 name w)
-    (add-hide name w cp2)
-    (add-disable name w ep2))
-  
-  (define add-testers2
-    (if stretchy?
-	(lambda (name control)
-	  (send control stretchable-width #t)
-	  (send control stretchable-height #t)
-	  (basic-add-testers2 name control))
-	basic-add-testers2))
-
-  (define fp2 (make-object vertical-panel% ip2-0))
-  (define ip2 (make-object group-box-panel% "Sub" fp2))
-
-  (when initially-disabled?
-    (send ip2 enable #f))
-
-  (make-h&s cp2 f2)
-  
-  (add-testers2 "Sub-panel" fp2)
-  (send ip2 set-label "Sub-sub panel")
-  (add-testers2 "Sub-sub-panel" ip2)
-  
-  (make-object text-field% #f ip2 void "start focus here")
-
-  (when prev-frame
-    (add-disable "Previous Tester Frame" prev-frame ep2))
-  
-  (let ()
-    (define co
-      (make-object combo-field% "Greet:" '("Hola" "Ni Hao") ip2 void "hello" null ($ font)))
-
-    (define sh (make-object slider% 
-			    (if null-label? #f "H S&lid\u03A3r") 0 10 ip2
-			    (lambda (s e)
-			      (send gh set-value (* 10 (send sh get-value))))
-			    5
-			    (add-label-direction 
-			     label-h? 
-			     (if plain-slider? '(horizontal plain) '(horizontal)))
-			    ($ font)))
-    
-    (define sv (make-object slider% 
-			    (if null-label? #f "V Sl&id\u03A3r") 0 10 ip2 
-			    (lambda (s e)
-			      (send gv set-value (* 10 (send sv get-value))))
-			    5
-			    (add-label-direction 
-			     label-h? 
-			     (if plain-slider? '(vertical plain) '(vertical)))
-			    ($ font)))
-    
-    (define gh (make-object gauge% 
-			    (if null-label? #f "H G&aug\u03A3") 100 ip2
-			    (add-label-direction 
-			     label-h? 
-			     '(horizontal))
-			    ($ font)))
-    
-    (define gv (make-object gauge% 
-			    (if null-label? #f "V Ga&ug\u03A3") 100 ip2
-			    (add-label-direction 
-			     label-h? 
-			     '(vertical))
-			    ($ font)))
-    
-    (define txt (make-object text-field% 
-			     (if null-label? #f "T&ext \u7238") ; \u7238 is Chinese "father"
-			     ip2 void 
-			     "initial & starting"
-			     (add-label-direction 
-			      label-h? 
-			      '(multiple))
-			     ($ font)))
-
-    (define tab (make-object tab-panel% 
-			     '("Appl\u03A3" "B&anana") ip2 void
-			     null
-			     ($ font)))
-
-    (define grp (make-object group-box-panel% 
-			     "Group\u03A3" ip2
-			     null (or font small-control-font)))
-
-    (make-object button% "OK" tab void)
-    (make-object button% "Cancel" grp void)
-
-    (add-testers2 "Combo" co)
-    (add-testers2 "Horiz Slider" sh)
-    (add-testers2 "Vert Slider" sv)
-    (add-testers2 "Horiz Gauge" gh)
-    (add-testers2 "Vert Gauge" gv)
-    ; (add-testers2 "Text Message" cmt)
-    ; (add-testers2 "Image Message" cmi)
-    (add-testers2 "Text" txt)
-    (add-testers2 "Tab" tab)
-    (add-testers2 "Group" grp)
-    
-    (add-change-label "Combo" co lp2 #f OTHER-LABEL)
-    (add-change-label "Horiz Slider" sh lp2 #f OTHER-LABEL)
-    (add-change-label "Vert Slider" sv lp2 #f OTHER-LABEL)
-    (add-change-label "Horiz Gauge" gh lp2 #f OTHER-LABEL)
-    (add-change-label "Vert Gauge" gv lp2 #f OTHER-LABEL)
-    (add-change-label "Text" txt lp2 #f OTHER-LABEL)
-    (add-change-label "Group" grp lp2 #f OTHER-LABEL)
-    
-    (let* ([items (list co
-			sh sv
-			gh gv
-			; cmt cmi
-			txt
-			tab grp)]
-	   [canvas  (make-object popup-test-canvas% 
-				 items
-				 (list "combo"
-                                       "h slider" "v slider"
-				       "v gauge" "v gauge"
-				       ; "text msg" "image msg"
-				       "text"
-				       "tab" "group")
-				 cp2 '(hscroll vscroll))])
-      (send canvas accept-tab-focus #t)
-      (send canvas init-auto-scrollbars 300 300 0.0 0.0)
-      (add-disable "Canvas" canvas ep2)
-
-      (add-focus-note f2 ep2)
-      (send f2 set-info ep2)
-      
-      (add-cursors f2 lp2 (cons canvas items))
-
-      (add-med-deleted-adds lp2))
-
-    (unless use-dialogs?
-      (send f2 create-status-line)
-      (send f2 set-status-text "This is the status line"))
-    (send f2 show #t)
-    (set! prev-frame f2)
-    f2))
-
-; Need: check, check-test, and enable via menubar
-; All operations on Submenus
-(define f%
-  (class frame%
-    (init-rest args)
-    (define ADD-APPLE (void))
-    (define ADD-BANANA (void))
-    (define ADD-COCONUT (void))
-    (define DELETE-APPLE (void))
-    (define DELETE-EXTRA-BANANA (void))
-    (define DELETE-BANANA (void))
-    (define DELETE-COCONUT-0 (void))
-    (define DELETE-COCONUT (void))
-    (define DELETE-COCONUT-2 (void))
-    (define COCONUT-ID (void))
-    (define DELETE-ONCE (void))
-    (define APPLE-CHECK-ID (void))
-    (define CHINESE (void))
-    (define menu-bar (void))
-    (define main-menu (void))
-    (define apple-menu (void))
-    (define banana-menu (void))
-    (define coconut-menu (void))
-    (define baseball-ids (void))
-    (define hockey-ids (void))
-    (define enable-item (void))
-    (apply super-make-object args)
-    (public*
-     [make-menu-bar
-      (lambda ()
-        (let* ([mb (make-object menu-bar% this)]
-               [menu (make-object menu% "&Tester" mb)]
-               [new (case-lambda 
-		      [(l help parent) (make-object menu-item% l parent (lambda (o e) (callback o e)) #f help)]
-		      [(l help) (make-object menu-item% l menu (lambda (o e) (callback o e)) #f help)]
-		      [(l) (make-object menu-item% l menu (lambda (o e) (callback o e)))])]
-               [sep (lambda () (make-object separator-menu-item% menu))])
-          (set! menu-bar mb)
-          (set! main-menu menu)
-
-          (set! ADD-APPLE (new "Add Apple" "Adds the Apple menu"))
-          (set! ADD-BANANA (new "Add Banana"))
-          (set! ADD-COCONUT (new "Add Coconut"))
-	   
-          (make-object on-demand-menu-item% "Append Donut" menu
-                       (lambda (m e) 
-                         (make-object menu-item% "Donut" apple-menu void)))
-          (sep)
-          (set! DELETE-COCONUT-0 (new "Delete Coconut"))
-          (make-object menu-item% "Delete Apple" menu
-                       (lambda (m e) 
-                         (send apple-menu delete)
-                         (set! apple-installed? #f)))
-	   
-          (sep)
-          (set! enable-item
-                (make-object checkable-menu-item% "Apple Once Disabled" menu
-                             (lambda (m e)
-                               (send DELETE-ONCE enable
-                                     (not (send enable-item is-checked?))))))
-	   
-          (let ([mk-enable (lambda (on?)
-                             (lambda (m e)
-                               (let ([l (send menu-bar get-items)])
-                                 (unless (null? (cdr l))
-                                   (send (cadr l) enable on?)))))])
-            (make-object menu-item% "Disable Second" menu (mk-enable #f))
-            (make-object menu-item% "Enable Second" menu (mk-enable #t)))
-
-          (set! CHINESE (make-object menu-item% "Chinese: \U7238" menu void))
-	   
-          (let ([make-menu
-                 (opt-lambda (title parent help-string)
-                   (let ([m (make-object menu% title parent help-string)])
-                     (send m delete)
-                     m))])
-            (set! apple-menu (make-menu "Apple" mb #f))
-            (set! banana-menu (make-menu "Banana" mb #f))
-            (set! coconut-menu (make-menu "Coconut" apple-menu "Submenu")))
-	   
-          (set! COCONUT-ID coconut-menu)
-
-          (set! DELETE-ONCE (new "Delete Once" #f apple-menu))
-          (set! DELETE-APPLE (new "Delete Apple" "Deletes the Apple menu" apple-menu))
-          (set! APPLE-CHECK-ID (make-object checkable-menu-item% "Checkable" apple-menu void))
-
-          (set! DELETE-BANANA (new "Delete Banana" #f banana-menu))
-          (set! DELETE-EXTRA-BANANA (new "Delete First Banana Item" #f banana-menu))
-
-          (set! DELETE-COCONUT (new "Delete Coconut" #f coconut-menu))
-          (set! DELETE-COCONUT-2 (new "Delete Coconut By Position" #f coconut-menu))))]
-      
-     [callback
-      (lambda (op ev)
-        (cond
-         [(eq? op ADD-APPLE)
-          (send apple-menu restore)
-          (set! apple-installed? #t)]
-         [(eq? op ADD-BANANA)
-          (send banana-menu restore)]
-         [(eq? op ADD-COCONUT)
-          (send coconut-menu restore)]
-         [(eq? op DELETE-ONCE)
-          (send DELETE-ONCE delete)]
-         [(eq? op DELETE-APPLE)
-          (send apple-menu delete)
-          (set! apple-installed? #f)]
-         [(eq? op DELETE-BANANA)
-          (send banana-menu delete)]
-         [(eq? op DELETE-EXTRA-BANANA)
-          (send (car (send banana-menu get-items)) delete)]
-         [(or (eq? op DELETE-COCONUT) (eq? op DELETE-COCONUT-0))
-          (send COCONUT-ID delete)]
-         [(eq? op DELETE-COCONUT-2)
-          (send (list-ref (send apple-menu get-items) 3) delete)]))])
-    (define mfp (make-object vertical-panel% this))
-    (define mc (make-object editor-canvas% mfp))
-    (define restp (make-object vertical-panel% mfp))
-    (define sbp (make-object horizontal-panel% restp))
-    (define mfbp (make-object horizontal-panel% restp))
-    (define lblp (make-object horizontal-panel% restp))
-    (define badp (make-object horizontal-panel% restp))
-    (define e (make-object text%))
-    (send restp stretchable-height #f)
-    (send mc min-height 250)
-    (send mc set-editor e)
-    (send e load-file (local-path "menu-steps.txt"))
-    (public*
-     [make-test-button
-      (lambda (name pnl menu id)
-        (make-object button%
-                     (format "Test ~a" name) pnl 
-                     (lambda (b e)
-                       (message-box
-                        "Checked?"
-                        (if (send id is-checked?)
-                            "yes"
-                            "no")))))]
-     [compare
-      (lambda (expect v kind)
-        (unless (or (and (string? expect) (string? v)
-                         (string=? expect v))
-                    (eq? expect v))
-          (error 'test-compare "~a mismatch: ~s != ~s" kind expect v)))]
-     [check-parent
-      (lambda (menu id)
-        (unless use-menubar?
-          (unless (eq? (send id get-parent) menu)
-            (error 'check-parent "parent mismatch: for ~a, ~a != ~a"
-                   (send id get-label)
-                   (send menu get-label)
-                   (send (send (send id get-parent) get-item) get-label)))))]
-     [label-test
-      (lambda (menu id expect)
-        (check-parent menu id)
-        (let ([v (send id get-label)])
-          (compare expect v "label")))]
-     [top-label-test
-      (lambda (pos expect)
-        (let ([i (send menu-bar get-items)])
-          (and (> (length i) pos)
-               (let ([v (send (list-ref i pos) get-label)])
-                 (compare expect v "top label")))))]
-     [help-string-test
-      (lambda (menu id expect)
-        (check-parent menu id)
-        (let ([v (send id get-help-string)])
-          (compare expect v "help string")))]
-     [find-test
-      (lambda (menu title expect string)
-        (letrec ([find
-                  (lambda (menu str)
-                    (let ([items (send menu get-items)])
-                      (ormap (lambda (i)
-                               (and (is-a? i labelled-menu-item<%>)
-                                    (equal? (send i get-plain-label) str)
-                                    i))
-                             items)))]
-                 [find-item
-                  (lambda (menu str)
-                    (or (find menu str)
-                        (let ([items (send menu get-items)])
-                          (ormap (lambda (i)
-                                   (and (is-a? i menu%)
-                                        (find-item i str)))
-                                 items))))]
-                 [v (if use-menubar? 
-                        (let ([item (find menu-bar title)])
-                          (if item
-                              (find-item item string)
-                              -1))
-                        (find-item menu string))])
-          (compare expect v (format "label search: ~a" string))))]
-     [tell-ok
-      (lambda ()
-        (printf "ok\n"))])
-    (define temp-labels? #f)
-    (define use-menubar? #f)
-    (define apple-installed? #f)
-    (public*
-     [via (lambda (menu) (if use-menubar? menu-bar menu))]
-     [tmp-pick (lambda (a b) (if temp-labels? a b))]
-     [apple-pick (lambda (x a b) (if (and use-menubar? (not apple-installed?))
-                                     x
-                                     (tmp-pick a b)))])
-     (make-menu-bar)
-
-     (send apple-menu restore)
-
-     (make-object button%
-                  "Delete Tester" sbp 
-                  (lambda args
-                    (send main-menu delete)))
-     (make-object button%
-                  "Delete First Menu" sbp
-                  (lambda args
-                    (send (car (send menu-bar get-items)) delete)))
-     (make-object button%
-                  "Add Tester" sbp
-                  (lambda args
-                    (send main-menu restore)))
-     (make-object button%
-                  "Add Delete Banana" sbp
-                  (lambda args
-                    (send DELETE-BANANA restore)))
-     (make-object button%
-                  "Counts" sbp
-                  (lambda args
-                    (message-box
-                     "Counts"
-                     (format "MB: ~a; T: ~a; A: ~a; B: ~a"
-                             (length (send menu-bar get-items))
-                             (length (send main-menu get-items))
-                             (length (send apple-menu get-items))
-                             (length (send banana-menu get-items))))))
-
-     (make-test-button "Apple Item" mfbp apple-menu APPLE-CHECK-ID)
-     (make-object button%
-                  "Check in Apple" mfbp
-                  (lambda args
-                    (send APPLE-CHECK-ID check #t)))
-     (make-object button%
-                  "Delete/Restore Check" mfbp
-                  (lambda args
-                    (if (send APPLE-CHECK-ID is-deleted?)
-                        (send APPLE-CHECK-ID restore)
-                        (send APPLE-CHECK-ID delete))))
-     (make-object button%
-                  "Toggle Menubar Enable" mfbp
-                  (lambda args
-                    (send menu-bar enable (not (send menu-bar is-enabled?)))))
-     (make-object button%
-                  "Toggle Apple Enable" mfbp
-                  (lambda args
-                    (send apple-menu enable (not (send apple-menu is-enabled?)))))
-       
-     (make-object button%
-                  "Test Labels" lblp 
-                  (lambda args
-                    (label-test (via main-menu) ADD-APPLE (tmp-pick "Apple Adder" "Add Apple"))
-                    (help-string-test (via main-menu) ADD-APPLE (tmp-pick "ADDER" "Adds the Apple menu"))
-                    (label-test (via apple-menu) DELETE-APPLE (apple-pick #f "Apple Deleter" "Delete Apple"))
-                    (help-string-test (via apple-menu) DELETE-APPLE (apple-pick #f "DELETER"
-                                                                                "Deletes the Apple menu"))
-                    (label-test (via apple-menu) COCONUT-ID (apple-pick #f "Coconut!" "Coconut"))
-                    (help-string-test (via apple-menu) COCONUT-ID (apple-pick #f "SUBMENU" "Submenu"))
-                    (label-test (via coconut-menu) DELETE-COCONUT (apple-pick #f "Coconut Deleter" "Delete Coconut")) ; submenu test
-                    (help-string-test (via coconut-menu) DELETE-COCONUT (apple-pick #f "CDELETER" #f))
-                    (top-label-test 0 (if temp-labels? "Hi" "&Tester"))
-                    (top-label-test 1 (if apple-installed? "Apple" #f))
-                    (tell-ok)))
-     (make-object button%
-                  "Find Labels" lblp
-                  (lambda args
-                    (find-test main-menu (tmp-pick "Hi" "&Tester")
-                               ADD-APPLE (tmp-pick "Apple Adder" "Add Apple"))
-                    (find-test apple-menu "Apple" (apple-pick -1 DELETE-APPLE DELETE-APPLE)
-                               (tmp-pick "Apple Deleter" "Delete Apple"))
-                    (find-test apple-menu "Apple" (apple-pick -1 COCONUT-ID COCONUT-ID)
-                               (tmp-pick "Coconut!" "Coconut"))
-                    (find-test apple-menu "Apple" (apple-pick -1 DELETE-COCONUT DELETE-COCONUT)
-                               (tmp-pick "Coconut Deleter" "Delete Coconut"))
-                    (tell-ok)))
-     (make-object button%
-                  "Toggle Labels" lblp
-                  (lambda args
-                    (set! temp-labels? (not temp-labels?))
-                    (let ([menu (via main-menu)])
-                      (send ADD-APPLE set-label (tmp-pick "Apple Adder" "Add Apple"))
-                      (send DELETE-APPLE set-label (tmp-pick "Apple Deleter" "Delete Apple"))
-                      (send COCONUT-ID set-label (tmp-pick "Coconut!" "Coconut"))
-                      (send DELETE-COCONUT set-label (tmp-pick "Coconut Deleter" "Delete Coconut"))
-                      (send ADD-APPLE set-help-string (tmp-pick "ADDER" "Adds the Apple menu"))
-                      (send DELETE-APPLE set-help-string (tmp-pick "DELETER" "Deletes the Apple menu"))
-                      (send COCONUT-ID set-help-string (tmp-pick "SUBMENU" "Submenu"))
-                      (send DELETE-COCONUT set-help-string (tmp-pick "CDELETER" #f))
-                      (send CHINESE set-label (tmp-pick "Chinese: \U7239" "Chinese: \U7238"))
-                      (send CHINESE set-shortcut (tmp-pick #\C #\K))
-                      (send main-menu set-label (if temp-labels? "Hi" "&Tester")))))
-     (letrec ([by-bar (make-object check-box%
-                                   "Via Menubar" lblp
-                                   (lambda args
-                                     (set! use-menubar? (send by-bar get-value))))])
-       by-bar)
-       
-     #f))
-
-(define (menu-frame)
-  (define mf (make-frame f% "Menu Test"))
-  (set! prev-frame mf)
-  (send mf show #t)
-  mf)
-
-(define (panel-frame)
-  (define make-p% 
-    (lambda (panel%)
-      (class panel%
-        (init parent)
-	(override*
-	  [container-size
-	   (lambda (l)
-	     (values (apply + (map car l))
-		     (apply + (map cadr l))))]
-	  [place-children
-	   (lambda (l w h)
-	     (let-values ([(mw mh) (container-size l)])
-	       (let* ([num-x-stretch (apply + (map (lambda (x) (if (caddr x) 1 0)) l))]
-		      [num-y-stretch (apply + (map (lambda (x) (if (cadddr x) 1 0)) l))]
-		      [dx (floor (/ (- w mw) num-x-stretch))]
-		      [dy (floor (/ (- h mh) num-y-stretch))])
-		 (let loop ([l l][r null][x 0][y 0])
-		   (if (null? l)
-		       (reverse r)
-		       (let ([w (+ (caar l) (if (caddr (car l)) dx 0))]
-			     [h (+ (cadar l) (if (cadddr (car l)) dy 0))])
-			 (loop (cdr l)
-			       (cons (list x y w h) r)
-			       (+ x w) (+ y h))))))))])
-        (super-make-object parent))))
-  (define f (make-frame frame% "Panel Tests"))
-  (define h (make-object horizontal-panel% f))
-  (define kind (begin
-		 (send h set-alignment 'center 'top)
-		 (make-object radio-box%
-			      "Kind"
-			      '("Panel" "Pane")
-			      h
-			      void)))
-  (define direction (make-object radio-box%
-				 "Direction"
-				 '("Horionztal" "Vertical" "Diagonal" "None")
-				 h
-				 void))
-  (define h-align (make-object radio-box%
-			       "H Alignment"
-			       '("Left" "Center" "Right")
-			       h
-			       void))
-  (define v-align (make-object radio-box%
-			       "V Alignment"
-			       '("Top" "Center" "Bottom")
-			       h
-			       void))
-  (make-object button% "Make Container" f
-	       (lambda (b e) (do-panel-frame
-			      (let ([kind (send kind get-selection)]
-				    [direction (send direction get-selection)])
-				(case kind
-				  [(0) (case direction
-					 [(0) horizontal-panel%]
-					 [(1) vertical-panel%]
-					 [(2) (make-p% panel%)]
-					 [else panel%])]
-				  [(1) (case direction
-					 [(0) horizontal-pane%]
-					 [(1) vertical-pane%]
-					 [(2) (make-p% pane%)]
-					 [else pane%])]))
-			      (case (send h-align get-selection)
-				[(0) 'left]
-				[(1) 'center]
-				[(2) 'right])
-			      (case (send v-align get-selection)
-				[(0) 'top]
-				[(1) 'center]
-				[(2) 'bottom]))))
-  (send f show #t))
-
-(define (do-panel-frame p% va ha)
-  (define f (make-frame frame% "Container Test"))
-  (define p (make-object p% f))
-  (define b (make-object button% "Add List or Bad" p
-			 (lambda (b e)
-			   (send p add-child 
-				 (if (send c get-value)
-				     m1
-				     l)))))
-  (define c (make-object check-box% "Remove List" p
-			 (lambda (c e)
-			   (if (send c get-value)
-			       (send p delete-child l)
-			       (send p add-child l)))))
-  (define l (make-object list-box% "List Box" '("A" "B" "C") p
-			 (lambda (l e)
-			   (if (eq? (send e get-event-type) 'list-box)
-			       (send p get-children)
-			       (send p change-children reverse)))))
-  (define p2 (make-object vertical-panel% p '(border)))
-  (define m1 (make-object message% "1" p2))
-  (define m2 (make-object message% "2" p2))
-  (send p set-alignment va ha)
-  (send f show #t))
-
-(define (check-callback-event orig got e types silent?)
-  (unless (eq? orig got)
-    (error "object not the same"))
-  (unless (is-a? e control-event%)
-    (error "bad event object"))
-  (let ([type (send e get-event-type)])
-    (unless (memq type types)
-      (error (format "bad event type: ~a" type))))
-  (unless silent?
-    (printf "Callback Ok\n")))
-
-(define (instructions v-panel file)
-  (define c (make-object editor-canvas% v-panel))
-  (define m (make-object text%))
-  (send c set-editor m)
-  (send m load-file (local-path file))
-  (send m lock #t)
-  (send c min-width 520)
-  (send c min-height 200))
-
-(define (open-file file)
-  (define f (make-object frame% file #f 300 300))
-  (instructions f file)
-  (send f show #t))
-
-(define (button-frame frame% style)
-  (define f (make-frame frame% "Button Test"))
-  (define p (make-object vertical-panel% f))
-  (define old-list null)
-  (define commands (list 'button))
-  (define hit? #f)
-  (define b (make-object button%
-			 "Hit Me" p
-			 (lambda (bx e)
-			   (set! hit? #t)
-			   (set! old-list (cons e old-list))
-			   (check-callback-event b bx e commands #f))
-			 style))
-  (define c (make-object button%
-			 "Check" p
-			 (lambda (c e)
-			   (for-each
-			    (lambda (e)
-			      (check-callback-event b b e commands #t))
-			    old-list)
-			   (printf "All Ok\n"))))
-  (define e (make-object button%
-			 "Disable Test" p
-			 (lambda (c e)
-			   (sleep 1)
-			   (set! hit? #f)
-			   (let ([sema (make-semaphore)])
-			     (send b enable #f)
-			     (thread (lambda () (sleep 0.5) (semaphore-post sema)))
-			     (yield sema)
-			     (when hit?
-			       (printf "un-oh\n"))
-			     (send b enable #t)))))
-  (instructions p "button-steps.txt")
-  (send f show #t))
-
-(define (image-button-frame)
-  (define f (make-frame frame% "Image Button Test"))
-  (define pt (make-object vertical-panel% f))
-  (define pm (make-object horizontal-panel% f))
-  (define pb (make-object vertical-panel% f))
-  (define pc (make-object horizontal-panel% f))
-  (define bt (new button% [parent pt]
-                  [label (list (read-bitmap
-                                (collection-file-path "foot.png" "icons"))
-                               "Top"
-                               'top)]))
-  (define bl (new button% [parent pm]
-                  [label (list (read-bitmap
-                                (collection-file-path "b-wait.png" "icons"))
-                               "Left"
-                               'left)]))
-  (define br (new button% [parent pm]
-                  [label (list (read-bitmap
-                                (collection-file-path "b-run.png" "icons"))
-                               "Right"
-                               'right)]))
-  (define bb (new button% [parent pb]
-                  [label (list (read-bitmap
-                                (collection-file-path "bug09.png" "icons"))
-                               "Bottom"
-                               'bottom)]))
-  (new button% [parent pc]
-       [label "Strings"]
-       [callback (lambda (b e)
-                   (for ([b (in-list (list bt bl br bb))])
-                     (send b set-label (list->string
-                                        (reverse
-                                         (string->list
-                                          (cadr (send b get-label))))))))])
-  (new button% [parent pc]
-       [label "Bitmaps"]
-       [callback (lambda (b e)
-                   (for ([b (in-list (list bt bl br bb))])
-                     (send b set-label (let ([bm (car (send b get-label))])
-                                         (let* ([bm2 (make-bitmap (send bm get-width)
-                                                                  (send bm get-height))]
-                                                [dc (make-object bitmap-dc% bm2)])
-                                           (send dc scale 1 -1)
-                                           (send dc translate 0 (send bm get-height))
-                                           (send dc draw-bitmap bm 0 0)
-                                           (send dc set-bitmap #f)
-                                           bm2)))))])
-  (send f show #t))
-
-(define (checkbox-frame)
-  (define f (make-frame frame% "Checkbox Test"))
-  (define p f)
-  (define old-list null)
-  (define commands (list 'check-box))
-  (define cb (make-object check-box%
-			  "On" p
-			  (lambda (cx e)
-			    (set! old-list (cons e old-list))
-			    (check-callback-event cb cx e commands #f))))
-  (define t (make-object button%
-			 "Toggle" p
-			 (lambda (t e)
-			   (let ([on? (send cb get-value)])
-			     (send cb set-value (not on?))))))
-  (define t2 (make-object button%
-			  "Simulation Toggle" p
-			  (lambda (t e)
-			    (let ([on? (send cb get-value)]
-				  [e (make-object control-event% 'check-box)])
-			      (send cb set-value (not on?))
-			      (send cb command e)))))
-  (define c (make-object button%
-			 "Check" p
-			 (lambda (c e)
-			   (for-each
-			    (lambda (e)
-			      (check-callback-event cb cb e commands #t))
-			    old-list)
-			   (printf "All Ok\n"))))
-  (instructions p "checkbox-steps.txt")
-  (send f show #t))
-
-(define (radiobox-frame)
-  (define f (make-frame frame% "Radiobox Test"))
-  (define p f)
-  (define old-list null)
-  (define commands (list 'radio-box))
-  (define hp (make-object horizontal-panel% p))
-  (define _ (send hp stretchable-height #f))
-  (define callback (lambda (rb e)
-		     (set! old-list (cons (cons rb e) old-list))
-		     (check-callback-event rb rb e commands #f)))
-  (define rb1-l (list "Singleton"))
-  (define rb1 (make-object radio-box% "&Left" rb1-l hp callback))
-  (define rb2-l (list "First" "Last"))
-  (define rb2 (make-object radio-box% "&Center" rb2-l hp callback))
-  (define rb3-l (list "&Top" "&Middle" "&Bottom"))
-  (define rb3 (make-object radio-box% "&Right" rb3-l hp callback))
-
-  (define rbs (list rb1 rb2 rb3))
-  (define rbls (list rb1-l rb2-l rb3-l))
-  (define normal-sel (lambda (rb p) (send rb set-selection p)))
-  (define simulate-sel (lambda (rb p)
-			 (let ([e (make-object control-event% 'radio-box)])
-			   (send rb set-selection p)
-			   (send rb command e))))
-  (define (mk-err exn?)
-    (lambda (f)
-      (lambda (rb p)
-	(with-handlers ([exn? void])
-	  (f rb p)
-	  (error "no exn raisd")))))
-  (define type-err (mk-err exn:fail:contract?))
-  (define mismatch-err (mk-err exn:fail:contract?))
-
-  (define do-sel (lambda (sel n) (for-each (lambda (rb) (sel rb (n rb))) rbs)))
-  (define sel-false (lambda (sel) (do-sel sel (lambda (rb) #f))))
-  (define sel-minus (lambda (sel) (do-sel (type-err sel) (lambda (rb) -1))))
-  (define sel-first (lambda (sel) (do-sel sel (lambda (rb) 0))))
-  (define sel-middle (lambda (sel) (do-sel sel (lambda (rb) (floor (/ (send rb get-number) 2))))))
-  (define sel-last (lambda (sel) (do-sel sel (lambda (rb) (sub1 (send rb get-number))))))
-  (define sel-N (lambda (sel) (do-sel (mismatch-err sel) (lambda (rb) (send rb get-number)))))
-  (define (make-selectors title sel)
-    (define hp2 (make-object horizontal-panel% p))
-    (send hp2 stretchable-height #f)
-    (make-object button% (format "Select -1~a" title) hp2 (lambda (b e) (sel-minus sel)))
-    (make-object button% (format "Select First~a" title) hp2 (lambda (b e) (sel-first sel)))
-    (make-object button% (format "Select Middle ~a" title) hp2 (lambda (b e) (sel-middle sel)))
-    (make-object button% (format "Select Last~a" title) hp2 (lambda (b e) (sel-last sel)))
-    (make-object button% (format "Select N~a" title) hp2 (lambda (b e) (sel-N sel)))
-    (when (equal? title "")
-      (make-object button% (format "Select #f~a" title) hp2 (lambda (b e) (sel-false sel)))))
-  (make-selectors "" normal-sel)
-  (make-selectors " by Simulate" simulate-sel)
-  (make-object button% "Check" p
-	       (lambda (c e)
-		 (for-each
-		  (lambda (rb l)
-		    (let loop ([n 0][l l])
-		      (unless (null? l)
-			(let ([a (car l)]
-			      [b (send rb get-item-label n)])
-			  (unless (string=? a b)
-			    (error "item name mismatch: ~s != ~s" a b)))
-			(loop (add1 n) (cdr l)))))
-		  rbs rbls)
-		 (for-each
-		  (lambda (rbe)
-		    (check-callback-event (car rbe) (car rbe) (cdr rbe) commands #t))
-		  old-list)
-		 (printf "All Ok\n")))
-  (instructions p "radiobox-steps.txt")
-  (send f show #t))
-
-(define (choice-or-list-frame list? list-style empty? 
-                              [columns '("Choice")] [more-styles '()] [column-order #f])
-  (define f (make-frame frame% (if list? "List Test" "Choice Test")))
-  (define p f)
-  (define-values (actual-content actual-user-data)
-    (if empty?
-	(values null null)
-	(values '("Alpha" "Beta" "Gamma")
-		(list #f #f #f))))
-  (define commands 
-    (if list?
-	(append (list 'list-box 'list-box-dclick)
-                (if (memq 'clickable-headers more-styles)
-                    (list 'list-box-column)
-                    null))
-	(list 'choice)))
-  (define old-list null)
-  (define multi? (or (memq 'multiple list-style)
-		     (memq 'extended list-style)))
-  (define callback
-    (lambda (cx e)
-      (when (zero? (send c get-number))
-	    (error "Callback for empty choice/list"))
-      (set! old-list (cons e old-list))
-      (cond
-       [(eq? (send e get-event-type) 'list-box-dclick)
-	; double-click
-	(printf "Double-click\n")
-	(unless (send cx get-selection)
-	  (error "no selection for dclick"))]
-       [(eq? (send e get-event-type) 'list-box-column)
-        (printf "Column: ~a\n" (send e get-column))]
-       [else
-	; misc multi-selection
-	(printf "Changed: ~a\n" (if list?
-				    (send cx get-selections)
-				    (send cx get-selection)))])
-      (check-callback-event c cx e commands #f)))
-  (define c (if list?
-		(new list-box% [label "Tester"]
-                     [choices actual-content]
-                     [parent p]
-                     [callback callback]
-                     [style (append list-style more-styles)]
-                     [columns columns]
-                     [column-order column-order])
-		(make-object choice% "Tester" actual-content p callback)))
-  (define counter 0)
-  (define append-with-user-data? #f)
-  (define ap (new horizontal-panel% [parent p]
-                  [stretchable-width #f]
-                  [stretchable-height #f]))
-  (define ab (make-object button%
-			  "Append" ap
-			  (lambda (b e)
-			    (set! counter (add1 counter))
-			    (let ([naya (format "~aExtra ~a" 
-						(if (= counter 10)
-						    (string-append
-						     "This is a Really Long Named Item That Would Have Used the Short Name, Yes "
-						     "This is a Really Long Named Item That Would Have Used the Short Name ")
-						    "")
-						counter)]
-				  [naya-data (box 0)])
-			      (set! actual-content (append actual-content (list naya)))
-			      (set! actual-user-data (append actual-user-data (list naya-data)))
-			      (if (and list? append-with-user-data?)
-				  (send c append naya naya-data)
-				  (begin
-				    (send c append naya)
-				    (when list?
-					  (send c set-data 
-						(sub1 (send c get-number))
-						naya-data))))
-			      (set! append-with-user-data?
-				    (not append-with-user-data?))))))
-  (new button% 
-       [label "Add Column"]
-       [parent ap]
-       [callback (lambda (b e)
-                   (let ([s (format "New ~a" (length columns))])
-                     (send c append-column s)
-                     (set! columns (append columns (list s)))))])
-  (new button% 
-       [label "Delete Right Column"]
-       [parent ap]
-       [callback (lambda (b e)
-                   (let ([pos (last (send c get-column-order))])
-                     (send c delete-column pos)
-                     (set! columns (send c get-column-labels))))])
-  (when list? 
-    (let ([hp (new horizontal-panel% 
-                   [parent p]
-                   [stretchable-width #f]
-                   [stretchable-height #f])])
-      (make-object button%
-                   "Visible Indices" hp
-                   (lambda (b e)
-                     (printf "top: ~a\nvisible count: ~a\n"
-                             (send c get-first-visible-item)
-                             (send c number-of-visible-items))))
-      (define (mk which pos)
-        (new button% [label (format "Set ~a Top" which)]
-             [parent hp]
-             [callback (lambda (b e) (send c set-first-visible-item pos))]))
-      (mk "First" 0)
-      (mk "Third" 2)
-      (mk "Tenth" 9)
-      (new button% [label "Reverse Columns"]
-           [parent hp]
-           [callback (lambda (b e) (send c set-column-order (reverse (send c get-column-order))))])
-      (new button% [label "Set Column Label"]
-           [parent hp]
-           [callback (lambda (b e) 
-                       (send c set-column-label (sub1 (length columns)) "Last")
-                       (send c set-column-label 0 "First"))])
-      (new button% [label "Set Column Size"]
-           [parent hp]
-           [callback (lambda (b e) 
-                       (send c set-column-size 0 50 10 100)
-                       (unless (= 1 (length columns))
-                         (let-values ([(w mn mx) (send c get-column-size 0)])
-                           (send c set-column-size (sub1 (length columns)) w mn mx))))])))
-  (define cdp (new horizontal-panel% [parent p]
-                   [stretchable-height #f]))
-  (define rb (make-object button% "Clear" cdp
-			  (lambda (b e)
-			    (set! actual-content null)
-			    (set! actual-user-data null)
-			    (send c clear))))
-  (define (gone l n)
-    (if (zero? n)
-        (cdr l)
-        (cons (car l) (gone (cdr l) (sub1 n)))))
-  (define (delete p)
-    (send c delete p)
-    (when (<= 0 p (sub1 (length actual-content)))
-      (set! actual-content (gone actual-content p))
-      (set! actual-user-data (gone actual-user-data p))))
-  (define db (make-object button%
-                          "Delete" cdp
-                          (lambda (b e)
-                            (let ([p (send c get-selection)])
-                              (delete p)))))
-  (define dab (if list?
-		  (make-object button%
-			       "Delete Above" cdp
-			       (lambda (b e)
-				 (let ([p (send c get-selection)])
-				   (delete (sub1 p)))))
-		  null))
-  (define dbb (if list?
-		  (make-object button%
-			       "Delete Below" cdp
-			       (lambda (b e)
-				 (let ([p (send c get-selection)])
-				   (delete (add1 p)))))
-		  null))
-  (define setb (if list?
-		   (make-object button%
-				"Reset" cdp
-				(lambda (b e)
-                                  (let ([extras (for/list ([in-list (cdr columns)]
-                                                           [col (in-naturals 1)])
-                                                  (for/list ([i (in-range 3)])
-                                                    (format "~a, ~a" col i)))])
-                                    (send c set '("Alpha" "Beta" "Gamma") . extras))
-				  (set! actual-content '("Alpha" "Beta" "Gamma"))
-				  (set! actual-user-data (list #f #f #f))))
-		   null))
-  (define sel (if list?
-		  (make-object button%
-			       "Add Select First" cdp
-			       (lambda (b e)
-				 (send c select 0 #t)))
-		  null))
-  (define unsel (if list?
-		    (make-object button%
-				 "Unselect" cdp
-				 (lambda (b e)
-				   (send c select (send c get-selection) #f)))
-		    null))
-  (define change-button-name (if list? 
-                                 (make-object button%
-                                              "Change Name" cdp
-                                              (lambda (b e)
-						(let ([p (send c get-selection)])
-						  (when p
-						    (send c set-string p "New Name")
-                                                    (for ([in-list (cdr columns)]
-                                                          [col (in-naturals 1)])
-                                                      (send c set-string p 
-                                                            (format "new ~a" col)
-                                                            col))
-						    (set! actual-content
-							  (let loop ([ac actual-content][p p])
-							    (if (zero? p)
-								(cons "New Name" (cdr ac))
-								(cons (car ac)
-								      (loop (cdr ac) (sub1 p))))))))))
-                                 null))
-  (define (make-selectors method mname numerical?)
-    (define p2 (make-object horizontal-panel% p))
-    (send p2 stretchable-height #f)
-    (when numerical?
-	  (make-object button%
-		       (string-append "Select Bad -1" mname) p2
-		       (lambda (b e)
-			 (with-handlers ([exn:fail:contract? void])
-			   (method -1)
-			   (error "expected a type exception")))))
-    (make-object button%
-		 (string-append "Select First" mname) p2
-		 (lambda (b e)
-		   (method 0)))
-    (make-object button%
-		 (string-append "Select Middle" mname) p2
-		 (lambda (b e)
-		   (method (floor (/ (send c get-number) 2)))))
-    (make-object button%
-		 (string-append  "Select Last" mname) p2
-		 (lambda (b e)
-		   (method (sub1 (send c get-number)))))
-    (make-object button%
-		 (string-append "Select Bad X" mname) p2
-		 (lambda (b e)
-		   (with-handlers ([exn:fail:contract? void]) 
-		     (method (if numerical?
-				 (send c get-number)
-				 #f))
-		     (error "expected a mismatch exception"))))
-    #f)
-  (define dummy-1 (make-selectors (lambda (v) (send c set-selection v)) "" #t))
-  (define dummy-2 (make-selectors (lambda (p) 
-				    (if p
-					(when (positive? (length actual-content))
-					      (send c set-string-selection 
-						    (list-ref actual-content p)))
-					(send c set-string-selection "nada")))
-				  " by Name"
-				  #f))
-  (define dummy-3 (make-selectors (lambda (p)
-				    (let ([e (make-object control-event% (if list? 'list-box 'choice))])
-				      (send c set-selection p)
-				      (when list? (send c set-first-visible-item p))
-				      (send c command e)))
-				  " by Simulate" #t))
-  (define tb (make-object button%
-			  "Check" p
-			  (lambda (b e)
-			    (let ([c (send c get-number)])
-			      (unless (= c (length actual-content))
-				(error "bad number response")))
-			    (let loop ([n 0][l actual-content][lud actual-user-data])
-			      (unless (null? l)
-				      (let ([s (car l)]
-					    [sud (car lud)]
-					    [sv (send c get-string n)]
-					    [sudv (if list?
-						      (send c get-data n)
-						      #f)])
-					(unless (string=? s sv)
-					  (error "get-string mismatch"))
-					(unless (or (not list?) (eq? sud sudv))
-					  (error 'get-data "mismatch at ~a: ~s != ~s"
-						 n sud sudv))
-					(unless (= n (send c find-string s))
-					  (error "bad find-string result")))
-				      (loop (add1 n) (cdr l) (cdr lud))))
-			    (let ([bad (lambda (exn? i)
-					 (with-handlers ([exn? void])
-					   (send c get-string i)
-					   (error "out-of-bounds: no exn")))])
-			      (bad exn:fail:contract? -1)
-			      (bad exn:fail:contract? (send c get-number)))
-			    (unless (not (send c find-string "nada"))
-			      (error "find-string of nada wasn't #f"))
-			    (for-each
-			     (lambda (e)
-			       (check-callback-event c c e commands #t))
-			     old-list)
-			    (printf "content: ~s\n" actual-content)
-			    (when multi?
-			      (printf "selections: ~s\n" (send c get-selections))))))
-  (send c stretchable-width #t)
-  (instructions p "choice-list-steps.txt")
-  (send f show #t))
-
-(define (combo-frame empty?)
-  (define f (make-frame frame% "Combo Test"))
-  (define p f)
-  (define actual-content (if empty?
-                             null
-                             '("Apple" "Banana")))
-  (define (callback c e) (void))
-  (define c (make-object (class combo-field% 
-                           (define/override (on-popup e)
-                             (printf "Popup!\n"))
-                           (super-new))
-                         "Tester" actual-content p callback))
-  (define counter 0)
-  (define append-with-user-data? #f)
-  (define ab (make-object button%
-			  "Append" p
-			  (lambda (b e)
-			    (set! counter (add1 counter))
-			    (let ([naya (format "~aExtra ~a" 
-						(if (= counter 10)
-						    (string-append
-						     "This is a Really Long Named Item That Would Have Used the Short Name, Yes "
-						     "This is a Really Long Named Item That Would Have Used the Short Name ")
-						    "")
-						counter)]
-				  [naya-data (box 0)])
-			      (set! actual-content (append actual-content (list naya)))
-			      (send c append naya)))))
-  (define asb (make-object button%
-                           "Append Separator" p
-                           (lambda (b e)
-                             (set! counter (add1 counter))
-                             (new separator-menu-item% [parent (send c get-menu)]))))
-  (define cdp (make-object horizontal-panel% p))
-  (define (clear)
-    (for ([i (send (send c get-menu) get-items)])
-      (send i delete)))
-  (define rb (make-object button% "Clear" cdp
-                          (lambda (b e) (clear))))
-  (define (gone l n)
-    (if (zero? n)
-        (cdr l)
-        (cons (car l) (gone (cdr l) (sub1 n)))))
-  (define (delete p)
-    (send (list-ref (send (send c get-menu) get-items) p) delete)
-    (when (<= 0 p (sub1 (length actual-content)))
-      (set! actual-content (gone actual-content p))))
-  (define db (make-object button%
-                          "Delete First" cdp
-                          (lambda (b e)
-                            (unless (null? actual-content)
-                              (delete 0)))))
-  (define dbe (make-object button%
-                           "Delete Last" cdp
-                           (lambda (b e)
-                             (unless (null? actual-content)
-                               (delete (sub1 (length actual-content)))))))
-  (define setb (make-object button%
-                            "Reset" cdp
-                            (lambda (b e)
-                              (clear)
-                              (let ([m (send c get-menu)])
-                                (for ([i '("Alpha" "Beta" "Gamma")])
-                                  (new menu-item% [parent m] [label i]
-                                       [callback (lambda (itm e)
-                                                   (send c set-value
-                                                         (format "~a from Reset" i)))]))))))
-  (define tb (make-object button%
-			  "Check" p
-			  (lambda (b e)
-                            (void))))
-  (send c stretchable-width #t)
-  (instructions p "combo-steps.txt")
-  (send f show #t))
-
-(define (slider-frame style)
-  (define f (make-frame frame% "Slider Test"))
-  (define p (make-object vertical-panel% f))
-  (define old-list null)
-  (define commands (list 'slider))
-  (define s (make-object slider% "Slide Me" -1 11 p
-			 (lambda (sl e)
-			   (check-callback-event s sl e commands #f)
-			   (printf "slid: ~a\n" (send s get-value)))
-			 3
-                         (cons 'horizontal style)))
-  (define c (make-object button% "Check" p
-			 (lambda (c e)
-			   (for-each
-			    (lambda (e)
-			      (check-callback-event s s e commands #t))
-			    old-list)
-			   (printf "All Ok\n"))))
-  (define (simulate v)
-    (let ([e (make-object control-event% 'slider)])
-      (send s set-value v)
-      (send s command e)))
-  (define p2 (make-object horizontal-panel% p))
-  (define p3 (make-object horizontal-panel% p))
-  (send p3 stretchable-height #f)
-  (make-object button%
-	       "Up" p2
-	       (lambda (c e)
-		 (send s set-value (add1 (send s get-value)))))
-  (make-object button%
-	       "Down" p2
-	       (lambda (c e)
-		 (send s set-value (sub1 (send s get-value)))))
-  (make-object button%
-	       "Simulate Up" p2
-	       (lambda (c e)
-		 (simulate (add1 (send s get-value)))))
-  (make-object button%
-	       "Simulate Down" p2
-	       (lambda (c e)
-		 (simulate (sub1 (send s get-value)))))
-  (make-object check-box%
-	       "Disabled" p2
-	       (lambda (c e)
-		 (send s enable (not (send c get-value)))))
-  (instructions p "slider-steps.txt")
-  (send f show #t))
-
-(define (gauge-frame)
-  (define f (make-frame frame% "Gauge Test"))
-  (define p (make-object vertical-panel% f))
-  (define g (make-object gauge% "Tester" 10 p))
-  (define (move d name)
-    (make-object button%
-		 name p
-		 (lambda (c e)
-		   (send g set-value (+ d (send g get-value))))))
-  (define (size d name)
-    (make-object button%
-		 name p
-		 (lambda (c e)
-		   (send g set-range (+ d (send g get-range))))))
-  (move 1 "+")
-  (move -1 "-")
-  (size 1 "Bigger")
-  (size -1 "Smaller")
-  (instructions p "gauge-steps.txt")
-  (send f show #t))
-
-(define (text-frame style)
-  (define (handler get-this)
-    (lambda (c e)
-      (unless (eq? c (get-this))
-	(printf "callback: bad item: ~a\n" c))
-      (let ([t (send e get-event-type)])
-	(cond
-	 [(eq? t 'text-field)
-	  (printf "Changed: ~a\n" (send c get-value))]
-	 [(eq? t 'text-field-enter)
-	  (printf "Return: ~a\n" (send c get-value))]))))
-
-  (define f (make-frame frame% "Text Test"))
-  (define p (make-object vertical-panel% f))
-  (define t1 (make-object text-field% #f p (handler (lambda () t1)) "This should just fit!" style))
-  (define t2 (make-object text-field% "Another" p (handler (lambda () t2)) "This too!" style))
-  (define t3 (make-object text-field% "Catch Returns" p (handler (lambda () t3)) "And, yes, this!"
-			  (cons 'hscroll style)))
-  (send t1 stretchable-width #f)
-  (send t2 stretchable-width #f)
-  (send t3 stretchable-width #f)
-  (send f show #t))
-
-(define (canvas-frame flags)
-  (define f (make-frame frame% "Canvas Test" #f #f 250))
-  (define p (make-object vertical-panel% f))
-  (define c% (class canvas%
-               (init -name -swapped-name p)
-	       (inherit get-dc get-scroll-pos get-scroll-range get-scroll-page
-			get-client-size get-virtual-size get-view-start)
-	       (define name -name)
-               (define swapped-name -swapped-name)
-               (define auto? #f)
-               (define incremental? #f)
-               (define vw 10)
-               (define vh 10)
-	       (public*
-		 [inc-mode (lambda (x) (set! incremental? x))]
-		 [set-vsize (lambda (w h) (set! vw w) (set! vh h))])
-	       (override*
-		[on-paint
-		 (lambda ()
-		   (let ([s (format "V: p: ~s r: ~s g: ~s H: ~s ~s ~s"
-				    (get-scroll-pos 'vertical)
-				    (get-scroll-range 'vertical)
-				    (get-scroll-page 'vertical)
-				    (get-scroll-pos 'horizontal)
-				    (get-scroll-range 'horizontal)
-				    (get-scroll-page 'horizontal))]
-                         [dc (get-dc)])
-		     (let-values ([(w h) (get-client-size)]
-				  [(w2 h2) (get-virtual-size)]
-				  [(x y) (get-view-start)])
-		       ; (send dc set-clipping-region 0 0 w2 h2)
-		       (unless incremental? (send dc clear))
-		       (send dc draw-text (if (send ck-w get-value) swapped-name name) 3 3)
-		       ; (draw-line 3 12 40 12)
-		       (send dc draw-text s 3 15)
-		       (send dc draw-text (format "client: ~s x ~s  virtual: ~s x ~s  view: ~s x ~s" 
-						  w h
-						  w2 h2
-						  x y)
-			     3 27)
-		       (send dc draw-line 0 vh vw vh)
-		       (send dc draw-line vw 0 vw vh))))]
-		[on-event
-		 (lambda (e)
-		   (let ([s (format "~a ~a" (send e get-x) (send e get-y))])
-		     (send f set-status-text s)))]
-		[on-scroll
-		 (lambda (e) 
-		   (when auto? (printf "Hey - on-scroll called for auto scrollbars\n"))
-		   (unless incremental? (on-paint)))]
-		[init-auto-scrollbars (lambda x
-					(set! auto? #t)
-					(super init-auto-scrollbars . x))]
-		[init-manual-scrollbars (lambda x
-					  (set! auto? #f)
-					  (super init-manual-scrollbars . x))])
-               (super-make-object p flags)))
-  (define un-name "Unmanaged scroll")
-  (define m-name "Automanaged scroll")
-  (define c1 (make-object c% un-name m-name p))
-  (define c2 (make-object c% m-name un-name p))
-  (define (reset-scrolls for-small?)
-    (let* ([h? (send ck-h get-value)]
-	   [v? (send ck-v get-value)]
-	   [small? (send ck-s get-value)]
-	   [swap? (send ck-w get-value)])
-      (send c1 set-vsize 10 10)
-      (if swap?
-	  (send c1 init-auto-scrollbars (and h? 10) (and v? 10) .1 .1)
-	  (send c1 init-manual-scrollbars (and h? 10) (and v? 10) 3 3 1 1))
-      ; (send c1 set-scrollbars (and h? 1) (and v? 1) 10 10 3 3 1 1 swap?)
-      (send c2 set-vsize (if small? 50 500) (if small? 20 200))
-      (if swap?
-	  (send c2 init-manual-scrollbars (if small? 2 20) (if small? 2 20) 3 3 1 1)
-	  (send c2 init-auto-scrollbars (and h? (if small? 50 500)) (and v? (if small? 20 200)) .2 .2))
-      ; (send c2 set-scrollbars (and h? 25) (and v? 10) (if small? 2 20) (if small? 2 20) 3 3 1 1 (not swap?))
-      (if for-small?
-	  ; Specifically refresh the bottom canvas
-	  (send c2 refresh)
-	  ; Otherwise, we have to specifically refresh the unmanaged canvas
-	  (send (if swap? c2 c1) refresh))))
-  (define (reset-show)
-    (for-each
-     (lambda (c)
-       (send c show-scrollbars 
-	     (and (not (send sh-h get-value)) (memq 'hscroll flags))
-	     (and (not (send sh-v get-value)) (memq 'vscroll flags))))
-     (list c1 c2)))
-  (define p2 (make-object horizontal-panel% p))
-  (define junk (send p2 stretchable-height #f))
-  (define ck-v (make-object check-box% "Vertical Scroll" p2 (lambda (b e) (reset-scrolls #f))))
-  (define ck-h (make-object check-box% "Horizontal Scroll" p2 (lambda (b e) (reset-scrolls #f))))
-  (define ck-s (make-object check-box% "Small" p2 (lambda (b e) (reset-scrolls #t))))
-  (define ck-w (make-object check-box% "Swap" p2 (lambda (b e) (reset-scrolls #f))))
-  (define p3 (make-object horizontal-panel% p))
-  (define junk2 (send p3 stretchable-height #f))
-  (define sh-v (make-object check-box% "Hide Vertical" p3 (lambda (b e) (reset-show))))
-  (define sh-h (make-object check-box% "Hide Horizontal" p3 (lambda (b e) (reset-show))))
-  (define ip (make-object horizontal-panel% p))
-  (send ip stretchable-height #f)
-  (make-object button%
-	       "Get Instructions" ip
-	       (lambda (b e) (open-file "canvas-steps.txt")))
-  (make-object button%
-	       "&1/5 Scroll" ip
-	       (lambda (b e) (send c2 scroll 0.2 0.2)))
-  (make-object button%
-	       "&4/5 Scroll" ip
-	       (lambda (b e) (send c2 scroll 0.8 0.8)))
-  (make-object check-box%
-	       "Inc" ip
-	       (lambda (c e) 
-		 (send c1 inc-mode (send c get-value))
-		 (send c2 inc-mode (send c get-value))))
-  (make-object check-box%
-	       "x2" ip
-	       (lambda (c e) 
-		 (let ([s (if (send c get-value)
-			      2
-			      1)])
-		   (send (send c2 get-dc) set-scale s s)
-		   (send c2 refresh))))
-  (send c1 set-vsize 10 10)
-  (send c2 set-vsize 500 200)
-  (send f create-status-line)
-  (send f show #t))
-
-(define (no-clear-canvas-frame)
-  (define f (new frame% 
-		 [label "No-Clear Canvas Test"]
-		 [height 250]
-		 [width 300]
-		 [style (add-frame-style null)]))
-  (define p (make-object vertical-panel% f))
-  (define c% (class canvas%
-               (inherit get-dc refresh)
-	       (define delta 0)
-	       (define/override (on-paint)
-		 (let ([red (send the-brush-list find-or-create-brush "RED" 'solid)]
-		       [blue (send the-brush-list find-or-create-brush "BLUE" 'solid)]
-		       [dc (get-dc)])
-		   (let loop ([x 0])
-		     (unless (= x 500)
-		       (send dc set-brush red)
-		       (send dc draw-rectangle (- x delta) 0 25 30)
-		       (send dc draw-rectangle (- x delta) 40 25 390)
-		       (send dc set-brush blue)
-		       (send dc draw-rectangle (- (+ x 25) delta) 0 25 30)
-		       (send dc draw-rectangle (- (+ x 25) delta) 40 25 390)
-		       (loop (+ x 50))))))
-	       (define/override (on-event evt)
-		 (when (send evt dragging?)
-		   (set! delta (modulo (add1 delta) 100))
-		   (refresh)))
-	       (super-new)))
-  (new c% [parent p][style '(border)])
-  (new c% [parent p][style '(transparent)])
-  (new c% [parent p][style '(no-autoclear border)])
-  (send f show #t)
-  f)
-
-(define (editor-frame canvas-style canvas-bg)
-  (define f (new frame% 
-		 [label "No-Clear Canvas Test"]
-		 [height 250]
-		 [width 300]
-		 [style (add-frame-style null)]))
-  (define c (new editor-canvas%
-		 [parent f]
-		 [style canvas-style]))
-  (define mb (make-object menu-bar% f))
-  (define edit-menu (make-object menu% "Edit" mb))
-  (define font-menu (make-object menu% "Font" mb))
-
-  (when canvas-bg
-    (send c set-canvas-background (make-object color% canvas-bg)))
-  (send c set-editor (new text%))
-
-  (append-editor-operation-menu-items edit-menu #f)
-  (append-editor-font-menu-items font-menu)
-
-  (send f show #t))
-
-(define (editor-canvas-oneline-frame)
-  (define f (make-frame frame% "x" #f 200 #f))
-  
-  (define (try flags)
-    (define c (make-object editor-canvas% f #f flags))
-    
-    (define e (make-object text%))
-    
-    (send e insert "Xy!")
-    
-    (send c set-line-count 1)
-    
-    (send c set-editor e)
-    (send c stretchable-height #f))
-
-  (send f show #t)
-  
-  (try '(no-hscroll no-vscroll))
-  (try '(no-vscroll))
-  (try '(no-hscroll))
-  (try '()))
-
-(define (minsize-frame)
-  (define f (make-frame frame% "x"))
-  
-  (define bp (make-object horizontal-panel% f))
-  (define tb (make-object button% "Toggle Stretch" bp
-			  (lambda (b e)
-			    (for-each
-			     (lambda (p)
-			       (send p stretchable-width (not (send p stretchable-width)))
-			       (send p stretchable-height (not (send p stretchable-height))))
-			     containers))))
-  (define ps (make-object button% "Print Sizes" bp
-			  (lambda (b e)
-			    (newline)
-			    (for-each
-			     (lambda (p)
-			       (let ([c (car (send p get-children))])
-				 (let-values ([(w h) (send c get-size)]
-					      [(cw ch) (send c get-client-size)])
-				   (printf "~a: (~a x ~a) client[~a x ~a] diff<~a x ~a> min{~a x ~a}\n"
-					   c w h cw ch
-					   (- w cw) (- h ch)
-					   (send c min-width) (send c min-height)))))
-			     (reverse containers))
-			    (newline))))
-  
-  (define containers null)
-
-  (define (make-container p)
-    (let ([p (make-object vertical-panel% p '())])
-      (send p stretchable-width #f)
-      (send p stretchable-height #f)
-      (set! containers (cons p containers))
-      p))
-  
-  (define hp0 (make-object horizontal-panel% f))
-
-  (define p (make-object panel% (make-container hp0)))
-  (define pb (make-object panel% (make-container hp0) '(border)))
-
-  (define hp1 (make-object horizontal-panel% f))
-
-  (define c (make-object canvas% (make-container hp1)))
-  (define cb (make-object canvas% (make-container hp1) '(border)))
-  (define ch (make-object canvas% (make-container hp1) '(hscroll)))
-  (define cv (make-object canvas% (make-container hp1) '(vscroll)))
-  (define chv (make-object canvas% (make-container hp1) '(hscroll vscroll)))
-  (define cbhv (make-object canvas% (make-container hp1) '(border hscroll vscroll)))
-
-  (define hp2 (make-object horizontal-panel% f))
-
-  (define ec (make-object editor-canvas% (make-container hp2) #f '(no-hscroll no-vscroll)))
-  (define ech (make-object editor-canvas% (make-container hp2) #f '(no-vscroll)))
-  (define ecv (make-object editor-canvas% (make-container hp2) #f '(no-hscroll)))
-  (define echv (make-object editor-canvas% (make-container hp2) #f '()))
-
-  (define hp3 (make-object horizontal-panel% f))
-  
-  (define pec (make-object editor-canvas% (make-container hp3) #f '(no-border no-hscroll no-vscroll)))
-  (define pech (make-object editor-canvas% (make-container hp3) #f '(no-border no-vscroll)))
-  (define pecv (make-object editor-canvas% (make-container hp3) #f '(no-border no-hscroll)))
-  (define pechv (make-object editor-canvas% (make-container hp3) #f '(no-border )))
-
-  (define hp4 (make-object horizontal-panel% f))
-  (define chvh (make-object canvas% (make-container hp4) '(border hscroll vscroll)))
-  (define chvv (make-object canvas% (make-container hp4) '(border hscroll vscroll)))
-  (send chvh show-scrollbars #t #f)
-  (send chvv show-scrollbars #f #t)
-
-  (send f show #t))
-
-;----------------------------------------------------------------------
-
-(define (test-tab-panel no-border?)
-  (define f (make-object frame% "Tabby"))
-  (define p (make-object tab-panel% '("App&le" "B&anana" "Co&conut") 
-			 f
-			 (lambda (p e)
-			   (send m set-label (format "Selected: ~a" (send p get-selection))))
-			 (if no-border?
-			     '(no-border)
-			     '())))
-  (define p2 (if no-border?
-		 (new vertical-panel% [parent f])
-		 p))
-  (define count 3)
-  (define on? #t)
-  (define m (make-object message% (format "Selected: ~a" (send p get-selection)) p2))
-
-  (when no-border?
-    (make-object vertical-pane% p2))
-
-  (make-object button% "Append" p2 (lambda (b e) 
-				    (send p append (format "N&ew ~a" count))
-				    (set! count (add1 count))))
-  (make-object button% "Delete" p2 (lambda (b e)
-				     (send p delete 0)))
-  (make-object button% "First" p2 (lambda (b e)
-				    (send p set-selection 0)))
-  (make-object button% "Last" p2 (lambda (b e)
-				   (send p set-selection (sub1 (send p get-number)))))
-  (make-object button% "Rename" p2 (lambda (b e)
-				     (send p set-item-label (quotient (send p get-number) 2) "Do&nut")))
-  (make-object button% "Labels" p2 (lambda (b e)
-				     (printf "~s\n"
-					     (reverse
-					      (let loop ([i (send p get-number)])
-						(if (zero? i)
-						    null
-						    (cons (send p get-item-label (sub1 i)) (loop (sub1 i)))))))))
-  (make-object button% "Set" p2 (lambda (b e)
-				  (send p set '("New One" "New Second" "New Third"))))
-  (when no-border?
-    (make-object button% "Toggle" p2 (lambda (b e)
-				       (if on?
-					   (send f delete-child p)
-					   (send f change-children
-						 (lambda (l) (cons p l))))
-				       (set! on? (not on?)))))
-
-  (send f show #t))
-
-;----------------------------------------------------------------------
-
-(define (test-modified-frame)
-  (define f (new (class frame% 
-		   (define/override (on-toolbar-button-click)
-		     (send f modified (not (send f modified))))
-		   (super-make-object))
-		 [label "Modifiable"]
-		 [style '(toolbar-button)]))
-
-  (make-object button% "Toggle" f (lambda (b e)
-				    (send f on-toolbar-button-click)))
-  (make-object message% "Mac OS X: toolbar button also toggles" f)
-  (send f show #t))
-
-;----------------------------------------------------------------------
-
-(define (message-boxes parent)
-  (define (check expected got)
-    (unless (eq? expected got)
-      (eprintf "bad result: - expected ~e, got ~e\n" expected got)))
-  (define (big s)
-    (format "~a\n~a\n~a\n~a\n" s
-            (make-string 500 #\x)
-            (make-string 500 #\x)
-            (make-string 500 #\x)))
-
-  (check 'ok (message-box "Title" "Message OK!" parent '(ok)))
-  (check 'ok (message-box "Title" (big "Message OK!") parent '(ok)))
-
-  (check 'cancel (message-box "Title" "Cancel Me" parent '(ok-cancel)))
-  (check 'ok (message-box "Title" "Ok Me" parent '(ok-cancel)))
-  (check 'ok (message-box "Title" (big "Ok Me") parent '(ok-cancel)))
-
-  (check 'yes (message-box "Title" "Yes, please" parent '(yes-no)))
-  (check 'no (message-box "Title" "No, please" parent '(yes-no)))
-
-  (check 'yes (message-box "Title" "Caution sign?" parent '(yes-no caution)))
-  (check 'yes (message-box "Title" "Stop sign?" parent '(yes-no stop)))
-
-  (check 1 (message-box/custom "Title" "Hello"
-				"Hi" #f #f
-				parent
-				'(default=1)))
-  (check 2 (message-box/custom "Title" "Hello"
-			       #f "Howdy" #f
-			       parent))
-  (check 3 (message-box/custom "Title" "Hello (response should be on left for Mac OS)"
-				#f #f "Howdy"
-				parent))
-  (check #f (message-box/custom "Title" "Escape to close, please"
-				 "Hi" #f #f
-				 parent))
-  (check 'closed (message-box/custom "Title" "Escape to close, again, please"
-				     "Hi" #f #f
-				     parent
-				     '(default=1)
-				     'closed))
-  (check 'closed (message-box/custom "Title" "Escape to close, again, please"
-				     #f #f #f
-				     parent
-				     '(default=1)
-				     'closed))
-  (check 1 (message-box/custom "Title" "Try to escape to close"
-				"I can't" #f #f
-				parent
-				'(default=1 disallow-close)
-				'closed))
-
-  (message-box/custom "Title" "Buttons out of order in Mac OS"
-		       "One" "Two" "Three"
-		       parent)
-  (message-box/custom "Title" "Buttons in order on all platforms"
-		       "One" "Two" "Three"
-		       parent
-		       '(default=1 number-order))
-		       
-  )
-
-;----------------------------------------------------------------------
-
-(define (cursors)
-  (define f (make-object frame% "Cursors"))
-  (for-each (lambda (s)
-	      (make-object button%
-			   (format "~a" s)
-			   f
-			   (lambda (b e)
-			     (send f set-cursor (make-object cursor% s)))))
-	    '(arrow bullseye cross hand ibeam watch blank size-n/s size-e/w size-ne/sw size-nw/se))
-  (send f show #t))
-
-;----------------------------------------------------------------------
-
-(define (mouse)
-  (define f (new frame% 
-                 [label "Mouse"]
-                 [width 300]
-                 [height 200]))
-  (define m (new message%
-                 [parent f]
-                 [label ""]
-                 [stretchable-width #t]))
-  (send f show #t)
-  (thread (lambda ()
-            (let loop ()
-              (when (send f is-shown?)
-                (sleep 0.1)
-                (define-values (pos keys) (get-current-mouse-state))
-                (queue-callback
-                 (lambda () (send m set-label
-                                  (format "~a,~a ~a" 
-                                          (send pos get-x)
-                                          (send pos get-y)
-                                          keys))))
-                (loop))))))
-
-;----------------------------------------------------------------------
-
-(define selector (make-frame frame% "Test Selector"))
-(define ap (make-object vertical-panel% selector))
-
-; Test timers while we're at it. And create the "Instructions" button.
-(let ([clockp (make-object horizontal-panel% ap)]
-      [selector selector])
-  (make-object button% "Get Instructions" clockp
-	       (lambda (b e) 
-		 (open-file "frame-steps.txt")))
-  (make-object check-box% "Use Dialogs" clockp
-	       (lambda (c e)
-		 (set! use-dialogs? (send c get-value))))
-  (make-object check-box% "Metal" clockp
-	       (lambda (c e)
-		 (set! use-metal? (send c get-value))))
-  (make-object check-box% "Float" clockp
-	       (lambda (c e)
-		 (set! float-frame? (send c get-value))))
-  (make-object check-box% "No Title" clockp
-	       (lambda (c e)
-		 (set! no-caption? (send c get-value))))
-  (make-object vertical-panel% clockp) ; filler
-  (let ([time (make-object message% "XX:XX:XX" clockp)])
-    (make-object
-     (class timer%
-       (inherit start)
-       (override*
-	 [notify
-	  (lambda ()
-	    (let* ([now (seconds->date (current-seconds))]
-		   [pad (lambda (pc d)
-			  (let ([s (number->string d)])
-			    (if (= 1 (string-length s))
-				(string-append pc s)
-				s)))]
-		   [s (format "~a:~a:~a"
-			      (pad " " (let ([h (modulo (date-hour now) 12)])
-					 (if (zero? h)
-					     12
-					     h)))
-			      (pad "0" (date-minute now))
-			      (pad "0" (date-second now)))])
-	      (send time set-label s)
-	      (when (send selector is-shown?)
-		(start 1000 #t))))])
-       (super-make-object)
-       (start 1000 #t)))))
-
-(define bp0 (make-object vertical-panel% ap '(border)))
-(define bp1 (make-object horizontal-panel% bp0))
-(define bp2 (make-object horizontal-pane% bp0))
-(define mp (make-object vertical-panel% ap '(border)))
-(define mp1 (make-object horizontal-panel% mp))
-(define mp2 (make-object horizontal-pane% mp))
-
-(define pp (make-object horizontal-pane% ap))
-(send bp0 stretchable-height #f)
-(make-object button% "Make Menus Frame" pp (lambda (b e) (menu-frame)))
-(make-object horizontal-pane% pp)
-(make-object button% "Make Panel Frame" pp (lambda (b e) (panel-frame)))
-(make-object horizontal-pane% pp)
-(make-object button% "Editor Canvas One-liners" pp (lambda (b e) (editor-canvas-oneline-frame)))
-(make-object horizontal-pane% pp)
-(make-object button% "Minsize Windows" pp (lambda (b e) (minsize-frame)))
-(define bp (make-object horizontal-pane% ap))
-(send bp stretchable-width #f)
-(make-object button% "Make Button Frame" bp (lambda (b e) (button-frame frame% null)))
-(make-object button% "Make Default Button Frame" bp (lambda (b e) (button-frame frame% '(border))))
-(make-object button% "Make Button Dialog" bp (lambda (b e) (button-frame dialog% null)))
-(make-object button% "Make Image Buttons" bp (lambda (b e) (image-button-frame)))
-(define crp (make-object horizontal-pane% ap))
-(send crp stretchable-height #f)
-(make-object button% "Make Checkbox Frame" crp (lambda (b e) (checkbox-frame)))
-(make-object vertical-pane% crp) ; filler
-(make-object button% "Message Boxes" crp (lambda (b e) (message-boxes #f)))
-(make-object vertical-pane% crp) ; filler
-(make-object button% "Cursors" crp (lambda (b e) (cursors)))
-(make-object vertical-pane% crp) ; filler
-(make-object button% "Mouse" crp (lambda (b e) (mouse)))
-(make-object vertical-pane% crp) ; filler
-(make-object button% "Make Radiobox Frame" crp (lambda (b e) (radiobox-frame)))
-(define cp (make-object horizontal-pane% ap))
-(send cp stretchable-width #f)
-(make-object button% "Make Choice Frame" cp (lambda (b e) (choice-or-list-frame #f null #f)))
-(make-object button% "Make Empty Choice Frame" cp (lambda (b e) (choice-or-list-frame #f null #t)))
-(make-object button% "Make Combo Frame" cp (lambda (b e) (combo-frame #f)))
-(make-object button% "Make Empty Combo Frame" cp (lambda (b e) (combo-frame #t)))
-(define lcp (make-object horizontal-pane% ap))
-(send lcp stretchable-width #f)
-(define list-columns-choice (new choice% 
-                                 [parent lcp]
-                                 [label "List Type"]
-                                 [choices '("Single Column"
-                                            "Multiple Columns")]))
-(define (get-columns) (if (zero? (send list-columns-choice get-selection))
-                          '("Column")
-                          '("Main Entry" "Extra" "Final")))
-(define list-headers-choice (new check-box%
-                                 [parent lcp]
-                                 [label "Show Columns"]))
-(define (get-headers) (if (send list-headers-choice get-value)
-                          '(column-headers clickable-headers reorderable-headers variable-columns)
-                          '()))
-(define list-order-choice (new check-box%
-                               [parent lcp]
-                               [label "Swap Last Two"]))
-(define (get-order) (if (and (positive? (send list-columns-choice get-selection))
-                             (send list-order-choice get-value))
-                        '(0 2 1)
-                        #f))
-(define lp (make-object horizontal-pane% ap))
-(send lp stretchable-width #f)
-(make-object button% "Make List Frame" lp 
-             (lambda (b e) (choice-or-list-frame #t '(single) #f (get-columns) (get-headers) (get-order))))
-(make-object button% "Make Empty List Frame" lp 
-             (lambda (b e) (choice-or-list-frame #t '(single) #t (get-columns) (get-headers) (get-order))))
-(make-object button% "Make MultiList Frame" lp 
-             (lambda (b e) (choice-or-list-frame #t '(multiple) #f (get-columns) (get-headers) (get-order))))
-(make-object button% "Make MultiExtendList Frame" lp 
-             (lambda (b e) (choice-or-list-frame #t '(extended) #f (get-columns) (get-headers) (get-order))))
-(define gsp (make-object horizontal-pane% ap))
-(send gsp stretchable-height #f)
-(make-object button% "Make Gauge Frame" gsp (lambda (b e) (gauge-frame)))
-(make-object vertical-pane% gsp) ; filler
-(make-object button% "Make Slider Frame" gsp (lambda (b e) (slider-frame null)))
-(make-object button% "Make Plain Slider Frame" gsp (lambda (b e) (slider-frame '(plain))))
-(make-object vertical-pane% gsp) ; filler
-(make-object button% "Make Tab Panel" gsp (lambda (b e) (test-tab-panel #f)))
-(make-object button% "Make Tabs" gsp (lambda (b e) (test-tab-panel #t)))
-
-(define tp (make-object horizontal-pane% ap))
-(send tp stretchable-width #f)
-(make-object button% "Make Text Frame" tp (lambda (b e) (text-frame '(single))))
-(make-object button% "Make Multitext Frame" tp (lambda (b e) (text-frame '(multiple))))
-(make-object vertical-pane% tp) ; filler
-(make-object button% "Make Modified Frame" tp (lambda (b e) (test-modified-frame)))
-
-(define cnp (make-object horizontal-pane% ap))
-(send cnp stretchable-width #t)
-(send cnp set-alignment 'right 'center)
-(let ([mkf (lambda (flags name)
-	     (make-object button%
-			  (format "Make ~aCanvas Frame" name) cnp 
-			  (lambda (b e) (canvas-frame flags))))])
-  (mkf '(hscroll vscroll) "HV")
-  (mkf '(hscroll) "H")
-  (mkf '(vscroll) "V")
-  (mkf null "")
-  (make-object grow-box-spacer-pane% cnp))
-(make-object button%
-	     "Make No-Clear Canvas" cnp 
-	     (lambda (b e) (no-clear-canvas-frame)))
-
-(define edp (new horizontal-pane% 
-		 [parent ap]
-		 [alignment '(center center)]))
-(make-object button%
-	     "Make Editor" edp 
-	     (lambda (b e) (editor-frame null #f)))
-(make-object button%
-	     "Make Transparent Editor" edp 
-	     (lambda (b e) (editor-frame '(transparent) #f)))
-(make-object button%
-	     "Make Blue Editor" edp 
-	     (lambda (b e) (editor-frame null "blue")))
-(new horizontal-panel% [parent edp])
-(make-object button%
-	     "Warp Pointer" edp 
-	     (lambda (b e)
-               (send selector warp-pointer 5 5)))
-(let* ([w (send gc-bmp get-width)]
-       [h (send gc-bmp get-height)]
-       [c (new (class canvas%
-                 (super-new)
-                 (define/override (on-event e)
-                   (when (send e button-down?)
-                     (collect-garbage))))
-               [parent edp]
-               [stretchable-width #f]
-               [stretchable-height #f]
-               [vert-margin 2]
-               [horiz-margin 2]
-               [min-width w]
-               [min-height h])])
-  (register-collecting-blit c
-                            0 0 (send gc-bmp get-width) (send gc-bmp get-height)
-                            gc-bmp (make-bitmap w h #f)))
-  
-              
-
-(define (choose-next radios)
-  (let loop ([l radios])
-    (let* ([c (car l)]
-	   [rest (cdr l)]
-	   [n (send c get-number)]
-	   [v (send c get-selection)])
-      (if (< v (sub1 n))
-	  (send c set-selection (add1 v))
-	  (if (null? rest)
-	      (map (lambda (c) (send c set-selection 0)) radios)
-	      (begin
-		(send c set-selection 0)
-		(loop rest)))))))
-
-(define make-next-button
-  (lambda (p l)
-    (make-object button%
-		 "Next Configuration" p
-		 (lambda (b e) (choose-next l)))))
-
-(define make-selector-and-runner
-  (lambda (p1 p2 radios? msg? size maker)
-    (define (make-radio-box lbl choices panel cb)
-      (let ([g (instantiate group-box-panel% (lbl panel))])
-	(if (= (length choices) 2)
-	    (make-object radio-box% #f choices g cb)
-	    (make-object choice% #f choices g cb))))
-    (define radio-h-radio
-      (make-radio-box 
-       (if radios? "Radio Box Orientation" "Slider Style")
-       (if radios? '("Vertical" "Horizontal") '("Numbers" "Plain"))
-       p1 void))
-    (define label-h-radio
-      (make-radio-box "Label Orientation" '("Vertical" "Horizontal")
-		      p1 void))
-    (define label-null-radio
-      (make-radio-box "Optional Labels" '("Use Label" "No Label")
-		      p1 void))
-    (define stretchy-radio
-      (make-radio-box "Stretchiness" '("Normal" "All Stretchy")
-		      p1 void))
-    (define font-radio
-      (make-radio-box "Label Font" '("Normal" "Small" "Tiny" "Big" "Italic")
-		      p1 void))
-    (define enabled-radio
-      (make-radio-box "Initially" '("Enabled" "Disabled")
-		      p1 void))
-    (define selection-radio
-      (make-radio-box "Selection" '("Default" "Alternate")
-		      p1 void))
-    (define next-button
-      (make-next-button p2 (list radio-h-radio label-h-radio label-null-radio 
-				 stretchy-radio font-radio
-				 enabled-radio selection-radio)))
-    (define go-button
-      (make-object button% (format "Make ~a Frame" size) p2
-		   (lambda (b e)
-		     (maker
-		      (positive? (send radio-h-radio get-selection))
-		      (positive? (send label-h-radio get-selection))
-		      (positive? (send label-null-radio get-selection))
-		      (positive? (send stretchy-radio get-selection))
-		      (list-ref (list #f
-				      small-control-font
-				      tiny-control-font
-				      special-font
-                                      italic-font)
-				(send font-radio get-selection))
-		      (positive? (send enabled-radio get-selection))
-		      (positive? (send selection-radio get-selection))
-                      (and message-auto
-                           (send message-auto get-value))
-                      (append
-                       (case (send panel-h-mode get-selection)
-                         [(0) '()]
-                         [(1) '(hscroll)]
-                         [(2) '(auto-hscroll)])
-                       (case (send panel-v-mode get-selection)
-                         [(0) '()]
-                         [(1) '(vscroll)]
-                         [(2) '(auto-vscroll)]))))))
-
-    (define message-auto
-      (and msg?
-           (new check-box% 
-                [parent p2]
-                [label "Auto-Size Message"])))
-
-    (define panel-h-mode
-      (new choice% 
-           [parent p2]
-           [label "Panels"]
-           [choices '("No HScroll" "HScroll" "Auto HScroll")]))
-    (define panel-v-mode
-      (new choice% 
-           [parent p2]
-           [label "Panels"]
-           [choices '("No VScroll" "VScroll" "Auto VScroll")]))
-    
-    #t))
-
-(make-selector-and-runner bp1 bp2 #t #t "Big" big-frame)
-(make-selector-and-runner mp1 mp2 #f #f "Medium" med-frame)
-
-(send selector show #t)
-
-;; For test mode, check that we can at least start,
-;; but exit right away:
-(module+ test 
-  (queue-callback (lambda () (exit)) #f))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/load-handler.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/load-handler.rkt
deleted file mode 100644
index 2f50e74362..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/load-handler.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket
-(require racket/gui/init
-         tests/racket/load-handler)
-
-(try-load-handler-now)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/loadtest.rktl b/pkgs/gui-pkgs/gui-test/tests/gracket/loadtest.rktl
deleted file mode 100644
index 698e61e065..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/loadtest.rktl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-(unless (with-handlers ([exn:fail? (lambda (x) #f)])
-	  (namespace-variable-binding 'SECTION)
-	  #t)
-  (load-relative "testing.rktl"))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/media3.mre b/pkgs/gui-pkgs/gui-test/tests/gracket/media3.mre
deleted file mode 100644
index 00a6badbe3..0000000000
Binary files a/pkgs/gui-pkgs/gui-test/tests/gracket/media3.mre and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/media6.mre b/pkgs/gui-pkgs/gui-test/tests/gracket/media6.mre
deleted file mode 100644
index 5712a022a1..0000000000
Binary files a/pkgs/gui-pkgs/gui-test/tests/gracket/media6.mre and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/media8.mre b/pkgs/gui-pkgs/gui-test/tests/gracket/media8.mre
deleted file mode 100644
index 76fe9f4075..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/media8.mre
+++ /dev/null
@@ -1,137 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket, or DrScheme version 4 or later
-   to read it.
-
-            http://racket-lang.org/
-|#
- 4 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wxmedia\0"
-4 1 8 #"wximage\0"
-2 0 1 6 #"wxloc\0"
-00000000000 1 19 0 9 #"Standard\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 0 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 1 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 1 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1 1 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 255 255 0 1 1 1 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 1 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 1 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 93 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 #"\0"
-0 70 1 #"\0"
-1 0 92 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 #"\0"
-0 70 1 #"\0"
-2 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 #"\0"
-0 70 1 #"\0"
-1 -2 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 #"\0"
-0 71 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 #"\0"
-0 72 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 #"\0"
-0 73 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 #"\0"
-0 74 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 #"\0"
-0 75 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 2 1 00000000002
-0 00000000000 2 00000000000 40 0 1 3 44
-#"This is a line of plain text (default font)."
-0 0 1 29 1 #"\n"
-0 2 1 1 1 5 5 5 5 1 1 1 1 -1 -1 -1 -1 0 0 0 00000000000 2 3 0 9
-#"Standard\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 0 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 00000000000
-1 0 1 3 38 #"This is a line of plain text in a box."
-0 00000000000 0 0 1 29 1 #"\n"
-0 2 1 1 1 5 5 5 5 1 1 1 1 -1 -1 -1 -1 0 0 0 00000000000 3 3 0 9
-#"Standard\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 0 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 00000000000
-1 2 1 1 1 5 5 5 5 1 1 1 1 -1 -1 -1 -1 0 0 0 00000000000 4 3 0 9
-#"Standard\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 0 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 00000000000
-1 0 1 3 35 #"The boxes just keep getting deeper."
-0 00000000000 0 00000000000 0 0 1 29 1 #"\n"
-0 0 3 3 18 #"This is blue text."
-0 0 1 29 1 #"\n"
-0 0 4 3 12 #"This is red."
-0 0 1 29 1 #"\n"
-0 0 5 3 29 #"This has a yellow background."
-0 0 1 29 1 #"\n"
-0 0 7 3 34 #"Top aligned (compared to the box)."
-0 2 1 1 1 5 5 5 5 1 1 1 1 -1 -1 -1 -1 0 0 0 00000000000 5 5 0 9
-#"Standard\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 0 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 1 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 1 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1
-00000000000 5 0 3 3 4 #"Blue"
-0 0 1 29 1 #"\n"
-0 0 4 3 3 #"Red"
-0 0 4 29 1 #"\n"
-0 2 4 1 1 5 5 5 5 1 1 1 1 -1 -1 -1 -1 0 0 0 00000000000 6 4 0 9
-#"Standard\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 0 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 1 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 60 248 52 0 0 0 1 1
-00000000000 2 0 3 3 5 #"Green"
-0 0 3 3 7 #" in red"
-0 00000000000 0 00000000000 0 0 1 3 16 #" Bottom aligned."
-0 0 18 3 9 #"Centered."
-0 0 7 29 1 #"\n"
-0 0 10 3 5 #"Bold."
-0 0 7 3 1 #" "
-0 0 9 3 7 #"Italic."
-0 0 7 3 1 #" "
-0 0 8 3 1 #"U"
-0 0 8 3 10 #"nderlined."
-0 0 7 3 7 #" Plain."
-0 0 7 29 1 #"\n"
-0 0 11 3 11 #"Twice as bi"
-0 0 11 3 2 #"g!"
-0 0 7 29 1 #"\n"
-0 0 12 3 19 #"(2 points smaller.)"
-0 0 7 29 1 #"\n"
-0 0 13 3 11 #"Decorative."
-0 0 7 3 1 #" "
-0 0 14 3 6 #"Roman."
-0 0 7 3 1 #" "
-0 0 15 3 7 #"Script."
-0 0 7 3 1 #" "
-0 0 16 3 6 #"Swiss."
-0 0 7 3 1 #" "
-0 0 17 3 6 #"Fixed."
-0 0 7 29 1 #"\n"
-0 00000000000
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/mediastream.example b/pkgs/gui-pkgs/gui-test/tests/gracket/mediastream.example
deleted file mode 100644
index 2cfe56f557..0000000000
Binary files a/pkgs/gui-pkgs/gui-test/tests/gracket/mediastream.example and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/mem.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/mem.rkt
deleted file mode 100644
index 73538189ea..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/mem.rkt
+++ /dev/null
@@ -1,283 +0,0 @@
-#lang racket/gui
-
-(define source-dir (current-load-relative-directory))
-
-(define num-times 10)
-(define num-threads 3)
-
-(define dump-stats? #f)
-
-(define edit? #t)
-(define insert? #t)
-(define load-file? #f) ; adds a lot of messy objects
-
-(define menus? #t)
-(define atomic? #t)
-(define offscreen? #t)
-(define frame? #t)
-
-(define subwindows? #t)
-
-(define allocated '())
-(define (remember tag v)
-  (set! allocated
-        (cons (cons tag (make-weak-box v))
-              allocated))
-  v)
-
-(define sub-collect-frame
-  (and subwindows?
-       (make-object frame% "sub-collect")))
-(define sub-collect-panel
-  (and subwindows?
-       (make-object panel% sub-collect-frame)))
-
-(define permanent-ready? #f)
-(define mb-lock (make-semaphore 1))
-
-(define htw (make-weak-hasheq))
-
-(send sub-collect-frame show #t)
-
-(define (get-panel% n)
-  (case (modulo n 3)
-    [(0) panel%]
-    [(1) vertical-panel%]
-    [(2) horizontal-panel%]))
-
-(define (get-pane% n)
-  (case (modulo n 6)
-    [(0) pane%]
-    [(1) vertical-pane%]
-    [(2) horizontal-pane%]
-    [else (get-panel% n)]))
-
-(define (get-image n)
-  (collection-file-path
-   (case (modulo n 4)
-     [(0) "mini-plt.xpm"]
-     [(1) "lock.gif"]
-     [(2) "help.bmp"]
-     [(3) "return.xbm"])
-   "icons"))
-
-(define (maker id n)
-  (sleep)
-  (collect-garbage)
-  (collect-garbage)
-  (printf "Thread: ~s Cycle: ~s\n" id n)
-  ; (dump-object-stats)
-  ; (if (and dump-stats? (= id 1))
-  ;    (dump-memory-stats))
-  (unless (zero? n)
-    (let ([tag (cons id n)])
-      (let* ([edit (remember tag (make-object text%))]
-             [ef (let ([f (make-object frame% "Editor Frame")])
-                   (send (make-object editor-canvas% f) set-editor edit)
-                   (remember tag f))]
-             [c (make-custodian)]
-             [es (parameterize ([current-custodian c])
-                   (make-eventspace))])
-
-        (when edit?
-          (send ef show #t)
-          (sleep 0.1))
-
-        (parameterize ([current-eventspace es])
-          (send (remember 
-                 tag
-                 (make-object
-                  (class timer%
-                    (init-rest args)
-                    (override* [notify (lambda () (void))])
-                    (apply super-make-object args))))
-                start 100))
-
-        (when frame?
-            (let* ([f (remember tag
-                       (make-object (if (even? n)
-                                       frame% 
-                                       dialog%)
-                                   "Tester" #f 200 200))]
-                   [cb (lambda (x y) f)]
-                   [p (remember tag (make-object (get-pane% n) f))])
-              (remember tag (make-object canvas% f))
-              (when (zero? (modulo n 3))
-                (thread (lambda () (send f show #t)))
-                (let loop () (sleep) (unless (send f is-shown?) (loop))))
-              (remember tag (make-object button% "one" p cb))
-              (let ([class check-box%])
-                (let loop ([m 10])
-                  (unless (zero? m)
-                    (remember (cons tag m)
-                              (make-object class "another" p cb))
-                    (loop (sub1 m)))))
-              (remember tag (make-object check-box% "check" p cb))
-              (remember tag (make-object choice% "choice" '("a" "b" "c") p cb))
-              (remember tag (make-object list-box% "list" '("apple" "banana" "coconut")
-                                         p cb))
-              (remember tag (make-object button% "two" p cb))
-              (send f show #f)))
-
-        (when subwindows?
-            (let ([p (make-object (get-panel% n) sub-collect-frame)]
-                  [cv (make-object canvas% sub-collect-frame)]
-                  [add-objects
-                   (lambda (p tag hide?)
-                     (let ([b (let* ([x #f]
-                                     [bcb (lambda (a b) x)])
-                                (set! x (make-object button% "one" p bcb))
-                                x)]
-                           [c (make-object check-box% "check" p void)]
-                           [co (make-object choice% "choice" '("a" "b" "c") p void)]
-                           [cv (make-object canvas% p)]
-                           [lb (make-object list-box% "list" '("apple" "banana" "coconut") p void)])
-                       (when hide?
-                         (send p delete-child b)
-                         (send p delete-child c)
-                         (send p delete-child cv)
-                         (send p delete-child co)
-                         (send p delete-child lb))
-                       (remember tag b)
-                       (remember tag c)
-                       (remember tag cv)
-                       (remember tag co)
-                       (remember tag lb)))])
-              (add-objects sub-collect-panel (cons 'sc1 tag) #t)
-              (add-objects p (cons 'sc2 tag) #f)
-              (remember (cons 'sc0 tag) p)
-              (remember (cons 'sc0 tag) cv)
-              (send sub-collect-frame delete-child p)
-              (send sub-collect-frame delete-child cv)))
-
-        (when (and edit? insert?)
-            (let ([e edit])
-              (send e begin-edit-sequence)
-              (when load-file?
-                (send e load-file (build-path source-dir "mem.rkt")))
-              (let loop ([i 20])
-                (send e insert (number->string i))
-                (unless (zero? i)
-                  (loop (sub1 i))))
-              (let ([s (make-object editor-snip%)])
-                (send (send s get-editor) insert "Hello!")
-                (send e insert s))
-              (send e insert #\newline)
-              (send e insert "done")
-              (send e set-modified #f)
-              (send e end-edit-sequence)))
-        
-        (when menus?
-          (let ([f (remember tag (make-object frame% "MB Frame 0"))])
-            (remember tag (make-object menu% "TM1" (remember (cons 'q tag) (make-object menu-bar% f)))))
-          (let* ([mb (remember tag (make-object menu-bar% ef))]
-                 [m (remember tag (make-object menu% "Ok" mb))])
-            (remember tag (make-object menu-item% "Hi" m void))
-            (remember tag (make-object menu-item% "There" m void #\t))
-            (remember tag
-                      (make-object checkable-menu-item%
-                                   "Checkable"
-                                   (remember tag (make-object menu% "Hello" m))
-                                   void))
-            (let ([i (remember tag (make-object menu-item% "Delete Me" m void))])
-              (send i delete)))
-
-          (when subwindows?
-            (unless permanent-ready?
-              (semaphore-wait mb-lock)
-              (unless (send sub-collect-frame get-menu-bar)
-                (let ([mb (make-object menu-bar% sub-collect-frame)])
-                  (make-object menu% "Permanent" mb)))
-              (set! permanent-ready? #t)
-              (semaphore-post mb-lock))
-            (let* ([mb (send sub-collect-frame get-menu-bar)]
-                   [mm (car (send mb get-items))])
-              (send (remember (cons 'm tag) (make-object menu-item% "Delete Me" mm void)) delete)
-              (let ([m (remember tag (make-object menu% "Temporary" mb))])
-                (remember (cons 't tag) (make-object menu-item% "Temp Hi" m void))
-                (send m delete)))))
-
-        (when atomic?
-          (let loop ([m 8])
-            (unless (zero? m)
-              (remember (cons tag m) (make-object point% n m))
-              (let ([br (make-object brush%)])
-                (remember (cons tag m) br)
-                (hash-set! htw br 'ok))
-              (remember (cons tag m) (make-object pen%))
-              (loop (sub1 m)))))
-        
-        (when offscreen?
-          (let ([m (remember tag (make-object bitmap-dc%))]
-                [b0 (remember (cons tag 'f) (make-object bitmap% (get-image n)))]
-                [b (remember (cons tag 'u) (make-object bitmap% 100 100))]
-                [b2 (remember (cons tag 'x) (make-object bitmap% 100 100))])
-            (unless (send b0 ok?)
-              (error "bitmap load error"))
-            (send m set-bitmap b)))
-        
-        (when edit?
-          (send ef show #f))
-        
-        (custodian-shutdown-all c)
-
-        (collect-garbage)
-
-        (maker id (sub1 n))))))
-
-(define (still)
-  (map (lambda (x)
-         (let ([v (weak-box-value (cdr x))])
-           (when v
-             (printf "~s ~s\n" (car x) v))))
-       allocated)
-  (void))
-
-(define (xthread f)
-  (f))
-
-(define (stw t n)
-  '(thread-weight t (floor (/ (thread-weight t) n))))
-
-(define (breakable t)
-  (if #f
-      (thread (lambda ()
-                (read)
-                (printf "breaking\n")
-                (break-thread t)
-                (thread-wait t)
-                (printf "done\n")))
-      (void)))
-
-(define (do-test)
-  (let ([sema (make-semaphore)])
-    (let loop ([n num-threads])
-      (unless (zero? n)
-        (breakable
-         (thread (lambda () 
-                   (stw (current-thread) n)
-                   (dynamic-wind
-                    void
-                    (lambda () (maker n num-times))
-                    (lambda () (semaphore-post sema))))))
-        (loop (sub1 n))))
-    (let loop ([n num-threads])
-      (unless (zero? n)
-        (yield sema)
-        (loop (sub1 n)))))
-
-  (collect-garbage)
-  (collect-garbage)
-  (let loop ([n 100]) 
-    (if (zero? n) 0 (sub1 (loop (sub1 n)))))
-  (collect-garbage)
-  (collect-garbage)
-  (still)
-  (when subwindows?
-    (set! sub-collect-frame #f)
-    (set! sub-collect-panel #f))
-  (when dump-stats?
-    (dump-memory-stats)
-    (still)))
-
-(do-test)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/menu-steps.txt b/pkgs/gui-pkgs/gui-test/tests/gracket/menu-steps.txt
deleted file mode 100644
index 42bee5eefb..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/menu-steps.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-Instructions:
- Initial Setup:
-  - Second menu is enabled "Apple"
-  Delete Apple
-  Add Apple - apple menu appears
-  Delete Tester (button)
-  Delete First Menu (button) - empty menu bar
-  Add Tester (button)
-  Add Apple
-  Delete Tester
-  Add Tester - tester now the second menu
-  Delete Apple - only tester left
-
- Menu Inserting & Deleting:
-  Add Apple - apple menu appears
-  Add Banana - banana menu appears
-  Delete Apple (from apple menu) - apple menu goes, banana menu still there
-  Delete Banana - back to starting point
-  Add Apple
-  Add Banana
-  Delete Banana - apple still there
-  Delete Apple
-  Add Apple
-  Add Coconut - coconut submenu appears
-  Delete Coconut (from sub-menu) - coconut submenu gone
-  Delete Apple
-  Add Coconut
-  Add Apple - apple menu appears with coconut already
-  Delete Apple
-  Delete Coconut
-  Add Apple - apple menu appears without coconut
-
- Menu Enabling:
-  Disable Second - apple menu gray & unselectable
-  Enable Second - back to normal
-  Disable Second
-  Delete Apple (from tester menu)
-  Add Apple - still gray
-  Enable Second
-
- Item Enabling:
-  Disable Apple Once Item -> once item grayed & unselectable
-  Un-Disable Apple Once Item -> once item normal
-  Disable Apple Once Item
-  Delete Apple
-  Add Apple -> once item still gray
-  Un-Disable Apple Once Item
-  Delete Apple
-  Disable Apple Once Item
-  Add Apple -> once item gray again
-  Un-Disable Apple Once Item
-  
- Item Inserting & Deleting:
-  Append Donut - donut item added
-  Delete Once - once item disappears
-  Delete Apple
-  Add Apple - once item still gone
-  Append Donut - another donut
-  Delete Apple
-  Append Donut
-  Add Apple - three donuts total
-
- Emptying a Menu
-  Add Banana
-  Delete First Banana Item (in Banana Menu) - one left
-  Delete First Banana Item - none left
-  Add Delete Banana - one item again
-  Add Delete Banana - still one item
-  Delete Banana
-
- Checkable Items & Insertions:
-  Test Apple Item -> "no"
-  Apple | Checkable - on
-  Test Apple Item -> "yes"
-  Delete Apple
-  Test Apple Item -> "yes"
-  Add Apple
-  Apple | Checkable - off
-  Test Apple Item -> "no"
-  Delete Apple
-  Test Apple Item -> "no"
-  Check in Apple (Button)
-  Test Apple Item -> "yes"
-  Add Apple
-  Apple | Checkable - off
-  Check in Apple (Button) - check is on
-  Test Apple Item -> "yes"
-  Apple | Checkable - off
-  Delete Apple
-
- Labels (Apple & Banana currently deleted):
-  Add Coconut - (coconut item needed for the rest)
-  Test Labels - "ok" in console
-  Find Labels - "ok" in console
-  Toggle Labels - "Tester" -> "Hi", "Add Apple" -> "Apple Adder"
-  Add Apple - check that "Delete Apple" -> "Apple Deleter"
-  Delete Apple
-  Test Labels - "ok" in console
-  Find Labels - "ok" in console
-  Toggle Labels - original labels
-  Add Apple - check for original labels
-  Toggle Labels - "Delete Apple" -> "Apple Deleter"
-  Toggle Labels
-  Delete Apple
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/nruter.xbm b/pkgs/gui-pkgs/gui-test/tests/gracket/nruter.xbm
deleted file mode 100644
index 9e74923da0..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/nruter.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define nruter_width 6
-#define nruter_height 9
-static char nruter_bits[] = {
- 0x1e,0x1f,0x03,0x03,0x27,0x3e,0x3c,0x3c,0x3e};
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/paramz.rktl b/pkgs/gui-pkgs/gui-test/tests/gracket/paramz.rktl
deleted file mode 100644
index d9a22186a3..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/paramz.rktl
+++ /dev/null
@@ -1,129 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                             Yield Tests                                    ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define s (make-semaphore))
-(define v 4)
-(queue-callback (lambda () (set! v 5)))
-(yield)
-(test v 'yield-run 5)
-(queue-callback (lambda () (set! v 6)))
-
-(semaphore-post s)
-(yield s)
-(test v 'yield-wait 5)
-(yield)
-(test v 'yield-run 6)
-
-(queue-callback (lambda () (set! v 7) (semaphore-post s)))
-(yield s)
-(test v 'yield-run-post 7)
-
-(queue-callback (lambda () 
-		  (set! v 8)
-		  (semaphore-post s)
-		  (queue-callback
-		   (lambda () (set! v 9)))))
-(yield s)
-(test v 'yield-wait-post 8)
-(yield)
-(test v 'yield-run 9)
-
-(define d (make-object dialog% "hello"))
-(thread (lambda () 
-	  (sync (system-idle-evt))
-	  (queue-callback (lambda () (set! v 11)))
-	  (send d show #f)))
-(queue-callback (lambda () (set! v 10)))
-(send d show #t)
-(test v 'dialog-wait 10)
-(yield)
-(test v 'dialog-run 11)
-
-(define d (make-object dialog% "Hello"))
-(let ([t (thread (lambda ()
-		   (send d show #t)))])
-  (let loop () (unless (send d is-shown?) (loop)))
-  (st #t d is-shown?)
-  (thread-suspend t)
-  (stv d show #f)
-  (st #f d is-shown?)
-  (thread-resume t)
-  (thread-wait t)
-  (st #f d is-shown?)
-
-  (let ([t (thread (lambda ()
-                     (send d show #t)))])
-    (let loop () (unless (send d is-shown?) (sleep) (loop)))
-    (st #t d is-shown?)
-    (thread-suspend t)
-    (stv d show #f)
-    (st #f d is-shown?)
-    (let ([t2 (thread (lambda () (send d show #t)))])
-      (yield (system-idle-evt))
-      (st #t d is-shown?)
-      (thread-resume t)
-      (yield (system-idle-evt))
-      (st #t d is-shown?)
-      (test #t 'thread2 (thread-running? t2))
-      (stv d show #f)
-      (thread-wait t)
-      (thread-wait t2)
-      (st #f d is-shown?))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                        Parameterization Tests                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Killing an eventspace
-(define c (make-custodian))
-(define e (parameterize ([current-custodian c]) (make-eventspace)))
-(define tmr (parameterize ([current-eventspace e]) 
-	      (new timer% [notify-callback void])))
-(parameterize ([current-eventspace e]) (send (make-object frame% "x" #f 50 50) show #t))
-(test #f 'shutdown? (eventspace-shutdown? e))
-(custodian-shutdown-all c)
-(test #t 'shutdown? (eventspace-shutdown? e))
-(define (try-use-es t)
-  (test
-   'error
-   'shutdown-eventspace
-   (with-handlers ([(lambda (x)
-		      (and (exn:fail? x)
-			   (regexp-match "shutdown" (exn-message x))))
-		    (lambda (x)
-		      (printf "got expected error: ~a\n" (exn-message x))
-		      'error)])
-     (parameterize ([current-eventspace e]) 
-       (t)))))
-(try-use-es (lambda () (make-object frame% "x" #f 50 50)))
-(try-use-es (lambda () (make-object dialog% "x" #f 50 50)))
-(try-use-es (lambda () (make-object timer%)))
-(try-use-es (lambda () (queue-callback void)))
-(try-use-es (lambda () (send tmr start 100 #t)))
-
-;; ----------------------------------------
-;;  Check that breaking an eventspace thread doesn't kill it:
-
-(let ()
-  (define o (open-output-bytes))
-  (define evtsp (parameterize ([current-error-port o])
-                  (make-eventspace)))
-  (define evtth (eventspace-handler-thread evtsp))
-  
-  (sleep 0.1)
-  (break-thread evtth)
-
-  (define done (make-semaphore))
-  (parameterize ((current-eventspace evtsp))
-    (queue-callback (lambda () (semaphore-post done))))
-
-  (unless (sync/timeout 3 done)
-    (error "broken thread is really broken")))
-
-;; ----------------------------------------
-
-(report-errs)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/png.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/png.rkt
deleted file mode 100644
index 47fae4b1ef..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/png.rkt
+++ /dev/null
@@ -1,178 +0,0 @@
-#lang racket/gui
-(require racket/list)
-
-(module test racket/base) ; no test
-
-(define png-suite (build-path (or (current-load-relative-directory)
-				  (current-directory))
-			      "png-suite"))
-
-(unless (directory-exists? png-suite)
-  (error 'png-test
-	 (string-append
-	  "The png-suite subdirectory appears to be missing. "
-	  "It should contain the PNG test files (including GIFs for comparisons).")))
-
-(define l (map (lambda (f) (path->string (build-path png-suite f)))
-	       (sort (filter (lambda (x) (regexp-match #rx"^[^x].*[.]png$" x))
-                             (directory-list png-suite))
-                     path<?)))
-
-(define (png->gif f)
-  (regexp-replace #rx"[.]png$" f ".gif"))
-
-(define f (make-object frame% "Tester"))
-(define name (new message% 
-		  [label (car l)]
-		  [parent f]
-		  [stretchable-width #t]))
-(define no-mask-bm (let* ([bm (make-object bitmap% 32 32 1)]
-			  [dc (make-object bitmap-dc% bm)])
-		     (send dc clear)
-		     (send dc draw-line 0 0 32 32)
-		     (send dc draw-line 0 32 32 0)
-		     (send dc set-bitmap #f)
-		     bm))
-
-(define last-bm (make-object bitmap% (car l)))
-
-(define ppng (make-object horizontal-panel% f))
-(define png (new message%
-		 [label last-bm]
-		 [parent ppng]
-		 [stretchable-width #t]
-		 [stretchable-height #t]))
-(define pngm (new message%
-		 [label no-mask-bm]
-		 [parent ppng]
-		 [stretchable-width #t]
-		 [stretchable-height #t]))
-(define png-canvas (new canvas%
-			[parent ppng]
-			[stretchable-width #t]
-			[stretchable-height #t]
-			[paint-callback (lambda (c dc)
-					  (send dc set-brush 
-						(send the-brush-list find-or-create-brush "GREEN" 'solid))
-					  (send dc draw-rectangle -1 -1 500 500)
-					  (send dc draw-bitmap
-						last-bm 0 0
-						'solid 
-						(send the-color-database find-color "BLACK")
-						(send last-bm get-loaded-mask)))]))
-(define ppng-mono (make-object vertical-panel% ppng))
-(define mono? (new message%
-		   [label "mono"]
-		   [parent ppng-mono]))
-(define mono-mask? (new message%
-			[label "mono mask"]
-			[parent ppng-mono]))
-(unless (= 1 (send last-bm get-depth))
-  (send mono? show #f))
-(unless (and (send last-bm get-loaded-mask)
-	     (= 1 (send (send last-bm get-loaded-mask) get-depth)))
-  (send mono-mask? show #f))
-
-(define gif (new message%
-		 [label (make-object bitmap% (png->gif (car l)))]
-		 [parent f]
-		 [stretchable-width #t]
-		 [stretchable-height #t]))
-
-(define pld (make-object group-box-panel% "Save and Reload" f))
-(new button%
-     [label "Go"]
-     [parent pld]
-     [callback (lambda (b e)
-		 (if (send last-bm save-file "tmp.png" 'png)
-		     (let ([bm (make-object bitmap% "tmp.png" (get-mask-mode) (get-bg-color))])
-		       (send ld-png set-label (if (send bm ok?)
-						  bm
-						  no-mask-bm))
-		       (send ld-pngm set-label (or (send bm get-loaded-mask)
-						   no-mask-bm))
-		       (send ld-mono? show (and (send bm ok?)
-						(= 1 (send bm get-depth))))
-		       (send ld-mono-mask? show (and (send bm get-loaded-mask)
-						     (= 1 (send (send bm get-loaded-mask) get-depth)))))
-		     (error "write failed!")))])
-(define ppld (make-object horizontal-panel% pld))
-(define ld-png (new message%
-		    [label no-mask-bm]
-		    [parent ppld]
-		    [stretchable-width #t]
-		    [stretchable-height #t]))
-(define ld-pngm (new message%
-		     [label no-mask-bm]
-		     [parent ppld]
-		     [stretchable-width #t]
-		     [stretchable-height #t]))
-(define ppld-mono (make-object vertical-panel% ppld))
-(define ld-mono? (new message%
-		      [label "mono"]
-		      [parent ppld-mono]))
-(define ld-mono-mask? (new message%
-			   [label "mono mask"]
-			   [parent ppld-mono]))
-(send ld-mono? show #f)
-(send ld-mono-mask? show #f)
-
-(define mask (new choice%
-		  [label "Alpha"]
-		  [choices '("Auto" "Mask")]
-		  [parent f]
-		  [callback (lambda (c e) (refresh))]))
-(define bg (new choice%
-		[label "Background"]
-		[choices '("Default" "White" "Black" "Red")]
-		[parent f]
-		[callback (lambda (c e) (refresh))]))
-
-(define slider
-  (new slider% 
-       [label #f]
-       [parent f]
-       [min-value 1]
-       [max-value (length l)]
-       [init-value 1]
-       [callback (lambda (s e) (refresh))]))
-(let ([p (make-object horizontal-panel% f)])
-  (make-object button% "Prev" p (lambda (b e) 
-				  (send slider set-value (max 1 (sub1 (send slider get-value))))
-				  (refresh)))
-  (make-object vertical-pane% p)
-  (make-object button% "Next" p (lambda (b e)
-				  (send slider set-value (min (length l) (add1 (send slider get-value))))
-				  (refresh))))
-
-(define (refresh)
-  (let ([n (list-ref l (sub1 (send slider get-value)))])
-    (send name set-label n)
-    (let ([bm (make-object bitmap% n (get-mask-mode) (get-bg-color))])
-      (set! last-bm bm)
-      (send png set-label bm)
-      (send pngm set-label (or (send bm get-loaded-mask)
-			       no-mask-bm)))
-    (send gif set-label (make-object bitmap% (png->gif n)))
-    (send mono? show (= 1 (send last-bm get-depth)))
-    (send mono-mask? show (and (send last-bm get-loaded-mask)
-			       (= 1 (send (send last-bm get-loaded-mask) get-depth))))
-    (send png-canvas refresh)))
-
-(define (get-mask-mode)
-  (case (send mask get-selection)
-    [(0) 'unknown]
-    [(1) 'unknown/mask]))
-
-(define get-bg-color
-  (let ([white (make-object color% 255 255 255)]
-	[black (make-object color% 0 0 0)]
-	[red (make-object color% 255 0 0)])
-    (lambda ()
-      (case (send bg get-selection)
-	[(0) #f]
-	[(1) white]
-	[(2) black]
-	[(3) red]))))
-
-(send f show #t)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/prog6.mre b/pkgs/gui-pkgs/gui-test/tests/gracket/prog6.mre
deleted file mode 100644
index e67250ddb8..0000000000
Binary files a/pkgs/gui-pkgs/gui-test/tests/gracket/prog6.mre and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/prog8.mre b/pkgs/gui-pkgs/gui-test/tests/gracket/prog8.mre
deleted file mode 100644
index 011446809a..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/prog8.mre
+++ /dev/null
@@ -1,339 +0,0 @@
-WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket, or DrScheme version 4 or later
-   to read it.
-
-            http://racket-lang.org/
-|#
- 44 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wxmedia\0"
-3 1 8 #"wximage\0"
-2 0 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 56
-(
- #"(lib \"hrule-snip.ss\" \"macro-debugger\" \"syntax-browse"
- #"r\")\0"
-) 1 0 60
-(
- #"(lib \"implementation.ss\" \"macro-debugger\" \"syntax-br"
- #"owser\")\0"
-) 2 0 18 #"java-comment-box%\0"
-1 0 23 #"java-interactions-box%\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55
-(
- #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private"
- #"\")\0"
-) 1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 1 6 #"wxloc\0"
-00000000000 1 72 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 12 #"Courier New\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 27
-#"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 40
-#"framework:syntax-coloring:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 41
-#"framework:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-41 #"framework:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 40
-#"framework:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 42
-#"framework:syntax-coloring:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 45
-#"framework:syntax-coloring:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 39
-#"framework:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 39
-#"framework:syntax-coloring:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 14
-#"Html Standard\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-49 #"drscheme:check-syntax:lexically-bound-identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 42
-#"drscheme:check-syntax:imported-identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 39
-#"profj:syntax-coloring:scheme:prim-type\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 40
-#"profj:syntax-coloring:scheme:identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 36
-#"profj:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:literal\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-35 #"profj:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:default\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 39
-#"profj:syntax-coloring:scheme:uncovered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:covered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 4
-#"XML\0"
-0 70 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 4 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 -1 -1 0 1
-#"\0"
-0 75 12 #"Courier New\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 -1 -1 0 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 255 255 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 1 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 93 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 92 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-2 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-1 -2 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 71 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 72 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 73 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 74 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 75 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 2 1 0 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 0 1
-#"\0"
-0 70 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 39
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1
-00000000006 0 00000000000 7 00000000000 6 00000000000 39 00000000000 43
-00000000000 3 00000000000 23 0 16 3 1 #"("
-0 0 8 3 1 #"l"
-0 0 8 3 3 #"ist"
-0 0 4 29 1 #"\n"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"1"
-0 0 4 29 1 #"\n"
-0 0 4 3 1 #" "
-0 7 00000000061 4 00000000000 1 00000000000 9 0 8 3 1 #"c"
-0 0 8 3 1 #"o"
-0 0 8 3 1 #"m"
-0 0 8 3 1 #"m"
-0 0 8 3 1 #"e"
-0 0 8 3 1 #"n"
-0 0 8 3 3 #"ted"
-0 0 2 29 1 #"\n"
-0 0 8 3 4 #"out!"
-0 00000000000 0 0 4 29 1 #"\n"
-0 0 4 3 1 #" "
-0 6 00000000010 4 4 #"1/2\0"
-1 #"\0"
-6 #"mixed\0"
-2 #"1\0"
-0 0 4 29 1 #"\n"
-0 0 4 3 1 #" "
-0 39 00000000068 4 0 00000000000 1 00000000001 41 00000000000 3 0 39 3 5
-#"<tag>"
-0 41 00000000044 39 1 00000000000 1 00000000000 6 0 16 3 1 #"("
-0 0 8 3 1 #"a"
-0 0 8 3 3 #"dd1"
-0 0 2 3 1 #" "
-0 0 14 3 1 #"0"
-0 0 16 3 1 #")"
-0 00000000000 0 0 39 3 6 #"</tag>"
-0 00000000000 0 0 4 29 1 #"\n"
-0 0 4 3 1 #" "
-0 43 00000000013 4 00000000000 1 00000000000 1 0 2 3 6 #"quoted"
-0 00000000000 0 0 4 29 1 #"\n"
-0 0 4 3 1 #" "
-0 3 00000000015 4 1 #"\0"
-2 -1 -1 0 0 0 00000000002 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\0\24\0\0\0\31\b\2\0"
- #"\0\0\276u\231\204\0\0\2JIDATx\234\235T1o\262P\24=\317\30\330"
- #"\365%$\f$\217\216\316l\16\335\214I7\a\376\203,\35\372\v\32"
- #"\2735\351\204\377@\215C7\23\342$\3\235\230\305\251\2200hH\200"
- #"\260\366-t\270_\211V\375\232\366\fD.\367\334\373\356y\236\3136"
- #"\233\r\316\300\30\333\357\367\0\272\335\256\242(\347\t\204\326"
- #"\305\350~\277_.\227UU\205ax8\34~Af\214\305q\254iZY\226\236\347\271"
- #"\256\373\vr]\327\235N\a@\232\246I\222P\271\213\344v\363KJ"
- #"\t\240\231p\273\335&IrwwG\345\256\222\245\224\257\257\257\206a\0"
- #"\360<\217s\236\347y\222$B\210\333\333\333\252\252v\273\335\315\315"
- #"\r\325e\2145\265\332\0\212\242\310\262,\3132M\323\0h\232\226\347"
- #"\271\20\202s\256\353\272\357\373Y\226\331\266]UUY\226\0\372\375"
- #">\361\31]\225\224\262(\2128\216\3234\245\3\v!\0\320\314T"
- #"\b@\236\347\0\236\236\236N\310\307R\3\b\202`:\235\2\260,"
- #"\313\266\355\343\204\343\233o\343\24T\322\262,!\204\3438q\34"
- #"\353\272~M\260\313\177\22UU9\347\276\357w:\235k\314\253d\202a\30e"
- #"Y^\273\344\37\310\0\3020\374Kg\22\226\236\177\351\354y\336p8"
- #"\374vl\306\330n\267\243\340\377\310\234\363s\301>>>\326\353\365\17"
- #"\2359\347\226e\235\307\337\337\337\233YZRJ)\345\267\263\5A\20"
- #"\206\3419\363\355\355\355\370\265U\24\305\343\343c\20\4\207\303"
- #"\201}!MS\0d\314\6\213\305\3024\315\311d\322\353\365h\226\226"
- #"\256\353\364-\216\343\227\227\227 \b\232l\262\1AJi\30\206\353"
- #"\272B\210\321hD\301v]\327"
-) 143
-(
- #"\216\343<<<\220uM\323\4@\366\244\316\214\261\371|\236e\31\t1"
- #"\36\217UU\375\327\31\200\256\353\343\361\30@\236\347\276\357GQt"
- #"\334<\212\242\325jE\"\335\337\337+\212r\342\347\272\256\373\375>"
- #"\276\366\336z\275\36\f\6$\265i\232\313\345\262\261\344\361&"
- #"\300EKFQ4\233\315\310\311\204\347\347g\0\256\353N&\223\223\344k{;"
- #"\212\242\262,\251?\31XJ\371m\207\177\2\303\234?\344\214\372k\17"
- #"\0\0\0\0IEND\256B`\202"
-) 0 0 16 3 1 #")"
-0 0 4 29 1 #"\n"
-0 00000000000
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/racket-ns.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/racket-ns.rkt
deleted file mode 100644
index 234df24227..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/racket-ns.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/gui/dynamic)
-;; Don't change this program to use `racket'; ths point
-;; is to test `racket/gui/base' exports
-
-(let ([ns ((gui-dynamic-require 'make-gui-namespace))]
-      [orig-ns (current-namespace)])
-  (unless (namespace-variable-value 'hash #t (lambda () #f) ns)
-    (error "expected a binding for `hash'"))
-  (namespace-attach-module orig-ns 'racket/base ns))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/radiobox-steps.txt b/pkgs/gui-pkgs/gui-test/tests/gracket/radiobox-steps.txt
deleted file mode 100644
index da4304f9bb..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/radiobox-steps.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-You should see three radioboxes:
-  "Left" with one radio button: "Singleton"
-  "Center" with two radio button: "First" and "Last"
-  "Right" with three radio button: "Top", "Middle", and "Bottom"
-
-Click the "Check" button. "All Ok" should appear in the console.
-
-Click each radio button once. For each click, "Callback Ok"
- should be printed in the console, even if the radio button
- is already selected.
-
-Click the "Check" button. "All Ok" should appear in the console.
-
-Select the first button in all radio boxes.
-
-Click "Select First", "Select Middle", "Select Last" then
- "Select First" again. The appropriate button should become selected
- in all radioboxes each time. (For the two-button box, the
- second one counts as `middle'.)
-
-Click "Select -1" and "Select N". Nothing should happen (because the
- appropriate exceptions are caught). Select the last button in each
- box and try "Select -1" again. Nothing should happen. Return the
- selection to the first item in each box.
-
-Repeat the two steps for the "Select XXX by Simulate" buttons. In this
- case, "Callback Ok" should be printed three times when any button
- is hit. The selection should move appropriately.
-
-Click the "Check" button.
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/record-dc.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/record-dc.rkt
deleted file mode 100644
index 8c072aca59..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/record-dc.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw
-         (only-in racket/draw/private/record-dc 
-                  record-dc-mixin
-                  get-recorded-command))
-
-(define bm1 (make-bitmap 100 100))
-(define bm2 (make-bitmap 100 100))
-(define bm3 (make-bitmap 100 100))
-
-(define dc1 (make-object bitmap-dc% bm1))
-(define dc2 (make-object (record-dc-mixin bitmap-dc%) bm2))
-(define dc3 (make-object bitmap-dc% bm3))
-
-(define (config dc)
-  (send dc set-origin 2 3)
-  (send dc set-scale 1.1 0.9)
-  (send dc set-rotation 0.1)
-  (send dc set-initial-matrix '#(1.0 -0.1 0.1 1.0 1.0 2.0))
-  (send dc set-pen "red" 2 'solid)
-  (send dc set-brush "blue" 'solid)
-  (send dc set-font (make-font #:size 32))
-  (send dc set-smoothing 'smoothed)
-  (send dc set-text-mode 'solid)
-  (send dc set-alpha 0.8)
-  (send dc set-clipping-rect 5 5 95 95))
-
-(define (draw dc)
-  (send dc draw-ellipse 2 2 100 100)
-  (send dc draw-text "Hello" 10 10))
-
-(define (get-bytes bm)
-  (define w (send bm get-width))
-  (define h (send bm get-height))
-  (define bstr (make-bytes (* 4 w h)))
-  (send bm get-argb-pixels 0 0 w h bstr)
-  bstr)
-
-(config dc1)
-(draw dc1)
-
-(define pre-bytes (get-bytes bm1))
-
-(config dc2)
-(send dc2 erase)
-(draw dc2)
-
-(define middle-bytes (get-bytes bm2))
-
-(define cms (send dc2 get-recorded-command))
-
-(void (cms dc3))
-
-(define post-bytes (get-bytes bm3))
-
-(unless (equal? pre-bytes middle-bytes)
-  (error "middle != pre"))
-
-(unless (equal? pre-bytes post-bytes)
-  (error "post != pre"))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/sandbox-gui.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/sandbox-gui.rkt
deleted file mode 100644
index 3c6aaaa326..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/sandbox-gui.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang racket
-(require racket/sandbox
-         racket/gui/dynamic)
-
-(define-syntax-rule (test expect expr)
-  (do-test 'expr expect expr))
-
-(define (do-test which expect got)
-  (unless (equal? expect got)
-    (error 'test "failed: ~s expect: ~e got: ~e" which expect got)))
-
-;; GUI is initialled allowed by sandbox, but not initially available:
-
-(test #t (sandbox-gui-available))
-(test #f (gui-available?))
-
-;; Create a pre-GUI evaluator:
-
-(define e (call-with-trusted-sandbox-configuration
-           (lambda ()
-             (make-evaluator 'racket))))
-(test (void) (e '(require racket/gui/dynamic)))
-(test #f (e '(gui-available?)))
-
-;; Load GUI library
-
-(test (void) (dynamic-require 'racket/gui #f))
-
-;; Now the GUI is available:
-
-(test #t (gui-available?))
-
-;; Create a post-GUI evaluator:
-
-(define ge (call-with-trusted-sandbox-configuration
-            (lambda ()
-              (make-evaluator 'racket))))
-(test (void) (ge '(require racket/gui/dynamic)))
-(test #t (ge '(gui-available?)))
-
-;; A post-GUI evaluator, but with GUI disabled:
-
-(define pe (parameterize ([sandbox-gui-available #f])
-             (call-with-trusted-sandbox-configuration
-              (lambda ()
-                (make-evaluator 'racket)))))
-(test (void) (pe '(require racket/gui/dynamic)))
-(test #f (pe '(gui-available?)))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/scheme-ns.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/scheme-ns.rkt
deleted file mode 100644
index 17ea595330..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/scheme-ns.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang scheme/base
-(require scheme/gui/base
-         scheme/gui/dynamic)
-;; Don't change this program to use `racket'; ths point
-;; is to test `scheme/gui/base' exports
-
-(let ([ns ((gui-dynamic-require 'make-gui-namespace))]
-      [orig-ns (current-namespace)])
-  (when (namespace-variable-value 'hash #t (lambda () #f) ns)
-    (error "did not expect a binding for `hash'"))
-  (namespace-attach-module orig-ns 'scheme/base ns))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/showkey.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/showkey.rkt
deleted file mode 100644
index f0d885ba58..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/showkey.rkt
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class
-         racket/cmdline)
-
-(command-line
- #:once-each
- [("--option") "set special Option key"
-  (special-option-key #t)]
- [("--control") "set special Control key"
-  (special-control-key #t)])
-
-(let ()
-  (define iter 0)
-  (define c%
-    (class canvas%
-      (super-new)
-      (define/override (on-event ev)
-        (printf "~a~a MOUSE ~a (~a,~a)\n  mods:~a~a~a~a~a~a~a~a\n  buttons:~a~a~a~a~a~a~a\n" 
-                (es-check)
-                iter
-                (send ev get-event-type)
-                (send ev get-x)
-                (send ev get-y)
-                (if (send ev get-meta-down) " META" "")
-                (if (send ev get-control-down) " CTL" "")
-                (if (send ev get-alt-down) " ALT" "")
-                (if (send ev get-shift-down) " SHIFT" "")
-                (if (send ev get-caps-down) " CAPS" "")
-                (if (send ev get-mod3-down) " MOD3" "")
-                (if (send ev get-mod4-down) " MOD4" "")
-                (if (send ev get-mod5-down) " MOD5" "")
-                (if (send ev get-left-down) " LEFT" "")
-                (if (send ev get-middle-down) " MIDDLE" "")
-                (if (send ev get-right-down) " RIGHT" "")
-                (if (send ev dragging?)
-                    " dragging"
-                    "")
-                (if (send ev moving?)
-                    " moving"
-                    "")
-                (if (send ev entering?)
-                    " entering"
-                    "")
-                (if (send ev leaving?)
-                    " leaving"
-                    "")))
-      (define/override (on-char ev)
-        (set! iter (add1 iter))
-        (printf "~a~a KEY: ~a\n  rel-code: ~a\n  other-codes: ~a\n  mods:~a~a~a~a~a~a~a~a~a\n"
-                (es-check)
-                iter
-                (let ([v (send ev get-key-code)])
-                  (if (symbol? v)
-                      v
-                      (format "~s = ASCII ~a" (string v) (char->integer v))))
-                (let ([v (send ev get-key-release-code)])
-                  (if (symbol? v)
-                      v
-                      (format "~s = ASCII ~a" (string v) (char->integer v))))
-                (let ([vs (list (send ev get-other-shift-key-code)
-                                (send ev get-other-altgr-key-code)
-                                (send ev get-other-shift-altgr-key-code)
-                                (send ev get-other-caps-key-code))])
-                  (map (lambda (v)
-                         (and v
-                              (if (symbol? v)
-                                  v
-                                  (format "~s = ASCII ~a" (string v) (char->integer v)))))
-                       vs))
-                (if (send ev get-meta-down) " META" "")
-                (if (send ev get-control-down) " CTL" "")
-                (if (send ev get-control+meta-is-altgr) " = ALTGR" "")
-                (if (send ev get-alt-down) " ALT" "")
-                (if (send ev get-shift-down) " SHIFT" "")
-                (if (send ev get-caps-down) " CAPS" "")
-                (if (send ev get-mod3-down) " MOD3" "")
-                (if (send ev get-mod4-down) " MOD4" "")
-                (if (send ev get-mod5-down) " MOD5" "")))))
-  (define f (make-object (class frame%
-                           (inherit accept-drop-files)
-                           (define/override (on-drop-file file)
-                             (printf "Dropped: ~a\n" file))
-                           (super-make-object  "tests" #f 100 100)
-                           (accept-drop-files #t))))
-  (define c (make-object c% f))
-  (define (es-check) (if (eq? (send f get-eventspace) (current-eventspace))
-			 ""
-			 ">>WRONG EVENTSPACE<<\n"))
-  (send c focus)
-  (send f show #t))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/slider-steps.txt b/pkgs/gui-pkgs/gui-test/tests/gracket/slider-steps.txt
deleted file mode 100644
index 40e570f7a9..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/slider-steps.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-The slider's initial value should be 3. The range is -1 to 11.
-
-Change the slider value in each way allowed by the control (dragging,
- clicking in page-up/page-down, clicking on one-step arrows). For
- each change, the console should contain "Callback Ok". When you
- drag, one callback may be reported for the whole drag, or
- intermediate callbacks may be reported.
-
-Click "Up" until the slider is at the top; a mismatch exception should
- be reported. Click "Down" once and verify that the slider is at 10.
-
-Repeat the above step for "Down" (checking for an exception when the
- slider is already at its minimum value).
-
-Repeat the above two steps for "Simulate Up" and "Simulate Down". For
- the simulates, the console should report "Callback Ok" for each click.
- If you try to go too far up or down, the console should report an
- error: "slider value mismatch".
-
-Click the "Check" button. The console should report "All Ok".
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/test-editor-admin.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/test-editor-admin.rkt
deleted file mode 100644
index 3dbc1e4e34..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/test-editor-admin.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang scheme/base
-(require scheme/class
-         scheme/gui/base)
-
-(provide test-editor-admin%)
-
-(define the-dc
-  (new (class* bitmap-dc% ()
-         (super-new)
-         (define/override (get-text-extent s [font #f] [combine? #f] [offset 0])
-           (values (* 10.0 (string-length s)) 10.0 1.0 1.0))
-         (define/override (set-pen . p) (void))
-         (define/override (get-pen . p) #f)
-         (define/override (set-brush . b) (void))
-         (define/override (get-brush . b) #f)
-         (define/override (set-clipping-rect . b) (void))
-         (define/override (get-clipping-region . b) #f)
-         (define/override (draw-text s x y [combine? #f] [offset 0] [angle 0.0]) (void))
-         (define/override (cache-font-metrics-key) 100))))
-         
-
-(define test-editor-admin%
-  (class editor-admin% 
-    (super-new)
-
-    (define/override (get-dc [x #f] [y #f])
-      (when x (set-box! x 1.0))
-      (when y (set-box! y 1.0))
-      the-dc)
-
-    (define/private (do-get-view x y w h)
-      (when x (set-box! x 0.0))
-      (when y (set-box! y 0.0))
-      (when w (set-box! w 100.0))
-      (when h (set-box! h 100.0)))
-
-    (define/override (get-view x y w h [full? #f])
-      (do-get-view x y w h))
-
-    (define/override (get-max-view x y w h [full? #f])
-      (do-get-view x y w h))
-
-    (define/override (scroll-to x y w h refresh? bias)
-      (void))))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/test.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/test.rkt
deleted file mode 100644
index b5e29b0b6c..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/test.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/load
-
-(require racket/gui)
-
-(load-relative "editor.rktl")
-(load-relative "paramz.rktl")
-(load-relative "dc.rktl")
-(load-relative "cache-image-snip-test.rktl")
-(load-relative "windowing.rktl")
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/testbox6.mre b/pkgs/gui-pkgs/gui-test/tests/gracket/testbox6.mre
deleted file mode 100644
index ed82240ef9..0000000000
Binary files a/pkgs/gui-pkgs/gui-test/tests/gracket/testbox6.mre and /dev/null differ
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/testbox8.mre b/pkgs/gui-pkgs/gui-test/tests/gracket/testbox8.mre
deleted file mode 100644
index 2d04e55d06..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/testbox8.mre
+++ /dev/null
@@ -1,264 +0,0 @@
-WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket, or DrScheme version 4 or later
-   to read it.
-
-            http://racket-lang.org/
-|#
- 31 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wxmedia\0"
-3 1 8 #"wximage\0"
-2 0 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 60
-(
- #"(lib \"implementation.ss\" \"macro-debugger\" \"syntax-br"
- #"owser\")\0"
-) 2 0 18 #"java-comment-box%\0"
-1 0 23 #"java-interactions-box%\0"
-1 0 15 #"make-line-snip\0"
-1 0 15 #"make-line-snip\0"
-1 0 13 #"example-box%\0"
-2 0 18 #"interactions-box%\0"
-2 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55
-(
- #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private"
- #"\")\0"
-) 1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 10 #"text-box%\0"
-1 0 1 6 #"wxloc\0"
-00000000000 1 74 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 12 #"Courier New\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 27
-#"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 40
-#"framework:syntax-coloring:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 41
-#"framework:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-41 #"framework:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 40
-#"framework:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 42
-#"framework:syntax-coloring:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 45
-#"framework:syntax-coloring:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 39
-#"framework:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 39
-#"framework:syntax-coloring:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 14
-#"Html Standard\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-49 #"drscheme:check-syntax:lexically-bound-identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 42
-#"drscheme:check-syntax:imported-identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 39
-#"profj:syntax-coloring:scheme:prim-type\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 40
-#"profj:syntax-coloring:scheme:identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 36
-#"profj:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:literal\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-35 #"profj:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:default\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 39
-#"profj:syntax-coloring:scheme:uncovered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:covered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 4
-#"XML\0"
-0 70 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 0 1
-#"\0"
-0 75 12 #"Courier New\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 -1 -1 0 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 255 255 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 1 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 93 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 92 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-2 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-1 -2 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 71 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 72 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 73 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 74 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 75 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 2 1 0 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 0 1
-#"\0"
-0 70 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 4 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 94 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 148 0 211 0 0 0 -1 -1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1
-00000000002 29 00000000000 0 00000000000 2 29 00000000078 2 00000000000
-1 00000000000 7 0 16 3 1 #"("
-0 0 8 3 1 #"+"
-0 0 2 3 1 #" "
-0 0 14 3 1 #"1"
-0 0 2 3 1 #" "
-0 0 14 3 1 #"2"
-0 0 16 3 1 #")"
-0 00000000000 00000000000 1 00000000000 1 0 14 3 1 #"3"
-0 00000000000 00000000000 1 00000000000 0 00000000000 00000000000 1
-00000000000 0 00000000000 00000000000 1 00000000000 0 00000000000 1 0 0
-0 0 2 29 1 #"\n"
-0 00000000000
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/testing.rktl b/pkgs/gui-pkgs/gui-test/tests/gracket/testing.rktl
deleted file mode 100644
index 33f7bebdd7..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/testing.rktl
+++ /dev/null
@@ -1,63 +0,0 @@
-
-;; GRacket automatic testing basic functions and macros
-
-(require mzlib/class)
-
-(define SECTION #t)
-
-(define errs null)
-(define test-count 0)
-
-(define (test expect name got)
-  (set! test-count (add1 test-count))
-  (unless (equal? expect got)
-    (let ([s (format "~a: expected ~e; got ~e" name expect got)])
-      (fprintf (current-error-port) "ERROR: ~a\n" s)
-      (set! errs (cons s errs)))))
-
-(define-syntax mismatch
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ expr)
-       (syntax
-	(test 'was-mismatch 'mismtach
-	      (with-handlers ([exn:fail:contract?
-			       (lambda (x)
-                                 (printf "~a\n" (exn-message x))
-				 'was-mismatch)]
-			      [exn:fail? values])
-		expr)))])))
-
-(define-syntax st
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ val obj method . args)
-       (syntax
-	(test val 'method (send obj method . args)))])))
-
-(define-syntax stv
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ . args)
-       (syntax (st (void) . args))])))
-
-(define-syntax stvals
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ vals obj method . args)
-       (syntax
-	(test vals 'method (call-with-values (lambda () (send obj method . args)) list)))])))
-
-(define (report-errs)
-  (flush-output)
-  (sleep 1)
-  (newline)
-  (if (null? errs)
-      (printf "Passed all ~a tests\n" test-count)
-      (begin
-	(fprintf (current-error-port) "~a Error(s) in ~a tests\n" (length errs) test-count)
-	(for-each
-	 (lambda (s)
-	   (fprintf (current-error-port) "~a\n" s))
-	 (reverse errs)))))
-
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/undo.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/undo.rkt
deleted file mode 100644
index e14be23fc8..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/undo.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/gui
-
-;; Tests for Emacs-style undo in a `text%`
-
-(define (mk)
-  (define t (new text%))
-  (send t set-max-undo-history 1)
-  (send t set-undo-preserves-all-history #t)
-  t)
-
-(define (deep t)
-  (define (touch)
-    (send t begin-edit-sequence #f)
-    (send t change-style (make-object style-delta% 'change-bold) 0 (send t last-position))
-    (send t end-edit-sequence))
-
-  (define (try n)
-    (unless (= n 1000)
-      (send t insert "hello\n")
-      (send t undo)
-      (send t begin-edit-sequence)
-      (send t insert "mo")
-      (send t insert "re")
-      (send t end-edit-sequence)
-      (touch)
-      (send t undo)
-      (send t undo) ; hello is back
-      (send t undo)
-      (try (add1 n))))
-
-  (try 0)
-  (unless (equal? "" (send t get-text))
-    (error "failed"))
-  t)
-
-(define (bounce t)
-  (define (undo s)
-    (send t undo)
-    (define got (send t get-text))
-    (unless (equal? s got)
-      (error 'undo "fail: ~s vs. ~s" s got)))
-
-  (send t insert "hello")
-  (undo "")
-  (send t insert "goodbye")
-  (undo "")
-  (undo "hello")
-  (undo "")
-  (send t insert "more")
-  (undo "")
-  (undo "hello")
-  (undo "")
-  (undo "goodbye")
-  (undo ""))
-
-(void (deep (mk)))
-(bounce (mk))
-(bounce (deep (mk)))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/unflushed-circle.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/unflushed-circle.rkt
deleted file mode 100644
index 7376ed6212..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/unflushed-circle.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket/gui
-(require racket/math)
-
-;; This test creates a background that draws a circle in changing
-;; colors. It draws in a background thread --- on in response to
-;; `on-paint', and with no flushing controls --- but it should nevertheless
-;; refresh onscreen frequently through an automatic flush.
-
-(define f (new frame%
-               [label "Snake"]
-               [width 400]
-               [height 400]))
-
-(define c (new canvas% [parent f]))
-
-(send f show #t)
-
-(define prev-count 0)
-(define next-time (+ (current-inexact-milliseconds) 1000))
-
-(define (go)
-  (let loop ([n 0])
-    (when ((current-inexact-milliseconds) . > . next-time)
-      (printf "~s\n" (- n prev-count))
-      (set! prev-count n)
-      (set! next-time (+ (current-inexact-milliseconds) 1000)))
-    (let ([p (make-polar 175 (* pi (/ n 100)))]
-          [dc (send c get-dc)])
-      (send dc set-brush 
-            (make-object color% 
-                         (remainder n 256)
-                         (remainder (* 2 n) 256)
-                         (remainder (* 3 n) 256))
-            'solid)
-      (send dc draw-rectangle
-            (+ 180 (real-part p))
-            (+ 180 (imag-part p))
-            20
-            20)
-      (loop (add1 n)))))
-
-(thread go)
-
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/unsafe-draw.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/unsafe-draw.rkt
deleted file mode 100644
index ff5b82cdf7..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/unsafe-draw.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         racket/draw/unsafe/cairo-lib
-         racket/draw/unsafe/brush)
-
-(provide surface-brush)
-
-(define cairo_image_surface_create
-  (get-ffi-obj 'cairo_image_surface_create cairo-lib (_fun _int _int _int -> _pointer)))
-(define cairo_surface_destroy
-  (get-ffi-obj 'cairo_surface_destroy cairo-lib (_fun _pointer -> _void)))
-(define cairo_create
-  (get-ffi-obj 'cairo_create cairo-lib (_fun _pointer -> _pointer)))
-(define cairo_destroy
-  (get-ffi-obj 'cairo_destroy cairo-lib (_fun _pointer -> _void)))
-
-(define cairo_set_source_rgba
-  (get-ffi-obj 'cairo_set_source_rgba cairo-lib (_fun _pointer _double* _double* _double* _double* -> _void)))
-(define cairo_rectangle
-  (get-ffi-obj 'cairo_rectangle cairo-lib (_fun _pointer _double* _double* _double* _double* -> _void)))
-(define cairo_fill
-  (get-ffi-obj 'cairo_fill cairo-lib (_fun _pointer -> _void)))
-
-(define s (cairo_image_surface_create 0 20 30))
-(define cr (cairo_create s))
-(cairo_set_source_rgba cr 1.0 0.0 0.0 0.5)
-(cairo_rectangle cr 2 2 16 26)
-(cairo_fill cr)
-(cairo_set_source_rgba cr 0.0 0.0 0.0 1.0)
-(cairo_rectangle cr 9 9 2 2)
-(cairo_fill cr)
-(cairo_destroy cr)
-
-(define surface-brush (make-handle-brush s 20 30 '#(#(1 0 0 1 420 320) 0 0 1 1 0)))
-
-(cairo_surface_destroy s)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/windowing.rktl b/pkgs/gui-pkgs/gui-test/tests/gracket/windowing.rktl
deleted file mode 100644
index c39a590cb0..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/windowing.rktl
+++ /dev/null
@@ -1,1176 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(define shorter? #t)
-
-; These message boxes mustn't survive
-(let ([c (make-custodian)])
-  (parameterize ([current-custodian c])
-    (parameterize ([current-eventspace (make-eventspace)])
-      (queue-callback
-       (lambda ()
-	 (queue-callback
-	  (lambda ()
-	    (sleep/yield 0.1)
-	    (queue-callback
-	     (lambda ()
-	       (custodian-shutdown-all c)))
-	    (message-box "w" "q")))
-	 (message-box "x" "y"))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                           Windowing Tests                                  ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Some tests can't work on X due to window-manager 
-;; prerogative and race conditions
-(define-syntax (X-FAILS stx)
-  (if (eq? (system-type) 'unix)
-      (syntax (void))
-      (syntax-case stx () [(_ e) #'e])))
-
-(define (pause)
-  (let ([s (make-semaphore)])
-    (flush-display)
-    (thread (lambda () (sleep 0.01) (semaphore-post s)))
-    (test s 'yield (yield s))))
-
-(define (iconize-pause)
-  (pause))
-
-(let ([s (make-semaphore 1)])
-  (test s 'yield-wrapped (yield s)))
-(let ([s (make-semaphore 1)])
-  (test (list s) 'yield-wrapped (yield (wrap-evt s (lambda (v) (list v))))))
-(let ([s (make-semaphore)])
-  (thread (lambda () (sleep 0.01) (semaphore-post s)))
-  (test (list s) 'yield-wrapped (yield (wrap-evt s (lambda (v) (list v))))))
-
-(define (enable-tests f)
-  (printf "Enable ~a\n" f)
-  (st #t f is-enabled?)
-  (stv f enable #f)
-  (st #f f is-enabled?)
-  (stv f enable #t)
-  (st #t f is-enabled?))
-
-(define (drop-file-tests f)
-  (printf "Drop File ~a\n" f)
-  (st #f f accept-drop-files)
-  (stv f accept-drop-files #t)
-  (st #t f accept-drop-files)
-  (stv f accept-drop-files #f)
-  (st #f f accept-drop-files))
-
-(define (client->screen-tests f)
-  (printf "Client<->Screen ~a\n" f)
-  (send (or (send f get-parent) f) reflow-container)
-  (X-FAILS
-   (let-values ([(x y) (send f client->screen 0 0)])
-     (stvals '(0 0) f screen->client x y)))
-  (X-FAILS
-   (let-values ([(x y) (send f screen->client 0 0)])
-     (stvals '(0 0) f client->screen x y)))
-  (let-values ([(cw ch) (send f get-client-size)]
-	       [(w h) (send f get-size)])
-    (test #t `(client-size ,f ,cw ,ch ,w ,h) (and (<= 1 cw w) (<= 1 ch h))))
-  (stv f refresh))
-
-(define (area-tests f sw? sh? no-stretch? use-client-size?)
-  (printf "Area ~a\n" f)
-  (let ([x (send f min-width)]
-	[y (send f min-height)])
-    (st sw? f stretchable-width)
-    (st sh? f stretchable-height)
-    (stv (send f get-top-level-window) reflow-container)
-    (pause) ; to make sure size has taken effect
-    (let-values ([(w h) (if no-stretch?
-			    (if use-client-size?
-                                (send f get-client-size)
-                                (send f get-size))
-			    (values 0 0))])
-      (printf "Size ~a x ~a\n" w h)
-      (when no-stretch?
-	(stv f min-width w) ; when we turn of stretchability, don't resize
-	(stv f min-height h))
-      (stv f stretchable-width #f)
-      (stv f stretchable-height #f)
-      (st #f f stretchable-width)
-      (st #f f stretchable-height)
-      (stv f stretchable-width #t)
-      (stv f stretchable-height #t)
-      (st #t f stretchable-width)
-      (st #t f stretchable-height)
-      (stv f stretchable-width sw?)
-      (stv f stretchable-height sh?))
-    (stv f min-width x)
-    (stv f min-height y)))
-
-(define (containee-tests f sw? sh? m)
-  (area-tests f sw? sh? #f #f)
-  (printf "Containee ~a\n" f)
-  (st m f horiz-margin)
-  (st m f vert-margin)
-  (stv f horiz-margin 3)
-  (st 3 f horiz-margin)
-  (st m f vert-margin)
-  (stv f horiz-margin m)
-  (stv f vert-margin 3)
-  (st m f horiz-margin)
-  (st 3 f vert-margin)
-  (stv f vert-margin m))
-
-(define (container-tests f win?)
-  (printf "Container ~a\n" f)
-  (let-values ([(x y) (send f get-alignment)])
-    (stv f set-alignment 'right 'bottom)
-    (stvals '(right bottom) f get-alignment)
-    (stv f set-alignment x y)))
-
-(define (cursor-tests f)
-  (printf "Cursor ~a\n" f)
-  (let ([c (send f get-cursor)])
-    (stv f set-cursor c)
-    (st c f get-cursor)
-    (begin-busy-cursor)
-    (end-busy-cursor)
-    (st c f get-cursor)
-    (stv f set-cursor #f)
-    (st #f f get-cursor)
-    (begin-busy-cursor)
-    (end-busy-cursor)
-    (st #f f get-cursor)
-    (stv f set-cursor c)))
-
-(define (show-tests f)
-  (unless (is-a? f dialog%)
-    (printf "Show ~a\n" f)
-    (let ([on? (send f is-shown?)])
-      (stv f show #f)
-      (when on?
-	(stv f show #t)))))
-
-(define (window-tests f sw? sh? parent top m)
-  (st parent f get-parent)
-  (st top f get-top-level-window)
-  (enable-tests f)
-  (drop-file-tests f)
-  (client->screen-tests f)
-  (cursor-tests f)
-  (show-tests f))
-
-(define (containee-window-tests f sw? sh? parent top m)
-  (window-tests f sw? sh? parent top m)
-  (containee-tests f sw? sh? m))
-
-(define (test-control-event e types)
-  (test #t 'event-instance (is-a? e control-event%)) 
-  (test #t 'event-type (pair? (memq (send e get-event-type) types))))
-
-(define (label-test b l)
-  (let ([&-l (format "&~a" l)]
-	[my-l (format "My ~a" l)]
-	[&-my-l (format "&My ~a" l)]
-	[my-l-& (format "My ~a (&X) " l)])
-    (st &-l b get-label)
-    (st l b get-plain-label)
-    (stv b set-label &-my-l)
-    (st &-my-l b get-label)
-    (st my-l b get-plain-label)
-    (stv b set-label my-l-&)
-    (st my-l-& b get-label)
-    (st my-l b get-plain-label)
-    (stv b set-label &-l)))
-
-(let ([f (make-object frame% "Yes & No" #f 150 151 70 21)])
-  (let ([init-tests
-	 (lambda (hidden?)
-	   (st "Yes & No" f get-label)
-	   (st "Yes  No" f get-plain-label)
-	   (stv f set-label "Yeah & Nay")
-	   (st "Yeah & Nay" f get-label)
-	   (st "Yeah  Nay" f get-plain-label)
-	   (stv f set-label "Yes & No")
-	   (st #f f get-parent)
-	   (st f f get-top-level-window)
-           (X-FAILS (st 70 f get-x))
-           (X-FAILS (st 21 f get-y))
-	   (X-FAILS (st 150 f get-width))
-	   (X-FAILS (st 151 f get-height))
-	   (X-FAILS (stvals (list (send f get-width) (send f get-height)) f get-size))
-	   (st #f f has-status-line?)
-	   (st #f f is-iconized?)
-	   (st #f f get-menu-bar))]
-	[space-tests
-	 (lambda ()
-	   (printf "Spacing\n")
-	   (let ([b (send f border)])
-	     (stv f border 25)
-	     (st 25 f border)
-	     (stv f border b))
-	   (let ([s (send f spacing)])
-	     (stv f spacing 7)
-	     (st 7 f spacing)
-	     (stv f spacing s)))]
-	[enable-tests
-	 (lambda () (enable-tests f))]
-	[drop-file-tests
-	 (lambda ()
-	   (drop-file-tests f))]
-	[client->screen-tests
-	 (lambda ()
-	   (printf "Client<->Screen\n")
-	   (X-FAILS
-        (let-values ([(x y) (send f client->screen 0 0)])
-          (stvals '(0 0) f screen->client x y)))
-	   (X-FAILS
-        (let-values ([(x y) (send f screen->client 0 0)])
-          (stvals '(0 0) f client->screen x y))))]
-	[container-tests
-	 (lambda ()
-	   (printf "Container\n")
-	   (area-tests f #t #t #t #t)
-	   (let-values ([(x y) (send f container-size null)])
-	     (st x f min-width)
-	     (st y f min-height))
-	   (container-tests f #t))]
-	[cursor-tests
-	 (lambda ()
-	   (test #t 'get-cursor-kind (is-a? (send f get-cursor) cursor%))
-	   (cursor-tests f))])
-
-    (st (current-eventspace) f get-eventspace)
-    (st #t f can-close?)
-    (st #t f can-exit?)
-    (stv f focus)
-
-    (space-tests)
-    (enable-tests)
-    (client->screen-tests)
-    (container-tests)
-    (cursor-tests)
-
-    (printf "Init\n")
-    (init-tests #f)
-    (stv f show #t)
-    (pause)
-    (printf "Show Init\n")
-    (init-tests #t)
-    (stv f show #f)
-    (pause)
-    (printf "Hide Init\n")
-    (init-tests #f)
-    (send f show #t)
-    (pause)
-
-    (space-tests)
-    (enable-tests)
-    (client->screen-tests)
-    (container-tests)
-
-    (stv f change-children values)
-    
-    (printf "Iconize\n")
-    (stv f iconize #t)
-    (iconize-pause)
-    (X-FAILS (st #t f is-iconized?))
-    (stv f iconize #f)
-    (iconize-pause)
-    (X-FAILS (st #f f is-iconized?))
-    (stv f iconize #t)
-    (iconize-pause)
-    (X-FAILS (st #t f is-iconized?))
-    (stv f show #t)
-    (iconize-pause)
-    (X-FAILS (st #f f is-iconized?))
-
-    (stv f maximize #t)
-    (pause)
-    (stv f maximize #f)
-    (pause)
-
-    (printf "Move\n")
-    (stv f move 34 37)
-    (pause)
-    (X-FAILS (st 34 f get-x))
-    (X-FAILS (st 37 f get-y))
-    (X-FAILS (st 150 f get-width))
-    (X-FAILS (st 151 f get-height))
-
-    (printf "Resize\n")
-    (stv f resize 156 57)
-    (pause)
-    (X-FAILS (st 34 f get-x))
-    (X-FAILS (st 37 f get-y))
-    (X-FAILS (st 156 f get-width))
-    (X-FAILS (st 57 f get-height))
-
-    (stv f center)
-    (pause)
-    (X-FAILS (st 156 f get-width))
-    (X-FAILS (st 57 f get-height))
-
-    (client->screen-tests)
-
-    (stv f create-status-line)
-    (stv f set-status-text "Hello")
-
-    (stv f change-children values)
-    (st null f get-children)
-    (stvals '(center top) f get-alignment)
-
-    (stv f focus)
-
-    (cursor-tests)
-
-    (printf "Menu Bar\n")
-    (let ([mb (make-object menu-bar% f)])
-      (st mb f get-menu-bar)
-      (st f mb get-frame)
-      (st null f get-children)
-
-      (st #t mb is-enabled?)
-      (stv mb enable #f)
-      (st #f mb is-enabled?)
-      (stv mb enable #t)
-      (st #t mb is-enabled?)
-      
-      (st null mb get-items)
-
-      (printf "Menu 1\n")
-      (let* ([m (make-object menu% "&File" mb)]
-	     [i m]
-	     [delete-enable-test (lambda (i parent empty)
-				   (printf "Item\n")
-				   (st #f i is-deleted?)
-				   (st #t i is-enabled?)
-				   
-				   (stv i delete)
-				   (st #t i is-deleted?)
-				   (st empty parent get-items)
-				   (stv i restore)
-				   (st #f i is-deleted?)
-				   
-				   (stv i enable #f)
-				   (st #f i is-enabled?)
-				   (stv i enable #t)
-				   (st #t i is-enabled?)
-
-				   (stv i delete)
-				   (st #t i is-enabled?)
-				   (stv i enable #f)
-				   (st #f i is-enabled?)
-				   (stv i restore)
-				   (st #f i is-deleted?)
-				   (st #f i is-enabled?)
-				   (stv i enable #t)
-
-				   (let ([l (send i get-help-string)])
-				     (stv i set-help-string "Yikes")
-				     (st "Yikes" i get-help-string)
-				     (stv i set-help-string #f)
-				     (st #f i get-help-string)
-				     (stv i set-help-string l))
-
-				   (let ([l (send i get-label)])
-				     (stv i set-label "Matthew")
-				     (st "Matthew" i get-label)
-				     (stv i set-label l)))]
-	     [hit #f])
-	(st (list i) mb get-items)
-	(st mb i get-parent)
-
-	(st "&File" i get-label)
-	(st "File" i get-plain-label)
-	(st #f i get-help-string)
-
-	(delete-enable-test i mb null)
-
-	(st null m get-items)
-
-	(printf "Menu Items\n")
-	(let ([i1 (make-object menu-item% "&Plain" m 
-			       (lambda (i e)
-				 (test-control-event e '(menu))
-				 (test hit 'expected-plain-menu i)
-				 (set! hit 'plain)
-				 'oops)
-			       #f "Help")]
-	      [i2 (make-object separator-menu-item% m)]
-	      [i3 (make-object checkable-menu-item% "Che&ckable" m 
-			       (lambda (i e)
-				 (test-control-event e '(menu))
-				 (test hit 'expected-check-menu i)
-				 (set! hit 'check)
-				 'oops)
-			       #\C)]
-	      [shortcut-test
-	       (lambda (i empty name)
-		 (delete-enable-test i m empty)
-		 
-		 (printf "Shortcut\n")
-		 (set! hit i)
-		 (stv i command (make-object control-event% 'menu))
-		 (test name 'hit-command hit)
-		 
-		 (let ([c (send i get-shortcut)])
-		   (stv i set-shortcut #\M)
-		   (st #\M i get-shortcut)
-		   (stv i set-shortcut #f)
-		   (st #f i get-shortcut)
-		   (stv i set-shortcut c))
-		 
-		 (st (get-default-shortcut-prefix) i get-shortcut-prefix)
-		 (let ([p (send i get-shortcut-prefix)])
-		   (stv i set-shortcut-prefix '(shift))
-		   (st '(shift) i get-shortcut-prefix)
-		   (stv i set-shortcut-prefix '(ctl))
-		   (st '(ctl) i get-shortcut-prefix)
-		   (stv i set-shortcut-prefix '(shift ctl))
-		   (st '(shift ctl) i get-shortcut-prefix)
-		   (stv i set-shortcut-prefix p)))])
-	  (st (list i1 i2 i3) m get-items)
-	  
-	  (st "&Plain" i1 get-label)
-	  (st "Plain" i1 get-plain-label)
-	  (st "Help" i1 get-help-string)
-	  (st #f i1 get-shortcut)
-
-	  (st "Che&ckable" i3 get-label)
-	  (st "Checkable" i3 get-plain-label)
-	  (st #f i3 get-help-string)
-	  (st #\C i3 get-shortcut)
-
-	  (shortcut-test i1 (list i2 i3) 'plain)
-	  (shortcut-test i3 (list i2 i1) 'check)
-
-	  (st (list i2 i1 i3) m get-items)
-	  (stv i2 delete)
-	  (st #t i2 is-deleted?)
-	  (st (list i1 i3) m get-items)
-	  (stv i2 restore)
-	  (st #f i2 is-deleted?)
-	  (st (list i1 i3 i2) m get-items)
-
-	  'done)
-
-	(printf "Menu 2\n")
-	(let* ([m2 (make-object menu% "&Edit" mb "Help Edit")]
-	       [i2 m2])
-	  (st (list i i2) mb get-items)
-	  (st mb i2 get-parent)
-
-	  (st "&Edit" i2 get-label)
-	  (st "Edit" i2 get-plain-label)
-	  (st "Help Edit" i2 get-help-string)
-
-	  (delete-enable-test i2 mb (list i))
-
-	  (st null m2 get-items)
-
-	  ; Move orig to end
-	  (stv i delete)
-	  (stv i restore)
-	  (st (list i2 i) mb get-items)))
-
-      'done)))
-
-(define frame (let ([l (get-top-level-windows)])
-		(test 1 'list-size (length l))
-		(car l)))
-(st "Yes & No" frame get-label)
-
-(send frame show #f)
-
-(define (test-controls parent frame)
-  (define side-effect #f)
-  
-  (printf "Buttons\n")
-  (letrec ([b (make-object button% 
-			   "&Button"
-			   parent
-			   (lambda (bt e)
-			     (test bt 'same-button b)
-			     (test-control-event e '(button))
-			     (set! side-effect 'button)
-			     'oops)
-			   '(border))])
-    (label-test b "Button")
-    (stv b command (make-object control-event% 'button))
-    (test 'button 'button-callback side-effect)
-    
-    (containee-window-tests b #f #f parent frame 2))
-
-  (printf "Check Box\n")
-  (letrec ([c (make-object check-box% 
-			   "&Check Box"
-			   parent
-			   (lambda (cb e)
-			     (test cb 'same-check c)
-			     (test-control-event e '(check-box))
-			     (set! side-effect 'check-box)
-			     'oops)
-			   null)])
-    (label-test c "Check Box")
-    (stv c command (make-object control-event% 'check-box))
-    (test 'check-box 'check-box-callback side-effect)
-    
-    (st #f c get-value)
-    (stv c set-value #t)
-    (st #t c get-value)
-    (stv c set-value #f)
-    (st #f c get-value)
-    
-    (containee-window-tests c #f #f parent frame 2))
-  (let ([c (make-object check-box% "True"
-			parent void
-			null
-			#t)])
-    (st #t c get-value))
-
-  (printf "Radio Box\n")
-  (letrec ([r (make-object radio-box%
-			   "&Radio Box"
-			   (list "O&ne" "T&wo" "T&hree")
-			   parent
-			   (lambda (rb e)
-			     (test rb 'same-radio r)
-			     (test-control-event e '(radio-box))
-			     (set! side-effect 'radio-box)
-			     'oops)
-			   '(vertical))])
-    (label-test r "Radio Box")
-    (stv r command (make-object control-event% 'radio-box))
-    (test 'radio-box 'radio-box-callback side-effect)
-
-    ; Try every combination of enable states:
-    (let ([try-all
-	   (lambda ()
-	     (let loop ([n 7])
-	       (let ([0? (positive? (bitwise-and n 1))]
-		     [1? (positive? (bitwise-and n 2))]
-		     [2? (positive? (bitwise-and n 4))])
-		 (st 0? r is-enabled? 0)
-		 (st 1? r is-enabled? 1)
-		 (st 2? r is-enabled? 2)
-		 (let ([0? (positive? (bitwise-and (sub1 n) 1))]
-		       [1? (positive? (bitwise-and (sub1 n) 2))]
-		       [2? (positive? (bitwise-and (sub1 n) 4))])
-		   (stv r enable 0 0?)
-		   (stv r enable 1 1?)
-		   (stv r enable 2 2?)
-		   (unless (zero? n)
-		     (loop (sub1 n))))))
-	     (st #t r is-enabled? 0)
-	     (st #t r is-enabled? 1)
-	     (st #t r is-enabled? 2))])
-      (try-all)
-      (stv r enable #f)
-      (try-all)
-      (stv r enable #t))
-
-    (st "O&ne" r get-item-label 0)
-    (st "T&wo" r get-item-label 1)
-    (st "T&hree" r get-item-label 2)
-    (st "One" r get-item-plain-label 0)
-    (st "Two" r get-item-plain-label 1)
-    (st "Three" r get-item-plain-label 2)
-
-    (st 3 r get-number)
-
-    (st 0 r get-selection)
-    (stv r set-selection 1)
-    (st 1 r get-selection)
-    (stv r set-selection 2)
-    (st 2 r get-selection)
-    (stv r set-selection 1)
-    (st 1 r get-selection)
-    (stv r set-selection 0)
-    (st 0 r get-selection)
-    
-    (containee-window-tests r #f #f parent frame 2))
-  (letrec ([r (make-object radio-box%"Radio Two"
-			   (list "O&ne" "T&wo" "T&hree")
-			   parent
-			   void
-			   '(vertical)
-			   2)])
-    (st 2 r get-selection))
-  (mismatch (make-object radio-box%"Radio Two"
-			 (list "O&ne" "T&wo" "T&hree")
-			 parent
-			 void
-			 '(vertical)
-			 3))
-
-  (printf "Gauge\n")
-  (letrec ([g (make-object gauge% 
-			   "&Gauge"
-			   10
-			   parent
-			   '(horizontal))])
-    (label-test g "Gauge")
-    
-    (st 0 g get-value)
-    (stv g set-value 8)
-    (st 8 g get-value)
-    (stv g set-value 0)
-    (st 0 g get-value)
-    (stv g set-value 10)
-    (st 10 g get-value)
-
-    (st 10 g get-range)
-    (stv g set-range 11)
-    (st 11 g get-range)
-    (st 10 g get-value)
-    (stv g set-range 8)
-    (st 8 g get-range)
-    (st 8 g get-value)
-    (stv g set-range 1)
-    (st 1 g get-range)
-    (st 1 g get-value)
-    (stv g set-range 10)
-    (st 10 g get-range)
-    (st 1 g get-value)
-
-    (stv g set-range 100011)
-    (stv g set-value 100010)
-    
-    (containee-window-tests g #t #f parent frame 2))
-
-  (printf "Slider\n")
-  (mismatch
-   (new slider% [parent parent] [label #f] [min-value 10] [max-value 9]))
-  (mismatch
-   (new slider% [parent parent] [label #f] [min-value 10] [max-value 11] [init-value 12]))
-  (letrec ([s (make-object slider% 
-			   "&Slider"
-			   -2 8
-			   parent
-			   (lambda (sl e)
-			     (test sl 'same-slider s)
-			     (test-control-event e '(slider))
-			     (set! side-effect 'slider)
-			     'oops)
-			   3
-			   '(horizontal))])
-    (label-test s "Slider")
-    (stv s command (make-object control-event% 'slider))
-    (test 'slider 'slider-callback side-effect)
-    
-    (st 3 s get-value)
-    (stv s set-value 4)
-    (st 4 s get-value)
-    (stv s set-value -2)
-    (st -2 s get-value)
-    (stv s set-value 8)
-    (st 8 s get-value)
-
-    (containee-window-tests s #t #f parent frame 2))
-
-  (let ([test-list-control
-	 (lambda (l choice? multi?)
-	   (st 3 l get-number)
-	   
-	   (st "A" l get-string 0)
-	   (st "B" l get-string 1)
-	   (st "C & D" l get-string 2)
-
-	   (unless choice?
-	     (st 'a l get-data 0)
-	     (st #f l get-data 1)
-	     (st 'c-&-d l get-data 2))
-	   
-	   (st 0 l find-string "A")
-	   (st 1 l find-string "B")
-	   (st 2 l find-string "C & D")
-	   (st #f l find-string "C")
-
-	   (stv l set-selection 2)
-	   (st 2 l get-selection)
-	   (st "C & D" l get-string-selection)
-	   (stv l set-selection 1)
-	   (st 1 l get-selection)
-	   (st "B" l get-string-selection)
-	   (stv l set-selection 0)
-	   (st 0 l get-selection)
-	   (st "A" l get-string-selection)
-	   
-	   (stv l set-string-selection "C & D")
-	   (st 2 l get-selection)
-	   (st "C & D" l get-string-selection)
-	   (stv l set-string-selection "B")
-	   (st 1 l get-selection)
-	   (st "B" l get-string-selection)
-	   (stv l set-string-selection "A")
-	   (st 0 l get-selection)
-	   (st "A" l get-string-selection)
-
-	   (stv l set-selection 2)
-	   
-	   (unless choice?
-	     (st '(2) l get-selections)
-	     (stv l set-selection 1)
-	     (st #t l is-selected? 1)
-	     (st #f l is-selected? 2)
-	     (st '(1) l get-selections)
-	     (stv l set-selection 2)
-	     (st #f l is-selected? 1)
-	     (st #t l is-selected? 2)
-	     
-	     (stv l select 2 #f)
-	     (st '() l get-selections)
-	     (st #f l get-selection)
-	     (stv l select 0 #t)
-	     (st '(0) l get-selections)
-
-	     (stv l select 2 #t)
-	     (st (if multi? '(0 2) '(2)) l get-selections)
-	     (stv l select 1 #t)
-	     (st (if multi? '(0 1 2) '(1)) l get-selections)
-	     (stv l select 1 #f)
-	     (st (if multi? '(0 2) '()) l get-selections)
-	     (st (if multi? 0 #f) l get-selection)
-	     (stv l select 2 #t)
-	     (st (if multi? '(0 2) '(2)) l get-selections)
-	     (st (if multi? 0 2) l get-selection)
-	     (st multi? l is-selected? 0)
-	     (st #t l is-selected? 2)
-	     (stv l set-selection 2)
-	     (st '(2) l get-selections))
-
-	   (if choice?
-	       (stv l append "E")
-	       (stv l append "E" 'e))
-	   (st 4 l get-number)
-	   (st 2 l get-selection)
-	   (unless choice?
-	     (st 'e l get-data 3))
-	   (stv l append "F & G")
-	   (st 5 l get-number)
-	   (st 2 l get-selection)
-	   (unless choice?
-	     (st #f l get-data 4))
-
-	   (stv l set-selection 4)
-	   (st 4 l get-selection)
-	   (st "F & G" l get-string-selection)
-	   (stv l set-selection 2)
-	   (stv l set-string-selection "F & G")
-	   (st 4 l get-selection)
-	   (st "F & G" l get-string-selection)
-
-	   (unless choice?
-	     (stv l delete 1)
-	     (st 4 l get-number)
-	     (st "A" l get-string 0)
-	     (st 'a l get-data 0)
-	     (st "C & D" l get-string 1)
-	     (st 'c-&-d l get-data 1)
-
-	     (stv l delete 0)
-	     (st 3 l get-number))
-
-	   (stv l clear)
-	   (st 0 l get-number)
-	   (st #f l get-selection)
-	   (st #f l get-string-selection)
-
-	   (stv l append "Z")
-	   (st 1 l get-number)
-	   (when choice?
-	     (st 0 l get-selection)
-	     (st "Z" l get-string-selection))
-
-	   (unless choice?
-	     (st 1 l get-number)
-	     (stv l set '("ONe" "TW&o" "THRee"))
-	     (st 3 l get-number)
-	     (st "ONe" l get-string 0)
-	     (st "TW&o" l get-string 1)
-	     (st "THRee" l get-string 2)
-
-	     (stv l set-data 0 'my-example-data)
-	     (stv l set-data 2 'my-other-data)
-	     (st 'my-example-data l get-data 0)
-	     (st #f l get-data 1)
-	     (st 'my-other-data l get-data 2))
-
-	   'done-list)])
-
-    (printf "Choice\n")
-    (letrec ([c (make-object choice%
-			     "&Choice"
-			     '("A" "B" "C & D")
-			     parent
-			     (lambda (ch e)
-			       (test ch 'same-choice c)
-			       (test-control-event e '(choice))
-			       (set! side-effect 'choice)
-			       'oops)
-			     null)])
-      (label-test c "Choice")
-      (stv c command (make-object control-event% 'choice))
-      (test 'choice 'choice-callback side-effect)
-      
-      (st 0 c get-selection)
-
-      (test-list-control c #t #f)
-      
-      (containee-window-tests c #f #f parent frame 2))
-    (letrec ([c (make-object choice% "Choice 2"
-			     '("A" "B" "C & D")
-			     parent void
-			     null
-			     2)])
-      (st 2 c get-selection))
-    (mismatch (make-object choice% "Choice 2"
-			   '("A" "B" "C & D")
-			   parent void
-			   null
-			   3))
-
-    (let ([mk-list
-	   (lambda (style)
-	     (printf "List Box: ~a\n" style)
-	     (letrec ([l (make-object list-box%
-				      "&List Box"
-				      '("A" "B" "C & D")
-				      parent
-				      (lambda (lb e)
-					(test lb 'same-list-box l)
-					(test-control-event e '(list-box))
-					(set! side-effect 'list-box)
-					'oops)
-				      style)])
-	       (label-test l "List Box")
-	       (stv l command (make-object control-event% 'list-box))
-	       (test 'list-box 'list-box-callback side-effect)
-	       
-	       (stv l set-data 0 'a)
-	       (stv l set-data 2 'c-&-d)
-	       
-	       (test-list-control l #f (and (or (memq 'multiple style) 
-                                                (memq 'extended style))
-                                            #t))
-	       
-	       (containee-window-tests l #t #t parent frame 2)
-
-               (st '("Column") l get-column-labels)
-               (st '(0) l get-column-order)
-               (let ([check-col-width
-                      (lambda (col)
-                        (let-values ([(val lo hi) (send l get-column-width col)])
-                          (test #t 'col-width (<= 0 lo val hi 10000))))])
-                 (check-col-width 0)
-
-                 (when (memq 'variable-columns style)
-                   (stv l append-column "Second")
-                   (st '("Column" "Second") l get-column-labels)
-                   (st '(0 1) l get-column-order)
-                   (stv l set-column-order '(1 0))
-                   (st '(1 0) l get-column-order)
-                   (stv l set-string 0 "A2" 1)
-                   (check-col-width 1)
-                   (stv l append-column "Three")
-                   (check-col-width 2)
-                   (st '("Column" "Second" "Three") l get-column-labels)
-                   (st '(1 0 2) l get-column-order)
-                   (stv l delete-column 1)
-                   (st '("Column" "Three") l get-column-labels)
-                   (st '(0 1) l get-column-order)))
-               
-	       (stv parent delete-child l)))])
-
-      (mk-list '(single))
-      (mk-list '(multiple))
-      (mk-list '(extended))
-      (mk-list '(single variable-columns)))
-
-    'done-lists)
-  (let ([l (make-object list-box% "List Two"
-			'("A" "B" "C & D")
-			parent
-			void
-			(list 'single)
-			2)])
-    (st 2 l get-selection))
-  (mismatch (make-object list-box% "List Two"
-			 '("A" "B" "C & D")
-			 parent
-			 void
-			 (list 'single)
-			 3))
-
-  (let loop ([styles '((single) (multiple) (multiple hscroll))])
-    (unless (null? styles)
-      (let ([t (make-object text-field% "Label" parent void "Starting Value" (car styles))])
-	(st "Starting Value" t get-value)
-	(stv t set-value "different")
-	(st "different" t get-value)
-
-	(test #t 'is-editor? (is-a? (send t get-editor) text%))
-
-	(containee-window-tests t #t 
-				(and (memq 'multiple (car styles)) #t)
-				parent frame 2)
-
-	(send parent delete-child t)
-	(loop (cdr styles)))))
-
-  (define (check-canvas-no-scroll c)
-    (st 0 c get-scroll-range 'vertical)
-    (st 0 c get-scroll-range 'horizontal)
-    (st 0 c get-scroll-page 'vertical)
-    (st 0 c get-scroll-page 'horizontal)
-    (st 0 c get-scroll-pos 'vertical)
-    (st 0 c get-scroll-pos 'horizontal))
-
-  (let ([c (make-object canvas% parent '())])
-    (check-canvas-no-scroll c)
-    (stv c init-manual-scrollbars 5 6 2 3 4 5)
-    (check-canvas-no-scroll c))
-
-  (let ([c (make-object canvas% parent '(hscroll vscroll))])
-    
-    (printf "Tab Focus\n")
-    (st #f c accept-tab-focus)
-    (stv c accept-tab-focus #t)
-    (st #t c accept-tab-focus)
-    (stv c accept-tab-focus #f)
-    (st #f c accept-tab-focus)
-
-    (check-canvas-no-scroll c)
-
-    (stv c init-auto-scrollbars 500 606 .02 .033)
-    ; (stv c set-scrollbars 100 101 5 6 2 3 10 20 #t)
-    (let-values ([(w h) (send c get-virtual-size)]
-		 [(cw ch) (send c get-client-size)])
-      (printf "Canvas size: Virtual: ~a x ~a  Client: ~a x ~a\n" w h cw ch)
-      (let ([check-scroll
-	     (lambda (xpos ypos)
-	       (let-values ([(x y) (send c get-view-start)])
-		 (let ([coerce (lambda (x) (inexact->exact (floor x)))])
-		   (test (coerce (* xpos (- 500 cw))) `(canvas-view-x ,xpos ,ypos ,x ,cw ,w) x)
-		   (test (coerce (* ypos (- 606 ch))) `(canvas-view-y ,xpos ,ypos ,y ,ch , h) y))))])
-	(test 500 'canvas-virt-w-size w)
-	(test 606 'canvas-virt-h-size h)
-	
-	(check-scroll 0.02 0.033)
-
-	(st 0 c get-scroll-pos 'horizontal)
-	(st 0 c get-scroll-pos 'vertical)
-	(st 0 c get-scroll-page 'horizontal)
-	(st 0 c get-scroll-page 'vertical)
-	(st 0 c get-scroll-range 'horizontal)
-	(st 0 c get-scroll-range 'vertical)
-	
-	(stv c scroll 0.1 0.1)
-	(check-scroll 0.1 0.1)
-	(stv c scroll #f 0.2)
-	(check-scroll 0.1 0.2)
-	(stv c scroll 0.0 #f)
-	(check-scroll 0.0 0.2)
-	
-	'done-sb))
-
-    (stv c init-manual-scrollbars 5 6 2 3 4 5)
-    (let-values ([(w h) (send c get-virtual-size)]
-		 [(cw ch) (send c get-client-size)])
-      (let ([check-scroll
-	     (lambda (xpos ypos)
-	       (st xpos c get-scroll-pos 'horizontal)
-	       (st ypos c get-scroll-pos 'vertical)
-	
-	       (test cw 'canvas-virt-w-size w)
-	       (test ch 'canvas-virt-h-size h)
-	       
-	       (let-values ([(x y) (send c get-view-start)])
-		 (test 0 'canvas-view-x x)
-		 (test 0 'canvas-view-y y)))])
-	
-	(check-scroll 4 5)
-	
-	(st 2 c get-scroll-page 'horizontal)
-	(st 3 c get-scroll-page 'vertical)
-	(st 5 c get-scroll-range 'horizontal)
-	(st 6 c get-scroll-range 'vertical)
-	
-	(stv c scroll 1 1)
-	(check-scroll 4 5)
-
-	(stv c set-scroll-pos 'horizontal 1)
-	(check-scroll 1 5)
-	(stv c set-scroll-pos 'vertical 0)
-	(check-scroll 1 0)
-	
-	(stv c set-scroll-page 'horizontal 1)
-	(st 1 c get-scroll-page 'horizontal)
-	(st 3 c get-scroll-page 'vertical)
-	(stv c set-scroll-page 'vertical 2)
-	(st 1 c get-scroll-page 'horizontal)
-	(st 2 c get-scroll-page 'vertical)
-		
-	'done-sb))
-
-    (stv c init-manual-scrollbars 1000000 1000000 999999 999999 4 5)
-
-    (stv c warp-pointer 21 23)
-
-    (containee-window-tests c #t #t parent frame 0))
-  
-  (let* ([e (make-object text%)]
-	 [c (make-object editor-canvas%
-			 parent e
-			 null
-			 102)])
-    (let loop ([n 100])
-      (unless (zero? n)
-	(send e insert (format "line ~a\n" n))
-	(loop (sub1 n))))
-
-    (st #f c allow-scroll-to-last)
-    (stv c allow-scroll-to-last #t)
-    (st #t c allow-scroll-to-last)
-    (stv c allow-scroll-to-last #f)
-
-    (st 'hello c call-as-primary-owner (lambda () 'hello))
-
-    (st #f c force-display-focus)
-    (stv c force-display-focus #t)
-    (st #t c force-display-focus)
-    (stv c force-display-focus #f)
-
-    (st e c get-editor)
-    (stv c set-editor #f)
-    (st #f c get-editor)
-    (stv c set-editor e)
-    (st e c get-editor)
-
-    (st #f c lazy-refresh)
-    (stv c lazy-refresh #t)
-    (st #t c lazy-refresh)
-    (stv c lazy-refresh #f)
-
-    (st #f c scroll-with-bottom-base)
-    (stv c scroll-with-bottom-base #t)
-    (st #t c scroll-with-bottom-base)
-    (stv c scroll-with-bottom-base #f)
-
-    (stv c set-line-count 6)
-    (stv c set-line-count #f)
-
-    (containee-window-tests c #t #t parent frame 0))
-
-  'done)
-
-(test-controls frame frame)
-
-(define (panel-tests frame% show? #:shorter? [shorter? shorter?])
-  (define (panel-test % win? 
-                      #:choices? [choices? #f]
-                      #:label? [label? #f]
-                      #:margin [m 0]
-                      #:style [style '()])
-    (let* ([frame (make-object frame% "Panel Test" #f 100 100)]
-           [panel (if %
-                      (cond
-                       [choices?
-                        (new % [parent frame] [choices '("A" "B")] [style style])]
-                       [label?
-                        (new % [parent frame] [label "Stuff"])]
-                       [else (new % [parent frame])])
-		      frame)])
-      (let ([go
-	     (lambda ()
-	       (test-controls panel frame)
-	       (if win?
-		   ((if % containee-window-tests window-tests) panel #t #t (and % frame) frame m)
-		   (area-tests panel #t #t #f #f))
-               (when (is-a? panel panel%)
-                 (st (is-a? panel horizontal-panel%) panel get-orientation))
-	       (container-tests panel win?)
-	       (send frame show #f))])
-	(when (eq? show? 'dialog)
-	  (queue-callback go))
-	(when show?
-	  (send frame show #t))
-	(unless (eq? show? 'dialog)
-	  (go)))))
-  (panel-test #f #t)
-  (unless shorter?
-    (panel-test vertical-pane% #f)
-    (panel-test horizontal-pane% #f)
-    (panel-test vertical-panel% #t)
-    (panel-test horizontal-panel% #t)
-    (panel-test tab-panel% #t #:choices? #t))
-  (panel-test tab-panel% #t #:choices? #t #:style '(no-border))
-  (panel-test group-box-panel% #t #:label? #t #:margin 2))
-
-(panel-tests dialog% #f)
-(panel-tests frame% #t #:shorter? #f)
-(panel-tests frame% #f)
-(panel-tests dialog% 'dialog)
-
-(let ([e (make-object mouse-event%
-                      'motion
-                      #t ; left
-                      #f ; middle
-                      #f ; right
-                      11 ; x
-                      33 ; y
-                      #t ; shift
-                      #f ; control
-                      #t ; meta
-                      #f ; alt
-                      13 ; timestamp
-                      #f ; caps
-                      #t ; mod3
-                      #f ; mod4
-                      #t ; mod5
-                      )])
-  (st 'motion e get-event-type)
-  (st #t e get-left-down)
-  (st #f e get-middle-down)
-  (st #f e get-right-down)
-  (st 11 e get-x) 
-  (st 33 e get-y)
-  (st #t e get-shift-down)
-  (st #f e get-control-down)
-  (st #t e get-meta-down)
-  (st #f e get-alt-down)
-  (st 13 e get-time-stamp)
-  (st #f e get-caps-down)
-  (st #t e get-mod3-down)
-  (st #f e get-mod4-down)
-  (st #t e get-mod5-down))
-
-(let ([e (make-object key-event%
-                      #\x
-                      #t ; shift
-                      #f ; control
-                      #t ; meta
-                      #f ; alt
-                      11 ; x
-                      33 ; y
-                      13 ; timestamp
-                      #f ; caps
-                      #t ; mod3
-                      #f ; mod4
-                      #t ; mod5
-                      )])
-  (st #\x e get-key-code)
-  (st 'press e get-key-release-code)
-  (st 11 e get-x) 
-  (st 33 e get-y)
-  (st #t e get-shift-down)
-  (st #f e get-control-down)
-  (st #t e get-meta-down)
-  (st #f e get-alt-down)
-  (st 13 e get-time-stamp)
-  (st #f e get-caps-down)
-  (st #t e get-mod3-down)
-  (st #f e get-mod4-down)
-  (st #t e get-mod5-down))
-
-(report-errs)
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/wxme-load.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/wxme-load.rkt
deleted file mode 100644
index d0bd5dcea0..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/wxme-load.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-(require racket/gui/base)
-
-(parameterize ([current-namespace (make-gui-namespace)])
-  (namespace-require 'racket/gui/init)
-  (void (load (collection-file-path "prog8.mre" "tests" "gracket"))))
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/wxme-random.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/wxme-random.rkt
deleted file mode 100644
index 5948182fb3..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/wxme-random.rkt
+++ /dev/null
@@ -1,198 +0,0 @@
-#lang scheme/gui
-
-(define seed (abs (current-milliseconds)))
-(random-seed seed)
-
-(define use-nested? #t)
-
-(error-print-context-length 100)
-
-;; Don't paste before copying, because that interferes with replay
-(define copied? #f)
-(define copy-len 0)
-
-(define (go pause x-pos)
-  (define orig-t (new text%))
-
-  (define frame
-    (new (class frame% 
-           (define/augment (on-close) (exit))
-           (super-new))
-         [label "Test"]
-         [width 300]
-         [height 400]
-         [x x-pos]))
-
-  (define canvas
-    (new editor-canvas% [parent frame] [editor orig-t]))
-  
-  (define _1 (send frame show #t))
-  
-  (define (init t)
-    (send t set-max-undo-history 100))
-  (define _2 (init orig-t))
-
-  (define (random-elem v)
-    (vector-ref v (random (vector-length v))))
-
-  (define (random-string)
-    (random-elem '#("a" "x\ny\nz\n" "(define (f x)\n  (+ x x))\n" "hello there" "" "\n")))
-
-  (define seqs (make-hasheq))
-
-  (define ts-length 64)
-  (define ts-pos 0)
-  (define ts (make-vector ts-length orig-t))
-  (define (add-t! t2)
-    (if (= ts-pos ts-length)
-        (let ([v ts])
-          (set! ts (make-vector ts-length orig-t))
-          (set! ts-pos 0)
-          (for ([t3 (in-vector v)])
-            (when (zero? (random 2))
-              (add-t! t3)))
-          (add-t! t2))
-        (begin
-          (vector-set! ts ts-pos t2)
-          (set! ts-pos (add1 ts-pos)))))
-
-  (define (set-copied?! t)
-    (let ([len (- (send t get-end-position)
-                  (send t get-start-position))])
-      (if (zero? len)
-          #f
-          (begin
-            (set! copy-len len)
-            (set! copied? #t)
-            #t))))
-
-  (define (maybe-convert)
-    (when (zero? (random 4))
-      (let ([data (send the-clipboard get-clipboard-data "WXME" 0)])
-        (send the-clipboard set-clipboard-client
-              (new (class clipboard-client%
-                     (inherit add-type)
-                     (super-new)
-                     (add-type "WXME")
-                     (define/override (get-data format) data)))
-              0))))
-
-  (define actions
-    (vector
-     (lambda (t) (send t undo))
-     (lambda (t) (send t redo))
-     (lambda (t) (send t insert (random-string) (random (add1 (send t last-position)))))
-     (lambda (t) (send t insert "\t" (random (add1 (send t last-position)))))
-     (lambda (t) 
-       (let ([pos (random (add1 (send t last-position)))])
-         (send t delete pos (random (max 1 (- (send t last-position) pos))))))
-     (lambda (t)
-       (send t begin-edit-sequence)
-       (hash-update! seqs t add1 0))
-     (lambda (t) 
-       (let loop ()
-         (when (positive? (hash-ref seqs t 0))
-           (send t end-edit-sequence)
-           (hash-update! seqs t sub1)
-           (when (zero? (random 2))
-             (loop)))))
-     (lambda (t) 
-       (let ([pos (random (add1 (send t last-position)))])
-         (send t set-position pos (random (max 1 (- (send t last-position) pos))))))
-     (lambda (t) (when (set-copied?! t) (send t copy) (maybe-convert)))
-     (lambda (t) (when (set-copied?! t) (send t cut) (maybe-convert)))
-     (lambda (t) (when copied? 
-                   (let ([s (send t get-start-position)]
-                         [e (send t get-end-position)]
-                         [l (send t last-position)])
-                     (send t paste)
-                     (when copy-len
-                       (unless (= (send t last-position)
-                                  (+ (- l (- e s)) copy-len))
-                         (error 'paste "length mismatch: [~s, ~s) in ~s + ~s ~s -> ~s"
-                                s e l copy-len 
-                                (send the-clipboard get-clipboard-data "TEXT" 0)
-                                (send t last-position)))))
-                   (when (zero? (random 4))
-                     (set! copy-len #f)
-                     (send t paste-next))))
-     (lambda (t) (send t change-style (make-object style-delta% 'change-size (add1 (random 42)))))
-     (lambda (t) (send t change-style 
-                       (send (make-object style-delta%) set-delta-foreground (make-object color%
-                                                                                          (random 256)
-                                                                                          (random 256)
-                                                                                          (random 256)))))
-     (lambda (t) 
-       (when use-nested?
-         (let ([t2 (new text%)])
-           (add-t! t2)
-           (init t2)
-           (send t insert (make-object editor-snip% t2)))))
-     (lambda (t)
-       (send t set-max-width (if (zero? (random 2)) 
-                                 (+ 50.0 (/ (random 500) 10.0))
-                                 'none)))
-     (lambda (t) (yield (system-idle-evt)))
-     (lambda (t) (pause))
-     ))
-  
-  (send canvas focus)
-  
-  (let loop ()
-    (let ([act (random-elem actions)]
-          [t (if (zero? (random 2))
-                 orig-t
-                 (random-elem ts))])
-      (printf "~s: ~s ~s\n" seed (eq-hash-code t) act)
-      (act t)
-      (loop))))
-
-(define (run-one)
-  (go void 50))
-
-(define (run-two-concurrent)
-  (define sema-one (make-semaphore))
-  (define sema-two (make-semaphore))
-  
-  (define (make sema-this sema-other x-pos)
-    (parameterize ([current-eventspace (make-eventspace)])
-      (queue-callback
-       (lambda ()
-         (semaphore-wait sema-this)
-         (go (lambda ()
-               (semaphore-post sema-other)
-               (semaphore-wait sema-this))
-             x-pos)))
-      (current-eventspace)))
-
-  (define e1 (make sema-one sema-two 50))
-  (define e2 (make sema-two sema-one 350))
-  (semaphore-post sema-one)
-  (application-quit-handler (lambda args (exit)))
-  (yield never-evt))
-
-(define (run-two)
-  (define one-box (box #f))
-  (define two-box (box #f))
-  (define (make box-this box-other x-pos)
-    (let/ec esc
-      (call-with-continuation-prompt
-       (lambda ()
-         (begin
-           (let/cc k
-             (set-box! box-this k)
-             (esc))
-           (go (lambda ()
-                 (let/cc k
-                   (set-box! box-this k)
-                   ((unbox box-other))))
-               x-pos))))))
-
-  (make one-box two-box 50)
-  (make two-box one-box 350)
-  (call-with-continuation-prompt
-   (lambda ()
-     ((unbox one-box)))))
-
-(run-two)
-
diff --git a/pkgs/gui-pkgs/gui-test/tests/gracket/wxme.rkt b/pkgs/gui-pkgs/gui-test/tests/gracket/wxme.rkt
deleted file mode 100644
index 4666e063c1..0000000000
--- a/pkgs/gui-pkgs/gui-test/tests/gracket/wxme.rkt
+++ /dev/null
@@ -1,1605 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/contract
-         (only-in racket/gui/base
-                  color% 
-                  font%
-                  the-clipboard
-                  clipboard-client%
-                  key-event%
-                  mouse-event%)
-         racket/snip
-         mred/private/wxme/mline
-         mred/private/wxme/editor
-         mred/private/wxme/text
-         mred/private/wxme/pasteboard
-         "test-editor-admin.rkt"
-         mred/private/wxme/stream
-         mred/private/wxme/keymap
-         mred/private/wxme/editor-snip
-         (for-syntax racket/base))
-
-(define wrong-cnt 0)
-(define test-cnt 0)
-
-(define-syntax (expect stx)
-  (syntax-case stx ()
-    [(_ a b)
-     #`(expect/proc #,(syntax-line stx) a b)]))
-
-(define (expect/proc line v v2)
-  (set! test-cnt (add1 test-cnt))
-  (unless (equal? v v2)
-    (set! wrong-cnt (add1 wrong-cnt))
-    (eprintf "FAILED: line ~a\nexpected: ~s\n     got: ~s\n" 
-             line
-             v2
-             v)))
-
-(define (done)
-  (printf "\n~a tests\n" test-cnt)
-  (if (zero? wrong-cnt)
-      (printf "all passed\n")
-      (eprintf "~s FAILED\n" wrong-cnt)))
-
-;; ----------------------------------------
-;; String snips and lines
-
-(define s (make-object string-snip% "helko"))
-(send s insert "cat " 4 2)
-(void (send s get-text 0 (send s get-count)))
-(send s set-flags (cons 'invisible (send s get-flags)))
-(void (send s get-flags))
-(void (send (send (get-the-snip-class-list) find "wxtext") get-classname))
-
-(define root-box (box mline-NIL))
-(define m20 (mline-insert #f root-box #t))
-(expect (mline-get-line m20) 0)
-(define m00 (mline-insert m20 root-box #t))
-(expect (mline-get-line m00) 0)
-(expect (mline-get-line m20) 1)
-(expect (mline-get-position m00) 0)
-(expect (mline-get-position m20) 0)
-(mline-set-length m00 5)
-(mline-set-length m20 20)
-(expect (mline-get-position m00) 0)
-(expect (mline-get-position m20) 5)
-
-(mline-check-consistent (unbox root-box))
-
-;; ----------------------------------------
-;; Line inserts and deletes
-
-(define m5 (mline-insert m20 root-box #t))
-(mline-check-consistent (unbox root-box))
-
-(mline-set-length m5 10)
-
-(expect (mline-get-position m00) 0)
-(expect (mline-get-position m5) 5)
-(expect (mline-get-position m20) 15)
-
-(mline-delete m5 root-box)
-(expect (mline-get-position m20) 5)
-
-(set! m5 (mline-insert m20 root-box #t))
-(mline-set-length m5 8)
-
-(expect (mline-get-position m00) 0)
-(expect (mline-get-position m5) 5)
-(expect (mline-get-position m20) 13)
-
-(mline-delete m5 root-box)
-
-(mline-check-consistent (unbox root-box))
-
-;; ----------------------------------------
-;; Line counts and positions
-
-(define m30 (mline-insert m20 root-box #f))
-
-(expect (mline-get-line m00) 0)
-(expect (mline-get-line m20) 1)
-(expect (mline-get-line m30) 2)
-
-(expect (mline-get-position m00) 0)
-(expect (mline-get-position m20) 5)
-(expect (mline-get-position m30) 25)
-
-(mline-check-consistent (unbox root-box))
-
-;; ----------------------------------------
-;; More line lines and positions
-
-(define m05 (mline-insert m00 root-box #f))
-
-(mline-set-length m05 2)
-
-(expect (mline-get-line m00) 0)
-(expect (mline-get-line m05) 1)
-(expect (mline-get-line m20) 2)
-(expect (mline-get-line m30) 3)
-
-(expect (mline-get-position m00) 0)
-(expect (mline-get-position m05) 5)
-(expect (mline-get-position m20) 7)
-(expect (mline-get-position m30) 27)
-
-(mline-check-consistent (unbox root-box))
-
-;; ----------------------------------------
-;; Line inserts and deletes, radomized
-
-(let ([added
-       (let loop ([l (list m00 m05 m20 m30)]
-                  [n 100])
-         (let ([m (mline-insert (list-ref l (random (length l))) 
-                                root-box
-                                (zero? (random 2)))])
-           (mline-check-consistent (unbox root-box))
-           (if (zero? n)
-               (cons m l)
-               (loop (cons m l) (sub1 n)))))])
-  (for-each (lambda (i)
-              (mline-delete i root-box)
-              (mline-check-consistent (unbox root-box)))
-            (cdr added))
-  (expect (mline-next (car added)) #f)
-  (expect (mline-prev (car added)) #f)
-  (expect (unbox root-box)
-          (car added)))
-
-;; ----------------------------------------
-;; Styles, deltas, lists
-
-(define d1 (new style-delta%))
-(define d2 (new style-delta%))
-(expect (send d1 get-underlined-on) #f)
-(expect (send d1 equal? d2) #t)
-(send d1 set-underlined-on #t)
-(expect (send d1 equal? d2) #f)
-(void (send d2 collapse d1))
-(expect (send d2 get-underlined-on) #t)
-(send d2 set-underlined-on #f)
-(send d1 copy d2)
-(expect (send d1 get-underlined-on) #f)
-
-(define sl (new style-list%))
-(expect #t (eq? (send sl basic-style) (send sl basic-style)))
-(define s-plain (send sl find-or-create-style (send sl basic-style)
-                      (new style-delta%)))
-(expect (send sl find-or-create-style (send sl basic-style)
-              (new style-delta%))
-        s-plain)
-
-(send d1 set-underlined-on #t)
-(define s-underlined (send sl find-or-create-style s-plain d1))
-(expect (send s-plain get-underlined) #f)
-(expect (send s-underlined get-underlined) #t)
-
-(send d2 set-underlined-off #t)
-(send d2 set-smoothing-on 'partly-smoothed)
-(define s-nonunderlined1 (send sl find-or-create-style s-underlined d2))
-(expect (send s-nonunderlined1 get-underlined) #f)
-(expect (send s-nonunderlined1 get-base-style) (send sl basic-style)) ; due to collpasing
-
-(define s-named-underlined (send sl new-named-style "underlined" s-underlined))
-(define s-nonunderlined (send sl find-or-create-style s-named-underlined d2))
-(expect (send s-nonunderlined get-underlined) #f)
-(expect (send s-nonunderlined get-base-style) s-named-underlined)
-
-(send d1 set-family 'modern)
-(define s-modern (send sl find-or-create-style s-plain d1))
-(expect (send s-modern get-underlined) #t)
-(expect (send s-modern get-family) 'modern)
-(expect (send s-plain get-family) 'default)
-
-(expect (send s-plain is-join?) #f)
-
-(define s-modern+nonunderlined (send sl find-or-create-join-style
-                                     s-modern
-                                     s-nonunderlined))
-(expect (send s-modern+nonunderlined get-underlined) #f)
-(expect (send s-modern+nonunderlined get-smoothing) 'partly-smoothed)
-(expect (send s-modern+nonunderlined get-family) 'modern)
-(expect (send s-modern+nonunderlined is-join?) #t)
-
-(send d2 set-smoothing-on 'base)
-(send s-nonunderlined set-delta d2)
-(expect (send s-nonunderlined get-smoothing) 'default)
-(expect (send s-modern+nonunderlined get-smoothing) 'default)
-
-(send d1 set-style-on 'italic)
-(send s-modern set-delta d1)
-(expect (send s-modern get-style) 'italic)
-(expect (send s-modern+nonunderlined get-style) 'italic)
-
-(expect (send s-plain get-alignment) 'bottom)
-(expect (send (send s-plain get-background) red) 255)
-(expect (send s-plain get-base-style) (send sl basic-style))
-(expect (send s-modern+nonunderlined get-base-style) s-modern)
-(expect (send s-plain get-face) #f)
-(expect (send s-plain get-name) #f)
-(expect (send s-plain get-shift-style) (send sl basic-style))
-(expect (send s-modern+nonunderlined get-shift-style) s-nonunderlined)
-(expect (send s-plain get-size-in-pixels) #f)
-(expect (send s-plain get-transparent-text-backing) #t)
-(expect (send s-plain get-weight) 'normal)
-
-(expect (send s-nonunderlined get-base-style) s-named-underlined)
-(send s-nonunderlined set-base-style s-modern+nonunderlined) ; would create cycle
-(expect (send s-nonunderlined get-base-style) s-named-underlined)
-
-(send s-modern+nonunderlined set-base-style s-plain)
-(expect (send s-modern+nonunderlined get-family) 'default)
-(expect (send s-modern+nonunderlined get-style) 'normal)
-
-(send s-modern+nonunderlined set-shift-style s-modern+nonunderlined) ; would create cycle
-
-(define sl2 (new style-list%))
-(define s2-modern (send sl2 convert s-modern))
-(expect (send s2-modern get-family) 'modern)
-
-;; ----------------------------------------
-;; Lines, positions, paragraphs
-
-(define t (new text%))
-(expect (send t get-text) "")
-(expect (send t last-position) 0)
-(expect (send t get-start-position) 0)
-(expect (send t get-end-position) 0)
-(expect (send t position-line 0) 0)
-(expect (send t position-paragraph 0) 0)
-
-(send t insert "hello")
-(expect (send t get-text) "hello")
-(expect (send t get-text 3) "lo")
-(expect (send t get-text 2 4) "ll")
-(expect (send t last-position) 5)
-(expect (send t last-line) 0)
-(expect (send t get-start-position) 5)
-(expect (send t get-end-position) 5)
-(expect (send t get-character 1) #\e)
-(expect (send t position-line 1) 0)
-(expect (send t position-paragraph 1) 0)
-
-(send t insert "!\nbye")
-(expect (send t get-text) "hello!\nbye")
-(expect (send t last-position) 10)
-(expect (send t line-length 0) 7)
-(expect (send t line-length 1) 3)
-(expect (send t last-line) 1)
-(expect (send t line-start-position 0) 0)
-(expect (send t line-start-position 1) 7)
-(expect (send t line-end-position 0) 6)
-(expect (send t position-line 0) 0)
-(expect (send t position-line 1) 0)
-(expect (send t position-line 6) 0)
-(expect (send t position-line 7 #t) 0)
-(expect (send t position-line 7) 1)
-(expect (send t position-line 10) 1)
-(expect (send t position-paragraph 1) 0)
-(expect (send t position-paragraph 6) 0)
-(expect (send t position-paragraph 7 #t) 1) ; no eol ambiguity for paragraphs
-(expect (send t position-paragraph 7) 1)
-(expect (send t position-paragraph 8) 1)
-(expect (send t get-start-position) 10)
-(expect (send t get-end-position) 10)
-
-(send t set-position 7 8)
-(expect (send t get-start-position) 7)
-(expect (send t get-end-position) 8)
-(expect
- (let ([b (box 0)][e (box 0)])
-   (list
-    (begin (send t get-position b) (unbox b))
-    (begin (send t get-position #f e) (list (unbox b) (unbox e)))))
- '(7 (7 8)))
-
-(send t insert ".\t," 2 4)
-(expect (send t get-text) "he.\t,o!\nbye")
-(expect (send t get-start-position) 8)
-(expect (send t get-end-position) 9)
-
-(send t insert "\n3\n" 10)
-(expect (send t get-text) "he.\t,o!\nby\n3\ne")
-(expect (send t last-line) 3)
-(expect (send t get-start-position) 8)
-(expect (send t get-end-position) 9)
-(send t set-position 100)
-(expect (send t get-start-position) 14)
-(expect (send t get-end-position) 14)
-(send t set-position 14)
-(expect (send t get-start-position) 14)
-(expect (send t get-end-position) 14)
-
-(send t delete (send t last-position))
-(expect (send t get-text) "he.\t,o!\nby\n3\n")
-(expect (send t last-line) 3)
-(expect (send t get-start-position) 13)
-(expect (send t get-end-position) 13)
-
-(send t insert "4" (send t last-position))
-(expect (send t get-text) "he.\t,o!\nby\n3\n4")
-(expect (send t last-line) 3)
-(send t delete 9 11)
-(expect (send t last-line) 2)
-(expect (send t get-text) "he.\t,o!\nb3\n4")
-
-(send t set-position 2 4)
-(send t delete)
-(expect (send t get-text) "he,o!\nb3\n4")
-(expect (send t last-line) 2)
-(expect (send t get-start-position) 2)
-(expect (send t get-end-position) 2)
-(expect (send t position-line 6) 1)
-(expect (send t position-line 7) 1)
-(expect (send t position-line 12) 2)
-
-(send t insert (make-object string-snip% "?") 2)
-(expect (send t get-text) "he?,o!\nb3\n4")
-
-(expect (send t find-string "o") 4)
-(expect (send t find-string "q") #f)
-(expect (send t find-string "\n") 6)
-(expect (send t find-string "\n" 'forward) 6)
-(expect (send t find-string "\n" 'forward 7) 9)
-(expect (send t find-string "\n" 'backward 7) 7)
-(expect (send t find-string "\n" 'backward 9) 7)
-(expect (send t find-string-all "\n") '(6 9))
-(expect (send t find-string-all "\n" 'forward 3 7) '(6))
-(expect (send t find-string-all "\n" 'backward 8 4) '(7))
-(expect (send t find-string-all "\n" 'backward 8 4 #f) '(6))
-(expect (send t find-string "\n4") 9)
-(expect (send t find-string "O") #f)
-(expect (send t find-string "O" 'forward 0 20 #t #f) 4)
-
-(expect (send t find-next-non-string-snip #f) #f)
-
-(let ()
-  (define (txt s)
-    (define t (new text%))
-    (send t insert s)
-    (send t set-position 0 0)
-    t)
-  (define (kmp-search txt str all?)
-    (send txt do-find-string-all str 'forward 0 (send txt last-position) (not all?) #t #t #f))
-  
-  (expect (kmp-search (txt "x") "x" #f) 0)
-  (expect (kmp-search (txt "yx") "x" #f) 1)
-  (expect (kmp-search (txt "yx") "yx" #f) 0)
-  (expect (kmp-search (txt "zyx") "yx" #f) 1)
-  (expect (kmp-search (txt "yyx") "yx" #f) 1)
-  (expect (kmp-search (txt "qqq") "yx" #f) #f)
-  (expect (kmp-search (txt "ABC ABCDAB ABCDABCDABDE") "ABCDABD" #f) 15)
-  (expect (kmp-search (txt "xxxx") "y" #t) '())
-  (expect (kmp-search (txt "xxxx") "x" #t) '(0 1 2 3))
-  (expect (kmp-search (txt "xyxy") "x" #t) '(0 2))
-  (expect (kmp-search (txt " x\n ") "x" #t) '(1))
-  (expect (kmp-search (txt "") "x" #t) '())
-  (expect (send (txt " x\n ") do-find-string-all "X" 'forward 0 'eof #f #t #f #f)
-          '(1))
-  (expect (send (txt "xXxXxX") do-find-string-all "x" 'forward 0 'eof #f #t #f #f)
-          '(0 1 2 3 4 5))
-  (expect (send (txt "xXxXxX") do-find-string-all "x" 'forward 2 4 #f #t #f #f)
-          '(2 3))
-  (expect (send (txt "xyxyxyxyxyx") do-find-string-all "xy" 'forward 2 5 #f #t #t #f)
-          '(2))
-  (expect (send (txt "abcdabcdabcd") do-find-string-all "abcd" 'forward 0 'eof #f #f #t #f)
-          '(4 8 12))
-  (expect (send (txt "qqabcdabcdabcd") do-find-string-all "abcd" 'forward 0 'eof #t #f #t #f)
-          6)
-  (expect (send (txt "qqabcdabcdabcd") do-find-string-all "abcd" 'forward 0 'eof #t #t #t #f)
-          2)
-  (expect (send (txt "abcdabcdabcd") do-find-string-all "abcd" 'backward 12 0 #f #t #t #f)
-          '(12 8 4))
-  (expect (send (txt "abcdabcdabcd") do-find-string-all "abcd" 'backward 12 0 #f #f #t #f)
-          '(8 4 0))
-  (expect (send (txt "abcd\nabcdabcd") do-find-string-all "abcd" 'backward 12 0 #f #t #t #f)
-          '(9 4))
-  (expect (send (txt "abcd\nabcdabcd") do-find-string-all "abcd" 'backward 13 0 #f #t #t #f)
-          '(13 9 4))
-  (expect (send (txt "abcdabcd\nabcd") do-find-string-all "abcd" 'backward 12 0 #f #t #t #f)
-          '(8 4))
-  (expect (send (txt "abcdabcd\nabcd") do-find-string-all "abcd" 'backward 13 0 #f #t #t #f)
-          '(13 8 4))
-  (expect (send (txt "abcdabcd\nabcd") do-find-string-all "abcd" 'backward 8 0 #f #t #t #f)
-          '(8 4))
-  (expect (send (txt "abcdabcd\nabcd") do-find-string-all "abcd" 'forward 4 13 #f #t #t #f)
-          '(4 9))
-  (expect (send (txt "xyz") do-find-string-all "xyz" 'backward 3 0 #t #f #t #f)
-          0)
-  (expect (send (txt "xyz") do-find-string-all "xyz" 'backward 3 0 #t #t #t #f)
-          3)
-  
-  (let ([t1 (new text%)]
-        [t2 (new text%)])
-    (send t1 insert "abc")
-    (send t1 insert (new editor-snip% [editor t2]))
-    (send t1 insert "abc")
-    (send t2 insert "abc")
-    (expect (send t1 do-find-string-all "abc" 'forward 0 (send t1 last-position) #f #t #t #t)
-            (list 0 (list t2 0) 4)))
-  
-  (let ([t1 (new text%)]
-        [t2 (new text%)])
-    (send t1 insert "abc")
-    (send t1 insert (new editor-snip% [editor t2]))
-    (send t1 insert "abc")
-    (send t2 insert "abc")
-    (expect (send t1 do-find-string-all "abc" 'backward (send t1 last-position) 0 #f #t #t #t)
-            (list 7 (list t2 3) 3)))
-  
-  (let ([t1 (new text%)]
-        [t2 (new text%)])
-    (send t1 insert "abc")
-    (send t1 insert (new editor-snip% [editor t2]))
-    (send t1 insert "abcd")
-    (send t2 insert "abc")
-    (expect (send t1 do-find-string-all "abcd" 'forward 0 (send t1 last-position) #t #t #t #t)
-            4))
-  
-  (let ([t1 (new text%)]
-        [t2 (new text%)])
-    (send t1 insert "abc")
-    (send t1 insert (new editor-snip% [editor t2]))
-    (send t1 insert "abc")
-    (send t2 insert "abcd")
-    (expect (send t1 do-find-string-all "abcd" 'forward 0 (send t1 last-position) #t #t #t #t)
-            (cons t2 0)))
-  
-  (let ([t1 (new text%)]
-        [t2 (new text%)]
-        [pb (new pasteboard%)])
-    (send t1 insert "abc")
-    (send t1 insert (new editor-snip% [editor pb]))
-    (send pb insert (new editor-snip% [editor t2]))
-    (send t1 insert "abc")
-    (send t2 insert "abcd")
-    (expect (send t1 do-find-string-all "abcd" 'forward 0 (send t1 last-position) #t #t #t #t)
-            (list* pb t2 0)))
-  
-  (let ([t1 (new text%)]
-        [t2 (new text%)]
-        [t3 (new text%)]
-        [pb (new pasteboard%)])
-    (send t1 insert "abc")
-    (send t1 insert (new editor-snip% [editor pb]))
-    (send pb insert (new editor-snip% [editor t2]))
-    (send pb insert (new editor-snip% [editor t3]))
-    (send t1 insert "abc")
-    (send t2 insert "abcd")
-    (send t3 insert "abcd")
-    (expect (send t1 do-find-string-all "abcd" 'forward 0 (send t1 last-position) #f #t #t #t)
-            (list (list pb (list t2 0) (list t3 0)))))
-  
-  (let ([t1 (new text%)])
-    (send t1 insert "abc")
-    (define es (new editor-snip%))
-    (send t1 insert es)
-    (send t1 insert "abc")
-    (expect (send t1 do-find-string-all "abcd" 'forward 0 (send t1 last-position) #f #t #t #t)
-            '()))
-  
-  (let ([t1 (new text%)]
-        [pb (new pasteboard%)])
-    (send t1 insert "abc")
-    (send t1 insert (new editor-snip% [editor pb]))
-    (send t1 insert "abc")
-    (send pb insert (new editor-snip%))
-    (send pb insert (new editor-snip%))
-    (expect (send t1 do-find-string-all "abcd" 'forward 0 (send t1 last-position) #f #t #t #t)
-            '()))
-  
-  (expect (send (txt "aaa") find-string-all "a") '(0 1 2)))
-
-
-;; ----------------------------------------
-
-;; Insert very long strings to test max-string-length handling
-(send t delete 0 (send t last-position))
-(send t insert (make-string 256 #\a))
-(send t insert (make-string 256 #\a))
-(send t insert (make-string 256 #\a))
-(send t insert (make-string 256 #\a))
-(send t insert (make-string 1024 #\a))
-(expect (send t last-position) 2048)
-
-;; ----------------------------------------
-;; Moving and word boundaries
-
-(send t delete 0 (send t last-position))
-(send t insert "do you like\ngreen eggs and ham?")
-(expect (send t position-paragraph 0) 0)
-(expect (send t position-paragraph 12) 1)
-(expect (send t paragraph-start-position 1) 12)
-(expect (send t paragraph-start-position 2) 31)
-(expect (send t find-newline 'forward 0) 12)
-(expect (send t find-newline 'forward 12) 31)
-(expect (send t get-text) "do you like\ngreen eggs and ham?")
-(send t set-position 0)
-(send t move-position 'right #f 'word)
-(expect (send t get-start-position) 2)
-(send t move-position 'right #f 'word)
-(expect (send t get-start-position) 6)
-(send t move-position 'left #f 'word)
-(expect (send t get-start-position) 3)
-(send t move-position 'right #f 'word)
-(expect (send t get-start-position) 6)
-(send t move-position 'right #f 'word)
-(expect (send t get-start-position) 11)
-(send t move-position 'right #f 'simple)
-(send t move-position 'right #f 'word)
-(expect (send t get-start-position) 17)
-(send t set-position 11)
-(send t move-position 'right #f 'word)
-(expect (send t get-start-position) 17)
-
-(define (check-positions graphics?)
-  (define snips+counts
-    (let loop ([snip (send t find-first-snip)])
-      (if snip
-          (cons (cons snip (send snip get-count))
-                (loop (send snip next)))
-          null)))
-
-  (let ([x (box 0.0)]
-        [y (box 0.0)])
-    (let loop ([s+c snips+counts]
-               [pos 0])
-      (unless (null? s+c)
-        (let ([p (send t get-snip-position (caar s+c))])
-          (expect p pos)
-          (let ([p2 (box 0)])
-            (when graphics?
-              (if (send t get-snip-position-and-location (caar s+c) p2 x y)
-                  (expect (unbox p2) pos)
-                  (expect #f #t)))
-            (loop (cdr s+c) (+ pos (cdar s+c))))))))
-
-  (for-each 
-   (lambda (before)
-     (let loop ([pos 0][s+c snips+counts][snip-pos 0])
-       (if (null? s+c)
-           (expect pos (add1 (send t last-position)))
-           (let* ([s-pos (box 0)]
-                  [s (send t find-snip pos before s-pos)])
-             (let ([es (if (and (= pos 0) (eq? before 'before-or-none))
-                           #f
-                           (caar s+c))])
-               (expect s es)
-               (expect (unbox s-pos) snip-pos)
-               (let ([next? (= pos (+ snip-pos (cdar s+c)))])
-                 (loop (add1 pos)
-                       (if next?
-                           (cdr s+c)
-                           s+c)
-                       (if next?
-                           (+ snip-pos (cdar s+c))
-                           snip-pos))))))))
-   '(before before-or-none))
-
-  (for-each 
-   (lambda (after)
-     (let loop ([pos 0][s+c snips+counts][snip-pos 0][prev #f][prev-snip-pos 0])
-       (let* ([s-pos (box 0)]
-              [s (send t find-snip pos after s-pos)]
-              [end? (null? s+c)]
-              [es (if end?
-                      (if (eq? after 'after-or-none)
-                          #f
-                          (car prev))
-                      (caar s+c))]
-              [ep (if end? (if es prev-snip-pos 0) snip-pos)])
-         (expect s es)
-         (expect (unbox s-pos) ep)
-         (if end?
-             (expect pos (send t last-position))
-             (let ([next? (= (add1 pos) (+ snip-pos (cdar s+c)))])
-               (loop (add1 pos)
-                     (if next?
-                         (cdr s+c)
-                         s+c)
-                     (if next?
-                         (+ snip-pos (cdar s+c))
-                         snip-pos)
-                     (car s+c)
-                     snip-pos))))))
-   '(after after-or-none)))
-
-(check-positions #f)
-
-;; ----------------------------------------
-;; Line flow
-
-;; Every character is 10.0 high, 10.0 wide, 1.0 descent, 1.0 top space
-(send t set-admin (new test-editor-admin%))
-
-(define (check-simple-locations pl pt pr pb)
-  (expect (let ([x (box 0.0)] [y (box 0.0)])
-            (list (begin
-                    (send t position-location 1 x y)
-                    (list (unbox x) (unbox y)))
-                  (begin
-                    (send t position-location 1 x y #f)
-                    (list (unbox x) (unbox y)))))
-          (list (list (+ pl 10.0) (+ pt 0.0))
-                (list (+ pl 10.0) (+ pt 10.0))))
-  (expect (let ([x (box 0.0)] [y (box 0.0)])
-            (list (begin
-                    (send t position-location 14 x y)
-                    (list (unbox x) (unbox y)))
-                  (begin
-                    (send t position-location 14 x y #f)
-                    (list (unbox x) (unbox y)))))
-          (list (list (+ pl 20.0) (+ pt 11.0))
-                (list (+ pl 20.0) (+ pt 21.0))))
-  (expect (let ([w (box 0.0)] [h (box 0.0)])
-            (send t get-extent w h)
-            (list (unbox w) (unbox h)))
-          (list (+ 192.0 pl pr)
-                (+ 22.0 pt pb))))
-(check-simple-locations 0 0 0 0)
-
-(send t set-padding 5.0 8.0 11.0 13.0)
-(check-simple-locations 5 8 11 13)
-(send t set-padding 0 0 0 0)
-
-(expect (send t find-position 0.0 0.0) 0)
-(expect (send t find-position 0.0 3.0) 0)
-(expect (send t find-position 10.0 0.0) 1)
-(expect (send t find-position 13.0 0.0) 1)
-(expect (send t find-position 0.0 12.0) 12)
-(expect (send t find-position 13.0 12.0) 13)
-(expect (send t find-position 13.0 23.0) 31)
-(expect (send t find-position 0.0 230.0) 31)
-(expect (send t find-position 300.0 2.0) 11)
-(expect (send t find-position -1.0 12.0) 12)
-(expect (send t find-position 109.0 2.0) 10)
-(expect (send t find-position 110.0 2.0) 11)
-(expect (let ([b (box #f)])
-          (send t find-position 1.0 12.0 #f b)
-          (unbox b))
-        #t)
-(expect (let ([b (box #f)]
-              [e (box 0.0)])
-          (send t find-position -1.0 12.0 #f b e)
-          (list (unbox b) (unbox e)))
-        '(#f 100.0))
-(expect (let ([b (box #f)]
-              [e (box 0.0)])
-          (list (send t find-position 109.0 2.0 #f b e)
-                (unbox b) 
-                (unbox e)))
-        '(10 #t 1.0))
-(expect (let ([b (box #f)]
-              [e (box 0.0)])
-          (list (send t find-position 102.0 2.0 #f b e)
-                (unbox b) 
-                (unbox e)))
-        '(10 #t -2.0))
-(expect (let ([b (box #f)]
-              [e (box 0.0)])
-          (list (send t find-position 110.0 2.0 #f b e)
-                (unbox b)
-                (unbox e)))
-        '(11 #f 100.0))
-(expect (send t find-position-in-line 0 14.0) 1)
-(expect (send t find-position-in-line 1 14.0) 13)
-
-(send t set-position 1 1)
-(send t move-position 'down #f 'line)
-(expect (send t get-start-position) 13)
-(send t move-position 'right #f 'simple)
-(send t move-position 'up #f 'line)
-(expect (send t get-start-position) 2)
-
-(check-positions #t)
-
-(send t set-max-width 71.0)
-
-(define (check-ge&h-flow)
-  (expect (send t last-line) 6)
-  (expect (send t line-start-position 0) 0)
-  (expect (send t line-start-position 1) 3)
-  (expect (send t line-start-position 2) 7)
-  (expect (send t line-start-position 3) 12)
-  (expect (send t line-start-position 4) 18)
-  (expect (send t line-start-position 5) 23)
-  (expect (send t line-start-position 6) 27)
-  (expect (send t last-paragraph) 1)
-  (expect (send t paragraph-start-position 0) 0)
-  (expect (send t paragraph-end-position 0) 11)
-  (expect (send t paragraph-start-position 1) 12)
-  (expect (send t paragraph-end-position 1) 31)
-  (expect (send t paragraph-start-position 2) 31)
-  (void))
-(check-ge&h-flow)
-
-(check-positions #t)
-
-(send t set-max-width 200.0)
-(expect (send t last-line) 1)
-
-(send t set-max-width 71.0)
-(check-ge&h-flow)
-
-(send t insert "Sir: " 0)
-(expect (send t last-line) 7)
-(expect (send t line-start-position 7) 32)
-(send t delete 0 5)
-(check-ge&h-flow)
-
-(define (check-line-starts)
-  (let ([lens (let loop ([snip (send t find-first-snip)][len 0])
-                (if snip
-                    (let ([len (+ len (send snip get-count))])
-                      (let ([s (send snip get-text 0 (send snip get-count))])
-                        (when (regexp-match? #rx"\n" s)
-                          (unless (and (memq 'hard-newline (send snip get-flags))
-                                       (string=? s "\n"))
-                            (error "embedded newline!")))
-                        (if (or (memq 'newline (send snip get-flags))
-                                (memq 'hard-newline (send snip get-flags)))
-                            (cons len (loop (send snip next) 0))
-                            (loop (send snip next) len))))
-                    (list len)))])
-    (for/fold ([pos 0]) ([i (in-range (add1 (send t last-line)))]
-                         [len (in-list lens)])
-      (expect (send t line-start-position i #f) pos)
-      (expect (send t line-end-position i #f) (+ pos len))
-      (+ pos len))))
-
-(for-each
- (lambda (str)
-   ;; (printf ">> ~s <<\n" str)
-   (for ([i (in-range (add1 (send t last-position)))])
-     (check-line-starts)
-     (send t insert str i)
-     (check-line-starts)
-     ;; (printf "=> ~a ~s\n" i (send t get-text 0 'eof #t #t))
-     (send t last-line)
-     (send t delete i (+ i (string-length str)))
-     (check-line-starts)
-     ;; (printf "~a ~s <=\n" i (send t get-text 0 'eof #t #t))
-     (check-ge&h-flow)))
- '(" a" "a " "qvzxw " " qvxzw" "qqq qqqq" "a\nb"))
-
-;; ----------------------------------------
-;; Undo
-
-(send t set-modified #f)
-(send t set-max-undo-history 100)
-(send t delete 0 3)
-(expect (send t get-text) "you like\ngreen eggs and ham?")
-(expect (send t modified?) #t)
-(send t undo)
-(expect (send t get-text) "do you like\ngreen eggs and ham?")
-(expect (send t modified?) #f)
-(send t redo)
-(expect (send t modified?) #t)
-(expect (send t get-text) "you like\ngreen eggs and ham?")
-(send t set-position 0)
-(send t insert #\d)
-(send t insert #\o)
-(send t insert #\space)
-(expect (send t get-text) "do you like\ngreen eggs and ham?")
-(send t undo)
-(expect (send t get-text) "you like\ngreen eggs and ham?")
-(send t redo)
-(expect (send t get-text) "do you like\ngreen eggs and ham?")
-
-(send t begin-edit-sequence)
-(send t delete 0 3)
-(send t delete (- (send t last-position) 4) (send t last-position))
-(send t end-edit-sequence)
-
-(expect (send t get-text) "you like\ngreen eggs and ")
-(send t delete 0 4)
-(expect (send t get-text) "like\ngreen eggs and ")
-(send t undo)
-(send t undo)
-(expect (send t get-text) "do you like\ngreen eggs and ham?")
-
-;; ----------------------------------------
-;; Stream out base
-
-(define fbo (make-object editor-stream-out-bytes-base%))
-(expect (send fbo tell) 0)
-(expect (send fbo write-bytes #"abc") (void))
-(expect (send fbo tell) 3)
-(expect (send fbo get-bytes) #"abc")
-(send fbo seek 2)
-(expect (send fbo write-bytes #"012345" 1 4) (void))
-(expect (send fbo tell) 5)
-(expect (send fbo get-bytes) #"ab123")
-(expect (send fbo bad?) #f)
-(expect (send fbo write '(#\o #\l #\d)) (void))
-(expect (send fbo get-bytes) #"ab123old")
-
-;; ----------------------------------------
-;; Stream in base
-
-(define fbi (make-object editor-stream-in-bytes-base% #"ab123old"))
-(define ibuf (make-bytes 3))
-(expect (send fbi tell) 0)
-(expect (send fbi read-bytes ibuf) 3)
-(expect ibuf #"ab1")
-(expect (send fbi tell) 3)
-(send fbi seek 2)
-(expect (send fbi read-bytes ibuf 1 2) 1)
-(expect ibuf #"a11")
-(send fbi skip 2)
-(expect (send fbi read-bytes ibuf 0 2) 2)
-(expect ibuf #"ol1")
-(expect (send fbi bad?) #f)
-
-;; ----------------------------------------
-;; Stream writing
-
-(define fbo2 (make-object editor-stream-out-bytes-base%))
-(define fo (make-object editor-stream-out% fbo2))
-
-(expect (send fo tell) 0)
-(void (send fo put 2))
-(expect (send fbo2 get-bytes) #"\n2")
-(void (send fo put 2.0))
-(expect (send fbo2 get-bytes) #"\n2 2.0")
-(expect (send fo tell) 2)
-(send fo jump-to 0)
-(void (send fo put 3))
-(send fo jump-to 2)
-(expect (send fbo2 get-bytes) #"\n3 2.0")
-(void (send fo put #"hi"))
-(expect (send fbo2 get-bytes) #"\n3 2.0 3 #\"hi\\0\"")
-(void (send fo put 3 #"bye?"))
-(expect (send fbo2 get-bytes) #"\n3 2.0 3 #\"hi\\0\"\n3 #\"bye\"")
-(void (send fo put 80 #"0123456789abcdefghij0123456789ABCDEFGHIJ0123456789abcdefghij0123456\"89ABCDEFGHIJ"))
-(expect (send fbo2 get-bytes) 
-        (bytes-append
-         #"\n3 2.0 3 #\"hi\\0\"\n3 #\"bye\"\n80\n"
-         #"(\n"
-         #" #\"0123456789abcdefghij0123456789ABCD\"\n"
-         #" #\"EFGHIJ0123456789abcdefghij0123456\\\"89ABCDEFGHIJ\"\n"
-         #")"))
-
-(define fbo3 (make-object editor-stream-out-bytes-base%))
-(define fo3 (make-object editor-stream-out% fbo3))
-(void (send fo3 put 2))
-(expect (send fo3 tell) 1)
-(void (send fo3 put-fixed 5))
-(expect (send fo3 tell) 2)
-(void (send fo3 put-fixed -8))
-(void (send fo3 put 2 #"hi"))
-(expect (send fbo3 get-bytes) #"\n2           5          -8 2 #\"hi\"")
-(send fo3 jump-to 1)
-(void (send fo3 put-fixed -4))
-(send fo3 jump-to 2)
-(void (send fo3 put-fixed 7))
-(expect (send fbo3 get-bytes) #"\n2          -4           7 2 #\"hi\"")
-
-;; ----------------------------------------
-;; Stream reading
-
-(define fbi2 (make-object editor-stream-in-bytes-base% (bytes-append #"1 ; comment \n 2 "
-                                                                     #"#| | x # #|  |# q |# 4.0"
-                                                                     #" 2 #\"hi\""
-                                                                     #" 3 #\"hi\\\"\""
-                                                                     #" 23 ( #\"0123456789ABCDEFappl\" #\"e!\\0\" ) 88")))
-(define fi2 (make-object editor-stream-in% fbi2))
-
-(expect (send fi2 ok?) #t)
-(expect (send fi2 tell) 0)
-(expect (let ([b (box 0)]) (send fi2 get b) (unbox b)) 1)
-(expect (send fi2 ok?) #t)
-(expect (send fi2 tell) 1)
-(expect (let ([b (box 0)]) (send fi2 get b) (unbox b)) 2)
-(expect (send fi2 ok?) #t)
-(expect (let ([b (box 0.0)]) (send fi2 get b) (unbox b)) 4.0)
-(expect (send fi2 ok?) #t)
-(expect (send fi2 tell) 3)
-(expect (send fi2 get-unterminated-bytes) #"hi")
-(expect (send fi2 ok?) #t)
-(expect (send fi2 tell) 5)
-(expect (send fi2 get-unterminated-bytes) #"hi\"")
-(expect (send fi2 ok?) #t)
-(expect (send fi2 get-bytes) #"0123456789ABCDEFapple!")
-(expect (send fi2 ok?) #t)
-(expect (send fi2 tell) 9)
-
-(send fi2 jump-to 3)
-(expect (send fi2 tell) 3)
-(expect (send fi2 get-unterminated-bytes) #"hi")
-(send fi2 skip 4)
-(expect (let ([b (box 0)]) (send fi2 get b) (unbox b)) 88)
-(expect (send fi2 ok?) #t)
-(expect (send fi2 tell) 10)
-
-(send fi2 jump-to 3)
-(send fi2 set-boundary 2)
-(expect (send fi2 get-unterminated-bytes) #"hi")
-(send fi2 jump-to 3)
-(expect (send fi2 ok?) #t)
-(expect (send fi2 tell) 3)
-(send fi2 set-boundary 1)
-(expect (with-handlers ([values (lambda (exn) #"")])
-          (send fi2 get-unterminated-bytes))
-        #"")
-(expect (send fi2 ok?) #f)
-
-;; ----------------------------------------
-;; Save & load
-
-(send t delete 0 (send t last-position))
-(send t clear-undos)
-(send t insert "one\ntwo\n")
-(send t set-position 0 3)
-(send t copy #f 0)
-(send t set-position 8)
-(send t paste 0) ;; probably uses the snip% `copy' method
-(expect (send t get-text) "one\ntwo\none")
-(define (move-to-serialized-clipboard)
-  (let ([data (send the-clipboard get-clipboard-data "WXME" 0)])
-    (send the-clipboard set-clipboard-client
-          (new (class clipboard-client%
-                 (inherit add-type)
-                 (super-new)
-                 (add-type "WXME")
-                 (define/override (get-data format) data)))
-          0)))
-(move-to-serialized-clipboard)
-(send t paste 0) ;; uses above clipboard
-(expect (send t get-text) "one\ntwo\noneone")
-(send the-clipboard set-clipboard-string "\u3BB" 0)
-(send t paste 0)
-(expect (send t get-text) "one\ntwo\noneone\u3BB")
-
-(send t set-position 3 4)
-(send t copy #f 0)
-(send t set-position 4 7)
-(send t copy #t 0)
-(send t set-position (send t last-position))
-(send t paste 0)
-(expect (send t get-text) "one\ntwo\noneone\u3BB\ntwo")
-(send t paste-next)
-(expect (send t get-text) "one\ntwo\noneone\u3BBone")
-
-(send t cut #f 0 0 4)
-(expect (send t get-text) "two\noneone\u3BBone")
-
-(define-values (in7 out7) (make-pipe))
-(expect (send t save-port out7 'text) #t)
-(close-output-port out7)
-(expect (read-string 100 in7)  "two\noneone\u3BBone")
-
-(define out8 (open-output-bytes))
-(expect (send t save-port out8 'standard) #t)
-(define in8 (open-input-bytes (get-output-bytes out8)))
-(expect (peek-bytes 31 0 in8) #"#reader(lib\"read.ss\"\"wxme\")WXME")
-(send t erase)
-(expect (send t get-text) "")
-(expect (send t insert-port in8) 'standard)
-(expect (send t get-text) "two\noneone\u3BBone")
-
-;; ----------------------------------------
-;; Styles on text
-
-(define (check-color pos r g b w)
-  (let* ([s (send (send t find-snip pos 'after) get-style)]
-         [c (send s get-foreground)]
-         [f (send s get-font)])
-    (expect (send c red) r)
-    (expect (send c green) g)
-    (expect (send c blue) b)
-    (expect (send f get-weight) w)))
-
-(send t erase)
-(send t insert "red\nblue")
-(check-color 0 0 0 0 'normal)
-(let ([d (send (new style-delta%) set-delta-foreground (make-object color% 255 0 0))])
-  (send d set-weight-on 'bold)
-  (send t change-style d 0 3))
-(send t change-style
-      (send (new style-delta%) set-delta-foreground (make-object color% 0 0 255))
-      4 8)
-(check-color 0 255 0 0 'bold)
-(check-color 4 0 0 255 'normal)
-
-(define out9 (open-output-bytes))
-(expect (send t save-port out9 'standard) #t)
-(define in9 (open-input-bytes (get-output-bytes out9)))
-(send t erase)
-(expect (send t insert-port in9) 'standard)
-(expect (send t get-text) "red\nblue")
-(check-color 0 255 0 0 'bold)
-(check-color 4 0 0 255 'normal)
-
-(define (check-random-delta d)
-  (expect (send d get-alignment-on) 'top)
-  (expect (send d get-alignment-off) 'base)
-  (expect (send (send d get-background-add) get-r) 25)
-  (expect (send (send d get-background-add) get-g) 25)
-  (expect (send (send d get-background-add) get-b) 25)
-  (expect (send (send d get-background-mult) get-r) 0.5)
-  (expect (send (send d get-background-mult) get-g) 0.5)
-  (expect (send (send d get-background-mult) get-b) 0.5)
-  (expect (send (send d get-foreground-add) get-r) 50)
-  (expect (send (send d get-foreground-add) get-g) 50)
-  (expect (send (send d get-foreground-add) get-b) 50)
-  (expect (send (send d get-foreground-mult) get-r) 0.6)
-  (expect (send (send d get-foreground-mult) get-g) 0.6)
-  (expect (send (send d get-foreground-mult) get-b) 0.6)
-  (expect (send d get-face) "Purty") 
-  (expect (send d get-family) 'decorative)
-  (expect (send d get-size-in-pixels-on) #t)
-  (expect (send d get-size-in-pixels-off) #f)
-  (expect (send d get-smoothing-off) 'smoothed)
-  (expect (send d get-smoothing-on) 'base)
-  (expect (send d get-style-on) 'italic)
-  (expect (send d get-style-off) 'base)
-  (expect (send d get-transparent-text-backing-on) #t)
-  (expect (send d get-transparent-text-backing-off) #f)
-  (expect (send d get-underlined-off) #t)
-  (expect (send d get-underlined-on) #f)
-  (expect (send d get-weight-on) 'light)
-  (expect (send d get-weight-off) 'base))
-
-(let ([d (new style-delta%)])
-  (send d set-alignment-on 'top)
-  (send (send d get-background-add) set 25 25 25)
-  (send (send d get-background-mult) set 0.5 0.5 0.5)
-  (send (send d get-foreground-add) set 50 50 50)
-  (send (send d get-foreground-mult) set 0.6 0.6 0.6)
-  (send d set-delta-face "Purty" 'decorative)
-  (send d set-size-in-pixels-on #t)
-  (send d set-smoothing-off 'smoothed)
-  (send d set-style-on 'italic)
-  (send d set-transparent-text-backing-on #t)
-  (send d set-underlined-off #t)
-  (send d set-weight-on 'light)
-
-  (check-random-delta d)
-
-  (let* ([sl (send t get-style-list)]
-         [s (send sl find-or-create-style (send sl basic-style) d)])
-    (send t change-style s 0 1)))
-
-(define out10 (open-output-bytes))
-(expect (send t save-port out10 'standard) #t)
-(define in10 (open-input-bytes (get-output-bytes out10)))
-(send t erase)
-(expect (send t insert-port in10 'guess #t) 'standard)
-(expect (send t get-text) "red\nblue")
-(check-color 0 50 50 50 'light)
-(check-color 1 255 0 0 'bold)
-(check-color 4 0 0 255 'normal)
-
-(let ([d (new style-delta%)])
-  (send (send (send t find-first-snip) get-style) get-delta d)
-  (check-random-delta d))
-
-;; ----------------------------------------
-;; Keymaps
-
-(define km (new keymap%))
-(define hit #f)
-(define kevt (new key-event%))
-
-(send km add-function "letter-a" (lambda (obj evt) (set! hit #\a)))
-(send km add-function "letter-m" (lambda (obj evt) (set! hit #\m)))
-(send km add-function "letter-n" (lambda (obj evt) (set! hit #\n)))
-(send km add-function "letter-up" (lambda (obj evt) (set! hit 'up)))
-(send km add-function "letter-UP" (lambda (obj evt) (set! hit 'UP)))
-(send km add-function "letter-down" (lambda (obj evt) (set! hit 'down)))
-(send km add-function "letter-DOWN" (lambda (obj evt) (set! hit 'DOWN)))
-
-(send km map-function "a" "letter-a")
-(send kevt set-key-code #\x)
-(expect (send km handle-key-event 'obj kevt) #f)
-(send kevt set-key-code #\a)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit #\a)
-
-(send km map-function "up" "letter-up")
-(send kevt set-key-code 'up)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit 'up)
-(set! hit #f)
-(send kevt set-shift-down #t)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit 'up)
-
-(send km map-function "s:up" "letter-UP")
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit 'UP)
-
-(send km map-function ":down" "letter-down")
-(send kevt set-key-code 'down)
-(send kevt set-shift-down #f)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit 'down)
-(set! hit #f)
-(send kevt set-shift-down #t)
-(expect (send km handle-key-event 'obj kevt) #f)
-
-(send km map-function "s:down" "letter-DOWN")
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit 'DOWN)
-
-(expect (with-handlers ([values
-                         (lambda (exn)
-                           (and (regexp-match? #rx"mapped as a non-prefix key" (exn-message exn))
-                                'bad-remap))])
-          (send km map-function "s:down;z" "oops"))
-        'bad-remap)
-
-;; Check sequence
-(set! hit #f)
-(send km map-function "d;O" "letter-down")
-(send kevt set-shift-down #f)
-(send kevt set-key-code #\d)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit #f)
-(send kevt set-key-code #\o)
-(expect (send km handle-key-event 'obj kevt) #f)
-(send kevt set-shift-down #f)
-(send kevt set-key-code #\d)
-(expect (send km handle-key-event 'obj kevt) #t)
-(send kevt set-key-code #\O)
-(send kevt set-shift-down #t)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit 'down)
-
-;; Interrupt sequence
-(set! hit #f)
-(send kevt set-shift-down #f)
-(send kevt set-key-code #\d)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit #f)
-(send km break-sequence)
-(send kevt set-key-code #\O)
-(send kevt set-shift-down #t)
-(expect (send km handle-key-event 'obj kevt) #f)
-(expect hit #f)
-
-;; Check success with alternate, then override with more specific non-alternate
-(send kevt set-key-code #\m)
-(send kevt set-other-shift-key-code #\n)
-(send kevt set-shift-down #f)
-(send km map-function "?:n" "letter-n")
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit #\n)
-(send km map-function "?:m" "letter-m")
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit #\m)
-
-(define km2 (new keymap%))
-(send km chain-to-keymap km2 #t)
-
-;; Chained keymap more specific overrides less specific
-(send km2 add-function "letter-n2" (lambda (obj evt) (set! hit 'n2)))
-(send km2 map-function "n" "letter-n2")
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit #\m)
-(send kevt set-key-code #\n)
-(send kevt set-other-shift-key-code #\p)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit 'n2)
-
-;; Check sequence in chained keymap
-(send km2 add-function "letter-t" (lambda (obj evt) (set! hit #\t)))
-(send km2 map-function "c:x;t" "letter-t")
-(send kevt set-key-code #\x)
-(send kevt set-control-down #t)
-(send kevt set-other-shift-key-code #f)
-(set! hit #f)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit #f)
-(send kevt set-control-down #f)
-(send kevt set-key-code #\t)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit #\t)
-
-;; Chained keymap non-prefixed overrides prefixed
-(send km2 add-function "letter-d" (lambda (obj evt) (set! hit #\d)))
-(send km2 map-function "d" "letter-d")
-(send kevt set-key-code #\d)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit #\d)
-(send kevt set-key-code #\O)
-(send kevt set-shift-down #t)
-(expect (send km handle-key-event 'obj kevt) #f)
-(expect hit #\d)
-
-;; Remove chained keymap
-(send km remove-chained-keymap km2)
-(send kevt set-key-code #\d)
-(send kevt set-shift-down #f)
-(set! hit #f)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit #f)
-(send kevt set-key-code #\O)
-(send kevt set-shift-down #t)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit 'down)
-
-;; Key grab
-(send kevt set-key-code #\m)
-(send kevt set-shift-down #f)
-(send km set-grab-key-function (lambda (str km-in ed evt)
-                                 (expect km-in km)
-                                 (expect evt kevt)
-                                 (set! hit (list str ed))
-                                 #t))
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit '("letter-m" obj))
-(send kevt set-key-code #\p)
-(expect (send km handle-key-event 'obj kevt) #t)
-(expect hit '(#f obj))
-(send km set-grab-key-function (lambda (str km-in ed evt)
-                                 (expect str "letter-m")
-                                 (expect ed 'obj2)
-                                 (set! hit 'nope)
-                                 #f))
-(send kevt set-key-code #\m)
-(expect (send km handle-key-event 'obj2 kevt) #t)
-(expect hit #\m)
-(send km set-grab-key-function (lambda (str km-in ed evt)
-                                 (expect str #f)
-                                 (expect ed 'obj3)
-                                 (set! hit 'nope)
-                                 #f))
-(send kevt set-key-code #\p)
-(expect (send km handle-key-event 'obj3 kevt) #f)
-(expect hit 'nope)
-
-;; Mouse events
-(define mevt/l (new mouse-event% [event-type 'left-down]))
-(send mevt/l set-left-down #t)
-(send km add-function "mouse-right" (lambda (obj evt) (set! hit 'right)))
-(send km add-function "mouse-left" (lambda (obj evt) (set! hit 'left)))
-(send km add-function "mouse-left2" (lambda (obj evt) (set! hit 'left2)))
-
-(expect (send km handle-mouse-event 'obj mevt/l) #f)
-(send mevt/l set-time-stamp 501) ;; FIXME: depends on double-click time
-(send km map-function "leftbutton" "mouse-left")
-(send km map-function "leftbuttondouble" "mouse-left2")
-(expect (send km handle-mouse-event 'obj mevt/l) #t)
-(expect hit 'left)
-(expect (send km handle-mouse-event 'obj mevt/l) #t)
-(expect hit 'left2)
-(expect (send km handle-mouse-event 'obj mevt/l) #t)
-(expect hit 'left)
-(send mevt/l set-time-stamp 10100)
-(expect (send km handle-mouse-event 'obj mevt/l) #t)
-(expect hit 'left)
-
-(set! hit #f)
-(send km map-function "rightbuttonseq" "mouse-right")
-(define mevt/r (new mouse-event% [event-type 'right-down]))
-(send mevt/r set-right-down #t)
-(define mevt/r/up (new mouse-event% [event-type 'right-up]))
-(expect (send km handle-mouse-event 'obj mevt/r) #t)
-(expect hit 'right)
-(set! hit #f)
-(expect (send km handle-mouse-event 'obj mevt/r/up) #t)
-(expect hit 'right)
-
-(send km set-grab-mouse-function (lambda (str km-in ed evt)
-                                   (set! hit 'm)
-                                   #t))
-(define mevt/m (new mouse-event% [event-type 'middle-down]))
-(send mevt/m set-middle-down #t)
-(expect (send km handle-mouse-event 'obj mevt/m) #t)
-(expect hit 'm)
-(send km remove-grab-mouse-function)
-(expect (send km handle-mouse-event 'obj mevt/m) #f)
-
-;; ----------------------------------------
-;; editor snips, content
-
-(define oe (new text%))
-(define ie (new text%))
-(define es (new editor-snip% [editor ie]))
-(send ie insert "Hello")
-(send oe insert es)
-
-(expect (send oe get-text 0 'eof #f) ".")
-(expect (send oe get-flattened-text) "Hello")
-
-(send es show-border #t)
-(expect (send es border-visible?) #t)
-(send es set-margin 1 2 3 4)
-(define (check-border es)
-  (let ([l (box 0)][t (box 0)][r (box 0)][b (box 0)])
-    (send es get-margin l t r b)
-    (expect (list (unbox l) (unbox t) (unbox r) (unbox b))
-            (list 1 2 3 4))))
-(check-border es)
-
-(send oe set-position 0 1)
-(send oe copy #f 0)
-(send oe set-position 1)
-(send oe paste 0) ;; probably uses the snip% `copy' method
-(expect (send oe last-position) 2)
-(define es2 (send oe find-snip 1 'after-or-none))
-(check-border es2)
-(move-to-serialized-clipboard)
-(send oe paste 0) ;; uses above clipboard
-(define es3 (send oe find-snip 2 'after-or-none))
-(check-border es3)
-(expect (send es3 border-visible?) #t)
-(expect (send es3 get-align-top-line) #f)
-
-(send (send es2 get-editor) insert "zzz" 2 2)
-(expect (send oe get-text 0 'eof #f) "...")
-(expect (send oe get-flattened-text) "HelloHezzzlloHello")
-
-(send oe insert "a\n" 0)
-(send oe insert "\nb" (send oe last-position))
-(expect (send oe get-flattened-text) "a\nHelloHezzzlloHello\nb")
-
-;; ----------------------------------------
-;; editor snips, locations
-
-(send oe set-admin (new test-editor-admin%))
-(expect (let ([w (box 0.0)] [h (box 0.0)])
-          (send oe get-extent w h)
-          (list (unbox w) (unbox h)))
-        '(197.0 40.0))
-(expect (let ([x (box 0.0)] [y (box 0.0)])
-          (list (begin
-                  (send oe position-location 0 x y)
-                  (list (unbox x) (unbox y)))
-                (begin
-                  (send oe position-location 1 x y #f)
-                  (list (unbox x) (unbox y)))))
-        '((0.0 0.0) (10.0 10.0)))
-(expect (let ([x (box 0.0)] [y (box 0.0)])
-          (list (begin
-                  (send oe position-location 2 x y)
-                  (list (unbox x) (unbox y)))
-                (begin
-                  (send oe position-location 3 x y #f)
-                  (list (unbox x) (unbox y)))))
-        '((0.0 11.0) (55.0 28.0)))
-
-(send (send es2 get-editor) insert "\nmore" 100)
-(expect (let ([w (box 0.0)] [h (box 0.0)])
-          (send oe get-extent w h)
-          (list (unbox w) (unbox h)))
-        '(197.0 51.0))
-
-;; ----------------------------------------
-;; Pasteboard
-
-(define pb (new pasteboard%))
-(expect (send pb find-first-snip) #f)
-(expect (send pb find-snip 10.0 10.0) #f)
-(expect (let ([w (box 0.0)] [h (box 0.0)])
-          (send pb get-extent w h)
-          (list (unbox w) (unbox h)))
-        '(0.0 0.0))
-
-(define ss1 (new string-snip%))
-(send ss1 insert "one" 3)
-(send pb insert ss1 12.0 17.5)
-(expect (send pb find-first-snip) ss1)
-(expect (send pb get-flattened-text) "one")
-
-(define ss2 (new string-snip%))
-(send ss2 insert "two!" 4)
-(send pb insert ss2 ss1 32.0 7.5)
-(expect (send pb find-first-snip) ss2)
-(expect (send pb get-flattened-text) "two!one")
-(send pb lower ss2)
-(expect (send pb get-flattened-text) "onetwo!")
-(send pb raise ss2)
-(expect (send pb get-flattened-text) "two!one")
-
-(send pb set-admin (new test-editor-admin%))
-(expect (let ([w (box 0.0)] [h (box 0.0)])
-          (send pb get-extent w h)
-          (list (unbox w) (unbox h)))
-        '(74.0 29.5))
-(expect (let ([x (box 0.0)] [y (box 0.0)])
-          (send pb get-snip-location ss2 x y #t)
-          (list (unbox x) (unbox y)))
-        '(72.0 17.5))
-(send ss2 insert "more" 4 3)
-(expect (let ([x (box 0.0)] [y (box 0.0)])
-          (send pb get-snip-location ss2 x y #t)
-          (list (unbox x) (unbox y)))
-        '(112.0 17.5))
-(expect (send pb get-flattened-text) "twomore!one")
-
-(send pb no-selected)
-(expect (send pb find-next-selected-snip #f) #f)
-(send pb add-selected ss1)
-(expect (send pb find-next-selected-snip #f) ss1)
-(expect (send pb find-next-selected-snip ss1) #f)
-(send pb no-selected)
-(send pb add-selected 0.0 0.0 10.0 10.0)
-(expect (send pb find-next-selected-snip #f) #f)
-(send pb add-selected 10.0 10.0 20.0 20.0)
-(expect (send pb find-next-selected-snip #f) ss1)
-(expect (send pb find-next-selected-snip ss1) #f)
-(send pb add-selected 10.0 10.0 40.0 40.0)
-(expect (send pb find-next-selected-snip #f) ss2)
-(expect (send pb find-next-selected-snip ss2) ss1)
-
-(send pb set-max-undo-history 10)
-
-(send pb move 3 4)
-(expect (let ([x (box 0.0)] [y (box 0.0)])
-          (send pb get-snip-location ss1 x y #f)
-          (list (unbox x) (unbox y)))
-        '(15.0 21.5))
-(expect (let ([x (box 0.0)] [y (box 0.0)])
-          (send pb get-snip-location ss2 x y #f)
-          (list (unbox x) (unbox y)))
-        '(35.0 11.5))
-(send pb undo)
-(expect (let ([x (box 0.0)] [y (box 0.0)])
-          (send pb get-snip-location ss1 x y #f)
-          (list (unbox x) (unbox y)))
-        '(12.0 17.5))
-(expect (let ([x (box 0.0)] [y (box 0.0)])
-          (send pb get-snip-location ss2 x y #f)
-          (list (unbox x) (unbox y)))
-        '(32.0 7.5))
-
-(send pb remove-selected ss1)
-(expect (send pb find-snip 15.0 20.0) ss1)
-(expect (send pb find-snip 35.0 10.0) ss2)
-(expect (send pb find-first-snip) ss2)
-(send pb delete) ; "delete"
-(expect (send pb find-first-snip) ss1)
-(expect (send pb find-snip 15.0 20.0) ss1)
-(expect (send pb find-snip 35.0 10.0) #f)
-(send pb undo) ; "undo"
-(expect (send pb find-first-snip) ss2)
-(expect (send pb find-snip 35.0 10.0) ss2)
-(expect (let ([x (box 0.0)] [y (box 0.0)])
-          (send pb get-snip-location ss2 x y #f)
-          (list (unbox x) (unbox y)))
-        '(32.0 7.5))
-
-(define out20 (open-output-bytes))
-(expect (send pb save-port out20 'standard) #t)
-(define in20 (open-input-bytes (get-output-bytes out20)))
-(expect (peek-bytes 31 0 in20) #"#reader(lib\"read.ss\"\"wxme\")WXME")
-
-(define t10 (make-object text%))
-(expect (send t10 insert-port in20) 'standard)
-(expect (send t10 get-flattened-text) "twomore!one")
-
-(define in21 (open-input-bytes (get-output-bytes out20)))
-(define pb2 (make-object pasteboard%))
-(expect (send pb2 insert-port in21) 'standard)
-(expect (send pb2 get-flattened-text) "twomore!one")
-(expect (let ([x (box 0.0)] [y (box 0.0)])
-          (send pb2 get-snip-location (send pb2 find-first-snip) x y #f)
-          (list (unbox x) (unbox y)))
-        '(32.0 7.5))
-
-;; ----------------------------------------
-
-(let ()
-  (define (mk) (make-object image-snip% (collection-file-path "b-run.png" "icons") 'unknown #f #f))
-  
-  (define is (mk))
-  (define copy-is
-    (let ()
-      (define sp (open-output-string))
-      (define t (new text%))
-      (send t insert (mk))
-      (send t save-port sp)
-      (define t2 (new text%))
-      (send t2 insert-port (open-input-string (get-output-string sp)))
-      (send t2 find-first-snip)))
-  
-  (expect (send (mk) get-filename)
-          (send copy-is get-filename)))
-
-
-;; ----------------------------------------
-;; get-extend-start-position and
-;; get-extend-end-position
-
-(let ([t (new text%)])
-  (send t insert (make-string 40 #\a))
-  (send t set-position 10 20)
-  
-  (expect (send t get-start-position) 10)
-  (expect (send t get-end-position) 20)
-  (expect (send t get-extend-start-position) 10)
-  (expect (send t get-extend-end-position) 20)
-  
-  (send t set-anchor #t)
-  (send t set-position 5 25)
-  
-  (expect (send t get-start-position) 5)
-  (expect (send t get-end-position) 25)
-  (expect (send t get-extend-start-position) 5)
-  (expect (send t get-extend-end-position) 25)
-  
-  (send t extend-position 30)
-  (expect (send t get-start-position) 5)
-  (expect (send t get-end-position) 30)
-  (expect (send t get-extend-start-position) 5)
-  (expect (send t get-extend-end-position) 25)
-
-  (send t extend-position 0)
-  (expect (send t get-start-position) 0)
-  (expect (send t get-end-position) 25)
-  (expect (send t get-extend-start-position) 5)
-  (expect (send t get-extend-end-position) 25))
-
-;; ----------------------------------------
-
-(let ()
-  (define t (new text%))
-  (send t insert "1\n12\n123\n")
-  (expect (send t paragraph-start-position 3) 9)
-  (expect (send t paragraph-end-position 3) 9)
-  (expect (send t line-end-position 3) 9))
-
-(let ()
-  (define t (new text%))
-  (send t insert "1\n12\n123\n\n")
-  (expect (send t paragraph-start-position 3) 9)
-  (expect (send t paragraph-end-position 3) 9)
-  (expect (send t line-end-position 3) 9))
-
-;; ----------------------------------------
-;; tabs
-
-(let ([t1 (new text%)])
-  (send t1 set-admin (new test-editor-admin%))  
-  (send t1 set-tabs '(100 200 300 400 500 600 700 800 900 1000 100) 1 #t)
-  (send t1 insert "Hello\tWorld")
-  (send t1 get-extent (box 0) (box 0)))
-
-;; ----------------------------------------
-;; Identity and contracts
-
-(let ([t (new text%)])
-  (define s (new editor-snip%))
-  (send t insert "x")
-  (send t insert s)
-  (define (check s)
-    (expect (send t get-snip-location s) #t)
-    (expect (send t get-snip-position s) 1))
-  (check s)
-  (define/contract s2 (object/c) s)
-  (check s2))
-
-(let ([t (new pasteboard%)])
-  (define s (new editor-snip%))
-  (send t insert (make-object string-snip% "x"))
-  (send t insert s 13 14)
-  (define (check s)
-    (define x (box 0))
-    (define y (box 0))
-    (expect (send t get-snip-location s x y) #t)
-    (expect (unbox x) 13.0)
-    (expect (unbox y) 14.0))
-  (check s)
-  (define/contract s2 (object/c) s)
-  (check s2)
-  (send t delete s2)
-  (expect (send t get-snip-location s) #f)
-  (expect (send t get-snip-location s2) #f))
-
-;; ----------------------------------------
-;; Error reporting
-
-(when (regexp-match? #rx"raise-type-error"
-                     (with-handlers ([exn:fail? exn-message])
-                       (send (new text%) get-text 1 'end #t)))
-  (error "bad error message"))
-
-;; ----------------------------------------
-
-(done)
diff --git a/pkgs/gui-pkgs/gui/LICENSE.txt b/pkgs/gui-pkgs/gui/LICENSE.txt
deleted file mode 100644
index de93c61880..0000000000
--- a/pkgs/gui-pkgs/gui/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-gui
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/gui-pkgs/gui/info.rkt b/pkgs/gui-pkgs/gui/info.rkt
deleted file mode 100644
index 2711de0bd0..0000000000
--- a/pkgs/gui-pkgs/gui/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("gui-lib"
-               "gui-doc"))
-(define implies '("gui-lib"
-                  "gui-doc"))
-
-(define pkg-desc "Graphical user interface toolkit")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/gui-pkgs/tex-table/info.rkt b/pkgs/gui-pkgs/tex-table/info.rkt
deleted file mode 100644
index 63be298146..0000000000
--- a/pkgs/gui-pkgs/tex-table/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define deps '("base"))
-(define collection "mrlib")
-
-(define pkg-desc "Table of TeX-style abbreviations")
-
-(define pkg-authors '(robby))
diff --git a/pkgs/gui-pkgs/tex-table/tex-table.rkt b/pkgs/gui-pkgs/tex-table/tex-table.rkt
deleted file mode 100644
index 24cfb9af47..0000000000
--- a/pkgs/gui-pkgs/tex-table/tex-table.rkt
+++ /dev/null
@@ -1,203 +0,0 @@
-#lang racket/base
-(require racket/contract)
-
-(define (string-len-one? x)
-  (and (string? x)
-       (= 1 (string-length x))))
-  
-(provide/contract
- [tex-shortcut-table
-  (listof (list/c string? string-len-one?))])
-
-(define tex-shortcut-table
-  '(("Downarrow" "⇓")
-    ("nwarrow" "↖")
-    ("downarrow" "↓")
-    ("Rightarrow" "⇒")
-    ("rightarrow" "→")
-    ("mapsto" "↦")
-    ("searrow" "↘")
-    ("swarrow" "↙")
-    ("leftarrow" "←")
-    ("uparrow" "↑")
-    ("Leftarrow" "⇐")
-    ("longrightarrow" "−")
-    ("Uparrow" "⇑")
-    ("Leftrightarrow" "⇔")
-    ("updownarrow" "↕")
-    ("leftrightarrow" "↔")
-    ("nearrow" "↗")
-    ("Updownarrow" "⇕")
-   
-    ;; arrows that didn't come out right in copy & paste
-    ;←− \longleftarrow
-    ;⇐= \Longleftarrow 
-    ;← 􏰂 \hookleftarrow
-    ;←→ \longleftrightarrow 
-    ;􏰁 → \hookrightarrow
-    ;⇐⇒ \Longleftrightarrow
-    ;􏴲 \leadsto∗ 
-    ;􏰃−→ \longmapsto
-    ;=⇒ \Longrightarrow 
-    ;􏰃→ \mapsto
-    
-    ("aleph" "א")
-    ("prime" "′")
-    ("emptyset" "∅")
-    ("nabla" "∇")
-    ("diamondsuit" "♦")
-    ("spadesuit" "♠")
-    ("clubsuit" "♣")
-    ("heartsuit" "♥")
-    ("sharp" "♯")
-    ("flat" "♭")
-    ("natural" "♮")
-    ("surd" "√")
-    ("neg" "¬")
-    ("triangle" "△")
-    ("forall" "∀")
-    ("exists" "∃")
-    ("infty" "∞")
-    ("circ" "∘")
-    ("alpha" "α")
-    ("theta" "θ")
-    ("tau" "τ")
-    ("beta" "β")
-    ("vartheta" "θ")
-    ("pi" "π")
-    ("upsilon" "υ")
-    ("gamma" "γ")
-    ("varpi" "π")
-    ("phi" "φ")
-    ("delta" "δ")
-    ("kappa" "κ")
-    ("rho" "ρ")
-    ("varphi" "φ")
-    ("epsilon" "ε")
-    ("lambda" "λ")
-    ("varrho" "ρ")
-    ("chi" "χ")
-    ("varepsilon" "ε")
-    ("mu" "μ")
-    ("sigma" "σ")
-    ("psi" "ψ")
-    ("zeta" "ζ")
-    ("nu" "ν")
-    ("varsigma" "ς")
-    ("omega" "ω")
-    ("eta" "η")
-    ("xi" "ξ")
-    ("iota" "ι")
-    ("Gamma" "Γ")
-    ("Lambda" "Λ")
-    ("Sigma" "Σ")
-    ("Psi" "Ψ")
-    ("Delta" "Δ")
-    ("Xi" "Ξ")
-    ("Upsilon" "Υ")
-    ("Omega" "Ω")
-    ("Theta" "Θ")
-    ("Pi" "Π")
-    ("Phi" "Φ")
-    ("pm" "±")
-    ("cap" "∩")
-    ("diamond" "◇")
-    ("oplus" "⊕")
-    ("mp" "∓")
-    ("cup" "∪")
-    ("bigtriangleup" "△")
-    ("ominus" "⊖")
-    ("times" "×")
-    ("uplus" "⊎")
-    ("bigtriangledown" "▽")
-    ("otimes" "⊗")
-    ("div" "÷")
-    ("sqcap" "⊓")
-    ("triangleright" "▹")
-    ("oslash" "⊘")
-    ("ast" "∗")
-    ("sqcup" "⊔")
-    ("vee" "∨")
-    ("wedge" "∧")
-    ("triangleleft" "◃")
-    ("odot" "⊙")
-    ("star" "★")
-    ("dagger" "†")
-    ("bullet" "•")
-    ("ddagger" "‡")
-    ("wr" "≀")
-    ("amalg" "⨿")
-    ("leq" "≤")
-    ("geq" "≥")
-    ("equiv" "≡")
-    ("models" "⊨")
-    ("prec" "≺")
-    ("succ" "≻")
-    ("sim" "∼")
-    ("perp" "⊥")
-    ("bot" "⊥")
-    ("top" "⊤")
-    ("preceq" "≼")
-    ("succeq" "≽")
-    ("simeq" "≃")
-    ("ll" "≪")
-    ("gg" "≫")
-    ("asymp" "≍")
-    ("parallel" "∥")
-    ("subset" "⊂")
-    ("supset" "⊃")
-    ("approx" "≈")
-    ("bowtie" "⋈")
-    ("subseteq" "⊆")
-    ("supseteq" "⊇")
-    ("cong" "≌")
-    ("sqsubsetb" "⊏")
-    ("sqsupsetb" "⊐")
-    ("neq" #;"≠" "≠")
-    ("smile" "⌣")
-    ("sqsubseteq" "⊑")
-    ("sqsupseteq" "⊒")
-    ("doteq" "≐")
-    ("frown" "⌢")
-    ("in" "∈")
-    ("ni" "∋")
-    ("propto" "∝")
-    ("vdash" "⊢")
-    ("dashv" "⊣")
-    ("cdot" "·")
-    ("sum" "∑")
-    ("prod" "∏")
-    ("coprod" "∐")
-    
-    ("int" "∫")
-    ("oint" "∮")
-
-    ("sqrt" "√")
-    
-    ("skull" "☠") 
-    ("smiley" "☺")
-    ("blacksmiley" "☻")
-    ("frownie" "☹")
-    
-    ("S" "§")
-    ("l" "ł")
-    
-    ("newpage" "\f")
-    
-    ("vdots" "⋮")
-    ("ddots" "⋱")
-    ("cdots" "⋯")
-    ("hdots" "⋯")))
-
-(module+ test
-  (require racket/match)
-  (define name-ht (make-hash))
-  (define val-ht (make-hash))
-  (for ([line (in-list tex-shortcut-table)])
-    (match-define (list name obj) line)
-    (hash-set! name-ht name (cons obj (hash-ref name-ht name '()))))
-  (for ([(k v) (in-hash name-ht)])
-    (unless (= 1 (length v))
-      (eprintf "duplicate: ~s -> ~s\n" k v))))
-
-
diff --git a/pkgs/honu/LICENSE.txt b/pkgs/honu/LICENSE.txt
deleted file mode 100644
index 3eb5b05617..0000000000
--- a/pkgs/honu/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-honu
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/honu/contrib/honu.vim b/pkgs/honu/contrib/honu.vim
deleted file mode 100644
index a6c3b3f0bd..0000000000
--- a/pkgs/honu/contrib/honu.vim
+++ /dev/null
@@ -1,57 +0,0 @@
-" Honu syntax file
-" Language: Honu
-" Filenames: *.honu
-" Maintainers: Jon Rafkind <jon@rafkind.com>
-" URL: http://racket-lang.org
-" Last Change: 2012 April 24 - Initial Version
-
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax") && b:current_syntax == "fortress"
-  finish
-endif
-
-syn region honuComment start="/\*" end="\*/" contains=honuComment
-syn match honuLineComment "//.*"
-
-syn region honuString start=+"+ skip=+\\\\\|\\"+ end=+"+
-syn match honuNumber "\<-\=\d\(_\|\d\)*"
-
-syn keyword honuKeyword pattern macro var function
-syn keyword honuConditional if
-syn match honuOperator "="
-syn keyword honuBoolean true false
-syn match honuSpecial "\.\.\."
-syn match honuSpecial "\$"
-syn match honuSpecial "#lang"
-
-if version >= 508 || !exists("did_honu_syntax_inits")
-  if version < 508
-    let did_honu_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink honuComment           Comment
-  HiLink honuLineComment       Comment
-  HiLink honuKeyword           Keyword
-  HiLink honuExternal          Include
-  HiLink honuType              Type
-  HiLink honuOperator          Operator
-  HiLink honuEnd               Statement
-
-  HiLink honuBoolean           Boolean
-  HiLink honuConditional       Conditional
-  
-  HiLink honuString            String
-  HiLink honuChar              String
-  HiLink honuNumber            Number
-  HiLink honuSpecial           Special
-  
-  HiLink honuThenErr           Error
-  
-  delcommand HiLink
-endif
-
-let b:current_syntax = "honu"
diff --git a/pkgs/honu/core/api.rkt b/pkgs/honu/core/api.rkt
deleted file mode 100644
index 891e9f46b1..0000000000
--- a/pkgs/honu/core/api.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-
-;; Public API for interfacing with the honu macro system
-
-(require "private/syntax.rkt"
-         "private/literals.rkt"
-         (for-syntax "private/compile.rkt"
-                     "private/syntax.rkt"
-                     "private/parse2.rkt"))
-(provide define-honu-syntax
-         define-literal
-         (for-syntax racket-syntax
-                     honu-expression
-                     honu-syntax
-                     honu-body
-                     parse-all))
diff --git a/pkgs/honu/core/lang/reader.rkt b/pkgs/honu/core/lang/reader.rkt
deleted file mode 100644
index ec23a12187..0000000000
--- a/pkgs/honu/core/lang/reader.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang s-exp syntax/module-reader
-
-honu/core/main
-
-#:read honu-read 
-#:read-syntax honu-read-syntax
-#:whole-body-readers? #t
-#:info honu-info
-
-(require "../read.rkt")
-(require "../language.rkt")
diff --git a/pkgs/honu/core/language.rkt b/pkgs/honu/core/language.rkt
deleted file mode 100644
index a5c303e543..0000000000
--- a/pkgs/honu/core/language.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-
-;; This module provides some functions used for metadata about the language
-
-(provide honu-info)
-(define (honu-info key default default-filter)
-  ; (printf "get info for ~a\n" key)
-  (case key
-    [(color-lexer) (dynamic-require 'honu/core/read
-                                    'color-lexer)]
-    [else
-      (default-filter key default)]))
-
-(provide honu-language-info)
-(define (honu-language-info data)
-  (lambda (key default)
-    (case key
-      [(configure-runtime) '(#(honu/core/runtime configure #f))]
-      [else default])))
diff --git a/pkgs/honu/core/main.rkt b/pkgs/honu/core/main.rkt
deleted file mode 100644
index df2470816a..0000000000
--- a/pkgs/honu/core/main.rkt
+++ /dev/null
@@ -1,123 +0,0 @@
-#lang racket/base
-
-(define-syntax-rule (standard-honu meta-level)
-  (begin
-    (require (for-meta meta-level
-                       racket/base
-                       racket/class
-                       (prefix-in list: racket/list)
-                       "private/macro2.rkt"
-                       "private/class.rkt"
-                       "private/operator.rkt"
-                       "private/syntax.rkt"
-                       (prefix-in literal: "private/literals.rkt")
-                       (prefix-in syntax-parse: syntax/parse)
-                       (prefix-in racket: racket/base)
-                       (prefix-in parse: "private/parse2.rkt")
-                       "private/honu2.rkt"))
-    (provide (for-meta meta-level 
-                       (rename-out [parse:honu-expression expression]
-                                   [parse:honu-expression-list expression_list]
-                                   [parse:honu-identifier identifier]
-                                   [racket:else else]
-                                   [racket:void void]
-                                   [parse:honu-number number]
-                                   [parse:honu-string string]
-                                   [honu-function function]
-                                   [honu-function fun]
-                                   [honu-var var]
-                                   [honu-syntax-var syntax_var]
-                                   [honu-== ==]
-                                   [honu-not-equal !=]
-                                   [honu--> %arrow]
-                                   [honu-class class]
-                                   [honu-require require]
-                                   [honu-provide provide]
-                                   [honu-new new]
-                                   [honu-while while]
-                                   [honu-macro macro]
-                                   [honu-phase phase]
-                                   [honu-racket racket]
-                                   [honu-primitive-macro primitive_macro]
-                                   [honu-pattern pattern]
-                                   [racket:read-line readLine]
-                                   [honu-with-input-from-file withInputFromFile]
-                                   [define-make-honu-operator operator]
-                                   [define-make-honu-binary-operator binary_operator]
-                                   [define-make-honu-unary-operator unary_operator]
-                                   [honu-match match]
-                                   [honu-with with]
-                                   [literal:honu-where where]
-                                   [honu-for-syntax for_syntax]
-                                   [honu-var var]
-                                   [honu-val val]
-                                   [honu-for for]
-                                   [honu-fold fold]
-                                   [honu-to to]
-                                   [honu-if if]
-                                   [honu-quote quote]
-                                   [honu-quasiquote quasiquote]
-                                   [honu-+ +] [honu-- -]
-                                   [honu-* *] [honu-/ /]
-                                   [honu-modulo %]
-                                   [honu-^ ^]
-                                   [honu-> >] [honu-< <]
-                                   [honu->= >=]
-                                   [honu-<= <=]
-                                   [honu-=> =>]
-                                   ;; [honu-equal =]
-                                   ;; [honu-assignment :=]
-                                   [honu-map map]
-                                   [honu-flow \|]
-                                   [honu-dot %dot]
-                                   [honu--> %arrow]
-                                   [honu-string=? string_equal]
-                                   [honu-cons ::]
-                                   [honu-and and] [honu-and &&]
-                                   [honu-or or] [honu-or \|\|]
-                                   [honu-not not] [honu-not !]
-                                   [honu-structure structure]
-                                   [honu-structure struct]
-                                   [honu-syntax syntax]
-                                   [honu-equal =]
-                                   [honu-+= +=] [honu--= -=]
-                                   [honu-*= *=] [honu-/= /=]
-                                   [literal:postfix postfix]
-                                   [literal:honu-prefix prefix]
-                                   [literal:honu-then then]
-                                   [literal:colon %colon]
-                                   [literal:honu-in in]
-                                   [literal:semicolon %semicolon]
-                                   [literal:honu-comma honu-comma]
-                                   [literal:honu-$ honu-$]
-                                   [literal:honu-<- <-]
-                                   [literal:honu-in-lines inLines]
-                                   [literal:#%brackets #%brackets]
-                                   [literal:#%braces #%braces]
-                                   [literal:#%parens #%parens])
-                       (rename-out
-                         [datum->syntax datum_to_syntax]
-                         [syntax->datum syntax_to_datum]
-                         [syntax->list syntax_to_list]
-                         [list:first first]
-                         [symbol->string symbol_to_string]
-                         [string-append string_append])
-                       print printf
-                       true false
-                       withSyntax
-                       mergeSyntax
-                       this
-                       error
-                       #%top
-                       #%datum
-                       (... ...)
-                       ))))
-
-(require "private/honu-typed-scheme.rkt")
-
-;; Provide standard stuff at phase 1
-(standard-honu 1)
-(standard-honu 0)
-
-(provide (rename-out [#%dynamic-honu-module-begin #%module-begin]
-                     [honu-top-interaction #%top-interaction]))
diff --git a/pkgs/honu/core/private/canonical.rkt b/pkgs/honu/core/private/canonical.rkt
deleted file mode 100644
index e06472e6f0..0000000000
--- a/pkgs/honu/core/private/canonical.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(provide (all-defined-out))
-
-(require "literals.rkt"
-         (for-template "honu-typed-scheme.rkt")
-         syntax/parse)
-
-;; syntax -> string
-(define (to-honu-string stx)
-  (syntax-parse stx
-    #:literal-sets ([cruft #:at stx])
-    #:literals (honu-unparsed-begin)
-    [(f (#%parens x ...) rest ...)
-     (format "~a(~a)~a"
-             (to-honu-string #'f)
-             (to-honu-string #'(x ...))
-             (to-honu-string #'(rest ...)))]
-    [(x1) (to-honu-string #'x1)]
-    [(x1 x2 ...)
-     (format "~a ~a" (to-honu-string #'x1)
-             (to-honu-string #'(x2 ...)))]
-    [() ""]
-    [else (format "~a" (syntax->datum stx))]))
diff --git a/pkgs/honu/core/private/class.rkt b/pkgs/honu/core/private/class.rkt
deleted file mode 100644
index ff92cf3a95..0000000000
--- a/pkgs/honu/core/private/class.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang racket/base
-
-(require "syntax.rkt"
-         "literals.rkt"
-         (only-in "operator.rkt" honu-equal)
-         (only-in "honu2.rkt" honu-declaration separate-ids)
-         (for-syntax racket/base
-                     "compile.rkt"
-                     "literals.rkt"
-                     "parse2.rkt"
-                     "util.rkt"
-                     syntax/parse)
-         racket/class)
-
-(begin-for-syntax
-  (define (replace-with-public method)
-    (syntax-parse method #:literals (define)
-      [(define (name args ...) body ...)
-       (racket-syntax (define/public (name args ...) body ...))]))
-  (define-literal-set equals (honu-equal))
-  (define-splicing-syntax-class honu-class-thing
-                                #:literal-sets (equals)
-    [pattern method:honu-function
-             #:with result (replace-with-public (local-binding method.result))]
-    [pattern var:honu-declaration
-             #:with result #'(field [var.name var.expression] ...)]))
-
-(provide honu-class)
-(define-honu-syntax honu-class
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      ;; FIXME: empty parenthesis for constructor arguments should be optional
-      [(_ name (#%parens (~var constructor-argument (separate-ids (literal-syntax-class honu-comma) (literal-syntax-class honu-comma))))
-          (#%braces method:honu-class-thing ...) . rest)
-       (define class
-         (racket-syntax (define name (class* object% ()
-                                         (super-new)
-                                         (init-field constructor-argument.id ...)
-                                         method.result ...))))
-       (values class (local-binding rest) #t)])))
-
-(provide honu-new)
-(define-honu-syntax honu-new
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ name (#%parens arg:honu-expression/comma) . rest)
-       (define new (racket-syntax (make-object name (let () arg.result) ...)))
-       (values
-         new
-         (local-binding rest)
-         #f)])))
diff --git a/pkgs/honu/core/private/compile.rkt b/pkgs/honu/core/private/compile.rkt
deleted file mode 100644
index face5515ca..0000000000
--- a/pkgs/honu/core/private/compile.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         "debug.rkt"
-         "literals.rkt"
-         (for-syntax racket/base
-                     "debug.rkt"))
-
-;; to get syntax as a literal
-(require (for-template racket/base))
-
-(provide (all-defined-out))
-
-; (define parsed-property (gensym 'honu-parsed))
-(define parsed-property 'honu-parsed)
-
-(define (parsed-syntax syntax)
-  (debug "Add parsed syntax property to ~a\n" (syntax->datum syntax))
-  (if syntax
-    (syntax-property syntax parsed-property #t)
-    syntax))
-
-(define (parsed-syntax? syntax)
-  (if syntax
-    (syntax-property syntax parsed-property)
-    syntax))
-
-(define-syntax (racket-syntax stx)
-  (syntax-case stx ()
-    [(_ form)
-     (begin
-       (debug 2 "Racket syntax ~a\n" (syntax->datum #'form))
-       #'(parsed-syntax #'form))]))
diff --git a/pkgs/honu/core/private/contexts.rkt b/pkgs/honu/core/private/contexts.rkt
deleted file mode 100644
index 2139468861..0000000000
--- a/pkgs/honu/core/private/contexts.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang scheme
-
-(define-struct block-context (return?))
-(define-struct (top-block-context block-context) ())
-(define-struct (expression-block-context block-context) ())
-
-(define-struct definition-context ())
-(define-struct (function-definition-context definition-context) ())
-(define-struct (value-definition-context definition-context) ())
-(define-struct (constant-definition-context value-definition-context) ())
-(define-struct (variable-definition-context value-definition-context) ())
-
-(define-struct expression-context ())
-(define-struct type-context ())
-(define-struct type-or-expression-context ())
-(define-struct prototype-context ())
-
-(define the-block-context (make-block-context #f))
-(define the-top-block-context (make-top-block-context #f))
-(define the-expression-block-context (make-expression-block-context #f))
-(define the-return-block-context (make-block-context #t))
-(define the-expression-return-block-context (make-expression-block-context #t))
-
-(define the-variable-definition-context (make-variable-definition-context))
-(define the-constant-definition-context (make-constant-definition-context))
-(define the-function-definition-context (make-function-definition-context))
-
-(define the-expression-context (make-expression-context))
-(define the-type-context (make-type-context))
-(define the-type-or-expression-context (make-type-or-expression-context))
-(define the-prototype-context (make-prototype-context))
-
-(define (context->name ctx)
-  (cond
-    [(type-context? ctx) "a type"]
-    [(type-or-expression-context? ctx) "a type or expression"]
-    [(expression-context? ctx) "an expression"]
-    [(expression-block-context? ctx) "a statement"]
-    [(block-context? ctx) "a block"]
-    [(variable-definition-context? ctx) "a variable-definition"]
-    [(constant-definition-context? ctx) "a constant-definition"]
-    [(function-definition-context? ctx) "a function-definition"]
-    [(prototype-context? ctx) "a function-definition"]
-    [else "an expression"]))
-
-(provide block-context?
-         expression-block-context?
-         top-block-context?
-
-         definition-context?
-         function-definition-context?
-         value-definition-context?
-         variable-definition-context?
-         constant-definition-context?
-
-         expression-context?
-         type-context?
-         type-or-expression-context?
-         prototype-context?
-
-         block-context-return?
-
-         the-block-context
-         the-top-block-context
-         the-return-block-context
-         the-expression-block-context
-         the-expression-return-block-context
-
-         make-function-definition-context
-         the-variable-definition-context
-         the-constant-definition-context
-         the-function-definition-context
-
-         the-expression-context
-         the-type-context
-         the-type-or-expression-context
-         the-prototype-context
-
-         context->name)
diff --git a/pkgs/honu/core/private/debug.rkt b/pkgs/honu/core/private/debug.rkt
deleted file mode 100644
index 84a087f49b..0000000000
--- a/pkgs/honu/core/private/debug.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     syntax/parse))
-
-(provide debug)
-
-(define-for-syntax (filename path)
-  (if path
-    (let ()
-      (define-values (base name dir?)
-                     (split-path (build-path path)))
-      name)
-    "no source"))
-
-(define (colorize string color)
-  (define colors (hash 'none "0"
-                       'black "0;30"
-                       'red "0;31"
-                       'green "0;32"
-                       'brown "0;33"
-                       'blue "0;34"
-                       'purple "0;35"
-                       'cyan "0;36"
-                       'light-gray "0;37"
-                       'dark-gray "1:30"
-                       'light-red "1;31"
-                       'light-green "1;32"
-                       'yellow "1;33"
-                       'light-blue "1;34"
-                       'light-purple "1;35"
-                       'light-cyan "1;36"
-                       'white "1;37"))
-  (define (get-color color)
-    (hash-ref colors color (lambda () "0")))
-  (format "\033[~am~a\033[0m" (get-color color) string))
-
-(define-for-syntax verbose? (getenv "HONU_DEBUG"))
-(define-syntax (debug stx)
-  (if verbose?
-    (syntax-parse stx
-      [(_ str:str x ...)
-       (with-syntax ([file (filename (syntax-source #'str))]
-                     [line (syntax-line #'str)]
-                     [column (syntax-column #'str)])
-         #'(printf (string-append "~a at ~a:~a " str)
-                   (colorize file 'green)
-                   (colorize line 'red)
-                   (colorize column 'red)
-                   x ...))]
-      [(_ level:number message:str x ...)
-       (if (>= (string->number verbose?)
-               (syntax->datum #'level))
-         #'(debug message x ...)
-         #'(void))])
-    #'(void)))
-
diff --git a/pkgs/honu/core/private/extra.rkt b/pkgs/honu/core/private/extra.rkt
deleted file mode 100644
index cd54bae06d..0000000000
--- a/pkgs/honu/core/private/extra.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-
-(provide do-lookup)
-(define (do-lookup data slice)
-  (cond
-    [(list? data) (list-ref data slice)]
-    [(string? data) (string-ref data slice)]
-    [(vector? data) (vector-ref data slice)]
-    [else (error 'lookup "don't know how to lookup ~a" data)]))
diff --git a/pkgs/honu/core/private/fixture.rkt b/pkgs/honu/core/private/fixture.rkt
deleted file mode 100644
index bdda9c011c..0000000000
--- a/pkgs/honu/core/private/fixture.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base))
-
-(provide (rename-out [prop:fixture? fixture?])
-         make-fixture
-         (rename-out [-fixture-ref fixture-ref]))
-(define-values (prop:fixture prop:fixture? prop:fixture-ref)
-               (make-struct-type-property 'fixture))
-
-#;
-(provide honu-operator?)
-(define-values (struct:fixture -make-fixture fixture? -fixture-ref fixture-set!)
-               (make-struct-type 'fixture #f 1 0 #f 
-                                 (list (list prop:fixture #t))
-                                 (current-inspector) 0))
-
-(define (make-fixture transformer)
-  (when (and (procedure? transformer)
-             (not (procedure-arity-includes? transformer 2)))
-    (raise-type-error
-      'define-fixture
-      "procedure (arity 2)"
-      transformer))
-  (-make-fixture transformer))
-
diff --git a/pkgs/honu/core/private/honu-plan b/pkgs/honu/core/private/honu-plan
deleted file mode 100644
index fac062c090..0000000000
--- a/pkgs/honu/core/private/honu-plan
+++ /dev/null
@@ -1,36 +0,0 @@
-honu forms -> expanded, parsed into racket code
-to expand honu forms we have to parse the code again
-
-1. start with raw honu code
-2. wrap it with (honu-unparsed-begin ...)
-3. run macro processor, eventually spit out s-expressions
-   honu macros will only produce honu syntax, but primitive
-   forms can produce s-expressions
-so what should parsing 'expression' as a syntax class produce?
-eventually 1 + 1 should be converted into (+ 1 1) but what should be the
-representation of this as an expression within a macro?
-  x:expression
-maybe just the unparsed form
-  x == 1 + 1
-with possibly some accessors to tell stuff about the expression
-so if a macro appears when an expression wants to parse then the macro
-will be parsed and the result will be passed along
-  foo x:expression
-  foo some_macro 1 + 1
-where some_macro is
-  some_macro x:expression => "ok"
-then foo will get
-  x => "ok"
-as opposed to
-  x => some_macro 1 + 1
-when should honu syntax be converted to racket?
-at the top level. if we know what context we are expanding then we can compile
-top-level things
-
-Parsing:
-  macro invocation starts parsing process. parse one expression, get back a top level form and unparsed syntax. the top level form has to be local-expanded to eventually produce some low-level racket syntax (like define).
-  (honu-parse stuff ...)
-
-  (define-syntax (honu-parse stx) ...)
-  
-Should call parse on stx and return 
diff --git a/pkgs/honu/core/private/honu-typed-scheme.rkt b/pkgs/honu/core/private/honu-typed-scheme.rkt
deleted file mode 100644
index 4bbefcc66f..0000000000
--- a/pkgs/honu/core/private/honu-typed-scheme.rkt
+++ /dev/null
@@ -1,514 +0,0 @@
-#lang racket/base
-
-;; (require (rename-in typed-scheme (#%module-begin #%module-begin-typed-scheme)))
-(require (for-syntax scheme/base
-                     syntax/stx
-                     syntax/name
-                     syntax/define
-                     syntax/parse
-                     syntax/parse/experimental/splicing
-                     scheme/splicing
-                     macro-debugger/emit
-                     racket/pretty
-                     "compile.rkt"
-                     "debug.rkt"
-                     "contexts.rkt"
-                     "util.rkt"
-                     ;; "ops.rkt"
-                     "syntax.rkt"
-                     ;; "parse.rkt"
-                     "parse2.rkt"
-                     "literals.rkt"
-                     )
-         syntax/parse
-         "literals.rkt"
-         "debug.rkt"
-         ;; (prefix-in honu: "honu.rkt")
-         ;; (prefix-in honu: "macro2.rkt")
-         ;; "typed-utils.ss"
-         )
-
-(require (for-meta 2 racket/base "util.rkt"))
-(require (for-meta 3 racket/base))
-
-(provide (all-defined-out))
-
-(begin-for-syntax
-
-#;
-(define parse-expr
-  ;; The given syntax sequence must not be empty
-  (let ()
-    (define (parse-expr-seq stx)
-      (define (start-expr stx) 
-        (let ([trans (get-transformer stx)])
-          (if trans
-            (let-values ([(expr rest) (trans stx the-expression-context)])
-              (if (stx-null? rest)
-                (list expr)
-                (cons expr (start-operator rest))))
-            (syntax-case* stx (#%parens #%braces #%angles) delim-identifier=?
-                          [(v)
-                           (or (number? (syntax-e #'v))
-                               (identifier? #'v)
-                               (string? (syntax-e #'v)))
-                           (if (operator? #'v)
-                             (raise-syntax-error
-                               #f
-                               "operator alone is not an expression and cannot start an expression"
-                               #'v)
-                             (list #'v))]
-                          [((#%parens . pexpr))
-                           ;; parens as an expression
-                           (if (stx-null? #'pexpr)
-                             (raise-syntax-error
-                               #f
-                               "missing expression inside parentheses as expression"
-                               (stx-car stx))
-                             (list (parse-expr #'pexpr)))]
-                          [((#%parens . pexpr) expr . more)
-                           (get-transformer #'pexpr)
-                           ;; Expand pexpr in an expression-or-type context, and make a cast 
-                           ;; if it's a type.
-                           (let ([trans (get-transformer #'pexpr)])
-                             (let-values ([(expr-or-type rest) (trans #'pexpr the-type-or-expression-context)])
-                               (cons expr-or-type
-                                     (start-operator #'(expr . more)))))]
-                          [((#%braces . pexpr))
-                           (if (stx-null? #'pexpr)
-                             (raise-syntax-error
-                               #f
-                               "missing expression inside braces as expression"
-                               (stx-car stx))
-                             (list #'(honu-unparsed-block #f obj 'obj #f #f . pexpr)))]
-                          [(op . more)
-                           (and (identifier? #'op)
-                                (memq (syntax-e #'op) unary-prefix-ops))
-                           (cons (make-prefix (stx-car stx)) (start-expr #'more))]
-                          [(expr then . more)
-                           (append (start-expr (list #'expr))
-                                   (start-operator #'(then . more)))]
-                          [(bad . rest)
-                           (raise-syntax-error
-                             'expression
-                             "unknown expression form"
-                             #'bad)]))))
-      (define (start-operator stx)
-        (unless (or (and (stx-pair? (stx-car stx))
-                         (let ([id (stx-car (stx-car stx))])
-                           (or (delim-identifier=? #'#%brackets id)
-                               (delim-identifier=? #'#%parens id)
-                               (delim-identifier=? #'#%angles id))))
-                    (and (identifier? (stx-car stx))
-                         (hash-ref op-table
-                                   (syntax-e (stx-car stx))
-                                   (lambda () #f))))
-          (raise-syntax-error
-            'expression
-            "expected an operator, but found something else"
-            (stx-car stx)))
-        ;; Check for postfix operator, first (or parens as a
-        ;;  an "infix" operator)
-        (cond
-          [(stx-pair? (stx-car stx))
-           ;; Convert vector index or application to a binary operator:
-           (let ([opl (let ([id (stx-car (stx-car stx))])
-                        ;; Note that we don't check for whether #%brackets, etc. is
-                        ;;  bound as a transformer, which means that you can't
-                        ;;  change the parsing of [], (), or <> as an "infix" operator.
-                        (cond
-                          [(delim-identifier=? #'#%brackets id)
-                           (let ([index-expr (parse-expr (stx-cdr (stx-car stx)))])
-                             (list (make-infix id)
-                                   index-expr))]
-                          [(delim-identifier=? #'#%parens id)
-                           (let ([arg-exprs (parse-arg-list (stx-cdr (stx-car stx)))])
-                             (list (make-infix id)
-                                   arg-exprs))]
-                          [(delim-identifier=? #'#%angles id)
-                           (list (make-infix id)
-                                 ;; These are normally type expressions, so
-                                 ;;  leave parsing to honu-type-ap:
-                                 (stx-cdr (stx-car stx)))]
-                          [else (error "internal error parsing expr")]))])
-             (if (stx-null? (stx-cdr stx))
-               opl
-               (append opl (start-operator (stx-cdr stx)))))]
-          [(memq (syntax-e (stx-car stx)) unary-postfix-ops)
-           (if (stx-null? (stx-cdr stx))
-             (list (make-postfix (stx-car stx)))
-             (cons (make-postfix (stx-car stx))
-                   (start-operator (stx-cdr stx))))]
-          [else
-            ;; Otherwise, must be infix
-            (cons (make-infix (stx-car stx))
-                  (start-expr (stx-cdr stx)))]))
-      (start-expr stx))
-
-    (define (parse-expr stx)
-      (let group ([seq (parse-expr-seq stx)])
-        ;; seq is a list that mixes exprs with ops.
-        ;; Find leftmost oper with maximal precedence
-        (if (null? (cdr seq))
-          (car seq)
-          (let loop ([seq seq][before null][op #f][since null])
-            (cond
-              [(null? seq)
-               (cond
-                 [(prefix? op)
-                  (let ([after (reverse since)])
-                    (group (append (reverse before)
-                                   (list (quasisyntax/loc (op-id op)
-                                                          (op-app #,(op-id op) #%prefix #,(car after))))
-                                   (cdr after))))]
-                 [(postfix? op)
-                  (let ([after (reverse since)]
-                        [before (reverse before)])
-                    (group (append (cdr before)
-                                   (list (quasisyntax/loc (op-id op)
-                                                          (op-app #,(op-id op) #%postfix #,(car before))))
-                                   after)))]
-                 [(infix? op)
-                  (let ([after (reverse since)])
-                    (group (append (reverse (cdr before))
-                                   (list (quasisyntax/loc (op-id op)
-                                                          (op-app #,(op-id op) #,(car before) #,(car after))))
-                                   (cdr after))))]
-                 [else (error 'parse-expr "not an op!: ~s ~s ~s" op before since)])]
-              [(not (op? (stx-car seq)))
-               (loop (cdr seq) before op (cons (car seq) since))]
-              [((if (prefix? op) >= >)
-                (hash-ref precedence-table (prec-key (car seq)) (lambda () 0))
-                (hash-ref precedence-table (prec-key op) (lambda () 0)))
-               (loop (cdr seq) 
-                     (if op
-                       (append since (list op) before)
-                       since)
-                     (car seq) null)]
-              [else
-                (loop (cdr seq) before op (cons (car seq) since))])))))
-
-    (define (parse-arg-list stxs)
-      (if (stx-null? stxs)
-        stxs
-        (let-values ([(val-stxs after-expr terminator) (extract-until stxs (list #'\,))])
-          (when (and val-stxs
-                     (stx-null? (stx-cdr after-expr)))
-            (raise-syntax-error
-              'procedure\ call
-              "missing expression after comma"
-              (stx-car after-expr)))
-          (when (null? val-stxs)
-            (raise-syntax-error
-              'procedure\ call
-              "missing expression before token"
-              (stx-car after-expr)))
-          (if val-stxs
-            (cons (parse-expr val-stxs)
-                  (parse-arg-list (stx-cdr after-expr)))
-            (list (parse-expr stxs))))))
-
-    parse-expr))
-
-#;
-(define (parse-tail-expr expr-stxs)
-  (syntax-parse expr-stxs
-    #:literals (honu-return)
-    [(honu-return expr ...)
-     #:fail-when (stx-null? #'(expr ...)) "missing expression"
-     (parse-expr (syntax->list #'(expr ...)))]
-    [else (parse-expr expr-stxs)]))
-
-
-#;
-(define (parse-block-one context body combine-k done-k)
-  (define (parse-one expr-stxs after-expr terminator)
-    (define (checks)
-      (unless expr-stxs
-        (raise-syntax-error
-          #f
-          "expected a semicolon to terminate form"
-          (stx-car body)))
-      (when (null? expr-stxs)
-        (raise-syntax-error
-          #f
-          "missing expression before terminator"
-          terminator)))
-    (checks)
-    (let* ([parser (if (block-context-return? context)
-                     parse-tail-expr
-                     parse-expr)]
-           [code (parser expr-stxs)])
-      (with-syntax ([code code])
-        (with-syntax ([top-expr (if (top-block-context? context) 
-                                   #'(let ([v code])
-                                       (unless (void? v)
-                                         (debug "~s\n" v)))
-                                   #'code)])
-          (combine-k #'(#%expression top-expr)
-                     (stx-cdr after-expr))))))
-  (cond
-    [(stx-null? body) (done-k)]
-    [(get-transformer body) =>
-     (lambda (transformer)
-       (let-values ([(code rest) (transformer body context)])
-         (combine-k code rest)))]
-    [else (call-values (extract-until body (list #'\;
-                                                 ))
-                       parse-one )]))
-
-#;
-(define (parse-block stx ctx)
-  (let loop ([stx stx])
-    (parse-block-one ctx
-                     stx 
-                     (lambda (code rest)
-                       (cons code (loop rest)))
-                     (lambda ()
-                       null))))
-
-(define (expression-result ctx expr rest)
-     (if (top-block-context? ctx)
-         (values #`(#%expression (show-top-result #,expr)) rest)
-         (values #`(#%expression #,expr) rest)))
-
-)
-
-#|
-
-Yes, check out head patterns and splicing syntax classes.
-
-For example, if 'display' is a special kind of statement, you might have something like this:
-
-(define-splicing-syntax-class statement
-      (pattern (~seq (~literal display) something (~literal \;)))
-      ___ <other alternatives> ___)
-
-Then, in the pattern above for 'if', 'then' would be bound to the following syntax list:
-  (display (#%braces "hello world") \;) 
-
-(if expr block else statement rest)
-(if expr block rest)
-
-|#
-
-(define-syntax (define-honu-infix-syntax stx)
-  (let-values ([(id rhs) (normalize-definition stx #'lambda #f)])
-    (with-syntax ([id id]
-                  [rhs rhs])
-      (syntax/loc stx
-                 (define-syntax id (make-honu-infix-transformer rhs))))))
-
-#;
-(honu:define-honu-syntax honu-macro-item
-  (lambda (stx ctx)
-    (syntax-parse stx
-      #:literals (#%braces)
-      [(_ name:id (#%braces literals (#%braces literal ...)
-                   items ...) . rest)
-       (values #'(define-syntax-class name [pattern x])
-               #'rest)])))
-
-#;
-(honu:define-honu-syntax honu-scheme
-  (lambda (stx ctx)
-    (syntax-parse stx #:literals (semicolon)
-      [(_ template semicolon rest ...)
-       (values (lambda () #'(lambda () template)) #'(rest ...))]
-      [else (raise-syntax-error 'scheme "need a semicolon probably" stx)]
-      )))
-
-#;
-(honu:define-honu-syntax honu-keywords
-  (lambda (stx ctx)
-    (syntax-parse stx #:literals (semicolon)
-      [(_ keyword:honu-identifier ... semicolon . rest)
-       (values (lambda () (apply-scheme-syntax
-                            (syntax/loc stx
-                                        (begin
-                                          (define-syntax keyword.x (lambda (xx) (raise-syntax-error 'keyword.x "dont use this")))
-                                          ...))))
-               #'rest)])))
-
-#|
-(honu:define-honu-syntax honu-if
-  (lambda (stx ctx)
-    (define (parse-complete-block stx)
-      ;; (debug "Parsing complete block ~a\n" (syntax->datum stx))
-      (with-syntax ([(exprs ...) (parse-block stx the-expression-block-context)])
-        #'(begin exprs ...)))
-    ;; TODO: move these syntax classes to a module
-    (define-syntax-class expr
-      [pattern e])
-    (define-syntax-class paren-expr
-                         #:literals (#%parens)
-      [pattern (#%parens expr:expression) #:with result #'expr.result])
-    (define-syntax-class block
-                         [pattern (#%braces statement ...)
-                                  #:with line #'(honu-unparsed-begin statement ...)])
-    ;; (debug "Original syntax ~a\n" (syntax->datum stx))
-    (syntax-parse stx
-      #:literals (else)
-      [(_ condition:paren-expr on-true:block else on-false:block . rest)
-       ;; (debug "Condition expr is ~a\n" #'condition.expr)
-       ;; (debug "used if with else\n")
-       (let ([result #'(if condition.result on-true.line on-false.line)])
-         (values
-           (lambda () result)
-           #'rest))]
-      [(_ condition:paren-expr on-true:block . rest)
-       ;; (debug "used if with no else\n")
-       (let ([result #'(when condition.result on-true.line)])
-         (values
-           (lambda () result)
-           #'rest))])))
-|#
-
-
-(define (show-top-result v)
-  (unless (void? v)
-    (debug "~s\n" v)))
-
-(define-syntax (op-app stx)
-    (syntax-case stx (#%parens #%angles)
-      [(_ #%parens a (b ...))
-       #'(a b ...)
-       #;
-       #'(honu-app a b ...)]
-      [(_ #%angles a (b ...))
-       #'(honu-type-app a b ...)]
-      [(_ a b ...) 
-       (datum->syntax #'a
-                      (cons #'a #'(b ...))
-                      #'a)]))
-  
-(define-syntax (honu-top stx)
-  (debug "Honu ~a\n" (syntax->datum stx))
-  (raise-syntax-error #f "interactive use is not yet supported"))
-
-(define (display2 x y)
-  (debug "~a ~a" x y))
-
-#;
-(define-syntax (honu-unparsed-expr stx)
-  (syntax-parse stx
-    [(_ expr ...)
-     (emit-remark "Parse an expression" #'(expr ...))
-     (parse-an-expr #'(expr ...))]
-    [else (raise-syntax-error 'honu-unparsed-expr "Invalid expression syntax" stx)]))
-
-#;
-(honu:define-honu-syntax scheme-syntax
-  (lambda (body ctx)
-    (syntax-parse body
-      [(_ template . rest)
-       (values
-         (lambda ()
-           (debug "Applying syntax to ~a\n" (quote-syntax template))
-           (apply-scheme-syntax #'#'template))
-         #'rest)])))
-
-#;
-(honu:define-honu-syntax honu-provide
-  (lambda (body ctx)
-    (syntax-parse body #:literals (semicolon)
-      [(_ x:honu-identifier ... semicolon . rest)
-       (values
-         (lambda ()
-           (debug "Providing ~a\n" #'(x ...))
-           #'(provide x.x ...))
-         #'rest)])))
-
-#;
-(honu:define-honu-syntax honu-require
-  (lambda (body ctx)
-    (define-syntax-class for-syntax-form
-                         #:literals (#%parens honu-for-syntax)
-      [pattern (#%parens honu-for-syntax spec)
-               #:with result
-               (datum->syntax #'spec (cons #'for-syntax (cons #'spec #'()))
-                              #'spec #'spec)
-               #;
-               (datum->syntax body (cons #'for-syntax (cons #'spec #'()))
-                                            body body)])
-    (define-syntax-class for-template-form
-                         #:literals (#%parens honu-for-template)
-      [pattern (#%parens honu-for-template spec)
-               #:with result
-               (datum->syntax #'spec (cons #'for-template (cons #'spec #'()))
-                              #'spec #'spec)])
-    (define-syntax-class normal-form
-      [pattern x:str #:with result #'x])
-    (define-syntax-class form
-      [pattern x:for-syntax-form #:with result #'x.result]
-      [pattern x:for-template-form #:with result #'x.result]
-      [pattern x:normal-form #:with result #'x.result])
-    (syntax-parse body #:literals (semicolon)
-      [(_ form:form ... semicolon . rest)
-       (values
-         (lambda ()
-           (datum->syntax
-             body
-             (cons #'require
-                   #'(form.result ...))
-             body
-             body))
-         #'rest)])))
-
-(define-for-syntax (honu-expand forms)
-  (parse-one forms))
-
-(define-for-syntax (honu-compile forms)
-  #'(void))
-
-(provide honu-unparsed-begin)
-(define-syntax (honu-unparsed-begin stx)
-  (emit-remark "Honu unparsed begin!" stx)
-  (debug "honu unparsed begin: ~a at phase ~a\n" (syntax->datum stx) (syntax-local-phase-level))
-  (syntax-parse stx
-    [(_) #'(void)]
-    [(_ forms ...)
-     #'(begin
-         (define-syntax (parse-more stx)
-           (syntax-case stx ()
-             [(_ stuff (... ...))
-              (do-parse-rest #'(stuff (... ...)) #'parse-more)]))
-         (parse-more forms ...))
-     ;; if parsed is #f then we don't want to expand to anything that will print
-     ;; so use an empty form, begin, `parsed' could be #f becuase there was no expression
-     ;; in the input such as parsing just ";".
-     #;
-     (begin
-     (debug "expanded ~a unexpanded ~a\n"
-            (if parsed (syntax->datum parsed) parsed)
-            (syntax->datum unparsed))(define-values (parsed unparsed) (honu-expand #'(forms ...)))
-     (with-syntax ([parsed (if (not parsed) #'(begin)
-                             (remove-repeats parsed)
-                             #;
-                             (honu->racket parsed))]
-                   [(unparsed ...) unparsed])
-       (debug "Final parsed syntax\n~a\n" (pretty-format (syntax->datum #'parsed)))
-       (debug "Unparsed syntax ~a\n" #'(unparsed ...))
-       (if (null? (syntax->datum #'(unparsed ...)))
-         (if (parsed-syntax? #'parsed)
-           #'parsed
-           (with-syntax ([(out ...) #'parsed])
-             #'(honu-unparsed-begin out ...)))
-         (if (parsed-syntax? #'parsed)
-           #'(begin parsed (honu-unparsed-begin unparsed ...))
-           (with-syntax ([(out ...) #'parsed])
-             #'(honu-unparsed-begin out ... unparsed ...))))))]))
-
-(define-syntax (#%dynamic-honu-module-begin stx)
-  (syntax-case stx ()
-    [(_ forms ...)
-     (begin
-       (debug "Module begin ~a\n" (pretty-format (syntax->datum #'(forms ...))))
-       #'(#%module-begin (honu-unparsed-begin forms ...)))]))
-
-(provide honu-top-interaction)
-(define-syntax (honu-top-interaction stx)
-  (syntax-case stx ()
-    [(_ rest ...)
-     #'(#%top-interaction . (honu-unparsed-begin rest ...))]))
-
diff --git a/pkgs/honu/core/private/honu.rkt b/pkgs/honu/core/private/honu.rkt
deleted file mode 100644
index a541a2a63d..0000000000
--- a/pkgs/honu/core/private/honu.rkt
+++ /dev/null
@@ -1,2098 +0,0 @@
-#lang scheme/base
-
-  (require (for-syntax
-             syntax/stx
-             scheme/base
-             syntax/kerncase
-             syntax/define
-             syntax/context
-             syntax/name
-             syntax/parse
-             scheme/pretty
-             "ops.rkt"
-             "util.rkt"
-             "contexts.rkt"
-             ))
-
-  (provide (all-defined-out))
-
-  (begin-for-syntax
-   ;; these definitions are used as stop-lists in local-expand
-   (define kernel-forms (kernel-form-identifier-list))
-   (define prop-expand-stop-forms (list* #'honu-typed
-                                         #'honu-unparsed-block
-                                         kernel-forms))
-   (define block-expand-stop-forms prop-expand-stop-forms)
-   (define prototype-expand-stop-forms (list
-                                        #'honu-prototype))
-   (define type-name-expand-stop-forms (list
-                                        #'honu-type-name))
-
-
-   ;; --------------------------------------------------------
-   ;; Transformer procedure property and basic struct
-
-   (define-values (prop:honu-transformer honu-transformer? honu-transformer-ref)
-     (make-struct-type-property 'honu-transformer))
-
-
-   (define-values (struct:honu-trans make-honu-trans honu-trans? honu-trans-ref honu-trans-set!)
-     (make-struct-type 'honu-trans #f 1 0 #f 
-		       (list (list prop:honu-transformer #t))
-		       (current-inspector) 0))
-
-   (define (make-honu-transformer proc)
-     (unless (and (procedure? proc)
-		  (procedure-arity-includes? proc 2))
-       (raise-type-error
-	'define-honu-syntax
-	"procedure (arity 2)"
-	proc))
-     (make-honu-trans proc))
-
-   ;; --------------------------------------------------------
-   ;; Type
-
-   (define-values (struct:honu-type make-h-type honu-type? honu-type-ref honu-type-set!)
-     (make-struct-type 'honu-type #f 4 0 #f null (current-inspector) 0))
-
-   (define (honu-type-stx v) (honu-type-ref v 0))
-   (define (honu-type-name-stx v) (honu-type-ref v 1))
-   (define (honu-type-pred-stx v) (honu-type-ref v 2))
-   (define (honu-type-protect-stx v) (honu-type-ref v 3))
-
-   ;; convert a honu type into a list with nice formatting
-   ;; todo: need example
-   (define (format-type t)
-    (if (identifier? t)
-        (syntax-e t)
-        (syntax-case t (-> forall)
-          [(-> (res . _) (arg . __) ...)
-           (append (map format-type (syntax->list #'(arg ...)))
-                   (list '-> (format-type #'res)))]
-          [(forall (id ...) rhs bindings)
-           (append (map syntax-e (syntax->list #'(id ...)))
-                   (list '>-> (format-type #'rhs)))]
-          [_else `(??? ,(syntax->datum t))])))
-
-   ;; --------------------------------------------------------
-   ;; Parsing blocks
-
-   ;; #t if the syntax object contains an operator
-   (define operator? 
-     (let ([sym-chars (string->list "+-_=?:<>.!%^&*/~|")])
-       (lambda (stx)
-	 (and (identifier? stx)
-	      (let ([str (symbol->string (syntax-e stx))])
-		(and (positive? (string-length str))
-		     (memq (string-ref str 0) sym-chars)))))))
-
-   ;; #t if the identifier is not an operator nor a delimiter
-   (define (honu-identifier? stx)
-     (and (identifier? stx)
-	  (not (ormap (lambda (i) (delim-identifier=? stx i)) (list #'\; #'\,)))
-	  (not (operator? stx))))
-
-   (define (get-transformer stx)
-     ;; if its an identifier and bound to a transformer return it
-     (define (bound-transformer stx)
-       (and (stx-pair? stx)
-            (identifier? (stx-car stx))
-            (let ([v (syntax-local-value (stx-car stx) (lambda () #f))])
-              (and (honu-transformer? v) v))))
-     (define (special-transformer stx) 
-       (and (stx-pair? stx)
-            (let ([first (stx-car stx)])
-              (cond
-                [(and (stx-pair? first)
-                      (identifier? (stx-car first))
-                      (delim-identifier=? #'#%parens (stx-car first)))
-                 ;; If the stx-car is a list with just one operator symbol,
-                 ;;  try using the operator as a transformer
-                 (let ([l (cdr (stx->list first))])
-                   (let loop ([l l])
-                     (cond
-                       [(null? l) #f]
-                       [(operator? (car l))
-                        (if (ormap operator? (cdr l))
-                          #f
-                          (let ([v (syntax-local-value (car l) (lambda () #f))])
-                            (and (honu-transformer? v)
-                                 v)))]
-                       [else (loop (cdr l))])))]
-                [(and (stx-pair? first)
-                      (identifier? (stx-car first))
-                      (free-identifier=? #'#%angles (stx-car first)))
-                 (let ([v (syntax-local-value (stx-car first) (lambda () #f))])
-                   (and (honu-transformer? v) v))]
-                [else #f]))))
-     ;; (printf "~a bound transformer? ~a\n" stx (bound-transformer stx))
-     (or (bound-transformer stx)
-         (special-transformer stx)))
-   
-   ;; --------------------------------------------------------
-   ;; Parsing blocks
-
-   (define parse-an-expr #f)
-   (define parse-a-tail-expr #f)
-
-   (define (parse-block-one ctx body k done-k)
-     (cond
-      [(stx-null? body) (done-k)]
-      [(get-transformer body)
-       => (lambda (transformer)
-	    (let-values ([(code rest) (transformer body ctx)])
-	      (k code rest)))]
-      [else (let-values ([(expr-stxs after-expr terminator)
-                          (extract-until body (list #'\;))])
-	      (unless expr-stxs
-		(raise-syntax-error
-		 #f
-		 "expected a semicolon to terminate form"
-		 (stx-car body)))
-	      (when (null? expr-stxs)
-		(raise-syntax-error
-		 #f
-		 "missing expression before terminator"
-		 terminator))
-	      (let ([code ((if (block-context-return? ctx)
-			       parse-a-tail-expr
-			       parse-an-expr)
-			   expr-stxs)])
-		(k #`(#%expression #,((if (top-block-context? ctx) 
-                                          (lambda (x) 
-                                            `(show-top-result ,x))
-                                          values)
-                                      code))
-		   (stx-cdr after-expr))))]))
-   
-   (define (parse-block stx ctx)
-     (let loop ([stx stx])
-       (parse-block-one ctx
-			stx 
-			(lambda (code rest)
-			  (cons code (loop rest)))
-			(lambda ()
-			  null))))
-
-   (define (expression-result ctx expr rest)
-     (if (top-block-context? ctx)
-         (values #`(#%expression (show-top-result #,expr)) rest)
-         (values #`(#%expression #,expr) rest)))
-
-
-   (define (finish-parsing-expression what where expr rest ctx)
-     (if (or (expression-context? ctx)
-             (type-or-expression-context? ctx))
-         (values expr rest)
-         ;; Since we're parsing an expression in a
-         ;; declaration context, we're responsible for
-         ;; getting the whole expression:
-         (let ([placeholder (datum->syntax #f (gensym))])
-           (let-values ([(expr-stxs after-expr terminator) (extract-until (cons placeholder rest) (list #'\;))])
-             (unless expr-stxs
-               (raise-syntax-error
-                #f
-                (format "expected a semicolon to terminate form after ~a" what)
-                where))
-             (let* ([total-expr (let loop ([in-expr (parse-an-expr expr-stxs)])
-                                  (cond
-                                   [(eq? in-expr placeholder) expr]
-                                   [(syntax? in-expr)
-                                    (datum->syntax in-expr
-                                                   (loop (syntax-e in-expr))
-                                                   in-expr
-                                                   in-expr
-                                                   in-expr)]
-                                   [(pair? in-expr) (cons (loop (car in-expr))
-                                                          (loop (cdr in-expr)))]
-                                   [else in-expr]))])
-               (expression-result ctx
-                                  total-expr
-                                  (stx-cdr after-expr)))))))
-
-   ;; --------------------------------------------------------
-   ;; Parsing expressions
-
-   (define parse-expr
-     ;; The given syntax sequence must not be empty
-     (let ()
-       (define (parse-expr-seq stx)
-         (define (start-expr stx) 
-           (let ([trans (get-transformer stx)])
-             (if trans
-               (let-values ([(expr rest) (trans stx the-expression-context)])
-                 (if (stx-null? rest)
-                   (list expr)
-                   (cons expr (start-operator rest))))
-               (syntax-case* stx (#%parens #%braces #%angles) delim-identifier=?
-                             [(v)
-                              (or (number? (syntax-e #'v))
-                                  (identifier? #'v)
-                                  (string? (syntax-e #'v)))
-                              (if (operator? #'v)
-                                (raise-syntax-error
-                                  #f
-                                  "operator alone is not an expression and cannot start an expression"
-                                  #'v)
-                                (list #'v))]
-                             [((#%parens . pexpr))
-                              ;; parens as an expression
-                              (if (stx-null? #'pexpr)
-                                (raise-syntax-error
-                                  #f
-                                  "missing expression inside parentheses as expression"
-                                  (stx-car stx))
-                                (list (parse-expr #'pexpr)))]
-                             [((#%parens . pexpr) expr . more)
-                              (get-transformer #'pexpr)
-                              ;; Expand pexpr in an expression-or-type context, and make a cast 
-                              ;; if it's a type.
-                              (let ([trans (get-transformer #'pexpr)])
-                                (let-values ([(expr-or-type rest) (trans #'pexpr the-type-or-expression-context)])
-                                  (if (honu-type? expr-or-type)
-                                    ;; parens as a unary prefix operator
-                                    (cons (make-cast-prefix (stx-car (stx-car stx)) expr-or-type)
-                                          (start-expr #'(expr . more)))
-                                    ;; must have been an expression
-                                    (cons expr-or-type
-                                          (start-operator #'(expr . more))))))]
-                             [((#%braces . pexpr))
-                              (if (stx-null? #'pexpr)
-                                (raise-syntax-error
-                                  #f
-                                  "missing expression inside braces as expression"
-                                  (stx-car stx))
-                                (list #'(honu-unparsed-block #f obj 'obj #f #f . pexpr)))]
-                             [(op . more)
-                              (and (identifier? #'op)
-                                   (memq (syntax-e #'op) unary-prefix-ops))
-                              (cons (make-prefix (stx-car stx)) (start-expr #'more))]
-                             [(expr then . more)
-                              (append (start-expr (list #'expr))
-                                      (start-operator #'(then . more)))]
-                             [(bad . rest)
-                              (raise-syntax-error
-                                'expression
-                                "unknown expression form"
-                                #'bad)]))))
-         (define (start-operator stx)
-           (unless (or (and (stx-pair? (stx-car stx))
-                            (let ([id (stx-car (stx-car stx))])
-                              (or (delim-identifier=? #'#%brackets id)
-                                  (delim-identifier=? #'#%parens id)
-                                  (delim-identifier=? #'#%angles id))))
-                       (and (identifier? (stx-car stx))
-                            (hash-ref op-table
-                                      (syntax-e (stx-car stx))
-                                      (lambda () #f))))
-             (raise-syntax-error
-               'expression
-               "expected an operator, but found something else"
-               (stx-car stx)))
-           ;; Check for postfix operator, first (or parens as a
-           ;;  an "infix" operator)
-           (cond
-             [(stx-pair? (stx-car stx))
-              ;; Convert vector index or application to a binary operator:
-              (let ([opl (let ([id (stx-car (stx-car stx))])
-                           ;; Note that we don't check for whether #%brackets, etc. is
-                           ;;  bound as a transformer, which means that you can't
-                           ;;  change the parsing of [], (), or <> as an "infix" operator.
-                           (cond
-                             [(delim-identifier=? #'#%brackets id)
-                              (let ([index-expr (parse-expr (stx-cdr (stx-car stx)))])
-                                (list (make-infix id)
-                                      index-expr))]
-                             [(delim-identifier=? #'#%parens id)
-                              (let ([arg-exprs (parse-arg-list (stx-cdr (stx-car stx)))])
-                                (list (make-infix id)
-                                      arg-exprs))]
-                             [(delim-identifier=? #'#%angles id)
-                              (list (make-infix id)
-                                    ;; These are normally type expressions, so
-                                    ;;  leave parsing to honu-type-ap:
-                                    (stx-cdr (stx-car stx)))]
-                             [else (error "internal error parsing expr")]))])
-                (if (stx-null? (stx-cdr stx))
-                  opl
-                  (append opl (start-operator (stx-cdr stx)))))]
-             [(memq (syntax-e (stx-car stx)) unary-postfix-ops)
-              (if (stx-null? (stx-cdr stx))
-                (list (make-postfix (stx-car stx)))
-                (cons (make-postfix (stx-car stx))
-                      (start-operator (stx-cdr stx))))]
-             [else
-               ;; Otherwise, must be infix
-               (cons (make-infix (stx-car stx))
-                     (start-expr (stx-cdr stx)))]))
-         (start-expr stx))
-
-       (define (parse-expr stx)
-         (let group ([seq (parse-expr-seq stx)])
-           ;; seq is a list that mixes exprs with ops.
-           ;; Find leftmost oper with maximal precedence
-           (if (null? (cdr seq))
-             (car seq)
-             (let loop ([seq seq][before null][op #f][since null])
-               (cond
-                 [(null? seq)
-                  (cond
-                    [(cast-prefix? op)
-                     (let ([after (reverse since)])
-                       (group (append (reverse before)
-                                      (list (quasisyntax/loc (op-id op)
-                                                             (op-cast #,(op-id op) 
-                                                                      #,(let ([t (cast-prefix-type op)])
-                                                                          (list (honu-type-stx t)
-                                                                                (honu-type-name-stx t)
-                                                                                (honu-type-pred-stx t)
-                                                                                (honu-type-protect-stx t)))
-                                                                      #,(car after))))
-                                      (cdr after))))]
-                    [(prefix? op)
-                     (let ([after (reverse since)])
-                       (group (append (reverse before)
-                                      (list (quasisyntax/loc (op-id op)
-                                                             (op-app #,(op-id op) #%prefix #,(car after))))
-                                      (cdr after))))]
-                    [(postfix? op)
-                     (let ([after (reverse since)]
-                           [before (reverse before)])
-                       (group (append (cdr before)
-                                      (list (quasisyntax/loc (op-id op)
-                                                             (op-app #,(op-id op) #%postfix #,(car before))))
-                                      after)))]
-                    [(infix? op)
-                     (let ([after (reverse since)])
-                       (group (append (reverse (cdr before))
-                                      (list (quasisyntax/loc (op-id op)
-                                                             (op-app #,(op-id op) #,(car before) #,(car after))))
-                                      (cdr after))))]
-                    [else (error 'parse-expr "not an op!: ~s ~s ~s" op before since)])]
-                 [(not (op? (stx-car seq)))
-                  (loop (cdr seq) before op (cons (car seq) since))]
-                 [((if (prefix? op) >= >)
-                   (hash-ref precedence-table (prec-key (car seq)) (lambda () 0))
-                   (hash-ref precedence-table (prec-key op) (lambda () 0)))
-                  (loop (cdr seq) 
-                        (if op
-                          (append since (list op) before)
-                          since)
-                        (car seq) null)]
-                 [else
-                   (loop (cdr seq) before op (cons (car seq) since))])))))
-
-       (define (parse-arg-list stxs)
-         (if (stx-null? stxs)
-           stxs
-           (let-values ([(val-stxs after-expr terminator) (extract-until stxs (list #'\,))])
-             (when (and val-stxs
-                        (stx-null? (stx-cdr after-expr)))
-               (raise-syntax-error
-                 'procedure\ call
-                 "missing expression after comma"
-                 (stx-car after-expr)))
-             (when (null? val-stxs)
-               (raise-syntax-error
-                 'procedure\ call
-                 "missing expression before token"
-                 (stx-car after-expr)))
-             (if val-stxs
-               (cons (parse-expr val-stxs)
-                     (parse-arg-list (stx-cdr after-expr)))
-               (list (parse-expr stxs))))))
-
-       parse-expr))
-
-   (define (parse-tail-expr expr-stxs)
-     (syntax-case expr-stxs (honu-return)
-       [(honu-return expr ...)
-	(let ([exprs #'(expr ...)])
-	  (when (stx-null? exprs)
-	    (raise-syntax-error 
-	     #f
-	     "missing expression"
-	     (stx-car expr-stxs)))
-	  (parse-expr exprs))]
-       [_else
-	(parse-expr expr-stxs)]))
-
-   (set! parse-an-expr parse-expr)
-   (set! parse-a-tail-expr parse-tail-expr)
-
-   ;; --------------------------------------------------------
-   ;; Parsing declarations (which always start with a type)
-
-   (define (parse-one-argument proc-id type id k)
-     (cons (list id 
-		 (honu-type-stx type)
-		 (honu-type-name-stx type)
-		 (honu-type-pred-stx type)
-		 (honu-type-protect-stx type))
-	   (k)))
-
-   (define (parse-arguments orig-args-stx proc-id)
-     (if (stx-null? orig-args-stx)
-	 null
-	 (let loop ([args-stx orig-args-stx]
-		    [where "at start of argument sequence"]
-		    [where-stx orig-args-stx])
-	   (let-values ([(type rest-stx) (if (syntax-case* args-stx (\,) delim-identifier=?
-					       [(id \, . rest)
-						(honu-identifier? #'id)
-						#t]
-					       [(id)
-						(honu-identifier? #'id)
-						#t]
-					       [_else #f])
-					     (values (make-h-type #'obj #''obj #f #f)
-						     args-stx)
-					     (let ([trans (get-transformer args-stx)])
-					       (if trans
-						   (trans args-stx the-type-context)
-						   (values #f #f))))])
-	     (unless (honu-type? type)
-	       (raise-syntax-error
-		'|procedure declaration|
-		(format "expected an identifier or type ~a, found something else" where)
-		where-stx))
-	     (syntax-case rest-stx ()
-	       [(id)
-		(honu-identifier? #'id)
-		(parse-one-argument proc-id type #'id
-				    (lambda () null))]
-	       [(id comma . rest)
-		(and (honu-identifier? #'id)
-		     (identifier? #'comma)
-		     (delim-identifier=? #'comma #'\,))
-		(parse-one-argument proc-id type #'id
-				    (lambda ()
-				      (loop #'rest
-					    "after comma"
-					    #'comma)))]
-	       [(id something . rest)
-		(honu-identifier? #'id)
-		(raise-syntax-error
-		 'procedure\ declaration
-		 "expected a comma after argument identifier, found something else"
-		 #'something)]
-	       [_else
-		(raise-syntax-error
-		 'procedure\ declaration
-		 "expected an argument identifier, found something else"
-		 (car rest-stx))])))))
-
-   (define (parse-types main-stx orig-args-stx)
-     (if (stx-null? orig-args-stx)
-	 null
-	 (let loop ([args-stx orig-args-stx]
-		    [where "at start of type sequence"]
-		    [where-stx orig-args-stx])
-	   (let-values ([(type rest-stx) (let ([trans (get-transformer args-stx)])
-                                           (if trans
-                                               (trans args-stx the-type-context)
-                                               (values #f #f)))])
-	     (unless (honu-type? type)
-	       (raise-syntax-error
-		'|type application|
-		(format "expected a type ~a, found something else" where)
-                main-stx
-		where-stx))
-	     (syntax-case rest-stx ()
-	       [()
-                (list type)]
-	       [(comma . rest)
-                (cons type (loop #'rest
-                                 "after comma"
-                                 #'comma))]
-	       [(something . rest)
-		(raise-syntax-error
-		 'procedure\ declaration
-		 "expected a comma after type, found something else"
-                 main-stx
-		 #'something)])))))
-
-   (define (make-honu-type pred-id get-type-name type-name-expr mk-pred-def)
-     (make-honu-trans
-      (lambda (orig-stx ctx)
-	(let-values ([(type-name type-name-expr pred-id protect-id) 
-                      (if mk-pred-def
-                          (mk-pred-def orig-stx)
-                          (let ([name (get-type-name orig-stx)])
-                            (values name 
-                                    (or type-name-expr #`'#,name)
-                                    pred-id
-                                    #f)))])
-	  (cond
-	   [(let ([is-expr?
-                   (lambda ()
-                     (syntax-case orig-stx (function)
-                       [(function . __) #t]
-                       [(_ function . __) #t]
-                       [_else #f]))])
-              (and (or (block-context? ctx)
-                       (definition-context? ctx)
-                       (prototype-context? ctx)
-                       (and (or (expression-context? ctx)
-                                (type-or-expression-context? ctx))
-                            (is-expr?)))
-                   (or (not (expression-block-context? ctx))
-                       (is-expr?))))
-	    (with-syntax ([pred-id pred-id]
-                          [protect-id protect-id]
-			  [type-name type-name]
-			  [type-name-expr type-name-expr])
-	      (let loop ([stx (if (and (not (definition-context? ctx))
-                                       (not (prototype-context? ctx))
-                                       (syntax-case orig-stx (function)
-                                         [(function . __) #t]
-                                         [_else #f]))
-                                  orig-stx
-                                  (stx-cdr orig-stx))]
-			 [after (stx-car orig-stx)]
-			 [after-what "type name"])
-		(syntax-case stx ()
-		  [(id . rest)
-		   (begin
-		     (unless (honu-identifier? #'id)
-		       (raise-syntax-error 'declaration
-					   (format "expected a identifier after ~a" after-what)
-					   (stx-car orig-stx)
-					   #'id))
-		     (if (and (or (value-definition-context? ctx)
-                                  (not (free-identifier=? #'id #'function)))
-                              (not (function-definition-context? ctx))
-                              (not (prototype-context? ctx))
-                              (identifier? (stx-car #'rest))
-			      (free-identifier=? #'set! (stx-car #'rest)))
-			 ;; -- Non-procedure declaration
-			 (if (function-definition-context? ctx)
-			     (raise-syntax-error 
-			      'declaration
-			      "expected parentheses after name for function definition"
-			      (stx-car #'rest))
-			     (let-values ([(val-stxs after-expr terminator) (extract-until (stx-cdr #'rest)
-											   (list #'\; #'\,))])
-			       (unless val-stxs
-				 (raise-syntax-error 
-				  'declaration
-				  "missing semicolon or comma after initializing assignment"
-				  (stx-car #'rest)))
-			       (when (null? val-stxs)
-				 (raise-syntax-error 
-				  'declaration
-				  "missing expression initializing assignment"
-				  (stx-car #'rest)))
-			       (let ([def #`(define-typed id 
-					      #,(constant-definition-context? ctx)
-					      #f type-name type-name-expr pred-id protect-id
-					      (check-expr-type #f 'id type-name type-name-expr pred-id
-                                                               (let ([id (honu-unparsed-expr #,@val-stxs)])
-                                                                 id)))])
-				 (if (delim-identifier=? #'\; (stx-car after-expr))
-				     (values #`(begin #,def) (stx-cdr after-expr))
-				     (let-values ([(defs remainder kind) (loop (stx-cdr after-expr) (stx-car after-expr) "comma" #f)])
-				       (values #`(begin #,def #,defs) remainder))))))
-			 ;; -- Procedure declaration
-			 (if (value-definition-context? ctx)
-			     (raise-syntax-error 
-			      'declaration
-			      (format "expected = after name in ~a context" (context->name ctx))
-			      (stx-car #'rest))
-			     (syntax-case* #'rest (#%parens \;) delim-identifier=?
-			       [((#%parens . prest) (#%braces . body) . rest)
-				(let ([args (parse-arguments #'prest #'id)])
-				  (with-syntax ([((arg arg-type arg-type-name arg-pred-id arg-protect-id) ...) args]
-						[(temp-id ...) (generate-temporaries (map car args))]
-                                                [def-id (if (and (not (definition-context? ctx))
-                                                                 (free-identifier=? #'id #'function))
-                                                            (or (syntax-local-infer-name #'id)
-                                                                (car (generate-temporaries '(function))))
-                                                            #'id)])
-                                    (if (prototype-context? ctx)
-                                        ;; Just generate the prototype (as needed for polymorphic functions,
-                                        ;;  for example)
-                                        #`(honu-prototype (type-name protect-id)
-                                                          (arg-type arg-pred-id arg-type-name) ...)
-                                        ;; Generate a function declaration
-                                        (let ([decl
-                                               #`(begin
-                                                   (define-typed-procedure def-id
-                                                     (type-name type-name-expr protect-id)
-                                                     ((arg arg-type arg-type-name arg-pred-id) ...)
-                                                     (lambda (temp-id ...)
-                                                       (define-typed arg #f id arg-type arg-type-name arg-pred-id arg-protect-id temp-id) ...
-                                                       (honu-unparsed-block def-id type-name type-name-expr pred-id #t . body))))])
-                                          (if (and (not (definition-context? ctx))
-                                                   (free-identifier=? #'id #'function))
-                                              ;; Anonymous function:
-                                              ;;  We may have to continue parsing...
-                                              (finish-parsing-expression "anonymous function"
-                                                                         #'id
-                                                                         #`(let () #,decl def-id) #'rest ctx)
-                                              ;; Function definition:
-                                              (values decl #'rest))))))]
-			       ;; --- Error handling ---
-			       [((#%parens . prest) . bad-rest)
-				(begin
-				  (parse-arguments #'prest #'id)
-				  (raise-syntax-error 
-				   '|procedure declaration|
-				   "braces for function body after parenthesized arguments"
-				   (stx-car #'rest)
-				   #'id))]
-			       [(id . _)
-				(raise-syntax-error 
-				 '|declaration|
-				 (cond
-				  [(constant-definition-context? ctx) "expected = (for constant initialization)"]
-				  [(variable-definition-context? ctx) "expected = (for variable initialization)"]
-				  [(function-definition-context? ctx) "expected parens (for function arguments)"]
-				  [(or (expression-context? ctx)
-                                       (type-or-expression-context? ctx)
-                                       (expression-block-context? ctx))
-                                   "expected parens (for function arguments)"]
-				  [else
-				   "expected either = (for variable intialization) or parens (for function arguments)"])
-				 #'id)]))))]
-		  [_else
-		   (raise-syntax-error #f 
-				       (format "expected a identifier after ~a" after-what)
-				       after
-				       #'id)])))]
-	   [(or (type-context? ctx) 
-                (type-or-expression-context? ctx))
-	    (values (make-h-type type-name type-name-expr pred-id protect-id) (stx-cdr orig-stx))]
-	   [else
-	    (raise-syntax-error #f 
-				(format "illegal in ~a context" (context->name ctx))
-				(stx-car orig-stx))])))))
-
-   (define (make-proc-predicate form)
-     ;; `Form' starts with a operator-transformer sequence
-     (let-values ([(args-stx ->-stx result-stx) 
-		   (let loop ([stx (stx-cdr (stx-car form))][args null])
-		     (if (and (identifier? (stx-car stx))
-			      (free-identifier=? #'-> (stx-car stx)))
-			 (values (reverse args) (stx-car stx) (stx-cdr stx))
-			 (loop (stx-cdr stx) (cons (stx-car stx) args))))])
-       (when (stx-null? result-stx)
-	 (raise-syntax-error
-	  #f
-	  "missing type for result"
-	  ->-stx))
-       (let ([arg-types
-	      (let loop ([args-stx args-stx])
-		(if (stx-null? args-stx)
-		    null
-		    (let ([trans (get-transformer args-stx)])
-		      (unless trans
-			(raise-syntax-error #f
-                                            "non-type within a procedure-type construction"
-                                            ->-stx
-                                            (stx-car args-stx)))
-		      (let-values ([(type rest-stx) (trans args-stx the-type-context)])
-			(cons type (loop rest-stx))))))]
-	     [result-type 
-	      (let ([trans (get-transformer result-stx)])
-		(unless trans
-		  (raise-syntax-error #f
-                                      "non-type in result position for procedure-type construction"
-                                      ->-stx
-                                      (stx-car result-stx)))
-		(let-values ([(type rest-stx) (trans result-stx the-type-context)])
-		  (unless (stx-null? rest-stx)
-		    (raise-syntax-error #f
-                                        "extra tokens following result for procedure-type construction"
-                                        ->-stx
-                                        (stx-car rest-stx)))
-		  type))])
-	 (with-syntax ([(arg ...) (generate-temporaries arg-types)]
-		       [(arg-type ...) (map honu-type-stx arg-types)]
-		       [(arg-type-name ...) (map honu-type-name-stx arg-types)]
-		       [(arg-pred-id ...) (map honu-type-pred-stx arg-types)]
-		       [(arg-protect-id ...) (map honu-type-protect-stx arg-types)]
-		       [result-type (honu-type-stx result-type)]
-		       [result-type-name (honu-type-name-stx result-type)]
-		       [result-pred-id (honu-type-pred-stx result-type)]
-		       [result-protect-id (honu-type-protect-stx result-type)]
-		       [n (length arg-types)])
-           (values
-            #'(-> (result-type result-protect-id)
-                  (arg-type arg-type-name arg-pred-id) ...)
-            #'`(,arg-type-name ... -> ,result-type-name)
-            #`(lambda (v)
-                (if (and (procedure? v)
-                         (procedure-arity-includes? v n))
-                    (values #t (lambda (arg ...)
-                                 (check-expr-type
-                                  #f #t result-type result-type-name result-pred-id
-                                  (v (honu-typed arg #f arg-type arg-protect-id) ...))))
-                    (values #f #f)))
-            #`(lambda (v)
-                (lambda (arg ...)
-                  (honu-typed (v (check-expr-type #f #f arg-type arg-type-name arg-pred-id arg)
-                                 ...)
-                              #f
-                              result-type
-                              result-protect-id))))))))
-  
-   (define (make-poly-predicate form)
-     ;; `Form' starts with an operator-transformer sequence
-     (let-values ([(args-stx >->-stx result-stx) 
-		   (let loop ([stx (stx-cdr (stx-car form))][args null])
-		     (if (and (identifier? (stx-car stx))
-			      (free-identifier=? #'>-> (stx-car stx)))
-			 (values (reverse args) (stx-car stx) (stx-cdr stx))
-			 (loop (stx-cdr stx) (cons (stx-car stx) args))))])
-       (when (stx-null? result-stx)
-	 (raise-syntax-error
-	  #f
-	  "missing right-hand-side type template"
-	  >->-stx))
-       (for-each (lambda (arg)
-                   (unless (identifier? arg)
-                     (raise-syntax-error
-                      #f
-                      "expected an identifier for a generic-type formal argument"
-                      >->-stx
-                      arg)))
-                 args-stx)
-       (with-syntax ([(arg-id ...) args-stx]
-                     [(arg-pred-id ...) (generate-temporaries args-stx)]
-                     [(arg-name-id ...) (generate-temporaries args-stx)]
-                     [n (add1 (* 2 (length args-stx)))])
-         ;; To get the right type name, we have to parse result-stx:
-         (let-values ([(type-name result-type-name)
-                       (let ([ex (local-expand #`(let ()
-                                                   (define-syntax arg-id (make-honu-type #'values stx-car #f #f)) ...
-                                                   (honu-type-name arg-id ...)
-                                                   (honu-unparsed-type-name #'>->-stx . #,result-stx))
-                                               'expression
-                                               type-name-expand-stop-forms)])
-                         (syntax-case ex (honu-type-name)
-                           [(let () (l-s+v b1 b2 
-                                           (honu-type-name bound-arg-id ...)
-                                           (honu-type-name result-type result-type-name)))
-                            (values #`(forall (bound-arg-id ...) result-type (arg-pred-id ... arg-name-id ...))
-                                    #'result-type-name)]))])
-           (values type-name
-                   #``(arg-id ... >-> ,#,result-type-name)
-                   #`(lambda (v)
-                       (if (and (generic? v)
-                                (procedure-arity-includes? (generic-val v) n))
-                           ;; So far, so good. Check the rest lazily.
-                           (values #t (make-generic
-                                       (lambda (safe? arg-pred-id ... arg-name-id ...)
-                                         (define-syntax arg-id (make-honu-type #'arg-pred-id stx-car #'arg-name-id #f)) ...
-                                         (honu-unparsed-type-predicate #,>->-stx next-pred res-type-name . #,result-stx)
-                                         (let ([v ((generic-val v) safe? arg-pred-id ... arg-name-id ...)])
-                                           (check* #f #f res-type-name next-pred v)))))
-                           ;; Not a generic
-                           (values #f #f)))
-                   ;; generics always protect themselves, for now:
-                   #'(lambda (x) x))))))
-
-   (define (poly-subs t orig-ids binding-ids new-types new-preds new-protects new-type-names)
-     (syntax-case t (-> poly)
-       [id
-        (identifier? t)
-        (or (and (identifier? t)
-                 (ormap (lambda (orig new)
-                          (and (free-identifier=? t orig)
-                               new))
-                        orig-ids new-types))
-            t)]
-       [(-> (res res-protect) (arg arg-pred arg-type-name) ...)
-        (let ([cvt (lambda (p) (poly-subs p orig-ids binding-ids new-types new-preds new-protects new-type-names))]
-              [wrap (lambda (expr) (and binding-ids
-                                        (and (syntax-e expr)
-                                             #`((lambda #,binding-ids #,expr)
-                                                #,@new-preds
-                                                #,@new-type-names))))])
-          (with-syntax ([res (cvt #'res)]
-                        [res-protect (wrap #'res-protect)]
-                        [(arg ...) (map cvt (syntax->list #'(arg ...)))]
-                        [(arg-pred ...) (map wrap (syntax->list #'(arg-pred ...)))]
-                        [(arg-type-name ...) (map wrap (syntax->list #'(arg-type-name ...)))])
-            #'(-> (res res-protect) (arg arg-pred arg-type-name) ...)))]
-       [else t]))
-
-   (define (apparent-type val-expr)
-     (syntax-case val-expr (#%datum)
-       [(#%datum . val-expr) (apparent-type #'val-expr)]
-       [_else
-        (cond
-         [(and (integer? (syntax-e val-expr))
-               (exact? (syntax-e val-expr))) #'int]
-         [(real? (syntax-e val-expr)) #'real]
-         [(number? (syntax-e val-expr)) #'num]
-         [(string? (syntax-e val-expr)) #'string]
-         [(boolean? (syntax-e val-expr)) #'bool]
-         [(identifier? val-expr)
-          (cond
-           [(free-identifier=? #'false val-expr) #'bool]
-           [(free-identifier=? #'true val-expr) #'bool]
-           [else #'obj])]
-         [else #'obj])]))
-       
-   (define (check-compatible-type val-expr orig-val-expr val-type target-type fail-k)
-     ;; Check whether target-type subsumes val-type, and returns #t if so.
-     ;; If val-type subsumes target-type, the result is #f.
-     ;; If the two types are incompatible, `fail-k' is called.
-     (syntax-case target-type (-> forall)
-       [ttid
-        (identifier? target-type)
-        (or (free-identifier=? #'obj target-type)
-            (and (identifier? val-type)
-                 (free-identifier=? val-type target-type))
-            (let ([val-type
-                   (if (not val-type)
-                       (apparent-type val-expr)
-                       val-type)])
-              (or (and (identifier? val-type)
-                       (or (free-identifier=? val-type target-type)
-                           (and (free-identifier=? #'num target-type)
-                                (or (free-identifier=? val-type #'int)
-                                    (free-identifier=? val-type #'real)))
-                           (and (free-identifier=? #'real target-type)
-                                (or (free-identifier=? val-type #'int)))))
-                  (if (and (identifier? val-type)
-                           (free-identifier=? val-type #'obj))
-                      #f
-                      (fail-k orig-val-expr val-type target-type)))))]
-       [(-> (t-result-type t-result-protect-id) (t-arg-type t-arg-type-name t-arg-pred) ...)
-        (let* ([val-type (or val-type (apparent-type val-expr))]
-               [do-fail (lambda ()
-                          (fail-k orig-val-expr val-type target-type))])
-          (syntax-case val-type (->)
-            [(-> (v-result-type v-result-protect-id) (v-arg-type v-arg-type-name v-arg-pred) ...)
-             (let ([t-args (syntax->list #'(t-arg-type ...))]
-                   [v-args (syntax->list #'(v-arg-type ...))])
-               (and (or (= (length t-args) (length v-args))
-                        (do-fail))
-                    (check-compatible-type val-expr orig-val-expr
-                                           #'v-result-type #'t-result-type
-                                           (lambda (a b c) (do-fail)))
-                    (andmap (lambda (t-arg v-arg)
-                              (check-compatible-type val-expr orig-val-expr
-                                                     t-arg v-arg
-                                                     (lambda (a b c)
-                                                       (do-fail))))
-                            t-args v-args)))]
-            [_else
-             (if (free-identifier=? val-type #'obj)
-                 #f
-                 (do-fail))]))]
-       [(forall (poly-id ...) poly-t bindings)
-        (let ([val-type (or val-type (apparent-type val-expr))]
-              [do-fail (lambda ()
-                         (fail-k orig-val-expr val-type target-type))])
-          (syntax-case val-type (forall)
-            [(forall (v-poly-id ...) v-poly-t v-bindings)
-             (let ([poly-ids (syntax->list #'(poly-id ...))]
-                   [v-poly-ids (syntax->list #'(v-poly-id ...))])
-               (if (= (length poly-ids) (length v-poly-ids))
-                   (let ([new-ids (generate-temporaries poly-ids)])
-                     (check-compatible-type
-                      val-expr orig-val-expr
-                      (poly-subs #'poly-t poly-ids #f new-ids new-ids new-ids #f)
-                      (poly-subs #'v-poly-t v-poly-ids #f new-ids new-ids new-ids #f)
-                      (lambda (a b c) (do-fail))))
-                   (do-fail)))]
-            [else
-             (if (and (identifier? val-type)
-                      (free-identifier=? val-type #'obj))
-                 #f
-                 (do-fail))]))]
-       [_else
-        (syntax-case val-type (-> forall)
-          [(-> . rest)
-           (fail-k orig-val-expr val-type target-type)]
-          [(forall . rest)
-           (fail-k orig-val-expr val-type target-type)]
-          [else #f])]))
-
-   (define (type-mismatch val-expr val-type target-type)
-     (raise-syntax-error
-      '|static type mismatch|
-      (format "type `~s' does not match type `~s'"
-	      (format-type val-type)
-	      (format-type target-type))
-      val-expr))
-
-   (define parse-comma-separated
-     (lambda (body terminated? empty-case parse-one combine)
-       (syntax-case* body (\;) delim-identifier=?
-         [(\;) terminated? (empty-case)]
-         [_else
-          (let loop ([body body][accum null][prev-comma #f])
-            (syntax-case* body (\, \;) delim-identifier=?
-              [()
-               (not terminated?)
-               (values (reverse accum) body)]
-              [(\, . rest)
-               (let-values ([(one) (parse-one (reverse accum) prev-comma (stx-car body))]
-                            [(other rest) (loop #'rest null (stx-car body))])
-                 (values (combine one other) rest))]
-              [(\; . rest)
-               terminated?
-               (values (parse-one (reverse accum) prev-comma (stx-car body)) #'rest)]
-              [(x . rest)
-               (loop #'rest (cons #'x accum) #f)]))]))))
-
-  ;; ----------------------------------------
-  ;; end begin-for-syntax
-
-  (define (check proc who type-name pred val)
-    (let-values ([(tst new-val) (pred val)])
-      (unless tst
-        (raise
-         (make-exn:fail:contract
-          (format "~a: expected `~a' value for ~a, got something else: ~e"
-                  (or proc (if (eq? who #t) #f who) "procedure")
-                  type-name
-                  (cond [(eq? who #t) "result"]
-                        [else (if proc
-                                  (format "`~a' argument" who)
-                                  (if who "initialization" "argument"))])
-                  val)
-          (current-continuation-marks))))
-      new-val))
-
-  (define-syntax as-protected
-    (syntax-rules ()
-      [(_ expr) 
-       ;; No need for `expr' to protect itself:
-       (check-expr-type #f #f #t #t #t expr)]))
-
-  (define-syntax as-test
-    (syntax-rules ()
-      [(_ expr) (as-protected expr)]))
-
-  (define-for-syntax (extract-type v)
-    ;; Lifts type checks up so that we can see them immediately:
-    (syntax-case v (#%expression if begin quote-syntax honu-type-info)
-      [(begin (quote-syntax (honu-type-info orig-expr val-type protect-id)) val)
-       (list #'orig-expr #'val-type #'protect-id)]
-      [(if t orig-then-expr orig-else-expr)
-       (with-syntax ([(orig-then-expr then-type then-protect-id) (extract-type #'orig-then-expr)]
-                     [(orig-else-expr else-type else-protect-id) (extract-type #'orig-else-expr)])
-         (cond
-          [(check-compatible-type #f v #'else-type #'then-type type-mismatch)
-           (list v #'then-type #'then-protect-id)]
-          [(check-compatible-type #f v #'then-type #'else-type type-mismatch)
-           (list v #'else-type #'else-protect-id)]
-          [else
-           (raise-syntax-error #f
-                               "need a least-upper bound?!"
-                               v)]))]
-      [(lv ([(lhs ...) expr] ...) ... body)
-       (ormap (lambda (id)
-                (free-identifier=? #'lv id))
-              (list #'let-values #'letrec-values #'letrec-syntaxes+values))
-       (extract-type #'body)]
-      [(begin e ... last-expr)
-       (extract-type #'last-expr)]
-      [(%expression expr)
-       (extract-type #'expr)]
-      [_else
-       (list v (apparent-type v) #f)]))
-
-  (define-for-syntax (expand-for-type stx)
-    (let-values ([(v pack-v) (syntax-local-expand-expression 
-                              #`(as-protected #,stx))])
-      (list* pack-v v (extract-type v))))
-
-  ;; (define-for-syntax certify (syntax-local-certifier))
-
-  (define-syntax (check-expr-type stx)
-    ;; Pushes type checks down to be treated by later expansion:
-    (syntax-case stx ()
-      [(_ proc who type-name type-name-expr pred val)
-       ;; Avoid the check if the static types are consistent
-       (let ([v (local-expand
-                  #'val
-                  'expression
-                  prop-expand-stop-forms)])
-         ;; FIXME: this is where we run afoul of certificates, because we're
-         ;; pulling apart something produced by `local-expand'.
-	 (syntax-case v (honu-typed if 
-                                    let-values letrec-values letrec-syntaxes+values 
-                                    begin #%expression
-                                    honu-unparsed-block)
-	   [(honu-typed val orig-expr val-type protect-id)
-            (if (eq? #t (syntax-e #'type-name))
-                ;; Context guarantees correct use, as long as we report our type:
-                #'(honu-report-type val orig-expr val-type protect-id)
-                ;; Context guarantees use at a particular type...
-                (if (check-compatible-type #'val #'orig-expr #'val-type #'type-name type-mismatch)
-                    ;; Declared type subsumes actual type:
-                    (if (and (syntax-e #'protect-id)
-                             (not (check-compatible-type #f #f #'type-name #'val-type (lambda (a b c) #f))))
-                        ;; Type subsumes, but still need to protect:
-                        v
-                        (if (syntax-e #'protect-id)
-                            ;; Don't need protect:
-                            #'(honu-typed val orig-expr val-type #f)
-                            ;; Didn't declare protect anyway:
-                            v))
-                    ;; Need a run-time check:
-                    (with-syntax ([val v])
-                      #'(check* proc who type-name-expr pred val))))]
-	   [(if test-expr then-expr else-expr)
-            (if (eq? #t (syntax-e #'type-name))
-                ;; Context guarantees correct use, but we have to manage any
-                ;; merge for subsumption.
-                (with-syntax ([(pack-t-expr t-expr orig-t-expr t-type t-protect-id)
-                               (expand-for-type #'then-expr)]
-                              [(pack-e-expr e-expr orig-e-expr e-type e-protect-id)
-                               (expand-for-type #'else-expr)])
-                  (if (check-compatible-type #'e-expr #'else-expr #'e-type #'t-type type-mismatch)
-                      (if (check-compatible-type #'t-expr #'then-expr #'t-type #'e-type type-mismatch)
-                          ;; branch types are equivalent
-                          #'(honu-typed (if test-expr pack-t-expr pack-e-expr)
-                                        val t-type t-protect-id)
-                          ;; then subsumes else
-                          #'(honu-typed (if test-expr
-                                            pack-t-expr
-                                            (e-protect-id pack-e-expr))
-                                        val t-type t-protect-id))
-                      (if (check-compatible-type #'t-expr #'then-expr #'t-type #'e-type type-mismatch)
-                          ;; else subsumes then
-                          #'(honu-typed (if test-expr
-                                            (t-protect-id pack-t-expr)
-                                            pack-e-expr)
-                                        val e-type e-protect-id)
-                          ;; neither subsumes the other, but they are compatible
-                          ;; --- we're losing information about the LUB
-                          #'(if test-expr
-                                (t-protect-id pack-t-expr)
-                                (e-protect-id pack-e-expr)))))
-                ;; Context guarantees use at a particular type.
-                ;; Simply propagate check to braches:
-                #'(if test-expr
-                      (check-expr-type proc who type-name type-name-expr pred then-expr)
-                      (check-expr-type proc who type-name type-name-expr pred else-expr)))]
-           [(let-values ([(id) rhs]) body-id)
-            ;; recognized when `let' is being used to name an expression
-            (and (identifier? #'body-id)
-                 (bound-identifier=? #'id #'body-id))
-            #'(let-values ([(id) (check-expr-type proc who type-name type-name-expr pred rhs)]) body-id)]
-	   [(let-values bindings body0 ... body)
-	    #'(let-values bindings 
-                  body0 ...
-		  (check-expr-type proc who type-name type-name-expr pred body))]
-	   [(letrec-values bindings body0 ... body)
-	    #'(letrec-values bindings 
-                  body0 ...
-		  (check-expr-type proc who type-name type-name-expr pred body))]
-	   [(letrec-syntaxes+values bindings1 bindings2 body0 ... body)
-	    #'(letrec-syntaxes+values bindings1 bindings2
-                body0...
-                (check-expr-type proc who type-name type-name-expr pred body))]
-           [(begin e0 ... e)
-            #'(begin e0 ... (check-expr-type proc who type-name type-name-expr pred e))]
-	   [(#%expression e)
-            #'(#%expression (check-expr-type proc who type-name type-name-expr pred e))]
-	   [(honu-unparsed-block #f _ __ #f return-context? . body)
-	    #'(honu-unparsed-block who type-name type-name-expr pred return-context? . body)]
-	   [_else
-            (if (eq? #t (syntax-e #'type-name))
-                v
-                ;; Even without a type for v, we might see a literal,
-                ;;  or maybe the declaration is simply val
-                (if (or (check-compatible-type v v #f #'type-name type-mismatch)
-                        (not (syntax-e #'pred)))
-                    ;; No run-time check:
-                    v
-                    ;; Run-time check:
-                    (with-syntax ([val v])
-                      #'(check* proc who type-name-expr pred val))))]))]))
-
-  (define-syntax check*
-    (syntax-rules ()
-      [(_ proc who type-name #f val) val]
-      [(_ proc who type-name pred val)
-       (check proc who type-name pred val)]))
-
-  (define-syntax (honu-app stx)
-    (syntax-case stx ()
-      [(_ a b ...)
-       (with-syntax ([(pack-a-expr a-expr orig-a-expr a-type a-protect-id)
-                      (expand-for-type #'a)]
-                     [orig-expr stx])
-         (syntax-case #'a-type (-> obj)
-           [(-> (result-type result-protect-id) (arg-type arg-type-name arg-pred) ...)
-            (if (= (length (syntax->list #'(arg-type ...)))
-                   (length (syntax->list #'(b ...))))
-                ;; Some run-time checks maybe needed on some arguments:
-                (with-syntax ([app
-                               (syntax/loc stx
-                                 (pack-a-expr (check-expr-type #f #f arg-type arg-type-name arg-pred b) ...))])
-                  (syntax/loc stx
-                    (honu-typed app
-                                orig-expr
-                                result-type result-protect-id)))
-                (raise-syntax-error #f
-                                    (format (string-append 
-                                             "static type mismatch: "
-                                             "function called with the wrong number of arguments; "
-                                             "expected ~a, given ~a")
-                                            (length (syntax->list #'(arg-type ...)))
-                                            (length (syntax->list #'(b ...))))
-                                    #'orig-expr))]
-           [obj
-            ;; There will be a run-time check to make sure that a is the
-            ;;  right kind of function, etc., and it will take care of the
-            ;;  argument checks itself.
-            (syntax/loc stx
-              (#%app (honu-typed pack-a-expr orig-a-expr a-type a-protect-id) b ...))]
-           [_else
-            (type-mismatch #'orig-a-expr #'a-type #'(-> (.... #f) (.... #f #f)))]))]))
-
-  (define-syntax (op-app stx)
-    (syntax-case stx (#%parens #%angles)
-      [(_ #%parens a (b ...))
-       #'(honu-app a b ...)]
-      [(_ #%angles a (b ...))
-       #'(honu-type-app a b ...)]
-      [(_ a b ...) 
-       (datum->syntax #'a
-                      (cons #'a #'(b ...))
-                      #'a)]))
-
-  (define-syntax (op-cast stx)
-    (syntax-case stx (#%parens)
-      [(_ #%parens (type-name type-name-expr pred-id protect-id) b)
-       #'(honu-typed (check-expr-type #f #f type-name type-name-expr pred-id b)
-                     b
-                     type-name
-                     #f)]))
-
-  (define-syntax (honu-#%app stx)
-    (syntax-case stx ()
-      [(_ a b ...) #'(#%expression (honu-app a b ...))]))
-
-  (define-syntax (honu-type-app stx)
-    (syntax-case stx ()
-      [(_ a b ...)
-       (with-syntax ([(pack-a-expr a-expr orig-a-expr a-type a-protect-id)
-                      (expand-for-type #'a)])
-         (let ([types (parse-types stx #'(b ...))])
-           (with-syntax ([ids (generate-temporaries types)])
-             (check-compatible-type #'a-expr #'a #'a-type #'(forall ids obj #f)
-                                    type-mismatch))
-           (with-syntax ([(pred ...) (map honu-type-pred-stx types)]
-                         [(name ...) (map honu-type-name-stx types)]
-                         [cnt (add1 (* 2 (length types)))])
-             (syntax-case #'a-type (forall)
-               [(forall (formal-id ...) t bindings)
-                (with-syntax ([new-type (poly-subs #'t 
-                                                   (syntax->list #'(formal-id ...))
-                                                   (syntax->list #'bindings)
-                                                   (map honu-type-stx types)
-                                                   (map honu-type-pred-stx types)
-                                                   (map honu-type-protect-stx types)
-                                                   (map honu-type-name-stx types))])
-                  #`(honu-typed ((generic-val pack-a-expr) #t pred ... name ...) #,stx new-type #f))]
-               [_else #'((extract-polymorphic pack-a-expr cnt) #f pred ... name ...)]))))]))
-                    
-  (define-syntax (define-typed stx)
-    (syntax-case stx ()
-      [(_ id const? proc-name type-name type-name-expr pred-id protect-id val)
-       (with-syntax ([gen-id (car (generate-temporaries (list #'id)))])
-	 #'(begin
-	     (define gen-id val)
-	     (define-syntax id
-	       (make-set!-transformer
-             (lambda (stx)
-               (syntax-case stx (set!)
-                 [(set! id rhs)
-                  (if const?
-                    (raise-syntax-error #f "cannot assign to constant" #'id)
-                    (syntax/loc stx
-                                (set! gen-id (check-expr-type 'set! id type-name type-name-expr pred-id rhs))))]
-                 [(id arg (... ...))
-                  (syntax/loc stx
-                              (honu-app (honu-typed gen-id id type-name protect-id) arg (... ...)))]
-                 [id
-                   (syntax/loc stx
-                               (honu-typed gen-id id type-name protect-id))]))))))]))
-
-  (define-for-syntax (make-typed-procedure gen-id result-spec arg-spec protect-id)
-    (with-syntax ([((arg arg-type arg-type-name arg-pred-id) ...) arg-spec]
-                  ;; FIXME! protect-id is quote-syntax'd and expanding it here
-                  ;; runs into trouble due to lexical marks
-                  ;; [(result-type result-type-name result-protect-id) result-spec]
-                  [(result-type result-type-name result-protect-id) (list #'#f #'#f #'#f)]
-                  [gen-id gen-id])
-      (with-syntax ([type-name #'(-> (result-type result-protect-id)
-                                     (arg-type arg-type-name arg-pred-id) ...)])
-        (make-set!-transformer
-         (lambda (stx)
-           (syntax-case stx (set! honu-safe-use-hack)
-             [(set! id rhs)
-              (raise-syntax-error #f
-                                  "cannot assign to procedure name"
-                                  stx
-                                  #'id)]
-             [(id honu-safe-use-hack)
-              #'gen-id]
-             [(id actual-arg ...)
-              (let ([actual-args (syntax->list #'(actual-arg ...))]
-                    [formal-args (syntax->list #'(arg ...))])
-                (unless (= (length actual-args)
-                           (length formal-args))
-                  (raise-syntax-error
-                   'id
-                   (format "expects ~a arguments, provided ~a"
-                           (length formal-args)
-                           (length actual-args))
-                   stx))
-                ;; FIXME!
-                #'(#%app gen-id actual-arg ...)
-                #;
-                #'(honu-typed (#%app gen-id actual-arg ...) id result-type result-protect-id)
-                #;
-                #'(honu-typed (#%app gen-id
-                                     (check-expr-type 'id 'arg arg-type arg-type-name arg-pred-id actual-arg) 
-                                     ...)
-                              id
-                              result-type
-                              result-protect-id))]
-             [id
-              #`(honu-typed gen-id id type-name #,protect-id)]))))))
-
-  ;; FIXME: some of these must be exported due to a bad `local-expand':
-  (provide honu-typed check-expr-type honu-app op-app 
-           define-typed-procedure define-typed
-           honu-unparsed-block
-           extract-polymorphic generic-val)
-
-  (define-syntax (define-typed-procedure stx)
-    (syntax-case stx ()
-      [(_ id result-spec arg-spec val)
-       (with-syntax ([gen-id (car (generate-temporaries (list #'id)))]
-                     [((arg arg-type arg-type-name arg-pred-id) ...) #'arg-spec]
-                     [(result-type result-type-name result-protect-id) #'result-spec])
-	 #'(begin
-	     (define gen-id val)
-             (define-syntax id
-               (make-typed-procedure (quote-syntax gen-id) 
-                                     (quote-syntax result-spec) 
-                                     (quote-syntax arg-spec)
-                                     (quote-syntax
-                                      (lambda (orig)
-                                        (let ([id (lambda (arg ...)
-                                                    (honu-typed (orig (check-expr-type 'id 'arg arg-type arg-type-name arg-pred-id arg)
-                                                                      ...)
-                                                                #f
-                                                                result-type
-                                                                result-protect-id))])
-                                          id)))))))]))
-
-  (define-syntax honu-typed
-    (syntax-rules ()
-      [(_ expr orig-expr type #f) 
-       (honu-report-type expr orig-expr type #f)]
-      [(_ expr orig-expr type protect-id) 
-       ;; The `protect-id' must be an expression that can be
-       ;;  lifted out of any enclosing `let' binding.
-       ;; Since nothing stripped the `honu-typed' from `expr',
-       ;;  we need to protect the value by applying `protect-id':
-       (honu-report-type (protect-id expr) orig-expr type #f)]))
-
-  (define-syntax honu-report-type
-    (syntax-rules ()
-      [(_ expr orig-expr type protect-id) 
-       ;; Preserve information in a particular pattern that survives full
-       ;; expansion, but that doesn't create any run-time overhead:
-       (#%expression (begin (quote-syntax (honu-type-info orig-expr type protect-id)) 
-                            expr))]))
-      
-  (define-syntax (honu-type-info stx) (raise-syntax-error #f "shouldn't appear unquoted!" stx))
-
-  ;; (require-for-syntax syntax/context)
-  (define-syntax (honu-block stx)
-    ;; A block can have mixed exprs and defns. Wrap expressions with
-    ;; `(define-values () ... (values))' as needed, and add a (void)
-    ;; at the end if needed. Also, wrap the final expression with
-    ;; a type check as needed.
-    (let ([proc-id (stx-car (stx-cdr stx))]
-	  [result-type-name (stx-car (stx-cdr (stx-cdr stx)))]
-	  [result-type-name-expr (stx-car (stx-cdr (stx-cdr (stx-cdr stx))))]
-	  [result-pred-id (stx-car (stx-cdr (stx-cdr (stx-cdr (stx-cdr stx)))))]
-	  [exprs 
-           (let ([def-ctx (syntax-local-make-definition-context)]
-                 [ctx (generate-expand-context)])
-             (begin0
-              (let loop ([exprs (cddddr (cdr (syntax->list stx)))])
-                (apply 
-                 append
-                 (map (lambda (expr)
-                        (let ([expr (local-expand
-                                     expr
-                                     ctx
-                                     block-expand-stop-forms
-                                     def-ctx)])
-                          (syntax-case expr (begin define-values define-syntaxes)
-                            [(begin . rest)
-                             (loop (syntax->list #'rest))]
-                            [(define-syntaxes (id ...) rhs)
-                             (andmap identifier? (syntax->list #'(id ...)))
-                             (with-syntax ([rhs (local-transformer-expand
-                                                 #'rhs
-                                                 'expression
-                                                 null)])
-                               (syntax-local-bind-syntaxes
-                                (syntax->list #'(id ...))
-                                #'rhs def-ctx)
-                               (list #'(define-syntaxes (id ...) rhs)))]
-                            [(define-values (id ...) rhs)
-                             (andmap identifier? (syntax->list #'(id ...)))
-                             (let ([ids (syntax->list #'(id ...))])
-                               (syntax-local-bind-syntaxes ids #f def-ctx)
-                               (list expr))]
-                            [else
-                             (list expr)])))
-                      exprs)))
-              (internal-definition-context-seal def-ctx)))])
-      #`(let ()
-	  #,@(let loop ([exprs exprs][prev-defns null][prev-exprs null])
-	       (cond
-		[(null? exprs) (append 
-				(reverse prev-defns)
-				(if (pair? prev-exprs) 
-				    (reverse (cons
-					      #`(check-expr-type '#,proc-id #t
-								 #,result-type-name 
-								 #,result-type-name-expr 
-								 #,result-pred-id 
-								 #,(car prev-exprs))
-					      (cdr prev-exprs)))
-				    (begin
-				      (unless (or (not proc-id)
-						  (not (syntax-e proc-id))
-						  (free-identifier=? #'type-name #'obj))
-					(error "no expression for type check; should have been "
-					       "caught earlier"))
-				      (reverse prev-exprs)))
-				(if (null? prev-exprs)
-				    (list #'(void))
-				    null))]
-		[(and (stx-pair? (car exprs))
-                      (identifier? (stx-car (car exprs)))
-		      (or (free-identifier=? #'define-values (stx-car (car exprs)))
-			  (free-identifier=? #'define-syntaxes (stx-car (car exprs)))))
-		 (loop (cdr exprs)
-		       (cons (car exprs)
-			     (append
-			      (map (lambda (expr)
-				     #`(define-values () (begin #,expr (values))))
-				   prev-exprs)
-			      prev-defns))
-		       null)]
-		[else
-		 (loop (cdr exprs) prev-defns (cons (car exprs) prev-exprs))])))))
-
-  (define-syntax (honu-unparsed-block stx)
-    (syntax-case stx (void)
-      [(_ proc-id result-type-name result-type-name-expr result-pred-id return-context? . body) 
-       #`(honu-block proc-id result-type-name result-type-name-expr result-pred-id 
-                     #,@(parse-block 
-                         #'body
-                         (if (syntax-e #'return-context?)
-                             the-return-block-context
-                             the-block-context)))]))
-
-  (define-syntax (honu-unparsed-expr stx)
-    (syntax-case stx ()
-      [(_ v ...) #`(#%expression #,(parse-expr (syntax->list #'(v ...))))]))
-
-  (define-syntax (h-return stx)
-    (syntax-case stx ()
-      [(_ expr) #'(#%expression expr)]))
-
-  (define-syntax (#%parens stx)
-    (raise-syntax-error #f "misplaced parentheses" stx))
-
-  (define-syntax (#%brackets stx)
-    (raise-syntax-error #f "misplaced brackets" stx))
-
-  (define-syntax (#%braces stx)
-    (raise-syntax-error #f "misplaced braces" stx))
-
-  (define-syntax (&& stx)
-    (syntax-case stx ()
-      [(_ a b) #'(and a b)]))
-
-  (define-syntax (!= stx)
-    (syntax-case stx ()
-      [(_ a b) #'(not (equal? a b))]))
-
-  (define-syntax (\|\| stx)
-    (syntax-case stx ()
-      [(_ a b) #'(or a b)]))
-
-  ;; --------------------------------------------------------
-  ;; Defining a new transformer or new type
-
-  ;; (require-for-syntax syntax/define)
-  (define-syntax (define-honu-syntax stx)
-    (let-values ([(id rhs) (normalize-definition stx #'lambda #f)])
-      (with-syntax ([id id]
-		    [rhs rhs])
-	#'(define-syntax id (make-honu-transformer rhs)))))
-
-  (define-syntax (define-type stx)
-    (syntax-case stx ()
-      [(_ id pred-expr)
-       (identifier? #'id)
-       (with-syntax ([pred-id (car (generate-temporaries '(pred)))])
-	 #'(begin
-	     (define pred-id (let ([pred pred-expr])
-				(lambda (v)
-				  (values (pred v) v))))
-	     (define-syntax id (make-honu-type ((syntax-local-certifier #t) #'pred-id) stx-car #f #f))))]))
-
-  (define-syntax (define-type-constructor stx)
-    (syntax-case stx ()
-      [(_ id generator-expr)
-       (identifier? #'id)
-       #'(define-syntax id (make-honu-type #f #f #f generator-expr))]))
-
-  ;; ----------------------------------------
-  ;;  Definition forms
-
-  (define-for-syntax (make-definition-form what this-context this-context?)
-    (make-honu-transformer
-     (lambda (orig-stx ctx)
-       (when (this-context? ctx)
-	 (raise-syntax-error #f 
-			     (format "redundant in ~a context" (context->name ctx))
-			     (stx-car orig-stx)))
-       (unless (block-context? ctx)
-	 (raise-syntax-error #f 
-			     (format "illegal in ~a context" (context->name ctx))
-			     (stx-car orig-stx)))
-       (let ([body (stx-cdr orig-stx)])
-	 (cond
-	  [(stx-null? body)
-	   (raise-syntax-error #f 
-			       (format "expected a ~a definition after keyword" what)
-			       (stx-car orig-stx))]
-	  [(get-transformer body)
-	   => (lambda (transformer)
-		(transformer body this-context))]
-	  [else
-	   (let ([id (stx-car body)])
-	     (unless (honu-identifier? id)
-	       (raise-syntax-error #f
-				   (format "expected an identifier or type for a ~a definition" what)
-				   (stx-car orig-stx)
-				   id))
-	     ((make-honu-type #f (lambda (stx) #'obj) #f #f) orig-stx this-context))])))))
-
-  (define-syntax var (make-definition-form 'variable the-variable-definition-context variable-definition-context?))
-  (define-syntax const (make-definition-form 'variable the-constant-definition-context constant-definition-context?))
-
-  (define-syntax function
-    (make-honu-type #f (lambda (stx) #'obj) #f #f))
-
-  (define-type-constructor -> make-proc-predicate)
-  (define-type-constructor >-> make-poly-predicate)
-
-  (define-for-syntax (honu-expand-type orig-stx type-stx)
-    (let-values ([(type rest-stx) 
-                  (let ([trans (get-transformer type-stx)])
-                    (if trans
-                        (trans type-stx the-type-context)
-                        (values #f #f)))])
-      (unless (honu-type? type)
-        (raise-syntax-error
-         #f
-         "expected a type after arrow, found something else"
-         orig-stx
-         (stx-car type-stx)))
-      (unless (stx-null? rest-stx)
-        (raise-syntax-error
-         #f
-         "expected to end with result type, but found more"
-         orig-stx
-         (stx-car rest-stx)))
-      type))
-
-  
-  (define-syntax (honu-unparsed-type-predicate stx)
-    (syntax-case stx ()
-      [(_ orig-stx next-pred res-type-name . type-stx)
-       (let ([type (honu-expand-type #'orig-stx #'type-stx)])
-         #`(begin
-             (define (next-pred v) (#,(honu-type-pred-stx type) v))
-             (define res-type-name #,(honu-type-name-stx type))))]))
-
-  (define-syntax (honu-unparsed-type-name stx)
-    (syntax-case stx ()
-      [(_ orig-stx . type-stx)
-       (let ([type (honu-expand-type #'orig-stx #'type-stx)])
-         #`(honu-type-name #,(honu-type-stx type) #,(honu-type-name-stx type)))]))
-  
-  ;; ----------------------------------------
-
-  (define-syntax (honu-unparsed-function-definition stx)
-    (let-values ([(parsed rest)
-                  ((make-definition-form '|generic function| the-function-definition-context (lambda (x) #f))
-                   stx
-                   the-block-context)])
-      (unless (stx-null? rest)
-        (raise-syntax-error #f "error: function definition didn't consume body" rest))
-      parsed))
-
-  (define-syntax (honu-unparsed-prototype stx)
-    ((make-definition-form '|generic function| the-prototype-context (lambda (x) #f))
-     stx
-     the-block-context))
-
-  ;; By defining #%angles as a Honu transfomer, we override any potential
-  ;;  treatment as a prefix operator.
-  (define-honu-syntax #%angles
-    (lambda (stx ctx)
-      (unless (or (type-or-expression-context? ctx)
-                  (expression-context? ctx)
-                  (block-context? ctx))
-        (raise-syntax-error #f 
-                            (format
-                             "generic allowed only in a block or expression context, not in ~a context" 
-                             (context->name ctx))
-                            stx))
-      (syntax-case (stx-car stx) (#%angles)
-        [(#%angles . rest)
-         (let-values ([(ids empty-rest)
-                       ;; Parse inside angle brackets:
-                       (parse-comma-separated
-                        #'rest
-                        #f
-                        (lambda ()
-                          (raise-syntax-error #f
-                                              "expected at least one identifier"
-                                              (stx-car stx)))
-                        (lambda (stxes prev-comma-stx term-stx)
-                          (unless (and (= (length stxes) 1)
-                                       (honu-identifier? (car stxes)))
-                            ;; Either prev-comma-stx is not #f or stxes is not null
-                            ;;  (otherwise we'd hit the empty case, covered above)
-                            (cond
-                             [prev-comma-stx
-                              (raise-syntax-error #f
-                                                  "expected a single identifier after comma"
-                                                  (stx-car stx)
-                                                  prev-comma-stx)]
-                             [(raise-syntax-error #f
-                                                  "expected a single identifier before comma or closing bracket"
-                                                  (stx-car stx)
-                                                  (car stxes))]))
-                          (car stxes))
-                        (lambda (id ids)
-                          (cons id ids)))]
-                      [(new-id) (car (generate-temporaries '(poly)))])
-           ;; Everything up to and including curly braces defines the poly function:
-           (let-values ([(id defn rest)
-                         (let loop ([rest (stx-cdr stx)][accum null])
-                           (syntax-case* rest (#%braces \; \,) delim-identifier=?
-                             [((#%braces . body) . new-rest)
-                              (begin
-                                ;; Maybe found the body. Preceeded by params and identifier?
-                                (unless (and (pair? accum)
-                                             (stx-pair? (car accum))
-                                             (identifier? (stx-car (car accum)))
-                                             (delim-identifier=? #'#%parens (stx-car (car accum))))
-                                  (raise-syntax-error #f
-                                                      "expected a function-argument list before generic function body braces"
-                                                      (stx-car stx)
-                                                      (if (null? accum)
-                                                          (stx-car rest)
-                                                          (car accum))))
-                                (unless (and (pair? (cdr accum))
-                                             (honu-identifier? (cadr accum)))
-                                  (raise-syntax-error #f
-                                                      "expected an identifier for a function name before generic function argument list"
-                                                      (stx-car stx)
-                                                      (if (null? (cdr accum))
-                                                          (car accum)
-                                                          (cadr accum))))
-                                (values (cadr accum) (reverse (list* (stx-car rest) 
-                                                                     (car accum)
-                                                                     new-id
-                                                                     (cddr accum))) #'new-rest))]
-                             [()
-                              (raise-syntax-error #f
-                                                  "expected a function body in braces eventually after generic specification"
-                                                  (stx-car stx))]
-                             [(\; . _)
-                              (raise-syntax-error #f
-                                                  "expected a function body in braces (eventually), found a semi-colon"
-                                                  (stx-car stx)
-                                                  (stx-car rest))]
-                             [(\, . _)
-                              (raise-syntax-error #f
-                                                  "expected a function body in braces (eventually), found a comma"
-                                                  (stx-car stx)
-                                                  (stx-car rest))]
-                             [(something . rest)
-                              ;; Assume anything else is ok:
-                              (loop #'rest (cons #'something accum))]))])
-             (unless (block-context? ctx)
-               (unless (free-identifier=? id #'function)
-                 (raise-syntax-error #f 
-                                     (format
-                                      "named generic allowed only in a block context, not in ~a context" 
-                                      (context->name ctx))
-                                     (stx-car stx)
-                                     id)))
-             (with-syntax ([(poly-id ...) ids]
-                           [(poly-pred-id ...) (generate-temporaries ids)]
-                           [(poly-name-id ...) (generate-temporaries ids)]
-                           [def-id (if (free-identifier=? id #'function)
-                                       (or (syntax-local-infer-name id)
-                                           (car (generate-temporaries '(function))))
-                                       id)]
-                           [new-id new-id]
-                           [defn defn])
-               (with-syntax ([((bound-poly-id ...) (return-type return-protect) (arg-type arg-pred arg-type-name) ...)
-                              (let ([ex (local-expand #`(let ([poly-pred-id #f] ... [poly-name-id #f] ...)
-                                                          (define-syntax poly-id (make-honu-type #'poly-pred-id stx-car #'poly-name-id #f)) ...
-                                                          (honu-prototype poly-id ...)
-                                                          (honu-unparsed-prototype . defn))
-                                                      'expression
-                                                      prototype-expand-stop-forms)])
-                                (syntax-case ex (honu-prototype)
-                                  [(let b0 (l-s+v b1 b2 
-                                                  (honu-prototype bound-poly-id ...)
-                                                  (honu-prototype (return-type return-protect) (arg-type arg-pred arg-type-name) ...)))
-                                   #'((bound-poly-id ...) (return-type return-protect) (arg-type arg-pred arg-type-name) ...)]
-                                  [else (raise-syntax-error
-                                         #f
-                                         "expansion problem: didn't get expected prototype information"
-                                         ex)]))])
-                 (with-syntax ([(safe-arg ...) (generate-temporaries #'(arg-type ...))])
-                   (let ([decl
-                           #'(begin
-                               (define-syntax def-id
-                                 (make-set!-transformer
-                                  (lambda (stx)
-                                    (syntax-case stx (set!)
-                                      [(set! def-id rhs)
-                                       (raise-syntax-error #f
-                                                           "cannot assign to generic procedure name"
-                                                           stx
-                                                           #'def-id)]
-                                      [(def-id arg (... ...))
-                                       (raise-syntax-error #f
-                                                           "cannot apply generic procedure without first applying it to types"
-                                                           stx)]
-                                      [def-id
-                                       #'(honu-typed gen-id def-id
-                                                     (forall (bound-poly-id ...)
-                                                             (-> (return-type return-protect) (arg-type arg-pred arg-type-name) ...)
-                                                             (poly-pred-id ... poly-name-id ...))
-                                                     #f)]))))
-                               (define gen-id
-                                 (make-generic
-                                  (lambda (safe? poly-pred-id ... poly-name-id ...)
-                                    (define-syntax poly-id (make-honu-type #'poly-pred-id stx-car #'poly-name-id #f)) ...
-                                    (honu-unparsed-function-definition . defn)
-                                    (if safe?
-                                        (new-id honu-safe-use-hack)
-                                        new-id)))))])
-
-                    (if (free-identifier=? id #'function)
-                        ;; Anonymous function:
-                        ;;  We may have to continue parsing...
-                        (finish-parsing-expression "anonymous generic function"
-                                                   id
-                                                   #`(let () #,decl def-id) rest ctx)
-                        (values decl rest))))))))])))
-
-  (define-syntax (honu-safe-use-hack stx) (raise-syntax-error #f "shouldn't see this" stx))
-  (define-syntax (honu-prototype stx) (raise-syntax-error #f "shouldn't see this" stx))
-  (define-syntax (honu-type-name stx) (raise-syntax-error #f "shouldn't see this" stx))
-
-  (define-struct generic (val))
-  (define (extract-polymorphic v n)
-    (unless (generic? v)
-      (raise-type-error '|type application|
-                        "generic value"
-                        v))
-    (let ([p (generic-val v)])
-      (unless (procedure-arity-includes? p n)
-        (raise-type-error '|type application|
-                          (format "generic value (type arity ~a)" n)
-                          v))
-      p))
-
-  (define-syntax (#%prefix stx) (raise-syntax-error #f "should have been matched by an operator binding" stx))
-  (define-syntax (#%postfix stx) (raise-syntax-error #f "should have been matched by an operator binding" stx))
-
-  ;; ----------------------------------------
-  ;;  Pre-defined types
-
-  (define-type int exact-integer?)
-  (define-type bool boolean?)
-  (define-type real real?)
-  (define-type num number?)
-  (define-type obj (lambda (x) #t))
-  (define-type string string?)
-
-  ;; ----------------------------------------
-  ;;  Pre-defined forms
-
-  (define-honu-syntax honu-provide
-    (lambda (body ctx)
-      (unless (top-block-context? ctx)
-	(raise-syntax-error #f "not allowed outside the top level" (stx-car body)))
-      (parse-comma-separated
-       (stx-cdr body)
-       #t
-       (lambda () #'(begin))
-       (lambda (stxes prev-comma-stx term-stx)
-	 (syntax-case stxes ()
-	   [(id)
-	    (honu-identifier? #'id)
-	    #`(provide id)]
-	   [else
-	    (raise-syntax-error
-	     #f
-	     "unknown provide form"
-	     (stx-car body)
-	     (car stxes))]))
-       (lambda (p decls)
-	 #`(begin #,p #,decls)))))
-
-  (define-honu-syntax honu-require
-    (lambda (body ctx)
-      (define (check-empty rest after-what)
-	(unless (stx-null? rest)
-	  (raise-syntax-error
-	   #f
-	   (format "expect a comma or semicolon after ~a" after-what)
-	   (stx-car body)
-	   (stx-car rest))))
-      (unless (top-block-context? ctx)
-	(raise-syntax-error #f "not allowed outside the top level" (stx-car body)))
-      (parse-comma-separated
-       (stx-cdr body)
-       #t
-       (lambda () #'(begin))
-       (lambda (stxes prev-comma-stx term-stx)
-	 #`(require 
-	    #,(let ()
-		(define (parse-module-name stxes)
-		  (syntax-case* stxes (lib file #%parens) delim-identifier=?
-		    [(fn . rest)
-		     (string? (syntax-e #'fn))
-		     (begin
-		       (check-empty #'rest "path string")
-		       #'fn)]
-		    [(lib (#%parens names ...) . rest)
-		     (let ([names (let loop ([names #'(names ...)])
-				    (syntax-case* names (\,) delim-identifier=?
-				      [() null]
-				      [(name . rest)
-				       (begin
-					 (unless (string? (syntax-e #'name))
-					   (raise-syntax-error
-					    #f
-					    "expected a string for a library path"
-					    (car stxes)
-					    #'name))
-					 (syntax-case* #'rest (\,) delim-identifier=?
-					   [() (list #'name)]
-					   [(\, . rest)
-					    (cons #'name (loop #'rest))]
-					   [else
-					    (raise-syntax-error
-					     #f
-					     "expected a comma"
-					     (stx-car stxes)
-					     (stx-car #'rest))]))]
-				      [(\,)
-				       (raise-syntax-error
-					#f
-					"expected a string before comma"
-					(car stxes)
-					(stx-car names))]
-				      [_else
-				       (raise-syntax-error
-					#f
-					"expected a string for a library path"
-					(car stxes)
-					(stx-car names))]))])
-		       (when (null? names)
-			 (raise-syntax-error
-			  #f
-			  "expected at least one string for the library path"
-			  (cadr stxes)))
-		       (check-empty #'rest "library path")
-		       (syntax-local-introduce #`(lib #,@names)))]
-		    [(lib . rest)
-		     (raise-syntax-error 
-		      #f
-		      "expected a parenthesized sequence of strings after `lib' keyword"
-		      (car stxes)
-		      (stx-car body))]
-		    [(file (#%parens name) . rest)
-		     (string? (syntax-e #'name))
-		     (begin
-		       (check-empty #'rest "file name")
-		       (syntax-local-introduce #`(file name)))]
-		    [(file . rest)
-		     (raise-syntax-error 
-		      #f
-		      "expected a parenthesized string after `file' keyword"
-		      (car stxes)
-		      (stx-car body))]
-		    [(fn)
-		     (honu-identifier? #'fn)
-		     #'fn]
-		    [else
-		     (raise-syntax-error
-		      #f
-		      "unknown require form"
-		      (stx-car body)
-		      (car stxes))]))
-		(define (parse-module-spec stxes)
-		  (syntax-case* stxes (rename #%parens \,) delim-identifier=?
-		    [(rename (#%parens spec0 spec ... \, local-id \, remote-id) . rest)
-		     (begin
-		       (unless (honu-identifier? #'local-id)
-			 (raise-syntax-error
-			  #f
-			  "expected an identifier"
-			  (stx-car stxes)
-			  #'local-id))
-		       (unless (honu-identifier? #'remote-id)
-			 (raise-syntax-error
-			  #f
-			  "expected an identifier"
-			  (stx-car stxes)
-			  #'remote-id))
-		       (begin0
-			#`(rename #,(parse-module-name 
-				     (syntax->list #'(spec0 spec ...))) 
-				  local-id 
-				  remote-id)
-			(check-empty #'rest "rename")))]
-		    [(rename . rest)
-		     (raise-syntax-error 
-		      #f
-		      "expected a parenthesized id, id, and require spec `rename' keyword"
-		      (car stxes)
-		      (stx-car body))]
-		    [_else (parse-module-name stxes)]))
-		(parse-module-spec stxes))))
-       (lambda (p decls)
-	 #`(begin #,p #,decls)))))
-
-  (define-honu-syntax honu-return
-    (lambda (stx ctx)
-      (unless (block-context-return? ctx)
-	(raise-syntax-error #f "allowed only in a tail position" (stx-car stx)))
-      (let-values ([(val-stxs after-expr terminator) (extract-until (stx-cdr stx)
-								    (list #'\;))])
-	(unless val-stxs
-	  (raise-syntax-error 
-	   #f
-	   "missing semicolon"
-	   (stx-car stx)))
-	(when (null? val-stxs)
-	  (raise-syntax-error 
-	   #f
-	   "missing expression"
-	   (stx-car stx)))
-	(with-syntax ([expr (parse-expr val-stxs)])
-	  (unless (or (expression-block-context? ctx)
-                      (stx-null? (stx-cdr after-expr)))
-	    (raise-syntax-error 
-	     #f
-	     "not at a block end"
-	     (stx-car stx)))
-	  (values
-	   (syntax/loc (stx-car stx)
-	     (h-return expr))
-           (stx-cdr after-expr))))))
-
-  (define-honu-syntax honu-if
-    (lambda (stx ctx)
-      (define (get-block-or-statement kw rest)
-	(syntax-case rest (#%braces)
-	  [((#%braces then ...) . rrest)
-           (values
-            #`(honu-unparsed-block #f obj 'obj #f #,(and (block-context-return? ctx)
-                                                    (stx-null? rest))
-                                   . #,(stx-cdr (stx-car rest)))
-            #'rrest)]
-	  [else
-           (parse-block-one (if (block-context-return? ctx)
-                                the-expression-return-block-context
-                                the-expression-block-context)
-                            rest
-                            (lambda (expr rest)
-                              (values expr rest))
-                            (lambda ()
-                              (raise-syntax-error
-                               #f
-                               "expected a braced block or a statement"
-                               kw)))]))
-
-      (unless (block-context? ctx)
-        (raise-syntax-error
-         #f
-         "allowed only in a block context"
-         (stx-car stx)))
-
-      (syntax-case* stx (#%parens) delim-identifier=?
-	[(_ (#%parens test ...) . rest)
-	 (let* ([tests #'(test ...)])
-	   (when (stx-null? tests)
-	     (raise-syntax-error
-	      #f
-	      "missing test expression"
-	      (stx-car stx)
-	      (stx-car (stx-cdr stx))))
-	   (let ([test-expr (parse-expr (syntax->list tests))])
-	     (let-values ([(then-exprs rest) (get-block-or-statement (stx-car stx) #'rest)])
-	       (syntax-case rest (else)
-		 [(else . rest2)
-		  (let-values ([(else-exprs rest) (get-block-or-statement (stx-car rest) #'rest2)])
-		    (expression-result ctx
-                                       #`(if (as-test #,test-expr) #,then-exprs #,else-exprs)
-                                       rest))]
-		 [_else
-		  (expression-result ctx #`(if (as-test #,test-expr) #,then-exprs (void)) rest)]))))]
-	[_else
-	 (raise-syntax-error
-	  #f
-	  "expected a parenthesized test after `if' keyword"
-	  (stx-car stx))])))
-  
-  (define-honu-syntax honu-time
-    (lambda (stx ctx)
-      (unless (block-context? ctx)
-        (raise-syntax-error
-         #f
-         "allowed only in a block context"
-         (stx-car stx)))
-      (let-values ([(val-stxs rest terminator) (extract-until (stx-cdr stx) (list #'\;) #f)])
-        (unless val-stxs
-          (raise-syntax-error
-           #f
-           "expected a terminating semicolon"
-           (stx-car stx)))
-        (when (null? val-stxs)
-          (raise-syntax-error
-           #f
-           "expected an expression before semicolon"
-           (stx-car stx)
-           (stx-car rest)))
-        (let ([time-expr (parse-expr val-stxs)])
-          (expression-result ctx
-                             #`(time (#%expression #,time-expr))
-                             (stx-cdr rest))))))
-      
-  ;; ----------------------------------------
-  ;;  Class form
-
-  (define-honu-syntax honu-class
-    (lambda (stx ctx)
-      (syntax-case stx (#%braces)
-	[(form id . rest)
-	 (not (honu-identifier? #'id))
-	 (raise-syntax-error
-	  #f
-	  "expected an identifier for the class"
-	  #'form
-	  #'id)]
-	[(form id (#%braces content ...) . rest)
-	 (let ([id #'id])
-	   
-
-	   10)]
-	[(form)
-	 (raise-syntax-error
-	  #f
-	  "missing name for the class"
-	  #'form)]
-	[(form id next . _)
-	 (raise-syntax-error
-	  #f
-	  "expected braces after class name, found something else"
-	  #'form
-	  #'next)]
-	[(form id)
-	 (raise-syntax-error
-	  #f
-	  "missing braces after class name"
-	  #'form
-	  #'id)])))
-
-  ;; ----------------------------------------
-  ;; Main compiler loop
-
-   (define (show-top-result v)
-     (unless (void? v)
-       (printf "~s\n" v)))
-
-   (define-syntax (honu-unparsed-begin stx)
-    (syntax-case stx ()
-      [(_) #'(begin)]
-      [(_ . body) (let-values ([(code rest) (parse-block-one the-top-block-context
-							     #'body 
-							     values
-							     (lambda ()
-							       (values #'(void) null)))])
-		    #`(begin
-			#,code
-			(honu-unparsed-begin #,@rest)))]))
-
-  (define-syntax (#%dynamic-honu-module-begin stx)
-    ;; (printf "honu raw sexp ~a\n" (syntax->datum stx))
-    (let ([result #`(#%plain-module-begin
-                     (honu-unparsed-begin #,@(stx-cdr stx)))])
-      ;; (pretty-print (syntax->datum (expand result)))
-      result))
-  
-  (define-syntax (\; stx) (raise-syntax-error '\; "out of context" stx))
-  
-  (define true #t)
-  (define false #f)
-
-  (define-syntax define-integer-closed-op
-    (syntax-rules ()
-      [(_ id scheme-id)
-       (define-syntax (id stx)
-         (syntax-case stx (#%prefix)
-           [(_ #%prefix a) (syntax/loc stx (honu-app (honu-typed scheme-id #f (-> (int #f) (int 'int #f)) #f) a))]
-           [(_ a b) (syntax/loc stx (honu-app (honu-typed scheme-id #f (-> (int #f) (int 'int #f) (int 'int #f)) #f) a b))]
-           [_ (syntax/loc stx (honu-typed scheme-id #f (-> (int #f) (int 'int #f) (int 'int #f)) #f))]))]))
-
-  (define-integer-closed-op honu- -)
-  (define-integer-closed-op honu+ +)
-  (define-integer-closed-op honu* *)
-
-  (define-syntax (? stx)
-    (syntax-case stx (op-app :)
-      [(_ t (opp-app : b1 b2))
-       (syntax/loc stx (if t b1 b2))]
-      [(? . _)
-       (raise-syntax-error #f "misuse of operator (not matched with :)" #'?)]))
-
-  (define-syntax (: stx)
-    (raise-syntax-error #f "misuse of operator (not preceded with ?)" stx))
-
-  (define-syntax (honu-end stx)
-    (raise-syntax-error #f "ignore this" stx))
-
-  (define-syntax (honu-top stx)
-    (raise-syntax-error #f "interactive use is not yet supported"))
diff --git a/pkgs/honu/core/private/honu2.rkt b/pkgs/honu/core/private/honu2.rkt
deleted file mode 100644
index ba0edcefff..0000000000
--- a/pkgs/honu/core/private/honu2.rkt
+++ /dev/null
@@ -1,526 +0,0 @@
-#lang racket/base
-
-(require "syntax.rkt"
-         "operator.rkt"
-         "struct.rkt"
-         "honu-typed-scheme.rkt"
-         racket/match
-         racket/class
-         racket/require
-         (only-in "literals.rkt"
-                  honu-then
-                  honu-in
-                  honu-in-lines
-                  honu-prefix
-                  postfix
-                  semicolon
-                  honu-comma
-                  define-literal)
-         (for-syntax syntax/parse
-                     syntax/parse/experimental/reflect
-                     syntax/parse/experimental/splicing
-                     macro-debugger/emit
-                     racket/syntax
-                     racket/pretty
-                     racket/string
-                     "compile.rkt"
-                     "util.rkt"
-                     "debug.rkt"
-                     "literals.rkt"
-                     "parse2.rkt"
-                     racket/base)
-         (for-meta 2 racket/base
-                     syntax/parse
-                     racket/pretty
-                     macro-debugger/emit
-                     "compile.rkt"
-                     "debug.rkt"
-                     "parse2.rkt"))
-
-(provide (all-from-out "struct.rkt"))
-
-(define-syntax (parse-body stx)
-  (syntax-parse stx
-    [(_ stuff ...)
-     (parse-all #'(stuff ...))]))
-
-(provide honu-function)
-(define-honu-syntax honu-function
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ name:identifier (#%parens (~seq arg:identifier (~optional honu-comma)) ...)
-          (#%braces code ...) . rest)
-       (values
-         (racket-syntax (define (name arg ...) (parse-body code ...)))
-         #'rest
-         #f)]
-      [(_ (#%parens (~seq arg:identifier (~optional honu-comma)) ...)
-          (#%braces code ...)
-          . rest)
-       (values
-         (racket-syntax (lambda (arg ...)
-                      (parse-body code ...)))
-         #'rest
-         #f)])))
-
-(provide honu-if)
-(define-honu-syntax honu-if
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-                       #:literals (else honu-then)
-      [(_ (#%parens condition:honu-expression) true:honu-expression
-          (~optional else) false:honu-expression . rest)
-       (values
-         (racket-syntax (if condition.result true.result false.result))
-         #'rest
-         #f)])))
-
-(provide honu-val)
-(define-honu-syntax honu-val
-  (lambda (code)
-    (syntax-parse code
-      [(_ rest ...)
-       (define-values (parsed unparsed)
-                      (parse #'(rest ...)))
-       (values parsed unparsed #t)])))
-
-(provide honu-quote)
-(define-honu-syntax honu-quote
-  (lambda (code)
-    (syntax-parse code
-      [(_ expression rest ...)
-       (values (racket-syntax (quote expression)) #'(rest ...) #f)])))
-
-(provide honu-quasiquote)
-(define-honu-syntax honu-quasiquote
-  (lambda (code)
-    (syntax-parse code
-      [(_ expression rest ...)
-       (values (racket-syntax (quasiquote expression))
-               #'(rest ...)
-               #f)])))
-
-(begin-for-syntax
-
-(define-syntax (parse-expression stx)
-  (syntax-parse stx
-    [(_ (syntax-ignore (stuff ...)))
-     (debug "Parse expression ~a\n" (pretty-format (syntax->datum #'(stuff ...))))
-     (define-values (parsed unparsed)
-                    (parse #'(stuff ...)))
-     (with-syntax ([parsed* parsed]
-                   [unparsed unparsed])
-       (emit-local-step parsed #'parsed* #:id #'honu-parse-expression)
-       (debug "Parsed ~a. Unparsed ~a\n" #'parsed #'unparsed)
-       ;; we need to smuggle our parsed syntaxes through the macro transformer
-       #'(#%datum parsed* unparsed))]))
-
-(define-primitive-splicing-syntax-class (honu-expression/phase+1)
-  #:attributes (result)
-  #:description "expression at phase + 1"
-  (lambda (stx fail)
-    (debug "honu expression phase + 1: ~a\n" (pretty-format (syntax->datum stx)))
-    (define transformed
-      (with-syntax ([stx stx])
-        (local-transformer-expand #'(parse-expression #'stx)
-                                  'expression '())))
-    (debug "Transformed ~a\n" (pretty-format (syntax->datum transformed)))
-    (define-values (parsed unparsed)
-                   (syntax-parse transformed
-                     [(ignore-quote (parsed unparsed)) (values #'parsed
-                                                               #'unparsed)]))
-    (debug "Parsed ~a unparsed ~a\n" parsed unparsed)
-    (list (parsed-things stx unparsed)
-          (with-syntax ([parsed parsed])
-            (racket-syntax parsed)))))
-
-) ;; begin-for-syntax
-
-(provide define-make-honu-operator)
-(define-honu-syntax define-make-honu-operator 
-  (lambda (code)
-    (syntax-parse code
-      [(_ name:id level:number association:honu-expression function:honu-expression/phase+1 . rest)
-       (debug "Operator function ~a\n" (syntax->datum #'function.result))
-       (define out (racket-syntax (define-honu-operator/syntax name level association.result function.result)))
-       (values out #'rest #t)])))
-
-(provide define-make-honu-binary-operator)
-(define-honu-syntax define-make-honu-binary-operator
-  (lambda (code)
-    (syntax-parse code
-      [(_ name:id level:honu-expression association:honu-expression function:honu-expression . rest)
-       (define out (racket-syntax
-                     (define-binary-operator name level.result association.result function.result)))
-       (values out #'rest #t)])))
-
-(provide define-make-honu-unary-operator)
-(define-honu-syntax define-make-honu-unary-operator
-  (lambda (code)
-    (syntax-parse code #:literals (postfix)
-      [(_ name:id level:honu-expression
-          (~optional (~and postfix postfix?)
-                     #:defaults ([postfix? #f]))
-          function:honu-expression . rest)
-       (define out
-         (with-syntax ([postfix? (if (attribute postfix?) #t #f)])
-           (racket-syntax
-             (define-unary-operator name level.result postfix? function.result))))
-       (values out #'rest #t)])))
-
-;; equals can have a compile time property that allows it to do something like set!
-;; v.x could return a syntax object with a property that can be invoked by an equals
-;; thing so that it can be rewritten to do the set! thing
-;; if the property is not used then it will just be a field lookup
-;;   v.x => (syntax-property #'(foo-x v)
-;;                           'setter (lambda (e) (set-foo-x! v e)))
-;; where `e' is the right hand side of the = expression
-
-;; default dot interpretation
-(define-syntax (dot stx)
-  (syntax-parse stx
-    [(_ object field:identifier)
-     (racket-syntax
-       (let ([left* object])
-         (cond
-           [(honu-struct? left*) (let ([use (honu-struct-get left*)])
-                                   (use left* 'field))]
-           [(object? left*) (get-field field left*)]
-           ;; possibly handle other types of data
-           [else (error 'dot "don't know how to deal with ~a (~a)" 'object left*)])))]))
-
-(define-syntax (dot-assign stx)
-  (syntax-parse stx
-    [(_ left field:identifier expression)
-     (racket-syntax
-       (let ([left* left])
-         (cond
-           [(honu-struct? left*)
-            (honu-struct-set! left* 'field expression)]
-           [(object? left*) (error 'assign "implement set for objects")]
-           [else (error 'assign "don't know how to do set for ~a" left*)])))]))
-
-(provide honu-dot)
-(define-honu-operator/syntax honu-dot 10000 'left
-  (lambda (left right)
-    (with-syntax ([left left]
-                  [right (syntax-parse right
-                           [field:identifier #'field])])
-      (syntax-property (racket-syntax (dot left right))
-                       'assign
-                       (lambda (expression)
-                         (with-syntax ([expression expression])
-                           (racket-syntax (dot-assign left right expression))))))))
-#;
-(define-honu-fixture honu-dot
-  (lambda (left rest)
-
-    ;; v.x = 5
-    (define-syntax-class assign #:literal-sets (cruft)
-                                #:literals (honu-equal)
-      [pattern (_ name:identifier honu-equal argument:honu-expression . more)
-               #:with result (with-syntax ([left left])
-                               (racket-syntax 
-                                   (let ([left* left])
-                                     (cond
-                                       [(honu-struct? left*)
-                                        (honu-struct-set! left* 'name argument.result)]
-                                       [(object? left*) (error 'set "implement set for objects")]))))
-               #:with rest #'more])
-
-    ;; v.x
-    (define-syntax-class plain #:literal-sets (cruft)
-                               #:literals (honu-equal)
-      [pattern (_ name:identifier . more)
-       #:with result (with-syntax ([left left])
-                       (racket-syntax 
-                           (let ([left* left])
-                             (cond
-                               [(honu-struct? left*) (let ([use (honu-struct-get left*)])
-                                                       (use left* 'name))]
-                               [(object? left*) (get-field name left*)]
-                               ;; possibly handle other types of data
-                               [else (error 'dot "don't know how to deal with ~a (~a)" 'left left*)]))))
-       #:with rest #'more])
-
-    (syntax-parse rest
-      [stuff:assign (values #'stuff.result #'stuff.rest)]
-      [stuff:plain (values #'stuff.result #'stuff.rest)])))
-#;
-(define-honu-operator/syntax honu-dot 10000 'left
-  (lambda (left right)
-    (debug "dot left ~a right ~a\n" left right)
-    (with-syntax ([left left]
-                  [right right])
-      (racket-syntax 
-          (let ([left* left])
-            (cond
-              [(honu-struct? left*) (let ([use (honu-struct-get left*)])
-                                      (use left* 'right))]
-              [(object? left*) (get-field right left*)]
-              ;; possibly handle other types of data
-              [else (error 'dot "don't know how to deal with ~a (~a)" 'left left*)]))))))
-
-(provide honu-for-syntax)
-(define-literal honu-for-syntax) 
-
-(begin-for-syntax
-  (define (fix-module-name name)
-    (format-id name "~a" (regexp-replace* #rx"_" (symbol->string (syntax->datum name)) "-")))
-  (define (combine-paths paths name)
-    (define all (for/list ([path (if paths
-                                   (append paths (list name))
-                                   (list name))])
-                  (cond
-                    [(identifier? path) (symbol->string (syntax->datum path))]
-                    [(string? path) path]
-                    [else (error 'combine-paths "what is ~a" path)])))
-    (format-id name (string-join all "/")))
-  (define-splicing-syntax-class not-comma
-    [pattern x #:when (not ((literal-set->predicate cruft) #'x))])
-  (define-splicing-syntax-class require-form
-                                #:literals (honu-prefix honu-for-syntax)
-                                #:literal-sets (cruft)
-    [pattern (~seq honu-prefix prefix module:require-form)
-             #:with result #'(prefix-in prefix module.result)]
-    [pattern (~seq honu-for-syntax ~! (#%parens module:require-form))
-             #:with result #'(for-syntax module.result)]
-    [pattern x:str #:with result #'x]
-    [pattern (~seq x:not-comma ...)
-             #:with result (with-syntax ([name
-                                           ;; use the lexical context of the original syntax
-                                           (datum->syntax (car (syntax->list #'(x.x ...)))
-                                           (string->symbol
-                                             (apply string-append
-                                                    (map (compose symbol->string syntax->datum)
-                                                         (syntax->list #'(x.x ...)))))
-                                           #'(x.x ...))
-                                           ])
-                             (fix-module-name #'name))]))
-                                                                    
-(provide honu-require)
-(define-honu-syntax honu-require
-  (lambda (code)
-    (syntax-parse code
-      [(_ form1:require-form (~seq honu-comma form:require-form) ... . rest)
-       (values
-         (racket-syntax (require (filtered-in (lambda (name)
-                                                (regexp-replace* #rx"-"
-                                                                 (regexp-replace* #rx"->" name "_to_")
-                                                                 "_"))
-                                              (combine-in form1.result form.result ...))))
-
-         #'rest
-         #f)])))
-
-(provide honu-provide)
-(define-honu-syntax honu-provide
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ name:honu-identifier ... (~optional semicolon) . rest)
-       (debug "Provide matched names ~a\n" (syntax->datum #'(name.result ...)))
-       (define out (racket-syntax (provide name.result ...)))
-       (debug "Provide properties ~a\n" (syntax-property-symbol-keys out))
-       (debug "Rest ~a\n" #'rest)
-       (values out #'rest #f)])))
-
-(provide honu-with-input-from-file)
-(define-honu-syntax honu-with-input-from-file
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ file:honu-expression something:honu-expression . rest)
-       (define with (racket-syntax (with-input-from-file file.result
-                                                     (lambda () something.result))))
-       (values
-         with
-         #'rest
-         #f)])))
-
-(provide honu-while)
-(define-honu-syntax honu-while
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ condition:honu-expression body:honu-body . rest)
-       (values
-         (racket-syntax (let loop ()
-                          (when condition.result
-                            body.result
-                            (loop))))
-         #'rest
-         #t)])))
-
-(provide honu-with honu-match)
-(define-literal honu-with)
-(define-honu-syntax honu-match
-  (lambda (code)
-    (define-splicing-syntax-class match-clause
-                                  #:literal-sets (cruft)
-                                  #:literals (else)
-      [pattern (~seq else body:honu-body)
-               #:with final #'else
-               #:with code #'body.result]
-      [pattern (~seq (#%parens pattern ...) body:honu-body)
-               #:with final #'(pattern ...)
-               #:with code #'body.result])
-
-    (syntax-parse code #:literal-sets (cruft)
-                       #:literals (honu-with)
-      [(_ thing:honu-expression honu-with clause:match-clause ... . rest)
-       (values
-         (racket-syntax (match thing.result
-                      [clause.final clause.code]
-                      ...))
-         #'rest
-         #t)])))
-
-(provide honu-->)
-(define-honu-fixture honu-->
-  (lambda (left rest)
-    (syntax-parse rest #:literal-sets (cruft)
-      [(_ name:identifier (#%parens argument:honu-expression/comma) . more)
-       (with-syntax ([left left])
-         (values (racket-syntax (send/apply left name (list argument.result ...)))
-                 #'more))])))
-
-(begin-for-syntax
-  (define-splicing-syntax-class (id-must-be what)
-    [pattern (~reflect x (what))])
-  (define-syntax-class (id-except ignore1 ignore2)
-    [pattern (~and x:id (~not (~or (~reflect x1 (ignore1))
-                                   (~reflect x2 (ignore2)))))])
-
-  (provide separate-ids)
-  (define-splicing-syntax-class (separate-ids separator end)
-    [pattern (~seq (~var first (id-except separator end))
-                   (~seq (~var between (id-must-be separator))
-                         (~var next (id-except separator end))) ...)
-             #:with (id ...) #'(first.x next.x ...)]
-    [pattern (~seq) #:with (id ...) '()]))
-
-(begin-for-syntax
-  (provide honu-declaration)
-
-  (define-literal-set declaration-literals (honu-comma honu-equal))
-  (define-splicing-syntax-class var-id
-    [pattern (~var x (id-except (literal-syntax-class honu-comma)
-                                (literal-syntax-class honu-equal)))])
-
-  ;; parses a declaration
-  ;; var x = 9
-  ;; var a, b, c = values(1 + 2, 5, 9)
-  (define-splicing-syntax-class honu-declaration
-                              #:literal-sets (cruft)
-                              #:literals (honu-var)
-     [pattern (~seq honu-var (~var variables (separate-ids (literal-syntax-class honu-comma)
-                                                           (literal-syntax-class honu-equal)))
-                    honu-equal one:honu-expression)
-              #:with (name ...) #'(variables.id ...)
-              #:with expression #'one.result]))
-
-(begin-for-syntax
-  (provide honu-declaration/phase+1)
-
-  ;; parses a declaration
-  ;; var x = 9
-  ;; var a, b, c = values(1 + 2, 5, 9)
-  (define-splicing-syntax-class honu-declaration/phase+1
-                              #:literal-sets (cruft)
-                              #:literals (honu-syntax-var)
-     [pattern (~seq honu-syntax-var (~var variables (separate-ids (literal-syntax-class honu-comma)
-                                                           (literal-syntax-class honu-equal)))
-                    honu-equal one:honu-expression/phase+1)
-              #:with (name ...) #'(variables.id ...)
-              #:with expression #'one.result]))
-
-;; like define
-(provide honu-var)
-(define-honu-syntax honu-var
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(var:honu-declaration . rest)
-       (define result 
-         ;; wrap the expression in a let so that we can insert new `define-syntax'es
-         (racket-syntax (define-values (var.name ...) (let () var.expression))))
-       (values result #'rest #t)])))
-
-;; like define-syntax
-(provide honu-syntax-var)
-(define-honu-syntax honu-syntax-var
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(var:honu-declaration/phase+1 . rest)
-       (define result 
-         ;; wrap the expression in a let so that we can insert new `define-syntax'es
-         (racket-syntax (define-syntaxes (var.name ...) (let () var.expression))))
-       (values result #'rest #t)])))
-
-(provide (rename-out [honu-with-syntax withSyntax]))
-(define-honu-syntax honu-with-syntax
-  (lambda (code)
-    (define-splicing-syntax-class clause
-                                  #:literal-sets (cruft)
-                                  #:literals [(ellipses ...) honu-equal]
-      [pattern (~seq name:id honu-equal data:honu-expression)
-               #:with out #'(name data.result)]
-      [pattern (~seq (#%parens name:id ellipses) honu-equal data:honu-expression)
-               #:with out #'((name (... ...)) data.result)]
-      [pattern (~seq (#%parens (#%parens name:id ellipses) ellipses) honu-equal data:honu-expression)
-               #:with out #'(((name (... ...)) (... ...)) data.result)])
-    (syntax-parse code #:literal-sets (cruft)
-                       #:literals (honu-equal)
-      [(_ (~seq all:clause (~optional honu-comma)) ...
-          (#%braces code ...) . rest)
-       (define out (racket-syntax
-                     (with-syntax (all.out ...)
-                       (parse-body code ...))))
-       (values out #'rest #t)])))
-
-(provide true false)
-(define true #t)
-(define false #f)
-
-(provide honu-for)
-(define-honu-syntax honu-for
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-                       #:literals (honu-in)
-      [(_ (~seq iterator:id honu-in stuff:honu-expression)
-          (~seq honu-comma iterator*:id honu-in stuff*:honu-expression) ...
-          honu-do body:honu-expression . rest)
-       (values (racket-syntax (for ([iterator stuff.result]
-                                    [iterator* stuff*.result] ...)
-                                body.result))
-               #'rest
-               #t)])))
-
-(provide honu-fold)
-(define-honu-syntax honu-fold
-  (lambda (code)
-    (define-splicing-syntax-class sequence-expression
-                                  #:literals (honu-in honu-in-lines)
-       [pattern (~seq iterator:id honu-in stuff:honu-expression)
-                 #:with variable #'iterator
-                 #:with expression #'stuff.result]
-        [pattern (~seq iterator:id honu-in-lines)
-                 #:with variable #'iterator
-                 #:with expression #'(in-lines)])
-    (syntax-parse code #:literal-sets (cruft)
-                       #:literals (honu-equal)
-      [(_ (~seq init:id honu-equal init-expression:honu-expression (~optional honu-comma)) ...
-          (~seq sequence:sequence-expression (~optional honu-comma)) ...
-          honu-do body:honu-expression . rest)
-       (values (racket-syntax (for/fold ([init init-expression.result] ...)
-                                    ([sequence.variable sequence.expression] ...)
-                            body.result))
-               #'rest
-               #t)])))
-
-(provide honu-primitive-macro)
-(define-honu-syntax honu-primitive-macro
-  (lambda (code)
-    (syntax-parse code
-      [(_ name:id transformer:honu-expression/phase+1 . rest)
-       (values
-         (racket-syntax (define-honu-syntax name transformer.result))
-         #'rest
-         #t)])))
diff --git a/pkgs/honu/core/private/issues b/pkgs/honu/core/private/issues
deleted file mode 100644
index 4cd7d11018..0000000000
--- a/pkgs/honu/core/private/issues
+++ /dev/null
@@ -1,3 +0,0 @@
-for x = 1 to 10 do Expression
-
-
diff --git a/pkgs/honu/core/private/language.rkt b/pkgs/honu/core/private/language.rkt
deleted file mode 100644
index ea77b5ef0d..0000000000
--- a/pkgs/honu/core/private/language.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scheme
-
-(require (for-syntax syntax/parse))
-
-(provide (all-defined-out))
-
-(define-syntax (field-access stx)
-  (syntax-parse stx
-    [(_ field object)
-     #'(get-field field object)]))
diff --git a/pkgs/honu/core/private/literals.rkt b/pkgs/honu/core/private/literals.rkt
deleted file mode 100644
index a300df969d..0000000000
--- a/pkgs/honu/core/private/literals.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket/base
-
-(provide (all-defined-out))
-(require syntax/parse
-         (for-syntax racket/base
-                     syntax/parse))
-
-;; macro for defining literal tokens that can be used in macros
-(define-syntax-rule (define-literal name ...)
-  (begin
-   (define-syntax name (lambda (stx)
-                         (raise-syntax-error 'name
-                                             "this is a literal and cannot be used outside a macro" (syntax->datum stx))))
-   ...))
-
-(define-literal honu-return)
-(define-literal semicolon)
-(define-literal honu-|| honu-%
-                honu-%=
-                honu-&= honu-^= honu-\|= honu-<<= honu->>= honu->>>=
-                honu->> honu-<< honu->>> 
-                honu-!=
-                ;; honu-equal
-                honu-<-
-                honu-literal
-                honu-then
-                honu-? honu-: honu-comma honu-. #%braces #%brackets #%parens colon
-                ellipses-comma ellipses-comma* ellipses-repeat
-                honu-in
-                honu-where
-                ;; honu-for-syntax
-                honu-for-template
-                honu-prefix
-                honu-$
-                ;; FIXME: in-lines should probably not be here
-                honu-in-lines
-                postfix)
-
-(define-syntax-rule (define-literal+set set literal ...)
-                    (begin
-                      (define-literal literal ...)
-                      (begin-for-syntax
-                        (define-literal-set set (literal ...)))))
-
-(define-literal-set cruft (#%parens #%brackets #%braces
-                           semicolon colon honu-comma))
diff --git a/pkgs/honu/core/private/macro2.rkt b/pkgs/honu/core/private/macro2.rkt
deleted file mode 100644
index d0dbd6e914..0000000000
--- a/pkgs/honu/core/private/macro2.rkt
+++ /dev/null
@@ -1,505 +0,0 @@
-#lang racket/base
-
-(require (for-syntax "transformer.rkt"
-                     syntax/parse
-                     syntax/stx
-                     racket/set
-                     racket/syntax
-                     macro-debugger/emit
-                     "template.rkt"
-                     "literals.rkt"
-                     "syntax.rkt"
-                     (prefix-in phase1: "parse2.rkt")
-                     "debug.rkt"
-                     (prefix-in phase1: "compile.rkt")
-                     "util.rkt"
-                     racket/base)
-         (for-meta 2 syntax/parse
-                     racket/base
-                     macro-debugger/emit
-                     racket/syntax
-                     racket/set
-                     racket/pretty
-                     "literals.rkt"
-                     "debug.rkt"
-                     (prefix-in phase2: "parse2.rkt")
-                     (prefix-in phase2: "compile.rkt"))
-         (prefix-in phase0: "compile.rkt")
-         racket/splicing
-         "literals.rkt"
-         "syntax.rkt"
-         "debug.rkt"
-
-         (for-meta 0 "template.rkt" syntax/stx)
-
-         (for-meta -1 "literals.rkt" "compile.rkt" "parse2.rkt" "parse-helper.rkt")
-         #;
-         (for-syntax "honu-typed-scheme.rkt")
-         syntax/parse)
-
-(module analysis racket/base
-  (require syntax/parse
-           "literals.rkt"
-           "debug.rkt"
-           "util.rkt"
-           (prefix-in syntax: syntax/parse/private/residual-ct)
-           racket/syntax
-           racket/set
-           racket/match
-           (for-syntax syntax/parse
-                       racket/base
-                       racket/syntax)
-           (for-template racket/base
-                         syntax/parse))
-
-    (provide (all-defined-out))
-    (struct pattern-variable [name original depth class] #:transparent)
-
-    ;; given the name of an object and some fields this macro defines
-    ;; name.field for each of the fields
-    (define-syntax (define-struct-fields stx)
-      (syntax-parse stx
-        [(_ name type (field ...))
-         (with-syntax ([(field* ...)
-                        (for/list ([field (syntax->list #'(field ...))])
-                          (format-id field "~a.~a" (syntax-e #'name) (syntax-e field)))])
-           #'(match-define (struct type (field* ...)) name))]))
-
-    ;; makes a syntax object with the right number of nested ellipses patterns
-    (define (pattern-variable->syntax variable)
-      (debug 2 "Convert pattern variable to syntax ~a location ~a\n" variable (pattern-variable-original variable))
-      (define location (pattern-variable-original variable))
-      (for/fold ([out (pattern-variable-name variable)])
-                ([depth (pattern-variable-depth variable)])
-                (with-syntax ([out out]
-                              [ellipses (syntax/loc location (... ...))])
-                  (syntax/loc location (out ellipses)))))
-
-  (define (convert-pattern original-pattern new-names)
-    (define-splicing-syntax-class pattern-type
-        #:literal-sets (cruft)
-        [pattern (~seq name colon class)
-                 #:with (result ...)
-                 (with-syntax ([new-name (pattern-variable-name (hash-ref new-names (syntax-e #'name)))])
-                   #'((~var new-name class #:attr-name-separator "_")))]
-        [pattern (x:pattern-type ...) #:with (result ...) #'((x.result ... ...))]
-        [pattern x #:with (result ...) #'(x)])
-    (syntax-parse original-pattern
-      [(thing:pattern-type ...)
-       #'(thing.result ... ...)]))
-
-  ;; reverse the syntax so that ellipses appear in front of the s-expr
-  ;; then search for ellipses nodes and s-exprs of the form class:id %colon name:id
-  ;; the output should match the ellipses depth, so for example
-  ;;   ... foo %colon bar
-  ;; output would be
-  ;;   ((bar ...) (foo_result ...)
-  (define (find-pattern-variables original-pattern)
-    (define (reverse-syntax input)
-      (syntax-parse input
-        [(x ...) (datum->syntax input
-                                (reverse (for/list ([x (syntax->list #'(x ...))])
-                                           (reverse-syntax x)))
-                                input input)]
-        [x #'x]))
-    (define (merge set1 set2)
-      (debug 2 "Merge ~a with ~a\n" set1 set2)
-      (set-union set1 set2))
-    (define (wrap-ellipses stuff)
-      (for/set ([variable stuff])
-               (pattern-variable (pattern-variable-name variable)
-                                 (pattern-variable-original variable)
-                                 (add1 (pattern-variable-depth variable))
-                                 (pattern-variable-class variable))))
-    #;
-    (define (wrap-ellipses stuff)
-      (for/set ([name+result stuff])
-               (syntax-case name+result ()
-                 [(name result)
-                  #'((name (... ...))
-                     (result (... ...)))])))
-    (define (find the-pattern)
-      (debug 2 "Find in ~a\n" (syntax->datum the-pattern))
-      (define-splicing-syntax-class maybe
-          #:literal-sets (cruft)
-          #:literals ([ellipses ...])
-          [pattern (~seq class:id colon name:id)
-                   #:attr result
-                   (with-syntax ([name.result (format-id #'name "~a_result" #'name)])
-                     (set (pattern-variable #'name #'class 0 #'class)))]
-          [pattern (~seq ellipses thing:maybe rest ...)
-                   #:attr result
-                   (merge (wrap-ellipses (attribute thing.result))
-                          (find #'(rest ...)))]
-          [pattern (x:maybe ...) #:attr result (apply set-union (attribute x.result))]
-          [pattern x #:attr result (set)])
-      (syntax-parse the-pattern
-        #:literals ([ellipses ...])
-        [(ellipses thing:maybe rest ...)
-         (debug 2 "Ellipses case\n")
-         (merge (wrap-ellipses (attribute thing.result))
-                (find #'(rest ...)))]
-        [(thing:maybe rest ...)
-         (debug 2 "Normal list case ~a\n" (attribute thing.result))
-         (merge (attribute thing.result) (find #'(rest ...)))]
-        [thing (set)]))
-    (define variables (find (reverse-syntax original-pattern)))
-    (debug 2 "Found variables ~a\n" variables)
-    (for/list ([x variables]) x))
-
-  ;; variable is the original pattern variable, like 'foo'
-  ;; and new-name is the new generated name, 'temp1'
-  ;; we want to bind all the attributes from temp1 to foo, so if temp1 has
-  ;;   temp1_a
-  ;;   temp1_b ...
-  ;;
-  ;; we want to bind
-  ;;   foo_a temp_a
-  ;;   (foo_b ...) (temp_b ...)
-  (define (bind-attributes variable new-name)
-    (debug 2 "Syntax class of ~a is ~a at ~a\n"
-           (pattern-variable-class variable)
-           (syntax-local-value (pattern-variable-class variable) (lambda () #f))
-           (syntax-local-phase-level))
-    (define attributes
-      (let ([syntax-class (syntax-local-value (pattern-variable-class variable))])
-        (for/list ([attribute (syntax:stxclass-attrs syntax-class)])
-          (pattern-variable (syntax:attr-name attribute)
-                            (pattern-variable-original variable)
-                            (+ (pattern-variable-depth variable)
-                               (syntax:attr-depth attribute))
-                            #f))))
-
-    (define (mirror-attribute attribute)
-      (debug 2 "Mirror attribute ~a\n" attribute)
-      (define-struct-fields attribute pattern-variable
-                            (name original depth class))
-      ;; create a new pattern variable with a syntax object that uses
-      ;; the given lexical context and whose name is prefix_suffix
-      (define (create lexical prefix suffix)
-        (pattern-variable->syntax
-          (pattern-variable (format-id lexical "~a_~a" prefix suffix)
-                            attribute.original attribute.depth attribute.class)))
-      (define-struct-fields variable pattern-variable
-                            (name original depth class))
-      (debug 2 "Bind attributes ~a ~a\n" variable.name attribute.name)
-      (with-syntax ([bind-attribute
-                      #;
-                      (create name (syntax-e name) name)
-                      (pattern-variable->syntax
-                        (pattern-variable (format-id variable.name "~a_~a"
-                                                     (syntax-e variable.name)
-                                                     attribute.name)
-                                          attribute.original
-                                          attribute.depth
-                                          attribute.class))]
-                    [new-attribute 
-                      #;
-                      (create new-name new-name name)
-                      (pattern-variable->syntax
-                        (pattern-variable
-                          (format-id new-name "~a_~a"
-                                     new-name
-                                     attribute.name)
-                          attribute.original attribute.depth #f))])
-        (debug 2 "Bind ~a to ~a\n" #'bind-attribute #'new-attribute)
-        #'(#:with bind-attribute #'new-attribute)))
-
-    (for/set ([attribute attributes])
-             (mirror-attribute attribute)))
-
-  ;; returns a set of #:with clauses for syntax-parse that
-  ;; bind all the old variables and their attributes to some new names
-  ;; taking care of ellipses depth
-  (define (pattern-variables+attributes variables use)
-    (for/union ([old variables]
-                [new use])
-               (define-struct-fields old pattern-variable (name original depth class))
-               (with-syntax ([old-syntax (pattern-variable->syntax old)]
-                             [new.result (pattern-variable->syntax
-                                           (pattern-variable (format-id new "~a_result" new)
-                                                             old.original
-                                                             old.depth
-                                                             old.class))])
-                 (set-union (set #'(#:with old-syntax #'new.result))
-                            (bind-attributes old new)))))
-  )
-
-(require (for-meta 2 (submod "." analysis)))
-
-(begin-for-syntax
-  (define-syntax (parse-stuff stx)
-    (syntax-parse stx
-      [(_ stuff ...)
-       (emit-remark "Parse stuff ~a\n" #'(stuff ...))
-       (phase2:parse-all #'(stuff ...))
-       #;
-       (honu->racket (parse-all #'(stuff ...)))])))
-
-(begin-for-syntax
-  (define-syntax (create-honu-macro stx)
-    (syntax-parse stx
-      [(_ name (literal ...) (pattern ...) (action ...))
-       (debug 2 "Name is ~a\n" #'name)
-       (define pattern-variables (find-pattern-variables #'(pattern ...)))
-
-       ;; only need a 1-to-1 mapping here
-       (define mapping (make-hash))
-       (for ([variable pattern-variables])
-         (debug 2 "Update mapping for ~a\n" (pattern-variable-name variable))
-         (hash-set! mapping (syntax-e (pattern-variable-name variable))
-                    variable)) 
-       (debug 2 "Create pattern\n")
-       (with-syntax ([(syntax-parse-pattern ...)
-                      (convert-pattern #'(pattern ...) mapping)]
-                     [((pattern-variable.name pattern-variable.result) ...)
-                      (for/list ([name pattern-variables])
-                        (debug 2 "Create new pattern variable from ~a\n" name)
-                        (with-syntax ([name (pattern-variable->syntax name)]
-                                      [name.result (pattern-variable->syntax
-                                                     (pattern-variable (format-id (pattern-variable-name name)
-                                                                                  "~a_result"
-                                                                                  (pattern-variable-name name))
-                                                                       (pattern-variable-original name)
-                                                                       (pattern-variable-depth name)
-                                                                       (pattern-variable-class name)
-                                                                       ))])
-                          #'(name name.result)))])
-
-         (define output 
-           (syntax (quote-syntax 
-                     (lambda (stx)
-                       (emit-remark "Invoke macro" (symbol->string 'name) "on" stx)
-                       (define-literal-set local-literals (literal ...))
-                       (syntax-parse stx
-                         #:literal-sets ([cruft #:at name]
-                                         [local-literals #:at name])
-                         [(_ syntax-parse-pattern ... . more)
-                          (values
-                            ;; if the pattern is x:expression then x_result will
-                            ;; hold the parsed version of x, so we rebind x to
-                            ;; x_result so you can use just x in the template
-                            ;; instead of x_result. x_result is still there, too
-                            (with-syntax ([pattern-variable.name #'pattern-variable.result]
-                                          ...)
-                              (debug "~a = ~a\n" 'pattern-variable.name (syntax->datum #'pattern-variable.name)) ...
-                              (parse-stuff action ...))
-                            #'more #t)]
-                         [else (raise-syntax-error #f "Could not match macro" stx)])))))
-             (debug "Create macro: ~a\n" (pretty-format (syntax->datum output)))
-             output)]))
-  )
-
-(provide honu-macro)
-(define-honu-syntax honu-macro
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ name
-          (#%parens literal ...)
-          (#%braces pattern ...)
-          (#%braces action ...) . rest)
-       (values (phase1:racket-syntax
-                 ;; trampoline to phase 1
-                 (splicing-let-syntax ([make (lambda (stx)
-                                               (syntax-parse stx
-                                                 [(_ new-name)
-                                                  (define output 
-                                                    (create-honu-macro name
-                                                                       (literal ...)
-                                                                       (pattern ...)
-                                                                       (action ...)))
-                                                  (debug "Output from create macro ~a\n" output)
-                                                  (with-syntax ([output output])
-                                                    (debug "Output is ~a\n" #'output)
-                                                    #'(define-honu-syntax new-name output))]))])
-                   (make name)))
-               #'rest
-               #t)])))
-
-#|
-;; FIXME: we shouldn't need this definition here
-(define-syntax (as-honu-syntax stx)
-  (syntax-parse stx
-    [(_ form)
-     (define compressed (compress-dollars #'form))
-     (with-syntax ([stuff* (datum->syntax #'form (syntax->list compressed)
-                                          #'form #'form)])
-       (syntax #'stuff*))]))
-
-(begin-for-syntax
-  (define-syntax (as-honu-syntax stx)
-    (syntax-parse stx
-      [(_ form)
-       (define compressed (phase1:compress-dollars #'form))
-       (with-syntax ([stuff* (datum->syntax #'form (syntax->list compressed)
-                                            #'form #'form)])
-         (syntax #'stuff*))])))
-|#
-
-
-;; combine syntax objects
-;; #'(a b) + #'(c d) = #'(a b c d)
-(provide mergeSyntax)
-(define (mergeSyntax syntax1 syntax2)
-  (debug "Merge syntax ~a with ~a\n" (syntax->datum syntax1) (syntax->datum syntax2))
-  (with-syntax ([(syntax1* ...) syntax1]
-                [(syntax2* ...) syntax2])
-          #'(syntax1* ... syntax2* ...))
-  #;
-  (syntax-parse syntax1
-    [(r1 (unexpand something1))
-     (syntax-parse syntax2
-       [(r2 (unexpand2 something2))
-        (with-syntax ([(syntax1* ...) #'something1]
-                      [(syntax2* ...) #'something2])
-          #'(%racket (unexpand (syntax1* ... syntax2* ...))))])]))
-
-(begin-for-syntax
-  (define-for-syntax (pretty-syntax stx) (pretty-format (syntax->datum stx))))
-
-;; honu-pattern should expand to
-;; (define-syntax honu-pattern ...)
-
-(require (for-syntax (submod "." analysis)))
-(require (for-meta 2 "util.rkt"
-                   racket/match
-                   (prefix-in syntax: syntax/parse/private/residual-ct))
-         (for-meta 3 racket/base syntax/parse racket/syntax)
-         )
-;; creates a new syntax/parse pattern
-(provide honu-pattern)
-
-(begin-for-syntax
-  (define-syntax (generate-pattern stx)
-    (syntax-parse stx
-      [(_ name literals (pattern-stx out-stx) ...)
-
-      (define (make-syntax-class-pattern honu-pattern maybe-out)
-        (define variables (find-pattern-variables honu-pattern))
-        (define use (generate-temporaries variables))
-        (define mapping (make-hash))
-        (for ([old variables]
-              [new use])
-          (debug 2 "Update mapping ~a to ~a\n" (syntax-e (pattern-variable-name old)) new)
-          (hash-set! mapping
-                     (syntax-e (pattern-variable-name old))
-                     (pattern-variable new
-                                       (pattern-variable-original old)
-                                       (pattern-variable-depth old)
-                                       (pattern-variable-class old))))
-
-        (define withs (pattern-variables+attributes variables use))
-
-        (with-syntax ([(new-pattern ...) (convert-pattern honu-pattern mapping)]
-                      [((withs ...) ...) (set->list withs)]
-                      [(result-with ...) (if (syntax-e maybe-out)
-                                           (with-syntax ([(out ...)
-                                                          (syntax-parse maybe-out
-                                                            #:literal-sets (cruft)
-                                                            [(#%braces what ...)
-                                                             #'(what ...)])
-                                                            ])
-                                             ;; #'(#:with result (parse-stuff honu-syntax (#%parens out ...)))
-                                             #'(#:with result (parse-stuff out ...))
-                                             )
-                                           #'(#:with result #'()))])
-          (syntax/loc honu-pattern
-                      [pattern (~seq new-pattern ...)
-                               withs ... ...
-                               result-with ...
-                               #:with (inner (... ...)) #'result
-                               ])))
-
-      (define pattern-stuff
-        (for/list ([pattern (syntax->list #'(pattern-stx ...))]
-                   [out (syntax->list #'(out-stx ...))])
-          (make-syntax-class-pattern pattern out)))
-
-      #;
-      (debug "With bindings ~a\n" withs)
-      (with-syntax ([(literal ...) #'literals]
-                    [(new-pattern ...) pattern-stuff])
-        #;
-        (debug "Result with ~a\n" (syntax->datum #'(quote-syntax (result-with ...))))
-        (define output
-          #'(quote-syntax
-              (begin
-                ;; define at phase1 so we can use it in a macro
-                (begin-for-syntax
-                  (define-literal-set local-literals (literal ...))
-                  (define-splicing-syntax-class name
-                      #:literal-sets ([cruft #:at name]
-                                      [local-literals #:at name])
-                      new-pattern ...
-
-                      #;
-                      [pattern x #:when (begin
-                                          (debug "All patterns failed for ~a\n" 'name)
-                                          #f)]
-
-                      )))))
-        (debug "Output is ~a\n" (pretty-syntax output))
-        output)])))
-
-;; generates a phase 1 binding for the pattern. analyzes its pattern so it
-;; must execute in phase 2
-(define-honu-syntax honu-pattern
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ name (#%parens literal ...)
-          (~seq (#%braces original-pattern ...)
-                (~optional (~seq honu-comma maybe-out)
-                           #:defaults ([maybe-out #'#f])))
-          ...
-          . rest)
-       (values
-         (phase1:racket-syntax
-           (splicing-let-syntax
-             ([make (lambda (stx)
-                      (syntax-parse stx
-                        [(_ new-name)
-                         (syntax-local-introduce
-                           (generate-pattern name
-                                             (literal ...)
-                                             ((original-pattern ...) maybe-out)
-                                             ...))]))])
-             (make name)))
-               #'rest
-               #f)])))
-
-;; like begin-for-syntax
-(provide honu-phase)
-(define-honu-syntax honu-phase
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ (#%braces body ...) . rest)
-       (define out
-         (phase1:racket-syntax (begin-for-syntax (parse-stuff body ...))))
-       (values out #'rest #t)])))
-
-;; not sure this is useful but it lets you write racket syntax expressions
-;; from inside honu. the main issue is all the bindings available
-;; are honu bindings so things like (+ 1 x) wont work.
-(provide honu-racket)
-(define-honu-syntax honu-racket
-  (lambda (code)
-    (define (remove-cruft stx)
-      (syntax-parse stx #:literal-sets (cruft)
-        [(#%parens inside ...)
-         (remove-cruft #'(inside ...))]
-        [(#%braces inside ...)
-         (remove-cruft #'(inside ...))]
-        [(#%brackets inside ...)
-         (remove-cruft #'(inside ...))]
-        [(head rest ...)
-         (with-syntax ([head* (remove-cruft #'head)]
-                       [(rest* ...) (remove-cruft #'(rest ...))])
-           #'(head* rest* ...))]
-        [x #'x]))
-
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ (#%parens stx ...) . rest)
-       (define out
-         (with-syntax ([(stx* ...) (remove-cruft #'(stx ...))])
-           (phase1:racket-syntax (phase0:racket-syntax (stx* ...)))))
-       (values out #'rest #t)])))
diff --git a/pkgs/honu/core/private/more.rkt b/pkgs/honu/core/private/more.rkt
deleted file mode 100644
index 4ef6f15779..0000000000
--- a/pkgs/honu/core/private/more.rkt
+++ /dev/null
@@ -1,184 +0,0 @@
-#lang racket/base
-
-#|
-
-(require "honu-typed-scheme.rkt"
-         "literals.rkt"
-         syntax/parse
-         mzlib/trace
-         "syntax.rkt"
-         (for-syntax syntax/parse
-                     syntax/stx
-                     racket/list
-                     racket/base
-                     "debug.rkt"
-                     "contexts.rkt"
-                     "syntax.rkt"
-                     (only-in racket (... scheme-ellipses))
-                     "literals.rkt")
-         (for-template "honu-typed-scheme.rkt"
-                       "literals.rkt"
-                       "syntax.rkt"
-                       (only-in racket ...)
-                       ))
-
-(provide (all-defined-out))
-
-(define (combine-syntax lexical . all)
-  (define consed (for/fold ([item all])
-                           ([out '()])
-                           (cons item out)))
-  (datum->syntax lexical consed lexical))
-
-(define (replace-commas stuff)
-  (syntax-parse stuff #:literals (ellipses-comma ellipses-comma*)
-    [((ellipses-comma* z ...) thing blah ...)
-     (with-syntax ([(rest ...) (replace-commas #'(thing blah ...))])
-       (datum->syntax stuff
-                      #'(z ... honu-comma rest ...)
-                      ;; `(1 ,#'(z ...) ,#'honu-comma ,#'(rest ...))
-                      stuff
-                      stuff))]
-    [((ellipses-comma z) thing blah ...)
-     (with-syntax ([(rest ...) (replace-commas #'(thing blah ...))])
-       (datum->syntax stuff (cons #'z (cons #'honu-comma #'(rest ...)))
-                      stuff
-                      stuff))]
-    [(front (ellipses-comma* z ...) thing more ...)
-     (with-syntax ([front* (replace-commas #'front)]
-                   [(rest* ...) (replace-commas #'(thing more ...))])
-       (datum->syntax stuff #'(front z ... honu-comma rest* ...) stuff stuff))]
-    [(front (ellipses-comma z) thing more ...)
-     (define (maybe-apply-raw stx)
-       (syntax-parse stuff #:literals (ellipses-comma)
-                     [(front (ellipses-comma x) . rest)
-                      (if (raw-scheme? #'x)
-                        (apply-scheme-syntax stx)
-                        stx)]))
-     (with-syntax ([front* (replace-commas #'front)]
-                   [(rest* ...) (replace-commas #'(thing more ...))])
-       (datum->syntax stuff (cons #'front* (cons #'z (cons #'honu-comma #'(rest* ...))))
-                      stuff
-                      stuff))]
-    [((ellipses-comma* z ...)) (datum->syntax stuff #'(z ...) stuff stuff)]
-    [((ellipses-comma z)) (datum->syntax stuff #'(z) stuff stuff)]
-    [(z rest ...)
-     (with-syntax ([z* (replace-commas #'z)]
-                   [(rest* ...) (replace-commas #'(rest ...))])
-       (datum->syntax stuff
-                      (cons #'z* #'(rest* ...))
-                      stuff stuff))]
-    [else stuff]))
-
-;; (trace replace-commas)
-
-(define-syntax (fix-template stuff)
-  (define (fix stuff)
-    (debug "Macro fix template for ~a\n" (syntax->datum stuff))
-    (syntax-parse stuff #:literals (ellipses-comma)
-      [(any ellipses-comma rest ...)
-       (define (addit item)
-         (with-syntax ([i item])
-           #'(i honu-comma)))
-       (define (remove-last list)
-         (take list (sub1 (length list))))
-       (define (add-commas stuff)
-         (remove-last (apply append (map syntax->list (map addit (syntax->list stuff))))))
-       (with-syntax ([(any* ...) (add-commas #'any)]
-                     [(rest* ...) (fix #'(rest ...))])
-         #'(any* ... rest* ...))]
-      [(one rest ...)
-       (with-syntax ([one* (fix #'one)]
-                     [(rest* ...) (fix #'(rest ...))])
-         (datum->syntax stuff (cons #'one*
-                                    #'(rest* ...))
-                        stuff stuff))]
-      [else stuff]))
-  (define (replace2 stuff)
-    (syntax-parse stuff #:literals (ellipses-comma ellipses-repeat #%parens)
-      [(ellipses-repeat (#%parens ellipses-comma things-to-repeat ...) rest ...)
-       (with-syntax ([(rest* ...) (replace #'(rest ...))])
-         (datum->syntax stuff
-                        (cons
-                          (cons #'ellipses-comma* #'(things-to-repeat ...))
-                          (cons
-                            #'(... ...)
-                            #'(rest* ...)))
-                        stuff stuff))]
-      [(a ellipses-comma rest ...)
-       (with-syntax ([a* (replace #'a)]
-                     [(rest* ...) (replace #'(rest ...))])
-         (datum->syntax stuff
-                        (cons
-                          (cons #'ellipses-comma (cons #'a* '()))
-                          (cons
-                            #'(... ...)
-                            #'(rest* ...)))
-                        stuff stuff))]
-      [(z rest ...)
-       (with-syntax ([z* (replace #'z)]
-                     [(rest* ...) (replace #'(rest ...))])
-         (datum->syntax stuff
-                        (cons #'z* #'(rest* ...))
-                        stuff stuff))]
-      [else stuff]))
-
-  (define (replace stuff)
-    (syntax-parse stuff
-      #:literals (;; honu-comma
-                  ;; FIXME! Use a literal-set and #:at instead of this
-                  [honu-comma honu-comma #:phase (sub1 (syntax-local-phase-level))]
-                  [ellipses ...] ellipses-comma ellipses-repeat #%parens)
-      [(a honu-comma ellipses rest ...)
-       (with-syntax ([a* (replace #'a)]
-                     [(rest* ...) (replace #'(rest ...))])
-         (datum->syntax stuff
-                        (cons
-                          (cons #'ellipses-comma (cons #'a* '()))
-                          (cons
-                            #'(... ...)
-                            #'(rest* ...)))
-                        stuff stuff))]
-      [(z rest ...)
-       (with-syntax ([z* (replace #'z)]
-                     [(rest* ...) (replace #'(rest ...))])
-         (datum->syntax stuff
-                        (cons #'z* #'(rest* ...))
-                        stuff stuff))]
-      [else stuff]
-      ))
-  
-  (debug "Do fix template for ~a\n" (syntax->datum stuff))
-  (syntax-parse stuff
-    [(_ blah)
-     (let ([replaced (replace #'blah)])
-       (debug "Replaced ~a\n" (syntax->datum replaced))
-       (with-syntax ([out2 replaced])
-         (let ([x #'(apply-scheme-syntax (replace-commas #'out2))])
-           (debug "Final syntax ~a\n" (syntax->datum x))
-           x)))]))
-
-(define-syntax-rule (honu-syntax-maker maker unparsed)
-  (define-honu-syntax maker
-    (lambda (stx ctx)
-      (syntax-parse stx #:literal-sets ([cruft #:at unparsed])
-        [(_ (#%parens expr (... ...)) semicolon . rest)
-         (values
-           (lambda ()
-             (define (show-pattern-variables what)
-               (cond
-                 [(syntax-pattern-variable? what) (debug "~a is a pattern variable\n") what]
-                 [(stx-pair? what) (for-each show-pattern-variables (syntax->list what))]
-                 [else (debug "~a is *not* a pattern variable\n" what)]))
-
-             (debug "Making unparsed syntax with `~a'\n" (syntax->datum #'(expr (... ...))))
-
-             #'(fix-template (unparsed expr (... ...))))
-           #'rest)]
-        [else (raise-syntax-error 'maker "you have used this incorrectly")]
-        ))))
-
-(honu-syntax-maker honu-syntax honu-unparsed-begin)
-(honu-syntax-maker honu-expression-syntax honu-unparsed-expr)
-
-|#
diff --git a/pkgs/honu/core/private/operator.rkt b/pkgs/honu/core/private/operator.rkt
deleted file mode 100644
index 003da6a875..0000000000
--- a/pkgs/honu/core/private/operator.rkt
+++ /dev/null
@@ -1,142 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     "transformer.rkt"
-                     "fixture.rkt"
-                     "compile.rkt"
-                     "debug.rkt"
-                     syntax/parse))
-
-(provide (all-defined-out))
-
-(define-syntax (define-honu-operator/syntax stx)
-  (syntax-parse stx
-    [(_ name precedence associativity binary-function)
-     (syntax/loc stx (define-syntax name (make-honu-operator precedence associativity binary-function #f #f)))]
-    [(_ name precedence associativity binary-function unary-function postfix?)
-     (syntax/loc stx (define-syntax name (make-honu-operator precedence associativity binary-function unary-function postfix?)))]))
-
-(define-syntax (define-honu-fixture stx)
-  (syntax-parse stx
-    [(_ name transformer)
-     #'(define-syntax name (make-fixture transformer))]))
-
-(define-syntax-rule (define-binary-operator name precedence associativity operator)
-    (define-honu-operator/syntax name precedence associativity
-                                 ;; binary
-                                 (lambda (left right)
-                                   (with-syntax ([left left]
-                                                 [right right])
-                                     (racket-syntax (operator left right))))))
-
-(define-syntax-rule (define-unary+binary-operator name precedence associativity operator)
-    (define-honu-operator/syntax name precedence associativity
-                                 ;; binary
-                                 (lambda (left right)
-                                   (with-syntax ([left left]
-                                                 [right right])
-                                     (racket-syntax (operator left right))))
-                                 ;; unary
-                                 (lambda (arg)
-                                   (with-syntax ([arg arg])
-                                     (racket-syntax (operator arg))))
-                                 ;; binary operators should not be able to be postfix
-                                 #f))
-
-(define-syntax-rule (define-unary-operator name precedence postfix? operator)
-                    ;; associativity dont matter for unary 
-                    (define-honu-operator/syntax name precedence 'left
-                                                 #f
-                                                 ;; unary
-                                                 (lambda (argument)
-                                                   (with-syntax ([argument argument])
-                                                     (racket-syntax (operator argument))))
-                                                 postfix?))
-
-(define-honu-operator/syntax honu-flow 0.001 'left
-  (lambda (left right)
-    (with-syntax ([left left]
-                  [right right])
-      (racket-syntax (right left)))))
-
-(begin-for-syntax
-  (define-syntax-rule (mutator change)
-                      (lambda (left right)
-                        (with-syntax ([left left]
-                                      [right (change left right)])
-                          (racket-syntax (set! left right))))))
-
-;; Traditional assignment operator
-(define-honu-operator/syntax honu-equal 0.0001 'left
-  (let ([plain-mutate (mutator (lambda (left right) right))])
-    (lambda (left right)
-      (define mutate (syntax-property left 'assign))
-      (if mutate
-        (mutate right)
-        (plain-mutate left right)))))
-
-;; Define an assignment operator that uses the current value in its operation
-;;   a -= 2
-;; is the same 
-;;   a = a - 2
-;; and turns into
-;;   (set! a (- a 2))
-;;
-;;   a.x -= 2
-;; turns into
-;;   (honu-struct-set! a x (- (dot a x) 2))
-;; where (dot a x) is field lookup of x inside a
-(define-syntax-rule (define-honu-operator-= name operation)
-  (define-honu-operator/syntax name 0.0001 'left
-    (let ()
-      (define (do-it left right)
-        (with-syntax ([left left] [right right])
-          #'(operation left right)))
-      (define plain-mutate (mutator do-it))
-      (lambda (left right)
-        (define mutate (syntax-property left 'assign))
-        (if mutate
-          (mutate (do-it left right))
-          (plain-mutate left right))))))
-
-;; Operators that mutate the left hand side
-(define-honu-operator-= honu-+= +)
-(define-honu-operator-= honu--= -)
-(define-honu-operator-= honu-*= *)
-(define-honu-operator-= honu-/= /)
-
-(define-unary+binary-operator honu-+ 1 'left +)
-(define-unary+binary-operator honu-- 1 'left -)
-(define-binary-operator honu-* 2 'left *)
-(define-binary-operator honu-/ 2 'left /)
-(define-binary-operator honu-^ 2 'right expt)
-(define-binary-operator honu-< 0.9 'left <)
-(define-binary-operator honu-<= 0.9 'left <=)
-(define-binary-operator honu-> 0.9 'left >)
-(define-binary-operator honu->= 0.9 'left >=)
-;; (define-binary-operator honu-= 0.9 'left =)
-(define-binary-operator honu-and 0.5 'left and)
-(define-binary-operator honu-or 0.5 'left or)
-(define-binary-operator honu-cons 0.1 'right cons)
-(define-binary-operator honu-map 0.09 'left map)
-(define-binary-operator honu-string=? 1 'left string=?)
-(define-binary-operator honu-modulo 2 'left modulo)
-
-(define-binary-operator honu-to 0.001 'left
-                        (lambda (left right)
-                          (for/list ([i (in-range left right)]) i)))
-
-(define-unary-operator honu-not 0.7 #f not)
-
-(define-binary-operator honu-== 1 'left equal?)
-(define-binary-operator honu-not-equal 1 'left (lambda (left right)
-                                                 (not (equal? left right))))
-
-(define-honu-operator/syntax honu-=> 0.00001 'left
-  (lambda (left right)
-    (when (not (identifier? left))
-      (raise-syntax-error '=> "expected an identifier" left))
-    (with-syntax ([left left]
-                  [right right])
-      (racket-syntax (lambda (left)
-                       right)))))
diff --git a/pkgs/honu/core/private/ops.rkt b/pkgs/honu/core/private/ops.rkt
deleted file mode 100644
index 658274e54b..0000000000
--- a/pkgs/honu/core/private/ops.rkt
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang scheme
-
-  (provide unary-prefix-ops
-           unary-postfix-ops
-           (struct-out op)
-           (struct-out prefix)
-           (struct-out cast-prefix)
-           (struct-out infix)
-           (struct-out postfix)
-           prec-key
-           precedence-table
-           op-table)
-
-(define unary-prefix-ops '(++
-                            --
-                            +
-                            -
-                            !
-                            ~))
-
-(define unary-postfix-ops '(++
-                             --))
-
-(define-struct op (id))
-(define-struct (prefix op) ())
-(define-struct (cast-prefix prefix) (type))
-(define-struct (infix op) ())
-(define-struct (postfix op) ())
-
-(define (prec-key op)
-  (and op
-       (cons (cond
-               [(prefix? op) 'pre]
-               [(infix? op) 'in]
-               [(postfix? op) 'post])
-             (syntax-e (op-id op)))))
-
-(define precedence-table (make-immutable-hash
-                           '(((in . |.|) . 100)
-                             ((in . #%parens) . 100)
-                             ((in . #%brackets) . 100)
-                             ((in . #%angles) . 100)
-                             ((post . ++) . 100)
-                             ((post . --) . 100)
-                             ((pre . ++) . 95)
-                             ((pre . --) . 95)
-                             ((pre . +) . 95)
-                             ((pre . -) . 95)
-                             ((pre . ~) . 95)
-                             ((pre . !) . 95)
-                             ((pre . #%parens) . 95)
-                             ((in . *) . 90)
-                             ((in . %) . 90)
-                             ((in . /) . 90)
-                             ((in . +) . 85)
-                             ((in . -) . 85)
-                             ((in . >>) . 80)
-                             ((in . <<) . 80)
-                             ((in . >>>) . 80)
-                             ((in . <) . 70)
-                             ((in . >) . 70)
-                             ((in . <=) . 70)
-                             ((in . >=) . 70)
-                             ((in . ==) . 60)
-                             ((in . !=) . 60)
-                             ((in . &) . 55)
-                             ((in . ^) . 50)
-                             ((in . \|) . 45)
-                             ((in . &&) . 40)
-                             ((in . \|\|) . 35)
-                             ((in . =) . 10)
-                             ((in . +=) . 10)
-                             ((in . -=) . 10)
-                             ((in . *=) . 10)
-                             ((in . /=) . 10)
-                             ((in . %=) . 10)
-                             ((in . &=) . 10)
-                             ((in . ^=) . 10)
-                             ((in . \|=) . 10)
-                             ((in . <<=) . 10)
-                             ((in . >>=) . 10)
-                             ((in . >>>=) . 10)
-                             ((in . \,) . 6)
-                             ((in . :) . 5)
-                             ((in . ?) . 4))))
-                           
-
-(define op-table (make-hash))
-(hash-for-each precedence-table (lambda (k v)
-                                  (hash-set! op-table (cdr k) #t)))
-
diff --git a/pkgs/honu/core/private/parse-helper.rkt b/pkgs/honu/core/private/parse-helper.rkt
deleted file mode 100644
index c6da1f23bc..0000000000
--- a/pkgs/honu/core/private/parse-helper.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     "parse2.rkt"))
-
-(provide (all-defined-out))
-
-(define-syntax (do-parse-rest-macro stx)
-  (syntax-case stx ()
-    [(_ stuff ...)
-     (do-parse-rest #'(stuff ...) #'do-parse-rest-macro)]))
diff --git a/pkgs/honu/core/private/parse2.rkt b/pkgs/honu/core/private/parse2.rkt
deleted file mode 100644
index b695ab1617..0000000000
--- a/pkgs/honu/core/private/parse2.rkt
+++ /dev/null
@@ -1,766 +0,0 @@
-#lang racket/base
-
-(define-syntax-rule (require-syntax stuff ...)
-                    (require (for-syntax stuff ...)))
-
-;; phase 0
-(require ;; "macro2.rkt"
-         "literals.rkt"
-         "debug.rkt"
-         "compile.rkt"
-         "template.rkt"
-         "utils.rkt"
-         racket/list
-         (prefix-in transformer: "transformer.rkt")
-         (prefix-in fixture: "fixture.rkt")
-         "operator.rkt"
-         macro-debugger/emit
-         racket/pretty
-         syntax/stx
-         syntax/parse/experimental/splicing
-         syntax/parse)
-;; phase 1
-(require-syntax racket/base
-                "compile.rkt"
-                "debug.rkt")
-
-;; phase -1
-(require (for-template racket/base
-                       racket/splicing
-                       ;; "compile.rkt"
-                       "syntax.rkt"
-                       "extra.rkt"))
-
-(provide parse parse-all)
-
-#;
-(define-literal-set literals
-                    [honu-macro])
-
-(define (get-value what)
-  (syntax-local-value what (lambda () #f)))
-
-#;
-(define (get-value what)
-  (debug "what is ~a\n" what)
-  (with-syntax ([what what])
-    (let-syntax ([v (lambda (stx)
-                      (debug "get ~a\n" #'what)
-                      (with-syntax ([x (syntax-local-value #'what (lambda () #f))])
-                        #'x))])
-      (v))))
-
-#;
-(define (get-value check)
-  (eval-syntax
-    (with-syntax ([check check])
-      #'(syntax-local-value check #'check (lambda () #f))))) 
-
-(define (bound-to-operator? check)
-  (let ([value (get-value check)])
-    (debug 2 "operator? ~a ~a\n" check value)
-    (transformer:honu-operator? value)))
-
-(define (bound-to-fixture? check)
-  (let ([value (get-value check)])
-    (debug 2 "fixture? ~a ~a\n" check value)
-    (fixture:fixture? value)))
-
-(define (bound-to-macro? check)
-  (let ([value (get-value check)])
-    (debug 2 "macro? ~a ~a\n" check value)
-    (transformer:honu-transformer? value))
-  #;
-  (let ([value (syntax-local-value check (lambda () #f))])
-    (transformer:honu-transformer? value)))
-
-(define (honu-macro? something)
-  (and (identifier? something)
-       (bound-to-macro? something)))
-
-(define (honu-operator? something)
-  (and (identifier? something)
-       (bound-to-operator? something)))
-
-(define (honu-fixture? something)
-  (and (identifier? something)
-       (bound-to-fixture? something)))
-
-(define (semicolon? what)
-  (define-literal-set check (semicolon))
-  (define is (and (identifier? what)
-                    ((literal-set->predicate check) what)))
-  (debug "Semicolon? ~a ~a\n" what is)
-  is)
-
-(define (comma? what)
-  (define-literal-set check (honu-comma))
-  (define is (and (identifier? what)
-                    ((literal-set->predicate check) what)))
-  (debug 2 "Comma? ~a ~a\n" what is)
-  is)
-
-(define-literal-set argument-stuff [honu-comma])
-
-(define (parse-arguments arguments)
-  (define-syntax-class val
-    [pattern x:identifier #:when (equal? 'val (syntax-e #'x))])
-  (let loop ([out '()]
-             [arguments arguments])
-    (syntax-parse arguments #:literal-sets (argument-stuff)
-      [(x:val name:identifier honu-comma more ...)
-       (loop (cons #'name out) #'(more ...))]
-      [(name:identifier honu-comma more ...)
-       (loop (cons #'name out) #'(more ...))]
-      [(x:val name:identifier)
-       (loop (cons #'name out) #'())]
-      [(name:identifier)
-       (loop (cons #'name out) #'())]
-      [() (reverse out)])))
-
-(define (parse-comma-expression arguments)
-  (if (null? (syntax->list arguments))
-    '()
-    (let loop ([used '()]
-               [rest arguments])
-      (if (empty-syntax? rest)
-        (reverse used)
-        (syntax-parse rest #:literal-sets (cruft)
-          [(honu-comma more ...)
-           (loop used #'(more ...))]
-          [else
-            (let-values ([(parsed unparsed)
-                          ;; FIXME: don't strip all stops, just comma
-                          (parse (strip-stops rest))])
-              (loop (if parsed
-                      (cons (parse-all-expression parsed) used)
-                      used)
-                    unparsed))])))))
-
-(define (stopper? what)
-  (define-literal-set check (honu-comma semicolon colon))
-  (define is (and (identifier? what)
-                  ((literal-set->predicate check) what)))
-  (debug 2 "Comma? ~a ~a\n" what is)
-  is)
-
-(provide do-parse-rest)
-(define (do-parse-rest stx parse-more)
-  (syntax-parse stx #:literal-sets (cruft)
-    
-    #;
-    [(semicolon semicolon ... rest ...)
-     (do-parse-rest #'(rest ...) parse-more)]
-    [(stuff ...)
-     (debug "Parse rest ~a\n" (syntax->datum #'(stuff ...)))
-     (define-values (parsed unparsed)
-                    (parse (strip-stops #'(stuff ...))))
-     (debug "Parse more: ~a unparsed ~a\n" parsed unparsed)
-     (define output (if parsed parsed #'(void)))
-     (debug "Output ~a unparsed ~a\n"
-            (syntax->datum output)
-            (syntax->datum unparsed))
-     (with-syntax ([output output]
-                   [(unparsed-out ...) unparsed]
-                   [parse-more parse-more])
-       (if (null? (syntax->datum #'(unparsed-out ...)))
-         (if (parsed-syntax? #'output)
-           #'output
-           #;
-           #'(parse-more output)
-           (with-syntax ([(out ...) #'output])
-             #'(parse-more out ...)))
-         #;
-         #'(begin (parse-more output unparsed-out ...))
-         (if (parsed-syntax? #'output)
-           #'(begin output (parse-more unparsed-out ...))
-           #;
-           #'(parse-more output unparsed-out ...)
-           (with-syntax ([(out ...) #'output])
-             #'(begin (parse-more out ...) (parse-more unparsed-out ...))))))]
-    [() #'(begin)]))
-
-(define (do-parse-rest/local stx)
-  (define name (gensym 'local-parser))
-  (define local-parser (with-syntax ([name name])
-                         #'(define-syntax (name stx)
-                             (syntax-case stx ()
-                               [(_ stuff (... ...))
-                                (debug "Properties on first element ~a\n" (syntax-property-symbol-keys (stx-car #'(stuff (... ...)))))
-                                (do-parse-rest #'(stuff (... ...)) #'name)]))))
-  (with-syntax ([local local-parser]
-                #;
-                [parsed (do-parse-rest stx name)])
-    (with-syntax ([stx stx]
-                  [name name])
-      (debug "Create local parser for ~a properties ~a\n" (syntax->datum #'stx) (syntax-property-symbol-keys #'stx))
-      ;; sort of a hack, if the input is already parsed then don't deconstruct it
-      ;; otherwise the input is a honu expression so we need to splice it in
-      (define with-local
-        (if (parsed-syntax? #'stx)
-          #'(begin local (unexpand-honu-syntax (name stx)))
-          (with-syntax ([(inside ...) #'stx])
-            #'(begin local (unexpand-honu-syntax (name inside ...))))))
-      (emit-local-step #'stx with-local #:id #'do-parse-rest/local)
-      (parsed-syntax with-local))))
-
-#|
-(provide do-parse-rest-macro)
-(define-syntax (do-parse-rest-macro stx)
-  (syntax-case stx ()
-    [(_ code ...)
-     #'(let ()
-         (define-syntax (parse-more stx)
-           (syntax-case stx ()
-             [(_ stuff (... ...))
-              (do-parse-rest #'(stuff (... ...)) #'parse-more)]))
-         (parse-more code ...))]))
-|#
-
-(define-syntax-rule (parse-delayed code ...)
-                    (let ()
-                      (define-syntax (parse-more stx)
-                        (syntax-case stx ()
-                          [(_ stuff (... ...))
-                           (racket-syntax (do-parse-rest #'(stuff (... ...)) #'parse-more))]))
-                      (parse-more code ...)))
-
-(provide honu-body)
-(define-syntax-class honu-body
-  #:literal-sets (cruft)
-  [pattern (#%braces code ...)
-           #:with result
-           (racket-syntax (let ()
-                            (define-syntax (parse-more stx)
-                              (syntax-case stx ()
-                                [(_ stuff (... ...))
-                                 (do-parse-rest #'(stuff (... ...)) #'parse-more)]))
-                            (parse-more code ...)))])
-
-(provide honu-delayed)
-(define-syntax-class honu-delayed
-  [pattern any #:with result (racket-syntax
-                               (let ()
-                                 (define-syntax (parse-more stx)
-                                   (syntax-case stx ()
-                                     [(_ stuff (... ...))
-                                      (do-parse-rest #'(stuff (... ...)) #'parse-more)]))
-                                 (parse-more any)))])
-
-(provide honu-function)
-(define-splicing-syntax-class honu-function #:literal-sets (cruft)
-  [pattern (~seq function:identifier (#%parens args ...) body:honu-body)
-           #:with result
-           (with-syntax ([(parsed-arguments ...)
-                          (parse-arguments #'(args ...))])
-             (racket-syntax (define (function parsed-arguments ...)
-                              body.result)))])
-
-(define (definition? code)
-  (define (contains-define? code)
-    (syntax-parse code #:literals (define define-honu-syntax)
-      [(define x ...) #t]
-      [(define-honu-syntax x ...) #t]
-      [else #f]))
-  (and (parsed-syntax? code)
-       (contains-define? code)))
-
-;; E = macro
-;;   | E operator E
-;;   | [...]
-;;   | f(...)
-;;   | { ... }
-;;   | (...)
-
-;; 1 + 1
-;; ^
-;;  left: identity
-;;  current: 1
-;; 1 + 1
-;;   ^
-;;  left: (lambda (x) (+ 1 x))
-;;  current: #f
-;; 1 + 1
-;;     ^
-;;  left: (lambda (x) (+ 1 x))
-;;  current: 1
-;;
-;; 1 + 1 * 2
-;;       ^
-;;  left: (lambda (x) (left (* 1 x)))
-;;  current: #f
-;;
-;; 1 + 1 * 2
-;;         ^
-;;  left: (lambda (x) (left (* 1 x)))
-;;  current: 2
-
-;; parse one form
-;; return the parsed stuff and the unparsed stuff
-(define (parse input)
-  (define (do-macro head rest precedence left current stream)
-    (if current
-      (values (left current) stream)
-      (begin
-        (debug "Honu macro at phase ~a: ~a ~a\n" (syntax-local-phase-level) head (syntax-local-value head))
-        #;
-        (emit-remark "Input to macro" 
-                     (with-syntax ([head head]
-                                     [(rest ...) rest])
-                         (datum->syntax #'head
-                                        (syntax->list #'(head rest ...))
-                                        #'head #'head)))
-        (let-values ([(parsed unparsed terminate?)
-                      ((syntax-local-value head)
-                       (with-syntax ([head head]
-                                     [(rest ...) rest])
-                         (datum->syntax #'head
-                                        (syntax->list #'(head rest ...))
-                                        #'head #'head)))])
-          #;
-          (emit-remark "Output from macro" parsed)
-          #;
-          (emit-local-step stream parsed #:id #'do-macro)
-          (with-syntax ([parsed parsed]
-                        [rest unparsed])
-            (debug "Output from macro ~a\n" (pretty-format (syntax->datum #'parsed)))
-            #;
-            (do-parse #'(parsed ... rest ...)
-                      precedence left current)
-            ;; (debug "Remove repeats from ~a\n" #'parsed)
-            (define re-parse
-              #'parsed
-              #;
-              (remove-repeats #'parsed)
-              #;
-              (with-syntax ([(x ...) #'parsed])
-                (debug "Properties on parsed ~a\n" (syntax-property-symbol-keys #'parsed))
-                (do-parse-rest/local #'parsed)))
-            (debug "Reparsed ~a\n" (pretty-format (syntax->datum re-parse)))
-            #;
-            (define re-parse (let-values ([(re-parse re-unparse)
-                                           (parse #'parsed)])
-                               (with-syntax ([(re-parse* ...) re-parse]
-                                             [(re-unparse* ...) re-unparse])
-                                 (datum->syntax re-parse
-                                                (syntax->list
-                                                  #'(%racket
-                                                      (begin (re-parse* ...)
-                                                             (let ()
-                                                               (define-syntax (parse-more stx)
-                                                                 (do-parse-rest stx #'parse-more))
-                                                               (parse-more re-unparse* ...)))))
-                                                re-parse re-parse))))
-            #;
-            (debug "Reparsed output ~a\n" (pretty-format (syntax->datum re-parse)))
-            (define terminate (definition? re-parse))
-            (debug "Terminate? ~a\n" terminate)
-            (if terminate
-              (values (left re-parse)
-                      #'rest)
-              (do-parse #'rest precedence
-                        left re-parse)))))))
-  (define (do-parse stream precedence left current)
-    (define-syntax-class atom
-      ;; [pattern x:identifier #:when (not (stopper? #'x))]
-      [pattern x:identifier #:when (not (free-identifier=? #'#%braces #'x))]
-      [pattern x:str]
-      [pattern x:number])
-
-    (debug "parse ~a precedence ~a left ~a current ~a properties ~a\n"
-           (syntax->datum stream) precedence left current
-           (syntax-property-symbol-keys stream))
-    (define final (if current current (racket-syntax (void))))
-    (if (parsed-syntax? stream)
-      (values (left stream) #'())
-      (syntax-parse stream #:literal-sets (cruft)
-        #;
-        [x:id (values #'x #'())]
-        [((semicolon inner ...) rest ...)
-         ;; nothing on the left side should interact with a semicolon
-         (if current
-           (values (left current)
-                   stream)
-           (begin
-             (with-syntax (
-                           #;
-                           [inner* (parse-all #'(inner ...))])
-               (values (left (parse-delayed inner ...))
-                       #'(rest ...)))))]
-        [()
-         (debug "Empty input out: left ~a ~a\n" left (left final))
-         (values (left final) #'())]
-        [(head rest ...)
-         (debug 2 "Not a special expression..\n")
-         (cond
-           [(honu-macro? #'head)
-            (debug "Macro ~a\n" #'head)
-            (do-macro #'head #'(rest ...) precedence left current stream)]
-           [(parsed-syntax? #'head)
-            (debug "Parsed syntax ~a\n" #'head)
-            (emit-local-step #'head #'head #:id #'do-parse)
-            (if current
-              (values current stream)
-              (do-parse #'(rest ...) precedence left #'head))]
-           [(honu-fixture? #'head)
-            (debug 2 "Fixture ~a\n" #'head)
-            (define transformer (fixture:fixture-ref (syntax-local-value #'head) 0))
-            (define-values (output rest) (transformer current stream))
-            (do-parse rest precedence left output)]
-           [(honu-operator? #'head)
-            (define operator (syntax-local-value #'head))
-
-            (define new-precedence (transformer:operator-precedence operator))
-            (define association (transformer:operator-association operator))
-            (define binary-transformer (transformer:operator-binary-transformer operator))
-            (define unary-transformer (transformer:operator-unary-transformer operator))
-            (define postfix? (transformer:operator-postfix? operator))
-
-            (define higher
-              (case association
-                [(left) >]
-                [(right) >=]
-                [else (raise-syntax-error 'parse "invalid associativity. must be either 'left or 'right" association)]))
-            (debug "precedence old ~a new ~a higher? ~a\n" precedence new-precedence (higher new-precedence precedence))
-            (if (higher new-precedence precedence)
-              (let-values ([(parsed unparsed)
-                            (do-parse #'(rest ...) new-precedence
-                                      (lambda (stuff)
-                                        (define right (parse-all stuff))
-                                        (define output
-                                          (if current
-                                            (if binary-transformer
-                                              (binary-transformer (parse-all-expression current) right)
-                                              ;; use a unary transformer in postfix position
-                                              (if (and postfix? unary-transformer)
-                                                (unary-transformer current)
-                                                (error 'binary "cannot be used as a binary operator in ~a" #'head)))
-                                            (if unary-transformer
-                                              (unary-transformer right)
-                                              (error 'unary "cannot be used as a unary operator in ~a" #'head))))
-                                        #;
-                                        (debug "Binary transformer ~a\n" binary-transformer)
-                                        #;
-                                        (emit-local-step stuff output #:id binary-transformer)
-                                        (with-syntax ([out (parse-all output)])
-                                          #'out))
-
-                                      #f)])
-                (do-parse unparsed precedence left parsed))
-              ;; if we have a unary transformer then we have to keep parsing
-              (if unary-transformer
-                (if current
-                  (if postfix?
-                    (do-parse #'(rest ...)
-                              precedence 
-                              left
-                              (unary-transformer current))
-                    (values (left current) stream))
-
-                  (do-parse #'(rest ...) new-precedence
-                            (lambda (stuff)
-                              (define right (parse-all stuff))
-                              (define output (unary-transformer right))
-                              ;; apply the left function because
-                              ;; we just went ahead with parsing without
-                              ;; caring about precedence
-                              (with-syntax ([out (left (parse-all output))])
-                                #'out))
-                            #f))
-                ;; otherwise we have a binary transformer (or no transformer..??)
-                ;; so we must have made a recursive call to parse, just return the
-                ;; left hand
-                (values (left current) stream))
-              )]
-           
-           #;
-           [(stopper? #'head)
-            (debug "Parse a stopper ~a\n" #'head)
-            (values (left final)
-                    stream)]
-           [else
-            (define-splicing-syntax-class no-left
-              [pattern (~seq) #:when (and (= precedence 0) (not current))])
-            (syntax-parse #'(head rest ...) #:literal-sets (cruft)
-              #;
-              [(semicolon . rest)
-               (debug "Parsed a semicolon, finishing up with ~a\n" current)
-               (values (left current) #'rest)]
-              [body:honu-body
-               (if current
-                 (values (left current) stream)
-                 (values (left #'body.result) #'())
-                 #;
-                 (do-parse #'(rest ...) precedence left #'body.result))]
-              #;
-              [((semicolon more ...) . rest)
-               #;
-               (define-values (parsed unparsed)
-                 (do-parse #'(more ...)
-                           0
-                           (lambda (x) x)
-                           #f))
-               #;
-               (when (not (stx-null? unparsed))
-                 (raise-syntax-error 'parse "found unparsed input" unparsed))
-               (values (parse-all #'(more ...)) #'rest)]
-              #;
-              [(left:no-left function:honu-function . rest)
-               (values #'function.result #'rest)]
-              [else 
-               (debug "Parse a single thing ~a\n" (syntax->datum #'head))
-               (syntax-parse #'head
-                 #:literal-sets (cruft)
-                 [x:atom
-                  (debug 2 "atom ~a current ~a\n" #'x current)
-                  (if current
-                    (values (left current) stream)
-                    (do-parse #'(rest ...) precedence left (racket-syntax x)))]
-                 ;; [1, 2, 3] -> (list 1 2 3)
-                 [(#%brackets stuff ...)
-                  (define-literal-set wheres (honu-where))
-                  (define-literal-set equals (honu-equal))
-                  (syntax-parse #'(stuff ...) #:literal-sets  (cruft wheres equals)
-                                [(work:honu-expression 
-                                  colon (~seq variable:id honu-equal list:honu-expression (~optional honu-comma)) ...
-                                  (~seq honu-where where:honu-expression (~optional honu-comma)) ...)
-                                 (define filter (if (attribute where)
-                                                  #'((#:when where.result) ...)
-                                                  #'()))
-                                 (define comprehension
-                                   (with-syntax ([((filter ...) ...) filter])
-                                     (racket-syntax (for/list ([variable list.result]
-                                                               ...
-                                                               filter ... ...)
-                                                      work.result))))
-                                 (if current
-                                   (values (left current) stream)
-                                   (do-parse #'(rest ...) precedence left comprehension))]
-                                [else
-                                 (debug "Current is ~a\n" current)
-                                 (define value (with-syntax ([(data ...)
-                                                              (parse-comma-expression #'(stuff ...))])
-                                                 (debug "Create list from ~a\n" #'(data ...))
-                                                 (racket-syntax (list data ...))))
-                                 (define lookup (with-syntax ([(data ...)
-                                                               (parse-comma-expression #'(stuff ...))]
-                                                              [current current])
-                                                  (racket-syntax (do-lookup current data ...))))
-                                 (if current
-                                   ;; (values (left current) stream)
-                                   (do-parse #'(rest ...) precedence left lookup)
-                                   (do-parse #'(rest ...) precedence left value))])]
-                 ;; block of code
-                 [body:honu-body
-                  (if current
-                    (values (left current) stream)
-                    (do-parse #'(rest ...) precedence left #'body.result))] 
-                 ;; expression or function application
-                 [(#%parens args ...)
-                  (debug "Maybe function call with ~a\n" #'(args ...))
-                  (if current
-                    ;; FIXME: 9000 is an arbitrary precedence level for
-                    ;; function calls
-                    (if (> precedence 9000)
-                      (let ()
-                        (debug 2 "higher precedence call ~a\n" current)
-                        (define call (with-syntax ([current (left current)]
-                                                   [(parsed-args ...)
-                                                    (parse-comma-expression #'(args ...)) ])
-                                       (racket-syntax (current parsed-args ...))))
-                        (do-parse #'(rest ...) 9000 (lambda (x) x) call))
-                      (let ()
-                        (debug 2 "function call ~a\n" left)
-                        (define call (with-syntax ([current current]
-                                                   [(parsed-args ...)
-                                                    (parse-comma-expression #'(args ...)) ])
-                                       (debug "Parsed args ~a\n" #'(parsed-args ...))
-                                       (racket-syntax (current parsed-args ...))))
-                        (do-parse #'(rest ...) precedence left call)))
-                    (let ()
-                      (debug "inner expression ~a\n" #'(args ...))
-                      (define-values (inner-expression unparsed) (parse #'(args ...)))
-                      (when (not (empty-syntax? unparsed))
-                        (error 'parse "expression had unparsed elements ~a" unparsed))
-                      (do-parse #'(rest ...) precedence left inner-expression)))
-
-                  #;
-                  (do-parse #'(rest ...)
-                            0
-                            (lambda (x) x)
-                            (left (with-syntax ([current current]
-                                                [(parsed-args ...)
-                                                 (if (null? (syntax->list #'(args ...)))
-                                                   '()
-                                                   (list (parse #'(args ...))))])
-                                    #'(current parsed-args ...))))
-                  #;
-                  (error 'parse "function call")]
-                 #;
-                 [else (if (not current)
-                         (error 'what "don't know how to parse ~a" #'head)
-                         (values (left current) stream))]
-                 [else (error 'parser "don't know how to parse ~a" #'head)])])])])))
-
-  (emit-remark "Honu parse" input)
-  (define-values (parsed unparsed)
-                 (do-parse input 0 (lambda (x) x) #f))
-  (values ;; (parsed-syntax parsed)
-          parsed
-          unparsed))
-
-(define (empty-syntax? what)
-  (syntax-parse what
-    [() #t]
-    [else #f]))
-
-(provide parse-one)
-(define (parse-one code)
-  (parse (strip-stops code)))
-
-;; keep parsing some expression until only a parsed term remains
-(define (parse-all-expression code)
-  (define-values (parsed unparsed)
-                 (parse code))
-  (when (not (empty-syntax? unparsed))
-    (raise-syntax-error 'parse-all-expression "expected no more syntax" code))
-  (if (parsed-syntax? parsed)
-    parsed
-    (parse-all-expression parsed)))
-
-(define (parse-all code)
-  (let loop ([all '()]
-             [code code])
-    (define-values (parsed-original unparsed)
-                   (parse (strip-stops code)))
-    (define parsed (if (parsed-syntax? parsed-original)
-                     parsed-original
-                     (let-values ([(out rest) (parse parsed-original)])
-                       (when (not (empty-syntax? rest))
-                         (raise-syntax-error 'parse-all "expected no more syntax" parsed-original))
-                       out)))
-    (debug "Parsed ~a unparsed ~a all ~a\n"
-           (if parsed (syntax->datum parsed) parsed)
-           (if unparsed (syntax->datum unparsed) unparsed)
-           all)
-    (if (empty-syntax? unparsed)
-      (with-syntax ([(use ...) (reverse (if parsed
-                                          (cons parsed all)
-                                          all))])
-        (debug "Nothing left to parse. Use ~a\n" #'(use ...))
-        ;; If multiple things then wrap inside a begin
-        (syntax-parse #'(use ...)
-          [(x z y ...)
-           (emit-remark "Parsed all" #'(begin use ...))
-           (racket-syntax (begin use ...))]
-          [(x) (racket-syntax x)]))
-      (loop (cons parsed all)
-            unparsed))))
-
-(provide parsed-things)
-;; rest will be some subset of full
-(define (parsed-things full rest)
-  (define full-datum (syntax->datum full))
-  (define rest-datum (syntax->datum rest))
-  (- (length full-datum) (length rest-datum)))
-
-(provide honu-expression)
-(define-primitive-splicing-syntax-class (honu-expression)
-  #:attributes (result)
-  #:description "expression"
-  (lambda (stx fail)
-    (define context (gensym))
-    (debug "[~a] honu expression syntax class on ~a\n" context stx)
-    (if (or (stx-null? stx)
-            #;
-            (stopper? (stx-car stx)))
-      (begin
-        (debug "[~a] failed\n" context)
-        (fail))
-      (let ()
-        ;; probably dont need to use local-expand here, just marking the syntax
-        ;; ourselves is good enough
-        #;
-        (define out
-          (with-syntax ([(stx ...) stx])
-            ;; we have to trampoline to phase 0 because this is phase -1 code
-            (local-expand #'(letrec-syntax
-                              ([parse-more (lambda (stx*)
-                                             (syntax-case stx* ()
-                                               [(_ stuff (... ...))
-                                                (let ()
-                                                  (define-values (parsed unparsed)
-                                                                 (parse #'(stuff (... ...))))
-                                                  (with-syntax ([parsed parsed]
-                                                                [unparsed unparsed])
-                                                    #'(#%datum parsed unparsed))
-                                                  )
-                                                  ]))])
-                              (parse-more stx ...))
-                          'expression '())))
-        #;
-        (debug "Local expanded: ~a\n" (syntax->datum out))
-        ;; pull the values out of the local expansion
-        #;
-        (define-values (parsed unparsed)
-                       (syntax-case out ()
-                         [(letrec-values (ignore-syntaxes ...) 
-                                         (ignore-values ...)
-                                         (quote (parsed unparsed)))
-                          (values #'parsed #'unparsed)]))
-        (define mark (make-syntax-introducer))
-        ;; mark the syntax that is passed to `parse', then re-mark the parsed
-        ;; object that comes out and the unparsed object
-        (define-values (parsed unparsed)
-                       (call-with-values 
-                         (lambda ()
-                           (parse (mark stx)))
-                         (lambda (parsed unparsed)
-                           (values (mark parsed)
-                                   (mark unparsed)))))
-        (emit-remark "honu-expression class parsed" parsed)
-        (debug "[~a] expression parsed ~a. Parsed? ~a\n" context (if parsed (syntax->datum parsed) parsed) (parsed-syntax? parsed))
-        (debug 2 "[~a] Parsed things ~a\n" context (parsed-things stx unparsed))
-        (if (parsed-syntax? parsed)
-          (list (parsed-things stx unparsed)
-                parsed)
-          ;; if the parsed thing still needs to be parsed more it probably doesn't
-          ;; need to be remarked
-          (list (parsed-things stx unparsed)
-                (parse-all parsed)))))))
-
-(provide honu-expression-list)
-(define-splicing-syntax-class (honu-expression-list)
-  #:literal-sets (cruft)
-  [pattern (~seq (~seq each:honu-expression (~optional honu-comma)) ...)
-           #:with (each_result ...)
-           #'(each.result ...)
-           #;
-           (with-syntax ([(each ...) (add-between (syntax->list #'(each.result ...)) #'honu-comma)])
-             #'(each ...))
-           ])
-
-(provide honu-identifier)
-(define-splicing-syntax-class honu-identifier
-                              #:literal-sets (cruft)
-  [pattern (~and (~not semicolon)
-                 x:id) #:with result #'x])
-
-(provide honu-number)
-(define-splicing-syntax-class honu-number
-                              #:literal-sets (cruft)
-  [pattern x:number #:with result #'x])
-
-(provide honu-string)
-(define-splicing-syntax-class honu-string
-                              #:literal-sets (cruft)
-  [pattern x:str #:with result #'x])
-
-(provide identifier-comma-list)
-(define-splicing-syntax-class identifier-comma-list
-                              #:literal-sets (cruft)
-  [pattern (~seq (~seq name:id (~optional honu-comma) ...) ...)]) 
-
-(provide honu-expression/comma)
-(define-splicing-syntax-class honu-expression/comma
-  [pattern (~seq x ...) #:with (result ...) (parse-comma-expression #'(x ...))])
diff --git a/pkgs/honu/core/private/struct.rkt b/pkgs/honu/core/private/struct.rkt
deleted file mode 100644
index 7b30f82bdc..0000000000
--- a/pkgs/honu/core/private/struct.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/base
-
-(require "syntax.rkt"
-         "literals.rkt"
-         (for-syntax racket/base
-                     "parse2.rkt"
-                     "literals.rkt"
-                     "compile.rkt"
-                     syntax/parse
-                     racket/syntax
-                     unstable/syntax))
-
-(provide honu-struct honu-struct? honu-struct-get)
-(define-values (honu-struct honu-struct? honu-struct-get)
-               (make-struct-type-property 'honu-struct))
-
-(define-values (honu-struct-mutable honu-struct-mutable? honu-struct-mutate)
-               (make-struct-type-property 'honu-struct-mutable))
-
-(define-for-syntax (make-accessors name fields)
-  (for/list ([field fields])
-    (format-id name "~a-~a" name field)))
-
-(define-for-syntax (make-mutators name fields)
-  (for/list ([field fields])
-    (format-id name "set-~a-~a!" name field)))
-
-(provide honu-struct-set!)
-(define (honu-struct-set! instance name value)
-  ((honu-struct-mutate instance) instance name value))
-
-(provide honu-structure)
-(define-honu-syntax honu-structure
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ name:id (#%braces fields:identifier-comma-list) . rest)
-       (define out
-         (with-syntax ([(fields.name/accessor ...)
-                        (make-accessors #'name (syntax->list #'(fields.name ...)))]
-                       [(fields.name/mutator ...)
-                        (make-mutators #'name (syntax->list #'(fields.name ...)))])
-           (racket-syntax (struct name (fields.name ...)
-                              #:transparent
-                              #:mutable
-                              #:property honu-struct-mutable
-                                (lambda (instance name value)
-                                  (case name
-                                    [(fields.name) (fields.name/mutator instance value)]
-                                    ...
-                                    [else (error 'dot "no such field name ~a" name)]))
-                              #:property honu-struct (lambda (instance name)
-                                                       (case name
-                                                         [(fields.name) (fields.name/accessor instance)]
-                                                         ...
-                                                         [else (error 'dot "no such field name ~a" name)]))))))
-       (values out #'rest #t)])))
-
diff --git a/pkgs/honu/core/private/syntax.rkt b/pkgs/honu/core/private/syntax.rkt
deleted file mode 100644
index a296f73464..0000000000
--- a/pkgs/honu/core/private/syntax.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang racket/base
-
-(provide (all-defined-out))
-
-(require (for-syntax racket/base
-                     syntax/define
-                     "transformer.rkt"))
-
-#|
-(define honu-scheme-syntax 'honu-scheme-syntax)
-
-(define (raw-scheme? stx)
-  (syntax-property stx honu-scheme-syntax))
-
-(define (apply-scheme-syntax stx)
-  (syntax-property stx honu-scheme-syntax #t))
-|#
-
-(provide define-honu-syntax)
-(define-syntax (define-honu-syntax stx)
-  (let-values ([(id rhs) (normalize-definition stx #'lambda #f)])
-    (with-syntax ([id id]
-                  [rhs rhs])
-      (syntax/loc stx
-                 (define-syntax id (make-honu-transformer rhs))))))
-
-;; Do any honu-specific expansion here
-(require (for-syntax
-           "template.rkt" ;; for compress-dollars at phase 1
-           "compile.rkt"
-           "literals.rkt"
-           syntax/stx
-           syntax/parse)
-         "template.rkt") ;; for remove-repeats at phase 0
-(define-honu-syntax honu-syntax
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      #;
-      [(_ (#%parens single) . rest)
-       (define context #'single)
-       (define compressed (compress-dollars #'single))
-       (values
-         (with-syntax ([stuff* (datum->syntax context compressed context context)])
-           (phase1:racket-syntax #'stuff*))
-         #'rest
-         #f)]
-      [(_ (#%parens stuff ...) . rest)
-       (define context (stx-car #'(stuff ...)))
-       (define compressed (compress-dollars #'(stuff ...)))
-       (values
-         (with-syntax ([stuff* (datum->syntax context
-                                              (syntax->list compressed)
-                                              context context)])
-           ;; (debug "Stuff is ~a\n" (syntax->datum #'stuff*))
-           ;; (debug "Stuff syntaxed is ~a\n" (syntax->datum #'#'stuff*))
-
-           ;; stuff* will be expanded when this syntax is returned because
-           ;; the whole thing will be
-           ;;   (remove-repeats #'((repeat$ 1) (repeat$ 2)))
-           ;; so remove-repeats will be executed later
-           (racket-syntax
-             (remove-repeats #'stuff*))
-
-           #;
-           (with-syntax ([(out ...) #'stuff*])
-             (phase1:racket-syntax #'stuff*)))
-         #; #'(%racket-expression (parse-stuff stuff ...))
-         #'rest
-         #f)])))
diff --git a/pkgs/honu/core/private/template.rkt b/pkgs/honu/core/private/template.rkt
deleted file mode 100644
index c594bd830a..0000000000
--- a/pkgs/honu/core/private/template.rkt
+++ /dev/null
@@ -1,96 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         "literals.rkt"
-         "debug.rkt"
-         (for-syntax racket/base
-                     "debug.rkt"
-                     syntax/parse
-                     macro-debugger/emit
-                     ))
-
-(provide (all-defined-out))
-
-(define-syntax repeat$ (lambda (stx) (raise-syntax-error 'repeat$ "dont use this")))
-
-(define (remove-repeats input)
-  (debug 2 "Remove repeats from ~a\n" (syntax->datum input))
-  (debug 2 "Properties ~a\n" (syntax-property-symbol-keys input))
-  (define-literal-set locals (repeat$))
-  (syntax-parse input #:literal-sets ([locals #:at input])
-    [(out ... ((~literal repeat$) stuff ...) rest ...)
-     (debug 2 " Found a repeat\n")
-     (with-syntax ([(out* ...) (map remove-repeats (syntax->list #'(out ...)))]
-                   [(stuff* ...) (map remove-repeats (syntax->list #'(stuff ...)))]
-                   [(rest* ...) (map remove-repeats (syntax->list #'(rest ...)))])
-       (remove-repeats (datum->syntax input
-                                      (syntax->list #'(out* ... stuff* ... rest* ...))
-                                      input input)))]
-    [(normal ...) (with-syntax ([(normal* ...) (map remove-repeats (syntax->list #'(normal ...)))])
-                    (datum->syntax input
-                                   (syntax->list #'(normal* ...))
-                                   input input))]
-    [x #'x]
-    [else (raise-syntax-error 'repeats "unhandled case" input)]))
-
-(define-syntax (unexpand-honu-syntax stx)
-  (define (remove-repeats input)
-    (debug 2 "Remove repeats from ~a\n" (syntax->datum input))
-    (debug 2 "Properties ~a\n" (syntax-property-symbol-keys input))
-    (define-literal-set locals (repeat$))
-    (syntax-parse input #:literal-sets (locals)
-      [(out ... (repeat$ stuff ...) rest ...)
-       (debug 2 " Found a repeat\n")
-       (with-syntax ([(out* ...) (map remove-repeats (syntax->list #'(out ...)))]
-                     [(rest* ...) (map remove-repeats (syntax->list #'(rest ...)))])
-         (remove-repeats (datum->syntax input
-                                        (syntax->list #'(out* ... stuff ... rest* ...))
-                                        input input)))]
-      [(normal ...) (with-syntax ([(normal* ...) (map remove-repeats (syntax->list #'(normal ...)))])
-                      (datum->syntax input
-                                     (syntax->list #'(normal* ...))
-                                     input input))]
-      [x #'x]
-      [else (raise-syntax-error 'repeats "unhandled case" input)]))
-
-  (syntax-case stx ()
-    [(_ expr)
-     (begin
-       (debug "Expand honu syntax at phase ~a\n" (syntax-local-phase-level))
-       #;
-       (debug " Is ~a expanded ~a\n" (syntax->datum #'expr) (syntax->datum #'#'expr))
-       (emit-remark (format "Unexpand honu syntax at phase ~a" (syntax-local-phase-level))
-                    #'expr)
-       #;
-       (syntax-case #'expr ()
-         [(_ what) (debug "Properties on ~a are ~a\n" #'what (syntax-property-symbol-keys #'what))])
-       (define removed (remove-repeats #'expr))
-       (emit-local-step #'expr removed #:id #'unexpand-honu-syntax)
-       (debug "Cleansed ~a\n" (syntax->datum removed))
-       (debug "Syntax properties ~a\n" (syntax-property-symbol-keys removed))
-       removed)]))
-
-(define (compress-dollars stx)
-  (define-literal-set local-literals (honu-$ repeat$))
-  (define-splicing-syntax-class not-dollar
-                                #:literal-sets (local-literals)
-                                [pattern x #:when (or (not (identifier? #'x))
-                                                      (not (free-identifier=? #'honu-$ #'x)))
-                                         #:with out #'x])
-  (debug 2 "Compress dollars ~a\n" stx)
-  (syntax-parse stx #:literal-sets (local-literals)
-    [(honu-$ x:not-dollar ... honu-$ rest ...)
-     (debug 2 "Compressing ~a\n" #'(x.out ...))
-     (with-syntax ([(rest* ...) (compress-dollars #'(rest ...))]
-                   [(x.out* ...) (compress-dollars #'(x.out ...))])
-       (datum->syntax stx (syntax->list #'((repeat$ x.out* ...) rest* ...))
-                      stx stx))]
-    [(honu-$ rest ...)
-     (error 'compress-dollars "unmatched $ ~a" (syntax->datum stx))]
-    [(x rest ...)
-     (with-syntax ([x* (compress-dollars #'x)]
-                   [(rest* ...) (compress-dollars #'(rest ...))])
-       (datum->syntax stx
-                      (syntax->list #'(x* rest* ...))
-                      stx stx))]
-    [x #'x]))
diff --git a/pkgs/honu/core/private/transformer.rkt b/pkgs/honu/core/private/transformer.rkt
deleted file mode 100644
index 59a2c2d9e4..0000000000
--- a/pkgs/honu/core/private/transformer.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base))
-
-#;
-(provide (all-defined-out))
-
-(provide honu-transformer? make-honu-transformer)
-
-(define-values (prop:honu-transformer honu-transformer? honu-transformer-ref)
-               (make-struct-type-property 'honu-transformer))
-
-(define-values (struct:honu-trans make-honu-trans honu-trans? honu-trans-ref honu-trans-set!)
-               (make-struct-type 'honu-trans #f 1 0 #f 
-                                 (list (list prop:honu-transformer #t))
-                                 (current-inspector) 0))
-
-(define (make-honu-transformer proc)
-  (unless (and (procedure? proc)
-               (procedure-arity-includes? proc 1))
-    (raise-type-error
-      'define-honu-syntax
-      "procedure (arity 1)"
-      proc))
-  (make-honu-trans proc))
-
-(provide (rename-out [prop:honu-operator? honu-operator?])
-         make-honu-operator
-         (rename-out [-honu-operator-ref honu-operator-ref]))
-
-(define-values (prop:honu-operator prop:honu-operator? prop:honu-operator-ref)
-               (make-struct-type-property 'honu-operator))
-
-#;
-(provide honu-operator?)
-
-(define operator-fields '(precedence assocation binary unary postfix?))
-
-(define-values (struct:honu-operator -make-honu-operator honu-operator? -honu-operator-ref honu-operator-set!)
-               (make-struct-type 'honu-operator #f (length operator-fields) 0 #f 
-                                 (list (list prop:honu-operator #t))
-                                 (current-inspector)
-                                 0))
-
-(define (get n)
-  (lambda (operator)
-    (-honu-operator-ref operator n)))
-
-(provide operator-precedence operator-association
-         operator-binary-transformer operator-unary-transformer
-         operator-postfix?)
-
-(define operator-precedence (get 0))
-(define operator-association (get 1))
-(define operator-binary-transformer (get 2))
-(define operator-unary-transformer (get 3))
-(define operator-postfix? (get 4))
-
-(define (make-honu-operator precedence associativity binary unary postfix?)
-  (when (and (procedure? binary)
-             (not (procedure-arity-includes? binary 2)))
-    (raise-type-error
-      'define-honu-operator/syntax
-      "procedure (arity 2)"
-      binary))
-  (when (and (procedure? unary)
-             (not (procedure-arity-includes? unary 1)))
-    (raise-type-error
-      'define-honu-operator/syntax
-      "procedure (arity 1)"
-      unary))
-  (-make-honu-operator precedence associativity binary unary postfix?))
diff --git a/pkgs/honu/core/private/util.rkt b/pkgs/honu/core/private/util.rkt
deleted file mode 100644
index 2044c27d06..0000000000
--- a/pkgs/honu/core/private/util.rkt
+++ /dev/null
@@ -1,145 +0,0 @@
-#lang racket/base
-
-(provide (except-out (all-defined-out) test-delimiter))
-(require "debug.rkt"
-         racket/match
-         syntax/parse
-         syntax/parse/experimental/reflect
-         racket/set
-         (for-syntax racket/base
-                     racket/set
-                     syntax/parse
-                     "debug.rkt"
-                     )
-         syntax/stx
-         racket/list)
-
-
-(define (delim-identifier=? a b)
-  (eq? (syntax-e a) (syntax-e b)))
-
-(define extract-until
-  (case-lambda
-    [(r ids keep?)
-     (let loop ([r r][val-stxs null])
-       (cond
-         [(stx-null? r)
-          (values #f #f #f)]
-         [(and (identifier? (stx-car r))
-               (ormap (lambda (id)
-                        (delim-identifier=? id (stx-car r)))
-                      ids))
-          (values (reverse (if keep?
-                             (cons (stx-car r) val-stxs) 
-                             val-stxs))
-                  r
-                  (stx-car r))]
-         [else
-           (loop (stx-cdr r) (cons (stx-car r) val-stxs))]))]
-    [(r ids) (extract-until r ids #f)]))
-
-(define-syntax-rule (call-values values-producing function)
-  (call-with-values (lambda () values-producing) function))
-
-;; shortcut for treating arguments as syntax objects
-(define-syntax (syntax-lambda stx)
-  (syntax-case stx ()
-    [(_ (arg ...) body ...)
-     (with-syntax ([(temp ...) (generate-temporaries #'(arg ...))])
-       #'(lambda (temp ...)
-           (with-syntax ([arg temp] ...)
-             body ...)))]))
-
-;; removes the last element of a list
-(define (drop-last lst)
-  (take lst (sub1 (length lst))))
-
-(define (test-delimiter)
-  (let* ([original #'(a b c d e)]
-         [delimiter #'c]
-         [expected-before #'(a b)]
-         [expected-rest #'(c d e)]
-         [expected-delimiter #'c]
-         )
-    (let-values ([(before rest hit) (extract-until original (list delimiter))])
-      ;; is there a better way to test equality between two syntaxes?
-      (when (not (and (equal? (syntax->datum expected-before)
-                              (map syntax->datum before))
-                      (equal? (syntax->datum expected-rest)
-                              (map syntax->datum rest))
-                      (equal? (syntax->datum expected-delimiter)
-                              (syntax->datum hit))))
-        (debug "failure: original ~a until ~a\n" (syntax->datum original) (map syntax->datum (list delimiter)))
-        (debug " before expected ~a actual ~a\n" (syntax->datum expected-before) (map syntax->datum before))
-        (debug " rest expected ~a actual ~a\n" (syntax->datum expected-rest) (map syntax->datum rest))
-        (debug " delimiter expected ~a actual ~a\n" (syntax->datum expected-delimiter) (syntax->datum hit))
-        ))))
-
-;; better version of caddadadr-type functions
-(define-syntax (list-match stx)
-  (define (convert-pattern pattern)
-    (syntax-case pattern ()
-      [(x ...) (with-syntax ([(x* ...) (map convert-pattern (syntax->list #'(x ...)))])
-                 #'(list x* ...))]
-      [x #'x]))
-  (define (extract-variable pattern)
-    (define (non-wildcard-identifier? x)
-      (and (identifier? x)
-           (not (eq? (syntax-e x) '_))))
-    (syntax-case pattern ()
-      [(a x ...)
-       (if (non-wildcard-identifier? #'a)
-         #'a
-         (or (extract-variable #'a)
-             (extract-variable #'(x ...))))]
-      [x (if (non-wildcard-identifier? #'x)
-           #'x
-           #f)]))
-  (syntax-case stx ()
-    [(_ pattern expression)
-     (with-syntax ([match-pattern (convert-pattern #'pattern)]
-                   [match-variable (extract-variable #'pattern)])
-       #'(match expression
-           [match-pattern match-variable]))]))
-
-;; local-binding and module-binding check that the identifier is bound at the given phase
-(define-syntax (local-binding stx)
-  (syntax-parse stx
-    [(_ name)
-     (define type (identifier-binding #'name))
-     (when (not (eq? type 'lexical))
-       (raise-syntax-error 'local-binding "not bound locally" #'name))
-     #'#'name]))
-
-(define-syntax (module-binding stx)
-  (syntax-parse stx
-    [(_ name level)
-     (define type (identifier-binding #'name (syntax-e #'level)))
-     (when (not (and (list? type)
-                     (= (length type) 7)))
-       (raise-syntax-error 'module-binding
-                           (format "not bound by a module at phase ~a" (syntax-e #'level))
-                           #'name))
-     #'#'name]))
-
-(define-syntax-rule (literal-syntax-class literal)
-  (let ()
-    (define-literal-set set (literal))
-    (define-syntax-class class
-      ;; The problem is that 'literal' is unmarked but 'set' is marked.
-      ;; The #:literal-sets option is kind of like a binding form: only identifiers
-      ;; having the same marks are treated as literals.
-      ;; The fix is
-      ;;   #:literal-sets ([set #:at literal])
-      ;; which means treat any identifier whose name is listed in 'set' and whose lexical context matches 'literal' as a literal.
-      ;; - Ryan
-      #:literal-sets ([set #:at literal])
-      [pattern literal])
-    (reify-syntax-class class)))
-
-(define-syntax (for/union stx)
-  (syntax-case stx ()
-    [(_ clauses . body)
-     #'(for/fold/derived stx ([accum-set (set)])
-                         clauses
-                         (set-union accum-set (let () . body)))]))
diff --git a/pkgs/honu/core/private/utils.rkt b/pkgs/honu/core/private/utils.rkt
deleted file mode 100644
index 1ec7e1f329..0000000000
--- a/pkgs/honu/core/private/utils.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         "literals.rkt")
-
-(provide (all-defined-out))
-
-(define (strip-stops code)
-  (define-syntax-class stopper #:literal-sets (cruft)
-    #;
-    [pattern semicolon]
-    [pattern honu-comma]
-    [pattern colon])
-  #;
-  (syntax-parse code
-    [(x:stopper rest ...) (strip-stops #'(rest ...))]
-    [else code])
-  code
-  )
diff --git a/pkgs/honu/core/read.rkt b/pkgs/honu/core/read.rkt
deleted file mode 100644
index a0329683e9..0000000000
--- a/pkgs/honu/core/read.rkt
+++ /dev/null
@@ -1,509 +0,0 @@
-#lang racket/base
-
-;; This module implements read related functions such as `read', `read-syntax',
-;; and a colored lexer for drracket
-
-(require rackunit)
-(require parser-tools/lex
-         (prefix-in : parser-tools/lex-sre))
-(require racket/match
-         (for-syntax racket/base
-                     syntax/parse))
-
-(require "private/debug.rkt")
-
-(define-tokens honu-tokens (number identifier string))
-
-(define-empty-tokens honu-empty-tokens
-                     [eof fail whitespace
-                      left-parens right-parens
-                      parse-error
-                      left-bracket right-bracket
-                      left-brace right-brace
-                      semicolon
-                      block-comment
-                      end-of-line-comment])
-
-(define-lex-abbrev digit (:/ #\0 #\9))
-(define-lex-abbrev identifier-first-character (:or (:/ #\a #\z)
-                                                   (:/ #\A #\Z)
-                                                   "_" "?"))
-(define-lex-abbrev identifier-character (:or identifier-first-character
-                                             digit))
-(define-lex-abbrev identifier (:: identifier-first-character
-                                  (:* identifier-character)))
-(define-lex-abbrev number (:: (:+ digit) (:? (:: "." (:+ digit)))))
-(define-lex-abbrev string-character (:or (:: #\\ any-char)
-                                         (:~ #\")))
-(define-lex-abbrev string (:: #\" (:* string-character) #\"))
-(define-lex-abbrev operator (:or "+=" "-=" "*=" "/="
-                                 "+" "!=" "=>" "=" "==" "*" "/" "-" "^" "||" "|" "&&" "<="
-                                 ">=" "<-" "<" ">" "!" "::" ":=" "%"))
-(define-lex-abbrev block-comment (:: "/*"
-                                     (complement (:: any-string "*/" any-string))
-                                     "*/"))
-
-(define-lex-abbrev line-comment (:: (:or "#" "//")
-                                    (:* (:~ "\n"))
-                                    ;; we might hit eof before a \n
-                                    (:? "\n" "\r")))
-
-(define (replace-escapes string)
-  (define replacements '([#px"\\\\n" "\n"]
-                         [#px"\\\\t" "\t"]))
-  (for/fold ([string string])
-            ([replace replacements])
-    (define pattern (car replace))
-    (define with (cadr replace))
-    (regexp-replace* pattern string with)))
-
-(provide honu-lexer)
-(define honu-lexer
-  (lexer-src-pos
-    [(eof) (token-eof)]
-    #;
-    [line-comment (token-whitespace)]
-    [(:or "#" "//") (token-end-of-line-comment)]
-    [(:? "\n" "\r") (token-whitespace)]
-    [number (token-number (string->number lexeme))]
-    #;
-    [block-comment (token-whitespace)]
-    ["/*" (token-block-comment)]
-    ["..." (token-identifier '...)]
-    ["." (token-identifier '%dot)]
-    ["$" (token-identifier 'honu-$)]
-    ["," (token-identifier 'honu-comma)]
-    [":" (token-identifier '%colon)]
-    ["'" (token-identifier 'quote)]
-    ["`" (token-identifier 'quasiquote)]
-    ["->" (token-identifier '%arrow)]
-    [operator (token-identifier (string->symbol lexeme))]
-    [";" (token-semicolon)]
-    ;; strip the quotes from the resulting string
-    ;; TODO: find a more optimal way
-    [string (let ()
-              (define raw (substring (substring lexeme 1)
-                                     0 (- (string-length lexeme) 2)))
-              (token-string (replace-escapes raw)))]
-    ["(" (token-left-parens)]  [")" (token-right-parens)]
-    ["[" (token-left-bracket)] ["]" (token-right-bracket)]
-    ["{" (token-left-brace)]   ["}" (token-right-brace)]
-    [identifier (token-identifier (string->symbol lexeme))]
-    [(union " " "\t") (token-whitespace)]
-    [any-char (token-parse-error)]))
-
-(define-syntax (define-token? stx)
-  (syntax-parse stx
-    [(_ name)
-     (define name? (datum->syntax #'name (string->symbol
-                                           (format "token-~a?"
-                                                 (symbol->string
-                                                   (syntax->datum #'name))))
-                                  #'name))
-     (with-syntax ([name? name?])
-       #'(begin
-           (provide name?)
-           (define (name? token)
-             (equal? 'name (token-name token)))))]))
-
-(define-syntax-rule (define-tokens? name ...)
-                    (begin
-                      (define-token? name) ...))
-
-(define-tokens? eof whitespace end-of-line-comment number string
-                block-comment parse-error
-                identifier left-parens right-parens
-                left-bracket right-bracket
-                left-brace right-brace
-                semicolon)
-
-;; returns #t if an entire comment was read (with an ending newline)
-(define (read-until-end-of-line input)
-  (define (finish? what)
-    (or (eof-object? what)
-        (= (char->integer #\newline) what)))
-  ;; #t if read a #\newline, otherwise #f
-  (define (clean-end? what)
-    (if (eof-object? what)
-      #f
-      (= (char->integer #\newline) what)))
-  (let loop ()
-    (define what (read-byte input))
-    (if (not (finish? what))
-      (loop)
-      (clean-end? what))))
-
-;; returns #t if an entire block comment was read
-(define (read-block-comment port)
-  (define comment-lexer
-    (lexer
-      ["/*" 'nest]
-      ["*/" 'done]
-      [(eof) eof]
-      [any-char 'continue]))
-
-  (define (finish? what)
-    (or (eq? 'done what)
-        (eof-object? what)))
-
-  (let loop ([nesting 1])
-    (define what (comment-lexer port))
-    (cond
-      [(eq? what 'nest) (loop (add1 nesting))]
-      [(eq? what 'done) (if (> nesting 1)
-                          (loop (sub1 nesting))
-                          #t)]
-      [(eof-object? what) #f]
-      [else (loop nesting)])))
-
-;; read characters from a port and return a stream of tokens
-(define (read-tokens port)
-  (let loop ([tokens '()])
-    (define next (honu-lexer port))
-    ;; (debug "next token ~a\n" next)
-    (match next
-      [(struct* position-token ([token (? token-eof?)] [start-pos start] [end-pos end]))
-       ; (printf "done lexing ~a\n" tokens)
-       (reverse tokens)]
-      [(struct* position-token ([token (? token-end-of-line-comment?)]
-                                 [start-pos start]
-                                 [end-pos end]))
-       (read-until-end-of-line port)
-       (loop tokens)]
-       [(struct* position-token ([token (? token-block-comment?)]
-                                 [start-pos start]
-                                 [end-pos end]))
-        (read-block-comment port)
-        (loop tokens)]
-       [(struct* position-token ([token (? token-whitespace?)] [start-pos start] [end-pos end]))
-        (loop tokens)]
-       [else (loop (cons next tokens))]
-       #;
-       [(position-token token start end)
-        ;; (printf "next is ~a eof? ~a\n" token (token-eof? token))
-        (loop (cons token tokens))])))
-
-;; symbols that can be used for colors
-;;   symbol
-;;   keyword
-;;   comment
-;;   string
-;;   constant
-;;   parenthesis
-;;   error
-;;   other
-(define (honu-name->color token-name)
-  ;; (printf "Get honu color for ~a\n" token-name)
-  (case token-name
-    [(number) 'constant]
-    [(string) 'string]
-    [(parens) 'parenthesis]
-    [(identifier) 'symbol]
-    [else 'other]))
-
-;; implements a lexer that the colorer in drracket expects
-;; FIXME: color comments
-(provide color-lexer)
-(define (color-lexer port offset mode)
-  ;; (printf "Parse at token ~a mode is ~a\n" offset mode)
-  (define lexeme (honu-lexer port))
-  (define need-backup (if mode mode 0))
-  (match lexeme
-    [(position-token token start end)
-     ;; (printf "Lexed ~a\n" token)
-     (define (encloser kind)
-       (values token 'parenthesis kind
-               (position-offset start)
-               (position-offset end)
-               need-backup mode))
-
-     ;; (printf "Get token for at ~a\n" (position-offset start))
-     (cond
-       [(token-eof? token)
-        (values eof 'eof #f
-                (position-offset start)
-                (position-offset end)
-                need-backup mode)]
-       [(token-parse-error? token)
-        (define backup (if mode (add1 mode) 1))
-        (values token 
-                'error
-                #f
-                (position-offset start)
-                (position-offset end)
-                backup backup)]
-       [(token-end-of-line-comment? token)
-        (read-until-end-of-line port)
-        (define-values (line column position) (port-next-location port))
-        (values #f 'comment #f
-                (position-offset start)
-                position
-                need-backup need-backup)]
-       [(token-block-comment? token)
-        (read-block-comment port)
-        (define-values (line column position) (port-next-location port))
-        (values #f 'comment #f
-                (position-offset start)
-                position
-                need-backup need-backup)]
-       [(token-left-parens? token)  (encloser '|(|)]
-       [(token-right-parens? token) (encloser '|)|)]
-       [(token-left-bracket? token) (encloser '|[|)]
-       [(token-right-bracket? token)(encloser '|]|)]
-       [(token-left-brace? token)   (encloser '|{|)]
-       [(token-right-brace? token)  (encloser '|}|)]
-       [else (values (format "~a" (token-value token))
-                     (honu-name->color (token-name token))
-                     #f
-                     (position-offset start)
-                     (position-offset end)
-                     need-backup mode)])]))
-
-;; convert a string to a stream of tokens
-(define (lex-string input)
-  (read-tokens (open-input-string input)))
-
-;; make a syntax object out of some symbol and a position-token
-(define (make-syntax datum token source)
-  (match token
-    [(position-token token start end)
-     (datum->syntax #f datum
-                    (list source (position-line start)
-                          (position-col start)
-                          (position-offset start)
-                          (- (position-offset end)
-                             (position-offset start))))]))
-
-(define (make-syntax-from-token token source)
-  (match token
-    [(position-token datum start end)
-     (make-syntax (token-value datum) token source)])) 
-
-;; converts a stream of tokens to a tree
-(define (parse source tokens)
-  (define (is-first-token what? tokens)
-    (match tokens
-      [(list (position-token token start end) rest ...)
-       (what? token)]
-      [else #f]))
-
-  (define (do-atom current tokens table)
-    (do-parse (cons (make-syntax-from-token (car tokens) source) current)
-              (cdr tokens)
-              table))
-  (define (atom? tokens)
-    (is-first-token (lambda (token)
-                      (or (token-identifier? token)
-                          (token-string? token)
-                          (token-number? token)))
-                    tokens))
-
-  (define (do-empty current tokens table)
-    (reverse current))
-
-  (define (contains-semicolon? syntax)
-    (syntax-case syntax (%semicolon #%braces #%parens)
-      [(%semicolon x ...) #t]
-      [#%braces #t]
-      [(#%braces x ...) #t]
-      #;
-      [(#%parens x ...) #t]
-      [else #f]))
-
-  ;; wraps syntax objects with (%semicolon ...)
-  ;; it will search backwards through the list of already created syntax objects
-  ;; until it either runs out of syntax objects or finds one already wrapped with
-  ;; (%semicolon ...)
-  ;; 
-  ;; if the original input is '1 + 2; 3 + 4;' this will get read as
-  ;;   (1 + 2 %semicolon 3 + 4 %semicolon)
-  ;; then parsing will start from the front. when %semicolon is reached we will have
-  ;; the following (current is always backwards).
-  ;;   current: (2 + 1)
-  ;; do-semicolon will search this for a syntax object containing (%semicolon ...) but
-  ;; since one doesn't appear the entire expression will be reversed and wrapped thus
-  ;; resulting in
-  ;;   (%semicolon 1 + 2)
-  ;;
-  ;; Now parsing continues with (3 + 4 %semicolon). When the next %semicolon is hit we
-  ;; will have
-  ;;   current: (4 + 3 (%semicolon 1 + 2))
-  ;;
-  ;; So do-semicolon will find (%semicolon 1 + 2) and leave stop processing there,
-  ;; resulting in
-  ;;   ((%semicolon 3 + 4) (%semicolon 1 + 2))
-  ;;
-  ;; The entire list will be reversed at the end of parsing.
-  (define (do-semicolon current tokens table)
-    ;; (debug "Do semicolon on ~a\n" current)
-    (define-values (wrap ok)
-                   (let loop ([found '()]
-                              [rest current])
-                     (match rest
-                       [(list) (values found rest)]
-                       [(list (and (? contains-semicolon?) head) rest* ...)
-                        (values found rest)]
-                       [(list head rest ...)
-                        (loop (cons head found) rest)])))
-    (define semicolon (make-syntax `(%semicolon ,@wrap)
-                                   ;; FIXME: this is probably the wrong token
-                                   ;; to get source location from
-                                   (car tokens)
-                                   source))
-
-
-    (do-parse (cons semicolon ok)
-              (cdr tokens)
-              table))
-
-  (define (do-semicolon2 current tokens table)
-    (do-parse (cons (make-syntax '%semicolon (car tokens) source) current)
-              (cdr tokens)
-              table))
-  
-  (define (do-continue current tokens table)
-    (do-parse current (cdr tokens) table))
-
-  (define (parse-error? tokens)
-    (is-first-token token-parse-error? tokens))
-
-  (define (semicolon? tokens)
-    (is-first-token token-semicolon? tokens))
-  
-  (define (left-parens? tokens)
-    (is-first-token token-left-parens? tokens))
-  (define (right-parens? tokens)
-    (is-first-token token-right-parens? tokens))
-  (define (left-bracket? tokens)
-    (is-first-token token-left-bracket? tokens))
-  (define (right-bracket? tokens)
-    (is-first-token token-right-bracket? tokens))
-  (define (left-brace? tokens)
-    (is-first-token token-left-brace? tokens))
-  (define (right-brace? tokens)
-    (is-first-token token-right-brace? tokens))
-
-  (define (do-end-encloser current tokens table)
-    (values (reverse current) (cdr tokens)))
-
-  (define (add-dispatch-rule table rule)
-    (cons rule table))
-  (define ((do-fail kind) current tokens table)
-    (define line (syntax-line (car current)))
-    (define column (add1 (+ (syntax-span (car current))
-                            (syntax-column (car current)))))
-    (error 'parse "expected a ~a character at line ~a column ~a" kind line column))
-  ;; add a rule to the dispatch table to expect an ending token then
-  ;; parse the sub-tree and continue
-  (define (make-encloser head failure-name next)
-    (lambda (current tokens table)
-      (define added (add-dispatch-rule
-                      (add-dispatch-rule dispatch-table [list next do-end-encloser])
-                      [list null? (do-fail failure-name)]))
-      (define-values (sub-tree unparsed)
-                     (do-parse (list (make-syntax head (car tokens) source))
-                               (cdr tokens) added))
-      (do-parse (cons sub-tree current) unparsed table)))
-
-  (define do-left-parens (make-encloser '#%parens ")" right-parens?))
-  (define do-left-bracket (make-encloser '#%brackets "}" right-bracket?))
-  (define do-left-brace (make-encloser '#%braces "]" right-brace?))
-  
-  (define dispatch-table (list [list semicolon? do-semicolon]
-                               [list atom? do-atom]
-                               [list left-parens? do-left-parens]
-                               [list left-bracket? do-left-bracket]
-                               [list left-brace? do-left-brace]
-                               [list parse-error? do-continue]
-                               [list null? do-empty]))
-
-  (define (do-parse current tokens table)
-    (define (fail tokens)
-      (if (null? tokens)
-        (error 'read "error while reading")
-        (let ([first (car tokens)])
-          ;; hack to get the current failure behavior
-          (do-parse current '() table)
-          (define line (position-line (position-token-start-pos first)))
-          (define column (position-col (position-token-start-pos first)))
-          (error 'parse "error while parsing on line ~a column ~a" line column))))
-    ;; (printf "do parse ~a [tokens] ~a table ~a\n" (strip current) (strip tokens) table)
-    (let loop ([use table])
-      ;; (printf "Check ~a on ~a null? ~a\n" use (map position-token-token tokens) (null? tokens))
-      (cond
-        [(null? use) (fail tokens)]
-        [(let ([dispatcher (caar use)])
-           (dispatcher tokens))
-         (define action (cadar use))
-         (action current tokens table)]
-        [else (loop (cdr use))])))
-
-  (debug 3 "Parsing tokens ~a\n" (map position-token-token tokens))
-  (if (null? tokens)
-    (datum->syntax #f '() #f)
-    (datum->syntax #f (do-parse '() tokens dispatch-table)
-                   #f)))
-
-;; strip the source location from the position tokens
-(define (strip tokens)
-  (for/list ([token tokens])
-    (match token
-      [(position-token token start end) token]
-      [else token])))
-
-(provide honu-read-syntax)
-(define (honu-read-syntax [name #f] [port (current-input-port)])
-  (parse name (read-tokens port)))
-
-(provide honu-read)
-(define (honu-read [port (current-input-port)])
-  (syntax->datum (honu-read-syntax #f port)))
-
-(define (count-lines port)
-  (port-count-lines! port)
-  port)
-
-#;
-(test-case
-  "Basic tests"
-  (check-equal? (strip (lex-string "5"))
-                (list (token-number 5)))
-  (check-equal? (strip (lex-string "5 8"))
-                (list (token-number 5) (token-number 8)))
-  (check-equal? (strip (lex-string "hello"))
-                (list (token-identifier 'hello)))
-  (check-equal? (strip (lex-string "()"))
-                (list (token-left-parens)
-                      (token-right-parens)))
-  (check-equal? (strip (lex-string "()[]{}"))
-                (list (token-left-parens)
-                      (token-right-parens)
-                      (token-left-bracket)
-                      (token-right-bracket)
-                      (token-left-brace)
-                      (token-right-brace)))
-  (check-equal? (strip (lex-string "foo // 5"))
-                (list (token-identifier 'foo)))
-  (check-equal? (strip (lex-string "foo // 5
-                            bar"))
-                (list (token-identifier 'foo)
-                      (token-identifier 'bar)))
-  (check-equal? (strip (lex-string "f(2)"))
-                (list (token-identifier 'f)
-                      (token-left-parens)
-                      (token-number 2)
-                      (token-right-parens)))
-  (check-equal? (strip (lex-string "8 /* aosidfjasdf329023 */ 5"))
-                (list (token-number 8)
-                      (token-number 5)))
-  (check-equal? (strip (lex-string "\"hello\""))
-                (list (token-string "hello")))
-  ;; FIXME: how can we write a string with an escaped character in it?
-  #;
-  (check-equal? (strip (lex-string "\"hel\\\\\"lo\""))
-                (list (token-string "hel\"lo")))
-  (check-equal? (honu-read (open-input-string "f(5)"))
-                '(f (#%parens 5)))
-  (check-exn exn:fail? (lambda ()
-                         (honu-read (count-lines (open-input-string "({)}")))))
-  )
diff --git a/pkgs/honu/core/runtime.rkt b/pkgs/honu/core/runtime.rkt
deleted file mode 100644
index e1423dd709..0000000000
--- a/pkgs/honu/core/runtime.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-
-(require "read.rkt"
-         "private/honu-typed-scheme.rkt"
-         racket/port)
-
-;; at the repl, honu will only read a single line at a time regardless
-;; of how many expressions it contains
-(define (read-one-line name input)
-  (define quit? #f)
-  (define one-line
-    (with-output-to-string
-      (lambda ()
-        (let loop ()
-          (define next (read-char input))
-          (when (eof-object? next)
-            (set! quit? #t))
-          (when (not (or (eof-object? next)
-                         (char=? next #\newline)))
-            (display next)
-            (loop))))))
-  (if quit?
-    eof
-    (honu-read-syntax name (open-input-string one-line))))
-
-(provide configure)
-(define (configure . args)
-  (current-read-interaction read-one-line))
diff --git a/pkgs/honu/debug.rkt b/pkgs/honu/debug.rkt
deleted file mode 100644
index 66226833a5..0000000000
--- a/pkgs/honu/debug.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-
-(require "core/read.rkt"
-         racket/pretty
-         racket/cmdline)
-
-;; Helpful debug things for Honu
-;;  * read a Honu program and view its structure as an s-expression (before enforestation)
-
-(define (read-file file)
-  (printf "Read file ~a\n" file)
-  (pretty-print (with-input-from-file file
-                                      (lambda () (honu-read)))))
-
-(define (do-parse-command-line)
-  (command-line
-    #:program "debug"
-    #:args files
-    files))
-
-(for ([file (do-parse-command-line)])
-  (read-file file))
diff --git a/pkgs/honu/info.rkt b/pkgs/honu/info.rkt
deleted file mode 100644
index db4e9a33c2..0000000000
--- a/pkgs/honu/info.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang info
-
-(define collection "honu")
-(define deps '("scheme-lib"
-               "macro-debugger"
-               "base"
-               "parser-tools-lib"
-               "rackunit-lib"))
-(define build-deps '("racket-index"
-                     "scribble-lib"
-                     "at-exp-lib"
-                     "sandbox-lib"
-                     "racket-doc"))
-
-;; Make honu.vim easier to find by copying it to the "share" directory:
-(define copy-shared-files '("contrib/honu.vim"))
-
-(define pkg-desc "The implementation of the Honu language")
-
-(define pkg-authors '(mflatt rafkind))
diff --git a/pkgs/honu/lang/reader.rkt b/pkgs/honu/lang/reader.rkt
deleted file mode 100644
index ed19d2233a..0000000000
--- a/pkgs/honu/lang/reader.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang s-exp syntax/module-reader
-
-honu
-
-#:read honu-read
-#:read-syntax honu-read-syntax
-#:whole-body-readers? #t
-#:info honu-info
-#:language-info #(honu/core/language honu-language-info #f)
-
-(require "../core/read.rkt"
-         "../core/language.rkt")
diff --git a/pkgs/honu/main.rkt b/pkgs/honu/main.rkt
deleted file mode 100644
index 57fdd0be9c..0000000000
--- a/pkgs/honu/main.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang honu/private
-
-(require (prefix-in racket: (combine-in racket/base racket/list racket/file)))
-
-;; require's and provide's a module
-(define-syntax-rule (provide-module module ...)
-  (begin
-    (begin
-      (racket:require module)
-      (racket:provide [all-from-out module]))
-    ...))
-
-(provide-module "core/main.rkt"
-                "private/common.rkt"
-                "private/common.honu"
-                ;;"private/struct.honu"
-                ;;"private/function.honu"
-                )
-
-(racket:provide sqr sqrt sin max min
-         number? symbol?
-         null
-         null?
-         length
-         substring
-         format
-         integer
-         cos sin
-         random
-         filter
-         append
-         values
-         hash
-         regexp
-         error
-         (racket:rename-out
-           [honu-cond cond]
-           [honu-time time]
-           [time-apply time_apply]
-           [null empty]
-           [make-hash mutable_hash]
-           [hash-set! hash_update]
-           [hash-ref hash_lookup]
-           [current-inexact-milliseconds currentMilliseconds]
-           [string-length string_length]
-           [string-append string_append]
-           [current-command-line-arguments commandLineArguments]
-           [racket:find-files find_files]
-           [racket:empty? empty?]
-           [regexp-match regexp_match]
-           [racket:rest rest]))
diff --git a/pkgs/honu/private/common.honu b/pkgs/honu/private/common.honu
deleted file mode 100644
index 0a62ee1579..0000000000
--- a/pkgs/honu/private/common.honu
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang honu/core
-
-provide when;
-macro when (){ (condition:expression) body:expression }{
-  syntax(if (condition) body else { })
-}
-
-/*
-require (forSyntax "with.honu");
-require (forSyntax "function.honu");
-require (forSyntax "patterns.honu");
-require "keywords.honu";
-
-provide print;
-provide then;
-
-macro print ()
-{ _ (value:expression); } { syntax(display(value_result); newline();); }
-{ _ value:expression_comma ... ; } { syntax({display(value_result);} ... newline()); }
-
-provide check_expect;
-provide expect;
-keywords expect;
-macro check_expect (expect) { _ check:expression expect expected:expression ; }
-{ 
-  withSyntax [check_raw syntax_to_string(syntax(check);)]{
-   syntax({checked = check_result;
-           out = expected_result;
-           if (checked != out){
-             // print "Expected ", out, " but got ", checked, " (", check_raw, ")";
-             print "Expected ", out, " but got ", checked, " (", check_raw, ")";
-           }});
-   };
-}
-
-provide condition;
-macro condition (){ _ clause:condition_clause rest ... ;}
-{ syntax(if (clause_condition_result) {
-           clause_out_result
-         } else {
-           condition rest ... ;
-         }
-         ); }
-{ _ ; } { syntax(1;); }
-*/
diff --git a/pkgs/honu/private/common.rkt b/pkgs/honu/private/common.rkt
deleted file mode 100644
index 789b352786..0000000000
--- a/pkgs/honu/private/common.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket/base
-
-(require honu/core/private/syntax
-         honu/core/private/literals
-         (for-syntax syntax/parse
-                     honu/core/private/debug
-                     racket/base
-                     honu/core/private/literals
-                     honu/core/private/compile
-                     honu/core/private/parse2))
-
-(provide sqr)
-(define (sqr x) (* x x))
-
-;; convert a float to an integer
-(provide integer)
-(define (integer x)
-  (inexact->exact (round x)))
-
-(provide honu-cond)
-(define-honu-syntax honu-cond
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ (~seq clause:honu-expression colon body:honu-expression (~optional honu-comma)) ...
-          . rest)
-       (values
-         (racket-syntax (cond
-                          [clause.result body.result]
-                          ...))
-         #'rest
-         #t)])))
-
-(provide honu-time)
-(define-honu-syntax honu-time
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft)
-      [(_ e:honu-expression . rest)
-       (values (racket-syntax (time e.result))
-               #'rest
-               #'t)])))
diff --git a/pkgs/honu/private/function.honu b/pkgs/honu/private/function.honu
deleted file mode 100644
index ee768e0249..0000000000
--- a/pkgs/honu/private/function.honu
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang honu/core
-
-provide function;
-macro function ()
-  { _ name:identifier (args:identifier , ...) { body ... } }
-  { #sx scheme:syntax #sx(define (name_result args_result ...)
-                         (honu-unparsed-begin body ...)) }
-  { _ (args:identifier , ...) { body ... }}
-  { #sx scheme:syntax #sx(lambda (args_result ...) (honu-unparsed-begin body ...)) }
diff --git a/pkgs/honu/private/keywords.honu b/pkgs/honu/private/keywords.honu
deleted file mode 100644
index 8c2faa4a73..0000000000
--- a/pkgs/honu/private/keywords.honu
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang honu/core
-
-provide then;
-keywords then;
diff --git a/pkgs/honu/private/lang/reader.rkt b/pkgs/honu/private/lang/reader.rkt
deleted file mode 100644
index 53b832e2c5..0000000000
--- a/pkgs/honu/private/lang/reader.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang s-exp syntax/module-reader
-
-honu/private/main
-
-;;#:read honu-read
-;;#:read-syntax honu-read-syntax
-;;#:whole-body-readers? #t
-#:language-info #(honu/core/language honu-language-info #f)
-; #:language-info #(honu/core/runtime configure 'dont-care)
-
-(require honu/core/read
-         honu/core/language)
diff --git a/pkgs/honu/private/main.rkt b/pkgs/honu/private/main.rkt
deleted file mode 100644
index 8694e2e130..0000000000
--- a/pkgs/honu/private/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require racket/base)
-(provide (all-from-out racket/base))
diff --git a/pkgs/honu/private/patterns.honu b/pkgs/honu/private/patterns.honu
deleted file mode 100644
index 9f0e192cb5..0000000000
--- a/pkgs/honu/private/patterns.honu
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang honu/core
-
-require (forTemplate "keywords.honu");
-
-provide condition_clause;
-
-pattern condition_clause literals (then) (condition_result out_result) [condition:expression then out:expression_comma];
diff --git a/pkgs/honu/private/struct-patterns.honu b/pkgs/honu/private/struct-patterns.honu
deleted file mode 100644
index 594643a1a3..0000000000
--- a/pkgs/honu/private/struct-patterns.honu
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang honu/core
-
-provide structField;
-
-pattern structField (name_result) [name:identifier];
diff --git a/pkgs/honu/private/struct.honu b/pkgs/honu/private/struct.honu
deleted file mode 100644
index c75eb5a050..0000000000
--- a/pkgs/honu/private/struct.honu
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang honu/core
-
-require (forSyntax "struct-patterns.honu");
-
-provide struct;
-macro struct () {
-  _ name {field:structField, ...} ;
-} {
-  schemeSyntax#sx(honu-struct name (field_name_result ...))
-}
diff --git a/pkgs/honu/private/with.honu b/pkgs/honu/private/with.honu
deleted file mode 100644
index 9a16643662..0000000000
--- a/pkgs/honu/private/with.honu
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang honu/core
-
-provide withSyntax;
-
-macro withSyntax () {
- [variable expr:expression] { b ... /* body:statement */ }; } {
-  primitiveWithSyntax [variable_result (datumToSyntax (syntax expr)
-                                                      expr_result
-                                                      (syntax expr)
-                                                      (syntax expr))]
-          syntax(b ...)
-
-          /*
-  #sx scheme:syntax #sx
-  (with-syntax ([variable_result (datum->syntax (real-syntax expr) expr_result
-                                                (real-syntax expr)
-                                                (real-syntax expr))])
-    (honu-unparsed-begin b ...))
-    */
-}
-  
-// applySchemeSyntax(#sx(real-syntax (with-syntax ([variable_result expr_result]) (honu-unparsed-begin b ...))))
diff --git a/pkgs/honu/scribblings/honu.scrbl b/pkgs/honu/scribblings/honu.scrbl
deleted file mode 100644
index a02d924c1f..0000000000
--- a/pkgs/honu/scribblings/honu.scrbl
+++ /dev/null
@@ -1,280 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/bnf
-          honu/core/read
-          (for-label honu/core/read))
-
-@(define lcomma (litchar ", "))
-
-@title{Honu}
-
-@defterm{Honu} is a language with Java-like syntax built on top of Racket.
-Honu's main goal is to support syntactic abstraction mechanisms similar to
-Racket. Currently, Honu is a prototype and may change without notice.
-
-@defmodulelang[honu]
-
-@table-of-contents[]
-
-@; ----------------------------------------------------------------------
-
-@section{Get started}
-To use Honu in a module, write the following line at the top of the file.
-
-@racketmod[honu]
-
-You can use Honu at the REPL on the command line by invoking racket like so
-@verbatim{
-racket -Iq honu
-}
-
-@section{Reader}
-
-@subsection{Tokens}
-The Honu reader, @racket[honu-read], will tokenize the input stream according to
-the following regular expressions.
-
-@itemize[
-  @item{Identifiers are [a-zA-Z_?][a-zA-Z_?0-9]*}
-  @item{Strings are "[^"]*"}
-  @item{Numbers are \d+(\.\d+)?}
-  @item{And the following tokens + = * / - ^ || | && <= >= <- < > !
-  :: := : ; ` ' . ,  ( ) { } [ ]}
-]
-
-Comments can be written for a single line or in block form. Use @bold{#} or
-@bold{//} for a line comment and @bold{/* */} for block comments. Block comments
-can be nested.
-
-@verbatim{
-# i am a comment
-// i am also a comment
-/* start of a comment /* with an inner comment */ end of first comment */
-}
-
-@subsection{Structure}
-
-@defmodule[honu/core/read]
-
-After tokenization a Honu program will be converted into a tree with minimal
-structure. Enclosing tokens will be grouped into a single object represented as
-an s-expression. Enclosing tokens are pairs of (), {}, and [].
-
-Consider the following stream of tokens
-
-@codeblock|{
-x ( 5 + 2 )
-}|
-
-This will be converted into
-@codeblock|{
-(x (#%parens 5 + 2))
-}|
-
-{} will be converted to (#%braces ...) and [] will be conveted to (#%brackets
-...)
-
-@defproc[(honu-read (port port?)) any]{
-  Read an s-expression from the given port.
-}
-
-@defproc[(honu-read-syntax (name any) (port port?)) any]{
-  Read a syntax object from the given port.
-}
-
-@defproc[(honu-lexer (port port?)) (list position-token?)]{
-  Tokenize a port into a stream of honu tokens.
-}
-
-@section{Parsing}
-
-Honu is parsed using an algorithm based primarily on operator precedence. The
-main focus of the operator precedence algorithm is to support infix operators.
-In short, the algorithm operates in the following way
-
-@itemlist[
-@item{1. parse an @tech{expression}}
-@item{2. check for a binary operator. if one is found then continue to step 3
-otherwise return the expression from step 1 immediately.}
-@item{3. parse another @tech{expression}}
-@item{4. check for a binary operator. if one is found then check if its precedence is
-higher than the operator found in step 2, and if so then continue parsing from
-step 3. if the precedence is lower or an operator is not found then build an
-infix expression from the left hand expression from step 1, the binary operator
-in step 2, and the right hand expression in step 3.}
-]
-
-Parsing will maintain the following registers
-@itemlist[
-  @item{@bold{left} - a function that takes the right hand side of an expression and
-  returns the infix expression by combining the left hand side and the
-  operator.}
-  @item{@bold{current} - the current right hand side}
-  @item{@bold{precedence} - represents the current precedence level}
-  @item{@bold{stream} - stream of tokens to parse}
-]
-
-This algorithm is illustrated with the following example. Consider the raw
-stream of tokens
-
-@codeblock|{ 1 + 2 * 3 - 9 }|
-
-@tabular[
-  @list[
-    @list["left" (hspace 1) "current" (hspace 1) "precedence" (hspace 1) "stream"]
-    @list[@racket[(lambda (x) x)] (hspace 1)
-          @racket[#f] (hspace 1)
-          @racket[0] (hspace 1)
-          @codeblock|{1 + 2 * 3 - 9}|]
-    @list[@racket[(lambda (x) x)] (hspace 1)
-          @racket[1] (hspace 1)
-          @racket[0] (hspace 1)
-          @codeblock|{+ 2 * 3 - 9}|]
-    @list[@racket[(lambda (x) #'(+ 1 x))] (hspace 1)
-          @racket[#f] (hspace 1)
-          @racket[1] (hspace 1)
-          @codeblock|{2 * 3 - 9}|]
-    @list[@racket[(lambda (x) #'(+ 1 x))] (hspace 1)
-          @racket[2] (hspace 1)
-          @racket[1] (hspace 1)
-          @codeblock|{* 3 - 9}|]
-    @list[@racket[(lambda (x) (left #'(* 2 x)))] (hspace 1)
-          @racket[2] (hspace 1)
-          @racket[2] (hspace 1)
-          @codeblock|{3 - 9}|]
-    @list[@racket[(lambda (x) (left #'(* 2 x)))] (hspace 1)
-          @racket[3] (hspace 1)
-          @racket[2] (hspace 1)
-          @codeblock|{- 9}|]
-    @list[@racket[(lambda (x) #'(- (+ 1 (* 2 3)) x))] (hspace 1)
-          @racket[#f] (hspace 1)
-          @racket[1] (hspace 1)
-          @codeblock|{9}|]
-    @list[@racket[(lambda (x) #'(- (+ 1 (* 2 3)) x))] (hspace 1)
-          @racket[9] (hspace 1)
-          @racket[1] (hspace 1)
-          @codeblock|{}|]
-  ]
-]
-
-When the stream of tokens is empty the @bold{current} register is passed as an
-argument to the @bold{left} function which ultimately produces the expression
-@codeblock|{(- (+ 1 (* 2 3)) 9)}|
-
-In this example @racket[+] and @racket[-] both have a precedence of 1 while
-@racket[*] has a precedence of 2. Currently, precedences can be any number that
-can be compared with @racket[<=].
-
-The example takes some liberties with respect to how the actual implementation
-works. In particular the binary operators are syntax transformers that accept
-the left and right hand expressions as parameters and return new syntax objects.
-Also when the @racket[*] operator is parsed the @bold{left} function for
-@racket[+] is nested inside the new function for @racket[*].
-
-An @deftech{expression} can be one of the following
-@itemlist[
-  @item{@bold{datum} - number, string, or symbol. @codeblock|{5}|}
-  @item{@bold{macro} - a symbol bound to a syntax transformer.
-  @codeblock|{cond x = 5: true, else: false}|}
-  @item{@bold{stop} - a symbol which immediately ends the current expression.
-  these are currently , ; :}
-  @item{@bold{lambda expression} - an identifier followed by @racket[(id ...)]
-  followed by a block of code in braces. @codeblock|{add(x, y){ x + y }}|}
-  @item{@bold{function application} - an expression followed by @racket[(arg
-  ...)]. @codeblock|{f(2, 2)}|}
-  @item{@bold{list comprehension} - @codeblock|{[x + 1: x <- [1, 2, 3]]}|}
-  @item{@bold{block of code} - a series of expressions wrapped in braces.}
-  @item{@bold{expression grouping} - any expression inside a set of parenthesis
-  @codeblock|{(1 + 1) * 2}|}
-]
-
-@section{Macros in Honu}
-
-@subsection{Honu syntax}
-A good concrete syntax for honu macros is still under development.
-
-@subsection{Low Level Racket Interface}
-
-A Honu macro can be defined in Racket using @racket[define-honu-syntax].
-
-@defform[(define-honu-syntax name function)]{
-Defines @racket[name] to be a honu macro that uses @racket[function] as the
-syntax transformer. @racket[function] should accept two parameters, the first is
-the syntax tree that follows the macro name in the current input and the second
-related to the current context but for now is not used.
-
-@racket[function] should return 3 values using @racket[values].
-@itemlist[
- @item{a new syntax object that corresponds to the computation performed by the
- macro}
- @item{the rest of the input syntax that is to be parsed}
- @item{a boolean, @racket[#t] or @racket[#f], that tells the parser whether or not
- to immediately return the current expression or to continue parsing.}
-]
-
-Macro's should use @racket[syntax-parse] to pattern match on their input
-although this is not strictly necessary. Honu provides the syntax class
-@racket[honu-expression] from @racket[honu/core/parse2] that will re-invoke the
-honu parser and return a single expression. The result of using
-@racket[honu-expression] can be accessed with the @racket[result] attribute.
-
-The definition of the @racket[for] form for Honu.
-@codeblock|{
-(define-honu-syntax honu-for
-  (lambda (code context)
-    (syntax-parse code #:literal-sets (cruft)
-#:literals (honu-= honu-in)
-      [(_ iterator:id honu-= start:honu-expression
-          honu-to end:honu-expression
-          honu-do body:honu-expression .
-          rest)
-       (values
-       #'(for ([iterator
-                (in-range
-                 start.result
-                 end.result)])
-        body.result)
-        #'rest
-        #t)]
-      [(_ iterator:id honu-in
-          stuff:honu-expression
-          honu-do
-          body:honu-expression
-          .
-          rest)
-        (values
-       #'(for ([iterator stuff.result])
-           body.result)
-       #'rest
-       #t)])))
-}|
-}
-
-@section{Language}
-
-@racket[var] is a macro that defines a new variable.
-@codeblock|{var x = 1}|
-
-@racket[for] is a macro that is similar to Racket's @racket[for].
-@codeblock|{for id = expression to expression do expression}|
-@codeblock|{for id in expression do expression}|
-
-@section{Examples}
-
-@codeblock|{
-// A for loop that iterates between two bounds.
-for x = 1 + 5 to 10 do
-  printf("x is ~a\n" x)
-
-// Similar to above but shows a block of expressions in the body
-for x = 1 to 10 do {
- var y = x + 1;
- printf("x ~a y ~a\n", x, y)
-}
-
-// A for loop that iterates over a list of numbers
-for x in [1, 2, 3] do {
- printf("x ~a\n", x);
-}
-
-}|
diff --git a/pkgs/honu/scribblings/info.rkt b/pkgs/honu/scribblings/info.rkt
deleted file mode 100644
index 76fed75591..0000000000
--- a/pkgs/honu/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("honu.scrbl" (multi-page) (experimental 40))))
diff --git a/pkgs/honu/syntax-parse.rkt b/pkgs/honu/syntax-parse.rkt
deleted file mode 100644
index 2393f196ce..0000000000
--- a/pkgs/honu/syntax-parse.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-
-(require honu/core/private/syntax
-         honu/core/private/parse2
-         (for-syntax honu/core/private/parse2)
-         honu/core/private/literals
-         (for-syntax honu/core/private/compile)
-         (for-syntax racket/base)
-         (for-syntax (prefix-in parse: syntax/parse))
-         (prefix-in parse: syntax/parse))
-
-(define-honu-syntax syntax-parse
-  (lambda (code)
-
-    (parse:define-splicing-syntax-class a-pattern #:literals (cruft)
-      [parse:pattern (parse:~seq var:parse:id %colon class:parse:id)
-                     #:with pattern #'(parse:~var var class #:attr-name-separator "_")])
-
-    (parse:syntax-parse code #:literals (cruft)
-      [(_ data:honu-expression (#%braces (#%brackets something:a-pattern action:honu-delayed) ...) . rest)
-       (define output
-         (racket-syntax (parse:syntax-parse data.result
-                           [(something.pattern) action.result] ...)))
-       (values output #'rest #t)])))
-
-(provide syntax-parse)
diff --git a/pkgs/honu/syntax.rkt b/pkgs/honu/syntax.rkt
deleted file mode 100644
index d73638cda8..0000000000
--- a/pkgs/honu/syntax.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang honu
-
-/* Standard syntax-rules but as a macro-defining form */
-
-provide macro_rules;
-macro macro_rules(){
-  name:identifier (literal ...){ pattern ... }{ template ... }
-} {
-  syntax(macro name (literal ...){ pattern ... }{ syntax(template ...) })
-}
diff --git a/pkgs/honu/tests/basic.honu b/pkgs/honu/tests/basic.honu
deleted file mode 100644
index e5a22358cd..0000000000
--- a/pkgs/honu/tests/basic.honu
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang honu
-
-obj test(t, a, b){
-  if (a != b){
-    display(t);
-    display(" failed!");
-    newline();
-    display("Got ");
-    display(a);
-    display(". Expected ");
-    display(b);
-    newline();
-  }
-}
-
-obj test1(){
-  var x = 3;
-  const y = 2;
-  test("x = 3", x, 3);
-  test("y = 2", y, 2);
-}
-
-obj test2(){
-  obj foo(){
-    1;
-  }
-
-  obj x1(){
-    obj x(){
-      2;
-    }
-    x;
-  }
- 
-  (-> obj) x2(){
-    obj x(){
-      3;
-    }
-    x;
-  }
-  
-  /*
-  var anonymous_foo = obj x(){
-    2;
-  };
-  */
-
-  var anonymous_foo = x1();
-  var x2_x = x2();
-
-  test("foo() = 1", foo(), 1);
-  test("anonymous_foo = 2", anonymous_foo(), 2);
-  test("x2_x = 3", x2_x(), 3);
-}
-
-test1();
-test2();
diff --git a/pkgs/honu/tests/check.rkt b/pkgs/honu/tests/check.rkt
deleted file mode 100644
index 2058c72111..0000000000
--- a/pkgs/honu/tests/check.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang at-exp racket/base
-
-(require racket/sandbox
-         racket/port
-         rackunit
-         honu/core/read)
-
-(define honu-eval (make-parameter (lambda args (error 'honu-eval "set the honu evaluator"))))
-(define (make-honu-evaluator)
-  (call-with-trusted-sandbox-configuration
-    (lambda ()
-      (make-evaluator 'honu))))
-
-(define (honu . input)
-  (with-input-from-string (apply string-append input)
-    (lambda ()
-      ((honu-eval) (honu-read-syntax)))))
-
-(define-syntax-rule (honu-tests checks ...)
-  (parameterize ([honu-eval (make-honu-evaluator)]) checks ...))
-
-(honu-tests
-  (check-equal? @honu{1} 1)
-  (check-equal? @honu{5} 5)
-  (check-equal? @honu{1 + 1} (+ 1 1))
-  (check-equal? @honu{1 + 2 * 3} (+ 1 (* 2 3)))
-  (check-equal? @honu{3 * 2 + 1} (+ (* 3 2) 1))
-  (check-equal? @honu{1 + 4 ^ 2 * 3} (+ 1 (* (expt 4 2) 3)))
-  (check-equal? @honu{1 + 4 ^ 3 ^ 2} (+ 1 (expt 4 (expt 3 2))))
-  (check-equal? @honu{4 ^ 3 ^ 2 + 1} (+ (expt 4 (expt 3 2)) 1))
-  
-  (check-equal? @honu{
-                      var n = 5
-                      cond
-                      n < 10: 'x1,
-                      n > 10: 'x2
-                }
-             'x1)
-
-  (check-equal? @honu{
-                     if (2 > 1)
-                       1
-                     else
-                     0
-                }
-             1)
-
-  (check-equal? @honu{
-                  var x = 12
-                  x *= 2
-                  x -= 5
-                  x
-                }
-                (- (* 12 2) 5))
-
-  (check-equal? @honu{[x + 1: x = [1, 2, 3]]} '(2 3 4))
-  (check-equal? @honu{[x + y: x = [1, 2, 3], y = [4, 5, 6]]} '(5 7 9))
-  )
-
-(honu-tests
-  (check-equal? @honu{function foo(x){
-                            x * 2
-                          }
-                          foo(5)
-                          }
-             10)
-
-  (check-equal? @honu{
-                  unary_operator u1 4 function(x){ x * 2}
-                  u1 8
-                }
-
-                (* 8 2))
-
-  (check-equal? @honu{
-                  unary_operator u1 4 function(x){ x * 2}
-                  2 + u1 8 * 3
-                }
-
-                (+ 2 (* 3 (* 8 2))))
-
-  (check-equal? @honu{
-                  binary_operator b1 4 'left function(left, right){ left + right * 2}
-                  2 b1 4
-                }
-
-                (+ 2 (* 2 4)))
-  )
diff --git a/pkgs/honu/tests/class.honu b/pkgs/honu/tests/class.honu
deleted file mode 100644
index 0fb616abd5..0000000000
--- a/pkgs/honu/tests/class.honu
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang honu
-
-class What(x, y){
-  var q = 2
-  foobar(z){
-    z + x + y
-  }
-};
-
-var instance = new What(5, 8);
-printf("got ~a\n", instance->foobar(10))
diff --git a/pkgs/honu/tests/flow.honu b/pkgs/honu/tests/flow.honu
deleted file mode 100644
index 1e1e26ba6a..0000000000
--- a/pkgs/honu/tests/flow.honu
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang honu
-
-function foo(x){
-    x + 1
-}
-
-function bar(x){
-    x * 2
-}
-
-function buz(z){
-    z - 4
-}
-
-foo(5) | bar | buz
diff --git a/pkgs/honu/tests/for.honu b/pkgs/honu/tests/for.honu
deleted file mode 100644
index 24a3bc5e18..0000000000
--- a/pkgs/honu/tests/for.honu
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang honu
-
-for x in 1 + 5 to 10 do
-  printf("x is ~a\n" x)
-
-for x in 1 to 10 do {
-    var y = x + 1;
-    printf("x ~a y ~a\n", x, y)
-}
-
-for x in [1, 2, 3] do {
-  printf("x ~a\n", x);
-}
-
-for x in 0 to 3,
-    y in 2 to 5 do {
-  printf("x ~a y ~a\n", x, y)
-}
-
-fold x = [],
-     z in 0 to 5 do {
-  z :: x
-}
-
-fold x = [],
-     y = 1,
-     z in 1 to 5 do {
-  values(z :: x, y * z)
-}
diff --git a/pkgs/honu/tests/function-use.honu b/pkgs/honu/tests/function-use.honu
deleted file mode 100644
index 2c4360778b..0000000000
--- a/pkgs/honu/tests/function-use.honu
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang honu
-
-// require "function.honu";
-
-function foo (a b c){
-  display("5");
-  newline();
-}
-
-foo(1, 2, 3);
-
-function (a b c){
-  display(a+b+c);
-  newline();
-}(1, 2, 3);
diff --git a/pkgs/honu/tests/function.honu b/pkgs/honu/tests/function.honu
deleted file mode 100644
index cba2c73f11..0000000000
--- a/pkgs/honu/tests/function.honu
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang honu
-
-function foo(x){
-  1 + x * 2
-}
-
-fun foo2(x){
-  foo(x + 2)
-}
-
-foo(5)
-foo2(3)
diff --git a/pkgs/honu/tests/ideas.honu b/pkgs/honu/tests/ideas.honu
deleted file mode 100644
index c7d270a50c..0000000000
--- a/pkgs/honu/tests/ideas.honu
+++ /dev/null
@@ -1,165 +0,0 @@
-#lang honu
-
-/*
-<a>a f(a x, a b) { return (obj)x; }
-((obj)f<string>)(1, "again");
-*/
-
-/* Some examples to consider when writing a test suite.
-   //T means the example should be a type error.
-   //R means the example should be a run-time error. */
-
--10;
-
-(int)10;
-//T (int)"apple";
-//R (int)(obj)"apple";
-
-//T 1(10);
-
-//T int xyz = "a";
-//R int xyz = (obj)"a";
-
-int b(int y) { 1 + y; }
-
-if (true) 1; else 2;
-if ((obj)true) 1; else 2;
-//T if (10) 1; else 2;
-//R if ((obj)10) 1; else 2;
-
-int f(int x, (string -> int) g) {
-   if (x == 0) 1; else g("a");
-}
-
-int g(string s) { return 5; }
-
-//T g({ if (true) "a"; else 5; });
-
-string j (string s) { return s; }
-
-obj h = j;
-
-f(1, g);
-f(1, { obj g2 = g; g2; });
-//T f(1, j);
-f(0, h);
-//R f(1, h);
-
-string function(string x) { return x; };
-
-/* Should be the same speed as the Scheme version: */
-int loop(int n) {
-  if (n == 0)
-    return 1;
-  else
-    return loop(n - 1);
-}
-
-{ time loop(1000000); } + 1;
-
-obj z(a) {
-  int y = 12;
-  return 13;
-}
-z(10);
-
-if (true)
-  if (true)
-    1;
-  else
-    2;
-else
-  3;
-
-1 < 2 && 7 > 6;
-
-<a, b, c> b polyX(a n) { if ((obj)n) (obj)1; else (obj)2; }
-
-/*
-
-//T <a, b, c> b poly0(a n) { if (n) (obj)1; else (obj)2; }
-//T <a, b, c> b poly0(a n) { if ((obj)n) 1; else 2; }
-<a, b, c> b polyX(a n) { if ((obj)n) (obj)1; else (obj)2; }
-/* but there's no valid way to use polyX... */
-//R polyX<bool, int, int> (true);
-
-<a, b, c> b polyY(bool t, a n) { if (t) polyY<bool, b, c>(false, true); else { obj x = 12; x;} }
-/* similarly, no valid way to use polyY... */
-//R polyY<int, int, int> (true, 1);
-
-<a, b, c> c poly(bool t, a n, c res) { if (t) poly<bool, b, c>(false, true, res); else res; }
-poly<int, int, int> (true, 1, -1);
-
-<a, b, c> obj paly(obj n, obj m) { return n; }
-
-obj pf0((a b c >-> (bool a c -> c)) g) { return g<int,bool,int>(true, 10, -3); }
-//R pf0(poly);
-
-obj pf((a b c >-> (bool a c -> c)) g) { return g<int,int,int>(true, 10, -3); }
-pf(poly);
-//T pf(paly);
-pf({ obj x = poly; x; } );
-pf((obj)poly);
-//R pf({ obj x = paly; x; } );
-//R pf((obj)paly);
-
-/* Check time of 2-arg loop... */
-obj loop3(int n, obj res) {
-  if (n == 0)
-    return res;
-  else
-    return loop3(n - 1, res);
-}
-time loop3(1000000, false);
-
-/* Compare this cost to loop3: */
-<a> a loop2(int n, a res) {
-  if (n == 0)
-    return res;
-  else
-    return loop2<a>(n - 1, res);
-}
-time loop2<bool>(1000000, false);
-
-/* Compare this one, too: */
-<a> (int a -> a) getLoop() 
-{
-  a loop2(int n, a res) {
-   if (n == 0)
-    return res;
-   else
-     return loop2(n - 1, res);
- }
-  return loop2;
-}
-time getloop<bool>()(1000000, false);
-
-int app((int int -> int) f) { return f(0, 1); }
-app(int function(int a, int b) { return a; });
-
-
-//T { if (true) int function(int b) { return 1; }; else 10; } (1);
-{ if (true) int function(int b) { return 1; }; else { obj x = 10; x; } } (1);
-(true ? int function(int b) { return 1; } : { obj x = 10; x; } ) (1);
-{ if (true) int function(int b) { return 1; }; else obj function(int x) { return "hi"; }; } (1);
-//T { if (true) int function(int b, obj z) { return 1; }; else obj function(int x) { return "hi"; }; } (1);
-{ if (false) int function(int b) { return 1; }; else obj function(int x) { return "hi"; }; } (1);
-{ if (false) int function(int b) { return 1; }; else obj function(obj x) { return "hi"; }; } ("a");
-//R { if (true) int function(int b) { return 1; }; else obj function(obj x) { return "hi"; }; } ("a");
-{ if (true) obj function(obj x) { return "hi"; }; else int function(int b) { return 1; };} ("a");
-//R { if (false) obj function(obj x) { return "hi"; }; else int function(int b) { return 1; };} ("a");
-
-int make_adder((int -> int) x) { x(10); }
-{ ((int -> int) -> int) mkaddr = make_adder; mkaddr; }(b);
-{ if (true) { ((int -> int) -> int) mkaddr = make_adder; mkaddr; } else { obj x = 5; x; } }(b);
-
-<a> function(a y) { return 10; };
-(<a> function(a y) { return 10; });
-//T (<a> function(a y) { return 10; })(12);
-(<a> function(a y) { return 10; })<int>(12);
-
-(int function(int b, int a) { return a + b; }) (1, 2);
-
-provide make_adder;
-
- */
diff --git a/pkgs/honu/tests/linq.honu b/pkgs/honu/tests/linq.honu
deleted file mode 100644
index 0ba4a8b404..0000000000
--- a/pkgs/honu/tests/linq.honu
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang honu
-
-require prefix xml_ xml;
-require "linq.rkt";
-
-class Xml(data){
-  Descendants(name){
-    [new Xml(element): element = find_descendants(data, name)]
-  }
-
-  Element(name){
-    new Xml(get_element(data, name))
-  }
-
-  Value(){
-    get_text(data)
-  }
-
-  getData(){ data }
-}
-
-function read_xml(){
-  xml_permissive_xexprs(true)
-  xml_xml_to_xexpr(xml_document_element(xml_read_xml()))
-}
-
-function loadXml(file){
-  withInputFromFile(file){
-    new Xml(read_xml())
-  }
-}
-
-function starts_with(start, what){
-  substring(what, 0, string_length(start)) string_equal start
-}
-
-var xml = loadXml("test.xml")
-printf("xml ~a\n", xml)
-printf("data: ~a\n", xml->getData())
-printf("table1: ~a\n", xml->Descendants("Table1"))
-
-struct test{name, address}
-
-var addresses = linq from add in xml->Descendants("Table1")
-                     where true
-                     orderby add->Element("familyName")->Value()
-                     select test(add->Element("familyName")->Value(),
-                                 add->Element("address")->Value())
-
-printf("addresses ~a\n", addresses)
-
-for add in addresses do {
-  printf("name ~a address ~a\n", add.name, add.address)
-}
-
-for xs in linq from foo in xml->Descendants("Table1")
-               where starts_with("x", foo->Element("familyName")->Value())
-               select foo->Element("familyName")->Value() do {
-  printf("only x: ~a\n", xs)
-}
diff --git a/pkgs/honu/tests/linq.rkt b/pkgs/honu/tests/linq.rkt
deleted file mode 100644
index 2240c1579e..0000000000
--- a/pkgs/honu/tests/linq.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang racket/base
-
-(require honu/core/private/syntax
-         honu/core/private/honu-typed-scheme
-         honu/core/private/literals
-         racket/list
-         racket/match
-         (for-syntax racket/base
-                     honu/core/private/literals
-                     honu/core/private/parse2
-                     honu/core/private/compile
-                     syntax/parse))
-
-(define-literal+set linq-literals
-                    linq-from linq-select linq-where
-                    linq-order-by)
-(provide linq (rename-out [linq-from from]
-                          [linq-where where]
-                          [linq-order-by orderby]
-                          [linq-select select]))
-
-(define-honu-syntax linq
-  (lambda (code)
-    (syntax-parse code #:literal-sets (cruft linq-literals)
-                       #:literals (honu-in)
-      [(_ linq-from name:id honu-in
-          (~var store honu-expression)
-          (~optional (~seq linq-where where:honu-expression))
-          (~optional (~seq linq-order-by order-by:honu-expression))
-          linq-select select:honu-expression . rest)
-       (define out
-         (with-syntax ([(guard ...)
-                        (if (attribute where)
-                          #'(#:when where.result)
-                          #'())]
-                       [order (if (attribute order-by)
-                                #'(sort store.result string<?
-                                        #:key (lambda (name) order-by.result))
-                                #'store.result)])
-           (racket-syntax (for/list ([name order]
-                                     guard ...)
-                            select.result))))
-       (values out #'rest #f)])))
-          
-#|
-var addresses = linq from add in xml.Descendants("Table1")
-                     select new {
-                       Name = add.Element("familyName").Value,
-                       Address = add.Element("address").Value
-                     };
-
-|#
-
-(provide find-descendants)
-(define (find-descendants xexpr name)
-  (match xexpr
-    [(list root root-attributes elements ...)
-     (filter (lambda (element)
-               (match element
-                 [(list (? (lambda (x) (string=? name (symbol->string x)))) stuff ...) #t]
-                 [else #f]))
-             elements)]))
-
-(provide get-element)
-(define (get-element xexpr name)
-  (first (find-descendants xexpr name)))
-
-(provide get-text)
-(define (get-text xexpr)
-  (match xexpr
-    [(list name attributes text)
-     text]))
diff --git a/pkgs/honu/tests/macros.rkt b/pkgs/honu/tests/macros.rkt
deleted file mode 100644
index ca04d4164d..0000000000
--- a/pkgs/honu/tests/macros.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang honu
-
-macro testx () {x:expression} {
-  var out1 = syntax(x)
-  var out2 = syntax(+ 1)
-  mergeSyntax(out1, out2)
-}
-
-testx 5 * 2
-
-for z in 1 to testx 6 * 2 do
-  printf("z is ~a\n", z)
-
-macro testfor () {x:expression} {
-  syntax(for z in 1 to x do
-    printf("z is ~a\n" z))
-}
-
-macro testfor2 () {x:expression}{
-  syntax(testfor x * 2)
-}
-
-testfor2 1 + 2
diff --git a/pkgs/honu/tests/macros2.honu b/pkgs/honu/tests/macros2.honu
deleted file mode 100644
index c9cdfb5499..0000000000
--- a/pkgs/honu/tests/macros2.honu
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang honu
-
-macro foo (){ x:identifier }{
-  syntax(macro x (){ e:expression }{
-    syntax(e + 2)
-  })
-}
-
-foo h
-
-h 5
-h 8 * 9
-
-function test(z){
-  macro foo (){ x:identifier }{
-    syntax(macro x (){ e:expression }{
-      syntax(e + z)
-    })
-  }
-
-  foo h
-  h 5
-}
-
-test(4)
diff --git a/pkgs/honu/tests/match.honu b/pkgs/honu/tests/match.honu
deleted file mode 100644
index 1965f9526b..0000000000
--- a/pkgs/honu/tests/match.honu
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang honu
-
-var => = 0
-
-pattern match_pattern (){ [element:expression_list]}, { [ $ element_each_result , $ ...]}
-
-pattern match_clause (| =>){ | pattern:match_pattern => out:expression , }
-
-macro mymatch(with){
-  thing:expression with
-  clause:match_clause ...
-} {
-  syntax(
-    cond
-     $ clause_pattern == thing: clause_out, $ ...
-     else: -2
-  )
-}
-
-mymatch [1] with
-| [1] => 5,
-| [2] => 6,
-
-mymatch [1, 2, 3] with
-| [4] => 12,
-| [1, 2] => 7,
-| [1, 2, 3] => 8,
-
-// mymatch [1] with | [2] => 5
-
-mymatch [true, false] with
-| [true] => 1,
-| [false] => 2,
-| [false, true] => 3,
-| [true, false] => 4,
diff --git a/pkgs/honu/tests/math.honu b/pkgs/honu/tests/math.honu
deleted file mode 100644
index 4c4456ca2f..0000000000
--- a/pkgs/honu/tests/math.honu
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang honu
-
-macro add_all(){
-  number:expression ...
-} {
-  syntax(
-    $ number + $ ... 0
-  )
-  /*
-  syntax(
-    $ printf("~a\n", number) $ ...
-    )
-    */
-}
-
-add_all 1 2 3 * 4;
diff --git a/pkgs/honu/tests/operators.honu b/pkgs/honu/tests/operators.honu
deleted file mode 100644
index f4577d9395..0000000000
--- a/pkgs/honu/tests/operators.honu
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang honu
-
-operator gg 2 'left
-  function(left right){
-    withSyntax left = left,
-               right = right {
-      syntax(left * 2 - right)
-    }
-  }
-
-3 gg 4 gg 5
-
-binary_operator b1 2 'left
-  function(left, right){
-    left + right * 2
-  }
-
-3 b1 8
-
-unary_operator u1 4 function(x){ x - 2 }
-
-2 + u1 u1 5
-
-unary_operator u2 5 postfix function(x){ x + 8 }
-unary_operator u3 5 postfix function(x){ x * 2 };
-
-7 u3;
-u2 7 u3;
-1 + u2 7 u3;
-1 + u2 7 u3 * 3;
diff --git a/pkgs/honu/tests/struct-patterns.honu b/pkgs/honu/tests/struct-patterns.honu
deleted file mode 100644
index 026b62e6be..0000000000
--- a/pkgs/honu/tests/struct-patterns.honu
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang honu
-
-/*
-provide structField;
-
-pattern structField (name_result) [name:identifier];
-*/
diff --git a/pkgs/honu/tests/struct-use.honu b/pkgs/honu/tests/struct-use.honu
deleted file mode 100644
index 74f21751fc..0000000000
--- a/pkgs/honu/tests/struct-use.honu
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang honu
-
-/*
-// require "struct.honu";
-
-struct foo {a b c};
-
-z = foo(1, 2, 3);
-y = 3;
-y = 9;
-// x = foo(1, 2, 3);
-
-display(z.a);
-*/
diff --git a/pkgs/honu/tests/struct.honu b/pkgs/honu/tests/struct.honu
deleted file mode 100644
index 87fa95a941..0000000000
--- a/pkgs/honu/tests/struct.honu
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang honu
-
-// structure foo (bar) {a, b, c};
-structure foo {a, b, c};
-
-var x = foo(1, 2, 3);
-printf("x.a: ~a\n", x.a);
diff --git a/pkgs/honu/tests/test-docs-complete.rkt b/pkgs/honu/tests/test-docs-complete.rkt
deleted file mode 100644
index 51fa648473..0000000000
--- a/pkgs/honu/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-;; to be re-enabled at some point
-#;
-(check-docs (quote honu))
diff --git a/pkgs/honu/tests/test.honu b/pkgs/honu/tests/test.honu
deleted file mode 100644
index 5df481f9cd..0000000000
--- a/pkgs/honu/tests/test.honu
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang honu
-
-/*
-function test(t, a, b){
-  if (a != b){
-    display(t);
-    display(" failed!");
-    newline();
-    display("Got ");
-    display(a);
-    display(". Expected ");
-    display(b);
-    newline();
-  }
-}
-*/
-
-function test1(){
-  var x = 3;
-/*
-  const y = 2;
-  test("x = 3", x, 3);
-  test("y = 2", y, 2);
-  */
-  printf("x is ~a\n", x + 2);
-  // print(x + 2);
-  // print(x ^ 2)
-}
-
-function test2(x, y){
-  printf("~a\n", x);
-  printf("~a\n", y);
-}
-
-function test3(what){
-    printf("~a and true = ~a\n", what, what and true);
-    printf("~a and false = ~a\n", what, what and false);
-}
-
-test1();
-test2(5, 9);
-test3(true);
-
-// function(z){ print(z) }(12)
diff --git a/pkgs/honu/tests/test.xml b/pkgs/honu/tests/test.xml
deleted file mode 100644
index 7ff696b3d1..0000000000
--- a/pkgs/honu/tests/test.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<root>
-    <Table1>
-        <ID>3</ID>
-        <familyName>x1</familyName>
-        <address>xa</address>
-    </Table1>
-    <Table1>
-        <ID>4</ID>
-        <familyName>y1</familyName>
-        <address>ya</address>
-    </Table1>
-    <Table1>
-        <ID>5</ID>
-        <familyName>hub</familyName>
-        <address>away</address>
-    </Table1>
-    <Table1>
-        <ID>5</ID>
-        <familyName>xeno</familyName>
-        <address>banana</address>
-    </Table1>
-</root>
diff --git a/pkgs/honu/tests/where.honu b/pkgs/honu/tests/where.honu
deleted file mode 100644
index def96d2214..0000000000
--- a/pkgs/honu/tests/where.honu
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang honu
-
-var where = 0
-
-macro varwhere(where =){ unparsed where bind:identifier = any:expression }
-{ syntax({var bind = any
-          unparsed}) }
-
-varwhere { printf("x is ~a\n", x)
-           {
-             var x = 5;
-             x * 2
-           }
-         } where x = 2 + 1
-
-varwhere { macro foo(){ z:expression }{ syntax(x + z) }
-           foo 5 } where x = 2 * 8
diff --git a/pkgs/honu/tests/xml.honu b/pkgs/honu/tests/xml.honu
deleted file mode 100644
index 44cbb7d170..0000000000
--- a/pkgs/honu/tests/xml.honu
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang honu
-
-require "xml.rkt";
-
-// var x = xml <foo>hello world!!</foo>
-
-// var x = xml <foo> </foo>
-var x = xml <foo> tuna {var z = 9; 1 + z} </foo>
-var y = xml <foo> <bar> {1 + 1} </bar> </foo>
-
-xml_to_string(x)
-xml_to_string(y)
-
-xml_to_string(xml <html><body> hello world! <b>foo</b> <b>bar</b> </body></html>)
-xml_to_string(xml <what>{"{hi}"}</what>)
diff --git a/pkgs/honu/tests/xml.rkt b/pkgs/honu/tests/xml.rkt
deleted file mode 100644
index 4ae3491795..0000000000
--- a/pkgs/honu/tests/xml.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang racket/base
-
-(require honu/core/api
-         racket/match
-         (only-in honu [/ honu-/]
-                       [< honu-<]
-                       [> honu->])
-         (for-syntax syntax/parse
-                     racket/base))
-
-(provide xml
-         xml->string)
-
-(struct xml:object (tag elements))
-
-(begin-for-syntax
-  (define (debug . x)
-    (void)
-    #;
-    (apply printf x)))
-
-(define (xml->string xml)
-  (match xml
-    [(struct xml:object (tag elements))
-     (format "<~a>~a</~a>"
-             tag
-             (apply string-append (map xml->string elements))
-             tag)]
-    [else (format "~a" xml)]))
-
-(define (make-xml name . stuff)
-  (xml:object name stuff))
-
-(define-honu-syntax xml
-  (lambda (code)
-    (define-literal-set xml-literals (honu-< honu-> honu-/))
-
-    (define-splicing-syntax-class non-xml-id #:literal-sets (xml-literals)
-      [pattern (~and (~not honu-<) x:id)])
-
-    (define-splicing-syntax-class node
-      #:literal-sets (xml-literals)
-      [pattern (~seq honu-< start:id honu-> more:node ... honu-< honu-/ end:id honu->)
-               #:with result (racket-syntax (make-xml 'start more.result ...))]
-      [pattern body:honu-body #:with result #'body.result]
-      [pattern (~seq plain:non-xml-id plain*:non-xml-id ...) #:with result #''(plain plain* ...)]
-      )
-
-    (debug "Parse xml ~a\n" code)
-    (syntax-parse code
-      [(_ node:node . rest)
-       (define out #'node.result)
-       (debug "Result ~a\n" out)
-       (values out #'rest #f)])))
diff --git a/pkgs/htdp-pkgs/htdp-doc/LICENSE.txt b/pkgs/htdp-pkgs/htdp-doc/LICENSE.txt
deleted file mode 100644
index 7770ca90ee..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-htdp-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/common.rkt b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/common.rkt
deleted file mode 100644
index a4c95f31f2..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/common.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scheme/base
-
-(require scribble/manual
-         (for-label scheme/base
-                    scheme/contract
-                    scheme/class
-                    scheme/unit
-                    scheme/gui/base))
-(provide (all-from-out scribble/manual)
-         (for-label (all-from-out scheme/base
-                                  scheme/contract
-                                  scheme/class
-                                  scheme/unit
-                                  scheme/gui/base)))
diff --git a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/graphics.scrbl b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/graphics.scrbl
deleted file mode 100644
index 7408f3bf91..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/graphics.scrbl
+++ /dev/null
@@ -1,820 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label graphics/graphics
-                     graphics/graphics-sig
-                     graphics/graphics-unit
-                     graphics/graphics-posn-less-unit))
-
-@title{Graphics: Legacy Library}
-
-@defmodule[graphics/graphics]
-
-The viewport graphics library is a relatively simple toolbox of
-graphics commands. The library is not very powerful; it is intended as
-a simplified alternative to @racketmodname[racket/gui]'s full
-graphical toolbox.
-
-The graphics library originated as SIXlib, a library of X Windows
-commands available within Chez Scheme at Rice University. The
-functionality of that library has been reproduced (with backward
-compatibility) in this version.
-
-@table-of-contents[]
-
-@; ----------------------------------------------------------------------
-
-@section{Basic Commands}
-
-@defproc[(open-graphics) void?]{
-
-Initializes the library's graphics routines. It must be called before
- any other graphics operations.}
-
-@defproc[(close-graphics) void?]{
-
-Closes all of the windows. Until @racket[open-graphics] is called
-again, no graphics routines will work.}
-
-@defproc[(graphics-open?) boolean?]{
-   Determines if the graphics have been opened (or not).
-}
-
-@defproc*[([(open-viewport [name string?]
-                           [horiz exact-nonnegative-integer?]
-                           [vert exact-nonnegative-integer?])
-            viewport?]
-           [(open-viewport [name string?]
-                           [dimensions posn?])
-            viewport?])]{
-
-Creates a new window called @racket[name].  The window is
-@racket[horiz] pixels wide and @racket[vert] pixels high.  For
-backward compatibility, a single @racket[posn] value can be submitted
-in the place of @racket[horiz] and @racket[vert].  The result is a
-viewport descriptor.}
-
-
-@defproc*[([(open-pixmap [name string?]
-                         [horiz exact-nonnegative-integer?]
-                         [vert exact-nonnegative-integer?])
-            viewport?]
-           [(open-pixmap [name string?]
-                         [dimensions posn?])
-            viewport?])]{
-
-Like @racket[open-viewport], but the resulting viewport is not
-displayed on the screen. Offscreen pixmaps are useful for executing a
-sequence of drawing commands and displaying them all at once with
-@racket[copy-viewport].
-  
-Offscreen pixmaps are also useful in conjunction with viewport->snip
-(see below). This allows functions to compute with graphical objects
-and view the graphics when results are returned to the interactions
-window.}
-
-
-@defproc[(close-viewport [viewport viewport?]) void?]{
-
-Removes the viewport from the screen and makes subsequent operations
-dealing with the viewport illegal.}
-
-
-@defproc[(viewport? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a viewport (i.e., a destination
-for drawing), @racket[#f] otherwise.}
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "posn"]{Position Operations}
-
-A position is a pixel location within a viewport.  The upper-left
-corner is pixel @math{(0, 0)}, and positions increase to the right and
-down.
-
-
-@defstruct[posn ([x real?][y real?])]{
-
-Represents a positions.}
-
-
-@defproc[((get-pixel [viewport viewport?]) [p posn?]) (one-of/c 0 1)]{
-
-Returns the color of the pixel at position @racket[p] in
-@racket[viewport]; @racket[0] denotes white and @racket[1] denotes not
-white.}
-
-
-@defproc[((get-color-pixel [viewport viewport?]) [p posn?]) rgb?]{
-
-Returns an @racket[rgb] value for color of the pixel at position
-@racket[p] in @racket[viewport].}
-
-
-@defproc[((test-pixel [viewport viewport?]) [color (or/c (integer-in 0 299)
-                                                         string?
-                                                         rgb?)])
-         rgb?]{
-
-Returns the color that will actually be used if @racket[color] is used
-to draw.}
-
-@; ----------------------------------------------------------------------
-
-@section{Color Operations}
-
-A color can be represented in three ways: as a color index (an integer
-in 0 to 299, inclusive), as a color name string, or as a @racket[rgb]
-value. All drawing functions which take a color argument accept colors
-in any form. An @racket[rgb] value is assigned to an index with
-@racket[change-color].
-
-
-@defstruct[rgb ([red (real-in 0 1)][green (real-in 0 1)][blue (real-in 0 1)])]{
-
-Takes three values in the range 0 (dark) to 1 (bright) and returns an
-@racket[rgb] (a color).}
-
-
-@defproc[(change-color [index (integer-in 0 299)] [rgb rgb?]) 
-         void?]{
-
-Changes the color at @racket[index] in the color table to the
-color specified in @racket[rgb]. Only the first twenty-one indices
-are initialized; a color index should not be used until it has
-been initialized.}
-
-
-@defproc[(default-display-is-color?) boolean?]{
-
-Returns @racket[#t] if the default display screen for viewports is in
-color or @racket[#f] otherwise.}
-
-@; ----------------------------------------------------------------------
-
-@section{Draw, Clear, and Flip Operations}
-
-The following are the basic graphics operations for drawing to a
-viewport.  Each function takes a viewport as its argument and returns
-a function operating within that viewport.  Further arguments, if any,
-are curried.  For example, @racket[(draw-line _viewport)] returns a
-function, that can then be applied to the proper arguments to draw a
-line in the viewport corresponding to viewport descriptor
-@racket[_viewport].
-
-In general, @racketidfont{draw-} functions make pixels black or
-colored, @racketidfont{clear-} functions make them white, and
-@racketidfont{flip-} commands @deftech{invert} pixels (which makes
-black white, white black, and is otherwise ill-defined).
-
-@subsection{Viewports}
-
-@defproc[((draw-viewport [viewport viewport?])
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Colors the entire contents of @racket[viewport] with @racket[color].}
-
-@defproc[((clear-viewport [viewport viewport?]))
-         void?]{
-
-Whitens the entire contents of @racket[viewport].}
-
-@defproc[((flip-viewport [viewport viewport?]))
-         void?]{
-
-@tech{Inverts} the entire contents of @racket[viewport].}
-
-
-@defproc[(copy-viewport [source viewport?] [dest viewport?])
-         void?]{
-
-Copies the content of @racket[source] into @racket[dest].}
-
-@; ----------------------------------------
-
-@subsection{Pixels}
-
-@defproc[((draw-pixel [viewport viewport?])
-          [p posn?]
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Colors the pixel in @racket[viewport] at @racket[p].}
-
-@defproc[((clear-pixel [viewport viewport?])
-          [p posn?])
-         void?]{
-
-Whitens the pixel in @racket[viewport] at @racket[p].}
-
-@defproc[((flip-pixel [viewport viewport?])
-          [p posn?])
-         void?]{
-
-@tech{Inverts} the pixel in @racket[viewport] at @racket[p].}
-
-@; ----------------------------------------
-
-@subsection{Lines}
-
-@defproc[((draw-line [viewport viewport?]) 
-          [p1 posn?]
-          [p2 posn?]
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Draws a line in @racket[viewport] connecting positions @racket[p1] and
-@racket[p2].}
-
-
-@defproc[((clear-line [viewport viewport?]) 
-          [p1 posn?]
-          [p2 posn?])
-         void?]{
-
-Whitens a line in @racket[viewport] connecting positions @racket[p1]
-and @racket[p2].}
-
-
-@defproc[((flip-line [viewport viewport?]) 
-          [p1 posn?]
-          [p2 posn?])
-         void?]{
-
-@tech{Inverts} a line in @racket[viewport] connecting positions
-@racket[p1] and @racket[p2].}
-
-@; ----------------------------------------
-
-@subsection{Rectangles}
-
-@defproc[((draw-rectangle [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))]
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Draws a rectangle border in the @racket[viewport] with the top-left of
-the rectangle at the position @racket[p] and with sides @racket[width]
-across and @racket[height] tall.}
-
-
-@defproc[((clear-rectangle [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))])
-         void?]{
-
-Whitens a rectangle border in the @racket[viewport], analogous to
-@racket[draw-rectangle].}
-
-
-@defproc[((flip-rectangle [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))])
-         void?]{
-
-@tech{Inverts} a rectangle border in the @racket[viewport], analogous
-to @racket[draw-rectangle].}
-
-
-@defproc[((draw-solid-rectangle [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))]
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Draws a solid rectangle in the @racket[viewport] with the top-left of
-the rectangle at the position @racket[p] and with sides @racket[width]
-across and @racket[height] tall.}
-
-
-@defproc[((clear-solid-rectangle [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))])
-         void?]{
-
-Whitens a rectangle border in the @racket[viewport], analogous to
-@racket[draw-solid-rectangle].}
-
-
-@defproc[((flip-solid-rectangle [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))])
-         void?]{
-
-@tech{Inverts} a rectangle border in the @racket[viewport], analogous
-to @racket[draw-solid-rectangle].}
-
-@; ----------------------------------------
-
-@subsection{Ellipses}
-
-@defproc[((draw-ellipse [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))]
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Draws a ellipse border in the @racket[viewport]. The ellipse is
-inscribed with a rectangle whose top-left is at position @racket[p]
-and with sides @racket[width] across and @racket[height] tall.}
-
-
-@defproc[((clear-ellipse [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))])
-         void?]{
-
-Whitens a ellipse border in the @racket[viewport], analogous to
-@racket[draw-ellipse].}
-
-
-@defproc[((flip-ellipse [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))])
-         void?]{
-
-@tech{Inverts} a ellipse border in the @racket[viewport], analogous
-to @racket[draw-ellipse].}
-
-
-@defproc[((draw-solid-ellipse [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))]
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Draws a solid ellipse in the @racket[viewport]. The ellipse is
-inscribed with a rectangle whose top-left is at position @racket[p]
-and with sides @racket[width] across and @racket[height] tall.}
-
-
-@defproc[((clear-solid-ellipse [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))])
-         void?]{
-
-Whitens a ellipse border in the @racket[viewport], analogous to
-@racket[draw-solid-ellipse].}
-
-
-@defproc[((flip-solid-ellipse [viewport viewport?]) 
-          [p posn?]
-          [width (and/c real? (not/c negative?))]
-          [height (and/c real? (not/c negative?))])
-         void?]{
-
-@tech{Inverts} a ellipse border in the @racket[viewport], analogous
-to @racket[draw-solid-ellipse].}
-
-@; ----------------------------------------
-
-@subsection{Polygons}
-
-@defproc[((draw-polygon [viewport viewport?]) 
-          [points (listof posn?)]
-          [offset posn?]
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Draws a polygon border in @racket[viewport] using @racket[points] for
-the polygon vertices and @racket[offset] as an offset added to all
-points.}
-
-
-@defproc[((clear-polygon [viewport viewport?]) 
-          [points (listof posn?)]
-          [offset posn?])
-         void?]{
-
-Whitens a polygon border in @racket[viewport], analogous to
-@racket[draw-polygon].}
-
-
-@defproc[((flip-polygon [viewport viewport?]) 
-          [points (listof posn?)]
-          [offset posn?])
-         void?]{
-
-@tech{Inverts} a polygon border in @racket[viewport], analogous to
-@racket[draw-polygon].}
-
-
-@defproc[((draw-solid-polygon [viewport viewport?]) 
-          [points (listof posn?)]
-          [offset posn?]
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Draws a solid polygon in @racket[viewport] using @racket[points] for
-the polygon vertices and @racket[offset] as an offset added to all
-points.}
-
-
-@defproc[((clear-solid-polygon [viewport viewport?]) 
-          [points (listof posn?)]
-          [offset posn?])
-         void?]{
-
-Whitens a polygon border in @racket[viewport], analogous to
-@racket[draw-solid-polygon].}
-
-
-@defproc[((flip-solid-polygon [viewport viewport?]) 
-          [points (listof posn?)]
-          [offset posn?])
-         void?]{
-
-@tech{Inverts} a polygon border in @racket[viewport], analogous to
-@racket[draw-solid-polygon].}
-
-@; ----------------------------------------
-
-@subsection{Strings}
-
-@defproc[((draw-string [viewport viewport?]) 
-          [p posn?]
-          [str string?]
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Draws a string at a specified location in the @racket[viewport].
-The lower left of the string begins at @racket[p].}
-
-
-@defproc[((clear-string [viewport viewport?]) 
-          [p posn?]
-          [str string?])
-         void?]{
-
-Whitens a string at a specified location in the @racket[viewport].
-The lower left of the string begins at @racket[p].}
-
-@defproc[((flip-string [viewport viewport?]) 
-          [p posn?]
-          [str string?])
-         void?]{
-
-@tech{Inverts} a string at a specified location in the
-@racket[viewport].  The lower left of the string begins at
-@racket[p].}
-
-@; ----------------------------------------
-
-@subsection{Pixmaps}
-
-@defproc[(((draw-pixmap-posn [file path-string?] 
-                             [type (one-of/c 'unknown 'unknown/mask 
-                                             'gif 'gif/mask 'jpeg 'png 'png/mask 
-                                             'xbm 'xpm 'bmp)
-                                   'unknown/mask])
-           [viewport viewport?])
-          [p posn?]
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Draws a pixmap into @racket[viewport] with its upper left corner at
-position @racket[p]. If @racket[type] is @racket['unknown] or
-@racket['unknown/mask], then the content of the file is examined to
-determine the type.  The
-@racket['gif/mask], @racket['png/mask], and @racket['unknown/mask]
-types draw the bitmap with a transparent background if
-@racket[filename] refers to a GIF/PNG file with a transparent
-background.
-
-The argument @racket[color] is only used when the loaded pixmap is
-monochrome. In that case, the color is used instead of black in the
-drawn image.}
-
-@defproc[((draw-pixmap [viewport viewport?])
-          [file path-string?]
-          [p posn?]
-          [color (or/c (integer-in 0 299)
-                       string?
-                       rgb?)
-                 "black"])
-         void?]{
-
-Equivalent to @racket[(((draw-pixmap-posn file) viewport) p color)].}
-
-@defproc[((save-pixmap [viewport viewport?])
-          [file path-string?]
-          [type (one-of/c 'gif 'jpeg 'png 'xbm 'xpm 'bmp) 'xpm])
-         void?]{
-
-Saves the current content of @racket[viewport] to @racket[file].
-The @racket[type] argument determines the kind of file that is written.}
-
-@; ----------------------------------------
-
-@section{World Operations}
-
-Every canvas comes with an associated world. A client program can set
-the world, start the world's clock, stop the world's clock, and deal
-with tick events (the clock ticks) and keyboard inputs (keyevents).
-
-@defproc[((init-world [viewport viewport?]) [v any/c]) void?]{
-
-Sets the initial value of @racket[viewport]'s world to @racket[v].}
-
-@defproc[((set-on-tick-event [viewport viewport?])
-          [secs real?] [update-callback (any/c . -> . any/c)]) void?]{
-
-For @racket[viewport], sets @racket[update-callback] to be invoked to
-transform the world value every @racket[secs] seconds. Only one
-callback is installed at a time.}
-
-@defproc[((stop-tick [viewport viewport?])) void?]{
-
-Stops updating @racket[viewport]'s world via a callback installed with
-@racket[set-on-tick-event].}
-
-@defproc[((set-on-key-event [viewport viewport?])
-          [key-callback (any/c any/c . -> . any/c)])
-         void?]{
-
-Sets @racket[key-callback] as the function to call whenever a key
-event is received for @racket[viewport]. The @racket[key-callback] is
-given a key event and the current world, and it produces an updated
-world.}
-
-@; ----------------------------------------
-
-@section{Miscellaneous Operations}
-
-@defproc[((get-string-size [viewport viewport?]) [str string?]) (list/c real? real?)]{
-
-Returns the size of @racket[str] as drawn into @racket[viewport] as a
-list of two numbers: width and height.}
-
-@defproc[(viewport->snip [viewport viewport?]) (is-a?/c snip%)] 
-
-Returns an object that can be inserted into an editor buffer to
-display the current image in the viewport. (Subsequent drawing to the
-viewport does not affect the snip's image.)
-
-When snips are the results of computations in the interactions window,
-DrRacket shows the snip in the interactions window.}
-
-@defproc[(viewport-dc [viewport viewport?]) (is-a?/c dc<%>)]{
-
-Returns an object for direct drawing into @racket[viewport]'s
-on-screen representation (if any). Mirror all such drawing to the
-result of @racket[(viewport-buffer-dc viewport)], too.}
-
-@defproc[(viewport-buffer-dc [viewport viewport?]) (is-a?/c dc<%>)]{
-
-Returns an object for direct drawing into @racket[viewport]'s
-off-screen representation. Mirror all such drawing to the
-result of @racket[(viewport-dc viewport)], too.}
-
-@; ----------------------------------------
-
-@section{An Example}
-
-@racketblock[
-(open-graphics)
-(code:comment @#,t{nothing appears to happen, but the library is initialized...})
-
-(define w (open-viewport "practice" 300 300))
-(code:comment @#,t{viewport window appears})
-
-((draw-line w) (make-posn 30 30) (make-posn 100 100))     
-(code:comment @#,t{line appears})
-
-(close-viewport w)
-(code:comment @#,t{viewport disappears})
-
-(close-graphics)
-(code:comment @#,t{again, nothing appears to happen, but})
-(code:comment @#,t{unclosed viewports (if any) would disappear})
-]
-
-@section{A More Complicated Example}
-
-The use of multiple viewports, viewport descriptors, drawing
-operations for multiple viewports is as easy as the use of a single
-viewport: 
-
-@racketblock[
-(open-graphics)
-(let* ((code:comment @#,t{@racket[w1] and @racket[w2] are viewports for different windows})
-       [w1  (open-viewport "viewport 1" 300 300)]
-       [w2  (open-viewport "viewport 2" 200 500)]
-       (code:comment @#,t{@racket[d1] and @racket[d2] draw lines in different viewports})
-       [d1  (draw-line w1)]
-       [d2  (draw-line w2)])
-  (code:comment @#,t{draws a line in viewport labeled ``viewport 1''})
-  (d1 (make-posn 100 5) (make-posn 5 100))
-  (code:comment @#,t{draws a line in viewport labeled ``viewport 2''})
-  (d2 (make-posn 100 100) (make-posn 101 400)))
- 
-(code:comment @#,t{we no longer have access to viewports 1 and 2,})
-(code:comment @#,t{since their descriptors did not escape the @racket[let]})
-(close-graphics) 
-(code:comment @#,t{removes the viewports})
-]
-
-@section{Protecting Graphics Operations}
-
-To guarantee the proper closing of viewports in cases of errors,
-especially when a program manages several viewports simultaneously, a
-programmer should use @racket[dynamic-wind:]
-
-@racketblock[
-(let ([w (open-viewport "hello" 100 100)])
-  (dynamic-wind
-    (code:comment @#,t{what we want to happen first: nothing})
-    void
-    (code:comment @#,t{the main program (errors constrained to this piece)})
-    (lambda () (draw-pixel 13))  (code:comment @#,t{an error})
-    (code:comment @#,t{what we would like to happen, whether the main program})
-    (code:comment @#,t{finishes normally or not})
-    (lambda () (close-viewport w))))
-]
-
-@; ----------------------------------------
-
-@section{Mouse Operations}
-
-The graphics library contains functions that determine where the mouse
-is, if there are any clicks, etc.  The functions
-@racket[get-mouse-click] and @racket[ready-mouse-click] first return a
-``mouse-click descriptor,'' and then other functions take the
-descriptor and return the mouse's position, which button was pushed,
-etc.  Mouse clicks are buffered and returned in the same order in
-which they occurred.  Thus, the descriptors returned by
-@racket[get-mouse-click] and @racket[ready-mouse-click] may be from
-clicks that occurred long before these functions were called.
-
-@defproc[(get-mouse-click [viewport viewport?]) mouse-click?]{
-
-Returns the next mouse click in @racket[viewport], waiting for a click
-if necessary.}
-
-
-@defproc[(ready-mouse-click [viewport viewport?])
-         (or/c mouse-click? false/c)]{
-
-Returns either a mouse click descriptor or @racket[#f] if none is
-available.  Unlike @racket[get-mouse-click],
-@racket[ready-mouse-click] always returns immediately.}
-
-
-@defproc[(ready-mouse-release [viewport viewport?]) 
-         (or/c mouse-click? false/c)]{
-
-Returns either a click descriptor from a mouse-release (button-up)
-event or @racket[#f] if none is available.}
-
-
-@defproc[(query-mouse-posn [viewport viewport?]) (or/c posn? false/c)]{
-
-Returns either the position of the mouse cursor within
-@racket[viewport] or else @racket[#f] if the cursor is currently
-outside @racket[viewport].}
-
-
-@defproc[(mouse-click-posn [mouse-click mouse-click?]) posn?]{
-
-Returns the position of the pixel within a viewport where a given
-mouse click occurred.}
-
-
-@defproc[(left-mouse-click? [mouse-click mouse-click?]) boolean?]{
-
-Returns @racket[#t] if the mouse click occurred with the left mouse
-button, @racket[#f] otherwise.}
-
-@defproc[(middle-mouse-click? [mouse-click mouse-click?]) boolean?]{
-
-Returns @racket[#t] if the mouse click occurred with the middle mouse
-button, @racket[#f] otherwise.}
-
-@defproc[(right-mouse-click? [mouse-click mouse-click?]) boolean?]{
-
-Returns @racket[#t] if the mouse click occurred with the right mouse
-button, @racket[#f] otherwise.}
-
-@; ----------------------------------------
-
-@section{Keyboard Operations}
-
-The graphics library contains functions that report key presses from
-the keyboard.  The functions @racket[get-key-press] and
-@racket[ready-key-press] return a ``key-press descriptor,'' and then
-@racket[key-value] takes the descriptor and returns a character or
-symbol (usually a character) representing the key that was pressed.
-Key presses are buffered and returned in the same order in which they
-occurred.  Thus, the descriptors returned by @racket[get-key-press]
-and @racket[ready-key-press] may be from presses that occurred long
-before these functions were called.
-
-@defproc[(get-key-press [viewport viewport?]) key-press?]{
-
-Returns the next key press in the @racket[viewport], waiting for a
-key press if necessary.}
-
-@defproc[(ready-key-press [viewport viewport?]) key-press?]{
-
-Returns the next key press in the @racket[viewport] or returns
-@racket[#f] if none is available. Unlike @racket[get-key-press],
-@racket[ready-key-press] always returns immediately.}
-
-@defproc[(key-value [key-press key-press?]) (or/c char? symbol?)]{
-
-Returns a character or special symbol for the key that was
-pressed. For example, the Enter key generates @racket[#\return], and the
-up-arrow key generates @racket['up].  For a complete list of possible
-return values, see @method[key-event% get-key-code].}
-
-@; ----------------------------------------
-
-@section{Flushing}
-
-@defproc[(viewport-flush-input [viewport viewport?]) void?]{
-
-Empties all mouse and keyboard events in the input buffer of
-@racket[viewport].}
-
-@; ----------------------------------------
-
-@section{Graphics Library as a Unit}
-
-@subsection{Signatures}
-
-@defmodule[graphics/graphics-sig]
-
-@defsignature[graphics^ ()]
-
-Includes all of the bindings defined earlier in this chapter, except
-the @racket[posn] bindings of @secref["posn"].
-
-
-@defsignature[graphics:posn^ ()]
-
-Includes the @racket[posn] bindings of @secref["posn"].
-
-
-@subsection{Unit with @racket[posn]}
-
-@defmodule[graphics/graphics-unit]
-
-@defthing[graphics@ unit?]{
-
-Imports @racket[mred^] and exports both @racket[graphics^] and
-@racket[graphics:posn^].}
-
-@subsection{Unit without @racket[posn]}
-
-@defmodule[graphics/graphics-posn-less-unit]
-
-@defthing[graphics-posn-less@ unit?]{
-
-Imports @racket[mred^] and @racket[graphics:posn^] and exports
-@racket[graphics^].}
diff --git a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/info.rkt b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/info.rkt
deleted file mode 100644
index 211214fd55..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define scribblings '(("graphics.scrbl" (multi-page) (legacy))
-                      ("turtles.scrbl" (multi-page) (gui-library))))
-(define doc-categories '(legacy library))
diff --git a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/traditional-turtles.scrbl b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/traditional-turtles.scrbl
deleted file mode 100644
index 2f8e6388eb..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/traditional-turtles.scrbl
+++ /dev/null
@@ -1,244 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label graphics/turtles graphics/turtle-examples))
-
-@title{Traditional Turtles}
-
-@defmodule[graphics/turtles]
-
-To use any of the turtle drawing functions, you first need to
-initialize the turtles by calling @racket[(turtles #t)].
-
-@defproc*[([(turtles [on? any/c]) void?]
-           [(turtles) void?])]{
-
-Shows and hides the turtles window based on @racket[on?]. If
-@racket[on?] is not supplied, the state is toggled.}
-
-@defproc[(move [n real?]) void?]{
-
-Moves the turtle @racket[n] pixels without drawing.}
-
-@defproc[(draw [n real?]) void?]{
-
-Moves the turtle @racket[n] pixels and draws a line on the path.}
-
-@defproc[(erase [n real?]) void?]{
-
-Moves the turtle @racket[n] pixels and erase along the path.}
-
-@deftogether[(
-@defproc[(move-offset [h real?][v real?]) void?]
-@defproc[(draw-offset [h real?][v real?]) void?]
-@defproc[(erase-offset [h real?][v real?]) void?]
-)]{
-
-Like @racket[move], @racket[draw], and @racket[erase], but using a
-horizontal and vertical offset from the turtle's current position.}
-
-
-@defproc[(turn [theta real?]) void?]{
- 
-Turns the turtle @racket[theta] degrees counter-clockwise.}
-
-@defproc[(turn/radians [theta real?]) void?]{
-
-Turns the turtle @racket[theta] radians counter-clockwise.}
-
-@defproc[(clear) void?]{
-
-Erases the turtles window.}
-
-@defproc[(home) void?]{
-
-Leaves only one turtle, in the start position.}
-
-@defform[(split expr ...)]{
-
-Spawns a new turtle where the turtle is currently located. In order to
-distinguish the two turtles, only the new one evaluates
-@racket[expr]. For example, if you start with a fresh turtle-window
-and evaluate:
-
-@racketblock[
-(split (turn/radians (/ pi 2)))
-]
-
-you will have two turtles, pointing at right angles to each
-other. Continue with 
-
-@racketblock[
-(draw 100)
-]
-
-You will see two lines. Now, if you evaluate those two expression
-again, you will have four turtles, etc.}
-
-@defform[(split* expr ...)]{
-
-Like @racket[(split expr ...)], except that one turtle is created for
-each @racket[expr].
-
-For example, to create two turtles, one pointing at @math["\u3C0/2"]
-and one at @math["\u3C0/3"], evaluate
-
-@racketblock[
- (split* (turn/radians (/ pi 3)) (turn/radians (/ pi 2)))
-]}
-
-@defform[(tprompt expr ...)]{
-
-Limits the splitting of the turtles. Before @racket[expr] is evaluated,
-the state of the turtles (how many, their positions and headings) is
-``checkpointed.'' Then @racket[expr] is evaluated, and then the state
-of the turtles is restored, but all drawing that may have occurred
-during execution of @racket[expr] remains.
-
-For example
-
-@racketblock[
-(tprompt (draw 100))
-]
-
-moves a turtle forward 100 pixel while drawing a line, and then moves
-the turtle be immediately back to its original position. Similarly,
-
-@racketblock[
-(tprompt (split (turn/radians (/ pi 2))))
-]
-
-splits the turtle into two, rotates one 90 degrees, and then
-collapses back to a single turtle.
-
-The fern functions below demonstrate more advanced use of
-@racket[tprompt].}
-
-@defproc[(save-turtle-bitmap [name (or/c path-string? output-port?)]
-                             [kind (or/c 'png 'jpeg 'xbm 'xpm 'bmp)])
-         void?]{
-  Saves the current state of the turtles window in an image file.
-}
-
-@defthing[turtle-window-size exact-positive-integer?]{
-  The size of the turtles window.
-}
-
-@; ----------------------------------------
-
-@section{Examples}
-
-@defmodule[graphics/turtle-examples]
-
-The @racketmodname[graphics/turtle-examples] library's source is meant
-to be read, but it also exports the following examples. To display these
-examples, first initialize the turtle window with @racket[(turtles #t)].
-
-@defproc[(regular-poly [sides exact-nonnegative-integer?] [radius real?])
-         void?]{
-
-Draws a regular poly centered at the turtle with @racket[sides] sides
-and with radius @racket[radius].}
-
-@defproc[(regular-polys [n exact-nonnegative-integer?] [s any/c])
-         void?]{
-
-Draws @racket[n] regular polys each with @racket[n] sides centered at
-the turtle.}
-
-@defproc[(radial-turtles [n exact-nonnegative-integer?]) void?]{
-
-Places @math{2^n} turtles spaced evenly pointing radially outward.}
-
-@defproc[(spaced-turtles [n exact-nonnegative-integer?]) void?]{
-
-Places @math{2^n} turtles evenly spaced in a line and pointing in the
-same direction as the original turtle.}
-
-@defproc[(spokes) void?]{
- 
-Draws some spokes, using @racket[radial-turtles] and
-@racket[spaced-turtles].}
-
-@defproc[(gapped-lines) void?]{
-   Draw a bunch of parallel line segments, using 
-   @racket[spaced-turtles].
-}
-
-@defproc[(spyro-gyra) void?]{
- 
-Draws a spyro-grya reminiscent shape.}
-
-@defproc[(neato) void?]{
-
-As the name says...}
-
-@defproc[(graphics-bexam) void?]{
-  Draws a fractal that came up on an exam given at Rice in 1997 or so.
-}
-
-@defthing[sierp-size real?]{
-
-A constant that is a good size for the @racket[sierp] procedures.}
-
-@deftogether[(
-@defproc[(sierp [sierp-size real?]) void?]
-@defproc[(sierp-nosplit [sierp-size real?]) void?]
-)]{
-
-Draws the @as-index{Sierpinski triangle} in two different ways, the
-first using @racket[split] heavily. After running the first one, try
-executing @racket[(draw 10)].}
-
-
-@defthing[koch-size real?]{
-
-A constant that is a good size for the @racket[koch] procedures.}
-
-@deftogether[(
-@defproc[(koch-split [koch-size real?]) void?]
-@defproc[(koch-draw [koch-size real?]) void?]
-)]{
-
-Draws the same @as-index{Koch snowflake} in two different ways.}
-
-@defproc[(lorenz [a real?] [b real?] [c real?]) void?]{
-
-Watch the @as-index{Lorenz attractor} (a.k.a. @as-index{butterfly attractor})
-initial values @racket[a], @racket[b], and @racket[c].}
-
-@defproc[(lorenz1) void?]{
-
-Calls @racket[lorenz] with good initial values.}
-
-@defproc[(peano [peano-size real?]) void?]{
-  Draws the @as-index{Peano space-filling curve}.
-}
-
-@defproc[(peano-position-turtle) void?]{
-  Moves the turtle to a good place to prepare for
-  a call to @racket[peano].
-}
-
-@defthing[peano-size exact-nonnegative-integer?]{
-  One size to use with @racket[peano].
-}
-
-@defthing[fern-size exact-nonnegative-integer?]{
-
-A good size for the @racket[fern1] and @racket[fern2] functions.}
-
-@deftogether[(
-@defproc[(fern1 [fern-size exact-nonnegative-integer?]) void?]
-@defproc[(fern2 [fern-size exact-nonnegative-integer?]) void?]
-)]{
-
-Draws a @as-index{fern fractal}.
-
-For @racket[fern1], you will probably want to point the turtle up
-before running this one, with something like:
-
-@racketblock[
-(turn/radians (- (/ pi 2)))
-]
-
-For @racket[fern2], you may need to backup a little.}
-
diff --git a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/turtles.scrbl b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/turtles.scrbl
deleted file mode 100644
index c74aa6890f..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/turtles.scrbl
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual)
-
-@title{Turtle Graphics}
-
-Turtle graphics are available in two forms: traditional imperative
-turtle operations that draw into a fixed window, and functional turtle
-operations that consume and produce a turtle picture.
-
-@table-of-contents[]
-
-@include-section["traditional-turtles.scrbl"]
-@include-section["value-turtles.scrbl"]
diff --git a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/value-turtles.scrbl b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/value-turtles.scrbl
deleted file mode 100644
index 247afeb0de..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/value-turtles.scrbl
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label graphics/value-turtles))
-
-@title{Value Turtles}
-
-@defmodule[graphics/value-turtles]
-
-The value turtles are a variation on traditional turtles.  Rather than
-having just a single window where each operation changes the state of
-that window, in the @racket[graphics/value-turtles] library, the
-entire turtles window is treated as a value. This means that each of
-the primitive operations accepts, in addition to the usual arguments,
-a turtles-window value; instead of returning nothing, each returns a
-turtles-window value.
-
-@defproc[(turtles [width real?] 
-                  [height real?]
-                  [init-x real? (/ width 2)]
-                  [init-y real? (/ height 2)]
-                  [init-angle real? 0])
-          turtles?]{
-
-Creates a new turtles window with the given @racket[width] and
-@racket[height]. The remaining arguments specify position of the
-initial turtle and the direction in radians (where @racket[0] is to
-the right).}
-
-@defproc[(turtles? [v any/c]) boolean?]{
-  Determines if @racket[v] is a turtles drawing.
-}
-
-@defproc[(move [n real?] [turtles turtles?]) turtles?]{
-
-Moves the turtle @racket[n] pixels, returning a new turtles window.}
-
-@defproc[(draw [n real?] [turtles turtles?]) turtles?]{
-
-Moves the turtle @racket[n] pixels and draws a line along the path,
-returning a new turtles window.}
-
-@defproc[(erase [n real?] [turtles turtles?]) turtles?]{
-
-Moves the turtle @racket[n] pixels and erases a line along the path,
-returning a new turtles window.}
-
-
-@deftogether[(
-@defproc[(move-offset [h real?] [v real?] [turtles turtles?]) turtles?]
-@defproc[(draw-offset [h real?] [v real?] [turtles turtles?]) turtles?]
-@defproc[(erase-offset [h real?] [v real?] [turtles turtles?]) turtles?]
-)]{
-
-Like @racket[move], @racket[draw], and @racket[erase], but using a
-horizontal and vertical offset from the turtle's current position.}
-
-
-@defproc[(turn [theta real?] [turtles turtles?]) turtles?]{
-
-Turns the turtle @racket[theta] degrees counter-clockwise, returning a
-new turtles window.}
-
-@defproc[(turn/radians [theta real?] [turtles turtles?]) turtles?]{
-
-Turns the turtle @racket[theta] radians counter-clockwise, returning a
-new turtles window.}
-
-@defproc[(merge [turtles1 turtles?] [turtles2 turtles?]) turtles?]{
-
-The @racket[split] and @racket[tprompt] forms provided by
-@racketmodname[graphics/turtles] aren't needed for
-@racketmodname[graphics/value-turtles], since the turtles window is a
-value.
-    
-Instead, the @racket[merge] accepts two turtles windows and combines
-the state of the two turtles windows into a single window. The new
-window contains all of the turtles of the previous two windows, but
-only the line drawings of the first turtles argument.}
-
-@defproc[(clean [turtles turtles?]) turtles?]{
-  Produces a turtles like @racket[turtles], but with only a single
-  turtle, positioned in the center.
-}
-
-@; ----------------------------------------
-
-@section[#:tag "value-examples"]{Examples}
-
-@defmodule[graphics/value-turtles-examples]
-
-The @racketmodname[graphics/turtle-examples] library's source is meant
-to be read, but it also exports the following examples.
-
-@defproc[(radial-turtles [n exact-nonnegative-integer?] [turtles turtles?]) turtles?]{
-
-Places @math{2^n} turtles spaced evenly pointing radially outward.}
-
-@defproc[(spaced-turtles [n exact-nonnegative-integer?] [turtles turtles?]) turtles?]{
-
-Places @math{2^n} turtles evenly spaced in a line and pointing in the
-same direction as the original turtle.}
-
-
-@defproc[(neato [turtles turtles?]) turtles?]{
- As the name says...
-}
-
-@defproc[(regular-poly [sides exact-nonnegative-integer?] 
-                       [radius real?]
-                       [turtles turtles?])
-         turtles?]{
-
-Draws a regular poly centered at the turtle with @racket[sides] sides
-and with radius @racket[radius].}
-
-@defproc[(regular-polys [n exact-nonnegative-integer?] 
-                        [s any/c]
-                        [turtles turtles?])
-         turtles?]{
-
-Draws @racket[n] regular polys each with @racket[n] sides centered at
-the turtle.}
-
-@defproc[(spokes [turtles turtles?]) turtles?]{
- 
-Draws some spokes, using @racket[radial-turtles] and
-@racket[spaced-turtles].}
-
-@defproc[(spyro-gyra [turtles turtles?]) turtles?]{
- 
-Draws a spyro-grya reminiscent shape.}
diff --git a/pkgs/htdp-pkgs/htdp-doc/htdp/error-composition.scrbl b/pkgs/htdp-pkgs/htdp-doc/htdp/error-composition.scrbl
deleted file mode 100644
index ec9c3ac272..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/htdp/error-composition.scrbl
+++ /dev/null
@@ -1,206 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual 
-          (for-label [only-in lang/htdp-advanced set!]
-                     [only-in lang/htdp-intermediate let]  
-                     [only-in lang/htdp-beginner define]
-                     [only-in racket/base syntax-local-expand-expression]))
-
-@(require scribble/decode)
-
-@(require [only-in scribble/core table style])
-
-
-@title[#:tag "error-guidelines"]{Error Message Composition Guidelines}
-
-This section lists some guidelines for writing good error messages for
-novices, as informed by @seclink["research"]{our research}.  Please
-follow these guidelines when you write code that is intended for
-beginners, including libraries and teachpacks.  It ensures that error
-messages from your code fits messages from the student languages and
-from other teachpacks.
-
-@(define (samp . text) @splice[@list{@emph{``@splice[text]''}}])
-@(define (word . text) @splice[@list{‘@splice[text]’}])
-
-@section{General Guidelines}
-
-@itemize[
-  @item{Frustrated students will peer at the error message for clues on
-    how to proceed.  Avoid offering hints, and avoid proposing any
-    specific modification. Students will follow well-meaning-but-wrong
-    advice uncritically, if only because they have no reason to doubt
-    the authoritative voice of the tool.}
-
-  @item{Be concise and clear.  Students give up reading error messages
-    if the text is too long, uses obscure words, or employs difficult
-    grammar.}]
-
-@section{Message Structure and Form}
-
-@itemize[
-  @item{Start the message with the name of the construct whose
-    constraint is being violated, followed by a colon.}
-
-  @item{State the constraint that was violated (@samp{expected a...}),
-    then contrast with what was found.  For example, @samp{this function
-    expects two arguments, but found only one}.  If needed, explain how
-    what was found fails to satisfy the constraint.  Write somewhat
-    anthropomorphically with an objective voice that is neither friendly
-    nor antagonistic.}
-
-  @item{If an expression contains multiple errors, report the leftmost
-    error first.  E.g., the error in @racket[(define 1 2 3)] is
-    @samp{expected the variable name, but found a number}, not
-    @samp{expected 2 parts after define, but found 3}.  Before raising
-    an error about a sub-part of a macro, call
-    @racket[syntax-local-expand-expression] on sub-expressions to its
-    left, so that such errors are shown first.}
-
-  @item{State the number of parts instead of saying @samp{found too many
-    parts}.  Write the code necessary to make plurals agree.}]
-
-@section{Words For Describing Code}
-
-Use only the following vocabulary words to describe code:
-
-@table[(style 'boxed '())
-@list[@list[@para{function} @para{variable} @para{argument} @para{function body}]
-      @list[@para{expression} @para{part} @para{clause} @para{top level}]
-      @list[@para{structure name} @para{type name} @para{field name} @para{binding}]]]
-
-@itemize[
-  @item{Use binding for the square-braced pair in a @racket[let]
-    and similar binding forms.}
-
-  @item{Use @word{argument} for actual arguments and @word{variable} for
-    formal arguments in the header and body of a definition.}
-
-  @item{Use @word{part} when speaking about an s-expression that is not
-    an expression, either because it is malformed, because it occurs in
-    a non-expression position, or because it is a valid piece of syntax
-    for a macro invocation.  A well-formed and well-placed call to a
-    function, primitive, or macro is not a @word{part}, it is an
-    @word{expression}.}]
-
-@section{Words For Describing Runtime Behavior}
-
-Use the following vocabulary words to describe how code runs:
-
-@itemize[
-  @item{When specifying a function's behavior, say @samp{the function
-    takes ... and produces ...}}
-
-  @item{When describing a contract violation, say @samp{the function
-    expects ... but received ...}}
-
-  @item{As much as possible, identify expressions and the value they evaluate
-    to, e.g. @samp{the value of @racket[(f x)] is 5}.  If it is necessary to
-    mention evaluation order, such as when the context discusses mutable state,
-    say that the expression @samp{evaluates to} a value.  Function calls
-    are a special case of expression.  Prefer @samp{the function call produces ...}
-    to @samp{the function call evaluates to ...}, except when trying to draw attention to
-    the evaluation of the arguments.}
-
-  @item{@racket[set!] and
-    @racketidfont{set-}@racket[_structure-name]@racketidfont{-}@racket[_field-name]@racketidfont{!}
-    @word{mutate} variables and structure instances, respectively. Avoid using
-    the verb @word{sets} when discussing mutation, and reserve the verbs
-    @word{changes} and @word{updates} for functional updates.}]
-
-
-@section{Prohibited Words}
-
-These guidelines use few terms intentionally, emphasizing commonality
-among concepts rather than technical precision (which most students do
-not appreciate anyway).
-
-@table[(style 'boxed '())
-@list[
-  @list[@para{@bold{Instead of}}
-        @para{@bold{Use}}]
-  @list[@para{procedure, primitive name, primitive operator, predicate,
-          selector, constructor}
-        @para{@samp{function}''}]
-  @list[@para{s-expression}
-        @para{@samp{expression}}]
-  @list[@para{identifier}
-        @para{@samp{argument} or @samp{variable}, depending on the use
-          in the program}]
-  @list[@para{defined name}
-        @para{@samp{function} or @samp{variable}}]
-  @list[@para{sequence}
-        @para{@samp{at least one (in parentheses)}}]
-  @list[@para{function header}
-        @para{@samp{after define}, @samp{after the name},
-          @samp{after the first argument}, ...}]
-  @list[@para{keyword}
-        @para{mention the construct directly by name, such as
-          @samp{expected a variable but found a cond}}]
-  @list[@para{built-in}  @para{Nothing --- avoid this term}]
-  @list[@para{macro} @para{Nothing --- avoid this term}]]]
-
-@section{General Vocabulary Guidelines}
-
-@itemize[
-  @item{Avoid modifiers that are not necessary to disambiguate. Write
-    @word{variable} instead of @word{local variable}, @word{defined
-    variable}, or @word{input variable}.  Write @word{clause} instead of
-    @word{question-answer clause}.  If they appear necessary for
-    disambiguation, try to find some other way to achieve this (and drop
-    the modifier).}
-
-  @item{When introducing macros with sub-parts, reuse existing
-    vocabulary words, such as @word{clause} or @word{binding} (if
-    appropriate), or just @word{part}, instead of defining new terms.}
-
-  @item{Use @word{name} only when describing the syntax of a definition
-    form.  For example, the define form in BSL should say @samp{expected
-    at least one variable after the function name}.  Outside of the
-    definition form, simply use the word @word{function} rather than
-    distinguish between (1) a function, (2) the variable that binds the
-    function, and (3) the name of that variable.
-
-    [Rationale: Students learn this distinction when they learn about
-    lambda.  The first is the lambda implicit in the definition, the
-    second is the variable introduced by the definition that can appear
-    as the first argument to @racket[set!], the third is the particular
-    sequence of letters.  But BSL should avoid this complexity, and
-    ASL’s error messages should maintain consistency with BSL.]}
-
-  @item{Avoid introducing technical vocabulary, even if well-known to a
-    mathematician.}]
-
-@section{Punctuation}
-
-@itemize[
-  @item{Do not use any punctuation beyond those of the normal English
-    language.  Do not write @litchar{<>} around type names, and do not
-    write quotes around keywords.}]
-
-@section[#:tag "research"]{Supporting Research}
-
-These guidelines arose from a collections of research studies held at
-the Worcester Polytechnic Institute, Brown University, and Northeastern
-University.  Further experiment details and results are described in:
-@itemize[
-  @item{@hyperlink["http://www.cs.brown.edu/~sk/Publications/Papers/Published/mfk-mind-lang-novice-inter-error-msg/"]{
-          Mind Your Language: On Novices' Interactions with Error
-          Messages}
-
-    This paper reports on a series of studies that explore beginning
-    students' interactions with the vocabulary and source-expression
-    highlighting in DrRacket.  Our findings demonstrate that the error
-    message DrRacket's old error messages significantly failed to convey
-    information accurately to students.}
-
-  @item{@hyperlink["http://www.cs.brown.edu/~sk/Publications/Papers/Published/mfk-measur-effect-error-msg-novice-sigcse/"]{
-          Measuring the Effectiveness of Error Messages Designed for
-          Novice Programmers}
-
-    This paper presents a fine-grained grading rubric for evaluating the
-    performance of individual error messages.  We applied the rubric to
-    a course worth of student work, which allowed us to characterize
-    some ways error messages fail.}]
-
-@; -----------------------------------------------------------------------------
diff --git a/pkgs/htdp-pkgs/htdp-doc/htdp/error-reporting.scrbl b/pkgs/htdp-pkgs/htdp-doc/htdp/error-reporting.scrbl
deleted file mode 100644
index d553cc4bf3..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/htdp/error-reporting.scrbl
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual (for-label htdp/error 2htdp/image racket))
-
-@title[#:tag "error-reporting"]{Error Reporting Functions} 
-
-@defmodule[htdp/error]
-
-To provide uniform error messages from teachpacks, this module provides several functions: 
-
-@defproc[(check-arg [name (or/c symbol? string?)]
-		    [chk  boolean?]
-                    [expected any/c]
-		    [position (or/c (and/c positive? integer?) string?)]
-		    [given any/c])
-          void?]{
- Checks an flat-valued argument to function @scheme[name].
- Reports an error for function @scheme[name] 
-  telling students what kind of data is @scheme[expected] at the @scheme[position]-th argument 
-  and displaying what value was actually @scheme[given],
-  unless @scheme[chk] is @scheme[true].}
-
-@defproc[(check-arity [name (or/c symbol? string?)]
-		      [arg# (or/c (and/c positive? integer?) string?)?]
-		      [args list?])
-         void?]{
- Checks the arity of a procedure-valued argument to function @scheme[name].
- Reports an error for function @scheme[name] 
-  telling students that @scheme[(length args)] arguments were provided but
-  @scheme[arg#] were expected, unless @scheme[(= (length args) arg#)]
-  produces @scheme[true].} 
-
-@defproc[(check-proc [name (or/c symbol? string?)]
-		     [proc any/c]
-		     [expected natural?]
-		     [arg# (or/c (and/c positive? integer?) string?)]
-		     [arg-err string?])
-         void?]{
- Checks [the properties of] a procedure-valued argument to function @scheme[name].
- Reports an error for function @scheme[name] 
-  telling students that a procedure was expected at position @scheme[arg#]
-  and that this procedure should be of arity @scheme[expected],
-  unless the @scheme[proc] is a function and has the @scheme[expected] arity.
-  The string @scheme[arg-err] is used to describe the higher-order argument.}
-
-@defproc[(check-result [name (or/c symbol? string?)]
-		       [pred? (-> any/c boolean?)]
-		       [kind (or/c symbol? string?)]
-		       [returned any/c] ...+)
-          void?]{
- Checks the expected result of a procedure-valued argument.
- If the result satisfies @scheme[pred?], it is returned. 
- Otherwise, the function reports an error for function @scheme[name] 
-  telling students what @scheme[kind] of value is expected and what the
-  @scheme[returned] value is. NOTE: if there is more than one
-  @scheme[returned] value, the function uses the second value. (MF: I forgot
-  why.)}
-
-
-@defproc[(check-list-list [name (or/c symbol? string?)] 
-			  [chk (or/c string? false/c)]
-			  [pred? any/c]
-			  [given any/c]) 
-          void?]{
- Checks a list-of-lists-valued argument to function @scheme[name].
- Reports an error for function @scheme[name] if a list-of-lists contains 
- a value of the wrong kind---signaled via a string-valued @scheme[chk]. 
- The @scheme[given] value is the element that went wrong. Rarely used.}
-
-@defproc[(check-color [name (or/c symbol? string?)] 
-		      [arg# natural?]
-		      [given any/c]) 
-         void?]{
- Checks a color-valued argument to function @scheme[name]. 
- Deprecated. Use @scheme[image-color?] instead. 
- }
-
-@defproc[(check-fun-res [f procedure?]
-			[pred? (-> any/c boolean?)]
-			[type (or/c symbol? string?)]) 
-          void?]{
- Creates a callback from @scheme[f] and uses @scheme[check-result] to make
- sure the result is a piece of data that satisfies @scheme[pred?],
- described as @scheme[type].
- }
-
-@defproc[(natural? [o any/c]) boolean?]{
- Determines whether the given value is a natural number.}
-
-@defproc[(find-non [pred? (-> any/c boolean?)] [l list?]) (or/c any/c false/c)]{
- Find an element of @scheme[l] for which @scheme[(pred? l)] produces
- @scheme[true]; otherwise return @scheme[false].}
- 
-@defproc[(check-dependencies [name (or/c symbol? string?)]
-			     [chk  boolean?]
-			     [fmt format-string?]
-			     [arg any/c] ...) 
-          void?]{
- Unless @scheme[chk] is @scheme[true], it raises an error called
- @scheme[name] whose message is composed from @scheme[fmt] and the
- @scheme[arg]s. 
- }
-
-@defproc[(tp-error [name (or/c symbol? string?)]
-		   [fmt format-string?]
-		   [arg any/c] ...)
-         void?]{
- Signals an @racket[exn:fail:contract] from @scheme[fmt] and @scheme[arg]
- for a function called @scheme[name].}
-
-@defproc[(tp-exn? [o any/c]) boolean?]{
- Determine whether the given object is a teachpack exception 
- MF: Guillaume seems to have deprecated these structures. 
- }
-
-@defproc[(number->ord [n natural?]) string?]{
- Convert a position number into a string, e.g., 1 into ``first'' and so
- on.}
-
-MF: These library and its uses needs to be cleaned up. 
-
diff --git a/pkgs/htdp-pkgs/htdp-doc/htdp/htdp-lib.scrbl b/pkgs/htdp-pkgs/htdp-doc/htdp/htdp-lib.scrbl
deleted file mode 100644
index 2ed4a30343..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/htdp/htdp-lib.scrbl
+++ /dev/null
@@ -1,168 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual scribble/eval
-          (for-label lang/prim lang/imageeq lang/posn racket/gui/base
-                     (only-in racket/contract any/c)
-                     (only-in racket/class is-a?/c)))
-@(define (htdp-ref s) @secref[#:doc '(lib "scribblings/htdp-langs/htdp-langs.scrbl") s])
-
-@title{HtDP Languages as Libraries}
-
-@; ------------------------------------------------------------
-@section{@italic{HtDP} Beginning Student}
-
-@defmodule[lang/htdp-beginner]
-
-The @racketmodname[lang/htdp-beginner] module provides the Beginning
-Student Language; see @htdp-ref["beginner"].
-
-@; ------------------------------------------------------------
-@section{@italic{HtDP} Beginning Student with Abbreviations}
-
-@defmodule[lang/htdp-beginner-abbr]
-
-The @racketmodname[lang/htdp-beginner-abbr] module provides the
-Beginning Student with Abbreviations language; see
-@htdp-ref["beginner-abbr"].
-
-@; ------------------------------------------------------------
-@section{@italic{HtDP} Intermediate Student}
-
-@defmodule[lang/htdp-intermediate]
-
-The @racketmodname[lang/htdp-intermediate] module provides the
-Intermediate Student language; see
-@htdp-ref["intermediate"].
-
-@; ------------------------------------------------------------
-@section{@italic{HtDP} Intermediate Student with Lambda}
-
-@defmodule[lang/htdp-intermediate-lambda]
-
-The @racketmodname[lang/htdp-intermediate-lambda] module provides the
-Intermediate Student with Lambda language; see
-@htdp-ref["intermediate-lam"].
-
-@; ------------------------------------------------------------
-@section{@italic{HtDP} Advanced Student}
-
-@defmodule[lang/htdp-advanced]
-
-The @racketmodname[lang/htdp-advanced] module provides the Advanced
-Student language; see @htdp-ref["advanced"].
-
-@; ------------------------------------------------------------
-@section{Pretty Big Text (Legacy Language)}
-
-@defmodule[lang/plt-pretty-big-text]
-
-The @racketmodname[lang/plt-pretty-big-text] module is similar to the
-@italic{HtDP} Advanced Student language, but with more of Racket's
-libraries in legacy form. It provides the bindings of 
-@racketmodname[mzscheme],
-@racketmodname[mzlib/etc], @racketmodname[mzlib/file],
-@racketmodname[mzlib/list], @racketmodname[mzlib/class],
-@racketmodname[mzlib/unit], @racketmodname[mzlib/include],
-@racketmodname[mzlib/defmacro], @racketmodname[mzlib/pretty],
-@racketmodname[mzlib/string], @racketmodname[mzlib/thread],
-@racketmodname[mzlib/math], @racketmodname[mzlib/match],
-@racketmodname[mzlib/shared], and @racketmodname[lang/posn].
-
-@; ------------------------------------------------------------
-
-@section{Pretty Big (Legacy Language)}
-
-@defmodule[lang/plt-pretty-big]
-
-The @racketmodname[lang/plt-pretty-big] module extends
-@racket[lang/plt-pretty-big-text] with @racketmodname[racket/gui/base]
-and @racketmodname[lang/imageeq].  This language corresponds to the
-@onscreen{Pretty Big} legacy language in DrRacket.
-
-@; ----------------------------------------------------------------------
-
-@section{@racket[posn]s in @italic{HtDP} Languages}
-
-@defmodule[lang/posn]
-
-@defstruct[posn ([x any/c] [y any/c])]{
-
-The @racket[posn] structure type that is also provided by
-@racket[lang/htdp-beginner].}
-
-
-@; ----------------------------------------------------------------------
-
-@section{Image Equality in @italic{HtDP} Languages}
-
-@defmodule[lang/imageeq]
-
-@defproc[(image=? [i1 (is-a?/c image-snip%)]
-                  [i2 (is-a?/c image-snip%)])
-         boolean?]{
-
-The image-comparison operator that is also provided by
-@racket[lang/htdp-beginner].}
-
-@; ----------------------------------------------------------------------
-
-@section{Primitives in @italic{HtDP} Beginner}
-
-@defmodule[lang/prim]
-
-The @racketmodname[lang/prim] module several syntactic forms for
-use by the implementors of teachpacks, when the teachpack is to be
-used with the Beginner Student
-Language. In Beginner Student, primitive names (for built-in
-procedures) are distinguished from other types of expressions, so that
-they can be syntactically restricted to application positions.
-
-@defform[(define-primitive id proc-id)]{
-
-  Defines @racket[id] to be a primitive operator whose implementation
-  is @racket[proc-id], and that takes no procedures as
-  arguments. Normally, @racket[id] is exported from the teachpack and
-  @racket[proc-id] is not.}
-
-@defform[(provide-primitive id)]{
-
-  Like @racket[define-primitive], but the existing function @racket[id] is
-  exported as the primitive operator named @racket[id]. An alternative
-  to @racket[define-primitive].}
-
-@defform[(provide-primitives id ...)]{
-
-  Multiple-identifier version of @racket[provide-primitive].}
-
-@defform[(define-higher-order-primitive id proc-id (arg ...))]{
-
-  Defines @racket[id] to be a primitive operator whose implementation is
-  @racket[proc-id]. Normally, @racket[id] is exported from the teachpack and
-  @racket[proc-id] is not.
-
-  For each non-procedure argument, the corresponding @racket[arg] should be
-  an underscore. For each procedure argument, the corresponding @racket[arg]
-  should be the usual name of the procedure.
-
-  @as-examples[
-  @racketblock[
-   (define-higher-order-primitive convert-gui convert-gui/proc (f2c))
-  ]]
-}
-
-@defform[(provide-higher-order-primitive id (arg ...))]{
-
-  Like @racket[define-higher-order-primitive], but the existing function
-  @racket[id] is exported as the primitive operator named
-  @racket[id]. An alternative to @racket[define-higher-order-primitive].}
-
-@defform[(first-order->higher-order expression)]{
-
-If @racket[expression] is the name of a first-order function (either a
-primitive or a function defined within Beginner Student), produces the
-function as a value; otherwise, the form is equivalent to
-@racket[expression].
-
-This form is mainly useful for implementing syntactic forms that, like
-the application of a higher-order primitive, allow first-order bindings
-to be used in an expression position.}
diff --git a/pkgs/htdp-pkgs/htdp-doc/htdp/htdp.scrbl b/pkgs/htdp-pkgs/htdp-doc/htdp/htdp.scrbl
deleted file mode 100644
index 8ad9d47cb8..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/htdp/htdp.scrbl
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual 
-          (for-label [except-in racket require]
-                     htdp/color-structs
-                     [only-in lang/htdp-beginner require]))
-
-@title[#:style 'toc #:tag "htdp"]{Implementing HtDP Teachpacks, Libraries, and Customized Teaching Languages}
-
-DrRacket has two different mechanisms for making available additional functions
-and functionality to students using the teaching languages. 
-
-
-@itemize[
-@item{HtDP Teachpacks are added to a student's program by clicking on the
-``Language'' menu and selecting ``add Teachpack''. Students can then install a
-new Teachpack by clicking ``Add Teachpack to List'' and choosing the Teachpack
-file from the filesystem.}
-
-@item{HtDP Libraries are brought into the student's program using a
-@racket[require] statement.}]
-
-Under the hood, HtDP Teachpacks and HtDP Libraries are implemented the same way,
-using normal Racket @secref[#:doc '(lib "scribblings/guide/guide.scrbl") "modules"]. 
-
-When implementing such an extension for students, pay a special attention
-to two aspects: 
-@itemlist[#:style 'ordered
-
-@item{@bold{choice of construct}: The teaching languages limit the
-expressive power in comparison to plain Racket. One goal is to teach
-``design subject to constraints,'' and the other one is to help restrict
-the set of explanations for student errors. With regard to the first, we
-consider it imperative that new teachpacks and libraries avoid features
-intended for upper-level students or professionals.}
-
-@item{@bold{error messages}: The error messages from the teaching languages
-go to great length to never confront students messages that uses vocabulary
-or phrases outside of the scope of the chosen level. While teachpacks and
-libraries can be used at all levels, they should ideally restrict the
-vocabulary in error message to the lowest level language in which they are
-to be used.}
-
-]
-
-
-This manual describes library support for authors of HtDP Teachpacks, libraries,
-and customized teaching languages. Use the HtDP
-@seclink["error-reporting"]{error reporting functions} to create error messages
-that integrate smoothly with those of the teaching languages. Before composing
-new error messages, we recommend you read the @seclink["error-guidelines"]{error
-message composition guidelines} that informed the design of the error messages
-of DrRacket's teaching languages.
-
-@local-table-of-contents[#:style 'immediate-only]
-
-@include-section["error-composition.scrbl"]
-
-@include-section["error-reporting.scrbl"]
-@include-section["testing.scrbl"]
-@include-section["htdp-lib.scrbl"]
-
-@section{Color and Alpha Color Structs}
-
-@defmodule[htdp/color-structs]
-
-@defstruct[color ([red any/c] [green any/c] [blue any/c])]{
-  This is the color sturct that is also exported by @racketmodname[htdp/image],
-  but here it is exported via @racket[(provide (struct-out color))].
-}
-@defstruct[alpha-color ([alpha any/c] [red any/c] [green any/c] [blue any/c])]{
-  This is the color sturct that is also exported by @racketmodname[htdp/image],
-  but here it is exported via @racket[(provide (struct-out alpha-color))].
-}
diff --git a/pkgs/htdp-pkgs/htdp-doc/htdp/info.rkt b/pkgs/htdp-pkgs/htdp-doc/htdp/info.rkt
deleted file mode 100644
index 25676bf6ad..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/htdp/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("htdp.scrbl")))
diff --git a/pkgs/htdp-pkgs/htdp-doc/htdp/testing.scrbl b/pkgs/htdp-pkgs/htdp-doc/htdp/testing.scrbl
deleted file mode 100644
index 10bea7052b..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/htdp/testing.scrbl
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label test-engine/racket-tests
-                     (only-in racket/base void?)
-                     (only-in htdp/testing generate-report)))
-
-@title{Testing} 
-
-@; -----------------------------------------------------------------------------
-@defmodule[htdp/testing #:use-sources (test-engine/racket-tests)]
-
-The library re-exports the following identifiers from @racketmodname[test-engine/racket-tests]
-
-@deftogether[(
-@defproc[(build-test-engine) void?]
-@defproc[(builder) void?]
-@defproc[(display-results) void?]
-@defproc[(error-handler) void?]
-@defproc[(exn:fail:wish) void?]
-@defproc[(get-test-engine) void?]
-@defproc[(reset-tests) void?]
-@defproc[(run-tests) void?]
-@defproc[(scheme-test-data) void?]
-@defproc[(signature-test-info%) void?])]
-
-@defproc[(generate-report) void?]{The same as @racket[test].}
-
-
-@(require scribble/eval
-          (for-label racket/contract
-                     racket/class
-                     racket/gui/base
-                     lang/posn
-                     lang/imageeq
-                     lang/prim))
-
-@(define (htdp-ref s) @secref[#:doc '(lib "scribblings/htdp-langs/htdp-langs.scrbl") s])
-
diff --git a/pkgs/htdp-pkgs/htdp-doc/info.rkt b/pkgs/htdp-pkgs/htdp-doc/info.rkt
deleted file mode 100644
index a7d77409fe..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/info.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps
-  '("base"
-    "scribble-lib"
-    "at-exp-lib"
-    "draw-lib"
-    "gui-lib"
-    "htdp-lib"
-    "sandbox-lib"
-    "pict-lib"))
-(define build-deps '("mzscheme-doc"
-                     "scheme-lib"
-                     "compatibility-doc"
-                     "draw-doc"
-                     "drracket"
-                     "gui-doc"
-                     "pict-doc"
-                     "racket-doc"
-                     #;"at-exp-lib"
-                     #;"rackunit-lib"))
-(define update-implies '("htdp-lib"))
-
-(define pkg-desc "documentation part of \"htdp\"")
-
-(define pkg-authors '(matthias mflatt robby))
diff --git a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/advanced.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/advanced.scrbl
deleted file mode 100644
index d51ce84439..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/advanced.scrbl
+++ /dev/null
@@ -1,321 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" "std-grammar.rkt" "prim-ops.rkt"
-          (for-label lang/htdp-advanced))
-
-@title[#:tag "advanced"]{Advanced Student}
-
-@declare-exporting[lang/htdp-advanced]
-
-@racketgrammar*+qq[
-#:literals (define define-struct define-datatype lambda λ cond else if and or require lib planet
-            local let let* letrec time begin begin0 set! delay shared recur when case match unless
-             ; match
-             _ cons list list* struct vector box
-            check-expect check-random check-satisfied check-within check-member-of check-range check-error)
-(check-expect check-random check-satisfied check-within check-error check-member-of check-range require)
-[program (code:line def-or-expr ...)]
-[def-or-expr definition
-             expr
-             test-case
-             library-require]
-[definition (define (name variable ...) expr)
-            (define name expr)
-            (define-struct name (name ...))
-            (define-datatype name (name name ...) ...)]
-[expr (begin expr expr ...)
-      (begin0 expr expr ...)
-      (set! variable expr)
-      (delay expr)
-      (lambda (variable ...) expr)
-      (λ (variable ...) expr)
-      (local [definition ...] expr)
-      (letrec ([name expr] ...) expr)
-      (shared ([name expr] ...) expr)
-      (let ([name expr] ...) expr)
-      (let name ([name expr] ...) expr)
-      (let* ([name expr] ...) expr)
-      (recur name ([name expr] ...) expr)
-      (code:line (expr expr ...))
-      (cond [expr expr] ... [expr expr])
-      (cond [expr expr] ... [else expr])
-      (case expr [(choice choice ...) expr] ... 
-                 [(choice choice ...) expr])
-      (case expr [(choice choice ...) expr] ... 
-                 [else expr])
-      (match expr [pattern expr] ...)
-      (if expr expr expr)
-      (when expr expr)
-      (unless expr expr)
-      (and expr expr expr ...)
-      (or expr expr expr ...)
-      (time expr)
-      (code:line name)
-      (code:line @#,elem{@racketvalfont{'}@racket[_quoted]})
-      (code:line @#,elem{@racketvalfont{`}@racket[_quasiquoted]})
-      number
-      boolean
-      string
-      character]
-[choice (code:line name)
-        number]
-[pattern _
-         name
-         number
-         true
-         false
-         string
-         character
-         @#,elem{@racketvalfont{'}@racket[_quoted]}
-         @#,elem{@racketvalfont{`}@racket[_quasiquoted-pattern]}
-         (cons pattern pattern)
-         (list pattern ...)
-         (list* pattern ...)
-         (struct id (pattern ...))
-         (vector pattern ...)
-         (box pattern)]
-[quasiquoted-pattern name
-                     number
-                     string
-                     character
-                     (quasiquoted-pattern ...)
-                     @#,elem{@racketvalfont{'}@racket[_quasiquoted-pattern]}
-                     @#,elem{@racketvalfont{`}@racket[_quasiquoted-pattern]}
-                     @#,elem{@racketfont[","]@racket[_pattern]}
-                     @#,elem{@racketfont[",@"]@racket[_pattern]}]
-]
-
-
-@prim-nonterms[("advanced") define define-struct]
-
-@prim-variables[("advanced") empty true false .. ... .... ..... ......]
-
-@; ----------------------------------------------------------------------
-@section[#:tag "advanced-syntax"]{Syntax for Advanced}
-
-In Advanced, @racket[set!] can be used to mutate variables, and
-@racket[define-struct]'s structures are mutatable. @racket[define] and
-@racket[lambda] can define functions of zero arguments, and function calls can
-invoke functions of zero arguments.
-
-
-@defform[(lambda (variable ...) expression)]{
-
-Creates a function that takes as many arguments as given @racket[variable]s,
-and whose body is @racket[expression].}
-
-@defform[(λ (variable ...) expression)]{
-
-The Greek letter @racket[λ] is a synonym for @racket[lambda].}
-
-@defform/none[(expression expression ...)]{
-
-Calls the function that results from evaluating the first
-@racket[expression]. The value of the call is the value of function's body when
-every instance of @racket[name]'s variables are replaced by the values of the
-corresponding @racket[expression]s.
-
-The function being called must come from either a definition appearing before the
-function call, or from a @racket[lambda] expression. The number of argument
-@racket[expression]s must be the same as the number of arguments expected by
-the function.}
-
-@; ----------------------------------------------------------------------
-
-
-@defform[(define-datatype dataype-name [variant-name field-name ...] ...)]{
-
-A short-hand for defining a group of related structures. The following @racket[define-datatype]:
-
-@racketblock[
- (define-datatype datatype-name
-   [variant-name field-name (unsyntax @racketidfont{...})]
-   (unsyntax @racketidfont{...}))
-]
-is equivalent to:
-@racketblock[
- (define ((unsyntax @racket[datatype-name])? x)
-   (or ((unsyntax @racket[variant-name])? x) (unsyntax @racketidfont{...})))
- (define-struct variant-name (field-name (unsyntax @racketidfont{...})))
- (unsyntax @racketidfont{...})
-]}
-
-
-
-@defform[(begin expression expression ...)]{
-
-Evaluates the @racket[expression]s in order from left to right. The value of
-the @racket[begin] expression is the value of the last @racket[expression].}
-
-
-
-@defform[(begin0 expression expression ...)]{
-
-Evaluates the @racket[expression]s in order from left to right. The value of
-the @racket[begin] expression is the value of the first @racket[expression].}
-
-
-
-@defform[(set! variable expression)]{
-
-Evaluates @racket[expression], and then mutates the @racket[variable]
-to have @racket[expression]'s value. The @racket[variable] must be defined 
-by @racket[define], @racket[letrec], @racket[let*], or @racket[let].}
-
-
-@defform[(delay expression)]{
-
-Produces a ``promise'' to evaluate @racket[expression]. The @racket[expression]
-is not evaluated until the promise is forced with @racket[force]; when
-the promise is forced, the result is recorded, so that any further
-@racket[force] of the promise immediately produces the remembered value.}
-
-
-
-@defform[(shared ([name expression] ...) expression)]{
-
-Like @racket[letrec], but when an @racket[expression] next to an @racket[id]
-is a @racket[cons], @racket[list], @racket[vector], quasiquoted
-expression, or @racketidfont{make-}@racket[_struct-name] from a
-@racket[define-struct], the @racket[expression] can refer directly to any
-@racket[name], not just @racket[name]s defined earlier. Thus,
-@racket[shared] can be used to create cyclic data structures.}
-
-
-@; ----------------------------------------------------------------------
-
-
-@defform[(recur name ([name expression] ...) expression)]{
-
-A short-hand syntax for recursive loops. The first @racket[name] corresponds to
-the name of the recursive function. The @racket[name]s in the parenthesis are
-the function's arguments, and each corresponding @racket[expression] is a
-value supplied for that argument in an initial starting call of the
-function. The last @racket[expression] is the body of the function.
-
-More precisely, the following @racket[recur]: 
-
-@racketblock[
-(recur func-name ([arg-name arg-expression] (unsyntax @racketidfont{...}))
-  body-expression)
-]
-
-is equivalent to:
-
-@racketblock[
-(local [(define (func-name arg-name (unsyntax @racketidfont{...})) body-expression)]
-  (func-name arg-expression (unsyntax @racketidfont{...})))
-]}
-
-
-@defform/none[(let name ([name expression] ...) expression)]{
-
-An alternate syntax for @racket[recur].}
-
-
-@; ----------------------------------------------------------------------
-
-
-@defform[(case expression [(choice ...) expression] ... [(choice ...) expression])]{
-
-A @racket[case] form contains one or more clauses. Each clause contains a
-choices (in parentheses)---either numbers or names---and an answer
-@racket[expression]. The initial @racket[expression] is evaluated, and its
-value is compared to the choices in each clause, where the lines are considered
-in order. The first line that contains a matching choice provides an answer
-@racket[expression] whose value is the result of the whole @racket[case]
-expression. Numbers match with the numbers in the choices, and symbols match
-with the names. If none of the lines contains a matching choice, it is an
-error.}
-
-@defform/none[#:literals (case else)
-              (case expression [(choice ...) expression] ... [else expression])]{
-
-This form of @racket[case] is similar to the prior one, except that the final
-@racket[else] clause is taken if no clause contains a choice matching the value
-of the initial @racket[expression].}
-
-@; ----------------------------------------------------------------------
-
-
-@defform[(match expression [pattern expression] ...)]{
-
-A @racket[match] form contains one or more clauses that are surrounded by
-square brackets. Each clause contains a pattern---a description of a value---and
-an answer @racket[expression].  The initial @racket[expression] is evaluated,
-and its value is matched against the pattern in each clause, where the clauses are
-considered in order. The first clause that contains a matching pattern provides
-an answer @racket[expression] whose value is the result of the whole
-@racket[match] expression. This @racket[expression] may reference identifiers
-defined in the matching pattern. If none of the clauses contains a matching
-pattern, it is an error.}
-
-@; ----------------------------------------------------------------------
-
-
-@defform[(when test-expression body-expression)]{
-
-If @racket[test-expression] evaluates to @racket[true], the result of the
-@racket[when] expression is the result of evaluating the 
-@racket[body-expression], otherwise the result is @racket[(void)] and the 
-@racket[body-expression] is not evaluated. If the result of evaluating the
-@racket[test-expression] is neither @racket[true] nor @racket[false], it is an
-error.}
-
-@defform[(unless test-expression body-expression)]{
-
-Like @racket[when], but the @racket[body-expression] is evaluated when the
-@racket[test-expression] produces @racket[false] instead of @racket[true].}
-
-
-@section[#:tag "advanced-common-syntax"]{Common Syntaxes}
-
-The following syntaxes behave the same in the @emph{Advanced}
-level as they did in the @secref["intermediate-lam"] level.
-
-
-@(intermediate-forms lambda
-                     local
-                     letrec
-                     let*
-                     let
-                     time
-                     define
-                     define-struct)
-
-
-@(define-forms/normal define)
-
-@(prim-forms ("advanced")
-             define 
-             lambda
-             define-struct 
-             @{In Advanced, @racket[define-struct] introduces one additional function:
-              @itemize[
-               @item{@racketidfont{set-}@racket[_structure-name]@racketidfont{-}@racket[_field-name]@racketidfont{!}
-                : takes an instance of the structure and a value, and
-                mutates the instance's field to the given value.}]}
-             define-wish
-             cond
-             else
-             if
-             and 
-             or
-             check-expect
-             check-random
-	     check-satisfied
-             check-within
-             check-error
-             check-member-of
-             check-range
-             require
-             true false
-             #:with-beginner-function-call #f)
-
-@; ----------------------------------------
-
-@section[#:tag "advanced-pre-defined"]{Pre-Defined Functions}
-
-@(require (submod lang/htdp-advanced procedures))
-@(render-sections (docs) #'here "htdp-advanced")
-
-@;prim-op-defns['(lib "htdp-advanced.rkt" "lang") #'here '()]
diff --git a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/beginner-abbr.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/beginner-abbr.scrbl
deleted file mode 100644
index 40a8e164b7..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/beginner-abbr.scrbl
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang scribble/doc
-
-@(require "common.rkt" "std-grammar.rkt" "prim-ops.rkt" (for-label lang/htdp-beginner-abbr))
-
-@title[#:tag "beginner-abbr"]{Beginning Student with List Abbreviations}
-
-@declare-exporting[lang/htdp-beginner-abbr]
-
-@racketgrammar*+qq[
-#:literals (define define-struct lambda cond else if and or require lib planet
-            check-expect check-random check-satisfied check-within check-error)
-(check-expect check-random check-satisfied check-within check-member-of check-range check-error require)
-[program (code:line def-or-expr ...)]
-[def-or-expr definition
-             expr
-             test-case
-             library-require]
-[definition (define (name variable variable ...) expr)
-            (define name expr)
-            (define name (lambda (variable variable ...) expr))
-            (define-struct name (name ...))]
-[expr (code:line (name expr expr ...))
-      (code:line (prim-op expr ...))
-      (cond [expr expr] ... [expr expr])
-      (cond [expr expr] ... [else expr])
-      (if expr expr expr)
-      (and expr expr expr ...)
-      (or expr expr expr ...)
-      name
-      (code:line @#,elem{@racketvalfont{'}@racket[_quoted]})
-      (code:line @#,elem{@racketvalfont{`}@racket[_quasiquoted]})
-      number
-      boolean
-      string
-      character]
-]
-
-@prim-nonterms[("beginner-abbr") define define-struct]
-
-@prim-variables[("beginner-abbr") empty true false .. ... .... ..... ......]
-
-@; ----------------------------------------
-
-@section[#:tag "beginner-abbr-syntax"]{Syntaxes for Beginning Student with List Abbreviations}
-
-@(beginner-abbr-forms quote quasiquote unquote unquote-splicing)
-
-
-
-@; ----------------------------------------------------------------------
-@section[#:tag "beginner-abbr-common-syntax"]{Common Syntaxes}
-
-The following syntaxes behave the same in the @emph{Beginner with List
-Abbreviations} level as they did in the @secref["beginner"] level.
-
-@(define-forms/normal define)
-@(define-form/explicit-lambda define lambda)
-
-
-@prim-forms[("beginner-abbr")
-            define 
-            lambda
-            define-struct []
-            define-wish
-            cond
-            else
-            if
-            and 
-            or
-            check-expect
-            check-random
-	    check-satisfied
-            check-within
-            check-error
-            check-member-of
-            check-range
-            require
-            true false
-             #:with-beginner-function-call #t]
-
-
-@; ----------------------------------------
-
-@section[#:tag "beginner-abbr-pre-defined"]{Pre-defined Functions}
-
-@(require (submod lang/htdp-beginner-abbr procedures))
-@(render-sections (docs) #'here "htdp-beginner-abbr")
-
-@;prim-op-defns['(lib "htdp-beginner-abbr.rkt" "lang") #'here '()]
diff --git a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/beginner.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/beginner.scrbl
deleted file mode 100644
index c930bb93c5..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/beginner.scrbl
+++ /dev/null
@@ -1,85 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" "std-grammar.rkt" "prim-ops.rkt"
-          (for-label lang/htdp-beginner))
-
-
-@title[#:tag "beginner"]{Beginning Student}
-
-@declare-exporting[lang/htdp-beginner #:use-sources (lang/htdp-beginner lang/private/teachprims)]
-
-@racketgrammar*+library[
-#:literals (define define-struct lambda cond else if and or require lib planet
-            check-expect check-random check-satisfied check-within check-error)
-(check-expect check-random check-satisfied check-within check-member-of check-range check-error require)
-[program (code:line def-or-expr ...)]
-[def-or-expr definition
-             expr
-             test-case             
-             library-require]
-[definition (define (name variable variable ...) expr)
-            (define name expr)
-            (define name (lambda (variable variable ...) expr))
-            (define-struct name (name ...))]
-[expr (code:line (name expr expr ...))
-      (cond [expr expr] ... [expr expr])
-      (cond [expr expr] ... [else expr])
-      (if expr expr expr)
-      (and expr expr expr ...)
-      (or expr expr expr ...)
-      name
-      (code:line @#,elem{@racketvalfont{'}@racket[name]})
-      number
-      boolean 
-      string
-      character]
-]
-
-@prim-nonterms[("beginner") define define-struct]
-
-@prim-variables[("beginner") empty true false .. ... .... ..... ......]
-
-@; --------------------------------------------------
-
-@section[#:tag "beginner-syntax"]{Syntax}
-
-@(define-forms/normal define)
-@(define-form/explicit-lambda define lambda)
-
-@deftogether[(
-@defform/none[(unsyntax @elem{@racketvalfont{'}@racket[name]})]
-@defform[(quote name)]
-)]{
-
-A quoted @racket[name] is a symbol. A symbol is a value, just like
-@racket[0] or @racket[empty].}
-
-@(prim-forms ("beginner")
-             define 
-             lambda
-             define-struct []
-             define-wish
-             cond
-             else
-             if
-             and 
-             or
-             check-expect
-             check-random
-             check-satisfied
-             check-within
-             check-error
-             check-member-of
-             check-range
-             require
-             true false
-             #:with-beginner-function-call #t
-             )
-
-@; --------------------------------------------------
-             
-@section[#:tag "beginner-pre-defined"]{Pre-defined Functions}
-
-@(require (submod lang/htdp-beginner procedures))
-@(render-sections (docs) #'here "htdp-beginner")
-
-@;prim-op-defns[ #'here '()]
diff --git a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/common.rkt b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/common.rkt
deleted file mode 100644
index b7eb875738..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/common.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-
-(require scribble/manual)
-
-(provide (all-from-out scribble/manual))
diff --git a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/htdp-langs.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/htdp-langs.scrbl
deleted file mode 100644
index 5e6342ed46..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/htdp-langs.scrbl
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label lang/htdp-beginner))
-
-@title[#:style 'toc #:tag "top"]{@italic{How to Design Programs} Languages}
-
-The languages documented in this manual are provided by DrRacket to be
-used with the @italic{@link["http://www.htdp.org/"]{How to Design
-Programs}} book.
-
-When programs in these languages are run in DrRacket, any part of the
-program that was not run is highlighted in orange and black. These
-colors are intended to give the programmer feedback about the parts of
-the program that have not been tested. To avoid seeing these colors,
-use @racket[check-expect] to test your program. Of course, just
-because you see no colors, does not mean that your program has been
-fully tested; it simply means that each part of the program has been run
-(at least once).
-
-@table-of-contents[]
-
-@;------------------------------------------------------------------------
-
-@include-section["beginner.scrbl"]
-@include-section["beginner-abbr.scrbl"]
-@include-section["intermediate.scrbl"]
-@include-section["intermediate-lambda.scrbl"]
-@include-section["advanced.scrbl"]
-
-@;------------------------------------------------------------------------
-
-@;index-section[]
diff --git a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/htdp-ptr.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/htdp-ptr.scrbl
deleted file mode 100644
index 8886b7890e..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/htdp-ptr.scrbl
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang scribble/base
-@(require scribble/core
-          net/url
-          scribble/html-properties))
-
-@(define redirect
-   (style #f (list (part-link-redirect (string->url "http://www.htdp.org/")))))
-
-@title[#:style redirect]{@italic{How to Design Programs}}
-
-See @hyperlink["http://www.htdp.org/"]{the book's web site}.
diff --git a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/info.rkt b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/info.rkt
deleted file mode 100644
index f9cbfdc2a7..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define scribblings '(("htdp-langs.scrbl" (multi-page) (teaching -12))
-                      ("htdp-ptr.scrbl" () (teaching -11))))
diff --git a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/intermediate-lambda.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/intermediate-lambda.scrbl
deleted file mode 100644
index 2f15c019aa..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/intermediate-lambda.scrbl
+++ /dev/null
@@ -1,127 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" "std-grammar.rkt" "prim-ops.rkt"
-          (for-label lang/htdp-intermediate-lambda))
-
-@title[#:tag "intermediate-lam"]{Intermediate Student with Lambda}
-
-@declare-exporting[lang/htdp-intermediate-lambda]
-
-@racketgrammar*+qq[
-#:literals (define define-struct lambda λ cond else if and or require lib planet
-            local let let* letrec time check-expect check-random check-satisfied check-within check-member-of check-range check-error)
-(check-expect check-random check-satisfied check-within check-member-of check-range check-error require)
-[program (code:line def-or-expr ...)]
-[def-or-expr definition
-             expr
-             test-case
-             library-require]
-[definition (define (name variable variable ...) expr)
-            (define name expr)
-            (define-struct name (name ...))]
-[expr (lambda (variable variable ...) expr)
-      (λ (variable variable ...) expr)
-      (local [definition ...] expr)
-      (letrec ([name expr] ...) expr)
-      (let ([name expr] ...) expr)
-      (let* ([name expr] ...) expr)
-      (code:line (expr expr expr ...))
-      (cond [expr expr] ... [expr expr])
-      (cond [expr expr] ... [else expr])
-      (if expr expr expr)
-      (and expr expr expr ...)
-      (or expr expr expr ...)
-      (time expr)
-      (code:line name)
-      (code:line prim-op)
-      (code:line @#,elem{@racketvalfont{'}@racket[_quoted]})
-      (code:line @#,elem{@racketvalfont{`}@racket[_quasiquoted]})
-      number
-      boolean 
-      string
-      character]
-]
-
-@prim-nonterms[("intm-w-lambda") define define-struct]
-
-@prim-variables[("intm-w-lambda") empty true false .. ... .... ..... ......]
-
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "intm-w-lambda-syntax"]{Syntax for Intermediate with Lambda}
-
-
-@defform[(lambda (variable variable ...) expression)]{
-
-Creates a function that takes as many arguments as given @racket[variable]s,
-and whose body is @racket[expression].}
-
-@defform[(λ (variable variable ...) expression)]{
-
-The Greek letter @racket[λ] is a synonym for @racket[lambda].}
-
-
-
-@defform/none[(expression expression expression ...)]{
-
-Calls the function that results from evaluating the first
-@racket[expression]. The value of the call is the value of function's body when
-every instance of @racket[name]'s variables are replaced by the values of the
-corresponding @racket[expression]s.
-
-The function being called must come from either a definition appearing before the
-function call, or from a @racket[lambda] expression. The number of argument
-@racket[expression]s must be the same as the number of arguments expected by
-the function.}
-
-
-
-@(intermediate-forms lambda
-                     local
-                     letrec
-                     let*
-                     let
-                     time
-                     define
-                     define-struct)
-
-
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "intm-w-lambda-common-syntax"]{Common Syntaxes}
-
-The following syntaxes behave the same in the @emph{Intermediate with Lambda}
-level as they did in the @secref["intermediate"] level.
-
-@(define-forms/normal define)
-
-@(beginner-abbr-forms quote quasiquote unquote unquote-splicing)
-
-@(prim-forms ("intermediate-lam")
-             define 
-             lambda
-             define-struct []
-             define-wish
-             cond
-             else
-             if
-             and 
-             or
-             check-expect
-             check-random
-	     check-satisfied
-             check-within
-             check-error
-             check-member-of
-             check-range
-             require
-             true false
-             #:with-beginner-function-call #f)
-
-@section[#:tag "intm-w-lambda-pre-defined"]{Pre-defined Functions}
-
-@(require (submod lang/htdp-intermediate-lambda procedures))
-@(render-sections (docs) #'here "htdp-intermediate-lambda")
-
-@;prim-op-defns['(lib "htdp-intermediate-lambda.rkt" "lang") #'here '()]
diff --git a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/intermediate.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/intermediate.scrbl
deleted file mode 100644
index e3ad277c63..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/intermediate.scrbl
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" "std-grammar.rkt" "prim-ops.rkt"
-          (for-label lang/htdp-intermediate))
-
-
-@title[#:tag "intermediate"]{Intermediate Student}
-
-@declare-exporting[lang/htdp-intermediate]
-
-@racketgrammar*+qq[
-#:literals (define define-struct lambda cond else if and or require lib planet
-            local let let* letrec time check-expect check-random check-satisfied check-within check-error)
-(check-expect check-random check-satisfied check-within check-member-of check-range check-error require)
-[program (code:line def-or-expr ...)]
-[def-or-expr definition
-             expr
-             test-case
-             library-require]
-[definition (define (name variable variable ...) expr)
-            (define name expr)
-            (define name (lambda (variable variable ...) expr))
-            (define-struct name (name ...))]
-[expr (local [definition ...] expr)
-      (letrec ([name expr-for-let] ...) expr)
-      (let ([name expr-for-let] ...) expr)
-      (let* ([name expr-for-let] ...) expr)
-      (code:line (name expr expr ...) )
-      (cond [expr expr] ... [expr expr])
-      (cond [expr expr] ... [else expr])
-      (if expr expr expr)
-      (and expr expr expr ...)
-      (or expr expr expr ...)
-      (time expr)
-      (code:line name)
-      (code:line @#,elem{@racketvalfont{'}@racket[_quoted]})
-      (code:line @#,elem{@racketvalfont{`}@racket[_quasiquoted]})
-      number
-      boolean 
-      string
-      character]
-[expr-for-let (lambda (variable variable ...) expr)
-              expr]
-]
-
-@prim-nonterms[("intermediate") define define-struct]
-
-@prim-variables[("intermediate") empty true false .. ... .... ..... ......]
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "intermediate-syntax"]{Syntax for Intermediate}
-
-
-@(intermediate-forms lambda
-                     local
-                     letrec
-                     let*
-                     let
-                     time
-                     define
-                     define-struct)
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "intermediate-common-syntax"]{Common Syntaxes}
-
-The following syntaxes behave the same in the @emph{Intermediate} level as they
-did in the @secref["beginner-abbr"] level.
-
-@(beginner-abbr-forms quote quasiquote unquote unquote-splicing)
-
-@(define-forms/normal define)
-@(define-form/explicit-lambda define lambda)
-
-@(prim-forms 
-                     ("intermediate")
-                     define 
-                     lambda
-                     define-struct []
-                     define-wish
-                     cond
-                     else
-                     if
-                     and 
-                     or
-                     check-expect
-                     check-random
-                     check-satisfied
-                     check-within
-                     check-error
-                     check-member-of
-                     check-range
-                     require
-                     true false
-                     #:with-beginner-function-call #t)
-
-
-
-
-@section[#:tag "intermediate-pre-defined" ]{Pre-defined Functions}
-
-@(require (submod lang/htdp-intermediate procedures))
-@(render-sections (docs) #'here "htdp-intermediate")
-
-@;prim-op-defns['(lib "htdp-intermediate.rkt" "lang") #'here '()]
-
diff --git a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/prim-ops.rkt b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/prim-ops.rkt
deleted file mode 100644
index af4eb2acaa..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/prim-ops.rkt
+++ /dev/null
@@ -1,978 +0,0 @@
-#lang at-exp racket/base
-(provide prim-variables
-         prim-forms
-         define-forms/normal
-         define-form/explicit-lambda
-         beginner-abbr-forms
-         intermediate-forms
-         prim-ops
-         prim-op-defns)
-
-(require "common.rkt"
-         scribble/decode
-         scribble/struct
-         scribble/racket
-         scribble/eval
-	 racket/sandbox
-         racket/list
-         racket/pretty
-         syntax/docprovide
-	 (for-label lang/htdp-intermediate)
-         (for-syntax racket/base))
-
-(define (maybe-make-table l t)
-  (if (paragraph? t)
-      (make-paragraph
-       (append l (cons " "
-                       (paragraph-content t))))
-      (make-table
-       "prototype"
-       (list (list (make-flow (list (make-paragraph l)))
-                   (make-flow (list t)))))))
-
-(define-syntax-rule
-  (mk-eval defs ...)
-  ;; ==> 
-  (let ([me (make-base-eval)])
-    (define run? #f)
-    (call-in-sandbox-context me (lambda () (error-print-source-location #f) (sandbox-output 'string)))
-    (interaction-eval #:eval me '(require test-engine/racket-tests))
-    (interaction-eval #:eval me defs) 
-    ...
-    (lambda (x) (begin0 (me x) (unless run? (set! run? #t) (me '(test)))))))
-
-@(define e1 (mk-eval (require test-engine/racket-tests) (define (fahrenheit->celsius f) (* 5/9 (- f 32)))))
-
-@(define evil 
-(mk-eval
- (require racket/list)
- (require racket/bool)
- (require test-engine/racket-tests)
-(define (sorted? l)
-  (cond
-    [(empty? (rest l)) true]
-    [else (and (<= (first l) (second l)) (sorted? (rest l)))]))
-
-(define (htdp-sort l)
-  (cond
-    [(empty? l) l]
-    [else (insert (first l) (htdp-sort (rest l)))]))
-
-(define (insert x l)
-  (cond
-    [(empty? l) (list x)]
-    [else (if (<= x (first l)) (cons x l) (cons (first l) (insert x (rest l))))]))
-))
-
-(define (typeset-type type)
-  (let-values ([(in out) (make-pipe)])
-    (parameterize ([pretty-print-columns 50])
-      (pretty-write type out))
-    (port-count-lines! in)
-    (read-syntax #f in)))
-
-(define (sort-category category)
-  (sort
-   (cadr category)
-   (lambda (x y)
-     (string<=? (symbol->string (car x))
-                (symbol->string (car y))))))
-
-
-(define (make-proto func ctx-stx)
-  (maybe-make-table
-   (list
-    (hspace 2)
-    (to-element (datum->syntax ctx-stx (car func)))
-    (hspace 1)
-    ":"
-    (hspace 1))
-   (to-paragraph
-    (typeset-type (cadr func)))))
-
-(define-syntax-rule
-  (prim-variables (section-prefix) empty true false ..2 ..3 ..4 ..5 ..6)
-  ;; ===> 
-  (make-splice
-   (list
-    @section[#:tag (string-append section-prefix " Pre-Defined Variables")]{Pre-Defined Variables}
-
-    @defthing[empty empty?]{
-      The empty list.}
-
-    @defthing[true boolean?]{
-      The true value.}
-
-    @defthing[false boolean?]{
-      The false value.}
-
-    @section[#:tag (string-append section-prefix " Template Variables")]{Template Variables}
-    @; MF: I tried abstracting but I failed
-    @defidform[..2]{A placeholder for indicating that a definition is a template.}
-    @defidform[..3]{A placeholder for indicating that a definition is a template.}
-    @defidform[..4]{A placeholder for indicating that a definition is a template.}
-    @defidform[..5]{A placeholder for indicating that a definition is a template.}
-    @defidform[..6]{A placeholder for indicating that a definition is a template.}
-    )))
-
-;; ----------------------------------------
-
-(define-syntax-rule (define-forms/normal define)
-  (gen-define-forms/normal #'define @racket[define]))
-
-(define (gen-define-forms/normal define-id define-elem)
-  ;; Since `define' has a source location different from the use site,
-  ;; use the `#:id [spec-id bind-id]' form in `defform*':
-  (list
-   @defform*[#:id [define define-id]
-             [(define (name variable variable ...) expression)]]{
-
-   Defines a function named @racket[name]. The @racket[expression] is the body
-   of the function. When the function is called,
-   the values of the arguments are inserted into the body in place of the
-   @racket[variable]s. The function returns the value of that new expression.
-
-   The function name's cannot be the same as that of another function or
-   variable.}
-
-   @defform/none[(@#,define-elem name expression)]{
-
-   Defines a variable called @racket[name] with the the value of
-   @racket[expression]. The variable name's cannot be the same as that of
-   another function or variable, and @racket[name] itself must not appear in
-   @racket[expression].}))
-
-;; ----------------------------------------
-
-(define-syntax-rule (define-form/explicit-lambda define lambda)
-  (gen-define-form/explicit-lambda @racket[define] 
-                                   #'lambda @racket[lambda]))
-
-(define (gen-define-form/explicit-lambda define-elem lambda-id lambda-elem)
-  (list
-   @defform/none[(#,define-elem name (#,lambda-elem (variable variable ...) expression))]{
-
-   An alternate way on defining functions. The @racket[name] is the name of
-   the function, which cannot be the same as that of another function or
-   variable. 
-
-   A @defidform/inline[#,lambda-id] cannot be used outside of this alternate syntax.}))
-
-;; ----------------------------------------
-
-(define-syntax-rule (prim-forms 
-                     (section-prefix)
-                     define 
-                     lambda
-                     define-struct [ds-extra ...]
-                     define-wish
-                     cond
-                     else
-                     if
-                     and 
-                     or
-                     check-expect
-                     check-random
-		     check-satisfied
-                     check-within
-                     check-error
-                     check-member-of
-                     check-range
-                     require
-                     true
-                     false
-                     #:with-beginner-function-call with-beginner-function-call)
-  (gen-prim-forms #'define-struct @racket[define-struct] (list ds-extra ...)
-                  #'cond @racket[cond]
-                  #'else @racket[else]
-                  #'if @racket[if]
-                  #'or @racket[or]
-                  #'and @racket[and]
-                  #'check-expect @racket[check-expect]
-                  #'check-random @racket[check-random]
-		  #'check-satisfied @racket[check-satisfied]
-                  #'check-within @racket[check-within]
-                  #'check-error @racket[check-error]
-                  #'check-member-of @racket[check-member-of]
-                  #'check-range @racket[check-range]
-                  #'require @racket[require]
-                  @racket[true] @racket[false]
-                  with-beginner-function-call))
-
-(define (gen-prim-forms define-struct-id define-struct-elem ds-extras
-                        cond-id cond-elem
-                        else-id else-elem
-                        if-id if-elem
-                        or-id or-elem
-                        and-id and-elem
-                        check-expect-id check-expect-elem
-                        check-random-id check-random-elem
-			check-satisfied-id check-satisfied-elem
-                        check-within-id check-within-elem
-                        check-error-id check-error-elem
-                        check-member-of-id check-member-of-elem
-                        check-range-id check-range-elem
-                        require-id require-elem
-                        true-elem false-elem
-                        with-beginner-function-call)
-  (list
-   @; ----------------------------------------------------------------------
-
-  @defform*[#:id [define-struct define-struct-id]
-            [(define-struct structure-name (field-name ...))]]{
-
-   Defines a new structure called @racket[structure-name]. The structure's fields are
-   named by the @racket[field-name]s. After the @define-struct-elem, the following new
-   functions are available:
-
-   @itemize[
-
-     @item{@racketidfont{make-}@racket[structure-name] : takes a number of
-           arguments equal to the number of fields in the structure,
-           and creates a new instance of that structure.}
-
-     @item{@racket[structure-name]@racketidfont{-}@racket[field-name] : takes an
-           instance of the structure and returns the value in the field named by
-           @racket[field-name].}
-
-     @item{@racket[structure-name]@racketidfont{?} : takes any value, and returns
-           @true-elem if the value is an instance of the structure.}
-   ]
-
-   The name of the new functions introduced by @define-struct-elem
-   must not be the same as that of other functions or variables,
-   otherwise @define-struct-elem reports an error.
-
-   @ds-extras}
-
-  #|
-
-  @defform*[[(define-wish name)]]{                           
-                           
-  Defines a function called @racket[name] that we wish exists but have not
-  implemented yet. The wished-for function can be called with one argument, and
-  are reported in the test report for the current program.
-
-  The name of the function cannot be the same as another function or variable.}
-
-
-  @defform/none[#:literals (define-wish)
-                (define-wish name expression)]{
-  Similar to the above form, defines a wished-for function named @racket[name]. If the 
-  wished-for function is called with one value, it returns the values of @racket[expression]. }
-  |#
-
-  @; ----------------------------------------------------------------------
-
-  @(if with-beginner-function-call
-       @defform/none[(name expression expression ...)]{
-        Calls the function named @racket[name]. The value of the call is the
-        value of @racket[name]'s body when every one of the function's
-        variables are replaced by the values of the corresponding
-        @racket[expression]s.
-     
-        The function named @racket[name] must defined before it can be called. The
-        number of argument @racket[expression]s must be the same as the number of arguments
-        expected by the function.}
-       @elem[])
-
-  @; ----------------------------------------------------------------------
-
-  @defform*[#:id [cond cond-id]
-            #:literals (else)
-            [(cond [question-expression answer-expression] ...)
-             (#,cond-elem [question-expression answer-expression]
-                          ... 
-                          [#,else-elem answer-expression])]]{
-
-    Chooses a clause based on some condition. @racket[cond] finds the first
-    @racket[question-expression] that evaluates to @true-elem, then
-    evaluates the corresponding @racket[answer-expression].
-
-    If none of the @racket[question-expression]s evaluates to @true-elem,
-    @cond-elem's value is the @racket[answer-expression] of the
-    @else-elem clause. If there is no @else-elem, @cond-elem reports
-    an error. If the result of a @racket[question-expression] is neither
-    @true-elem nor @false-elem, @cond-elem also reports an error.
-    
-    @defidform/inline[#,else-id] cannot be used outside of @|cond-elem|.}
-
-  @; ----------------------------------------------------------------------
-
-  @defform*[#:id [if if-id]
-            [(if test-expression then-expression else-expression)]]{
-
-   When the value of the @racket[test-expression] is @true-elem,
-   @if-elem evaluates the @racket[then-expression]. When the test is
-   @false-elem, @if-elem evaluates the @racket[else-expression].
-
-   If the @racket[test-expression] is neither @true-elem nor
-   @false-elem, @if-elem reports an error.}
-
-  @; ----------------------------------------------------------------------
-
-  @defform*[#:id [and and-id]
-            [(and expression expression expression ...)]]{
-
-    Evaluates to @true-elem if all the @racket[expression]s are
-    @|true-elem|. If any @racket[expression] is @|false-elem|, the @and-elem
-    expression evaluates to @false-elem (and the expressions to the
-    right of that expression are not evaluated.)
-
-    If any of the expressions evaluate to a value other than @true-elem or
-    @false-elem, @and-elem reports an error.}
-
-  @; ----------------------------------------------------------------------
-
-
-  @defform*[#:id [or or-id]
-            [(or expression expression expression ...)]]{
-
-    Evaluates to @true-elem as soon as one of the
-    @racket[expression]s is @true-elem (and the expressions to the right of that
-    expression are not evaluated.) If all of the @racket[expression]s are @|false-elem|,
-    the @or-elem expression evaluates to @|false-elem|.
-
-    If any of the expressions evaluate to a value other than @true-elem or
-    @false-elem, @or-elem reports an error.}
-
-  @; ----------------------------------------------------------------------
-
-  @defform*[#:id [check-expect check-expect-id]
-            [(check-expect expression expected-expression)]]{
-
-   Checks that the first @racket[expression] evaluates to the same value as the
-   @racket[expected-expression].
-
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-  
-(check-expect (fahrenheit->celsius 212) 100)
-(check-expect (fahrenheit->celsius -40) -40)
-
-(define (fahrenheit->celsius f)
-  (* 5/9 (- f 32)))
-))
-@;%
-A @racket[check-expect] expression must be placed at the top-level of a
- student program. Also it may show up anywhere in the program, including
- ahead of the tested function definition. By placing @racket[check-expect]s
- there, a programmer conveys to a future reader the intention behind the
- program with working examples, thus making it often superfluous to read
- the function definition proper. 
-
-It is an error for @racket[expr] or @racket[expected-expr] to produce an
-inexact number or a function value. As for inexact numbers, it is
-@italic{morally} wrong to compare them for plain equality. Instead one
-tests whether they are both within a small interval; see
-@racket[check-within]. As for functions (see Intermediate and up), it is
-provably impossible to compare functions. 
-}
-
-  @defform*[#:id [check-random check-random-id]
-            [(check-random expression expected-expression)]]{
-
-   Checks that the first @racket[expression] evaluates to the same value as the
-   @racket[expected-expression].
-
-The form supplies the same random-number generator to both parts. If both
-parts request @racket[random] numbers from the same interval in the same
-order, they receive the same random numbers. 
-
-Here is a simple example of where @racket[check-random] is useful: 
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(define WIDTH 100)
-(define HEIGHT (* 2 WIDTH))
-
-(define-struct player (name x y))
-;; A @italic{Player} is @racket[(make-player String Nat Nat)]
-
-;; String -> Player 
-
-(check-random (create-randomly-placed-player "David Van Horn")
-	      (make-player "David Van Horn" (random WIDTH) (random HEIGHT)))
-
-(define (create-randomly-placed-player name)
-  (make-player name (random WIDTH) (random HEIGHT)))
-))
-@;%
-Note how @racket[random] is called on the same numbers in the same order in
- both parts of @racket[check-random]. If the two parts call @racket[random]
-  for different intervals, they are likely to fail: 
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; String -> @italic{Player}
-
-(check-random (create-randomly-placed-player "David Van Horn")
-	      (make-player "David Van Horn" (random WIDTH) (random HEIGHT)))
-
-(define (create-randomly-placed-player name)
-  (local ((define h (random HEIGHT))
-          (define w (random WIDTH)))
-    (make-player name w h)))
-))
-@;%
-
-It is an error for @racket[expr] or @racket[expected-expr] to produce a function
-value or an inexact number; see note on @racket[check-expect] for details.
-}
-
-  @defform*[#:id [check-satisfied check-satisfied-id]
-            [(check-satisfied expression predicate)]]{
-
-   Checks that the first @racket[expression] satisfies the named
-   @racket[predicate] (function of one argument).  Recall that
-   ``satisfies'' means ``the function produces a value other than
-   @racket[false].''
-
-Here are simple examples for @racket[check-satisfied]: 
-@interaction[
-#:eval 
-(mk-eval
- (require test-engine/racket-tests))
-(check-satisfied 1 odd?)
-]
-@interaction[
-#:eval 
-(mk-eval
- (require test-engine/racket-tests))
-(check-satisfied 1 even?)
-]
-
-In general @racket[check-satisfied] empowers program designers to use
-defined functions to formulate test suites: 
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; [cons Number [List-of Number]] -> Boolean 
-;; a function for testing @racket[htdp-sort]
-
-(check-expect (sorted? (list 1 2 3)) true)
-(check-expect (sorted? (list 2 1 3)) false)
-
-(define (sorted? l)
-  (cond
-    [(empty? (rest l)) true]
-    [else (and (<= (first l) (second l)) (sorted? (rest l)))]))
-
-;; [List-of Number] -> [List-of Number]
-;; create a sorted version of the given list of numbers 
-
-(check-satisfied (htdp-sort (list 1 2 0 3)) sorted?)
-
-(define (htdp-sort l)
-  (cond
-    [(empty? l) l]
-    [else (insert (first l) (htdp-sort (rest l)))]))
-
-;; Number [List-of Number] -> [List-of Number]
-;; insert @racket[x] into @racket[l] at proper place 
-;; @bold{assume} @racket[l] is arranged in ascending order 
-;; the result is sorted in the same way 
-(define (insert x l)
-  (cond
-    [(empty? l) (list x)]
-    [else (if (<= x (first l)) (cons x l) (cons (first l) (insert x (rest l))))]))
-))
-@;%
-
-And yes, the results of @racket[htdp-sort] satisfy the @racket[sorted?] predicate:
-@interaction[
-#:eval evil 
-(check-satisfied (htdp-sort (list 1 2 0 3)) sorted?)
-]
-}
-
-  @defform*[#:id [check-within check-within-id]
-            [(check-within expression expected-expression delta)]]{
-
-  Checks whether the value of the @racket[expression] expression is
-  structurally equal to the value produced by the
-  @racket[expected-expression] expression; every number in the first
-  expression must be within @racket[delta] of the corresponding number in
-  the second expression.
-
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(define-struct roots (x sqrt))
-;; RT is [List-of (make-roots Number Number)]
-
-(define (roots-table xs)
-  (map (lambda (a) (make-roots a (sqrt a))) xs))
-))
-@;%
-
-Due to the presence of inexact numbers in nested data, @racket[check-within] is the
-correct choice for testing, and the test succeeds if @racket[delta] is reasonably
-large: 
-@examples[
-#:eval 
-(mk-eval
- (require test-engine/racket-tests)
- (define-struct roots (x sqrt) #:transparent)
- (define (roots-table xs) (map (lambda (a) (make-roots a (sqrt a))) xs)))
-
-(check-within (roots-table (list 1. 2. 3.))
-              (list 
-	        (make-roots 1. 1.)
-	        (make-roots 2  1.414)
-	        (make-roots 3  1.713))
-              .1)
-]
-In contrast, when @racket[delta] is small, the test fails: 
-@examples[
-#:eval 
-(mk-eval
- (require test-engine/racket-tests)
-(define-struct roots (x sqrt) 
-  #:transparent
-  #:methods gen:custom-write
-  [(define (write-proc x port mode)
-     (display `(make-roots ,(roots-x x) ,(roots-sqrt x)) port))])
- (define (roots-table xs) (map (lambda (a) (make-roots a (sqrt a))) xs)))
-
-(check-within (roots-table (list 2.))
-              (list 
-	        (make-roots 2  1.414))
-              .00001)
-]
-
-  It is an error for @racket[expressions] or @racket[expected-expression]
-  to produce a function value; see note on @racket[check-expect] for details.
-
-  If @racket[delta] is not a number, @check-within-elem reports an error.} 
-
-  @defform*[#:id [check-error check-error-id]
-            [(check-error expression expected-error-message)
-             (#,check-error-elem expression)]]{
-
-   Checks that the @racket[expression] reports an error, where the error messages
-   matches the value of @racket[expected-error-message], if it is present.
-
-Here is a typical beginner example that calls for a use of @racket[check-error]: 
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(define sample-table
-  '(("matthias" 10)
-    ("matthew"  20)
-    ("robby"    -1)
-    ("shriram"  18)))
-
-;; [List-of [list String Number]] String -> Number 
-;; determine the number associated with @racket[s] in @racket[table] 
-
-(define (lookup table s)
-  (cond
-    [(empty? table) (error (string-append s " not found"))]
-    [else (if (string=? (first (first table)) s)
-              (second (first table))
-              (lookup (rest table)))]))
-))
-@;%
-
-Consider the following two examples in this context: 
-
-@examples[
-#:eval (mk-eval
- (require test-engine/racket-tests racket/list)
-(define sample-table
-  '(("matthias" 10)
-    ("matthew"  20)
-    ("robby"    -1)
-    ("shriram"  18)))
-
-(define (lookup table s)
-  (cond
-    [(empty? table) (error (string-append s " not found"))]
-    [else (if (string=? (first (first table)) s)
-              (second (first table))
-              (lookup (rest table) s))]))
-)
-(check-expect (lookup sample-table "matthew") 20)
-]
-
-@examples[
-#:eval (mk-eval
- (require test-engine/racket-tests racket/list)
-(define sample-table
-  '(("matthias" 10)
-    ("matthew"  20)
-    ("robby"    -1)
-    ("shriram"  18)))
-
-(define (lookup table s)
-  (cond
-    [(empty? table) (error (string-append s " not found"))]
-    [else (if (string=? (first (first table)) s)
-              (second (first table))
-              (lookup (rest table) s))]))
-)
-(check-error (lookup sample-table "kathi") "kathi not found")
-]
-} 
-
-
-  @defform*[#:id [check-member-of check-member-of-id]
-            [(check-member-of expression expression expression ...)]]{
-
-   Checks that the value of the first @racket[expression] is that of
-   one of the following @racket[expression]s.
-
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; [List-of X] -> X 
-;; pick a random element from the given list @racket[l]
-(define (pick-one l)
-  (list-ref l (random (length l))))
-))
-@;%
-
-@examples[#:eval
-(mk-eval (require test-engine/racket-tests)
-(define (pick-one l) (list-ref l (random (length l)))))
-
-(check-member-of (pick-one '("a" "b" "c")) "a" "b" "c")
-]
-
-  It is an error for any of @racket[expressions] to produce a function value; see
-  note on @racket[check-expect] for details. 
-   }
-
-  @defform*[#:id [check-range check-range-id]
-            [(check-range expression low-expression high-expression)]]{
-
-   Checks that the value of the first @racket[expression] is a number in
-   between the value of the @racket[low-expression] and the
-   @racket[high-expression], inclusive.
-
-A @racket[check-range] form is best used to delimit the possible results of
-functions that compute inexact numbers: 
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; [Real -> Real] Real -> Real 
-;; what is the slope of @racket[f] at @racket[x]?
-(define (differentiate f x)
-  (local ((define epsilon .001)
-          (define left (- x epsilon))
-          (define right (+ x epsilon))
-          (define slope 
-            (/ (- (f right) (f left))
-               2 epsilon)))
-    slope))
-
-(check-range (differentiate sin 0) 0.99 1.00)
-))
-@;%
-
-It is an error for @racket[expression], @racket[low-expression], or
-@racket[high-expression] to produce a function value or an inexact number;
-see note on @racket[check-expect] for details.  }
-
-  @; ----------------------------------------------------------------------
-
-  @defform*[#:id [require require-id]
-            [(require string)]]{
-
-   Makes the definitions of the module specified by @racket[string]
-   available in the current module (i.e., the current file), where
-   @racket[string] refers to a file relative to the current file.
-
-   The @racket[string] is constrained in several ways to avoid
-   problems with different path conventions on different platforms: a
-   @litchar{/} is a directory separator, @litchar{.} always means the
-   current directory, @litchar{..} always means the parent directory,
-   path elements can use only @litchar{a} through @litchar{z}
-   (uppercase or lowercase), @litchar{0} through @litchar{9},
-   @litchar{-}, @litchar{_}, and @litchar{.}, and the string cannot be
-   empty or contain a leading or trailing @litchar{/}.}
-
-
-  @defform/none[(#,require-elem module-name)]{
-
-   Accesses a file in an installed library. The library name is an
-   identifier with the same constraints as for a relative-path string
-   (though without the quotes), with the additional constraint that it
-   must not contain a @litchar{.}.}
-
-  @defform/none[(#,require-elem (lib string string ...))]{
-
-  Accesses a file in an installed library, making its definitions
-  available in the current module (i.e., the current file). The first
-  @racket[string] names the library file, and the remaining
-  @racket[string]s name the collection (and sub-collection, and so on)
-  where the file is installed. Each string is constrained in the same
-  way as for the @racket[(#,require-elem string)] form.}
-
-
-  @deftogether[(
-  @defform/none[#:literals (planet)
-                (#,require-elem (planet string (string string number number)))]{}
-  @defform/none[#:literals (planet) (#,require-elem (planet id))]{}
-  @defform/none[#:literals (planet) (#,require-elem (planet string))]{})]{
-
-  Accesses a library that is distributed on the internet via the
-  @|PLaneT| server, making it definitions available in the current module
-  (i.e., current file).
-
-  The full grammar for planet requires is given in 
-  @secref["require"
-          #:doc '(lib "scribblings/reference/reference.scrbl")], but
-  the best place to find examples of the syntax is on the
-  @link["http://planet.racket-lang.org"]{the @PLaneT server}, in the
-  description of a specific package.  
-}
-))
-
-;; ----------------------------------------
-
-(define-syntax-rule
-  (beginner-abbr-forms quote quasiquote unquote unquote-splicing)
-  (gen-beginner-abbr-forms #'quote @racket[quote]
-                           #'quasiquote @racket[quasiquote]
-                           #'unquote @racket[unquote]
-                           #'unquote-splicing @racket[unquote-splicing]))
-
-(define (gen-beginner-abbr-forms quote-id quote-elem
-                                 quasiquote-id quasiquote-elem
-                                 unquote-id unquote-elem
-                                 unquote-splicing-id unquote-splicing-elem)
-  
-  (list
-   @deftogether[(
-    @defform/none[(unsyntax @elem{@racketvalfont{'}@racket[name]})]
-    @defform/none[(unsyntax @elem{@racketvalfont{'}@racket[part]})]
-    @defform[#:id [quote quote-id] (quote name)]
-    @defform/none[(#,quote-elem part)]
-   )]{
- 
-    A quoted name is a symbol. A quoted part is an abbreviation for a nested lists.
- 
-    Normally, this quotation is written with a @litchar{'}, like
-    @racket['(apple banana)], but it can also be written with
-    @quote-elem, like @racket[(@#,quote-elem (apple banana))].}
- 
- 
-   @deftogether[(
-    @defform/none[(unsyntax @elem{@racketvalfont{`}@racket[name]})]
-    @defform/none[(unsyntax @elem{@racketvalfont{`}@racket[part]})]
-    @defform[#:id [quasiquote quasiquote-id]
-             (quasiquote name)]
-    @defform/none[(#,quasiquote-elem part)]
-   )]{
- 
-    Like @quote-elem, but also allows escaping to expression
-    ``unquotes.''
- 
-    Normally, quasi-quotations are written with a backquote,
-    @litchar{`}, like @racket[`(apple ,(+ 1 2))], but they can also be
-    written with @quasiquote-elem, like
-    @racket[(@quasiquote-elem (apple ,(+ 1 2)))].}
- 
- 
-   @deftogether[(
-    @defform/none[(unsyntax @elem{@racketvalfont{,}@racket[expression]})]
-    @defform[#:id [unquote unquote-id]
-             (unquote expression)]
-   )]{
- 
-    Under a single quasiquote, @racketfont{,}@racket[expression]
-    escapes from the quote to include an evaluated expression whose
-    result is inserted into the abbreviated list.
- 
-    Under multiple quasiquotes, @racketfont{,}@racket[expression] is
-    really the literal @racketfont{,}@racket[expression], decrementing
-    the quasiquote count by one for @racket[expression].
- 
-    Normally, an unquote is written with @litchar{,}, but it can also be
-    written with @|unquote-elem|.}
- 
- 
-   @deftogether[(
-    @defform/none[(unsyntax @elem{@racketvalfont[",@"]@racket[expression]})]
-    @defform[#:id [unquote-splicing unquote-splicing-id]
-             (unquote-splicing expression)]
-   )]{
- 
-    Under a single quasiquote, @racketfont[",@"]@racket[expression]
-    escapes from the quote to include an evaluated expression whose
-    result is a list to splice into the abbreviated list.
- 
-    Under multiple quasiquotes, a splicing unquote is like an unquote;
-    that is, it decrements the quasiquote count by one.
- 
-    Normally, a splicing unquote is written with @litchar{,}, but it
-    can also be written with @|unquote-splicing-elem|.}
-
-    ))
-
-
-(define-syntax-rule 
-  (intermediate-forms lambda
-                      local
-                      letrec
-                      let*
-                      let
-                      time
-                      define
-                      define-struct)
-  (gen-intermediate-forms #'lambda @racket[lambda]
-                          #'local @racket[local]
-                          #'letrec @racket[letrec]
-                          #'let* @racket[let*]
-                          #'let @racket[let]
-                          #'time @racket[time]
-                          @racket[define] 
-                          @racket[define-struct]))
-
-(define (gen-intermediate-forms lambda-id lambda-elem
-                                local-id local-elem
-                                letrec-id letrec-elem
-                                let*-id let*-elem
-                                let-id let-elem
-                                time-id time-elem
-                                define-elem
-                                define-struct-elem
-                                )
-  (list
-
-  @defform[#:id [local local-id]
-           (local [definition ...] expression)]{
-
-   Groups related definitions for use in @racket[expression]. Each
-   @racket[definition] can be either a @define-elem or a
-   @|define-struct-elem|. 
-
-   When evaluating @local-elem, each @racket[definition] is evaluated
-   in order, and finally the body @racket[expression] is
-   evaluated. Only the expressions within the @local-elem (including
-   the right-hand-sides of the @racket[definition]s and the
-   @racket[expression]) may refer to the names defined by the
-   @racket[definition]s. If a name defined in the @local-elem is the
-   same as a top-level binding, the inner one ``shadows'' the outer
-   one. That is, inside the @local-elem, any references to that name
-   refer to the inner one.}
-
-  @; ----------------------------------------------------------------------
-
-  @defform[#:id [letrec letrec-id]
-           (letrec ([name expr-for-let] ...) expression)]{
-
-   Like @local-elem, but with a simpler syntax. Each @racket[name]
-   defines a variable (or a function) with the value of the
-   corresponding @racket[expr-for-let].  If @racket[expr-for-let] is a
-   @lambda-elem, @letrec-elem defines a function, otherwise it
-   defines a variable.}
-
-
-  @defform[#:id [let* let*-id]
-           (let* ([name expr-for-let] ...) expression)]{
-
-   Like @letrec-elem, but each @racket[name] can only be used in
-   @racket[expression], and in @racket[expr-for-let]s occuring after
-   that @racket[name].}
-
-
-  @defform[#:id [let let-id]
-           (let ([name expr-for-let] ...) expression)]{
-
-   Like @letrec-elem, but the defined @racket[name]s can be used only
-   in the last @racket[expression], not the @racket[expr-for-let]s
-   next to the @racket[name]s.}
-
-  @; ----------------------------------------------------------------------
-
-  @defform[#:id [time time-id]
-            (time expression)]{
-
-   Measures the time taken to evaluate @racket[expression]. After
-   evaluating @racket[expression], @racket[time] prints out the time
-   taken by the evaluation (including real time, time taken by the
-   CPU, and the time spent collecting free memory). The value of
-   @time-elem is the same as that of @racket[expression].}))
-
-;; ----------------------------------------
-
-(define (prim-ops lib ctx-stx)
-  (let ([ops (map (lambda (cat)
-                    (cons (car cat)
-                          (list (cdr cat))))
-                  (lookup-documentation lib 'procedures))])
-    (make-table
-     #f
-     (cons
-      (list
-       (make-flow
-        (list
-         (make-paragraph
-          (list "In function calls, the function appearing immediatly after the open parenthesis can be any functions
-defined with " (racket define) " or " (racket define-struct) ", or any one of:")))))
-      (apply
-       append
-       (map (lambda (category)
-              (cons
-               (list (make-flow
-                      (list
-                       (make-paragraph (list (hspace 1)
-                                             (bold (car category)))))))
-               (map (lambda (func)
-                      (list
-                       (make-flow
-                        (list
-                         (make-proto func ctx-stx)))))
-                    (sort-category category))))
-            ops))))))
-
-
-(define (prim-op-defns lib ctx-stx not-in)
-  (make-splice
-   (let ([ops (map (lambda (cat)
-                     (cons (car cat)
-                           (list (cdr cat))))
-                   (lookup-documentation lib 'procedures))]
-         [not-in-ns (map (lambda (not-in-mod)
-                           (let ([ns (make-base-namespace)])
-                             (parameterize ([current-namespace ns])
-                               (namespace-require `(for-label ,not-in-mod)))
-                             ns))
-                         not-in)])
-     (apply
-      append
-      (map (lambda (category)
-             (cons
-              (subsection #:tag-prefix (format "~a" lib) (car category))
-              (filter values
-                      (map
-                       (lambda (func)
-                         (let ([id (datum->syntax ctx-stx (car func))])
-                           (and (not (ormap
-                                      (lambda (ns)
-                                        (free-label-identifier=?
-                                         id
-                                         (parameterize ([current-namespace ns])
-                                           (namespace-syntax-introduce (datum->syntax #f (car func))))))
-                                      not-in-ns))
-                                (let ([desc-strs (cddr func)])
-                                  (defthing/proc
-                                    (if (pair? (cadr func)) "function" "constant")
-                                    id
-                                    (to-paragraph (typeset-type (cadr func)))
-                                    desc-strs)))))
-                       (sort-category category)))))
-           ops)))))
-
diff --git a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/std-grammar.rkt b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/std-grammar.rkt
deleted file mode 100644
index 6f5e565349..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/std-grammar.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-#reader scribble/reader
-#lang racket/base
-(require "common.rkt"
-         scribble/decode)
-
-(provide prim-nonterms
-         racketgrammar*+library
-         racketgrammar*+qq)
-
-(define ex-str "This is a string with \" inside")
-
-(define-syntax-rule (racketgrammar*+library
-                     #:literals lits
-                     (check-expect check-random check-satisfied check-within check-member-of check-range check-error require)
-                     form ...)
-  (racketgrammar*
-   #:literals lits
-   form ...
-   [test-case @#,racket[(check-expect expr expr)]
-              @#,racket[(check-random expr expr)]
-              @#,racket[(check-satisifed expr name)]
-              @#,racket[(check-within expr expr expr)]
-              @#,racket[(check-member-of expr expr (... ...))]
-              @#,racket[(check-range expr expr expr)]
-              @#,racket[(check-error expr expr)]
-              @#,racket[(check-error expr)]]
-   (...
-    [library-require @#,racket[(require string)]
-                     @#,racket[(require (lib string string ...))]
-                     @#,racket[(require (planet string package))]])
-   (...
-    [package @#,racket[(string string number number)]])))
-
-(define-syntax-rule (racketgrammar*+qq 
-                     #:literals lits
-                     (check-expect check-random check-satisfied check-within check-member-of check-range check-error require)
-                     form ...)
-  (racketgrammar*+library
-   #:literals lits
-   (check-expect check-random check-satisfied check-within check-member-of check-range check-error require)
-   form ...
-   (...
-    [quoted name
-            number
-            string
-            character
-            @#,racket[(quoted ...)]
-            @#,elem{@racketvalfont{'}@racket[quoted]}
-            @#,elem{@racketvalfont{`}@racket[quoted]}
-            @#,elem{@racketfont{,}@racket[quoted]}
-            @#,elem{@racketfont[",@"]@racket[quoted]}])
-   (...
-    [quasiquoted name
-                 number
-                 string
-                 character
-                 @#,racket[(quasiquoted ...)]
-                 @#,elem{@racketvalfont{'}@racket[quasiquoted]}
-                 @#,elem{@racketvalfont{`}@racket[quasiquoted]}
-                 @#,elem{@racketfont{,}@racket[expr]}
-                 @#,elem{@racketfont[",@"]@racket[expr]}])))
-
-(define-syntax-rule (prim-nonterms (section-prefix) define define-struct)
-  
-  (make-splice
-   (list
-
-@t{An @racket[_name] or a @racket[_variable] is a sequence of characters
-not including a space or one of the following:}
-
-@t{@hspace[2] @litchar{"} @litchar{,} @litchar{'} @litchar{`}
-@litchar{(} @litchar{)} @litchar{[} @litchar{]}
-@litchar["{"] @litchar["}"] @litchar{|} @litchar{;}
-@litchar{#}}
-
-@t{A @racket[_number] is a number such as @racket[123], @racket[3/2], or
-@racket[5.5].}
-
-@t{A @racket[_boolean] is one of: @racket[true], @racket[false],
-@racket[#t], @racket[#f], @code{#true}, or @code{#false}.}
-
-@t{A @racket[_symbol] is a quote character followed by a name. A
-symbol is a value, just like 0 or empty.}
-
-@t{A @racket[_string] is enclosed by a pair of @litchar{"}. Unlike
-symbols, strings may be split into characters and manipulated by a
-variety of functions.  For example, @racket["abcdef"],
-@racket["This is a string"], and @racket[#,ex-str] are all strings.}
-
-@t{A @racket[_character] begins with @litchar{#\} and has the
-name of the character. For example, @racket[#\a], @racket[#\b],
-and @racket[#\space] are characters.}
-
-@t{In @seclink[(string-append section-prefix "-syntax")]{function calls}, the function appearing
-immediatly after the open parenthesis can be any functions defined
-with @racket[define] or @racket[define-struct], or any one of the
-@seclink[(string-append section-prefix "-pre-defined")]{pre-defined functions}.}
-
-)))
-
diff --git a/pkgs/htdp-pkgs/htdp-doc/stepper/info.rkt b/pkgs/htdp-pkgs/htdp-doc/stepper/info.rkt
deleted file mode 100644
index ec2db62985..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/stepper/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define scribblings '(("scribblings/stepper.scrbl")))
-
diff --git a/pkgs/htdp-pkgs/htdp-doc/stepper/scribblings/stepper.scrbl b/pkgs/htdp-pkgs/htdp-doc/stepper/scribblings/stepper.scrbl
deleted file mode 100644
index ab949f10e4..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/stepper/scribblings/stepper.scrbl
+++ /dev/null
@@ -1,177 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual)
-
-@title{The Stepper}
-
-@section{What is the Stepper?}
-
-DrRacket includes an "algebraic stepper," a tool which proceeds
-through the evaluation of a set of definitions and expressions,
-one step at a time. This evaluation shows the user how DrRacket
-evaluates expressions and definitions, and can help in debugging
-programs.  Currently, the Stepper is available in the "Beginning
-Student" and "Intermediate Student" language levels.
-
-@section{How do I use the Stepper?}
-
-The Stepper operates on the contents of the frontmost DrRacket
-window.  A click on the "Step" button brings up the stepper
-window.  The stepper window has two panes, arranged as follows:
-
-@verbatim{
-------------------
-|        |       |
-| before -> after|
-|        |       |
-------------------
-}
-
-The first, "before," box, shows the current expression.  The
-region highlighted in green is known as the "redex".  You may
-pronounce this word in any way you want.  It is short for
-"reducible expression," and it is the expression which is the
-next to be simplified.
-
-The second, "after," box shows the result of the reduction.  The
-region highlighted in purple is the new expression which is
-substituted for the green one as a result of the reduction. For 
-most reductions, the only difference between the left- and right-hand
-sides should be the contents of the green and purple boxes.
-
-Please note that the stepper only steps through the expressions
-in the definitions window, and does not allow the user to enter
-additional expressions.  So, for instance, a definitions buffer
-which contains only procedure definitions will not result in
-any reductions.
-
-@section{How Does the Stepper work?}
-
-In order to discover all of the steps that occur during the evaluation
-of your code, the Stepper rewrites (or "instruments") your code. 
-The inserted code uses a mechanism called "continuation marks" to
-store information about the program's execution as it is running, 
-and makes calls to the Stepper before, after and during the evaluation
-of each expression, indicating the current shape of the program.
-
-What does this instrumented code look like?  For the curious, here's the
-expanded version of @racket[(define (f x) (+ 3 x))] in the beginner 
-language [*]:
-
-@racketblock[
-(module #%htdp (lib "lang/htdp-beginner.rkt")
-  (#%plain-module-begin
-   (define-syntaxes (f)
-     (#%app make-first-order-function
-            (quote procedure)
-            (quote 1)
-            (quote-syntax f)
-            (quote-syntax #%app)))
-   (define-values (test~object) (#%app namespace-variable-value (quote test~object)))
-   (begin 
-     (define-values (f) 
-       (with-continuation-mark "#<debug-key-struct>"
-         (#%plain-lambda () (#%plain-app "#<procedure:...rivate/marks.rkt:70:2>"))
-         (#%plain-app
-          call-with-values
-          (#%plain-lambda ()
-            (with-continuation-mark "#<debug-key-struct>"
-              (#%plain-lambda () (#%plain-app
-                                  "#<procedure:...rivate/marks.rkt:70:2>"
-                                  (#%plain-lambda () beginner:+)))
-              (#%plain-app
-               "#<procedure:closure-storing-proc>"
-               (#%plain-lambda (x)
-                 (begin
-                   (let-values ([(arg0-1643 arg1-1644 arg2-1645) 
-                                 (#%plain-app
-                                  values
-                                  "#<*unevaluated-struct*>"
-                                  "#<*unevaluated-struct*>"
-                                  "#<*unevaluated-struct*>")])
-                     (with-continuation-mark "#<debug-key-struct>"
-                       (#%plain-lambda ()
-                         (#%plain-app
-                          "#<procedure:...rivate/marks.rkt:70:2>"
-                          (#%plain-lambda () beginner:+)
-                          (#%plain-lambda () x)
-                          (#%plain-lambda () arg0-1643)
-                          (#%plain-lambda () arg1-1644)
-                          (#%plain-lambda () arg2-1645)))
-                       (begin
-                         (#%plain-app "#<procedure:result-exp-break>")
-                         (begin 
-                           (set! arg0-1643 
-                                 (with-continuation-mark "#<debug-key-struct>"
-                                   (#%plain-lambda ()
-                                     (#%plain-app
-                                      "#<procedure:...rivate/marks.rkt:70:2>"))
-                                   beginner:+)) 
-                           (set! arg1-1644 
-                                 (with-continuation-mark "#<debug-key-struct>"
-                                   (#%plain-lambda ()
-                                     (#%plain-app 
-                                      "#<procedure:...rivate/marks.rkt:70:2>"))
-                                   (quote 3)))
-                           (set! arg2-1645
-                                 (with-continuation-mark "#<debug-key-struct>"
-                                   (#%plain-lambda ()
-                                     (#%plain-app
-                                      "#<procedure:...rivate/marks.rkt:70:2>")) x))
-                           (begin 
-                             (#%plain-app "#<procedure:normal-break>")
-                             (with-continuation-mark "#<debug-key-struct>"
-                               (#%plain-lambda ()
-                                 (#%plain-app
-                                  "#<procedure:...rivate/marks.rkt:70:2>"
-                                  (#%plain-lambda () arg0-1643) 
-                                  (#%plain-lambda () arg1-1644)
-                                  (#%plain-lambda () arg2-1645)))
-                               (if (#%plain-app
-                                    "#<procedure:annotated-proc?>"
-                                    arg0-1643) 
-                                   (#%plain-app
-                                    arg0-1643
-                                    arg1-1644
-                                    arg2-1645) 
-                                   (#%plain-app
-                                    call-with-values
-                                    (#%plain-lambda () 
-                                      (#%plain-app arg0-1643 arg1-1644 arg2-1645))
-                                    (#%plain-lambda args 
-                                      (#%plain-app
-                                       "#<procedure:result-value-break>"
-                                       args) 
-                                      (#%plain-app
-                                       "#<procedure:apply>"
-                                       values
-                                       args))))))))))))
-               (#%plain-lambda ()
-                 (#%plain-app 
-                  "#<procedure:...rivate/marks.rkt:70:2>"
-                  (#%plain-lambda () beginner:+))) #f)))
-          (#%plain-lambda args 
-            (#%plain-app "#<procedure:apply>" values args)))))
-     (#%plain-app "#<procedure:exp-finished-break>"
-                  (#%plain-app 
-                   list 
-                   (#%plain-app 
-                    list
-                    "#<procedure:...ate/annotate.rkt:1256:93>"
-                    #f
-                    (#%plain-lambda () (#%plain-app list f))))))))
-
-(let-values ([(done-already?) (quote #f)])
-  (#%app dynamic-wind void
-         (lambda () (#%app dynamic-require (quote (quote #%htdp)) (quote #f))) 
-         (lambda () (if done-already?
-                        (#%app void)
-                        (let-values ()
-                          (set! done-already? (quote #t))
-                          (#%app test*)
-                          (#%app current-namespace
-                                 (#%app module->namespace
-                                        (quote (quote #%htdp)))))))))]
-
-
-[*] : In order to allow things like @verbatim{#<procedure:apply>} in scribble, I've taken the cheap solution of wrapping them in quotes. These are not actually strings, they're opaque 3D syntax elements.
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/2htdp.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/2htdp.scrbl
deleted file mode 100644
index f6716642ef..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/2htdp.scrbl
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label scheme))
-
-@title[#:style '(toc) #:tag "2htdp" #:tag-prefix "2htdp"]{HtDP/2e Teachpacks}
-
-@local-table-of-contents[]
-
-@include-section["batch-io.scrbl"]
-@include-section["image-guide.scrbl"]
-@include-section["image.scrbl"]
-@include-section["universe.scrbl"]
-@include-section["planetcute.scrbl"]
-@include-section["port.scrbl"]
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow1.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow1.png
deleted file mode 100644
index 0276985820..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow1.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow2.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow2.png
deleted file mode 100644
index 79db65c5b1..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow2.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow2b.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow2b.png
deleted file mode 100644
index eb5f14757c..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow2b.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow3.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow3.png
deleted file mode 100644
index 147f0c0443..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow3.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadowMockup.jpg b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadowMockup.jpg
deleted file mode 100644
index 6f5c9a666b..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadowMockup.jpg and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/batch-io.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/batch-io.scrbl
deleted file mode 100644
index 87ee6f2f01..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/batch-io.scrbl
+++ /dev/null
@@ -1,286 +0,0 @@
-#lang scribble/doc
-
-@(require scheme/sandbox scribble/manual scribble/eval scribble/core
-          scribble/html-properties scribble/latex-properties
-          2htdp/batch-io
-          "shared.rkt"
-          (for-syntax racket)
-          (for-label scheme teachpack/2htdp/batch-io))
-
-@(require scheme/runtime-path)
-@(define-runtime-path here ".")
-@(define io-style-extras
-   (list (make-css-addition (build-path here "io.css"))
-         (make-tex-addition (build-path here "io.tex"))))
-@(define (file-is f)
-  (define x (parameterize ([current-directory here]) (read-file f)))
-  (nested
-    (tabular #:style (make-style "FileBox" io-style-extras)
-      (list (list (verbatim x))))))
-
-@(define-syntax examples-batch-io
-  (syntax-rules ()
-    [(_ d ...)
-     (let ()
-       (define me (make-base-eval))
-       (begin
-         (interaction-eval #:eval me (require 2htdp/batch-io))
-         (interaction-eval #:eval me d)
-         ...)
-       (me `(,current-directory ,here))
-       (interaction-eval #:eval me (require lang/htdp-intermediate-lambda))
-       me)]))
-
-@; -----------------------------------------------------------------------------
-
-@(define-syntax (reading stx)
-   (syntax-case stx ()
-     [(reading name ctc s)
-     #`@defproc[(@name [f (or/c 'standard-in 'stdin (and/c string? file-exists?))]) @ctc ]{
-      reads the standard input device (until closed) or the content of file
-      @racket[f] and produces it as @list[s].}]
-     [(reading name ctc [x ctc2] s ...)
-      #`@defproc[(@name [f (or/c 'standard-in 'stdin (and/c string? file-exists?))] [@x @ctc2]) @ctc ]{
-      reads the standard input device (until closed) or the content of file
-      @racket[f] and produces it as @list[s ...].}]))
-
-@teachpack["batch-io"]{Batch Input/Output}
-
-@author{Matthias Felleisen}
-
-@defmodule[#:require-form beginner-require 2htdp/batch-io]
-
-The batch-io teachpack introduces several functions and a form for reading
- content from files and one function for writing to a file.
-
-@; -----------------------------------------------------------------------------
-@section{IO Functions}
-
-All functions that read a file consume the name of a file and possibly
- additional arguments. They assume that the specified file exists in the
- same folder as the program; if not they signal an error:
-@itemlist[
-
-@item{@reading[read-file string?]{a string, including newlines}
-
-@examples[#:eval (examples-batch-io)
-(read-file "data.txt")
-]
-assuming the file named @racket["data.txt"] has this shape:
-@(file-is "data.txt")
-Note how the leading space in the second line translates into the space
-between the newline indicator and the word @racket["good"] in the result.}
-
-@item{@reading[read-1strings (listof 1string?)]{a list of one-char strings, one per character}
-
-@examples[#:eval (examples-batch-io)
-(read-1strings "data.txt")
-]
-Note how this function reproduces all parts of the file faithfully,
-including spaces and newlines.}
-
-@item{@reading[read-lines (listof string?)]{a list of strings, one per line}
-@examples[#:eval (examples-batch-io)
-(read-lines "data.txt")
-]
-when @racket["data.txt"] is the name of the same file as in the preceding
-item. And again, the leading space of the second line shows up in the
-second string in the list.}
-
-@item{@reading[read-words (listof string?)]{a list of strings, one per white-space separated token in the file}
-
-@examples[#:eval (examples-batch-io)
-(read-words "data.txt")
-]
-This time, however, the extra leading space of the second line of
-@racket["data.txt"] has disappeared in the result. The space is considered
-a part of the separator that surrounds the word @racket["good"].
-}
-
-@item{@reading[read-words/line (listof (listof string?))]{a list of lists, one per line; each line is represented as a list of strings}
-
-@examples[#:eval (examples-batch-io)
-(read-words/line "data.txt")
-]
-The results is similar to the one that @racket[read-words] produces,
-except that the organization of the file into lines is preserved.
-In particular, the empty third line is represented as an empty list of words.
-}
-
-@item{@reading[read-words-and-numbers/line (listof (or number? string?))]{a list of lists, one per line; each line is represented as a list of strings and numbers}
-
-@examples[#:eval (examples-batch-io)
-(read-words-and-numbers/line "data.txt")
-]
-The results is like the one that @racket[read-words/line] produces,
-except strings that can be parsed as numbers are represented as numbers.}
-
-@item{@reading[read-csv-file (listof (listof any/c))]{a list of lists of comma-separated values}
-
-@examples[#:eval (examples-batch-io)
-(read-csv-file "data.csv")
-]
-where the file named @racket["data.csv"] has this shape:
-@(file-is "data.csv")
-It is important to understand that the rows don't have to have the same
-length. Here the third line of the file turns into a row of three
-elements.
-}
-
-@item{@reading[read-csv-file/rows (listof X?) [s (-> (listof any/c) X?)]]{reads the content of file @racket[f] and
- produces it as list of rows, each constructed via @racket[s]}
-
-@examples[#:eval (examples-batch-io)
-(read-csv-file/rows "data.csv" (lambda (x) x))
-(read-csv-file/rows "data.csv" length)
-]
- The first example shows how @racket[read-csv-file] is just a short form
- for @racket[read-csv-file/rows]; the second one simply counts the
- number of separated tokens and the result is just a list of numbers.
- In many cases, the function argument is used to construct a structure from
- a row.}
-
-@; -----------------------------------------------------------------------------
-@item{@reading[read-xexpr xexpr?]{an X-expression, including whitespace such as tabs and newlines}
-
-Assumption: the file @racket[f] or the selected input device contains an
-XML element. It assumes the file contains HTML-like text and reads it as XML.
-
-@examples[#:eval (examples-batch-io)
-(read-xexpr "data.xml")
-]
-assuming the file named @racket["data.xml"] has this shape:
-@(file-is "data.xml")
-Note how the result includes @racket["\\n"] for the newlines.}
-
-@item{@reading[read-plain-xexpr xexpr?]{an X-expression, without whitespace}
-
-Assumption: the file @racket[f] or the selected input device contains an
-XML element and the content of this element are other XML elements and
-whitespace. In particular, the XML element does not contain any strings as
-elements other than whitespace.
-
-@examples[#:eval (examples-batch-io)
-(read-plain-xexpr "data-plain.xml")
-]
-assuming the file named @racket["data-plain.xml"] has this shape:
-@(file-is "data-plain.xml")
-Compare this result with the one for @racket[read-xexpr].}
-]
-
-There is only one writer function at the moment:
-@itemlist[
-
-@item{@defproc[(write-file [f (or/c 'standard-out 'stdout string?)] [cntnt string?]) string?]{
- sends @racket[cntnt] to the standard output device or
- turns @racket[cntnt] into the content of file @racket[f], located in the
- same folder (directory) as the program. If the write succeeds, the
- function produces the name of the file (@racket[f]); otherwise it signals
- an error.}
-
-@examples[#:eval (examples-batch-io)
-(if (string=? (write-file "output.txt" "good bye") "output.txt")
-    (write-file "output.txt" "cruel world")
-    (write-file "output.txt" "cruel world"))
-]
- After evaluating this examples, the file named @racket["output.txt"]
- looks like this:
-cruel world
- Explain why.
-}
-]
-
-@(parameterize ([current-directory here])
-   (with-handlers ([exn:fail:filesystem? void])
-     (delete-file "output.txt")))
-
-@bold{Warning}: The file IO functions in this teachpack are platform
- dependent. That is, as long as your programs and your files live on the
- same platform, you should not have any problems reading the files that
- programs wrote and vice versa. If, however, one of your programs writes a
- file on a Windows operating system and if you then copy this output file
- to a Mac, reading the copied text file may produce extraneous ``return''
- characters. Note that this describes only one example of possible
- malfunction; there are other cases when trans-platform actions may cause
- this teachpack to fail.
-
-@; -----------------------------------------------------------------------------
-@(define-syntax (reading/web stx)
-   (syntax-case stx ()
-     [(reading name ctc s)
-     #`@defproc[(@name [u string?]) @ctc]{
-      reads the content of URL @racket[u] and produces the first XML
-      element as an @racket[xexpr?] @list[s]. If possible, the function interprets the HTML at
-      the specified URL as XML. The function returns #@racket[f] if the web page
-      does not exist (404)}]
-     [(reading name ctc [x ctc2] s ...)
-      #`@defproc[(@name [f (or/c 'standard-in 'stdin (and/c string? file-exists?))] [@x @ctc2]) @ctc ]{
-      reads the content of URL @racket[u] and produces the first XML
-      element as an @racket[xexpr?] @list[s ...] If possible, the function interprets the HTML at
-      the specified URL as XML. The function returns #@racket[f] if the web page
-      does not exist (404)}]))
-
-@section{Web Functions}
-
-All functions that read a web-based XML consume a URL and possibly
- additional arguments. They assume that the computer is connected to
- specified part of the web, though they tolerate non-existent web pages
- (404 errors)
-
-@itemlist[
-@; -----------------------------------------------------------------------------
-@item{
-@reading/web[read-xexpr/web xexpr?]{including whitespace such as tabs and newlines}}
-
-@item{
-@reading/web[read-plain-xexpr/web xexpr?]{without whitespace}}
-
-@item{
-@defproc[(url-exists? [u string?]) boolean?]{ensures that the specified URL
-@racket[u] does not produce a 404 error.}}
-
-@item{
-@defproc[(xexpr? [u any?]) boolean?]{checks that the given value is an
-X-expression in the following sense:
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
- ;   @deftech{Xexpr} is one of:
- ;   -- @racket[symbol?]
- ;   -- @racket[string?]
- ;   -- @racket[number?]
- ;   -- @racket[(cons symbol? (cons [List-of #, @tech{Attribute}] [List-of #, @tech{Xexpr}]))]
- ;   -- @racket[(cons symbol? [List-of #, @tech{Xexpr}])]
- ;
- ;   @deftech{Attribute} is:
- ;      @racket[(list symbol? string?)]
- ;   @racket[(list 'a "some text")] is called an a-Attribute
- ;   and "some text" is a's value.
-))
-@;%
- Note that full Racket uses a wider notion of X-expression.
- }}
-
-@item{
-@defproc[(xexpr-as-string [x xexpr?]) string?]{renders the given
-X-expression as a string.}}
-
-@item{
-@defproc[(url-html-neighbors [u string?]) (listof string?)]{retrieves the
-content of URL @racket[u] and produces the list of all URLs that refer to
-.html pages via an @tt{<a>} tag.}}
-
-]
-
-
-
-
-@; -----------------------------------------------------------------------------
-@section{Testing}
-
-@defform[(simulate-file process str ...)]{
- simulates a file system for the function @racket[process], which reads a
- file and may produce one. Note: this form is under development and will be
- documented in a precise manner after it is finalized and useful for a wide
- audience.}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data-plain.xml b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data-plain.xml
deleted file mode 100644
index 843ec2b9f1..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data-plain.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<pre>
-<line text="hello world" />
-<line text="good bye" />
-<line />
-<line text="i, for 1, am done" />
-</pre>
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.csv b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.csv
deleted file mode 100644
index 38f045a27b..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-hello, world 
- good, bye 
-i, am, done 
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.txt b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.txt
deleted file mode 100644
index d0593b882d..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-hello world 
- good bye 
-
-i, for 1, am done 
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.xml b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.xml
deleted file mode 100644
index 2bae0e3ff8..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<pre>
-hello world
-good bye
-
-i, for 1, am done
-</pre>
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image-guide.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image-guide.scrbl
deleted file mode 100644
index 480156466b..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image-guide.scrbl
+++ /dev/null
@@ -1,539 +0,0 @@
-#lang scribble/doc
-
-@(require (for-label 2htdp/image
-                     (except-in lang/htdp-beginner posn make-posn posn? posn-x posn-y image?)
-                     lang/posn
-                     (only-in racket/base foldl)
-                     (except-in racket/gui/base make-color make-pen)
-                     file/convertible
-                     pict/convert
-                     (only-in mrlib/image-core render-image))
-          "shared.rkt"
-          "img-eval.rkt"
-          scribble/decode
-          scribble/manual
-          scribble/eval
-          scribble/core
-          scribble/html-properties)
-
-@(define guide-eval (make-img-eval))
-
-@(define-syntax-rule 
-   (image-examples exp ...)
-   (examples #:eval guide-eval exp ...))
-
-@(define-syntax-rule
-   (image-interaction exp ...)
-   (interaction #:eval guide-eval exp ...))
-
-@(define-syntax-rule
-   (image-interaction/bitmap exp)
-   (interaction #:eval guide-eval 
-                (eval:alts exp (make-object bitmap%
-                                 (open-input-bytes (convert exp 'png-bytes))
-                                 'png/alpha))))
-
-@(define-syntax-rule
-   (image-interaction/margin num exp)
-   (begin
-     (racketinput exp)
-     (guide-eval '(extra-margin num))
-     (interaction-eval-show #:eval guide-eval exp)
-     (guide-eval '(extra-margin 0))))
-
-@(interaction-eval #:eval guide-eval 
-                   (require racket/list 
-                            racket/local
-                            file/convertible
-                            (only-in racket/draw bitmap%)
-                            racket/class))
-
-@title[#:style 
-       (style #f (list (render-convertible-as '(svg-bytes png-bytes))))
-       #:tag "image-guide"]{Image Guide}
-
-This section introduces the @racketmodname[2htdp/image] library
-through a series of increasingly complex image constructions
-and discusses some subtle details of cropping and outline
-images.
-
-@section{Overlaying, Above, and Beside: A House}
-
-To build a simple-looking house, we can place a triangle above 
-a rectangle.
-
-@image-interaction[(above (triangle 40 "solid" "red")
-                          (rectangle 40 30 "solid" "black"))]
-
-We can give the house two roofs by putting two triangles next to
-each other.
-
-@image-interaction[(above (beside (triangle 40 "solid" "red")
-                                  (triangle 40 "solid" "red"))
-                          (rectangle 80 40 "solid" "black"))]
-
-But if we want the new roof to be a little smaller, then they do not line
-up properly.
-
-@image-interaction[(above (beside (triangle 40 "solid" "red")
-                                  (triangle 30 "solid" "red"))
-                          (rectangle 70 40 "solid" "black"))]
-
-Instead, we can use @racket[beside/align] to line up the two triangles
-along their bottoms instead of along the middles (which is what
-@racket[beside] does).
-
-@image-interaction[
-(define victorian 
-  (above (beside/align "bottom"
-                       (triangle 40 "solid" "red")
-		       (triangle 30 "solid" "red"))
-         (rectangle 70 40 "solid" "black")))
-victorian
-]
-  
-To add a door to the house, we can overlay a brown @racket[rectangle],
-aligning it with the center bottom of the rest of the house.
-
-@image-interaction[
-(define door (rectangle 15 25 "solid" "brown"))
-(overlay/align "center" "bottom" door victorian)]
-
-We can use a similar technique to put a doorknob on the door, but instead of
-overlaying the doorknob on the entire house, we can overlay it just on the
-door.
-
-@image-interaction[
-(define door-with-knob
-  (overlay/align "right" "center" (circle 3 "solid" "yellow") door))
-(overlay/align "center" "bottom" door-with-knob victorian)]
-
-@section{Rotating and Overlaying: A Rotary Phone Dial}
-
-A rotary phone dial can be built by from a black disk and 10 little white ones
-by placing the white disks, one at a time, at the top of the black disk and
-then rotating the entire black disk. To get started, lets define a function
-to make little white disks with numbers on them:
-
-@image-interaction[(define (a-number digit)
-                     (overlay
-                      (text (number->string digit) 12 "black")
-                      (circle 10 "solid" "white")))]
-
-We'll use @racket[place-and-turn] to put the numbers onto the disk:
-
-@image-interaction[(define (place-and-turn digit dial)
-                     (rotate 30
-                             (overlay/align "center" "top" 
-                                            (a-number digit)
-                                            dial)))]
-
-For example:
-
-@image-interaction[(place-and-turn
-                    0
-                    (circle 60 "solid" "black"))]
-
-@image-interaction[(place-and-turn
-                    8
-                    (place-and-turn
-                     9
-                     (place-and-turn
-                      0
-                      (circle 60 "solid" "black"))))]
-
-We can write a single function to put all of the numbers together into the dial:
-
-@image-interaction[(define (place-all-numbers dial)
-                     (place-and-turn
-                      1
-                      (place-and-turn
-                       2
-                       (place-and-turn
-                        3
-                        (place-and-turn
-                         4
-                         (place-and-turn
-                          5
-                          (place-and-turn
-                           6
-                           (place-and-turn
-                            7
-                            (place-and-turn
-                             8
-                             (place-and-turn
-                              9
-                              (place-and-turn
-                               0
-                               dial)))))))))))
-                                              
-                   (place-all-numbers (circle 60 "solid" "black"))]
-
-That definition is long and tedious to write. We can shorten it using
-@racket[foldl]:
-
-@image-interaction[(define (place-all-numbers dial)
-                     (foldl place-and-turn
-                            dial
-                            '(0 9 8 7 6 5 4 3 2 1)))
-                                              
-                   (place-all-numbers (circle 60 "solid" "black"))]
-
-To finish off the dial, we need to rotate it a little bit to its natural
-position and put a white disk in the center of it. Here's the inner dial:
-
-@image-interaction[(define inner-dial
-                     (overlay
-                      (text "555-1234" 9 "black")
-                      (circle 30 "solid" "white")))]
-
-and here's a function to build the entire rotary dial, with an argument
-that scales the dial:
-
-@image-interaction[(define (rotary-dial f)
-                     (scale
-                      f
-                      (overlay 
-                       inner-dial
-                       (rotate
-                        -90
-                        (place-all-numbers (circle 60 "solid" "black"))))))
-                   (rotary-dial 2)]
-
-Looking at the image, it feels like the numbers are too close to the edge of
-the dial. So we can adjust the @racket[place-and-turn] function to put a little
-black rectangle on top of each number. The rectangle is invisible because it
-ends up on top of the black dial, but it does serve to push the digits down
-a little.
-
-@image-interaction[(define (place-and-turn digit dial)
-                     (rotate 30
-                             (overlay/align "center" "top" 
-                                            (above 
-                                             (rectangle 1 5 "solid" "black")
-                                             (a-number digit))
-                                            dial)))
-                   
-                   (rotary-dial 2)]
-
-@section{Alpha Blending}
-
-With shapes that have opaque colors like @racket["red"] and @racket["blue"], 
-overlaying one on top completely blots out the one one the bottom. 
-
-For example, the red rectangle here completely covers the blue one.
-
-@image-interaction[(overlay
-                    (rectangle 60 100 "solid" (color 127 255 127))
-                    (rectangle 100 60 "solid" (color 127 127 255)))]
-
-But @racketmodname[2htdp/image] also supports colors that are not 
-completely opaque, via the (optional) fourth argument to @racket[color].
-
-@image-interaction[(overlay
-                    (rectangle 60 100 "solid" (color 0 255 0 127))
-                    (rectangle 100 60 "solid" (color 0 0 255 127)))]
-
-In this example, the color @racket[(color 0 255 0 127)] looks just
-like the color @racket[(color 127 255 127)] when the background
-is white. Since white is @racket[(color 255 255 255)], we end up 
-getting @racket[1/2] of @racket[255] for the red and blue components
-and @racket[255] for the green one. 
-
-We can also use alpha blending to make some interesting effects. 
-For example, the function @racket[spin-alot] takes an image argument
-and repeatedly places it on top of itself, rotating it each time by 
-@racket[1] degree.
-
-@image-interaction[(define (spin-alot t)
-                     (local [(define (spin-more i θ)
-                               (cond
-                                 [(= θ 360) i]
-                                 [else 
-                                  (spin-more (overlay i (rotate θ t))
-                                             (+ θ 1))]))]
-                       (spin-more t 0)))]
-
-Here are some uses of @racket[spin-alot], first showing the original
-shape and then the spun shape.
-
-@image-interaction[(rectangle 12 120 "solid" (color 0 0 255))
-                   (spin-alot (rectangle 12 120 "solid" (color 0 0 255 1)))
-                   (triangle 120 "solid" (color 0 0 255))
-                   (spin-alot (triangle 120 "solid" (color 0 0 255 1)))
-                   (isosceles-triangle 120 30 "solid" (color 0 0 255))
-                   (spin-alot (isosceles-triangle 120 30 "solid" (color 0 0 255 1)))]
-
-@section{Recursive Image Functions}
-
-It is also possible to make interesting looking shapes with little recursive functions.
-For example, this function repeatedly puts white circles that grow, evenly spaced around 
-the edge of the given shape:
-
-@image-interaction[(define (swoosh image s)
-                     (cond
-                       [(zero? s) image]
-                       [else (swoosh 
-                              (overlay/align "center" "top"
-                                             (circle (* s 1/2) "solid" "white")
-                                             (rotate 4 image))
-                              (- s 1))]))]
-
-@image-interaction[(swoosh (circle 100 "solid" "black") 
-                           94)]
-
-More conventional fractal shapes can also be written using the image
-library, e.g.:
-
-@image-interaction[(define (sierpinski-carpet n)
-                     (cond
-                       [(zero? n) (square 1 "solid" "black")]
-                       [else
-                        (local [(define c (sierpinski-carpet (- n 1)))
-                                (define i (square (image-width c) "solid" "white"))]
-                          (above (beside c c c)
-                                 (beside c i c)
-                                 (beside c c c)))]))]
-
-@image-interaction/bitmap[(sierpinski-carpet 5)]
-
-We can adjust the carpet to add a little color:
-
-@image-interaction[(define (colored-carpet colors)
-                     (cond
-                       [(empty? (rest colors)) 
-                        (square 1 "solid" (first colors))]
-                       [else
-                        (local [(define c (colored-carpet (rest colors)))
-                                (define i (square (image-width c) "solid" (car colors)))]
-                          (above (beside c c c)
-                                 (beside c i c)
-                                 (beside c c c)))]))]
-
-@image-interaction/bitmap[(colored-carpet 
-                           (list (color #x33 #x00 #xff)
-                                 (color #x66 #x00 #xff)
-                                 (color #x99 #x00 #xff)
-                                 (color #xcc #x00 #xff)
-                                 (color #xff #x00 #xff)
-                                 (color 255 204 0)))]
-
-The Koch curve can be constructed by simply placing four
-curves next to each other, rotated appropriately:
-
-@image-interaction[(define (koch-curve n)
-                     (cond
-                       [(zero? n) (square 1 "solid" "black")]
-                       [else
-                        (local [(define smaller (koch-curve (- n 1)))]
-                          (beside/align "bottom"
-                                        smaller 
-                                        (rotate 60 smaller)
-                                        (rotate -60 smaller)
-                                        smaller))]))
-                   (koch-curve 5)]
-
-And then put three of them together to form the Koch snowflake.
-
-@image-interaction[(above 
-                    (beside
-                     (rotate 60 (koch-curve 5))
-                     (rotate -60 (koch-curve 5)))
-                    (flip-vertical (koch-curve 5)))]
-
-@section[#:tag "rotate-center"]{Rotating and Image Centers}
-
-When rotating an image, some times the image looks best when it
-rotates around a point that is not the center of the image. The 
-@racket[rotate] function, however, just rotates the image as
-a whole, effectively rotating it around the center of its
-bounding box.
-
-For example, imagine a game where the hero is represented
-as a triangle:
-@image-interaction[(define (hero α) 
-                     (triangle 30 "solid" (color 255 0 0 α)))
-                   (hero 255)]
-rotating the hero at the prompt looks reasonable:
-@image-interaction[(rotate 10 (hero 255))
-                   (rotate 20 (hero 255))
-                   (rotate 30 (hero 255))]
-but if the hero has to appear to spin in place, then it will not look
-right, as you can kind of see if we use α-blending to represent
-old positions of the hero:
-@image-interaction[(overlay (rotate 0  (hero 255))
-                            (rotate 10 (hero 125))
-                            (rotate 20 (hero 100))
-                            (rotate 30 (hero  75))
-                            (rotate 40 (hero  50))
-                            (rotate 50 (hero  25)))]
-What we'd really want is for the hero to appear to rotate around
-the centroid of the triangle. To achieve this effect, we can put
-the hero onto a transparent circle such that the center of the whole
-image lines up with the centroid of the triangle:
-@image-interaction[(define (hero-on-blank α)
-                     (define the-hero (hero α))
-                     (define w (image-width the-hero))
-                     (define h (image-height the-hero))
-                     (define d (max w h))
-                     (define dx (/ w 2))   (code:comment "centroid x offset")
-                     (define dy (* 2/3 h)) (code:comment "centroid y offset")
-                     (define blank  (circle d "solid" (color 255 255 255 0)))
-                     (place-image/align the-hero (- d dx) (- d dy) "left" "top" blank))]
-and now the rotating hero looks reasonable:
-@image-interaction[(overlay (rotate 0  (hero-on-blank 255))
-                            (rotate 10 (hero-on-blank 125))
-                            (rotate 20 (hero-on-blank 100))
-                            (rotate 30 (hero-on-blank  75))
-                            (rotate 40 (hero-on-blank  50))
-                            (rotate 50 (hero-on-blank  25)))]
-
-@section{Image Interoperability}
-
-Images can connect to other libraries.  Specifically:
-@itemlist[@item{images are @racket[snip%] objects, so can
-                be @method[text% insert]ed into @racket[text%]
-                and @racket[pasteboard%] objects}
-           @item{they implement the @racket[convert] protocol for @racket['png-bytes]}
-           @item{they implement the @racket[pict-convert] protocol, and}
-           @item{there is a low-level interface for drawing directly into
-                 a @racket[dc<%>] object: @racket[render-image].}]
-
-@section[#:tag "nitty-gritty"]{The Nitty Gritty of Pixels, Pens, and Lines}
-
-The image library treats coordinates as if they are in the upper-left corner 
-of each pixel, and infinitesimally small (unlike pixels which have some area).
-
-Thus, when drawing a solid @racket[square] of whose side-length is 10, the image library
-colors in all of the pixels enclosed by the @racket[square] starting at the upper
-left corner of (0,0) and going down to the upper left corner of (10,10),
-so the pixel whose upper left at (9,9) is colored in, but the pixel
-at (10,10) is not. All told, 100 pixels get colored in, just as expected for
-a @racket[square] with a side length of 10.
-
-When drawing lines, however, things get a bit more complex. Specifically, 
-imagine drawing the outline of that rectangle. Since the border is
-between the pixels, there really isn't a natural pixel to draw to indicate
-the border. Accordingly, when drawing an outline @racket[square] (without a 
-@racket[pen] specification, but just a color as the last argument), 
-the image library uses a pen whose width is 1 pixel, but draws a line
-centered at the point (0.5,0.5) that goes down and around to the point (10.5,10.5).
-This means that the outline slightly exceeds the bounding box of the shape.
-Specifically, the upper and left-hand lines around the square are within
-the bounding box, but the lower and right-hand lines are just outside.
-
-This kind of rectangle is useful when putting rectangles next to each other
-and avoiding extra thick lines on the interior. For example, consider
-building a grid like this:
-
-@image-interaction[
-(define s1 (square 20 'outline 'black))
-(define r1 (beside s1 s1 s1 s1 s1 s1))
-(above  r1 r1 r1 r1 r1 r1)
-]
-
-The reason interior lines in this grid are the same thickness as the lines around the edge
-is because the rectangles overlap with each other. 
-That is, the upper-left rectangle's right edge is right on top of the
-next rectangle's left edge.
-
-The special case of adding 0.5 to each coordinate when drawing the square
-applies to all outline polygon-based shapes that just pass color, 
-but does not apply when a @racket[pen]
-is passed as the last argument to create the shape.
-For example, if using a pen of thickness 2 to draw a rectangle, we get a
-shape that has a border drawing the row of pixels just inside and just outside
-the shape. One might imagine that a pen of thickness 1 would draw an outline around the shape with
-a 1 pixel thick line, but this would require 1/2 of each pixel to be illuminated, something
-that is not possible. Instead, the same pixels are lit up as with the 2 pixel wide pen, but
-with only 1/2 of the intensity of the color. So a 1 pixel wide black @racket[pen] object draws
-a 2 pixel wide outline, but in gray.
-
-@image-interaction[(define p1 (make-pen "black" 1 "solid" "round" "round"))]
-@image-interaction/margin[2 (rectangle 20 20 "outline" p1)]
-
-When combining pens and cropping, we can make a rectangle that has a line that is one pixel
-wide, but where the line is drawn entirely within the rectangle. This rectangle has a two-pixel wide
-black pen, but we can crop out the outer portion of the pen.
-
-@image-interaction[(define p2 (make-pen "black" 2 "solid" "round" "round"))
-                   (define s2 (crop 0 0 20 20 (rectangle 20 20 "outline" p2)))
-                   s2]
-
-Using that we can build a grid now too, but this grid has doubled lines on the
-interior.
-
-@image-interaction[
-(define r2 (beside s2 s2 s2 s2 s2 s2))
-(above  r2 r2 r2 r2 r2 r2)
-]
-
-While this kind of rectangle is not useful for building grids, it 
-is important to be able to build rectangles whose drawing does not
-exceed its bounding box. Specifically, this kind of drawing is used
-by @racket[frame] and @racket[empty-scene] so that the extra drawn pixels
-are not lost if the image is later clipped to its bounding box.
-
-When using @racket[image->color-list] with outline shapes, the results
-can be surprising for the same reasons. For example, a
-2x2 black, outline rectangle consists of nine black pixels, as discussed above,
-but since @racket[image->color-list] only returns the pixels that are 
-within the bounding box, we see only three black pixels and one white one.
-
-@image-interaction[(image->color-list
-                    (rectangle 2 2 "outline" "black"))]
-
-The black pixels are (most of) the upper and left edge of the outline shape,
-and the one white pixel is the pixel in the middle of the shape.
-
-@section[#:tag "nitty-gritty-alpha"]{The Nitty Gritty of Alpha Blending}
-
-Alpha blending can cause imprecision in color comparisons resulting in
-shapes that appear @racket[equal?] even though they were created with
-different colors. This section explains how that happens.
-
-To start, consider the color @racket[(make-color 1 1 1 50)].
-This color is nearly the darkest shade of black, but with lots of transparency,
-to it renders a light gray color on a white background, e.g.:
-@image-interaction[(rectangle 100 100 "solid" (make-color 1 1 1 50))]
-If the background had been green, the same rectangle would look like a darker shade of green:
-@image-interaction[(overlay
-                    (rectangle 100 100 "solid" (make-color 1 1 1 50))
-                    (rectangle 200 200 "solid" "green"))]
-
-Surprisingly, this shape is equal to one that (apparently) has a different
-color in it:
-@image-interaction[(equal? 
-                    (rectangle 100 100 'solid (make-color 1 1 1 50))
-                    (rectangle 100 100 'solid (make-color 2 2 2 50)))]
-To understand why, we must look more carefully at how alpha blending
-and image equality work. Image equality's definition is straightforward: two images
-are equality if they are both drawn the same. That is, image equality
-is defined by simply drawing the two shapes on a white background and
-then comparing all of the pixels for the two drawings
-(it is implemented more efficiently in some cases, however).
-
-So, for those shapes to be equal, they must be drawn with the same colors.
-To see what colors were actually drawn, we can use @racket[image->color-list].
-Since these images use the same color in every pixel, we can examine just the first one:
-@image-interaction[(first
-                    (image->color-list
-                     (rectangle 100 100 'solid (make-color 1 1 1 50))))
-                   (first
-                    (image->color-list
-                     (rectangle 100 100 'solid (make-color 2 2 2 50))))]
-As expected from the @racket[equal?] test, the two colors are the same, but
-why should they be the same? This is where a subtle aspect of alpha blending 
-and drawing comes up. In general, alpha blending works by taking the color
-of any shapes below the one being drawn and then combining that color with
-the new color. The precise amount of the combination is controlled by the alpha value. 
-So, if a shape has an alpha value of @racket[α], then the drawing library
-multiplies the new shapes color by @racket[(/ α 255)] and the existing shape's
-color by @racket[(- 1 (/ α 255))] and then adds the results to get the final color.
-(It does this for each of the red, green, and blue components separately.)
-
-Going back to the two example rectangles,
-the drawing library multiplies @code{50/255} by @racket[1] for the first
-shape and multiplies @code{50/255} by @racket[2] for the second shape (since they
-are both drawn on a white background). Then rounds them to integers, which
-results in @racket[0] for both colors, making the images the same.
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image-util.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image-util.rkt
deleted file mode 100644
index b0fd61d0c1..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image-util.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-(require scribble/eval)
-
-(provide image-examples)
-
-(define img-eval (make-base-eval))
-(interaction-eval #:eval img-eval (require 2htdp/image))
-
-(define-syntax-rule 
-  (image-examples exp ...)
-  (examples #:eval img-eval exp ...))
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image.scrbl
deleted file mode 100644
index 2a41dd2a98..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image.scrbl
+++ /dev/null
@@ -1,1909 +0,0 @@
-#lang scribble/doc
-
-@(require (for-label (only-in racket/contract and/c or/c any/c not/c listof
-                                              >=/c <=/c)
-                     2htdp/image
-                     (except-in lang/htdp-beginner posn make-posn posn? posn-x posn-y image?)
-                     lang/posn
-                     (except-in racket/gui/base make-color make-pen)
-                     (only-in racket/base path-string?))
-          lang/posn
-          "shared.rkt"
-          "img-eval.rkt"
-          scribble/decode
-          scribble/manual)
-
-@(require scribble/eval)
-
-@(define img-eval (make-img-eval))
-
-@(define-syntax-rule 
-   (image-examples exp ...)
-   (examples #:eval img-eval exp ...))
-
-@(define-syntax-rule 
-   (image-interaction exp ...)
-   (interaction #:eval img-eval exp ...))
-
-@(define-syntax-rule
-   (image-interaction/margin num exp)
-   (begin
-     (racketinput exp)
-     (img-eval '(extra-margin num))
-     (interaction-eval-show #:eval img-eval exp)
-     (img-eval '(extra-margin 0))))
-     
-
-@teachpack[#:svg? #t "image"]{Images}
-
-@(define mode/color-and-nitty-text
-   (make-splice
-    @list{
-     Note that when the @racket[mode] is @racket['outline] or @racket["outline"], the shape
-     may draw outside of its bounding box and thus parts of the image may disappear
-     when it is cropped. See @secref["nitty-gritty"] (in the @seclink["image-guide"])
-     for a more careful explanation of the ramifications of this fact.
-
-     If the @racket[_mode] argument is @racket['outline] or @racket["outline"], then the last
-     argument can be a @racket[pen] struct or an @racket[image-color?], but if the @racket[_mode]
-     is @racket['solid] or @racket["solid"], then the last argument must be an
-     @racket[image-color?].}))
-
-@(define crop-warning
-   (make-splice
-    @list{Some shapes (notably those with @racket['outline] or @racket["outline"] as
-          the @racket[_mode] argument) draw outside of their bounding boxes and thus
-          cropping them may remove part of them (often the lower-left and lower-right
-          edges). See @secref["nitty-gritty"] (in the @seclink["image-guide"])
-          for a more careful discussion of this issue.}))
-
-@defmodule[#:require-form beginner-require 2htdp/image]
-
-The image teachpack provides a number of basic image construction
-functions, along with combinators for building more complex images out of
-existing images. Basic images include various polygons, ellipses and
-circles, and text, as well as bitmaps.@margin-note*{In the context of this
-documentation, a @defterm{bitmap} denotes a special form of
-@racket[image?], namely a collection of pixels associated with an image. It
-does not refer to the @racket[bitmap%] class. Typically such image-bitmaps
-come about via the @onscreen{Insert Image...} menu item in DrRacket}
-Existing images can be rotated, scaled, flipped, and overlaid on top of each other.
-
-@section{Basic Images}
-
-@defproc*[([(circle [radius (and/c real? (not/c negative?))]
-                    [mode mode?]
-                    [color image-color?])
-            image?]
-           [(circle [radius (and/c real? (not/c negative?))]
-                    [outline-mode (or/c 'outline "outline")]
-                    [pen-or-color (or/c pen? image-color?)])
-            image?])]{
-  Constructs a circle with the given radius, mode, and color.
-  
-  @mode/color-and-nitty-text
-  
-   @image-examples[(circle 30 "outline" "red")
-                   (circle 20 "solid" "blue")
-                   (circle 20 100 "blue")]
-
-}
-
-@defproc*[([(ellipse [width (and/c real? (not/c negative?))]
-                     [height (and/c real? (not/c negative?))]
-                     [mode mode?] 
-                     [color image-color?])
-            image?]
-           [(ellipse [width (and/c real? (not/c negative?))]
-                     [height (and/c real? (not/c negative?))]
-                     [mode (or/c 'outline "outline")] 
-                     [pen-or-color (or/c image-color? pen?)])
-            image?])]{
-  Constructs an ellipse with the given width, height, mode, and color.
-
-  @mode/color-and-nitty-text
-  
-  @image-examples[(ellipse 60 30 "outline" "black")
-                  (ellipse 30 60 "solid" "blue")
-                  (ellipse 30 60 100 "blue")] 
-}
-
-@defproc[(line [x1 real?] [y1 real?] [pen-or-color (or/c pen? image-color?)]) image?]{
-  Constructs an image representing a line segment that connects the points
-  (0,0) to (x1,y1).
-  
-  @image-examples[(line 30 30 "black")
-                  (line -30 20 "red")
-                  (line 30 -20 "red")]
-}
-
-@defproc[(add-line [image image?]
-                   [x1 real?] [y1 real?]
-                   [x2 real?] [y2 real?]
-                   [pen-or-color (or/c pen? image-color?)])
-         image?]{
-
-  Adds a line to the image @racket[image], starting from the point (@racket[x1],@racket[y1])
-  and going to the point (@racket[x2],@racket[y2]).
-  Unlike @racket[scene+line], if the line passes outside of @racket[image], the image
-  gets larger to accommodate the line.
-  
-  @image-examples[(add-line (ellipse 40 40 "outline" "maroon")
-                            0 40 40 0 "maroon")
-                  (add-line (rectangle 40 40 "solid" "gray")
-                            -10 50 50 -10 "maroon")
-                 (add-line
-                   (rectangle 100 100 "solid" "darkolivegreen")
-                   25 25 75 75 
-                   (make-pen "goldenrod" 30 "solid" "round" "round"))]
-}
-
-@defproc[(add-curve [image image?] 
-                    [x1 real?] [y1 real?] [angle1 angle?] [pull1 real?]
-                    [x2 real?] [y2 real?] [angle2 angle?] [pull2 real?]
-                    [pen-or-color (or/c pen? image-color?)])
-         image?]{
-
-Adds a curve to @racket[image], starting at the point
-(@racket[x1],@racket[y1]), and ending at the point
-(@racket[x2],@racket[y2]).
-
-The @racket[angle1] and @racket[angle2] arguments specify the 
-angle that the curve has as it leaves the initial point and
-as it reaches the final point, respectively. 
-
-The @racket[pull1] and @racket[pull2] arguments control how
-long the curve tries to stay with that angle. Larger numbers
-mean that the curve stays with the angle longer.
-
-Unlike @racket[scene+curve], if the line passes outside of @racket[image], the image
-  gets larger to accommodate the curve.
-
-
-  @image-examples[(add-curve (rectangle 100 100 "solid" "black")
-                             20 20 0 1/3
-                             80 80 0 1/3
-                             "white")
-                  (add-curve (rectangle 100 100 "solid" "black")
-                             20 20 0 1 
-                             80 80 0 1
-                             "white")
-                  (add-curve 
-                   (add-curve 
-                    (rectangle 40 100 "solid" "black")
-                    20 10 180 1/2
-                    20 90 180 1/2
-                    (make-pen "white" 4 "solid" "round" "round"))
-                   20 10 0 1/2
-                   20 90 0 1/2
-                   (make-pen "white" 4 "solid" "round" "round"))
-                  
-                  (add-curve (rectangle 100 100 "solid" "black")
-                             -20 -20 0 1 
-                             120 120 0 1
-                             "red")]
-}
-
-@defproc[(text [string string?] [font-size (and/c integer? (<=/c 1 255))] [color image-color?])
-         image?]{
-                
-  Constructs an image that draws the given string, using the font size and color.
-                 
-  @image-examples[(text "Hello" 24 "olive")
-                  (text "Goodbye" 36 "indigo")]
-  
-  The text size is measured in pixels, not points, so passing @racket[24]
-  to @racket[text] should result in an image whose height is @racket[24]
-  (which might not be the case if the size were measured in points).
-  @image-examples[(image-height (text "Hello" 24 "olive"))]
-  
-}
-
-@defproc[(text/font [string string?] [font-size (and/c integer? (<=/c 1 255))] [color image-color?]
-                    [face (or/c string? #f)]
-                    [family (or/c 'default 'decorative 'roman 'script 
-                                  'swiss 'modern 'symbol 'system)]
-                    [style (or/c 'normal 'italic 'slant)]
-                    [weight (or/c 'normal 'bold 'light)]
-                    [underline? any/c])
-         image?]{
-                
-  Constructs an image that draws the given string, using a complete font specification.
-  
-  The @racket[face] and the @racket[family] combine to give the complete typeface. If 
-  @racket[face] is available on the system, it is used, but if not then a default typeface
-  based on the @racket[family] is chosen. The @racket[style] controls if the face is italic
-  or not (on Windows and Mac OS X, @racket['slant] and @racket['italic] are the same),
-  the @racket[weight] controls if it is boldface (or light), and @racket[underline?]
-  determines if the face is underlined. For more details on these arguments, see @racket[font%],
-  which ultimately is what this code uses to draw the font.
-                 
-  @image-examples[(text/font "Hello" 24 "olive"
-                             "Gill Sans" 'swiss 'normal 'bold #f)
-                  (text/font "Goodbye" 18 "indigo"
-                             #f 'modern 'italic 'normal #f)
-                  (text/font "not really a link" 18 "blue"
-                             #f 'roman 'normal 'normal #t)]
-}
-
-@defthing[empty-image image?]{
-  The empty image. Its width and height are both zero and it does not draw at all.
-  
-  @image-examples[(image-width empty-image)
-                  (equal? (above empty-image
-                                 (rectangle 10 10 "solid" "red"))
-                          (beside empty-image
-                                  (rectangle 10 10 "solid" "red")))]
-  
-  
-  Combining an image with @racket[empty-image] produces the
-  original image (as shown in the above example).  
-}
-
-@section{Polygons}
-
-@defproc*[([(triangle [side-length (and/c real? (not/c negative?))] 
-                      [mode mode?]
-                      [color image-color?])
-            image?]
-           [(triangle [side-length (and/c real? (not/c negative?))] 
-                      [outline-mode (or/c 'outline "outline")]
-                      [pen-or-color (or/c pen? image-color?)])
-            image?])]{
-
-   Constructs a upward-pointing equilateral triangle. 
-  The @racket[side-length] argument 
-  determines the 
-  length of the side of the triangle.
-
-    @mode/color-and-nitty-text
-  
-    @image-examples[(triangle 40 "solid" "tan")]
-
-}
-
-@defproc*[([(right-triangle [side-length1 (and/c real? (not/c negative?))]
-                            [side-length2 (and/c real? (not/c negative?))]
-                            [mode mode?]
-                            [color image-color?])
-            image?]
-           [(right-triangle [side-length1 (and/c real? (not/c negative?))]
-                            [side-length2 (and/c real? (not/c negative?))]
-                            [outline-mode (or/c 'outline "outline")]
-                            [pen-or-color (or/c pen? image-color?)])
-            image?])]{
-                 
-  Constructs a triangle with a right angle where the two sides adjacent
-  to the right angle have lengths @racket[side-length1] and @racket[side-length2].
-
-  @mode/color-and-nitty-text
-  
-  @image-examples[(right-triangle 36 48 "solid" "black")]
-}
-
-@defproc*[([(isosceles-triangle [side-length (and/c real? (not/c negative?))] 
-                                [angle angle?]
-                                [mode mode?]
-                                [color image-color?])
-            image?]
-           [(isosceles-triangle [side-length (and/c real? (not/c negative?))] 
-                                [angle angle?]
-                                [outline-mode (or/c 'outline "outline")]
-                                [pen-or-color (or/c pen? image-color?)])
-            image?])]{
-
- Creates a triangle with two equal-length sides, of length @racket[side-length]
- where the angle between those sides is @racket[angle]. The third
- leg is straight, horizontally. If the angle is less than 
- @racket[180], then the triangle will point up and if the @racket[angle]
- is more, then the triangle will point down. 
- 
- @mode/color-and-nitty-text
- 
- @image-examples[(isosceles-triangle 200 170 "solid" "seagreen")
-                 (isosceles-triangle 60 30 "solid" "aquamarine")
-                 (isosceles-triangle 60 330 "solid" "lightseagreen")]
-}
-
-                     
-To create a triangle given known sides and angles, the following
-family of functions are useful:
-@itemlist[@item{@racket[triangle/sss], if all three sides are known}
-          @item{@racket[triangle/ass], 
-                @racket[triangle/sas], or
-                @racket[triangle/ssa], 
-                if two sides and their included angle are known}
-          @item{@racket[triangle/aas], 
-                @racket[triangle/asa], or 
-                @racket[triangle/saa], 
-                if two angles and their shared side are known.}]
-                     
-
-They all construct a triangle oriented as follows:
-
-@image["triangle-xxx.png"]
-
-@defproc*[([(triangle/sss [side-length-a (and/c real? (not/c negative?))] 
-                          [side-length-b (and/c real? (not/c negative?))] 
-                          [side-length-c (and/c real? (not/c negative?))] 
-                          [mode mode?]
-                          [color image-color?])
-            image?]
-           [(triangle/sss [side-length-a (and/c real? (not/c negative?))]
-                          [side-length-b (and/c real? (not/c negative?))]
-                          [side-length-c (and/c real? (not/c negative?))]
-                          [outline-mode (or/c 'outline "outline")]
-                          [pen-or-color (or/c pen? image-color?)])
-            image?])]{
- Creates a triangle where the side lengths a, b, and, c are given by @racket[side-length-a],
- @racket[side-length-b], and, @racket[side-length-c] respectively.
- 
- @mode/color-and-nitty-text
- 
- @image-examples[(triangle/sss 40 60 80 "solid" "seagreen")
-                 (triangle/sss 80 40 60 "solid" "aquamarine")
-                 (triangle/sss 80 80 40 "solid" "lightseagreen")]
-}
-
-@defproc*[([(triangle/ass [angle-a angle?] 
-                          [side-length-b (and/c real? (not/c negative?))] 
-                          [side-length-c (and/c real? (not/c negative?))] 
-                          [mode mode?]
-                          [color image-color?])
-            image?]
-           [(triangle/ass [angle-a angle?]
-                          [side-length-b (and/c real? (not/c negative?))]
-                          [side-length-c (and/c real? (not/c negative?))]
-                          [outline-mode (or/c 'outline "outline")]
-                          [pen-or-color (or/c pen? image-color?)])
-            image?])]{
- Creates a triangle where the angle A and side length a and b, are given by @racket[angle-a],
- @racket[side-length-b], and, @racket[side-length-c] respectively.
- See above for a diagram showing where which sides and which angles are which.
- 
- @mode/color-and-nitty-text
- 
- @image-examples[(triangle/ass 10  60 100 "solid" "seagreen")
-                 (triangle/ass 90  60 100 "solid" "aquamarine")
-                 (triangle/ass 130 60 100 "solid" "lightseagreen")]
-}
-
-@defproc*[([(triangle/sas [side-length-a (and/c real? (not/c negative?))] 
-                          [angle-b angle?] 
-                          [side-length-c (and/c real? (not/c negative?))] 
-                          [mode mode?]
-                          [color image-color?])
-            image?]
-           [(triangle/sas [side-length-a (and/c real? (not/c negative?))]
-                          [angle-b angle?]
-                          [side-length-c (and/c real? (not/c negative?))]
-                          [outline-mode (or/c 'outline "outline")]
-                          [pen-or-color (or/c pen? image-color?)])
-            image?])]{
- Creates a triangle where the side length a, angle B, and, 
- side length c given by @racket[side-length-a],
- @racket[angle-b], and, @racket[side-length-c] respectively.
- See above for a diagram showing where which sides and which angles are which.
- 
- @mode/color-and-nitty-text
- 
- @image-examples[(triangle/sas 60  10 100 "solid" "seagreen")
-                 (triangle/sas 60  90 100 "solid" "aquamarine")
-                 (triangle/sas 60 130 100 "solid" "lightseagreen")]
-}
-
-@defproc*[([(triangle/ssa [side-length-a (and/c real? (not/c negative?))] 
-                          [side-length-b (and/c real? (not/c negative?))] 
-                          [angle-c angle?] 
-                          [mode mode?]
-                          [color image-color?])
-            image?]
-           [(triangle/ssa [side-length-a (and/c real? (not/c negative?))]
-                          [side-length-b (and/c real? (not/c negative?))]
-                          [angle-c angle?]
-                          [outline-mode (or/c 'outline "outline")]
-                          [pen-or-color (or/c pen? image-color?)])
-            image?])]{
- Creates a triangle where the side length a, side length b, and,
- angle c given by @racket[side-length-a],
- @racket[side-length-b], and, @racket[angle-c] respectively.
- See above for a diagram showing where which sides and which angles are which.
- 
- @mode/color-and-nitty-text
- 
- @image-examples[(triangle/ssa 60 100  10 "solid" "seagreen")
-                 (triangle/ssa 60 100  90 "solid" "aquamarine")
-                 (triangle/ssa 60 100 130 "solid" "lightseagreen")]
-}
-@defproc*[([(triangle/aas [angle-a angle?] 
-                          [angle-b angle?] 
-                          [side-length-c (and/c real? (not/c negative?))] 
-                          [mode mode?]
-                          [color image-color?])
-            image?]
-           [(triangle/aas [angle-a angle?]
-                          [angle-b angle?]
-                          [side-length-c (and/c real? (not/c negative?))]
-                          [outline-mode (or/c 'outline "outline")]
-                          [pen-or-color (or/c pen? image-color?)])
-            image?])]{
- Creates a triangle where the angle A, angle B, and, side length c given by @racket[angle-a],
- @racket[angle-b], and, @racket[side-length-c] respectively.
- See above for a diagram showing where which sides and which angles are which.
- 
- @mode/color-and-nitty-text
- 
- @image-examples[(triangle/aas  10 40 200 "solid" "seagreen")
-                 (triangle/aas  90 40 200 "solid" "aquamarine")
-                 (triangle/aas 130 40 40  "solid" "lightseagreen")]
-}
-
-@defproc*[([(triangle/asa [angle-a angle?] 
-                          [side-length-b (and/c real? (not/c negative?))] 
-                          [angle-c angle?] 
-                          [mode mode?]
-                          [color image-color?])
-            image?]
-           [(triangle/asa [angle-a angle?]
-                          [side-length-b (and/c real? (not/c negative?))]
-                          [angle-c angle?]
-                          [outline-mode (or/c 'outline "outline")]
-                          [pen-or-color (or/c pen? image-color?)])
-            image?])]{
- Creates a triangle where the angle A, side length b, and, angle C given by @racket[angle-a],
- @racket[side-length-b], and, @racket[angle-c] respectively.
- See above for a diagram showing where which sides and which angles are which.
- 
- @mode/color-and-nitty-text
- 
- @image-examples[(triangle/asa  10 200 40 "solid" "seagreen")
-                 (triangle/asa  90 200 40 "solid" "aquamarine")
-                 (triangle/asa 130 40  40 "solid" "lightseagreen")]
-}
-
-@defproc*[([(triangle/saa [side-length-a (and/c real? (not/c negative?))] 
-                          [angle-b angle?] 
-                          [angle-c angle?] 
-                          [mode mode?]
-                          [color image-color?])
-            image?]
-           [(triangle/saa [side-length-a (and/c real? (not/c negative?))]
-                          [angle-b angle?]
-                          [angle-c angle?]
-                          [outline-mode (or/c 'outline "outline")]
-                          [pen-or-color (or/c pen? image-color?)])
-            image?])]{
- Creates a triangle where the side length a, angle B, and, angle C given by @racket[side-length-a],
- @racket[angle-b], and, @racket[angle-c] respectively.
- See above for a diagram showing where which sides and which angles are which.
- 
- @mode/color-and-nitty-text
- 
- @image-examples[(triangle/saa 200  10 40 "solid" "seagreen")
-                 (triangle/saa 200  90 40 "solid" "aquamarine")
-                 (triangle/saa 40  130 40 "solid" "lightseagreen")]
-}
-
-
-@defproc*[([(square [side-len (and/c real? (not/c negative?))]
-                    [mode mode?]
-                    [color image-color?])
-            image?]
-           [(square [side-len (and/c real? (not/c negative?))]
-                    [outline-mode (or/c 'outline "outline")]
-                    [pen-or-color (or/c pen? image-color?)])
-            image?])]{
-
- Constructs a square.
- 
- @mode/color-and-nitty-text
- 
- @image-examples[(square 40 "solid" "slateblue")
-                 (square 50 "outline" "darkmagenta")]
-
-}
-
-@defproc*[([(rectangle [width (and/c real? (not/c negative?))]
-                       [height (and/c real? (not/c negative?))]
-                       [mode mode?]
-                       [color image-color?])
-            image?]
-           [(rectangle [width (and/c real? (not/c negative?))]
-                       [height (and/c real? (not/c negative?))]
-                       [outline-mode (or/c 'outline "outline")] 
-                       [pen-or-color (or/c pen? image-color?)])
-            image?])]{
-  Constructs a rectangle with the given width, height, mode, and color.
-  
-  @mode/color-and-nitty-text
-  
-  @image-examples[(rectangle 40 20 "outline" "black")
-                  (rectangle 20 40 "solid" "blue")]
-}
-
-@defproc*[([(rhombus [side-length (and/c real? (not/c negative?))]
-                     [angle angle?]
-                     [mode mode?]
-                     [color image-color?])
-            image?]
-           [(rhombus [side-length (and/c real? (not/c negative?))]
-                     [angle angle?]
-                     [outline-mode (or/c 'outline "outline")]
-                     [pen-or-color (or/c pen? image-color?)])
-            image?])]{
-                 
-Constructs a four sided polygon with all equal sides and thus where opposite angles are equal to each
-other. The top and bottom pair of angles is @racket[angle]
-and the left and right are @racket[(- 180 angle)].
-
-@mode/color-and-nitty-text
-
-@image-examples[(rhombus 40 45 "solid" "magenta")
-                (rhombus 80 150 "solid" "mediumpurple")]
-}
-
-@defproc*[([(star [side-length (and/c real? (not/c negative?))] 
-                  [mode mode?]
-                  [color image-color?])
-            image?]
-           [(star [side-length (and/c real? (not/c negative?))] 
-                  [outline-mode (or/c 'outline "outline")]
-                  [color (or/c pen? image-color?)])
-            image?])]{
-  Constructs a star with five points. The @racket[side-length] argument 
-  determines the side length of the enclosing pentagon.
-
-  @mode/color-and-nitty-text
-
-  @image-examples[(star 40 "solid" "gray")]
-  
-}
-
-@defproc*[([(star-polygon [side-length (and/c real? (not/c negative?))]
-                          [side-count side-count?]
-                          [step-count step-count?]
-                          [mode mode?]
-                          [color image-color?])
-            image?]
-           [(star-polygon [side-length (and/c real? (not/c negative?))]
-                          [side-count side-count?]
-                          [step-count step-count?]
-                          [outline-mode (or/c 'outline "outline")]
-                          [pen-or-color (or/c pen? image-color?)])
-            image?])]{
- 
-  Constructs an arbitrary regular star polygon (a generalization of the regular polygons). 
-  The polygon is enclosed by a regular polygon with @racket[side-count] sides each
-  @racket[side-length] long. The polygon is actually constructed by going from vertex to
-  vertex around the regular polygon, but connecting every @racket[step-count]-th vertex
-  (i.e., skipping every @racket[(- step-count 1)] vertices).
-  
-  For example, if @racket[side-count] is @racket[5] and @racket[step-count] is @racket[2],
-  then this function produces a shape just like @racket[star].
-  
-  @mode/color-and-nitty-text
-
-  @image-examples[(star-polygon 40 5 2 "solid" "seagreen")
-                  (star-polygon 40 7 3 "outline" "darkred")
-                  (star-polygon 20 10 3 "solid" "cornflowerblue")]
- 
-}
-                
-@defproc*[([(radial-star [point-count (and/c integer? (>=/c 2))]
-                         [inner-radius (and/c real? (not/c negative?))]
-                         [outer-radius (and/c real? (not/c negative?))]
-                         [mode mode?]
-                         [color image-color?])
-            image?]
-           [(radial-star [point-count (and/c integer? (>=/c 2))]
-                         [inner-radius (and/c real? (not/c negative?))]
-                         [outer-radius (and/c real? (not/c negative?))]
-                         [outline-mode (or/c 'outline "outline")]
-                         [pen-or-color (or/c pen? image-color?)])
-            image?])]{
-
-Constructs a star-like polygon where the star is specified by two radii and a number of points. 
-The first radius determines where the points begin, the second determines where they end, and
-the @racket[point-count] argument determines how many points the star has.
-
-@image-examples[(radial-star 8 8 64 "solid" "darkslategray")
-                (radial-star 32 30 40 "outline" "black")]
-
-}
-
-@defproc*[([(regular-polygon [side-length (and/c real? (not/c negative?))] 
-                             [side-count side-count?]
-                             [mode mode?]
-                             [color image-color?])
-            image?]
-           [(regular-polygon [side-length (and/c real? (not/c negative?))] 
-                             [side-count side-count?]
-                             [outline-mode (or/c 'outline "outline")]
-                             [pen-or-color (or/c pen? image-color?)])
-            image?])]{
-  Constructs a regular polygon with @racket[side-count] sides.
-
-  @mode/color-and-nitty-text
-
-  @image-examples[(regular-polygon 50 3 "outline" "red")
-                  (regular-polygon 40 4 "outline" "blue")
-                  (regular-polygon 20 8 "solid" "red")]
-}
-
-
-@defproc*[([(polygon [vertices (listof real-valued-posn?)] 
-                     [mode mode?]
-                     [color image-color?])
-            image?]
-           [(polygon [vertices (listof real-valued-posn?)] 
-                     [outline-mode (or/c 'outline "outline")]
-                     [pen-or-color (or/c pen? image-color?)])
-            image?])]{
-  Constructs a polygon connecting the given vertices.
-  
-  @mode/color-and-nitty-text
-  
-  @image-examples[(polygon (list (make-posn 0 0)
-                                 (make-posn -10 20)
-                                 (make-posn 60 0)
-                                 (make-posn -10 -20))
-                           "solid" 
-                           "burlywood")
-                  (polygon (list (make-posn 0 0)
-                                 (make-posn 0 40)
-                                 (make-posn 20 40)
-                                 (make-posn 20 60)
-                                 (make-posn 40 60)
-                                 (make-posn 40 20)
-                                 (make-posn 20 20)
-                                 (make-posn 20 0))
-                           "solid" 
-                           "plum")
-                  (underlay
-                   (rectangle 80 80 "solid" "mediumseagreen")
-                   (polygon
-                    (list (make-posn 0 0)
-                          (make-posn 50 0)
-                          (make-posn 0 50)
-                          (make-posn 50 50))
-                    "outline"
-                    (make-pen "darkslategray" 10 "solid" "round" "round")))
-                  
-                  (underlay
-                   (rectangle 90 80 "solid" "mediumseagreen")
-                   (polygon 
-                    (list (make-posn 0 0)
-                          (make-posn 50 0)
-                          (make-posn 0 50)
-                          (make-posn 50 50))
-                    "outline"
-                    (make-pen "darkslategray" 10 "solid" "projecting" "miter")))]
-}
-
-@defproc[(add-polygon [image image?]
-                      [posns (listof posn?)]
-                      [mode mode?]
-                      [color image-color?])
-         image?]{
-                 
- Adds a closed polygon to the image @racket[image], with vertices as specified in @racket[posns]
- (relative to the top-left corner of @racket[image]).  Unlike @racket[scene+polygon], 
- if the polygon goes outside the bounds of @racket[image], the result is enlarged to accommodate both.
-
-@mode/color-and-nitty-text
-
-@image-examples[(add-polygon (rectangle 55 34 "solid" "light blue")
-                          (list (make-posn 50 10)
-                                (make-posn 20 15)
-                                (make-posn 50 20)
-                                (make-posn 10 25)
-                                (make-posn 35 30))
-                          "outline" "red")
-                (add-polygon (square 65 "solid" "light blue")
-                          (list (make-posn 30 -20)
-                                (make-posn 50 50)
-                                (make-posn -20 30))
-                          "solid" "forest green")
-                (add-polygon (square 180 "solid" "yellow")
-                          (list
-                           (make-posn 109 160)
-                           (make-posn 26 148)
-                           (make-posn 46 36)
-                           (make-posn 93 44)
-                           (make-posn 89 68)
-                           (make-posn 122 72))
-                          "outline" "dark blue")
-                (add-polygon (square 50 "solid" "light blue")
-                          (list (make-posn 25 -10)
-                                (make-posn 60 25)
-                                (make-posn 25 60)
-                                (make-posn -10 25))
-                          "solid" "pink")]
-                                     }
-
-@defproc[(scene+polygon [image image?]
-                     [posns (listof posn?)]
-                     [mode mode?]
-                     [color image-color?])
-         image?]{
-  Adds a closed polygon to the image @racket[image], with vertices as specified in @racket[posns]
- (relative to the top-left corner of @racket[image]).  Unlike @racket[add-polygon], if the
- polygon goes outside the bounds of @racket[image], the result is clipped to @racket[image].
-                                     
-@crop-warning
-
-@image-examples[(scene+polygon (rectangle 55 34 "solid" "light blue")
-                          (list (make-posn 50 10)
-                                (make-posn 20 15)
-                                (make-posn 50 20)
-                                (make-posn 10 25)
-                                (make-posn 35 30))
-                          "outline" "red")
-                (scene+polygon (square 65 "solid" "light blue")
-                          (list (make-posn 30 -20)
-                                (make-posn 50 50)
-                                (make-posn -20 30))
-                          "solid" "forest green")
-                (scene+polygon (square 180 "solid" "yellow")
-                          (list
-                           (make-posn 109 160)
-                           (make-posn 26 148)
-                           (make-posn 46 36)
-                           (make-posn 93 44)
-                           (make-posn 89 68)
-                           (make-posn 122 72))
-                          "outline" "dark blue")
-                (scene+polygon (square 50 "solid" "light blue")
-                          (list (make-posn 25 -10)
-                                (make-posn 60 25)
-                                (make-posn 25 60)
-                                (make-posn -10 25))
-                          "solid" "pink")]
-                                     }
-
-
-@section{Overlaying Images}
-
-@defproc[(overlay [i1 image?] [i2 image?] [is image?] ...) image?]{
-  Overlays all of its arguments building a single image. The first argument goes
-  on top of the second argument, which goes on top of the third argument, etc.
-  The images are all lined up on their centers.
-
-  @image-examples[(overlay (rectangle 30 60 "solid" "orange")
-                           (ellipse 60 30 "solid" "purple"))
-                  (overlay (ellipse 10 10 "solid" "red")
-                           (ellipse 20 20 "solid" "black")
-                           (ellipse 30 30 "solid" "red")
-                           (ellipse 40 40 "solid" "black")
-                           (ellipse 50 50 "solid" "red")
-                           (ellipse 60 60 "solid" "black"))
-                  (overlay (regular-polygon 20 5 "solid" (make-color  50  50 255))
-                           (regular-polygon 26 5 "solid" (make-color 100 100 255))
-                           (regular-polygon 32 5 "solid" (make-color 150 150 255))
-                           (regular-polygon 38 5 "solid" (make-color 200 200 255))
-                           (regular-polygon 44 5 "solid" (make-color 250 250 255)))]
-  
-  }
-
-@defproc[(overlay/align [x-place x-place?] [y-place y-place?] [i1 image?] [i2 image?] [is image?] ...)
-         image?]{
-  Overlays all of its image arguments, much like the @racket[overlay] function, but using
-  @racket[x-place] and @racket[y-place] to determine where the images are lined up. For example, if
-  @racket[x-place] and @racket[y-place] are both @racket["middle"], then the images are lined up
-  on their centers.
-
-  @image-examples[(overlay/align "left" "middle"
-                                 (rectangle 30 60 "solid" "orange")
-                                 (ellipse 60 30 "solid" "purple"))
-                  (overlay/align "right" "bottom"
-                                 (rectangle 20 20 "solid" "silver")
-                                 (rectangle 30 30 "solid" "seagreen")
-                                 (rectangle 40 40 "solid" "silver")
-                                 (rectangle 50 50 "solid" "seagreen"))]
-
-  }
-
-@defproc[(overlay/offset [i1 image?] [x real?] [y real?] [i2 image?]) image?]{
-  Just like @racket[overlay], this function lines up its image arguments on top of
-  each other. Unlike @racket[overlay], it moves @racket[i2] by @racket[x] pixels to
-  the right and @racket[y] down before overlaying them.
-  
-  @image-examples[(overlay/offset (circle 40 "solid" "red")
-                                  10 10
-                                  (circle 40 "solid" "blue"))
-                  
-                  (overlay/offset (overlay/offset (rectangle 60 20 "solid" "black")
-                                                  -50 0
-                                                  (circle 20 "solid" "darkorange"))
-                                  70 0
-                                  (circle 20 "solid" "darkorange"))
-                  (overlay/offset
-                   (overlay/offset (circle 30 'solid (color 0 150 0 127))
-                                   26 0
-                                   (circle 30 'solid (color 0 0 255 127)))
-                   0 26
-                   (circle 30 'solid (color 200 0 0 127)))]
-}
-
-@defproc[(overlay/align/offset [x-place x-place?] [y-place y-place?] 
-                               [i1 image?] [x real?] [y real?] [i2 image?])
-         image?]{
-  Overlays image @racket[i1] on top of @racket[i2], using @racket[x-place] and @racket[y-place] 
-  as the starting points for the overlaying, and then adjusts @racket[i2] by @racket[x] to the 
-  right and @racket[y] pixels down. 
-  
-  This function combines the capabilities of @racket[overlay/align] and @racket[overlay/offset].
-  
-  @image-examples[(overlay/align/offset
-                   "right" "bottom"
-                   (star-polygon 20 20 3 "solid" "navy")
-                   10 10
-                   (circle 30 "solid" "cornflowerblue"))
-                  (overlay/align/offset
-                   "left" "bottom"
-                   (star-polygon 20 20 3 "solid" "navy")
-                   -10 10
-                   (circle 30 "solid" "cornflowerblue"))]
-  
-}
-
-@defproc[(overlay/xy [i1 image?] [x real?] [y real?] [i2 image?]) image?]{
-  Constructs an image by overlaying @racket[i1] on top of @racket[i2].
-  The images are initially lined up on their upper-left corners and 
-  then @racket[i2] is shifted to the right 
-  by @racket[x] pixels to and down by @racket[y] pixels.
-  
-  This is the same as @racket[(underlay/xy i2 (- x) (- y) i1)].
-
-  See also @racket[overlay/offset] and @racket[underlay/offset].
-
-  @image-examples[(overlay/xy (rectangle 20 20 "outline" "black")
-                              20 0
-                              (rectangle 20 20 "outline" "black"))
-                  (overlay/xy (rectangle 20 20 "solid" "red")
-                              10 10
-                              (rectangle 20 20 "solid" "black"))
-                  (overlay/xy (rectangle 20 20 "solid" "red")
-                              -10 -10
-                              (rectangle 20 20 "solid" "black"))
-                  (overlay/xy 
-                   (overlay/xy (ellipse 40 40 "outline" "black")
-                               10
-                               15
-                               (ellipse 10 10 "solid" "forestgreen"))
-                   20
-                   15
-                   (ellipse 10 10 "solid" "forestgreen"))]
-}
-
-@defproc[(underlay [i1 image?] [i2 image?] [is image?] ...) image?]{
-  Underlays all of its arguments building a single image.
-  
-  It behaves like @racket[overlay], but with the arguments in the reverse order.
-  That is, the first argument goes
-  underneath of the second argument, which goes underneath the third argument, etc.
-  The images are all lined up on their centers.
-
-  @image-examples[(underlay (rectangle 30 60 "solid" "orange")
-                            (ellipse 60 30 "solid" "purple"))
-                  (underlay (ellipse 10 60 "solid" "red")
-                            (ellipse 20 50 "solid" "black")
-                            (ellipse 30 40 "solid" "red")
-                            (ellipse 40 30 "solid" "black")
-                            (ellipse 50 20 "solid" "red")
-                            (ellipse 60 10 "solid" "black"))
-                  (underlay (ellipse 10 60 40 "red")
-                            (ellipse 20 50 40 "red")
-                            (ellipse 30 40 40 "red")
-                            (ellipse 40 30 40 "red")
-                            (ellipse 50 20 40 "red")
-                            (ellipse 60 10 40 "red"))]
-  
-  }
-
-@defproc[(underlay/align [x-place x-place?] [y-place y-place?] [i1 image?] [i2 image?]
-                         [is image?] ...)
-         image?]{
-  Underlays all of its image arguments, much like the @racket[underlay] function, but using
-  @racket[x-place] and @racket[y-place] to determine where the images are lined up. For example, if
-  @racket[x-place] and @racket[y-place] are both @racket["middle"], then the images are lined up
-  on their centers.
-
-  @image-examples[(underlay/align "left" "middle"
-                                  (rectangle 30 60 "solid" "orange")
-                                  (ellipse 60 30 "solid" "purple"))
-                  (underlay/align "right" "top"
-                                  (rectangle 50 50 "solid" "seagreen")
-                                  (rectangle 40 40 "solid" "silver")
-                                  (rectangle 30 30 "solid" "seagreen")
-                                  (rectangle 20 20 "solid" "silver"))
-                  (underlay/align "left" "middle"
-                                  (rectangle 50 50 50 "seagreen")
-                                  (rectangle 40 40 50 "seagreen")
-                                  (rectangle 30 30 50 "seagreen")
-                                  (rectangle 20 20 50 "seagreen"))]
-
-  }
-
-
-@defproc[(underlay/offset [i1 image?] [x real?] [y real?] [i2 image?]) image?]{
-  Just like @racket[underlay], this function lines up its first image argument
-  underneath the second. Unlike @racket[underlay], it moves @racket[i2] by
-  @racket[x] pixels to the right and @racket[y] down before underlaying them.
-  
-  @image-examples[(underlay/offset (circle 40 "solid" "red")
-                                  10 10
-                                  (circle 40 "solid" "blue"))
-                  
-                  (underlay/offset (circle 40 "solid" "gray")
-                                   0 -10
-                                   (underlay/offset (circle 10 "solid" "navy")
-                                                   -30 0
-                                                   (circle 10 "solid" "navy")))]
-}
-
-@defproc[(underlay/align/offset [x-place x-place?] [y-place y-place?] 
-                                [i1 image?]
-                                [x real?] [y real?]
-                                [i2 image?])
-         image?]{
-  Underlays image @racket[i1] underneath @racket[i2], using @racket[x-place] and @racket[y-place]
-  as the starting points for the combination, and then adjusts @racket[i2] by @racket[x] to the 
-  right and @racket[y] pixels down. 
-  
-  This function combines the capabilities of @racket[underlay/align] and @racket[underlay/offset].
-  
-  @image-examples[(underlay/align/offset
-                   "right" "bottom"
-                   (star-polygon 20 20 3 "solid" "navy")
-                   10 10
-                   (circle 30 "solid" "cornflowerblue"))
-                  (underlay/align/offset
-                   "right" "bottom"
-                   (underlay/align/offset
-                    "left" "bottom"
-                    (underlay/align/offset
-                     "right" "top"
-                     (underlay/align/offset
-                      "left" "top"
-                      (rhombus 120 90 "solid" "navy")
-                      16 16
-                      (star-polygon 20 11 3 "solid" "cornflowerblue"))
-                     -16 16
-                     (star-polygon 20 11 3 "solid" "cornflowerblue"))
-                    16 -16
-                    (star-polygon 20 11 3 "solid" "cornflowerblue"))
-                   -16 -16
-                   (star-polygon 20 11 3 "solid" "cornflowerblue"))]
-  
-}
-
-@defproc[(underlay/xy [i1 image?] [x real?] [y real?] [i2 image?]) image?]{
-  Constructs an image by underlaying @racket[i1] underneath @racket[i2].
-  The images are initially lined up on their upper-left corners and 
-  then @racket[i2] is shifted to the right 
-  by @racket[x] pixels to and down by @racket[y] pixels.
-  
-  This is the same as @racket[(overlay/xy i2 (- x) (- y) i1)].
-  
-  See also @racket[underlay/offset] and @racket[overlay/offset].
-
-  @image-examples[(underlay/xy (rectangle 20 20 "outline" "black")
-                               20 0
-                               (rectangle 20 20 "outline" "black"))
-                  (underlay/xy (rectangle 20 20 "solid" "red")
-                               10 10
-                               (rectangle 20 20 "solid" "black"))
-                  (underlay/xy (rectangle 20 20 "solid" "red")
-                               -10 -10
-                               (rectangle 20 20 "solid" "black"))
-                  (underlay/xy 
-                   (underlay/xy (ellipse 40 40 "solid" "gray")
-                                10
-                                15
-                                (ellipse 10 10 "solid" "forestgreen"))
-                   20
-                   15
-                   (ellipse 10 10 "solid" "forestgreen"))]
-}
-
-
-@defproc[(beside [i1 image?] [i2 image?] [is image?] ...) image?]{
-  Constructs an image by placing all of the argument images in a
-  horizontal row, aligned along their centers.
-
-  @image-examples[(beside (ellipse 20 70 "solid" "gray")
-                          (ellipse 20 50 "solid" "darkgray")
-                          (ellipse 20 30 "solid" "dimgray")
-                          (ellipse 20 10 "solid" "black"))]
-
-  }
-
-@defproc[(beside/align [y-place y-place?] [i1 image?] [i2 image?] [is image?] ...) image?]{
-  Constructs an image by placing all of the argument images in a horizontal row, lined
-  up as indicated by the @racket[y-place] argument. For example, if @racket[y-place]
-  is @racket["middle"], then the images are placed side by side with their centers 
-  lined up with each other.
-
-  @image-examples[(beside/align "bottom"
-                                (ellipse 20 70 "solid" "lightsteelblue")
-                                (ellipse 20 50 "solid" "mediumslateblue")
-                                (ellipse 20 30 "solid" "slateblue")
-                                (ellipse 20 10 "solid" "navy"))
-
-                  (beside/align "top"
-                                (ellipse 20 70 "solid" "mediumorchid")
-                                (ellipse 20 50 "solid" "darkorchid")
-                                (ellipse 20 30 "solid" "purple")
-                                (ellipse 20 10 "solid" "indigo"))
-
-                  (beside/align "baseline"
-                                (text "ijy" 18 "black")
-                                (text "ijy" 24 "black"))]
-
-  }
-
-
-@defproc[(above [i1 image?] [i2 image?] [is image?] ...) image?]{
-  Constructs an image by placing all of the argument images in a
-  vertical row, aligned along their centers.
-
-  @image-examples[(above (ellipse 70 20 "solid" "gray")
-                         (ellipse 50 20 "solid" "darkgray")
-                         (ellipse 30 20 "solid" "dimgray")
-                         (ellipse 10 20 "solid" "black"))]
-
-  }
-
-@defproc[(above/align [x-place x-place?] [i1 image?] [i2 image?] [is image?] ...) image?]{
-  Constructs an image by placing all of the argument images in a vertical row, lined
-  up as indicated by the @racket[x-place] argument. For example, if @racket[x-place]
-  is @racket["middle"], then the images are placed above each other with their centers 
-  lined up.
-
-  @image-examples[(above/align "right"
-                               (ellipse 70 20 "solid" "gold")
-                               (ellipse 50 20 "solid" "goldenrod")
-                               (ellipse 30 20 "solid" "darkgoldenrod")
-                               (ellipse 10 20 "solid" "sienna"))
-
-                  (above/align "left"
-                               (ellipse 70 20 "solid" "yellowgreen")
-                               (ellipse 50 20 "solid" "olivedrab")
-                               (ellipse 30 20 "solid" "darkolivegreen")
-                               (ellipse 10 20 "solid" "darkgreen"))]
-
-  }
-
-@section{Placing Images & Scenes}
-
-Placing images into scenes is particularly useful when building worlds
-and universes using @racket[2htdp/universe].
-
-@defproc*[([(empty-scene [width (and/c real? (not/c negative?))]
-                         [height (and/c real? (not/c negative?))])
-            image?]
-            [(empty-scene [width (and/c real? (not/c negative?))]
-                          [height (and/c real? (not/c negative?))]
-                          [color image-color?])
-            image?])]{
-
-Creates an empty scene, i.e., a white rectangle with a black outline.
-
-@image-examples[(empty-scene 160 90)]
-
-The three-argument version creates a rectangle of the specified color with
-a black outline. 
-}
-
-@defproc[(place-image [image image?] [x real?] [y real?] [scene image?]) image?]{
-
- Places @racket[image] onto @racket[scene] with its center at the coordinates 
- (@racket[x],@racket[y]) and crops the resulting image so that it has the 
- same size as @racket[scene]. The coordinates are relative to the top-left
- of @racket[scene].
-  
- @crop-warning
- 
- @image-examples[(place-image 
-                  (triangle 32 "solid" "red")
-                  24 24
-                  (rectangle 48 48 "solid" "gray"))
-                 
-                 (place-image 
-                  (triangle 64 "solid" "red")
-                  24 24
-                  (rectangle 48 48 "solid" "gray"))
-                 
-                 (place-image
-                  (circle 4 "solid" "white")
-                  18 20
-                  (place-image
-                   (circle 4 "solid" "white")
-                   0 6
-                   (place-image
-                    (circle 4 "solid" "white")
-                    14 2
-                    (place-image
-                     (circle 4 "solid" "white")
-                     8 14
-                     (rectangle 24 24 "solid" "goldenrod")))))]
-}
-@defproc[(place-image/align [image image?]
-                            [x real?]
-                            [y real?]
-                            [x-place x-place?]
-                            [y-place y-place?]
-                            [scene image?])
-         image?]{
-
- Like @racket[place-image], but uses @racket[image]'s @racket[x-place] and
- @racket[y-place] to anchor the image. Also, like
- @racket[place-image], @racket[place-image/align]
- crops the resulting image so that it has the 
- same size as @racket[scene].
-  
- @crop-warning
- 
- @image-examples[(place-image/align (triangle 48 "solid" "yellowgreen")
-                                    64 64 "right" "bottom"
-                                    (rectangle 64 64 "solid" "mediumgoldenrod"))
-                 (beside 
-                  (place-image/align (circle 8 "solid" "tomato")
-                                     0 0 "center" "center"
-                                     (rectangle 32 32 "outline" "black"))
-                  (place-image/align (circle 8 "solid" "tomato")
-                                     8 8 "center" "center"
-                                     (rectangle 32 32 "outline" "black"))
-                  (place-image/align (circle 8 "solid" "tomato")
-                                     16 16 "center" "center"
-                                     (rectangle 32 32 "outline" "black"))
-                  (place-image/align (circle 8 "solid" "tomato")
-                                     24 24 "center" "center"
-                                     (rectangle 32 32 "outline" "black"))
-                  (place-image/align (circle 8 "solid" "tomato")
-                                     32 32 "center" "center"
-                                     (rectangle 32 32 "outline" "black")))]
-}
-
-@defproc[(place-images [images (listof image?)]
-                       [posns (listof posn?)]
-                       [scene image?])
-         image?]{
- 
- Places each of @racket[images] into @racket[scene] like 
-                @racket[place-image] would, using the coordinates
-                in @racket[posns] as the @racket[_x]
-                and @racket[_y] arguments to @racket[place-image].
-                  
- @crop-warning
-                
- @image-examples[(place-images
-                  (list (circle 4 "solid" "white")
-                        (circle 4 "solid" "white")
-                        (circle 4 "solid" "white")
-                        (circle 4 "solid" "white"))
-                  (list (make-posn 18 20)
-                        (make-posn 0 6)
-                        (make-posn 14 2)
-                        (make-posn 8 14))
-                  (rectangle 24 24 "solid" "goldenrod"))]
-}
-
-
-@defproc[(place-images/align [images (listof image?)]
-                             [posns (listof posn?)]
-                             [x-place x-place?]
-                             [y-place y-place?]
-                             [scene image?])
-         image?]{
- 
- Like @racket[place-images], except that it places the images
-      with respect to @racket[x-place] and @racket[y-place].
-                         
- @crop-warning
-
- @image-examples[(place-images/align
-                  (list (triangle 48 "solid" "yellowgreen")
-                        (triangle 48 "solid" "yellowgreen")
-                        (triangle 48 "solid" "yellowgreen")
-                        (triangle 48 "solid" "yellowgreen"))
-                  (list (make-posn 64 64) 
-                        (make-posn 64 48)
-                        (make-posn 64 32)
-                        (make-posn 64 16))
-                  "right" "bottom"
-                  (rectangle 64 64 "solid" "mediumgoldenrod"))]
-}
-@defproc[(scene+line [scene image?]
-                     [x1 real?] [y1 real?]
-                     [x2 real?] [y2 real?]
-                     [pen-or-color (or/c pen? image-color?)])
-         image?]{
-
-  Adds a line to the image @racket[scene], starting from the point (@racket[x1],@racket[y1])
-  and going to the point (@racket[x2],@racket[y2]); unlike
-  @racket[add-line], this function crops the resulting image to the size of @racket[scene].
-  
-  @crop-warning
-  
-  @image-examples[(scene+line (ellipse 40 40 "outline" "maroon")
-                              0 40 40 0 "maroon")
-                  (scene+line (rectangle 40 40 "solid" "gray")
-                              -10 50 50 -10 "maroon")
-                  (scene+line
-                   (rectangle 100 100 "solid" "darkolivegreen")
-                   25 25 100 100 
-                   (make-pen "goldenrod" 30 "solid" "round" "round"))]
-}
-
-
-@defproc[(scene+curve [scene image?] 
-                      [x1 real?] [y1 real?] [angle1 angle?] [pull1 real?]
-                      [x2 real?] [y2 real?] [angle2 angle?] [pull2 real?]
-                      [color (or/c pen? image-color?)])
-         image?]{
-
-Adds a curve to @racket[scene], starting at the point
-(@racket[x1],@racket[y1]), and ending at the point
-(@racket[x2],@racket[y2]).
-
-The @racket[angle1] and @racket[angle2] arguments specify the 
-angle that the curve has as it leaves the initial point and
-as it reaches the final point, respectively. 
-
-The @racket[pull1] and @racket[pull2] arguments control how
-long the curve tries to stay with that angle. Larger numbers
-mean that the curve stays with the angle longer.
-
-Unlike @racket[add-curve], this function crops the curve, only showing
-the parts that fit onto @racket[scene].
-
-@crop-warning
-
-@image-examples[(scene+curve (rectangle 100 100 "solid" "black")
-                             20 20 0 1/3
-                             80 80 0 1/3
-                             "white")
-                (scene+curve (rectangle 100 100 "solid" "black")
-                             20 20 0 1 
-                             80 80 0 1
-                             "white")
-                (scene+curve 
-                 (add-curve 
-                  (rectangle 40 100 "solid" "black")
-                  20 10 180 1/2
-                  20 90 180 1/2
-                  "white")
-                 20 10 0 1/2
-                 20 90 0 1/2
-                 "white")
-
-                (scene+curve (rectangle 100 100 "solid" "black")
-                             -20 -20 0 1 
-                             120 120 0 1
-                             "red")]
-}
-
-
-@section{Rotating, Scaling, Flipping, Cropping, and Framing Images}
-
-@defproc[(rotate [angle angle?] [image image?]) image?]{
-  Rotates @racket[image] by @racket[angle] degrees in a counter-clockwise direction.
-          
-          @image-examples[(rotate 45 (ellipse 60 20 "solid" "olivedrab"))
-                          (rotate 5 (rectangle 50 50 "outline" "black"))
-                          (rotate 45
-                                  (beside/align
-                                   "center"
-                                   (rectangle 40 20 "solid" "darkseagreen")
-                                   (rectangle 20 100 "solid" "darkseagreen")))]
-          
-          See also @seclink["rotate-center"].
-          
-}
-
-@defproc[(scale [factor (and/c real? positive?)] [image image?]) image?]{
-
-  Scales @racket[image] by @racket[factor].
-  
-  The pen sizes are also scaled and thus draw thicker (or thinner)
-  lines than the original image, unless the pen was size 
-  @racket[0]. That pen size is treated specially to mean ``the
-  smallest available line'' and thus it always draws a one-pixel
-  wide line; this is also the case for @racket['outline] and @racket["outline"]
-  shapes that are drawn with an @racket[image-color?] instead of
-  a @racket[pen].
-  
-         
-  @image-examples[(scale 2 (ellipse 20 30 "solid" "blue"))
-                   (ellipse 40 60 "solid" "blue")]
-  
-  
-  
-}
-
-@defproc[(scale/xy [x-factor (and/c real? positive?)] 
-                   [y-factor (and/c real? positive?)]
-                   [image image?])
-         image?]{
-  Scales @racket[image] by @racket[x-factor] horizontally and by 
-  @racket[y-factor] vertically. 
-  
-  @image-examples[(scale/xy 3 
-                            2 
-                            (ellipse 20 30 "solid" "blue")) 
-                  (ellipse 60 60 "solid" "blue")]
-}
-
-@defproc[(flip-horizontal [image image?]) image?]{
-   Flips @racket[image] left to right.
-         
-         Flipping images with text is not supported (so passing @racket[flip-horizontal] an image
-         that contains a @racket[text] or @racket[text/font] image inside somewhere signals an error).
-         
-         @image-examples[(beside
-                          (rotate 30 (square 50 "solid" "red"))
-                          (flip-horizontal
-                           (rotate 30 (square 50 "solid" "blue"))))]
-}
-
-@defproc[(flip-vertical [image image?]) image?]{
-   Flips @racket[image] top to bottom.
-         
-         Flipping images with text is not supported (so passing @racket[flip-vertical] an image
-         that contains a @racket[text] or @racket[text/font] image inside somewhere signals an error).
-
-         @image-examples[(above 
-                          (star 40 "solid" "firebrick")
-                          (scale/xy 1 1/2 (flip-vertical (star 40 "solid" "gray"))))]
-}
-
-@defproc[(crop [x real?]
-               [y real?] 
-               [width (and/c real? (not/c negative?))]
-               [height (and/c real? (not/c negative?))]
-               [image image?])
-         image?]{
-
- Crops @racket[image] to the rectangle with the upper left at the point (@racket[x],@racket[y])
- and with @racket[width] and @racket[height]. 
- 
- @crop-warning
- 
- @image-examples[(crop 0 0 40 40 (circle 40 "solid" "chocolate"))
-                 (crop 40 60 40 60 (ellipse 80 120 "solid" "dodgerblue"))
-                 (above
-                  (beside (crop 40 40 40 40 (circle 40 "solid" "palevioletred"))
-                          (crop 0 40 40 40 (circle 40 "solid" "lightcoral")))
-                  (beside (crop 40 0 40 40 (circle 40 "solid" "lightcoral"))
-                          (crop 0 0 40 40 (circle 40 "solid" "palevioletred"))))]
-                 
-}
-
-@defproc[(crop/align [x-place x-place?]
-                     [y-place y-place?]
-                     [width (and/c real? (not/c negative?))]
-                     [height (and/c real? (not/c negative?))]
-                     [image image?])
-         image?]{
-
- Crops @racket[image] to a rectangle whose size is @racket[width] and @racket[height]
-       and is positioned based on @racket[x-place] and @racket[y-place].
-
- @crop-warning
-
- @image-examples[(crop/align "left" "top" 40 40 (circle 40 "solid" "chocolate"))
-                 (crop/align "right" "bottom" 40 60 (ellipse 80 120 "solid" "dodgerblue"))
-                 (crop/align "center" "center" 50 30 (circle 25 "solid" "mediumslateblue"))
-                 (above
-                  (beside (crop/align "right" "bottom" 40 40 (circle 40 "solid" "palevioletred"))
-                          (crop/align "left" "bottom" 40 40 (circle 40 "solid" "lightcoral")))
-                  (beside (crop/align "right" "top" 40 40 (circle 40 "solid" "lightcoral"))
-                          (crop/align "left" "top" 40 40 (circle 40 "solid" "palevioletred"))))]
-
- @history[#:added "1.1"]
-}
-
-
-@defproc[(frame [image image?]) image?]{
-  Returns an image just like @racket[image], except
-  with a black, single pixel frame drawn around the 
-  bounding box of the image.
-  
-  @image-examples[(frame (ellipse 40 40 "solid" "gray"))]
-  
-  Generally speaking, this function is useful to 
-  debug image constructions, i.e., to see where
-  certain sub-images appear within some larger image.
-  
-  @image-examples[(beside
-                   (ellipse 20 70 "solid" "lightsteelblue")
-                   (frame (ellipse 20 50 "solid" "mediumslateblue"))
-                   (ellipse 20 30 "solid" "slateblue")
-                   (ellipse 20 10 "solid" "navy"))]
-}
-
-@defproc[(color-frame [color (or/c pen? image-color?)] [image image?]) image?]{
-  Like @racket[frame], except with the given @racket[color].
-       
-  @history[#:added "1.1"]
-}
-
-
-@section{Bitmaps}
-
-DrRacket's @seclink["images" #:doc '(lib "scribblings/drracket/drracket.scrbl")]{Insert Image ...} 
-menu item allows you to insert images into your program text, and those images are treated 
-as images for this library. 
-
-Unlike all of the other images in this library, those images (and the other images created
-by functions in this section of the documentation)
-are represented as bitmaps, i.e., an array of colors (that can be quite large in some cases).
-This means that scaling and rotating them loses fidelity in the image and is significantly
-more expensive than with the other shapes.
-
-See also the @racketmodname[2htdp/planetcute] library.
-
-@defform/subs[(bitmap bitmap-spec)
-              ([bitmap-spec rel-string
-                            id])]{
-
-  Loads the bitmap specified by @racket[bitmap-spec]. If
-  @racket[bitmap-spec] is a string, it is treated as a relative path.
-  If it is an identifier, it is treated like a require spec and used to
-  refer to a file in a collection.
-
-  @image-examples[(bitmap icons/stop-16x16.png)
-                  (bitmap icons/b-run.png)]
-}
-
-@defproc[(bitmap/url [url string?]) image?]{
-  Goes out on the web and downloads the image at @racket[url].
-
-  Downloading the image happens each time this function is called, so
-  you may find it simpler to download the image once with a browser 
-  and then paste it into your program or download it and use @racket[bitmap].
-}
-
-@defproc[(bitmap/file [ps path-string?]) image?]{
-  Loads the image from @racket[ps].
-
-  If @racket[ps] is a relative path, the file is relative to
-  the current directory. (When running in DrRacket, the current
-  directory is set to the place where the definitions window is
-  saved, but in general this can be an arbitrary directory.)
-}
-
-
-@defproc[(image->color-list [image image?]) (listof color?)]{
-  Returns a list of colors that correspond to the colors in the
-  image, reading from left to right, top to bottom.
-  
-  The list of colors is obtained by drawing the image on a white
-  background and then reading off the colors of the pixels that were drawn.
-  
-  @image-examples[(image->color-list (rectangle 2 2 "solid" "black"))
-                  (image->color-list
-                   (above (beside (rectangle 1 1 "solid" (make-color 1 1 1))
-                                  (rectangle 1 1 "solid" (make-color 2 2 2)))
-                          (beside (rectangle 1 1 "solid" (make-color 3 3 3))
-                                  (rectangle 1 1 "solid" (make-color 4 4 4)))))]
-  
-}
-
-@defproc[(color-list->bitmap [colors (listof image-color?)] 
-                             [width (and/c real? (not/c negative?))]
-                             [height (and/c real? (not/c negative?))])
-         image?]{
-  Constructs a bitmap from the given @racket[colors], 
-  with the given @racket[width] and @racket[height].
-
-  @image-examples[(scale
-                   40
-                   (color-list->bitmap
-                    (list "red" "green" "blue")
-                    3 1))]
-  
-  }
-
-@defproc*[([(freeze [image image?]) image?]
-           [(freeze [width (and/c real? (not/c negative?))]
-                    [height (and/c real? (not/c negative?))]
-                    [image image?]) image?]
-           [(freeze [x real?]
-                    [y real?]
-                    [width (and/c real? (not/c negative?))]
-                    [height (and/c real? (not/c negative?))]
-                    [image image?]) image?])]{
-  Freezing an image internally builds a bitmap, crops the image, draws the cropped image
-  into the bitmap and then
-  uses the bitmap to draw that image afterwards. Typically this is used as a performance
-  hint. When an image both contains many sub-images and is going to be drawn many times
-  (but not scaled or rotated),
-  using freeze on the image can substantially improve performance without changing how
-  the image draws (assuming it draws only inside its bounding box; see also @secref["nitty-gritty"]).
-  
-  If @racket[freeze] is passed only the image argument, then it crops the image to its bounding
-  box. If it is given three arguments, the two numbers are used as the width and height and
-  the five argument version fully specifies where to crop the image.
-}
-
-@section{Image Properties}
-
-@defproc[(image-width [i image?]) (and/c integer? (not/c negative?) exact?)]{
-  Returns the width of @racket[i].
-
-  @image-examples[(image-width (ellipse 30 40 "solid" "orange"))
-                  (image-width (circle 30 "solid" "orange"))
-                  (image-width (beside (circle 20 "solid" "orange")
-                                       (circle 20 "solid" "purple")))
-                  (image-width (rectangle 0 10 "solid" "purple"))]
-}
-
-@defproc[(image-height [i image?]) (and/c integer? (not/c negative?) exact?)]{
-  Returns the height of @racket[i].
-  
-  @image-examples[(image-height (ellipse 30 40 "solid" "orange"))
-                  (image-height (circle 30 "solid" "orange"))
-                  (image-height (overlay (circle 20 "solid" "orange")
-                                         (circle 30 "solid" "purple")))
-                  (image-height (rectangle 10 0 "solid" "purple"))]
-  }
-
-@defproc[(image-baseline [i image?]) (and/c integer? (not/c negative?) exact?)]{
-  Returns the distance from the top of the image to its baseline. 
-  The baseline of an image is the place where the bottoms any letters line up, 
-  but without counting the descenders, e.g. the tail on ``y'' or ``g'' or ``j''.
-  
-  Unless the image was constructed with @racket[text], @racket[text/font] 
-  or, in some cases, @racket[crop], this will be the same as its height.
-  
-  @image-examples[(image-baseline (text "Hello" 24 "black"))
-                  (image-height (text "Hello" 24 "black"))
-                  (image-baseline (rectangle 100 100 "solid" "black"))
-                  (image-height (rectangle 100 100 "solid" "black"))]
-
-  A @racket[crop]ped image's baseline is the same as the image's baseline, if the
-  cropping stays within the original image's bounding box. But if the cropping actually
-  enlarges the image, then the baseline can end up being smaller.
-  
-  @image-examples[(image-height (rectangle 20 20 "solid" "black"))
-                  (image-baseline (rectangle 20 20 "solid" "black"))
-                  
-                  (image-height (crop 10 10 5 5 (rectangle 20 20 "solid" "black")))
-                  (image-baseline (crop 10 10 5 5 (rectangle 20 20 "solid" "black")))
-                  
-                  (image-height (crop 10 10 30 30 (rectangle 20 20 "solid" "black")))
-                  (image-baseline (crop 10 10 30 30 (rectangle 20 20 "solid" "black")))]
-                  
-}
-
-@section{Image Predicates}
-
-This section lists predicates for the basic structures provided by the image library.
-
-@defproc[(image? [x any/c]) boolean?]{
- Determines if @racket[x] is an image. Images are returned by functions
- like @racket[ellipse] and @racket[rectangle] and
- accepted by functions like @racket[overlay] and @racket[beside].
-
- Additionally, images inserted into a DrRacket window are treated as
- bitmap images, as are instances of @racket[image-snip%] and @racket[bitmap%].
- }
-
-@defproc[(mode? [x any/c]) boolean?]{
- Determines if @racket[x] is a mode suitable for
- constructing images. 
- 
- It can be one of
- @racket['solid], @racket["solid"], @racket['outline],
- or @racket["outline"], indicating if the shape is
- filled in or not.
- 
- It can also be an integer between @racket[0] and @racket[255] (inclusive)
- indicating the transparency of the image. The integer @racket[255] is
- fully opaque, and is the same as @racket["solid"] (or @racket['solid]).
- The integer @racket[0] means fully transparent.
-}
-
-@defproc[(image-color? [x any/c]) boolean?]{
-
-  Determines if @racket[x] represents a color. Strings, symbols,
-  and @racket[color] structs are allowed as colors.
-
-  For example,
-  @racket["magenta"], @racket["black"], @racket['orange], and @racket['purple]
-  are allowed. Colors are not case-sensitive, so 
-  @racket["Magenta"], @racket["Black"], @racket['Orange], and @racket['Purple]
-  are also allowed, and are the same colors as in the previous sentence.
-  If a string or symbol color name is not recognized, black is used in its place.
-  
-  The complete list of colors is the same as the colors allowed in
-  @racket[color-database<%>], plus the color @racket["transparent"], a transparent
-  color.
-
-}
-
-@defstruct[color ([red (and/c natural-number/c (<=/c 255))]
-                  [green (and/c natural-number/c (<=/c 255))]
-                  [blue (and/c natural-number/c (<=/c 255))]
-                  [alpha (and/c natural-number/c (<=/c 255))])]{
-  The @racket[color] struct defines a color with @racket[red], 
-      @racket[green], @racket[blue], and @racket[alpha] components
-      that range from @racket[0] to @racket[255]. 
-      
-    The @racket[red], @racket[green], and @racket[blue] fields
-      combine to make a color, with the higher values meaning more of the given color. 
-      For example, @racket[(make-color 255 0 0)] makes a
-      bright red color and @racket[(make-color 255 0 255)] makes a bright purple.
-    
-      The @racket[alpha] field controls the transparency of the color. A value of @racket[255] means
-      that the color is opaque and @racket[0] means the color is fully transparent.
-      
-  The constructor, @racket[make-color], also accepts only three arguments, in which case
-  the three arguments are used for the @racket[red], @racket[green], and @racket[blue] fields, and the
-  @racket[alpha] field defaults to @racket[255].
-}
-
-@defproc[(y-place? [x any/c]) boolean?]{
-  Determines if @racket[x] is a placement option
-  for the vertical direction. It can be one
-  of
-@racket["top"],
-@racket['top], 
-@racket["bottom"],
-@racket['bottom],
-@racket["middle"],
-@racket['middle],
-@racket["center"],
-@racket['center],
-@racket["baseline"],
-@racket['baseline],
-@racket["pinhole"], or
-@racket['pinhole].
-
-Using @racket["pinhole"] or @racket['pinhole] is only allowed when all of the 
-image arguments have @seclink["pinholes"]{pinholes}.
-
-See also @racket[image-baseline] for more discussion of baselines.
-
-}
-
-@defproc[(x-place? [x any/c]) boolean?]{
-  Determines if @racket[x] is a placement option
-  for the horizontal direction. It can be one
-  of @racket["left"],
-  @racket['left], 
-  @racket["right"],
-  @racket['right],
-  @racket["middle"],
-  @racket['middle],
-  @racket["center"],
-  @racket['center],
-  @racket["pinhole"], or
-  @racket['pinhole].
-
-  Using @racket["pinhole"] or @racket['pinhole] is only allowed when all of the image 
-  arguments have @seclink["pinholes"]{pinholes}.
-
-}
-
-@defproc[(angle? [x any/c]) boolean?]{
-  Determines if @racket[x] is an angle, namely
-  a real number (except not @racket[+inf.0], @racket[-inf.0] or
-  @racket[+nan.0]). 
-  
-  Angles are in degrees, so 0 is
-  the same as 360, 90 means rotating one
-  quarter of the way around a circle, and 180
-  is halfway around a circle.
-}
-
-@defproc[(side-count? [x any/c]) boolean?]{
-  Determines if @racket[x] is an integer 
-  greater than or equal to @racket[3].
-}
-
-@defproc[(step-count? [x any/c]) boolean?]{
-  Determines if @racket[x] is an integer greater than or equal to @racket[1].
-}
-
-@defproc[(real-valued-posn? [x any/c]) boolean?]{
-  Determines if @racket[x] is a @racket[posn] whose @racket[_x] and @racket[_y]
-  fields are both @racket[real?] numbers.
-}
-
-@defstruct[pen ([color image-color?]
-                [width (and/c real? (<=/c 0 255))]
-                [style pen-style?]
-                [cap pen-cap?]
-                [join pen-join?])]{
-  The @racket[pen] struct specifies how the drawing library draws lines. 
-      
-      
-      A good default for @racket[style] is @racket["solid"], and
-      good default values for the @racket[cap] and @racket[join] fields
-      are @racket["round"].
-      
-      Using @racket[0] as a width is special; it means to always draw the 
-      smallest possible, but visible, pen. This means that the pen will always
-      be one pixel in size, no matter how the image is scaled.
-}
-
-@defproc[(pen-style? [x any/c]) boolean?]{
-  Determines if @racket[x] is a valid pen style.
-  It can be one of
-  @racket["solid"], @racket['solid], 
-  @racket["dot"], @racket['dot], 
-  @racket["long-dash"], @racket['long-dash], 
-  @racket["short-dash"], @racket['short-dash], 
-  @racket["dot-dash"], or @racket['dot-dash].
-}
-
-@defproc[(pen-cap? [x any/c]) boolean?]{
-  Determines if @racket[x] is a valid pen cap.
-  It can be one of
-  @racket["round"], @racket['round], 
-  @racket["projecting"], @racket['projecting], 
-  @racket["butt"], or @racket['butt].
-}
-
-@defproc[(pen-join? [x any/c]) boolean?]{
-  Determines if @racket[x] is a valid pen join.
-  It can be one of
-  @racket["round"], @racket['round], 
-  @racket["bevel"], @racket['bevel], 
-  @racket["miter"], or @racket['miter].
-}
-
-@section{Equality Testing of Images}
-
-Two images are @racket[equal?] if they draw exactly the same way at their current size
-(not necessarily at all sizes) and, if there are pinholes, the pinholes are
-in the same place.
-
-This can lead to some counter-intuitive results. For example, 
-two completely different shapes that are the same size and are
-drawn with the transparent color are equal:
-@image-examples[(equal? (circle 30 "solid" "transparent")
-                        (square 60 "solid" "transparent"))]
-See also @secref["nitty-gritty-alpha"].
-
-@section[#:tag "pinholes"]{Pinholes}
-
-A pinhole is an optional property of an image that identifies a point somewhere
-in the image. The pinhole can then be used to facilitate overlaying images by
-lining them up on the their pinholes. 
-
-When an image has a pinhole, the pinhole
-is drawn with crosshairs on the image.
-The crosshairs are drawn with two one-pixel wide black lines (one horizontal and one vertical)
-and two one-pixel wide white lines,
-where the black lines is drawn .5 pixels to the left and above the pinhole, and the
-white lines are drawn .5 pixels to the right and below the pinhole. 
-Accordingly, when the pixel is on an integral coordinate, then black and white lines all 
-take up a single pixel and in the center of their intersections is the actual pinholes.
-See @secref["nitty-gritty"] for more details about pixels.
-
-When images are @racket[overlay]'d, @racket[underlay]'d (or the variants of those functions),
-placed @racket[beside], or @racket[above] each other, 
-the pinhole of the resulting image is the pinhole of 
-the first image argument passed to the combining
-operation. When images are combined with @racket[place-image]
-(or the variants of @racket[place-image]), 
-then the scene argument's pinhole is preserved.
-
-@defproc[(center-pinhole [image image?]) image?]{
-  Creates a pinhole in @racket[image] at its center.
-  @image-examples[(center-pinhole (rectangle 40 20 "solid" "red"))
-                  (rotate 30 (center-pinhole (rectangle 40 20 "solid" "orange")))]
-}
-@defproc[(put-pinhole [x integer?] [y integer?] [image image?]) image?]{
-  Creates a pinhole in @racket[image] at the point (@racket[x],@racket[y]).
-  @image-examples[(put-pinhole 2 18 (rectangle 40 20 "solid" "forestgreen"))]
-}
-@defproc[(pinhole-x [image image?]) (or/c integer? #f)]{
-  Returns the x coordinate of @racket[image]'s pinhole.
-  @image-examples[(pinhole-x (center-pinhole (rectangle 10 10 "solid" "red")))]
-}
-@defproc[(pinhole-y [image image?]) (or/c integer? #f)]{
-  Returns the y coordinate of @racket[image]'s pinhole.
-  @image-examples[(pinhole-y (center-pinhole (rectangle 10 10 "solid" "red")))]
-}
-@defproc[(clear-pinhole [image image?]) image?]{
-  Removes a pinhole from @racket[image] (if the image has a pinhole).
-}
-
-@defproc[(overlay/pinhole [i1 image?] [i2 image?] [is image?] ...) image?]{
-  
-  Overlays all of the image arguments on their pinholes. If any of the
-  arguments do not have pinholes, then the center of the image is used instead.
-  
-  @image-examples[(overlay/pinhole
-                   (put-pinhole 25 10 (ellipse 100 50 "solid" "red"))
-                   (put-pinhole 75 40 (ellipse 100 50 "solid" "blue")))
-                  (let ([petal (put-pinhole 
-                                20 20
-                                (ellipse 100 40 "solid" "purple"))])
-                    (clear-pinhole
-                     (overlay/pinhole
-                      (circle 30 "solid" "yellow")
-                      (rotate (* 60 0) petal)
-                      (rotate (* 60 1) petal)
-                      (rotate (* 60 2) petal)
-                      (rotate (* 60 3) petal)
-                      (rotate (* 60 4) petal)
-                      (rotate (* 60 5) petal))))]
-}
-
-@defproc[(underlay/pinhole [i1 image?] [i2 image?] [is image?] ...) image?]{
-  
-  Underlays all of the image arguments on their pinholes. If any of the
-  arguments do not have pinholes, then the center of the image is used instead.
-  
-  @image-examples[(underlay/pinhole
-                   (put-pinhole 25 10 (ellipse 100 50 "solid" "red"))
-                   (put-pinhole 75 40 (ellipse 100 50 "solid" "blue")))
-                  (let* ([t (triangle 40 "solid" "orange")]
-                         [w (image-width t)]
-                         [h (image-height t)])
-                    (clear-pinhole
-                     (overlay/pinhole
-                      (put-pinhole (/ w 2) 0 t)
-                      (put-pinhole w h t)
-                      (put-pinhole 0 h t))))]
-}
-
-@;-----------------------------------------------------------------------------
-@section{Exporting Images to Disk}
-
-In order to use an image as an input to another program (e.g., Photoshop or 
-a web browser), it is necessary to represent it in a format that these programs
-can understand. 
-
-The @racket[save-image] function provides this functionality, 
-writing an image to disk using the @tt{PNG} format. Since this
-format represents an image using a set of pixel values, an image written to disk
-generally contains less information than the image that was written, and cannot be scaled
-or manipulated as cleanly (by any image program).
-
-The @racket[save-svg-image] function writes an @tt{SVG} file format
-representation of the file to the disk that, unlike @racket[save-image] produces
-an image that can still be scaled arbitrarily look as good as scaling the
-image directly via @racket[scale].
-
-@defproc[(save-image [image image?]
-                     [filename path-string?]
-                     [width 
-                      (and/c real? (not/c negative?))
-                      (image-width image)]
-                     [height 
-                      (and/c real? (not/c negative?))
-                      (image-height image)])
-         boolean?]{
- Writes an image to the path specified by @racket[filename], using the
- @tt{PNG} format.
- 
- The last two arguments are optional. If present, they determine the width
- and height of the save image file. If absent, the width and height of the image is used.
- 
- }
-
-@defproc[(save-svg-image [image image?]
-                         [filename path-string?]
-                         [width 
-                          (and/c real? (not/c negative?))
-                          (image-width image)]
-                         [height 
-                          (and/c real? (not/c negative?))
-                          (image-height image)])
-         void?]{
- Writes an image to the path specified by @racket[filename], using the
- @tt{SVG} format.
- 
- The last two arguments are optional. If present, they determine the width
- and height of the save image file. If absent, the width and height of the image is used.
- }
-
-@(close-eval img-eval)
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/img-eval.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/img-eval.rkt
deleted file mode 100644
index 4011fb3b3b..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/img-eval.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-(require scribble/eval)
-(provide make-img-eval
-         set-eval-handler-to-tweak-images)
-
-#|
-
-make-img-eval : -> (any/c . -> . any)
-  calls @racket[make-base-eval] to create
-  an evaluator, and then initializes it with
-  @racket[set-eval-handler-to-tweak-images].
-
-
-set-eval-handler-to-tweak-images : (any/c . -> . any) -> void?
-
-  loads @racketmodname[2htdp/image] and @racketmodname[lang/posn]
-  into the given evaluator and then sets its eval-handler to
-  increase the bounding box for 2htdp/image images by 1.
-  
-  It does this only for images that the result of evaluation
-  directly (not for example, when lists that contain images
-  are the result of evaluation).
-
-|#
-
-(define (make-img-eval)
-  (define img-eval (make-base-eval))
-  (set-eval-handler-to-tweak-images img-eval)
-  img-eval)
-
-(define (set-eval-handler-to-tweak-images img-eval)
-  (interaction-eval #:eval img-eval (require 2htdp/image))
-  (interaction-eval #:eval img-eval (require lang/posn))
-  
-  (img-eval '(define extra-margin (make-parameter 0)))
-  
-  (img-eval
-   `(let ([ce (current-eval)])
-      (define (adjust-image exp i)
-        (if (image? i)
-            (let ([em (extra-margin)])
-              (overlay/xy i 
-                          (- em) (- em)
-                          (rectangle 
-                           (+ (image-width i) 1 em em)
-                           (+ (image-height i) 1 em em)
-                           'solid
-                           (color 255 0 0 0))))
-            i))
-      (current-eval
-       (λ (exp)
-         (adjust-image exp (ce exp)))))))
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/info.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/info.rkt
deleted file mode 100644
index 757feacf3a..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define test-responsibles '(("image.scrbl" robby)
-                            ("image-util.rkt" robby)))
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/io.css b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/io.css
deleted file mode 100644
index 89735f0535..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/io.css
+++ /dev/null
@@ -1,10 +0,0 @@
-
-.FileBox {
-  width: 16em;
-  margin: 0px;
-  padding: 0px;
-  background-color: #eee;
-  border: 1px solid #ddd;
-  text-align: center;
-  vertical-align: middle;
-}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/io.tex b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/io.tex
deleted file mode 100644
index f69032f36c..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/io.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-
-\usepackage{framed}
-
-\newenvironment{FileBox}{\begin{minipage}{4in}\begin{framed}}{\end{framed}\end{minipage}}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/ligature.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/ligature.png
deleted file mode 100644
index bff797e1b9..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/ligature.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/planetcute.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/planetcute.scrbl
deleted file mode 100644
index ed84b07e3f..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/planetcute.scrbl
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang scribble/doc
-
-@(require "shared.rkt" 
-          "port.rkt"
-          scribble/manual
-          scribble/eval
-          2htdp/image
-          racket/runtime-path
-          (except-in racket/draw make-color make-pen)
-          racket/class
-          (for-syntax racket/base)
-          (for-label 2htdp/image
-                     2htdp/planetcute
-                     (only-in lang/htdp-beginner first list rest empty? define cond)))
-
-@; -----------------------------------------------------------------------------
-
-@title{Planet Cute Images}
-
-@defmodule[2htdp/planetcute]
-
-@(define pc-eval (make-base-eval))
-@(interaction-eval #:eval pc-eval (require 2htdp/image 2htdp/planetcute racket/list))
-
-The @racketmodname[2htdp/planetcute] library contains the 
-@link["http://www.lostgarden.com/2007/05/dancs-miraculously-flexible-game.html"]{Planet Cute} 
-art by Daniel Cook (Lostgarden.com).
-
-The images are designed to be overlaid with each other to build
-scenes for use in games. Here is an example image taken
-from the Planet Cute website.
-
-@racketblock+eval[#:eval 
-                  pc-eval
-                  (code:comment "stack : non-empty-list-of-images -> image")
-                  (code:comment "stacks 'imgs' on each other, separated by 40 pixels")
-                  (define (stack imgs)
-                    (cond
-                      [(empty? (rest imgs)) (first imgs)]
-                      [else (overlay/xy (first imgs)
-                                        0 40
-                                        (stack (rest imgs)))]))]
-@interaction[#:eval 
-             pc-eval
-             (beside/align
-              "bottom"
-              (stack (list wall-block-tall stone-block))
-              (stack (list character-cat-girl
-                           stone-block stone-block
-                           stone-block stone-block))
-              water-block
-              (stack (list grass-block dirt-block))
-              (stack (list grass-block dirt-block dirt-block)))]
-
-@(close-eval pc-eval)
-
-The Planet Cute images also include some shadows that can improve the
-look of your game; see the @secref["pc:Shadows"] section for an overview
-of how to use them.
-
-@(require (for-syntax 2htdp/private/planetcute-image-list))
-@(define-syntax (defthings stx)
-   (syntax-case stx ()
-     [(_ what whatever ...)
-      (identifier? #'what)
-      (let* ([sym (syntax-e #'what)]
-             [sec-title (symbol->string sym)]
-             [these-images (cdr (assoc sym images))])
-        #`(begin
-            @section[#:tag #,(format "pc:~a" sec-title) #,sec-title]
-            whatever ...
-            #,@(for/list ([img (in-list these-images)])
-                 (define req (string->symbol (format "2htdp/planetcute/~a" (name->filename img))))
-                 #`@defthing[#,img image?]{  @(bitmap #,req) })))]))
-
-@(begin
-   (define-runtime-path PlanetCuteShadow1.png "PlanetCuteShadow1.png")
-   (define-runtime-path PlanetCuteShadow2.png "PlanetCuteShadow2.png")
-   (define-runtime-path PlanetCuteShadow2b.png "PlanetCuteShadow2b.png")
-   (define-runtime-path PlanetCuteShadow3.png "PlanetCuteShadow3.png"))
-
-@defthings[Characters]{}
-@defthings[Blocks]{}
-@defthings[Items]{}
-@defthings[Ramps]{}
-@defthings[Buildings]{}
-@defthings[Shadows]{The shadow images are intended to be
-                    overlaid on the other blocks when they
-                    appear in certain configurations, as
-                    detailed here.
-                    
-                    @(read-bitmap PlanetCuteShadow1.png) 
-                    @(read-bitmap PlanetCuteShadow2.png)
-                    @(read-bitmap PlanetCuteShadow2b.png)
-                    @(read-bitmap PlanetCuteShadow3.png) }
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/port.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/port.rkt
deleted file mode 100644
index d6da930454..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/port.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scheme
-
-(require scribble/core)
-
-(define (port old new)
-  (make-table 
-   (make-style 'boxed '())
-   (list           
-    (list (make-paragraph plain "World Style") (make-paragraph plain "Universe Style"))
-    (list old new))))
-
-(provide port)
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/port.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/port.scrbl
deleted file mode 100644
index 4e06303821..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/port.scrbl
+++ /dev/null
@@ -1,366 +0,0 @@
-#lang scribble/doc
-
-@(require "shared.rkt" "port.rkt" scribble/manual
-          (for-label scheme
-                     (only-in 2htdp/universe on-tick on-draw)
-                     (prefix-in htdp: teachpack/htdp/world)
-                     (prefix-in htdp: htdp/image)
-                     (prefix-in 2htdp: teachpack/2htdp/universe)
-                     (prefix-in 2htdp: 2htdp/image)
-                     (only-in lang/htdp-beginner check-expect)))
-
-@; -----------------------------------------------------------------------------
-
-@title[#:tag "htdp-port"]{Porting World Programs to Universe}
-
-@author{Matthias Felleisen, Robby Findler}
-
-@; -----------------------------------------------------------------------------
-@section{The World is Not Enough}
-
-With the June 2009 release, we started deprecating the world teachpack; instead
- we recommended the use of the universe teachpack. With the January 2010 release,
- we are also introducing a new image teachpack and, in support of this second
- teachpack, we have separated out the image functionality from the
- functionality for world programs. 
-
-In this document, we explain how to port programs that assume the old world
- teachpack into this new setting, one step at a time. Most importantly,
- programs must now import @emph{two} teachpacks insteead of one: 
-@port[
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(require #,(racketmodname htdp/world))
-))
-@; ---------------------------------
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(require #,(racketmodname 2htdp/universe))
-(require #,(racketmodname htdp/image))
-))
-]
- The table shows the old style on the left and the new style on the
- right. If your programs imported teachpacks via the drscheme teachpack
- menu, we recommend that you use the @racket[require] form from now on; 
- alternatively, you use the drscheme menu @emph{twice} to import the 
- functions from two teachpacks. 
-
-In the next section, we first explain how to port world programs so that
- they use the universe teachpack and the @emph{old} image teachpack. In the
- section after that, we list suggestions for changing programs so that they
- no longer rely on the old image functionality but the new one. 
-
-In order to distinguish between the various pieces of functionality, we
- uniformly prefix old functionality with "htdp:" and new functionality with
- "2htdp:". There is no need to use these prefixes in your programs of
- course. 
-
-@; -----------------------------------------------------------------------------
-@section{Porting World Programs}
-
-Here is the first program from the documentation for the world teachpack:
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(require #,(racketmodname htdp/world))
-
-;; Number -> Scene 
-(define (create-UFO-scene height)
-  (htdp:place-image UFO 
-                    50 height
-		    (htdp:empty-scene 100 100)))
-
-;; Scene 
-(define UFO
-  (htdp:overlay
-    (htdp:circle 10 'solid 'red)
-    (htdp:rectangle 40 4 'solid 'red)))
-
-;; --- run program run 
-(htdp:big-bang 100 100 (/1 28) 0)
-(htdp:on-tick-event add1)
-(htdp:on-redraw create-UFO-scene)
-))
- This program defines a function for placing a @racket[UFO] into a 100 by
- 100 scene, where @racket[UFO] is a defined image. The world program itself
- consists of three lines: 
-@itemize[
-@item{the first one creates the 100 by 100 scene, specifies a rate of 28
- images per second, and @racket[0] as the initial world description;}
-@item{the second one says that for each clock tick, the world (a number) is
- increased by @racket[1]; and}
-@item{the last line tells drscheme to use @racket[create-UFO-scene] as the
- function that renders the current world as a scene.}
-]
-
-Let us now convert this program into the universe setting, step by
- step, staring with the @racket[require] specification, which is converted
- as above: 
-@port[
-@racketblock[(require #,(racketmodname htdp/world))]
-@; ---------------------------------
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(require #,(racketmodname 2htdp/universe))
-(require #,(racketmodname htdp/image))
-))
-]
-
-The function that renders the world as a scene remains the same: 
-@port[
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; Number -> Scene 
-(define (create-UFO-scene height)
-  (htdp:place-image
-    UFO 
-    50 height
-    (htdp:empty-scene 100 100)))
-))
-@; ---------------------------------
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; Number -> Scene 
-(define (create-UFO-scene height)
-  (htdp:place-image
-    UFO 
-    50 height
-    (htdp:empty-scene 100 100)))
-))
-]
-
-For the image constant we switch from symbols to strings: 
-@port[
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; Scene 
-(define UFO
-  (htdp:overlay
-    (htdp:circle 
-     10 'solid 'red)
-    (htdp:rectangle
-     40 4 'solid 'red)))
-))
-@; ---------------------------------
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; Scene 
-(define UFO
-  (htdp:overlay
-    (htdp:circle
-     10 "solid" "red")
-    (htdp:rectangle
-     40 4 "solid" "red")))
-))
-]
- Strictly speaking, this isn't necessary, but we intend to replace symbols
- with strings whenever possible because strings are more common than
- symbols. 
-
-The most important change concerns the lines that launch the world program: 
-@port[
-@racketblock[
-(htdp:big-bang 100 100 (/1 28) 0)
-(htdp:on-tick-event add1)
-(htdp:on-redraw create-UFO-scene)
-]
-@; ---------------------------------
-@racketblock[
-(2htdp:big-bang
-  0
-  (on-tick add1)
-  (on-draw create-UFO-scene))
-]
-]
- They are turned into a single expression that comes with as many clauses
- as there are lines in the old program. As you can see, the
- @racket[big-bang] expression from the universe teachpack no longer
- requires the specification of the size of the scene or the rate at which
- the clock ticks (though it is possible to supply the clock rate if the default
- is not satisfactory). 
- Furthermore, the names of the clauses are similar to
- the old names but shorter. 
-
-
-The other big change concerns key event handling and mouse event
- handling. The respective handlers no longer accept symbols and chars but
- strings only. Here is the first key event handler from the documentation
- of the world teachpack: 
-
-@port[
-@racketblock[
- (define (change w a-key-event)
-   (cond
-     [(key=? a-key-event 'left)
-      (world-go w -DELTA)]
-     [(key=? a-key-event 'right)
-      (world-go w +DELTA)]
-     [(char? a-key-event)
-      w]
-     [(key=? a-key-event 'up)
-      (world-go w -DELTA)]
-     [(key=? a-key-event 'down)
-      (world-go w +DELTA)]
-     [else
-      w]))]
-@; ---------------------------------
-@racketblock[
- (define (change w a-key-event)
-   (cond
-     [(key=? a-key-event "left")
-      (world-go w -DELTA)]
-     [(key=? a-key-event "right")
-      (world-go w +DELTA)]
-     [(= (string-length a-key-event) 1)
-      w]
-     [(key=? a-key-event "up")
-      (world-go w -DELTA)]
-     [(key=? a-key-event "down")
-      (world-go w +DELTA)]
-     [else
-      w]))
-]]
- Note how the @racket[char?] clause changed. Since all chars are now
- represented as strings containing one ``letter'', the program on the right
- just checks the length of the string. Otherwise, we simply change all
- symbols into strings. 
-
-If you ever recorded your programs' work via an animated gif, you can still
- do so. Instead of adding a fifth argument to @racket[big-bang], however,
- you will need to add a clause of the shape @racket[(record? x)]. 
-
-Finally, the universe teachpack implements a richer functionality than the
- world teachpack. 
-
-@; -----------------------------------------------------------------------------
-@section{Porting Image Programs}
-
-The universe library also comes with a new image library, @racketmodname[2htdp/image].
-Using the old image
-library still works fine with @racketmodname[2htdp/universe], but the
-new image library provides a number of improvements, including faster 
-image comparison (especially useful in @racket[check-expect] expressions),
-rotating images, scaling images, curves, a number of new polygon shapes,
-and more control over line drawing.
-
-To use the new image library in isloation:
-
-@port[
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(require #,(racketmodname htdp/image))
-))
-@; ---------------------------------
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(require #,(racketmodname 2htdp/image))
-))
-]
-
-and to use the new image library with the universe teachpack:
-
-@port[
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(require #,(racketmodname htdp/world))
-))
-@; ---------------------------------
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(require #,(racketmodname 2htdp/universe))
-(require #,(racketmodname 2htdp/image))
-))]
-  
-@bold{Overlay vs Underlay}
-
-The @racket[htdp:overlay] function places its first argument
-under its second (and subsequent) arguments and so in 
-@racketmodname[2htdp/image], we decided to call that
-function @racket[2htdp:underlay].
-
-@port[(racketblock
-       (htdp:overlay
-        (htdp:rectangle 
-         10 20 "solid" "red")
-        (htdp:rectangle
-         20 10 "solid" "blue")))
-      (racketblock
-       (2htdp:underlay
-        (2htdp:rectangle
-         10 20 "solid" "red")
-        (2htdp:rectangle
-         20 10 "solid" "blue")))]
-
-@bold{No more pinholes}
-
-The concept of pinholes from @racketmodname[htdp/image]
-has no correspondance in @racketmodname[2htdp/image] 
-(we do expect to bring back pinholes in @racketmodname[2htdp/image]
-eventually, but they will not be as pervasive as they are
-in @racket[htdp/image]).
-
-Instead of 
-a special position in the image that overlay operations
-are sensitive to, 
-@racketmodname[2htdp/image] has a family of overlay operations,
-that overlay images based on their centers or their edges.
-
-Since the default position of the pinhole is in the center
-for most images and the default for overlaying and underlaying
-images in @racket[2htdp/image] is based on the center, 
-simple examples (like the one above) behave the same
-in both libraries.
-
-But, consider this expression that overlays two images on
-their upper-left corners, written using both libraries.
-
-@port[@racketblock[(htdp:overlay
-                    (htdp:put-pinhole
-                     (htdp:rectangle 10 20 "solid" "red")
-                     0 0)
-                    (htdp:put-pinhole
-                     (htdp:rectangle 20 10 "solid" "blue")
-                     0 0))]
-      @racketblock[(2htdp:underlay/align
-                    "left"
-                    "top"
-                    (2htdp:rectangle
-                     10 20 "solid" "red")
-                    (2htdp:rectangle
-                     20 10 "solid" "blue"))]]
-
-In the @racketmodname[2htdp/image] version, the programmer
-uses @racket[2htdp:underlay/align] to specify where
-the images should be lined up, instead of using the pinhole.
-
-@bold{Outlines in different places}
-
-The outline style shapes are now shifted by one pixel for @racketmodname[2htdp/image]
-images as compared to @racketmodname[htdp/image].
-This means that these two rectangles draw the same sets of pixels.
-
-@port[@racketblock[(htdp:rectangle 
-                    11 11 "outline" "black")]
-      @racketblock[(2htdp:rectangle
-                    10 10 "outline" "black")]]
-
-See also @secref["nitty-gritty"].
-
-@bold{Star changed}
-
-The @racket[2htdp:star] function is a completely different
-function from @racket[htdp:star]. Both produce stars based, 
-on polygons, but @racket[2htdp:star] always produces a five-pointed
-star. See also @racket[2htdp:star-polygon] for more general star
-shapes.
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/shared.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/shared.rkt
deleted file mode 100644
index ee23a8049d..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/shared.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scheme/base
-
-(require "../../htdp/scribblings/shared.rkt")
-
-(provide teachpack beginner-require)
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/universe.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/universe.scrbl
deleted file mode 100644
index a21e663517..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/universe.scrbl
+++ /dev/null
@@ -1,1995 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt" scribble/eval
-          (for-label scheme
-                     (only-in lang/htdp-beginner check-expect)
-                     teachpack/2htdp/universe
-                     2htdp/image))
-@(require scribble/struct)
-
-@(define note-scene @margin-note*{See @secref{scene} for @racket[scene?].})
-
-@(define (table* . stuff)
-  ;; (list paragraph paragraph) *-> Table
-   (define (flow* x) (make-flow (list x)))
-   (make-blockquote #f
-     (list
-       (make-table (make-with-attributes 'boxed
-                     '((cellspacing . "6")))
-         ;list
-         (map (lambda (x) (map flow* x)) stuff)
-         #;(map flow* (map car stuff))
-         #;(map flow* (map cadr stuff))))))
-
-@(define WorldState @tech[#:tag-prefixes '("world")]{WorldState})
-@(define S-expression @tech[#:tag-prefixes '("universe")]{S-expression})
-
-@; -----------------------------------------------------------------------------
-
-@teachpack["universe"]{Worlds and the Universe}
-
-@author{Matthias Felleisen}
-
-@defmodule[#:require-form beginner-require 2htdp/universe #:use-sources (teachpack/2htdp/image)]
-
-@;{FIXME: the following paragraph uses `defterm' instead of `deftech',
-   because the words "world" and "universe" are used as datatypes, and
-   datatypes are currently linked as technical terms --- which is a hack.
-   Fix the paragraph when we have a better way to link datatype names.}
-
-The @tt{universe.rkt} teachpack implements and provides the functionality
- for creating interactive, graphical programs that consist of plain
- mathematical functions. We refer to such programs as @deftech{world}
- programs. In addition, world programs can also become a part of a
- @deftech{universe}, a collection of worlds that can exchange messages.
-
-The purpose of this documentation is to give experienced Racketeers and HtDP
- teachers a concise overview for using the library. The first part of the
- documentation focuses on @tech{world} programs. Section
- @secref["world-example"] presents an illustration of how to design such
- programs for a simple domain; it is suited for a novice who knows how to
- design conditional functions for enumerations, intervals, and unions. The
- second half of the documentation focuses on "universe" programs: how it is
- managed via a server, how @tech{world} programs register with the server,
- etc. The last two sections show how to design a simple universe of two
- communicating worlds.
-
-@emph{Note}: For a quick and educational introduction to just worlds, see
- @link["http://www.ccs.neu.edu/home/matthias/HtDP2e/prologue.html"]{How
- to Design Programs, Second Edition: Prologue}. As of August 2008, we also
- have a series of projects available as a small booklet on
- @link["http://world.cs.brown.edu/"]{How to Design Worlds}.
-
-@; -----------------------------------------------------------------------------
-@section[#:tag "scene"]{Background}
-
-The universe teachpack assumes working knowledge of the basic image
-manipulation operations, either @racketmodname[htdp/image] or
-@racketmodname[2htdp/image]. As far as this extended reference is
-concerned, the major difference between the two image teachpacks is
-the assumption that
-@nested[#:style 'inset]{
-  @racketmodname[htdp/image] programs render their state as @emph{scenes},
-  i.e., images that satisfy the @racket[scene?] predicate.
-}
-Recall that @racketmodname[htdp/image] defines a scene to be an image whose
-pinhole is at @math{(0,0)}. If your program uses the operations of
-@racketmodname[2htdp/image], all images are also scenes.
-
-While the operations of this teachpack work with both image teachpacks, we
-hope to eliminate @racketmodname[htdp/image] in the not-too-distant future.
-All example programs are already written using @racketmodname[2htdp/image]
-operations. We urge programmers to use @racketmodname[2htdp/image] when
-they design new ``world'' and ``universe'' programs and to rewrite their
-existing @racketmodname[htdp/image] programs to use
-@racketmodname[2htdp/image].
-
-@; -----------------------------------------------------------------------------
-@section[#:tag "simulations"]{Simple Simulations}
-
-The simplest kind of animated @tech{world} program is a time-based
- simulation, which is a series of images.  The programmer's task is to
- supply a function that creates an image for each natural number. Handing
- this function to the teachpack displays the simulation.
-
-@defproc[(animate [create-image (-> natural-number/c scene?)])
-         natural-number/c]{
-@note-scene
- opens a canvas and starts a clock that ticks 28 times per second.  Every
- time the clock ticks, DrRacket applies @racket[create-image] to the
- number of ticks passed since this function call. The results of these
- function calls are displayed in the canvas. The simulation runs until you
- click the @tt{Stop} button in DrRacket or close the window. At that
- point, @racket[animate] returns the number of ticks that have
- passed.
-}
-
-Example:
-@racketblock[
-(define (create-UFO-scene height)
-  (underlay/xy (rectangle 100 100 "solid" "white") 50 height UFO))
-
-(define UFO
-  (underlay/align "center"
-                  "center"
-                  (circle 10 "solid" "green")
-                  (rectangle 40 4 "solid" "green")))
-
-(animate create-UFO-scene)
-]
-
-@defproc[(run-simulation [create-image (-> natural-number/c scene?)])
-         true]{
-@note-scene
- @racket[animate] was originally called @racket[run-simulation], and this
- binding is retained for backwards compatibility}
-
-@defproc[(run-movie [r (and/c real? positive?)] [m [Listof image?]])
-         true]{
-
- @racket[run-movie] displays the list of images @racket[m], spending 
- @racket[r] seconds per image.}
-
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "interactive" #:tag-prefix "world"]{Interactions}
-
-The step from simulations to interactive programs is relatively
- small. Roughly speaking, a simulation designates one function,
- @racket[_create-image], as a handler for one kind of event: clock ticks.  In
- addition to clock ticks, @tech{world} programs can also deal with two
- other kinds of events: keyboard events and mouse events. A keyboard event
- is triggered when a computer user presses a key on the
- keyboard. Similarly, a mouse event is the  movement of the mouse, a click
- on a mouse button, the crossing of a boundary by a mouse movement, etc.
-
-Your program may deal with such events via the @emph{designation} of
- @emph{handler} functions.  Specifically, the teachpack provides for the
- installation of four event handlers: @racket[on-tick], @racket[on-key],
- @racket[on-mouse], and @racket[on-pad]. In addition, a @tech{world}
- program must specify a
- @racket[draw] function, which is called every time your program should
- visualize the current world, and a @racket[done] predicate, which is used
- to determine when the @tech{world} program should shut down.
-
-Each handler function consumes the current state of the @tech{world} and
- optionally a data representation of the event. It produces a new state of
- the @tech{world}.
-
-The following picture provides an intuitive overview of the workings of a
- @tech{world} program in the form of a state transition diagram.
-
-@image["nuworld.png"]
-
- The @racket[big-bang] form installs @racket[World_0] as the initial @tech{WorldState}.
- The handlers @racket[tock], @racket[react], and @racket[click] transform
- one world into another one; each time an event is handled, @racket[done] is
- used to check whether the world is final, in which case the program is
- shut down; and finally, @racket[draw] renders each world as an image, which
- is then displayed on an external canvas.
-
-@deftech{WorldState} : @racket[any/c]
-
-The design of a world program demands that you come up with a data
- definition of all possible states. We use @tech{WorldState} to refer to
- this collection of data, using a capital W to distinguish it from the
- program.  In principle, there are no constraints on this data
- definition though it mustn't be an instance of the @tech[#:tag-prefixes '("universe")]{Package}
- structure (see below). You can even keep it implicit, even if this
- violates the Design Recipe.
-
-@defform/subs[#:id big-bang
-              #:literals
-              (on-tick to-draw on-draw on-key on-pad on-release on-mouse on-receive stop-when
-              check-with register record? state name)
-              (big-bang state-expr clause ...)
-              ([clause
-                 (on-tick tick-expr)
-                 (on-tick tick-expr rate-expr)
-                 (on-tick tick-expr rate-expr limit-expr)
-                 (on-key key-expr)
-                 (on-pad pad-expr)
-                 (on-release release-expr)
-                 (on-mouse mouse-expr)
-                 (to-draw draw-expr)
-                 (to-draw draw-expr width-expr height-expr)
-                 (stop-when stop-expr) (stop-when stop-expr last-scene-expr)
-                 (check-with world?-expr)
-                 (record? r-expr)
-                 (state expr)
-                 (on-receive rec-expr)
-                 (register IP-expr)
-                 (port Port-expr)
-                 (name name-expr)
-                 ])]{
-
- starts a @tech{world} program in the initial state specified with
- @racket[state-expr], which must of course evaluate to an element of
- @tech{WorldState}.  Its behavior is specified via the handler functions
- designated in the optional @racket[spec] clauses, especially how the
- @tech{world} program deals with clock ticks, with key events, with mouse
- events, and eventually with messages from the universe; how it renders
- itself as an image; when the program must shut down; where to register the
- world with a universe; and whether to record the stream of events. A world
- specification may not contain more than one @racket[on-tick],
- @racket[to-draw], or @racket[register] clause. A @racket[big-bang]
- expression returns the last world when the stop condition is satisfied
- (see below) or when the programmer clicks on the @tt{Stop} button or
- closes the canvas.
-}
-
-The only mandatory clause of a @racket[big-bang] description is
-@racket[to-draw] (or @racket[on-draw] for backwards compatibility):
-@itemize[
-
-@item{
-
-@defform[(to-draw render-expr)
-         #:contracts
-         ([render-expr (-> (unsyntax @tech{WorldState}) scene?)])]{
-@note-scene
- tells DrRacket to call the function @racket[render-expr] whenever the
- canvas must be drawn. The external canvas is usually re-drawn after DrRacket has
- dealt with an event. Its size is determined by the size of the first
- generated image.}
-
-@defform/none[#:literals (to-draw)
-              (to-draw render-expr width-expr height-expr)
-              #:contracts
-              ([render-expr (-> (unsyntax @tech{WorldState}) scene?)]
-               [width-expr natural-number/c]
-               [height-expr natural-number/c])]{
-@note-scene
- tells DrRacket to use a @racket[width-expr] by @racket[height-expr]
- canvas instead of one determined by the first generated image.
-}
-
-For compatibility reasons, the teachpack also supports the keyword
-@defidform/inline[on-draw] in lieu of @racket[to-draw] but the latter is preferred
-now.
-}
-
-]
-All remaining clauses are optional. To introduce them, we need one more
-data definition: 
-
-@deftech{HandlerResult} : is a synonym for @tech{WorldState} until @secref[#:tag-prefixes '("universe")]{world2}
-
-@itemize[
-
-@item{
-@defform[(on-tick tick-expr)
-         #:contracts
-         ([tick-expr (-> (unsyntax @tech{WorldState}) (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))])]{
-
-tells DrRacket to call the @racket[tick-expr] function on the current
-world every time the clock ticks. The result of the call becomes the
-current world. The clock ticks at the rate of 28 times per second.}}
-
-@item{
-@defform/none[#:literals(on-tick)
-              (on-tick tick-expr rate-expr)
-              #:contracts
-              ([tick-expr (-> (unsyntax @tech{WorldState}) (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))]
-               [rate-expr (and/c real? positive?)])]{
-tells DrRacket to call the @racket[tick-expr] function on the current
-world every time the clock ticks. The result of the call becomes the
-current world. The clock ticks every @racket[rate-expr] seconds.}}
-
-@item{
-@defform/none[#:literals(on-tick)
-              (on-tick tick-expr rate-expr limit-expr)
-              #:contracts
-              ([tick-expr (-> (unsyntax @tech{WorldState}) (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))]
-               [rate-expr (and/c real? positive?)]
-               [limit-expr (and/c integer? positive?)])]{
-tells DrRacket to call the @racket[tick-expr] function on the current
-world every time the clock ticks. The result of the call becomes the
-current world. The clock ticks every @racket[rate-expr] seconds.
-The world ends when the clock has ticked more than @scheme[limit-expr] times.}}
-
-@item{A @tech{KeyEvent} represents key board events.
-
-@deftech{KeyEvent} : @racket[string?]
-
-For simplicity, we represent key events with strings, but not all strings
- are key events. The representation of key events comes in distinct
- classes. First, a single-character string is used to signal that the user
- has hit a "regular" key, such as 
-@itemize[
-
-@item{@racket["q"] stands for the q key;}
-@item{@racket["w"] stands for the w key;}
-@item{@racket["e"] stands for the e key;}
-@item{@racket["r"] stands for the r key; and so on.}
-]
- Some of these one-character strings look somewhat unusual:
-@itemize[
-
-@item{@racket[" "] stands for the space bar (@racket[#\space]);}
-@item{@racket["\r"] stands for the return and enter key (@racket[#\return]);}
-@item{@racket["\t"] stands for the tab key (@racket[#\tab]); and}
-@item{@racket["\b"] stands for the backspace key (@racket[#\backspace]).}
-]
- Here is "proof" that these strings really have length 1: 
-@interaction[
-(string-length "\t")
-]
- On rare occasions your programs may also encounter @racket["\u007F"],
- which is the string representing the delete key (aka rubout).
-
-Second, some keys have multiple-character string representations. Strings
- with more than one character denote arrow keys or other special events,
- starting with the four most important ones:
-@itemize[
-@item{@racket["left"] is the left arrow;}
-@item{@racket["right"] is the right arrow;}
-@item{@racket["up"] is the up arrow;}
-@item{@racket["down"] is the down arrow;}
-]
-Here are some others that you may encounter: 
-@itemize[
-@item{@racket["start"]}
-@item{@racket["cancel"]}
-@item{@racket["clear"]}
-@item{@racket["shift"]}
-@item{@racket["rshift"]}
-@item{@racket["control"]}
-@item{@racket["rcontrol"]}
-@item{@racket["menu"]}
-@item{@racket["pause"]}
-@item{@racket["capital"]}
-@item{@racket["prior"]}
-@item{@racket["next"]}
-@item{@racket["end"]}
-@item{@racket["home"]}
-@item{@racket["escape"]}
-@item{@racket["select"]}
-@item{@racket["print"]}
-@item{@racket["execute"]}
-@item{@racket["snapshot"]}
-@item{@racket["insert"]}
-@item{@racket["help"]}
- @;item{@racket["numpad0"],
- @;racket["numpad1"],
- @;racket["numpad2"],
- @;racket["numpad3"],
- @;racket["numpad4"],
- @;racket["numpad5"],
- @;racket["numpad6"],
- @;racket["numpad7"],
- @;racket["numpad8"],
- @;racket["numpad9"],
- @;racket["numpad-enter"],
- @;racket["multiply"],
- @;racket["add"],
- @;racket["separator"],
- @;racket["subtract"],
- @;racket["decimal"],
- @;racket["divide"]}
-@item{function keys: 
- @racket["f1"],
- @racket["f2"],
- @racket["f3"],
- @racket["f4"],
- @racket["f5"],
- @racket["f6"],
- @racket["f7"],
- @racket["f8"],
- @racket["f9"],
- @racket["f10"],
- @racket["f11"],
- @racket["f12"],
- @racket["f13"],
- @racket["f14"],
- @racket["f15"],
- @racket["f16"],
- @racket["f17"],
- @racket["f18"],
- @racket["f19"],
- @racket["f20"],
- @racket["f21"],
- @racket["f22"],
- @racket["f23"],
- @racket["f24"]}
-@item{@racket["numlock"]}
-@item{@racket["scroll"]}]
-
-The following four count as keyevents even though they are triggered by
-physical events on some form of mouse: 
-@itemize[
-@item{@racket["wheel-up"]}
-@item{@racket["wheel-down"]}
-@item{@racket["wheel-left"]}
-@item{@racket["wheel-right"]}
-]
- The preceding enumeration is neither complete in covering all the events
- that this library deals with nor does it specify which events the library
- ignores. If you wish to design a program that relies on specific keys on
- your keyboard, you should first write a small test program to find out
- whether the chosen keystrokes are caught by the library and, if so, which
- string representations are used for these events. 
-
-@defproc[(key-event? [x any]) boolean?]{
- determines whether @racket[x] is a @tech{KeyEvent}}
-
-@defproc[(key=? [x key-event?][y key-event?]) boolean?]{
- compares two @tech{KeyEvent} for equality}
-
-@defform[(on-key key-expr)
-         #:contracts
-          ([key-expr (-> (unsyntax @tech{WorldState}) key-event? (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))])]{
- tells DrRacket to call the @racket[key-expr] function on the current world and a
- @tech{KeyEvent} for every keystroke the user of the computer makes. The result
- of the call becomes the current world.
-
- Here is a typical key-event handler:
-@racketblock[
-(define (change w a-key)
-  (cond
-    [(key=? a-key "left")  (world-go w -DELTA)]
-    [(key=? a-key "right") (world-go w +DELTA)]
-    [(= (string-length a-key) 1) w] (code:comment "order-free checking")
-    [(key=? a-key "up")    (world-go w -DELTA)]
-    [(key=? a-key "down")  (world-go w +DELTA)]
-    [else w]))
-]
- }
- The omitted, auxiliary function @emph{world-go} is supposed to consume a
- world and a number and produces a world.
-
-@defform[(on-release release-expr)
-         #:contracts
-          ([release-expr (-> (unsyntax @tech{WorldState}) key-event? (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))])]{
- tells DrRacket to call the @racket[release-expr] function on the current world and a
- @tech{KeyEvent} for every release event on the keyboard. A release event
- occurs when a user presses the key and then releases it. The second argument
- indicates which key has been released. The result of the function call
- becomes the current world.
-}
-}
-
-@item{A @tech{PadEvent} is a @tech{KeyEvent} for a game-pad simulation via
-@racket[big-bang]. The presence of an @racket[on-pad] clause superimposes
-the game-pad image onto the current image, suitably scaled to its size:
-
-@image["gamepad.png"]
-
-@deftech{PadEvent} : @racket[key-event?]
-
-It is one of the following:
-@itemize[
-@item{@racket["left"] is the left arrow;}
-@item{@racket["right"] is the right arrow;}
-@item{@racket["up"] is the up arrow;}
-@item{@racket["down"] is the down arrow;}
-@item{@racket["w"] to be interpreted as up arrow;}
-@item{@racket["s"] to be interpreted as down arrow;}
-@item{@racket["a"] to be interpreted as left arrow;}
-@item{@racket["d"] to be interpreted as right arrow;}
-@item{@racket[" "] is the space bar;}
-@item{@racket["shift"] is the left shift key;}
-@item{@racket["rshift"] is the right shift key;}
-]
-
-@defproc[(pad-event? [x any]) boolean?]{
- determines whether @racket[x] is a @tech{PadEvent}}
-
-@defproc[(pad=? [x pad-event?][y pad-event?]) boolean?]{
- compares two @tech{PadEvent} for equality}
-
-@defform[(on-pad pad-expr)
-         #:contracts
-          ([pad-expr (-> (unsyntax @tech{WorldState}) pad-event? (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))])]{
- tells DrRacket to call the @racket[pad-expr] function on the current world and the
- @tech{KeyEvent} for every keystroke that is also a @tech{PadEvent}. The result
- of the call becomes the current world.
-
- Here is a typical @tech{PadEvent} handler:
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; ComplexNumber PadEvent -> ComplexNumber
-(define (handle-pad-events x k)
-  (case (string->symbol k)
-    [(up    w)      (- x 0+10i)]
-    [(down  s)      (+ x 0+10i)]
-    [(left  a)      (- x 10)]
-    [(right d)      (+ x 10)]
-    [(| |)          x0]
-    [(shift)        (conjugate x)]
-    [(rshift)       (stop-with (conjugate x))]))
-
-))
-@;%
-
- }
-
-When a @racket[big-bang] expression specifies an @racket[on-pad] clause,
-all @tech{PadEvent}s are sent to the @racket[on-pad] handler. All other
-key events are discarded, unless an @racket[on-key] and/or an
-@racket[on-release] clause are specified, in which case all remaining
-@tech{KeyEvent}s are sent there.
-
-To facilitate the definition of @racket[on-pad] handlers, the library
-provides the @racket[pad-handler] form.
-
-@defform/subs[#:id pad-handler
-              #:literals
-              (up down left right space shift)
-              (pad-handler clause ...)
-              ([clause
-                 (up up-expr)
-                 (down down-expr)
-                 (left left-expr)
-                 (right right-expr)
-                 (space space-expr)
-                 (shift shift-expr)])]{
- Creates a function that deals with @tech{PadEvent}s. Each (optional) clause
- contributes one function that consumes a @tech{World} and produces a
- world. The name of the clause determines for which kind of @tech{PadEvent}
- the function is called.
-
- Using the form is entirely optional and not required to use
- @racket[on-pad]. Indeed, @racket[pad-handler] could be used to define a
- plain @tech{KeyEvent} handler---if we could guarantee that players never
- hit keys other than @tech{PadEvent} keys.
-}
-
-All clauses in a @racket[pad-handler] form are optional:
-@itemize[
-
-@item{
-@defform[(up up-expr)
-         #:contracts
-         ([tick-expr (-> (unsyntax @tech{WorldState}) (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))])]{
- Creates a handler for @racket["up"] and @racket["w"] events.}
-}
-
-@item{
-@defform[(down down-expr)
-         #:contracts
-         ([tick-expr (-> (unsyntax @tech{WorldState}) (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))])]{
- Creates a handler for @racket["down"] and @racket["s"] events.}
-}
-
-@item{
-@defform[(left left-expr)
-         #:contracts
-         ([tick-expr (-> (unsyntax @tech{WorldState}) (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))])]{
- Creates a handler for @racket["left"] and @racket["a"] events.}
-}
-
-@item{
-@defform[(right right-expr)
-         #:contracts
-         ([tick-expr (-> (unsyntax @tech{WorldState}) (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))])]{
- Creates a handler for @racket["right"] and @racket["d"] events.}
-}
-
-@item{
-@defform[(space space-expr)
-         #:contracts
-         ([tick-expr (-> (unsyntax @tech{WorldState}) (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))])]{
- Creates a handler for space-bar events (@racket[" "]).}
-}
-
-@item{
-@defform[(shift shift-expr)
-         #:contracts
-         ([tick-expr (-> (unsyntax @tech{WorldState}) (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))])]{
- Creates a handler for @racket["shift"] and @racket["rshift"] events.}
-}
-
-]
- If a clause is omitted, @racket[pad-handler] installs a default function
- that maps the existing world to itself.
-
- Here is a @tech{PadEvent} handler defined with @racket[pad-handler]:
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; ComplexNumber -> ComplexNumber
-(define (i-sub1 x) (- x 0+1i))
-
-;; ComplexNumber -> ComplexNumber
-(define (i-add1 x) (+ x 0+1i))
-
-;; ComplexNumber -> ComplexNumber
-;; deal with all @tech{PadEvent}s
-(define handler
-  (pad-handler (left sub1) (right add1)
-               (up i-sub1) (down i-add1)
-               (shift (lambda (w) 0))
-               (space stop-with)))
-
-;; some tests:
-(check-expect (handler 9 "left") 8)
-(check-expect (handler 8 "up")   8-i)
-))
-@;%
-}
-
-@item{ A @tech{MouseEvent} represents mouse events, e.g., mouse movements
- or mouse clicks, by the computer's user.
-
-@deftech{MouseEvent} : @racket[(one-of/c "button-down" "button-up" "drag" "move" "enter" "leave")]
-
-All @tech{MouseEvent}s are represented via strings:
-@itemize[
-
-@item{@racket["button-down"]
- signals that the computer user has pushed a mouse button down;}
-@item{@racket["button-up"]
- signals that the computer user has let go of a mouse button;}
-@item{@racket["drag"]
- signals that the computer user is dragging the mouse. A dragging event
- occurs when the mouse moves while a mouse button is pressed.}
-@item{@racket["move"]
- signals that the computer user has moved the mouse;}
-@item{@racket["enter"]
- signals that the computer user has moved the mouse into the canvas area; and}
-@item{@racket["leave"]
- signals that the computer user has moved the mouse out of the canvas area.}
-]
-
-@defproc[(mouse-event? [x any]) boolean?]{
- determines whether @racket[x] is a @tech{MouseEvent}}
-
-@defproc[(mouse=? [x mouse-event?][y mouse-event?]) boolean?]{
- compares two @tech{MouseEvent}s for equality}
-
-@defform[(on-mouse mouse-expr)
-         #:contracts
-         ([mouse-expr
-           (-> (unsyntax @tech{WorldState})
-               integer? integer? (unsyntax @tech{MouseEvent})
-               (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult}))])]{
- tells DrRacket to call @racket[mouse-expr] on the current world, the current
- @racket[x] and @racket[y] coordinates of the mouse, and a
- @tech{MouseEvent} for every (noticeable) action of the mouse by the
- computer user. The result of the call becomes the current world.
-
- For @racket["leave"] and @racket["enter"] events, the coordinates of the
- mouse click may be outside of the (implicit) rectangle. That is, the
- coordinates may be negative or larger than the (implicitly) specified
- width and height.
-
- @bold{Note 1}: the operating system doesn't really notice every single movement
- of the mouse (across the mouse pad). Instead it samples the movements and
- signals most of them.}
-
- @bold{Note 2}: while mouse events are usually reported in the expected
- manner, the operating system doesn't necessarily report them in the
- expected order. For example, the Windows operating system insists on
- signaling a @racket["move"] event immediately after a @racket["button-up"]
- event is discovered.  Programmers must design the @racket[on-mouse]
- handler to handle any possible mouse event at any moment.  }
-
-@item{
-
-@defform[(stop-when last-world?)
-         #:contracts
-         ([last-world? (-> (unsyntax @tech{WorldState}) boolean?)])]{
- tells DrRacket to call the @racket[last-world?] function whenever the canvas is
- drawn. If this call produces @racket[true], the world program is shut
- down. Specifically, the  clock is stopped; no more
- tick events, @tech{KeyEvent}s, or @tech{MouseEvent}s are forwarded to
- the respective handlers. The @racket[big-bang] expression returns this
- last world.
-}
-
-@defform/none[#:literals (stop-when)
-         (stop-when last-world? last-picture)
-         #:contracts
-         ([last-world? (-> (unsyntax @tech{WorldState}) boolean?)]
-          [last-picture (-> (unsyntax @tech{WorldState}) scene?)])]{
-@note-scene
- tells DrRacket to call the @racket[last-world?] function whenever the canvas is
- drawn. If this call produces @racket[true], the world program is shut
- down after displaying the world one last time, this time using the image
- rendered with @racket[last-picture]. Specifically, the  clock is stopped; no more
- tick events, @tech{KeyEvent}s, or @tech{MouseEvent}s are forwarded to
- the respective handlers. The @racket[big-bang] expression returns this
- last world.
-}
-}
-
-@item{
-
-@defstruct*[stop-with ([w (unsyntax @tech[#:tag-prefixes '("world")]{HandlerResult})])]{signals to
-DrRacket that the world program should shut down. That is, any
-handler may return @racket[(stop-with w)] provided @racket[w] is a
-@tech[#:tag-prefixes '("world")]{HandlerResult}. If it does, the state of the world becomes @racket[w]
-and @racket[big-bang] will close down all event handling.}
-
-}
-
-@item{
-
-@defform[#:literals (check-with)
-         (check-with world-expr?)
-         #:contracts
-         ([world-expr? (-> Any boolean?)])]{
- tells DrRacket to call the @racket[world-expr?] function on the result of
- every world handler call. If this call produces @racket[true], the result
- is considered a world; otherwise the world program signals an error.
-}}
-
-@item{
-
-@defform[#:literals (record?)
-         (record? r-expr)
-         #:contracts
-         ([r-expr any/c])]{
- tells DrRacket to enable a visual replay of the interaction,
- unless @racket[#f].
- The replay action generates one png image per image and
- an animated gif for the entire sequence in the directory of the user's
- choice.  If @racket[r-expr] evaluates to the name of an existing
- directory/folder (in the local directory/folder), the directory is used to
- deposit the images.
-}}
-
-@item{
-
-@defform[#:literals (state) (state expr)]{
- if not @racket[#f], DrRacket opens a separate window in which the current
- state is rendered each time it is updated. This is useful for beginners
- who wish to see how their world evolves---without having to design a
- rendering function---plus for the debugging of world programs.
-}}
-
-@item{
-@defform[(name name-expr)
-         #:contracts
-         ([name-expr (or/c symbol? string?)])]{
- provide a name (@racket[namer-expr]) to this world, which is used as the
- title of the canvas.}
-}
-
-]
-
-The following example shows that @racket[(run-simulation create-UFO-scene)] is
-a short-hand for three lines of code:
-
-@(begin
-#reader scribble/comment-reader
-@racketblock[
-(define (create-UFO-scene height)
-  (underlay/xy (rectangle 100 100 "solid" "white") 50 height UFO))
-
-(define UFO
-  (underlay/align "center"
-                  "center"
-                  (circle 10 "solid" "green")
-                  (rectangle 40 4 "solid" "green")))
-
-;; (run-simulation create-UFO-scene) is short for:
-(big-bang 0
-          (on-tick add1)
-          (to-draw create-UFO-scene))
-])
-
-Exercise: Add a condition for stopping the flight of the UFO when it
-reaches the bottom.
-
-
-@; -----------------------------------------------------------------------------
-@section[#:tag "world-example"]{A First Sample World}
-
-This section uses a simple example to explain the design of worlds. The
- first subsection introduces the sample domain, a door that closes
- automatically. The second subsection is about the design of @tech{world}
- programs in general, the remaining subsections implement a simulation of
- the door.
-
-@subsection{Understanding a Door}
-
-Say we wish to design a @tech{world} program that simulates the working of
- a door with an automatic door closer. If this kind of door is locked, you
- can unlock it with a key. While this doesn't open the door per se, it is
- now possible to do so. That is, an unlocked door is closed and pushing at
- the door opens it. Once you have passed through the door and you let go,
- the automatic door closer takes over and closes the door again. When a
- door is closed, you can lock it again.
-
-Here is a diagram that translates our words into a graphical
- representation:
-
-@image["door-real.png"]
-
-Like the picture of the general workings of a @tech{world} program, this
- diagram displays a so-called ``state machine.'' The three circled words are
- the states that our informal description of the door identified: locked,
- closed (and unlocked), and open. The arrows specify how the door can go
- from one state into another. For example, when the door is open, the
- automatic door closer shuts the door as time passes. This transition is
- indicated by the arrow labeled ``time.'' The other arrows represent
- transitions in a similar manner:
-
-@itemize[
-
-@item{``push'' means a person pushes the door open (and let's go);}
-
-@item{``lock'' refers to the act of inserting a key into the lock and turning
-it to the locked position; and}
-
-@item{``unlock'' is the opposite of ``lock.''}
-
-]
-
-@; -----------------------------------------------------------------------------
-@subsection{Hints on Designing Worlds}
-
-Simulating any dynamic behavior via a @tech{world} program demands two
- different activities. First, we must tease out those portions of our
- domain that change over time or in reaction to actions, and we must
- develop a data representation for this information.  This is what we call
- @|WorldState|. Keep in
- mind that a good data definition makes it easy for readers to map data to
- information in the real world and vice versa. For all others aspects of
- the world, we use global constants, including graphical or visual
- constants that are used in conjunction with the rendering operations.
-
-Second, we must translate the actions in our domain---the arrows in the
- above diagram---into interactions with the computer that the universe
- teachpack can deal with. Once we have decided to use the passing of time
- for one aspect, key presses for another, and mouse movements for a third,
- we must develop functions that map the current state of the
- world---represented as data from @|WorldState|---into the next state of the
- world. Put differently, we have just created a wish list with three
- handler functions that have the following general contract and purpose
- statements:
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; tick : WorldState -> HandlerResult
-;; deal with the passing of time
-(define (tick w) ...)
-
-;; click : WorldState @emph{Number} @emph{Number} @tech{MouseEvent} -> @tech[#:tag-prefixes '("world")]{HandlerResult}
-;; deal with a mouse click at @emph{(x,y)} of kind @emph{me}
-;; in the current world @emph{w}
-(define (click w x y me) ...)
-
-;; control : WorldState @tech{KeyEvent} -> @tech[#:tag-prefixes '("world")]{HandlerResult}
-;; deal with a key event @emph{ke}
-;; in the current world @emph{w}
-(define (control w ke) ...)
-))
-
-That is, the contracts of the various handler designations dictate what the
- contracts of our functions are, once we have defined how to represent the
- domain with data in our chosen language.
-
-A typical program does not use all three of these functions. Furthermore,
- the design of these functions provides only the top-level, initial design
- goal. It often demands the design of many auxiliary functions. The
- collection of all these functions is your @tech{world} program.
-
-@centerline{An extended example is available in
- @link["http://www.ccs.neu.edu/home/matthias/HtDP2e/"]{How to Design Programs/2e}.}
-
-@; -----------------------------------------------------------------------------
-@section[#:tag "world2" #:tag-prefix "universe"]{The World is not Enough}
-
-The library facilities covered so far are about designing individual
- programs with interactive graphical user interfaces (simulations,
- animations, games, etc.). In this section, we introduce capabilities for
- designing a distributed program, which is really a number of programs that
- coordinate their actions in some fashion. Each of the individual programs
- may run on any computer in the world (as in our planet and the spacecrafts
- that we sent out), as long as it is on the internet and as long as the
- computer allows the program to send and receive messages (via TCP). We
- call this arrangement a @tech{universe} and the program that coordinates
- it all a @emph{universe server} or just @tech{server}.
-
-This section explains what messages are, how to send them from a
- @tech{world} program, how to receive them, and how to connect a
- @tech{world} program to a @tech{universe}.
-
-@; -----------------------------------------------------------------------------
-
-@subsection{Messages}
-
-After a world program has become a part of a universe, it may send messages
- and receive them. In terms of data, a message is just an
- @tech{S-expression}.
-
-@deftech{S-expression} An S-expression is roughly a nested list of basic
-data; to be precise, an S-expression is one of:
-
-@itemize[
- @item{a string,}
- @item{a symbol,}
- @item{a number,}
- @item{a boolean,}
- @item{a char, or}
- @item{a list of S-expressions, or}
- @item{a prefab struct of S-expressions.}
-]
-Note the @racket[list] clause includes @racket[empty] of course.
-
-@defproc[(sexp? [x any/c]) boolean?]{
- determines whether @racket[x] is an @tech{S-expression}.}
-
-@subsection{Sending Messages}
-
-Each world-producing callback in a world program---those for handling clock
- tick events, keyboard events, and mouse events---may produce a
- @tech{Package} in addition to just a @|WorldState|:
-
-@deftech{HandlerResult} is one of the following:
-@itemize[
-@item{@|WorldState|}
-@item{@tech{Package}}
-]
- where @deftech{Package} represents a pair consisting of a @|WorldState|
- and a message from a @tech{world} program to the @tech{server}.  Because
- programs send messages via @tech{Package}, the teachpack does not
- provide the selectors for the structure, only the constructor and a
- predicate.
-
-@defproc[(package? [x any/c]) boolean?]{
- determine whether @racket[x] is a @tech{Package}.}
-
-@defproc[(make-package [w any/c][m sexp?]) package?]{
- create a @tech{Package} from a @|WorldState| and an @tech{S-expression}.}
-
-Recall that event handlers return a @tech[#:tag-prefixes'("universe")]{HandlerResult},
- and we have just refined this data definition. Hence, each handler may return either a
- @|WorldState| or a @tech{Package}.  If an event handler produces a @tech{Package},
- the content of the world field becomes the next world and the message field specifies
- what the world sends to the universe. This distinction also explains why the data
- definition for @|WorldState| may not include a @tech{Package}.
-
-@subsection{Connecting with the Universe}
-
-Messages are sent to the universe program, which runs on some computer in
- the world. The next section is about constructs for creating such a universe
- server. For now, we just need to know that it exists and that it is the recipient
- of messages.
-
-@deftech{IP} @racket[string?]
-
-Before a world program can send messages, it must register with the
- server. Registration must specify the internet address of the computer on which
- the server runs, also known as an @tech{IP} address or a host.  Here a
- @tech{IP} address is a string of the right shape, e.g., @racket["192.168.1.1"]
- or @racket["www.google.com"].
-
-@defthing[LOCALHOST string?]{the @tech{IP} of your computer. Use it while you
- are developing a distributed program, especially while you are
- investigating whether the participating world programs collaborate in an
- appropriate manner. This is called @emph{integration testing} and differs
- from unit testing quite a bit.}
-
-A @racket[big-bang] description of a world program that wishes to communicate
-with other programs must contain a @racket[register] clause of one of the
-following shapes:
-
-@itemize[
-
-@item{
-@defform[(register ip-expr) #:contracts ([ip-expr string?])]{
- connect this world to a universe server at the specified @racket[ip-expr]
- address and set up capabilities for sending and receiving messages.
- If the world description includes a name specification of the form
- @racket[(name SomeString)] or @racket[(name SomeSymbol)], the name of the
- world is sent along to the server.
-}}
-
-@item{
-@defform[(port port-expr) #:contracts ([port-expr natural-number/c])]{
- specifies port on which a world wishes to receive and send messages. A
- port number is an integer between @racket[0] and @racket[65536].
-}}
-]
-
-When a world program registers with a universe program and the universe program
-stops working, the world program stops working, too.
-
-@subsection{Receiving Messages}
-
-Finally, the receipt of a message from the server is an event, just like
- tick events, keyboard events, and mouse events. Dealing with the receipt of a
- message works exactly like dealing with any other event. DrRacket
- applies the event handler that the world program specifies; if there is no
- clause, the message is discarded.
-
-The @racket[on-receive] clause of a @racket[big-bang] specifies the event handler
- for message receipts.
-
-@defform[(on-receive receive-expr)
-         #:contracts
-         ([receive-expr (-> (unsyntax @|WorldState|) sexp? (unsyntax @tech[#:tag-prefixes '("universe")]{HandlerResult}))])]{
- tells DrRacket to call @racket[receive-expr] for every message receipt, on the current
- @|WorldState| and the received message. The result of the call becomes the current
- @|WorldState|.
-
- Because @racket[receive-expr] is (or evaluates to) a world-transforming
- function, it too can produce a @tech{Package} instead of just a
- @|WorldState|. If the result is a @tech{Package}, its message content is
- sent to the @tech{server}.}
-
-The diagram below summarizes the extensions of this section in graphical form.
-
-@image["universe.png"]
-
-A registered world program may send a message to the universe server
- at any time by returning a @tech{Package} from an event handler. The
- message is transmitted to the server, which may forward it to some
- other world program as given or in some massaged form. The arrival of a
- message is just another event that a world program must deal with. Like
- all other event handlers @emph{receive} accepts a @|WorldState| and some
- auxiliary arguments (a message in this case) and produces a
- @|WorldState| or a @tech{Package}.
-
-When messages are sent from any of the worlds to the universe or vice versa,
- there is no need for the sender and receiver to synchronize. Indeed, a sender
- may dispatch as many messages as needed without regard to whether the
- receiver has processed them yet. The messages simply wait in queue until
- the receiving @tech{server} or @tech{world} program takes care of them.
-
-@; -----------------------------------------------------------------------------
-@section[#:tag "universe-server"]{The Universe Server}
-
-A @deftech{server} is the central control program of a @tech{universe} and
- deals with receiving and sending of messages between the world
- programs that participate in the @tech{universe}. Like a @tech{world}
- program, a server is a program that reacts to events, though to different
- events than @tech{world}s. The two primary kinds of events are the
- appearance of a new @tech{world} program in the @tech{universe}
- and the receipt of a message from a @tech{world} program.
-
-The teachpack provides a mechanism for designating event handlers for
- servers that is quite similar to the mechanism for describing @tech{world}
- programs. Depending on the designated event handlers, the server takes on
- distinct roles:
-
-@itemize[
-
-@item{A server may be a ``pass through'' channel between two worlds, in which case
- it has no other function than to communicate whatever message it receives
- from one world to the other, without any interference.}
-
-@item{A server may enforce a ``back and forth'' protocol, i.e., it may force two
- (or more) worlds to engage in a civilized tit-for-tat exchange. Each
- world is given a chance to send a message and must then wait
- to get a reply before it sends anything again.}
-
-@item{A server may play the role of a special-purpose arbiter, e.g., the referee
- or administrator of a game. It may check that each world ``plays'' by the rules,
- and it administrates the resources of the game.}
-
-]
-
-As a matter of fact, a pass-through @tech{server} can become basically
-invisible, making it appear as if all communication goes from peer
-@tech{world} to peer in a @tech{universe}.
-
-This section first introduces some basic forms of data that the
- @tech{server} uses to represent @tech{world}s and other matters. Second,
- it explains how to describe a server program.
-
-@; -----------------------------------------------------------------------------
-@subsection{Worlds and Messages}
-
-Understanding the server's event handling functions demands several data
- representations: that of (a connection to) a @tech{world} program and that
- of a response of a handler to an event.
-
-@itemize[
-
-@item{The @tech{server} and its event handlers must agree on a
- data representation of the @tech{world}s that participate in the
- universe.
-
-@defproc[(iworld? [x any/c]) boolean?]{
- determines whether @racket[x] is an @emph{iworld}. Because the universe server
- represents worlds via structures that collect essential information about
- the connections, the teachpack does not export any constructor or selector
- functions on worlds.}
-
-@defproc[(iworld=? [u iworld?][v iworld?]) boolean?]{
- compares two @emph{iworld}s for equality.}
-
-@defproc[(iworld-name [w iworld?]) string?]{
- extracts the name from a @emph{iworld} structure.}
-
-@defthing[iworld1 iworld?]{an @emph{iworld} for testing your programs}
-@defthing[iworld2 iworld?]{another iworld for testing your programs}
-@defthing[iworld3 iworld?]{and a third one}
-
-The three sample iworlds are provided so that you can test your functions
-for universe programs. For example:
-
-@racketblock[
-(check-expect (iworld=? iworld1 iworld2) false)
-(check-expect (iworld=? iworld2 iworld2) true)
-]
-}
-
-@item{Each event handler produces a state of the universe or a @emph{bundle}, which is a structure
- that contains the @tech{server}'s state, a list of mails to other worlds,
- and the list of @emph{iworld}s that are to be disconnected.
-
-@defproc[(bundle? [x any/c]) boolean?]{
- determines whether @racket[x] is a @emph{bundle}.}
-
-@defproc[(make-bundle [state any/c] [mails (listof mail?)] [low (listof iworld?)]) bundle?]{
- creates a @emph{bundle} from a piece of data that
- represents a server state, a list of mails, and a list of iworlds.}
-
-If disconnecting from these worlds results in an empty list of
-participants, the universe server is restarted in the initial state.
-
-A @emph{mail} represents a message from an event handler to a world. The
-teachpack provides only a predicate and a constructor for these structures:
-
-@defproc[(mail? [x any/c]) boolean?]{
- determines whether @racket[x] is a @emph{mail}.}
-
-@defproc[(make-mail [to iworld?] [content sexp?]) mail?]{
- creates a @emph{mail} from a @emph{iworld} and an @|S-expression|.}
-}
-]
-
-@; -----------------------------------------------------------------------------
-@subsection{Universe Descriptions}
-
-A @tech{server} keeps track of information about the @tech{universe} that
- it manages. One kind of tracked information is obviously the collection of
- participating world programs, but in general the kind of information that
- a server tracks and how the information is represented depends on the
- situation and the programmer, just as with @tech{world} programs.
-
-@deftech{UniverseState} : @racket[any/c] 
-
-The design of a universe server demands that you come up with a data
-definition for all possible server states. For running
-@tech{universe}s, the teachpack demands that you come up with a data
-definition for (your state of the) @tech{server}.  Any piece of data can
-represent the state. We just assume that you introduce a data definition
-for the possible states and that your event handlers are designed
-according to the design recipe for this data definition.
-
-The @tech{server} itself is created with a description that includes the
- first state and a number of clauses that specify functions for dealing
- with @tech{universe} events.
-
-@defform/subs[#:id universe
-              #:literals
-              (on-new on-msg on-tick on-disconnect to-string check-with port state)
-              (universe state-expr clause ...)
-              ([clause
-                 (on-new new-expr)
-                 (on-msg msg-expr)
-                 (on-tick tick-expr)
-                 (on-tick tick-expr rate-expr)
-                 (on-tick tick-expr rate-expr limit-expr)
-                 (on-disconnect dis-expr)
-                 (state expr)
-                 (to-string render-expr)
-		 (port port-expr)
-                 (check-with universe?-expr)
-                 ])]{
-
-creates a server with a given state, @racket[state-expr]. The
-behavior is specified via handler functions through mandatory and optional
-@emph{clause}s. These functions govern how the server deals with the
-registration of new worlds, how it disconnects worlds, how it sends
-messages from one world to the rest of the registered worlds, and how it
-renders its current state as a string.}
-
-Evaluating a @racket[universe] expression starts a server. Visually it opens
- a console window on which you can see that worlds join, which messages are
- received from which world, and which messages are sent to which world. For
- convenience, the console also has two buttons: one for shutting down a
- universe and another one for re-starting it. The latter functionality is
- especially useful during the integration of the various pieces of a
- distributed program.
-
-The mandatory clauses of a @racket[universe] server description are
-@racket[on-new] and @racket[on-msg]:
-
-@itemize[
-
-@item{
- @defform[(on-new new-expr)
-          #:contracts
-          ([new-expr (-> (unsyntax @tech{UniverseState}) iworld? (or/c (unsyntax @tech{UniverseState}) bundle?))])]{
- tells DrRacket to call the function @racket[new-expr] every time another world joins the
- universe. The event handler is called with the current state and the
- joining iworld, which isn't on the list yet. In particular, the handler may
- reject a @tech{world} program from participating in a @tech{universe},
- by simply returning the given state or by immediately including the new world in the third field of the resulting @racket[bundle] structure.
-
-@history[
- #:changed 
- "1.1" 
- "allow universe handlers to return a plain universe state"]
-
-}}
-
-@item{
- @defform[(on-msg msg-expr)
-          #:contracts
-          ([msg-expr (-> (unsyntax @tech{UniverseState}) iworld? sexp? (or/c (unsyntax @tech{UniverseState}) bundle?))])]{
- tells DrRacket to apply @racket[msg-expr] to the current state of the
- universe, the world
- @racket[w] that sent the message, and the message itself.
-
-@history[
- #:changed 
- "1.1" 
- "allow universe handlers to return a plain universe state"]
-
-}
-
-}]
- All proper event handlers produce a state of the universe or a
- @emph{bundle}.  The state of the universe is safe-guarded by the server until the next event, and the mails
- are broadcast as specified.  The list of iworlds in the third field of the
- bundle is removed from the list of participants from which to expect
- messages.
-
-The following picture provides a graphical overview of the server's workings.
-
-@; -----------------------------------------------------------------------------
-@;; THE PICTURE IS WRONG
-@; -----------------------------------------------------------------------------
-
-@image["server.png"]
-
-In addition to the mandatory handlers, a program may wish to add some
-optional handlers:
-
-@itemize[
-
-@item{
-@defform/none[#:literals (on-tick)
-              (on-tick tick-expr)
-              #:contracts
-              ([tick-expr (-> (unsyntax @tech{UniverseState}) (or/c (unsyntax @tech{UniverseState}) bundle?))])]{
- tells DrRacket to apply @racket[tick-expr] to the current state of the
- universe.
-
-@history[
- #:changed 
- "1.1" 
- "allow universe handlers to return a plain universe state"]
-}
-
-@defform/none[#:literals (on-tick)
-              (on-tick tick-expr rate-expr)
-              #:contracts
-              ([tick-expr (-> (unsyntax @tech{UniverseState}) (or/c (unsyntax @tech{UniverseState}) bundle?))]
-               [rate-expr (and/c real? positive?)])]{
- tells DrRacket to apply @racket[tick-expr] as above; the clock ticks
- every  @racket[rate-expr] seconds.
-
-@history[
- #:changed 
- "1.1" 
- "allow universe handlers to return a plain universe state"]
-
-}
-
-@defform/none[#:literals (on-tick)
-              (on-tick tick-expr rate-expr)
-              #:contracts
-              ([tick-expr (-> (unsyntax @tech{UniverseState}) (or/c (unsyntax @tech{UniverseState}) bundle?))]
-               [rate-expr (and/c real? positive?)]
-               [limit-expr (and/c integer? positive?)])]{
- tells DrRacket to apply @racket[tick-expr] as above; the clock ticks
- every  @racket[rate-expr] seconds. The universe stops when the clock has
- ticked more than @scheme[limit-expr] times.
-
-@history[
- #:changed 
- "1.1" 
- "allow universe handlers to return a plain universe state"]
-}
-}
-
-@item{
- @defform[#:literals (on-disconnect)
-	  (on-disconnect dis-expr)
-          #:contracts
-          ([dis-expr (-> (unsyntax @tech{UniverseState}) iworld? (or/c (unsyntax @tech{UniverseState}) bundle?))])]{
- tells DrRacket to invoke @racket[dis-expr] every time a participating
- @tech{world} drops its connection to the server. The first argument
- is the current state of the universe server, while the second argument is
- the (representation of the) world that got disconnected. The resulting
- bundle usually includes this second argument in the third field, telling
- DrRacket not to wait for messages from this world anymore.
-
-@history[
- #:changed 
- "1.1" 
- "allow universe handlers to return a plain universe state"]
-}
-}
-
-@item{
-@defform/none[#:literals (port)
-              (port port-expr) 
-	      #:contracts 
-	      ([port-expr natural-number/c])]{
- specifies port on which a universe wishes to receive and send messages. A
- port number is an integer between @racket[0] and @racket[65536].
-}}
-
-@item{
- @defform[(to-string render-expr)
-          #:contracts
-          ([render-expr (-> (unsyntax @tech{UniverseState}) string?)])]{
- tells DrRacket to render the state of the universe after each event and to
- display this string in the universe console.
- }
-}
-
-@item{
- @defform/none[#:literals (check-with)
-               (check-with universe?-expr)
-          #:contracts
-          ([universe?-expr (-> Any boolean?)])]{
- ensure that what the event handlers produce is really an element of
- @tech{UniverseState}.}
-}
-
-@item{
-@defform/none[#:literals (state) (state expr)]{
- tells DrRacket to display a separate window in which the current
- state is rendered each time it is updated. This is mostly useful for
- debugging server programs.
-}}
-
-]
-
-@subsection{Exploring a Universe}
-
-In order to explore the workings of a universe, it is necessary to launch a
- server and several world programs on one and the same computer. We
- recommend launching one server out of one DrRacket tab and as many worlds
- as necessary out of a second tab. For the latter, the teachpack provides a
- special form.
-
-@defform[(launch-many-worlds expression ...)]{
- evaluates all sub-expressions in parallel. Typically each sub-expression
- is an application of a function that evaluates a @racket[big-bang]
- expression. When all worlds have stopped, the expression returns all final
- worlds in order.}
-
-Once you have designed a world program, add a function definition
- concerning @racket[big-bang] to the end of the tab:
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; String -> World
-(define (main n)
-  (big-bang ... (name n) ...))
-))
- Then in DrRacket's Interactions area, use @racket[launch-many-worlds]
- to create several distinctively named worlds:
-@(begin
-#reader scribble/comment-reader
-(racketblock
-> (launch-many-worlds (main "matthew")
-                      (main "kathi")
-                      (main "h3"))
-10
-25
-33
-))
- The three worlds can then interact via a server. When all of them have
- stopped, they produce the final states, here @racket[10], @racket[25], and
- @racket[33].
-
-For advanced programmers, the library also provides a programmatic
-interface for launching many worlds in parallel.
-
-@defproc[(launch-many-worlds/proc [thunk-that-runs-a-world (-> any/c)] ...)
-          (values any @#,racketfont{...})]{
- invokes all given @racket[thunk-that-runs-a-world] in parallel. Typically
- each argument is a function of no argument that evaluates a @racket[big-bang]
- expression. When all worlds have stopped, the function expression returns
- all final worlds in order.}
-
-It is thus possible to decide at run time how many and which worlds to run
-in parallel:
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-> (apply launch-many-worlds/proc
-         (build-list (random 10)
-                     (lambda (i)
-                       (lambda ()
-                         (main (number->string i))))))
-0
-9
-1
-2
-3
-6
-5
-4
-8
-7
-))
-@;%
-
-
-
-@; -----------------------------------------------------------------------------
-@section[#:tag "universe-sample"]{A First Sample Universe}
-
-This section uses a simple example to explain the design of a universe,
- especially its server and some participating worlds. The first subsection
- explains the example, the second introduces the general design plan for
- such universes. The remaining sections present the full-fledged solution.
-
-@subsection{Two Ball Tossing Worlds}
-
-Say we want to represent a universe that consists of a number of worlds and
- that gives each world a ``turn'' in a round-robin fashion. If a world is
- given its turn, it displays a ball that ascends from the bottom of a
- canvas to the top. It relinquishes its turn at that point and the server
- gives the next world a turn.
-
-Here is an image that illustrates how this universe would work if two
- worlds participated:
-
-@image["balls" #:suffixes '(".gif" ".png")]
-
- The two @tech{world} programs could be located on two distinct computers
- or on just one. A @tech{server} mediates between the two worlds, including
- the initial start-up.
-
-@; -----------------------------------------------------------------------------
-@subsection{Hints on Designing Universes}
-
-The first step in designing a @tech{universe} is to understand the
- coordination of the @tech{world}s from a global perspective. To some
- extent, it is all about knowledge and the distribution of knowledge
- throughout a system. We know that the @tech{universe} doesn't exist until
- the server starts and the @tech{world}s are joining. Because of the nature
- of computers and networks, however, we may assume little else. Our network
- connections ensure that if some @tech{world} or the @tech{server} sends
- two messages to the @emph{same} place in some order, they arrive in the
- same order (if they arrive at all). In contrast, if two distinct
- @tech{world} programs send one message each, the network does not
- guarantee the order of arrival at the server; similarly, if the
- @tech{server} is asked to send some messages to several distinct
- @tech{world} programs, they may arrive at those worlds in the order sent
- or in the some other order. In the same vein, it is impossible to ensure
- that one world joins before another. Worst, when someone removes the
- connection (cable, wireless) between a computer that runs a @tech{world}
- program and the rest of the network or if some network cable is cut,
- messages don't go anywhere. Due to this vagaries, it is therefore the
- designer's task to establish a protocol that enforces a certain order onto
- a universe and this activity is called @emph{protocol design}.
-
-From the perspective of the @tech{universe}, the design of a protocol is
- about the design of data representations for tracking universe information
- in the server and the participating worlds and the design of a data
- representation for messages. As for the latter, we know that they must be
- @|S-expression|s, but usually @tech{world} programs don't send all
- kinds of @|S-expression|s. The data definitions for messages must
- therefore select a subset of suitable @|S-expression|s. As for the
- state of the server and the worlds, they must reflect how they currently
- relate to the universe. Later, when we design their ``local'' behavior, we
- may add more components to their state space.
-
-In summary, the first step of a protocol design is to introduce:
-
-@itemize[
-
-@item{a data definition for the information about the universe that the
-server tracks, call it @tech{UniverseState};}
-
-@item{a data definition for the world(s) about their current relationship
-to the universe;}
-
-@item{data definitions for the messages that are sent from the server to
-the worlds and vice versa. Let's call them @deftech{S2W} for messages
-from the server to the worlds and @deftech{W2S} for the other direction;
-in the most general case you may need one pair per world.}
-]
-
-If all the worlds exhibit the same behavior over time, a single data
-definition suffices for step 2. If they play different roles, we may need
-one data definition per world.
-
-Of course, as you define these collections of data always keep in mind what
-the pieces of data mean, what they represent from the universe's
-perspective.
-
-The second step of a protocol design is to figure out which major
- events---the addition of a world to the universe, the arrival of a message
- at the server or at a world---to deal with and what they imply for the
- exchange of messages. Conversely, when a server sends a message to a
- world, this may have implications for both the state of the server and the
- state of the world. A good tool for writing down these agreements is an
- interaction diagram.
-
-
-@verbatim{
-
-     Server              World1                  World2
-       |                   |                       |
-       |   'go             |                       |
-       |<------------------|                       |
-       |    'go            |                       |
-       |------------------------------------------>|
-       |                   |                       |
-       |                   |                       |
-}
-
- Each vertical line is the life line of a @tech{world} program or the
- @tech{server}. Each horizontal arrow denotes a message sent from one
- @tech{universe} participant to another.
-
-The design of the protocol, especially the data definitions, have direct
-implications for the design of event handling functions. For example, in
-the server we may wish to deal with two kinds of events: the joining of a
-new world and the receipt of a message from one of the worlds. This
-translates into the design of two functions with the following headers,
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; Bundle is
-;;   (make-bundle UniverseState [Listof mail?] [Listof iworld?])
-
-;; UniverseState iworld? -> Bundle
-;; next list of worlds when world @racket[iw] is joining
-;; the universe in state @racket[s]
-(define (add-world s iw) ...)
-
-;; UniverseState iworld? W2U -> Bundle
-;; next list of worlds when world @racket[iw] is sending message @racket[m] to
-;; the universe in state @racket[s]
-(define (process s iw m) ...)
-))
-
-Finally, we must also decide how the messages affect the states of the
- worlds; which of their callback may send messages and when; and what to do
- with the messages a world receives. Because this step is difficult to
- explain in the abstract, we move on to the protocol design for the
- universe of ball worlds.
-
-@; -----------------------------------------------------------------------------
-@subsection{Designing the Ball Universe}
-
-Running the ball @tech{universe} has a simple overall goal: to ensure that at any
- point in time, one @tech{world} is active and all others are passive. The active
- @tech{world} displays a moving ball, and the passive @tech{world}s should display
- something, anything that indicates that it is some other @tech{world}'s turn.
-
-As for the server's state, it must obviously keep track of all @tech{world}s that
- joined the @tech{universe}, and it must know which one is active and which ones
- are passive. Of course, initially the @tech{universe} is empty, i.e., there are
- no @tech{world}s and, at that point, the server has nothing to track.
-
-While there are many different useful ways of representing such a
- @tech{universe}, we just use the list of @emph{iworlds} that is handed to
- each handler and that handlers return via their bundles. The
- @tech{UniverseState} itself is useless for this trivial example. We
- interpret non-empty lists as those where the first @emph{iworld} is active
- and the remainder are the passive @emph{iworld}s. As for the two possible
- events,
-
-@itemize[
-
-@item{it is natural to add new @emph{iworld}s to the end of the list; and}
-
-@item{it is natural to move an active @emph{iworld} that relinquishes its turn to
-the end of the list, too.}
-]
-
-The server should send messages to the first @emph{iworld} of its list as
- long as it wishes this @emph{iworld} to remain active. In turn, it should
- expect to receive messages only from this one active @emph{iworld} and no
- other @emph{iworld}. The content of these two messages is nearly irrelevant
- because a message from the server to an @emph{iworld} means that it is the
- @emph{iworld}'s turn and a message from the @emph{iworld} to the server
- means that the turn is over. Just so that we don't confuse ourselves, we
- use two distinct symbols for these two messages:
-@itemize[
-@item{A @defterm{GoMessage} is @racket['it-is-your-turn].}
-@item{A @defterm{StopMessage} is @racket['done].}
-]
-
-From the @tech{universe}'s perspective, each @tech{world} is in one of two states:
-@itemize[
-@item{A passive @tech{world} is @emph{resting}. We use @racket['resting] for this state.}
-@item{An active @tech{world} is not resting. We delay choosing a representation
-for this part of a @tech{world}'s state until we design its ``local'' behavior.}
-]
- It is also clear that an active @tech{world} may receive additional messages,
- which it may ignore. When it is done with its turn, it will send a
- message.
-
-@verbatim{
-     Server
-       |                 World1
-       |<==================|
-       |  'it-is-your-turn |
-       |------------------>|
-       |                   |                    World2
-       |<==========================================|
-       |  'done            |                       |
-       |<------------------|                       |
-       |  'it-is-your-turn |                       |
-       |------------------------------------------>|
-       |                   |                       |
-       |                   |                       |
-       |  'done            |                       |
-       |<------------------------------------------|
-       |  'it-is-your-turn |                       |
-       |------------------>|                       |
-       |                   |                       |
-       |                   |                       |
-}
-
-Here the double-lines (horizontal) denote the registration step, the others
- are message exchanges. The diagram thus shows how the @tech{server}
- decides to make the first registered world the active one and to enlist
- all others as they join.
-
-
-@; -----------------------------------------------------------------------------
-@subsection{Designing the Ball Server}
-
-The preceding subsection dictates that our server program starts like this:
-
-@(begin
-#reader scribble/comment-reader
-[racketblock
-;; teachpack: universe.rkt
-
-;; UniverseState is '*
-;; StopMessage is 'done.
-;; GoMessage is 'it-is-your-turn.
-])
-
- The design of a protocol has immediate implications for the design of the
- event handling functions of the server. Here we wish to deal with two
- events: the appearance of a new world and the receipt of a message. Based
- on our data definitions and based on the general contracts of the event
- handling functions spelled out in this documentation, we get two functions
- for our wish list:
-
-@(begin
-#reader scribble/comment-reader
-[racketblock
-;; Result is
-;;   (make-bundle [Listof iworld?]
-;;                (list (make-mail iworld? GoMessage))
-;;                '())
-
-;; [Listof iworld?] iworld? -> Result
-;; add world @racket[iw] to the universe, when server is in state @racket[u]
-(define (add-world u iw) ...)
-
-;; [Listof iworld?] iworld? StopMessage -> Result
-;; world @racket[iw] sent message @racket[m] when server is in state @racket[u]
-(define (switch u iw m) ...)
-])
-
-Although we could have re-used the generic contracts from this
-documentation, we also know from our protocol that our server sends a
-message to exactly one world. Note how these contracts are just refinements
-of the generic ones. (A type-oriented programmer would say that the
-contracts here are subtypes of the generic ones.)
-
-The second step of the design recipe calls for functional examples:
-
-@(begin
-#reader scribble/comment-reader
-[racketblock
-;; an obvious example for adding a world:
-(check-expect
-  (add-world '() world1)
-  (make-bundle (list world1)
-               (list (make-mail world1 'it-is-your-turn))
-               '()))
-
-;; an example for receiving a message from the active world:
-(check-expect
- (switch (list world1 world2) world1 'done)
- (make-bundle (list world2 world1)
-              (list (make-mail world2 'it-is-your-turn))
-              '()))
-])
-
- Note that our protocol analysis dictates this behavior for the two
- functions. Also note how we use @racket[world1], @racket[world2], and
- @racket[world3] because the teachpack applies these event handlers to real
- worlds.
-
-Exercise: Create additional examples for the two functions based on our
-protocol.
-
-The protocol tells us that @emph{add-world} just adds the given
- @emph{world} structure---recall that this a data representation of the
- actual @tech{world} program---to the given list of worlds. It then sends a
- message to the first world on this list to get things going:
-
-@(begin
-#reader scribble/comment-reader
-[racketblock
-(define (add-world univ wrld)
-  (local ((define univ* (append univ (list wrld))))
-    (make-bundle univ*
-                 (list (make-mail (first univ*) 'it-is-your-turn))
-                 '())))
-])
-
-Because @emph{univ*} contains at least @emph{wrld}, it is acceptable to
-create a mail to @racket[(first univ*)]. Of course, this same reasoning
-also implies that if @emph{univ} isn't empty, its first element is an
-active world and is about to receive a second @racket['it-is-your-turn] message.
-
-Similarly, the protocol says that when @emph{switch} is invoked because a
- @tech{world} program sends a message, the data representation of the
- corresponding world is moved to the end of the list and the next world on
- the (resulting) list is sent a message:
-
-@(begin
-#reader scribble/comment-reader
-[racketblock
-(define (switch univ wrld m)
-  (local ((define univ* (append (rest univ) (list (first univ)))))
-    (make-bundle univ*
-                 (list (make-mail (first univ*) 'it-is-your-turn))
-                 '())))
-])
-
- As before, appending the first world to the end of the list guarantees
- that there is at least this one world on this list. It is therefore
- acceptable to create a mail for this world.
-
-Start the server now.
-
- @racketblock[(universe '() (on-new add-world) (on-msg switch))]
-
-Exercise: The function definition simply assumes that @emph{wrld} is
- @racket[world=?] to @racket[(first univ)] and that the received message
- @emph{m} is @racket['done]. Modify the function definition so that it
- checks these assumptions and raises an error signal if either of them is
- wrong. Start with functional examples. If stuck, re-read the section on
- checked functions from HtDP. (Note: in a @tech{universe} it is quite
- possible that a program registers with a @tech{server} but fails to stick
- to the agreed-upon protocol. How to deal with such situations properly
- depends on the context. For now, stop the @tech{universe} at this point by
- returning an empty list of worlds. Consider alternative solutions, too.)
-
-Exercise: An alternative state representation would equate
- @tech{UniverseState} with @emph{world} structures, keeping track of the
- active world. The list of world in the server would track the passive
- worlds only. Design appropriate @racket[add-world] and @racket[switch]
- functions.
-
-@; -----------------------------------------------------------------------------
-@subsection{Designing the Ball World}
-
-The final step is to design the ball @tech{world}. Recall that each world
- is in one of two possible states: active or passive. The second kind of
- @tech{world} moves a ball upwards, decreasing the ball's @emph{y}
- coordinate; the first kind of @tech{world} displays something that says
- it's someone else's turn.  Assuming the ball always moves along a vertical
- line and that the vertical line is fixed, the state of the world is an
- enumeration of two cases:
-
-@(begin #reader scribble/comment-reader
-(racketblock
-;; teachpack: universe.rkt
-
-;; WorldState is one of:
-;; -- Number             %% representing the @emph{y} coordinate
-;; -- @racket['resting]
-
-(define WORLD0 'resting)
-
-;; A WorldResult is one of:
-;; -- WorldState
-;; -- (make-package WorldState StopMessage)
-))
- The definition says that initially a @tech{world} is passive.
-
-The communication protocol and the refined data definition of @|WorldState|
- imply a number of contract and purpose statements:
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-
-;; WorldState GoMessage -> WorldResult
-;; make sure the ball is moving
-(define (receive w n) ...)
-
-;; WorldState -> WorldResult
-;; move this ball upwards for each clock tick
-;; or stay @racket['resting]
-(define (move w) ...)
-
-;; WorldState -> Image
-;; render the world as an image
-(define (render w) ...)
-))
-
-Let's design one function at a time, starting with @emph{receive}.  Since
- the protocol doesn't spell out what @emph{receive} is to compute, let's
- create a good set of functional examples, exploiting the structure of the
- data organization of @|WorldState|:
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(check-expect (receive 'resting 'it-is-your-turn) HEIGHT)
-(check-expect (receive (- HEIGHT 1) 'it-is-your-turn) ...)
-))
-
-Since there are two kinds of states, we make up at least two kinds of
- examples: one for a @racket['resting] state and another one for a numeric
- state. The dots in the result part of the second unit test reveal the
- first ambiguity; specifically it isn't clear what the result should be
- when an active @tech{world} receives another message to activate itself. The
- second ambiguity shows up when we study additional examples, which are
- suggested by our approach to designing functions on numeric intervals
- (HtDP, section 3). That is we should consider the following three inputs
- to @emph{receive}:
-
-@itemize[
-@item{@racket[HEIGHT] when the ball is at the bottom of the image;}
-@item{@racket[(- HEIGHT 1)] when the ball is properly inside the image; and}
-@item{@racket[0] when the ball has hit the top of the image.}
-]
-
- In the third case the function could produce three distinct results:
- @racket[0], @racket['resting], or @racket[(make-package 'resting
- 'done)]. The first leaves things alone; the second turns the active @tech{world}
- into a resting one; the third does so, too, and tells the universe about
- this switch.
-
-We choose to design @emph{receive} so that it ignores the message and
- returns the current state of an active @tech{world}.  This ensures that the ball
- moves in a continuous fashion and that the @tech{world} remains active.
-
-Exercise: One alternative design is to move the ball back to the bottom of
-the image every time @racket['it-is-your-turn] is received. Design this function, too.
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-
-(define (receive w m)
-  (cond
-    [(symbol? w) HEIGHT] ;; meaning: @racket[(symbol=? w 'resting)]
-    [else w]))
-))
-
- Our second function to design is @emph{move}, the function that computes
- the ball movement. We have the contract and the second step in the design
- recipe calls for examples:
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-; WorldState -> WorldState or @racket[(make-package 'resting 'done)]
-; move the ball if it is flying
-
-(check-expect (move 'resting) 'resting)
-(check-expect (move HEIGHT) (- HEIGHT 1))
-(check-expect (move (- HEIGHT 1)) (- HEIGHT 2))
-(check-expect (move 0) (make-package 'resting 'done))
-
-(define (move x) ...)
-))
-
- Following HtDP again, the examples cover four typical situations:
- @racket['resting], two end points of the specified numeric interval, and
- one interior point. They tell us that @emph{move} leaves a passive @tech{world}
- alone and that it otherwise moves the ball until the @emph{y} coordinate
- becomes @racket[0]. In the latter case, the result is a package that
- renders the @tech{world} passive and tells the server about it.
-
- Turning these thoughts into a complete definition is straightforward now:
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(define (move x)
-  (cond
-    [(symbol? x) x]
-    [(number? x) (if (<= x 0)
-                     (make-package 'resting 'done)
-                     (sub1 x))]))
-))
-
-Exercise: what could happen if we had designed @emph{receive} so that it
- produces @racket['resting] when the state of the world is @racket[0]?  Use
- your answer to explain why you think it is better to leave this kind of
- state change to the tick event handler instead of the message receipt
- handler?
-
-Finally, here is the third function, which renders the state as an image:
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-; WorldState -> Image
-; render the state of the world as an image
-
-(check-expect (render HEIGHT) (underlay/xy MT 50 HEIGHT BALL))
-(check-expect (render 'resting)
-              (underlay/xy MT 10 10 (text "resting" 11 "red")))
-
-(define (render w)
-  (underlay/xy
-    (cond
-      [(symbol? w) (underlay/xy MT 10 10 (text "resting" 11 "red"))]
-      [(number? w) (underlay/xy MT 50 w BALL)])
-    5 85
-    (text name 11 "black")))
-
-))
-
- Here is an improvement that adds a name to the image and abstracts over
- the name at the same time:
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-; String -> (WorldState -> Image)
-; render the state of the world as an image
-
-(check-expect
- ((draw "Carl") 100)
- (underlay/xy (underlay/xy MT 50 100 BALL)
-              5 85
-              (text "Carl" 11 "black")))
-
-(define (draw name)
-  (lambda (w)
-    (overlay/xy
-     (cond
-       [(symbol? w) (underlay/xy MT 10 10 (text "resting" 11 "red"))]
-       [(number? w) (underlay/xy MT 50 w BALL)])
-     5 85
-     (text name 11 'black))))
-
-))
-
- By doing so, we can use the same program to create many different
- @tech{world}s that register with a @tech{server} on your computer:
-@(begin
-#reader scribble/comment-reader
-(racketblock
-
-; String -> WorldState
-; create and hook up a world with the @racket[LOCALHOST] server
-(define (create-world n)
-  (big-bang WORLD0
-           (on-receive receive)
-           (to-draw (draw n))
-           (on-tick move)
-           (name n)
-           (register LOCALHOST)))
-))
-
- Now you can use @racket[(create-world 'carl)] and @racket[(create-world 'sam)],
- respectively, to run two different worlds, after launching a @tech{server}
- first.
-
-Exercise: Design a function that takes care of a world to which the
- universe has lost its connection. Is @emph{Result} the proper contract for
- the result of this function?
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/balls.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/balls.png
deleted file mode 100644
index 03ea3eb596..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/balls.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/door-real.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/door-real.png
deleted file mode 100644
index 1514131ad0..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/door-real.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/door-sim.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/door-sim.png
deleted file mode 100644
index 014d4a7a9a..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/door-sim.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/gamepad.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/gamepad.png
deleted file mode 100644
index 434f65df98..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/gamepad.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/arrow-gui.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/arrow-gui.scrbl
deleted file mode 100644
index 9ba01f8b8d..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/arrow-gui.scrbl
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label scheme teachpack/htdp/arrow-gui))
-
-@teachpack["arrow-gui"]{An Arrow GUI}
-
-@defmodule[#:require-form beginner-require htdp/arrow-gui]
-
-The teachpack provides functions for creating and manipulating an arrow
-GUI. We recommend using @racketmodname[2htdp/universe] instead.
-
-@deftech{modelT} @racket[(-> button% event% true)]
-
-A @tech{modelT} is a function that accepts and ignores two arguments. 
-
-@defproc[(control) symbol?]{Reads out the current state of the message
-field.} 
-
-@defproc[(view [s (or/c string? symbol?)]) true]{Displays @racket[s] in the
-message field.} 
-
-@defproc[(connect [l (unsyntax @tech{modelT})][r (unsyntax @tech{modelT})][u (unsyntax @tech{modelT})][d (unsyntax @tech{modelT})]) true]{Connects four
-controllers with the four directions in the arrow window.}
-
-Example:
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; Advanced
-(define (make-model dir)
-  (lambda (b e)
-    (begin
-      (view dir)
-      (printf "~a ~n" (control)))))
-
-(connect (make-model "left")
-         (make-model "right")
-         (make-model "up")
-         (make-model "down"))
-))
-Now click on the four arrows. The message field contains the current
-direction, the print-out the prior contents of the message field.
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/arrow.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/arrow.scrbl
deleted file mode 100644
index bf929f99be..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/arrow.scrbl
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label scheme teachpack/htdp/arrow))
-
-@teachpack["arrow"]{Managing Control Arrows}
-
-@;declare-exporting[teachpack/htdp/arrow]
-@defmodule[#:require-form beginner-require htdp/arrow]
-
-The teachpack implements a controller for moving shapes across a canvass.  
-
-@defproc[(control-left-right
-	   [shape Shape]
-	   [n number?]
-	   [move (-> number? Shape Shape)]
-	   [draw (-> Shape true)]) true]{Moves shape @racket[n] pixels left
-(negative) or right (positive).} 
-
-@defproc[(control-up-down
-	   [shape Shape]
-	   [n number?]
-	   [move (-> number? Shape Shape)]
-	   [draw (-> Shape true)]) true]{Moves shape @racket[n] pixels up
-(negative) or down (positive).} 
-
-@defproc[(control
-	   [shape Shape]
-	   [n number?]
-	   [move-lr (-> number? Shape Shape)]
-	   [move-ud (-> number? Shape Shape)]
-	   [draw (-> Shape true)]) true]{
-Moves shape @racket[N] pixels left or right and up or down, respectively.} 
-
-Example:
-@(begin
-#reader scribble/comment-reader
-(racketblock 
-;; A shape is a structure:
-;;   (make-posn num num)
-
-;; RAD : the radius of the simple disk moving across a canvas
-(define RAD 10)
-
-;; move : number shape -> shape or false
-;; to move a shape by delta according to translate
-;; effect: to redraw it
-(define (move delta sh)
-  (cond
-    [(and (clear-solid-disk sh RAD)
-          (draw-solid-disk (translate sh delta) RAD))
-     (translate sh delta)]
-    [else false]))
-
-;; translate : shape number -> shape
-;; to translate a shape by delta in the x direction
-(define (translate sh delta)
-  (make-posn (+ (posn-x sh) delta) (posn-y sh)))
-
-;; draw-it : shape -> true
-;; to draw a shape on the canvas: a disk with radius
-(define (draw-it sh)
-  (draw-solid-disk sh RAD))
-
-;; Run:
-
-;; this creates the canvas
-(start 100 50)
-
-;; this creates the controller GUI
-(control-left-right (make-posn 10 20) 10 move draw-it)
-))
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/convert.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/convert.scrbl
deleted file mode 100644
index c847f33f22..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/convert.scrbl
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/convert))
-
-@teachpack["convert"]{Converting Temperatures}
-
-@;declare-exporting[teachpack/htdp/convert]
-@defmodule[#:require-form beginner-require htdp/convert]
-
-The teachpack @racket[convert.rkt] provides three functions for
-converting Fahrenheit temperatures to Celsius. It is useful for a single
-exercise in HtDP. Its purpose is to demonstrate the independence of
-``form'' (user interface) and ``function'' (also known as ``model'').
-
-@defproc[(convert-gui [convert (-> number? number?)]) true]{Consumes a
-conversion function from Fahrenheit to Celsius and creates a graphical user
-interface with two rulers, which users can use to convert temperatures
-according to the given temperature conversion function.}
-
-@defproc[(convert-repl [convert (-> number? number?)]) true]{Consumes a
-conversion function from Fahrenheit to Celsius and then starts a
-read-evaluate-print loop. The loop prompts users to enter a number and then
-converts the number according to the given temperature conversion function.
-A user can exit the loop by entering ``x.''}
-
-@defproc[(convert-file [in string?][convert (-> number? number?)][out string?]) true]{Consumes a
-file name @racket[in], a
-conversion function from Fahrenheit to Celsius, and a string
-@racket[out]. The program then reads all the number from
-@racket[in], converts them according to @racket[convert], and prints the
-results to the newly created file @racket[out].
-
-@bold{Warning}: If @racket[out] already exists, it is deleted.}
-
-Example: Create a file with name @racket["in.dat"] with some numbers in
-it, using your favorite text editor on your computer.  Define a function
-@racket[f2c] in the Definitions window and set teachpack to
-@filepath{convert.rkt} and click Run.  Then evaluate
-@(begin
-#reader scribble/comment-reader
-(racketblock
- (convert-gui f2c)
- ;; and 
- (convert-file "in.dat" f2c "out.dat")
- ;; and 
- (convert-repl f2c)
-))
-Finally inspect the file @racket["out.dat"] and use the repl to check the
-answers. 
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/dir.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/dir.scrbl
deleted file mode 100644
index 71712fa23f..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/dir.scrbl
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label (except-in racket/base file-size)
-                     teachpack/htdp/dir
-                     racket/contract))
-
-@teachpack["dir"]{Working with Files and Directories}
-
-@;declare-exporting[teachpack/htdp/dir]
-@defmodule[#:require-form beginner-require htdp/dir]
-
-The teachpack provides structures and functions for working with files and
-directories: 
-
-@defstruct[dir ([name symbol?][dirs (listof dir?)][files (listof file?)])]{}
-
-@defstruct[file ([name symbol?][size integer?][content (listof char?)])]{}
-
-@defproc[(create-dir [path symbol?]) dir?]{
- Turns the directory found at @racket[path] on your computer into an instance of @racket[dir?].}
-
-Sample: Set teachpack to @filepath{dir.rkt} and click Run:
-@(begin
-#reader scribble/comment-reader
-(racketblock
-> (create-dir ".")
-(make-dir
-  '|.|
-  empty
-  (cons (make-file 'ball1.gif 1289 empty)
-        (cons (make-file 'blueball.gif 205 empty)
-              (cons (make-file 'greenbal.gif 204 empty)
-                    (cons (make-file 'redball.gif 203 empty)
-                          (cons (make-file 'ufo.gif 1044 empty)
-                                (cons (make-file 'gif-test.rkt 5811 empty)
-                                      empty)))))))
-))
-Using ``.'' usually means the directory in which your program is
-located. In this case, the directory contains no sub-directories and six
-files. 
- 
-Note: Soft links are always treated as if they were empty files.
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/docs.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/docs.scrbl
deleted file mode 100644
index c4b308fd92..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/docs.scrbl
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/docs))
-
-@teachpack["docs"]{Manipulating Simple HTML Documents}
-
-@;declare-exporting[teachpack/htdp/docs]
-@defmodule[#:require-form beginner-require htdp/docs]
-
-The teachpack provides three functions for creating simple ``HTML'' documents: 
-
-@deftech{Annotation} An @tech{Annotation} is a symbol that starts with ``<''
-and ends in ``>''. An end annotation is one that starts with ``</''.
-
-@defproc[(atom? [x any/c]) boolean?]{Determines whether or not a value
-is a number, a symbol, or a string.} 
-
-@defproc[(annotation? [x any/c]) boolean?]{Determines whether or not a
-symbol is a document annotation.} 
-
-@defproc[(end-annotation [x (unsyntax @tech{Annotation})]) (unsyntax @tech{Annotation})]{Consumes an annotation
-and produces a matching ending annotation.} 
-
-@defproc[(write-file [l (list-of atom)]) true]{
-Consumes a list of symbols and annotations and prints them out as a
-"file".}
-
-Sample session: set teachpack to @filepath{docs.rkt} and click Run:
-@(begin
-#reader scribble/comment-reader
-(racketblock
-> (annotation? 0)
-false
-> (annotation? '<bold>)
-true
-> (end-annotation 0)
-end-annotation: not an annotation: 0
-> (write-file (list 'a 'b))
-a b 
-))
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/draw.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/draw.scrbl
deleted file mode 100644
index 98c6b0a41e..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/draw.scrbl
+++ /dev/null
@@ -1,125 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/draw))
-
-@teachpack["draw"]{Simple Drawing}
-
-@;declare-exporting[teachpack/htdp/draw]
-@defmodule[#:require-form beginner-require htdp/draw #:use-sources (htdp/big-draw htdp/draw)]
-
-The teachpack provides two sets of functions: one for drawing into a canvas
-and one for reacting to canvas events. 
-
-@deprecated[(list @racketmodname[2htdp/image] " (probably in conjunction with " @racketmodname[2htdp/universe] ")")]{
-  You may continue to use the library for solving exercises 
-  from @emph{How To Design Programs, First Edition} but do consider
-  switching to @link["http://www.ccs.neu.edu/home/matthias/HtDP2e/"]{How To Design Programs, Second Edition} instead.}
-
-@section[#:tag "drawing"]{Drawing on a Canvas}
-
-@deftech{DrawColor}: @racket[(and/c symbol? (one-of/c 'white 'yellow 'red 'blue 'green 'black))]
-These six colors are definitely provided. If you want other colors,
-guess! For example, @racket['orange] works, but @racket['mauve]
-doesn't. If you apply the function to a symbol that it doesn't recognize as
-a color, it raises an error.
-
-@defproc[(start [width number?][height number?]) true]{Opens a
-@racket[width] x @racket[height] canvas.} 
-
-@defproc[(start/cartesian-plane [width number?][height number?])
-         true]{
-Opens a @racket[width] x @racket[height] canvas and draws a Cartesian
-plane.}
-
-@defproc[(stop) true]{Closes the canvas.}
-
-@defproc[(draw-circle [p posn?] [r number?] [c (unsyntax @tech{DrawColor})])
-         true]{
-Draws a @racket[c] circle at @racket[p] with radius @racket[r].}
-
-@defproc[(draw-solid-disk [p posn?] [r number?] [c (unsyntax @tech{DrawColor})])
-         true]{
-Draws a @racket[c] disk at @racket[p] with radius @racket[r].}
-
-@defproc[(draw-solid-rect [ul posn?] [width number?] [height number?]
-                          [c (unsyntax @tech{DrawColor})])
-         true]{
-Draws a @racket[width] x @racket[height], @racket[c] rectangle with the
-upper-left corner at @racket[ul].}
-
-@defproc[(draw-solid-line [strt posn?] [end posn?]
-                          [c (unsyntax @tech{DrawColor})])
-         true]{
-Draws a @racket[c] line from @racket[strt] to @racket[end].}
-
-@defproc[(draw-solid-string [p posn?] [s string?]) true]{
-Draws @racket[s] at @racket[p].}
-
-@defproc[(sleep-for-a-while [s number?]) true]{
-Suspends evaluation for @racket[s] seconds.}
-
-The teachpack also provides @racket[clear-] functions for each
-@racket[draw-] function:
-
-@defproc[(clear-circle [p posn?] [r number?] [c (unsyntax @tech{DrawColor})])
-         true]{
-clears a @racket[c] circle at @racket[p] with radius @racket[r].}
-
-@defproc[(clear-solid-disk [p posn?] [r number?] [c (unsyntax @tech{DrawColor})])
-         true]{
-clears a @racket[c] disk at @racket[p] with radius @racket[r].}
-
-@defproc[(clear-solid-rect [ul posn?] [width number?] [height number?]
-                          [c (unsyntax @tech{DrawColor})])
-         true]{
-clears a @racket[width] x @racket[height], @racket[c] rectangle with the
-upper-left corner at @racket[ul].}
-
-@defproc[(clear-solid-line [strt posn?] [end posn?]
-                          [c (unsyntax @tech{DrawColor})])
-         true]{
-clears a @racket[c] line from @racket[strt] to @racket[end].}
-
-@defproc[(clear-solid-string [p posn?] [s string?]) true]{
- clears @racket[s] at @racket[p].}
-
-@defproc[(clear-all) true]{
- clears the entire screen.}
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "interaction"]{Interactions with Canvas}
-
-@defproc[(wait-for-mouse-click) posn?]{
-Waits for the user to click on the mouse, within the canvas.}
-
-@deftech{DrawKeyEvent}: @racket[(or/c char? symbol?)] A
-@tech{DrawKeyEvent} represents keyboard events: 
-@itemize[
- @item{@racket[char?], if the user pressed an alphanumeric key;}
- @item{@racket[symbol?], if the user pressed, for example, an arror key:
- @racket['up] @racket['down]  @racket['left] @racket['right]}
-]
-
-@defproc[(get-key-event) (or/c false (unsyntax @tech{DrawKeyEvent}))]{Checks whether the
-user has pressed a key within the window; @racket[false] if not.}
-
-@deftech{DrawWorld}: For proper interactions, using the teachpack
- requires that you provide a data definition for @tech{DrawWorld} . In
- principle, there are no constraints on this data definition. You can even
- keep it implicit, even if this violates the Design Recipe.
-
-The following functions allow programs to react to events from the canvas.
-
-@defproc[(big-bang [n number?] [w (unsyntax @tech{DrawWorld})]) true]{Starts the clock, one tick every
-@racket[n] (fractal) seconds; @racket[w] becomes the first ``current'' world.}
-
-@defproc[(on-key-event [change (-> (unsyntax @tech{DrawKeyEvent}) (unsyntax @tech{DrawWorld}) (unsyntax @tech{DrawWorld}))])
-true]{Adds @racket[change] to the world. The function reacts to keyboard
-events and creates a new @racket[@#,tech{DrawWorld}].}
-
-@defproc[(on-tick-event [tock (-> (unsyntax @tech{DrawWorld}) (unsyntax @tech{DrawWorld}))]) true]{Adds @racket[tock]
-to the world. The function reacts to clock tick events, creating a new
-current world.}
-
-@defproc[(end-of-time) (unsyntax @tech{DrawWorld})]{Stops the world; returns the current world.} 
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/elevator.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/elevator.scrbl
deleted file mode 100644
index 84030deb6b..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/elevator.scrbl
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/elevator))
-
-@teachpack["elevator"]{Controlling an Elevator}
-
-@;declare-exporting[teachpack/htdp/elevator]
-@defmodule[#:require-form beginner-require htdp/elevator]
-
-The teachpack implements an elevator simulator.
-
-It displays an eight-floor elevator and accepts mouse clicks from the user,
-which are translated into service demands for the elevator. 
-
-@defproc[(run [NextFloor number?]) any/c]{Creates an elevator simulator
-that is controlled by @racket[NextFloor]. This function consumes the
-current floor, the direction in which the elevator is moving, and the
-current demands. From that, it computes where  to send the elevator next.} 
-
-Example: Define a function that consumes the current state of
-the elevator (three arguments) and returns a number between 1 and 8. Here
-is a non-sensical definition:
-
-@racketblock[(define (controller x y z) 7)]
-
-It moves the elevator once, to the 7th floor.
-
-Second, set the teachpack to @filepath{elevator.rkt}, click Run, and
-evaluate
-@racketblock[(run controller)]
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/graphing.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/graphing.scrbl
deleted file mode 100644
index 241a622615..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/graphing.scrbl
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/graphing))
-
-@teachpack["graphing"]{Graphing Functions}
-
-@;declare-exporting[teachpack/htdp/graphing]
-@defmodule[#:require-form beginner-require htdp/graphing #:use-sources (htdp/draw)]
-
-The teachpack provides two functions for graphing functions in the regular
-(upper right) quadrant of the Cartesian plane (between 0 and 10 in both
-directions): 
-
-@defproc[(graph-fun [f (-> number?  number?)][color symbol?]) true]{
-Draws the graph of @racket[f] with the given @racket[color].}
-
-@defproc[(graph-line [line (-> number? number?)][color symbol?]) true]{
-Draws @racket[line], a function representing a straight line, with a given
-color.} 
-
-For color symbols, see @secref{draw}. 
-
-In addition, the teachpack re-exports the entire functionality of the
-drawing library; see @secref{draw} for documentation. 
-
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/guess-gui.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/guess-gui.scrbl
deleted file mode 100644
index e81c59d4e2..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/guess-gui.scrbl
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/guess-gui))
-
-@teachpack["guess-gui"]{Guess GUI}
-
-@defmodule[#:require-form beginner-require htdp/guess-gui]
-
-The teachpack provides three functions:
-
-@defproc[(control [index natural-number?]) symbol?]{
- reads out the @racket[index]th guess choice, starting with 0}
-
-@defproc[(view [msg (or/c string? symbol?)]) true/c]{
- displays its @racket[msg] argument in the message panel}
-
-@defproc[(connect [handler (-> button% event% true/c)]) true/c]{
- connects a controller (@racket[handler]) with the Check button displays frame}
-
-Example:
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(connect (lambda (e b)
-           (begin
-             (printf "0th digit: ~s~n" (control 0))
-             (view (control 0)))))
-))
-@;%
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/guess.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/guess.scrbl
deleted file mode 100644
index 91b1a28dd8..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/guess.scrbl
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/guess))
-
-@teachpack["guess"]{Guessing Numbers}
-
-@;declare-exporting[teachpack/htdp/guess]
-@defmodule[#:require-form beginner-require htdp/guess]
-
-The teachpack provides functions to play a guess-the-number game. Each
-function display a GUI in which a player can choose specific values for
-some number of digits and then check the guess. The more advanced
-functions ask students to implement more of the game.
-
-@defproc[(guess-with-gui [check-guess (-> number? number? symbol?)]) true]{
-The @racket[check-guess] function consumes two numbers: @racket[guess], which
-is the user's guess, and @racket[target], which is the randomly
-chosen number-to-be-guessed. The result is a symbol that reflects the
-relationship of the player's guess to the target.}
-
-@defproc[(guess-with-gui-3 [check-guess (-> digit? digit? digit? number? symbol?)]) true]{
-The @racket[check-guess] function consumes three digits (@racket[digit0],
-@racket[digit1], @racket[digit2]) and one number (@racket[target]). The
-latter is the randomly chosen number-to-be-guessed; the three digits are
-the current guess. The result is a symbol that reflects the relationship of
-the player's guess (the digits converted to a number) to the target.
-
-Note: @racket[digit0] is the @emph{least} significant digit that
-the user chose and @racket[digit2] is the @emph{most} significant
-one.}
-
-@defproc[(guess-with-gui-list [check-guess (-> (list-of digit?) number? symbol?)]) true]{
-The @racket[check-guess] function consumes a list of digits
-(@racket[digits]) and a number (@racket[target]). The former is  a list
-that makes up the user's guess, and the latter is the randomly chosen
-number-to-be-guessed. The result is a symbol that reflects the
-relationship of the player's guess (the digits converted to a number) to
-the target.
-
-Note: the first item on @racket[digits] is the @emph{least}
-significant digit that the user chose, and the last one is the
-@emph{most} significant digit.}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/gui.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/gui.scrbl
deleted file mode 100644
index 5e547c8fce..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/gui.scrbl
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/gui))
-
-@teachpack["gui"]{Simple Graphical User Interfaces}
-
-@;declare-exporting[teachpack/htdp/gui]
-@defmodule[#:require-form beginner-require htdp/gui]
-
-The teachpack provides functions for creating and manipulating graphical
-user interfaces. We recommend using @racketmodname[2htdp/universe] instead. 
-
-@deftech{Window} A @tech{Window} is a data representation of a visible
-window on your computer screen.
-
-@deftech{GUI-ITEM} A @tech{GUI-Item} is a data representation of an active
-component of a window on your computer screen.
-
-@defproc[(create-window [g (listof (listof (unsyntax @tech{GUI-ITEM})))])  Window]{
-Creates a window from the ``matrix'' of gui items @racket[g].}
-
-@defproc[(window? [x any/c]) boolean?]{Is the given value a window?}
-
-@defproc[(show-window [w Window]) true]{Shows @racket[w].}
-
-@defproc[(hide-window [w window]) true]{Hides @racket[w].}
-
-@defproc[(make-button [label string>][callback (-> event%  boolean)])  (unsyntax @tech{GUI-ITEM})]{Creates a
-button with @racket[label] and @racket[callback] function. The latter
-receives an argument that it may safely ignore.}
-
-@defproc[(make-message [msg string?]) (unsyntax @tech{GUI-ITEM})]{Creates a message item from @racket[msg].}
-
-@defproc[(draw-message [g (unsyntax @tech{GUI-ITEM})][m string?])  true]{Displays @racket[m]
-in message item @racket[g] and erases the current message.}
-
-@defproc[(make-text [txt string?]) (unsyntax @tech{GUI-ITEM})]{Creates an text editor (with
-label @racket[txt]) that allows users to enter text.}
-
-@defproc[(text-contents [g (unsyntax @tech{GUI-ITEM})])  string?]{
-Determines the current contents of a text @tech{GUI-ITEM}.}
-
-@defproc[(make-choice [choices (listof string?)]) (unsyntax @tech{GUI-ITEM})]{
-Creates a choice menu from @racket[choices] that permits users to choose
-from some alternatives.}
-
-@defproc[(choice-index [g (unsyntax @tech{GUI-ITEM})]) natural-number/c]{Determines the
-choice that is currently selected in a choice @tech{GUI-ITEM}; the result
-is the 0-based index in the choice menu}
-
-Example 1:
-@(begin
-#reader scribble/comment-reader
-(racketblock
-> (define w
-    (create-window
-      (list (list (make-button "QUIT" (lambda (e) (hide-window w)))))))
-;; A button appears on the screen.
-;; Click on the button and it will disappear.
-> (show-window w)
-;; The window disappears. 
-))
-
-Example 2:
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; text1 : GUI-ITEM
-(define text1
-  (make-text "Please enter your name"))
-
-;; msg1 : GUI-ITEM
-(define msg1
-  (make-message (string-append "Hello, World" (make-string 33 #\SPACE))))
-
-;; Event -> true
-;; draws the current contents of text1 into msg1, prepended with "Hello, "
-(define (respond e)
-  (draw-message msg1 (string-append "Hello, " (text-contents text1))))
-
-;; set up window with three "lines":
-;;    a text field, a message, and two buttons
-;; fill in text and click OKAY
-(define w
-  (create-window
-   (list
-    (list text1)
-    (list msg1)
-    (list (make-button "OKAY" respond)
-          (make-button "QUIT" (lambda (e) (hide-window w)))))))
-))
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/hangman-play.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/hangman-play.scrbl
deleted file mode 100644
index 0a98f03a4a..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/hangman-play.scrbl
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/hangman))
-
-@teachpack["hangman-play"]{Playing Hangman}
-
-@defmodule[#:require-form beginner-require htdp/hangman-play]
-
-The teachpack implements the Hangman game so that students can play the
-game and get an understanding of what we expect from them. 
-
-@defproc[(go [name symbol?]) true]{
-chooses a ``secret'' three-letter word, opens a canvas and a menu, 
-and asks the player to guess the word.}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/hangman.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/hangman.scrbl
deleted file mode 100644
index 00732eb0ff..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/hangman.scrbl
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/hangman))
-
-@teachpack["hangman"]{Hangman}
-
-@defmodule[#:require-form beginner-require htdp/hangman]
-
-The teachpack implements the callback functions for playing a
-@emph{Hangman} game, based on a function designed by a student. The player
-guesses a letter and the program responds with an answer that indicates
-how many times, if at all, the letter occurs in the secret word.
-
-@defproc[(hangman [make-word (-> symbol? symbol? symbol? word?)][reveal (-> word? word? word?)][draw-next-part (-> symbol? true)]) true]{
-Chooses a ``secret'' three-letter word and uses the given functions to
-manage the @emph{Hangman} game.}
-
-@defproc[(hangman-list
-	   [reveal-for-list (-> symbol? (list-of symbol?) (list-of symbol?)
-			        (list-of symbol?))]
-	   [draw-next-part (-> symbol? true)]) true]{
-Chooses a ``secret'' word---a list of symbolic letters---and uses the given
-functions to manage the @emph{Hangman} game: 
-@racket[reveal-for-list] determines how many times the chosen letter occurs
-in the secret word; 
-@racket[draw-next-part] is given the symbolic name of a body part and draws
-it on a separately managed canvas.
-}
-
-In addition, the teachpack re-exports the entire functionality of the
-drawing library; see @secref{draw} for documentation. 
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/htdp.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/htdp.scrbl
deleted file mode 100644
index dbba7fce27..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/htdp.scrbl
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label racket))
-
-@title[#:style '(toc) #:tag "htdp"]{HtDP Teachpacks}
-
-@local-table-of-contents[]
-
-@include-section["image.scrbl"]
-@include-section["world.scrbl"]
-
-@include-section["convert.scrbl"]
-@include-section["guess.scrbl"]
-@include-section["master.scrbl"]
-@include-section["master-play.scrbl"]
-@include-section["draw.scrbl"]
-@include-section["hangman.scrbl"]
-@include-section["hangman-play.scrbl"]
-@include-section["arrow.scrbl"]
-@include-section["docs.scrbl"]
-@include-section["dir.scrbl"]
-@include-section["graphing.scrbl"]
-@include-section["gui.scrbl"]
-@include-section["arrow-gui.scrbl"]
-@include-section["elevator.scrbl"]
-@include-section["lkup-gui.scrbl"]
-@include-section["guess-gui.scrbl"]
-@include-section["show-queen.scrbl"]
-
-@include-section["matrix.scrbl"]
-
-@;-- what do those do? --
-
-@;include-section["Simplified Racket Web Servlets"]
-@;include-section["Racket Web Servlets"]
-
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/image.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/image.scrbl
deleted file mode 100644
index 93a6ce371f..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/image.scrbl
+++ /dev/null
@@ -1,319 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket lang/posn teachpack/htdp/image))
-
-@teachpack["image"]{Manipulating Images}
-
-@defmodule[#:require-form beginner-require htdp/image]
-
-@deprecated[@racketmodname[2htdp/image]]{For the foreseeable time, we will
-  continue to support the teachpack for your existing programs.}
-
-The teachpack provides functions for constructing and manipulating
-images. Basic, colored images are created as outlines or solid
-shapes. Additional functions allow for the composition of images.
-
-
-@;-----------------------------------------------------------------------------
-@section{Images}
-
-@defproc[(image? [x any/c]) boolean?]{Is @racket[x] an image?}
-
-@defproc[(image=? [x image?] [y image?]) boolean?]{Are @racket[x] and
-@racket[y] the same image?}
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "modes-colors"]{Modes and Colors}
-
-@deftech{Mode} @racket[(one-of/c 'solid 'outline "solid" "outline")]
-
-A @tech{Mode} is used to specify whether painting a shape fills or
-outlines the form.
-
-@defstruct[color [(red (and/c natural-number/c (<=/c 255)))
-                  (green (and/c natural-number/c (<=/c 255)))
-                  (blue (and/c natural-number/c (<=/c 255)))]]
-
-@deftech{RGB} @racket[color?]
-
-A @tech{RGB} describes a color via a shade of red, blue, and green colors
- (e.g., @racket[(make-color 100 200 30)]).
-
-@deftech{Color} @racket[(or/c symbol? string? color?)] 
-
-A @tech{Color} is a color-symbol (e.g., @racket['blue]) or a color-string
- (e.g., @racket["blue"]) or an @tech{RGB} structure.
-
-@defproc[(image-color? [x any]) boolean?]{ Determines if the input is a
- valid image @tech{Color}.}
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "creational"]{Creating Basic Shapes}
-
-In DrRacket, you can insert images from your file system. Use PNG images
-whenever possible. In addition, you can create basic
-shapes with the following functions.
-
-@defproc[(rectangle [w (and/c number? (or/c zero? positive?))] [h (and/c number? (or/c zero? positive?))] [m (unsyntax @tech{Mode})] [c (unsyntax @tech{Color})]) image?]{
- Creates a @racket[w] by @racket[h] rectangle, filled in according to
- @racket[m] and painted in color @racket[c]}
-
-@defproc[(circle [r (and/c number? (or/c zero? positive?))] [m (unsyntax @tech{Mode})] [c (unsyntax @tech{Color})]) image?]{
- Creates a circle or disk of radius @racket[r], filled in according to
- @racket[m] and painted in color @racket[c]}
-
-@defproc[(ellipse [w (and/c number? (or/c zero? positive?))] [h (and/c number? (or/c zero? positive?))] [m (unsyntax @tech{Mode})] [c (unsyntax @tech{Color})]) image?]{
- Creates a @racket[w] by @racket[h] ellipse, filled in according to
- @racket[m] and painted in color @racket[c]}
-
-@defproc[(triangle [s number?] [m (unsyntax @tech{Mode})] [c (unsyntax @tech{Color})]) image?]{ 
- Creates an upward pointing equilateral
- triangle whose side is @racket[s] pixels long, filled in according to
- @racket[m] and painted in color @racket[c]}
-
-@defproc[(star [n (and/c number? (>=/c 2))]
-               [outer (and/c number? (>=/c 1))]
-               [inner (and/c number? (>=/c 1))]
-               [m (unsyntax @tech{Mode})]
-               [c (unsyntax @tech{Color})]) image?]{
- Creates a multi-pointed star with @racket[n] points, an @racket[outer]
- radius for the max distance of the points to the center, and
- an @racket[inner] radius for the min distance to the center. }
-
-@defproc[(regular-polygon [s side] [r number?] [m (unsyntax @tech{Mode})] [c (unsyntax @tech{Color})] [angle real? 0]) image?]{
-Creates a regular polygon with @racket[s] sides inscribed in
-a circle of radius @racket[r], using mode @racket[m] and
-color @racket[c]. If an angle is specified, the polygon is rotated by that
-angle.
-}
-
-@defproc[(line [x number?][y number?] [c (unsyntax @tech{Color})]) image?]{
- Creates a line colored @racket[c] from (0,0) to @racket[(x,y)].
- See @racket[add-line] below.
-}
-
-@defproc[(text [s string?] [f (and/c number? positive?)] [c (unsyntax @tech{Color})]) Image]{
- Creates an image of the text @racket[s] at point size @racket[f] 
- and painted in color @racket[c].}
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "properties"]{Basic Image Properties}
-
-To understand how images are manipulated, you need to understand the
-basic properties of images. 
-
-@defproc[(image-width [i image?]) integer?]{
- Obtain @racket[i]'s width in pixels}
-
-@defproc[(image-height [i image?]) integer?]{
- Obtain @racket[i]'s height in pixels}
-
-For the composition of images, you must know about @emph{pinholes}. Every
-image come with a pinhole. For images created
-with the above functions, the pinhole is at the center of the shape except
-for those created from @racket[line] and @racket[text].
-The @racket[text] function puts the pinhole at the upper left corner of
-the image, and @racket[line] puts the pinhole at the beginning of the line
-(meaning that if the first two arguments to @racket[line] are positive,
-the pinhole is also in the upper left corner).
-The pinhole can be moved, of course, and compositions
-locate pinholes according to their own rules. When in doubt you can always
-find out where the pinhole is and place it where convenient.
-
-@defproc[(pinhole-x [i image?]) integer?]{Determines the @racket[x]
- coordinate of the pinhole, measuring from the left of the image.}
-
-@defproc[(pinhole-y [i image?]) integer?]{Determines the @racket[y]
- coordinate of the pinhole, measuring from the top (down) of the image.}
-
-@defproc[(put-pinhole [i image?] [x number?] [y number?]) image?]{
- Creates a new image with the pinhole in the location specified by
- @racket[x] and @racket[y], counting from the left and top (down),
- respectively.}
-
-@defproc[(move-pinhole [i image?] [delta-x number?] [delta-y number?]) image?]{
- Creates a new image with the pinhole moved down and right by
- @racket[delta-x] and @racket[delta-y] with respect to its current
- location. Use negative numbers to move it up or left.}
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "composition"]{Composing Images}
-
-Images can be composed, and images can be found within compositions. 
-
-@defproc[(add-line [i image?] 
-                   [x1 number?]
-                   [y1 number?]
-                   [x2 number?]
-                   [y2 number?]
-                   [c (unsyntax @tech{Color})]) image?]{
-Creates an image by adding a line (colored @racket[c]) from 
-(@racket[x1],@racket[y1]) to
-(@racket[x2],@racket[y2])
-to image @racket[i].}
-
-@defproc[(overlay [img image?] [img2 image?] [img* image?] ...) image?]{
-Creates an image by overlaying all images on their pinholes.
-The pinhole of the resulting image is the same place as the pinhole in the
-first image. 
-}
-
-@defproc[(overlay/xy [img image?] [delta-x number?] [delta-y number?] [other image?]) image?]{
-Creates an image by adding the pixels of @racket[other] to
-@racket[img]. 
-
-Instead of lining the two images up on their pinholes,
-@racket[other]'s pinhole is lined up on the point:
-@racketblock[
-(make-posn (+ (pinhole-x img) delta-x)
-           (+ (pinhole-y img) delta-y))
-]
-
-The pinhole of the resulting image is the same
-place as the pinhole in the first image.
-
-The same effect can be had by combining
-@racket[move-pinhole] and @racket[overlay],
-@racketblock[
-(overlay img 
-         (move-pinhole other
-                       (- delta-x)
-                       (- delta-y)))]
-
-}
-
-@defproc[(image-inside? [img image?] [other image?]) boolean?]{
- Determines whether the pixels of the second image appear in the first.
-
-Be careful when using this function with jpeg images. If you use an
-image-editing program to crop a jpeg image and then save it,
-@racket[image-inside?] does not recognize the cropped image, due to
-standard compression applied to JPEG images.}
-
-@defproc[(find-image [img image?] [other image?]) posn?]{
- Determines where the pixels of the second image appear in the first, with
- respect to the pinhole of the first image. If @racket[(image-inside? img
- other)] isn't true, @racket[find-image] signals an error.}
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "manipulation"]{Manipulating Images}
-
-Images can also be shrunk. These ``shrink'' functions trim an image by
-eliminating extraneous pixels. 
-
-@defproc[(shrink-tl [img image?][width number?][height number?]) image?]{
-Shrinks the image to a @racket[width] by @racket[height] image, starting
-from the @emph{top-left} corner. The pinhole of the resulting image is in
-the center of the image.}
-
-@defproc[(shrink-tr [img image?][width number?][height number?]) image?]{
-Shrinks the image to a @racket[width] by @racket[height] image, starting
-from the @emph{top-right} corner. The pinhole of the resulting image is in
-the center of the image.}
-
-@defproc[(shrink-bl [img image?][width number?][height number?]) image?]{
-Shrinks the image to a @racket[width] by @racket[height] image, starting
-from the @emph{bottom-left} corner. The pinhole of the resulting image is in
-the center of the image.}
-
-@defproc[(shrink-br [img image?][width number?][height number?]) image?]{
-Shrinks the image to a @racket[width] by @racket[height] image, starting
-from the @emph{bottom-right} corner. The pinhole of the resulting image is in
-the center of the image.}
-
-@defproc[(shrink [img image?][left number?][above number?][right number?][below number?]) image?]{
-Shrinks an image around its pinhole. The numbers are the pixels to save to
-left, above, to the right, and below the pinhole, respectively. The pixel
-directly on the pinhole is always saved.}
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "scenes"]{Scenes}
-
-A @deftech{scene} is an image, but with the pinhole in the upper-left corner, i.e. 
-an image where @racket[pinhole-x] and @racket[pinhole-y] both return
-@racket[0].
-
-Scenes are particularly useful with the
-@racketmodname[2htdp/universe] and @racketmodname[htdp/world]
-teachpacks, since it displays only @tech{scene}s in its canvas.
-
-@defproc[(scene? [x any/c]) boolean?]{Is @racket[x] an scene?}
-
-@defproc[(empty-scene [width natural-number/c]
-                      [height natural-number/c])
-         scene?]{
- creates a plain white, @racket[width] x @racket[height] @tech{scene}.}
-
-@defproc[(place-image [img image?] [x number?] [y number?]
-                      [s scene?])
-         scene?]{
- creates a scene by placing @racket[img] at
- @math{(@racket[x], @racket[y])} into @racket[s];
- @math{(@racket[x], @racket[y])} are computer graphics coordinates,
- i.e., they count right and down from the upper-left corner.}
-
-
-@defproc[(nw:rectangle [width natural-number/c] [height natural-number/c] [solid-or-outline Mode] [c Color]) image?]{
-   creates a @racket[width] by @racket[height] rectangle, solid or outlined as specified by
-   @racket[solid-or-outline] and colored according to @racket[c], with a pinhole at the upper left
-   corner.}
-   
-@defproc[(scene+line [s scene?][x0 number?][y0 number?][x1 number?][y1 number?][c Color]) scene?]{
-   creates a scene by placing a line of color @racket[c] from
-   @math{(@racket[x0], @racket[y0])} to @math{(@racket[x1],
-   @racket[y1])} using computer graphics coordinates.  In contrast to
-   the @racket[add-line] function, @racket[scene+line] cuts off those
-   portions of the line that go beyond the boundaries of the given
-   @racket[s].}
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "pixel-lists"]{Miscellaneous Image Manipulation and Creation}
- 
-The last group of functions extracts the constituent colors from an image
-and converts a list of colors into an image.
-
-@defthing[List-of-color list?]{is one of:}
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; -- @racket[empty]
-;; -- @racket[(cons @#,tech{Color} List-of-color)]
-;; Interpretation: represents a list of colors.
-))
-
-@defproc[(image->color-list [img image?]) List-of-color]{
- Converts an image to a list of colors.}
-
-@defproc[(color-list->image [l List-of-color]
-           [width natural-number/c]
-           [height natural-number/c]
-           [x natural-number/c]
-           [y natural-number/c]) image?]{
- Converts a list of colors @racket[l] to an image with the given
- @racket[width] and @racket[height] and pinhole (@racket[x],@racket[y])
- coordinates, specified with respect to the top-left of the image.}
-
-The remaining functions provide alpha-channel information as well. Alpha
-channels are a measure of transparency; 0 indicates fully opaque and 255
-indicates fully transparent.
-
-
-@defstruct[alpha-color [(alpha (and/c natural-number/c (<=/c 255)))
-                        (red (and/c natural-number/c (<=/c 255)))
-                        (green (and/c natural-number/c (<=/c 255)))
-                        (blue (and/c natural-number/c (<=/c 255)))]]{
-  A structure representing an alpha color.}
-
-@defproc[(image->alpha-color-list [img image?]) (list-of alpha-color?)]{
- to convert an image to a list of alpha colors}
-
- @defproc[(alpha-color-list->image
-            [l (list-of alpha-color?)]
-            [width integer?]
-            [height integer?]
-            [x integer?]
-            [y integer?]) image?]{
- Converts a list of @racket[alpha-color]s @racket[l] to an image with the given
- @racket[width] and @racket[height] and pinhole (@racket[x],@racket[y])
- coordinates, specified with respect to the top-left of the image.}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/lkup-gui.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/lkup-gui.scrbl
deleted file mode 100644
index 70c58b5650..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/lkup-gui.scrbl
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt" (for-label racket teachpack/htdp/lkup-gui))
-
-@teachpack["lkup-gui"]{Lookup GUI}
-
-@defmodule[#:require-form beginner-require htdp/lkup-gui]
-
-The teachpack provides three functions:
-
-@defproc[(control [index natural-number?]) symbol?]{
- reads out the @racket[index]th guess choice, starting with 0}
-
-@defproc[(view [msg (or/c string? symbol?)]) true/c]{
- displays its @racket[msg] argument in the message panel}
-
-@defproc[(connect [event-handler (-> button% event% true/c)]) true/c]{
- connects a controller (@racket[handler]) with the Check button displays frame}
-
-Example:
-@;%
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(connect
- (lambda (e b)
-   (view (control))))
-))
-@;%
-This example simply mirrors what the user types in to the message field.
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/master-play.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/master-play.scrbl
deleted file mode 100644
index dd1d0c6300..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/master-play.scrbl
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt" (for-label racket teachpack/htdp/master))
-
-@teachpack["master-play"]{Playing MasterMind}
-
-@defmodule[#:require-form beginner-require htdp/master-play]
-
-The teachpack implements the MasterMind game so that students can play the
-game and get an understanding of what we expect from them. 
-
-@defproc[(go [name symbol?]) true]{
-chooses a ``secret'' three-letter word, opens a canvas and a menu, 
-and asks the player to guess the word.}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/master.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/master.scrbl
deleted file mode 100644
index 8d7db94e0e..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/master.scrbl
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/master))
-
-@teachpack["master"]{MasterMinding}
-
-@;declare-exporting[teachpack/htdp/master]
-@defmodule[#:require-form beginner-require htdp/master]
-
-The teachpack implements GUI for playing a simple master mind-like game,
-based on a function designed by a student. The player clicks on two colors
-and the program responds with an answer that indicates how many colors and
-places were correct.
-
-@defproc[(master [check-guess (-> symbol? symbol? symbol? symbol? boolean?)]) symbol?]{
-Chooses two ``secret'' colors and then opens a graphical user interface for
-playing @emph{MasterMind}. The player is prompted to choose two colors, via
-a choice tablet and mouse clicks. Once chosen, @racket[master] uses
-@racket[check-guess] to compare them. 
-
-If the two guesses completely match the two secret colors,
-@racket[check-guess] must return @racket['PerfectGuess]; otherwise it must
-return a different, informative symbol.}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/matrix.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/matrix.scrbl
deleted file mode 100644
index 31fa45a125..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/matrix.scrbl
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label scheme teachpack/htdp/matrix htdp/matrix lang/posn))
-
-@teachpack["matrix"]{Matrix Functions}
-
-@;declare-exporting[teachpack/htdp/matrix]
-@defmodule[#:require-form beginner-require htdp/matrix]
-
-The experimental teachpack supports matrices and matrix functions. A
-matrix is just a rectangle of 'objects'. It is displayed as an image, just
-like the images from @secref["image"]. Matrices are images and, indeed,
-scenes in the sense of the @secref["world"]. 
-
-@emph{No educational materials involving matrices exist.}
-
-The functions access a matrix in the usual (school-mathematics) manner:
-row first, column second. 
-
-The functions aren't tuned for efficiency so don't expect to build
-programs that process lots of data. 
-
-@deftech{Rectangle} 
-A Rectangle (of X) is a non-empty list of lists containing X where all
-elements of the list are lists of equal (non-zero) length.
-
-@defproc[(matrix? [o any/c]) boolean?]{
-determines whether the given object is a matrix?}
-
-@defproc[(matrix-rows [m matrix?]) natural-number/c]{
-determines how many rows this matrix @racket[m] has} 
-
-@defproc[(matrix-cols [m matrix?]) natural-number/c]{
-determines ow many columns this matrix @racket[m] has} 
-
-@defproc[(rectangle->matrix [r (unsyntax @tech{Rectangle})]) matrix?]{
-creates a matrix from the given @tech{Rectangle}}
-
-@defproc[(matrix->rectangle [m matrix?]) (unsyntax @tech{Rectangle})]{
-creates a rectangle from this matrix @racket[m]}
-
-@defproc[(make-matrix [n natural-number/c][m natural-number/c][l (Listof X)]) matrix?]{
-creates an @racket[n] by @racket[m] matrix from @racket[l] 
-
-NOTE: @racket[make-matrix] would consume an optional number of entries, if
-it were like @racket[make-vector]}
-
-@defproc[(build-matrix 
-  [n natural-number/c][m natural-number/c]
-  [f (-> (and/c natural-number/c (</c m)) 
-	 (and/c natural-number/c (</c n))
-	 any/c)])
- matrix?]{
-creates an @racket[n] by @racket[m] matrix by applying @racket[f] to @racket[(0,0)],
-@racket[(0,1)], ..., (@racket[(sub1 m),(sub1 n)])}
-
-@defproc[(matrix-ref [m matrix?][i (and/c natural-number/c (</c (matrix-rows m)))][j (and/c natural-number/c (</c (matrix-rows m)))]) any/c]{
-retrieve the item at (@racket[i],@racket[j]) in matrix @racket[m]}
-
-@defproc[(matrix-set [m matrix?][i (and/c natural-number/c (</c (matrix-rows m)))][j (and/c natural-number/c (</c (matrix-rows m)))] 
-		     [x any/c]) 
-         matrix?]{
-creates a new matrix with @racket[x] at (@racket[i],@racket[j]) and all
-other places the same as in @racket[m]}
-
-@defproc[(matrix-where? [m matrix?] [pred? (-> any/c boolean?)]) (listof posn?)]{
-@racket[(matrix-where? M P)] produces a list of @racket[(make-posn i j)]
-such that @racket[(P (matrix-ref M i j))] holds}
-
-@defproc[(matrix-render [m matrix?]) (unsyntax @tech{Rectangle})]{
-renders this matrix @racket[m] as a rectangle of strings}
-
-@defproc[(matrix-minor [m matrix?][i (and/c natural-number/c (</c (matrix-rows m)))][j (and/c natural-number/c (</c (matrix-rows m)))]) 
-          matrix?]{ 
-creates a matrix minor from @racket[m] at (@racket[i],@racket[j])}
-
-@;defproc[(matrix-set! [m matrix?][i (and/c natural-number/c (</c (matrix-rows m)))][j (and/c natural-number/c (</c (matrix-rows m)))] [x any/c]) matrix?]{like @racket[matrix-set] but uses a destructive update}
-
-@; -----------------------------------------------------------------------------
-
-@section{Matrix Snip}
-
-@(require (for-label (only-in mrlib/cache-image-snip cache-image-snip%)))
-
-@;defmodule[htdp/matrix]
-
-The @racket[htdp/matrix] teachpack exports the @racket[snip-class] object to
-support saving and reading matrix snips. 
-
-@defthing[snip-class (instance/of matrix-snip-class%)]{An object to support 2D matrix rendering.}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/servlet.thtml b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/servlet.thtml
deleted file mode 100644
index 84c43151ea..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/servlet.thtml
+++ /dev/null
@@ -1,136 +0,0 @@
-{ (define LIBNAME "Racket Web Servlets")
-  (include "head.tinc") }
-
-<p>The teachpack <code>servlet.ss</code> provides structures and
-functions for building Web servlets in Racket. The data definitions
-represent HTTP requests and Web page responses using these two structures:</p>
-
-<pre>
- <code>
-  (define-struct request (method uri headers bindings host-ip client-ip))
-
-  (define-struct response/full (code message seconds mime extras body))
- </code>
-</pre>
-
-constrained as follows:
-
-<pre>
-  Env      = (listof (cons Symbol String))
-  Request  = (make-request (union 'get 'post) URL Env Env String String)
-    ;; (search for "net" in Help Desk)
-  Response =
-   (union
-     X-expression ;; represent XHTML (search for "XML" in help-desk)
-     (cons String (listof String))
-       ;; where the first string is the mime type from RFC 2822, often
-       ;; "text/html", and the rest of the strings provide the document's
-       ;; content.
-     (make-response/full N String N String Env (listof String))
-       ;; where the fields are interpreted as follows:
-       ;;   code indicates the HTTP response code.
-       ;;   message describes the code in human language.
-       ;;   seconds indicates the origination time of the
-       ;;   response. Use (current-seconds) for dynamically created responses.
-       ;;   mime indicates the response type.
-       ;;   extras is an environment with extra headers for redirects, authentication, or cookies.
-       ;;   body is the message body.
-  Suspender = String -> Response
-</pre>
-
-<p>The following functions empower servlets to interact with a Web browser:
-
-<ul>
-  <li><code>{(idx build-suspender)} :
-         (listof X-expr[HTML]) (listof X-expr[HTML]) [Env] [Env] -> Suspender</code>
-    <br>builds a suspender from lists of X-expressions for the head and the
-    body of a Web page. The body is put into a form context. The function
-    optionally consumes attributes for the <code>head</code> and
-    <code>body</code> tags of the constructed page.
-
-  <li><code>{(idx send/suspend)} : Suspender -> Request</code> <br />
-  sends the suspender's page to the browser and waits for the browser's request.
-
-  <li><code>{(idx send/finish)} : Response -> Void</code> <br />
-  sends the response to the browser and terminates the servlet (and the
-  REPL, when used inside of DrRacket).
-
-  <li><code>{(idx initial-request)} : Request</code> <br /> a fictitious request
-  that looks like a browser initially requested the servlet's URL.
-
-  <li><code>{(idx extract-binding/single)} : Symbol Env -> string</code><br>
-  consumes the symbol of an HTML form field and a bindings environment.  It
-  returns the only value associated with the given symbol.  It raises an
-  exception when zero or more than one input is provided for a single symbol.
-
-  <li><code>{(idx extract-bindings)} : Symbol Env -> (listof String)</code>
-  <br /> consumes a symbol and a bindings environment.  It produces all the
-  values associated with that symbol.
-
-  <li><code>{(idx extract-string)} : String Env -> (listof String)</code>
-  <br /> consumes a string and a bindings environment.  It produces all the
-  values associated with that string.
-
-  <li><code>{(idx exists-binding?)} : Symbol Env -> Boolean</code> <br>
-  consumes a symbol and a bindings environment.  It produces true when the
-  symbol is bound.  This is useful for checkboxes.
-
-  <li><code>{(idx extract-user-pass)} : Env -> (union false (cons string string))</code>
-  <br>extracts the username and the password from the HTTP headers environment,
-  if provided.
-  Servlets may use this function to implement password based
-  authentication.
-</ul>
-
-<p>Here is a sample script that permits consumers to login to a site:
-
-<pre>
-; Request -> Request
-(define (get-login-information request0)
-  (let* ([bindings (request-bindings request0)]
-         [name (extract-bindings 'Name bindings)]
-         [form '((input ([type "text"][name "Name"][value "<Last Name>"]))
-                 (br)
-                 (input ([type "password"][name "Passwd"]))
-                 (br)
-                 (input ([type "submit"][value "Login"])))])
-    (if (null? name)
-        (send/suspend
-         (build-suspender
-          '("Login")
-          form))
-        (send/suspend
-         (build-suspender
-          '("Repeat Login")
-          `(("Dear "
-             ,(car name)
-             " your username didn't match your password. Please try again."
-             (br))
-            ,@form))))))
-
-; Request -> Void
-(define (check-login-information request)
-  (let* ([bindings (request-bindings request)]
-         [name     (extract-binding/single 'Name bindings)]
-         [passwd   (extract-binding/single 'Passwd bindings)])
-    (if (and (string=? "Paul" name) (string=? "Portland" passwd))
-        request
-        (check-login-information (get-login-information request)))))
-
-; Request -> Void
-(define (welcome request)
-  (let ([bindings (request-bindings request)])
-    (send/finish
-     `(html
-       ,(extract-binding/single 'Name bindings)
-       " Thanks for using our service."
-       " We're glad you recalled that your password is "
-       ,(extract-binding/single 'Passwd bindings)))))
-
-; Run:
-(welcome
- (check-login-information
-  (get-login-information initial-request)))
-</pre>
-
-{(include "foot.tinc")}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/servlet2.thtml b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/servlet2.thtml
deleted file mode 100644
index 779dce3872..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/servlet2.thtml
+++ /dev/null
@@ -1,214 +0,0 @@
-{ (define LIBNAME "Simplified Racket Web Servlets")
-  (include "head.tinc") }
-
-<p>This teachpack provides a simplified API for Racket servlets. The
-teachpack does not require any understanding of HTML and higher-order
-functions. It uses structures and lists, and is therefore well-suited for
-use with an HtDP course.
-
-<hr>
-<h3>Interface</h3>
-
-<pre>
-   ; Data Constructors  -------------------------------------------------------
-   {(idx make-password)} ; asking for a password
-   {(idx make-number)}   ; asking for a number
-   {(idx make-yes-no)}   ; asking for a Yes-No style answer
-   {(idx make-boolean)}  ; asking for a true-false style answer
-   {(idx make-radio)}    ; requesting one choice from some mutually exclusive choices
-
-   #| Data Definitions --------------------------------------------------------
-
-   Forms ----------------------------------------------------------------------
-   Query    = (union String
-                (make-password String)
-                (make-number   String)
-                (make-boolean  String)
-                (make-yes-no   String String String)
-                (make-radio    String (cons String (listof String))))
-   FormItem = (list Symbol Query)
-   Form     = (cons FormItem (listof FormItem))
-
-   Table -------------------------------------------------------------------
-   Response = (union String Number Boolean)
-   Table    = (listof (list Symbol Response))
-   |#
-
-   ; Functions ----------------------------------------------------------------
-
-   {(idx form?)}               ; TST -> Boolean
-   ; checking the structure of forms
-
-   {(idx form-element?)}       ; TST -> Boolean
-   ; checking the structure of form-elements
-
-   {(idx single-query)}        ; Query -> Response
-   ; posing a single question
-
-   {(idx queries)}             ; (listof Query) -> (listof Response)
-   ; posing a list of questions
-
-   {(idx echo-answers)}        ; (listof Response) -> true
-   ; echoing the answers from a list of questions to a Web page (development)
-
-   {(idx form-query)}          ; Form -> Table
-   ; posing a list of questions with tag
-
-   {(idx extract/single)}      ; Symbol Table -> Response
-   ; extracting the answer for a given tag from a response; the tag must
-   ; occur exactly once.
-
-   {(idx extract)}             ; Symbol Table -> (listof Response)
-   ; extracting all the answers for a given tag from a response; the list
-   ; is empty if there is no such tag.
-
-   {(idx echo-response)}       ; Table -> true
-   ; echoing the response from a form to a Web page (development)
-
-   {(idx inform)}              ; String String *-> true
-   ; posting some information on a Web page, wait for continue signal
-
-   {(idx final-page)}          ; String String *-> true
-   ; posting some information on a Web page,
-   ; killing the script and all associated backtrack/clone points
-
-</pre>
-<hr>
-<h3>Pragmatics</h3>
-
-<p>The following table specifies what kind of answer each form of query
-produces:
-
-<pre>
-  Query                                      GUI Item         Response
-________________________________________________________________________________
-  String                                     text field       String
-  (make-password String)                     password field   String
-  (make-number   String)                     text field       Number
-  (make-boolean  String)                     check box        Boolean
-  (make-yes-no   String String1 String2)     2-pronged radio  String1 or String2
-  (make-radio    String loString)            radio button     one of loString
-  (make-button   String0)                    submit button    String0
-</pre>
-
-<p>The functions play the following role:
-<ul>
-<li>
-   <code>form?</code> and <code>form-element?</code> enable programmers to
-   check the well-formedness of their queries.
-
-<li>
-   <code>single-query</code> poses a question and waits for a answer from
-   the consumer.
-
-<li>
-   <code>queries</code> poses a list of questions and waits for the
-   submission of answers; it produces a list of answers that is as
-   long as the list of given questions.
-
-<li>
-   <code>echo-answers</code> echoes a list of answers to a Web page; this
-   function is useful for testing Web form designs.
-
-<li>
-   <code>form-query</code> poses a form with queries and waits for the
-   submission of answers; it produces a list of tagged or labeled answers
-   that is as long as the list of given questions.
-
-<li>
-   <code>echo-response</code> echoes a response to a Web page as a table.
-
-<li>
-   <code>inform</code> posts some information on a Web page and wait for a
-   continue signal (a link) from the consumer; the first string plays the
-   role of a title and the rest form a paragraph.
-
-<li>
-   <code>final-page</code> posts some information on a Web page and
-   shuts down the script and all associated backtrack/clone points.
-</ul>
-
-
-<h3>Example</h3>
-
-<p>The following example illustrates how the library enables programs to
-interact with the consumer. In particular, note the properly recursive
-calls to <code>login</code> in <code>inform-error</code>. Also note how the
-functions <code>make-password</code> and <code>make-number</code> return
-strings and numbers, respectively.
-
-<pre>
-#| Login Site -----------------------------------------------------------------
-   Author: Matthias Felleisen
-   Language: Intermediate
-   Teachpack: servlet2.ss
-
-   Login Web Site:
-
-   A login site consists of three pages:
-    1. login: request user information: name, password, year-of-birth
-       - if correct, respond with greeting for name
-       - if incorrect, go to error page
-    2. error: inform user of error, continue goes back to login page
-    3. greetings: say hello to name
-   The second and third are generated from user input, the first is
-   generated by the program alone.
-
-|#
-
-;; Login Page -----------------------------------------------------------------
-
-; ask three questions: one plain, one password, one numeric
-(define login-page
-  (list
-   (list 'name "User Name")
-   (list 'pass (make-password "Password"))
-   (list 'yofb (make-number "Year-of-birth"))))
-
-; Table -> true
-; process the response for login-page
-(define (login r)
-  (let ([name (extract/single 'name r)])
-    (if (string=? (lookup-password name) (extract/single 'pass r))
-        (if (= (lookup-yofb name) (extract/single 'yofb r))
-            (greetings name)
-            (inform-error "bad data"))
-        (inform-error "bad match"))))
-
-; String -> (union false String)
-; lookup the password for name in DB
-(define (lookup-password name)
-  (local ([define (x=? x) (string=? name x)]
-          [define r (assf x=? DB)])
-    (if (boolean? r) false (second r))))
-
-; String -> (union false Number)
-; lookup the year-of-birth for name in DB
-(define (lookup-yofb name)
-  (local ([define (x=? x) (string=? name x)]
-          [define r (assf x=? DB)])
-    (if (boolean? r) false (third r))))
-
-(define DB
-  '(("matthias" "okay" 1958)))
-
-;; Error Page -----------------------------------------------------------------
-
-; String -> true
-; consume error message, print and enable return to login page
-(define (inform-error s)
-  (let ([_ (inform "Error" s)])
-    (login (form-query login-page))))
-
-;; Greetings Page -------------------------------------------------------------
-
-; String -> true
-; consume name and display good bye message
-(define (greetings name)
-  (inform "Welcome" "Welcome " name " and good bye."))
-
-;; Run ------------------------------------------------------------------------
-(login (form-query login-page))
-</pre>
-
-{(include "foot.tinc")}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/shared.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/shared.rkt
deleted file mode 100644
index dd788cd6f6..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/shared.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-
-(require scribble/manual 
-         scribble/core
-         scribble/html-properties)
-
-(provide teachpack
-         beginner-require)
-
-(define (teachpack #:svg? [svg? #f] tp . name)
-  (apply title #:tag tp
-         #:style (if svg? 
-                     (style #f (list (render-convertible-as '(svg-bytes png-bytes))))
-                     #f)
-         `(,@name ": " ,(filepath (format "~a.rkt" tp))
-           ,(index (format "~a teachpack" tp)))))
-
-(define-syntax-rule (def-req beg-require)
-  (begin
-    (require (for-label lang/htdp-beginner))
-    (define beg-require (racket require))))
-(def-req beginner-require)
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/show-queen.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/show-queen.scrbl
deleted file mode 100644
index c7ec1e0914..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/show-queen.scrbl
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual "shared.rkt"
-          (for-label racket teachpack/htdp/show-queen))
-
-@teachpack["show-queen"]{Queens}
-
-@;declare-exporting[teachpack/htdp/show-queen]
-@defmodule[#:require-form beginner-require htdp/show-queen]
-
-The teachpack provides the function @racket[show-queen], which implements
-a GUI for exploring the n-queens problem.
-
-@defproc[(show-queen [board (list-of (list-of boolean?))]) true]{The
-function @racket[show-queen] consumes a list of 
-lists of booleans that describes a @racket[board]. Each of the inner
-lists must have the same length as the outer list. The
-@racket[true]s correspond to positions where queens are,
-and the @racket[false]s correspond to empty squares. The
-function returns nothing.
-
-In the GUI window that @racket[show-queen] opens, the
-red and orange dots show where the queens are. The green dot
-shows where the mouse cursor is. Each queen that threatens
-the green spot is shown in red, and the queens that do not
-threaten the green spot are shown in orange.}
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/world.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/world.scrbl
deleted file mode 100644
index ad8e05f94f..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/world.scrbl
+++ /dev/null
@@ -1,479 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (only-in scribble/core make-nested-flow make-style)
-          "shared.rkt"
-	  scribble/struct
-          (for-label racket
-                     teachpack/htdp/image
-                     teachpack/htdp/world))
-
-@teachpack["world"]{Simulations and Animations}
-
-@defmodule[#:require-form beginner-require htdp/world #:use-sources (htdp/image)]
-
-@deprecated[@racketmodname[2htdp/universe]]{
-  For guidance on how to convert your @racketmodname[htdp/world] programs
-  to use @racketmodname[2htdp/universe], see @secref[#:tag-prefixes '("2htdp")]{htdp-port}}
-
-@emph{Note}: For a quick and educational introduction to the teachpack, see
-@link["http://www.ccs.neu.edu/home/matthias/HtDP/Prologue/book.html"]{How
-to Design Programs, Second Edition: Prologue}. As of August 2008, we also
-have a series of projects available as a small booklet on
-@link["http://world.cs.brown.edu/"]{How to Design Worlds}. 
-
-The purpose of this documentation is to give experienced Racketers a concise
-overview for using the library and for incorporating it elsewhere. The last
-section presents @secref["example"] for an extremely simple domain and is
-suited for a novice who knows how to design conditional functions for
-symbols. 
-
-The teachpack provides two sets of tools. The first allows students to
-create and display a series of animated scenes, i.e., a simulation. The
-second one generalizes the first by adding interactive GUI features. 
-
-@; -----------------------------------------------------------------------------
-@section[#:tag "simulations"]{Simple Simulations}
-
-@defproc[(run-movie [r (and/c real? positive?)] [m [Listof image?]]) 
-         true]{
-
- @racket[run-movie] displays the list of images @racket[m] at the rate of
- @racket[r] images per second.}
-
-@defproc[(run-simulation
-           [w natural-number/c]
-           [h natural-number/c]
-           [r number?]
-           [create-image (-> natural-number/c scene)])
-         true]{
-   creates and shows a canvas of width @racket[w] and height @racket[h] , 
-   starts a clock, making it tick every @racket[r] (usually fractional)
-   seconds. Every time the clock ticks, @racket[run-simulation] applies @racket[create-image] to
-   the number of ticks passed since this function call. The results of
-   these applications are displayed in the canvas.
-}
-
-Example:
-@racketblock[
-(define (create-UFO-scene height)
-  (place-image UFO 50 height (empty-scene 100 100)))
-
-(define UFO
-  (overlay (circle 10 'solid 'green)
-           (rectangle 40 4 'solid 'green)))
-
-(run-simulation 100 100 (/ 1 28) create-UFO-scene)
-]
-
-@;-----------------------------------------------------------------------------
-@section[#:tag "interactive"]{Interactions}
-
-An animation starts from a given ``world'' and generates new ones in
- response to events on the computer. This teachpack keeps track of the
- ``current world'' and recognizes three kinds of events: clock ticks;
- keyboard presses and releases; and mouse movements, mouse clicks,
- etc.
-
-Your program may deal with such events via the @emph{installation} of
- @emph{handlers}.  The teachpack provides for the installation of three
- event handlers: @racket[on-tick-event], @racket[on-key-event], and
- @racket[on-mouse-event]. In addition, it provides for the installation of
- a @racket[draw] handler, which is called every time your program should
- visualize the current world.
-
-The following picture provides an intuitive overview of the workings of
- "world".
-
-@image["world.png"]
-
- The @racket[big-bang] function installs @emph{World_0} as the initial
- world; the callbacks @emph{tock}, @emph{react}, and @emph{click} transform
- one world into another one; @emph{done} checks each time whether the world
- is final; and @emph{draw} renders each world as a scene. 
-
-@deftech{World} @racket[any/c]
-
- For animated worlds and games, using the teachpack requires that you
- provide a data definition for @tech{World}. In principle, there are no
- constraints on this data definition. You can even keep it implicit, even
- if this violates the Design Recipe.
-
-@defproc*[(
-[(big-bang [width natural-number/c] [height natural-number/c] [r number?] [world0 (unsyntax @tech{World})]) true]
-[(big-bang [width natural-number/c] [height natural-number/c] [r number?] [world0 (unsyntax @tech{World})][animated-gif? boolean?]) true]
-)]{
-   Creates and displays a @racket[width] x @racket[height] canvas,
-   starts the clock, 
-   makes it tick every @racket[r] seconds, 
-   and makes @racket[world0] the current world. 
-   If it is called with five instead of four arguments and the last one
-   (@racket[animated-gif?]) is @racket[true], the teachpack allows the
-   generation of images from the animation, including an animated GIF image. }
-
-@defproc[(on-tick-event [tock (-> (unsyntax @tech{World}) (unsyntax @tech{World}))]) true]{
-   Tells @racket[big-bang] to call @racket[tock] on the current world every time the
-   clock ticks. The result of the call becomes the current world.} 
-
-@deftech{KeyEvent} @racket[(or/c char? symbol?)]
-
-A @tech{KeyEvent} represents key board events, e.g., keys pressed or
-   released, by the computer's user. A @racket[char?] @tech{KeyEvent} is
-   used to signal that the user has hit an alphanumeric key. Symbols such
-   as @racket['left], @racket['right], @racket['up], @racket['down],
-   @racket['release] denote arrow keys or special events, such as releasing
-   the key on the keypad.
-
-@defproc[(key-event? [x any]) boolean?]{
-   is @racket[x] a @tech{KeyEvent}}
-
-@defproc[(key=? [x key-event?][y key-event?]) boolean?]{
-   compares two @tech{KeyEvent} for equality}
-
-@defproc[(on-key-event [change (-> (unsyntax @tech{World}) key-event? (unsyntax @tech{World}))]) true]{
-   Tells @racket[big-bang] to call @racket[change] on the current world and a 
-   @tech{KeyEvent} for every keystroke the user of the computer makes. The result
-   of the call becomes the current world.
-
-   Here is a typical key-event handler: 
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(define (change w a-key-event)
-  (cond
-    [(key=? a-key-event 'left)  (world-go w -DELTA)]
-    [(key=? a-key-event 'right) (world-go w +DELTA)]
-    [(char? a-key-event) w] ;; to demonstrate order-free checking 
-    [(key=? a-key-event 'up)    (world-go w -DELTA)]
-    [(key=? a-key-event 'down)  (world-go w +DELTA)]
-    [else w]))
-))
-
-}
-
-@deftech{MouseEvent} @racket[(one-of/c 'button-down 'button-up 'drag 'move 'enter 'leave)]
- 
- A @tech{MouseEvent} represents mouse events, e.g., mouse movements or mouse clicks, by the
-   computer's user. 
-
-@defproc[(on-mouse-event [clack (-> (unsyntax @tech{World}) natural-number/c natural-number/c (unsyntax @tech{MouseEvent}) (unsyntax @tech{World}))]) true]{
-   Tells @racket[big-bang] to call @racket[clack] on the current world, the current
-   @racket[x] and @racket[y] coordinates of the mouse, and a
-   @tech{MouseEvent} for every action of the mouse by the user of the
-   computer. The result of the call becomes the current world.}
-
-@defproc[(on-redraw [to-scene (-> (unsyntax @tech{World}) (unsyntax @tech{Scene}))]) true]{ Tells @racket[big-bang] to call @racket[to-scene]
-   whenever the canvas must be redrawn. The canvas is usually re-drawn after a tick event, a keyboard
-   event, or a mouse event has occurred.  The generated scene is  displayed in the world's canvas.}
-
-@defproc[(stop-when [last-world? (-> (unsyntax @tech{World}) boolean?)]) true]{
-   Tells @racket[big-bang] to call @racket[last-world?] whenever the canvas is
-   drawn. If this call produces @racket[true], the clock is stopped; no more
-   tick events, @tech{KeyEvent}s, or @tech{MouseEvent}s are forwarded to
-   the respective handlers. As a result, the canvas isn't updated either.} 
-
-Example: The following examples shows that @racket[(run-simulation 100 100
-(/ 1 28) create-UFO-scene)] is a short-hand for three lines of code:
-@racketblock[
-(define (create-UFO-scene height)
-  (place-image UFO 50 height (empty-scene 100 100)))
-
-(define UFO
-  (overlay (circle 10 'solid 'green)
-           (rectangle 40 4 'solid 'green)))
-
-(big-bang 100 100 (/1 28) 0)
-(on-tick-event add1)
-(on-redraw create-UFO-scene)
-]
-Exercise: Add a condition for stopping the flight of the UFO when it
-reaches the bottom. 
-
-@; -----------------------------------------------------------------------------
-
-@(define (table* . stuff)
-   ;; (list paragraph paragraph) *-> Table
-   (define (flow* x) (make-flow (list x)))
-   (make-blockquote #f
-    (list
-     (make-table (make-with-attributes 'boxed '((cellspacing . "6")))
-                 ;; list
-                 (map (lambda (x) (map flow* x)) stuff)
-                 #;(map flow* (map car stuff))
-                 #;(map flow* (map cadr stuff))))))
-
-@; -----------------------------------------------------------------------------
-@section[#:tag "example"]{A First Example} 
-
-
-@subsection{Understanding a Door}
-
-Say we want to represent a door with an automatic door closer. If this kind
- of door is locked, you can unlock it. While this doesn't open the door per
- se, it is now possible to do so. That is, an unlocked door is closed and
- pushing at the door opens it. Once you have passed through the door and
- you let go, the automatic door closer takes over and closes the door
- again. Of course, at this point you could lock it again. 
-
-Here is a picture that translates our words into a graphical
- representation: 
-
-@image["door-real.png"]
-
-The picture displays a so-called "state machine". The three circled words
- are the states that our informal description of the door identified:
- locked, closed (and unlocked), and open. The arrows specify how the door
- can go from one state into another. For example, when the door is open,
- the automatic door closer shuts the door as time passes. This transition
- is indicated by the arrow labeled "time passes." The other arrows
- represent transitions in a similar manner: 
-
-@itemize[
-
-@item{"push" means a person pushes the door open (and let's go);}
-
-@item{"lock" refers to the act of inserting a key into the lock and turning
-it to the locked position; and}
-
-@item{"unlock" is the opposite of "lock".}
-
-]
-
-@; -----------------------------------------------------------------------------
-@subsection{Simulations of the World}
-
-Simulating any dynamic behavior via a program demands two different
- activities. First, we must tease out those portions of our "world" that
- change over time or in reaction to actions, and we must develop a data
- representation @deftech{D} for this information.  Keep in mind that a good data
- definition makes it easy for readers to map data to information in the
- real world and vice versa. For all others aspects of the world, we use
- global constants, including graphical or visual constants that are used in
- conjunction with the rendering functions.
-
-Second, we must translate the "world" actions---the arrows in the above
- diagram---into interactions with the computer that the world teachpack can
- deal with. Once we have decided to use the passing of time for one aspect
- and mouse movements for another, we must develop functions that map the
- current state of the world---represented as data---into the next state of
- the world. Since the data definition @tech{D} describes the class of data
- that represents the world, these functions have the following general
- contract and purpose statements: 
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; tick : @tech{D} -> @tech{D}
-;; deal with the passing of time 
-(define (tick w) ...)
-
-;; click : @tech{D} @racket[Number] @racket[Number] @tech{MouseEvent} -> @tech{D}
-;; deal with a mouse click at (x,y) of kind @racket[me]
-;; in the current world @racket[w]
-(define (click w x y me) ...)
-
-;; control : @tech{D} @tech{KeyEvent} -> @tech{D}
-;; deal with a key event (symbol, char) @racket[ke] 
-;; in the current world @racket[w]
-(define (control w ke) ...)
-))
-
-That is, the contracts of the various hooks dictate what the contracts of
-these functions are once we have defined how to represent the world in
-data. 
-
-A typical program does not use all three of these actions and functions but
- often just one or two. Furthermore, the design of these functions provides
- only the top-level, initial design goal. It often demands the design of
- many auxiliary functions.
-
-@; -----------------------------------------------------------------------------
-@subsection{Simulating a Door: Data}
-
-Our first and immediate goal is to represent the world as data. In this
- specific example, the world consists of our door and what changes about
- the door is whether it is locked, unlocked but closed, or open. We use
- three symbols to represent the three states:
-
-@deftech{SD}
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; DATA DEF.
-;; The state of the door (SD) is one of: 
-;; -- @racket['locked]
-;; -- @racket['closed]
-;; -- @racket['open]
-))
-
-Symbols are particularly well-suited here because they directly express
- the state of the door. 
-
-Now that we have a data definition, we must also decide which computer
- actions and interactions should model the various actions on the door.
- Our pictorial representation of the door's states and transitions,
- specifically the arrow from "open" to "closed" suggests the use of a
- function that simulates time. For the other three arrows, we could use
- either keyboard events or mouse clicks or both. Our solution uses three
- keystrokes: 
-@racket[#\u] for unlocking the door, 
-@racket[#\l] for locking it, and 
-@racket[#\space] for pushing it open. 
- We can express these choices graphically by translating the above "state
- machine" from the world of information into the world of data: 
-
-@image["door-sim.png"]
-
-@; -----------------------------------------------------------------------------
-@subsection{Simulating a Door: Functions}
-
-Our analysis and data definition leaves us with three functions to design: 
-
-@itemize[
-
-@item{@racket[automatic-closer], which closes the time during one tick;}
-
-@item{@racket[door-actions], which manipulates the time in response to
-pressing a key; and}
-
-@item{@racket[render], which translates the current state of the door into
-a visible scene.}
-
-]
-
-Let's start with @racket[automatic-closer]. We know its contract and it is
-easy to refine the purpose statement, too: 
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; automatic-closer : SD -> SD
-;; closes an open door over the period of one tick 
-(define (automatic-closer state-of-door) ...)
-))
-
- Making up examples is trivial when the world can only be in one of three
- states: 
-
-@table*[
-	@list[@t{ given state } @t{ desired state }]
-        @list[@t{ 'locked } @t{ 'locked }]
-        @list[@t{ 'closed } @t{ 'closed }]
-        @list[@t{ 'open } @t{ 'closed }]
-]
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; automatic-closer : SD -> SD
-;; closes an open door over the period of one tick 
-
-(check-expect (automatic-closer 'locked) 'locked)
-(check-expect (automatic-closer 'closed) 'closed)
-(check-expect (automatic-closer 'open) 'closed)
-
-(define (automatic-closer state-of-door) ...)
-))
-
- The template step demands a conditional with three clauses: 
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(define (automatic-closer state-of-door)
-  (cond
-    [(symbol=? 'locked state-of-door) ...]
-    [(symbol=? 'closed state-of-door) ...]
-    [(symbol=? 'open state-of-door) ...]))
-))
-
- The examples basically dictate what the outcomes of the three cases must
- be:
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(define (automatic-closer state-of-door)
-  (cond
-    [(symbol=? 'locked state-of-door) 'locked]
-    [(symbol=? 'closed state-of-door) 'closed]
-    [(symbol=? 'open state-of-door) 'closed]))
-))
-
- Don't forget to run the example-tests. 
-
-For the remaining three arrows of the diagram, we design a function that
- reacts to the three chosen keyboard events. As mentioned, functions that
- deal with keyboard events consume both a world and a keyevent:
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; door-actions : SD Keyevent -> SD
-;; key events simulate actions on the door 
-(define (door-actions s k) ...)
-))
-
-@table*[
-	@list[@t{ given state } @t{ given keyevent } @t{ desired state }]
- 
-@list[ @t{  'locked } @t{ #\u    } @t{ 'closed}]
-@list[ @t{  'closed } @t{ #\l    } @t{ 'locked} ]
-@list[ @t{  'closed } @t{ #\space} @t{ 'open } ]
-@list[ @t{  'open   } @t{ --- }    @t{ 'open } ]]
-
- The examples combine what the above picture shows and the choices we made
- about mapping actions to keyboard events. 
-
-From here, it is straightforward to turn this into a complete design:
- 
-@racketblock[
-(define (door-actions s k)
-  (cond
-    [(and (symbol=? 'locked s) (key=? #\u k)) 'closed]
-    [(and (symbol=? 'closed s) (key=? #\l k)) 'locked]
-    [(and (symbol=? 'closed s) (key=? #\space k)) 'open]
-    [else s]))
-
-(check-expect (door-actions 'locked #\u) 'closed)
-(check-expect (door-actions 'closed #\l) 'locked)
-(check-expect (door-actions 'closed #\space) 'open)
-(check-expect (door-actions 'open 'any) 'open)
-(check-expect (door-actions 'closed 'any) 'closed)
-]
-
-Last but not least we need a function that renders the current state of the
-world as a scene. For simplicity, let's just use a large enough text for
-this purpose: 
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-;; render : @tech{SD} -> @racket[Scene]
-;; translate the current state of the door into a large text 
-(define (render s)
-  (text (symbol->string s) 40 'red))
-
-(check-expect (render 'closed) (text "closed" 40 'red))
-))
- The function @racket[symbol->string] translates a symbol into a string,
- which is needed because @racket[text] can deal only with the latter, not
- the former. A look into the language documentation revealed that this
- conversion function exists, and so we use it. 
-
-Once everything is properly designed, it is time to @emph{run} the
-program. In the case of the world teachpack, this means we must specify
-which function takes care of tick events, key events, and redraws: 
-
-@(begin
-#reader scribble/comment-reader
-(racketblock
-(big-bang 100 100 1 'locked)
-(on-tick-event automatic-closer)
-(on-key-event door-actions)
-(on-redraw render)
-))
- 
-Now it's time for you to collect the pieces and run them in @racket[big-bang] to see
-whether it all works. 
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/info.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/info.rkt
deleted file mode 100644
index 6093ee1739..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define scribblings '(("teachpack.scrbl" (multi-page) (teaching -13))))
-
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/nuworld.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/nuworld.png
deleted file mode 100644
index c3fbc2b1b5..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/nuworld.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/server.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/server.png
deleted file mode 100644
index 4939b08f12..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/server.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/teachpack.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/teachpack.scrbl
deleted file mode 100644
index b7efae7404..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/teachpack/teachpack.scrbl
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label scheme/base))
-
-@title[#:style '(toc) #:tag "top"]{@italic{How to Design Programs} Teachpacks}
-
-Teaching languages are small subsets of a full programming language. While
- such restrictions simplify error diagnosis and the construction of tools,
- they also make it impossible (or at least difficult) to write some
- interesting programs. To circumvent this restriction, it is possible to
- import teachpacks into programs written in a teaching language.
-
-In principle, a teachpack is just a library written in the full language,
- not the teaching subset. Like any other library, it may export values,
- functions, etc. In contrast to an ordinary library, however, a teachpack
- must enforce the contracts of the ``lowest'' teaching language into which it
- is imported and signal errors in a way with which students are familiar at
- that level. 
-
-This chapter covers the teachpacks for @italic{How to Design Programs}.
-
-@table-of-contents[]
-
-@include-section["htdp/scribblings/htdp.scrbl"]
-
-@; removed: @include-section["htdc/scribblings/htdc.scrbl"]
-
-@include-section["2htdp/scribblings/2htdp.scrbl"]
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/triangle-xxx.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/triangle-xxx.png
deleted file mode 100644
index 1f549556da..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/triangle-xxx.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/universe.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/universe.png
deleted file mode 100644
index 83f55d5ead..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/universe.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/world.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/world.png
deleted file mode 100644
index 2b215663af..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-doc/teachpack/world.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-doc/test-engine/info.rkt b/pkgs/htdp-pkgs/htdp-doc/test-engine/info.rkt
deleted file mode 100644
index 2a94d6f711..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/test-engine/info.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang info
-(define scribblings '(("test-engine.scrbl" () (tool-library))))
diff --git a/pkgs/htdp-pkgs/htdp-doc/test-engine/test-engine.scrbl b/pkgs/htdp-pkgs/htdp-doc/test-engine/test-engine.scrbl
deleted file mode 100644
index f1727d3acc..0000000000
--- a/pkgs/htdp-pkgs/htdp-doc/test-engine/test-engine.scrbl
+++ /dev/null
@@ -1,152 +0,0 @@
-#lang scribble/doc
-
-@(require (for-label racket/base test-engine/racket-tests (prefix-in gui: test-engine/racket-gui)))
-
-@(require scribble/manual scribble/eval racket/sandbox)
-@(define-syntax-rule (mk-eval defs ...)
-  ;; ==> 
-  (let ([me (make-base-eval)])
-    (call-in-sandbox-context me (lambda () (error-print-source-location #f)))
-    (interaction-eval #:eval me defs) 
-    ...
-    me))
-
-@title{Test Support}
-
-@author["Kathryn Gray"]
-
-@table-of-contents[]
-
-@; ----------------------------------------------------------------------
-
-@section{Using Check Forms}
-
-@defmodule[test-engine/racket-tests]
-
-This module provides test forms for use in Racket programs, as well
-as parameters to configure the behavior of test reports.
-
-Each check form may only occur at the top-level; results are collected
-and reported by the test function.  Note that the check forms only
-register checks to be performed.  The checks are actually run by the
-@racket[test] function.
-
-@defform[(check-expect expr expected-expr)]{
-Checks whether the value of the @racket[expr] expression is
-@racket[equal?] to the value produced by the @racket[expected-expr].
-
-It is an error for @racket[expr] or @racket[expected-expr] to produce a function
-value or an inexact number.}
-
-@defform[(check-random expr expected-expr)]{
-Checks whether the value of the @racket[expr] expression is
-@racket[equal?] to the value produced by the @racket[expected-expr].
-
-The form supplies the same random-number generator to both parts. If both
-parts request @racket[random] numbers from the same interval in the same
-order, they receive the same random numbers. 
-
-@examples[#:eval (mk-eval (require test-engine/racket-tests))
-
-(check-random (random 10) (random 10))
-
-(check-random 
-  (begin (random 100) (random 200))
-  (begin (random 100) (random 200)))
-
-(test)
-]
-
-If the two parts call @racket[random] for different intervals, they are
-likely to fail: 
-
-@examples[#:eval (mk-eval (require test-engine/racket-tests))
-(check-random 
-  (begin (random 100) (random 200))
-  (begin (random 200) (random 100)))
-
-(test)
-]
-
-It is an error for @racket[expr] or @racket[expected-expr] to produce a function
-value or an inexact number.}
-
-@defform[(check-satisfied expr property?)]{
-Checks whether the value of the @racket[expr] expression satisfies 
-the @racket[property?] predicate (which must evaluate to a function of one
-argument). 
-
-@examples[#:eval (mk-eval (require test-engine/racket-tests))
-
-(check-satisfied 1 odd?)
-
-(check-satisfied 1 even?)
-
-(test)
-]} 
-
-@defform[(check-within expr expected-expr delta-expr)
-          #:contracts ([delta-expr number?])]{
-Checks whether the value of the @racket[test] expression is structurally
-equal to the value produced by the @racket[expected] expression; every
-number in the first expression must be within @racket[delta] of the
-corresponding number in the second expression.
-
-It is an error for @racket[expr] or @racket[expected] to produce a function
-value.} 
-
-@defform*[ [(check-error expr)
-            (check-error expr msg-expr)]
-            #:contracts ([msg-expr string?]) ]{
-Checks that evaluating @racket[expr] signals an error, where
-the error message matches the string (if any).}
-
-@defform[(check-member-of expr expected-expr ...)]{
-Checks whether the value of the @racket[expr] expression is @racket[equal?]
-to any of the values produced by the @racket[expected-expr]s.
-
-It is an error for @racket[expr] or any of the @racket[expected-expr]s
-to produce a function value or an inexact number.}
-
-@defform[(check-range expr min-expr max-expr)
-         #:contracts ([expr number?]
-                      [min-expr number?]
-                      [max-expr number?])]{
-Checks whether value of @racket[expr] is between the values of
-@racket[min-expr] and @racket[max-expr] inclusive.}
-
-@defform[(test)]{
-
-Runs all of the tests specified by check forms in the current module
-and reports the results.  When using the gui module, the results are
-provided in a separate window, otherwise the results are printed to
-the current output port.}
-
-@defparam[test-format format (any/c . -> . string?)]{
-
-A parameter that stores the formatting function for the values tested
-by the check forms.}
-
-
-@defboolparam[test-silence silence?]{
-
-A parameter that stores a boolean, defaults to #f, that can be used to
-suppress the printed summary from test.}
-
-
-@defboolparam[test-execute execute?]{
-
-A parameter that stores a boolean, defaults to #t, that can be used to
-suppress evaluation of test expressions.
-}
-
-@section{GUI Interface}
-
-@defmodule[test-engine/racket-gui]
-
-@; FIXME: need to actually list the bindings here, so they're found in
-@; the index
-
-This module requires produces an independent window when
-displaying test results.  It provides the same bindings as
-@racket[test-engine/racket-tests].
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/TESTME.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/TESTME.txt
deleted file mode 100644
index ef9bcbd875..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/TESTME.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-2htdp comes with three different kinds of tests: 
-
-1. tests 
-   This directory contains end-to-end tests for big-bang and universe.
-
-   These tests are mostly automatic except for two of them which expect 
-   some interaction (move mouse, hold key). 
-   
-   The expected output is mostly some sign that the test is 'done' or 
-   that no random tests failed or some cpu time. Failures are indicated
-   with the word failure. 
-
-   To execute these tests, run 
-
-      $ ./xtest in this directory 
-
-2. utest, uchat
-   These two directories contain end-to-end universe program tests. 
-
-   To execute these tests, run 
-   
-     $ ./xrun in the respective directory 
-
-   In utest, xrun pops up two world screens that show a ball moving in one
-   of two canvases. Kill one world after another, then stop the universe. 
-   (It may also pop up additional world state and universe state screens.) 
-
-   In uchat, xrun pops up two chat room screens. Type in one, see the text
-   appear in the other when you hit return. 
-
-3. tests-failed 
-   This directory contains tests that are currently expected to fail. 
-
-   
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/batch-io.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/batch-io.rkt
deleted file mode 100644
index 25f9512357..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/batch-io.rkt
+++ /dev/null
@@ -1,576 +0,0 @@
-#lang racket
-
-;; todo?
-;; -- export tokenization?
-
-(require (rename-in lang/prim (first-order->higher-order f2h)))
-(require (only-in net/sendurl send-url/file))
-
-;; I am trying to use these lists to automate the documentation of the functions
-;; but my scribble skills are insufficient and my time is running out. 
-
-(module devices racket/base
-  (provide *input-devices* *output-devices*)
-  (define *input-devices*  `((stdin ,current-input-port)   (standard-in ,current-input-port)))
-  (define *output-devices* `((stdout ,current-output-port) (standard-out ,current-output-port))))
-
-(require (submod "." devices))
-
-;;---------------------------------------------------------------------------------------------------
-(provide simulate-file) ;; syntax (simulate-file reader string ...)
-
-(provide
- ;; all reader functions consume the name of a file f:
- ;; -- f must be a file name (string) in the same folder as the program 
- 
- ;; String -> String
- ;; read the specified file as a string
- read-file
- 
- ;; String -> [Listof 1String]
- ;; read the specified file as a list of 1strings (characters)
- read-1strings
- 
- ;; String -> [Listof String]
- ;; read the specified file as a list of strings, one per line
- read-lines
- 
- ;; String -> [Listof String]
- ;; read the specified file as a list of white-space separated tokens
- read-words
- 
- ;; String -> [Listof [Listof String]]
- ;; read the specified file as a list of lines, each line as a list of words
- read-words/line
- 
- ;; String -> [Listof [Listof (Union Number String)]]
- ;; read the specified file as a list of lines, each line as a list of words and numbers 
- read-words-and-numbers/line
- 
- ;; String -> [Listof [Listof (U Any)]]
- ;; -- f must be formated as a a file with comma-separated values (Any)
- ;; read the specified file as a list of lists---one per line---of values (Any)
- read-csv-file
- 
- ;; String String -> String 
- ;; (write-file filename str) writes str to filename; 
- ;; produces the file name as a confirmation that the write succeeded 
- write-file)
-
-#;
-(provide 
- ;; [List-of Symbol]
- ;;  symbols that redirect input from an input-port 
- *input-devives*
- 
- ;; [List-of Symbol]
- ;; symbols that redirect output from a output-port 
- *output-devives*)
-
-;; ---------------------------------------------------------------------------------------------------
-;; reading simple X-expressions via HTML/XML files 
-
-(provide-higher-order-primitive
- ;; String ([Listof Any] -> X) -> [Listof X]
- ;; -- f must be formated as a a file with comma-separated values (Any)
- ;; read the specified file as a file of comma-separated values, apply the second
- ;; argument to each row, i.e., list of CSV on one line 
- read-csv-file/rows (_ row-processor))
-(provide 
- ;; String -> Nothing 
- ;; send the specified file name as a URL to default browser 
- (rename-out [send-url/file show])
- 
- ;; --------------------------------------------------------------------------------------------------
- ;; data definition 
- 
- ;   Xexpr.v3 is one of: 
- ;   -- Symbol 
- ;   -- String 
- ;   -- Number 
- ;   -- (cons Symbol (cons [List-of Attribute] [List-of Xexpr.v3]))
- ;   -- (cons Symbol [List-of Xexpr.v3])
- ;
- ;   Attribute is:
- ;      (list Symbol String)
- ;   (list 'a "some text") is called an a-Attribute and "some text" is a's value.
- 
- ;; --------------------------------------------------------------------------------------------------
- ;; function names and purpose statements 
- 
- ;; Any -> Boolean 
- ;; is the given value an Xexpr.v3? 
- ;; effect: display bad piece if x is not an Xexpr.v3
- xexpr?
- 
- ;; String -> Xexpr.v3
- ;; given a file name, retrieve the first X(HT)ML element
- 
- ;; the X(HT)ML element does not contain any strings as elements other than whitespace, 
- ;; and all whitespace between embedded elements is eliminated 
- read-plain-xexpr
- 
- ;; String -> Xexpr.v3
- ;; given a file name, retrieve the first X(HT)ML element
- read-xexpr
- 
- ;; String -> Boolean 
- ;; true, if the url points to a legitimate web page; 
- ;; false, if this url returns a '404'
- ;; raises an exception if the url doesn't get caught by an active server 
- url-exists? 
- 
- ;; String -> [Maybe Xexpr.v3]
- ;; given a URL, retrieve the first X(HT)ML element, false if the web page isn't found
- ;; read HTML as XML (if possible) 
- ;; effect: signals an error in case of network problems or if there is no element 
- read-xexpr/web
- 
- ;; String -> [Maybe Xexpr.v3]
- ;; given a URL, find web site and retrieve the first XML element, false if the web page isn't found 
- ;; read HTML as XML (if possible) 
- ;; effect: signals an error in case of network problems or if there is no element 
- 
- ;; the XML element does not contain any strings as elements other than whitespace, 
- ;; and all whitespace between embedded elements is eliminated 
- read-plain-xexpr/web
- 
- ;; String -> [Listof String]
- ;; produce the list of (fully resolve) .html references in a elements from url
- url-html-neighbors 
- 
- ;; Xexpr.v3 -> String
- ;; turn the X-expression into a string 
- xexpr-as-string)
-
-;; ---------------------------------------------------------------------------------------------------
-;; exported functions 
-
-(require htdp/error
-         (for-syntax racket/base syntax/parse)
-         "private/csv/csv.rkt"
-         ;; --- xml/html 
-         net/url
-         (except-in xml/xml xexpr?)
-         html
-         srfi/13)
-
-(module+ test
-  (require rackunit))
-
-(define-syntax-rule
-  (def-reader (name f s ...) body ...)
-  (define (name f s ...)
-    (check-input-file f 'name)
-    (let ()
-      body ...)))
-
-(def-reader (read-file f)
-  (list->string (read-chunks f read-char drop-last-newline)))
-
-(def-reader (read-1strings f)
-  (map string (read-chunks f read-char drop-last-newline)))
-
-(def-reader (read-lines f)
-  (read-chunks f *read-line reverse))
-
-(def-reader (read-words f)
-  (read-words/line/internal f append))
-
-(def-reader (read-words/line f)
-  (read-words/line/internal f cons))
-
-(def-reader (read-words-and-numbers/line f)
-  ;; String [Listof [Listof (U String Number)]] -> [Listof [Listof (U String Number)]]
-  (define (tease-out-numbers line1 r)
-    (cons (for/list ((t (in-list line1))) (or (string->number t) t)) r))
-  (read-words/line/internal f tease-out-numbers))
-
-(def-reader (read-csv-file f)
-  (read-csv-file/func f))
-
-(def-reader (read-csv-file/rows f row)
-  (check-proc 'read-csv-file row 1 "one argument" "row")
-  (read-csv-file/func f row))
-
-(define (*read-line)
-  (read-line (current-input-port) 'any))
-
-;; ---------------------------------------------------------------------------------------------------
-
-;; -----------------------------------------------------------------------------
-;; writer 
-
-(define (write-file f str)
-  (check-output-file f 'write-file)
-  (check-arg 'write-file (string? str) "string" "second" str)
-  (define (wt) (printf "~a" str))
-  (define device (assq f *output-devices*))
-  (if device 
-      (parameterize ((current-output-port [(cadr device)])) (wt))
-      (with-output-to-file f wt #:mode 'text #:exists 'replace))
-  f)
-
-;; -----------------------------------------------------------------------------
-;; auxiliaries 
-
-;; String [String [Listof [Listof X]] -> Y] -> Y
-(define (read-words/line/internal f combine)
-  (define lines (read-chunks f *read-line (lambda (x) x)))
-  (foldl (lambda (f r)
-           (define fst (filter (compose not (curry string=? "")) (split f)))
-           (combine fst r))
-         '() lines))
-
-;; String (-> X) ([Listof X] -> [Listof X]) -> [Listof X]
-;; read a file as a list of X where process-accu is applied to accu when eof
-(define (read-chunks f read-chunk process-accu) 
-  (define (rd)
-    (let loop ([accu '()])
-      (define nxt (read-chunk))
-      (if (eof-object? nxt) (process-accu accu) (loop (cons nxt accu)))))
-  (read-from-file-or-device f rd))
-
-;; String [-> X] -> X
-(define (read-from-file-or-device f rd)
-  (define device (assq f *input-devices*))
-  (if device 
-      (parameterize ((current-input-port [(cadr device)])) (rd))
-      (with-input-from-file f #:mode 'text rd)))
-
-(define (read-csv-file/func f [row (lambda (x) x)])
-  (define (reader o)
-    (csv->list
-     (make-csv-reader o '((strip-leading-whitespace?  . #t)
-                          (strip-trailing-whitespace? . #t)))))
-  (define device (assq f *input-devices*))
-  (map row
-       (if device 
-           (reader [(cadr device)])
-           (call-with-input-file f #:mode 'text reader))))
-
-;; [Listof Char] -> [Listof Char]
-(define (drop-last-newline accu)
-  (reverse (if (and (pair? accu) (char=? (car accu) #\newline)) (cdr accu) accu)))
-
-;; effect: ensure that f is a file in current directory or report error for t
-(define (check-input-file f t)
-  (define d? (assq f *input-devices*))
-  (check-arg t (or (string? f) d?) (error-message (map car *input-devices*)) "first" f)
-;; ---------------------------------------------------------------------------------------------------
-  (unless (or d? (file-exists? f))
-    (error t "file ~s not found in ~s [the program's folder]"
-      f
-      (path->string (current-directory))))
-  f)
-
-;; effect: ensure that f is a file in current directory or report error for t
-(define (check-output-file f t)
-  (define d? (assq f *output-devices*))
-  (check-arg t (or (string? f) d?) (error-message (map car *output-devices*)) "first" f))
-
-;; [Listof Symbol] -> String 
-(define (error-message los)
-  (string-append "string or one of: " (string-join (map ~e los) ", ")))
-
-;; split : String [Regexp] -> [Listof String]
-;; splits a string into a list of substrings using the given delimiter
-;; (white space by default)
-;;ELI: This shouldn't be needed now, it can use `string-split' as is
-;; (also, the trimming doesn't make sense if the pattern is not a
-;; space--?)
-(define (split str [ptn #rx"[ ]+"])
-  (regexp-split ptn (string-trim str)))
-
-;; split-lines : String -> Listof[String]
-;; splits a string with newlines into a list of lines
-(define (split-lines str)
-  (map string-trim (split str "\r*\n")))
-
-;; ---------------------------------------------------------------------------------------------------
-;; implementation 
-
-;; ---------------------------------------------------------------------------------------------------
-;; ---------------------------------------------------------------------------------------------------
-;; exported functions 
-
-(require htdp/error
-         (for-syntax racket/base syntax/parse)
-         ;; --- xml/html 
-         net/url
-         (except-in xml/xml xexpr?)
-         html
-         srfi/13)
-
-(module+ test
-  (require rackunit))
-
-;; ---------------------------------------------------------------------------------------------------
-(define (xexpr? x0)
-  (define tag (gensym))
-  
-  ;; Any -> Boolean 
-  (define (xexpr-aux? x)
-    (cond
-      [(string? x) #t]
-      [(symbol? x) #t]
-      [(number? x) #t]
-      [(and (cons? x) (symbol? (first x)))
-       (define body (rest x))
-       (or (and (list-of-attributes? (first body)) (list-of-xexpr? (rest body))) 
-           (list-of-xexpr? body))]
-      [else (raise (cons tag x))]))
-  
-  ;; Any -> Boolean 
-  (define (list-of-attributes? xs)
-    (and (list? xs)
-         (for/and ((x xs))
-           (and (list? x) (= (length x) 2) (symbol? (first x)) (string? (second x))))))
-  
-  ;; Any -> Boolean 
-  (define (list-of-xexpr? xs)
-    (and (or (list? xs) (raise (cons tag xs)))
-         (andmap xexpr-aux? xs)))
-  
-  ;; -- IN -- 
-  (with-handlers (((lambda (x) (and (cons? x) (eq? (car x) tag)))
-                   (lambda (x) 
-                     (pretty-print `(,(cdr x) occurs in ,x0))
-                     #f)))
-    (xexpr-aux? x0)))
-
-(define (url-html-neighbors u)
-  (define x (read-xexpr/web u))
-  (if x (url-html-neighbors-aux u x) '()))
-
-(define (url-exists? url:string)
-  (retrieve 'url-exists? url:string (lambda (_ h) (not (404? h)))))
-
-(def-reader (read-plain-xexpr f)
-  (read-xexpr-aux 'read-plain-xexpr f fix-up))
-
-(def-reader (read-xexpr f)
-  (read-xexpr-aux 'read-xexpr f values))
-
-(define (read-xexpr/web url:string)
-  (read-xexpr/web-aux 'read-xexpr/web url:string values))
-
-(define (read-plain-xexpr/web url:string)
-  (read-xexpr/web-aux 'read-xexpr/web url:string fix-up))
-
-(define (xexpr-as-string x) 
-  (check-arg 'xexpr->string (and (pair? x) (xexpr? x)) 'xexpr "first" x)
-  (string-trim (call-with-output-string (curry display-xml/content (xexpr->xml x)))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Symbol String [XML -> XML] -> Xexpr
-;; read an Xexpr from a file that contains at least one XHTML element 
-(define (read-xexpr-aux tag f fix-up)
-  (first-element tag fix-up (read-from-file-or-device f read-html-as-xml)))
-
-;; Symbol String [XML -> XML] -> Xexpr 
-;; read an Xexpr from a URL that contains 
-(define (read-xexpr/web-aux tag url:string fix-up)
-  (retrieve 
-   tag
-   url:string
-   (lambda (url h)
-     (if (404? h)
-         #f
-         (first-element tag fix-up (call/input-url url get-impure-port read-html-as-xml))))))
-
-;; Symbol [XML -> XML] [List-of X] -> Xexpr 
-;; picks out the XML elements from raw, ensures there is one, and fixes up the first one as an Xexpr
-(define (first-element tag fix-up raw)
-  (define ele (filter element? raw))
-  (if (empty? ele)
-      #f ; (error tag "no XHTML element found")
-      (check-result tag xexpr? 'xexpr (xml->xexpr (fix-up (first ele))))))
-
-(define fix-up (eliminate-whitespace '() (lambda (x) #t)))
-
-(module+ test
-  (define test-file
-    #<< eos
-<?xml version='1.0' encoding='UTF-8'?>
-<osm>
-  <bound box="41.91100,-71.74800,42.16100,-71.61800" origin="0.40.1"/>
-  <node id="64028225" version="1" timestamp="2007-10-11T01:54:28Z" uid="8609" user="ewedistrict"
-    changeset="95861" lat="42.049639" lon="-71.734509">
-    <tag k="attribution" v="Office of Geographic and Environmental Information (MassGIS)"/>
-    <tag k="created_by" v="JOSM"/>
-    <tag k="source" v="massgis_import_v0.1_20071010205040"/>
-  </node>
-</osm>
-    
- eos
-    )
-  
-  (check-equal? 
-   (with-input-from-string test-file (lambda () (read-xexpr-aux 'read-xexpr 'stdin fix-up)))
-   '(osm
-     ()
-     (bound ((box "41.91100,-71.74800,42.16100,-71.61800") (origin "0.40.1")))
-     (node
-      ((changeset "95861")
-       (id "64028225")
-       (lat "42.049639")
-       (lon "-71.734509")
-       (timestamp "2007-10-11T01:54:28Z")
-       (uid "8609")
-       (user "ewedistrict")
-       (version "1"))
-      (tag
-       ((k "attribution")
-        (v "Office of Geographic and Environmental Information (MassGIS)")))
-      (tag ((k "created_by") (v "JOSM")))
-      (tag ((k "source") (v "massgis_import_v0.1_20071010205040")))))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Symbol String [URL String -> X] -> X 
-;; retrieve the first text line from the url represented by url:string, hand url and line to consumer
-(define (retrieve tag url:string consumer)
-  (define URL (string->url url:string))
-  (with-handlers ([exn:fail:network? 
-                   (lambda (e) 
-                     (define msg (format "working url, details:\n ~a" (exn-message e)))
-                     (check-arg tag #f msg "" url:string))])
-    (consumer URL (call/input-url URL get-impure-port read-line))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; String -> Boolean 
-;; does the string contain "404"
-(define (404? s) (pair? (regexp-match "404" s)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; String Xexpr -> [Listof String]
-;; retrieve the domain-local neighbors of url that point to HTML files 
-
-(module+ test 
-  (check-equal? (url-html-neighbors-aux
-                 "http://fun.com/"
-                 '(div 
-                   (a "hello")
-                   (a ((href " one.html")) "world")
-                   (a ((href "Papers/ignore.pdf")) "world")
-                   (img ((alt "two")))
-                   (img ((alt "three") (src "ignore.jpg")))))
-                '("http://fun.com/one.html")))
-
-(define (url-html-neighbors-aux u xexpr)
-  (define url (string->url u))
-  (for/fold ((result '())) ((e (xexpr-elements xexpr 'a)))
-    (cond
-      [(and (cons? (rest e)) (loa? (second e)))
-       (define html-targets
-         (for/fold ((htmls '())) ((attributes-of-a-element (second e)))
-           (cond
-             [(symbol=? (first attributes-of-a-element) 'href)
-              (define value:str (string-trim-both (second attributes-of-a-element)))
-              (define value:url (combine-url/relative url value:str))
-              (if (not (url-ends-in-html? value:url)) 
-                  htmls 
-                  (cons (url->string value:url) htmls))]
-             [else htmls])))
-       (append html-targets result)]
-      [else result])))
-
-;; ---------------------------------------------------------------------------------------------------
-;; URL -> Boolean 
-;; does the url end in html? 
-
-(module+ test
-  (check-true (url-ends-in-html? (string->url "seconds.html")))
-  (check-false (url-ends-in-html? (string->url "seconds.pdf"))))
-
-(define (url-ends-in-html? u)
-  (define q (reverse (map path/param-path (url-path u))))
-  (and (cons? q) (pair? (regexp-match ".html$" (first q)))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Xexpr Symbol -> [Listof Xexpr]
-;; retrieve all elements whose tag is 'tag'
-
-(module+ test 
-  (check-equal? (xexpr-elements '(p () (p ((align "center")) "hello") (a)) 'p) 
-                (list '(p () (p ((align "center")) "hello") (a))
-                      '(p ((align "center")) "hello"))))
-
-(define (xexpr-elements x0 tag)
-  (define (K- fst rst) rst)
-  (xexpr-abs x0 
-             '() 
-             K-
-             K- 
-             append 
-             (lambda (e loa rst) (if (symbol=? (first e) tag) (cons e rst) rst))
-             (lambda (e rst) (if (symbol=? (first e) tag) (cons e rst) rst))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Xexpr
-;; [Attribute -> X]
-;; Y 
-;; [String Y -> Y] 
-;; [Xexpr Y -> Y]
-;; [Xexpr [Listof X] Z -> W] 
-;; [Symbol Z -> W] 
-;; -> 
-;; W
-
-;; traverse X-expression and combine results 
-(define (xexpr-abs x0 body0 attr-combine string-combine xexpr-combine loa-combine plain-combine)
-  ;; Xexpr -> W
-  (define (f-xexpr x)
-    (cond
-      [(and (cons? (rest x)) (loa? (second x))) 
-       (loa-combine x (f-loa (second x)) (f-xbody (rest (rest x))))]
-      [else (plain-combine x (f-xbody (rest x)))]))
-  ;; Xbody -> Z
-  (define (f-xbody x)
-    (cond
-      [(empty? x) body0]
-      [(string? (first x)) (string-combine (first x) (f-xbody (rest x)))]
-      [(cons? (first x)) (xexpr-combine (f-xexpr (first x)) (f-xbody (rest x)))]
-      [else (f-xbody (rest x))]))
-  ;; LOA -> [Listof X]
-  (define (f-loa x)
-    (cond
-      [(empty? x) '()]
-      [else (attr-combine (first x) (f-loa (rest x)))]))
-  ;; -- IN -- 
-  (f-xexpr x0))
-
-;; String or (cons Symbol Y) or empty or (cons (list Symbol String) Any) --> Boolean
-;; is the given value a loa, possibly in front of some other Xexpr elements 
-(define (loa? x)
-  (or (empty? x) (and (cons? x) (cons? (first x)))))
-
-
-
-;; ---------------------------------------------------------------------------------------------------
-;; tester 
-
-(define-syntax (simulate-file stx)
-  (syntax-case stx ()
-    [(simulate-file) 
-     (raise-syntax-error #f "expects at least one sub-expression" stx)]
-    [(simulate-file reader str ...) #'(simulate-file/proc (f2h reader) str ...)]))
-
-(define (simulate-file/proc reader . los)
-  (define _1 (check-proc "simulate-file" reader 1 "reader" "one argument"))
-  (define _2 
-    (andmap 
-     (lambda (f)
-       (check-arg "simulate-file" (string? f) "sequence of strings" "" f))
-     los))
-  (define t (make-temporary-file "drracket-temporary-file-~a"))
-  (dynamic-wind 
-   (lambda ()
-     (with-output-to-file t 
-       (lambda () (for-each displayln los))
-       #:mode 'text
-       #:exists 'replace))
-   (lambda () 
-     (reader (path->string t)))
-   (lambda ()
-     (delete-file t))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/image.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/image.rkt
deleted file mode 100644
index ecce6deeaa..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/image.rkt
+++ /dev/null
@@ -1,188 +0,0 @@
-#lang racket/base
-
-#|
-
-Need to test copy & paste. Also test that if the "if" 
-expression in image-snipclass%'s read
-method returns #f, then you get a black circle out.
-
----
-
-improvments/changes wrt to htdp/image:
-
-  - copying and pasting does not introduce jaggies
-  - equal comparisons are more efficient
-  - added rotation & scaling
-  - got rid of pinholes (see the new overlay, beside, and above functions)
-  - a bunch of new polygon functions
-
-todo: sort out wxme library support (loading in text mode).
-
-------------
-
-From Matthias: (to use to compare with this library)
-
-
-You asked about exercises and code snippets for HtDP/2e yesterday. 
-I actually do have a bunch of stuff in
-
- svn: 2HtDP/SampleCode/
-
-and they all have good sample contracts. (It is amazing what we can do with kids who have just
- a few weeks of cs down; I would have never dared to write an editor after six weeks in Algol.)
-
-
-|#
-
-
-(require (except-in mrlib/image-core make-color color make-pen pen)
-         "private/image-more.rkt"
-         "private/img-err.rkt"
-         (only-in lang/prim provide-primitive provide-primitives define-primitive)
-         htdp/error
-         (for-syntax racket/base))
-
-(provide-primitives
-         overlay
-         overlay/align
-         overlay/offset
-         overlay/align/offset
-         overlay/xy
-         
-         underlay
-         underlay/align
-         underlay/offset
-         underlay/align/offset
-         underlay/xy
-         
-         beside
-         beside/align
-
-         above
-         above/align
-         
-         crop
-         crop/align
-         rotate
-         flip-horizontal
-         flip-vertical
-         color-frame
-         frame
-         place-image
-         place-image/align
-         place-images
-         place-images/align
-         
-         scale
-         scale/xy
-         
-         circle
-         ellipse
-         rectangle
-         empty-scene
-         square
-         rhombus
-         regular-polygon
-         polygon
-         star
-         star-polygon
-         radial-star
-         triangle
-         triangle/sss
-         triangle/ssa
-         triangle/sas
-         triangle/ass
-         triangle/aas
-         triangle/asa
-         triangle/saa
-         isosceles-triangle
-         right-triangle
-         line
-         add-line
-         add-polygon
-         add-curve
-         scene+line
-         scene+polygon
-         scene+curve
-         text
-         text/font
-         
-         image->color-list
-         color-list->bitmap
-         
-         x-place?
-         y-place?
-         image?
-         mode?
-         angle?
-         side-count?
-         image-color?
-         pen-style? 
-         pen-cap?
-         pen-join?
-         real-valued-posn?
-
-         image-width
-         image-height
-         image-baseline
-
-         put-pinhole
-         clear-pinhole
-         center-pinhole
-         pinhole-x
-         pinhole-y
-         overlay/pinhole
-         underlay/pinhole
-         
-         make-color
-         make-pen
-         step-count?
-         save-image
-         save-svg-image
-         
-         freeze
-         bitmap/url
-         bitmap/file)
-
-(provide bitmap
-         empty-image)
-
-(define-primitive make-color build-color/make-color)
-(define-primitive color build-color/color
-  (list #f
-        #'color #':color? 
-        (list #':color-alpha  #':color-blue #':color-green #':color-red)
-        (list #f #f #f #f)
-        #f))
-(define-primitive make-pen build-pen/make-pen)
-(define-primitive pen build-pen/pen
-  (list #f
-        #'pen #':pen? 
-        (list #':pen-join #':pen-cap #':pen-style #':pen-width #':pen-color)
-        (list #f #f #f #f #f)
-        #f))
-(provide color pen)
-
-(define-primitive :color-red color-red)
-(define-primitive :color-blue color-blue)
-(define-primitive :color-green color-green)
-(define-primitive :color-alpha color-alpha)
-(define-primitive :color? color?)
-(define-primitive :pen-color pen-color)
-(define-primitive :pen-width pen-width)
-(define-primitive :pen-style pen-style)
-(define-primitive :pen-cap pen-cap)
-(define-primitive :pen-join pen-join)
-(define-primitive :pen? pen?)
-
-(provide (rename-out [:color-red color-red]
-                     [:color-blue color-blue]
-                     [:color-green color-green]
-                     [:color-alpha color-alpha]
-                     [:color? color?]
-                     [:pen-color pen-color]
-                     [:pen-width pen-width]
-                     [:pen-style pen-style]
-                     [:pen-cap pen-cap]
-                     [:pen-join pen-join]
-                     [:pen? pen?]))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/info.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/info.rkt
deleted file mode 100644
index 87e4656dc7..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define name "HtDP/2e Teachpacks")
-
-(define test-omit-paths '("uchat/chatter.rkt"
-                          "uchat/server.rkt"))
-
-
-(define test-responsibles '(("image.rkt" robby)
-                            (all matthias)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/langs.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/langs.txt
deleted file mode 100644
index 2753218dc4..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/langs.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-;; design points for bsl/isl/asl in 2htdp
-
-*** '() will be the empty list 
-
-*** bsl: current bsl - symbols + '() 
-*** isl: lambda + local 
-*** isl+: symbols, quoted and backquoted S-expressions 
-
-*** structures come with dot and update forms (where?)
-
-*** if checked signatures are added, change libraries to export signatures
-    for basic things 
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute.rkt
deleted file mode 100644
index a167ff3c3b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang racket/base
-(require 2htdp/image
-         racket/runtime-path
-         (for-syntax "private/planetcute-image-list.rkt")
-         (for-syntax racket/base))
-
-(define-syntax (definitions stx)
-  #`(begin
-      #,@(for/list ([img (in-list (apply append (map cdr images)))])
-           #`(begin
-               (provide #,img)
-               (define-syntax #,img (make-planetcute-transformer '#,img))))))
-
-
-(define-for-syntax (make-planetcute-transformer img)
-  (make-set!-transformer
-   (let ([saved-id-table (make-hasheq)])
-     (λ (stx)
-       (if (eq? 'expression (syntax-local-context))
-           ;; In an expression context:
-           (let* ([key (syntax-local-lift-context)]
-                  ;; Already lifted in this lifting context?
-                  [lifted-id
-                   (or (hash-ref saved-id-table key #f)
-                       ;; No: lift the require for the image:
-                       (syntax-local-lift-require `(lib ,(format "~a.rkt" img) "2htdp" "planetcute")
-                                                  (datum->syntax stx img)))])
-             (when key (hash-set! saved-id-table key lifted-id))
-             ;; Expand to a use of the lifted expression:
-             (with-syntax ([saved-id (syntax-local-introduce lifted-id)])
-               (syntax-case stx (set!)
-                 [name (identifier? #'name) #'saved-id]
-                 [(set! id arg)
-                  (raise-syntax-error
-                   '2htdp/planetcute
-                   "cannot set! a Planet Cute variable"
-                   stx #'id)]
-                 [(name . more)
-                  (raise-syntax-error
-                   '2htdp/planetcute
-                   "the Planet Cute variables cannot be used after an open parenthesis as they are not functions"
-                   stx #'id)])))
-           ;; In case of partial expansion for module-level and internal-defn
-           ;; contexts, delay expansion until it's a good time to lift
-           ;; expressions:
-           (quasisyntax/loc stx (#%expression #,stx)))))))
-
-(definitions)
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/brown-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/brown-block.png
deleted file mode 100644
index 75c5e1ff50..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/brown-block.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/brown-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/brown-block.rkt
deleted file mode 100644
index e528812e62..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/brown-block.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide brown-block)
-(require racket/draw racket/runtime-path)
-(define-runtime-path brown-block-img "brown-block.png")
-(define brown-block (read-bitmap brown-block-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-boy.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-boy.png
deleted file mode 100644
index 3dc7c298f3..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-boy.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-boy.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-boy.rkt
deleted file mode 100644
index 35114c0880..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-boy.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide character-boy)
-(require racket/draw racket/runtime-path)
-(define-runtime-path character-boy-img "character-boy.png")
-(define character-boy (read-bitmap character-boy-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-cat-girl.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-cat-girl.png
deleted file mode 100644
index dc0538b131..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-cat-girl.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-cat-girl.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-cat-girl.rkt
deleted file mode 100644
index 140cf0b5e0..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-cat-girl.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide character-cat-girl)
-(require racket/draw racket/runtime-path)
-(define-runtime-path character-cat-girl-img "character-cat-girl.png")
-(define character-cat-girl (read-bitmap character-cat-girl-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-horn-girl.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-horn-girl.png
deleted file mode 100644
index 90f22784ca..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-horn-girl.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-horn-girl.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-horn-girl.rkt
deleted file mode 100644
index 4c08ac8344..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-horn-girl.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide character-horn-girl)
-(require racket/draw racket/runtime-path)
-(define-runtime-path character-horn-girl-img "character-horn-girl.png")
-(define character-horn-girl (read-bitmap character-horn-girl-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-pink-girl.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-pink-girl.png
deleted file mode 100644
index baef1772a4..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-pink-girl.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-pink-girl.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-pink-girl.rkt
deleted file mode 100644
index 17521e9d01..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-pink-girl.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide character-pink-girl)
-(require racket/draw racket/runtime-path)
-(define-runtime-path character-pink-girl-img "character-pink-girl.png")
-(define character-pink-girl (read-bitmap character-pink-girl-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-princess-girl.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-princess-girl.png
deleted file mode 100644
index 9d9f958c43..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-princess-girl.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-princess-girl.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-princess-girl.rkt
deleted file mode 100644
index 953dbdf1a5..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-princess-girl.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide character-princess-girl)
-(require racket/draw racket/runtime-path)
-(define-runtime-path character-princess-girl-img "character-princess-girl.png")
-(define character-princess-girl (read-bitmap character-princess-girl-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-closed.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-closed.png
deleted file mode 100644
index 78b716bb54..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-closed.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-closed.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-closed.rkt
deleted file mode 100644
index aa4da1d71c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-closed.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide chest-closed)
-(require racket/draw racket/runtime-path)
-(define-runtime-path chest-closed-img "chest-closed.png")
-(define chest-closed (read-bitmap chest-closed-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-lid.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-lid.png
deleted file mode 100644
index bb79dfb762..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-lid.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-lid.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-lid.rkt
deleted file mode 100644
index 27ad3512ce..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-lid.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide chest-lid)
-(require racket/draw racket/runtime-path)
-(define-runtime-path chest-lid-img "chest-lid.png")
-(define chest-lid (read-bitmap chest-lid-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-open.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-open.png
deleted file mode 100644
index 65073fe2fd..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-open.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-open.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-open.rkt
deleted file mode 100644
index 1ac9721d03..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-open.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide chest-open)
-(require racket/draw racket/runtime-path)
-(define-runtime-path chest-open-img "chest-open.png")
-(define chest-open (read-bitmap chest-open-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/dirt-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/dirt-block.png
deleted file mode 100644
index bd85e94e5f..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/dirt-block.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/dirt-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/dirt-block.rkt
deleted file mode 100644
index 95b188ff95..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/dirt-block.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide dirt-block)
-(require racket/draw racket/runtime-path)
-(define-runtime-path dirt-block-img "dirt-block.png")
-(define dirt-block (read-bitmap dirt-block-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-closed.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-closed.png
deleted file mode 100644
index 57e8e56e29..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-closed.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-closed.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-closed.rkt
deleted file mode 100644
index 951049e5db..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-closed.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide door-tall-closed)
-(require racket/draw racket/runtime-path)
-(define-runtime-path door-tall-closed-img "door-tall-closed.png")
-(define door-tall-closed (read-bitmap door-tall-closed-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-open.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-open.png
deleted file mode 100644
index 4dbcf37674..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-open.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-open.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-open.rkt
deleted file mode 100644
index 0ecb4f8dca..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-open.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide door-tall-open)
-(require racket/draw racket/runtime-path)
-(define-runtime-path door-tall-open-img "door-tall-open.png")
-(define door-tall-open (read-bitmap door-tall-open-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/enemy-bug.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/enemy-bug.png
deleted file mode 100644
index 191587b4fa..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/enemy-bug.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/enemy-bug.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/enemy-bug.rkt
deleted file mode 100644
index 803b3418fa..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/enemy-bug.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide enemy-bug)
-(require racket/draw racket/runtime-path)
-(define-runtime-path enemy-bug-img "enemy-bug.png")
-(define enemy-bug (read-bitmap enemy-bug-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-blue.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-blue.png
deleted file mode 100644
index 5808a7def6..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-blue.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-blue.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-blue.rkt
deleted file mode 100644
index 2703bed4d5..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-blue.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide gem-blue)
-(require racket/draw racket/runtime-path)
-(define-runtime-path gem-blue-img "gem-blue.png")
-(define gem-blue (read-bitmap gem-blue-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-green.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-green.png
deleted file mode 100644
index e971d14d79..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-green.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-green.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-green.rkt
deleted file mode 100644
index 4575b5feae..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-green.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide gem-green)
-(require racket/draw racket/runtime-path)
-(define-runtime-path gem-green-img "gem-green.png")
-(define gem-green (read-bitmap gem-green-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-orange.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-orange.png
deleted file mode 100644
index f8faf7b5a6..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-orange.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-orange.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-orange.rkt
deleted file mode 100644
index 36f23529b6..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-orange.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide gem-orange)
-(require racket/draw racket/runtime-path)
-(define-runtime-path gem-orange-img "gem-orange.png")
-(define gem-orange (read-bitmap gem-orange-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/grass-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/grass-block.png
deleted file mode 100644
index eb04ba9069..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/grass-block.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/grass-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/grass-block.rkt
deleted file mode 100644
index 9bf829c6d1..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/grass-block.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide grass-block)
-(require racket/draw racket/runtime-path)
-(define-runtime-path grass-block-img "grass-block.png")
-(define grass-block (read-bitmap grass-block-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/heart.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/heart.png
deleted file mode 100644
index aa49b5c36b..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/heart.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/heart.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/heart.rkt
deleted file mode 100644
index 5d5c886185..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/heart.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide heart)
-(require racket/draw racket/runtime-path)
-(define-runtime-path heart-img "heart.png")
-(define heart (read-bitmap heart-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/key.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/key.png
deleted file mode 100644
index 7602326ab2..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/key.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/key.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/key.rkt
deleted file mode 100644
index a53c98f79f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/key.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide key)
-(require racket/draw racket/runtime-path)
-(define-runtime-path key-img "key.png")
-(define key (read-bitmap key-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/plain-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/plain-block.png
deleted file mode 100644
index 9e9c65f51f..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/plain-block.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/plain-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/plain-block.rkt
deleted file mode 100644
index f43163843c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/plain-block.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide plain-block)
-(require racket/draw racket/runtime-path)
-(define-runtime-path plain-block-img "plain-block.png")
-(define plain-block (read-bitmap plain-block-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-east.png
deleted file mode 100644
index 927f09e782..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-east.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-east.rkt
deleted file mode 100644
index aaf7bb9a9d..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-east.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide ramp-east)
-(require racket/draw racket/runtime-path)
-(define-runtime-path ramp-east-img "ramp-east.png")
-(define ramp-east (read-bitmap ramp-east-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-north.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-north.png
deleted file mode 100644
index c9678ba6cb..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-north.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-north.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-north.rkt
deleted file mode 100644
index 1716d9f9c4..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-north.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide ramp-north)
-(require racket/draw racket/runtime-path)
-(define-runtime-path ramp-north-img "ramp-north.png")
-(define ramp-north (read-bitmap ramp-north-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-south.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-south.png
deleted file mode 100644
index bde7360cb2..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-south.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-south.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-south.rkt
deleted file mode 100644
index c97746db69..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-south.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide ramp-south)
-(require racket/draw racket/runtime-path)
-(define-runtime-path ramp-south-img "ramp-south.png")
-(define ramp-south (read-bitmap ramp-south-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-west.png
deleted file mode 100644
index 1554c8d136..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-west.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-west.rkt
deleted file mode 100644
index 203833ebcc..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-west.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide ramp-west)
-(require racket/draw racket/runtime-path)
-(define-runtime-path ramp-west-img "ramp-west.png")
-(define ramp-west (read-bitmap ramp-west-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/rock.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/rock.png
deleted file mode 100644
index 29c4e2000e..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/rock.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/rock.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/rock.rkt
deleted file mode 100644
index 00842b3959..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/rock.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide rock)
-(require racket/draw racket/runtime-path)
-(define-runtime-path rock-img "rock.png")
-(define rock (read-bitmap rock-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-east.png
deleted file mode 100644
index 3c3b7569ea..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-east.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-east.rkt
deleted file mode 100644
index a8d7069a19..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-east.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide roof-east)
-(require racket/draw racket/runtime-path)
-(define-runtime-path roof-east-img "roof-east.png")
-(define roof-east (read-bitmap roof-east-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-east.png
deleted file mode 100644
index f81f9bc6e0..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-east.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-east.rkt
deleted file mode 100644
index 7da869c7ac..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-east.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide roof-north-east)
-(require racket/draw racket/runtime-path)
-(define-runtime-path roof-north-east-img "roof-north-east.png")
-(define roof-north-east (read-bitmap roof-north-east-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-west.png
deleted file mode 100644
index 16ab3fd7b1..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-west.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-west.rkt
deleted file mode 100644
index c59ff52fc2..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-west.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide roof-north-west)
-(require racket/draw racket/runtime-path)
-(define-runtime-path roof-north-west-img "roof-north-west.png")
-(define roof-north-west (read-bitmap roof-north-west-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north.png
deleted file mode 100644
index a0f68cf9e0..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north.rkt
deleted file mode 100644
index 9ed5af98d3..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide roof-north)
-(require racket/draw racket/runtime-path)
-(define-runtime-path roof-north-img "roof-north.png")
-(define roof-north (read-bitmap roof-north-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-east.png
deleted file mode 100644
index f875039aed..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-east.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-east.rkt
deleted file mode 100644
index 2c709c3fab..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-east.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide roof-south-east)
-(require racket/draw racket/runtime-path)
-(define-runtime-path roof-south-east-img "roof-south-east.png")
-(define roof-south-east (read-bitmap roof-south-east-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-west.png
deleted file mode 100644
index 636c0ccf66..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-west.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-west.rkt
deleted file mode 100644
index bd6228e373..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-west.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide roof-south-west)
-(require racket/draw racket/runtime-path)
-(define-runtime-path roof-south-west-img "roof-south-west.png")
-(define roof-south-west (read-bitmap roof-south-west-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south.png
deleted file mode 100644
index dda41b4d38..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south.rkt
deleted file mode 100644
index bd3db4de7e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide roof-south)
-(require racket/draw racket/runtime-path)
-(define-runtime-path roof-south-img "roof-south.png")
-(define roof-south (read-bitmap roof-south-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-west.png
deleted file mode 100644
index c7d92774e3..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-west.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-west.rkt
deleted file mode 100644
index 7f4a883394..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-west.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide roof-west)
-(require racket/draw racket/runtime-path)
-(define-runtime-path roof-west-img "roof-west.png")
-(define roof-west (read-bitmap roof-west-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/selector.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/selector.png
deleted file mode 100644
index e7c5475a6e..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/selector.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/selector.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/selector.rkt
deleted file mode 100644
index 4263f572b4..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/selector.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide selector)
-(require racket/draw racket/runtime-path)
-(define-runtime-path selector-img "selector.png")
-(define selector (read-bitmap selector-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-east.png
deleted file mode 100644
index e2fbadc5de..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-east.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-east.rkt
deleted file mode 100644
index a82ae19840..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-east.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide shadow-east)
-(require racket/draw racket/runtime-path)
-(define-runtime-path shadow-east-img "shadow-east.png")
-(define shadow-east (read-bitmap shadow-east-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-east.png
deleted file mode 100644
index 015a8cff3e..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-east.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-east.rkt
deleted file mode 100644
index 3657a45093..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-east.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide shadow-north-east)
-(require racket/draw racket/runtime-path)
-(define-runtime-path shadow-north-east-img "shadow-north-east.png")
-(define shadow-north-east (read-bitmap shadow-north-east-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-west.png
deleted file mode 100644
index d4ad7b79e8..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-west.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-west.rkt
deleted file mode 100644
index 0d16843d9f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-west.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide shadow-north-west)
-(require racket/draw racket/runtime-path)
-(define-runtime-path shadow-north-west-img "shadow-north-west.png")
-(define shadow-north-west (read-bitmap shadow-north-west-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north.png
deleted file mode 100644
index eb35321562..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north.rkt
deleted file mode 100644
index 8ef1855f8e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide shadow-north)
-(require racket/draw racket/runtime-path)
-(define-runtime-path shadow-north-img "shadow-north.png")
-(define shadow-north (read-bitmap shadow-north-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-side-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-side-west.png
deleted file mode 100644
index 9c02903965..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-side-west.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-side-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-side-west.rkt
deleted file mode 100644
index 2b139ac35d..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-side-west.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide shadow-side-west)
-(require racket/draw racket/runtime-path)
-(define-runtime-path shadow-side-west-img "shadow-side-west.png")
-(define shadow-side-west (read-bitmap shadow-side-west-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-east.png
deleted file mode 100644
index 7bde7f3abb..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-east.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-east.rkt
deleted file mode 100644
index 1c3072d6d9..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-east.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide shadow-south-east)
-(require racket/draw racket/runtime-path)
-(define-runtime-path shadow-south-east-img "shadow-south-east.png")
-(define shadow-south-east (read-bitmap shadow-south-east-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-west.png
deleted file mode 100644
index ee845db9c1..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-west.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-west.rkt
deleted file mode 100644
index 4c278604d3..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-west.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide shadow-south-west)
-(require racket/draw racket/runtime-path)
-(define-runtime-path shadow-south-west-img "shadow-south-west.png")
-(define shadow-south-west (read-bitmap shadow-south-west-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south.png
deleted file mode 100644
index 0a122b9f84..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south.rkt
deleted file mode 100644
index 630c31fead..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide shadow-south)
-(require racket/draw racket/runtime-path)
-(define-runtime-path shadow-south-img "shadow-south.png")
-(define shadow-south (read-bitmap shadow-south-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-west.png
deleted file mode 100644
index 6203d90545..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-west.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-west.rkt
deleted file mode 100644
index c661f6ebc4..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-west.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide shadow-west)
-(require racket/draw racket/runtime-path)
-(define-runtime-path shadow-west-img "shadow-west.png")
-(define shadow-west (read-bitmap shadow-west-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/speech-bubble.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/speech-bubble.png
deleted file mode 100644
index 7e03049840..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/speech-bubble.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/speech-bubble.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/speech-bubble.rkt
deleted file mode 100644
index 07a01f5003..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/speech-bubble.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide speech-bubble)
-(require racket/draw racket/runtime-path)
-(define-runtime-path speech-bubble-img "speech-bubble.png")
-(define speech-bubble (read-bitmap speech-bubble-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block-tall.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block-tall.png
deleted file mode 100644
index cc3ce6ac9a..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block-tall.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block-tall.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block-tall.rkt
deleted file mode 100644
index 78780c89f7..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block-tall.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide stone-block-tall)
-(require racket/draw racket/runtime-path)
-(define-runtime-path stone-block-tall-img "stone-block-tall.png")
-(define stone-block-tall (read-bitmap stone-block-tall-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block.png
deleted file mode 100644
index 01113cffa8..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block.rkt
deleted file mode 100644
index 8f6ff70026..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide stone-block)
-(require racket/draw racket/runtime-path)
-(define-runtime-path stone-block-img "stone-block.png")
-(define stone-block (read-bitmap stone-block-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-short.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-short.png
deleted file mode 100644
index 28a15d058c..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-short.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-short.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-short.rkt
deleted file mode 100644
index fbc7f04cb8..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-short.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide tree-short)
-(require racket/draw racket/runtime-path)
-(define-runtime-path tree-short-img "tree-short.png")
-(define tree-short (read-bitmap tree-short-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-tall.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-tall.png
deleted file mode 100644
index 1ae3581ec9..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-tall.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-tall.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-tall.rkt
deleted file mode 100644
index 6c8a2f8e70..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-tall.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide tree-tall)
-(require racket/draw racket/runtime-path)
-(define-runtime-path tree-tall-img "tree-tall.png")
-(define tree-tall (read-bitmap tree-tall-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-ugly.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-ugly.png
deleted file mode 100644
index 957dca61ee..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-ugly.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-ugly.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-ugly.rkt
deleted file mode 100644
index 75bdf62b85..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-ugly.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide tree-ugly)
-(require racket/draw racket/runtime-path)
-(define-runtime-path tree-ugly-img "tree-ugly.png")
-(define tree-ugly (read-bitmap tree-ugly-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block-tall.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block-tall.png
deleted file mode 100644
index 08d85d928a..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block-tall.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block-tall.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block-tall.rkt
deleted file mode 100644
index 94a3b6591c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block-tall.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide wall-block-tall)
-(require racket/draw racket/runtime-path)
-(define-runtime-path wall-block-tall-img "wall-block-tall.png")
-(define wall-block-tall (read-bitmap wall-block-tall-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block.png
deleted file mode 100644
index 9cad766568..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block.rkt
deleted file mode 100644
index 24560a628c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide wall-block)
-(require racket/draw racket/runtime-path)
-(define-runtime-path wall-block-img "wall-block.png")
-(define wall-block (read-bitmap wall-block-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/water-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/water-block.png
deleted file mode 100644
index 0383ed8143..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/water-block.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/water-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/water-block.rkt
deleted file mode 100644
index 5f51359810..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/water-block.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide water-block)
-(require racket/draw racket/runtime-path)
-(define-runtime-path water-block-img "water-block.png")
-(define water-block (read-bitmap water-block-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/window-tall.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/window-tall.png
deleted file mode 100644
index ca1af59dd1..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/window-tall.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/window-tall.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/window-tall.rkt
deleted file mode 100644
index fd6df710d1..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/window-tall.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide window-tall)
-(require racket/draw racket/runtime-path)
-(define-runtime-path window-tall-img "window-tall.png")
-(define window-tall (read-bitmap window-tall-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wood-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wood-block.png
deleted file mode 100644
index 0705007f2e..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wood-block.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wood-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wood-block.rkt
deleted file mode 100644
index 3f89326eba..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wood-block.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide wood-block)
-(require racket/draw racket/runtime-path)
-(define-runtime-path wood-block-img "wood-block.png")
-(define wood-block (read-bitmap wood-block-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/yellow-star.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/yellow-star.png
deleted file mode 100644
index 17c0af58a7..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/yellow-star.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/yellow-star.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/yellow-star.rkt
deleted file mode 100644
index 850c35ef13..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/yellow-star.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide yellow-star)
-(require racket/draw racket/runtime-path)
-(define-runtime-path yellow-star-img "yellow-star.png")
-(define yellow-star (read-bitmap yellow-star-img))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/check-aux.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/check-aux.rkt
deleted file mode 100644
index c65e2e6818..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/check-aux.rkt
+++ /dev/null
@@ -1,174 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/list
-         racket/bool
-         racket/match
-         htdp/error)
-
-(provide (all-defined-out))
-
-(define INSET  5)     ;; the space around the image in the canvas
-(define RATE   1/30)   ;; the clock tick rate 
-(define TRIES  3)     ;; how many times should register try to connect to the server 
-(define PAUSE  1/2)     ;; # secs to wait between attempts to connect to server 
-(define SQPORT 4567) ;; the port on which universe traffic flows
-
-;                                                                               
-;                                                                               
-;                                                                               
-;    ;;;                                              ;;;                       
-;   ;   ;                                            ;   ;                      
-;   ;   ;                                            ;   ;                      
-;   ;       ;;;   ;;;;;  ;;;;;   ;;;   ;;;;          ;   ;  ;   ;  ;   ;        
-;   ;      ;   ;  ; ; ;  ; ; ;  ;   ;  ;   ;         ;;;;;  ;   ;   ; ;         
-;   ;      ;   ;  ; ; ;  ; ; ;  ;   ;  ;   ;         ;   ;  ;   ;    ;          
-;   ;      ;   ;  ; ; ;  ; ; ;  ;   ;  ;   ;         ;   ;  ;   ;    ;          
-;   ;   ;  ;   ;  ; ; ;  ; ; ;  ;   ;  ;   ;         ;   ;  ;  ;;   ; ;    ;;   
-;    ;;;    ;;;   ; ; ;  ; ; ;   ;;;   ;   ;         ;   ;   ;; ;  ;   ;   ;;   
-;                                                                               
-;                                                                               
-;                                                                               
-
-;; ---------------------------------------------------------------------------------------------------
-
-;; Any -> Boolean
-(define (nat? x)
-  (and (number? x) (integer? x) (>= x 0)))
-
-;; Number Symbol Symbol -> Integer
-(define (number->integer x [t ""] [p ""])
-  (check-arg t (and (number? x) (real? x)) "real number" p x)
-  (inexact->exact (floor x)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Nat Nat ->String 
-;; converts i to a string, adding leading zeros, make it at least as long as L
-(define (zero-fill i L)
-  (let ([n (number->string i)])
-    (string-append (make-string (max (- L (string-length n)) 0) #\0) n)))
-
-;; ---------------------------------------------------------------------------------------------------
-
-;; MouseEvent% -> [List Nat Nat MouseEventType]
-;; turn a mouse event into its pieces 
-(define (mouse-event->parts e)
-  (define x (- (send e get-x) INSET))
-  (define y (- (send e get-y) INSET))
-  (values x y 
-          (cond [(send e button-down?) "button-down"]
-                [(send e button-up?)   "button-up"]
-                [(send e dragging?)    "drag"]
-                [(send e moving?)      "move"]
-                [(send e entering?)    "enter"]
-                [(send e leaving?)     "leave"]
-                [else ; (send e get-event-type)
-                 (let ([m (send e get-event-type)])
-                   (error 'on-mouse (format "Unknown event: ~a" m)))])))
-
-;; KeyEvent% -> String
-(define (key-event->parts e)
-  (define x (send e get-key-code))
-  (cond
-    [(char? x) (string x)]
-    [(symbol? x) (symbol->string x)]
-    [else (error 'on-key (format "Unknown event: ~a" x))]))
-
-;; KeyEvent% -> String
-(define (key-release->parts e)
-  (define x (send e get-key-release-code))
-  (cond
-    [(char? x) (string x)]
-    [(symbol? x) (symbol->string x)]
-    [else (error 'on-key (format "Unknown event: ~a" x))]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Any -> Symbol 
-(define (name-of draw tag)
-  (define fname  (object-name draw))
-  (if fname fname tag))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Any -> Boolean
-(define (sexp? x)
-  (cond
-    [(empty? x) true]
-    [(string? x) true]
-    [(symbol? x) true]
-    [(number? x) true]
-    [(boolean? x) true]
-    [(char? x) true]
-    [(pair? x) (and (list? x) (andmap sexp? x))]
-    [(and (struct? x) (prefab-struct-key x)) (for/and ((i (struct->vector x))) (sexp? i))]
-    [else false]))
-
-; tests:
-;(struct s (t) #:prefab)
-;(unless (sexp? (list (s (list 'a))))
-;  (error 'prefab "structs should be sexp?"))
-
-(define (no-newline? x)
-  (not (member #\newline (string->list x))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; exchange one-line messages between worlds and the server
-
-(define tcp-eof (gensym 'tcp-eof))
-
-;; Any -> Boolean 
-(define (tcp-eof? a) (eq? tcp-eof a))
-
-;; OutPort Sexp -> Void
-(define (tcp-send out msg)
-  (write msg out)
-  (newline out)
-  (flush-output out))
-
-;; InPort -> Sexp
-(define (tcp-receive in)
-  (with-handlers ((exn? (lambda (x) (raise tcp-eof))))
-    (define x (read in))
-    (if (eof-object? x) 
-        (raise tcp-eof)
-        (begin
-          (read-line in) ;; read the newline 
-          x))))
-
-;; InPort OutPort (X -> Y) -> (U Y Void)
-;; process a registration from a potential client, invoke k on name if it is okay
-(define (tcp-process-registration in out k)
-  (define next (tcp-receive in))
-  (match next
-    [`(REGISTER ((name ,name)))
-     (tcp-send out '(OKAY))
-     (k name)]))
-  
-;; InPort OutPort (U #f String) -> Void 
-;; register with the server, send the given name or make up a symbol 
-(define (tcp-register in out name)
-  (define msg `(REGISTER ((name ,(if name name (gensym 'world))))))
-  (tcp-send out msg)
-  (define ackn (tcp-receive in))
-  (unless (equal? ackn '(OKAY))
-    (raise tcp-eof)))
-
-;                                                   
-;                                                   
-;                                                   
-;    ;;;                         ;;;   ;      ;     
-;   ;   ;                       ;   ;  ;      ;     
-;   ;   ;                       ;   ;  ;      ;     
-;   ;   ;  ; ;;    ;;;;         ;      ;;;;   ;  ;  
-;   ;;;;;  ;;  ;  ;   ;         ;      ;   ;  ; ;   
-;   ;   ;  ;   ;  ;   ;         ;      ;   ;  ;;    
-;   ;   ;  ;      ;   ;         ;      ;   ;  ; ;   
-;   ;   ;  ;      ;   ;         ;   ;  ;   ;  ;  ;  
-;   ;   ;  ;       ;;;;          ;;;   ;   ;  ;   ; 
-;                     ;                             
-;                 ;   ;                             
-;                  ;;;                              
-
-;; Symbol Any String -> Void
-(define (check-pos t c r)
-  (check-arg 
-   t (and (real? c) (>= (number->integer c t r) 0)) "positive integer" r c))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/checked-cell.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/checked-cell.rkt
deleted file mode 100644
index 357dfed519..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/checked-cell.rkt
+++ /dev/null
@@ -1,102 +0,0 @@
-#lang scheme/gui
-
-(require htdp/error mzlib/pconvert)
-
-(provide checked-cell%)
-
-(define checked-cell<%>
-  (interface ()
-    set ;; Symbol Any -> Boolean 
-    ;; does the new state differ from the old? 
-    ;; effect: if so only, set state
-    
-    get ;; -> Any (ok?)
-    ))
-
-(define checked-cell% 
-  (class* object% (checked-cell<%>) 
-    (init-field value0 ;; X
-                ok?)   ;; Any -> Boolean : X 
-    
-    (init [display #f]) ;; (U String #f) ; a string is the name of the state display window
-    
-    (field 
-     [value (coerce "the initial expression" value0 #t)]
-     ;; (U False pasteboard%)
-     [pb (if (boolean? display)
-             #f
-             (let* ([f (new frame% [label display][width 400][height 400])]
-                    [p (new pasteboard%)]
-                    [e (new editor-canvas% [parent f] [editor p] 
-                            [style '(hide-hscroll hide-vscroll)])])
-               (send f show #t)
-               p))])
-    
-    (define/private (show-state)
-      (define xbox (box #f)) ;; x coordinate (throw away)
-      (define ybox (box 0))  ;; y coordinate for next snip
-      (define s
-        (pretty-format
-         (parameterize ([constructor-style-printing #t]
-                        [booleans-as-true/false #t]
-                        [abbreviate-cons-as-list 
-                         #t
-                         ;; is this beginner or beginner+quote
-                         #;
-                         (let ([o (open-output-string)])
-                           (print '(1) o)
-                           (regexp-match #rx"list" (get-output-string o)))])
-           (print-convert value)) 
-         40))
-      ;; turn s into lines and display them in pb
-      (send pb erase)
-      (if (is-a? value snip%)
-          (send pb insert value 0 0)
-          (parameterize ([current-input-port (open-input-string s)])
-            (let read-all ()
-              (define nxt (read-line))
-              (unless (eof-object? nxt)
-                (let ([s (make-object string-snip% nxt)])
-                  (send pb insert s 0 (unbox ybox))
-                  (send pb get-snip-location s xbox ybox #t)
-                  (read-all)))))))
-    
-    ;; Symbol Any -> ok?
-    (define/private (coerce tag nw [say-evaluated-to #f])
-      (let ([b (ok? nw)])
-        (unless (boolean? b)
-          (tp-error 'check-with "the test function ~a is expected to return a boolean, but it returned ~v" 
-                    (object-name ok?) b))
-        (unless b
-          (define check-with-name 
-            (let ([n (symbol->string (object-name ok?))])
-              (if (regexp-match "check-with" n)
-                  "handler"
-                  n)))
-          (tp-error 'check-with "~a ~a ~v, which fails to pass check-with's ~a test"
-                    tag (if say-evaluated-to "evaluated to" "returned") 
-                    nw check-with-name))
-        nw))
-    
-    ;; Symbol Any -> Void 
-    ;; effect: set value to v if distinct, also display it if pb exists
-    (define/public (set tag v) 
-      (define nw  (coerce tag v))
-      ;; this is the old Robby "optimization" for not triggering draw
-      ;; when the world doesn't change 
-      ;if (equal? value nw)
-      ;   #t
-      (begin
-        (set! value nw)
-        (when pb (show-state))
-        #f))
-    
-    ;; -> ok?
-    (define/public (get) value)
-    
-    (super-new)
-    
-    (when pb (show-state))))
-
-; (define c (new checked-cell% [msg "World"] [value0 1] [ok? positive?]))
-; (send c set "tick" 10)
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-and-process.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-and-process.rkt
deleted file mode 100644
index a3126a5508..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-and-process.rkt
+++ /dev/null
@@ -1,159 +0,0 @@
-#lang racket/base
-
-;; ---------------------------------------------------------------------------------------------------
-;; provides functions for specifying the shape of big-bang and universe clauses:
-
-(provide function-with-arity expr-with-check err)
-
-;; ... and for checking and processing them 
-
-(provide ;; constraint: the first kw is the original one 
-         ;; and it is also the name of the field in the class
-         ->args
-         contains-clause?)
-
-(require racket/function
-         racket/list
-         racket/bool
-         (for-syntax racket/base syntax/parse)
-         (for-template "clauses-spec-aux.rkt"
-                       racket
-                       (rename-in lang/prim (first-order->higher-order f2h))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; specifying the shape of clauses 
-
-(define-syntax (expr-with-check stx)
-  (syntax-case stx ()
-    [(_ check> msg)
-     #`(lambda (tag)
-         (lambda (p)
-           (syntax-case p ()
-             [(_ x) #`(check> #,tag x)]
-             [_ (err tag p msg)])))]))
-
-(define-syntax function-with-arity
-  (syntax-rules ()
-    [(_ arity)
-     (lambda (tag)
-       (lambda (p [tag tag])
-         (syntax-case p ()
-           [(_ x) #`(proc> #,tag (f2h x) arity)]
-           [_ (err tag p)])))]
-    [(_ arity #:except extra ...)
-     (lambda (tag)
-       (lambda (p [tag tag])
-         (syntax-case p ()
-           [(_ x) #`(proc> #,tag (f2h x) arity)]
-           extra ...
-           [_ (err tag p)])))]))
-
-(define (err spec p . xtras)
-  (define x (cadr spec))
-  (raise-syntax-error (if (syntax? x) (syntax-e x) x)
-                      (if (null? xtras)
-                          "illegal specification"
-                          (string-append "illegal specification: " (car xtras)))
-                      p))
-
-;; ---------------------------------------------------------------------------------------------------
-;; processing actual clauses 
-
-;; KeyWord [Listof Clause] -> Boolean 
-;; does this list of clauses contain one that starts with kw?
-(define (contains-clause? kw clause-list)
-  (memf (lambda (clause) (free-identifier=? kw (car (syntax->list clause)))) clause-list))
-
-#|
-  transform the clauses into the initial arguments specification 
-  for a new expression that instantiates the appropriate class
-  
-  ensure that the initial state (state0) is not in the shape of a clause
-
-  ensure that all clauses mention only keywords specified in AllSpec or PartSpec
-  move the contracts from AppSpecl and PartSpec to the clauses 
-  
-  run ->rec? over all used keywords to discover the presence of special clauses
-  
-  if anything fails, use the legal keyword to specialize the error message
-|#
-(define (->args tag stx state0 clauses Spec ->rec?)
-  (define kwds (map (compose (curry datum->syntax stx) car) Spec))
-  (define spec (clauses-use-kwd (syntax->list clauses) ->rec? tag kwds))
-  (duplicates? tag spec)
-  (not-a-clause tag stx state0 kwds)
-  (map (lambda (s) 
-         (define kw (first s))
-         (define kw-alt (second s))
-         (define r
-           (let loop ([spec spec])
-             (cond
-               [(null? spec) #false]
-               [(or (free-identifier=? (caar spec) kw)
-                    (free-identifier=? (caar spec) kw-alt))
-                ; (syntax->list (cdar spec))
-                (datum->syntax
-                 #f
-                 (for/list ([i (syntax->list (cdar spec))])
-                   (define n  (string->symbol (format "~a handler" (syntax-e (caar spec)))))
-                   (syntax-property  i 'inferred-name n))
-                 (cdar spec))]
-               [else (loop (cdr spec))])))
-         (if r 
-             (let ([f (third s)])
-               (if (procedure-arity-includes? f 2)
-                   (f r `',(car (syntax->list r)))
-                   (f r)))
-             (fourth s)))
-       Spec))
-
-;; check whether rec? occurs, produces list of keyword x clause pairs 
-(define (clauses-use-kwd stx:list ->rec? tag kwds)
-  (define kwd-in? (->kwds-in kwds))
-  (map (lambda (stx)
-         (syntax-case stx ()
-           [(kw . E) (kwd-in? #'kw) (begin (->rec? #'kw #'E) (cons #'kw stx))]
-           [(kw . E)
-	    (let* ([stx2 #'kw]
-		   [kw (syntax-e stx2)]
-		   [kw-appears-as-symbol
-		     (member kw (map syntax-e kwds))
-		     #;
-		     (for/or ((n kwds))
-		       (symbol=? kw (syntax-e n)))])
-              (if kw-appears-as-symbol
-                  (raise-syntax-error
-		    tag (format "the ~a keyword seems to have been used as a variable" kw) stx2)
-                  (raise-syntax-error
-		    tag (format "~a clauses are not allowed within ~a" kw tag) stx)))]
-           [_ (raise-syntax-error tag "expected a clause, but found something else" stx)]))
-       stx:list))
-
-
-;; [Listof SyntaxIdentifier] -> (Syntax -> Boolean)
-(define (->kwds-in kwds)
-  (lambda (k)
-    (and (identifier? k) (for/or ([n kwds]) (free-identifier=? k n)))))
-
-;; Symbol Syntax Syntax [Listof Kw] -> true
-;; effect: if state0 looks like a clause, raise special error 
-(define (not-a-clause tag stx state0 kwds)
-  (syntax-case state0 ()
-    [(kw . E) 
-     ((->kwds-in kwds) #'kw) 
-     (raise-syntax-error tag "expected an initial state, but found a clause" stx)]
-    [_ #t]))
-
-;; Symbol [Listof kw] -> true
-;; effect: raise syntax error about duplicated clause 
-(define (duplicates? tag lox)
-  (let duplicates? ([lox lox])
-    (cond
-      [(empty? lox) false]
-      [else
-       (let* ([f (caar lox)]
-              [id (syntax-e f)]
-              [x (memf (lambda (x) (free-identifier=? (car x) f)) (rest lox))])
-         (if x 
-             (raise-syntax-error tag (format "duplicate ~a clause" id) (cdar x))
-             (duplicates? (rest lox))))])))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-aux.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-aux.rkt
deleted file mode 100644
index 3c6e499bb5..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-aux.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/base
-
-;; ---------------------------------------------------------------------------------------------------
-;; provides constants and functions for specifying the shape of clauses in big-bang and universe 
-
-(provide port> nat> nat? proc> bool> num> ip> string> symbol> string-or-symbol> any> K False True)
-
-(require htdp/error "check-aux.rkt")
-
-(define (K w . r) w)
-(define (False w) #f)
-(define (True w) #t)
-
-;; Symbol X -> X : nat?
-(define (port> tag x)
-  (nat> tag x "port"))
-
-;; Symbol X -> X : boolean? 
-(define (bool> tag x)
-  (check-arg tag (boolean? x) "boolean" "first" x)
-  x)
-
-;; Symbol X -> X : string?
-(define (string> tag x)
-  (check-arg tag (string? x) "string" "first" x)
-  x)
-
-;; Symbol X -> X : symbol? 
-(define (symbol> tag x)
-  (check-arg tag (symbol? x) "symbol" "second" x)
-  x)
-
-;; Symbol X -> X : symbol?  or string? 
-(define (string-or-symbol> tag x)
-  (check-arg tag (or (symbol? x) (string? x)) "symbol or string" "first" x)
-  x)
-
-(define ip> string>)
-
-;; Symbol X Nat -> X
-(define (proc> tag f ar #:place (place "first"))
-  (check-proc tag f ar place (if (> ar 1) (format "~a arguments" ar) "one argument"))
-  f)
-
-;; Symbol X (Number -> Boolean) String String -> X
-(define (num> tag x pred? spec which)
-  (check-arg tag (and (number? x) (pred? x)) spec which x)
-  x)
-
-;; Symbol X String -> X
-(define (nat> tag x spec)
-  (check-arg tag (nat? x) "natural number" spec x)
-  x)
-
-;; Symbol X String -> X
-(define (any> tag x)
-  x)
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/csv.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/csv.rkt
deleted file mode 100644
index f99ae8e7b4..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/csv.rkt
+++ /dev/null
@@ -1,955 +0,0 @@
-;;; @Package     csv
-;;; @Subtitle    Comma-Separated Value (CSV) Utilities in Scheme
-;;; @HomePage    http://www.neilvandyke.org/csv-scheme/
-;;; @Author      Neil Van Dyke
-;;; @Version     0.10
-;;; @Date        2010-04-13
-;;; @PLaneT      neil/csv:1:6
-
-;; $Id: csv.ss,v 1.199 2010/04/13 17:56:20 neilpair Exp $
-
-;;; @legal
-;;; Distributed under the same terms as Racket, by permission.
-;;; @end legal
-
-#lang scheme/base
-
-;;; @section Introduction
-
-;;; The @b{csv} Scheme library provides utilities for reading various kinds of
-;;; what are commonly known as ``comma-separated value'' (CSV) files.  Since
-;;; there is no standard CSV format, this library permits CSV readers to be
-;;; constructed from a specification of the peculiarities of a given variant.
-;;; A default reader handles the majority of formats.
-;;;
-;;; One of the main uses of this library is to import data from old crusty
-;;; legacy applications into Scheme for data conversion and other processing.
-;;; To that end, this library includes various conveniences for iterating over
-;;; parsed CSV rows, and for converting CSV input to the
-;;; @uref{http://pobox.com/~oleg/ftp/Scheme/SXML.html, SXML 3.0} Scheme XML
-;;; format.
-;;;
-;;; This library requires R5RS, SRFI-6, SRFI-23, and an @code{integer->char}
-;;; procedure that accepts ASCII values.
-;;;
-;;; Other implementations of some kind of CSV reading for Scheme include
-;;; Gauche's @code{text.csv} module, and Scsh's @code{record-reader} and
-;;; related procedures.  This library intends to be portable and more
-;;; comprehensive.
-
-;; TODO: Briefly introduce terms "row", "column", and "field".
-
-(define-syntax %csv:error
-  (syntax-rules () ((_ p m o)
-                    (error (string-append p " : " m) o)
-                    ;; Bigloo: (error p m o)
-                    )))
-
-(define-syntax %csv:type-error
-  (syntax-rules ()
-    ((_ proc-str expected-str got-value)
-     (%csv:error proc-str
-                 (string-append "expected " expected-str ", received:")
-                 got-value))))
-
-(define %csv:a2c integer->char)
-
-(define %csv:cr (%csv:a2c 13))
-(define %csv:lf (%csv:a2c 10))
-
-(define-syntax %csv:gosc
-  (syntax-rules ()
-    ((_ os-stx)
-     (let* ((os  os-stx)
-            (str (get-output-string os)))
-       (close-output-port os)
-       str))))
-
-(define (%csv:in-arg proc-name in)
-  (cond ((input-port? in) in)
-        ((string?     in) (open-input-string in))
-        (else (%csv:type-error proc-name "input port or string" in))))
-
-(define (%csv:reader-or-in-arg proc-name reader-or-in)
-  (cond ((procedure?  reader-or-in) reader-or-in)
-        ((input-port? reader-or-in) (make-csv-reader reader-or-in))
-        ((string?     reader-or-in) (make-csv-reader (open-input-string
-                                                      reader-or-in)))
-        (else (%csv:type-error proc-name
-                               "csv reader or input port or string"
-                               reader-or-in))))
-
-;;; @section Reader Specs
-
-;;; CSV readers are constructed using @dfn{reader specs}, which are sets of
-;;; attribute-value pairs, represented in Scheme as association lists keyed on
-;;; symbols.  Each attribute has a default value if not specified otherwise.
-;;; The attributes are:
-
-;;; @table @code
-;;;
-;;; @item newline-type
-;;; Symbol representing the newline, or record-terminator, convention.  The
-;;; convention can be a fixed character sequence (@code{lf}, @code{crlf}, or
-;;; @code{cr}, corresponding to combinations of line-feed and carriage-return),
-;;; any string of one or more line-feed and carriage-return characters
-;;; (@code{lax}), or adaptive (@code{adapt}).  @code{adapt} attempts to detect
-;;; the newline convention at the start of the input and assume that convention
-;;; for the remainder of the input.  Default: @code{lax}
-;;;
-;;; @item separator-chars
-;;; Non-null list of characters that serve as field separators.  Normally, this
-;;; will be a list of one character.  Default: @code{(#\,)} (list of the comma
-;;; character)
-;;;
-;;; @item quote-char
-;;; Character that should be treated as the quoted field delimiter character,
-;;; or @code{#f} if fields cannot be quoted.  Note that there can be only one
-;;; quote character.  Default: @code{#\"} (double-quote)
-;;;
-;;; @item quote-doubling-escapes?
-;;; Boolean for whether or not a sequence of two @code{quote-char} quote
-;;; characters within a quoted field constitute an escape sequence for
-;;; including a single @code{quote-char} within the string.  Default: @code{#t}
-;;;
-;;; @item comment-chars
-;;; List of characters, possibly null, which comment out the entire line of
-;;; input when they appear as the first character in a line.  Default:
-;;; @code{()} (null list)
-;;;
-;;; @item whitespace-chars
-;;; List of characters, possibly null, that are considered @dfn{whitespace}
-;;; constituents for purposes of the @code{strip-leading-whitespace?} and
-;;; @code{strip-trailing-whitespace?} attributes described below.
-;;; Default: @code{(#\space)} (list of the space character)
-;;;
-;;; @item strip-leading-whitespace?
-;;; Boolean for whether or not leading whitespace in fields should be
-;;; stripped.  Note that whitespace within a quoted field is never stripped.
-;;; Default: @code{#f}
-;;;
-;;; @item strip-trailing-whitespace?
-;;; Boolean for whether or not trailing whitespace in fields should be
-;;; stripped.  Note that whitespace within a quoted field is never stripped.
-;;; Default: @code{#f}
-;;;
-;;; @item newlines-in-quotes?
-;;; Boolean for whether or not newline sequences are permitted within quoted
-;;; fields.  If true, then the newline characters are included as part of the
-;;; field value; if false, then the newline sequence is treated as a premature
-;;; record termination.  Default: @code{#t}
-;;;
-;;; @end table
-
-;; TODO: Do not expose this procedure for now.  We expect it to go away and be
-;; replaced with two other procedures.
-;;
-;; @defproc %csv:csv-spec-derive orig-spec changes
-;;
-;; Yields a new CSV spec that is derived from @var{orig-spec} by applying spec
-;; @var{changes} as attribute substitions and additions to the original.  For
-;; example, given an original CSV reader spec:
-;;
-;; @lisp
-;; (define my-first-csv-spec
-;;   '((newline-type            . lax)
-;;     (separator-chars         . (#\,))
-;;     (quote-char              . #\")
-;;     (quote-doubling-escapes? . #t)
-;;     (whitespace-chars        . (#\space))))
-;; @end lisp
-;;
-;; a derived spec with a different @code{separator-chars} attribute and an
-;; added @code{comment-chars} attribute can be created like:
-;;
-;; @lisp
-;; (%csv:csv-spec-derive my-first-csv-spec
-;;                  '((separator-chars . (#\%))
-;;                    (comment-chars   . (#\#))))
-;; @result{}
-;; ((separator-chars         . (#\%))
-;;  (comment-chars           . (#\#))
-;;  (newline-type            . lax)
-;;  (quote-char              . #\")
-;;  (quote-doubling-escapes? . #t)
-;;  (whitespace-chars        . (#\space)))
-;; @end lisp
-;;
-;; In that the yielded spec might share some structure with @var{orig-spec}
-;; and/or @var{changes}.  Most applications will not use this procedure
-;; directly.
-
-(define (%csv:csv-spec-derive orig-spec changes)
-  ;; TODO: Make this not share structure.  Error-check and normalize at the
-  ;; same time we clone.
-  (let ((new-spec '()))
-    (let ((add-to-new-spec
-           (lambda (alist)
-             (for-each (lambda (cell)
-                         (or (assq (car cell) new-spec)
-                             (set! new-spec (cons cell new-spec))))
-                       alist))))
-      (add-to-new-spec changes)
-      (add-to-new-spec orig-spec)
-      (reverse new-spec))))
-
-;;; @section Making Reader Makers
-
-;;; CSV readers are procedures that are constructed dynamically to close over a
-;;; particular CSV input and yield a parsed row value each time the procedure
-;;; is applied.  For efficiency reasons, the reader procedures are themselves
-;;; constructed by another procedure, @code{make-csv-reader-maker}, for
-;;; particular CSV reader specs.
-
-(define (%csv:csv-error code extra)
-  ;; TODO: Maybe make the CSV error handler user-specifiable, or allow user to
-  ;; specify some errors that should be disregarded.
-  ;;
-  ;; TODO: Add position information.  Keep track of character position while
-  ;; reading.
-  (%csv:error
-   "[csv-reader]"
-   (string-append "Erroneous CSV format: "
-                  (case code
-                    ((junk-after-quote-close)
-                     "Junk after close of quoted field:")
-                    (else (string-append "INTERNAL ERROR: Unknown code: "
-                                         (symbol->string code)))))
-   extra))
-
-(define (%csv:newline-check-step0 newline-type c port)
-  ;; (display "*DEBUG* (equal? newline-type 'lax) = ")
-  ;; (write (equal? newline-type 'lax))
-  ;; (newline)
-  ;; (display "*DEBUG* (eqv? newline-type 'lax) = ")
-  ;; (write (eqv? newline-type 'lax))
-  ;; (newline)
-  (case newline-type
-    ((cr)   (eqv? c %csv:cr))
-    ((lf)   (eqv? c %csv:lf))
-    ((crlf) (if (eqv? c %csv:cr)
-                (let ((c2 (peek-char port)))
-                  (cond ((eof-object? c2)
-                         ;; Note: This is a CR-EOF in an input that uses CR-LF
-                         ;; for terminating records.  We are discarding the CR,
-                         ;; so it will not be added to the field string.  We
-                         ;; might want to signal an error.
-                         #t)
-                        ((eqv? c2 %csv:lf)
-                         (read-char port)
-                         #t)
-                        (else #f)))
-                #f))
-    ((lax detect) (cond ((eqv? c %csv:cr)
-                         (let ((c2 (peek-char port)))
-                           (cond ((eof-object? c2) #t)
-                                 ((eqv? c2 %csv:lf)
-                                  (read-char port)
-                                  'crlf)
-                                 (else 'cr))))
-                        ((eqv? c %csv:lf) 'lf)
-                        (else #f)))
-    (else (%csv:error
-           "%csv:make-portreader/positional"
-           "unrecognized newline-type"
-           newline-type))))
-
-(define %csv:make-portreader/positional
-  (letrec-syntax
-      ((newline-check
-        (syntax-rules ()
-          ((_ newline-type c port detected-newline-type)
-           ;; Note: "port" and "detected-newline-type" must be identifiers.
-           ;; "newline-type" and "c" must be identifiers or self-evals.
-           (if (eqv? newline-type 'detect)
-               (begin (set! detected-newline-type
-                            (%csv:newline-check-step0 newline-type c port))
-                      detected-newline-type)
-               (%csv:newline-check-step0 newline-type c port)))))
-       (gosc-cons
-        ;; Note: This is to ensure the output string is gotten and closed
-        ;; before consing it with the result of a recursive call.
-        (syntax-rules ()
-          ((_ os b) (let ((s (%csv:gosc os))) (cons s b))))))
-    (lambda (newline-type
-             separator-chars
-             quote-char
-             quote-doubling-escapes?
-             comment-chars
-             whitespace-chars
-             strip-leading-whitespace?
-             strip-trailing-whitespace?
-             newlines-in-quotes?)
-      (lambda (port)
-        (let ((dnlt #f))
-          (let read-fields-or-eof ((c (read-char port)))
-            (cond
-             ((eof-object? c) '())
-             ((and strip-leading-whitespace? (memv c whitespace-chars))
-              ;; It's leading whitespace char when we're ignoring leading
-              ;; whitespace in fields, and there might just be whitespace and
-              ;; then an EOF, which should probably be considered just an EOF
-              ;; rather than a row with one empty field, so just skip this
-              ;; whitespace char.
-              (read-fields-or-eof (read-char port)))
-             ((and (not (null? comment-chars)) (memv c comment-chars))
-              ;; It's a comment char in the first column (or in the first
-              ;; non-whitespace column, if "strip-leading-whitespace?" is
-              ;; true), so skip to end of line.
-              (let ((fake-dnlt #f))
-                (let loop ((c (read-char port)))
-                  (cond ((eof-object? c) '())
-                        ((newline-check newline-type c port fake-dnlt)
-                         (read-fields-or-eof (read-char port)))
-                        (else (loop (read-char port)))))))
-             (else
-              ;; It's not going to be just an EOF, so try to read a row.
-              (let ((row
-                     (let read-fields ((c c))
-                       (cond
-                        ;; If an EOF or newline in an unquoted field, consider
-                        ;; the field and row finished.  (We don't consider EOF
-                        ;; before newline to be an error, although perhaps that
-                        ;; would be a useful check for a freak premature
-                        ;; end-of-input when dealing with "well-formed" CSV).
-                        ((or (eof-object? c)
-                             (newline-check newline-type c port dnlt))
-                         (list ""))
-                        ;; If a field separator, finish this field and cons
-                        ;; with value of recursive call to get the next field.
-                        ((memv c separator-chars)
-                         (cons "" (read-fields (read-char port))))
-                        ;; If we're ignoring leading whitespace, and it's a
-                        ;; whitespace-chars character, then recurse to keep
-                        ;; finding the field start.
-                        ((and strip-leading-whitespace?
-                              (memv c whitespace-chars))
-                         (read-fields (read-char port)))
-                        ;; If a quote, read a quoted field.
-                        ((and quote-char (eqv? c quote-char))
-                         (let ((os (open-output-string)))
-                           (let loop ((c (read-char port)))
-                             (cond
-                              ((or (eof-object? c)
-                                   (and (not newlines-in-quotes?)
-                                        (newline-check newline-type
-                                                       c port dnlt)))
-                               (list (%csv:gosc os)))
-                              ((and quote-char (eqv? c quote-char))
-                               (if quote-doubling-escapes?
-                                   (let ((c2 (read-char port)))
-                                     (if (eqv? c2 quote-char)
-                                         (begin (write-char c2 os)
-                                                (loop (read-char port)))
-                                         (gosc-cons
-                                          os
-                                          (let skip-after ((c c2))
-                                            (cond
-                                             ((or (eof-object? c)
-                                                  (newline-check
-                                                   newline-type c port dnlt))
-                                              '())
-                                             ((memv c separator-chars)
-                                              (read-fields (read-char port)))
-                                             ((memv c whitespace-chars)
-                                              ;; Note: We tolerate
-                                              ;; whitespace after field
-                                              ;; close quote even if
-                                              ;; skip-trailing-whitespace?
-                                              ;; is false.
-                                              (skip-after (read-char port)))
-                                             (else (%csv:csv-error
-                                                    'junk-after-quote-close
-                                                    c)))))))
-                                   (gosc-cons os
-                                              (read-fields (read-char port)))))
-                              (else (write-char c os)
-                                    (loop (read-char port)))))))
-                        ;; It's the start of an unquoted field.
-                        (else
-                         (let ((os (open-output-string)))
-                           (write-char c os)
-                           (let loop ((c (read-char port)))
-                             (cond
-                              ((or (eof-object? c)
-                                   (newline-check newline-type c port dnlt))
-                               (list (get-output-string os)))
-                              ((memv c separator-chars)
-                               (gosc-cons os (read-fields (read-char port))))
-                              ((and strip-trailing-whitespace?
-                                    (memv c whitespace-chars))
-                               ;; TODO: Maybe optimize to avoid creating a new
-                               ;; output string every time we see whitespace.
-                               ;; We could use a string collector with unwrite.
-                               ;; And/or do lookahead to see whether whitespace
-                               ;; is only one character.  Do this after we have
-                               ;; a better regression test suite.
-                               (let ((ws-os (open-output-string)))
-                                 (write-char c ws-os)
-                                 (let ws-loop ((c (read-char port)))
-                                   (cond
-                                    ((or (eof-object? c)
-                                         (newline-check
-                                          newline-type c port dnlt))
-                                     (close-output-port ws-os)
-                                     (list (%csv:gosc os)))
-                                    ((memv c separator-chars)
-                                     (close-output-port ws-os)
-                                     (gosc-cons os (read-fields (read-char
-                                                                 port))))
-                                    ((memv c whitespace-chars)
-                                     (write-char c ws-os)
-                                     (ws-loop (read-char port)))
-                                    (else
-                                     (display (%csv:gosc ws-os) os)
-                                     (write-char c os)
-                                     (loop (read-char port)))))))
-                              (else (write-char c os)
-                                    (loop (read-char port)))))))))))
-                (if (null? row)
-                    row
-                    (if (eq? newline-type 'detect)
-                        (cons dnlt row)
-                        row)))))))))))
-
-(define %csv:make-portreader
-  ;; TODO: Make a macro for the three times we list the spec attributes.
-  (letrec ((pb (lambda (x) (if x #t #f)))
-           (pc (lambda (x)
-                 (cond ((char?   x) x)
-                       ((string? x) (case (string-length x)
-                                      ((1)  (string-ref  x 0))
-                                      (else (%csv:type-error
-                                             "make-csv-reader-maker"
-                                             "character"
-                                             x))))
-                       (else (%csv:type-error "make-csv-reader-maker"
-                                              "character"
-                                              x)))))
-           (pc-f (lambda (x)
-                   (cond ((not     x) x)
-                         ((char?   x) x)
-                         ((string? x) (case (string-length x)
-                                        ((0)  #f)
-                                        ((1)  (string-ref  x 0))
-                                        (else (%csv:type-error
-                                               "make-csv-reader-maker"
-                                               "character or #f"
-                                               x))))
-                         (else (%csv:type-error "make-csv-reader-maker"
-                                                "character or #f"
-                                                x)))))
-           (pe (lambda (x acceptable)
-                 (if (memq x acceptable)
-                     x
-                     (%csv:type-error
-                      "make-csv-reader-maker"
-                      (let ((os (open-output-string)))
-                        (display "symbol from the set " os)
-                        (write acceptable os)
-                        (%csv:gosc os))
-                      x))))
-           (plc-n (lambda (x)
-                    (or (list? x)
-                        (%csv:type-error "make-csv-reader-maker"
-                                         "list of characters"
-                                         x))
-                    (map pc x)))
-           (plc (lambda (x)
-                  (let ((result (plc-n x)))
-                    (if (null? result)
-                        (%csv:type-error "make-csv-reader-maker"
-                                         "non-null list of characters"
-                                         x)
-                        result)))))
-    (lambda (reader-spec)
-      (let ((newline-type               'lax)
-            (separator-chars            '(#\,))
-            (quote-char                 #\")
-            (quote-doubling-escapes?    #t)
-            (comment-chars              '())
-            (whitespace-chars           '(#\space))
-            (strip-leading-whitespace?  #f)
-            (strip-trailing-whitespace? #f)
-            (newlines-in-quotes?        #t))
-        ;; TODO: It's erroneous to have two entries for the same attribute in a
-        ;; spec.  However, it would be nice if we error-detected duplicate
-        ;; entries, or at least had assq semantics (first, rather than last,
-        ;; wins).  Use csv-spec-derive's descendants for that.
-        (for-each
-         (lambda (item)
-           (let ((v (cdr item)))
-             (case (car item)
-               ((newline-type)
-                (set! newline-type (pe v '(cr crlf detect lax lf))))
-               ((separator-chars)
-                (set! separator-chars (plc v)))
-               ((quote-char)
-                (set! quote-char (pc-f v)))
-               ((quote-doubling-escapes?)
-                (set! quote-doubling-escapes? (pb v)))
-               ((comment-chars)
-                (set! comment-chars (plc-n v)))
-               ((whitespace-chars)
-                (set! whitespace-chars (plc-n v)))
-               ((strip-leading-whitespace?)
-                (set! strip-leading-whitespace?  (pb v)))
-               ((strip-trailing-whitespace?)
-                (set! strip-trailing-whitespace? (pb v)))
-               ((newlines-in-quotes?)
-                (set! newlines-in-quotes? (pb v))))))
-         reader-spec)
-        (%csv:make-portreader/positional
-         newline-type
-         separator-chars
-         quote-char
-         quote-doubling-escapes?
-         comment-chars
-         whitespace-chars
-         strip-leading-whitespace?
-         strip-trailing-whitespace?
-         newlines-in-quotes?)))))
-
-;;; @defproc make-csv-reader-maker reader-spec
-;;;
-;;; Constructs a CSV reader constructor procedure from the @var{reader-spec},
-;;; with unspecified attributes having their default values.
-;;;
-;;; For example, given the input file @code{fruits.csv} with the content:
-;;;
-;;; @example
-;;; apples  |  2 |  0.42
-;;; bananas | 20 | 13.69
-;;; @end example
-;;;
-;;; a reader for the file's apparent format can be constructed like:
-;;;
-;;; @lisp
-;;; (define make-food-csv-reader
-;;;   (make-csv-reader-maker
-;;;    '((separator-chars            . (#\|))
-;;;      (strip-leading-whitespace?  . #t)
-;;;      (strip-trailing-whitespace? . #t))))
-;;; @end lisp
-;;;
-;;; The resulting @code{make-food-csv-reader} procedure accepts one argument,
-;;; which is either an input port from which to read, or a string from which to
-;;; read.  Our example input file then can be be read by opening an input port
-;;; on a file and using our new procedure to construct a reader on it:
-;;;
-;;; @lisp
-;;; (define next-row
-;;;   (make-food-csv-reader (open-input-file "fruits.csv")))
-;;; @end lisp
-;;;
-;;; This reader, @code{next-row}, can then be called repeatedly to yield a
-;;; parsed representation of each subsequent row.  The parsed format is a list
-;;; of strings, one string for each column.  The null list is yielded to
-;;; indicate that all rows have already been yielded.
-;;;
-;;; @lisp
-;;; (next-row) @result{} ("apples" "2" "0.42")
-;;; (next-row) @result{} ("bananas" "20" "13.69")
-;;; (next-row) @result{} ()
-;;; @end lisp
-
-(define (make-csv-reader-maker reader-spec)
-  (let ((make-portread
-         (if (let ((p (assq 'newline-type reader-spec))) (and p (cdr p)))
-             ;; Newline-adapting portreader-maker.
-             (letrec
-                 ((detect-portread
-                   (%csv:make-portreader
-                    (%csv:csv-spec-derive reader-spec
-                                          '((newline-type . detect)))))
-                  ;; TODO: The set of cr/crlf/lf newline-type portreaders are
-                  ;; constructed optimistically right now for two reasons:
-                  ;; 1. we don't yet sanitize reader-specs of shared structure
-                  ;; that can be mutated behind our backs; 2. eventually, we
-                  ;; want to add a "lots-o-shots?" argument that, when true,
-                  ;; would do this anyway.  Consider.
-                  (cr-portread
-                   (%csv:make-portreader
-                    (%csv:csv-spec-derive reader-spec
-                                          '((newline-type . cr)))))
-                  (crlf-portread
-                   (%csv:make-portreader
-                    (%csv:csv-spec-derive reader-spec
-                                          '((newline-type . crlf)))))
-                  (lf-portread
-                   (%csv:make-portreader
-                    (%csv:csv-spec-derive reader-spec
-                                          '((newline-type . lf))))))
-               (lambda ()
-                 (let ((actual-portread #f))
-                   (let ((adapt-portread
-                          (lambda (port)
-                            (let ((dnlt-row (detect-portread port)))
-                              (if (null? dnlt-row)
-                                  dnlt-row
-                                  (begin (set! actual-portread
-                                               (case (car dnlt-row)
-                                                 ((cr)   cr-portread)
-                                                 ((crlf) crlf-portread)
-                                                 ((lf)   lf-portread)
-                                                 (else   actual-portread)))
-                                         (cdr dnlt-row)))))))
-                     (set! actual-portread adapt-portread)
-                     (lambda (port) (actual-portread port))))))
-             ;; Stateless portreader-maker.
-             (let ((reusable-portread
-                    (%csv:make-portreader reader-spec)))
-               (lambda () reusable-portread)))))
-    (lambda (in)
-      (let ((port     (%csv:in-arg "[csv-reader]" in))
-            (portread (make-portread)))
-        (lambda () (portread port))))))
-
-;;; @section Making Readers
-
-;;; In addition to being constructed from the result of
-;;; @code{make-csv-reader-maker}, CSV readers can also be constructed using
-;;; @code{make-csv-reader}.
-
-;;; @defproc make-csv-reader in [reader-spec]
-;;;
-;;; Construct a CSV reader on the input @var{in}, which is an input port or a
-;;; string.  If @var{reader-spec} is given, and is not the null list, then a
-;;; ``one-shot'' reader constructor is constructed with that spec and used.  If
-;;; @var{reader-spec} is not given, or is the null list, then the default CSV
-;;; reader constructor is used.  For example, the reader from the
-;;; @code{make-csv-reader-maker} example could alternatively have been
-;;; constructed like:
-;;;
-;;; @lisp
-;;; (define next-row
-;;;   (make-csv-reader
-;;;    (open-input-file "fruits.csv")
-;;;    '((separator-chars            . (#\|))
-;;;      (strip-leading-whitespace?  . #t)
-;;;      (strip-trailing-whitespace? . #t))))
-;;; @end lisp
-
-(define make-csv-reader
-  (let ((default-maker (make-csv-reader-maker '())))
-    (lambda (in . rest)
-      (let ((spec (cond 
-                    ((null? rest)       '())
-                    ((null? (cdr rest)) (car rest))
-                    (else (%csv:error "make-csv-reader" "extraneous arguments" (cdr rest))))))
-        ((if (null? spec)
-             default-maker
-             (make-csv-reader-maker spec))
-         (%csv:in-arg "make-csv-reader" in))))))
-
-;;; @section High-Level Conveniences
-
-;;; Several convenience procedures are provided for iterating over the CSV rows
-;;; and for converting the CSV to a list.
-;;;
-;;; To the dismay of some Scheme purists, each of these procedures accepts a
-;;; @var{reader-or-in} argument, which can be a CSV reader, an input port, or a
-;;; string.  If not a CSV reader, then the default reader constructor is used.
-;;; For example, all three of the following are equivalent:
-;;;
-;;; @lisp
-;;; (csv->list                                     STRING  )
-;;; @equiv{}
-;;; (csv->list (make-csv-reader                    STRING ))
-;;; @equiv{}
-;;; (csv->list (make-csv-reader (open-input-string STRING )))
-;;; @end lisp
-
-;;; @defproc csv-for-each proc reader-or-in
-;;;
-;;; Similar to Scheme's @code{for-each}, applies @var{proc}, a procedure of one
-;;; argument, to each parsed CSV row in series.  @var{reader-or-in} is the CSV
-;;; reader, input port, or string.  The return value is undefined.
-
-;; TODO: Doc an example for this.
-
-(define (csv-for-each proc reader-or-in)
-  (let ((reader (%csv:reader-or-in-arg "csv-for-each" reader-or-in)))
-    (let loop ((row (reader)))
-      (or (null? row)
-          (begin (proc row)
-                 (loop (reader)))))))
-
-;;; @defproc csv-map proc reader-or-in
-;;;
-;;; Similar to Scheme's @code{map}, applies @var{proc}, a procedure of one
-;;; argument, to each parsed CSV row in series, and yields a list of the values
-;;; of each application of @var{proc}, in order.  @var{reader-or-in} is the CSV
-;;; reader, input port, or string.
-
-;; TODO: Doc an example for this.
-
-;; (define (csv-map proc reader-or-in)
-;;   (let ((reader (%csv:reader-or-in-arg "csv-for-each" reader-or-in)))
-;;     (let ((head '()))
-;;       (let ((row (reader)))
-;;         (if (null? row)
-;;             head
-;;             (let ((pair (cons (proc row) '())))
-;;               (set! head pair)
-;;               (let loop ((prior pair))
-;;                 (let ((row (reader)))
-;;                   (if (null? row)
-;;                       head
-;;                       (let ((pair (cons (proc row) '())))
-;;                         (set-cdr! prior pair)
-;;                         (loop pair)))))))))))
-
-(define (csv-map proc reader-or-in)
-  (let ((reader (%csv:reader-or-in-arg "csv-for-each" reader-or-in)))
-    (let loop ((row (reader)) (ret null))
-      (if (null? row)
-          (reverse ret)
-          (let ((ret (cons (proc row) ret)))
-            (loop (reader) ret))))))
-
-;;; @defproc csv->list reader-or-in
-;;;
-;;; Yields a list of CSV row lists from input @var{reader-or-in}, which is a
-;;; CSV reader, input port, or string.
-
-;; TODO: Doc an example for this.
-
-;; (define (csv->list reader-or-in)
-;;   (let ((reader (%csv:reader-or-in-arg "csv->list" reader-or-in)))
-;;     (let ((head '()))
-;;       (let ((row (reader)))
-;;         (if (null? row)
-;;             head
-;;             (let ((pair (cons row '())))
-;;               (set! head pair)
-;;               (let loop ((prior pair))
-;;                 (let ((row (reader)))
-;;                   (if (null? row)
-;;                       head
-;;                       (let ((pair (cons row '())))
-;;                         (set-cdr! prior pair)
-;;                         (loop pair)))))))))))
-
-(define (csv->list reader-or-in)
-  (csv-map values reader-or-in))
-
-;;; @section Converting CSV to SXML
-
-;;; The @code{csv->sxml} procedure can be used to convert CSV to SXML format,
-;;; for processing with various XML tools.
-
-;;; @defproc csv->sxml reader-or-in [row-element [col-elements]]
-;;;
-;;; Reads CSV from input @var{reader-or-in} (which is a CSV reader, input port,
-;;; or string), and yields an SXML representation.  If given, @var{row-element}
-;;; is a symbol for the XML row element.  If @var{row-element} is not given,
-;;; the default is the symbol @code{row}.  If given @var{col-elements} is a
-;;; list of symbols for the XML column elements.  If not given, or there are
-;;; more columns in a row than given symbols, column element symbols are of the
-;;; format @code{col-@var{n}}, where @var{n} is the column number (the first
-;;; column being number 0, not 1).
-;;;
-;;; For example, given a CSV-format file @code{friends.csv} that has the
-;;; contents:
-;;;
-;;; @example
-;;; Binoche,Ste. Brune,33-1-2-3
-;;; Posey,Main St.,555-5309
-;;; Ryder,Cellblock 9,
-;;; @end example
-;;;
-;;; with elements not given, the result is:
-;;;
-;;; @lisp
-;;; (csv->sxml (open-input-file "friends.csv"))
-;;; @result{}
-;;; (*TOP*
-;;;  (row (col-0 "Binoche") (col-1 "Ste. Brune")  (col-2 "33-1-2-3"))
-;;;  (row (col-0 "Posey")   (col-1 "Main St.")    (col-2 "555-5309"))
-;;;  (row (col-0 "Ryder")   (col-1 "Cellblock 9") (col-2 "")))
-;;; @end lisp
-;;;
-;;; With elements given, the result is like:
-;;;
-;;; @lisp
-;;; (csv->sxml (open-input-file "friends.csv")
-;;;            'friend
-;;;            '(name address phone))
-;;; @result{}
-;;; (*TOP* (friend (name    "Binoche")
-;;;                (address "Ste. Brune")
-;;;                (phone   "33-1-2-3"))
-;;;        (friend (name    "Posey")
-;;;                (address "Main St.")
-;;;                (phone   "555-5309"))
-;;;        (friend (name    "Ryder")
-;;;                (address "Cellblock 9")
-;;;                (phone   "")))
-;;; @end lisp
-
-(define csv->sxml
-  (let* ((top-symbol
-          (string->symbol "*TOP*"))
-         (make-col-symbol
-          (lambda (n)
-            (string->symbol (string-append "col-" (number->string n)))))
-         (default-col-elements
-           (let loop ((i 0))
-             (if (= i 32) ; arbitrary magic number
-                 '()
-                 (cons (make-col-symbol i) (loop (+ 1 i)))))))
-    ;; TODO: Have option to error when columns count doesn't match provided
-    ;; column name list.
-    (lambda (reader-or-in . rest)
-      (let ((reader       (%csv:reader-or-in-arg "csv->sxml"
-                                                 reader-or-in))
-            (row-element  'row)
-            (col-elements #f))
-        ;; TODO: Maybe use case-lambda.
-        (or (null? rest)
-            (begin (set! row-element (car rest))
-                   (let ((rest (cdr rest)))
-                     (or (null? rest)
-                         (begin (set! col-elements (car rest))
-                                (let ((rest (cdr rest)))
-                                  (or (null? rest)
-                                      (%csv:error
-                                       "csv->sxml"
-                                       "extraneous arguments"
-                                       rest))))))))
-        ;; TODO: We could clone and grow default-col-elements for the duration
-        ;; of this procedure.
-        (cons top-symbol
-              (csv-map (lambda (row)
-                         (cons row-element
-                               (let loop ((vals  row)
-                                          (i     0)
-                                          (names (or col-elements
-                                                     default-col-elements)))
-                                 (if (null? vals)
-                                     '()
-                                     (cons (list (if (null? names)
-                                                     (make-col-symbol i)
-                                                     (car names))
-                                                 (car vals))
-                                           (loop (cdr vals)
-                                                 (+ 1 i)
-                                                 (if (null? names)
-                                                     '()
-                                                     (cdr names))))))))
-                       reader))))))
-
-;; TODO: Make a define-csv-reader/positional, for great constant-folding.
-;; That's part of the reason some things are done the way they are.
-
-;; TODO: Make a csv-bind, as a newbie convenience for people without advanced
-;; match forms, which looks good in examples.  This is better than a
-;; csv-map/bind and a csv-for-each/bind.
-;;
-;; (csv-for-each/bind ((column-binding ...) body ...)
-;;               { (else => closure) | (else body ...) | }
-;;               input-port
-;;               [ csv-reader ])
-;;
-;; (csv-for-each/bind
-;;  ((lastname firstname email)
-;;   ...)
-;;  (else => (lambda (row) (error "CSV row didn't match pattern" row)))
-;;  my-input-port
-;;  my-csv-reader)
-
-;; TODO: Handle escapes, once we find an actual example or specification of any
-;; flavor of escapes in CSV other than quote-doubling inside a quoted field.
-
-;; TODO: Add a spec attribute for treating adjacent separators as one, or
-;; skipping empty fields.  This would probably only be used in practice for
-;; parsing whitespace-separated input.
-
-;; TODO: Get access to MS Excel or documentation, and make this correct.
-;;
-;; (define msexcel-csv-reader-spec
-;;   '((newline-type               . crlf)
-;;     (separator-chars            . (#\,))
-;;     (quote-char                 . #\")
-;;     (quote-doubling-escapes?    . #t)
-;;     (comment-chars              . ())
-;;     (whitespace-chars           . (#\space))
-;;     (strip-leading-whitespace?  . #f)
-;;     (strip-trailing-whitespace? . #f)
-;;     (newlines-in-quotes?        . #t)))
-
-;; TODO: Maybe put this back in.
-;;
-;; (define default-csv-reader-spec
-;;   '((newline-type               . lax)
-;;     (separator-chars            . (#\,))
-;;     (quote-char                 . #\")
-;;     (quote-doubling-escapes?    . #t)
-;;     (comment-chars              . ())
-;;     (whitespace-chars           . (#\space))
-;;     (strip-leading-whitespace?  . #f)
-;;     (strip-trailing-whitespace? . #f)
-;;     (newlines-in-quotes?        . #t)))
-
-;; TODO: Implement CSV writing, after CSV reading is field-tested and polished.
-
-;; TODO: Call "close-input-port" once eof-object is hit, but make sure we still
-;; can return an empty list on subsequent calls to the CSV reader.
-
-;; TODO: Consider switching back to returning eof-object at the end of input.
-;; We originally changed to returning the null list because we might want to
-;; synthesize the EOF, and there is no R5RS binding for the eof-object.
-
-;; TODO: [2005-12-09] In one test, Guile has a stack overflow when parsing a
-;; row with 425 columns.  Wouldn't hurt to see if we can make things more
-;; tail-recursive.
-
-;;; @unnumberedsec History
-
-;;; @table @asis
-;;;
-;;; @item Version 0.10 -- 2010-04-13 -- PLaneT @code{(1 6)}
-;;; Documentation fix.
-;;;
-;;; @item Version 0.9 -- 2009-03-14 -- PLaneT @code{(1 5)}
-;;; Documentation fix.
-;;;
-;;; @item Version 0.8 -- 2009-02-23 -- PLaneT @code{(1 4)}
-;;; Documentation changes.
-;;;
-;;; @item Version 0.7 -- 2009-02-22 -- PLaneT @code{(1 3)}
-;;; License is now LGPL 3.  Moved to author's new Scheme administration system.
-;;;
-;;; @item Version 0.6 -- 2008-08-12 -- PLaneT @code{(1 2)}
-;;; For PLT 4 compatibility, new versions of @code{csv-map} and
-;;; @code{csv->list} that don't use @code{set-cdr!} (courtesy of Doug
-;;; Orleans). PLT 4 @code{if} compatibility change.  Minor documentation fixes.
-;;;
-;;; @item Version 0.5 --- 2005-12-09
-;;; Changed a non-R5RS use of @code{letrec} to @code{let*}, caught by Guile and
-;;; David Pirotte.
-;;;
-;;; @item Version 0.4 --- 2005-06-07
-;;; Converted to Testeez.  Minor documentation changes.
-;;;
-;;; @item Version 0.3 --- 2004-07-21
-;;; Minor documentation changes.  Test suite now disabled by default.
-;;;
-;;; @item Version 0.2 --- 2004-06-01
-;;; Work-around for @code{case}-related bug observed in Gauche 0.8 and 0.7.4.2
-;;; that was tickled by @code{csv-internal:make-portreader/positional}.  Thanks
-;;; to Grzegorz Chrupa@l{}a for reporting.
-;;;
-;;; @item Version 0.1 --- 2004-05-31
-;;; First release, for testing with real-world input.
-;;;
-;;; @end table
-
-(provide
- csv->list
- csv->sxml
- csv-for-each
- csv-map
- make-csv-reader
- make-csv-reader-maker)
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/friends.csv b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/friends.csv
deleted file mode 100644
index 870e53061f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/friends.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-Binoche,Ste. Brune,33-1-2-3
-Posey,Main St.,555-5309
-Ryder,Cellblock 9,
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/fruit.csv b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/fruit.csv
deleted file mode 100644
index d048c57ecd..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/fruit.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-apples  |  2 |  0.42
-bananas | 20 | 13.69
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/permission.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/permission.txt
deleted file mode 100644
index 5212f4d44d..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/permission.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Neil Van Dyke <neil@neilvandyke.org>
-Date: April 13, 2010 2:39:54 PM EDT
-To: Matthias Felleisen <matthias@ccs.neu.edu>
-Subject: Re: csv package
-
-Matthias, sure, you guys may include it, if you want to.
-
-I have to retain copyright, since it's used by people with several non-PLT Scheme implementations.
-
-If LGPL 3 license is a problem, and you're looking for a LPGL 2.x, I could change the license.
-
-I've attached a ".zip" file of the sources of the latest version.  PLaneT has the sources for the specific version you mentioned.  Let me know if you need something else.
-
-Cheers,
-Neil
-
-Matthias Felleisen wrote at 04/13/2010 11:08 AM:
-
-Neil, would it be okay with you if I provide your csv package from the core:
-
- (require (planet neil/csv:1:2/csv))
-
-If so, could you send me your sources? Thanks -- Matthias
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/define-keywords.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/define-keywords.rkt
deleted file mode 100644
index b41b8b8416..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/define-keywords.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-
-;; ---------------------------------------------------------------------------------------------------
-;; provide a mechanism for defining the shape of big-bang and universe clauses 
-;; to specify individual clauses see syn-aux.rkt
-
-(provide define-keywords DEFAULT)
-
-(require racket/class
-         (for-syntax racket/base syntax/parse))
-
-(define-syntax (DEFAULT stx)
-  (raise-syntax-error 'DEFAULT "used out of context" stx))
-
-(define-syntax (define-keywords stx)
-  (syntax-parse stx #:literals (DEFAULT) 
-    [(_ the-list super-list define-create
-        (kw:identifier 
-         (~optional kw-alt:identifier #:defaults ((kw-alt #'kw)))
-         (~optional (~seq DEFAULT default:expr))
-         coerce:expr) ...)
-     (let* ([defs (attribute default)])
-       #`(begin
-           ;; define and create list of keywords and associated values 
-           (define-for-syntax the-list
-             (list* (list #'kw #'kw-alt (coerce ''kw) default) ... super-list))
-           ;; define and provide keywords
-           (provide (rename-out (kw  kw-alt) ...))
-           (provide kw ...) 
-           (define-syntaxes (kw ...)
-             (values
-              (lambda (x) 'kw (raise-syntax-error #f "used out of context" x))
-              ...))
-           
-           ;; a macro for creating functions that instantiate the proper object
-           ;; (define-create para ...) :: additional parameters for the new func
-           (define-syntax (define-create stx)
-             (syntax-case stx ()
-               [(_ para (... ...))
-                (let*-values
-                    ([(kwds defs)
-                      (values (map car the-list) '())]
-                     ;; the defaults list defs is no longer needed
-                     [(args) (lambda (para*) (append para* (foldr cons '() kwds)))]
-                     [(body) (lambda (para*) (map (lambda (x) `(,x ,x)) (append para* kwds)))])
-                  (let ([para* (syntax->list #'(para (... ...)))])
-                    #`(lambda (%)
-                        (lambda #,(args para*)
-                          (lambda ()
-                            (new % #,@(body para*)))))))]))))]))
\ No newline at end of file
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/design.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/design.txt
deleted file mode 100644
index a9d7c6b259..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/design.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Files for constructing universe.rkt:
-
- world.rkt              the old world
-                        world%  = (clock-mixin ...) -- the basic world
-                        aworld% = (class world% ...) -- the world with recording
-
- universe.rkt           the universe server
-                        universe% = (clock-mixin ...) -- the basic universe
-
- timer.rkt              the clock-mixin
-
- check-aux.rkt          common primitives
- image.rkt              the world image functions
- clauses-spec-and-process.rkt syntactic auxiliaries
- clauses-spec-aux.rkt        auxiliaries to the syntactic auxiliaries
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/gamepad.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/gamepad.png
deleted file mode 100644
index ee79693ac4..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/gamepad.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-core.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-core.rkt
deleted file mode 100644
index a23c45e520..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-core.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-;; this is here as a backwards compatibility file to provide the snipclass 
-(require mrlib/image-core)
-(provide snip-class)
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-more.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-more.rkt
deleted file mode 100644
index 58b382a850..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-more.rkt
+++ /dev/null
@@ -1,1641 +0,0 @@
-#lang racket/base
-
-(require mrlib/image-core
-         "img-err.rkt"
-         racket/match
-         racket/contract
-         racket/class
-         (except-in racket/draw
-                    make-pen make-color)
-         ;(only-in racket/gui/base frame% canvas% slider% horizontal-panel% button%)
-         htdp/error
-         racket/math
-         (for-syntax racket/base
-                     racket/list)
-         lang/posn
-         net/url)
-
-;; for testing
-; (require racket/gui/base)
-#;
-(define (show-image arg [extra-space 0])
-  (letrec ([g (to-img arg)]
-           [f (new frame% [label ""])]
-           [c (new canvas% 
-                   [parent f]
-                   [min-width (+ extra-space (image-width g))]
-                   [min-height (+ extra-space (image-height g))]
-                   [paint-callback
-                    (λ (c dc)
-                      (send dc set-smoothing 'aligned)
-                      (let-values ([(w h) (send c get-client-size)])
-                        (let ([scale (send sl get-value)])
-                          (send dc set-scale scale scale)
-                          (render-image 
-                           g
-                           dc
-                           (inexact->exact (floor (- (/ w 2 scale) (/ (get-right g) 2))))
-                           (inexact->exact (floor (- (/ h 2 scale) (/ (get-bottom g) 2))))))))])]
-           [min-scale 1]
-           [max-scale 10]
-           [sl (new slider% 
-                    [label "Scale factor"] 
-                    [parent f] 
-                    [min-value min-scale]
-                    [max-value max-scale]
-                    [callback (λ ignore (send c refresh))])]
-           [bp (new horizontal-panel% 
-                    [parent f]
-                    [alignment '(center center)]
-                    [stretchable-height #f])]
-           [scale-adjust
-            (λ (f)
-              (send sl set-value 
-                    (max min-scale (min max-scale (f (send sl get-value)))))
-              (send c refresh))])
-    (send (new button% 
-               [label "√"] 
-               [callback (λ x (scale-adjust sub1))] 
-               [parent bp]) min-width 100)
-    (send (new button% 
-               [label "2"]
-               [callback (λ x (scale-adjust add1))]
-               [parent bp]) min-width 100)
-    (send f show #t)))
-
-;; the obfuscation in the width and height defaults 
-;; is so that error checking happens in the right order
-(define/chk (save-image image
-                        filename 
-                        [width (if (image? image) (image-width image) 0)] 
-                        [height (if (image? image) (image-height image) 0)])
-  (check-dependencies 'save-image
-                      (not (zero? width))
-                      "the width must not be zero, got ~e"
-                      width)
-  (check-dependencies 'save-image
-                      (not (zero? height))
-                      "the width must not be zero, got ~e"
-                      height)
-  (let* ([bm (make-bitmap (inexact->exact (ceiling width)) 
-                          (inexact->exact (ceiling height)))]
-         [bdc (make-object bitmap-dc% bm)])
-    (send bdc set-smoothing 'aligned)
-    (send bdc erase)
-    (render-image image bdc 0 0)
-    (send bdc set-bitmap #f)
-    (send bm save-file filename 'png)))
-
-(define/chk (save-svg-image image
-                            filename 
-                            [width (if (image? image) (image-width image) 0)] 
-                            [height (if (image? image) (image-height image) 0)])
-  (call-with-output-file filename
-    (λ (port)
-      (define sdc (new svg-dc% [width width] [height height] [output port]))
-      (send sdc start-doc "")
-      (send sdc start-page)
-      (send sdc set-smoothing 'aligned)
-      (render-image image sdc 0 0)
-      (send sdc end-page)
-      (send sdc end-doc))
-    #:exists 'truncate))
-
-(define (get-right img) (bb-right (send img get-bb)))
-(define (get-bottom img) (bb-bottom (send img get-bb)))
-(define (get-baseline img) (bb-baseline (send img get-bb)))
-
-;                                              
-;                                              
-;                                              
-;                              ;;              
-;                              ;;              
-;                              ;;              
-;    ;;;;  ;;;  ;;;;;;   ;; ;  ;; ;;;;;  ;;;  ;
-;   ;;  ;;  ;;  ;;;; ;;  ;;;;  ;; ;   ;;  ;; ;;
-;  ;;;  ;;  ;;;; ;;;;;;  ;;    ;;   ;;;;  ;;;; 
-;  ;;;  ;;  ;;;; ;;      ;;    ;; ;;  ;;   ;;; 
-;   ;;  ;;   ;;; ;;;  ;  ;;    ;; ;;  ;;   ;;; 
-;    ;;;;    ;;   ;;;;   ;;    ;; ;;;;;;;  ;;  
-;                                          ;;  
-;                                          ;   
-;                                         ;;   
-                                                                            
-
-;; scale : number image -> image
-(define/chk (scale factor image)
-  (scale-internal factor factor image))
-
-(define/chk (scale/xy x-factor y-factor image)
-  (scale-internal x-factor y-factor image))
-
-(define (scale-internal x-factor y-factor image)
-  (let ([ph (send image get-pinhole)])
-    (make-image (make-scale x-factor y-factor (image-shape image))
-                (make-bb (* x-factor (get-right image))
-                         (* y-factor (get-bottom image))
-                         (* y-factor (get-baseline image)))
-                #f
-                (and ph 
-                     (make-point (* x-factor (point-x ph))
-                                 (* y-factor (point-y ph)))))))
-
-;; overlay : image image image ... -> image
-;; places images on top of each other with their upper left corners aligned. 
-;; last one goes on the bottom
-(define/chk (overlay image image2 . image3)
-  (overlay/internal 'middle 'middle image (cons image2 image3) #t))
-
-;; underlay : image image image ... -> image
-(define/chk (underlay image image2 . image3)
-  (let ([imgs (reverse (list* image image2 image3))])
-    (overlay/internal 'middle 'middle (car imgs) (cdr imgs) #f)))
-
-;; overlay/align : string string image image image ... -> image
-;; the first string has to be one of "center" "middle" "left" or "right" (or symbols)
-;; the second string has to be one of "center" "middle" "top" "bottom" or "baseline" (or symbols)
-;; behaves like overlay, but lines up the images in the various places.
-;; overlay without string arguments is the same as passing "left" and "top"
-;; for the two string arguments. Passing, eg, "center" "center" lines the
-;; images up at their centers.
-
-(define/chk (overlay/align x-place y-place image image2 . image3)
-  (when (or (eq? x-place 'pinhole) (eq? y-place 'pinhole))
-    (check-dependencies
-     'overlay/align
-     (and (send image get-pinhole)
-          (send image2 get-pinhole)
-          (andmap (λ (x) (send x get-pinhole))
-                  image3))
-     "when x-place or y-place is ~e or ~e, then all of the arguments must have pinholes"
-     'pinhole "pinhole"))
-  (overlay/internal x-place y-place image (cons image2 image3) #t))
-
-(define/chk (underlay/align x-place y-place image image2 . image3)
-  (when (or (eq? x-place 'pinhole) (eq? y-place 'pinhole))
-    (check-dependencies
-     'underlay/align
-     (and (send image get-pinhole)
-          (send image2 get-pinhole)
-          (andmap (λ (x) (send x get-pinhole))
-                  image3))
-     "when x-place or y-place is ~e or ~e, then all of the arguments must have pinholes"
-     'pinhole "pinhole"))
-  (let ([imgs (reverse (list* image image2 image3))])
-    (overlay/internal x-place y-place (car imgs) (cdr imgs) #f)))
-
-(define/chk (overlay/pinhole image1 image2 . image3)
-  (overlay/internal 'pinhole 'pinhole 
-                    (maybe-center-pinhole image1)
-                    (map maybe-center-pinhole (cons image2 image3))
-                    #t))
-
-(define/chk (underlay/pinhole image1 image2 . image3)
-  (let ([imgs (map maybe-center-pinhole (reverse (list* image1 image2 image3)))])
-    (overlay/internal 'pinhole 'pinhole
-                      (car imgs)
-                      (cdr imgs)
-                      #f)))
-
-(define (maybe-center-pinhole img)
-  (if (send img get-pinhole)
-      img
-      (center-pinhole img)))
-
-(define (overlay/internal x-place y-place fst rst first-pinhole?)
-  (let loop ([fst fst]
-             [rst rst])
-    (cond
-      [(null? rst) fst]
-      [else 
-       (let* ([fst-x-spot (find-x-spot x-place fst)]
-              [fst-y-spot (find-y-spot y-place fst)]
-              [snd-x-spot (find-x-spot x-place (car rst))]
-              [snd-y-spot (find-y-spot y-place (car rst))]
-              [dx (- fst-x-spot snd-x-spot)]
-              [dy (- fst-y-spot snd-y-spot)])
-         (loop (overlay/δ fst
-                          (if (< dx 0) (- dx) 0) 
-                          (if (< dy 0) (- dy) 0)
-                          (car rst)
-                          (if (< dx 0) 0 dx)
-                          (if (< dy 0) 0 dy)
-                          first-pinhole?
-                          #f)
-               (cdr rst)))])))
-
-(define (find-x-spot x-place image)
-  (case x-place
-    [(left) 0]
-    [(middle) (/ (get-right image) 2)]
-    [(right) (get-right image)]
-    [(pinhole) (point-x (send image get-pinhole))]
-    [else (error 'find-x-spot "~s" x-place)]))
-
-(define (find-y-spot y-place image)
-  (case y-place
-    [(top) 0]
-    [(middle) (/ (get-bottom image) 2)]
-    [(bottom) (get-bottom image)]
-    [(baseline) (get-baseline image)]
-    [(pinhole) (point-y (send image get-pinhole))]
-    [else (error 'find-y-spot "~s" y-place)]))
-
-;; overlay/xy : image number number image -> image
-;; places images on top of each other with their upper-left corners offset by the two numbers
-
-(define/chk (overlay/xy image dx dy image2) 
-  (overlay/δ image
-             (if (< dx 0) (- dx) 0)
-             (if (< dy 0) (- dy) 0)
-             image2
-             (if (< dx 0) 0 dx)
-             (if (< dy 0) 0 dy)
-             #t
-             #f))
-
-(define/chk (underlay/xy image dx dy image2)
-  (overlay/δ image2
-             (if (< dx 0) 0 dx)
-             (if (< dy 0) 0 dy)
-             image
-             (if (< dx 0) (- dx) 0)
-             (if (< dy 0) (- dy) 0)
-             #f
-             #f))
-
-(define (overlay/δ image1 dx1 dy1 image2 dx2 dy2 first-pinhole? beside-baseline?)
-    (make-image (make-overlay (make-translate dx1 dy1 (image-shape image1))
-                              (make-translate dx2 dy2 (image-shape image2)))
-                (make-bb (max (+ (get-right image1) dx1)
-                              (+ (get-right image2) dx2))
-                         (max (+ (get-bottom image1) dy1)
-                              (+ (get-bottom image2) dy2))
-                         (if beside-baseline?
-                             (let ([δ1 (- (get-bottom image1) (get-baseline image1))]
-                                   [δ2 (- (get-bottom image2) (get-baseline image2))]
-                                   [b1 (+ (get-baseline image1) dy1)]
-                                   [b2 (+ (get-baseline image2) dy2)])
-                               (cond
-                                 [(= δ1 δ2) (max b1 b2)]
-                                 [(< δ1 δ2) b2]
-                                 [else b1]))
-                             (max (+ (get-baseline image1) dy1)
-                                  (+ (get-baseline image2) dy2))))
-                #f
-                (if first-pinhole?
-                    (let ([ph (send image1 get-pinhole)])
-                      (and ph
-                           (make-point (+ (point-x ph) dx1)
-                                       (+ (point-y ph) dy1))))
-                    (let ([ph (send image2 get-pinhole)])
-                      (and ph
-                           (make-point (+ (point-x ph) dx2)
-                                       (+ (point-y ph) dy2)))))))
-
-;; beside : image image image ... -> image
-;; places images in a single horizontal row, top aligned
-(define/chk (beside image1 image2 . image3)
-  (beside/internal 'middle image1 (cons image2 image3)))
-
-;; beside/align : string image image image ... -> image
-;; places images in a horizontal row where the vertical alignment is
-;; covered by the string argument
-(define/chk (beside/align y-place image1 image2 . image3)
-  (when (eq? y-place 'pinhole)
-    (check-dependencies 'beside/align
-                        (and (send image1 get-pinhole)
-                             (send image2 get-pinhole)
-                             (andmap (λ (x) (send x get-pinhole))
-                                     image3))
-                        "when y-place is ~e or ~e, then all of the arguments must have pinholes"
-                        'pinhole "pinhole"))
-  (beside/internal y-place image1 (cons image2 image3)))
-
-(define (beside/internal y-place fst rst)
-  (let loop ([fst fst]
-             [rst rst])
-    (cond
-      [(null? rst) fst]
-      [else
-       (let* ([snd (car rst)]
-              [fst-y-spot (find-y-spot y-place fst)]
-              [snd-y-spot (find-y-spot y-place (car rst))]
-              [dy (- fst-y-spot snd-y-spot)])
-         (loop (overlay/δ fst
-                          0 
-                          (if (< dy 0) (- dy) 0)
-                          (car rst)
-                          (get-right fst)
-                          (if (< dy 0) 0 dy)
-                          #t
-                          #t)
-               (cdr rst)))])))
-
-;; above : image image image ... -> image
-;; places images in a single vertical row, left aligned
-(define/chk (above image1 image2 . image3)
-  (above/internal 'middle image1 (cons image2 image3)))
-
-;; beside/align : string image image image ... -> image
-;; places images in a horizontal row where the vertical alignment is
-;; covered by the string argument
-(define/chk (above/align x-place image1 image2 . image3)
-  (when (eq? x-place 'pinhole)
-    (check-dependencies 'above/align
-                        (and (send image1 get-pinhole)
-                             (send image2 get-pinhole)
-                             (andmap (λ (x) (send x get-pinhole))
-                                     image3))
-                        "when x-place is ~e or ~e, then all of the arguments must have pinholes"
-                        'pinhole "pinhole"))
-  (above/internal x-place image1 (cons image2 image3)))
-
-(define (above/internal x-place fst rst)
-  (let loop ([fst fst]
-             [rst rst])
-    (cond
-      [(null? rst) fst]
-      [else
-       (let* ([snd (car rst)]
-              [fst-x-spot (find-x-spot x-place fst)]
-              [snd-x-spot (find-x-spot x-place (car rst))]
-              [dx (- fst-x-spot snd-x-spot)])
-         (loop (overlay/δ fst
-                          (if (< dx 0) (- dx) 0) 
-                          0
-                          (car rst)
-                          (if (< dx 0) 0 dx)
-                          (get-bottom fst)
-                          #t
-                          #f)
-               (cdr rst)))])))
-
-(define/chk (overlay/offset image1 dx dy image2)
-  (overlay/offset/internal 'middle 'middle image1 dx dy image2))
-
-(define/chk (overlay/align/offset x-place y-place image1 dx dy image2)
-  (overlay/offset/internal x-place y-place image1 dx dy image2))
-
-(define/chk (underlay/offset image1 dx dy image2)
-  (overlay/offset/internal 'middle 'middle  image2 (- dx) (- dy) image1))
-
-(define/chk (underlay/align/offset x-place y-place image1 dx dy image2)
-  (overlay/offset/internal x-place y-place image2 (- dx) (- dy) image1))
-
-(define (overlay/offset/internal x-place y-place fst orig-dx orig-dy snd)
-  (let* ([fst-x-spot (find-x-spot x-place fst)]
-         [fst-y-spot (find-y-spot y-place fst)]
-         [snd-x-spot (find-x-spot x-place snd)]
-         [snd-y-spot (find-y-spot y-place snd)]
-         [dx (+ (- fst-x-spot snd-x-spot) orig-dx)]
-         [dy (+ (- fst-y-spot snd-y-spot) orig-dy)])
-    (overlay/δ fst
-               (if (< dx 0) (- dx) 0) 
-               (if (< dy 0) (- dy) 0)
-               snd
-               (if (< dx 0) 0 dx)
-               (if (< dy 0) 0 dy)
-               #t
-               #f)))
-
-
-;                                                                                                  
-;                                                                                                  
-;                                                                                                  
-;                                 ;;;;        ;;                        ;                          
-;                                 ;;;;        ;;                       ;;                          
-;    ;;;;;   ;;;;   ;;;;;;; ;;;;  ;;;;;;;        ;;;; ;;;  ;;;;;;;   ;;;;;   ;;;;   ;;; ;;;  ;;;;; 
-;   ;;;;;;  ;;;;;;  ;;;;;;;;;;;;; ;;;;;;;;  ;;;; ;;;;;;;;; ;;;;;;;; ;;;;;;  ;;;;;;  ;;;;;;; ;;;;;; 
-;  ;;;;;;; ;;;;;;;; ;;;; ;;; ;;;; ;;;;;;;;; ;;;; ;;;; ;;;;     ;;;;  ;;;;  ;;;;;;;; ;;;; ;; ;;;;   
-;  ;;;;    ;;;; ;;; ;;;; ;;; ;;;; ;;;; ;;;; ;;;; ;;;; ;;;;  ;;;;;;;  ;;;;  ;;;; ;;; ;;;;     ;;;;  
-;  ;;;;;;; ;;;;;;;; ;;;; ;;; ;;;; ;;;;;;;;; ;;;; ;;;; ;;;; ;;  ;;;;  ;;;;; ;;;;;;;; ;;;;      ;;;; 
-;   ;;;;;;  ;;;;;;  ;;;; ;;; ;;;; ;;;;;;;;  ;;;; ;;;; ;;;; ;;;;;;;;  ;;;;;  ;;;;;;  ;;;;    ;;;;;; 
-;    ;;;;;   ;;;;   ;;;; ;;; ;;;; ;;;;;;;   ;;;; ;;;; ;;;;  ;; ;;;;   ;;;;   ;;;;   ;;;;    ;;;;;  
-;                                                                                                  
-;                                                                                                  
-;                                                                                                  
-    
-
-;; crop : number number number number image -> image
-;; crops an image to be w x h from (x,y)
-(define/chk (crop x1 y1 width height image)
-  (crop/internal x1 y1 width height image))
-
-(define/chk (crop/align x-place y-place width height image)
-  (define x-spot (find-x-spot x-place image))
-  (define y-spot (find-y-spot y-place image))
-  (define crop-rec (rectangle width height "solid" "black"))
-  (define w-off (find-x-spot x-place crop-rec))
-  (define h-off (find-y-spot y-place crop-rec))
-  (crop/internal (- x-spot w-off)
-                 (- y-spot h-off)
-                 width height image))
-
-(define (crop/internal x1 y1 width height image)
-  (let ([points (rectangle-points width height)]
-        [ph (send image get-pinhole)])
-    (make-image (make-crop points
-                           (make-translate (- x1) (- y1) (image-shape image)))
-                (make-bb width
-                         height
-                         (min height (get-baseline image)))
-                #f
-                (and ph 
-                     (make-point (- (point-x ph) x1)
-                                 (- (point-y ph) y1))))))
-
-;; place-image : image x y scene -> scene
-(define/chk (place-image image1 x1 y1 image2) 
-  (place-image/internal image1 x1 y1 image2 'middle 'middle))
-(define/chk (place-image/align image1 x1 y1 x-place y-place image2)
-  (when (or (eq? x-place 'pinhole) (eq? y-place 'pinhole))
-    (check-dependencies
-     'place-image/align
-     (send image1 get-pinhole)
-     "when x-place or y-place is ~e or ~e, the the first image argument must have a pinhole"
-     'pinhole "pinhole"))
-  (place-image/internal image1 x1 y1 image2 x-place y-place))
-(define/chk (place-images images zero-or-more-posns image2)
-  (check-place-images-dependency 'place-images images zero-or-more-posns)
-  (for/fold ([image2 image2]) ([image1 (in-list (reverse images))] 
-                               [posn (in-list (reverse zero-or-more-posns))])
-    (place-image/internal
-     image1 (posn-x posn) (posn-y posn) image2 'middle 'middle)))
-(define/chk (place-images/align images zero-or-more-posns x-place y-place image2)
-  (check-place-images-dependency 'place-images/align images zero-or-more-posns)
-  (for/fold ([image2 image2]) ([image1 (in-list (reverse images))] 
-                               [posn (in-list (reverse zero-or-more-posns))])
-    (place-image/internal
-     image1 (posn-x posn) (posn-y posn) image2 x-place y-place)))
-
-(define (check-place-images-dependency who images zero-or-more-posns)
-  (check-dependencies who
-                      (= (length images) (length zero-or-more-posns))
-                      "expected images and posns arguments to have the same length"))
-
-(define (place-image/internal image orig-dx orig-dy scene x-place y-place)
-  (let ([dx (- orig-dx (find-x-spot x-place image))]
-        [dy (- orig-dy (find-y-spot y-place image))])
-    (crop/internal
-     (if (< dx 0) (- dx) 0)
-     (if (< dy 0) (- dy) 0)
-     (get-right scene)
-     (get-bottom scene)
-     (overlay/δ image
-                (if (< dx 0) 0 dx)
-                (if (< dy 0) 0 dy)
-                scene
-                (if (< dx 0) (- dx) 0)
-                (if (< dy 0) (- dy) 0)
-                #f
-                #f))))
-
-(define/chk (scene+line image x1 y1 x2 y2 color)
-  (let* ([dx (abs (min 0 x1 x2))]
-         [dy (abs (min 0 y1 y2))])
-    (make-image (make-overlay
-                 (make-crop (rectangle-points (get-right image) (get-bottom image))
-                            (make-line-segment (make-point x1 y1) (make-point x2 y2) color))
-                 (image-shape image))
-                (image-bb image)
-                #f
-                (send image get-pinhole))))
-
-(define/chk (scene+polygon image posns mode color)
-  (check-mode/color-combination 'scene+polygon 4 mode color)
-  (when (null? posns) (error 'scene+polygon "must have at least one posn"))
-  (make-image (make-overlay
-               (make-crop (rectangle-points (get-right image) (get-bottom image))
-                          (make-polygon (map (lambda (p) (make-point (posn-x p) (posn-y p))) posns)
-                                        mode color))
-               (image-shape image))
-              (image-bb image)
-              #f
-              (send image get-pinhole)))
-    
-
-(define/chk (scene+curve image x1 y1 angle1 pull1 x2 y2 angle2 pull2 color)
-  (let* ([dx (abs (min 0 x1 x2))]
-         [dy (abs (min 0 y1 y2))])
-    (make-image (make-overlay
-                 (make-crop (rectangle-points (get-right image) (get-bottom image))
-                            (make-curve-segment (make-point x1 y1) angle1 pull1
-                                                (make-point x2 y2) angle2 pull2
-                                                color))
-                 (image-shape image))
-                (image-bb image)
-                #f
-                (send image get-pinhole))))
-
-;; frame : image -> image
-;; draws a black frame around a image where the bounding box is
-;; (useful for debugging images)
-
-(define/chk (frame image) (real-color-frame "black" image))
-(define/chk (color-frame color image) (real-color-frame color image))
-
-(define (real-color-frame color image)
-  (make-image (make-overlay (image-shape 
-                             (crop 0 0
-                                   (get-right image)
-                                   (get-bottom image)
-                                   (rectangle (get-right image)
-                                              (get-bottom image)
-                                              'outline
-                                              (pen color 2 'solid 'round 'round))))
-                            (image-shape image))
-              (make-bb (get-right image)
-                       (get-bottom image)
-                       (get-baseline image))
-              #f
-              (send image get-pinhole)))
-
-;; scale : I number -> I
-;; scales the I by the given factor
-
-;; rotate : number I -> I
-;; rotates the I around the top-left corner by the given angle (in degrees)
-(define/chk (rotate angle image)
-  (let* ([rotated-shape (rotate-normalized-shape 
-                         angle
-                         (send image get-normalized-shape))]
-         [ltrb (normalized-shape-bb rotated-shape)]
-         [ph (send image get-pinhole)])
-    (make-image (make-translate (- (ltrb-left ltrb)) (- (ltrb-top ltrb)) rotated-shape)
-                (make-bb (- (ltrb-right ltrb) (ltrb-left ltrb))
-                         (- (ltrb-bottom ltrb) (ltrb-top ltrb))
-                         (- (ltrb-bottom ltrb) (ltrb-top ltrb)))
-                #f
-                (and ph
-                     (let ([rp (rotate-point ph angle)])
-                       (make-point (- (point-x rp) (ltrb-left ltrb))
-                                   (- (point-y rp) (ltrb-top ltrb))))))))
-
-(define/contract (rotate-normalized-shape angle shape)
-  (-> number? normalized-shape? normalized-shape?)
-  (cond
-    [(overlay? shape)
-     (let ([top-shape (rotate-normalized-shape angle (overlay-top shape))]
-           [bottom-shape (rotate-cn-or-simple-shape angle (overlay-bottom shape))])
-       (make-overlay top-shape bottom-shape))]
-    [else 
-     (rotate-cn-or-simple-shape angle shape)]))
-
-(define/contract (rotate-cn-or-simple-shape angle shape)
-  (-> number? cn-or-simple-shape? cn-or-simple-shape?)
-  (cond
-    [(crop? shape)
-     (make-crop (rotate-points (crop-points shape) angle)
-                (rotate-normalized-shape angle (crop-shape shape)))]
-    [else
-     (rotate-simple angle shape)]))
-
-;; rotate-simple : angle simple-shape -> simple-shape
-(define/contract (rotate-simple θ simple-shape)
-  (-> number? simple-shape? simple-shape?)
-  (cond
-    [(line-segment? simple-shape)
-     (make-line-segment (rotate-point (line-segment-start simple-shape)
-                                      θ)
-                        (rotate-point (line-segment-end simple-shape)
-                                      θ)
-                        (line-segment-color simple-shape))]
-    [(curve-segment? simple-shape)
-     (make-curve-segment (rotate-point (curve-segment-start simple-shape)
-                                       θ)
-                         (bring-between (+ (curve-segment-s-angle simple-shape) θ) 360)
-                         (curve-segment-s-pull simple-shape)
-                         (rotate-point (curve-segment-end simple-shape)
-                                       θ)
-                         (bring-between (+ (curve-segment-e-angle simple-shape) θ) 360)
-                         (curve-segment-e-pull simple-shape)
-                         (curve-segment-color simple-shape))]
-    [(polygon? simple-shape)
-     (make-polygon (rotate-points (polygon-points simple-shape) θ)
-                   (polygon-mode simple-shape)
-                   (polygon-color simple-shape))]
-    [else
-     (let* ([unrotated (translate-shape simple-shape)]
-            [rotated (rotate-atomic θ unrotated)])
-       (let-values ([(dx dy) 
-                     (c->xy (* (degrees->complex θ)
-                               (xy->c (translate-dx simple-shape)
-                                      (translate-dy simple-shape))))])
-         (make-translate dx dy rotated)))]))
-
-(struct ltrb (left top right bottom) #:transparent)
-(define (union-ltrb ltrb1 ltrb2)
-  (ltrb (min (ltrb-left ltrb1) (ltrb-left ltrb2))
-        (min (ltrb-top ltrb1) (ltrb-top ltrb2))
-        (max (ltrb-right ltrb1) (ltrb-right ltrb2))
-        (max (ltrb-bottom ltrb1) (ltrb-bottom ltrb2))))
-
-;; only intersection if they already overlap.
-(define (intersect-ltrb ltrb1 ltrb2)
-  (ltrb (max (ltrb-left ltrb1) (ltrb-left ltrb2))
-        (max (ltrb-top ltrb1) (ltrb-top ltrb2))
-        (min (ltrb-right ltrb1) (ltrb-right ltrb2))
-        (min (ltrb-bottom ltrb1) (ltrb-bottom ltrb2))))
-
-(define/contract (normalized-shape-bb shape)
-  (-> normalized-shape? ltrb?)
-  (cond
-    [(overlay? shape)
-     (let ([top-ltrb (normalized-shape-bb (overlay-top shape))]
-           [bottom-ltrb (cn-or-simple-shape-bb (overlay-bottom shape))])
-       (union-ltrb top-ltrb bottom-ltrb))]
-    [else 
-     (cn-or-simple-shape-bb shape)]))
-
-(define/contract (cn-or-simple-shape-bb shape)
-  (-> cn-or-simple-shape? ltrb?)
-  (cond
-    [(crop? shape)
-     (let ([ltrb (normalized-shape-bb (crop-shape shape))]
-           [crop-ltrb (points->ltrb (crop-points shape))])
-       (intersect-ltrb crop-ltrb ltrb))]
-    [else
-     (simple-bb shape)]))
-
-;; simple-bb : simple-shape -> ltrb
-;; returns the bounding box of 'shape' 
-;; (only called for rotated shapes, so bottom=baseline)
-(define/contract (simple-bb simple-shape)
-  (-> simple-shape? ltrb?)
-  (cond
-    [(line-segment? simple-shape)
-     (let ([x1 (point-x (line-segment-start simple-shape))]
-           [y1 (point-y (line-segment-start simple-shape))]
-           [x2 (point-x (line-segment-end simple-shape))]
-           [y2 (point-y (line-segment-end simple-shape))])
-       (ltrb (min x1 x2)
-             (min y1 y2)
-             (+ (max x1 x2) 1)
-             (+ (max y1 y2) 1)))]
-    [(curve-segment? simple-shape)
-     (let ([x1 (point-x (curve-segment-start simple-shape))]
-           [y1 (point-y (curve-segment-start simple-shape))]
-           [x2 (point-x (curve-segment-end simple-shape))]
-           [y2 (point-y (curve-segment-end simple-shape))])
-       (ltrb (min x1 x2)
-             (min y1 y2)
-             (+ (max x1 x2) 1)
-             (+ (max y1 y2) 1)))]
-    [(polygon? simple-shape)
-     (points->ltrb (polygon-points simple-shape))]
-    [else
-     (let ([dx (translate-dx simple-shape)]
-           [dy (translate-dy simple-shape)])
-       (let-values ([(l t r b) (np-atomic-bb (translate-shape simple-shape))])
-         (ltrb (+ l dx)
-               (+ t dy)
-               (+ r dx)
-               (+ b dy))))]))
-
-(define (points->ltrb points)
-  (let-values ([(left top right bottom) (points->ltrb-values points)])
-    (ltrb left top right bottom)))
-
-(define/contract (np-atomic-bb atomic-shape)
-  (-> np-atomic-shape? (values number? number? number? number?))
-  (cond
-    [(ellipse? atomic-shape)
-     (let ([θ (ellipse-angle atomic-shape)])
-       (let-values ([(w h) (ellipse-rotated-size (ellipse-width atomic-shape)
-                                                 (ellipse-height atomic-shape)
-                                                 (degrees->radians θ))])
-         
-         (values (- (/ w 2))
-                 (- (/ h 2))
-                 (/ w 2)
-                 (/ h 2))))]
-    [(text? atomic-shape)
-     (let-values ([(w h a d) (send text-sizing-bm get-text-extent 
-                                   (text-string atomic-shape) 
-                                   (text->font atomic-shape))])
-       (rotated-rectangular-bounding-box w h (text-angle atomic-shape)))]
-    [(flip? atomic-shape)
-     (define bitmap (flip-shape atomic-shape))
-     (define bb (ibitmap-raw-bitmap bitmap))
-     (define-values (l t r b)
-       (rotated-rectangular-bounding-box (* (send bb get-width) (ibitmap-x-scale bitmap))
-                                         (* (send bb get-height) (ibitmap-y-scale bitmap))
-                                         (ibitmap-angle bitmap)))
-     (values l t r b)]
-    [else
-     (eprintf "using bad bounding box for ~s\n" atomic-shape)
-     (values 0 0 100 100)]))
-
-(define (rotated-rectangular-bounding-box w h θ)
-  (let*-values ([(ax ay) (rotate-xy (- (/ w 2)) (- (/ h 2)) θ)]
-                [(bx by) (rotate-xy (- (/ w 2)) (/ h 2) θ)]
-                [(cx cy) (rotate-xy (/ w 2) (- (/ h 2)) θ)]
-                [(dx dy) (rotate-xy (/ w 2) (/ h 2) θ)])
-    (values (min ax bx cx dx)
-            (min ay by cy dy)
-            (max ax bx cx dx)
-            (max ay by cy dy))))
-
-(define (rotate-points in-points θ)
-  (let* ([cs (map point->c in-points)]
-         [vectors (points->vectors cs)]
-         [rotated-vectors (map (λ (c) (rotate-c c θ)) vectors)]
-         [points (vectors->points rotated-vectors)])
-    points))
-
-(define (points->vectors orig-points)
-  (let loop ([points (cons 0 orig-points)])
-    (cond
-      [(null? (cdr points)) '()]
-      [else
-       (cons (- (cadr points) (car points))
-             (loop (cdr points)))])))
-
-(define (vectors->points vecs)
-  (let loop ([vecs vecs]
-             [p 0])
-    (cond
-      [(null? vecs) '()]
-      [else 
-       (let ([next-p (+ (car vecs) p)])
-         (cons (c->point next-p)
-               (loop (cdr vecs)
-                     next-p)))])))
-
-(define (center-point np-atomic-shape)
-  (let-values ([(l t r b) (np-atomic-bb np-atomic-shape)])
-    (xy->c (/ (- r l) 2)
-           (/ (- b t) 2))))
-
-;; rotate-atomic : angle np-atomic-shape -> np-atomic-shape
-(define (rotate-atomic θ atomic-shape)
-  (-> number? np-atomic-shape? np-atomic-shape?)
-  (cond
-    [(ellipse? atomic-shape)
-     (cond
-       [(= (ellipse-width atomic-shape)
-           (ellipse-height atomic-shape))
-        atomic-shape]
-       [else
-        (let ([new-angle (bring-between (+ θ (ellipse-angle atomic-shape)) 180)])
-          (cond
-            [(< new-angle 90)
-             (make-ellipse (ellipse-width atomic-shape)
-                           (ellipse-height atomic-shape)
-                           new-angle
-                           (ellipse-mode atomic-shape)
-                           (ellipse-color atomic-shape))]
-            [else
-             (make-ellipse (ellipse-height atomic-shape)
-                           (ellipse-width atomic-shape)
-                           (- new-angle 90)
-                           (ellipse-mode atomic-shape)
-                           (ellipse-color atomic-shape))]))])]
-    [(text? atomic-shape)
-     (make-text (text-string atomic-shape)
-                (bring-between (+ θ (text-angle atomic-shape)) 360)
-                (text-y-scale atomic-shape)
-                (text-color atomic-shape)
-                (text-size  atomic-shape)
-                (text-face  atomic-shape)
-                (text-family atomic-shape)
-                (text-style atomic-shape)
-                (text-weight  atomic-shape)
-                (text-underline atomic-shape))]
-    [(flip? atomic-shape)
-     (let ([bitmap (flip-shape atomic-shape)]
-           [flipped? (flip-flipped? atomic-shape)])
-       (make-flip flipped? 
-                  (make-ibitmap (ibitmap-raw-bitmap bitmap)
-                                (bring-between 
-                                 (+ (ibitmap-angle bitmap) θ)
-                                 360)
-                                (ibitmap-x-scale bitmap)
-                                (ibitmap-y-scale bitmap)
-                                (make-hash))))]))
-
-;; rotate-point : point angle -> point
-(define (rotate-point p θ)
-  (let-values ([(x y) (rotate-xy (point-x p) (point-y p) θ)])
-    (make-point x y)))
-
-(define (rotate-c c θ)
-  (* (degrees->complex θ) c))
-
-(define (degrees->complex θ) 
-  (unless (and (<= 0 θ)
-               (< θ 360))
-    (error 'degrees->complex "~s" θ))
-  (case (and (integer? θ) (modulo θ 360))
-    [(0)    1+0i]
-    [(90)   0+1i]
-    [(180) -1+0i]
-    [(270)  0-1i]
-    [else (make-polar 1 (degrees->radians θ))]))
-
-;; rotate-xy : x,y angle -> x,y
-(define (rotate-xy x y θ)
-  (c->xy (rotate-c (xy->c x y) θ)))
-
-(define (xy->c x y) (make-rectangular x (- y)))
-(define (c->xy c) 
-  (values (real-part c)
-          (- (imag-part c))))
-(define (point->c p) (xy->c (point-x p) (point-y p)))
-(define (c->point c) 
-  (let-values ([(x y) (c->xy c)])
-    (make-point x y)))
-
-
-;; bring-between : rational integer -> rational
-;; returns a number that is much like the modulo of 'x' and 'upper-bound',
-;; since modulo only works on integers
-(define (bring-between x upper-bound)
-  (let* ([x-floor (floor x)]
-         [fraction (- x x-floor)])
-    (+ (modulo x-floor upper-bound) 
-       fraction)))
-
-(define/chk (flip-horizontal image)
-  (rotate 90 (flip-vertical (rotate -90 image))))
-
-(define/chk (flip-vertical image)
-  (let* ([flipped-shape (flip-normalized-shape 
-                         (send image get-normalized-shape))]
-         [ltrb (normalized-shape-bb flipped-shape)]
-         [ph (send image get-pinhole)])
-    (make-image (make-translate (- (ltrb-left ltrb)) (- (ltrb-top ltrb)) flipped-shape)
-                (make-bb (- (ltrb-right ltrb) (ltrb-left ltrb))
-                         (- (ltrb-bottom ltrb) (ltrb-top ltrb))
-                         (- (ltrb-bottom ltrb) (ltrb-top ltrb)))
-                #f
-                (and ph
-                     (make-point (+ (point-x ph) (- (ltrb-left ltrb)))
-                                 (+ (- (point-y ph)) (- (ltrb-top ltrb))))))))
-
-(define/contract (flip-normalized-shape shape)
-  (-> normalized-shape? normalized-shape?)
-  (cond
-    [(overlay? shape)
-     (let ([top-shape (flip-normalized-shape (overlay-top shape))]
-           [bottom-shape (flip-cn-or-simple-shape (overlay-bottom shape))])
-       (make-overlay top-shape bottom-shape))]
-    [else 
-     (flip-cn-or-simple-shape shape)]))
-
-(define/contract (flip-cn-or-simple-shape shape)
-  (-> cn-or-simple-shape? cn-or-simple-shape?)
-  (cond
-    [(crop? shape)
-     (make-crop (flip-points (crop-points shape))
-                (flip-normalized-shape (crop-shape shape)))]
-    [else
-     (flip-simple shape)]))
-
-(define/contract (flip-simple simple-shape)
-  (-> simple-shape? simple-shape?)
-  (cond
-    [(line-segment? simple-shape)
-     (make-line-segment (flip-point (line-segment-start simple-shape))
-                        (flip-point (line-segment-end simple-shape))
-                        (line-segment-color simple-shape))]
-    [(curve-segment? simple-shape)
-     (make-curve-segment (flip-point (curve-segment-start simple-shape))
-                         (bring-between (- (curve-segment-s-angle simple-shape)) 360)
-                         (curve-segment-s-pull simple-shape)
-                         (flip-point (curve-segment-end simple-shape))
-                         (bring-between (- (curve-segment-e-angle simple-shape)) 360)
-                         (curve-segment-e-pull simple-shape)
-                         (curve-segment-color simple-shape))]
-    [(polygon? simple-shape)
-     (make-polygon (flip-points (polygon-points simple-shape))
-                   (polygon-mode simple-shape)
-                   (polygon-color simple-shape))]
-    [else
-     (make-translate (translate-dx simple-shape) 
-                     (- (translate-dy simple-shape))
-                     (flip-atomic (translate-shape simple-shape)))]))
-
-(define/contract (flip-atomic atomic-shape)
-  (-> np-atomic-shape? np-atomic-shape?)
-  (cond
-    [(ellipse? atomic-shape)
-     (cond
-       [(= (ellipse-width atomic-shape)
-           (ellipse-height atomic-shape))
-        atomic-shape]
-       [else
-        (let ([new-angle (bring-between (- 180 (ellipse-angle atomic-shape)) 180)])
-          (cond
-            [(< new-angle 90)
-             (make-ellipse (ellipse-width atomic-shape)
-                           (ellipse-height atomic-shape)
-                           new-angle
-                           (ellipse-mode atomic-shape)
-                           (ellipse-color atomic-shape))]
-            [else
-             (make-ellipse (ellipse-height atomic-shape)
-                           (ellipse-width atomic-shape)
-                           (- new-angle 90)
-                           (ellipse-mode atomic-shape)
-                           (ellipse-color atomic-shape))]))])]
-    [(text? atomic-shape)
-     (error 'flip "cannot flip shapes that contain text")]
-    [(flip? atomic-shape)
-     (define bitmap (flip-shape atomic-shape))
-     (make-flip (not (flip-flipped? atomic-shape))
-                (make-ibitmap (ibitmap-raw-bitmap bitmap)
-                              (bring-between (- (ibitmap-angle bitmap)) 360)
-                              (ibitmap-x-scale bitmap)
-                              (ibitmap-y-scale bitmap)
-                              (make-hash)))]))
-
-(define (flip-point point) (make-point (point-x point) (- (point-y point))))
-(define (flip-points points) (map flip-point points))
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;  ;;;;                        ;;               ;;                                                
-;  ;;;;                        ;;               ;;                                                
-;  ;;;;;;;   ;;;;;;;   ;;;;;        ;;;;;          ;;;;;;; ;;;;  ;;;;;;;   ;;;;;;;   ;;;    ;;;;; 
-;  ;;;;;;;;  ;;;;;;;; ;;;;;; ;;;;  ;;;;;;     ;;;; ;;;;;;;;;;;;; ;;;;;;;; ;;;;;;;;  ;;;;;  ;;;;;; 
-;  ;;;;;;;;;     ;;;; ;;;;   ;;;; ;;;;;;;     ;;;; ;;;; ;;; ;;;;     ;;;; ;;; ;;;; ;;;; ;; ;;;;   
-;  ;;;; ;;;;  ;;;;;;;  ;;;;  ;;;; ;;;;        ;;;; ;;;; ;;; ;;;;  ;;;;;;; ;;;;;;;; ;;;;;;;  ;;;;  
-;  ;;;;;;;;; ;;  ;;;;   ;;;; ;;;; ;;;;;;;     ;;;; ;;;; ;;; ;;;; ;;  ;;;;  ;;;;;;; ;;;;;     ;;;; 
-;  ;;;;;;;;  ;;;;;;;; ;;;;;; ;;;;  ;;;;;;     ;;;; ;;;; ;;; ;;;; ;;;;;;;; ;   ;;;;  ;;;;;; ;;;;;; 
-;  ;;;;;;;    ;; ;;;; ;;;;;  ;;;;   ;;;;;     ;;;; ;;;; ;;; ;;;;  ;; ;;;; ;;;;;;;;   ;;;;  ;;;;;  
-;                                                                         ;;;;;;;;                
-;                                                                          ;;;;;;                 
-;                                                                                                 
-
-
-(define/chk (polygon posns mode color)
-  (check-mode/color-combination 'polygon 3 mode color)
-  (make-a-polygon (map (λ (p) (make-point (posn-x p) (posn-y p))) posns)
-                  mode
-                  color))
-
-(define/chk (rectangle width height mode color)
-  (check-mode/color-combination 'rectangle 4 mode color)
-  (make-a-polygon (rectangle-points width height) mode color))
-
-(define/chk (square side-length mode color)
-  (check-mode/color-combination 'square 3 mode color)
-  (make-a-polygon (rectangle-points side-length side-length) mode color))
-
-(define/chk (empty-scene width height [color 'white])
-  (crop 0 0 width height
-        (overlay (rectangle width height 'outline (pen "black" 2 'solid 'round 'round))
-                 (rectangle width height 'solid color))))
-
-(define/chk (rhombus side-length angle mode color)
-  (check-mode/color-combination 'rhombus 3 mode color)
-  (let* ([left-corner (make-polar side-length (+ (* pi 1/2) (/ (degrees->radians angle) 2)))]
-         [right-corner (make-polar side-length (- (* pi 1/2) (/ (degrees->radians angle) 2)))]
-         [bottom-corner (+ left-corner right-corner)])
-    (make-a-polygon (list (make-point 0 0)
-                          (make-point (real-part right-corner) (imag-part right-corner))
-                          (make-point (real-part bottom-corner) (imag-part bottom-corner))
-                          (make-point (real-part left-corner) (imag-part left-corner)))
-                    mode
-                    color)))
-
-(define (rectangle-points width height [dx 0] [dy 0])
-  (list (make-point dx dy)
-        (make-point (+ dx width) dy)
-        (make-point (+ dx width) (+ height dy))
-        (make-point dx (+ dy height))))
-  
-
-(define/chk (line x1 y1 color)
-  (let-values ([(shape w h) (line-shape x1 y1 color)])
-    (make-image shape
-                (make-bb w h h)
-                #f)))
-
-(define (line-shape x1 y1 color)
-  (let ([dx (- (min x1 0))]
-        [dy (- (min y1 0))]
-        [w (+ (abs x1) 1)]
-        [h (+ (abs y1) 1)])
-    (values (make-translate
-             dx dy
-             (make-line-segment (make-point 0 0)
-                                (make-point x1 y1)
-                                color))
-            w h)))
-
-(define/chk (add-line image x1 y1 x2 y2 color)
-  (let* ([dx (abs (min 0 x1 x2))]
-         [dy (abs (min 0 y1 y2))]
-         [bottom (max (+ y1 dy)
-                      (+ y2 dy)
-                      (+ dy (get-bottom image)))]
-         [right (max (+ x1 dx)
-                     (+ x2 dx)
-                     (+ dx (get-right image)))]
-         [baseline (+ dy (get-baseline image))])
-    (make-image (make-translate
-                 dx dy
-                 (make-overlay
-                  (make-line-segment (make-point x1 y1) (make-point x2 y2) color)
-                  (image-shape image)))
-                (make-bb right bottom baseline)
-                #f
-                (send image get-pinhole))))
-
-(define/chk (add-polygon image posns mode color)
-  (if (null? posns)
-      (error 'add-polygon "must have at least one posn")
-      (let ((left (apply min (map posn-x posns)))
-            (top (apply min (map posn-y posns)))
-            (poly (polygon posns mode color)))
-        (overlay/xy poly (- left) (- top) image)
-        )))
-
-(define/chk (add-curve image x1 y1 angle1 pull1 x2 y2 angle2 pull2 color)
-  (define cs (make-curve-segment (make-point x1 y1) angle1 pull1
-                                 (make-point x2 y2) angle2 pull2
-                                 color))
-  (define path (curve-segment->path cs))
-  (define rdc (new record-dc%))
-  (send rdc set-pen (mode-color->pen 'outline color))
-  (send rdc set-brush "black" 'transparent)
-  (send rdc set-smoothing 'smoothed)
-  (define-values (path-l path-t path-w path-h) (send rdc get-path-bounding-box path 'stroke))
-  (define dx (abs (min 0 path-l)))
-  (define dy (abs (min 0 path-t)))
-  (define bottom (max (+ dy path-t path-h) (+ dy (get-bottom image))))
-  (define right (max (+ dx path-l path-w) (+ dx (get-right image))))
-  (define baseline (+ dy (get-baseline image)))
-  (make-image (make-translate
-               dx dy
-               (make-overlay
-                cs
-                (image-shape image)))
-              (make-bb right bottom baseline)
-              #f
-              (send image get-pinhole)))
-
-;; this is just so that 'text' objects can be sized.
-(define text-sizing-bm (make-object bitmap-dc% (make-object bitmap% 1 1)))
-
-(define/chk (text string font-size color)
-  (mk-text string font-size color #f 'swiss 'normal 'normal #f))
-
-(define/chk (text/font string font-size color face family style weight underline)
-  (mk-text string font-size color face family style weight underline))
-
-(define (mk-text str font-size color face family style weight underline)
-  (cond
-    [(<= (string-length str) 1)
-     (mk-single-text str font-size color face family style weight underline)]
-    [else
-     (let ([letters (string->list str)])
-       (beside/internal
-        'baseline
-        (mk-single-text (string (car letters)) font-size color face family style weight underline)
-        (map (λ (letter)
-               (mk-single-text (string letter) font-size color face family style weight underline))
-             (cdr letters))))]))
-
-(define (mk-single-text letter font-size color face family style weight underline)
-  (let ([text (make-text letter 0 1 color font-size face family style weight underline)])
-    (let-values ([(w h d a) (send text-sizing-bm get-text-extent letter (text->font text))])
-      (make-image (make-translate (/ w 2) (/ h 2) text)
-                  (make-bb w h (- h d))
-                  #f))))
-
-(define/chk (isosceles-triangle side-length angle mode color)
-  (check-mode/color-combination 'isosceles-triangle 4 mode color)
-  (let ([left-corner (make-polar side-length (+ (* pi 1/2) (/ (degrees->radians angle) 2)))]
-        [right-corner (make-polar side-length (- (* pi 1/2) (/ (degrees->radians angle) 2)))])
-    (make-a-polygon (list (make-point 0 0)
-                          (make-point (real-part right-corner) (imag-part right-corner))
-                          (make-point (real-part left-corner) (imag-part left-corner)))
-                    mode
-                    color)))
-
-(define/chk (right-triangle side-length1 side-length2 mode color)
-  (check-mode/color-combination 'right-triangle 4 mode color)
-  (make-a-polygon (list (make-point 0 (- side-length2))
-                        (make-point 0 0)
-                        (make-point side-length1 0))
-                  mode
-                  color))
-
-(define/chk (triangle side-length mode color)
-  (check-mode/color-combination 'triangle 3 mode color)
-  (make-polygon/star side-length 3 mode color values))
-
-; excess : R+ R+ -> R
-;  compute the Euclidean excess
-;  Note: If the excess is 0, then C is 90 deg.
-;        If the excess is negative, then C is obtuse.
-;        If the excess is positive, then C is acuse.
-(define (excess a b c)
-  (+ (sqr a) (sqr b) (- (sqr c))))
-
-; polar->posn : R+ R -> (posn R R)
-;  return a position with x and y coordinates
-(define (polar->posn radius angle)
-  (make-posn (* radius (cos angle))
-             (* radius (sin angle))))
-
-; cos-rel : R R R -> R+
-;   return c^2 = a^2 + b^2 - 2ab cos(C)
-(define (cos-rel a b C)
-  (+ (sqr a) (sqr b) (* -2 a b (cos C))))
-
-; sin-rel : R R R -> R
-;  return the side b
-(define (sin-rel A a B)
-  (/ (* a (sin B)) (sin A)))
-
-; last-angle : R R -> R
-;   return pi-(A+B)
-(define (last-angle A B)
-  (- pi A B))
-
-(define (radians degree)
-  (* (/ degree 180.0) pi))
-
-
-(define (triangle/sss side-a side-b side-c mode color)
-  (define (triangle-vertices/sss a b c)
-    (let ([A (acos (/ (excess b c a) (* 2 b c)))])
-      (list (make-posn 0 0)
-            (make-posn c 0)
-            (polar->posn b A))))
-  (check-dependencies 'triangle/sss
-                      (and (>= (+ side-a side-b) side-c) 
-                           (>= (+ side-a side-c) side-b) 
-                           (>= (+ side-b side-c) side-a))
-                      "the given side lengths will not form a triangle ~a, ~a, and, ~a."
-                      side-a side-b side-c)
-  (polygon (triangle-vertices/sss side-a side-b side-c) mode color))
-
-(define/chk (triangle/ass angle-a side-b side-c mode color)
-  (define (triangle-vertices/ass A b c)
-    (list (make-posn 0 0) (make-posn c 0) (polar->posn b A)))
-  (polygon (triangle-vertices/ass (radians angle-a) side-b side-c) mode color))
-
-(define/chk (triangle/sas side-a angle-b side-c mode color)
-  (define (triangle-vertices/sas a B c)
-    (let ([b^2 (cos-rel a c B)])
-      (check-dependencies 'triangle/sas
-                          "the given side, angle, and, side will not form a triangle ~a, ~a, and, ~a."
-                          side-a angle-b side-c)
-      (let* ([b (sqrt b^2)]
-             [A (acos (/ (excess b c a) (* 2 b c)))])
-        (list (make-posn 0 0) (make-posn c 0) (polar->posn b A)))))
-  (polygon (triangle-vertices/sas side-a (radians angle-b) side-c) mode color))
-(define/chk (triangle/ssa side-a side-b angle-c mode color)
-  (define (triangle-vertices/ssa a b C)
-    (let ([c^2 (cos-rel a b C)])
-      (check-dependencies 'triangle/ssa 
-                          (positive? c^2)
-                          "the given side, side, and, angle will not form a triangle ~a, ~a, and, ~a."
-                          side-a side-b angle-c)
-      (let*([c (sqrt c^2)]
-            [A (acos (/ (excess b c a) (* 2 b c)))])
-        (list (make-posn 0 0)
-              (make-posn c 0)
-              (polar->posn b A)))))
-  (polygon (triangle-vertices/ssa side-a side-b (radians angle-c)) mode color))
-
-(define/chk (triangle/aas angle-a angle-b side-c mode color)
-  (define (triangle-vertices/aas A B c)
-    (let* ([C (last-angle A B)]
-           [b (sin-rel C c B)])
-      (list (make-posn 0 0) (make-posn c 0) (polar->posn b A))))
-  (polygon (triangle-vertices/aas (radians angle-a) (radians angle-b) side-c) mode color))
-
-(define/chk (triangle/asa angle-a side-b angle-c mode color)
-  (define (triangle-vertices/asa A b C)
-    (let* ([B (last-angle A C)]
-           [c (sin-rel B b C)])
-      (list (make-posn 0 0) (make-posn c 0) (polar->posn b A))))
-  (polygon (triangle-vertices/asa (radians angle-a) side-b (radians angle-c)) mode color))
-
-(define/chk (triangle/saa side-a angle-b angle-c mode color)
-  (define (triangle-vertices/saa a B C)
-    (let* ([A (last-angle B C)]
-           [b (sin-rel A a B)]
-           [c (sin-rel A a C)])
-      (list (make-posn 0 0)
-            (make-posn c 0)
-            (polar->posn b A))))
-  (polygon (triangle-vertices/saa side-a (radians angle-b) (radians angle-c)) mode color))
-
-(define/chk (regular-polygon side-length side-count mode color)
-  (check-mode/color-combination 'regular-polygon 4 mode color)
-  (make-polygon/star side-length side-count mode color values))
-
-(define/chk (star-polygon side-length side-count step-count mode color)
-  (check-mode/color-combination 'star-polygon 5 mode color)
-  (check-arg 'star-polygon
-             (step-count . < . side-count)
-             (format "number that is smaller than the side-count (~a)" side-count)
-             3
-             step-count)
-  (check-arg 'star-polygon
-             (= 1 (gcd side-count step-count))
-             (format "number that is relatively prime to the side-count (~a)" side-count)
-             3
-             step-count)
-  (make-polygon/star side-length side-count mode color (λ (l) (swizzle l step-count))))
-
-(define/chk (star side-length mode color)
-  (check-mode/color-combination 'star 3 mode color)
-  (make-polygon/star side-length 5 mode color (λ (l) (swizzle l 2))))
-
-(define (make-polygon/star side-length side-count mode color adjust)
-  (make-a-polygon (adjust (regular-polygon-points side-length side-count)) 
-                  mode color))
-
-(define/chk (radial-star point-count radius1 radius2 mode color)
-  (make-a-polygon (star-points radius1 radius2 point-count) mode color))
-  
-(define (star-points in-small-rad in-large-rad points)
-  (let* ([small-rad (- in-small-rad 1)]
-         [large-rad (- in-large-rad 1)]
-         [roff (floor (/ large-rad 2))])
-    (let loop ([i points])
-      (cond
-        [(zero? i) '()]
-        [else 
-         (let* ([this-p (- i 1)]
-                [theta1 (* 2 pi (/ this-p points))]
-                [theta2 (* 2 pi (/ (- this-p 1/2) points))])
-           (let-values ([(x1 y1) (find-xy small-rad theta1)]
-                        [(x2 y2) (find-xy large-rad theta2)])
-             (let ([p1 (make-point (+ large-rad x1)
-                                   (+ large-rad y1))]
-                   [p2 (make-point (+ large-rad x2)
-                                   (+ large-rad y2))])
-               (list* p1 p2 (loop (- i 1))))))]))))
-
-(define (find-xy radius theta)
-  (values (* radius (cos theta))
-          (* radius (sin theta))))
-
-(define (make-a-polygon points mode color)
-  (let* ([poly (make-polygon points mode color)]
-         [ltrb (simple-bb poly)]
-         [l (ltrb-left ltrb)]
-         [t (ltrb-top ltrb)]
-         [r (ltrb-right ltrb)]
-         [b (ltrb-bottom ltrb)])
-    (make-image (make-translate (- l) (- t) poly)
-                (make-bb (- r l) (- b t) (- b t))
-                #f)))
-(define (gcd a b)
-  (cond
-    [(zero? b) a]
-    [else (gcd b (modulo a b))]))
-
-
-
-;; swizzle : (listof X)[odd-length] -> (listof X)
-;; returns a list with the same elements, 
-;; but reordered according to the step. Eg, if the step
-;; is 2, we get the even elements and then the odd ones.
-(define (swizzle l step)
-  (let ([v (list->vector l)])
-    (let loop ([i 0])
-      (cond
-        [(= i (vector-length v)) '()]
-        [else
-         (cons (vector-ref v (modulo (* i step) (vector-length v)))
-               (loop (+ i 1)))]))))
-
-;; regular-polygon-points : number number -> (listof point)
-(define (regular-polygon-points side-length side-count)
-  (let loop ([p (make-rectangular 0 0)]
-             [i 0])
-    (cond
-      [(= i side-count) '()]
-      [else (cons (make-point (real-part p) (imag-part p)) 
-                  (loop (+ p (make-polar side-length
-                                         (* -1 (* 2 pi) (/ i side-count))))
-                        (+ i 1)))])))
-
-(define/chk (ellipse width height mode color)
-  (check-mode/color-combination 'ellipse 4 mode color)
-  (make-image (make-translate (/ width 2) (/ height 2)
-                              (make-ellipse width height 
-                                            0
-                                            mode
-                                            color))
-              (make-bb width height height)
-              #f))
-
-(define/chk (circle radius mode color)
-  (check-mode/color-combination 'circle 3 mode color)
-  (let ([w/h (* 2 radius)])
-    (make-image (make-translate radius radius (make-ellipse w/h w/h 0 mode color))
-                (make-bb w/h w/h w/h)
-                #f)))
-
-(define empty-image (rectangle 0 0 'solid 'black))
-
-(define/chk (image-width image) (bb-select/round/exact bb-right image))
-(define/chk (image-height image) (bb-select/round/exact bb-bottom image))
-(define/chk (image-baseline image) (bb-select/round/exact bb-baseline image))
-(define (bb-select/round/exact select image) (inexact->exact (round (select (send image get-bb)))))
-
-(define-syntax (bitmap stx)
-  (syntax-case stx ()
-    [(_ arg)
-     (let* ([arg (syntax->datum #'arg)]
-            [path/lst
-             (cond
-               [(and (pair? arg)
-                     (eq? (car arg) 'planet))
-                (raise-syntax-error 'bitmap "planet paths not yet supported" stx)]
-               [(symbol? arg)
-                (define pieces (regexp-split #rx"/" (symbol->string arg)))
-                (cond
-                  [(or (null? pieces) (null? (cdr pieces)))
-                   (raise-syntax-error 'bitmap "expected a path with a / in it" stx)]
-                  [else
-                   (define fn (last pieces))
-                   (define colls (reverse (cdr (reverse pieces))))
-                   (define candidate
-                     (apply collection-file-path fn colls
-                            #:fail
-                            (λ (msg) (raise-syntax-error 'bitmap msg stx))))
-                   (unless (file-exists? candidate)
-                     (raise-syntax-error 'bitmap 
-                                         (format "could not find ~s, expected it to be in ~a"
-                                                 arg candidate)
-                                         stx))
-                   (cons fn colls)])]
-               [(string? arg)
-                (path->complete-path 
-                 arg
-                 (or (current-load-relative-directory)
-                     (current-directory)))]
-               [else (raise-syntax-error 
-                      'bitmap 
-                      (string-append
-                       "expected the argument to specify a local path (via a string)"
-                       " or a module path (e.g. `icons/b-run.png')")
-                      stx)])])
-       #`(bitmap/proc '#,path/lst))]))
-
-(define (bitmap/proc arg)
-  (define pth (if (path? arg)
-                  arg
-                  (apply collection-file-path arg
-                         #:fail
-                         (λ (msg) (error 'bitmap msg)))))
-  (when (and (path? pth)
-             (not (file-exists? pth)))
-    (error 'bitmap "could not find the file ~a" (path->string pth)))
-  ;; the rotate does a coercion to a 2htdp/image image
-  (rotate 0 (make-object image-snip% (make-object bitmap% pth 'unknown/alpha))))
-
-(define/chk (bitmap/url string)
-  ;; the rotate does a coercion to a 2htdp/image image
-  (rotate
-   0
-   (call/input-url (string->url string)
-                   get-pure-port
-                   (λ (port)
-                     (make-object bitmap% port 'unknown/alpha #f #t)))))
-                      
-(define/chk (bitmap/file filename)
-  (unless (file-exists? filename)
-    (error 'bitmap/file 
-           "could not find the file ~a" 
-           filename))
-  (rotate
-   0
-   (read-bitmap filename)))
-
-(define/chk (image->color-list image)
-  (define w (image-width image))
-  (define h (image-height image))
-  (cond
-    [(or (= w 0) (= h 0)) '()]
-    [else
-     (define bm (make-bitmap w h))
-     (define bdc (make-object bitmap-dc% bm))
-     (define c (make-object color%))
-     (define bytes (make-bytes (* w h 4)))
-     (send bdc erase)
-     (render-image image bdc 0 0)
-     (send bdc get-argb-pixels 0 0 w h bytes)
-     (for/list ([i (in-range 0 (* w h 4) 4)])
-       (color (bytes-ref bytes (+ i 1))
-              (bytes-ref bytes (+ i 2))
-              (bytes-ref bytes (+ i 3))
-              (bytes-ref bytes i)))]))
-
-(define/chk (color-list->bitmap color-list width height)
-  (check-dependencies 
-   'color-list->bitmap
-   (= (* width height) (length color-list))
-   (string-append
-    "the length of the color list to match the product of the width and the height,"
-    " but the list has ~a elements and the width and height are ~a and ~a respectively")
-   (length color-list) width height)
-  (cond
-    [(or (zero? width) (zero? height))
-     (rectangle width height "solid" "black")]
-    [else
-     (define bmp (make-bitmap width height))
-     (define bytes (make-bytes (* width height 4) 0))
-     (define o (make-object color%))
-     (for ([c (in-list color-list)]
-           [i (in-naturals)])
-       (define j (* i 4))
-       (cond
-         [(color? c)
-          (bytes-set! bytes j (color-alpha c))
-          (bytes-set! bytes (+ j 1) (color-red c))
-          (bytes-set! bytes (+ j 2) (color-green c))
-          (bytes-set! bytes (+ j 3) (color-blue c))]
-         [else
-          (define str (if (string? c) c (symbol->string c)))
-          (define clr (or (send the-color-database find-color str)
-                          (send the-color-database find-color "black")))
-          (bytes-set! bytes j 255)  ;; this should probably (send clr alpha) when that's possible
-          (bytes-set! bytes (+ j 1) (send clr red))
-          (bytes-set! bytes (+ j 2) (send clr green))
-          (bytes-set! bytes (+ j 3) (send clr blue))]))
-     (send bmp set-argb-pixels 0 0 width height bytes)
-     (bitmap->image bmp)]))
-      
-(define build-color/make-color
-  (let ([orig-make-color make-color])
-    (define/chk make-color
-      (case-lambda 
-        [(int0-255-1 int0-255-2 int0-255-3) 
-         (orig-make-color int0-255-1 int0-255-2 int0-255-3)]
-        [(int0-255-1 int0-255-2 int0-255-3 int0-255-4) 
-         (orig-make-color int0-255-1 int0-255-2 int0-255-3 int0-255-4)]))
-    make-color))
-
-(define/chk (pinhole-x image) (let ([ph (send image get-pinhole)]) (and ph (point-x ph))))
-(define/chk (pinhole-y image) (let ([ph (send image get-pinhole)]) (and ph (point-y ph))))
-(define/chk (put-pinhole x1 y1 image) 
-  (make-image (image-shape image) (image-bb image) (image-normalized? image) (make-point x1 y1)))
-(define/chk (center-pinhole image) 
-  (let ([bb (send image get-bb)])
-    (make-image (image-shape image)
-                (image-bb image)
-                (image-normalized? image) 
-                (make-point (/ (bb-right bb) 2)
-                            (/ (bb-baseline bb) 2)))))
-(define/chk (clear-pinhole image)
-  (make-image (image-shape image) (image-bb image) (image-normalized? image) #f))
-
-(define build-color/color
-  (let ([orig-make-color make-color])
-    (define/chk color
-      (case-lambda
-        [(int0-255-1 int0-255-2 int0-255-3) 
-         (orig-make-color int0-255-1 int0-255-2 int0-255-3)]
-        [(int0-255-1 int0-255-2 int0-255-3 int0-255-4) 
-         (orig-make-color int0-255-1 int0-255-2 int0-255-3 int0-255-4)]))
-    color))
-
-(define build-pen/make-pen
-  (let ([orig-make-pen make-pen])
-    (define/chk (make-pen color int-0-255 pen-style pen-cap pen-join)
-      (orig-make-pen color int-0-255 pen-style pen-cap pen-join))
-    make-pen))
-
-(define build-pen/pen
-  (let ([orig-make-pen make-pen])
-    (define/chk (pen color int-0-255 pen-style pen-cap pen-join)
-      (orig-make-pen color int-0-255 pen-style pen-cap pen-join))
-    pen))
-
-(define/chk freeze
-  (case-lambda 
-    [(image) (freeze/internal 0 0 (image-width image) (image-height image) image)]
-    [(width height image) (freeze/internal 0 0 width height image)]
-    [(x y width height image) (freeze/internal x y width height image)]))
-
-(define (freeze/internal x y w h image)
-  (cond
-    [(or (zero? w) (zero? h)) image]
-    [else
-     (define bm (make-bitmap w h))
-     (define bdc (make-object bitmap-dc% bm))
-     (render-image image bdc (- x) (- y))
-     (send bdc set-bitmap #f)
-     (to-img bm)]))
-
-(provide overlay
-         overlay/align
-         overlay/offset
-         overlay/align/offset
-         overlay/xy
-         
-         underlay
-         underlay/align
-         underlay/align/offset
-         underlay/offset
-         underlay/xy
-         
-         beside
-         beside/align
-         above
-         above/align
-         
-         rotate
-         crop
-         crop/align
-         flip-vertical
-         flip-horizontal
-         frame
-         color-frame
-
-         place-image
-         place-image/align
-         place-images
-         place-images/align
-         
-         save-image
-         save-svg-image
-         bring-between
-         
-         
-         scale
-         scale/xy
-         
-         image-width
-         image-height
-         image-baseline
-         
-         circle
-         ellipse
-         rectangle
-         empty-scene
-         square
-         rhombus
-         empty-image
-         
-         polygon
-         regular-polygon
-         triangle 
-         triangle/sss
-         triangle/ssa
-         triangle/sas
-         triangle/ass
-         triangle/aas
-         triangle/asa
-         triangle/saa
-
-         isosceles-triangle
-         right-triangle
-         star
-         star-polygon
-         radial-star
-         
-         line
-         add-line
-         add-polygon
-         add-curve
-         scene+line
-         scene+polygon
-         scene+curve
-         text
-         text/font
-         image->color-list
-         color-list->bitmap
-         
-         bitmap
-         bitmap/url
-         bitmap/file
-         
-         swizzle
-         
-         rotate-xy
-         
-         put-pinhole
-         pinhole-x
-         pinhole-y
-         clear-pinhole
-         center-pinhole
-         overlay/pinhole
-         underlay/pinhole
-         
-         build-color/make-color
-         build-color/color
-         build-pen/make-pen
-         build-pen/pen
-         
-         freeze
-         
-         render-image)
-
-(provide/contract
- [np-atomic-bb (-> np-atomic-shape? (values real? real? real? real?))]
- [center-point (-> np-atomic-shape? number?)])
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/img-err.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/img-err.rkt
deleted file mode 100644
index ca62354b75..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/img-err.rkt
+++ /dev/null
@@ -1,376 +0,0 @@
-#lang racket/base
-
-(provide define/chk 
-         x-place?
-         y-place?
-         mode?
-         angle?
-         side-count?
-         image-color?
-         pen-style? 
-         pen-cap?
-         pen-join?
-         real-valued-posn?
-         step-count?
-         check-mode/color-combination)
-
-(require htdp/error
-         racket/class
-         racket/contract
-         lang/posn
-         (except-in racket/draw
-                    make-pen make-color)
-         mrlib/image-core
-         (for-syntax racket/base
-                     racket/list))
-
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;                                              ;;                      ;;      ;;                 
-;                                              ;;                      ;;      ;;                 
-;    ;;;;   ;;;;;;;;;  ;;;;   ;;;;      ;;;;   ;;;;;;   ;;;;    ;;;;   ;; ;;;  ;;  ;; ;;;  ;;;;;; 
-;   ;;  ;;  ;;;; ;;;; ;;;;;;  ;;;;     ;;;;;;  ;;;;;;  ;;  ;;  ;;;;;;  ;;;;;   ;;  ;;;;;;  ;;;;;; 
-;  ;;;;;;;; ;;   ;;  ;;;  ;;; ;;      ;;;      ;;  ;; ;;;;;;;;;;;      ;;;;;   ;;  ;;  ;; ;;;  ;; 
-;  ;;;      ;;   ;;  ;;;  ;;; ;;      ;;;      ;;  ;; ;;;     ;;;      ;;;;;   ;;  ;;  ;; ;;;  ;; 
-;   ;;; ;;  ;;   ;;   ;;;;;;  ;;       ;;;;;;  ;;  ;;  ;;; ;;  ;;;;;;  ;;  ;;  ;;  ;;  ;;  ;;;;;; 
-;    ;;;;   ;;   ;;    ;;;;   ;;        ;;;;   ;;  ;;   ;;;;    ;;;;   ;;  ;;; ;;  ;;  ;;   ;;;;; 
-;                                                                                          ;; ;;; 
-;                                                                                          ;;;;;  
-;                                                                                                 
-;
-
-
-(define-syntax define/chk
-  (λ (stx)
-    (define (adjust-case fn-name case-args bodies)
-      (syntax-case case-args ()
-        [(args ... . final-arg)
-         (identifier? #'final-arg)
-         (let ([len (length (syntax->list #'(args ...)))])
-           (with-syntax ([(i ...) (build-list len add1)])
-             #`((args ... . final-arg)
-                (let ([args (check/normalize '#,fn-name 'args args i)] ...
-                      [final-arg 
-                       (for/list ([x (in-list final-arg)]
-                                  [j (in-naturals #,(+ len 1))])
-                         (check/normalize '#,fn-name 'final-arg x j))])
-                  #,@bodies))))]
-        [(args ...)
-         (with-syntax ([(i ...) (build-list (length (syntax->list #'(args ...))) add1)]
-                       [(arg-ids ...)
-                        (map (λ (arg)
-                               (syntax-case arg ()
-                                 [x 
-                                  (identifier? #'x)
-                                  #'x]
-                                 [(x y)
-                                  (identifier? #'x)
-                                  #'x]
-                                 [_
-                                  (raise-syntax-error 'define/chk "unknown argument spec" stx arg)]))
-                             (syntax->list #'(args ...)))])
-           #`((args ...)
-              (let ([arg-ids (check/normalize '#,fn-name 'arg-ids arg-ids i)] ...)
-                #,@bodies)))]))
-    (syntax-case stx (case-lambda)
-      [(define/chk fn-name (case-lambda [in-args in-body ...] ...))
-       (with-syntax ([((args body) ...) (map (lambda (a b) (adjust-case #'fn-name a b))
-                                             (syntax->list #'(in-args ...))
-                                             (syntax->list #'((in-body ...) ...)))])
-         #'(define fn-name
-             (case-lambda
-               [args body] ...)))]
-      [(define/chk (fn-name . args) body ...)
-       (with-syntax ([(args body) (adjust-case #'fn-name #'args #'(body ...))])
-         #`(define (fn-name . args) body))])))
-
-;; check/normalize : symbol symbol any number -> any
-;; based on the name of the argument, checks to see if the input
-;; is valid and, if so, transforms it to a specific kind of value
-;;   width, height -> number
-;;   mode -> 'outline 'solid
-;;   color -> (is-a?/c color<%>)
-(define (check/normalize fn-name argname arg i)
-  (case argname
-    [(x-place)
-     (check-arg fn-name
-                (x-place? arg)
-                'x-place
-                i
-                arg)
-     (let ([sym (if (string? arg)
-                    (string->symbol arg)
-                    arg)])
-       (if (eq? sym 'center)
-           'middle
-           sym))]
-    [(y-place) 
-     (check-arg fn-name
-                (y-place? arg)
-                'y-place
-                i
-                arg)
-     (let ([sym (if (string? arg)
-                    (string->symbol arg)
-                    arg)])
-       (if (eq? sym 'center)
-           'middle
-           sym))]
-    [(image image1 image2 image3) 
-     (check-arg fn-name
-                (image? arg)
-                'image
-                i
-                arg)
-     (to-img arg)]
-    [(images)
-     (check-arg fn-name (and (list? arg) (andmap image? arg)) 'image-list i arg)
-     (for/list ([i (in-list arg)])
-       (to-img i))]
-    [(mode)
-     (check-arg fn-name
-                (mode? arg)
-                'mode
-                i
-                arg)
-     (cond
-       [(or (equal? arg "solid")
-            (equal? arg 'solid))
-        255]
-       [(equal? arg "outline")
-        'outline]
-       [(and (integer? arg)
-             (not (exact? arg)))
-        (inexact->exact arg)]
-       [else arg])]
-    [(width height radius radius1 radius2 side-length side-length1 side-length2
-            side-a side-b side-c)
-     (check-arg fn-name
-                (and (real? arg)
-                     (not (negative? arg)))
-                'non\ negative\ real\ number
-                i arg)
-     arg]
-    [(point-count)
-     (check-arg fn-name
-                (and (integer? arg)
-                     (>= arg 2))
-                'integer\ greater\ than\ 2
-                i arg)
-     arg]
-    [(dx dy x y x1 y1 x2 y2 pull1 pull2)
-     (check-arg fn-name
-                (real? arg)
-                'real\ number
-                i arg)
-     arg]
-    [(factor x-factor y-factor)
-     (check-arg fn-name
-                (and (real? arg)
-                     (positive? arg))
-                'positive\ real\ number
-                i arg)
-     arg]
-    [(side-count)
-     (check-arg fn-name
-                (side-count? arg)
-                'side-count
-                i arg)
-     arg]
-    [(step-count)
-     (check-arg fn-name
-                (step-count? arg)
-                'step-count
-                i arg)
-     arg]
-    [(angle angle1 angle2 angle-a angle-b angle-c)
-     (check-arg fn-name
-                (angle? arg)
-                'angle\ in\ degrees
-                i arg)
-     (angle->proper-range arg)]
-    [(color)
-     (check-arg fn-name (or (image-color? arg) (pen? arg)) 'image-color-or-pen i arg)
-     ;; return either a string, color, or a pen,
-     ;; (technically, the string case is redundant,
-     ;;  but since there may be saved files that have 
-     ;;  strings in the color positions we leave them
-     ;;  here too; note that using a pen struct means
-     ;;  'smoothed mode, but a color (or string) means
-     ;;  'aligned mode, so that's not redundant).
-     (cond
-       [(color? arg) arg]
-       [(pen? arg) arg]
-       [else
-        (define color-str
-          (if (symbol? arg)
-              (symbol->string arg)
-              arg))
-        (cond
-          [(equal? color-str "transparent") "transparent"]
-          [(send the-color-database find-color color-str) color-str]
-          [else "black"])])]
-    [(color-list)
-     (check-arg fn-name (and (list? arg) (andmap image-color? arg)) 'color-list i arg)
-     arg]
-    [(string)
-     (check-arg fn-name (string? arg) 'string i arg)
-     arg]
-    [(font-size)
-     (check-arg fn-name (and (integer? arg) (<= 1 arg 255)) 'font-size i arg)
-     (if (exact? arg)
-         arg
-         (inexact->exact arg))]
-    [(face)
-     (check-arg fn-name (or (not arg) (string? arg)) 'face i arg)
-     arg]
-    [(family)
-     (check-arg fn-name
-                (memq arg '(default decorative roman script swiss modern symbol system))
-                'family i arg)
-     arg]
-    [(style)
-     (check-arg fn-name (memq arg '(normal italic slant)) 'style i arg)
-     arg]
-    [(weight)
-     (check-arg fn-name (memq arg '(normal bold light)) 'weight i arg)
-     arg]
-    [(underline)
-     (and arg #t)]
-    [(posns)
-     (check-arg fn-name
-                (and (list? arg)
-                     (andmap posn? arg))
-                'list-of-posns
-                i arg)
-     (check-arg fn-name
-                (andmap real-valued-posn? arg)
-                'list-of-posns-with-real-valued-x-and-y-coordinates
-                i arg)
-     (check-arg fn-name
-                (>= (length arg) 3)
-                'list-of-at-least-three-posns
-                i arg)
-     arg]
-    [(zero-or-more-posns)
-     (check-arg fn-name
-                (and (list? arg)
-                     (andmap posn? arg))
-                'list-of-posns
-                i arg)
-     (check-arg fn-name
-                (andmap real-valued-posn? arg)
-                'list-of-posns-with-real-valued-x-and-y-coordinates
-                i arg)
-     arg]
-    [(int0-255-1 int0-255-2 int0-255-3 int0-255-4)
-     (check-arg fn-name (and (integer? arg) (<= 0 arg 255)) 
-                'integer\ between\ 0\ and\ 255 i arg)
-     arg]
-    [(int-0-255)
-     (check-arg fn-name (and (integer? arg) (<= 0 arg 255)) 
-                'integer\ between\ 0\ and\ 255 i arg)
-     arg]
-    
-    [(pen-style)
-     (check-arg fn-name (pen-style? arg) 'pen-style i arg)
-     (if (string? arg)
-         (string->symbol arg)
-         arg)]
-    [(pen-cap)
-     (check-arg fn-name (pen-cap? arg) 'pen-cap i arg)
-     (if (string? arg)
-         (string->symbol arg)
-         arg)]
-    [(pen-join)
-     (check-arg fn-name (pen-join? arg) 'pen-join i arg)
-     (if (string? arg)
-         (string->symbol arg)
-         arg)]
-    [(filename)
-     (check-arg fn-name (path-string? arg) 'path-string i arg)
-     arg]
-    [else
-     (error 'check "the function ~a has an argument with an unknown name: ~s"
-            fn-name
-            argname)]))
-
-(define (y-place? arg)
-  (and (member arg '("top" top "bottom" bottom "middle" middle "center" center 
-                           "baseline" baseline "pinhole" pinhole))
-       #t))
-(define (x-place? arg)
-  (and (member arg '("left" left "right" right "middle" middle
-                            "center" center "pinhole" pinhole))
-       #t))
-(define (mode? arg)
-  (or (and (member arg '(solid outline "solid" "outline")) #t)
-      (and (integer? arg)
-           (<= 0 arg 255))))
-(define (side-count? i)
-  (and (integer? i)
-       (3 . <= .  i)))
-(define (step-count? i)
-  (and (integer? i)
-       (1 . <= .  i)))
-(define (image-color? c) (or (symbol? c) (string? c) (color? c)))
-(define (pen-style? arg) 
-  (and (member (if (string? arg) (string->symbol arg) arg)
-               '(solid dot long-dash short-dash dot-dash))
-       #t))
-(define (pen-cap? arg)
-  (and (member (if (string? arg) (string->symbol arg) arg)
-               '(round projecting butt))
-       #t))
-(define (pen-join? arg)
-  (and (member (if (string? arg) (string->symbol arg) arg)
-               '(round bevel miter))
-       #t))
-(define (real-valued-posn? arg)
-  (and (posn? arg)
-       (real? (posn-x arg))
-       (real? (posn-y arg))))
-
-
-;; checks the dependent part of the 'color' specification
-(define (check-mode/color-combination fn-name i mode color)
-  (cond
-    [(or (eq? mode 'solid)
-         (number? mode))
-     (check-arg fn-name (image-color? color) 'image-color i color)]
-    [(eq? mode 'outline)
-     (void)]))
-
-(define (angle? arg)
-  (and (real? arg)
-       (not (or (= arg +inf.0)
-                (= arg -inf.0)
-                (equal? arg +nan.0)))))
-
-(define/contract (angle->proper-range α)
-  (-> real? (between/c 0 360))
-  (let loop ([θ (- α (* 360 (floor (/ α 360))))])
-    (cond [(negative? θ) (+ θ 360)]
-          [(>= θ 360)    (- θ 360)]
-          [else θ])))
-
-(module+ test
-  (require rackunit)
-  (check-equal? (angle->proper-range 1) 1)
-  (check-equal? (angle->proper-range 361) 1)
-  (check-equal? (angle->proper-range 1/2) 1/2)
-  (check-equal? (angle->proper-range -1) 359)
-  (check-equal? (angle->proper-range #e-1.5) #e358.5)
-  (check-equal? (angle->proper-range #e-.1) #e359.9)
-  
-  (check-equal? (angle->proper-range 1.0) 1.0)
-  (check-equal? (angle->proper-range 361.0) 1.0)
-  (check-equal? (angle->proper-range 0.5) 0.5)
-  (check-equal? (angle->proper-range -1.0) 359.0)
-  (check-equal? (angle->proper-range -1.5) 358.5)
-  (check-equal? (angle->proper-range -.1) 359.9)
-  (check-equal? (angle->proper-range #i-7.347880794884119e-016) 0.0))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/info.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/info.rkt
deleted file mode 100644
index 762cb84de0..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define test-responsibles '(("img-err.rkt" robby)
-                            ("image-more.rkt" robby)
-                            ("image-core.rkt" robby)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/last.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/last.rkt
deleted file mode 100644
index b7dbf1af5e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/last.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang scheme/gui
-
-(require "timer.rkt")
-
-(provide last-mixin)
-
-(define last-mixin
-  (mixin (start-stop<%>) ()
-    ;; to comunicate between stop! and last
-    (field [end:ch  (make-channel)])
-
-    ;; X -> Void
-    (define/override (stop! w)
-      (send-to-last w)
-      (super stop! w))
-    
-    ;; -> World
-    (define/public (last) 
-      (define result (yield end:ch))
-      (if (exn? result) (raise result) result))
-    
-    (field [dr:cust (current-custodian)])
-
-    ;; X -> Void
-    ;; send x to last method
-    (define/private (send-to-last x)
-      (parameterize ((current-custodian dr:cust))
-        (thread 
-         (lambda ()
-           (channel-put end:ch x)))))
-    
-    (super-new)))
-    
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/launch-many-worlds.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/launch-many-worlds.rkt
deleted file mode 100644
index d84f148b8b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/launch-many-worlds.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-
-(provide
- ;; (launch-many-worlds e1 ... e2)
- ;; run expressions e1 through e2 in parallel,
- ;; produce all values
- launch-many-worlds
- ;; launch-many-worlds/proc : (-> Any) *-> [Listof Any]
- launch-many-worlds/proc)
-
-;; ---------------------------------------------------------------------------------------------------
-(require racket/list racket/function racket/gui mzlib/etc htdp/error)
-
-(define-syntax-rule 
-  (launch-many-worlds e ...) 
-  (launch-many-worlds* (lambda () e) ...))
-
-(define (launch-many-worlds/proc . loth)
-  ;; check arguments:
-  (for ([th loth][i (in-naturals 1)])
-    (check-proc 'launch-many-worlds/proc th 0 i "no arguments"))
-  ;; -- IN -- 
-  (apply launch-many-worlds* loth))
-
-;; [Listof (-> X)] ->* X ...
-;; run the thunks as parallel threads and produce 'values' of their results
-;; effect: propagate exn when one of them raises one 
-(define (launch-many-worlds* . th*)
-  ;; allocate the program's resources in the active custodian 
-  (define cc (current-custodian))
-  ;; c* is used to shut down launch-many-worlds when one of them raises an exn
-  [define c* (make-custodian)]
-  [define ch (make-channel)]
-  (parameterize ([current-custodian c*]) 
-    (for/list ((th th*) (i (in-naturals)))
-      (parameterize ([current-eventspace (make-eventspace)])
-        (queue-callback
-         (lambda ()
-           (with-handlers ((exn? (lambda (x) (channel-put ch x))))
-             (channel-put ch (list i (parameterize ([current-custodian cc]) (th))))))))))
-  ;; for all X: (U Exn X) -> X
-  (define (handle x)
-    (when (exn? x) (custodian-shutdown-all c*) (raise x))
-    x)
-  ;; [Listof X]
-  (define results
-     (for/list ((n (in-range (length th*))))
-      (sync (handle-evt ch handle))))
-  ;; -- IN -- 
-  (apply values (map second (sort results < #:key first))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/pad.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/pad.rkt
deleted file mode 100644
index b1481ec98f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/pad.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/gui
-
-;; provide basic elements for game pad clause in big-bang: the icon, pad-event?
-
-(require racket/runtime-path)
-
-(provide
-  ;; bitmap
-  game-pad
-  ;; KeyEvent -> Boolean
-  ;; is the given key-event also a pad-event? 
-  pad-event? 
-  ;; PadEvent PadEvent -> Boolean 
-  ;; are the two pad-events equal? 
-  pad=?
-  )
-
-;; ---------------------------------------------------------------------------------------------------
-
-(define-runtime-path gamepad-path "gamepad.png")
-(define game-pad (read-bitmap gamepad-path 'png/alpha #f #t))
-(unless (send game-pad ok?)
-  (error 'big-bang "the game pad icon isn't available; please report error"))
-
-(define pad-buttons
-  '("up"    "w" 
-    "down"  "s" 
-    "left"  "a"
-    "right" "d"
-    " "
-    "shift" "rshift"))
-
-(define (pad-event? ke)
-  (pair? (member ke pad-buttons)))
-
-(define (pad=? ke kq)
-  (and (pad-event? ke) (pad-event? kq) (string=? ke kq)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/planetcute-image-list.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/planetcute-image-list.rkt
deleted file mode 100644
index b6b8a6e7a8..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/planetcute-image-list.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang racket/base
-(provide images name->filename)
-
-(define (name->filename img)
-  (format "~a.png" img))
-
-(define images
-  '((Characters
-     character-boy
-     character-cat-girl
-     character-horn-girl
-     character-pink-girl
-     character-princess-girl
-     enemy-bug
-     speech-bubble)
-
-    (Items
-     chest-closed
-     chest-lid
-     chest-open
-     gem-blue
-     gem-green
-     gem-orange
-     heart
-     key
-     rock
-     selector
-     tree-short
-     tree-tall
-     tree-ugly
-     yellow-star)
-
-    (Blocks
-     brown-block
-     dirt-block
-     grass-block
-     plain-block
-     stone-block-tall
-     stone-block
-     wall-block-tall
-     wall-block
-     water-block
-     wood-block)
-
-    (Ramps
-     ramp-east
-     ramp-north
-     ramp-south
-     ramp-west)
-
-    (Buildings
-     door-tall-closed
-     door-tall-open
-     roof-east
-     roof-north-east
-     roof-north-west
-     roof-north
-     roof-south-east
-     roof-south-west
-     roof-south
-     roof-west
-     window-tall)
-
-    (Shadows
-     shadow-east
-     shadow-north-east
-     shadow-north-west
-     shadow-north
-     shadow-side-west
-     shadow-south-east
-     shadow-south-west
-     shadow-south
-     shadow-west)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/stop.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/stop.rkt
deleted file mode 100644
index 816d57201b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/stop.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scheme
-
-(provide (struct-out stop-the-world))
-
-(define-struct stop-the-world (world) #:transparent)
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/timer.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/timer.rkt
deleted file mode 100644
index 5507672ef9..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/timer.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang racket/gui
-
-;; The module provides a timer mixing for world and universe.
-
-;; The interface ensures that super class provides start and stop method, 
-;; BUT if fails to ensure that the class comes with a _tick_ field. 
-;; plus a call back for clock ticks. The super-init call sets the 
-;; tick field, which the super-class uses to define the callback.
-
-
-(require "check-aux.rkt" "stop.rkt")
-
-(provide clock-mixin start-stop<%>)
-
-(define start-stop<%> (interface () start! ptock pptock name-of-tick-handler stop!))
-
-(define clock-mixin
-  (mixin (start-stop<%>) ()
-    (inherit ptock)
-    (init-field [on-tick #f])
-    (field [rate  0]
-           [limit #f]
-           [tick  void]
-           [tick# 0]
-           [timer (new timer% [notify-callback (lambda () (set! tick# (+ tick# 1)) (ptock))])])
-    (match on-tick
-      [`(,handler ,r ,l) 
-       (set! limit l)
-       (set! rate r)
-       (set! tick (first on-tick))]
-      [`(,handler ,r) 
-       (set! rate r)
-       (set! tick handler)]
-      [(? procedure? handler)
-       (set! rate RATE)
-       (set! tick handler)]
-      [else (void)])
-    (define/override (start!)
-      (unless (<= rate 0)
-        (send timer start (number->integer (* 1000 rate) 'big-bang/universe 'clock-rate)))
-      (super start!))
-    (define/override (stop! w)
-      (send timer stop)
-      (super stop! w))
-    (define/override (pptock w)
-      (if (and limit (> tick# limit))
-          (make-stop-the-world w)
-          (tick w)))
-    (define/override (name-of-tick-handler)
-      (object-name tick))
-    (super-new)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/universe-image.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/universe-image.rkt
deleted file mode 100644
index d2b0263bf2..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/universe-image.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang racket/base
-(require (prefix-in 2: 2htdp/image)
-         (prefix-in 2-core: mrlib/image-core)
-         (prefix-in 1: htdp/image)
-         racket/class
-         htdp/error)
-
-(provide image? scene? image-width image-height text 2:image?
-         check-image check-scene check-scene-result check-scene-dimensions
-         disable-cache)
-
-(define (disable-cache x)
-  (if (is-a? x 2-core:image%)
-      (2-core:un/cache-image x #f)
-      x))
-
-(define (scene? x)
-  ;; be sure to check 2:image? first so that
-  ;; bitmaps are always okay (more specifically,
-  ;; so that we don't reject a 2htdp/image universe
-  ;; program that uses a bitmap (bitmap pinholes
-  ;; are not at (0,0).)).
-  (or (2:image? x)
-      (1:scene? x)))
-
-(define (image? x) (or (1:image? x) (2:image? x)))
-
-(define (text a b c) (2:text a b c))
-
-(define (image-width x)
-  (check-arg 'image-width (image? x) 'image 1 x)
-  (if (2:image? x)
-      (2:image-width x)
-      (1:image-width x)))
-
-(define (image-height x)
-  (check-arg 'image-height (image? x) 'image 1 x)
-  (if (2:image? x)
-      (2:image-height x)
-      (1:image-height x)))
-
-;; Symbol Any String String *-> Void
-(define (check-image tag i rank . other-message)
-  (if (and (pair? other-message) (string? (car other-message)))
-      (check-arg tag (image? i) (car other-message) rank i)
-      (check-arg tag (image? i) "image" rank i)))
-
-(define (check-scene tag i rank)
-  (define error "image with pinhole at (~s,~s)")
-  (if (2:image? i)
-      i
-      (if (1:image? i)
-          (check-arg tag (1:scene? i) "scene" rank (image-pins i))
-          (check-arg tag #f         "scene" rank i))))
-
-(define (check-scene-result tname i)
-  (if (2:image? i)
-      i
-      (if (1:image? i) 
-          (check-result tname 1:scene? "scene" i (image-pins i))
-          (check-result tname (lambda _ #f) "scene" i))))
-
-(define (check-scene-dimensions name width height)
-  (unless(and (<= 0 width 2000) (<= 0 height 2000))
-    (define basics "cannot render images larger than 2000 x 2000 pixels")
-    (error 'big-bang "~a; the dimension demanded by ~a are ~a by ~a" basics name width height)))
-      
-(define (image-pins i)
-  (format "image with pinhole at (~s,~s)" (1:pinhole-x i) (1:pinhole-y i)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/universe.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/universe.rkt
deleted file mode 100644
index 9d8ddd292e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/universe.rkt
+++ /dev/null
@@ -1,394 +0,0 @@
-#lang racket/gui
-
-;; ---------------------------------------------------------------------------------------------------
-;; provides the universe functionality (distributed worlds)
-
-(require "checked-cell.rkt"
-         "check-aux.rkt"
-         "timer.rkt"    
-         "last.rkt"
-         "clauses-spec-aux.rkt"
-         "stop.rkt"
-         htdp/error
-         (only-in mzlib/etc evcase)
-         string-constants)
-
-(provide 
- universe%
- ;; --- sample worlds and function on worlds ---
- iworld?  ;; Any -> Boolean 
- iworld=? ;; World World -> Boolean 
- iworld-name ;; World -> Symbol 
- iworld1  ;; sample worlds 
- iworld2
- iworld3
- ;; --- sending 'mail' to worlds ---
- ;; type Bundle = (make-bundle [Listof World] Universe [Listof Mail]) 
- ;; type Mail = (make-mail World S-expression)
- make-bundle ;; [Listof World] Universe [Listof Mail] -> Bundle 
- bundle?     ;; is this a bundle? 
- make-mail   ;; World S-expression -> Mail 
- mail?       ;; is this a real mail? 
- )
-
-;                                                          
-;                                                          
-;                                                          
-;   ;   ;           ;                                      
-;   ;   ;           ;                                      
-;   ;   ;                                                  
-;   ;   ;  ;;;;     ;    ;   ;   ;;;   ; ;;    ;;;    ;;;  
-;   ;   ;  ;   ;    ;    ;   ;  ;   ;  ;;  ;  ;   ;  ;   ; 
-;   ;   ;  ;   ;    ;     ; ;   ;;;;;  ;   ;   ;;;   ;;;;; 
-;   ;   ;  ;   ;    ;     ; ;   ;      ;          ;  ;     
-;   ;   ;  ;   ;    ;      ;    ;   ;  ;      ;   ;  ;   ; 
-;    ;;;   ;   ;    ;      ;     ;;;   ;       ;;;    ;;;  
-;                                                          
-;                                                          
-;                                                          
-
-(define universe%
-  (last-mixin
-   (clock-mixin
-    (class* object% (start-stop<%>) 
-      (inspect #f) 
-      (super-new)
-      (init-field        ;; type Result
-       ; = (make-bundle [Listof World] Universe [Listof Mail])
-       universe0         ;; the initial state of the universe
-       on-new            ;; Universe World -> Result
-       on-msg            ;; Universe World Message -> Result
-       port              ;; Number
-       ;; tick              ;; Universe -> Result
-       (state #f)        ;; Boolean 
-       (on-disconnect    ;; Universe World -> Result
-        (lambda (u w) (make-bundle u '() '())))
-       (to-string #f)    ;; Universe -> String 
-       (check-with True) ;; Any -> Boolean 
-       )
-      
-      (field 
-       [universe 
-        (new checked-cell%
-	     [value0 universe0]
-	     [ok? check-with] 
-             [display (if (string? state) 
-                          (and (not (string=? "OliverFlatt" state)) state)
-                          (and state "your server's state"))])])
- 
-      ;; -----------------------------------------------------------------------
-      ;; dealing with events
-      (define-syntax-rule 
-        ;; A B ... -> Void
-        (def/cback pub (pname a ...) 
-          ;; Universe A B ... -> (cons Universe Mail)
-          ;; effect: change server state, broadcast mails 
-          name body ...)
-        (begin
-          (pub pname)
-          (define (pname a ...) 
-            (define (handler e) (stop! e))
-            (with-handlers ([exn? handler])
-              (define ___  (begin 'dummy body ...))
-	      (define n (if (object-name name) (object-name name) name))
-              (define nxt (name (send universe get) a ...))
-              (cond
-                [(stop-the-world? nxt) (stop! (stop-the-world-world nxt))]
-                [(bundle? nxt) 
-                 (define-values (u mails bad)
-                   (bundle> n nxt))
-                 (send universe set (format "value returned from ~a" 'name) u)
-                 (unless (boolean? to-string) (send gui add (to-string u)))
-                 (broadcast mails)
-                 (for-each (lambda (iw) (kill iw "disconnected ~a")) bad)]
-                [else ;; plain universe state 
-                 (send universe set (format "value returned from ~a" 'name) nxt)
-                 (unless (boolean? to-string) (send gui add (to-string nxt)))])))))
-      
-      ;; [Listof Mail] -> Void
-      ;; send payload of messages to designated worlds 
-      (define/private (broadcast lm)
-        (for-each (lambda (p+m) 
-                    (define w (mail-to p+m))
-                    (define p (mail-content p+m))
-                    (define n (iworld-name w))
-                    (if (memq w iworlds)
-                        (with-handlers ((exn:fail? (lambda (e) (kill w "broadcast failed to ~a"))))
-                          (send gui add (format "-> ~a: ~a" n p))
-                          (iworld-send w p))
-                        (send gui add (format "~s not on list" n))))
-                  lm))
-      
-      (def/cback private (pnew iworld) on-new
-        (set! iworlds (cons iworld iworlds))
-        (send gui add (format "~a signed up" (iworld-name iworld))))
-      
-      (def/cback private (pmsg iworld r) on-msg
-        (send gui add (format "~a ->: ~a" (iworld-name iworld) r)))
-      
-      (def/cback private (pdisconnect iworld) on-disconnect
-        (kill iworld "~a !! closed port"))
-      
-      ;; tick, tock : deal with a tick event for this world 
-      (def/cback pubment (ptock) (let ([on-tick (lambda (w) (pptock w))]) on-tick))
-      (define/public (pptock w) (void))
-      (define/public (name-of-tick-handler)
-        "the on-tick-handler")
-      
-      ;; IWorld FormatString -> Void 
-      ;; effect: remove from given iworld from iworlds 
-      ;;         and shut down all connections 
-      (define/private (kill w msg)
-        (iworld-close w)
-        (set! iworlds (remq w iworlds))
-        (send gui add (format msg (iworld-name w)))
-        (when (null? iworlds) (restart)))
-      
-      ;; -----------------------------------------------------------------------
-      ;; start and stop server, start and stop the universe
-      
-      (field [iworlds   '()] ;; [Listof World]
-             [gui
-	       (if (and (string? state) (string=? "OliverFlatt" state))
-		   (new dummy-gui%)
-		   (new gui%
-		     [stop-server (lambda () (stop! (send universe get)))] 
-		     [stop-and-restart (lambda () (restart))]))]
-             [dr:custodian  (current-custodian)]
-             [the-custodian (make-custodian)])
-      
-      ;; start the universe, enable registrations and message exchanges
-      (define/public (start!)
-        (set! the-custodian (make-custodian))
-        (parameterize ([current-custodian the-custodian])
-          (define (loop)
-            (apply sync 
-                   (handle-evt (tcp-accept-evt tcp-listener) add-iworld)
-                   (map (lambda (p) (handle-evt (iworld-in p) (process-message p))) iworlds))
-            (loop))
-          ;;; WHERE 
-          (define tcp-listener 
-            (with-handlers ((exn:fail:network? (lambda (x) (stop! x))))
-              (tcp-listen port 4 #t)))
-          ;; [list IPort OPort] -> Void 
-          (define (add-iworld in-out)
-            (define in (first in-out))
-            (define out (second in-out))
-            ;; is it possible to kill the server with lots of bad connections?
-            (with-handlers ((tcp-eof? (lambda _ (void)))
-                            (exn? (lambda (e) (printf "process registration failed!\n"))))
-              (tcp-process-registration in out (lambda (info) (pnew (create-iworld in out info))))))
-          ;; IWorld -> [IPort -> Void]
-          (define (process-message p)
-            (lambda (in)
-              (with-handlers ((tcp-eof? (lambda (e) (pdisconnect p))))
-                (pmsg p (tcp-receive in)))))
-          ;; --- go universe go ---
-          (set! iworlds '())
-          (send universe set "initial expression" universe0)
-          (send gui add "a new universe is up and running")
-          (thread loop)))
-      
-      (define/private (restart)
-        ;; I am running in a custodian that is about to be killed, 
-        ;; so let's switch to one up in the hierarchy
-        (let ([old-t (current-thread)]
-              [go (make-semaphore)])
-          (parameterize ([current-custodian dr:custodian])
-            (thread (lambda ()
-                      (sync old-t go)
-                      (start!))))
-          (send gui add "stopping the universe")
-          (send gui add "----------------------------------")
-          (for-each iworld-close iworlds)
-          (custodian-shutdown-all the-custodian)
-          (semaphore-post go)))
-      
-      (define/public (stop! msg) 
-        (send gui show #f)
-        (custodian-shutdown-all the-custodian))
-      
-      ;; -----------------------------------------------------------------------
-      ;; initialize the universe and run 
-      (send gui show #t)
-      (start!)))))
-
-
-;                                            
-;                                            
-;                                            
-;   ;   ;                  ;        ;        
-;   ;   ;                  ;        ;        
-;   ;   ;                  ;        ;        
-;   ;   ;   ;;;   ; ;;     ;     ;;;;   ;;;  
-;   ;   ;  ;   ;  ;;  ;    ;    ;   ;  ;   ; 
-;   ; ; ;  ;   ;  ;   ;    ;    ;   ;   ;;;  
-;   ;; ;;  ;   ;  ;        ;    ;   ;      ; 
-;   ;   ;  ;   ;  ;        ;    ;   ;  ;   ; 
-;   ;   ;   ;;;   ;        ;;    ;;;;   ;;;  
-;                                            
-;                                            
-;                                            
-
-;; --- the server representation of a world --- 
-(define-struct iworld (in out name info) #; #:transparent)
-;; World = (make-iworld IPort OPort Symbol [Listof Sexp])
-
-(define (iw* n) (make-iworld (current-input-port) (current-output-port) n '()))
-(define iworld1 (iw* "iworld1"))
-(define iworld2 (iw* "iworld2"))
-(define iworld3 (iw* "iworld3"))
-
-(define (iworld=? u v)
-  (check-arg 'iworld=? (iworld? u) 'iworld "first" u)
-  (check-arg 'iworld=? (iworld? v) 'iworld "second" v)
-  (eq? u v))
-
-;; IWorld -> Void
-(define (iworld-close p)
-  (close-output-port (iworld-out p))
-  (close-input-port (iworld-in p)))
-
-;; IPort OPort Sexp -> IWorld 
-(define (create-iworld i o info)
-  (make-iworld i o info "info field not available"))
-
-;; Player S-exp -> Void
-(define (iworld-send p sexp)
-  (tcp-send (iworld-out p) sexp))
-
-;                       
-;                       
-;                       
-;    ;;;   ;   ;    ;   
-;   ;   ;  ;   ;    ;   
-;   ;      ;   ;    ;   
-;   ;      ;   ;    ;   
-;   ;  ;;  ;   ;    ;   
-;   ;   ;  ;   ;    ;   
-;   ;   ;  ;   ;    ;   
-;   ;   ;  ;   ;    ;   
-;    ;;;    ;;;     ;   
-;                       
-;                       
-;                       
-
-;; effect: create and show a gui with two buttons and an editor for logging
-(define gui%
-  (class frame%
-    (init stop-server stop-and-restart)
-    (inherit show)
-    (define/augment (on-close) (end))
-    (super-new [label "Universe"][width 500][height 300][style '(metal)])
-    (field
-     [end (lambda _ (show #f) (stop-server))]
-     [panel (new horizontal-panel% [parent this] [stretchable-height #f]
-                 [alignment '(center center)])]
-     [stop  (new button% [parent panel] [label "stop"] [callback end])]
-     [s&re  (new button% [parent panel] [label "stop and restart"] 
-                 [callback (lambda (but evt) (stop-and-restart))])]
-     [text  (new text%)]
-     [edit  (new editor-canvas% [parent this] [editor text]
-                 [style '(no-border no-hscroll auto-vscroll)])])
-    
-    ;; add lines to the end of the text 
-    (define/public (add str)
-      (queue-callback 
-       (lambda () 
-         (send text lock #f)
-         (send text insert (format "~a\n" str) (send text last-position))
-         (send text lock #t))))
-    
-    ;; -------------------------------------------------------------------------
-    ;; add menu, lock, and show 
-    (copy-and-paste this)
-    (send text lock #t)))
-
-;; throw away all messages, for Oliver to run on R Pi 
-(define dummy-gui%
-  (class object%
-    (super-new)
-    (define/public (show x) (void))
-    (define/public (add x) (void))))
-
-;; -----------------------------------------------------------------------------
-;; Frame Text -> Void
-;; add menu bar to frame for copying all of the text 
-(require string-constants)
-
-(define (copy-and-paste frame)
-  (define mb (new menu-bar% [parent frame]))
-  (define edit (new menu%
-                    [label (string-constant edit-menu-label)]
-                    [parent mb]))
-  (new menu-item%
-       [label (string-constant copy-menu-item)]
-       [parent edit]
-       [shortcut #\c]
-       [callback (lambda (m e)
-                   (define t (send frame get-focus-object))
-                   (when (is-a? t editor<%>)
-                     (send t copy)))])
-  (new menu-item%
-       [label (string-constant select-all-menu-item)]
-       [parent edit]
-       [shortcut #\a]
-       [callback (lambda (m e)
-                   (define t (send frame get-focus-object))
-                   (when (is-a? t text%)
-                     (send t set-position 0 (send t last-position))))])
-  (void))
-
-;                              
-;                              
-;  ;;; ;;;          ;     ;;   
-;   ;; ;;                  ;   
-;   ;; ;;   ;;;   ;;;      ;   
-;   ; ; ;  ;   ;    ;      ;   
-;   ; ; ;   ;;;;    ;      ;   
-;   ;   ;  ;   ;    ;      ;   
-;   ;   ;  ;   ;    ;      ;   
-;  ;;; ;;;  ;;;;; ;;;;;  ;;;;; 
-;                              
-;                              
-;                              
-;                              
-
-(define-struct bundle (state mails bad) #:transparent)
-
-(set! make-bundle
-      (let ([make-bundle make-bundle])
-        (lambda (state mails bads)
-          (check-arg-list 'make-bundle mails mail? "mail" "second")
-          (check-arg-list 'make-bundle bads iworld? "iworld" "third")
-          (make-bundle state mails bads))))
-
-;; Symbol Any (Any -> Boolean) String String -> Void 
-;; raise a TP exception if low is not a list of world? elements 
-(define (check-arg-list tag low pred? msg ith)
-  (check-arg tag (list? low) (format "list [of ~as]" msg) ith low)
-  (for ((c (in-list low)))
-    (unless (pred? c)
-      (error 
-       tag
-       "expects a list of mails as ~a argument, given a list that contains: ~e"
-       ith
-       c)))
-  #;
-  (check-arg tag  msg (format "(elements of) ~a" ith) c)
-  )
-
-;; Symbol Any ->* Universe [Listof Mail] [Listof IWorld]
-(define (bundle> tag r)
-  (unless (bundle? r) 
-    (tp-error tag "expected the ~a function to return a bundle, but it returned ~e" tag r))
-  (values (bundle-state r) (bundle-mails r) (bundle-bad r)))
-
-(define-struct mail (to content) #:transparent)
-
-(set! make-mail
-      (let ([make-mail make-mail])
-        (lambda (to content)
-          (check-arg 'make-mail (iworld? to) 'iworld "first" to)
-          (check-arg 'make-mail (sexp? content) 'S-expression "second" content)
-          (make-mail to content))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/utilities.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/utilities.rkt
deleted file mode 100644
index 2c2f04b1fc..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/utilities.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-
-(require racket/contract)
-
-(provide/contract
- ;; like the unix debugging facility
- [tee (-> symbol? any/c any)]
- )
-
-
-(define (tee tag x)
-  (printf "~a ~s\n" tag x)
-  x)
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/world.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/world.rkt
deleted file mode 100644
index b5a2d69dda..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/world.rkt
+++ /dev/null
@@ -1,570 +0,0 @@
-#lang racket/gui
-
-(require "check-aux.rkt"
-         "timer.rkt"
-         "last.rkt"
-         "checked-cell.rkt"
-         "stop.rkt"
-         "universe-image.rkt"
-         "pad.rkt"
-         (only-in 2htdp/image scale overlay/align rotate)
-         htdp/error
-         mzlib/runtime-path
-         mrlib/bitmap-label
-         string-constants
-         mrlib/gif)
-
-(provide world% aworld%)
-
-;                                     
-;                                     
-;                                     
-;   ;   ;                  ;        ; 
-;   ;   ;                  ;        ; 
-;   ;   ;                  ;        ; 
-;   ;   ;   ;;;   ; ;;     ;     ;;;; 
-;   ;   ;  ;   ;  ;;  ;    ;    ;   ; 
-;   ; ; ;  ;   ;  ;   ;    ;    ;   ; 
-;   ;; ;;  ;   ;  ;        ;    ;   ; 
-;   ;   ;  ;   ;  ;        ;    ;   ; 
-;   ;   ;   ;;;   ;        ;;    ;;;; 
-;                                     
-;                                     
-;                                     
-
-(define MIN-WIDT-FOR-GAME-PAD 300)
-
-;; -----------------------------------------------------------------------------
-;; packages for broadcasting information to the universe 
-
-(define-values (make-package package? package-world package-message)
-  (let ()
-    (struct package (world message) #:transparent)
-    (define (make-package w m)
-      (check-arg 'make-package (sexp? m) 'sexp "second" m)
-      (package w m))
-    (values make-package package? package-world package-message)))
-
-(provide
- make-package  ;; World S-expression -> Package
- package?      ;; Any -> Package
- package-world ;; Package -> World 
- )
-
-(define p-r-g (make-pseudo-random-generator))
-
-(define world%
-  (last-mixin
-   (clock-mixin
-    (class* object% (start-stop<%>)
-      (inspect #f)
-      (init-field world0)
-      (init-field name state register port check-with on-key on-release on-pad on-mouse record?)
-      (init on-receive on-draw stop-when)
-      
-      ;; -----------------------------------------------------------------------
-      (field
-       [to-draw on-draw]
-       [world
-        (new checked-cell% [value0 world0] [ok? check-with]
-             [display (and state (or name "your world program's state"))])])
-      
-      
-      ;; -----------------------------------------------------------------------
-      (field [*out* #f] ;; (U #f OutputPort), where to send messages to 
-             [*rec* (make-custodian)]) ;; Custodian, monitor traffic)
-      
-      (define/private (register-with-host)
-        (define FMT "\nworking off-line\n")
-        (define FMTtry (string-append "unable to register with ~a after ~s tries" FMT))                         
-        (define FMTcom (string-append "unable to register with ~a due to protocol problems" FMT))
-        ;; Input-Port -> [-> Void]
-        ;; create closure (for thread) to receive messages and signal events
-        (define (RECEIVE in)
-          (define (RECEIVE)
-            (sync 
-             (handle-evt
-              in
-              (lambda (in) 
-                (define dis (text "the universe disappeared" 11 'red))
-                ((with-handlers ((tcp-eof? 
-                                  (compose (handler #f)
-                                           (lambda (e)
-                                             (set! draw (lambda (w) dis))
-                                             (pdraw)
-                                             (lambda () e)))))
-                   ;; --- "the universe disconnected" should come from here ---
-                   (define msg (tcp-receive in))
-                   (cond
-                    [(sexp? msg) (prec msg) RECEIVE] ;; break loop if EOF
-                    [else (error 'RECEIVE "sexp expected, received: ~e" msg)])))))))
-          RECEIVE)
-        ;; --- now register, obtain connection, and spawn a thread for receiving
-        (parameterize ([current-custodian *rec*])
-          ;; try to register with the server n times 
-          (let try ([n TRIES])
-            (printf "trying to register with ~a ...\n" register)
-            (with-handlers ((tcp-eof? (lambda (x) (printf FMTcom register)))
-                            (exn:fail:network? 
-                             (lambda (x)
-                               (if (= n 1) 
-                                   (printf FMTtry register TRIES)
-                                   (begin (sleep PAUSE) (try (- n 1)))))))
-              (define-values (in out) (tcp-connect register port))
-              (tcp-register in out name)
-              (printf "... successful registered and ready to receive\n")
-              (set! *out* out)
-              (thread (RECEIVE in))))))
-      
-      (define/private (broadcast msg)
-        (when *out* 
-          (check-result 'send sexp? "Sexp expected; given ~e\n" msg)
-          (tcp-send *out* msg)))
-      
-      ;; -----------------------------------------------------------------------
-      (field
-       (draw   (cond
-                 [(procedure? to-draw) to-draw]
-                 [(pair? to-draw)      (first to-draw)]
-                 [else to-draw]))
-       (live   (not (boolean? draw)))
-       (width  (if (pair? to-draw) (second to-draw) #f))
-       (height (if (pair? to-draw) (third to-draw) #f)))
-      
-      ;; the visible world 
-      (field [enable-images-button void] ;; used if stop-when call produces #t
-             [disable-images-button void]
-             [visible (new pasteboard%)])
-      
-      (define/private (show-canvas)
-        (send visible set-cursor (make-object cursor% 'arrow))
-        (let ([fst-scene (ppdraw)])
-          (if (2:image? fst-scene)
-              (let ([first-width  (+ (image-width fst-scene) 1)]
-                    [first-height (+ (image-height fst-scene) 1)])
-                (unless (and width height)
-                  (check-scene-dimensions (name-of draw 'your-draw) first-width first-height)
-                  (set! width first-width)
-                  (set! height first-height)))
-              (let ([first-width  (image-width fst-scene)]
-                    [first-height (image-height fst-scene)])
-                (unless (and width height)
-                  (set! width first-width)
-                  (set! height first-height))))
-          (when pad
-            (unless (>= width MIN-WIDT-FOR-GAME-PAD)
-              (error 'big-bang
-                     "a game pad requires a scene whose width is greater or equal to ~a, given ~e"
-                     MIN-WIDT-FOR-GAME-PAD fst-scene))
-            (set! game-pad-image (scale (/ width (image-width game-pad)) game-pad)))
-          (create-frame)
-          (show fst-scene)))
-      
-      (define/private (add-game-pad scene)
-        (if (boolean? pad) scene (overlay/align 'left 'bottom game-pad-image scene)))
-      
-      (define/public (deal-with-key %)
-        (if (and (not on-key) (not on-pad) (not on-release))
-            %
-            (class %
-              (super-new)
-              (define/override (on-char e) 
-                (when live
-                  (let ([e:str (key-event->parts e)])
-                    (cond
-                      [(string=? e:str "release") (prelease (key-release->parts e))]
-                      [(and pad (pad-event? e:str)) (ppad e:str)]
-                      [else (pkey e:str)])))))))
-      
-      (define/public (deal-with-mouse %)
-        (if (not on-mouse) 
-            ;; No mouse handler => discard mouse events (so snip are not selected
-            ;;  in the pasteboard, for example
-            (class %
-              (super-new)
-              (define/override (on-event e)
-                (void)))
-            ;; Mouse handler => handle mouse events
-            (class %
-              (super-new)
-              (define/override (on-event e)
-                (define-values (x y me) (mouse-event->parts e))
-                (when live
-                  (cond
-                    [(and (<= 0 x width) (<= 0 y height)) (pmouse x y me)]
-                    [(member me '("leave" "enter")) (pmouse x y me)]
-                    [else (void)]))))))
-      
-      ;; allows embedding of the world-canvas in other GUIs
-      (define/public (create-frame)
-        (create-frame/universe))
-      
-      ;; effect: create, show and set the-frame
-      (define/pubment (create-frame/universe)
-        (define play-back:cust (make-custodian))
-        (define frame (new (class frame%
-                             (super-new)
-                             (define/augment (on-close)  
-                               (callback-stop! 'frame-stop)
-                               (custodian-shutdown-all play-back:cust)))
-                           (label (if name (format "~a" name) "World"))
-                           (alignment '(center center))
-                           (style '(no-resize-border metal))))
-        
-        (define editor-canvas
-          (new (deal-with-key (deal-with-mouse editor-canvas%))
-               (parent frame)
-               (editor visible)
-               (stretchable-width #f)
-               (stretchable-height #f)
-               (style '(no-hscroll no-vscroll))
-               (horizontal-inset INSET)
-               (vertical-inset INSET)))
-        (send editor-canvas min-client-width (+ width INSET INSET))
-        (send editor-canvas min-client-height (+ height INSET INSET))
-        (set!-values (enable-images-button disable-images-button)
-                     (inner (values void void) create-frame/universe frame play-back:cust))
-        (send editor-canvas focus)
-        (send frame show #t))
-      
-      ;; Image -> Void
-      ;; show the image in the visible world
-      (define/public (show pict0)
-        (define pict*
-          (if (is-a? pict0 bitmap%)
-              (rotate 0 pict0)
-              pict0))
-        (define pict (add-game-pad pict*))
-        (send visible begin-edit-sequence)
-        (send visible lock #f)
-        (let ([s (send visible find-first-snip)]
-              [c (send visible get-canvas)])
-          (when s (send visible delete s))
-          (send visible insert (disable-cache (send pict copy)) 0 0)
-          (send visible lock #t)
-          (send visible end-edit-sequence)
-          ;; The following flush trades streaming performance (where updates
-          ;; could be skipped if they're replaced fast enough) for 
-          ;; responsiveness (where too many updates might not get 
-          ;; through if the canvas is mostly in suspended-refresh 
-          ;; mode for scene changes):
-          #;
-          (send c flush)))
-      
-      ;; ----------------------------------------------------------------------
-      ;; callbacks 
-      (field
-       (key     (if on-key on-key (lambda (w ke) w)))
-       (pad     on-pad)
-       (game-pad-image #f)
-       (release (if on-release on-release (lambda (w ke) w)))
-       (mouse  on-mouse)
-       (rec    on-receive))
-      
-      (define drawing #f) ;; Boolean; is a draw callback scheduled?
-      (define (set-draw#!) 
-        (set! draw# (parameterize ((current-pseudo-random-generator p-r-g))
-                      (random 3)))
-        (set! drawing #f))
-      (define draw# 0) 
-      (set-draw#!)
-      
-      (define-syntax def/cback
-        (syntax-rules ()
-          [(_ pub (name arg ...) transform) 
-           (def/cback pub (name arg ...) transform (object-name transform))]
-          [(_ pub (name arg ...) transform tag)
-           ;; Any ... -> Boolean
-           (begin
-             (pub name)
-             
-             (define (name arg ...) 
-               (queue-callback 
-                (lambda ()
-                  (define H (handler #t))
-                  (with-handlers ([exn? H])
-                    ; (define tag (object-name transform))
-                    (define nw (transform (send world get) arg ...))
-                    (define (d) 
-                      (with-handlers ((exn? H))
-                        (pdraw))
-                      (set-draw#!))
-                    ;; ---
-                    ;; [Listof (Box [d | void])]
-                    (define w '()) 
-                    ;; set all to void, then w to null 
-                    ;; when a high priority draw is scheduledd
-                    ;; --- 
-                    (when (package? nw)
-                      (broadcast (package-message nw))
-                      (set! nw (package-world nw)))
-                    (cond
-                      [(stop-the-world? nw)
-                       (set! nw (stop-the-world-world nw))
-                       (send world set tag nw)
-                       (last-draw)
-                       (callback-stop! 'name)
-                       (enable-images-button)]
-                      [else 
-                       [define changed-world? (send world set tag nw)]
-                       [define stop? (stop (send world get))]
-                       ;; this is the old "Robby optimization" see checked-cell:
-                       ; unless changed-world? 
-                       (cond
-                         [(and draw (not stop?))
-                          (cond
-                            [(not drawing)
-                             (set! drawing #t)
-                             (let ([b (box d)])
-                               (set! w (cons b w))
-                               ;; low priority, otherwise it's too fast
-                               (queue-callback (lambda () ((unbox b))) #f))]
-                            [(< draw# 0)
-                             (set-draw#!)
-                             (for-each (lambda (b) (set-box! b void)) w)
-                             (set! w '())
-                             ;; high!!  the scheduled callback didn't fire
-                             (queue-callback (lambda () (d)) #t)]
-                            [else 
-                             (set! draw# (- draw# 1))])]
-                         [stop?
-                          (last-draw)
-                          (callback-stop! 'name)
-                          (enable-images-button)])
-                       changed-world?]))))))]))
-      
-      ;; tick, tock : deal with a tick event for this world 
-      (def/cback pubment (ptock) (lambda (w) (pptock w)) (name-of-tick-handler))
-      (define/public (pptock w) (void))
-      (define/public (name-of-tick-handler)
-        "the on-tick handler")
-      
-      ;; key events 
-      (def/cback pubment (pkey ke) key)
-      
-      ;; key events 
-      (def/cback pubment (ppad ke) pad)
-      
-      ;; release events 
-      (def/cback pubment (prelease ke) release)
-      
-      ;; mouse events 
-      (def/cback pubment (pmouse x y me) mouse)
-      
-      ;; receive revents 
-      (def/cback pubment (prec msg) rec)
-      
-      ;; ----------------------------------------------------------------------
-      ;; -> Void 
-      ;; draw : render the given world or this world (if #f)
-      (define/private (pdraw) 
-        (show (ppdraw)))
-      
-      ;; -> Scene
-      ;; produce the scene for the this state
-      (define/public (ppdraw)
-        (check-scene-result (name-of draw 'your-draw) (draw (send world get))))
-      
-      ;; ---------------------------------------------------------------------------------------------
-      ;; stop-when 
-      (field [stop (let ((s (if (procedure? stop-when) stop-when (first stop-when))))
-                     (lambda (x)
-                       (define result (s x))
-                       (check-result (name-of s 'your-stop-when) boolean? "boolean" result)
-                       result))]
-             [last-picture (if (pair? stop-when) (second stop-when) #f)])
-      
-      (define/private (last-draw)
-        (when last-picture (set! draw last-picture))
-        (pdraw))
-      
-      ;; ---------------------------------------------------------------------------------------------
-      ;; start & stop
-      (define/public (callback-stop! msg)
-        (stop! (send world get)))
-      
-      (define (handler re-raise)
-        (lambda (e)
-          (disable-images-button)
-          (stop! (if re-raise e (send world get)))))
-      
-      (define/public (start!)
-        (with-handlers ([exn? (handler #t)])
-          (when width ;; and height
-            (check-scene-dimensions "your to-draw clause" width height))
-          (when register (register-with-host))
-          (define w (send world get))
-          (cond
-            [(stop w) 
-             (when last-picture (set! draw last-picture))
-             (show-canvas)
-             (stop! w)]
-            [(stop-the-world? w) 
-             (when last-picture (set! draw last-picture))
-             (show-canvas)
-             (stop! (stop-the-world-world w))]
-            [else (show-canvas)])))
-      
-      (define/public (stop! w)
-        (set! live #f)
-        (custodian-shutdown-all *rec*))
-      
-      ;; -------------------------------------------------------------------------
-      ;; initialize the world and run 
-      (super-new)
-      (start!)))))
-
-; (define make-new-world (new-world world%))
-
-;; -----------------------------------------------------------------------------
-(define-runtime-path break-btn:path '(lib "icons/break.png"))
-(define break-button:label 
-  ((bitmap-label-maker (string-constant break-button-label) break-btn:path) '_))
-
-(define-runtime-path image-button:path '(lib "icons/file.gif"))
-(define image-button:label ((bitmap-label-maker "Images" image-button:path) '_))
-
-(define aworld%
-  (class world% 
-    ;; an argument-recording ppdraw
-    
-    ;; [Listof [List N Image]]
-    ;; a list of the displayed images combined with a time stamp 
-    (field [image-history '()]) 
-    
-    (super-new)
-    (inherit-field world0 draw rate width height record?)
-    (inherit show callback-stop!)
-    
-    ;; -> String or false 
-    (define/private (recordable-directory)
-      (and (path-string? record?) (directory-exists? record?) record?))
-    
-    ;; Frame Custodian ->* (-> Void) (-> Void)
-    ;; adds the stop animation and image creation button, 
-    ;; whose callbacks runs as a thread in the custodian
-    (define/augment (create-frame/universe frm play-back-custodian)
-      (define p (new horizontal-pane% [parent frm][alignment '(center center)]))
-      (define (pb)
-        (parameterize ([current-custodian play-back-custodian])
-          (define done #false)
-          (define pb-thread
-            (thread
-             (lambda ()
-               (dynamic-wind void 
-                             (lambda () (play-back))
-                             (lambda () (set! done #true))))))
-          (define watcher
-            (thread
-             (lambda ()
-               (sync pb-thread)
-               (if done 
-                   (custodian-shutdown-all play-back-custodian) 
-                   (message-box
-                    "Error"
-                    "The creation of the animated gif failed, probably due to a lack of memory")))))
-          (stop)))
-      (define (switch)
-        (send stop-button enable #f)
-        (if (recordable-directory) (pb) (send image-button enable #t)))
-      (define (stop) 
-        (send image-button enable #f)
-        (send stop-button enable #f))
-      (define-syntax-rule (btn l a y ...)
-        (new button% [parent p] [label l] [style '(border)] 
-             [callback (lambda a y ...)]))
-      (define stop-button 
-        (btn break-button:label (b e) (callback-stop! 'stop-images) (switch)))
-      (define image-button 
-        (btn image-button:label (b e) (pb)))
-      (send image-button enable #f)
-      (values switch stop))
-    
-    (define/override (ppdraw)
-      (define image (super ppdraw))
-      (set! image-history (cons (list (current-inexact-milliseconds) image) image-history))
-      image)
-    
-    ;; --> Void
-    ;; re-play the history of events; create a png per step; create animated gif
-    ;; effect: write to user-chosen directory
-    (define/private (play-back)
-      ;; World EventRecord -> World 
-      (define (world-transition world fst) (apply (car fst) world (cdr fst)))
-      ;; --- creating images 
-      (define total (+ (length image-history) 1))
-      (define digt# (string-length (number->string total)))
-      (define imag# 0)
-      (define bmps '())
-      ;; Image -> Void
-      (define (save-image img)
-        (define bm (make-object bitmap% width height))
-        (define dc (make-object bitmap-dc% bm))
-        (send dc clear)
-        (send img draw dc 0 0 0 0 width height 0 0 #f)
-        (set! imag# (+ imag# 1))
-        (send bm save-file (format "i~a.png" (zero-fill imag# digt#)) 'png)
-        (set! bmps (cons bm bmps))
-        img)
-      ;; --- choose place 
-      (define img:dir
-        (or (recordable-directory)
-            (get-directory "image directory:" #f (current-directory))))
-      (when img:dir
-        (parameterize ([current-directory img:dir])
-          (define image-history-interpolated (interpolate-history image-history))
-          (define imageN 
-            (if (empty? image-history-interpolated)
-                (save-image (draw world0))
-                (first (map save-image image-history-interpolated))))
-          (show (text (format "creating ~a" ANIMATED-GIF-FILE) 18 'red))
-          (create-animated-gif rate bmps)
-          (show imageN))))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; [Listof [List Real Image]] -> [Listof Image]
-;; for David's talk
-(define (interpolate-history lox0)
-  (define lox (reverse lox0))
-  (cond 
-    [(or (empty? lox) (empty? (rest lox))) (map second lox)]
-    [else 
-     ;; -----------------------------------------------------------------------------
-     (define raw-times (map first lox))
-     (define intervals 
-       (let loop ([l (rest raw-times)][last (first raw-times)])
-         (cond
-           [(empty? l) '()]
-           [else (cons (- (first l) last) (loop (rest l) (first l)))])))
-     (define delta (apply min intervals))
-     ;; -----------------------------------------------------------------------------
-     (define image1 (second (first lox)))
-     (let loop ([last-image image1][t (first (first lox))][lox (rest lox)][images (list image1)])
-       (cond
-         [(empty? lox) images]
-         [else (define stamp+image (first lox))
-               (define stamp (first stamp+image))
-               (define image (second stamp+image))
-               (define new-t (+ delta t))
-               (if (< new-t stamp)
-                   (loop last-image new-t lox (cons last-image images))
-                   (loop image      new-t (rest lox) (cons image  images)))]))]))
-
-;; ---------------------------------------------------------------------------------------------------
-
-
-;; Number [Listof (-> bitmap)] -> Void
-;; turn the list of thunks into animated gifs 
-;; effect: overwrite the ANIMATED-GIF-FILE (in current directory)
-;; [Listof (-> bitmap)] -> Void
-;; turn the list of thunks into animated gifs 
-;; effect: overwrite the ANIMATED-GIF-FILE (in current directory)
-(define (create-animated-gif R bitmap-list)
-  (when (file-exists? ANIMATED-GIF-FILE) (delete-file ANIMATED-GIF-FILE))
-  (write-animated-gif bitmap-list (if (> +inf.0 R 0) (number->integer R) 5)
-                      ANIMATED-GIF-FILE
-                      #:one-at-a-time? #t
-                      #:loop? #f))
-
-(define ANIMATED-GIF-FILE "i-animated.gif")
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/auxiliaries.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/auxiliaries.rkt
deleted file mode 100644
index f43ab936db..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/auxiliaries.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scheme
-
-(provide spawn)
-
-(define (spawn f name)
-  (thread (lambda () (f name))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/chatter.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/chatter.rkt
deleted file mode 100644
index 2ca1f4c1a8..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/chatter.rkt
+++ /dev/null
@@ -1,492 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname chatter) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require 2htdp/universe)
-(require htdp/image)
-(require "auxiliaries.rkt")
-
-#|
-
- +------------------------------------------------------------------+
- | from: text text text text text text                              |
- | from*: text text text text text text                             |
- | ...                                                              |
- | ...                                                              |
- +------------------------------------------------------------------+
- | to: text text text text text text                                |
- | *: text text text text text text                                 |
- | to2: text blah text[]                                            |
- | ...                                                              |
- +------------------------------------------------------------------+
-
- Convention: the names of participants may not contain ":". 
- The first typed ":" separates the addresses from the message.
- 
- TODO:
-   -- the editing of too-tall send messages is a bit off screen. 
-   
-|#
-
-;                                                          
-;                                                          
-;      ;;                                 ;;           ;;; 
-;       ;          ;                       ;          ;    
-;    ;; ;   ;;;   ;;;;;   ;;;           ;; ;   ;;;   ;;;;; 
-;   ;  ;;  ;   ;   ;     ;   ;         ;  ;;  ;   ;   ;    
-;   ;   ;   ;;;;   ;      ;;;;         ;   ;  ;;;;;   ;    
-;   ;   ;  ;   ;   ;     ;   ;         ;   ;  ;       ;    
-;   ;   ;  ;   ;   ;   ; ;   ;         ;   ;  ;       ;    
-;    ;;;;;  ;;;;;   ;;;   ;;;;;         ;;;;;  ;;;;  ;;;;; 
-;                                                          
-;                                                          
-;                                                          
-;                                                          
-
-(define-struct world (todraft mmdraft from to))
-(define-struct messg (addr text))
-
-;; World = (make-world StrFl StrFl (Listof Line) (Listof Line))
-;; StrFl = String or false 
-;; Line  = (make-messg String String)
-;; WorldPackage = (make-package World (list String String))
-
-;; NOTE: the from and to fields never contain lists that would 
-;;   create images taller than MID-2. We enforce this via send
-;;   and receive. 
-
-;; visual constants 
-
-(define WIDTH 400)
-(define HEIGHT 300) ;; at least 200 
-(define MID (/ HEIGHT 2))
-
-(define FTSZ 11)
-(define FTCL "black")
-
-(define SP " ")
-
-(define MT (scene+line (empty-scene WIDTH HEIGHT) 0 MID WIDTH MID FTCL))
-(define BLANK (rectangle WIDTH FTSZ "outline" "white"))
-
-(define CURSOR (rectangle 3 FTSZ "solid" "red"))
-
-;                                            
-;                                            
-;                           ;;               
-;                            ;               
-;   ;; ;;   ;;;  ;; ;;    ;; ;   ;;;   ;; ;; 
-;    ;;    ;   ;  ;;  ;  ;  ;;  ;   ;   ;;   
-;    ;     ;;;;;  ;   ;  ;   ;  ;;;;;   ;    
-;    ;     ;      ;   ;  ;   ;  ;       ;    
-;    ;     ;      ;   ;  ;   ;  ;       ;    
-;   ;;;;;   ;;;; ;;; ;;;  ;;;;;  ;;;;  ;;;;; 
-;                                            
-;                                            
-;                                            
-;                                            
-
-;; World -> Scene 
-;; render the world as a scene 
-(define (render w)
-  (local [(define fr (line*-render (world-from w)))
-          (define t1 (line*-render (world-to w)))
-          (define last-to-line
-            (line-render-cursor (world-todraft w) (world-mmdraft w)))
-          (define tt (image-stack t1 last-to-line))]
-    (place-image fr 1 1 (place-image tt 1 MID MT))))
-
-;; -----------------------------------------------------------------------------
-;; [Listof Line] -> Image
-;; render this list of lines 
-(define (line*-render lines)
-  (cond
-    [(empty? lines) (circle 0 "solid" "red")]
-    [else
-     (local ((define fst (first lines)))
-       (image-stack (line-render (messg-addr fst) (messg-text fst))
-                    (line*-render (rest lines))))]))
-
-;; -----------------------------------------------------------------------------
-;; String String -> Image
-;; render a single display line 
-
-(define result0 (text (string-append SP "ada: hello") FTSZ FTCL))
-
-(check-expect (line-render "ada" "hello") result0)
-
-(define (line-render addr msg)
-  (text (string-append SP addr ": " msg) FTSZ FTCL))
-
-;; -----------------------------------------------------------------------------
-;; StrFl StrFl -> Image
-;; render a single display line, with a cursor at current 'editing' position
-
-(check-expect (line-render-cursor false false) 
-              (image-append (text SP FTSZ FTCL) CURSOR))
-
-(check-expect (line-render-cursor "ada" false) 
-              (image-append (text (string-append SP "ada") FTSZ FTCL) CURSOR))
-
-(check-expect (line-render-cursor "ada" "hello") 
-              (image-append result0 CURSOR))
-
-(define (line-render-cursor addr msg)  
-  (cond
-    [(and (boolean? addr) (boolean? msg)) 
-     (image-append (text SP FTSZ FTCL) CURSOR)]
-    [(and (string? addr) (boolean? msg)) 
-     (image-append (text (string-append SP addr) FTSZ FTCL) CURSOR)]
-    [else 
-     (image-append (text (string-append SP addr ": " msg) FTSZ FTCL) CURSOR)]))
-
-;                                                   
-;                                                   
-;                   ;                               
-;                                                   
-;    ;; ;;;;  ;;  ;;;            ;;;  ;;  ;; ;;  ;; 
-;   ;  ;;  ;   ;    ;           ;   ;  ;   ;  ;  ;  
-;   ;   ;  ;   ;    ;            ;;;;  ;   ;   ;;   
-;   ;   ;  ;   ;    ;           ;   ;  ;   ;   ;;   
-;   ;   ;  ;  ;;    ;           ;   ;  ;  ;;  ;  ;  
-;    ;;;;   ;; ;; ;;;;;          ;;;;;  ;; ;;;;  ;; 
-;       ;                                           
-;    ;;;                                            
-;                                                   
-;                                                   
-
-;; Image Image -> Image 
-;; stack two images along left vertical 
-
-(check-expect (image-stack (rectangle 10 20 "solid" "red") 
-                           (rectangle 10 20 "solid" "red"))
-              (put-pinhole (rectangle 10 40 "solid" "red") 0 0))
-
-(define (image-stack i j)
-  (overlay/xy (put-pinhole i 0 0) 0 (image-height i) (put-pinhole j 0 0)))
-
-;; Image Image -> Image 
-;; append two images along bottom line
-
-(check-expect (image-append (rectangle 10 20 "solid" "red") 
-                            (rectangle 10 20 "solid" "red"))
-              (put-pinhole (rectangle 20 20 "solid" "red") 0 0))
-
-(check-expect (image-append (rectangle 10 20 "solid" "red") 
-                            (rectangle 10 10 "solid" "red"))
-              (overlay/xy (put-pinhole (rectangle 10 20 "solid" "red") 0 0)
-                          10 10
-                          (put-pinhole (rectangle 10 10 "solid" "red") 0 0)))
-
-(define (image-append i j)
-  (local ((define hi (image-height i))
-          (define hj (image-height j)))
-    (overlay/xy (put-pinhole i 0 0) (image-width i) (- hi hj) (put-pinhole j 0 0))))
-
-;                                                   
-;                                                   
-;                                 ;                 
-;                                                   
-;   ;; ;;   ;;;    ;;;;   ;;;   ;;;   ;;; ;;;  ;;;  
-;    ;;    ;   ;  ;   ;  ;   ;    ;    ;   ;  ;   ; 
-;    ;     ;;;;;  ;      ;;;;;    ;    ;   ;  ;;;;; 
-;    ;     ;      ;      ;        ;     ; ;   ;     
-;    ;     ;      ;   ;  ;        ;     ; ;   ;     
-;   ;;;;;   ;;;;   ;;;    ;;;;  ;;;;;    ;     ;;;; 
-;                                                   
-;                                                   
-;                                                   
-;                                                   
-
-;; World Message -> World 
-;; receive a message, append to end of received messages 
-
-(define w0 (make-world false false '() '()))
-(define w1 (make-world false false (list (make-messg "bob*" "hello")) '()))
-
-(check-expect (receive w0 (list "bob*" "hello")) w1)
-(check-expect (receive w1 (list "angie" "world")) 
-              (make-world false false 
-                          (list (make-messg "bob*" "hello")
-                                (make-messg "angie" "world"))
-                          '()))
-
-(define (receive w m)
-  (make-world (world-todraft w)
-              (world-mmdraft w)
-              (enqueue 2 (world-from w) (first m) (second m))
-              (world-to w)))
-
-;                                                          
-;                                                          
-;    ;;      ;                                             
-;     ;                                                    
-;     ;    ;;;   ;; ;;    ;;;           ;;;  ;;  ;; ;;  ;; 
-;     ;      ;    ;;  ;  ;   ;         ;   ;  ;   ;  ;  ;  
-;     ;      ;    ;   ;  ;;;;;          ;;;;  ;   ;   ;;   
-;     ;      ;    ;   ;  ;             ;   ;  ;   ;   ;;   
-;     ;      ;    ;   ;  ;             ;   ;  ;  ;;  ;  ;  
-;   ;;;;;  ;;;;; ;;; ;;;  ;;;;          ;;;;;  ;; ;;;;  ;; 
-;                                                          
-;                                                          
-;                                                          
-;                                                          
-
-;; Nat [Listof Line] String String -> [Listof Line]
-;; generative: add the line at end of list; if small enough, okay. 
-
-;; this tests adding one too many items to the list
-(check-expect 
- (enqueue 2 (build-list 11 (lambda (i) (make-messg "a*" (number->string i))))
-          "ada" "hello world")
- (build-list 11 (lambda (i) 
-                  (if (<= i 9)
-                      (make-messg "a*" (number->string (+ i 1)))
-                      (make-messg "ada" "hello world")))))
-                      
-
-(define (enqueue h from* from msg)
-  (local ((define candidate (append from* (list (make-messg from msg))))
-          (define rendered  (line*-render candidate)))
-    (cond
-      [(<= (image-height rendered) (- MID h)) candidate]
-      [else (enqueue h (rest from*) from msg)])))
-    
-
-
-;                                                                               
-;                                                                               
-;             ;;    ;                                                        ;; 
-;              ;          ;                                                   ; 
-;    ;;;    ;; ;  ;;;    ;;;;;           ;;           ;;;;   ;;;  ;; ;;    ;; ; 
-;   ;   ;  ;  ;;    ;     ;             ;            ;   ;  ;   ;  ;;  ;  ;  ;; 
-;   ;;;;;  ;   ;    ;     ;             ;             ;;;   ;;;;;  ;   ;  ;   ; 
-;   ;      ;   ;    ;     ;            ; ; ;             ;  ;      ;   ;  ;   ; 
-;   ;      ;   ;    ;     ;   ;        ;  ;          ;   ;  ;      ;   ;  ;   ; 
-;    ;;;;   ;;;;; ;;;;;    ;;;          ;; ;         ;;;;    ;;;; ;;; ;;;  ;;;;;
-;                                                                               
-;                                                                               
-;                                                                               
-;                                                                               
-
-;; World String -> World u WorldPackage
-;; add char to address (unless ":"); otherwise to message draft
-;; if line is too wide to display, send off the message
-
-;; edit a text: one char at a time until 
-;; -- (1) ":" which is the name or 
-;; -- (2) "\r"/rendering a line is wider than the window
-;; WHAT HAPPENS IF THE LINE BECOMES WIDER THAN THE BUFFER BEFORE ":" ?
-
-(define WIDE-STRING (replicate WIDTH "m"))
-
-(check-expect (react w0 ":") w0)
-(check-expect (react w0 " ") w0)
-(check-expect (react w0 "a") (make-world "a" false '() '()))
-(check-expect (react (make-world "a" false '() '()) "d") 
-              (make-world "ad" false '() '()))
-(check-expect (react (make-world "ada" false '() '()) ":")
-              (make-world "ada" "" '() '()))
-(check-expect (react (make-world "ada" false '() '()) "left")
-              (make-world "ada" false '() '()))
-(check-expect (react (make-world "ada" "" '() '()) " ")
-              (make-world "ada" " " '() '()))
-(check-expect (react (make-world "ada" "" '() '()) "left")
-              (make-world "ada" "" '() '()))
-(check-expect (react (make-world "ada" "" '() '()) "h")
-              (make-world "ada" "h" '() '()))
-(check-expect (react (make-world "ada" "h" '() '()) ":")
-              (make-world "ada" "h:" '() '()))
-(check-expect (react w0 "\r") w0)
-(check-expect (react (make-world "ada" "x" '() '()) "\r")
-              (send "ada" "x" '() '()))
-(check-expect (react (make-world "ada" false '() '()) "\r")
-              (send "ada" "" '() '()))
-(check-expect (react (make-world "ada" WIDE-STRING '() '()) "x")
-              (send "ada" WIDE-STRING '() '()))
-(check-expect (react (make-world WIDE-STRING false '() '()) "x")
-              (send WIDE-STRING "" '() '()))
-
-;; -------------------------------
-;; editing keys, not required 
-
-(check-expect (react (make-world "abc" false '() '()) "\b")
-              (make-world "ab" false '() '()))
-(check-expect (react (make-world false false '() '()) "\b")
-              (make-world false false '() '()))
-(check-expect (react (make-world "abc" "def" '() '()) "\b")
-              (make-world "abc" "de" '() '()))
-
-(define (react w key)
-  (local ((define to (world-todraft w))
-          (define mm (world-mmdraft w))
-          (define from* (world-from w))
-          (define to* (world-to w)))
-    (cond
-      [(key=? "\r" key) 
-       (if (boolean? to) w (send to (if (boolean? mm) "" mm) from* to*))]
-      ;; -------------------------------
-      ;; editing keys; not required 
-      [(key=? "\b" key)
-       (cond
-         [(boolean? to) w]
-         [(string? mm) (world-mmdraft! w (shorten mm))]
-         ;; (boolean? mm) ^ (not (boolean? to)) => (string? mm)
-         [else (world-todraft! w (shorten to))])]       
-      ;; -------------------------------
-      [(key=? ":" key)
-       (cond
-         [(boolean? to) w]
-         [(boolean? mm) (world-mmdraft! w "")]
-         ;; (and (string? to) (string? mm))
-         ;; so this string belongs to the end of mm
-         [else (world-mmdraft! w (string-append mm ":"))])]
-      [else 
-       (cond
-         [(and (boolean? to) (boolean? mm))
-          ;; the key belongs into the address; it can't possibly be too wide
-          (cond
-            [(bad-name-key? key) w]
-            [else (world-todraft! w key)])]
-         [(and (string? to) (boolean? mm))
-          ;; the key also belongs into address 
-          (local ((define to-new (string-append to key)))
-            (cond
-              [(bad-name-key? key) w]
-              [(too-wide? to-new mm) (send to "" from* to*)]
-              [else (world-todraft! w to-new)]))]
-         ; [(and (boolean? to) (string? mm)) (error 'react "can't happen")]
-         [else                          ; (and (string? to) (string? mm))
-          ;; the key belongs into the message text 
-          (local ((define new-mm (string-append mm key)))
-            (cond
-              [(bad-msg-key? key) w]
-              [(too-wide? to new-mm) (send to mm from* to*)]
-              [else (world-mmdraft! w new-mm)]))])])))
-
-;; -----------------------------------------------------------------------------
-;; String -> String 
-;; take off last character 
-(check-expect (shorten "") "")
-(check-expect (shorten "abc") "ab")
-(define (shorten to)
-  (if (= (string-length to) 0)
-      to
-      (substring to 0 (- (string-length to) 1))))
-
-;; -----------------------------------------------------------------------------
-;; String -> Boolean 
-;; is this key bad for text messages?
-
-(check-expect (bad-msg-key? " ") false)
-(check-expect (bad-msg-key? "right") true)
-
-(define (bad-msg-key? key)
-  (or (string=? "\b" key) (>= (string-length key) 2)))
-
-;; -----------------------------------------------------------------------------
-;; String -> Boolean 
-;; is the key bad (special key, or space or ":") for names
-
-(check-expect (bad-name-key? "x") false)
-(check-expect (bad-name-key? ":") true)
-(check-expect (bad-name-key? "false") true)
-
-(define (bad-name-key? key)
-  (or (string=? " " key) (string=? ":" key) (>= (string-length key) 2)))
-
-;; -----------------------------------------------------------------------------
-;; String String [Listof Line] [Listof Line] -> WorldPackage
-;; add (make-messg addr msg) to from list, send (list addr msg)
-
-(check-expect (send "ada" "hello" '() '())
-              (make-package
-               (make-world false false '() (list (make-messg "ada" "hello")))
-               (list "ada" "hello")))
-
-(define (send addr msg from* to*)
-  (local ((define new-to* (enqueue (+ (image-height CURSOR) 2) to* addr msg)))
-    (make-package (make-world false false from* new-to*) (list addr msg))))
-
-;; -----------------------------------------------------------------------------
-;; World String -> World 
-;; create world from old fiels, use str for mmdraft
-
-(check-expect (world-mmdraft! (make-world false "" '() '()) ":") 
-              (make-world false ":" '() '()))
-
-(define from0 (list (make-messg "ada" "hello world")))
-(check-expect (world-mmdraft! (make-world false "" '() from0) ":")
-              (make-world false ":" '() from0))
-
-(define (world-mmdraft! w str)
-  (make-world (world-todraft w) str (world-from w) (world-to w)))
-
-;; -----------------------------------------------------------------------------
-;; World String -> World 
-;; create world from old fiels, use str for todraft
-
-(check-expect (world-todraft! (make-world false false '() '()) "x") 
-              (make-world "x" false '() '()))
-
-(check-expect (world-todraft! (make-world "xy" false '() from0) "xyz")
-              (make-world "xyz" false '() from0))
-
-(define (world-todraft! w str)
-  (make-world str (world-mmdraft w) (world-from w) (world-to w)))
-
-;; -----------------------------------------------------------------------------
-;; String String -> Boolean
-
-(check-expect (too-wide? "" (replicate WIDTH "m")) true)
-(check-expect (too-wide? "ada" "hello") false) ; must succeed 
-
-(define (too-wide? addr msg)
-  (>= (image-width (line-render-cursor addr msg)) (- WIDTH 2)))
-
-;                                     
-;                                     
-;                                     
-;    ;                    ;           
-;   ;;;;;   ;;;    ;;;;  ;;;;;   ;;;; 
-;    ;     ;   ;  ;   ;   ;     ;   ; 
-;    ;     ;;;;;   ;;;    ;      ;;;  
-;    ;     ;          ;   ;         ; 
-;    ;   ; ;      ;   ;   ;   ; ;   ; 
-;     ;;;   ;;;;  ;;;;     ;;;  ;;;;  
-;                                     
-;                                     
-;                                     
-;                                     
-
-(define world0 (make-world false false '() '()))
-(define world1 (make-world  
-                false false 
-                (list (make-messg "ada*" "hello")) 
-                (list (make-messg "ada" "world"))))
-(define world2 (make-world  
-                false false 
-                (list (make-messg "ada*" "hello")
-                      (make-messg "bob" "secret code")
-                      (make-messg "cynthia" "more secrets")
-                      (make-messg "doug" "it's all the same to me"))
-                (list (make-messg "ada" "world") 
-                      (make-messg "*" "world!!!"))))
-
-(render world0)
-(render world1)
-(render world2)
-
-(define (main n)
-  (big-bang world0 
-            (on-key react)
-            (on-draw render)
-            (on-receive receive)
-            (check-with world?)
-            (name n)
-            (state true)
-            (register LOCALHOST)))
-
-(define (run* _)
-  (launch-many-worlds (main "carl") (main "sam")))
-
-(run* 0)
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/readme b/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/readme
deleted file mode 100644
index ea76213edb..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/readme
+++ /dev/null
@@ -1,101 +0,0 @@
-                                Chit Chat
-                                ---------
-
-Design and implement a universe program that allows people to chat with
- each other, using short messages.
-
-A participant uses a chat space, which is a window divided into two spaces:
- the top half for listing the messages received and the bottom half for
- listing the messages sent plus the one message the participant is currently
- entering.
-
-The two halves display the messages in historical order, with the most
- recent message received/sent at the bottom. When either half is full of
- messages, drop the least recent lines.
-
-Each message is at most one line of text, which is the width of the
- window. Use 400 pixels for the width of a window, and use 11 point text
- fonts to render lines.  A line consists of two pieces:
-
-  -- an address
-  -- a message
-
- where the address is separated from the message with a ":". The user sends
- a message by typing the name of a participant, followed by ":" and the text
- of the message. The message is sent when the user hits "\r" (return) or
- when the line is too wide for the screen.
-
-Editing is just entering keys. Ignore all those key strokes that aren't
- one-character strings and of the remaining strings ignore backspace and
- delete. (Of course, if you are ambitious you may wish to assign meaning to
- some of those keys so that chatters can edit a bit.)
-
-A message whose recipient is "*" is broadcast to every current participant.
- Otherwise a message is sent to the designated recipient, if the string is
- the valid name of a current participant; all other messages disappear in
- the big empty void.
-
-Each received message is displayed like those that are sent, with an sender
- followed by ":" and the text of the message. If the message went to all
- participants, the sender's name is followed by an asterisk "*".
-
-As you work on this project, you will encounter questions for which this
-problem statement doesn't provide enough information to make decisions. You
-must make the decisions on your own, following this procedure:
- -- do not opt for answers that render the project trivial
- -- document all non-trivial answers and the answer you chose
- -- provide a reason for your choice
-Be concise.
-
-;; -----------------------------------------------------------------------------
-protocol:
-
-Sending and receiving message occur without any synchronization.
-
-Clients send messages of the form (list String String) to the server.  The
- first string designates the recipient of the message, the second string
- represents the message text.
-
-The Chat Server swaps the name of the recipient of a message with that of
- the sender; if the message is to be broadcast, it adds an asterisk "*".
- The server sends sends the resulting messages to the designated recipient.
- If the recipient name of a message is "*", then the server sends it all
- current participants.
-
-
-   SERVER                  CLIENT (name1)       CLIENT (name2)
-     |                       |                                   |
-     |  name1                |  % name by which client is known  |
-     | <-------------------- |                                   |
-     |                       |                                   |
-     |  (list name2 txt)     |                                   |
-     | <-------------------- |                                   |
-     |                       |                                   |
-     |                       |  (list name1 txt)                 |
-     | --------------------------------------------------------> |
-     |                       |                                   |
-     |                       |                                   |
-
-;; Client2ServerMsg = (list String String)
-;; interp. recipient followed by message text
-
-;; Server2ClientMsg = (list String String)
-;; interp. sender followed by message text.
-
-;; -----------------------------------------------------------------------------
-
-chat server: receive message, swap recipient for sender & send message(s)
-
-;; -----------------------------------------------------------------------------
-
-chat world:
-
- +------------------------------------------------------------------+
- | from: text text text text text text                              |
- | from*: text text text text text text                             |
- | ...                                                              |
- +------------------------------------------------------------------+
- | to: text text text text text text                                |
- | *: text text text text text text                                 |
- | ...                                                              |
- +------------------------------------------------------------------+
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/server.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/server.rkt
deleted file mode 100644
index 0fe94178a8..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/server.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname server) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require 2htdp/universe)
-
-;; UniState = [Listof IWorld]
-;; interp. the currently participating iworlds
-
-;; Message = (list String String)
-;; intep. 
-;; incoming message: (list to-address message)
-;; outgoing message: (list from-address message)
-
-;; Result = (make-bundle UniState [Listof (make-mail IWorld Message)]) 
-;; -----------------------------------------------------------------------------
-(define ALL "*")
-
-;; -----------------------------------------------------------------------------
-;; Universe IWorld -> Bundle
-;; add the name of the new world to the universe
-
-(check-expect (new-chatter '() iworld1) (make-bundle (list iworld1) '() '()))
-
-(define (new-chatter u w)
-  (make-bundle (cons w u) '() '()))
-
-;; -----------------------------------------------------------------------------
-;; Universe IWorld Message -> Result
-;; process the message and forward it to the appropriate addressees 
-
-(define u0 (list iworld1 iworld2 iworld3))
-(define name1 (iworld-name iworld1))
-(define name2 (iworld-name iworld2))
-(define name3 (iworld-name iworld3))
-
-(check-expect
- (forward u0 iworld1 (list name2 "hello"))
- (make-bundle u0 (list (make-mail iworld2 (list name1 "hello"))) '()))
-
-(check-expect 
- (forward u0 iworld1 (list "*" "hello"))
- (make-bundle u0 
-              (list
-               (make-mail iworld2 (list (string-append name1 "*") "hello"))
-               (make-mail iworld3 (list (string-append name1 "*") "hello")))
-              '()))
-
-(define (forward u s msg) 
-  (local ((define to (first msg)))
-    (make-bundle u (transform u (iworld-name s) to (second msg)) '())))
-
-;; Universe String Message -> [Listof Message]
-;; transform an incoming message into a list of outgoing ones
-
-(check-expect (transform u0 name1 name2 "hello")
-              (list (make-mail iworld2 (list name1 "hello"))))
-
-(check-expect (transform u0 name1 "bob" "hello") '())
-
-(check-expect (transform u0 name1 "*" "hello")
-              (list
-               (make-mail iworld2 (list (string-append name1 "*") "hello"))
-               (make-mail iworld3 (list (string-append name1 "*") "hello"))))
-
-(define (transform univ from to msg)
-  (if (string=? ALL to)
-      (local ((define true-msg  (list (string-append from "*") msg)))
-        (map (lambda (to-world) (make-mail to-world true-msg)) 
-             (filter (lambda (to-world) 
-                       (not (string=? (iworld-name to-world) from)))
-                     univ)))
-      (local ((define true-to (lookup to univ)))
-        (if (boolean? true-to)
-            '()
-            (list (make-mail true-to (list from msg)))))))
-
-;; String Universe -> IWorld or false 
-;; pick the iworld whose name is n
-
-(check-expect (lookup name1 u0) iworld1)
-(check-expect (lookup name2 u0) iworld2)
-(check-expect (lookup name3 u0) iworld3)
-(check-expect (lookup "*" u0) false)
-
-(define (lookup name univ)
-  (cond
-    [(empty? univ) false]
-    [else (if (string=? (iworld-name (first univ)) name)
-              (first univ)
-              (lookup name (rest univ)))]))
-
-;; Any -> Universe
-;; run the chat server 
-(define (run debug)
-  (universe '()
-            (state debug)
-            (on-new new-chatter)
-            (on-msg forward)))
-
-(run #true)
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/xrun b/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/xrun
deleted file mode 100755
index 833373fb5e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/xrun
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gracket server.rkt &
-gracket chatter.rkt -e"(run* 'go)" &
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/universe-request.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/universe-request.txt
deleted file mode 100644
index 23f508eacd..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/universe-request.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Robby Findler <robby@eecs.northwestern.edu>
-Date: June 16, 2009 5:16:50 PM EDT
-To: Matthias Felleisen <matthias@ccs.neu.edu>
-Subject: Fwd: Universe key handler request
-
-I was cleaning out my inbox and found this. Probably too late, but I
-thought I'd still pass it on in case you'd forgotten. 
-
-Robby
-
-Forwarded conversation
-Subject: Universe key handler request
-------------------------
-
-From: Robby Findler <robby@eecs.northwestern.edu>
-Date: Tue, Feb 24, 2009 at 9:22 AM
-To: matthias@ccs.neu.edu
-
-
-Can you make the key handlers in universe take 3 arguments instead of
-2? That is, it takes a world, a key-event and a boolean where the key
-event does not include 'release and the Boolean indicates if the key
-was pressed down or not.
-
-Robby
-
-----------
-From: Matthias Felleisen <matthias@ccs.neu.edu>
-Date: Tue, Feb 24, 2009 at 9:24 AM
-To: Robby Findler <robby@eecs.northwestern.edu>
-
-
-
-I guess. Why is this useful?
-
-
-----------
-From: Matthias Felleisen <matthias@ccs.neu.edu>
-Date: Tue, Feb 24, 2009 at 9:25 AM
-To: Robby Findler <robby@eecs.northwestern.edu>
-
-
-
-P.S. and how would you signal the release of a key?
-
-
-----------
-From: Robby Findler <robby@eecs.northwestern.edu>
-Date: Tue, Feb 24, 2009 at 9:29 AM
-To: Matthias Felleisen <matthias@ccs.neu.edu>
-
-
-the Boolean!
-
-It is useful for multiple key presses that overlap but it is also
-useful that it matches what you think when you look at a keyboard.
-
-Robby
-
-
-----------
-From: Matthias Felleisen <matthias@ccs.neu.edu>
-Date: Tue, Feb 24, 2009 at 10:19 AM
-To: Robby Findler <robby@eecs.northwestern.edu>
-
-
-
-
-Wait. Say I press a key
-
-�*------------------------------||-------------------------------------*
-�key-press � �holding it down �the event handler is called with #t � more key presses, no release?
-
-when does the program find out that I have released the key?
-
-
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/universe-syntax-parse.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/universe-syntax-parse.rkt
deleted file mode 100644
index 9aebcce082..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/universe-syntax-parse.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang scheme/load
-
-(module auxs scheme 
-  (define (world->world> proc0)
-    (printf "a world to world function\n")
-    proc0)
-  
-  (define (positive-number> rate0)
-    (printf "a positive number")
-    rate0)
-  
-  ;; Syntax String String Syntax[id] -> Syntax 
-  (define (pre-post-name stx pre post name)
-    (datum->syntax 
-     name (string->symbol (string-append pre (symbol->string (syntax-e name)) post))))
-  
-  (provide (all-defined-out))
-  
-  (define-syntax-rule 
-    (define-kwd name) 
-    (begin
-      (provide name)
-      (define-syntax (name . x) 
-        (raise-syntax-error 'name "used out of context" x))))
-  
-  (define-kwd on-tick)  
-  
-  (define-kwd on-mouse))
-
-(module clauses scheme
-  
-  (require syntax/parse 'auxs
-           (for-syntax scheme 'auxs unstable/syntax)
-           (for-template scheme/base 'auxs))
-  
-  (provide define-clause)
-  
-  (define-syntax (define-clause stx)
-    (syntax-case stx ()
-      [(_ name (proc p-ctc) (rate r-ctc) ...)
-       (with-syntax ([name-clause (pre-post-name stx "" "-clause" #'name)]
-                     [(rate0 ...) (generate-temporaries #'(rate ...))])
-         (with-syntax ([((thing ...) ...) #'((#:with rate #'(r-ctc rate0)) ...)])
-           #`
-           (begin
-             (provide name name-clause)
-             
-             (define-syntax-class name-clause
-               #:description (format "~a" 'name)
-               #:literals (name)
-               #:attributes (proc rate ...)
-               (pattern (name proc0:expr)
-                        #:with (rate0 ...) (map (lambda (x) #'0) '(rate0 ...))
-                        #:with proc #'(world->world proc0)
-                        thing ... ...)
-               (pattern (name proc0:expr (~var rate0 expr) ...)
-                        #:with proc #'(world->world> proc0)
-                        thing ... ...))
-             )))]))
-  
-  (define-clause on-mouse (proc world-nat-nat-mouse->world))
-  (define-clause on-tick (proc world->world))
-  )
-(module utest scheme
-  (require 'clauses (for-syntax 'clauses syntax/parse) (for-template 'clauses))
-
-  (define-syntax (big-bang stx)
-    (syntax-parse stx
-      [(big-bang world0:expr 
-                 (~or (~optional otk:on-tick-clause)
-                      (~optional omc:on-mouse-clause))
-                 ...)
-       #`(printf "~s\n"
-                 '(bb world0
-                      #,(if (attribute omc) "mouse" "no mouse")
-                      #,(if (attribute otk) "tick" "no tick")))]))
-
-  (big-bang 0)
-  (big-bang 1 (on-tick +) (on-mouse -))
-  (big-bang 2 (on-tick +))
-  (big-bang 3 (on-mouse +))
-  )
-
-(require 'utest)
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/universe.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/universe.rkt
deleted file mode 100644
index 8d2fc50754..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/universe.rkt
+++ /dev/null
@@ -1,437 +0,0 @@
-#lang racket/gui
-
-;; ---------------------------------------------------------------------------------------------------
-;; the universe library provides the functionality to create interactive and distributed FPs in HtDP
-
-;; DONT USE ___to-draw___ IN THIS FILE 
-
-#| TODO: 
-   -- run callbacks in user eventspace
-   -- make timer fire just once; restart after on-tick callback finishes
-          [on-tick tick-handler tick-producer tick-limit]
-          tick-producer: World -> PositiveNumber 
-          allow the time span to be a function of the world state 
-   -- take out counting; replace by 0.25 delay
-
-   -- make window resizable :: why
-|#
-
-(require (for-syntax "private/clauses-spec-and-process.rkt"
-                     stepper/private/syntax-property)
-         "private/define-keywords.rkt"
-         "private/clauses-spec-aux.rkt" 
-         ;; ---
-         "private/world.rkt"
-         "private/universe.rkt"
-         "private/universe-image.rkt"
-         ;; 
-         (only-in "private/launch-many-worlds.rkt" launch-many-worlds launch-many-worlds/proc)
-         (only-in "private/stop.rkt" make-stop-the-world)
-         (only-in "private/check-aux.rkt" sexp? SQPORT)
-         (only-in "private/pad.rkt" pad-event? pad=?)
-         htdp/error
-         (rename-in lang/prim (first-order->higher-order f2h)))
-
-(define-primitive stop-with make-stop-the-world)
-
-(provide stop-with) ;; World -> STOP
-
-(provide
- ;; (launch-many-worlds e1 ... e2)
- ;; run expressions e1 through e2 in parallel, produce all values in same order
- launch-many-worlds
- ;; launch-many-worlds/proc : (-> Any) *-> [Listof Any]
- launch-many-worlds/proc
- )
-
-(provide-primitive
- sexp?  ;; Any -> Boolean 
- )
-
-(define new-world (create-world world0))
-(define new-universe (create-universe universe0))
-
-(define-keywords AllSpec '() define-all
-  ;; -- on-tick must specify a tick handler: World -> World 
-  ;; it may specify a clock-tick rate
-  [on-tick DEFAULT #'#f
-           (function-with-arity
-            1
-            #:except
-            [(_ f rate)
-             #'(list
-                (proc> 'on-tick (f2h f) 1)
-                (num> 'on-tick rate (lambda (x) (and (real? x) (positive? x)))
-                      "positive number" "rate"))]
-            [(_ f rate limit)
-             #'(list
-                (proc> 'on-tick (f2h f) 1)
-                (num> 'on-tick rate (lambda (x) (and (real? x) (positive? x)))
-                      "positive number" "rate")
-                (num> 'on-tick limit (lambda (x) (and (integer? x) (positive? x)))
-                      "positive integer" "limit"))])]
-  ;; -- state specifies whether to display the current state 
-  [state DEFAULT #'#f (expr-with-check any> "expected a boolean or a string")]
-  ;; Any -> Boolean 
-  ;; -- check-with: all states should specify this predicate 
-  [check-with DEFAULT #'True (function-with-arity 1)]
-  ;; Natural
-  ;; -- port: specify the port to use
-  [port DEFAULT #'SQPORT (expr-with-check port> "expected a port number")])
-
-;  (create-world world0)
-(define-keywords WldSpec AllSpec create-world
-  ;; (U #f (World -> Scene) (list (World -> Scene) Nat Nat))
-  ;; on-draw must specify a rendering function; 
-  ;;   it may specify dimensions
-  [on-draw to-draw DEFAULT #'#f
-           (function-with-arity
-            1
-            #:except
-            [(_ f width height)
-             #'(list (proc> 'to-draw (f2h f) 1)
-                     (nat> 'to-draw width "width")
-                     (nat> 'to-draw height "height"))])]
-  ;; World Nat Nat MouseEvent -> World 
-  ;; on-mouse must specify a mouse event handler 
-  [on-mouse DEFAULT #f (function-with-arity 4)]
-  ;; (U #f (World KeyEvent -> World))
-  ;; on-key must specify a key event handler 
-  [on-key DEFAULT #f (function-with-arity 2)]
-  ;; (U #f (World PadEvent -> World))
-  ;; on-pad must specify a pad event handler 
-  [on-pad DEFAULT #f (function-with-arity 2)]
-  ;; (U #f (World KeyEvent -> World))
-  ;; on-release must specify a release event handler 
-  [on-release DEFAULT #f (function-with-arity 2)]
-  ;; (World S-expression -> World)
-  ;; -- on-receive must specify a receive handler 
-  [on-receive DEFAULT #'(lambda (w m) w) (function-with-arity 2)]
-  ;; World -> Boolean 
-  ;; -- stop-when must specify a predicate; it may specify a rendering function
-  [stop-when DEFAULT #'False
-             (function-with-arity
-              1
-              #:except
-              [(_ stop? last-picture)
-               #'(list (proc> 'stop-when (f2h stop?) 1)
-                       (proc> 'stop-when (f2h last-picture) 1 #:place "second"))])]
-  ;; (U #f Any)
-  ;; -- should the session be recorded and turned into PNGs and an animated GIF
-  ;; -- if the value is a string and is the name of a local directory, use it! 
-  [record? DEFAULT #'#f (expr-with-check any> "")]
-  ;; (U #f String)
-  ;; -- name specifies one string 
-  [name DEFAULT #'#f (expr-with-check string-or-symbol> "expected a string")]
-  ;; (U #f IP)  
-  ;; -- register must specify the internet address of a host (e.g., LOCALHOST)
-  [register DEFAULT #'#f (expr-with-check ip> "expected a host (ip address)")])
-
-;  (create-universe universe0)
-(define-keywords UniSpec AllSpec create-universe
-  ;; -- on-new must specify what happens when a world joins the universe
-  [on-new 
-   DEFAULT #'"my-bad"
-   (function-with-arity 2)]
-  ;; -- on-msg must specify what happens to a message from a world 
-  [on-msg
-   DEFAULT #'"my-bad"
-   (function-with-arity 3)]
-  ;; -- on-disconnect may specify what happens when a world drops out
-  [on-disconnect
-   ;; ******************************************************************
-   DEFAULT #'(lambda (u w) (make-bundle u '() '()))
-   ;; this is the wrong default function 
-   ;; instead of K there should be a function that produces a bundle 
-   (function-with-arity 2)
-   ;; ******************************************************************
-   ]
-  ;; -- to-string specifies how to render the universe as a string for display
-  [to-string
-   DEFAULT #'#f
-   (function-with-arity 1)])
-
-
-;                                     
-;                                     
-;                                     
-;   ;   ;                  ;        ; 
-;   ;   ;                  ;        ; 
-;   ;   ;                  ;        ; 
-;   ;   ;   ;;;   ; ;;     ;     ;;;; 
-;   ;   ;  ;   ;  ;;  ;    ;    ;   ; 
-;   ; ; ;  ;   ;  ;   ;    ;    ;   ; 
-;   ;; ;;  ;   ;  ;        ;    ;   ; 
-;   ;   ;  ;   ;  ;        ;    ;   ; 
-;   ;   ;   ;;;   ;        ;;    ;;;; 
-;                                     
-;                                     
-;                                     
-
-(provide 
- big-bang     ;; <syntax> : see below 
- pad-handler  ;; <syntax> : see below 
- )
-
-(provide-primitives
- make-package  ;; World Sexp -> Package
- package?      ;; Any -> Boolean 
- run-movie     ;; [r Positive] [m [Listof Image]] -> true
- ;; run movie m at rate r images per second 
- mouse-event?  ;; Any -> Boolean : MOUSE-EVTS
- mouse=?       ;; MOUSE-EVTS MOUSE-EVTS -> Boolean 
- key-event?    ;; Any -> Boolean : KEY-EVTS
- key=?         ;; KEY-EVTS KEY-EVTS -> Boolean
- pad-event?    ;; KeyEvent -> Boolean
- ;; is the given key-event also a pad-event? 
- pad=?         ;; PadEvent PadEvent -> Boolean 
- ;; ---
- ;; IP : a string that points to a machine on the net 
- )
-
-(provide LOCALHOST     ;; IP
-         )
-
-(provide-higher-order-primitive
- run-simulation (create-scene) ; (Nat -> Scene) -> Nat
- )
-
-(provide-higher-order-primitive
- animate (create-scene) ; (Nat -> Scene) -> Nat
- )
-
-(define MOUSE-EVTS 
-  '("button-down" 
-    "button-up"
-    "drag"
-    "move"
-    "enter"
-    "leave"))
-
-(define KEY-EVTS 
-  '("left"
-    "right"
-    "up"
-    "down"
-    "start"
-    "cancel"
-    "clear"
-    "shift"
-    "rshift"
-    "control"
-    "rcontrol"
-    "menu"
-    "pause"
-    "capital"
-    "prior"
-    "next"
-    "end"
-    "home"
-    "escape"
-    "select"
-    "print"
-    "execute"
-    "snapshot"
-    "insert"
-    "help"
-    "numpad0" "numpad1" "numpad2" "numpad3" "numpad4" 
-    "numpad5" "numpad6" "numpad7" "numpad8" "numpad9" 
-    "numpad-enter" "multiply" "add" "separator" "subtract" "decimal" "divide"
-    "f1" "f2" "f3" "f4" "f5" "f6" "f7" "f8" "f9" "f10" "f11" "f12" "f13" 
-    "f14" "f15" "f16" "f17" "f18" "f19" "f20" "f21" "f22" "f23" "f24"
-    "numlock"
-    "scroll"
-    "wheel-up"
-    "wheel-down"
-    "wheel-left"
-    "wheel-right"
-    ))
-
-(define-syntax (big-bang stx)
-  (define world0 "expects an expression for the initial world and at least one clause")
-  (syntax-case stx ()
-    [(big-bang) (raise-syntax-error #f world0 stx)]
-    [(big-bang w clause ...)
-     (let* ([rec? #'#f]
-            [->rec? 
-             (lambda (kw E)
-               (when (free-identifier=? kw #'record?)
-                 (syntax-case E ()
-                   [(V) (set! rec? #'V)]
-                   [_ (err '#'record? stx)])))]
-            [args 
-             (->args 'big-bang stx #'w #'(clause ...) WldSpec ->rec?)]
-            [dom (syntax->list #'(clause ...))])
-       (cond
-         [(and (not (contains-clause? #'to-draw dom)) (not (contains-clause? #'on-draw dom)))
-          (raise-syntax-error #f "missing [to-draw renderer] or [on-draw renderer] clause" stx)]
-         [else
-	   (syntax-property 
-	     (stepper-syntax-property
-	       #`(run-it ((new-world (if #,rec? aworld% world%)) w #,@args))
-	       'stepper-skip-completely #t)
-	     'disappeared-use (map (lambda (x) (car (syntax->list x))) dom))]))]))
-
-(define-keywords Pad1Specs '() _init-not-needed
-  [up    DEFAULT #'#f (function-with-arity 1)]
-  [down  DEFAULT #'#f (function-with-arity 1)]
-  [left  DEFAULT #'#f (function-with-arity 1)]
-  [right DEFAULT #'#f (function-with-arity 1)]
-  [space DEFAULT #'#f (function-with-arity 1)]
-  [shift DEFAULT #'#f (function-with-arity 1)])
-
-(define-syntax (pad-handler stx)
-  (syntax-case stx ()
-    [(pad1 clause ...)
-     (let* ([args (->args 'pad-one-player stx #'w #'(clause ...) Pad1Specs void)]
-            ; [_ (displayln args)]
-            [keys (map (lambda (x) 
-                         (syntax-case x () 
-                           [(proc> (quote s) _f _d) (symbol->string (syntax-e #'s))]
-                           [else "not present"]))
-                       (filter values args))]
-            [doms (map (lambda (x) (car (syntax->list x))) (syntax->list #'(clause ...)))])
-       (syntax-property 
-        (stepper-syntax-property
-         #`(produce-handler '#,keys (list #,@args))
-         'stepper-skip-completely #t)
-        'disappeared-use doms))]))
-
-(define (produce-handler keys args)
-  (define (check k one other)
-    (or (and (string=? k one) (not (member other keys)))
-        (and (string=? k other) (not (member one keys)))))
-  (define quasi-methods
-    (for/fold ((m '())) ((k keys) (a args))
-      (cond
-        [(check k "w"     "up") (list* (cons "w" a) (cons "up" a) m)]
-        [(check k "s"     "down") (list* (cons "s" a) (cons "down" a) m)]
-        [(check k "a"     "left") (list* (cons "a" a) (cons "left" a) m)]
-        [(check k "d"     "right") (list* (cons "d" a) (cons "right" a) m)]
-        [(check k "shift" "rshift") (list* (cons "shift" a) (cons "rshift" a) m)]
-        [else (cons (cons "space" a) m)])))
-  (define quasi-object (make-immutable-hash quasi-methods))
-  (define (the-handler* world key-event)
-    ((hash-ref quasi-object key-event (lambda () values)) world))
-  the-handler*)
-
-(define (run-simulation f)
-  (check-proc 'run-simulation f 1 "first" "one argument")
-  (big-bang 0 (on-draw f) (on-tick add1)))
-
-(define animate run-simulation)
-
-(define (run-movie r m*)
-  (check-arg 'run-movie (positive? r) "positive number" "first" r)
-  (check-arg 'run-movie (list? m*) "list of images" "second" m*)
-  (for-each (lambda (m) (check-image 'run-movie m "first" "list of images")) m*)
-  (let* ([fst (car m*)]
-         [wdt (image-width fst)]
-         [hgt (image-height fst)])
-    (big-bang 
-     m* 
-     (on-tick rest r)
-     (on-draw (lambda (m) (if (empty? m) (text "The End" 22 'red) (first m))))
-     (stop-when empty?))))
-
-(define (mouse-event? a) (and (string? a) (pair? (member a MOUSE-EVTS))))
-
-(define (mouse=? k m)
-  (check-arg 'mouse=? (mouse-event? k) 'MouseEvent "first" k)
-  (check-arg 'mouse=? (mouse-event? m) 'MouseEvent "second" m)
-  (string=? k m))
-
-(define (key-event? k) 
-  (and (string? k) (or (= (string-length k) 1) (pair? (member k KEY-EVTS)))))
-
-(define (key=? k m)
-  (check-arg 'key=? (key-event? k) 'KEY-EVTS "first" k)
-  (check-arg 'key=? (key-event? m) 'KEY-EVTS "second" m)
-  (string=? k m))
-
-(define LOCALHOST "127.0.0.1")
-
-;                                                          
-;                                                          
-;                                                          
-;   ;   ;           ;                                      
-;   ;   ;           ;                                      
-;   ;   ;                                                  
-;   ;   ;  ;;;;     ;    ;   ;   ;;;   ; ;;    ;;;    ;;;  
-;   ;   ;  ;   ;    ;    ;   ;  ;   ;  ;;  ;  ;   ;  ;   ; 
-;   ;   ;  ;   ;    ;     ; ;   ;;;;;  ;   ;   ;;;   ;;;;; 
-;   ;   ;  ;   ;    ;     ; ;   ;      ;          ;  ;     
-;   ;   ;  ;   ;    ;      ;    ;   ;  ;      ;   ;  ;   ; 
-;    ;;;   ;   ;    ;      ;     ;;;   ;       ;;;    ;;;  
-;                                                          
-;                                                          
-;                                                          
-
-(provide-primitives
- ;; type World 
- iworld?    ;; Any -> Boolean 
- iworld=?   ;; World World -> Boolean 
- iworld-name ;; World -> Symbol 
- ;; type Bundle = (make-bundle [Listof World] Universe [Listof Mail]) 
- ;; type Mail = (make-mail World S-expression)
- make-bundle ;; [Listof World] Universe [Listof Mail] -> Bundle 
- bundle?     ;; is this a bundle? 
- make-mail   ;; World S-expression -> Mail 
- mail?       ;; is this a real mail? 
- )
-
-(provide 
- iworld1    ;; sample worlds 
- iworld2
- iworld3
- universe    ;; <syntax> : see below 
- )
-
-(define-syntax (universe stx)
-  (syntax-case stx ()
-    [(universe) (raise-syntax-error #f "expects an expression for the initial world" stx)]
-    [(universe u)
-     (raise-syntax-error #f "expects at least an on-new and an on-msg clause after the initial world"
-                         stx)]
-    [(universe u bind ...)
-     (let* ([args (->args 'universe stx #'u #'(bind ...) UniSpec void)]
-            [dom (syntax->list #'(bind ...))])
-       (cond
-         [(not (contains-clause? #'on-new dom))
-          (raise-syntax-error #f "expects a on-new clause, but found none" stx)]
-         [(not (contains-clause? #'on-msg dom))
-          (raise-syntax-error #f "expects a on-msg clause, but found none" stx)]
-         [else ; (and (memq #'on-new dom) (memq #'on-msg dom))
-          (syntax-property 
-           #`(run-it ((new-universe universe%) u #,@args))
-           'disappeared-use (map (lambda (x) (car (syntax->list x))) dom))]))]))
-
-;                                          
-;                                          
-;                                          
-;      ;               ;;;                 
-;                     ;                    
-;    ;;;    ;; ;;   ;;;;;;  ;; ;;;   ;;;;  
-;      ;     ;;  ;    ;      ;;     ;    ; 
-;      ;     ;   ;    ;      ;       ;;;;; 
-;      ;     ;   ;    ;      ;      ;    ; 
-;      ;     ;   ;    ;      ;      ;   ;; 
-;    ;;;;;  ;;; ;;; ;;;;;;  ;;;;;    ;;; ;;
-;                                          
-;                                          
-;                                          
-;                                          
-
-;; (-> Object) -> Any
-(define (run-it o)
-  (send (o) last))
-
-#;
-(define (run-it o)
-  (define esp (make-eventspace))
-  (define thd (eventspace-handler-thread esp))
-  (with-handlers ((exn:break? (lambda (x) (break-thread thd))))
-    (define obj:ch (make-channel))
-    (parameterize ([current-eventspace esp])
-      (queue-callback (lambda () (channel-put obj:ch (o)))))
-    (send (channel-get obj:ch) last)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/LICENSE.txt b/pkgs/htdp-pkgs/htdp-lib/LICENSE.txt
deleted file mode 100644
index 1f4ce192db..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-htdp-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-posn-less-unit.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-posn-less-unit.rkt
deleted file mode 100644
index 5ce087837d..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-posn-less-unit.rkt
+++ /dev/null
@@ -1,1299 +0,0 @@
-; Simple graphics routines for GRacket
-; Originally written by Johnathan Franklin
-
-(module graphics-posn-less-unit racket/base
-  (require racket/unit
-           mred/mred-sig
-           mred
-           mzlib/etc
-           racket/class
-           "graphics-sig.rkt")
-  (provide graphics-posn-less@)
-
-  (define-syntax define-do-pixel
-    (syntax-rules ()
-      [(_ name do-it v-name make-do-pixel)
-       (define (name viewport)
-	 (let ([f ((make-do-pixel do-it) viewport)])
-	   ;; Give a nicer name to f:
-	   (let ([v-name
-		  (case-lambda
-		   [(posn) (f posn)]
-		   [(posn color) (f posn color)])])
-	     v-name)))]))
-
-  (define-syntax define-string
-    (syntax-rules ()
-      [(_ name what v-name string-functions)
-       (define name
-	 (let ([finish (lambda (f)
-			 ;; Give a nicer name to f:
-			 (let ([v-name
-				(case-lambda
-				 [(posn text) (f posn text)]
-				 [(posn text color) (f posn text color)])])
-			   v-name))])
-	   (case-lambda
-	    [(viewport font)
-	     (finish ((string-functions 'what) viewport font))]
-	    [(viewport) 
-	     (finish ((string-functions 'what) viewport))])))]))
-
-(define-unit graphics-posn-less@
-  (import (prefix mred: mred^)
-          graphics:posn^)
-  (export graphics^)
-  (init-depend mred^)
-  
-  (define send/proc
-    (lambda (class method . args)
-      (send-generic class (make-generic mred:dc<%> method) . args)))
-
-  (define send/proc2
-    (lambda (class method . args)
-      (send-generic class (make-generic sixlib-canvas% method) . args)))
-
-
-  (define-struct viewport (label canvas))
-  (define-struct sixmouse (x y left? middle? right?))
-  (define-struct sixkey (value))
-  (define graphics-flag #f)
-  (define global-viewport-list '())
-  (define global-color-vector (make-vector 300 #f))
-  (define global-pen-vector (make-vector 300 #f))
-  (define global-brush-vector (make-vector 300 #f))
-  (define default-font (make-object mred:font% 12 'roman 'normal 'normal #f 'unsmoothed))
-  (define black-color (make-object mred:color% "BLACK"))
-
-  (define sixlib-canvas%
-    (class mred:canvas% 
-      (super-new)
-      (inherit get-parent
-	       min-client-width min-client-height
-	       stretchable-width stretchable-height)
-      (define current-mouse-posn (make-posn 0 0))
-      (define queue%
-	 (class object%
-	   (define queue '())
-	   (define last #f)
-	   (define lock (make-semaphore 1))
-	   (define ready (make-semaphore))
-	   (public*
-	     [flush
-	      (lambda ()
-		(semaphore-wait lock)
-		(set! queue '())
-		(set! last #f)
-		(set! ready (make-semaphore))
-		(semaphore-post lock))]
-	     [add
-	      (lambda (v)
-		(semaphore-wait lock)
-		(if last
-		    (begin
-		      (set-mcdr! last (mcons v '()))
-		      (set! last (mcdr last)))
-		    (begin
-		      (set! queue (mcons v '()))
-		      (set! last queue)))
-		(semaphore-post ready)
-		(semaphore-post lock))]
-	     [remove
-	      (lambda ()
-		(semaphore-wait lock)
-		(begin0
-		 (if (null? queue)
-		     #f
-		     (begin0
-		      (mcar queue)
-		      (semaphore-wait ready)
-		      (set! queue (mcdr queue))
-		      (when (null? queue)
-		        (set! last #f))))
-		 (semaphore-post lock)))]
-	     [remove/wait
-	      (lambda ()
-		(semaphore-wait ready)
-		(semaphore-post ready)
-		(remove))])
-           (super-make-object)))
-      (define click-queue (make-object queue%))
-      (define release-queue (make-object queue%))
-      (define press-queue (make-object queue%))
-      (private*
-        [reset-size
-	 (lambda ()
-           (min-client-width width)
-           (min-client-height height)
-           (stretchable-width #f)
-           (stretchable-height #f)
-           (set! bitmap (make-object mred:bitmap% width height))
-           (unless (send bitmap ok?)
-             (error "cannot allocate viewport"))
-           (send buffer-dc set-bitmap bitmap)
-           (send buffer-dc set-brush (send dc get-brush))
-           (send buffer-dc set-pen (send dc get-pen))
-           (let ([f (send dc get-font)])
-             (when f
-               (send buffer-dc set-font f)))
-           (send buffer-dc clear)
-           (send dc clear))])
-      
-      ;; were public
-      (define viewport (void))
-      (define height 0)
-      (define width 0)
-      (define label 0)
-      (define current-pen 'uninitialized-pen)
-      (define current-brush 'uninitialized-brush)
-      (define bitmap 'uninitalized-bitmap)
-      (define dc 'uninitialized-dc)
-      (define buffer-dc 'uninitialized-buffer-dc)
-      
-      (public*
-        [get-viewport (lambda () viewport)]
-	[set-viewport (lambda (x) (set! viewport x))]
-	[get-sixlib-height (lambda () height)]
-	[get-sixlib-width (lambda () width)]
-	[get-current-pen (lambda () current-pen)]
-	[get-current-brush (lambda () current-brush)]
-	[get-bitmap (lambda () bitmap)]
-	[get-sixlib-dc (lambda () dc)]
-	[get-buffer-dc (lambda () buffer-dc)]
-	[remember-pen (lambda (pen) (set! current-pen pen))]
-	[remember-brush (lambda (brush) (set! current-brush brush))])
-
-      (override*
-       [on-paint
-	(lambda ()
-	  (let ([bm (send buffer-dc get-bitmap)])
-	    (send dc draw-bitmap bm 0 0)))]
-       
-       [on-event 
-	(lambda (mouse-event)
-          ;; this does deal with mouse events
-          ;; so let's try and put hooks in here
-          ;; after I know that it is a "good" sixm mouseclick
-	  (let* ([x (send mouse-event get-x)]
-		 [y (send mouse-event get-y)]
-		 [left? (send mouse-event button-down? 'left)]
-		 [middle? (send mouse-event button-down? 'middle)]
-		 [right? (send mouse-event button-down? 'right)]
-		 [sixm (make-sixmouse x y left? middle? right?)])
-	    (set! current-mouse-posn (make-posn x y))
-	    (cond
-	      [(send mouse-event button-down?)
-	       (send click-queue add sixm)]
-	      [(send mouse-event button-up?)
-	       (send release-queue add sixm)]
-	      [else (void)])))]
-       
-       [on-char
-	(lambda (key-event)
-          (let ([the-event (make-sixkey (send key-event get-key-code))])
-            ;; --- timing stuff : MF 4/4/2004
-            (if (procedure? on-char-proc)
-                (on-char-proc the-event)                  
-                (send press-queue add the-event))))])
-      
-      ;; --- timing stuff : MF 4/4/2004
-      (define the-world #f)
-      ;; KeyEvent World -> Void
-      (define on-char-proc #f)
-      (define the-time
-        (new timer% [notify-callback (lambda () (timer-callback))]))
-      (define timer-callback
-        (lambda ()
-          (set! the-world 
-            (with-handlers ([exn:break? break-handler]
-                      [exn? exn-handler])
-        (on-tick-proc the-world)))))
-      ;; World -> World 
-      (define on-tick-proc void)
-      (define exn-handler 
-       (lambda (e)
-         (send the-time stop)
-         (set! on-char-proc #f)
-         (raise e)))
-      (define break-handler
-       (lambda _ 
-         (printf "animation stopped")
-         (send the-time stop)
-         (set! on-char-proc #f)
-         the-world))
-      (public*
-        [set-on-char-proc 
-         (lambda (f)
-           (let ([esp (current-eventspace)])
-             (if (procedure? on-char-proc)
-                 (error 'on-event "the event action has been set already")
-                 (set! on-char-proc 
-                       (lambda (e)
-                         (parameterize ([current-eventspace esp])
-                           (queue-callback 
-                            (lambda ()
-                              (set! the-world 
-                                    (with-handlers ([exn:break? break-handler]
-                                                    [exn? exn-handler])
-                                      (f e the-world))))
-                            #t)))))))]
-        [set-on-tick-proc ;; Number [seconds] (World -> World) -> Void
-         (lambda (delta f)
-	   (if (eq? on-tick-proc void)
-	       (set! on-tick-proc f)
-	       (error 'on-tick "the timing action has been set already"))
-	   (send the-time start delta))]
-        [stop-tick 
-         (lambda ()
-	   (send the-time stop)
-	   (set! on-char-proc #f)
-	   the-world)]
-        [init-world (lambda (w) (set! the-world w))])
-      ;; --- end timing stuff
-      
-      (public*
-	[get-click
-	 (lambda ()
-	   (send click-queue remove))]
-	[get-click-now
-	 (lambda ()
-	   (send click-queue remove/wait))]
-	
-	[get-release
-	 (lambda ()
-	   (send release-queue remove))]
-	[get-release-noew
-	 (lambda ()
-	   (send release-queue remove/wait))]
-	
-	[get-press
-	 (lambda ()
-	   (send press-queue remove))]
-	[get-press-now
-	 (lambda ()
-	   (send press-queue remove/wait))]
-	
-	[get-posn (lambda () current-mouse-posn)]
-	[set-dc (lambda (new-dc) (set! dc new-dc))]
-	[set-buffer-dc (lambda (new-buffer-dc) (set! buffer-dc
-						     new-buffer-dc))]
-	
-	[set-geometry
-	 (lambda (new-width new-height)
-	   (set! height new-height)
-	   (set! width new-width)
-	   (reset-size))]
-	[set-height (lambda (new-height) 
-		      (set! height new-height)
-		      (reset-size))]
-	[set-width (lambda (new-width) 
-		     (set! width new-width)
-		     (reset-size))]
-	
-	
-	[viewport-flush-input
-	 (lambda ()
-	   (send click-queue flush)
-	   (send release-queue flush)
-	   (send press-queue flush))])))
-  
-  (define open-frames-timer (make-object mred:timer%))
-  
-  ;; --- timing events --- MF
-  [define the-time---old
-    (new timer% [notify-callback (lambda () (timer-callback---old))])]
-  [define timer-callback---old void]
-  ;; --- end timing --- 
-
-  (define sixlib-frame%
-    (class mred:frame%
-      (field [canvas #f])
-      (define/public (set-canvas x) (set! canvas x))
-      (define/augment (on-close)        
-	(close-viewport (send canvas get-viewport))
-        (send canvas stop-tick)
-	(inner (void) on-close))
-      (super-instantiate ()
-			 [stretchable-height #f]
-			 [stretchable-width #f]
-			 [style '(no-resize-border)])))
-  
-  (define repaint
-    (lambda (viewport)
-      (send (viewport-canvas viewport) on-paint)))
-  
-  (define viewport-dc 
-    (lambda (viewport)
-      (send (viewport-canvas viewport) get-sixlib-dc)))
-  
-  (define viewport-buffer-dc
-    (lambda (viewport)
-      (send (viewport-canvas viewport) get-buffer-dc)))
-
-  (define viewport-bitmap
-    (lambda (viewport)
-      (send (viewport-canvas viewport) get-bitmap)))
-  
-  (define viewport-frame
-    (lambda (viewport)
-      (send (send (viewport-canvas viewport) get-parent) get-parent)))
-  
-  (define viewport-height
-    (lambda (viewport)
-      (send (viewport-canvas viewport) get-sixlib-height)))
-  
-  (define viewport-width
-    (lambda (viewport)
-      (send (viewport-canvas viewport) get-sixlib-width)))
-  
-  (define (get-mouse-click viewport)
-    (send (viewport-canvas viewport) get-click-now))
-  
-  (define (init-world viewport)
-    (lambda (w)
-      (send (viewport-canvas viewport) init-world w)))
-  
-  (define (set-on-key-event viewport)
-    (lambda (f)
-      (send (viewport-canvas viewport) set-on-char-proc f)))
-  
-  (define (set-on-tick-event viewport)
-    (lambda (delta f)
-      (send (viewport-canvas viewport) set-on-tick-proc delta f)))
-  
-  (define (stop-tick viewport)
-    (lambda ()
-      (send (viewport-canvas viewport) stop-tick)))
-
-  (define (get-key-press viewport) 
-    (send (viewport-canvas viewport) get-press-now))
-  
-  (define (ready-mouse-click viewport)
-    (send (viewport-canvas viewport) get-click))
-  
-  (define (ready-mouse-release viewport)
-    (send (viewport-canvas viewport) get-release))
-  
-  (define (ready-key-press viewport)
-    (send (viewport-canvas viewport) get-press))
-  
-  (define mouse-click-posn
-    (lambda (mouse-event)
-      (make-posn (sixmouse-x mouse-event) (sixmouse-y mouse-event))))
-  
-  (define query-mouse-posn
-    (lambda (viewport) (send (viewport-canvas viewport) get-posn)))
-  
-  (define viewport-flush-input
-    (lambda (viewport) (send (viewport-canvas viewport) viewport-flush-input)))
-  
-  (define left-mouse-click?
-    (lambda (mouse-event) (sixmouse-left? mouse-event)))
-  
-  (define middle-mouse-click?
-    (lambda (mouse-event) (sixmouse-middle? mouse-event)))
-  
-  (define right-mouse-click?
-    (lambda (mouse-event) (sixmouse-right? mouse-event)))
-  
-  (define key-value sixkey-value)
-  
-  (define clear-viewport
-    (lambda (viewport)
-      (let* ([vdc (viewport-dc viewport)]
-	     [vbdc (viewport-buffer-dc viewport)])
-	(lambda ()
-	  (send vdc clear)
-	  (send vbdc clear)))))
-
-  (define draw-viewport
-    (lambda (viewport)
-      (let* ([dc (viewport-dc viewport)]
-	     [buffer-dc (viewport-buffer-dc viewport)]
-	     [w (viewport-width viewport)]
-	     [h (viewport-height viewport)])
-	(rec draw-viewport/color
-	     (case-lambda
-	      [(color)
-	       (let ([new-pen (send mred:the-pen-list find-or-create-pen color 1 'solid)]
-		     [new-brush (send mred:the-brush-list find-or-create-brush color 'solid)]
-		     [old-pen (send dc get-pen)]
-		     [old-brush (send dc get-brush)])
-		 (send dc set-pen new-pen)
-		 (send dc set-brush new-brush)
-		 (send buffer-dc set-pen new-pen)
-		 (send buffer-dc set-brush new-brush)
-		 (send dc draw-rectangle 0 0 w h)
-		 (send buffer-dc draw-rectangle 0 0 w h)
-		 (send dc set-pen old-pen)
-		 (send buffer-dc set-pen old-pen)
-		 (send dc set-brush old-brush)
-		 (send buffer-dc set-brush old-brush))]
-	      [() (draw-viewport/color (make-rgb 0 0 0))])))))
-  
-  (define flip-viewport
-    (lambda (viewport)
-      (let* ([dc (viewport-dc viewport)]
-	     [dc2 (viewport-buffer-dc viewport)]
-	     [w (viewport-width viewport)]
-	     [h (viewport-height viewport)])
-	(lambda ()
-	  (let ([pen (send dc get-pen)]
-		[pen2 (send dc2 get-pen)]
-		[brush (send dc get-brush)]
-		[brush2 (send dc2 get-brush)])
-	    (send dc set-pen xor-pen)
-	    (send dc2 set-pen xor-pen)
-	    (send dc set-brush xor-brush)
-	    (send dc2 set-brush xor-brush)
-	    (send dc draw-rectangle 0 0 w h)
-	    (send dc2 draw-rectangle 0 0 w h)
-	    (send dc set-pen pen)
-	    (send dc2 set-pen pen2)
-	    (send dc set-brush brush)
-	    (send dc2 set-brush brush2))))))
-  
-  (define close-viewport
-    (lambda (viewport)
-      (set! global-viewport-list 
-	    (let loop ([l global-viewport-list])
-	      (cond
-		[(null? l) '()]
-		[(eq? (car l) viewport) (cdr l)]
-		[else (cons (car l) (loop (cdr l)))])))
-      (send (viewport-frame viewport) show #f)
-      (send (viewport-canvas viewport) show #f)
-      (when (null? global-viewport-list)
-	(send open-frames-timer stop))))
-  
-  (define open-graphics 
-    (lambda () 
-      (set! graphics-flag #t)))
-  
-  (define close-graphics 
-    (lambda ()
-      (map close-viewport global-viewport-list)
-      (set! graphics-flag #f)
-      (set! global-viewport-list '())
-      (send open-frames-timer stop)))
-  
-  (define graphics-open? (lambda () graphics-flag))
-  
-  (define make-rgb
-    (lambda (red green blue)
-      (when (or (< red 0.) (< blue 0.) (< green 0.)
-		(> red 1.) (> blue 1.) (> green 1.))
-	(error 'make-rgb
-	       "all color indices should be in [0.0, 1.0]; provided ~s"
-	       (list red green blue)))
-      (let* ([convert (lambda (num) (inexact->exact (round (* 255 num))))]
-	     [nred (convert red)]
-	     [ngreen (convert green)]
-	     [nblue (convert blue)])
-	(make-object mred:color% nred ngreen nblue))))
-  
-  (define make-color make-rgb)
-  
-  (define (rgb-red rgb) (/ (send rgb red) 255))
-  (define (rgb-blue rgb) (/ (send rgb blue) 255))
-  (define (rgb-green rgb) (/ (send rgb green) 255))
-  
-  (define rgb? (lambda (object) (is-a? object mred:color%)))
-  (define (color? x)
-    (or (rgb? x)
-	(not (not (send mred:the-color-database find-color x)))))
-  
-  (define change-color
-    (lambda (index color)
-      (vector-set! global-color-vector index color)
-      (vector-set! global-pen-vector index (get-pen color))
-      (vector-set! global-brush-vector index (get-brush color))))
-  
-  (define (get-color index)
-    (cond
-      [(is-a? index mred:color%) index]
-      [(string? index) (make-object mred:color% index)]
-      [else (vector-ref global-color-vector index)]))
-  
-  (define get-pen
-    (lambda (index)
-      (cond
-	[(is-a? index mred:pen%) index]
-	[(or (string? index) (is-a? index mred:color%))
-	 (send mred:the-pen-list find-or-create-pen index 1 'solid)]
-	[else (vector-ref global-pen-vector index)])))
-  
-  (define get-brush
-    (lambda (index)
-      (cond
-	[(is-a? index mred:brush%) index]
-	[(or (string? index) (is-a? index mred:color%))
-	 (send mred:the-brush-list find-or-create-brush index 'solid)]
-	[else (vector-ref global-brush-vector index)])))
-  
-  (define pen? (lambda (object) (is-a? object mred:pen%)))
-  (define brush? (lambda (object) (is-a? object mred:brush%)))
-  
-  (define display-color-vector
-    (lambda ()
-      (do
-	  ([index 0 (+ index 1)])
-	((eq? index 100))
-	(display (list (/ (rgb-red (get-color index)) 255)
-                       (/ (rgb-green (get-color index)) 255)
-                       (/ (rgb-blue (get-color index)) 255))))))
-  
-  (define make-font
-    (lambda (name)
-      (cond
-	[(eq? name 'large-deco)
-	 (make-object mred:font% 40 'decorative 'normal 'normal)]
-	[(eq? name 'small-roman)
-	 (make-object mred:font% 12 'roman 'normal 'normal)]
-	[(eq? name 'medium-roman)
-	 (make-object mred:font% 24 'roman 'normal 'normal)]
-	[(eq? name 'large-roman)
-	 (make-object mred:font% 32 'roman 'normal 'normal)]
-	[else "no such font ~a; only 'large-deco, 'small-roman, 'medium-roman, and 'large-roman"
-	      name])))
-  
-  (define custom-roman
-    (lambda (size)
-      (make-object mred:font%
-		   size 'roman 'normal 'normal)))
-  
-  (define custom-deco
-    (lambda (size)
-      (make-object mred:font% size 'decorative 'normal 'normal)))
-  
-  (define set-viewport-pen
-    (lambda (viewport pen)
-      (send (viewport-canvas viewport) remember-pen pen)
-      (let ([pen (get-pen pen)])
-	(send (viewport-dc viewport) set-pen pen)
-	(send (viewport-buffer-dc viewport) set-pen pen))))
-  
-  (define set-viewport-brush
-    (lambda (viewport brush)
-      (send (viewport-canvas viewport) remember-brush brush)
-      (let ([brush (get-brush brush)])
-	(send (viewport-dc viewport) set-brush brush)
-	(send (viewport-buffer-dc viewport) set-brush brush))))
-  
-  (define set-text-foreground
-    (lambda (viewport color)
-      (let ([color (get-color color)])
-	(send (viewport-dc viewport) set-text-foreground color)
-	(send (viewport-buffer-dc viewport) set-text-foreground color))))
-  
-  (define set-text-background
-    (lambda (viewport color)
-      (let ([color (get-color color)])
-	(send (viewport-dc viewport) set-text-background color)
-	(send (viewport-buffer-dc viewport) set-text-background color))))
-  
-  (define set-viewport-font
-    (lambda (viewport font)
-      (send (viewport-dc viewport) set-font font)
-      (send (viewport-buffer-dc viewport) set-font font)))
-  
-  (define set-viewport-background
-    (lambda (viewport color)
-      (send (viewport-dc viewport) set-background color)
-      (send (viewport-buffer-dc viewport) set-background color)))
-  
-  (define set-viewport-logical-function
-    (lambda (viewport logical-function)
-      (send (viewport-dc viewport) set-logical-function logical-function)
-      (send (viewport-buffer-dc viewport) set-logical-function
-	    logical-function)))
-
-  (define white (make-rgb 1 1 1))
-  (define black (make-rgb 0 0 0))
-  (define red (make-rgb 1 0 0))
-  (define green (make-rgb 0 1 0))
-  (define blue (make-rgb 0 0 1))
-  (define white-pen (get-pen white))
-  (define black-pen (get-pen black))
-  (define red-pen (get-pen red))
-  (define blue-pen (get-pen blue))
-  (define green-pen (get-pen green))
-  (define white-brush (get-brush white))
-  (define black-brush (get-brush black))
-  (define red-brush (get-brush red))
-  (define green-brush (get-brush green))
-  (define blue-brush (get-brush blue))
-  
-  (define invisi-pen (send mred:the-pen-list find-or-create-pen "WHITE" 0 'transparent))
-  (define invisi-brush (send mred:the-brush-list find-or-create-brush "WHITE" 'transparent))
-  
-  (define xor-pen (send mred:the-pen-list find-or-create-pen "BLACK" 1 'xor))
-  (define xor-brush (send mred:the-brush-list find-or-create-brush "BLACK" 'xor))
-  
-  (define draw-it (lambda (draw flip clear) (draw)))
-  (define flip-it (lambda (draw flip clear) (flip)))
-  (define clear-it (lambda (draw flip clear) (clear)))
-  
-  (define make-draw-proc
-    (lambda (get-pen-name set-pen-name 
-	     get-current-pen-name set-viewport-pen white-pen)
-      (lambda (viewport) 
-	(let* ([vdc (viewport-dc viewport)]
-	       [vbdc (viewport-buffer-dc viewport)])
-	  (lambda (color go)
-	    (let ([orig (and color
-			     (begin0
-			      (send/proc2 (viewport-canvas viewport) 
-					  get-current-pen-name)
-			      (set-viewport-pen viewport (get-color color))))])
-	      (go (lambda (draw)
-		    (let ([pen (send vdc get-pen)]
-			  [brush (send vdc get-brush)])
-		      (send vdc set-brush xor-brush)
-		      (send vbdc set-brush xor-brush)
-		      (send vdc set-pen xor-pen)
-		      (send vbdc set-pen xor-pen)
-		      (draw)
-		      (send vdc set-brush brush)
-		      (send vbdc set-brush brush)
-		      (send vdc set-pen pen)
-		      (send vbdc set-pen pen)))
-		  (lambda (draw)
-		    (let ([pen (send/proc vdc get-pen-name)])
-		      (send/proc vdc set-pen-name white-pen)
-		      (send/proc vbdc set-pen-name white-pen)
-		      (draw)
-		      (send/proc vdc set-pen-name pen)
-		      (send/proc vbdc set-pen-name pen))))
-	      (when orig
-	        (set-viewport-pen viewport orig))))))))
-  
-  (define make-do-line
-    (lambda (go)
-      (let ([f (make-draw-proc 'get-pen 'set-pen 
-			       'get-current-pen set-viewport-pen white-pen)])
-	(lambda (viewport)
-	  (let ([f (f viewport)])
-	    (letrec ([the-function
-		      (case-lambda
-		       [(posn1 posn2) (the-function posn1 posn2 #f)]
-		       [(posn1 posn2 color)
-			(f color
-			   (lambda (flip clear)
-			     (let* ([x1 (posn-x posn1)]
-				    [y1 (posn-y posn1)]
-				    [x2 (posn-x posn2)]
-				    [y2 (posn-y posn2)]
-				    [draw (lambda ()
-					    (send (viewport-dc viewport) 
-						  draw-line 
-						  x1 y1 x2 y2)
-					    (send (viewport-buffer-dc viewport)
-						  draw-line
-						  x1 y1 x2 y2))])
-			       (go draw
-				   (lambda () (flip draw))
-				   (lambda () (clear draw))))))])])
-	      the-function))))))
-  
-  (define draw-line (make-do-line draw-it))
-  (define (clear-line viewport)
-    (let ([f ((make-do-line clear-it) viewport)])
-      (rec clear-line-viewport
-	   (lambda (p1 p2)
-	     (f p1 p2)))))
-  (define (flip-line viewport)
-    (let ([f ((make-do-line flip-it) viewport)])
-      (rec flip-line-viewport
-	   (lambda (p1 p2)
-	     (f p1 p2)))))
-  
-  (define (draw/clear/flip ivar)
-    (lambda (init-dc viewport p width height)
-      (let ([dc (viewport-dc viewport)]
-	    [buffer-dc (viewport-buffer-dc viewport)])
-	(init-dc dc)
-	(init-dc buffer-dc)
-	(send/proc dc ivar (posn-x p) (posn-y p) width height)
-	(send/proc buffer-dc ivar (posn-x p) (posn-y p) width height))))
-  
-  (define draw/clear/flip-rectangle (draw/clear/flip 'draw-rectangle))
-  (define draw/clear/flip-ellipse (draw/clear/flip 'draw-ellipse))
-  
-  (define (draw-rectangle viewport)
-    (check-viewport 'draw-rectangle viewport)
-    (rec draw-rectangle-viewport
-	 (case-lambda 
-	  [(p width height) (draw-rectangle-viewport p width height (make-rgb 0 0 0))]
-	  [(p width height color)
-	   (check 'draw-rectangle
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number"
-		  (orp color? number?) color "color or index")
-	   (draw/clear/flip-rectangle
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen (get-color color) 1 'solid))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush "BLACK" 'transparent)))
-	    viewport p width height)])))
-    
-  (define (draw-solid-rectangle viewport)
-    (check-viewport 'draw-solid-rectangle viewport)
-    (rec draw-solid-rectangle-viewport
-	 (case-lambda 
-	  [(p width height) (draw-solid-rectangle-viewport p width height (make-rgb 0 0 0))]
-	  [(p width height color)
-	   (check 'draw-solid-rectangle
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number"
-		  (orp color? number?) color "color or index")
-	   (draw/clear/flip-rectangle
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen (get-color color) 1 'solid))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush (get-color color) 'solid)))
-	    viewport p width height)])))
-  
-  (define (flip-rectangle viewport)
-    (check-viewport 'flip-rectangle viewport)
-    (rec flip-rectangle-viewport
-	 (case-lambda 
-	  [(p width height) (flip-rectangle-viewport p width height (make-rgb 0 0 0))]
-	  [(p width height color)
-	   (check 'flip-rectangle
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number"
-		  (orp color? number?) color "color or index")
-	   (draw/clear/flip-rectangle
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen (get-color color) 1 'xor))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush "BLACK" 'transparent)))
-	    viewport p width height)])))
-  
-  (define (flip-solid-rectangle viewport)
-    (check-viewport 'flip-solid-rectangle viewport)
-    (rec flip-solid-rectangle-viewport
-	 (case-lambda 
-	  [(p width height) (flip-solid-rectangle-viewport p width height (make-rgb 0 0 0))]
-	  [(p width height color)
-	   (check 'flip-solid-rectangle
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number"
-		  (orp color? number?) color "color or index")
-	   (draw/clear/flip-rectangle
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen "BLACK" 1 'transparent))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush (get-color color) 'xor)))
-	    viewport p width height)])))
-
-  (define (draw-ellipse viewport)
-    (check-viewport 'draw-ellipse viewport)
-    (rec draw-ellipse-viewport
-	 (case-lambda 
-	  [(p width height) (draw-ellipse-viewport p width height (make-rgb 0 0 0))]
-	  [(p width height color)
-	   (check 'draw-ellipse
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number"
-		  (orp color? number?) color "color or index")
-	   (draw/clear/flip-ellipse
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen (get-color color) 1 'solid))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush "BLACK" 'transparent)))
-	    viewport p width height)])))
-  
-  (define (draw-solid-ellipse viewport)
-    (check-viewport 'draw-solid-ellipse viewport)
-    (rec draw-solid-ellipse-viewport
-	 (case-lambda 
-	  [(p width height) (draw-solid-ellipse-viewport p width height (make-rgb 0 0 0))]
-	  [(p width height color)
-	   (check 'draw-solid-ellipse
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number"
-		  (orp color? number?) color "color or index")
-	   (draw/clear/flip-ellipse
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen (get-color color) 1 'solid))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush (get-color color) 'solid)))
-	    viewport p width height)])))
-  
-  (define (flip-ellipse viewport)
-    (check-viewport 'flip-ellipse viewport)
-    (rec flip-ellipse-viewport
-	 (case-lambda 
-	  [(p width height) (flip-ellipse-viewport p width height (make-rgb 0 0 0))]
-	  [(p width height color)
-	   (check 'flip-ellipse
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number"
-		  (orp color? number?) color "color or index")
-	   (draw/clear/flip-ellipse
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen (get-color color) 1 'xor))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush "BLACK" 'transparent)))
-	    viewport p width height)])))
-  
-  (define (flip-solid-ellipse viewport)
-    (check-viewport 'flip-solid-rectangle viewport)
-    (rec flip-solid-ellipse-viewport
-	 (case-lambda 
-	  [(p width height) (flip-solid-ellipse-viewport p width height (make-rgb 0 0 0))]
-	  [(p width height color)
-	   (check 'flip-solid-ellipse
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number"
-		  (orp color? number?) color "color or index")
-	   (draw/clear/flip-ellipse
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen "BLACK" 1 'transparent))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush (get-color color) 'xor)))
-	    viewport p width height)])))
-  
-  (define (clear-rectangle viewport)
-    (check-viewport 'clear-rectangle viewport)
-    (rec clear-rectangle-viewport
-	 (lambda (p width height)
-	   (check 'clear-rectangle
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number")
-	   (draw/clear/flip-rectangle
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen "WHITE" 1 'solid))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush "BLACK" 'transparent)))
-	    viewport p width height))))
-  
-  (define (clear-solid-rectangle viewport)
-    (check-viewport 'clear-solid-rectangle viewport)
-    (rec clear-solid-rectangle-viewport
-	 (lambda (p width height)
-	   (check 'clear-solid-rectangle
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number")
-	   (draw/clear/flip-rectangle
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen "WHITE" 1 'solid))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush "WHITE" 'solid)))
-	    viewport p width height))))
-  
-  (define (clear-ellipse viewport)
-    (check-viewport 'clear-ellipse viewport)
-    (rec clear-ellipse-viewport
-	 (lambda (p width height)
-	   (check 'clear-ellipse
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number")
-	   (draw/clear/flip-ellipse
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen "WHITE" 1 'solid))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush "BLACK" 'transparent)))
-	    viewport p width height))))
-  
-  (define (clear-solid-ellipse viewport)
-    (check-viewport 'clear-solid-ellipse viewport)
-    (rec clear-solid-ellipse-viewport
-	 (lambda (p width height)
-	   (check 'clear-solid-ellipse
-		  posn? p "posn"
-		  number? width "number"
-		  number? height "number")
-	   (draw/clear/flip-ellipse
-	    (lambda (dc)
-	      (send dc set-pen (send mred:the-pen-list find-or-create-pen "WHITE" 1 'solid))
-	      (send dc set-brush (send mred:the-brush-list find-or-create-brush "WHITE" 'solid)))
-	    viewport p width height))))
-
-  (define make-do-pointlist
-    (lambda (go name get-pen-name set-pen-name
-		get-current-pen-name set-viewport-pen white-pen
-		get-brush-name set-brush-name invisi-brush)
-      (let ([f (make-draw-proc get-pen-name set-pen-name 
-			       get-current-pen-name set-viewport-pen white-pen)])
-	(lambda (viewport)
-	  (let ([f (f viewport)]
-		[vdc (viewport-dc viewport)]
-		[vbdc (viewport-buffer-dc viewport)])
-	    (letrec ([the-function
-		      (case-lambda
-		       [(posns offset) (the-function posns offset #f)]
-		       [(posns offset color)
-			(f color
-			   (lambda (flip clear)
-			     (let* ([points (map (lambda (p)
-						   (make-object mred:point% (posn-x p) (posn-y p)))
-						 posns)]
-				    [x (posn-x offset)]
-				    [y (posn-y offset)]
-				    [orig (send/proc vdc get-brush-name)]
-				    [draw (lambda ()
-					    (send/proc vdc set-brush-name
-						       invisi-brush)
-					    (send/proc vbdc set-brush-name
-						       invisi-brush)
-					    (send/proc 
-					     (viewport-dc viewport) name
-					     points x y)
-					    (send/proc 
-					     (viewport-buffer-dc viewport) name
-					     points x y)
-					    (send/proc vdc set-brush-name orig)
-					    (send/proc vbdc set-brush-name
-						       orig))])
-			       (go draw
-				   (lambda () (flip draw))
-				   (lambda () (clear draw))))))])])
-	      the-function))))))
-  
-  (define make-do-polygon
-    (lambda (go)
-      (make-do-pointlist go 'draw-polygon 'get-pen 'set-pen 
-			 'get-current-pen set-viewport-pen white-pen
-			 'get-brush 'set-brush invisi-brush)))
-  
-  (define make-do-solid-polygon
-    (lambda (go)
-      (make-do-pointlist go 'draw-polygon 'get-brush 'set-brush  
-			 'get-current-brush set-viewport-brush white-brush
-			 'get-pen 'set-pen invisi-pen)))
-  
-  (define draw-polygon (make-do-polygon draw-it))
-  (define (clear-polygon viewport)
-    (let ([f ((make-do-polygon clear-it) viewport)])
-      (rec clear-polygon-viewport
-	   (lambda (posns offset)
-	     (f posns offset)))))
-  (define (flip-polygon viewport)
-    (let ([f ((make-do-polygon flip-it) viewport)])
-      (rec flip-polygon-viewport
-	   (lambda (posns offset)
-	     (f posns offset)))))
-  
-  (define draw-solid-polygon (make-do-solid-polygon draw-it))
-  (define (clear-solid-polygon viewport)
-    (let ([f ((make-do-solid-polygon clear-it) viewport)])
-      (rec clear-solid-polygon-viewport
-	   (lambda (posns offset)
-	     (f posns offset)))))
-  (define (flip-solid-polygon viewport)
-    (let ([f ((make-do-solid-polygon flip-it) viewport)])
-      (rec flip-solid-polygon-viewport
-	   (lambda (posns offset)
-	     (f posns offset)))))
-  
-  (define make-do-pixel
-    (lambda (go)
-      (let ([f (make-draw-proc 'get-pen 'set-pen  
-			       'get-current-pen set-viewport-pen white-pen)])
-	(lambda (viewport)
-	  (let ([f (f viewport)])
-	    (letrec ([the-function
-		      (case-lambda
-		       [(posn) (the-function posn #f)]
-		       [(posn color)
-			(f color
-			   (lambda (flip clear)
-			     (let* ([x (posn-x posn)]
-				    [y (posn-y posn)]
-				    [draw (lambda ()
-					    (send 
-					     (viewport-dc viewport) draw-point
-					     x y)
-					    (send 
-					     (viewport-buffer-dc viewport)
-					     draw-point 
-					     x y))])
-			       (go draw 
-				   (lambda () (flip draw)) 
-				   (lambda () (clear draw))))))])])
-	      the-function))))))
-
-  (define-do-pixel draw-pixel draw-it draw-pixel-viewport make-do-pixel)
-  (define-do-pixel clear-pixel clear-it clear-pixel-viewport make-do-pixel)
-  (define-do-pixel flip-pixel flip-it flip-pixel-viewport make-do-pixel)
-  
-  (define string-functions
-    (lambda (string-op)
-      (letrec ([outer-function
-		(case-lambda
-		 [(viewport) (outer-function viewport default-font)]
-		 [(viewport font)
-		  (letrec ([the-function
-			    (case-lambda
-			     [(posn text) (the-function posn text #f)]
-			     [(posn text color)
-			      (let*-values ([(dc) (viewport-dc viewport)]
-					    [(x) (posn-x posn)]
-					    [(w h d a) (send dc get-text-extent "X" font)]
-					    [(y) (- (posn-y posn) (- h d))]
-					    [(buffer) (viewport-buffer-dc viewport)]
-					    [(string-create)
-					     (lambda ()
-					       (send dc draw-text text x y)
-					       (send buffer draw-text text x y))])
-				(cond
-				  [(eq? string-op 'draw)
-				   (when color
-				     (set-text-foreground viewport color))
-				   (set-viewport-font viewport font)
-				   (send dc draw-text text x y)
-				   (send buffer draw-text text x y)]
-				  [(eq? string-op 'flip)
-				   (when color
-				     (set-text-foreground viewport color))
-				   (set-viewport-font viewport font)
-				   (string-create)]
-				  [(eq? string-op 'clear)
-				   (set-text-foreground viewport white)
-				   (set-viewport-font viewport font)
-				   (string-create)
-				   (set-text-foreground viewport black)]))])])
-		    the-function)])])
-	outer-function)))
-
-  (define-string draw-string draw draw-string-viewport string-functions)
-  (define-string clear-string clear clear-string-viewport string-functions)
-  (define-string flip-string flip flip-string-viewport string-functions)
-  
-  (define get-string-size
-    (case-lambda
-     [(viewport) (get-string-size viewport default-font)]
-     [(viewport font)
-      (lambda (text)
-	(let-values ([(w h d a) (send (viewport-dc viewport) get-text-extent text font)])
-	  (list w h)))]))
-  
-  (define get-color-pixel 
-    (lambda (viewport)
-      (lambda (posn)
-	(let ([c (make-object mred:color%)]
-	      [x (posn-x posn)]
-	      [y (posn-y posn)])
-	  (unless (send (viewport-buffer-dc viewport) get-pixel x y c)
-	    (error 'get-color-pixel "specified point is out-of-range"))
-	  c))))
-  
-  (define get-pixel 
-    (lambda (viewport)
-      (lambda (posn)
-	(let ([c (make-object mred:color%)]
-	      [x (posn-x posn)]
-	      [y (posn-y posn)])
-	  (unless (send (viewport-buffer-dc viewport) get-pixel x y c)
-	    (error 'get-pixel "specified point is out-of-range"))
-	  (if (or (< (send c blue) 255)
-		  (< (send c red) 255)
-		  (< (send c green) 255))
-	      1
-	      0)))))
-  
-  (define (test-pixel viewport)
-    (lambda (color)
-      (let ([c (make-object mred:color%)])
-	(send (viewport-buffer-dc viewport) try-color color c)
-	c)))
-
-  (define draw-pixmap-posn
-    (opt-lambda (filename [type 'unknown/mask])
-      (check 'draw-pixmap-posn
-	     (andp path-string? file-exists?) filename "filename"
-	     (lambda (x) (memq x '(gif xbm xpm bmp unknown unknown/mask gif/mask))) type "file type symbol")
-      (let* ([bitmap (make-object mred:bitmap% filename type)])
-	(lambda (viewport)
-	  (check 'draw-pixmap-posn
-		 viewport? viewport "viewport")
-	  (opt-lambda (posn [color #f])
-	    (check 'draw-pixmap-posn
-		   posn? posn "posn"
-		   (orp not color?) color (format "color or ~e" #f))
-	    (when color
-	      (set-viewport-pen viewport (get-color color)))
-	    (let ([x (posn-x posn)]
-		  [y (posn-y posn)])
-	      (send (viewport-dc viewport) draw-bitmap bitmap x y 'solid black-color (send bitmap get-loaded-mask))
-	      (send (viewport-buffer-dc viewport) draw-bitmap bitmap x y 'solid black-color (send bitmap get-loaded-mask))))))))
-  
-  (define draw-pixmap
-    (lambda (viewport)
-      (check 'draw-pixmap
-	     viewport? viewport "viewport")
-      (opt-lambda (filename p [color #f])
-	(check 'draw-pixmap
-	       (andp path-string? file-exists?) filename "filename"
-	       posn? p "posn"
-	       (orp not color?) color (format "color or ~e" #f))
-	(((draw-pixmap-posn filename 'unknown) viewport) p color))))
-  
-  (define copy-viewport 
-    (lambda (source target)
-      (check 'copy-viewport
-	     viewport? source "viewport"
-	     viewport? target "viewport")
-      (let* ([source-bitmap (viewport-bitmap source)]
-	     [target-dc (viewport-dc target)]
-	     [target-buffer-dc (viewport-buffer-dc target)])
-	(send target-dc draw-bitmap source-bitmap 0 0)
-	(send target-buffer-dc draw-bitmap source-bitmap 0 0))))
-
-  (define save-pixmap
-    (lambda (viewport)
-      (check 'save-pixmap
-	     viewport? viewport "viewport")
-      (opt-lambda (filename [kind 'xpm])
-	(check 'save-pixmap
-	       (andp path-string? (orp relative-path? absolute-path?)) filename "filename"
-	       (lambda (x) (memq x '(xpm xbm bmp))) kind "file type symbol")
-	(let ([bm (viewport-bitmap viewport)])
-	  (send bm save-file filename kind)))))
-
-  (define sixlib-eventspace #f)
-  
-  (define make-open-viewport
-    (lambda (name show?)
-      (unless sixlib-eventspace
-	(set! sixlib-eventspace 
-	      (parameterize ([uncaught-exception-handler
-			      (lambda (x)
-				((error-display-handler)
-				 (format "internal error in graphics library: ~a"
-					 (if (exn? x)
-					     (exn-message x)
-					     (format "~e" x))))
-				((error-escape-handler)))])
-		(mred:make-eventspace))))
-      (letrec ([open-viewport
-		(case-lambda
-		 [(label point) 
-		  (cond
-		    [(posn? point) (open-viewport label (posn-x point) (posn-y point))]
-		    [(and (list? point) (= (length point) 2))
-		     (open-viewport label (car point) (cadr point))]
-		    [else (error name "bad argument ~s" point)])]
-		 [(label width height)
-		  (cond
-		    [graphics-flag
-		     (let*
-			 ([frame
-			   (parameterize ([mred:current-eventspace sixlib-eventspace])
-			     (make-object sixlib-frame% label #f width height))]
-			  [panel (make-object mred:vertical-panel% frame)]
-			  [canvas (make-object sixlib-canvas% panel)]
-			  [_ (begin
-			       (send canvas min-height height)
-			       (send canvas min-width width))]
-			  [dc (send canvas get-dc)]
-			  [buffer-dc (make-object mred:bitmap-dc%)]
-			  [viewport (make-viewport label canvas)])
-		       (send panel set-alignment 'center 'center)
-		       (send frame set-canvas canvas)
-		       (send canvas set-viewport viewport)
-		       (send canvas set-dc dc)
-		       (send canvas set-buffer-dc buffer-dc)
-		       (send canvas set-geometry width height)
-		       (when show? 
-			 (send frame show #t)
-			 (send canvas focus))
-		       (set-text-foreground viewport black)
-		       (set-text-background viewport white)
-		       (set-viewport-background viewport white)
-		       (set-viewport-pen viewport black-pen)
-		       (set-viewport-brush viewport black-brush)
-		       ((clear-viewport viewport))
-		       (when (null? global-viewport-list)
-			 (send open-frames-timer start 100000000))
-		       (set! global-viewport-list (cons viewport global-viewport-list))
-		       viewport)]
-		    [else (error "graphics not open")])])])
-	open-viewport)))
-  
-  (define open-viewport (make-open-viewport 'open-viewport #t))
-  (define open-pixmap (make-open-viewport 'open-pixmap #f))
-
-  (define (default-display-is-color?) (mred:is-color-display?))
-  
-  (define position-display
-    (lambda (viewport counter)
-      (cond
-	[(equal? counter 0) '()]
-	[else (begin 
-		(display (query-mouse-posn viewport))
-		(position-display viewport (- counter 1)))])))
-  
-  (define create-cmap
-    (lambda ()
-      (do ([index 0 (+ 1 index)])
-	((> index 20))
-	(let* ([r (* 0.05 index)]
-	       [b (- 1 r)]
-	       [g (- 1 r)])
-	  (change-color index (make-rgb r g b))))))
-  
-  (define viewport->snip
-    (lambda (viewport)
-      (let ([orig-bitmap (send (viewport-canvas viewport) get-bitmap)]
-	    [orig-dc (viewport-buffer-dc viewport)])
-	(let* ([h (send orig-bitmap get-height)]
-	       [w (send orig-bitmap get-width)]
-	       [new-bitmap (make-object mred:bitmap% w h)]
-	       [tmp-mem-dc (make-object mred:bitmap-dc%)])
-	  (send tmp-mem-dc set-bitmap new-bitmap)
-	  (send tmp-mem-dc draw-bitmap (send orig-dc get-bitmap) 0 0)
-	  (send tmp-mem-dc set-bitmap #f)
-	  (let ([snip (make-object mred:image-snip%)])
-	    (send snip set-bitmap new-bitmap)
-	    snip)))))
-  
-  (create-cmap)
-
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;;                                                             ;;;
-  ;;;                        ERROR CHECKING                       ;;;
-  ;;;                                                             ;;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-  ;; check-viewport : symbol TST -> void
-  (define (check-viewport f-name obj)
-    (unless (viewport? obj)
-      (error f-name "expected viewport as first argument, got ~e" obj)))
-
-  ;; (define-type arg/pred/name-list (list* (TST -> bool) TST string arg/pred/name-list))
-  ;; check : (symbol arg/pred/name-list *-> void)
-  (define (check f-name . in-args)
-    (let loop ([args in-args]
-	       [n 0])
-      (cond
-       [(null? args) (void)]
-       [else (let ([pred? (car args)]
-		   [val (cadr args)]
-		   [name (caddr args)])
-	       (unless (pred? val)
-		 (error f-name "expected ~a as arg ~a, got: ~e, all args: ~a"
-			name n val
-			(let loop ([args in-args])
-			  (cond
-			   [(null? args) ""]
-			   [else (string-append (format "~e" (cadr args))
-						" "
-						(loop (cdddr args)))]))))
-	       (loop (cdddr args)
-		     (+ n 1)))])))
-
-  (define (orp . preds)
-    (lambda (TST)
-      (ormap (lambda (p) (p TST)) preds)))
-
-  (define (andp . preds)
-    (lambda (TST)
-      (andmap (lambda (p) (p TST)) preds)))
-  )
-)
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-sig.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-sig.rkt
deleted file mode 100644
index cc93256586..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-sig.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-(module graphics-sig mzscheme
-  (require mzlib/unit)
-
-  (provide graphics^ graphics:posn^)
-
-  (define-signature graphics:posn^
-    ((struct posn (x y) -setters)))
-
-  (define-signature graphics^
-    (viewport?
-
-     open-graphics 
-     close-graphics 
-     graphics-open?
-     
-     get-mouse-click
-     ready-mouse-click
-     ready-mouse-release
-     mouse-click-posn
-     query-mouse-posn
-     viewport-flush-input
-     left-mouse-click?
-     middle-mouse-click?
-     right-mouse-click?
-     
-     set-on-key-event
-     set-on-tick-event
-     stop-tick
-     init-world
-     get-key-press
-     ready-key-press
-     key-value
-     
-     make-rgb
-     rgb-blue rgb-red rgb-green
-     change-color 
-     rgb?
-     
-     open-viewport 
-     open-pixmap
-     close-viewport    
-     
-     clear-viewport draw-viewport flip-viewport
-     
-     draw-line clear-line flip-line 
-     draw-pixel clear-pixel flip-pixel 
-     get-pixel get-color-pixel test-pixel
-     
-     draw-rectangle clear-rectangle flip-rectangle 
-     draw-ellipse clear-ellipse flip-ellipse 
-     draw-polygon clear-polygon flip-polygon 
-     draw-solid-rectangle clear-solid-rectangle flip-solid-rectangle 
-     draw-solid-ellipse clear-solid-ellipse flip-solid-ellipse 
-     draw-solid-polygon clear-solid-polygon flip-solid-polygon 
-     
-     get-string-size
-     
-     draw-string clear-string flip-string 
-     
-     draw-pixmap-posn
-     draw-pixmap
-     save-pixmap
-     
-     copy-viewport 
-     
-     default-display-is-color?
-     
-     viewport->snip
-     
-     viewport-dc viewport-buffer-dc))
-  
-  #;(define-signature graphics^
-    ((open graphics:posn-less^)
-     (open graphics:posn^)))
-)
-
-
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-unit.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-unit.rkt
deleted file mode 100644
index 423f42c090..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-unit.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-(module graphics-unit mzscheme
-  (require mzlib/unit
-           mred/mred-sig
-           "graphics-sig.rkt"
-           "graphics-posn-less-unit.rkt")
-  (provide graphics@)
-
-  (define-unit p@
-    (import)
-    (export graphics:posn^)
-    (define-struct posn (x y)))
-  
-  (define-compound-unit/infer graphics@
-    (import mred^)
-    (export graphics:posn^ graphics^)
-    (link p@ graphics-posn-less@)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/graphics.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/graphics.rkt
deleted file mode 100644
index 0531f0fd95..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/graphics.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-(module graphics mzscheme
-  (require mzlib/unit
-           mred/mred-sig
-           mred/mred-unit
-           "graphics-sig.rkt"
-           "graphics-unit.rkt")
-  (provide-signature-elements graphics^ graphics:posn^)
-
-  (define-values/invoke-unit/infer
-    (export graphics^ graphics:posn^)
-    (link standard-mred@ graphics@)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/info.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/info.rkt
deleted file mode 100644
index a297bb927f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all (mflatt robby))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/main.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/main.rkt
deleted file mode 100644
index 34ca77c558..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scheme/base
-
-(require "graphics.rkt")
-(provide (all-from-out "graphics.rkt"))
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/tests/sixlib.rktl b/pkgs/htdp-pkgs/htdp-lib/graphics/tests/sixlib.rktl
deleted file mode 100644
index 12ed2ef10e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/tests/sixlib.rktl
+++ /dev/null
@@ -1,300 +0,0 @@
-;; load the graphics
-(require graphics/graphics
-         mzlib/etc
-         mzlib/file)
-(open-graphics)
-
-(define (struct-test)
-  ;; test rgb selectors
-  (let* ([fraction 1/5]
-         [test 
-          (list
-           (rgb-red (make-rgb fraction 0 0))
-           (rgb-green (make-rgb 0 fraction 0))
-           (rgb-blue (make-rgb 0 0 fraction)))])
-    (unless (equal? (list fraction fraction fraction) test)
-      (error 'rgb "wrong: ~s" test)))
-  
-  ;; test posn selectors
-  (let* ([test
-          (list
-           (posn-x (make-posn 1 0))
-           (posn-y (make-posn 0 1)))])
-    (unless (equal? (list 1 1) test)
-      (error 'posn "wrong: ~s" test))))
-
-;; test basic operations
-(define (basic-test)
-  (let ([v (open-viewport "Tester" 200 200)])
-    ((draw-string v) (make-posn 0 20) "Reversed X; click to continue")
-    ((draw-string v) (make-posn 0 40) "(busy-waiting right now!)")
-    ((draw-line v) (make-posn 0 0) (make-posn 100 100))
-    ((draw-line v) (make-posn 100 0) (make-posn 0 100))
-    ((flip-viewport v))
-    (let loop ()
-      (unless (ready-mouse-click v)
-        (loop)))
-    
-    ((clear-viewport v))
-    ((draw-string v) (make-posn 0 20) "Cleared; click")
-    (get-mouse-click v)
-    
-    (let ([rect-draw
-           (lambda (f)
-             (f (make-posn 20 20) 60 60))]
-          [poly-draw
-           (lambda (f)
-             (f (list (make-posn 0 0) (make-posn 40 0) (make-posn 20 40)) (make-posn 20 20)))]
-          [string-draw
-           (lambda (f)
-             (f (make-posn 10 20) "XXXXX"))]
-          [shape
-           (lambda (do-draw draw clear flip name)
-             ((clear-viewport v))
-             ((draw-string v) (make-posn 0 20) (format "Centered ~s" name))
-             (do-draw (draw v))
-             (get-mouse-click v)
-             
-             ((draw-string v) (make-posn 0 40) (format "Erased ~s" name))
-             (do-draw (clear v))
-             (get-mouse-click v)
-             
-             ((clear-viewport v))
-             ((draw-string v) (make-posn 0 20) (format "Centered ~s" name))
-             (do-draw (draw v))
-             (get-mouse-click v)
-             
-             ((draw-string v) (make-posn 0 40) (format "Flipped ~s" name))
-             (do-draw (flip v))
-             (get-mouse-click v)
-             
-             ((draw-string v) (make-posn 0 40) (format "Flipped ~s back" name))
-             (do-draw (flip v))
-             (get-mouse-click v))])
-      (shape rect-draw draw-rectangle clear-rectangle flip-rectangle "box")
-      (shape rect-draw draw-solid-rectangle clear-solid-rectangle flip-solid-rectangle "solid box")
-      (shape rect-draw draw-ellipse clear-ellipse flip-ellipse "circle")
-      (shape rect-draw draw-solid-ellipse clear-solid-ellipse flip-solid-ellipse "solid circle")
-      (shape poly-draw draw-polygon clear-polygon flip-polygon "polygon")
-      (shape poly-draw draw-solid-polygon clear-solid-polygon flip-solid-polygon "solid polygon")
-      (shape string-draw
-             draw-string
-             clear-string
-             flip-string
-             "string"))
-    
-    ((clear-viewport v))
-    ((draw-string v) (make-posn 0 20) "Done; click")
-    (get-mouse-click v)
-    
-    (close-viewport v)))
-
-;; test get-pixel
-(define (pixel-test)
-  (let ([v (open-viewport "test get-pixel" 8 8)]
-        [f (lambda (x y) 
-             (if (= (modulo (+ x y) 2) 0)
-                 (make-rgb 1 1 1)
-                 (make-rgb (/ (modulo (+ x y) 3) 2)
-                           (/ (modulo (+ x y 1) 3) 2)
-                           (/ (modulo (+ x y 2) 3) 2))))]
-        
-        [unmarshall-color
-         (lambda (c)
-           (if (is-a? c color%)
-               (list (send c red)
-                     (send c green)
-                     (send c blue))
-               c))]
-
-        [for-each-point
-         (lambda (f)
-           (let loop ([i 8])
-             (unless (= i 0)
-               (let loop ([j 8])
-                 (unless (= j 0)
-                   (f (- i 1) (- j 1))
-                   (loop (- j 1))))
-               (loop (- i 1)))))])
-    (for-each-point
-     (lambda (i j)
-       ;(printf "(~a, ~a) -> ~a\n" i j (unmarshall-color (f i j)))
-       ((draw-pixel v) (make-posn i j) (f i j))))
-    ;(get-mouse-click v)
-    (for-each-point
-     (lambda (i j)
-       (let* ([cmp
-               (lambda (rgb1 rgb2)
-                 (and (= (rgb-red rgb1) (rgb-red rgb2))
-                      (= (rgb-blue rgb1) (rgb-blue rgb2))
-                      (= (rgb-green rgb1) (rgb-green rgb2))))]
-              [color-expected ((test-pixel v) (f i j))]
-              [bw-expected (if (cmp (make-rgb 1 1 1) color-expected) 0 1)]
-              [color-got ((get-color-pixel v) (make-posn i j))]
-              [bw-got ((get-pixel v) (make-posn i j))])
-         (unless (= bw-got bw-expected)
-           (error 'test-get-pixel "wrong answer for (~a,~a); got ~a expectd ~a"
-                  i j bw-got bw-expected))
-         (unless (cmp color-expected color-got)
-           (error 'test-get-color-pixel "wrong answer for (~a,~a); got ~a expected ~a"
-                  i j
-                  (unmarshall-color color-got)
-                  (unmarshall-color color-expected))))))
-    (close-viewport v)))
-
-(define (snip-test)
-  ;; test snips
-  (let ([vp (open-pixmap "snip test" 100 100)])
-    ((draw-string vp) (make-posn 20 30) "flipped rect")
-    ((flip-solid-rectangle vp) (make-posn 10 10) 80 80)
-    (display (viewport->snip vp))))
-
-(define (color-test)
-  (let ([v (open-viewport "Color Tester" 100 200)])
-    ((draw-solid-rectangle v) (make-posn 10 10) 80 80 (make-rgb 1 0 0))
-    ((draw-solid-ellipse v) (make-posn 10 10) 80 80 (make-rgb 0 1 0))
-    ((draw-line v) (make-posn 10 10) (make-posn 90 90) (make-rgb 0 0 1))
-    ((draw-string v) (make-posn 10 100) "red rectangle")
-    ((draw-string v) (make-posn 10 120) "green ellipse")
-    ((draw-string v) (make-posn 10 140) "blue line")
-    (get-mouse-click v)
-    
-    ((draw-viewport v) (make-rgb 1 0 0))
-    ((draw-string v) (make-posn 10 100) "solid red")
-    (get-mouse-click v)
-    
-    ((draw-viewport v))
-    ((clear-string v) (make-posn 10 100) "solid black")
-    (get-mouse-click v)
-    
-    (close-viewport v)))
-
-(define (pixmap-test)
-  (local [(define width 500)
-          (define height 500)
-          (define pixmap-filename (build-path (collection-path "icons") "plt.gif"))
-          (define view-port (open-viewport "pixmap tests" width height))
-          (define (line)
-            ((draw-line view-port) (make-posn 50 50) (make-posn 450 450)))
-          (define (next desc)
-            ((draw-string view-port) (make-posn 0 (- height 50)) desc)
-            ((draw-string view-port) (make-posn 0 (- height 30)) "click to continue")
-            (get-mouse-click view-port)
-            ((clear-viewport view-port)))]
-    
-    (line)
-    (((draw-pixmap-posn pixmap-filename) view-port) (make-posn 0 0))
-    (next "draw line then draw-pixmap-posn")
-    
-    (line)
-    ((draw-pixmap view-port) pixmap-filename (make-posn 0 0))
-    (next "pixmap-functions: draw line then draw-pixmap")
-    
-    (line)
-    ((draw-pixmap view-port) pixmap-filename (make-posn 0 0))
-    (let ([fn (make-temporary-file)])
-      ((save-pixmap view-port) fn)
-      ((clear-viewport view-port))
-      (next (format "same image; saved to ~a and cleared..." fn))
-      ((draw-pixmap view-port) fn (make-posn 0 0))
-      (delete-file fn)
-      (next "re-loaded"))
-    
-    (close-viewport view-port)))
-
-(define (copy-viewport-test)
-  (let* ([width 100]
-         [height 100]
-         [vs (open-viewport "viewport source" width height)]
-         [vd (open-viewport "viewport dest" width height)])
-    
-    ((draw-ellipse vs) (make-posn 10 10) 80 80)
-    ((draw-string vs) (make-posn 10 30) "Click")
-    (get-mouse-click vs)
-    (copy-viewport vs vd)
-    ((clear-viewport vs))
-    ((draw-string vs) (make-posn 10 30) "Cleared")
-    (get-mouse-click vd)
-    (void)))
-
-(define (keyboard-test)
-  (let ([v (open-viewport "keyboard" 300 200)]
-        [RED (make-rgb 1 0 0)]
-        [BLACK (make-rgb 0 0 0)])
-    ((draw-string v) (make-posn 5 15) "Type, end with return (red is from key-ready):")
-    (let loop ([x 5])
-      (let* ([kv (or (begin
-                       ((draw-rectangle v) (make-posn 290 0) 10 10 RED)
-                       (ready-key-press v))
-                     (begin
-                       ((draw-rectangle v) (make-posn 290 0) 10 10 BLACK)
-                       (cons 'slow (get-key-press v))))]
-             [k (key-value (if (pair? kv) (cdr kv) kv))])
-        ((clear-rectangle v) (make-posn 0 290) 10 10)
-        (cond
-          [(eq? k #\return) 'done]
-          [(char? k) (let ([s (string k)])
-                       ((draw-string v) (make-posn x 50) s
-                        (if (pair? kv)
-                            BLACK
-                            RED))
-                       (sleep 0.05) ; slow down so key-ready takes effect
-                       (loop (+ x (car ((get-string-size v) s)))))]
-          [else (loop x)])))
-    (close-viewport v)))
-
-(define (color-accepting-test)
-  (let* ([vp (open-viewport "viewport" 200 200)]
-	 [operations
-	  (list
-	   (draw-viewport vp)
-	   (lambda (c) ((draw-pixel vp) (make-posn 0 0) c))
-	   (lambda (c) ((draw-line vp) (make-posn 0 0) (make-posn 100 100) c))
-	   (lambda (c) ((draw-rectangle vp) (make-posn 0 0) 10 10 c))
-	   (lambda (c) ((flip-rectangle vp) (make-posn 0 0) 10 10 c))
-	   (lambda (c) ((draw-solid-rectangle vp) (make-posn 0 0) 10 10 c))
-	   (lambda (c) ((flip-solid-rectangle vp) (make-posn 0 0) 10 10 c))
-	   (lambda (c) ((draw-ellipse vp) (make-posn 0 0) 10 10 c))
-	   (lambda (c) ((flip-ellipse vp) (make-posn 0 0) 10 10 c))
-	   (lambda (c) ((draw-solid-ellipse vp) (make-posn 0 0) 10 10 c))
-	   (lambda (c) ((flip-solid-ellipse vp) (make-posn 0 0) 10 10 c))
-	   (lambda (c) ((draw-polygon vp)
-			(list (make-posn 0 0)
-			      (make-posn 10 10)
-			      (make-posn 0 10))
-			(make-posn 20 20)
-			c))
-	   (lambda (c) ((draw-solid-polygon vp)
-			(list (make-posn 0 0)
-			      (make-posn 10 10)
-			      (make-posn 0 10))
-			(make-posn 20 20)
-			c))
-	   (lambda (c) ((draw-string vp) (make-posn 40 40) "abcd" c))
-	   (lambda (c) (((draw-pixmap-posn (build-path (collection-path "icons") "bb.gif"))
-			 vp)
-			(make-posn 20 0)
-			c))
-	   (lambda (c) ((draw-pixmap vp)
-			(build-path (collection-path "icons") "bb.gif")
-			(make-posn 0 0)
-			c)))])
-    (for-each (lambda (c)
-		(c "red")
-		(c "blue")
-		(c "black")
-		(c (make-rgb .3 .5 .1)))
-	      operations)
-    (close-viewport vp)))
-	     
-(struct-test)
-(basic-test)
-(pixel-test)
-(color-test)
-(snip-test)
-(pixmap-test)
-(copy-viewport-test)
-(keyboard-test)
-(color-accepting-test)
-
-(close-graphics)
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/tests/test-docs-complete.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/tests/test-docs-complete.rkt
deleted file mode 100644
index 1d138f8c56..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote graphics/value-turtles))
-(check-docs (quote graphics/value-turtles-test))
-(check-docs (quote graphics/value-turtles-examples))
-(check-docs (quote graphics/turtles))
-(check-docs (quote graphics/turtle-test))
-(check-docs (quote graphics/turtle-examples))
-(check-docs (quote graphics))
-(check-docs (quote graphics/graphics))
-(check-docs (quote graphics/graphics-unit))
-(check-docs (quote graphics/graphics-sig))
-(check-docs (quote graphics/graphics-posn-less-unit))
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/turtle-examples.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/turtle-examples.rkt
deleted file mode 100644
index 80dc99f916..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/turtle-examples.rkt
+++ /dev/null
@@ -1,308 +0,0 @@
-#lang racket
-
-(require graphics/turtles)
-
-(provide regular-poly regular-polys radial-turtles spaced-turtles
-         spokes spyro-gyra neato graphics-bexam sierp-size sierp sierp-nosplit
-         koch-size koch-split koch-draw lorenz lorenz1 peano-size
-         peano-position-turtle peano fern-size fern1 fern2 gapped-lines)
-
-(define (regular-poly sides radius)
-  (define theta (/ (* 2 pi) sides))
-  (define side-len (* 2 radius (sin (/ theta 2))))
-  (define (draw-sides n)
-    (cond
-      [(zero? n) (void)]
-      [else
-       (draw side-len)
-       (turn/radians theta)
-       (draw-sides (sub1 n))]))
-  (tprompt (move radius)
-           (turn/radians (/ (+ pi theta) 2))
-           (draw-sides sides)))
-
-(define (regular-polys sides s)
-  (define (make-polys n)
-    (cond
-      [(zero? n) (void)]
-      [else
-       (regular-poly sides (* n 5))
-       (make-polys (sub1 n))]))
-  (make-polys sides))
-
-(define (radial-turtles n)
-  (cond
-    [(zero? n) (void)]
-    [else
-     (split (turn/radians (/ pi (expt 2 (sub1 n)))))
-     (radial-turtles (sub1 n))]))
-
-(define (spaced-turtles n)
-  (cond
-    [(zero? n) (void)]
-    [else
-     (split (move (expt 2 (+ n 1))))
-     (spaced-turtles (sub1 n))]))
-
-(define (spokes)
-  (radial-turtles 4)
-  (spaced-turtles 5)
-  (turn/radians (/ pi 2))
-  (draw 10))
-
-(define (spyro-gyra)
-  (radial-turtles 4)
-  (regular-poly 3 100))
-
-(define (neato)
-  (define (spiral d t)
-    (cond
-      [(<= 1 d)
-       (draw d)
-       (turn/radians t)
-       (spiral (- d 1) t)]
-      [else (void)]))
-  (radial-turtles 4)
-  (spiral 30 (/ pi 12)))
-
-(define (graphics-bexam)
-  (define (gb d)
-    (cond
-      [(<= d 3)
-       (draw d)]
-      [else
-       (define new-d (/ d 3))
-       (gb new-d)
-       (turn/radians (- (/ pi 2)))
-       (gb new-d)
-       (turn/radians (/ pi 2))
-       (gb new-d)
-       (turn/radians (/ pi 2))
-       (gb new-d)
-       (turn/radians (- (/ pi 2)))
-       (gb new-d)]))
-  (define square-size (expt 3 5))
-  (split (turn/radians (/ pi 2))
-         (move square-size)
-         (turn/radians (- (/ pi 2)))
-         (move square-size)
-         (turn/radians pi))
-  (split (move square-size)
-         (turn/radians (/ pi 2)))
-  (gb square-size))
-
-(define sierp-size 120)
-
-(define (sierp distance)
-  (define sqrt3 (sqrt 3))
-  (define -2pi/3 (- 0 (/ (* 2 pi) 3)))
-  (define pi/6 (/ pi 6))
-  (define -5pi/6 (- 0 (/ (* 5 pi) 6)))
-  (define pi/2 (/ pi 2))
-  (define (engine distance)
-    (unless (< distance 1)
-      (define side-half (* distance sqrt3))
-      (define side (* 2 side-half))
-      (turn/radians -2pi/3)
-      (move distance)
-      (split (move distance)
-             (turn/radians -5pi/6)
-             (draw side)
-             (turn/radians -5pi/6)
-             (move distance)
-             (turn/radians pi)
-             (split (turn/radians -5pi/6)
-                    (move side-half)
-                    (turn/radians pi/6)))
-      (engine (/ distance 2))))
-  (move (* 2 distance))
-  (turn/radians (/ (* 5 pi) 6))
-  (draw (* distance 2 (sqrt 3)))
-  (turn/radians (/ (* 2 pi) 3))
-  (move (* distance 2 (sqrt 3)))
-  (turn/radians (/ (* 2 pi) 3))
-  (draw (* distance 2 (sqrt 3)))
-  (turn/radians (/ (* 2 pi) 3))
-  (turn/radians (/ pi 6))
-  (move (* 2 distance))
-  (turn/radians pi)
-  (engine distance))
-
-(define (sierp-nosplit distance)
-  (define sqrt3 (sqrt 3))
-  (define -2pi/3 (- 0 (/ (* 2 pi) 3)))
-  (define pi/6 (/ pi 6))
-  (define -5pi/6 (- 0 (/ (* 5 pi) 6)))
-  (define pi/2 (/ pi 2))
-  (define (engine distance)
-    (unless (< distance 1)
-      (define side-half (* distance sqrt3))
-      (define side (* 2 side-half))
-      (turn/radians -2pi/3)
-      (move distance)
-      (engine (/ distance 2))
-      (move distance)
-      (turn/radians -5pi/6)
-      (draw side)
-      (turn/radians -5pi/6)
-      (move distance)
-      (turn/radians pi)
-      (engine (/ distance 2))
-      (turn/radians -5pi/6)
-      (move side-half)
-      (turn/radians pi/6)
-      (engine (/ distance 2))
-      (move (- distance))))
-  (move (* 2 distance))
-  (turn/radians (/ (* 5 pi) 6))
-  (draw (* distance 2 (sqrt 3)))
-  (turn/radians (/ (* 2 pi) 3))
-  (move (* distance 2 (sqrt 3)))
-  (turn/radians (/ (* 2 pi) 3))
-  (draw (* distance 2 (sqrt 3)))
-  (turn/radians (/ (* 2 pi) 3))
-  (turn/radians (/ pi 6))
-  (move (* 2 distance))
-  (turn/radians pi)
-  (engine distance))
-
-(define koch-size (expt 3 5))
-
-(define (koch-split koch-size)
-  (define (build-up-turtles n)
-    (cond
-      [(<= n 3) 'built]
-      [else 
-       (define third (/ n 3))
-       (split* 'stay-put
-               (move (* 2 third))
-               (begin (move third)
-                      (turn/radians (- (/ pi 3))))
-               (begin (move third)
-                      (turn/radians (- (/ pi 3)))
-                      (move third)
-                      (turn/radians (* 2 (/ pi 3)))))
-       (build-up-turtles third)]))
-  (split* 'stay-put
-          (begin (move koch-size)
-                 (turn/radians (/ (* 2 pi) 3)))
-          (begin (turn/radians (/ pi 3))
-                 (move koch-size)
-                 (turn/radians pi)))
-  (build-up-turtles koch-size)
-  (draw 3))
-
-(define (koch-draw koch-size)
-  (define (side n)
-    (cond
-      [(<= n 3) (draw n)]
-      [else 
-       (define third (/ n 3))
-       (side third)
-       (turn/radians (- (/ pi 3)))
-       (side third)
-       (turn/radians (* 2 (/ pi 3)))
-       (side third)
-       (turn/radians (- (/ pi 3)))
-       (side third)]))
-  (split* 'stay-put
-          (begin (move koch-size)
-                 (turn/radians (/ (* 2 pi) 3)))
-          (begin (turn/radians (/ pi 3))
-                 (move koch-size)
-                 (turn/radians pi)))
-  (side koch-size))
-
-(define (lorenz a b c)
-  (define (loop x y z)
-    (define delta 0.01)
-    (define dx (* delta (* a (- y x))))
-    (define dy (* delta (- (* x b) y (* x z))))
-    (define dz (* delta (- (* x y) (* c z))))
-    (draw-offset dx dz)
-    (sleep 0.05)
-    (erase-offset (- dx) (- dz))
-    (move-offset dx dz)
-    (loop (+ x dx)
-          (+ y dy)
-          (+ z dz)))
-  (loop 1 1 1))
-
-(define (lorenz1) (lorenz 50 60 11))
-
-(define peano-size (expt 3 6))
-(define (peano-position-turtle)
-  (clear)
-  (move -270)
-  (turn/radians (/ pi 2))
-  (move 250)
-  (turn/radians (- (/ (* 3 pi) 4))))
-
-(define (peano l)
-  (cond
-    [(<= l 3)
-     (draw l)]
-    [else
-     (define new-l (/ l 3))
-     (peano new-l)
-     (tprompt (peano new-l)
-              (split* (turn/radians (/ pi 2))
-                      (turn/radians (- (/ pi 2))))
-              (peano new-l))
-     (tprompt (split* (turn/radians (/ pi 2))
-                      (turn/radians (- (/ pi 2))))
-              (peano new-l))
-     (tprompt (split* (move new-l)
-                      (begin (turn/radians (/ pi 2))
-                             (move new-l)
-                             (turn/radians (- (/ pi 2))))
-                      (begin (turn/radians (- (/ pi 2)))
-                             (move new-l)
-                             (turn/radians (/ pi 2))))
-              (peano l))
-     (move (* 2 new-l))]))
-
-(define fern-size 30)
-
-(define (fern1 n)
-  (cond
-    [(< 1 n)
-     (draw (/ n 2))
-     (tprompt (split* (turn/radians (/ pi 3))
-                      (turn/radians (- (/ pi 3))))
-              (fern1 (/ n 2)))
-     (draw (/ n 2))
-     (turn/radians 0.08)
-     (fern1 (- n 1))]
-    [else (void)]))
-
-
-;; need to backup a little for this one.
-(define (fern2 n)
-  (define d 0.04)
-  (define (fernd n sign)
-    (cond
-      [(< 1 n)
-       (draw (/ n 2))
-       (tprompt (turn/radians (/ pi 3))
-                (fernd (/ n 2) -))
-       (tprompt (turn/radians (- (/ pi 3)))
-                (fernd (/ n 2) +))
-       (draw (/ n 2))
-       (turn/radians (sign d))
-       (fernd (- n 1) sign)]
-      [else (void)]))
-  (fernd n +))
-
-(define (gapped-lines)
-  (define gaps 5)
-  (define lines 3)
-  (tprompt
-   (turn/radians (/ pi 2))
-   (spaced-turtles lines)
-   (turn/radians (- (/ pi 2)))
-   (draw (* 4 (expt 2 gaps))))
-  (tprompt
-   (spaced-turtles gaps)
-   (turn/radians (/ pi 2))
-   (erase (* 4 (expt 2 lines)))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/turtle-test.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/turtle-test.rkt
deleted file mode 100644
index 206e10a51e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/turtle-test.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-(module turtle-test mzscheme
-  (require mred
-           mzlib/class
-           mzlib/math
-           "turtle-examples.rkt"
-           "turtles.rkt")
-
-  (module test racket/base)
-
-  (define frame (make-object frame% "Turtle Examples"))
-  
-  (define options
-    `(("Triangle" ,(lambda () (regular-poly 3 100)))
-      ("Hexagons" ,(lambda () (regular-polys 6 10)))
-      ("Spokes" ,spokes)
-      ("Spyro Gyra" ,spyro-gyra)
-      ("Neato" ,neato)
-      ("Graphics BExam" ,(lambda () 
-                           (turn/radians (/ pi 4))
-                           (move -150)
-                           (turn/radians (- (/ pi 4)))
-                           (graphics-bexam)))
-      ("Sierpinski (split)" ,(lambda () (sierp sierp-size)))
-      ("Sierpinski (no split)" ,(lambda () (sierp-nosplit sierp-size)))
-      ("Koch (split)" ,(lambda () (koch-split koch-size)))
-      ("Koch (no split)" ,(lambda () (koch-draw koch-size)))
-      ("Lorenz Attractor" ,lorenz1)
-      ("Peano" ,(lambda () (peano-position-turtle) (peano peano-size)))
-      ("Fern" ,(lambda () (turn/radians (/ pi 2)) (move -100) (fern1 fern-size)))
-      ("Gapped Lines" ,(lambda () (gapped-lines)))))
-  
-  (for-each (lambda (test) 
-              (send
-               (make-object button% 
-                 (car test)
-                 frame
-                 (lambda x 
-                   (turtles #t)
-                   (clear)
-                   (yield)
-                   ((cadr test))))
-               stretchable-width #t))
-            options)
-  
-  (make-object grow-box-spacer-pane% frame)
-  
-  (send frame show #t))
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/turtles.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/turtles.rkt
deleted file mode 100644
index e0b0ea5986..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/turtles.rkt
+++ /dev/null
@@ -1,469 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base
-         (for-syntax racket/base)
-         racket/class)
-
-(provide turtles
-         clear home
-         turn turn/radians
-         move move-offset
-         draw draw-offset
-         erase erase-offset
-         
-         save-turtle-bitmap
-         
-         turtle-window-size
-         
-         split split* tprompt)
-
-(define turtles:window #f)
-(define turtles:shown? #f)
-
-(define pi 3.141592653589793)
-(define pi/2 (/ pi 2))
-
-(define icon-pen (send the-pen-list find-or-create-pen "SALMON" 1 'solid))
-(define icon-brush (send the-brush-list find-or-create-brush "SALMON" 'solid))
-(define blank-pen (send the-pen-list find-or-create-pen "BLACK" 1 'transparent))
-(define w-pen (send the-pen-list find-or-create-pen "white" 2 'solid))
-(define b-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-
-(define show-turtle-icons? #t)
-
-;; turtle-style : (union 'triangle 'line 'empty)
-(define turtle-style 'triangle)
-
-(define plot-window%
-  (class frame% 
-    (init-field name width height)
-    
-    (define bitmap (make-bitmap width height))      
-    
-    (inherit show)
-    (define memory-dc (new bitmap-dc%))
-    (define pl (make-object point% 0 0))
-    (define pr (make-object point% 0 0))
-    (define ph (make-object point% 0 0))
-    (define points (list pl pr ph))
-    
-    (define/public (get-canvas) canvas)
-    (define/private (draw-turtle-icons)
-      (case turtle-style
-        [(triangle line)
-         (flatten (lambda (x) x))
-         (let* ([dc (send canvas get-dc)]
-                [proc
-                 (if (eq? turtle-style 'line)
-                     (lambda (turtle)
-                       (let ([x (turtle-x turtle)]
-                             [y (turtle-y turtle)]
-                             [theta (turtle-angle turtle)]
-                             [size 2])
-                         (send dc draw-line
-                               x y
-                               (+ x (* size (cos theta)))
-                               (+ y (* size (sin theta))))))
-                     (lambda (turtle)
-                       (let* ([x (turtle-x turtle)]
-                              [y (turtle-y turtle)]
-                              [theta (turtle-angle turtle)]
-                              [long-size 20]
-                              [short-size 7]
-                              [l-theta (+ theta pi/2)]
-                              [r-theta (- theta pi/2)])
-                         (send ph set-x (+ x (* long-size (cos theta))))
-                         (send ph set-y (+ y (* long-size (sin theta))))
-                         (send pl set-x (+ x (* short-size (cos l-theta))))
-                         (send pl set-y (+ y (* short-size (sin l-theta))))
-                         (send pr set-x (+ x (* short-size (cos r-theta))))
-                         (send pr set-y (+ y (* short-size (sin r-theta))))
-                         (send dc draw-polygon points))))])
-           (if (eq? turtle-style 'line)
-               (send dc set-pen icon-pen)
-               (begin
-                 (send dc set-pen blank-pen)
-                 (send dc set-brush icon-brush)))
-           (for-each proc turtles-state)
-           (send dc set-pen b-pen))]
-        [else
-         (void)]))
-    
-    (define/public (clear)
-      (send memory-dc clear)
-      (send canvas refresh))
-    
-    (send memory-dc set-bitmap bitmap)
-    (send memory-dc clear)
-    (send memory-dc set-smoothing 'smoothed)
-    (super-new [label name] [width width] [height height])
-  
-    (define/public (on-menu-command op) (turtles #f))
-    
-    (define menu-bar (make-object menu-bar% this))
-    (define file-menu (make-object menu% "&File" menu-bar))
-    (new menu-item%
-         [label "&Print"]
-         [parent file-menu]
-         [callback (lambda (_1 _2) (print))]
-         [shortcut #\p])
-    (new menu-item%
-         [label "&Close"]
-         [parent file-menu]
-         [callback (lambda (_1 _2) (turtles #f))]
-         [shortcut #\w])
-    
-    (define/public (save-turtle-bitmap fn type)
-      (send bitmap save-file fn type))
-    
-    (define t-canvas% 
-      (class canvas%
-        (inherit get-dc)
-        (define/override (on-paint)
-          (define dc (get-dc))
-          (send dc set-smoothing 'aligned)
-          (send dc clear)
-          (send dc draw-bitmap (send memory-dc get-bitmap) 0 0)
-          (draw-turtle-icons))
-        (super-new)))
-    (define canvas (make-object t-canvas% this))
-    (define dc (send canvas get-dc))
-    
-    (define/public (wipe-line a b c d)
-      (send memory-dc set-pen w-pen)
-      (send dc set-pen w-pen)
-      (send memory-dc draw-line a b c d)
-      (send dc draw-line a b c d)
-      (send memory-dc set-pen b-pen)
-      (send dc set-pen b-pen))
-    (define/public (draw-line a b c d)
-      (send memory-dc draw-line a b c d)
-      (send dc draw-line a b c d))
-    
-    (send canvas min-width width)
-    (send canvas min-height height)
-    (send this clear)))
-
-(define turtle-window-size
-  (let-values ([(w h) (get-display-size)]
-               [(user/client-offset) 65]
-               [(default-size) 800])
-    (min default-size
-         (- w user/client-offset)
-         (- h user/client-offset))))
-
-(define-struct turtle (x y angle))
-                                        ; x : int
-                                        ; y: int
-                                        ; angle : int
-
-(define-struct cached (turtles cache))
-                                        ; turtles : (list-of turtle)
-                                        ; cache : turtle -> turtle
-
-(define-struct tree (children))
-                                        ; children : (list-of cached)
-
-(define clear-turtle (make-turtle (/ turtle-window-size 2)
-                                  (/ turtle-window-size 2) 0))
-
-;; turtles-state is either a
-;;    - (list-of turtle) or
-;;    - tree 
-(define turtles-state (list clear-turtle))
-
-;; the cache contains a turtle-offset, which is represented
-;; by a turtle -- but it is a delta not an absolute.
-(define empty-cache (make-turtle 0 0 0))
-(define turtles-cache empty-cache)
-
-(define init-error (lambda _ (error 'turtles "Turtles not initialized. Evaluate (turtles).")))
-(define inner-line init-error)
-(define inner-wipe-line init-error)
-(define inner-clear-window init-error)
-(define inner-save-turtle-bitmap init-error)
-
-(define line
-  (lambda (a b c d)
-    (set! lines-in-drawing (cons (make-draw-line a b c d) lines-in-drawing))
-    (inner-line a b c d)
-    (update-icon)))
-(define do-wipe-line
-  (lambda (a b c d)
-    (set! lines-in-drawing (cons (make-wipe-line a b c d) lines-in-drawing))
-    (inner-wipe-line a b c d)
-    (update-icon)))
-
-(define clear-window (lambda () (inner-clear-window)))
-(define save-turtle-bitmap (lambda (x y) (inner-save-turtle-bitmap x y)))
-
-(define (turtles [x #t])
-  (set! turtles:shown? x)
-  (unless turtles:window
-    (set! turtles:window
-          (make-object plot-window%
-            "Turtles"
-            turtle-window-size
-            turtle-window-size))
-    (set! inner-line (lambda x (send turtles:window draw-line . x)))
-    (set! inner-wipe-line (lambda x (send turtles:window wipe-line . x)))
-    (set! inner-clear-window (lambda x (send turtles:window clear . x)))
-    (set! inner-save-turtle-bitmap (lambda x (send turtles:window save-turtle-bitmap . x))))
-  (send turtles:window show x)
-  (send turtles:window get-canvas)
-  (void))
-
-(define (clear) 
-  (set! turtles-cache empty-cache)
-  (set! turtles-state (list clear-turtle))
-  (set! lines-in-drawing null)
-  (clear-window))
-
-(define (update-icon)
-  (when turtles:window
-    (send turtles:window refresh)))
-
-(define (home)
-  (set! turtles-cache empty-cache)
-  (set! turtles-state (list clear-turtle))
-  (update-icon))
-
-;; cache elements:
-(define-struct c-forward (distance))
-(define-struct c-turn (angle))
-(define-struct c-draw (distance))
-(define-struct c-offset (x y))
-
-;; combines a cache-element and a turtle-offset.
-;; turtle-offsets are represented as turtles, 
-;; however they are deltas, not absolutes.
-(define (combine entry cache)
-  (cond 
-    [(c-forward? entry)
-     (let* ([n (c-forward-distance entry)]
-            [angle (turtle-angle cache)]
-            [x (turtle-x cache)]
-            [y (turtle-y cache)]
-            [newx (+ x (* n (cos angle)))]
-            [newy (+ y (* n (sin angle)))])
-       (make-turtle newx newy angle))]
-    [(c-offset? entry)
-     (let* ([tx (turtle-x cache)]
-            [ty (turtle-y cache)]
-            [newx (+ tx (c-offset-x entry))]
-            [newy (+ ty (c-offset-y entry))])
-       (make-turtle newx newy 
-                    (turtle-angle cache)))]
-    [(c-turn? entry)
-     (make-turtle (turtle-x cache)
-                  (turtle-y cache)
-                  (- (turtle-angle cache)
-                     (c-turn-angle entry)))]
-    [else
-     (error 'turtles-cache "illegal entry in cache: ~a" entry)]))
-
-;; this applies an offset to a turtle.
-;; an offset is a turtle, representing what would happen 
-;;    if the turtle had started at zero.
-(define apply-cache
-  (lambda (offset)
-    (let ([x (turtle-x offset)]
-          [y (turtle-y offset)]
-          [offset-angle (turtle-angle offset)])
-      (lambda (turtle)
-        (let* ([angle (turtle-angle turtle)])
-          (let* ([c (cos angle)]
-                 [s (sin angle)]
-                 [rx (- (* x c) (* y s))]
-                 [ry (+ (* y c) (* x s))])
-            (make-turtle (+ rx (turtle-x turtle))
-                         (+ ry (turtle-y turtle))
-                         (+ offset-angle angle))))))))
-
-(define flatten
-  (lambda (at-end)
-    (letrec ([walk-turtles
-              (lambda (turtles cache list)
-                (cond
-                 [(tree? turtles)
-                  (let ([children (tree-children turtles)]
-                        [ac (apply-cache cache)])
-                    (foldl (lambda (child list)
-                             (walk-turtles (cached-turtles child)
-                                           (ac (cached-cache child))
-                                           list))
-                           list
-                           children))]
-                 [else
-                  (let ([f (compose at-end (apply-cache cache))])
-                    (foldl (lambda (t l) (cons (f t) l)) list turtles))]))])
-      (set! turtles-state (walk-turtles turtles-state turtles-cache null))
-      (set! turtles-cache empty-cache))))
-
-(define draw/erase
-  (lambda (doit)
-    (lambda (n)
-      (flatten
-       (lambda (turtle)
-         (let* ([x (turtle-x turtle)]
-                [y (turtle-y turtle)]
-                [angle (turtle-angle turtle)]
-                [d (if (zero? n) 0 (sub1 (abs n)))]
-                [res (if (< n 0) (- d) d)]
-                [c (cos angle)]
-                [s (sin angle)]
-                [drawx (+ x (* res c))]
-                [drawy (+ y (* res s))]
-                [newx (+ x (* n c))]
-                [newy (+ y (* n s))])
-           (unless (zero? n)
-             (doit x y drawx drawy))
-           (make-turtle newx newy angle)))))))
-
-(define draw (draw/erase (lambda (a b c d) (line a b c d))))
-(define erase (draw/erase (lambda (a b c d) (do-wipe-line a b c d))))
-
-(define move
-  (lambda (n)
-    (set! turtles-cache (combine (make-c-forward n) turtles-cache))
-    (update-icon)))
-
-(define turn/radians
-  (lambda (d)
-    (set! turtles-cache (combine (make-c-turn d) turtles-cache))
-    (update-icon)))
-
-(define turn
-  (lambda (c)
-    (turn/radians (* (/ c 360) 2 pi))))
-
-(define move-offset
-  (lambda (x y)
-    (set! turtles-cache (combine (make-c-offset x y) turtles-cache))
-    (update-icon)))
-
-(define erase/draw-offset
-  (lambda (doit)
-    (lambda (x y)
-      (flatten
-       (lambda (turtle)
-         (let* ([tx (turtle-x turtle)]
-                [ty (turtle-y turtle)]
-                [newx (+ tx x)]
-                [newy (+ ty y)])
-           (doit tx ty newx newy)
-           (make-turtle newx newy (turtle-angle turtle))))))))
-
-(define erase-offset (erase/draw-offset (lambda (a b c d) (do-wipe-line a b c d))))
-(define draw-offset (erase/draw-offset (lambda (a b c d) (line a b c d))))
-
-(define splitfn
-  (lambda (e)
-    (let ([t turtles-state]
-          [c turtles-cache])
-      (e)
-      (set! turtles-state
-            (make-tree (list (make-cached turtles-state turtles-cache)
-                             (make-cached t c))))
-      (set! turtles-cache empty-cache)
-      (update-icon))))
-
-(define split*fn
-  (lambda (es)
-    (let ([t turtles-state]
-          [c turtles-cache]
-          [l '()])
-      (for-each (lambda (x)
-                  (x)
-                  (set! l (cons (make-cached turtles-state turtles-cache) l))
-                  (set! turtles-state t)
-                  (set! turtles-cache c))
-                es)
-      (set! turtles-cache empty-cache)
-      (set! turtles-state (make-tree l))
-      (update-icon))))
-
-
-(define tpromptfn
-  (lambda (thunk)
-    (let ([save-turtles-cache #f]
-          [save-turtles-state #f])
-      (dynamic-wind
-          (lambda ()
-            (set! save-turtles-cache turtles-cache)
-            (set! save-turtles-state turtles-state))
-          (lambda ()
-            (thunk))
-          (lambda ()
-            (set! turtles-cache save-turtles-cache)
-            (set! turtles-state save-turtles-state)
-            (update-icon))))))
-
-
-(define-struct drawing-line (x1 y1 x2 y2))
-(define-struct (wipe-line drawing-line) ())
-(define-struct (draw-line drawing-line) ())
-(define lines-in-drawing null)
-
-(define (draw-lines-into-dc dc)
-  (for ([line (in-list lines-in-drawing)])
-    (cond
-      [(wipe-line? line) (send dc set-pen w-pen)]
-      [(draw-line? line) (send dc set-pen b-pen)])
-    (send dc draw-line
-          (drawing-line-x1 line)
-          (drawing-line-y1 line)
-          (drawing-line-x2 line)
-          (drawing-line-y2 line))))
-
-;; used to test printing
-(define (display-lines-in-drawing)
-  (let* ([lines-in-drawing-canvas%
-          (class canvas% 
-            (init-field frame)
-            (inherit get-dc)
-            (define/override (on-paint)
-              (draw-lines-into-dc (get-dc)))
-            (super-new [parent frame]))]
-         [frame (make-object frame% "Lines in Drawing")]
-         [canvas (make-object lines-in-drawing-canvas% frame)])
-    (send frame show #t)))
-
-
-(define (print)
-  (case (system-type)
-    [(macosx windows)
-     (let ([dc (make-object printer-dc%)])
-       (send dc start-doc "Turtles")
-       (send dc start-page)
-       (draw-lines-into-dc dc)
-       (send dc end-page)
-       (send dc end-doc))]
-    [(unix)
-     (let ([dc (make-object post-script-dc%)])
-       (send dc start-doc "Turtles")
-       (send dc start-page)
-       (draw-lines-into-dc dc)
-       (send dc end-page)
-       (send dc end-doc))]
-    [else
-     (message-box "Turtles"
-                  "Printing is not supported on this platform")]))
-
-
-(define-syntaxes (split)
-  (lambda (x)
-    (syntax-case x ()
-      ((_ args ...)
-       (syntax (splitfn (lambda () args ...)))))))
-
-(define-syntaxes (split*)
-  (syntax-rules ()
-    [(_ e0 e ...)
-     (split*fn (list (lambda () e0) (lambda () e) ...))]))
-
-(define-syntaxes (tprompt)
-  (lambda (x)
-    (syntax-case x ()
-      ((_ e1 ...)
-       (syntax (tpromptfn (lambda () e1 ...)))))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles-examples.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles-examples.rkt
deleted file mode 100644
index 499a71969b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles-examples.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-(module value-turtles-examples mzscheme
-  (require "value-turtles.rkt"
-           mzlib/etc
-           mzlib/math)
-
-  (provide regular-poly regular-polys radial-turtles spaced-turtles 
-           spokes spyro-gyra neato)
-  
-  (define (regular-poly sides radius tv)
-    (local [(define theta (/ (* 2 pi) sides))
-            (define side-len (* 2 radius (sin (/ theta 2))))
-            (define (draw-sides n tv)
-              (cond
-                [(zero? n) tv]
-                [else
-                 (draw-sides
-                  (sub1 n)
-                  (turn/radians
-                   theta
-                   (draw side-len tv)))]))]
-      (merge
-       (clean
-        (draw-sides
-         sides
-         (turn/radians
-          (/ (+ pi theta) 2)
-          (move
-           radius
-           tv))))
-       tv)))
-  
-  (define (regular-polys sides s tv)
-    (local [(define (make-polys n tv)
-              (cond
-                [(zero? n) tv]
-                [else
-                 (make-polys 
-                  (sub1 n)
-                  (regular-poly 
-                   sides 
-                   (* n 5)
-                   tv))]))]
-      (make-polys sides tv)))
-  
-  (define (radial-turtles n tv)
-    (cond
-      [(zero? n) tv]
-      [else
-       (radial-turtles
-        (sub1 n)
-        (merge 
-         tv
-         (turn/radians 
-          (/ pi (expt 2 (sub1 n)))
-          tv)))]))
-  
-  (define (spaced-turtles n tv)
-    (cond
-      [(zero? n) tv]
-      [else
-       (spaced-turtles 
-        (sub1 n)
-        (merge
-         tv
-         (move 
-          (expt 2 (+ n 1))
-          tv)))]))
-  
-  (define (spokes turtles)
-    (draw 
-     10
-     (turn/radians 
-      (/ pi 2)
-      (spaced-turtles
-       5
-       (radial-turtles 
-        4
-        turtles)))))
-  
-  (define (spyro-gyra turtles)
-    (regular-poly 
-     3
-     100
-     (radial-turtles 
-      4
-      turtles)))
-  
-  (define (neato turtles)
-    (local [(define (spiral d t turtles)
-              (cond
-                [(<= 1 d)
-                 (spiral 
-                  (- d 1)
-                  t               
-                  (turn/radians 
-                   t
-                   (draw 
-                    d
-                    turtles)))]
-                [else turtles]))]
-      (spiral 
-       30 
-       (/ pi 12)
-       (radial-turtles
-        4
-        turtles)))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles-test.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles-test.rkt
deleted file mode 100644
index 6993d5968f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles-test.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-(module value-turtles-test mzscheme
-  (require "value-turtles-examples.rkt"
-           "value-turtles.rkt"
-           mred
-           mzlib/class)
-
-  (module test racket/base)
-  
-  (define-syntax (test stx)
-    (syntax-case stx ()
-      [(_ body)
-       (with-syntax ([body-string (format "~s" (syntax-object->datum (syntax body)))])
-         (syntax
-          (let* ([f (make-object frame% "frame" #f 600 600)]
-                 [t (make-object text%)]
-                 [mb (make-object menu-bar% f)]
-                 [fm (make-object menu% "File" mb)])
-            (send t insert body-string)
-            (send t change-style (make-object style-delta% 'change-family 'modern)
-                  0 (send t last-position))
-            (send t insert #\newline)
-            (make-object menu-item% "Copy" fm (lambda x (send t copy)) #\c)
-            (make-object editor-canvas% f t)
-            (send f show #t)
-            (with-handlers ([exn:fail?
-                             (lambda (x)
-                               (send t insert (exn-message x))
-                               (send t insert #\newline))])
-              (send t insert body)
-              (send t insert #\newline)))))]))
-  
-  (test (regular-poly 5 30 (turtles 150 150)))
-  (test (regular-polys 5 30 (turtles 150 150)))
-  (test (draw 20 (radial-turtles 5 (turtles 150 150))))
-  (test (draw 20 (turn 90 (spaced-turtles 5 (turtles 150 150 10 75 0)))))
-  (test (spokes (turtles 200 200)))
-  (test (spyro-gyra (turtles 200 200)))
-  (test (neato (turtles 400 400))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles.rkt
deleted file mode 100644
index 2f5ba93cd2..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles.rkt
+++ /dev/null
@@ -1,352 +0,0 @@
-(module value-turtles mzscheme
-  (require mzlib/math
-           mzlib/class
-           mred
-           (all-except mzlib/list merge)
-           mzlib/struct)
-
-  (provide turtles move draw turn turn/radians merge clean turtles?)
-
-  ;; a turtle is:
-  ;; - (make-turtle x y theta)
-  ;; where x, y, and theta are numbers
-  (define-struct turtle (x y angle))
-  (define turtle->vector (make-->vector turtle))
-  
-  (define-struct offset (x y angle))
-  (define offset->vector (make-->vector offset))
-
-  ;; a lines is:
-  ;;   - (list-of line)
-  (define-struct line (x1 y1 x2 y2 black?))
-  (define line->vector (make-->vector line))
-  
-  ;; a turtles is either
-  ;;  - (make-tmerge (list-of turtles/offset))
-  ;;  - (list-of turtle)
-  (define-struct tmerge (turtles))
-  (define tmerge->vector (make-->vector tmerge))
-
-  ;; a turtles/offset is
-  ;; - (make-turtles/offset turtles offset)
-  (define-struct turtles/offset (turtles offset))
-  (define turtles/offset->vector (make-->vector turtles/offset))
-
-  (define saved-turtle-snip% #f)
-  (define saved-turtles #f)
-  (define (vec->struc sexp)
-    (cond
-      [(pair? sexp) (cons (vec->struc (car sexp)) (vec->struc (cdr sexp)))]
-      [(vector? sexp)
-       (apply (case (vector-ref sexp 0)
-                [(struct:turtle) make-turtle]
-                [(struct:offset) make-offset]
-                [(struct:line) make-line]
-                [(struct:merge) make-tmerge]
-                [(struct:turtles/offset) make-turtles/offset]
-                [else (error 'vec->struc "unknown structure: ~s\n" sexp)])
-              (map vec->struc (vector-ref sexp 1)))]
-      [else sexp]))
-  
-  (define (struc->vec sexp)
-    (cond
-      [(pair? sexp) (cons (struc->vec (car sexp)) (struc->vec (cdr sexp)))]
-      [(turtle? sexp) (vector 'struct:turtle (map struc->vec (vector->list (turtle->vector sexp))))]
-      [(offset? sexp) (vector 'struct:offset (map struc->vec (vector->list (offset->vector sexp))))]
-      [(line? sexp) (vector 'struct:line (map struc->vec (vector->list (line->vector sexp))))]
-      [(tmerge? sexp) (vector 'struct:tmerge (map struc->vec (vector->list (tmerge->vector sexp))))]
-      [(turtles/offset? sexp) (vector 'struct:turtles/offset (map struc->vec (vector->list (turtles/offset->vector sexp))))]
-      [else sexp]))
-  
-  (define prim-read read)
-  (define prim-write write)
-
-  (define turtle-snip-class%
-    (class snip-class% ()
-      (define/override (read in-stream)
-        (unless saved-turtles
-          (error 'turtles "click execute before running the turtles"))
-        (let ([str (send in-stream get-string #f)])
-          (if (or (not str)
-                  (string=? "" str))
-              (saved-turtles 150 150)
-              (let ([sexp (vec->struc (prim-read (open-input-string str)))])
-                (make-object saved-turtle-snip%
-                  (first sexp)
-                  (second sexp)
-                  (third sexp)
-                  (fourth sexp)
-                  (fifth sexp))))))
-      (super-instantiate ())))
-  
-  (define turtle-snipclass (make-object turtle-snip-class%))
-  
-  (send turtle-snipclass set-classname "drscheme:turtle-snip")
-  (send turtle-snipclass set-version 1)
-  (send (get-the-snip-class-list) add turtle-snipclass)
-  
-  (define pi/2 (/ pi 2))
-  (define (set-box/f b v) (when (box? b) (set-box! b v)))
-  (define icon-color "PURPLE")
-  (define icon-pen (send the-pen-list find-or-create-pen icon-color 1 'xor))
-  (define icon-brush (send the-brush-list find-or-create-brush icon-color 'xor))
-  (define blank-pen (send the-pen-list find-or-create-pen "BLACK" 1 'transparent))
-  (define w-pen (send the-pen-list find-or-create-pen "white" 1 'solid))
-  (define b-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-  (define w-brush (send the-brush-list find-or-create-brush "WHITE" 'solid))
-  
-  (define empty-cache (make-offset 0 0 0))
-  
-  (define turtle-snip%
-    (class snip% 
-      (init-field width height turtles cache lines)
-      (define/public (get-lines) lines)
-      (define/public (get-turtles) turtles)
-      (define/public (get-cache) cache)
-      (define/public (get-width) width)
-      (define/public (get-height) height)
-      
-      (define turtle-style 'triangle)
-      (define bitmap #f)
-      
-      [define pl (make-object point% 0 0)]
-      [define pr (make-object point% 0 0)]
-      [define ph (make-object point% 0 0)]
-      [define points (list pl pr ph)]
-      (define (flip-icons dc dx dy)
-        (case turtle-style
-          [(triangle line)
-           (let* ([proc
-                   (if (eq? turtle-style 'line)
-                       (lambda (turtle)
-                         (let ([x (turtle-x turtle)]
-                               [y (turtle-y turtle)]
-                               [theta (turtle-angle turtle)]
-                               [size 2])
-                           (send dc draw-line
-                                 (+ dx x)
-                                 (+ dy y)
-                                 (+ dx x (* size (cos theta)))
-                                 (+ dy y (* size (sin theta))))))
-                       (lambda (turtle)
-                         (let* ([x (turtle-x turtle)]
-                                [y (turtle-y turtle)]
-                                [theta (turtle-angle turtle)]
-                                [long-size 20]
-                                [short-size 7]
-                                [l-theta (+ theta pi/2)]
-                                [r-theta (- theta pi/2)])
-                           (send ph set-x (+ dx x (* long-size (cos theta))))
-                           (send ph set-y (+ dy y (* long-size (sin theta))))
-                           (send pl set-x (+ dx x (* short-size (cos l-theta))))
-                           (send pl set-y (+ dy y (* short-size (sin l-theta))))
-                           (send pr set-x (+ dx x (* short-size (cos r-theta))))
-                           (send pr set-y (+ dy y (* short-size (sin r-theta))))
-                           (send dc draw-polygon points))))])
-             (if (eq? turtle-style 'line)
-                 (send dc set-pen icon-pen)
-                 (begin
-                   (send dc set-pen blank-pen)
-                   (send dc set-brush icon-brush)))
-             (for-each proc turtles)
-             (send dc set-pen b-pen))]
-          [else
-           (void)]))
-      
-      (define (construct-bitmap)
-        (unless bitmap
-          (flatten)
-          (set! bitmap (make-object bitmap% width height))
-          (let* ([bitmap-dc (make-object bitmap-dc% bitmap)])
-            (send bitmap-dc clear)
-            (for-each (lambda (line)
-                        (send bitmap-dc set-pen (if (line-black? line) b-pen w-pen))
-                        (send bitmap-dc draw-line
-                              (line-x1 line)
-                              (line-y1 line)
-                              (line-x2 line)
-                              (line-y2 line)))
-                      lines))))
-      
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (construct-bitmap)
-        (let ([old-pen (send dc get-pen)]
-              [old-brush (send dc get-brush)]
-              [old-clip (send dc get-clipping-region)])
-          (send dc set-pen b-pen)
-          (send dc set-brush w-brush)
-          (send dc draw-rectangle x y (+ width 2) (+ height 2))
-          (send dc set-clipping-rect (+ x 1) (+ y 1) width height)
-          (send dc draw-bitmap bitmap (+ x 1) (+ y 1))
-          (flip-icons dc (+ x 1) (+ y 1))
-          (send dc set-pen old-pen)
-          (send dc set-brush old-brush)
-          (send dc set-clipping-region old-clip)))
-      (define/override (get-extent dc x y w h descent space lspace rspace)
-        (set-box/f w (+ width 2))
-        (set-box/f h (+ height 2))
-        (set-box/f descent 0)
-        (set-box/f space 0)
-        (set-box/f lspace 0)
-        (set-box/f rspace 0))
-      
-      (define/override (copy)
-        (make-object turtle-snip% width height turtles cache lines))
-      (define/override (write stream-out)
-        (let ([p (open-output-string)])
-          (prim-write (struc->vec (list width height turtles cache lines)) p)
-          (send stream-out put (get-output-string p))))
-      
-      (define/public (flatten)
-        (letrec ([walk-turtles
-                  (lambda (turtles offset sofar)
-                    (cond
-                      [(tmerge? turtles)
-                       (let ([turtles/offsets (tmerge-turtles turtles)]
-                             [ac (apply-offset cache)])
-                         (foldl (lambda (turtles/offset sofar)
-                                  (walk-turtles (turtles/offset-turtles turtles/offset)
-                                                (combine-offsets
-                                                 offset
-                                                 (turtles/offset-offset turtles/offset))
-                                                sofar))
-                                sofar
-                                turtles/offsets))]
-                      [else
-                       (let ([f (apply-offset offset)])
-                         (cond
-                           [(null? sofar)
-                            (map f turtles)]
-                           [else
-                            (foldl (lambda (t l) (cons (f t) l)) sofar turtles)]))]))])
-          (set! turtles (walk-turtles turtles cache null))
-          (set! cache empty-cache)))
-
-      (define (move-turtle dist)
-        (lambda (turtle)
-          (let ([x (turtle-x turtle)]
-                [y (turtle-y turtle)]
-                [theta (turtle-angle turtle)])
-            (make-turtle
-             (+ x (* dist (cos theta)))
-             (+ y (* dist (sin theta)))
-             theta))))
-
-      (define/public (draw-op d)
-        (flatten)
-        (let ([build-line
-               (lambda (turtle)
-                 (let ([x (turtle-x turtle)]
-                       [y (turtle-y turtle)]
-                       [theta (turtle-angle turtle)])
-                   (make-line
-                    x
-                    y
-                    (+ x (* d (cos theta)))
-                    (+ y (* d (sin theta)))
-                    #t)))])
-          (make-object turtle-snip%
-            width
-            height
-            (map (move-turtle d) turtles)
-            cache
-            (foldl (lambda (turtle lines) (cons (build-line turtle) lines))
-                   lines
-                   turtles))))
-      (define/public (merge-op tvs)
-        (make-object turtle-snip%
-          width
-          height
-          (make-tmerge (map (lambda (tv) (make-turtles/offset
-                                          (send tv get-turtles)
-                                          (send tv get-cache)))
-                            (cons this tvs)))
-          empty-cache
-          lines))
-
-      (define/public (move-op n)
-        (make-object turtle-snip%
-          width
-          height
-          turtles
-          (let* ([angle (offset-angle cache)]
-                 [x (offset-x cache)]
-                 [y (offset-y cache)]
-                 [newx (+ x (* n (cos angle)))]
-                 [newy (+ y (* n (sin angle)))])
-            (make-offset newx newy angle))
-          lines))
-      (define/public (turn-op d)
-        (make-object turtle-snip%
-          width
-          height
-          turtles
-          (make-offset (offset-x cache)
-                       (offset-y cache)
-                       (- (offset-angle cache)
-                          d))
-          lines))
-      (define/public (clean-op)
-        (flatten)
-        (make-object turtle-snip%
-          width
-          height
-          null
-          empty-cache
-          lines))
-      (super-instantiate ())
-      (inherit set-snipclass)
-      (set-snipclass turtle-snipclass)))
-  
-  (define apply-offset
-    (lambda (offset)
-      (let ([x (offset-x offset)]
-            [y (offset-y offset)]
-            [offset-angle (offset-angle offset)])
-        (lambda (turtle)
-          (let* ([angle (turtle-angle turtle)])
-            (let* ([c (cos angle)]
-                   [s (sin angle)]
-                   [rx (- (* x c) (* y s))]
-                   [ry (+ (* y c) (* x s))])
-              (make-turtle (+ rx (turtle-x turtle))
-                           (+ ry (turtle-y turtle))
-                           (+ offset-angle angle))))))))
-  
-  (define combine-offsets
-    (lambda (offset1 offset2)
-      (let ([answer ((apply-offset offset1)
-                     (make-turtle
-                      (offset-x offset2)
-                      (offset-y offset2)
-                      (offset-angle offset2)))])
-        (make-offset
-         (turtle-x answer)
-         (turtle-y answer)
-         (turtle-angle answer)))))
-  
-  (define turtles
-    (case-lambda
-      [(width height x y theta)
-       (make-object turtle-snip%
-         width height
-         (list (make-turtle x y theta))
-         empty-cache
-         null)]
-      [(width height)
-       (turtles width height 
-                (quotient width 2)
-                (quotient height 2)
-                0)]))
-  
-  (define (turtles? x) (is-a? x turtle-snip%))
-  
-  (define (move d tv) (send tv move-op d))
-  (define (draw d tv) (send tv draw-op d))
-  (define (turn/radians d tv) (send tv turn-op d))
-  (define (turn d tv) (turn/radians (* (/ d 360) 2 pi) tv))
-  (define (merge tv . tvs) (send tv merge-op tvs))
-  (define (clean tv) (send tv clean-op))
-  
-  (set! saved-turtle-snip% turtle-snip%)
-  (set! saved-turtles turtles))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/arrow-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/arrow-gui.rkt
deleted file mode 100644
index 9cc6acad57..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/arrow-gui.rkt
+++ /dev/null
@@ -1,85 +0,0 @@
-#lang scheme/gui
-
-(require htdp/error
-         htdp/big-draw
-         lang/prim
-         mzlib/etc
-         mzlib/class)
-
-(provide
- control ; modelT modelT modelT modelT -> true 
- view    ; X -> true
- connect ; -> Symbol
- )
-
-(define-higher-order-primitive connect connect/proc (left right up down))
-(define-primitive control control/proc)
-(define-primitive view view/proc)
-
-;; CONSTANTS ---------------------------------------------------------------
-(define MY-ICONS "/home/matthias/icons/")
-(define TITLE "Controller")
-(define COLLECT (collection-path "icons"))
-(define ARR "arrow.blue.~a.gif")
-
-;; LAYOUT CONSTRUCTION ----------------------------------------------------
-
-
-;; mk-image-constant : str (button% event% -> true) -> (panel% -> button%)
-;; to create a panel-parameterized button with a picture and a specific call-back 
-(define (mk-image-constant kind model)
-  (local ([define an-item
-            (make-object bitmap% (build-path COLLECT (format ARR kind)) 'gif)])
-    (lambda (panel)
-      (make-object button% an-item panel model))))
-
-;; make-button-table : 
-;;   panel% layout -> (listof (listof (union panel% button%)))
-;; to translate a layout table into a button table 
-;;   each button is controlled by (control a-bitmap)
-(define (make-button-table panel layout)
-  (local ((define (make-row a-row)
-            (local ((define row-panel (make-object horizontal-panel% panel))
-                    (define (make-item an-item)
-                      (if an-item (an-item row-panel)
-                          (let ([panel (make-object horizontal-panel% row-panel)])
-                            (send panel min-width 30)))))
-              (map make-item a-row))))
-    (map make-row layout)))
-
-(define frame (make-object frame% TITLE #f 10 10))
-(define panel (make-object vertical-panel% frame))
-(define hor (make-object horizontal-panel% panel '(border)))
-(define lab (make-object message% "Going where?" hor))
-(define msg (make-object message% "Nowhere" hor))
-
-;; X -> true
-;; to display s in the msg panel 
-(define (view/proc s)
-  (send msg set-label (format "~a" s))
-  true)
-
-;; WIRING THINGS UP    ----------------------------------------------------
-;; -> symbol
-;; to read out the current state of the msg field 
-(define (control/proc)
-  (string->symbol (send msg get-label)))
-
-;; modelT = (button% event% -> true)
-;; connect/proc : modelT modelT modelT modelT -> true
-(define (connect/proc left right up down)
-  (check-proc 'connect left 2 "'left' argument" "two arguments")
-  (check-proc 'connect right 2 "'right' argument" "two arguments")
-  (check-proc 'connect up 2 "'up' argument" "two arguments")
-  (check-proc 'connect down 2 "'down' argument" "two arguments")  
-  (local ((define LEFT-ARROW  (mk-image-constant "left"  left))
-          (define RIGHT-ARROW (mk-image-constant "right" right))
-          (define UP-ARROW    (mk-image-constant "up"    up))
-          (define DOWN-ARROW  (mk-image-constant "down"  down))
-          (define FOUR 
-            `( (,#f         ,UP-ARROW   ,#f)
-               (,LEFT-ARROW ,#f         ,RIGHT-ARROW)
-               (,#f         ,DOWN-ARROW ,#f) ))
-          (define layout (make-button-table frame FOUR)))
-    (send frame show true)
-    true))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/arrow.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/arrow.rkt
deleted file mode 100644
index 56ffcae8d5..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/arrow.rkt
+++ /dev/null
@@ -1,133 +0,0 @@
-#lang scheme/gui
-
-(require htdp/error
-         htdp/big-draw
-         lang/prim
-         mzlib/etc
-         mzlib/class)
-
-(provide
- control
- control-up-down
- control-left-right
- )
-
-(define-higher-order-primitive control-up-down control-up-down/proc 
-  (_ _ up-down draw))
-
-(define-higher-order-primitive control-left-right control-left-right/proc 
-  (_ _ left-right draw))
-
-(define-higher-order-primitive control control/proc 
-  (_ _ left-right up-down draw))  
-
-
-;; CONSTANTS ---------------------------------------------------------------
-(define MY-ICONS "/home/matthias/icons/")
-(define TITLE "Controller")
-
-(define (mk-image-constant kind)
-  (make-object bitmap%
-    (build-path (collection-path "icons") (format "arrow.~a.gif" kind)) 'gif))
-
-;(define LEFT-ARROW  (mk-image-constant "marble.left"))
-;(define RIGHT-ARROW (mk-image-constant "marble.right"))
-;(define UP-ARROW    (mk-image-constant "marble.up"))
-;(define DOWN-ARROW  (mk-image-constant "marble.down"))
-
-(define LEFT-ARROW  (mk-image-constant "blue.left"))
-(define RIGHT-ARROW (mk-image-constant "blue.right"))
-(define UP-ARROW    (mk-image-constant "blue.up"))
-(define DOWN-ARROW  (mk-image-constant "blue.down"))
-
-;; LAYOUT ------------------------------------------------------------------
-
-;; layout = (listof (listof (union #f bitmap%)))  
-
-(define FOUR 
-  `( (,#f         ,UP-ARROW   ,#f)
-     (,LEFT-ARROW ,#f         ,RIGHT-ARROW)
-     (,#f         ,DOWN-ARROW ,#f) ))
-
-(define UP-DOWN
-  `( (,UP-ARROW   )
-     (,DOWN-ARROW ) ))
-
-(define LEFT-RIGHT
-  `( (,LEFT-ARROW ,RIGHT-ARROW ) ))
-
-;; make-button-table : 
-;;   panel% layout (bitmap% -> (_ _ -> X))
-;;   -> 
-;;   (listof (listof (union panel% button%)))
-;; to translate a layout table into a button table 
-;;   each button is controlled by (control a-bitmap)
-(define (make-button-table panel control layout)
-  (define (make-row a-row)
-    (define row-panel (make-object horizontal-panel% panel))
-    (define (make-item an-item)
-      (if an-item
-          (make-object button% an-item row-panel (control an-item))
-          (let ([panel (make-object horizontal-panel% row-panel)])
-            (send panel min-width 30))))
-    ;; --- 
-    (map make-item a-row))
-  ;; --- 
-  (map make-row layout))
-
-;; GUI ---------------------------------------------------------------------
-
-;; make-controller :
-;;   symbol layout number X (number X -> true) (number X -> true) (X -> true)-> void
-;; effect: create a left-right controller that invokes move on delta
-(define (make-controller tag layout shape delta left-right-action up-down-action draw-shape)
-  (check-arg  tag
-              (and (number? delta) (integer? delta) (>= delta 1))
-              "positive integer"
-              '2nd
-              delta)
-  (check-proc tag left-right-action 2 "move-left-right" "two arguments")
-  (check-proc tag up-down-action 2 "move-up-down" "two arguments")
-  (check-proc tag draw-shape 1 "draw" "one argument")
-  ;; --- 
-  (local ((define frame (make-object frame% TITLE #f 10 10))
-          (define panel (make-object vertical-panel% frame))
-          ;; control : bitmap% -> (_ _ -> void)
-          ;; to check which button was clicked 
-          (define (control an-item)
-            (lambda (x y)
-              ;; DESIGN DECISION:
-              ;; by handing over the number first, nesting the moves becomes easier
-              (evcase an-item
-                      (UP-ARROW
-                       (set! shape (up-down-action (- delta) shape)))
-                      (DOWN-ARROW
-                       (set! shape (up-down-action delta shape)))
-                      (LEFT-ARROW
-                       (set! shape (left-right-action (- delta) shape)))
-                      (RIGHT-ARROW
-                       (set! shape (left-right-action delta shape))))
-              (draw-shape shape))))
-    (make-button-table panel control layout)
-    (send frame show #t)
-    #t))
-
-;; EXPORTS:
-
-(define (void2 x y) (void))
-
-;; control-left-right/proc : XShape number (number XShape -> XShape) (XShape -> true) -> true
-;; effect: create a window from which a user can control L/R moves
-(define (control-left-right/proc shape delta lr draw)
-  (make-controller 'control-left-right LEFT-RIGHT shape delta lr void2 draw))
-
-;; control-up-down : X number (number X -> true) (X -> true) -> true
-;; effect: create a window from which a user can control U/D moves      
-(define (control-up-down/proc shape delta ud draw)
-  (make-controller 'control-up-down UP-DOWN shape delta void2 ud draw))
-
-;; control/proc : X number (number X -> true) (number X -> true) (X -> true) -> true
-;; effect: create a window from which a user can control moves
-(define (control/proc shape delta lr ud draw)
-  (make-controller 'control FOUR shape delta lr ud draw))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/asl/lang/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/asl/lang/reader.rkt
deleted file mode 100644
index 6aef136a77..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/asl/lang/reader.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang s-exp htdp/bsl/reader
-lang/htdp-advanced
-'(abbreviate-cons-as-list
-  read-accept-quasiquote
-  show-sharing)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/big-draw.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/big-draw.rkt
deleted file mode 100644
index 9bd6f3b021..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/big-draw.rkt
+++ /dev/null
@@ -1,329 +0,0 @@
-#lang scheme/gui
-
-(require htdp/error
-         htdp/draw-sig
-         lang/posn
-         lang/prim
-         mzlib/etc
-         mzlib/unit
-         mzlib/class
-         mred/mred-sig
-         mred/mred-unit
-         graphics/graphics-sig
-         graphics/graphics-posn-less-unit)
-
-(define-values/invoke-unit/infer
-  (export graphics^) 
-  (link standard-mred@ graphics-posn-less@))
-
-(provide-signature-elements graphics^)
-
-(define-primitive stop stop/proc)
-
-(define-primitive draw-solid-disk draw-solid-disk/proc)
-(define-primitive draw-circle draw-circle/proc)
-(define-primitive draw-solid-rect draw-solid-rect/proc)
-(define-primitive draw-solid-line draw-solid-line/proc)  
-
-(define-primitive clear-solid-disk clear-solid-disk/proc)
-(define-primitive clear-circle clear-circle/proc)
-(define-primitive clear-solid-rect clear-solid-rect/proc)
-(define-primitive clear-solid-line clear-solid-line/proc)  
-(define-primitive clear-all clear-all/proc)
-
-(define-primitive draw-solid-string draw-string/proc)
-(define-primitive clear-solid-string clear-string/proc)
-
-(define-primitive sleep-for-a-while sleep-for-a-while/proc)
-(define-primitive wait-for-mouse-click wait-for-mouse-click/proc)
-(define-primitive get-mouse-event get-mouse-event/proc)
-(define-primitive get-key-event get-key-event/proc)  
-
-(define-higher-order-primitive on-key-event on-key-event/proc (handle-event))
-(define-higher-order-primitive on-tick-event on-tick-event/proc (handle-tick))
-(define-primitive big-bang big-bang/proc)
-(define-primitive end-of-time end-of-time/proc)
-
-;; (union #f viewport)
-;; the view port for normal operation 
-(define @vp #f)
-
-;; boolean 
-;; state: are the operations "grouped" into a draw sequence? 
-(define in-sequence? #f) 
-
-;; (union #f pixmap) 
-;; the pixmap for "grouped" operations 
-(define @pm #f)
-
-;; -> (list Viewport Viewport)
-(define (get-@VP) (list @vp @pm))
-
-(define the-error (lambda x (error "evaluate (start <num> <num>) first")))
-(define-syntax (define-hook stx)
-  (syntax-case stx ()
-    [(_ name)
-     (let* ([stuff (symbol->string (syntax-e (syntax name)))]
-            [fools (lambda (x) (datum->syntax #'name (string->symbol x)))]
-            [%name (fools (format "%~a" stuff))] ;; works on viewport 
-            [proc  (fools (format "~a/proc" stuff))])
-       #`(define-values (#,%name #,proc)
-           (values the-error (lambda a (apply #,%name a)))))]))
-
-(define-syntax (define-hook-draw/clear stx)
-  (syntax-case stx () 
-    [(_ name)
-     (let* ([stuff (symbol->string (syntax-e (syntax name)))]
-            [fools (lambda (x) (datum->syntax #'name (string->symbol x)))]
-            [clear (fools (format "clear-~a" stuff))]
-            [draw  (fools (format "draw-~a" stuff))])
-       #`(begin
-           (define-hook #,clear)
-           (define-hook #,draw)))]))
-
-(define-hook-draw/clear solid-disk) 
-(define-hook-draw/clear circle)
-(define-hook-draw/clear string)
-(define-hook-draw/clear solid-rect)
-(define-hook-draw/clear solid-line)  
-
-(define-hook clear-all)
-
-(define-hook get-key-event)
-(define-hook get-mouse-event)
-(define-hook wait-for-mouse-click)
-
-(define-hook big-bang)     
-(define-hook on-key-event)
-(define-hook on-tick-event)
-(define-hook end-of-time)
-
-(define-hook stop)
-
-(define (sleep-for-a-while/proc s) (sleep/yield s) #t)
-
-(define-syntax (define-make stx)
-  (syntax-case stx ()
-    [(_ tag procedure)
-     (identifier? (syntax tag))
-     (let* ([stuff (symbol->string (syntax-e (syntax tag)))]
-            [fools (lambda (x) (datum->syntax stx (string->symbol x)))]
-            [make- (fools (format "make-~a" stuff))]
-            [name  (fools "name")]
-            [ffff  (fools "f")]
-            [x     (fools "x")])
-       #`(define (#,make- #,name #,ffff)
-           (lambda #,x
-             (apply procedure #,x)
-             #t)))]))
-
-(define-make line 
-  (lambda (p1 p2 . c)
-    (check-arg name (posn? p1) "posn" "first" p1)
-    (check-arg name (posn? p2) "posn" "second" p2)
-    (f p1 p2 (check-optional name 3 c "third" x))))
-
-(define-make rect
-  (lambda (p w h . c)
-    (check-arg name (posn? p) "posn" "first" p)
-    (check-arg name (and (integer? w) (> w 0)) "positive integer" "second" w)
-    (check-arg name (and (integer? h) (> h 0)) "positive integer" "third" h)
-    (f p w h (check-optional name 4 c "fourth" x))))
-
-(define-make %string 
-  (lambda (p s)
-    (check-arg name (posn? p) "posn" "first" p)
-    (check-arg name (string? s) "string" "second" s)
-    (f p s)))
-
-(define-make circle
-  (lambda (p r . c)
-    (check-arg name (posn? p) "posn" "first" p)
-    (check-arg name (and (integer? r) (> r 0)) "positive integer" "second" r)
-    ((ellipsis-2-circle f) p r (check-optional name 3 c "third" x))))
-
-;; Local function for make-circle 
-;; (Posn Number Symbol[color] -> void) -> (Posn Number Symbol[color] -> void)
-(define (ellipsis-2-circle f)
-  (lambda (p r c)
-    (let ((d (* r 2)))
-      (f (make-posn (- (posn-x p) r) (- (posn-y p) r)) d d c))))
-
-;; (Listof _) String (Listof _) -> Symbol[color]
-;; contract: c is shared suffix of all
-;; check whether c contains a single color symbol and all has proper length
-(define (check-optional name n c position x)
-  (if (pair? c)
-      (begin
-        (check-arity name n x)
-        (check-arg name (symbol? (car c)) "symbol" position (car c)))
-      (check-arity name (- n 1) x))
-  (symbol->color (if (null? c) 'black (car c))))
-
-;; Semaphore
-;; only one world can perform a draw sequence, including a start-up sequence 
-(define seq-lock (make-semaphore 1))
-
-(define is-graphics-open? #f)
-(define (start WIDTH HEIGHT) (start-and-export WIDTH HEIGHT (make-hash)))
-(define (start-and-export WIDTH HEIGHT h)
-  (define-syntax setter
-    (syntax-rules ()
-      [(_ vp* pm* name exp) 
-       (begin 
-         (set! name 
-               (let ([direct (let ([vp* vp*]) exp)][pmap (let ([vp* pm*]) exp)])
-                 (lambda a (if in-sequence? (apply pmap a) (apply direct a)))))
-         (hash-set! h 'name name))]))
-  
-  ;; Call after (start ... ...) to collect all the newly created closures 
-  (check-arg 'start (and (integer? WIDTH) (> WIDTH 0)) "positive integer" "first" WIDTH)
-  (check-arg 'start (and (integer? HEIGHT) (> HEIGHT 0)) "positive integer" "second" HEIGHT)
-  (semaphore-wait seq-lock)
-  ;; ---
-  (unless is-graphics-open?
-    (set! is-graphics-open? #t)
-    (open-graphics))
-  (let* ((tag (symbol->string (gensym)))
-         (vpn (string-append "Canvas VP: " tag))
-         (pmn (string-append "Canvas PM: " tag))
-         (vp* (open-viewport vpn WIDTH HEIGHT))
-         (pm* (open-pixmap pmn WIDTH HEIGHT))
-         (lbl (lambda () (if in-sequence? pmn vpn)))
-         (*delta* 0))
-    (hash-set! h 'label lbl)
-    (set! @vp vp*)
-    (set! @pm pm*)
-    ;; --- the following need two versions 
-    (setter vp* pm* %clear-all (clear-viewport vp*))    
-    (setter vp* pm* %draw-solid-line (make-line 'draw-solid-line (draw-line vp*)))
-    (setter vp* pm* %clear-solid-line (make-line 'clear-solid-line (lambda (p1 p2 c) ((clear-line vp*) p1 p2))))
-    (setter vp* pm* %draw-solid-rect (make-rect 'draw-solid-rect (draw-solid-rectangle vp*)))
-    (setter vp* pm* %clear-solid-rect (make-rect 'clear-solid-rect (lambda (p w h c) ((clear-solid-rectangle vp*) p w h))))
-    (setter vp* pm* %draw-solid-disk (make-circle 'draw-solid-disk (draw-solid-ellipse vp*)))
-    (setter vp* pm* %clear-solid-disk (make-circle 'clear-solid-disk (lambda (p r1 r2 c) ((clear-solid-ellipse vp*) p r1 r2))))
-    (setter vp* pm* %draw-circle (make-circle 'draw-circle (draw-ellipse vp*)))
-    (setter vp* pm* %clear-circle (make-circle 'clear-circle (lambda (p r1 r2 c) ((clear-ellipse vp*) p r1 r2))))
-    (setter vp* pm* %draw-string (make-%string 'draw-string (lambda (p s) [(draw-string vp*) p s])))
-    (setter vp* pm* %clear-string (make-%string 'clear-string (clear-string vp*))) 
-    ;; --- 
-    (set! %end-of-time
-          (let () #;([vp* vp*][pm* pm*])
-            (lambda () 
-              [(stop-tick vp*)]
-              [(stop-tick pm*)] 
-              #t)))
-    (hash-set! h '%end-of-time %end-of-time)
-    ;; ---
-    (set! %stop
-          (let* ([vp* vp*]
-                 [pm* pm*]
-                 [a (lambda () (close-viewport vp*) (close-viewport pm*))])
-            (lambda ()
-              [(stop-tick vp*)]
-              [(stop-tick pm*)]
-              (if in-sequence? 
-                  (set! @end-actions (cons a @end-actions))
-                  [a])
-              #t)))
-    (hash-set! h '%stop %stop)
-    ;; --- 
-    ;; see ../htdch/draw/support.scm (copy) for explanation and design rationale
-    (hash-set! h 'copy (lambda () (set! @vp vp*) (set! @pm pm*) [(clear-viewport pm*)]))
-    ;; ---
-    ;; --- the following can't happen during a draw sequence --- 
-    (set! %wait-for-mouse-click (lambda () (mouse-click-posn (get-mouse-click vp*))))      
-    (set! %get-key-event
-          (lambda ()
-            (cond
-              [(ready-key-press vp*) => key-value]
-              [else false])))    
-    (set! %get-mouse-event
-          (lambda ()
-            (cond
-              [(ready-mouse-click vp*) => mouse-click-posn]
-              [else false])))
-    (set! %on-key-event
-          (lambda (f)
-            (check-proc 'on-key-event f 2 'first 'two)
-            ((set-on-key-event vp*) 
-             (lambda (x y) (f (key-value x) y)))
-            #t))
-    (set! %on-tick-event
-          (lambda (f)
-            (let* ([w (ceiling (* 1000 *delta*))]
-                   [w (if (exact? w) w (inexact->exact w))])
-              (check-proc 'on-key-event f 1 'first 'one)
-              ((set-on-tick-event vp*) w (lambda (x) (f x)))
-              #t)))
-    (set! %big-bang 
-          (lambda (delta w)
-            (check-arg 'big-bang
-                       (and (number? delta) (>= delta 0))
-                       "number [of seconds] between 0 and 1000000"
-                       "first"
-                       delta)
-            (set! *delta* delta)
-            ((init-world vp*) w) 
-            #t))
-    
-    (semaphore-post seq-lock)
-    #t))
-
-;; [Listof (-> Void)]
-;; a list of actions to be performed after the drawing action is done. 
-(define @end-actions '())
-
-;; Viewport Pixmap -> true
-;; start a drawing sequence by clearing the pixmap and making it the "target" for all operations 
-;; effect: in-sequence?, @vp and @pm so that copy-viewport can work later 
-;; The draw sequence can only draw (and clear) elements from the pixmap. 
-;; It doesn't react to events. Should it disable them? 
-;; Or do we count on finishing the sequence fast enough?
-(define (begin-draw-sequence)
-  (semaphore-wait seq-lock)
-  (set! in-sequence? #t)
-  #t)
-
-;; -> true 
-;; stop a drawing sequence and copy the pixmap into the viewport 
-;; effect: in-sequence? 
-(define (end-draw-sequence)
-  (set! in-sequence? #f)
-  (copy-viewport @pm @vp)
-  (for-each (lambda (th) (th)) @end-actions)
-  (set! @end-actions '())
-  (semaphore-post seq-lock)
-  #t)
-
-;; start/cartesian-plane : Number Number -> true
-;; start up a canvas of size width x height  and draw a centered cartesian coordinate
-(define (start/cartesian-plane width height)
-  (check-arg 'start/cartesian-plane
-             (and (integer? width) (> width 0)) "positive integer" "first" width)
-  (check-arg 'start/cartesian-plane
-             (and (integer? height) (> height 0)) "positive integer" "second" height)    
-  (local ((define trash  (start width height))
-          (define mid-x  (quotient width 2))
-          (define mid-y  (quotient height 2)))
-    (and (draw-solid-line (make-posn mid-x 0) (make-posn mid-x height))
-         (draw-solid-line (make-posn 0 mid-y) (make-posn width mid-y)))))
-
-(provide-signature-elements draw^)
-
-;; symbol->color : symbol -> color
-;; to convert symbol to 
-(define (symbol->color s)
-  (check-arg 'draw.ss (symbol? s) "symbol" "first" s)
-  (case s 
-    ((white)   (make-rgb 1 1 1))
-    ((yellow)  (make-rgb 1 1 0))
-    ((red)     (make-rgb 1.0 0 0))
-    ((green)   (make-rgb 0 1.0 0))
-    ((blue)    (make-rgb 0 0 1.0))
-    ((black)   (make-rgb 0 0 0))
-    (else
-     (let ([x (send the-color-database find-color (symbol->string s))])
-       (if (rgb? x)
-           x
-           (error 'draw.ss "The symbol ~e is not a legal color in draw.ss." s))))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/bsl+/lang/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/bsl+/lang/reader.rkt
deleted file mode 100644
index caff3dd2e5..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/bsl+/lang/reader.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang s-exp htdp/bsl/reader
-lang/htdp-beginner-abbr
-'(abbreviate-cons-as-list
-  read-accept-quasiquote)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/lang/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/lang/reader.rkt
deleted file mode 100644
index 64af9a8d22..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang s-exp htdp/bsl/reader
-lang/htdp-beginner
-'()
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/language-info.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/language-info.rkt
deleted file mode 100644
index fd37495f45..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/language-info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scheme/base
-(provide get-info)
-
-(define ((get-info options) key default)
-  (case key
-    [(configure-runtime) `(#(htdp/bsl/runtime configure ,options))]
-    [else default]))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/reader.rkt
deleted file mode 100644
index f838ec2362..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/reader.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scheme/base
-(require (rename-in syntax/module-reader
-                    [#%module-begin #%reader-module-begin]))
-(provide (rename-out [module-begin #%module-begin])
-         (except-out (all-from-out scheme/base)
-                     #%module-begin))
-
-(define-syntax-rule (module-begin lang opts)
-  (#%reader-module-begin
-   lang
-
-   #:read (wrap-reader read options)
-   #:read-syntax (wrap-reader read-syntax options)
-   #:info (make-info options)
-   #:language-info (make-language-info options)
-
-   (provide options)
-   (define options opts)))
-
-(define (wrap-reader read-proc options)
-  (lambda args
-    (parameterize ([read-decimal-as-inexact #f]
-                   [read-accept-dot #f]
-                   [read-accept-quasiquote (memq 'read-accept-quasiquote options)])
-      (apply read-proc args))))
-
-(define ((make-info options) key default use-default)
-  (case key
-    [(drscheme:toolbar-buttons)
-     (list (dynamic-require 'stepper/drracket-button 'stepper-drracket-button)
-           (dynamic-require 'drracket/syncheck-drracket-button 'syncheck-drracket-button))]
-
-    [(drscheme:opt-out-toolbar-buttons)
-     ;; opt-out of all of the extra buttons b/c 
-     ;; we don't want anything to confuse in the teaching languages.
-     #f]
-    
-    [(drracket:show-big-defs/ints-labels) #t]
-    
-    [else (use-default key default)]))
-
-(define (make-language-info options)
-  `#(htdp/bsl/language-info get-info ,options))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/runtime.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/runtime.rkt
deleted file mode 100644
index 3c2ac07345..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/runtime.rkt
+++ /dev/null
@@ -1,81 +0,0 @@
-#lang racket/base
-(require mzlib/pconvert
-         racket/pretty
-         lang/private/set-result
-         lang/private/rewrite-error-message
-         mrlib/image-core
-         racket/snip
-         racket/class)
-
-(provide configure)
-
-(define (configure options)
-  ;; Set print-convert options:
-  (booleans-as-true/false #f)
-  (print-boolean-long-form #t)
-  (constructor-style-printing #t)
-  (add-make-prefix-to-constructor #f)
-  (abbreviate-cons-as-list (memq 'abbreviate-cons-as-list options))
-  (current-print-convert-hook
-   (let ([ph (current-print-convert-hook)])
-     (lambda (val basic sub)
-       (cond
-         [(equal? val '()) ''()]
-         [(equal? val set!-result) '(void)]
-         [(is-image? val) val]
-         [else (ph val basic sub)]))))
-  (use-named/undefined-handler
-   (lambda (x)
-     (and (memq 'use-function-output-syntax options)
-          (procedure? x)
-          (object-name x))))
-  (named/undefined-handler
-   (lambda (x)
-     (string->symbol
-      (format "function:~a" (object-name x)))))
-  ;; Set pretty-print options:
-  (pretty-print-show-inexactness #t)
-  (pretty-print-exact-as-decimal #t)
-  (define img-str "#<image>")
-  (define (is-image? val)
-    (or (is-a? val image%)         ;; 2htdp/image
-        (is-a? val image-snip%)))  ;; literal image constant
-  (show-sharing (memq 'show-sharing options))
-
-  ;; Set print handlers to use print-convert and pretty-write:
-  (define (set-handlers thunk)
-    (parameterize ([pretty-print-print-hook
-                    (let ([oh (pretty-print-print-hook)])
-                      (λ (val display? port)
-                        (if (and (not (port-writes-special? port))
-                                 (is-image? val))
-                            (begin (display img-str port)
-                                   (string-length img-str))
-                            (oh val display? port))))]
-                   [pretty-print-size-hook
-                    (let ([oh (pretty-print-size-hook)])
-                      (λ (val display? port)
-                        (if (and (not (port-writes-special? port))
-                                 (is-image? val))
-                            (string-length img-str)
-                            (oh val display? port))))])
-      (thunk)))
-  (current-print
-   (lambda (v)
-     (unless (void? v)
-       (define converted (print-convert v))
-       (set-handlers
-        (λ () (pretty-write converted))))))
-  (error-display-handler
-    (let ([o-d-h (error-display-handler)])
-      (lambda (msg exn)
-	(define x (get-rewriten-error-message exn))
-	(o-d-h x exn))))
-  (let ([orig (global-port-print-handler)])
-    (global-port-print-handler
-     (lambda (val port [depth 0])
-       (parameterize ([global-port-print-handler orig])
-         (let ([val (print-convert val)])
-           (parameterize ([pretty-print-columns 'infinity])
-             (set-handlers
-              (λ () (pretty-write val port))))))))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/color-structs.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/color-structs.rkt
deleted file mode 100644
index af95e9d103..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/color-structs.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(provide (struct-out color)
-         (struct-out alpha-color))
-(define-struct color (red green blue) #:transparent)
-(define-struct alpha-color (alpha red green blue) #:transparent)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/convert.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/convert.rkt
deleted file mode 100644
index 660f884866..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/convert.rkt
+++ /dev/null
@@ -1,279 +0,0 @@
-#lang racket/base
-
-(require racket/gui)
-
-;; ---------------------------------------------------------------------------------------------------
-;; functions that demonstrate how one and the same function can be used in three different contexts
-
-(require mzlib/etc lang/prim lang/htdp-langs-save-file-prefix htdp/error )
-
-(provide-higher-order-primitive convert-gui (f2c))
-(provide-higher-order-primitive convert-repl (f2c))
-(provide-higher-order-primitive convert-file (_ f2c _))
-
-;; ---------------------------------------------------------------------------------------------------
-
-(define IN-ERROR
-  "The input must be a number. Given: ~e\n")
-
-(define OUT-ERROR
-  "The conversion function must produce a number; but it produced ~e")
-
-(define CONVERT-FILE-MESSAGE
-  "It appears as if you created the input file with DrRacket. Please use a different text editor")
-
-;; ---------------------------------------------------------------------------------------------------
-
-(define black-pen  (send the-pen-list find-or-create-pen "BLACK" 2 'solid))
-(define red-brush  (send the-brush-list find-or-create-brush "RED" 'solid))
-(define white-brush  (send the-brush-list find-or-create-brush "WHITE" 'solid))
-
-;; scale% : (union false (num -> str)) frame% -> scale<%>
-;; scale<%> : set-current-x + canvas<%>
-(define scale%
-  (class canvas%
-    (inherit get-dc get-size get-client-size)    
-    
-    (define value  0)
-    
-    (define (draw-something)
-      (let ([dc (get-dc)])
-        (send dc clear)
-        (let-values ([(width height) (get-client-size)])
-          (send dc set-pen black-pen)
-          (send dc set-brush white-brush)
-          (send dc draw-rectangle 0 0 width height)
-          (send dc set-brush red-brush)
-          (send dc draw-rectangle 0 0
-                (* width (max 0 (min 1 (/ (- value SLI-MIN) (- SLI-MAX SLI-MIN))))) height)
-          (let*-values ([(cw ch) (get-client-size)]
-                        [(number) value])
-            (when (and (number? number)
-                       (exact? number)
-                       (real? number))
-              (let* ([whole (if (number . < . 0)
-                                (ceiling number)
-                                (floor number))]
-                     [fractional-part (- (abs number) (floor (abs number)))]
-                     [num (numerator fractional-part)]
-                     [den (denominator fractional-part)]
-                     [wholes (if (and (zero? whole) (not (zero? number)))
-                                 ""
-                                 (number->string whole))]
-                     [nums (number->string num)]
-                     [dens (number->string den)])
-                (let-values ([(ww wh wa wd) (send dc get-text-extent wholes)]
-                             [(nw nh na nd) (send dc get-text-extent nums)]
-                             [(dw dh da dd) (send dc get-text-extent dens)])
-                  (let ([w (if (integer? number) (+ ww (max nw dw)) ww)]
-                        [h (if (integer? number)
-                               wh
-                               (+ nh dh))])
-                    (cond
-                      [(integer? number) 
-                       (send dc draw-text
-                             wholes
-                             (- (/ cw 2) (/ w 2))
-                             (- (/ ch 2) (/ wh 2)))]
-                      [else
-                       (send dc draw-text
-                             wholes
-                             (- (/ cw 2) (/ w 2))
-                             (- (/ ch 2) (/ wh 2)))
-                       (send dc draw-text
-                             nums
-                             (+ ww (- (/ cw 2) (/ w 2)))
-                             (- (/ ch 2) (/ h 2)))
-                       (send dc draw-text
-                             dens
-                             (+ ww (- (/ cw 2) (/ w 2)))
-                             (+ nh (- (/ ch 2) (/ h 2))))
-                       (send dc draw-line
-                             (+ ww (- (/ cw 2) (/ w 2)))
-                             (/ ch 2)
-                             (+ ww (max nw dw) (- (/ cw 2) (/ w 2)))
-                             (/ ch 2))])))))))))
-    (override on-paint)
-    (define (on-paint) (draw-something))
-    (public set-value)
-    (define (set-value v) 
-      (set! value v)
-      (draw-something))
-    (inherit min-width min-height)
-    (super-instantiate ())
-    (let-values ([(w h a d) (send (get-dc) get-text-extent "100100100")])
-      (min-width (+ 4 (inexact->exact w)))
-      (min-height (+ 4 (inexact->exact (* 2 h)))))))
-
-;; ============================================================================
-;; MODEL
-;; 2int : num -> int
-;; to convert a real number into an exact number 
-(define (2int x)
-  (if (and (real? x) (number? x))
-      (inexact->exact x)
-      (error 'convert OUT-ERROR x)))
-
-;; slider-cb : (num -> num) object object -> [slider% event% -> void]
-;; to use fahr->cel to perform the conversion 
-(define ((slider-cb fahr->cel sliderC sliderF) c s)
-  (send sliderC set-value
-        ((compose in-slider-range 2int fahr->cel)
-         (send sliderF get-value))))
-
-;; in-slider-range : number -> number 
-;; to check and to convert the new temperature into an appropriate scale 
-(define (in-slider-range x)
-  (cond
-    [(<= SLI-MIN x SLI-MAX) x]
-    [else (error 'convert-gui "result out of range for Celsius display")]))
-
-
-#| --------------------------------------------------------------------
-  
-  view  (exports SLI-MIN SLI-MAX) (imports slider-cb)   
-  parameter: sliderC sliderF 
-
-  model (imports SLI-MIN SLI-MAX) (exports slider-cb)   
-  
-  ----------------------------------------------------------------------- |#
-
-;; ============================================================================
-;; VIEW
-
-;; convert-gui : (num -> num) -> void
-;; to install f as the temperature converter 
-;; effect: to create a window with two rulers for converting F to C
-(define (convert-gui f)
-  (check-proc 'convert-gui f 1 "convert-gui" "one argument")
-  ;; only initialize the slider based on the user's program when there aren't any exceptions.
-  ;; if there are exceptions, wait for the user to click "convert" to see an error.
-  (define-values (sliderC frame) (make-gui f))
-  (with-handlers ([exn:fail? (lambda (x) (void))])
-    (send sliderC set-value (in-slider-range (f F-SLI-0))))
-  (send frame show #t))
-
-;; f2c : num -> num
-;; to convert a Fahrenheit temperature into a Celsius temperature 
-(define (f2c f) (2int (* 5/9 (- f 32))))
-
-(define F-SLI-MIN -50)
-(define F-SLI-MAX 250)
-(define F-SLI-0 32)    
-(define SLI-MIN (f2c F-SLI-MIN))
-(define SLI-MAX (f2c F-SLI-MAX))
-
-(define (make-gui fahr->cel)
-  (define frame 
-    (parameterize ((current-eventspace (make-eventspace))) 
-      (new frame% 
-           [label "Fahrenheit to Celsius Conversion"]
-           [alignment '(center center)])))
-  
-  (define main-panel
-    (new horizontal-panel% [parent frame] [stretchable-height #f]))
-  
-  ;; create labels; aligned with sliders 
-  (define mpanel (make-object vertical-panel% main-panel))
-  (make-object message% "Fahrenheit" mpanel)
-  (make-object message% "" mpanel)
-  (make-object message% "Celsius" mpanel)
-  (send mpanel stretchable-width #f)
-  
-  (define panel (make-object vertical-panel% main-panel))
-  (send panel set-alignment 'center 'center)
-  
-  ;; sliderF : slider% 
-  ;; to display the Fahrenheit temperature 
-  (define sliderF (make-object slider% #f F-SLI-MIN F-SLI-MAX panel void F-SLI-0))
-  (send sliderF min-width (- F-SLI-MAX F-SLI-MIN))
-  
-  ;; sliderC : slider% 
-  ;; to display the Celsius temperature 
-  (define sliderC (make-object scale% panel))
-  (define _set-sliderC (send sliderC set-value (in-slider-range (f2c F-SLI-0))))
-  
-  (define button-panel
-    (new vertical-panel% (stretchable-width #f) (stretchable-height #f) (parent main-panel)))
-  
-  ;; convert : button%
-  ;; to convert fahrenheit to celsius 
-  (make-object button% "Convert" button-panel (slider-cb fahr->cel sliderC sliderF))
-  (make-object button% "Close" button-panel (lambda (x e) (send frame show #f)))
-  
-  (values sliderC frame))
-
-;; ============================================================================
-;; convert-repl : (num -> num) -> void
-;; to start a read-eval-print loop that reads numbers [temp in F], applies f, and prints 
-;; the result; effects: read and write; 
-;; exit on x as input
-(define (convert-repl f)
-  (check-proc 'convert-repl f 1 "convert-repl" "one argument")
-  (let repl ()
-    (begin
-      (printf "Enter Fahrenheit temperature and press <enter> [to exit, type x]: ")
-      (flush-output)
-      (let* ([ans (read)])
-        (cond
-          [(or (eof-object? ans) (eq? ans 'x)) (void)]
-          [(not (number? ans))
-           (printf "The input must be a number. Given: ~s\n" ans) (repl)]
-          [(number? ans) 
-           (let ([res (f ans)])
-             (if (number? res)
-                 (printf "~sF corresponds to ~sC\n" ans res) 
-                 (error 'convert OUT-ERROR res))
-             (repl))]
-          [else (error 'convert "can't happen")])))))
-
-;; ---------------------------------------------------------------------------------------------------
-
-;; convert-file : str (num -> num) str -> void
-;; to read a number from file in, to convert it with f, and to write it to out
-(define (convert-file in f out)
-  (check-arg 'convert-file (path-string? in) "string" "first" in)
-  (check-arg 'convert-file (file-exists? in) 
-             (format "name of existing file in ~a" (current-directory))
-             "first" in)
-  (check-proc 'convert-file f 1 "convert-file" "one argument")
-  (check-arg 'convert-file (path-string? out) "string" "third" out)
-  ;; [ -> Void] -> Void 
-  ;; perform the actual conversion on the file after optionally reading a prelude 
-  (define (convert-file prefix)
-    (with-output-to-file out #:exists 'replace 
-      (lambda () (with-input-from-file in (make-reader-for f prefix)))))
-  (with-handlers ((exn:fail:read?
-                   (lambda (x) 
-                     (define message (exn-message x))
-                     (define reader-exception? (regexp-match "#reader" message))
-                     (cond
-                       [reader-exception? 
-                        (with-handlers ((exn:fail:read? (lambda (y) (raise x))))
-                          (convert-file
-                           (lambda ()
-                             (unless (htdp-file-prefix? (current-input-port)) (raise x)))))]
-                       [else (raise x)]))))
-    (convert-file void)))
-
-(define *debug (current-output-port))
-
-;; make-reader-for-f : [Number -> Number] [ -> Void] -> [ -> void]
-;; make-reader-for-f creates a function that reads numbers from a file
-;; converts them according to f, and prints the results
-;; effect: if any of the S-expressions in the file aren't numbers or
-;;         if any of f's results aren't numbers,
-;;         the function signals an error
-(define (make-reader-for f prefix)
-  (define (read-until-eof)
-    (prefix)
-    (let read-until-eof ()
-      (define in (read))
-      (cond
-        [(eof-object? in) (void)]
-        [(number? in)
-         (define out (f in))
-         (if (number? out) (printf "~s\n" out) (error 'convert OUT-ERROR out))
-         (read-until-eof)]
-        [else (error 'convert IN-ERROR in)])))
-  read-until-eof)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/dir.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/dir.rkt
deleted file mode 100644
index 9f248c1151..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/dir.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang racket/base
-
-(provide
- ;; map the directory tree at the given path into a data representation according to model 3 of 
- ;; HtDP/1e (part III) and HtDP/2e (Part IV); 
- ;; effects: if a directory d isn't accessible, the function prints (inaccessible d) to stdout
- create-dir ; String -> Dir.v3
- 
- ; structure 
- dir? make-dir dir-name dir-dirs dir-files
- 
- ; structure 
- file? make-file file-name file-content file-size
- )
-
-;; ---------------------------------------------------------------------------------------------------
-
-(require htdp/error lang/prim (only-in racket/base [file-size s:file-size]))
-
-;; Structures: 
-(define-struct dir (name dirs files) #:transparent)
-(define-struct file (name size content) #:transparent)
-
-(define-primitive create-dir create-dir/proc)
-
-;; Data:
-;; Directory  = (make-dir Symbol (listof Dir) (listof File))
-;; File       = (make-file Symbol Number (union '() X))
-
-(define (create-dir/proc a-path)
-  (check-arg 'create-dir (string? a-path) "string" "first" a-path)
-  (let ([a-path! (string->path a-path)])
-    (if (directory-exists? a-path!)
-        (car (explore (list a-path!)))
-        (error 'create-dir "not a directory: ~e" a-path))))
-
-;; explore : (listof String[directory-names]) -> (listof Directory)
-(define (explore dirs)
-  (map (lambda (d) 
-         (let-values ([(fs ds) (pushd d directory-files&directories)]) 
-           (make-dir
-            (string->symbol (path->string (my-split-path d)))
-            (explore (map (lambda (x) (build-path d x)) ds))
-            (map make-file
-                 (map (compose string->symbol path->string) fs)
-                 (map (lambda (x) (if (file-exists? x) (s:file-size x) 0))
-                      (map (lambda (x) (build-path d x)) fs))
-                 (map (lambda (x) "") fs)))))
-       dirs))
-
-;; String -> String
-(define (my-split-path d)
-  (let-values ([(base name mbd?) (split-path d)])
-    (if (string? base) name d)))
-
-;; pushd : String[directory-name] (-> X) -> X
-(define (pushd d f)
-  (parameterize ([current-directory d])
-    (f)))
-
-;; directory-files&directories : 
-;;  (-> (values (listof String[file-names]) (listof String[directory-names])))
-(define (directory-files&directories)
-  (with-handlers ((exn:fail:filesystem? 
-                   (lambda (x)
-                     (displayln `(inaccessible ,(current-directory)))
-                     (values '() '()))))
-    (let ((contents (directory-list)))
-      (values
-       (filter (lambda (x) (or (file-exists? x) (link-exists? x))) contents)
-       (filter (lambda (x) (and (directory-exists? x) (not (link-exists? x))))
-               contents)))))
-
-;; get-file-content : file -> (int -> string)
-;; to read a file on demand as a string
-;; option to expand the library ... 
-;; cache it ... 
-(define (get-file-content f)
-  (read-string (file-size f) (open-input-file (symbol->string (file-name f)))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/docs.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/docs.rkt
deleted file mode 100644
index 00c81876e5..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/docs.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang scheme 
-
-(require htdp/error
-         lang/prim
-         mzlib/list)
-
-(provide
- atom?
- annotation?
- end-annotation
- write-file
- )
-
-(define-primitive atom? atom?/proc)
-(define-primitive annotation? annotation?/proc)  
-(define-primitive end-annotation? end-annotation?/proc)
-(define-primitive write-file write-file/proc)
-
-;; mk-annotation :
-;;  (str number[str-length] -> bool) -> (any-value -> bool)
-(define (mk-annotation test)
-  (lambda (val)
-    (and (symbol? val) 
-         (let ((str (symbol->string val)))
-           (test str (sub1 (string-length str)))))))
-
-;; annotation? : any-value -> bool
-(define annotation?/proc
-  (mk-annotation (lambda (str E);; str : string, E : integer
-                   (and (> E 1) 
-                        (eqv? (string-ref str 0) #\<)
-                        (eqv? (string-ref str E) #\>)))))
-
-;; end-annotation? : any-value -> bool
-(define end-annotation?/proc
-  (mk-annotation (lambda (str E);; str : string, E : integer 
-                   (and (> E 2)
-                        (eqv? (string-ref str 0) #\<)
-                        (eqv? (string-ref str 1) #\/)
-                        (eqv? (string-ref str E) #\>)))))
-
-;; end-annotation : annotation -> end-annotation
-(define (end-annotation ann)
-  (check-arg 'end-annotation (annotation? ann) "annotation (str)" "first" ann)
-  (let ((str (symbol->string ann))) 
-    (string->symbol
-     (string-append "</" (substring str 1 (string-length str))))))
-
-;; line-breaking? : any-value -> bool
-(define (line-breaking? x)
-  (and (annotation? x) (memq x LNBRK) #t))
-
-(define LNBRK 
-  (let ((x '(<html> <title> <body> <table> <ol> <li> <tr>)))
-    (append x (map end-annotation x))))
-
-;; where to break lines in write-file
-(define MAX-COLUMN 80)
-
-;; atom? : TSV -> boolean
-;; to determine whether x is a symbol, number, or string
-(define (atom?/proc x)
-  (or (symbol? x) (number? x) (string? x)))
-
-;; write-file : list-of-atom [file-name] -> void
-;; effect: write los to file-name, in small column width
-;;   delete file-name if it exists
-(define (write-file/proc  los . file-name)
-  ;; the-port : an output port, 
-  ;;   determined from the optional second argument
-  (define the-port
-    (if (null? file-name)
-        (current-output-port)
-        (let ((the-name (car file-name)))
-          (check-arg 'write-file 
-                     (string? the-name)
-                     "string" "(optional) second" 
-                     the-name)
-          (when (file-exists? the-name)
-            (delete-file the-name))
-          (open-output-file the-name))))
-  
-  (check-arg 'write-file
-             (and (list? los) (andmap atom? los)) "list of symbols" "first" los)
-  ;; --- the LOOP ---
-  (let loop ((i 0) (los los))
-    (if (null? los) (newline the-port)
-        (let* ((wrd (first los))
-               (str (format "~a" wrd))
-               (j   (+ i (string-length str) 1)))
-          (cond
-            ((> i MAX-COLUMN)      (newline the-port) 
-                                   (loop 0 los))
-            ((line-breaking? wrd)  (newline the-port) 
-                                   (display wrd the-port) 
-                                   (newline the-port)
-                                   (loop j (rest los)))
-            
-            (else                  (display wrd the-port)
-                                   (display #\SPACE the-port)
-                                   (loop j (rest los)))))))
-  (when (cons? file-name)
-    (close-output-port the-port))
-  #t)
-
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/draw-sig.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/draw-sig.rkt
deleted file mode 100644
index 29986c53c5..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/draw-sig.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang scheme
-
-(provide core-draw^ draw^)
-
-(require mzlib/unit)
-
-;; xxx-solid-rect cannot be called xxx-solid-rectangle because that
-;; interferes with the existing xxx-solid-rectangle name in our unit
-;; calculus -- mf 
-
-(define-signature core-draw^
-  (start 
-   start/cartesian-plane
-   stop 
-   ;; --- 
-   start-and-export 
-   ;; like start but also consumes a hashtable 
-   ;; adds the procedures that can be called during a sequnce to the hashtable
-   ;; --- the following can be called during a draw sequence --- 
-   draw-circle
-   draw-solid-disk
-   draw-solid-rect
-   draw-solid-line
-   draw-solid-string
-   clear-circle
-   clear-solid-disk
-   clear-solid-rect
-   clear-solid-line
-   clear-solid-string
-   clear-all
-   ;; --- stupid stuff --- 
-   sleep-for-a-while
-   wait-for-mouse-click ; -> posn
-   get-key-event   ; -> (union #f char symbol)
-   get-mouse-event ; -> (union #f posn)
-   ;;
-   ;; "hidden" access to viewports (for htdc/[i]draw mostly)
-   get-@VP         ; -> Viewport
-   begin-draw-sequence ; Viewport Viewport -> #t
-   end-draw-sequence   ; -> #t
-   ;; 
-   big-bang        ; World -> true
-   on-key-event    ; (union char symbol) World -> World 
-   on-tick-event   ; World -> World 
-   end-of-time     ; -> World
-   ))
-
-(define-signature draw^ extends core-draw^ ())
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/draw.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/draw.rkt
deleted file mode 100644
index c7c4ec55da..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/draw.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang scheme
-
-(require htdp/big-draw
-         htdp/draw-sig
-         mzlib/unit)
-
-(define-syntax (draw s)
-  (syntax-case s (produce)
-    [(_ stmt ... produce exp) (syntax (begin (and stmt ...) exp))]
-    [(_ stmt ... produce) 
-     (raise-syntax-error #f "produce must be followed by an expression" s)]
-    [(_ stmt ... produce exp exp2)
-     (raise-syntax-error #f "produce must be followed by exactly one expression" s)]
-    [(_ stmt ... produce exp exp2 exp3)
-     (raise-syntax-error #f "produce must be followed by exactly one expression" s)]
-    [(_ stmt ...)
-     (raise-syntax-error #f "use drawing instructions between _draw_ and _produce_ and an expression behind produce" s)]
-    ))
-
-(provide 
- draw ;; (draw <expression> ... produce <expression>)
- )
-
-(provide-signature-elements draw^)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/elevator.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/elevator.rkt
deleted file mode 100644
index 3f12655052..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/elevator.rkt
+++ /dev/null
@@ -1,816 +0,0 @@
-#lang scheme/gui
-
-(require htdp/big-draw
-         htdp/error
-         lang/prim
-         lang/posn
-         mzlib/etc)
-
-;; Implementation:
-;;   Stephanie Weirich (1994),
-;;   Mark Krentel (1995),
-;;   Matthias Felleisen (1996)
-
-(provide run)
-
-(define-higher-order-primitive run run/proc (elevator-controller))
-
-;;  There are really  three distinct levels: graphics, hardware,
-;;  and software. Don't mix them!
-
-;;
-;;  HARDWARE/GRAPHICS level for Elevator.
-;;  This level provides the basic primitives for writing an elevator.
-;;  The hardware level are the guards for the graphics level.
-;;
-;;  Hardware functions:
-;;
-;;     make-elevator  max-floor
-;;     current-floor  move-up-floor    move-down-floor
-;;     update-input   wait-for-input
-;;     open?          open-doors       close-doors
-;;     up-call?       down-call?       demand?
-;;     clear-up-call  clear-down-call  clear-demand
-;;     busy-wait      info
-;;
-
-;;  Compute the layout and draw the window.
-
-(define  init-graphics
-  (lambda  ()
-    (init-layout-and-window)
-    (init-shaft)
-    (init-calls)
-    (init-info)
-    (init-demands)
-    (init-stop)
-    (init-car)
-    (busy-wait  800)
-    (draw-open-doors)))
-
-;;
-;;  Overall layout for the window.
-;;  Currently need max-floor >= 4.
-;;
-
-(define  BORDER  100)
-(define  SHAFT-INFO-GAP   40)
-(define  STOP-DEMAND-GAP  50)
-
-(define  init-layout-and-window
-  (lambda  ()
-    (let* 
-        ([shaft  (make-posn  BORDER  BORDER)]
-         [call   (add-hv  shaft  SHAFT-WIDTH  0)]
-         [top    (add-hv  call  CALL-WIDTH  0)]
-         [bot    (add-hv  top  0  (* (max-floor) FLOOR-SIZE))]
-         [info   (add-hv  top  SHAFT-INFO-GAP  0)]
-         [stop   (add-hv  bot  SHAFT-INFO-GAP  (- STOP-HEIGHT))]
-         [demand (add-hv  stop  0  (- 0 STOP-DEMAND-GAP DEMAND-HEIGHT))]
-         [horiz  (+  (posn-x info)  STOP-WIDTH  BORDER)]
-         [vert   (+  (posn-y bot)  BORDER)])
-      (set!  SHAFT-ORIGIN   shaft)
-      (set!  CALL-ORIGIN    call)
-      (set!  INFO-ORIGIN    info)
-      (set!  STOP-ORIGIN    stop)
-      (set!  DEMAND-ORIGIN  demand)
-      (init-window  horiz  vert))))
-
-;;
-;;  Window primitives for lines, strings, mouse clicks.
-;;  These should be the only functions that use elev-win.
-;;
-
-(define  elev-win  #f)
-(define  d-line    #f)
-(define  c-line    #f)
-(define  d-string  #f)
-(define  c-string  #f)
-(define  mouse-click?    (lambda () (ready-mouse-click elev-win)))
-(define  wait-for-click  (lambda () (get-mouse-click elev-win)))
-
-(define  init-window
-  (lambda  (horiz  vert)
-    (set!  elev-win  (open-viewport "Elevator Simulation" horiz vert))
-    (set!  d-line  (draw-line  elev-win))
-    (set!  c-line  (clear-line  elev-win))
-    (set!  d-string  (draw-string  elev-win))
-    (set!  c-string  (clear-string  elev-win))))
-
-(define  d-string-bf
-  (lambda  (posn  string)
-    (d-string  posn  string)
-    (d-string  (add-hv posn 1 0)  string)))
-
-(define  c-string-bf
-  (lambda  (posn  string)
-    (c-string  posn  string)
-    (c-string  (add-hv posn 1 0)  string)))
-
-;;
-;;  Helper functions for position, offsets, etc.
-;;  SIXLib should provide better primitives here.
-;;
-
-(define  under?   (lambda  (p1  p2)  (>  (posn-y p1)  (posn-y p2))))
-
-(define  add-posn
-  (lambda  (p1  p2)
-    (make-posn  (+  (posn-x p1)  (posn-x p2))
-                (+  (posn-y p1)  (posn-y p2)))))
-
-(define  add-hv
-  (lambda  (p  horiz  vert)
-    (make-posn  (+  (posn-x p)  horiz) 
-                (+  (posn-y p)  vert))))
-
-;;
-;;  Low-level primitives for lines, rectangles, etc.
-;;
-
-(define  paint-rect
-  (lambda  (origin  horiz  vert)
-    (when  (>= vert 0)
-      (let ([right  (add-hv origin horiz 0)]
-            [next   (add-hv origin 0 +1)])
-        (d-line  origin  right)
-        (paint-rect  next  horiz  (- vert 1))))))
-
-(define  outline-rect
-  (lambda  (origin  horiz  vert  thick)
-    (let* ([x0  (posn-x origin)]  [y0  (posn-y origin)])
-      (recur  loop  ([lf   x0]  [rt   (+ x0 horiz thick -1)]
-                                [top  y0]  [bot  (+ y0 vert  thick -1)]
-                                [n  thick])
-        (when  (> n 0)
-          (d-line  (make-posn lf top)  (make-posn rt top))
-          (d-line  (make-posn rt top)  (make-posn rt bot))
-          (d-line  (make-posn rt bot)  (make-posn lf bot))
-          (d-line  (make-posn lf bot)  (make-posn lf top))
-          (loop  (+ lf 1)  (- rt 1)  (+ top 1)  (- bot 1)  (- n 1)))))))
-
-(define  clear-inside-rect
-  (lambda  (origin  horiz  vert  thick)
-    (recur  loop  ([lf  (add-hv origin thick thick)]
-                   [rt  (add-hv origin (- horiz 1) thick)]
-                   [n  thick])
-      (when  (< n vert)
-        (c-line  lf  rt)
-        (loop  (add-hv lf 0 +1)  (add-hv rt 0 +1) (+ n 1))))))
-
-;;
-;;  Elevator Shaft and Car 
-;;
-
-(define  SHAFT-ORIGIN #f)
-(define  STOP-ORIGIN  #f)
-(define  SHAFT-WIDTH  64)
-(define  FLOOR-SIZE   64)
-(define  CAR-WIDTH    44)
-(define  CAR-HEIGHT   44)
-(define  MIN-DOOR-SEP  3)
-(define  NUMBER-POSN  (make-posn -22 (floor (/ FLOOR-SIZE 2))))
-
-(define  init-shaft
-  (lambda  ()
-    (let ([height  (* (max-floor) FLOOR-SIZE)])
-      (outline-rect  SHAFT-ORIGIN  SHAFT-WIDTH  height  2)
-      (recur  loop  ([p  (add-posn SHAFT-ORIGIN NUMBER-POSN)]
-                     [n  (max-floor)])
-        (when  (>= n 1)
-          (d-string-bf  p  (number->string n))
-          (loop  (add-hv p 0 FLOOR-SIZE)  (- n 1)))))))
-
-(define  init-car
-  (lambda  ()
-    (let* ([origin  (car-posn 1)])
-      (outline-rect  origin  CAR-WIDTH  CAR-HEIGHT  1)
-      (outline-rect  origin  (floor (/ CAR-WIDTH 2))  CAR-HEIGHT  1))))
-
-(define  car-posn
-  (lambda  (n)
-    (add-hv  SHAFT-ORIGIN
-             (floor (/ (- SHAFT-WIDTH CAR-WIDTH) 2))
-             (+  (floor (/ (- FLOOR-SIZE  CAR-HEIGHT) 2))
-                 (*  (- (max-floor) n)  FLOOR-SIZE)))))
-
-(define  move-car-door
-  (lambda  (horiz  delta)
-    (let* ([origin   (car-posn (current-floor))]
-           [old-top  (add-hv origin horiz +1)]
-           [old-bot  (add-hv origin horiz (- CAR-HEIGHT 1))]
-           [new-top  (add-hv old-top delta 0)]
-           [new-bot  (add-hv old-bot delta 0)])
-      (d-line  new-top  new-bot)
-      (c-line  old-top  old-bot))))
-
-(define  draw-open-doors
-  (lambda  ()
-    (recur  loop  ([lf  (floor   (/ CAR-WIDTH 2))]
-                   [rt  (ceiling (/ CAR-WIDTH 2))])
-      (when  (<  MIN-DOOR-SEP  lf)
-        (move-car-door  lf  -1)
-        (move-car-door  rt  +1)
-        (busy-wait)
-        (loop  (- lf 1)  (+ rt 1))))
-    (draw-little-man)))
-
-(define  draw-close-doors
-  (lambda  ()
-    (recur  loop  ([lf  MIN-DOOR-SEP]
-                   [rt  (- CAR-WIDTH MIN-DOOR-SEP)])
-      (when  (>=  (- rt lf)  2)
-        (move-car-door  lf  +1)
-        (move-car-door  rt  -1)
-        (busy-wait)
-        (loop  (+ lf 1)  (- rt 1))))))
-
-(define  move-fwd-edge
-  (lambda  (origin  delta)
-    (let* ([new-lf  (add-hv origin 0 delta)]
-           [new-rt  (add-hv origin CAR-WIDTH delta)]
-           [old-1-lf  (add-hv origin +1 0)]
-           [old-1-rt  (add-hv origin (- (floor (/ CAR-WIDTH 2)) 1) 0)]
-           [old-2-lf  (add-hv origin (+ (ceiling (/ CAR-WIDTH 2)) 1) 0)]
-           [old-2-rt  (add-hv origin (- CAR-WIDTH 1) 0)])
-      (d-line  new-lf  new-rt)
-      (c-line  old-1-lf  old-1-rt)
-      (c-line  old-2-lf  old-2-rt))))
-
-(define  move-back-edge
-  (lambda  (origin  delta)
-    (let*  ([new-lf  (add-hv origin 0 delta)]
-            [new-rt  (add-hv origin CAR-WIDTH delta)]
-            [old-lf  origin]
-            [old-rt  (add-hv origin CAR-WIDTH 0)])
-      (d-line  new-lf  new-rt)
-      (c-line  old-lf  old-rt))))
-
-(define  draw-up-floor
-  (lambda  ()
-    (let ([goal  (car-posn (+ (current-floor) 1))])
-      (recur  loop  ([cur  (car-posn (current-floor))])
-        (when  (under?  cur  goal)
-          (move-fwd-edge  cur  -1)
-          (move-back-edge  (add-hv cur 0 CAR-HEIGHT)  -1)
-          (busy-wait)
-          (loop  (add-hv cur 0 -1)))))))
-
-(define  draw-down-floor
-  (lambda  ()
-    (let ([goal  (car-posn (- (current-floor) 1))])
-      (recur  loop  ([cur  (car-posn (current-floor))])
-        (when  (under?  goal  cur)
-          (move-fwd-edge  (add-hv cur 0 CAR-HEIGHT)  +1)
-          (move-back-edge  cur  +1)
-          (busy-wait)
-          (loop  (add-hv cur 0 +1)))))))
-
-;;  This is probably going too far ...
-;;  But he's more than just a list of lines!
-
-(define  MAN-POSN  (make-posn 18 14))
-
-(define  LITTLE-MAN
-  (list  (make-posn 5 0)   (make-posn 9 0)    ; head
-         (make-posn 9 0)   (make-posn 9 4)
-         (make-posn 9 4)   (make-posn 5 4)
-         (make-posn 5 4)   (make-posn 5 0)
-         (make-posn 7 4)   (make-posn 7 12)   ; body
-         (make-posn 7 12)  (make-posn 2 23)   ; legs
-         (make-posn 7 12)  (make-posn 12 23)
-         (make-posn 0 23)  (make-posn 2 23)   ; feet
-         (make-posn 12 23) (make-posn 14 23)
-         (make-posn 1 8)   (make-posn 13 8)   ; arms
-         (make-posn 0 9)   (make-posn 1 8)    ; hands
-         (make-posn 13 8)  (make-posn 14 7)))
-
-(define  draw-little-man
-  (lambda  ()
-    (let ([origin  (add-posn (car-posn (current-floor)) MAN-POSN)])
-      (recur  loop  ([l  LITTLE-MAN])
-        (unless  (null? l)
-          (d-line  (add-posn  origin  (car l))  
-                   (add-posn  origin  (cadr l)))
-          (loop  (cddr l)))))))
-
-;;
-;;  Call Buttons 
-;;
-
-(define  CALL-ORIGIN  #f)
-(define  CALL-WIDTH   50)
-(define  CALL-HEIGHT  (floor (/ FLOOR-SIZE 2)))
-
-(define  UP-CALL-SHAPE  
-  (list  (make-posn 13 28)  (make-posn 25 4)   (make-posn 37 28)))
-(define  DOWN-CALL-SHAPE
-  (list  (make-posn 13 4)   (make-posn 25 28)  (make-posn 37 4)))
-
-(define  UP-CALL-POSN
-  (lambda  (floor)
-    (add-hv  CALL-ORIGIN  0  (* FLOOR-SIZE (- (max-floor) floor)))))
-
-(define  DOWN-CALL-POSN
-  (lambda  (floor)  
-    (add-hv  (UP-CALL-POSN floor)  0  CALL-HEIGHT)))
-
-(define  init-calls
-  (lambda  ()
-    (recur  loop  ([n  1])
-      (when  (<=  n  (max-floor))
-        (outline-rect  (UP-CALL-POSN n)  CALL-WIDTH  FLOOR-SIZE  2)
-        (outline-call  (UP-CALL-POSN n)  UP-CALL-SHAPE)
-        (outline-call  (DOWN-CALL-POSN n)  DOWN-CALL-SHAPE)
-        (loop  (+ n 1))))))
-
-(define  draw-clear-up
-  (lambda  (floor)
-    (clear-call    (UP-CALL-POSN floor)  UP-CALL-SHAPE)
-    (outline-call  (UP-CALL-POSN floor)  UP-CALL-SHAPE)))
-
-(define  draw-clear-down
-  (lambda  (floor)
-    (clear-call    (DOWN-CALL-POSN floor)  DOWN-CALL-SHAPE)
-    (outline-call  (DOWN-CALL-POSN floor)  DOWN-CALL-SHAPE)))
-
-(define  paint-up-call
-  (lambda  (floor)
-    (paint-call  (UP-CALL-POSN floor)  UP-CALL-SHAPE)))
-
-(define  paint-down-call
-  (lambda  (floor)
-    (paint-call  (DOWN-CALL-POSN floor)  DOWN-CALL-SHAPE)))
-
-(define  outline-call
-  (lambda  (origin  l)
-    (let* ([p  (add-posn origin (car l))]
-           [q  (add-posn origin (cadr l))] 
-           [r  (add-posn origin (caddr l))])
-      (d-line  p  q)
-      (d-line  q  r)
-      (d-line  r  p))))
-
-(define  clear-call
-  (lambda  (origin  l)
-    (let* ([p  (add-posn origin (car l))]
-           [q  (add-posn origin (cadr l))] 
-           [r  (add-posn origin (caddr l))]
-           [top  (min (posn-y p) (posn-y q))]
-           [bot  (max (posn-y p) (posn-y q))])
-      (recur  loop  ([y  (+ top 1)])
-        (when  (< y bot)
-          (let ([lf  (ceiling (x-val p q y))]
-                [rt  (floor   (x-val q r y))])
-            (c-line  (make-posn lf y)  (make-posn rt y))
-            (loop  (+ y 1))))))))
-
-(define  paint-call
-  (lambda  (origin  l)
-    (let* ([p  (add-posn origin (car l))]
-           [q  (add-posn origin (cadr l))] 
-           [r  (add-posn origin (caddr l))]
-           [top  (min (posn-y p) (posn-y q))]
-           [bot  (max (posn-y p) (posn-y q))])
-      (recur  loop  ([y  (+ top 1)])
-        (when  (< y bot)
-          (let ([lf  (ceiling (x-val p q y))]
-                [rt  (floor   (x-val q r y))])
-            (d-line  (make-posn lf y)  (make-posn rt y))
-            (loop  (+ y 1))))))))
-
-(define  x-val
-  (lambda  (a  b  y)
-    (let ([ax  (posn-x a)]  [ay  (posn-y a)]
-                            [bx  (posn-x b)]  [by  (posn-y b)])
-      (+  ax  (*  (/  (-  y  ay)  (-  by  ay))
-                  (-  bx  ax))))))
-
-;;
-;;  Demand Buttons
-;;
-
-(define  DEMAND-ORIGIN  #f)
-(define  DEMAND-WIDTH   40)
-(define  DEMAND-HEIGHT  40)
-(define  DEMAND-TEXT  (make-posn 18 25))
-
-(define  DEMAND-POSN
-  (let ([HORIZ  (+ DEMAND-WIDTH 20)]  
-        [VERT   (+ DEMAND-HEIGHT 20)])
-    (lambda  (i)
-      (let ([x  (remainder (sub1 i) 2)]
-            [y  (quotient  (sub1 i) 2)])
-        (add-hv  DEMAND-ORIGIN  (* x HORIZ)  (* -1 y VERT))))))
-
-(define  init-demands
-  (lambda  ()
-    (recur  loop  ([n  1])
-      (when  (<= n (max-floor))
-        (outline-rect  (DEMAND-POSN n)  DEMAND-WIDTH  DEMAND-HEIGHT  2) 
-        (d-string-bf  (add-posn (DEMAND-POSN n) DEMAND-TEXT)  (number->string n))
-        (loop  (+ n 1))))))
-
-(define  paint-demand
-  (lambda  (k)
-    (let ([nw  (DEMAND-POSN k)])
-      (paint-rect  nw  DEMAND-WIDTH  DEMAND-HEIGHT)
-      (c-string-bf  (add-posn nw DEMAND-TEXT)  (number->string k)))))
-
-(define  draw-clear-demand
-  (lambda  (k)
-    (clear-inside-rect  (DEMAND-POSN k)  DEMAND-WIDTH  DEMAND-HEIGHT  2)
-    (d-string-bf  (add-posn (DEMAND-POSN k) DEMAND-TEXT)  (number->string k))))
-
-;;
-;;  "Stop Program" Button
-;;
-
-(define  STOP-WIDTH  100)
-(define  STOP-HEIGHT  40)
-(define  STOP-TEXT  (make-posn 15 25))
-
-(define  init-stop
-  (lambda  ()
-    (outline-rect  STOP-ORIGIN  STOP-WIDTH  STOP-HEIGHT  2)
-    (d-string  (add-posn STOP-ORIGIN STOP-TEXT)  "Stop Program")))
-
-;;
-;;  Mouse Clicks
-;;  Look for up/down calls, demands and stop-program button.
-;;  If you can get access to a real-time clock, then change the
-;;  delay loop to use sleep-for or real-time.
-;;  The units are (fake) milliseconds.
-;;  SCALE is the multiplier for waiting time.
-;;  SCALE > 1 slows down the simulation.
-;;
-
-(define  DEFAULT-WAIT    25) 
-(define  SCALE  0.75)
-
-(define  busy-wait
-  (lambda  l
-    (let* ([cur-time   (current-milliseconds)]
-           [wait-time  (if (null? l) DEFAULT-WAIT (car l))]
-           [new-time   (+ cur-time (* SCALE wait-time))])
-      (recur  loop  ()
-        (check-buttons)
-        (yield)
-        (when (< (current-milliseconds) new-time)
-          (loop))))))
-
-(define  check-buttons
-  (lambda  ()
-    (let ([click  (mouse-click?)])
-      (when  click
-        (process-click  click)
-        (check-buttons)))))
-
-(define  wait-for-button
-  (lambda  ()
-    (let ([click  (wait-for-click)])
-      (process-click  click)
-      (check-buttons))))
-
-(define  process-click
-  (lambda  (click)
-    (recur  loop  ([n  1])
-      (cond
-        [(>  n  (max-floor))  (void)]
-        [(click-here? click (UP-CALL-POSN n) CALL-WIDTH CALL-HEIGHT)
-         (push-up-call  n)]
-        [(click-here? click (DOWN-CALL-POSN n) CALL-WIDTH CALL-HEIGHT)
-         (push-down-call  n)]
-        [(click-here? click (DEMAND-POSN n) DEMAND-WIDTH DEMAND-HEIGHT)
-         (push-demand  n)]
-        [(click-here? click STOP-ORIGIN STOP-WIDTH STOP-HEIGHT)
-         (push-stop)]
-        [else  (loop (+ n 1))]))))
-
-(define  click-here?
-  (lambda  (click  origin  horiz  vert)
-    (let* ([x0  (posn-x origin)]
-           [y0  (posn-y origin)]
-           [x   (posn-x (mouse-click-posn click))]
-           [y   (posn-y (mouse-click-posn click))])
-      (and  (<= x0 x (+ x0 horiz))
-            (<= y0 y (+ y0 vert))))))
-
-;;
-;;  Info
-;;  Just floor, goal, dir. 
-;;
-
-(define  INFO-ORIGIN  #f)
-(define-struct einfo  (sym  posn  label  prev) #:mutable)
-
-(define  INFO-LIST
-  (list  (make-einfo  'floor  (make-posn 0 12)   "floor = "  #f)
-         (make-einfo  'goal   (make-posn 0 28)  "goal = "   #f)
-         (make-einfo  'dir    (make-posn 0 44)  "dir = "    #f)))
-
-(define  init-info
-  (lambda  ()
-    (let  loop  ([l  INFO-LIST])
-      (unless  (null? l)
-        (set-einfo-prev!  (car l)  "")
-        (loop  (cdr l))))
-    (info  'floor  1)
-    (info  'goal  1)
-    (info  'dir  'none)))
-
-(define  my-lookup
-  (lambda  (sym)
-    (let  loop  ([l  INFO-LIST])
-      (cond
-        [(null? l)  (error 'info "Unknown info type: ~e" sym)]
-        [(eq? sym (einfo-sym (car l)))  (car l)]
-        [else  (loop  (cdr l))]))))
-
-(define  info
-  (lambda  (sym  obj)
-    (let* ([item  (my-lookup sym)]
-           [posn  (add-posn  INFO-ORIGIN  (einfo-posn item))]
-           [str   (if (string? obj) obj (format "~s" obj))]
-           [full-str  (string-append (einfo-label item) str)])
-      (unless  (string=?  full-str  (einfo-prev item))
-        (c-string  posn  (einfo-prev item))
-        (d-string  posn  full-str)
-        (set-einfo-prev!  item  full-str)))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                           ;;
-;;  Functions to show to the outside world.  ;;
-;;                                           ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;  This is really the (virtual) elevator hardware level.
-;;  This includes state and the basic elevator operations.
-;;  You write an elevator from these primitives.
-;;
-;;  This could be a separate module, but you'd just write all of
-;;  these functions twice.  Also, they make nice guards for the
-;;  graphics functions.
-
-;;  Elevator State
-;;
-;;  the-floor = integer 1..THE-MAX-FLOOR
-;;  the-doors = 'open, 'closed
-;;  up-call-vec, down-call-vec, demand-vec = vectors 1..THE-MAX-FLOOR
-;;     for buttons, #t = pushed, #f = not pushed
-
-(define  max-floor  #f)
-(define  the-floor  #f)
-(define  the-doors  #f)
-(define  up-call-vec  #f)
-(define  down-call-vec  #f)
-(define  demand-vec  #f)
-(define  exit-continuation  #f)
-
-;;  Initialize the hardware state and draw the picture.
-;;  f = THE-MAX-FLOOR,  k = exit continuation
-
-(define  make-elevator
-  (lambda  (f  k)
-    (let ([n  (add1 f)])
-      (set!  max-floor  (lambda () f))
-      (set!  exit-continuation  k)
-      (set!  the-floor  1)
-      (set!  the-doors  'open)
-      (set!  up-call-vec    (build-vector n (lambda (i) #f)))
-      (set!  down-call-vec  (build-vector n (lambda (i) #f)))
-      (set!  demand-vec     (build-vector n (lambda (i) #f)))
-      (init-graphics))))
-
-(define  push-stop  
-  (lambda  ()  (exit-continuation  'game-over)))
-
-;;  Functions that use the-floor.
-;;  Only (move-up-floor) and (move-down-floor) are allowed to use
-;;  the-floor and THE-MAX-FLOOR directly.
-
-(define  current-floor  (lambda  ()  the-floor))
-
-(define  move-up-floor
-  (lambda  ()
-    (if  (=  the-floor  (max-floor))
-         (error  'move-up-floor  "Elevator already at MAX-FLOOR")
-         (begin  (info  'dir  'up)
-                 ;;  (info  'floor  (format "~s~s" the-floor '+))
-                 (when  (open?)  (close-doors))
-                 (draw-up-floor)
-                 (set!  the-floor  (add1 the-floor))
-                 (info  'floor  the-floor)))))
-
-(define  move-down-floor
-  (lambda  ()
-    (if  (=  the-floor  1)
-         (error  'move-down-floor  "Elevator already at ground floor")
-         (begin  (info  'dir  'down)
-                 ;;  (info  'floor  (format "~s~s" the-floor '-))
-                 (when  (open?)  (close-doors))
-                 (draw-down-floor)
-                 (set!  the-floor  (sub1 the-floor))
-                 (info  'floor  the-floor)))))
-
-;;  Functions that use the-doors.
-;;  Again, only (open-doors) and (close-doors) are allowed to use
-;;  the-doors directly.
-
-(define  open?  (lambda  ()  (eq? the-doors 'open)))
-
-(define  open-doors
-  (lambda  ()
-    (unless  (open?)
-      (draw-open-doors)
-      (set!  the-doors  'open))))
-
-(define  close-doors
-  (lambda  ()
-    (when  (open?)
-      (draw-close-doors)
-      (set!  the-doors  'closed))))
-
-;;  Functions that use buttons: up/down-calls, demands.
-;;  Again, these are the only functions that are allowed to use
-;;  up/down-calls and demands directly.
-
-(define  up-call?    (lambda  (floor)  (vector-ref up-call-vec floor)))
-(define  down-call?  (lambda  (floor)  (vector-ref down-call-vec floor)))
-(define  demand?     (lambda  (floor)  (vector-ref demand-vec floor)))
-
-(define  update-input  check-buttons)
-(define  wait-for-input  wait-for-button)
-
-(define  clear-up-call
-  (lambda  (floor)
-    (when  (up-call?  floor)
-      (draw-clear-up  floor)
-      (vector-set!  up-call-vec  floor  #f))))
-
-(define  clear-down-call
-  (lambda  (floor)
-    (when  (down-call?  floor)
-      (draw-clear-down  floor)
-      (vector-set!  down-call-vec  floor  #f))))
-
-(define  clear-demand
-  (lambda  (floor)
-    (when  (demand?  floor)
-      (draw-clear-demand  floor)
-      (vector-set!  demand-vec  floor  #f))))
-
-;;  The push functions are not visible outside, but they need to
-;;  be here because graphics calls them.
-
-(define  push-up-call
-  (lambda  (floor)
-    (when  (not  (up-call? floor))
-      (paint-up-call  floor)
-      (vector-set!  up-call-vec  floor  #t))))
-
-(define  push-down-call
-  (lambda  (floor)
-    (when  (not  (down-call? floor))
-      (paint-down-call  floor)
-      (vector-set!  down-call-vec  floor  #t))))
-
-(define  push-demand
-  (lambda  (floor)
-    (when  (not  (demand? floor))
-      (paint-demand  floor)
-      (vector-set!  demand-vec  floor  #t))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                     ;;
-;;  SOFTWARE level for elevator.       ;;
-;;                                     ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;  Here, you design your own elevator, using the primitives from
-;;  the graphics-module and the user's Control function.
-
-(define  THE-MAX-FLOOR  8)
-
-(define  start-program
-  (lambda  ()
-    (dynamic-wind
-     (lambda ()
-       (unless  (graphics-open?)  (open-graphics)))
-     (lambda ()
-       (call/cc
-        (lambda  (k)
-          (make-elevator  THE-MAX-FLOOR  k)
-          (elevator  'open  #f  'up))))
-     close-graphics)
-    (lambda () #t)))
-
-;;
-;;  Main Loop.
-;;
-;;  This version gives the user complete control.
-;;  All we do is ask the user for a goal, move one floor closer,
-;;  check to see if we're at the goal (stop and open doors if so),
-;;  and ask for another goal. 
-;;  Any kind of fairness or ignoring the down-calls when moving up
-;;  is totally up to Control.
-;;
-;;  floor, goal = integer 1..THE-MAX-FLOOR
-;;  state = 'arrive, 'open, 'wait, 'move
-;;    'arrive = just arrived at this floor, check if it's the goal
-;;    'open = open doors, wait, ignore goal, get new one
-;;    'wait = no requests, wait until there is one
-;;    'move = start moving toward the goal
-;;  dir = 'up, 'down
-;;
-;;  We call new-goal at each floor.
-;;
-
-(define  OPEN-DOOR-WAIT-TIME  1500)
-
-(define  elevator
-  (lambda  (state  goal  dir)
-    (let ([floor  (current-floor)])
-      (cond
-        [(eq?  state  'arrive)
-         (if  (=  floor  goal)
-              (elevator  'open  goal  dir)
-              (elevator  'move  (new-goal dir)  dir))]
-        [(eq?  state  'open) 
-         (begin
-           (open-doors)
-           (clear-all-buttons  floor)
-           (busy-wait  OPEN-DOOR-WAIT-TIME)
-           (update-input)
-           (clear-all-buttons  floor)
-           (elevator  'wait  (new-goal dir)  dir))]
-        [(eq?  state  'wait)
-         (if  (=  floor  goal)
-              (begin
-                (update-input)
-                (clear-all-buttons  floor)
-                (wait-for-request)
-                (elevator  'wait  (new-goal dir)  dir))
-              (elevator  'move  goal  dir))]
-        [(=  goal  floor)  
-         (elevator  'open  goal  dir)]
-        [(<  goal  floor)
-         (begin  
-           (move-down-floor)
-           (elevator  'arrive  goal  'down))]
-        [(>  goal  floor)
-         (begin  
-           (move-up-floor)
-           (elevator  'arrive  goal  'up))]
-        [else  (error 'elevator "Internal error in main loop")]))))
-
-;;  Don't get stuck on the same floor forever.
-
-(define  clear-all-buttons
-  (lambda  (floor) 
-    (clear-up-call  floor)
-    (clear-down-call  floor) 
-    (clear-demand  floor)))
-
-;;  Don't return until at least one button is pushed.
-
-(define  wait-for-request
-  (lambda  ()
-    (recur  loop  ([n  1])
-      (cond
-        [(> n (max-floor))  (wait-for-input)]
-        [(or  (up-call? n)  (down-call? n)  (demand? n))  #t]
-        [else  (loop  (add1 n))]))))
-
-;;  Call the user's function Control and check that the floor is valid.
-
-(define  list-of-floors
-  (lambda  ()
-    (recur  loop  ([f  (max-floor)]  [l  null])
-      (cond
-        [(= f 0)  l]
-        [(or (up-call? f) (down-call? f) (demand? f))
-         (loop  (sub1 f)  (cons f l))]
-        [else  (loop  (sub1 f)  l)]))))
-
-(define  new-goal
-  (lambda  (dir)
-    (update-input)
-    (let 
-        ([ans  (Next-Floor  dir (current-floor)  (list-of-floors))]) 
-      (if  (and  (integer? ans)  (exact? ans)  (<= 1 ans (max-floor)))
-           (begin  (info  'goal  ans)  ans)
-           (error 'Next-Floor "~e is not a valid floor number" ans)))))
-
-;;  Functions to show the user.
-;;  Remember, the elevator calls Next-Floor, not the other way.
-
-(define Next-Floor (lambda x (error 'Next-Floor "undefined")))
-
-(define  run/proc 
-  (lambda (f)
-    (check-proc 'run f 3 'first "3 arguments")
-    (set! Next-Floor f)
-    (start-program)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/error.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/error.rkt
deleted file mode 100644
index 777ff2bf4c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/error.rkt
+++ /dev/null
@@ -1,164 +0,0 @@
-#lang racket/base
-
-(require lang/private/rewrite-error-message)
-
-;; -----------------------------------------------------------------------------
-;; this module provides one-point functionality to report errors in teachpacks 
-
-;; -----------------------------------------------------------------------------
-(provide check-arg
-         check-list-list
-         check-arity
-         check-proc
-         check-result 
-         check-fun-res
-         check-color
-         check-dependencies
-         natural?
-         number->ord
-         find-non 
-         tp-exn?
-         tp-error)
-
-;; check-arg : sym bool str (or/c str non-negative-integer) TST -> void
-(define (check-arg pname condition expected arg-posn given)
-  (unless condition
-    (tp-error pname "expects ~a as ~a argument, given ~e"
-              (add-article expected) 
-              (spell-out arg-posn)
-              given)))
-
-;; Symbol (union true String) String X -> void
-(define (check-list-list pname condition pred given)
-  (when (string? condition)
-    (tp-error pname (string-append condition (format "\nin ~e" given)))))
-
-;; check-arity : sym num (list-of TST) -> void
-(define (check-arity name arg# args)
-  (unless (= (length args) arg#)
-    (tp-error name (argcount-error-message #f arg# (length args)))))
-
-;; check-proc : sym (... *->* ...) num (union sym str) (union sym str) -> void
-(define (check-proc name f exp-arity arg# arg-err)
-  (define arg#-text (if (number? arg#) (number->ord arg#) arg#))
-  (unless (procedure? f)
-    (tp-error name "expected a function as ~a argument; given ~e" arg#-text f))
-  (define arity-of-f (procedure-arity f))
-  (unless (procedure-arity-includes? f exp-arity)
-    (tp-error name "expected function of ~a as ~a argument; given function of ~a "
-              arg-err arg#-text
-              (cond
-                [(number? arity-of-f)
-                 (if (= arity-of-f 1)
-                     (format "1 argument")
-                     (format "~s arguments" arity-of-f))]
-                [(arity-at-least? arity-of-f) "variable number of arguments"]
-                [else (format "multiple arities (~s)" arity-of-f)]))))
-
-;; Symbol (_ -> Boolean) String X  X *-> X 
-(define (check-result pname pred? expected given . other-given)
-  (if (pred? given)
-      given
-      (tp-error pname "is expected to return ~a, but it returned ~v" 
-                (add-article expected) 
-                (if (pair? other-given)
-                    (car other-given)
-                    given))))
-
-;; check-color : symbol (or/c str non-negative-integer) TST -> void
-(define (check-color pname arg-pos given)
-  (check-arg pname
-             (or (string? given)
-                 (symbol? given))
-             'color
-             arg-pos given)
-  ;; this would be good to check, but it isn't possible, since this
-  ;; file is not allowed to rely on mred. 
-  ;; also nice would be to allow color% objects here, but that's
-  ;; not possible for the same reason (but that is why 
-  ;; the '[else color]' case is below in the cond.
-  #;
-  (let ([color
-         (cond
-           [(symbol? given)
-            (send the-color-database find-color (symbol->string given))]
-           [(string? given)
-            (send the-color-database find-color given)]
-           [else given])])
-    (unless color
-      (tp-error pname 
-                "expected the name ~e to be a color, but did not recognize it"
-                given))))
-
-;; (: check-fun-res (∀ (γ) (∀ (β α ...) (α ...α -> β)) (_ -γ-> boolean) _ -> γ))
-(define (check-fun-res f pred? type)
-  (lambda x 
-    (check-result (object-name f) pred? type (apply f x))))
-
-;; check-dependencies : Symbol x Boolean x FormatString x Any* -> Void
-(define (check-dependencies pname condition fmt . args)
-  (unless condition
-    (tp-error pname (apply format fmt args))))
-
-(define-struct (tp-exn exn) ())
-
-(define (tp-error name fmt . args)
-  (raise 
-   (make-exn:fail:contract 
-    (string-append (format "~a: " name) (apply format fmt args))
-    (current-continuation-marks))))
-
-(define (number->ord i)
-  (if (= i 0)
-      "zeroth"
-      (case (modulo i 10)
-        [(0 4 5 6 7 8 9) (format "~ath" i)]
-        [(1) (format "~ast" i)]
-        [(2) (format "~and" i)]
-        [(3) (format "~ard" i)])))
-
-;; (_ -> Boolean) (listof X) -> (union X false)
-;; (not (find-non list? '((1 2 3) (a b c))))
-;; (symbol? (find-non number? '(1 2 3 a)))
-;; (symbol? (find-non list? '((1 2 3) a (b c))))
-(define (find-non pred? l)
-  (let ([r (filter (compose not pred?) l)])
-    (if (null? r) #f (car r))))
-
-(define (natural? w)
-  (and (number? w) (integer? w) (>= w 0)))
-
-;; add-article : anything -> string
-;; (add-article 'color) should be "a color"
-;; (add-article 'acronym) should be "an acronym"
-(define (add-article thing)
-  (let ((s (format "~a" thing)))
-    (string-append
-     (if (starts-with-vowel? s)
-         "an "
-         "a ")
-     s)))
-
-;; starts-with-vowel? : string -> boolean
-(define (starts-with-vowel? s)
-  (and
-   (not (string=? s ""))
-   (member (string-ref s 0) (list #\a #\e #\i #\o #\u))))
-
-;; spell-out : number-or-string -> string
-(define (spell-out arg-posn)
-  (cond
-    [(string? arg-posn) arg-posn]
-    [(number? arg-posn)
-     (case arg-posn
-       [(1) "first"]
-       [(2) "second"]
-       [(3) "third"]
-       [(4) "fourth"]
-       [(5) "fifth"]
-       [(6) "sixth"]
-       [(7) "seventh"]
-       [(8) "eighth"]
-       [(9) "ninth"]
-       [(10) "tenth"]
-       [else (number->ord arg-posn)])]))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/error.txt b/pkgs/htdp-pkgs/htdp-lib/htdp/error.txt
deleted file mode 100644
index 41a5e302e3..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/error.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang scheme
-
-(require (for-syntax srfi/1))
-
-; from John: 
-
-;; define/checks
-;; won't work with more than eight arguments (at least it's a static failure...)
-(define-syntax (define/checks stx)
-  (syntax-case stx ()
-      [(_ (fun-name (argname checker) ...) body ...)
-       (let* ([num-args (length (syntax->list #`(argname ...)))]
-              [posn-names (take (list #'"first" #'"second" #'"third" #'"fourth" #'"fifth" #'"sixth" #'"seventh" #'"eighth")
-                                num-args)])
-         (with-syntax ([(posn-name ...) (datum->syntax #f posn-names)])
-           (with-syntax ([(check-call ...) #`((checker (quote fun-name) argname posn-name) ...)])
-             #`(define (fun-name argname ...)
-                 check-call
-                 ...
-                 body
-                 ...))))]))
-
-
-(define (check-image f s x)
-  (unless (string? s) 
-    (error f "string expected as ~a argument, given ~e " x s)))
-
-(define-struct position (x y))
-
-(define (check-coordinate f s x)
-  (unless (position? s)
-    (error f "position expected as ~a argument, given ~e" x s)))
-
-;; plonk a shape down at some given set of coordinates
-;; plonk-at : shape number number -> shapelist
-(define/checks (plonk-at [shape check-image]
-                         [x check-coordinate]
-                         [y check-coordinate])
-  (list (make-position (make-position x y) shape)))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/graphing.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/graphing.rkt
deleted file mode 100644
index c3810a01c0..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/graphing.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang scheme
-
-(require htdp/error
-         lang/posn
-         lang/prim
-         mzlib/unit
-         htdp/draw-sig
-         htdp/big-draw)
-
-(provide-signature-elements draw^)
-
-(provide 
- graph-fun
- graph-line
- )
-
-(module test racket/base)
-
-(define-higher-order-primitive graph-line graph-line/proc (f _))
-(define-higher-order-primitive graph-fun graph-fun/proc (f _))
-
-;; --------------------------------------------------------------------------
-
-;; make-graph : sym -> void
-;; effect: set up pasteboard for drawing functions 
-;;   between [0,10] and [0,10] on x/y axis 
-(define (make-graph name)
-  (start EAST SOUTH)
-  (let* ([vp+pm #cs(get-@VP)]
-         [vp    (car vp+pm)])
-    (draw-solid-line ORIGIN X-AXIS 'blue)
-    ((draw-string vp) (make-posn (+ OFFSET 10) (+ OFFSET 10)) "Y-AXIS")
-    (draw-solid-line ORIGIN Y-AXIS 'blue)
-    ((draw-string vp) (make-posn (- EAST 100) (- SOUTH 15)) "X-AXIS")))
-
-;; (num -> num) symbol -> true
-;; effect: draw function graph for x in [0,10] at delta = .1
-(define (graph-line/proc f color)
-  (check 'graph-line f color)
-  (let ((p1 (translate (make-posn 0 (f 0))))
-        (p2 (translate (make-posn 10 (f 10)))))
-    (draw-solid-line p1 p2 color)))
-
-;; (num -> num) symbol -> true
-;; effect: draw function graph for x in [0,10] at delta = .1
-(define (graph-fun/proc f color)
-  (check 'graph-fun f color)
-  (draw-tab (map translate (tabulate f 0 10 DELTA)) color))
-
-;; check : tst tst tst -> void
-(define (check tag f color)
-  (check-proc tag f 1 '1st "one argument")
-  (check-arg tag (symbol? color) 'symbol '2nd color))
-
-;; tabulate : (num -> num) num num num -> (list-of (make-posn num num))
-(define (tabulate f left right delta)
-  (if (> left right) null
-      (cons (make-posn left (f left))
-            (tabulate f (+ left delta) right delta))))
-
-;; translate : posn -> posn
-(define (translate p)
-  (make-posn (+ (* FACT (/ 1 DELTA) (posn-x p)) OFFSET) 
-             (- (- SOUTH (* FACT (/ 1 DELTA) (posn-y p))) OFFSET)))
-
-;; draw-tab : (list-of (make-posn num num)) symbol -> true
-(define (draw-tab lop color)
-  (for-each (lambda (p) (draw-solid-disk p DOT color)) lop)
-  (unless (or (null? lop) (null? (cdr lop)))
-    (let loop ([f (car lop)][r (cdr lop)])
-      (unless (null? r) 
-        (let ([next (car r)])
-          (draw-solid-line f next color)
-          (loop next (cdr r))))))
-  #t)
-
-(define EAST  400)
-(define SOUTH EAST)
-(define FACT  (/ (- EAST 100) 100))
-(define OFFSET   10.)
-(define ORIGIN (make-posn OFFSET          (- SOUTH OFFSET)))
-(define X-AXIS (make-posn OFFSET OFFSET))
-(define Y-AXIS (make-posn (- EAST OFFSET) (- SOUTH OFFSET)))
-(define GRAPH-COLOR 'red)
-
-(define DELTA .1)
-(define DOT   1)
-
-(make-graph 'ok)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/guess-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/guess-gui.rkt
deleted file mode 100644
index f1f67a55ee..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/guess-gui.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#cs(module guess-gui mzscheme
-  (require htdp/error
-	   mred
-	   mzlib/class
-           mzlib/list
-           mzlib/etc
-           lang/prim)
-  
-  (provide
-   connect ; (button% event% -> true) -> true 
-   control ; N -> DIGIT 
-   view    ; X -> true
-   )
-  
-  (define-primitive control control/proc)
-  (define-primitive view view/proc)
-  (define-higher-order-primitive connect connect/proc (call-back))
-
-  ;; ------------------------------------------------------------------------
-  ;; Basic constants: 
-  (define TITLE "Number Guessing")
-  (define WIDTH 100)
-  (define HIGHT 80)
-  (define GUESS 3)
-  
-  ;; DIGIT = (union 0 1 2 3 4 5 6 7 8 9)
-  (define DIGITS (build-list 10 (lambda (i) (number->string i))))
-  
-  ;; ------------------------------------------------------------------------
-  ;; GUI LAYOUT 
-  (define frame (make-object frame% TITLE #f WIDTH HIGHT))
-  (define verti (make-object vertical-panel% frame))
-  (define panel (make-object horizontal-panel% verti))
-  (send panel set-alignment 'center 'center)
-  
-  ;; ------------------------------------------------------------------------
-  ;; guess : handle CONTROL
-  (define guess-panel (make-object horizontal-panel% verti '(border)))
-  (define (make-choices n)
-    (cons (make-object choice% #f DIGITS guess-panel void)
-          (cond
-            [(= n 0) empty]
-            [else (make-choices (sub1 n))])))
-  
-  (define guess-choices (make-choices (sub1 GUESS)))
-  
-  ;; control : N -> DIGIT
-  ;; to read out the i-th guess choice, starting with 0
-  (define (control/proc i)
-    (check-arg 'control
-               (and (number? i) (integer? i) (exact? i) (<= 0 i (sub1 GUESS))) 
-               (format "number in 0 ...~s" GUESS) "first" i)
-    '(if (and (number? i) (integer? i) (exact? i) (<= 0 i (sub1 GUESS)))
-         ...  
-         (printf "control: improper index, expected 0 ... ~s\n" GUESS))
-    (send (list-ref guess-choices (- GUESS i 1)) get-selection))
-  
-  ;; connect : (button% control-event% -> true) -> true
-  ;; effect: to add a check button with call-back to frame and to show frame 
-  (define check-button #f)
-  (define (connect/proc call-back)
-    (check-proc 'connect call-back 2 '1st "2 arguments")
-    (if check-button
-        (printf "connect: called a second time\n")
-        (begin
-          (set! check-button 
-                (make-object button% "Check" guess-panel call-back '(border)))
-          (send frame show #t))))
-  
-  ;; ------------------------------------------------------------------------
-  ;; message : display VIEW 
-  (define VIEW-fmt "View the result: ~a")
-  (define VIEW0 (format VIEW-fmt (make-string (* 2 GUESS) #\space)))
-  (define message-field (make-object message%  VIEW0 verti))
-  
-  ;; view : X -> void
-  ;; effect: to display n in the message panel 
-  (define (view/proc n) (send message-field set-label (format VIEW-fmt n)))
-  )
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/guess.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/guess.rkt
deleted file mode 100644
index d7e991df3d..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/guess.rkt
+++ /dev/null
@@ -1,217 +0,0 @@
-#lang scheme/gui
-
-(require htdp/error
-         lang/prim
-         mzlib/unitsig
-         mzlib/etc
-         mzlib/class
-         mzlib/list)
-
-(provide 
- guess-with-gui
- guess-with-gui-3
- guess-with-gui-list
- )
-
-(define-higher-order-primitive guess-with-gui guess-with-gui/proc 
-  (check-guess))
-(define-higher-order-primitive guess-with-gui-3 guess-with-gui-3/proc 
-  (check-guess))
-(define-higher-order-primitive guess-with-gui-list guess-with-gui-list/proc 
-  (_ check-guess-list))
-
-
-;                                                                  
-;                                                                  
-;                                                                  
-;     ;;;;                                                         
-;    ;    ;                                                        
-;   ;                               ;                   ;          
-;   ;         ;;;;   ; ;;;    ;;;; ;;;;   ;;;   ; ;;;  ;;;;   ;;;; 
-;   ;        ;    ;  ;;   ;  ;      ;    ;   ;  ;;   ;  ;    ;     
-;   ;        ;    ;  ;    ;  ;      ;        ;  ;    ;  ;    ;     
-;   ;        ;    ;  ;    ;   ;;;   ;     ;;;;  ;    ;  ;     ;;;  
-;   ;        ;    ;  ;    ;      ;  ;    ;   ;  ;    ;  ;        ; 
-;    ;    ;  ;    ;  ;    ;      ;  ;    ;   ;  ;    ;  ;        ; 
-;     ;;;;    ;;;;   ;    ;  ;;;;    ;;   ;;;;; ;    ;   ;;  ;;;;  
-;                                                                  
-;                                                                  
-;                                                                  
-
-(define TITLE "Bobby's Game")
-
-(define WELCOME "Welcome to Bobby's Game") 
-
-(define DIGITS (build-list 10 (lambda (i) (number->string i))))
-
-(define BUT-SIZE 10)
-
-(define WIDTH BUT-SIZE) ; (* 5 BUT-SIZE)
-
-(define HIGHT BUT-SIZE)
-
-(define STOPS (list 'Perfect 'perfect 'perfect! 'perfect_guess))
-
-(define TRUMPET
-  (make-object bitmap% 
-    (build-path (collection-path "icons") "trumpet.xbm")
-    'xbm))
-
-
-;                                     
-;                                     
-;                                     
-;     ;;;;                            
-;    ;    ;                           
-;   ;                                 
-;   ;         ;;;   ; ;;; ;;     ;;;  
-;   ;        ;   ;  ;;  ;;  ;   ;   ; 
-;   ;            ;  ;   ;   ;   ;   ; 
-;   ;     ;   ;;;;  ;   ;   ;   ;;;;; 
-;   ;     ;  ;   ;  ;   ;   ;   ;     
-;    ;    ;  ;   ;  ;   ;   ;   ;     
-;     ;;;;;   ;;;;; ;   ;   ;    ;;;; 
-;                                     
-;                                     
-;                                     
-
-
-
-#| ------------------------------------------------------------------------
-     
-     ------------------------------------------------------------------
-     |       
-     |   CB1  CB2   CB3   CB4   .......   CB*   CB*   CB*   CB*   CB* 
-     | 
-     |          CB-GUESS1    ...    CB-GUESS*
-     | 
-     |                     ONE-MESSAGE
-     ------------------------------------------------------------------
-
-     Two horizontal panels: 
-       the first one with all the colors (as buttons)
-       the second is a sequence of colored buttons 
-     |#
-
-;; ------------------------------------------------------------------------
-;; Setting up the buttons
-
-(define (init-game number-of-digits convert check-guess)
-  (local ((define GUESS number-of-digits)
-          
-          ;; layout
-          (define frame (make-object frame% TITLE #f WIDTH HIGHT))
-          
-          (define verti (make-object vertical-panel% frame))
-          
-          (define panel
-            (let ([panel (make-object horizontal-panel% verti)])
-              (send panel set-alignment 'center 'center)
-              panel))
-          
-          (define guess-panel
-            (let ([guess-panel (make-object horizontal-panel% verti)])
-              (send guess-panel set-alignment 'center 'center)
-              guess-panel))
-          
-          (define message-panel
-            (let ([message-panel (make-object horizontal-panel% verti)])
-              (send message-panel set-alignment 'center 'center)
-              message-panel))
-          
-          ;; message : a field for displaying basic messages about state of game 
-          (define message  (make-object message% WELCOME message-panel))
-          
-          ;; guesses: status vector, record the choice of digit when set
-          (define guesses (make-vector GUESS 0))
-          
-          ;; the-number : randomly chosen 
-          (define the-number 0)
-          
-          ;; new-game : -> void
-          ;; effect: set up new target number, send message that game's ready 
-          (define (new-game) 
-            (set! the-number (random (expt 10 GUESS)))
-            (send message-panel change-children (lambda (x) (list message)))
-            (send message set-label WELCOME))
-          
-          ;; call-back : _ _ -> void
-          ;; check status and announce result, possibly set winner
-          (define (call-back x y)
-            (let ((response (check-guess (convert guesses) the-number)))
-              (send message set-label (symbol->string response))
-              (when (memq response STOPS)
-                ;; announce winner and set up new game
-                (send message-panel change-children (lambda (x) empty))
-                (make-object message% TRUMPET message-panel)
-                (make-object button% "New Game?" message-panel 
-                  (lambda (x y) (new-game)))
-                (make-object button% "CLOSE?" message-panel
-                  (lambda (x y) (send frame show #f)))))))
-    
-    ;; making the menu choices 
-    (for-each (lambda (i)
-                (local ((define n (- GUESS i 1)))
-                  (make-object choice% #f DIGITS panel 
-                    (lambda (x y)
-                      (vector-set! guesses n (send x get-selection))))))
-              (build-list GUESS identity))
-    
-    (new-game)
-    (make-object button% "Check" guess-panel call-back)
-    (send frame show #t)
-    #t))
-
-
-;                                                  
-;                                                  
-;                                                  
-;   ;;;;;                                          
-;   ;                                              
-;   ;                                   ;          
-;   ;     ;     ;  ; ;;;    ;;;;   ; ;;;;;;   ;;;; 
-;   ;;;;   ;   ;   ;;   ;  ;    ;  ;;   ;    ;     
-;   ;       ; ;    ;    ;  ;    ;  ;    ;    ;     
-;   ;        ;     ;    ;  ;    ;  ;    ;     ;;;  
-;   ;       ; ;    ;    ;  ;    ;  ;    ;        ; 
-;   ;      ;   ;   ;;   ;  ;    ;  ;    ;        ; 
-;   ;;;;; ;     ;  ; ;;;    ;;;;   ;     ;;  ;;;;  
-;                  ;                               
-;                  ;                               
-;                  ;                               
-
-
-;; convert : (vector DIGIT) -> number
-;; to convert a vector of digits into a number 
-;; 0-th digit is right-most digit in number, 
-;; N-th digit is left-most digit in number
-(define (convert guesses:vec)
-  (local ((define (convert digits)
-            (cond
-              ((empty? digits) 0)
-              (else (+ (first digits) (* (convert (rest digits)) 10))))))
-    (convert (vector->list guesses:vec))))
-
-;; guess-with-gui : (num num -> num) -> void
-;; effect: init target, init frame, set the check-guess function and show the frame
-(define (guess-with-gui/proc cg)
-  (check-proc 'guess-with-gui cg 2 'first "two arguments")
-  (init-game 5 convert cg))
-
-;; guess-with-gui-3 : (digit digit digit num -> num) -> void
-;; effect: init target, init frame, set the check-guess function and show the frame
-(define (guess-with-gui-3/proc cg)
-  (check-proc 'guess-with-gui-3 cg (+ 3 1) 'first "four arguments")
-  (init-game 3 vector->list
-             (lambda (lod target) (apply cg (append lod (list target))))))
-
-;; guess-with-gui-list : num ((listof digit) num -> num) -> void
-;; effect: init target, init frame, set the check-guess function and show the frame
-(define (guess-with-gui-list/proc n cg)
-  (check-arg  'guess-with-gui-list
-              (and (number? n) (integer? n) (>= n 1)) "positive integer" '1st n)
-  (check-proc 'guess-with-gui-list cg 2 'first "two arguments")
-  (unless  (<= (expt 10 n) 2147483647)
-    (error 'guess-with-gui-list "the given number of digits (~a) is too large" n))
-  (init-game n vector->list cg))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/gui.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/gui.rkt
deleted file mode 100644
index fd1bb80b62..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/gui.rkt
+++ /dev/null
@@ -1,192 +0,0 @@
-;; This is a modified version of the original "gui.ss" teachpack:
-;;   - Instead of having one window, each call to "create-window"
-;;     returns a window
-;;   - Message items stretch horizontally to fill the window, 
-;;     avoiding the need for long initialization messages
-#lang scheme/gui
-
-(require htdp/error
-         lang/prim
-         mzlib/class
-         mzlib/list
-         mzlib/etc)
-
-(provide-primitives
- window?       ; any/c -> boolean 
- create-window ; (listof (listof GUI-ITEM)) -> window
- show-window   ; window -> true
- hide-window   ; window -> true
- make-text     ; Str -> GUI-ITEM
- text-contents ; GUI-ITEM[text%] -> Str
- make-choice   ; (listof Str) -> GUI-ITEM
- choice-index  ; GUI-ITEM[choice%] -> Str
- ; make-button ; Str (Event% -> Boolean) -> GUI-ITEM
- make-message  ; Str -> GUI-ITEM
- draw-message  ; GUI-ITEM[message%] Str -> true
- )
-
-(provide-higher-order-primitive make-button (_ call-back))
-
-#| ------------------------------------------------------------------
-  Students build a window from a "matrix" list of GUI-ITEMS. 
-  To build GUI-ITEMs, they need to use make-text, make-choice, 
-  make-button, make-choice, or make-message. A GUI-ITEM can be 
-  added to the window only once. 
-  
-  |#
-
-;; INFRASTRUCTURE OPERATIONS:
-;; ------------------------------------------------------------------
-
-(define-struct window (get-frame))
-
-;; show-window : -> true
-;; effect: to show the window
-(define (show-window w)
-  (check-arg 'show-window (window? w) "window" "its" w)
-  (send ((window-get-frame w)) show true)
-  true)
-
-;; hide-window : X -> true
-;; effect: to hide the window 
-(define (hide-window w)
-  (check-arg 'hide-window (window? w) "window" "its" w)
-  (send ((window-get-frame w)) show false)
-  true)
-
-;; MAKING ITEMS:
-;; ------------------------------------------------------------------
-
-(define-struct gui-item (builder))
-;; A gui-item[C < control%] is a structure: (make-gui-item f)
-;; where f is a function: (panel% -> C)
-
-;; create-gui-item : ((union panel% #f) -> C[< control%])
-;; to create a memoizing gui-item
-;; create-window is the only caller that can pass in a panel
-;; exceptions: ;; if the gui-item is already "panel'ed", error
-;; all other callers must pass in #f
-(define (create-gui-item builder)
-  (let ([C false])
-    (make-gui-item
-     (lambda (p)
-       (cond
-         [(and p C)
-          (error 'create-window "item added to window twice")]
-         [(and p (not C)) (set! C (builder p)) C]
-         [(and (not p) C) C]
-         [(and (not p) (not C))
-          (error 'gui "gui-items must be added to window before use (see create-window)")])))))
-
-;; create-window : (listof (listof gui-item)) -> true
-;; to add gui-items to the window and to show window
-(define (create-window loi)
-  (check-list-list 'create-window (listoflistof? gui-item? "gui-item" loi) "gui-items" loi)
-  
-  (let ([the-frame (make-object frame% "GUI" false 10 10)])
-    (for-each (lambda (loi)
-                (let ((p (make-object horizontal-pane% the-frame)))
-                  (send p set-alignment 'center 'center)
-                  (for-each (lambda (i) ((gui-item-builder i) p)) loi)))
-              loi)
-    (let ([w (make-window (lambda () the-frame))])
-      (show-window w)
-      w)))
-
-;; (_ -> Boolean) String X -> (union String true)
-(define (listoflistof? pred? pred given)
-  (cond
-    [(not (list? given)) (format NONLIST given)]
-    [(find-non list? given)
-     => (lambda (non-list)
-          (format NONLISTLIST non-list))]
-    [(ormap identity (map (lambda (ll) (find-non pred? ll)) given))
-     => (lambda (non-x)
-          (format NONX pred non-x))]
-    [else #t]))
-
-(define NONLIST "list expected, given: ~e")
-(define NONLISTLIST "list of lists expected, given list with ~e")
-(define NONX "list of lists of ~a expected, given list of lists with ~e")
-
-
-#| Tests ------------------------------------------------------------------
-  (listoflistof? number? "number" '((1 2 3) (4 5 6)))
-  
-  (string=? (format NONX "number" 'a)
-            (listoflistof? number? "number" '((1 2 3) (4 a 6))))
-  
-  (string=? (format NONLISTLIST 1)
-            (listoflistof? number? "number" '(1 (2 3) (4 5 6))))
-  |#
-
-;; make-text : str -> gui-item
-;; to create a text-item with label lbl
-(define (make-text lbl)
-  (check-arg 'make-text (string? lbl) "string" "first" lbl)
-  (create-gui-item
-   (lambda (the-panel) 
-     (make-object text-field% lbl the-panel void))))
-
-;; make-message : str -> gui-item
-;; to create a message-item with current contents txt
-(define (make-message txt)
-  (check-arg 'make-message (string? txt) "string" "first" txt)
-  (create-gui-item 
-   (lambda (the-panel)
-     (new message% [label txt] [parent the-panel] [stretchable-width #t]))))
-
-;; make-button : str (event% -> boolean) -> gui-item
-;; to create a button-item with label and call-back function 
-(define (make-button label call-back)
-  (check-arg 'make-button (string? label) "string" 'first label)
-  (check-proc 'make-button call-back 1 'second "1 argument")
-  (create-gui-item 
-   (lambda (the-panel)
-     (make-object button% label
-       the-panel
-       (lambda (b e)
-         (check-result 'button-callback boolean? "Boolean" (call-back e)))))))
-
-;; make-choice : (listof str) -> gui-item
-;; to create a choice-item that permits users to choose from the
-;; alternatives on loc
-(define (make-choice loc)
-  (check-arg 'make-choice (and (list? loc) (andmap string? loc)) "list of strings" "first" loc)
-  (create-gui-item 
-   (lambda (the-panel)
-     (make-object choice% "" loc the-panel void))))
-
-;; DISPLAYING MESSAGES:
-;; ------------------------------------------------------------------
-
-;; draw-message : gui-item[message%] str -> true
-;; to change the current contents of a message field 
-(define (draw-message msg txt)
-  (check-arg 'draw-message (gui-item? msg) "gui-item" "first" msg)
-  (check-arg 'draw-message (string? txt) "string" "second" txt)   
-  (let* ([o ((gui-item-builder msg) #f)])
-    (when (<= (send o min-width) (string-length txt))
-      (let*-values ;; MF: I couldn't think of a better way of doing this
-          ([(m) (new message% [parent (new frame% [label "hello"])][label txt])]
-           [(x y) (send m get-graphical-min-size)])
-        (send o min-width x)))
-    (send o set-label txt)
-    true))
-
-;; PROBING ITEMS:
-;; ------------------------------------------------------------------
-
-;; text-contents : gui-item[text-field%] -> str
-;; to determine the contents of a text-item 
-(define (text-contents a-text-gui)
-  (check-arg 'text-contents (gui-item? a-text-gui) "gui-item" "first" a-text-gui)
-  (send ((gui-item-builder a-text-gui) #f) get-value))
-
-;; choice-index : gui-item[choice%] -> number
-;; to determine which choice is currently selected in a choice-item 
-(define (choice-index a-choice)
-  (check-arg 'choice-index (gui-item? a-choice) "gui-item" "first" a-choice)      
-  (send ((gui-item-builder a-choice) #f) get-selection))
-
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/hangman-play.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/hangman-play.rkt
deleted file mode 100644
index 51b69a4f2b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/hangman-play.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang scheme
-
-(require htdp/hangman
-         htdp/big-draw
-         lang/prim
-         lang/posn)
-
-(provide go)
-
-(define-primitive go go/proc)
-
-#| ------------------------------------------------------------------------
-  draw-next-part :
-  { 'noose 'head 'right-arm 'left-arm 'body 'right-leg 'left-leg } -> #t
-  result: #t if things went okay
-  effect: to draw the specified body part in a canvas of size W x H
-  credit: John Clements 
-  |#
-(define (draw-next-part body-part)
-  (cond ((eq? body-part 'body)
-         (draw-solid-line (make-posn 100 60) (make-posn 100 130) 'black))
-        ((eq? body-part 'right-leg)
-         (draw-solid-line (make-posn 100 130) (make-posn 30 170) 'black))
-        ((eq? body-part 'left-leg)
-         (draw-solid-line (make-posn 100 130) (make-posn 170 170) 'black))
-        ((eq? body-part 'right-arm)
-         (draw-solid-line (make-posn 100 75) (make-posn 40 65) 'black))
-        ((eq? body-part 'left-arm)
-         (draw-solid-line (make-posn 100 75) (make-posn 160 65) 'black))
-        ((eq? body-part 'head)
-         (draw-circle (make-posn 100 50) 10 'black))
-        ((eq? body-part 'noose)
-         (and
-          (draw-solid-line (make-posn 100 30) (make-posn 100 10) 'black)
-          (draw-solid-line (make-posn 100 10) (make-posn 0 10) 'black)
-          (draw-solid-line (make-posn 115 35) (make-posn 123 43) 'black)
-          (draw-solid-line (make-posn 123 35) (make-posn 115 43) 'black)
-          (draw-solid-line (make-posn 131 40) (make-posn 139 48) 'black)
-          (draw-solid-line (make-posn 139 40) (make-posn 131 48) 'black)
-          (draw-circle (make-posn 120 50) 30 'red)))))
-
-;; reveal-list : list-of-letters list-of-letters letter -> list-of-letters
-(define (reveal-list l1 l2 gu)
-  (map (lambda (x1 x2)
-         (cond
-           [(eq? x1 gu) gu]
-           [else x2]))
-       l1 l2))
-
-(define (go/proc x)
-  (start 200 400)
-  (hangman-list reveal-list draw-next-part))    
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/hangman.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/hangman.rkt
deleted file mode 100644
index c12d5684c9..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/hangman.rkt
+++ /dev/null
@@ -1,294 +0,0 @@
-#lang mzscheme
-(require "error.rkt"
-         "draw-sig.rkt"
-         "big-draw.rkt"
-         mzlib/class
-         mzlib/unit
-         mzlib/etc
-         lang/prim
-         mred)
-
-(provide
- hangman
- hangman-list
- )
-
-(define-higher-order-primitive hangman hangman/proc (make-word reveal draw-next))
-(define-higher-order-primitive hangman-list hangman-list/proc (reveal-list draw-next))
-
-(provide-signature-elements draw^)
-
-#| ------------------------------------------------------------------------
-  The Basic Constants |#
-
-(define TITLE "Hangman")
-(define WELCOME "Welcome to Hangman") 
-(define WINNER  "We have a winner!") 
-(define LOSER   "This is the end, my friend. The word was ~a.") 
-
-(define SMALL_A (char->integer #\a))
-(define LETTERS
-  (build-list 26 (lambda (i) (format "~a" (integer->char (+ SMALL_A i))))))
-
-(define TRUMPET
-  (make-object bitmap% 
-    (build-path (collection-path "icons") "trumpet.xbm")
-    'xbm))
-
-(define PARTS (vector 'right-leg 'left-leg 'left-arm 'right-arm 'body 'head 'noose))
-
-(define NUMBER-OF-GUESSES (vector-length PARTS))
-
-;; char->symbol : char -> symbol 
-(define (char->symbol c)
-  (string->symbol (format "~a" c)))
-
-;; word->list : symbol -> (listof letter)
-(define (word->list sym)
-  (map char->symbol (string->list (symbol->string sym))))
-
-;; WORDS : (listof (list letter letter letter))
-(define WORDS
-  (map word->list
-       '(and
-         are
-         but
-         cat
-         cow
-         dog
-         eat
-         fee
-         gal
-         hat
-         inn
-         jam
-         kit
-         lit
-         met
-         now
-         owl
-         pet
-         rat
-         sea
-         the
-         usa
-         vip
-         was
-         zoo)))
-
-;; WORDS2 : (listof (listof letter))
-(define WORDS2
-  (append (map word->list
-               '(apple
-                 bottle
-                 cattle
-                 drscheme
-                 elephant
-                 folder
-                 gift
-                 hangman
-                 idle
-                 jet
-                 knowledge
-                 length
-                 macintosh
-                 north
-                 ottoman
-                 public
-                 queue
-                 rattlesnake
-                 snow
-                 toddler
-                 under
-                 virus
-                 xylaphon
-                 yellow
-                 zombie))
-          WORDS))
-
-;; ------------------------------------------------------------------------
-;; The GUI
-
-;; two communication channels to GUI; init with setup-gui
-(define status-message #f)
-(define message-panel #f)
-
-;; setup-gui : str ->* message% panel%
-;; to produce a status message and a panel where winning/losing can be announced
-;; effect: set up a new frame, arrange the GUI, and display (blank) status word 
-(define (setup-gui status)
-  (local (#| --------------------------------------------------------------
-             The GUI Layout: (computed as a function of constants)
-             
-             ------------------------------------------------
-             |                                              |
-             |   a ... z    "Check"  "Status"   word        |
-             |   choice%     button%  message%  message%    |
-             |                                              |
-             |         Welcome/Winner/Loser                 |
-             |            message%                          |
-             ------------------------------------------------
-             |#
-          
-          (define frame (make-object frame% TITLE #f 100 50))
-          (define verti (make-object vertical-panel% frame))
-          
-          (define panel (make-object horizontal-panel% verti))
-          (define _1 (send panel set-alignment 'center 'center))
-          
-          (define choice (make-object choice% "Guess:" LETTERS panel void))    
-          
-          ; (make-object message% "  " panel);; added for looks
-          (define check (make-object button% "Check" panel 
-                          (lambda (x y)
-                            (check-guess
-                             (char->symbol
-                              (list-ref LETTERS
-                                        (send choice get-selection)))))))
-          
-          (define _2 (make-object message% " Status: " panel))
-          (define m (make-object message% (uncover status) panel))
-          
-          (define p (make-object horizontal-panel% verti))
-          (define _3 (send p set-alignment 'center 'center))
-          (define _4 (make-object message% WELCOME p)))
-    (set! status-message m)
-    (set! message-panel p)
-    (send frame show #t)))
-
-;; ------------------------------------------------------------------------
-;; The functions for communicating with the GUI
-
-;; a-winner! : -> void
-;; effect: signal win and disable game 
-(define (a-winner!)
-  (send message-panel change-children (lambda (x) null))
-  (make-object message% WINNER message-panel)
-  (make-object message% TRUMPET message-panel))
-
-;; a-loser! : -> void
-;; effect: signal loss and disable game 
-(define (a-loser!)
-  (send message-panel change-children (lambda (x) null))
-  (make-object message% (format LOSER (uncover chosen)) message-panel))
-
-;; ------------------------------------------------------------------------
-;; The functions for playing the game
-
-;; check-guess : symbol -> word 
-;; to check whether guess occurs in the chosen word, using reveal 
-;; effect: update the status word 
-(define (check-guess guess)
-  (let ((result (reveal chosen status guess)))
-    (cond
-      [(equal? result chosen) 
-       (send status-message set-label (uncover chosen))
-       (a-winner!)]
-      [(equal? result status) 
-       (draw-next-part (select-piece!))
-       (when (the-end?) (a-loser!))]
-      [else
-       (set! status result)
-       (send status-message set-label (uncover status))])))
-
-;; uncover : word -> string
-;; to translate the current word into a string, 
-;; using abstraction breaking struct-ref
-(define (uncover a-word)
-  (error 'hangman "impossible"))
-
-;; pieces-left : index into PARTS 
-(define pieces-left NUMBER-OF-GUESSES)
-(define (init-guesses)
-  (set! pieces-left NUMBER-OF-GUESSES))
-
-;; select-piece! : -> void
-;; effect: to decrease pieces-left and to pick the next thing to be drawn 
-(define (select-piece!)
-  (if (> pieces-left 0)
-      (begin
-        (set! pieces-left (sub1 pieces-left))
-        (vector-ref PARTS pieces-left))
-      ;; (<= pieces-left 0)
-      (vector-ref PARTS 1)))
-;; the-end? : -> boolean
-;; to check whether the hangman is complet 
-(define (the-end?) (zero? pieces-left))
-
-;; USER INTERFACE to student
-
-;; chosen : word 
-(define chosen 10)
-;; status : word 
-(define status 10)
-;; reveal :  (word word letter -> word)
-(define (reveal chosen status guess)
-  (error 'hangman "appply hangman first!"))
-;; draw-next-part :  (symbol -> #t)
-(define (draw-next-part s)
-  (error 'hangman "appply hangman first!"))
-
-;; hangman :
-;;   (letter letter letter -> word)
-;;   (word word letter -> word)
-;;   (symbol -> true)
-;;   ->
-;;   true
-;; effects: set up game status, draw noose, show frame
-;; depends on: words are structures 
-(define (hangman/proc mw rv dr)
-  (check-proc 'hangman mw 3 '1st "3 arguments")
-  (check-proc 'hangman rv 3 '2nd "3 arguments")
-  (check-proc 'hangman dr 1 '3rd "1 argument")
-  (set! chosen (apply mw (list-ref WORDS (random (length WORDS)))))
-  (set! status (mw '_ '_ '_))
-  ;; make uncover work for structs
-  (set! uncover
-        (lambda (a-word)
-          ;; abstraction breaking hack.
-          (parameterize ([current-inspector
-                          (with-handlers ([exn:fail? 
-                                           (λ (x)
-                                             (error 
-                                              'hangman
-                                              "only works from within DrRacket when using the teaching languages via the languages menu (original exn msg: ~s)"
-                                              (exn-message x)))])
-                            (dynamic-require ''drscheme-secrets 'drscheme-inspector))])
-            (unless (struct? a-word)
-              (error 'hangman "expected a struct, got: ~e" a-word))
-            (let ([word-vec (struct->vector a-word)])
-              (unless (= (vector-length word-vec) 5)
-                (error 'hangman "expected words to be structures with three fields, found ~a fields"
-                       (- (vector-length word-vec) 2)))
-              (format "~a~a~a" 
-                      (vector-ref word-vec 1)
-                      (vector-ref word-vec 2)
-                      (vector-ref word-vec 3))))))
-  (initialize rv dr status))
-
-;; word2 = (listof letter)
-;; hangman-list : (word2 word2 letter -> word2) (symbol -> #t) -> void
-;; effects: set up game status, draw noose, show frame
-(define (hangman-list/proc rv dr)
-  (check-proc 'hangman-list rv 3 '1st "3 arguments")
-  (check-proc 'hangman-list dr 1 '2nd "1 argument")
-  (set! chosen (list-ref WORDS2 (random (length WORDS2))))
-  (set! status (build-list (length chosen) (lambda (x) '_)))
-  ;; make uncover work for lists
-  (set! uncover
-        (lambda (word)
-          (apply string-append (map (lambda (x) (format "~a" x)) word))))
-  (initialize (check-fun-res rv list? "list of symbols")
-              (check-fun-res dr boolean? "boolean")
-              status))
-
-
-;; initialize : as it says ...
-;; the gui, the guess, the picture, the reveal function the draw-next function
-(define (initialize rv dr status)
-  (init-guesses)
-  (set! reveal rv)
-  (set! draw-next-part dr)
-  (setup-gui status)
-  (draw-next-part (select-piece!)))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/image.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/image.rkt
deleted file mode 100644
index 0d765c6e4b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/image.rkt
+++ /dev/null
@@ -1,1241 +0,0 @@
-#lang scheme/base
-
-#|
-
-The test suite for this code is in
-plt/collects/tests/mzscheme/htdp-image.rkt
-
-|#
-
-
-(require (except-in mred
-                    make-color)
-         mzlib/class
-         mrlib/cache-image-snip
-         mzlib/math
-         lang/prim
-         lang/posn
-         lang/private/imageeq
-         "color-structs.rkt"
-         "error.rkt")
-
-(provide-primitives
-         image?
-         scene?
-         image=?
-         image-width
-         image-height
-         overlay
-         overlay/xy
-         
-         pinhole-x
-         pinhole-y
-         move-pinhole
-         put-pinhole
-         
-         rectangle
-         circle
-         ellipse
-         triangle
-         line
-         star
-         add-line
-         text
-         regular-polygon
-         
-         shrink
-         shrink-tl
-         shrink-tr
-         shrink-bl
-         shrink-br
-         
-         image-inside?
-         find-image
-         
-         image->color-list
-         color-list->image
-         
-         image->alpha-color-list
-         alpha-color-list->image
-         
-         image-color?
-         make-color
-         color-red
-         color-green
-         color-blue
-         color?
-         make-alpha-color
-         alpha-color-alpha
-         alpha-color-red
-         alpha-color-green
-         alpha-color-blue
-         alpha-color?)
-
-;; ----------------------------------------
-
-(define (color-list? l)
-  (and (list? l) (andmap image-color? l)))
-(define (alpha-color-list? l)
-  (and (list? l) (andmap alpha-color? l)))
-
-;; ----------------------------------------
-
-(define (to-exact-int x) (floor0 (if (exact? x) x (inexact->exact x))))
-(define (floor0 n)
-  (cond
-    [(< n 0) (- (floor (- n)))]
-    [else (floor n)]))
-
-;; ----------------------------------------
-
-(define (check name p? v desc arg-posn) (check-arg name (p? v) desc arg-posn v))
-
-(define (check-coordinate name val arg-posn) (check name finite-real? val "finite real number" arg-posn))
-(define (check-integer-coordinate name val arg-posn) (check name nii? val "integer" arg-posn))
-(define (check-size name val arg-posn) (check name pos-number? val "positive number" arg-posn))
-(define (check-posi-size name val arg-posn) (check name pos-integer? val "positive integer" arg-posn))
-(define (check-size/0 name val arg-posn) (check name nn-number? val "non-negative number" arg-posn))
-(define (check-image name val arg-posn) (check name image? val "image" arg-posn))
-(define (check-image-color name val arg-posn) 
-  (let ([simple-check (λ (x) (or (string? x) (symbol? x) (color? x)))])
-    (check name simple-check val "image-color" arg-posn)
-    (unless (image-color? val)
-      (error name "~e is not a valid color name" val))))
-(define (check-mode name val arg-posn) (check name mode? val mode-str arg-posn))
-
-(define (pos-number? i) (and (number? i) (positive? i)))
-(define (pos-integer? i) (and (number? i) (positive? i) (integer? i)))
-(define (nn-number? i) (and (number? i) (or (zero? i) (positive? i))))
-(define (nii? x) (and (integer? x) (not (= x +inf.0)) (not (= x -inf.0))))
-(define (finite-real? x) (and (real? x) (not (= x +inf.0)) (not (= x -inf.0))))
-
-(define (check-sizes who w h)
-  (unless (and (< 0 w 10000) (< 0 h 10000))
-    (error who (format "cannot make ~a x ~a image" w h))))
-
-(define (mode? x)
-  (member x '(solid "solid" outline "outline")))
-
-(define mode-str "'solid \"solid\" 'outline or \"outline\"")
-
-(define (mode->brush-symbol m)
-  (cond
-    [(member m '(solid "solid"))
-     'solid]
-    [(member m '(outline "outline"))
-     'transparent]))
-
-(define (mode->pen-symbol m)
-  (cond
-    [(member m '(solid "solid")) 'transparent]
-    [(member m '(outline "outline")) 'solid]))
-
-(define (make-color% c)
-  (cond
-    [(string? c) (send the-color-database find-color c)]
-    [(symbol? c) (send the-color-database find-color (symbol->string c))]
-    [(color? c) (make-object color%
-                  (color-red c)
-                  (color-green c)
-                  (color-blue c))]
-    [else #f]))
-
-(define (image-color? c) 
-  (cond
-    [(color? c) #t]
-    [(string? c) (and (send the-color-database find-color c) #t)]
-    [(symbol? c) (and (send the-color-database find-color (symbol->string c)) #t)]
-    [else #f]))
-
-(define (image-width a)
-  (check-image 'image-width a "first")
-  (let-values ([(w h) (snip-size a)])
-    (inexact->exact (ceiling w))))
-
-(define (image-height a)
-  (check-image 'image-height a "first")
-  (let-values ([(w h) (snip-size a)])
-    (inexact->exact (ceiling h))))
-
-(define (pinhole-x a)
-  (check-image 'pinhole-x a "first")
-  (let-values ([(x y) (send (coerce-to-cache-image-snip a) get-pinhole)])
-    x))
-
-(define (pinhole-y a)
-  (check-image 'pinhole-y a "first")
-  (let-values ([(x y) (send (coerce-to-cache-image-snip a) get-pinhole)])
-    y))
-
-(define (move-pinhole raw-i dx dy)
-  (check-image 'move-pinhole raw-i "first")
-  (check-coordinate 'move-pinhole dx "second")
-  (check-coordinate 'move-pinhole dy "third")
-  (let ([i (coerce-to-cache-image-snip raw-i)])
-    (let-values ([(px py) (send i get-pinhole)]
-                 [(w h) (send i get-size)])
-      (new cache-image-snip%
-           (dc-proc (send i get-dc-proc))
-           (argb-proc (send i get-argb-proc))
-           (width w)
-           (height h)
-           (argb (send i get-argb/no-compute))
-           (px (+ px (floor0 dx)))
-           (py (+ py (floor0 dy)))))))
-
-(define (put-pinhole raw-i px py)
-  (check-image 'put-pinhole raw-i "first")
-  (check-coordinate 'put-pinhole px "second")
-  (check-coordinate 'put-pinhole py "third")
-  (let ([i (coerce-to-cache-image-snip raw-i)])
-    (let-values ([(w h) (send i get-size)])
-      (new cache-image-snip%
-           (dc-proc (send i get-dc-proc))
-           (argb-proc (send i get-argb-proc))
-           (width w)
-           (height h)
-           (argb (send i get-argb/no-compute))
-           (px (floor0 px))
-           (py (floor0 py))))))
-
-(define (overlay a b . cs)
-  (check-image 'overlay a "first")
-  (check-image 'overlay b "second")
-  (let loop ([cs cs]
-             [i 3])
-    (unless (null? cs)
-      (check-image 'overlay (car cs) (number->ord i))))
-  (let ([all-imgs (reverse (list* a b cs))])
-    (let loop ([imgs (cdr all-imgs)]
-               [acc (car all-imgs)])
-      (cond
-        [(null? imgs) acc]
-        [else (loop (cdr imgs)
-                    (real-overlay/xy 'overlay (car imgs) 0 0 acc))]))))
-
-(define (overlay/xy a dx dy b)
-  (check-image 'overlay/xy a "first")
-  (check-coordinate 'overlay/xy dx "second")
-  (check-coordinate 'overlay/xy dy "third")
-  (check-image 'overlay/xy b "fourth")
-  (real-overlay/xy 'overlay/xy 
-                   a
-                   (to-exact-int dx)
-                   (to-exact-int dy)
-                   b))
-
-(define (real-overlay/xy name raw-a raw-delta-x raw-delta-y raw-b)
-  (let ([a (coerce-to-cache-image-snip raw-a)]
-        [b (coerce-to-cache-image-snip raw-b)])
-    (let-values ([(a-w a-h) (snip-size a)]
-                 [(b-w b-h) (snip-size b)]
-                 [(a-px a-py) (send a get-pinhole)]
-                 [(b-px b-py) (send b get-pinhole)])
-      (let* ([delta-x (+ raw-delta-x a-px (- b-px))]
-             [delta-y (+ raw-delta-y a-py (- b-py))]
-             [left (min 0 delta-x)]
-             [top (min 0 delta-y)]
-             [right (max (+ delta-x b-w) a-w)]
-             [bottom (max (+ delta-y b-h) a-h)]
-             [new-w (inexact->exact (ceiling (- right left)))]
-             [new-h (inexact->exact (ceiling (- bottom top)))]
-             [a-dx (inexact->exact (round (- left)))]
-             [a-dy (inexact->exact (round (- top)))]
-             [b-dx (inexact->exact (round (- delta-x left)))]
-             [b-dy (inexact->exact (round (- delta-y top)))]
-             [new-px (- a-px left)]
-             [new-py (- a-py top)]
-             [combine (lambda (a-f b-f)
-                        (lambda (dc dx dy)
-                          (a-f dc (+ dx a-dx) (+ dy a-dy))
-                          (b-f dc (+ dx b-dx) (+ dy b-dy))))])
-        (unless (and (<= 0 new-w 10000) (<= 0 new-h 10000))
-          (error name (format "cannot make ~a x ~a image" new-w new-h)))
-        (new cache-image-snip%
-             [dc-proc (combine (send a get-dc-proc)
-                               (send b get-dc-proc))]
-             [argb-proc (combine (send a get-argb-proc)
-                                 (send b get-argb-proc))]
-             [width new-w]
-             [height new-h]
-             [px new-px]
-             [py new-py])))))
-;; ------------------------------------------------------------
-
-(define (shrink raw-img in-left in-up in-right in-down)
-  (check-image 'shrink raw-img "first")
-  (check-size/0 'shrink in-left "second")
-  (check-size/0 'shrink in-up "third")
-  (check-size/0 'shrink in-right "fourth")
-  (check-size/0 'shrink in-down "fifth")
-  (let ([left (to-exact-int in-left)]
-        [up (to-exact-int in-up)]
-        [right (to-exact-int in-right)]
-        [down (to-exact-int in-down)]
-        [img (coerce-to-cache-image-snip raw-img)])
-    (let-values ([(i-px i-py) (send img get-pinhole)]
-                 [(i-width i-height) (send img get-size)])
-      (let* ([dc-proc (send img get-dc-proc)]
-             [argb-proc (send img get-argb-proc)]
-             [delta-w (- i-px left)]
-             [delta-h (- i-py up)]
-             [width (+ left right 1)]
-             [height (+ up down 1)])
-        (new cache-image-snip%
-             [px left]
-             [py up]
-             [dc-proc (lambda (dc dx dy)
-                        (let ([clip (send dc get-clipping-region)]
-                              [rgn (make-object region% dc)])
-                          (send rgn set-rectangle dx dy width height)
-                          (when clip
-                            (send rgn intersect clip))
-                          (send dc set-clipping-region rgn)
-                          (dc-proc dc (- dx delta-w) (- dy delta-h))
-                          (send dc set-clipping-region clip)))]
-             [argb-proc (lambda (argb dx dy) (argb-proc argb (- dx delta-w) (- dy delta-h)))]
-             [width width]
-             [height height])))))
-
-(define (shrink-tl raw-img in-x in-y)
-  (check-image 'shrink-tl raw-img "first")
-  (check-size 'shrink-tl in-x "second")
-  (check-size 'shrink-tl in-y "third")
-  (let ([x (to-exact-int in-x)]
-        [y (to-exact-int in-y)])
-    (put-pinhole (shrink (put-pinhole raw-img 0 0) 0 0 (- x 1) (- y 1)) (/ x 2) (/ y 2))))
-
-(define (shrink-tr raw-img in-x in-y)
-  (check-image 'shrink-tr raw-img "first")
-  (check-size 'shrink-tr in-x "second")
-  (check-size 'shrink-tr in-y "third")
-  (let ([x (to-exact-int in-x)]
-        [y (to-exact-int in-y)])
-    (put-pinhole (shrink (put-pinhole raw-img (- (image-width raw-img) 1) 0) (- x 1) 0 0 (- y 1))
-                 (/ x 2)
-                 (/ y 2))))
-
-(define (shrink-bl raw-img in-x in-y)
-  (check-image 'shrink-bl raw-img "first")
-  (check-size 'shrink-bl in-x "second")
-  (check-size 'shrink-bl in-y "third")
-  (let ([x (to-exact-int in-x)]
-        [y (to-exact-int in-y)])
-    (put-pinhole (shrink (put-pinhole raw-img 0 (- (image-height raw-img) 1)) 0 (- y 1) (- x 1) 0) 
-                 (/ x 2)
-                 (/ y 2))))
-
-(define (shrink-br raw-img in-x in-y)
-  (check-image 'shrink-br raw-img "first")
-  (check-size 'shrink-br in-x "second")
-  (check-size 'shrink-br in-y "third")
-  (let ([x (to-exact-int in-x)]
-        [y (to-exact-int in-y)])
-    (put-pinhole (shrink (put-pinhole raw-img (- (image-width raw-img) 1) (- (image-height raw-img) 1))
-                         (- x 1)
-                         (- y 1)
-                         0
-                         0)
-                 (/ x 2)
-                 (/ y 2))))
-
-
-;; ------------------------------------------------------------
-
-(define (line in-x in-y color)
-  (check-coordinate 'line in-x "first")
-  (check-coordinate 'line in-y "second")
-  (check-image-color 'line color "third")
-  (let* ([x (floor (inexact->exact in-x))]
-         [y (floor (inexact->exact in-y))]
-         [w (+ (abs x) 1)]
-         [h (+ (abs y) 1)]
-         [px (abs (min x 0))]
-         [py (abs (min y 0))])
-    (check-sizes 'line w h)
-    (let* ([do-draw
-            (λ (dc dx dy)
-              (send dc draw-line (+ px dx) (+ py dy) (+ dx px x) (+ dy py y)))]
-           [draw-proc (make-color-wrapper color 'transparent 'solid do-draw)]
-           [mask-proc (make-color-wrapper 'black 'transparent 'solid do-draw)])
-      (make-simple-cache-image-snip w h px py draw-proc mask-proc))))
-
-;; test what happens when the line moves out of the box.
-(define (add-line raw-i pre-x1 pre-y1 pre-x2 pre-y2 color-in)
-  (check-image 'add-line raw-i "first")
-  (check-coordinate 'add-line pre-x1 "second")
-  (check-coordinate 'add-line pre-y1 "third")
-  (check-coordinate 'add-line pre-x2 "fourth")
-  (check-coordinate 'add-line pre-y2 "fifth")
-  (check-image-color 'add-line color-in "sixth")
-  (let ([i (coerce-to-cache-image-snip raw-i)])
-    (let-values ([(px py) (send i get-pinhole)]
-                 [(iw ih) (send i get-size)]
-                 [(x1 y1 x2 y2)
-                  (if (<= pre-x1 pre-x2)
-                      (values pre-x1 pre-y1 pre-x2 pre-y2)
-                      (values pre-x2 pre-y2 pre-x1 pre-y1))])
-      (let* ([line-w (abs (- x2 x1))]
-             [line-h (abs (- y2 y1))]
-             [build-snip
-              (λ (do-draw py-offset)
-                (let* ([draw-proc 
-                        (make-color-wrapper color-in 'transparent 'solid do-draw)]
-                       [mask-proc
-                        (make-color-wrapper 'black 'transparent 'solid do-draw)]
-                       [line
-                        (make-simple-cache-image-snip (+ line-w 1) (+ line-h 1) px py draw-proc mask-proc)])
-                  (real-overlay/xy 'add-line i (+ px x1) (+ py py-offset) line)))])
-        (if (y1 . <= . y2)
-            (build-snip (λ (dc dx dy)
-                          (send dc draw-line 
-                                dx
-                                dy
-                                (+ dx (- x2 x1))
-                                (+ dy (- y2 y1))))
-                        y1)
-            (build-snip (λ (dc dx dy)
-                          (send dc draw-line 
-                                dx
-                                (+ dy line-h)
-                                (+ dx line-w)
-                                dy))
-                        y2))))))
-
-(define (text str size color-in)
-  (check 'text string? str "string" "first")
-  (check 'text (lambda (x) (and (integer? x) (<= 1 x 255))) size "integer between 1 and 255" "second")
-  (check-image-color 'text color-in "third")
-  (cond
-    [(string=? str "")
-     (let-values ([(tw th) (get-text-size size "dummyX")])
-       (put-pinhole (rectangle 0 th 'solid 'black) 0 0))]
-    [else
-     (let ([color (make-color% color-in)])
-       (let-values ([(tw th) (get-text-size size str)])
-         (let ([draw-proc
-                (lambda (txt-color mode dc dx dy)
-                  (let ([old-mode (send dc get-text-mode)]
-                        [old-fore (send dc get-text-foreground)]
-                        [old-font (send dc get-font)])
-                    (send dc set-text-mode mode)
-                    (send dc set-text-foreground txt-color)
-                    (send dc set-font (get-font size))
-                    (send dc draw-text str dx dy)
-                    (send dc set-text-mode old-mode)
-                    (send dc set-text-foreground old-fore)
-                    (send dc set-font old-font)))])
-           (new cache-image-snip%
-                [dc-proc (lambda (dc dx dy) (draw-proc color 'transparent dc dx dy))]
-                [argb-proc 
-                 (lambda (argb dx dy)
-                   (let ([bm-color
-                          (build-bitmap
-                           (lambda (dc)
-                             (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-                             (send dc set-brush (send the-brush-list find-or-create-brush color 'solid))
-                             (send dc draw-rectangle 0 0 tw th))
-                           tw
-                           th)]
-                         [bm-mask
-                          (build-bitmap
-                           (lambda (dc)
-                             (draw-proc 
-                              (send the-color-database find-color "black")
-                              'solid dc 0 0))
-                           tw
-                           th)])
-                     (overlay-bitmap argb dx dy bm-color bm-mask)))]
-                [width tw]
-                [height th]
-                [px 0]
-                [py 0]))))]))
-
-(define cached-bdc-for-text-size (make-thread-cell #f))
-(define (get-text-size size string)
-  (unless (thread-cell-ref cached-bdc-for-text-size)
-    (let* ([bm (make-object bitmap% 1 1)]
-           [dc (make-object bitmap-dc% bm)])
-      (thread-cell-set! cached-bdc-for-text-size dc)))
-  (let ([dc (thread-cell-ref cached-bdc-for-text-size)])
-    (let-values ([(w h _1 _2) (send dc get-text-extent string (get-font size))])
-      (values (inexact->exact (ceiling w)) 
-              (inexact->exact (ceiling h))))))
-
-(define (get-font size)
-  (send the-font-list find-or-create-font size
-        'default 'normal 'normal #f
-        (case (system-type)
-          [(macosx) 'partly-smoothed]
-          [else 'smoothed])))
-
-(define (a-rect/circ do-draw w h color brush pen)
-  (let* ([dc-proc (make-color-wrapper color brush pen do-draw)]
-         [mask-proc (make-color-wrapper 'black brush pen do-draw)])
-    (make-simple-cache-image-snip w h (floor (/ w 2)) (floor (/ h 2)) dc-proc mask-proc)))
-
-(define (rectangle in-w in-h mode color)
-  (check-size/0 'rectangle in-w "first")
-  (check-size/0 'rectangle in-h "second")
-  (check-mode 'rectangle mode "third")
-  (check-image-color 'rectangle color "fourth")
-  (let ([w (inexact->exact (floor in-w))]
-        [h (inexact->exact (floor in-h))])
-    (a-rect/circ (lambda (dc dx dy) (send dc draw-rectangle dx dy w h))
-                 w h color (mode->brush-symbol mode) (mode->pen-symbol mode))))
-
-(define (ellipse in-w in-h mode color)
-  (check-size/0 'ellipse in-w "first")
-  (check-size/0 'ellipse in-h "second")
-  (check-mode 'ellipse mode "third")
-  (check-image-color 'ellipse color "fourth")
-  (let ([w (inexact->exact (floor in-w))]
-        [h (inexact->exact (floor in-h))])
-    (a-rect/circ (lambda (dc dx dy) (send dc draw-ellipse dx dy w h))
-                 w h color (mode->brush-symbol mode) (mode->pen-symbol mode))))
-
-(define (circle in-r mode color)
-  (check-size/0 'circle in-r "first")
-  (check-mode 'circle mode "second")
-  (check-image-color 'circle color "third")
-  (let ([r (inexact->exact (floor in-r))])
-    (a-rect/circ (lambda (dc dx dy) (send dc draw-ellipse dx dy (* 2 r) (* 2 r)))
-                 (* 2 r) (* 2 r) color (mode->brush-symbol mode) (mode->pen-symbol mode))))
-
-(define (triangle in-size mode color)
-  (check 'triangle
-         (lambda (x) (and (real? x) (< 2 x 10000)))
-         in-size 
-         "positive real number bigger than 2"
-         "first")
-  (check-mode 'triangle mode "second")
-  (check-image-color 'triangle color "third")
-  (let* ([size (floor (inexact->exact in-size))]
-         [right (- size 1)]
-         [bottom (inexact->exact (ceiling (* size (sin (* 2/3 pi)))))]
-         [points (list (make-object point% 0 bottom)
-                       (make-object point% right bottom)
-                       (make-object point% (/ size 2) 0))]
-         [draw (make-color-wrapper
-                color (mode->brush-symbol mode) 'solid
-                (lambda (dc dx dy)
-                  (send dc draw-polygon points dx dy)))]
-         [mask-draw (make-color-wrapper
-                     'black (mode->brush-symbol mode) 'solid
-                     (lambda (dc dx dy)
-                       (send dc draw-polygon points dx dy)))]
-         [w size]
-         [h (+ bottom 1)])
-    (make-simple-cache-image-snip w h (floor (/ w 2)) (floor (/ h 2)) draw mask-draw)))
-
-(define (regular-polygon sides in-radius mode color [angle 0])
-  (check 'regular-polygon 
-         (λ (x) (and (integer? x) (<= 3 sides 10000)))
-         sides
-         "positive integer bigger than or equal to 3"
-         "first")
-  (check-size 'regular-polygon in-radius "second")
-  (check-mode 'regular-polygon mode "third")
-  (check-image-color 'regular-polygon color "fourth")
-  (check 'regular-polygon real? angle "real number" "fifth")
-  (let* ([radius (inexact->exact (floor in-radius))]
-         [points (regular-polygon-points radius sides angle)]
-         [draw 
-          (make-color-wrapper
-           color (mode->brush-symbol mode) 'solid
-           (λ (dc dx dy)
-             (send dc draw-polygon points dx dy)))]
-         [mask-draw 
-          (make-color-wrapper
-           'black (mode->brush-symbol mode) 'solid
-           (λ (dc dx dy)
-             (send dc draw-polygon points dx dy)))])
-    (make-simple-cache-image-snip 
-     (* radius 2)
-     (* radius 2)
-     radius
-     radius
-     draw
-     mask-draw)))
-
-(define (regular-polygon-points in-radius points delta-angle)
-  (let ([radius (- in-radius 1)])
-    (let loop ([n points])
-      (cond
-        [(zero? n) null]
-        [else
-         (let ([angle (+ delta-angle (/ (* 2 pi n) points))])
-           (cons (make-object point% 
-                   (+ radius (* radius (cos angle)))
-                   (+ radius (* radius (sin angle))))
-                 (loop (- n 1))))]))))
-  
-(define (star points in-inner-radius in-outer-radius mode color)
-  (check 'star
-         (lambda (x) (and (integer? x) (<= 3 x 10000)))
-         points
-         "positive integer bigger than or equal to 3"
-         "first")
-  (check-size 'star in-inner-radius "second")
-  (check-size 'star in-outer-radius "third")
-  (check-mode 'star mode "fourth")
-  (check-image-color 'star color "fifth")
-  (let* ([inner-radius (inexact->exact (floor in-inner-radius))]
-         [outer-radius (inexact->exact (floor in-outer-radius))]
-         [points (star-points inner-radius outer-radius points)]
-         [radial-offset
-          (if (<= inner-radius outer-radius)
-              0
-              (- inner-radius outer-radius))]
-         [draw 
-          (make-color-wrapper
-           color (mode->brush-symbol mode) 'solid
-           (λ (dc dx dy)
-             (send dc draw-polygon points 
-                   (+ dx radial-offset)
-                   (+ dy radial-offset))))]
-         [mask-draw 
-          (make-color-wrapper
-           'black (mode->brush-symbol mode) 'solid
-           (λ (dc dx dy)
-             (send dc draw-polygon points
-                   (+ dx radial-offset)
-                   (+ dy radial-offset))))]
-         
-         ;; we want the radius to be this max -- if it draws outside
-         ;; this radius, we should change the drawing.
-         [size-determining-radius (max inner-radius outer-radius)])
-    (make-simple-cache-image-snip 
-     (* size-determining-radius 2)
-     (* size-determining-radius 2)
-     size-determining-radius
-     size-determining-radius
-     draw
-     mask-draw)))
-
-(define (star-points in-small-rad in-large-rad points)
-  (let* ([small-rad (- in-small-rad 1)]
-         [large-rad (- in-large-rad 1)]
-         [roff (floor (/ large-rad 2))])
-    (let loop ([i points])
-      (cond
-        [(zero? i) '()]
-        [else 
-         (let* ([this-p (- i 1)]
-                [theta1 (* 2 pi (/ this-p points))]
-                [theta2 (* 2 pi (/ (- this-p 1/2) points))])
-           (let-values ([(x1 y1) (find-xy small-rad theta1)]
-                        [(x2 y2) (find-xy large-rad theta2)])
-             (let ([p1 (make-object point% 
-                         (+ large-rad x1)
-                         (+ large-rad y1))]
-                   [p2 (make-object point%
-                         (+ large-rad x2)
-                         (+ large-rad y2))])
-               (list* p1 p2 (loop (- i 1))))))]))))
-
-(define (find-xy radius theta)
-  (values (* radius (cos theta))
-          (* radius (sin theta))))
-
-(define (make-simple-cache-image-snip w h px py dc-proc mask-proc)
-  (let ([w (inexact->exact (ceiling w))]
-        [h (inexact->exact (ceiling h))])
-    (let ([argb-proc 
-           (if (or (zero? w) (zero? h))
-               void
-               (lambda (argb-vector dx dy)
-                 (let ([c-bm (build-bitmap (lambda (dc) (dc-proc dc 0 0)) w h)]
-                       [m-bm (build-bitmap (lambda (dc) (mask-proc dc 0 0)) w h)])
-                   (overlay-bitmap argb-vector dx dy c-bm m-bm))))])
-      (new cache-image-snip%
-           [dc-proc dc-proc]
-           [argb-proc argb-proc]
-           [width w]
-           [height h]
-           [px px]
-           [py py]))))
-
-(define (make-color-wrapper color-in brush pen rest)
-  (let ([color (make-color% color-in)])
-    (lambda (dc dx dy)
-      (let ([old-brush (send dc get-brush)]
-            [old-pen (send dc get-pen)])
-        (send dc set-brush (send the-brush-list find-or-create-brush color brush))
-        (send dc set-pen (send the-pen-list find-or-create-pen color 1 pen))
-        (rest dc dx dy)
-        (send dc set-pen old-pen)
-        (send dc set-brush old-brush)))))
-
-
-;; ------------------------------------------------------------
-
-(define (image-inside? i a)
-  (and (locate-image 'image-inside? 
-                     (coerce-to-cache-image-snip i)
-                     (coerce-to-cache-image-snip a))
-       #t))
-
-(define (find-image i a)
-  (or (locate-image 'find-image 
-                    (coerce-to-cache-image-snip i)
-                    (coerce-to-cache-image-snip a))
-      (error 'find-image
-             "the second image does not appear within the first image")))
-
-(define (locate-image who i a)
-  (check-image who i "first")
-  (check-image who a "second")
-  (let-values ([(iw ih) (snip-size i)]
-               [(ipx ipy) (send i get-pinhole)]
-               [(aw ah) (snip-size a)]
-               [(apx apy) (send a get-pinhole)])
-    (and (iw . >= . aw)
-         (ih . >= . ah)
-         (let ([i-argb-vector (argb-vector (send i get-argb))]
-               [a-argb-vector (argb-vector (send a get-argb))])
-           (let ([al (let loop ([offset 0])
-                       (cond
-                         [(= offset (* ah aw 4)) null]
-                         [else (cons (subvector a-argb-vector offset (+ offset (* 4 aw)))
-                                     (loop (+ offset (* 4 aw))))]))])
-             (let yloop ([dy 0])
-               (and (dy . <= . (- ih ah))
-                    (let xloop ([dx 0])
-                      (if (dx . <= . (- iw aw))
-                          (if (let loop ([al al][dd 0])
-                                (or (null? al)
-                                    (and (first-in-second?
-                                          i-argb-vector 
-                                          (car al)
-                                          (* 4 (+ (* (+ dy dd) iw) dx)))
-                                         (loop (cdr al) (add1 dd)))))
-                              (make-posn (+ dx (- apx ipx)) (+ dy (- apy ipy)))
-                              (xloop (add1 dx)))
-                          (yloop (add1 dy)))))))))))
-
-(define (subvector orig i j)
-  (let ([v (make-vector (- j i) #f)])
-    (let loop ([x i])
-      (when (< x j)
-        (vector-set! v (- x i) (vector-ref orig x))
-        (loop (+ x 1))))
-    v))
-#|
-(initial inequalities thanks to Matthew (thanks!!))
-
-We know that, for a combination:
-  m3 = (m1+m2-m1*m2) and 
-  b3 = (m1*b1*(1-m2) + m2*b2)/m3
-
-So, we need to figure out what m1 & m2 might have been, 
-given the other values.
-
-Check m3:
-
-   m3 = m2 when m1 = 0
-   m3 = 1 when m1 = 1
-
-   [deriv of m3 with respect to m1 = 1 - m2, which is positive]
-
-    so check that m3 is between m2 and 1
-
-Then check m3*b3:
-
-   b3*m3 = m2*b2  when m1 = 0 or b1 = 0
-   b3*m3 = (1 - m2) + m2*b2 when m1 = b1 = 1
-
-   [deriv with respect to m1 is b1*(1-m2), which is positive]
-   [deriv with respect to b1 is m1*(1-m2), which is positive]
-
-    So check that m3*b3 is between m2*b2 and (1 - m2) + m2*b2
-
-This is all in alphas from 0 to 1 and needs to be from 255 to 0.
-Converting (but using the same names) for the alpha test, we get:
-
-(<= (- 1 (/ m2 255))
-    (- 1 (/ m3 255))
-    1)
-
-sub1 to each:
-
-(<= (- (/ m2 255))
-    (- (/ m3 255))
-    0)
-
-mult by 255:
-
-(<= (- m2)
-    (- m3)
-    0)
-
-negate and flip ineq:
-
-
-(>= m2 m3 0)
-
-flip ineq back:
-
-(<= 0 m3 m2)
-
-
-Here's the original scheme expression for the second check:
-
-(<= (* m2 b2) 
-    (* m3 b3)
-    (+ (- 1 m2) (* m2 b2))
-
-converting from the computer's coordinates, we get:
-
-
-(<= (* (- 1 (/ m2 255)) (- 1 (/ b2 255)))
-    (* (- 1 (/ m3 255)) (- 1 (/ b3 255)))
-    (+ (- 1 (- 1 (/ m2 255)))
-       (* (- 1 (/ m2 255)) (- 1 (/ b2 255)))))
-
-;; multiplying out the binomials:
-
-(<= (+ 1
-       (- (/ m2 255)) 
-       (- (/ b2 255)) 
-       (/ (* m2 b2) (* 255 255)))
-    (+ 1
-       (- (/ m3 255)) 
-       (- (/ b3 255)) 
-       (/ (* m3 b3) (* 255 255)))
-    (+ (- 1 (- 1 (/ m2 255)))
-       (+ 1
-          (- (/ m2 255)) 
-          (- (/ b2 255)) 
-          (/ (* m2 b2) (* 255 255)))))
-
-;; simplifying the last term
-  
-(<= (+ 1
-       (- (/ m2 255)) 
-       (- (/ b2 255)) 
-       (/ (* m2 b2) (* 255 255)))
-    (+ 1
-       (- (/ m3 255)) 
-       (- (/ b3 255)) 
-       (/ (* m3 b3) (* 255 255)))
-    (+ 1
-       (- (/ b2 255)) 
-       (/ (* m2 b2) (* 255 255))))
-  
-;; multiply thru by 255:
-
-(<= (+ 255
-       (- m2) 
-       (- b2) 
-       (* m2 b2 1/255))
-    (+ 255
-       (- m3)
-       (- b3)
-       (* m3 b3 1/255))
-    (+ 255
-       (- b2) 
-       (* m2 b2 1/255)))
-  
-;; subtract out 255 from each:
-
-(<= (+ (- m2) 
-       (- b2) 
-       (* m2 b2 1/255))
-    (+ (- m3)
-       (- b3)
-       (* m3 b3 1/255))
-    (+ (- b2) 
-       (* m2 b2 1/255)))
-
-;; negate them all, and reverse the inequality
-
-(>= (+ m2 b2 (* m2 b2 -1/255))
-    (+ m3 b3 (* m3 b3 -1/255))
-    (+ b2 (* m2 b2 -1/255)))
-
-;; aka
-
-(<= (+ b2 (* m2 b2 -1/255))
-    (+ m3 b3 (* m3 b3 -1/255))
-    (+ m2 b2 (* m2 b2 -1/255)))
-
-|#
-
-;; in the above, m3 & b3 come from iv
-;; and m2 & b2 come from av
-(define (first-in-second? iv av xd)
-  (let loop ([i (vector-length av)])
-    (or (zero? i)
-        (let ([a (- i 4)]
-              [r (- i 3)]
-              [g (- i 2)]
-              [b (- i 1)])
-          (let* ([m2 (vector-ref av a)]
-                 [m3 (vector-ref iv (+ xd a))]
-                 [test
-                  (lambda (b2 b3)
-                    (<= (+ b2 (* m2 b2 -1/255))
-                        (+ m3 b3 (* m3 b3 -1/255))
-                        (+ m2 b2 (* m2 b2 -1/255))))])
-            (and (<= 0 m3 m2)
-                 (test (vector-ref av r) (vector-ref iv (+ xd r)))
-                 (test (vector-ref av g) (vector-ref iv (+ xd g)))
-                 (test (vector-ref av b) (vector-ref iv (+ xd b)))
-                 (loop (- i 4))))))))
-
-;; ----------------------------------------
-
-(define (image->color-list i-raw)
-  (check-image 'image->color-list i-raw "first")
-  (let* ([cis (coerce-to-cache-image-snip i-raw)]
-         [i (send cis get-bitmap)])
-    (cond
-      [(not i) '()]
-      [else
-       (let* ([iw (send i get-width)]
-              [ih (send i get-height)]
-              [new-bitmap (make-object bitmap% iw ih)]
-              [bdc (make-object bitmap-dc% new-bitmap)])
-         (send bdc clear)
-         (send bdc draw-bitmap i 0 0 'solid 
-               (send the-color-database find-color "black")
-               (send i get-loaded-mask))
-         (let ([is (make-bytes (* 4 iw ih))]
-               [cols (make-vector (* iw ih))])
-           (send bdc get-argb-pixels 0 0 iw ih is)
-           (let yloop ([y 0][pos 0])
-             (unless (= y ih)
-               (let xloop ([x 0][pos pos])
-                 (if (= x iw)
-                     (yloop (add1 y) pos)
-                     (begin
-                       (vector-set! cols (+ x (* y iw))
-                                    (make-color (bytes-ref is (+ 1 pos))
-                                                (bytes-ref is (+ 2 pos))
-                                                (bytes-ref is (+ 3 pos))))
-                       (xloop (add1 x) (+ pos 4)))))))
-           (send bdc set-bitmap #f)
-           (vector->list cols)))])))
-
-(define (image->alpha-color-list i)
-  (check-image 'image->alpha-color-list i "first")
-  (let* ([argb (cond
-                 [(is-a? i image-snip%) 
-                  (send (coerce-to-cache-image-snip i) get-argb)]
-                 [(is-a? i cache-image-snip%) (send i get-argb)])]
-         [v (argb-vector argb)])
-    (let loop ([i (vector-length v)]
-               [a null])
-      (cond
-        [(zero? i) a]
-        [else (loop (- i 4)
-                    (cons (make-alpha-color
-                           (vector-ref v (- i 4))
-                           (vector-ref v (- i 3))
-                           (vector-ref v (- i 2))
-                           (vector-ref v (- i 1)))
-                          a))]))))
-
-(define (color-list->image cl in-w in-h px py)
-  (check 'color-list->image color-list? cl "list-of-colors" "first")
-  (check-size/0 'color-list->image in-w "second")
-  (check-size/0 'color-list->image in-h "third")
-  (check-coordinate 'color-list->image px "fourth")
-  (check-coordinate 'color-list->image py "fifth")
-  (let ([w (inexact->exact in-w)]
-        [h (inexact->exact in-h)])
-    
-    (unless (= (* w h) (length cl))
-      (error 'color-list->image
-             "given width times given height is ~a, but the given color list has ~a items"
-             (* w h) 
-             (length cl)))
-    
-    (cond
-      [(or (equal? w 0) (equal? h 0))
-       (put-pinhole (rectangle w h 'solid 'black) px py)]
-      [else
-       (unless (and (< 0 w 10000) (< 0 h 10000))
-         (error 'color-list->image "cannot make ~a x ~a image" w h))
-       
-       (let* ([bm (make-object bitmap% w h)]
-              [mask-bm (make-object bitmap% w h)]
-              [dc (make-object bitmap-dc% bm)]
-              [mask-dc (make-object bitmap-dc% mask-bm)])
-         (unless (send bm ok?)
-           (error (format "cannot make ~a x ~a image" w h)))
-         (let ([is (make-bytes (* 4 w h) 0)]
-               [mask-is (make-bytes (* 4 w h) 0)]
-               [cols (list->vector (map (λ (x) 
-                                          (or (make-color% x)
-                                              (error 'color-list->image "color ~e is unknown" x)))
-                                        cl))])
-           (let yloop ([y 0][pos 0])
-             (unless (= y h)
-               (let xloop ([x 0][pos pos])
-                 (if (= x w)
-                     (yloop (add1 y) pos)
-                     (let* ([col (vector-ref cols (+ x (* y w)))]
-                            [r (pk (send col red))]
-                            [g (pk (send col green))]
-                            [b (pk (send col blue))])
-                       (bytes-set! is (+ 1 pos) r)
-                       (bytes-set! is (+ 2 pos) g)
-                       (bytes-set! is (+ 3 pos) b)
-                       (when (= 255 r g b)
-                         (bytes-set! mask-is (+ 1 pos) 255)
-                         (bytes-set! mask-is (+ 2 pos) 255)
-                         (bytes-set! mask-is (+ 3 pos) 255))
-                       (xloop (add1 x) (+ pos 4)))))))
-           (send dc set-argb-pixels 0 0 w h is)
-           (send mask-dc set-argb-pixels 0 0 w h mask-is))
-         (send dc set-bitmap #f)
-         (send mask-dc set-bitmap #f)
-         (bitmaps->cache-image-snip bm mask-bm px py))])))
-
-(define (pk col) (min 255 (max 0 col)))
-
-(define (alpha-color-list->image cl in-w in-h px py)
-  (check 'alpha-color-list->image alpha-color-list? cl "list-of-alpha-colors" "first")
-  (check-size/0 'alpha-color-list->image in-w "second")
-  (check-size/0 'alpha-color-list->image in-h "third")
-  (check-coordinate 'alpha-color-list->image px "fourth")
-  (check-coordinate 'alpha-color-list->image py "fifth")
-  (let ([w (inexact->exact in-w)]
-        [h (inexact->exact in-h)])
-    (unless (= (* w h) (length cl))
-      (error 'alpha-color-list->image
-             "given width times given height is ~a, but the given color list has ~a items"
-             (* w h) (length cl)))
-    (cond
-      [(or (equal? w 0) (equal? h 0))
-       (put-pinhole (rectangle w h 'solid 'black) px py)]
-      [else
-       (unless (and (< 0 w 10000) (< 0 h 10000))
-         (error 'alpha-color-list->image format "cannot make ~a x ~a image" w h))
-       (let ([index-list (alpha-colors->ent-list cl)])
-         (argb->cache-image-snip (make-argb (list->vector index-list) w h) px py))])))
-
-;; alpha-colors->ent-list : (listof alpha-color) -> (listof number)
-(define (alpha-colors->ent-list cl)
-  (let loop ([cl cl])
-    (cond
-      [(null? cl) null]
-      [else 
-       (let ([ac (car cl)])
-         (list* (alpha-color-alpha ac)
-                (alpha-color-red ac)
-                (alpha-color-green ac)
-                (alpha-color-blue ac)
-                (loop (cdr cl))))])))
-
-
-;                                                                 
-;                                                                 
-;                                                                 
-;                                                                 
-;   ;;;                                  ;                        
-;   ;                                                             
-;   ;; ;;;  ;;   ;;;;;;;     ;  ;  ;;;;  ; ;;  ; ;;;  ;;; ;;; ;;; 
-;   ;  ;   ;  ;  ;  ;  ;     ;  ;  ;  ;  ;  ; ;  ;  ; ;   ;   ;  ;
-;   ;  ;   ;  ;  ;  ;  ;     ;  ;  ;  ;  ;  ; ;  ;;;; ;   ;;; ;;;;
-;   ;  ;   ;  ;  ;  ;  ;     ;  ;  ;  ;  ;   ;   ;    ;     ; ;   
-;   ;  ;    ;;   ;  ;  ;     ;;;;  ;  ;  ;   ;   ;;;  ;   ;;; ;;; 
-;                                                                 
-;                                                                 
-;
-
-(provide
- ;; type Scene = Image with pinhole in origin 
- nw:rectangle ;; Number Number Mode Color -> Image
- ;; create a rectangle with pinhole in the upper-left corner 
- place-image  ;; Image Number Number Scene -> Scene
- ;; place image at (x,y) in given scene 
- empty-scene  ;; Number Number -> Scene 
- ;; create an empty scene of size width x height (!= (nw:rectangle width height))
- scene+line   ;; Scene Number Number Number Number Color -> Scene 
- ;; cut all pieces that are outside the given rectangle 
- )
-
-(define (nw:rectangle width height mode color)
-  (check-size/0 'nw:rectangle width "first")
-  (check-size/0 'nw:rectangle height "second")
-  (check-mode 'nw:rectangle mode "third")
-  (check-image-color 'nw:rectangle color "fourth")
-  (put-pinhole (rectangle width height mode color) 0 0))
-
-(define (place-image image x y scene)
-  (check-image 'place-image image "first")
-  (check-arg 'place-image (real? x) 'real "second" x)
-  (check-arg 'place-image (real? y) 'real "third" y)
-  (check-scene 'place-image scene "fourth")
-  (let ([x (to-exact-int x)]
-        [y (to-exact-int y)])
-    (place-image0 image x y scene)))
-
-(define (empty-scene width height)
-  (check-size/0 'empty-scene width "first")
-  (check-size/0 'empty-scene height "second")    
-  (put-pinhole 
-   (overlay (rectangle width height 'solid 'white)
-            (rectangle width height 'outline 'black))
-   0 0))
-
-(define (scene+line img x0 y0 x1 y1 c)
-  ;; img and c are checked via calls to add-line from image.rkt
-  (check-arg 'scene+line (scene? img) "scene" "first" "plain image")
-  (check-arg 'scene+line (real? x0) "number" "second" x0)
-  (check-arg 'scene+line (real? y0) "number" "third" y0)
-  (check-arg 'scene+line (real? x1) "number" "fourth" x1)
-  (check-arg 'scene+line (real? y1) "number" "fifth" y1)
-  (check-image-color 'scene+line c "sixth")
-  (let ([x0 (to-exact-int x0)]
-        [x1 (to-exact-int x1)]
-        [y0 (to-exact-int y0)]
-        [y1 (to-exact-int y1)])
-    (add-line-to-scene0 img x0 y0 x1 y1 c)))
-
-;; Image Number Number Image -> Image 
-(define (place-image0 image x y scene)
-  (define sw (image-width scene))
-  (define sh (image-height scene))
-  (define ns (overlay/xy scene x y image))
-  (define nw (image-width ns))
-  (define nh (image-height ns))
-  (if (and (= sw nw) (= sh nh)) ns (shrink ns 0 0 (- sw 1) (- sh 1)))) 
-
-;; Image Number Number Number Number Color -> Image
-(define (add-line-to-scene0 img x0 y0 x1 y1 c)
-  (define w (image-width img))  
-  (define h (image-height img))
-  (cond
-    [(and (<= 0 x0) (< x0 w) (<= 0 y0) (< y0 w)
-          (<= 0 x1) (< x1 w) (<= 0 y1) (< y1 w))
-     ;; everything is inside 
-     (add-line img x0 y0 x1 y1 c)]
-    [(= x0 x1) 
-     ;; vertical 
-     (if (<= 0 x0 w) (add-line img x0 (app y0 h) x0 (app y1 h) c) img)]
-    [(= y0 y1) 
-     ;; horizontal 
-     (if (<= 0 y0 h) (add-line img (app x0 w) y0 (app x1 w) y0 c) img)]
-    [else 
-     ;; partial off-screen 
-     (let ()
-       (define lin (points->line x0 y0 x1 y1))
-       (define dir (direction x0 y0 x1 y1))
-       (define-values (upp low lft rgt) (intersections lin w h))
-       (define (add x y) (add-line img x0 y0 x y c))
-       (cond
-         [(and (< 0 x0 w) (< 0 y0 h)) ;; (x0,y0) is in the interior
-          (case dir
-            [(upper-left)  (if (number? upp) (add upp 0) (add 0 lft))]
-            [(lower-left)  (if (number? low) (add low h) (add 0 lft))]
-            [(upper-right) (if (number? upp) (add upp 0) (add h rgt))]
-            [(lower-right) (if (number? low) (add low h) (add w rgt))]
-            [else (error 'dir "contract violation: ~e" dir)])]
-         [(and (< 0 x1 w) (< 0 y1 h)) ;; (x1,y1) in interior; symmetry!
-          (add-line-to-scene0 img x1 y1 x0 y0 c)]
-         [else 
-          (cond
-            [(and (number? upp) (number? low)) (add-line img upp 0 low h c)]
-            [(and (number? upp) (number? lft)) (add-line img upp 0 0 lft c)]
-            [(and (number? upp) (number? rgt)) (add-line img upp 0 w rgt c)]
-            [(and (number? low) (number? lft)) (add-line img low h 0 lft c)]
-            [(and (number? low) (number? rgt)) (add-line img low h w rgt c)]
-            [(and (number? lft) (number? rgt)) (add-line img 0 lft w rgt c)]
-            [else img])]))]))
-
-;; Nat Nat -> Nat 
-;; y if in [0,h], otherwise the closest boundary
-(define (app y h)
-  (cond
-    [(and (<= 0 y) (< y h)) y]
-    [(< y 0) 0]
-    [else (- h 1)]))
-
-;; Nat Nat Nat Nat -> (union 'upper-left 'upper-right 'lower-left 'lower-right)
-;; how to get to (x1,y1) from (x0,y0)
-(define (direction x0 y0 x1 y1)
-  (string->symbol
-   (string-append 
-    (if (<= y0 y1) "lower" "upper") "-" (if (<= x0 x1) "right" "left"))))
-
-#| TESTS 
-'direction 
-(equal? (direction 10 10 0 0) 'upper-left)
-(equal? (direction 10 10 20 20) 'lower-right)
-(equal? (direction 10 10 0 20) 'lower-left)
-(equal? (direction 10 10 20 0) 'upper-right)
-|#
-
-;; -----------------------------------------------------------------------------
-;; LINEs 
-
-;; Number Number -> LINE
-;; create a line from a slope and the intersection with the y-axis
-(define-struct lyne (slope y0))
-
-;; Nat Nat Nat Nat -> LINE
-;; determine the line function from the four points (or the attributes)
-;; ASSUME: (not (= x0 x1))
-(define (points->line x0 y0 x1 y1)
-  (define slope  (/ (- y1 y0) (- x1 x0)))
-  (make-lyne slope (- y0 (* slope x0))))
-
-;; LINE Number -> Number 
-(define (of ln x) (+ (* (lyne-slope ln) x) (lyne-y0 ln)))
-
-;; LINE Nat Nat -> [Opt Number] [Opt Number] [Opt Number] [Opt Number]
-;; where does the line intersect the rectangle [0,w] x [0,h]
-;; (values UP LW LF RT) means the line intersects with 
-;;  the rectangle [0,w] x [0,h] at (UP,0) or (LW,h) or (0,LF) or (w,RT)
-;;  when a field is false, the line doesn't interesect with that side 
-(define (intersections l w h)
-  (values
-   (opt (X l 0) w) (opt (X l h) w) (opt (lyne-y0 l) h) (opt (of l w) h)))
-
-;; Number Number -> [Opt Number]
-(define (opt z lft) (if (<= 0 z lft) z #f))
-
-;; LINE Number -> Number 
-;; the x0 where LINE crosses y(x) = h
-;; assume: LINE is not a horizontal
-(define (X ln h) (/ (- h (lyne-y0 ln)) (lyne-slope ln)))
-
-;; --- TESTS --- 
-#|
-(define line1 (points->line 0 0 100 100))
-(= (of line1 0) 0)
-(= (of line1 100) 100)
-(= (of line1 50) 50)
-
-(= (X (make-lyne 1 0) 0) 0)
-(= (X (make-lyne 1 0) 100) 100)
-
-(equal? (call-with-values 
-         (lambda () (intersections (points->line -10 -10 110 110) 100 100))
-         list)
-        (list 0 100 0 100))
-(equal? (call-with-values 
-         (lambda () (intersections (points->line 0 10 100 80) 100 100))
-         list)
-        (list #f #f 10 80))
-|#
-
-;; Symbol Any String -> Void
-(define (check-scene tag i rank)
-  (define error "image with pinhole at (~s,~s)")
-  (if (image? i)
-      (check-arg tag (scene? i) "scene" rank (image-pins i))
-      (check-arg tag #f         "scene" rank i)))
-
-;; Symbol Any -> Void 
-(define (check-scene-result tname i)
-  (if (image? i) 
-      (check-result tname scene? "scene" i (image-pins i))
-      (check-result tname (lambda (x) (image? x)) "scene" i)))
-
-(define (image-pins i)
-  (format "image with pinhole at (~s,~s)" (pinhole-x i) (pinhole-y i)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/info.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/info.rkt
deleted file mode 100644
index e3e30d56fd..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang info
-
-(define name "HtDP Teachpacks")
-(define compile-omit-paths
-  '("hangman-world.rkt" "hangman-world-play.rkt"))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/isl+/lang/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/isl+/lang/reader.rkt
deleted file mode 100644
index 7f9e163c58..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/isl+/lang/reader.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang s-exp htdp/bsl/reader
-lang/htdp-intermediate-lambda
-'(abbreviate-cons-as-list
-  read-accept-quasiquote)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/isl/lang/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/isl/lang/reader.rkt
deleted file mode 100644
index 57c04e9358..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/isl/lang/reader.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang s-exp htdp/bsl/reader
-lang/htdp-intermediate
-'(abbreviate-cons-as-list
-  read-accept-quasiquote)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/lkup-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/lkup-gui.rkt
deleted file mode 100644
index aa8f283fd2..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/lkup-gui.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang scheme/gui
-
-(require htdp/error
-         lang/prim
-         mzlib/class)
-
-(provide control view connect)
-
-(define-primitive control control/proc)
-(define-primitive view view/proc)
-(define-higher-order-primitive connect connect/proc (call-back))
-
-;; ------------------------------------------------------------------------
-;; Basic constants: 
-(define TITLE "LOOKUP")
-(define WIDTH 100)
-(define HIGHT 50)
-
-;; ------------------------------------------------------------------------
-;; GUI LAYOUT 
-(define frame (make-object frame% TITLE #f WIDTH HIGHT))
-(define panel (make-object horizontal-panel% frame))
-(send panel set-alignment 'left 'top)
-(define vert1 (make-object vertical-panel% panel)) 
-(send vert1 set-alignment 'left 'top)
-(void (make-object message% "Name:" vert1)
-      (make-object message% "Number:" vert1))
-(define vert2 (make-object vertical-panel% panel))
-
-;; ------------------------------------------------------------------------
-;; guess : handle CONTROL
-(define query-tf (make-object text-field% "" vert2
-                   (lambda (x y) (send result set-label ""))))
-
-;; control : -> symbol
-;; to supply the name that a user typed into the query text-field
-(define (control/proc)
-  (string->symbol (send query-tf get-value)))
-
-;; connect : (button% control-event% -> true) -> void
-;; effect: to add a check button with call-back to frame and to show frame 
-;; the button is "border" style, so <CR> in query-tf will use call-back
-(define button #f)
-(define (connect/proc call-back)
-  (check-proc 'connect call-back 2 '1st "2 arguments")
-  (if button
-      (printf "connect: called a second time\n")
-      (begin 
-        (set! button (make-object button% "LookUp" panel call-back '(border)))
-        (send query-tf focus)
-        (send frame show #t)
-        #t)))
-
-;; ------------------------------------------------------------------------
-;; message : display VIEW 
-(define result (make-object message% "ddd.ddd.dddd" vert2))
-
-;; view : symbol -> void
-;; effect: to display the phone number n in the message panel 
-(define (view/proc n)
-  (check-arg 'view (symbol? n) "symbol" "first" n)
-  (send result set-label (symbol->string n)))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/master-play.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/master-play.rkt
deleted file mode 100644
index 0bfbc068d5..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/master-play.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#cs(module master-play mzscheme
-  (require 
-   "master.rkt"
-   lang/prim)
-  
-  (provide go)
-  (define-primitive go go/proc)
-  
-  (define (compare choice1 choice2 guess1 guess2)
-    (cond
-      [(and (eq? choice1 guess1) (eq? choice2 guess2))
-       'perfect!]
-      [(or (eq? choice1 guess1) (eq? choice2 guess2))
-       'one_color_is_at_proper_place]
-      [(or (eq? choice2 guess1) (eq? choice1 guess2))
-       'one_color_occurs]
-      [else
-       'sorry_all_wrong]))
-
-  (define (go/proc s)
-    (printf "Have fun playing, ~a\n" s)
-    (master compare)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/master.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/master.rkt
deleted file mode 100644
index 6d97c06ad9..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/master.rkt
+++ /dev/null
@@ -1,173 +0,0 @@
-#lang racket/gui
-
-(require htdp/error
-         lang/prim
-         racket/class)
-
-(provide master)
-
-(define-higher-order-primitive master master/proc (compare-guess))
-
-#| ---------------------------------------------------------------------------
-  The Basic Constants |#
-
-(define TITLE "TeachScheme Color Guessing")
-
-(define WELCOME "Welcome to the TeachScheme Color-Guessing Game") 
-
-(define COLORS
-  (list 'black 'white 'red 'blue 'green 'gold 'pink 'orange 'purple 'navy))
-
-(define COL# (length COLORS))
-
-(define GUESSES# 2) 
-
-(define BUT-SIZE 30)
-(define WIDTH (* COL# BUT-SIZE))
-(define HIGHT BUT-SIZE)
-
-(define STOPS 
-  (list 'PerfectGuess 'perfect_guess 'perfect! 'perfect 'Perfect 'perfekt 'Perfekt))
-
-(define TRUMPET
-  (make-object bitmap% (build-path (collection-path "icons") "trumpet.xbm") 'xbm))
-
-#|
-  cd ~.../plt/collects/icons
-  cp where/ever/trumpet.xbm .
-  git pull
-  ...make trumpet.xbm...
-  git commit -m "added trumpet image"
-  git push
-  |#
-
-#| ------------------------------------------------------------------------
-  The Layout: (computed as a function of constants)
-  
-  ------------------------------------------------------------------
-  |       
-  |   CB1  CB2   CB3   CB4   .......   CB*   CB*   CB*   CB*   CB* 
-  | 
-  |          CB-GUESS1    ...    CB-GUESS*
-  | 
-  |                     ONE-MESSAGE
-  ------------------------------------------------------------------
-  
-  Two horizontal panels: 
-  the first one with all the colors (as buttons)
-  the second is a sequence of colored buttons 
-  |#
-
-(define frame (make-object frame% TITLE #f WIDTH HIGHT))
-
-(define verti (make-object vertical-panel% frame))
-
-(define panel (make-object horizontal-panel% verti))
-
-(define guess-panels
-  (let ((p (make-object horizontal-panel% verti)))
-    (build-list GUESSES# (lambda (i) (make-object horizontal-panel% p)))))
-
-(for-each (lambda (p) (send p set-alignment 'center 'center)) guess-panels)
-
-(define message-panel (make-object horizontal-panel% verti))
-(send message-panel set-alignment 'center 'center)
-
-(define message #f)
-(define (add-message!)
-  (send message-panel change-children (lambda (x) null))
-  (set! message (make-object message% WELCOME message-panel)))
-(define (add-winner!)
-  (send message-panel change-children (lambda (x) null))
-  (make-object message% TRUMPET message-panel)
-  (make-object button% "New Game?" message-panel new-game))
-
-#| ------------------------------------------------------------------------
-  Some additional functionality |#
-
-(define colored-button%
-  (class button%
-    (init color:str parent call-back [_width BUT-SIZE] [_height BUT-SIZE])
-    (define width _width)
-    (define height _height)
-    (private*
-      (make-colored-bm
-       (lambda (color:str)
-         (let* ([bm (make-object bitmap% width height)]
-                [dc (make-object bitmap-dc% bm)])
-           (send dc set-brush (make-object brush% color:str 'solid))
-           (send dc draw-rectangle 0 0 width height)
-           (send dc set-bitmap #f)
-           bm))))
-    (public*
-      (change-color
-       (lambda (color:str)
-         (send this set-label (make-colored-bm color:str))))) 
-    (super-make-object (make-colored-bm color:str) parent call-back)
-    ))
-
-
-(define (make-color-button color:sym)
-  (let ((color:str (symbol->string color:sym)))
-    (letrec ((this
-              (lambda (x y)
-                (let* ((guess-button (pop!)))
-                  (send guess-button change-color color:str)
-                  (add-a-guess! color:sym)
-                  (if (pair? guesses)
-                      (send message set-label "Another guess, please!")
-                      (let ((response (check-now!)))
-                        (initialize-guesses)
-                        (send message set-label (symbol->string response))
-                        (when (memq response STOPS) (add-winner!))))))))
-      (make-object colored-button% color:str panel this))))
-
-;; master : (color-symbol color-symbol color-symbol color-symbol -> symbol) -> ???
-(define (master/proc cg)
-  (check-proc 'master cg 4 'first 'arguments)
-  (set! check-guess cg)
-  (send frame show #t)
-  #t)
-
-#| ------------------------------------------------------------------------
-  Setting up the buttons |#
-
-(for-each make-color-button COLORS)
-
-(define guess-buttons
-  (map (lambda (p) (make-object colored-button% "gray" p void)) guess-panels))
-
-;; ------------------------------------------------------------------------
-;; State of Game
-
-(define choices null)
-(define (new-game . x)
-  (add-message!)
-  (set! choices
-        (build-list GUESSES# (lambda (i) (list-ref COLORS (random COL#))))))
-(new-game)
-
-(define guesses null)
-(define (initialize-guesses)
-  (set! guesses guess-buttons))
-(define (pop!)
-  (when (null? guesses) (error 'TeachMind "can't happen"))
-  (let ((g (car guesses)))
-    (set! guesses (cdr guesses))
-    g))
-(initialize-guesses)
-
-(define guessed-colors null)
-(define (add-a-guess! color:sym)
-  (set! guessed-colors (cons color:sym guessed-colors)))
-(define (check-now!)
-  (begin0
-    (if (= GUESSES# 2)
-        (apply check-guess (append choices (reverse guessed-colors)))
-        (check-guess choices (reverse guessed-colors)))
-    (set! guessed-colors null)))
-
-;; ------------------------------------------------------------------------
-;; Student Contribution
-
-(define check-guess #f)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-invisible.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-invisible.rkt
deleted file mode 100644
index bf1379d239..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-invisible.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket
-
-(require htdp/matrix-sig
-         htdp/matrix-render-sig
-         htdp/matrix-unit)
-
-(define render@
-  (unit (import)
-        (export matrix-render^)
-        (define-struct invisible (matrix))
-	(define visible? invisible?)
-        (define make-visible make-invisible)
-        (define visible-matrix invisible-matrix)))
-
-(define invisible-matrix@
-  (compound-unit
-    (import)
-    (export m)
-    (link (((r : matrix-render^)) render@)
-          (((m : matrix^)) matrix@ r))))
-
-(define-values/invoke-unit invisible-matrix@ (import) (export matrix^))
-
-(provide-signature-elements matrix^)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-render-sig.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-render-sig.rkt
deleted file mode 100644
index 85e0a499e4..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-render-sig.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scheme/signature 
-
-;; type: [VM X]
-make-visible    ;; [Matrix X] -> [VM X]
-
-visible-matrix  ;; [VM X] -> [Matrix M]
-
-visible?        ;; Any -> Boolean 
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-sig.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-sig.rkt
deleted file mode 100644
index 4654d05ba5..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-sig.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/signature
-
-;; CONVENTION: 
-;; [Rectangle X] = [Listof [Listof X]] 
-;;  where all elements of the non-empty list are of equal non-empty length
-
-;; type: [Matrix X]
-matrix? 
-;; is this a matrix?
-
-matrix-rows ;; [Matrix X] -> Nat 
-;; how many rows does this matrix have? 
-
-matrix-cols ;; [Matrix X] -> Nat 
-;; how many columns does this matrix have? 
-
-rectangle->matrix ;; [Rectangle X] -> [Matrix X]
-;; create a matrix from a rectangle 
-
-matrix->rectangle ;; [Matrix X] -> [Rectangle X]
-;; create a rectangle from matrix
-
-;; ----------------------------------------------------------------------------
-
-make-matrix ;; Nat Nat [Listof X] -> [Matrix X]
-;; create an initialized n x m matrix from list l
-;; NOTE: make-matrix would consume an optional number of entries, 
-;; if it were like make-vector  
-
-build-matrix ;; Nat Nat (Nat Nat -> X) -> [Matrix X]
-;; create a matrix from a function 
-
-matrix-ref ;; [Matrix X] Nat Nat -> X
-;; retrieve the content of the matrix at (i,j)
-
-matrix-set ;; [Matrix X] Nat Nat X -> [Matrix X]
-;; create a new matrix with x at (i,j) and all other places the same 
-
-matrix-where? ;; [Matrix X] (X -> Boolean) -> [Listof Posn]
-;; (matrix-where? M P) :: list of (make-posn i j) s.t. (P (matrix-ref M i j))
-
-matrix-render ;; [Matrix X] -> [Rectangle String]
-;; render the matrix as a rectangle of strings 
-
-matrix-minor ;; Matrix Nat Nat -> Matrix 
-;; create a matrix minor from M at (i,j)
-
-;; matrix-set! ;; [Matrix X] Nat Nat X -> [Matrix X]
-;; set the matrix at (i,j)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-unit.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-unit.rkt
deleted file mode 100644
index 6bb73325b7..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-unit.rkt
+++ /dev/null
@@ -1,317 +0,0 @@
-#lang racket/unit
-
-(require htdp/matrix-sig
-         htdp/matrix-render-sig
-         mrlib/matrix-snip
-         htdp/error
-         lang/posn
-         mzlib/class
-         mzlib/pconvert
-         mzlib/pretty)
-
-(import matrix-render^)
-(export matrix^)
-
-;; [Matrix X] = [BST X]
-
-(define matrix% 
-  (class* object% (matrix<%>)
-    (define/public (->rectangle) (matrix->rectangle this))
-    (super-new)))
-
-(define bmatrix%
-  (class* matrix% (matrix<%>)
-    (init-field n m mat)
-    (define/public (get-n) n)
-    (define/public (get-m) m)
-    (define/public (get-mat) mat)
-    ;; [InnerMatrix X] = Nat x Nat x [vectorof X] 
-    ;; s.t. (= (* n m)(vector-length vector))
-    (super-new)))
-
-(define imatrix%
-  (class* matrix% (matrix<%>)
-    (init-field left i j info right)
-    (super-new)))
-
-(define imatrix-left (class-field-accessor imatrix% left))
-(define imatrix-i (class-field-accessor imatrix% i))
-(define imatrix-j (class-field-accessor imatrix% j))
-(define imatrix-info (class-field-accessor imatrix% info))
-(define imatrix-right (class-field-accessor imatrix% right))
-
-(define (make-imatrix left i j info right) 
-  (make-object imatrix% left i j info right))
-
-(define (set-imatrix-left n x)
-  (make-imatrix x (imatrix-i n) (imatrix-j n) (imatrix-info n) (imatrix-right n)))
-(define (set-imatrix-right n x)
-  (make-imatrix (imatrix-left n) (imatrix-i n) (imatrix-j n) (imatrix-info n) x))
-(define (set-imatrix-info n x)
-  (make-imatrix (imatrix-left n) (imatrix-i n) (imatrix-j n) x (imatrix-right n)))
-
-(define (create-matrix n m mat)
-  (new bmatrix% [n n] [m m] [mat mat]))
-
-(define (matrix-get-mat bm) (send bm get-mat))
-(define (matrix-get-n bm) (send bm get-n))
-(define (matrix-get-m bm) (send bm get-m))
-
-;; [BST X] = [InnerMatrix X] | (make-imatrix [BST X] Nat Nat X [BST X])
-
-;; Nat Nat Nat Nat -> Boolean
-(define (bst-< i j imatrix-i imatrix-j)
-  (or (< i imatrix-i) (and (= i imatrix-i) (< j imatrix-j))))
-
-;; Nat Nat Nat Nat -> Boolean
-(define (bst-= i j imatrix-i imatrix-j)
-  (and (= i imatrix-i) (= j imatrix-j)))
-
-;; Nat Nat Nat Nat -> Boolean
-(define (bst-> i j imatrix-i imatrix-j)
-  (not (or (bst-< i j imatrix-i imatrix-j) (bst-= i j imatrix-i imatrix-j))))
-
-;; bst-insert : [BST X] Nat Nat X -> [BST X]
-(define (bst-insert t i j x)
-  (cond
-    [(is-a? t imatrix%)
-     (cond
-       [(bst-< i j (imatrix-i t) (imatrix-j t)) 
-        (set-imatrix-left t (bst-insert (imatrix-left t) i j x))]
-       [(bst-= i j (imatrix-i t) (imatrix-j t)) 
-        (set-imatrix-info t x)]
-       [(bst-> i j (imatrix-i t) (imatrix-j t)) 
-        (set-imatrix-right t (bst-insert (imatrix-right t) i j x))])]
-    [else (make-imatrix t i j x t)]))
-
-;; bst-lookup : [BST X] Nat Nat -> X
-(define (bst-lookup t i j)
-  (cond
-    [(is-a? t imatrix%)
-     (cond
-       [(bst-< i j (imatrix-i t) (imatrix-j t)) (bst-lookup (imatrix-left t) i j)]
-       [(bst-= i j (imatrix-i t) (imatrix-j t)) (imatrix-info t)]
-       [else (bst-lookup (imatrix-right t) i j)])]
-    [else (inner-ref (matrix-get-mat t) (matrix-get-m t) i j)]))
-
-;                                                   
-;                                                   
-;  ;;;;;;                                           
-;   ;   ;                               ;           
-;   ; ;   ;;  ;; ;; ;;    ;;;   ;; ;;  ;;;;;   ;;;; 
-;   ;;;    ;  ;   ;;  ;  ;   ;   ;;     ;     ;   ; 
-;   ; ;     ;;    ;   ;  ;   ;   ;      ;      ;;;  
-;   ;       ;;    ;   ;  ;   ;   ;      ;         ; 
-;   ;   ;  ;  ;   ;   ;  ;   ;   ;      ;   ; ;   ; 
-;  ;;;;;; ;;  ;;  ;;;;    ;;;   ;;;;;    ;;;  ;;;;  
-;                 ;                                 
-;                ;;;                                
-;                                                   
-;                                                   
-
-(define (matrix? x)
-  (define m (if (visible? x) (visible-matrix x) x))
-  (internal-matrix? m))
-
-(define (internal-matrix? m)
-  (or (is-a? m bmatrix%) (is-a? m imatrix%)))
-
-(define (matrix-rows M*)
-  (define-values (M n m) (check-matrix 'matrix-n M* 0 0))
-  n)
-
-(define (matrix-cols M*)
-  (define-values (M n m) (check-matrix 'matrix-n M* 0 0))
-  m)
-
-(define (rectangle->matrix r)
-  ;; check rectangleness of r 
-  (define n (length r))
-  (define m (length (car r)))
-  (make-matrix n m (apply append r)))
-
-(define (rectangle->imatrix r)
-  ;; check rectangleness of r 
-  (define n (length r))
-  (define m (length (car r)))
-  (make-matrix-aux n m (apply append r)))
-
-(define (matrix->rectangle M*)
-  (define-values (M n m) (check-matrix 'matrix->rectangle M* 0 0))
-  (build-list n (lambda (i) (build-list m (lambda (j) (matrix-ref M i j))))))
-
-;; -------------------------------------------------------------------------
-
-(define (make-matrix n m l)
-  (check-arg 'make-matrix (natural? n) 'Nat "first" n)
-  (check-arg 'make-matrix (natural? m) 'Nat "second" m)
-  (check-arg 'make-matrix (list? l) 'list "third" l)
-  (check-arg 'make-matrix (= (length l) (* n m)) 
-             (format "list of length ~a given, expected ~a items" 
-                     (length l)
-                     (* n m))
-             "third" l)
-  (make-visible (make-matrix-aux n m l)))
-(define (make-matrix-aux n m l)
-  (let ([mat (make-vector (* n m) 0)])
-    (let loop ([l l][i 0][j 0])
-      (cond
-        [(null? l) (create-matrix n m mat)]
-        [else (begin (vector-set! mat (+ (* i m) j) (car l))
-                     (if (< j (- m 1))
-                         (loop (cdr l) i (+ j 1))
-                         (loop (cdr l) (+ i 1) 0)))]))))
-
-(define (build-matrix n m f)
-  (check-arg 'make-matrix (natural? n) 'Nat "first" n)
-  (check-arg 'make-matrix (natural? m) 'Nat "second" m)
-  (check-proc 'make-matrix f 2 "third" "2 arguments")
-  (build-matrix-aux n m f))
-(define (build-matrix-aux n m f)
-  (define ns (build-list n (lambda (x) x)))
-  (define ms (build-list m (lambda (x) x)))
-  (define ** 
-    (apply append (map (lambda (i) (map (lambda (j) (f i j)) ms)) ns)))
-  (make-matrix n m **))
-
-(define (matrix-ref M* i j)
-  (define-values (M n m) (check-matrix 'matrix-ref M* i j))
-  (bst-lookup M i j))
-
-(define (matrix-set M* i j x)
-  (define-values (M m n) (check-matrix 'matrix-set M* i j))
-  (make-visible (bst-insert M i j x)))
-
-(define (matrix-render M*)
-  (define-values (M n m) (check-matrix 'matrix-render M* 0 0))
-  (define (make-row i)
-    (let loop ([j 0])
-      (if (= j m)
-          '()
-          (cons (element->string (matrix-ref M i j)) (loop (+ j 1))))))
-  (let loop ([i 0])
-    (if (= i n) '() (cons (make-row i) (loop (+ i 1))))))
-
-(define (matrix-where? M* pred?)
-  (define-values (M n m) (check-matrix 'matrix-where? M* 0 0))
-  (define (select-from-row i)
-    (define (select-cell j)
-      (if (pred? (matrix-ref M i j)) (make-posn i j) #f))
-    (filter posn? (build-list m select-cell)))
-  (apply append (build-list n select-from-row)))
-
-(define (matrix-minor M* i j)
-  (define-values (M n m) (check-matrix 'matrix-minor M* i j))
-  (build-matrix (- n 1) (- m 1) 
-                (lambda (i* j*) 
-                  (cond
-                    [(< i* i) 
-                     (cond 
-                       [(< j* j) (matrix-ref M i* j*)]
-                       [(>= j* j) (matrix-ref M i* (+ j* 1))])]
-                    [(>= i* i)
-                     (cond 
-                       [(< j* j) (matrix-ref M (+ i* 1) j*)]
-                       
-                       [(>= j* j) (matrix-ref M (+ i* 1) (+ j* 1))])]))))
-
-#| from bug report 13264:
-
-I have two problems with matrix-set!. 
-
-1. When I enable matrix-set! 
-
- (require htdp/matrix)
- (define M (build-matrix 2 3 (λ (i j) (* (expt 2 i) (expt 3 j)))))
- (matrix-set! M 1 2 'a)
- (eq? (matrix-ref M 1 2) 'a)
- (equal? M (build-matrix 2 3 (λ (i j) (* (expt 2 i) (expt 3 j)))))
-
-I get the results 'true' and 'true' -- the second one should NOT be true but false. 
-
-Because I can't change the snip either, M also displays wrong. 
-
-2. I really don't want to enable it in language levels strictly below ASL. 
-Otherwise the functional model breaks. ** But I do not know how to make teachpacks
-depend on the language into which they linked. ** 
-|#
-
-(define (matrix-set! M* i j x)
-  (when (is-a? M imatrix%)
-    (error 'matrix-set! "use functional updates instead"))
-  (define-values (M n m) (check-matrix 'matrix-ref M* i j))
-  (vector-set! (matrix-get-mat M) (+ (* i m) j) x)
-  M*)
-
-;                              
-;                              
-;    ;;                        
-;     ;                        
-;    ; ;  ;;  ;; ;;  ;;   ;;;; 
-;    ; ;   ;   ;  ;  ;   ;   ; 
-;    ; ;   ;   ;   ;;     ;;;  
-;   ;;;;;  ;   ;   ;;        ; 
-;   ;   ;  ;  ;;  ;  ;   ;   ; 
-;  ;;; ;;;  ;; ;;;;  ;;  ;;;;  
-;                              
-;                              
-;                              
-;                              
-
-;; [Vectorof X] Nat Nat Nat -> Nat 
-;; the internal referencing for element (i,j) in an _ x m matrix 
-(define (inner-ref V m i j)
-  (vector-ref V (+ (* i m) j)))
-
-;; X -> String 
-;; okay, not X, something renderable via constructor style printing
-(define (element->string value)
-  (parameterize ([constructor-style-printing #t]
-                 [pretty-print-columns 40])
-    (let ([value1 0]
-          [text* (open-output-string)])
-      (pretty-print (print-convert value) text*)
-      (close-output-port text*)
-      (let* ([s (get-output-string text*)]
-             [l (string->list s)]
-             [x (reverse l)])
-        (if (char=? (car x) #\newline)
-            (list->string (reverse (cdr x)))
-            s)))))
-
-;; Symbol [Matrix X] Nat Nat ->* [Vectorof X] Nat Nat 
-;; contract checking for teaching languages; compute properties of matrix
-(define (check-matrix tag M* i j)
-  (define M (if (internal-matrix? M*)
-                M* 
-                (let ([r (if (visible? M*) (visible-matrix M*) M*)])
-                  (cond
-                    [(internal-matrix? r) r]
-                    ;; this next line is suspicious! 
-                    [(pair? r) (rectangle->imatrix r)]
-                    [else (check-arg tag #f 'matrix "first" M*)]))))
-  (check-arg tag (natural? i) 'Nat "second" i)
-  (check-arg tag (natural? j) 'Nat "third" j)
-  ;; --- now that M is a matrix, i and j are natural numbers:
-  (check-aux tag M i j))
-(define (check-aux tag M* i j)
-  (define M (let loop ([M M*]) (if (is-a? M imatrix%) (loop (imatrix-left M)) M)))
-  (define n (matrix-get-n M))
-  (define m (matrix-get-m M))
-  ;; i and j have to be in Nat
-  (unless (< -1 i n)
-    (error tag "~ax~a matrix given, can't index into ~a~a row" n m i (th i)))
-  (unless (< -1 j m)
-    (error tag "~ax~a matrix given, can't index into ~a~a column" n m j (th j)))
-  (values M* n m))
-
-;; Nat -> String 
-(define (th n)
-  (cond
-    [(= n 0) "th"]
-    [(= n 1) "st"]
-    [(= n 2) "nd"]
-    [(= n 3) "rd"]
-    [(> n 3) "th"]
-    [else (error 'th "can't happen ~e" n)]))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix.rkt
deleted file mode 100644
index 8d0825a5df..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix.rkt
+++ /dev/null
@@ -1,193 +0,0 @@
-#lang racket/gui
-
-;; 4. integrate with snips
-
-#|
-
-From: Mark Engelberg <mark.engelberg@gmail.com>
-
-
-In a flash of inspiration, I searched on matrix, and turned up the
-matrix teachpack.  I really like it!  I especially like:
-* the ease of converting back and forth between "rectangles" and "matrices"
-* the multiple ways of constructing matrices
-* the ability to set cells non-destructively or destructively
-
-Two questions:
-1. The documentation warns that the teachpack is experimental.  Are
-there any major problems I need to be aware of, or is the warning just
-an indicator that the API is likely to continue to be revised?
-2. Are there other similar built-in PLT Scheme libraries that I should
-be aware of, or is this the main one I should be considering?
-
-A few API comments and suggestions:
-
-matrix-render is a nice low-level function for extracting information
-from the matrix in preparation for displaying or printing, but perhaps
-there could also be a higher-level matrix->string function.
-For example,
-(define (matrix->string m col-separator row-separator)
- (string-join (map (λ (row) (string-join row col-separator))
-(matrix-render m)) row-separator))
-
-Since matrix-ref returns an error with a bogus row,column, it would be
-nice to be able to easily test for that in advance:
-(define (matrix-within-bounds? m i j)
- (and (<= 0 i) (< i (matrix-rows m)) (<= 0 j) (< j (matrix-cols m))))
-or alternatively adjust matrix-ref to take an optional argument to
-return if the entry is invalid (like hash-ref).
-
-Since matrix-where? returns a list of posn structures, it would be
-ideal if the other matrix functions (e.g., matrix-ref, matrix-set)
-could optionally consume a single posn rather than a separate i and j.
-
-Speaking of which, shouldn't the matrix teachpack automatically
-provide lang/posn so that you can call posn-x and posn-y on the
-position structures returned by matrix-where?
-
-|#
-
-
-(require htdp/matrix-sig
-         htdp/matrix-render-sig
-         htdp/matrix-unit
-         mrlib/matrix-snip
-         ; mzlib/string
-         mzlib/class mrlib/matrix-snip
-         mred)
-
-;; ---------------------------------------------------------------------------
-
-(define render@
-  (unit 
-    (import matrix^)
-    (export matrix-render^)
-    (define (visible? m) (and (object? m) (v? m)))
-    (define visible-matrix v-m)
-
-    ;; the graphical stuff follows  .. it is code based on image.rkt
-    ;; Matrix -> VisibleMatrix
-    (define (make-visible M)
-      (define S (matrix-render M))
-      (define indent 3)
-      (define xspan 3)
-      (define-values (row-heights col-widths) (text-sizes S))
-      (define th ;; total height of matrix: 2 lines plus the text height
-        (+ 2 (apply + row-heights)))
-      (define tw ;; total width of matrix: 2 identations, n xspans
-        (+ 1 (* 2 indent) (apply + col-widths) (* (length col-widths) xspan)))
-      ;; 
-      (define (draw-proc mode dc dx dy)
-        [define old-mode (send dc get-text-mode)]
-        [define old-fore (send dc get-text-foreground)]
-        [define old-font (send dc get-font)]
-        (send dc set-text-mode mode)
-        (send dc set-text-foreground COLOR)
-        (send dc set-font (get-font SIZE))
-        ;; --- left bracket 
-        (send dc draw-line dx dy (+ dx indent) dy)
-        (send dc draw-line dx (+ dy th -1) (+ dx indent) (+ dy th -1))
-        (send dc draw-line dx dy dx (+ dy th -1))
-        ;; --- right bracket 
-        (send dc draw-line (+ dx tw (- indent) -1) dy (+ dx tw -1) dy)
-        (send dc draw-line (+ dx tw (- indent) -1) (+ dy th -1) (+ dx tw -1) (+ dy th -1))
-        (send dc draw-line (+ dx tw -1) dy (+ dx tw -1) (+ dy th -1))
-        ;; --- draw all matrix cells 
-        (draw-matrix S dc dx dy indent xspan col-widths row-heights)
-        (send dc set-text-mode old-mode)
-        (send dc set-text-foreground old-fore)
-        (send dc set-font old-font))
-      ;; 
-      (define (argb-proc argb dx dy)
-        (define (bm-color-builder dc)
-          (define p (send the-pen-list find-or-create-pen "black" 1 'transparent))
-          (define b (send the-brush-list find-or-create-brush COLOR 'solid))
-          (send dc set-pen p)
-          (send dc set-brush b)
-          (send dc draw-rectangle 0 0 tw th))
-        (define bm-color (build-bitmap bm-color-builder tw th))
-        (define(bm-mask-builder dc) (draw-proc 'solid dc 0 0))
-        (define bm-mask (build-bitmap bm-mask-builder tw th))
-        (overlay-bitmap argb dx dy bm-color bm-mask))
-      (new visible-matrix%
-           [M_0 M]
-           [width tw] [height th] [px 0] [py 0]
-           [dc-proc (lambda (dc dx dy) (draw-proc 'transparent dc dx dy))]
-           [argb-proc argb-proc]))
-    
-    ;; [Rectangle String] DC Nat Nat Nat Nat [Listof Nat] [Listof Nat] -> Void
-    (define (draw-matrix S dc dx dy indent xspan col-widths row-heights)
-      (define dx0 dx)
-      (for-each (lambda (row deltay)
-                  (set! dx (+ dx0 2 indent))
-                  (for-each (lambda (str deltax)
-                              (draw-centrally dc str dx dy deltax deltay)
-                              (set! dx (+ deltax xspan dx)))
-                            row col-widths)
-                  (set! dy (+ 2 deltay dy)))
-                S row-heights))
-    
-    ;; basic constants 
-    (define SIZE 12)
-    (define COLOR (send the-color-database find-color "black"))
-    
-    ;; String Nat Nat Nat Nat -> Void
-    ;; draw str centrally into a (deltax x deltay) rectangle of dc 
-    ;; whose upper-left position is (dx,dy)
-    (define (draw-centrally dc str dx dy deltax deltay)
-      (define-values (w h) (get-text-size SIZE str))
-      (define dx* (+ dx (quotient (- deltax w) 2)))
-      (define dy* (+ dy (quotient (- deltay h) 2)))
-      (send dc draw-text str dx* dy*))
-    
-    ;; [Rectangle String] ->* [Listof Nat] [Listof Nat]
-    ;; determine the height of each row and the width of each column
-    (define (text-sizes S)
-      (define S-sizes 
-        (map (lambda (row)
-               (map (lambda (cell) 
-                      (define-values (tw th) (get-text-size SIZE cell))
-                      (list tw th))
-                    row))
-             S))
-      (define row-heights (map (lambda (r) (apply max (map cadr r))) S-sizes))
-      (define col-widths
-        (let loop ([S-sizes S-sizes])
-          (if (andmap null? S-sizes)
-              '()
-              (cons (apply max (map car (map car S-sizes)))
-                    (loop (map cdr S-sizes))))))
-      (values row-heights col-widths))
-    
-    ;; --- copied from image.rkt --- needs refactoring
-    (define (get-text-size size string)
-      (unless (thread-cell-ref cached-bdc-for-text-size)
-        (let* ([bm (make-object bitmap% 1 1)]
-               [dc (make-object bitmap-dc% bm)])
-          (thread-cell-set! cached-bdc-for-text-size dc)))
-      (let ([dc (thread-cell-ref cached-bdc-for-text-size)])
-        (let-values ([(w h _1 _2)
-                      (send dc get-text-extent string (get-font size))])
-          (values (inexact->exact (ceiling w)) 
-                  (inexact->exact (ceiling h))))))
-    
-    (define (get-font size)
-      (send the-font-list find-or-create-font size
-            'default 'normal 'normal #f
-            (case (system-type)
-              [(macosx) 'partly-smoothed]
-              [else 'smoothed])))
-    
-    (define cached-bdc-for-text-size (make-thread-cell #f))))
-
-(define invisible-matrix@
-  (compound-unit
-    (import)
-    (export m r)
-    (link (((r : matrix-render^)) render@ m)
-          (((m : matrix^)) matrix@ r))))
-
-(define-values/invoke-unit invisible-matrix@ (import) (export matrix^))
-
-(provide-signature-elements matrix^)
-(provide snip-class)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix.txt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix.txt
deleted file mode 100644
index b891322958..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/matrix.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-
-%% -----------------------------------------------------------------------------
-
-rectangle: a list of lists of equal length
-
-files:
- mrlib/matrix-snip.ss     : the image snips for matrix
-
-                            works with matrices that implement matrix<%>
-                            i.e., support a ->rectangle method
-
-                            it writes out a matrix as a rectangle and
-                            reconstructs it as a rectangle
-
-                            the function visible-matrix may therefore yield a
-                            rectangle or a matrix representation proper
-
- drscheme/private/eval.ss : requires matrix-snip to share at module level
-
- htdp/matrix.ss           : uses snips to present matrices, requires matrix-snip
- htdp/matrix-invisible.ss : make matrices invisible
-
-                          * they are created from two mutually recursive units:
-                          * matrix-unit and a 'rendering' unit
-
- htdp/matrix-sig.ss       : the functions that matrix-unit.ss provides
-                            and that matrix-render.ss needs
-
- htdp/matrix-render-sig.ss: the functions that matrix-unit expects from the
-                            rendering unit
-
- htdp/matrix-unit.ss      : the matrix functionality
-
- htdp/tests/matrix-test.ss: a textual test
- htdp/tests/matrix-client.ss a test with embedded images
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/servlet.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/servlet.rkt
deleted file mode 100644
index cd6485f11b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/servlet.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-; Author: Paul Graunke
-#cs(module servlet mzscheme
-     (require web-server/servlet-env
-              web-server/servlet
-              htdp/error
-              xml
-              scheme/contract
-              mzlib/etc)
-     (provide (all-from web-server/servlet-env)
-              (all-from web-server/servlet))
-     (provide/contract
-      [build-suspender 
-       (((listof xexpr/c)
-         (listof xexpr/c))
-        ((listof (list/c symbol? string?))
-         (listof (list/c symbol? string?)))
-        . ->* . 
-        (string?
-         . -> .
-         xexpr/c))])
-     
-     ; build-suspender : (listof html) (listof html) [(listof (cons sym str))] [(listof (cons sym str))] -> str -> response
-     (define build-suspender
-       (opt-lambda (title content [body-attributes '([bgcolor "white"])] [head-attributes null])
-         (lambda (k-url)
-           `(html (head ,head-attributes
-                        (meta ([http-equiv "Pragma"] [content "no-cache"])) ; don't cache in netscape
-                        (meta ([http-equiv "Expires"] [content "-1"])) ; don't cache in IE
-                        ; one site said to use -1, another said to use 0.
-                        (title . ,title))
-                  (body ,body-attributes
-                        (form ([action ,k-url] [method "post"])
-                              ,@content)))))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/servlet2.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/servlet2.rkt
deleted file mode 100644
index 804f145cb2..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/servlet2.rkt
+++ /dev/null
@@ -1,586 +0,0 @@
-#lang scheme
-
-#| TODO -----------------------------------------------------------------------
-        buttons: multiple points of returns: continuation functions 
-  |#
-(require (prefix-in servlet: web-server/servlet-env)
-         (prefix-in servlet: web-server/servlet)
-         htdp/error
-         scheme/tcp
-         scheme/bool
-         scheme/list
-         scheme/match)
-
-(require (for-syntax scheme/base))
-
-(provide single-query ; FormElement -> Answer
-         
-         queries             ; (listof FormElement) -> (listof Answer)
-         echo-answers        ; (listof Answers) -> true
-         
-         form-query          ; Form -> Response
-         echo-response       ; Response -> true
-         extract/single      ; Symbol Response -> Answer
-         extract             ; Symbol Response -> (listof Answer)
-         
-         inform              ; String String *-> true 
-         inform/html         ; (listof Xexpr) -> true
-         final-page          ; String String *-> true
-         
-         ; Structures  --------------------------------------------------------------
-         make-password
-         (rename-out (make-numeric make-number)
-                     (make-check make-boolean))
-         make-yes-no
-         make-radio
-         ;   make-button
-         
-         form? 
-         form-element?
-         
-         ;; Advanced API from servlet-env:
-         send/suspend
-         send/finish
-         (rename-out (servlet:extract-binding/single extract-binding/single)
-                     (servlet:extract-bindings extract-bindings))
-         
-         
-         #| Data Definitions --------------------------------------------------------
-           
-           FormElement = (union String
-                                (make-password String)
-                                (make-number String)
-                                (make-boolean String)
-                                (make-yes-no String String String)
-                                (make-radio String (cons String (listof String)))
-                                (make-button String))
-           
-           FormItem    = (list Symbol FormElement)
-           Form        = (cons FormItem (listof FormItem))
-           
-           Answer      = (union String Number Boolean)
-           Response    = (listof (list Symbol Answer))
-           |#
-         )
-
-;       ;;        
-;;;;;           ;                    ;;;         ;;;;;                                   ;        
-;   ;          ;                   ;  ;          ;  ;;                                  ;        
-;   ;  ;;;;   ;;;;;  ;;;;          ;             ;   ;  ; ;;;   ;;;  ;;; ;;; ;;;     ;;;;   ;;;  
-;   ;      ;   ;         ;          ;   ;        ;  ;;   ;     ;   ;  ;   ;    ;    ;   ;  ;   ; 
-;   ;   ;;;;   ;      ;;;;         ;;; ;         ;;;;    ;     ;   ;  ;   ;    ;    ;   ;  ;;;;; 
-;   ;  ;   ;   ;     ;   ;        ;   ;          ;       ;     ;   ;   ; ;     ;    ;   ;  ;     
-;   ;  ;   ;   ;   ; ;   ;        ;   ;;         ;       ;     ;   ;   ;;;     ;    ;   ;  ;   ; 
-;;;;;    ;;; ;   ;;;   ;;; ;        ;;;  ;       ;;;;    ;;;;    ;;;     ;    ;;;;;   ;;; ;  ;;;  
-
-
-#| Documentation ------------------------------------------------------------
-  (define-checked (name pred_1? ... pred_n?))
-  re-defines the constructor make-name so that it makes sure that its
-  n arguments satisfy pred_1? ... pred_n?
-  
-  Note: 
-  to maintain the invariant, also modify the mutators to check their arguments
-  |#
-(define-syntax (define-checked stx)
-  (syntax-case stx ()
-    [(_ (name pred? ...))
-     (let ([make-variable 
-            ; String SyntaxObject -> SyntaxObject
-            (lambda (x y)
-              (datum->syntax
-               stx
-               (string->symbol 
-                (format "~a-~a" x (syntax->datum y)))))])
-       (with-syntax ([make-name   (make-variable "make" (syntax name))]
-                     [(x ...) (generate-temporaries (syntax (pred? ...)))])
-         (syntax
-          (set! make-name 
-                (let ([make-name make-name])
-                  (lambda (x ...)
-                    (check-arg 'make-name (pred? x) pred? "an" x)
-                    ...
-                    (make-name x ...)))))))]))
-; _ -> true
-(define (true? x) #t)
-
-;; Structure Definitions ----------------------------------------------------
-(define-struct fe (question))
-
-(define-struct (password fe)())
-(define-struct (numeric fe) ())
-(define-struct (check fe)   ())
-(define-struct (yes-no fe)  (positive negative))
-(define-struct (radio fe)   (labels))
-
-(define-checked (password string?))
-(define-checked (numeric string?))
-(define-checked (check string?))
-(define (list-of-strings? l)
-  (and (list? l) (andmap string? l)))
-(define-checked (radio string? list-of-strings?))
-(define-checked (yes-no string? true? true?))
-
-; todo
-(define-struct (button fe)  ())
-
-
-; _ -> (union true String) 
-(define (form? x)
-  (cond
-    [(not (list? x)) (format "list expected, given ~e" x)]
-    [(find-non list? x)
-     => 
-     (lambda (non-list)
-       (format "list of lists expected, give list with ~e" non-list))]
-    [(find-non 
-      (lambda (x)
-        (and (list? x)
-             (= (length x) 2)
-             (symbol? (car x))
-             (form-element? (cadr x))))
-      x)
-     => 
-     (lambda (non-tagged-fe)
-       (format "list of (list Symbol FormElement) expected, given ~s" non-tagged-fe))]
-    [else true]))
-
-; _ -> Boolean 
-(define (form-element? x)
-  (cond
-    [(string? x) #t]
-    [(fe? x) (and
-              (string? (fe-question x))
-              (cond
-                [(radio? x)  (and (non-empty-list? (radio-labels x))
-                                  (andmap string? (radio-labels x)))]
-                [(yes-no? x) (and (string? (yes-no-positive x)) 
-                                  (string? (yes-no-negative x)))]
-                [else #t]))]
-    [else #f]))
-
-; _ -> Boolean 
-(define (non-empty-list? x)
-  (and (cons? x) (list? x)))
-
-;                 
-;;   ;;                            
-;; ;;                             
-;; ;;  ;;;;   ;;;   ; ;;;    ;;;  
-; ; ;      ;    ;    ;;  ;  ;   ; 
-; ; ;   ;;;;    ;    ;   ;   ;;;  
-; ; ;  ;   ;    ;    ;   ;      ; 
-;   ;  ;   ;    ;    ;   ;  ;   ; 
-;;; ;;;  ;;; ; ;;;;; ;;;  ;;  ;;;  
-
-
-; posing questions ----------------------------------------------------------
-
-; FormElement -> Answer
-; to pose one question, receive one answer 
-(define (internal:single-query fe)
-  (check-arg 'single-query (form-element? fe) "form element" "first" fe)
-  (car (internal:queries (list fe))))
-
-; (listof FormElement) -> (listof Answer)
-; to ask N questions and to get N answers
-; assert: (lambda (result) (= (length fes) (length result)))
-(define (internal:queries fes)
-  (check-arg 'queries (and (list? fes) (andmap form-element? fes))
-             "list of form elements" "first" fes)
-  (conduct-query "Web Query" (map list (make-keys fes) fes)))
-
-; Form -> Bindings 
-; to ask N questions with tags, receive N answers 
-; assert: (lambda (result) (set-equal? (map car aloss) (map car result)))
-(define (internal:form-query f)
-  (check-list-list 'form-query (form? f) "form" f)
-  (map list (map first f)
-       (conduct-query "Web Query" (map list (make-keys f) (map second f)))))
-
-
-; extracting values from forms ----------------------------------------------
-
-; extract : Symbol Response -> (listof Answer)
-; extract all answers associated with a tag 
-(define (extract tag r)
-  (map second (filter (lambda (a) (eq? (first a) tag)) r)))
-
-; extract/single : Symbol Response -> Answer
-(define (extract/single tag r)
-  (let ([all (extract tag r)])
-    (if (and (pair? all) (null? (rest all))) ; (= (length all) 1)
-        (first all)
-        (cond
-          [(null? all) 
-           (error 'extract/single "~e contains no tag ~e" r tag)]
-          [else 
-           (error 'extract/single "~e contains more than one tag ~e" r tag)]))))
-
-; echoing responses ---------------------------------------------------------
-
-; Response -> true
-; to display a response on a web page 
-(define (internal:echo-response form)
-  (make-echo-page
-   (map (lambda (tag answer)
-          `(tr (td ,(symbol->string tag))
-               (td ,(answer->string answer))))
-        (map first form)
-        (map second form))))
-
-; (listof Answer) -> true
-; to display a list of answers on a web page
-(define (internal:echo-answers form)
-  (make-echo-page 
-   (map (lambda (answer) `(tr (td ,(answer->string answer)))) form)))
-
-; displaying information ----------------------------------------------------
-
-; String String *-> true
-; to deliver an intermediate message and a link to continue
-(define (internal:inform title . paragraph)
-  (check-arg 'inform (string? title) "string" "first" title)
-  (check-arg 'inform (andmap string? paragraph) 
-             "list of strings" "second, third, ..." paragraph)
-  (servlet:send/suspend
-   (lambda (url)
-     `(html 
-       (title ,title)
-       (body ([bgcolor "white"])
-             (h3 ,title)
-             (br)
-             (p ,@paragraph)
-             (br)
-             (a ([href ,url]) "Continue")))))
-  #t)
-
-
-
-; (listof Xexpr) -> true 
-(define (internal:inform/html stuff)
-  (servlet:send/suspend
-   (lambda (url)
-     `(html 
-       (title "Information")
-       (body ([bgcolor "white"])
-             (hr)
-             (div ,@stuff)
-             (hr)
-             (a ([href ,url]) "Continue")))))
-  #t)
-
-; String String *-> true
-; to deliver a final web page and terminate the web dialog
-(define (internal:final-page title . paragraph)
-  (check-arg 'final-page (string? title) "string" "first" title)
-  (check-arg 'final-page (andmap string? paragraph) 
-             "list of strings" "second, third, ..." paragraph)
-  (servlet:send/finish
-   `(html 
-     (title ,title)
-     (body ([bgcolor "white"])
-           (h3 ,title)
-           (br)
-           (p ,@paragraph))))
-  #t)
-
-
-;    ;;;      ;                    ;                 
-;;;                           ;                                             
-;                           ;                                             
-; ;  ;;  ;; ;;; ;;; ;;;      ;    ;;;    ;;;;   ; ;;;  ;;;     ;;;    ;;;  
-; ;   ;   ;   ; ;     ;      ;      ;        ;   ;       ;    ;   ;  ;   ; 
-;;;;;  ;   ;    ;      ;      ;      ;     ;;;;   ;       ;    ;;;;;   ;;;  
-;   ;  ;   ;   ; ;     ;      ;      ;    ;   ;   ;       ;    ;          ; 
-;   ;  ;   ;  ;   ;    ;      ;      ;    ;   ;   ;       ;    ;   ;  ;   ; 
-;;; ;;;  ;;; ;;;   ;; ;;;;;  ;;;;;; ;;;;;   ;;; ; ;;;;   ;;;;;   ;;;    ;;;  
-
-; String Form -> FormResults
-(define (conduct-query text aloss)
-  (let ([keys (map car aloss)])
-    (let cq ([text text])
-      (let ([res (build-form text aloss)])
-        (let/ec restart 
-          (map (lambda (k fe)
-                 (get-binding restart (string->symbol k) res (cadr fe) cq))
-               keys aloss))))))
-
-; String (String -> (listof Answer)) -> (listof Answer)
-(define (handle message cq n)
-  (cq `(font ([color "red"]) ,(string-append message " " (fe-question n)))))
-
-; Continuation Symbol Bindings FormElement -> Answer
-; effect:  raise 'yes-no if a yes-no button goes unchecked 
-(define (get-binding restart tag bindings fe cq)
-  (let ([cq       (compose restart cq)]
-        [result (servlet:extract-bindings tag bindings)]
-        [question "Please respond to the question:"])
-    (cond
-      [(check? fe) (if (null? result) #f #t)]
-      [(numeric? fe) 
-       (if (null? result)
-           (handle question cq fe)
-           (let ([r (string->number (car result))]
-                 [question  "Please respond with a number to the question:"])
-             (if r r (handle question cq fe))))]
-      [(yes-no? fe)
-       (if (null? result) (handle question cq fe) (car result))]
-      [(radio? fe)
-       (if (null? result) (handle question cq fe) (car result))]
-      [(button? fe) ; at most one button should be clicked
-       (if (null? result) #f (car result))]
-      [(null? result) (format "error ~e -> ~e :: ~e" tag fe bindings)]
-      [else (car result)])))
-
-; String Form -> FormResults
-; assert: (lambda (result) (set-equal? (domain aloss) (domain result)))
-(define (build-form title f)
-  (servlet:request-bindings
-   (servlet:send/suspend
-    (lambda (url) 
-      `(html 
-        (head (title ,title))
-        (body ([bgcolor "white"])
-              (h3 ,title)
-              (br)
-              (form ([action ,url])                       
-                    (table ,@(map build-row f))
-                    ,@(add-submit-button (map second f)))))))))
-
-; build-row : (list Symbol FormElement) -> Xexpr[tr]
-(define (build-row x)
-  (let* ([tag (first x)]
-         [fe  (second x)]
-         [rad (lambda (x)
-                `(td (input ([type "radio"][name ,tag][value ,x])) " " ,x))]
-         [make-radio
-          (lambda (loq) `(td (table (tr ,@(map rad loq)))))])
-    (cond
-      [(string? fe) 
-       `(tr (td ,fe) (td (input ([type "text"][name ,tag][value ""]) " ")))]
-      [(password? fe)
-       `(tr (td ,(fe-question fe)) 
-            (td (input ([type "password"][name ,tag]) " ")))]
-      [(numeric? fe)
-       `(tr (td ,(fe-question fe)) 
-            (td (input ([type "text"][name ,tag]) " ")))]
-      [(check? fe)
-       `(tr (td ,(fe-question fe))
-            (td (input ([type "checkbox"][name ,tag][value ,(fe-question fe)]) " ")))]
-      [(yes-no? fe) 
-       `(tr (td ,(fe-question fe))
-            ,(make-radio (list (yes-no-positive fe) (yes-no-negative fe))))]
-      [(radio? fe)
-       `(tr (td ,(fe-question fe)) ,(make-radio (radio-labels fe)))]
-      [(button? fe)
-       `(tr (td) 
-            (td (input ([type "submit"][name ,tag][value ,(fe-question fe)]) " ")))]
-      [else (error 'build-row "can't happen: ~e" fe)])))
-
-; (listof Forms) -> (union Empty (list SUBMIT-BUTTON))
-(define (add-submit-button fes)
-  ; XXX Commented
-  #;(if (pair? (cdr fes))
-        (if (ormap button? fes) '() (list SUBMIT-BUTTON))
-        (let ([fe (car fes)])
-          (if (or (string? fe) (password? fe) (numeric? fe))
-              '()
-              (list SUBMIT-BUTTON))))
-  (list SUBMIT-BUTTON))
-
-;;                   ;;            
-;;;   ;                    ;            
-;   ;  ;                    ;            
-;   ;  ; ;;    ;;;    ;;;   ;  ;;   ;;;  
-;      ;;  ;  ;   ;  ;   ;  ; ;    ;   ; 
-;      ;   ;  ;;;;;  ;      ;;      ;;;  
-;   ;  ;   ;  ;      ;      ; ;        ; 
-;   ;  ;   ;  ;   ;  ;   ;  ;  ;   ;   ; 
-;;;  ;;; ;;;  ;;;    ;;;  ;;   ;;  ;;;  
-
-
-; Answer -> String 
-(define (answer->string a)
-  (cond
-    [(string? a)  (format "~s" a)]
-    [(number? a)  (number->string a)]
-    [(boolean? a) (if a "true" "false")]
-    [else (format "~a" a)]))
-
-; ---------------------------------------------------------------------------
-; (listof X) -> (listof String)
-; make unique, readable string/tags for a list of queries 
-(define make-keys
-  (let ([counter 0])
-    (lambda (fes)
-      (map (lambda (x) 
-             (set! counter (+ counter 1))
-             (format "tag~a" counter))
-           fes))))
-
-; ---------------------------------------------------------------------------
-; (listof Xexpr[tr]) -> true 
-; echo stuff, wait for click on continue link
-(define (make-echo-page stuff)
-  (servlet:send/suspend
-   (lambda (url)
-     `(html
-       (title "Echoed Answers")
-       (body ([bgcolor "white"])
-             (br)
-             (table 
-              ,@stuff)
-             (br)
-             (a ([href ,url]) "Continue")))))
-  #t)
-
-; constants -----------------------------------------------------------------
-(define SUBMIT-BUTTON '(input ([type "submit"][value "Submit"])))
-
-
-
-
-;                                            
-;                                            
-;                                            
-;    ;;;;                                    
-;   ;;   ;                                   
-;   ;       ;;;    ; ;;  ;   ;   ;;;    ; ;; 
-;   ;;     ;;  ;   ;;  ; ;   ;  ;;  ;   ;;  ;
-;    ;;;;  ;   ;   ;      ; ;   ;   ;   ;    
-;       ;; ;;;;;   ;      ; ;   ;;;;;   ;    
-;        ; ;       ;      ;;;   ;       ;    
-;   ;   ;; ;;  ;   ;       ;    ;;  ;   ;    
-;    ;;;;   ;;;    ;       ;     ;;;    ;    
-;                                            
-;                                            
-;                                     ;    ;;
-
-
-;; get-next-port: -> number
-;; Returns the next port, starting from 8000, that's available.
-;; If we can't get one after max-attempt tries, give up and raise
-;; an error.
-(define (get-next-port)
-  (define starting-at 8000)
-  (define max-attempts 32)
-  (let loop ([port-no starting-at]
-             [attempts 0])
-    (let ([port-available?
-           (with-handlers ([exn:fail:network?
-                            (lambda (exn) #f)])
-             (let ([listener (tcp-listen port-no 4 #t #f)])
-               (tcp-close listener)
-               #t))])
-      (cond
-        [port-available?
-         port-no]
-        [(< attempts max-attempts)
-         (loop (add1 port-no) (add1 attempts))]
-        [else
-         (error 'get-next-port
-                "Couldn't find an available port between ~a and ~a\n"
-                starting-at (+ starting-at max-attempts))]))))
-
-;; the current-server is a (make-parameter (or/c #f a-server))
-;; where a-server is a server, defined below.
-(define current-server (make-parameter #f))
-
-;; A server consists of the maintenance thread, the request and response channels.
-(define-struct server (th req-ch))
-
-;; A request is either a
-;;   (make-req:standard f args)
-;; or a
-;;   (make-req:final f args)
-;; where f is a function that consumes args.
-(define-struct req (res-ch func args) #:prefab)
-(define-struct (req:standard req) () #:prefab)
-(define-struct (req:final req) () #:prefab)
-
-;; If an exception happens when evaluating a request, we
-;; return an error response.  exn holds the exception that happened.
-(define-struct error-res (exn))
-
-;; ensure-standalone-server-running!: -> void
-;; Initializes the current-server parameter.
-;; Makes sure that the standalone server is up and running.
-(define (ensure-standalone-server-running!)
-  (unless (current-server)
-    (local [(define req-ch (make-channel))
-            (define (server-loop)
-              (let ([msg (channel-get req-ch)])
-                (match msg
-                  [(struct req (res-ch func args))
-                   (define res 
-                     (with-handlers ([void make-error-res])
-                       (apply func args)))
-                   (channel-put res-ch res)
-                   (unless (req:final? msg)
-                     (server-loop))])))
-            (define th
-              (thread (lambda ()
-                        (let ([port (get-next-port)]
-                              [called? #f])
-                          (parameterize ([read-accept-dot #t])
-                            (servlet:serve/servlet 
-                             (lambda (req)
-                               (if (not called?)
-                                   (begin (set! called? #t)
-                                          (server-loop))
-                                   "The servlet has executed already."))
-                             #:banner? #f
-                             #:port port))))))
-            (define a-server (make-server th req-ch))]
-      (current-server a-server))))
-
-;; Each of the wrapped functions turns function calls into requests
-;; to the server.
-(define (make-wrapped-function internal:function make-req)
-  (lambda args
-    (ensure-standalone-server-running!)
-    (match (current-server)
-      [(struct server (th req-ch))
-       (thread-resume th)
-       (let* ([res-ch (make-channel)]
-              [req (make-req res-ch internal:function args)])
-         (channel-put req-ch req)
-         (let ([result (channel-get res-ch)])
-           (cond
-             [(error-res? result)
-              (raise (error-res-exn result))]
-             [else
-              result])))])))
-
-;; Provides wrappers around the internal functions to make the wrapped functions
-;; run in the context of a standalone server.
-(define-syntax (define-wrapped-function stx)
-  (syntax-case stx ()
-    [(_ function internal:function #:final final)
-     (with-syntax ([make-request (if (syntax->datum #'final)
-                                     #'make-req:final
-                                     #'make-req:standard)])
-       (syntax/loc stx 
-         (define function (make-wrapped-function internal:function make-request))))]
-    
-    [(_ function internal:function)
-     (syntax/loc stx
-       (define-wrapped-function function internal:function #:final #f))]))
-
-
-(define-wrapped-function single-query internal:single-query)
-(define-wrapped-function queries internal:queries)
-(define-wrapped-function echo-answers internal:echo-answers)
-
-(define-wrapped-function form-query internal:form-query)
-(define-wrapped-function echo-response internal:echo-response)
-
-(define-wrapped-function inform/html internal:inform/html)
-(define-wrapped-function inform internal:inform)
-
-;; fixme: on a final-page, send/finish doesn't seem to return control.
-(define-wrapped-function final-page internal:final-page #:final #t)
-
-(define-wrapped-function send/suspend servlet:send/suspend)
-(define-wrapped-function send/finish servlet:send/finish #:final #t)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/show-queen.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/show-queen.rkt
deleted file mode 100644
index b5c73df7cf..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/show-queen.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang s-exp framework/private/decode
-zVdLk6M2EL77V3TY2lrIhJrZ2hxSqUx8yTlVObt8kKFt5BUSI4Qfe8hvT7cEWGA8u8ec0ONT
-61PTz1V6MrKEZLUC+MvA1XRgUSh1hbPQDpwBZcxXEDSsZAuFKXG9WiXZapVafOukRagtlmBF
-8RXdc6FE2/JmY81JlghtZc75W4eoebXEvdQIjcWTNF2b762oET7so73iIzFJvRwohD6Jlhdo
-aS9RlbA55TsjbAmfPqTZFjat/Ibwss0CJsh4brqdkgWkUksHHh72CdGi+wkGGamSrcv/PGHh
-jIW0Fg1MVsLRbHrY35gGRK5QH1w1CLwhjc4bIbXLZsSsPAlHxw/oQMIxGwVZ3E/GA0WZEaoX
-InWFll5Eh/NCSdQu92R4XhZZrKa0lqxW+h75O2VhTmgt/xymiSeSA3hyI/fC6LIfA2xS1kyL
-umQM1PRX9WGdRUt0nFjxYjaeIs3SA9MN7V8iKBO98F+jyXW2fuX1vel0mRuNa2K9jeTxw0gz
-KIoqb0lL0uh4k+4T9a4UpCM4wgWu3lrzc/hUE0GMPleoIRV0ffrHK+EDzycahXNZ5jeuEIg+
-DQKrLJvLGswipu4WQJ1WSCYdLiXPEWpNFlDT/x1mR6iPC+KHC+iPynd2j2QnS7s3S5xxHxjd
-iE+PTxlr4wJZP1jgOZJkb35EcWkvJriN7G60DoUiGF1kXuEHkmnShfUxm9w+uS6Wv33gB6sZ
-kX4eTLgsvLeyg90M8rEx/rghMsu8MMrYFuiSZKcohCaQKHmo3MGKazJDkzoIV1pxpghROKEP
-Cr9zRVDTEGymHiMp4LiKgr1DjWW+u66DMu+hj7lS5E9+FGssMcZkZjnTd6FSsmlxLpEdM30e
-3vnbnfF5Bx0A1RLg5+Hwl+dfH21WfjNbUCB7QNBN+jo47euSvz56+8FSAkz+9y8fQ8QsX/UO
-MTd62Eeukp+E6pDCxSY9Q5UFp4myVOw9wbPOeeuwgfStM45hcIYAhE0136pgJqOXQsUJwTaS
-SgDYXCgd70lybcpOmUjcZawQhrNDbOPf6VGz2BcY9przrvINrVlDuCKDgfvTMPqcZdv72BZR
-PHqK1ynFaqR4nVO8I3pcInpPt4rpXnu61Ui3eoduL2wPP5REx7v9+57oyOcHkB54T+sF0ryf
-MKN3T09y8EL6GWjIhzQWfqMncPkOgUldEDtJ2zVoc428fCtgZzGg8UPY+Q8fHP2ecQ2HF7/g
-KuRZzgUokCBKyTYvfHj2qF7OZ/jUGiVDqTkRtbNdW0XC/HxRXEAGRqO4+AXvpYU4GHJp+BoK
-Ez9YrkFoh7Qcqt28T9ge7/8Wrz4NqxMat+Zg7A18PzDtF9Jbh3Er9ae1C+tgPe0DbuQIwXX/
-mLcv2eRUP2XIzhgqRTSvEf+44E+pjvCqHKnE1yR4aShgUpMkfHsBZj9+e5kt0LOkbjr3CxyM
-+x3+xSQWcbusz0i6U2rypHsKkJAVBKFQd3TdDolA6CrOkpoW4Usr5sGqpQQUcvMQnSXrILQ3
-4Z6hyYp0e6e5V4jPRYoamot3NRXrisn3YkhPPDMdNRpBc9SW1sIVFXA6GvYZXbl2mEqte3i7
-rFSI+7v+1RrJ5n3b6Atdb4Ljw73qR8SkKQy2mlIsCMOPsFFihwqSv+EffmabUJAn3dBzvrxw
-JqiQ6zw/mTWYvZV7YQUJaoTlFOjlbm/Bh/28h8773BnTHhw4sua5Qwmv5uafRv8B
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/testing.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/testing.rkt
deleted file mode 100644
index 614ef15449..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/testing.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scheme/base
-
-(require test-engine/racket-tests)
-
-(define (generate-report) (test)#;(void))
-
-(provide (all-from-out test-engine/racket-tests)
-         generate-report)
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/world.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/world.rkt
deleted file mode 100644
index 1333f9eeec..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/world.rkt
+++ /dev/null
@@ -1,886 +0,0 @@
-#lang scheme/base
-
-#|
- workshop experience: 
-
-   stop-when should have a different signature:
-    stop-when : (World -> Boolean) (World -> Image) 
-
-   (stop-when C F) should have this semantics:
-    on each assignment to world,
-    (begin 
-      (set! current-world new-world)
-      (when (C current-world) (render (F current-world))))
-|#
-;; Thu Aug 28 15:54:23 EDT 2008: big-bang can now be re-run after the world
-;;                               has stopped
-
-;; Tue Aug 12 08:54:45 EDT 2008: ke=? changed to key=? 
-;; Fri Jul  4 10:25:47 EDT 2008: added ke=? and key-event? 
-;; Mon Jun 16 15:38:14 EDT 2008: removed end-of-time and provided stop-when 
-;;                               also allow repeated setting of callbacks now
-;;                               If this is changed back, stop-when will fail
-
-;; Wed Apr 23 11:42:25 EDT 2008: fixed reverse bug in animation 
-;; Thu Mar 20 17:15:54 EDT 2008: fixed place-image0, which used shrink off-by-1
-;; Mon Sep 17 09:40:39 EDT 2007: run-simulation now allows recordings, too
-;; Mon Aug  6 19:50:30 EDT 2007: exporting both add-line from "image.rkt" and scene+line 
-;; Fri May  4 18:05:33 EDT 2007: define-run-time-path 
-;; Thu May  3 22:06:16 EDT 2007: scene # image; pasteboard% for text%
-;; Sat Apr 28 13:31:02 EDT 2007: fixed the image and animated-gif thing, using Matthew's lib
-;; Fri Dec 22 11:51:53 EST 2006: cleaned up the callback code with macro
-;; Thu Dec 21 13:59:23 EST 2006: fixed add-line and place-image to accept numbers
-;; Wed Dec 20 18:17:03 EST 2006: recording events and creating images
-
-#|
-At Thu, 21 Dec 2006 14:10:35 -0500, Matthias Felleisen wrote:
-2. The history mechanism collects a record in a list for every event.
-    This means say 30 tick events per second, plus mice and keyboard  
-    callbacks.
-    Say we get 50 events at the upper limit per second.
-    After playing for one minute, the event list contains 3,000 records.
-    After playing for ten minutes, the event list contains 30,000 records.
-    Each record consists of, on the average, 3 numbers, so it's like gathering
-    a list of 100,000 numbers.
-
-    Is this going to become a bottleneck?
-
-That's a largish list. It could only get that big with mouse-motion
-events, right?
-
-I suggest that when you receive three mouse-motion events in a row,
-drop the middle one, unless the time between the middle one and the
-oldest one is greater than 100 msecs. (Dropping the middle one means
-that you keep the endpoints, which are likely to be the interesting
-ones.)
-
-Matthew
-|#
-
-;; Sun Dec 09 23:17:41 EST 2006: add-line fixed so it cuts off lines before drawing
-;; Mon Mar 27 10:29:28 EST 2006: integrated Felix's mouse events
-;; Wed Jan 25 13:38:42 EST 2006: on-redraw: proc is now called on installation
-;; Tue Jan  3 11:17:50 EST 2006: changed add-line behavior in "world.rkt"
-;; Sat Dec 10 19:39:03 EST 2005: fixed name, changed interface to on-key-event
-;; Fri Dec  9 21:39:03 EST 2005: remoevd (update ... produce ...); added on-redraw 
-;; Thu Dec  1 17:03:03 EST 2005: fixed place-image; all coordinates okay now
-
-(require scheme/class
-         scheme/local
-         scheme/bool
-         (except-in mred make-color)
-         htdp/error
-         htdp/image
-         mrlib/cache-image-snip
-         lang/prim
-         lang/private/rewrite-error-message
-         (for-syntax scheme/base))
-
-(require mrlib/gif)
-(require mzlib/runtime-path)
-
-(require mrlib/bitmap-label
-         string-constants)
-
-;; --- provide ---------------------------------------------------------------
-
-
-;                                                   
-;                                                   
-;   ;;;;                         ;         ;        
-;   ;   ;                                  ;        
-;   ;   ;                                  ;        
-;   ;   ;  ; ;;;   ;;;   ;   ; ;;;      ;;;;   ;;;  
-;   ;  ;   ;;  ;  ;   ;  ;   ;   ;     ;   ;  ;   ; 
-;   ;;;    ;      ;   ;   ; ;    ;     ;   ;  ;;;;; 
-;   ;      ;      ;   ;   ; ;    ;     ;   ;  ;     
-;   ;      ;      ;   ;   ; ;    ;     ;  ;;  ;     
-;   ;      ;       ;;;     ;     ;;;    ;; ;   ;;;; 
-;                                                   
-;                                                   
-;                                                   
-
-
-;; image manipulation functions:
-;; =============================
-(provide (all-from-out htdp/image))
-
-;; world manipulation functions: 
-;; =============================
-(provide      ;; forall(World):
- big-bang     ;; Number Number Number World [Boolean] -> true
- )
-
-(provide-higher-order-primitive
- on-tick-event (tock) ;; (World -> World) -> true
- )
-
-(provide-higher-order-primitive
- on-redraw (world-to-image) ;; (World -> Image) -> true
- )
-
-;; KeyEvent is one of: 
-;; -- Char 
-;; -- Symbol 
-
-(provide
-  key-event? ;; Any -> Boolean
-  key=? ;; KeyEvent KeyEvent -> Boolean
- )
-
-(provide-higher-order-primitive
- on-key-event (control) ;; (World KeyEvent -> World) -> true
- )
-
-;; A MouseEventType is one of:
-;; - 'button-down
-;; - 'button-up
-;; - 'drag
-;; - 'move
-;; - 'enter
-;; - 'leave
-
-(provide-higher-order-primitive
- on-mouse-event (clack)  ;; (World Number Number MouseEvent -> World) -> true
- )
-
-(provide-higher-order-primitive
- stop-when (last-world)  ;; (World -> Boolean) -> true
- )
-
-(provide-higher-order-primitive
- run-simulation (_ _ _ create-scene) ; (Number Number Number (Nat -> Scene) -> true)
- )
-
-(provide
- run-movie ;; [Listof Image] -> true 
- )
-
-;; ---------------------------------------------------------------------------
-
-
-;                                                                        
-;                                                                        
-;   ;;;;;                                           ;  ;  ;;;;         ; 
-;   ;                                    ;          ;  ;  ;  ;         ; 
-;   ;                                    ;          ;  ;  ;  ;         ; 
-;   ;      ;  ;   ; ;;    ;;;   ; ;;;  ;;;;;        ; ; ; ;  ;      ;;;; 
-;   ;;;;;  ;  ;   ;;  ;  ;   ;  ;;  ;    ;          ; ; ; ;  ;     ;   ; 
-;   ;       ;;    ;   ;  ;   ;  ;        ;           ;; ;;   ;     ;   ; 
-;   ;       ;;    ;   ;  ;   ;  ;        ;           ;   ;   ;     ;   ; 
-;   ;      ;  ;   ;   ;  ;   ;  ;        ;           ;   ;   ;     ;  ;; 
-;   ;;;;;  ;  ;   ;;;;    ;;;   ;         ;;         ;   ;   ;;;    ;; ; 
-;                 ;                                                      
-;                 ;                                                      
-;                                                                        
-
-;; Number Number Number World [Boolean] -> true
-;; create the visible world (canvas)
-(define big-bang
-  (lambda x 
-    (define args (length x))
-    (if (or (= args 5) (= args 4))
-        (apply big-bang0 x) 
-        (tp-error 'big-bang "expects 4 or 5 arguments, given ~a" args))))
-
-(define *running?* #f)
-(define big-bang0
-  (case-lambda 
-    [(w h delta world) (big-bang w h delta world #f)]
-    [(w h delta world animated-gif) 
-     (check-size/0 'big-bang w "first")
-     (check-size/0 'big-bang h "second")
-     ;; ============================================
-     ;; WHAT IF THEY ARE NOT INTs?
-     ;; ============================================
-     (check-arg 'big-bang
-                (and (number? delta) (<= 0 delta 1000))
-                "number of seconds between 0 and 1000"
-                "third"
-                delta)
-     (check-arg 'big-bang 
-                (boolean? animated-gif)
-                "boolean"
-                "fifth"
-                animated-gif)
-     (let ([w (coerce w)]
-           [h (coerce h)])
-       (when *running?*  (error 'big-bang "the world is still running, cannot start another world"))
-       (set! *running?* #t)
-       (callback-stop!)
-       ;; (when (vw-init?) (error 'big-bang "big-bang already called once"))
-       (install-world delta world) ;; call first to establish a visible world
-       (set-and-show-frame w h animated-gif) ;; now show it
-       (unless animated-gif (set! add-event void)) ;; no recording if image undesired
-       (set! *the-delta* delta)
-       #t)]))
-
-;; Number -> Int 
-(define (coerce x) (inexact->exact (floor x)))
-
-(define *the-delta* 0.0)
-
-(define (on-tick-event f)
-  (check-proc 'on-tick-event f 1 "on-tick-event" "one argument")
-  (check-world 'on-tick-event)
-  (set-timer-callback f)
-  (send the-time start
-        (let* ([w (ceiling (* 1000 the-delta))])
-          (if (exact? w) w (inexact->exact w))))
-  #t)
-
-(define (on-redraw f)
-  (check-proc 'on-redraw f 1 "on-redraw" "one argument")
-  (check-world 'on-redraw)
-  (set-redraw-callback f)
-  (redraw-callback)
-  #t)
-
-(define (key-event? k)
-  (or (char? k) (symbol? k)))
-
-(define (key=? k m)
-  (check-arg 'key=? (key-event? k) 'KeyEvent "first" k)
-  (check-arg 'key=? (key-event? m) 'KeyEvent "first" m)
-  (eqv? k m))
-
-(define (on-key-event f)
-  (check-proc 'on-key-event f 2 "on-key-event" "two arguments")
-  (check-world 'on-key-event)
-  (set-key-callback f (current-eventspace))
-  #t)
-
-(define (on-mouse-event f)
-  (check-proc 'on-mouse-event f 4 "on-mouse-event" "four arguments")
-  (check-world 'on-mouse-event)
-  (set-mouse-callback f (current-eventspace))
-  #t)
-
-(define (stop-when f)
-  (check-proc 'stop-when f 1 "stop-when" "one argument")
-  (check-world 'stop-when)
-  (set-stop-when-callback f)
-  #t)
-
-(define (run-movie movie)
-  (check-arg 'run-movie (list? movie) "list (of images)" "first" movie)
-  (for-each (lambda (cand) 
-              (check-image 'run-movie cand "first" "list of images"))
-            movie)
-  (let* ([fst (car movie)]
-         [wdt (image-width fst)]
-         [hgt (image-height fst)])
-    (big-bang wdt hgt (/ 1 27) movie)
-    (let run-movie ([movie movie])
-      (cond
-        [(null? movie) #t]
-        [(pair? movie)
-         (update-frame (car movie))
-         (sleep/yield .05)
-         (run-movie (cdr movie))]))))
-
-(define run-simulation 
-  (lambda x 
-    (define args (length x))
-    (if (or (= args 5) (= args 4))
-        (apply run-simulation0 x) 
-        (tp-error 'run-simulation "expects 4 or 5 arguments, given ~a" args))))
-
-
-(define run-simulation0
-  (case-lambda
-    [(width height rate f record?)
-     (check-size/0 'run-simulation width "first")
-     (check-size/0 'run-simulation height "second")
-     (check-arg 'run-simulation (number? rate) 'number "third" rate)
-     (check-proc 'run-simulation f 1 "fourth" "one argument")
-     (check-arg 'run-simulation (boolean? record?) 'number "fifth [and optional]" record?)
-     (big-bang width height rate 1 record?)
-     (on-redraw f)
-     (on-tick-event add1)]
-    [(width height rate f)
-     (run-simulation width height rate f #f)]))
-
-;; ---------------------------------------------------------------------------
-
-;                                     
-;                                     
-;     ;;;  ;                    ;     
-;    ;     ;                    ;     
-;   ;      ;                    ;     
-;   ;      ; ;;    ;;;    ;;;;  ;   ; 
-;   ;      ;;  ;  ;   ;  ;      ;  ;  
-;   ;      ;   ;  ;;;;;  ;      ; ;   
-;   ;      ;   ;  ;      ;      ;;;   
-;    ;     ;   ;  ;      ;      ;  ;  
-;     ;;;  ;   ;   ;;;;   ;;;;  ;   ; 
-;                                     
-;                                     
-;                                     
-
-;; Symbol Any String -> Void
-(define (check-size/0 tag c rank)
-  (check-arg tag (and (number? c) (>= (coerce c) 0))
-             "natural number" rank c))
-
-;; Symbol Any String String *-> Void
-(define (check-image tag i rank . other-message)
-  (if (and (pair? other-message) (string? (car other-message)))
-      (check-arg tag (image? i) (car other-message) rank i)
-      (check-arg tag (image? i) "image" rank i)))
-
-;; Symbol Any String -> Void
-(define (check-scene tag i rank)
-  (if (image? i)
-      (unless (scene? i)
-        (tp-error tag "expects a scene, given image whose pinhole is at (~s,~s) instead of (0,0)"
-               (pinhole-x i) (pinhole-y i)))
-      (check-arg tag #f "image" rank i)))
-
-;; Symbol Any String -> Void
-(define (check-sym/string-color tag width rank)
-  (check-arg tag (or (symbol? width) (string? width)) 
-             "color symbol or string" rank width))
-
-;; Symbol (union Symbol String) Nat -> Void
-(define (check-mode tag s rank)
-  (check-arg tag (or (eq? s 'solid)
-                     (eq? s 'outline)
-                     (string=? "solid" s)
-                     (string=? "outline" s)) "mode (solid or outline)" rank s))
-
-;                                                                        
-;                                                                        
-;   ;;;;;                                     ;;;;;                      
-;     ;                                       ;                          
-;     ;                                       ;                          
-;     ;   ;;; ;    ;;;;   ;;;;   ;;;          ;      ;   ;  ; ;;    ;;;  
-;     ;   ; ;;;   ;   ;  ;   ;  ;   ;         ;;;;;  ;   ;  ;;  ;  ;   ; 
-;     ;   ; ; ;   ;   ;  ;   ;  ;;;;;         ;      ;   ;  ;   ;   ;;   
-;     ;   ; ; ;   ;   ;  ;   ;  ;             ;      ;   ;  ;   ;     ;  
-;     ;   ; ; ;   ;  ;;  ;  ;;  ;             ;      ;  ;;  ;   ;  ;   ; 
-;   ;;;;; ; ; ;    ;; ;   ;; ;   ;;;;         ;       ;; ;  ;   ;   ;;;  
-;                            ;                                           
-;                        ;;;;                                            
-;                                                                        
-
-;; Image Number Number Image -> Image 
-#;
-(define (place-image0 image x y scene)
-  (define sw (image-width scene))
-  (define sh (image-height scene))
-  (define ns (overlay/xy scene x y image))
-  (define nw (image-width ns))
-  (define nh (image-height ns))
-  (if (and (= sw nw) (= sh nh)) ns (shrink ns 0 0 sw sh)))
-
-(define (place-image0 image x y scene)
-  (define sw (image-width scene))
-  (define sh (image-height scene))
-  (define ns (overlay/xy scene x y image))
-  (define nw (image-width ns))
-  (define nh (image-height ns))
-  (if (and (= sw nw) (= sh nh)) ns (shrink ns 0 0 (- sw 1) (- sh 1)))) 
-
-;; Image Number Number Number Number Color -> Image
-(define (add-line-to-scene0 img x0 y0 x1 y1 c)
-  (define w (image-width img))  
-  (define h (image-height img))
-  (cond
-    [(and (<= 0 x0 w) (<= 0 x1 w) (<= 0 y0 w) (<= 0 y1 w))
-     (shrink (add-line img x0 y0 x1 y1 c) 0 0 (- w 1) (- h 1))]
-    [(= x0 x1) ;; vertical that leaves bounds 
-     (if (<= 0 x0 w) (add-line img x0 (app y0 h) x0 (app y1 h) c) img)]
-    [(= y0 y1) ;; horizontal that leaves bounds 
-     (if (<= 0 y0 h) (add-line img (app x0 w) y0 (app x1 w) y0 c) img)]
-    [else 
-     (local ((define lin (points->line x0 y0 x1 y1))
-             (define dir (direction x0 y0 x1 y1))
-             (define-values (upp low lft rgt) (intersections lin w h))
-             (define (add x y) (add-line img x0 y0 x y c)))
-       (cond
-         [(and (< 0 x0 w) (< 0 y0 h)) ;; (x0,y0) is in the interior
-          (case dir
-            [(upper-left)  (if (number? upp) (add upp 0) (add 0 lft))]
-            [(lower-left)  (if (number? low) (add low h) (add 0 lft))]
-            [(upper-right) (if (number? upp) (add upp 0) (add w rgt))]
-            [(lower-right) (if (number? low) (add low h) (add w rgt))]
-            [else (tp-error
-                   'dir
-                   "expected a symbol for the direction, such as 'upper-left 'lower-right 'upper-right or 'lower-right, given ~a"
-                   dir)])]
-         [(and (< 0 x1 w) (< 0 y1 h)) ;; (x1,y1) in interior; symmetry!
-          (add-line-to-scene0 img x1 y1 x0 y0 c)]
-         [else 
-          (cond
-            [(and (number? upp) (number? low)) (add-line img upp 0 low h c)]
-            [(and (number? upp) (number? lft)) (add-line img upp 0 0 lft c)]
-            [(and (number? upp) (number? rgt)) (add-line img upp 0 w rgt c)]
-            [(and (number? low) (number? lft)) (add-line img low h 0 lft c)]
-            [(and (number? low) (number? rgt)) (add-line img low h w rgt c)]
-            [(and (number? lft) (number? rgt)) (add-line img 0 lft w rgt c)]
-            [else img])]))]))
-;; Nat Nat -> Nat 
-;; y if in [0,h], otherwise the closest boundary
-(define (app y h)
-  (cond
-    [(and (<= 0 y) (< y h)) y]
-    [(< y 0) 0]
-    [else (- h 1)]))
-
-;; Nat Nat Nat Nat -> (union 'upper-left 'upper-right 'lower-left 'lower-right)
-;; how to get to (x1,y1) from (x0,y0)
-(define (direction x0 y0 x1 y1)
-  (string->symbol
-   (string-append 
-    (if (<= y0 y1) "lower" "upper") "-" (if (<= x0 x1) "right" "left"))))
-
-#| TESTS
-'direction 
-(equal? (direction 10 10 0 0) 'upper-left)
-(equal? (direction 10 10 20 20) 'lower-right)
-(equal? (direction 10 10 0 20) 'lower-left)
-(equal? (direction 10 10 20 0) 'upper-right)
-|#
-
-;; -----------------------------------------------------------------------------
-;; LINEs 
-
-;; Number Number -> LINE
-;; create a line from a slope and the intersection with the y-axis
-(define-struct lyne (slope y0))
-
-;; Nat Nat Nat Nat -> LINE
-;; determine the line function from the four points (or the attributes)
-;; ASSUME: (not (= x0 x1))
-(define (points->line x0 y0 x1 y1)
-  (local ((define slope  (/ (- y1 y0) (- x1 x0))))
-    (make-lyne slope (- y0 (* slope x0)))))
-
-;; LINE Number -> Number 
-(define (of ln x) (+ (* (lyne-slope ln) x) (lyne-y0 ln)))
-
-;; LINE Nat Nat -> [Opt Number] [Opt Number] [Opt Number] [Opt Number]
-;; where does the line intersect the rectangle [0,w] x [0,h]
-;; (values UP LW LF RT) means the line intersects with 
-;;  the rectangle [0,w] x [0,h] at (UP,0) or (LW,h) or (0,LF) or (w,RT)
-;;  when a field is false, the line doesn't interesect with that side 
-(define (intersections l w h)
-  (values
-   (opt (X l 0) w) (opt (X l h) w) (opt (lyne-y0 l) h) (opt (of l w) h)))
-
-;; Number Number -> [Opt Number]
-(define (opt z lft) (if (<= 0 z lft) z false))
-
-;; LINE Number -> Number 
-;; the x0 where LINE crosses y(x) = h
-;; assume: LINE is not a horizontal
-(define (X ln h) (/ (- h (lyne-y0 ln)) (lyne-slope ln)))
-
-;; --- TESTS --- 
-#|
-(define line1 (points->line 0 0 100 100))
-(= (of line1 0) 0)
-(= (of line1 100) 100)
-(= (of line1 50) 50)
-
-(= (X (make-lyne 1 0) 0) 0)
-(= (X (make-lyne 1 0) 100) 100)
-
-(equal? (call-with-values 
-         (lambda () (intersections (points->line -10 -10 110 110) 100 100))
-         list)
-        (list 0 100 0 100))
-(equal? (call-with-values 
-         (lambda () (intersections (points->line 0 10 100 80) 100 100))
-         list)
-        (list false false 10 80))
-|#
-;; ---------------------------------------------------------------------------
-
-
-;                                     
-;                                     
-;  ;  ;  ;              ;;;         ; 
-;  ;  ;  ;                ;         ; 
-;  ;  ;  ;                ;         ; 
-;  ; ; ; ;  ;;;   ; ;;;   ;      ;;;; 
-;  ; ; ; ; ;   ;  ;;  ;   ;     ;   ; 
-;   ;; ;;  ;   ;  ;       ;     ;   ; 
-;   ;   ;  ;   ;  ;       ;     ;   ; 
-;   ;   ;  ;   ;  ;       ;     ;  ;; 
-;   ;   ;   ;;;   ;       ;;;    ;; ; 
-;                                     
-;                                     
-;                                     
-
-(define unique-world (cons 1 1))
-(define (check-world tag)
-  (when (eq? unique-world the-world) 
-    (tp-error tag "big-bang has not been called before calling ~a" tag)))
-
-(define the-world unique-world)
-(define the-world0 unique-world)
-
-;; Nat World -> Void
-;; effects: init event-history, the-delta, the-world, the-world0
-(define (install-world delta w)
-  (reset-event-history)
-  (set! the-delta delta)
-  (set! the-world w)
-  (set! the-world0 w)
-  (vw-setup))
-
-;; Number > 0
-;; the rate of at which the clock ticks 
-(define the-delta 1000)
-
-;; Text-- The One and Only Visible World
-(define visible-world #f)
-
-;; Bool -> Void
-(define (vw-setup)
-  (set! visible-world (new pasteboard%))
-  (send visible-world set-cursor (make-object cursor% 'arrow)))
-
-;; -> Boolean 
-(define (vw-init?) (is-a? visible-world pasteboard%))
-
-;; Image -> Void
-;; show the image in the visible world
-(define (update-frame pict)
-  (send visible-world begin-edit-sequence)
-  (send visible-world lock #f)
-  (let ([s (send visible-world find-first-snip)])
-    (when s
-      (send visible-world delete s)))
-  (let ([c (send visible-world get-canvas)])
-    (let-values ([(px py)
-                  (if (is-a? pict cache-image-snip%)
-                      (send pict get-pinhole)
-                      (values 0 0))]
-                 [(cw ch)
-                  (send c get-client-size)])
-      (send visible-world insert (send pict copy) (- px) (- py))))
-  (send visible-world lock #t)
-  (send visible-world end-edit-sequence))
-
-;; Nat Nat Boolean -> Void
-;; effect: create, show and set the-frame
-;; assume: visible-world is a pasteboard%, i.e., install-world has been called. 
-(define (set-and-show-frame w h animated-gif)
-  (define the-play-back-custodian (make-custodian))
-  (define frame (create-frame the-play-back-custodian))
-  (set! WIDTH w)
-  (set! HEIGHT h)
-  (when animated-gif
-    (add-stop-and-image-buttons frame the-play-back-custodian))
-  (add-editor-canvas frame visible-world w h)
-  (send frame show #t))
-
-(define WIDTH 0) 
-(define HEIGHT 0)
-
-;; [Box (union false Thread)] -> Frame
-;; create a frame that shuts down the custodian on close
-(define (create-frame the-play-back-custodian)
-  (new (class frame%
-         (super-new)
-         (define/augment (on-close)  
-           (callback-stop!)
-           (custodian-shutdown-all the-play-back-custodian)))
-       (label "DrRacket")
-       (stretchable-width #f)
-       (stretchable-height #f)
-       (style '(no-resize-border metal))))
-
-;; Frame [Box (union false Thread)] -> Void
-;; adds the stop animation and image creation button, 
-;; whose callbacks runs as a thread in the custodian
-(define IMAGES "Images")
-(define-runtime-path s:pth '(lib "icons/break.png"))
-(define-runtime-path i:pth '(lib "icons/file.gif"))
-(define (add-stop-and-image-buttons  frame the-play-back-custodian)
-  (define p (new horizontal-pane% [parent frame][alignment '(center center)]))
-  (define S ((bitmap-label-maker (string-constant break-button-label) s:pth) '_))
-  (define I ((bitmap-label-maker IMAGES i:pth) '_))
-  (define stop-button
-    (new button% [parent p] [label S] [style '(border)]
-         [callback (lambda (this-button e) 
-                     (callback-stop!)
-                     (send this-button enable #f)
-                     (send image-button enable #t))]))
-  (define image-button 
-    (new button% [parent p] [enabled #f] [label I] [style '(border)]
-         [callback (lambda (b e)
-                     (parameterize ([current-custodian the-play-back-custodian])
-                       (define th (thread play-back))
-                       (send b enable #f)))]))
-  (void))
-
-;; Frame Editor Nat Nat -> Void
-;; adds the visible wold to the frame and hooks it up with the callbacks
-(define (add-editor-canvas frame visible-world w h)
-  (define c 
-    (new (class editor-canvas%
-           (super-new)
-           (define/override (on-char e) (key-callback (send e get-key-code)))
-           (define/override (on-event e) (mouse-callback e)))
-         (parent frame)
-         (editor visible-world)
-         (style '(no-hscroll no-vscroll))
-         (horizontal-inset INSET)
-         (vertical-inset INSET)))
-  (send c min-client-width (+ w INSET INSET))
-  (send c min-client-height (+ h INSET INSET))
-  (send c focus))
-
-;; Amount of space around the image in the world window:
-(define INSET 5)
-
-;                                                                                      
-;                                                                                      
-;  ;;;;;;                                    ;;;;;                                  ;; 
-;   ;   ;                        ;            ;   ;                                  ; 
-;   ; ;   ;;; ;;;  ;;;  ;; ;;   ;;;;;         ;   ;   ;;;    ;;;;   ;;;   ;; ;;   ;; ; 
-;   ;;;    ;   ;  ;   ;  ;;  ;   ;            ;   ;  ;   ;  ;   ;  ;   ;   ;;    ;  ;; 
-;   ; ;    ;   ;  ;;;;;  ;   ;   ;            ;;;;   ;;;;;  ;      ;   ;   ;     ;   ; 
-;   ;       ; ;   ;      ;   ;   ;            ;  ;   ;      ;      ;   ;   ;     ;   ; 
-;   ;   ;   ; ;   ;      ;   ;   ;   ;        ;   ;  ;      ;   ;  ;   ;   ;     ;   ; 
-;  ;;;;;;    ;     ;;;; ;;; ;;;   ;;;        ;;;   ;  ;;;;   ;;;    ;;;   ;;;;;   ;;;;;
-;                                                                                      
-;                                                                                      
-;                                                                                      
-;                                                                                      
-
-(define TICK 'tick)
-(define MOUSE 'mouse)
-(define KEY 'key)
-;; Evt =   (list utick) 
-;;       | (list KEY (union Char Symbol)) 
-;;       | (list MOUSE MouseEventType)
-;; [Listof Evt]
-(define event-history '())
-
-;; -> Void 
-(define (reset-event-history)
-  (set! event-history '()))
-
-;; Symbol  Any *-> Void
-(define (add-event type . stuff)
-  (set! event-history (cons (cons type stuff) event-history)))
-
-
-;; zfill: natural-number natural-number -> string
-;; Converts a-num to a string, adding leading zeros to make it at least as long as a-len.
-(define (zfill a-num a-len)
-  (let ([n (number->string a-num)])
-    (string-append (build-string (max (- a-len (string-length n)) 0)
-                                 (lambda (i) #\0))
-                   n)))
-
-;; --> Void
-;; re-play the history of events, creating a png per step, create animated gif
-;; effect: write to user-chosen file 
-(define (play-back)
-  ;; --- state transitions 
-  (define (world-transition world fst)
-    (case (car fst)
-      [(tick)  (timer-callback0 world)]
-      [(key)   (key-callback0 world (cadr fst))]
-      [(mouse) (mouse-callback0 world (cadr fst) (caddr fst) (cadddr fst))]
-      [else (tp-error 'play-back "bad type of event: ~s" fst)]))
-  ;; --- creating images 
-  (define total (+ (length event-history) 1))
-  (define image-count 0)
-  (define bitmap-list '())
-  (define (save-image img)
-    (define-values (w h) (send img get-size)) 
-    (define (make-bitmap)
-      (define bm (make-object bitmap% w h))
-      (define dc (make-object bitmap-dc% bm))
-      (send dc clear)
-      (send img draw dc 0 0 0 0 w h 0 0 #f)
-      bm)
-    (define bm (make-bitmap)) 
-    (set! bitmap-list (cons bm bitmap-list))
-    (set! image-count (+ image-count 1))
-    (send bm save-file (format "i~a.png" (zfill image-count (string-length (number->string total)))) 'png))
-  ;; --- choose place 
-  (define target:dir
-    (let* ([cd (current-directory)]
-           [dd (get-directory "Select directory for images" #f cd)])
-      (if dd dd cd)))
-  (parameterize ([current-directory target:dir])
-    (let replay ([ev (reverse event-history)][world the-world0])
-      (define img (redraw-callback0 world))
-      (update-frame (text (format "~a/~a created" image-count total) 18 'red))
-      (save-image img)
-      (cond
-        [(null? ev)
-         (update-frame (text (format "creating ~a" ANIMATED-GIF-FILE) 18 'red))
-         (create-animated-gif (reverse bitmap-list))
-         (update-frame img)]
-        [else
-         (let ([world1 (world-transition world (car ev))])
-           (replay (cdr ev) world1))]))))
-
-;; [Listof (-> bitmap)] -> Void
-;; turn the list of thunks into animated gifs 
-;; effect: overwrite the ANIMATED-GIF-FILE (in current directory)
-(define (create-animated-gif bitmap-list)
-  (define intv (if (> +inf.0 *the-delta* 0) (inexact->exact (floor (* 100 *the-delta*))) 5))
-  (when (file-exists? ANIMATED-GIF-FILE)
-    (delete-file ANIMATED-GIF-FILE))
-  (write-animated-gif bitmap-list intv ANIMATED-GIF-FILE #:one-at-a-time? #t #:loop? #f))
-
-(define ANIMATED-GIF-FILE "i-animated.gif")
-
-
-;                                                                 
-;                                                                 
-;     ;;;        ;;;    ;;;     ;                    ;            
-;    ;             ;      ;     ;                    ;            
-;   ;              ;      ;     ;                    ;            
-;   ;       ;;;;   ;      ;     ; ;;    ;;;;   ;;;;  ;   ;   ;;;  
-;   ;      ;   ;   ;      ;     ;;  ;  ;   ;  ;      ;  ;   ;   ; 
-;   ;      ;   ;   ;      ;     ;   ;  ;   ;  ;      ; ;     ;;   
-;   ;      ;   ;   ;      ;     ;   ;  ;   ;  ;      ;;;       ;  
-;    ;     ;  ;;   ;      ;     ;   ;  ;  ;;  ;      ;  ;   ;   ; 
-;     ;;;   ;; ;   ;;;    ;;;   ;;;;    ;; ;   ;;;;  ;   ;   ;;;  
-;                                                                 
-;                                                                 
-;                                                                 
-
-;; callbacks: timer, mouse, key, redraw, stop-when 
-
-;; Definition = (define-callback Symbol String Symbol Expression ...)
-;; effect: (define-callback introduces three names: name, name0, set-name
-(define-syntax (define-callback stx)
-  (syntax-case stx ()
-    [(_ n msg (f esp ...) para body ...)
-     (let* ([n:str (symbol->string (syntax-e (syntax n)))]
-            [callback (lambda (before after)
-                        (string->symbol 
-                         (string-append before n:str "-callback" after)))]
-            [name (datum->syntax stx (callback "" ""))]
-            [name0 (datum->syntax stx (callback "" "0"))]
-            [set-name (datum->syntax stx (callback "set-" ""))])
-       #`(define-values (#,name #,name0 #,set-name)
-           (values 
-            void void 
-            (lambda (f esp ...)
-              #;
-              (when (callback-set? #,name) 
-                (error (format "the ~a has already been specified") msg))
-              (set! #,name0 f)
-              (set! #,name (lambda para body ...))))))]))
-
-;; -> Void
-(define (callback-stop!)
-  (send the-time stop)
-  (set! timer-callback void)
-  (set! mouse-callback void)
-  (set! key-callback void)
-  (set! stop-when-callback (lambda () #f))
-  (set! redraw-callback void)
-  (set! *running?* #f))
-
-;; Any -> Boolean
-;; is the callback set to the default value 
-(define (callback-set? cb) (not (eq? cb void)))
-
-;; Timer
-(define the-time (new timer% [notify-callback (lambda () (timer-callback))]))
-
-;; f : [World -> World]
-(define-callback timer "tick-event hander" (f) ()
-  (with-handlers ([exn:break? break-handler][exn? exn-handler])
-    (set! the-world (f the-world))
-    (add-event TICK)
-    (redraw-callback)))
-
-;; f : [World -> Image]
-(define-callback redraw "redraw function" (f) ()
-  (with-handlers ([exn:break? break-handler][exn? exn-handler])
-    (define result (f the-world))
-    (define fname (object-name f))
-    (define tname (if fname fname 'your-redraw-function))
-    (if (image? result)
-        (check-result tname scene? "scene" result
-                      (format "image with pinhole at (~s,~s)"
-                              (pinhole-x result) (pinhole-y result)))
-        (check-result tname (lambda (x) (image? x)) "scene" result))
-    (update-frame result)
-    ;; if this world is the last one, stop the world
-    (when (stop-when-callback)
-      (callback-stop!))))
-
-;; f : [World -> Boolean]
-(define-callback stop-when "is end of world check" (f) ()
-  (define result (f the-world))
-  (define fname (object-name f))
-  (define tname (if fname fname 'your-redraw-function))
-  (check-result fname boolean? "boolean" result)
-  result)
-
-;; f : [World KeyEvent -> World]
-;; esp : EventSpace 
-;; e : KeyEvent 
-(define-callback key "key-event handler" (f evt-space) (e)
-  (parameterize ([current-eventspace evt-space])
-    (queue-callback 
-     (lambda ()
-       (with-handlers ([exn:break? break-handler][exn? exn-handler])
-         (let ([new-world (f the-world e)])
-           (unless (equal? new-world the-world)
-             (set! the-world new-world)
-             (add-event KEY e)
-             (redraw-callback))))))))
-
-;; f : [World Nat Nat MouseEventType -> World]
-;; esp : EventSpace 
-;; e : MouseEvent
-(define-callback mouse "mouse event handler" (f evt-space) (e)
-  (parameterize ([current-eventspace evt-space])
-    (queue-callback
-     (lambda ()
-       (define x (- (send e get-x) INSET))
-       (define y (- (send e get-y) INSET))
-       (define m (mouse-event->symbol e))
-       (when (and (<= 0 x WIDTH) (<= 0 y HEIGHT))
-         (with-handlers ([exn:break? break-handler][exn? exn-handler])
-           (let ([new-world (f the-world x y m)])
-             (unless (equal? new-world the-world)
-               (set! the-world new-world)
-               (add-event MOUSE x y m)
-               (redraw-callback)))))))))
-
-;; MouseEvent -> MouseEventType
-(define (mouse-event->symbol e)
-  (cond [(send e button-down?) 'button-down]
-        [(send e button-up?)   'button-up]
-        [(send e dragging?)    'drag]
-        [(send e moving?)      'move]
-        [(send e entering?)    'enter]
-        [(send e leaving?)     'leave]
-        [else ; (send e get-event-type)
-         (tp-error 'on-mouse-event
-                (format 
-                 "Unknown event type: ~a"
-                 (send e get-event-type)))]))
-
-;; --- library 
-(define (exn-handler e)
-  (callback-stop!)
-  (raise e))
-
-(define (break-handler . _) 
-  (printf "animation stopped")
-  (callback-stop!)
-  the-world)
-
-;; Number -> Integer
-(define (number->integer x)
-  (inexact->exact (floor x)))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/info.rkt b/pkgs/htdp-pkgs/htdp-lib/info.rkt
deleted file mode 100644
index e0515c230c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/info.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps
-  '("scheme-lib"
-    "srfi-lite-lib"
-    "base"
-    "compatibility-lib"
-    "draw-lib"
-    "errortrace-lib"
-    "gui-lib"
-    "htdp-doc"
-    "html-lib"
-    "images-lib"
-    "images-gui-lib"
-    "net-lib"
-    "pconvert-lib"
-    "r5rs-lib"
-    "sandbox-lib"
-    "scribble-lib"
-    "slideshow-lib"
-    "snip-lib"    
-    "string-constants-lib"
-    "typed-racket-lib"
-    "web-server-lib"
-    "wxme-lib"
-    "drracket"
-    "deinprogramm"))
-(define build-deps '("racket-index"
-                     "at-exp-lib"
-                     "rackunit-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"htdp\"")
-
-(define pkg-authors '(matthias mflatt robby))
-
-(define version "1.1")
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/doc.txt b/pkgs/htdp-pkgs/htdp-lib/lang/doc.txt
deleted file mode 100644
index 590b81909f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/doc.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-
-The "lang" collection defines a number of modules that can serve as
-languages for other modules (i.e., as the initial import):
-
- * _r5rs.ss_ - provides R5RS Scheme, which is defined in the "r5rs"
-   collection.  This file is here only for backward compatibility, use
-   (lib "lang.ss" "r5rs") instead.
-
- * _plt-pretty-big-text.ss_ - provides MzScheme plus the
-   following MzLib libraries: etc.ss, file.ss, list.ss,
-   class.ss, unit.ss, include.ss, defmacro.ss,
-   pretty.ss, string.ss, thread.ss, math.ss, match.ss, and
-   shared.ss. It also provides the posn, color, and image
-   functions of Beginning Student.
-
- * _plt-pretty-big.ss_ - provides plt-pretty-big-text.ss
-    plus the GRacket classes. This corresponds to the
-    _Pretty Big Scheme_ language in DrRacket.
-
- * _htdp-beginner.ss_ - provides Beginning Student
-
- * _htdp-beginner-abbr.ss_ - provides Beginning Student with List Abbreviations
-
- * _htdp-intermediate.ss_ - provides Intermediate Student
-
- * _htdp-intermediate-lambda.ss_ - provides Intermediate Student with Lambda
-
- * _htdp-advanced.ss_ - provides Advanced Student
-
-In addition, the "lang" collection defines two modules that supply
-special teaching functions:
-
- * _posn.ss_ - provides the `posn' structure
-
- * _imageeq.ss_ - provides the `image=?' function
-
-----------------------------------------
-
-_Teachpacks, Beginner_
-_Teachpacks, Higher-order Primitives_
-
-The _prim.ss_ module defines two syntactic forms for use by the
-implementors of teachpacks, which the teachpack is to be used with the
-Beginner Student languages. In Beginner Student, primitive names (for
-built-in procedures) are distinguished from other types of
-expressions, so that they can be syntactically restricted to
-application positions.
-
-> (define-higher-order-primitive id proc-id (arg ...)) - defines `id'
-  to be a primitive operator whose implementation is
-  `proc-id'. Normally, `id' is exported from the teachpack and
-  `proc-id' is not.
-
-  For each non-procedure argument, the corresponding `arg' should be
-  an underscore. For each procedure argument, the corresponding `arg'
-  should be the usual name of the procedure.
-
-  Example: 
-   (define-higher-order-primitive convert-gui convert-gui/proc (f2c))
-
-> (provide-higher-order-procedure id (arg ...)) - like above, but the
-  function `id' is exported as the primitive operator named `id'.
-
-> (define-primitive id proc-id) - defines `id' to be a primitive
-  operator whose implementation is `proc-id', and which takes no
-  procedures as arguments. Normally, `id' is exported from the
-  teachpack and `proc-id' is not.
-
-> (provide-primitive id) - like above, but the function `id' is
-  exported as the primitive operator named `id'.
-
-> (provide-primitives id ...) - multi-provide version of
-  `provide-primitive'.
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/error.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/error.rkt
deleted file mode 100644
index 82f8eed444..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/error.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-(module error mzscheme
-  (require mzlib/etc mzlib/list)
-  ;; --------------------------------------------------------------------------
-  (provide
-   check-arg
-   check-arity
-   check-proc
-   check-result
-   check-list-list
-   find-non
-   ;; --- error constants 
-   result-error ; String[format: String[expected], Any[given]]
-   arg-error    ; String [format: String[expected], String[position] Any[given]]
-   arity-error  ; String [format: String[expected] Any[given]]
-   proc-error   ; String [format: String[expected] Any[given]]
-   arity-error2 ; String [format: String[expected], String[position] Number[given]]
-   )
-
-  ;; (_ -> Boolean) (listof X) -> (union X false)
-  (define (find-non pred? l)
-    (let ([r (filter (compose not pred?) l)])
-      (if (null? r) #f (car r))))
-
-  #| Tests ------------------------------------------------------------------
-  (not (find-non list? '((1 2 3) (a b c))))
-  (symbol? (find-non number? '(1 2 3 a)))
-  (symbol? (find-non list? '((1 2 3) a (b c))))
-  |#
-
-  ;; Symbol (union true String) String X -> void
-  (define (check-list-list pname condition pred given)
-    (when (string? condition)
-      (error pname (string-append condition (format "\nin ~e" given)))))
-
-  ;; Symbol (_ -> Boolean) String X -> X 
-  (define (check-result pname pred? expected given)
-    (if (pred? given) given (error pname result-error expected given)))
-
-  ;; String[format: String[expected], Any[given]
-  (define result-error "expected ~a result, given: ~e")
-
-  ;; check-arg : sym bool str str TST -> void
-  (define (check-arg pname condition expected arg-posn given)
-    (unless condition (error pname arg-error expected arg-posn given)))
-  
-  ;; String [format: String[expected], String[position] Any[given]
-  (define arg-error "expected <~a> as ~a argument, given: ~e")
-
-  ;; check-arity : sym num (list-of TST) -> void
-  (define (check-arity name arg# args)
-    (let ([x (length args)])
-      (if (>= x arg#) (void) (error name arity-error arg# x))))
-
-  ;; String [format: String[expected] Any[given]
-  (define arity-error "expects at least ~a arguments, given ~e")
-  
-  ;; String [format: String[expected] Any[given]
-  (define proc-error "a function was expected as ~s argument, given ~e")
-  
-  ;; check-proc :
-  ;;   sym (... *->* ...) num (union sym str) (union sym str) -> void
-  (define (check-proc proc f exp-arity arg# arg-err)
-    (unless (procedure? f) (error proc proc-error arg# f))
-    (unless (procedure-arity-includes? f exp-arity)
-      (let ([arity-of-f (procedure-arity f)])
-        (error proc arity-error2
-	  arg-err arg# 
-	  (cond
-	    [(number? arity-of-f)
-	     (if (= arity-of-f 1)
-		 (format "1 argument")
-		 (format "~s arguments" arity-of-f))]
-	    [(arity-at-least? arity-of-f) (format "at least ~s arguments" (arity-at-least-value arity-of-f))]
-	    [else (format "multiple arities (~s)" arity-of-f)])))))
-
-  ;; String [format: String[expected], String[position] Number[given]  
-  (define arity-error2 "a function that expects ~a expected as ~s argument, given a function that expects ~a ")
-  )
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-advanced-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-advanced-reader.rkt
deleted file mode 100644
index c22827d692..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-advanced-reader.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module htdp-advanced-reader mzscheme
-  (require "htdp-reader.rkt")
-  (provide (rename -read-syntax read-syntax)
-           (rename -read read))
-  (define -read-syntax (make-read-syntax '(lib "htdp-advanced.ss" "lang")))
-  (define -read (make-read '(lib "htdp-advanced.ss" "lang"))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-advanced.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-advanced.rkt
deleted file mode 100644
index aaae3d3b22..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-advanced.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang scheme/base
-
-(require "private/teach.rkt"
-         "private/teach-module-begin.rkt"
-         mzlib/etc
-         mzlib/list
-         mzlib/pretty
-         syntax/docprovide
-         scheme/promise
-         test-engine/scheme-tests
-         "posn.rkt")
-
-(require "private/provide-and-scribble.rkt")
-
-
-;; syntax:
-(provide (rename-out
-          [advanced-define define]
-          [advanced-define-struct define-struct]
-          [advanced-define-datatype define-datatype]
-          [advanced-lambda lambda]
-          [advanced-lambda λ]
-          [advanced-app #%app]
-          [beginner-top #%top]
-          [intermediate-local local]
-          [advanced-let let]
-          [intermediate-let* let*]
-          [intermediate-letrec letrec]
-          [advanced-recur recur]
-          [beginner-cond cond]
-          [beginner-else else]
-          [beginner-if if]
-          [beginner-and and]
-          [beginner-or or]
-          [beginner-require require]
-          [beginner-dots ..]
-          [beginner-dots ...]
-          [beginner-dots ....]
-          [beginner-dots .....]
-          [beginner-dots ......]
-          [beginner-true true]
-          [beginner-false false]
-          [intermediate-quote quote]
-          [intermediate-quasiquote quasiquote]
-          [intermediate-unquote unquote]
-          [intermediate-unquote-splicing unquote-splicing]
-          [intermediate-time time]
-          [advanced-begin begin]
-          [advanced-begin0 begin0]
-          [advanced-shared shared]
-          [advanced-set! set!]
-          [advanced-when when]
-          [advanced-unless unless]
-          [advanced-case case]
-          [advanced-match match]
-          [advanced-delay delay]
-          [advanced-module-begin #%module-begin])
-         check-expect
-         check-random
-	 check-satisfied
-         check-within
-         check-error
-         check-member-of
-         check-range
-         #%datum
-         #%top-interaction
-         empty
-         
-         signature : -> mixed one-of predicate combined
-         Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list Any
-         cons-of
-         Property
-         check-property for-all ==> expect expect-within expect-member-of expect-range)
-
-;; procedures:
-(provide-and-scribble
- procedures
- (begin)
- (all-from-except intermediate: lang/private/intermediate-funs procedures cons list* append random)
- (all-from        advanced:     lang/private/advanced-funs    procedures))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-abbr-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-abbr-reader.rkt
deleted file mode 100644
index 6de88efa9d..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-abbr-reader.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module htdp-beginner-abbr-reader mzscheme
-  (require "htdp-reader.rkt")
-  (provide (rename -read-syntax read-syntax)
-           (rename -read read))
-  (define -read-syntax (make-read-syntax '(lib "htdp-beginner-abbr.ss" "lang")))
-  (define -read (make-read '(lib "htdp-beginner-abbr.ss" "lang"))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-abbr.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-abbr.rkt
deleted file mode 100644
index 9481e65ad7..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-abbr.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang scheme/base 
-
-(require mzlib/etc
-         mzlib/list
-         mzlib/math
-         syntax/docprovide
-         test-engine/racket-tests)
-
-(require "private/provide-and-scribble.rkt")
-
-;; Implements the forms:
-(require "private/teach.rkt"
-         "private/teach-module-begin.rkt")
-
-;; syntax:
-(provide (rename-out
-          [beginner-define define]
-          [beginner-define-struct define-struct]
-          [beginner-lambda lambda]
-          [beginner-app #%app]
-          [beginner-top #%top]
-          [beginner-cond cond]
-          [beginner-else else]
-          [beginner-if if]
-          [beginner-and and]
-          [beginner-or or]
-          [beginner-require require]
-          [beginner-dots ..]
-          [beginner-dots ...]
-          [beginner-dots ....]
-          [beginner-dots .....]
-          [beginner-dots ......]
-          [intermediate-quote quote]
-          [intermediate-quasiquote quasiquote]
-          [intermediate-unquote unquote]
-          [intermediate-unquote-splicing unquote-splicing]
-          [beginner-module-begin #%module-begin]
-          [beginner-true true]
-          [beginner-false false])
-         check-expect
-	 check-random
-	 check-satisfied
-         check-within
-         check-error
-         check-member-of
-         check-range
-         #%datum
-         #%top-interaction
-         empty 
-         
-         ;  signature : -> mixed one-of predicate combined
-         ;  Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list Any
-         ;  cons-of
-         ;  Property
-         ;  check-property for-all ==> expect expect-within expect-member-of expect-range
-         )
-
-;; procedures:
-(provide-and-scribble
- procedures
- (begin)
- (all-from beginner: (submod lang/private/beginner-funs with-wrapper) procedures))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-reader.rkt
deleted file mode 100644
index 991fcce1e7..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-reader.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module htdp-beginner-reader mzscheme
-  (require "htdp-reader.rkt")
-  (provide (rename -read-syntax read-syntax)
-           (rename -read read))
-  (define -read-syntax (make-read-syntax '(lib "htdp-beginner.ss" "lang")))
-  (define -read (make-read '(lib "htdp-beginner.ss" "lang"))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner.rkt
deleted file mode 100644
index 9fec1e30cd..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-;; Implements the Beginner Scheme language, at least in terms of the
-;; forms and procedures. The reader-level aspects of the language
-;; (e.g., case-sensitivity) are not implemented here.
-
-#lang scheme/base
-(require mzlib/etc
-         mzlib/list
-         syntax/docprovide
-         "private/rewrite-error-message.rkt"
-         (for-syntax "private/rewrite-error-message.rkt")
-         (for-syntax scheme/base))
-
-(require "private/provide-and-scribble.rkt")
-
-
-;; Implements the forms:
-(require "private/teach.rkt"
-         "private/teach-module-begin.rkt"
-         test-engine/racket-tests)
-
-;; syntax:
-(provide (rename-out
-          [beginner-define define]
-          [beginner-define-struct define-struct]
-          [beginner-lambda lambda]
-          [beginner-app #%app]
-          [beginner-top #%top]
-          [beginner-cond cond]
-          [beginner-else else]
-          [beginner-if if]
-          [beginner-and and]
-          [beginner-or or]
-          [beginner-quote quote]
-          [beginner-module-begin #%module-begin]
-          [beginner-require require]
-          [beginner-dots ..]
-          [beginner-dots ...]
-          [beginner-dots ....]
-          [beginner-dots .....]
-          [beginner-dots ......]
-          [beginner-true true]
-          [beginner-false false]
-          )
-         check-expect
-	 check-random
-	 check-satisfied
-         check-within
-         check-error
-         check-member-of
-         check-range
-         ;; define-wish
-         #%datum
-         #%top-interaction
-         empty
-         
-         ;  signature : -> mixed one-of predicate combined
-         ;  Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list Any
-         ;  cons-of
-         ;  Property
-         ;  check-property for-all ==> expect expect-within expect-member-of expect-range
-         )
- 
-;; procedures:
-(provide-and-scribble
- procedures
- (begin)
- (all-from beginner: (submod lang/private/beginner-funs with-wrapper) procedures))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-lambda-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-lambda-reader.rkt
deleted file mode 100644
index 40cd89d999..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-lambda-reader.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module htdp-intermediate-lambda-reader mzscheme
-  (require "htdp-reader.rkt")
-  (provide (rename -read-syntax read-syntax)
-           (rename -read read))
-  (define -read-syntax (make-read-syntax '(lib "htdp-intermediate-lambda.ss" "lang")))
-  (define -read (make-read '(lib "htdp-intermediate-lambda.ss" "lang"))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-lambda.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-lambda.rkt
deleted file mode 100644
index aa3c24c9ce..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-lambda.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang scheme/base
-
-(require "private/teach.rkt"
-         "private/teach-module-begin.rkt"
-         mzlib/etc
-         mzlib/list
-         syntax/docprovide
-         test-engine/racket-tests)
-
-(require "private/provide-and-scribble.rkt")
-
-;; syntax:
-(provide (rename-out
-          [intermediate-lambda-define define]
-          [intermediate-define-struct define-struct]
-          [intermediate-lambda lambda]
-          [intermediate-lambda λ]
-          [advanced-app #%app]
-          [beginner-top #%top]
-          [intermediate-local local]
-          [intermediate-let let]
-          [intermediate-let* let*]
-          [intermediate-letrec letrec]
-          [intermediate-recur recur]
-          [beginner-cond cond]
-          [beginner-else else]
-          [beginner-if if]
-          [beginner-and and]
-          [beginner-or or]
-          [beginner-require require]
-          [beginner-dots ..]
-          [beginner-dots ...]
-          [beginner-dots ....]
-          [beginner-dots .....]
-          [beginner-dots ......]
-          [intermediate-quote quote]
-          [intermediate-quasiquote quasiquote]
-          [intermediate-unquote unquote]
-          [intermediate-unquote-splicing unquote-splicing]
-          [intermediate-time time]
-          [intermediate-module-begin #%module-begin]
-          [beginner-true true]
-          [beginner-false false]
-          )
-         check-expect
-	 check-random
-	 check-satisfied
-         check-within
-         check-error
-         check-member-of
-         check-range
-         #%datum
-         #%top-interaction
-         empty
-         
-         ;  signature : -> mixed one-of predicate combined
-         ;  Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list Any
-         ;  cons-of
-         ;  Property
-         ;  check-property for-all ==> expect expect-within expect-member-of expect-range
-         )
-
-;; procedures:
-(provide-and-scribble 
- procedures
- (begin)
- (all-from intermediate: lang/private/intermediate-funs procedures))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-reader.rkt
deleted file mode 100644
index c1347347a3..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-reader.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module htdp-intermediate-reader mzscheme
-  (require "htdp-reader.ss")
-  (provide (rename -read-syntax read-syntax)
-           (rename -read read))
-  (define -read-syntax (make-read-syntax '(lib "htdp-intermediate.ss" "lang")))
-  (define -read (make-read '(lib "htdp-intermediate.ss" "lang"))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate.rkt
deleted file mode 100644
index dd9f3c7a7a..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate.rkt
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang scheme/base 
-
-(require "private/teach.rkt"
-         "private/teachprims.rkt"
-         "private/teach-module-begin.rkt"
-         mzlib/etc
-         mzlib/list
-         syntax/docprovide
-         test-engine/racket-tests
-         (for-syntax scheme/base))
-
-(require "private/provide-and-scribble.rkt")
-
-;; syntax:
-(provide (rename-out 
-          [intermediate-define define]
-          [intermediate-define-struct define-struct]
-          [intermediate-pre-lambda lambda]
-          [intermediate-app #%app]
-          [beginner-top #%top]
-          [intermediate-local local]
-          [intermediate-let let]
-          [intermediate-let* let*]
-          [intermediate-letrec letrec]
-          ;; [intermediate-recur recur]
-          [beginner-cond cond]
-          [beginner-else else]
-          [beginner-if if]
-          [beginner-and and]
-          [beginner-or or]
-          [beginner-require require]
-          [beginner-dots ..]
-          [beginner-dots ...]
-          [beginner-dots ....]
-          [beginner-dots .....]
-          [beginner-dots ......]
-          [intermediate-quote quote]
-          [intermediate-quasiquote quasiquote]
-          [intermediate-unquote unquote]
-          [intermediate-unquote-splicing unquote-splicing]
-          [intermediate-time time]
-          [intermediate-module-begin #%module-begin]
-          [beginner-true true]
-          [beginner-false false]
-          )
-         check-expect
-	 check-random
-	 check-satisfied
-         check-within
-         check-error
-         check-member-of
-         check-range
-         #%datum
-         #%top-interaction
-         empty 
-         
-         ;  signature : -> mixed one-of predicate combined
-         ;  Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list Any
-         ;  cons-of
-         ;  Property 
-         ;  check-property for-all ==> expect expect-within expect-member-of expect-range
-         )
-
-
-(provide-and-scribble 
- procedures
- (begin)
- (all-from beginner: lang/private/intermediate-funs procedures))
-
-#;
-(provide
- (rename-out
-  [beginner-list? list?]))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-langs-save-file-prefix.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-langs-save-file-prefix.rkt
deleted file mode 100644
index 94a20d9da4..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-langs-save-file-prefix.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket/base
-
-;; ---------------------------------------------------------------------------------------------------
-;; exports the header for a file saved from a drracket buffer in a menu-selected teaching language 
-
-(require racket/contract 
-         racket/port)
-
-(provide/contract
- [htdp-save-file-prefix (listof string?)]
- [htdp-file-prefix? (-> input-port? boolean?)])
-
-
-(define htdp-save-file-prefix
-  (list ";; The first three lines of this file were inserted by DrRacket. They record metadata"
-        ";; about the language level of this file in a form that our tools can easily process."))
-
-(define (htdp-file-prefix? port)
-  (define pp (peeking-input-port port))
-  (define ans (htdp-file-prefix/raw? pp))
-  (when ans
-    (htdp-file-prefix/raw? port))
-  ans)
-  
-;; htdp-file-prefix/raw? : input-port? -> boolean
-;; SIDE EFFECT: consumes input from the port;
-;;  in the case the it returns #t, then it consumes precisely
-;;  the prefix that DrRacket saves
-;;  in the case that it returns #f, it consumes some random amount
-(define (htdp-file-prefix/raw? port)
-  (let loop ([prefix htdp-save-file-prefix])
-    (cond
-      [(null? prefix)
-       (define l (read-line port 'any))
-       (and (string? l) (pair? (regexp-match #rx"^#reader" l)))]
-      [else
-       (define l (read-line port 'any))
-       (and (string? l)
-            (equal? l (car prefix))
-            (loop (cdr prefix)))])))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-langs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-langs.rkt
deleted file mode 100644
index ba125b5393..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-langs.rkt
+++ /dev/null
@@ -1,1136 +0,0 @@
-#lang scheme
-(require string-constants
-         framework
-         (prefix-in et: errortrace/stacktrace)
-         mzlib/pretty
-         (prefix-in pc: mzlib/pconvert)
-         mzlib/file
-         mzlib/unit
-         mzlib/class
-         mzlib/list
-         mzlib/struct
-         mzlib/struct
-         drscheme/tool
-         mred
-         mrlib/cache-image-snip
-         (prefix-in ic: mrlib/image-core)
-         test-engine/racket-tests
-
-         ;; this module is shared between the drracket namespace (so loaded here) 
-         ;; and the user's namespace in the teaching languages
-         "private/set-result.rkt"
-         "private/rewrite-error-message.rkt"
-
-         "private/continuation-mark-key.rkt"
-         "private/create-htdp-executable.rkt"
-         "private/tp-dialog.rkt"
-         
-         "stepper-language-interface.rkt"
-         lang/debugger-language-interface
-         "run-teaching-program.rkt"
-         "htdp-langs-save-file-prefix.rkt"
-
-         (only-in test-engine/scheme-gui make-formatter)
-         (only-in test-engine/racket-tests
-                  scheme-test-data error-handler test-format test-execute display-results
-                  build-test-engine)
-         (lib "test-engine/test-display.scm")
-         deinprogramm/signature/signature)
-  
-  
-  (provide tool@)
-  
-  (define o (current-output-port))
-  (define (oprintf . args) (apply fprintf o args))
-  
-  (define tool@
-    (unit 
-      (import drscheme:tool^)
-      (export drscheme:tool-exports^)
-      
-      (define drs-eventspace (current-eventspace))
-      
-      ;; tracing? : boolean
-      ;; teachpacks : (listof require-spec)
-      (define-struct (htdp-lang-settings drscheme:language:simple-settings) (tracing? teachpacks))
-      (define htdp-lang-settings->vector (make-->vector htdp-lang-settings))
-      (define teachpacks-field-index (+ (procedure-arity drscheme:language:simple-settings) 1))
-      
-      (define image-string "<image>")
-      
-      (define htdp-language<%>
-        (interface ()
-          get-module
-          get-language-position
-          get-sharing-printing
-          get-abbreviate-cons-as-list
-          get-allow-sharing?
-          get-use-function-output-syntax?
-          get-accept-quasiquote?
-          get-read-accept-dot))
-      
-      ;; module-based-language-extension :    (implements drscheme:language:module-based-language<%>) 
-      ;;                                   -> (implements drscheme:language:module-based-language<%>)
-      ;; changes the default settings and sets a few more paramters during `on-execute'
-      (define (module-based-language-extension super%)
-        (class* super% ()
-          
-          (inherit get-sharing-printing get-abbreviate-cons-as-list)
-          
-          (define/override (default-settings)
-            (make-htdp-lang-settings 
-             #t
-             'constructor
-             'repeating-decimal
-             (get-sharing-printing)
-             #t
-             'none
-             #f 
-             (preferences:get 'drracket:htdp:last-set-teachpacks/multi-lib)))
-          
-          (define/override (default-settings? s)
-            (and (super default-settings? s)
-                 (not (htdp-lang-settings-tracing? s))
-                 (null? (htdp-lang-settings-teachpacks s))))
-          
-          (define/override (marshall-settings x)
-            (list (super marshall-settings x)
-                  (htdp-lang-settings-tracing? x)
-                  (htdp-lang-settings-teachpacks x)))
-          
-          (define/override (unmarshall-settings x)
-            (if (and (list? x)
-                     (= (length x) 3)
-                     (boolean? (list-ref x 1))
-                     (list-of-require-specs? (list-ref x 2)))
-                (let ([drs-settings (super unmarshall-settings (first x))])
-                  (make-htdp-lang-settings
-                   (drscheme:language:simple-settings-case-sensitive drs-settings)
-                   (drscheme:language:simple-settings-printing-style  drs-settings)
-                   (drscheme:language:simple-settings-fraction-style  drs-settings)
-                   (drscheme:language:simple-settings-show-sharing  drs-settings)
-                   (drscheme:language:simple-settings-insert-newlines  drs-settings)
-                   (drscheme:language:simple-settings-annotations drs-settings)
-                   (cadr x)
-                   (caddr x)))
-                (default-settings)))
-          
-          (define/private (list-of-require-specs? l)
-            (and (list? l)
-                 (andmap (λ (x)
-                           (and (list? x)
-                                (andmap (λ (x) (or (string? x) (symbol? x))) x)))
-                         l)))
-          
-          (inherit get-allow-sharing? get-use-function-output-syntax? 
-                   get-accept-quasiquote? get-read-accept-dot)
-          (define/override (config-panel parent)
-            (sharing/not-config-panel (get-allow-sharing?) (get-accept-quasiquote?) parent))
-          
-          (define/override (on-execute settings run-in-user-thread)
-            (let ([drs-namespace (current-namespace)]
-                  [set-result-module-name 
-                   ((current-module-name-resolver) '(lib "lang/private/set-result.ss") #f #f #t)]
-                  [scheme-test-module-name
-                   ((current-module-name-resolver) '(lib "test-engine/racket-tests.ss") #f #f #t)]
-                  [scheme-signature-module-name
-                   ((current-module-name-resolver) 
-                    '(lib "deinprogramm/signature/signature-english.rkt") #f #f #t)]
-                  [tests-on? (preferences:get 'test-engine:enable?)])
-              (run-in-user-thread
-               (lambda ()
-                 (when (getenv "PLTDRHTDPNOCOMPILED") (use-compiled-file-paths '()))
-                 (read-accept-quasiquote (get-accept-quasiquote?))
-                 (namespace-attach-module drs-namespace ''drscheme-secrets)
-                 (namespace-attach-module drs-namespace set-result-module-name)                 
-                 (error-display-handler teaching-languages-error-display-handler)
-                 (error-value->string-handler 
-                  (λ (x y) (teaching-languages-error-value->string settings x y)))
-                 (current-eval (add-annotation (htdp-lang-settings-tracing? settings) (current-eval)))
-                 (error-print-source-location #f)
-                 (read-decimal-as-inexact #f)
-                 (read-accept-dot (get-read-accept-dot))
-                 (namespace-attach-module drs-namespace scheme-test-module-name)
-                 (namespace-require scheme-test-module-name)
-                 (namespace-attach-module drs-namespace scheme-signature-module-name)
-                 (namespace-require scheme-signature-module-name)
-		 ;; hack: the test-engine code knows about the test~object name; we do, too
-		 (namespace-set-variable-value! 'test~object (build-test-engine))
-		 ;; record signature violations with the test engine
-                 (signature-violation-proc
-                  (lambda (obj signature message blame)
-                    (cond
-                      ((namespace-variable-value 'test~object #f (lambda () #f))
-                       => (lambda (engine)
-                            (send (send engine get-info) signature-failed
-                                  obj signature message blame))))))
-                 (scheme-test-data (list (drscheme:rep:current-rep) drs-eventspace test-display%))
-                 (test-execute tests-on?)
-		 (signature-checking-enabled? (get-preference 'signatures:enable-checking? (lambda () #t)))
-                 (test-format (make-formatter (λ (v o) (render-value/format v settings o 40)))))))
-            (super on-execute settings run-in-user-thread)
-            
-            ;; set the global-port-print-handler after the super class because the super sets it too
-            (run-in-user-thread
-             (lambda ()
-               (define my-setup-printing-parameters 
-                 (drscheme:language:make-setup-printing-parameters))
-               (global-port-print-handler
-                (λ (value port [depth 0])
-                  (teaching-language-render-value/format my-setup-printing-parameters
-                                                         value settings port 'infinity))))))
-          
-          (define/private (teaching-languages-error-value->string settings v len)
-            (let ([sp (open-output-string)])
-              (set-printing-parameters settings (λ () (print v sp)))
-              (flush-output sp)
-              (let ([s (get-output-string sp)])
-                (cond
-                  [(<= (string-length s) len) s]
-                  [else (string-append (substring s 0 (- len 3)) "...")]))))
-
-	  ;; set-printing-parameters : settings ( -> TST) -> TST
-	  ;; is implicitly exposed to the stepper.  watch out!  --  john
-          (define/public (set-printing-parameters settings thunk)
-            (define img-str "#<image>")
-            (define (is-image? val)
-              (or (is-a? val ic:image%)         ;; 2htdp/image
-                  (is-a? val cache-image-snip%) ;; htdp/image
-                  (is-a? val image-snip%)       ;; literal image constant
-                  (is-a? val bitmap%)))         ;; works in other places, so include it here too
-            (parameterize ([pc:booleans-as-true/false #f]
-                           [pc:add-make-prefix-to-constructor #t]
-                           [print-boolean-long-form #t]
-                           [pc:abbreviate-cons-as-list (get-abbreviate-cons-as-list)]
-                           [pc:current-print-convert-hook
-                            (let ([ph (pc:current-print-convert-hook)])
-                              (lambda (val basic sub)
-                                (cond
-                                  [(equal? val '()) ''()]
-                                  [(equal? val set!-result) '(void)]
-                                  [else (ph val basic sub)])))]
-                           [pretty-print-show-inexactness #t]
-                           [pretty-print-exact-as-decimal #t]
-                           [pretty-print-print-hook
-                            (let ([oh (pretty-print-print-hook)])
-                              (λ (val display? port)
-                                (if (and (not (port-writes-special? port))
-                                         (is-image? val))
-                                    (begin (display img-str port)
-                                           (string-length img-str))
-                                    (oh val display? port))))]
-                           [pretty-print-size-hook
-                            (let ([oh (pretty-print-size-hook)])
-                              (λ (val display? port)
-                                (if (and (not (port-writes-special? port))
-                                         (is-image? val))
-                                    (string-length img-str)
-                                    (oh val display? port))))]
-                           [pc:use-named/undefined-handler
-                            (lambda (x)
-                              (and (get-use-function-output-syntax?)
-                                   (procedure? x)
-                                   (object-name x)))]
-                           [pc:named/undefined-handler
-                            (lambda (x)
-                              (string->symbol
-                               (format "function:~a" (object-name x))))])
-              (thunk)))
-          
-          (define/override (render-value/format value settings port width)
-            (teaching-language-render-value/format drscheme:language:setup-printing-parameters
-                                                   value settings port width))
-          (define/override (render-value value settings port)
-            (teaching-language-render-value/format drscheme:language:setup-printing-parameters
-                                                   value settings port 'infinity))
-          
-          (define/private (teaching-language-render-value/format setup-printing-parameters 
-                                                                 value settings port width)
-            ;; set drscheme's printing parameters
-            (setup-printing-parameters
-             (λ ()
-               ;; then adjust the settings for the teaching languages
-               (set-printing-parameters
-                settings
-                (λ () 
-                  (let-values ([(converted-value write?)
-                                (call-with-values
-                                    (lambda ()
-                                      (drscheme:language:simple-module-based-language-convert-value
-                                       value settings))
-                                  (case-lambda
-                                   [(converted-value) (values converted-value #t)]
-                                   [(converted-value write?) (values converted-value write?)]))])
-                    (let ([pretty-out (if write? pretty-write pretty-print)])
-                      (cond
-                       [(drscheme:language:simple-settings-insert-newlines settings)
-                        (if (number? width)
-                            (parameterize ([pretty-print-columns width])
-                              (pretty-out converted-value port))
-                            (pretty-out converted-value port))]
-                       [else
-                        (parameterize ([pretty-print-columns 'infinity])
-                          (pretty-out converted-value port))
-                        (newline port)]))))))
-             settings
-             width))
-          
-          (super-new)))
-      
-      ;; sharing/not-config-panel :  boolean boolean parent 
-      ;;                         -> (case-> (-> settings) (settings -> void))
-      ;; constructs the config-panel for a language without a sharing option.
-      (define (sharing/not-config-panel allow-sharing-config? accept-quasiquote? _parent)
-        (let* ([parent (make-object vertical-panel% _parent)]
-               
-               [input-panel (instantiate group-box-panel% ()
-                              (parent parent)
-                              (label (string-constant input-syntax))
-                              (alignment '(left center)))]
-               
-               [output-panel (instantiate group-box-panel% ()
-                               (parent parent)
-                               (label (string-constant output-syntax))
-                               (alignment '(left center)))]
-               
-               [tp-group-box (instantiate group-box-panel% ()
-                               (label (string-constant teachpacks))
-                               (parent parent)
-                               (alignment '(center top)))]
-               [tp-panel (new vertical-panel%
-                              [parent tp-group-box]
-                              [alignment '(center center)]
-                              [stretchable-width #f]
-                              [stretchable-height #f])]
-               
-               [case-sensitive (make-object check-box%
-                                 (string-constant case-sensitive-label)
-                                 input-panel
-                                 void)]
-               [output-style (make-object radio-box%
-                               (string-constant output-style-label)
-                               (if accept-quasiquote?
-                                   (list (string-constant constructor-printing-style)
-                                         (string-constant quasiquote-printing-style)
-                                         (string-constant write-printing-style))
-                                   (list (string-constant constructor-printing-style)
-                                         (string-constant write-printing-style)))
-                               output-panel
-                               void)]
-               [show-sharing #f]
-               [insert-newlines (make-object check-box%
-                                  (string-constant use-pretty-printer-label)
-                                  output-panel
-                                  void)]
-               [tracing (new check-box%
-                             (parent output-panel)
-                             (label (string-constant tracing-enable-tracing))
-                             (callback void))]
-               [fraction-style
-                (make-object radio-box% (string-constant fraction-style)
-                  (list (string-constant use-mixed-fractions)
-                        (string-constant use-repeating-decimals))
-                  output-panel
-                  void)]
-               
-               [tps '()])
-          
-          (when allow-sharing-config?
-            (set! show-sharing
-                  (instantiate check-box% ()
-                    (parent output-panel)
-                    (label (string-constant sharing-printing-label))
-                    (callback void))))
-          
-          ;; set the characteristics of the GUI
-          (send _parent set-alignment 'center 'center)
-          (send parent stretchable-height #f)
-          (send parent stretchable-width #f)
-          (send parent set-alignment 'center 'center)
-          
-          (case-lambda
-            [()
-             (make-htdp-lang-settings
-              (send case-sensitive get-value)
-              (if accept-quasiquote?
-                  (case (send output-style get-selection)
-                    [(0) 'constructor]
-                    [(1) 'quasiquote]
-                    [(2) 'write])
-                  (case (send output-style get-selection)
-                    [(0) 'constructor]
-                    [(1) 'write]))
-              (case (send fraction-style get-selection)
-                [(0) 'mixed-fraction]
-                [(1) 'repeating-decimal])
-              (and allow-sharing-config? (send show-sharing get-value))
-              (send insert-newlines get-value)
-              'none
-              (send tracing get-value)
-              tps)]
-            [(settings)
-             (send case-sensitive set-value 
-                   (drscheme:language:simple-settings-case-sensitive settings))
-             (send output-style set-selection
-                   (if accept-quasiquote?
-                       (case (drscheme:language:simple-settings-printing-style settings)
-                         [(constructor) 0]
-                         [(quasiquote) 1]
-                         [(print trad-write write) 2])
-                       (case (drscheme:language:simple-settings-printing-style settings)
-                         [(constructor) 0]
-                         [(quasiquote) 0]
-                         [(print trad-write write) 1])))
-             (send fraction-style set-selection
-                   (case (drscheme:language:simple-settings-fraction-style settings)
-                     [(mixed-fraction) 0]
-                     [(repeating-decimal) 1]))
-             (when allow-sharing-config?
-               (send show-sharing set-value
-                     (drscheme:language:simple-settings-show-sharing settings)))
-             (send insert-newlines set-value 
-                   (drscheme:language:simple-settings-insert-newlines settings))
-             (set! tps (htdp-lang-settings-teachpacks settings))
-             (send tp-panel change-children (λ (l) '()))
-             (if (null? tps)
-                 (new message%
-                      [parent tp-panel]
-                      [label (string-constant teachpacks-none)])
-                 (for-each
-                  (λ (tp) (new message% 
-                               [parent tp-panel]
-                               [label (format "~s" tp)]))
-                  tps))
-             (send tracing set-value (htdp-lang-settings-tracing? settings))
-             (void)])))
-      
-      (define simple-htdp-language%
-        (class* drscheme:language:simple-module-based-language% (htdp-language<%>)
-          (init-field sharing-printing
-                      abbreviate-cons-as-list
-                      allow-sharing?
-                      manual
-                      reader-module
-                      (use-function-output-syntax? #f)
-                      (accept-quasiquote? #t)
-                      (read-accept-dot #f)
-                      (style-delta #f))
-          (define/public (get-sharing-printing) sharing-printing)
-          (define/public (get-abbreviate-cons-as-list) abbreviate-cons-as-list)
-          (define/public (get-allow-sharing?) allow-sharing?)
-          (define/public (get-manual) manual)
-          (define/public (get-use-function-output-syntax?) use-function-output-syntax?)
-          (define/public (get-accept-quasiquote?) accept-quasiquote?)
-          (define/public (get-read-accept-dot) read-accept-dot)
-          ;(define/override (get-one-line-summary) one-line-summary)
-          (define/public (get-htdp-style-delta) style-delta)
-          
-          (super-new [language-url "http://www.htdp.org/"])))
-      
-      (define (language-extension %)
-        (class %
-          (inherit get-manual)
-          
-          (define/override (extra-repl-information settings port) 
-            (define welcome (drscheme:rep:get-welcome-delta))
-            (define (go str sd)
-              (let* ([s (make-object string-snip% str)]
-                     [sl (editor:get-standard-style-list)]
-                     [std (send sl find-named-style "Standard")]
-                     [style (send sl find-or-create-style std sd)])
-                (send s set-style style)
-                (write-special s port)))
-            
-            (define tps (htdp-lang-settings-teachpacks settings))
-            
-            (unless (null? tps)
-              (go "Teachpack" welcome)
-              (cond
-                [(= 1 (length tps))
-                 (go ": " welcome)
-                 (go (tp-require->str (car tps)) (drscheme:rep:get-dark-green-delta))]
-                [(= 2 (length tps))
-                 (go "s: " welcome)
-                 (go (tp-require->str (car tps)) (drscheme:rep:get-dark-green-delta))
-                 (go " and " welcome)
-                 (go (tp-require->str (cadr tps)) (drscheme:rep:get-dark-green-delta))]
-                [else
-                 (go "s: " welcome)
-                 (go (tp-require->str (car tps)) (drscheme:rep:get-dark-green-delta))
-                 (let loop ([these-tps (cdr tps)])
-                   (cond
-                     [(null? (cdr these-tps))
-                      (go ", and " welcome)
-                      (go (tp-require->str (car these-tps)) (drscheme:rep:get-dark-green-delta))]
-                     [else
-                      (go ", " welcome)
-                      (go (tp-require->str (car these-tps)) (drscheme:rep:get-dark-green-delta))
-                      (loop (cdr these-tps))]))])
-              (go "." welcome)
-              (newline port)))
-          
-          (define/override (first-opened settings)
-            (define-values (mod name)
-              (create-empty-module (get-module)
-                                   (htdp-lang-settings-teachpacks settings)))
-            (eval mod)
-            (dynamic-require `',name #f)
-            (current-namespace (module->namespace `',name)))
-          
-          (define/private (tp-require->str tp)
-            (match tp
-              [`(lib ,x) 
-               (define m (regexp-match #rx"teachpack/2?htdp/(.*)$" x))
-               (if m
-                   (list-ref m 1)
-                   (format "~s" tp))]
-              [_ (format "~s" tp)]))
-          
-          (inherit get-module get-transformer-module get-init-code
-                   use-namespace-require/copy?)
-          (define/override (create-executable setting parent program-filename)
-            (let ([dist-filename
-		   (drscheme:language:put-executable
-		    parent program-filename
-		    'distribution
-		    #t 
-		    (string-constant save-a-mred-distribution))])
-              (when dist-filename
-                (drscheme:language:create-distribution-for-executable 
-                 dist-filename
-                 #t
-                 (λ (exe-name)
-                   (create-htdp-lang-executable program-filename exe-name reader-module))))))
-
-          (define/private (symbol-append x y)
-            (string->symbol
-             (string-append
-              (symbol->string x)
-              (symbol->string y))))
-          
-          (inherit get-htdp-style-delta)
-          (define/override (get-style-delta)
-            (get-htdp-style-delta))
-          
-          (inherit get-reader set-printing-parameters)
-          
-          (define/override (front-end/complete-program port settings)
-            (expand-teaching-program port  
-                                     (get-reader)
-                                     (get-module)
-                                     (htdp-lang-settings-teachpacks settings)))
-          
-          (define/override (front-end/interaction port settings)
-            (let ([t (super front-end/interaction port settings)]
-		  [start? #t]
-                  [done? #f])
-              (λ ()
-                (cond
-		  [start?
-		   (set! start? #f)
-		   #'(#%plain-app reset-tests)]
-                  [done? eof]
-                  [else
-                   (let ([ans (parameterize ([read-accept-lang #f])
-                                (t))])
-                     (cond
-                       [(eof-object? ans)
-                        (set! done? #t)
-                        #`(test)]
-                       [else
-                        ans]))]))))
-
-
-          (define keywords #f)
-          (define/augment (capability-value key)
-            (case key
-              [(drscheme:autocomplete-words)
-               (unless keywords 
-                 ;; complete with everything, which is wrong ..
-                 (set! keywords (text:get-completions/manuals #f))) 
-               keywords]
-              [(drscheme:teachpack-menu-items) htdp-teachpack-callbacks]
-              [(drscheme:special:insert-lambda) #f]
-              [(drscheme:help-context-term)
-               (let* ([m (get-module)]
-                      [m (and m (pair? m) (pair? (cdr m)) (cadr m))]
-                      [m (and m (regexp-match #rx"^(lang/[^/.]+).ss$" m))]
-                      [m (and m (cadr m))])
-                 (if m
-                   (format "O:{ L:~a T:teachpack T:picturing-programs }" m)
-                   (error 'drscheme:help-context-term
-                          "internal error: unexpected module spec")))]
-              [(tests:test-menu tests:dock-menu) #t]
-              [else (inner (drscheme:language:get-capability-default key) 
-                           capability-value
-                           key)]))
-          
-          (define htdp-teachpack-callbacks
-            (drscheme:unit:make-teachpack-callbacks
-             (λ (settings) 
-               (map (λ (x) (tp-require->str x))
-                    (htdp-lang-settings-teachpacks settings)))
-             (λ (settings parent) 
-               (define old-tps (htdp-lang-settings-teachpacks settings))
-	       (define tp-dirs (list "htdp" "2htdp"))
-	       (define labels (list (string-constant teachpack-pre-installed/htdp)
-				    (string-constant teachpack-pre-installed/2htdp)))
-	       (define tp-syms '(htdp-teachpacks 2htdp-teachpacks))
-               (define-values (tp-to-remove tp-to-add) (get-teachpack-from-user parent tp-dirs labels tp-syms old-tps))
-               (define new-tps (let ([removed (if tp-to-remove
-                                                  (remove tp-to-remove old-tps)
-                                                  old-tps)])
-                                 (if (or (not tp-to-add) (member tp-to-add old-tps))
-                                     removed
-                                     (append removed (list tp-to-add)))))
-               (when (member tp-to-add old-tps)
-                 (message-box (string-constant drscheme)
-                              (format (string-constant already-added-teachpack)
-                                      (tp-require->str tp-to-add))
-                              #:dialog-mixin frame:focus-table-mixin))
-               (preferences:set 'drracket:htdp:last-set-teachpacks/multi-lib new-tps)
-               (make-htdp-lang-settings
-                (drscheme:language:simple-settings-case-sensitive settings)
-                (drscheme:language:simple-settings-printing-style settings)
-                (drscheme:language:simple-settings-fraction-style settings)
-                (drscheme:language:simple-settings-show-sharing settings)
-                (drscheme:language:simple-settings-insert-newlines settings)
-                (drscheme:language:simple-settings-annotations settings)
-                (htdp-lang-settings-tracing? settings)
-                new-tps))
-             (λ (settings name) 
-               (let ([new-tps (filter (λ (x) (not (equal? (tp-require->str x) name)))
-                                      (htdp-lang-settings-teachpacks settings))])
-                 (preferences:set 'drracket:htdp:last-set-teachpacks/multi-lib new-tps)
-                 (make-htdp-lang-settings
-                  (drscheme:language:simple-settings-case-sensitive settings)
-                  (drscheme:language:simple-settings-printing-style settings)
-                  (drscheme:language:simple-settings-fraction-style settings)
-                  (drscheme:language:simple-settings-show-sharing settings)
-                  (drscheme:language:simple-settings-insert-newlines settings)
-                  (drscheme:language:simple-settings-annotations settings)
-                  (htdp-lang-settings-tracing? settings)
-                  new-tps)))
-             (λ (settings) 
-               (preferences:set 'drracket:htdp:last-set-teachpacks/multi-lib '())
-               (make-htdp-lang-settings
-                (drscheme:language:simple-settings-case-sensitive settings)
-                (drscheme:language:simple-settings-printing-style settings)
-                (drscheme:language:simple-settings-fraction-style settings)
-                (drscheme:language:simple-settings-show-sharing settings)
-                (drscheme:language:simple-settings-insert-newlines settings)
-                (drscheme:language:simple-settings-annotations settings)
-                (htdp-lang-settings-tracing? settings)
-                '()))))
-        
-          (inherit-field reader-module)
-          (define/override (get-reader-module) reader-module)
-          (define/override (get-metadata modname settings)
-            (define parsed-tps 
-              (marshall-teachpack-settings
-               (htdp-lang-settings-teachpacks settings)))
-            (string-append
-             (apply string-append
-                    (map (λ (x) (string-append x "\n"))
-                         htdp-save-file-prefix))
-             (format "#reader~s~s\n"
-                     reader-module
-                     `((modname ,modname)
-                       (read-case-sensitive
-                        ,(drscheme:language:simple-settings-case-sensitive settings))
-                       (teachpacks ,parsed-tps)
-                       (htdp-settings
-                        ,(for/vector ([e (in-vector (htdp-lang-settings->vector settings))]
-                                      [i (in-naturals)])
-                           (cond
-                             [(= i teachpacks-field-index) parsed-tps]
-                             [else e])))))))
-          
-          (inherit default-settings)
-          (define/override (metadata->settings metadata)
-            (define table (massage-metadata (metadata->table metadata)))
-            (define ssv (assoc 'htdp-settings table))
-            (cond
-              [ssv
-               (define settings-list (vector->list (cadr ssv)))
-               (cond
-                 [(equal? (length settings-list)
-                          (procedure-arity make-htdp-lang-settings))
-                  (define new-settings-list
-                    (for/list ([i (in-naturals)]
-                               [e (in-list settings-list)])
-                      (cond
-                        [(= i teachpacks-field-index)
-                         (unmarshall-teachpack-settings e)]
-                        [else e])))
-                  (apply make-htdp-lang-settings new-settings-list)]
-                 [else
-                  (default-settings)])]
-              [else (default-settings)]))
-          
-          ;; these are used for the benefit of v5.3.6 and earlier drracket's
-          ;; specifically, those language doesn't work right with teachpack
-          ;; paths of the form (lib "a/b/c.rkt"), but they do with ones of the
-          ;; form (lib "c.rkt" "a" "b"), so we do that conversion here when
-          ;; sending out a file that might go into 5.3.6.
-          
-          (define/private (unmarshall-teachpack-settings obj)
-            (cond
-              [(list? obj)
-               (for/list ([obj (in-list obj)])
-                 (match obj
-                   [`(lib ,(? string? s1) ,(? string? s2) ...)
-                    `(lib ,(apply string-append (add-between (append s2 (list s1)) "/")))]
-                   [else obj]))]
-              [else obj]))
-          
-          (define/private (marshall-teachpack-settings obj)
-            (define (has-slashes? s) (regexp-match? #rx"/" s))
-            (cond
-              [(list? obj) 
-               (for/list ([obj (in-list obj)])
-                 (match obj
-                   [`(lib ,(? (and/c string? has-slashes?) s))
-                    (define split (regexp-split #rx"/" s))
-                    `(lib ,(last split) ,@(reverse (cdr (reverse split))))]
-                   [else obj]))]
-              [else obj]))
-          
-          (define/private (massage-metadata md)
-            (if (and (list? md)
-                     (andmap (λ (x) (and (pair? x) (symbol? (car x)))) md))
-                md
-                '()))
-          
-          (define/private (metadata->table metadata)
-            (with-handlers ((exn:fail:read? (λ (x) #f)))
-              (let ([p (open-input-string metadata)])
-                (regexp-match #rx"\n#reader" p) ;; skip to reader
-                (read p) ;; skip module
-                (read p))))
-          
-          (define/override (get-metadata-lines) 3)
-          
-          (super-new)))
-      
-      
-
-      (define (stepper-settings-language %)
-        (if (implementation? % stepper-language<%>)
-            (class* % (stepper-language<%>)
-              (init-field stepper:supported)
-              (init-field stepper:enable-let-lifting)
-	      (init-field stepper:show-lambdas-as-lambdas)
-              (define/override (stepper:supported?) stepper:supported)
-              (define/override (stepper:enable-let-lifting?) stepper:enable-let-lifting)
-              (define/override (stepper:show-lambdas-as-lambdas?) stepper:show-lambdas-as-lambdas)
-              (super-new))
-            (class* % ()
-              (init stepper:supported)
-              (init stepper:enable-let-lifting)
-              (init stepper:show-lambdas-as-lambdas)
-              (super-new))))
-
-      (define (debugger-settings-language %)
-        (if (implementation? % debugger-language<%>)
-            (class* % (debugger-language<%>)
-              (init-field [debugger:supported #f])
-              (define/override (debugger:supported?) debugger:supported)
-              (super-new))
-            (class %
-              (init [debugger:supported #f])
-              (super-new))))
-
-      ;; filter/hide-ids : syntax[list] -> listof syntax
-      (define (filter/hide-ids ids)
-        ;; When a `define-values' or `define-syntax' declaration
-        ;; is macro-generated, if the defined name also originates
-        ;; from a macro, then the name is hidden to anything
-        ;; that wasn't generated by the same macro invocation. This
-        ;; hiding relies on renaming at the symbol level, and it's
-        ;; exposed by the fact that `syntax-e' of the identifier 
-        ;; returns a different name than `identifier-binding'.
-        (filter
-         (lambda (id)
-           (let ([ib (identifier-binding id)])
-             ;; ib should always be a 4-elem list, but
-             ;; check, just in case:
-             (or (not (pair? ib)) 
-                 (eq? (syntax-e id)
-                      (cadr ib)))))
-         (syntax->list ids)))
-                 
-      
-      ;                                                                                              
-      ;                                                                                              
-      ;                                                                                              
-      ;   ;                                                             ;                     ;      
-      ;   ;                                                             ;                     ;      
-      ;   ;                                                             ;                     ;      
-      ;   ; ;;    ;;;    ; ;;     ;; ;   ; ;;  ;;    ;;;    ; ;;        ; ;;    ;;;     ;;;   ;   ;  
-      ;   ;;  ;  ;   ;   ;;  ;   ;  ;;   ;;  ;;  ;  ;   ;   ;;  ;       ;;  ;  ;   ;   ;   ;  ;  ;   
-      ;   ;   ;      ;   ;   ;  ;    ;   ;   ;   ;      ;   ;   ;       ;   ;      ;  ;       ; ;    
-      ;   ;   ;   ;;;;   ;   ;  ;    ;   ;   ;   ;   ;;;;   ;   ;       ;   ;   ;;;;  ;       ;;;    
-      ;   ;   ;  ;   ;   ;   ;  ;    ;   ;   ;   ;  ;   ;   ;   ;       ;   ;  ;   ;  ;       ;  ;   
-      ;   ;   ;  ;   ;   ;   ;   ;  ;;   ;   ;   ;  ;   ;   ;   ;       ;   ;  ;   ;   ;   ;  ;   ;  
-      ;   ;   ;   ;;;;;  ;   ;    ;; ;   ;   ;   ;   ;;;;;  ;   ;       ;   ;   ;;;;;   ;;;   ;    ; 
-      ;                              ;                                                               
-      ;                         ;    ;                                                               
-      ;                          ;;;;                                                                
-      
-
-      ;; this inspector should be powerful enough to see
-      ;; any structure defined in the user's namespace
-      (define drscheme-inspector (current-inspector))
-      (eval `(,#'module drscheme-secrets mzscheme
-                        (provide drscheme-inspector)
-                        (define drscheme-inspector ,drscheme-inspector)))
-      (namespace-require ''drscheme-secrets)
-      
-      
-      
-      ;                                                               
-      ;                                                               
-      ;                                                               
-      ;                                                               
-      ;                                                               
-      ;                                 ;                             
-      ;    ;;;   ; ;  ; ;   ;;;    ; ; ;;;;  ; ;  ;;;     ;;;    ;;;  
-      ;   ;   ;  ;;   ;;   ;   ;   ;;   ;    ;;  ;   ;   ;   ;  ;   ; 
-      ;  ;    ;  ;    ;   ;     ;  ;    ;    ;       ;  ;      ;    ; 
-      ;  ;;;;;;  ;    ;   ;     ;  ;    ;    ;    ;;;;  ;      ;;;;;; 
-      ;  ;       ;    ;   ;     ;  ;    ;    ;   ;   ;  ;      ;      
-      ;   ;      ;    ;    ;   ;   ;    ;    ;   ;   ;   ;   ;  ;     
-      ;    ;;;;  ;    ;     ;;;    ;     ;;  ;    ;;;;;   ;;;    ;;;; 
-      ;                                                               
-      ;                                                               
-      ;                                                               
-      
-      
-      
-      
-      (define mf-note
-        (let ([bitmap
-               (make-object bitmap%
-                 (collection-file-path "mf.gif" "icons"))])
-          (and (send bitmap ok?)
-               (make-object image-snip% bitmap))))
-      
-      ;; teaching-languages-error-display-handler : 
-      ;;    (string (union TST exn) -> void) -> string exn -> void
-      ;; adds in the bug icon, if there are contexts to display
-      (define (teaching-languages-error-display-handler msg exn)
-          (if (exn? exn)
-              (display (get-rewriten-error-message exn) (current-error-port))
-              (eprintf "uncaught exception: ~e" exn))
-          (eprintf "\n")
-
-          ;; need to flush here so that error annotations inserted in next line
-          ;; don't get erased if this output were to happen after the insertion
-          (flush-output (current-error-port))
-          
-          (let ([rep (drscheme:rep:current-rep)])
-            (when (and (is-a? rep drscheme:rep:text<%>)
-                       (eq? (send rep get-err-port) (current-error-port)))
-              (let ([to-highlight 
-                     (cond
-                       [(exn:srclocs? exn) 
-                        ((exn:srclocs-accessor exn) exn)]
-                       [(exn? exn) 
-                        (let ([cms (continuation-mark-set->list 
-                                    (exn-continuation-marks exn)
-                                    teaching-languages-continuation-mark-key)])
-			  (cond
-			   ((not cms) '())
-			   ((findf (lambda (mark)
-				     (and mark
-					  (or (path? (car mark))
-					      (symbol? (car mark)))))
-				   cms)
-			    => (lambda (mark)
-				 (apply (lambda (source line col pos span)
-					  (list (make-srcloc source line col pos span)))
-					mark)))
-			   (else '())))]
-		       [else '()])])
-
-                (parameterize ([current-eventspace drs-eventspace])
-                  (queue-callback
-                   (lambda ()
-                     ;; need to make sure that the user's eventspace is still the same
-                     ;; and still running here?
-                     (send rep highlight-errors to-highlight #f))))))))
-      
-      ;; with-mark : syntax syntax exact-nonnegative-integer -> syntax
-      ;; a member of stacktrace-imports^
-      ;; guarantees that the continuation marks associated with
-      ;; teaching-languages-continuation-mark-key are members of the debug-source type
-      (define (with-mark source-stx expr phase)
-        (let ([source (syntax-source source-stx)]
-              [line (syntax-line source-stx)]
-              [col (syntax-column source-stx)]
-              [start-position (syntax-position source-stx)]
-              [span (syntax-span source-stx)])
-          (if (and (or (symbol? source) (path? source))
-                   (number? start-position)
-                   (number? span))
-              (with-syntax ([expr expr]
-                            [mark (list source line col start-position span)]
-                            [teaching-languages-continuation-mark-key 
-                             teaching-languages-continuation-mark-key]
-                            [wcm (syntax-shift-phase-level #'with-continuation-mark 
-                                                           (- phase base-phase))]
-                            [quot (syntax-shift-phase-level #'quote (- phase base-phase))])
-                #`(wcm (quot teaching-languages-continuation-mark-key)
-                    (quot mark)
-                    expr))
-              expr)))
-
-      (define base-phase
-        (variable-reference->module-base-phase (#%variable-reference)))
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;;  profiling infrastructure. Not used.
-      ;;
-      
-      (define profile-key (gensym))
-      (define (profiling-enabled) #f)
-      (define (initialize-profile-point . x) (void))
-      (define (register-profile-start . x) #f)
-      (define (register-profile-done . x) (void))
-      
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;;  test coverage
-      ;;
-      
-      (define test-coverage-enabled (make-parameter #t))
-      (define current-test-coverage-info (make-thread-cell #f))
-      
-      (define (initialize-test-coverage-point expr)
-        (unless (thread-cell-ref current-test-coverage-info)
-          (let ([ht (make-hasheq)])
-            (thread-cell-set! current-test-coverage-info ht)
-            (let ([rep (drscheme:rep:current-rep)])
-              (when rep
-                (parameterize ([current-eventspace drs-eventspace])
-                  (queue-callback
-                   (λ ()
-                     (define sl (editor:get-standard-style-list))
-                     (define on-s (send sl find-named-style test-coverage-on-style-name))
-                     (define off-s (send sl find-named-style test-coverage-off-style-name))
-                     (send rep set-test-coverage-info ht on-s off-s #f))))))))
-        (let ([ht (thread-cell-ref current-test-coverage-info)])
-          (when ht
-            (hash-set! ht expr #;(box #f) (mcons #f #f)))))
-      
-      (define (test-covered expr)
-        (let* ([ht (or (thread-cell-ref current-test-coverage-info)
-                       (error 'htdp-langs
-                              "internal-error: no test-coverage table"))]
-               [v (hash-ref ht expr
-                    (lambda ()
-                      (error 'htdp-langs
-                             "internal-error: expression not found: ~.s"
-                             expr)))])
-          #; (lambda () (set-box! v #t))
-          (with-syntax ([v v]) #'(#%plain-app set-mcar! v #t))))
-      
-      (define-values/invoke-unit et:stacktrace@
-        (import et:stacktrace-imports^) (export (prefix et: et:stacktrace^)))
-     
-      ;; add-annotation : boolean (sexp -> value) -> sexp -> value
-      ;; adds debugging and test coverage information to `sexp' and calls `oe'
-      (define (add-annotation tracing? oe)
-        (let ([teaching-language-eval-handler
-               (lambda (exp)
-                 (let* ([is-compiled? (compiled-expression? (if (syntax? exp) (syntax-e exp) exp))]
-                        [annotated
-                         (if is-compiled? 
-                             exp
-                             (let* ([et-annotated (et:annotate-top (expand exp) 
-                                                                   (namespace-base-phase))]
-                                    [tr-annotated
-                                     (if tracing?
-                                         (drscheme:tracing:annotate (expand et-annotated))
-                                         et-annotated)])
-                               tr-annotated))])
-                   (oe annotated)))])
-          teaching-language-eval-handler))
-      
-     
-   
-;                                                                                               
-;                                                                                               
-;                                                                                               
-;                                                                                               
-;                    ;      ;;;   ;        ;                            ;  ;;;                  
-;                  ;;;          ;;;      ;;;                          ;;;  ;;;                  
-;  ;;; ;;  ;;; ;;; ;;;;     ;;; ;;;;     ;;;;   ;;;    ;; ;;;   ;;;;  ;;;; ;;; ;;    ;;;;  ;;; ;
-;  ;;;;;;; ;;; ;;; ;;;;     ;;; ;;;;     ;;;;  ;;;;;  ;;;;;;;  ;; ;;; ;;;; ;;;;;;;  ;; ;;; ;;;;;
-;  ;;; ;;; ;;; ;;; ;;;      ;;; ;;;      ;;;  ;;; ;;; ;;; ;;; ;;; ;;; ;;;  ;;; ;;; ;;; ;;; ;;;  
-;  ;;; ;;; ;;; ;;; ;;;      ;;; ;;;      ;;;  ;;; ;;; ;;; ;;; ;;;;;;; ;;;  ;;; ;;; ;;;;;;; ;;;  
-;  ;;; ;;; ;;; ;;; ;;;      ;;; ;;;      ;;;  ;;; ;;; ;;; ;;; ;;;     ;;;  ;;; ;;; ;;;     ;;;  
-;  ;;;;;;; ;;;;;;; ;;;;     ;;; ;;;;     ;;;;  ;;;;;  ;;;;;;;  ;;;;;; ;;;; ;;; ;;;  ;;;;;; ;;;  
-;  ;;; ;;   ;; ;;;  ;;;     ;;;  ;;;      ;;;   ;;;    ;; ;;;   ;;;;   ;;; ;;; ;;;   ;;;;  ;;;  
-;  ;;;                                                    ;;;                                   
-;  ;;;                                                ;;;;;;                                    
-;                                                                                               
-;                                                                                               
-
-      
-      ;; add-htdp-language : (instanceof htdp-language<%>) -> void
-      (define (add-htdp-language o)
-        (drscheme:language-configuration:add-language 
-         o
-         #:allow-executable-creation? #t))
-      
-      (define (phase1) (void))
-
-      ;; phase2 : -> void
-      (define (phase2)
-        (define htdp-language%
-          (stepper-settings-language
-           (debugger-settings-language
-            ((drscheme:language:get-default-mixin)
-             (language-extension
-              (drscheme:language:module-based-language->language-mixin
-               (module-based-language-extension
-                (drscheme:language:simple-module-based-language->module-based-language-mixin
-                 simple-htdp-language%))))))))
-        
-        (add-htdp-language
-         (instantiate htdp-language% ()
-           (one-line-summary (string-constant advanced-one-line-summary))
-           (module '(lib "lang/htdp-advanced.ss"))
-           (manual #"advanced")
-           (language-position
-            (list (string-constant teaching-languages)
-                  (string-constant how-to-design-programs)
-                  (string-constant advanced-student)))
-           (language-id "plt:advanced-student")
-           (language-numbers '(-500 -500 5))
-           (sharing-printing #t)
-           (abbreviate-cons-as-list #t)
-           (allow-sharing? #t)
-           (reader-module '(lib "htdp-advanced-reader.ss" "lang"))
-           (debugger:supported #t)
-	   (stepper:supported #f)
-	   (stepper:enable-let-lifting #t)
-	   (stepper:show-lambdas-as-lambdas #t)))
-        
-        (add-htdp-language
-         (instantiate htdp-language% ()
-           (one-line-summary (string-constant intermediate/lambda-one-line-summary))
-           (module '(lib "lang/htdp-intermediate-lambda.ss"))
-           (manual #"intermediate-lambda")
-           (language-position
-            (list (string-constant teaching-languages)
-                  (string-constant how-to-design-programs)
-                  (string-constant intermediate-student/lambda)))
-           (language-id "plt:intermediate-student/lambda")
-           (style-delta (let ([match (regexp-match-positions
-                                      "lambda"
-                                      (string-constant intermediate-student/lambda))])
-                          (if match
-                              (let ([pos (car match)])
-                                (list (list (make-object style-delta% 'change-family 'modern)
-                                            (car pos)
-                                            (cdr pos))))
-                              #f)))
-           (language-numbers '(-500 -500 4))
-           (sharing-printing #f)
-           (abbreviate-cons-as-list #t)
-           (allow-sharing? #f)
-           (reader-module '(lib "htdp-intermediate-lambda-reader.ss" "lang"))
-	   (stepper:supported #t)
-           (stepper:enable-let-lifting #t)
-	   (stepper:show-lambdas-as-lambdas #t)))
-        
-	(add-htdp-language
-         (instantiate htdp-language% ()
-           (one-line-summary (string-constant intermediate-one-line-summary))
-           (module '(lib "lang/htdp-intermediate.ss"))
-           (manual #"intermediate")
-           (language-position
-            (list (string-constant teaching-languages)
-                  (string-constant how-to-design-programs)
-                  (string-constant intermediate-student)))
-           (language-id "plt:intermediate-student")
-           (language-numbers '(-500 -500 3))
-           (sharing-printing #f)
-           (abbreviate-cons-as-list #t)
-           (allow-sharing? #f)
-           (use-function-output-syntax? #t)
-           (reader-module '(lib "htdp-intermediate-reader.ss" "lang"))
-	   (stepper:supported #t)
-           (stepper:enable-let-lifting #t)
-	   (stepper:show-lambdas-as-lambdas #f)))
-        
-        (add-htdp-language
-         (instantiate htdp-language% ()
-           (one-line-summary (string-constant beginning/abbrev-one-line-summary))
-           (module '(lib "lang/htdp-beginner-abbr.ss"))
-           (manual #"beginning-abbr")
-           (language-position
-            (list (string-constant teaching-languages)
-                  (string-constant how-to-design-programs)
-                  (string-constant beginning-student/abbrev)))
-           (language-id "plt:beginning-student/abbrev")
-           (language-numbers '(-500 -500 2))
-           (sharing-printing #f)
-           (abbreviate-cons-as-list #t)
-           (allow-sharing? #f)
-           (reader-module '(lib "htdp-beginner-abbr-reader.ss" "lang"))
-           (stepper:supported #t)
-           (stepper:enable-let-lifting #t)
-           (stepper:show-lambdas-as-lambdas #f)))
-        
-        (add-htdp-language
-         (instantiate htdp-language% ()
-           (one-line-summary (string-constant beginning-one-line-summary))
-           (module '(lib "lang/htdp-beginner.ss"))
-           (manual #"beginning")
-           (language-position
-            (list (string-constant teaching-languages)
-                  (string-constant how-to-design-programs)
-                  (string-constant beginning-student)))
-           (language-numbers '(-500 -500 1))
-           (language-id "plt:beginning-student")
-           (sharing-printing #f)
-           (abbreviate-cons-as-list #f)
-           (allow-sharing? #f)
-           (accept-quasiquote? #f)
-           (reader-module '(lib "htdp-beginner-reader.ss" "lang"))
-           (stepper:supported #t)
-           (stepper:enable-let-lifting #t)
-           (stepper:show-lambdas-as-lambdas #f))))
-      
-      (define test-coverage-on-style-name "plt:htdp:test-coverage-on")
-      (define test-coverage-off-style-name "plt:htdp:test-coverage-off")
-      (define test-coverage-on-style-pref (string->symbol test-coverage-on-style-name))
-      (define test-coverage-off-style-pref (string->symbol test-coverage-off-style-name))
-      
-      (color-prefs:add-color-scheme-entry test-coverage-on-style-pref
-                                          #:style test-coverage-on-style-name
-                                          "black"
-                                          "white")
-      (color-prefs:add-color-scheme-entry test-coverage-off-style-pref
-                                          #:style test-coverage-off-style-name
-                                          "orange"
-                                          "indianred"
-                                          #:background "black")
-      (color-prefs:add-to-preferences-panel 
-       "HtDP Languages"
-       (λ (parent)
-         (color-prefs:build-color-selection-panel parent
-                                                  test-coverage-on-style-pref
-                                                  test-coverage-on-style-name
-                                                  (string-constant test-coverage-on))
-         (color-prefs:build-color-selection-panel parent
-                                                  test-coverage-off-style-pref
-                                                  test-coverage-off-style-name
-                                                  (string-constant test-coverage-off)
-                                                  #:background? #t)))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-reader.rkt
deleted file mode 100644
index e8f53ea198..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/htdp-reader.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-(module htdp-reader mzscheme
-  (require mzlib/etc)
-  (provide make-read-syntax
-           make-read)
-  
-  (define (make-read spec)
-    (let ([read
-           (opt-lambda ([port (current-input-port)])
-             (syntax-object->datum ((make-read-syntax spec) 'whatever port)))])
-      read))
-  
-  (define (get-all-exps source-name port)
-    (parameterize ([read-accept-lang #f])
-      (let loop ()
-        (let ([exp (read-syntax source-name port)])
-          (cond
-           [(eof-object? exp) null]
-           [else (cons exp (loop))])))))
-  
-  (define (lookup key table)
-    (let ([ans (assoc key table)])
-      (unless ans
-        (error 'special-reader "couldn't find ~s in table ~s"
-               key table))
-      (cadr ans)))
-  
-  (define (make-read-syntax spec)
-    (let ([read-syntax
-           (opt-lambda ([source-name #f]
-                        [port (current-input-port)])
-             (let* ([table (read port)]
-                    [path (object-name port)]
-                    [modname 
-                     (if (or (path? path)
-                             (and (string? path)
-                                  (path-string? path)))
-                         (let-values ([(base name dir) (split-path path)])
-                           (string->symbol (path->string (path-replace-suffix name #""))))
-                         (lookup 'modname table))])
-               (datum->syntax-object
-                #f
-                `(module ,modname ,spec
-                   (#%module-begin
-                    ,@(map (λ (x) `(require ,x))
-                           (lookup 'teachpacks table))
-                    ,@(parameterize ([read-case-sensitive (lookup 'read-case-sensitive table)]
-                                     [read-decimal-as-inexact #f]
-                                     [read-accept-dot #f])
-                        (get-all-exps source-name port)))))))])
-      read-syntax)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/imageeq.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/imageeq.rkt
deleted file mode 100644
index 786bb11bad..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/imageeq.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-(module imageeq mzscheme
-
-  (define op (current-output-port))
-  
-  ;; Flag to indicate whether we've tried to load
-  ;;  the GRacket-using image functions
-  (define tried? #f)
-
-  ;; This macro is used once to export all functions
-  ;;  from "private/image.rkt":
-  (define-syntax (re-export stx)
-    (syntax-case stx ()
-      [(_ (id . impl) ...) 
-       (with-syntax ([(got-id ...) (generate-temporaries #'(id ...))])
-         #'(begin 
-             (provide id ...)
-             (re-export-one get-procs! id got-id . impl) ...
-             (define got-id #f) ...
-             (define (get-procs!)
-               (unless tried?
-                 (set! tried? #t)
-                 (with-handlers ([exn:fail? (lambda (x) #f)])
-                   (set! got-id (dynamic-require 'lang/private/imageeq 'id))
-                   ...)))))]))
-
-  ;; This macro is used once for each individual function,
-  ;;  and the use is generated by `re-export':
-  (define-syntax (re-export-one stx)
-    (syntax-case stx ()
-      [(_ get-procs! id got-id args alt ...)
-       (with-syntax ([alt (if (null? (syntax-e #'(alt ...)))
-                              #'(raise-type-error 'id "image" 0 . args)
-                              #'(alt ... . args))])
-                              
-         #'(define (id . args)
-             (get-procs!)
-             (if got-id
-                 (got-id . args)
-                 alt)))]))
-
-  ;; Each re-export is the name, formals for the argument,
-  ;;  and if the first argument isn't required to be an image,
-  ;;  a function to apply when the real version is unavailable
-  ;;  (i.e., because there's no GRacket)
-  (re-export (image? (x) (lambda (x) #f))
-             (image=? (a b))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/info.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/info.rkt
deleted file mode 100644
index ebae6e44bc..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/info.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang info
-
-(define name "HtDP Languages")
-(define tools (list "htdp-langs.rkt"))
-(define tool-icons (list '("htdp-icon.gif" "icons")))
-(define tool-names (list "How to Design Programs"))
-(define tool-urls (list "http://www.htdp.org/"))
-
-(define compile-omit-paths
-  '("test-error.rkt"))
-
-(define get-textbook-pls
-  '("private/textbook-pls-spec.rkt" textbook-pls))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/plt-pretty-big-text.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/plt-pretty-big-text.rkt
deleted file mode 100644
index 0877dc795d..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/plt-pretty-big-text.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-(module plt-pretty-big-text mzscheme
-  (require mzlib/etc
-           mzlib/file
-           mzlib/list
-           mzlib/class
-           mzlib/unit
-           mzlib/include
-           mzlib/defmacro
-           mzlib/pretty
-           mzlib/string
-           mzlib/thread
-           mzlib/math
-           mzlib/match
-           mzlib/shared
-           "posn.rkt")
-
-  (provide (all-from mzscheme)
-           (all-from mzlib/etc)
-           (all-from mzlib/file)
-           (all-from mzlib/list)
-           (all-from mzlib/class)
-           (all-from mzlib/unit)
-           (all-from mzlib/include)
-           (all-from mzlib/defmacro)
-           (all-from mzlib/pretty)
-           (all-from mzlib/string)
-           (all-from mzlib/thread)
-           (all-from mzlib/math)
-           (all-from mzlib/match)
-           (all-from mzlib/shared)
-           (all-from "posn.rkt")))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/plt-pretty-big.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/plt-pretty-big.rkt
deleted file mode 100644
index ceefde078a..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/plt-pretty-big.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-(module plt-pretty-big "plt-pretty-big-text.rkt"
-  (require mred "private/imageeq.rkt")
-
-  (provide (all-from "plt-pretty-big-text.rkt")
-           (all-from mred)
-           (all-from "private/imageeq.rkt")))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/posn.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/posn.rkt
deleted file mode 100644
index 2f3e82982f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/posn.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-
-(require lang/private/signature-syntax)
-
-;; The posn struct for the teaching languages
-(provide struct:posn make-posn posn? posn-x posn-y set-posn-x! set-posn-y!
-         (rename-out (posn posn-id))
-	 (rename-out (posn-signature posn)))
-
-(struct posn (x y) #:mutable #:transparent)
-
-;; We define a separate function so tha it has the 
-;; name `make-posn':
-(define (make-posn x y) (posn x y))
-
-(define posn-signature (signature (predicate posn?)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/prim.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/prim.rkt
deleted file mode 100644
index 2058902cf0..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/prim.rkt
+++ /dev/null
@@ -1,170 +0,0 @@
-;; Provides `define-primitive' and `define-higher-order-primitive'
-;; for use in teachpacks for Beginner, especially those that
-;; define a primitive operator that consumes a procedure.
-;; See manual for more information.
-
-#lang mzscheme
-(require lang/error
-  (rename lang/htdp-beginner beginner-app #%app))
-  
-(require-for-syntax (prefix fo: "private/firstorder.rkt")
-                      stepper/private/syntax-property)
-  
-(provide define-primitive
-         define-higher-order-primitive
-	   provide-primitive
-	   provide-higher-order-primitive
-	   provide-primitives
-           first-order->higher-order)
-
-  (define-syntax (define-primitive stx)
-    (define (go name implementation struct-info)
-      (with-syntax ([name name][implementation implementation])
-        (with-syntax ([impl #'(let ([name (lambda argv
-                                            (apply implementation argv))])
-                                name)])
-          #`(begin
-              ;; Make sure that `implementation' is bound:
-              (define-values () (begin (lambda () implementation) (values)))
-              ;; Bind `name':
-              (define-syntax name 
-                (#,(if struct-info
-                       #'fo:make-first-order+struct
-                       #'fo:make-first-order)
-                 (lambda (stx)
-                   (with-syntax ([tagged-impl (stepper-syntax-property
-                                               (stepper-syntax-property (quote-syntax impl) 'stepper-skip-completely #t)
-                                               'stepper-prim-name
-                                               (quote-syntax name))])
-                     (syntax-case stx ()
-                       [(_ . body)
-                        ;; HACK: we disable all checks if #%app is not beginner-app
-                        (not (module-identifier=? #'beginner-app (datum->syntax-object stx '#%app)))
-                        (syntax/loc stx (tagged-impl . body))]
-                       [_
-                        ;; HACK: see above
-                        (not (module-identifier=? #'beginner-app (datum->syntax-object stx '#%app)))
-                        (syntax/loc stx tagged-impl)]
-                       [(id . args)
-                        (syntax/loc stx (#%plain-app tagged-impl . args))]
-                       [_
-                        (raise-syntax-error
-                         #f
-                         "expected a function call, but there is no open parenthesis before this function"
-                         stx)])))
-                 ((syntax-local-certifier #t)
-                  #'impl)
-                 #,@(if struct-info
-                        (list struct-info)
-                        '())))))))
-    (syntax-case stx ()
-      [(_ name implementation) (go #'name #'implementation #f)]
-      [(_ name implementation inf)
-       (go #'name #'implementation #'inf)]))
-
-
-  (define-syntax (define-higher-order-primitive stx)
-    (define (is-proc-arg? arg)
-      (not (eq? '_ (syntax-e arg))))
-    (syntax-case stx ()
-      [(_ name implementation (arg ...))
-       (let ([args (syntax->list (syntax (arg ...)))])
-         (for-each (lambda (id)
-                     (unless (identifier? id)
-                       (raise-syntax-error #f "expected a variable" stx id)))
-                   (cons (syntax name)
-                         args))
-	 (let ([new-args (generate-temporaries args)])
-	   (with-syntax ([(new-arg ...) new-args]
-			 [(checks ...)
-			  (map (lambda (arg new-arg)
-				 (if (not (is-proc-arg? arg))
-				     #'(void)
-				     #`(unless (identifier? (#,#'syntax #,new-arg))
-					 (raise-syntax-error
-					  #f
-					  (format
-					   "expects a function in this position")
-					  s
-					  (#,#'syntax #,new-arg)))))
-			       args new-args)]
-			 [(wrapped-arg ...)
-			  (map (lambda (arg new-arg)
-				 (cond
-				  [(not (is-proc-arg? arg)) new-arg]
-				  [else #`(first-order->higher-order #,new-arg)]))
-			       args new-args)]
-			 [num-arguments (length args)])
-	     (with-syntax ([impl #'(let ([name (lambda (new-arg ...)
-                                                 (implementation new-arg ...))])
-                                     name)])
-	       (syntax/loc stx
-		   (define-syntax name
-                     (fo:make-first-order
-                      (lambda (s)
-                        (with-syntax ([tagged-impl (stepper-syntax-property
-                                                    (stepper-syntax-property (quote-syntax impl) 'stepper-skip-completely #t)
-                                                    'stepper-prim-name
-                                                    (quote-syntax name))])
-                          (syntax-case s ()
-                            [(_ . body)
-                             ;; HACK: see above
-                             (not (module-identifier=? #'beginner-app (datum->syntax-object s '#%app)))
-                             (syntax/loc s (tagged-impl . body))]
-                            [_
-                             ;; HACK: see above
-                             (not (module-identifier=? #'beginner-app (datum->syntax-object s '#%app)))
-                             (syntax/loc s tagged-impl)]
-                            [(_ new-arg ...)
-                             (begin
-                               checks ...
-                               ;; s is a well-formed use of the primitive;
-                               ;; generate the primitive implementation
-                               (syntax/loc s (tagged-impl wrapped-arg ...))
-                               )]
-                            [(_ . rest)
-                             (let ([num-actuals (length (syntax->list #'rest))])
-                               (raise-syntax-error
-                                #f
-                                (format
-                                 "this function expects ~a argument~a, here it is provided ~a argument~a"
-                                 num-arguments
-                                 (if (= num-arguments 1) "" "s")
-                                 num-actuals
-                                 (if (= num-actuals 1) "" "s"))
-                                s))]
-                            [_
-                             (raise-syntax-error
-                              #f
-                              "expected a function call, but there is no open parenthesis before this function"
-                              s)])))
-                      ((syntax-local-certifier #t)
-                       #'impl))))))))]))
-
-  (define-syntax (first-order->higher-order stx)
-    (syntax-case stx ()
-      [(_ id) (identifier? #'id) (fo:first-order->higher-order #'id)]
-      [(_ expr) #'expr]))
-
-  (define-syntax (provide-primitive stx)
-    (syntax-case stx ()
-      [(_ name)
-       (with-syntax ([ex-name ((make-syntax-introducer) #'name)])
-	 #'(begin
-	     (define-primitive ex-name name)
-	     (provide ex-name)))]))
-
-  (define-syntax (provide-primitives stx)
-    (syntax-case stx ()
-      [(_ name ...)
-       #'(begin
-	   (provide-primitive name)
-	   ...)]))
-
-  (define-syntax (provide-higher-order-primitive stx)
-    (syntax-case stx ()
-      [(_ name (arg ...))
-       (with-syntax ([ex-name ((make-syntax-introducer) #'name)])
-	 #'(begin
-	     (define-higher-order-primitive ex-name name (arg ...))
-	     (provide ex-name)))]))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/advanced-funs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/advanced-funs.rkt
deleted file mode 100644
index c5ca154e64..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/advanced-funs.rkt
+++ /dev/null
@@ -1,449 +0,0 @@
-#lang at-exp scheme/base
-  (require "teachprims.rkt"
-           mzlib/etc
-           mzlib/list
-           mzlib/pretty
-           syntax/docprovide
-           scheme/promise
-           scheme/port
-           "../posn.rkt"
-           (for-syntax scheme/base))
-
-(define advanced-list? list?)
-
-;; Documents the procedures:
-(require "provide-and-scribble.rkt")
-
-(define pp (let ([pretty-print (lambda (v) (pretty-write v))]) pretty-print))
-
-(provide-and-scribble
-   procedures
-
-   (begin
-     (require scribble/manual scribble/eval "sl-eval.rkt")
-     (define (asl)
-       (define *bsl
-         (asl-eval
-          (require 2htdp/image)
-          (define c1 (circle 10 "solid" "green"))
-
-          (define zero 0)
-
-          (define one (list 1))
-
-          ;; b 69, c 42, e 61
-          (define list-for-hash '((b . 69) (c . 42) (e . 61) (r . 999)))
-
-          (define hsh (make-hash list-for-hash))
-          (define heq (make-hasheq list-for-hash))
-          (define heqv (make-hasheqv list-for-hash))
-          (define ish (make-immutable-hash list-for-hash))
-          (define ieq (make-immutable-hasheq list-for-hash))
-          (define ieqv (make-immutable-hasheqv list-for-hash))
-
-          (define q (make-posn "bye" 2))
-          (define p (make-posn 2 -3))
-          
-          (define v (vector "a" "b" "c" "d" "e"))
-          
-          (define b (box 33))
-
-          (define s "hello world")
-          (define x (list 2 "hello" true))))
-       (set! asl (lambda () *bsl))
-       *bsl))
-   
-   ("Numbers: Integers, Rationals, Reals, Complex, Exacts, Inexacts"
-    @defproc[(random [x natural]) natural]{
-    Generates a random natural number less than some given natural number
-    In ASL: @racket[random] generate a random inexact number between 0.0
-    and 1.0 exclusive when applied to no argument.
-    @interaction[#:eval (asl) (random)]
-    } 
-    )
-
-   ("Reading and Printing"
-    @defproc[(with-input-from-file [f string] [p (-> any)]) any]{
-    Opens the named input file @racket[f] and allows @racket[p] to read from it.
-    } 
-    @defproc[(with-output-to-file [f string] [p (-> any)]) any]{
-    Opens the named input file @racket[f] and allows @racket[p] to write to it.
-    } 
-    @defproc[(with-input-from-string [s string] [p (-> any)]) any]{
-    Turns @racket[s] into input for @racket[read] operations in @racket[p].
-    @interaction[#:eval (asl)
-      (with-input-from-string "hello" read)
-      (string-length (symbol->string (with-input-from-string "hello" read)))]
-    } 
-    @defproc[(with-output-to-string [p (-> any)]) any]{
-    Produces a string from all write/display/print operations in @racket[p].
-    @interaction[#:eval (asl)
-      (with-output-to-string (lambda () (display 10)))]
-    } 
-    
-    @defproc[(print [x any]) void]{
-    Prints the argument as a value.
-    @interaction[#:eval (asl)
-      (print 10)
-      (print "hello")
-      (print 'hello)]
-    } 
-    @defproc[(display [x any]) void]{
-    Prints the argument to stdout (without quotes on symbols and strings, etc.).
-    @interaction[#:eval (asl)
-      (display 10)
-      (display "hello")
-      (display 'hello)]
-    } 
-    @defproc[(write [x any]) void]{
-    Prints the argument to stdout (in a traditional style that is somewhere 
-    between @racket[print] and @racket[display]).
-    @interaction[#:eval (asl)
-      (write 10)
-      (write "hello")
-      (write 'hello)]
-    } 
-    @defproc[((pp pretty-print) [x any]) void]{
-    Pretty prints S-expressions (like @racket[write]). 
-    @interaction[#:eval (asl)
-                  (pretty-print '((1 2 3) ((a) ("hello world" true) (((false "good bye"))))))
-                  (pretty-print (build-list 10 (lambda (i) (build-list 10 (lambda (j) (= i j))))))
-                  ]
-    }
-
-    @defproc[(printf [f string] [x any] ...) void]{
-    Formats the rest of the arguments according to the first argument and print it. } 
-
-    @defproc[(newline) void]{
-    Prints a newline.} 
-
-    @defproc[(read) sexp]{
-    Reads input from the user.}) 
-   
-   ("Lists"
-;    @defproc[((advanced-list? list?) [x any]) boolean]{
-;    Determines whether some value is a list. 
-;    In ASL, @racket[list?] also deals with cyclic lists. 
-;    } 
-    @defproc[((advanced-list* list*) [x any] ... [l (listof any)]) (listof any)]{
-    Constructs a list by adding multiple items to a list.
-    In ASL, @racket[list*] also deals with cyclic lists. 
-    } 
-    @defproc[((advanced-cons cons) [x X] [l (listof X)]) (listof X)]{
-    Constructs a list.
-    In ASL, @racket[cons] creates a mutable list. 
-    } 
-    @defproc[((advanced-append append) [l (listof any)] ...) (listof any)]{
-    Creates a single list from several.
-    In ASL, @racket[list*] also deals with cyclic lists. 
-    } 
-    @defproc[(assoc [x any] [l (listof any)]) (union (listof any) false)]{
-    Produces the first pair on @racket[l] whose @racket[first] is @racket[equal?] to @racket[x];
-     otherwise it produces @racket[false].
-    @interaction[#:eval (asl) (assoc "hello" '(("world" 2) ("hello" 3) ("good" 0)))]
-    }) 
-   
-   ("Misc"
-    @defproc[(gensym) symbol?]{
-    Generates a new symbol, different from all symbols in the program.
-    @interaction[#:eval (asl) (gensym)]
-    } 
-    @defproc[(sleep [sec positive-num]) void]{
-    Causes the program to sleep for the given number of seconds.
-    } 
-    @defproc[(current-milliseconds) exact-integer]{
-    Returns the current “time” in fixnum milliseconds (possibly negative).
-    @interaction[#:eval (asl) (current-milliseconds)]
-    } 
-    @defproc[(force [v any]) any]{
-    Finds the delayed value; see also delay.
-    } 
-    @defproc[(promise? [x any]) boolean?]{
-    Determines if a value is delayed.
-    } 
-    @defproc[(void) void?]{
-    Produces a void value.
-    @interaction[#:eval (asl) (void)]
-    } 
-    @defproc[(void? [x any]) boolean?]{
-    Determines if a value is void.
-    @interaction[#:eval (asl) (void? (void)) (void? 42)]
-    }) 
-   
-   ("Posns"
-    @defproc[(set-posn-x! [p posn] [x any]) void?]{
-    Updates the x component of a posn.
-    @interaction[#:eval (asl) p (set-posn-x! p 678) p]
-    } 
-    @defproc[(set-posn-y! [p posn] [x any]) void]{
-    Updates the y component of a posn.
-    @interaction[#:eval (asl) q (set-posn-y! q 678) q]
-    }) 
-   
-   ("Vectors"
-    @defproc[(vector [x X] ...) (vector X ...)]{
-    Constructs a vector from the given values.
-    @interaction[#:eval (asl) (vector 1 2 3 -1 -2 -3)]
-    } 
-    @defproc[(make-vector [n number] [x X]) (vectorof X)]{
-    Constructs a vector of @racket[n] copies of @racket[x].
-    @interaction[#:eval (asl) (make-vector 5 0)]
-    } 
-    @defproc[(build-vector [n nat] [f (nat -> X)]) (vectorof X)]{
-    Constructs a vector by applying @racket[f] to the numbers @racket[0] through @racket[(- n 1)]. 
-    @interaction[#:eval (asl) (build-vector 5 add1)]
-    }
-    @defproc[(vector-ref [v (vector X)] [n nat]) X]{
-    Extracts the @racket[n]th element from @racket[v].
-    @interaction[#:eval (asl) v (vector-ref v 3)]
-    } 
-    @defproc[(vector-length [v (vector X)]) nat]{
-    Determines the length of @racket[v].
-    @interaction[#:eval (asl) v (vector-length v)]
-    } 
-    @defproc[(vector-set! [v (vectorof X)][n nat][x X]) void]{
-    Updates @racket[v] at position @racket[n] to be @racket[x].
-    @interaction[#:eval (asl) v (vector-set! v 3 77) v]
-    } 
-    @defproc[(vector->list [v (vectorof X)]) (listof X)]{
-    Transforms @racket[v] into a list. 
-    @interaction[#:eval (asl) (vector->list (vector 'a 'b 'c))]
-    } 
-    @defproc[(list->vector [l (listof X)]) (vectorof X)]{
-    Transforms @racket[l] into a vector. 
-    @interaction[#:eval (asl) (list->vector (list "hello" "world" "good" "bye"))]
-    } 
-    @defproc[(vector? [x any]) boolean]{
-    Determines if a value is a vector.
-    @interaction[#:eval (asl) v (vector? v) (vector? 42)]
-    }) 
-   
-   ("Boxes"
-    @defproc[(box [x any/c]) box?]{
-    Constructs a box.
-    @interaction[#:eval (asl) (box 42)]
-    } 
-    @defproc[(unbox [b box?]) any]{
-    Extracts the boxed value.
-    @interaction[#:eval (asl) b (unbox b)]
-    } 
-    @defproc[(set-box! [b box?][x any/c]) void]{
-    Updates a box.
-    @interaction[#:eval (asl) b (set-box! b 31) b]
-    } 
-    @defproc[(box? [x any/c]) boolean?]{
-    Determines if a value is a box.
-    @interaction[#:eval (asl) b (box? b) (box? 42)]
-    }) 
-   
-   ("Hash Tables"
-    @defproc[((advanced-make-hash make-hash)) (hash X Y)]{
-    Constructs a mutable hash table from an optional list of mappings that
-    uses equal? for comparisions.
-    @interaction[#:eval (asl)
-      (make-hash)
-      (make-hash '((b 69) (e 61) (i 999)))
-      ]
-    } 
-    @defproc[((advanced-make-hasheq make-hasheq)) (hash X Y)]{
-    Constructs a mutable hash table from an optional list of mappings that
-    uses eq? for comparisions.
-    @interaction[#:eval (asl)
-      (make-hasheq)
-      (make-hasheq '((b 69) (e 61) (i 999)))
-      ] 
-    } 
-    @defproc[((advanced-make-hasheqv make-hasheqv)) (hash X Y)]{
-    Constructs a mutable hash table from an optional list of mappings that
-    uses eqv? for comparisions.
-    @interaction[#:eval (asl)
-      (make-hasheqv)
-      (make-hasheqv '((b 69) (e 61) (i 999)))
-      ]
-    } 
-    @defproc[((advanced-make-immutable-hash make-immutable-hash)) (hash X Y)]{
-    Constructs an immutable hash table from an optional list of mappings
-    that uses equal? for comparisions.
-    @interaction[#:eval (asl)
-      (make-immutable-hash)
-      (make-immutable-hash '((b 69) (e 61) (i 999)))
-      ]
-    } 
-    @defproc[((advanced-make-immutable-hasheq make-immutable-hasheq)) (hash X Y)]{
-    Constructs an immutable hash table from an optional list of mappings
-    that uses eq? for comparisions.
-    @interaction[#:eval (asl)
-      (make-immutable-hasheq)
-      (make-immutable-hasheq '((b 69) (e 61) (i 999)))
-      ]
-    } 
-    @defproc[((advanced-make-immutable-hasheqv make-immutable-hasheqv)) (hash X Y)]{
-    Constructs an immutable hash table from an optional list of mappings
-    that uses eqv? for comparisions.
-    @interaction[#:eval (asl)
-      (make-immutable-hasheqv)
-      (make-immutable-hasheqv '((b 69) (e 61) (i 999)))
-      ]
-    } 
-    @defproc[(hash-set! [h (hash X Y)] [k X] [v Y]) void?]{
-    Updates a mutable hash table with a new mapping.
-    @interaction[#:eval (asl) hsh (hash-set! hsh 'a 23) hsh]
-    } 
-    @defproc[(hash-set  [h (hash X Y)] [k X] [v Y]) (hash X Y)]{
-    Constructs an immutable hash table with one new mapping from an
-    existing immutable hash table.
-    @interaction[#:eval (asl) (hash-set ish 'a 23)]
-    } 
-    @defproc[(hash-ref  [h (hash X Y)] [k X]) Y]{
-    Extracts the value associated with a key from a hash table; the three
-    ; argument case allows a default value or default value computation.
-    @interaction[#:eval (asl) hsh (hash-ref hsh 'b)]
-    } 
-    @defproc[(hash-ref! [h (hash X Y)] [k X] [v Y]) Y]{
-    Extracts the value associated with a key from a mutable hash table; if
-    ; the key does not have an mapping, the third argument is used as the
-    ; value (or used to compute the value) and is added to the hash table
-    ; associated with the key.
-    @interaction[#:eval (asl) hsh (hash-ref! hsh 'd 99) hsh]
-    } 
-    @defproc[(hash-update! [h (hash X Y)] [k X] [f (Y -> Y)]) void?]{
-    Composes hash-ref and hash-set! to update an existing mapping; the
-    ; third argument is used to compute the new mapping value; the fourth
-    ; argument is used as the third argument to hash-ref.
-    @interaction[#:eval (asl) hsh (hash-update! hsh 'b (lambda (old-b) (+ old-b 1))) hsh]    
-    } 
-    @defproc[(hash-update  [h (hash X Y)] [k X] [f (Y -> Y)]) (hash X Y)]{
-    Composes hash-ref and hash-set to update an existing mapping; the third
-    ; argument is used to compute the new mapping value; the fourth
-    ; argument is used as the third argument to hash-ref.
-    @interaction[#:eval (asl) (hash-update ish 'b (lambda (old-b) (+ old-b 1)))]        
-    } 
-    @defproc[(hash-has-key? [h (hash X Y)] [x X]) boolean]{
-    Determines if a key is associated with a value in a hash table.
-    @interaction[#:eval (asl)
-      ish
-      (hash-has-key? ish 'b)
-      hsh
-      (hash-has-key? hsh 'd)]
-    } 
-    @defproc[(hash-remove! [h (hash X Y)] [x X]) void]{
-    Removes an mapping from a mutable hash table.
-    @interaction[#:eval (asl)
-      hsh
-      (hash-remove! hsh 'r)
-      hsh]
-    } 
-    @defproc[(hash-remove [h (hash X Y)] [k X]) (hash X Y)]{
-    Constructs an immutable hash table with one less mapping than an
-    existing immutable hash table.
-    @interaction[#:eval (asl)
-      ish
-      (hash-remove ish 'b)]
-    } 
-    @defproc[(hash-map [h (hash X Y)] [f (X Y -> Z)]) (listof Z)]{
-    Constructs a new list by applying a function to each mapping of a hash
-    table.
-    @interaction[#:eval (asl)
-      ish
-      (hash-map ish list)]
-    } 
-    @defproc[(hash-for-each [h (hash X Y)] [f (X Y -> any)]) void?]{
-    Applies a function to each mapping of a hash table for effect only.
-    @interaction[#:eval (asl)
-      hsh
-      (hash-for-each hsh (lambda (ky vl) (hash-set! hsh ky (+ vl 1))))
-      hsh]
-    } 
-    @defproc[(hash-count [h hash]) integer]{
-    Determines the number of keys mapped by a hash table.
-    @interaction[#:eval (asl)
-      ish
-      (hash-count ish)]
-    } 
-    @defproc[(hash-copy [h hash]) hash]{
-    Copies a hash table.
-    } 
-    @defproc[(hash? [x any]) boolean]{
-    Determines if a value is a hash table.
-    @interaction[#:eval (asl)
-      ish
-      (hash? ish)
-      (hash? 42)]
-    } 
-    @defproc[(hash-equal? [h hash?]) boolean]{
-    Determines if a hash table uses equal? for comparisons.
-    @interaction[#:eval (asl)
-      ish
-      (hash-equal? ish)
-      ieq
-      (hash-equal? ieq)
-      ]
-    } 
-    @defproc[(hash-eq? [h hash]) boolean]{
-    Determines if a hash table uses eq? for comparisons.
-    @interaction[#:eval (asl)
-      hsh
-      (hash-eq? hsh)
-      heq
-      (hash-eq? heq)
-      ]
-    } 
-    @defproc[(hash-eqv? [h hash]) boolean]{
-    Determines if a hash table uses eqv? for comparisons.
-    @interaction[#:eval (asl)
-      heq
-      (hash-eqv? heq)
-      heqv
-      (hash-eqv? heqv)
-      ]
-    })) 
-
-#|
-@defproc[(random (case-> (natural -> natural) (-> (and/c real inexact? (>/c 0) (</c 1)))]{
- Generates a random natural number less than some given natural number, or to
- generate a random inexact number between 0.0 and 1.0 exclusive.}
-
-@defproc[((advanced-make-hash make-hash) (case-> (-> (hash X Y)) ((listof (list X Y)) -> (hash X Y))]{
- Constructs a mutable hash table from an optional list of mappings that
- uses equal? for comparisions.} 
-
-@defproc[((advanced-make-hasheq make-hasheq) (case-> (-> (hash X Y)) ((listof (list X Y)) -> (hash X Y))]{
- Constructs a mutable hash table from an optional list of mappings that
- uses eq? for comparisions.} 
-
-@defproc[((advanced-make-hasheqv make-hasheqv) (case-> (-> (hash X Y)) ((listof (list X Y)) -> (hash X Y))]{
- Constructs a mutable hash table from an optional list of mappings that
- uses eqv? for comparisions.} 
-
-@defproc[((advanced-make-immutable-hash make-immutable-hash) (case-> (-> (hash X Y)) ((listof (list X Y)) -> (hash X Y))]{
- Constructs an immutable hash table from an optional list of mappings that
- uses equal? for comparisions.} 
-
-@defproc[((advanced-make-immutable-hasheq make-immutable-hasheq) (case-> (-> (hash X Y)) ((listof (list X Y)) -> (hash X Y))]{
- Constructs an immutable hash table from an optional list of mappings that
- uses eq? for comparisions.} 
-
-@defproc[((advanced-make-immutable-hasheqv make-immutable-hasheqv) (case-> (-> (hash X Y)) ((listof (list X Y)) -> (hash X Y))]{
- Constructs an immutable hash table from an optional list of mappings that
- uses eqv? for comparisions.} 
-
-@defproc[(hash-ref (case-> ((hash X Y) X -> Y) ((hash X Y) X Y -> Y) ((hash X Y) X (-> Y) -> Y))]{
- Extracts the value associated with a key from a hash table; the three
- argument case allows a default value or default value computation.} 
-
-@defproc[(hash-ref! (case-> ((hash X Y) X Y -> Y) ((hash X Y) X (-> Y) -> Y))]{
- Extracts the value associated with a key from a mutable hash table; if the
- key does not have an mapping, the third argument is used as the value (or
- used to compute the value) and is added to the hash table associated with
- the key.} 
-
-@defproc[(hash-update! (case-> ((hash X Y) X (Y -> Y) -> void) ((hash X Y) X (Y -> Y) Y -> void) ((hash X Y) X (Y -> Y) (-> Y) -> void))]{
- Composes hash-ref and hash-set! to update an existing mapping; the third
- argument is used to compute the new mapping value; the fourth argument is
- used as the third argument to hash-ref.} 
-
-@defproc[(hash-update (case-> ((hash X Y) X (Y -> Y) -> (hash X Y)) ((hash X Y) X (Y -> Y) Y -> (hash X Y)) ((hash X Y) X (Y -> Y) (-> Y) -> (hash X Y)))]{
- Composes hash-ref and hash-set to update an existing mapping; the third
- argument is used to compute the new mapping value; the fourth argument is
- used as the third argument to hash-ref.} 
-|#
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/and-or-map.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/and-or-map.rkt
deleted file mode 100644
index 36e4c88ed0..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/and-or-map.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang scheme
-
-;; ---------------------------------------------------------------------------------------------------
-;; define higher-order primitives that consume boolean-valued functions 
-
-(require "teachprims.rkt" "teach.rkt")
-
-(provide intermediate-andmap intermediate-ormap intermediate-filter 
-         intermediate-quicksort intermediate-sort)
-
-
-;; --- checking auxiliaries ---
-(define (arity-check t r f a)
-  (unless (and (procedure? f) (procedure-arity-includes? f a))
-    (if (= a 1)
-        (hocheck t "~a argument must be a function that accepts one argument, given ~e" r f)
-        (hocheck t "~a argument must be a function that accepts ~a arguments, given ~e" r a f))))
-
-(define-syntax-rule
-  (boolean-test-wrapper tag (f z ...))
-  (let ()
-    (define msg (format "the function given to ~a" tag))
-    (define *name (object-name f))
-    (define name (if *name (format "~a (~a)" *name msg) msg))
-    (define (g z ...)
-      (define f@x (f z ...))
-      (if (boolean? f@x)
-          f@x
-          (error tag "expected a boolean from ~a, but received ~e" name f@x)))
-    g))
-
-(define (list-check? name msg l)
-  (unless (beginner-list? l) 
-    (hocheck name "expected a list for the ~a argument, given ~e" msg l)))
-
-;; --- refined function definitions --- 
-
-(define-syntax-rule
-  (define-boolean name)
-  (define-teach intermediate name
-    (lambda (f l)
-      (arity-check 'name "first" f 1)
-      (list-check? 'name "second" l)
-      (unless (beginner-list? l) 
-        (hocheck 'name "expected a list for the second argument, given ~e" l))
-      (define g (boolean-test-wrapper 'name (f x)))
-      (name g l))))
-
-(define-boolean andmap)
-(define-boolean ormap)
-(define-boolean filter)
-
-(define-syntax-rule
-  (define-sort name)
-  (define-teach intermediate name 
-    (lambda (l cmp?)
-      (list-check? 'name "first" l)
-      (arity-check 'name "second" cmp? 2)
-      (define dmp? (boolean-test-wrapper 'name (cmp? x y)))
-      (sort l dmp?))))
-
-(define-sort sort)
-(define-sort quicksort)
-
-#| TESTS
-
-(define (tester tag name)
-  (lambda (x) 
-    (unless (regexp-match name (exn-message x))
-      (displayln '****broken-test****)
-      (displayln `(,tag ,(exn-message x))))))
-
-(define-syntax-rule 
-  (exn-tester label name function inputs ...)
-  (with-handlers ((exn:fail? (tester label name)))
-    (function inputs ...)
-    (error 'exn-tester "***case ~a (~a) failed***" label name)))
-
-(exn-tester 1 "ormap" intermediate-ormap cons '(1 2 3))
-(exn-tester 2 "andmap" intermediate-andmap cons '(1 2 3))
-(exn-tester 3 "ormap" intermediate-ormap add1 1)
-(exn-tester 4 "andmap" intermediate-andmap add1 1)
-(exn-tester 5 "ormap" intermediate-ormap (lambda (x) x) '(1 2 3))
-(exn-tester 6 "andmap" intermediate-andmap (lambda (x) x) '(1 2 3))
-(exn-tester 7 "andmap" intermediate-andmap add1 '(1 2 3))
-(exn-tester 8 "filter" intermediate-filter (lambda (x) x) '(1 2 3))
-(exn-tester 9 "filter" intermediate-filter add1 '(1 2 3))
-(exn-tester 10 "sort" intermediate-sort '(1 2 3) (lambda (x y) (if (< x y) y #false)))
-(exn-tester 11 "quick" intermediate-quicksort '(1 2 3) (lambda (x y) (if (< x y) y #false)))
-
-(unless (equal? (intermediate-ormap odd? '(1 2 3)) #t) (error 'x "1"))
-(unless (equal? (intermediate-andmap odd? '(1 2 3)) #f) (error 'x "2"))
-(unless (equal? (intermediate-andmap odd? '(1 3 5)) #t) (error 'x "3"))
-(unless (equal? (intermediate-ormap even? '(1 3 5)) #f) (error 'x "4"))
-(unless (equal? (intermediate-filter odd? '(1 2 3)) '(1 3)) (error 'x "5"))
-(unless (equal? (intermediate-filter odd? '()) '()) (error 'x "6"))
-(unless (equal? (intermediate-sort '(1 0 2) <) '(0 1 2)) (error 'x "7"))
-(unless (equal? (intermediate-quicksort '(1 0 2) <) '(0 1 2)) (error 'x "8"))
-|#
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/beginner-funs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/beginner-funs.rkt
deleted file mode 100644
index 749fc760db..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/beginner-funs.rkt
+++ /dev/null
@@ -1,930 +0,0 @@
-#lang at-exp racket 
-
-;; weed out: string-copy, eqv?, struct? -- no need for beginners, move to advanced 
-;; eq? is questionable, but okay if someone uses BSL to teach not out of HtDP 
-;; 
-
-(require mzlib/etc mzlib/list mzlib/math syntax/docprovide
-         (for-syntax "firstorder.rkt")
-         (for-syntax syntax/parse) 
-         (for-syntax racket/syntax))
-
-;; Implements the procedures:
-(require "teachprims.rkt" "teach.rkt" lang/posn lang/imageeq "provide-and-scribble.rkt")
-
-(define-syntax (provide-and-wrap stx)
-  (syntax-parse stx 
-    ; (defproc (name args ...) range w ...)
-    [(provide-and-wrap wrap doc-tag:id requires (title df ...) ...)
-     (let* ((defs (map syntax->list (syntax->list #'((df ...) ...))))
-            (names (map extract-names defs))
-            (tmps  (map generate-temporaries names))
-            (internals (map (lambda (x)
-                              (map (lambda (n) 
-                                     (syntax-parse n
-                                       [(internal-name:id external-name:id) #'internal-name]
-                                       [n:id #'n]))
-                                   x))
-                            names))
-            (externals (map (lambda (x)
-                              (map (lambda (n) 
-                                     (syntax-parse n
-                                       [(internal-name:id external-name:id) #'external-name]
-                                       [n:id #'n]))
-                                   x))
-                            names)))
-       (with-syntax* ([((f ...) ...) tmps]
-                      [((internal-name ...) ...) internals]
-                      [((dg ...) ...)
-                       (map (lambda (d.. f.. ex..)
-                              (map (lambda (d f external-name)
-                                     (syntax-case d ()
-                                       [(defproc [name args ...] range w ...)
-                                        #`(defproc [(#,f #,external-name) args ...] range w ...)]
-                                       [(defthing name range w ...)
-                                        #'(defthing name range w ...)]))
-                                   d.. f.. ex..))
-                            defs tmps externals)])
-                     #'(begin ;; create two modules: 
-                         ;; one that makes definitions first-order 
-                         (module+ with-wrapper 
-                           (wrap f internal-name) ... ...
-                           (provide-and-scribble doc-tag requires (title dg ...) ...))
-                         ;; and one that doesn't
-                         (module+ without-wrapper 
-                           (provide-and-scribble doc-tag requires (title df ...) ...)))))]))
-
-;; MF: this is now an ugly kludge, left over from my original conversion of Matthew's docs for *SL
-(define-syntax (in-rator-position-only stx)
-  (syntax-case stx ()
-    [(_ new-name orig-name)
-     (let ([new (syntax new-name)]
-           [orig (syntax orig-name)])
-       (cond
-         ;; Some things are not really functions:
-         [(memq (syntax-e orig) '(pi e null eof))
-          #'(define new-name orig-name)]
-         [else 
-          #'(define-syntax new-name 
-              (make-first-order
-               (lambda (stx)
-                 (syntax-case stx ()
-                   [(id . args) (syntax/loc stx (beginner-app orig-name . args))]
-                   [_else
-                    (raise-syntax-error
-                     #f
-                     "expected a function call, but there is no open parenthesis before this function"
-                     stx)]))
-               #'orig-name))]))]))
-
-
-;; procedures with documentation:
-(provide-and-wrap
- in-rator-position-only
- procedures
- 
- (begin
-   (require scribble/manual scribble/eval "sl-eval.rkt")
-   (define (bsl)
-     (define *bsl
-       (bsl+-eval
-        (require 2htdp/image)
-        (define c1 (circle 10 "solid" "green"))
-        
-        (define zero 0)
-        
-        (define one (list 1))
-        
-        (define q (make-posn "bye" 2))
-        (define p (make-posn 2 -3))
-        
-        (define a (list (list 'a 22) (list 'b 8) (list 'c 70)))
-        (define v (list 1 2 3 4 5 6 7 8 9 'A))
-        (define w (list (list (list (list "bye") 3) true) 42))
-        (define z (list (list (list (list 'a 'b) 2 3) ) (list false true) "world"))
-        (define y (list (list (list 1 2 3) false "world")))
-        (define x (list 2 "hello" true))))
-     (set! bsl (lambda () *bsl))
-     *bsl))
- 
- ("Numbers: Integers, Rationals, Reals, Complex, Exacts, Inexacts"
-  @defproc[(number? [n any/c]) boolean?]{
-                                         Determines whether some value is a number:
-                                         @interaction[#:eval (bsl) (number? "hello world") (number? 42)] 
-                                         }
-  @defproc[(= [x number][y number][z number] ...) boolean?]{
-                                                            Compares numbers for equality.
-                                                            @interaction[#:eval (bsl) (= 42 2/5)]
-                                                            }
-  @defproc[(< [x real][y real][z real] ...) boolean?]{
-                                                      Compares (real) numbers for less-than.
-                                                      @interaction[#:eval (bsl) (< 42 2/5)]
-                                                      }
-  @defproc[(> [x real][y real][z real] ...) boolean?]{
-                                                      Compares (real) numbers for greater-than.
-                                                      @interaction[#:eval (bsl) (> 42 2/5)]   
-                                                      }
-  @defproc[(<= [x real][y real][z real] ...) boolean?]{
-                                                       Compares (real) numbers for less-than or equality.
-                                                       @interaction[#:eval (bsl) (<= 42 2/5)]
-                                                       }
-  @defproc[(>= [x real][y real][z real] ...) boolean?]{
-                                                       Compares (real) numbers for greater-than or equality.
-                                                       @interaction[#:eval (bsl) (>= 42 42)]
-                                                       }
-  @defproc[((beginner-+ +) [x number][y number][z number] ...) number]{
-                                                                       @index["plus"]{}@index["add"]{Adds} up all numbers.
-                                                                        @interaction[#:eval (bsl) (+ 2/3 1/16) (+ 3 2 5 8)]
-                                                                        }
-  @defproc[(- [x number][y number] ...) number]{
-                                                @index["subtract"]{Subtracts} the second (and following) number(s) from the first ;
-                                                 negates the number if there is only one argument.
-                                                 @interaction[#:eval (bsl) (- 5) (- 5 3) (- 5 3 1)]
-                                                 }
-  @defproc[((beginner-* *) [x number][y number][z number] ...) number]{
-                                                                       @index["times"]{}@index["product"]{}@index["multiply"]{Multiplies} all numbers. 
-                                                                        @interaction[#:eval (bsl) (* 5 3) (* 5 3 2)]
-                                                                        }
-  @defproc[((beginner-/ /) [x number][y number][z number] ...) number]{
-                                                                       @index["divide"]{Divides} the first by the second (and all following) number(s).
-                                                                        @interaction[#:eval (bsl) (/ 12 2) (/ 12 2 3)]
-                                                                        }
-  @defproc[(max [x real][y real] ...) real]{
-                                            Determines the largest number---aka, the @index["maximum"]{maxiumum}. 
-                                                                                     @interaction[#:eval (bsl) (max 3 2 8 7 2 9 0)]
-                                                                                     }
-  @defproc[(min [x real][y real] ...) real]{
-                                            Determines the smallest number---aka, the @index["minimum"]{miniumum}. 
-                                                                                      @interaction[#:eval (bsl) (min 3 2 8 7 2 9 0)]
-                                                                                      }
-  @defproc[(quotient [x integer][y integer]) integer]{
-                                                      Divides the second integer---also called divisor---into the first---known as 
-                                                      dividend---to obtain the @index[(list "divide" "quotient")]{quotient}.
-                                                      @interaction[#:eval (bsl) (quotient 9 2) (quotient 3 4)] 
-                                                      }
-  @defproc[(remainder [x integer][y integer]) integer]{
-                                                       Determines the @index[(list "divide" "remainder")]{remainder} of dividing the first by the second integer
-                                                                      (exact or inexact). 
-                                                                      @interaction[#:eval (bsl) (remainder 9 2) (remainder 3 4)] 
-                                                                      } 
-  @defproc[(modulo [x integer][y integer]) integer]{
-                                                    Finds the remainder of the division of the first number by the second:
-                                                    @interaction[#:eval (bsl) (modulo 9 2) (modulo 3 -4)] 
-                                                    }
-  @defproc[((beginner-sqr sqr) [x number]) number]{
-                                                   Computes the @index["square"]{square} of a number.
-                                                                @interaction[#:eval (bsl) (sqr 8)]
-                                                                }
-  @defproc[(sqrt [x number]) number]{
-                                     Computes the square root of a number.
-                                     @interaction[#:eval (bsl) (sqrt 9) (sqrt 2)]
-                                     }
-  @defproc[(integer-sqrt [x integer]) complex]{
-                                              Computes the integer or imaginary-integer square root of an integer.
-                                              @interaction[#:eval (bsl) (integer-sqrt 11) (integer-sqrt -11)]
-                                              }
-  @defproc[(abs [x real]) real]{
-                                Determines the absolute value of a real number.
-                                @interaction[#:eval (bsl) (abs -12)]
-                                }
-  @defproc[(sgn [x real]) (union 1 #i1.0 0 #i0.0 -1 #i-1.0)]{
-                                                             Determines the sign of a real number.
-                                                             @interaction[#:eval (bsl) (sgn -12)]
-                                                             }		       
-  
-  ;; exponents and logarithms 
-  @defproc[(expt [x number][y number]) number]{
-                                               Computes the power of the first to the second number.
-                                               @interaction[#:eval (bsl) (expt 16 1/2) (expt 3 -4)]
-                                               }
-  @defproc[(exp [x number]) number]{
-                                    Determines e raised to a number.
-                                    @interaction[#:eval (bsl) (exp -2)]
-                                    }
-  @defproc[(log [x number]) number]{
-                                    Determines the base-e logarithm of a number.
-                                    @interaction[#:eval (bsl) (log 12)]
-                                    }
-  
-  ;; trigonometry
-  @defproc[(sin [x number]) number]{
-                                    Computes the @index["sine"]{sine} of a number (radians).
-                                                 @interaction[#:eval (bsl) (sin pi)]
-                                                 }
-  @defproc[(cos [x number]) number]{
-                                    Computes the @index["cosine"]{cosine} of a number (radians).
-                                                 @interaction[#:eval (bsl) (cos pi)]
-                                                 }
-  @defproc[(tan [x number]) number]{
-                                    Computes the @index["tangent"]{tangent} of a number (radians). 
-                                                 @interaction[#:eval (bsl) (tan pi)]
-                                                 }
-  @defproc[(asin [x number]) number]{
-                                     Computes the arcsine (inverse of sin) of a number.
-                                     @interaction[#:eval (bsl) (asin 0)]
-                                     }
-  @defproc[(acos [x number]) number]{
-                                     Computes the arccosine (inverse of cos) of a number. 
-                                     @interaction[#:eval (bsl) (acos 0)]
-                                     }
-  @defproc[(atan [x number]) number]{
-   Computes the arctangent of the given number:  
-   @interaction[#:eval (bsl) (atan 0) (atan 0.5)]
-
-   Also comes in a two-argument version where @racket[(atan x y)] computes
-   @racket[(atan (/ x y))] but the signs of @racket[x] and @racket[y]
-   determine the quadrant of the result and the result tends to be more
-   accurate than that of the 1-argument version in borderline cases:
-   @interaction[#:eval (bsl) (atan 3 4) (atan -2 -1)]
-                                                }
-  @defproc[(sinh [x number]) number]{
-                                     Computes the hyperbolic sine of a number. 
-                                     @interaction[#:eval (bsl) (sinh 10)]
-                                     }
-  @defproc[(cosh [x number]) number]{
-                                     Computes the hyperbolic cosine of a number. 
-                                     @interaction[#:eval (bsl) (cosh 10)]
-                                     }
-  
-  ;; predicates 
-  @defproc[(exact? [x number]) boolean?]{
-                                         Determines whether some number is exact.
-                                         @interaction[#:eval (bsl) (exact? (sqrt 2))]
-                                         }
-  @defproc[(integer? [x any/c]) boolean?]{
-                                          Determines whether some value is an integer (exact or inexact). 
-                                          @interaction[#:eval (bsl) (integer? (sqrt 2))]
-                                          }
-  @defproc[(zero? [x number]) boolean?]{
-                                        Determines if some value is zero or not.  
-                                        @interaction[#:eval (bsl) (zero? 2)]
-                                        }
-  @defproc[(positive? [x number]) boolean?]{
-                                            Determines if some value is strictly larger than zero. 
-                                            @interaction[#:eval (bsl) (positive? -2)]
-                                            }
-  @defproc[(negative? [x number]) boolean?]{
-                                            Determines if some value is strictly smaller than zero.
-                                            @interaction[#:eval (bsl) (negative? -2)]
-                                            }
-  @defproc[(odd? [x integer]) boolean?]{
-                                        Determines if some integer (exact or inexact) is odd or not. 
-                                        @interaction[#:eval (bsl) (odd? 2)]
-                                        }
-  @defproc[(even? [x integer]) boolean?]{
-                                         Determines if some integer (exact or inexact) is even or not. 
-                                         @interaction[#:eval (bsl) (even? 2)]
-                                         }
-  @defproc[(rational? [x any/c]) boolean?]{
-   Determines whether some value is a rational number. 
-   @interaction[#:eval (bsl) 
-     (rational? 1)
-     (rational? -2.349)
-     (rational? #i1.23456789)
-     (rational? (sqrt -1))
-     (rational? pi)
-     (rational? e)
-     (rational? 1-2i)]
-  As the interactions show, the teaching languages considers many more
-  numbers as rationals than expected. In particular, @racket[pi] is a
-  rational number because it is only a finite approximation to the
-  mathematical π. Think of @racket[rational?] as a suggestion to think of
-  these numbers as fractions.
-  }
-  @defproc[(inexact? [x number]) boolean?]{
-                                           Determines whether some number is inexact.
-                                           @interaction[#:eval (bsl) (inexact? 1-2i)]
-                                           }
-  @defproc[(real? [x any/c]) boolean?]{
-                                       Determines whether some value is a real number. 
-                                       @interaction[#:eval (bsl) (real? 1-2i)]
-                                       }
-  @defproc[(complex? [x any/c]) boolean?]{
-                                          Determines whether some value is complex. 
-                                          @interaction[#:eval (bsl) (real? 1-2i)]
-                                          }
-  
-  ;; common utilities 
-  @defproc[(add1 [x number]) number]{
-                                     Incrementes the given number.
-                                     @interaction[#:eval (bsl) (add1 2)]
-                                     }
-  @defproc[(sub1 [x number]) number]{
-                                     Decrements the given number.
-                                     @interaction[#:eval (bsl) (sub1 2)]
-                                     }
-  @defproc[(lcm [x integer][y integer] ...) integer]{
-                                                     Determines the least common multiple of two integers (exact or inexact). 
-                                                     @interaction[#:eval (bsl) (lcm 6 12 8)]
-                                                     }
-  @defproc[(gcd [x integer][y integer] ...) integer]{
-                                                     Determines the greatest common divisior of two integers (exact or inexact). 
-                                                     @interaction[#:eval (bsl) (gcd 6 12 8)]
-                                                     }
-  @defproc[(numerator [x rational?]) integer]{
-                                              Computes the numerator of a rational.
-                                              @interaction[#:eval (bsl) (numerator 2/3)]
-                                              }
-  @defproc[(denominator [x rational?]) integer]{
-                                                Computees the denominator of a rational.
-                                                @interaction[#:eval (bsl) (denominator 2/3)]
-                                                }
-  @defproc[(floor [x real]) integer]{
-                                     Determines the closest integer (exact or inexact) below a real
-                                     number. See @racket[round].
-                                     @interaction[#:eval (bsl) (floor 12.3)]
-                                     }
-  @defproc[(ceiling [x real]) integer]{
-                                       Determines the closest integer (exact or inexact) above a real
-                                       number. See @racket[round]. 
-                                       @interaction[#:eval (bsl) (ceiling 12.3)]
-                                       }
-  @defproc[(round [x real]) integer]{
-                                     Rounds a real number to an integer (rounds to even to break ties). See
-                                     @racket[floor] and @racket[ceiling]. 
-                                     @interaction[#:eval (bsl) (round 12.3)]
-                                     }
-  @defproc[(make-polar [x real ][y real]) number]{
-                                                  Creates a complex from a magnitude and angle. 
-                                                  @interaction[#:eval (bsl) (make-polar 3 4)]
-                                                  }
-  @defproc[(make-rectangular [x real][y real]) number]{
-                                                       Creates a complex from a real and an imaginary part. 
-                                                       @interaction[#:eval (bsl) (make-rectangular 3 4)] 
-                                                       }
-  @defproc[(real-part [x number]) real]{
-                                        Extracts the real part from a complex number. 
-                                        @interaction[#:eval (bsl) (real-part 3+4i)] 
-                                        }
-  @defproc[(imag-part [x number]) real]{
-                                        Extracts the imaginary part from a complex number. 
-                                        @interaction[#:eval (bsl) (imag-part 3+4i)] 
-                                        }
-  @defproc[(magnitude [x number]) real]{
-                                        Determines the magnitude of a complex number. 
-                                        @interaction[#:eval (bsl) (magnitude (make-polar 3 4))]
-                                        }
-  @defproc[(angle [x number]) real]{
-                                    Extracts the angle from a complex number. 
-                                    @interaction[#:eval (bsl) (angle (make-polar 3 4))]
-                                    }
-  @defproc[(conjugate [x number]) number]{
-                                          Extracts the conjugate of a complex number. 
-                                          @interaction[#:eval (bsl) (conjugate (make-polar 3 4))]
-                                          }
-  @defproc[(exact->inexact [x number]) number]{
-                                               Converts an exact number to an inexact one. 
-                                               @interaction[#:eval (bsl) (exact->inexact 12)]
-                                               }
-  @defproc[(inexact->exact [x number]) number]{
-                                               Approximates an inexact number by an exact one. 
-                                               @interaction[#:eval (bsl) (inexact->exact #i12)]
-                                               }
-  @defproc[(number->string [x number]) string]{
-                                               Converts a number to a string. 
-                                               @interaction[#:eval (bsl) (number->string 42)]
-                                               }
-  @defproc[(integer->char [x exact-integer?]) char]{
-                                                    Lookups the character that corresponds to the given exact integer in the ASCII table (if any). 
-                                                    @interaction[#:eval (bsl) (integer->char 42)]
-                                                    }
-  @defproc[((beginner-random random) [x natural]) natural]{
-                                                           Generates a random natural number less than some given exact natural.
-                                                           @interaction[#:eval (bsl) (random 42)]
-                                                           }
-  @defproc[(current-seconds) integer]{
-                                      Determines the current time in seconds elapsed (since a platform-specific starting date). 
-                                      @interaction[#:eval (bsl) (current-seconds)]
-                                      }
-  @defthing[e real]{Euler's number.
-                     @interaction[#:eval (bsl) e]
-                     }
-  @defthing[pi real]{The ratio of a circle's circumference to its diameter. 
-                      @interaction[#:eval (bsl) pi]
-                      })
- 
- ("Booleans"
-  @defproc[(boolean? [x any/c]) boolean?]{
-                                          Determines whether some value is a boolean. 
-                                          @interaction[#:eval (bsl) (boolean? 42) (boolean? false)]
-                                          }
-  @defproc[(boolean=? [x boolean?][y boolean?]) boolean?]{
-                                                          Determines whether two booleans are equal.
-                                                          @interaction[#:eval (bsl) (boolean=? true false)]
-                                                          }
-  @defproc[(false? [x any/c]) boolean?]{
-                                        Determines whether a value is false.
-                                        @interaction[#:eval (bsl) (false? false)]
-                                        }
-  @defproc[((beginner-not not) [x boolean?]) boolean?]{
-                                                       Negates a boolean value.
-                                                       @interaction[#:eval (bsl) (not false)]
-                                                       })
- 
- ("Symbols"
-  @defproc[(symbol? [x any/c]) boolean?]{
-                                         Determines whether some value is a symbol.
-                                         @interaction[#:eval (bsl) (symbol? 'a)]
-                                         }
-  @defproc[(symbol=? [x symbol][y symbol]) boolean?]{
-                                                     Determines whether two symbols are equal.
-                                                     @interaction[#:eval (bsl) (symbol=? 'a 'b)]
-                                                     }
-  @defproc[(symbol->string [x symbol]) string]{
-                                               Converts a symbol to a string.
-                                               @interaction[#:eval (bsl) (symbol->string 'c)]
-                                               })
- 
- ("Lists"
-  @defproc[(cons? [x any/c]) boolean?]{
-                                       Determines whether some value is a constructed list. 
-                                       @interaction[#:eval (bsl-eval) (cons? (cons 1 empty)) (cons? 42)]
-                                       }
-  @defproc[(empty? [x any/c]) boolean?]{
-                                        Determines whether some value is the empty list.
-                                        @interaction[#:eval (bsl) (empty? empty) (empty? 42)]
-                                        }
-  @defproc[((beginner-cons cons) [x any/x][y list?]) list?]{
-                                                            Constructs a list.
-                                                            @interaction[#:eval (bsl-eval) (cons 1 empty)]
-                                                            }
-  @defproc[((beginner-first first) [x cons?]) any/c]{
-                                                     Selects the first item of a non-empty list.
-                                                     @interaction[#:eval (bsl) x (first x)]
-                                                     }
-  @defproc[((beginner-rest rest) [x cons?]) any/c]{
-                                                   Selects the rest of a non-empty list.
-                                                   @interaction[#:eval (bsl) x (rest x)]
-                                                   }
-  @defproc[(second [x list?]) any/c]{
-                                     Selects the second item of a non-empty list. 
-                                     @interaction[#:eval (bsl) x (second x)]
-                                     }
-  @defproc[(third [x list?]) any/c]{
-                                    Selects the third item of a non-empty list.
-                                    @interaction[#:eval (bsl) x (third x)]
-                                    }
-  
-  @defproc[(fourth [x list?]) any/c]{
-                                     Selects the fourth item of a non-empty list. 
-                                     @interaction[#:eval (bsl) v (fourth v)]
-                                     }
-  
-  @defproc[(fifth [x list?]) any/c]{
-                                    Selects the fifth item of a non-empty list. 
-                                    @interaction[#:eval (bsl) v (fifth v)]
-                                    }
-  @defproc[(sixth [x list?]) any/c]{
-                                    Selects the sixth item of a non-empty list.
-                                    @interaction[#:eval (bsl) v (sixth v)]
-                                    }
-  @defproc[(seventh [x list?]) any/c]{
-                                      Selects the seventh item of a non-empty list.
-                                      @interaction[#:eval (bsl) v (seventh v)]
-                                      }
-  @defproc[(eighth [x list?]) any/c]{
-                                     Selects the eighth item of a non-empty list. 
-                                     @interaction[#:eval (bsl) v (eighth v)]
-                                     }
-  @defproc[(list-ref [x list?][i natural?]) any/c]{
-                                                   Extracts the indexed item from the list.
-                                                   @interaction[#:eval (bsl) v (list-ref v 9)]
-                                                   }
-  @defproc[(list [x any/c] ... ) list?]{
-                                        Constructs a list of its arguments.
-                                        @interaction[#:eval (bsl-eval) (list 1 2 3 4 5 6 7 8 9 0)]
-                                        }
-  @defproc[(make-list [i natural-number] [x any/c]) list?]{
-                                                           Constructs a list of @racket[i] copies of @racket[x].
-                                                                                @interaction[#:eval (bsl-eval) (make-list 3 "hello")]
-                                                                                }
-  @defproc[((beginner-list* list*) [x any/c]  ... [l list?]) list?]{
-                                                                    Constructs a list by adding multiple items to a list.
-                                                                    @interaction[#:eval (bsl-eval (define x (list 2 "hello" true))) x (list* 4 3 x)]
-                                                                    }
-  @defproc[((beginner-range range) [start number][end number][step number]) list?]{
-                                                                                   Constructs a list of numbers by @racket[step]ping from @racket[start]
-                                                                                                                   to @racket[end]. 
-                                                                                                                   @interaction[#:eval (bsl-eval) (range 0 10 2)]
-                                                                                                                   }
-  @defproc[((beginner-append append) [x list?][y list?][z list?]  ...) list?]{
-                                                                              Creates a single list from several, by concatenation of the items.  
-                                                                              @interaction[#:eval (bsl) (append (cons 1 (cons 2 empty)) (cons "a" (cons "b" empty)))]
-                                                                              }
-  @defproc[(length (l list?)) natural-number?]{
-                                               Evaluates the number of items on a list.
-                                               @interaction[#:eval (bsl) x (length x)]
-                                               }
-  @defproc[((beginner-memq memq) [x any/c][l list?]) boolean?]{
-                                                               Determines whether some value @racket[x] is on some list @racket[l], 
-                                                                                             using @racket[eq?] to compare @racket[x] with items on @racket[l].
-                                                                                             @interaction[#:eval (bsl) x (memq (list (list 1 2 3)) x)]
-                                                                                             }
-  @defproc[((beginner-memq? memq?) [x any/c][l list?]) boolean?]{
-                                                                 Determines whether some value @racket[x] is on some list @racket[l], 
-                                                                                               using @racket[eq?] to compare @racket[x] with items on @racket[l].
-                                                                                               @interaction[#:eval (bsl) x (memq? (list (list 1 2 3)) x)]
-                                                                                               }
-  @defproc[(memv [x any/c][l list?]) (or/c false list)]{
-                                                        Determines whether some value is on the list if so, it produces the
-                                                        suffix of the list that starts with x if not, it produces false. (It
-                                                        compares values with the eqv? predicate.)  
-                                                        @interaction[#:eval (bsl) x (memv (list (list 1 2 3)) x)]
-                                                        }
-  @defproc[((beginner-member? member?) [x any/c][l list?]) boolean?]{
-                                                                     Determines whether some value is on the list (comparing values with equal?).
-                                                                     @interaction[#:eval (bsl) x (member? "hello" x)]
-                                                                     }
-  @defproc[((beginner-member member) [x any/c][l list?]) boolean?]{
-                                                                   Determines whether some value is on the list (comparing values with equal?).
-                                                                   @interaction[#:eval (bsl) x (member "hello" x)]
-                                                                   }
-  @defproc[((beginner-remove remove) [x any/c][l list?]) list?]{
-                                                                Constructs a list like the given one with the first occurrence of the
-                                                                given item removed (comparing values with equal?).
-                                                                @interaction[#:eval (bsl) x (remove "hello" x)]
-                                                                }
-  @defproc[(reverse [l list?]) list]{
-                                     Creates a reversed version of a list.
-                                     @interaction[#:eval (bsl) x (reverse x)]
-                                     }
-  @defproc[(assq [x any/c][l list?]) (union false cons?)]{
-                                                          Determines whether some item is the first item of a pair in a list of
-                                                          pairs. (It compares the items with @racket[eq?].)
-                                                          @interaction[#:eval (bsl) a (assq 'b a)]
-                                                          }
-  
-  
-  ;; LISP-ish selectors:
-  @defproc[(null? [x any/c]) boolean?]{
-                                       Determines whether some value is the empty list.
-                                       @interaction[#:eval (bsl) (null? empty) (null? 42)]
-                                       }
-  @defthing[null list]{Another name for the empty list
-                        @interaction[#:eval (bsl) null]
-                        }
-  @defproc[((beginner-car car) [x cons?]) any/c]{
-                                                 Selects the first item of a non-empty list.
-                                                 @interaction[#:eval (bsl) x (car x)]
-                                                 }
-  @defproc[((beginner-cdr cdr) [x cons?]) any/c]{
-                                                 Selects the rest of a non-empty list.
-                                                 @interaction[#:eval (bsl) x (cdr x)]
-                                                 }
-  @defproc[(cadr [x list?]) any/c]{
-                                   LISP-style selector: @racket[(car (cdr x))].
-                                                        @interaction[#:eval (bsl) x (cadr x)]
-                                                        }
-  @defproc[(cdar [x list?]) list?]{
-                                   LISP-style selector: @racket[(cdr (car x))].
-                                                        @interaction[#:eval (bsl) y (cdar y)]
-                                                        }
-  @defproc[(caar [x list?]) any/c]{
-                                   LISP-style selector: @racket[(car (car x))].
-                                                        @interaction[#:eval (bsl) y (caar y)]
-                                                        }
-  @defproc[(cddr [x list?]) list? ]{
-                                    LISP-style selector: @racket[(cdr (cdr x))].
-                                                         @interaction[#:eval (bsl) x (cddr x)]
-                                                         }
-  @defproc[(caddr [x list?]) any/c]{
-                                    LISP-style selector: @racket[(car (cdr (cdr x)))].
-                                                         @interaction[#:eval (bsl) x (caddr x)]
-                                                         }
-  @defproc[(caadr [x list?]) any/c]{
-                                    LISP-style selector: @racket[(car (car (cdr x)))].
-                                                         @interaction[#:eval (bsl) z (caadr z)]
-                                                         }
-  @defproc[(caaar [x list?]) any/c]{
-                                    LISP-style selector: @racket[(car (car (car (car x))))].
-                                                         @interaction[#:eval (bsl) w (caaar w)]
-                                                         }
-  @defproc[(cdaar [x list?]) any/c]{
-                                    LISP-style selector: @racket[(cdr (car (car x)))].
-                                                         @interaction[#:eval (bsl) w (cdaar w)]
-                                                         }
-  @defproc[(cdadr [x list?]) any/c]{
-                                    LISP-style selector: @racket[(cdr (car (cdr x)))].
-                                                         @interaction[#:eval (bsl) z (cdadr z)]
-                                                         }
-  @defproc[(cadar [x list?]) any/c]{
-                                    LISP-style selector: @racket[(car (cdr (car x)))].
-                                                         @interaction[#:eval (bsl) w (cadar w)]
-                                                         }
-  @defproc[(cddar [x list?]) any/c]{
-                                    LISP-style selector: @racket[(cdr (cdr (car x)))]
-                                                         @interaction[#:eval (bsl) w (cddar w)]
-                                                         }
-  @defproc[(cdddr [x list?]) any/c]{
-                                    LISP-style selector: @racket[(cdr (cdr (cdr x)))].
-                                                         @interaction[#:eval (bsl) v (cdddr v)]
-                                                         }
-  @defproc[(cadddr [x list?]) any/c]{
-                                     LISP-style selector: @racket[(car (cdr (cdr (cdr x))))].
-                                                          @interaction[#:eval (bsl) v (cadddr v)]
-                                                          })
- 
- ("Posns"
-  @defproc[(posn) signature]{Signature for posns.}
-  @defproc[(make-posn [x any/c][y any/c]) posn]{
-                                                Constructs a posn from two arbitrary values.
-                                                @interaction[#:eval (bsl) (make-posn 3 3) (make-posn "hello" true)]
-                                                }
-  @defproc[(posn? [x any/c]) boolean?]{
-                                       Determines if its input is a posn.
-                                       @interaction[#:eval (bsl) q (posn? q) (posn? 42)]
-                                       }
-  @defproc[(posn-x [p posn]) any]{
-                                  Extracts the x component of a posn.
-                                  @interaction[#:eval (bsl) p (posn-x p)]
-                                  }
-  @defproc[(posn-y [p posn]) any]{
-                                  Extracts the y component of a posn.
-                                  @interaction[#:eval (bsl) p (posn-y p)]
-                                  })
- 
- ("Characters"
-  @defproc[(char? [x any/c]) boolean?]{
-                                       Determines whether a value is a character.
-                                       @interaction[#:eval (bsl) (char? "a") (char? #\a)]
-                                       }
-  @defproc[(char=? [c char][d char][e char] ...) boolean?]{
-                                                           Determines whether the characters are equal.
-                                                           @interaction[#:eval (bsl) (char=? #\b #\a)]
-                                                           }
-  @defproc[(char<? [x char][d char][e char] ...) boolean?]{
-                                                           Determines whether the characterc are ordered in a strictly increasing manner. 
-                                                           @interaction[#:eval (bsl) (char<? #\a #\b #\c)]
-                                                           }
-  @defproc[(char>? [c char][d char][e char] ...) boolean?]{
-                                                           Determines whether the characters are sorted in a strictly decreasing manner. 
-                                                           @interaction[#:eval (bsl) (char>? #\A #\z #\a)]
-                                                           }
-  @defproc[(char<=? [c char][d char][e char] ...) boolean?]{
-                                                            Determines whether the characterc are ordered in a strictly increasing manner. 
-                                                            @interaction[#:eval (bsl) (char<=? #\a #\a #\b)]
-                                                            }
-  @defproc[(char>=? [c char][d char][e char] ...) boolean?]{
-                                                            Determines whether the characters are sorted in a decreasing manner. 
-                                                            @interaction[#:eval (bsl) (char>=? #\b #\b #\a)]
-                                                            }
-  @defproc[(char-ci=? [c char][d char][e char] ...) boolean?]{
-                                                              Determines whether two characters are equal in a case-insensitive
-                                                              manner.
-                                                              @interaction[#:eval (bsl) (char-ci=? #\b #\B)]
-                                                              }
-  @defproc[(char-ci<? [c char][d char][e char] ...) boolean?]{
-                                                              Determines whether the characterc are ordered in a strictly increasing and case-insensitive manner. 
-                                                              @interaction[#:eval (bsl) (char-ci<? #\B #\c) (char<? #\b #\B)]
-                                                              }
-  @defproc[(char-ci>? [c char][d char][e char] ...) boolean?]{
-                                                              Determines whether the characters are sorted in a strictly decreasing and case-insensitive manner.
-                                                              @interaction[#:eval (bsl) (char-ci>? #\b #\B) (char>? #\b #\B)]
-                                                              }
-  @defproc[(char-ci<=? [c char][d char][e char] ...) boolean?]{
-                                                               Determines whether the characterc are ordered in an increasing and case-insensitive manner. 
-                                                               @interaction[#:eval (bsl) (char-ci<=? #\b #\B) (char<=? #\b #\B)]
-                                                               }
-  @defproc[(char-ci>=? [c char][d char][e char] ...) boolean?]{
-                                                               Determines whether the characters are sorted in a decreasing and case-insensitive manner.
-                                                               @interaction[#:eval (bsl) (char-ci>=? #\b #\C) (char>=? #\b #\C)]
-                                                               }
-  @defproc[(char-numeric? [c char]) boolean?]{
-                                              Determines whether a character represents a digit.
-                                              @interaction[#:eval (bsl) (char-numeric? #\9)]
-                                              }
-  @defproc[(char-alphabetic? [c char]) boolean?]{
-                                                 Determines whether a character represents an alphabetic character.
-                                                 @interaction[#:eval (bsl) (char-alphabetic? #\Q)]
-                                                 }
-  @defproc[(char-whitespace? [c char]) boolean?]{
-                                                 Determines whether a character represents space.
-                                                 @interaction[#:eval (bsl) (char-whitespace? #\tab)]
-                                                 }
-  @defproc[(char-upper-case? [c char]) boolean?]{
-                                                 Determines whether a character is an upper-case character.
-                                                 @interaction[#:eval (bsl) (char-upper-case? #\T)]
-                                                 }
-  @defproc[(char-lower-case? [c char]) boolean?]{
-                                                 Determines whether a character is a lower-case character.
-                                                 @interaction[#:eval (bsl) (char-lower-case? #\T)]
-                                                 }
-  @defproc[(char-upcase [c char]) char]{
-                                        Produces the equivalent upper-case character.
-                                        @interaction[#:eval (bsl) (char-upcase #\t)]
-                                        }
-  @defproc[(char-downcase [c char]) char]{
-                                          Produces the equivalent lower-case character.
-                                          @interaction[#:eval (bsl) (char-downcase #\T)]
-                                          }
-  @defproc[(char->integer [c char]) integer]{
-                                             Lookups the number that corresponds to the given character in the ASCII table (if any). 
-                                             @interaction[#:eval (bsl) (char->integer #\a) (char->integer #\z)]
-                                             })
- 
- ("Strings"
-  @defproc[(string? [x any/c]) boolean?]{
-                                         Determines whether a value is a string. 
-                                         @interaction[#:eval (bsl) (string? "hello world") (string? 42)]
-                                         }
-  @defproc[(string-length [s string]) nat]{
-                                           Determines the length of a string. 
-                                           @interaction[#:eval (bsl) (string-length "hello world")]
-                                           }
-  @defproc[((beginner-string-ith string-ith) [s string][i natural-number]) 1string?]{
-                                                                                     Extracts the @racket[i]th 1-letter substring from @racket[s].
-                                                                                                  @interaction[#:eval (bsl) (string-ith "hello world" 1)]
-                                                                                                  }
-  @defproc[((beginner-replicate replicate) [i natural-number][s string]) string]{
-                                                                                 Replicates @racket[s] @racket[i] times. 
-                                                                                            @interaction[#:eval (bsl) (replicate 3 "h")]
-                                                                                            }
-  @defproc[((beginner-int->string int->string) [i integer]) string]{
-                                                                    Converts an integer in [0,55295] or [57344 1114111] to a 1-letter string. 
-                                                                    @interaction[#:eval (bsl) (int->string 65)]
-                                                                    }
-  @defproc[((beginner-string->int string->int) [s string]) integer]{
-                                                                    Converts a 1-letter string to an integer in [0,55295] or [57344, 1114111]. 
-                                                                    @interaction[#:eval (bsl) (string->int "a")]
-                                                                    }
-  @defproc[((beginner-explode explode) [s string]) (listof string)]{
-                                                                    Translates a string into a list of 1-letter strings. 
-                                                                    @interaction[#:eval (bsl) (explode "cat")]
-                                                                    }
-  @defproc[((beginner-implode implode) [l list?]) string]{
-                                                          Concatenates the list of 1-letter strings into one string. 
-                                                          @interaction[#:eval (bsl) (implode (cons "c" (cons "a" (cons "t" empty))))]
-                                                          }
-  @defproc[((beginner-string-numeric? string-numeric?) [s string]) boolean?]{
-                                                                             Determines whether all 'letters' in the string are numeric. 
-                                                                             @interaction[#:eval (bsl) (string-numeric? "123") (string-numeric? "1-2i")]
-                                                                             }
-  @defproc[((beginner-string-alphabetic? string-alphabetic?) [s string]) boolean?]{
-                                                                                   Determines whether all 'letters' in the string are alphabetic. 
-                                                                                   @interaction[#:eval (bsl) (string-alphabetic? "123") (string-alphabetic? "cat")]
-                                                                                   }
-  @defproc[((beginner-string-whitespace? string-whitespace?) [s string]) boolean?]{
-                                                                                   Determines whether all 'letters' in the string are white space. 
-                                                                                   @interaction[#:eval (bsl) (string-whitespace? (string-append " " (string #\tab #\newline #\return)))]
-                                                                                   }
-  @defproc[((beginner-string-upper-case? string-upper-case?) [s string]) boolean?]{
-                                                                                   Determines whether all 'letters' in the string are upper case. 
-                                                                                   @interaction[#:eval (bsl) (string-upper-case? "CAT")]
-                                                                                   }
-  @defproc[((beginner-string-lower-case? string-lower-case?) [s string]) boolean?]{
-                                                                                   Determines whether all 'letters' in the string are lower case. 
-                                                                                   @interaction[#:eval (bsl) (string-lower-case? "CAT")]
-                                                                                   }
-  @defproc[((beginner-string-contains? string-contains?) [s string] [t string]) boolean?]{
-                                                                                          Determines whether the first string appears literally in the second one. 
-                                                                                          @interaction[#:eval (bsl) (string-contains? "at" "cat")]
-                                                                                          }
-  @defproc[(string [c char] ...) string?]{
-                                          Builds a string of the given characters. 
-                                          @interaction[#:eval (bsl) (string #\d #\o #\g)]
-                                          }
-  @defproc[(make-string [i natural-number][c char]) string]{
-                                                            Produces a string of length @racket[i] from @racket[c].
-                                                                                        @interaction[#:eval (bsl) (make-string 3 #\d)]
-                                                                                        }
-  @defproc[(string-ref [s string][i natural-number]) char]{
-                                                           Extracts the @racket[i]th character from @racket[s]. 
-                                                                        @interaction[#:eval (bsl) (string-ref "cat" 2)]
-                                                                        }
-  @defproc[(substring [s string][i natural-number][j natural-number]) string]{
-                                                                              Extracts the substring starting at @racket[i] up to @racket[j] (or the
-                                                                                                                 end if @racket[j] is not provided). 
-                                                                                                                 @interaction[#:eval (bsl) (substring "hello world" 1 5) (substring "hello world" 4)]
-                                                                                                                 }
-  @defproc[(string-copy [s string]) string]{
-                                            Copies a string. @;why is it included? 
-                                            @interaction[#:eval (bsl) (string-copy "hello")]
-                                            }
-  @defproc[(string-append [s string] ...) string]{
-                                                  Concatenates the characters of several strings. 
-                                                  @interaction[#:eval (bsl) (string-append "hello" " " "world" " " "good bye")]
-                                                  }
-  @defproc[(string=? [s string][t string][x string] ...) boolean?]{
-                                                                   Determines whether all strings are equal, character for character.
-                                                                   @interaction[#:eval (bsl) (string=? "hello" "world") (string=? "bye" "bye")]
-                                                                   }
-  @defproc[(string<? [s string][t string][x string] ...) boolean?]{
-                                                                   Determines whether the strings are ordered in a lexicographically strictly increasing manner.
-                                                                   @interaction[#:eval (bsl) (string<? "hello" "world" "zoo")]
-                                                                   }
-  @defproc[(string>? [s string][t string][x string] ...) boolean?]{
-                                                                   Determines whether the strings are ordered in a lexicographically strictly decreasing manner.
-                                                                   @interaction[#:eval (bsl) (string>?  "zoo" "world" "hello")]
-                                                                   }
-  @defproc[(string<=? [s string][t string][x string] ...) boolean?]{
-                                                                    Determines whether the strings are ordered in a lexicographically increasing manner.
-                                                                    @interaction[#:eval (bsl) (string<=? "hello" "hello" "world" "zoo")]
-                                                                    }
-  @defproc[(string>=? [s string][t string][x string] ...) boolean?]{
-                                                                    Determines whether the strings are ordered in a lexicographically decreasing manner.
-                                                                    @interaction[#:eval (bsl) (string>=?  "zoo" "zoo" "world" "hello")]
-                                                                    }
-  @defproc[(string-ci=?  [s string][t string][x string] ...) boolean?]{
-                                                                       Determines whether all strings are equal, character for character, regardless of case. 
-                                                                       @interaction[#:eval (bsl) (string-ci=?  "hello" "HellO")]
-                                                                       }
-  @defproc[(string-ci<?  [s string][t string][x string] ...) boolean?]{
-                                                                       Determines whether the strings are ordered in a lexicographically strictly increasing and case-insensitive manner.
-                                                                       @interaction[#:eval (bsl) (string-ci<? "hello" "WORLD" "zoo")]
-                                                                       }
-  @defproc[(string-ci>?  [s string][t string][x string] ...) boolean?]{
-                                                                       Determines whether the strings are ordered in a lexicographically strictly decreasing and case-insensitive manner.
-                                                                       @interaction[#:eval (bsl) (string-ci>?  "zoo" "WORLD" "hello")]
-                                                                       }
-  @defproc[(string-ci<=? [s string][t string][x string] ...) boolean?]{
-                                                                       Determines whether the strings are ordered in a lexicographically increasing and case-insensitive manner. 
-                                                                       @interaction[#:eval (bsl) (string-ci<=? "hello" "WORLD" "zoo")]
-                                                                       }
-  @defproc[(string-ci>=? [s string][t string][x string] ...) boolean?]{
-                                                                       Determines whether the strings are ordered in a lexicographically decreasing and case-insensitive manner.
-                                                                       @interaction[#:eval (bsl) (string-ci>?  "zoo" "WORLD" "hello")]
-                                                                       }
-  @defproc[(string->symbol [s string]) symbol]{
-                                               Converts a string into a symbol. 
-                                               @interaction[#:eval (bsl) (string->symbol "hello")]
-                                               }
-  @defproc[(string->number [s string]) (union number false)]{
-                                                             Converts a string into a number, produce false if impossible. 
-                                                             @interaction[#:eval (bsl) (string->number "-2.03") (string->number "1-2i")]
-                                                             }
-  @defproc[(string->list [s string]) (listof char)]{
-                                                    Converts a string into a list of characters. 
-                                                    @interaction[#:eval (bsl) (string->list "hello")]
-                                                    }
-  @defproc[(list->string [l list?]) string]{
-                                            Converts a s list of characters into a string. 
-                                            @interaction[#:eval (bsl) (list->string (cons #\c (cons #\a (cons #\t empty))))]
-                                            }
-  @defproc[(format [f string] [x any/c] ...) string]{
-                                                     Formats a string, possibly embedding values. 
-                                                     @interaction[#:eval (bsl)
-                                                                         (format "Dear Dr. ~a:" "Flatt")
-                                                                         (format "Dear Dr. ~s:" "Flatt")
-                                                                         (format "the value of ~s is ~a" '(+ 1 1) (+ 1 1))
-                                                                         ]
-                                                     })
- 
- ("Images"
-  @defproc[(image? [x any/c]) boolean?]{
-                                        Determines whether a value is an image. 
-                                        @interaction[#:eval (bsl) c1 (image? c1)]
-                                        }
-  @defproc[(image=? [i image][j image]) boolean?]{
-                                                  Determines whether two images are equal. 
-                                                  @interaction[#:eval (bsl) c1 (image=? (circle 5 "solid" "green") c1) (image=? (circle 10 "solid" "green") c1)]
-                                                  })
- 
- ("Misc"
-  @defproc[(identity [x any/c]) any]{
-                                     Returns @racket[x].
-                                             @interaction[#:eval (bsl) (identity 42) (identity c1)  (identity "hello")]
-                                             }
-  @defproc[((beginner-error error) [x any/c] ...) void?]{
-                                                         Signals an error, combining the given values
-                                                         into an error message. If any of the values' 
-                                                         printed representations is too long, it is
-                                                         truncated and ``...'' is put into the string.
-                                                         If the first value is a symbol, it is suffixed with a colon and the
-                                                         result pre-pended on to the error message. 
-                                                         @interaction[#:eval (bsl) zero (if (= zero 0) (error "can't divide by 0") (/ 1 zero))]
-                                                         }
-  @defproc[((beginner-struct? struct?) [x any/c]) boolean?]{
-                                                            Determines whether some value is a structure. 
-                                                            @interaction[#:eval (bsl) (struct? (make-posn 1 2)) (struct? 43)]
-                                                            }
-  @defproc[((beginner-equal? equal?) [x any/c][y any/c]) boolean?]{
-                                                                   Determines whether two values are structurally equal where basic values
-                                                                   are compared with the eqv? predicate. 
-                                                                   @interaction[#:eval (bsl) (equal? (make-posn 1 2) (make-posn (- 2 1) (+ 1 1)))]
-                                                                   }
-  @defproc[(eq? [x any/c][y any/c]) boolean?]{
-                                              Determines whether two values are equivalent from the computer's perspective (intensional). 
-                                              @interaction[#:eval (bsl) (eq? (cons 1 empty) (cons 1 empty)) one (eq? one one)]
-                                              }
-  @defproc[(eqv? [x any/c][y any/c]) boolean?]{
-                                               Determines whether two values are equivalent from the perspective of all functions that can be applied to it (extensional). 
-                                               @interaction[#:eval (bsl) (eqv? (cons 1 empty) (cons 1 empty)) one (eqv? one one)]
-                                               }
-  @defproc[((beginner-=~ =~) [x number][y number][z non-negative-real]) boolean?]{
-                                                                                  Checks whether @racket[x] and @racket[y] are within @racket[z] of either other. 
-                                                                                                 @interaction[#:eval (bsl) (=~ 1.01 1.0 .1) (=~ 1.01 1.5 .1)]
-                                                                                                 }
-  @defproc[((beginner-equal~? equal~?) [x any/c][y any/c][z non-negative-real]) boolean?]{
-                                                                                          Compares @racket[x] and @racket[y] like @racket[equal?] but uses =~ in the case of numbers. 
-                                                                                                   @interaction[#:eval (bsl) (equal~? (make-posn 1.01 1.0) (make-posn 1.01 .99) .2)]
-                                                                                                   }
-  @defthing[eof eof-object?]{A value that represents the end of a file: 
-                              @interaction[#:eval (bsl) eof]
-                              }
-  @defproc[(eof-object? [x any/c]) boolean?]{
-                                             Determines whether some value is the end-of-file value. 
-                                             @interaction[#:eval (bsl) (eof-object? eof) (eof-object? 42)]
-                                             }
-  @defproc[((beginner-exit exit)) void]{
-                                        Evaluating @racket[(exit)] terminates the running program. 
-                                                   }))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/continuation-mark-key.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/continuation-mark-key.rkt
deleted file mode 100644
index ff3ec8a942..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/continuation-mark-key.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang scheme/base
-
-(provide teaching-languages-continuation-mark-key)
-
-; The test code also needs access to this.
-
-;; cm-key : symbol
-;; the key used to put information on the continuation
-(define teaching-languages-continuation-mark-key (gensym 'teaching-languages-continuation-mark-key))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/create-htdp-executable.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/create-htdp-executable.rkt
deleted file mode 100644
index a3a9a77d04..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/create-htdp-executable.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang racket/base
-(require compiler/embed
-         wxme/wxme)
-(provide create-htdp-lang-executable
-         cannot-compile?)
-
-(define oprintf
-  (let ([o (current-output-port)])
-    (λ args
-      (apply fprintf o args))))
-
-(define (create-htdp-lang-executable program-filename exe-name reader-module)
-  (create-embedding-executable 
-   exe-name
-   #:modules `((#f ,reader-module)
-               (#f (lib "wxme/read.ss"))
-               (#f (lib "mred/mred.ss"))
-               (#f racket/gui/init)
-               (#f ,program-filename))
-   #:configure-via-first-module? #t
-   #:cmdline `("-l"
-               "racket/base"
-               "-e"
-               ,(format "~s" `(#%require ',(filename->require-symbol program-filename))))
-   #:src-filter
-   (λ (path) (cannot-compile? path))
-   #:get-extra-imports
-   (λ (path cm)
-     (call-with-input-file path
-       (λ (port)
-         (cond
-           [(is-wxme-stream? port)
-            ;; Extract snip-related modules:
-            (define-values (snip-class-names data-class-names)
-              (extract-used-classes port))
-            (define used-mods (append snip-class-names data-class-names))
-              (append
-               (filter values (map (λ (x) (string->lib-path x #t)) used-mods))
-               (filter values (map (λ (x) (string->lib-path x #f)) used-mods))
-               ;; Extract reader-related modules:
-               (begin
-                 (file-position port 0)
-                 (let ([mods null])
-                   (parameterize ([current-reader-guard
-                                   (let ([g (current-reader-guard)])
-                                     (lambda (p)
-                                       (set! mods (cons p mods))
-                                       (g p)))])
-                     (read-language (wxme-port->port port) (lambda () #f)))
-                   mods)))]
-           [else
-            '()]))))
-   #:mred? #t))
-
-(define (filename->require-symbol fn)
-  (let-values ([(base name dir) (split-path fn)])
-    (string->symbol
-     (path->string
-      (path-replace-suffix name #"")))))
-
-;; cannot-compile? : path -> boolean
-;; returns #t if the file cannot be compiled, #f otherwise
-(define (cannot-compile? path)
-  (call-with-input-file path
-    (λ (port) 
-      (let ([ok-to-compile-names 
-             (map (λ (x) (format "~s" x))
-                  '(wxtext
-                    (lib "comment-snip.ss" "framework")
-                    (lib "xml-snipclass.ss" "xml")
-                    (lib "scheme-snipclass.ss" "xml")))])
-        (and (is-wxme-stream? port)
-             (let-values ([(snip-class-names data-class-names)
-                           (extract-used-classes port)])
-               (not (and (andmap
-                          (λ (used-name) (member used-name ok-to-compile-names))
-                          snip-class-names)
-                         (andmap
-                          (λ (used-name) (member used-name ok-to-compile-names))
-                          data-class-names)))))))))
-
-
-
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/firstorder.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/firstorder.rkt
deleted file mode 100644
index 96f3ff0682..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/firstorder.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-(module firstorder mzscheme
-  (require racket/struct-info)
-  (provide make-first-order
-           make-first-order+struct
-           first-order->higher-order
-           fo+struct?
-           fo?)
-  
-  (define (fo-either? x) (or (fo? x) (fo+struct? x)))
-  (define (fo-either-proc-id x)
-    (if (fo? x)
-        (fo-proc-id x)
-        (fo+struct-proc-id x)))
-  
-  (define-values (struct:fo make-first-order fo? fo-get fo-set!)
-    (make-struct-type 'procedure #f 2 0 #f null (current-inspector) 0))
-  
-  (define-values (struct:fo+struct make-first-order+struct fo+struct? fo+struct-get fo+struct-set!)
-    (let ()
-      (define props (list (cons prop:struct-info (λ (s) (fo+struct-get s 2)))))
-      (make-struct-type 'procedure #f 3 0 #f props (current-inspector) 0)))
-  
-  (define fo-proc-id (make-struct-field-accessor fo-get 1))
-  (define fo+struct-proc-id (make-struct-field-accessor fo+struct-get 1))
-  
-  (define (first-order->higher-order id)
-    (let ([v (syntax-local-value id (lambda () #f))])
-      (if (or (fo-either? v)
-              (and (set!-transformer? v)
-                   (fo-either? (set!-transformer-procedure v))))
-          (syntax-property
-           (syntax-local-introduce 
-            (fo-either-proc-id (if (fo-either? v) v (set!-transformer-procedure v))))
-           'disappeared-use
-           (syntax-local-introduce id))
-          id))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/imageeq.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/imageeq.rkt
deleted file mode 100644
index 5f617ad479..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/imageeq.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-(require racket/snip
-         mrlib/cache-image-snip
-         (prefix-in 2htdp/image: mrlib/image-core)
-         racket/class)
-
-(provide scene? image? image=? 
-         coerce-to-cache-image-snip
-         snip-size
-         bitmaps->cache-image-snip)
-
-(define (image? a)
-  (or (is-a? a image-snip%)
-      (is-a? a cache-image-snip%)))
-
-(define (image=? a-raw b-raw)
-  (unless (or (2htdp/image:image? a-raw) (image? a-raw)) (raise-type-error 'image=? "image" 0 a-raw b-raw))
-  (unless (or (2htdp/image:image? b-raw) (image? b-raw)) (raise-type-error 'image=? "image" 1 a-raw b-raw))
-  ;; Rely on image-snip% implementing equal<%>:
-  (equal? a-raw b-raw))
-
-(define (scene? i)
-  (and (image? i)
-       (let-values ([(x y) (send (coerce-to-cache-image-snip i) get-pinhole)])
-         (and (= 0 x)
-              (= 0 y)))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/intermediate-funs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/intermediate-funs.rkt
deleted file mode 100644
index 1e7a77307f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/intermediate-funs.rkt
+++ /dev/null
@@ -1,199 +0,0 @@
-#lang at-exp scheme/base
-
-(require "teachprims.rkt" "and-or-map.rkt"
-         mzlib/etc
-         (only-in racket/list argmin argmax)
-         syntax/docprovide
-         (for-syntax scheme/base))
-
-;; Documents the procedures:
-(require "provide-and-scribble.rkt")
-
-(provide-and-scribble
-  procedures
-
-  (begin
-    (require scribble/manual scribble/eval "sl-eval.rkt")
-    (define (isl)
-      (define *bsl
-        (isl+-eval
-         ; (require 2htdp/image)
-         (define i 3)
-         (define a-list '(0 1 2 3 4 5 6 7 8 9))
-         (define threshold 3)))
-      (set! isl (lambda () *bsl))
-      *bsl))
-
-  (all-from-except beginner: (submod lang/private/beginner-funs without-wrapper) procedures + * / append) 
- 
-  ("Numbers (relaxed conditions)"
-    @defproc[(+ [x number] ...) number]{
-    Adds all given numbers.
-    In ISL and up: @racket[+] works when applied to only one number or none. 
-    @interaction[#:eval (isl) (+ 2/3 1/16) (+ 3 2 5 8) (+ 1) (+)]
-    }
-    @defproc[(* [x number] ...) number]{
-    Multiplies all given numbers.
-    In ISL and up: @racket[*] works when applied to only one number or none. 
-    @interaction[#:eval (isl) (* 5 3) (* 5 3 2) (* 2) (*)]
-    }
-    @defproc[(/ [x number] [y number] ...) number]{
-    Divides the first by all remaining numbers.
-    In ISL and up: @racket[/] computes the inverse when applied to only one number. 
-    @interaction[#:eval (isl) (/ 12 2) (/ 12 2 3) (/ 3)]
-    }
-    )
- 
-  ; ("Posn" )
-
-  ("Lists"
-    @defproc[((intermediate-append append) [l (listof any)] ...) (listof any)]{
-    Creates a single list from several, by concatenation of the items.
-    In ISL and up: @racket[append] also works when applied to one list or none. 
-    @interaction[#:eval (isl)
-		  (append (cons 1 (cons 2 empty)) (cons "a" (cons "b" empty)))
-		  (append)]}
-    @defproc[((beginner-list? list?) [x any]) boolean?]{
-    Checks whether the given value is a list.
-    @interaction[#:eval (isl)
-		  (list? 42)
-		  (list? (cons 1 (cons 2 empty)))]}
-)
- 
-  ("Higher-Order Functions"
-    @defproc[(map [f (X ... -> Z)] [l (listof X)] ...) (listof Z)]{
-    Constructs a new list by applying a function to each item on one or more existing lists:
-    @codeblock{(map f (list x-1 ... x-n)) = (list (f x-1) ... (f x-n))}
-    @interaction[#:eval (isl) 
-		  (map add1 '(3 -4.01 2/5)) 
-		  (map (lambda (x) (list 'my-list (+ x 1))) '(3 -4.01 2/5))]
-    }
-    @defproc[(for-each [f (any ... -> any)] [l (listof any)] ...) void?]{
-    Applies a function to each item on one or more lists for effect only:
-    @codeblock{(for-each f (list x-1 ... x-n)) = (begin (f x-1) ... (f x-n))}
-    @interaction[#:eval (asl-eval)
-		  (for-each (lambda (x) (begin (display x) (newline))) '(1 2 3))
-		  ]
-    }
-    @defproc[((intermediate-filter filter) [p? (X -> boolean)] [l (listof X)]) (listof X)]{
-    Constructs a list from all those items on a list for which the predicate holds.
-    @interaction[#:eval (isl)
-		  (filter odd? '(0 1 2 3 4 5 6 7 8 9))
-		  threshold
-		  (filter (lambda (x) (>= x threshold)) '(0 1 2 3 4 5 6 7 8 9))
-		  ]
-    }
-    @defproc[((intermediate-foldr foldr) [f (X Y -> Y)] [base Y] [l (listof X)]) Y]{
-    @codeblock{(foldr f base (list x-1 ... x-n)) = (f x-1 ... (f x-n base))}
-    @interaction[#:eval (isl)
-		  (foldr + 0 '(0 1 2 3 4 5 6 7 8 9))
-		  a-list
-		  (foldr (lambda (x r) (if (> x threshold) (cons (* 2 x) r) r)) '() a-list)
-		  ]
-    }
-    @defproc[((intermediate-foldl foldl) [f (X Y -> Y)] [base Y] [l (listof X)]) Y]{
-    @codeblock{(foldl f base (list x-1 ... x-n)) = (f x-n ... (f x-1 base))}
-    @interaction[#:eval (isl)
-		  (foldl + 0 '(0 1 2 3 4 5 6 7 8 9))
-		  a-list
-		  (foldl (lambda (x r) (if (> x threshold) (cons (* 2 x) r) r)) '() a-list)
-		  ]
-    }
-    @defproc[(build-list [n nat] [f (nat -> X)]) (listof X)]{
-    Constructs a list by applying @racket[f] to the numbers between @racket[0] and @racket[(- n 1)]:
-    @codeblock{(build-list n f) = (list (f 0) ... (f (- n 1)))}
-    @interaction[#:eval (isl)
-		  (build-list 22 add1)
-		  i
-		  (build-list 3 (lambda (j) (+ j i)))
-		  (build-list 5
-		    (lambda (i)
-		      (build-list 5
-			(lambda (j)
-			  (if (= i j) 1 0)))))
-		  ]
-    }
-    @defproc[((intermediate-build-string build-string) [n nat] [f (nat -> char)]) string]{
-    Constructs a string by applying @racket[f] to the numbers between @racket[0] and @racket[(- n 1)]: 
-    @codeblock{(build-string n f) = (string (f 0) ... (f (- n 1)))}
-    @interaction[#:eval (isl)
-		  (build-string 10 integer->char)
-		  (build-string 26 (lambda (x) (integer->char (+ 65 x))))]
-    }
-    @defproc[((intermediate-quicksort quicksort) [l (listof X)] [comp (X X -> boolean)]) (listof X)]{
-    Sorts the items on @racket[l], in an order according to @racket[comp] (using the quicksort algorithm).
-    @interaction[#:eval (isl)
-		  (quicksort '(6 7 2 1 3 4 0 5 9 8) <)]
-    }
-    @defproc[((intermediate-sort sort) [l (listof X)] [comp (X X -> boolean)]) (listof X)]{
-    Sorts the items on @racket[l], in an order according to @racket[comp].
-    @interaction[#:eval (isl)
-		  (sort '(6 7 2 1 3 4 0 5 9 8) <)]
-    }
-    @defproc[((intermediate-andmap andmap) [p? (X -> boolean)] [l (listof X)]) boolean]{
-    Determines whether @racket[p?] holds for all items of @racket[l]:
-    @codeblock{(andmap p (list x-1 ... x-n)) = (and (p x-1) ... (p x-n))}
-    @interaction[#:eval (isl)
-		  (andmap odd? '(1 3 5 7 9))
-		  threshold 
-		  (andmap (lambda (x) (< x threshold)) '(0 1 2))
-		  (andmap even? '())
-		  ]
-    }
-    @defproc[((intermediate-ormap ormap)   [p? (X -> boolean)] [l (listof X)]) boolean]{
-    Determines whether @racket[p?] holds for at least one items of @racket[l]:
-    @codeblock{(ormap p (list x-1 ... x-n)) = (or (p x-1) ... (p x-n))}
-    @interaction[#:eval (isl)
-		  (ormap odd? '(1 3 5 7 9))
-		  threshold 
-		  (ormap (lambda (x) (< x threshold)) '(6 7 8 1 5))
-		  (ormap even? '())
-		  ]
-    }
-    @defproc[(argmin [f (X -> real)] [l (listof X)]) X]{
-    Finds the (first) element of the list that minimizes the output of the function.
-    @interaction[#:eval (isl)
-		  (argmin second '((sam 98) (carl 78) (vincent 93) (asumu 99)))
-		  ]
-    }
-    @defproc[(argmax [f (X -> real)] [l (listof X)]) X]{
-    Finds the (first) element of the list that maximizes the output of the function.
-    @interaction[#:eval (isl)
-		  (argmax second '((sam 98) (carl 78) (vincent 93) (asumu 99)))
-		  ]
-    }
-    @defproc[(memf [p? (X -> any)] [l (listof X)]) (union false (listof X))]{
-    Produces @racket[false] if @racket[p?] produces @racket[false] for all
-    items on @racket[l]. If @racket[p?] produces @racket[true] for any of
-    the items on @racket[l], @racket[memf] returns the sub-list starting
-    from that item.
-    @interaction[#:eval (isl)
-		  (memf odd? '(2 4 6 3 8 0))
-		  ]
-    } 
-    @defproc[(apply [f (X-1 ... X-N -> Y)] [x-1 X-1] ... [l (list X-i+1 ... X-N)]) Y]{
-    Applies a function using items from a list as the arguments:
-    @codeblock{(apply f (list x-1 ... x-n)) = (f x-1 ... x-n)}
-    @interaction[#:eval (isl)
-		  a-list
-		  (apply max a-list)
-		  ]
-    }
-    @defproc[(compose [f (Y -> Z)] [g (X -> Y)]) (X -> Z)]{
-    Composes a sequence of procedures into a single procedure:
-    @codeblock{(compose f g) = (lambda (x) (f (g x)))}
-    @interaction[#:eval (isl)
-		  ((compose add1 second) '(add 3))
-		  (map (compose add1 second) '((add 3) (sub 2) (mul 4)))
-		  ]
-    }
-    @defproc[(procedure? [x any]) boolean?]{
-    Produces true if the value is a procedure.
-    @interaction[#:eval (isl)
-		  (procedure? cons)
-		  (procedure? add1) 
-		  (procedure? (lambda (x) (> x 22)))
-		  ]
-    }
-    )
-  )
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/provide-and-scribble.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/provide-and-scribble.rkt
deleted file mode 100644
index 95112f0a94..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/provide-and-scribble.rkt
+++ /dev/null
@@ -1,230 +0,0 @@
-#lang at-exp racket
-
-#|
-FIX THESE: 
-
-0. close 10498; ok
-
-1. the links within documentations don't work
-   example: see list? in Advanced; 
-   example: printing is pre-determined via the eval in the doc file 
-   Robby suggests using a macro to generate documentation and to expand it
-   in the context where the documentation is placed 
-
-2. need to expand the allowed scribble entries to 
-     defthing for e, pi, null, and eof in Beginner (and possibly elsewhere). done 
-     it feels a bit kludgey and needs changes in two files, but I don't have time 
-     to think about it more. 
-
-     still to do: 
-     defproc* for case-> in Advanced 
-     rewrite the case-> based things in Advanced 
-
-3. Fix up how primitives are "overwritten" in Advanced and friends 
-
-4. clean up primitive functions:
-   list? in Intermediate, others like that 
-   possibly legacy issues: 
-     why do we need eof or eof-object? in Beginner
-     why do we need eq? in Beginner
-
-tests to run: 
- collects/tests/htdp-lang/
-|#
-
-(require (for-syntax syntax/parse))
-
-(require racket/provide)
-
-(provide 
- provide-and-scribble 
- (for-syntax extract-names)
- all-from all-from-except defproc)
-
-;; ---------------------------------------------------------------------------------------------------
-
-(define-for-syntax *add #f)
-
-(define-for-syntax (provide-and-scribble-only stx)
-  (raise-syntax-error #f "use with provide-and-scribble only" stx))
-(define-syntax all-from provide-and-scribble-only)
-(define-syntax all-from-except provide-and-scribble-only)
-(define-syntax defproc provide-and-scribble-only)
-(define-syntax defthing provide-and-scribble-only)
-
-(define-syntax (provide-and-scribble stx)
-  (syntax-parse stx #:literals ()
-    [(provide-and-scribble doc-tag:id requires rows ...)
-     (provide-and-scribble-proc #'requires #'doc-tag #'(rows ...))]))
-
-(define-for-syntax (provide-and-scribble-proc requires doc-tag row*)
-  (define-values (add-docs-and-provide provides)
-    (for/fold ((add-docs-and-provide '()) (provides '())) ((row (syntax->list row*)))
-      (syntax-parse row #:literals (defproc all-from all-from-except)
-        [(all-from-except tag:id path label:id f:id ...)
-         (define-values (a p) (provide-all-from #'path #'label #'tag #'(f ...)))
-         (values (cons a add-docs-and-provide) (append (syntax->list p) provides))]
-        [(all-from tag:id path label:id)
-         (define-values (a p) (provide-all-from #'path #'label #'tag #'()))
-         (values (cons a add-docs-and-provide) (append (syntax->list p) provides))]
-        [(title df ...)
-         (define name* (extract-names (syntax->list #'(df ...))))
-         (define exnm* (extract-external-name name*))
-         (define defs* (rewrite-defs (syntax->list #'(df ...)) exnm*))
-         (values (cons (lambda ()  ;; delay the syntax creation until add-sections is set
-                         (with-syntax ([(ex ...) exnm*]
-                                       [(df ...) defs*])
-                           #`(#,*add title (list (cons #'ex df) ...))))
-                       add-docs-and-provide)
-                 (cons #`(provide #,@(optional-rename-out name*))
-                       provides))])))
-  (provide-and-scribble-code requires doc-tag add-docs-and-provide provides))
-
-;; (U defproc defthing) -> [Listof (U (Id Id) Id)]
-;; extract names from documented definitions in section 
-(define-for-syntax (extract-names defs)
-  (map (λ (d)
-         (syntax-case d ()
-           [(defproc (name args ...) range w ...) #'name]
-           [(defthing name stuff ...) #'name]))
-       defs))
-
-;; (U defproc defthing) -> [Listof Syntax]
-;; get documented definitions in section ready (parameterized over context)
-(define-for-syntax (rewrite-defs defs names)
-  (define (rewrite-one-def d n)
-    (syntax-case d ()
-      [(defproc (name args ...) range w ...)
-       (with-syntax ([ex n])
-         #'(lambda (c)
-             (defproc #:id [ex (datum->syntax c 'ex)]
-               (ex args ...) range w ...)))]
-      [(defthing name range w ...)
-       #'(lambda (c) (defthing #:id (datum->syntax c 'name) name range w ...))]))
-  (map rewrite-one-def defs names))
-
-
-;; Path Identifier Identifier [Listof Identifier] ->* [-> Syntax] Syntax[List]
-;; create the require and provide clauses AND
-;; delayed code for merging documentations from path -> label into the 'documentation' doc-tag submod
-(define-for-syntax (provide-all-from path label prefix f*)
-  (with-syntax ([path (syntax-case path (submod)
-                        [(submod nested-path nested-tag) #'nested-path]
-                        [_ path])]
-                [(nested-tag ...)
-                 (syntax-case path (submod)
-                   [(submod nested-path nested-tag ...) #'(nested-tag ...)]
-                   [_ #'()])]
-                [label label]
-                [prefix prefix]
-                [(f ...) (syntax->list f*)]
-                [mydocs (gensym 'mydocs)])
-    (values (lambda ()  ;; delay the syntax creation until add-sections is set
-              ;; ******************************************************************
-              ;; I was really hoping to make 
-              ;;   (local-require (only-in (submod path nested-tag ... label) (docs mydocs)))
-              ;; to work but that gave me problems about 'docs' already required before
-              ;; so I went with dynamic-require. Argh. 
-              ;; ******************************************************************
-              #`(for ((s ((dynamic-require '(submod path nested-tag ... label) 'docs) #'f ...)))
-                  (#,*add (car s) (cadr s))))
-            #`(;; import from path with prefix, exclude f ...
-               (require (prefix-in prefix (except-in (submod path nested-tag ...) f ...)))
-               ;; export the bindings without prefix 
-               ; (local-require (only-in racket/provide filtered-out))
-               (provide (filtered-out (lambda (name)
-                                        (define prefix (format "^~a" (syntax-e #'prefix)))
-                                        (and (regexp-match? prefix name)
-                                             (regexp-replace prefix name "")))
-                                      (all-from-out (submod path nested-tag ...))))))))
-
-;; Identifier [Listof [-> Syntax]] [Listof Syntax] -> Syntax 
-;; generate (module+ doc-tag ...) with the documentation in add-docs-and-provide, 
-;; the first time it adds functions to (module+ doc-tag ...) that help render the docs
-;; export the provides list 
-(define-for-syntax (provide-and-scribble-code requires doc-tag add-docs-and-provide provides)
-  (with-syntax ([(p* ...) (reverse provides)])
-    (cond 
-      [*add #`(begin p* ... (module+ #,doc-tag #,@(map (lambda (adp) (adp)) (reverse add-docs-and-provide))))]
-      [else
-       (set! *add (syntax-local-introduce #'add-sections))
-       #`(begin (module+ #,doc-tag 
-                         (require scribble/manual)
-                         #,requires
-                         ;; -----------------------------------------------------------------------
-                         ;; Section  = [Listof (cons Identifier Doc)]
-                         ;; Sections = [Listof (list Title Section)]
-                         (provide 
-                          ;; Identfier ... *-> Sections 
-                          ;; retrieve the document without the specified identfiers
-                          docs
-                          
-                          ;; Sections String -> [Listof ScribbleBox]
-                          ;; render the sections as a scribble list of splice-boxes: #:tag-prefix p
-                          render-sections)
-                         ;; -----------------------------------------------------------------------
-                         ;;
-                         
-                         (define (render-sections s c p)
-                           (let render-sections ([s s])
-                             (cond
-                               [(null? s) '()]
-                               [else 
-                                (define section1 (car s))
-                                (define others (render-sections (cdr s)))
-                                (define-values (section-title stuff) (apply values section1))
-                                (define sorted 
-                                  (sort stuff string<=? #:key (compose symbol->string syntax-e car)))
-                                (define typed (for/list ((s sorted)) (re-context c (car s) (cdr s))))
-                                (cons @section[#:tag-prefix p]{@section-title}
-                                      (cons typed others))])))
-                         
-                         (define (re-context c id defproc)
-                           (defproc c))
-                         
-                         ;;
-                         (define (docs . exceptions)
-                           (define (is-exception i)
-                             (memf (lambda (j) (eq? (syntax-e j) (syntax-e i))) exceptions))
-                           (for/list ((s *sections))
-                             (define sectn (second s))
-                             (define clean (filter (lambda (i) (not (is-exception (car i)))) sectn))
-                              (list (first s) clean)))
-                         ;; 
-                         ;; state variable: Sections
-                         (define *sections '())
-                         ;; String Section -> Void 
-                         ;; add _scontent_ section to *sections in the doc submodule 
-                         (define (#,*add stitle scontent)
-                           (define exists #f)
-                           (define sections
-                             (for/list ((s *sections))
-                               (cond
-                                 [(string=? (first s) stitle) 
-                                  (set! exists #t)
-                                  (list stitle (append (second s) scontent))]
-                                 [else s])))
-                           (if exists
-                               (set! *sections sections)
-                               (set! *sections (append sections (list (list stitle scontent))))))
-                         
-                         #,@(map (lambda (adp) (adp)) (reverse add-docs-and-provide)))
-                p* ...)])))
-
-;; [Listof (u Identifier (Identifier Identifier))] -> [Listof Identifier]
-(define-for-syntax (extract-external-name lon)
-  (map (lambda (name-or-pair)
-         (syntax-parse name-or-pair 
-           [(internal:id external:id) #'external]
-           [name:id #'name]))
-       lon))
-
-;; [Listof (u Identifier (Identifier Identifier))] -> [Listof Identifier]
-;; create rename-out qualifications as needed
-(define-for-syntax (optional-rename-out lon)
-  (map (lambda (name-or-pair)
-         (syntax-parse name-or-pair 
-           [(internal:id external:id) #'(rename-out (internal external))]
-           [name:id #'name]))
-       lon))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/rewrite-error-message.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/rewrite-error-message.rkt
deleted file mode 100644
index 5ad87209eb..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/rewrite-error-message.rkt
+++ /dev/null
@@ -1,153 +0,0 @@
-#lang scheme/base
-
-(require mzlib/etc
-         mzlib/list
-         (for-syntax "firstorder.rkt"
-                     scheme/base))
-
-(provide rewrite-contract-error-message
-         reraise-rewriten-lookup-error-message
-         get-rewriten-error-message
-         plural
-         raise-not-bound-error
-         argcount-error-message)
-
-(define (reraise-rewriten-lookup-error-message e id was-in-app-position)
-  (let ([var-or-function (if was-in-app-position "function" "variable")])
-    (raise-syntax-error
-     #f
-     (format "this ~a is not defined" var-or-function)
-     id)))
-
-(define (exn-needs-rewriting? exn)
-  (exn:fail:contract? exn))
-
-(define (ensure-number n-or-str)
-  (if (string? n-or-str) (string->number n-or-str) n-or-str))
-
-(define (plural n)
-  (if (> (ensure-number n) 1) "s" ""))
-
-(define (raise-not-bound-error id)
-  (if (syntax-property id 'was-in-app-position)
-      (raise-syntax-error
-       #f
-       "this function is not defined"
-       id)
-      (raise-syntax-error
-       #f
-       "this variable is not defined"
-       id)))
-
-(define (argcount-error-message name arity found [at-least #f])
-  (define arity:n (ensure-number arity))
-  (define found:n (ensure-number found))
-  (define fn-is-large (> arity:n found:n))
-  (format "~a~aexpects ~a~a~a argument~a, but found ~a~a"
-          (or name "") (if name ": " "")
-          (if at-least "at least " "")
-          (if (or (= arity:n 0) fn-is-large) "" "only ")
-          (if (= arity:n 0) "no" arity:n) (plural arity:n)
-          (if (and (not (= found:n 0)) fn-is-large) "only " "")
-          (if (= found:n 0) "none" found:n)))
-
-(define (format-enum conj l)
-  (if (= (length l) 2)
-      (format "~a ~a ~a" (car l) conj (cadr l))
-      (apply string-append
-             (let loop ([l l])
-               (cond
-                [(null? (cdr l)) l]
-                [(null? (cddr l))
-                 (list* (car l) ", " conj " " (loop (cdr l)))]
-                [else
-                 (list* (car l) ", " (loop (cdr l)))])))))
-
-(define (contract-to-desc ctc)
-  (with-handlers ([exn:fail:read? (lambda (exn) ctc)])
-    (define s (read (open-input-string ctc)))
-    (let loop ([s s])
-      (cond
-       [(not s) "false"]
-       [(and (symbol? s) (regexp-match? #rx"[?]$" (symbol->string s)))
-        (define str (symbol->string s))
-        (format "a~a ~a"
-                (if (and ((string-length str) . > . 0)
-                         (memv (string-ref str 0) '(#\a #\e #\i #\o #\u)))
-                    "n"
-                    "")
-                (substring str 0 (sub1 (string-length str))))]
-       [(null? s) "an impossible value"]
-       [(not (list? s)) ctc] ;; ???
-       [(eq? 'or/c (car s))
-        (format-enum "or" (map loop (cdr s)))]
-       [(eq? 'and/c (car s))
-        (string-append "a value that is " (format-enum "and" (map loop (cdr s))))]
-       [(eq? 'not/c (car s))
-        (format "a value that is not ~a" (loop (cadr s)))]
-       [(and (eq? '>/c (car s)) (zero? (cadr s)))
-        "a positive number"]
-       [(and (eq? '</c (car s)) (zero? (cadr s)))
-        "a negative number"]
-       [(and (eq? '>=/c (car s)) (zero? (cadr s)))
-        "a non-negative number"]
-       [else ctc]))))
-
-(define (contract-error-message ctc given pos)
-  (define d (contract-to-desc ctc))
-  (format "expects ~a~a~a~a, given ~a"
-          d
-          (if pos " as " "")
-          (or pos "")
-          (if pos " argument" "")
-          given))
-
-(define (rewrite-contract-error-message msg)
-  (define replacements
-    (list (list #rx"application: not a procedure;\n [^\n]*?\n  given: ([^\n]*)(?:\n  arguments[.][.][.]:(?: [[]none[]]|(?:\n   [^\n]*)*))?"
-                (lambda (all one)
-                  (format "function call: expected a function after the open parenthesis, but received ~a" one)))
-          (list #rx"([^\n]*): undefined;\n cannot reference an identifier before its definition"
-                (lambda (all one) (format "~a is used here before its definition" one)))
-          (list #rx"expects argument of type (<([^>]+)>)"
-                (lambda (all one two) (format "expects a ~a" two)))
-          (list #rx"expected argument of type (<([^>]+)>)"
-                (lambda (all one two) (format "expects a ~a" two)))
-          (list #rx"expects type (<([^>]+)>)"
-                (lambda (all one two) (format "expects a ~a" two)))
-          (list #px"([^\n]*): arity mismatch;\n[^\n]*\n  expected[^:]*: at least (\\d+)\n  given[^:]*: (\\d+)(?:\n  arguments[.][.][.]:(?:\n   [^\n]*)*)?"
-                (lambda (all one two three) (argcount-error-message one two three #t)))
-          (list #px"([^\n]*): arity mismatch;\n[^\n]*\n  expected[^:]*: (\\d+)\n  given[^:]*: (\\d+)(?:\n  arguments[.][.][.]:(?:\n   [^\n]*)*)?"
-                (lambda (all one two three) (argcount-error-message one two three)))
-          (list #px"contract violation\n  expected: (.*?)\n  given: ([^\n]*)(?:\n  argument position: ([^\n]*))?"
-                (lambda (all ctc given pos) (contract-error-message ctc given pos)))
-          (list #rx"^procedure "
-                (lambda (all) ""))
-          (list #rx", given: "
-                (lambda (all) ", given "))
-          (list #rx"; other arguments were:.*"
-                (lambda (all) ""))
-          (list #px"(?:\n  other arguments[.][.][.]:(?:\n   [^\n]*)*)"
-                (lambda (all) ""))
-          (list #rx"expects a (struct:)"
-                (lambda (all one) "expects a "))
-          (list #rx"list or cyclic list"
-                (lambda (all) "list"))
-          (list #rx"assignment disallowed;\n cannot set variable before its definition\n  variable:"
-                (lambda (all) "cannot set variable before its definition:"))
-          (list #rx"^(.*): undefined;\n cannot use before initialization"
-                (λ (all one) (format "local variable used before its definition: ~a" one)))
-          ;; When do these show up? I see only `#<image>' errors, currently.
-          (list (regexp-quote "#(struct:object:image% ...)")
-                (lambda (all) "an image"))
-          (list (regexp-quote "#(struct:object:image-snip% ...)")
-                (lambda (all) "an image"))
-          (list (regexp-quote "#(struct:object:cache-image-snip% ...)")
-                (lambda (all) "an image"))))
-  (for/fold ([msg msg]) ([repl. replacements])
-    (regexp-replace* (first repl.) msg (second repl.))))
-
-(define (get-rewriten-error-message exn)
-  (if (exn-needs-rewriting? exn)
-      (rewrite-contract-error-message (exn-message exn))
-      (exn-message exn)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/set-result.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/set-result.rkt
deleted file mode 100644
index 8cd83ad0b0..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/set-result.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-;; this module is shared between drscheme's and the user's namespace
-;; the printer uses it, printing it as (void), so that ordinary
-;; (void) results can still be ignored by the printer.
-(module set-result mzscheme
-  (provide set!-result)
-  (define set!-result
-    (let ()
-      (define-struct set!-result ())
-      (make-set!-result))))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/signature-syntax.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/signature-syntax.rkt
deleted file mode 100644
index 2851737299..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/signature-syntax.rkt
+++ /dev/null
@@ -1,261 +0,0 @@
-#lang scheme/base
-
-(provide :
-	 signature signature/arbitrary
-	 define/signature define-values/signature
-	 -> mixed one-of predicate combined property list-of vector-of)
-
-(require deinprogramm/signature/signature
-	 deinprogramm/signature/signature-english
-	 scheme/promise
-	 (for-syntax scheme/base)
-	 (for-syntax syntax/stx)
-         (for-syntax stepper/private/syntax-property)
-	 (for-syntax "firstorder.rkt"))
-
-(define-for-syntax (phase-lift stx)
-  (with-syntax ((?stx stx))
-    (with-syntax ((?stx1 (syntax/loc stx #'?stx))) ; attach the occurrence position to the syntax object
-      #'?stx1)))
-
-(define-for-syntax (parse-signature name stx)
-  (syntax-case* stx
-		(mixed one-of predicate list-of vector-of -> combined property reference at signature)
-		module-or-top-identifier=?
-    ((mixed ?signature ...)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   ((?signature-expr ...) (map (lambda (sig)
-						(parse-signature #f sig))
-					      (syntax->list #'(?signature ...)))))
-       #'(make-mixed-signature '?name
-			      (list ?signature-expr ...)
-			      ?stx)))
-    ((one-of ?exp ...)
-     (with-syntax ((((?temp ?exp) ...) 
-		    (map list
-			 (generate-temporaries #'(?exp ...)) (syntax->list #'(?exp ...))))
-		   (?stx (phase-lift stx))
-		   (?name name))
-       (with-syntax (((?check ...) 
-		      (map (lambda (lis)
-			     (with-syntax (((?temp ?exp) lis))
-			       (with-syntax ((?raise
-					      (syntax/loc 
-					       #'?exp
-					       (error 'signatures "no signature permissible here, value required"))))
-				 #'(when (signature? ?temp)
-				     ?raise))))
-			   (syntax->list #'((?temp ?exp) ...)))))
-         #'(let ((?temp ?exp) ...)
-             ?check ...
-             (make-case-signature '?name (list ?temp ...) equal? ?stx)))))
-    ((predicate ?exp)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name))
-       #'(make-predicate-signature '?name (delay ?exp) ?stx)))
-    ((list-of ?signature)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   (?signature-expr (parse-signature #f #'?signature)))
-       #'(make-list-signature '?name ?signature-expr ?stx)))
-    ((list-of ?signature1 ?rest ...)
-     (raise-syntax-error #f
-			 "list-of signature accepts only a single operand"
-			 (syntax ?signature1)))
-    ((vector-of ?signature)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   (?signature-expr (parse-signature #f #'?signature)))
-       #'(make-vector-signature '?name ?signature-expr ?stx)))
-    ((vector-of ?signature1 ?rest ...)
-     (raise-syntax-error #f
-			 "vector-of signature accepts only a single operand"
-			 (syntax ?signature1)))
-    ((?arg-signature ... -> ?return-signature)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   ((?arg-signature-exprs ...) (map (lambda (sig)
-						     (parse-signature #f sig))
-						   (syntax->list #'(?arg-signature ...))))
-		   (?return-signature-expr (parse-signature #f #'?return-signature)))
-       #'(make-procedure-signature '?name (list ?arg-signature-exprs ...) ?return-signature-expr ?stx)))
-    ((?arg-signature ... -> ?return-signature1 ?return-signature2 . ?_)
-     (raise-syntax-error #f
-			 "only one signature is allowed after ->"
-			 (syntax ?return-signature2)))
-    ((at ?loc ?sig)
-     (with-syntax ((?sig-expr (parse-signature #f #'?sig)))
-       #'(signature-update-syntax ?sig-expr #'?loc)))
-    (signature
-     (with-syntax ((?stx (phase-lift stx)))
-       #'(signature-update-syntax signature/signature #'?loc)))
-    (?id
-     (identifier? #'?id)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name (or name (syntax->datum #'?id))))
-       (let ((name (symbol->string (syntax->datum #'?id))))
-	 (if (char=? #\% (string-ref name 0))
-	     #'(make-type-variable-signature '?name ?stx)
-	     (with-syntax
-		 ((?raise
-                   #'(error 'signatures "expected a signature, found ~e" ?id)))
-	       (with-syntax
-		   ((?sig
-		     #'(make-delayed-signature '?name
-					      (delay
-						(begin
-						  (when (not (signature? ?id))
-						    ?raise)
-						  ?id)))))
-		 ;; for local variables (parameters, most probably),
-		 ;; we want the value to determine the blame location
-		 (if (eq? (identifier-binding #'?id) 'lexical)
-		     #'?sig
-		     #'(signature-update-syntax ?sig #'?stx))))))))
-    ((combined ?signature ...)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   ((?signature-expr ...) (map (lambda (sig)
-						(parse-signature #f sig))
-					      (syntax->list #'(?signature ...)))))
-       #'(make-combined-signature '?name
-				 (list ?signature-expr ...)
-				 ?stx)))
-    ((property ?access ?signature)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   (?signature-expr (parse-signature #f #'?signature)))
-       #'(make-property-signature '?name
-				 ?access
-				 ?signature-expr
-				 ?stx)))
-    ((signature ?stuff ...)
-     (raise-syntax-error #f
-			 "`signature' makes no sense as an operator"
-			 stx))
-    ((?signature-abstr ?signature ...)
-     (identifier? #'?signature-abstr)
-     (with-syntax ((?stx (phase-lift stx))
-		   (?name name)
-		   ((?signature-expr ...) (map (lambda (sig)
-						(parse-signature #f sig))
-					      (syntax->list #'(?signature ...)))))
-       (with-syntax
-	   ((?call (syntax/loc stx (?signature-abstr ?signature-expr ...)))
-	    (?signature-abstr-ho (first-order->higher-order #'?signature-abstr)))
-	 #'(make-call-signature '?name
-			       (delay ?call)
-			       (delay ?signature-abstr-ho)
-			       (delay (list ?signature-expr ...))
-			       ?stx))))
-    (else
-     (raise-syntax-error #f
-			 "invalid signature" stx))))
-
-; regrettable
-(define signature/signature
-  (make-predicate-signature 'signature
-			   (delay signature?)
-			   #f))
-			     
-
-(define-syntax signature
-  (lambda (stx)
-    (syntax-case stx ()
-      ((_ ?contr)
-       #'(signature #f ?contr))
-      ((_ ?name ?contr)
-       (stepper-syntax-property
-	(parse-signature (syntax->datum #'?name) #'?contr)
-	'stepper-skip-completely #t)))))
-
-(define-syntax signature/arbitrary
-  (lambda (stx)
-    (syntax-case stx ()
-      ((_ ?arb ?contr . ?rest)
-       #'(let ((contr (signature ?contr . ?rest)))
-	   (set-signature-arbitrary! contr ?arb)
-	   contr)))))
-
-(define-syntax define/signature
-  (lambda (stx)
-    (syntax-case stx ()
-      ((_ ?name ?cnt ?expr)
-       (with-syntax ((?enforced
-		       (stepper-syntax-property #'(attach-name '?name (apply-signature/blame ?cnt ?expr))
-						'stepper-skipto/discard
-						;; apply-signature/blame takes care of itself
-						;; remember there's an implicit #%app
-						'(syntax-e cdr syntax-e cdr cdr car))))
-							   
-	 #'(define ?name ?enforced))))))
-
-(define-syntax define-values/signature
-  (lambda (stx)
-    (syntax-case stx ()
-      ((_ (?id ...) ?expr)
-       (andmap identifier? (syntax->list #'(?id ...)))
-       (syntax-track-origin
-	#'(define-values (?id ...) ?expr)
-	stx
-	(car (syntax-e stx))))
-      ((_ ((?id ?cnt)) ?expr)
-       (identifier? #'?id)
-       #'(define/signature ?id ?cnt ?expr)) ; works with stepper
-      ((_ (?bind ...) ?expr)
-       (let ((ids+enforced
-	      (map (lambda (bind)
-		     (syntax-case bind ()
-		       (?id
-			(identifier? #'?id)
-			(cons #'?id #'?id))
-		       ((?id ?cnt)
-			(identifier? #'?id)
-			(cons #'?id
-			      #'(attach-name '?id (apply-signature/blame ?cnt ?id))))))
-		   (syntax->list #'(?bind ...)))))
-	 (with-syntax (((?id ...) (map car ids+enforced))
-		       ((?enforced ...) (map cdr ids+enforced)))
-	   (stepper-syntax-property
-	    #'(define-values (?id ...)
-		(call-with-values
-		    (lambda () ?expr)
-		  (lambda (?id ...)
-		    (values ?enforced ...))))
-	    'stepper-skip-completely #t)))))))
-
-;; Matthew has promised a better way of doing this in the future.
-(define (attach-name name thing)
-  (if (procedure? thing)
-      (procedure-rename thing name)
-      thing))
-
-(define-syntax :
-  (syntax-rules ()
-    ((: ?id ?sig) (begin)))) ; probably never used, we're only interested in the binding for :
-
-(define-for-syntax (within-signature-syntax-error stx name)
-  (raise-syntax-error #f
-		      "may only occur within signatures"
-		      name))
-
-;; Expression -> Expression
-;; Transforms unfinished code (... and the like) to code
-;; raising an appropriate error.
-(define-for-syntax within-signature-syntax-transformer
-  (make-set!-transformer
-   (lambda (stx)
-     (syntax-case stx (set!)
-       [(set! form expr) (within-signature-syntax-error stx (syntax form))]
-       [(form . rest) (within-signature-syntax-error stx (syntax form))]
-       [form (within-signature-syntax-error stx stx)]))))
-
-(define-syntax -> within-signature-syntax-transformer)
-(define-syntax mixed within-signature-syntax-transformer)
-(define-syntax one-of within-signature-syntax-transformer)
-(define-syntax predicate within-signature-syntax-transformer)
-(define-syntax combined within-signature-syntax-transformer)
-(define-syntax property within-signature-syntax-transformer)
-(define-syntax list-of within-signature-syntax-transformer)
-(define-syntax vector-of within-signature-syntax-transformer)
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/sl-eval.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/sl-eval.rkt
deleted file mode 100644
index 84f7509797..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/sl-eval.rkt
+++ /dev/null
@@ -1,118 +0,0 @@
-#lang racket/base
-
-(require teachpack/2htdp/scribblings/img-eval
-         racket/pretty
-         racket/sandbox
-         mzlib/pconvert
-         file/convertible
-         scribble/eval)
-
-(provide
- ;; syntax: 
- ;; use with (define-module-local-eval e) ... (eval 'foo e)
- define-module-local-eval 
-
- ;; syntax: 
- ;; use with @interaction[#:eval (*sl-eval (define x ...) ...) ...] to create interactive examples 
- bsl-eval
- bsl+-eval
- isl-eval
- isl+-eval
- asl-eval)
-
-;; this definition is a pile of hacks accumulated over the course of HtDP/2e writing 
-;; there should be a better and simpler way to get this done 
-(define-syntax-rule
-  (*sl-eval module-lang reader def ...)
-  ;; ===>>>
-  (let ()
-    (define me (make-img-eval))
-    (me '(require (only-in racket empty? first rest cons? sqr true false)))
-    (me '(require lang/posn))
-    (me '(require racket/pretty))
-    (me '(current-print pretty-print-handler))
-    (me '(pretty-print-columns 65))
-    (me 'def)
-    ...
-    (call-in-sandbox-context me (lambda () (error-print-source-location #f)))
-    (call-in-sandbox-context me (lambda () (sandbox-output 'string)))
-    (call-in-sandbox-context me (lambda () (sandbox-error-output 'string)))
-    (call-in-sandbox-context me (lambda ()
-				  (current-print-convert-hook
-				    (let ([prev (current-print-convert-hook)])
-				      ;; tell `print-convert' to leave images as themselves:
-				      (lambda (v basic sub)
-					(if (convertible? v)
-					    v
-					    (prev v basic sub)))))
-
-				  (pretty-print-size-hook
-				    (let ([prev (pretty-print-size-hook)])
-				      ;; tell `pretty-print' that we'll handle images specially:
-				      (lambda (v w? op)
-					(if (convertible? v) 1 (prev v w? op)))))
-				  
-				  (pretty-print-print-hook
-				    (let ([prev (pretty-print-print-hook)])
-				      ;; tell `pretty-print' how to handle images, which is
-				      ;; by using `write-special':
-				      (lambda (v w? op)
-					(if (convertible? v) (write-special v op) (prev v w? op)))))
-
-				  ((dynamic-require 'htdp/bsl/runtime 'configure)
-				   (dynamic-require reader 'options))))
-    (call-in-sandbox-context me (lambda () (namespace-require module-lang)))
-    (interaction-eval #:eval me (require 2htdp/image))
-    (interaction-eval #:eval me (require 2htdp/batch-io))
-    ;; --- splice in the defs
-    me
-    #;
-    (lambda x
-      (with-handlers ([void (lambda (exn . more)
-			      (define msg (exn-message exn))
-			      (define x (get-rewriten-error-message exn))
-			      (define s (open-output-string))
-			      (define y
-				(begin
-				  (parameterize ([current-error-port s])
-				    ((error-display-handler) x 'exn))
-				  (get-output-string s)))
-			      (displayln `(hello ,msg ,exn ,y))
-			      x)])
-	(apply me x)))))
-
-(define-syntax-rule
-  (bsl-eval def ...)
-  (*sl-eval 'lang/htdp-beginner 'htdp/bsl/lang/reader def ...))
-
-(define-syntax-rule
-  (bsl+-eval def ...)
-  (*sl-eval 'lang/htdp-beginner-abbr 'htdp/bsl+/lang/reader def ...))
-
-(define-syntax-rule
-  (isl-eval def ...)
-  (*sl-eval 'lang/htdp-intermediate 'htdp/isl/lang/reader def ...))
-
-(define-syntax-rule 
-  (isl+-eval def ...)
-  (*sl-eval 'lang/htdp-intermediate-lambda 'htdp/isl/lang/reader def ...))
-
-(define-syntax-rule 
-  (asl-eval def ...)
-  (*sl-eval 'lang/htdp-advanced 'htdp/asl/lang/reader def ...))
-
-; (isl-eval+)
-
-;; -----------------------------------------------------------------------------
-
-;; (define-module-local-eval name-of-evaluator)
-;; a make-base-eval whose namespace is initialized with the module where the macro is used 
-(define-syntax-rule 
-  (define-module-local-eval name)
-  (begin
-    (define-namespace-anchor ns)
-    (define name 
-      (parameterize ([sandbox-namespace-specs (list (lambda () (namespace-anchor->namespace ns)))]
-                     [sandbox-error-output 'string]
-                     [sandbox-output 'string])
-        (make-base-eval)))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/teach-module-begin.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/teach-module-begin.rkt
deleted file mode 100644
index f126b11ce0..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/teach-module-begin.rkt
+++ /dev/null
@@ -1,206 +0,0 @@
-#lang scheme/base
-
-; Once upon a time, there were three different variants.  Preserve the
-; ability to do this.
-(provide (rename-out (module-begin beginner-module-begin)
-                     (module-begin intermediate-module-begin)
-                     (module-begin advanced-module-begin)))
-
-(require deinprogramm/signature/signature
-         lang/private/signature-syntax)
-
-(require (for-syntax scheme/base)
-         (for-syntax racket/list)
-         (for-syntax syntax/boundmap)
-         (for-syntax syntax/kerncase))
-
-(require (for-syntax "firstorder.rkt"))
-
-(define-syntax (print-results stx)
-  (syntax-case stx ()
-    ((_ expr)
-     (not (or (syntax-property #'expr 'stepper-hide-completed)
-	      (syntax-property #'expr 'stepper-skip-completely)
-	      (syntax-property #'expr 'test-call)))
-     (syntax-property
-      (syntax-property
-       #'(#%app call-with-values (lambda () expr)
-		do-print-results)
-       'stepper-skipto 
-       '(syntax-e cdr cdr car syntax-e cdr cdr car))
-      'certify-mode
-      'transparent))
-    ((_ expr) #'expr)))
-
-(define (do-print-results . vs)
-  (for-each (current-print) vs)
-  ;; Returning 0 values avoids any further result printing
-  ;; (even if void values are printed)
-  (values))
-  
-(define-syntaxes (module-begin module-continue)
-  (let ()
-    ;; takes a list of syntax objects (the result of syntax-e) and returns all the syntax objects that correspond to
-    ;; a signature declaration. Syntax: (: id signature)
-    (define extract-signatures
-      (lambda (lostx) 
-	(let* ((table (make-bound-identifier-mapping))
-	       (non-signatures
-		(filter-map (lambda (maybe)
-			      (syntax-case maybe (:)
-				((: ?exp ?sig)
-				 (not (identifier? #'?exp))
-				 #'(apply-signature/blame (signature ?sig) ?exp))
-				((: ?id ?sig)
-				 (begin
-				   (let ((real-id (first-order->higher-order #'?id)))
-				     (cond
-				      ((bound-identifier-mapping-get table real-id (lambda () #f))
-				       => (lambda (old-sig-stx)
-					    (unless (equal? (syntax->datum old-sig-stx)
-							    (syntax->datum #'?sig))
-					      (raise-syntax-error #f
-								  "Second signature declaration for the same name."
-								  maybe))))
-				      (else
-				       (bound-identifier-mapping-put! table real-id #'?sig)))
-				     #f)))
-				((: ?id)
-				 (raise-syntax-error #f "Signature declaration is missing a signature." maybe))
-				((: ?id ?sig ?stuff0 ?stuff1 ...)
-				 (raise-syntax-error #f "The : form expects a name and a signature; there is more."
-						     (syntax/loc #'?stuff0
-								 (?stuff0 ?stuff1 ...))))
-				(_ maybe)))
-			    lostx)))
-	  (values table non-signatures))))
-
-    (define local-expand-stop-list 
-      (append (list #': #'define-signature)
-	      (kernel-form-identifier-list)))
-	
-    (define (expand-signature-expressions signature-table expressions)
-
-      (let loop ((exprs expressions))
-
-	(cond
-	 ((null? exprs)
-	  (bound-identifier-mapping-for-each signature-table
-					     (lambda (id thing)
-					       (when thing
-						 (if (identifier-binding id)
-						     (raise-syntax-error #f "Cannot declare a signature for a built-in form." id)
-						     (raise-syntax-error #f "There is no definition for this signature declaration." id)))))
-	  #'(begin))
-	 (else
-	  (let ((expanded (car exprs)))
-
-	    (syntax-case expanded (begin define-values)
-	      ((define-values (?id ...) ?e1)
-	       (with-syntax (((?enforced ...)
-			      (map (lambda (id)
-				     (cond
-				      ((bound-identifier-mapping-get signature-table id (lambda () #f))
-				       => (lambda (sig)
-					    (bound-identifier-mapping-put! signature-table id #f) ; check for orphaned signatures
-					    (with-syntax ((?id id)
-							  (?sig sig))
-					      #'(?id (signature ?sig)))))
-				      (else
-				       id)))
-				   (syntax->list #'(?id ...))))
-			     (?rest (loop (cdr exprs))))
-		 (with-syntax ((?defn
-				(syntax-track-origin
-				 #'(define-values/signature (?enforced ...)
-				     ?e1)
-				 (car exprs)
-				 (car (syntax-e expanded)))))
-
-		   (syntax/loc (car exprs)
-			       (begin
-				 ?defn
-				 ?rest)))))
-	      ((begin e1 ...)
-	       (loop (append (syntax-e (syntax (e1 ...))) (cdr exprs))))
-	      (else 
-	       (with-syntax ((?first expanded)
-			     (?rest (loop (cdr exprs))))
-		 (syntax/loc (car exprs)
-			     (begin
-			       ?first ?rest))))))))))
-    (values
-     ;; module-begin
-     (lambda (stx)
-       (syntax-case stx ()
-	 ((_ e1 ...)
-	  ;; module-begin-continue takes a sequence of expanded
-	  ;; exprs and a sequence of to-expand exprs; that way,
-	  ;; the module-expansion machinery can be used to handle
-	  ;; requires, etc.:
-	  #`(#%plain-module-begin
-	     (module-continue (e1 ...) () ())))))
-
-     ;; module-continue
-     (lambda (stx)
-       (syntax-case stx ()
-	 ((_ () (e1 ...) (defined-id ...))
-	  ;; Local-expanded all body elements, lifted out requires, etc.
-	  ;; Now process the result.
-	  (begin
-	    ;; The expansion for signatures breaks the way that beginner-define, etc.,
-	    ;;  check for duplicate definitions, so we have to re-check here.
-	    ;; A better strategy might be to turn every define into a define-syntax
-	    ;;  to redirect the binding, and then the identifier-binding check in
-	    ;;  beginner-define, etc. will work.
-	    (let ((defined-ids (make-bound-identifier-mapping)))
-	      (for-each (lambda (id)
-			  (when (bound-identifier-mapping-get defined-ids id (lambda () #f))
-			    (raise-syntax-error
-			     #f
-			     "this name was defined previously and cannot be re-defined"
-			     id))
-			  (bound-identifier-mapping-put! defined-ids id #t))
-			(reverse (syntax->list #'(defined-id ...)))))
-	    ;; Now handle signatures:
-	    (let ((top-level (reverse (syntax->list (syntax (e1 ...))))))
-	      (let-values (((sig-table expr-list)
-			    (extract-signatures top-level)))
-		(expand-signature-expressions sig-table expr-list)))))
-	 ((frm e3s e1s def-ids)
-	  (let loop ((e3s #'e3s)
-		     (e1s #'e1s)
-		     (def-ids #'def-ids))
-	    (syntax-case e3s ()
-	      (()
-	       #`(frm () #,e1s #,def-ids))
-	      ((e2 . e3s)
-	       (let ((e2 (local-expand #'e2 'module local-expand-stop-list)))
-		 ;; Lift out certain forms to make them visible to the module
-		 ;;  expander:
-		 (syntax-case e2 (#%require #%provide #%declare
-				  define-syntaxes begin-for-syntax define-values begin
-				  define-signature :)
-		   ((#%require . __)
-		    #`(begin #,e2 (frm e3s #,e1s #,def-ids)))
-		   ((#%provide . __)
-		    #`(begin #,e2 (frm e3s #,e1s #,def-ids)))
-		   ((#%declare . __)
-		    #`(begin #,e2 (frm e3s #,e1s #,def-ids)))
-		   ((define-syntaxes (id ...) . _)
-		    #`(begin #,e2 (frm e3s #,e1s (id ... . #,def-ids))))
-		   ((begin-for-syntax . _)
-		    #`(begin #,e2 (frm e3s #,e1s #,def-ids)))
-		   ((begin b1 ...)
-		    (syntax-track-origin 
-		     (loop (append (syntax->list #'(b1 ...)) #'e3s) e1s def-ids)
-		     e2
-		     (car (syntax-e e2))))
-		   ((define-values (id ...) . _)
-		    (loop #'e3s (cons e2 e1s) (append (syntax->list #'(id ...)) def-ids)))
-		   ((define-signature id ctr)
-		    (loop #'e3s (cons e2 e1s) def-ids))
-		   ((: stuff ...)
-		    (loop #'e3s (cons e2 e1s) def-ids))
-		   (_
-		    (loop #'e3s (cons #`(print-results #,e2) e1s) def-ids)))))))))))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/teach-shared.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/teach-shared.rkt
deleted file mode 100644
index 86b556f65c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/teach-shared.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scheme/base
-(require (for-template racket/private/shared-body
-                       (only-in "teachprims.rkt" advanced-cons)))
-
-(provide shared/proc)
-
-(define code-insp
-  (variable-reference->module-declaration-inspector
-   (#%variable-reference)))
-
-(define shared/proc
-  (lambda (stx make-check-cdr)
-    (shared-body stx #'advanced-cons code-insp make-check-cdr)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/teach.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/teach.rkt
deleted file mode 100644
index bdea70e901..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/teach.rkt
+++ /dev/null
@@ -1,3272 +0,0 @@
-;; Implements the syntactic forms for the HtDP teaching languages. The
-;; reader-level aspects of the language (e.g., case-sensitivity) are
-;; not implemented here, and the procedures are in a separate
-;; module.
-
-;; To a first approximation, this module is one big error-checking
-;; routine. In other words, most of the syntax implementations are
-;; straightforward, but error-checking is complex.
-
-;; Error-message conventions:
-;;  - Report errors, somewhat anthropomorphically, in terms of "expected"
-;;    versus "found" syntax.
-;;  - Report errors according to a left-to-right reading; e.g., the
-;;    error in `(define 1 2 3)' is "expected an identifier, found 1",
-;;    not "expected two parts after `define', but found three".
-;;  - The error message should always explain what is wrong, not simply
-;;    state a fact. For example, "f defined previously, so it cannot
-;;    be re-defined here" is a good error message; in contrast, "found
-;;    second definition of f here" doesn't say what's wrong with a second
-;;    definition.
-
-;; Left-to-right reporting sometimes requires an explicit expression
-;; check before reporting some other error. For example, in the
-;; expression (cond [true + 1 2]), the reported error should ideally
-;; be for a misuse of "+", not that there are two extra parts in the
-;; clause. This check requires local-expanding, so it doesn't work
-;; when checking top-level forms like `define' (because not all of the
-;; definitions are ready, yet). For other cases, ensure that the
-;; expansion is in an expression position (not the top level) and use
-;; the `local-expand-for-error' function instead of `local-expand' to
-;; help declare that the expansion is merely for left-to-right error
-;; reporting. As always, avoid using `local-expand' if there's no
-;; error.
-
-#lang mzscheme
-
-(require mzlib/etc
-         mzlib/list
-         mzlib/math
-         mzlib/pconvert-prop
-         scheme/match
-         racket/undefined
-         "set-result.rkt"
-         (only racket/base define-struct)
-         racket/struct-info
-         deinprogramm/signature/signature-english
-         (all-except deinprogramm/signature/signature signature-violation)
-         (all-except lang/private/signature-syntax property)
-         (rename lang/private/signature-syntax signature:property property)
-         (all-except deinprogramm/quickcheck/quickcheck property)
-         (rename deinprogramm/quickcheck/quickcheck quickcheck:property property)
-         test-engine/racket-tests
-         scheme/class
-         "../posn.rkt"
-         (only lang/private/teachprims
-               beginner-equal? beginner-equal~? teach-equal?
-               advanced-cons advanced-list*))
-
-(require "rewrite-error-message.rkt")
-
-(require-for-syntax "teachhelp.rkt"
-                    "rewrite-error-message.rkt"
-                    "teach-shared.rkt"
-                    "rewrite-error-message.rkt"
-                    racket/syntax
-                    syntax/kerncase
-                    syntax/stx
-                    syntax/struct
-                    syntax/context
-                    mzlib/include
-                    scheme/list
-                    (rename racket/base racket:define-struct define-struct)
-                    (only racket/base syntax->datum datum->syntax)
-                    (rename racket/base kw-app #%app)
-                    racket/struct-info
-                    stepper/private/syntax-property
-                    test-engine/racket-tests)
-
-(define-for-syntax EXPECTED-HEADER
-  "expected a variable name, or a function name and its variables (in parentheses), but ~a")
-
-(define-for-syntax EXPECTED-MATCH-PATTERN
-  "expected a pattern--answer clause after the expression following `match', but nothing's there")
-
-(define-for-syntax EXPECTED-FUNCTION-NAME
-  "expected a function after the open parenthesis, but found a structure name")
-
-(define-for-syntax EXPECTED-MUTABLE
-  "expected a mutable variable after set!, but found a variable that cannot be modified: ~a")
-
-(define-for-syntax EXPECTED-1
-  "expected at least one binding (in parentheses) after the function name, but found none")
-
-(define-for-syntax EXPECTED-1-FIELD
-  "expected at least one field name (in parentheses) after the structure name, but nothing's there")
-
-(define-for-syntax EXPECTED-CLAUSE
-  "expected a clause with a question and an answer, but found a clause with only one part")
-
-(define-for-syntax EXPECTED-GOOD-CLAUSE
-  "expected a clause with a question and an answer, but found a clause with ~a parts")
-
-(define-for-syntax EXPECTED-MORE-THAN-NOTHING
-  (string-append
-   "expected a clause with at least one choice (in parentheses) and an answer after the expression,"
-   " but nothing's there"))
-
-(define-for-syntax EXPECTED-SYMBOL-OR-NUMBER+
-  "expected a symbol (without its quote) or a number as a choice, but found ~a")
-
-(define-for-syntax EXPECTED-SYMBOL-OR-NUMBER
-  "expected a symbol (without its quote) or a number as a choice, but nothing's there")
-
-(define-for-syntax EXPECTED-CLAUSE-WITH-CHOICE
-  "expected a clause with at least one choice (in parentheses) and an answer, but found ~a")
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; run-time helpers
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; verify-boolean is inserted to check for boolean results:
-(define (verify-boolean b where)
-  (if (or (eq? b #t) (eq? b #f))
-      b
-      (raise
-       (make-exn:fail:contract
-        (format "~a: question result is not true or false: ~e" where b)
-        (current-continuation-marks)))))
-
-(define (identifier-is-bound? id)
-  (or (identifier-binding id)
-      ;; identifier-binding returns #f for variable bound at the top-level,
-      ;; check explicitly:
-      (and (namespace-variable-value (syntax-e id) #t (lambda () #f)) #t)))
-
-;; Wrapped around top-level definitions to disallow re-definition:
-(define (check-top-level-not-defined who id)
-  (when (identifier-is-bound? id)
-    (raise-syntax-error #f "this name was defined previously and cannot be re-defined" id)))
-
-(define (top/check-defined id)
-  (namespace-variable-value (syntax-e id) #t (lambda () (raise-not-bound-error id))))
-
-;; For quasiquote and shared:
-(require (rename "teachprims.rkt" the-cons advanced-cons))
-(require (only   "teachprims.rkt" cyclic-list?))
-
-;; Referenced to ensure that evaluating `lambda' always
-;; produces a new closure (instead of using a closure
-;; that's allocated once)
-(define make-lambda-generative 5)
-
-;; A consistent pattern for stepper-skipto:
-(define-for-syntax (stepper-ignore-checker stx)
-  (stepper-syntax-property stx 'stepper-skipto '(syntax-e cdr syntax-e cdr car)))
-
-(define-for-syntax (map-with-index proc . lists)
-  (let loop ([i 0] [lists lists] [rev-result '()])
-    (if (null? (car lists))
-        (reverse rev-result)
-        (loop (+ 1 i)
-              (map cdr lists)
-              (cons (apply proc i (map car lists)) rev-result)))))
-
-;; build-struct-names is hard to handle
-(define-for-syntax (make-struct-names name fields stx)
-  (apply (lambda (struct: constructor predicate . rest)
-           (let loop ([rest rest]
-                      [getters '()]
-                      [setters '()])
-             (if (null? rest)
-                 (values struct: constructor predicate (reverse getters) (reverse setters))
-                 (loop (cddr rest)
-                       (cons (car rest) getters)
-                       (cons (cadr rest) setters)))))
-         (build-struct-names name fields #f #f stx)))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; syntax implementations
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-syntax define-syntax-set/provide
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ (id ...) defn ...)
-       (with-syntax ([(plain-id ...)
-                      (map (lambda (id)
-                             (if (identifier? id)
-                                 id
-                                 (stx-car (stx-cdr id))))
-                           (syntax->list (syntax (id ...))))]
-                     [provided-identifiers
-                      (datum->syntax-object stx 'provided-identifiers)])
-         (syntax
-          (begin
-            (provide plain-id ...)
-            (define-syntax-set (id ...) 
-              (define provided-identifiers (quote-syntax (id ...)))
-              defn ...))))])))
-
-
-;; The implementation of form X is defined below as X/proc. The
-;; reason for this is to allow the implementation of Y to re-use the
-;; implementation of X (expanding to a use of X would mangle syntax
-;; error messages), while preserving the binding of X as the one for
-;; the syntax definition (so that quasiquote can recognize unquote,
-;; etc.).
-
-(define-syntax-set/provide (beginner-define
-                             beginner-define-struct
-                             beginner-lambda
-                             beginner-app     beginner-app-continue
-                             beginner-top     beginner-top-continue
-                             beginner-cond
-                             beginner-else
-                             beginner-if
-                             beginner-and
-                             beginner-or
-                             beginner-quote/expr
-                             beginner-require
-                             beginner-dots
-                             beginner-true
-                             beginner-false
-                             
-                             intermediate-define
-                             intermediate-define-struct
-                             intermediate-pre-lambda
-                             intermediate-local
-                             intermediate-letrec
-                             intermediate-let
-                             intermediate-let*
-                             intermediate-recur
-                             intermediate-app
-                             intermediate-quote/expr
-                             intermediate-quasiquote/expr
-                             intermediate-unquote
-                             intermediate-unquote-splicing
-                             intermediate-time
-                             
-                             intermediate-lambda-define
-                             intermediate-lambda
-                             
-                             advanced-define
-                             advanced-lambda
-                             advanced-app
-                             advanced-set!  advanced-set!-continue
-                             advanced-when
-                             advanced-unless
-                             advanced-define-struct
-                             advanced-define-datatype
-                             advanced-let
-                             advanced-recur
-                             advanced-begin
-                             advanced-begin0
-                             advanced-case
-                             advanced-match
-                             advanced-shared
-                             advanced-delay
-                             
-                             define-wish)
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; compile-time helpers
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; Raise a syntax error:
-  (define (teach-syntax-error form stx detail msg . args)
-    (let ([form (or form (first (flatten (syntax->datum stx))))]
-          [msg (apply format msg args)])
-      (if detail
-          (raise-syntax-error form msg stx detail)
-          (raise-syntax-error form msg stx))))
-  
-  
-  (define (teach-syntax-error* form stx details msg . args)
-    (let ([exn (with-handlers ([exn:fail:syntax?
-                                (lambda (x) x)])
-                 (apply teach-syntax-error form stx #f msg args))])
-      (raise
-       (make-exn:fail:syntax
-        (exn-message exn)
-        (exn-continuation-marks exn)
-        details))))
-  
-  (define (binding-in-this-module? b)
-    (and (list? b)
-         (module-path-index? (car b))
-         (let-values ([(path base) (module-path-index-split (car b))])
-           (and (not path) (not base)))))
-  
-  ;; The syntax error when a form's name doesn't follow a "("
-  (define (bad-use-error name stx)
-    (teach-syntax-error
-     name
-     stx
-     #f
-     "expected an open parenthesis before ~a, but found none" name))
-  
-  ;; Use for messages "expected ..., found <something else>"
-  (define (something-else v)
-    (let ([v (syntax-e v)])
-      (cond
-        [(number? v) "a number"]
-        [(string? v) "a string"]
-        [(list? v) "a part"]
-        [(struct? v) "an image"]
-        [else "something else"])))
-  
-  (define (ordinal n)
-    (cond
-      [(or (<= 11 n 13)
-           (zero? (modulo n 10))
-           (<= 4 (modulo n 10) 9))
-       (format "~ath" n)]
-      [(= 1 (modulo n 10))
-       (format "~ast" n)]
-      [(= 2 (modulo n 10))
-       (format "~and" n)]
-      [(= 3 (modulo n 10))
-       (format "~ard" n)]))
-  
-  
-  ;; At the top level, wrap `defn' to first check for
-  ;;  existing definitions of the `names'. The `names'
-  ;;  argument is a syntax list of identifiers.
-  ;; In a module context, just check the binding
-  ;;  at compile time.
-  ;; In either context, if `assign?' is true, then
-  ;;  generate an unevaluated assignment that makes
-  ;;  the identifier mutable.
-  (define (check-definitions-new who stx names defn assign)
-    (cond
-      [(eq? (syntax-local-context) 'top-level)
-       (with-syntax ([defn defn]
-                     [who who])
-         (with-syntax ([(check ...)
-                        (map (lambda (name)
-                               (with-syntax ([name name])
-                                 ;; Make sure each check has the
-                                 ;; source location of the original
-                                 ;; expression:
-                                 (syntax/loc stx
-                                   (check-top-level-not-defined 'who #'name))))
-                             names)])
-           (stepper-syntax-property 
-            (syntax/loc stx
-              (begin
-                check ...
-                defn)) 
-            'stepper-skipto 
-            (cons 'syntax-e
-                  (let loop ([l names])
-                    (if (null? l)
-                        `(syntax-e cdr car)
-                        (cons 'cdr (loop (cdr l)))))))))]
-      [(memq (syntax-local-context) '(module module-begin))
-       (for-each (lambda (name)
-                   (let ([b (identifier-binding name)])
-                     (when b
-                       (teach-syntax-error
-                        (syntax-e name)
-                        name
-                        #f
-                        "this name was defined previously and cannot be re-defined"))))
-                 names)
-       (if assign
-           (with-syntax ([(name ...) (if (eq? assign #t)
-                                         names
-                                         assign)]
-                         [made-up (gensym)]
-                         [defn defn])
-             (with-syntax ([made-up-defn 
-                            (stepper-syntax-property 
-                             (syntax (define made-up (lambda () (advanced-set! name 10) ...)))
-                             'stepper-skip-completely
-                             #t)])
-               (syntax/loc stx
-                 (begin
-                   made-up-defn ;; (define made-up (lambda () (advanced-set! name 10) ...))
-                   defn))))
-           defn)]
-      [else defn]))
-  
-  ;; Same as above, but for one name
-  (define (check-definition-new who stx name defn assign)
-    (check-definitions-new who stx (list name) defn assign))
-  
-  ;; Check context for a `define' before even trying to
-  ;; expand
-  (define-struct expanding-for-intermediate-local ())
-  (define (ok-definition-context)
-    (let ([ctx (syntax-local-context)])
-      (or (memq ctx '(top-level module module-begin))
-          (and (pair? ctx)
-               (expanding-for-intermediate-local? (car ctx))))))
-  
-  (define (local-expand-for-error stx ctx stops)
-    ;; This function should only be called in an 'expression
-    ;;  context. In case we mess up, avoid bogus error messages.
-    (when (memq (syntax-local-context) '(expression))
-      (local-expand stx ctx stops)))
-  
-  (define (ensure-expression stx k)
-    (if (memq (syntax-local-context) '(expression))
-        (k)
-        (stepper-syntax-property #`(begin0 #,stx) 'stepper-skipto skipto/second)))
-  
-  ;; Use to generate nicer error messages than direct pattern
-  ;; matching. The `where' argument is an English description
-  ;; of the portion of the larger expression where a single
-  ;; sub-expression was expected.
-  (define (check-single-expression who where stx exprs will-bind)
-    (when (null? exprs)
-      (teach-syntax-error
-       who
-       stx
-       #f
-       "expected an expression ~a, but nothing's there"
-       where))
-    (unless (null? (cdr exprs))
-      ;; In case it's erroneous, to ensure left-to-right reading, let's
-      ;;  try expanding the first expression. We have to use
-      ;;  `will-bind' to avoid errors for unbound ids that will actually
-      ;;  be bound. Since they're used as stopping points, we may miss
-      ;;  some errors after all. It's worth a try, though. We also
-      ;;  have to stop at advanced-set!, in case it's used with
-      ;;  one of the identifiers in will-bind.
-      (when will-bind
-        (local-expand-for-error (car exprs) 'expression (cons #'advanced-set!
-                                                              will-bind)))
-      ;; First expression seems ok, report an error for 2nd and later:
-      (teach-syntax-error
-       who
-       stx
-       (cadr exprs)
-       "expected only one expression ~a, but found ~a extra part~a"
-       where
-       (sub1 (length exprs))
-       (if (> (length exprs) 2) "s" ""))))
-  
-  (define (check-single-result-expr exprs where enclosing-expr will-bind)
-    (check-single-expression where
-                             "for the function body"
-                             enclosing-expr
-                             exprs
-                             will-bind))
-  
-  (define keyword-list
-    (append (syntax->list provided-identifiers)
-            (syntax->list (quote-syntax 
-                           (#%datum
-                            #%top
-                            empty true false
-                            )))))
-  
-  (define (identifier/non-kw? stx)
-    (and (identifier? stx)
-         (not (ormap (lambda (x) (module-identifier=? stx x))
-                     keyword-list))))
-  
-  (define (something-else/kw stx)
-    (if (identifier? stx)
-        "a keyword"
-        (something-else stx)))
-  
-  (define (make-name-inventer)
-    ;; Normally we'd use (make-syntax-introducer) because gensyming makes
-    ;;  identifiers that play badly with exporting. But we don't have
-    ;;  to worry about exporting in the teaching languages, while we do
-    ;;  have to worry about mangled names.
-    (lambda (id)
-      (datum->syntax-object id 
-                            (string->uninterned-symbol (symbol->string (syntax-e id)))
-                            id)))
-  
-  (define (wrap-func-definitions first-order? kinds names argcs k)
-    (if first-order?
-        (let ([name2s (map (make-name-inventer) names)])
-          (values (quasisyntax
-                   (begin
-                     #,@(map
-                         (lambda (name name2 kind argc)
-                           #`(define-syntax #,name 
-                               (make-first-order-function '#,kind 
-                                                          #,argc
-                                                          (quote-syntax #,name2) 
-                                                          (quote-syntax #%app))))
-                         names name2s kinds argcs)
-                     #,(k name2s)))
-                  name2s))
-        (values (k names)
-                names)))
-  
-  
-  ;; Racket's true and false are defined as macros (for performance perhaps?),
-  ;; but this dodge *SL's redefinition of #%app and set!. Without these
-  ;; beginner-true/proc and beginner-false/proc here, (true) would throw a
-  ;; professional error message not suitable for beginners.
-  (define (make-constant-expander val)
-    (make-set!-transformer
-     (lambda (stx)
-       (syntax-case stx (set!)
-         [(set! id rhs) (syntax/loc stx (set! val rhs))]
-         [(id . args) 
-          (teach-syntax-error
-           '|function call|
-           #'stx
-           #'id 
-           "expected a function after the open parenthesis, but found ~a"
-           (syntax-e #'id))]
-         [_ (datum->syntax stx val stx)]))))
-  
-  (define beginner-true/proc (make-constant-expander #t))
-  (define beginner-false/proc (make-constant-expander #f))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; define (beginner)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (define/proc first-order? assign? stx lambda-stx)
-    
-    (define (wrap-func-definition name argc k)
-      (wrap-func-definitions first-order? 
-                             '(procedure) (list name) (list argc)
-                             (lambda (names)
-                               (k (car names)))))
-    
-    (define (check-function-defn-ok stx)
-      (when first-order?
-        (when (eq? 'top-level (syntax-local-context))
-          (teach-syntax-error
-           'define
-           stx
-           #f
-           "function definitions are not allowed in the interactions window; ~
-              they must be in the definitions window"))))
-    
-    (unless (or (ok-definition-context)
-                (identifier? stx))
-      (teach-syntax-error
-       'define
-       stx
-       #f
-       "found a definition that is not at the top level"))
-    
-    (syntax-case stx ()
-      ;; Constant or lambda def:
-      [(_ name expr)
-       (identifier/non-kw? (syntax name))
-       (let ([lam (syntax expr)])
-         (check-defined-lambda lam)
-         (syntax-case* (syntax expr) (beginner-lambda) (lambda (a b)
-                                                         (module-identifier=? a lambda-stx))
-           ;; Well-formed lambda def:
-           [(beginner-lambda arg-seq lexpr ...)
-            (begin
-              (check-function-defn-ok stx)
-              (let-values ([(defn bind-names)
-                            (wrap-func-definition
-                             #'name
-                             (length (syntax->list #'arg-seq))
-                             (lambda (name)
-                               (with-syntax ([name name])
-                                 (quasisyntax/loc 
-                                     stx 
-                                   (define name
-                                     #,(stepper-syntax-property
-                                        (syntax-track-origin
-                                         #`(lambda arg-seq 
-                                             #,(stepper-syntax-property #`make-lambda-generative 
-                                                                        'stepper-skip-completely #t)
-                                             lexpr ...)
-                                         lam
-                                         (syntax-local-introduce (car (syntax-e lam))))
-                                        'stepper-define-type
-                                        'lambda-define))))))])
-                (check-definition-new
-                 'define
-                 stx
-                 #'name
-                 defn
-                 (and assign? bind-names))))]
-           ;; Constant def
-           [_else
-            (check-definition-new
-             'define
-             stx
-             (syntax name)
-             (quasisyntax/loc stx (define name expr))
-             (and assign? (list (syntax name))))]))]
-      ;; Function definition:
-      [(_ name-seq expr ...)
-       (syntax-case (syntax name-seq) () [(name ...) #t][_else #f])
-       ;; name-seq is at least a sequence
-       (let ([names (syntax->list (syntax name-seq))])
-         (check-function-defn-ok stx)
-         (when (null? names)
-           (teach-syntax-error
-            'define
-            stx
-            #f
-            "expected a name for the function, but nothing's there"))
-         (let loop ([names names][pos 0])
-           (unless (null? names)
-             (unless (identifier/non-kw? (car names))
-               (teach-syntax-error
-                'define
-                stx
-                (car names)
-                "expected ~a, but found ~a"
-                (cond
-                  [(zero? pos) "the name of the function"]
-                  [else "a variable"])
-                (something-else/kw (car names))))
-             (loop (cdr names) (add1 pos))))
-         (when (null? (cdr names))
-           (teach-syntax-error
-            'define
-            stx
-            (syntax name-seq)
-            "expected at least one variable after the function name, but found none"))
-         (let ([dup (check-duplicate-identifier (cdr names))])
-           (when dup
-             (teach-syntax-error
-              'define
-              stx
-              dup
-              "found a variable that is used more than once: ~a"
-              (syntax-e dup))))
-         (check-single-result-expr (syntax->list (syntax (expr ...)))
-                                   #f
-                                   stx
-                                   ;; can't local-expand function body, because
-                                   ;;  not all top-level defns are ready:
-                                   #f)
-         
-         (let-values ([(defn bind-names)
-                       (wrap-func-definition
-                        (car (syntax-e #'name-seq))
-                        (length (cdr (syntax->list #'name-seq)))
-                        (lambda (fn)
-                          (with-syntax ([fn fn]
-                                        [args (cdr (syntax-e #'name-seq))])
-                            (quasisyntax/loc stx
-                              (define fn
-                                #,(stepper-syntax-property
-                                   (stepper-syntax-property
-                                    ;; this is so signature blame can report a
-                                    ;; position for the procedure
-                                    (syntax/loc stx (lambda args expr ...))
-                                    'stepper-define-type
-                                    'shortened-proc-define)
-                                   'stepper-proc-define-name
-                                   #`fn))))))])
-           (check-definition-new 
-            'define
-            stx
-            (car names)
-            defn
-            (and assign? bind-names))))]
-      ;; Constant/lambda with too many or too few parts:
-      [(_ name expr ...)
-       (identifier/non-kw? (syntax name))
-       (let ([exprs (syntax->list (syntax (expr ...)))])
-         (check-single-expression 'define
-                                  (format "after the variable name ~a"
-                                          (syntax-e (syntax name)))
-                                  stx
-                                  exprs
-                                  ;; can't local-expand RHS, because
-                                  ;;  not all top-level defns are ready:
-                                  #f))]
-      ;; Bad name/header:
-      [(_ non-name expr ...)
-       (teach-syntax-error
-        'define
-        stx
-        (syntax non-name)
-        EXPECTED-HEADER
-        (string-append "found " (something-else/kw (syntax non-name))))]
-      ;; Missing name:
-      [(_)
-       (teach-syntax-error
-        'define
-        stx
-        #f
-        EXPECTED-HEADER
-        "nothing's there")]
-      [_else
-       (bad-use-error 'define stx)]))
-  
-  (define (beginner-define/proc stx)
-    (define/proc #t #f stx #'beginner-lambda))
-  
-  (define (define-wish/proc stx)
-    (syntax-case stx ()
-      [(_ name) 
-       (define/proc #t #f 
-         #`(define (#,#'name x) 
-             (begin 
-               (send (send (get-test-engine) get-info) add-wish-call (quote #,#'name))
-               (raise (exn:fail:wish 
-                       (format "wished for function ~a not implemented" (quote #,#'name))
-                       (current-continuation-marks) (quote #,#'name) x)))) #'lambda)]
-      [(_ name default-value)
-       (define/proc #t #f
-         #`(define (#,#'name x) 
-             (begin 
-               (send (send (get-test-engine) get-info) add-wish-call (quote #,#'name))
-               #,#'default-value))
-         #'lambda)]))               
-  
-  (define (intermediate-define/proc stx)
-    (define/proc #f #f stx #'intermediate-pre-lambda))
-  
-  (define (intermediate-lambda-define/proc stx)
-    ;; no special treatment of intermediate-lambda:
-    (define/proc #f #f stx #'beginner-lambda))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; lambda (beginner; only works with define)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (beginner-lambda/proc stx)
-    (syntax-case stx ()
-      [(_ . rest)
-       (teach-syntax-error
-        'lambda
-        stx
-        #f
-        "found a lambda that is not a function definition")]
-      [_else
-       (bad-use-error 'lambda stx)]))
-  
-  (define (intermediate-pre-lambda/proc stx)
-    (beginner-lambda/proc stx))
-  
-  (define (check-defined-lambda rhs)
-    (syntax-case rhs ()
-      [(lam . _)
-       (and (identifier? #'lam)
-            (or (module-identifier=? #'lam #'beginner-lambda)
-                (module-identifier=? #'lam #'intermediate-pre-lambda)))
-       (syntax-case rhs ()
-         [(lam arg-seq lexpr ...)
-          (syntax-case (syntax arg-seq) () [(arg ...) #t][_else #f])
-          (let ([args (syntax->list (syntax arg-seq))])
-            (for-each (lambda (arg)
-                        (unless (identifier/non-kw? arg)
-                          (teach-syntax-error
-                           'lambda
-                           rhs
-                           arg
-                           "expected a variable, but found ~a"
-                           (something-else/kw arg))))
-                      args)
-            (when (null? args)
-              (teach-syntax-error
-               'lambda
-               rhs
-               (syntax arg-seq)
-               "expected at least one variable after lambda, but found none"))
-            (let ([dup (check-duplicate-identifier args)])
-              (when dup
-                (teach-syntax-error
-                 'lambda
-                 rhs
-                 dup
-                 "found a variable that is used more than once: ~a"
-                 (syntax-e dup))))
-            (check-single-result-expr (syntax->list (syntax (lexpr ...)))
-                                      #f
-                                      rhs
-                                      args)
-            'ok)]
-         ;; Bad lambda because bad args:
-         [(lam args . _)
-          (teach-syntax-error
-           'lambda
-           rhs
-           (syntax args)
-           "expected at least one variable (in parentheses) after lambda, but found ~a"
-           (something-else (syntax args)))]
-         ;; Bad lambda, no args:
-         [(lam)
-          (teach-syntax-error
-           'lambda
-           rhs
-           #f
-           "expected at least one variable (in parentheses) after lambda, but nothing's there")]
-         [_else 'ok])]
-      [_else 'ok]))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; define-struct (beginner)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (do-define-struct stx first-order? setters?)
-    
-    (unless (or (ok-definition-context)
-                (identifier? stx))
-      (teach-syntax-error
-       'define-struct
-       stx
-       #f
-       "found a definition that is not at the top level"))
-    
-    (syntax-case stx ()
-      ;; First, check for a struct name:
-      [(_ name . __)
-       (not (identifier/non-kw? (syntax name)))
-       (teach-syntax-error
-        'define-struct
-        stx
-        (syntax name)
-        "expected the structure name after define-struct, but found ~a"
-        (something-else/kw (syntax name)))]
-      ;; Main case (`rest' is for nice error messages):
-      [(_ name_ (field_ ...) . rest)
-       (let ([name (syntax name_)]
-             [fields (syntax->list (syntax (field_ ...)))]
-             [ht (make-hash-table)])
-         (for-each
-          (lambda (field)
-            (unless (identifier? field)
-              (teach-syntax-error
-               'define-struct
-               stx
-               field
-               "expected a field name, but found ~a"
-               (something-else field)))
-            (let ([sym (syntax-e field)])
-              (when (hash-table-get ht sym (lambda () #f))
-                (teach-syntax-error
-                 'define-struct
-                 stx
-                 field
-                 "found a field name that is used more than once: ~a"
-                 sym))
-              (hash-table-put! ht sym #t)))
-          fields)
-         (let ([rest (syntax->list (syntax rest))])
-           (unless (null? rest)
-             (teach-syntax-error
-              'define-struct
-              stx
-              (car rest)
-              "expected nothing after the field names, but found ~a extra part~a"
-              (length rest)
-              (if (> (length rest) 1) "s" ""))))
-         [define-values (struct: constructor-name predicate-name getter-names setter-names)
-           (make-struct-names name fields stx)]
-         [define field# (length fields)]
-         [define signature-name (car (generate-temporaries (list name)))]
-         [define parametric-signature-name (datum->syntax name (format-symbol "~a-of" name))]
-         [define to-define-names (list* constructor-name predicate-name
-                                        (if setters?
-                                            (append getter-names setter-names)
-                                            getter-names))]
-         [define proc-names to-define-names]
-         (define fields-without-location 
-           (map (λ (x) (datum->syntax x (syntax->datum x) #f)) (syntax->list #'(field_ ...))))
-         (with-syntax ([compile-info 
-                        (kw-app build-struct-expand-info name fields #f (not setters?) #t null null
-                                #:omit-struct-type? #t)]
-                       [(field_/no-loc ...) fields-without-location])
-           (define-values (defn0 bind-names)
-             (wrap-func-definitions 
-              first-order? 
-              (list* 'constructor 
-                     'predicate
-                     (map (lambda (x) 'selector) (cddr proc-names)))
-              proc-names
-              (list* (- (length proc-names) 2)
-                     1
-                     (map (lambda (x) 1) (cddr proc-names)))
-              (lambda (def-proc-names)
-                (with-syntax ([(def-proc-name ...) def-proc-names]
-                              [(proc-name ...) proc-names]
-                              [(getter-id ...) getter-names])
-                  (define defns
-                    #`(define-values (#;#,signature-name #,parametric-signature-name def-proc-name ...)
-                        (let ()
-                          (define-values (type-descriptor
-                                          raw-constructor
-                                          raw-predicate
-                                          raw-generic-access
-                                          raw-generic-mutate)
-                            (make-struct-type
-                             'name_
-                             #f
-                             #,field# 1
-                             #f ; auto-v
-                             (list
-                              (cons prop:print-convert-constructor-name
-                                    '#,constructor-name)
-                              (cons prop:print-converter
-                                    (lambda (r recur)
-                                      (list '#,constructor-name
-                                            #,@(map-with-index
-                                                (lambda (i _)
-                                                  #`(recur (raw-generic-access r #,i)))
-                                                fields))))
-                              (cons prop:custom-print-quotable
-                                    'never)
-                              (cons prop:custom-write
-                                    ;; Need a transparent-like printer, but hide auto field.
-                                    ;; This simplest way to do that is to create an instance
-                                    ;; of a transparet structure with the same name and field values.
-                                    (let-values ([(struct:plain make-plain plain? plain-ref plain-set)
-                                                  (make-struct-type 'name_ #f #,field# 0 #f null #f)])
-                                      (lambda (r port mode)
-                                        (let ((v (make-plain
-                                                  #,@(map-with-index (lambda (i _)
-                                                                       #`(raw-generic-access r #,i))
-                                                                     fields))))
-                                          (cond
-                                            [(eq? mode #t) (write v port)]
-                                            [(eq? mode #f) (display v port)]
-                                            [else (print v port mode)])))))
-                              (cons prop:equal+hash
-                                    (list
-                                     (lambda (r1 r2 equal?)
-                                       (and #,@(map-with-index 
-                                                (lambda (i field-spec)
-                                                  #`(equal? (raw-generic-access r1 #,i)
-                                                            (raw-generic-access r2 #,i)))
-                                                fields)))
-                                     (make-equal-hash 
-                                      (lambda (r i) (raw-generic-access r i)) #,field#) 
-                                     (make-equal2-hash
-                                      (lambda (r i) (raw-generic-access r i)) #,field#)))
-                              (cons prop:lazy-wrap
-                                    (make-lazy-wrap-info
-                                     (lambda args (apply #,constructor-name args))
-                                     (list #,@(map-with-index
-                                               (lambda (i _) 
-                                                 #`(lambda (r) (raw-generic-access r #,i)))
-                                               fields))
-                                     (list #,@(map-with-index
-                                               (lambda (i _)
-                                                 #`(lambda (r v) (raw-generic-mutate r #,i v)))
-                                               fields))
-                                     (lambda (r)
-                                       (raw-generic-access r #,field#))
-                                     (lambda (r v)
-                                       (raw-generic-mutate r #,field# v)))))
-                             ;; give `check-struct-wraps!' access
-                             (make-inspector)))
-                          
-                          #,@(map-with-index (lambda (i name field-name)
-                                               #`(define #,name
-                                                   (let ([raw (make-struct-field-accessor
-                                                               raw-generic-access
-                                                               #,i
-                                                               '#,field-name)])
-                                                     (lambda (r)
-                                                       (raw r)))))
-                                             getter-names
-                                             fields)
-                          #,@(map-with-index (lambda (i name field-name)
-                                               #`(define #,name 
-                                                   (let ([raw (make-struct-field-mutator
-                                                               raw-generic-mutate
-                                                               #,i
-                                                               '#,field-name)])
-                                                     (lambda (r v)
-                                                       (raw r v)))))
-                                             setter-names
-                                             fields)
-                          (define #,predicate-name raw-predicate)
-                          (define #,constructor-name raw-constructor)
-                          
-                          (define #,signature-name (signature (predicate raw-predicate)))
-                          
-                          #,(if setters?
-                                #`(define (#,parametric-signature-name field_ ...)
-                                    (signature
-                                     (combined 
-                                      (at name_ (predicate raw-predicate))
-                                      (at field_ (signature:property getter-id field_/no-loc)) ...)))
-                                #`(define (#,parametric-signature-name field_ ...)
-                                    (let* ((sigs (list field_/no-loc ...))
-                                           (sig
-                                            (make-lazy-wrap-signature 'name_ #t
-                                                                      type-descriptor
-                                                                      raw-predicate
-                                                                      sigs
-                                                                      #'name_)))
-                                      (let ((arbs (map signature-arbitrary sigs)))
-                                        (when (andmap values arbs)
-                                          (set-signature-arbitrary! 
-                                           sig
-                                           (apply arbitrary-record
-                                                  #,constructor-name 
-                                                  (list #,@getter-names)
-                                                  arbs))))
-                                      sig)))
-                          
-                          (values #;#,signature-name #,parametric-signature-name proc-name ...))))
-                  ;; --- IN ---
-                  (stepper-syntax-property defns 'stepper-black-box-expr stx)))))
-           ;; --------------------------------------------------------------------------------
-           (define struct-name-size (string-length (symbol->string (syntax-e #'name_))))
-           (define struct-name/locally-introduced (syntax-local-introduce #'name_))
-           
-	   (define signature-name-directive #f)
-           (define parametric-signature-name-directive #f)
-
-           (define struct-name-to-maker-directive
-             (vector (syntax-local-introduce constructor-name)
-                     5
-                     struct-name-size
-                     struct-name/locally-introduced
-                     0
-                     struct-name-size))
-           
-           (define struct-name-to-predicate-directive
-             (vector (syntax-local-introduce predicate-name)
-                     0
-                     struct-name-size
-                     struct-name/locally-introduced
-                     0
-                     struct-name-size))
-           
-           (define (struct->selector-directive selector)
-             (define selector-name/locally-introduced (syntax-local-introduce selector))
-             (vector selector-name/locally-introduced
-                     0
-                     struct-name-size
-                     struct-name/locally-introduced
-                     0
-                     struct-name-size))
-           
-           (define (field->selector-directive field selector)
-             (define field-name/locally-introduced (syntax-local-introduce field))
-             (define field-name-size (string-length (symbol->string (syntax-e field))))
-             (define selector-name/locally-introduced (syntax-local-introduce selector))
-             (vector selector-name/locally-introduced
-                     (+ struct-name-size 1)
-                     field-name-size
-                     field-name/locally-introduced
-                     0
-                     field-name-size))
-           
-           (define (struct->setter-directive setter)
-             (define setter-name/locally-introduced (syntax-local-introduce setter))
-             (vector setter-name/locally-introduced
-                     ;; set-name_-field!
-                     ;; 012|--->|
-                     (string-length "set-")
-                     struct-name-size
-                     struct-name/locally-introduced
-                     0
-                     struct-name-size))
-           
-           (define (field->setter-directive field setter)
-             (define field-name/locally-introduced (syntax-local-introduce field))
-             (define field-name-size (string-length (symbol->string (syntax-e field))))
-             (define setter-name/locally-introduced (syntax-local-introduce setter))
-             (vector setter-name/locally-introduced
-                     ;; set-name_-field!
-                     ;; 012|4...X|--->
-                     (+ (string-length "set-") struct-name-size 1)
-                     field-name-size
-                     field-name/locally-introduced
-                     0
-                     field-name-size))
-           
-           (define all-directives
-             (list* signature-name-directive
-                    parametric-signature-name-directive
-                    struct-name-to-maker-directive
-                    struct-name-to-predicate-directive
-                    (map field->selector-directive fields getter-names)
-                    (map struct->selector-directive getter-names)
-                    (map field->setter-directive fields setter-names)
-                    (map struct->setter-directive setter-names)))
-           
-           ;; --------------------------------------------------------------------------------
-           (define defn1 defn0)
-           (define defn2 
-             (quasisyntax/loc stx
-               (begin
-                 #,(stepper-syntax-property
-                    #`(define-syntaxes (name_) 
-                        (let ()
-                          (racket:define-struct info ()
-                                                #:super struct:struct-info
-                                                ;; support `signature'
-                                                #:property 
-                                                prop:procedure
-                                                (lambda (_ stx)
-                                                  (syntax-case stx ()
-                                                    [(self . args)
-                                                     (raise-syntax-error
-                                                      #f
-                                                      EXPECTED-FUNCTION-NAME
-                                                      stx
-                                                      #'self)]
-                                                    [else
-						      (raise-syntax-error
-                                                      #f
-                                                      (format "structure type; do you mean make-~a"
-							(syntax-e #'name_))
-						      stx
-                                                      stx)
-						      #;#'#,signature-name
-						      ])))
-                          ;; support `shared'
-                          (make-info (lambda () compile-info))))
-                    'stepper-skip-completely
-                    #t)
-                 #,defn1)))
-           (define defn3
-             (check-definitions-new 'define-struct
-                                    stx 
-                                    (list* name parametric-signature-name to-define-names)
-                                    defn2
-                                    (and setters? bind-names)))
-           (define defn4
-             (syntax-property defn3 'disappeared-use (list struct-name/locally-introduced)))
-           (syntax-property defn4 'sub-range-binders all-directives)))]
-      [(_ name_ something . rest)
-       (teach-syntax-error
-        'define-struct
-        stx
-        (syntax something)
-        "expected at least one field name (in parentheses) after the structure name, but found ~a"
-        (something-else (syntax something)))]
-      [(_ name_)
-       (teach-syntax-error
-        'define-struct
-        stx
-        #f
-        EXPECTED-1-FIELD)]
-      [(_)
-       (teach-syntax-error
-        'define-struct
-        stx
-        #f
-        "expected the structure name after define-struct, but nothing's there")]
-      [_else (bad-use-error 'define-struct stx)]))
-  
-  (define (beginner-define-struct/proc stx)
-    (do-define-struct stx #t #f))
-  
-  (define (intermediate-define-struct/proc stx)
-    (do-define-struct stx #f #f))
-  
-  (define (advanced-define-datatype/proc stx)
-    (unless (or (ok-definition-context)
-                (identifier? stx))
-      (teach-syntax-error
-       'define-datatype
-       stx
-       #f
-       "found a definition that is not at the top level"))
-    
-    (syntax-case stx ()
-      
-      ;; First, check for a datatype name:
-      [(_ name . __)
-       (not (identifier/non-kw? (syntax name)))
-       (teach-syntax-error
-        'define-datatype
-        stx
-        (syntax name)
-        "expected a datatype type name after `define-datatype', but found ~a"
-        (something-else/kw (syntax name)))]
-      
-      [(_ name (variant field ...) ...)
-       
-       (let ([find-duplicate
-              (λ (stxs fail-k)
-                (define ht (make-hash-table))
-                (for-each
-                 (λ (s)
-                   (define sym (syntax-e s))
-                   (when (hash-table-get ht sym (λ () #f))
-                     (fail-k s))
-                   (hash-table-put! ht sym #t))
-                 (syntax->list stxs)))])
-         (for-each 
-          (λ (v)
-            (unless (identifier/non-kw? v)
-              (teach-syntax-error
-               'define-datatype
-               stx
-               v
-               "expected a variant name, found ~a"
-               (something-else/kw v))))
-          (syntax->list #'(variant ...)))
-         (find-duplicate #'(variant ...)
-                         (λ (v-stx)
-                           (define v (syntax-e v-stx))
-                           (teach-syntax-error
-                            'define-datatype
-                            stx
-                            v-stx
-                            "found a variant name that is used more than once: ~a"
-                            v)))              
-         
-         (for-each
-          (λ (vf)
-            (with-syntax ([(variant field ...) vf])
-              (for-each
-               (λ (f)
-                 (unless (identifier? f)
-                   (teach-syntax-error
-                    'define-datatype
-                    stx
-                    f
-                    "in variant `~a': expected a field name, found ~a"
-                    (syntax-e #'variant)
-                    (something-else f))))
-               (syntax->list #'(field ...)))
-              (find-duplicate #'(field ...)
-                              (λ (f-stx)
-                                (teach-syntax-error
-                                 'define-datatype
-                                 stx
-                                 f-stx
-                                 "in variant `~a': found a field name that is used more than once: ~a"
-                                 (syntax-e #'variant)
-                                 (syntax-e f-stx))))))
-          (syntax->list #'((variant field ...) ...))))
-       
-       (with-syntax ([(name? variant? ...)
-                      (map (lambda (stx)
-                             (datum->syntax stx (format-symbol "~a?" (syntax->datum stx)) stx))
-                           (syntax->list #'(name variant ...)))])
-         ;; Here we are using an explicit loop and the "/proc" functions instead of producing 
-         ;; a syntax with "..." to preserve the syntax location information.
-         (with-syntax ([the-definition 
-                        (advanced-define/proc 
-                         (syntax/loc stx (define (name? x) (or (variant? x) ...))))]
-                       [(the-struct-definitions ...)
-                        (map
-                         (lambda (v)
-                           (syntax-case v ()
-                             [(variant field ...)
-                              (advanced-define-struct/proc
-                               (syntax/loc stx (define-struct variant (field ...))))]))
-                         (syntax->list #'((variant field ...) ...)))])
-           (syntax/loc stx (begin the-definition the-struct-definitions ...))))]
-      [(_ name_ (variant field ...) ... something . rest)
-       (teach-syntax-error
-        'define-datatype
-        stx
-        (syntax something)
-        "expected a variant after the datatype type name in `define-datatype', ~
-         but found ~a"
-        (something-else (syntax something)))]
-      [(_)
-       (teach-syntax-error
-        'define-datatype
-        stx
-        #f
-        "expected a datatype type name after `define-datatype', but nothing's there")]
-      [_else (bad-use-error 'define-datatype stx)]))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; application (beginner and intermediate)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; For beginner:
-  
-  ;; #%app should never happen in beginner. Primitive operations and
-  ;; defined functions turn into syntax that handle application
-  ;; forms.  The only vaguely legitimate application would involve a
-  ;; poorly implemented teachpack that exports functions instead of
-  ;; primitive operators. Also, #%app is unavoidable in the REPL.
-  
-  ;; An #%app might happen "temporarily" if it appears at the top
-  ;; level before the corresponding function definition. To provide
-  ;; a good error message, we need to wait, and that's what
-  ;; beginner-app-delay does.
-  
-  (define-values (beginner-app/proc intermediate-app/proc)
-    (let ([mk-app
-           (lambda (lex-ok?)
-             (lambda (stx)
-               (syntax-case stx ()
-                 [(_ rator rand ...)
-                  (let* ([fun (syntax rator)]
-                         [binding (and (identifier? fun)
-                                       (identifier-binding fun))]
-                         [lex? (eq? 'lexical binding)]
-                         [bad-app (lambda (what)
-                                    (teach-syntax-error
-                                     '|function call|
-                                     stx
-                                     fun
-                                     "expected a function after the open parenthesis, but found ~a"
-                                     what))])
-                    (unless (and (identifier? fun) (or lex-ok? (not lex?)))
-                      (bad-app (if lex?
-                                   "a variable"
-                                   (something-else fun))))
-                    ;; The following check disallows calling thunks.
-                    ;; It's disabled because we need to allow calls to
-                    ;; primitive thunks.
-                    '(when (null? (syntax->list (syntax (rand ...))))
-                       (teach-syntax-error
-                        '|function call|
-                        stx
-                        #f
-                        "expected an argument after the function, but nothing's there"))
-                    (cond
-                      [(and (not lex-ok?) (binding-in-this-module? binding))
-                       ;; An application of something defined as a constant
-                       (bad-app "a variable")]
-                      [(or lex-ok? (and binding (not (binding-in-this-module? binding))))
-                       (with-syntax ([new-rator (syntax-property #'rator 'was-in-app-position #t)])
-                         (syntax/loc stx (#%app new-rator rand ...)))]
-                      [else
-                       ;; We don't know what rator is, yet, and it might be local:
-                       (with-syntax ([new-rator (syntax-property #'rator 'was-in-app-position #t)])
-                         (quasisyntax/loc 
-                             stx 
-                           (#%app values #,(quasisyntax/loc
-                                               stx
-                                             (beginner-app-continue new-rator rand ...)))))]))]
-                 [(_)
-                  (teach-syntax-error
-                   '|function call|
-                   stx
-                   #f
-                   "expected a function after the open parenthesis, but nothing's there")]
-                 [_else (bad-use-error '|function call| stx)])))])
-      (values (mk-app #f) (mk-app #t))))
-  
-  
-  
-  (define (beginner-app-continue/proc stx)
-    (syntax-case stx ()
-      [(_ rator rand ...)
-       (let* ([fun #'rator]
-              [binding (identifier-binding fun)])
-         (if binding
-             ;; Now defined in the module:
-             (if (set!-transformer? (syntax-local-value fun (lambda () #f)))
-                 ;; Something that takes care of itself:
-                 (syntax/loc stx (rator rand ...))
-                 ;; Something for which we probably need to report an error,
-                 ;;  but let beginner-app take care of it:
-                 (syntax/loc stx (beginner-app rator rand ...)))
-             
-             ;; Something undefined; let beginner-top take care of it:
-             (with-syntax ([new-rator (syntax-property #'rator 'was-in-app-position #t)])
-               (syntax/loc stx (#%app new-rator rand ...)))))]))
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; top-level variables (beginner)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (beginner-top/proc stx)
-    (syntax-case stx ()
-      [(_ . id)
-       (if (not (identifier-binding #'id))
-           (if (syntax-source-module #'id)
-               ;; If we're in a module, we'll need to check that the name
-               ;;  is bound but it might be defined later in the module, so
-               ;; delay the check.
-               (stepper-ignore-checker 
-                (syntax/loc stx (#%app values (beginner-top-continue id))))
-               
-               ;; identifier-finding only returns useful information when inside a module. 
-               ;; At the top-level we need to  do the check at runtime. Also, note that at 
-               ;; the top level there is no need for stepper annotations
-               (syntax/loc stx (#%app top/check-defined #'id)))
-           
-           (syntax/loc stx (#%top . id)))]))
-  
-  
-  (define (beginner-top-continue/proc stx)
-    (syntax-case stx ()
-      [(_ id)
-       (if (not (identifier-binding #'id))
-           ;; If there's still no binding, it's an "unknown name" error.
-           (raise-not-bound-error #'id)
-           
-           ;; Don't use #%top here; id might have become bound to something
-           ;;  that isn't a value.
-           #'id)]))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; cond
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (beginner-cond/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_)
-          (teach-syntax-error
-           'cond
-           stx
-           #f
-           "expected a clause after cond, but nothing's there")]
-         [(_ clause ...)
-          (let* ([clauses (syntax->list (syntax (clause ...)))]
-                 [check-preceding-exprs
-                  (lambda (stop-before)
-                    (let/ec k
-                      (for-each 
-                       (lambda (clause)
-                         (if (eq? clause stop-before)
-                             (k #t)
-                             (syntax-case clause ()
-                               [(question answer)
-                                (begin
-                                  (unless
-                                      (and (identifier? (syntax question))
-                                           (module-identifier=? (syntax question) #'beginner-else))
-                                    (local-expand-for-error (syntax question) 'expression null))
-                                  (local-expand-for-error (syntax answer) 'expression null))])))
-                       clauses)))])
-            (let ([checked-clauses
-                   (map
-                    (lambda (clause)
-                      (syntax-case clause (beginner-else)
-                        [(beginner-else answer)
-                         (let ([lpos (memq clause clauses)])
-                           (when (not (null? (cdr lpos)))
-                             (teach-syntax-error
-                              'cond
-                              stx
-                              clause
-                              "found an else clause that isn't the last clause ~
-                                    in its cond expression"))
-                           (with-syntax ([new-test (stepper-syntax-property #'#t 'stepper-else #t)])
-                             (syntax/loc clause (new-test answer))))]
-                        [(question answer)
-                         (with-syntax ([verified (stepper-ignore-checker 
-                                                  #'(verify-boolean question 'cond))])
-                           (syntax/loc clause (verified answer)))]
-                        [()
-                         (check-preceding-exprs clause)
-                         (teach-syntax-error
-                          'cond
-                          stx
-                          clause
-                          "expected a clause with a question and an answer, but found an empty part")]
-                        [(question?)
-                         (check-preceding-exprs clause)
-                         (teach-syntax-error
-                          'cond
-                          stx
-                          clause
-                          EXPECTED-CLAUSE)]
-                        [(question? answer? ...)
-                         (check-preceding-exprs clause)
-                         (let ([parts (syntax->list clause)])
-                           ;; to ensure the illusion of left-to-right checking, make sure 
-                           ;; the question and first answer (if any) are ok:
-                           (unless (and (identifier? (car parts))
-                                        (module-identifier=? (car parts) #'beginner-else))
-                             (local-expand-for-error (car parts) 'expression null))
-                           (unless (null? (cdr parts))
-                             (local-expand-for-error (cadr parts) 'expression null))
-                           ;; question and answer (if any) are ok, raise a count-based exception:
-                           (teach-syntax-error*
-                            'cond
-                            stx
-                            parts
-                            EXPECTED-GOOD-CLAUSE
-                            (length parts)))]
-                        [_else
-                         (teach-syntax-error
-                          'cond
-                          stx
-                          clause
-                          "expected a clause with a question and an answer, but found ~a"
-                          (something-else clause))]))
-                    clauses)])
-              ;; Add `else' clause for error (always):
-              (define error-call (syntax/loc stx (error 'cond "all question results were false")))
-              [define clauses
-                (append checked-clauses 
-                        (list 
-                         (with-syntax ([error-call error-call]) 
-                           (syntax [else error-call]))))]
-              (with-syntax ([clauses clauses])
-                (syntax/loc stx (cond . clauses)))))]
-         [_else (bad-use-error 'cond stx)]))))
-  
-  (define beginner-else/proc
-    (make-set!-transformer
-     (lambda (stx)
-       (define (bad expr)
-         (teach-syntax-error
-          'else
-          expr
-          #f
-          "not allowed here, because this is not a question in a clause"))
-       (syntax-case stx (set! x)
-         [(set! e expr) (bad #'e)]
-         [(e . expr) (bad #'e)]
-         [e (bad stx)]))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; if
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (beginner-if/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_ test then else)
-          (with-syntax ([new-test (stepper-ignore-checker (syntax (verify-boolean test 'if)))])
-            (syntax/loc stx
-              (if new-test
-                  then
-                  else)))]
-         [(_ . rest)
-          (let ([n (length (syntax->list (syntax rest)))])
-            (teach-syntax-error
-             'if
-             stx
-             #f
-             "expected a question and two answers, but ~a"
-             (cond [(zero? n) "nothing's there"]
-                   [(= n 1) "found only 1 part"]
-                   [(= n 2) "found only 2 parts"]
-                   [else (format "found ~a parts" n)])))]
-         [_else (bad-use-error 'if stx)]))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; or, and
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define-values (beginner-or/proc beginner-and/proc)
-    (let ([mk
-           (lambda (where)
-             (let ([stepper-tag (case where
-                                  [(or) 'comes-from-or]
-                                  [(and) 'comes-from-and])])
-               (with-syntax ([swhere where])
-                 (lambda (stx)
-                   (ensure-expression
-                    stx
-                    (lambda ()
-                      (syntax-case stx ()
-                        [(_ . clauses)
-                         (let ([n (length (syntax->list (syntax clauses)))])
-                           (when (n . < . 2)
-                             (teach-syntax-error
-                              where
-                              stx
-                              #f
-                              (argcount-error-message #f 2 n #t)))
-                           (let loop ([clauses-consumed 0]
-                                      [remaining (syntax->list #`clauses)])
-                             (if (null? remaining)
-                                 (case where
-                                   [(or) #`#f]
-                                   [(and) #`#t])
-                                 (stepper-syntax-property
-                                  (stepper-syntax-property
-                                   (quasisyntax/loc 
-                                       stx
-                                     (if #,(stepper-ignore-checker 
-                                            (quasisyntax/loc stx
-                                              (verify-boolean #,(car remaining) 'swhere)))
-                                         #,@(case where
-                                              [(or) 
-                                               #`(#t
-                                                  #,(loop (+ clauses-consumed 1) (cdr remaining)))]
-                                              [(and)
-                                               #`(#,(loop (+ clauses-consumed 1) (cdr remaining))
-                                                  #f)])))
-                                   'stepper-hint
-                                   stepper-tag)
-                                  'stepper-and/or-clauses-consumed
-                                  clauses-consumed))))]
-                        [_else (bad-use-error where stx)])))))))])
-      (values (mk 'or) (mk 'and))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; quote (symbols)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (beginner-quote/expr/proc stx)
-    (syntax-case stx ()
-      [(_ expr)
-       (let ([id-or-null (syntax expr)])
-         (unless (or (identifier? id-or-null)
-                     (null? (syntax-e id-or-null)))
-           (teach-syntax-error
-            'quote
-            stx
-            #f
-            "expected the name of a symbol or () after the quote, but found ~a"
-            (something-else id-or-null)))
-         (syntax/loc stx (quote expr)))]
-      [_else (bad-use-error 'quote stx)]))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; require
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (check-string-form stx s)
-    (unless (regexp-match #rx#"^[-a-zA-Z0-9_. ]+(/+[-a-zA-Z0-9_. ]+)*$" (syntax-e s))
-      (teach-syntax-error
-       'require
-       stx
-       s
-       (cond
-         [(string=? "" (syntax-e s))
-          "a module-naming string cannot be empty"]
-         [(regexp-match #rx"^/" (syntax-e s))
-          "a module-naming string cannot start with a slash"]
-         [(regexp-match #rx"/$" (syntax-e s))
-          "a module-naming string cannot end with a slash"]
-         [else
-          "a module-naming string can contain only a-z, A-Z, 0-9, -, _, ., space, and slash"]))))
-  
-  (define (version-number? n)
-    (and (number? n) (exact? n) (integer? n) (n . >= . 0)))
-  
-  (define (beginner-require/proc stx)
-    (when (identifier? stx)
-      (bad-use-error 'require stx))
-    (unless (memq (syntax-local-context) '(top-level module module-begin))
-      (teach-syntax-error
-       'define
-       stx
-       #f
-       "found a module require that is not at the top level"))
-    (syntax-case stx (lib planet)
-      [(_ s)
-       (string? (syntax-e #'s))
-       (begin
-         (check-string-form stx #'s)
-         (stepper-syntax-property
-          #'(require s)
-          'stepper-black-box-expr
-          stx))]
-      [(_ id)
-       (identifier? #'id)
-       (begin
-         (unless (module-path? (syntax-e #'id))
-           (teach-syntax-error
-            'require
-            stx
-            #'id
-            "bad syntax for a module path"))
-         (stepper-syntax-property
-          #'(require id)
-          'stepper-black-box-expr
-          stx))]
-      [(_ (lib . rest))
-       (let ([s (syntax->list #'rest)])
-         (unless ((length s) . >= . 1)
-           (teach-syntax-error
-            'require
-            stx
-            #f
-            "expected at least one string with lib, found only ~a parts"
-            (length s)))
-         (for-each (lambda (v)
-                     (unless (string? (syntax-e v))
-                       (teach-syntax-error
-                        'require
-                        stx
-                        v
-                        "expected a string for a lib path, found ~a"
-                        (something-else v)))
-                     (check-string-form stx v))
-                   s)
-         ;; use the original `lib', so that it binds correctly:
-         (syntax-case stx ()
-           [(_ ms) (stepper-syntax-property
-                    #'(require ms)
-                    'stepper-black-box-expr
-                    stx)]))]
-      [(_ (planet . rest))
-       (let ([go
-              (λ ()
-                ;; use the original `planet', so that it binds correctly:
-                (syntax-case stx ()
-                  [(_ ms) (stepper-syntax-property
-                           #'(require ms)
-                           'stepper-black-box-expr
-                           stx)]))])
-         (syntax-case stx (planet)
-           [(_ (planet s1 (s2 s3 n1 n2)))
-            (and (string? (syntax-e #'s1))
-                 (string? (syntax-e #'s2))
-                 (string? (syntax-e #'s3))
-                 (version-number? (syntax-e #'n1))
-                 (version-number? (syntax-e #'n2)))
-            (begin
-              (check-string-form stx #'s1)
-              (check-string-form stx #'s2)
-              (check-string-form stx #'s3)
-              (go))]
-           [(_ (planet a))
-            (or (string? (syntax-e #'a))
-                (symbol? (syntax-e #'a)))
-            (go)]
-           [_else
-            (teach-syntax-error
-             'require
-             stx
-             #f
-             (string-append
-              "not a valid planet path; should be:"
-              " (require (planet STRING (STRING STRING NUMBER NUMBER)))"
-              " (require (planet STRING)) or (require (planet SYMBOL))"))]))]
-      [(_ thing)
-       (teach-syntax-error
-        'require
-        stx
-        #'thing
-        "expected a module name as a string, a `lib' form, or a `planet' form, found ~a"
-        (something-else #'thing))]
-      [(_)
-       (teach-syntax-error
-        'require
-        stx
-        #f
-        "expected a module name after `require', but found nothing")]
-      [(_ . rest)
-       (teach-syntax-error
-        'require
-        stx
-        #f
-        "expected a single module name after `require', but found ~a parts"
-        (length (syntax->list #'rest)))]))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; dots (.. and ... and .... and ..... and ......)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; Syntax Identifier -> Expression
-  ;; Produces an expression which raises an error reporting unfinished code.
-  (define (dots-error stx name)
-    (quasisyntax/loc stx
-      (error (quote (unsyntax name))
-             "expected a finished expression, but found a template")))
-  
-  ;; Expression -> Expression
-  ;; Transforms unfinished code (... and the like) to code
-  ;; raising an appropriate error.
-  (define beginner-dots/proc
-    (make-set!-transformer
-     (lambda (stx)
-       
-       ;; this ensures that coverage happens; it lifts a constant
-       ;; expression to the top level, but one that has the source location of the dots expression
-       (syntax-local-lift-expression (datum->syntax #'here 1 stx))
-       
-       (syntax-case stx (set!)
-         [(set! form expr) (dots-error stx (syntax form))]
-         [(form . rest) (dots-error stx (syntax form))]
-         [form (dots-error stx stx)]))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; local
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (intermediate-local/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_ (definition ...) . exprs)
-          (let ([defns (syntax->list (syntax (definition ...)))]
-                ;; The following context value lets teaching-language definition
-                ;;  forms know that it's ok to expand in this internal
-                ;;  definition context.
-                [int-def-ctx (build-expand-context (make-expanding-for-intermediate-local))])
-            (let* ([partly-expand (lambda (d)
-                                    (local-expand
-                                     d
-                                     int-def-ctx
-                                     (kernel-form-identifier-list)))]
-                   [partly-expanded-defns
-                    (map partly-expand defns)]
-                   [flattened-defns
-                    (let loop ([l partly-expanded-defns][origs defns])
-                      (apply
-                       append
-                       (map (lambda (d orig)
-                              (syntax-case d (begin define-values define-syntaxes)
-                                ;; we don't have to check for ill-formed `define-values'
-                                ;; or `define-syntaxes', because only macros can generate
-                                ;; them
-                                [(begin defn ...)
-                                 (let ([l (map partly-expand (syntax->list (syntax (defn ...))))])
-                                   (loop l l))]
-                                [(define-values . _)
-                                 (list d)]
-                                [(define-syntaxes . _)
-                                 (list d)]
-                                [_else
-                                 (teach-syntax-error
-                                  'local
-                                  stx
-                                  orig
-                                  "expected a definition, but found ~a"
-                                  (something-else orig))]))
-                            l origs)))]
-                   [val-defns
-                    (apply
-                     append
-                     (map (lambda (partly-expanded)
-                            (syntax-case partly-expanded (define-values)
-                              [(define-values (id ...) expr)
-                               (list partly-expanded)]
-                              [_else
-                               null]))
-                          flattened-defns))]
-                   [stx-defns
-                    (apply
-                     append
-                     (map (lambda (partly-expanded)
-                            (syntax-case partly-expanded (define-syntaxes)
-                              [(define-syntaxes (id ...) expr)
-                               (list partly-expanded)]
-                              [_else
-                               null]))
-                          flattened-defns))]
-                   [get-ids (lambda (l)
-                              (apply
-                               append
-                               (map (lambda (partly-expanded)
-                                      (syntax-case partly-expanded ()
-                                        [(_ (id ...) expr)
-                                         (syntax->list (syntax (id ...)))]))
-                                    l)))]
-                   [val-ids (get-ids val-defns)]
-                   [stx-ids (get-ids stx-defns)])
-              (let ([dup (check-duplicate-identifier (append val-ids stx-ids))])
-                (when dup
-                  (teach-syntax-error
-                   'local
-                   stx
-                   dup
-                   "~a was defined locally more than once"
-                   (syntax-e dup)))
-                (let ([exprs (syntax->list (syntax exprs))])
-                  (check-single-expression 'local
-                                           "after the local definitions"
-                                           stx
-                                           exprs
-                                           (append val-ids stx-ids)))
-                (with-syntax ([((d-v (def-id ...) def-expr) ...) val-defns]
-                              [(stx-def ...) stx-defns])
-                  (with-syntax ([(((tmp-id def-id/prop) ...) ...)
-                                 ;; Generate tmp-ids that at least look like the defined
-                                 ;;  ids, for the purposes of error reporting, etc.:
-                                 (map (lambda (def-ids)
-                                        (map (lambda (def-id)
-                                               (list
-                                                (stepper-syntax-property
-                                                 (datum->syntax-object
-                                                  #f
-                                                  (string->uninterned-symbol
-                                                   (symbol->string (syntax-e def-id))))
-                                                 'stepper-orig-name
-                                                 def-id)
-                                                (syntax-property
-                                                 def-id
-                                                 'bind-as-variable
-                                                 #t)))
-                                             (syntax->list def-ids)))
-                                      (syntax->list (syntax ((def-id ...) ...))))])
-                    (with-syntax ([(mapping ...)
-                                   (let ([mappers
-                                          (syntax->list
-                                           (syntax
-                                            ((define-syntaxes (def-id/prop ...)
-                                               (values
-                                                (redirect-identifier-to
-                                                 (quote-syntax set!)
-                                                 (quote-syntax tmp-id))
-                                                ...))
-                                             ...)))])
-                                     (map syntax-track-origin
-                                          mappers
-                                          val-defns
-                                          (syntax->list (syntax (d-v ...)))))])
-                      (stepper-syntax-property
-                       (quasisyntax/loc stx
-                         (let ()
-                           (#%stratified-body
-                            (define #,(gensym) 1) ; this ensures that the expansion of 'local' looks
-                            ; roughly the same, even if the local has no defs.
-                            mapping ...
-                            stx-def ...
-                            (define-values (tmp-id ...) def-expr)
-                            ...
-                            . exprs)))
-                       'stepper-hint
-                       'comes-from-local)))))))]
-         [(_ def-non-seq . __)
-          (teach-syntax-error
-           'local
-           stx
-           (syntax def-non-seq)
-           "expected at least one definition (in square brackets) after local, but found ~a"
-           (something-else (syntax def-non-seq)))]
-         [(_)
-          (teach-syntax-error
-           'local
-           stx
-           #f
-           "expected at least one definition (in square brackets) after local, but nothing's there")]
-         [_else (bad-use-error 'local stx)]))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; letrec and let (intermediate)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; For the `let' forms, match the definitely correct patterns, and
-  ;; put all error checking in `bad-let-form'.
-  
-  (define (intermediate-letrec/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_ ([name rhs-expr] ...) expr)
-          (let ([names (syntax->list (syntax (name ...)))])
-            (and (andmap identifier/non-kw? names)
-                 (not (check-duplicate-identifier names))))
-          (with-syntax ([(tmp-id ...)
-                         ;; Generate tmp-ids that at least look like the defined
-                         ;;  ids, for the purposes of error reporting, etc.:
-                         (map (lambda (name)
-                                (stepper-syntax-property
-                                 (datum->syntax-object
-                                  #f
-                                  (string->uninterned-symbol
-                                   (symbol->string (syntax-e name))))
-                                 'stepper-orig-name
-                                 name))
-                              (syntax->list #`(name ...)))]
-                        [(rhs-expr ...) (map allow-local-lambda 
-                                             (syntax->list (syntax (rhs-expr ...))))])
-            (quasisyntax/loc stx
-              (#%stratified-body
-               (define-syntaxes (name) (redirect-identifier-to
-                                        (quote-syntax set!)
-                                        (quote-syntax tmp-id)))
-               ...
-               (define-values (tmp-id) rhs-expr)
-               ...
-               expr)))]
-         [_else (bad-let-form 'letrec stx stx)]))))
-  
-  (define (intermediate-let/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_ ([name rhs-expr] ...) expr)
-          (let ([names (syntax->list (syntax (name ...)))])
-            (and (andmap identifier/non-kw? names)
-                 (not (check-duplicate-identifier names))))
-          (with-syntax ([(tmp-id ...)
-                         ;; Generate tmp-ids that at least look like the defined
-                         ;;  ids, for the purposes of error reporting, etc.:
-                         (map (lambda (name)
-                                (stepper-syntax-property
-                                 (datum->syntax-object
-                                  #f
-                                  (string->uninterned-symbol
-                                   (symbol->string (syntax-e name))))
-                                 'stepper-orig-name
-                                 name))
-                              (syntax->list #`(name ...)))]
-                        [(rhs-expr ...) (map allow-local-lambda 
-                                             (syntax->list (syntax (rhs-expr ...))))])
-            (quasisyntax/loc stx
-              (let-values ([(tmp-id) rhs-expr] ...)
-                #,(stepper-syntax-property
-                   #`(let-syntaxes ([(name) (redirect-identifier-to
-                                             (quote-syntax set!t)
-                                             (quote-syntax tmp-id))]
-                                    ...)
-                                   expr)
-                   'stepper-skipto
-                   (append
-                    ;; body of let-values:
-                    skipto/third
-                    ;; body of let-values:
-                    skipto/third)))))]
-         [_else (bad-let-form 'let stx stx)]))))
-  
-  (define (intermediate-let*/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_ () expr)
-          (stepper-syntax-property
-           #`(let () expr)
-           'stepper-skipto
-           skipto/third)]
-         [(_ ([name0 rhs-expr0] [name rhs-expr] ...) expr)
-          (let ([names (syntax->list (syntax (name0 name ...)))])
-            (andmap identifier/non-kw? names))
-          (with-syntax ([rhs-expr0 (allow-local-lambda (syntax rhs-expr0))])
-            (stepper-syntax-property
-             (quasisyntax/loc stx
-               (intermediate-let ([name0 rhs-expr0])
-                                 #,(quasisyntax/loc stx 
-                                     (intermediate-let* ([name rhs-expr]
-                                                         ...)
-                                                        expr))))
-             'stepper-hint
-             'comes-from-let*))]
-         [_else (bad-let-form 'let* stx stx)]))))
-  
-  ;; Helper function: allows `intermediate-pre-lambda' instead
-  ;; of rejecting it:
-  (define (allow-local-lambda stx)
-    (syntax-case stx (intermediate-pre-lambda)
-      [(intermediate-pre-lambda . rest)
-       (begin
-         (check-defined-lambda stx)
-         ;; pattern-match again to pull out the formals:
-         (syntax-case stx ()
-           [(_ formals . rest)
-            (quasisyntax/loc stx (lambda formals #,(stepper-syntax-property
-                                                    #`make-lambda-generative
-                                                    'stepper-skip-completely
-                                                    #t)
-                                   . rest))]))]
-      [_else stx]))
-  
-  ;; Helper function:
-  (define (bad-let-form who stx orig-stx)
-    (syntax-case stx ()
-      [(_ (binding ...) . exprs)
-       (let ([bindings (syntax->list (syntax (binding ...)))])
-         (for-each (lambda (binding)
-                     (syntax-case binding ()
-                       [(something . exprs)
-                        (not (identifier/non-kw? (syntax something)))
-                        (teach-syntax-error
-                         who
-                         orig-stx
-                         (syntax something)
-                         "expected a variable for the binding, but found ~a"
-                         (something-else/kw (syntax something)))]
-                       [(name expr)
-                        (void)]
-                       [(name . exprs)
-                        (check-single-expression who
-                                                 (format "after the name ~a"
-                                                         (syntax-e (syntax name)))
-                                                 binding
-                                                 (syntax->list (syntax exprs))
-                                                 #f)]
-                       [_else
-                        (teach-syntax-error
-                         who
-                         orig-stx
-                         binding
-                         "expected a binding with a variable and an expression, but found ~a"
-                         (something-else binding))]))
-                   bindings)
-         (unless (eq? who 'let*)
-           (let ([dup (check-duplicate-identifier (map (lambda (binding)
-                                                         (syntax-case binding ()
-                                                           [(name . _) (syntax name)]))
-                                                       bindings))])
-             (when dup
-               (teach-syntax-error
-                who
-                orig-stx
-                dup
-                "~a was defined locally more than once"
-                (syntax-e dup)))))
-         (let ([exprs (syntax->list (syntax exprs))])
-           (check-single-expression who 
-                                    "after the bindings"
-                                    orig-stx
-                                    exprs
-                                    #f)))]
-      [(_ binding-non-seq . __)
-       (teach-syntax-error
-        who
-        orig-stx
-        (syntax binding-non-seq)
-        "expected at least one binding (in parentheses) after ~a, but found ~a"
-        who
-        (something-else (syntax binding-non-seq)))]
-      [(_)
-       (teach-syntax-error
-        who
-        orig-stx
-        #f
-        "expected at least one binding (in parentheses) after ~a, but nothing's there"
-        who)]
-      [_else
-       (bad-use-error who stx)]))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; recur (intermediate and advanced)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; We can defer some error reporting to `bad-let-form',
-  ;; but not all of it.
-  
-  (define-values (intermediate-recur/proc advanced-recur/proc)
-    (let ([mk
-           (lambda (empty-ok?)
-             (lambda (stx)
-               (ensure-expression
-                stx
-                (lambda ()
-                  (syntax-case stx ()
-                    [(_ fname ([name rhs-expr] ...) expr)
-                     (and (identifier/non-kw? (syntax fname))
-                          (let ([names (syntax->list (syntax (name ...)))])
-                            (and (andmap identifier/non-kw? names)
-                                 (or empty-ok? (pair? names))
-                                 (not (check-duplicate-identifier names)))))
-                     (stepper-syntax-property
-                      (quasisyntax/loc stx
-                        ((intermediate-letrec ([fname
-                                                #,(stepper-syntax-property
-                                                   (stepper-syntax-property 
-                                                    #`(lambda (name ...)
-                                                        expr)
-                                                    'stepper-define-type
-                                                    'shortened-proc-define)
-                                                   'stepper-proc-define-name
-                                                   #`fname)])
-                                              fname)
-                         rhs-expr ...))
-                      'stepper-hint
-                      'comes-from-recur)]
-                    [(_form fname empty-seq . rest)
-                     (and (not empty-ok?)
-                          (identifier/non-kw? (syntax fname))
-                          (null? (syntax-e (syntax empty-seq))))
-                     (teach-syntax-error
-                      'recur
-                      stx
-                      (syntax empty-seq)
-                      EXPECTED-1)]
-                    [(_form fname . rest)
-                     (identifier/non-kw? (syntax fname))
-                     (bad-let-form 'recur (syntax (_form . rest)) stx)]
-                    [(_form fname . rest)
-                     (teach-syntax-error
-                      'recur
-                      stx
-                      #f
-                      "expected a function name after recur, but found ~a"
-                      (something-else/kw (syntax fname)))]
-                    [(_form)
-                     (teach-syntax-error
-                      'recur
-                      stx
-                      #f
-                      "expected a function name after recur, but nothing's there")]
-                    [_else
-                     (bad-use-error 'recur stx)])))))])
-      (values (mk #f) (mk #t))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; lambda (intermediate)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (intermediate-lambda/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_ arg-seq lexpr ...)
-          (syntax-case (syntax arg-seq) () [(arg ...) #t][_else #f])
-          (let ([args (syntax->list (syntax arg-seq))])
-            (for-each (lambda (arg)
-                        (unless (identifier/non-kw? arg)
-                          (teach-syntax-error
-                           'lambda
-                           stx
-                           arg
-                           "expected a variable, but found ~a"
-                           (something-else/kw arg))))
-                      args)
-            (when (null? args)
-              (teach-syntax-error
-               'lambda
-               stx
-               (syntax arg-seq)
-               "expected at least one variable after lambda, but found none"))
-            (let ([dup (check-duplicate-identifier args)])
-              (when dup
-                (teach-syntax-error
-                 'lambda
-                 stx
-                 dup
-                 "found a variable that is used more than once: ~a"
-                 (syntax-e dup))))
-            (check-single-expression 'lambda
-                                     "for the function body"
-                                     stx
-                                     (syntax->list (syntax (lexpr ...)))
-                                     args)
-            (syntax/loc stx (lambda arg-seq lexpr ...)))]
-         ;; Bad lambda because bad args:
-         [(_ args . __)
-          (teach-syntax-error
-           'lambda
-           stx
-           (syntax args)
-           "expected at least one variable (in parentheses) after lambda, but found ~a"
-           (something-else (syntax args)))]
-         [(_)
-          (teach-syntax-error
-           'lambda
-           stx
-           #f
-           "expected at least one variable (in parentheses) after lambda, but nothing's there")]
-         [_else
-          (bad-use-error 'lambda stx)]))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; quote (intermediate)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define intermediate-quote/expr/proc
-    (lambda (stx)
-      (syntax-case stx ()
-        [(_ expr ...)
-         (begin
-           (check-single-expression 'quote
-                                    "after quote"
-                                    stx
-                                    (syntax->list (syntax (expr ...)))
-                                    ;; Don't expand expr!
-                                    #f)
-           (syntax (quote expr ...)))]
-        [_else (bad-use-error 'quote stx)])))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; quasiquote (intermediate)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; This quasiquote uses the right cons, and perhaps provides more
-  ;; suitable error messages. The "right" cons is actually advanced-cons,
-  ;; because it works with shared:
-  
-  (define (intermediate-quasiquote/expr/proc stx)
-    (let loop ([stx (syntax-case stx ()
-                      [(_ stx) (syntax stx)]
-                      [(_ . any)
-                       (teach-syntax-error
-                        'quasiquote
-                        stx
-                        #f
-                        "misuse of quasiquote")]
-                      [_else (bad-use-error 'quasiquote stx)])]
-               [depth 0])
-      (syntax-case stx (intermediate-unquote intermediate-unquote-splicing intermediate-quasiquote)
-        [(intermediate-unquote x)
-         (if (zero? depth)
-             (syntax x)
-             (with-syntax ([x (loop (syntax x) (sub1 depth))]
-                           [uq (stx-car stx)])
-               (syntax/loc stx (list (quote uq) x))))]
-        [intermediate-unquote
-         (teach-syntax-error
-          'quasiquote
-          stx
-          #f
-          "misuse of unquote within a quasiquoting backquote")]
-        [((intermediate-unquote-splicing x) . rest)
-         (if (zero? depth)
-             (with-syntax ([rest (loop (syntax rest) depth)])
-               (syntax (append x rest)))
-             (with-syntax ([x (loop (syntax x) (sub1 depth))]
-                           [rest (loop (syntax rest) depth)]
-                           [uq-splicing (stx-car (stx-car stx))])
-               (syntax/loc stx (the-cons/matchable (list (quote uq-splicing) x) rest))))]
-        [intermediate-unquote-splicing
-         (teach-syntax-error
-          'quasiquote
-          stx
-          #f
-          "misuse of ,@ or unquote-splicing within a quasiquoting backquote")]
-        [(intermediate-quasiquote x)
-         (with-syntax ([x (loop (syntax x) (add1 depth))]
-                       [qq (stx-car stx)])
-           (syntax/loc stx (list (quote qq) x)))]
-        [(a . b)
-         (with-syntax ([a (loop (syntax a) depth)]
-                       [b (loop (syntax b) depth)])
-           (syntax/loc stx (the-cons/matchable a b)))]
-        [any
-         (syntax/loc stx (quote any))])))
-  
-  (define (intermediate-unquote/proc stx)
-    (teach-syntax-error
-     'unquote
-     stx
-     #f
-     "misuse of a comma or unquote, not under a quasiquoting backquote"))
-  
-  (define (intermediate-unquote-splicing/proc stx)
-    (teach-syntax-error
-     'unquote-splicing
-     stx
-     #f
-     "misuse of ,@ or unquote-splicing, not under a quasiquoting backquote"))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; time
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (intermediate-time/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_ . exprs)
-          (check-single-expression 'time 
-                                   "after time"
-                                   stx
-                                   (syntax->list (syntax exprs))
-                                   null)
-          (stepper-syntax-property 
-           (syntax/loc stx (time . exprs))
-           'stepper-skipto
-           (append 
-            ;; let-values-bindings
-            skipto/second
-            ;; rhs of first binding
-            skipto/first
-            skipto/second
-            ;; 2nd term of application:
-            skipto/cdr
-            skipto/second
-            ;; lambda-body:
-            skipto/cddr
-            skipto/first))]
-         [_else
-          (bad-use-error 'time stx)]))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; define (advanced)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (advanced-define/proc stx)
-    ;; Handle the case that doesn't fit into intermediate, then dispatch to 
-    ;; the common code that it also used by beginner/intermediate.
-    (syntax-case stx ()
-      [(_ (name) expr)
-       (and (identifier/non-kw? (syntax name))
-            (ok-definition-context))
-       (check-definition-new
-        'define
-        stx
-        (syntax name)
-        (syntax/loc stx (define (name) expr))
-        (list #'name))]
-      [(_ (name) expr ...)
-       (and (identifier/non-kw? (syntax name))
-            (ok-definition-context))
-       (check-single-result-expr (syntax->list (syntax (expr ...)))
-                                 #f
-                                 stx
-                                 (list #'name))]
-      [(_ . rest)
-       ;; Call transformer define/proc.
-       ;; Note that we call the transformer instead of producing
-       ;; new syntax object that is an `intermediate-define' form;
-       ;; that's important for syntax errors, so that they
-       ;; report `advanced-define' as the source.
-       (define/proc #f #t stx #'beginner-lambda)]
-      [_else
-       (bad-use-error 'define stx)]))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; lambda (advanced)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (advanced-lambda/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_  (name ...) . exprs)
-          (let ([names (syntax->list (syntax (name ...)))])
-            (for-each (lambda (name)
-                        (unless (identifier/non-kw? name)
-                          (teach-syntax-error
-                           'lambda
-                           stx
-                           name
-                           "expected a variable, but found ~a"
-                           (something-else/kw name))))
-                      names)
-            (let ([dup (check-duplicate-identifier names)])
-              (when dup
-                (teach-syntax-error
-                 'lambda
-                 stx
-                 dup
-                 "found a variable that is used more than once: ~a"
-                 (syntax-e dup))))
-            (check-single-expression 'lambda 
-                                     "for the function body"
-                                     stx
-                                     (syntax->list (syntax exprs))
-                                     names)
-            (syntax/loc stx (lambda (name ...) . exprs)))]
-         [(_ arg-non-seq . exprs)
-          (teach-syntax-error
-           'lambda
-           stx
-           (syntax arg-non-seq)
-           "expected at least one variable (in parentheses) after lambda, but found ~a"
-           (something-else (syntax arg-non-seq)))]
-         [(_)
-          (teach-syntax-error
-           'lambda
-           stx
-           #f
-           "expected at least one variable (in parentheses) after lambda, but nothing's there")]
-         [_else
-          (bad-use-error 'lambda stx)]))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; application (advanced)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (advanced-app/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_ rator rand ...)
-          (with-syntax ([new-rator (syntax-property #'rator 'was-in-app-position #t)])
-            (syntax/loc stx (#%app new-rator rand ...)))]
-         [(_)
-          (teach-syntax-error
-           '|function call|
-           stx
-           #f
-           "expected a function after the open parenthesis, but nothing's there")]
-         [_else (bad-use-error '|function call| stx)]))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; set! (advanced)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; We disallow set!s on lambda-bound variables, which we recognize
-  ;; as lexically-bound variables that are not bound to
-  ;; set!-transformer syntax values.
-  
-  (define-values (advanced-set!/proc advanced-set!-continue/proc)
-    (let ([proc
-           (lambda (continuing?)
-             (lambda (stx)
-               (ensure-expression
-                stx
-                (lambda ()
-                  (syntax-case stx ()
-                    [(_ id expr ...)
-                     (identifier? (syntax id))
-                     (let ([exprs (syntax->list (syntax (expr ...)))])
-                       ;; Check that id isn't syntax, and not lexical.
-                       ;; First try syntax:
-                       (let ([binding (syntax-local-value (syntax id) (lambda () #f))])
-                         ;; If it's a transformer binding, then it can take care of itself...
-                         (cond
-                           [(set!-transformer? binding)
-                            ;; no lex check wanted
-                            (void)]
-                           [(not binding)
-                            ;; Now try lexical:
-                            (when (eq? 'lexical (identifier-binding (syntax id)))
-                              (teach-syntax-error
-                               'set!
-                               stx
-                               (syntax id)
-                               EXPECTED-MUTABLE
-                               (syntax-e #'id)))]
-                           [else 
-                            (teach-syntax-error
-                             'set!
-                             stx
-                             (syntax id)
-                             "expected a variable after set!, but found a ~a" (syntax-e #'id))]))
-                       ;; If we're in a module, we'd like to check here whether
-                       ;;  the identier is bound, but we need to delay that check
-                       ;;  in case the id is defined later in the module. So only
-                       ;;  do this in continuing mode:
-                       (when continuing?
-                         (let ([binding (identifier-binding #'id)])
-                           (cond
-                             [(and (not binding)
-                                   (syntax-source-module #'id))
-                              (teach-syntax-error
-                               #f
-                               #'id
-                               #f
-                               "this variable is not defined")]
-                             [(and (list? binding)
-                                   (or (not (module-path-index? (car binding)))
-                                       (let-values ([(path rel) 
-                                                     (module-path-index-split (car binding))])
-                                         path)))
-                              (teach-syntax-error
-                               'set!
-                               #'id
-                               #f
-                               EXPECTED-MUTABLE
-                               (syntax-e #'id))])))
-                       ;; Check the RHS
-                       (check-single-expression 'set!
-                                                "for the new value"
-                                                stx
-                                                exprs
-                                                null)
-                       
-                       (if continuing?
-                           (stepper-syntax-property
-                            (quasisyntax/loc stx
-                              (begin
-                                #,(datum->syntax #'here 
-                                                 `(set! ,#'id ,@(syntax->list #'(expr ...))) 
-                                                 stx)
-                                set!-result))
-                            'stepper-skipto
-                            (append skipto/cdr
-                                    skipto/first))
-                           (stepper-ignore-checker 
-                            (quasisyntax/loc stx
-                              (#%app values 
-                                     #,(advanced-set!-continue/proc
-                                        (syntax/loc stx (_ id expr ...))))))))]
-                    [(_ id . __)
-                     (teach-syntax-error
-                      'set!
-                      stx
-                      (syntax id)
-                      "expected a variable after set!, but found ~a"
-                      (something-else (syntax id)))]
-                    [(_)
-                     (teach-syntax-error
-                      'set!
-                      stx
-                      #f
-                      "expected a variable after set!, but nothing's there")]
-                    [_else (bad-use-error 'set! stx)])))))])
-      (values (proc #f)
-              (proc #t))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; when and unless (advanced)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define-values (advanced-when/proc advanced-unless/proc)
-    (let ([mk
-           (lambda (who target-stx)
-             (lambda (stx)
-               (ensure-expression
-                stx
-                (lambda ()
-                  (syntax-case stx ()
-                    [(_)
-                     (teach-syntax-error
-                      who
-                      stx
-                      #f
-                      "expected a question and an answer, but nothing's there")]
-                    [(_ q)
-                     (teach-syntax-error
-                      who
-                      stx
-                      #'q
-                      "expected a question and an answer, but found only one part")]
-                    [(_ q a)
-                     (with-syntax ([who who]
-                                   [target target-stx])
-                       (syntax/loc stx (target (verify-boolean q 'who) a)))]
-                    [(_ . parts)
-                     (teach-syntax-error*
-                      who
-                      stx
-                      (syntax->list #'parts)
-                      "expected a question and an answer, but found ~a parts" 
-                      (length (syntax->list #'parts)))]
-                    [_else
-                     (bad-use-error who stx)])))))])
-      (values (mk 'when (quote-syntax when))
-              (mk 'unless (quote-syntax unless)))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; define-struct (advanced)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (advanced-define-struct/proc stx)
-    (do-define-struct stx #f #t))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; let (advanced)       >> mz errors in named case <<
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (advanced-let/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_form name . rest)
-          (identifier/non-kw? (syntax name))
-          (begin
-            (bad-let-form 'let (syntax (_form . rest)) stx)
-            (syntax/loc stx (let name . rest)))]
-         [(_ name)
-          (identifier/non-kw? (syntax name))
-          (teach-syntax-error
-           'let
-           stx
-           #f
-           "expected at least one binding (in parentheses) after ~a, but nothing's there"
-           (syntax->datum (syntax name)))]
-         [(_form name . rest)
-          (identifier/non-kw? (syntax name))
-          (bad-let-form 'let (syntax (_form . rest)) stx)]
-         [(_ . rest)
-          (syntax/loc stx (intermediate-let . rest))]
-         [_else
-          (bad-use-error 'let stx)]))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; begin (advanced)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; Mask out the top-level begin
-  (define (advanced-begin/proc stx)
-    (syntax-case stx ()
-      [(_)
-       (teach-syntax-error
-        'begin
-        stx
-        #f
-        "expected at least one expression after begin, but nothing's there")]
-      [(_ e ...)
-       (stepper-syntax-property (syntax/loc stx (let () e ...))
-                                'stepper-hint
-                                'comes-from-begin)]
-      [_else
-       (bad-use-error 'begin stx)]))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; begin0 (advanced)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (advanced-begin0/proc stx)
-    (syntax-case stx ()
-      [(_)
-       (teach-syntax-error
-        'begin0
-        stx
-        #f
-        "expected at least one expression after begin0, but nothing's there")]
-      [(_ e ...)
-       (syntax/loc stx (begin0 e ...))]
-      [_else
-       (bad-use-error 'begin0 stx)]))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; case
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define (advanced-case/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_)
-          (teach-syntax-error
-           'case
-           stx
-           #f
-           "expected an expression after case, but nothing's there")]
-         [(_ expr)
-          (teach-syntax-error
-           'case
-           stx
-           #f
-           EXPECTED-MORE-THAN-NOTHING)]
-         [(_ v-expr clause ...)
-          (let ([clauses (syntax->list (syntax (clause ...)))])
-            (for-each
-             (lambda (clause)
-               (syntax-case clause (beginner-else)
-                 [(beginner-else answer ...)
-                  (let ([lpos (memq clause clauses)])
-                    (when (not (null? (cdr lpos)))
-                      (teach-syntax-error
-                       'case
-                       stx
-                       clause
-                       "found an else clause that isn't the last clause ~
-                                    in its case expression"))
-                    (let ([answers (syntax->list (syntax (answer ...)))])
-                      (check-single-expression 'case
-                                               "for the answer in the case clause"
-                                               clause
-                                               answers
-                                               null)))]
-                 [(choices answer ...)
-                  (let ([choices (syntax choices)]
-                        [answers (syntax->list (syntax (answer ...)))])
-                    (syntax-case choices ()
-                      [(elem ...)
-                       (let ([elems (syntax->list (syntax (elem ...)))])
-                         (for-each (lambda (e)
-                                     (let ([v (syntax-e e)])
-                                       (unless (or (number? v)
-                                                   (symbol? v))
-                                         (teach-syntax-error
-                                          'case
-                                          stx
-                                          e
-                                          EXPECTED-SYMBOL-OR-NUMBER+
-                                          (something-else e)))))
-                                   elems))]
-                      [_else (teach-syntax-error
-                              'case
-                              stx
-                              choices
-                              "expected at least one choice (in parentheses), but found ~a"
-                              (something-else choices))])
-                    (when (stx-null? choices)
-                      (teach-syntax-error
-                       'case
-                       stx
-                       choices
-                       EXPECTED-SYMBOL-OR-NUMBER))
-                    (check-single-expression 'case
-                                             "for the answer in the case clause"
-                                             clause
-                                             answers
-                                             null))]
-                 [()
-                  (teach-syntax-error
-                   'case
-                   stx
-                   clause
-                   EXPECTED-CLAUSE-WITH-CHOICE
-                   "an empty part")]
-                 [_else
-                  (teach-syntax-error
-                   'case
-                   stx
-                   clause
-                   EXPECTED-CLAUSE-WITH-CHOICE
-                   (something-else clause))]))
-             clauses)
-            ;; Add `else' clause for error, if necessary:
-            (let ([clauses
-                   (let loop ([clauses clauses])
-                     (cond
-                       [(null? clauses)
-                        (list
-                         (syntax/loc stx
-                           [else (error 'cases "the expression matched none of the choices")]))]
-                       [(syntax-case (car clauses) (beginner-else)
-                          [(beginner-else . _) (syntax/loc (car clauses) (else . _))]
-                          [_else #f])
-                        => 
-                        (lambda (x) (cons x (cdr clauses)))]
-                       [else (cons (car clauses) (loop (cdr clauses)))]))])
-              (with-syntax ([clauses clauses])
-                (syntax/loc stx (case v-expr . clauses)))))]
-         [_else (bad-use-error 'case stx)]))))
-  
-  ;; match (advanced)
-  (define (advanced-match/proc stx)
-    (ensure-expression
-     stx
-     (lambda ()
-       (syntax-case stx ()
-         [(_)
-          (teach-syntax-error
-           'match
-           stx
-           #f
-           "expected an expression after `match', but nothing's there")]
-         [(_ expr)
-          (teach-syntax-error
-           'match
-           stx
-           #f
-           EXPECTED-MATCH-PATTERN)]
-         [(_ v-expr clause ...)
-          (let ([clauses (syntax->list (syntax (clause ...)))])
-            (for-each
-             (lambda (clause)
-               (syntax-case clause ()
-                 [(pattern answer ...)
-                  (let ([pattern (syntax pattern)]
-                        [answers (syntax->list (syntax (answer ...)))])
-                    (check-single-expression 'match
-                                             "for the answer in a `match' clause"
-                                             clause
-                                             answers
-                                             null))]
-                 [()
-                  (teach-syntax-error
-                   'match
-                   stx
-                   clause
-                   "expected a pattern--answer clause, but found an empty clause")]
-                 [_else
-                  (teach-syntax-error
-                   'match
-                   stx
-                   clause
-                   "expected a pattern--answer clause, but found ~a"
-                   (something-else clause))]))
-             clauses)
-            
-            (letrec
-                ([check-and-translate-qqp
-                  (λ (qqp)
-                    (syntax-case qqp (intermediate-unquote intermediate-unquote-splicing)
-                      [(intermediate-unquote p)
-                       (quasisyntax/loc qqp
-                         (unquote #,(check-and-translate-p #'p)))]
-                      [(intermediate-unquote-splicing p)
-                       (quasisyntax/loc qqp
-                         (unquote-splicing #,(check-and-translate-p #'p)))]
-                      [(qqpi ...)
-                       (quasisyntax/loc qqp
-                         (#,@(map check-and-translate-qqp (syntax->list #'(qqpi ...)))))]
-                      [_
-                       qqp]))]
-                 [check-and-translate-p
-                  (λ (p)
-                    (syntax-case p (struct 
-                                     posn
-                                     beginner-true
-                                     beginner-false
-                                     empty
-                                     intermediate-quote
-                                     intermediate-quasiquote
-                                     advanced-cons
-                                     list
-                                     advanced-list*
-                                     vector
-                                     box)
-                      [beginner-true
-                        (syntax/loc p
-                          #t)]
-                      [beginner-false
-                        (syntax/loc p
-                          #f)]
-                      [empty
-                       (syntax/loc p
-                         (list))]
-                      [(intermediate-quote qp)
-                       (syntax/loc p
-                         (quote qp))]
-                      [(intermediate-quasiquote qqp)
-                       (quasisyntax/loc p
-                         (quasiquote #,(check-and-translate-qqp #'qqp)))]
-                      [(advanced-cons p1 p2)
-                       (quasisyntax/loc p
-                         (cons #,(check-and-translate-p #'p1)
-                               #,(check-and-translate-p #'p2)))]
-                      [(list pi ...)
-                       (quasisyntax/loc p
-                         (list #,@(map check-and-translate-p (syntax->list #'(pi ...)))))]
-                      [(advanced-list* pi ...)
-                       (quasisyntax/loc p
-                         (list* #,@(map check-and-translate-p (syntax->list #'(pi ...)))))]
-                      [(struct posn (pi ...))
-                       (quasisyntax/loc p
-                         (struct posn-id #,(map check-and-translate-p (syntax->list #'(pi ...)))))]
-                      [(struct struct-id (pi ...))
-                       (quasisyntax/loc p
-                         (struct struct-id #,(map check-and-translate-p (syntax->list #'(pi ...)))))]
-                      [(vector pi ...)
-                       (quasisyntax/loc p
-                         (vector #,@(map check-and-translate-p (syntax->list #'(pi ...)))))]
-                      [(box p1)
-                       (quasisyntax/loc p
-                         (box #,(check-and-translate-p #'p1)))]
-                      [_
-                       (let ([v (syntax->datum p)])
-                         (if (or (and (symbol? v)
-                                      (not (member v '(true false empty))))
-                                 (number? v)
-                                 (string? v)
-                                 (char? v))
-                             p
-                             (teach-syntax-error
-                              'match
-                              stx
-                              p
-                              "expected a pattern, but found ~a"
-                              (something-else p))))]))])
-              (let ([clauses
-                     (map (λ (c)
-                            (syntax-case c ()
-                              [(p e)
-                               (quasisyntax/loc c
-                                 (#,(check-and-translate-p #'p) e))]))
-                          clauses)])
-                (with-syntax ([clauses clauses])
-                  (syntax/loc stx
-                    (match v-expr . clauses))))))]
-         [_else (bad-use-error 'match stx)]))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; delay (advanced)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define advanced-delay/proc
-    (lambda (stx)
-      (ensure-expression
-       stx
-       (lambda ()
-         (syntax-case stx ()
-           [(_ expr ...)
-            (begin
-              (check-single-expression 'delay
-                                       "after delay"
-                                       stx
-                                       (syntax->list (syntax (expr ...)))
-                                       null)
-              (syntax (delay expr ...)))]
-           [_else (bad-use-error 'delay stx)])))))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; shared (advanced)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; We do all the initial syntax checks, and otherwise
-  ;; let "shared-body.rkt" implement the form.
-  
-  (define advanced-shared/proc
-    (lambda (stx)
-      (ensure-expression
-       stx
-       (lambda ()
-         ;; Helper for the main implementation
-         (define (make-check-cdr name)
-           (with-syntax ([name name])
-             (syntax (unless (cyclic-list? (cdr name))
-                       (raise-type-error
-                        'cons
-                        "list"
-                        1
-                        (car name)
-                        (cdr name))))))
-         
-         ;; Check the syntax before letting the main implementation go:
-         (syntax-case stx ()
-           [(_ (binding ...) . exprs)
-            (let ([bindings (syntax->list (syntax (binding ...)))])
-              (for-each
-               (lambda (binding)
-                 (syntax-case binding ()
-                   [(id . exprs)
-                    (identifier/non-kw? (syntax id))
-                    (check-single-expression 'shared
-                                             "after the binding name"
-                                             binding
-                                             (syntax->list (syntax exprs))
-                                             #f)]
-                   [(a . rest)
-                    (not (identifier/non-kw? (syntax a)))
-                    (teach-syntax-error
-                     'shared
-                     stx
-                     (syntax a)
-                     "expected a variable for the binding, but found ~a"
-                     (something-else/kw (syntax a)))]
-                   [()
-                    (teach-syntax-error
-                     'shared
-                     stx
-                     #f
-                     "expected a variable for a binding, but nothing's there")]
-                   [_else
-                    (teach-syntax-error
-                     'shared
-                     stx
-                     binding
-                     "expected a binding with a variable and an expression, but found ~a"
-                     (something-else binding))]))
-               bindings)
-              (check-single-expression 'shared
-                                       "after the bindings"
-                                       stx
-                                       (syntax->list (syntax exprs))
-                                       #f)
-              (let ([dup (check-duplicate-identifier (map (lambda (binding)
-                                                            (syntax-case binding ()
-                                                              [(name . _) (syntax name)]))
-                                                          bindings))])
-                (when dup
-                  (teach-syntax-error
-                   'shared
-                   stx
-                   dup
-                   "found a variable that is used more than once: ~a"
-                   (syntax-e dup)))))]
-           [(_ bad-bind . exprs)
-            (teach-syntax-error
-             'shared
-             stx
-             (syntax bad-bind)
-             "expected at least one binding (in parentheses) after shared, but found ~a"
-             (something-else (syntax bad-bind)))]
-           [(_)
-            (teach-syntax-error
-             'shared
-             stx
-             #f
-             "expected at least one binding (in parentheses) after shared, but nothing's there")]
-           [_else (bad-use-error 'shared stx)])
-         
-         ;; The main implementation
-         (shared/proc stx make-check-cdr))))))
-
-;; ----------------------------------------
-;; Utilities for `define-struct':
-
-(define (make-equal-hash generic-access field-count)
-  (lambda (r recur)
-    (let loop ((i 0)
-               (factor 1)
-               (hash 0))
-      (if (= i field-count)
-          hash
-          (loop (+ 1 i)
-                (* factor 33)
-                (+ hash (* factor (recur (generic-access r i)))))))))
-
-(define (make-equal2-hash generic-access field-count)
-  (lambda (r recur)
-    (let loop ((i 0)
-               (factor 1)
-               (hash 0))
-      (if (= i field-count)
-          hash
-          (loop (+ 1 i)
-                (* factor 33)
-                (+ hash (* factor 
-                           (recur (generic-access r (- field-count i 1))))))))))
-
-;; ----------------------------------------
-;; Extend quote forms to work with `match':
-
-(provide beginner-quote
-         intermediate-quote
-         intermediate-quasiquote)
-
-(define-match-expander beginner-quote
-  (syntax-local-value #'beginner-quote/expr)
-  (syntax-local-value #'beginner-quote/expr))
-
-(define-match-expander intermediate-quote
-  (syntax-local-value #'intermediate-quote/expr)
-  (syntax-local-value #'intermediate-quote/expr))
-
-(define-match-expander intermediate-quasiquote
-  ;; Match expander:
-  (let ([qq (syntax-local-value #'intermediate-quasiquote/expr)])
-    (lambda (stx)
-      ;; Call expression version for checking:
-      (qq stx)
-      ;; But then just use `scheme/base' quasiquote and unquotes:
-      (quasisyntax/loc stx
-        (quasiquote
-         #,(let loop ([stx (syntax-case stx ()
-                             [(_ stx) (syntax stx)])]
-                      [depth 0])
-             (syntax-case stx (intermediate-unquote 
-                               intermediate-unquote-splicing
-                               intermediate-quasiquote)
-               [(intermediate-unquote x)
-                (if (zero? depth)
-                    (syntax (unquote x))
-                    (with-syntax ([x (loop (syntax x) (sub1 depth))])
-                      (syntax/loc stx (unquote x))))]
-               [((intermediate-unquote-splicing x) . rest)
-                (if (zero? depth)
-                    (with-syntax ([rest (loop (syntax rest) depth)])
-                      (syntax/loc stx ((unquote-splicing x) . rest)))
-                    (with-syntax ([x (loop (syntax x) (sub1 depth))]
-                                  [rest (loop (syntax rest) depth)])
-                      (syntax/loc stx ((unquote-splicing x) . rest))))]
-               [(intermediate-quasiquote x)
-                (with-syntax ([x (loop (syntax x) (add1 depth))]
-                              [qq (stx-car stx)])
-                  (syntax/loc stx (quasiquote x)))]
-               [(a . b)
-                (with-syntax ([a (loop (syntax a) depth)]
-                              [b (loop (syntax b) depth)])
-                  (syntax/loc stx (a . b)))]
-               [any stx]))))))
-  ;; Expression expander:
-  (syntax-local-value #'intermediate-quasiquote/expr))
-
-(define-match-expander the-cons/matchable
-  ;; For match (no cdr check needed for deconstruction):
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ a b) (syntax/loc stx (cons a b))]))
-  ;; For expressions (cdr check via `the-cons'):
-  (lambda (stx)
-    (with-syntax
-        ([the-cons/tagged (stepper-syntax-property
-                           #'the-cons
-                           'stepper-prim-name
-                           #'cons)])
-      (syntax-case stx ()
-        [(_ a b) (syntax/loc stx (the-cons/tagged a b))]))))
-
-(provide signature :
-         -> mixed one-of predicate combined)
-
-(provide Integer Number Rational Real Natural 
-         Boolean True False
-         String Char Symbol Empty-list
-         Any Unspecific
-         cons-of)
-
-(define Integer (signature/arbitrary arbitrary-integer (predicate integer?)))
-(define Number (signature/arbitrary arbitrary-real (predicate number?)))
-(define Rational (signature/arbitrary arbitrary-rational (predicate rational?)))
-(define Real (signature/arbitrary arbitrary-real (predicate real?)))
-
-(define (natural? x)
-  (and (integer? x)
-       (not (negative? x))))
-
-(define Natural (signature/arbitrary arbitrary-natural (predicate natural?)))
-
-(define Boolean (signature/arbitrary arbitrary-boolean (predicate boolean?)))
-
-(define True (signature (one-of #f)))
-(define False (signature (one-of #f)))
-
-(define String (signature/arbitrary arbitrary-printable-ascii-string (predicate string?)))
-(define Char (signature/arbitrary arbitrary-printable-ascii-string (predicate char?)))
-(define Symbol (signature/arbitrary arbitrary-symbol (predicate symbol?)))
-(define Empty-list (signature (one-of empty)))
-
-(define Any (signature Any %Any))
-
-(define Unspecific (signature Unspecific %Unspecific))
-
-(define (cons-of car-sig cdr-sig)
-  (make-pair-signature #t car-sig cdr-sig))
-
-; QuickCheck
-
-(provide for-all ==>
-         check-property
-         expect expect-within expect-member-of expect-range
-         Property)
-
-(define-syntax (for-all stx)
-  (syntax-case stx ()
-    ((_ (?clause ...) ?body)
-     (with-syntax
-         ((((?id ?arb) ...)
-           (map (lambda (pr)
-                  (syntax-case pr ()
-                    ((?id ?signature)
-                     (identifier? #'?id)
-                     (with-syntax
-                         ((?error-call
-                           (syntax/loc #'?signature (error "Signature does not have a generator"))))
-                       #'(?id
-                          (or (signature-arbitrary (signature ?signature))
-                              ?error-call))))
-                    (_
-                     (raise-syntax-error #f "incorrect `for-all' clause - should have form (id contr)"
-                                         pr))))
-                (syntax->list #'(?clause ...)))))
-       
-       (stepper-syntax-property #'(quickcheck:property 
-                                   ((?id ?arb) ...) ?body)
-                                'stepper-skip-completely
-                                #t)))
-    ((_ ?something ?body)
-     (raise-syntax-error #f "no clauses of them form (id contr)"
-                         stx))
-    ((_ ?thing1 ?thing2 ?thing3 ?things ...)
-     (raise-syntax-error #f "too many operands"
-                         stx))))
-
-(define-syntax (check-property stx)
-  (unless (memq (syntax-local-context) '(module top-level))
-    (raise-syntax-error
-     #f "`check-property' must be at top level" stx))
-  (syntax-case stx ()
-    ((_ ?prop)
-     (stepper-syntax-property
-      (check-expect-maker stx #'check-property-error #'?prop '() 
-                          'comes-from-check-property)
-      'stepper-replace
-      #'#t))
-    (_ (raise-syntax-error #f "`check-property' expects a single operand"
-                           stx))))
-
-(define (check-property-error test src-info test-info)
-  (let ((info (send test-info get-info)))
-    (send info add-check)
-    (with-handlers ((exn:fail?
-                     (lambda (e)
-                       (send info property-error e src-info)
-                       (raise e))))
-      (call-with-values
-       (lambda ()
-         (with-handlers
-             ((exn:assertion-violation?
-               (lambda (e)
-                 ;; minor kludge to produce comprehensible error message
-                 (if (eq? (exn:assertion-violation-who e) 'coerce->result-generator)
-                     (raise (make-exn:fail (string-append "Value must be property or boolean: "
-                                                          ((error-value->string-handler)
-                                                           (car (exn:assertion-violation-irritants e))
-                                                           100))
-                                           (exn-continuation-marks e)))
-                     (raise e)))))
-           (quickcheck-results (test))))
-       (lambda (ntest stamps result)
-         (if (check-result? result)
-             (begin
-               (send info property-failed result src-info)
-               #f)
-             #t))))))
-
-(define (expect v1 v2)
-  (quickcheck:property () (teach-equal? v1 v2)))
-
-(define (ensure-real who n val)
-  (unless (real? val)
-    (raise
-     (make-exn:fail:contract
-      (string->immutable-string
-       (format "~a argument ~e for `~a' is not a real number." n val who))
-      (current-continuation-marks)))))
-
-(define (expect-within v1 v2 epsilon)
-  (ensure-real 'expect-within "Third" epsilon)
-  (quickcheck:property () (beginner-equal~? v1 v2 epsilon)))
-
-(define (expect-range val min max)
-  (ensure-real 'expect-range "First" val)
-  (ensure-real 'expect-range "Second" min)
-  (ensure-real 'expect-range "Third" max)
-  (quickcheck:property () (and (<= min val) (<= val max))))
-
-(define (expect-member-of val . candidates)
-  (quickcheck:property () (ormap (lambda (cand) (teach-equal? val cand)) candidates)))
-
-(define Property
-  (signature (predicate (lambda (x) (or (boolean? x) (property? x))))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/teachhelp.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/teachhelp.rkt
deleted file mode 100644
index e8cc15728b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/teachhelp.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-(module teachhelp mzscheme
-  (require "firstorder.rkt"
-           "rewrite-error-message.rkt"
-           stepper/private/syntax-property
-           (for-template (prefix r: racket/base)))
-
-  (provide make-first-order-function
-           redirect-identifier-to)
-
-  (define (redirect-identifier-to set!-stx tmp-id)
-      (make-set!-transformer
-       (lambda (stx)
-	 (syntax-case stx ()
-	   [(set! id expr)
-	    (module-identifier=? (syntax set!) set!-stx)
-	    (with-syntax ([tmp-id tmp-id])
-	      (syntax/loc stx (set! tmp-id expr)))]
-	   [(id . args)
-            (datum->syntax-object
-             stx
-             (cons '#%app stx)
-             stx
-             stx)]
-	   [id
-            tmp-id]))))
-#;    
-  (define (appropriate-use what)
-    (case what
-     [(constructor)
-      "called with values for the structure fields"]
-     [(selector) 
-      "applied to a structure to get the field value"]
-     [(predicate procedure)
-      "applied to arguments"]))
-
-  (define (make-first-order-function what arity orig-id app)
-    (make-set!-transformer
-     (make-first-order
-      (lambda (stx)
-	(syntax-case stx (set!)
-	  [(set! . _) (raise-syntax-error 
-		       #f stx #f 
-		       "internal error: assignment to first-order function")]
-	  [id
-	   (identifier? #'id)
-	   (raise-syntax-error
-	    #f
-	    (format "expected a function call, but there is no open parenthesis before this function")
-	    stx
-	    #f)]
-	  [(id . rest)
-	   (let ([found (length (syntax->list #'rest))])
-	     (unless (= found arity)
-	       (raise-syntax-error
-		#f
-                (argcount-error-message #f arity found)
-		stx
-		#f))
-	     (datum->syntax-object
-	      app
-	      (list* app (datum->syntax-object orig-id (syntax-e orig-id) #'id #'id) #'rest)
-	      stx stx))]))
-      (syntax-local-introduce orig-id)))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/teachprims.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/teachprims.rkt
deleted file mode 100644
index 14fcc34a1e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/teachprims.rkt
+++ /dev/null
@@ -1,612 +0,0 @@
-#lang scheme 
-
-#| tests are at plt/collects/tests/mzscheme/
-collects/tests/mzscheme/beginner.rkt
-                    .../beginner-abbr.rkt
-                    .../intermediate.rkt
-                    .../intermediate-lambda.rkt
-                    .../advanced.rkt
-
-Each one has to run separately, since they mangle the top-level
-namespace.
-|#
-
-
-(require mzlib/list 
-         mzlib/math
-         mzlib/etc
-	 deinprogramm/signature/signature
-	 deinprogramm/signature/signature-english)
-
-(define-syntax (define-teach stx)
-  (syntax-case stx ()
-    [(_ level id expr)
-     (with-syntax ([level-id (datum->syntax
-                              (syntax id)
-                              (string->symbol
-                               (format "~a-~a"
-                                       (syntax->datum (syntax level))
-                                       (syntax->datum (syntax id))))
-                              (syntax id))])
-       (syntax (define level-id
-                 (let ([id expr])
-                   id))))]))
-
-(provide define-teach)
-
-(define-teach beginner list?
-  (lambda (x)
-    (or (null? x) (pair? x))))
-
-(define cyclic-list? beginner-list?)
-;; don't need a special  anymore, since we just check for pairs:
-
-(define (build-arg-list args)
-  (let loop ([args args][n 0])
-    (cond
-      [(null? args) ""]
-      [(= n 5) " ..."]
-      [else
-       (format " ~e~a" (car args) (loop (cdr args) (add1 n)))])))
-
-(define (mk-check-second ok? type)
-  (lambda (prim-name a b)
-    (unless (ok? b)
-      (raise
-       (make-exn:fail:contract
-        (format "~a: second argument must be ~a ~a, but received ~e and ~e"
-                prim-name (a-or-an type) type
-                a b)
-        (current-continuation-marks))))))
-
-(define check-second 
-  (mk-check-second beginner-list? "list"))
-
-(define check-second/cycle
-  (mk-check-second cyclic-list? "list or cyclic list"))
-
-(define (mk-check-last ok? type)
-  (lambda (prim-name args)
-    (let loop ([l args])
-      (cond
-        [(null? l) (void)]
-        [(null? (cdr l))
-         (let ([last (car l)])
-           (unless (ok? last)
-             (raise
-              (make-exn:fail:contract
-               (format "~a: last argument must be ~a ~a, but received ~e"
-                       prim-name (a-or-an type) type
-                       last)
-               (current-continuation-marks)))))]
-        [else (loop (cdr l))]))))
-
-(define check-last
-  (mk-check-last beginner-list? "list"))
-
-(define check-last/cycle
-  (mk-check-last cyclic-list? "list or cyclic list"))
-
-(define (check-three a b c prim-name ok1? 1type ok2? 2type ok3? 3type)
-  (let ([bad
-         (lambda (v which type)
-           (raise
-            (make-exn:fail:contract
-             (format "~a: ~a argument must be of a ~a, given ~e, ~e, and ~e"
-                     prim-name which type
-                     a b c)
-             (current-continuation-marks))))])
-    (unless (ok1? a) (bad a "first"  1type))
-    (unless (ok2? b) (bad b "second" 2type))
-    (unless (ok3? c) (bad c "third"  3type))))
-
-(define (positive-real? v)
-  (and (real? v) (>= v 0)))
-
-(define (false? v) (eq? v #f))
-
-(define-teach beginner not
-  (lambda (a)
-    (unless (boolean? a)
-      (raise
-       (make-exn:fail:contract
-        (format "not: expected either true or false; given ~e" a)
-        (current-continuation-marks))))
-    (not a)))
-
-(define-teach beginner random 
-  (lambda (a)
-    (random a)))
-
-(define-teach beginner +
-  (lambda (a b . args)
-    (apply + a b args)))
-
-(define-teach beginner /
-  (lambda (a b . args)
-    (apply / a b args)))
-
-(define-teach beginner *
-  (lambda (a b . args)
-    (apply * a b args)))
-
-(define-teach beginner sqr
-  (lambda (a)
-    (unless (number? a)
-      (raise
-       (make-exn:fail:contract
-        (format "sqr: expected a number; given ~e" a)
-        (current-continuation-marks))))
-    (sqr a)))
-
-(define-teach beginner memq
-  (lambda (a b)
-    (check-second 'memq a b)
-    (not (boolean? (memq a b)))))
-
-(define-teach beginner memq?
-  (lambda (a b)
-    (check-second 'memq? a b)
-    (not (boolean? (memq a b)))))
-
-(define-teach beginner member 
-  (lambda (a b)
-    (check-second 'member a b)
-    (not (boolean? (member a b)))))
-
-(define-teach beginner member? 
-  (lambda (a b)
-    (check-second 'member? a b)
-    (not (boolean? (member a b)))))
-
-(define-teach beginner remove
-  (lambda (a b)
-    (check-second 'remove a b)
-    (remove a b)))
-
-(define-teach beginner cons 
-  (lambda (a b)
-    (check-second 'cons a b)
-    (cons a b)))
-
-(define-teach beginner car
-  (lambda (p) (checked-car p)))
-
-(define-teach beginner first
-  (lambda (p) (checked-first p)))
-
-(define-teach beginner cdr
-  (lambda (p) (checked-cdr p)))
-
-(define-teach beginner rest
-  (lambda (p) (checked-rest p)))
-
-(define-teach beginner list*
-  (lambda x
-    (check-last 'list* x)
-    (apply list* x)))
-
-(define-teach beginner range
-  (lambda (start end step)
-    (cerr 'range (real? start) "real" start)
-    (cerr 'range (real? end) "real" end)
-    (cerr 'range (real? step) "real" step)
-    (range start end step)))
-    
-(define-teach beginner append
-  (lambda (a b . x)
-    (check-last 'append (cons a (cons b x)))
-    (apply append a b x)))
-
-(define-teach intermediate append
-  (lambda x
-    (if (null? x)
-        null
-        (begin
-          (check-last 'append x)
-          (apply append x)))))
-
-(define-teach beginner error
-  (lambda stuff0
-    (define-values (f stuff1)
-      (if (and (cons? stuff0) (symbol? (first stuff0)))
-          (values (first stuff0) (rest stuff0))
-          (values false stuff0)))
-    (error (apply
-            string-append
-            (if f (format "~a: " f) "")
-            (for/list ([ele (in-list stuff1)])
-              (if (string? ele)
-                  ele
-                  (format "~e" ele)))))))
-
-(define-teach beginner struct?
-  (lambda (x)
-    (not (or (number? x)
-             (boolean? x)
-             (empty? x)
-             (pair? x)
-             (symbol? x)
-             (string? x)
-             (procedure? x)
-             (vector? x)
-             (char? x)
-             (port? x)
-             (eof-object? x)
-             (void? x)))))
-
-(define-teach beginner exit
-  (lambda () (exit)))
-
-(define (make-union-equal!?)
-  (let* ([ht (make-hasheq)] ;; make-hash
-         [union-find (lambda (a)
-                       (let loop ([prev a]
-                                  [prev-prev a])
-                         (let ([v (hash-ref ht prev #f)])
-                           (if v
-                               (loop v prev)
-                               (begin
-                                 (let loop ([a a])
-                                   (unless (eq? a prev-prev)
-                                     (let ([v (hash-ref ht a)])
-                                       (hash-set! ht a prev)
-                                       (loop v))))
-                                 prev)))))])
-    (lambda (a b)
-      (let ([a (union-find a)]
-	    [b (union-find b)])
-	(if (eq? a b)
-	    #t
-	    (begin
-	      (hash-set! ht b a)
-	      #f))))))
-
-(define (tequal? x y epsilon)
-  (let ([union-equal!? (make-union-equal!?)]
-	[fail (lambda (fmt arg)
-		(raise
-                 (make-exn:fail:contract
-                  (if (or (eq? arg x)
-                          (eq? arg y))
-                      (format fmt arg)
-                      (format "~a (originally comparing ~e and ~e)" (format fmt arg) x y))
-                  (current-continuation-marks))))])
-    (let ? ([a x][b y])
-      (cond
-        [(number? a)
-         (and (number? b)
-              (beginner-=~ a b epsilon))]
-	[(procedure? a)
-	 (fail "first argument of equality cannot be a function, given ~e" a)]
-	[(procedure? b)
-	 (fail "second argument of equality cannot be a function, given ~e" b)]
-        [(union-equal!? a b) #t]
-        [else (equal?/recur a b ?)]))))
-
-(define (teach-equal? x y)
-
-  (let ([fail (lambda (fmt arg)
-		(raise
-                 (make-exn:fail:contract 
-                  (if (or (eq? arg x)
-                          (eq? arg y))
-                      (format fmt arg)
-                      (format "~a (originally comparing ~e and ~e)" (format fmt arg) x y))
-                  (current-continuation-marks))))]
-	[union-equal!? (make-union-equal!?)])
-	      
-    (let recur ([a x] [b y])
-      (cond
-       [(procedure? a)
-	(fail "first argument of equality cannot be a function, given ~e" a)]
-       [(procedure? b)
-	(fail "second argument of equality cannot be a function, given ~e" b)]
-       [(and (number? a)
-	     (inexact? a))
-	(fail "first argument of equality cannot be an inexact number, given ~e" a)]
-       [(and (number? b)
-	     (inexact? b))
-	(fail "first argument of equality cannot be an inexact number, given ~e" b)]
-       [(union-equal!? a b) #t]
-       [else
-	(equal?/recur a b recur)]))))
-
-(define-teach beginner equal?
-  (lambda (a b)
-    (equal? a b)))
-
-(define-teach beginner =~
-  (lambda (a b c)
-    (check-three a b c '=~ number? 'number number? 'number positive-real? 'non-negative-real)
-    (<= (magnitude (- a b)) c)))
-
-(define-teach beginner equal~?
-  (lambda (a b c)
-    (check-three a b c 'equal~? values 'any values 'any positive-real? 'non-negative-real)
-    (tequal? a b c)))
-
-(define (hocheck name fmt-str . x)
-  (raise
-   (make-exn:fail:contract
-    (string-append (format "~a : " name) (apply format fmt-str x))
-    (current-continuation-marks))))
-
-(provide hocheck)
-
-(define-teach intermediate foldr
-  (lambda (f e l)
-    (unless (and (procedure? f) (procedure-arity-includes? f 2))
-      (hocheck 'foldr "first argument must be a function that expects two arguments, given ~e" f))
-    (unless (beginner-list? l) 
-      (hocheck 'foldr "third argument must be a list, given ~e" l))
-    (foldr f e l)))
-
-(define-teach intermediate foldl
-  (lambda (f e l)
-    (unless (and (procedure? f) (procedure-arity-includes? f 2))
-      (hocheck 'foldl "first argument must be a function that expects two arguments, given ~e" f))
-    (unless (beginner-list? l) 
-      (hocheck 'foldl "third argument must be a list, given ~e" l))
-    (foldl f e l)))
-
-(define-teach intermediate build-string
-  (lambda (n f)
-    (unless (and (procedure? f) (procedure-arity-includes? f 1))
-      (hocheck 'build-string
-               "second argument must be a function that accepts one argument, given ~e" f))
-    (unless (and (number? n) (integer? n) (>= n 0))
-      (hocheck 'build-string "first argument must be a natural number, given ~e" n))
-    (build-string n (lambda (i)
-                      (define r (f i))
-                      (unless (char? r)
-                        (hocheck 'build-string
-                                 "the second argument must be a function that produces a character, ~
-                                  given ~e, which produced ~e when given ~e" f r i))
-                      r))))
-
-
-
-(define-teach advanced cons 
-  (lambda (a b)
-    (check-second/cycle 'cons a b)
-    (cons a b)))
-
-(define-teach advanced list*
-  (lambda x
-    (check-last/cycle 'list* x)
-    (apply list* x)))
-
-(define-teach advanced append
-  (lambda x
-    (check-last/cycle 'append x)
-    (apply append x)))
-
-(define-teach advanced make-hash
-  (lambda ([a empty])
-    (make-hash (map (lambda (l) (cons (first l) (second l))) a))))
-
-(define-teach advanced make-hasheq
-  (lambda ([a empty])
-    (make-hasheq (map (lambda (l) (cons (first l) (second l))) a))))
-
-(define-teach advanced make-hasheqv
-  (lambda ([a empty])
-    (make-hasheqv (map (lambda (l) (cons (first l) (second l))) a))))
-
-(define-teach advanced make-immutable-hash
-  (lambda ([a empty])
-    (make-immutable-hash (map (lambda (l) (cons (first l) (second l))) a))))
-
-(define-teach advanced make-immutable-hasheq
-  (lambda ([a empty])
-    (make-immutable-hasheq (map (lambda (l) (cons (first l) (second l))) a))))
-
-(define-teach advanced make-immutable-hasheqv
-  (lambda ([a empty])
-    (make-immutable-hasheqv (map (lambda (l) (cons (first l) (second l))) a))))
-
-(provide  
- false?
- beginner-not
- beginner-random
- beginner-+
- beginner-/
- beginner-*
- beginner-sqr
- beginner-list?
- beginner-member
- beginner-member?
- beginner-memq
- beginner-memq?
- beginner-remove
- beginner-cons
- beginner-car
- beginner-cdr
- beginner-first
- beginner-rest
- beginner-list*
- beginner-range
- beginner-append
- intermediate-append
- beginner-error
- beginner-struct?
- beginner-exit
- beginner-equal?
- beginner-equal~?
- beginner-=~
- intermediate-foldr
- intermediate-foldl
- intermediate-build-string
- advanced-cons
- advanced-list*
- advanced-append
- advanced-make-hash
- advanced-make-hasheq
- advanced-make-hasheqv
- advanced-make-immutable-hash
- advanced-make-immutable-hasheq
- advanced-make-immutable-hasheqv
- cyclic-list?
- teach-equal?)
-
-;; -----------------------------------------------------------------------------
-;; auxiliary stuff, ignore
-
-(define 1-LET "1-letter string")
-(define 1-LETTER (format "~a" 1-LET))
-(define 1-LETTER* (format "list of ~as" 1-LET))
-(define NAT "natural number")
-
-;; Symbol Any -> Boolean 
-;; is this a 1-letter string?
-(define (1-letter? tag s)
-  (unless (string? s) (err tag "expected a ~a, but received a string: ~e" 1-LETTER s))
-  (= (string-length s) 1))
-
-;; Symbol Any -> Boolean 
-;; is s a list of 1-letter strings
-;; effect: not a list, not a list of strings 
-(define (1-letter*? tag s)
-  (unless (list? s) (err tag "expected a ~a, but received: ~e" 1-LETTER* s))
-  (for-each 
-   (lambda (c) 
-     (unless (string? c)
-       (err tag "expected a ~a, but received: ~e\n which contains the non-1-letter string: ~e" 
-            1-LETTER* s c)))
-   s)
-  (andmap (compose (curry = 1) string-length) s))
-
-(define (err tag msg-format . args)
-  (raise 
-   (make-exn:fail:contract
-    (apply format (string-append (symbol->string tag) ": " msg-format) args)
-    (current-continuation-marks))))
-
-(define (a-or-an after)
-  (if (member (string-ref (format "~a" after) 0) '(#\a #\e #\i #\o #\u))
-      "an" "a"))
-
-(define cerr 
-  (case-lambda
-    [(tag check-result format-msg actual)
-     (unless check-result
-       (err tag (string-append "expected " (a-or-an format-msg) " " format-msg ", but received ~e")
-            actual))]
-    [(tag check-result format-msg actual snd)
-     (unless check-result
-       (define a (a-or-an format-msg))
-       (define f (string-append "expected " a " " format-msg " for the ~a argument, but received ~e"))
-       (err tag f snd actual))]))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner string-ith
-  (lambda (s n)
-    (cerr 'string-ith (string? s) "string" s "first")
-    (cerr 'string-ith (and (number? n) (integer? n) (>= n 0)) NAT n "second")
-    (define l (string-length s))
-    (define f (format "exact integer in [0, ~a) (i.e., less than the length of the given string)" l))
-    (cerr 'string-ith (< n l) f n "second")
-    (string (string-ref s n))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner replicate 
-  (lambda (n s1)
-    (cerr 'replicate (and (number? n) (exact-integer? n) (>= n 0)) NAT n)
-    (cerr 'replicate (string? s1) "string" s1)
-    (apply string-append (build-list n (lambda (i) s1)))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner int->string 
-  (lambda (i) 
-    (cerr 'int->string 
-          (and (exact-integer? i) (or (<= 0 i 55295) (<= 57344 i 1114111)))
-          "exact integer in [0,55295] or [57344 1114111]"
-          i)
-    (string (integer->char i))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner string->int 
-  (lambda (s) 
-    (cerr 'string->int (1-letter? 'string->int s) 1-LETTER s)
-    (char->integer (string-ref s 0))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner explode 
-  (lambda (s)
-    (cerr 'explode (string? s) "string" s)
-    (map string (string->list s))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner implode
-  (lambda (los)
-    (cerr 'implode (1-letter*? 'implode los) 1-LETTER* los)
-    (apply string-append los)))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner string-numeric? 
-  ;; is this: (number? (string->number s)) enough?
-  (lambda (s1)
-    (cerr 'string-numeric? (string? s1) "string" s1)
-    (andmap char-numeric? (string->list s1))))
-
-;; -----------------------------------------------------------------------------
-
-;; I used copying here and I feel awful. 
-
-(define-teach beginner string-alphabetic? 
-  (lambda (s1)
-    (cerr 'string-alphabetic? (string? s1) "string" s1)
-    (andmap char-alphabetic? (string->list s1))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner string-whitespace? 
-  (lambda (s)
-    (cerr 'string-whitespace? (string? s)  "string" s)
-    (andmap char-whitespace? (string->list s))))
-
-;; -----------------------------------------------------------------------------
-;; I copied the next two, and I feel awful, too. 
-
-(define-teach beginner string-upper-case? 
-  (lambda (s)
-    (cerr 'string-upper-case? (string? s) "string" s)
-    (andmap char-upper-case? (string->list s))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner string-lower-case? 
-  (lambda (s)
-    (cerr 'string-lower-case? (string? s) "string" s)
-    (andmap char-lower-case? (string->list s))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner string-contains? 
-  (lambda (s t)
-    (cerr 'string-contains? (string? s) "string" s)
-    (cerr 'string-contains? (string? t) "string" t)
-    (regexp-match? (regexp-quote s) t)))
-
-(provide
- beginner-string-ith
- beginner-replicate
- beginner-int->string 
- beginner-string->int
- beginner-explode
- beginner-implode
- beginner-string-numeric?
- beginner-string-alphabetic?
- beginner-string-whitespace?
- beginner-string-upper-case?
- beginner-string-lower-case?
- beginner-string-contains?
- )
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/textbook-pls-spec.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/textbook-pls-spec.rkt
deleted file mode 100644
index 044e367496..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/textbook-pls-spec.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-(require string-constants)
-
-(provide textbook-pls)
-
-(define textbook-pls
-  (list (list '("htdp-icon.gif" "icons")
-              "How to Design Programs"
-              (string-constant teaching-languages)
-              (string-constant how-to-design-programs)
-              (string-constant beginning-student))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/todo.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/todo.rkt
deleted file mode 100644
index a4ba00f93c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/todo.rkt
+++ /dev/null
@@ -1,247 +0,0 @@
-#lang scheme
-
-#| QQQ: okay?
-char-upcase:   use string-upcase instead
-char-downcase: use string-downcase instead 
-string:        use string-append instead 
-|#
-
-#| QQQ: I noticed an oddity: 
-substring consumes 2 or 3 arguments 
-|#
-
-(define-syntax (define-teach stx)
-  (syntax-case stx ()
-    [(_ level id expr)
-     (with-syntax ([level-id (datum->syntax
-                              (syntax id)
-                              (string->symbol
-                               (format "~a-~a"
-                                       (syntax->datum (syntax level))
-                                       (syntax->datum (syntax id))))
-                              (syntax id))])
-       (syntax (define level-id
-                 (let ([id expr])
-                   id))))]))
-
-;; -----------------------------------------------------------------------------
-;; auxiliary stuff, ignore
-
-(define 1-LET "1-letter string")
-(define 1-LETTER (format "<~a>" 1-LET))
-(define 1-LETTER* (format "<list of ~as>" 1-LET))
-(define NAT "<natural number>")
-
-;; Symbol Any -> Boolean 
-;; is this a 1-letter string?
-(define (1-letter? tag s)
-  (unless (string? s) (err tag "~a expected, not a string: ~e" 1-LETTER s))
-  (= (string-length s) 1))
-
-;; Symbol Any -> Boolean 
-;; is s a list of 1-letter strings
-;; effect: not a list, not a list of strings 
-(define (1-letter*? tag s)
-  (unless (list? s) (err tag "~a expected, not a <list>: ~e" 1-LETTER* s))
-  (for-each 
-   (lambda (c) 
-     (unless (string? c) (err tag "~a expected, not a <string>: ~e" 1-LETTER* c)))
-   s)
-  (andmap (compose (curry = 1) string-length) s))
-
-(define (err tag msg-format . args)
-  (raise 
-   (make-exn:fail:contract
-    (apply format (string-append (symbol->string tag) ": " msg-format) args)
-    (current-continuation-marks))))
-
-(define cerr 
-  (case-lambda
-    [(tag check-result format-msg actual)
-     (unless check-result
-       (err tag (string-append format-msg " expected, given ~e") actual))]
-    [(tag check-result format-msg actual snd)
-     (unless check-result
-       (err tag (string-append format-msg " for ~a argument expected, given ~e")
-            snd actual))]))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner string-ith
-  (lambda (s n)
-    (define f "<exact integer in [0, length of the given string (~s)]>")
-    (cerr 'string-ith (string? s) "<string>" s "first")
-    (cerr 'string-ith (and (number? n) (integer? n) (>= n 0)) NAT n "second")
-    (let ([l (string-length s)]) 
-      (cerr 'string-ith (< n l) (format f l) n "second"))
-    (string (string-ref s n))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner replicate 
-  (lambda (n s1)
-    (cerr 'replicate (and (number? n) (exact-integer? n) (>= n 0)) NAT n)
-    (cerr 'replicate (string? s1) "<string>" s1)
-  (apply string-append (build-list n (lambda (i) s1)))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner int->string 
-  (lambda (i) 
-    (cerr 'int->string 
-          (and (exact-integer? i) (or (<= 0 i 55295) (<= 57344 i 1114111)))
-          "<exact integer in [0,55295] or [57344 1114111]>"
-          i)
-    (string (integer->char i))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner string->int 
-  (lambda (s) 
-    (cerr 'string->int (1-letter? 'string->int s) 1-LETTER s)
-    (char->integer (string-ref s 0))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner explode 
-  (lambda (s)
-    (cerr 'explode (string? s) "<string>" s)
-    (map string (string->list s))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner implode
-  (lambda (los)
-    (cerr 'implode (1-letter*? 'implode los) 1-LETTER* los)
-    (apply string-append los)))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner string-numeric? 
-  ;; is this: (number? (string->number s)) enough?
-  (lambda (s1)
-    (cerr 'string-numeric? (string? s1) "<string>" s1)
-    (andmap char-numeric? (string->list s1))))
-
-;; -----------------------------------------------------------------------------
-
-;; I used copying here and I feel awful. 
-
-(define-teach beginner string-alphabetic? 
-  (lambda (s1)
-    (cerr 'string-alphabetic? (string? s1) "<string>" s1)
-    (andmap char-alphabetic? (string->list s1))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner string-whitespace? 
-  (lambda (s)
-    (cerr 'string-upper-case? (string? s)  "<string>" s)
-    (andmap char-whitespace? (string->list s))))
-
-;; -----------------------------------------------------------------------------
-;; I copied the next two, and I feel awful, too. 
-
-(define-teach beginner string-upper-case? 
-  (lambda (s)
-    (cerr 'string-upper-case? (string? s) "<string>" s)
-    (andmap char-upper-case? (string->list s))))
-
-;; -----------------------------------------------------------------------------
-
-(define-teach beginner string-lower-case? 
-  (lambda (s)
-    (cerr 'string-lower-case? (string? s) "<string>" s)
-    (andmap char-lower-case? (string->list s))))
-
-;; -----------------------------------------------------------------------------
-;; -----------------------------------------------------------------------------
-;; -----------------------------------------------------------------------------
-
-(require test-engine/scheme-tests)
-
-(check-expect (beginner-string-ith "hell" 0) "h")
-(check-error
- (beginner-string-ith "hell" 4) 
- (string-append 
-  "string-ith:"
-  " <exact integer in [0, length of the given string (4)]>"
-  " for second argument expected, given "
-  "4"))
-
-(check-error
- (beginner-string-ith 10 4) 
- (string-append "string-ith: <string> for first argument expected, given "
-                "10"))
-
-(check-error
- (beginner-string-ith "10" 'a)
- (string-append "string-ith: <natural number> for second argument expected, given "
-                "a"))
-
-
-(check-expect (beginner-replicate 3 "a") "aaa")
-(check-expect (beginner-replicate 3 "ab") "ababab")
-(check-error (beginner-replicate 3 10) "replicate: <string> expected, given 10")
-
-(check-expect (beginner-int->string 10) "\n")
-(check-error 
- (beginner-int->string 56555) 
- (string-append 
-  "int->string: <exact integer in [0,55295] or [57344 1114111]> expected, given "
-  "56555"))
-(check-error 
- (beginner-int->string "A") 
- (string-append 
-  "int->string: <exact integer in [0,55295] or [57344 1114111]> expected, given "
-  (format "~s" "A")))
-
-(check-expect (beginner-string->int "A") 65)
-(check-error 
- (beginner-string->int 10) 
- (string-append "string->int: " 1-LETTER " expected, not a string: 10"))
-(check-error 
- (beginner-string->int "AB") 
- (string-append
-   "string->int: " 1-LETTER " expected, given " (format "~s" "AB")))
-
-(check-expect (beginner-explode "hello") (list "h" "e" "l" "l" "o"))
-(check-error (beginner-explode 10) 
-             (string-append "explode: <string> expected, given " "10"))
-
-(check-expect (beginner-implode (list "h" "e" "l" "l" "o")) "hello")
-(check-error (beginner-implode 10)
-             (string-append "implode: " 1-LETTER* 
-                            " expected, not a <list>: 10"))
-(check-error (beginner-implode '("he" "l"))
-             (string-append "implode: " 1-LETTER* " expected, given " 
-                            (format "~s" '("he" "l"))))
-
-(check-expect (beginner-string-numeric? "0") true)
-(check-expect (beginner-string-numeric? "10") true)
-(check-expect (beginner-string-numeric? "a") false)
-(check-expect (beginner-string-numeric? "ab") false)
-(check-error (beginner-string-numeric? 10)
-             (string-append "string-numeric?: <string> expected, given 10"))
-
-
-(check-expect (beginner-string-alphabetic? "a0") false)
-(check-expect (beginner-string-alphabetic? "a") true)
-(check-expect (beginner-string-alphabetic? "ba") true)
-(check-expect (beginner-string-alphabetic? "ab") true)
-
-(check-expect (beginner-string-whitespace? "  ") true)
-(check-expect (beginner-string-whitespace? "  \t") true)
-(check-expect (beginner-string-whitespace? "ABC") false)
-
-(check-expect (beginner-string-upper-case? "  ") false)
-(check-expect (beginner-string-upper-case? "AB\t") false)
-(check-expect (beginner-string-upper-case? "ABC") true)
-
-(check-expect (beginner-string-lower-case? "  ") false)
-(check-expect (beginner-string-lower-case? "ab\t") false)
-(check-expect (beginner-string-lower-case? "abc") true)
-
-
-
-(test)
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/tp-dialog.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/tp-dialog.rkt
deleted file mode 100644
index 09666fa824..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/private/tp-dialog.rkt
+++ /dev/null
@@ -1,428 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class
-         racket/path
-         racket/file
-         racket/set
-         setup/collects
-         setup/dirs
-         setup/getinfo
-         syntax/modread
-         syntax/modcode
-         syntax/modresolve
-         string-constants
-         framework
-         compiler/compile-file
-         
-         "create-htdp-executable.rkt")
-
-(provide get-teachpack-from-user)
-
-(define user-installed-teachpacks-collection "installed-teachpacks")
-(define teachpack-installation-dir 
-  (build-path (find-user-collects-dir) user-installed-teachpacks-collection))
-
-(define (get-teachpack-from-user parent tp-dirs labels tp-syms [already-installed-teachpacks '()])
-  (define tpss (map tp-dir->tps tp-syms))
-  
-  (define label+mpss
-    (let ([all-filenames 
-           (apply
-            append
-            (map (λ (tps)
-                   (map (λ (tp) (list-ref tp 0)) tps))
-                 tpss))])
-      (for/list ([tps (in-list tpss)])
-        (for/list ([tp (in-list tps)])
-          (define filename (list-ref tp 0))
-          (define mp (list-ref tp 1))
-          (list (path->string 
-                 (or (shrink-path-wrt filename all-filenames)
-                     (let-values ([(base name dir?) (split-path filename)])
-                       name)))
-                mp)))))
-  
-  (define already-installed-labels
-    (for/list ([already-installed-teachpack (in-list already-installed-teachpacks)])
-      (let/ec k
-        (for ([label+mps (in-list label+mpss)])
-          (for ([label+mp (in-list label+mps)])
-            (when (equal? (list-ref label+mp 1) already-installed-teachpack)
-              (k (list-ref label+mp 0)))))
-        ;; shouldn't happen, but this will be a slightly graceful fallback, I hope
-        (format "~s" already-installed-teachpack))))
-  
-  (define pre-installed-tpss 
-    (for/list ([label+mps (in-list label+mpss)])
-      (sort label+mps string<? #:key car)))
-  
-  (define dlg (new (frame:focus-table-mixin dialog%) 
-                   [parent parent]
-                   [label (string-constant drscheme)]))
-  (define hp (new horizontal-panel% [parent dlg]))
-  (define answer #f)
-  (define compiling? #f)
-  
-  (define pre-installed-gbs (map (λ (tps label)
-                                   (new group-box-panel%
-                                        [label label]
-                                        [parent hp]))
-                                 tpss labels))
-  (define user-installed-gb (new group-box-panel%
-                                 [label (string-constant teachpack-user-installed)]
-                                 [parent hp]))
-  
-  (define pre-installed-lbs
-    (map (λ (pre-installed-gb pre-installed-tps)
-           (define lb 
-             (new list-box%
-                  [label #f]
-                  [choices (map (λ (x) (gui-utils:trim-string (list-ref x 0) 200))
-                                pre-installed-tps)]
-                  [stretchable-height #t]
-                  [min-height 300]
-                  [min-width 200]
-                  [callback
-                   (λ (this evt)
-                     (case (send evt get-event-type)
-                       [(list-box-dclick) 
-                        (update-button-and-conflict)
-                        (selected this)]
-                       [else
-                        (for ([x (in-list (cons user-installed-lb
-                                                pre-installed-lbs))]
-                              #:unless (eq? x this))
-                          (clear-selection x))
-                        (update-button-and-conflict)]))]
-                  [parent pre-installed-gb]))
-           (for ([i (in-naturals)]
-                 [tp (in-list pre-installed-tps)])
-             (send lb set-data i (list-ref tp 1)))
-           lb)
-         pre-installed-gbs
-         pre-installed-tpss))
-  
-  (define user-installed-lb
-    (new list-box%
-         [label #f]
-         [choices '()]
-         [stretchable-height #t]
-         [min-width 200]
-         [callback
-          (λ (x evt)
-            (case (send evt get-event-type)
-              [(list-box-dclick) 
-               (update-button-and-conflict)
-               (selected user-installed-lb)]
-              [else
-               (for ([pre-installed-lb (in-list pre-installed-lbs)])
-                 (clear-selection pre-installed-lb))
-               (update-button-and-conflict)]))]
-         [parent user-installed-gb]))
-  
-  (define (selected lb)        
-    (when (send lb get-selection)
-      (when (and viable-action?
-                 (not conflict-tp))
-        (unless compiling?
-          (set! answer (figure-out-answer))
-          (send dlg show #f)))))
-  
-  (define (clear-selection lb)
-    (for-each
-     (λ (x) (send lb select x #f))
-     (send lb get-selections)))
-  
-  (define add-button (new button%
-                          [parent user-installed-gb]
-                          [label (string-constant add-teachpack-to-list...)]
-                          [callback (λ (x y) (install-teachpack))]))
-  
-  (define (install-teachpack)
-    (let ([file (get-file (string-constant select-a-teachpack) dlg)])
-      (when file
-        (let-values ([(base name dir) (split-path file)])
-          (let ([dest-file (build-path teachpack-installation-dir name)])
-            (when (or (not (file-exists? dest-file))
-                      (equal? 1
-                              (message-box/custom
-                               (string-constant drscheme)
-                               (format
-                                (string-constant teachpack-already-installed)
-                                (path->string name))
-                               (string-constant overwrite)
-                               (string-constant cancel)
-                               #f
-                               dlg
-                               '(default=2 caution))))
-              (make-directory* teachpack-installation-dir)
-              (when (file-exists? dest-file)
-                (delete-file dest-file))
-              (copy-file file dest-file)
-              
-              ;; compiling the teachpack should be the last thing in this GUI callback
-              (compile-new-teachpack dest-file)))))))
-  
-  (define (compile-new-teachpack filename)
-    (let-values ([(_1 short-name _2) (split-path filename)])
-      (cond
-        [(cannot-compile? filename)
-         (post-compilation-gui-cleanup short-name)]
-        [else
-         (send compiling-message set-label
-               (format (string-constant compiling-teachpack) 
-                       (path->string short-name)))
-         (starting-compilation)
-         (let ([nc (make-custodian)]
-               [exn #f])
-           (let ([t 
-                  (parameterize ([current-custodian nc])
-                    (thread (λ () 
-                              (with-handlers ((exn? (λ (x) (set! exn x))))
-                                (parameterize ([current-namespace (make-base-namespace)])
-                                  (with-module-reading-parameterization
-                                   (lambda ()
-                                     (compile-file filename))))))))])
-             (thread
-              (λ ()
-                (thread-wait t)
-                (queue-callback
-                 (λ () 
-                   (cond
-                     [exn
-                      (message-box (string-constant drscheme)
-                                   (exn-message exn))
-                      (delete-file filename)
-                      (update-user-installed-lb)]
-                     [else
-                      (post-compilation-gui-cleanup short-name)])
-                   (done-compilation)
-                   (send compiling-message set-label "")))))))])))
-  
-  (define (post-compilation-gui-cleanup short-name)
-    (update-user-installed-lb)
-    (for ([pre-installed-lb (in-list pre-installed-lbs)])
-      (clear-selection pre-installed-lb))
-    (send user-installed-lb set-string-selection (path->string short-name)))
-  
-  (define (starting-compilation)
-    (set! compiling? #t)
-    (update-button-and-conflict)
-    (send cancel-button enable #f))
-  
-  (define (done-compilation)
-    (set! compiling? #f)
-    (update-button-and-conflict)
-    (send cancel-button enable #t))
-  
-  (define (update-user-installed-lb)
-    (let ([files
-           (if (directory-exists? teachpack-installation-dir)
-               (map path->string 
-                    (filter 
-                     (λ (x) (file-exists? (build-path teachpack-installation-dir x)))
-                     (directory-list teachpack-installation-dir)))
-               '())])
-      (send user-installed-lb set (sort files string<=?))))
-  
-  (define viable-action? #f)
-  (define conflict-tp #f)
-  
-  (define (update-button-and-conflict)
-    ;; figuring out if there is a conflict.
-    (define-values (tp-req tp-label) (figure-out-answer/f))
-    (set! conflict-tp #f)
-    (define conflict-name #f)
-    (define conflict-label #f)
-    (when tp-req
-      (let/ec k
-        (for ([existing-tp (in-list already-installed-teachpacks)]
-              [existing-tp-label (in-list already-installed-labels)])
-          (unless (equal? existing-tp tp-req)
-            (define conflict (teachpacks-conflict existing-tp tp-req))
-            (when conflict
-              (set! conflict-tp existing-tp)
-              (set! conflict-name conflict)
-              (set! conflict-label existing-tp-label)
-              (k (void)))))))
-    (cond
-      [conflict-tp
-       (send conflict-txt lock #f)
-       (send conflict-txt begin-edit-sequence)
-       (send conflict-txt erase)
-       ;; answer must be non #f here
-       ;; also conflict-message must be non #f, too
-       (send conflict-txt insert 
-             (format (string-constant teachpack-conflict)
-                     conflict-label
-                     tp-label
-                     conflict-name))
-       (send conflict-txt change-style red-sd 0 (send conflict-txt last-position))
-       (send conflict-txt end-edit-sequence)
-       (send conflict-txt lock #t)]
-      [else
-       (when conflict-txt
-         (send conflict-txt lock #f)
-         (send conflict-txt begin-edit-sequence)
-         (send conflict-txt erase)
-         (send conflict-txt end-edit-sequence)
-         (send conflict-txt lock #t))])
-
-    (set! viable-action?
-          (or (pair? (send user-installed-lb get-selections))
-              (ormap (λ (pre-installed-lb)
-                       (pair? (send pre-installed-lb get-selections)))
-                     pre-installed-lbs)))
-        
-    ;; updating buttons
-    (send ok-button enable 
-          (and viable-action? 
-               (not compiling?)
-               (not conflict-tp)))
-    
-    (send replace-button show (and viable-action? 
-                                   (not compiling?)
-                                   conflict-tp))
-    (send replace-button set-label (if (and viable-action? conflict-tp)
-                                       (format (string-constant remove-and-add-teachpack)
-                                               conflict-label tp-label)
-                                       "")))
-    
-  
-  (define red-sd (new style-delta%))
-  (send red-sd set-delta-foreground (make-object color% 200 0 0))
-  
-  (define conflict-txt 
-    (and (not (null? already-installed-teachpacks))
-         (let ([t (new text:hide-caret/selection%)])
-           (send t lock #t)
-           (send t auto-wrap #t)
-           (send t set-autowrap-bitmap #f)
-           t)))
-  (define conflict-ed
-    (and conflict-txt
-         (new editor-canvas% 
-              [parent dlg]
-              [editor conflict-txt]
-              [style '(auto-vscroll no-hscroll no-border transparent)]
-              [line-count 2])))
-  
-  (define button-panel (new horizontal-panel% 
-                            [parent dlg]
-                            [alignment '(right center)]
-                            [stretchable-height #f]))
-  (define compiling-message (new message% 
-                                 [parent button-panel]
-                                 [label ""]
-                                 [auto-resize #t]))
-  (define replace-button 
-    (new button% 
-         [parent button-panel]
-         [label ""]
-         [stretchable-width #t]
-         [callback (λ (x y)
-                     (set! answer (figure-out-answer))
-                     (send dlg show #f))]))
-  (send replace-button show #f)
-  (define-values (ok-button cancel-button)
-    (gui-utils:ok/cancel-buttons button-panel
-                                 (λ (b e)
-                                   (set! answer (figure-out-answer))
-                                   (send dlg show #f))
-                                 (λ (b e) 
-                                   (send dlg show #f))
-                                 (string-constant ok) (string-constant cancel)))
-  
-  (define (figure-out-answer)
-    (define-values (tp-req tp-label) (figure-out-answer/f))
-    (or tp-req
-        (error 'figure-out-answer "no selection!")))
-  
-  (define (figure-out-answer/f)
-    (let/ec done
-      (for ([pre-installed-lb (in-list pre-installed-lbs)]
-            [tp-dir (in-list tp-dirs)])
-        (define sel (send pre-installed-lb get-selection))
-        (when sel
-          (done (send pre-installed-lb get-data sel)
-                (send pre-installed-lb get-string sel))))
-      (when (send user-installed-lb get-selection)
-        (define str (send user-installed-lb get-string
-                          (send user-installed-lb get-selection)))
-        (done `(lib ,str ,user-installed-teachpacks-collection)
-              str))
-      (done #f #f)))
-  
-  
-  (send ok-button enable #f)
-  (update-user-installed-lb)
-  
-  (send dlg show #t)
-  (values conflict-tp answer))
-
-
-(define (tp-dir->tps tp-sym)
-  (filter
-   values
-   (for*/list ([dir (in-list (find-relevant-directories (list tp-sym)))]
-               #:when (let ([inf (get-info/full dir)])
-                        (and inf (inf tp-sym (λ () #f))))
-               [file-or-dir (in-list
-                             (let ([files ((get-info/full dir) tp-sym)])
-                               (cond
-                                 [(eq? files 'all)
-                                  (for/list ([x (in-list (directory-list dir))]
-                                             #:when
-                                             (regexp-match #rx"[.](ss|scm|rkt)$"
-                                                           (path->string x))
-                                             #:unless
-                                             (member (path->string x) '("info.rkt" "info.ss")))
-                                    x)]
-                                 [(list? files) files]
-                                 [else '()])))])
-     (let/ec k
-       (unless (path? file-or-dir) (k #f))
-       (define candidate (build-path dir file-or-dir))
-       (unless (file-exists? candidate) (k #f))
-       (define mp (path->module-path candidate))
-       (when (path-string? mp) (k #f))
-       (list candidate mp)))))
-
-
-(define (teachpacks-conflict tp1 tp2)
-  (define tp1-exports (get-exports tp1))
-  (define tp2-exports (get-exports tp2))
-  (define conflicts
-    (sort (set->list (set-intersect tp1-exports tp2-exports))
-          symbol<?))
-  (if (null? conflicts)
-      #f
-      (car conflicts)))
-
-(define (get-exports tp)
-  (with-handlers ([exn:fail? (λ (x) (list->set '()))])
-    (define-values (vars stx) (module-compiled-exports (get-module-code (resolve-module-path tp #f))))
-    (set-union (phase0-exports vars) (phase0-exports stx))))
-
-(define (phase0-exports which)
-  (define a (assoc 0 which))
-  (list->set (map car (if a (cdr a) '()))))
-
-(module+ test
-  (require rackunit)
-  (check-equal?
-   (teachpacks-conflict '(lib "teachpack/htdp/guess.rkt")
-                        '(lib "teachpack/htdp/lkup-gui.rkt"))
-   #f)
-  
-  (check-equal?
-   (and (teachpacks-conflict '(lib "teachpack/2htdp/image.rkt")
-                             '(lib "teachpack/htdp/image.rkt"))
-        #t)
-   #t))
-
-
-(module+ main 
-  (get-teachpack-from-user 
-   #f 
-   (list '(lib "teachpack/htdp/image.rkt"))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/r5rs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/r5rs.rkt
deleted file mode 100644
index bd538fc8ec..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/r5rs.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-;; This module provides R5RS Scheme, which is defined in "r5rs/main.rkt".
-;; This file is here only as a stub for backward compatibility; use one
-;;   r5rs
-;; instead.
-(module r5rs r5rs/main
-  (#%provide (all-from r5rs/main)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/run-teaching-program.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/run-teaching-program.rkt
deleted file mode 100644
index c18b34c890..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/run-teaching-program.rkt
+++ /dev/null
@@ -1,161 +0,0 @@
-#lang scheme/base
-
-(require "stepper-language-interface.rkt"
-         lang/debugger-language-interface
-         stepper/private/syntax-property
-         scheme/class
-         scheme/contract
-         test-engine/racket-tests
-         syntax/modresolve
-         (only-in racket/list split-at)
-         (only-in racket/sequence sequence->list))
-
-(provide/contract
- [create-empty-module (->* (any/c (listof any/c)) (symbol?) (values any/c symbol?))]
- [expand-teaching-program (->* (input-port?
-                                (-> any/c input-port? any/c)
-                                any/c
-                                (listof any/c))
-                               (symbol? boolean?)
-                               any)])
-
-;; this function expands a port providing a program and a bunch of 
-;; arguments describing the user environment, and returns a thunk
-;; that returns the top-level expressions that make up the expanded
-;; program, one on each call.
-
-;; the expanded program generally contains two expressions: a module, and
-;; a require. The module includes a 'require' for each teachpack that
-;; the user has added. Also, any 'provide' expressions are stripped out.
-
-(define (create-empty-module language-module teachpacks [module-name '#%htdp])
-  (values (datum->syntax
-           #f
-           `(,#'module ,module-name ,language-module 
-                       ,@(map (λ (x) 
-                                `(require ,x))
-                              teachpacks)))
-          module-name))
-  
-(define (expand-teaching-program port reader language-module teachpacks [module-name '#%htdp] [enable-testing? #t])
-  (define state 'init)
-  ;; state : 'init => 'require => 'done-or-exn
-
-  ;; in state 'done-or-exn, if this is an exn, we raise it
-  ;; otherwise, we just return eof
-  (define saved-exn #f)
-
-  (lambda ()
-    (case state
-      [(init)
-       (set! state 'require)
-       (with-handlers ([exn:fail?
-                        (λ (x)
-                          (set! saved-exn x)
-                          (define-values (mod name)
-                            (create-empty-module language-module teachpacks module-name))
-                          (expand mod))])
-         (define body-exps (suck-all-exps port reader))           
-         (define teachpack-requires (teachpacks->requires teachpacks))        
-         (rewrite-module
-          (expand
-           (datum->syntax
-            #f
-            `(,#'module ,module-name ,language-module 
-                        ,@teachpack-requires
-                        ,@(if enable-testing?
-                              (if (null? body-exps)
-                                  '() 
-                                  ;; this definition pulls the test~object binding from the user's namespace
-                                  ;; over to the one that is used in the REPL when module->namepsace
-                                  ;; grabs a hold of this module to make a namespace for the REPL
-                                  `(,(syntax-property
-                                      #`(define #,(datum->syntax #f 'test~object) (namespace-variable-value 'test~object))
-                                      'test-call #t)))
-                              '())
-                        ,@body-exps)
-             (vector (object-name port) #f #f #f #f)))))]
-      [(require)
-       (set! state 'done-or-exn)
-       (stepper-skip
-        #`(let ([done-already? #f])
-            (dynamic-wind
-             void
-             (lambda () 
-               (dynamic-require ''#,module-name #f))  ;; work around a bug in dynamic-require
-             (lambda () 
-               (unless done-already?
-                 (set! done-already? #t)
-                 #,(if enable-testing? 
-                       #'(test) 
-                       #'(begin))
-                 (current-namespace (module->namespace ''#,module-name)))))))]
-      [(done-or-exn)
-       (cond
-         [saved-exn (raise saved-exn)]
-         [else      eof])])))
-
-;; take all of the body expressions from the port
-(define (suck-all-exps port reader)
-  (define (port-reader p) (parameterize ([read-accept-lang #f])
-                            (reader (object-name port) p)))
-  (sequence->list (in-port port-reader port)))
-
-;; check that the teachpacks exist, return 
-;; syntax objects that require them (tagged
-;; with stepper-skip-completely)
-(define (teachpacks->requires teachpacks)
-  (filter
-   values
-   (for/list ([tp (in-list teachpacks)])
-     (cond
-       [(has-a-file? tp)
-        (stepper-skip
-         (datum->syntax #f `(require ,tp)))]
-       [else
-        (eprintf "~a\n" (missing-tp-message tp))]))))
-
-(define (has-a-file? tp)
-  (define pth 
-    (with-handlers ((exn:fail? (λ (x) #f)))
-      (resolve-module-path tp #f)))
-  (and pth
-       (or (file-exists? pth)
-           (file-exists? 
-            (bytes->path (regexp-replace #rx#"[.]rkt$" 
-                                         (path->bytes pth)
-                                         #".ss"))))))
-           
-       
-
-(define (missing-tp-message x)
-  (format "the teachpack '~s' was not found" x))
-
-
-;; rewrite-module : syntax -> syntax
-;; rewrites the module to remove provide's (for now...)
-(define (rewrite-module stx)
-  (syntax-case stx (module #%plain-module-begin)
-    [(module name lang (#%plain-module-begin bodies ...))
-     (with-syntax ([(rewritten-bodies ...) 
-                    (filter not-provide?
-                            (syntax->list (syntax (bodies ...))))])
-       (syntax/loc stx
-         (module name lang
-           (#%plain-module-begin 
-            rewritten-bodies ...))))]
-    [else
-     (raise-syntax-error 'htdp-languages "internal error .1")]))
-
-
-;; not-provide? : syntax -> boolean
-;; return #t for expressions that are not 'provide's
-(define (not-provide? stx)
-  (syntax-case stx (#%provide)
-    [(#%provide specs ...) #f]
-    [else                  #t]))
-
-;; stepper-skip : syntax -> syntax
-;; tag the expression with stepper-skip-completely
-(define (stepper-skip stx)
-  (stepper-syntax-property stx 'stepper-skip-completely #t))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/stepper-language-interface.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/stepper-language-interface.rkt
deleted file mode 100644
index 92666384af..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/stepper-language-interface.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-(module stepper-language-interface mzscheme
-  
-  (require mzlib/class)
-  (provide stepper-language<%>)
-    
-  (define stepper-language<%>
-    (interface ()
-      stepper:supported?
-      stepper:enable-let-lifting?
-      stepper:show-lambdas-as-lambdas?
-      stepper:show-inexactness?
-      stepper:show-consumed-and/or-clauses?
-      stepper:render-to-sexp)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/test-error.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/test-error.rkt
deleted file mode 100644
index a2a20deb2f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/lang/test-error.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname bar) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(check-error (error) "")
-(check-error (error 1) "1")
-(check-error (error 'a) "a: ")
-(check-error (error 'a "bad input") "a: bad input")
-(check-error (error 'a "bad input: " 1) "a: bad input: 1")
-(check-error (error 'a "bad input: " 1 " and " "hello") "a: bad input: 1 and hello")
-(check-error (error 'a "bad input: " 1 " and " false) "a: bad input: 1 and false")
-(check-error (error 'a "uhoh " (list 1 2 3)) "a: uhoh (cons 1 (cons 2 (cons 3 empty)))")
-
-(define-struct err (str))
-
-(check-error (error 'a "bad input: " 1 " and " (make-err "hello")) 
-             "a: bad input: 1 and (make-err \"hello\")")
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/DESIGN-NOTES b/pkgs/htdp-pkgs/htdp-lib/stepper/DESIGN-NOTES
deleted file mode 100644
index 79d351879f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/DESIGN-NOTES
+++ /dev/null
@@ -1,978 +0,0 @@
-[Ed. Note.: Much of this refers to the Zodiac version of the stepper, which
-I am busily replacing at this very moment.  jbc, 2001-12-04]
-
-variable references: there are three kinds of variable references:
-1) bound variable refs
-2) unit-bound variable refs
-3) top-level variable refs
-
-You might be forgiven for some confusion: these three appear to overlap
-heavily.  Here are more accurate defintions for each one:
-
-unit-bound variable references are those which occur as the left-hand
-sides of top-level definitions within a unit.
-
-bound variable references are those which occur within the scope of a
-lambda, case-lambda, let, let*, letrec, or other form which introduces a
-limited lexical scope.  This includes `local', but not the unit-bound
-variables mentioned above.
-
-top-level references are the rest of the references.
-
-One difference between top-level and bound varrefs are the way that they
-are handled at runtime.  Top-level varrefs are looked up in a table; if
-they are not found in this table, a runtime error is signalled.  Note
-that this lookup occurs only when the varref is evaluated, not when it
-is first `encountered' (e.g., in the body of a closure). One reason that
-this mechanism is necessary is that a Scheme REPL permits top-level
-references to variables that have not yet been defined.
-
-Bound varrefs have a known lexical binding location, and they can be
-looked up directly, rather than going through the indirection of
-checking a table.  These variables may be introduced by forms like
-`letrec' or `local', and they may furthermore be used before their
-binding definition has been evaluated.  In this case, they have the
-`<undefined>' value.  In most language levels, a reference to a variable
-which contains the `<undefined>' value is an error.  In such a language
-level, any variable which may have this value must be checked on every
-evaluated reference.
-
-So here's the problem: unit-bound varrefs are similar to those inside a
-`local'.  Syntactically, their bindings are introduced by `define', and
-their scope extends in both directions. Semantically they are similar to
-bound variables, in that the interpreter can lexically fix the binding
-of the variable.  In both of these regards they are similar to the
-bindings in a `local'.  However, zodiac does not parse them like those
-in a `local'.  Rather, it parses them as `top-level-varref's.  Why? I
-forget, and I'm about to ask Matthew yet again.  Then I'll record the
-answer here.
-
-Now things get a bit more complicated.  Top-level varrefs never need to
-be checked for the '<undefined>' value; before they are bound, they have
-no runtime lookup location at all.  Bound varrefs and unit varrefs, on
-the other hand, may contain the `<undefined>' value.  In particular,
-those bound by letrec, local, and units may contain this value.  Others,
-like those bound by lambda, let, and let*, will not.  For the first and
-third categories, we do not need to check for the undefined value at
-runtime.  Only when we are looking at a bound or unit varref which may
-contain the `<undefined>' value do we need to insert a runtime check.
-
-*******
-
-Another topic entirely is that of sharing.  When a break occurs, the
-stepper reconstructs the state of memory. However, two closures may
-refer to the same binding. For instance,
-
-(define-values (setter getter)
-  (let ([a '*undefined*])
-    (values
-     (lambda (x) (set! a x))
-     (lambda () a))))
-
-If each closure is linked to a record of the form (lambda ()
-values-of-free-vars), there's no way to tell whether the first and
-second closure refer to the same binding of a or not.  So in this case,
-we must devise some other technique to detect sharing.  A simple one
-suggested by Matthew is to store mutators in the closure record; then,
-sharing can be detected by the old bang-one-and-see-if-the-other-changes
-technique.
-
-*********
-
-A note about source locations: I'm using the "start" locations of sexps
-(assigned by Zodiac) to uniquely identify those expressions: I don't
-believe there are any instances where two expressions share a start
-location.
-
-Later: this is now obsolete: I'm just storing the parsed zodiac 
-expressions.  Forget all of this source correlation crap. Zodiac does it 
-for me.
-
-[Ed. Note: this observation turned out to be completely wrong. cf. later
-notes.]
-
-*********
-
-Robby has a good point: Matthew's technique for detecting gaps in the
-continuation-mark chain (look for applications whose arguments are fully
-evaluated but are still on the list of current marks) depends on the
-assumption that every "jump site" has the jump as its tail action.  In
-other words, what about things like "invoke-unit/open", which jumps to
-some code, evaluates it, >then comes back and binds unit values in the
-environment<.  In this case, the "invoke-unit/open" continuation will
-not be handed directly to the evaluation of the unit, because work
-remains to be done after the evaluation of the unit's definitions.
-Therefore, it will be impossible to tell when un-annotated code is
-appearing on the stack in uses of "invoke-unit/open."  Problem.
-
-*********
-
-So what the heck does a mark contain for the stepper? it looks like this:
-
-(lambda () (list <source-expr> <var-list>))
-
-with 
-
-var-list = (list-of var)
-
-and
-
-var = (list <val> z:varref)
-
-*********
-
-Let me say a few words here about the overall structure of the
-annotator/stepper combination. We have a choice when rebuilding the
-source: we can follow the source itself, or we can follow the parsed
-expression emitted by zodiac.  If our task is simply to spit out source
-code, then it's clear that we should simply follow the source.  However,
-we need to replace certain variables with the values of their bindings
-(in particular, lambda-bound ones). Well, in beginner mode anyway...
-
-*******
-
-Okay, I'm about to extend the stepper significantly, and I want to do at
-least a little bit of design work first.  The concept is this: I want
-the stepper to stop _after_ each reduction, as well as before it.  One
-principal difference between the new and old step types is that in the
-new one, the continuation cannot be rectified entirely based upon the
-continuation marks; the value that is produced by the expression in
-question is also needed.
-
-Here's a question: can I prove, for the setup I put together, that the
-part of the continuation _outside_ the highlighted region does not
-change? This should be the case; after all, the continuation itself does
-not change.
-
-Of course, there are some reductions which do not immediately produce a
-value; procedure applications, and ... uh oh, what about cond and if
-expressions?  We want the stepper to use the appropriate "answer" as the
-"result" of the step.  So there's some context sensitivity here.
-
-Wait, maybe not. It seems like _every_ expression will have to have a
-"stop on entry" step. Further, these types of steps will _not_ have
-values associated with them. Hmmm....
-
-Okay, this isn't that hard.  Yes, it's true that every expression that
-becomes ... no, it's not obvious that the expression which is
-substituted ... jesus, it's not even always the case that a
-"substitution" occurs in the simplistic sense I'm imagining.  Damn, I
-wish my reduction semantics were finished.
-
-(Much later): The real issue is that the "stop-on-enter" code is
-inserted based on the surrounding code, and
-
-
-So, here's the next macro we need to handle: define-struct.
-
-
-*********
-
-Don't forget a test like
-
-(cond [blah]
-      [else cond [blah] [blah]])
-	  
-	  
-**********
-
-Okay, I'm a complete moron.  In particular, I threw out all of the
-source correlation code a week ago because I somehow convinced myself
-that the parsed expressions retained references to the read expressions.
-That's not true; all that's kept is a "location" structure, which
-records the file and offset and all that jazz.
-
-So I tried to fix that by inserting these source expressions into the
-marks, along with the parsed expressions.  This doesn't work because I
-need to find the read expressions for expressions that don't get
-marks...  or do I?  Yes, I do.  In particular, to unparse (define a 3),
-I need to see the read expression to know that it wasn't really
-(define-values (a) (values 3)).
-
-Maybe I can add a field to zodiac structures a la maybe-undefined?
-
-************
-
-That worked great!
-
-************
-
-Man, there's a lot of shared code in here. 
-
-************
-
-Okay, back to the drawing board on a lot of things.
-
-1) Matthias and Robby are of the opinion that the break for an expression 
-should be triggered only when that expression becomes the redex.  For
-example, the breakpoint for an if expression is triggered _after_ the
-test expression is evaluated.
-
-2) I've realized that I need a more general approach in the annotater to 
-handle binding constructs other than lambda.  In particular, the new 
-scheme handles top-level variables differently than lexically bound ones.  
-In particular, the mark for an expression contains the value of a 
-top-level variable if (1) the variable occurs free in the expression, and 
-(2) the expression is on the spine of the current procedure or definition.
-Lexically bound variables are placed in the mark if (1) they occur free in 
-the expression, and (2) they are in tail position relative to the innermost 
-binding expression for the variable.
-
-*** Wait, no.  This is crap, because the bodies of lambdas need to store 
-all free variables, regardless of whether they're lexically tail w.r.t.
-the binding occurrence. Maybe it really would just be easier to do this
-in two passes.  How would this work?  One pass would attach the free
-variables to each expression.  Then, the variables you must store in the
-mark for an expression are those which (1) occur free and (2) are not
-contained in some lexically enclosing expression. I guess we can use the
-register-client ability of zodiac for this...
-
-We're helped out in the lexical variables by the fact that zodiac
-renames all lexically bound variables, so no two bindings have the same
-name. Of course, that's not the case for the special variables inserted
-by the annotator.  Most of these ... well, no, all of these will have to
-appear in marks now.  The question is whether they'll ever fight with
-each other.  In the case of applications, I'm okay, because the only
-expressions which appear in tail ... wait, wait, the only problem that I
-could have here arises when top-level variables have the same names as
-lexically bound ones, and since all of the special ones are lexically
-bound, this is fine.
-
-
-************
-
-I'm taking these comments out of the program file.  They just clutter 
-things up.
-
-           ; make-debug-info takes a list of variables and an expression and
-           ; creates a thunk closed over the expression and (if bindings-needed is true) 
-           ; the following information for each variable in kept-vars:
-           ; 1) the name of the variable (could actually be inferred)
-           ; 2) the value of the variable
-           ; 3) a mutator for the variable, if it appears in mutated-vars.
-           ; (The reason for the third of these is actually that it can be used
-           ;  in the stepper to determine which bindings refer to the same location,
-           ;  as per Matthew's suggestion.)
-           ; 
-           ; as an optimization:
-           ; note that the mutators are needed only for the bindings which appear in
-           ; closures; no location ambiguity can occur in the 'currently-live' bindings,
-           ; since at most one location can exist for any given stack binding.  That is,
-           ; using the source, I can tell whether variables referenced directly in the
-           ; continuation chain refer to the same location.
-           
-           ; okay, things have changed a bit.  For this iteration, I'm simply not going to 
-           ; store mutators.  later, I'll add them in.
-
-		  
-************
-
-Okay, I'm back to the one-pass scheme, and here's how it's going to
-work.  Top-level variables are handled differently from lexically bound
-ones.  Annotate/inner takes an expression to annotate, and a list of
-variables whose bindings the current expression is in tail position to.
-This list may optionally also hold the symbol 'all, which indicates that
-all variables which occur free should be placed in the mark.
-
-
-***********
-
-Regarding the question: what the heck is this lexically-bound-vars
-argument to annotate-source-expr?  The answer is that if we're
-displaying a lambda, we do not have values for the variables whose
-bindings are the arguments to the lambda.  For instance, suppose we
-have:
-
-(define my-top-level 13)
-
-(define my-closure
-  (lambda (x) (x top-level)))
-
-When we're displaying my-closure, we better not try to find a value for
-x when reconstructing the body, as there isn't one.
-
-*************
-
-This may come back to haunt me: the temporary variables I'm introducing
-for applications and 'if's are funny: they have no bindings.  They have
-no orig-name's.  They _must_ be expanded, always. This may be a problem
-when I stop displaying the values of lambda-bound variables.
-
-***************
-
-currently on the stack:
-
-yank all of that 'comes-from-blah' crap if read->raw works.
-
-*************
-
-annotater philosophy: don't look at the source; just expand based on the
-parsed expression.  The information you need to reconstruct the
-
-*************
-
-for savings, I could elide the guard-marks on all but the top level.
-
-***********
-
-months later; October 99.
-
-major reorganization, along a model-view-controller philosophy. Here's
-how it works:
-
-The view and controller (for the regular stepper) are combined in a gui
-unit.  This unit takes a text%, handles all gui stuff, and invokes the
-model unit (one for each stepping).
-
-The model unit is a compound unit.  It consists of the annotater, the
-reconstructor, and the model unit itself.
-
-Gee whiz; there's so much stuff I haven't talked about.  Like for
-instance the fact that the stepper now has before and after steps.  The
-point of this reorganization is to permit a natural test suite.  Jesus,
-that's been a long time coming. At some point, I'm also hoping to
-combine the stepper into the main DrScheme frame.
-
-Oh yes, another major change was that evaluation is now strictly on a
-one- expression-at-a-time basis.  The read, parse, and step are now done
-indiv- idually for each expression.  This has the ancillary benefit that
-there's no longer any need to reconstruct _all_ of the old expressions
-at every step.
-
-************
-
-You know, I should never have started that ******** divider.  I have no
-idea how many stars are supposed to be there.  Oh well.
-
-************
-
-The version for DrS-101 is out, and I've restructured the stepper into a
-"model/view/controller" architecture, primarily to ease testing.  Of
-course, I haven't actually written the tester yet. So now, the view and
-controller are combined in stepper-view-controller.ss, and the model
-(instantiated once per step-process) is in stepper-model.ss.  In fact,
-the view-controller is also instantiated once per step-process, so I'm
-not utilizing the division in that way, but the tester will definitely
-want to instantiate the model repeatedly.
-
-***********
-
-I also want to comment a little bit on some severe ugliness regarding
-pretty- printing.  The real problem is how to use the existing
-pretty-print code, while still having enough control to highlight in the
-right locations.
-
-Okay, let me explain this one step at a time.
-
-The way the pretty-printer currently works is this: there are four hooks
-into the pretty-printing process.  The first one is used to determine
-the width of an element.  The result of this procedure is used to decide
-whether a line break is necessary.  However, this hook is _also_ used to
-determine whether or not the pretty-printer will try to print the string
-itself or hand off responsibility to the display-handler hook.  In other
-words, if the width- hook procedure returns a non-false value, then the
-display-handler will be called to print the actual string.  The other
-pair of hook procedures is first, a procedure which is called _before_
-display of any subexpression, and one which is called _after_ display of
-any subexpression.
-
-So how does the stepper use this to do its work?  Well, the stepper has
-two tricky tasks to accomplish.  First, it must highlight some
-subexpression.  Second, it must manually insert elements (i.e. images)
-which the pretty-printer does not handle.
-
-Let's talk about images first.  In order to display images, the
-width-hook procedure detects images and (if one is encountered) returns
-a width explicitly. (Currently that width is always one, which can lead
-to display errors, but let's leave that for later.)  Remember, whenever
-the width returned by this hook is non-false, the display handler will
-be called to insert the object.  That's perfect: the display hander
-inserts the image just fine.
-
-One down, one to go.
-
-The stepper needs to detect the beginning of the (let's call it the)
-redex.  The obvious way to do this is (almost) the right way: the
-before-printing handler checks to see whether the element about to be
-printed is the redex (by an eq?-test).  If so, it sets the beginning of
-the highlight region.  A corresponding test determines the end of the
-highlight region.  When the pretty-printing is complete, we highlight
-the desired region.  Fine.
-
-BUT, sometimes we want to highlight things like numbers and symbols; in
-other words, non-heap values.  For instance, suppose I tell you that the
-expression that we're printing is (if #t #t #t) and that you're supposed
-to be highlight- ing the #t.  Well, I can't tell which of the #t's you
-want to highlight.  So this isn't enough information.
-
-To solve this problem, the result of the reconstructor is split up into
-two pieces: the reconstructed stuff outside the box, with a special
-gensym occurring where the redex should be, and a separate expression
-containing the redex.  Now at least the displayer has enough information
-to do its job.
-
-Now, what happens is that when the width-hook runs into the special
-gensym, it knows that it must insert the redex.  Well, that's fine, but
-remember, if this procedure wants to take control of the printing
-process, it must do so by returning the width of the printed object, and
-then this object must be printed by the display-hook.  The problem here
-is that neither of these procedures have the faintest idea about
-line-breaks; that's the pretty- printer's job.  In other words, this
-solution only works for things (like numbers, symbols and booleans)
-which cannot be split across lines. What do we do?
-
-Well, the solution is ugly.  Remember, the only reason we had to resort
-to this baroque solution in the first place is that values like numbers,
-symbols, and booleans couldn't be identified uniquely by eq?.  So we
-take a two- pronged approach.  For non-confusable values, we insert them
-in place of the gensym before doing the printing.  For confusable
-values, we leave the placeholder in and take control of the printing
-process manually.
-
-In other words, the _only_ reason this solution works is because of the
-chance overlap between confusable values and non-breakable values.  To
-be more precise, it just so happens that all confusable values are non-
-line-breakable.
-
-Lucky.
-
-And Ugly.
-
-*****
-
-January, 2000
-
-I'm working on the debugger, now, and in particular extending the
-annotater to handle all of the Zodiac forms. Let and Letrec turn out to
-be quite ugly.  I'm still a little unsure about certain aspects of
-variable references, like for example whether or not they stay renamed,
-or whether they return to their original names. [ed. note: they get new
-uninterned symbols that print like their original names]
-
-But that's not what I'm here to talk about.  No, the topic of the day is
-'floating variables.'  A floating variable is one whose value must be
-captured in a continuation mark even though it doesn't occur free in the
-expression that the wcm wraps.  Let me give an example:
-
-(unit/sig some-sig^
-  (import)
-  
-  (define a 13)
-  (define b (wcm <must grab a> (+ 3 4))))
-  
-In this case, the continuation-mark must hold the value of a, even
-though a does not occur free in the rhs of b's definition.  Floating
-variables are stored in a parameter of annotate/inner.  In other words,
-they propagate downward.  Furthermore, they're subject to the same
-potential elision as all other variables; you only need to store the
-ones which are also contained in the set tail-bound.  Also note that
-(thank God) Zodiac standardizes names apart, so we don't need to worry
-about duplications.  Also note that floating variables may only be
-bound-varrefs.
-
-********
-
-Okay, well that doesn't work at all; dynamic scope blows it away
-completely.  For instance, imagine the following unit:
-
-(unit/sig some-sig^
-  (import sig-that-includes-c^)
-  
-  (define a 13)
-  (define b (c)))
-  
-Now, during the execution of c, there's no mark on the stack which holds
-the bindings of a. DUH! I can't believe I didn't think of this before.
-Okay, one possible solution for this would be to use _different keys_
-for the marks, so that a mark on the unit-evaluation-continuaiton could
-be retained.
-  
-  
-*********
-
-
-Okay, time to do units.  Compound units are dead easy.  Just wrap them
-in a wcm that captures all free vars.  No problemo.  Normal units are
-more tricky, because of their scoping rules.  Here's my canonical
-translation:
-
-(unit 
-  (import vars)
-  (export vars)
-  
-  (define a a-exp)
-  
-  b
-  
-  (define c c-exp)
-  
-  d
-  
-  etc.)
-  
-... goes to ...
-
-(unit
-  (import vars)
-  (export vars)
-  
-  (wcm blah ; including imported vars
-    (begin
-      (set! a a-exp)
-      b
-      (set! c c-exp)
-      d))
-      
-   (define a a)
-   (define c c)
-   ...)
-   
-************
-
-Well, I still haven't written the code to annotate units, so it's a damn
-good thing I wrote down the transformation.  I'm here today (thank you
-very much) to talk about annotation schemes.
-
-I just (okay, a month ago --- it's now 2000-05-23) folded aries into the
-stepper. the upshot of this is that aries now supports two different
-annotation modes: "cheap-wrap," which is what aries used to do, and the
-regular annotation, used for the algebraic stepper.
-
-However, I'm beginning to see a need for a third annotation, to be used
-for (non- algebraic) debugging.  In particular, much of the bulk
-involved in annotating the program source is due to the strict algebraic
-nature of the stepper.  For instance, I'm now annotating lets.  The
-actual step taken by the let is after the evaluation of all bindings.
-So we need a break there.  However, the body expression is _also_ going
-to have a mark and a break around it, for the "result-break" of the let.
-I thought I could leave out the outer break, but it doesn't work.
-Actually, maybe I could leave out the inner one.  Gee whiz.  This stuff
-is really complicated.
-
-*************
-
-Okay, well, I figured all that stuff out, but now I've got to
-restructure the reconstructor to handle lifting---PRE-lifting, that
-is---on let/letrec/local.  In particular, the reconstruct-inner function
-will now return four things: the free bindings, the reconstructed expr,
-the "before" definitions, and the "after" definitions.  These before and
-after definitions are wrapped around the current set of generated
-definitions.  Case in point; I'm about to execute the (+ 7 8) in the
-following expression:
-
-(let ([a 4]
-      [b (let ([h 3]
-               [i (+ 7 8)]
-               [j 9])
-            (+ h i j))]
-      [c 19])
-   (+ a b c))
-
-How do we reconstruct this?  Well, first we reconstruct the (+ 7 8) itself, that's
-easy.  Then, we encounter a let.  The return value of this will be the _before_
-expressions:
-(define ~h~0 3)
-the _after_expressions:
-(define ~i~0 (+ 7 8))
-(define ~j~0 9)
-and the reconstructed expression:
-(+ ~h~0 ~i~0 ~j~0)
-
-Now, we recur, using the reconstructed expression.  The next step outward is _also_
-a let, so we get the following before expressions:
-(define ~a~0 4)
-the following after expressions:
-(define ~b~0 (+ ~h~0 ~i~0 ~j~0))  <---here is where the reconstructed expr appears
-(define ~c~0 19)
-and the reconstructed expression:
-(+ ~a~0 ~b~0 ~c~0)
-
-So then, the final assembly occurs when the "before" expressions are
-slapped together, last first, then the "after" expressions, first first,
-and then whatever reconstructed expression is left over.
-
-Ugh.
-
-***********
-
-Wow. more complications.  Here's the new problem.  Let's say I have an
-expression like this:
-
-(define (make-thunk)
-  (let ([lexical-binding 14]
-        [returned-thunk (lambda () lexical-binding)])
-     returned-thunk))
-     
-(define first-thunk (make-thunk))
-(define second-thunk (make-thunk))
-
-(first-thunk)
-
-Now, when I'm just inside the body of first-thunk, and trying to
-reconstruct "lexical- binding", I need to know what lifted name it got.
-
-There are a bunch of ways to try to do this, but I'm going to take the
-most straightforward approach (which came to me after about a day of
-thought), which is to expand every lexical binding into a pair of
-bindings; one which refers to the bound value (with the same name as the
-original binding), and a new, gensym'ed one, which indicates what index
-number this binding has received.
-
-2000-06-05
-
-***********
-
-So here's the new format of a full mark: 
-
-(make-mark label source bindings)
-
-where label is a symbol, source is a zodiac:parsed, and bindings is an
-association list from bindings to values.  Note, however, that every
-let-type binding now has _two_ entries in this list.  The first one
-supplies the binding's value, and the second one supplies the lifted
-name's index.
-
-[ed note.: see note for 2000-09-26]
-
-2000-06-06
-
-***********
-
-How do we guarantee that lifted names do not clash? Well, for
-each binding we use the original name, with two numbers appended
-to it, separated by zeros; the first one indicates which binding
-it is (more than one binding may have the same original name),
-and the second one indicates which dynamic occurrence of this
-binding it is.
-
-So, for instance, if a program contains one binding named 'foo', and
-it's evaluated three times, the third evaluation would result in the
-lifted name 'foo0002'.  I personally guarantee that no namespace clashes
-can occur in this scheme. Yep.
-
-2000-06-06
-
-***********
-
-Oh.. Well, Matthias prefers a naming scheme whereby all bindings are
-assigned sequential numbers, regardless of the binding name. So this
-name clash isn't really an issue anymore.
-
-2000-09-09
-
-***********
-
-To handle units, marks must now contain "top-level" (actually,
-unit-bound) variables.  For this reason, the datatype for a full mark
-must change.  a full mark is now:
-
-(make-full-mark location label bindings)
-
-where location is a zodiac:location
-      label    is a symbol,
-  and bindings is an association list containing <bindings> and values 
-  
-a <binding> is either a zodiac:binding (for bound vars), or a slot (for
-unit-bound vars in the zodiac:top-level-varref/bind/unit struct).
-
-***********
-
-Ooookay.  We're in Boston now, and I'm rewriting the stepper completely
-to work with version 200.  In other words, we're scrapping Zodiac
-completely.  This is an interesting SE task, because from a data-driven
-design standpoint, the code is starting from zero again; all of my data
-have different shapes now.
-
-Another change is that with the demise of DrScheme Jr and the
-institution of the static-compilation module mechanism, there's no
-longer a need for two separate collections.  I've therefore scrapped
-stepper-graphical, and moved everything back into stepper.
-
-Also, the stepper no longer needs to be tightly integrated with DrScheme
-itself; it can now be simply a tool.  I've already done the front-end
-work to tie in to the new tool interface; I think this stuff is all
-done.
-
-So, here's the plan.  The major pain is in the annotater, and that's
-what I'm tackling now.  I'm proceeding along an iterative refinement
-path; first, I want to get a bare-bones annotation working, without any
-macro-reversal (hence source-correlation) stuff.
-
-Bindings.  What's a binding?  It looks to me like the syntax object
-representing the binding occurrence of the variable should serve
-admirably as a 'binding' for our purposes.
-
-***********
-
-I'm dumping the tracking of the 'never-undefined property.  It was
-originally used for two purposes; first, varrefs had to be wrapped with
-an undefined check.  Second, varrefs in ankle- and cheap-wrap were not
-wrapped if the variables were known never to be undefined. Now, the
-undefined check is (at last) inserted by the language's elaborator, so
-the first use is obsolete.  The second one is more or less obsolete as
-well, because I'm not sure that cheap- or ankle-wrap are ever going to
-be used again.
-
-Also, the 'lambda-bound-var' property is going away; in v200, I don't
-see a good way to get from a bound variable to its binding, which makes
-it more or less impossible to keep track of things by attaching
-properties to bindings.  In fact, it doesn't really even make sense to
-try and find the binding for an occurrence in v200, because it's not
-even known.  Instead, I've just added another recursion argument called
-'let-bound-variables", which is basically what the property was anyway.
-
-2002-01-08
-
-***********
-
-Why, for the love of God, do we need to put a wcm around a quote? I can
-see how we need one if there's a pre-break there, but otherwise, it
-seems totally useless.
-
-Ditto for quote-syntax
-
-2002-01-08
-
-[Later Note: This is preposterous.  Of course I need a wcm there, to
-replace an existing one if necessary.  Maybe if it's in non-tail
-position...]
-
-***********
-
-Here's a nice optimization I'm not taking advantage of: the application
-of all lambda-bound vars doesn't need all those temp vars.  OTOH, this
-won't help much with beginner/intermediate, because you never have a
-lexical var in the application position.  I suppose you can generalize
-this to say that you only need arg-temps for things that are not
-lambda-bound vars.  Well, maybe some other day...
-
-2002-01-08
-
-***********
-
-Okay, as much as I hate to admit it, reconstruct is not just getting a
-face lift; it's being largely rewritten.  The major change is this: I'm
-going to delay macro unwinding until the end.  Toward this end, the
-recon (formerly "rectify") procedures will produce syntax objects with
-attached properties that record the macro expansions and the primary
-origin of the form.  After all reconstruction is done, we go through
-again and look for things that need to be rewritten.  This will separate
-the macro unwinding from the basic reconstruction of the expression.
-Hopefully, at the end we can just use (syntax-object->datum) to discard
-all of the side information.
-
-Please, let this work. Yikes.
-
-2002-01-12
-
-*******
-
-There's a problem with the reconstruction of let-values, which only
-surfaces in the presence of multiple-values.  This is okay for now,
-because beginner and intermediate do not allow multiple values.  The
-problem is that if you allow expressions like this --- (let-values ([()
-(values)]) 3) --- that is, where there can be an empty set of variables
-in a lhs position, you may not be able to tell at runtime what
-expression you're in the middle of.  The problem is that when we stop
-during the evaluation of a rhs in a let, we figure out which rhs we're
-evaluating by which lhs-vars have been changed from their original
-values.  Oh, dang.  This is totally broken for letrec's in which the rhs
-evaluates to the undefined value.
-
-Well, I guess I'm going to have to fix this the right way, by adding a
-counter to every let which is incremented explicitly after the
-evaluation of each rhs. Yikes.
-
-********
-
-Ha! Did I actually say "right way?" This is totally the _wrong_ way;
-keeping information about the continuation by mutating the store is
-guaranteed to fail when continuations are invoked.
-
-2002-06-21
-
-*********
-
-Well, another year has passed.  How swiftly they fly!  Nathan is almost
-walking, Alex is almost three, and I'm about to graduate.  But I'd
-better get the Intermediate stepper working first.
-
-A note about lifting; I keep looking for the right idiom in which to
-code the search for the highlight. In fact, the real problem is my
-inability to cleanly express the location of the highlight.  The one
-I've settled on as the least egregious is this: a location in a syntax
-object is expressed as a list of context records, where each one
-contains an index indicating the location of the subterm.  This index
-makes coding the search less pleasant than it might otherwise be; right
-now, I'm searching by constructing a list of subterms paired with
-indices, and then iterating through these.
-
-2003-07-13
-
-**********
-
-Intermediate stepper now working.  I developed a much better way of
-specifying the highlight: the reconstruct engine now delivers a syntax
-object to the display engine, which allows me to use syntax properties.
-Much much better.
-
-2004-01-15
-
-************
-
-A year and a half has passed since I've thought about this file, and I'm
-now in the midst of a Google Summer of Code (SoC) grant which is
-supposed to get me to support mutation, and make the corresponding
-changes to the interface.
-
-A thought I had while walking the California mountainsides (BTW: I've
-just graduated, and gotten a job at Cal Poly)--why do I do the
-reconstruction from the inside out?  Wouldn't it be much much easier to
-do from the outside in?  Feh.
-
-2005-08-02
-
-
-*************
-
-Well, the dang summer is almost over, and I've still got a long, long
-way to go.
-
-The basic change to the model is that instead of storing completed
-definitions as pre-formatted s-expressions, I'm now storing them as
-2-element lists containing the syntax object associated with the
-definition and a 'getter' which returns the value that the binding
-refers to.  The actual definition is reformatted for each step.  This is
-a bit silly, but it would be easy to cache the definitions along with
-the present values if this is actually a performance bottleneck. I
-suspect it won't matter a bit.
-
-In the presence of mutation, the existing separators don't make sense,
-either.  I'm scrapping them, for the moment.  A nice interface change
-would be to separate only the definitions that had changed. For them
-moment, they'll all be separated.
-
-The first order of business, after mucking around in the model for some
-time to get the flavor of how things will work, is to go and set up the
-interface so I can get things running.
-
-*************
-
-Okay, I've "completed" the google project, but there are still things to
-wrap up.  Right now I'm working on the highlighting for mutated
-bindings, which is inferred from differences in the rendered steps.
-
-So, for instance, if the left-hand-side has (define a 3), and the
-right-hand-side has (define a 4), well then we'd better highlight the 3
-on the left and the 4 on the right, because this binding was mutated.
-
-Now, this kind of highlighting--reconstructing highlighting from
-observed differences, rather than obtaining direct evidence of the
-mutation--clearly has some shortcomings.  For instance, concurrent
-code... well, concurrent code is all messed up to begin with; a more
-interesting problem occurs when you have mutations that share structure.
-So, what if a is mutated from (list 3 4) to (list 4 5).  Should the
-whole thing be highlighted?  Certainly that's what you'd get from a a
-normal reduction semantics.  In some sense, though, highlighting _just_
-the 3 and the 4 (and the 4 and the 5) corresponds to a smaller set of
-changes that produces the same result.
-
-Another problem that's coming out is the problem of "intermediate"
-completed expressions that arise from partially evaluated letrecs (and
-all the things that expand into them).  These should also be scanned for
-mutation, right?  What about the "future" ones?  There are other
-rendering problems with forward mutation in letrecs which I haven't
-tackled, as well.  I find myself leaning toward depending on the
-"user-source" syntax property.  As I've observed before, though, the
-syntax properties form a sort of creeping mush; they don't need to be
-explicitly expressed as arguments or return values, and errors of
-omission in the syntax properties are hard to catch. A lot can hide in
-the "syntax?" contract.
-
-2005-09-21
-
-**************
-
-Time to clean up for v300.  Let's see if we can get begin and begin0
-working.
-
-2005-11-14
-
-*************
-
-Okay, it turns out that begin expands into a let-values with empty
-bindings, so I'm working on getting this going.  With this addition, the
-annotation for 'let' is a complete monster, chewing up a substantial
-fraction of the annotation code all by itself.
-
-Also, I've come across a design optimization that improves if & set!,
-which is this: there's no reason to have if-temp & set!-temp.  Putting
-these inline is a great improvement: it reduces code in the
-reconstructor, in the annotator, all over the place.  The caveat: I
-haven't finished it yet, so who knows what kind of horrible thing will
-crop up.
-
-The architecture change here is that we need a new kind of break that's
-like a normal-break (blecch! terrible name!) but carries a value along
-with it.  I'm going to call this the normal-break/value break.  Blurrch!
-
-2006-01-12
-
-*************
-
-Begin STILL isn't working.  My last plan, to wrap each 'begin' body with
-a mark that indicates the source, is naturally broken because an inner
-mark can destroy that one.  The solution is (hopefully) easy; just
-eta-expand to prevent the mark from being lost.  Since it's a non-tail
-call, this doesn't destroy tail-calling.
-
-**************
-
-Okay, begin now works.  I decided that one of my implicit
-invariants--that the source expressions linked to by the marks always be
-actual parts of the source--was too restrictive.  I've now introduced a
-"fake-exp" which signals an artificially constructed expression.  This
-made all my problems go away, and now I'm a happy man.  If only begin0
-worked, too...
-
-2006-11-13
-
-**************
-
-Yeah, I think begin0 works now, too... supporting check- forms turned
-out to be MUCH harder than I expected.  Don't ask me about lazy scheme.
-Or Advanced.  Grr!
-
-2008-05-08
-
-**************
-
-Okay, you can ask me about lazy scheme now. Err, lazy racket. The answer
-is simple: Stephen Chang is working on it :). I'm back in here trying to
-figure out why I changed to stepper-syntax-property, and I think the
-answer is that Back In The Day, it wasn't possible to extract all of the
-syntax properties associated with the stepper.  Hmm... actually, maybe I
-should leave this alone; do I want programs to be able to mangle their
-own stepper marks? No, probably not.
-
-Other changes on the GUI side: the stepper now eagerly precomputes
-steps, rather than doing a complex back-and-forth locking; this is less
-code, and works better, too.
-
-Nice to be here again...
-
-2010-12-04
-
-**************
-
-How time flies. Small bug fixes; it's now illegal to refer to undefined
-values. That is, (letrec ([a a]) 3) is illegal.  This caused stepper
-breakage, and I was worried that fixing this was going to require some
-terrible deep surgery.  In fact, though, it looks like this change
-makes things *simpler*; it looks like I was going out of my way to
-preserve the undefined values for situations where it might turn up in
-student programs, and now I can omit that check.
-
-2013-05-18
-
-**************
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/HISTORY.txt b/pkgs/htdp-pkgs/htdp-lib/stepper/HISTORY.txt
deleted file mode 100644
index 09b891f41a..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/HISTORY.txt
+++ /dev/null
@@ -1,243 +0,0 @@
-Stepper
--------
-Changes for 6.1.1:
-
-None.
-
-Changes for 6.1:
-
-Bugfixes.
-
-Changes for 6.0.1:
-
-None.
-
-Changes for 6.0:
-
-Minor bug fixes.
-
-Changes for 5.3.6:
-
-None.
-
-Changes for 5.3.4:
-
-None.
-
-Changes for 5.3.3:
-
-None.
-
-Changes for 5.3.2:
-
-None.
-
-Changes for 5.3.1:
-
-Addded external interface, for third-party stepper developers.
-
-Changes for 5.3:
-
-Minor bug fixes.
-
-Changes for v5.2.1:
-
-Fix occasional race condition bug on startup, lovely new icon work by
-Neil Toronto.
-
-Changes for v5.2:
-
-None.
-
-Changes for v5.1.2:
-
-Support for 'require' in stepped programs, fixed a number of
-bugs,  lots of cleanup & refactoring, some documentation
-changes.
-
-Changes for v5.1.1:
-
-None.
-
-Changes for v5.1:
-
-Quite a bit of rackety, retabbing, refactoring. There's no longer a closure
-table, but instead functions expand into applicable structures.  Cleanup of
-unnecessary function arguments. Got rid of '2vals' idiom. Improved jump
-to ... error messages.
-
-Changes for v5.0.2:
-
-Bug fixes, Big Bang working again. Define-struct in local not working.
-
-Changes for v5.0.1:
-
-None.
-
-Changes for v5.0:
-
-Bug fixes, computes all steps ahead of time (some time in last few revs)?
-
-Changes for v4.2.5:
-
-None.
-
-Changes for v4.2.4:
-
-Bug fixes.
-
-Changes for v4.2.3:
-
-Bug fixes, show first step as soon as it appears.
-
-Changes for v4.2.2:
-
-Minor bug fixes.
-
-Changes for v4.2.1:
-
-Minor bug fixes.
-
-Changes for v4.2:
-
-It's now possible to jump to the evaluation of a selected expression in
-the stepper.
-
-Changes for v4.1.5:
-
-Minor bug fixes.
-
-Changes for v4.1.4:
-
-None.
-
-Changes for v4.1.3:
-
-Minor bug fixes.
-
-Changes for v4.1.2:
-
-None.
-
-Changes for v4.1.1:
-
-Check-expect now reduces to a boolean in the stepper. Also, this history file
-now appears with the most recent entries at the top....
-
-Changes for v4.1:
-
-none.
-
-Changes for v4.0.1:
-
-none.
-
-Changes for v4.0:
-
-overhauled support for check-expect, check-within, check-error.
-
-Changes for v372:
-
-support for check-expect, check-within, and check-error
-
-Changes for v371:
-
-None.
-
-Changes for v370:
-
-Added "End" button to stepper interface.
-
-Stepper supports "begin0".  Again, you'll never know it unless you use
-the PLTSTEPPERUNSAFE environment variable.
-
-There's a known bug with expressions of the form (let <bindings> (begin
-...)). (It's displayed as (let () X) rather than (begin X).)
-
-Changes for v361:
-
-Bug fix for test cases
-
-Changes for v360:
-
-Stepper supports 'begin'.  You'll never know it unless you use the
-PLTSTEPPERUNSAFE environment variable, though.
-
-Changes for v351:
-
-Minor bug fixes
-
-Changes for v350:
-
-None.
-
-Changes for v300: 
-
-Major changes.  The stepper now handles mutation, though it doesn't yet handle
-'begin', so the advanced language is not defaultly steppable.  Enable stepping
-for the advanced language using the PLTSTEPPERUNSAFE environment variable.
-
-This change has also prompted an interface change; rather than splitting the
-stepper window into three panes, there is just one pane, with a simple
-left-right split between before & after.  The reason for this is that in the
-presence of mutation, it's no longer the case that the "finished" expressions
-never change, which means that they can't always be shared between the left and
-right hand sides.
-
-Changes for v209:
-
-None.
-
-Changes for v208:
-
-minor bug fixes.
-
-Changes for v207:
-
-None.
-
-Changes for v206p1:
-
-None.
-
-Changes for v206:
-
-Stepper supports intermediate, minor bug fixes, major rewrite of interface
- between reconstruct and display.
-
-Changes for v205:
-
-v. minor bug fixes.
-
-Changes for v204:
-
-none.
-
-Changes for v203:
-
-Much more systematic unwinding, intermediate almost ready, redesigned test suite
-
-Changes for v201:
-
-Minor bug fixes.
-
-Changes for v200:
-
-Total rewrite for new syntax. Addition of test suites.
-Addition of somewhat more systematic macro unwinding.
-Lots of bug fixes.
-
-Changes for v103:
-
-PRs fixed: 1564, 1277, 1536, 1500, 1561, 1468, 1599, 1631
-
-Changes for v102:
-
-Stepper handles intermediate level.
-UI redesigned to use "side-by-side" reduction.
-
-Changes for v101:
-
-all steps scroll to bottom automatically.
-constants like 'pi' are explicitly expanded in a step.
-stepper uses fewer threads internally.
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/command-line-debugger-example.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/command-line-debugger-example.rkt
deleted file mode 100644
index ea606ac2f3..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/command-line-debugger-example.rkt
+++ /dev/null
@@ -1,94 +0,0 @@
-#lang racket
-
-;; this file shows how you might build a command-line debugger. It doesn't provide much in
-;; the way of convenience functions....
-
-(provide (contract-out [run-program (-> path-string? void?)]
-                       [continue (-> void?)]
-                       [this-step (or/c false? step?)]
-                       [srcloc (-> any)])
-         (struct-out step)
-         )
-
-(require "external-interface.rkt"
-         "private/marks.rkt")
-
-(struct step (context-thunks break-kind values-returned) #:prefab)
-
-;; for convenience, we just provide mutable top-level bindings for some functions. This
-;; will cause terrible problems if you try to debug two programs at once...
-(define this-step #f)
-(define debugged-program-semaphore (make-semaphore))
-;; in case you want to kill it...:
-(define debugged-program-thread #f)
-
-;; this function gets invoked on the debugged program's thread each time a step
-;; arrives.
-(define (step-receiver a b c)
-  ;; if you wanted breakpoints, you could check if this is the
-  ;; desired step before halting...
-  (set! this-step (step a b c))
-  (printf "*ding* a new step has arrived:\n~e\n" this-step)
-  (semaphore-wait debugged-program-semaphore))
-
-;; given a program path, run the debugger
-(define (run-program program-path)
-  (set!
-   debugged-program-thread
-   (thread
-    (lambda ()
-      (step-program-file program-path step-receiver)))))
-
-;; continue running the debugger:
-(define (continue)
-  (semaphore-post debugged-program-semaphore))
-
-;; show the innermost source location associated with the current-step
-(define (srcloc)
-  (match this-step
-    [#f (error 'step-srcloc "no steps yet")]
-    [(struct step ((cons first-mark _) _ _))
-     (mark-source first-mark)]
-    [other (error 'step-srcloc "no source contexts in this step")]))
-
-;; EXAMPLE:
-
-;; Put the following code in /tmp/foo.rkt:
-
-#|
-#lang racket
-
-(define (f x) (+ x 14))
-
-(f 9)
-
-Then, you might run it from the command line like this:
-
-jclements-09740:~/plt/collects/stepper clements> racket
-Welcome to Racket v5.3.4.7.
-> (require "command-line-debugger-example.rkt")
-> (run-program "/tmp/foo.rkt")
-> *ding* a new step has arrived:
-'#s(step #f expr-finished-break ((#<procedure:...ate/annotate.rkt:1061:62> #f #<procedure>)))
-(srcloc)
-step-srcloc: no source contexts in this step
-  context...:
-   /Users/clements/plt/collects/racket/private/misc.rkt:87:7
-> (continue)
-> *ding* a new step has arrived:
-'#s(step (#<procedure> #<procedure> #<procedure>) normal-break #f)
-(srcloc)
-#<syntax:5:1 f>
-> (continue)
-> *ding* a new step has arrived:
-'#s(step (#<procedure> #<procedure> #<procedure>) result-value-break (#<procedure>))
-(srcloc)
-#<syntax:5:1 f>
-> (continue)
-> *ding* a new step has arrived:
-'#s(step (#<procedure> #<procedure>) normal-break #f)
-(srcloc)
-#<syntax:5:0 (#%app f (quote 9))>
-> (exit)
-
-|#
\ No newline at end of file
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/doc.txt b/pkgs/htdp-pkgs/htdp-lib/stepper/doc.txt
deleted file mode 100644
index 851ad7670e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/doc.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-What is the _Stepper_?
-
-DrRacket includes an "algebraic stepper," a tool which proceeds
-through the evaluation of a set of definitions and expressions,
-one step at a time. This evaluation shows the user how DrRacket
-evaluates expressions and definitions, and can help in debugging
-programs.  Currently, the Stepper is available in the "Beginning
-Student" and "Intermediate Student" language levels.
-
-How do I use the Stepper?
-
-The Stepper operates on the contents of the frontmost DrRacket
-window.  A click on the "Step" button brings up the stepper
-window.  The stepper window has four panes, arranged as follows:
-
-------------------
-|    finished    |
-------------------
-|before ->  after|
-------------------
-|     coming     |
-------------------
-
-
-The first, "finished," box shows definitions and expressions
-whose evaluation is complete. This box is changed only when
-another completed evaluation's result is added to it.
-
-The second, "before," box, shows the current expression.  The
-region highlighted in green is known as the "redex".  You may
-pronounce this word in any way you want.  It is short for
-"reducible expression," and it is the expression which is the
-next to be simplified.
-
-The third, "after," box shows the result of the reduction.  The
-region highlighted in purple is the new expression which is
-substituted for the green one as a result of the reduction.
-
-Finally, the fourth box, labeled "coming" above, shows new
-expressions introduced by prior reductions which have yet to be
-reduced. As an example, a "local" expression may result in many
-new definitions which require reduction.  The definitions which
-have not yet been evaluated appear in the "coming" box.
-
-There are three buttons at the top of the stepper window.  The
-"Home" button returns to the initial state of the evaluation: that
-is, no expressions have yet been evaluated.  The "Previous"
-button returns to the prior step of the evaluation.  The "Next"
-step shows the next step in the evaluation.
-
-For more information on how DrRacket selects a "redex" and how
-the expressions are reduced, please see <A>The Beginner Language
-Semantics</A> which formally specify the set of rules governing
-the language's evaluation.
-
-Please note that the stepper only steps through the expressions
-in the definitions window, and does not allow the user to enter
-additional expressions.  So, for instance, a definitions buffer
-which contains only procedure definitions will not result in
-any reductions.
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/drracket-button.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/drracket-button.rkt
deleted file mode 100644
index cd1866fb2d..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/drracket-button.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang scheme/base
-(require scheme/class string-constants/string-constant
-         (prefix-in x: "private/mred-extensions.rkt"))
-(provide stepper-button-callback stepper-drracket-button)
-(define-local-member-name stepper-button-callback)
-
-(define stepper-drracket-button
-  (list 
-   (string-constant stepper-button-label)
-   x:step-img
-   (λ (drs-frame) (send drs-frame stepper-button-callback))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/examples/bobby.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/examples/bobby.rkt
deleted file mode 100644
index d5579290d4..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/examples/bobby.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket
-
-(for/list ([z 13])
-  z)
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/examples/external-interface-example.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/examples/external-interface-example.rkt
deleted file mode 100644
index fc142a1b42..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/examples/external-interface-example.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket
-
-(require stepper/external-interface
-         stepper/private/marks
-         racket/runtime-path)
-
-;; this handler just prints out some information about 
-;; the topmost mark in the list.
-(define (handler mark-list kind value-list)
-  (printf "handling a break\n")
-  (printf "break kind: ~s\n" kind)
-  (when mark-list
-    (printf "~a" (display-mark (first mark-list)))
-    (define source (mark-source (first mark-list)))
-    (printf "top-mark line: ~s\n" (syntax-line source))
-    (printf "top-mark column: ~s\n" (syntax-column source)))
-  (when value-list
-    (printf "values in value-list:\n")
-    (for ([v value-list])
-      (printf "~s\n" v)))
-  (newline))
-
-;; the string interface:
-(step-program-string "globby"
-                     "#lang racket 
-(+ 3 4)"
-                     handler)
-
-;; the file interface:
-(define-runtime-path bobby "./bobby.rkt")
-(step-program-file bobby handler)
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/external-interface.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/external-interface.rkt
deleted file mode 100644
index 46eecf7573..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/external-interface.rkt
+++ /dev/null
@@ -1,83 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         "private/annotate.rkt"
-         "private/marks.rkt")
-
-;; an external interface for the stepper.
-
-;; a handler gets a list of marks, a symbol indicating
-;; the kind of break, and an optional list of values 
-;; (associated with certain kinds of break).
-(define handler-ctct (-> (or/c list? false/c)
-                         symbol?
-                         (or/c list? false/c)
-                         any))
-
-(provide/contract
- [step-program-file (-> path-string? handler-ctct any/c)]
- [step-program-string (-> string? string? handler-ctct any/c)])
-
-
-(define (step-program-file path handler)
-  (define stx (path->stx path))
-  (expand-annotate-and-run stx handler))
-
-(define (step-program-string name prog-text handler)
-  (define stx (string->stx name prog-text))
-  (expand-annotate-and-run stx handler))
-
-(define-namespace-anchor here-anchor)
-
-(define (expand-annotate-and-run stx handler)
-  (define expanded
-    ;; should this be a blank namespace instead?
-    (parameterize ([current-namespace 
-                    (namespace-anchor->namespace here-anchor)])
-      (expand stx)))
-  #;(printf "~s\n" expanded)
-  (define module-name
-    (syntax-case expanded ()
-      [(#%module name . rest) (syntax-e #'name)]))
-  #;(printf "~s\n" module-name)
-  ;; unwrap the continuation-mark-set->list part:
-  (define (wrapped-handler mark-set kind vals)
-    (handler (cond [mark-set (extract-mark-list mark-set)]
-                   [else #f])
-             kind
-             vals))
-  (eval-syntax (annotate expanded wrapped-handler #t))
-  (dynamic-require `(quote ,module-name) #f))
-
-;; given a path, return the read syntax. Expects 
-;; a file starting with #lang
-(define (path->stx path)
-  (parameterize ([port-count-lines-enabled #t]
-                 [read-accept-reader #t])
-    (call-with-input-file path
-      (lambda (port) (read-syntax path port)))))
-
-;; read the program, return an expanded
-;; module with the given name.  Expects 
-;; a program starting with "#lang"
-(define (string->stx prog-name prog-text)
-  ;; I'm worried about the bogusness of this path:
-  (define fabricated-module-path
-    (build-path "/" "tmp" (string-append prog-name ".rkt")))
-  (define raw-stx
-    (parameterize ([port-count-lines-enabled #t]
-                   [read-accept-reader #t])
-      (define port (open-input-string prog-text fabricated-module-path))
-      (read-exactly-one fabricated-module-path port)))
-  raw-stx)
-
-;; read one syntax-object, make sure there are no more.
-(define (read-exactly-one path port)
-  (define first-stx (read-syntax path port))
-  (define second-stx (read-syntax "bogus" port))
-  (unless (eof-object? second-stx)
-    (error 'read-exactly-one
-           "expected only one syntax expression in port, got additional exp: ~s\n" (syntax->datum second-stx)))
-  first-stx)
-
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/info.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/info.rkt
deleted file mode 100644
index 79ab2ef166..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang info
-
-(define drracket-tools '(("stepper+xml-tool.rkt")))
-
-(define drracket-tool-names (list "The Stepper"))
-
-(define drracket-tool-icons (list '("stepper-32x32.png" "icons")))
-
-(define release-note-files (list (list "Stepper" "HISTORY.txt")))
-
-(define test-responsibles '((all clements)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/internal-docs.txt b/pkgs/htdp-pkgs/htdp-lib/stepper/internal-docs.txt
deleted file mode 100644
index 47ef53e36b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/internal-docs.txt
+++ /dev/null
@@ -1,322 +0,0 @@
-This file summarizes certain aspects of the operation of the stepper.
-
-The Stepper's use of syntax-property:
-
-In order to make macro-unwinding possible, the stepper adds
-syntax-properties to elaborated code which then informs the
-reconstruction process about how certain macros were originally
-formed.
-
-In fact, the truth is slightly more complicated, because there are
-two rounds of macro-expansion for a program written in a teaching
-language.  First, the program is expanded according to the
-macro definitions contained in the "lang" collection.  Then, the
-code is expanded according to the macro definitions built into
-mzscheme.  So, for instance, a beginner 'cond' expands into a
-mzscheme 'cond' which expands into a nested series of 'if's.
-
-Correspondingly, the stepper's addition of syntax properties is broken
-into two parts; those added for the beginner macros, and those added
-for the mzscheme macros.  However, since it is harder to alter the
-macro expansion which occurs in mzscheme, the latter set are added not
-during the actual macro expansion in mzscheme but as part of a pass
-over the code that occurs in the annotator between expansion and the
-main annotation.  This procedure is called 'top-level-rewrite'.
-
-Therefore, the stepper's syntax-property additions occur in two
-textual locations: collects/lang/private/teach.ss, and
-collects/stepper/private/annotate.ss (with a few stray ones
-in collects/lang/private/teachhelp.ss).
-
-In order to make it easy to move the stepper's syntax properties
-as a group and also in order to check that only sane ones are
-used, the stepper syntax properties are actually all grouped
-together as a list stored under a  single syntax property.
-
-In order to be visible to the reconstructor, these properties must
-be explicitly transferred from the annotated source code syntax to the
-reconstructed syntax. This is accomplished by the 'attach-info'
-procedure in shared.rkt. Note that in the process, the source and
-source-position properties are given names that have "user-" prepended
-to them.  This now seems like a strange decision.
-
-Finally, the astute reader may wonder why I need to add things like
-'comes-from-or, since the expression that results from the expansion
-of 'or' has a corresponding 'or' element in its 'origin field.  The
-reason is that this element appears only on the outermost expression
-in the expansion, and during runtime reconstruction, this outermost
-expression may be gone.
-
-Here are the syntax properties added, the values they may be
-associated with, their meanings, and where they're used.
-
-NB: this list of property names is specified in the code in
-private/shared.rkt; if you add one or change its name, you should
-do so in that code as well, or you'll get errors.
-
-stepper-skip-completely :
- [ #t ] : this code should not be annotated at all.  In general, this
- means it therefore be invisible to the reconstructor.
- Actually, the code is wrapped with a dummy mark,
- just to make sure that other marks get properly obliterated.
-
- Note that skipping an expression can turn a sensible expression into
- a nonsensical one.  This is where the 'expressions are lists of
- subexpressions' abstraction and the 'expressions are one of A...Z'
- abstraction part ways.
-
- Uses:
- - applied to the check of the test-variable in the expansion of the
-   'or' macro.
- - applied to the expansion of the primitives defined with
-   'define-primitive'.
- - applied to the 'make-generative-lambda' inserted by teach.ss
-
-stepper-hint :
- this is the most generally applied syntax property.  In general, it
- informs the reconstructor what macro this source expression came
- from.
-
- See notes below about 'being careful with stepper-hint'.
-
- [ 'comes-from-cond ] : similarly, this expression came from a use
- of 'cond'. This tag is applied to all the if's, but not to the else
- clause.
-
- [ 'comes-from-let* ] : expression was expanded from let*
- [ 'comes-from-local ] : expression was expanded from local
-
- [ 'from-xml-box ] : expression was expanded from an xml box
- [ 'from-scheme-box ] : expression was expanded from a scheme box
-                        (inside an xml box)
- [ 'from-splice-box ] : expression was expanded from a scheme splice
-		        box (inside an xml box)
- [ 'comes-from-recur ] : expression was expanded from a 'recur'
- [ 'comes-from-check-expect ] : expression was expanded from a 'check-expect'
- [ 'comes-from-check-within ] : ... from a 'check-within'
- [ 'comes-from-check-error ] : ... from a 'check-error'
- 
-stepper-define-type:
- this is attached to the right-hand sides of defines to indicate what
- kind of define they came from.
-
- [ 'shortened-proc-define ] : this lambda arose from the expansion
-    of (define (id arg ...) body).  N.B.: anything tagged with this
-    property must also have a 'stepper-proc-define-name
-    property.
-
- [ 'lambda-define ] : this lambda arose from the expansion of
-    (define id (lambda (
-
- Question 1: why the right-hand side?  Why not on the define itself?
- A: because for certain kinds of define (namely those in a local),
-    the define itself evaporates into an internal define which is then
-    expanded in a mzscheme-native expansion into a letrec.
-
- Question 2: won't the right-hand side change, losing the mark?
- A: yes it will, but not for definitions of lambdas.  Since there
-    are three cases we need to distinguish, and two of them are
-    definitions of lambdas, we can distinguish the third case
-    by its lack of a stepper-define-type mark.
-
- Question 3: what if, through reduction, a different expression
-  than the original one shows up ... which _does_ have one of the
-  two stepper-define-type marks?
- A: to prevent this, there's another syntax-property,
-    'stepper-proc-define-name, which indicates the identifier to which
-    this procedure was originally bound.  In the absence of set!,
-    this solves the problem.
-
-stepper-xml-hint : indicates whether this expression came from an
-xml-box.  The protocol is as follows:
-
- [ 'from-xml-box ] : attached to the outer application that wraps
-   the result of expanding an xml-box
-
- [ 'from-scheme-box ] : attached to the (begin ...) that wraps
-   the result of expanding a scheme-box
-
- [ 'from-splice-box ] : attached to the (qq-append ...) that wraps
-   the result of expanding a splice-box
-
-stepper-xml-value-hint : like the stepper-xml-hint, used to indicate
-   values that are the result of evaluating xml boxes.  The reason
-   this cannot be the same as the stepper-xml-hint property is that
-   the stepper-xml-hint property is one of the "attached" ones which
-   follows the source syntax around.  This means that instances of this
-   property used to signal values that are the result of xml-box
-   evaluation get stomped by the stepper-xml-hint values attached to the
-   source.
-
- [ 'from-xml-box ] : this value is the result of evaluating an xml
-   box.
-
-stepper-proc-define-name : stores the name to which a procedure
-   defined with the (define (fn arg ...) body) was bound.
-
-stepper-orig-name: attached to an uninterned symbol used by
-   the expansion of define so that the stepper can compare the
-   name attached to a lambda to the name of a definition.
-
-stepper-prim-name:
- this is attached to the expansion of primitives introduced with the
- 'define-primitive' form. Its value indicates what name to give to
- the source term at reconstruction time.
-
-stepper-binding-type :
- this is actually unrelated to macro expansion. It differentiates
- between the various kinds of lexical bindings.
-
- [ 'macro-bound ] : this variable's binding was inserted by a macro
- [ 'let-bound ] : this variable's binding was in a let/*/rec
- [ 'lambda-bound ] : this variable's binding was in a lambda
- [ 'non-lexical ] : this variable's identifier-binding is not
-      'lexical (i.e., unbound, top-level, or a module binding
-      
-
-stepper-no-lifting-info :
- this label is applied to a let-bound-variable whose binding is not
- being annotated (because the annotator is skipping inward past it).
- For such a binding, no corresponding lifting variable is generated,
- and so the marks shouldn't try to capture it.
-
- 
-stepper-and/or-clauses-consumed :
- indicates the number of clauses to the left of the one associated
- with a given 'if' in the expansion of an 'and' or 'or'.
- This allows the stepper to reconstruct a partially evaluated
- 'and' or 'or' with the right number of 'true's or 'false's
- in front.
- 
-stepper-skipto :
- this instructs the annotator to look inside the current expression
- along a given path for the expression to be annotated.  In
- particular, the value bound to stepper-skipto must be a list whose
- elements are car, cdr, or syntax-e.
-
-Some uses:
- - applied to the 'check-undefined' check added on local-bound variables.
- - applied to the spurious 'let' that's wrapped around a local.
-
-Where it's used: the stepper-skipto label is used by the 2nd-pass
-macro-labeler and the annotator.  Both are in annotate.ss.  In addition
-to skipping inward, a stepper hint
-
-stepper-skipto/discard :
-
- This is like stepper-skipto, except that it makes the stepper
- replace the expression the property is attached to by the
- subexpression indicated by its value.
-
- (This is used in the contracts implementation for "Die Macht der
- Abstraktion", where procedures are wrapped in a contract-checking
- context that has no impact on the reduction semantics.)
-
-stepper-replace :
-
-  This is like stepper-skipto/discard, except that it makes the
-  stepper replace the expression the property is attached to by the
-  value of the property.
-
-stepper-else :
- [ #t ] : Initially applied to the 'true' that the cond macro
-  replaces a beginner's 'else' with, it is later transferred
-  to the 'if' wrapping that 'true'.  This is because there is no
-  place to annotated the cond that is passed to mzscheme's
-  expander which will result in an annotation on the 'if.'
-  Note that it cannot be applied simply to the 'true' itself,
-  because then, when you reduce to the then, the mark on the
-  test (that is, the (#%datum . true)) is gone.
-  
-stepper-black-box-expr :
-  this expression should be treated as a "black box"; evaluated without
-  annotation, and "transparent" in the stepper, in the sense that the
-  original expression should appear in the completed expressions without
-  alteration.
-  
-  Examples:
-  - define-struct
-  - require
-  
-stepper-test-suite-hint :
-  this expression was the expression being tested in a test-suite-tool
-  test.  this hint indicates to the annotator that the expression should
-  be annotated, even though it's not in one of the expected top-level
-  shapes.
-
-stepper-highlight :
-  this expression will be highlighted.
-  (Not currently tranferred...?)
-
-stepper-fake-exp :
-  this expression does not occur directly in the source; reconstruct specially.
-  used for begin.
-
-stepper-args-of-call [ADDED BY RECONSTRUCTOR] :
-  this reconstructed (...) expression is the result of a call with these args.
-  used by the check-expect unwinder to figure out the expected values.
-
-stepper-hide-completed : don't show the final top-level expression binding
-  for this identifier.
-
-stepper-hide-reduction : don't show any reductions where this term is 
-  associated with the topmost mark
-
-stepper-use-val-as-final : use the return value of this expression as a
-  "completed" val in the stepper. Used for test cases.
-
-stepper-lifted-name : used by the reconstructor to tell the unwinder
-  what the lifted name of a variable is.
-
-lazy-op : ???
-
-
-STEPPER-HINT COLLISIONS
-
- The major concern with the stepper-hint is that two of them may
- collide.  My claim that this never happens is founded on the following
- reasoning, KNOWN NOT TO BE RIGOROUS.
-
- 0) Tags are attached only to expressions that are produced fresh as
- the result of a macro expansion. (For instance, the 'if' that is
- the result of the expansion of 'and'.)
-
- 1) except in the circumstances listed below, the expressions with tags
- attached to them are not themselves macro invocations.
-
- Q.E.D.
-
- exceptions:
-
-1) the beginner cond expands into the mzscheme cond, which is
-then annotated by the top-level-rewrite. In this case, the expansion
-of the beginner cond does not add any stepper-hint properties, so no
-collision can occur.
-
-2) the intermediate let* expands into the beginner let; both add a
-stepper-hint.  To resolve this, the expansion of let allows an existing
-stepper-hint to stand.
-
-
-KINDS OF BREAKPOINTS:
-
-'normal-break : occurs before an expression's evaluation. The "before"
-  steps.
-
-'result-exp-break : occurs before an expression's evaluation that is the
-  "after" of some other step. E.G., the rhs of a cond, the body of
-  a procedure, etc.
-
-'result-value-break : occurs when a value is returned. Also corresponds
-  to an "after" step.
-
-'normal-break/values : occurs before an expression's evaluation, when
-  that expression has intermediate values. For instance, an "if"'s
-  reduction occurs after its test value has been evaluated, so the
-  "before" step for the "if" must already know about the test value.
-
-'expr-finished-break : occurs when a top-level expression is complete.
-
-'double-break : occurs as part of the evaluation of a let or local,
-  after the evaluation of all the binding rhses. Called a double-break
-  because it must generate two steps.
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/annotate.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/annotate.rkt
deleted file mode 100644
index 0150c8d83b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/annotate.rkt
+++ /dev/null
@@ -1,1338 +0,0 @@
-#lang racket/base
-
-(require (prefix-in kernel: syntax/kerncase)
-         racket/match
-         racket/contract
-         "marks.rkt"
-         "shared.rkt"
-         "syntax-property.rkt"
-         "my-macros.rkt"
-         #;"xml-box.rkt"
-         (prefix-in beginner-defined: "beginner-defined.rkt")
-         (for-syntax racket/base))
-
-(define-syntax (where stx)
-  (syntax-case stx ()
-    [(_ body bindings)
-     (syntax/loc stx (letrec bindings body))]))
-
-; CONTRACTS
-
-
-; PROVIDE
-(provide/contract
- [annotate
-  (syntax?                         ; syntax to annotate
-   ((or/c continuation-mark-set? false/c) 
-    break-kind?
-    (or/c list? false/c)
-    . -> .
-    any/c)                       ; procedure for runtime break
-   boolean?   ; show-lambdas-as-lambdas?
-   . -> .
-   syntax?)]                       ; result
- 
- #;[top-level-rewrite (-> syntax? syntax?)])
-
-
-;                                               
-; ;                         ;          ;         
-; ;    ; ;;   ; ;;    ;;;  ;;;;  ;;;  ;;;;  ;;;  
-; ;    ;;  ;  ;;  ;  ;   ;  ;   ;   ;  ;   ;   ; 
-;   ;   ;   ;  ;   ;  ;   ;  ;       ;  ;   ;   ; 
-;;;;;   ;   ;  ;   ;  ;   ;  ;    ;;;;  ;   ;;;;; 
-;   ;   ;   ;  ;   ;  ;   ;  ;   ;   ;  ;   ;     
-;     ;  ;   ;  ;   ;  ;   ;  ;   ;   ;  ;   ;     
-;     ;  ;   ;  ;   ;   ;;;    ;;  ;;;;;  ;;  ;;;; 
-
-
-
-
-;  oh-say-can-you-see,by-the-dawn's-early-light,what-so-proudly-we-hailed,at-the-twilight's-last-gle
-;  a m i n g . W h o s e b r o a d s t r i                                                         p
-;  pe s a n d b r i g h t s t a r s , t hrough-the-perilous-night,o'er-the-ramparts-we-watched,were-
-;  s o g a l l a n t l y s t r e a m i n g                                                         .
-;  an d t h e r o c k e t ' s r e d g l are,the-bombs-bursting-in-air,gave-proof-through-the-night,,
-;  t h a t o u r f l a g w a s s t i l l t                                                         h
-;  er e . O h s a y , d o e s t h a t s tar-spangled-banner-yet-wave,o'er-the-land-of-the-free,and-t
-;  h e h o m e o f t h e b r a v e ? . . .                                                         .
-;  .. . . . . . . . . . . . . . . . . . ............................................................
-;  . . . . . . . . . . . . . . . . . . . .                                                         .
-;  .........you-know,-this-flag-doesn't-feel-quite-as...............................................
-;  .                                                                                               .
-;  ..........lighthearted-as-it-did-when-I-created-it-in-1998.......................................
-;  .                                                                                               .
-;  .................................................................................................
-;  .                                                                                               .
-;  .................................................................................................
-;  .                                                                                               .
-;  .................................................................................................
-;  .                                                                                               .
-;  .................................................................................................
-;  .                                                                                               .
-;  .................................................................................................
-;  .                                                                                               .
-;  .................................................................................................
-;
-
-
-;; given an expression to annotate, and a 'break' expression to call 
-;; when a breakpoint occurs, and a boolean indicating whether
-;; lambdas are to be displayed as lambdas, return an annotated expression.
-(define (annotate main-exp break show-lambdas-as-lambdas?)
-  
-  #;(define _ (>>> main-exp #;(syntax->datum main-exp)))
-  
-  (define binding-indexer
-    (let ([binding-index 0])
-      (lambda ()
-        (let ([temp binding-index])
-          (set! binding-index (+ binding-index 1))
-          temp))))
-  
-  (define (normal-break)
-    (break (current-continuation-marks) 'normal-break #f))
-  
-  (define (result-exp-break)
-    (break (current-continuation-marks) 'result-exp-break #f))
-  
-  (define (result-value-break vals-list)
-    (break (current-continuation-marks) 'result-value-break vals-list))
-  
-  (define (normal-break/values vals-list)
-    (break (current-continuation-marks) 'normal-break/values vals-list))
-  
-  (define (exp-finished-break info-list)
-    (break #f 'expr-finished-break info-list))
-  
-  (define (double-break)
-    (break (current-continuation-marks) 'double-break #f))
-  
-  (define ((make-opaque-exp-break exp))
-    (exp-finished-break 
-     (list (list (lambda () exp) 
-                 #f 
-                 (lambda () (error 'make-define-struct-break
-                                   "no getter for a define-struct"))))))
-  
-  ; wcm-pre-break-wrap : call wcm-wrap with a pre-break on the expr
-  (define (wcm-pre-break-wrap debug-info exp)
-    (wcm-wrap debug-info (pre-break-wrap exp)))
-  
-  ;; wrap a pre-break around stx
-  (define (pre-break-wrap stx)
-    #`(begin (#%plain-app #,result-exp-break) #,stx))
-  
-  ;; wrap a normal break around stx
-  (define (break-wrap exp)
-    #`(begin (#%plain-app #,normal-break) #,exp));
-  
-  ;; wrap a double-break around exp
-  (define (double-break-wrap exp)
-    #`(begin (#%plain-app #,double-break) #,exp))
-  
-  ;; abstraction used in the next two defs
-  (define (return-value-wrap-maker break-proc) 
-    (lambda (exp)
-      #`(#%plain-app
-         call-with-values
-         (#%plain-lambda () #,exp)
-         (#%plain-lambda args
-           (#%plain-app #,break-proc args)
-           (#%plain-app #,apply values args)))))
-  
-  ;; wrap a return-value-break around exp
-  (define return-value-wrap
-    (return-value-wrap-maker result-value-break))
-  
-  ;; wrap a normal-break/values around exp
-  (define normal-break/values-wrap
-    (return-value-wrap-maker normal-break/values))
-  
-  (define (top-level-annotate/inner exp source-exp defined-name)
-    (match-let* 
-        ([(vector annotated dont-care)
-          (annotate/inner exp 'all #f defined-name)])
-      #`(with-continuation-mark #,debug-key 
-          #,(make-top-level-mark source-exp)
-          ;; inserting eta-expansion to prevent destruction of top-level mark
-          (#%plain-app
-           call-with-values (#%plain-lambda () #,annotated)
-           (#%plain-lambda args (#%plain-app #,apply values args))))))
-  
-  ; annotate/inner takes 
-  ; a) an expression to annotate
-  ; b) a list of all bindings which this expression is tail w.r.t. 
-  ;    or 'all to indicate that this expression is tail w.r.t. _all_ bindings.
-  ; d) a boolean indicating whether this expression will be the r.h.s. of a reduction
-  ;    (and therefore should be broken before)
-  ; g) information about the binding name of the given expression.  This is used 
-  ;    to associate a name with a closure mark (though this may now be redundant)
-  
-  ; it returns (as a 2vals)
-  ; a) an annotated s-expression
-  ; b) a list of varrefs for the variables which occur free in the expression
-  ;
-  ;(syntax-object BINDING-SET bool bool (or/c #f symbol (list binding symbol)) -> 
-  ;          sexp (list-of z:varref))
-  
-  
-  
-  
-  
-  ;                                                       ;  ;                           
-  ;                              ;          ;             ;                              
-  ;   ;;;   ; ;;   ; ;;    ;;;  ;;;;  ;;;  ;;;;  ;;;     ;   ;  ; ;;   ; ;;    ;;;   ; ;;
-  ;  ;   ;  ;;  ;  ;;  ;  ;   ;  ;   ;   ;  ;   ;   ;    ;   ;  ;;  ;  ;;  ;  ;   ;  ;;  
-  ;      ;  ;   ;  ;   ;  ;   ;  ;       ;  ;   ;   ;    ;   ;  ;   ;  ;   ;  ;   ;  ;   
-  ;   ;;;;  ;   ;  ;   ;  ;   ;  ;    ;;;;  ;   ;;;;;   ;    ;  ;   ;  ;   ;  ;;;;;  ;   
-  ;  ;   ;  ;   ;  ;   ;  ;   ;  ;   ;   ;  ;   ;       ;    ;  ;   ;  ;   ;  ;      ;   
-  ;  ;   ;  ;   ;  ;   ;  ;   ;  ;   ;   ;  ;   ;       ;    ;  ;   ;  ;   ;  ;      ;   
-  ;   ;;;;; ;   ;  ;   ;   ;;;    ;;  ;;;;;  ;;  ;;;;   ;    ;  ;   ;  ;   ;   ;;;;  ;   
-  ;  ;                                 
-  ;                                 
-  
-  (define annotate/inner
-    #;(syntax? binding-set? boolean? (or/c false/c syntax? (list/p syntax? syntax?)) (or/c false/c integer?)
-               . -> . (vector/p syntax? binding-set?))
-    (lambda (exp tail-bound pre-break? procedure-name-info)
-      
-      ;; annotate an exp with a stepper/skipto or stepper-skipto/discard
-      ;; label
-      (define (dont-annotate traversal)
-        ;; mutable, to catch free vars. Mutated several times, we
-        ;; only care about the last. A bit yecchy.
-        (define free-vars-captured #f)
-        
-        (define (subterm-recur subterm)
-          (match-let* 
-              ([(vector stx free-vars)
-                (annotate/inner subterm tail-bound pre-break?
-                                procedure-name-info)])
-            (set! free-vars-captured free-vars)
-            stx))
-        
-        (define annotated (skipto/auto exp traversal subterm-recur))
-        
-        (vector (wcm-wrap skipto-mark annotated) free-vars-captured))
-
-      ;; recurrence procedures, used to recur on sub-expressions:
-
-      (define (tail-recur exp) (annotate/inner exp tail-bound
-                                               #t procedure-name-info))
-      (define (non-tail-recur exp) (annotate/inner exp null #f #f))
-      (define (result-recur exp) (annotate/inner exp null
-                                                 #f procedure-name-info))
-      (define (set!-rhs-recur exp name) (annotate/inner exp null #f name))
-      (define (let-rhs-recur exp binding-names dyn-index-syms)
-        (define proc-name-info 
-          (if (not (null? binding-names))
-              (list (car binding-names) (car dyn-index-syms))
-              #f))
-        (annotate/inner exp null #f proc-name-info))
-      (define (lambda-body-recur exp) (annotate/inner exp 'all #t #f))
-      
-      
-      ; let bodies have a startling number of recurrence patterns. ouch!  
-      ;; ... looks like these can maybe be collapsed with a simpler desired reduction sequence
-      ;; (a.k.a. not safe-for-space).
-                  
-      ;; no pre-break, tail w.r.t. new bindings:
-      (define (let-body-recur/single exp bindings)
-        (annotate/inner exp (binding-set-union (list tail-bound bindings))
-                        #f procedure-name-info))
-                  
-      ;; different flavors of make-debug-info allow users to provide only the needed fields:
-                  
-      (define (make-debug-info-normal free-bindings)
-        (make-debug-info exp tail-bound free-bindings 'none #t))
-      
-      (define (make-debug-info-app tail-bound free-bindings label)
-        (make-debug-info exp tail-bound free-bindings label #t))
-      
-      (define (make-debug-info-let free-bindings binding-list let-counter)
-        (make-debug-info 
-         exp 
-         (binding-set-union (list tail-bound 
-                                  binding-list
-                                  (list let-counter)))
-         (varref-set-union (list free-bindings 
-                                 binding-list
-                                 (list let-counter))) ; NB using bindings as varrefs
-         'let-body
-         #t))
-      (define (make-debug-info-fake-exp exp free-bindings)
-        (make-debug-info (stepper-syntax-property exp 'stepper-fake-exp #t) 
-                         tail-bound free-bindings 'none #t))
-      
-      (define (make-debug-info-fake-exp/tail-bound exp tail-bound free-bindings)
-        (make-debug-info (stepper-syntax-property exp 'stepper-fake-exp #t) 
-                         tail-bound free-bindings 'none #t))
-                  
-      (define outer-wcm-wrap (if pre-break?
-                                 wcm-pre-break-wrap
-                                 wcm-wrap))
-      (define (wcm-break-wrap debug-info exp)
-        (outer-wcm-wrap debug-info (break-wrap exp)))
-                  
-      ;; used for things that are values:
-      (define (normal-bundle free-vars annotated)
-        (vector (outer-wcm-wrap (make-debug-info-normal free-vars)
-                                annotated)
-                free-vars))
-      
-      
-      ;    @@                 @@         @@        
-      ;     @                  @          @        
-      ;     @     $@$: @@+-$:  @-@$    $@:@   $@$: 
-      ;     @       -@  @+@$@  @+ *$  $* *@     -@ 
-      ;     @    -$@$@  @ @ @  @   @  @   @  -$@$@ 
-      ;     @    $*  @  @ @ @  @   @  @   @  $*  @ 
-      ;     @    @- *@  @ @ @  @  +$  $* *@  @- *@ 
-      ;   @@@@@  -$$-@@@@@@@@@@@+@$    $@:@@ -$$-@@
-      ;                                                        
-      
-      (define (lambda-clause-abstraction clause)
-        (with-syntax ([(args-stx . bodies) clause])
-          (match-let* 
-              ([(vector annotated-body free-varrefs)
-                ; wrap bodies in explicit begin if more than 1 
-                ; user-introduced (non-skipped) bodies
-                ; NB: CAN'T HAPPEN in beginner up through int/lambda
-                (let ([non-skipped-bodies
-                       (filter 
-                        (lambda (clause)
-                          (not (to-be-skipped? clause)))
-                        (syntax->list (syntax bodies)))])
-                  (if (> (length non-skipped-bodies) 1)
-                      (lambda-body-recur (syntax (begin . bodies)))
-                      (match-let* 
-                          ([(vector annotated-bodies free-var-sets)
-                            (2vals-map lambda-body-recur
-                                       (syntax->list #`bodies))])
-                        (vector #`(begin . #,annotated-bodies)
-                                (varref-set-union free-var-sets)))))]
-               [new-free-varrefs 
-                (varref-set-remove-bindings
-                 free-varrefs
-                 (arglist-flatten #'args-stx))])
-            (vector (datum->syntax
-                     #'here
-                     `(,#'args-stx ,annotated-body) #'clause)
-                    new-free-varrefs))))
-      
-      
-      (define (outer-lambda-abstraction annotated-lambda free-varrefs)
-        (let*
-            ([closure-info (make-debug-info-app 'all free-varrefs 'none)]
-             ;; if we manually disable the storage of names, 
-             ;; lambdas get rendered as lambdas.
-             ;; Yikes, this seems like a pretty gross hack... JBC 2010-12
-             [closure-name 
-              (if show-lambdas-as-lambdas?
-                  #f
-                  (cond [(syntax? procedure-name-info) procedure-name-info]
-                        [(pair? procedure-name-info) (car procedure-name-info)]
-                        [else #f]))]
-             
-             [closure-storing-proc
-              (lambda (clo debug-info maybe-index)
-                (annotated-proc
-                 clo
-                 (make-closure-record 
-                  closure-name
-                  debug-info
-                  #f
-                  maybe-index)))]
-             
-             [captured
-              (cond [(pair? procedure-name-info)
-                     #`(#%plain-app 
-                        #,closure-storing-proc
-                        #,annotated-lambda
-                        #,closure-info 
-                        #,(cadr procedure-name-info))]
-                    [else
-                     #`(#%plain-app
-                        #,closure-storing-proc
-                        #,annotated-lambda
-                        #,closure-info
-                        #f)])]
-             
-             ;; gnarr! I can't find a test case
-             ;; that depends on the attachment of the inferred name...
-             [inferred-name-struct
-              (if closure-name
-                  (syntax-property
-                   captured
-                   'inferred-name
-                   (syntax-e closure-name))
-                  captured)])
-         
-         (normal-bundle free-varrefs inferred-name-struct)))
-      
-      
-                  
-      
-      
-      ;    @@                 
-      ;     @            @    
-      ;     @    -@@$   @@@@@ 
-      ;     @    $  -$   @    
-      ;     @    @@@@@   @    
-      ;     @    $       @    
-      ;     @    +:      @: :$
-      ;   @@@@@   $@@+   :@@$-
-      
-      
-      ; The let transformation is complicated.
-      ; here's a sample transformation (not including 'break's):
-      ;(let-values ([(a b c) e1] [(d e) e2]) e3)
-      ;
-      ;turns into
-      ;
-      ;(let ([counter (<dynamic-counter-call>)])
-      ;(let-values ([(a b c d e lifter-a-1 lifter-b-2 lifter-c-3 lifter-d-4 lifter-e-5 let-counter)
-      ;              (values *unevaluated* *unevaluated* *unevaluated* *unevaluated* *unevaluated*
-      ;                      counter counter counter counter counter 0)])
-      ;  (with-continuation-mark 
-      ;   key huge-value
-      ;   (begin
-      ;     (set!-values (a b c) e1)
-      ;     (set! let-counter 1)
-      ;     (set!-values (d e) e2)
-      ;     (set! let-counter 2)
-      ;     e3))))
-      ;
-      ; note that this elaboration looks exactly like the one for letrec, and that's
-      ; okay, because expand guarantees that reordering them will not cause capture.
-      ; this is because a bound variable answers is considered bound by a binding only when
-      ; the pair answers true to bound-identifier=?, which is determined during (the first)
-      ; expand.
-      
-      ; another irritating point: the mark and the break that must go immediately 
-      ; around the body.  Irritating because they will be instantly replaced by
-      ; the mark and the break produced by the annotated body itself. However, 
-      ; they're necessary, because the body may not contain free references to 
-      ; all of the variables defined in the let, and thus their values are not 
-      ; known otherwise.  
-      ; whoops! hold the phone.  I think I can get away with a break before, and
-      ; a mark after, so only one of each.  groovy, eh?
-      
-      ; 2005-08: note that the set!-based approach on the let-counter is broken in the presence of 
-      ;  continuations; backing up a computation using a set! will not revert the
-      ;  counter, and the stepper may think that the computation is in a different 
-      ;  place.  To fix this, we must go to a pure let* with nested marks at each right-hand-side.
-      
-      ; 2006-01: oh dear heaven.  Begin expands into a let-values.  This means that the 
-      ;  let-values really has most of the complexity of the whole stepper, all in one 
-      ;  place.  Re-formulating the bodies as a begin and re-calling annotate/inner broke
-      ;  implied invariants (in particular, that annotate/inner was only called on subexprs)
-      ;  and confused the heck out of me for some time today.  Bleah.  I'm just going to 
-      ;  do the whole expansion here. Also, I'm going to make this expansion call/cc-clean, 
-      ;  because I think it'll actually be easier to state & read this way.
-      
-      ; 2006-11: appears to work now.  I'm about to try to transfer this new idiom to begin0;
-      ;  wish me luck.
-      
-      
-      (define (let-abstraction stx output-identifier)
-        (with-syntax ([(_ ([(var ...) val] ...) . bodies) stx])
-          (match-let*
-              ([binding-sets (map syntax->list (syntax->list #'((var ...) ...)))]
-               [binding-list (apply append binding-sets)]
-               [vals (syntax->list #'(val ...))]
-               [lifted-var-sets (map (lx (map get-lifted-var _)) binding-sets)]
-               [lifted-vars (apply append lifted-var-sets)]
-               [(vector annotated-vals free-varref-sets-vals)
-                (2vals-map let-rhs-recur vals binding-sets lifted-var-sets)]
-               [bodies-list (syntax->list #'bodies)]
-               [(vector annotated-body free-varrefs-body)
-                (if (= (length bodies-list) 1)
-                    (let-body-recur/single (car bodies-list) binding-list)
-                    ;; oh dear lord, we have to unfold these like an application:
-                    (let unroll-loop ([bodies-list bodies-list] [outermost? #t])
-                      (cond [(null? bodies-list)
-                             (error 'annotate "no bodies in let")]
-                            [(null? (cdr bodies-list))
-                             (tail-recur (car bodies-list))]
-                            [else
-                             (match-let*
-                              ([(vector rest free-vars-rest) 
-                                (unroll-loop (cdr bodies-list) #f)]
-                               [(vector this-one free-vars-this)
-                                (non-tail-recur (car bodies-list))]
-                               [free-vars-all
-                                (varref-set-union (list free-vars-rest
-                                                        free-vars-this))]
-                               [debug-info (make-debug-info-fake-exp 
-                                            #`(begin #,@bodies-list)
-                                            free-vars-all)]
-                               [begin-form 
-                                 #`(begin 
-                                     #,(normal-break/values-wrap this-one) 
-                                     #,rest)])
-                              (vector (if outermost?
-                                          (wcm-wrap debug-info begin-form)
-                                          (wcm-pre-break-wrap debug-info
-                                                              begin-form))
-                                      free-vars-all))])))])
-           
-           ((vector (quasisyntax/loc 
-                        exp 
-                      (let ([#,counter-id (#,binding-indexer)])
-                        (#,output-identifier #,outer-initialization #,wrapped-begin))) 
-                    free-varrefs)
-            
-            . where .
-            
-            ([free-varrefs (varref-set-remove-bindings 
-                            (varref-set-union (cons free-varrefs-body
-                                                    free-varref-sets-vals)) 
-                            binding-list)]
-             [counter-id #`lifting-counter]
-             [unevaluated-list (map (lambda (b) *unevaluated*)  binding-list)]
-             [outer-initialization
-              #`([(#,@lifted-vars #,@binding-list #,let-counter)
-                  (values #,@(append (map (lambda (dc_binding) counter-id)
-                                          binding-list)
-                                     unevaluated-list
-                                     (list 0)))])]
-             [counter-clauses (build-list 
-                               (length binding-sets)
-                               (lambda (num)
-                                 #`(set! #,let-counter #,(+ num 1))))]
-             [set!-clauses
-              (map (lambda (binding-set val)
-                     #`(set!-values #,binding-set #,val))
-                   binding-sets
-                   annotated-vals)]
-             [exp-finished-clauses
-              
-              (with-syntax  ([(_ let-clauses . dc) stx]
-                             [((lifted-var ...) ...) lifted-var-sets])
-                (with-syntax ([(exp-thunk ...) (map (lx (lambda () _))
-                                                    (syntax->list #`let-clauses))])
-                  #`(#%plain-app 
-                     list 
-                     (#%plain-app
-                      list exp-thunk
-                      (#%plain-app
-                       list lifted-var ...)
-                      (#%plain-lambda () (#%plain-app list var ...))) ...)))]
-             ; time to work from the inside out again
-             ; without renaming, this would all be much much simpler.
-             [wrapped-begin (outer-wcm-wrap (make-debug-info-let free-varrefs
-                                                                 binding-list
-                                                                 let-counter) 
-                                            (double-break-wrap
-                                             #`(begin #,@(apply append (zip set!-clauses counter-clauses))
-                                                      (#%plain-app #,exp-finished-break #,exp-finished-clauses)
-                                                      #,annotated-body)))])))))
-      
-      
-                  
-                  
-                  
-                  
-                  
-      
-      
-      ;     @     :@@$ 
-      ;           @:   
-      ;   -@@    @@@@@ 
-      ;     @     @    
-      ;     @     @    
-      ;     @     @    
-      ;     @     @    
-      ;   @@@@@  @@@@@ 
-      
-      ; if-abstraction: (-> syntax? syntax? (or/c false/c syntax?) (values syntax? varref-set?))
-      (define (if-abstraction test then else) 
-        (match-let*
-            ([(vector annotated-test free-varrefs-test) 
-              (non-tail-recur test)]
-             [test-with-break
-              (normal-break/values-wrap annotated-test)]
-             [(vector annotated-then free-varrefs-then) 
-              (tail-recur then)]
-             [(vector annotated-else free-varrefs-else)
-              (if else
-                  (tail-recur else)
-                  (vector #f null))]
-             [free-varrefs (varref-set-union (list free-varrefs-test 
-                                                   free-varrefs-then 
-                                                   free-varrefs-else))]
-             [annotated-if 
-              (if else
-                  (quasisyntax/loc exp 
-                    (if #,test-with-break #,annotated-then #,annotated-else))
-                  (quasisyntax/loc exp 
-                    (if #,test-with-break #,annotated-then)))])
-          (vector
-           (outer-wcm-wrap (make-debug-info-normal free-varrefs) annotated-if)
-           free-varrefs)))
-      
-      
-                  
-      
-      
-      ;                                            
-      ;                                            
-      ;                                        ;;; 
-      ;                                       ;    
-      ;                                       ;    
-      ;   ;   ;   ;;;;  ; ;;;  ; ;;;   ;;;  ;;;;;; 
-      ;   ;   ;  ;   ;  ;;  ;  ;;  ;  ;   ;   ;    
-      ;    ; ;   ;   ;  ;      ;      ;;;;;   ;    
-      ;    ; ;   ;   ;  ;      ;      ;       ;    
-      ;    ; ;   ;  ;;  ;      ;      ;       ;    
-      ;     ;     ;; ;  ;      ;       ;;;;   ;    
-      ;                                            
-      ;                                            
-      ;                                            
-      
-      
-      (define (varref-abstraction var)
-        (match-let* 
-            ([free-varrefs (list var)]
-             [varref-break-wrap
-              (lambda ()
-                (wcm-break-wrap (make-debug-info-normal free-varrefs)
-                                (return-value-wrap var)))]
-             [varref-no-break-wrap
-              (lambda ()
-                (outer-wcm-wrap (make-debug-info-normal free-varrefs) var))]
-             ;; JBC: shouldn't this be the namespace of the user's code... ?
-             [base-namespace-symbols (namespace-mapped-symbols (make-base-namespace))]
-             [module-bound-varref-break-wrap
-              (lambda ()
-                (varref-break-wrap)
-                #;(if (or (memq (syntax-e var) beginner-defined:must-reduce)
-                        (and (stepper-syntax-property var 'lazy-op)
-                             (not (memq (syntax->datum var) base-namespace-symbols))))
-                    (varref-break-wrap)
-                    (varref-no-break-wrap)))])
-          (vector 
-           (match (stepper-syntax-property var 'stepper-binding-type)
-             [(or 'lambda-bound 'macro-bound)   (varref-no-break-wrap)]
-             ['let-bound                        (varref-break-wrap)]
-             ['non-lexical ;; is it from this module or not?
-              (match (identifier-binding var)
-                ;; this can only come up when stepping through non-module code...
-                ;; perhaps we should just signal an error here.
-                (#f (varref-break-wrap))
-                ['lexical  
-                 ;; my reading of the docs suggest that this should not occur in v4...
-                 (error 'varref-abstraction 
-                        "identifier-binding should not be 'lexical")]
-                [(list-rest (? module-path-index? path-index) dontcare)
-                 (let-values ([(module-path dc5)
-                               (module-path-index-split path-index)])
-                   (if module-path
-                       ;; not a module-local variable:
-                       (module-bound-varref-break-wrap)
-                       ;; a module-local-variable:
-                       (varref-break-wrap)))]
-                [other (error 
-                        'annotate
-                        "unexpected value for identifier-binding: ~v" other)])]
-             [other
-              (error 'annotate 
-                     "unexpected value for stepper-binding-type on variable ~e: ~e"
-                     (syntax->datum var)
-                     other)])
-           free-varrefs)))
-                  
-      (define (recertifier vals)
-        (match-let* ([(vector new-exp bindings) vals])
-          (vector new-exp
-                  (map (lambda (b) b)
-                       bindings))))
-
-      ;; this is a terrible hack... until some other language form needs it. 
-      ;; It wraps the given annotated expression with a break that adds the 
-      ;; result to the list of completed expressions
-      (define maybe-final-val-wrap
-        (match-lambda 
-          [(vector annotated free-vars) 
-           (vector (if (stepper-syntax-property exp 'stepper-use-val-as-final)
-                       #`(#%plain-app
-                          call-with-values 
-                          (#%plain-lambda () #,annotated)
-                          (#%plain-lambda 
-                           results
-                           (#,exp-finished-break 
-                            (#%plain-app list
-                                         (#%plain-app 
-                                          list
-                                          #,(lambda () exp)
-                                          #f
-                                          (#%plain-lambda () results))))
-                                          (#%plain-app values results)))
-                       annotated)
-                   free-vars)]
-          [error 'maybe-final-val-wrap "stepper internal error 20080527"]))
-      
-      (cond [(stepper-syntax-property exp 'stepper-skipto) 
-             (dont-annotate 'rebuild)]
-            [(stepper-syntax-property exp 'stepper-skipto/discard)
-             (dont-annotate 'discard)]
-            [(to-be-skipped? exp)
-             (vector (wcm-wrap "supposed to be skipped" exp) null)]
-            
-            [else
-             (let ([exp (syntax-disarm exp saved-code-inspector)])
-              (recertifier
-              (maybe-final-val-wrap
-               (kernel:kernel-syntax-case 
-                exp #f
-                
-                [(#%plain-lambda . clause)
-                 (match-let* 
-                     ([(vector annotated-clause free-varrefs)
-                       (lambda-clause-abstraction (syntax clause))]
-                      [annotated-lambda
-                       (with-syntax ([annotated-clause annotated-clause])
-                         (syntax/loc exp (#%plain-lambda . annotated-clause)))])
-                   (outer-lambda-abstraction annotated-lambda free-varrefs))]
-                
-                [(case-lambda . clauses)
-                 (match-let* 
-                     ([(vector annotated-cases free-varrefs-cases)
-                       (2vals-map lambda-clause-abstraction (syntax->list (syntax clauses)))]
-                      [annotated-case-lambda (with-syntax ([annotated-cases annotated-cases])
-                                               (syntax/loc exp (case-lambda . annotated-cases)))]
-                      [free-varrefs (varref-set-union free-varrefs-cases)])
-                   (outer-lambda-abstraction annotated-case-lambda free-varrefs))]
-                
-                
-                
-                [(if test then else) (if-abstraction (syntax test) (syntax then) (syntax else))]
-                
-                
-                ;                                     
-                ;                                     
-                ;   ;                     ;           
-                ;   ;                                 
-                ;   ;                                 
-                ;   ; ;;    ;;;    ;;;; ;;;     ; ;;  
-                ;   ;;  ;  ;   ;  ;   ;   ;     ;;  ; 
-                ;   ;   ;  ;;;;;  ;   ;   ;     ;   ; 
-                ;   ;   ;  ;      ;   ;   ;     ;   ; 
-                ;   ;   ;  ;      ;  ;;   ;     ;   ; 
-                ;   ;;;;    ;;;;   ;; ;   ;;;   ;   ; 
-                ;                     ;               
-                ;                 ;;;;                
-                ;                                     
-                
-                
-                [(begin . bodies-stx)
-                 (begin
-                   (error 'annotate-inner "nothing expands into begin! : ~v" (syntax->datum exp))
-                   #;(begin-abstraction (syntax->list #`bodies-stx)))]
-                
-                
-                ;                                            
-                ;                                            
-                ;   ;                     ;             ;;   
-                ;   ;                                  ;  ;  
-                ;   ;                                 ;   ;; 
-                ;   ; ;;    ;;;    ;;;; ;;;     ; ;;  ;  ; ; 
-                ;   ;;  ;  ;   ;  ;   ;   ;     ;;  ; ;  ; ; 
-                ;   ;   ;  ;;;;;  ;   ;   ;     ;   ; ; ;  ; 
-                ;   ;   ;  ;      ;   ;   ;     ;   ; ;;   ; 
-                ;   ;   ;  ;      ;  ;;   ;     ;   ; ;;  ;  
-                ;   ;;;;    ;;;;   ;; ;   ;;;   ;   ;   ;;   
-                ;                     ;                      
-                ;                 ;;;;                       
-                ;                                            
-                
-                ;; one-element begin0 is a special case, because in this case only
-                ;; the body of the begin0 is in tail position.
-                
-                [(begin0 body)
-                 (match-let* ([(vector annotated-body free-vars-body) 
-                               (tail-recur #'body)])
-                   (vector (wcm-break-wrap (make-debug-info-normal free-vars-body)
-                                           (quasisyntax/loc exp (begin0 #,annotated-body)))
-                           free-vars-body))]
-                
-                
-                [(begin0 first-body . bodies-stx)
-                 (match-let*
-                     ([(vector annotated-first free-vars-first) (result-recur #'first-body)]
-                      [(vector annotated-rest free-vars-rest) (2vals-map non-tail-recur (syntax->list #`bodies-stx))]
-                      [wrapped-rest (map normal-break/values-wrap annotated-rest)]
-                      [all-free-vars (varref-set-union (cons free-vars-first free-vars-rest))]
-                      [early-debug-info (make-debug-info-normal all-free-vars)]
-                      [tagged-temp (stepper-syntax-property begin0-temp 'stepper-binding-type 'stepper-temp)]
-                      [debug-info-maker
-                       (lambda (rest-exps)
-                         (make-debug-info-fake-exp/tail-bound                                               
-                          #`(begin0 #,@rest-exps)
-                          (binding-set-union (list (list tagged-temp) tail-bound))
-                          (varref-set-union (list (list tagged-temp) all-free-vars))))]
-                      [rolled-into-fakes 
-                       (let loop ([remaining-wrapped wrapped-rest] 
-                                  [remaining-src (syntax->list #`bodies-stx)]
-                                  [first-time? #t])
-                         ((if first-time? wcm-wrap wcm-pre-break-wrap)
-                          (debug-info-maker remaining-src)   
-                          (cond [(null? remaining-src) begin0-temp]
-                                [else #`(begin #,(car remaining-wrapped) #,(loop (cdr remaining-wrapped)
-                                                                                 (cdr remaining-src)
-                                                                                 #f))])))])
-                   (vector (wcm-wrap early-debug-info
-                                     #`(let ([#,begin0-temp #,annotated-first])
-                                         #,rolled-into-fakes))
-                           all-free-vars))]
-                                            
-                [(let-values . _) (let-abstraction exp #`let-values)]
-                
-                [(letrec-values . _) (let-abstraction exp #`letrec-values)]
-                
-                
-                ;                          $   
-                ;                  @       @   
-                ;   :@@+@  -@@$   @@@@@    @   
-                ;   @$ -@  $  -$   @       @   
-                ;   :@@$-  @@@@@   @       @   
-                ;      *@  $       @           
-                ;   @  :@  +:      @: :$       
-                ;   $+@@:   $@@+   :@@$-   $   
-                
-                
-                [(set! var val)
-                 (match-let*
-                     ([(vector annotated-val val-free-varrefs)
-                       (set!-rhs-recur (syntax val) 
-                                       (syntax-case (syntax var) (#%top)
-                                         [(#%top . real-var) (syntax-e (syntax real-var))]
-                                         [else (syntax var)]))]
-                      [free-varrefs (varref-set-union (list val-free-varrefs (list #`var)))]
-                      [annotated-set!
-                       (return-value-wrap
-                        (quasisyntax/loc exp (set! var #,(normal-break/values-wrap annotated-val))))])
-                   (vector
-                    (outer-wcm-wrap (make-debug-info-normal free-varrefs) annotated-set!)
-                    free-varrefs))]
-                
-                
-                ;                         @           
-                ;    $@-@@@@  @@   $@$   @@@@@  -@@$  
-                ;   $- :@  @   @  $- -$   @     $  -$ 
-                ;   @   @  @   @  @   @   @     @@@@@ 
-                ;   @   @  @   @  @   @   @     $     
-                ;   $- :@  @: +@  $- -$   @: :$ +:    
-                ;    $@-@  :@$-@@  $@$    :@@$-  $@@+ 
-                ;       @                             
-                ;      @@@                            
-                
-                [(quote _)
-                 (normal-bundle null exp)]
-                
-                [(quote-syntax _)
-                 (normal-bundle null exp)]
-                
-                
-                ;  @@@ @@@         $@+@        @@+-$: 
-                ;   @   @         $+ -@         @+@$@ 
-                ;   $-@ @  @@@@@  @      @@@@@  @ @ @ 
-                ;   ++@+$         @             @ @ @ 
-                ;   :@@$+         $* -$         @ @ @ 
-                ;   -@$@*          $@$-        @@@@@@@
-                
-                
-                [(with-continuation-mark key mark body)
-                 ;(match-let* ([(annotated-key free-varrefs-key)
-                 ;              (non-tail-recur (syntax key))]
-                 ;             [(annotated-mark free-varrefs-mark)
-                 ;              (non-tail-recur (syntax mark))]
-                 ;             [(annotated-body dc_free-varrefs-body)
-                 ;              (result-recur (syntax body))])
-                 (error 'annotate/inner "this region of code is still under construction")
-                 
-                 ;                                       [annotated #`(let-values ([key-temp #,*unevaluated*]
-                 ;                                             [mark-temp #,*unevaluated*]
-                 ;)
-                 ]
-                
-                
-                ;                         @@      @                           @                 
-                ;                          @                          @                         
-                ;    $@$: @@:@$- @@:@$-    @    -@@     $@+@   $@$:  @@@@@  -@@     $@$  @@:@@: 
-                ;      -@  @: -$  @: -$    @      @    $+ -@     -@   @       @    $- -$  @+ :@ 
-                ;   -$@$@  @   @  @   @    @      @    @      -$@$@   @       @    @   @  @   @ 
-                ;   $*  @  @   @  @   @    @      @    @      $*  @   @       @    @   @  @   @ 
-                ;   @- *@  @: -$  @: -$    @      @    $* -$  @- *@   @: :$   @    $- -$  @   @ 
-                ;   -$$-@@ @-@$   @-@$   @@@@@  @@@@@   $@$-  -$$-@@  :@@$- @@@@@   $@$  @@@ @@@
-                ;          @      @                                                             
-                ;         @@@    @@@                                                            
-                
-                
-                ;                                  [foot-wrap? 
-                ;                                   (wcm-wrap debug-info annotated)])
-                ;                           free-bindings))]
-                
-                ; the app form's elaboration looks like this, where M0 etc. stand for expressions, and t0 etc
-                ; are temp identifiers that do not occur in the program:
-                ; (M0 ...)
-                ;
-                ; goes to
-                ;
-                ;(let ([t0 *unevaluated*]
-                ;      ...)
-                ;  (with-continuation-mark
-                ;   debug-key
-                ;   huge-value
-                ;   (set! t0 M0)
-                ;   ...
-                ;   (with-continuation-mark
-                ;    debug-key
-                ;    much-smaller-value
-                ;    (t0 ...))))
-                ; 
-                ; 'break's are not illustrated.  An optimization is possible when all expressions M0 ... are
-                ; varrefs.  In particular (where v0 ... are varrefs):
-                ; (v0 ...)
-                ;
-                ; goes to
-                ; 
-                ; (with-continuation-mark
-                ;  debug-key
-                ;  debug-value
-                ;  (v0 ...))
-                ;
-                ; in other words, no real elaboration occurs. Note that this doesn't work as-is for the
-                ; stepper, because there's nowhere to hang the breakpoint; you want to see the break
-                ; occur after all vars have been evaluated.  I suppose you could do (wcm ... (begin v0 ... (v0 ...)))
-                ; where the second set are not annotated ... but stepper runtime is not at a premium.
-                
-                ;; the call/cc-safe version of this appears to work, and it lives in the definition of let.  I should 
-                ;; transfer that knowledge to here.  -- JBC, 2006-10-11
-                
-                [(#%plain-app . terms)
-                 (match-let*
-                     ([(vector annotated-terms free-varrefs-terms)
-                       (2vals-map non-tail-recur (syntax->list (syntax terms)))]
-                      [free-varrefs (varref-set-union free-varrefs-terms)])
-                   (vector
-                    (let* ([arg-temps (build-list (length annotated-terms) get-arg-var)]
-                           [tagged-arg-temps (map (lambda (var) (stepper-syntax-property var 'stepper-binding-type 'stepper-temp))
-                                                  arg-temps)]
-                           [let-clauses #`((#,tagged-arg-temps 
-                                            (#%plain-app values #,@(map (lambda (_) *unevaluated*) tagged-arg-temps))))]
-                           [set!-list (map (lambda (arg-symbol annotated-sub-exp)
-                                             #`(set! #,arg-symbol #,annotated-sub-exp))
-                                           tagged-arg-temps annotated-terms)]
-                           [new-tail-bound (binding-set-union (list tail-bound tagged-arg-temps))]
-                           [app-debug-info (make-debug-info-app new-tail-bound tagged-arg-temps 'called)]
-                           [app-term (quasisyntax/loc exp (#%plain-app #,@tagged-arg-temps))]
-                           [debug-info (make-debug-info-app new-tail-bound
-                                                            (varref-set-union (list free-varrefs tagged-arg-temps)) ; NB using bindings as vars
-                                                            'not-yet-called)]
-                           [let-body (outer-wcm-wrap debug-info #`(begin #,@set!-list
-                                                                         #,(break-wrap
-                                                                            (wcm-wrap
-                                                                             app-debug-info
-                                                                             #`(if (#%plain-app #,annotated-proc? #,(car tagged-arg-temps))
-                                                                                   #,app-term
-                                                                                   #,(return-value-wrap app-term))))))])
-                      #`(let-values #,let-clauses #,let-body))
-                    ;)
-                    free-varrefs))]
-                
-                
-                ;      @@                             
-                ;       @          @                  
-                ;    $@:@   $@$:  @@@@@ @@  @@ @@+-$: 
-                ;   $* *@     -@   @     @   @  @+@$@ 
-                ;   @   @  -$@$@   @     @   @  @ @ @ 
-                ;   @   @  $*  @   @     @   @  @ @ @ 
-                ;   $* *@  @- *@   @: :$ @: +@  @ @ @ 
-                ;    $@:@@ -$$-@@  :@@$- :@$-@@@@@@@@@
-                
-                
-                [(#%top . var-stx) (varref-abstraction #`var-stx)]
-                
-                [var-stx
-                 (identifier? #`var-stx)
-                 (varref-abstraction #`var-stx)]
-                
-                [else 
-                 (error 'annotate "unexpected syntax for expression: ~v" (syntax->datum exp))]))))])))
-  
-  ;; annotate/top-level : syntax-> syntax
-  ;; expansion of teaching level language programs produces two kinds of 
-  ;; expressions: modules containing all of the code in the def'ns window, and
-  ;; require statements that invoke those modules.  In the first case, we must annotate
-  ;; the expressions inside the top-level module, and in the second, we should just
-  ;; leave it alone.
-  
-  (define/contract annotate/top-level
-    (syntax? . -> . syntax?)
-    (lambda (exp)
-      (syntax-case exp (module #%plain-module-begin let-values dynamic-wind #%plain-lambda #%plain-app define-values)
-        [(module name lang
-           (#%plain-module-begin . bodies))
-         #`(module name lang (#%plain-module-begin #,@(map annotate/module-top-level (syntax->list #`bodies))))]
-        ; the 'require' form is used for the test harness
-        [(require module-name) exp]
-        ; the 'dynamic-require' form is used by the actual expander 
-        [(let-values ([(done-already?) . rest1])
-           (#%plain-app dynamic-wind
-                        void
-                        (#%plain-lambda () . rest2)
-                        (#%plain-lambda () . rest3)))
-         exp]
-        ; STC: for lazy, handle defines
-        [(define-values (ids ...) bodies) (annotate/module-top-level exp)]
-        [else (annotate/module-top-level exp)]
-        #;[else
-         (error `annotate/top-level "unexpected top-level expression: ~a\n"
-                (syntax->datum exp))
-         #;(annotate/module-top-level exp)])))
-  
-  #;(define/contract annotate/top-level/acl2
-    (syntax? . -> . syntax?)
-    (lambda (exp)
-      (syntax-case exp (begin define-values #%plain-app)
-        [(begin contract-thingy 
-                (begin body (begin)))
-         #`(begin contract-thingy (begin #,(annotate/module-top-level #`body) (begin)))]
-        
-        #;(define-values
-            (lifted)
-            (begin
-              (#%app
-               contract/proc
-               provide/contract-contract-id-zp
-               zp
-               provide/contract-pos-module-source-zp
-               (#%app module-source-as-symbol (quote-syntax here))
-               (quote-syntax zp))))
-        #;(if (#%app null? (#%app lifted (#%datum . 3))) 'y 'x)
-        
-        
-        [else (annotate/module-top-level exp)]
-        
-        #;[else (begin
-                  (eprintf "~v\n" (syntax->datum exp))
-                  (error `annotate/top-level "unexpected top-level expression: ~a\n" (syntax->datum exp)))])))
-  
-  
-  
-  ;; annotate expressions at the top level within a module.
-  (define (annotate/module-top-level exp)
-    (cond [(stepper-syntax-property exp 'stepper-replace)]
-          [(to-be-skipped? exp) exp]
-          ;; for kathy's test engine:
-          [(syntax-property exp 'test-call) exp]
-          [(stepper-syntax-property exp 'stepper-black-box-expr)
-           #`(begin #,exp
-                    (#%plain-app #,(make-opaque-exp-break exp)))]
-          [(stepper-syntax-property exp 'stepper-skipto)
-           (skipto/auto exp 'rebuild annotate/module-top-level)] 
-          [else 
-           (syntax-case exp (#%app #%plain-app call-with-values define-values define-syntaxes 
-                                   #%require #%provide #%declare begin #%plain-lambda lambda
-                                   module module*)
-             [(define-values (new-var ...) e)
-              (let* ([name-list (syntax->list #`(new-var ...))]
-                     [defined-name (if (and (pair? name-list) (null? (cdr name-list)))
-                                       (car name-list)
-                                       #f)])
-                (stepper-recertify
-                 #`(begin
-                     (define-values (new-var ...)
-                       #,(top-level-annotate/inner (top-level-rewrite #`e) exp defined-name))
-                     ;; this next expression should deliver the newly computed values to an
-                     ;; exp-finished-break
-                     (#%plain-app #,exp-finished-break
-                                  (#%plain-app list 
-                                               (#%plain-app list
-                                                            #,(lambda () exp)
-                                                            #f
-                                                            (#%plain-lambda ()
-                                                                            (#%plain-app
-                                                                             list
-                                                                             new-var ...))))))
-                 #'e))]
-             [(define-syntaxes (new-vars ...) e)
-              exp]
-             [(#%require specs ...)
-              ;; this should only include requires inserted automatically, as others should 
-              ;; get caught above in the "stepper-black-box-expr" check:
-              exp]
-             [(#%provide specs ...)
-              exp]
-             [(#%declare specs ...)
-              exp]
-             [(module . _) ; submodule
-              exp]
-             [(module* . _) ; submodule
-              exp]
-             [(begin .  bodies)
-              #`(begin #,@(map annotate/module-top-level (syntax->list #`bodies)))]
-             ; STC: for lazy racket, need this case to catch and hide toplevel-forcer
-             ; stepper tests will expand to this case, with call-with-values
-             [(#%plain-app 
-               call-with-values 
-               (#%plain-lambda 
-                ()
-                (#%plain-app (#%plain-app toplevel-forcer) operand)) 
-               print-values)
-              (stepper-recertify
-               #`(#%plain-app
-                  call-with-values
-                  (#%plain-lambda 
-                   () 
-                   (#%plain-app 
-                    (#%plain-app toplevel-forcer)
-                    #,(top-level-annotate/inner (top-level-rewrite #'operand) exp #f)))
-                  (#%plain-lambda 
-                   vals
-                   (begin
-                     (#,exp-finished-break
-                      (#%plain-app 
-                       list 
-                       (#%plain-app 
-                        list 
-                        #,(lambda () exp) #f (#%plain-lambda () vals))))
-                     (#%plain-app 
-                      call-with-values 
-                      (#%plain-lambda () vals) values))))
-               exp)]
-             [(#%plain-app call-with-values (#%plain-lambda () body) print-values)
-              ;; re-extract the plain-lambda term, to use in recertification:
-              (let ([lam-for-cert (syntax-case exp (#%plain-app call-with-values)
-                                    [(#%plain-app call-with-values lam print-values) #'lam]
-                                    [other (error 'annotate/module-top-level "unreachable 2010-01-23 22:14")])])
-                ;; this recertify looks to be superfluous now that it has the "transparent" certificate-mode tag,
-                ;; but it can't hurt, and I'd rather just leave it in here.
-                (stepper-recertify 
-                 #`(#%plain-app
-                    call-with-values 
-                    #,(stepper-recertify
-                       #`(#%plain-lambda () #,(top-level-annotate/inner (top-level-rewrite #`body) exp #f))
-                       lam-for-cert)
-                    (#%plain-lambda vals
-                                    (begin
-                                      (#,exp-finished-break (#%plain-app list (#%plain-app list #,(lambda () exp) #f (#%plain-lambda () vals))))
-                                      (#%plain-app
-                                       call-with-values (#%plain-lambda () vals)
-                                       print-values))))
-                 exp))]
-             ; STC: for lazy racket, need this case to catch and hide toplevel-forcer
-             ; This is similar to app case above, but with toplevel-forcer
-             ; normal lazy stepper operation expands to this case
-             [(#%plain-app (#%plain-app toplevel-forcer) operand)
-              (stepper-recertify
-               #`(#%plain-app
-                  call-with-values
-                  (#%plain-lambda 
-                   () 
-                   (#%plain-app 
-                    (#%plain-app toplevel-forcer)
-                    #,(top-level-annotate/inner (top-level-rewrite #'operand) exp #f)))
-                  (#%plain-lambda 
-                   vals
-                   (begin
-                     (#,exp-finished-break
-                      (#%plain-app 
-                       list 
-                       (#%plain-app 
-                        list 
-                        #,(lambda () exp) #f (#%plain-lambda () vals))))
-                     (#%plain-app 
-                      call-with-values 
-                      (#%plain-lambda () vals) values))))
-               exp)]
-             [any
-              (stepper-syntax-property exp 'stepper-test-suite-hint)
-              (top-level-annotate/inner (top-level-rewrite exp) exp #f)]
-             [else
-              (top-level-annotate/inner (top-level-rewrite exp) exp #f)
-              ;; the following check can't be permitted in the presence of things like test-suite cases
-              ;; which produce arbitrary expressions at the top level.
-              #;(error `annotate/module-top-level "unexpected module-top-level expression to annotate: ~a\n" (syntax->datum exp))])]))
-  
-  
-  ; body of local
-  (annotate/top-level main-exp))
-
-;
-;  ;                         ;                      ;                                ;            
-;  ;                         ;                      ;                                   ;         
-; ;;;;  ;;;   ; ;;;          ;   ;;;  ;   ;   ;;;   ;      ; ;;  ;;;  ;   ;   ; ; ;; ; ;;;;  ;;;  
-;  ;   ;   ;  ;;   ;         ;  ;   ; ;   ;  ;   ;  ;      ;;   ;   ; ;   ;   ; ;;   ;  ;   ;   ; 
-;  ;   ;   ;  ;    ;         ;  ;   ;  ; ;   ;   ;  ;      ;    ;   ;  ; ; ; ;  ;    ;  ;   ;   ; 
-;  ;   ;   ;  ;    ;  ;;;;;  ;  ;;;;;  ; ;   ;;;;;  ;      ;    ;;;;;  ; ; ; ;  ;    ;  ;   ;;;;; 
-;  ;   ;   ;  ;    ;         ;  ;      ; ;   ;      ;      ;    ;      ; ; ; ;  ;    ;  ;   ;     
-;  ;   ;   ;  ;;   ;         ;  ;      ;;    ;      ;      ;    ;      ; ; ; ;  ;    ;  ;   ;     
-;   ;;  ;;;   ; ;;;          ;   ;;;;   ;     ;;;;  ;      ;     ;;;;   ;   ;   ;    ;   ;;  ;;;; 
-;             ;                                                                                   
-;             ;                                                                                   
-;                                                                                                 
-
-
-; top-level-rewrite : (SYNTAX-OBJECT -> SYNTAX-OBJECT)
-
-; top-level-rewrite performs several tasks; it labels variables with their types 
-; (let-bound, lambda-bound, or non-lexical), it flags if's which could come from 
-; cond's, it labels the begins in conds with 'stepper-skip annotations
-
-; label-var-types returns a syntax object which is identical to the 
-; original except that the variable references are labeled with the 
-; stepper-syntax-property 'stepper-binding-type, which is set to either 
-; let-bound, lambda-bound, or non-lexical. (It can also be 'macro-bound, set
-; earlier during macro expansion.)
-
-(define (top-level-rewrite stx)
-  (let loop ([stx stx]
-             [let-bound-bindings null]
-             [cond-test (lx #f)])
-    (define (recur-regular stx)
-      (loop stx let-bound-bindings (lx #f)))
-    
-    (define (recur-with-bindings exp vars)
-      (loop exp (append vars let-bound-bindings) (lx #f)))
-    
-    (define (recur-in-cond stx new-cond-test)
-      (loop stx let-bound-bindings new-cond-test))
-    
-    (define (do-let/rec stx rec?)
-      (with-syntax ([(label ((vars rhs) ...) . bodies) stx])
-        (let* ([vars-list 
-                (apply append
-                       (map syntax->list
-                            (syntax->list (syntax (vars ...)))))]
-               [labelled-vars-list 
-                (map (lambda (var-list)
-                       (map (lambda (exp)
-                              (recur-with-bindings exp vars-list))
-                            (syntax->list var-list)))
-                     (syntax->list (syntax (vars ...))))]
-               [rhs-list 
-                (if rec?
-                    (map (lambda (exp)
-                           (recur-with-bindings exp vars-list))
-                         (syntax->list #'(rhs ...)))
-                    (map recur-regular (syntax->list #'(rhs ...))))]
-               [new-bodies 
-                (map (lambda (exp)
-                       (recur-with-bindings exp vars-list))
-                     (syntax->list #'bodies))]
-               [new-bindings (map list labelled-vars-list rhs-list)])
-          (datum->syntax
-           stx
-           `(,#'label ,new-bindings ,@new-bodies) stx stx))))
-    
-    
-    ; evaluated at runtime, using 3D code:
-    (define (put-into-xml-table val)
-      (hash-set! finished-xml-box-table val #t)
-      val)
-    
-    (cond 
-      [(or (to-be-skipped? stx)
-           (stepper-syntax-property stx 'stepper-black-box-expr))
-       stx]
-      [else
-       (define rewritten
-         (let ([stx (syntax-disarm stx saved-code-inspector)])
-           (kernel:kernel-syntax-case 
-          stx
-          #f
-          ; cond :
-          [(if test (let-values () then) else-stx)
-           (let ([origin (syntax-property stx 'origin)]
-                 [rebuild-if
-                  (lambda (new-cond-test)
-                    (let* ([new-then (recur-regular (syntax then))]
-                           [rebuilt 
-                            (stepper-syntax-property
-                             (rebuild-stx 
-                              `(if ,(recur-regular (syntax test))
-                                   ,new-then
-                                   ,(recur-in-cond (syntax else-stx)
-                                                   new-cond-test))
-                                          stx)
-                             'stepper-hint
-                             'comes-from-cond)])
-                      ; move the stepper-else mark to the if, if it's present:
-                      (if (stepper-syntax-property (syntax test) 'stepper-else)
-                          (stepper-syntax-property rebuilt 'stepper-else #t)
-                          rebuilt)))])
-             (cond [(cond-test stx) ; continuing an existing 'cond'
-                    (rebuild-if cond-test)]
-                   [(and origin (pair? origin) 
-                         (eq? (syntax-e (car origin)) 'cond)) ; starting a new 'cond'
-                    (rebuild-if (lambda (test-stx) 
-                                  (and (eq? (syntax-source stx)
-                                            (syntax-source test-stx))
-                                       (eq? (syntax-position stx)
-                                            (syntax-position test-stx)))))]
-                   [else ; not from a 'cond' at all.
-                    (rebuild-stx `(if ,@(map recur-regular (list (syntax test) (syntax (begin then)) (syntax else-stx)))) stx)]))]
-          [(begin body) ; else clauses of conds; ALWAYS AN ERROR CALL
-           (cond-test stx)
-           (stepper-syntax-property stx 'stepper-skip-completely #t)]
-          
-          ; wrapper on a local.  This is necessary because 
-          ; teach.rkt expands local into a trivial let wrapping a bunch of
-          ; internal defines, and therefore the letrec-values on 
-          ; which I want to hang the 'stepper-hint doesn't yet
-          ; exist.  So we patch it up after expansion.  And we 
-          ; discard the outer 'let' at the same time.
-          [(let-values () expansion-of-local)
-           (eq? (stepper-syntax-property stx 'stepper-hint) 'comes-from-local)
-           (syntax-case #`expansion-of-local (letrec-values)
-             [(letrec-values (bogus-clause clause ...) . bodies)
-              (recur-regular
-               (stepper-syntax-property #`(letrec-values (clause ...) . bodies) 'stepper-hint 'comes-from-local))]
-             [else (error 'top-level-rewrite "expected a letrec-values inside a local, given: ~e" 
-                          (syntax->datum #`expansion-of-local))])]
-          
-          ; let/letrec :
-          [(let-values x ...) (do-let/rec stx #f)]
-          [(letrec-values x ...) (do-let/rec stx #t)]
-          
-          ; varref :
-          [var
-           (identifier? (syntax var))
-           (stepper-syntax-property 
-            (syntax var) 
-            'stepper-binding-type
-            (if (eq? (identifier-binding (syntax var)) 'lexical)
-                (cond [(ormap (lx (bound-identifier=? _ (syntax var)))
-                              let-bound-bindings)
-                       'let-bound]
-                      [else
-                       'lambda-bound])
-                'non-lexical))]
-          
-          [else
-           (let ([content (syntax-e stx)])
-             (if (pair? content)
-                 (rebuild-stx (syntax-pair-map content recur-regular) stx)
-                 stx))])))
-       
-       (if (eq? (stepper-syntax-property stx 'stepper-xml-hint) 'from-xml-box)
-           (stepper-syntax-property #`(#%plain-app 
-                                       #,put-into-xml-table
-                                       #,rewritten) 
-                                    'stepper-skipto
-                                    (list syntax-e cdr car))
-           (stepper-recertify rewritten stx))])))
-
-
-
-;; recertify the output of the stepper, to allow it to run:
-(define (stepper-recertify new-stx old-stx)
-  (syntax-rearm new-stx old-stx #t))
-
-;; does this stx have the 'stepper-skip-completely property?
-(define (to-be-skipped? stx)
-  (stepper-syntax-property stx 'stepper-skip-completely))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/beginner-defined.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/beginner-defined.rkt
deleted file mode 100644
index 71360ff72e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/beginner-defined.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-(module beginner-defined mzscheme
-  (provide must-reduce)
-  
-  (define must-reduce
-    `(e pi)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/display-break-stuff.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/display-break-stuff.rkt
deleted file mode 100644
index 3eaae39bbb..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/display-break-stuff.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang racket/base
-
-(require racket/gui racket/class "marks.rkt")
-
-(provide display-break-stuff)
-
-(define f
-  (new frame%
-       [label (format "Breakpoints Inspector")]
-       [width 400] [height 500]))
-(define sel (new choice% [label "Breakpoint#"] [choices '()] [parent f]
-                 [callback (lambda (c e) (show-sel))] [stretchable-width #t]))
-(define ec  (new editor-canvas% [parent f]))
-(define t   (new text%))
-(send ec set-editor t)
-
-(define selections '())
-(define (add-sel num mset bkind retvals)
-  (set! selections (cons (list num mset bkind retvals) selections))
-  (let ([num (number->string num)])
-    (send sel append num)
-    (send sel set-string-selection num)
-    (show-sel)))
-
-(define (show-sel)
-  (let* ([num (string->number (send sel get-string-selection))]
-         [bpt (assq num selections)])
-    (send* t (lock #f) (erase))
-    (if (not bpt)
-        (send* t (insert (format "Breakpoint #~a not found!\n" num)))
-        (let-values ([(mset bkind retvals) (apply values (cdr bpt))])
-          (send* t
-            (insert (format "Breakpoint #~a:\n" num))
-            (insert (format "  break-kind: ~v\n" bkind))
-            (insert "marks:\n"))
-          (if mset
-              (for-each
-               (lambda (mark)
-                 (let* ([em (expose-mark mark)]
-                        [source (car em)]
-                        [label (cadr em)]
-                        [binding-set (caddr em)])
-                   (send* t
-                     (insert (format "  label: ~v\n" label))
-                     ;; we really want one of those nice collapsible
-                     ;; syntax-viewer thingies here:
-                     (insert (format "  source : ~v\n"
-                                     (syntax->datum source)))
-                     ;; here too, though this isn't a syntax object.
-                     (insert (format "  bindings: ~v\n" binding-set)))))
-               (extract-mark-list mset))
-              (send t insert "  nothing!\n"))
-          (send t insert "returned-value-list:\n")
-          (if retvals
-              (for-each (lambda (v) (send t insert (format "  ~v\n" v)))
-                        retvals)
-              (send t insert "  nothing!\n"))))
-    (send* t (lock #t))))
-
-;; display-break-stuff : show the information associated with a breakpoint.
-;; Useful for people building steppers for new languages
-(define (display-break-stuff break-number mark-set break-kind
-                             returned-value-list)
-  (add-sel break-number mark-set break-kind returned-value-list)
-  (send f show #t))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/find-tag.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/find-tag.rkt
deleted file mode 100644
index e3127de948..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/find-tag.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/contract)
-
-(provide/contract 
- [find-tag 
-  (-> (is-a?/c text%)
-      exact-nonnegative-integer?
-      (or/c #f string?))])
-
-;; finds the name of the XML tag just before `start' in `text'.
-;; returns the tag name, with no trailing space of > or anything like that.
-(define (find-tag text start)
-  ;; loop iterates backwards, searching for #\<
-  ;; when it finds it, it gets the string starting
-  ;; there, forwards to last-space (if there was a space)
-  ;; or start-1.
-  ;; If there is a #\/ or a #\> just after the #\<, return #f
-  ;; (in that case, they are typing a close tag or closing an empty tag)
-  ;; this technique gleaned from the spec at:
-  ;;  http://www.w3.org/TR/2000/REC-xml-20001006
-  ;; If there are two hyphens after the #\<, then assume this is a
-  ;; comment and just give up.
-  (let loop ([pos (- start 2)]
-             [last-space #f])
-    (cond
-      [(< pos 0) #f]
-      [else
-       (let ([char (send text get-character pos)])
-         (case char
-           [(#\>) #f]
-           [(#\/) (if last-space
-                      (loop (- pos 1) last-space)
-                      #f)]
-           [(#\<) 
-            (cond
-              [(or (char=? (send text get-character (+ pos 1)) #\/)
-                   (char=? (send text get-character (+ pos 1)) #\>))
-               ;;technique gleaned, as above
-               #f]
-              [(and (< (+ pos 3) (send text last-position))
-                    (char=? (send text get-character (+ pos 1)) #\!)
-                    (char=? (send text get-character (+ pos 2)) #\-)
-                    (char=? (send text get-character (+ pos 3)) #\-))
-               ;; comment, just give up
-               #f]
-              [else
-               (send text get-text (+ pos 1) (or last-space (- start 1)))])]
-           [(#\space #\return #\newline #\tab)
-            (loop (- pos 1) pos)]
-           [else (loop (- pos 1) last-space)]))])))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/lifting.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/lifting.rkt
deleted file mode 100644
index 138d8f8c38..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/lifting.rkt
+++ /dev/null
@@ -1,326 +0,0 @@
-#lang racket/base
-
-(require (prefix-in kernel: syntax/kerncase)
-         racket/match
-         racket/contract
-         "shared.rkt"
-         "syntax-property.rkt"
-         (for-syntax racket/base))
-
-(define-struct context-record (stx index kind))
-  
-  ; context-records are used to represent syntax context frames. That is,
-  ; a list of context records represents a path through a syntax tree
-  ; (to the highlight).
-
-  (define-struct try-record (index try-fn expr))
-  
-  ; try-records are 
-  (provide/contract [lift (syntax? ; syntax to perform lifting in
-                           boolean? ; lift-at-highlight?
-                           . -> .
-                           (listof syntax?))]) ; result
-                          
-  
-  (define (lift stx lift-in-highlight?)
-    (match-let* ([(vector context-records highlight) (find-highlight stx)])
-      (lift-local-defs context-records highlight lift-in-highlight?)))
-  
-  ; [find-highlight (-> syntax? (listof context-record?))]
-  ; Accepts a syntax expression where one subexpression is highlighted: that is, has the 
-  ;  'stepper-highlight syntax property.  Returns a list of context records representing the 
-  ;  path through the syntax tree down to the highlight.
-
-  (define (find-highlight stx)
-    (let/ec success-escape
-      (let ()
-        (define (make-try-all-subexprs stx kind context-so-far)
-          (lambda (index-mangler list-of-subtries)
-            (let loop ([index 0] [remaining list-of-subtries])
-              (unless (null? remaining)
-                (let* ([try (car remaining)]
-                       [corrected-index (index-mangler index)])
-                  ((car try) (cadr try) (cons (make-context-record stx corrected-index kind) context-so-far))
-                  (loop (+ index 1) (cdr remaining)))))))
-        
-        (define try->offset-try
-          (lambda (try)
-            (lambda (offset subtries)
-              (try (lambda (index) (list (+ offset index))) subtries))))
-        
-        ;; WHOA: this code uses the template for fully-expanded syntax; what the code
-        ;; actually gets is reconstructed code.  This is a problem, because you can't
-        ;; distinguish a top-level begin from one that's the result of some evaluation. 
-        ;; I think for the moment that it will solve our problem simply to remove the
-        ;; special case for begin at the top level.  JBC, 2006-10-09
-        
-        ;; ... aaaand, yep, there's a bug.  The input is not fully-expanded syntax, and 
-        ;; therefore _can_ include a two-branched 'if' (because the reconstructor produces it.)
-        ;; 
-        
-        (define (top-level-expr-iterator stx context-so-far)
-          (let ([try (try->offset-try (make-try-all-subexprs stx 'top-level context-so-far))])
-            (kernel:kernel-syntax-case 
-             stx #f
-             [(module identifier name (#%plain-module-begin . module-level-exprs))
-              (try 3 (map (lambda (expr) `(,module-level-expr-iterator ,expr))
-                          (syntax->list #'module-level-exprs)))]
-             [else-stx
-              (general-top-level-expr-iterator stx context-so-far)])))
-        
-           
-           
-        (define (module-level-expr-iterator stx context-so-far)
-          (kernel:kernel-syntax-case 
-           stx #f
-           [(#%provide . provide-specs)
-            (void)]
-           [(#%declare . declare-specs)
-            (void)]
-           [else-stx
-            (general-top-level-expr-iterator stx context-so-far)]))
-        
-        (define (general-top-level-expr-iterator stx context-so-far)
-          (let ([try (try->offset-try (make-try-all-subexprs stx 'general-top-level context-so-far))])
-            (kernel:kernel-syntax-case 
-             stx #f
-             [(define-values (var ...) expr)
-              (try 2 `((,expr-iterator ,#'expr)))]
-             [(define-syntaxes (var ...) expr)
-              (try 2 `((,expr-iterator ,#'expr)))]
-             ;; this code is buggy, but I believe it doesn't belong here at all 
-             ;; per above discussion.  JBC, 2006-10-09
-             #;[(begin . top-level-exprs)
-                (try 1 (map (lambda (expr) `(,top-level-expr-iterator ,expr))
-                            (syntax->list #'exprs)))]
-             [(#%require . require-specs)
-              (void)]
-             [else
-              (expr-iterator stx context-so-far)])))
-        
-           
-        (define (expr-iterator stx context-so-far)
-          (when (stepper-syntax-property stx 'stepper-highlight)
-            (success-escape (vector context-so-far stx)))
-          (let* ([try (make-try-all-subexprs stx 'expr context-so-far)]
-                 [try-exprs (lambda (index-mangler exprs) (try index-mangler (map (lambda (expr) (list expr-iterator expr)) 
-                                                                                  (syntax->list exprs))))]
-                 [try-exprs-offset (try->offset-try try-exprs)] 
-                 [let-values-abstraction
-                  (lambda (stx)
-                    (kernel:kernel-syntax-case stx #f
-                                               [(kwd (((variable ...) rhs) ...) . bodies)
-                                                (begin
-                                                  (try-exprs (lambda (index) (list 1 index 1)) #'(rhs ...))
-                                                  (try-exprs-offset 2 #'bodies))]
-                                               [else
-                                                (error 'expr-syntax-object-iterator 
-                                                       "unexpected let(rec) expression: ~a"
-                                                       (syntax->datum stx))]))]) 
-            (kernel:kernel-syntax-case 
-             stx #f
-             [var-stx
-              (identifier? (syntax var-stx))
-              (void)]
-             [(#%plain-lambda vars . bodies)
-              (try-exprs-offset 2 #'bodies)]
-             [(case-lambda (vars . bodies) ...)
-              (let loop ([count 1] [clauses (syntax->list #'(bodies ...))])
-                (unless (null? clauses)
-                  (try-exprs (lambda (index) (list count (+ index 1))) (cdar clauses))
-                  (loop (+ count 1) (cdr clauses))))]
-             [(if test then else)
-              (try-exprs-offset 1 #'(test then else))]
-             [(if test then)
-              (try-exprs-offset 1 #'(test then))]
-             [(begin . bodies)
-              (try-exprs-offset 1 #'bodies)]
-             [(begin0 . bodies)
-              (try-exprs-offset 1 #'bodies)]
-             [(let-values . _)
-              (let-values-abstraction stx)]
-             [(letrec-values . _)
-              (let-values-abstraction stx)]
-             [(set! var val)
-              (try-exprs-offset 2 #'(val))]
-             [(quote _)
-              (void)]
-             [(quote-syntax _)
-              (void)]
-             [(with-continuation-mark key mark body)
-              (try-exprs-offset 1 #'(key mark body))]
-             [(#%plain-app . exprs)
-              (try-exprs-offset 1 #'exprs)]
-             [(#%top . var)
-              (void)]
-             [else
-              (error 'expr-iterator "unknown expr: ~a" 
-                     (syntax->datum stx))])))
-        
-        ;; this should exit before reaching the error:
-        (top-level-expr-iterator stx null)
-        (error 'find-highlight "couldn't find highlight-placeholder in expression: ~v" (syntax->datum stx)))))
-
-  ; TESTING:
-  
-  (define (datum-ize-context-record cr)
-     (list (syntax->datum (context-record-stx cr))
-                          (context-record-index cr)
-                          (context-record-kind cr)))
-  
-  (module+ test
-    (require rackunit)
-    
-    ; TEST OF FIND-HIGHLIGHT
-    
-    (let ()
-      (define test-datum 
-        (with-syntax ([hilite-a 
-                       (stepper-syntax-property
-                        #'a
-                        'stepper-highlight
-                        #t)])
-          (expand #`(define (f x) (letrec ([a (lambda (x) (b (- x 1)))]
-                                           [b (lambda (x) (hilite-a x))])
-                                    (a x))))))
-      
-      (define expected 
-        (list (list `(#%app a x) '(1) 'expr)
-              (list `(lambda (x) (#%app a x)) '(2) 'expr)
-              (list `(letrec-values ([(a) (lambda (x) (#%app b (#%app - x (quote 1))))] [(b) (lambda (x) (#%app a x))]) (#%app a x)) '(1 1 1) 'expr)
-              (list `(lambda (x) (letrec-values ([(a) (lambda (x) (#%app b (#%app - x (quote 1))))] [(b) (lambda (x) (#%app a x))]) (#%app a x))) '(2) 'expr)                 
-              (list `(define-values (f) (lambda (x) (letrec-values ([(a) (lambda (x) (#%app b (#%app - x (quote 1))))] [(b) (lambda (x) (#%app a x))]) (#%app a x)))) '(2)
-                    'general-top-level)))
-      
-      (match-define (vector context-records highlight) 
-        (find-highlight test-datum))
-      
-      (check-equal? (map datum-ize-context-record context-records)
-                    expected))
-    
-    (let ()
-      (define test-stx (stepper-syntax-property
-                        #'foo
-                        'stepper-highlight
-                        #t))
-      
-      (match-define (vector context-records dc) (find-highlight test-stx))
-      
-      (check-equal? context-records null)))
-  
-  ; substitute-in-syntax takes a syntax expression (which must be a proper syntax list) and a path
-  ; (represented by a list of numbers) and a syntax-expression to insert.  If the path is null, the
-  ; 'to-insert' expression is returned.  Otherwise, the nth element of the syntax-list is replaced
-  ; by the recursive call with the nth element, the rest of the path, and the to-insert, where n is
-  ; the first number in the list.
-
-  (define (substitute-in-syntax src path to-insert)
-    (if (null? path)
-        to-insert
-        (let* ([opened (syntax->list src)]
-               [n (car path)])
-          (when (>= n (length opened))
-            (error 'substitute-in-syntax "given an n (~v) which is larger than the length of the source sytax ~v" n (syntax->datum src)))
-          (datum->syntax
-           src
-           (let loop ([n n] [left opened])
-            (if (= n 0) 
-                (cons (substitute-in-syntax (car left) (cdr path) to-insert)
-                      (cdr left))
-                (cons (car left) 
-                      (loop (- n 1) (cdr left)))))
-           src
-           src))))
-  
-  (define (n-times n fn arg)
-    (if (= n 0)
-        arg
-        (fn (n-times (- n 1) fn arg))))
-  
-  (module+ test
-    (let ()
-      (define expected '(let-values ([(a) (lambda (x) 'bar)]) (a)))
-      (define actual (syntax->datum (substitute-in-syntax #'(let-values ([(a) (lambda (x) 'foo)]) (a)) '(1 0 1 2 1) #'bar)))
-      
-      (check-equal? actual expected)))
-  
-  
-  ; lift-local-defs takes a list of contexts and an instruction and works its way out, reconstructing the expression.
-  ; the main action of lift-local-defs is on let-values and letrec-values, where (after performing the substitution)
-  ; the binding clauses are lifted into top-level defs.
-  ; [lift-local-defs (->* ((listof context-record?) syntax?)
-  ;                       ((listof syntax?) (listof syntax?)))]
-  
-  (define (lift-local-defs ctx-list highlighted lift-in-highlighted?)
-    (let-values ([(highlighted-defs highlighted-body) (if lift-in-highlighted?
-                                                          (lift-helper highlighted #f null)
-                                                          (values null highlighted))])
-      (let loop ([ctx-list ctx-list]
-                 [so-far-defs (map (lambda (x) (stepper-syntax-property x 'stepper-highlight #t)) 
-                                   highlighted-defs)]
-                 [body (stepper-syntax-property highlighted-body 'stepper-highlight #t)])
-        (if (null? ctx-list)
-            (append so-far-defs (list body))
-            (let*-values ([(ctx) (car ctx-list)]
-                          [(index) (context-record-index ctx)]
-                          [(next-defs next-body) 
-                           (lift-helper (substitute-in-syntax (context-record-stx ctx) index body)
-                                        index
-                                        so-far-defs)])
-              (loop (cdr ctx-list) next-defs next-body))))))
-  
-  ; lift-helper takes a syntax object and a split path and a list of syntax objects and breaks it up
-  ; iff it's a let/rec, wrapping those before the split and those after the split around the list of syntax
-  ; objects
-  ;  (->* (syntax? (union false? (listof number?)) (listof syntax?)) ((listof syntax?) syntax?))
-  (define (lift-helper stx path so-far-defs)
-    (let* ([lift
-            (lambda ()
-              (kernel:kernel-syntax-case stx #f
-                [(tag ([(var ...) rhs] ...) body ...)
-                 (let* ([defns (syntax->list #'((define-values (var ...) rhs) ...))]
-                        [bodies-list (syntax->list #'(body ...))]
-                        [body (if (= (length bodies-list) 1) ; as far as I can tell, this source info is comprehensively lost.
-                                  (car bodies-list)
-                                  #'(values body ...))])
-                   (cond [(or (not path) (and (= (length path) 1)
-                                              (> (car path) 1)))
-                          (values (append defns so-far-defs) body)]
-                         [(match path [`(1 ,n 1) n]) =>
-                          (lambda (n)
-                            (values (append (sublist 0 n defns) so-far-defs (sublist n (length defns) defns))
-                                    body))]))]
-                [else (error 'lift-helper "let or letrec does not have expected shape: ~v\n" (syntax->datum stx))]))])
-    (kernel:kernel-syntax-case stx #f
-      [(let-values . dc)
-       (not (eq? (stepper-syntax-property stx 'stepper-hint) 'comes-from-or))
-       (lift)]
-      [(letrec-values . dc)
-       (lift)]
-      [else (values so-far-defs stx)])))
-  
-  (module+ test
-    (define actual-stxs
-      (lift-local-defs
-       (list (make-context-record #'(dc 14) '(0) 'expr)
-             (make-context-record #'(letrec-values ([(a) 3] [(b) dc] [(c) 5]) (+ 3 4)) '(1 1 1) 'expr)
-             (make-context-record #'(f dc) '(1) 'expr))
-       #'(let-values ([(a) 4] [(b) 9] [(c) 12]) (p q))
-       #t))
-    
-    
-    (define actual-sexps (map syntax->hilite-datum actual-stxs))
-    
-    (define expected-sexps
-      (list '(define-values (a) 3)
-            '(hilite (define-values (a) 4))
-            '(hilite (define-values (b) 9))
-            '(hilite (define-values (c) 12))
-            '(define-values (b) ((hilite (p q)) 14))
-            '(define-values (c) 5)
-            '(f (+ 3 4))))
-    
-    (check-equal? actual-sexps expected-sexps)
-    )
-  
- 
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/macro-unwind.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/macro-unwind.rkt
deleted file mode 100644
index 8616b48548..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/macro-unwind.rkt
+++ /dev/null
@@ -1,363 +0,0 @@
-#lang racket/base
-
-(require (only-in syntax/kerncase kernel-syntax-case)
-         racket/list
-         racket/contract
-         "model-settings.rkt"
-         "shared.rkt"
-         "syntax-property.rkt")
-
-(provide/contract [unwind (syntax? render-settings? . -> . syntax?)])
-;
-; ;;; ;;    ;;;    ;;;  ; ;;  ;;;       ;   ;  ; ;;  ;   ;   ; ;  ; ;;    ;;; ;  ;  ; ;;    ;; ;
-;;  ;;  ;  ;   ;  ;     ;;   ;   ;      ;   ;  ;;  ; ;   ;   ; ;  ;;  ;  ;   ;;  ;  ;;  ;  ;  ;;
-;   ;   ;      ;  ;     ;    ;   ;      ;   ;  ;   ;  ; ; ; ;  ;  ;   ;  ;    ;  ;  ;   ;  ;   ;
-;   ;   ;   ;;;;  ;     ;    ;   ;      ;   ;  ;   ;  ; ; ; ;  ;  ;   ;  ;    ;  ;  ;   ;  ;   ;
-;   ;   ;  ;   ;  ;     ;    ;   ;      ;   ;  ;   ;  ; ; ; ;  ;  ;   ;  ;    ;  ;  ;   ;  ;   ;
-;   ;   ;  ;   ;  ;     ;    ;   ;      ;  ;;  ;   ;  ; ; ; ;  ;  ;   ;  ;   ;;  ;  ;   ;  ;  ;;
-;   ;   ;   ;;;;;  ;;;  ;     ;;;        ;; ;  ;   ;   ;   ;   ;  ;   ;   ;;; ;  ;  ;   ;   ;; ;
-;
-
-
-; unwind takes a syntax object with a single highlight,
-; and returns a list of syntax objects
-
-
-(define (improper-member elt improper-list)
-  (cond [(pair? improper-list)
-         (or (eq? elt (car improper-list))
-             (improper-member elt (cdr improper-list)))]
-        [else
-         (eq? elt improper-list)]))
-
-;(->* (syntax? (listof syntax?))
-;     (syntax? (listof syntax?)))
-
-(define (recur-on-pieces stx settings)
-  (if (pair? (syntax-e stx))
-      (datum->syntax
-       stx (syntax-pair-map (syntax-e stx) (lambda (stx) (unwind stx settings))) stx stx)
-      stx))
-
-(define (fall-through stx settings)
-  (kernel-syntax-case stx #f
-    [id
-     (identifier? stx)
-     (or (stepper-syntax-property stx 'stepper-lifted-name)
-         stx)]
-    [(define-values dc ...)
-     (unwind-define stx settings)]
-    ; STC: app special cases from lazy racket
-    ; extract-if-lazy-proc - can't hide this in lazy.rkt bc it's needed
-    ; to distinguish the general lazy application
-    [(#%plain-app proc-extract p)
-     (or (eq? (syntax->datum #'proc-extract) 'extract-if-lazy-proc)
-         (eq? (object-name 
-               (with-handlers ; for print output-style
-                   ([(λ (e) #t) (λ (e) #f)]) 
-                 (syntax-e (second (syntax-e #'proc-extract)))))
-              'extract-if-lazy-proc))
-     (unwind #'p settings)]
-    ; lazy #%app special case: force and delay
-    [(#%plain-app f arg)
-     (let ([fn (syntax->datum #'f)])
-       (or (eq? fn 'lazy-proc)
-           (eq? fn 'make-lazy-proc)
-           (eq? fn 'force) (eq? fn '!) (eq? fn '!!)
-           (eq? fn '!list) (eq? fn '!!list)
-           (equal? fn '(#%plain-app parameter-procedure))))
-     (unwind #'arg settings)]
-    ; general lazy application
-    [(#%plain-app 
-      (#%plain-lambda args1 (#%plain-app (#%plain-app proc p) . args2)) 
-      . args3)
-     (and (eq? (syntax->datum #'proc) 'extract-if-lazy-proc)
-          (equal? (syntax->datum (cdr (syntax-e #'args1)))
-                  (syntax->datum #'args2)))
-     (recur-on-pieces #'args3 settings)]
-    [(#%plain-app exp ...)
-     (recur-on-pieces #'(exp ...) settings)]
-    [(quote datum)
-     (if (symbol? #'datum)
-         stx
-         #'datum)]
-    [(let-values . rest)
-     (unwind-mz-let stx settings)]
-    [(letrec-values . rest)
-     (unwind-mz-let stx settings)]
-    [(#%plain-lambda . rest)
-     (recur-on-pieces #'(lambda . rest) settings)]
-    [(set! var rhs)
-     (with-syntax ([unwound-var (or (stepper-syntax-property
-                                     #`var 'stepper-lifted-name)
-                                    #`var)]
-                   [unwound-body (unwind #`rhs settings)])
-       #`(set! unwound-var unwound-body))]
-    [else (recur-on-pieces stx settings)]))
-
-(define (unwind stx settings)
-  (transfer-info
-   (let ([hint (stepper-syntax-property stx 'stepper-hint)])
-     (if (procedure? hint)
-         ; STC: For fn hints, I changed the recur procedure to unwind
-         ; (was recur-on-pieces). This should not affect the non-lazy 
-         ; stepper since it doesnt seem to use any fn hints.
-         (hint stx (lambda (stx) (unwind stx settings)))
-         (let ([process (case hint
-                          [(comes-from-cond)  unwind-cond]
-                          [(comes-from-and)   (unwind-and/or 'and)]
-                          [(comes-from-or)    (unwind-and/or 'or)]
-                          [(comes-from-local) unwind-local]
-                          [(comes-from-recur) unwind-recur]
-                          [(comes-from-check-expect) unwind-check-expect]
-                          [(comes-from-check-within) unwind-check-within]
-                          [(comes-from-check-error) unwind-check-error]
-                          ;; unused: the fake-exp begin takes care of this for us...
-                          ;;[(comes-from-begin) unwind-begin]
-                          [else fall-through])])
-           (process stx settings))))
-   stx))
-
-(define (transfer-highlight from to)
-  (if (stepper-syntax-property from 'stepper-highlight)
-      (stepper-syntax-property to 'stepper-highlight #t)
-      to))
-
-(define (unwind-recur stx settings)
-  ;; if you use #%app, it gets captured here
-  (with-syntax ([(app-keywd letrec-term argval ...) stx])
-    (with-syntax ([(new-argval ...)
-                   (map (lambda (argval) (unwind argval settings)) (syntax->list #`(argval ...)))])
-      (let ([unwound (unwind #`letrec-term settings)])
-        (syntax-case unwound (letrec lambda)
-          [(letrec ([loop-name (lambda (argname ...) . bodies)])
-             loop-name-2)
-           (unless (free-identifier=? #`loop-name #`loop-name-2)
-             (error "unexpected syntax for 'recur': ~v" stx))
-           (transfer-highlight
-            unwound
-            #`(recur loop-name ([argname new-argval] ...) . bodies))]
-          [else #`(#,unwound new-argval ...)])))))
-
-(define (unwind-define stx settings)
-  (kernel-syntax-case stx #f
-    [(define-values (name . others) body)
-     (if (null? (syntax-e #'others))
-         ;; this is supported:
-         (let* ([printed-name
-                 (or (stepper-syntax-property #`name 'stepper-lifted-name)
-                     (stepper-syntax-property #'name 'stepper-orig-name)
-                     #'name)]
-                [unwound-body (unwind #'body settings)]
-                ;; see notes in internal-docs.txt
-                [define-type (stepper-syntax-property
-                              unwound-body 'stepper-define-type)])
-           (if define-type
-               (kernel-syntax-case 
-                   unwound-body #f
-                 [(lambda arglist lam-body ...)
-                  (case define-type
-                    [(shortened-proc-define)
-                     (let ([proc-define-name
-                            (stepper-syntax-property
-                             unwound-body
-                             'stepper-proc-define-name)])
-                       (if (or (free-identifier=? proc-define-name
-                                                  #'name)
-                               (and (stepper-syntax-property #'name
-                                                             'stepper-orig-name)
-                                    (free-identifier=?
-                                     proc-define-name
-                                     (stepper-syntax-property
-                                      #'name 'stepper-orig-name))))
-                           #`(define (#,printed-name . arglist)
-                               lam-body ...)
-                           #`(define #,printed-name
-                               #,unwound-body)))]
-                    [(lambda-define)
-                     #`(define #,printed-name #,unwound-body)]
-                    [else (error 'unwind-define
-                                 "unknown value for syntax property 'stepper-define-type: ~e"
-                                 define-type)])]
-                 [else (error 'unwind-define
-                              "expr with stepper-define-type is not a lambda: ~.s"
-                              (syntax->datum unwound-body))])
-               #`(define #,printed-name #,unwound-body)))
-         ;; this is there just to see the unsupported stuff go by...
-         #`(define-values (name . others) #,(unwind #'body settings))
-         )]
-    [else (error 'unwind-define
-                 "expression is not a define-values: ~.s"
-                 (syntax->datum stx))]))
-
-(define (unwind-mz-let stx settings)
-  (syntax-case stx ()
-    [(label ([(var) rhs] ...) . bodies)
-     (with-syntax ([(rhs2 ...) (map (lambda (rhs) (unwind rhs settings)) (syntax->list #'(rhs ...)))]
-                   [new-label
-                    (if (improper-member 'comes-from-let*
-                                         (stepper-syntax-property
-                                          stx 'stepper-hint))
-                        #`let*
-                        (case (syntax-e #'label)
-                          [(let-values) #'let]
-                          [(letrec-values) #'letrec]))]
-                   [new-bodies (map (lambda (body) (unwind body settings)) (syntax->list #'bodies))])
-       ;; is there a nested let-form that should be combined with this one?
-       #;(syntax-case #`new-bodies ()
-         [(only-body)
-          (same-source? stx #'only-body)
-          (syntax-case #'only-body ()
-            [(let/*/rec bindings inner-body ...)
-             ]
-            [else 
-             (error "internal error 20110709: nested expr in let/*/rec had same source, but wasn't a let/*/rec")])])
-       ;; is this let and the nested one part of a let*?
-       (syntax-case #`new-bodies (let*)
-         [((let* bindings inner-body ...))
-          (and
-           (improper-member 'comes-from-let*
-                            (stepper-syntax-property stx 'stepper-hint))
-           (same-source? stx (car (syntax->list #`new-bodies))))
-          #`(let* #,(append (syntax->list #`([var rhs2] ...))
-                            (syntax->list #`bindings))
-              inner-body ...)]
-         [else
-          #`(new-label ([var rhs2] ...) . new-bodies)]))]
-    [;; it's not part of the language we support... might as well just blow it on out there
-     (label ([(var ...) rhs] ...) . bodies)
-     (with-syntax ([(rhs2 ...) (map (lambda (rhs) (unwind rhs settings)) (syntax->list #'(rhs ...)))]
-                   [new-bodies (map (lambda (body) (unwind body settings)) (syntax->list #'bodies))])
-       #`(label ([(var ...) rhs2] ...) . new-bodies))]))
-
-(define (unwind-local stx settings)
-  (kernel-syntax-case stx #f
-    ;; at least through intermediate, define-values may not occur in
-    ;; local.
-    [(letrec-values ([vars exp] ...) body)
-     (with-syntax ([defns (map (lambda (def)
-                                 (unwind def settings))
-                               (syntax->list
-                                #`((define-values vars exp) ...)))])
-       #`(local defns #,(unwind #'body settings)))]
-    [else (error 'unwind-local
-                 "expected a letrec-values, given: ~.s"
-                 (syntax->datum stx))]))
-
-;(define (unwind-quasiquote-the-cons-application stx settings)
-;  (syntax-case (recur-on-pieces stx settings) ()
-;    [(#%app the-cons . rest)
-;     (syntax (cons . rest))]
-;    [else
-;     (error 'reconstruct
-;            "unexpected result for unwinding the-cons application")]))
-
-(define (unwind-cond-clause stx test-stx result-stx settings)
-  (with-syntax ([new-test (if (stepper-syntax-property stx 'stepper-else)
-                              #`else
-                              (unwind test-stx settings))]
-                [result (unwind result-stx settings)])
-    #`(new-test result)))
-
-(define (unwind-cond stx settings)
-  (let ([outer-stx stx])
-    (with-syntax
-        ([clauses
-          (let loop ([stx stx])
-            (if (and (same-source? outer-stx stx))
-                (syntax-case stx (if begin let-values)
-                  ;; the else clause disappears when it's a
-                  ;; language-inserted else clause
-                  [(if test result)
-                   (list (unwind-cond-clause stx #`test #`result settings))]                     
-                  [(if test result else-clause)
-                   (cons (unwind-cond-clause stx #`test #`result settings)
-                         (loop (syntax else-clause)))]
-                  ;; else clause appears momentarily in 'before,' even
-                  ;; though it's a 'skip-completely'
-                  [(let-values () . rest) null]
-                  [else-stx
-                   (error 'unwind-cond
-                          "expected an if, got: ~.s"
-                          (syntax->datum (syntax else-stx)))])
-                (error 'unwind-cond
-                       "expected a cond clause expansion, got: ~.s"
-                       (syntax->datum stx))))])
-      (syntax (cond . clauses)))))
-
-(define ((unwind-and/or label) stx settings)
-  (let ([user-source   (syntax-property stx 'user-source)]
-        [user-position (syntax-property stx 'user-position)])
-    (with-syntax
-        ([clauses
-          (append
-           (if (render-settings-show-and/or-clauses-consumed? settings)
-               (build-list (stepper-syntax-property
-                            stx 'stepper-and/or-clauses-consumed)
-                           (let ([clause-padder
-                                  (if (render-settings-true-false-printed? settings)
-                                      (case label [(and) #'true] [(or) #'false])
-                                      (case label [(and) #'#t] [(or) #'#f]))])
-                             (lambda (dc) clause-padder)))
-               '())
-           (let loop ([stx stx])
-             (if (and (eq? user-source
-                           (syntax-property stx 'user-source))
-                      (eq? user-position
-                           (syntax-property stx 'user-position)))
-                 (syntax-case stx (if)
-                   [(if part-1 part-2 part-3)
-                    (cons (unwind (syntax part-1) settings)
-                          (case label
-                            [(and) (loop (syntax part-2))]
-                            [(or) (loop (syntax part-3))]
-                            [else (error 'unwind-and/or
-                                         "unknown label ~a" label)]))]
-                   [else
-                    (error 'unwind-and/or
-                           "syntax: ~a does not match and/or patterns"
-                           (syntax->datum stx))])
-                 null)))])
-      #`(#,label . clauses))))
-
-(define (unwind-check-expect stx settings)
-  (kernel-syntax-case (fall-through stx settings) #f
-    [(c-e (lambda () a1) a2 a3 a4)
-     #`(check-expect a1 a2)]
-    [(dots1 actual dots2) 
-     (and (eq? (syntax->datum #'dots1) '...)
-          (eq? (syntax->datum #'dots2) '...))
-     (with-syntax ([expected (unwind (third (stepper-syntax-property stx 'stepper-args-of-call)) settings)])
-       #`(check-expect actual expected))]
-    [any #`(c-e any) #;#`(check-expect )]))
-
-(define (unwind-check-within stx settings)
-  (kernel-syntax-case (fall-through stx settings) #f
-    [(c-e (lambda () a1) a2 a3 a4 a5)
-     #`(check-within a1 a2 a3)]
-    [(dots1 actual dots2)
-     (and (eq? (syntax->datum #'dots1) '...)
-          (eq? (syntax->datum #'dots2) '...))
-     (let ([args-of-call (stepper-syntax-property stx 'stepper-args-of-call)])
-       (with-syntax ([expected (unwind (third args-of-call) settings)]
-                     [within (unwind (fourth args-of-call) settings)])
-         #`(check-within actual expected within)))]
-    [any #`(c-e any) #;#`(check-expect )]))
-
-(define (unwind-check-error stx settings)
-  (kernel-syntax-case (fall-through stx settings) #f
-    [(c-e (lambda () a1) a2 a3 a4)
-     #`(check-error a1 a2)]
-    [(dots1 actual dots2)
-     (and (eq? (syntax->datum #'dots1) '...)
-          (eq? (syntax->datum #'dots2) '...))
-     (let ([args-of-call (stepper-syntax-property stx 'stepper-args-of-call)])
-       (with-syntax ([expected (unwind (third args-of-call) settings)])
-         #`(check-error actual expected)))]
-    [any #`(c-e any) #;#`(check-expect )]))
-
-(define (same-source? stx1 stx2)
-  (and (equal? (syntax-property stx1 'user-source)
-               (syntax-property stx2 'user-source))
-       (equal? (syntax-property stx1 'user-position)
-               (syntax-property stx2 'user-position))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/marks.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/marks.rkt
deleted file mode 100644
index ccd5937170..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/marks.rkt
+++ /dev/null
@@ -1,186 +0,0 @@
-#lang scheme/base
-
-(require mzlib/list
-         mzlib/contract
-         "my-macros.rkt"
-         "shared.rkt"
-         "syntax-property.rkt"
-         #;(file "/Users/clements/clements/scheme-scraps/eli-debug.ss"))
-
-(define-struct full-mark-struct (source label bindings values))
-
-; CONTRACTS
-(define mark? (-> ; no args  
-               full-mark-struct?))
-(define mark-list? (listof procedure?))
-
-(provide/contract 
- ;[make-debug-info (any/c binding-set? varref-set? any/c boolean? . -> . syntax?)] ; (location tail-bound free label lifting? -> mark-stx)
- [expose-mark (-> mark? (list/c any/c symbol? (listof (list/c identifier? any/c))))]
- [make-top-level-mark (syntax? . -> . syntax?)]
- [lookup-all-bindings ((identifier? . -> . boolean?) mark-list? . -> . (listof any/c))]
- [lookup-first-binding ((identifier? . -> . boolean?) mark-list? ( -> any) . -> . any/c)]
- [lookup-binding (mark-list? identifier? . -> . any)])
-
-(provide
- make-debug-info
- wcm-wrap
- skipto-mark?
- skipto-mark
- strip-skiptos
- mark-list?
- mark-source
- mark-bindings
- mark-label
- mark-binding-value
- mark-binding-binding
- display-mark
- all-bindings
- #;lookup-binding-list
- debug-key
- extract-mark-list
- (struct-out normal-breakpoint-info)
- (struct-out error-breakpoint-info)
- (struct-out breakpoint-halt)
- (struct-out expression-finished))
-
-; BREAKPOINT STRUCTURES
-
-(define-struct normal-breakpoint-info (mark-list kind))
-(define-struct error-breakpoint-info (message))
-(define-struct breakpoint-halt ())
-(define-struct expression-finished (returned-value-list))
-
-(define-struct skipto-mark-struct ())
-(define skipto-mark? skipto-mark-struct?)
-(define skipto-mark (make-skipto-mark-struct))
-(define (strip-skiptos mark-list)
-  (filter (lx (not (skipto-mark? _))) mark-list))
-
-
-; debug-key: this key will be used as a key for the continuation marks.
-(define-struct debug-key-struct ())
-(define debug-key (make-debug-key-struct))
-
-(define (extract-mark-list mark-set)
-  (strip-skiptos (continuation-mark-set->list mark-set debug-key)))
-
-
-; the 'varargs' creator is used to avoid an extra cons cell in every mark:
-(define (make-make-full-mark-varargs source label bindings)
-  (lambda values 
-    (make-full-mark-struct source label bindings values)))
-
-; see module top for type
-(define (make-full-mark location label bindings)
-  (datum->syntax #'here `(#%plain-lambda () (#%plain-app ,(make-make-full-mark-varargs location label bindings)
-                                                         ,@(map make-mark-binding-stx bindings)))))
-
-(define (mark-source mark)
-  (full-mark-struct-source (mark)))
-
-(define (make-mark-binding-stx id)
-  #`(#%plain-lambda () #,id))
-
-(define (mark-bindings mark)
-  (map list 
-       (full-mark-struct-bindings (mark)) 
-       (full-mark-struct-values (mark))))
-
-(define (mark-label mark)
-  (full-mark-struct-label (mark)))
-
-(define (mark-binding-value mark-binding)
-  (with-handlers ([(λ (e) #t) (λ (e) "--- undefined ---")])
-    ((cadr mark-binding))))
-
-(define (mark-binding-binding mark-binding)
-  (car mark-binding))
-
-(define (expose-mark mark)
-  (let ([source (mark-source mark)]
-        [label (mark-label mark)]
-        [bindings (mark-bindings mark)])
-    (list source
-          label
-          (map (lambda (binding)
-                 (list (mark-binding-binding binding)
-                       (mark-binding-value binding)))
-               bindings))))
-
-(define (display-mark mark)
-  (apply
-   string-append
-   (format "source: ~a\n" (syntax->datum (mark-source mark)))
-   (format "label: ~a\n" (mark-label mark))
-   (format "bindings:\n")
-   (map (lambda (binding)
-          (format " ~a : ~a\n" (syntax-e (mark-binding-binding binding))
-                  (mark-binding-value binding)))
-        (mark-bindings mark))))
-
-
-; possible optimization: rig the mark-maker to guarantee statically that a
-; variable can occur at most once in a mark.  
-
-(define (binding-matches matcher mark)
-  (filter (lambda (binding-pair) (matcher (mark-binding-binding binding-pair))) (mark-bindings mark)))
-
-(define (lookup-all-bindings matcher mark-list)
-  (apply append (map (lambda (m) (binding-matches matcher m)) mark-list)))
-
-(define (lookup-first-binding matcher mark-list fail-thunk)
-  (let ([all-bindings (lookup-all-bindings matcher mark-list)])
-    (if (null? all-bindings)
-        (fail-thunk)
-        (car all-bindings))))
-
-(define (lookup-binding mark-list id)
-  (mark-binding-value
-   (lookup-first-binding (lambda (id2) (free-identifier=? id id2)) 
-                         mark-list 
-                         (lambda ()
-                           (error 'lookup-binding "variable not found in environment: ~a\n" (if (syntax? id) 
-                                                                                                (syntax->datum id)
-                                                                                                id))))))
-
-(define (all-bindings mark)
-  (map mark-binding-binding (mark-bindings mark)))
-
-(define (wcm-wrap debug-info expr)
-  #`(with-continuation-mark #,debug-key #,debug-info #,expr))
-
-
-; DEBUG-INFO STRUCTURES
-
-;;;;;;;;;;
-;;
-;; make-debug-info builds the thunk which will be the mark at runtime.  It contains 
-;; a source expression and a set of binding/value pairs.
-;; (syntax-object BINDING-SET VARREF-SET any boolean (union/c false/c integer?)) -> debug-info)
-;;
-;;;;;;;;;;
-
-(define (make-debug-info source tail-bound free-vars label lifting?)
-  (define kept-vars (binding-set-varref-set-intersect tail-bound free-vars))
-  (define (let-binding? var)
-    (and 
-     (not (stepper-syntax-property var 'stepper-no-lifting-info))
-     (case (stepper-syntax-property var 'stepper-binding-type)
-       ((let-bound macro-bound) #t)
-       ((lambda-bound stepper-temp non-lexical) #f)
-       (else (error 'make-debug-info 
-                    "varref ~a's binding-type info was not recognized: ~a"
-                    (syntax-e var)
-                    (stepper-syntax-property var 'stepper-binding-type))))))
-  (cond [lifting?
-         (define let-bindings (filter let-binding? kept-vars))
-         (define lifter-syms (map get-lifted-var let-bindings))
-         (make-full-mark source label (append kept-vars lifter-syms))]
-        [else
-         ;; I'm not certain that non-lifting is currently tested: 2005-12, JBC
-         (make-full-mark source label kept-vars)]))
-
-
-(define (make-top-level-mark source-expr)
-  (make-full-mark source-expr 'top-level null))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/model-settings.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/model-settings.rkt
deleted file mode 100644
index 32d2bfba62..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/model-settings.rkt
+++ /dev/null
@@ -1,142 +0,0 @@
-(module model-settings mzscheme
-  (require mzlib/contract
-           mzlib/pconvert)
-  
-  ; there are two separate reasons to use units here, but it's just too painful.
-  ; reason 1) the drscheme:language procedures are linked at runtime into the
-  ; stepper-tool unit, and we need to get them down here somehow.  Making the
-  ; render-settings a unit would solve this.
-  ; reason 2) the render-settings should be recomputed once for each stepper 
-  ; invocation.  invoke-unit is a nice way of doing this without dropping back
-  ; to linking-by-position, which is what happens with a simple closure 
-  ; implementation.
-  
-  ; HOWEVER, like I said, it's just too painful. Once this is a unit, then 
-  ; everything else wants to be a unit too. For instance, to make sure that 
-  ; the reconstructor gets the right invocation of the unit, it needs to be a 
-  ; unit as well.  Pretty soon, everything is units.
-
-  (define-struct render-settings
-    (true-false-printed? 
-     constructor-style-printing?
-     abbreviate-cons-as-list?
-     render-to-sexp
-     lifting?
-     show-and/or-clauses-consumed?
-     all-bindings-mutable?
-     show-lambdas-as-lambdas?))
-  
-  (provide/contract [check-global-defined (-> symbol? boolean?)]
-                    [global-lookup (-> any/c any)]
-
-                    [struct render-settings 
-                            ([true-false-printed? boolean?]
-                             [constructor-style-printing? boolean?]
-                             [abbreviate-cons-as-list? boolean?]
-                             [render-to-sexp (any/c . -> . any)]
-                             [lifting? boolean?]
-			     [show-and/or-clauses-consumed? boolean?]
-                             [all-bindings-mutable? boolean?]
-                             [show-lambdas-as-lambdas? boolean?])]
-                    
-                    
-                    
-                    [get-render-settings ((any/c . -> . string?) ; render-to-string
-                                          (any/c . -> . any) ; render-to-sexp
-                                          boolean? ; lifting?
-					  boolean? ; show-and/or-clauses-consumed?
-                                          boolean? ; show-lambdas-as-lambdas?
-                                          . -> .
-                                          render-settings?)]
-                    
-                    ;; the 'fake' render-settings structures are used for testing, so that the test suite
-                    ;; can be run without access to a drscheme frame.
-                    [fake-beginner-render-settings render-settings?]
-                    [fake-beginner-wla-render-settings render-settings?]
-                    [fake-intermediate-render-settings render-settings?]
-                    [fake-intermediate/lambda-render-settings render-settings?]
-                    [fake-advanced-render-settings render-settings?]
-                    [fake-mz-render-settings render-settings?]
-                    [fake-lazy-render-settings render-settings?])
-  
-  (define (make-fake-render-to-sexp true/false constructor-style abbreviate)
-    (lambda (val)
-      (parameterize ([booleans-as-true/false true/false]
-                     [constructor-style-printing constructor-style]
-                     [abbreviate-cons-as-list abbreviate])
-        ;; duplication of hack inserted by matthew flatt for 201 release:
-        (or (and (procedure? val)
-                 (object-name val))
-            (print-convert val)))))
-  
-    ; FIXME : #f totally unacceptable as 'render-to-string'
-  (define fake-beginner-render-settings
-    (make-render-settings #t #t #f (make-fake-render-to-sexp #t #t #f) #t #t #f #f))
-  
-  (define fake-beginner-wla-render-settings
-    (make-render-settings #t #t #t (make-fake-render-to-sexp #t #t #t) #t #t #f #f))
-  
-  (define fake-intermediate-render-settings
-    fake-beginner-wla-render-settings)
-  
-  (define fake-intermediate/lambda-render-settings
-    (make-render-settings #t #t #t (make-fake-render-to-sexp #t #t #t) #t #t #f #t))
-  
-  ;; this is a guess:
-  (define fake-advanced-render-settings
-    (make-render-settings #t #t #t (make-fake-render-to-sexp #t #t #t) #t #t #f #t))
-  
-  (define fake-mz-render-settings
-    (make-render-settings (booleans-as-true/false) 
-                          (constructor-style-printing) 
-                          (abbreviate-cons-as-list) 
-                          print-convert
-                          #f
-                          #t
-			  #f
-                          #t))
-  
-  (define fake-lazy-render-settings
-    (make-render-settings (booleans-as-true/false)     ; true-false-printed?
-                          #t ; constructor-style-printing?
-                          (abbreviate-cons-as-list)    ; abbreviate-cons-as-list?
-                          (make-fake-render-to-sexp #t #t #t) ; render-to-sexp
-                          #t   ; lifting?
-                          #t   ; show-and/or-clauses-consumed?
-                          #f   ; all-bindings-mutable?
-                          #t)) ; show-lambdas-as-lambdas?
-
-  
-  (define-struct test-struct () (make-inspector))
-  
-  ;; get-render-settings : infer aspects of the current language's print conversion by explicitly testing 
-  ;;  assorted test expressions
-  (define (get-render-settings render-to-string render-to-sexp lifting? 
-                               show-and/or-clauses-consumed?
-                               show-lambdas-as-lambdas?)
-    (let* ([true-false-printed? (string=? (render-to-string #t) "true")]
-           [constructor-style-printing? (string=? (render-to-string (make-test-struct)) "(make-test-struct)")]
-           [rendered-list (render-to-string '(3))]
-           [rendered-list-substring (substring rendered-list 
-                                               0 
-                                               (min 5 (string-length rendered-list)))]
-           [abbreviate-cons-as-list? (and constructor-style-printing?
-                                              (string=? rendered-list-substring "(list"))])
-      (make-render-settings
-       true-false-printed?
-       constructor-style-printing?
-       abbreviate-cons-as-list?
-       render-to-sexp
-       lifting?
-       show-and/or-clauses-consumed?
-       #f
-       show-lambdas-as-lambdas?)))
-  
-  (define (check-global-defined identifier)
-    (with-handlers
-        ([exn:fail:contract:variable? (lambda args #f)])
-      (global-lookup identifier)
-      #t))
-  
-  (define (global-lookup identifier)
-    (namespace-variable-value identifier)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/model.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/model.rkt
deleted file mode 100644
index 785d02b26e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/model.rkt
+++ /dev/null
@@ -1,570 +0,0 @@
-#lang racket/base
-
-;step collector state machine (not yet implemented):
-;
-; datatype held-type = NO-HELD-STEP | SKIPPED-STEP | HELD(args)
-;
-; states: global state of held
-; global: held : held-type
-; edge-names: first, skipped-first, second, skipped-second, double, late-let
-;
-;transitions (& actions):
-;
-; held = NO-HELD-STEP :
-;  first(x) : held := HELD(x)
-;  skipped-first : held := SKIPPED-STEP
-;  second(x) : trigger(NO-HELD-STEP, x), held := NO-HELD-STEP.
-;      this happens when evaluating unannotated code
-;  skipped-second : held := NO-HELD-STEP
-;      I believe this can also arise in unannotated code
-;  double(x) : double-trigger(x), held := NO-HELD-STEP
-;  late-let(x) : late-let-trigger(x), held := NO-HELD-STEP
-;
-; held = SOME(SKIPPED-STEP) :
-;  first(x) : ERROR
-;  skipped-first : ERROR
-;  second(x) : held := NO-HELD-STEP
-;      this happens e.g. for evaluation of top-level var bound to a procedure
-;  skipped-second : held := NO-HELD-STEP
-;  double(x) : ERROR
-;  late-let(x) : ERROR
-;
-; held = SOME(HELD(args))
-;  first(x) : ERROR
-;  skipped-first : ERROR
-;  second(x) : trigger(HELD(args),x), held = NO-HELD-STEP
-;  skipped-second : held = NO-HELD-STEP
-;  double(x) : ERROR
-;  late-let(x) : ERROR
-
-
-(require racket/contract
-         racket/match 
-         racket/list 
-         (prefix-in a: "annotate.rkt")
-         (prefix-in r: "reconstruct.rkt")
-         "shared.rkt"
-         "syntax-property.rkt"
-         "marks.rkt"
-         "model-settings.rkt"
-         "macro-unwind.rkt"
-         "lifting.rkt"
-         (prefix-in test-engine: test-engine/scheme-tests)
-         #;(file "/Users/clements/clements/scheme-scraps/eli-debug.ss")
-         ;; for breakpoint display
-         ;; (commented out to allow nightly testing)
-         #;"display-break-stuff.rkt"
-         (for-syntax scheme/base))
-
-(define stepper-model-debug? (make-parameter #f))
-(provide stepper-model-debug?)
-
-
-(define program-expander-contract
-  ((-> void?) ; init
-   ((or/c eof-object? syntax? (cons/c string? any/c)) (-> void?)
-                                                      . -> . void?) ; iter
-   . -> .
-   void?))
-
-(provide/contract
- [go (->*
-      (program-expander-contract       ; program-expander
-       (step-result? . -> . void?)     ; receive-result
-       (or/c render-settings? false/c)) ; render-settings
-      (#:raw-step-receiver 
-       (-> continuation-mark-set? symbol? void?)
-       #:disable-error-handling? boolean?)
-      void?)])
-
-   
-(define-struct posn-info (posn span))
-
-(provide (struct-out posn-info))
-
-
-; go starts a stepper instance
-; see provide stmt for contract
-(define (go program-expander receive-result render-settings
-            #:disable-error-handling? [disable-error-handling? #f]
-            #:raw-step-receiver [raw-step-receiver #f])
-  
-  (define DEBUG (stepper-model-debug?))
-  
-  ;; finished-exps:
-  ;;   (listof (list/c syntax-object? (or/c number? false?)( -> any)))
-  ;; because of mutation, these cannot be fixed renderings, but must be
-  ;; re-rendered at each step.
-  (define finished-exps null)
-  (define/contract add-to-finished
-    ((-> syntax?) (or/c (listof natural-number/c) false/c) (-> any)
-                  . -> . void?)
-    (lambda (exp-thunk lifting-indices getter)
-      (set! finished-exps
-            (append finished-exps
-                    (list (list exp-thunk lifting-indices getter))))))
-  
-  ;; the "held" variables are used to store the "before" step.
-  (define held-exp-list the-no-sexp)
-  
-  (define-struct held (exps was-app? source-info))
-  
-  (define held-finished-list null)
-  
-  (define (reset-held-exp-list)
-    (set! held-exp-list the-no-sexp)
-    (set! held-finished-list null)
-    (set! lhs-recon-thunk null))
-  
-  ; used when determining whether to skip step with ellipses on LHS
-  (define last-rhs-exps null)
-  
-  ; thunk that can re-reconstruct the last lhs
-  (define lhs-recon-thunk null)
-  
-  ; used to resolve lhs ellipses, to make sure highlighting is correct
-  ; steps are pushed onto the stack:
-  ;   when step=? but not step-and-highlight=?
-  ; steps are popped off the stack:
-  ;  lhs = ellipses and rhs != last-rhs-exps and skips = 0
-  ; skips are defined for each fn in lazy-highlighting.rkt;
-  ; # of skips depends on # of hidden !'s in fn def
-  (define highlight-stack null)
-  (define (highlight-stack-push mark-list)
-    (let ([top-called-fn (find-top-called-fn mark-list)])
-      (when DEBUG
-        (printf "top called fn = ~a\n" top-called-fn))
-      (set! highlight-stack
-            (cons (cons top-called-fn lhs-recon-thunk) highlight-stack))))
-  (define (find-top-called-fn mark-list)
-    (if (null? mark-list)
-        #f
-        (let ([top-mark (car mark-list)])
-          (if (eq? 'called (mark-label top-mark))
-              (object-name (lookup-binding (list top-mark) (get-arg-var 0)))
-              (find-top-called-fn (cdr mark-list))))))
-  (define (highlight-stack-pop)
-    (set! highlight-stack (cdr highlight-stack)))
-
-  
-  
-  ;; highlight-mutated-expressions :
-  ;;   ((listof (list/c syntax? syntax?)) (listof (list/c syntax? syntax?))
-  ;;   -> (list/c (listof syntax?) (listof syntax?)))
-  ;; highlights changes occurring due to mutation.  This function accepts the
-  ;; left-hand-side expressions and the right-hand-side expressions, and
-  ;; matches them against each other to see which ones have changed due to
-  ;; mutation, and highlights these.
-  ;; POSSIBLE RESEARCH POINT: if, say, (list 3 4) is mutated to (list 4 5),
-  ;;   should the 4 & 5 be highlighted individually or should the list as a
-  ;;   whole be highlighted.  Is either one "wrong?"  equivalences between
-  ;;   reduction semantics?
-  ;;
-  ;; 2005-11-14: punting. just highlight the whole darn thing if there are
-  ;; any differences.  In fact, just test for eq?-ness.
-  
-  #;
-  (define (highlight-mutated-expressions lefts rights)
-    (if (or (null? lefts) (null? rights))
-        (list lefts rights)
-        (let ([left-car (car lefts)]
-              [right-car (car rights)])
-          (if (eq? (syntax-property left-car 'user-source)
-                   (syntax-property right-car 'user-source))
-              (let ([highlights-added
-                     (highlight-mutated-expression left-car right-car)]
-                    [rest (highlight-mutated-expressions
-                           (cdr lefts) (cdr rights))])
-                (cons (cons (car highlights-added) (car rest))
-                      (cons (cadr highlights-added) (cadr rest))))))))
-  
-  ;; highlight-mutated-expression: syntax? syntax? -> syntax?
-  ;; given two expressions, highlight 'em both if they differ at all.
-  
-  ;; notes: wanted to use simple "eq?" test... but this will fail when a
-  ;; being-stepped definition (e.g.  in a let) turns into a permanent one.
-  ;; We pay a terrible price for the lifting thing.  And, for the fact that
-  ;; the highlighting follows from the reductions but can't obviously be
-  ;; deduced from them.
-  
-  #;
-  (define (highlight-mutated-expression left right)
-    (cond
-      ;; if either one is already highlighted, leave them alone.
-      [(or (stepper-syntax-property left 'stepper-highlight)
-           (stepper-syntax-property right 'stepper-highlight))
-       (list left right)]
-      
-      ;; first pass: highlight if not eq?.  Should be broken for local-bound
-      ;; things as they pass into permanence.
-      [(eq? left right)
-       (list left right)]
-      
-      [else (list (stepper-syntax-property left 'stepper-highlight)
-                  (stepper-syntax-property right 'stepper-highlight))]))
-  
-  ;; mutated on receipt of a break, used in displaying breakpoint stuff.
-  (define steps-received 0)
-  
-  (define break
-    (lambda (mark-set break-kind returned-value-list)
-      (when DEBUG
-        (printf "\n---------- BREAK TYPE = ~a ----------\n" break-kind))
-      
-      (set! steps-received (+ steps-received 1))
-      ;; have to be careful else this won't be looked up right away:
-      ;; (commented out to allow nightly tests to proceed, 2007-09-04
-      #;(when (getenv "PLTSTEPPERUNSAFE")
-          (let ([steps-received/current steps-received])
-            (run-on-drscheme-side
-             (lambda ()
-               (display-break-stuff
-                steps-received/current
-                mark-set break-kind returned-value-list)))))
-      
-      (let* ([mark-list (and mark-set (extract-mark-list mark-set))]
-             [dump-marks
-              (when DEBUG
-                (printf "MARKLIST:\n\n")
-                (and mark-set
-                     (map (λ (x) (printf "~a\n" (display-mark x))) mark-list))
-                (printf "RETURNED VALUE LIST: ~a\n" returned-value-list))])
-       
-        (define (reconstruct-all-completed)
-          (filter-map
-           (match-lambda
-             [(list source-thunk lifting-indices getter)
-              (let ([source (source-thunk)])
-                (if (r:hide-completed? source)
-                    #f
-                    (match (r:reconstruct-completed
-                            source lifting-indices
-                            getter render-settings)
-                      [(vector exp #f) (unwind exp render-settings)]
-                      [(vector exp #t) exp])))])
-           finished-exps))
-        
-        (define (compute-posn-info)
-          (mark-list->posn-info mark-list))
-        
-        (define (compute-step-was-app?)
-          (r:step-was-app? mark-list))
-        
-        (define (compute-step-kind held-step-was-app?)
-          (if (and held-step-was-app?
-                   (eq? break-kind 'result-exp-break))
-              'user-application
-              'normal))
-        
-        (define (create-held exps)
-          (make-held exps (compute-step-was-app?) (compute-posn-info)))
-        
-        (define-syntax (with-DEBUG stx)
-          (syntax-case stx ()
-            [(_ exp msg) #'(and exp (when DEBUG (printf msg)))]))
-        
-        ; sends a step to the stepper, except if
-        ;  - lhs = rhs
-        ;  - lhs = ellipses, highlight-stack = null (ie, this is first step)
-        ;  - lhs = ellipses, rhs = last-rhs-exps
-        ; when lhs = ellipses, and highlight-stack != null,
-        ; pop step from stack and use lhs
-        (define/contract 
-          (send-step lhs-exps lhs-finished-exps 
-                     rhs-exps rhs-finished-exps
-                     step-kind lhs-posn-info rhs-posn-info)
-          (-> (listof syntax?)
-              (listof syntax?)
-              (listof syntax?)
-              (listof syntax?)
-              any/c any/c any/c 
-              any)
-          
-          (define (send-it)
-            (receive-result
-             (before-after-result
-              (append lhs-finished-exps lhs-exps)
-              (append rhs-finished-exps rhs-exps)
-              step-kind
-              lhs-posn-info rhs-posn-info))
-            (when DEBUG 
-              (printf "step sent:\n")
-              (printf "LHS = ~a\n" (map syntax->hilite-datum lhs-exps))
-              (printf "RHS = ~a\n" (map syntax->hilite-datum rhs-exps)))
-            (set! last-rhs-exps rhs-exps))
-          
-          (when DEBUG
-            (printf "maybe sending step ... \n")
-            (printf "LHS = ~a\n" (map syntax->hilite-datum lhs-exps))
-            (printf "RHS = ~a\n" (map syntax->hilite-datum rhs-exps)))
-          
-          (cond
-            ; SKIPPING step, lhs = rhs
-            ; if highlights differ, push highlight-stack and set last-rhs-exp
-            [(step=? lhs-exps rhs-exps)
-             (when DEBUG (printf "SKIPPING STEP (LHS = RHS)\n"))
-             (when (not (step-and-highlight=? lhs-exps rhs-exps))
-               (when DEBUG
-                 (printf "Pushing onto highlight-stack:\n  ~a thunk\n" 
-                         (syntax->hilite-datum (car lhs-exps))))
-               (highlight-stack-push mark-list)
-               (set! last-rhs-exps rhs-exps))]
-            [(step=? lhs-exps (list #'(... ...)))
-             (cond
-               ; SKIPPING step, lhs = ellipses and rhs = last-rhs-exps
-               [(step=? rhs-exps last-rhs-exps)
-                (when DEBUG 
-                  (printf "SKIPPING STEP (LHS = ellipses and RHS = last RHS)\n"))]
-               ; SKIPPING step, lhs = ellipses and highlight-stack = null and 
-               ; last-rhs = null
-               ; if last-rhs != null, send step (lhs = ...)
-               [(null? highlight-stack)
-                (if (not (null? last-rhs-exps))
-                    (send-it)
-                    (when DEBUG
-                      (printf "SKIPPING STEP (LHS = ellipses and highlight-stack = null)\n")))]
-               ; if top-called-fn = top of highlight stack, 
-               ;    then send step with lhs = lhs-thunk on highlight stack
-               ; else if last-rhs != null, send it, else skip
-               [else
-                (let ([top-called-fn (caar highlight-stack)]
-                      [lhs-thunk (cdar highlight-stack)])
-                  (if (and (eq? (find-top-called-fn mark-list) top-called-fn)
-                           (eq? break-kind 'result-value-break))
-                      (begin
-                        (set! lhs-exps (lhs-thunk))
-                        (set! lhs-finished-exps rhs-finished-exps)
-                        (when DEBUG (printf "Popping highlight-stack\n"))
-                        (highlight-stack-pop)
-                        (send-it))
-                      (when (not (null? last-rhs-exps))
-                        (send-it))))])]
-            ; sending step
-            [else (send-it)]))
-        
-        ; compares the lhs and rhs of a step (lists of syntaxes)
-        ; and returns true if the underlying datums are equal
-        (define (step=? lhs rhs)
-          (equal? (map syntax->datum lhs)
-                  (map syntax->datum rhs)))
-        (define (step-and-highlight=? lhs rhs)
-          (equal? (map syntax->hilite-datum lhs)
-                  (map syntax->hilite-datum rhs)))
-        
-        (if (r:skip-step? break-kind mark-list render-settings)
-            (begin
-              (when DEBUG (printf "skipped step\n"))
-              (when (or (eq? break-kind 'normal-break)
-                        ;; not sure about this...
-                        (eq? break-kind 'nomal-break/values))
-                (set! held-exp-list the-skipped-step)))
-            
-            (begin
-              (case break-kind
-                ; CASE: normal-break or normal-break/values -------------------
-                [(normal-break normal-break/values)
-                 (begin
-                   (when (and (eq? break-kind 'normal-break)
-                              returned-value-list)
-                     (error 'break
-                            "broken invariant: normal-break can't have returned values"))
-                   (let*
-                       ([lhs-reconstructed
-                         (r:reconstruct-left-side 
-                          mark-list returned-value-list render-settings)]
-                        [print-lhs-recon
-                         (when DEBUG
-                           (printf "LHS (pre-unwound):\n  ~a\n" 
-                                   (syntax->hilite-datum lhs-reconstructed)))]
-                        [lhs-unwound
-                         (map (λ (exp) (unwind exp render-settings))
-                              (maybe-lift lhs-reconstructed #f))]
-                        [print-lhs-unwound
-                         (when DEBUG
-                           (for-each 
-                            (λ (x) (printf "LHS (unwound): ~a\n" 
-                                           (syntax->hilite-datum x)))
-                            lhs-unwound))]
-                        [lhs-finished-exps (reconstruct-all-completed)])
-                     (set! held-finished-list lhs-finished-exps)
-                     (set! held-exp-list (create-held lhs-unwound))
-                     (set! lhs-recon-thunk 
-                           (λ ()
-                             (when DEBUG
-                               (printf "\nforcing saved MARKLIST\n")
-                               (for-each (λ (x) 
-                                           (printf "~a\n" (display-mark x)))
-                                         mark-list)
-                               (printf "saved RETURNED VALUE LIST: ~a\n"
-                                       returned-value-list))
-                             (map (λ (exp) (unwind exp render-settings)) 
-                                  (maybe-lift 
-                                   (r:reconstruct-left-side 
-                                    mark-list 
-                                    returned-value-list 
-                                    render-settings) 
-                                   #f))))))]
-                
-                ; CASE: result-exp-break or result-value-break ----------------
-                [(result-exp-break result-value-break)
-                 (define (reconstruct)
-                   (define rhs-reconstructed
-                     (r:reconstruct-right-side 
-                      mark-list returned-value-list render-settings))
-                   (when DEBUG
-                     (printf "RHS (pre-unwound):\n  ~a\n" 
-                             (syntax->hilite-datum 
-                              rhs-reconstructed)))
-                   (define rhs-unwound
-                     (map (λ (exp) (unwind exp render-settings))
-                          (maybe-lift rhs-reconstructed #f)))
-                   (when DEBUG
-                     (for-each 
-                      (λ (x) (printf "RHS (unwound): ~a\n" 
-                                     (syntax->hilite-datum x)))
-                      rhs-unwound))
-                   rhs-unwound)
-                 (match held-exp-list
-                   [(struct skipped-step ())
-                    (when DEBUG (printf "LHS = skipped, so skipping RHS\n"))
-                    ;; don't render if before step was a skipped-step
-                    (reset-held-exp-list)]
-                   [(struct no-sexp ())
-                    (when DEBUG (printf "LHS = none\n"))
-                    ;; in this case, there was no "before" step, due
-                    ;; to unannotated code.  In this case, we make the
-                    ;; optimistic guess that none of the finished
-                    ;; expressions were mutated.  It would be somewhat
-                    ;; painful to do a better job, and the stepper
-                    ;; makes no guarantees in this case.
-                    (send-step (list #'(... ...)) '()                    ; lhs
-                               (reconstruct) (reconstruct-all-completed) ; rhs
-                               'normal #f #f)
-                    (reset-held-exp-list)]
-                   [(struct held (held-exps held-step-was-app? held-posn-info))
-                    (send-step held-exps held-finished-list
-                               (reconstruct) (reconstruct-all-completed)
-                               (compute-step-kind held-step-was-app?)
-                               held-posn-info (compute-posn-info))
-                    (reset-held-exp-list)])]
-                
-                ; CASE: double-break ------------------------------------------
-                [(double-break)
-                 ;; a double-break occurs at the beginning of a let's
-                 ;; evaluation.
-                 (when (not (eq? held-exp-list the-no-sexp))
-                   (error
-                    'break-reconstruction
-                    "held-exp-list not empty when a double-break occurred"))
-                 (define new-finished-list (reconstruct-all-completed))
-                 (define reconstruct-result
-                         (r:reconstruct-double-break mark-list render-settings))
-                 (when DEBUG
-                   (printf "LHS (pre-unwound):\n  ~a\n"
-                           (syntax->hilite-datum (car reconstruct-result)))
-                   (printf "RHS (pre-unwound):\n  ~a\n"
-                           (syntax->hilite-datum (cadr reconstruct-result))))
-                 (define lhs-unwound 
-                   (map (lambda (exp) (unwind exp render-settings))
-                        (maybe-lift (car reconstruct-result) #f)))
-                 (define rhs-unwound 
-                   (map (lambda (exp) (unwind exp render-settings))
-                        (maybe-lift (cadr reconstruct-result) #t)))
-                 (when DEBUG
-                   (for-each (λ (x) (printf "LHS (unwound):\n  ~a\n" 
-                                            (syntax->hilite-datum x)))
-                             lhs-unwound)
-                   (for-each (λ (x) (printf "right side (unwound):\n  ~a\n" 
-                                            (syntax->hilite-datum x)))
-                             rhs-unwound))
-                 (send-step lhs-unwound new-finished-list
-                            rhs-unwound new-finished-list
-                            'normal
-                            (compute-posn-info) (compute-posn-info))]
-                
-                ; CASE: expr-finished-break -----------------------------------
-                [(expr-finished-break)
-                 (unless (not mark-list)
-                   (error 'break
-                          "expected no mark-list with expr-finished-break"))
-                 ;; in an expr-finished-break, the returned-vals hold (listof
-                 ;; (list/c source lifting-index getter)) this will now include
-                 ;; define-struct breaks, for which the source is the source
-                 ;; and the getter causes an error.
-                 (when DEBUG
-                   (for-each 
-                    (λ (x)
-                      (printf "add to finished:\n")
-                      (printf "  source: ~a\n" (syntax->hilite-datum ((car x))))
-                      (printf "  index: ~a\n" (second x))
-                      (printf "  getter: ")
-                      (if (stepper-syntax-property ((car x)) 
-                                                   'stepper-black-box-expr)
-                          (printf "no getter for term with stepper-black-box-expr property\n")
-                          (printf "~a\n" ((third x)))))
-                    returned-value-list))
-                 (for-each (lambda (source/index/getter)
-                             (apply add-to-finished source/index/getter))
-                           returned-value-list)]
-                
-                [else (error 'break "unknown label on break")]))))))
-  
-  (define maybe-lift
-    (if (render-settings-lifting? render-settings)
-        lift
-        ;; ... oh dear; model.rkt should disable the double-break & late-let 
-        ;; break when lifting is off.
-        (lambda (stx dont-care) (list stx))))
-  
-  (define show-lambdas-as-lambdas?
-      (render-settings-show-lambdas-as-lambdas? render-settings))
-  
-  ;; step through a single expanded expression.
-  (define (step-through-expression expanded)  
-    (define annotated (a:annotate expanded break show-lambdas-as-lambdas?))
-    #;(printf "annotated: ~s\n" annotated)
-    (parameterize ([test-engine:test-silence #t])
-      (eval-syntax annotated)))
-  
-  (define (err-display-handler message exn)
-    (match held-exp-list
-      [(struct no-sexp ())
-        (receive-result (error-result message))]
-      [(struct held (exps dc posn-info))
-       (begin
-         (receive-result
-          (before-error-result (append held-finished-list exps)
-                                    message
-                                    posn-info))
-         (set! held-exp-list the-no-sexp))]))
-  
-  (program-expander
-   (lambda () ; init
-     (unless disable-error-handling?
-       (error-display-handler err-display-handler)))
-   (lambda (expanded continue-thunk) ; iter
-     (r:reset-special-values)
-     (if (eof-object? expanded)
-         (receive-result (finished-stepping))
-         (begin (step-through-expression expanded)
-                (continue-thunk))))))
-
-
-; no-sexp is used to indicate no sexpression for display.
-; e.g., on an error message, there's no sexp.
-(define-struct no-sexp ())
-(define the-no-sexp (make-no-sexp))
-
-; skipped-step is used to indicate that the "before" step was skipped.
-(define-struct skipped-step ())
-(define the-skipped-step (make-skipped-step))
-
-;; produce a posn-info structure or false based on the information in a mark-list
-;; mark-list->posn-info : (listof mark) -> (or/c posn-info? false?)
-(define (mark-list->posn-info mark-list)
-  (let* ([first-mark-source (mark-source (car mark-list))]
-         [posn (syntax-position first-mark-source)]
-         [span (syntax-span first-mark-source)])
-    (if posn
-        (make-posn-info posn span)
-        #f)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/mred-extensions.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/mred-extensions.rkt
deleted file mode 100644
index 5d8509195d..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/mred-extensions.rkt
+++ /dev/null
@@ -1,549 +0,0 @@
-#lang racket/base
-
-(require racket/gui
-         (prefix-in f: framework)
-         racket/pretty
-         "syntax-property.rkt"
-         images/compile-time
-         string-constants
-         (for-syntax images/icons/control images/icons/style))
-
-(provide
- step-img
- stepper-canvas%
- stepper-text%
- snip?
- stepper-warning%
- finished-text
- vertical-separator-snip-class%)
-
-(define test-dc (make-object bitmap-dc% (make-object bitmap% 1 1)))
-(define reduct-highlight-color (make-object color% 255 255 255))
-(define redex-highlight-color (make-object color% 255 255 255))
-(send test-dc try-color (make-object color% 212 159 245) reduct-highlight-color)
-(send test-dc try-color (make-object color% 193 251 181) redex-highlight-color)
-
-(define error-delta (make-object style-delta% 'change-style 'italic))
-(define dont-care (send error-delta set-delta-foreground "RED"))
-
-(define snip-delta (make-object style-delta% 'change-alignment 'top))
-
-
-
-;;;; VERTICAL-SEPARATOR : the red arrow that separates the left half of the display from the right half.
-
-(define red-arrow-bitmap
-  (make-object bitmap% (collection-file-path "red-arrow.bmp" "icons") 'bmp))
-
-(unless (send red-arrow-bitmap ok?)
-  (error 'red-arrow-bitmap "unable to load red-arrow bitmap"))
-
-(define vertical-separator-snip-class%
-  (class snip-class%
-    (override read)
-    
-    (define (read s)
-      (let ([size-box (box 0)])
-        (send s get size-box)
-        (make-object vertical-separator-snip% 100)))
-    
-    (super-instantiate ())))
-
-(define vertical-separator-snipclass
-  (make-object vertical-separator-snip-class%))
-
-
-(send* vertical-separator-snipclass
-  (set-version 1)
-  (set-classname (format "~s" `(lib "vertical-separator-snip.ss" "stepper" "private"))))
-
-(send (get-the-snip-class-list) add vertical-separator-snipclass)
-
-(define vertical-separator-snip%
-  (class snip%
-    (inherit get-style set-snipclass set-flags get-flags get-admin)
-    (public set-height!)
-    (override write copy get-extent draw)
-    
-    (init-field height)
-    
-    
-    (define bitmap-width 15.0)
-    (define left-white 0.0)
-    (define right-white 3.0)
-    (define bitmap-height 10.0)
-    
-    (define (set-height! x) 
-      (set! height (max x bitmap-height)))
-    
-    (define (write s) 
-      (send s put (char->integer #\r)))        ; this can't be right...?
-    
-    (define (copy)
-      (let ([s (make-object vertical-separator-snip% height)])
-        (send s set-style (get-style))
-        s))
-    
-    (define (get-extent dc x y w-box h-box descent-box space-box lspace-box rspace-box)
-      (for-each (lambda (box) (unless (not box) (set-box! box 0)))
-                (list descent-box space-box lspace-box rspace-box))
-      (unless (not w-box)
-        (set-box! w-box (+ left-white right-white bitmap-width)))
-      (unless (not h-box)
-        (set-box! h-box height)))
-    
-    (define (draw dc x y left top right bottom dx dy draw-caret)
-      (let ([y-offset (round (/ (- height bitmap-height) 2))]
-            [x-offset left-white])
-        (send dc draw-bitmap red-arrow-bitmap (+ x x-offset) (+ y y-offset))))
-    
-    (super-instantiate ())
-    (set-snipclass vertical-separator-snipclass)))
-
-
-;;;; end of vertical snip-stuff
-
-(define stepper-editor-snip%
-  (class editor-snip%
-    (inherit get-editor set-min-width set-max-width)
-    (public*
-     [set-new-width
-      (lambda (width canvas)
-        (set-min-width width)
-        (set-max-width width)
-        (let ([editor (get-editor)])
-          (when editor
-            (send editor reset-pretty-print-width width canvas))))])
-    (super-instantiate (#f #f 0 0 0 0 0 0 0 0))))
-
-;                                    ;;    ;
-;                                                          ;              ;                 ;  ;  ;  ; 
-;;; ;;;;  ;;;   ; ;;;   ; ;;;    ;;;   ; ;;         ;;;  ;   ;  ; ;;;         ;;;;  ;;;  ;    ; ;;;;;  ; ;  
-;     ;   ;   ;  ;;   ;  ;;   ;  ;   ;  ;;          ;     ;   ;  ;;   ;         ;   ;   ;  ;  ;   ;   ;; ;   
-;     ;   ;   ;  ;    ;  ;    ;  ;   ;  ;           ;     ;   ;  ;    ;         ;   ;   ;   ;;    ;     ;    
-;;   ;   ;;;;;  ;    ;  ;    ;  ;;;;;  ;    ;;;;;   ;;   ;   ;  ;    ;  ;;;;;  ;   ;;;;;   ;;    ;     ; ;; 
-;  ;   ;      ;    ;  ;    ;  ;      ;              ;  ;   ;  ;    ;         ;   ;       ;;    ;    ; ;  ;
-;  ;   ;      ;;   ;  ;;   ;  ;      ;              ;  ;  ;;  ;;   ;         ;   ;      ;  ;   ;   ;  ;  ;
-;;;    ;;  ;;;;  ; ;;;   ; ;;;    ;;;;  ;           ;;;    ;; ;  ; ;;;           ;;  ;;;; ;    ;   ;;;    ;; 
-;       ;                                                                                   
-;       ;                                                                                   
-
-; the stepper-sub-text% class is used to hold an individual list of sexps, with one or more highlights.
-; there are four of them (* NB: now only two! 2005-08) in the stepper window.
-
-(define stepper-sub-text%
-  (class f:text:standard-style-list%
-    
-    (init-field exps highlight-color show-inexactness?)
-    
-    (inherit insert get-style-list set-style-list change-style highlight-range last-position lock erase
-             begin-edit-sequence end-edit-sequence get-start-position select-all clear)
-    
-    (public* [reset-pretty-print-width
-              (lambda (inner-width canvas)
-                (begin-edit-sequence)
-                (let* ([style (send (get-style-list) find-named-style "Standard")]
-                       [char-width (send style get-text-width (send canvas get-dc))]
-                       [width (floor (/ (- inner-width 18) char-width))])
-                  (reformat-sexp width)
-                  (end-edit-sequence)))])
-    
-    (define highlight-table (make-weak-hasheq))
-    
-    (define stripped-exps
-      (map (lambda (exp) (strip-to-sexp exp highlight-table)) exps))
-    
-    (define pretty-printed-width #f)
-    (define clear-highlight-thunks null)
-    (define/private (reset-style)
-      (change-style (send (get-style-list) find-named-style "Standard")))
-    (define/private (set-last-style)
-      (change-style (send (get-style-list) find-named-style "Standard")
-                    (sub1 (last-position))
-                    (last-position)))
-    
-    (define/private (reformat-sexp width)
-      (when (not (eq? pretty-printed-width width))
-        (set! pretty-printed-width width)
-        (format-whole-step)))
-    
-    (define highlight-begin #f)
-    
-    (inherit get-dc)
-    
-    (define/private (format-sexp sexp)
-      (define text-port (open-output-text-editor this))
-      
-      (parameterize 
-          ([pretty-print-show-inexactness show-inexactness?]
-           [pretty-print-columns pretty-printed-width]
-           
-           ; the pretty-print-size-hook decides whether this object should be printed by the new pretty-print-hook
-           [pretty-print-size-hook
-            (lambda (value display? port)
-              (let ([looked-up (hash-ref highlight-table value (lambda () #f))])
-                (cond
-                  [(is-a? value snip%) 
-                   ;; Calculate the effective width of the snip, so that
-                   ;;  too-long lines (as a result of large snips) are broken
-                   ;;  correctly. When the snip is actusally inserted, its width
-                   ;;  will be determined by `(send snip get-count)', but the number
-                   ;;  returned here triggers line breaking in the pretty printer.
-                   (let ([dc (get-dc)]
-                         [wbox (box 0)])
-                     (send value get-extent dc 0 0 wbox #f #f #f #f #f)
-                     (let-values ([(xw dc dc2 dc3) (send dc get-text-extent "x")])
-                       (max 1 (inexact->exact (ceiling (/ (unbox wbox) xw))))))]
-                  [(and looked-up (not (eq? looked-up 'non-confusable)))
-                   (string-length (format "~s" (car looked-up)))]
-                  [else #f])))]
-           
-           [pretty-print-print-hook
-            ; this print-hook is called for confusable highlights and for images.
-            (lambda (value display? port)
-              (let ([to-display (cond 
-                                  [(hash-ref highlight-table value (lambda () #f)) => car]
-                                  [else value])])
-                (cond 
-                  [(is-a? to-display snip%) 
-                   (write-special (send to-display copy) port) (set-last-style)]
-                  [else
-                   ;; there's already code somewhere else to handle this; this seems like a bit of a hack.
-                   (when (and (number? to-display) (inexact? to-display) (pretty-print-show-inexactness))
-                     (write-string "#i" port))
-                   (write-string (format "~s" to-display) port)])))]
-           [pretty-print-print-line
-            (lambda (number port old-length dest-columns)
-              (when (and number (not (eq? number 0)))
-                (newline port))
-              0)]
-           [pretty-print-pre-print-hook
-            (lambda (value p)
-              (when (hash-ref highlight-table value (lambda () #f))
-                (set! highlight-begin (get-start-position))))]
-           [pretty-print-post-print-hook
-            (lambda (value p)
-              (when (hash-ref highlight-table value (lambda () #f))
-                (let ([highlight-end (get-start-position)])
-                  (unless highlight-begin
-                    (error 'format-whole-step "no highlight-begin to match highlight-end"))
-                  (set! clear-highlight-thunks
-                        (cons (highlight-range highlight-begin highlight-end highlight-color)
-                              clear-highlight-thunks))
-                  (set! highlight-begin #f))))]
-           ;; mflatt: MAJOR HACK - this setting needs to come from the language
-           ;;  somehow
-           ;; jbc : this could be fixed in the same way that inexact-number printing is handled....
-           [read-case-sensitive #t]
-           )
-        (pretty-write sexp text-port)))
-    
-    (define/public (format-whole-step)
-      (lock #f)
-      (begin-edit-sequence)
-      (for-each (lambda (fun) (fun)) clear-highlight-thunks)
-      (set! clear-highlight-thunks null)
-      (select-all)
-      (clear)
-      (reset-style)
-      (for ([exp stripped-exps] [i (in-naturals)])
-        (unless (= i 0)
-          (insert #\newline))
-        (format-sexp exp))
-      (end-edit-sequence)
-      (lock #t))
-    
-    (super-instantiate ())))
-
-
-;      ;;; ;;;;  ;;;   ; ;;;   ; ;;;    ;;;   ; ;;         ;;;  ;   ;  ; ;;;           ;;;   ; ;; ; ;;  ;;;   ; ;;       ;;;;  ;;;  ;    ; ;;;;;  ; ;  
-;     ;     ;   ;   ;  ;;   ;  ;;   ;  ;   ;  ;;          ;     ;   ;  ;;   ;         ;   ;  ;;   ;;   ;   ;  ;;          ;   ;   ;  ;  ;   ;   ;; ;   
-;     ;     ;   ;   ;  ;    ;  ;    ;  ;   ;  ;           ;     ;   ;  ;    ;         ;   ;  ;    ;    ;   ;  ;           ;   ;   ;   ;;    ;     ;    
-;      ;;   ;   ;;;;;  ;    ;  ;    ;  ;;;;;  ;    ;;;;;   ;;   ;   ;  ;    ;  ;;;;;  ;;;;;  ;    ;    ;   ;  ;    ;;;;;  ;   ;;;;;   ;;    ;     ; ;; 
-;        ;  ;   ;      ;    ;  ;    ;  ;      ;              ;  ;   ;  ;    ;         ;      ;    ;    ;   ;  ;           ;   ;       ;;    ;    ; ;  ;
-;        ;  ;   ;      ;;   ;  ;;   ;  ;      ;              ;  ;  ;;  ;;   ;         ;      ;    ;    ;   ;  ;           ;   ;      ;  ;   ;   ;  ;  ;
-;     ;;;    ;;  ;;;;  ; ;;;   ; ;;;    ;;;;  ;           ;;;    ;; ;  ; ;;;           ;;;;  ;    ;     ;;;   ;            ;;  ;;;; ;    ;   ;;;    ;; 
-;                     ;       ;                                                                                                                       
-;                     ;       ;                                                                                                                       
-
-; the stepper-sub-error-text%, like stepper-sub-text%, fits in one of the four^H^H^H^Htwo stepper "text" spots.
-; it is used for error messages.
-
-(define stepper-sub-error-text%
-  (class f:text:standard-style-list%
-    
-    (init-field error-msg)
-    
-    (inherit get-style-list last-position set-style-list insert change-style auto-wrap
-             set-max-width)
-    
-    (public* [reset-pretty-print-width 
-              (lambda (inner-width canvas)
-                (set-max-width inner-width))])
-    
-    (super-instantiate ())
-    (let ([before-error-msg (last-position)])
-      (change-style (send (get-style-list) find-named-style "Standard"))
-      (auto-wrap #t)
-      (insert error-msg)
-      (change-style error-delta before-error-msg (last-position)))))
-
-;;    ;
-;                                                                                   ;  ;  ; 
-;;; ;;;;  ;;;   ; ;;;   ; ;;;    ;;;   ; ;;         ;;;   ;;;   ; ;;  ;   ;   ;;;    ;;; ;  ; ;  
-;     ;   ;   ;  ;;   ;  ;;   ;  ;   ;  ;;          ;     ;   ;  ;;  ; ;   ;  ;   ;  ;     ;; ;   
-;     ;   ;   ;  ;    ;  ;    ;  ;   ;  ;           ;         ;  ;   ;  ; ;       ;  ;       ;    
-;;   ;   ;;;;;  ;    ;  ;    ;  ;;;;;  ;    ;;;;;  ;      ;;;;  ;   ;  ; ;    ;;;;   ;;     ; ;; 
-;  ;   ;      ;    ;  ;    ;  ;      ;           ;     ;   ;  ;   ;  ; ;   ;   ;     ;   ; ;  ;
-;  ;   ;      ;;   ;  ;;   ;  ;      ;           ;     ;   ;  ;   ;  ;;    ;   ;     ;  ;  ;  ;
-;;;    ;;  ;;;;  ; ;;;   ; ;;;    ;;;;  ;            ;;;   ;;;;; ;   ;   ;     ;;;;; ;;;  ;    ;; 
-;       ;                                                                        
-;       ;                                                                        
-
-;; the stepper-canvas% overrides the editor-canvas simply so that on-size messages get passed to
-;; the enclosed editor.
-
-(define stepper-canvas%
-  (class editor-canvas% 
-    (inherit get-editor)
-    (override*
-     [on-size
-      (lambda (width height)
-        (super on-size width height)
-        (let ([editor (get-editor)])
-          (when editor
-            (send editor reset-width this))))])
-    
-    (super-instantiate ())))
-
-;;    ;
-;                                             ;                 ;  ;  ;  ; 
-;;; ;;;;  ;;;   ; ;;;   ; ;;;    ;;;   ; ;;       ;;;;  ;;;  ;    ; ;;;;;  ; ;  
-;     ;   ;   ;  ;;   ;  ;;   ;  ;   ;  ;;          ;   ;   ;  ;  ;   ;   ;; ;   
-;     ;   ;   ;  ;    ;  ;    ;  ;   ;  ;           ;   ;   ;   ;;    ;     ;    
-;;   ;   ;;;;;  ;    ;  ;    ;  ;;;;;  ;    ;;;;;  ;   ;;;;;   ;;    ;     ; ;; 
-;  ;   ;      ;    ;  ;    ;  ;      ;           ;   ;       ;;    ;    ; ;  ;
-;  ;   ;      ;;   ;  ;;   ;  ;      ;           ;   ;      ;  ;   ;   ;  ;  ;
-;;;    ;;  ;;;;  ; ;;;   ; ;;;    ;;;;  ;            ;;  ;;;; ;    ;   ;;;    ;; 
-;       ;                                                       
-;       ;                                                       
-
-; the stepper-text% is the principal inhabitant of the stepper window. It keeps
-; track of all of the sexps & error messages in a given step, reformatting as necessary.
-
-;; constructor : ((union (listof sexp) string) (union (listof sexp) string) -> )
-
-(define stepper-text%
-  (class f:text:standard-style-list%
-    
-    (init-field left-side right-side show-inexactness?)
-    
-    (inherit find-snip insert change-style highlight-range last-position lock erase auto-wrap
-             begin-edit-sequence end-edit-sequence get-start-position get-style-list set-style-list
-             get-admin get-snip-location get-dc needs-update hide-caret)
-    (public* [reset-width 
-              (lambda (canvas)
-                (lock #f)
-                (begin-edit-sequence)
-                (let* ([width-box (box 0)]
-                       [canvas-width (begin (send (get-admin) get-view #f #f width-box #f) (unbox width-box))]
-                       [dc (send canvas get-dc)])
-                  (unless (and old-width (= canvas-width old-width))
-                    (let* ([minus-cursor-margin (- canvas-width 2)]
-                           [vert-separator-width-box (box 0)]
-                           [_ (send vert-separator get-extent dc 0 0 vert-separator-width-box
-                                    #f #f #f #f #f)]
-                           [vert-separator-width (unbox vert-separator-width-box)]
-                           [minus-center-bar (- minus-cursor-margin vert-separator-width)]
-                           [l-r-box-widths (floor (/ minus-center-bar 2))])
-                      (send before-snip set-new-width l-r-box-widths canvas)
-                      (send after-snip set-new-width l-r-box-widths canvas)
-                      (coordinate-snip-sizes))
-                    (set! old-width canvas-width))
-                  (end-edit-sequence)
-                  (lock #t)))])
-    
-    (define old-width #f)
-    (define before-snip (make-object stepper-editor-snip%))
-    (define vert-separator (make-object vertical-separator-snip% 10))
-    (define after-snip (make-object stepper-editor-snip%))
-    
-    ;; coordinate-snip-sizes : make the vertical separator snip the right size, then notify the administrator.
-    (define/private (coordinate-snip-sizes)
-      (let* ([get-snip-height
-              (lambda (snip)
-                (let* ([top-box (box 0)]
-                       [bottom-box (box 0)])
-                  (get-snip-location snip #f top-box #f)
-                  (get-snip-location snip #f bottom-box #t)
-                  (- (unbox bottom-box) (unbox top-box))))]
-             [max-height (max (get-snip-height before-snip) (get-snip-height after-snip))])
-        (send vert-separator set-height! (- max-height 4))
-        (let ([w-box (box 0)]
-              [h-box (box 0)])
-          (send vert-separator get-extent #f 0 0 w-box h-box #f #f #f #f)
-          (send (send vert-separator get-admin) resized vert-separator #t))))
-    
-    
-    
-    (super-instantiate ())
-    (hide-caret #t)
-    
-    ;; insert the editor-snips & separator-snip, and change the style.
-    (let ([before-position (last-position)])
-      (for-each (lambda (x) (insert x)) ;; NB: eta-expansion necessary because insert is a method, not a procedure.
-                (list before-snip vert-separator after-snip))
-      (change-style snip-delta before-position (last-position)))
-    
-    ;; attach the editors to the snips, and populate those editors.
-    
-    (define (setup-editor-snip snip error-or-exps highlight-color)
-      (send snip set-editor 
-            (cond [(string? error-or-exps) 
-                   (make-object stepper-sub-error-text% error-or-exps)]
-                  [else 
-                   (make-object stepper-sub-text% error-or-exps highlight-color show-inexactness?)])))
-    
-    (setup-editor-snip before-snip left-side redex-highlight-color)
-    (setup-editor-snip after-snip right-side reduct-highlight-color)
-    
-    
-    
-    
-    (lock #t)))
-
-(define finished-text
-  (instantiate (class text%
-                 (define/public (reset-width arg)
-                   (void))
-                 
-                 (super-instantiate ())
-                 
-                 (inherit insert lock)
-                 (insert (string-constant stepper-complete))
-                 (lock #t)) 
-    ()))
-
-(define (snip? val)
-  (is-a? val snip%))
-
-(define warning-color "yellow")
-(define warning-font (send the-font-list find-or-create-font 18 'decorative 'normal 'bold #f))
-
-(define stepper-warning%
-  (class canvas%
-    
-    (init-field warning-str)
-    
-    (inherit get-dc get-client-size)
-    (define/override (on-paint)
-      (let ([dc (get-dc)])
-        (send dc set-font warning-font) 
-        (let-values ([(cw ch) (get-client-size)]
-                     [(tw th dont-care dont-care2) (send dc get-text-extent warning-str)])
-          (send dc set-pen (send the-pen-list find-or-create-pen warning-color 1 'solid))
-          (send dc set-brush (send the-brush-list find-or-create-brush warning-color 'solid))
-          (send dc draw-rectangle 0 0 cw ch)
-          (send dc draw-text 
-                warning-str
-                (- (/ cw 2) (/ tw 2))
-                (- (/ ch 2) (/ th 2))))))
-    
-    (super-instantiate ())
-    (inherit min-width min-height stretchable-height)
-    (let-values ([(tw th dc dc2) (send (get-dc) get-text-extent warning-str warning-font)])
-      (min-width (+ 2 (inexact->exact (ceiling tw))))
-      (min-height (+ 2 (inexact->exact (ceiling th)))))
-    
-    (stretchable-height #f)))
-
-
-;                                                                                          
-;                                                                                          
-;                                                                                          
-;                    ;                                                                     
-;                                                                                          
-;          ;                             ;                                                 
-;    ;;;  ;;;;  ; ;  ;   ; ;;           ;;;;   ;;;             ;;;    ;;;  ;     ;  ; ;;   
-;   ;      ;    ;;   ;   ;;  ;           ;    ;   ;           ;      ;   ;  ;   ;   ;;  ;  
-;   ;;     ;    ;    ;   ;    ;          ;   ;     ;          ;;    ;    ;   ; ;    ;    ; 
-;    ;;    ;    ;    ;   ;    ;  ;;;;;;  ;   ;     ;  ;;;;;;   ;;   ;;;;;;    ;     ;    ; 
-;      ;   ;    ;    ;   ;    ;          ;   ;     ;             ;  ;        ; ;    ;    ; 
-;      ;   ;    ;    ;   ;;  ;           ;    ;   ;              ;   ;      ;   ;   ;;  ;  
-;   ;;;     ;;  ;    ;   ; ;;             ;;   ;;;            ;;;     ;;;; ;     ;  ; ;;   
-;                        ;                                                          ;      
-;                        ;                                                          ;      
-;                        ;                                                          ;      
-
-
-; strip-to-sexp transforms a syntax-object to an s-expression.  The reason we can't
-; just use syntax-object->datum for this is that certain syntax-objects must be
-; represented by a gensym'ed pointer into a table.
-
-(define (strip-to-sexp stx highlight-table)
-  (define (strip-regular stx)
-    (let* ([it (if (and (syntax? stx)
-                        (eq? (stepper-syntax-property stx 'stepper-hint) 'from-xml))
-                   (strip-xml stx)
-                   stx)]
-           [it
-            (cond [(pair? it)
-                   (cons (strip-regular (car it))
-                         (strip-regular (cdr it)))]
-                  [(syntax? it)
-                   (strip-regular (syntax-e it))]
-                  [else it])]
-           [it
-            (if (and (syntax? stx)
-                     (stepper-syntax-property stx 'stepper-highlight))
-                (if (pair? it) 
-                    (begin
-                      (hash-set! highlight-table it 'non-confusable)
-                      it)
-                    (let ([new-sym (gensym "-placeholder")])
-                      (hash-set! highlight-table new-sym (list it))
-                      new-sym))
-                it)])
-      it))
-  
-  ; strip-xml attempts to undo the expansion of quasiquote.  
-  (define (strip-xml stx)
-    ; we'll work on this later.
-    "<xml box here>"
-    ;(instantiate xml-snip% () [eliminate-whitespace-in-tags? #t])
-    )
-  
-  (strip-regular stx))
-
-;; the bitmap to use in a horizontal or vertical toolbar:
-(define step-img (compiled-bitmap (step-icon #:color run-icon-color #:height (toolbar-icon-height))))
-
-;; testing code
-
-(define (stepper-text-test . args)
-  (let* ([new-frame (make-object frame% "test-frame")]
-         [new-text (apply make-object stepper-text% args)]
-         [new-canvas (make-object stepper-canvas% new-frame new-text)])
-    (send new-canvas min-width 200)
-    (send new-canvas min-height 200)
-    (send new-frame show #t)
-    (send new-text reset-width new-canvas)
-    new-canvas))
-
-
-#;(define a
-    (stepper-text-test (build-stx-with-highlight `((* 13 (hilite (* 15 16)))))
-                       (build-stx-with-highlight `((hilite (+ 3 4)) (define y 4) 13 14 (+  (hilite 13) (hilite #f)) 13 
-                                                                    298 1 1 (+ (x 398 (hilite (+ x 398))) (hilite (x 398 (+ x 398)))) (hilite #f)))
-                       #t))
-
-;; test out scroll bars
-#;(stepper-text-test (build-stx-with-highlight `(1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8))
-                     (build-stx-with-highlight `(free!))
-                     #t)
-
-#;(stepper-text-test  `() "This is an error message" #t)
-
-#;(stepper-text-test  "This is another error message" `(poomp) #t)
-  
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/my-macros.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/my-macros.rkt
deleted file mode 100644
index 2030750415..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/my-macros.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         racket/match)
-
-;;;;;;;;;;
-;;
-;;  paul graham's [ _ ] macro
-;;
-;;;;;;;;;;
-
-(provide lx)
-
-(define-syntax (lx stx)
-  (syntax-case stx ()
-    [(lx term)
-     (with-syntax ([binder (datum->syntax (syntax term) `_)])
-       (syntax (lambda (binder) term)))]))
-  
-
-
-;;;;;;;;;;
-;;
-;;  ccond implementation
-;; 
-;;;;;;;;;;
-
-(provide ccond)
-
-(define-syntax (ccond stx)
-  (syntax-case stx ()
-    [(_ (question answer) ...)
-     (syntax
-      (cond
-        (question answer) ...
-        (else (error 'ccond "fell off end of cond expression"))))]))
-
-
-
-;;;;;;;;;;
-;;
-;;  2vals implementation
-;; 
-;;;;;;;;;;
-
-
-;; honestly, match-let* supersedes all of this, if I ever have time to redo it...
-
-(provide 2vals-map apply-to-first-of-2vals)
-
-(define (apply-to-first-of-2vals proc 2vals)
-  (vector (proc (vector-ref 2vals 0))
-          (vector-ref 2vals 1)))
-
-; 2vals-map : (('a -> (2vals 'b 'c)) ('a list)) -> (2vals ('b list) ('c list))
-;  dual-map is like map, only for a procedure that returns (values a b), and its
-;  result is (values a-list b-list)... the contract specifies this more clearly.
-
-(define (2vals-map f . lsts)
-  (if (null? (car lsts))
-      (vector null null)
-      (match-let* ([(vector a b) (apply f (map car lsts))]
-                   [(vector a-rest b-rest) (apply 2vals-map f (map cdr lsts))])
-        (vector (cons a a-rest) (cons b b-rest)))))
-
-; test cases
-; (require my-macros)
-;
-;(= (2vals-first (2vals 3 4)) 3)
-;(= (2vals-second (2vals 3 4)) 4)
-;
-;(= 
-; (let*-2vals
-;     ([a (2vals 3 4)]
-;      [(b c) a])
-;   a
-;   c)
-; 4)
-;
-;(make-contract-checker my-type (lambda (x) (= x 3)))
-;
-;(contract-check-my-type? 3 'second-arg)
-;;(contract-check-my-type? 14 'first-arg)
-;
-;((checked-lambda (x (y my-type) (z my-type))
-;    (+ x y z))
-; 3 3 5)
-;
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/reconstruct.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/reconstruct.rkt
deleted file mode 100644
index bc927487a2..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/reconstruct.rkt
+++ /dev/null
@@ -1,1155 +0,0 @@
-; general assertions about reconstruction:
-; a varref can only occur at the top of a mark-list
-; a varref at the top of the mark-list must either be a top-level-variable
-;  or have a value in some mark somewhere (or both).
-
-#lang scheme/base
-
-(require (prefix-in kernel: syntax/kerncase)
-           mzlib/list
-           mzlib/etc
-	   mzlib/contract
-           scheme/match
-           "marks.rkt"
-           "model-settings.rkt"
-           "shared.rkt"
-           "syntax-property.rkt"
-           "my-macros.rkt"
-           (for-syntax scheme/base)
-           racket/private/promise)
-
-(provide/contract 
- [reconstruct-completed (syntax? 
-                         (or/c (listof natural-number/c) false/c)
-                         (-> (listof any/c))
-                         render-settings? 
-                         . -> .
-                         (vector/c syntax? boolean?))]
- [hide-completed? (syntax? . -> . boolean?)]
- 
- ;; front ends for reconstruct-current
- [reconstruct-left-side (mark-list?
-                         (or/c (listof any/c) false/c)
-                         render-settings?
-                         . -> .
-                         syntax?)]
- [reconstruct-right-side (mark-list?
-                          (or/c (listof any/c) false/c)
-                          render-settings?
-                          . -> .
-                          syntax?)]
- [reconstruct-double-break (mark-list?
-                            render-settings?
-                            . -> . 
-                            (list/c syntax? syntax?))]
- 
- [skip-step? (-> break-kind? (or/c mark-list? false/c) render-settings? boolean?)]
- [step-was-app? (-> mark-list? boolean?)]
- 
- [reset-special-values (-> any)])
-
-(define nothing-so-far (gensym "nothing-so-far-"))
-
-; the let-glump is a structure that contains the reconstruct-time data about
-; a let-binding; that is, the names on the left-hand-side, the expression on
-; the right-hand side, and the values computed.
-
-(define-struct let-glump (name-set exp val-set))
-
-; split-list : ('a -> boolean) (listof 'a) -> (vector (listof 'a) (listof 'a))
-; split-list splits a list into two lists at the first element s.t. (fn element) => true).
-; that is, split-list yields the lists A and B such that (append A B) gives the original
-; list, and (fn element) => false for all elements in A, and B is either empty or
-; (fn (car B)) => true
-
-(define (split-list fn lst)
-  (let loop ([remaining lst] [so-far null]) 
-    (cond [(null? remaining)
-           (vector (reverse so-far) null)]
-          [else
-           (if (fn (car remaining))
-               (vector (reverse so-far) remaining)
-               (loop (cdr remaining) (cons (car remaining) so-far)))])))
-
-; test cases
-; (test (vector '(93 4 2) '(0 2 1)) split-list (lambda (x) (= x 0)) '(93 4 2 0 2 1))
-; (test (vector '(3 4 5) '()) split-list (lambda (x) (= x 0)) '(3 4 5))
-
-; n-split-list : num ('a list) -> ('a list) ('a list)
-; n-split-list splits a given list A into two lists B and C, such that B contains the
-; first n elements of A, and C contains the rest.
-
-(define (n-split-list num lst)
-  (when (> num (length lst))
-    (error 'n-split-list "can't split list ~a after ~ath element; not long enough" lst num))
-  (let loop ([count num] [remaining lst] [so-far null])
-    (if (= count 0)
-        (vector (reverse so-far) remaining)
-        (loop (- count 1) (cdr remaining) (cons (car remaining) so-far)))))
-
-; test cases
-; (test (vector '(a b c) '(d e f)) n-split-list 3 '(a b c d e f))
-
-
-(define (mark-as-highlight stx)
-  (stepper-syntax-property stx 'stepper-highlight #t))
-;               
-;               
-; ;;  ;;;    ;;;   ;;;   ; ;;         ;   ;   ;;;   ;  ;   ;   ;;;  
-;;   ;   ;  ;     ;   ;  ;;  ;        ;   ;  ;   ;  ;  ;   ;  ;   ; 
-;    ;   ;  ;     ;   ;  ;   ;         ; ;       ;  ;  ;   ;  ;   ; 
-;    ;;;;;  ;     ;   ;  ;   ;  ;;;;;  ; ;    ;;;;  ;  ;   ;  ;;;;; 
-;    ;      ;     ;   ;  ;   ;         ; ;   ;   ;  ;  ;   ;  ;     
-;    ;      ;     ;   ;  ;   ;         ;;    ;   ;  ;  ;  ;;  ;     
-;     ;;;;   ;;;   ;;;   ;   ;          ;     ;;;;; ;   ;; ;   ;;;; 
-
-
-; recon-value print-converts a value.  If the value is a closure, recon-value
-; prints the name attached to the procedure, unless we're on the right-hand-side
-; of a let, or unless there _is_ no name.
-
-(define recon-value
-  (opt-lambda (val render-settings [assigned-name #f] 
-                   [current-so-far nothing-so-far] [seen-promises null])
-    (if (hash-ref finished-xml-box-table val (lambda () #f))
-        (stepper-syntax-property #`(quote #,val) 'stepper-xml-value-hint 'from-xml-box)
-        (let* ([extracted-proc (unwrap-proc val)]
-               [closure-record (and (annotated-proc? extracted-proc)
-                                    (annotated-proc-info extracted-proc))])
-          (cond
-            [closure-record
-             (let* ([mark (closure-record-mark closure-record)]
-                    [base-name (closure-record-name closure-record)])
-               (if base-name
-                   (let* ([lifted-index 
-                           (closure-record-lifted-index closure-record)]
-                          [name 
-                           (if lifted-index
-                               (construct-lifted-name base-name lifted-index)
-                               base-name)])
-                     (if (and assigned-name 
-                              (free-identifier=? base-name assigned-name))
-                         (recon-source-expr 
-                          (mark-source mark) (list mark) null null render-settings)
-                         #`#,name))
-                   (recon-source-expr 
-                    (mark-source mark) (list mark) null null render-settings)))]
-            ; promise does not have annotation info,
-            ; must be from library code, or it's a running promise
-            ; or it's a nested promise?
-            [(promise? val)
-             (cond 
-               ; running promise cached by recon-inner
-               [(or (hash-ref partially-evaluated-promises-table val (λ () #f))
-                    ; can be an extra promise layer when dealing with lists
-                    (hash-ref partially-evaluated-promises-table (pref val) (λ () #f)))]
-               ; running promise not found by search in recon-inner
-               ; must be a nested running promise
-               [(and (nested-promise-running? val)
-                     (not (eq? current-so-far nothing-so-far)))
-                (hash-set! partially-evaluated-promises-table val current-so-far)
-                current-so-far]
-               #;[(and (nested-promise-running? val)
-                       (not (null? last-so-far)))
-                  last-so-far]
-               ; promise is not running if we get here
-               [(and (promise-forced? val)
-                     (not (nested-promise-running? val))
-                     (not (assq val seen-promises)))
-                (recon-value (force val) render-settings 
-                             assigned-name current-so-far 
-                             (cons (list val assigned-name) seen-promises))]
-               ; for cyclic lists, use assigned name if it's available
-               [(let ([v (assq val seen-promises)])
-                  (and v (second v)))]
-               ; unknown promise: promise not in src code, created in library fn
-               [(hash-ref unknown-promises-table val (λ () #f))
-                =>
-                render-unknown-promise]
-               [else ; else generate a fresh unknown promise
-                (begin0
-                  (render-unknown-promise next-unknown-promise)
-                  (hash-set! unknown-promises-table
-                             val next-unknown-promise)
-                  (set! next-unknown-promise 
-                        (add1 next-unknown-promise)))])]
-            ; STC: handle lists here, instead of deferring to render-to-sexp fn
-            ; because there may be nested promises
-            #;[(null? val) #'empty]
-            [(and (not (null? val))
-                  (list? val)
-                  (ormap promise? val))
-             (with-syntax 
-                 ([(reconed-vals ...)
-                   (map 
-                    (lx (recon-value _ render-settings #f current-so-far seen-promises))
-                    val)])
-               (if (render-settings-constructor-style-printing? render-settings)
-                   #'(#%plain-app list reconed-vals ...)
-                   #'`(reconed-vals ...)))]
-            [(and (pair? val)
-                  (or (promise? (car val))
-                      (promise? (cdr val))))
-             (with-syntax 
-                 ([reconed-car
-                   (recon-value (car val) render-settings 
-                                #f current-so-far seen-promises)]
-                  [reconed-cdr
-                   (recon-value (cdr val) render-settings 
-                                #f current-so-far seen-promises)])
-               #'(#%plain-app cons reconed-car reconed-cdr))]
-            [else
-             (let* ([rendered 
-                     ((render-settings-render-to-sexp render-settings) val)])
-               (if (symbol? rendered)
-                   #`#,rendered
-                   #`(quote #,rendered)))])))))
-
-; STC: helper fns for recon-value, to reconstruct promises
-; extract-proc-if-struct : any -> procedure? or any
-; Purpose: extracts closure from struct procedure, ie lazy-proc in lazy racket
-(define (extract-proc-if-struct f)
-  (if (and (procedure? f) (not (annotated-proc? f)))
-      (or (procedure-extract-target f)
-          f)
-      f))
-; extract-proc-if-promise : any -> thunk or any
-(define (extract-proc-if-promise p)
-  (if (promise? p) 
-      (extract-proc-if-promise (pref p))
-      p))
-; unwraps struct or promise around procedure
-(define (unwrap-proc f)
-  (extract-proc-if-promise (extract-proc-if-struct f)))
-
-; nested-promise-running? : Indicates whether a promise is in the "running" 
-; state. promise-running? in racket/private/promise.rkt only looks down
-; one level for a running promise
-(define (nested-promise-running? p)
-  (if (promise? p)
-      (let ([v (pref p)])
-        (or (running? v)
-            (and (promise? v)
-                 (nested-promise-running? v))))
-      (raise-type-error 'nested-promise-running? "promise" p)))
-
-; weak hash table to keep track of partially evaluated promises
-; where keys = promises, values = syntax
-; - initialized on each call to reconstruct-current 
-;   (ie - each half-step reconstruction)
-; - populated on each call to recon-inner
-(define partially-evaluated-promises-table null)
-
-; unknown-promises-table : keep track of unknown promises
-; ie, promises created from lib fns
-(define unknown-promises-table null)
-(define next-unknown-promise 0)
-
-;; NaturalNumber -> syntax    
-(define (render-unknown-promise x)
-  #`(quote #,(string->symbol 
-              (string-append "<DelayedEvaluation#" (number->string x) ">"))))
-
-; This is used when we need the exp associated with a running promise, but the promise is at
-; top-level, so it never gets added to partially-evaluated-promises-table
-; This is a huge hack and I dont know if it the assumptions I'm making always hold
-;  (ie - that the exp associated with any running promise not in 
-;  partially-evaluated-promises-table is the last so-far), 
-;  but it's working for all test cases so far 10/29/2010.
-;  Another solution is to wrap all lazy programs in a dummy top-level expression???
-;  Update 11/1/2010: needed to add the following guards in the code to make the assumptions 
-;  hold 
-;                    (guards are mainly triggered when there are infinite lists)
-;  - in recon-inner, dont add running promise to partially-evaluated-promises-table if 
-;    so-far = nothing-so-far
-;  - in recon, dont set last-so-far when so-far = nothing-so-far 
-;  - in recon-value, dont use last-so-far if it hasnt been set (ie - if it's still null)
-(define last-so-far null)
-;       ;      ;                                                                     ;;;
-;       ;                                                          ;                    ;
-;  ;;;  ;   ;  ;  ; ;;;         ;    ; ;    ; ;    ;          ;;; ;;;;  ;;;   ; ;;;     ;
-; ;     ;  ;   ;  ;;   ;         ;  ;   ;  ;   ;  ;          ;     ;   ;   ;  ;;   ;    ;
-; ;     ; ;    ;  ;    ;          ;;     ;;     ;;           ;     ;   ;   ;  ;    ;   ;
-;  ;;   ;;     ;  ;    ;  ;;;;;   ;;     ;;     ;;    ;;;;;   ;;   ;   ;;;;;  ;    ;  ;
-;    ;  ; ;    ;  ;    ;          ;;     ;;     ;;              ;  ;   ;      ;    ;  ;
-;    ;  ;  ;   ;  ;;   ;         ;  ;   ;  ;   ;  ;             ;  ;   ;      ;;   ;
-; ;;;   ;   ;  ;  ; ;;;         ;    ; ;    ; ;    ;         ;;;    ;;  ;;;;  ; ;;;   ;
-;                 ;                                                           ;
-;                 ;                                                           ;
-
-(define (skip-step? break-kind mark-list render-settings)
-  (case break-kind
-    [(result-value-break)
-     (and (pair? mark-list)
-          (let ([expr (mark-source (car mark-list))])
-            (stepper-syntax-property expr 'stepper-hide-reduction)))]
-    [(result-exp-break)
-     ;; skip if clauses that are the result of and/or reductions
-     (let ([and/or-clauses-consumed (stepper-syntax-property (mark-source (car mark-list)) 
-                                                            'stepper-and/or-clauses-consumed)])
-       (and and/or-clauses-consumed
-            (> and/or-clauses-consumed 0)))]
-    [(normal-break normal-break/values)
-     (skip-redex-step? mark-list render-settings)]
-    [(double-break)
-     (or 
-      ;; don't stop for a double-break on a let that is the expansion of a 'begin'
-      (let ([expr (mark-source (car mark-list))])
-        (eq? (stepper-syntax-property expr 'stepper-hint) 'comes-from-begin))
-      (not (render-settings-lifting? render-settings)))]
-    [(expr-finished-break define-struct-break late-let-break) #f]))
-
-;; skip-redex-step : mark-list? render-settings? -> boolean?
-(define (skip-redex-step? mark-list render-settings)
-  
-  (define (varref-skip-step? varref)
-    (with-handlers ([exn:fail:contract:variable? (lambda (dc-exn) #f)])
-      (let ([val (lookup-binding mark-list varref)])
-        (equal? (syntax->interned-datum (recon-value val render-settings))
-                (syntax->interned-datum 
-                 (case (stepper-syntax-property varref 'stepper-binding-type)
-                   ([let-bound]
-                    (binding-lifted-name mark-list varref))
-                   ([non-lexical]
-                    varref)
-                   (else
-                    (error 'varref-skip-step? 
-                           "unexpected value for stepper-binding-type: ~e for variable: ~.s\n"
-                           (stepper-syntax-property varref 'stepper-binding-type)
-                           varref))))))))
-  
-  (and (pair? mark-list)
-       (let ([expr (mark-source (car mark-list))])
-         (or (stepper-syntax-property expr 'stepper-hide-reduction)
-             (kernel:kernel-syntax-case 
-              expr #f
-              [id
-               (identifier? expr)
-               (case (stepper-syntax-property expr 'stepper-binding-type)
-                 [(lambda-bound) #t]  ; don't halt for lambda-bound vars
-                 [(let-bound)
-                  (varref-skip-step? expr)]
-                 [(non-lexical)
-                  (varref-skip-step? expr)])]
-              [(#%top . id-stx)
-               (varref-skip-step? #`id-stx)]
-              [(#%plain-app . terms)
-               ; don't halt for proper applications of constructors
-               (let ([fun-val (lookup-binding mark-list (get-arg-var 0))])
-                 (and (procedure? fun-val)
-                      (procedure-arity-includes? 
-                       fun-val
-                       (length (cdr (syntax->list (syntax terms)))))
-                      (or (and (render-settings-constructor-style-printing? render-settings)
-                               (if (render-settings-abbreviate-cons-as-list? render-settings)
-                                   (eq? fun-val special-list-value)
-                                   (and (eq? fun-val special-cons-value)
-                                        (second-arg-is-list? mark-list))))
-                          ;(model-settings:special-function? 'vector fun-val)
-                          (and (eq? fun-val void)
-                               (eq? (cdr (syntax->list (syntax terms))) null))
-                          (struct-constructor-procedure? fun-val))))]
-              [else #f])))))
-
-;; find-special-value finds the value associated with the given name.  Applications of 
-;; functions like 'list' should not be shown as steps, because the before and after steps will 
-;; be the same.  it might be easier simply to discover and discard these at display time.
-(define (find-special-value name valid-args)
-  (let* ([expanded-application (expand (cons name valid-args))]
-         [stepper-safe-expanded (skipto/auto expanded-application 'discard (lambda (x) x))]
-         [just-the-fn 
-          (kernel:kernel-syntax-case 
-           (syntax-disarm stepper-safe-expanded saved-code-inspector) #f
-           ; STC: lazy racket case
-           ;      Must change this case if lazy language changes!
-           [(#%plain-app 
-             (#%plain-app toplevelforcer)
-             (#%plain-app extra-lazy-lambda (#%plain-app force fn) . args))
-            (and (eq? (syntax->datum #'toplevelforcer) 'toplevel-forcer)
-                 (eq? (syntax->datum #'force) '!))
-            #'fn]
-           [(#%plain-app fn . rest) #`fn]
-           [else (error 'find-special-name "couldn't find expanded name for ~a" name)])])
-    (eval just-the-fn)))
-
-;; these are delayed so that they use the userspace expander.  I'm sure
-;; there's a more robust & elegant way to do this.
-(define special-list-value #f)
-(define special-cons-value #f)
-
-(define (reset-special-values)
-  (set! special-list-value (find-special-value 'list '(3)))
-  (set! special-cons-value (find-special-value 'cons '(3 empty)))
-  (set! unknown-promises-table (make-weak-hash))
-  (set! next-unknown-promise 0))
-
-(define (second-arg-is-list? mark-list)
-  (let ([arg-val (lookup-binding mark-list (get-arg-var 2))])
-    (list? arg-val)))
-
-;   ; static-binding-indexer (z:parsed -> integer)
-;  
-;  (define static-binding-indexer
-;    (let* ([name-number-table (make-hash-table)]
-;           [binding-number-table (make-hash-table-weak)])
-;      (lambda (binding)
-;        (cond [(hash-table-get binding-number-table binding (lambda () #f)) =>
-;               (lambda (x) x)]
-;              [else (let* ([orig-name (z:binding-orig-name binding)]
-;                           [old-index (hash-table-get name-number-table orig-name (lambda () -1))]
-;                           [new-index (+ old-index 1)])
-;                      (hash-table-put! name-number-table orig-name new-index)
-;                      (hash-table-put! binding-number-table binding new-index)
-;                      new-index)]))))
-
-; construct-lifted-name 
-; (-> syntax? (or/c num? false/c) symbol?)
-
-(define/contract construct-lifted-name
-  (-> syntax? number? syntax?)
-  (lambda (binding dynamic-index)
-    #`#,(string->symbol
-         (string-append (symbol->string (syntax-e binding)) "_" 
-                        (number->string dynamic-index)))))
-
-; binding-lifted-name
-
-(define/contract binding-lifted-name
-  (-> mark-list? syntax? syntax?)
-  (lambda (mark-list binding)
-    (construct-lifted-name binding (lookup-binding mark-list (get-lifted-var binding)))))
-
-
-(define (step-was-app? mark-list)
-  (and (not (null? mark-list))
-       (syntax-case (mark-source (car mark-list)) (#%plain-app)
-         [(#%plain-app . rest)
-          #t]
-         [else
-          #f])))
-
-
-
-
-
-; ;;  ;;;    ;;;   ;;;   ; ;;           ;;;   ;;;   ;   ;  ; ;;  ;;;   ;;;           ;;;  ;    ;  ; ;;;   ; ;;
-;;   ;   ;  ;     ;   ;  ;;  ;         ;     ;   ;  ;   ;  ;;   ;     ;   ;         ;   ;  ;  ;   ;;   ;  ;;  
-;    ;   ;  ;     ;   ;  ;   ;         ;     ;   ;  ;   ;  ;    ;     ;   ;         ;   ;   ;;    ;    ;  ;   
-;    ;;;;;  ;     ;   ;  ;   ;  ;;;;;   ;;   ;   ;  ;   ;  ;    ;     ;;;;;  ;;;;;  ;;;;;   ;;    ;    ;  ;   
-;    ;      ;     ;   ;  ;   ;            ;  ;   ;  ;   ;  ;    ;     ;             ;       ;;    ;    ;  ;   
-;    ;      ;     ;   ;  ;   ;            ;  ;   ;  ;  ;;  ;    ;     ;             ;      ;  ;   ;;   ;  ;   
-;     ;;;;   ;;;   ;;;   ;   ;         ;;;    ;;;    ;; ;  ;     ;;;   ;;;;          ;;;; ;    ;  ; ;;;   ;   
-;           
-;           
-
-
-; recon-source-expr 
-
-; recon-source-expr produces the reconstructed version of a given source epxression, using the 
-; binding information contained in the binding-list.  This happens during reconstruction 
-; whenever we come upon expressions that we haven't yet evaluated. 
-
-; NB: the variable 'dont-lookup' contains a list of variables whose bindings occur INSIDE the 
-; expression being evaluated, and hence do not yet have values.
-
-; the 'use-lifted-names' vars are those bound by a let which does have lifted names.  it is 
-; used in rendering the lifting of a let or local to show the 'after' step, which should show 
-; the lifted names.
-
-(define/contract recon-source-expr 
-  (-> syntax? mark-list? binding-set? binding-set? render-settings? syntax?)
-  (lambda (expr mark-list dont-lookup use-lifted-names render-settings)
-    
-    (define (recur expr) (recon-source-expr expr mark-list dont-lookup 
-                                            use-lifted-names render-settings))
-    (define (let-recur expr bindings)
-      (recon-source-expr expr mark-list (append bindings dont-lookup) 
-                         use-lifted-names render-settings))
-    
-    (skipto/auto
-     expr
-     'discard
-     (lambda (expr)
-   
-       (define (recon-basic)
-         (with-syntax ([(label . bodies) expr])
-           #`(label #,@(map recur (filter-skipped (syntax->list (syntax bodies)))))))
-       (define (recon-let/rec rec?)
-         
-         (with-syntax ([(label  ((vars val) ...) body ...) expr])
-           (let* ([bindings (map syntax->list (syntax->list (syntax (vars ...))))]
-                  [binding-list (apply append bindings)]
-                  [recur-fn (if rec? 
-                                (lambda (expr) (let-recur expr binding-list))
-                                recur)]
-                  [right-sides (map recur-fn (syntax->list (syntax (val ...))))]
-                  [recon-bodies (map (lambda (x) (let-recur x binding-list))
-                                     (syntax->list #`(body ...)))])
-             (with-syntax 
-                 ([(recon-val ...) right-sides]
-                  [(recon-body ...) recon-bodies]
-                  [(new-vars ...) 
-                   (map (lx (map (lx (if (ormap (lambda (binding)
-                                                  (bound-identifier=? binding _))
-                                                use-lifted-names)
-                                         (stepper-syntax-property 
-                                          _
-                                          'stepper-lifted-name
-                                          (binding-lifted-name mark-list _))
-                                         _))
-                                 _))
-                        bindings)])
-               (syntax (label ((new-vars recon-val) ...) recon-body ...))))))
-       
-       (define (recon-lambda-clause clause)
-         (with-syntax ([(args . bodies-stx) clause])
-           (let* ([arglist (arglist-flatten #'args)]
-                  [bodies (map (lambda (body) (let-recur body arglist))
-                               (filter-skipped (syntax->list (syntax bodies-stx))))])
-             (cons (syntax args) bodies))))
-       
-       
-       (define (recon)
-         (kernel:kernel-syntax-case 
-          expr #f
-          
-          ; lambda
-          [(#%plain-lambda . clause-stx)
-           (let* ([clause (recon-lambda-clause (syntax clause-stx))])
-             #`(#%plain-lambda #,@clause))]
-          
-          ; case-lambda
-          [(case-lambda . clauses-stx)
-           (let* ([clauses (map recon-lambda-clause (syntax->list (syntax clauses-stx)))])
-             #`(case-lambda #,@clauses))]
-          
-          ; if, begin, begin0
-          [(if test then else) (recon-basic)]
-          [(if test then) (recon-basic)]
-          [(begin . bodies) (recon-basic)]
-          [(begin0 . bodies) 
-           (if (stepper-syntax-property expr 'stepper-fake-exp)
-               (if (null? (syntax->list #`bodies))
-                   (recon-value (lookup-binding mark-list begin0-temp) render-settings)
-                   ;; prepend the computed value of the first arg:
-                   #`(begin0 #,(recon-value (lookup-binding mark-list begin0-temp) render-settings)
-                             #,@(map recur (filter-skipped (syntax->list #`bodies)))))
-               (recon-basic))]
-          
-          ; let-values, letrec-values
-          [(let-values . rest) (recon-let/rec #f)]
-          [(letrec-values . rest) (recon-let/rec #t)]
-          
-          ; set! 
-          [(set! var rhs)
-           (let ([rendered-var 
-                  (if (and (ormap (lambda (binding)
-                                    (bound-identifier=? binding #`var))
-                                  dont-lookup)
-                           (not (ormap (lambda (binding)
-                                         (bound-identifier=? binding #`var))
-                                       use-lifted-names)))
-                      #`var
-                      (reconstruct-set!-var mark-list #`var))])
-             #`(set! #,rendered-var #,(recur #'rhs)))]
-          
-          ; quote 
-          [(quote body) (recon-value (eval-quoted expr) render-settings)]
-          
-          ; quote-syntax : like set!, the current stepper cannot handle quote-syntax
-          
-          ; with-continuation-mark
-          [(with-continuation-mark . rest) (recon-basic)]
-          
-          ; application
-          [(#%plain-app . terms) (recon-basic)]
-          
-          ; varref                        
-          [var-stx
-           (identifier? expr)
-           (let* ([var (syntax var-stx)])
-             (if (render-settings-all-bindings-mutable? render-settings)
-                 var
-                 (cond [(eq? (identifier-binding var) 'lexical)
-                        ; has this varref's binding not been evaluated yet?
-                        ; (and this varref isn't in the list of must-lookups?)
-                        (if (and (ormap (lambda (binding)
-                                          (bound-identifier=? binding var))
-                                        dont-lookup)
-                                 (not (ormap (lambda (binding)
-                                               (bound-identifier=? binding var))
-                                             use-lifted-names)))
-                            var
-                            
-                            (case (stepper-syntax-property var 'stepper-binding-type)
-                              ((lambda-bound) 
-                               (recon-value (lookup-binding mark-list var) render-settings))
-                              ((macro-bound)
-                               ; for the moment, let-bound vars occur only in and/or :
-                               (recon-value (lookup-binding mark-list var) render-settings))
-                              ((let-bound)
-                               (if (stepper-syntax-property var 'stepper-no-lifting-info)
-                                   var
-                                   (stepper-syntax-property var
-                                                            'stepper-lifted-name
-                                                            (binding-lifted-name mark-list var))))
-                              ((stepper-temp)
-                               (error 'recon-source-expr "stepper-temp showed up in source?!?"))
-                              ((non-lexical)
-                               (error 
-                                'recon-source-expr 
-                                "can't get here: lexical identifier labeled as non-lexical"))
-                              (else
-                               (error 'recon-source-expr
-                                      "unknown 'stepper-binding-type property: ~a on var: ~a" 
-                                      (stepper-syntax-property var 'stepper-binding-type)
-                                      (syntax->datum var)))))]
-                       [else ; top-level-varref
-                        (fixup-name
-                         var)])))]
-          [(#%top . var)
-           (syntax var)]
-          
-          [else
-           (error 'recon-source "no matching clause for syntax: ~a" (if (syntax? expr)
-                                                                        (syntax->datum expr)
-                                                                        expr))]))
-       (if (stepper-syntax-property expr 'stepper-prim-name)
-           (stepper-syntax-property expr 'stepper-prim-name)
-           (let* ()
-             (attach-info (recon) expr)))))))
-
-;; reconstruct-set!-var
-
-(define (reconstruct-set!-var mark-list var)
-  (case (stepper-syntax-property var 'stepper-binding-type)
-    ((lambda-bound)
-     (error 'reconstruct-inner "lambda-bound variables can't be mutated"))
-    ((macro-bound)
-     ; for the moment, let-bound vars occur only in and/or :
-     (error 'reconstruct-inner "macro-bound variables can't occur in a set!"))
-    ((non-lexical) var)
-    ((let-bound)
-     (stepper-syntax-property var
-                              'stepper-lifted-name
-                              (binding-lifted-name mark-list var)))
-    ((stepper-temp)
-     (error 'recon-source-expr "stepper-temp showed up in source?!?"))
-    (else
-     (error 'recon-source-expr "unknown 'stepper-binding-type property: ~a" 
-            (stepper-syntax-property var 'stepper-binding-type)))))
-
-;; filter-skipped : (listof syntax?) -> (listof syntax?)
-;; filter out any elements of the list with 'stepper-skip-completely set, except those with stepper-prim-name set. (HACK).
-(define (filter-skipped los)
-  (filter (lambda (stx)
-            (or (stepper-syntax-property stx 'stepper-prim-name)
-                (not (stepper-syntax-property stx 'stepper-skip-completely))))
-          los))
-
-
-;; mflatt: MAJOR HACK - work around the prefix on
-;;         beginner name definitions
-(define (fixup-name s)
-  (let ([m (regexp-match re:beginner: (symbol->string (syntax-e s)))])
-    (if m
-        (datum->syntax s (string->symbol (cadr m)) s s)
-        s)))
-(define re:beginner: (regexp "^beginner-(.*)$"))
-
-
-;; eval-quoted : take a syntax that is an application of quote, and evaluate it (for display)
-;; Frankly, I'm worried by the fact that this isn't done at expansion time.
-
-(define (eval-quoted stx)
-  (syntax-case stx (quote)
-    [(quote . dont-care) (eval stx)]
-    [else (error 'eval-quoted "eval-quoted called with syntax that is not a quote: ~v" stx)]))
-
-
-;                     ; 
-;                     ;                                          ;         ;               ; 
-; ;;  ;;;    ;;;   ;;;   ; ;;    ;;; ;;;; ; ;; ;   ;   ;;; ;;;;         ;;;   ;;;   ; ;;; ;;   ; ;;;   ;   ;;;  ;;;;  ;;;    ;;; ; 
-;;   ;   ;  ;     ;   ;  ;;  ;  ;     ;   ;;   ;   ;  ;     ;          ;     ;   ;  ;;  ;;  ;  ;;   ;  ;  ;   ;  ;   ;   ;  ;   ;; 
-;    ;   ;  ;     ;   ;  ;   ;  ;     ;   ;    ;   ;  ;     ;          ;     ;   ;  ;   ;   ;  ;    ;  ;  ;   ;  ;   ;   ;  ;    ; 
-;    ;;;;;  ;     ;   ;  ;   ;   ;;   ;   ;    ;   ;  ;     ;   ;;;;;  ;     ;   ;  ;   ;   ;  ;    ;  ;  ;;;;;  ;   ;;;;;  ;    ; 
-;    ;      ;     ;   ;  ;   ;     ;  ;   ;    ;   ;  ;     ;          ;     ;   ;  ;   ;   ;  ;    ;  ;  ;      ;   ;      ;    ; 
-;    ;      ;     ;   ;  ;   ;     ;  ;   ;    ;  ;;  ;     ;          ;     ;   ;  ;   ;   ;  ;;   ;  ;  ;      ;   ;      ;   ;; 
-;     ;;;;   ;;;   ;;;   ;   ;  ;;;    ;; ;     ;; ;   ;;;   ;;         ;;;   ;;;   ;   ;   ;  ; ;;;   ;   ;;;;   ;;  ;;;;   ;;; ; 
-;                                   
-;                                   
-
-
-; reconstruct-completed : reconstructs a completed expression or definition.  
-; Accepts the source expression, a lifting-index which is either a number (indicating
-;  a lifted binding) or false (indicating a top-level expression), a list of values
-;  currently bound to the bindings, and the language level's render-settings.
-;; returns a vector containing a reconstructed expression and a boolean indicating 
-;; whether this should not be unwound (e.g., is source syntax
-;; from a define-struct).
-
-(define (reconstruct-completed exp lifting-indices vals-getter render-settings)
-  (if lifting-indices
-      (syntax-case exp ()
-        [(vars-stx rhs ...)
-         (let* ([vars (map (lambda (var index) (stepper-syntax-property var 'stepper-lifted-name (construct-lifted-name var index))) 
-                           (syntax->list #`vars-stx)
-                           lifting-indices)])
-           (vector (reconstruct-completed-define exp vars (vals-getter) render-settings) #f))])
-      (let ([exp (skipto/auto exp 'discard (lambda (exp) exp))])
-        (cond 
-          [(stepper-syntax-property exp 'stepper-black-box-expr)
-           ;; the hint contains the original syntax
-           (vector (stepper-syntax-property exp 'stepper-black-box-expr) #t)]
-          ;; for test cases, use the result here as the final result of the expression:
-          [(stepper-syntax-property exp 'stepper-use-val-as-final)
-           (vector (recon-value (car (vals-getter)) render-settings) #f)]
-          [else
-           (vector
-            (kernel:kernel-syntax-case exp #f
-                                       [(define-values vars-stx body)
-                                        (reconstruct-completed-define exp (syntax->list #`vars-stx) (vals-getter) render-settings)]
-                                       [else
-                                        (let* ([recon-vals (map (lambda (val)
-                                                                  (recon-value val render-settings))
-                                                                (vals-getter))])
-                                          (if (= (length recon-vals) 1)
-                                              (attach-info (car recon-vals) exp)
-                                              (attach-info #`(values #,@recon-vals) exp)))])
-            #f)]))))
-
-;; an abstraction lifted from reconstruct-completed
-(define (reconstruct-completed-define exp vars vals render-settings)
-  (let* ([_ (unless (equal? (length vars) (length vals))
-              (error "length of var list and val list unequal: ~v ~v" (map syntax->list vars) vals))]
-         [recon-vals (map (lambda (val var) 
-                            (recon-value val render-settings var)) 
-                          vals
-                          vars)])
-    (if (= (length recon-vals) 1)
-        (attach-info #`(define-values #,vars #,(car recon-vals)) exp)
-        (attach-info #`(define-values #,vars (values #,@recon-vals)) exp))))
-
-
-
-; : (-> syntax? syntax? syntax?)
-(define (reconstruct-top-level source reconstructed)
-  (skipto/auto
-   source
-   'discard
-   (lambda (source)
-     (kernel:kernel-syntax-case 
-      source #f
-      [(define-values vars-stx body)
-       (attach-info #`(define-values vars-stx #,reconstructed)
-                    source)]
-      [else
-       reconstructed]))))
-
-
-;; hide-completed? : syntax? -> boolean?
-(define (hide-completed? stx)
-  (syntax-case stx ()
-    [(define-values (v) rhs)
-     (stepper-syntax-property #'v 'stepper-hide-completed)]
-    [else #f]))
-
-
-;                     ;                                               ;  
-; ;;  ;;;    ;;;   ;;;   ; ;;    ;;; ;;;; ; ;; ;   ;   ;;; ;;;;         ;;;  ;   ;  ; ;; ; ;;  ;;;   ; ;;  ;;;;
-;;   ;   ;  ;     ;   ;  ;;  ;  ;     ;   ;;   ;   ;  ;     ;          ;     ;   ;  ;;   ;;   ;   ;  ;;  ;  ;  
-;    ;   ;  ;     ;   ;  ;   ;  ;     ;   ;    ;   ;  ;     ;          ;     ;   ;  ;    ;    ;   ;  ;   ;  ;  
-;    ;;;;;  ;     ;   ;  ;   ;   ;;   ;   ;    ;   ;  ;     ;   ;;;;;  ;     ;   ;  ;    ;    ;;;;;  ;   ;  ;  
-;    ;      ;     ;   ;  ;   ;     ;  ;   ;    ;   ;  ;     ;          ;     ;   ;  ;    ;    ;      ;   ;  ;  
-;    ;      ;     ;   ;  ;   ;     ;  ;   ;    ;  ;;  ;     ;          ;     ;  ;;  ;    ;    ;      ;   ;  ;  
-;     ;;;;   ;;;   ;;;   ;   ;  ;;;    ;; ;     ;; ;   ;;;   ;;         ;;;   ;; ;  ;    ;     ;;;;  ;   ;   ;;
-
-
-;; front ends for reconstruct-current:
-
-(define (reconstruct-left-side mark-list returned-value-list render-settings)
-  (reconstruct-current mark-list 'left-side returned-value-list render-settings))
-
-
-(define (reconstruct-right-side mark-list returned-value-list render-settings)
-  (reconstruct-current mark-list 'right-side returned-value-list render-settings))
-
-
-(define (reconstruct-double-break mark-list render-settings)
-  (reconstruct-current mark-list 'double-break null render-settings))
-
-
-; reconstruct-current : takes a list of marks, the kind of break, and
-; any values that may have been returned at the break point. It produces a list of sexps
-; (the result of reconstruction) --- which may contain holes, indicated by the 
-; highlight-placeholder --- and a list of sexps which go in the holes
-
-(define (reconstruct-current mark-list break-kind returned-value-list render-settings)
-  
-  ; ;;  ;;;    ;;;   ;;;   ; ;;          ;  ; ;;   ; ;;    ;;;   ; ;;
-  ;;   ;   ;  ;     ;   ;  ;;  ;         ;  ;;  ;  ;;  ;  ;   ;  ;;  
-  ;    ;   ;  ;     ;   ;  ;   ;         ;  ;   ;  ;   ;  ;   ;  ;   
-  ;    ;;;;;  ;     ;   ;  ;   ;  ;;;;;  ;  ;   ;  ;   ;  ;;;;;  ;   
-  ;    ;      ;     ;   ;  ;   ;         ;  ;   ;  ;   ;  ;      ;   
-  ;    ;      ;     ;   ;  ;   ;         ;  ;   ;  ;   ;  ;      ;   
-  ;     ;;;;   ;;;   ;;;   ;   ;         ;  ;   ;  ;   ;   ;;;;  ;   
-  
-  
-  (define (recon-inner mark-list so-far)
-    (let* ([recon-source-current-marks 
-            (lambda (expr)
-              (recon-source-expr expr mark-list null null render-settings))]
-           [top-mark (car mark-list)]
-           [exp (mark-source top-mark)]
-           [iota (lambda (x) (build-list x (lambda (x) x)))]
-           
-           [recon-let
-            (lambda ()
-              (with-syntax ([(label ((vars rhs) ...) . bodies) exp])
-                (match-let* 
-                    ([binding-sets (map syntax->list (syntax->list #'(vars ...)))]
-                     [binding-list (apply append binding-sets)]
-                     [glumps 
-                      (map (lambda (binding-set rhs)
-                             (make-let-glump
-                              (map (lambda (binding)
-                                     (stepper-syntax-property binding
-                                                              'stepper-lifted-name
-                                                              (binding-lifted-name mark-list binding)))
-                                   binding-set)
-                              rhs
-                              (map (lambda (arg-binding) 
-                                     (lookup-binding mark-list arg-binding))
-                                   binding-set)))
-                           binding-sets
-                           (syntax->list #`(rhs ...)))]
-                     [num-defns-done (lookup-binding mark-list let-counter)]
-                     [(vector done-glumps not-done-glumps)
-                      (n-split-list num-defns-done glumps)]
-                     [recon-lifted 
-                      (lambda (names expr)
-                        #`(#,names #,expr))]
-                     [before-bindings
-                      (map
-                       (lambda (glump)
-                         (let* ([name-set (let-glump-name-set glump)]
-                                [rhs-val-set (map (lambda (val)
-                                                    (if (> (length name-set) 0)
-                                                        (recon-value val render-settings (car name-set))
-                                                        (recon-value val render-settings))) 
-                                                  (let-glump-val-set glump))])
-                           (if (= (length rhs-val-set) 1)
-                               #`(#,name-set #,@rhs-val-set)
-                               #`(#,name-set (values #,rhs-val-set)))))
-                       done-glumps)]
-                     [reconstruct-remaining-def
-                      (lambda (glump)
-                        (let ([rhs-source (let-glump-exp glump)]
-                              [rhs-name-set (let-glump-name-set glump)])
-                          (recon-lifted rhs-name-set
-                                        (recon-source-current-marks rhs-source))))]
-                     [after-bindings
-                      (if (pair? not-done-glumps)
-                          (if (eq? so-far nothing-so-far)
-                              (map reconstruct-remaining-def not-done-glumps)
-                              (cons (recon-lifted (let-glump-name-set (car not-done-glumps)) so-far)
-                                    (map reconstruct-remaining-def (cdr not-done-glumps))))
-                          null)]
-                     [recon-bindings (append before-bindings after-bindings)]
-                     ;; JBC: deleted a bunch of dead code here referring to a never-set "stepper-offset" index...
-                     ;; frightening.
-                     [rectified-bodies 
-                      (for/list ([body (in-list (syntax->list #'bodies))])
-                        (recon-source-expr body mark-list binding-list binding-list render-settings))])
-                  (attach-info #`(label #,recon-bindings #,@rectified-bodies) exp))))])
-      
-      ; STC: cache any running promises in the top mark 
-      ; Means that promise is being evaluated.
-      ; NOTE: This wont wind running promises nested in another promise.
-      ;       Those wont be detected until the outer promise is being
-      ;       reconed, so we cant handle it until then.
-      (let ([maybe-running-promise
-             (findf (λ (f) (and (promise? f) (nested-promise-running? f)))
-                    (map mark-binding-value (mark-bindings top-mark)))])
-        (when (and maybe-running-promise
-                   (not (hash-has-key? partially-evaluated-promises-table
-                                       maybe-running-promise))
-                   (not (eq? so-far nothing-so-far)))
-          (hash-set! partially-evaluated-promises-table
-                     maybe-running-promise so-far)))
-      
-      (if (stepper-syntax-property exp 'stepper-fake-exp)
-          
-          (kernel:kernel-syntax-case 
-           exp #f
-           [(begin . bodies)
-            (if (eq? so-far nothing-so-far)
-                (error 'recon-inner "breakpoint before a begin reduction should have a result value in exp: ~a" (syntax->datum exp))
-                #`(begin #,so-far #,@(map recon-source-current-marks (cdr (syntax->list #'bodies)))))]
-           [(begin0 first-body . rest-bodies)
-            (if (eq? so-far nothing-so-far)
-                (error 'recon-inner "breakpoint before a begin0 reduction should have a result value in exp: ~a" (syntax->datum exp))
-                #`(begin0 #,(recon-value (lookup-binding mark-list begin0-temp) render-settings)
-                          #,so-far
-                          #,@(map recon-source-current-marks (syntax->list #`rest-bodies))))]
-           [else
-            (error 'recon-inner "unexpected fake-exp expression: ~a" (syntax->datum exp))])
-          
-          (kernel:kernel-syntax-case 
-           exp #f 
-           ; variable references
-           [id
-            (identifier? (syntax id))
-            (if (eq? so-far nothing-so-far)
-                (recon-source-current-marks exp)
-                (error 'recon-inner "variable reference given as context: ~a" exp))]
-           
-           [(#%top . id)
-            (if (eq? so-far nothing-so-far)
-                (recon-source-current-marks exp)
-                (error 'recon-inner "variable reference given as context: ~a" exp))]
-           
-           ; applications
-           [(#%plain-app . terms)
-            (attach-info
-             (match-let* 
-                 ([sub-exprs (syntax->list (syntax terms))]
-                  [arg-temps (build-list (length sub-exprs) get-arg-var)]
-                  [arg-vals (map (lambda (arg-temp) 
-                                   (lookup-binding mark-list arg-temp))
-                                 arg-temps)]
-                  [(vector evaluated unevaluated) (split-list (lambda (x) (eq? (cadr x) *unevaluated*))
-                                                              (zip sub-exprs arg-vals))]
-                  [rectified-evaluated (map (lx (recon-value _ render-settings #f so-far)) 
-                                            (map cadr evaluated))])
-               (case (mark-label (car mark-list))
-                 ((not-yet-called)
-                  (if (null? unevaluated)
-                      #`(#%plain-app . #,rectified-evaluated)
-                      #`(#%plain-app 
-                         #,@rectified-evaluated
-                         #,so-far 
-                         #,@(map recon-source-current-marks (cdr (map car unevaluated))))))
-                 ((called) ; unevaluated = null
-                  (stepper-syntax-property
-                   (if (eq? so-far nothing-so-far)
-                       (datum->syntax #'here `(,#'#%plain-app ...)) ; in unannotated code ... can this occur?
-                       ; dont show ellipses for force (and other lazy fns)
-                       ; object-name is good enough here, so dont need to add another "special val"
-                       (let ([obj-name (object-name (car arg-vals))])
-                         (cond [(ormap 
-                                 (lx (eq? obj-name _)) 
-                                 '(force ! !! !list !!list
-                                         caar cadr cdar cddr caaar caadr cadar caddr cdaar cdadr cddar 
-                                         cdddr caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr 
-                                         cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr 
-                                         first second third fourth fifth sixth seventh eighth take 
-                                         eq? eqv? equal? list? length list-ref list-tail append reverse
-                                         empty? assoc assq assv cons? remove remq remv member memq memv))
-                                #`(#%plain-app . #,rectified-evaluated)]
-                               [else
-                                (datum->syntax #'here `(,#'#%plain-app ... ,so-far ...))])))
-                   'stepper-args-of-call 
-                   rectified-evaluated))
-                 (else
-                  (error 'recon-inner "bad label (~v) in application mark in expr: ~a" (mark-label (car mark-list)) exp))))
-             exp)]
-           
-           ; define-struct 
-           ;               
-           ;               [(z:struct-form? expr)
-           ;                 (if (comes-from-define-struct? expr)
-           ;                     so-far
-           ;                     (let ([super-expr (z:struct-form-super expr)]
-           ;                           [raw-type (utils:read->raw (z:struct-form-type expr))]
-           ;                           [raw-fields (map utils:read->raw (z:struct-form-fields expr))])
-           ;                       (if super-expr
-           ;                           `(struct (,raw-type ,so-far)
-           ;                                    ,raw-fields)
-           ;                           `(struct ,raw-type ,raw-fields))))]
-           
-           ; if
-           [(if test then else)
-            (begin
-              (when (eq? so-far nothing-so-far)
-                (error 'reconstruct "breakpoint before an if reduction should have a result value"))
-              (attach-info
-               #`(if #,so-far
-                     #,(recon-source-current-marks (syntax then))
-                     #,(recon-source-current-marks (syntax else)))
-               exp))]
-           
-           ; one-armed if
-           
-           [(if test then)
-            (begin
-              (when (eq? so-far nothing-so-far)
-                (error 'reconstruct "breakpoint before an if reduction should have a result value"))
-              (attach-info
-               #`(if #,so-far #,(recon-source-current-marks (syntax then)))
-               exp))]
-           
-           ; quote : there is no break on a quote.
-           
-           ;; advanced-begin : okay, here comes advanced-begin.
-           
-           [(begin . terms)
-            ;; even in advanced, begin expands into a let-values.
-            (error 'reconstruct/inner "begin in non-teaching-languages not implemented in reconstruct")]
-           
-           ; begin : in the current expansion of begin, there are only two-element begin's, one-element begins, and 
-           ;; zero-element begins; these arise as the expansion of ... ?
-           
-           ;; these are all dead code, right?
-           
-           #;[(begin stx-a stx-b)
-              (attach-info 
-               (if (eq? so-far nothing-so-far)
-                   #`(begin #,(recon-source-current-marks #`stx-a) #,(recon-source-current-marks #`stx-b))
-                   #`(begin #,so-far #,(recon-source-current-marks #`stx-b))))]
-           
-           #;[(begin clause)
-              (attach-info
-               (if (eq? so-far nothing-so-far)
-                   #`(begin #,(recon-source-current-marks (syntax clause)))
-                   (error 
-                    'recon-inner
-                    "stepper:reconstruct: one-clause begin appeared as context: ~a" (syntax->datum exp)))
-               exp)]
-           
-           #;[(begin)
-              (attach-info
-               (if (eq? so-far nothing-so-far)
-                   #`(begin)
-                   (error 
-                    'recon-inner
-                    "stepper-reconstruct: zero-clause begin appeared as context: ~a" (syntax->datum exp))))]
-           
-           ; begin0 : 
-           ;; one-body begin0: perhaps this will turn out to be a special case of the
-           ;; many-body case.
-           [(begin0 body)
-            (if (eq? so-far nothing-so-far)
-                (recon-source-current-marks exp)
-                (error 'recon-inner "one-body begin0 given as context: ~a" exp))]
-           
-           ;; the only time begin0 shows up other than in a fake-exp is when the first 
-           ;; term is being evaluated
-           [(begin0 first-body . rest-bodies)
-            (if (eq? so-far nothing-so-far)
-                (error 'foo "not implemented")
-                ;; don't know what goes hereyet
-                #`(begin0 #,so-far #,@(map recon-source-current-marks (syntax->list #`rest-bodies))))]
-           
-           ; let-values
-           
-           [(let-values . rest) (recon-let)]
-           
-           [(letrec-values . rest) (recon-let)]
-           
-           [(set! var rhs)
-            (begin
-              (when (eq? so-far nothing-so-far)
-                (error 'reconstruct "breakpoint before an if reduction should have a result value"))
-              (attach-info
-               (let ([rendered-var (reconstruct-set!-var mark-list #`var)])
-                 #`(set! #,rendered-var #,so-far))
-               exp))]
-           
-           ; lambda : there is no break on a lambda
-           
-           [else
-            (error
-             'recon-inner
-             "stepper:reconstruct: unknown object to reconstruct: ~a" (syntax->datum exp))]))))
-  
-  ; the main recursive reconstruction loop is in recon:
-  ; recon : (syntax mark-list boolean -> syntax)
-  
-  (define (recon so-far mark-list first)
-    (cond [(null? mark-list) ; now taken to indicate a callback:
-           (unless (eq? so-far nothing-so-far)
-             (set! last-so-far so-far))
-           so-far
-           ;(error `recon "expcted a top-level mark at the end of the mark list.")
-           ]
-          [else
-           (case (mark-label (car mark-list)) 
-             [(top-level)
-              (if (null? (cdr mark-list))
-                  (reconstruct-top-level (mark-source (car mark-list)) so-far)
-                  (error 'recon "top-level-define mark found at non-end of mark list"))]
-             [else
-              (let ([reconstructed (recon-inner mark-list so-far)])
-                (recon
-                 (if first
-                     (mark-as-highlight reconstructed)
-                     reconstructed)
-                 (cdr mark-list)
-                 #f))])]))
-  
-  ; uncomment to see all breaks coming in:
-  #;(define _ (printf "break-kind: ~a\ninnermost source: ~a\nreturned-value-list: ~a\n" 
-                      break-kind
-                      (and (pair? mark-list)
-                           (syntax->datum (mark-source (car mark-list))))
-                      returned-value-list))
-  
-  (define answer
-    (begin
-      ; STC: reset partial-eval-promise table on each call to recon
-      (set! partially-evaluated-promises-table (make-weak-hash))
-      (set! last-so-far null)
-      
-      (case break-kind
-        ((left-side)
-         (let* ([innermost 
-                 (if returned-value-list ; is it a normal-break/values?
-                     (begin 
-                       (unless (and (pair? returned-value-list) 
-                                    (null? (cdr returned-value-list)))
-                         (error 'reconstruct 
-                                "context expected one value, given ~v" 
-                                returned-value-list))
-                       (recon-value (car returned-value-list) render-settings))
-                     nothing-so-far)])
-           (recon innermost mark-list #t)))
-        ((right-side)
-         (let* ([innermost 
-                 (if returned-value-list ; is it an expr -> value reduction?
-                     (begin 
-                       (unless (and (pair? returned-value-list)
-                                    (null? (cdr returned-value-list)))
-                         (error 'reconstruct 
-                                "context expected one value, given ~v"
-                                returned-value-list))
-                       (recon-value (car returned-value-list) render-settings))
-                     (recon-source-expr (mark-source (car mark-list))
-                                        mark-list null null render-settings))])
-           (recon (mark-as-highlight innermost) (cdr mark-list) #f)))
-        ((double-break)
-         (let* ([source-expr (mark-source (car mark-list))]
-                [innermost-before 
-                 (mark-as-highlight 
-                  (recon-source-expr source-expr mark-list null null render-settings))]
-                [newly-lifted-bindings 
-                 (syntax-case source-expr (letrec-values)
-                   [(letrec-values ([vars . rest] ...) . bodies)
-                    (apply append (map syntax->list (syntax->list #`(vars ...))))]
-                   [(let-values ([vars . rest] ...) . bodies)
-                    (apply append (map syntax->list (syntax->list #`(vars ...))))]
-                   [else (error 
-                          'reconstruct 
-                          "expected a let-values as source for a double-break, got: ~.s"
-                          (syntax->datum source-expr))])]
-                [innermost-after 
-                 (mark-as-highlight 
-                  (recon-source-expr 
-                   (mark-source (car mark-list)) 
-                   mark-list null newly-lifted-bindings render-settings))])
-           (list (recon innermost-before (cdr mark-list) #f)
-                 (recon innermost-after (cdr mark-list) #f)))))))
-  
-  
-  answer
-  )
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/shared.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/shared.rkt
deleted file mode 100644
index 8a5688d1e0..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/shared.rkt
+++ /dev/null
@@ -1,723 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         racket/match
-         racket/contract
-         racket/class
-         racket/unit
-         "syntax-property.rkt")
-
-; CONTRACTS
-
-(define varref-set? (listof identifier?))
-(define binding-set? (or/c varref-set? (symbols 'all)))
-(define (arglist? v)
-  (or (null? v)
-      (identifier? v)
-      (and (pair? v)
-           ((flat-contract-predicate (cons/c identifier? arglist?)) v))        
-      (and (syntax? v) (null? (syntax-e v)))
-      (and (syntax? v) 
-           ((flat-contract-predicate (cons/c identifier? arglist?)) (syntax-e v)))))
-
-#;(provide/contract
-   [varref-set-remove-bindings (-> varref-set? varref-set? varref-set?)]
-   [binding-set-varref-set-intersect (-> binding-set? varref-set? binding-set?)]
-   [binding-set-union (-> (listof binding-set?) binding-set?)]
-   [varref-set-union (-> (listof varref-set?) varref-set?)]
-   [skipto/auto (syntax? (symbols 'rebuild 'discard) 
-                         (syntax? . -> . syntax?)
-                         . -> . 
-                         syntax?)]
-   [in-closure-table (-> any/c boolean?)]
-   [sublist (-> number? number? list? list?)]
-   [attach-info (-> syntax? syntax? syntax?)]
-   [transfer-info (-> syntax? syntax? syntax?)]
-   [arglist->ilist (-> arglist? any)]
-   [arglist-flatten (-> arglist? (listof identifier?))])
-
-(provide
- skipto/auto
- sublist
- attach-info
- transfer-info
- arglist->ilist
- arglist-flatten
- binding-set-union
- binding-set-pair-union
- varref-set-union
- varref-set-pair-union
- varref-set-remove-bindings
- binding-set-varref-set-intersect
- step-result?
- step-maybe-result?
- (struct-out before-after-result)
- (struct-out before-error-result)
- (struct-out error-result)
- (struct-out finished-stepping)
- (struct-out runaway-process)
- list-take
- list-partition
- (struct-out closure-record)
- *unevaluated* 
- struct-flag
- multiple-highlight
- flatten-take
- get-lifted-var
- get-arg-var
- begin0-temp
- zip
- let-counter
- syntax-pair-map
- make-queue ; -> queue
- queue-push ; queue val -> 
- queue-pop ; queue -> val
- queue-length ; queue -> num
- rebuild-stx ; datum syntax -> syntax
- break-kind? ; predicate
- varref-set? ; predicate
- binding-set? ; predicate
- ; get-binding-name
- ; bogus-binding?
- ; get-lifted-gensym
- ; expr-read
- ; set-expr-read!
- values-map
- a...b ; a list of numbers from a to b
- reset-profiling-table ; profiling info
- get-set-pair-union-stats ; profiling info
- re-intern-identifier
- finished-xml-box-table
- language-level->name
- saved-code-inspector
- 
- 
- (struct-out annotated-proc)
- 
- view-controller^
- stepper-frame^
- )
-
-  
-  ; A step-result is either:
-  ; (make-before-after-result finished-exps exp redex reduct)
-  ; or (make-before-error-result finished-exps exp redex err-msg)
-  ; or (make-error-result finished-exps err-msg)
-  ; or (make-finished-result finished-exps)
-  
-  (struct before-after-result (pre-exps post-exps kind pre-src post-src) #:prefab)
-  (struct before-error-result (pre-exps err-msg pre-src) #:prefab)
-  (struct error-result (err-msg) #:prefab)
-  (struct finished-stepping () #:prefab)
-  (struct runaway-process (sema) #:prefab)
-  
-  (define step-result? (or/c before-after-result? before-error-result? 
-                             error-result? finished-stepping?))
-  (define step-maybe-result? (or/c step-result? runaway-process?))
-  
-  ; the closure record is placed in the closure table
-
-  (define-struct closure-record (name mark constructor? lifted-index))
-
-  ; bogus-binding is used so that we can create legal bindings for temporary variables
-  
-  (define (create-bogus-binding name)
-    (let* ([gensymed-name (gensym name)]
-           [binding (datum->syntax #'here gensymed-name)])
-      binding))
-  
-  ; make-binding-source creates a pool of bindings, indexed by arbitrary keys. These bindings
-  ; not eq? to any other bindings[*], but a client can always get the same binding by
-  ; invoking the resulting procedure with the same key (numbers work well). make-binding-source
-  ; also takes a string which will be part of the printed representation of the binding's
-  ; name; this makes debugging easier.
-  ; [*] actually, this is not true if you don't use a one-to-one function as the binding-maker
-  ; make-gensym-source : (string -> (key -> binding))
-  
-  (define (make-binding-source id-string binding-maker key-displayer)
-    (let ([assoc-table (make-weak-hash)])
-      (lambda (key)
-        (let ([maybe-fetch (hash-ref assoc-table key (lambda () #f))])
-          (or maybe-fetch
-              (begin
-                (let* ([new-binding (binding-maker 
-                                     (string-append id-string (key-displayer key) "-"))])
-                  (hash-set! assoc-table key new-binding)
-                  new-binding)))))))
-  
-  
-  ; get-arg-var maintains a list of bindings associated with the non-negative
-  ; integers.  These symbols are used in the elaboration of applications; the nth
-  ; in the application is evaluated and stored in a variable whose name is the nth
-  ; gensym supplied by get-arg-var.
-  
-  (define get-arg-var
-    (make-binding-source "arg" create-bogus-binding number->string))
-  
-  ; test cases: (returns #t on success)
-;  (printf "test of get-arg-binding: ~a\n"
-;          (let* ([arg3 (get-arg-var 3)]
-;                 [arg2 (get-arg-var 2)]
-;                 [arg1 (get-arg-var 1)]
-;                 [arg2p (get-arg-var 2)])
-;            (and (not (eq? arg3 arg2))
-;                 (not (eq? arg3 arg1))
-;                 (not (eq? arg3 arg2p))
-;                 (not (eq? arg2 arg1))
-;                 (eq? arg2 arg2p)
-;                 (not (eq? arg1 arg2p)))))
-
-  (define begin0-temp (create-bogus-binding "begin0-temp"))
-  
-  ; get-lifted-var maintains the mapping between let-bindings and the syntax object
-  ; which is used to capture its index at runtime.
-  ; unfortunately, it can't use "make-binding-source" because you need to compare the items 
-  ; with module-variable=?, which means that hash tables won't work.
-  
-  ; my weak-assoc lists are lists of two-element lists, where the first one is in a weak box.
-  ; furthermore, the whole thing is in a box, to allow it to be banged when needed.
-  
-  (define (weak-assoc-add boxed-lst key value)
-       (set-box! boxed-lst (cons (list (make-weak-box key) value) (unbox boxed-lst))))
-  
-  (define (weak-assoc-search boxed-lst key eq-fun)
-    (let* ([lst (unbox boxed-lst)]
-           [found-val #f]
-           [stripped (let loop ([remaining lst])
-                       (if (null? remaining)
-                           null
-                           (let* ([first (car remaining)]
-                                  [first-key (weak-box-value (car first))])
-                             (if first-key
-                                 (if (eq-fun key first-key)
-                                     (begin 
-                                       (set! found-val (cadr first))
-                                       remaining)
-                                     (cons first
-                                           (loop (cdr remaining))))
-                                 (loop (cdr remaining))))))])
-      (set-box! boxed-lst stripped)
-      found-val))
-  
-  ; test cases:
-  ;  (define wa (box null))
-  ;  (define-struct test ())
-  ;  (weak-assoc-add wa 3 4)
-  ;  (weak-assoc-add wa 9 10)
-  ;  (= (weak-assoc-search wa 3 =) 4)
-  ;  (= (weak-assoc-search wa 9 =) 10)
-  ;  (= (weak-assoc-search wa 3 =) 4)
-  ;  (= (length (unbox wa)) 2)
-  ;  (define my-struct (make-test))
-  ;  (weak-assoc-add wa my-struct 14)
-  ;  (= (length (unbox wa)) 3)
-  ;  (= (weak-assoc-search wa my-struct eq?) 14)
-  ;  (set! my-struct #f)
-  ;  (collect-garbage)
-  ;  (= (length (unbox wa)) 3)
-  ;  (= (weak-assoc-search wa 3 =) 4)
-  ;  (= (length (unbox wa)) 2)
-  
-  (define lifted-index 0)
-  (define (next-lifted-symbol str)
-    (let ([index lifted-index]) 
-      (set! lifted-index (+ lifted-index 1))
-      (datum->syntax #'here (string->symbol (string-append str (number->string index))))))
- 
-  (define get-lifted-var
-   (let ([assoc-table (box null)])
-      (lambda (stx)
-        (let ([maybe-fetch (weak-assoc-search assoc-table stx free-identifier=?)])
-          (or maybe-fetch
-              (begin
-                (let* ([new-binding (next-lifted-symbol
-                                     (string-append "lifter-" (format "~a" (syntax->datum stx)) "-"))])
-                  (weak-assoc-add assoc-table stx new-binding)
-                  new-binding)))))))
-  
-  ; gensyms needed by many modules:
-
-
-  ; multiple-highlight is used to indicate multiple highlighted expressions
-  (define multiple-highlight (gensym "multiple-highlight-"))
-  
-  ; *unevaluated* is the value assigned to temps before they are evaluated. It's not a symbol so
-  ; it won't need quoting in the source.  Bit of a hack, I know.
-  (define-struct *unevaluated-struct* ())
-  (define *unevaluated* (make-*unevaluated-struct*))
- 
-  ; struct-flag : uninterned symbol
-  (define struct-flag (gensym "struct-flag-"))
-  
-  ; list-partition takes a list and a number, and returns a 2vals containing 2 lists; the first one contains the
-  ; first n elements of the list, and the second contains the remainder.  If n is greater than
-  ; the length of the list, the exn:application:mismatch exception is raised.
-  
-  (define (list-partition lst n)
-    (if (= n 0)
-        (vector null lst)
-        (if (null? lst)
-            (list-ref lst 0) ; cheap way to generate exception
-            (match-let* ([(vector first rest) (list-partition (cdr lst) (- n 1))])
-              (vector (cons (car lst) first) rest)))))
-  
-;  (define expr-read read-getter)
-;  (define set-expr-read! read-setter)
-  
-  (define (list-take n a-list)
-    (if (= n 0)
-        null
-        (cons (car a-list) (list-take (- n 1) (cdr a-list)))))
-  
-  (define (flatten-take n a-list)
-    (apply append (list-take n a-list)))
-  
-  (define-values (closure-table-put! closure-table-lookup in-closure-table)
-    (let ([closure-table (make-weak-hash)])
-      (values
-       (lambda (key value)
-	 (hash-set! closure-table key value)
-	 key)                                  ; this return allows a run-time-optimization
-       (lambda args ; key or key & failure-thunk
-         (apply hash-ref closure-table args))
-       (lambda (key)
-         (let/ec k
-           (hash-ref closure-table key (lambda () (k #f)))
-           #t)))))
-  
-  ;(begin (closure-table-put! 'foo 'bar)
-  ;       (and (eq? (in-closure-table 'blatz) #f)
-  ;            (eq? (in-closure-table 'foo) #t)))
- 
-  
-  ;; arglist : for our puposes, an ilist is defined like this:
-  ;; arglist : (or/c identifier? null? (cons identifier? arglist?) (syntax (cons identifier? arglist?))
-  ;; ... where an ilist val can be anything _except_ a pair or null
-
-  ;; arglist->ilist : turns an (possibly improper) arglist into a (possibly improper) list of syntax objects
-
-  (define (arglist->ilist arglist)
-    (let loop ([ilist arglist])
-      (cond [(identifier? ilist)
-             ilist]
-            [(pair? ilist)
-             (cons (car ilist)
-                   (loop (cdr ilist)))]
-            [(and (syntax? ilist) (pair? (syntax-e ilist)))
-             (loop (syntax-e ilist))]
-            [(null? ilist) null])))
-
-  ;; arglist-flatten : produces a list containing the elements of the ilist
-
-  (define (arglist-flatten arglist)
-    (let loop ([ilist arglist])
-      (cond [(identifier? ilist)
-             (cons ilist null)]
-            [(or (null? ilist) (and (syntax? ilist) (null? (syntax-e ilist))))
-             null]
-            [(pair? ilist)
-             (cons (car ilist) (loop (cdr ilist)))]
-            [(and (syntax? ilist)
-                  (pair? (syntax-e ilist)))
-             (loop (syntax-e ilist))])))
-
-  ;; zip : (listof 'a) (listof 'b) (listof 'c) ...
-  ;;       -> (listof (list 'a 'b 'c ...))
-  ;; zip reshuffles lists of items into a list of item-lists.  Look at the
-  ;; contract, okay?
-
-  (define zip
-    (lambda args
-      (apply map list args)))
-
-  (define let-counter
-    (stepper-syntax-property #'let-counter 'stepper-binding-type 'stepper-temp))
-
-
-  ; syntax-pair-map (using the def'ns of the Racket docs):
-
-  (define (syntax-pair-map pair fn)
-    (cons (fn (car pair))
-          (cond [(syntax? (cdr pair))
-                 (fn (cdr pair))]
-                [(pair? (cdr pair))
-                 (syntax-pair-map (cdr pair) fn)]
-                [(null? (cdr pair))
-                 null])))
-
-  (define (make-queue)
-    (box null))
-
-  (define (queue-push queue new)
-    (set-box! queue (append (unbox queue) (list new))))
-
-  (define (queue-pop queue)
-    (if (null? (unbox queue))
-      (error 'queue-pop "no elements in queue")
-      (let ([first (car (unbox queue))])
-        (set-box! queue (cdr (unbox queue)))
-        first)))
-
-  (define (queue-length queue)
-    (length (unbox queue)))
-
-  (define saved-code-inspector (variable-reference->module-declaration-inspector
-                                (#%variable-reference)))
-  
-  (define (rebuild-stx new old)
-    (datum->syntax old new old old))
-
-  (define break-kind?
-    (symbols 'normal-break 'normal-break/values 'result-exp-break
-             'result-value-break 'double-break 'late-let-break
-             'expr-finished-break 'define-struct-break))
-
-  ; functional update package
-
-  ;; a trace is one of
-  ;; (cons 'car trace)
-  ;; (cons 'cdr trace)
-  ;; (cons 'syntax-e trace)
-  ;; (cons 'both (list trace trace))
-  ;; null
-  
-  (define (swap-args 2-arg-fun)
-    (lambda (x y)
-      (2-arg-fun y x)))
-
-  (define second-arg (lambda (dc y) y))
-  
-  (define (up-mapping traversal fn)
-    (unless (symbol? fn)
-      (error 'up-mapping "expected symbol for stepper traversal, given: ~v" fn))
-    (case traversal
-      [(rebuild) (case fn 
-                   [(car) (lambda (stx new) (cons new (cdr stx)))]
-                   [(cdr) (lambda (stx new) (cons (car stx) new))]
-                   [(syntax-e) (swap-args rebuild-stx)]
-                   [(both-l both-r) (lambda (stx a b) (cons a b))]
-                   [else (error 'up-mapping "unexpected symbol in up-mapping (1): ~v" fn)])]
-      [(discard) (case fn
-                   [(car) second-arg]
-                   [(cdr) second-arg]
-                   [(syntax-e) second-arg]
-                   [(both-l) (lambda (stx a b) a)]
-                   [(both-r) (lambda (stx a b) b)]
-                   [else (error 'up-mapping "unexpected symbol in up-mapping (2): ~v" fn)])]))
-  
-;; like car, but provide a useful error message if given a non-pair
-(define (noisy-car arg)
-  (cond [(pair? arg) (car arg)]
-        [else (raise-argument-error 'noisy-car "pair in syntax traversal" 0 arg)]))
-
-;; like cdr,  but provide a useful error message if given a non-pair
-(define (noisy-cdr arg)
-  (cond [(pair? arg) (cdr arg)]
-        [else (raise-argument-error 'noisy-car "pair in syntax traversal" 0 arg)]))
-
-;; like syntax-e,  but provide a useful error message if given a non-syntax-object
-(define (noisy-syntax-e arg)
-  (cond [(syntax? arg) (syntax-e arg)]
-        [else (raise-argument-error 'noisy-car "syntax object in syntax traversal" 0 arg)]))
-
-;; map a symbol in '(car cdr syntax-e) to the appropriate projector
-(define (down-mapping fn)
-  (case fn
-    [(car) noisy-car]
-    [(cdr) noisy-cdr]
-    [(syntax-e) noisy-syntax-e]
-    [else (error 'down-mapping "called on something other than 'car, 'cdr, & 'syntax-e: ~v" fn)]))
-
-(define (update fn-list val fn traversal)
-  (if (null? fn-list)
-      (fn val)
-      (let ([up (up-mapping traversal (car fn-list))])
-        (case (car fn-list)
-          [(both-l both-r) (up val 
-                               (update (cadr fn-list) (car val) fn traversal)
-                               (update (caddr fn-list) (cdr val) fn traversal))]
-          [else (let ([down (down-mapping (car fn-list))])
-                  (up val (update (cdr fn-list) (down val) fn traversal)))]))))
-  
-
-    #;(display (equal? (update '(cdr cdr car both-l (car) (cdr))
-                           `(a . (b ((1) c . 2) d))
-                           (lambda (x) (+ x 1))
-                           'rebuild)
-                   `(a . (b ((2) c . 3) d))))
-  
-  
-  ;; skipto/auto : syntax?
-  ;;               (symbols 'rebuild 'discard)
-  ;;               (syntax? . -> . syntax?)
-  ;; "skips over" part of a tree to find a subtree indicated by the
-  ;; stepper-skipto property, and applies the transformer to it.  
-  ;; If the traversal argument is 'rebuild, the
-  ;; result of transformation is embedded again in the same tree.  if the
-  ;; traversal argument is 'discard, the result of the transformation is the
-  ;; result of this function
-  (define (skipto/auto stx traversal transformer)
-    (cond [(or (stepper-syntax-property stx 'stepper-skipto)
-	       (stepper-syntax-property stx 'stepper-skipto/discard))
-           =>
-           (lambda (x) (update x stx 
-                               (lambda (y) 
-                                 (skipto/auto y traversal transformer)) 
-                               traversal))]
-          [else (transformer stx)]))
-
-  ;  small test case:
-  #;(display (equal? (syntax->datum
-                    (skipto/auto (stepper-syntax-property #`(a #,(stepper-syntax-property #`(b c)
-                                                                          'stepper-skipto
-                                                                          '(syntax-e cdr car)))
-                                                  'stepper-skipto
-                                                  '(syntax-e cdr car))
-                                 'discard
-                                 (lambda (x) x)))
-                   'c))
-  
-
-  ; BINDING-/VARREF-SET FUNCTIONS
-
-  ; note: a BINDING-SET which is not 'all may be used as a VARREF-SET.
-  ; this is because they both consist of syntax objects, and a binding
-  ; answers true to bound-identifier=? with itself, just like a varref
-  ; in the scope of that binding would.
-
-  ; binding-set-union: (listof BINDING-SET) -> BINDING-SET
-  ; varref-set-union: (listof VARREF-SET) -> VARREF-SET
-
-  (define profiling-table (make-hash))
-  (define (reset-profiling-table)
-    (set! profiling-table (make-hash)))
-
-  (define (get-set-pair-union-stats)
-    (hash-map profiling-table (lambda (k v) (list k (unbox v)))))
-
-  ;; test cases :
-  ;; (profiling-table-incr 1 2)
-  ;; (profiling-table-incr 2 3)
-  ;; (profiling-table-incr 2 1)
-  ;; (profiling-table-incr 1 2)
-  ;; (profiling-table-incr 2 1)
-  ;;
-  ;; (equal? (get-set-pair-union-stats)
-  ;         `(((2 . 3) 1) ((2 . 1) 2) ((1 . 2) 2)))
-
-  ;; until this remove* goes into list.rkt?
-
-  (define (set-pair-union a-set b-set comparator)
-    (cond [(null? b-set) a-set]
-          [(null? a-set) b-set]
-          [else (append (remove* a-set b-set comparator) a-set)]))
-
-  (define (varref-set-pair-union a-set b-set)
-    (set-pair-union a-set b-set free-identifier=?))
-
-  (define (binding-set-pair-union a-set b-set)
-    (cond [(eq? a-set 'all) 'all]
-          [(eq? b-set 'all) 'all]
-          [else (set-pair-union a-set b-set eq?)]))
-
-  (define (pair-union->many-union fn)
-    (lambda (args)
-      (foldl fn null args)))
-
-  (define binding-set-union
-    (pair-union->many-union binding-set-pair-union))
-
-  (define varref-set-union
-    (pair-union->many-union varref-set-pair-union))
-
-  ; binding-set-varref-set-intersect : BINDING-SET VARREF-SET -> BINDING-SET
-  ; return the subset of varrefs that appear in the bindings
-
-  (define (binding-set-varref-set-intersect bindings varrefs)
-    (cond [(eq? bindings 'all) varrefs]
-          [else (filter (lambda (varref)
-                          (ormap (lambda (binding)
-                                   (bound-identifier=? binding varref))
-                                 bindings))
-                        varrefs)]))
-
-  ; varref-set-remove-bindings : VARREF-SET (BINDING-SET - 'all) -> VARREF-SET
-  ; remove bindings from varrefs
-
-  (define (varref-set-remove-bindings varrefs bindings)
-    (cond [(eq? bindings 'all)
-           (error 'varref-set-remove-bindings "binding-set 'all passed as second argument, first argument was: ~s" varrefs)]
-          [else (remove* bindings varrefs bound-identifier=?)]))
-
-  ;; sublist returns the list beginning with element <begin> and ending just
-  ;; before element <end>.
-  ;; (-> number? number? list? list?)
-  (define (sublist begin end lst)
-    (if (= end 0)
-        null
-        (if (= begin 0)
-            (cons (car lst)
-                  (sublist 0 (- end 1) (cdr lst)))
-            (sublist (- begin 1) (- end 1) (cdr lst)))))
-
-  ;; take info from source expressions to reconstructed expressions
-
-  (define (attach-info to-exp from-exp)
-    (let* ([attached (syntax-property to-exp 'stepper-properties (append (or (syntax-property from-exp 'stepper-properties)
-                                                                             null)
-                                                                         (or (syntax-property to-exp 'stepper-properties)
-                                                                             null)))]
-           [attached (syntax-property attached 'user-source (syntax-source from-exp))]
-           [attached (syntax-property attached 'user-position (syntax-position from-exp))]
-           [attached (syntax-property attached 'user-origin (syntax-property from-exp 'origin))])
-      attached))
-
-  ;; transfer info from reconstructed expressions to other reconstructed
-  ;; expressions
-
-  (define (transfer-info to-exp from-exp)
-    (let* ([attached (syntax-property to-exp 'stepper-properties (append (or (syntax-property from-exp 'stepper-properties)
-                                                                             null)
-                                                                         (or (syntax-property to-exp 'stepper-properties)
-                                                                             null)))]
-           [attached (syntax-property attached 'user-source (syntax-property from-exp 'user-source))]
-           [attached (syntax-property attached 'user-position (syntax-property from-exp 'user-position))]
-           [attached (syntax-property attached 'user-origin (syntax-property from-exp 'user-origin))])
-      attached))
-
-  (define (values-map fn . lsts)
-    (apply values
-           (apply map list
-                  (apply map (lambda args
-                               (call-with-values (lambda () (apply fn args))
-                                   list))
-                         lsts))))
-  
-  ; produces the list of numbers from a to b (inclusive)
-  (define (a...b a b)
-    (if (= a b)
-        (list a)
-        (cons a (a...b (+ a 1) b))))
-  
-  ;; re-intern-identifier : (identifier? -> identifier?)
-  ;; re-intern-identifier : some identifiers are uninterned, which breaks
-  ;; test cases.  re-intern-identifier takes an identifier to a string
-  ;; and back again to make in into an interned identifier.
-  (define (re-intern-identifier identifier)
-    #`#,(string->symbol (symbol->string (syntax-e identifier))))
-  
-  
-  (provide/contract [syntax->hilite-datum 
-                     ((syntax?) (#:ignore-highlight? boolean?) . ->* . any)]) ; sexp with explicit tags
-  
-  ;; syntax->hilite-datum : takes a syntax object with zero or more
-  ;; subexpressions tagged with the 'stepper-highlight', 'stepper-xml-hint', and 'stepper-xml-value-hint' syntax-properties
-  ;; and turns it into a datum, where expressions with the named
-  ;; properties result in (hilite <datum>), (xml-box <datum>), (scheme-box <datum>) and (splice-box <datum>) rather than <datum>. It also
-  ;; re-interns all identifiers.  In cases where a given expression has more than one of these, they appear in the order
-  ;; listed.  That is, an expression with both highlight and xml-box annotations will result it (hilite (xml-box <datum>))
-  ;; 
-  ;; this procedure is useful in checking the output of the stepper.
-  
-  (define (syntax->hilite-datum stx #:ignore-highlight? [ignore-highlight? #f])
-    (let ([datum (syntax-case stx ()
-                   [(a . rest) (cons (syntax->hilite-datum #`a) (syntax->hilite-datum #`rest))]
-                   [id
-                    (identifier? stx)
-                    (string->symbol (symbol->string (syntax-e stx)))]
-                   [else (if (syntax? stx)
-                             (syntax->datum stx)
-                             stx)])])
-      (let* ([it (case (stepper-syntax-property stx 'stepper-xml-hint)
-                   [(from-xml-box) `(xml-box ,datum)]
-                   [(from-scheme-box) `(scheme-box ,datum)]
-                   [(from-splice-box) `(splice-box ,datum)]
-                   [else datum])]
-             [it (case (stepper-syntax-property stx 'stepper-xml-value-hint)
-                   [(from-xml-box) `(xml-box-value ,it)]
-                   [else it])]
-             [it (if (and (not ignore-highlight?)
-                          (stepper-syntax-property stx 'stepper-highlight))
-                     `(hilite ,it)
-                     it)])
-        it)))
-  
-  ;; finished-xml-box-table : this table tracks values that are the result
-  ;; of evaluating xml boxes.  These values should be rendered as xml boxes,
-  ;; and not as simple lists.
-  
-  (define finished-xml-box-table (make-weak-hash))
-  
-  (provide/contract [syntax->interned-datum (syntax? ; input
-                                                    . -> .
-                                                    any)]) ; sexp 
-  
-  ;; syntax->interned-datum : like syntax->datum, except
-  ;; that it re-interns all identifiers.  Useful in checking whether
-  ;; two sexps will have the same printed representation.
-  
-  (define (syntax->interned-datum stx)
-    (syntax-case stx ()
-      [(a . rest) (cons (syntax->interned-datum #`a) (syntax->interned-datum #`rest))]
-      [id
-       (identifier? stx)
-       (string->symbol (symbol->string (syntax-e stx)))]
-      [else (if (syntax? stx)
-                (syntax->datum stx)
-                stx)]))
-  
-  
-  ;; the xml-snip-creation@ unit accepts the xml-snip% and scheme-snip% classes and
-  ;; provides functions which map a "spec" to an xml-snip.
-  ;; An xml-spec is (listof xml-spec-elt)
-  ;; An xml-spec-elt is either
-  ;;  - a string,
-  ;;  - (cons/c 'scheme-box scheme-spec), or
-  ;;  - (cons/c 'splice-box scheme-spec)
-  ;;
-  ;; A scheme-spec is (listof scheme-spec-elt)
-  ;; A scheme-spec-elt is either
-  ;;  - a string, or
-  ;;  - (cons ... oh crud.
-  #;(define xml-snip-creation@
-    (unit/sig (create-xml-snip create-scheme-snip create-splice-snip)
-      (import (xml-snip% scheme-snip%))
-      
-      (define (construct-xml-box spec)
-        (let* ([new-xml-box (instantiate xml-snip% () 
-                              [eliminate-whitespace-in-empty-tags? #t])] ;  need to check what the languages themselves do here
-               [xml-editor (send new-xml-box get-editor)])
-          (for-each
-           (match-lambda
-            [`(scheme-box ,@(schemeboxspec ...)) (send new-xml-box insert (construct-scheme-box #f schemeboxspec))]
-            [`(splice-box ,@(spliceboxspec ...)) (send new-xml-box insert (construct-scheme-box #f spliceboxspec))]
-            [(? string? text) (send xml-editor insert text)])
-           spec)
-          new-xml-box))
-      
-      (define (construct-scheme-box splice? spec)
-        (let* ([new-scheme-box (instantiate scheme-snip% () [splice? splice?])]
-               [scheme-editor (send new-scheme-box get-editor)])
-          (for-each 
-           (match-lambda
-            [`(xml-box ,@(xmlspec ...)) (send scheme-editor insert (construct-xml-box xmlspec))]
-            [(? string? text) (send scheme-editor insert text)])
-           spec)))))
-  
-  
-  (define (language-level->name language)
-    (car (last-pair (send language get-language-position))))
-  
-  
-  ;; per Robby's suggestion: rather than using a hash table for 
-  ;; lambdas, just use an applicable structure instead.
-  
-  ;; An annotated procedure is represented at runtime by
-  ;; an applicable structure that stores stepper information.
-  (struct annotated-proc (base info)
-    #:property prop:procedure
-    (struct-field-index base))
-  
-  
-  (define-signature view-controller^ (go))
-  (define-signature stepper-frame^ (stepper-frame%))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/syntax-property.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/syntax-property.rkt
deleted file mode 100644
index 5977ccc837..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/syntax-property.rkt
+++ /dev/null
@@ -1,94 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base))
-
-(provide stepper-syntax-property
-         with-stepper-syntax-properties
-         
-         skipto/cdr
-         skipto/cddr
-         skipto/first
-         skipto/second
-         skipto/third
-         skipto/fourth
-         skipto/firstarg)
-
-
-;; stepper-syntax-property : like syntax property, but adds properties to an association
-;; list associated with the syntax property 'stepper-properties
-
-(define stepper-syntax-property
-  (case-lambda 
-    [(stx tag)
-     (unless (member tag known-stepper-syntax-property-names)
-       (raise-type-error 'stepper-syntax-property
-                         "known stepper property symbol" 1 stx tag))
-     (let ([stepper-props (syntax-property stx 'stepper-properties)])
-       (if stepper-props
-           (let ([table-lookup (assq tag stepper-props)])
-             (if table-lookup
-                 (cadr table-lookup)
-                 #f))
-           #f))]
-    [(stx tag new-val) 
-     (unless (member tag known-stepper-syntax-property-names)
-       (raise-type-error 'stepper-syntax-property
-                         "known stepper property symbol" 1 
-                         stx tag new-val))
-     (syntax-property stx 'stepper-properties
-                      (cons (list tag new-val)
-                            (or (syntax-property stx 'stepper-properties)
-                                null)))]))
-
-
-
-;; if the given property name isn't in this list, signal an error...
-(define known-stepper-syntax-property-names 
-  '(stepper-skip-completely
-    stepper-hint
-    stepper-define-type
-    stepper-xml-hint
-    stepper-xml-value-hint
-    stepper-proc-define-name
-    stepper-orig-name
-    stepper-prim-name
-    stepper-binding-type
-    stepper-no-lifting-info
-    stepper-and/or-clauses-consumed
-    stepper-skipto
-    stepper-skipto/discard
-    stepper-replace
-    stepper-else
-    stepper-black-box-expr
-    stepper-test-suite-hint
-    stepper-highlight
-    stepper-fake-exp
-    stepper-args-of-call
-    stepper-hide-completed
-    stepper-hide-reduction
-    stepper-use-val-as-final
-    stepper-lifted-name
-    lazy-op
-    ))
-
-
-;; with-stepper-syntax-properties : like stepper-syntax-property, 
-;; but in a "let"-like form
-(define-syntax (with-stepper-syntax-properties stx)
-  (syntax-case stx ()
-    [(_ ([property val] ...) body)
-     (foldl (lambda (property val b)
-              #`(stepper-syntax-property #,b #,property #,val))
-            #'body
-            (syntax->list #`(property ...))
-            (syntax->list #`(val ...)))]))
-
-
-;; commonly used values for stepper-syntax-property:
-(define skipto/cdr `(syntax-e cdr))
-(define skipto/cddr `(syntax-e cdr cdr))
-(define skipto/first `(syntax-e car))
-(define skipto/second `(syntax-e cdr car))
-(define skipto/third `(syntax-e cdr cdr car))
-(define skipto/fourth `(syntax-e cdr cdr cdr car))
-(define skipto/firstarg (append skipto/cdr skipto/second))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/vertical-separator-snip.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/vertical-separator-snip.rkt
deleted file mode 100644
index d927f272c9..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/vertical-separator-snip.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-(module vertical-separator-snip mzscheme
-  (require mred
-           mzlib/class
-           "mred-extensions.rkt")
-  
-  (provide snip-class)
-  (define snip-class (make-object vertical-separator-snip-class%))
-  (send snip-class set-classname (format "~s" `(lib "vertical-separator-snip.ss" "stepper" "private")))
-  (send (get-the-snip-class-list) add snip-class))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/view-controller.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/view-controller.rkt
deleted file mode 100644
index 437ab2417a..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/view-controller.rkt
+++ /dev/null
@@ -1,542 +0,0 @@
-#lang racket/unit
-
-;; this module implements the UI side of the stepper; it 
-;; opens a window, starts the stepper thread running, 
-;; and handles the resulting calls to 'break'.
-
-;; this module lies outside of the "testing boundary"
-;; of through-tests; it is not tested automatically at all.
-
-;; this version of the view-controller just collects the steps up front rather
-;; than blocking until the user presses the "next" button.
-
-(require racket/class
-         racket/match
-         racket/list
-         drracket/tool
-         mred
-         string-constants
-         racket/async-channel
-         (prefix-in model: "model.rkt")
-         (prefix-in x: "mred-extensions.rkt")
-         "shared.rkt"
-         "model-settings.rkt"
-         "xml-sig.rkt"
-         images/compile-time
-         images/gui
-         (for-syntax racket/base images/icons/control images/icons/style images/logos))
-
-
-(import drracket:tool^ xml^ stepper-frame^)
-(export view-controller^)
-
-(define drracket-eventspace (current-eventspace))
-
-(define (definitions-text->settings definitions-text)
-  (send definitions-text get-next-settings))
-  
-;; the stored representation of a step
-(define-struct step (text kind posns) #:transparent)
-
-(define (show-about-dialog parent)
-  (define dlg
-    (new logo-about-dialog%
-         [label "About the Stepper"]
-         [parent parent]
-         [bitmap (compiled-bitmap (stepper-logo))]
-         [messages '("The Algebraic Stepper is formalized and proved correct in\n"
-                     "\n"
-                     "    John Clements, Matthew Flatt, Matthias Felleisen\n"
-                     "    Modeling an Algebraic Stepper\n"
-                     "    European Symposium on Programming, 2001\n")]))
-  (send dlg show #t))
-
-(define (go drracket-tab program-expander selection-start selection-end)
-  
-  ;; get the language-level:
-  (define language-settings 
-    (definitions-text->settings
-      (send drracket-tab get-defs)))
-  
-  (define language-level 
-    (drracket:language-configuration:language-settings-language 
-     language-settings))
-  
-  (define simple-settings
-    (drracket:language-configuration:language-settings-settings
-     language-settings))
-  
-  ;; VALUE CONVERSION CODE:
-  
-  ;; render-to-string : TST -> string
-  (define (render-to-string val)
-    (let ([string-port (open-output-string)])
-      (send language-level render-value 
-            val simple-settings string-port)
-      (get-output-string string-port)))
-  
-  ;; render-to-sexp : TST -> sexp
-  (define (render-to-sexp val)
-    (send language-level stepper:render-to-sexp
-          val simple-settings language-level))
-  
-  ;; channel for incoming views
-  (define view-channel (make-async-channel))
-  
-  ;; the first-step semaphore
-  (define first-step-sema (make-semaphore 0))
-  
-  ;; the list of available views
-  (define view-history null)
-  
-  ;; the number of available steps
-  (define num-steps-available 0)
-  
-  ;; the view in the stepper window
-  (define view #f)
-  
-  ;; wait for steps to show up on the channel.  
-  ;; When they do, add them to the list.
-  (define (start-listener-thread stepper-frame-eventspace)
-    ;; as of 2012-06-20, I no longer believe there's any
-    ;; need for this thread, as the queue-callback handles
-    ;; the needed separation.
-    (thread
-     (lambda ()
-       (let loop ()
-         (define new-result (async-channel-get view-channel))
-         (receive-result-from-target new-result)
-         (loop)))))
-  
-  ;; handles an incoming result. Either adds it to the list of 
-  ;; steps, or prompts user to see whether to continue running.
-  (define (receive-result-from-target result)
-    (cond [(runaway-process? result)
-           (parameterize ([current-eventspace stepper-frame-eventspace])
-             (queue-callback
-              (lambda ()
-                (when (confirm-running)
-                  (semaphore-post (runaway-process-sema result)))
-                (void))))]
-          [else
-           (define new-step (format-result result))
-           (parameterize ([current-eventspace stepper-frame-eventspace])
-             (queue-callback
-              (lambda ()
-                (set! view-history (append view-history (list new-step)))
-                (set! num-steps-available (length view-history))
-                ;; this is only necessary the first time, but it's cheap:
-                (semaphore-post first-step-sema)
-                (update-status-bar))))]))
-    
-  
-  ;; find-later-step : given a predicate on history-entries, search through
-  ;; the history for the first step that satisfies the predicate and whose 
-  ;; number is greater than n (or -1 if n is #f), return # of step on success,
-  ;; on failure return (list 'nomatch last-step) or (list 'nomatch/seen-final
-  ;; last-step) if we went past the final step
-  (define (find-later-step p n)
-    (let* ([n-as-num (or n -1)])
-      (let loop ([step 0] 
-                 [remaining view-history]
-                 [seen-final? #f])
-        (cond [(null? remaining) 
-               (cond [seen-final? (list `nomatch/seen-final (- step 1))]
-                     [else (list `nomatch (- step 1))])]
-              [(and (> step n-as-num) (p (car remaining))) step]
-              [else (loop (+ step 1)
-                          (cdr remaining)
-                          (or seen-final? (finished-stepping-step? (car remaining))))]))))
-  
-  ;; find-earlier-step : like find-later-step, but searches backward from
-  ;; the given step.
-  (define (find-earlier-step p n)
-    (unless (number? n)
-      (error 'find-earlier-step 
-             "can't find earlier step when no step is displayed."))
-    (let* ([to-search (reverse (take view-history n))])
-      (let loop ([step (- n 1)]
-                 [remaining to-search])
-        (cond [(null? remaining) `nomatch]
-              [(p (car remaining)) step]
-              [else (loop (- step 1) (cdr remaining))]))))
-  
-  
-  ;; STEP PREDICATES:
-  
-  ;; is this an application step?
-  (define (application-step? history-entry)
-    (match history-entry
-      [(struct step (text (or 'user-application 'finished-or-error) posns)) #t]
-      [else #f]))
-  
-  ;; is this the finished-stepping step?
-  (define (finished-stepping-step? history-entry)
-    (match (step-kind history-entry)
-      ['finished-or-error #t]
-      [else #f]))
-  
-  ;; is this step on the selected expression?
-  (define (selected-exp-step? history-entry)
-    (ormap (span-overlap selection-start selection-end) (step-posns history-entry)))
-    
-  ;; build gui object:
-  
-
-  ;; next-of-specified-kind : starting at the current view, search forward for the
-  ;; desired step or wait for it if not found
-  (define (next-of-specified-kind right-kind? msg)
-    (next-of-specified-kind/helper right-kind? view msg))
-  
-  ;; first-of-specified-kind : similar to next-of-specified-kind, but 
-  ;; always start at zero
-  (define (first-of-specified-kind right-kind? msg)
-    (next-of-specified-kind/helper right-kind? #f msg))
-  
-  ;; next-of-specified-kind/helper : if the desired step 
-  ;; is already in the list, display it; otherwise, give up.
-  (define (next-of-specified-kind/helper right-kind? starting-step msg)
-    (match (find-later-step right-kind? starting-step)
-      [(? number? n)
-       (update-view/existing n)]
-      [(list `nomatch step)
-       (message-box (string-constant stepper-no-such-step/title) msg)
-       (when (>= num-steps-available 0)
-         (update-view/existing step))]
-      [(list `nomatch/seen-final step)
-       (message-box (string-constant stepper-no-such-step/title) msg)
-       (when (>= num-steps-available 0)
-         (update-view/existing step))]))
-  
-  ;; prior-of-specified-kind: if the desired step is already in the list, display
-  ;; it; otherwise, put up a dialog and jump to the first step.
-  (define (prior-of-specified-kind right-kind? msg)
-    (match (find-earlier-step right-kind? view)
-      [(? number? found-step)
-       (update-view/existing found-step)]
-      [`nomatch
-       (message-box (string-constant stepper-no-such-step/title) msg)
-       (when (>= num-steps-available 0)
-         (update-view/existing 0))]))
-  
-  ;; BUTTON/CHOICE BOX PROCEDURES
- 
-  
-  ;; respond to a click on the "next" button
-  (define (next)
-    (next-of-specified-kind (lambda (x) #t) 
-                            (string-constant stepper-no-later-step)))
-  
-  ;; previous : the action of the 'previous' button
-  (define (previous)
-    (prior-of-specified-kind (lambda (x) #t)
-                             (string-constant stepper-no-earlier-step)))
-  
-  ;; respond to a click on the "Jump To..." choice
-  (define (jump-to control event)
-    ((second (list-ref pulldown-choices (send control get-selection)))))
-  
-  ;; jump-to-beginning : the action of the choice menu entry
-  (define (jump-to-beginning)
-    (first-of-specified-kind (lambda (x) #t)
-                             ;; I don't believe this can fail...
-                             "internal error 2010-01-10 21:48"))
-  
-  ;; jump-to-end : the action of the jump-to-end choice box option
-  (define (jump-to-end)
-    (first-of-specified-kind finished-stepping-step?
-                             (string-constant stepper-no-last-step)))
-  
-  ;; jump-to-selected : the action of the jump to selected choice box option
-  (define (jump-to-selected)
-    (first-of-specified-kind selected-exp-step?
-                             (string-constant stepper-no-selected-step)))
-  
-  ;; jump-to-next-application : the action of the jump to next application
-  ;; choice box option
-  (define (jump-to-next-application)
-    (next-of-specified-kind application-step?
-                            (string-constant stepper-no-later-application-step)))
-  
-  ;; jump-to-prior-application : the action of the "jump to prior application"
-  ;; choice box option
-  (define (jump-to-prior-application)
-    (prior-of-specified-kind application-step?
-                             (string-constant 
-                              stepper-no-earlier-application-step)))
-  
-  
-  ;; GUI ELEMENTS:
-  (define s-frame
-    (make-object stepper-frame% drracket-tab))
-  
-  (define top-panel
-    (new horizontal-panel% [parent (send s-frame get-area-container)] [horiz-margin 5]
-         ;[style '(border)]  ; for layout testing only
-         [stretchable-width #t]
-         [stretchable-height #f]))
-  
-  (define button-panel
-    (new horizontal-panel% [parent top-panel] [alignment '(center top)]
-         ;[style '(border)]  ; for layout testing only
-         [stretchable-width #t]
-         [stretchable-height #f]))
-  
-  (define logo-canvas
-    (new (class bitmap-canvas%
-           (super-new [parent top-panel] [bitmap (compiled-bitmap (stepper-logo #:height 32))])
-           (define/override (on-event evt)
-             (when (eq? (send evt get-event-type) 'left-up)
-               (show-about-dialog s-frame))))))
-  
-  (define prev-img (compiled-bitmap (step-back-icon #:color run-icon-color
-                                                    #:height (toolbar-icon-height))))
-  (define previous-button (new button%
-                               [label (list prev-img (string-constant stepper-previous) 'left)]
-                               [parent button-panel]
-                               [callback (λ (_1 _2) (previous))]
-                               [enabled #f]))
-  
-  (define next-img (compiled-bitmap (step-icon #:color run-icon-color
-                                               #:height (toolbar-icon-height))))
-  (define next-button (new button%
-                           [label (list next-img (string-constant stepper-next) 'right)]
-                           [parent button-panel]
-                           [callback (λ (_1 _2) (next))]
-                           [enabled #f]))
-  
-  (define pulldown-choices
-    `((,(string-constant stepper-jump-to-beginning)            ,jump-to-beginning)
-      (,(string-constant stepper-jump-to-end)                  ,jump-to-end)
-      (,(string-constant stepper-jump-to-selected)             ,jump-to-selected)
-      (,(string-constant stepper-jump-to-next-application)     ,jump-to-next-application)
-      (,(string-constant stepper-jump-to-previous-application) ,jump-to-prior-application)))
-  
-  (define jump-button (new choice%
-                           [label (string-constant stepper-jump)]
-                           [choices (map first pulldown-choices)]
-                           [parent button-panel]
-                           [callback jump-to]
-                           [enabled #f]))
-  
-  (define canvas
-    (make-object x:stepper-canvas% (send s-frame get-area-container)))
-  
-  ;; counting steps...
-  (define status-text
-    (new text%))
-  
-  (define status-canvas
-    (new editor-canvas%
-         [parent button-panel]
-         [editor status-text]
-         [stretchable-width #f]
-         [style '(transparent no-border no-hscroll no-vscroll)]
-         ;; some way to get the height of a line of text?
-         [min-width 100]))
-
-  
-  ;; update-view/existing : set an existing step as the one shown in the
-  ;; frame
-  (define (update-view/existing new-view)
-    (set! view new-view)
-    (let ([e (step-text (list-ref view-history view))])
-      (send e begin-edit-sequence)
-      (send canvas set-editor e)
-      (send e reset-width canvas)
-      ;; why set the position within the step? I'm confused by this.--JBC
-      (send e set-position (send e last-position))
-      (send e end-edit-sequence))
-    (update-status-bar))
-  
-  ;; set the status bar to the correct m/n text.
-  (define (update-status-bar)
-    (send status-text begin-edit-sequence)
-    (send status-text lock #f)
-    (send status-text delete 0 (send status-text last-position))
-    ;; updated to yield 1-based step numbering rather than 0-based numbering.
-    (send status-text insert 
-          (format "~a/~a" (if view (+ 1 view) "none") (length view-history)))
-    (send status-text lock #t)
-    (send status-text end-edit-sequence))
-  
-  (define update-status-bar-semaphore (make-semaphore 1))
-  
-  (define (enable-all-buttons)
-    (send previous-button enable #t)
-    (send next-button enable #t)
-    (send jump-button enable #t))
-
-  
-  (define (print-current-view item evt)
-    (send (send canvas get-editor) print))
-  
-  ;; code for dealing with runaway processes:
-  
-  (define runaway-counter-limit 500)
-  (define disable-runaway-counter #f)
-  (define runaway-counter 0)
-
-  ;; runs on the stepped-process side.
-  ;; checks to see if the process has taken too
-  ;; many steps. If so, send a message and block
-  ;; for a response, then send the result. Otherwise,
-  ;; just send the result.
-  (define (deliver-result-to-gui result)
-    (when (not disable-runaway-counter)
-      (set! runaway-counter (+ runaway-counter 1)))
-    (when (= runaway-counter runaway-counter-limit)
-      (define runaway-semaphore (make-semaphore 0))
-      (async-channel-put view-channel 
-                         (runaway-process runaway-semaphore))
-      ;; wait for a signal to continue running:
-      (semaphore-wait runaway-semaphore))
-    (async-channel-put view-channel result))
-  
-  (define keep-running-message
-    (string-append 
-     "The program running in the stepper has taken a whole bunch of steps. "
-     "Do you want to continue running it for now, halt, or let it run "
-     "without asking again?"))
-  
-  (define (confirm-running)
-    (define message-box-result
-      (message-box/custom
-       "Keep Running Program?"
-       keep-running-message
-       "Continue for now"
-       "Halt"
-       "Continue uninterrupted"
-       #f ;; use the stepper window instead?
-       '(stop disallow-close default=1)
-       ))
-    (match message-box-result
-      ;; continue-for-now:
-      [1 (set! runaway-counter 0)
-         #t]
-      ;; halt:
-      [2 #f]
-      ;; continue-forever:
-      [3 (set! runaway-counter 0)
-         (set! disable-runaway-counter #t)
-         #t]))
-  
-  
-
-  ;; translates a result into a step
-  ;; format-result : step-result -> step?
-  (define (format-result result)
-    (match result
-      [(struct before-after-result (pre-exps post-exps kind pre-src post-src))
-       (make-step (new x:stepper-text% 
-                       [left-side pre-exps]
-                       [right-side post-exps]
-                       [show-inexactness? 
-                        (send language-level stepper:show-inexactness?)])
-                  kind 
-                  (list pre-src post-src))]
-      [(struct before-error-result (pre-exps err-msg pre-src))
-       (make-step (new x:stepper-text%
-                       [left-side pre-exps] 
-                       [right-side err-msg]
-                       [show-inexactness?
-                        (send language-level stepper:show-inexactness?)])
-                  'finished-or-error 
-                  (list pre-src))]
-      [(struct error-result (err-msg))
-       (make-step (new x:stepper-text% 
-                       [left-side null]
-                       [right-side err-msg]
-                       [show-inexactness?
-                        (send language-level stepper:show-inexactness?)]) 
-                  'finished-or-error 
-                  (list))]
-      [(struct finished-stepping ())
-       (make-step x:finished-text 'finished-or-error (list))]))
-  
-  ;; program-expander-prime : wrap the program-expander for a couple of reasons:
-  ;; 1) we need to capture the custodian as the thread starts up:
-  ;; ok, it was just one.
-  ;; 
-  (define (program-expander-prime init iter)
-    (program-expander
-     (lambda args
-       (send s-frame set-custodian! (current-custodian))
-       (apply init args))
-     iter))
-  
-  ;; CONFIGURE GUI ELEMENTS
-  (send s-frame set-printing-proc print-current-view)
-  (send canvas stretchable-height #t)
-  (send (send s-frame edit-menu:get-undo-item) enable #f)
-  (send (send s-frame edit-menu:get-redo-item) enable #f)
-  
-  (define stepper-frame-eventspace (send s-frame get-eventspace))
-  ;; START THE MODEL
-  (start-listener-thread stepper-frame-eventspace)
-  (model:go
-   program-expander-prime 
-   ;; what do do with the results:
-   deliver-result-to-gui
-   (get-render-settings render-to-string
-                        render-to-sexp 
-                        (send language-level stepper:enable-let-lifting?)
-			(send language-level stepper:show-consumed-and/or-clauses?)
-                        (send language-level stepper:show-lambdas-as-lambdas?)))
-  
-  (send s-frame show #t)
-  
-  ;; turn on the buttons and display the first step when it shows up:
-  (thread
-   (lambda ()
-     (semaphore-wait first-step-sema)
-     (parameterize
-         ([current-eventspace stepper-frame-eventspace])
-       (queue-callback
-        (lambda ()
-          (jump-to-beginning)
-          (enable-all-buttons))))))
-  
-  s-frame)
-
-
-
-;; UTILITY FUNCTIONS:
-
-;; span-overlap : number number -> posn-info -> boolean
-;; return true if the selection is of zero length and precedes a char of the 
-;; stepping expression, *or* if the selection has positive overlap with the 
-;; stepping expression.
-(define ((span-overlap selection-start selection-end) source-posn-info)
-  (match source-posn-info
-    [#f #f]
-    [(struct model:posn-info (posn span))
-     (let ([end (+ posn span)])
-       (and posn
-            ;; you can *almost* combine these two, but not quite.
-            (cond [(= selection-start selection-end)
-                   (and (<= posn selection-start) (< selection-start end))]
-                  [else 
-                   (let ([overlap-begin (max selection-start posn)]
-                         ;; nb: we don't want zero-length overlaps at the end.
-                         ;; compensate by subtracting one from the end of the 
-                         ;; current expression.
-                         [overlap-end (min selection-end end)])
-                     ;; #t if there's positive overlap:
-                     (< overlap-begin overlap-end))])))]))
-
-;; a few unit tests.  Use them if changing span-overlap.
-;; ...oops, can't use module+ inside of a unit.
-#;(module+ test
-  (require rackunit)
-  ;; zero-length selection cases:
-  (check-equal? ((span-overlap 13 13) (model:make-posn-info 14 4)) #f)
-  (check-equal? ((span-overlap 14 14) (model:make-posn-info 14 4)) #t)
-  (check-equal? ((span-overlap 18 18) (model:make-posn-info 14 4)) #f)
-  ;; nonzero-length selection cases:
-  (check-equal? ((span-overlap 13 14) (model:make-posn-info 14 4)) #f)
-  (check-equal? ((span-overlap 13 15) (model:make-posn-info 14 4)) #t)
-  (check-equal? ((span-overlap 13 23) (model:make-posn-info 14 4)) #t)
-  (check-equal? ((span-overlap 16 17) (model:make-posn-info 14 4)) #t)
-  (check-equal? ((span-overlap 16 24)  (model:make-posn-info 14 4)) #t)
-  (check-equal? ((span-overlap 18 21)  (model:make-posn-info 14 4)) #f))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-box.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-box.rkt
deleted file mode 100644
index ac4f4ef57b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-box.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-(module xml-box scheme/base
-  (require mzlib/contract
-           "shared.rkt"
-           "syntax-property.rkt"
-           (prefix-in kernel: syntax/kerncase))
-  
-  (provide/contract [rewrite-xml-box (syntax?                  ; stx to rewrite
-                                      (syntax? . -> . syntax?) ; rewriter for non-xml-box subcomponents
-                                      . -> . 
-                                      syntax?)])               ; rewritten
-  
-  
-  (define (rewrite-xml-box stx rewrite-other)
-      
-    (define (recur stx)
-      (rewrite-xml-box stx rewrite-other))
-    
-    (define (rewrite-xml-error)
-      (error 'rewrite-xml-box "unexpected syntax in expansion of xml box: ~.s" stx))
-
-    (case (stepper-syntax-property stx 'stepper-hint) 
-      [(from-scheme-box from-splice-box) (rewrite-other stx)]
-      [(from-xml-box #f)
-       (stepper-syntax-property
-        (kernel:kernel-syntax-case stx #f
-          [var-stx (identifier? (syntax var-stx)) (rewrite-xml-error)]
-          
-          [(#%plain-lambda . clause) (rewrite-xml-error)]
-          
-          [(case-lambda . clauses) (rewrite-xml-error)]
-          
-          [(if test then else) (rewrite-xml-error)]
-          
-          [(begin . bodies) (rewrite-xml-error)]
-          
-          [(begin0 . bodies) (rewrite-xml-error)]
-          
-          [(let-values . clause) (rewrite-xml-error)]
-          
-          [(letrec-values . clause) (rewrite-xml-error)]
-          
-          [(set! var val) (rewrite-xml-error)]
-          
-          [(quote _) stx]
-          
-          [(quote-syntax _) (rewrite-xml-error)]
-          
-          [(with-continuation-mark key mark body) (rewrite-xml-error)]
-          
-          [(#%plain-app . exprs)
-           (rebuild-stx (map recur (syntax->list #`exprs)) stx)]
-          
-          [(#%top . var) (rewrite-xml-error)]
-          
-          [else (error 'syntax-object-iterator "unknown expr: ~a" stx)])
-        'stepper-hint
-        'from-xml-box)]
-      
-      [else
-       (error 'rewrite-xml-box "unexpected stepper-hint ~e on syntax from xml box: ~.s"
-              (stepper-syntax-property stx 'stepper-hint)
-              stx)])))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-sig.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-sig.rkt
deleted file mode 100644
index 21b632bcdf..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-sig.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang scheme/signature
-
-xml-snip% scheme-snip%
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-snip-helpers.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-snip-helpers.rkt
deleted file mode 100644
index d9fc7d2423..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-snip-helpers.rkt
+++ /dev/null
@@ -1,156 +0,0 @@
-#lang racket/base
-
-(require xml/xml
-         syntax/readerr
-         racket/gui
-         "syntax-property.rkt")
-
-(provide xml-read-special
-         xml-snip<%>
-         scheme-read-special
-         scheme-snip<%>)
-
-(define (scheme-read-special snip source line col pos)
-  (let ([text (send snip get-editor)]
-        [splice? (send snip get-splice?)])
-    (when (= 0 (send text last-position))
-      (raise-read-error 
-       (if splice?
-           "read: bad syntax: empty scheme splice box"
-           "read: bad syntax: empty scheme box")
-       source line col pos 1))
-    (let* ([source-name (get-source-name text)]
-           [stx (read-syntax source-name
-                             (open-input-text-editor text 0 'end values source-name))])
-      (when (eof-object? stx)
-        (raise-read-error
-         (if splice?
-             "read: bad syntax: empty scheme splice box"
-             "read: bad syntax: empty scheme box")
-         source-name 1 1 1 (send text last-position)))
-      stx)))
-
-(define (get-source-name text)
-  (cond
-    [(method-in-interface? 'get-port-name (object-interface text))
-     (send text get-port-name)]
-    [else
-     (send text get-filename)]))
-
-(define (xml-read-special eliminate-whitespace-in-empty-tags? snip source line col pos)
-  (let ([editor (send snip get-editor)]
-        [old-locked #f])
-    (when (= 0 (send editor last-position))
-      (raise-read-error "read: bad syntax: empty xml box"
-                        source line col pos 1))
-    (dynamic-wind
-     (lambda () 
-       (set! old-locked (send editor is-locked?))
-       (send editor lock #t))
-     (lambda ()
-       (let* ([source-name (get-source-name editor)]
-              [port (open-input-text-editor editor 0 'end (xml-snip-filter editor) source-name)]
-              [xml (parameterize ([permissive-xexprs #t]) (read-xml port))]
-              [xexpr (parameterize ([permissive-xexprs #t]) (xml->xexpr (document-element xml)))]
-              [clean-xexpr (if eliminate-whitespace-in-empty-tags?
-                               (eliminate-whitespace-in-empty-tags xexpr)
-                               xexpr)]
-              [expd-xexpr (expand-embedded clean-xexpr)]
-              [qq-body (datum->syntax #'here expd-xexpr (list editor #f #f #f #f))])
-         (with-syntax ([qq-body qq-body])
-           (stepper-syntax-property (syntax (quasiquote qq-body))
-                                    'stepper-xml-hint
-                                    'from-xml-box))))
-     (lambda () (send editor lock old-locked)))))
-
-(define ((xml-snip-filter text) s)
-  (cond
-    [(is-a? s scheme-snip<%>)
-     (let* ([position (send text get-snip-position s)]
-            [line (send text position-paragraph position)]
-            [col (- position (send text paragraph-start-position line))])
-       (make-wrapped s text line col position))]
-    [else s]))
-
-(define scheme-snip<%>
-  (interface ()
-    get-splice?))
-
-(define xml-snip<%>
-  (interface ()))
-
-;; eliminate-whitespace-in-empty-tags : xexpr -> xexpr
-(define (eliminate-whitespace-in-empty-tags xexpr)
-  (cond
-    [(and (pair? xexpr)
-          (symbol? (car xexpr)))
-     (list* (car xexpr)
-            (cadr xexpr)
-            (map eliminate-whitespace-in-empty-tags
-                 (eliminate-whitespace-in-list (cddr xexpr))))]
-    [else xexpr]))
-
-;; wrapped = (make-wraped sexp text number number number)
-(define-struct wrapped (snip text line col pos))
-
-;; expand-embedded : xexpr -> xexpr
-;; constructs a new xexpr that has the embedded snips expanded 
-;; and wrapped with unquotes
-;; CRUCIAL INVARIANT: an expression must not receive both 'from-xml-box and 'from-scheme/splice-box tags.
-(define (expand-embedded _xexpr)
-  (let loop ([xexpr _xexpr])
-    (cond
-      [(pair? xexpr)
-       (cons (loop (car xexpr))
-             (loop (cdr xexpr)))]
-      [(wrapped? xexpr)
-       (let* ([snip (wrapped-snip xexpr)]
-              [text (wrapped-text xexpr)]
-              [pos (wrapped-pos xexpr)]
-              [line (wrapped-line xexpr)]
-              [col (wrapped-col xexpr)]
-              [raw-stxs (list (send snip read-special text line col pos))])
-         (with-syntax ([(stxs ...) raw-stxs])
-           (if (and (is-a? snip scheme-snip<%>)
-                    (send snip get-splice?))
-               (with-syntax ([err (syntax/loc 
-                                      (car (last-pair raw-stxs))
-                                    (error 'scheme-splice-box "expected a list, found: ~e" lst))])
-                 #`,@#,(stepper-syntax-property #`(let ([lst (begin stxs ...)])
-                                                    (if (list? lst)
-                                                        lst
-                                                        err))
-                                                'stepper-xml-hint
-                                                'from-splice-box))
-               #`,#,(stepper-syntax-property #`(begin stxs ...) 
-                                             'stepper-xml-hint
-                                             'from-scheme-box))))]
-      [else xexpr])))
-
-;; eliminate-whitespace-in-list (listof xexpr) -> (listof xexpr)
-;; if each string in xexprs is a whitespace string, remove all strings
-;; otherwise, return input.
-(define (eliminate-whitespace-in-list xexprs)
-  (cond
-    [(andmap (lambda (x) (or (not (string? x))
-                             (string-whitespace? x)))
-             xexprs)
-     (filter (lambda (x) (not (string? x))) xexprs)]
-    [else xexprs]))
-
-;; string-whitespace? : string -> boolean
-;; return #t if the input string consists entirely of whitespace
-(define (string-whitespace? str)
-  (let loop ([i (string-length str)])
-    (cond
-      [(zero? i) #t]
-      [(char-whitespace? (string-ref str (- i 1)))
-       (loop (- i 1))]
-      [else #f])))
-
-
-;; transformable? : snip -> boolean
-;; deteremines if a snip can be expanded here
-(define (transformable? snip)
-  (or (is-a? snip xml-snip<%>)
-      (is-a? snip scheme-snip<%>)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/stepper+xml-tool.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/stepper+xml-tool.rkt
deleted file mode 100644
index 7dd8cb52f1..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/stepper+xml-tool.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         drracket/tool
-         "stepper-tool.rkt"
-         "xml-tool.rkt"
-         "private/view-controller.rkt")
-
-(provide tool@)
-
-;; the xml and stepper tools are combined, so that the stepper can create XML
-;; snips. 
-
-(define tool@
-  (compound-unit/infer
-   (import drracket:tool^)
-   (export STEPPER-TOOL)
-   (link xml-tool@ 
-         view-controller@
-         [((STEPPER-TOOL : drracket:tool-exports^)) stepper-tool@])))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/stepper-tool.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/stepper-tool.rkt
deleted file mode 100644
index 62158aa0c6..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/stepper-tool.rkt
+++ /dev/null
@@ -1,440 +0,0 @@
-#lang racket/unit
-
-(require racket/class
-         drracket/tool
-         mred
-         (prefix-in frame: framework) 
-         mrlib/switchable-button
-         mzlib/pconvert
-         racket/pretty
-         string-constants
-         lang/stepper-language-interface
-         (prefix-in x: "private/mred-extensions.rkt")
-         "private/shared.rkt"
-         "private/xml-sig.rkt"
-         "drracket-button.rkt") ;; get the stepper-button-callback private-member-name
-
-(import drracket:tool^ xml^ view-controller^)
-(export drracket:tool-exports^ stepper-frame^)
-
-  ;; tool magic here:
-(define (phase1)
-  ;; experiment with extending the language... parameter-like fields for stepper parameters
-  (drracket:language:extend-language-interface
-   stepper-language<%>
-   (lambda (superclass)
-     (class* superclass (stepper-language<%>)
-       (public stepper:supported?)
-       (define (stepper:supported?) #f)
-       
-       (public stepper:enable-let-lifting?)
-       (define (stepper:enable-let-lifting?) #f)
-       
-       (public stepper:show-lambdas-as-lambdas?)
-       (define (stepper:show-lambdas-as-lambdas?) #t)
-       
-       (public stepper:show-inexactness?)
-       (define (stepper:show-inexactness?) #t)
-
-       (public stepper:show-consumed-and/or-clauses?)
-       (define (stepper:show-consumed-and/or-clauses?) #t)
-       
-       (public stepper:render-to-sexp)
-       (define (stepper:render-to-sexp val settings language-level)
-         (parameterize ([pretty-print-show-inexactness (stepper:show-inexactness?)]
-                        [current-print-convert-hook stepper-print-convert-hook])
-           (set-print-settings
-            language-level
-            settings
-            (lambda ()
-              (simple-module-based-language-convert-value
-               val
-               settings)))))
-       
-       (super-instantiate ())))))
-
-(define (phase2) (void))
-
-;; this should be a preference:
-(define stepper-initial-width 500)
-(define stepper-initial-height 500)
-
-(define (extract-language-level definitions-text)
-  (settings->language-level (definitions-text->settings definitions-text)))
-
-(define (definitions-text->settings definitions-text)
-  (send definitions-text get-next-settings))
-
-(define (settings->language-level settings)
-  (drracket:language-configuration:language-settings-language settings))
-
-(define (stepper-works-for? language-level)
-  (or (send language-level stepper:supported?)
-      (getenv "PLTSTEPPERUNSAFE")))
-  
-  ;; the stepper's frame:
-  
-(define stepper-frame%
-  (class (drracket:frame:basics-mixin
-          (frame:frame:standard-menus-mixin frame:frame:basic%))
-    
-    (init-field drracket-tab)
-    
-    ;; PRINTING-PROC
-    ;; I frankly don't think that printing (i.e., to a printer) works
-    ;; correctly. 2005-07-01, JBC
-    (public set-printing-proc)
-    
-    (define (set-printing-proc proc)
-      (set! printing-proc proc))
-    
-    (define (printing-proc item evt)
-      (message-box "error?" "shouldn't be called"))
-    
-    (define/private (file-menu:print a b) (printing-proc a b))
-    
-    ;; MENUS
-    
-    (define/override (edit-menu:between-find-and-preferences edit-menu)
-      (void))
-    (define/override (edit-menu:between-select-all-and-find edit-menu)
-      (void))
-    (define/override (file-menu:between-save-as-and-print file-menu)
-      (void))
-    
-    ;; CUSTODIANS
-    ;; The custodian is used to halt the stepped computation when the
-    ;; stepper window closes.  The custodian is captured when the stepped
-    ;; computation starts.
-    
-    (define custodian #f)
-    (define/public (set-custodian! cust)
-      (set! custodian cust))
-    (define/augment (on-close)
-      (when custodian
-        (custodian-shutdown-all custodian))
-      (send drracket-tab on-stepper-close)
-      (inner (void) on-close))
-    
-    ;; WARNING BOXES:
-    
-    (define program-changed-warning-str
-      (string-constant stepper-program-has-changed))
-    (define window-closed-warning-str
-      (string-constant stepper-program-window-closed))
-    
-    (define warning-message-visible-already #f)
-    (define/private (add-warning-message warning-str)
-      (let ([warning-msg (new x:stepper-warning%
-                              [warning-str warning-str]
-                              [parent (get-area-container)])])
-        (send (get-area-container)
-              change-children
-              (if warning-message-visible-already
-                  (lambda (l)
-                    (list (car l) warning-msg (caddr l)))
-                  (lambda (l)
-                    (list (car l) warning-msg (cadr l)))))
-        (set! warning-message-visible-already #t)))
-    
-    (inherit get-area-container)
-    (define program-change-already-warned? #f)
-    (define/public (original-program-changed)
-      (unless program-change-already-warned?
-        (set! program-change-already-warned? #t)
-        (add-warning-message program-changed-warning-str)))
-    
-    (define/public (original-program-gone)
-      (add-warning-message window-closed-warning-str))
-    
-    (super-new [label "Stepper"] [parent #f]
-               [width stepper-initial-width]
-               [height stepper-initial-height])))
-  
-
-  ;; stepper-unit-frame<%> : the interface that the extended drracket frame
-  ;; fulfils
-  (define stepper-tab<%>
-    (interface ()
-      get-stepper-frame
-      on-stepper-close))
-  
-  ;; stepper-unit-frame-mixin : the mixin that is applied to the drracket
-  ;; frame to interact with a possible stepper window. Specifically, this
-  ;; mixin needs to manage the creation and visibility of the stepper button.
-  (define (stepper-unit-frame-mixin super%)
-    (class* super% ()
-      (inherit get-button-panel register-toolbar-button get-current-tab get-tabs)
-      
-      (super-new)
-      
-      ;; STEPPER BUTTON
-      
-      (define/public (get-stepper-button) stepper-button)
-      
-      (define stepper-button-parent-panel 
-        (new frame:panel:horizontal-discrete-sizes%
-             [parent (get-button-panel)]
-             [stretchable-width #f]
-             [stretchable-height #f]))
-      
-      (define stepper-button
-        (new switchable-button% 
-             [parent stepper-button-parent-panel]
-             [label (string-constant stepper-button-label)]
-             [bitmap x:step-img]
-             [callback (lambda (dont-care) (send (get-current-tab)
-                                                 stepper-button-callback))]))
-      
-      (register-toolbar-button stepper-button #:number 59)
-      
-      (define (stepper-button-show)
-        (unless (send stepper-button is-shown?)
-          (send (send stepper-button get-parent)
-                add-child stepper-button)))
-      
-      (define (stepper-button-hide)
-        (when (send stepper-button is-shown?)
-          (send (send stepper-button get-parent)
-                delete-child stepper-button)))
-      
-      ;; when the window closes, notify all of the stepper frames.
-      (define/augment (on-close)
-        (for ([tab (in-list (get-tabs))])
-          (define possible-stepper-frame (send tab get-stepper-frame))
-          (when possible-stepper-frame
-            (send possible-stepper-frame original-program-gone)))        
-        (inner (void) on-close))
-      
-      ;; when we change tabs, show or hide the stepper button.
-      (define/augment (on-tab-change old new)
-        (show/hide-stepper-button)
-        (inner (void) on-tab-change old new))
-      
-      ;; add the stepper button to the button panel:
-      (send (get-button-panel) change-children 
-            (lambda (x) 
-              (cons stepper-button-parent-panel
-                    (remq stepper-button-parent-panel x))))
-      
-      ;; show or hide the stepper button depending
-      ;; on the language level
-      (define/public (show/hide-stepper-button)
-        (cond [(send (get-current-tab) current-lang-supports-stepper?)
-               (stepper-button-show)]
-              [else 
-               (stepper-button-hide)]))
-      
-      ;; hide stepper button if it's not supported for the initial language:
-      (show/hide-stepper-button)))
-  
-  ;; stepper-tab-mixin : the mixin that is applied to drracket tabs, to
-  ;; interact with a possible stepper window.
-  (define (stepper-tab-mixin super%)
-    (class* super% (stepper-tab<%>)
-      
-      (inherit get-ints get-defs get-frame get-directory)
-      
-      ;; a reference to a possible stepper frame.
-      (define stepper-frame #f)
-      (define/public (on-stepper-close)
-        (set! stepper-frame #f))
-      (define/public (get-stepper-frame) stepper-frame)
-      
-      (super-new)
-      
-      ;; program-expander : produces expanded expressions from the
-      ;; definitions window one at a time and calls 'iter' on each one
-      (define (program-expander init iter)
-        (let* ([lang-settings
-                (send (get-defs) get-next-settings)]
-               [lang (drracket:language-configuration:language-settings-language lang-settings)]
-               [settings (drracket:language-configuration:language-settings-settings lang-settings)])
-          (drracket:eval:expand-program
-           (drracket:language:make-text/pos
-            (get-defs)
-            0
-            (send (get-defs) last-position))
-           lang-settings
-           #f
-           (lambda ()
-             (init)
-             (error-value->string-handler
-              (lambda (val len)
-                (let ([sp (open-output-string)])
-                  (send lang render-value val settings sp)
-                  (let ([str (get-output-string sp)])
-                    (if ((string-length str) . <= . len)
-                        str
-                        (string-append (substring str 0 (max 0 (- len 3)))
-                                       "..."))))))
-             (current-print void))
-           void ; kill
-           iter)))
-      
-
-      ;; called from drracket-button.rkt, installed via the #lang htdp/bsl (& co) reader into drracket
-      (define/public (stepper-button-callback)
-        (cond 
-          [stepper-frame (send stepper-frame show #t)]
-          [else (create-new-stepper)]))
-      
-      ;; open a new stepper window, start it running
-      (define (create-new-stepper)
-        (let* ([language-level
-                (extract-language-level (get-defs))]
-               [language-level-name (language-level->name language-level)])
-          (if (or (stepper-works-for? language-level)
-                  (is-a? language-level drracket:module-language:module-language<%>))
-              (parameterize ([current-directory (or (get-directory) (current-directory))])
-                (set! stepper-frame
-                      (go this 
-                          program-expander 
-                          (+ 1 (send (get-defs) get-start-position))
-                          (+ 1 (send (get-defs) get-end-position)))))
-              (message-box
-               (string-constant stepper-name)
-               (format (string-constant stepper-language-level-message)
-                       language-level-name)))))
-      
-      (define/override (enable-evaluation)
-        (super enable-evaluation)
-        (send (send (get-frame) get-stepper-button) enable #t))
-      
-      (define/override (disable-evaluation)
-        (super disable-evaluation)
-        (send (send (get-frame) get-stepper-button) enable #f))
-      
-      (define/public (current-lang-supports-stepper?)
-        (stepper-works-for? (extract-language-level (get-defs))))
-      
-      (define/public (notify-stepper-frame-of-change)
-        (when stepper-frame
-          (send stepper-frame original-program-changed)))
-      
-      (define/augment (on-close)
-        (when stepper-frame
-          (send stepper-frame original-program-gone))
-        (inner (void) on-close))
-
-      ))
-  
-  
-  
-  ;; stepper-definitions-text-mixin : a mixin for the definitions text that
-  ;; alerts thet stepper when the definitions text is altered or destroyed
-  (define (stepper-definitions-text-mixin %)
-    (class %
-      
-      (inherit get-tab get-top-level-window)
-      
-      (define/augment (on-insert x y)
-        (unless metadata-changing-now?
-          (send (get-tab) notify-stepper-frame-of-change))
-        (inner (void) on-insert x y))
-      
-      (define/augment (on-delete x y)
-        (unless metadata-changing-now?
-          (send (get-tab) notify-stepper-frame-of-change))
-        (inner (void) on-delete x y))
-      
-      (define/augment (after-set-next-settings s)
-        (let ([tlw (get-top-level-window)])
-          (when tlw
-            (send tlw show/hide-stepper-button)))
-        (inner (void) after-set-next-settings s))
-      
-      (define metadata-changing-now? #f)
-      
-      ;; don't pay attention to changes that occur on metadata.
-      ;; this assumes that metadata changes cannot be nested.
-      (define/augment (begin-metadata-changes)
-        (set! metadata-changing-now? #t)
-        (inner (void) begin-metadata-changes))
-      
-      (define/augment (end-metadata-changes)
-        (set! metadata-changing-now? #f)
-        (inner (void) end-metadata-changes))
-      
-      (super-new)))
-  
-  ;; apply the mixins dynamically to the drracket unit frame and
-  ;; definitions text:
-  (drracket:get/extend:extend-unit-frame stepper-unit-frame-mixin)
-  (drracket:get/extend:extend-definitions-text stepper-definitions-text-mixin)
-  (drracket:get/extend:extend-tab stepper-tab-mixin)
-  
-  ;; COPIED FROM drracket/private/language.rkt
-;; simple-module-based-language-convert-value : TST STYLE boolean -> TST
-(define (simple-module-based-language-convert-value value settings)
-  (case (drracket:language:simple-settings-printing-style settings)
-    [(print) value]
-    [(write trad-write) value]
-    [(constructor)
-     (parameterize
-         ([constructor-style-printing #t]
-          [show-sharing (drracket:language:simple-settings-show-sharing settings)]
-          [current-print-convert-hook
-           (leave-snips-alone-hook (current-print-convert-hook))])
-       (stepper-print-convert value))]
-    [(quasiquote)
-     (parameterize
-         ([constructor-style-printing #f]
-          [show-sharing (drracket:language:simple-settings-show-sharing settings)]
-          [current-print-convert-hook
-           (leave-snips-alone-hook (current-print-convert-hook))])
-       (stepper-print-convert value))]
-    [else (error "Internal stepper error: time to resync with simple-module-based-language-convert-value")]))
-
-(define ((leave-snips-alone-hook sh) expr basic-convert sub-convert)
-  (if (or (is-a? expr snip%)
-          ;; FIXME: internal in language.rkt (to-snip-value? expr)
-          )
-      expr
-      (sh expr basic-convert sub-convert)))
-  
-;; mflatt: MINOR HACK - work around temporary
-;;         print-convert problems
-(define (stepper-print-convert v)
-  (or (and (procedure? v) (object-name v))
-      (print-convert v)))
-  
-
-;; set-print-settings ; settings ( -> TST) -> TST
-(define (set-print-settings language simple-settings thunk)
-  (if (method-in-interface? 'set-printing-parameters (object-interface language))
-      (send language set-printing-parameters simple-settings thunk)
-      ;; assume that the current print-convert context is fine
-      ;; (error 'stepper-tool "language object does not contain set-printing-parameters method")
-      ;; 2009-09-11, JBC : Gee Whiz, why the heck is it okay to assume that !?
-      (thunk)))
-
-;; WE REALLY WANT TO GET RID OF THIS STUFF (2005-07-01, JBC)
-
-;; stepper-convert-hook:
-;;   (TST (TST -> TST) (TST -> TST) -> TST)
-;; this code copied from various locations in language.rkt and rep.rkt
-(define (stepper-print-convert-hook exp basic-convert sub-convert)
-  (cond
-    [(is-a? exp snip%)
-     (send exp copy)]
-    #;
-    [((drracket:rep:use-number-snip) exp)
-     (let ([number-snip-type
-            (drracket:language:simple-settings-fraction-style
-             simple-settings)])
-       (cond
-         [(eq? number-snip-type 'repeating-decimal)
-          (drracket:number-snip:make-repeating-decimal-snip exp #f)]
-         [(eq? number-snip-type 'repeating-decimal-e)
-          (drracket:number-snip:make-repeating-decimal-snip exp #t)]
-         [(eq? number-snip-type 'mixed-fraction)
-          (drracket:number-snip:make-fraction-snip exp #f)]
-         [(eq? number-snip-type 'mixed-fraction-e)
-          (drracket:number-snip:make-fraction-snip exp #t)]
-         [else
-          (error 'which-number-snip
-                 "expected either 'repeating-decimal, 'repeating-decimal-e, 'mixed-fraction, or 'mixed-fraction-e got : ~e"
-                 number-snip-type)]))]
-    [else (basic-convert exp)]))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/xml-tool.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/xml-tool.rkt
deleted file mode 100644
index f189802c37..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/xml-tool.rkt
+++ /dev/null
@@ -1,403 +0,0 @@
-#lang racket/base
-
-(require "private/xml-snip-helpers.rkt"
-         "private/find-tag.rkt"
-         "private/xml-sig.rkt"
-         racket/unit
-         racket/gui
-         framework
-         drracket/tool
-         xml/xml
-         string-constants)
-  
-  (provide xml-tool@)
-  
-  (define orig (current-output-port))
-  (define-unit xml-tool@
-    (import drracket:tool^)
-    (export xml^)
-    
-    ;; these were necessary when this was a stand-alone tool:
-    #;(define (phase1) (void))
-    #;(define (phase2) (void))
-    
-    (preferences:set-default 'drracket:xml-eliminate-whitespace #t boolean?)
-      
-      (define xml-box-color "forest green")
-      (define scheme-splice-box-color "blue")
-      (define scheme-box-color "purple")
-      
-      ;; get-bm : string -> (union (is-a?/c bitmap%) false?)
-      (define (get-bm name)
-        (let ([bm (make-object bitmap% (collection-file-path name "icons"))])
-          (unless (send bm ok?)
-            (error 'xml-box "bitmap ~a failed to load" name))
-          bm))
-      
-      (define scheme-box-bm (get-bm "scheme-box.jpg"))
-      (define scheme-splice-box-bm (get-bm "scheme-splice-box.jpg"))
-      (define xml-box-bm (get-bm "xml-box.jpg"))
-      (define xml-box-open-bm (get-bm "xml-box-open.jpg"))
-      
-      (define xml-snip%
-        (class* decorated-editor-snip% (readable-snip<%> xml-snip<%>)
-          (inherit get-editor)
-          
-          (init-field eliminate-whitespace-in-empty-tags?)
-          
-          (define/override (make-editor) (make-object (get-xml-text%)))
-          (define/override (get-corner-bitmap) 
-            (if eliminate-whitespace-in-empty-tags?
-                xml-box-bm
-                xml-box-open-bm))
-          
-          (define/override (get-menu)
-            (let* ([menu (instantiate popup-menu% ()
-                           (title (string-constant xml-tool-xml-box)))]
-                   [leave-alone-item
-                    (make-object checkable-menu-item%
-                      (string-constant xml-tool-leave-whitespace-alone)
-                      menu
-                      (lambda (x y)
-                        (set-eliminate-whitespace-in-empty-tags? #f)))]
-                   [eliminate-item
-                    (make-object checkable-menu-item%
-                      (string-constant xml-tool-eliminate-whitespace-in-empty-tags)
-                      menu
-                      (lambda (x y)
-                        (set-eliminate-whitespace-in-empty-tags? #t)))])
-              (send leave-alone-item check (not eliminate-whitespace-in-empty-tags?))
-              (send eliminate-item check eliminate-whitespace-in-empty-tags?)
-              menu))
-          
-          (inherit get-admin reset-min-sizes)
-          (define/private (set-eliminate-whitespace-in-empty-tags? new)
-            (unless (eq? eliminate-whitespace-in-empty-tags? new)
-              (set! eliminate-whitespace-in-empty-tags? new)
-              (preferences:set 'drracket:xml-eliminate-whitespace new)
-              (reset-min-sizes)
-              (let ([admin (get-admin)])
-                (when admin
-                  (send admin resized this #t)))))
-          
-          (define/public (read-special source line col pos)
-            (xml-read-special eliminate-whitespace-in-empty-tags?
-			      this
-			      source
-			      line
-			      col
-			      pos))
-          
-          (define/override (write stream-out)
-            (send stream-out put (if eliminate-whitespace-in-empty-tags?
-                                     0
-                                     1))
-            (send (get-editor) write-to-file stream-out 0 'eof))
-          (define/override (make-snip)
-            (instantiate xml-snip% ()
-              [eliminate-whitespace-in-empty-tags? eliminate-whitespace-in-empty-tags?]))
-          
-          (define/override (get-color) xml-box-color)
-          
-          (inherit show-border set-snipclass)
-          (super-instantiate ())
-          (show-border #t)
-          (set-snipclass lib-xml-snipclass)))
-      
-      (define xml-snipclass%
-        (class decorated-editor-snipclass%
-          (define/override (make-snip stream-in)
-            (instantiate xml-snip% ()
-              [eliminate-whitespace-in-empty-tags?
-               (preferences:get 'drracket:xml-eliminate-whitespace)]))
-          (super-instantiate ())))
-      
-      ;; this snipclass is for old, saved files (no snip has it set)
-      (define xml-snipclass (make-object xml-snipclass%))
-      (send xml-snipclass set-version 1)
-      (send xml-snipclass set-classname "drscheme:xml-snip")
-      (send (get-the-snip-class-list) add xml-snipclass)
-      
-      ;; this snipclass overrides the actual one in xml/xml-snipclass
-      ;; as a full-fledged snipclass, for use in DrRacket.
-      
-      (define lib-xml-snipclass%
-        (class snip-class%
-          (define/override (read stream-in)
-            (let* ([eliminate-whitespace-in-empty-tags? (zero? (send stream-in get-exact))]
-                   [snip (instantiate xml-snip% ()
-                           [eliminate-whitespace-in-empty-tags? eliminate-whitespace-in-empty-tags?])])
-              (send (send snip get-editor) read-from-file stream-in #f)
-              snip))
-          (super-instantiate ())))
-      
-      (define lib-xml-snipclass (make-object lib-xml-snipclass%))
-      (send lib-xml-snipclass set-version 1)
-      (send lib-xml-snipclass set-classname (format "~s" '(lib "xml-snipclass.ss" "xml")))
-      (send (get-the-snip-class-list) add lib-xml-snipclass)
-      
-      (define scheme-snip%
-        (class* decorated-editor-snip% (scheme-snip<%> readable-snip<%>)
-          (init-field splice?)
-          (define/public (get-splice?) splice?)
-          
-          (define/override (get-corner-bitmap) 
-            (if splice? 
-                scheme-splice-box-bm
-                scheme-box-bm))
-          
-          (define/override (get-menu)
-            (let ([menu (instantiate popup-menu% ()
-                          (title (if splice?
-                                     (string-constant xml-tool-scheme-splice-box)
-                                     (string-constant xml-tool-scheme-box))))])
-              (instantiate menu-item% ()
-                (label
-                 (if splice?
-                     (string-constant xml-tool-switch-to-scheme)
-                     (string-constant xml-tool-switch-to-scheme-splice)))
-                (parent menu)
-                (callback (lambda (x y) (toggle-splice))))
-              menu))
-          
-          (inherit get-admin reset-min-sizes)
-          (define/private (toggle-splice)
-            (let ([admin (get-admin)])
-              (set! splice? (not splice?))
-              (reset-min-sizes)
-              (when admin
-                (send admin resized this #t))))
-          
-          (inherit get-editor)
-          
-          (define/public (read-special source line col pos)
-            (scheme-read-special this source line col pos))
-          
-          (define/override (make-editor) (new (get-scheme-box-text%)))
-          
-          (define/override (make-snip) 
-            (instantiate scheme-snip% () (splice? splice?)))
-          
-          (define/override (write stream-out)
-            (send stream-out put (if splice? 0 1))
-            (super write stream-out))
-          
-          (inherit show-border set-snipclass)
-          (define/override (get-color)
-            (if splice?
-                scheme-splice-box-color
-                scheme-box-color))
-          
-          (super-instantiate ())
-          (show-border #t)
-          (set-snipclass lib-scheme-snipclass)))
-
-      (define scheme-box-text% #f)
-      (define (get-scheme-box-text%)
-        (unless scheme-box-text%
-          (set! scheme-box-text%
-                (class ((drracket:unit:get-program-editor-mixin)
-                        (add-file-keymap-mixin
-                         racket:text%))
-                  (inherit copy-self-to)
-                  (define/override (copy-self)
-                    (let ([t (new scheme-box-text%)])
-                      (copy-self-to t)
-                      t))
-                  (super-new)
-                  (inherit set-max-undo-history)
-                  (set-max-undo-history 'forever))))
-        scheme-box-text%)
-        
-      (define (add-file-keymap-mixin %)
-        (class %
-          (define/override (get-keymaps)
-            (cons (keymap:get-file) (super get-keymaps)))
-          (super-instantiate ())))
-      
-      (define scheme-snipclass%
-        (class decorated-editor-snipclass%
-          (define/override (make-snip stream-in)
-            (let* ([splice? (zero? (send stream-in get-exact))])
-              (instantiate scheme-snip% () (splice? splice?))))
-          (super-instantiate ())))
-      
-      ;; this snipclass is for old, saved files (no snip has it set)
-      (define scheme-snipclass (make-object scheme-snipclass%))
-      (send scheme-snipclass set-version 2)
-      (send scheme-snipclass set-classname "drscheme:scheme-snip")
-      (send (get-the-snip-class-list) add scheme-snipclass)
-      
-      ;; this snipclass overrides the one in xml/scheme-snipclass
-      ;; as a full-fledged snipclass, for use in DrRacket.
-      (define lib-scheme-snipclass (make-object scheme-snipclass%))
-      (send lib-scheme-snipclass set-version 1)
-      (send lib-scheme-snipclass set-classname (format "~s" '(lib "scheme-snipclass.ss" "xml")))
-      (send (get-the-snip-class-list) add lib-scheme-snipclass)
-      
-      (define plain-text%
-        (class text:keymap% 
-          (init-field [delta (make-object style-delta%)])
-          (inherit change-style copy-self-to)
-          (inherit begin-edit-sequence end-edit-sequence)
-          (define/override (copy-self)
-            (let ([t (make-object plain-text% delta)])
-              (copy-self-to t)
-              t))
-          (define/augment (on-insert x y)
-            (begin-edit-sequence)
-            (inner (void) on-insert x y))
-          (define/augment (after-insert x y)
-            (change-style delta x (+ x y))
-            (end-edit-sequence)
-            (inner (void) after-insert x y))
-          
-          (define/override (get-keymaps)
-            (cons (keymap:get-file) (super get-keymaps)))
-          
-          (inherit set-styles-sticky)
-          (super-instantiate ())
-          (set-styles-sticky #f)))
-      
-      (define xml-keymap (make-object keymap%))
-      (send xml-keymap add-function 
-            "matching-xml" 
-            (lambda (x e) 
-              (when (is-a? x text%)
-                (matching-xml x))))
-      (send xml-keymap map-function ">" "matching-xml")
-      
-      ;; The editor standard style list's Standard size changes
-      ;; according to the font size preference. So,
-      ;; we create an XML style based on that stule
-      ;; for the XML boxes, so they change size too.
-      (let* ([style-list (editor:get-standard-style-list)]
-             [style (send style-list find-named-style "XML")]) 
-        (unless style
-          (let ([xml-delta (make-object style-delta% 'change-family 'default)])
-            (send style-list new-named-style "XML" 
-                  (send style-list find-or-create-style 
-                        (send style-list find-named-style (editor:get-default-color-style-name))
-                        xml-delta)))))
-
-      (define xml-text-mixin
-        (mixin (editor:keymap<%> editor:standard-style-list<%> (class->interface text%)) ()
-          (define/override (get-keymaps)
-            (cons xml-keymap (super get-keymaps)))
-          
-          (inherit begin-edit-sequence end-edit-sequence
-                   change-style get-style-list)
-          (define/augment (on-insert start rng)
-            (begin-edit-sequence)
-            (inner (void) on-insert start rng))
-          (define/augment (after-insert start rng)
-            (inner (void) after-insert start rng)
-            (change-style (send (get-style-list) find-named-style "XML")
-                          start 
-                          (+ start rng))
-            (end-edit-sequence))
-          
-          (super-instantiate ())
-          
-          (inherit set-style-list)
-          ))
-      
-      (define get-xml-text%
-	(let ([xml-text% #f])
-	  (lambda ()
-	    (unless xml-text%
-	      (set! xml-text% (class ((drracket:unit:get-program-editor-mixin)
-                                      (xml-text-mixin
-                                       plain-text%))
-                                (inherit copy-self-to)
-                                (define/override (copy-self)
-                                  (let ([t (new xml-text%)])
-                                    (copy-self-to t)
-                                    t))
-                                (super-new)
-                                (inherit set-max-undo-history)
-                                (set-max-undo-history 'forever))))
-            xml-text%)))
-
-      ;; matching-xml : (is-a?/c text) -> void
-      ;; inserts > and if there is an XML tag just
-      ;; before the caret, inserts the corresponding
-      ;; close XML tag after the caret.
-      (define (matching-xml text)
-        (send text begin-edit-sequence)
-        (send text insert ">")
-        (let* ([start (send text get-start-position)]
-               [tagname (find-tag text start)])
-          (when tagname
-            (send text insert "</")
-            (send text insert tagname)
-            (send text insert ">")
-            (send text set-position start)))
-        (send text end-edit-sequence))
-
-    (define (xml-box-frame-extension super%)
-        (class super%
-          (inherit get-editor register-capability-menu-item get-insert-menu get-edit-target-object)
-          
-          (super-new)
-          
-          (let* ([menu (get-insert-menu)]
-                 [find-insertion-point ;; -> (union #f editor<%>)
-                  ;; returns the editor (if there is one) with the keyboard focus
-                  (lambda ()
-                    (let ([editor (get-edit-target-object)])
-                      (and editor
-                           (is-a? editor editor<%>)
-                           (let loop ([editor editor])
-                             (let ([focused (send editor get-focus-snip)])
-                               (if (and focused
-                                        (is-a? focused editor-snip%))
-                                   (loop (send focused get-editor))
-                                   editor))))))]
-                 [insert-snip
-                  (lambda (make-obj)
-                    (let ([editor (find-insertion-point)])
-                      (when editor
-                        (let ([snip (make-obj)])
-                          (send editor insert snip)
-                          (send editor set-caret-owner snip 'display)))))]
-                 [demand-callback ;; : menu-item% -> void
-                  ;; enables the menu item when there is an editor available.
-                  (lambda (item)
-                    (send item enable (find-insertion-point)))])
-            (instantiate menu:can-restore-menu-item% ()
-              (label (string-constant xml-tool-insert-xml-box))
-              (parent menu)
-              (demand-callback demand-callback)
-              (callback
-               (lambda (menu evt)
-                 (insert-snip
-                  (lambda () 
-                    (instantiate xml-snip% ()
-                      [eliminate-whitespace-in-empty-tags?
-                       (preferences:get 'drracket:xml-eliminate-whitespace)]))))))
-            (register-capability-menu-item 'drracket:special:xml-menus (get-insert-menu))
-            (instantiate menu:can-restore-menu-item% ()
-              (label (string-constant xml-tool-insert-scheme-box))
-              (parent menu)
-              (demand-callback demand-callback)
-              (callback 
-               (lambda (menu evt)
-                 (insert-snip 
-                  (lambda () (instantiate scheme-snip% () (splice? #f)))))))
-            (register-capability-menu-item 'drracket:special:xml-menus (get-insert-menu))
-            (instantiate menu:can-restore-menu-item% ()
-              (label (string-constant xml-tool-insert-scheme-splice-box))
-              (parent menu)
-              (demand-callback demand-callback)
-              (callback
-               (lambda (menu evt)
-                 (insert-snip
-                  (lambda () (instantiate scheme-snip% () (splice? #t)))))))
-            (register-capability-menu-item 'drracket:special:xml-menus (get-insert-menu)))
-          
-          (frame:reorder-menus this)))
-      
-      (drracket:language:register-capability 'drracket:special:xml-menus (flat-contract boolean?) #t)
-      
-      (drracket:get/extend:extend-unit-frame xml-box-frame-extension))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/batch-io.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/batch-io.rkt
deleted file mode 100644
index 0ed9818097..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/batch-io.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang scheme
-(require 2htdp/batch-io)
-(provide (all-from-out 2htdp/batch-io))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/image.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/image.rkt
deleted file mode 100644
index 79b241c12e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/image.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require 2htdp/image)
-(provide (all-from-out 2htdp/image))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/info.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/info.rkt
deleted file mode 100644
index 6ab1a3d7d7..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define 2htdp-teachpacks 'all)
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/universe.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/universe.rkt
deleted file mode 100644
index 34dd9d540e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/universe.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-(module universe mzscheme
-  (provide (all-from 2htdp/universe))
-  (require 2htdp/universe))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/HISTORY.txt b/pkgs/htdp-pkgs/htdp-lib/teachpack/HISTORY.txt
deleted file mode 100644
index e660d607c1..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/HISTORY.txt
+++ /dev/null
@@ -1,455 +0,0 @@
-------------------------------------------------------------------------
-Version NEXT 
-
-* added check-satisfied to test engine 
-* fixed 2htdp/universe so that an executable created from drracket 
-  behaves properly when run independently of drracket 
-
-------------------------------------------------------------------------
-Version 6.1				  [Wed Jul 23 11:42:44 EDT 2014]
-
-* added check-random to the test-engine so that students can test random
-  functions more easily 
-
-------------------------------------------------------------------------
-Version 6.0.1				  [Thu Apr 24 16:39:50 EDT 2014]
-
-* doc improvements 
-
-------------------------------------------------------------------------
-Version 6.0				  [Wed Dec 18 22:02:03 EST 2013]
-
-* 2htdp/batch-io: added some web/html reading functions for part IV 
-  in HtDP/2e. Fixed some minor bugs in the other functions. 
-
-* 2htdp/universe: bug fixes
-
-* 2htdp/image: changed scene+curve and add-curve to more accurately
-  compute the bounding box of the curve (previously the argument
-  points were used as the bounding box for the entire curve; now the
-  bounding box is calculated properly in the case that the curve goes
-  outside that rectangle)
-
-* allow (almost) any real number as angles in 2htdp/image
-
-* added place-images, place-images/align to 2htdp/image
-
-* add transparent color to 2htdp/image 
-
-------------------------------------------------------------------------
-Version 5.3.4				  [Wed Apr 24 16:20:03 EDT 2013]
-
-Small bug fixes and doc improvements. 
-
-------------------------------------------------------------------------
-Version 5.3.3
-
-No changes.
-
-------------------------------------------------------------------------
-Version 5.3.2                             [Tue Jan 22 10:30:15 EST 2013]
-
-* batch-io extended with access to stdin and stout 
-
-------------------------------------------------------------------------
-Version 5.3.1                             [Wed Oct 31 14:52:48 EDT 2012]
-
-* bug fixes
-
-------------------------------------------------------------------------
-Version 5.2.1                             [Thu Jan 19 11:36:19 EST 2012]
-
-* added: universe.rkt now comes with a game-pad simulation option
-  A game-pad is a special-purpose key handler plus an icon that
-  maps out the legal key strokes.
-
-* fixed
-  -- wheel-left and wheel-right events work properly as key events now
-  -- on-receive doesn't have to exist for universe/world interactions
-  -- name clause accepts strings and symbols
-  -- doc typos
-
-------------------------------------------------------------------------
-Version 5.2                               [Tue Oct 18 12:34:16 EDT 2011]
-
-* bug fixes in 2htdp/universe
-* also, on-release now works without presence of an on-key clause
-
-------------------------------------------------------------------------
-Version 5.1.2                             [Fri Jul 22 15:27:37 EDT 2011]
-
-* The error messages of the image and universe teachpacks have been
-  revised substantially. They will be improved again next release.
-
-* 5.1.3: the on-tick clause now takes a max number of ticks
-
-------------------------------------------------------------------------
-Version 5.1.1                             [Tue Apr 26 22:38:44 EDT 2011]
-
-* bug fix in registration process for universe
-  implies incompatibility of protocols between 5.1 programs and
-  predecessors
-
-------------------------------------------------------------------------
-Version 5.1                               [Tue Feb  8 13:05:17 EST 2011]
-
-* to-draw (old name: on-draw) is now required for big-bang expressions
-* bug fixes in world, image, etc
-
-------------------------------------------------------------------------
-Version 5.0.2.                            [Wed Oct 27 18:30:26 EDT 2010]
-
-* fixed stepper-universe interaction (on my side)
-* record? allows specification of a directory
-* small bug fixes
-* small doc fixes
-
-* batch-io is now in shape to be used (somewhat) in 2e
-
-* robby added pinholes to his image teachpack
-
-------------------------------------------------------------------------
-Version 5.0.1.                            [Tue Jul 20 20:52:09 EDT 2010]
-
-* typos in documentation
-
-------------------------------------------------------------------------
-
-Version 5.0                               [Fri May 28 13:43:21 EDT 2010]
-
-* added to-draw to universe to prepare the switch to the new terminoloy
-
-------------------------------------------------------------------------
-Version 4.2.5                             [Fri Mar 26 10:02:11 EDT 2010]
-
-* "release" is no longer a key event; use "release" handler instead
-
-------------------------------------------------------------------------
-Version 4.2.4                             [Thu Jan 28 12:02:01 EST 2010]
-
-* separated 2htdp/universe from htdp/image
-* 2htdp/universe contains some stupid hacks to improve performance
-  -- to be changed with Matthew's advice
-* error modified
-* added a bunch of primitives for JPR
-* fixed some other bugs
-
-------------------------------------------------------------------------
-Version 4.2.3                             [Sun Nov 22 19:25:01 EST 2009]
-
-* bug fixes in universe
-* 2htdp/image (first draft)
-
-------------------------------------------------------------------------
-Version 4.2.2                             [Sat Aug 29 15:44:41 EDT 2009]
-
-* universe API:
-  -- added a (state Boolean) option for world and server programs
-  to display their actual state in a separate window
-  -- added a mechanism for displaying a final scene
-  when the world is about to come to an end
-
-------------------------------------------------------------------------
-Version 4.2.1                             [Wed Jul 22 11:15:54 EDT 2009]
-
-* universe API: added launch-many-worlds, fixed numerous small bugs
-  concerning symbol and char elimination
-
-------------------------------------------------------------------------
-Version 4.2                               [Thu May 21 08:51:15 EDT 2009]
-
-* the universe API has changed. It no longer uses chars or symbols
-  for the callbacks but one-letter strings, except for arrow keys
-  and special events, which are arbitrarily long strings.
-
-------------------------------------------------------------------------
-Version 4.1.5                             [Sat Feb 14 20:12:23 EST 2009]
-
-* the universe teachpack exports iworld, not world now
-
-------------------------------------------------------------------------
-Version 4.1.4                             [Sun Jan 18 21:18:34 EST 2009]
-
-* introduces 2htdp/universe
-* small bug fixes in world.ss
-
-------------------------------------------------------------------------
-Version 4.1.3                             [Wed Nov 19 10:20:41 EST 2008]
-
-tiny bug fixes
-
-------------------------------------------------------------------------
-Version 4.1.2                             [Sat Oct 25 10:31:05 EDT 2008]
-
-nothing new to report
-
-------------------------------------------------------------------------
-Version 4.1.1                             [Tue Sep 30 10:17:26 EDT 2008]
-
-* world.ss: big-bang can now be re-run after the world has stopped
-
-------------------------------------------------------------------------
-Version 4.1                               [Sun Aug 10 12:56:58 EDT 2008]
-
-* world docs include line to HtDP/2e Prologue
-
-------------------------------------------------------------------------
-Version 4.0.1                             [Fri Jun 20 10:35:32 EDT 2008]
-
-* world.ss: replaced 'end-of-world' with a hook called 'stop-when'
-
-------------------------------------------------------------------------
-VERSION 4.0                               [Thu May  8 11:03:30 EDT 2008]
-
-* small bug fixes in world
-
-* added matrix.ss (requires a write up)
-
-------------------------------------------------------------------------
-VERSION 371                               [Tue Aug  7 17:49:47 EDT 2007]
-
-* changed world.ss so that it exports both add-line from image.ss and
-  scene+image.
-
-------------------------------------------------------------------------
-VERSION 370                               [Mon May  7 09:54:19 EDT 2007]
-
-* Added testing.ss teachpack.
-
-* The world.ss teachpack now has a IMAGE capturing functionality, including
-  animated GIFs. It also supports simple simulations now.
-
-* The world.ss and image.ss support real numbers for sizes and coordinates
-  now.
-
-* The ProfessorJ wizard doesn't support templates for now.
-
-------------------------------------------------------------------------
-VERSION 360                               [Tue Nov  7 12:45:48 EST 2006]
-
- * The world.ss teachpack has now callback hooks for mouse clicks.
-
- * The image.ss teachpack now includes a star primitive.
-
- * Fixed bugs in world.ss, graphing.ss, image.ss
-
-------------------------------------------------------------------------
-VERSION 351                               [Tue Jul 18 14:11:29 EDT 2006]
-
- * The libraries for ProfessorJ are now organized as four packages:
-   draw, idraw, geometry, and colors.
-
- * Fixed small problems with master.ss and image.ss teachpacks and their
-   docs.
-
-------------------------------------------------------------------------
-VERSION 350                               [Fri Jun 16 20:37:38 EDT 2006]
-
- * The draw package (ProfJ) spawns a new Canvas per new Canvas.
-   The implementation of draw.ss has changed for that, though the visible
-   interface should remain the same.
-
- * The idraw package provides imperative versions of World and Canvas.
-
- * Small bugs in world.ss and image.ss fixed.
-
- * servlet.ss and servlet2.ss are still missing. Expect their arrival
-   for 351.
-
-------------------------------------------------------------------------
-VERSION 300                               [Mon Dec 12 15:59:02 EST 2005]
-
- * The world.ss teachpack has changed. It no longer supports
-   (update ... produce ...) but instead provides a function
-   on-redraw.
-
- * servlet.ss and servlet2.ss are still missing. Expect their arrival
-   for 301.
-
-------------------------------------------------------------------------
-VERSION 299.200                           [Tue Aug  2 17:37:24 EDT 2005]
-
- * servlet.ss and servlet2.ss are still missing. Expect their arrival
-   for 300.
-
- * draw.ss in the HtDCH teachpack collection has radically changed. See
-   the doc.txt file for the new arrangement.
-
-------------------------------------------------------------------------
-VERSION 209                               [Fri Dec 17 10:19:52 EST 2004]
-
- * fixed small bugs in image.ss and world.ss concerning colors and the
-   location of pinholes
-
- * The interface of the draw teachpack (package) for ProfessorJ has
-   changed. A World now supports draw and erase methods. The onTick and
-   onKeyEvent methods call erase on the current world, create the next
-   world, and then call draw on the new world.
-
-------------------------------------------------------------------------
-VERSION 208p1
-
-* fixed a bug in image.ss; find-image now returns the result
-  relative to the pinhole. Misc image.ss docs improvements.
-
-------------------------------------------------------------------------
-VERSION 208                               [Fri Jul 30 10:07:21 EDT 2004]
-
-* image.ss introduces images as algebraic values. Students can create basic
-  images such as rectangles, circles, and they can compose them via an
-  overlay function. There are also primitives for finding one picture in
-  another one and so on. Testing with drawing is now feasible.
-
-* world.ss enriches image.ss with animation functions. Like draw.ss, it
-  comes with big-bang, on-key-event, on-tick, end-of-time for creating a
-  world, starting a clock, reacting to clock ticks and keystrokes, and
-  ending time. It also comes with a mechanism for display movies. It does
-  *not* yet provide primitives for dealing with mouse clicks.
-
-  The performance problems from the TS! workshops have been eliminated.
-
-------------------------------------------------------------------------
-VERSION 207                               [Fri May 14 12:52:43 EDT 2004]
-
-* draw.ss now comes with functional callbacks for maintaining a visual
-  world: big-bang, on-key-event, on-tick, end-of-time
-
-* draw also comes now as a ProfessorJ implementation in the htdch
-  collects directory. This is an experimental teachpack. Docs are available
-  via doc.txt. Experiences with students may change this teachpack
-  significantly.
-
-------------------------------------------------------------------------
-VERSION 203                               [Thu Dec  5 09:10:40 EST 2002]
-
-* added get-key-event to draw.ss
-
-------------------------------------------------------------------------
-VERSION 201                               [Wed Jul 24 22:44:19 EDT 2002]
-
-* added servlet.ss and servlet2.ss
-
-* all exported functions are primitive operators or higher order primitives
-  this improves error reporting behavior in the Beginner languages (before
-  higher-order functions are introduced)
-
-* removed:
-  pingp-play.ss
-  pingp.ss
-  protect-play.ss
-  rectangle.ss
-  these teachpacks aren't mentioned in htdp, and aren't used for any
-  of the additional exercises
-
-------------------------------------------------------------------------
-VERSION 200alpha1                         [Wed Nov 21 13:07:43 EST 2001]
-
-* Robby converted to modules
-
-* Fixed bug in convert.ss
-
-------------------------------------------------------------------------
-VERSION 103                               []
-
-* modified draw.ss interface so that colors are symbols
-  use 'red instead of RED
-
-------------------------------------------------------------------------
-VERSION 102                               [Thu Jun 22 18:22:48 CDT 2000]
-
-* Added "convert.ss" to teachpacks/htdp
-
-* Fixed error messages for some arity tests
-
-* Fixed documentation
-
-------------------------------------------------------------------------
-
-VERSION 101                               [Tue Oct 26 22:28:38 CDT 1999]
-
-* TERMINOLOGY: We decided to eliminate the terminology "teaching
-  library", because it is easily confused with a plain library. As of
-  release 101, we refer to one of these objects as a
-
-    teachpack
-
-* USAGE: Inside of DrScheme, the menu choice called "Language|Set
-  library to..."  is now called "Language|Set teachpack to...".
-
-* LOCATION of Files: The distributed teachpacks are found at
-
-    $PLTHOME/teachpack/
-    PLTHOME is the location of the PLT software
-
-  The htdp subdirectory contains those files that matter to students who
-  use HtDP.
-
-* CHANGES in individual teachpacks: The most important and most visible
-  change in the teachpack support concerns
-
-    hangman.ss
-
-  It now provides two GUI interfaces: (1) hangman for three-letter words
-  and (2) hangman-list for words of arbitrary length. See the teachpack
-  documentation for details.
-
-  The teachpack
-
-    master.ss
-
-  now exports the procedure _master_, which is exactly like the procedure
-  _repl_ in the old master-lib.ss library.
-
-  The corresponding exercises in HtDP have been rewritten and are posted
-  on the HtDP Web site.
-
-* REMINDER: The *purpose* of teachpacks is to supplement student programs
-  with code that is beyond the teaching languages (Beginner, Intermediate,
-  Advanced). For example, to enable students to play hangman, we supply a
-  teachpack that
-    - implements the random choosing of a word
-    - maintains the state variable of how many guesses have gone wrong
-    - manages the GUI.
-  All these tasks are beyond students in the third week and/or impose
-  nothing memorization of currently useless knowledge on students.
-
-  A teachpack is a signed unit that imports the interface:
-
-    plt:userspace^
-
-  The exported names are added to the read-eval-print loop at the end of
-  an EXECUTE step.
-
-------------------------------------------------------------------------
-
-Version 100
-
-The plt:userspace^ signature does not contain the
-graphics library. In order to use the graphics library in your
-teachpacks, use a compound unit and link in graphics directly. For example:
-
-  (require-library "graphics.ss" "graphics")
-
-  (define-signature my-teachpack^ (four))
-
-  (define my-teachpack
-    (unit/sig my-teachpack^
-
-      (import plt:userspace^
-              graphics^)
-
-      '...
-
-      (define four 4)))
-
-  (compound-unit/sig
-   (import [P : plt:userspace^])
-   (link [G : graphics^ ((require-library "graphicr.ss" "graphics")
-                         (P : mzlib:file^)
-                         (P : mred^))]
-         [TP : my-teachpack^ (my-teachpack P G)])
-   (export (open TP)))
-
-The graphics^ signature contains all of the primitives in the
-graphic.ss library. Search for "graphics" in Help Desk for more
-information on those primitives.
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/balls.gif b/pkgs/htdp-pkgs/htdp-lib/teachpack/balls.gif
deleted file mode 100644
index 5f883d373d..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/teachpack/balls.gif and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/balls.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/balls.ss
deleted file mode 100644
index a0e3bda180..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/balls.ss
+++ /dev/null
@@ -1,59 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname balls) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require (lib "world.ss" "htdp"))
-
-;; constants 
-(define height 50)
-(define delta  80)
-(define width  (+ delta (* 2 height)))
-
-(define left (quotient height 2))
-(define right (+ height delta left))
-
-;; World = (make-posn left Number) | (make-posn right Number)
-
-(define server (text "server" 11 'black))
-(define server* (overlay server (nw:rectangle (image-width server) (image-height server) 'outline 'black)))
-
-;; visual constants 
-(define bg
-  (place-image 
-   (text "universe" 11 'green)
-   60 0
-  (place-image 
-   server*
-   (+ height 15) 20
-   (place-image 
-    (text "left" 11 'blue)
-    10 10
-    (place-image
-     (text "right" 11 'red)
-     (+ height delta 10) 10
-     (place-image
-      (nw:rectangle delta height 'solid 'white)
-      height 0 
-      (place-image 
-       (nw:rectangle width height 'solid 'gray)
-       0 0
-       (empty-scene width height))))))))
-
-(define ball (circle 3 'solid 'red))
-
-;; World -> Scene 
-(define (draw w)
-  (place-image ball (posn-x w) (posn-y w) bg))
-
-
-;; World -> World 
-(define (tick w)
-  (local ((define y (posn-y w))
-          (define x (posn-x w)))
-    (cond
-      [(> y 0) (make-posn x (- y 1))]
-      [(= x left) (make-posn right height)]
-      [(= x right) (make-posn left height)])))
-
-(big-bang width height 1/66 (make-posn left height) true)
-(on-redraw draw)
-(on-tick-event tick)
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/data.csv b/pkgs/htdp-pkgs/htdp-lib/teachpack/data.csv
deleted file mode 100644
index 38f045a27b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/data.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-hello, world 
- good, bye 
-i, am, done 
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/data.txt b/pkgs/htdp-pkgs/htdp-lib/teachpack/data.txt
deleted file mode 100644
index dda98f1b07..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/data.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-hello world 
- good bye 
-i am done 
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/door.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/door.ss
deleted file mode 100644
index c7fcef4548..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/door.ss
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang slideshow
-
-(define DELTA 40)
-(define FT 12)
-
-;  (fsa "unlock" "lock" "push" "tick")
-(define (fsa L C O unlock lock push tick)
-  (define (make-state txt)
-    (define t (text txt '() FT))
-    (define e (rounded-rectangle (+ 10 (pict-width t)) (+ 10 (pict-height t))))
-    (cc-superimpose t e))
-  
-  (define locked (make-state L))
-  (define closed (make-state C))
-  (define open   (make-state O))
-  
-  (define bg (rectangle (+ (pict-width locked) (* 2 DELTA))
-                        (+ (pict-height locked)
-                           (pict-height closed)
-                           (pict-height open)
-                           (* 3 DELTA))))
-  
-  (define width (pict-width bg))
-  
-  (define (center base state y)
-    (define w (pict-width state))
-    (define d (quotient (round (- width w)) 2))
-    (pin-over base d y state))
-  
-  (define nx 
-    (center 
-     (center
-      (center
-       bg locked (/ DELTA 2))
-      closed
-      (+ (/ DELTA 2) (pict-height locked) DELTA))
-     open
-     (+ (/ DELTA 2) DELTA (pict-height locked) DELTA (pict-height closed))))
-  
-  (define (add-labeled-arrow nx locked lb-find closed lt-find txt)
-    (define-values (x0 y0) (lb-find nx locked))
-    (define-values (x1 y1) (lt-find nx closed))
-    (define lbl (text txt '() (- FT 2)))
-    (define wlbl (pict-width lbl))
-    (define hlbl (pict-height lbl))
-    (define x (- x0 (/ wlbl 2)))
-    (define y (+ y0 (/ ( - y1 y0 hlbl) 2)))
-    (pin-over (pin-arrow-line 4.0 nx locked lb-find closed lt-find) x y lbl))
-  
-  (define l1 (add-labeled-arrow nx locked lb-find closed lt-find unlock))
-  (define l2 (add-labeled-arrow l1 closed lb-find open lt-find push))
-  (define l3 (add-labeled-arrow l2 open rt-find closed rb-find tick))
-  (define l4 (add-labeled-arrow l3 closed rt-find locked rb-find lock))
-  l4)
-
-(fsa "locked" "closed" "open" "unlock" "lock" "push" "time")
-(fsa "'locked" "'closed" "'open" "#\\u" "#\\l" "#\\space" "tick")
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/arrow-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/arrow-gui.rkt
deleted file mode 100644
index 09de6dab6a..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/arrow-gui.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/arrow-gui)
-(provide (all-from-out htdp/arrow-gui))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/arrow.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/arrow.rkt
deleted file mode 100644
index e51265ad39..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/arrow.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/arrow)
-(provide (all-from-out htdp/arrow))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/convert.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/convert.rkt
deleted file mode 100644
index f33b1fa1b0..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/convert.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/convert)
-(provide (all-from-out htdp/convert))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/dir.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/dir.rkt
deleted file mode 100644
index b1692a054a..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/dir.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/dir)
-(provide (all-from-out htdp/dir))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/docs.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/docs.rkt
deleted file mode 100644
index 1cf2d59c00..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/docs.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/docs)
-(provide (all-from-out htdp/docs))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/draw.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/draw.rkt
deleted file mode 100644
index 119e2b196c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/draw.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/draw)
-(provide (all-from-out htdp/draw))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/elevator.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/elevator.rkt
deleted file mode 100644
index 2612f8edaf..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/elevator.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/elevator)
-(provide (all-from-out htdp/elevator))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/graphing.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/graphing.rkt
deleted file mode 100644
index f5c2a1035b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/graphing.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require htdp/graphing)
-(provide (all-from-out htdp/graphing))
-(module test racket/base)
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/guess-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/guess-gui.rkt
deleted file mode 100644
index 57381b3ec8..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/guess-gui.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/guess-gui)
-(provide (all-from-out htdp/guess-gui))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/guess.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/guess.rkt
deleted file mode 100644
index 044036bb0b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/guess.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/guess)
-(provide (all-from-out htdp/guess))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/gui.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/gui.rkt
deleted file mode 100644
index 9dd92acf47..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/gui.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/gui)
-(provide (all-from-out htdp/gui))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/hangman.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/hangman.rkt
deleted file mode 100644
index 4778215296..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/hangman.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/hangman)
-(provide (all-from-out htdp/hangman))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/image.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/image.rkt
deleted file mode 100644
index 953bb5176f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/image.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/image lang/prim)
-(provide (all-from-out htdp/image))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/info.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/info.rkt
deleted file mode 100644
index 7f2608ab88..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define htdp-teachpacks 'all)
-
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/lkup-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/lkup-gui.rkt
deleted file mode 100644
index 253057829d..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/lkup-gui.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/lkup-gui)
-(provide (all-from-out htdp/lkup-gui))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/master.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/master.rkt
deleted file mode 100644
index 1ea865bc88..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/master.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/master)
-(provide (all-from-out htdp/master))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/matrix.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/matrix.rkt
deleted file mode 100644
index d42b89c16c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/matrix.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/matrix)
-(provide (all-from-out htdp/matrix))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/servlet.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/servlet.rkt
deleted file mode 100644
index 6188e54a9c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/servlet.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/servlet)
-(provide (all-from-out htdp/servlet))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/servlet2.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/servlet2.rkt
deleted file mode 100644
index 6eac6a0dc3..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/servlet2.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/servlet2)
-(provide (all-from-out htdp/servlet2))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/show-queen.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/show-queen.rkt
deleted file mode 100644
index 418d2f03ec..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/show-queen.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/show-queen)
-(provide (all-from-out htdp/show-queen))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/testing.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/testing.rkt
deleted file mode 100644
index 458ce81eee..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/testing.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/testing)
-(provide (all-from-out htdp/testing))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/world.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/world.rkt
deleted file mode 100644
index e465521f08..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/world.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require htdp/world)
-(provide (all-from-out htdp/world))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/info.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/info.rkt
deleted file mode 100644
index 345f6dece4..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define release-note-files (list (list "Teachpacks" "HISTORY.txt")))
-
-(define test-responsibles '((all matthias)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/nuworld.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/nuworld.ss
deleted file mode 100644
index 42165575dc..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/nuworld.ss
+++ /dev/null
@@ -1,120 +0,0 @@
-#lang slideshow
-
-(require racket/draw)
-
-(define DELTA 80)
-(define FT 12)
-
-(define txt 
-  '("(big-bang World_0"
-    "  (to-draw render WIDTH HEIGHT)"
-    "  (on-tick tock RATE)"
-    "  (on-mouse click)"
-    "  (on-key react)"
-    "  (stop-when done))"
-    ))
-
-(define program 
-  (apply vl-append (map (lambda (t) (text t '() (- FT 2))) txt)))
-
-(define Program 
-  (cc-superimpose 
-   (rectangle (+ 5 (pict-width program)) (+ 5 (pict-height program)))
-   program))
-
-(define (make-state txt)
-  (define t (text txt '() FT))
-  (define e (rounded-rectangle (+ 10 (pict-width t)) (+ DELTA (pict-height t))))
-  (cc-superimpose t e))
-
-(define False (text "FALSE" '() FT))
-(define True  (text "TRUE"  '() FT))
-(define BOOL  (rectangle (+ 5 (pict-width False)) (+ 5 (pict-height False))))
-
-;; String Boolean -> Pict 
-(define (make-state0 txt b)
-  ;; create the basic state
-  (define t (text txt '() FT))
-  (define s (if b 
-                (cc-superimpose 
-                 (rounded-rectangle (+ 5 (pict-width t))  (+ (- DELTA 5) (pict-height t)))
-                 t)
-                t))
-  (define w 
-    (cc-superimpose 
-     s
-     (rounded-rectangle (+ 10 (pict-width t)) (+ DELTA (pict-height t)))))
-  ;; add the boolean 
-  (define bb (cc-superimpose (if b True False) BOOL))
-  (define ar (add-labeled-arrow (vc-append DELTA bb w) w ct-find bb cb-find "done"))
-  (define scene (text "Scene" '() FT))
-  (define sc (cc-superimpose scene (rectangle (+ 20 (pict-width scene)) (+ 30 (pict-height scene)))))
-  (define br (add-labeled-arrow (vc-append DELTA ar sc) ar cb-find sc ct-find "render"))
-  br)
-
-(define (add-labeled-arrow nx locked lb-find closed lt-find txt)
-  (define-values (x0 y0) (lb-find nx locked))
-  (define-values (x1 y1) (lt-find nx closed))
-  (define lbl (text txt '() (- FT 2)))
-  (define wlbl (pict-width lbl))
-  (define hlbl (pict-height lbl))
-  (define x (- x0 (/ wlbl 2)))
-  (define y (+ y0 (/ ( - y1 y0 hlbl) 2)))
-  (pin-over (pin-arrow-line 4.0 nx locked lb-find closed lt-find) x y lbl))
-
-(define (h-labeled-arrow t)
-  (define tock (text t '() (- FT 2)))
-  (define blk (blank (+ DELTA 4) 2))
-  (vc-append tock (pin-arrow-line 4.0 blk blk lc-find blk rc-find)))
-
-(define arrows
-  (vc-append (h-labeled-arrow "tock")
-             (h-labeled-arrow "click")
-             (h-labeled-arrow "react")))
-
-(define state0 (make-state0 "World_0" #f))
-(define state1 (make-state0 "World_1" #f))
-(define dots   (cc-superimpose (blank (pict-width state1) (pict-height state1)) (text "..." '() FT)))
-(define state2 (make-state0 "World_N-1" #f))
-(define stateN (make-state0 "World_N" #t))
-(define states (list state0 arrows state1 arrows dots arrows state2 arrows stateN))
-
-(define bg (blank (+ (apply + (map pict-width states))
-                         DELTA #;(* (length states) DELTA))
-                      (+ (pict-height state0) DELTA)))
-
-(define (center base state x)
-  (define w (pict-height state))
-  (define d (floor (/ (- width w) 2)))
-  (pin-over base x d state))
-
-(define width (pict-height bg))
-
-(define x (* 1/2 DELTA))
-(define xx 
-  (foldl (lambda (f ls s)
-           (define y (center s f x))
-           (set! x (+ x ls))
-           y)
-         bg
-         states
-         (map (lambda (x) (+ (pict-width x) #;(* 1/1 DELTA))) states)))
-
-(define the-image (ct-superimpose xx Program))
-
-(define image-bm
-  (make-object bitmap% 
-    (inexact->exact (round (pict-width the-image)))
-    (inexact->exact (round (pict-height the-image)))))
-
-(send image-bm ok?)
-
-(define image-dc
-  (new bitmap-dc% [bitmap image-bm]))
-(send image-dc clear)
-
-(draw-pict the-image image-dc 0.0 0.0)
-
-(send image-bm save-file "nuworld.png" 'png)
-
-the-image
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/server.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/server.ss
deleted file mode 100644
index 7a0576fb80..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/server.ss
+++ /dev/null
@@ -1,226 +0,0 @@
-#lang slideshow
-
-(define DELTA 80)
-(define FT 12)
-
-(define prgm 
-  '("(universe UniState_0"
-    "  (on-new sign-up)"
-    "  (on-msg process)"
-    "  (on-dis disconnect)"
-    "  (on-tick tock)"
-    "  (to-string render))"))
-
-(define program 
-  (apply vl-append (map (lambda (t) (text t '() (- FT 2))) prgm)))
-
-(define Program 
-  (cc-superimpose 
-   (rectangle (+ 5 (pict-width program)) (+ 5 (pict-height program)))
-   program))
-
-(define (make-state txt)
-  (define t (text txt '() FT))
-  (define e (rounded-rectangle (+ 10 (pict-width t)) (+ DELTA (pict-height t))))
-  (cc-superimpose t e))
-
-(define False (text "FALSE" '() FT))
-(define True  (text "TRUE"  '() FT))
-(define BOOL  (rectangle (+ 5 (pict-width False)) (+ 5 (pict-height False))))
-
-;; String Boolean -> Pict 
-(define (make-state0 txt b)
-  ;; create the basic state
-  (define t (text txt '() FT))
-  (define s (if b 
-                (cc-superimpose 
-                 (rounded-rectangle (+ 5 (pict-width t))  (+ (- DELTA 5) (pict-height t)))
-                 t)
-                t))
-  (define w 
-    (cc-superimpose 
-     s
-     (rounded-rectangle (+ 10 (pict-width t)) (+ DELTA (pict-height t)))))
-  ;; add the boolean 
-  (define bb (cc-superimpose (if b True False) BOOL))
-  (define ar0 (add-labeled-arrow (vc-append DELTA bb w) w ct-find bb cb-find "done"))
-  ;; HIDE the arrow and done
-  (define ar (cb-superimpose w (blank (pict-width ar0) (pict-height ar0))))
-  (define scene (text "string" '() FT))
-  (define sc (cc-superimpose scene (rectangle (+ 20 (pict-width scene)) (+ 30 (pict-height scene)))))
-  (define br (add-labeled-arrow (vc-append DELTA ar sc) ar cb-find sc ct-find "render"))
-  br)
-
-(define (add-labeled-arrow nx locked lb-find closed lt-find txt)
-  (define-values (x0 y0) (lb-find nx locked))
-  (define-values (x1 y1) (lt-find nx closed))
-  (define lbl (text txt '() (- FT 2)))
-  (define wlbl (pict-width lbl))
-  (define hlbl (pict-height lbl))
-  (define x (- x0 (/ wlbl 2)))
-  (define y (+ y0 (/ ( - y1 y0 hlbl) 2)))
-  (pin-over (pin-arrow-line 4.0 nx locked lb-find closed lt-find) x y lbl))
-
-(define (h-labeled-arrow t)
-  (define tock (text t '() (- FT 2)))
-  (define blk (blank (+ DELTA 4) 2))
-  (vc-append tock (pin-arrow-line 4.0 blk blk lc-find blk rc-find)))
-
-(define message (text "Message" '() FT))
-(define (make-Message)
-  (cc-superimpose message (rectangle (+ 20 (pict-width message)) (+ 30 (pict-height message)))))
-
-(define Message  (vc-append (make-Message) (arrowhead 4 (* 1/2 pi))))
-(define MessageK (vc-append (arrowhead 4 (* 3/2 pi)) (make-Message)))
-
-(define M (rb-superimpose Message (blank DELTA  DELTA))) 
-(define K (rb-superimpose MessageK (blank DELTA  DELTA)))
-
-(define (make-arrows M)
-  (define Tock (h-labeled-arrow "sign-up"))
-  (define Click (h-labeled-arrow "tock"))
-  (define Clack (h-labeled-arrow "disconnect"))
-  (define Receive (h-labeled-arrow "process"))
-  (values Tock Click Clack Receive (vc-append (blank DELTA (/ DELTA 2)) Tock Click Clack Receive M)))
-
-(define-values (TockM ClickM ClackM ReceiveM arrowsR) (make-arrows M))
-(define-values (TockK ClickK ClackK ReceiveK arrowsL) (make-arrows K))
-
-(define state0 (make-state0 "UniState_0" #f))
-(define state1 (make-state0 "UniState_1" #f))
-(define Server (hc-append (arrowhead 4 0) (cc-superimpose (cloud 160 80) (text "UNIVERSE" '() FT ))))
-(define world  (cc-superimpose (cloud 80 40) (text "world" '() FT )))
-(define dots   (vc-append
-                (cc-superimpose (blank (pict-width state1) (pict-height state1)) (text "..." '() FT))
-                world
-                Server))
-(define state2 (make-state0 "UniState_N-1" #f))
-(define stateN (make-state0 "UniState_N" #t))
-(define states (list state1 arrowsL dots arrowsR state2))
-
-(define bg (blank (+ (apply + (map pict-width states)) DELTA)
-                  (+ (pict-height state0) DELTA)))
-
-(define (center base state x)
-  (define w (pict-height state))
-  (define d (quotient (round (- width w)) 2))
-  (pin-over base x d state))
-
-(define width (pict-height bg))
-
-(define x (* 1/2 DELTA))
-(define xx 
-  (foldl (lambda (f ls s)
-           (define y (center s f x))
-           (set! x (+ x ls))
-           y)
-         bg
-         states
-         (map (lambda (x) (+ (pict-width x) #;(* 1/1 DELTA))) states)))
-
-(define zz xx)
-
-(require mred/mred)
-
-(define the-image
-  (ct-superimpose Program
-                  (lt-superimpose 
-                   (dc (lambda (dc x y)
-                         (define-values (mx my) (cb-find zz MessageK))
-                         (define-values (tx ty) (ct-find zz MessageK))
-                         (define-values (sx sy) (lc-find zz Server))
-                         (define-values (tockx tocky) (lb-find zz TockK))
-                         (define-values (clickx clicky) (lb-find zz ClickK))
-                         (define-values (clackx clacky) (lb-find zz ClackK))
-                         (define-values (rx ry) (lb-find zz ReceiveK))
-                         (define (add-curve rx ry)
-                           (set! dcp (make-object dc-path%))
-                           (set! cx (max rx tx))
-                           (set! cy (min ry ty))
-                           (send dcp move-to tx ty)
-                           (send dcp curve-to tx ty cx cy rx ry)
-                           (send dc draw-path dcp))
-                         (define dcp (make-object dc-path%))
-                         ;; --- draw arc from Message to Server 
-                         (define cx (min sx mx))
-                         (define cy (max sy my))
-                         (send dc set-smoothing 'aligned)
-                         (send dcp move-to mx my)
-                         (send dcp curve-to mx my cx cy sx sy)
-                         (send dc draw-path dcp)
-                         ;; --- draw arc from Message to Receiver 
-                         (add-curve tockx tocky)
-                         (add-curve clickx clicky)
-                         (add-curve clackx clacky)
-                         (add-curve rx ry)
-                         ;; --- 
-                         dc)
-                       (pict-width zz) (pict-height zz))
-                   (lt-superimpose
-                    (lt-superimpose
-                     zz
-                     (dc (lambda (dc x y)
-                           (define-values (mx my) (cb-find zz world))
-                           (define-values (tx ty) (ct-find zz world))
-                           (define-values (sx sy) (rc-find zz Server))
-                           (define-values (rx ry) (rb-find zz ReceiveM))
-                           (define dcp (make-object dc-path%))
-                           ;; --- draw arc from Message to Server 
-                           (define cx (max sx mx))
-                           (define cy (max sy my))
-#|                           
-                           (send dc set-smoothing 'aligned)
-                           (send dcp move-to mx my)
-                           (send dcp curve-to mx my cx cy sx sy)
-                           (send dc draw-path dcp)
-|#
-                           ;; --- draw arc from Message to Receiver 
-                           (set! dcp (make-object dc-path%))
-                           (set! cx (min rx tx))
-                           (set! cy (min ry ty))
-                           (send dcp move-to tx ty)
-                           (send dcp curve-to tx ty cx cy rx ry)
-                           (send dc draw-path dcp)
-                           ;; --- 
-                           dc)
-                         (pict-width zz) (pict-height zz)))
-                    (dc (lambda (dc x y)
-                          (define-values (mx my) (cb-find zz Message))
-                          (define-values (tx ty) (ct-find zz Message))
-                          (define-values (sx sy) (rc-find zz Server))
-                          (define-values (rx ry) (rb-find zz ReceiveM))
-                          (define dcp (make-object dc-path%))
-                          ;; --- draw arc from Message to Server 
-                          (define cx (max sx mx))
-                          (define cy (max sy my))
-                          (send dc set-smoothing 'aligned)
-                          (send dcp move-to mx my)
-                          (send dcp curve-to mx my cx cy sx sy)
-                          (send dc draw-path dcp)
-                          ;; --- draw arc from Message to Receiver 
-                          (set! dcp (make-object dc-path%))
-                          (set! cx (min rx tx))
-                          (set! cy (min ry ty))
-                          (send dcp move-to tx ty)
-                          (send dcp curve-to tx ty cx cy rx ry)
-                          (send dc draw-path dcp)
-                          ;; --- 
-                          dc)
-                        (pict-width zz) (pict-height zz))))))
-
-(define image-bm
-  (make-object bitmap% 
-    (inexact->exact (round (pict-width the-image)))
-    (inexact->exact (round (pict-height the-image)))))
-
-(send image-bm ok?)
-
-(define image-dc
-  (new bitmap-dc% [bitmap image-bm]))
-(send image-dc clear)
-
-(draw-pict the-image image-dc 0.0 0.0)
-
-(send image-bm save-file "server.png" 'png)
-
-the-image
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/tests/test-docs-complete.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/tests/test-docs-complete.rkt
deleted file mode 100644
index 34ff1f6c75..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote teachpack/world))
-(check-docs (quote teachpack/value-turtles))
-(check-docs (quote teachpack/turtles))
-(check-docs (quote teachpack/server))
-;(check-docs (quote teachpack/picturing-programs))
-(check-docs (quote teachpack/nuworld))
-(check-docs (quote teachpack/door))
-(check-docs (quote teachpack/balls))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/turtles.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/turtles.ss
deleted file mode 100644
index 4d54d9144e..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/turtles.ss
+++ /dev/null
@@ -1,3 +0,0 @@
-(module turtles mzscheme
-  (require graphics/turtles)
-  (provide (all-from graphics/turtles)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/value-turtles.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/value-turtles.ss
deleted file mode 100644
index e7e66bd8f5..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/value-turtles.ss
+++ /dev/null
@@ -1,3 +0,0 @@
-(module value-turtles mzscheme
-  (require graphics/value-turtles)
-  (provide (all-from graphics/value-turtles)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/world.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/world.ss
deleted file mode 100644
index 9471ef567a..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/world.ss
+++ /dev/null
@@ -1,200 +0,0 @@
-#lang slideshow
-
-(define DELTA 80)
-(define FT 12)
-
-(define prgm 
-  '("(big-bang World_0"
-    "  (to-draw render WIDTH HEIGHT)"
-    "  (on-tick tock RATE)"
-    "  (on-mouse click)"
-    "  (on-key react)"
-    "  (on-receive receive)"
-    "  (stop-when done)"
-    "  (name 'jimbob)"
-    "  (register LOCALHOST))"))
-
-
-(define program 
-  (apply vl-append (map (lambda (t) (text t '() (- FT 2))) prgm)))
-
-(define Program 
-  (cc-superimpose 
-   (rectangle (+ 5 (pict-width program)) (+ 5 (pict-height program)))
-   program))
-
-(define (make-state txt)
-  (define t (text txt '() FT))
-  (define e (rounded-rectangle (+ 10 (pict-width t)) (+ DELTA (pict-height t))))
-  (cc-superimpose t e))
-
-(define False (text "FALSE" '() FT))
-(define True  (text "TRUE"  '() FT))
-(define BOOL  (rectangle (+ 5 (pict-width False)) (+ 5 (pict-height False))))
-
-;; String Boolean -> Pict 
-(define (make-state0 txt b)
-  ;; create the basic state
-  (define t (text txt '() FT))
-  (define s (if b 
-                (cc-superimpose 
-                 (rounded-rectangle (+ 5 (pict-width t))  (+ (- DELTA 5) (pict-height t)))
-                 t)
-                t))
-  (define w 
-    (cc-superimpose 
-     s
-     (rounded-rectangle (+ 10 (pict-width t)) (+ DELTA (pict-height t)))))
-  ;; add the boolean 
-  (define bb (cc-superimpose (if b True False) BOOL))
-  (define ar (add-labeled-arrow (vc-append DELTA bb w) w ct-find bb cb-find "done"))
-  (define scene (text "Scene" '() FT))
-  (define sc (cc-superimpose scene (rectangle (+ 20 (pict-width scene)) (+ 30 (pict-height scene)))))
-  (define br (add-labeled-arrow (vc-append DELTA ar sc) ar cb-find sc ct-find "render"))
-  br)
-
-(define (add-labeled-arrow nx locked lb-find closed lt-find txt)
-  (define-values (x0 y0) (lb-find nx locked))
-  (define-values (x1 y1) (lt-find nx closed))
-  (define lbl (text txt '() (- FT 2)))
-  (define wlbl (pict-width lbl))
-  (define hlbl (pict-height lbl))
-  (define x (- x0 (/ wlbl 2)))
-  (define y (+ y0 (/ ( - y1 y0 hlbl) 2)))
-  (pin-over (pin-arrow-line 4.0 nx locked lb-find closed lt-find) x y lbl))
-
-(define (h-labeled-arrow t)
-  (define tock (text t '() (- FT 2)))
-  (define blk (blank (+ DELTA 4) 2))
-  (vc-append tock (pin-arrow-line 4.0 blk blk lc-find blk rc-find)))
-
-(define message (text "Message" '() FT))
-(define (make-Message)
-  (cc-superimpose message (rectangle (+ 20 (pict-width message)) (+ 30 (pict-height message)))))
-
-(define Message  (vc-append (make-Message) (arrowhead 4 (* 1/2 pi))))
-(define MessageK (vc-append (arrowhead 4 (* 3/2 pi)) (make-Message)))
-
-(define M (rb-superimpose Message (blank DELTA  DELTA))) 
-(define K (rb-superimpose MessageK (blank DELTA  DELTA)))
-
-(define (make-arrows M)
-  (define Tock (h-labeled-arrow "tock"))
-  (define Click (h-labeled-arrow "click"))
-  (define Clack (h-labeled-arrow "react"))
-  (define Receive (h-labeled-arrow "receive"))
-  (values Tock Click Clack Receive (vc-append (blank DELTA (/ DELTA 2)) Tock Click Clack Receive M)))
-
-(define-values (TockM ClickM ClackM ReceiveM arrowsR) (make-arrows M))
-(define-values (TockK ClickK ClackK ReceiveK arrowsL) (make-arrows K))
-
-(define state0 (make-state0 "World_0" #f))
-(define state1 (make-state0 "World_1" #f))
-(define Server (hc-append (arrowhead 4 0) (cc-superimpose (cloud 160 80) (text "SERVER" '() FT ))))
-(define dots   (vc-append
-                (cc-superimpose (blank (pict-width state1) (pict-height state1)) (text "..." '() FT))
-                Server))
-(define state2 (make-state0 "World_N-1" #f))
-(define stateN (make-state0 "World_N" #t))
-(define states (list state1 arrowsL dots arrowsR state2))
-
-(define bg (blank (+ (apply + (map pict-width states)) DELTA)
-                  (+ (pict-height state0) DELTA)))
-
-(define (center base state x)
-  (define w (pict-height state))
-  (define d (quotient (round (- width w)) 2))
-  (pin-over base x d state))
-
-(define width (pict-height bg))
-
-(define x (* 1/2 DELTA))
-(define xx 
-  (foldl (lambda (f ls s)
-           (define y (center s f x))
-           (set! x (+ x ls))
-           y)
-         bg
-         states
-         (map (lambda (x) (+ (pict-width x) #;(* 1/1 DELTA))) states)))
-
-(define zz xx)
-
-(require mred/mred)
-
-(define the-image
-  (ct-superimpose Program
-  (lt-superimpose 
-   (dc (lambda (dc x y)
-         (define-values (mx my) (cb-find zz MessageK))
-         (define-values (tx ty) (ct-find zz MessageK))
-         (define-values (sx sy) (lc-find zz Server))
-         (define-values (tockx tocky) (lb-find zz TockK))
-         (define-values (clickx clicky) (lb-find zz ClickK))
-         (define-values (clackx clacky) (lb-find zz ClackK))
-         (define-values (rx ry) (lb-find zz ReceiveK))
-         (define (add-curve rx ry)
-           (set! dcp (make-object dc-path%))
-           (set! cx (max rx tx))
-           (set! cy (min ry ty))
-           (send dcp move-to tx ty)
-           (send dcp curve-to tx ty cx cy rx ry)
-           (send dc draw-path dcp))
-         (define dcp (make-object dc-path%))
-         ;; --- draw arc from Message to Server 
-         (define cx (min sx mx))
-         (define cy (max sy my))
-         (send dc set-smoothing 'aligned)
-         (send dcp move-to mx my)
-         (send dcp curve-to mx my cx cy sx sy)
-         (send dc draw-path dcp)
-         ;; --- draw arc from Message to Receiver 
-         (add-curve tockx tocky)
-         (add-curve clickx clicky)
-         (add-curve clackx clacky)
-         (add-curve rx ry)
-         ;; --- 
-         dc)
-       (pict-width zz) (pict-height zz))
-   (lt-superimpose
-    zz
-    (dc (lambda (dc x y)
-          (define-values (mx my) (cb-find zz Message))
-          (define-values (tx ty) (ct-find zz Message))
-          (define-values (sx sy) (rc-find zz Server))
-          (define-values (rx ry) (rb-find zz ReceiveM))
-          (define dcp (make-object dc-path%))
-          ;; --- draw arc from Message to Server 
-          (define cx (max sx mx))
-          (define cy (max sy my))
-          (send dc set-smoothing 'aligned)
-          (send dcp move-to mx my)
-          (send dcp curve-to mx my cx cy sx sy)
-          (send dc draw-path dcp)
-          ;; --- draw arc from Message to Receiver 
-          (set! dcp (make-object dc-path%))
-          (set! cx (min rx tx))
-          (set! cy (min ry ty))
-          (send dcp move-to tx ty)
-          (send dcp curve-to tx ty cx cy rx ry)
-          (send dc draw-path dcp)
-          ;; --- 
-          dc)
-        (pict-width zz) (pict-height zz))))))
-
-(define image-bm
-  (make-object bitmap% 
-    (inexact->exact (round (pict-width the-image)))
-    (inexact->exact (round (pict-height the-image)))))
-
-(send image-bm ok?)
-
-(define image-dc
-  (new bitmap-dc% [bitmap image-bm]))
-(send image-dc clear)
-
-(draw-pict the-image image-dc 0.0 0.0)
-
-(send image-bm save-file "universe.png" 'png)
-
-the-image
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/info.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/info.rkt
deleted file mode 100644
index 9349e9b333..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/info.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang info
-
-(define tools (list (list "test-tool.scm")))
-(define tool-names '("Test Engine"))
-
-
-(define test-responsibles '((all kathyg)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/print.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/print.rkt
deleted file mode 100644
index 7f66297c30..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/print.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang scheme/base
-
-(provide print-with-values)
-
-; This is like the printf procedures---it uses `print-string' to print
-; the string portions, and print-formatted to print the values
-; referenced via ~F. ~<w> is not supported.
-
-(define (print-with-values fstring print-string print-formatted
-			   . vals)
-  (let ((size (string-length fstring)))
-    (let loop ((start 0)
-	       (i 0)
-	       (vals vals)
-	       (seen-vals '())) ; reversed
-      (cond
-       ((>= i size)
-	(print-string (apply format (substring fstring start i) (reverse seen-vals))))
-       ((char=? (string-ref fstring i) #\~)
-	(case (string-ref fstring (+ 1 i))
-	  ((#\n #\~) (loop start (+ 1 i) vals seen-vals))
-	  ((#\F #\f)
-	   (print-string (apply format (substring fstring start i) (reverse seen-vals)))
-	   (print-formatted (car vals))
-	   (loop (+ 2 i) (+ 2 i) (cdr vals) '()))
-	  (else
-	   (loop start (+ 2 i) (cdr vals) (cons (car vals) seen-vals)))))
-       (else
-	(loop start (+ 1 i) vals seen-vals))))))
-	  
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/racket-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/racket-gui.rkt
deleted file mode 100644
index a9e2f12da9..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/racket-gui.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-(module scheme-gui scheme/base
-  
-  (require mred framework scheme/class 
-           mzlib/pconvert mzlib/pretty
-	   (for-syntax scheme/base))
-  
-  (require (except-in "scheme-tests.rkt" test) "test-display.scm")
-  
-  (define (make-formatter printer)
-    (lambda (value)
-      (let* ([text* (new (editor:standard-style-list-mixin text%))]
-             [text-snip (new editor-snip% [editor text*])])
-        (printer value (open-output-text-editor text* 0))
-        (send text* delete (send text* get-end-position) 'back)
-        (send text* lock #t) 
-        text-snip)))
-  
-  (define (format-value value)
-    (parameterize ([constructor-style-printing #t]
-                   [pretty-print-columns 40])
-      (make-formatter (lambda (v o) (pretty-print (print-convert v) o)))))
-  
-  #;(define (format-value value)
-    (cond
-      [(is-a? value snip%) value]
-      [(or (pair? value) (struct? value))
-       (parameterize ([constructor-style-printing #t]
-                      [pretty-print-columns 40])
-         (let* ([text* (new (editor:standard-style-list-mixin text%))]
-                [text-snip (new editor-snip% [editor text*])])
-           (pretty-print (print-convert value) (open-output-text-editor text*))
-           (send text* lock #t)
-           text-snip))]
-      [else (format "~v" value)]))
-  
-  (define (test*)
-    (printf "test*\n")
-    (run-tests)
-    (pop-up))
-  
-  (define-syntax (test stx) 
-    (syntax-case stx ()
-      [(_)
-       (syntax-property
-	#'(test*)
-	'test-call #t)]))
-
-  (define (pop-up)
-    (let ([test-info (namespace-variable-value 'test~object #f builder (current-namespace))])
-      (parameterize ([test-format format-value])
-        (and test-info
-             (send test-info refine-display-class test-display%)
-             (send test-info setup-display #f #f)
-             (printf "calling summarize-results method\n")
-             (send test-info summarize-results (current-output-port))))))
-  
-  (provide test format-value make-formatter (all-from-out "scheme-tests.rkt"))
-  
-  )
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/racket-tests.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/racket-tests.rkt
deleted file mode 100644
index 2ad2cfa45c..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/racket-tests.rkt
+++ /dev/null
@@ -1,557 +0,0 @@
-#lang racket/base
-
-;; *****************************************
-;; SEE todo.txt FOR HOW TO ADD A NEW FEATURE
-;; *****************************************
-
-(require lang/private/teachprims
-         (for-syntax racket/base
-                     lang/private/rewrite-error-message)
-         racket/class
-         racket/match
-         racket/function
-         lang/private/continuation-mark-key
-         lang/private/rewrite-error-message
-         ; (for-template lang/private/firstorder)
-         "test-engine.rkt"
-         "test-info.scm")
-
-(require (for-syntax stepper/private/syntax-property))
-
-(provide
- check-expect ;; syntax : (check-expect <expression> <expression>)
- check-random ;; syntax : (check-random <expression> <expression>)
- check-within ;; syntax : (check-within <expression> <expression> <expression>)
- check-member-of ;; syntax : (check-member-of <expression> <expression>)
- check-range ;; syntax : (check-range <expression> <expression> <expression>)
- check-error  ;; syntax : (check-error <expression> [<expression>])
- check-satisfied ;; syntax : (check-satisfied <expression> <expression>)
- )
-
-; for other modules implementing check-expect-like forms
-(provide
- (for-syntax check-expect-maker)
- get-test-engine
- exn:fail:wish)
-
-(define INEXACT-NUMBERS-FMT
-  "check-expect cannot compare inexact numbers. Try (check-within test ~a range).")
-(define FUNCTION-FMT
-  "check-expect cannot compare functions.")
-(define SATISFIED-FMT
-  "check-satisfied: expects function of one argument in second position. Given ~a")
-(define CHECK-ERROR-STR-FMT
-  "check-error: expects a string (the expected error message) for the second argument. Given ~s")
-(define CHECK-WITHIN-INEXACT-FMT
-  "check-within: expects an inexact number for the range. ~a is not inexact.")
-(define CHECK-WITHIN-FUNCTION-FMT
-  "check-within cannot compare functions.")
-(define LIST-FMT
-  "check-member-of: expects a list for the second argument (the possible outcomes). Given ~s")
-(define CHECK-MEMBER-OF-FUNCTION-FMT
-  "check-member-of: cannot compare functions.")
-(define RANGE-MIN-FMT
-  "check-range: expects a number for the minimum value. Given ~a")
-(define RANGE-MAX-FMT
-  "check-range: expects a number for the maximum value. Given ~a")
-(define CHECK-RANGE-FUNCTION-FMT
-  "check-range: cannot compare functions.")
-
-
-(define-for-syntax CHECK-EXPECT-DEFN-STR
-  "found a test that is not at the top level")
-(define-for-syntax CHECK-WITHIN-DEFN-STR
-  CHECK-EXPECT-DEFN-STR)
-(define-for-syntax CHECK-ERROR-DEFN-STR
-  CHECK-EXPECT-DEFN-STR)
-
-;; check-expect-maker : syntax? syntax? (listof syntax?) symbol? -> syntax?
-;; the common part of all three test forms
-;; examples
-#;
-(_ stx #'check-values-expected #`test (list #`actual) 'comes-from-check-expect)
-#;
-(_ stx #'check-values-within #`test (list #`actual #`within) 'comes-from-check-within)
-#;
-(_ stx #'check-values-error #`test (list #`error) 'comes-from-check-error)
-
-(define-for-syntax (check-expect-maker stx checker-proc-stx test-expr embedded-stxes hint-tag)
-  (define bogus-name
-    (stepper-syntax-property #`#,(gensym 'test) 'stepper-hide-completed #t))
-  (define src-info
-    (with-stepper-syntax-properties (['stepper-skip-completely #t])
-                                    #`(list #,@(list #`(quote #,(syntax-source stx))
-                                                     (syntax-line stx)
-                                                     (syntax-column stx)
-                                                     (syntax-position stx)
-                                                     (syntax-span stx)))))
-  (if (eq? 'module (syntax-local-context))
-      #`(define #,bogus-name
-          #,(stepper-syntax-property
-             #`(let* ([ns (current-namespace)]
-                      [test-engine (namespace-variable-value 'test~object #f builder ns)])
-                 (when test-engine
-                   (insert-test test-engine
-                                (lambda ()
-                                  #,(with-stepper-syntax-properties
-                                     (['stepper-hint hint-tag]
-                                      ['stepper-hide-reduction #t]
-                                      ['stepper-use-val-as-final #t])
-                                     (quasisyntax/loc stx
-                                       (#,checker-proc-stx
-                                        #,(with-stepper-syntax-properties
-                                           (['stepper-hide-reduction #t])
-                                           #`(car 
-                                              #,(with-stepper-syntax-properties
-                                                 (['stepper-hide-reduction #t])
-                                                 #`(list
-                                                    (lambda () #,test-expr)
-                                                    #,(syntax/loc stx (void))))))
-                                        #,@embedded-stxes
-                                        #,src-info
-                                        #,(with-stepper-syntax-properties
-                                           (['stepper-no-lifting-info #t]
-                                            ['stepper-hide-reduction #t])
-                                           #'test-engine))))))))
-             'stepper-skipto
-             (append skipto/third ;; first let* binding
-                     skipto/third ;; second let* binding
-                     skipto/third skipto/second
-                     ;; something funny going on here; I can't see how Mike's 
-                     ;; fix could ever have worked.  Possibly related: this
-                     ;; file is still written in the mzscheme language?
-                     ;; ... no, that doesn't seem to pan out.
-                     ;; okay, I really don't understand why, but it appears 
-                     ;; that in this context, 'when' is still expanding
-                     ;; into a begin, rather than a (let-values () ...)
-                     skipto/cdr skipto/third ;; application of insert-test
-                     '(syntax-e cdr cdr syntax-e car) ;; lambda
-                     )))
-      #`(let ([test-engine (namespace-variable-value 'test~object #f builder (current-namespace))])
-          (when test-engine
-            (insert-test test-engine
-                         (lambda ()
-                           #,(with-stepper-syntax-properties
-                              (['stepper-hint hint-tag]
-                               ['stepper-hide-reduction #t]
-                               ['stepper-use-val-as-final #t])
-                              (quasisyntax/loc stx
-                                (#,checker-proc-stx
-                                 #,(with-stepper-syntax-properties
-                                    (['stepper-hide-reduction #t])
-                                    #`(car 
-                                       #,(with-stepper-syntax-properties
-                                          (['stepper-hide-reduction #t])
-                                          #`(list
-                                             (lambda () #,test-expr)
-                                             #,(syntax/loc stx (void))))))
-                                 #,@embedded-stxes
-                                 #,src-info
-                                 #,(with-stepper-syntax-properties
-                                    (['stepper-no-lifting-info #t]
-                                     ['stepper-hide-reduction #t])
-                                    #'test-engine))))))))))
-
-(define-for-syntax (check-context?)
-  (let ([c (syntax-local-context)])
-    (memq c '(module top-level))))
-
-(define-for-syntax (argcount-error-message/stx arity stx [at-least #f])
-  (define ls (syntax->list stx))
-  (argcount-error-message #f arity (if ls (sub1 (length ls)) 0) at-least))
-
-;; check-expect
-(define-syntax (check-expect stx)
-  (unless (check-context?)
-    (raise-syntax-error 'check-expect CHECK-EXPECT-DEFN-STR stx))
-  (syntax-case stx ()
-    [(_ test actual)
-     (check-expect-maker stx #'check-values-expected #`test (list #`actual) 'comes-from-check-expect)]
-    [_ (raise-syntax-error 'check-expect (argcount-error-message/stx 2 stx) stx)]))
-
-;; checking random values 
-(define-syntax (check-random stx)
-  (syntax-case stx ()
-    [(check-random e1 e2)
-     (let ([test
-            #`(lambda (rng k)
-                (parameterize ((current-pseudo-random-generator rng)) (random-seed k)
-                  e1))]
-           [actuals
-            (list
-             #`(lambda (rng k)
-                 (parameterize ((current-pseudo-random-generator rng)) (random-seed k)
-                   e2)))])
-       (check-expect-maker stx #'check-random-values test actuals 'comes-from-check-expect))]
-    [_ (raise-syntax-error 'check-random (argcount-error-message/stx 2 stx) stx)]))
-
-(define-syntax (check-satisfied stx)
-  (syntax-case stx ()
-    [(_ actual:exp expected-property:exp)
-     (identifier? #'expected-property:exp)
-     (begin 
-       (check-expect-maker stx 
-                           #'check-values-property 
-                           #'actual:exp
-                           (list #'(lambda (x) (expected-property:exp x))
-                                 (symbol->string (syntax-e #'expected-property:exp)))
-                           'comes-from-check-satisfied))]
-    [(_ actual:exp expected-property:exp) 
-     (raise-syntax-error 'check-satisfied "expects named function in second position." stx)]
-    [_ (raise-syntax-error 'check-satisfied (argcount-error-message/stx 2 stx) stx)]))
-
-(define (check-values-property test actual property? src test-engine)
-  ;; it is okay if actual is a procedure because property testing may use
-  ;; it, but it is possibly weird for students
-  (send (send test-engine get-info) add-check)
-  (run-and-check
-   ;; check
-   (lambda (p? v _what-is-this?) (p? v))
-   ;; maker
-   (lambda (src format v1 _v2 _) (make-satisfied-failed src format v1 property?))
-   ;; test 
-   test
-   ;; expect 
-   actual
-   #f
-   src
-   test-engine
-   (list 'check-satisfied property?)))
-
-;; check-values-expected: (-> scheme-val) (-> nat scheme-val) src test-engine -> void
-(define (check-random-values test actual-maker src test-engine)
-  (define rng (make-pseudo-random-generator))
-  (define k (modulo (current-milliseconds) (sub1 (expt 2 31))))
-  (define actual (actual-maker rng k))
-  (error-check (lambda (v) (if (number? v) (exact? v) #t))
-               actual INEXACT-NUMBERS-FMT #t)
-  (error-check (lambda (v) (not (procedure? v))) actual FUNCTION-FMT #f)
-  (send (send test-engine get-info) add-check)
-  (run-and-check (lambda (v1 v2 _) (teach-equal? v1 v2))
-                 (lambda (src format v1 v2 _) (make-unequal src format v1 v2))
-                 (lambda () ((test) rng k))
-                 actual
-                 #f
-                 src
-                 test-engine
-                 'check-expect))
-
-;; check-values-expected: (-> scheme-val) scheme-val src test-engine -> void
-(define (check-values-expected test actual src test-engine)
-  (error-check (lambda (v) (if (number? v) (exact? v) #t))
-               actual INEXACT-NUMBERS-FMT #t)
-  (error-check (lambda (v) (not (procedure? v))) actual FUNCTION-FMT #f)
-  (send (send test-engine get-info) add-check)
-  (run-and-check (lambda (v1 v2 _) (teach-equal? v1 v2))
-                 (lambda (src format v1 v2 _) (make-unequal src format v1 v2))
-                 test actual #f src test-engine 'check-expect))
-
-;;check-within
-(define-syntax (check-within stx)
-  (unless (check-context?)
-    (raise-syntax-error 'check-within CHECK-WITHIN-DEFN-STR stx))
-  (syntax-case stx ()
-    [(_ test actual within)
-     (check-expect-maker stx #'check-values-within #`test (list #`actual #`within) 
-                         'comes-from-check-within)]
-    [_ (raise-syntax-error 'check-within (argcount-error-message/stx 3 stx) stx)]))
-
-;; check-values-within: (-> scheme-val) scheme-val number src test-engine -> void
-(define (check-values-within test actual within src test-engine)
-  (error-check number? within CHECK-WITHIN-INEXACT-FMT #t)
-  (error-check (lambda (v) (not (procedure? v))) actual CHECK-WITHIN-FUNCTION-FMT #f)
-  (send (send test-engine get-info) add-check)
-  (run-and-check beginner-equal~? make-outofrange test actual within src
-                 test-engine
-                 'check-within))
-
-;; check-error
-(define-syntax (check-error stx)
-  (unless (check-context?)
-    (raise-syntax-error 'check-error CHECK-ERROR-DEFN-STR stx))
-  (syntax-case stx ()
-    [(_ test error)
-     (check-expect-maker stx #'check-values-error #`test (list #`error)
-                         'comes-from-check-error)]
-    [(_ test)
-     (check-expect-maker stx #'check-values-error/no-string #`test null
-                         'comes-from-check-error)]
-    [_ (raise-syntax-error 'check-error (argcount-error-message/stx 1 stx #t) stx)]))
-
-;; check-values-error: (-> scheme-val) scheme-val src test-engine -> void
-(define (check-values-error test error src test-engine)
-  (error-check string? error CHECK-ERROR-STR-FMT #t)
-  (send (send test-engine get-info) add-check)
-  (let ([result (with-handlers ([exn?
-                                 (lambda (e)
-                                   (define msg 
-                                     (rewrite-contract-error-message (exn-message e)))
-                                   (or (equal? msg error)
-                                       (make-incorrect-error src (test-format) error
-                                                             msg e)))])
-                  (let ([test-val (test)])
-                    (make-expected-error src (test-format) error test-val)))])
-    (if (check-fail? result)
-        (begin
-          (send (send test-engine get-info) check-failed
-                result (check-fail-src result)
-                (and (incorrect-error? result) (incorrect-error-exn result)))
-          #f)
-        #t)))
-
-;; check-values-error/no-string: (-> scheme-val) src test-engine -> void
-(define (check-values-error/no-string test src test-engine)
-  (send (send test-engine get-info) add-check)
-  (let ([result (with-handlers ([exn?
-                                 (lambda (e) #t)])
-                  (let ([test-val (test)])
-                    (make-expected-an-error src (test-format) test-val)))])
-    (if (check-fail? result)
-        (begin
-          (send (send test-engine get-info) check-failed
-                result (check-fail-src result)
-                #f)
-          #f)
-        #t)))
-
-;;error-check: (scheme-val -> boolean) format-string boolean) -> void : raise exn:fail:contract
-(define (error-check pred? actual fmt fmt-act?)
-  (unless (pred? actual)
-    (define msg (if fmt-act? (format fmt actual) fmt))
-    (raise (make-exn:fail:contract msg (current-continuation-marks)))))
-
-;;check-member-of
-(define-syntax (check-member-of stx)
-  (unless (check-context?)
-    (raise-syntax-error 'check-member-of CHECK-EXPECT-DEFN-STR stx))
-  (syntax-case stx ()
-    [(_ test actual actuals ...)
-     (check-expect-maker stx
-                         #'check-member-of-values-expected
-                         #`test
-                         (list #`actual #`(list actuals ...))
-                         'comes-from-check-member-of)]
-    [_ (raise-syntax-error 'check-member-of (argcount-error-message/stx 2 stx #t) stx)]))
-
-;; check-member-of-values-expected: (-> scheme-val) scheme-val src test-engine -> void
-(define (check-member-of-values-expected test first-actual actuals src test-engine)
-  (error-check (lambda (v) (not (procedure? v))) first-actual CHECK-MEMBER-OF-FUNCTION-FMT #f)
-  (send (send test-engine get-info) add-check)
-  (run-and-check (lambda (v2 v1 _) (memf (lambda (i) (teach-equal? v1 i)) v2))
-                 (lambda (src format v1 v2 _) (make-not-mem src format v1 v2))
-                 test (cons first-actual actuals) #f src test-engine 'check-member-of))
-
-;;check-range
-(define-syntax (check-range stx)
-  (unless (check-context?)
-    (raise-syntax-error 'check-member-of CHECK-EXPECT-DEFN-STR stx))
-  (syntax-case stx ()
-    [(_ test min max)
-     (check-expect-maker stx #'check-range-values-expected #`test (list #`min #`max)
-                         'comes-from-check-range)]
-    [_ (raise-syntax-error 'check-range (argcount-error-message/stx 3 stx) stx)]))
-
-;; check-range-values-expected: (-> scheme-val) scheme-val src test-engine -> void
-(define (check-range-values-expected test min max src test-engine)
-  (error-check number? min RANGE-MIN-FMT #t)
-  (error-check number? max RANGE-MAX-FMT #t) 
-  (error-check (lambda (v) (not (procedure? v))) min CHECK-RANGE-FUNCTION-FMT #f)
-  (error-check (lambda (v) (not (procedure? v))) max CHECK-RANGE-FUNCTION-FMT #f)
-  (send (send test-engine get-info) add-check)
-  (run-and-check (lambda (v2 v1 v3) (and (number? v1) (and (<= v2 v1) (<= v1 v3))))
-                 (lambda (src format v1 v2 v3) (make-not-range src format v1 v2 v3))
-                 test min max src test-engine 'check-range))
-
-;; run-and-check: (scheme-val scheme-val scheme-val -> boolean)
-;;                (src format scheme-val scheme-val scheme-val -> check-fail)
-;;                ( -> scheme-val) scheme-val scheme-val test-engine symbol? -> boolean
-(define (run-and-check check maker test expect range src test-engine kind)
-  (match-let ([(list result result-val exn)
-               (with-handlers ([exn:fail:wish?
-                                (lambda (e)
-                                  (define display (error-display-handler))
-                                  (define name (exn:fail:wish-name e))
-                                  (define args (exn:fail:wish-args e))
-                                  (list (unimplemented-wish src (test-format) name args) 'error #f))]
-                               [(lambda (x)
-                                  (and (exn:fail:contract:arity? x)
-                                       (pair? kind)
-                                       (eq? 'check-satisfied (car kind))))
-                                (lambda (_)
-                                  (error-check (lambda (v) #f) (cadr kind) SATISFIED-FMT #t))]
-                               [exn:fail?
-                                (lambda (e)
-                                  (define display (error-display-handler))
-                                  (define msg (get-rewriten-error-message e))
-                                  (if (and (pair? kind) (eq? 'check-satisfied (car kind)))
-                                      (list (unsatisfied-error src (test-format) (cadr kind) msg e) 
-                                             'error e)
-                                      (list (unexpected-error src (test-format) expect msg e) 
-                                            'error e)))])
-                 (define test-val (test))
-                 (cond [(check expect test-val range) (list #t test-val #f)]
-                       [else (list (maker src (test-format) test-val expect range)
-                                   test-val
-                                   #f)]))])
-    (cond [(check-fail? result)
-           (define c (send test-engine get-info))
-           (send c check-failed result (check-fail-src result) exn)
-           (if exn (raise exn) #f)]
-          [else #t])))
-
-(define (tee x)
-  (displayln `(tee ,x))
-  x)
-
-;;Wishes
-(struct exn:fail:wish exn:fail (name args))
-
-(define (reset-tests)
-  (let ([test-engine (namespace-variable-value
-                      'test~object #f builder (current-namespace))])
-    (when test-engine
-      (send test-engine reset-info))))
-
-(define (builder)
-  (let ([te (build-test-engine)])
-    (namespace-set-variable-value! 'test~object te (current-namespace))
-    te))
-
-(define (get-test-engine)
-  (namespace-variable-value 'test~object #f builder (current-namespace)))
-
-(define-syntax (test stx) 
-  (syntax-case stx ()
-    [(_)
-     (syntax-property
-      #'(test*)
-      'test-call #t)]))
-
-(define (test*)
-  (dynamic-wind
-   values
-   (lambda () (run-tests))
-   (lambda () (display-results))))
-
-(define-syntax (run-tests stx)
-  (syntax-case stx ()
-    [(_)
-     (syntax-property
-      #'(run)
-      'test-call #t)]))
-
-(define (run) 
-  (let ([test-engine
-         (namespace-variable-value 'test~object #f builder (current-namespace))]) 
-    (and test-engine (send test-engine run))))
-
-(define (display-results*)
-  (let ([test-engine (namespace-variable-value 'test~object #f builder (current-namespace))])
-    (and test-engine
-         (let ([display-data (scheme-test-data)])
-           (when (caddr display-data)
-             (send test-engine refine-display-class (caddr display-data)))
-           (send test-engine setup-display (car display-data) (cadr display-data))
-           (send test-engine summarize-results (current-output-port))))))
-
-(define-syntax (display-results stx) 
-  (syntax-case stx ()
-    [(_)
-     (syntax-property
-      #'(display-results*)
-      'test-call #t)]))
-
-(provide run-tests display-results test builder reset-tests)
-
-(define (build-test-engine)
-  (let ([engine (make-object scheme-test%)])
-    (send engine setup-info 'test-check)
-    engine))
-
-(define (insert-test test-engine test) (send test-engine add-test test))
-
-(define scheme-test-data (make-parameter (list #f #f #f)))
-
-(define signature-test-info%
-  (class* test-info-base% ()
-    
-    (define signature-violations '())
-    
-    (inherit report-failure)
-    
-    (define/pubment (signature-failed obj signature message blame)
-      
-      (let* ((cms
-              (continuation-mark-set->list (current-continuation-marks)
-                                           teaching-languages-continuation-mark-key))
-             (srcloc
-              (cond
-                ((findf (lambda (mark)
-                          (and mark
-                               (or (path? (car mark))
-                                   (symbol? (car mark)))))
-                        cms)
-                 => (lambda (mark)
-                      (apply (lambda (source line col pos span)
-                               (make-srcloc source line col pos span))
-                             mark)))
-                (else #f)))
-             (message
-              (or message
-                  (make-signature-got obj (test-format)))))
-        
-        (set! signature-violations
-              (cons (make-signature-violation obj signature message srcloc blame)
-                    signature-violations)))
-      (report-failure)
-      (inner (void) signature-failed obj signature message))
-    
-    (define/public (failed-signatures) (reverse signature-violations))
-    
-    (inherit add-check-failure)
-    (define/pubment (property-failed result src-info)
-      (report-failure)
-      (add-check-failure (make-property-fail src-info (test-format) result) #f))
-    
-    (define/pubment (property-error exn src-info)
-      (report-failure)
-      (add-check-failure (make-property-error src-info (test-format) (exn-message exn) exn) exn))
-    
-    (super-instantiate ())))
-
-(define wish-test-info%
-  (class* test-info-base% ()
-    (inherit add-check-failure)
-    
-    (super-instantiate ())))
-
-(define scheme-test%
-  (class* test-engine% ()
-    (super-instantiate ())
-    (inherit-field test-info test-display)
-    (inherit setup-info)
-    
-    (field [tests null]
-           [test-objs null])
-    
-    (define/override (info-class) signature-test-info%)
-    
-    (define/public (add-test tst)
-      (set! tests (cons tst tests)))
-    (define/public (get-info)
-      (unless test-info (send this setup-info 'check-require))
-      test-info)
-    (define/public (reset-info)
-      (set! tests null)
-      #;(send this setup-info 'check-require))
-    
-    (define/augment (run)
-      (inner (void) run)
-      (for ([t (reverse tests)]) (run-test t)))
-    
-    (define/augment (run-test test)
-      (test)
-      (inner (void) run-test test))))
-
-(provide scheme-test-data test-format test-execute test-silence error-handler 
-         signature-test-info% build-test-engine)
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/scheme-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/scheme-gui.rkt
deleted file mode 100644
index 0e29500d57..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/scheme-gui.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "racket-gui.rkt")
-(provide (all-from-out "racket-gui.rkt"))
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/scheme-tests.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/scheme-tests.rkt
deleted file mode 100644
index 1a162400bb..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/scheme-tests.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require "racket-tests.rkt")
-(provide (all-from-out "racket-tests.rkt"))
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/test-coverage.scm b/pkgs/htdp-pkgs/htdp-lib/test-engine/test-coverage.scm
deleted file mode 100644
index 40e165e8b6..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/test-coverage.scm
+++ /dev/null
@@ -1,140 +0,0 @@
-#lang mzscheme
-
-(require mzlib/class
-         mred
-         framework
-         (prefix list: mzlib/list)
-         mzlib/integer-set)
-
-(provide (all-defined))
-
-(define coverage-track%
-  (class* object% ()
-
-    (super-instantiate ())
-
-    ;; interger-set
-    (define covered (make-range))
-    ;; [hashtable-of scheme-val -> integer-set]
-    (define covered-from-src (make-hash-table 'weak))
-    ;; (listof covered-from-src keys)
-    (define current-coverage-srcs null)
-
-    (define/public (covered-position start span)
-      (let ([new-range (make-range start (+ start span))])
-        (set! covered (union covered new-range))
-        (for-each (lambda (key covered-set)
-                    (hash-table-put! covered-from-src key
-                                     (union covered-set new-range)))
-                  current-coverage-srcs
-                  (map (lambda (key)
-                         (hash-table-get covered-from-src key (make-range)))
-                       current-coverage-srcs))))
-
-    (define/public (register-coverage-point src)
-      (set! current-coverage-srcs (cons src current-coverage-srcs)))
-
-    (define/public (unregister-coverage-point src)
-      (set! current-coverage-srcs (list:remq src current-coverage-srcs)))
-
-    (define/public (covers-span? start span)
-      (zero? (card (difference (make-range start (+ start span)) covered))))
-
-    (define/public (covers-spans? srcs)
-      (andmap (lambda (s) (covers-span? (car s) (cdr s))) srcs))
-
-    (define/public (display-coverage editor) 
-      (highlight-covered editor covered))
-
-    (define/public (display-covered-portion editor coverage-point)
-      (highlight-covered editor (hash-table-get covered-from-src coverage-point
-                                                (make-range))))
-
-
-    (define/private (highlight-covered editor int-set)
-      (let* ([style-list (editor:get-standard-style-list)]
-             [uncovered-highlight (send style-list find-named-style
-                                        "profj:syntax-colors:scheme:uncovered")]
-             [covered-highlight (send style-list find-named-style
-                                      "profj:syntax-colors:scheme:covered")])
-        (letrec ([color-buff
-                  (lambda ()
-                    (cond
-                      [(or (send editor is-locked?)
-                           (send editor in-edit-sequence?))
-                       (queue-callback color-buff)]
-                      [else
-                       (unless (send editor test-froze-colorer?)
-                         (send editor freeze-colorer)
-                         (send editor toggle-test-status))
-                       (send editor begin-test-color)
-                       (send editor change-style
-                             uncovered-highlight 0
-                             (send editor last-position) #f)
-                       (let loop ([positions (integer-set-contents int-set)])
-                         (unless (null? positions)
-                           (send editor change-style covered-highlight 
-                                 (sub1 (caar positions))
-                                 (sub1 (cdar positions))
-                                 #f)
-                           (loop (cdr positions))))
-                       (send editor end-test-color)]))])
-          (queue-callback color-buff))))))
-
-(define (test-coverage-button-mixin parent)
-  (class* parent ()
-    (super-instantiate ())
-
-    (define/public (insert-covered-button dest coverage src src-editor partial?)
-      (let* ([button-editor (new (editor:standard-style-list-mixin text%)
-                                 [auto-wrap #t])]
-             [snip (new editor-snip% (editor button-editor) (with-border? #t))]
-             [start (send dest get-end-position)])
-        (send snip set-style
-              (send (send dest get-style-list) find-named-style "Standard"))
-        (send button-editor insert
-              (if partial?
-                "Highlight covered expressions"
-                "Highlight all covered expressions"))
-        (send dest insert snip)
-        (send button-editor set-clickback 0
-              (send button-editor get-end-position)
-              (cond
-                [(and src-editor partial?)
-                 (lambda (t s e)
-                   (send coverage display-covered-portion src-editor src))]
-                [src-editor
-                 (lambda (t s e)
-                   (send coverage display-coverage src-editor))]
-                [else (lambda (t s e) (void))])
-              #f #f)
-        (send button-editor lock #t)
-        (let ([c (new style-delta%)])
-          (send c set-delta-foreground "royalblue")
-          (send dest change-style c start (sub1 (send dest get-end-position))
-                #f))))))
-
-(define analysis<%>
-  (interface ()
-    register-test register-testcase 
-    de-register-test de-register-testcase
-    analyze provide-info))
-
-(define coverage-analysis%
-  (class* object% (analysis<%>)
-
-    (define coverage-info (make-object coverage-track%))
-
-    (define/public (register-test name src)
-      (send coverage-info register-coverage-point src))
-    (define/public (register-testcase name src)
-      (send coverage-info register-coverage-point src))
-    (define/public (de-register-test src)
-      (send coverage-info unregister-coverage-point src))
-    (define/public (de-register-testcase src)
-      (send coverage-info unregister-coverage-point src))
-    (define/public (analyze src vals)
-      (send coverage-info covered-position (list-ref src 3) (list-ref src 4)))
-
-    (define/public (provide-info) coverage-info)
-    (super-instantiate ())))
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/test-display.scm b/pkgs/htdp-pkgs/htdp-lib/test-engine/test-display.scm
deleted file mode 100644
index 9fe22c7dd1..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/test-display.scm
+++ /dev/null
@@ -1,586 +0,0 @@
-#lang scheme/base
-
-(require scheme/class
-         scheme/file
-         mred
-         framework
-         string-constants
-         "test-info.scm"
-         "test-engine.rkt"
-         "print.ss"
-         (except-in deinprogramm/signature/signature signature-violation) ; clashes with test-engine
-         deinprogramm/quickcheck/quickcheck)
-
-(define test-display%
-  (class* object% ()
-
-    (init-field (current-rep #f))
-
-    (define test-info #f)
-    (define/pubment (install-info t) 
-      (set! test-info t)
-      (inner (void) install-info t))
-
-    (define current-tab #f)
-    (define drscheme-frame #f)
-    (define src-editor #f)
-    (define/public (display-settings df ct ed)
-      (set! current-tab ct)
-      (set! drscheme-frame df)
-      (set! src-editor ed))
-
-    (define (docked?)
-      (and drscheme-frame
-           (preferences:get 'test-engine:test-window:docked?)))
-    
-    (define/public (report-success)
-      (when current-rep
-        (unless current-tab
-          (set! current-tab (send (send current-rep get-definitions-text) get-tab)))
-        (unless drscheme-frame
-          (set! drscheme-frame (send current-rep get-top-level-window)))
-        (let ([curr-win (and current-tab (send current-tab get-test-window))])
-          (when curr-win
-            (let ([content (make-object (editor:standard-style-list-mixin text%))])
-              (send content lock #t)
-              (when curr-win (send curr-win update-editor content))
-              (when current-tab (send current-tab current-test-editor content))
-              (when (docked?)
-                (send drscheme-frame display-test-panel content)
-                (send curr-win show #f)))))))
-
-    (define/public (display-success-summary port count)
-      (unless (test-silence)
-        (display (case count
-                   [(0) (string-constant test-engine-0-tests-passed)]
-                   [(1) (string-constant test-engine-1-test-passed)]
-                   [(2) (string-constant test-engine-both-tests-passed)]
-                   [else (format (string-constant test-engine-all-n-tests-passed)
-                                 count)])
-                 port)))
-
-    (define/public (display-untested-summary port)
-      (unless (test-silence)
-        (display (string-constant test-engine-should-be-tested) port)
-        (display "\n" port)))
-
-    (define/public (display-disabled-summary port)
-      (display (string-constant test-engine-tests-disabled) port)
-      (display "\n" port))
-    
-    (define/public (display-results)
-      (let* ([curr-win (and current-tab (send current-tab get-test-window))]
-             [window (or curr-win (make-object test-window%))]
-             [content (make-object (editor:standard-style-list-mixin text%))])
-        
-        (send this insert-test-results content test-info src-editor)
-        (send content lock #t)
-        (send window update-editor content)
-        (when current-tab
-          (send current-tab current-test-editor content)
-          (unless curr-win
-            (send current-tab current-test-window window)
-            (send drscheme-frame register-test-window window)
-            (send window update-switch
-                  (lambda () (send drscheme-frame dock-tests)))
-            (send window update-disable
-                  (lambda () (send current-tab update-test-preference #f)))
-            (send window update-closer
-                  (lambda()
-                    (send drscheme-frame deregister-test-window window)
-                    (send current-tab current-test-window #f)
-                    (send current-tab current-test-editor #f)))))
-        (if (docked?)
-            (send drscheme-frame display-test-panel content)
-            (send window show #t))))
-
-    (define/pubment (insert-test-results editor test-info src-editor)
-      (let* ([style (send test-info test-style)]
-             [total-tests (send test-info tests-run)]
-             [failed-tests (send test-info tests-failed)]
-             [total-checks (send test-info checks-run)]
-             [failed-checks (send test-info checks-failed)]
-             [violated-signatures (send test-info failed-signatures)]
-             [wishes (send test-info unimplemented-wishes)]
-             [total-wishes (length wishes)]
-             [total-wish-calls (send test-info called-wishes)]
-
-             [check-outcomes
-              (lambda (total failed zero-message ck?)
-                (send editor insert
-                      (cond
-                       [(zero? total) zero-message]
-                       [(= 1 total) 
-                        (string-append
-                         (if ck?
-                             (string-constant test-engine-ran-1-check)
-                             (string-constant test-engine-ran-1-test))
-                         "\n")]
-                       [else 
-                        (format (string-append
-                                 (if ck?
-                                     (string-constant test-engine-ran-n-checks)
-                                     (string-constant test-engine-ran-n-tests))
-                                 "\n")
-                                total)]))
-                (send editor insert
-                      (cond 
-                        [(null? wishes) ""]
-                        [(= 1 total-wishes) (format "Wished for function ~a has not been implemented.\n" (car wishes))]
-                        [(= 2 total-wishes) (format "Wished for functions ~a and ~a have not been implemented.\n" (car wishes) (cadr wishes))]
-                        [else (format "Wished for functions ~a have not been implemented.\n" (format-list wishes))]))
-                (when (> total 0)
-                  (send editor insert
-                        (cond
-                         [(and (zero? failed) (= 1 total))
-                          (string-append (if ck?
-                                             (string-constant test-engine-1-check-passed)
-                                             (string-constant test-engine-1-test-passed))
-                                         "\n\n")]
-                         [(zero? failed) 
-                          (string-append (if ck?
-                                             (string-constant test-engine-all-checks-passed)
-                                             (string-constant test-engine-all-tests-passed))
-                                         "\n\n")]
-                         [(= failed total)
-                          (string-append (if ck?
-                                             (string-constant test-engine-0-checks-passed)
-                                             (string-constant test-engine-0-tests-passed))
-                                         "\n")]
-                         [else (format (string-append
-                                        (if ck?
-                                            (string-constant test-engine-m-of-n-checks-failed)
-                                            (string-constant test-engine-m-of-n-tests-failed))
-                                        "\n\n")
-                                       failed total)])))
-                (send editor insert
-                      (cond
-                       ((null? violated-signatures)
-                        (string-append (string-constant test-engine-no-signature-violations) "\n\n"))
-                       ((null? (cdr violated-signatures))
-                        (string-append (string-constant test-engine-1-signature-violation) "\n\n"))
-                       (else
-                        (format (string-append (string-constant test-engine-n-signature-violations) "\n\n")
-                                (length violated-signatures)))))
-                )]
-
-             [check-outcomes/check
-              (lambda (zero-message)
-                (check-outcomes total-checks failed-checks
-                                zero-message #t))]
-             [check-outcomes/test
-              (lambda (zero-message)
-                (check-outcomes total-checks failed-checks
-                                zero-message #f))]
-             [test-outcomes 
-              (lambda (zero-message)
-                (check-outcomes total-tests failed-tests
-                                zero-message #f))])
-        (case style
-          [(test-require)
-           (test-outcomes
-            (string-append (string-constant test-engine-must-be-tested) "\n"))
-           (check-outcomes/check
-            (string-append (string-constant test-engine-is-unchecked) "\n"))]
-          [(check-require)
-           (check-outcomes/check
-            (string-append (string-constant test-engine-is-unchecked) "\n"))]
-          [(test-basic)
-           (test-outcomes "")
-           (check-outcomes/check "")]
-          [(test-check)
-           (check-outcomes/test
-            (string-append (string-constant test-engine-must-be-tested)
-                           "\n"))]
-          [else (check-outcomes/check "")])
-
-        (unless (and (zero? total-checks)
-                     (null? violated-signatures))
-          (inner (begin
-                   (display-check-failures (send test-info failed-checks) 
-                                           editor test-info src-editor)
-                   (send editor insert "\n")
-                   (display-signature-violations violated-signatures
-                                                editor test-info src-editor))
-                 insert-test-results editor test-info src-editor))))
-
-    (define (format-list l)
-      (cond
-        [(null? (cdr l)) (format "and ~a" (car l))]
-        [else (format "~a, ~a" (car l) (format-list (cdr l)))]))
-    
-    (define/public (display-check-failures checks editor test-info src-editor)
-      (when (pair? checks)
-        (send editor insert (string-append (string-constant test-engine-check-failures) "\n")))
-      (for ([failed-check (reverse checks)])
-        (send editor insert "\t")
-        (if (failed-check-exn? failed-check)
-            (make-error-link editor
-                             (failed-check-reason failed-check)
-                             (failed-check-exn? failed-check)
-                             (check-fail-src (failed-check-reason failed-check))
-                             src-editor)
-            (make-link editor
-                       (failed-check-reason failed-check)
-                       (check-fail-src (failed-check-reason failed-check))
-                       src-editor))
-        (send editor insert "\n")))
-
-    (define/public (display-signature-violations violations editor test-info src-editor)
-      (when (pair? violations)
-        (send editor insert (string-append (string-constant test-engine-signature-violations) "\n")))
-      (for-each (lambda (violation)
-                  (send editor insert "\t")
-                  (make-signature-link editor violation src-editor)
-                  (send editor insert "\n"))
-                violations))
-
-    ;next-line: editor% -> void
-    ;Inserts a newline and a tab into editor
-    (define/public (next-line editor) (send editor insert "\n\t"))
-
-    ;; make-link: text% check-fail src editor -> void
-    (define (make-link text reason dest src-editor)
-      (display-reason text reason)
-      (let ((start (send text get-end-position)))
-        (send text insert (format-src dest))
-        (when (and src-editor current-rep)
-          (send text set-clickback
-                start (send text get-end-position)
-                (lambda (t s e) (highlight-check-error dest src-editor))
-                #f #f)
-          (set-clickback-style text start "royalblue"))))
-
-    (define (display-reason text fail)
-      #;(write (list 'display-reason fail (check-fail? fail) (message-error? fail))
-               (current-error-port))
-      #;(newline (current-error-port))
-
-      (let* ((print-string
-              (lambda (m)
-                (send text insert m)))
-             (print-formatted
-              (lambda (m)
-                (when (is-a? m snip%)
-                  (send m set-style (send (send text get-style-list)
-                                          find-named-style "Standard")))
-                (send text insert m)))
-             (print
-              (lambda (fstring . vals)
-                (apply print-with-values fstring print-string print-formatted vals)))
-             (formatter (check-fail-format fail)))
-        (cond
-         [(unexpected-error? fail)
-          (print (string-constant test-engine-check-encountered-error)
-                 (formatter (unexpected-error-expected fail))
-                 (unexpected-error-message fail))]
-         [(unsatisfied-error? fail)
-          (print
-           "check-satisfied encountered an error instead of the expected kind of value, ~F. \n  :: ~a"
-           (unsatisfied-error-expected fail)
-           (unsatisfied-error-message fail))]
-         [(unequal? fail)
-          (print (string-constant test-engine-actual-value-differs-error)
-                 (formatter (unequal-test fail))
-                 (formatter (unequal-actual fail)))]
-	 [(satisfied-failed? fail)
-	  (print "Actual value ~F does not satisfy ~a."
-	         (formatter (satisfied-failed-actual fail))
-                 (satisfied-failed-name fail))]
-         [(outofrange? fail)
-          (print (string-constant test-engine-actual-value-not-within-error)
-                 (formatter (outofrange-test fail))
-                 (outofrange-range fail)
-                 (formatter (outofrange-actual fail)))]
-         [(incorrect-error? fail)
-          (print (string-constant test-engine-encountered-error-error)
-                 (incorrect-error-expected fail)
-                 (incorrect-error-message fail))]
-         [(expected-error? fail)
-          (print (string-constant test-engine-expected-error-error)
-                 (formatter (expected-error-value fail))
-                 (expected-error-message fail))]
-         [(expected-an-error? fail)
-          (print (string-constant test-engine-expected-an-error-error)
-                 (formatter (expected-an-error-value fail)))]
-         [(message-error? fail)
-          (for-each print-formatted (message-error-strings fail))]
-         [(not-mem? fail)
-          (print (string-constant test-engine-not-mem-error)
-                 (formatter (not-mem-test fail)))
-          (for-each (lambda (a) (print " ~F" (formatter a))) (not-mem-set fail))
-          (print ".")]
-         [(not-range? fail)
-          (print (string-constant test-engine-not-range-error)
-                 (formatter (not-range-test fail))
-                 (formatter (not-range-min fail))
-                 (formatter (not-range-max fail)))]
-         [(unimplemented-wish? fail)
-           (print "Test relies on a call to wished for function ~F that has not been implemented, with arguments ~F."
-              (symbol->string (unimplemented-wish-name fail))
-              (formatter (unimplemented-wish-args fail)))]
-         [(property-fail? fail)
-          (print-string (string-constant test-engine-property-fail-error))
-          (for-each (lambda (arguments)
-                      (for-each (lambda (p)
-                                  (if (car p)
-                                      (print " ~a = ~F" (car p) (formatter (cdr p)))
-                                      (print "~F" (formatter (cdr p)))))
-                                arguments))
-                    (result-arguments-list (property-fail-result fail)))]
-         [(property-error? fail)
-          (print (string-constant test-engine-property-error-error)
-                 (property-error-message fail))]
-         )
-        (print-string "\n")))
-    
-    ;; make-error-link: text% check-fail exn src editor -> void
-    (define (make-error-link text reason exn dest src-editor)
-      (make-link text reason dest src-editor)
-      ;; the following code never worked
-      #;(let ((start (send text get-end-position)))
-        (send text insert (string-constant test-engine-trace-error))
-        (send text insert " ")
-        (when (and src-editor current-rep)
-          (send text set-clickback
-                start (send text get-end-position)
-                (lambda (t s e) ((error-handler) exn))
-                #f #f)
-          (set-clickback-style text start "red"))))
-
-    (define (insert-messages text msgs)
-      (for ([m msgs])
-        (when (is-a? m snip%)
-          (send m set-style (send (send text get-style-list)
-                                  find-named-style "Standard")))
-        (send text insert m)))
-
-    (define (make-signature-link text violation src-editor)
-      (let* ((signature (signature-violation-signature violation))
-             (stx (signature-syntax signature))
-             (srcloc (signature-violation-srcloc violation))
-             (message (signature-violation-message violation)))
-        (cond
-         ((string? message)
-          (send text insert message))
-         ((signature-got? message)
-          (insert-messages text (list (string-constant test-engine-got)
-                                      " "
-                                      ((signature-got-format message)
-                                       (signature-got-value message))))))
-        (when srcloc
-          (send text insert " ")
-          (let ((source (srcloc-source srcloc))
-                (line (srcloc-line srcloc))
-                (column (srcloc-column srcloc))
-                (pos (srcloc-position srcloc))
-                (span (srcloc-span srcloc))
-                (start (send text get-end-position)))
-            (send text insert (format-position source line column))
-            (send text set-clickback
-                  start (send text get-end-position)
-                  (lambda (t s e)
-                    (highlight-error source line column pos span src-editor))
-                  #f #f)
-            (set-clickback-style text start "blue")))
-        (send text insert ", ")
-        (send text insert (string-constant test-engine-signature))
-        (send text insert " ")
-        (format-clickable-syntax-src text stx src-editor)
-        (cond
-         ((signature-violation-blame violation)
-          => (lambda (blame)
-               (next-line text)
-               (send text insert (string-constant test-engine-to-blame))
-               (send text insert " ")
-               (format-clickable-syntax-src text blame src-editor))))))
-
-    (define (format-clickable-syntax-src text stx src-editor)
-      (let ((start (send text get-end-position)))
-        (send text insert (format-syntax-src stx))
-        (send text set-clickback
-              start (send text get-end-position)
-              (lambda (t s e)
-                (highlight-error/syntax stx src-editor))
-              #f #f)
-        (set-clickback-style text start "blue")))
-
-    (define (set-clickback-style text start color)
-      (let ([end (send text get-end-position)]
-            [c (new style-delta%)])
-        (send text insert " ")
-        (send text change-style
-              (make-object style-delta% 'change-underline #t)
-              start end #f)
-        (send c set-delta-foreground color)
-        (send text change-style c start end #f)))
-
-    (define (format-syntax-src stx)
-      (format-position (syntax-source stx)
-                       (syntax-line stx) (syntax-column stx)))
-
-    ;format-src: src -> string
-    (define (format-src src)
-      (format-position (car src) (cadr src) (caddr src)))
-
-    (define (format-position file line column)
-      (let ([line (cond [line => number->string]
-                        [else 
-                         (string-constant test-engine-unknown)])]
-            [col
-             (cond [column => number->string]
-                   [else (string-constant test-engine-unknown)])])  
-          
-        (if (path? file)
-            (let-values (((base name must-be-dir?)
-                          (split-path file)))
-              (if (path? name)
-                  (format (string-constant test-engine-in-at-line-column)
-                          (path->string name) line col)
-                  (format (string-constant test-engine-at-line-column)
-                          line col)))
-            (format (string-constant test-engine-at-line-column)
-                    line col))))
-
-    (define (highlight-error source line column position span src-editor)
-      (when (and current-rep src-editor)
-        (cond
-         [(is-a? src-editor text:basic<%>)
-          (let ((highlight
-                 (lambda ()
-                   (let ((error-src (if (send src-editor port-name-matches? source) ; definitions or REPL?
-                                        src-editor
-                                        current-rep)))
-                     (send current-rep highlight-errors
-                           (list (make-srcloc error-src
-                                              line
-                                              column
-                                              position span)) #f)
-                     (let ([frame (send current-tab get-frame)])
-                       (unless (send current-tab is-current-tab?)
-                         (let loop ([tabs (send frame get-tabs)] [i 0])
-                           (unless (null? tabs)
-                             (if (eq? (car tabs) current-tab)
-                                 (send frame change-to-nth-tab i)
-                                 (loop (cdr tabs) (add1 i))))))
-                       (send frame show #t))))))
-            (queue-callback highlight))])))
-
-    (define (highlight-check-error srcloc src-editor)
-      (let* ([src-pos cadddr]
-             [src-span (lambda (l) (car (cddddr l)))]
-             [position (src-pos srcloc)]
-             [span (src-span srcloc)])
-        (highlight-error (car srcloc) (cadr srcloc) (caddr srcloc)
-                         position span
-                         src-editor))) 
-
-    (define (highlight-error/syntax stx src-editor)
-      (highlight-error (syntax-source stx) (syntax-line stx) (syntax-column stx)
-                       (syntax-position stx) (syntax-span stx)
-                       src-editor))
-
-    (super-instantiate ())))
-
-(define test-window%
-  (class* frame:standard-menus% ()
-
-    (super-instantiate
-     ((string-constant test-engine-window-title) #f 400 350))
-
-    (define switch-func void)
-    (define disable-func void)
-    (define close-cleanup void)
-
-    (inherit get-area-container)
-    
-    (define content
-      (make-object editor-canvas% (get-area-container) #f '(auto-vscroll)))
-
-    (define button-panel
-      (make-object horizontal-panel% (get-area-container)
-                   '() #t 0 0 0 0 '(right bottom) 0 0 #t #f))
-
-    (define buttons
-      (list (make-object button%
-                         (string-constant close)
-                         button-panel
-                         (lambda (b c)
-                           (when (eq? 'button (send c get-event-type))
-                             (close-cleanup)
-                             (send this show #f))))
-            (make-object button%
-                         (string-constant dock)
-                         button-panel
-                         (lambda (b c)
-                           (when (eq? 'button (send c get-event-type))
-                             (send this show #f)
-                             (preferences:set 'test-engine:test-window:docked? #t)
-                             (switch-func))))
-            (make-object grow-box-spacer-pane% button-panel)))
-
-    (define/override (edit-menu:between-select-all-and-find menu) (void))
-    
-    (define/public (update-editor e)
-      (send content set-editor e))
-
-    (define/public (update-switch thunk)
-      (set! switch-func thunk))
-    (define/public (update-closer thunk)
-      (set! close-cleanup thunk))
-    (define/public (update-disable thunk)
-      (set! disable-func thunk))))
-
-(define test-panel%
-  (class* vertical-panel% ()
-
-    (inherit get-parent)
-
-    (super-instantiate ())
-
-    (define content (make-object editor-canvas% this #f '()))
-    (define button-panel (make-object horizontal-panel% this
-                                      '() #t 0 0 0 0 '(right bottom) 0 0 #t #f))
-    (define (hide)
-      (let ([current-tab (send frame get-current-tab)])
-        (send frame deregister-test-window 
-              (send current-tab get-test-window))
-        (send current-tab current-test-window #f)
-        (send current-tab current-test-editor #f))
-      (remove))
-
-    (make-object button%
-                 (string-constant hide)
-                 button-panel
-                 (lambda (b c)
-                   (when (eq? 'button (send c get-event-type))
-                     (hide))))
-    #;(make-object button%
-                 (string-constant profj-test-results-hide-and-disable)
-                 button-panel
-                 (lambda (b c)
-                   (when (eq? 'button (send c get-event-type))
-                     (hide)
-                     (send (send frame get-current-tab)
-                           update-test-preference #f))))
-    (make-object button%
-                 (string-constant undock)
-                 button-panel
-                 (lambda (b c)
-                   (when (eq? 'button (send c get-event-type))
-                     (preferences:set 'test-engine:test-window:docked? #f)
-                     (send frame undock-tests))))
-
-    (define/public (update-editor e)
-      (send content set-editor e))
-
-    (define frame #f)
-    (define/public (update-frame f)
-      (set! frame f))
-
-    (define/public (remove)
-      (let ([parent (get-parent)])
-        (preferences:set 'test-engine:test-dock-size (send parent get-percentages))
-        (send parent delete-child this)))))
-
-(provide test-panel% test-window% test-display%)
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/test-engine.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/test-engine.rkt
deleted file mode 100644
index 97b1dd2f1f..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/test-engine.rkt
+++ /dev/null
@@ -1,240 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         "test-info.scm")
-
-(define test-display-base%
-  (class* object% ()
-    
-    (init-field (current-rep #f))
-    (define test-info #f)
-    
-    (define/pubment (install-info t)
-      (set! test-info t)
-      (inner (void) install-info t))
-    (define/public (get-info) test-info)
-    
-    (define/public (display-results)
-      '...)
-    
-    (super-instantiate ())))
-
-(define test-display-textual%
-  (class* object% ()
-
-    (init-field (current-rep #f))
-
-    (define test-info #f)
-    (define/pubment (install-info t)
-      (set! test-info t)
-      (inner (void) install-info t))
-
-    (define/public (display-results)
-      (insert-test-results test-info))
-
-    (define/pubment (insert-test-results test-info)
-      (let* ([style (send test-info test-style)]
-             [total-tests (send test-info tests-run)]
-             [failed-tests (send test-info tests-failed)]
-             [total-checks (send test-info checks-run)]
-             [failed-checks (send test-info checks-failed)]
-             [test-outcomes
-              (lambda (zero-message)
-                (printf "~a"
-                        (cond [(zero? total-tests) zero-message]
-                              [(= 1 total-tests) "Ran 1 test.\n"]
-                              [else (format "Ran ~a tests.\n" total-tests)]))
-                (when (> total-tests 0)
-                  (printf "~a"
-                          (cond
-                            [(and (zero? failed-tests) (= 1 total-tests))
-                             "Test passed!\n\n"]
-                            [(zero? failed-tests) "All tests passed!\n\n"]
-                            [(= failed-tests total-tests) "0 tests passed.\n"]
-                            [else "~a of the ~a tests failed.\n\n"]))))]
-             [check-outcomes
-              (lambda (zero-message)
-                (printf "~a"
-                        (cond
-                          [(zero? total-checks) zero-message]
-                          [(= 1 total-checks) "Ran 1 check.\n"]
-                          [else (format "Ran ~a checks.\n" total-checks)]))
-                (when (> total-checks 0)
-                  (printf "~a"
-                          (cond
-                            [(and (zero? failed-checks) (= 1 total-checks))
-                             "Check passed!\n\n"]
-                            [(zero? failed-checks) "All checks passed!\n\n"]
-                            [(= failed-checks total-checks) "0 checks passed.\n"]
-                            [else (format "~a of the ~a checks failed.\n\n"
-                                          failed-checks total-checks)]))))])
-        (case style
-          [(test-require)
-           (test-outcomes "This program must be tested!\n")
-           (check-outcomes "This program is unchecked!\n")]
-          [(check-require)
-           (check-outcomes "This program is unchecked!\n")]
-          [(test-basic)
-           (test-outcomes "")
-           (check-outcomes "")]
-          [else (check-outcomes "")])
-
-        (unless (and (zero? total-checks) (zero? total-tests))
-          (inner (display-check-failures (send test-info failed-checks)
-                                         test-info)
-                 insert-test-results test-info))))
-
-    (define/public (display-check-failures checks test-info)
-      (for ([failed-check (reverse checks)])
-        (printf "~a" "\t")
-        (make-link (failed-check-reason failed-check)
-                   (check-fail-src (failed-check-reason failed-check)))
-        (printf "~a" "\n")))
-
-    (define/public (report-success) (void))
-
-    (define/public (display-success-summary port count)
-      (unless (test-silence)
-        (fprintf port "~a test~a passed!\n"
-                 (case count
-                   [(0) "Zero"]
-                   [(1) "The only"]
-                   [(2) "Both"]
-                   [else (format "All ~a" count)])
-                 (if (= count 1) "" "s"))))
-    
-    (define/public (display-untested-summary port)
-      (unless (test-silence)
-        (fprintf port "This program should be tested.\n")))
-
-    (define/public (display-disabled-summary port)
-      (fprintf port "Tests disabled.\n"))
-
-    (define/public (next-line) (printf "~a" "\n\t"))
-
-    ;; make-link: (listof (U check-fail (U string snip%))) src -> void
-    (define (make-link reason dest)
-      (print-reason display display reason)
-      (printf "~a" (format-src dest)))
-
-    (define (format-src src)
-      (let ([src-file car]
-            [src-line cadr]
-            [src-col caddr])
-        (string-append
-         (cond [(symbol? (src-file src)) " At "]
-               [(path? (src-file src))
-                (string-append " In " (path->string (src-file src)) " at ")]
-               [else " At "])
-         "line " (cond [(src-line src) => number->string]
-                       [else "(unknown)"])
-         " column " (cond [(src-col src) => number->string]
-                          [else "(unknown)"]))))
-
-      (super-instantiate ())))
-
-(define test-engine%
-  (class* object% ()
-    (field [test-info #f]
-           [test-display #f])
-
-    (define display-class test-display-textual%)
-    (define display-rep #f)
-    (define display-event-space #f)
-    (define silent-mode #t)
-    (define initial-report-done #f)
-    (define unreported-tests #f)
-
-    (super-instantiate ())
-
-    (define/public (refine-display-class d) (set! display-class d))
-    (define/public (info-class) test-info-base%)
-    (define/public (set-silence! t) (set! silent-mode t))
-
-    (define/public (add-analysis a) (send test-info add-analysis a))
-
-    (define/public (setup-info style)
-      (set! initial-report-done #f)
-      (set! test-info (make-object (info-class) style)))
-    (define/pubment (setup-display cur-rep event-space)
-      (set! test-display (make-object display-class cur-rep))
-      (set! display-rep cur-rep)
-      (set! display-event-space event-space)
-      (inner (void) setup-display cur-rep event-space))
-
-    (define/pubment (run)
-      (when (test-execute)
-        (unless test-info (setup-info 'check-base))
-        (inner (void) run)))
-
-    (define/private (clear-results event-space)
-      (when event-space
-	(parameterize ([(dynamic-require 'mred/mred 'current-eventspace) event-space])
-	  ((dynamic-require 'mred/mred 'queue-callback)
-	   (lambda () (send test-display report-success))))))
-
-    (define/public (summarize-results port)
-      (cond
-       ((and initial-report-done
-	     (not unreported-tests)
-	     (not (send test-info has-unreported-failures))))
-       ((test-execute)
-        (unless test-display (setup-display #f #f))
-	(send test-display install-info test-info)
-	(if (pair? (send test-info failed-signatures))
-	    (send this display-results display-rep display-event-space)
-	    (let ((result (send test-info summarize-results)))
-	      (case result
-		[(no-tests)
-		 (clear-results display-event-space)
-		 (display-untested port)]
-		[(all-passed) (display-success port display-event-space
-					       (+ (send test-info tests-run)
-						  (send test-info checks-run)))]
-		[(mixed-results)
-		 (display-results display-rep display-event-space)])))
-	(send test-info clear-unreported-failures)
-	(set! initial-report-done #t)
-	(set! unreported-tests #f))
-       (else
-	(display-disabled port))))
-
-    (define/private (display-success port event-space count)
-      (clear-results event-space)
-      (send test-display display-success-summary port count))
-
-    (define/public (display-results rep event-space)
-      (cond
-       [(and rep event-space)
-	(parameterize ([(dynamic-require 'mred/mred 'current-eventspace) event-space])
-	  ((dynamic-require 'mred/mred 'queue-callback)
-	   (lambda () (send rep display-test-results test-display))))]
-       [event-space 
-	(parameterize ([(dynamic-require 'mred/mred 'current-eventspace) event-space])
-	  ((dynamic-require 'mred/mred 'queue-callback)
-           (lambda () (send test-display display-results))))]
-       [else (send test-display display-results)]))
-
-    (define/public (display-untested port)
-      (when (not silent-mode)
-	(send test-display display-untested-summary port)))
-
-    (define/public (display-disabled port)
-      (send test-display display-disabled-summary port))
-
-    (define/pubment (initialize-test test)
-      (inner (void) initialize-test test))
-
-    (define/pubment (run-test test)
-      (set! unreported-tests #t)
-      (inner (void) run-test test))
-
-    (define/pubment (run-testcase testcase)
-      (inner (void) run-testcase testcase))))
-
-(define test-format (make-parameter (lambda (v) (format "~a" v))))
-(define test-execute (make-parameter #t))
-(define error-handler (make-parameter (lambda (e) (e))))
-(define test-silence (make-parameter #f))
-
-(provide test-engine% test-display-textual% test-format error-handler test-execute test-silence)
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/test-info.scm b/pkgs/htdp-pkgs/htdp-lib/test-engine/test-info.scm
deleted file mode 100644
index b9ddae370b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/test-info.scm
+++ /dev/null
@@ -1,203 +0,0 @@
-#lang scheme/base
-
-(require scheme/class
-         deinprogramm/quickcheck/quickcheck
-         "print.ss")
-
-(provide (all-defined-out))
-
-;; (make-failed-check check-fail (U #f exn)
-(define-struct failed-check (reason exn?))
-
-(define-struct check-fail (src format))
-
-;; (make-unexpected-error src format string exn)
-(define-struct (unexpected-error check-fail) (expected message exn))
-(define-struct (unsatisfied-error check-fail) (expected message exn))
-;; (make-unequal src format scheme-val scheme-val)
-(define-struct (unequal check-fail) (test actual))
-;; (make-outofrange src format scheme-val scheme-val inexact)
-(define-struct (outofrange check-fail) (test actual range))
-;; (make-incorrect-error src format string exn)
-(define-struct (incorrect-error check-fail) (expected message exn))
-;; (make-expected-error src format string scheme-val)
-(define-struct (expected-error check-fail) (message value))
-;; (make-expected-an-error src format scheme-val)
-(define-struct (expected-an-error check-fail) (value))
-;; (make-not-mem src format scheme-val scheme-val)
-(define-struct (not-mem check-fail) (test set))
-;; (make-not-range src format scheme-val scheme-val scheme-val)
-(define-struct (not-range check-fail) (test min max))
-;; (make-satisfied-failed src format scheme-val symbol)
-(define-struct (satisfied-failed check-fail) (actual name))
-
-;;Wishes
-(define-struct (unimplemented-wish check-fail) (name args))
-
-
-(define-struct signature-got (value format))
-
-(define-struct signature-violation (obj signature message srcloc blame))
-
-(define-struct (property-fail check-fail) (result))
-(define-struct (property-error check-fail) (message exn))
-
-;; (make-message-error src format (listof string))
-(define-struct (message-error check-fail) (strings))
-
-(define test-info-base%
-  (class* object% ()
-    (super-instantiate ())
-    
-    (init-field (style 'check-base))
-    (field [analyses null])
-    
-    (define total-tsts 0)
-    (define failed-tsts 0)
-    (define total-cks 0)
-    (define failed-cks 0)
-    (define total-called-wishes 0)
-    
-    (define failures null)
-    (define wishes null)
-    
-    (define unreported-failures #f)
-    
-    (define/public (clear-unreported-failures)
-      (set! unreported-failures #f))
-    
-    (define/public (report-failure)
-      (set! unreported-failures #t))
-    
-    (define/public (has-unreported-failures)
-      unreported-failures)
-    
-    (define/public (test-style) style)
-    (define/public (tests-run) total-tsts)
-    (define/public (tests-failed) failed-tsts)
-    (define/public (checks-run) total-cks)
-    (define/public (checks-failed) failed-cks)
-    (define/public (summarize-results)
-      (cond [(and (zero? total-tsts) (zero? total-cks)) 'no-tests]
-            [(and (zero? failed-cks) (zero? failed-tsts)) 'all-passed]
-            [else 'mixed-results]))
-    (define/public (called-wishes) total-called-wishes)
-    
-    (define/public (failed-checks) failures)
-    (define/public (unimplemented-wishes) wishes)
-    
-    (define/pubment (add-wish-call name)
-      (set! total-called-wishes (add1 total-called-wishes))
-      (unless (memq name wishes) (set! wishes (cons name wishes)))
-      (inner (void) add-wish-call name))
-    
-    (define/pubment (add-check)
-      (set! total-cks (add1 total-cks))
-      (inner (void) add-check))
-    
-    (define/pubment (add-test)
-      (set! total-tsts (add1 total-tsts))
-      (inner (void) add-test))
-    
-    (define/pubment (add-check-failure fail exn?)
-      (set! failed-cks (add1 failed-cks))
-      (set! failures (cons (make-failed-check fail exn?) failures))
-      (inner (void) add-check-failure fail exn?))
-    
-    (define/pubment (add-wish name)
-      (unless (memq name wishes)
-        (set! wishes (cons name wishes)))
-      (inner (void) add-wish name))
-    
-    ;; check-failed: (U check-fail (list (U string snip%))) src (U exn false) -> void
-    (define/pubment (check-failed msg src exn?)
-      (let ((fail
-             ;; We'd like every caller to make a check-fail object,
-             ;; but some (such as ProfessorJ's run time) cannot because
-             ;; of phase problems.  Therefore, do the coercion here.
-             (if (check-fail? msg)
-                 msg
-                 (make-message-error src #f msg))))
-        (add-check-failure fail exn?)
-        (report-failure)
-        (inner (void) check-failed fail src exn?)))
-    
-    (define/pubment (test-failed failed-info)
-      (set! failed-tsts (add1 failed-tsts))
-      (report-failure)
-      (inner (void) test-failed failed-info))
-    
-    (define/public (add-analysis a) (set! analyses (cons a analyses)))
-    
-    (define/public (analyze-position src . vals)
-      (for ([a analyses]) (send a analyze src vals)))
-    (define/public (extract-info pred?)
-      (filter pred? (map (lambda (a) (send a provide-info)) analyses)))))
-
-; helper for printing error messages
-(define (print-reason print-string print-formatted fail)
-  (let ((print
-         (lambda (fstring . vals)
-           (apply print-with-values fstring print-string print-formatted vals)))
-        (formatter (check-fail-format fail)))
-    (cond
-      [(unsatisfied-error? fail)
-       (print 
-        "check-satisfied encountered an error instead of the expected kind of value, ~F. \n   :: ~a"
-        (formatter (unsatisfied-error-expected fail))
-        (unsatisfied-error-message fail))]
-      [(unexpected-error? fail)
-       (print
-        "check-expect encountered the following error instead of the expected value, ~F. \n   :: ~a"
-        (formatter (unexpected-error-expected fail))
-        (unexpected-error-message fail))]
-      [(satisfied-failed? fail)
-       (print "Actual value ~F does not satisfy ~F.\n"
-              (formatter (satisfied-failed-actual fail))
-              (formatter (satisfied-failed-name fail)))]
-      [(unequal? fail)
-       (print "Actual value ~F differs from ~F, the expected value."
-              (formatter (unequal-test fail))
-              (formatter (unequal-actual fail)))]
-      [(outofrange? fail)
-       (print "Actual value ~F is not within ~a of expected value ~F."
-              (formatter (outofrange-test fail))
-              (formatter  (outofrange-range fail))
-              (formatter (outofrange-actual fail)))]
-      [(incorrect-error? fail)
-       (print "check-error encountered the following error instead of the expected ~a\n   :: ~a"
-              (incorrect-error-expected fail)
-              (incorrect-error-message fail))]
-      [(expected-error? fail)
-       (print "check-error expected the following error, but instead received the value ~F.\n ~a"
-              (formatter (expected-error-value fail))
-              (expected-error-message fail))]
-      [(message-error? fail)
-       (for-each print-formatted (message-error-strings fail))]
-      [(not-mem? fail)
-       (print "Actual value ~F differs from all given members in ~F."
-              (formatter (not-mem-test fail))
-              (formatter (not-mem-set fail)))]
-      [(not-range? fail)
-       (print "Actual value ~F is not between ~F and ~F, inclusive."
-              (formatter (not-range-test fail))
-              (formatter (not-range-min fail))
-              (formatter (not-range-max fail)))]
-      [(unimplemented-wish? fail)
-       (print (string-append "Test relies on a call to wished-for function ~F "
-                             " that has not been implemented, with arguments ~F.")
-              (unimplemented-wish-name fail)
-              (formatter (unimplemented-wish-args fail)))]
-      [(property-fail? fail)
-       (print-string "Property falsifiable with")
-       (for-each (lambda (arguments)
-                   (for-each (lambda (p)
-                               (if (car p)
-                                   (print " ~a = ~F" (car p) (formatter (cdr p)))
-                                   (print "~F" (formatter (cdr p)))))
-                             arguments))
-                 (result-arguments-list (property-fail-result fail)))]
-      [(property-error? fail)
-       (print "check-property encountered the following error\n:: ~a"
-              (property-error-message fail))])
-    (print-string "\n")))
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/test-tool.scm b/pkgs/htdp-pkgs/htdp-lib/test-engine/test-tool.scm
deleted file mode 100644
index 5967e5dfb6..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/test-tool.scm
+++ /dev/null
@@ -1,219 +0,0 @@
-#lang scheme/base
-
-(require scheme/file scheme/class scheme/unit scheme/contract drscheme/tool framework mred
-         string-constants)
-(require "test-display.scm")
-(provide tool@)
-
-(preferences:set-default 'test-engine:test-dock-size 
-                         '(2/3 1/3) 
-                         (λ (x) (and (list? x) (= (length x) 2) (andmap number? x) (= 1 (apply + x)))))
-(preferences:set-default 'test-engine:test-window:docked? #f boolean?)
-(preferences:set-default 'test-engine:enable? #t boolean?)
-
-(define tool@
-  (unit (import drscheme:tool^) (export drscheme:tool-exports^)
-
-    (define (phase1) (void))
-    (define (phase2) (void))
-
-    ;; Overriding interactions as the current-rep implementation
-    (define (test-interactions-text%-mixin %)
-      (class* % ()
-        (inherit get-top-level-window get-definitions-text)
-
-        (define/public (display-test-results test-display)
-          (let* ([dr-frame (get-top-level-window)]
-                 [ed-def (get-definitions-text)]
-                 [tab (and ed-def (send ed-def get-tab))])
-            (when (and dr-frame ed-def tab)
-              (send test-display display-settings dr-frame tab ed-def)
-              (send test-display display-results))))
-
-        (super-instantiate ())))
-
-    (define (test-definitions-text%-mixin %)
-      (class* % ()
-        (inherit begin-edit-sequence end-edit-sequence)
-
-        (define colorer-frozen-by-test? #f)
-        (define/public (test-froze-colorer?) colorer-frozen-by-test?)
-        (define/public (toggle-test-status)
-          (set! colorer-frozen-by-test?
-                (not colorer-frozen-by-test?)))
-
-        (define/public (begin-test-color)
-          (begin-edit-sequence #f))
-        (define/public (end-test-color)
-          (end-edit-sequence))
-
-        (define/augment (on-delete start len)
-          (begin-edit-sequence)
-          (inner (void) on-delete start len))
-        (define/augment (after-delete start len)
-          (inner (void) after-delete start len)
-          (when colorer-frozen-by-test?
-            (send this thaw-colorer)
-            (send this toggle-test-status))
-          (end-edit-sequence))
-
-        (define/augment (on-insert start len)
-          (begin-edit-sequence)
-          (inner (void) on-insert start len))
-        (define/augment (after-insert start len)
-          (inner (void) after-insert start len)
-          (when colorer-frozen-by-test?
-            (send this thaw-colorer)
-            (send this toggle-test-status))
-          (end-edit-sequence))
-
-        (super-instantiate ())))
-
-    (define (test-frame-mixin %)
-      (class* % ()
-        (inherit get-current-tab)
-
-        (define/public (display-test-panel editor)
-          (send test-panel update-editor editor)
-          (unless (send test-panel is-shown?)
-            (send test-frame add-child test-panel)
-            (send test-frame set-percentages
-                  (preferences:get 'test-engine:test-dock-size))))
-        (define test-panel null)
-        (define test-frame null)
-
-        (define test-windows null)
-        (define/public (register-test-window t)
-          (set! test-windows (cons t test-windows)))
-        (define/public (deregister-test-window t)
-          (set! test-windows (remq t test-windows)))
-
-        (define/public (dock-tests)
-          (for ([t test-windows]) (send t show #f))
-          (let ([ed (send (get-current-tab) get-test-editor)])
-            (when ed (display-test-panel ed))))
-        (define/public (undock-tests)
-          (when (send test-panel is-shown?) (send test-panel remove))
-          (for ([t test-windows]) (send t show #t)))
-
-        (define/override (make-root-area-container cls parent)
-          (let* ([outer-p (super make-root-area-container
-                                 panel:vertical-dragable% parent)]
-                 [louter-panel (make-object vertical-panel% outer-p)]
-                 [test-p (make-object test-panel% outer-p '(deleted))]
-                 [root (make-object cls louter-panel)])
-            (set! test-panel test-p)
-            (send test-panel update-frame this)
-            (set! test-frame outer-p)
-            root))
-
-        (define/augment (on-tab-change from-tab to-tab)
-          (let ([test-editor (send to-tab get-test-editor)]
-                [panel-shown? (send test-panel is-shown?)]
-                [dock? (preferences:get 'test-engine:test-window:docked?)])
-            (cond [(and test-editor panel-shown? dock?)
-                   (send test-panel update-editor test-editor)]
-                  [(and test-editor dock?)
-                   (display-test-panel test-editor)]
-                  [(and panel-shown? (not dock?))
-                   (undock-tests)]
-                  [panel-shown? (send test-panel remove)])
-            (inner (void) on-tab-change from-tab to-tab)))
-
-        (inherit get-menu-bar get-menu% register-capability-menu-item get-definitions-text
-                 get-insert-menu)
-        (define dock-label (string-constant test-engine-dock-report))
-        (define undock-label (string-constant test-engine-undock-report))
-
-        (define/private (test-menu-init)
-          (let ([language-menu (send this get-language-menu)]
-                [enable-label (string-constant test-engine-enable-tests)]
-                [disable-label (string-constant test-engine-disable-tests)])
-                
-            (make-object separator-menu-item% language-menu)
-            (register-capability-menu-item 'tests:test-menu language-menu)
-            (letrec ([enable-menu-item%
-                      (class menu:can-restore-menu-item%
-                        (define enabled? #t)
-                        (define/public (is-test-enabled?) enabled?)
-                        (define/public (set-test-enabled?! e) (set! enabled? e))
-                        (define/public (enable-tests)
-                          (unless enabled?
-                            (set! enabled? #t)
-                            (send this set-label disable-label)
-                            (preferences:set 'test-engine:enable? #t)))
-                        (define/public (disable-tests)
-                          (when enabled?
-                            (set! enabled? #f)
-                            (send this set-label enable-label)
-                            (preferences:set 'test-engine:enable? #f)))
-                        (super-instantiate ()))]
-                     [enable? (preferences:get 'test-engine:enable?)]
-                     [enable-menu-item (make-object enable-menu-item%
-                                         (if enable? disable-label enable-label)
-                                         language-menu 
-                                         (lambda (_1 _2)
-                                           (if (send _1 is-test-enabled?)
-                                               (send _1 disable-tests)
-                                               (send _1 enable-tests))) #f)])
-              
-              (send enable-menu-item set-test-enabled?! enable?)
-              (register-capability-menu-item 'tests:test-menu language-menu))))
-                
-        (unless (drscheme:language:capability-registered? 'tests:dock-menu)
-          (drscheme:language:register-capability 'tests:dock-menu (flat-contract boolean?) #f))
-          
-        (unless (drscheme:language:capability-registered? 'tests:test-menu)
-          (drscheme:language:register-capability 'tests:test-menu (flat-contract boolean?) #f))
-        (super-instantiate ())
-        (test-menu-init)
-        ))
-
-    (define (test-tab%-mixin %)
-      (class* % ()
-        (inherit get-frame get-defs)
-
-        (define test-editor #f)
-        (define/public (get-test-editor) test-editor)
-        (define/public (current-test-editor ed)
-          (set! test-editor ed))
-
-        (define test-window #f)
-        (define/public (get-test-window) test-window)
-        (define/public (current-test-window w) (set! test-window w))
-
-        (define/public (update-test-preference test?)
-          (let* ([language-settings
-                  (preferences:get
-                   (drscheme:language-configuration:get-settings-preferences-symbol))]
-                 [language
-                  (drscheme:language-configuration:language-settings-language
-                   language-settings)]
-                 [settings
-                  (drscheme:language-configuration:language-settings-settings
-                   language-settings)])
-            (when (object-method-arity-includes? language 'update-test-setting 2)
-              (let ([next-setting
-                     (drscheme:language-configuration:make-language-settings
-                      language
-                      (send language update-test-setting settings test?))])
-                (preferences:set
-                 (drscheme:language-configuration:get-settings-preferences-symbol)
-                 next-setting)
-                (send (get-defs) set-next-settings next-setting)))))
-
-        (define/augment (on-close)
-          (when test-window
-            (when (send test-window is-shown?)
-              (send test-window show #f))
-            (send (get-frame) deregister-test-window test-window))
-          (inner (void) on-close))
-
-        (super-instantiate ())))
-
-    (drscheme:get/extend:extend-definitions-text test-definitions-text%-mixin)
-    (drscheme:get/extend:extend-interactions-text test-interactions-text%-mixin)
-    (drscheme:get/extend:extend-unit-frame test-frame-mixin)
-    (drscheme:get/extend:extend-tab test-tab%-mixin)
-
-    ))
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/todo.txt b/pkgs/htdp-pkgs/htdp-lib/test-engine/todo.txt
deleted file mode 100644
index fa5cc48930..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/todo.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-
-;; *****************************************************************************
-
-BIGGEST FAILURE: 
-   There is no single point of control for anything here. 
-
-
-
-
-TestEngine : 
-  -- split up to test at various language levels
-  -- run automated tests (at the moment the test suite isn't really tested)
-
-;; *****************************************************************************
-To add a check-* feature to the HtDP languages, you need to: 
-
-1. htdp-lib/test-engine
-   create the basic functionality in racket-tests.rkt 
-   add a structure to test-info.scm for reporting test failures 
-   modify test-display.scm test-engine.rkt so that they display failures in
-   gui and repl, respectively 
-
-2. htdp-test/test-engine:
-   add tests to TestEngineTest.rkt
-
-3. htdp-lib/lang:
-   propagate the new name in 
-   htdp-beginner.rkt htdp-beginner-abbr.rkt htdp-intermediate.rkt htdp-intermediate-lambda.rkt htdp-advanced.rkt
-   
-   raco setup htdp; drracket test-file-for-new-syntax-in-bsl-and-isl+ [see 2]
-
-4. htdp-doc/test-engine
-   htdp-doc/lang/scribblings 
-
-   edit the following, follow the check-random example: 
-    beginner.scrbl 
-    beginner-abbr.scrbl 
-    intermediate.scrbl
-    intermediate-lambda.scrbl 
-    advanced.scrbl 
-    prim-ops.rkt 
-    std-grammar.rkt
-
-   raco setup scribblings
-
diff --git a/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/racket-tests.rkt b/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/racket-tests.rkt
deleted file mode 100644
index a4ad8d9004..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/racket-tests.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scheme/base
-
-(require test-engine/racket-tests
-         "type-env-ext.rkt")
-(provide (all-from-out test-engine/racket-tests))
diff --git a/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/scheme-tests.rkt b/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/scheme-tests.rkt
deleted file mode 100644
index 337a64bfec..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/scheme-tests.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scheme/base
-
-(require test-engine/scheme-tests
-         "type-env-ext.rkt")
-(provide (all-from-out test-engine/scheme-tests))
diff --git a/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/type-env-ext.rkt b/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/type-env-ext.rkt
deleted file mode 100644
index c00c4f7b20..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/type-env-ext.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-
-(require typed-racket/utils/utils
-         (prefix-in ce: test-engine/racket-tests)
-         (for-syntax
-          racket/base syntax/parse
-          (utils tc-utils)
-          (env init-envs)
-          (except-in (rep filter-rep object-rep type-rep) make-arr)
-          (rename-in (types abbrev numeric-tower union) [make-arr* make-arr])))
-
-(define-for-syntax ce-env
-  (make-env
-   ;; test*
-   [(syntax-parse (local-expand #'(ce:test) 'expression null)
-      #:context #'ce:test
-      [(_ ce-t:id) #'ce-t])
-    (-> -Void)]
-   ;; insert-test
-   [(syntax-parse (local-expand #'(ce:check-expect 1 1) 'module #f)
-      #:literals (let* when define-values)
-      [(define-values _
-         (let* ((_ _) (_ _))
-           (when _
-             (insert-test _ (lambda () (check-values-expected _ _ _ _))))))
-       #'insert-test])
-    (Univ (-> Univ) . -> . -Void)]
-   ;; builder
-   [(syntax-parse (local-expand #'(ce:check-expect 1 1) 'module #f)
-      #:literals (let* when define-values)
-      [(define-values _
-         (let* ((_ _) (_ (nvv _ _ builder _)))
-           _))
-       #'builder])
-    (-> Univ)]
-   ;; check-values-expected
-   [(syntax-parse (local-expand #'(ce:check-expect 1 1) 'module #f)
-      #:literals (let* when define-values)
-      [(define-values _
-         (let* ((_ _) (_ _))
-           (when _
-             (insert-test _ (lambda () (check-values-expected _ _ _ _))))))
-       #'check-values-expected])
-    ((-> Univ) Univ Univ Univ . -> . -Void)]
-   ;; check-values-within
-   [(syntax-parse (local-expand #'(ce:check-within 1 1 1) 'module #f)
-      #:literals (let* when define-values)
-      [(define-values _
-         (let* ((_ _) (_ _))
-           (when _
-             (insert-test _ (lambda () (check-values-within _ _ _ _ _))))))
-       #'check-values-within])
-    ((-> Univ) Univ -Real Univ Univ . -> . -Void)]
-   ;; check-values-error
-   [(syntax-parse (local-expand #'(ce:check-error 1 "foo") 'module #f)
-      #:literals (let* when define-values)
-      [(define-values _
-         (let* ((_ _) (_ _))
-           (when _
-             (insert-test _ (lambda () (check-values-error _ _ _ _))))))
-       #'check-values-error])
-    ((-> Univ) -String Univ Univ . -> . -Void)]
-   ;; check-range-values-expected
-   [(syntax-parse (local-expand #'(ce:check-range 1 1 1) 'module #f)
-      #:literals (let* when define-values)
-      [(define-values _
-         (let* ((_ _) (_ _))
-           (when _
-             (insert-test _ (lambda () (check-range-values-expected _ _ _ _ _))))))
-       #'check-range-values-expected])
-    ((-> -Real) -Real -Real Univ Univ . -> . -Void)]
-   ;; check-member-of-values-expected
-   [(syntax-parse (local-expand #'(ce:check-member-of 1 1) 'module #f)
-      #:literals (let* when define-values)
-      [(define-values _
-         (let* ((_ _) (_ _))
-           (when _
-             (insert-test _ (lambda () (check-member-of-values-expected _ _ _ _ _))))))
-       #'check-member-of-values-expected])
-    ((-> Univ) Univ (-lst Univ) Univ Univ . -> . -Void)]))
-
-(begin-for-syntax (initialize-type-env ce-env))
diff --git a/pkgs/htdp-pkgs/htdp-lib/xml/info.rkt b/pkgs/htdp-pkgs/htdp-lib/xml/info.rkt
deleted file mode 100644
index 42a2eaa62b..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/xml/info.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang info
-
-;; the XML tool has been moved to the stepper collection, so that the
-;; stepper can create xml snips.  See collects/stepper/tool.rkt for (a
-;; bit) more information
-(define tools '(("text-box-tool.rkt")))
-(define tool-names '("Text Box"))
diff --git a/pkgs/htdp-pkgs/htdp-lib/xml/scheme-snipclass.rkt b/pkgs/htdp-pkgs/htdp-lib/xml/scheme-snipclass.rkt
deleted file mode 100644
index 9c51111112..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/xml/scheme-snipclass.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-(require stepper/private/xml-snip-helpers
-         mzlib/class
-         mred)
-
-(provide snip-class scheme-snip%)
-
-(define scheme-snip%
-  (class* editor-snip% (scheme-snip<%> readable-snip<%>)
-    (init-field splice?)
-    (define/public (get-splice?) splice?)
-
-    (define/public (read-special file line col pos)
-      (scheme-read-special this
-                           file
-                           line
-                           col
-                           pos))
-
-    (super-instantiate ())))
-
-(define scheme-snipclass%
-  (class snip-class%
-    (define/override (read stream-in)
-      (let* ([splice? (zero? (send stream-in get-exact))]
-             [snip (instantiate scheme-snip% ()
-                                (splice? splice?))])
-        (send (send snip get-editor) read-from-file stream-in #f)
-        snip))
-    (super-instantiate ())))
-
-(define snip-class (make-object scheme-snipclass%))
-(send snip-class set-version 1)
-(send snip-class set-classname (format "~s" '(lib "scheme-snipclass.rkt" "xml")))
-(send (get-the-snip-class-list) add snip-class)
diff --git a/pkgs/htdp-pkgs/htdp-lib/xml/text-box-tool.rkt b/pkgs/htdp-pkgs/htdp-lib/xml/text-box-tool.rkt
deleted file mode 100644
index 458cd51448..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/xml/text-box-tool.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-(require drscheme/tool
-         mred
-         framework
-         "text-snipclass.rkt"
-         mzlib/unit
-         mzlib/class
-         string-constants
-         mrlib/include-bitmap)
-
-(provide tool@)
-
-(define tool@
-  (unit
-   (import drscheme:tool^)
-   (export drscheme:tool-exports^)
-   (define (phase1) (void))
-   (define (phase2) (void))
-
-   (define (text-box-mixin %)
-     (class %
-            (inherit get-insert-menu get-edit-target-object register-capability-menu-item)
-            (super-new)
-            (new menu-item%
-                 (label (string-constant insert-text-box-item))
-                 (parent (get-insert-menu))
-                 (callback
-                  (lambda (menu event)
-                    (let ([c-box (new text-box%)]
-                          [text (get-edit-target-object)])
-                      (send text insert c-box)
-                      (send text set-caret-owner c-box 'global)))))
-            (register-capability-menu-item 'drscheme:special:insert-text-box (get-insert-menu))))
-
-   (drscheme:get/extend:extend-unit-frame text-box-mixin)
-
-   (drscheme:language:register-capability 'drscheme:special:insert-text-box boolean? #t)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/xml/text-snipclass.rkt b/pkgs/htdp-pkgs/htdp-lib/xml/text-snipclass.rkt
deleted file mode 100644
index b2ca06f4c5..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/xml/text-snipclass.rkt
+++ /dev/null
@@ -1,148 +0,0 @@
-#lang racket/base
-(require framework
-         mzlib/class
-         mred)
-
-(provide text-box%
-         (rename-out [snipclass snip-class]))
-
-;; chunk-string: (listof any) -> (listof any)
-(define (chunk-string s acc)
-  (cond
-    ((and (null? s) (null? acc)) null)
-    ((null? s) (list (list->string (reverse acc))))
-    ((char? (car s)) (chunk-string (cdr s) (cons (car s) acc)))
-    ((null? acc) (cons (car s) (chunk-string (cdr s) null)))
-    (else (cons (list->string (reverse acc)) (cons (car s) (chunk-string (cdr s) null))))))
-
-(define get-icon
-  (let ([icon #f])
-    (λ ()
-      (unless icon
-        (let ()
-          (define str "“”")
-          (define bdc (make-object bitmap-dc% (make-object bitmap% 1 1)))
-          (define font (send the-font-list find-or-create-font 24 'default 'normal 'normal))
-          (define-values (w h _1 _2) (send bdc get-text-extent str font))
-          (define bmp (make-object bitmap% (floor (inexact->exact w)) (floor (inexact->exact h))))
-          (send bdc set-bitmap bmp)
-          (send bdc set-smoothing 'aligned)
-          (send bdc set-font font)
-          (send bdc clear)
-          (send bdc draw-text str 0 0)
-          (send bdc set-bitmap #f)
-          (set! icon bmp)))
-      icon)))
-
-
-;; marshall: writable -> string
-(define (marshall s)
-  (let ((os (open-output-string)))
-    (with-handlers ((exn:fail? (lambda (x) "")))
-      (write s os)
-      (get-output-string os))))
-
-(define snipclass-text-box%
-  (class decorated-editor-snipclass%
-    (define/override (make-snip stream-in) (new text-box%))
-    (super-instantiate ())))
-
-(define old-snipclass (new snipclass-text-box%))
-(send old-snipclass set-version 1)
-(send old-snipclass set-classname "text-box%")
-(send (get-the-snip-class-list) add old-snipclass)
-
-(define snipclass (new snipclass-text-box%))
-(send snipclass set-version 1)
-(send snipclass set-classname (format "~s" '(lib "text-snipclass.ss" "xml")))
-(send (get-the-snip-class-list) add snipclass)
-
-(define text-box%
-  (class* decorated-editor-snip% (readable-snip<%>)
-    (define/override (make-editor) (let ([e (new text:keymap%)])
-                                     (send e set-max-undo-history 'forever)
-                                     e))
-    (define/override (make-snip) (make-object text-box%))
-    (inherit get-editor get-admin)
-
-
-    (define/override (get-corner-bitmap)
-      (get-icon))
-
-    (define/override (get-menu)
-      (let ([menu (new popup-menu%)])
-        (new menu-item%
-             (label "Convert to string")
-             (parent menu)
-             (callback
-              (lambda (x y)
-                (let ([to-ed (find-containing-editor)])
-                  (when to-ed
-                    (let ([this-pos (find-this-position)])
-                      (when this-pos
-                        (let ([from-ed (get-editor)])
-                          (send to-ed begin-edit-sequence)
-                          (send from-ed begin-edit-sequence)
-                          (send to-ed delete this-pos (+ this-pos 1))
-                          (let* ((p (open-input-text-editor from-ed 0 'end
-                                                            (lambda (s)
-                                                              (values (box s) 1))))
-                                 (contents
-                                  (let loop ((next (read-char-or-special p)))
-                                    (cond
-                                      ((eof-object? next) null)
-                                      (else
-                                       (cons next (loop (read-char-or-special p)))))))
-                                 (repaired-contents
-                                  (map (lambda (x)
-                                         (if (string? x)
-                                           (marshall x)
-                                           (send (unbox x) copy)))
-                                       (chunk-string contents null))))
-                            (for-each
-                             (lambda (x)
-                               (send to-ed insert x this-pos))
-                             (reverse repaired-contents)))
-                          (send to-ed end-edit-sequence)
-                          (send from-ed end-edit-sequence)))))))))
-        menu))
-
-    ;; find-containing-editor : -> (union #f editor)
-    (define/private (find-containing-editor)
-      (let ([admin (get-admin)])
-        (and admin
-             (send admin get-editor))))
-
-    ;; find-this-position : -> (union #f number)
-    (define/private (find-this-position)
-      (let ([ed (find-containing-editor)])
-        (and ed
-             (send ed get-snip-position this))))
-
-    ;; input-port -> (union (listof char) char eof-object? syntax-object)
-    (define/private (get-next port)
-      (let ([v (read-char-or-special port)])
-        (if (special-comment? v)
-          (get-next port)
-          v)))
-
-    (define/public (read-special source line column position)
-      (let* ((ed (get-editor))
-             (port (open-input-text-editor ed))
-             (str (let loop ((next (get-next port)))
-                    (cond
-                      ((eof-object? next) null)
-                      ((char? next)
-                       (cons next (loop (get-next port))))
-                      (else (cons #`(marshall #,next) (loop (get-next port))))))))
-        #`(let ((marshall
-                 (lambda (s)
-                   (let ((os (open-output-string)))
-                     (with-handlers ((exn:fail? (lambda (x) "")))
-                       (display s os)
-                       (get-output-string os))))))
-            (string-append #,@(chunk-string str null)))))
-
-    (super-instantiate ())
-    (inherit set-snipclass)
-    (set-snipclass snipclass)))
diff --git a/pkgs/htdp-pkgs/htdp-lib/xml/xml-snipclass.rkt b/pkgs/htdp-pkgs/htdp-lib/xml/xml-snipclass.rkt
deleted file mode 100644
index 28594acfb7..0000000000
--- a/pkgs/htdp-pkgs/htdp-lib/xml/xml-snipclass.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-(require stepper/private/xml-snip-helpers
-         mzlib/class
-         mred)
-
-(provide snip-class xml-snip%)
-
-(define xml-snip%
-  (class* editor-snip% (xml-snip<%> readable-snip<%>)
-    (init-field eliminate-whitespace-in-empty-tags?)
-
-    (define/public (read-special file line col pos)
-      (xml-read-special eliminate-whitespace-in-empty-tags?
-                        this
-                        file
-                        line
-                        col
-                        pos))
-
-    (super-new)))
-
-(define xml-snipclass%
-  (class snip-class%
-    (define/override (read stream-in)
-      (let* ([eliminate-whitespace-in-empty-tags? (zero? (send stream-in get-exact))]
-             [snip (instantiate xml-snip% ()
-                                (eliminate-whitespace-in-empty-tags? eliminate-whitespace-in-empty-tags?))])
-        (send (send snip get-editor) read-from-file stream-in #f)
-        snip))
-    (super-new)))
-
-(define snip-class (make-object xml-snipclass%))
-(send snip-class set-version 1)
-(send snip-class set-classname (format "~s" '(lib "xml-snipclass.rkt" "xml")))
-(send (get-the-snip-class-list) add snip-class)
diff --git a/pkgs/htdp-pkgs/htdp-lib/xml/xml.png b/pkgs/htdp-pkgs/htdp-lib/xml/xml.png
deleted file mode 100644
index 8372ce9526..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-lib/xml/xml.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/info.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/info.rkt
deleted file mode 100644
index 51d5c492bf..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define compile-omit-paths
-  '("tests" "uchat" "utest"))
\ No newline at end of file
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/.gitignore b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/.gitignore
deleted file mode 100644
index fc57037f43..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/images0/
-/images3/
-/batch-io.txt
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bad-draw.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bad-draw.rkt
deleted file mode 100644
index 2846f66f36..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bad-draw.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang scheme
-
-(require 2htdp/universe)
-
-(define txt "expected to return a scene but this is a string")
-
-(with-handlers ((exn? (lambda (e) (unless (string=? (exn-message e) txt) (raise e)))))
-  (big-bang 0
-            (on-tick add1)
-            (to-draw (lambda (w) (error txt)))))
-          
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-csv-ho.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-csv-ho.rkt
deleted file mode 100644
index e532bb0d2b..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-csv-ho.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname read-with-csv-ho) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require 2htdp/batch-io)
-
-(check-expect (read-csv-file/rows "batch-io-csv-ho.rktl" length) (cons 3 empty))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-csv-ho.txt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-csv-ho.txt
deleted file mode 100644
index b2ffb02521..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-csv-ho.txt
+++ /dev/null
@@ -1 +0,0 @@
-a,b,c
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-xexpr-enumeration.xml b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-xexpr-enumeration.xml
deleted file mode 100644
index 2d10c2327f..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-xexpr-enumeration.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<ul>
-  <li> <word text="hello" /> </li>
-  <li> <ul> 
-        <li> <word text="one" /> </li>
-        <li> <word text="two" /> </li>
-       </ul>
-  </li>
-  <li> <word text="world" /></li>
-  <li> <word text="good" /> <word text="bye" /> </li>
-</ul>
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-xexpr-machine.xml b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-xexpr-machine.xml
deleted file mode 100644
index 6ac1881ada..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-xexpr-machine.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<machine initial="red">
- <action state="red"    next="green" />
- <action state="green"  next="yellow" />
- <action state="yellow" next="red" />
-</machine>
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-xexpr.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-xexpr.rkt
deleted file mode 100644
index 769179dfb9..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io-xexpr.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket 
-
-(require 2htdp/batch-io rackunit)
-
-(define url "http://www.ccs.neu.edu/home/matthias/HtDP2e/Files/")
-
-(define local-machine-configuration "batch-io-xexpr-machine.xml")
-(define remote-machine-configuration (string-append url "machine-configuration.xml"))
-
-(check-true (url-exists? remote-machine-configuration))
-
-(define xm0 (read-plain-xexpr local-machine-configuration))
-(define xm1 (read-xexpr local-machine-configuration))
-(define rxm0 (read-plain-xexpr/web remote-machine-configuration))
-(define rxm1 (read-xexpr/web remote-machine-configuration))
-
-(check-equal? xm0 rxm0 "compare remote and local machine config, plain XML")
-(check-equal? xm1 rxm1 "compare remote and local machine config, XML with white space")
-
-(define local-enumeration "batch-io-xexpr-enumeration.xml")
-(define remote-enumeration (string-append url "enumeration.xml"))
-
-(check-true (url-exists? remote-enumeration))
-
-(define en0 (read-plain-xexpr local-enumeration))
-(define en1 (read-xexpr local-enumeration))
-(define ren0 (read-plain-xexpr/web remote-enumeration))
-(define ren1 (read-xexpr/web remote-enumeration))
-
-(check-equal? xm0 rxm0 "compare remote and local enumeration, plain XML")
-(check-equal? xm1 rxm1 "compare remote and local enumeration, XML with white space")
\ No newline at end of file
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io.rkt
deleted file mode 100644
index 83aae74641..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io.rkt
+++ /dev/null
@@ -1,208 +0,0 @@
-#lang racket
-
-(require rackunit)
-(require 2htdp/batch-io)
-
-;; ---------------------------------------------------------------------------------------------------
-;; use simulate file to test the I/O functions 
-
-(check-equal?
- (simulate-file read-file 
-                "hello world"
-                " good bye"
-                "done")
- "hello world\n good bye\ndone")
-
-(check-equal? 
- (simulate-file read-lines
-                "hello world"
-                " good bye"
-                "done")
- '("hello world" " good bye" "done"))
-
-(check-equal? 
- (simulate-file read-words
-                "hello world"
-                " good bye"
-                "done")
- '("hello" "world" "good" "bye" "done"))
-
-(check-equal? 
- (simulate-file read-words/line
-                "hello world"
-                " good bye"
-                "done")
- '(("hello" "world") ("good" "bye") ("done")))
-
-(check-equal? (simulate-file read-file) "")
-
-;; ---------------------------------------------------------------------------------------------------
-;; manipulate an actual file on disk 
-
-(let ()
-  (define file "batch-io.txt")
-  
-  (define test1 #<<eos
-test1
-eos
-    )
-  
-  (define test2-as-list '("test1" "test2"))
-  
-  (define test2
-    (apply string-append 
-           (list (first test2-as-list)
-                 (string #\newline)
-                 (second test2-as-list))))
-  
-  (write-file file test1)
-  (check-true (string=? (simulate-file read-file test1) test1) "read-file 1")
-  
-  (write-file file test2)
-  (check-true (string=? (simulate-file read-file test2) test2) "read-file 2")
-  
-  (write-file file test1)
-  (check-equal? (read-lines file) (list test1) "as-lines 1")
-  
-  (write-file file test2)
-  (check-equal? (read-lines file) test2-as-list "as-lines 2")
-  
-  (define as-1strings1 (map string (string->list test1)))
-  (write-file file test1)
-  (check-equal? (read-1strings file) as-1strings1 "as-1strings 1")
-  
-  (define as-1strings2 
-    (map string
-         (apply append 
-                (map string->list 
-                     (cdr
-                      (foldr (lambda (f r) (cons "\n" (cons f r))) '() 
-                             test2-as-list))))))
-  
-  (write-file file test2)
-  (check-equal? (read-1strings file) as-1strings2 "as-lines 2")
-  
-  (define test2-a-as-list '("test1" "" "test2"))
-  
-  (define test2-a
-    (apply string-append 
-           (list (first test2-as-list)
-                 (string #\newline)
-                 (string #\newline)
-                 (second test2-as-list))))
-  
-  (write-file file test2-a)
-  (check-equal? (read-lines file) test2-a-as-list "as-lines 2-a")
-  (check-equal? (read-words file) '("test1" "test2") "as-words 2-a")
-  
-  (define test3 #<< eos
- word1, word2 
- word3, word4
- eos
-    )
-  
-  (write-file file test3)
-  (check-equal? (read-words file) '("word1," "word2" "word3," "word4")
-                "as-words")
-  (check-equal? (read-words/line file) '(("word1," "word2") ("word3," "word4"))
-                "as-words")
-  (check-equal? (read-csv-file file) '(("word1" "word2") ("word3" "word4"))
-                "as-cvs 1")
-  (check-equal? (read-csv-file/rows file length) '(2 2) 
-                "as-csv/rows")
-  (delete-file file))
-
-;; ---------------------------------------------------------------------------------------------------
-;; check failure more of functions. 
-
-(check-exn exn:fail:contract? (lambda () (simulate-file cons)))
-;; (check-exn exn:fail:contract? (lambda () (simulate-file))) ;; <--- figure this out 
-
-(check-exn exn:fail:contract? (lambda () (write-file 0 1)))
-(check-exn exn:fail:contract? (lambda () (write-file '("test") 1)))
-(check-exn exn:fail:contract? (lambda () (write-file "test" '("test"))))
-
-(check-exn exn:fail:contract? (lambda () (read-file 0)))
-(check-exn exn:fail:contract? (lambda () (read-file '("test"))))
-
-(check-exn exn:fail:contract? (lambda () (read-lines 0)))
-(check-exn exn:fail:contract? (lambda () (read-lines '("test"))))
-
-(check-exn exn:fail:contract? (lambda () (read-1strings 0)))
-(check-exn exn:fail:contract? (lambda () (read-1strings '("test"))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; read from stdio
-
-(let ()
-  (define *standard-out* "")
-  (define-syntax-rule 
-    (catch-stdo e)
-    (set! *standard-out* (with-output-to-string (lambda () e))))
-  (define-syntax-rule 
-    (pipe-stdi e)
-    (with-input-from-string *standard-out* (lambda () e)))
-    
-
-  (define test1 #<<eos
-test1
-eos
-    )
-  
-  (define test2-as-list '("test1" "test2"))
-  
-  (define test2
-    (apply string-append 
-           (list (first test2-as-list)
-                 (string #\newline)
-                 (second test2-as-list))))
-  
-  (catch-stdo (write-file 'standard-out test1))
-  (check-equal? (pipe-stdi (read-lines 'standard-in)) (list test1) "as-lines 1")
-  
-  (catch-stdo (write-file 'standard-out test2))
-  (check-equal? (pipe-stdi (read-lines 'standard-in)) test2-as-list "as-lines 2")
-  
-  (define as-1strings1 (map string (string->list test1)))
-  (catch-stdo (write-file 'standard-out test1))
-  (check-equal? (pipe-stdi (read-1strings 'standard-in)) as-1strings1 "as-1strings 1")
-  
-  (define as-1strings2 
-    (map string
-         (apply append 
-                (map string->list 
-                     (cdr
-                      (foldr (lambda (f r) (cons "\n" (cons f r))) '() 
-                             test2-as-list))))))
-  
-  (catch-stdo (write-file 'standard-out test2))
-  (check-equal? (pipe-stdi (read-1strings 'standard-in)) as-1strings2 "as-lines 2")
-  
-  (define test2-a-as-list '("test1" "" "test2"))
-  
-  (define test2-a
-    (apply string-append 
-           (list (first test2-as-list)
-                 (string #\newline)
-                 (string #\newline)
-                 (second test2-as-list))))
-  
-  (catch-stdo (write-file 'standard-out test2-a))
-  (check-equal? (pipe-stdi (read-lines 'standard-in)) test2-a-as-list "as-lines 2-a")
-  (check-equal? (pipe-stdi (read-words 'standard-in)) '("test1" "test2") "as-words 2-a")
-  
-  (define test3 #<< eos
- word1, word2 
- word3, word4
- eos
-    )
-  
-  (catch-stdo (write-file 'standard-out test3))
-  (check-equal? (pipe-stdi (read-words 'standard-in)) '("word1," "word2" "word3," "word4")
-                "as-words")
-  (check-equal? (pipe-stdi (read-words/line 'standard-in)) '(("word1," "word2") ("word3," "word4"))
-                "as-words")
-  (check-equal? (pipe-stdi (read-csv-file 'standard-in)) '(("word1" "word2") ("word3" "word4"))
-                "as-cvs 1")
-  (check-equal? (pipe-stdi (read-csv-file/rows 'standard-in length)) '(2 2) 
-                "as-csv/rows"))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io2.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io2.rkt
deleted file mode 100644
index 1167bc626a..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io2.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket
-
-;; test for pr11445
-
-(require 2htdp/batch-io)
-
-(define file "batch-io2.txt")
-
-(with-output-to-file file
-  (lambda ()
-    (display "hello")
-    (display #\return)
-    (display #\linefeed))
-  #:exists 'replace)
-
-(require rackunit)
-(check-equal? (read-lines "batch-io2.txt") '("hello"))
-
-(when (file-exists? file)
-  (delete-file file))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io3.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io3.rkt
deleted file mode 100644
index a67c794ec0..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/batch-io3.rkt
+++ /dev/null
@@ -1,132 +0,0 @@
-#lang racket
-
-;; test for pr11445
-
-(require 2htdp/batch-io)
-
-(define batch-io3
-  #<<eos
-2      
-4 2    
-3 hamburger 3.00
-2 cheeseburger 1.50
-1 hamburger 1.00
-1 fries 0.75
-hamburger
-fries
-2 1    
-4 jackets 42.34
-2 jackets 21.17
-jackets
-eos
-  )
-
-(define batch-io3-expected
-  #<<eos
-You sold 4 hamburgers for a total of $4.00.
-You sold 1 fries for a total of $0.75.
-
-You sold 6 jackets for a total of $63.51.
-
-
-eos
-  )
-
-(define batch-io3.sexpr
-  '((2)
-    (4 2)
-    (3 "hamburger" 3.00)
-    (2 "cheeseburger" 1.50)
-    (1 "hamburger" 1.00)
-    (1 "fries" 0.75)
-    ("hamburger")
-    ("fries")
-    (2 1)
-    (4 "jackets" 42.34)
-    (2 "jackets" 21.17)
-    ("jackets")))
-
-(with-output-to-file "batch-io3.txt"
-  #:exists 'replace
-  (lambda ()
-    (printf batch-io3)))
-
-(define batch-io3.read 
-  (read-words-and-numbers/line "batch-io3.txt"))
-
-(with-handlers ((exn:fail:filesystem? void))
-  (delete-file "batch-io3.txt"))
-
-;; ---------------------------------------------------------------------------------------------------
-;; time to test results 
-
-(module+ test 
-  (require rackunit)
-  (check-equal? batch-io3.read batch-io3.sexpr))
-
-(module+ test
-  (define (split file n)
-    (values (drop file n) (take file n)))
-  
-  (require (for-syntax syntax/parse))
-  
-  ;; (parse-file x:id ([y:id e:expr][(u:id ...) f:expr] ...) body:expr)
-  ;; teases apart x (a list of lines) according to the expressions e, f, ... and successively binds 
-  ;; the values in the lines to y, u, ... and eventually evaluates the body ... expressions 
-  ;; Restriction: to one body expressions so that this form does not inject errors into *SLs 
-  (define-syntax (parse-file stx)
-    (syntax-parse stx
-      [(parse-file file:id ((x:id e:expr) clauses ...) body:expr)
-       #'(let-values ([(x file) (split-at file (enni e))])
-           (parse-file file (clauses ...) body))]
-      [(parse-file file:id (((x:id ...) e:expr) clauses ...) body:expr)
-       #'(let-values ([(file x ...) 
-                       (let-values ([(bundle file) (split-at file (enni e))])
-                         (apply values file (first bundle)))])
-           (parse-file file (clauses ...) body))]
-      [(parse-file file:id () body) #'body]))
-  
-  ;; Any -> Exact-nonnegative-integer
-  ;; coercion with error message for parse-file 
-  (define (enni x)
-    (if (exact-nonnegative-integer? x) x (error 'parse-file pem x)))
-  
-  (define pem "exact-nonnegative-integer expected for relative file position; given: ~e"))
-
-(module+ test
-  ;; String -> Void
-  ;; read input, process queries, write output 
-  (define (solution file-name)
-    ;; S-expression [Dataset -> String] -> String
-    (define (input->output i)
-      (let loop ((ds# (first (first i))) (file (rest i)))
-        (cond
-          [(zero? ds#) ""]
-          [else
-           (parse-file file ([(sales-record# queries#) 1]
-                             [sales-records sales-record#]
-                             [queries queries#])
-             (string-append (process-dataset sales-records queries) "\n" (loop (sub1 ds#) file)))])))
-    ;; Dataset -> String 
-    ;; process one dataset 
-    (define (process-dataset sales-records queries)
-      (foldr (λ (query r) (string-append (total-message sales-records (first query)) r)) "" queries))
-    
-    ;; [Listof [List Number String Number]] String -> String 
-    ;; compute query result and turn into string 
-    (define (total-message sales-records query)
-      (define good* (filter (λ (sales-record) (string=? (second sales-record) query)) sales-records))
-      (define count (apply + (map first good*)))
-      (define value (apply + (map third good*)))
-      (format "You sold ~a ~a for a total of $~a.\n" 
-              count (add-s query (length good*)) (real->decimal-string value 2)))
-    ;; String Natural -> String 
-    ;; add s to string if plurality calls for it
-    (define (add-s str n)
-      (if (and (> n 1) (not (string=? (substring str (- (string-length str) 1)) "s")))
-          (string-append str "s")
-          str))
-    ;; -- in -- ;; should be write-file from batch io
-    (with-output-to-string (λ () (printf (input->output batch-io3.sexpr)))))
-  
-  (check-equal? (solution "don't care") batch-io3-expected))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bitmap-as-image-in-universe.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bitmap-as-image-in-universe.rkt
deleted file mode 100644
index 15421e7a1f..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bitmap-as-image-in-universe.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket
-
-(require pict (only-in 2htdp/universe big-bang on-tick to-draw) "test-aux.rkt")
-
-(testing
-  (check-equal?
-    103 
-    (big-bang 100
-              [on-tick add1 1/28 3]
-	      [to-draw (lambda (w) (pict->bitmap (circle w)))])))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bmp-5.0.1.rktd b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bmp-5.0.1.rktd
deleted file mode 100644
index 74428f56e5..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bmp-5.0.1.rktd
+++ /dev/null
@@ -1,455 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.0.1 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 28 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wxmedia\0"
-4 1 8 #"wximage\0"
-2 0 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 30 #"(lib \"image-core.ss\" \"mrlib\")\0"
-1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 44 0 1 #"\0"
-0 75 1 #"\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 38
-#"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
-#"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1 0 1 #"\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1           0 4 11           4 4 11473
-(
- #"(#(struct:overlay #(struct:translate 8 8 #(struct:flip #f #(struct:b"
- #"itmap #(#\"\\0!!>\\0!!>\\0!!>\\0!!>\\21!!>9\\34\\0347\\205\\31\\0314"
- #"\\227\\31\\0314\\227\\31\\0313\\205\\27\\02719\\31\\0311\\21\\34\\03"
- #"45\\0\\34\\0345\\0\\e\\e4\\0\\32\\0322\\0\\32\\0322\\0!!>\\0!!>\\0!!"
- #">H!!<\\304\\32\\0326\\37766S\\377^^w\\377mm\\204\\377nn\\204\\377aay"
- #"\\377;;W\\304\\27\\0270H\\31\\0311\\0\\e\\e4\\0\\32\\0322\\0\\32\\03"
- #"22\\0!!>\\0!!>l!!=\\364$$A\\377vv\\216\\377\\301\\301\\322\\377\\361"
- #"\\361\\367\\377\\375\\375\\376\\377\\376\\376\\376\\377\\367\\367\\3"
- #"74\\377\\313\\313\\333\\377||\\224\\364&&Cl\\31\\0310\\0\\32\\0322\\"
- #"0\\32\\0322\\0!!>G!!<\\372##@\\377\\202\\202\\233\\377\\316\\316\\33"
- #"5\\377\\322\\322\\336\\377\\312\\312\\330\\377\\312\\312\\327\\377\\"
- #"312\\312\\327\\377\\311\\311\\327\\377\\317\\317\\335\\377\\323\\323"
- #"\\340\\377\\224\\224\\253\\372##@G\\27\\27/\\0\\32\\0322\\16!!=\\305"
- #"\\34\\0347\\377]]{\\377\\261\\261\\307\\377\\275\\275\\316\\377\\365"
- #"\\365\\366\\377\\311\\311\\326\\377\\252\\252\\276\\377\\254\\254\\3"
- #"01\\377\\245\\245\\272\\377\\341\\"
- #"341\\351\\377\\344\\344\\353\\377\\301\\301\\323\\377qq\\214\\305\\2"
- #"7\\0270\\16\\30\\03009\\36\\368\\377--J\\377\\202\\202\\236\\377\\23"
- #"4\\234\\266\\377\\362\\362\\366\\377\\376\\376\\376\\377\\365\\365\\"
- #"370\\377\\261\\261\\306\\377\\222\\222\\253\\377\\330\\330\\341\\377"
- #"\\376\\376\\376\\377\\376\\376\\37"
- #"6\\377\\232\\232\\261\\377kk\\210\\377&&A9\\25\\25,\\205\\35\\358\\3"
- #"77>>[\\377~~\\233\\377zz\\227\\377\\234\\234\\265\\377\\364\\364\\36"
- #"7\\377\\376\\376\\376\\377\\364\\364\\366\\377\\335\\335\\346\\377\\"
- #"376\\376\\376\\377\\376\\376\\376\\377\\203\\203\\233\\377::Z\\37744"
- #"T\\377%%@\\205\\27\\27.\\227\\37\\"
- #"37:\\377??\\\\\\377hh\\206\\377aa\\200\\377[[{\\377\\207\\207\\240\\"
- #"377\\357\\357\\365\\377\\376\\376\\376\\377\\376\\376\\376\\377\\375"
- #"\\375\\376\\377\\177\\177\\227\\377"
- #"--M\\37711P\\37755U\\377--I\\227\\30\\0300\\227  :\\37755T\\377LLl\\"
- #"377IIi\\377BBb\\377[[|\\377\\327"
- #"\\327\\340\\377\\376\\376\\376\\377\\376\\376\\376\\377\\357\\357\\3"
- #"65\\377ee\\202\\377++J\\37744S\\37766U\\377++H\\227\\27\\27.\\205\\3"
- #"6\\368\\377++G\\377::Y\\37744T\\377NNm\\377\\321\\321\\335\\377\\376"
- #"\\376\\376\\377\\375\\375\\376\\377\\357\\357\\365\\377\\376\\376\\3"
- #"76\\377\\356\\356\\365\\377ff\\203"
- #"\\377..M\\37799X\\377$$@\\205\\24\\24+9\\35\\0357\\377$$@\\37766U\\3"
- #"77BBb\\377\\333\\333\\346\\377\\376\\376\\376\\377\\376\\376\\376\\3"
- #"77\\202\\202\\231\\377hh\\204\\377\\354\\354\\364\\377\\376\\376\\37"
- #"6\\377\\364\\364\\367\\377]]{\\37744S\\377\\36\\03679\\23\\23)\\16\\"
- #"35\\0356\\305\\34\\0345\\37744R\\377IIi\\377\\257\\257\\303\\377\\37"
- #"5\\375\\375\\377\\215\\215\\244\\3"
- #"77<<\\\\\\37799Y\\377vv\\221\\377\\364\\364\\367\\377\\317\\317\\333"
- #"\\377TTr\\37700O\\305\\24\\24+\\16\\23\\23*\\0\\34\\0345G\\e\\e2\\37"
- #"2\\\"\\\">\\377GGf\\377^^\\177\\377ww\\223\\377QQq\\377QQp\\377RRq\\"
- #"377LLl\\377xx\\223\\377bb\\202\\377EEd\\372\\34\\0344G\\22\\22'\\0\\"
- #"23\\23*\\0\\34\\0345\\0\\34\\0345l\\"
- #"31\\0311\\364##@\\377FFd\\377aa\\2"
- #"00\\377mm\\212\\377hh\\206\\377ii\\206\\377mm\\214\\377aa\\200\\377C"
- #"Ca\\364\\36\\368l\\22\\22(\\0\\23\\23*\\0\\23\\23*\\0\\34\\0345\\0\\"
- #"34\\0345\\0\\e\\e3H\\30\\30/\\304\\3"
- #"1\\0311\\377..I\\377AA^\\377UUs\\"
- #"377SSr\\377@@\\\\\\377++E\\304\\24\\24,H\\22\\22'\\0\\23\\23*\\0\\23"
- #"\\23*\\0\\23\\23*\\0\\34\\0345\\0\\34\\0345\\0\\e\\e3\\0\\31\\0311\\"
- #"21\\31\\03109\\24\\24,\\205\\26\\26.\\227\\e\\e3\\227\\31\\0310\\205"
- #"\\23\\23+9\\21\\21'\\21\\23\\23*\\0\\23\\23*\\0\\23\\23*\\0\\23\\23*"
- #"\\0\\23\\23*\" 16 16) #(#\"\\377\\"
- #"377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377"
- #"\\377\\377\\356\\356\\356\\377\\306\\306\\306\\377zzz\\377hhh\\377hh"
- #"h\\377zzz\\377\\306\\306\\306\\377\\356\\356\\356\\377\\377\\377\\37"
- #"7\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\"
- #"377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\267\\267"
- #"\\267\\377;;;\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\0\\0\\0\\377;"
- #";;\\377\\267\\267\\267\\377\\377\\"
- #"377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377"
- #"\\377\\377\\377\\377\\377\\223\\223\\223\\377\\v\\v\\v\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"v\\v\\v\\377\\223\\223\\223\\377\\3"
- #"77\\377\\377\\377\\377\\377\\377\\"
- #"377\\377\\377\\377\\377\\270\\270\\270\\377\\5\\5\\5\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\5\\5\\5\\377\\270\\270\\270\\377\\377\\37"
- #"7\\377\\377\\361\\361\\361\\377:"
- #"::\\377\\0\\0\\0\\377\\0\\0\\0\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\0\\0\\0\\377\\0\\0\\0\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377:::\\377\\361\\361\\361\\377\\30"
- #"6\\306\\306\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\306\\306\\306\\377zzz\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377zzz\\377hhh\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377hhh\\377hh"
- #"h\\377\\0\\0\\0\\377\\0\\0\\0\\377"
- #"\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\0\\0\\0\\377"
- #"\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377hhh\\3"
- #"77zzz\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377zz"
- #"z\\377\\306\\306\\306\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377"
- #"\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\0\\0\\0\\377"
- #"\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\306\\306\\306\\377"
- #"\\361\\361\\361\\377:::\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377:::\\377\\"
- #"361\\361\\361\\377\\377\\377\\377"
- #"\\377\\270\\270\\270\\377\\5\\5\\"
- #"5\\377\\0\\0\\0\\377\\0\\0\\0\\377"
- #"\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\0\\0\\0\\377"
- #"\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\377\\5\\5\\5\\377\\270\\270\\270\\377\\377\\377\\377\\377\\377\\3"
- #"77\\377\\377\\377\\377\\377\\377\\223\\223\\223\\377\\v\\v\\v\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\v\\v\\v\\377\\223\\223\\22"
- #"3\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\"
- #"377\\377\\377\\377\\377\\377\\377\\377\\267\\267\\267\\377;;;\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377;;;\\377\\267\\267\\2"
- #"67\\377\\377\\377\\377\\377\\377\\"
- #"377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377"
- #"\\377\\377\\377\\377\\377\\377\\377\\377\\377\\356\\356\\356\\377\\3"
- #"06\\306\\306\\377zzz\\377hhh\\377hhh\\377zzz\\377\\306\\306\\306\\37"
- #"7\\356\\356\\356\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\"
- #"377\\377\\377\\377\\377\\377\" 16 16) 0 1 1 #f #f))) #(struct:transl"
- #"ate 18 18 #(struct:flip #f #(struct:bitmap #(#\"\\0!!>\\0!!>\\0!!>\\"
- #"0!!>\\21!!>9\\34\\0347\\205\\31\\0"
- #"314\\227\\31\\0314\\227\\31\\0313"
- #"\\205\\27\\02719\\31\\0311\\21\\34\\0345\\0\\34\\0345\\0\\e\\e4\\0\\"
- #"32\\0322\\0\\32\\0322\\0!!>\\0!!>\\0!!>H!!<\\304\\32\\0326\\37766S\\"
- #"377^^w\\377mm\\204\\377nn\\204\\377aay\\377;;W\\304\\27\\0270H\\31\\"
- #"0311\\0\\e\\e4\\0\\32\\0322\\0\\32\\0322\\0!!>\\0!!>l!!=\\364$$A\\37"
- #"7vv\\216\\377\\301\\301\\322\\377\\361\\361\\367\\377\\375\\375\\376"
- #"\\377\\376\\376\\376\\377\\367\\36"
- #"7\\374\\377\\313\\313\\333\\377||\\224\\364&&Cl\\31\\0310\\0\\32\\03"
- #"22\\0\\32\\0322\\0!!>G!!<\\372##@\\377\\202\\202\\233\\377\\316\\316"
- #"\\335\\377\\322\\322\\336\\377\\312\\312\\330\\377\\312\\312\\327\\3"
- #"77\\312\\312\\327\\377\\311\\311\\"
- #"327\\377\\317\\317\\335\\377\\323\\323\\340\\377\\224\\224\\253\\372"
- #"##@G\\27\\27/\\0\\32\\0322\\16!!=\\305\\34\\0347\\377]]{\\377\\261\\"
- #"261\\307\\377\\275\\275\\316\\377\\365\\365\\366\\377\\311\\311\\326"
- #"\\377\\252\\252\\276\\377\\254\\254\\301\\377\\245\\245\\272\\377\\3"
- #"41\\341\\351\\377\\344\\344\\353\\377\\301\\301\\323\\377qq\\214\\30"
- #"5\\27\\0270\\16\\30\\03009\\36\\368\\377--J\\377\\202\\202\\236\\377"
- #"\\234\\234\\266\\377\\362\\362\\366\\377\\376\\376\\376\\377\\365\\3"
- #"65\\370\\377\\261\\261\\306\\377\\"
- #"222\\222\\253\\377\\330\\330\\341\\377\\376\\376\\376\\377\\376\\376"
- #"\\376\\377\\232\\232\\261\\377kk\\210\\377&&A9\\25\\25,\\205\\35\\35"
- #"8\\377>>[\\377~~\\233\\377zz\\227\\377\\234\\234\\265\\377\\364\\364"
- #"\\367\\377\\376\\376\\376\\377\\364\\364\\366\\377\\335\\335\\346\\3"
- #"77\\376\\376\\376\\377\\376\\376\\376\\377\\203\\203\\233\\377::Z\\3"
- #"7744T\\377%%@\\205\\27\\27.\\227\\37\\37:\\377??\\\\\\377hh\\206\\37"
- #"7aa\\200\\377[[{\\377\\207\\207\\240\\377\\357\\357\\365\\377\\376\\"
- #"376\\376\\377\\376\\376\\376\\377\\375\\375\\376\\377\\177\\177\\227"
- #"\\377--M\\37711P\\37755U\\377--I\\227\\30\\0300\\227  :\\37755T\\377"
- #"LLl\\377IIi\\377BBb\\377[[|\\377"
- #"\\327\\327\\340\\377\\376\\376\\376\\377\\376\\376\\376\\377\\357\\3"
- #"57\\365\\377ee\\202\\377++J\\37744S\\37766U\\377++H\\227\\27\\27.\\2"
- #"05\\36\\368\\377++G\\377::Y\\37744T\\377NNm\\377\\321\\321\\335\\377"
- #"\\376\\376\\376\\377\\375\\375\\376\\377\\357\\357\\365\\377\\376\\3"
- #"76\\376\\377\\356\\356\\365\\377ff\\203\\377..M\\37799X\\377$$@\\205"
- #"\\24\\24+9\\35\\0357\\377$$@\\37766U\\377BBb\\377\\333\\333\\346\\37"
- #"7\\376\\376\\376\\377\\376\\376\\376\\377\\202\\202\\231\\377hh\\204"
- #"\\377\\354\\354\\364\\377\\376\\376\\376\\377\\364\\364\\367\\377]]{"
- #"\\37744S\\377\\36\\03679\\23\\23)\\16\\35\\0356\\305\\34\\0345\\3774"
- #"4R\\377IIi\\377\\257\\257\\303\\377\\375\\375\\375\\377\\215\\215\\2"
- #"44\\377<<\\\\\\37799Y\\377vv\\221\\377\\364\\364\\367\\377\\317\\317"
- #"\\333\\377TTr\\37700O\\305\\24\\24+\\16\\23\\23*\\0\\34\\0345G\\e\\e"
- #"2\\372\\\"\\\">\\377GGf\\377^^\\177\\377ww\\223\\377QQq\\377QQp\\377"
- #"RRq\\377LLl\\377xx\\223\\377bb\\202\\377EEd\\372\\34\\0344G\\22\\22'"
- #"\\0\\23\\23*\\0\\34\\0345\\0\\34\\0345l\\31\\0311\\364##@\\377FFd\\3"
- #"77aa\\200\\377mm\\212\\377hh\\206\\377ii\\206\\377mm\\214\\377aa\\20"
- #"0\\377CCa\\364\\36\\368l\\22\\22(\\0\\23\\23*\\0\\23\\23*\\0\\34\\03"
- #"45\\0\\34\\0345\\0\\e\\e3H\\30\\30/\\304\\31\\0311\\377..I\\377AA^\\"
- #"377UUs\\377SSr\\377@@\\\\\\377++E\\304\\24\\24,H\\22\\22'\\0\\23\\23"
- #"*\\0\\23\\23*\\0\\23\\23*\\0\\34\\0345\\0\\34\\0345\\0\\e\\e3\\0\\31"
- #"\\0311\\21\\31\\03109\\24\\24,\\205\\26\\26.\\227\\e\\e3\\227\\31\\0"
- #"310\\205\\23\\23+9\\21\\21'\\21\\"
- #"23\\23*\\0\\23\\23*\\0\\23\\23*\\0\\23\\23*\\0\\23\\23*\" 16 16) #(#"
- #"\"\\377\\377\\377\\377\\377\\377\\3"
- #"77\\377\\377\\377\\377\\377\\377\\"
- #"377\\377\\377\\377\\356\\356\\356\\377\\306\\306\\306\\377zzz\\377hh"
- #"h\\377hhh\\377zzz\\377\\306\\306\\"
- #"306\\377\\356\\356\\356\\377\\377\\377\\377\\377\\377\\377\\377\\377"
- #"\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\3"
- #"77\\377\\377\\377\\377\\377\\377\\267\\267\\267\\377;;;\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\0\\0\\0\\377"
- #"\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377;;;\\377\\267\\267\\267\\3"
- #"77\\377\\377\\377\\377\\377\\377\\"
- #"377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377"
- #"\\223\\223\\223\\377\\v\\v\\v\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\0\\0\\0\\377\\0\\0\\0\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\v\\v\\v\\377\\223\\223\\2"
- #"23\\377\\377\\377\\377\\377\\377\\"
- #"377\\377\\377\\377\\377\\377\\377"
- #"\\270\\270\\270\\377\\5\\5\\5\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\0\\0\\0\\377\\0\\0\\0\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\5\\5\\5\\377\\270\\270\\270\\3"
- #"77\\377\\377\\377\\377\\361\\361\\"
- #"361\\377:::\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377:::\\377\\361\\361\\3"
- #"61\\377\\306\\306\\306\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\0\\0\\0\\377\\0\\0\\0\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\306\\306\\306\\3"
- #"77zzz\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377zzz\\377hhh\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\37"
- #"7hhh\\377hhh\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377hhh\\377zzz\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377zzz\\377\\306\\306\\306\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\306\\30"
- #"6\\306\\377\\361\\361\\361\\377:"
- #"::\\377\\0\\0\\0\\377\\0\\0\\0\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\0\\0\\0\\377\\0\\0\\0\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377:::\\377\\361\\361\\361\\377\\37"
- #"7\\377\\377\\377\\270\\270\\270\\"
- #"377\\5\\5\\5\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\5\\5\\5\\377\\270\\270\\270\\377\\377\\377\\377\\"
- #"377\\377\\377\\377\\377\\377\\377\\377\\377\\223\\223\\223\\377\\v\\"
- #"v\\v\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\v\\v\\v\\377\\223\\223\\223\\377\\377\\377\\377\\3"
- #"77\\377\\377\\377\\377\\377\\377\\"
- #"377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\267\\267\\267\\377"
- #";;;\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377;;;\\377\\"
- #"267\\267\\267\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377"
- #"\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\3"
- #"77\\377\\377\\377\\377\\356\\356\\356\\377\\306\\306\\306\\377zzz\\3"
- #"77hhh\\377hhh\\377zzz\\377\\306\\306\\306\\377\\356\\356\\356\\377\\"
- #"377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377\\377"
- #"\\377\" 16 16) 0 1 1 #f #f)))) #(struct:bb 26 26 26))"
-) 0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 17 3 36 #";; this file was created with v5.0.1"
-0           0
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bmp-5.1.3.rktd b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bmp-5.1.3.rktd
deleted file mode 100644
index 25634f4643..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/bmp-5.1.3.rktd
+++ /dev/null
@@ -1,631 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.1.3 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 28 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 53 0 1 #"\0"
-0 75 1 #"\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 38
-#"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
-#"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1 0 1 #"\0"
-0 75 25 #"Bitstream Vera Sans Mono\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1           0 4 11           4 4 19373
-(
- #"(#(struct:overlay #(struct:translate 0 0 #(struct:translate 27/2 14 "
- #"#(struct:bitmap #(#\"\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\37"
- #"7\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\0\\377\\377\\377\\0\\377\\377\\377\\233\\377\\377\\377\\377\\"
- #"0\\0\\0\\233\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\"
- #"377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\3777\\377\\377\\"
- #"377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\37"
- #"7\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3777\\"
- #"377\\377\\377\\233\\377\\377\\377"
- #"\\377\\0\\0\\0\\233\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377"
- #"\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\0\\377\\377\\377\\0\\3"
- #"77\\377\\3777\\377\\377\\377\\233"
- #"\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\2"
- #"33\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\3777\\377\\377\\"
- #"377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\0\\377\\"
- #"377\\377\\0\\377\\377\\3777\\377\\"
- #"377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\3777\\377"
- #"\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\233\\377\\377\\377\\"
- #"377\\0\\0\\0\\233\\377\\377\\377\\2"
- #"33\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\"
- #"377\\0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377\\3"
- #"77\\377\\377\\0\\0\\0\\233\\377\\377\\3777\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\37"
- #"7\\377\\377\\0\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233"
- #"\\377\\377\\3777\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\"
- #"0\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\233\\37"
- #"7\\377\\377\\233\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\2"
- #"33\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\"
- #"377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\0\\377\\377\\377\\233\\377"
- #"\\377\\377\\377\\0\\0\\0\\233\\377\\377\\3777\\377\\377\\377\\0\\377"
- #"\\377\\377\\0\\377\\377\\377\\31\\3"
- #"77\\377\\377\\233\\332\\332\\332\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377"
- #"\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\0\\377\\377\\377\\0\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\"
- #"0\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\23"
- #"3\\377\\377\\3777\\377\\377\\377\\"
- #"233\\377\\377\\377\\233\\377\\377\\377\\377111\\233\\332\\332\\332\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\255\\255\\255\\377ccc"
- #"\\233\\377\\377\\377\\233\\377\\377\\3777\\377\\377\\377\\233\\377\\"
- #"377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\0\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377"
- #"\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\233\\377\\377\\377\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\3777\\377\\377\\377\\0\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\"
- #"0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377"
- #"\\233\\377\\377\\377\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377"
- #"\\0\\0\\0\\233\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\3"
- #"77\\0\\0\\0\\233\\377\\377\\377\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\37"
- #"7\\3777\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\"
- #"377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\23"
- #"3\\377\\377\\377\\377\\0\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\233\\377\\377\\377\\233\\377\\377\\377\\233\\377\\377\\377\\"
- #"233\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\336\\0\\0\\377\\0\\0\\0\\233\\"
- #"377\\377\\3777\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\"
- #"377\\233\\377\\377\\3777\\377\\377\\377\\377\\377\\0\\0\\377\\377\\0"
- #"\\0\\377\\234\\0\\0\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\214\\0\\0007\\377\\37"
- #"7\\377\\233\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\377\\0\\377"
- #"\\377\\377\\0\\377\\377\\377\\0\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\23"
- #"3\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\377\\0\\0\\"
- #"31\\377\\377\\377\\377\\377\\0\\0"
- #"\\377c\\0\\0\\377\\377\\0\\0\\377"
- #"B\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\3"
- #"77\\377\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\377c\\0\\0\\377s\\0\\0\\3"
- #"77\\0\\0\\0\\233\\377\\377\\377\\23"
- #"3\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377"
- #"\\0\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\377\\0\\0\\37"
- #"7\\214\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377B\\0\\0"
- #"\\377\\0\\0\\0\\377B\\0\\0\\377\\3"
- #"77\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\234\\0\\0\\377\\214\\0\\0"
- #"\\377\\234\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377"
- #"\\377\\3777\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\3"
- #"77\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\3"
- #"77\\0\\0007\\377\\377\\377\\377\\"
- #"377\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\0\\0\\0\\377\\0\\0\\0\\37"
- #"7\\377\\0\\0\\377\\0\\0\\0\\377\\3"
- #"77\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\234\\0\\0\\377\\214\\0\\0\\377\\"
- #"214\\0\\0\\233\\377\\377\\377\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\3777\\377\\377\\377\\233\\3"
- #"77\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\233\\3"
- #"77\\377\\377\\377\\377\\0\\0\\31\\377\\377\\377\\377\\377\\0\\0\\377"
- #"\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\214\\0\\0\\377\\0\\0\\0\\377\\214\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\234\\0\\0\\377\\214\\0\\0\\377B\\0\\0\\233\\377"
- #"\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377"
- #"\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\23"
- #"3\\377\\377\\377\\377\\0\\0\\0\\377\\377\\0\\0\\31\\377\\377\\377\\3"
- #"77\\377\\0\\0\\377\\377\\0\\0\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\377\\214"
- #"\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\214\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\275\\0\\0\\377\\214\\0\\0\\377\\2"
- #"14\\0\\0\\377\\234\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\233\\377"
- #"\\377\\377\\377\\0\\0\\0\\233\\377\\377\\3777\\377\\377\\377\\233\\3"
- #"77\\377\\377\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\377\\377\\0\\"
- #"0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\214\\0\\0\\377\\377\\0\\0\\377"
- #"1\\0\\0\\377\\0\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\377s\\0\\0\\377\\"
- #"377\\0\\0\\377c\\0\\0\\377s\\0\\0\\377\\234\\0\\0\\377\\234\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\3777\\377\\3"
- #"77\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\233\\377\\377\\377\\377\\377\\"
- #"0\\0\\377\\0\\0\\0\\377\\377\\0\\0"
- #"\\377\\377\\0\\0\\377B\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\377\\"
- #"0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377c"
- #"\\0\\0\\377s\\0\\0\\377\\234\\0\\0\\377\\0\\0\\0\\377\\214\\0\\0\\23"
- #"3\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377"
- #"\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\233\\377"
- #"\\377\\377\\377\\0\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\377\\377\\"
- #"0\\0\\377\\0\\0\\0\\377\\377\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\214\\0\\0\\377\\0\\0\\0\\377\\214"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\377\\0\\0\\377c\\0\\0\\377\\214\\0\\0\\377\\234\\0\\0\\377\\234"
- #"\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\233\\377\\377\\377\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\233\\377\\377\\377\\377\\377\\0\\0\\31\\377\\377\\37"
- #"7\\377\\377\\0\\0\\377\\377\\0\\0\\"
- #"377B\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0"
- #"\\377\\377\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\377c\\0\\0\\377\\234\\"
- #"0\\0\\377s\\0\\0\\377\\214\\0\\0\\377c\\0\\0\\233\\377\\377\\377\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377"
- #"\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\233\\377\\377\\3777\\3"
- #"77\\377\\377\\377\\377\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\3771\\0\\0\\377\\0"
- #"\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\377\\234\\0\\0\\377\\214\\0\\0\\377!\\0\\0007\\377\\377\\377"
- #"\\233\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\37"
- #"7\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\"
- #"377\\3777\\377\\377\\377\\31\\377\\377\\377\\377\\377\\0\\0\\377\\37"
- #"7\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\3"
- #"77\\0\\0\\377\\0\\0\\0\\377\\377\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\234\\0\\0\\377c\\0\\0\\31\\37"
- #"7\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\"
- #"377\\377\\3777\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\2"
- #"33\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\31\\377\\377\\3"
- #"77\\377\\377\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\"
- #"377\\0\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\0\\0\\0\\377B\\0\\0\\"
- #"377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\214\\0\\0\\377\\2"
- #"14\\0\\0\\3771\\0\\0\\31\\377\\377"
- #"\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\233\\37"
- #"7\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\233\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\377\\31\\3"
- #"77\\377\\377\\377\\377\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\377\\3"
- #"77\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0"
- #"\\377\\0\\0\\0\\377\\377\\0\\0\\37"
- #"7!\\0\\0\\377\\214\\0\\0\\377R\\0\\0\\31\\377\\377\\377\\0\\377\\377"
- #"\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\233\\377\\377\\3777\\377\\377\\"
- #"377\\233\\377\\377\\377\\233\\377"
- #"\\377\\3777\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\31\\"
- #"377\\377\\377\\377\\377\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\377\\"
- #"0\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\0\\0\\0\\377B\\0\\0\\377\\"
- #"377\\0\\0\\377B\\0\\0\\377\\234\\0\\0\\377c\\0\\0\\377B\\0\\0\\31\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\23"
- #"3\\377\\377\\377\\233\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\377\\31\\377\\377\\377\\377\\"
- #"377\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0"
- #"\\0\\377\\0\\0\\0\\377\\377\\0\\0\\"
- #"377B\\0\\0\\377s\\0\\0\\377\\214\\0\\0\\377B\\0\\0\\31\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\0\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\37"
- #"7\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\31\\377\\377\\377\\377\\377\\0\\0"
- #"\\377\\0\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\0\\0\\0\\377s\\0\\0"
- #"\\377\\214\\0\\0\\377c\\0\\0\\3771"
- #"\\0\\0\\31\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\37"
- #"7\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\31\\377"
- #"\\377\\377\\31\\377\\377\\377\\377!\\0\\0\\377\\377\\0\\0\\377\\0\\0"
- #"\\0\\377\\234\\0\\0\\377R\\0\\0\\31\\377\\377\\377\\31\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\0\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\" 27 2"
- #"8) #f 0 1 1 #hash()))) #(struct:translate 0 28 #(struct:translate 0 "
- #"28 #(struct:translate 27/2 -14 #(s"
- #"truct:flip #t #(struct:bitmap #(#\"\\0\\377\\377\\377\\0\\377\\377\\"
- #"377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\233\\377\\377\\377\\377\\0"
- #"\\0\\0\\233\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\"
- #"0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\233\\377\\"
- #"377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\0\\377\\377\\377\\0\\377"
- #"\\377\\377\\0\\377\\377\\377\\0\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\"
- #"0\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\3"
- #"777\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377"
- #"\\377\\377\\0\\377\\377\\377\\0\\37"
- #"7\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\"
- #"377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\"
- #"377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\3777\\377\\3"
- #"77\\377\\233\\377\\377\\3777\\377"
- #"\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\3777\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\233\\377\\377\\377"
- #"\\377\\0\\0\\0\\233\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\377"
- #"\\0\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\37"
- #"7\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\"
- #"377\\3777\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\233\\3"
- #"77\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\233\\377\\377\\377\\"
- #"233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\3777\\377\\377\\3"
- #"77\\233\\377\\377\\377\\377\\0\\0\\"
- #"0\\233\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\0\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\0\\377\\377\\377\\233\\377\\377\\377\\377"
- #"\\0\\0\\0\\233\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\377\\0\\"
- #"377\\377\\377\\0\\377\\377\\3777\\"
- #"377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\233\\377\\377\\377\\233\\377\\377\\3777\\377\\377\\377\\0\\"
- #"377\\377\\377\\0\\377\\377\\3777\\"
- #"377\\377\\377\\233\\377\\377\\377"
- #"\\377\\0\\0\\0\\233\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\37"
- #"7\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\3777\\377\\"
- #"377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\31\\377\\377\\377\\233"
- #"\\332\\332\\332\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\"
- #"0\\0\\0\\233\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\"
- #"377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377"
- #"\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377"
- #"7\\377\\377\\377\\233\\377\\377\\377\\233\\377\\377\\377\\377111\\23"
- #"3\\332\\332\\332\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\255"
- #"\\255\\255\\377ccc\\233\\377\\377\\377\\233\\377\\377\\3777\\377\\37"
- #"7\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377"
- #"\\377\\377\\0\\377\\377\\377\\0\\37"
- #"7\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\3"
- #"77\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233"
- #"\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\3777\\37"
- #"7\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"77\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\233\\37"
- #"7\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\"
- #"377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\233\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\0\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\37"
- #"7\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\3"
- #"77\\0\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\3"
- #"77\\377\\233\\377\\377\\377\\233\\"
- #"377\\377\\377\\233\\377\\377\\377"
- #"\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\377\\336\\0\\0\\37"
- #"7\\0\\0\\0\\233\\377\\377\\3777\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\"
- #"0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377\\37"
- #"7\\3777\\377\\377\\377\\377\\377"
- #"\\0\\0\\377\\377\\0\\0\\377\\234\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\0\\0\\0\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\2"
- #"14\\0\\0007\\377\\377\\377\\233\\377\\377\\3777\\377\\377\\377\\0\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\"
- #"0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\3"
- #"77\\233\\377\\377\\377\\377\\0\\0\\0\\377\\377\\0\\0\\31\\377\\377\\"
- #"377\\377\\377\\0\\0\\377c\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\37"
- #"7\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\3"
- #"77B\\0\\0\\377\\377\\0\\0\\377c\\0\\0\\377s\\0\\0\\377\\0\\0\\0\\233"
- #"\\377\\377\\377\\233\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377\\377"
- #"\\377\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\233\\377\\377\\377\\377\\377\\0\\0\\377\\214\\0\\0\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\377\\377"
- #"\\0\\0\\377B\\0\\0\\377\\0\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\234\\0\\0\\377\\214\\0\\0\\377\\234\\0\\0"
- #"\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\3777\\377"
- #"\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\37"
- #"7\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\377\\0\\0007\\377"
- #"\\377\\377\\377\\377\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0"
- #"\\377\\0\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\0"
- #"\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\"
- #"377\\0\\0\\0\\377\\234\\0\\0\\377\\214\\0\\0\\377\\214\\0\\0\\233\\3"
- #"77\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\3777\\377\\"
- #"377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\"
- #"377\\377\\233\\377\\377\\377\\377\\377\\0\\0\\31\\377\\377\\377\\377"
- #"\\377\\0\\0\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\3"
- #"77\\214\\0\\0\\377\\0\\0\\0\\377\\214\\0\\0\\377\\0\\0\\0\\377\\0\\0"
- #"\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\234\\0\\0\\377\\214\\0\\0\\377"
- #"B\\0\\0\\233\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\"
- #"0\\0\\0\\233\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\"
- #"377\\377\\377\\233\\377\\377\\37"
- #"7\\377\\0\\0\\0\\377\\377\\0\\0\\31\\377\\377\\377\\377\\377\\0\\0\\"
- #"377\\377\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\214\\0\\0\\377\\377"
- #"\\0\\0\\377\\0\\0\\0\\377\\377\\0\\"
- #"0\\377\\214\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\275\\0\\0\\377\\"
- #"214\\0\\0\\377\\214\\0\\0\\377\\234\\0\\0\\377\\0\\0\\0\\233\\377\\3"
- #"77\\377\\233\\377\\377\\377\\377\\"
- #"0\\0\\0\\233\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\377"
- #"\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\377\\377\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377"
- #"\\377\\0\\0\\377\\214\\0\\0\\377\\377\\0\\0\\3771\\0\\0\\377\\0\\0\\"
- #"0\\377B\\0\\0\\377\\377\\0\\0\\377s\\0\\0\\377\\377\\0\\0\\377c\\0\\"
- #"0\\377s\\0\\0\\377\\234\\0\\0\\37"
- #"7\\234\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\37"
- #"7\\3777\\377\\377\\377\\233\\377"
- #"\\377\\377\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\377\\0\\0\\377\\0\\0\\0"
- #"\\377\\377\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\0\\0\\0\\377\\0\\"
- #"0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\37"
- #"7\\0\\0\\0\\377c\\0\\0\\377s\\0\\0\\377\\234\\0\\0\\377\\0\\0\\0\\37"
- #"7\\214\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\37"
- #"7\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\377\\0\\0\\377\\377\\"
- #"0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\37"
- #"7\\0\\0\\0\\377\\214\\0\\0\\377\\0"
- #"\\0\\0\\377\\214\\0\\0\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\377\\0\\0\\377c\\0\\0\\377\\214\\0\\0\\377\\23"
- #"4\\0\\0\\377\\234\\0\\0\\377\\0\\0\\"
- #"0\\233\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233"
- #"\\377\\377\\377\\377\\377\\0\\0\\31\\377\\377\\377\\377\\377\\0\\0\\"
- #"377\\377\\0\\0\\377B\\0\\0\\377\\3"
- #"77\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\"
- #"377B\\0\\0\\377\\377\\0\\0\\377c\\0\\0\\377\\234\\0\\0\\377s\\0\\0\\"
- #"377\\214\\0\\0\\377c\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0"
- #"\\0\\0\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\377\\0"
- #"\\0\\0\\233\\377\\377\\377\\233\\37"
- #"7\\377\\3777\\377\\377\\377\\377\\377\\0\\0\\377\\377\\0\\0\\377\\37"
- #"7\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\377"
- #"1\\0\\0\\377\\0\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\"
- #"0\\0\\0\\377\\0\\0\\0\\377\\234\\0\\0\\377\\214\\0\\0\\377!\\0\\0007"
- #"\\377\\377\\377\\233\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0\\"
- #"0\\233\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\377\\0\\0"
- #"\\0\\233\\377\\377\\3777\\377\\377\\377\\31\\377\\377\\377\\377\\377"
- #"\\0\\0\\377\\377\\0\\0\\377\\0\\0\\"
- #"0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\"
- #"0\\0\\0\\377\\377\\0\\0\\377\\0\\0"
- #"\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\0\\0\\0\\377\\234\\0\\0\\377"
- #"c\\0\\0\\31\\377\\377\\3777\\377\\3"
- #"77\\377\\233\\377\\377\\377\\377\\"
- #"0\\0\\0\\233\\377\\377\\3777\\377\\377\\3777\\377\\377\\377\\233\\37"
- #"7\\377\\377\\233\\377\\377\\377\\377\\0\\0\\0\\233\\377\\377\\377\\3"
- #"1\\377\\377\\377\\377\\377\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\37"
- #"7\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\0\\0\\0"
- #"\\377B\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\214"
- #"\\0\\0\\377\\214\\0\\0\\3771\\0\\0\\31\\377\\377\\377\\233\\377\\377"
- #"\\377\\377\\0\\0\\0\\233\\377\\377\\377\\233\\377\\377\\3777\\377\\3"
- #"77\\377\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\3"
- #"77\\3777\\377\\377\\377\\0\\377\\377\\377\\31\\377\\377\\377\\377\\3"
- #"77\\0\\0\\377\\377\\0\\0\\377\\37"
- #"7\\0\\0\\377\\377\\0\\0\\377\\0\\0"
- #"\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377"
- #"\\377\\0\\0\\377!\\0\\0\\377\\214\\0\\0\\377R\\0\\0\\31\\377\\377\\3"
- #"77\\0\\377\\377\\3777\\377\\377\\3"
- #"77\\233\\377\\377\\377\\377\\0\\0\\0\\377\\0\\0\\0\\233\\377\\377\\3"
- #"777\\377\\377\\377\\233\\377\\377\\377\\233\\377\\377\\3777\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\377\\31\\377\\377\\377\\377\\"
- #"377\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0"
- #"\\0\\377B\\0\\0\\377\\0\\0\\0\\377B\\0\\0\\377\\377\\0\\0\\377B\\0\\"
- #"0\\377\\234\\0\\0\\377c\\0\\0\\377B\\0\\0\\31\\377\\377\\377\\0\\377"
- #"\\377\\377\\0\\377\\377\\3777\\377\\377\\377\\233\\377\\377\\377\\23"
- #"3\\377\\377\\3777\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377"
- #"\\0\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\31\\377\\3"
- #"77\\377\\377\\377\\0\\0\\377\\377\\0\\0\\377\\377\\0\\0\\377\\0\\0\\"
- #"0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377s\\0"
- #"\\0\\377\\214\\0\\0\\377B\\0\\0\\31\\377\\377\\377\\0\\377\\377\\377"
- #"\\0\\377\\377\\377\\0\\377\\377\\3"
- #"77\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\37"
- #"7\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377"
- #"\\377\\377\\0\\377\\377\\377\\0\\3"
- #"77\\377\\377\\0\\377\\377\\377\\0\\"
- #"377\\377\\377\\31\\377\\377\\377"
- #"\\377\\377\\0\\0\\377\\0\\0\\0\\377\\377\\0\\0\\377B\\0\\0\\377\\0\\"
- #"0\\0\\377s\\0\\0\\377\\214\\0\\0\\377c\\0\\0\\3771\\0\\0\\31\\377\\3"
- #"77\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\37"
- #"7\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0"
- #"\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\0\\377\\377\\377\\0\\377\\377\\377\\31\\377\\377\\377\\31\\37"
- #"7\\377\\377\\377!\\0\\0\\377\\377\\0\\0\\377\\0\\0\\0\\377\\234\\0\\"
- #"0\\377R\\0\\0\\31\\377\\377\\377\\31\\377\\377\\377\\0\\377\\377\\37"
- #"7\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377\\377\\0\\377\\377"
- #"\\377\\0\\377\\377\\377\\0\\377\\3"
- #"77\\377\\0\\377\\377\\377\\0\\377\\377\\377\" 27 28) #f 0 1 1 #hash("
- #"))))))) #(struct:bb 27 56 56) #f)"
-) 0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 17 3 32 #";; this file created with v5.1.3"
-0           0
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/clause-once.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/clause-once.rkt
deleted file mode 100644
index 6cc45aab46..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/clause-once.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/load
-
-;; purpose: make sure that each clause exists at most once 
-;; (why am I running this in scheme/load for the namespace in eval)
-
-(error-print-source-location #f)
-
-(with-handlers ((exn:fail:syntax? 
-                 (lambda (e) 
-                   (define msg (exn-message e))
-                   (define ext "big-bang: duplicate on-draw clause") ; " in: (on-draw render2 400 200)")
-                   (unless (string=? msg ext)
-                     (raise e)))))
-  (eval '(module a scheme 
-           (require 2htdp/universe)
-           (require 2htdp/image)
-           
-           (define (render1 n) (text (number->string n) 12 "red"))
-           (define (render2 n) (text (number->string n) 10 "blue"))
-           
-           (define (main a)
-             (big-bang 0
-                       (on-draw render1 200 400)
-                       (on-draw render2 400 200)
-                       ; (on-tick sub1)
-                       (on-tick add1))))))
-
-(with-handlers ((exn:fail:syntax? 
-                 (lambda (e) 
-                   (define msg (exn-message e))
-                   (unless (string=? msg "universe: duplicate on-tick clause"); " in: (on-tick sub1)")
-                     (raise e)))))
-  (eval '(module a scheme 
-           (require 2htdp/universe)
-           
-           (define (main a)
-             (universe 0
-                       (on-tick add1)
-                       (on-tick sub1))))))
-
-(with-handlers ((exn:fail:syntax? 
-                 (lambda (e) 
-                   (define msg (exn-message e))
-                   (unless (string=? msg "big-bang: duplicate to-draw clause") 
-                     (raise e)))))
-  (eval '(module a racket
-	   (require 2htdp/universe)
-	   (define s "")
-	   (define x 0)
-	   (big-bang 0
-	     (on-tick (lambda (w) (begin (set! x (+ x 1)) w)))
-	     (to-draw (lambda (w) (set! s (number->string w))))
-	     (on-draw (lambda (w) (set! s (number->string w))))) )))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-in-draw.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-in-draw.rkt
deleted file mode 100644
index d66cc40530..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-in-draw.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket
-
-(require 2htdp/universe 2htdp/image "test-aux.rkt")
-
-(define (f x)
-  (cond
-    [(= x 0) (circle 10 'solid 'red)]
-    [(= x 1) (circle 20 'solid 'red)]
-    [else (error txt)]))
-
-(define txt "all questions were #f")
-
-(testing
-
-  (with-handlers ([exn? (lambda (e) (unless (string=? (exn-message e) txt) (raise e)))])
-    (big-bang 0 (on-tick add1) (to-draw f))
-    (error 'error-in-draw "test failed"))
-
-
-  (let ([exn (with-handlers ([exn:fail? values])
-	       (big-bang #f 
-		 [to-draw (λ (a b) #f)])
-	       "no error raised")])
-    (unless (regexp-match #rx"^to-draw:" (exn-message exn))
-      (eprintf "expected a error message beginning with to-draw:\n")
-      (raise exn)))
-
-  (let ([exn (with-handlers ([exn:fail? values])
-	       (big-bang #f 
-		 [on-draw (λ (a b) #f)])
-	       "no error raised")])
-    (unless (regexp-match #rx"^on-draw:" (exn-message exn))
-      (eprintf "expected a error message beginning with on-draw:\n")
-      (raise exn))))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-in-tick.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-in-tick.rkt
deleted file mode 100644
index 32eefb4ee1..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-in-tick.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket
-
-(require 2htdp/universe 2htdp/image "test-aux.rkt")
-
-(define (f x) (circle 10 'solid 'red))
-
-(define (g x)
-  (cond
-    [(= x 0) 1]
-    [else (error txt)]))
-
-(define txt "all questions were #f")
-
-(testing
-  (with-handlers ([exn? (lambda (e) (unless (string=? (exn-message e) txt) (raise e)))])
-    (big-bang 0 (on-tick g) (to-draw f))
-    (error 'error-in-tick "test failed")))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-messages.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-messages.rkt
deleted file mode 100644
index dc50974779..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-messages.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket
-
-(require 2htdp/universe)
-
-(with-handlers ((exn:fail:contract? 
-                 (lambda (x) 
-                   (unless (regexp-match "make-package" (exn-message x))
-                     (raise x)))))
-  (make-package 1 2 3))
-
-(with-handlers ((exn:fail:contract? 
-                 (lambda (x) 
-                   (unless (regexp-match "make-bundle" (exn-message x))
-                     (raise x)))))
-  (make-bundle 1 2))
-
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-to-draw.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-to-draw.rkt
deleted file mode 100644
index a7a139a793..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/error-to-draw.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket 
-
-;; fixes PR 14781
-
-(define-namespace-anchor an)
-
-(with-handlers ([exn:fail:syntax? 
-                 ;; succeed quietly if 
-                 (lambda (x)
-                   (unless (regexp-match? "^to-draw" (exn-message x))
-                     (error 'to-draw "got wrong error message: ~e" (exn-message x))))])
-  (eval
-   '(module test racket
-      (require 2htdp/universe)
-      to-draw)
-   (namespace-anchor->namespace an))
-  (error 'to-draw "got no error message"))
-
-(with-handlers ([exn:fail:syntax? 
-                 ;; succeed quietly if 
-                 (lambda (x)
-                   (unless (regexp-match? "^to-draw" (exn-message x))
-                     (error 'to-draw "got wrong error message: ~e" (exn-message x))))])
-  (eval
-   '(module test racket
-      (require 2htdp/universe)
-      (to-draw on-draw))
-   (namespace-anchor->namespace an))
-  (error 'to-draw "got no error message"))
-
-(with-handlers ([exn:fail:syntax? 
-                 ;; succeed quietly if 
-                 (lambda (x)
-                   (unless (regexp-match? "^to-draw" (exn-message x))
-                     (error 'to-draw "got wrong error message: ~e" (exn-message x))))])
-  (eval
-   '(module test racket
-      (require 2htdp/universe)
-      (big-bang 0 (on-draw to-draw)))
-   (namespace-anchor->namespace an))
-  (error 'to-draw "got no error message"))
-
-;; it still works okay for on-draw 
-
-(with-handlers ([exn:fail:syntax? 
-                 ;; succeed quietly if 
-                 (lambda (x)
-                   (unless (regexp-match? "^on-draw" (exn-message x))
-                     (error 'on-draw "got wrong error message: ~e" (exn-message x))))])
-  (eval
-   '(module test racket
-      (require 2htdp/universe)
-      (on-draw to-draw))
-   (namespace-anchor->namespace an))
-  (error 'on-draw "got no error message"))
-
-(with-handlers ([exn:fail:syntax? 
-                 ;; succeed quietly if 
-                 (lambda (x)
-                   (unless (regexp-match? "^on-draw" (exn-message x))
-                     (error 'on-draw "got wrong error message: ~e" (exn-message x))))])
-  (eval
-   '(module test racket
-      (require 2htdp/universe)
-      (big-bang 0 (to-draw on-draw)))
-   (namespace-anchor->namespace an))
-  (error 'to-draw "got no error message"))
\ No newline at end of file
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/full-scene-visible.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/full-scene-visible.rkt
deleted file mode 100644
index 46f5523aae..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/full-scene-visible.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang scheme/base
-
-(require 2htdp/universe
-         "test-aux.rkt"
-         (prefix-in 2: 2htdp/image)
-         (prefix-in 1: htdp/image))
-
-(define (see-full-rectangle x f)
-  (big-bang x
-            (on-tick sub1)
-            (stop-when zero?)
-            (on-draw (λ (x) (f 100 100 'outline 'black)))))
-
-(testing 
-  (see-full-rectangle 3 2:rectangle)
-  (see-full-rectangle 3 1:rectangle))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/image-equality-performance-htdp.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/image-equality-performance-htdp.rkt
deleted file mode 100644
index cf04ed3989..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/image-equality-performance-htdp.rkt
+++ /dev/null
@@ -1,900 +0,0 @@
-#lang racket
-
-#|
-
-This is a file from Guillaume that ran very slowly with the 
-htdp/image library; here it is used as a performance test.
-Porting to #lang racket +2htdp/image consisted of adding requires, 
-changing overlay/xy to underlay/xy,  defining empty-scene, and
-adding the check-expect macro (and related code).
-Also added the timing code at the end.
-
-|#
-
-
-(require htdp/image)
-
-(define-syntax (check-expect stx)
-  (syntax-case stx ()
-    [(_ a b)
-     (with-syntax ([line (syntax-line stx)])
-       #'(set! tests (cons (list (λ () a) (λ () b) line)
-                           tests)))]))
-(define tests '())
-(define (run-tests)
-  (for-each
-   (λ (l)
-     (let ([a-res ((list-ref l 0))]
-           [b-res ((list-ref l 1))]
-           [line (list-ref l 2)])
-       (unless (equal? a-res b-res)
-         (error 'test "test failed; expected ~s and ~s to be equal, but they weren't, line ~a"
-                a-res
-                b-res
-                line))))
-   tests))
-
-(define-syntax-rule (underlay/xy a x y b) (overlay/xy b (- x) (- y) a))
-
-;;Program for creating game of croos-circle game
-;;contract :image->image
-
-;;defining a union square
-;;A square is either
-;;A square is blank
-;;A square is cross
-;;A square is Circle
-
-;;defining width of square
-(define square-width 150)
-
-;;defining th height and width of scene
-(define width (* square-width 3))
-(define height (* square-width 3))
-
-
-;;defining the image circle 
-(define Circle (underlay/xy (circle  20 'solid 'orange) 0 0 (circle  10 'solid 'white)))
-;;defining the image cross 
-(define cross (underlay/xy (rectangle 10 30 'solid 'green) 0 0 (rectangle 30 10 'solid 'green)))
-;;defining the blank image
-(define blank (underlay/xy (rectangle square-width square-width 'solid  'red) 0 0
-                          (rectangle (- square-width 8) (- square-width 8) 'solid 'white)))
-
-;;Given  a square returns 
-;;the image of square
-;;draw-square :square ->image
-(define (draw-square square)
-  (cond[(equal? 'Circle  square)(underlay/xy blank 0 0 Circle)]
-       [(equal? 'cross square)(underlay/xy blank 0 0 cross)]
-       [(equal? 'blank square)blank]
-       ))
-
-
-;;test
-(check-expect(draw-square 'Circle)(underlay/xy blank 0 0 Circle))
-(check-expect(draw-square 'cross)(underlay/xy blank 0 0 cross))
-(check-expect(draw-square 'blank)blank)
-
-;;== Cross and circles, part #3 ==
-
-
-;;define a structure for ROW
-;;ROW structure used for creating a ROW in the board
-;;contract ROW:image image image->image
-(define-struct ROW (left middle right) #:transparent)
-
-
-;; defining a blank row
-
-(define blank-ROW (make-ROW 'blank 'blank 'blank))
-;;defining the cross row
-(define cross-ROW (make-ROW 'blank 'cross 'blank))
-
-;;defineing the cross-row-blank secoend combination
-(define  cross-ROW-blank (make-ROW 'cross 'cross 'blank ))
-;;defining a row cross-row
-(define cross-row (make-ROW 'cross 'cross 'cross ))
-;;defining a row blank-circle
-(define blank-circle (make-ROW 'Circle 'blank 'blank))
-;;defining a row cross-circle
-(define cross-circle  (make-ROW 'cross 'cross 'Circle ))
-;;defining a row circle-cross
-(define circle-cross (make-ROW 'cross 'Circle 'Circle ))
-;;defining a row cross-blank
-(define cross-blank (make-ROW 'cross 'blank 'blank ))
-;;function for  creating ROW with the square
-;;contract:square square square->ROW
-;template: for draw-row
-;template for ROW
-;(define (a-row-function a-row)
-;  ... (row-left a-row)      ;; is a square
-;  ... (row-mid a-row)      ;; is a square
-;  ... (row-right a-row))    ;; is a square
-
-
-
-(define (draw-row row)
-  (underlay/xy (draw-square(ROW-left row)) (image-width blank) 0
-              (underlay/xy (draw-square(ROW-middle row))  (image-width blank) 0 (draw-square(ROW-right row)) )))
-
-;;test
-
-(check-expect (draw-row (make-ROW 'Circle 'cross 'blank))
-              (underlay/xy (draw-square 'Circle) (image-width blank) 0
-                          (underlay/xy (draw-square 'cross )  (image-width blank) 0 (draw-square 'blank) )))
-
-(check-expect (draw-row (make-ROW 'Circle 'cross 'blank))
-              (underlay/xy (draw-square 'Circle) (image-width blank) 0
-                          (underlay/xy (draw-square 'cross )  (image-width blank) 0 (draw-square 'blank) )))
-
-(check-expect (draw-row (make-ROW 'Circle  'blank 'cross))
-              (underlay/xy (draw-square 'Circle) (image-width blank) 0
-                          (underlay/xy (draw-square 'blank )  (image-width blank) 0 (draw-square 'cross) )))
-
-(check-expect (draw-row cross-ROW-blank)
-              (underlay/xy (draw-square 'cross) (image-width blank) 0
-                          (underlay/xy (draw-square 'cross )  (image-width blank) 0 (draw-square 'blank) )))
-
-(check-expect (draw-row cross-row )
-              (underlay/xy (draw-square 'cross) (image-width blank) 0
-                          (underlay/xy (draw-square 'cross )  (image-width blank) 0 (draw-square 'cross) )))
-
-;;define a structure for BOARD
-;;contract make-BOARD :image image image->image
-(define-struct BOARD (top-row center-row bottom-row) #:transparent)
-
-;; purpose : defining an empty board
-(define empty-board (make-BOARD blank-ROW
-                                blank-ROW 
-                                blank-ROW))
-
-;;function for creating board with the row
-
-;template: for draw-board
-;(define (a-board-function a-row)
-;  ... (top-row a-row)      ;; is a square
-;  ... (center-row a-row)      ;; is a square
-;  ... (bottom-row a-row))    ;; is a square
-
-;;defining the background
-(define background (empty-scene width height))
-
-
-;;this function will reusing the fuction draw-row for creating row
-;;contract:row row row->board
-
-;;test
-(check-expect (draw-board (make-BOARD cross-ROW-blank
-                                      cross-ROW 
-                                      cross-row ))
-              (underlay/xy (draw-row cross-ROW-blank) 
-                          0 (image-height (draw-row cross-ROW))
-                          (underlay/xy (draw-row cross-ROW) 
-                                      0 (image-height (draw-row cross-ROW))
-                                      (draw-row cross-row ))))
-
-(check-expect (draw-board (make-BOARD  cross-circle
-                                       (make-ROW 'Circle 'cross 'blank) 
-                                       circle-cross))
-              (underlay/xy (draw-row  cross-circle) 
-                          0 (image-height (draw-row  cross-circle))
-                          (underlay/xy (draw-row (make-ROW 'Circle 'cross 'blank)) 
-                                      0 (image-height (draw-row(make-ROW 'Circle 'cross 'blank)))
-                                      (draw-row circle-cross))))
-
-(check-expect(draw-board (make-BOARD  cross-circle
-                                      (make-ROW 'Circle 'cross 'Circle) 
-                                      circle-cross))
-             (underlay/xy (draw-row  cross-circle) 
-                         0 (image-height (draw-row  cross-circle))
-                         (underlay/xy (draw-row  (make-ROW 'Circle 'cross 'Circle)) 
-                                     0 (image-height (draw-row (make-ROW 'Circle 'cross 'Circle)))
-                                     (draw-row circle-cross))))
-
-(check-expect (draw-board (make-BOARD (make-ROW 'blank 'cross 'Circle)
-                                      (make-ROW 'Circle 'cross 'cross) 
-                                      circle-cross))              
-              (underlay/xy (draw-row (make-ROW 'blank 'cross 'Circle)) 
-                          0 (image-height (draw-row (make-ROW 'blank 'cross 'Circle)))
-                          (underlay/xy (draw-row  (make-ROW 'Circle 'cross 'cross)) 
-                                      0 (image-height (draw-row (make-ROW 'Circle 'cross 'cross)))
-                                      (draw-row circle-cross))) )
-
-(check-expect (draw-board (make-BOARD (make-ROW 'blank 'cross 'Circle)
-                                      (make-ROW 'Circle 'blank 'cross) 
-                                      (make-ROW 'cross 'blank 'Circle)))
-              (underlay/xy (draw-row (make-ROW 'blank 'cross 'Circle)) 
-                          0 (image-height (draw-row (make-ROW 'blank 'cross 'Circle)))
-                          (underlay/xy (draw-row  (make-ROW 'Circle 'blank 'cross)) 
-                                      0 (image-height (draw-row (make-ROW 'Circle 'blank 'cross)))
-                                      (draw-row (make-ROW 'cross 'blank 'Circle)))))
-
-
-
-
-(define (draw-board board)
-  (underlay/xy (draw-row (BOARD-top-row board))
-              0 (image-height (draw-row (BOARD-top-row board)))
-              (underlay/xy (draw-row (BOARD-center-row board)) 
-                          0 (image-height (draw-row(BOARD-center-row board))) 
-                          (draw-row (BOARD-bottom-row board)))))                
-
-;;purpose: given the x coordinate of the mouse click  and returns 
-;;the symbol 'L, the symbol 'M, or the symbol 'R,
-;;depending on whether that X position falls on the right, the middle or the left of the board.
-;;contract: which-column:: number -> symbol
-
-;;test 
-
-(check-expect (which-column (* square-width .5)) 'L)
-(check-expect (which-column (* square-width 1.5)) 'M)
-(check-expect (which-column (* square-width 2.3)) 'R)
-
-(define (which-column x-pos)
-  (cond[(and (>= x-pos 0)(<= x-pos square-width))'L]
-       [(and (>= x-pos (+ square-width 1))(<= x-pos (* 2 square-width)))'M]
-       [(and (>= x-pos (+ (* 2 square-width) 1))(<= x-pos (* 3 square-width)))'R]
-       [else "play in the board,you played outside the square"]))
-
-
-
-;;purpose: given the y coordinate of the mouse click  and returns 
-;;the symbol 'T, the symbol 'C, or the symbol 'B,
-;;depending on whether that Y position falls on the top, the center or the bottom of the board.
-;;contract: which-row:: number -> symbol
-
-;;test 
-
-(check-expect (which-row (* square-width .6)) 'T)
-(check-expect (which-row (* square-width 1.3)) 'C)
-(check-expect (which-row (* square-width 2.7)) 'B)
-
-(define (which-row y-pos)
-  (cond[(and (>= y-pos 0)(<= y-pos square-width))'T]
-       [(and (>= y-pos (+ square-width 1))(<= y-pos (* 2 square-width)))'C]
-       [(and (>= y-pos (+ (* 2 square-width) 1))(<= y-pos (* 3 square-width)))'B]
-       [else "play in the board,you played outside the square"]))
-
-
-
-;;purpose: give the row and the square to be played and returns a new row replacing the left square
-;; play-on-left : row square ->row
-
-;;test
-(check-expect (play-on-left (make-ROW 'blank 'cross 'Circle) 'Circle)
-              (make-ROW 'Circle 'cross 'Circle))
-
-(check-expect (play-on-left (make-ROW 'blank 'cross 'Circle) 'cross)
-              cross-circle)
-
-(check-expect (play-on-left cross-ROW 'Circle)
-              (make-ROW 'Circle 'cross 'blank))
-(define (play-on-left row play)
-  (make-ROW play (ROW-middle row) (ROW-right row)))
-
-
-;;purpose: give the row and the square to be played and returns a new row replacing the middle square
-;; play-on-middle : row square ->row
-
-;;test
-(check-expect (play-on-middle (make-ROW 'blank 'blank 'Circle) 'Circle)
-              (make-ROW 'blank 'Circle 'Circle))
-
-(check-expect (play-on-middle (make-ROW 'blank 'blank 'Circle) 'cross)
-              (make-ROW 'blank 'cross 'Circle))
-
-(check-expect (play-on-middle blank-ROW 'Circle)
-              (make-ROW 'blank 'Circle 'blank))
-
-(define (play-on-middle row play)
-  (make-ROW (ROW-left row) play  (ROW-right row)))
-
-
-;;purpose: give the row and the square to be played and returns a new row replacing the right square
-;; play-on-right : row square ->row
-
-;;test
-(check-expect (play-on-right blank-ROW 'Circle)
-              (make-ROW 'blank 'blank 'Circle))
-
-(check-expect (play-on-right (make-ROW 'blank 'Circle 'blank) 'cross)
-              (make-ROW 'blank 'Circle 'cross))
-
-(check-expect (play-on-right blank-ROW 'Circle)
-              (make-ROW 'blank 'blank 'Circle))
-
-(define (play-on-right row play)
-  (make-ROW (ROW-left row) (ROW-middle row) play  ))
-
-;;purpose : given the row, which column ,square to be played returns new row replacing the column
-;; play-on-row : row square symbol -> row
-
-(check-expect (play-on-row blank-ROW 'L 'Circle)
-              (make-ROW 'Circle 'blank 'blank))
-(check-expect (play-on-row blank-ROW 'M 'Circle)
-              (make-ROW 'blank 'Circle 'blank))
-(check-expect (play-on-row blank-ROW 'R 'Circle)
-              (make-ROW 'blank 'blank 'Circle))
-
-(define (play-on-row row column-label play)
-  (cond [(equal? column-label 'L) (make-ROW play  (ROW-middle row) (ROW-right row))]
-        [(equal? column-label 'M) (make-ROW (ROW-left row) play  (ROW-right row))]
-        [(equal? column-label 'R) (make-ROW  (ROW-left row) (ROW-middle row) play)]
-        [else row]))
-
-;;purpose given a board, a square to be played and the label of the position to be played
-;;returns a new board with the square to be played at the labeled position on the top row
-
-;; play-on-board-at-top : board square symbol -> board
-;;test
-(check-expect (play-on-board-at-top empty-board  'Circle 'L)
-              (make-BOARD (make-ROW 'Circle 'blank 'blank)
-                          blank-ROW 
-                          blank-ROW))
-
-
-(check-expect (play-on-board-at-top empty-board  'Circle 'M)
-              (make-BOARD (make-ROW 'blank 'Circle 'blank)
-                          blank-ROW 
-                          blank-ROW))
-
-
-(check-expect (play-on-board-at-top empty-board  'cross 'R)
-              (make-BOARD (make-ROW 'blank 'blank 'cross)
-                          blank-ROW 
-                          blank-ROW))
-
-
-(define (play-on-board-at-top board play column-label)
-  (make-BOARD(play-on-row (BOARD-top-row board) column-label play)
-             (BOARD-center-row board)(BOARD-bottom-row board))
-  )
-
-
-
-;;purpose given a board, a square to be played and the label of the position to be played
-;;returns a new board with the square to be played at the labeled position on the middle row
-
-;; play-on-board-at-top : board square symbol -> board
-;;test
-(check-expect (play-on-board-at-middle empty-board  'Circle 'L)
-              (make-BOARD blank-ROW
-                          (make-ROW 'Circle 'blank 'blank) 
-                          blank-ROW))
-
-
-(check-expect (play-on-board-at-middle empty-board  'Circle 'M)
-              (make-BOARD blank-ROW
-                          (make-ROW 'blank 'Circle 'blank) 
-                          blank-ROW))
-
-
-(check-expect (play-on-board-at-middle empty-board  'cross 'R)
-              (make-BOARD blank-ROW
-                          (make-ROW 'blank 'blank  'cross) 
-                          blank-ROW))
-
-
-(define (play-on-board-at-middle board play column-label)
-  (make-BOARD (BOARD-top-row board) (play-on-row (BOARD-center-row board) column-label play)
-              (BOARD-bottom-row board))
-  )
-;;purpose given a board, a square to be played and the label of the position to be played
-;;returns a new board with the square to be played at the labeled position on the bottom row
-
-;; play-on-board-at-top : board square symbol -> board
-;;test
-(check-expect (play-on-board-at-bottom empty-board  'Circle 'L)
-              (make-BOARD blank-ROW
-                          blank-ROW 
-                          (make-ROW 'Circle 'blank 'blank)))
-
-
-(check-expect (play-on-board-at-bottom empty-board  'Circle 'M)
-              (make-BOARD blank-ROW
-                          blank-ROW 
-                          (make-ROW 'blank 'Circle 'blank)))
-
-
-(check-expect (play-on-board-at-bottom empty-board  'cross 'R)
-              (make-BOARD blank-ROW
-                          blank-ROW 
-                          (make-ROW 'blank 'blank 'cross)))
-
-
-(define (play-on-board-at-bottom board play column-label)
-  (make-BOARD (BOARD-top-row board) (BOARD-center-row board) 
-              (play-on-row (BOARD-bottom-row board)  column-label play)
-              )
-  )
-
-
-;;purpose :given the board ,square to be played,column and row label and returns a new board 
-;;with the square to be  played at the position referred
-;; play-on-board : board square symbol symbol -> board
-
-;;test
-(check-expect (play-on-board empty-board  'cross 'R 'T)
-              (make-BOARD (make-ROW 'blank 'blank 'cross )
-                          blank-ROW 
-                          blank-ROW))
-
-
-(check-expect (play-on-board empty-board  'cross 'L 'C)
-              (make-BOARD blank-ROW
-                          cross-blank 
-                          blank-ROW))
-
-
-(check-expect (play-on-board empty-board  'cross 'M 'B)
-              (make-BOARD blank-ROW
-                          blank-ROW 
-                          cross-ROW))
-
-
-(define (play-on-board board play column-label row-label)
-  (cond [(equal? row-label 'T) (play-on-board-at-top board play column-label)]
-        [(equal? row-label 'C) (play-on-board-at-middle board play column-label)]
-        [(equal? row-label 'B) (play-on-board-at-bottom board play column-label)]
-        [else board]))
-
-
-;;purpose : Given a board structure, a return the image of that board centered on the scene.
-;;create-board:board->scene
-
-;;test
-(check-expect (create-board  (make-BOARD blank-ROW
-                                         blank-ROW 
-                                         cross-ROW))
-              (place-image (draw-board (make-BOARD blank-ROW
-                                                   blank-ROW 
-                                                   cross-ROW))
-                           (/ square-width 2)(/ square-width 2) background))
-
-(check-expect (create-board  (make-BOARD (make-ROW 'Circle 'cross 'Circle) 
-                                         blank-ROW 
-                                         cross-ROW))
-              (place-image (draw-board (make-BOARD (make-ROW 'Circle 'cross 'Circle)
-                                                   blank-ROW 
-                                                   cross-ROW))
-                           (/ square-width 2)(/ square-width 2) background))
-
-(check-expect (create-board  (make-BOARD (make-ROW 'Circle 'cross 'blank) 
-                                         blank-ROW 
-                                         cross-ROW))
-              (place-image (draw-board (make-BOARD (make-ROW 'Circle 'cross 'blank)
-                                                   blank-ROW 
-                                                   cross-ROW))
-                           (/ square-width 2)(/ square-width 2) background))
-
-(define (create-board board)
-  (place-image (draw-board board)(/ square-width 2)(/ square-width 2)  background)
-  )
-
-;; clack1 : Mouse handler. Plays a cross (always a cross) where the mouse is clicked, on button-up.
-;; clack1 : board number number symbol -> board
-
-(define (clack1 board x y event)
-  (cond [(symbol=? event 'button-up)
-         (play-on-board board 'cross (which-column x) (which-row y))]
-        [else board]))
-
-(check-expect (clack1 (make-BOARD blank-ROW
-                                  blank-ROW 
-                                  cross-ROW) 40 68 'button-up)
-              (make-BOARD cross-blank
-                          blank-ROW 
-                          cross-ROW))
-
-(check-expect (clack1 (make-BOARD blank-ROW
-                                  blank-ROW 
-                                  cross-ROW) 160 168 'button-up)
-              (make-BOARD blank-ROW
-                          (make-ROW 'blank 'cross 'blank)
-                          cross-ROW))
-
-(check-expect (clack1 (make-BOARD blank-ROW
-                                  blank-ROW 
-                                  blank-ROW) 310 365 'button-up)
-              (make-BOARD blank-ROW
-                          blank-ROW
-                          (make-ROW  'blank 'blank 'cross)
-                          )) 
-;; purpose : Given the current player, return which player goes next.
-;; other-player : square -> square
-
-(define (other-player play)
-  (cond [(equal? play 'Circle) 'cross]
-        [(equal? play 'cross) 'Circle]))
-
-(check-expect (other-player 'cross) 'Circle)
-(check-expect (other-player 'Circle) 'cross)
-
-;; purpose : Given a horz. pos (either 'L, 'M or 'R), finds the content of that square.
-;; lookup-square : row symbol -> square
-
-(define (lookup-square column-label row)
-  (cond [(equal? column-label 'L)(ROW-left row)]
-        [(equal? column-label 'M)(ROW-middle row)]
-        [(equal? column-label 'R)(ROW-right row)]))
-
-(check-expect(lookup-square 'L (make-ROW 'blank 'Circle 'cross)) 'blank)
-(check-expect(lookup-square 'M (make-ROW 'blank 'Circle 'cross)) 'Circle)
-(check-expect(lookup-square 'R (make-ROW 'blank 'Circle 'cross)) 'cross)
-
-;; lookup-row : Given a vert. pos (either 'T, 'C or 'B), finds that row.
-;; lookup-row : board symbol -> row
-
-(define(lookup-row row-label board)
-  (cond [(equal? row-label 'T)(BOARD-top-row board)]
-        [(equal? row-label 'C)(BOARD-center-row board)]
-        [(equal? row-label 'B)(BOARD-bottom-row board)]))
-
-
-(check-expect(lookup-row 'T (make-BOARD (make-ROW 'cross 'blank 'Circle) 
-                                        blank-ROW 
-                                        blank-ROW)) (make-ROW 'cross 'blank 'Circle)) 
-
-(check-expect(lookup-row 'C (make-BOARD blank-ROW
-                                        (make-ROW 'cross 'blank 'Circle) 
-                                        blank-ROW)) (make-ROW 'cross 'blank 'Circle))
-
-(check-expect(lookup-row 'B (make-BOARD blank-ROW 
-                                        blank-ROW
-                                        (make-ROW 'cross 'blank 'Circle) 
-                                        )) (make-ROW 'cross 'blank 'Circle))
-
-;; lookup : Given a horz. and a vert. pos, finds that square.
-;; lookup : board symbol symbol -> square
-
-(define (lookup board  column-label row-label)
-  (lookup-square column-label (lookup-row row-label board)))
-
-(check-expect(lookup(make-BOARD (make-ROW 'cross 'blank 'Circle) 
-                                blank-ROW 
-                                blank-ROW) 'L 'T) 'cross)
-
-(check-expect(lookup(make-BOARD blank-ROW
-                                (make-ROW 'cross 'blank 'Circle) 
-                                blank-ROW) 'M 'C) 'blank)
-
-(check-expect(lookup(make-BOARD blank-ROW 
-                                blank-ROW
-                                (make-ROW 'cross 'blank 'Circle) 
-                                ) 'R 'B) 'Circle)
-
-
-;; move-legal? : Return true if the square at horizondal and vertical position is blank.
-;; move-legal? : board symbol symbol -> boolean
-
-(define(move-legal? board column-label row-label)
-  (equal? (lookup board  column-label row-label) 'blank))
-
-(check-expect (move-legal? empty-board 'L 'C) true)
-(check-expect (move-legal? (make-BOARD blank-ROW
-                                       (make-ROW 'Circle 'cross cross)
-                                       blank-ROW)                                       
-                           'M 'C) false)
-;;define a structure for game
-;;contract make-game :square board number->game
-(define-struct GAME (next-player board move-count) #:transparent)
-
-;;defining the initial-game
-(define initial-game (make-GAME 'cross empty-board 0))
-
-;;purpose: Given a game and a horz. and vert. position, the next player plays in that square, if legal. The move-count goes up by 1,and the next-player switches hand.
-;; play-on-game : game symbol symbol -> game
-
-(check-expect(play-on-game initial-game 'L 'T)
-             (make-GAME 'Circle 
-                        (make-BOARD cross-blank blank-ROW blank-ROW) 1))
-
-(check-expect(play-on-game (make-GAME 'Circle 
-                                      (make-BOARD cross-blank blank-ROW blank-ROW) 1)
-                           'M 'C )
-             (make-GAME 'cross 
-                        (make-BOARD cross-blank
-                                    (make-ROW 'blank 'Circle 'blank)
-                                    blank-ROW) 2))
-(check-expect(play-on-game(make-GAME 'cross 
-                                     (make-BOARD cross-blank
-                                                 (make-ROW 'blank 'Circle 'blank)
-                                                 blank-ROW) 2)
-                          'R 'B)
-             (make-GAME 'Circle 
-                        (make-BOARD cross-blank
-                                    (make-ROW 'blank 'Circle 'blank)
-                                    (make-ROW 'blank 'blank 'cross)) 3))
-
-(define (play-on-game game column-label row-label)
-  (cond [ (move-legal? (GAME-board game) column-label row-label)
-          (make-GAME (other-player (GAME-next-player game)) 
-                     (play-on-board (GAME-board game) (GAME-next-player game)  column-label row-label)
-                     (+ (GAME-move-count game)  1))]
-        [else game]))
-
-;; game-over? : Returns true when the game is over. 
-;; game-over? : game -> boolean
-(check-expect (game-over? (make-GAME 'Circle (make-BOARD cross-blank
-                                                         (make-ROW 'blank 'Circle 'blank)
-                                                         (make-ROW 'blank 'blank 'cross))3)) false)
-(check-expect (game-over? (make-GAME 'Circle (make-BOARD cross-ROW-blank
-                                                         (make-ROW 'blank 'Circle 'blank)
-                                                         (make-ROW 'blank 'blank 'cross))3))  false)
-(check-expect (game-over? (make-GAME 'Circle (make-BOARD  cross-circle
-                                                          (make-ROW 'cross 'Circle 'cross)
-                                                          (make-ROW 'Circle 'cross 'Circle))9))true)
-(define (game-over? game)
-  (>= (GAME-move-count game) 9))
-
-
-
-;; clack2 : Mouse handler. Plays the game on button-up.
-;; clack2 : game number number symbol -> game
-
-(check-expect (clack2 initial-game 90 90 'button-up)
-              (make-GAME 'Circle 
-                         (make-BOARD cross-blank blank-ROW blank-ROW) 1))
-
-(check-expect (clack2 (make-GAME 'Circle 
-                                 (make-BOARD cross-blank blank-ROW blank-ROW) 1)
-                      160 160  'button-up)
-              (make-GAME 'cross 
-                         (make-BOARD cross-blank
-                                     (make-ROW 'blank 'Circle 'blank)
-                                     blank-ROW) 2))
-
-(check-expect (clack2 (make-GAME 'cross 
-                                 (make-BOARD cross-blank
-                                             (make-ROW 'blank 'Circle 'blank)
-                                             blank-ROW) 2)310 310 'button-up)
-              (make-GAME 'Circle (make-BOARD cross-blank
-                                             (make-ROW 'blank 'Circle 'blank)
-                                             (make-ROW 'blank 'blank 'cross)) 3))             
-
-
-(define (clack2 game x y event)
-  (cond [(symbol=? event 'button-up)
-         (play-on-game game  (which-column x) (which-row y))]
-        [else game]))
-
-;; game->scene : Draws a game
-;; game->scene : game -> scene
-
-(check-expect (game->scene (make-GAME 'Circle 
-                                      (make-BOARD cross-blank blank-ROW blank-ROW) 1))
-              (place-image (draw-board (make-BOARD cross-blank blank-ROW blank-ROW)) 
-                           (/ square-width 2)(/ square-width 2) background))
-
-
-(check-expect (game->scene (make-GAME 'cross 
-                                      (make-BOARD (make-ROW 'cross 'blank 'Circle) blank-ROW blank-ROW) 1))
-              (place-image (draw-board (make-BOARD (make-ROW 'cross 'blank 'Circle) blank-ROW blank-ROW))
-                           (/ square-width 2)(/ square-width 2) background))
-
-(define (game->scene game)
-  (place-image (draw-board (GAME-board game)) (/ square-width 2)(/ square-width 2)  background)
-  )
-
-
-;; winning-triple? : Return true if a, b, and c are all the same symbol as player.
-;; winning-triple? : symbol symbol symbol symbol -> boolean
-
-(check-expect (winning-triple? 'cross 'cross 'cross 'cross)true)
-(check-expect (winning-triple? 'Circle 'Circle 'blank 'cross)false)
-(check-expect (winning-triple? 'Circle 'Circle 'Circle 'Circle)true)
-(check-expect (winning-triple? 'cross 'blank 'cross 'cross)false)
-
-
-(define (winning-triple? player a b c) 
-  (and(and (equal? player a)(equal? player b))(equal? player c)))
-
-
-;; winning-row? : Returns true if the indicated row is a win for the given player.
-;; winning-row? : board square symbol -> boolean
-
-(check-expect (winning-row? (make-BOARD cross-row  
-                                        circle-cross
-                                        (make-ROW 'Circle 'blank 'blank))
-                            'cross 'T)true)
-
-
-
-(check-expect (winning-row? (make-BOARD (make-ROW 'cross 'blank 'Circle) 
-                                        circle-cross
-                                        (make-ROW 'blank 'cross 'blank))
-                            'Circle 'C)false)
-
-
-
-(check-expect (winning-row? (make-BOARD (make-ROW 'cross 'Circle 'blank ) 
-                                        (make-ROW 'cross 'Circle 'cross)
-                                        (make-ROW 'Circle 'Circle 'Circle))
-                            'Circle 'B)true)
-
-(define (winning-row? board player vertical-pos)
-  (cond[(equal? vertical-pos 'T)(winning-triple? player (ROW-left (BOARD-top-row board)) 
-                                                 (ROW-middle (BOARD-top-row board))
-                                                 (ROW-right (BOARD-top-row board)))]
-       [(equal? vertical-pos 'C)(winning-triple? player (ROW-left (BOARD-center-row board)) 
-                                                 (ROW-middle (BOARD-center-row board))
-                                                 (ROW-right (BOARD-center-row board)))]
-       [(equal? vertical-pos 'B)(winning-triple? player (ROW-left (BOARD-bottom-row board)) 
-                                                 (ROW-middle (BOARD-bottom-row board))
-                                                 (ROW-right (BOARD-bottom-row board)))]
-       [else false]
-       ))
-
-
-;; winning-column? : Return true if the indicated column is a win for the given player.
-;; winnnig-column? : board square symbol -> boolean
-
-
-(check-expect (winning-column? (make-BOARD cross-ROW-blank 
-                                           circle-cross
-                                           cross-blank)
-                               'cross 'L)true)
-
-
-
-(check-expect (winning-column? (make-BOARD circle-cross 
-                                           circle-cross
-                                           (make-ROW 'blank 'Circle 'blank))
-                               'Circle 'M)true)
-
-
-
-(check-expect (winning-column? (make-BOARD circle-cross 
-                                           (make-ROW 'cross 'blank 'Circle)
-                                           (make-ROW 'Circle 'Circle 'Circle))
-                               'Circle 'R)true)
-
-(check-expect (winning-column? (make-BOARD circle-cross 
-                                           cross-blank
-                                           (make-ROW 'Circle 'Circle 'Circle))
-                               'Circle 'R)false)
-
-
-(define (winning-column? board player horizontal-pos)
-  (cond[(equal? horizontal-pos 'L)(winning-triple? player (ROW-left (BOARD-top-row board)) 
-                                                   (ROW-left (BOARD-center-row board))
-                                                   (ROW-left (BOARD-bottom-row board)))]
-       [(equal? horizontal-pos 'M)(winning-triple? player (ROW-middle (BOARD-top-row board)) 
-                                                   (ROW-middle (BOARD-center-row board))
-                                                   (ROW-middle (BOARD-bottom-row board)))]
-       [(equal? horizontal-pos 'R)(winning-triple? player (ROW-right (BOARD-top-row board)) 
-                                                   (ROW-right (BOARD-center-row board))
-                                                   (ROW-right (BOARD-bottom-row board)))]
-       [else false]
-       ))
-
-
-
-;; winning-down-diagonal? : Return true if the top-left to bottom-right diagonal is a win.
-;; winning-down-diagonal? : board square -> boolean
-
-
-
-
-(check-expect (winning-down-diagonal?(make-BOARD (make-ROW 'Circle  'Circle 'Circle) 
-                                                 (make-ROW 'cross 'Circle 'blank)
-                                                 (make-ROW  'cross 'blank 'Circle))
-                                     'Circle)true)
-
-(check-expect (winning-down-diagonal?(make-BOARD circle-cross 
-                                                 cross-blank
-                                                 (make-ROW 'Circle  'blank 'Circle))
-                                     'Circle)false)
-(check-expect (winning-down-diagonal?(make-BOARD (make-ROW 'cross 'blank 'cross ) 
-                                                 (make-ROW 'Circle 'cross 'blank)
-                                                 (make-ROW  'blank 'Circle 'cross))
-                                     'cross)true)
-
-
-(define (winning-down-diagonal? board player) 
-  (and (equal? player (ROW-right (BOARD-bottom-row board))) (and (equal? player(ROW-middle (BOARD-center-row board)))
-                                                                 (equal? player (ROW-left (BOARD-top-row board)))))) 
-
-
-;; winning-up-diagonal? : Return true if the bottom-left to top-right diagonal is a win.
-;; winning-up-diagonal? : board square -> boolean
-
-(check-expect (winning-up-diagonal?(make-BOARD circle-cross 
-                                               (make-ROW 'cross 'Circle 'blank)
-                                               (make-ROW 'Circle  'blank 'Circle))
-                                   'Circle)true)
-
-(check-expect (winning-up-diagonal?(make-BOARD circle-cross 
-                                               cross-blank
-                                               (make-ROW 'Circle  'blank 'Circle))
-                                   'Circle)false)
-(check-expect (winning-up-diagonal?(make-BOARD (make-ROW 'cross 'blank 'cross ) 
-                                               (make-ROW 'Circle 'cross 'blank)
-                                               (make-ROW 'cross  'blank 'Circle))
-                                   'cross)true)
-
-
-(define (winning-up-diagonal? board player) 
-  (and (equal? player (ROW-left (BOARD-bottom-row board))) (and (equal? player(ROW-middle (BOARD-center-row board)))
-                                                                (equal? player (ROW-right (BOARD-top-row board)))))) 
-
-;; winning-board? : Returns true if the given board is a win for the given player.
-;; winning-board? : board square -> boolean
-
-(check-expect (winning-board? (make-BOARD cross-row  
-                                          circle-cross
-                                          blank-circle)
-                              'cross)true)
-
-(check-expect (winning-board? (make-BOARD circle-cross
-                                          cross-row  
-                                          blank-circle)
-                              'cross)true)
-(check-expect (winning-board? (make-BOARD circle-cross
-                                          blank-circle
-                                          cross-row )
-                              'cross)true)
-
-(check-expect (winning-board? (make-BOARD (make-ROW 'Circle 'cross 'cross) 
-                                          (make-ROW  'Circle 'cross 'Circle)
-                                          blank-circle)
-                              'Circle)true)
-(check-expect (winning-board? (make-BOARD (make-ROW 'cross 'Circle 'cross) 
-                                          circle-cross
-                                          (make-ROW 'Circle 'Circle 'blank))
-                              'Circle)true)
-(check-expect (winning-board? (make-BOARD  cross-circle 
-                                           circle-cross
-                                           (make-ROW 'Circle 'blank 'Circle))
-                              'Circle)true)
-
-(check-expect (winning-board? (make-BOARD  cross-circle 
-                                           circle-cross
-                                           blank-circle)
-                              'Circle)true)
-(check-expect (winning-board? (make-BOARD (make-ROW 'cross 'Circle 'cross) 
-                                          cross-circle
-                                          (make-ROW 'Circle 'blank 'cross))
-                              'cross)true)
-
-(define (winning-board? board player) 
-  (or (winning-up-diagonal? board player)
-      (or (winning-down-diagonal? board player)
-          (or (winning-row? board player 'T)
-              (or   (winning-row? board player 'C)
-                    (or (winning-row? board player 'B)
-                        (or (winning-column? board player 'L)
-                            (or (winning-column? board player 'M)
-                                (winning-column? board player 'R)))))))))
-
-
-
-;; game-over-or-win? : Returns true when the game is over either because the board is full,
-;;                     or because someone won.
-;; game-over-or-win? : game -> boolean
-
-(check-expect (game-over-or-win? (make-GAME 'Circle 
-                                            (make-BOARD (make-ROW 'cross 'blank 'Circle) blank-ROW blank-ROW) 3))false)
-
-
-(check-expect (game-over-or-win? (make-GAME 'Circle
-                                            (make-BOARD (make-ROW 'cross 'blank 'Circle)
-                                                        (make-ROW 'blank 'cross 'Circle)
-                                                        (make-ROW 'cross 'blank 'Circle))7))true)
-
-
-(check-expect (game-over-or-win? (make-GAME 'cross 
-                                            (make-BOARD  cross-circle
-                                                         (make-ROW  'Circle 'cross 'Circle)
-                                                         (make-ROW 'cross 'Circle 'cross))9))
-              true)
-
-(define (game-over-or-win? game)
-  (or (winning-board? (GAME-board game) (GAME-next-player game))
-      (game-over? game)))
-
-
-(collect-garbage) (collect-garbage) (collect-garbage)
-(printf "running tests for htdp/image")
-(time (run-tests))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/image-equality-performance.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/image-equality-performance.rkt
deleted file mode 100644
index 19808deed0..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/image-equality-performance.rkt
+++ /dev/null
@@ -1,908 +0,0 @@
-#lang racket
-
-#|
-
-This is a file from Guillaume that ran very slowly with the 
-htdp/image library; here it is used as a performance test.
-Porting to #lang racket +2htdp/image consisted of adding requires, 
-changing overlay/xy to underlay/xy,  defining empty-scene, and
-adding the check-expect macro (and related code).
-Also added the timing code at the end.
-
-|#
-
-
-(require 2htdp/image
-         (only-in mrlib/image-core 
-                  skip-image-equality-fast-path))
-
-(define-syntax (check-expect stx)
-  (syntax-case stx ()
-    [(_ a b)
-     (with-syntax ([line (syntax-line stx)])
-       #'(set! tests (cons (list (λ () a) (λ () b) line)
-                           tests)))]))
-(define tests '())
-(define (run-tests)
-  (for-each
-   (λ (l)
-     (let ([a-res ((list-ref l 0))]
-           [b-res ((list-ref l 1))]
-           [line (list-ref l 2)])
-       (unless (equal? a-res b-res)
-         (error 'test "test failed; expected ~s and ~s to be equal, but they weren't, line ~a"
-                a-res
-                b-res
-                line))))
-   tests))
-#;
-(define (empty-scene w h) 
-  (overlay
-   (rectangle w h 'solid 'white)
-   (rectangle w h 'outline 'black)))
-
-;;Program for creating game of croos-circle game
-;;contract :image->image
-
-;;defining a union square
-;;A square is either
-;;A square is blank
-;;A square is cross
-;;A square is Circle
-
-;;defining width of square
-(define square-width 150)
-
-;;defining th height and width of scene
-(define width (* square-width 3))
-(define height (* square-width 3))
-
-
-;;defining the image circle 
-(define Circle (underlay/xy (circle  20 'solid 'orange) 0 0 (circle  10 'solid 'white)))
-;;defining the image cross 
-(define cross (underlay/xy (rectangle 10 30 'solid 'green) 0 0 (rectangle 30 10 'solid 'green)))
-;;defining the blank image
-(define blank (underlay/xy (rectangle square-width square-width 'solid  'red) 0 0
-                          (rectangle (- square-width 8) (- square-width 8) 'solid 'white)))
-
-;;Given  a square returns 
-;;the image of square
-;;draw-square :square ->image
-(define (draw-square square)
-  (cond[(equal? 'Circle  square)(underlay/xy blank 0 0 Circle)]
-       [(equal? 'cross square)(underlay/xy blank 0 0 cross)]
-       [(equal? 'blank square)blank]
-       ))
-
-
-;;test
-(check-expect(draw-square 'Circle)(underlay/xy blank 0 0 Circle))
-(check-expect(draw-square 'cross)(underlay/xy blank 0 0 cross))
-(check-expect(draw-square 'blank)blank)
-
-;;== Cross and circles, part #3 ==
-
-
-;;define a structure for ROW
-;;ROW structure used for creating a ROW in the board
-;;contract ROW:image image image->image
-(define-struct ROW (left middle right) #:transparent)
-
-
-;; defining a blank row
-
-(define blank-ROW (make-ROW 'blank 'blank 'blank))
-;;defining the cross row
-(define cross-ROW (make-ROW 'blank 'cross 'blank))
-
-;;defineing the cross-row-blank secoend combination
-(define  cross-ROW-blank (make-ROW 'cross 'cross 'blank ))
-;;defining a row cross-row
-(define cross-row (make-ROW 'cross 'cross 'cross ))
-;;defining a row blank-circle
-(define blank-circle (make-ROW 'Circle 'blank 'blank))
-;;defining a row cross-circle
-(define cross-circle  (make-ROW 'cross 'cross 'Circle ))
-;;defining a row circle-cross
-(define circle-cross (make-ROW 'cross 'Circle 'Circle ))
-;;defining a row cross-blank
-(define cross-blank (make-ROW 'cross 'blank 'blank ))
-;;function for  creating ROW with the square
-;;contract:square square square->ROW
-;template: for draw-row
-;template for ROW
-;(define (a-row-function a-row)
-;  ... (row-left a-row)      ;; is a square
-;  ... (row-mid a-row)      ;; is a square
-;  ... (row-right a-row))    ;; is a square
-
-
-
-(define (draw-row row)
-  (underlay/xy (draw-square(ROW-left row)) (image-width blank) 0
-              (underlay/xy (draw-square(ROW-middle row))  (image-width blank) 0 (draw-square(ROW-right row)) )))
-
-;;test
-
-(check-expect (draw-row (make-ROW 'Circle 'cross 'blank))
-              (underlay/xy (draw-square 'Circle) (image-width blank) 0
-                          (underlay/xy (draw-square 'cross )  (image-width blank) 0 (draw-square 'blank) )))
-
-(check-expect (draw-row (make-ROW 'Circle 'cross 'blank))
-              (underlay/xy (draw-square 'Circle) (image-width blank) 0
-                          (underlay/xy (draw-square 'cross )  (image-width blank) 0 (draw-square 'blank) )))
-
-(check-expect (draw-row (make-ROW 'Circle  'blank 'cross))
-              (underlay/xy (draw-square 'Circle) (image-width blank) 0
-                          (underlay/xy (draw-square 'blank )  (image-width blank) 0 (draw-square 'cross) )))
-
-(check-expect (draw-row cross-ROW-blank)
-              (underlay/xy (draw-square 'cross) (image-width blank) 0
-                          (underlay/xy (draw-square 'cross )  (image-width blank) 0 (draw-square 'blank) )))
-
-(check-expect (draw-row cross-row )
-              (underlay/xy (draw-square 'cross) (image-width blank) 0
-                          (underlay/xy (draw-square 'cross )  (image-width blank) 0 (draw-square 'cross) )))
-
-;;define a structure for BOARD
-;;contract make-BOARD :image image image->image
-(define-struct BOARD (top-row center-row bottom-row) #:transparent)
-
-;; purpose : defining an empty board
-(define empty-board (make-BOARD blank-ROW
-                                blank-ROW 
-                                blank-ROW))
-
-;;function for creating board with the row
-
-;template: for draw-board
-;(define (a-board-function a-row)
-;  ... (top-row a-row)      ;; is a square
-;  ... (center-row a-row)      ;; is a square
-;  ... (bottom-row a-row))    ;; is a square
-
-;;defining the background
-(define background (empty-scene width height))
-
-
-;;this function will reusing the fuction draw-row for creating row
-;;contract:row row row->board
-
-;;test
-(check-expect (draw-board (make-BOARD cross-ROW-blank
-                                      cross-ROW 
-                                      cross-row ))
-              (underlay/xy (draw-row cross-ROW-blank) 
-                          0 (image-height (draw-row cross-ROW))
-                          (underlay/xy (draw-row cross-ROW) 
-                                      0 (image-height (draw-row cross-ROW))
-                                      (draw-row cross-row ))))
-
-(check-expect (draw-board (make-BOARD  cross-circle
-                                       (make-ROW 'Circle 'cross 'blank) 
-                                       circle-cross))
-              (underlay/xy (draw-row  cross-circle) 
-                          0 (image-height (draw-row  cross-circle))
-                          (underlay/xy (draw-row (make-ROW 'Circle 'cross 'blank)) 
-                                      0 (image-height (draw-row(make-ROW 'Circle 'cross 'blank)))
-                                      (draw-row circle-cross))))
-
-(check-expect(draw-board (make-BOARD  cross-circle
-                                      (make-ROW 'Circle 'cross 'Circle) 
-                                      circle-cross))
-             (underlay/xy (draw-row  cross-circle) 
-                         0 (image-height (draw-row  cross-circle))
-                         (underlay/xy (draw-row  (make-ROW 'Circle 'cross 'Circle)) 
-                                     0 (image-height (draw-row (make-ROW 'Circle 'cross 'Circle)))
-                                     (draw-row circle-cross))))
-
-(check-expect (draw-board (make-BOARD (make-ROW 'blank 'cross 'Circle)
-                                      (make-ROW 'Circle 'cross 'cross) 
-                                      circle-cross))              
-              (underlay/xy (draw-row (make-ROW 'blank 'cross 'Circle)) 
-                          0 (image-height (draw-row (make-ROW 'blank 'cross 'Circle)))
-                          (underlay/xy (draw-row  (make-ROW 'Circle 'cross 'cross)) 
-                                      0 (image-height (draw-row (make-ROW 'Circle 'cross 'cross)))
-                                      (draw-row circle-cross))) )
-
-(check-expect (draw-board (make-BOARD (make-ROW 'blank 'cross 'Circle)
-                                      (make-ROW 'Circle 'blank 'cross) 
-                                      (make-ROW 'cross 'blank 'Circle)))
-              (underlay/xy (draw-row (make-ROW 'blank 'cross 'Circle)) 
-                          0 (image-height (draw-row (make-ROW 'blank 'cross 'Circle)))
-                          (underlay/xy (draw-row  (make-ROW 'Circle 'blank 'cross)) 
-                                      0 (image-height (draw-row (make-ROW 'Circle 'blank 'cross)))
-                                      (draw-row (make-ROW 'cross 'blank 'Circle)))))
-
-
-
-
-(define (draw-board board)
-  (underlay/xy (draw-row (BOARD-top-row board))
-              0 (image-height (draw-row (BOARD-top-row board)))
-              (underlay/xy (draw-row (BOARD-center-row board)) 
-                          0 (image-height (draw-row(BOARD-center-row board))) 
-                          (draw-row (BOARD-bottom-row board)))))                
-
-;;purpose: given the x coordinate of the mouse click  and returns 
-;;the symbol 'L, the symbol 'M, or the symbol 'R,
-;;depending on whether that X position falls on the right, the middle or the left of the board.
-;;contract: which-column:: number -> symbol
-
-;;test 
-
-(check-expect (which-column (* square-width .5)) 'L)
-(check-expect (which-column (* square-width 1.5)) 'M)
-(check-expect (which-column (* square-width 2.3)) 'R)
-
-(define (which-column x-pos)
-  (cond[(and (>= x-pos 0)(<= x-pos square-width))'L]
-       [(and (>= x-pos (+ square-width 1))(<= x-pos (* 2 square-width)))'M]
-       [(and (>= x-pos (+ (* 2 square-width) 1))(<= x-pos (* 3 square-width)))'R]
-       [else "play in the board,you played outside the square"]))
-
-
-
-;;purpose: given the y coordinate of the mouse click  and returns 
-;;the symbol 'T, the symbol 'C, or the symbol 'B,
-;;depending on whether that Y position falls on the top, the center or the bottom of the board.
-;;contract: which-row:: number -> symbol
-
-;;test 
-
-(check-expect (which-row (* square-width .6)) 'T)
-(check-expect (which-row (* square-width 1.3)) 'C)
-(check-expect (which-row (* square-width 2.7)) 'B)
-
-(define (which-row y-pos)
-  (cond[(and (>= y-pos 0)(<= y-pos square-width))'T]
-       [(and (>= y-pos (+ square-width 1))(<= y-pos (* 2 square-width)))'C]
-       [(and (>= y-pos (+ (* 2 square-width) 1))(<= y-pos (* 3 square-width)))'B]
-       [else "play in the board,you played outside the square"]))
-
-
-
-;;purpose: give the row and the square to be played and returns a new row replacing the left square
-;; play-on-left : row square ->row
-
-;;test
-(check-expect (play-on-left (make-ROW 'blank 'cross 'Circle) 'Circle)
-              (make-ROW 'Circle 'cross 'Circle))
-
-(check-expect (play-on-left (make-ROW 'blank 'cross 'Circle) 'cross)
-              cross-circle)
-
-(check-expect (play-on-left cross-ROW 'Circle)
-              (make-ROW 'Circle 'cross 'blank))
-(define (play-on-left row play)
-  (make-ROW play (ROW-middle row) (ROW-right row)))
-
-
-;;purpose: give the row and the square to be played and returns a new row replacing the middle square
-;; play-on-middle : row square ->row
-
-;;test
-(check-expect (play-on-middle (make-ROW 'blank 'blank 'Circle) 'Circle)
-              (make-ROW 'blank 'Circle 'Circle))
-
-(check-expect (play-on-middle (make-ROW 'blank 'blank 'Circle) 'cross)
-              (make-ROW 'blank 'cross 'Circle))
-
-(check-expect (play-on-middle blank-ROW 'Circle)
-              (make-ROW 'blank 'Circle 'blank))
-
-(define (play-on-middle row play)
-  (make-ROW (ROW-left row) play  (ROW-right row)))
-
-
-;;purpose: give the row and the square to be played and returns a new row replacing the right square
-;; play-on-right : row square ->row
-
-;;test
-(check-expect (play-on-right blank-ROW 'Circle)
-              (make-ROW 'blank 'blank 'Circle))
-
-(check-expect (play-on-right (make-ROW 'blank 'Circle 'blank) 'cross)
-              (make-ROW 'blank 'Circle 'cross))
-
-(check-expect (play-on-right blank-ROW 'Circle)
-              (make-ROW 'blank 'blank 'Circle))
-
-(define (play-on-right row play)
-  (make-ROW (ROW-left row) (ROW-middle row) play  ))
-
-;;purpose : given the row, which column ,square to be played returns new row replacing the column
-;; play-on-row : row square symbol -> row
-
-(check-expect (play-on-row blank-ROW 'L 'Circle)
-              (make-ROW 'Circle 'blank 'blank))
-(check-expect (play-on-row blank-ROW 'M 'Circle)
-              (make-ROW 'blank 'Circle 'blank))
-(check-expect (play-on-row blank-ROW 'R 'Circle)
-              (make-ROW 'blank 'blank 'Circle))
-
-(define (play-on-row row column-label play)
-  (cond [(equal? column-label 'L) (make-ROW play  (ROW-middle row) (ROW-right row))]
-        [(equal? column-label 'M) (make-ROW (ROW-left row) play  (ROW-right row))]
-        [(equal? column-label 'R) (make-ROW  (ROW-left row) (ROW-middle row) play)]
-        [else row]))
-
-;;purpose given a board, a square to be played and the label of the position to be played
-;;returns a new board with the square to be played at the labeled position on the top row
-
-;; play-on-board-at-top : board square symbol -> board
-;;test
-(check-expect (play-on-board-at-top empty-board  'Circle 'L)
-              (make-BOARD (make-ROW 'Circle 'blank 'blank)
-                          blank-ROW 
-                          blank-ROW))
-
-
-(check-expect (play-on-board-at-top empty-board  'Circle 'M)
-              (make-BOARD (make-ROW 'blank 'Circle 'blank)
-                          blank-ROW 
-                          blank-ROW))
-
-
-(check-expect (play-on-board-at-top empty-board  'cross 'R)
-              (make-BOARD (make-ROW 'blank 'blank 'cross)
-                          blank-ROW 
-                          blank-ROW))
-
-
-(define (play-on-board-at-top board play column-label)
-  (make-BOARD(play-on-row (BOARD-top-row board) column-label play)
-             (BOARD-center-row board)(BOARD-bottom-row board))
-  )
-
-
-
-;;purpose given a board, a square to be played and the label of the position to be played
-;;returns a new board with the square to be played at the labeled position on the middle row
-
-;; play-on-board-at-top : board square symbol -> board
-;;test
-(check-expect (play-on-board-at-middle empty-board  'Circle 'L)
-              (make-BOARD blank-ROW
-                          (make-ROW 'Circle 'blank 'blank) 
-                          blank-ROW))
-
-
-(check-expect (play-on-board-at-middle empty-board  'Circle 'M)
-              (make-BOARD blank-ROW
-                          (make-ROW 'blank 'Circle 'blank) 
-                          blank-ROW))
-
-
-(check-expect (play-on-board-at-middle empty-board  'cross 'R)
-              (make-BOARD blank-ROW
-                          (make-ROW 'blank 'blank  'cross) 
-                          blank-ROW))
-
-
-(define (play-on-board-at-middle board play column-label)
-  (make-BOARD (BOARD-top-row board) (play-on-row (BOARD-center-row board) column-label play)
-              (BOARD-bottom-row board))
-  )
-;;purpose given a board, a square to be played and the label of the position to be played
-;;returns a new board with the square to be played at the labeled position on the bottom row
-
-;; play-on-board-at-top : board square symbol -> board
-;;test
-(check-expect (play-on-board-at-bottom empty-board  'Circle 'L)
-              (make-BOARD blank-ROW
-                          blank-ROW 
-                          (make-ROW 'Circle 'blank 'blank)))
-
-
-(check-expect (play-on-board-at-bottom empty-board  'Circle 'M)
-              (make-BOARD blank-ROW
-                          blank-ROW 
-                          (make-ROW 'blank 'Circle 'blank)))
-
-
-(check-expect (play-on-board-at-bottom empty-board  'cross 'R)
-              (make-BOARD blank-ROW
-                          blank-ROW 
-                          (make-ROW 'blank 'blank 'cross)))
-
-
-(define (play-on-board-at-bottom board play column-label)
-  (make-BOARD (BOARD-top-row board) (BOARD-center-row board) 
-              (play-on-row (BOARD-bottom-row board)  column-label play)
-              )
-  )
-
-
-;;purpose :given the board ,square to be played,column and row label and returns a new board 
-;;with the square to be  played at the position referred
-;; play-on-board : board square symbol symbol -> board
-
-;;test
-(check-expect (play-on-board empty-board  'cross 'R 'T)
-              (make-BOARD (make-ROW 'blank 'blank 'cross )
-                          blank-ROW 
-                          blank-ROW))
-
-
-(check-expect (play-on-board empty-board  'cross 'L 'C)
-              (make-BOARD blank-ROW
-                          cross-blank 
-                          blank-ROW))
-
-
-(check-expect (play-on-board empty-board  'cross 'M 'B)
-              (make-BOARD blank-ROW
-                          blank-ROW 
-                          cross-ROW))
-
-
-(define (play-on-board board play column-label row-label)
-  (cond [(equal? row-label 'T) (play-on-board-at-top board play column-label)]
-        [(equal? row-label 'C) (play-on-board-at-middle board play column-label)]
-        [(equal? row-label 'B) (play-on-board-at-bottom board play column-label)]
-        [else board]))
-
-
-;;purpose : Given a board structure, a return the image of that board centered on the scene.
-;;create-board:board->scene
-
-;;test
-(check-expect (create-board  (make-BOARD blank-ROW
-                                         blank-ROW 
-                                         cross-ROW))
-              (place-image (draw-board (make-BOARD blank-ROW
-                                                   blank-ROW 
-                                                   cross-ROW))
-                           (/ square-width 2)(/ square-width 2) background))
-
-(check-expect (create-board  (make-BOARD (make-ROW 'Circle 'cross 'Circle) 
-                                         blank-ROW 
-                                         cross-ROW))
-              (place-image (draw-board (make-BOARD (make-ROW 'Circle 'cross 'Circle)
-                                                   blank-ROW 
-                                                   cross-ROW))
-                           (/ square-width 2)(/ square-width 2) background))
-
-(check-expect (create-board  (make-BOARD (make-ROW 'Circle 'cross 'blank) 
-                                         blank-ROW 
-                                         cross-ROW))
-              (place-image (draw-board (make-BOARD (make-ROW 'Circle 'cross 'blank)
-                                                   blank-ROW 
-                                                   cross-ROW))
-                           (/ square-width 2)(/ square-width 2) background))
-
-(define (create-board board)
-  (place-image (draw-board board)(/ square-width 2)(/ square-width 2)  background)
-  )
-
-;; clack1 : Mouse handler. Plays a cross (always a cross) where the mouse is clicked, on button-up.
-;; clack1 : board number number symbol -> board
-
-(define (clack1 board x y event)
-  (cond [(symbol=? event 'button-up)
-         (play-on-board board 'cross (which-column x) (which-row y))]
-        [else board]))
-
-(check-expect (clack1 (make-BOARD blank-ROW
-                                  blank-ROW 
-                                  cross-ROW) 40 68 'button-up)
-              (make-BOARD cross-blank
-                          blank-ROW 
-                          cross-ROW))
-
-(check-expect (clack1 (make-BOARD blank-ROW
-                                  blank-ROW 
-                                  cross-ROW) 160 168 'button-up)
-              (make-BOARD blank-ROW
-                          (make-ROW 'blank 'cross 'blank)
-                          cross-ROW))
-
-(check-expect (clack1 (make-BOARD blank-ROW
-                                  blank-ROW 
-                                  blank-ROW) 310 365 'button-up)
-              (make-BOARD blank-ROW
-                          blank-ROW
-                          (make-ROW  'blank 'blank 'cross)
-                          )) 
-;; purpose : Given the current player, return which player goes next.
-;; other-player : square -> square
-
-(define (other-player play)
-  (cond [(equal? play 'Circle) 'cross]
-        [(equal? play 'cross) 'Circle]))
-
-(check-expect (other-player 'cross) 'Circle)
-(check-expect (other-player 'Circle) 'cross)
-
-;; purpose : Given a horz. pos (either 'L, 'M or 'R), finds the content of that square.
-;; lookup-square : row symbol -> square
-
-(define (lookup-square column-label row)
-  (cond [(equal? column-label 'L)(ROW-left row)]
-        [(equal? column-label 'M)(ROW-middle row)]
-        [(equal? column-label 'R)(ROW-right row)]))
-
-(check-expect(lookup-square 'L (make-ROW 'blank 'Circle 'cross)) 'blank)
-(check-expect(lookup-square 'M (make-ROW 'blank 'Circle 'cross)) 'Circle)
-(check-expect(lookup-square 'R (make-ROW 'blank 'Circle 'cross)) 'cross)
-
-;; lookup-row : Given a vert. pos (either 'T, 'C or 'B), finds that row.
-;; lookup-row : board symbol -> row
-
-(define(lookup-row row-label board)
-  (cond [(equal? row-label 'T)(BOARD-top-row board)]
-        [(equal? row-label 'C)(BOARD-center-row board)]
-        [(equal? row-label 'B)(BOARD-bottom-row board)]))
-
-
-(check-expect(lookup-row 'T (make-BOARD (make-ROW 'cross 'blank 'Circle) 
-                                        blank-ROW 
-                                        blank-ROW)) (make-ROW 'cross 'blank 'Circle)) 
-
-(check-expect(lookup-row 'C (make-BOARD blank-ROW
-                                        (make-ROW 'cross 'blank 'Circle) 
-                                        blank-ROW)) (make-ROW 'cross 'blank 'Circle))
-
-(check-expect(lookup-row 'B (make-BOARD blank-ROW 
-                                        blank-ROW
-                                        (make-ROW 'cross 'blank 'Circle) 
-                                        )) (make-ROW 'cross 'blank 'Circle))
-
-;; lookup : Given a horz. and a vert. pos, finds that square.
-;; lookup : board symbol symbol -> square
-
-(define (lookup board  column-label row-label)
-  (lookup-square column-label (lookup-row row-label board)))
-
-(check-expect(lookup(make-BOARD (make-ROW 'cross 'blank 'Circle) 
-                                blank-ROW 
-                                blank-ROW) 'L 'T) 'cross)
-
-(check-expect(lookup(make-BOARD blank-ROW
-                                (make-ROW 'cross 'blank 'Circle) 
-                                blank-ROW) 'M 'C) 'blank)
-
-(check-expect(lookup(make-BOARD blank-ROW 
-                                blank-ROW
-                                (make-ROW 'cross 'blank 'Circle) 
-                                ) 'R 'B) 'Circle)
-
-
-;; move-legal? : Return true if the square at horizondal and vertical position is blank.
-;; move-legal? : board symbol symbol -> boolean
-
-(define(move-legal? board column-label row-label)
-  (equal? (lookup board  column-label row-label) 'blank))
-
-(check-expect (move-legal? empty-board 'L 'C) true)
-(check-expect (move-legal? (make-BOARD blank-ROW
-                                       (make-ROW 'Circle 'cross cross)
-                                       blank-ROW)                                       
-                           'M 'C) false)
-;;define a structure for game
-;;contract make-game :square board number->game
-(define-struct GAME (next-player board move-count) #:transparent)
-
-;;defining the initial-game
-(define initial-game (make-GAME 'cross empty-board 0))
-
-;;purpose: Given a game and a horz. and vert. position, the next player plays in that square, if legal. The move-count goes up by 1,and the next-player switches hand.
-;; play-on-game : game symbol symbol -> game
-
-(check-expect(play-on-game initial-game 'L 'T)
-             (make-GAME 'Circle 
-                        (make-BOARD cross-blank blank-ROW blank-ROW) 1))
-
-(check-expect(play-on-game (make-GAME 'Circle 
-                                      (make-BOARD cross-blank blank-ROW blank-ROW) 1)
-                           'M 'C )
-             (make-GAME 'cross 
-                        (make-BOARD cross-blank
-                                    (make-ROW 'blank 'Circle 'blank)
-                                    blank-ROW) 2))
-(check-expect(play-on-game(make-GAME 'cross 
-                                     (make-BOARD cross-blank
-                                                 (make-ROW 'blank 'Circle 'blank)
-                                                 blank-ROW) 2)
-                          'R 'B)
-             (make-GAME 'Circle 
-                        (make-BOARD cross-blank
-                                    (make-ROW 'blank 'Circle 'blank)
-                                    (make-ROW 'blank 'blank 'cross)) 3))
-
-(define (play-on-game game column-label row-label)
-  (cond [ (move-legal? (GAME-board game) column-label row-label)
-          (make-GAME (other-player (GAME-next-player game)) 
-                     (play-on-board (GAME-board game) (GAME-next-player game)  column-label row-label)
-                     (+ (GAME-move-count game)  1))]
-        [else game]))
-
-;; game-over? : Returns true when the game is over. 
-;; game-over? : game -> boolean
-(check-expect (game-over? (make-GAME 'Circle (make-BOARD cross-blank
-                                                         (make-ROW 'blank 'Circle 'blank)
-                                                         (make-ROW 'blank 'blank 'cross))3)) false)
-(check-expect (game-over? (make-GAME 'Circle (make-BOARD cross-ROW-blank
-                                                         (make-ROW 'blank 'Circle 'blank)
-                                                         (make-ROW 'blank 'blank 'cross))3))  false)
-(check-expect (game-over? (make-GAME 'Circle (make-BOARD  cross-circle
-                                                          (make-ROW 'cross 'Circle 'cross)
-                                                          (make-ROW 'Circle 'cross 'Circle))9))true)
-(define (game-over? game)
-  (>= (GAME-move-count game) 9))
-
-
-
-;; clack2 : Mouse handler. Plays the game on button-up.
-;; clack2 : game number number symbol -> game
-
-(check-expect (clack2 initial-game 90 90 'button-up)
-              (make-GAME 'Circle 
-                         (make-BOARD cross-blank blank-ROW blank-ROW) 1))
-
-(check-expect (clack2 (make-GAME 'Circle 
-                                 (make-BOARD cross-blank blank-ROW blank-ROW) 1)
-                      160 160  'button-up)
-              (make-GAME 'cross 
-                         (make-BOARD cross-blank
-                                     (make-ROW 'blank 'Circle 'blank)
-                                     blank-ROW) 2))
-
-(check-expect (clack2 (make-GAME 'cross 
-                                 (make-BOARD cross-blank
-                                             (make-ROW 'blank 'Circle 'blank)
-                                             blank-ROW) 2)310 310 'button-up)
-              (make-GAME 'Circle (make-BOARD cross-blank
-                                             (make-ROW 'blank 'Circle 'blank)
-                                             (make-ROW 'blank 'blank 'cross)) 3))             
-
-
-(define (clack2 game x y event)
-  (cond [(symbol=? event 'button-up)
-         (play-on-game game  (which-column x) (which-row y))]
-        [else game]))
-
-;; game->scene : Draws a game
-;; game->scene : game -> scene
-
-(check-expect (game->scene (make-GAME 'Circle 
-                                      (make-BOARD cross-blank blank-ROW blank-ROW) 1))
-              (place-image (draw-board (make-BOARD cross-blank blank-ROW blank-ROW)) 
-                           (/ square-width 2)(/ square-width 2) background))
-
-
-(check-expect (game->scene (make-GAME 'cross 
-                                      (make-BOARD (make-ROW 'cross 'blank 'Circle) blank-ROW blank-ROW) 1))
-              (place-image (draw-board (make-BOARD (make-ROW 'cross 'blank 'Circle) blank-ROW blank-ROW))
-                           (/ square-width 2)(/ square-width 2) background))
-
-(define (game->scene game)
-  (place-image (draw-board (GAME-board game)) (/ square-width 2)(/ square-width 2)  background)
-  )
-
-
-;; winning-triple? : Return true if a, b, and c are all the same symbol as player.
-;; winning-triple? : symbol symbol symbol symbol -> boolean
-
-(check-expect (winning-triple? 'cross 'cross 'cross 'cross)true)
-(check-expect (winning-triple? 'Circle 'Circle 'blank 'cross)false)
-(check-expect (winning-triple? 'Circle 'Circle 'Circle 'Circle)true)
-(check-expect (winning-triple? 'cross 'blank 'cross 'cross)false)
-
-
-(define (winning-triple? player a b c) 
-  (and(and (equal? player a)(equal? player b))(equal? player c)))
-
-
-;; winning-row? : Returns true if the indicated row is a win for the given player.
-;; winning-row? : board square symbol -> boolean
-
-(check-expect (winning-row? (make-BOARD cross-row  
-                                        circle-cross
-                                        (make-ROW 'Circle 'blank 'blank))
-                            'cross 'T)true)
-
-
-
-(check-expect (winning-row? (make-BOARD (make-ROW 'cross 'blank 'Circle) 
-                                        circle-cross
-                                        (make-ROW 'blank 'cross 'blank))
-                            'Circle 'C)false)
-
-
-
-(check-expect (winning-row? (make-BOARD (make-ROW 'cross 'Circle 'blank ) 
-                                        (make-ROW 'cross 'Circle 'cross)
-                                        (make-ROW 'Circle 'Circle 'Circle))
-                            'Circle 'B)true)
-
-(define (winning-row? board player vertical-pos)
-  (cond[(equal? vertical-pos 'T)(winning-triple? player (ROW-left (BOARD-top-row board)) 
-                                                 (ROW-middle (BOARD-top-row board))
-                                                 (ROW-right (BOARD-top-row board)))]
-       [(equal? vertical-pos 'C)(winning-triple? player (ROW-left (BOARD-center-row board)) 
-                                                 (ROW-middle (BOARD-center-row board))
-                                                 (ROW-right (BOARD-center-row board)))]
-       [(equal? vertical-pos 'B)(winning-triple? player (ROW-left (BOARD-bottom-row board)) 
-                                                 (ROW-middle (BOARD-bottom-row board))
-                                                 (ROW-right (BOARD-bottom-row board)))]
-       [else false]
-       ))
-
-
-;; winning-column? : Return true if the indicated column is a win for the given player.
-;; winnnig-column? : board square symbol -> boolean
-
-
-(check-expect (winning-column? (make-BOARD cross-ROW-blank 
-                                           circle-cross
-                                           cross-blank)
-                               'cross 'L)true)
-
-
-
-(check-expect (winning-column? (make-BOARD circle-cross 
-                                           circle-cross
-                                           (make-ROW 'blank 'Circle 'blank))
-                               'Circle 'M)true)
-
-
-
-(check-expect (winning-column? (make-BOARD circle-cross 
-                                           (make-ROW 'cross 'blank 'Circle)
-                                           (make-ROW 'Circle 'Circle 'Circle))
-                               'Circle 'R)true)
-
-(check-expect (winning-column? (make-BOARD circle-cross 
-                                           cross-blank
-                                           (make-ROW 'Circle 'Circle 'Circle))
-                               'Circle 'R)false)
-
-
-(define (winning-column? board player horizontal-pos)
-  (cond[(equal? horizontal-pos 'L)(winning-triple? player (ROW-left (BOARD-top-row board)) 
-                                                   (ROW-left (BOARD-center-row board))
-                                                   (ROW-left (BOARD-bottom-row board)))]
-       [(equal? horizontal-pos 'M)(winning-triple? player (ROW-middle (BOARD-top-row board)) 
-                                                   (ROW-middle (BOARD-center-row board))
-                                                   (ROW-middle (BOARD-bottom-row board)))]
-       [(equal? horizontal-pos 'R)(winning-triple? player (ROW-right (BOARD-top-row board)) 
-                                                   (ROW-right (BOARD-center-row board))
-                                                   (ROW-right (BOARD-bottom-row board)))]
-       [else false]
-       ))
-
-
-
-;; winning-down-diagonal? : Return true if the top-left to bottom-right diagonal is a win.
-;; winning-down-diagonal? : board square -> boolean
-
-
-
-
-(check-expect (winning-down-diagonal?(make-BOARD (make-ROW 'Circle  'Circle 'Circle) 
-                                                 (make-ROW 'cross 'Circle 'blank)
-                                                 (make-ROW  'cross 'blank 'Circle))
-                                     'Circle)true)
-
-(check-expect (winning-down-diagonal?(make-BOARD circle-cross 
-                                                 cross-blank
-                                                 (make-ROW 'Circle  'blank 'Circle))
-                                     'Circle)false)
-(check-expect (winning-down-diagonal?(make-BOARD (make-ROW 'cross 'blank 'cross ) 
-                                                 (make-ROW 'Circle 'cross 'blank)
-                                                 (make-ROW  'blank 'Circle 'cross))
-                                     'cross)true)
-
-
-(define (winning-down-diagonal? board player) 
-  (and (equal? player (ROW-right (BOARD-bottom-row board))) (and (equal? player(ROW-middle (BOARD-center-row board)))
-                                                                 (equal? player (ROW-left (BOARD-top-row board)))))) 
-
-
-;; winning-up-diagonal? : Return true if the bottom-left to top-right diagonal is a win.
-;; winning-up-diagonal? : board square -> boolean
-
-(check-expect (winning-up-diagonal?(make-BOARD circle-cross 
-                                               (make-ROW 'cross 'Circle 'blank)
-                                               (make-ROW 'Circle  'blank 'Circle))
-                                   'Circle)true)
-
-(check-expect (winning-up-diagonal?(make-BOARD circle-cross 
-                                               cross-blank
-                                               (make-ROW 'Circle  'blank 'Circle))
-                                   'Circle)false)
-(check-expect (winning-up-diagonal?(make-BOARD (make-ROW 'cross 'blank 'cross ) 
-                                               (make-ROW 'Circle 'cross 'blank)
-                                               (make-ROW 'cross  'blank 'Circle))
-                                   'cross)true)
-
-
-(define (winning-up-diagonal? board player) 
-  (and (equal? player (ROW-left (BOARD-bottom-row board))) (and (equal? player(ROW-middle (BOARD-center-row board)))
-                                                                (equal? player (ROW-right (BOARD-top-row board)))))) 
-
-;; winning-board? : Returns true if the given board is a win for the given player.
-;; winning-board? : board square -> boolean
-
-(check-expect (winning-board? (make-BOARD cross-row  
-                                          circle-cross
-                                          blank-circle)
-                              'cross)true)
-
-(check-expect (winning-board? (make-BOARD circle-cross
-                                          cross-row  
-                                          blank-circle)
-                              'cross)true)
-(check-expect (winning-board? (make-BOARD circle-cross
-                                          blank-circle
-                                          cross-row )
-                              'cross)true)
-
-(check-expect (winning-board? (make-BOARD (make-ROW 'Circle 'cross 'cross) 
-                                          (make-ROW  'Circle 'cross 'Circle)
-                                          blank-circle)
-                              'Circle)true)
-(check-expect (winning-board? (make-BOARD (make-ROW 'cross 'Circle 'cross) 
-                                          circle-cross
-                                          (make-ROW 'Circle 'Circle 'blank))
-                              'Circle)true)
-(check-expect (winning-board? (make-BOARD  cross-circle 
-                                           circle-cross
-                                           (make-ROW 'Circle 'blank 'Circle))
-                              'Circle)true)
-
-(check-expect (winning-board? (make-BOARD  cross-circle 
-                                           circle-cross
-                                           blank-circle)
-                              'Circle)true)
-(check-expect (winning-board? (make-BOARD (make-ROW 'cross 'Circle 'cross) 
-                                          cross-circle
-                                          (make-ROW 'Circle 'blank 'cross))
-                              'cross)true)
-
-(define (winning-board? board player) 
-  (or (winning-up-diagonal? board player)
-      (or (winning-down-diagonal? board player)
-          (or (winning-row? board player 'T)
-              (or   (winning-row? board player 'C)
-                    (or (winning-row? board player 'B)
-                        (or (winning-column? board player 'L)
-                            (or (winning-column? board player 'M)
-                                (winning-column? board player 'R)))))))))
-
-
-
-;; game-over-or-win? : Returns true when the game is over either because the board is full,
-;;                     or because someone won.
-;; game-over-or-win? : game -> boolean
-
-(check-expect (game-over-or-win? (make-GAME 'Circle 
-                                            (make-BOARD (make-ROW 'cross 'blank 'Circle) blank-ROW blank-ROW) 3))false)
-
-
-(check-expect (game-over-or-win? (make-GAME 'Circle
-                                            (make-BOARD (make-ROW 'cross 'blank 'Circle)
-                                                        (make-ROW 'blank 'cross 'Circle)
-                                                        (make-ROW 'cross 'blank 'Circle))7))true)
-
-
-(check-expect (game-over-or-win? (make-GAME 'cross 
-                                            (make-BOARD  cross-circle
-                                                         (make-ROW  'Circle 'cross 'Circle)
-                                                         (make-ROW 'cross 'Circle 'cross))9))
-              true)
-
-(define (game-over-or-win? game)
-  (or (winning-board? (GAME-board game) (GAME-next-player game))
-      (game-over? game)))
-
-
-(collect-garbage) (collect-garbage) (collect-garbage)
-(printf "running tests with fast path optimization in place\n")
-(time (run-tests))
-(printf "running tests without fast path optimization in place\n")
-(parameterize ([skip-image-equality-fast-path #t])
-  (time (run-tests)))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/image-too-large.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/image-too-large.rkt
deleted file mode 100644
index 0ec9a4cd34..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/image-too-large.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket
-
-(require 2htdp/universe 2htdp/image "test-aux.rkt")
-
-(define width 100000)
-(define height 10)
-(define image (rectangle width height 'solid 'red))
-(define small (rectangle 100 100 'solid 'black))
-
-(define (draw-large i)
-  image)
-
-(testing
-  (check-true
-    (with-handlers ([exn:fail? (lambda (x)
-				 (define msg (exn-message x))
-				 (define reg (regexp-match "draw-large" msg))
-				 (pair? reg))])
-      (big-bang 0 (to-draw draw-large) (on-tick add1) (stop-when zero?))
-      #false))
-
-  (check-true
-    (with-handlers ([exn:fail? (lambda (x)
-				 (define msg (exn-message x))
-				 (define reg (regexp-match "to-draw" msg))
-				 (pair? reg))])
-      (big-bang 0
-	(to-draw draw-large width height)
-	(on-tick add1)
-	(stop-when zero?))
-      #false))
-
-  (check-true
-    (local ((define first-time #true))
-      (big-bang 0
-	(to-draw (lambda (_) (begin0 (if first-time small image) (set! first-time #false))))
-	(on-tick add1)
-	(stop-when zero?))
-      #true)))
-
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/info.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/info.rkt
deleted file mode 100644
index 8105ced3ab..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/info.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang info
-
-(define test-omit-paths
-  '("jpr-bug.rkt"
-    "mouse-evt.rkt"
-    "mp.rkt"
-    "perform-whack.rkt"
-    "profile-robby.rkt"
-    "dir.rkt"
-    "matrix-client.rkt"
-    "matrix-example.rkt"
-    "jump-to-ui-test.rkt"
-    "on-release-no-key.rkt"
-    "pad1.rkt"
-    "universe-receive.rkt"
-    "batch-io-xexpr.rkt"))
-
-(define test-responsibles '(("test-image.rkt" robby)
-                            ("image-equality-performance.rkt" robby)
-                            ("image-equality-performance-htdp.rkt" robby)))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/jpr-bug.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/jpr-bug.rkt
deleted file mode 100644
index 0b04d42140..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/jpr-bug.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-advanced-reader.ss" "lang")((modname jpr-bug) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #t #t none #f ())))
-
-;; This program demonstrated that the idea of using default handlers (K) for 
-;; absent mouse and key handlers was a horrible idea. The balls on his cannvas
-;; just started jumping around when the mouse moved in. 
-
-(require 2htdp/universe)
-(require 2htdp/image)
-
-
-(define (animation2)
-  (local [(define SIZE 300)
-          (define SCENE (rectangle SIZE SIZE 'outline "black"))
-          (define dM 1)
-          (define INIT 0)
-          (define (suivant m)
-            (+ m dM))
-          (define (dessiner m)
-            (place-image (circle m 'solid "red") (random SIZE) (random SIZE) SCENE))]
-    (big-bang INIT
-              (on-tick suivant 1)
-              (on-draw dessiner SIZE SIZE))))
-
-(animation2)
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/key-error.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/key-error.rkt
deleted file mode 100644
index 3cf351086f..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/key-error.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket
-
-;; ---------------------------------------------------------------------------------------------------
-;; the error message should refer to the 'on-tick handler, not the lambda in the clause 
-
-(require 2htdp/universe 2htdp/image "test-aux.rkt")
-
-(define (main)
-  (big-bang 0
-            (on-tick (lambda (w) "3"))
-            (to-draw (lambda (w) (circle 10 'solid 'red)))
-            (check-with number?)))
-
-(testing
-
-  (with-handlers ((exn:fail? (lambda (x) 
-			       (define msg (exn-message x))
-			       (define hdl (regexp-match "check-with: (.*) returned" msg))
-			       (unless (and hdl (cons? (regexp-match "on-tick" (second hdl))))
-				 (error 'test "expected: \"on-tick\", actual: ~e" (second hdl))))))
-    (main))
-
-
-  (define (my-fun x) "hi")
-
-  (with-handlers ((exn:fail? 
-		    (lambda (x) 
-		      (define msg (exn-message x))
-		      (define hdl (regexp-match "check-with's handler test" msg))
-		      (unless hdl
-			(error 'test "expected: \"check-with's handler test, error says: ~e" msg)))))
-    (big-bang 0 
-      [to-draw (lambda (x) (circle 1 'solid 'red))]
-      [on-tick (lambda (x) (my-fun x))]
-      [check-with (lambda (x) (number? x))])
-    (raise `(bad "must fail"))))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/lauch-many-worlds-proc.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/lauch-many-worlds-proc.rkt
deleted file mode 100644
index 578f96a368..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/lauch-many-worlds-proc.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket
-
-;; ---------------------------------------------------------------------------------------------------
-;; testing launch many worlds/proc
-
-(require 2htdp/universe 2htdp/image)
-
-(define (aworld x c)
-  (big-bang 10
-            [to-draw (lambda (i) (text (number->string x) (+ 33 i) c))]
-            [on-tick sub1]
-            [stop-when zero?]))
-
-(define (main)
-  (apply launch-many-worlds/proc
-         (build-list 20 (lambda (x) (lambda () (aworld (+ 10 x) (make-color 255 255 x)))))))
-
-(main)
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/mouse-evt.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/mouse-evt.rkt
deleted file mode 100644
index 6e476aedf7..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/mouse-evt.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket
-
-(require 2htdp/universe)
-(require htdp/image)
-(require "test-aux.rkt")
-
-(define-struct posn (x y) #:transparent)
-
-(define world1 (make-posn 50 50))
-(define world-in (make-posn 100 100))
-(define world-out (make-posn 250 250))
-
-(define mt (empty-scene 500 500))
-(define sq (rectangle 10 10 'solid 'black))
-
-(define (draw a-world)
-  (cond
-    [(equal? a-world world1)
-     (place-image (text "move mouse in to canvas" 11 'red) 10 10
-                  (place-image sq (posn-x a-world) (posn-y a-world) mt))]
-    [(equal? a-world world-in)
-     (place-image (text "move mouse out of canvas" 11 'red) 10 10
-                  (place-image sq (posn-x a-world) (posn-y a-world) mt))]
-    [else
-     (place-image sq (posn-x a-world) (posn-y a-world) mt)]))
-
-(define (mouse-handler w x y me)
-  (cond
-    [(string=? "button-down" me) w]
-    [(string=? "button-up" me) w]
-    [(string=? "drag" me) w]
-    [(string=? "move" me) w]
-    [(string=? "enter" me) world-in]
-    [(string=? "leave" me) world-out]))
-
-(define (out? w)
-  (equal? world-out w))
-
-(define (main w)
-  (big-bang world1 (on-draw draw) (stop-when out?) (on-mouse mouse-handler)))
-
-(check-equal? (mouse-handler 'w 100 100 "leave") (make-posn 250 250))
-
-(testing
-  (main 0))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/mp.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/mp.rkt
deleted file mode 100644
index b435f75cc6..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/mp.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang scheme (require test-engine/scheme-tests)
-(require 2htdp/universe)
-(require htdp/image)
-
-
-;; WorldState = Image 
-
-;; graphical constants
-(define mt (empty-scene 100 100))
-
-;; clack : WorldState Nat Nat String -> Worldstate 
-;; add a dot at (x,y) to ws 
-
-(check-expect 
- (clack mt 10 20 "button-down")
- (place-image (circle 1 "solid" "red") 10 20 mt))
-
-(check-expect 
- (clack (place-image (circle 1 "solid" "red") 1 2 mt) 3 3 "button-down")
- (place-image (circle 1 "solid" "red") 3 3
-              (place-image (circle 1 "solid" "red") 1 2 mt)))
-
-(define (clack ws x y action)
-  (if (string=? "button-down" action)
-      (place-image (circle 1 "solid" "red") x y ws)
-      ws))
-
-;; show : WorldState -> WorldState 
-;; just reveal the current world state 
-
-(check-expect (show mt) mt)
-
-(define (show ws)
-  ws)
-
-(test)
-
-;; run program run 
-(define (main x)
-  (big-bang (empty-scene 100 100)
-            (on-draw show)
-            (record? x)
-            (on-mouse clack)))
-
-(main false)
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/name.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/name.rkt
deleted file mode 100644
index d6931b3878..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/name.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket
-
-;; created in response to pr 12857
-;; make sure the name of a world is transmitted to the server 
-
-(require rackunit)
-(require 2htdp/universe)
-(require 2htdp/image)
-
-(define NAME 'ian-johnson)
-
-(define c (make-custodian))
-
-;; Distinct from other tests:
-(define PORT-NO 19206)
-
-(define-values (_ n)
-  (parameterize ((current-custodian c))
-    (launch-many-worlds
-     ;; --- world: 
-     (big-bang 10
-               (on-tick sub1)
-               (to-draw (lambda (w) (empty-scene 200 200)))
-               (name NAME)
-               (register LOCALHOST)
-               (port PORT-NO))
-     ;; --- universe: 
-     (universe #f
-               (on-new (lambda (u w) (make-bundle (iworld-name w) '() '())))
-               (on-msg (lambda (u w m) (make-bundle u '() '())))
-               (on-tick (lambda (u) (make-bundle u '() '())) 1 1)
-               (port PORT-NO)))))
-
-(check-equal? n NAME)
-
-(custodian-shutdown-all c)
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-release-no-key.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-release-no-key.rkt
deleted file mode 100644
index dfeaf2e5e8..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-release-no-key.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-advanced-reader.ss" "lang")((modname on-release-no-key) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #t #t none #f ())))
-;; Any key inflates the balloon
-
-(require 2htdp/image) 
-(require 2htdp/universe)
-(require "test-aux.rkt")
-
-(define large 50)
-
-(define (balloon b) 
-  (if (<= b 10)
-      (text "press any key now" 22 'red)
-      (circle b "solid" "red")))
-
-(define (blow-up b k) large)
-
-(define (deflate b) (max (- b 1) 1))
-
-(testing
-  (big-bang 20
-    (on-release blow-up)
-    (on-tick deflate)
-    (to-draw balloon 200 200)
-    (stop-when (lambda (w) (>= w large)))))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-defined.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-defined.rkt
deleted file mode 100644
index dc7d7482ab..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-defined.rkt
+++ /dev/null
@@ -1,71 +0,0 @@
-#lang racket/load
-
-;; purpose: when on-tick or on-xxx has been redefined, 
-;; --- raise more specific error message
-;; (why am I running this in scheme/load for the namespace in eval)
-
-(error-print-source-location #f)
-
-(define legal "big-bang: ~a clauses are not allowed within big-bang")
-(define double "big-bang: the on-tick keyword seems to have been used as a variable")
-(define atleast "big-bang: missing [to-draw renderer] or [on-draw renderer] clause")
-
-;; is the mandatort to-draw clause specified 
-(with-handlers ((exn:fail:syntax? 
-                 (lambda (x) 
-                   (unless (string=? (exn-message x) atleast) (raise x)))))
-  (eval '(module a scheme 
-           (require 2htdp/universe)
-           (local ((define (run) (big-bang 0 (on-tick add1))))
-             10))))
-
-(with-handlers ((exn:fail:syntax? 
-                 (lambda (x) 
-                   (unless (string=? (exn-message x) double) (raise x)))))
-  (eval '(module a scheme 
-           (require 2htdp/universe)
-           (local ((define (run) (big-bang 0 (on-tick on-tick)))
-                   (define (on-tick t) 0))
-             10))))
-
-;; purpose: catch illegal shapes of the form (kwd . stuff)
-
-(with-handlers ((exn:fail:syntax? 
-                 (lambda (e)
-                   (unless (string=? (exn-message e) (format legal 'on-tic))
-                     (raise e)))))
-  (eval '(module a scheme
-           (require 2htdp/universe)
-           (big-bang 0 (on-tic add1)))))
-
-;; purpose: catch illegal atomic clauses 
-
-(with-handlers ((exn:fail:syntax? 
-                 (lambda (e)
-                   (unless (string=? (exn-message e) 
-                                     "big-bang: expected a clause, but found something else")
-                     (raise e)))))
-  (eval '(module a scheme
-           (require 2htdp/universe)
-           (big-bang 0 (on-tick add1) stop-when))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; purpose: catch illegal big-bang use w/o world expression
-
-(with-handlers 
-    ((exn:fail:syntax? 
-      (lambda (x) 
-        (unless (string=? (exn-message x) "big-bang: expected an initial state, but found a clause")
-          (raise x)))))
-  (eval '(module a scheme 
-           (require 2htdp/universe)
-           (big-bang (on-key add1)))))
-
-(with-handlers
-    ((exn:fail:syntax? 
-      (lambda (x) 
-        (unless (string=? (exn-message x) "universe: expected an initial state, but found a clause")
-          (raise x)))))
-  (eval '(module a scheme 
-           (require 2htdp/universe)
-           (universe (on-msg sub1) (on-new add1)))))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-universe-with-limit.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-universe-with-limit.rkt
deleted file mode 100644
index 6db0d965f8..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-universe-with-limit.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket 
-
-(require 2htdp/universe 2htdp/image)
-
-(universe 0 
-          (on-tick (lambda (w) (make-bundle (add1 w) '() '())) 1/28 3)
-          (on-msg (lambda (w sender msg) (make-bundle w '() '())))
-          (on-new cons)
-          ;; Distinct from other tests:
-          (port 19207))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-with-limit.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-with-limit.rkt
deleted file mode 100644
index 80794f2a02..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-with-limit.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket 
-
-(require 2htdp/universe 2htdp/image "test-aux.rkt")
-
-(testing
-  (big-bang 0 
-    (on-tick add1 1/28 3)
-    (to-draw (lambda (w) (circle (- 100 w) 'solid 'red)))))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/pad1-handler.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/pad1-handler.rkt
deleted file mode 100644
index c7a9cf2466..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/pad1-handler.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket
-
-(require 2htdp/universe)
-
-;; -----------------------------------------------------------------------------
-;; test case 
-
-(define (i-sub1 x) (- x 0+1i))
-(define (i-add1 x) (+ x 0+1i))
-
-(define handler 
-  (pad-handler (left sub1) (right add1)
-               (up i-sub1) (down i-add1)
-               (shift (lambda (w) 0))
-               (space stop-with)))
-
-(define-syntax-rule 
-  (tst (=-fun (handler _1 s) _2))
-  (unless (=-fun (handler _1 s) _2) (error 'test "~a failed" s)))
-
-(tst (= (handler 9 "left")  8))
-(tst (= (handler 8 "right") 9))
-(tst (= (handler 8 "up")    8-i))
-(tst (= (handler 8 "down")  8+i))
-
-(tst (= (handler 9 "a") 8))
-(tst (= (handler 8 "d") 9))
-(tst (= (handler 8 "w") 8-i))
-(tst (= (handler 8 "s") 8+i))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/pad1-in-bsl.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/pad1-in-bsl.rkt
deleted file mode 100644
index 25d787764c..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/pad1-in-bsl.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname pad1-in-bsl) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-;; must stay in BSL 
-
-(require 2htdp/universe)
-(require 2htdp/image)
-(require "test-aux.rkt")
-
-(define (render x)
-  (place-image (circle 3 'solid 'red) (+ 150 (real-part x)) (+ 150 (imag-part x)) (empty-scene 300 300)))
-
-(define (sub1-i x) (- x 0+i))
-(define (add1-i x) (+ x 0+i))
-
-(testing
-  (big-bang 0+0i
-    (to-draw render)
-    (on-tick add1-i 1/28 50)
-    (on-pad (pad-handler (up sub1-i) (down add1-i) (left sub1) (right add1)))))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/pad1.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/pad1.rkt
deleted file mode 100644
index cce8c54acc..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/pad1.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang racket/gui
-
-(require 2htdp/image 2htdp/universe "test-aux.rkt")
-
-(pad=? "left" "left")
-
-;; constants 
-(define width  1200)
-(define height 300)
-(define center-x (quotient width 2))
-(define center-y (quotient height 2))
-(define x0 0)
-
-;; graphical constants 
-(define label "press down, press a, press rshift")
-(define (mt)
-  (overlay/align 'left 'top 
-                 (text label 22 'red)
-                 (add-line 
-                  (add-line (empty-scene width height 'lightblue)
-                            center-x 0
-                            center-x height
-                            'blue)
-                  0 center-y 
-                  width center-y
-                  'blue)))
-
-(define dot (circle 3 'solid 'red))
-
-(define (render w)
-  (define x (transform-x (real-part w)))
-  (define y (transform-y (imag-part w))) 
-  (place-image dot x y (mt)))
-
-(define ((transform center) delta)
-  (+ center delta))
-
-(define transform-x (transform center-x))
-(define transform-y (transform center-y))
-
-(define (phandler x k)
-  (case (string->symbol k)
-    [(up    w)      (- x 0+10i)]
-    [(down  s)      (+ x 0+10i)]
-    [(left  a)      (- x 10)]
-    [(right d)      (+ x 10)]
-    [(| |)          x0]
-    [(shift)        (conjugate x)]
-    [(rshift)       (stop-with (conjugate x))]))
-
-(define ((key-handler tag) x k)
-  (displayln `(,tag ,k))
-  x)
-
-(define-syntax-rule 
-  (run txt clause ...) 
-  (begin (set! label (string-append txt label))
-         (big-bang x0 (to-draw render) (on-pad phandler) clause ... )))
-
-(testing
-  (= -10-10i (run ""))
-  (= -10-10i (run "press l, " (on-key (key-handler 'key))))
-  (= -10-10i (run "press l, " (on-key (key-handler 'key)) (on-release (key-handler 'release))))
-  (= -10-10i (run "press l, " (on-release (key-handler 'release)))))
-
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-record.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-record.rkt
deleted file mode 100644
index bee1797651..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-record.rkt
+++ /dev/null
@@ -1,1398 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 6.1.0.8 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 31 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 93
-(
- #"((lib \"collapsed-snipclass.ss\" \"framework\") (lib \"collapsed-sni"
- #"pclass-wxme.ss\" \"framework\"))\0"
-) 0 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 88
-(
- #"((lib \"pict-snip.rkt\" \"drracket\" \"private\") (lib \"pict-snip.r"
- #"kt\" \"drracket\" \"private\"))\0"
-) 0 0 34 #"(lib \"bullet-snip.rkt\" \"browser\")\0"
-0 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 29 #"drclickable-string-snipclass\0"
-0 0 26 #"drracket:spacer-snipclass\0"
-0 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 1 6 #"wxloc\0"
-          0 0 139 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 6 #"Menlo\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 90 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1 0 -1 92 93 -1 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 38
-#"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 35
-#"framework:syntax-color:scheme:text\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 49
-#"framework:syntax-color:scheme:hash-colon-keyword\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 90 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 92 90 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 16
-#"Misspelled Text\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
-#"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 92 -1 90 -1 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 37
-#"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 92 -1 90 -1 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 90 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 90 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 93 -1 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 26
-#"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 92 93 -1 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 37 #"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 92 93 -1 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1 0 1 #"\0"
-0 75 7 #"Monaco\0"
-0.0 11 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 150 0 150 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 93 -1 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 175 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 0 1 #"\0"
-0 75 23 #"Lucida Sans Typewriter\0"
-0.0 11 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 41 128 38 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 81 112 203 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 0 203 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 116 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 142 28 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 255 56 81 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 176 48 96 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 200 0 0 0 0
-0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-0.0 13 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-0.0 13 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 13 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 23 #"Lucida Sans Typewriter\0"
-0.0 12 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 38 #"drscheme:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 81 112 203 0
-0 0 -1 -1 2 28 #"drscheme:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 2 31 #"drscheme:check-syntax:imported\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 0 203 0 0
-0 -1 -1 8 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 8 24 #"drscheme:text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 21 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 21 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 0 1 #"\0"
-0 75 7 #"Monaco\0"
-0.0 14 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 1 #"\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 2 41 #"profj:syntax-colors:scheme:block-comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:keyword\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 37 #"profj:syntax-colors:scheme:prim-type\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 38 #"profj:syntax-colors:scheme:identifier\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 34 #"profj:syntax-colors:scheme:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:literal\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 33 #"profj:syntax-colors:scheme:error\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 35 #"profj:syntax-colors:scheme:default\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 37 #"profj:syntax-colors:scheme:uncovered\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 35 #"profj:syntax-colors:scheme:covered\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 21 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 65 105 225 0
-0 0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-0 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 26 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 26 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 26 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 0 1 #"\0"
-0 75 15 #"Lucida Console\0"
-0.0 15 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1 21 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1           0 394 0 28 3 12 #"#lang racket"
-0 0 24 3 1 #" "
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 102
-(
- #";; -----------------------------------------------------------------"
- #"----------------------------------"
-) 0 0 24 29 1 #"\n"
-0 0 17 3 74
-(
- #";; can world/universe cope with large backgrounds and small moving t"
- #"hing? "
-) 0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 7 #"require"
-0 0 24 3 1 #" "
-0 0 14 3 14 #"2htdp/universe"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 7 #"require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"2htdp/image"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 3 #"; ("
-0 0 17 3 6 #"struct"
-0 0 17 3 1 #" "
-0 0 17 3 4 #"posn"
-0 0 17 3 7 #" (x y))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 12 #";; CONSTANTS"
-0 0 24 29 1 #"\n"
-0 0 17 3 34 #";; I can now do 24 and it is okay "
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 9 #"num-grass"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"24"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 23 #";; GRAPHICAL CONSTANTS:"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 6 #"hammer"
-0 0 24 3 2 #" ("
-0 0 14 3 6 #"circle"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"3"
-0 0 24 3 1 #" "
-0 0 19 3 7 #"\"solid\""
-0 0 24 3 1 #" "
-0 0 19 3 8 #"\"yellow\""
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 9 #"mole-look"
-0 0 24 3 1 #" "
-0 2          29 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0           9 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\0(\0\0\0(\b"
- #"\6\0\0\0\214\376\270m\0\0\17\277IDATX\205U\230k\214]Wy"
- #"\206\237\265\326\336\373\334\317\231\273\347\342"
- #"xl\217\355\330\236\304\271\30r\241I(4D\242\210\224[TAT\252B\213"
- #"\250Z\225V \265\245\250J\372\243\5!ZU\324I\243\240\"~\320?\5\251"
- #"R)PZn\201\224\204\220\330\220\200"
- #"\215=c\317\214\347\342\271\234\231s?{\357u\353\217}\306\241[Zgk\237"
- #"}\373\276o\275\353}\337o\213\207?"
- #"3\355\363\371\34*\b\b\303\200\270\0373>1\306\316v\235~?fo\247\201"
- #"\aN\335v\2340\214\350t;\24\2539\312\3452?}~\221\365\327:\264\256"
- #"[Z\365>\2\b\303\220^7\2452T \356\367\31>\224\343\370\203\243\24\306"
- #"<\345J\t\23;\n\305<8(\225K\354\356\356\21\4\1A\240\270\276\264\6"
- #"\2\202 \240Z\253P\e\252\22\214O\214r}y\215\332P\215r\271\210\265\226"
- #"\265\325\rJ\345\"\"\26\234\274\3558\227/-\222\313G4\232M\232\365\16/"
- #"|e\227\e?\325\34\21%\346gG8q|\210[\177c\2040T\b)\20"
- #"B\240\265\243\321N\270\270T\347\207_Z\347r\322\340\360\275%&\356\b(U"
- #"r\324\206j\320\355\22\205\21A\240X"
- #"_\337\344\304\251c\\\372\305\25\216\36"
- #";\314\302\345\253\250@!\336\373\314I"
- #"\337\355\364(\226\n\264\232mJ\345\""
- #"I\234\"\a/\212\343\204\326^\233\273"
- #"\357\277\235\205\237\255s\376\213;\234\316"
- #"\225\270w~\234\a\316\316`\275\0)AJ\204T\b\1\2\201\0\20\240\4\24"
- #"C\305s?Y\345\271\363k<\277\276\306\331\17MP\233\216p\32"
- #"F\307\206YYZ\5\340\370\255s\264\333\35\352;\273T*e\372"
-) 500
-(
- #"\375\30\361\340\223\243\376\310\334,/\375"
- #"\350\2G\216\335\302\322\302*GO\314b\214aj\372\0ZkzI\227\265\363"
- #"=^|j\215O\276\357\24s\207\207\361J!T@\30\5\204A\200\n\2\244"
- #"\224\203\n\2^\340\275\303{\2175\26)<\241\202kKM\376\354\251\3479\371"
- #"\201\n\367\277\373V\256_]\343\300\344"
- #"\4\265\241\32\255f\213\265\325\r\206\206"
- #"k\\\271t\215b)OP*\227\330\336\252s\372\314\t\232\215\26g\336p\n"
- #"\357\34J\5\354l\327Im\302\302\217"
- #"\366\330\370j\3023\37\235\247a$\315~J!\37\21\205\1B\tP\203\300\224"
- #"D\n\1B\200\367\b$\316:\204\24h\353\350\3655C#!\337\370\364#\274"
- #"\357S\337!\312/Q\2365\364z}\326V78q\362\30\336{\272\235\36\0"
- #"\371|\169>1\312\310\350\20\306\30F\307\206i7;\224\312ez\275>\371"
- #"b\216R\276\306\306\177$\374\371\273\16"
- #"\262\\\217I\265\3059\217G\200\a\357"
- #"E6\0\234\307y\360\16\262\303A\260d\347=`R\307\302F\213s\177z\17"
- #"\313_\355\242|H\30\5\314\35?\302\325\205%\16\3362M.\27q\313\3544"
- #"\225j\31\271\267\333 M5\345r\211"
- #"\225\2455\246\17N\321l\264\20B\220"
- #"\352\204\27\276|\203\273\17\344i%\32"
- #"m\f\316\372l\332\234\317^\352<\316"
- #";\274\363X\357p\316\341\234\305:\207w.K\306\373\233{\353<\306Z\366z"
- #"}\368\\\345\322\327c:\235\16+Kk\24\213\5\244\224\24\212y\272\335\36"
- #"\215\275&\262\333\355a\255%I\22\242\\\304\312\322*\245R\221\\!bea"
- #"\e.\264\271o\276L\242\301Z\217\321"
- #"\26c\34\3269\214v\30\347\261\326\242\215%\325\206TkRc\320"
- #"\332\222ZCj,\332z\254u\30\353\320\326b\255\243\333\323\274\365\r"
-) 500
-(
- #"\243\24\27\f\215\235>;\333u\204\24lo\325\351vz\344r\21\225j\5Y"
- #"\e\252b\264\301\30K\24\205\0\\]XBHOc\301RP\202~\352qx"
- #"\274\27\244\326`lv\275\266\26\243S\2646\244iJ\232\32\2224%Itv"
- #"\234\30\214\326h\2551&\273\307\30\207"
- #"\31$\320\350\246\224\2\301\362O\232L"
- #"\35\32\247\323\356\322n\265\251\326*Xk\251\rU\220\373T\22\4\1B\b\274"
- #"\367L\3372E\263\323d\365E\303o\336Y\315\2t\36\353\a\323j\34\316Z"
- #"tjH\22C\22k\3428%\211\23\222~B\322\217\211\343\204$I\210\223\224"
- #"d\20\2543\26\234\305XK\2525\255v\314\273\356\31f\373<tz\35\2228"
- #"fxd\210\255\315\35\242(bc}\213`\237\265{\335\36C\303U\362\371<"
- #"\251N\t|\36\263\231\22\237p8$"
- #"\336\201\302\263\262\325\347\347\327\353<|"
- #"\367\1f\247\207\260\6\234s\203\344\30"
- #"\360_\306\241b\2600\2)\20\336\261\272\325\342\233?^\345\366C\25\16T%"
- #"\3269\372\336\342\353\26a\2\242\274 "
- #"_\310c\214\305Z\213\224\202\300\271\254"
- #"\344J)\366v\233(\325\301y\213O\n\34)(R\v^\200\363\16\353<\271"
- #"@\262\266\323\347\v__\344\276\371q"
- #"\336r\367\24\245B\2041\373\321\r\30"
- #"\32\220B\240\224\240\3353|\357\345u"
- #"~\370\352\26\271@p\327\3412\306z"
- #"\254\5\357a\256\244\220\272Hu4\300"
- #"\30C\251\\\244T*\262\266\272A\260\267\333 \212\"\342Ay;\355.\326i"
- #"\222\246\300\222\5\6`\275$\265\236\261"
- #"Z\310\357\275\355 \347\257v\370\336\205"
- #"M^\370\305.\357y\350 \267\317\215\340\274\307\r(F\n\360Rp\341J\203"
- #"\177\177n\205^lx\350\3161\316\316\325\20\336\322"
- #"\353k\274w8\357\321\316!}\200\224\2\253\35\255"
-) 500
-(
- #"f\233f\243\305\370\304(Am\250zsyom\356\340\234\343\300\324\4k\355"
- #"6\220e\350\274G9\217s\216T;"
- #"\362y\305\257\3379\312\275\363\243|\347"
- #"\225M\276\364\315\253\34\231\336\342#\357"
- #"<6\340=0\326\363\354\327\26\270\266"
- #"\336\341\336\323c<|\367\4\371\0:"
- #"\275\224Tg\364\343\234\317`\340 \227\217P\312\323kw\tT@.\37!\204"
- #"\3100X\337\331\243\337\217\251TJ\f"
- #"\217\324h5\333\244q\2\36\234\361x"
- #"\225=\304;\207\263\36g\35\335\276!\237\vy\367\3\a9{r\214\345\e]"
- #"\234s\200\0042\316;u\250\306\333\357"
- #"\235\346\226\261\34Il\351\367\r\306f"
- #"\317\360\326\341<\b\aB\b\32\273Mr#E\234s\f\217\324h6\332\331\342"
- #"\225R\320\357\307\224\313Er\371\34\235"
- #"v\227\211\351q\322V\2035\277\205%CzF\302\22GF\310\312y\214u\364"
- #"S\303\364h\236\231\261\302\0\16\16|"
- #"\2464o\272m\24\357\34\375$\3\275"
- #"\331't\3470\36\254\363\b\357\311\270"
- #"\1\2420\344\372\316:C\303UJ\345"
- #"\"[7\266\221\235v\227\261\361\21\362"
- #"\205<\365\372.Q1`\341\312\"\327\236\337E\6\31\355x\227=\304y\237U"
- #"\321{\34\356&\206\314\200\e\235\333\377"
- #"\317\341\275\305X\203\266\231\272\230\301\377"
- #"vp\277'3\22\336\273L\2\235\245X+P\e\251p\345\3225\322$%\214"
- #"B\202 \314V\216\220\260w\275G\375"
- #"\242\245\363\212g\375\347{L\217\2078\357\1\221i\254\a;\220+\3472u@"
- #"\n\224R\204\201@\16\354\226\367\36c"
- #",\251\31H\342`\270A\242\336;\234\313\256\23@P\220,}y\e\333\202\311"
- #"#5N\237\231 \ns\31\6\3030due\235\343\267\317\322\276\356\270"
- #"\372\265zVn\221\211\277\24\2\ax\353\260\312\21Z\211\302#\274\5\349"
-) 500
-(
- #"\341i\367\341\277\277\277F\247\327\307X"
- #"K)\237cv\246\306\203\267\r\23\353"
- #"\4\213Gx\201\360\231\\Z\347\301y"
- #"\224\204^\354\351\244\216\355\206e\353\331"
- #"\e\314\377\266f~f\234\244\255)WJ\4\235v\227\203\263Sl\2564h\274"
- #"`\310\221\341<u\260\326\260\0247b\346\306rD\221B\t0&\345\302\225\6"
- #"\224&\tKcX\24\2778\377\"\367\237\310Q=\30\240D@j<W\326\267"
- #"xfEs\372\324)\222~\35\323\335a\262\22425V\306K\350\30\307\345\325"
- #"\36\27\327b\272\211c2'(y\317"
- #"\316w\333\310\267\317\320\3557\221\262\204"
- #"x\364\363s>**\276\3657\213\244"
- #"\313\26\251 \222`\235\300\252\201\24\b"
- #"\301\361\251\34\207F\24u?\311\307>\365Y\36~\370aFje~\360\277\257"
- #"\360\261\307\316rx&\217q\257\323\264"
- #"\302\260ffy\361\302\2\316\303\362\312"
- #"\6\237\371\333\277\346\342\17\376\25\355\24"
- #"\257-\367H\255\347\310xH+v\314:Gj,k]I\373\220\344\241OL"
- #"\22\312\34\201\f\241\261li/[B\5J\n\20\36/\340@Eqr2b"
- #"q\307pi-\346\247\313\236O\376\325"
- #"\373y\317\243\357 \b\202\314X,\376"
- #"\222\335&\24\3136\363\177\3\2226\332"
- #"\260\331\333\30\30C\313\370H\231\371\333"
- #"\356\340\231g\277\210\360\226\371C\5\216"
- #"O\344(\347\340\271\313=\224PT\2"
- #"\301\250\364l.\e\322\255\210\374A\201"
- #"\272\353\375SO\374\327\223\v\310\276G"
- #"(\201\222\36\205\304\1\371Pr\313\220bz$GD\312;>\360G\374\313\27"
- #"\236\341\225W^\341\267\36}\224\335\335"
- #"]\356\270m\236\363WV\370\366\367/\20HK/\261,\337\260\264]\221'?"
- #"\375O\23486\207\367\236\337\371\340\a9\367\3249\236"
- #">w\216\346\316\22g\306\272x!\260\6V\366R\206\21"
-) 500
-(
- #"D\n\214sx\3\257\276\274\307]\357"
- #"\235B<\366\364\355\376\337\376\360UB"
- #"\231e\256D&\356\306z\306\252\212339\202P\360\322\245.Wvb\256\\"
- #"\3729\233[[\314\315\315\241\323\24\251"
- #"\24\265Z\215\37\277\3642\377t\356\363"
- #"\364\373}\36y\333#<\376\370\343H"
- #"\1q\34\23\4\1\213\213\213\214\217\217"
- #"s\346\314\35|\350\367?\214\276\374\25R\27!q\374h\261\307!/(\206\236"
- #"V\342\331Ia\261gy\347\337\37'hluo\272\16qS\332\308\223l"
- #"\312R\3Q\16>\376\361\217s\361\342k\274\365-oa|l\2148\216\1\250"
- #"\357\35403u\200\177\374\334\347\220J"
- #"\21\3071\33376\260\3a\316\347\363"
- #"\274\360\342\213\374\317\267\277\315\233\37z"
- #"3\27_\273\300\221 S\0341@\255\367\36o=\271P\22\31C\4\244=O"
- #"\220\352\364\246\t\361b?\310\f\203\355"
- #"\304\363\263\265\204z\317\221hx\372\237"
- #"\317\361\320\3\17R)\225\330\333\331!"
- #"\325\232\233\233\20\344\302\20\244\304h\215"
- #"\265\366\346\251~\30R*\24p\326r\356\351g\330\335\335\346RA2R\16\230"
- #"\254H\22\233\3315%\5rP\226\20"
- #"2\251\213\202\20G6\265\336\201\6\254"
- #"\313*\232\364-\326I\246\252\212\231\221"
- #"\220^\234\222\313\3479rx\216T\e\2146x<RJ\362\271\2_\377\326w"
- #"\371\317o~\203'>\371\227T\253e"
- #"\214\326x\262\226\340\2367\274\221n\354\330\\\371;\3569Tfe[\263\276g"
- #"\270^\327X\347i\n\230*H\16\25 \n\24\n\203\265\226`\277\n\36\201\20"
- #"\231GSY\3659PU\334>\23\1\2\25\bF\313Ez7\236\343O>\372"
- #"=\16\35\235gr\346\b\371B\211\335\235\r\226\256]bDmqv\252"
- #"\304_|\342w\231>t\232\311\351"
- #"\375\363\353\\[\274D\321\336\340\376\243"
-) 500
-(
- #"U\264\225T\362\212\223S\216^lyy%A%\236\255\3041\21\202\20\22\0"
- #"\235\30\2\37\245\3[\225\31\316Pe"
- #"\213\305\271\f\224\3328\20\2\207\4\341"
- #"(\26\"\336tR\241\365\25\222\353\277"
- #"$\1J\271\200\373\216\344\310\205#8"
- #"\17\217\334\35\321\351.\321\273q\205\226"
- #"\361\24\2\301\331\203!R\16\221\244\16"
- #"k\34\306\202\321\216HB(a\266 \310+\205\366\220\30\217\3\306gk\4\23"
- #"\2635j3\273\264\326\fb\20\334>h\361\36\357\301\343Qdf\324Z\2171"
- #"\236(\f)\26$J\n\204\24x\a\375\304\355\303\2210\f\251\5\341\300<d"
- #"\367\245\332\r\332N\237I\236\3658A&\245\b\300!U\200\351ir\223\2U"
- #"\262\310\306v\233S\217\215\f\f\317@\aD\266`^7\a\f\332\313\314\375j"
- #"\343\320\326\221\32Gb-\251\266hm\a\335\236A\e\203NM\326\355\351L!"
- #"\264\261h\223\231\b\347\262\26\324\r,"
- #"\227\367\340\360\b\251\200L\237\317|\3440q;E\26r\5*\263\222\23\2776"
- #"\212\261\334l\262\31P\215\277\331x;"
- #"\254\a\253A[\213N]\326\373\246\226T;\22cI\323\314q\247iv\234h"
- #"G\242\a\327\16\332Mc|\346r\254\3038;\260hY[\213\200^3%\272"
- #"\277\306\324\251\0226u\4\273\365\6*"
- #"\220\234\371\360\30\233W\233\2647\f\201"
- #"\332\257\340\300&\261\317\2116\333k\t"
- #"j\340\210\245@\b\207\360\"3\323\373"
- #"\233\3/\366\23\315\340\341\34\3\253\226"
- #"M\265\265\29\230;\347\300'\216\326\301<\247?|\200\356^\237j\255B\340"
- #"\275GJE}s\217\273\376x\224\227"
- #"\377a\233\316\216\333o-\262\a\337\4"
- #"\200\300x\217\227\16\347\5\316\200P"
- #"\22\4\310\233\276\370u\303\340\366\3\365.\303\331`v"
- #"\366\203\315\222\367\2036\2\266\16DL\377\301\b\322A"
-) 500
-(
- #"\234\30z:F\26\212\5\224R8\v\371B\310cO\275\221\243\367\17\343<8"
- #"\313\300=\373A\307\226\rm\375\3538"
- #"\324\206T\233l\212\177e$\373\237B"
- #"\214!\265\16\255\35\251\366h\3\326dx66\373|\"bO\353\326\220\371'"
- #"\217#\204\241\335\350\22\4\1C\3035"
- #"\324\201\373\324\23\307o=\212\20 \205\344\306\215M\216\275u\214hD`W!"
- #"\327K3^\222\331j\306\263\277\354\262"
- #"\335~5|\306\241\356W\216\263\4\301"
- #"Y1p\324\274\236\250\365\330\256\243\245"
- #"\24\243\357\256q\327\207\216\241{\t\325"
- #"J\225 \bH\222\224v\273\203\272\353}3O\244iJ\261X \356\307\b!"
- #"\311\205y\302aC\365\336\220\256\n\321"
- #"\333\6\333\266\4\210\254\237\270\211\317A"
- #"\0^\f\272\276\327\207\333?g\375\377"
- #"\v\312%\2368\366$9E\377\316\34\217|\366!\362c\340bG\273\325\245Z"
- #"\253\220$)\315F\v\2555\342\361/"
- #"\335\341\313\2252\313\327\256\337\\\255\0"
- #"\245r\221N\247\313\344-\23\270\24V"
- #"_\332f\365;\353\214\366\363\230n\202"
- #"\362\36\2512\f\356\343\365W7\277\377\343=X\320\36D! 8\\\"\177\246"
- #"\210\232\361D\305\200J\261\314\360\360\20"
- #"7\3267)\226\n\304qB\232\244H)\351v{\210\307\236=\355\373\275>a"
- #"\24\342\234C\247\232\251\231I._\\"
- #"\240T.\21\4\212\332p\25\213a\267"
- #"\321\242\265\326\247\32\24\250\277\332F\355"
- #"\bt\263\207\213\r\312B(%2\0+\300!\260\241 \254\26h\347z\4\263"
- #"\202\3\307&)OE4\353-\362a\236(\n)\24\362\364\3731\355V\a\245"
- #"\24\205B\236\\>\207\265\226\235\355]\202B!\217\20\240\265A\bA\230\vY"
- #"\274|\rc\262\317_\333[u\256/\257\243\224\342\320"
- #"\321\31\222ZB\"\22\336\370\221yv\367\366\20J\320"
-) 88
-(
- #"h\264\251\324\31247\273\324/\246\fM\226\tg\22\306F\206I\23\315\336N"
- #"\203\221\241!t\242\t\\\310Hm\230N\273K}{\227(\27\321\330m11"
- #"9\306\330\370\bB\b\366v\et:]j\265\n\377\a\236"
- #"\235\2\375\275\222\317\24\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 10 #"grass-look"
-0 0 24 3 1 #" "
-0 2          31 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          10 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\0(\0\0\0(\b"
- #"\6\0\0\0\214\376\270m\0\0\21\300IDATX\205=\230\331\217\34\211}"
- #"\337?uwU\365Q}\367\364\334\34rx\314\236\334\325J{Jk\371H,"
- #"\310\27\344+p`\310F\202 ~\260_\374\224\27\"\17\371\a\364\22\4\360S"
- #"\20\344\200a#\216rm$mV\226\245\365.\315].\271\344\222\\\222\303a"
- #"OO\367\364U\335]\367\351\207\36\261"
- #"^\v\5\374\352\367\373\376\276\307O\370"
- #"\265\357\355\345A\20bU\313H\222D\30F\354\356m\263\230/\231Nf\314\355"
- #"\5\213\371\222f\253N\24\305\244iJ"
- #"\357\311\200\257\275u\225\351d\206a\352"
- #"\210\242\210a\32\364{\3fS\233f"
- #"\253\316\243/\217\250\325+\344y\316\245"
- #"\203}~\376|\374\263O8\351E\374\342\257>O\251\\\342t8\"K3\232"
- #"\355\6\207\217\216\330\273\260K\340\a\334"
- #"\377\342!\242( \354\375\v\362?\370"
- #"\356o\362?\377\373{\24\313&\212\242"
- #"\260\261\331EVd\306\243\t\313\205C\24\305$qL\275Q\243Z\263(\226\212"
- #"<\270\367\220\311h\306\305+{,\27\16s{\301\333\337x\235\321h\202\263t"
- #"\330;\277K\24\307Da\304r\351\0"
- #"\220&)\212\252\260\276\336A\224$\376"
- #"\313\177\374k\252\2652f\321$\bB\352\215*\273{\333<\372\362\220$N\30"
- #"\217\246\b\177\3627\357\344\337\377\353\37"
- #"\363\366\273/\361\364\250O\241\240\261\273"
- #"\267\r\300pp\312\334^\260\276\261\306\243/\17\251XeN\ac\362<\307Y"
- #"\372\374\301\37}\207\277\372\257\337\247\331"
- #"\256s\360\374%>\370\341Oy\375\355WI\222\224\345bI\226et7\326\230"
- #"\333\213g\0354M\203;\267\357\221\246){\27v"
- #"i\267\233\304IB\222$\234\34\17x\357\373\267\250"
-) 500
-(
- #"T\341\215w^b\271t\220\322\215\321\265<K\350n\264q]\2178N\350\35"
- #"\35\23G\21\206\2413\233\330\364{C.\37\354\343,]\3224E\323\v\304Q"
- #"\314\217\336\273\305?\373\303o\261\276\261"
- #"\306lf\223e\31\207\217\216h4\353"
- #"\250\232J\357\250\217,\313H\222D\236"
- #"\347\0\374\354o\257\323h\326\220$\tQ\24q]\17g\351\20\370!\375\343\1"
- #"\337\376\255w(Wt\246\23\233(\212"
- #"\221\253\365\nq\234\20E1\206\241\363"
- #"\372[\257\1\360\321\207\377\200\256\353l"
- #"n\257\323\357\r\320\r\235\235s[|\370\223\353DQL\255^\341\235_x\216"
- #"\a\367\37\242\353:Y\226Q\3205\322"
- #"\264\310\203{\217\320\365\2\227\17\366\231"
- #"Mm\222$A\222$\314\242\211\242\310"
- #"\210\222H\263\335x\206\265\237\27\277\261"
- #"\325\345\223\353\237\341\271\36\333\273\233D"
- #"Q\214\360\335\377\374\225\334\367}\306\243"
- #")i\2322\354\217Q5\205J\265L\255n\241i*\206i\360\243\377\373\21\377"
- #"\344\333o\1p\373\346\35\336\374\372\327"
- #"\370\273\17>\244\273\321\341\306Gw\350n4X\314\35\332kM&\243)\255N"
- #"\203\a_<\341\352k\a$IJ\30\204\224+%\332\235\26\213\305\222R\251\310"
- #"t2C+h\24\n\32\256\353\361\360\301!\262,q~\377\34O\36?\245T"
- #".\"\374\356_\34\344\0\222$\241\252*wn\337C\24ETU\341\360\341\230"
- #"\257\377\342\313\344yN\30F\344y\316"
- #"\361\323\23\236\177\351\n\267>\275\303\301"
- #"\v\227\350\35\365\21\4\201\331\324f\357"
- #"\302\16\247\3031\233\333\353|\364\323O"
- #"0\314\2\257\275~\225<\317\31\16F\b\202@\253\335\340t8F\222D6\267"
- #"7\270}\363.\222$\3428.\233[\3534\333\r\36|\361\220\345\322a"
- #":\266\221^\374\255\265k\0\236\3473\36M(\227\213\244iJ\232\246H"
-) 500
-(
- #"RN\263]'I\22\26s\aEU\310\262\fY\226\310s\230Mm\4A@"
- #"Qd\n\5\rQ\24I\342\204R\271H\222$(\212L\265f1\31OI\323"
- #"\fE\221I\223\24Q\24\250\326\252\330"
- #"S\233\351tF\273\323\"\216\343g\243"
- #"\236\333\v\3428\241\331\252!\aA\310ljcU+\b\202@\30Fg\30\263"
- #"\260gKfS\233b\311$\317s\306\243)\353\e\35\354\331\34Y\226\360<\37"
- #"\303\320)\225\213\344y\316b\276D\222"
- #"Dt\275\200\246\251X\325\nQ\0301\36MQ\24\5\331*\341\272\36\205\202F"
- #"\222$\4A\300tl\223\304\t\202(\3428\36q\24S*\27)W\212\24\n"
- #"\5\304~o\200i\32\230\246\1\300\311\361)q\24\243\0254\332k\r\246\23\e"
- #"\3234\2517\252\224\313E\3020\242T"
- #".\342\373\1\335\3656Y\226a\317\346"
- #"\317 0\267\27\364\236\366I\222\224\376\361\200\311xJ\275Q#\216cDQ$"
- #"MSDQ\344\356\31\224:\335\26\313"
- #"\271\213\242\310\344Yv\366^\240\273\276"
- #"\306d<E\252^\315\257\275\360\362\1\303\301)\17\276x\312\363/]d}\263"
- #"K\277w\362l\363F\247\23\362,c\261pX\316\227\250\232\212=[\340\271\36"
- #"Y\236\21\307\t\272\241S\3205\242(\306u}\232\255:\256\343!\b\"\366l"
- #"\216\242(\317\260-\212\"\25\253\314b\276$\212b.^>\217\353x\230Ec"
- #"\5\223$\5\300\266\27\210{\373\333<\270\367\20EUh\257Y\350z\1\263\250"
- #"\3\20G1\273{\333\4~\300\334^\240\353\5TMe:\2661\213\6I\222"
- #"\220\245\31\345r\211\243\307=\6\375S"
- #"t\275@\22\307\364\216\372di\6@\236eH\222\304\351`D\251\\\"\317s"
- #"\254j\5\253Z\301\367|\3020D\226%d"
- #"E\306uW\205\16\a#\312\225\22r\261h\""
-) 500
-(
- #"\3132\242(0\35\317Q\324>W\236\273D\236\3474Zu\6'C\256~\345"
- #"E\362<\307\236\331\314\355%\202.\20"
- #"\3071a\20Q\337\2501\34\2140\212\3063*\t\303\350\31\320\223$\241\323m"
- #"3\350\17\2517j(\212B\256\347\374"
- #"\335\a\37\321\335h\223\246\253\t\344y"
- #"\216(\212\310\262\214\357\ah\5\25I\22\21\3030BQd\236<\356a\26u"
- #"\366.\354\"\b\260wa\27{6'\3132\36>x\314\341\243#\356\337}\264"
- #"\332\364J\t\263hR\3205\312\225\22"
- #"\316\322\347\345W^\0\340\351\223c\302"
- #" DU\25\254j\205F\263\316\326\366"
- #"\6\252\246R\253W\271\373\371}\346\366"
- #"\202r\245\310r\341\20G1\213\371\22"
- #"\317\363\211\302\210$I\20E\221F\263"
- #"\316b\356 \275\362;\e\327\216{'"
- #"\234\236L\371\205_y\eY\226\370\374"
- #"\326=\266\266\327\211\242\bY\226Y."
- #"\34\362<C+\250\314m\207\365\315\16"
- #"\25\253L\305*\263\\\272\210\242\210\246"
- #"\251\214G\23\\\307#\212b6w\326\231Mf$Ir\266h\6\243\323\361\252"
- #"\203y\316\336\205]\3428F\325T\fS'\216\23\262,G\222$\234\245\203 "
- #"\bh\5\rY\325TDQD\24\5\202 @U\25*V\231\e\37\337\244\331"
- #"n\20\205\21\323\261\315W^\177\tY"
- #"\226q\35\217\273\267\277\244\275\326\340t"
- #"8\302u|\32M\213{w\37\220\3479\252\252\20\307)\272^\240Z\263\220d"
- #"\211\345\302!\313\24\262,\347\305\253\317"
- #"\341{>\177\373\376\207\274\362\332\213\244"
- #"i\212=\233\243i*\235n\233,\315\30\16F\330\2639[\333\eHW\177{"
- #"\343Z\22'\324\352\25\202 @\24$*V\t{6\247\337\e\342:\36V\255"
- #"L\265Za6\265\251\326,\232\255:A\20\221g9"
- #"FQg<\232\341.\3\2420FQd\3428>\303"
-) 500
-(
- #"hH\226e|\363\227\277\316\347\267\357\21G1\256\3432\36M\251\325-\6'"
- #"\247t7\326\330\336\331d2\231\221&)Y\226R,\232x\236\217 \bH\372"
- #"e\367Z\265^ec\263K\232d\fNN\231Nl$I\244\325i\0\2k"
- #"\335\26\206\251\363\340\336!V\265\314t"
- #"b\223\347\31\212\252\322l\325\361=\237"
- #"R\331\240\325ip:\230P\261\212T*e\234\245\313\302^\"\313\22\256\353Q"
- #"*\27Y.]\262,\5\4\6\375\21\252\246\340:.\366l\301\340xH\226\347"
- #"DQDvFk\322\333\337\335\277vr< \a\32\315:\375\336\200\212Ub"
- #"\377\342\371\225S6\f \243P\320\310"
- #"\363\214(\212\317\n\314\231N\246|y"
- #"\357\204\356F\203\235s[\310\262D\305*\242j\5*V\tA\20h\2575\371"
- #"\364\372\347\354]\330\346\352\253/\362\350"
- #"\313C|/@\325T\366/\355q\373\323{\244YJ\305*\23\3071\25\253L"
- #"\24\306\b\202@\232fH\277\372\247\257"
- #"\\\e\234\f\321\n\32\276\347\23E!\223\361\24UU9:<b{w\325\376"
- #"\2337\356S*\353,\227\36V\265D\222\2444\2325Z\35\213\271\275\244b\225"
- #"\371\361\17oQkT8z\334\303\367Wd\255(2\305\322\212\354\1\372\307\3"
- #"\332\235&\273{;h\5\r\243\270\262j\253\361{H\222\204\246\251g\324'\""
- #"5\277\312\265\316Z\233+\317]<\263;2\262\242q:\34\323\352\264\21E\211"
- #"\303GO0\f\203j\315\302s=DQ\344t0\341\340\205K\b\202\310h8"
- #"A\323d\332k\26\236\347\263\275\333\345\213\333}\252u\23YV\220d\231~o"
- #"\200Q\3241\f\235\336\321\tfQ\347\372\2077\261je\2043\211\235\214=D"
- #"![\21\266\343r\341\342\36\322\205_\261\256"
- #"!p\246\245\31\272\241\243i\32\345J\31\323"
-) 500
-(
- #",p:\34\323]os\365\325\347\370\344\372g\354]\330E\24\5\372O\207\324"
- #"\352\25\246\23\eE\225Q\24\205\212U"
- #"\241\331\254\343\373!\325\272\301\334^P"
- #"\253W\250\325\353t\272-\310s&g\0360\317s:\335\26\237\335\270OAW"
- #"\211\243\230\213\a;L'6\263\311|\245Tq\202\264\366\246rmm\275\303\215"
- #"\217n\22\370\1\315V\3MS\231\214"
- #"\2478\216\313\326\316\6\245r\221'\207"
- #"=~N\352\222$\221\2461\236\27\260"
- #"\265\275\301|\276D\24E\4Q\340\350"
- #"\260\217a\26\350\254\265\210\242\30\317\363"
- #"I\323\204v\273\305\223\303\247\224+%\252\265U\332[\353vh\266,TM\245"
- #"\336\250\322Yk\363\370\341\21\315v\235"
- #"Z\335\302q\\\244\356\233\312\265R\311"
- #"$\212cj\365*\323\311\214 \b\260gs\254j\31Y\226\t\303\bg\351 "
- #"\2122y\266Jf\203\376)\305\222\301b\341\340{>\216\343\242\252\n99\335"
- #"\215\3163\v\267R#\210\343\210V\273"
- #"\311\370tL\24\256\322\336I\177\205}"
- #"\327\361\230\214&<y\364\224<\317\271"
- #"|p\1Y\226\250\325\253\210\333\273\e\370\276O\226\345L'\253\3740\36M1"
- #"L\35Y\226\t\202\200/\356<\240\240\27\20\204\34Q\2248\35\216)WV\213"
- #"\262\230/\21E\tI\222q]\237\321p\202=\233\223\304\t\237}r\227j\255"
- #"J\222$x\256O\24\306\344\271\200\242(X\3252\v{\311\350tB\232\246\30"
- #"\246\201Y4h\266\353\210\242\310b\276"
- #"d2\236\256\2648\216R\254j\231R\311<\v\341:Y\226\223\246)\256\343\261"
- #"\265\263A\34G\344\271\200\343\270\204A"
- #"\204\242\256\272\331\3564q\226\16\252\246"
- #"\242(2\25\253\204\252*\4A\210\347\6H\222D\305*\243\25\n\364"
- #"\236\366\320u\235$\211\211\242\230K\a\347y\353\235\257R\256\2240L\35"
-) 500
-(
- #"\3034\320\365\2\307\275\23\34\307%\b"
- #"B\304\300\17\311\262\4\337\v\320\r\235"
- #"\265n\233\205\275\304s}\322$\245\337\e\"\313\22a\20\23\4>V\265\202a"
- #"\26\210\302\30I\226Y\314\27\30\246\376,\367\26K&A\20P*\2278\177q"
- #"\e\327\361V?\266\\\222\304)\216\343 \212\"q\24#I\22\363\371\2028\212"
- #"9|\370t\25i\v\332\252\243\206N\271RB\214\242\b\255P\300u\\\6\375"
- #"\341\231L%\4~\300\341\243\36/\274"
- #"|\200\353\270\b\2\214\6\23\306\247S\\\307CQUL\263H\226\201,KH"
- #"\222H\236\347\370~\300t2g6\265i\265\233dY\202\347.\317\212.\"I"
- #"\3423\31\213\242\230O\256\177F\20\204"
- #"\354_\336c\347\334\26a\20\262\261\331"
- #"\245V\257b\317\346\210V\265\2\b\b\202@\263\335\340\341\375CTU\3010u"
- #"4MA7\n\204aJ\20Dl\355\256\343,\35$I\3044\rdEB\24"
- #"A\20\4\26\366\2224\315\20E\201Ri\25\274N\372\247t7:Tk\26\0"
- #"Y\226\261sn\v\317]\25\370\364\3111fq\225wdY\302uV\316HV"
- #"d\216\236\34\263sn\vq:\261\211"
- #"\302\210b\251\210a\350T\353\26\312\231\2273K&?\370\337?\301Y:\314&"
- #"sJ\345\"\316\322'I\4\3224\341\370\250\377\314p\252\232\302d4\303u<"
- #"\252\265\n\255v\203\223\343\23|/8"
- #"\343Xp\35\27\327q\331\335\333\"\3132\352\215*Vue\333\312\2252Q\264"
- #"Jv\223\361\224$\216\261\252\25\244\363"
- #"\277\\\2716\31O\261\2542\276\347\3"
- #"\2\363\331\234(\212\361\275\200\347_\276"
- #"H\30\206\344\371\312\26Uke\2420"
- #"\3050Uj\315\32\316\302\241\337\263\331\277\274K\30\370\244\311j\271"
- #"\nz\201\354L\273\2535\2138N(\226L\346\366\342Yp2L}"
-) 500
-(
- #"\345\320\1A\340\314t\24\31\217\246\264"
- #":M\246\223\31\322\273\377\362\312\265O>~\314ra3\235\314Y.\34Z\235"
- #"\6\343\341\214bI\347\235w\337\244\337"
- #"?\241\331j\220$)y\16\215\246\205\357\207DaD\243YG\24S\16\37\36"
- #"\263\267\277\213a\32<\376\362\210f\273"
- #"\201n\350\370\276\217(\211t\326Z\b"
- #"\202\2602\265\256\217\357\373,\27\16a"
- #"\30b\230\6w>\273\217\357\373\254o"
- #"\254\201\300*\346\236N\220eY\346\265"
- #"7\366W\256Y\0Q\20\250\326,\352\325*3\333\246\331j\340\314W\324\" "
- #"\340-=Z\235&\375\336\20\323\324y\370\340\220w\336\375*\267n\336%\n#"
- #"t\323$\216s\352\215\32\236\353Q*"
- #"\231\314\347\v\2420\242\177|\202\263\364"
- #"\2507\253$I\212\347z\254u\333\210\222H\331*R\255Y\224\312ETM%"
- #"I\22\342(F\354\35\35\23\305\21[\233\353\324\353\26\265Z\205,KQt\225"
- #"\235\363;\374\267\377\364W\34\37\215\221D\21I\2218wq\233\303\307=^}"
- #"\375\25n\177:F\310\341\307?\372\220"
- #"\265\365\16\222,\361\371\315;\\:\330"
- #"\345\311\343\36K\307\341\302\245\363<~"
- #"\360\4E\225\361\275\220\235\275M$IF\222D\316\357\357>\313\"\27.\356b"
- #"U\313Dq\314\255O>\307s=\2224Cx\347\3376r\243d\220\2041\265"
- #"F\225<\313\311\362\224\34\221\305\334A"
- #"\327\24\256<\177\211\243\307G$B\216"
- #"c;\274\365\2157\370\331O\256\263\277"
- #"\277\215$)|\360\376\207\324\233\26\222(\"\b9\5\275H\340\373\224kEN"
- #"\216N\330\334Z\347\301\375\207\204AB"
- #"\255Q\"\2122\302(\342\312\301>7\376\376\26\2)\227_\270H\226\345\204Q"
- #"D\32\245\244Y\212Y1\221\256|\273yM\24\5"
- #"Dqu\257\23%\tA\20\211\302\20\337\367h\265\233"
-) 500
-(
- #"\374\315_\376\204\335\v\35\226s\227f"
- #"\253\311\17\376\317\a\253[\n\2\255v"
- #"\235\223\223\1\205B\2014IY\333\350\262\260m\f\263\300h8er:\341\270"
- #"\177\312\271\363;\224*E*V\5M\323\330\332^\247\323ia\224\f\266v\267"
- #"\b\202\220(\212)\26M\262\354\354$\374\345S\304V\273A\253\325\244T61"
- #"\f\235<\317\t\374\0Y\225\271\362\374"
- #"%\0\276\361K/\362?\376\362\26\25"
- #"\253J\251\\\342;\277\377\233|\375\233"
- #"_\343\335o\276\311\372F\227(\214\30"
- #"\235\216\320\215\2?\376\341O\321\r\235"
- #",\3M\321X:\21/]\275\202\246\251<\367\374e\262,\343\312\301EF\303"
- #"1\377\341{\337G\222%>\372\351\rN\207cdY\342\343\237}J\226e|"
- #"z\375\26\313\205\273\32\261\252\251\24\n"
- #"\32G\207\307t7:\317\244k6\265"
- #"\31\236\214\371\326o\374\22\213\371\202~"
- #"\357\4\317\v\351\256wx\375\3157\370"
- #"\367\337\373\v\262,\345\317\377\315\237\361"
- #"\303\367~\300x8\306q=\20\4\302"
- #" D\3234\276\365\353\377\224\217\377\376"
- #"\343\325\267n\300\332z\233\e\37=\341\327\177\373\r<\327c1_\322;\32\0"
- #"9\305\262I\275Yess\235(Z\5/\351\233\377\352\271k\272^\240l\225"
- #"\271|\260\217\357\373\334\374\207{\354]"
- #"\330\242X2\251\325-\306\243\t\225J"
- #"\205\2337\356\360\235\337\3735\3428\346"
- #"\375\37\274\317\306\326\32\325Z\231\367\377"
- #"\337\377\307q\274g\324\22E\21\317\275"
- #"x\205A\177\200 \346\334\275\365\200\177"
- #"\376\307\277\307\366N\27\253f\321\356\224"
- #"\370\374\326\27\234;\277\303\315\ew\370"
- #"\327\177\372G\224\255\"\212,3\267\227"
- #"<y\374\24\303\324\321u\35\341\e\377"
- #"\256\235\227\212&\275\243\23^\375\332K\fONI\323\224"
- #"\351\304&\360C\266v\327I\342\204\356\306\32\233[\353\274\367"
-) 101
-(
- #"\277~\304\325\257\274\310\255\233w\0\320"
- #"\365\2\321\331\311\354\311\243\36\222|v"
- #"\276\360\2\314\242N\275Q\343\350\360\30"
- #"Q\249|\350\261\265[\240\240k\254"
- #"o\256\321;\352\263\266\336\246\337\e\340"
- #":>\347\316o\321l7\270{\373>\27.\236\343t8\346\37"
- #"\1\177\211o\367m\20\16\314\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 7 #"sc-size"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"*"
-0 0 24 3 2 #" ("
-0 0 14 3 11 #"image-width"
-0 0 24 3 1 #" "
-0 0 14 3 10 #"grass-look"
-0 0 24 3 2 #") "
-0 0 14 3 9 #"num-grass"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 42 #";; Functions for building the grass field:"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 2 #" ("
-0 0 14 3 6 #"mt-row"
-0 0 24 3 1 #" "
-0 0 14 3 8 #"num-left"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 5 #"apply"
-0 0 24 3 1 #" "
-0 0 14 3 6 #"beside"
-0 0 24 3 2 #" ("
-0 0 14 3 9 #"make-list"
-0 0 24 3 1 #" "
-0 0 14 3 8 #"num-left"
-0 0 24 3 1 #" "
-0 0 14 3 10 #"grass-look"
-0 0 24 3 3 #")))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 2 #" ("
-0 0 14 3 7 #"make-mt"
-0 0 24 3 1 #" "
-0 0 14 3 8 #"num-left"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 5 #"apply"
-0 0 24 3 1 #" "
-0 0 14 3 5 #"above"
-0 0 24 3 2 #" ("
-0 0 14 3 9 #"make-list"
-0 0 24 3 1 #" "
-0 0 14 3 8 #"num-left"
-0 0 24 3 2 #" ("
-0 0 14 3 6 #"mt-row"
-0 0 24 3 1 #" "
-0 0 14 3 8 #"num-left"
-0 0 24 3 4 #"))))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 9 #"simple-mt"
-0 0 24 3 2 #" ("
-0 0 14 3 9 #"rectangle"
-0 0 24 3 1 #" "
-0 0 14 3 7 #"sc-size"
-0 0 24 3 1 #" "
-0 0 14 3 7 #"sc-size"
-0 0 24 3 1 #" "
-0 0 19 3 7 #"\"solid\""
-0 0 24 3 1 #" "
-0 0 19 3 7 #"\"brown\""
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 2 #"mt"
-0 0 24 3 2 #" ("
-0 0 14 3 17 #"place-image/align"
-0 0 24 3 2 #" ("
-0 0 14 3 7 #"make-mt"
-0 0 24 3 1 #" "
-0 0 14 3 9 #"num-grass"
-0 0 24 3 2 #") "
-0 0 21 3 1 #"0"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"0"
-0 0 24 3 1 #" "
-0 0 19 3 6 #"\"left\""
-0 0 24 3 1 #" "
-0 0 19 3 5 #"\"top\""
-0 0 24 3 1 #" "
-0 0 14 3 9 #"simple-mt"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 11 #";; DATA DEF"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 13 #"define-struct"
-0 0 24 3 1 #" "
-0 0 14 3 5 #"world"
-0 0 24 3 2 #" ("
-0 0 14 3 9 #"mole-time"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 11 #";; Example:"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 6 #"ticks1"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"1000"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 6 #"world1"
-0 0 24 3 2 #" ("
-0 0 14 3 10 #"make-world"
-0 0 24 3 1 #" "
-0 0 14 3 6 #"ticks1"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 16 #";; Tick handler:"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 2 #" ("
-0 0 14 3 12 #"update-world"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 10 #"make-world"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"sub1"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"world-mole-time"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 24 3 4 #"))))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 16 #";; Draw handler:"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 2 #" ("
-0 0 14 3 13 #"render-rotate"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 6 #"rotate"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"*"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"45"
-0 0 24 3 2 #" ("
-0 0 14 3 6 #"modulo"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"world-mole-time"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 24 3 2 #") "
-0 0 21 3 1 #"4"
-0 0 24 3 4 #")) ("
-0 0 14 3 6 #"render"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 24 3 3 #")))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 2 #" ("
-0 0 14 3 6 #"render"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"t"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"world-mole-time"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 11 #"place-image"
-0 0 24 3 1 #" "
-0 0 14 3 9 #"mole-look"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"-"
-0 0 24 3 1 #" "
-0 0 14 3 6 #"ticks1"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"t"
-0 0 24 3 3 #") ("
-0 0 14 3 1 #"-"
-0 0 24 3 1 #" "
-0 0 14 3 6 #"ticks1"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"t"
-0 0 24 3 2 #") "
-0 0 14 3 2 #"mt"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 14 #";; final-state"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"main"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"cmd"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"yes?"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"read"
-0 0 24 3 2 #" ("
-0 0 14 3 17 #"open-input-string"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"cmd"
-0 0 24 3 3 #")))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 6 #"printf"
-0 0 24 3 1 #" "
-0 0 19 3 17 #"\"recording? ~a\\n\""
-0 0 24 3 1 #" "
-0 0 14 3 4 #"yes?"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 15 #"collect-garbage"
-0 0 24 3 3 #") ("
-0 0 14 3 15 #"collect-garbage"
-0 0 24 3 3 #") ("
-0 0 14 3 15 #"collect-garbage"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 4 #"time"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 8 #"big-bang"
-0 0 24 3 1 #" "
-0 0 14 3 6 #"world1"
-0 0 24 29 1 #"\n"
-0 0 24 3 14 #"             ("
-0 0 14 3 7 #"on-tick"
-0 0 24 3 1 #" "
-0 0 14 3 12 #"update-world"
-0 0 24 3 1 #" "
-0 0 21 3 5 #"1/100"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 14 #"             ("
-0 0 14 3 9 #"stop-when"
-0 0 24 3 2 #" ("
-0 0 15 3 6 #"lambda"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"w"
-0 0 24 3 3 #") ("
-0 0 14 3 2 #"<="
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"world-mole-time"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"w"
-0 0 24 3 2 #") "
-0 0 21 3 1 #"0"
-0 0 24 3 3 #")))"
-0 0 24 29 1 #"\n"
-0 0 24 3 14 #"             ("
-0 0 14 3 7 #"record?"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"yes?"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 14 #"             ("
-0 0 14 3 7 #"on-draw"
-0 0 24 3 1 #" "
-0 0 14 3 6 #"render"
-0 0 24 3 4 #"))))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 24 #";; -- run program run --"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 7 #"module+"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"main"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"main"
-0 0 24 3 1 #" "
-0 0 19 3 8 #"\"#false\""
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0           0
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-record.txt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-record.txt
deleted file mode 100644
index c15f3ce040..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-record.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-==================================================================
-WITH ROTATING JUST THE ENTIRE 1000 X 1000 IMAGE
-
-$$ record events and replay events from world0
-----------------------------------------------
-
-cpu time: 565085 real time: 646655 gc time: 38387
-cpu time: 563740 real time: 755095 gc time: 44929
-cpu time: 571815 real time: 904814 gc time: 43534
-
-$$ record all images during the run 
-----------------------------------------------
-
-cpu time: 561001 real time: 601603 gc time: 38273
-cpu time: 573939 real time: 643410 gc time: 44268
-cpu time: 576818 real time: 590559 gc time: 43788
-
-==================================================================
-WITH ROTATING JUST THE MOLE TILE (REALISTIC)
-
-$$ record events and replay events from world0
-----------------------------------------------
-
-cpu time: 41269 real time: 60555 gc time: 946
-cpu time: 40808 real time: 60496 gc time: 769
-cpu time: 41094 real time: 60226 gc time: 772
-
-$$ record all images during the run 
-----------------------------------------------
-
-cpu time: 41168 real time: 60843 gc time: 960
-cpu time: 41100 real time: 60323 gc time: 779
-cpu time: 41227 real time: 60373 gc time: 766
-
-==================================================================
-WITHOUT ROTATING: 
-
-$$ record events and replay events from world0
-----------------------------------------------
-
-cpu time: 64417 real time: 86047 gc time: 520
-cpu time: 63700 real time: 85693 gc time: 303
-cpu time: 64332 real time: 85991 gc time: 446
-
-$$ record all images during the run 
-----------------------------------------------
-
-cpu time: 64386 real time: 86030 gc time: 525
-cpu time: 64308 real time: 85871 gc time: 300
-cpu time: 64532 real time: 86174 gc time: 446
-
-just to make sure it's sane, I ran it again: 
-
-cpu time: 64169 real time: 86067 gc time: 556
-cpu time: 64356 real time: 86016 gc time: 377
-cpu time: 64262 real time: 85955 gc time: 375
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-robby.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-robby.rkt
deleted file mode 100644
index 678652088f..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-robby.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang scheme
-(require 2htdp/universe 2htdp/image "test-aux.rkt")
-
-(define (slow)
-  (let sloop ([n (expt 2 22)])
-    (unless (zero? n)
-      (sloop (- n 1)))))
-
-(define (update-world w)
-  (slow)
-  (- w 1))
-
-(define (render w)
-  (circle 30 'solid (if (odd? w) 'red 'green)))
-
-(testing 
-  (big-bang 10
-    (on-tick update-world)
-    (on-draw render)
-    (stop-when zero?))
-
-  (printf "done\n"))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-whack.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-whack.rkt
deleted file mode 100644
index 258040eb20..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-whack.rkt
+++ /dev/null
@@ -1,1358 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket, or DrScheme version 4.2.3.8 or later
-   to read it.
-
-            http://racket-lang.org/
-|#
- 44 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wxmedia\0"
-4 1 8 #"wximage\0"
-2 0 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 40 #"(lib \"image-core.ss\" \"2htdp\" \"private\")\0"
-1 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 56
-#"(lib \"hrule-snip.ss\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 93 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 23 #"Lucida Sans Typewriter\0"
-0 12 90 -1 90 -1 1 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 38
-#"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-38 #"drscheme:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
-#"drscheme:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31
-#"drscheme:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 8 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 8 24
-#"drscheme:text:ports err\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1 0 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 200 0 0 0 0 0 -1 -1 0 1
-#"\0"
-0 75 23 #"Lucida Sans Typewriter\0"
-0.0 12 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 15 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 4 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 14 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 19 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 22 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 14 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 4 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 4 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1
-22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1
-15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1
-14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1
-19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1
-15 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 20 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 19 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 17 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1
-20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1
-0 1 #"\0"
-0 75 7 #"Monaco\0"
-0.0 14 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 1 #"\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 2 41 #"profj:syntax-colors:scheme:block-comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-35 #"profj:syntax-colors:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 37 #"profj:syntax-colors:scheme:prim-type\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 38 #"profj:syntax-colors:scheme:identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 34 #"profj:syntax-colors:scheme:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:literal\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-33 #"profj:syntax-colors:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 35
-#"profj:syntax-colors:scheme:default\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-colors:scheme:uncovered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 35
-#"profj:syntax-colors:scheme:covered\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 65 105 225 0
-0 0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-0 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 0 1 #"\0"
-0 75 15 #"Lucida Console\0"
-0.0 15 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1           0 480 0 4 3 85
-(
- #";; The first three lines of this file were inserted by DrScheme. The"
- #"y record metadata"
-) 0 0 4 29 1 #"\n"
-0 0 4 3 85
-(
- #";; about the language level of this file in a form that our tools ca"
- #"n easily process."
-) 0 0 4 29 1 #"\n"
-0 0 4 3 183
-(
- #"#reader(lib \"htdp-intermediate-reader.ss\" \"lang\")((modname whack"
- #"-a-mole) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#"
- #"t constructor repeating-decimal #f #t none #f ())))"
-) 0 0 4 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 7 #"require"
-0 0 51 3 1 #" "
-0 0 14 3 14 #"2htdp/universe"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 7 #"require"
-0 0 51 3 1 #" "
-0 0 14 3 10 #"htdp/image"
-0 0 22 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 3 #"req"
-0 0 14 3 1 #"u"
-0 0 14 3 3 #"ire"
-0 0 4 3 1 #" "
-0 0 14 3 7 #"profile"
-0 0 22 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 17 3 1 #";"
-0 0 17 3 51 #"; If the following constant is set to 16 or higher,"
-0 0 4 29 1 #"\n"
-0 0 17 3 66
-#";; the window locks up and it appears that the only events getting"
-0 0 4 29 1 #"\n"
-0 0 17 3 72
-(
- #";; through are tick events.  At 12, it's sluggish but almost accepta"
- #"ble."
-) 0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 17 3 6 #";; I c"
-0 0 17 3 4 #"an n"
-0 0 17 3 3 #"ow "
-0 0 17 3 6 #"do 24 "
-0 0 17 3 2 #"an"
-0 0 17 3 13 #"d it is okay "
-0 0 4 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 4 3 1 #" "
-0 0 14 3 9 #"num-grass"
-0 0 4 3 1 #" "
-0 0 20 3 2 #"24"
-0 0 22 3 1 #")"
-0 0 14 29 1 #"\n"
-0 0 51 29 1 #"\n"
-0 0 17 3 35 #";; world is a (make-world num posn)"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 13 #"define-struct"
-0 0 51 3 1 #" "
-0 0 14 3 5 #"world"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 9 #"mole-time"
-0 0 51 3 1 #" "
-0 0 14 3 8 #"mousepos"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 17 3 74
-(
- #";; Interp: time the mole will remain onscreen, and current mouse pos"
- #"ition."
-) 0 0 51 29 1 #"\n"
-0 0 17 3 11 #";; Example:"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 14 3 6 #"world1"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"make-world"
-0 0 51 3 1 #" "
-0 0 20 3 4 #"1000"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 9 #"make-posn"
-0 0 51 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 51 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 29 1 #"\n"
-0 0 17 3 17 #";; Mouse handler:"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 12 #"accept-mouse"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"m-x"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"m-y"
-0 0 51 3 1 #" "
-0 0 14 3 10 #"event-type"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 3 2 #"  "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"make-world"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 15 #"world-mole-time"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 22 3 1 #")"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 9 #"make-posn"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"m-x"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"m-y"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 29 1 #"\n"
-0 0 17 3 16 #";; Tick handler:"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 12 #"update-world"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 3 2 #"  "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"make-world"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 4 #"sub1"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 15 #"world-mole-time"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 14 #"world-mousepos"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 29 1 #"\n"
-0 0 17 3 25 #";;;; Graphical constants:"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 14 3 6 #"hammer"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 6 #"circle"
-0 0 51 3 1 #" "
-0 0 20 3 1 #"3"
-0 0 51 3 1 #" "
-0 0 19 3 7 #"\"solid\""
-0 0 51 3 1 #" "
-0 0 19 3 8 #"\"yellow\""
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 14 3 9 #"mole-look"
-0 0 51 3 1 #" "
-0 3          29 51 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0           9 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\0(\0\0\0(\b"
- #"\6\0\0\0\214\376\270m\0\0\17\277IDATx\234U\230k\214]Wy"
- #"\206\237\265\326\336\373\334\317\231\273\347\342"
- #"xl\217\355\330\236\304\271\30r\241I(4D\242\210\224[TAT\252B\213"
- #"\250Z\225V \265\245\250J\372\243\5!ZU\324I\243\240\"~\320?\5\251"
- #"R)PZn\201\224\204\220\330\220\200"
- #"\215=c\317\214\347\342\271\234\231s?{\357u\353\217}\306\241[Zgk\237"
- #"}\373\276o\275\353}\337o\213\207?"
- #"3\355\363\371\34*\b\b\303\200\270\0373>1\306\316v\235~?fo\247\201"
- #"\aN\335v\2340\214\350t;\24\2539\312\3452?}~\221\365\327:\264\256"
- #"[Z\365>\2\b\303\220^7\2452T \356\367\31>\224\343\370\203\243\24\306"
- #"<\345J\t\23;\n\305<8(\225K\354\356\356\21\4\1A\240\270\276\264\6"
- #"\2\202 \240Z\253P\e\252\22\214O\214r}y\215\332P\215r\271\210\265\226"
- #"\265\325\rJ\345\"\"\26\234\274\3558\227/-\222\313G4\232M\232\365\16/"
- #"|e\227\e?\325\34\21%\346gG8q|\210[\177c\2040T\b)\20"
- #"B\240\265\243\321N\270\270T\347\207_Z\347r\322\340\360\275%&\356\b(U"
- #"r\324\206j\320\355\22\205\21A\240X"
- #"_\337\344\304\251c\\\372\305\25\216\36"
- #";\314\302\345\253\250@!\336\373\314I"
- #"\337\355\364(\226\n\264\232mJ\345\""
- #"I\234\"\a/\212\343\204\326^\233\273"
- #"\357\277\235\205\237\255s\376\213;\234\316"
- #"\225\270w~\234\a\316\316`\275\0)AJ\204T\b\1\2\201\0\20\240\4\24"
- #"C\305s?Y\345\271\363k<\277\276\306\331\17MP\233\216p\32"
- #"F\307\206YYZ\5\340\370\255s\264\333\35\352;\273T*e\372"
-) 500
-(
- #"\375\30\361\340\223\243\376\310\334,/\375"
- #"\350\2G\216\335\302\322\302*GO\314b\214aj\372\0ZkzI\227\265\363"
- #"=^|j\215O\276\357\24s\207\207\361J!T@\30\5\204A\200\n\2\244"
- #"\224\203\n\2^\340\275\303{\2175\26)<\241\202kKM\376\354\251\3479\371"
- #"\201\n\367\277\373V\256_]\343\300\344"
- #"\4\265\241\32\255f\213\265\325\r\206\206"
- #"k\\\271t\215b)OP*\227\330\336\252s\372\314\t\232\215\26g\336p\n"
- #"\357\34J\5\354l\327Im\302\302\217"
- #"\366\330\370j\3023\37\235\247a$\315~J!\37\21\205\1B\tP\203\300\224"
- #"D\n\1B\200\367\b$\316:\204\24h\353\350\3655C#!\337\370\364#\274"
- #"\357S\337!\312/Q\2365\364z}\326V78q\362\30\336{\272\235\36\0"
- #"\371|\169>1\312\310\350\20\306\30F\307\206i7;\224\312ez\275>\371"
- #"b\216R\276\306\306\177$\374\371\273\16"
- #"\262\\\217I\265\3059\217G\200\a\357"
- #"E6\0\234\307y\360\16\262\303A\260d\347=`R\307\302F\213s\177z\17"
- #"\313_\355\242|H\30\5\314\35?\302\325\205%\16\3362M.\27q\313\3544"
- #"\225j\31\271\267\333 M5\345r\211"
- #"\225\2455\246\17N\321l\264\20B\220"
- #"\352\204\27\276|\203\273\17\344i%\32"
- #"m\f\316\372l\332\234\317^\352<\316"
- #";\274\363X\357p\316\341\234\305:\207w.K\306\373\233{\353<\306Z\366z"
- #"}\368\\\345\322\327c:\235\16+Kk\24\213\5\244\224\24\212y\272\335\36"
- #"\215\275&\262\333\355a\255%I\22\242\\\304\312\322*\245R\221\\!bea"
- #"\e.\264\271o\276L\242\301Z\217\321"
- #"\26c\34\3269\214v\30\347\261\326\242\215%\325\206TkRc\320"
- #"\332\222ZCj,\332z\254u\30\353\320\326b\255\243\333\323\274\365\r"
-) 500
-(
- #"\243\24\27\f\215\235>;\333u\204\24lo\325\351vz\344r\21\225j\5Y"
- #"\e\252b\264\301\30K\24\205\0\\]XBHOc\301RP\202~\352qx"
- #"\274\27\244\326`lv\275\266\26\243S\2646\244iJ\232\32\2224%Itv"
- #"\234\30\214\326h\2551&\273\307\30\207"
- #"\31$\320\350\246\224\2\301\362O\232L"
- #"\35\32\247\323\356\322n\265\251\326*Xk\251\rU\220\373T\22\4\1B\b\274"
- #"\367L\3372E\263\323d\365E\303o\336Y\315\2t\36\353\a\323j\34\316Z"
- #"tjH\22C\22k\3428%\211\23\222~B\322\217\211\343\204$I\210\223\224"
- #"d\20\2543\26\234\305XK\2525\255v\314\273\356\31f\373<tz\35\2228"
- #"fxd\210\255\315\35\242(bc}\213`\237\265{\335\36C\303U\362\371<"
- #"\251N\t|\36\263\231\22\237p8$"
- #"\336\201\302\263\262\325\347\347\327\353<|"
- #"\367\1f\247\207\260\6\234s\203\344\30"
- #"\360_\306\241b\2600\2)\20\336\261\272\325\342\233?^\345\366C\25\16T%"
- #"\3269\372\336\342\353\26a\2\242\274 "
- #"_\310c\214\305Z\213\224\202\300\271\254"
- #"\344J)\366v\233(\325\301y\213O\n\34)(R\v^\200\363\16\353<\271"
- #"@\262\266\323\347\v__\344\276\371q"
- #"\336r\367\24\245B\2041\373\321\r\30"
- #"\32\220B\240\224\240\3353|\357\345u"
- #"~\370\352\26\271@p\327\3412\306z"
- #"\254\5\357a\256\244\220\272Hu4\300"
- #"\30C\251\\\244T*\262\266\272A\260\267\333 \212\"\342Ay;\355.\326i"
- #"\222\246\300\222\5\6`\275$\265\236\261"
- #"Z\310\357\275\355 \347\257v\370\336\205"
- #"M^\370\305.\357y\350 \267\317\215\340\274\307\r(F\n\360Rp\341J\203"
- #"\177\177n\205^lx\350\3161\316\316\325\20\336\322"
- #"\353k\274w8\357\321\316!}\200\224\2\253\35\255"
-) 500
-(
- #"f\233f\243\305\370\304(Am\250zsyom\356\340\234\343\300\324\4k\355"
- #"6\220e\350\274G9\217s\216T;"
- #"\362y\305\257\3379\312\275\363\243|\347"
- #"\225M\276\364\315\253\34\231\336\342#\357"
- #"<6\340=0\326\363\354\327\26\270\266"
- #"\336\341\336\323c<|\367\4\371\0:"
- #"\275\224Tg\364\343\234\317`\340 \227\217P\312\323kw\tT@.\37!\204"
- #"\3100X\337\331\243\337\217\251TJ\f"
- #"\217\324h5\333\244q\2\36\234\361x"
- #"\225=\304;\207\263\36g\35\335\276!\237\vy\367\3\a9{r\214\345\e]"
- #"\234s\200\0042\316;u\250\306\333\357"
- #"\235\346\226\261\34Il\351\367\r\306f"
- #"\317\360\326\341<\b\aB\b\32\273Mr#E\234s\f\217\324h6\332\331\342"
- #"\225R\320\357\307\224\313Er\371\34\235"
- #"v\227\211\351q\322V\2035\277\205%CzF\302\22GF\310\312y\214u\364"
- #"S\303\364h\236\231\261\302\0\16\16|"
- #"\2464o\272m\24\357\34\375$\3\275"
- #"\331't\3470\36\254\363\b\357\311\270"
- #"\1\2420\344\372\316:C\303UJ\345"
- #"\"[7\266\221\235v\227\261\361\21\362"
- #"\205<\365\372.Q1`\341\312\"\327\236\337E\6\31\355x\227=\304y\237U"
- #"\321{\34\356&\206\314\200\e\235\333\377"
- #"\317\341\275\305X\203\266\231\272\230\301\377"
- #"vp\277'3\22\336\273L\2\235\245X+P\e\251p\345\3225\322$%\214"
- #"B\202 \314V\216\220\260w\275G\375"
- #"\242\245\363\212g\375\347{L\217\2078\357\1\221i\254\a;\220+\3472u@"
- #"\n\224R\204\201@\16\354\226\367\36c"
- #",\251\31H\342`\270A\242\336;\234\313\256\23@P\220,}y\e\333\202\311"
- #"#5N\237\231 \ns\31\6\3030due\235\343\267\317\322\276\356\270"
- #"\372\265zVn\221\211\277\24\2\ax\353\260\312\21Z\211\302#\274\5\349"
-) 500
-(
- #"\341i\367\341\277\277\277F\247\327\307X"
- #"K)\237cv\246\306\203\267\r\23\353"
- #"\4\213Gx\201\360\231\\Z\347\301y"
- #"\224\204^\354\351\244\216\355\206e\353\331"
- #"\e\314\377\266f~f\234\244\255)WJ\4\235v\227\203\263Sl\2564h\274"
- #"`\310\221\341<u\260\326\260\0247b\346\306rD\221B\t0&\345\302\225\6"
- #"\224&\tKcX\24\2778\377\"\367\237\310Q=\30\240D@j<W\326\267"
- #"xfEs\372\324)\222~\35\323\335a\262\22425V\306K\350\30\307\345\325"
- #"\36\27\327b\272\211c2'(y\317"
- #"\316w\333\310\267\317\320\3557\221\262\204"
- #"x\364\363s>**\276\3657\213\244"
- #"\313\26\251 \222`\235\300\252\201\24\b"
- #"\301\361\251\34\207F\24u?\311\307>\365Y\36~\370aFje~\360\277\257"
- #"\360\261\307\316rx&\217q\257\323\264"
- #"\302\260ffy\361\302\2\316\303\362\312"
- #"\6\237\371\333\277\346\342\17\376\25\355\24"
- #"\257-\367H\255\347\310xH+v\314:Gj,k]I\373\220\344\241OL"
- #"\22\312\34\201\f\241\261li/[B\5J\n\20\36/\340@Eqr2b"
- #"q\307pi-\346\247\313\236O\376\325"
- #"\373y\317\243\357 \b\202\314X,\376"
- #"\222\335&\24\3136\363\177\3\2226\332"
- #"\260\331\333\30\30C\313\370H\231\371\333"
- #"\356\340\231g\277\210\360\226\371C\5\216"
- #"O\344(\347\340\271\313=\224PT\2"
- #"\301\250\364l.\e\322\255\210\374A\201"
- #"\272\353\375SO\374\327\223\v\310\276G"
- #"(\201\222\36\205\304\1\371Pr\313\220bz$GD\312;>\360G\374\313\27"
- #"\236\341\225W^\341\267\36}\224\335\335"
- #"]\356\270m\236\363WV\370\366\367/\20HK/\261,\337\260\264]\221'?"
- #"\375O\23486\207\367\236\337\371\340\a9\367\3249\236"
- #">w\216\346\316\22g\306\272x!\260\6V\366R\206\21"
-) 500
-(
- #"D\n\214sx\3\257\276\274\307]\357"
- #"\235B<\366\364\355\376\337\376\360UB"
- #"\231e\256D&\356\306z\306\252\212339\202P\360\322\245.Wvb\256\\"
- #"\3729\233[[\314\315\315\241\323\24\251"
- #"\24\265Z\215\37\277\3642\377t\356\363"
- #"\364\373}\36y\333#<\376\370\343H"
- #"\1q\34\23\4\1\213\213\213\214\217\217"
- #"s\346\314\35|\350\367?\214\276\374\25R\27!q\374h\261\307!/(\206\236"
- #"V\342\331Ia\261gy\347\337\37'hluo\272\16qS\332\308\223l"
- #"\312R\3Q\16>\376\361\217s\361\342k\274\365-oa|l\2148\216\1\250"
- #"\357\35403u\200\177\374\334\347\220J"
- #"\21\3071\33376\260\3a\316\347\363"
- #"\274\360\342\213\374\317\267\277\315\233\37z"
- #"3\27_\273\300\221 S\0341@\255\367\36o=\271P\22\31C\4\244=O"
- #"\220\352\364\246\t\361b?\310\f\203\355"
- #"\304\363\263\265\204z\317\221hx\372\237"
- #"\317\361\320\3\17R)\225\330\333\331!"
- #"\325\232\233\233\20\344\302\20\244\304h\215"
- #"\265\366\346\251~\30R*\24p\326r\356\351g\330\335\335\346RA2R\16\230"
- #"\254H\22\233\3315%\5rP\226\20"
- #"2\251\213\202\20G6\265\336\201\6\254"
- #"\313*\232\364-\326I\246\252\212\231\221"
- #"\220^\234\222\313\3479rx\216T\e\2146x<RJ\362\271\2_\377\326w"
- #"\371\317o~\203'>\371\227T\253e"
- #"\214\326x\262\226\340\2367\274\221n\354\330\\\371;\3569Tfe[\263\276g"
- #"\270^\327X\347i\n\230*H\16\25 \n\24\n\203\265\226`\277\n\36\201\20"
- #"\231GSY\3659PU\334>\23\1\2\25\bF\313Ez7\236\343O>\372"
- #"=\16\35\235gr\346\b\371B\211\335\235\r\226\256]bDmqv\252"
- #"\304_|\342w\231>t\232\311\351"
- #"\375\363\353\\[\274D\321\336\340\376\243"
-) 500
-(
- #"U\264\225T\362\212\223S\216^lyy%A%\236\255\3041\21\202\20\22\0"
- #"\235\30\2\37\245\3[\225\31\316Pe"
- #"\213\305\271\f\224\3328\20\2\207\4\341"
- #"(\26\"\336tR\241\365\25\222\353\277"
- #"$\1J\271\200\373\216\344\310\205#8"
- #"\17\217\334\35\321\351.\321\273q\205\226"
- #"\361\24\2\301\331\203!R\16\221\244\16"
- #"k\34\306\202\321\216HB(a\266 \310+\205\366\220\30\217\3\306gk\4\23"
- #"\2635j3\273\264\326\fb\20\334>h\361\36\357\301\343Qdf\324Z\2171"
- #"\236(\f)\26$J\n\204\24x\a\375\304\355\303\2210\f\251\5\341\300<d"
- #"\367\245\332\r\332N\237I\236\3658A&\245\b\300!U\200\351ir\223\2U"
- #"\262\310\306v\233S\217\215\f\f\317@\aD\266`^7\a\f\332\313\314\375j"
- #"\343\320\326\221\32Gb-\251\266hm\a\335\236A\e\203NM\326\355\351L!"
- #"\264\261h\223\231\b\347\262\26\324\r,"
- #"\227\367\340\360\b\251\200L\237\317|\3440q;E\26r\5*\263\222\23\2776"
- #"\212\261\334l\262\31P\215\277\331x;"
- #"\254\a\253A[\213N]\326\373\246\226T;\22cI\323\314q\247iv\234h"
- #"G\242\a\327\16\332Mc|\346r\254\3038;\260hY[\213\200^3%\272"
- #"\277\306\324\251\0226u\4\273\365\6*"
- #"\220\234\371\360\30\233W\233\2647\f\201"
- #"\332\257\340\300&\261\317\2116\333k\t"
- #"j\340\210\245@\b\207\360\"3\323\373"
- #"\233\3/\366\23\315\340\341\34\3\253\226"
- #"M\265\265\29\230;\347\300'\216\326\301<\247?|\200\356^\237j\255B\340"
- #"\275GJE}s\217\273\376x\224\227"
- #"\377a\233\316\216\333o-\262\a\337\4"
- #"\200\300x\217\227\16\347\5\316\200P"
- #"\22\4\310\233\276\370u\303\340\366\3\365.\303\331`v"
- #"\366\203\315\222\367\2036\2\266\16DL\377\301\b\322A"
-) 500
-(
- #"\234\30z:F\26\212\5\224R8\v\371B\310cO\275\221\243\367\17\343<8"
- #"\313\300=\373A\307\226\rm\375\3538"
- #"\324\206T\233l\212\177e$\373\237B"
- #"\214!\265\16\255\35\251\366h\3\326dx66\373|\"bO\353\326\220\371'"
- #"\217#\204\241\335\350\22\4\1C\3035"
- #"\324\201\373\324\23\307o=\212\20 \205\344\306\215M\216\275u\214hD`W!"
- #"\327K3^\222\331j\306\263\277\354\262"
- #"\335~5|\306\241\356W\216\263\4\301"
- #"Y1p\324\274\236\250\365\330\256\243\245"
- #"\24\243\357\256q\327\207\216\241{\t\325"
- #"J\225 \bH\222\224v\273\203\272\353}3O\244iJ\261X \356\307\b!"
- #"\311\205y\302aC\365\336\220\256\n\321"
- #"\333\6\333\266\4\210\254\237\270\211\317A"
- #"\0^\f\272\276\327\207\333?g\375\377"
- #"\v\312%\2368\366$9E\377\316\34\217|\366!\362c\340bG\273\325\245Z"
- #"\253\220$)\315F\v\2555\342\361/"
- #"\335\341\313\2252\313\327\256\337\\\255\0"
- #"\245r\221N\247\313\344-\23\270\24V"
- #"_\332f\365;\353\214\366\363\230n\202"
- #"\362\36\2512\f\356\343\365W7\277\377\343=X\320\36D! 8\\\"\177\246"
- #"\210\232\361D\305\200J\261\314\360\360\20"
- #"7\3267)\226\n\304qB\232\244H)\351v{\210\307\236=\355\373\275>a"
- #"\24\342\234C\247\232\251\231I._\\"
- #"\240T.\21\4\212\332p\25\213a\267"
- #"\321\242\265\326\247\32\24\250\277\332F\355"
- #"\bt\263\207\213\r\312B(%2\0+\300!\260\241 \254\26h\347z\4\263"
- #"\202\3\307&)OE4\353-\362a\236(\n)\24\362\364\3731\355V\a\245"
- #"\24\205B\236\\>\207\265\226\235\355]\202B!\217\20\240\265A\bA\230\vY"
- #"\274|\rc\262\317_\333[u\256/\257\243\224\342\320"
- #"\321\31\222ZB\"\22\336\370\221yv\367\366\20J\320"
-) 88
-(
- #"h\264\251\324\31247\273\324/\246\fM\226\tg\22\306F\206I\23\315\336N"
- #"\203\221\241!t\242\t\\\310Hm\230N\273K}{\227(\27\321\330m11"
- #"9\306\330\370\bB\b\366v\et:]j\265\n\377\a\236"
- #"\235\2\375mi\4d\0\0\0\0IEND\256B`\202"
-) 0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 14 3 10 #"grass-look"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"put-pinhole"
-0 0 51 3 1 #" "
-0 3          31 51 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          10 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\0(\0\0\0(\b"
- #"\6\0\0\0\214\376\270m\0\0\21\300IDATx\234=\230\331\217\34\211}"
- #"\337?uwU\365Q}\367\364\334\34rx\314\236\334\325J{Jk\371H,"
- #"\310\27\344+p`\310F\202 ~\260_\374\224\27\"\17\371\a\364\22\4\360S"
- #"\20\344\200a#\216rm$mV\226\245\365.\315].\271\344\222\\\222\303a"
- #"OO\367\364U\335]\367\351\207\36\261"
- #"^\v\5\374\352\367\373\376\276\307O\370"
- #"\265\357\355\345A\20bU\313H\222D\30F\354\356m\263\230/\231Nf\314\355"
- #"\5\213\371\222f\253N\24\305\244iJ"
- #"\357\311\200\257\275u\225\351d\206a\352"
- #"\210\242\210a\32\364{\3fS\233f"
- #"\253\316\243/\217\250\325+\344y\316\245"
- #"\203}~\376|\374\263O8\351E\374\342\257>O\251\\\342t8\"K3\232"
- #"\355\6\207\217\216\330\273\260K\340\a\334"
- #"\377\342!\242( \354\375\v\362?\370"
- #"\356o\362?\377\373{\24\313&\212\242"
- #"\260\261\331EVd\306\243\t\313\205C\24\305$qL\275Q\243Z\263(\226\212"
- #"<\270\367\220\311h\306\305+{,\27\16s{\301\333\337x\235\321h\202\263t"
- #"\330;\277K\24\307Da\304r\351\0"
- #"\220&)\212\252\260\276\336A\224$\376"
- #"\313\177\374k\252\2652f\321$\bB\352\215*\273{\333<\372\362\220$N\30"
- #"\217\246\b\177\3627\357\344\337\377\353\37"
- #"\363\366\273/\361\364\250O\241\240\261\273"
- #"\267\r\300pp\312\334^\260\276\261\306\243/\17\251XeN\ac\362<\307Y"
- #"\372\374\301\37}\207\277\372\257\337\247\331"
- #"\256s\360\374%>\370\341Oy\375\355WI\222\224\345bI\226et7\326\230"
- #"\333\213g\0354M\203;\267\357\221\246){\27v"
- #"i\267\233\304IB\222$\234\34\17x\357\373\267\250"
-) 500
-(
- #"T\341\215w^b\271t\220\322\215\321\265<K\350n\264q]\2178N\350\35"
- #"\35\23G\21\206\2413\233\330\364{C.\37\354\343,]\3224E\323\v\304Q"
- #"\314\217\336\273\305?\373\303o\261\276\261"
- #"\306lf\223e\31\207\217\216h4\353"
- #"\250\232J\357\250\217,\313H\222D\236"
- #"\347\0\374\354o\257\323h\326\220$\tQ\24q]\17g\351\20\370!\375\343\1"
- #"\337\376\255w(Wt\246\23\233(\212"
- #"\221\253\365\nq\234\20E1\206\241\363"
- #"\372[\257\1\360\321\207\377\200\256\353l"
- #"n\257\323\357\r\320\r\235\235s[|\370\223\353DQL\255^\341\235_x\216"
- #"\a\367\37\242\353:Y\226Q\3205\322"
- #"\264\310\203{\217\320\365\2\227\17\366\231"
- #"Mm\222$A\222$\314\242\211\242\310"
- #"\210\222H\263\335x\206\265\237\27\277\261"
- #"\325\345\223\353\237\341\271\36\333\273\233D"
- #"Q\214\360\335\377\374\225\334\367}\306\243"
- #")i\2322\354\217Q5\205J\265L\255n\241i*\206i\360\243\377\373\21\377"
- #"\344\333o\1p\373\346\35\336\374\372\327"
- #"\370\273\17>\244\273\321\341\306Gw\350n4X\314\35\332kM&\243)\255N"
- #"\203\a_<\341\352k\a$IJ\30\204\224+%\332\235\26\213\305\222R\251\310"
- #"t2C+h\24\n\32\256\353\361\360\301!\262,q~\377\34O\36?\245T"
- #".\"\374\356_\34\344\0\222$\241\252*wn\337C\24ETU\341\360\341\230"
- #"\257\377\342\313\344yN\30F\344y\316"
- #"\361\323\23\236\177\351\n\267>\275\303\301"
- #"\v\227\350\35\365\21\4\201\331\324f\357"
- #"\302\16\247\3031\233\333\353|\364\323O"
- #"0\314\2\257\275~\225<\317\31\16F\b\202@\253\335\340t8F\222D6\267"
- #"7\270}\363.\222$\3428.\233[\3534\333\r\36|\361\220\345\322a"
- #":\266\221^\374\255\265k\0\236\3473\36M(\227\213\244iJ\232\246H"
-) 500
-(
- #"RN\263]'I\22\26s\aEU\310\262\fY\226\310s\230Mm\4A@"
- #"Qd\n\5\rQ\24I\342\204R\271H\222$(\212L\265f1\31OI\323"
- #"\fE\221I\223\24Q\24\250\326\252\330"
- #"S\233\351tF\273\323\"\216\343g\243"
- #"\236\333\v\3428\241\331\252!\aA\310ljcU+\b\202@\30Fg\30\263"
- #"\260gKfS\233b\311$\317s\306\243)\353\e\35\354\331\34Y\226\360<\37"
- #"\303\320)\225\213\344y\316b\276D\222"
- #"Dt\275\200\246\251X\325\nQ\0301\36MQ\24\5\331*\341\272\36\205\202F"
- #"\222$\4A\300tl\223\304\t\202(\3428\36q\24S*\27)W\212\24\n"
- #"\5\304~o\200i\32\230\246\1\300\311\361)q\24\243\0254\332k\r\246\23\e"
- #"\3234\2517\252\224\313E\3020\242T"
- #".\342\373\1\335\3656Y\226a\317\346"
- #"\317 0\267\27\364\236\366I\222\224\376\361\200\311xJ\275Q#\216cDQ$"
- #"MSDQ\344\356\31\224:\335\26\313"
- #"\271\213\242\310\344Yv\366^\240\273\276"
- #"\306d<E\252^\315\257\275\360\362\1\303\301)\17\276x\312\363/]d}\263"
- #"K\277w\362l\363F\247\23\362,c\261pX\316\227\250\232\212=[\340\271\36"
- #"Y\236\21\307\t\272\241S\3205\242(\306u}\232\255:\256\343!\b\"\366l"
- #"\216\242(\317\260-\212\"\25\253\314b\276$\212b.^>\217\353x\230Ec"
- #"\5\223$\5\300\266\27\210{\373\333<\270\367\20EUh\257Y\350z\1\263\250"
- #"\3\20G1\273{\333\4~\300\334^\240\353\5TMe:\2661\213\6I\222"
- #"\220\245\31\345r\211\243\307=\6\375S"
- #"t\275@\22\307\364\216\372di\6@\236eH\222\304\351`D\251\\\"\317s"
- #"\254j\5\253Z\301\367|\3020D\226%d"
- #"E\306uW\205\16\a#\312\225\22r\261h\""
-) 500
-(
- #"\3132\242(0\35\317Q\324>W\236\273D\236\3474Zu\6'C\256~\345"
- #"E\362<\307\236\331\314\355%\202.\20"
- #"\3071a\20Q\337\2501\34\2140\212\3063*\t\303\350\31\320\223$\241\323m"
- #"3\350\17\2517j(\212B\256\347\374"
- #"\335\a\37\321\335h\223\246\253\t\344y"
- #"\216(\212\310\262\214\357\ah\5\25I\22\21\3030BQd\236<\356a\26u"
- #"\366.\354\"\b\260wa\27{6'\3132\36>x\314\341\243#\356\337}\264"
- #"\332\364J\t\263hR\3205\312\225\22"
- #"\316\322\347\345W^\0\340\351\223c\302"
- #" DU\25\254j\205F\263\316\326\366"
- #"\6\252\246R\253W\271\373\371}\346\366"
- #"\202r\245\310r\341\20G1\213\371\22"
- #"\317\363\211\302\210$I\20E\221F\263"
- #"\316b\356 \275\362;\e\327\216{'"
- #"\234\236L\371\205_y\eY\226\370\374"
- #"\326=\266\266\327\211\242\bY\226Y."
- #"\34\362<C+\250\314m\207\365\315\16"
- #"\25\253L\305*\263\\\272\210\242\210\246"
- #"\251\214G\23\\\307#\212b6w\326\231Mf$Ir\266h\6\243\323\361\252"
- #"\203y\316\336\205]\3428F\325T\fS'\216\23\262,G\222$\234\245\203 "
- #"\bh\5\rY\325TDQD\24\5\202 @U\25*V\231\e\37\337\244\331"
- #"n\20\205\21\323\261\315W^\177\tY"
- #"\226q\35\217\273\267\277\244\275\326\340t"
- #"8\302u|\32M\213{w\37\220\3479\252\252\20\307)\272^\240Z\263\220d"
- #"\211\345\302!\313\24\262,\347\305\253\317"
- #"\341{>\177\373\376\207\274\362\332\213\244"
- #"i\212=\233\243i*\235n\233,\315\30\16F\330\2639[\333\eHW\177{"
- #"\343Z\22'\324\352\25\202 @\24$*V\t{6\247\337\e\342:\36V\255"
- #"L\265Za6\265\251\326,\232\255:A\20\221g9"
- #"FQg<\232\341.\3\2420FQd\3428>\303"
-) 500
-(
- #"hH\226e|\363\227\277\316\347\267\357\21G1\256\3432\36M\251\325-\6'"
- #"\247t7\326\330\336\331d2\231\221&)Y\226R,\232x\236\217 \bH\372"
- #"e\367Z\265^ec\263K\232d\fNN\231Nl$I\244\325i\0\2k"
- #"\335\26\206\251\363\340\336!V\265\314t"
- #"b\223\347\31\212\252\322l\325\361=\237"
- #"R\331\240\325ip:\230P\261\212T*e\234\245\313\302^\"\313\22\256\353Q"
- #"*\27Y.]\262,\5\4\6\375\21\252\246\340:.\366l\301\340xH\226\347"
- #"DQDvFk\322\333\337\335\277vr< \a\32\315:\375\336\200\212Ub"
- #"\377\342\371\225S6\f \243P\320\310"
- #"\363\214(\212\317\n\314\231N\246|y"
- #"\357\204\356F\203\235s[\310\262D\305*\242j\5*V\tA\20h\2575\371"
- #"\364\372\347\354]\330\346\352\253/\362\350"
- #"\313C|/@\325T\366/\355q\373\323{\244YJ\305*\23\3071\25\253L"
- #"\24\306\b\202@\232fH\277\372\247\257"
- #"\\\e\234\f\321\n\32\276\347\23E!\223\361\24UU9:<b{w\325\376"
- #"\2337\356S*\353,\227\36V\265D\222\2444\2325Z\35\213\271\275\244b\225"
- #"\371\361\17oQkT8z\334\303\367Wd\255(2\305\322\212\354\1\372\307\3"
- #"\332\235&\273{;h\5\r\243\270\262j\253\361{H\222\204\246\251g\324'\""
- #"5\277\312\265\316Z\233+\317]<\263;2\262\242q:\34\323\352\264\21E\211"
- #"\303GO0\f\203j\315\302s=DQ\344t0\341\340\205K\b\202\310h8"
- #"A\323d\332k\26\236\347\263\275\333\345\213\333}\252u\23YV\220d\231~o"
- #"\200Q\3241\f\235\336\321\tfQ\347\372\2077\261je\2043\211\235\214=D"
- #"![\21\266\343r\341\342\36\322\205_\261\256"
- #"!p\246\245\31\272\241\243i\32\345J\31\323"
-) 500
-(
- #",p:\34\323]os\365\325\347\370\344\372g\354]\330E\24\5\372O\207\324"
- #"\352\25\246\23\eE\225Q\24\205\212U"
- #"\241\331\254\343\373!\325\272\301\334^P"
- #"\253W\250\325\353t\272-\310s&g\0360\317s:\335\26\237\335\270OAW"
- #"\211\243\230\213\a;L'6\263\311|\245Tq\202\264\366\246rmm\275\303\215"
- #"\217n\22\370\1\315V\3MS\231\214"
- #"\2478\216\313\326\316\6\245r\221'\207"
- #"=~N\352\222$\221\2461\236\27\260"
- #"\265\275\301|\276D\24E\4Q\340\350"
- #"\260\217a\26\350\254\265\210\242\30\317\363"
- #"I\323\204v\273\305\223\303\247\224+%\252\265U\332[\353vh\266,TM\245"
- #"\336\250\322Yk\363\370\341\21\315v\235"
- #"Z\335\302q\\\244\356\233\312\265R\311"
- #"$\212cj\365*\323\311\214 \b\260gs\254j\31Y\226\t\303\bg\351 "
- #"\2122y\266Jf\203\376)\305\222\301b\341\340{>\216\343\242\252\n99\335"
- #"\215\3163\v\267R#\210\343\210V\273"
- #"\311\370tL\24\256\322\336I\177\205}"
- #"\327\361\230\214&<y\364\224<\317\271"
- #"|p\1Y\226\250\325\253\210\333\273\e\370\276O\226\345L'\253\3740\36M1"
- #"L\35Y\226\t\202\200/\356<\240\240\27\20\204\34Q\2248\35\216)WV\213"
- #"\262\230/\21E\tI\222q]\237\321p\202=\233\223\304\t\237}r\227j\255"
- #"J\222$x\256O\24\306\344\271\200\242(X\3252\v{\311\350tB\232\246\30"
- #"\246\201Y4h\266\353\210\242\310b\276"
- #"d2\236\256\2648\216R\254j\231R\311<\v\341:Y\226\223\246)\256\343\261"
- #"\265\263A\34G\344\271\200\343\270\204A"
- #"\204\242\256\272\331\3564q\226\16\252\246"
- #"\242(2\25\253\204\252*\4A\210\347\6H\222D\305*\243\25\n\364"
- #"\236\366\320u\235$\211\211\242\230K\a\347y\353\235\257R\256\2240L\35"
-) 500
-(
- #"\3034\320\365\2\307\275\23\34\307%\b"
- #"B\304\300\17\311\262\4\337\v\320\r\235"
- #"\265n\233\205\275\304s}\322$\245\337\e\"\313\22a\20\23\4>V\265\202a"
- #"\26\210\302\30I\226Y\314\27\30\246\376,\367\26K&A\20P*\2278\177q"
- #"\e\327\361V?\266\\\222\304)\216\343 \212\"q\24#I\22\363\371\2028\212"
- #"9|\370t\25i\v\332\252\243\206N\271RB\214\242\b\255P\300u\\\6\375"
- #"\341\231L%\4~\300\341\243\36/\274"
- #"|\200\353\270\b\2\214\6\23\306\247S\\\307CQUL\263H\226\201,KH"
- #"\222H\236\347\370~\300t2g6\265i\265\233dY\202\347.\317\212.\"I"
- #"\3423\31\213\242\230O\256\177F\20\204"
- #"\354_\336c\347\334\26a\20\262\261\331"
- #"\245V\257b\317\346\210V\265\2\b\b\202@\263\335\340\341\375CTU\3010u"
- #"4MA7\n\204aJ\20Dl\355\256\343,\35$I\3044\rdEB\24"
- #"A\20\4\26\366\2224\315\20E\201Ri\25\274N\372\247t7:Tk\26\0"
- #"Y\226\261sn\v\317]\25\370\364\3111fq\225wdY\302uV\316HV"
- #"d\216\236\34\263sn\vq:\261\211"
- #"\302\210b\251\210a\350T\353\26\312\231\2273K&?\370\337?\301Y:\314&"
- #"sJ\345\"\316\322'I\4\3224\341\370\250\377\314p\252\232\302d4\303u<"
- #"\252\265\n\255v\203\223\343\23|/8"
- #"\343Xp\35\27\327q\331\335\333\"\3132\352\215*Vue\333\312\2252Q\264"
- #"Jv\223\361\224$\216\261\252\25\244\363"
- #"\277\\\2716\31O\261\2542\276\347\3"
- #"\2\363\331\234(\212\361\275\200\347_\276"
- #"H\30\206\344\371\312\26Uke\2420"
- #"\3050Uj\315\32\316\302\241\337\263\331\277\274K\30\370\244\311j\271"
- #"\nz\201\354L\273\2535\2138N(\226L\346\366\342Yp2L}"
-) 500
-(
- #"\345\320\1A\340\314t\24\31\217\246\264"
- #":M\246\223\31\322\273\377\362\312\265O>~\314ra3\235\314Y.\34Z\235"
- #"\6\343\341\214bI\347\235w\337\244\337"
- #"?\241\331j\220$)y\16\215\246\205\357\207DaD\243YG\24S\16\37\36"
- #"\263\267\277\213a\32<\376\362\210f\273"
- #"\201n\350\370\276\217(\211t\326Z\b"
- #"\202\2602\265\256\217\357\373,\27\16a"
- #"\30b\230\6w>\273\217\357\373\254o"
- #"\254\201\300*\346\236N\220eY\346\265"
- #"7\366W\256Y\0Q\20\250\326,\352\325*3\333\246\331j\340\314W\324\" "
- #"\340-=Z\235&\375\336\20\323\324y\370\340\220w\336\375*\267n\336%\n#"
- #"t\323$\216s\352\215\32\236\353Q*"
- #"\231\314\347\v\2420\242\177|\202\263\364"
- #"\2507\253$I\212\347z\254u\333\210\222H\331*R\255Y\224\312ETM%"
- #"I\22\342(F\354\35\35\23\305\21[\233\353\324\353\26\265Z\205,KQt\225"
- #"\235\363;\374\267\377\364W\34\37\215\221D\21I\2218wq\233\303\307=^}"
- #"\375\25n\177:F\310\341\307?\372\220"
- #"\265\365\16\222,\361\371\315;\\:\330"
- #"\345\311\343\36K\307\341\302\245\363<~"
- #"\360\4E\225\361\275\220\235\275M$IF\222D\316\357\357>\313\"\27.\356b"
- #"U\313Dq\314\255O>\307s=\2224Cx\347\3376r\243d\220\2041\265"
- #"F\225<\313\311\362\224\34\221\305\334A"
- #"\327\24\256<\177\211\243\307G$B\216"
- #"c;\274\365\2157\370\331O\256\263\277"
- #"\277\215$)|\360\376\207\324\233\26\222(\"\b9\5\275H\340\373\224kEN"
- #"\216N\330\334Z\347\301\375\207\204AB"
- #"\255Q\"\2122\302(\342\312\301>7\376\376\26\2)\227_\270H\226\345\204Q"
- #"D\32\245\244Y\212Y1\221\256|\273yM\24\5"
- #"Dqu\257\23%\tA\20\211\302\20\337\367h\265\233"
-) 500
-(
- #"\374\315_\376\204\335\v\35\226s\227f"
- #"\253\311\17\376\317\a\253[\n\2\255v"
- #"\235\223\223\1\205B\2014IY\333\350\262\260m\f\263\300h8er:\341\270"
- #"\177\312\271\363;\224*E*V\5M\323\330\332^\247\323ia\224\f\266v\267"
- #"\b\202\220(\212)\26M\262\354\354$\374\345S\304V\273A\253\325\244T61"
- #"\f\235<\317\t\374\0Y\225\271\362\374"
- #"%\0\276\361K/\362?\376\362\26\25"
- #"\253J\251\\\342;\277\377\233|\375\233"
- #"_\343\335o\276\311\372F\227(\214\30"
- #"\235\216\320\215\2?\376\341O\321\r\235"
- #",\3M\321X:\21/]\275\202\246\251<\367\374e\262,\343\312\301EF\303"
- #"1\377\341{\337G\222%>\372\351\rN\207cdY\342\343\237}J\226e|"
- #"z\375\26\313\205\273\32\261\252\251\24\n"
- #"\32G\207\307t7:\317\244k6\265"
- #"\31\236\214\371\326o\374\22\213\371\202~"
- #"\357\4\317\v\351\256wx\375\3157\370"
- #"\367\337\373\v\262,\345\317\377\315\237\361"
- #"\303\367~\300x8\306q=\20\4\302"
- #" D\3234\276\365\353\377\224\217\377\376"
- #"\343\325\267n\300\332z\233\e\37=\341\327\177\373\r<\327c1_\322;\32\0"
- #"9\305\262I\275Yess\235(Z\5/\351\233\377\352\271k\272^\240l\225"
- #"\271|\260\217\357\373\334\374\207{\354]"
- #"\330\242X2\251\325-\306\243\t\225J"
- #"\205\2337\356\360\235\337\3735\3428\346"
- #"\375\37\274\317\306\326\32\325Z\231\367\377"
- #"\337\377\307q\274g\324\22E\21\317\275"
- #"x\205A\177\200 \346\334\275\365\200\177"
- #"\376\307\277\307\366N\27\253f\321\356\224"
- #"\370\374\326\27\234;\277\303\315\ew\370"
- #"\327\177\372G\224\255\"\212,3\267\227"
- #"<y\374\24\303\324\321u\35\341\e\377"
- #"\256\235\227\212&\275\243\23^\375\332K\fONI\323\224"
- #"\351\304&\360C\266v\327I\342\204\356\306\32\233[\353\274\367"
-) 101
-(
- #"\277~\304\325\257\274\310\255\233w\0\320"
- #"\365\2\321\331\311\354\311\243\36\222|v"
- #"\276\360\2\314\242N\275Q\343\350\360\30"
- #"Q\249|\350\261\265[\240\240k\254"
- #"o\256\321;\352\263\266\336\246\337\e\340"
- #":>\347\316o\321l7\270{\373>\27.\236\343t8\346\37"
- #"\1\177\211o\367\4 \2,\0\0\0\0IEND\256B`\202"
-) 0 0 51 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 51 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 14 3 7 #"sc-size"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 1 #"*"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"image-width"
-0 0 51 3 1 #" "
-0 0 14 3 10 #"grass-look"
-0 0 22 3 1 #")"
-0 0 51 3 1 #" "
-0 0 14 3 9 #"num-grass"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 29 1 #"\n"
-0 0 17 3 42 #";; Functions for building the grass field:"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 6 #"mt-row"
-0 0 51 3 1 #" "
-0 0 14 3 8 #"num-left"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 3 2 #"  "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"if"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"<="
-0 0 51 3 1 #" "
-0 0 14 3 8 #"num-left"
-0 0 51 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 3 6 #"      "
-0 0 14 3 10 #"grass-look"
-0 0 51 29 1 #"\n"
-0 0 51 3 6 #"      "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"overlay/xy"
-0 0 51 3 1 #" "
-0 0 14 3 10 #"grass-look"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"image-width"
-0 0 51 3 1 #" "
-0 0 14 3 10 #"grass-look"
-0 0 22 3 1 #")"
-0 0 51 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 51 29 1 #"\n"
-0 0 51 3 18 #"                  "
-0 0 22 3 1 #"("
-0 0 14 3 6 #"mt-row"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 4 #"sub1"
-0 0 51 3 1 #" "
-0 0 14 3 8 #"num-left"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 7 #"make-mt"
-0 0 51 3 1 #" "
-0 0 14 3 8 #"num-left"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 3 2 #"  "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"if"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"<="
-0 0 51 3 1 #" "
-0 0 14 3 8 #"num-left"
-0 0 51 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 3 6 #"      "
-0 0 22 3 1 #"("
-0 0 14 3 6 #"mt-row"
-0 0 51 3 1 #" "
-0 0 14 3 9 #"num-grass"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 3 6 #"      "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"overlay/xy"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 6 #"mt-row"
-0 0 51 3 1 #" "
-0 0 14 3 9 #"num-grass"
-0 0 22 3 1 #")"
-0 0 51 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 12 #"image-height"
-0 0 51 3 1 #" "
-0 0 14 3 10 #"grass-look"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 3 18 #"                  "
-0 0 22 3 1 #"("
-0 0 14 3 7 #"make-mt"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 4 #"sub1"
-0 0 51 3 1 #" "
-0 0 14 3 8 #"num-left"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 14 3 9 #"simple-mt"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 12 #"nw:rectangle"
-0 0 51 3 1 #" "
-0 0 14 3 7 #"sc-size"
-0 0 51 3 1 #" "
-0 0 14 3 7 #"sc-size"
-0 0 51 3 1 #" "
-0 0 19 3 7 #"\"solid\""
-0 0 51 3 1 #" "
-0 0 19 3 7 #"\"brown\""
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 14 3 2 #"mt"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"place-image"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 7 #"make-mt"
-0 0 51 3 1 #" "
-0 0 14 3 9 #"num-grass"
-0 0 22 3 1 #")"
-0 0 51 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 51 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 51 3 1 #" "
-0 0 14 3 9 #"simple-mt"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 29 1 #"\n"
-0 0 17 3 16 #";; Draw handler:"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 6 #"render"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 3 2 #"  "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"place-image"
-0 0 51 3 1 #" "
-0 0 14 3 6 #"hammer"
-0 0 51 29 1 #"\n"
-0 0 51 3 15 #"               "
-0 0 22 3 1 #"("
-0 0 14 3 6 #"posn-x"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 14 #"world-mousepos"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 3 15 #"               "
-0 0 22 3 1 #"("
-0 0 14 3 6 #"posn-y"
-0 0 51 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 14 #"world-mousepos"
-0 0 51 3 1 #" "
-0 0 14 3 3 #"wrl"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 3 15 #"               "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"place-image"
-0 0 51 3 1 #" "
-0 0 14 3 9 #"mole-look"
-0 0 51 3 1 #" "
-0 0 20 3 2 #"50"
-0 0 51 3 1 #" "
-0 0 20 3 2 #"50"
-0 0 51 3 1 #" "
-0 0 14 3 2 #"mt"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 51 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 51 3 1 #" "
-0 0 14 3 11 #"final-state"
-0 0 4 29 1 #"\n"
-0 0 4 3 2 #"  "
-0 0 22 3 1 #"("
-0 0 14 3 5 #"profi"
-0 0 14 3 2 #"le"
-0 0 51 29 1 #"\n"
-0 0 4 3 3 #"   "
-0 0 22 3 1 #"("
-0 0 14 3 8 #"big-bang"
-0 0 51 3 1 #" "
-0 0 14 3 6 #"world1"
-0 0 51 29 1 #"\n"
-0 0 4 3 13 #"             "
-0 0 22 3 1 #"("
-0 0 14 3 7 #"on-tick"
-0 0 51 3 1 #" "
-0 0 14 3 12 #"update-world"
-0 0 22 3 1 #")"
-0 0 51 29 1 #"\n"
-0 0 4 3 13 #"             "
-0 0 22 3 1 #"("
-0 0 14 3 8 #"on-mouse"
-0 0 51 3 1 #" "
-0 0 14 3 12 #"accept-mouse"
-0 0 22 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 13 #"             "
-0 0 22 3 1 #"("
-0 0 14 3 5 #"state"
-0 0 4 3 1 #" "
-0 0 14 3 4 #"true"
-0 0 22 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 13 #"             "
-0 0 22 3 1 #"("
-0 0 14 3 7 #"on-draw"
-0 0 51 3 1 #" "
-0 0 14 3 6 #"render"
-0 0 22 3 2 #"))"
-0 0 22 3 2 #"))"
-0 0 51 29 1 #"\n"
-0           0
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/profile-robby.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/profile-robby.rkt
deleted file mode 100644
index cd16989275..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/profile-robby.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang scheme/gui
-(require profile
-         scheme/runtime-path)
-
-(define-runtime-path perform-robby "perform-robby.rkt")
-
-(profile-thunk
- (λ ()
-   (parameterize ([current-eventspace (make-eventspace)])
-     (let ([s (make-semaphore 0)])
-       (queue-callback
-        (λ ()
-          (dynamic-require perform-robby #f)
-          (semaphore-post s)))
-       (semaphore-wait s))))
- #:threads #t)
-
-
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/random-seed-works.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/random-seed-works.rkt
deleted file mode 100644
index 6fc5ddc80d..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/random-seed-works.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket
-
-;; testing the combination of random-seed and world programming 
-;; -----------------------------------------------------------------------------
-
-(require 2htdp/universe 2htdp/image)
-
-(define (main)
-  (random-seed 1324)
-  (big-bang
-   '()
-   #;
-   (on-tick (λ (l) (cons (random 100) l)) 1/100 30)
-   ;; it fails mostly with just time but not always, strange 
-   
-   (to-draw (λ (l) 
-              (text (if (> (length l) 3)
-			"ok"
-			(~a "press a again: " (- 2 (length l))))
-		    222
-		    *color)))
-   
-   (on-key (λ (l ke) 
-             (if (and (key=? "a" ke) (<= (length l) 3)) (cons (random 100) l) l)))
-   
-   (stop-when (λ (l) (>= (length l) 2)))))
-
-(define *color 'blue)
-
-;; -----------------------------------------------------------------------------
-(require "test-aux.rkt")
-
-(testing
-  (check-equal? (main) (begin (set! *color 'red) (main))))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record-stop-when.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record-stop-when.rkt
deleted file mode 100644
index e6db02a991..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record-stop-when.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket
-
-(require 2htdp/universe 2htdp/image (only-in lang/imageeq image=?) 
-         racket/runtime-path
-	 "test-aux.rkt")
-
-(define (draw-number n)
-  (place-image (text (number->string n) 44 'red) 50 50 (empty-scene 100 100)))
-
-(define (draw-stop n)
-  (place-image stop 50 50 (empty-scene 100 100)))
-(define stop (text "STOP" 44 'red))
-
-(define-runtime-path dir "images0")
-
-(testing
-  (unless (directory-exists? dir)
-    (make-directory dir))
-  (parameterize ([current-directory dir])
-    (for-each delete-file (directory-list)))
-  (with-output-to-file (build-path dir "index.html")
-    (lambda ()
-      (displayln "<html><body><img src=\"i-animated.gif\" /></body></html>"))
-    #:exists 'replace)
-  (define final-world 
-    (big-bang 0
-      (on-tick add1)
-      (stop-when (curry = 5) draw-stop)
-      (on-draw draw-number)
-      (record? dir)))
-  (sleep 1)
-
-  (define i (bitmap "images0/i1.png"))
-  (define j (draw-stop 5))
-
-  (unless (image=? (crop 0 0 100 100 i) j)
-    (eprintf "this test needs to be revised -- the way 'world' writes images adds an extra pixel -- think! \n")))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record.rkt
deleted file mode 100644
index e52ab3e5f7..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket
-
-(require 2htdp/universe 2htdp/image "test-aux.rkt")
-
-(define (draw-number n)
-  (place-image (text (number->string n) 44 'red)
-               50 50
-               (empty-scene 100 100)))
-
-;; Nat Nat String -> Nat 
-;; make the clock tick n times, expected expected-n files in dir 
-(define (create-n-images n expected-n dir)
-  (unless (directory-exists? dir)
-    (make-directory dir))
-  (parameterize ([current-directory dir])
-    (for-each delete-file (directory-list)))
-  (with-output-to-file (format "./~a/index.html" dir)
-    (lambda ()
-      (displayln "<html><body><img src=\"i-animated.gif\" /></body></html>"))
-    #:exists 'replace)
-  (define final-world 
-   (big-bang 0
-             (on-tick add1 1)
-             (stop-when (lambda (k) (>= k (- n 1))))
-             (on-draw draw-number)
-             (record? dir)))
-  (sleep 1)
-  (define number-of-png
-    (parameterize ([current-directory dir])
-      (define dlst (directory-list))
-      ; (displayln dlst)
-      (length
-       (filter (lambda (f) (regexp-match "\\.png" (path->string f)))
-               dlst))))
-  (unless (<= expected-n number-of-png)
-    (error 'record? "(~s, ~s) didn't record proper number of images: ~s" n dir 
-           number-of-png)))
-
-(testing
-  (create-n-images 3 3 "images3/")
-  (create-n-images 0 0 "images0/"))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/release.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/release.rkt
deleted file mode 100644
index 9da9ddf117..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/release.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang scheme 
-
-(require 2htdp/universe 2htdp/image "test-aux.rkt")
-
-(define (main r)
-  (big-bang 1
-            (on-draw (lambda (n)
-                       (if (string? n)
-                           (text (string-append "stopped: " n) 11 'red)
-                           (text "hold down a" 11 'blue)))
-                     500 500)
-            (on-tick (lambda (x) (if (string? x) x (add1 x)))
-                     r)
-	    (stop-when (lambda (x)
-			 (if (string? x)
-			     (>= (string-length x) 3)
-			     (>= x 5))))
-            (on-key  (lambda (n key)
-                       (if (string? n)
-                           (string-append n key)
-                           (if (key=? "a" key)
-                               ""
-                               n))))
-            (on-release (lambda (n key)
-                          ;; you can release a key only if it was pressed
-                          (if (key=? "a" key) 
-                              1
-                              n)))))
-(testing (main 1))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/run-movie.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/run-movie.rkt
deleted file mode 100644
index 51a8bd3d29..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/run-movie.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket
-
-(require 2htdp/universe 2htdp/image "test-aux.rkt")
-
-(define (make-images i)
-  (cond
-    [(zero? i) '()]
-    [else (cons (place-image DOT 50 (* 50 i) BACKGROUND) (make-images (sub1 i)))]))
-
-(define DOT (circle 3 'solid 'red))
-(define BACKGROUND (empty-scene 100 400))
-
-(testing (run-movie 1/8 (make-images 8)))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/server-rename.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/server-rename.rkt
deleted file mode 100644
index bb1d0939b0..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/server-rename.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket
-(require (prefix-in uni: 2htdp/universe))
-
-(define (server)
-  (uni:universe 0
-    (uni:on-new cons)
-    (uni:on-msg list)
-    (uni:on-tick add1)
-    ;; Distinct from other tests:
-    (uni:port 19204)))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop-when-crash.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop-when-crash.rkt
deleted file mode 100644
index 8e858ded71..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop-when-crash.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket
-
-;; ---------------------------------------------------------------------------------------------------
-;; the stop-when clause crashes. make sure that it signals a catchable error.
-
-(require 2htdp/universe 2htdp/image)
-
-(with-handlers ((exn:fail? void))
-  (big-bang 0
-            (on-draw (λ _ (empty-scene 500 500)))
-            (stop-when (λ _ (car '()))))
-  (displayln '(*** something went wrong in stop-when crash ***)))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop-when-error.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop-when-error.rkt
deleted file mode 100644
index 07a58adb4f..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop-when-error.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname stop-when-error) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require 2htdp/image)
-(require 2htdp/universe)
-
-(define (render x) (circle x "solid" "blue"))
-
-(check-error (big-bang 10
-                       (to-draw render)
-                       (on-tick sub1)
-                       (stop-when zero? (circle 10 "solid" "red")))
-             "stop-when: expected a function as second argument; given #<image>")
\ No newline at end of file
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop-when-not-boolean.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop-when-not-boolean.rkt
deleted file mode 100644
index f898d1f2aa..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop-when-not-boolean.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket
-
-;; ---------------------------------------------------------------------------------------------------
-;; the stop-when clause crashes. make sure that it signals a catchable error.
-
-(require 2htdp/universe 2htdp/image)
-
-(with-handlers ((exn:fail? (λ (x) 
-                             (unless (pair? (regexp-match #px"return a boolean" (exn-message x)))
-                               (raise x)))))
-  (big-bang 0
-            (on-draw (λ _ (empty-scene 500 500)))
-            (stop-when (λ _ 5)))
-  (displayln '(*** SOMETHING WENT WRONG IN STOP-WHEN NOT BOOLEAN ***)))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop.rkt
deleted file mode 100644
index af3e5bf45e..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/stop.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname stop) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require 2htdp/universe)
-(require htdp/image)
-
-;; on RETURN stop
-
-(define (main debug?)
-  (big-bang ""
-            (on-key (lambda (w ke)
-                      (cond
-                        [(key=? ke "\r") (stop-with w)]
-                        [(= (string-length ke) 1)
-                         (string-append w ke)]
-                        [else w])))
-            (state debug?)
-            (on-draw (lambda (w)
-                       (place-image
-                        (text w 22 'black)
-                        3 3
-                        (empty-scene 100 100))))))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/struct-universe.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/struct-universe.rkt
deleted file mode 100644
index 1c677ec5aa..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/struct-universe.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket
-
-(module shared racket/base
-  (require 2htdp/universe 2htdp/image)
-  
-  ;; Distinct from other tests:
-  (define PORT-NO 19203)
-
-  (struct s (t) #:prefab)
-
-  (provide s s-t (all-from-out 2htdp/universe 2htdp/image)
-           PORT-NO))
-
-(module client racket
-  (require (submod ".." shared))
-
-  ;; Color -> Boolean 
-  (define (client c)
-    (define count 0)
-    (big-bang #true
-              (to-draw (lambda (w) (text (if w "hello world" "good bye") 22 c)))
-              (register LOCALHOST)
-              (port PORT-NO)
-              #;
-              (stop-when (lambda (w) (> count 3)))
-              (on-receive 
-               (lambda (w msg)
-                 (set! count (+ count 1))
-                 ;; send out a prefabed struct to the server 
-                 (make-package (not w) (s count)))))) 
-  
-  (provide client))
-
-(module server racket 
-  (require (submod ".." shared))
-  
-  (define (server)
-    (universe '()
-              (on-new (lambda (w n) (make-bundle (cons n w) '() '())))
-              (on-tick
-               (lambda (w*)
-                 (make-bundle w* (map (lambda (w) (make-mail w 'go)) w*) '()))
-               1
-               3)
-              (on-msg 
-               (lambda (state iw msg)
-                 ;; display the received prefabbed struct's content 
-                 (displayln (s-t msg))
-                 (make-bundle state '() '())))
-              (port PORT-NO)))
-  
-  
-  (provide server))
-
-(module run racket/base
-  (require (submod ".." client) (submod ".." server) (submod ".." shared))
-  
-  (launch-many-worlds (client 'blue) (client 'red) (server)))
-
-(require (submod "." run))
-
-(module+ test
-  (module config info
-    (define random? #t)))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/test-aux.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/test-aux.rkt
deleted file mode 100644
index f36525d18e..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/test-aux.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/gui
-
-(require rackunit)
-
-(provide
-  ;; syntax
-  ;; (testing e ...) creates a top-level test in its own eventspace that
-  ;; shuts down after the tests are run 
-  testing
-  (all-from-out rackunit))
-
-;; -----------------------------------------------------------------------------
-
-(define-syntax-rule
-  (testing e ...)
-  (begin ;; module+ test
-    (parameterize ((current-eventspace (make-eventspace))) e ...)))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/test-docs-complete.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/test-docs-complete.rkt
deleted file mode 100644
index 1d2127f6bb..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote 2htdp/universe))
-(check-docs (quote 2htdp/universe-syntax-parse))
-(check-docs (quote 2htdp/image))
-(check-docs (quote 2htdp/batch-io))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/test-image.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/test-image.rkt
deleted file mode 100644
index 94defecb34..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/test-image.rkt
+++ /dev/null
@@ -1,2838 +0,0 @@
-#lang racket/base
-#|
-;; snippet of code for experimentation
-#lang racket/gui
-(require 2htdp/image
-         lang/posn
-         (only-in lang/htdp-advanced equal~?))
-
-(define images
-  (list (rhombus 10 90 'solid 'black)
-        (rotate 45 (square 10 'solid 'black))))
-
-(define t (new text%))
-(define f (new frame% [label ""] [width 600] [height 400]))
-(define ec (new editor-canvas% [parent f] [editor t]))
-(for ((i (in-list images))) (send t insert i) (send t insert " "))
-(send f show #t)
-|#
-
-(require 2htdp/image
-         (only-in mrlib/image-core 
-                  image%
-                  make-image
-                  image-shape
-                  image-bb
-                  image-normalized?
-                  skip-image-equality-fast-path
-                  make-overlay
-                  make-translate
-                  make-bb
-                  normalize-shape
-                  make-ellipse
-                  make-polygon
-                  make-point
-                  make-crop
-                  crop?
-                  normalized-shape?
-                  image-snip->image
-                  to-img
-                  render-normalized
-                  render-image)
-         (only-in 2htdp/private/image-more
-                  bring-between
-                  swizzle)
-         mrlib/private/image-core-bitmap
-         lang/posn
-         racket/math
-         racket/runtime-path
-         racket/class
-         racket/file
-         (except-in racket/gui/base
-                    make-color
-                    make-pen)
-         racket/port
-         wxme
-         rackunit
-         file/convertible
-         pict/convert
-         (only-in pict pict?)
-         (only-in lang/imageeq image=?)
-         (prefix-in 1: htdp/image)
-         (only-in lang/htdp-advanced equal~?)
-         racket/match)
-
-(require (for-syntax racket/base))
-(define-syntax (test stx)
-  (syntax-case stx ()
-    [(test a => b)
-     (with-syntax ([check-equal? (datum->syntax #'here 'check-equal? stx)])
-       #`(begin
-           ;(printf "running line ~a\n" #,(syntax-line stx))
-           #,(quasisyntax/loc stx (check-equal? a b))
-           (parameterize ([skip-image-equality-fast-path #t])
-             #,(quasisyntax/loc stx (check-equal? a b)))))]))
-
-(define-syntax (test/exn stx)
-  (syntax-case stx ()
-    [(test/exn a => b)
-     (with-syntax ([check-equal? (datum->syntax #'here 'check-equal? stx)])
-       #`(let ([reg b])
-           (unless (regexp? reg)
-             (error 'test/exn "expected a regular expression, got ~e" reg))
-           ;(printf "running line ~a\n" #,(syntax-line stx))
-           #,(quasisyntax/loc stx (check-regexp-match 
-                                   reg
-                                   (with-handlers ((exn:fail? exn-message)) a "NO EXN!")))))]))
-
-;; test case: (beside (text "a"...) (text "b" ...)) vs (text "ab")
-
-;(show-image (frame (rotate 30 (ellipse 200 400 'solid 'purple))))
-
-(define-simple-check (check-close a b)
-  (and (number? a)
-       (number? b)
-       (< (abs (- a b)) 0.001)))
-
-(define-syntax-rule 
-  (round-numbers e)
-  (call-with-values (λ () e) round-numbers/values))
-
-(define (round-numbers/values . args) (apply values (round-numbers/proc args)))
-
-(define (round-numbers/proc x)
-  (let loop ([x x])
-    (cond
-      [(number? x) (let ([n (exact->inexact (/ (round (* 100. x)) 100))])
-                     (if (equal? n -0.0)
-                         0.0
-                         n))]
-      [(pair? x) (cons (loop (car x)) (loop (cdr x)))]
-      [(vector? x) (apply vector (map loop (vector->list x)))]
-      [(is-a? x image%)
-       (make-image 
-        (loop (image-shape x))
-        (loop (image-bb x))
-        (loop (image-normalized? x)))]
-      [(object? x)
-       ;; add a random number here to hack around the way Eli's 
-       ;; tester treats two errors as a passing test
-       (error 'round-numbers/proc "cannot handle objects ~a" (random))]
-      [(let-values ([(a b) (struct-info x)]) a)
-       =>
-       (λ (struct-type)
-         (apply
-          (struct-type-make-constructor struct-type)
-          (map loop (cdr (vector->list (struct->vector x))))))]
-      [else x])))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; predicates
-;;
-
-(test (mode? "outline") => #t)
-(test (mode? 'outline) => #t)
-(test (mode? 'oooutlineh) => #f)
-(test (pen-style? 'solid) => #t)
-(test (pen-style? 'solidd) => #f)
-(test (pen-cap? 'round) => #t)
-(test (pen-cap? 'roound) => #f)
-(test (pen-join? 'round) => #t)
-(test (pen-join? 'roound) => #f)
-(test (x-place? 'left) => #t)
-(test (x-place? 'zuo) => #f)
-(test (y-place? 'top) => #t)
-(test (y-place? 'shang) => #f)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; circle vs ellipse
-;;
-
-(test (ellipse 40 40 'outline 'black)
-      =>
-      (circle 20 'outline 'black))
-(test (ellipse 60 60 'solid 'red)
-      =>
-      (circle 30 'solid 'red))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; width and height
-;;
-
-(test (image-width (rectangle 10 20 'solid 'blue))
-      =>
-      10)
-(test (image-height (rectangle 10 20 'solid 'blue))
-      =>
-      20)
-(test (image-width (rectangle 0 100 'solid 'blue))
-      =>
-      0)
-(test (image-height (rectangle 0 100 'solid 'blue))
-      =>
-      100)
-(test (image-width (rectangle 100 0 'solid 'blue))
-      =>
-      100)
-(test (image-height (rectangle 100 0 'solid 'blue))
-      =>
-      0)
-
-(test (image-width empty-image) => 0)
-(test (image-height empty-image) => 0)
-(test (equal? (above empty-image
-                     (rectangle 10 10 "solid" "red"))
-              (beside empty-image
-                      (rectangle 10 10 "solid" "red")))
-      =>
-      #t)
-
-(check-close (image-width (rotate 45 (rectangle 100 0 'solid 'blue)))
-             (inexact->exact (ceiling (* (sin (* pi 1/4)) 100))))
-(check-close (image-height (rotate 45 (rectangle 100 0 'solid 'blue)))
-             (inexact->exact (ceiling (* (sin (* pi 1/4)) 100))))
-(check-close (image-width (rotate 45 (rectangle 0 100 'solid 'blue)))
-             (inexact->exact (ceiling (* (sin (* pi 1/4)) 100))))
-(check-close (image-height (rotate 45 (rectangle 0 100 'solid 'blue)))
-             (inexact->exact (ceiling (* (sin (* pi 1/4)) 100))))
-
-(test (image-width (scale 4 (rectangle 10 10 'outline 'black)))
-      =>
-      40)
-(test (image-width (rotate 90 (scale 4 (rectangle 10 10 'outline 'black))))
-      =>
-      40)
-
-(test (image-width (scale 4 (rectangle 10 10 'solid 'black)))
-      =>
-      40)
-(test (image-width (rotate 90 (scale 4 (rectangle 10 10 'solid 'black))))
-      =>
-      40)
-
-
-(test (image-width (ellipse 10 20 'solid 'blue))
-      =>
-      10)
-(test (image-height (ellipse 10 20 'solid 'blue))
-      =>
-      20)
-(test (image-width (ellipse 0 100 'solid 'blue))
-      =>
-      0)
-(test (image-height (ellipse 0 100 'solid 'blue))
-      =>
-      100)
-(test (image-width (ellipse 100 0 'solid 'blue))
-      =>
-      100)
-(test (image-height (ellipse 100 0 'solid 'blue))
-      =>
-      0)
-
-(test (image-width (rotate 30 (ellipse 100 0 'solid 'blue)))
-      =>
-      (inexact->exact (ceiling (* (cos (* pi 1/6)) 100))))
-(test (image-height (rotate 30 (ellipse 100 0 'solid 'blue)))
-      =>
-      (inexact->exact (ceiling (* (sin (* pi 1/6)) 100))))
-(check-close (image-width (rotate 30 (ellipse 0 100 'solid 'blue)))
-             (* (sin (* pi 1/6)) 100))
-(check-close (image-height (rotate 30 (ellipse 0 100 'solid 'blue)))
-             (ceiling (* (cos (* pi 1/6)) 100)))
-
-;; zero-sized htdp/image images should also work
-(test (image-width (1:text "" 18 "blue"))
-      =>
-      0)
-(test (image-height (1:rectangle 10 0 'solid "red"))
-      =>
-      0)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  polygon equality
-;;
-
-(test (polygon (list (make-posn 0 0)
-                     (make-posn 10 10)
-                     (make-posn 10 0))
-               "solid" "plum")
-      =>
-      (polygon (list (make-posn 10 10)
-                     (make-posn 10 0)
-                     (make-posn 0 0))
-               "solid" "plum"))
-
-(test (polygon (list (make-posn 0 0)
-                     (make-posn 0 10)
-                     (make-posn 10 10)
-                     (make-posn 10 0))
-               "solid" "plum")
-      =>
-      (rectangle 10 10 "solid" "plum"))
-
-(test (polygon (list (make-posn 0 0)
-                     (make-posn 0 10)
-                     (make-posn 10 10)
-                     (make-posn 10 0))
-               "solid" "plum")
-      =>
-      (polygon (list (make-posn 0 0)
-                     (make-posn 0 10)
-                     (make-posn 10 10)
-                     (make-posn 10 0)
-                     (make-posn 0 0))
-               "solid" "plum"))
-
-(test (polygon (list (make-posn 0 0)
-                     (make-posn 0 10)
-                     (make-posn 10 10)
-                     (make-posn 10 0))
-               "outline"
-               (make-pen "plum" 8 "solid" "round" "round"))
-      =>
-      (polygon (list (make-posn 0 0)
-                     (make-posn 0 10)
-                     (make-posn 10 10)
-                     (make-posn 10 0)
-                     (make-posn 0 0))
-               "outline"
-               (make-pen "plum" 8 "solid" "round" "round")))
-
-;; make sure equality isn't equating everything
-(test (equal? (rectangle 10 10 'solid 'blue)
-              (rectangle 10 10 'solid 'red))
-      =>
-      #f)
-
-;; make sure equality doesn't compare baselines;
-;; these two images have different baselines but
-;; draw the same way (they draw nothing because their
-;; widths are 0)
-(test (equal?
-       (crop 0 0 0 1 
-             (rectangle 0 0 'solid "red"))
-       (crop 0 0 0 1
-             (rectangle 20 20 'solid "red")))
-      => #t)
-
-;; make sure 'white and black match up with color structs
-(test (rectangle 10 10 'solid (make-color 255 255 255))
-      =>
-      (rectangle 10 10 'solid 'white))
-(test (rectangle 10 10 'solid (make-color 0 0 0))
-      =>
-      (rectangle 10 10 'solid 'black))
-
-(test (overlay (rectangle 10 10 'solid "blue")
-               (rectangle 10 10 'solid "transparent"))
-      =>
-      (rectangle 10 10 'solid "blue"))
-
-(test (overlay (rectangle 10 10 'solid 'transparent)
-               (rectangle 10 10 'solid "blue"))
-      =>
-      (rectangle 10 10 'solid "blue"))
-
-(test (overlay (rectangle 10 10 'solid "blue")
-               (rectangle 10 10 'solid "transparent"))
-      =>
-      (rectangle 10 10 'solid "blue"))
-
-;; test zero sized image equalities
-
-(test (rectangle 0 100 'solid 'white)
-      =>
-      (rectangle 0 100 'solid 'white))
-
-(test (rectangle 0 100 'solid 'white)
-      =>
-      (rectangle 0 100 'solid 'black))
-
-(test (rectangle 100 0 'solid 'white)
-      =>
-      (rectangle 100 0 'solid 'black))
-
-(test (rectangle 0 0 'solid 'black)
-      =>
-      (rectangle 0 0 'solid 'orange))
-
-(test (equal~? (rectangle 0 100 'solid 'white)
-               (rotate 90 (rectangle 100 0 'solid 'black))
-               .1)
-      =>
-      #t)
-
-;; test to make sure that image=? is provided from 2htdp/image and
-;; not just built into the teaching languages.
-(test (image=? (rectangle 10 10 'solid 'red) (rectangle 10 10 'solid 'red))
-      =>
-      #t)
-
-(test (image=? (overlay (rectangle 3 1 'solid 'blue)
-                        (rectangle 1 3 'solid 'blue))
-               (overlay (rectangle 1 3 'solid 'blue)
-                        (rectangle 3 1 'solid 'blue)))
-      =>
-      #t)
-
-
-(test (with-handlers ((exn:fail? (λ (x) 'passed)))
-        (begin (image=? 1 2) 'fail))
-      =>
-      'passed)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  testing overlays
-;;
-
-(test (overlay (ellipse 100 100 'solid 'blue)
-               (ellipse 120 120 'solid 'red))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 10 10 (image-shape (ellipse 100 100 'solid 'blue)))
-        (make-translate 0 0 (image-shape (ellipse 120 120 'solid 'red))))
-       (make-bb 120
-                120
-                120)
-       #f))
-
-(test (overlay/xy (ellipse 100 100 'solid 'blue)
-                  -10 -10
-                  (ellipse 120 120 'solid 'red))
-      =>
-      (overlay (ellipse 100 100 'solid 'blue)
-               (ellipse 120 120 'solid 'red)))
-
-
-(test (overlay/xy (ellipse 50 100 'solid 'red)
-                  -25 25
-                  (ellipse 100 50 'solid 'green))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate
-         25 0
-         (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate
-         0 25
-         (image-shape (ellipse 100 50 'solid 'green))))
-       (make-bb 100
-                100
-                100)
-       #f))
-
-(test (overlay/xy (ellipse 100 50 'solid 'green)
-                  10 10
-                  (ellipse 50 100 'solid 'red))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 0 (image-shape (ellipse 100 50 'solid 'green)))
-        (make-translate 10 10 (image-shape (ellipse 50 100 'solid 'red))))
-       (make-bb 100
-                110
-                110)
-       #f))
-
-(test (overlay (ellipse 100 50 'solid 'green)
-               (ellipse 50 100 'solid 'red))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 25 (image-shape (ellipse 100 50 'solid 'green)))
-        (make-translate 25 0 (image-shape (ellipse 50 100 'solid 'red))))
-       (make-bb 100
-                100
-                100)
-       #f))
-
-(test (overlay (ellipse 100 100 'solid 'blue)
-               (ellipse 120 120 'solid 'red)
-               (ellipse 140 140 'solid 'green))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 
-         10 10
-         (make-overlay
-          (make-translate 10 10 (image-shape (ellipse 100 100 'solid 'blue)))
-          (make-translate 0 0 (image-shape (ellipse 120 120 'solid 'red)))))
-        (make-translate 0 0 (image-shape (ellipse 140 140 'solid 'green))))
-       (make-bb 140 140 140)
-       #f))
-
-(test (overlay/align 'middle
-                     'middle
-                     (ellipse 100 50 'solid 'green)
-                     (ellipse 50 100 'solid 'red))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 25 (image-shape (ellipse 100 50 'solid 'green)))
-        (make-translate 25 0 (image-shape (ellipse 50 100 'solid 'red))))
-       (make-bb 100 100 100)
-       #f))
-
-(test (overlay/align 'middle
-                     'middle
-                     (ellipse 50 100 'solid 'red)
-                     (ellipse 100 50 'solid 'green))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 25 0 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 0 25 (image-shape (ellipse 100 50 'solid 'green))))
-       (make-bb 100 100 100)
-       #f))
-
-
-(test (overlay/align 'right
-                     'bottom
-                     (ellipse 50 100 'solid 'red)
-                     (ellipse 100 50 'solid 'green))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 50 0 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 0 50 (image-shape (ellipse 100 50 'solid 'green))))
-       (make-bb 100 100 100)
-       #f))
-
-(test (overlay/align 'right
-                     'baseline
-                     (ellipse 50 100 'solid 'red)
-                     (ellipse 100 50 'solid 'green))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 50 0 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 0 50 (image-shape (ellipse 100 50 'solid 'green))))
-       (make-bb 100 100 100)
-       #f))
-
-(test (beside/align 'top
-                    (ellipse 50 100 'solid 'red)
-                    (ellipse 100 50 'solid 'blue))
-      
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 0 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 50 0 (image-shape (ellipse 100 50 'solid 'blue))))
-       (make-bb 150 100 100)
-       #f))
-
-(test (beside/align 'center
-                    (ellipse 50 100 'solid 'red)
-                    (ellipse 100 50 'solid 'blue))
-      
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 0 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 50 25 (image-shape (ellipse 100 50 'solid 'blue))))
-       (make-bb 150 100 100)
-       #f))
-
-(test (beside/align 'baseline
-                    (ellipse 50 100 'solid 'red)
-                    (ellipse 100 50 'solid 'blue))
-      
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 0 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 50 50 (image-shape (ellipse 100 50 'solid 'blue))))
-       (make-bb 150 100 100)
-       #f))
-
-(test (beside (ellipse 50 100 'solid 'red)
-              (ellipse 100 50 'solid 'blue))
-      =>
-      (beside/align 'center
-                    (ellipse 50 100 'solid 'red)
-                    (ellipse 100 50 'solid 'blue)))
-
-(test (above/align 'left
-                   (ellipse 50 100 'solid 'red)
-                   (ellipse 100 50 'solid 'blue))
-      
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 0 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 0 100 (image-shape (ellipse 100 50 'solid 'blue))))
-       (make-bb 100 150 150)
-       #f))
-
-(test (above/align 'center
-                   (ellipse 50 100 'solid 'red)
-                   (ellipse 100 50 'solid 'blue))
-      
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 25 0 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 0 100 (image-shape (ellipse 100 50 'solid 'blue))))
-       (make-bb 100 150 150)
-       #f))
-
-(test (above/align 'right
-                   (ellipse 50 100 'solid 'red)
-                   (ellipse 100 50 'solid 'blue))
-      
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 50 0 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 0 100 (image-shape (ellipse 100 50 'solid 'blue))))
-       (make-bb 100 150 150)
-       #f))
-
-(test (above (ellipse 50 100 'solid 'red)
-             (ellipse 100 50 'solid 'blue))
-      =>
-      (above/align 'center
-                   (ellipse 50 100 'solid 'red)
-                   (ellipse 100 50 'solid 'blue)))
-
-
-
-(test (underlay (ellipse 100 100 'solid 'blue)
-                (ellipse 120 120 'solid 'red))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 0 (image-shape (ellipse 120 120 'solid 'red)))
-        (make-translate 10 10 (image-shape (ellipse 100 100 'solid 'blue))))
-       (make-bb 120
-                120
-                120)
-       #f))
-
-(test (underlay/xy (ellipse 100 100 'solid 'blue)
-                   -10 -10
-                   (ellipse 120 120 'solid 'red))
-      =>
-      (underlay (ellipse 100 100 'solid 'blue)
-                (ellipse 120 120 'solid 'red)))
-
-
-(test (underlay/xy (ellipse 50 100 'solid 'red)
-                   -25 25
-                   (ellipse 100 50 'solid 'green))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 25 (image-shape (ellipse 100 50 'solid 'green)))
-        (make-translate 25 0 (image-shape (ellipse 50 100 'solid 'red))))
-       (make-bb 100
-                100
-                100)
-       #f))
-
-(test (underlay/xy (ellipse 100 50 'solid 'green)
-                   10 10
-                   (ellipse 50 100 'solid 'red))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 10 10 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 0 0 (image-shape (ellipse 100 50 'solid 'green))))
-       (make-bb 100
-                110
-                110)
-       #f))
-
-(test (underlay (ellipse 100 50 'solid 'green)
-                (ellipse 50 100 'solid 'red))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 25 0 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 0 25 (image-shape (ellipse 100 50 'solid 'green))))
-       (make-bb 100
-                100
-                100)
-       #f))
-
-(test (underlay (ellipse 100 100 'solid 'blue)
-                (ellipse 120 120 'solid 'red)
-                (ellipse 140 140 'solid 'green))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 
-         0 0
-         (make-overlay
-          (make-translate 0 0 (image-shape (ellipse 140 140 'solid 'green)))
-          (make-translate 10 10 (image-shape (ellipse 120 120 'solid 'red)))))
-        (make-translate 10 10 (image-shape (ellipse 100 100 'solid 'blue))))
-       (make-bb 140 140 140)
-       #f))
-
-(test (underlay/align 'middle
-                      'middle
-                      (ellipse 100 50 'solid 'green)
-                      (ellipse 50 100 'solid 'red))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 25 0 (image-shape (ellipse 50 100 'solid 'red)))
-        (make-translate 0 25 (image-shape (ellipse 100 50 'solid 'green))))
-       (make-bb 100 100 100)
-       #f))
-
-(test (underlay/align 'middle
-                      'middle
-                      (ellipse 50 100 'solid 'red)
-                      (ellipse 100 50 'solid 'green))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 25 (image-shape (ellipse 100 50 'solid 'green)))
-        (make-translate 25 0 (image-shape (ellipse 50 100 'solid 'red))))
-       (make-bb 100 100 100)
-       #f))
-
-(test (underlay/align 'right
-                      'bottom
-                      (ellipse 50 100 'solid 'red)
-                      (ellipse 100 50 'solid 'green))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 50 (image-shape (ellipse 100 50 'solid 'green)))
-        (make-translate 50 0 (image-shape (ellipse 50 100 'solid 'red))))
-       (make-bb 100 100 100)
-       #f))
-
-(test (underlay/align "right"
-                      "baseline"
-                      (ellipse 50 100 'solid 'red)
-                      (ellipse 100 50 'solid 'green))
-      =>
-      (make-image
-       (make-overlay
-        (make-translate 0 50 (image-shape (ellipse 100 50 'solid 'green)))
-        (make-translate 50 0 (image-shape (ellipse 50 100 'solid 'red))))
-       (make-bb 100 100 100)
-       #f))
-
-(test (pinhole-x
-       (underlay 
-        (put-pinhole 50 50 (rectangle 100 100 "solid" "gray"))
-        (rectangle 10 10 "solid" "black")))
-      =>
-      50)
-
-(test (overlay/offset (rectangle 10 100 'solid 'red)
-                      0 0
-                      (rectangle 100 10 'solid 'blue))
-      =>
-      (overlay (rectangle 10 100 'solid 'red)
-               (rectangle 100 10 'solid 'blue)))
-
-(test (overlay/align/offset "center" "center"
-                            (rectangle 10 100 'solid 'red)
-                            0 0
-                            (rectangle 100 10 'solid 'blue))
-      =>
-      (overlay/align "center" "center"
-                     (rectangle 10 100 'solid 'red)
-                     (rectangle 100 10 'solid 'blue)))
-
-(test (overlay/align/offset "right" "top"
-                            (rectangle 10 100 'solid 'red)
-                            0 0
-                            (rectangle 100 10 'solid 'blue))
-      =>
-      (overlay/align "right" "top"
-                     (rectangle 10 100 'solid 'red)
-                     (rectangle 100 10 'solid 'blue)))
-
-(test (underlay/offset (rectangle 10 100 'solid 'red)
-                       0 0
-                       (rectangle 100 10 'solid 'blue))
-      =>
-      (underlay (rectangle 10 100 'solid 'red)
-                (rectangle 100 10 'solid 'blue)))
-
-(test (underlay/align/offset "center" "center"
-                             (rectangle 10 100 'solid 'red)
-                             0 0
-                             (rectangle 100 10 'solid 'blue))
-      =>
-      (underlay/align "center" "center"
-                      (rectangle 10 100 'solid 'red)
-                      (rectangle 100 10 'solid 'blue)))
-
-(test (underlay/align/offset "left" "bottom"
-                             (rectangle 10 100 'solid 'red)
-                             0 0
-                             (rectangle 100 10 'solid 'blue))
-      =>
-      (underlay/align "left" "bottom"
-                      (rectangle 10 100 'solid 'red)
-                      (rectangle 100 10 'solid 'blue)))
-
-(test (empty-scene 185 100)
-      =>
-      (crop 0 0 185 100
-            (overlay (rectangle 185 100 'outline (pen "black" 2 'solid 'round 'round))
-                     (rectangle 185 100 'solid 'white))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  testing normalization
-;;
-
-(test (normalize-shape (image-shape (ellipse 50 100 'solid 'red)))
-      =>
-      (make-translate 25 50 (make-ellipse 50 100 0 255 "red")))
-
-(test (normalize-shape (make-overlay (image-shape (ellipse 50 100 'solid 'red))
-                                     (image-shape (ellipse 50 100 'solid 'blue))))
-      =>
-      (make-overlay (image-shape (ellipse 50 100 'solid 'red))
-                    (image-shape (ellipse 50 100 'solid 'blue))))
-
-(test (normalize-shape (make-overlay
-                        (make-overlay (image-shape (ellipse 50 100 'solid 'red))
-                                      (image-shape (ellipse 50 100 'solid 'blue)))
-                        (image-shape (ellipse 50 100 'solid 'green))))
-      =>
-      (make-overlay 
-       (make-overlay (make-translate 25 50 (make-ellipse 50 100 0 255 "red"))
-                     (make-translate 25 50 (make-ellipse 50 100 0 255 "blue")))
-       (make-translate 25 50 (make-ellipse 50 100 0 255 "green"))))
-
-(test (normalize-shape (make-overlay
-                        (image-shape (ellipse 50 100 'solid 'green))
-                        (make-overlay (image-shape (ellipse 50 100 'solid 'red))
-                                      (image-shape (ellipse 50 100 'solid 'blue)))))
-      =>
-      (make-overlay 
-       (make-overlay (make-translate 25 50 (make-ellipse 50 100 0 255 "green"))
-                     (make-translate 25 50 (make-ellipse 50 100 0 255 "red")))
-       (make-translate 25 50 (make-ellipse 50 100 0 255 "blue"))))
-
-(test (normalize-shape (make-translate 100 100 (image-shape (ellipse 50 100 'solid 'blue))))
-      =>
-      (make-translate 125 150 (make-ellipse 50 100 0 255 "blue")))
-
-(test (normalize-shape 
-       (make-translate 10 20 (make-translate 100 100 (image-shape (ellipse 50 100 'solid 'blue)))))
-      =>
-      (make-translate 135 170 (make-ellipse 50 100 0 255 "blue")))
-
-(test (normalize-shape (image-shape
-                        (beside/align 'top
-                                      (rectangle 10 10 'solid 'black)
-                                      (crop 0 0 5 5 (rectangle 10 10 'solid 'green)))))
-      =>
-      (make-overlay
-       (make-polygon
-        (list (make-point 0 0)
-              (make-point 10 0)
-              (make-point 10 10)
-              (make-point 0 10))
-        255
-        "black")
-       (make-crop
-        (list (make-point 10 0)
-              (make-point 15 0)
-              (make-point 15 5)
-              (make-point 10 5))
-        (make-polygon
-         (list (make-point 10 0)
-               (make-point 20 0)
-               (make-point 20 10)
-               (make-point 10 10))
-         255
-         "green"))))
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  testing rotating
-;;
-
-(test (bring-between 123 360) => 123)
-(test (bring-between 365 360) => 5)
-(test (bring-between -5 360) => 355)
-(test (bring-between 720 360) => 0)
-(test (bring-between 720.5 360) => .5)
-
-(test (equal~? (rotate 90 (rectangle 100 100 'solid 'blue))
-               (rectangle 100 100 'solid 'blue)
-               .1)
-      =>
-      #t)
-
-(test (round-numbers
-       (normalize-shape (image-shape (rotate 90 (rotate 90 (rectangle 50 100 'solid 'purple))))))
-      =>
-      (round-numbers
-       (normalize-shape (image-shape (rotate 180 (rectangle 50 100 'solid 'purple))))))
-
-(test (round-numbers (normalize-shape (image-shape (rotate 90 (ellipse 10 10 'solid 'red)))))
-      =>
-      (round-numbers (normalize-shape (image-shape (ellipse 10 10 'solid 'red)))))
-
-(test (round-numbers (normalize-shape (image-shape (rotate 90 (ellipse 10 12 'solid 'red)))))
-      =>
-      (round-numbers (normalize-shape (image-shape (ellipse 12 10 'solid 'red)))))
-
-(test (round-numbers (normalize-shape (image-shape (rotate 135 (ellipse 10 12 'solid 'red)))))
-      =>
-      (round-numbers (normalize-shape (image-shape (rotate 45 (ellipse 12 10 'solid 'red))))))
-
-(test (round-numbers (rotate -90 (ellipse 200 400 'solid 'purple)))
-      =>
-      (round-numbers (rotate 90 (ellipse 200 400 'solid 'purple))))
-(test (round-numbers (rotate (+ 360 360 90) (ellipse 200 400 'solid 'purple)))
-      =>
-      (round-numbers (rotate 90 (ellipse 200 400 'solid 'purple))))
-
-(test (equal~? (rectangle 100 10 'solid 'red)
-               (rotate 90 (rectangle 10 100 'solid 'red))
-               0.1)
-      =>
-      #t)
-
-(test (equal~? (rectangle 100 10 'solid 'red)
-               (rotate 90 (rectangle 10.0001 100.0001 'solid 'red))
-               0.1)
-      =>
-      #t)
-
-(test (equal~? (rotate 
-                90
-                (overlay/xy (rectangle 20 100 'solid 'purple)
-                            20 0
-                            (ellipse 40 40 'solid 'orange)))
-               (overlay/xy (rectangle 100 20 'solid 'purple)
-                           0 -40
-                           (ellipse 40 40 'solid 'orange))
-               .1)
-      =>
-      #t)
-
-;; make sure rotate can get non-integral arguments
-(test (rotate -90.5 (rotate 90.5 (rectangle 20 100 'solid 'orange)))
-      =>
-      (rectangle 20 100 'solid 'orange))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; scaling tests
-;;
-
-(test (scale 2 (rectangle 100 10 'solid 'blue))
-      =>
-      (rectangle 200 20 'solid 'blue))
-
-(test (scale 3
-             (overlay/xy (rectangle 100 10 'solid 'blue)
-                         0
-                         20
-                         (rectangle 100 10 'solid 'red)))
-      =>
-      (overlay/xy (rectangle 300 30 'solid 'blue)
-                  0
-                  60
-                  (rectangle 300 30 'solid 'red)))
-
-(test (scale 3
-             (overlay/xy (rectangle 100 10 'solid 'blue)
-                         0
-                         20
-                         (overlay/xy (rectangle 100 10 'solid 'blue)
-                                     0
-                                     20
-                                     (rectangle 100 10 'solid 'purple))))
-      =>
-      (overlay/xy (rectangle 300 30 'solid 'blue)
-                  0
-                  60
-                  (overlay/xy (rectangle 300 30 'solid 'blue)
-                              0
-                              60
-                              (rectangle 300 30 'solid 'purple))))
-
-(test (scale/xy 3 4 (ellipse 30 60 'outline 'purple))
-      =>
-      (ellipse (* 30 3) (* 60 4) 'outline 'purple))
-
-
-;; test scaling of bitmaps with alpha (in this case, a completely blank one)
-(let ()
-  (define bmp (make-bitmap 1 1))
-  (define bdc (make-object bitmap-dc% bmp))
-  (send bdc erase)
-  (send bdc set-bitmap #f)
-  (define i (make-object image-snip% bmp))
-  (test (overlay i
-                 (rectangle 1 1 'solid 'red))
-        =>
-        (rectangle 1 1 'solid 'red))
-  (test (overlay (scale 2 i)
-                 (rectangle 2 2 'solid 'red))
-        =>
-        (rectangle 2 2 'solid 'red)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; misc tests
-;;
-
-(test (rectangle 100 10 'solid 'blue)
-      =>
-      (rectangle 100 10 "solid" "blue"))
-
-(test (overlay (rectangle 100 10 'solid (color 255 0 0 0))
-               (rectangle 100 10 'solid (color 0 255 0 255))
-               (rectangle 100 10 'solid (color 0 0 255 0)))
-      =>
-      (rectangle 100 10 'solid (color 0 255 0)))
-
-;; make sure that rotation with a very small negative number doesn't crash
-(test (image? (rotate -0.0000000000000001 (rectangle 10 10 'solid 'blue)))
-      =>
-      #t)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  regular polygon
-;;
-
-;; note: the regular-polygon and the rectangle generate the points in reverse directions.
-(test (round-numbers (regular-polygon 100 4 'outline 'green))
-      =>
-      (round-numbers (rectangle 100 100 'outline 'green)))
-
-(test (swizzle (list 0 1 2 3 4) 2)
-      =>
-      (list 0 2 4 1 3))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  text
-;;
-
-(test (beside/align "baseline"
-                    (text "a" 18 "black")
-                    (text "b" 18 "black"))
-      =>
-      (text "ab" 18 "black"))
-
-(test (round-numbers
-       (image-width (rotate 45 (text "One" 18 'black))))
-      =>
-      (round-numbers
-       (let ([t (text "One" 18 'black)])
-         (image-width (rotate 45 (rectangle (image-width t) 
-                                            (image-height t)
-                                            'solid 'black))))))
-
-(test (text "ab" 18 (make-color 0 0 255))
-      =>
-      (text "ab" 18 "blue"))
-
-(test (beside/align "bottom"
-                    empty-image
-                    (text "please?" 12 "green"))
-      =>
-      (text "please?" 12 "green"))
-(test (beside/align "bottom"
-                    (text "feed me " 18 "red")
-                    (text "please?" 12 "green") empty-image)
-      =>
-      (beside/align "bottom"
-                    (text "feed me " 18 "red")
-                    (text "please?" 12 "green")))
-
-;; make sure this doesn't crash (there was a bug that would be triggered by drawing these guys)
-(test (equal? (scale 0.1 (text "Howdy!" 12 'black))
-              (scale 0.1 (text "Howdy!" 12 'red)))
-      =>
-      #f)
-      
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; triangle
-;;
-
-(test (round-numbers (rotate 180 (isosceles-triangle 60 330 "solid" "lightseagreen")))
-      =>
-      (round-numbers (isosceles-triangle 60 30 "solid" "lightseagreen")))
-
-(test (triangle 40 'outline 'black)
-      =>
-      (regular-polygon 40 3 'outline 'black))
-
-(test (equal~? (rotate (+ 180 45) (right-triangle 50 50 'solid 'black))
-               (isosceles-triangle 50 90 'solid 'black)
-               0.001)
-      =>
-      #t)
-
-(test (equal~? (triangle/ass 90 60 60 'solid 'red)
-               (triangle/sss (* 60 (sqrt 2)) 60 60 'solid 'red)
-               0.001)
-      =>
-      #t)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; square
-;;
-
-(test (square 10 'solid 'black)
-      =>
-      (rectangle 10 10 'solid 'black))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; rhombus
-;;
-
-(test (equal~? (rhombus 10 90 'solid 'black)
-               (rotate 45 (square 10 'solid 'black))
-               0.01)
-      =>
-      #t)
-
-(test (equal~? (rhombus 50 150 'solid 'black)
-               (rotate 90 (rhombus 50 30 'solid 'black))
-               0.01)
-      =>
-      #t)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; lines
-;;
-
-(test (image-width (line 10 20 'black))
-      =>
-      11)
-(test (image-height (line 10 20 'black))
-      =>
-      21)
-
-(test (round-numbers (rotate 90 (line 10 20 'black)))
-      =>
-      (round-numbers (line 20 -10 'black)))
-
-(test (round-numbers (line 20 30 "red"))
-      =>
-      (round-numbers (rotate 180 (line 20 30 "red"))))
-
-(test (round-numbers (line -30 20 "red"))
-      =>
-      (round-numbers (line 30 -20 "red")))
-
-(test (image-width (add-line (rectangle 100 200 'solid 'black)
-                             10 10 90 190 "red"))
-      =>
-      100)
-(test (image-height (add-line (rectangle 100 200 'solid 'black)
-                              10 10 90 190 "red"))
-      =>
-      200)
-(test (image-width (add-line (rectangle 100 200 'solid 'black)
-                             10 10 200 200 "red"))
-      =>
-      200)
-(test (image-height (add-line (rectangle 100 200 'solid 'black)
-                              10 10 200 200 "red"))
-      =>
-      200)
-
-(test (image-width (add-line (rectangle 100 200 'solid 'black)
-                             10 10 300 300 "red"))
-      =>
-      300)
-(test (image-height (add-line (rectangle 100 200 'solid 'black)
-                              10 10 300 300 "red"))
-      =>
-      300)
-
-(test (image-width (add-line (rectangle 100 200 'solid 'black)
-                             -10 10 100 200 "red"))
-      =>
-      110)
-(test (image-height (add-line (rectangle 100 200 'solid 'black)
-                              -10 10 100 200 "red"))
-      =>
-      200)
-
-(test (image-width (add-line (rectangle 100 200 'solid 'black)
-                             10 -10 100 200 "red"))
-      =>
-      100)
-(test (image-height (add-line (rectangle 100 200 'solid 'black)
-                              10 -10 100 200 "red"))
-      =>
-      210)
-
-(test (image-width (add-line (rectangle 100 200 'solid 'black)
-                             100 200 10 -10 "red"))
-      =>
-      100)
-(test (image-height (add-line (rectangle 100 200 'solid 'black)
-                              100 200 10 -10 "red"))
-      =>
-      210)
-
-(test (image-width (add-line (rectangle 100 200 'solid 'black)
-                             100 200 -10 10 "red"))
-      =>
-      110)
-(test (image-height (add-line (rectangle 100 200 'solid 'black)
-                              100 200 -10 10 "red"))
-      =>
-      200)
-
-(let* ([txt (text "H" 24 'black)]
-       [bl (image-baseline txt)])
-  (test (image-baseline (add-line txt 0 0 100 100 'red))
-        =>
-        bl))
-
-(let* ([txt (text "H" 24 'black)]
-       [bl (image-baseline txt)])
-  (test (image-baseline (add-line txt 0 -10 100 100 'red))
-        =>
-        (+ bl 10)))
-
-(test (scene+line (rectangle 100 100 'solid 'black)
-                  10 10 
-                  90 50
-                  "red")
-      =>
-      (add-line (rectangle 100 100 'solid 'black)
-                10 10 
-                90 50
-                "red"))
-
-(test (image-width (scene+line (rectangle 100 100 'solid 'black)
-                               -10 -20
-                               110 120
-                               "green"))
-      =>
-      100)
-(test (image-height (scene+line (rectangle 100 100 'solid 'black)
-                               -10 -20
-                               110 120
-                               'purple))
-      =>
-      100)
-(test (image-baseline (scene+line (rectangle 100 100 'solid 'black)
-                                  -10 -20
-                                  110 120
-                                  'olive))
-      =>
-      100)
-
-(test (add-polygon (rectangle 60 50 'solid 'black)
-                (list (make-posn -10 0)
-                      (make-posn 60 -10)
-                      (make-posn 70 50)
-                      (make-posn 0 60))
-                'outline 'red)
-      =>
-      (overlay/xy 
-       (polygon (list (make-posn 0 10)
-                      (make-posn 70 0)
-                      (make-posn 80 60)
-                      (make-posn 10 70))
-                'outline 'red)
-       10 10
-       (rectangle 60 50 'solid 'black)))
-
-(test (scene+polygon (rectangle 60 50 'solid 'black)
-                  (list (make-posn -10 0)
-                        (make-posn 60 -10)
-                        (make-posn 70 50)
-                        (make-posn 0 60))
-                  'outline 'red)
-      =>
-      (rectangle 60 50 'solid 'black))
-
-(test (add-polygon (rectangle 60 60 'solid 'black)
-                (list (make-posn -10 0)
-                      (make-posn 60 -10)
-                      (make-posn 70 60)
-                      (make-posn 0 70))
-                'solid 'red)
-      =>
-             (polygon (list (make-posn 0 10)
-                      (make-posn 70 0)
-                      (make-posn 80 70)
-                      (make-posn 10 80))
-                'solid 'red)
-             )
-
-(test (add-polygon (rectangle 100 60 'solid 'green)
-                (list (make-posn 70 20)
-                      (make-posn 40 40)
-                      (make-posn 60 60)
-                      (make-posn 5 70)
-                      (make-posn 2 40))
-                'outline 'red)
-      =>
-      (overlay/xy (polygon (list (make-posn 100 50)
-                                 (make-posn 70 70)
-                                 (make-posn 90 90)
-                                 (make-posn 35 100)
-                                 (make-posn 32 70))
-                           'outline 'red)
-                  -2 -20
-                  (rectangle 100 60 'solid 'green)))
-
-(test (scene+polygon (rectangle 60 50 'solid 'black)
-                  (list (make-posn -10 0)
-                        (make-posn 60 -10)
-                        (make-posn 70 60)
-                        (make-posn 0 70))
-                  'solid 'red)
-      =>
-      (rectangle 60 50 'solid 'red))
-
-(test (scene+polygon (rectangle 120 100 'solid 'black)
-                  (list (make-posn 50 40)
-                        (make-posn 70 40)
-                        (make-posn 70 60)
-                        (make-posn 50 60))
-                  'outline 'red)
-      =>
-               (overlay (square 20 'outline 'red) (rectangle 120 100 'solid 'black)))
-
-(test (scene+polygon (rectangle 90 100 'solid 'black)
-                  (list (make-posn 30 10)
-                        (make-posn 100 20)
-                        (make-posn 50 30)
-                        (make-posn 100 40)
-                        (make-posn 30 50))
-                  'solid 'red)
-      =>
-      (place-image/align (polygon (list (make-posn 30 50)
-                                        (make-posn 100 40)
-                                        (make-posn 50 30)
-                                        (make-posn 100 20)
-                                        (make-posn 30 10))
-                                  'solid 'red)
-                         30 10 'left 'top (rectangle 90 100 'solid 'black)))
-
-(test (image-width (scene+polygon (rectangle 90 100 'solid 'black)
-                               (list (make-posn 30 10)
-                                     (make-posn 100 20)
-                                     (make-posn 50 30)
-                                     (make-posn 100 40)
-                                     (make-posn 30 50))
-                               'outline 'orange))
-      => 90)
-(test (image-height (scene+polygon (rectangle 90 100 'solid 'black)
-                               (list (make-posn 30 10)
-                                     (make-posn 100 20)
-                                     (make-posn 50 30)
-                                     (make-posn 100 40)
-                                     (make-posn 30 50))
-                               'outline 'orange))
-      => 100)
-(test (scene+polygon (rectangle 100 100 'solid 'blue)
-                  (list (make-posn 20 10)
-                        (make-posn -10 -20)
-                        (make-posn -20 -10)
-                        (make-posn 10 20))
-                  'outline 'orange)
-      =>
-      (place-image/align (polygon (list (make-posn -20 -10)
-                                        (make-posn 10 20)
-                                        (make-posn 20 10)
-                                        (make-posn -10 -20))
-                                  'outline 'orange)
-                         -20 -20 'left 'top
-                         (rectangle 100 100 'solid 'blue)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  curves
-;;
-
-;; make sure a curve stays roughly in the middle pixels by
-;; covering up a white curve with a thin black bar
-(test (overlay/align 'middle
-                     'middle 
-                     (rectangle 82 2 'solid 'black)
-                     (add-curve (rectangle 100 20 'solid 'black)
-                                10 10 0 1/4
-                                90 10 0 1/4 
-                                'white))
-                      
-      =>
-      (rectangle 100 20 'solid 'black))
-
-;; and then make sure the curve actually draws something ...
-(test (not (equal? (add-curve (rectangle 100 20 'solid 'black)
-                              10 10 0 1/4
-                              90 10 0 1/4 
-                              'white)
-                   (rectangle 100 20 'solid 'black)))
-      =>
-      #t)
-
-(test (scale 2
-             (add-curve 
-              (rectangle 100 100 'solid 'black)
-              20 20 0 1/3 80 80 0 1/3 'white))
-      =>
-      (add-curve 
-       (rectangle 200 200 'solid 'black)
-       40 40 0 1/3 160 160 0 1/3 'white))
-
-(test (rotate 
-       90
-       (add-curve 
-        (rectangle 100 100 'solid 'black)
-        20 20 0 1/3 80 80 0 1/3 'white))
-      =>
-      (add-curve 
-       (rectangle 100 100 'solid 'black)
-       20 80 90 1/3 80 20 90 1/3 'white))
-
-(test (add-curve (rectangle 100 100 'solid 'black)
-                 10 10 0 1/4
-                 90 90 0 1/4
-                 'white)
-      =>
-      (scene+curve (rectangle 100 100 'solid 'black)
-                   10 10 0 1/4
-                   90 90 0 1/4
-                   'white))
-(test (scene+curve (rectangle 100 100 'solid 'black)
-                   10 10 0 1/4
-                   110 110 0 1/4
-                   'red)
-      
-      =>
-      (crop 0 0 100 100
-            (add-curve (rectangle 100 100 'solid 'black)
-                       10 10 0 1/4
-                       110 110 0 1/4
-                       'red)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  bitmap tests
-;;
-
-(test (clamp-1 0 3 5)
-      => 3)
-(test (clamp-1 0 0 5)
-      => 0)
-(test (clamp-1 0 -2 5)
-      => 0)
-(test (clamp-1 0 4 5)
-      => 4)
-(test (clamp-1 0 7 5)
-      => 4)
-
-(test (build-bytes 5 sqr)
-      => (list->bytes '(0 1 4 9 16)))
-
-
-(define onePixel (list->bytes '(255 0 0 255)))
-;(call-with-values (λ () (scale onePixel 1 1 100)) show-bitmap)
-
-(define blue2x1 (list->bytes '(255 0 0 255   255 0 255 0)))
-;(call-with-values (λ () (scale blue2x1 2 1 20)) show-bitmap)
-
-(define blue2x2 
-  (list->bytes '(255 0 0 255       255 0 0 255       255 0 0 255       255 0 0 255)))
-(define gray2x2 
-  (list->bytes '(255 100 100 100   255 100 100 100   255 100 100 100   255 100 100 100)))
-;; Some blue x green checkerboards:
-(define checker2x2 (list->bytes '(255 0 0 255   255 0 255 0
-                                      255 0 255 0   255 0 0 255)))
-(define checker3x3 (list->bytes '(255 0 0 255   255 0 255 0    255 0 0 255
-                                      255 0 255 0   255 0 0 255    255 0 255 0
-                                      255 0 0 255   255 0 255 0    255 0 0 255 )))
-
-
-(test (bmbytes-ref/safe checker3x3 3 3 0 0)   => (list->bytes '(255 0 0 255)))
-(test (bmbytes-ref/safe checker3x3 3 3 1 1)   => (list->bytes '(255 0 0 255)))
-(test (bmbytes-ref/safe checker3x3 3 3 2 2)   => (list->bytes '(255 0 0 255)))
-(test (bmbytes-ref/safe checker3x3 3 3 1 2)   => (list->bytes '(255 0 255 0)))
-(test (bmbytes-ref/safe checker3x3 3 3 0 3)   => (list->bytes '(  0 0 0 255)))
-(test (bmbytes-ref/safe checker3x3 3 3 -1 -1) => (list->bytes '(  0 0 0 255)))
-(test (bmbytes-ref/safe checker3x3 3 3 -1 1)  => (list->bytes '(  0 0 255 0)))
-(test (bmbytes-ref/safe checker3x3 3 3 1 19)  => (list->bytes '(  0 0 255 0)))
-
-#;
-(test (bytes->list (interpolate checker2x2 2 2 1 0))
-      =>
-      '(255 0 255 0))
-
-#;
-(test (bytes->list (interpolate checker3x3 3 3 0 0))
-      =>
-      '(255 0 0 255))
-
-#;
-(test (bytes->list (interpolate checker3x3 3 3 0 1))
-      =>
-      '(255 0 255 0))
-
-#;
-(test (bytes->list (interpolate checker3x3 3 3 0 2))
-      =>
-      '(255 0 0 255))
-
-#;
-(test (bytes->list (interpolate checker3x3 3 3 0.5 0))
-      =>
-      '(255 0 128 128))
-
-(test (image-width (bitmap icons/stop-16x16.png))
-      =>
-      16)
-(test (image-height (bitmap icons/stop-16x16.png))
-      =>
-      16)
-
-(test (let ()
-        (define bmp (make-bitmap 4 4))
-        (define mask (make-bitmap 4 4))
-        (define bdc (make-object bitmap-dc% bmp))
-        (send bdc set-brush "black" 'solid)
-        (send bdc draw-rectangle 0 0 4 4)
-        (send bdc set-bitmap mask)
-        (send bdc set-brush "black" 'solid)
-        (send bdc clear)
-        (send bdc draw-rectangle 1 1 1 1)
-        (send bdc set-bitmap #f)
-        (let-values ([(bytes w h) (bitmap->bytes bmp mask)])
-          bytes))
-      =>
-      (bytes-append #"\377\0\0\0" #"\377\0\0\0"   #"\377\0\0\0" #"\377\0\0\0"
-                    #"\377\0\0\0" #"\377\0\0\0"   #"\377\0\0\0" #"\377\0\0\0"
-                    #"\377\0\0\0" #"\377\0\0\0"   #"\377\0\0\0" #"\377\0\0\0"
-                    #"\377\0\0\0" #"\377\0\0\0"   #"\377\0\0\0" #"\377\0\0\0"))
-
-;; ensure no error
-(test (begin (scale 2 (make-bitmap 10 10))
-             (void))
-      =>
-      (void))
-
-
-(define (fill-bitmap b color [x 0] [y 0] [w (send b get-width)] [h (send b get-height)])
-  (let ([bdc (make-object bitmap-dc% b)])
-    (send bdc set-brush color 'solid)
-    (send bdc set-pen color 1 'transparent)
-    (send bdc draw-rectangle x y w h)
-    (send bdc set-bitmap #f)))
-
-(define blue-10x20-bitmap (make-bitmap 10 20))
-(fill-bitmap blue-10x20-bitmap "blue")
-(define blue-20x10-bitmap (make-bitmap 20 10))
-(fill-bitmap blue-20x10-bitmap "blue")
-(define blue-20x40-bitmap (make-bitmap 20 40))
-(fill-bitmap blue-20x40-bitmap "blue")
-
-(define green-blue-10x20-bitmap (make-bitmap 10 20))
-(fill-bitmap green-blue-10x20-bitmap "green")
-(fill-bitmap green-blue-10x20-bitmap "blue" 0 0 10 10)
-
-(define green-blue-20x10-bitmap (make-bitmap 20 10))
-(fill-bitmap green-blue-20x10-bitmap "green")
-(fill-bitmap green-blue-20x10-bitmap "blue" 10 0 10 10)
-
-(test (image-width (image-snip->image (make-object image-snip% blue-10x20-bitmap)))
-      => 
-      10)
-(test (image-height (image-snip->image (make-object image-snip% blue-10x20-bitmap)))
-      => 
-      20)
-(test (image-baseline (image-snip->image (make-object image-snip% blue-10x20-bitmap)))
-      => 
-      20)
-
-(define (close-enough i1 i2)
-  (define w (image-width i1))
-  (define h (image-height i1))
-  (cond
-    [(and (= w (image-width i2))
-          (= h (image-height i2)))
-     (define b1 (make-bytes (* w h 4)))
-     (define b2 (make-bytes (* w h 4)))
-     (define bm (make-bitmap w h))
-     (define bdc (make-object bitmap-dc% bm))
-     (render-image i1 bdc 0 0)
-     (send bdc get-argb-pixels 0 0 w h b1)
-     (send bdc erase)
-     (render-image i2 bdc 0 0)
-     (send bdc get-argb-pixels 0 0 w h b2)
-     (define diff 0)
-     (for ([x (in-range 0 (bytes-length b1))])
-       (set! diff (+ diff (abs (- (bytes-ref b1 x) 
-                                  (bytes-ref b2 x))))))
-     (define avg-diff (/ diff (bytes-length b1)))
-     (<= avg-diff 16)]
-    [else #f]))
-       
-
-(test (close-enough (rotate 90 (make-object image-snip% blue-10x20-bitmap))
-                    (image-snip->image (make-object image-snip% blue-20x10-bitmap)))
-      => #t)
-
-;; this test case actually fails (but the avg-diff <= 16 above makes it pass)
-;; because the rotated bitmap ends up translated one pixel too far down
-;; (not sure why this is happening)
-(test (close-enough (rotate 90 (make-object image-snip% green-blue-20x10-bitmap))
-                    (image-snip->image (make-object image-snip% green-blue-10x20-bitmap)))
-      => #t)
-
-(test (rotate 90 (rotate 90 (make-object image-snip% green-blue-20x10-bitmap)))
-      =>
-      (rotate 180 (make-object image-snip% green-blue-20x10-bitmap)))
-
-(test (rotate 90 (flip-vertical (rotate 90 (make-object image-snip% green-blue-20x10-bitmap))))
-      =>
-      (rotate 0 (make-object image-snip% green-blue-20x10-bitmap)))
-
-;; there was a bug in the bounding box computation for scaled bitmaps that this test exposes
-(test (image-width (frame (rotate 90 (scale 1/2 (bitmap icons/plt-logo-red-diffuse.png)))))
-      =>
-      128)
-
-;; Rotation by 0 should produce an equivalent object
-(test (rotate 0 (make-object image-snip% green-blue-20x10-bitmap))
-      =>
-      (to-img (make-object image-snip% green-blue-20x10-bitmap)))
-
-(let ([b (freeze (beside (rectangle 4 8 "solid" "blue") (rectangle 4 8 "solid" "red")))])
-  (test (flip-vertical (rotate 90 b))
-        =>
-        (rotate -90 b)))
-
-;; make sure that raw image snips are equal to image snips
-(let ([i1 (make-object image-snip% (collection-file-path "bug09.png" "icons"))]
-      [i2 (make-object image-snip% (collection-file-path "bug09.png" "icons"))])
-  (test (equal? (rotate 0 i1) i2) => #t)
-  (test (equal? i1 (rotate 0 i2)) => #t))
-
-
-;; this test case checks for broken behavior in scaled, translated
-;; bitmaps whereby the translation amount isn't scaled properly so
-;; the bitmap goes in the wrong place (and thus the buggy would
-;; not equate the two images, since the bitmap would be in
-;; the bounding box (where it wasn't supposed to be))
-(let ()
-  (define img (make-object bitmap% 200 200))
-  (define bdc (make-object bitmap-dc% img))
-  (send bdc erase)
-  (send bdc set-brush "black" 'solid)
-  (send bdc set-pen "black" 1 'transparent)
-  (send bdc draw-rectangle 0 0 200 200)
-  (send bdc set-bitmap #f)
-  
-  (test (equal? (place-image (scale .1 (overlay (circle 60 'solid 'red) img))
-                             120 120 
-                             (rectangle 100 100 'solid 'white))
-                (place-image (scale .1 (circle 60 'solid 'red))
-                             120 120 
-                             (rectangle 100 100 'solid 'white)))
-        =>
-        #t))
-
-
-(define-runtime-path u.png "u.png")
-(define u-bitmap (read-bitmap u.png))
-(let ()
-  (define i (rotate 0 (make-object bitmap% u.png 'unknown/mask)))
-  (define t (new text%))
-  (send t insert i)
-  (define bop (open-output-bytes))
-  (void (send t save-port bop))
-  (define bip (open-input-bytes (get-output-bytes bop)))
-  (define t2 (new text%))
-  (void (send t2 insert-port bip))
-  (test (equal? (send t find-first-snip)
-                (send t2 find-first-snip))
-        =>
-        #t))
-
-(let ()
-  (define i1 (rotate 0 (make-object bitmap% u.png 'unknown/mask)))
-  (define i2 (rotate 0 (make-object bitmap% u.png 'unknown/alpha)))
-  (test (equal? i1 i2) => #t))
-
-(define (get-from-file f)
-  (define t (new text%))
-  (send t load-file f)
-  (send t find-first-snip))
-
-(define-runtime-path bmp-5.1.3.rktd "bmp-5.1.3.rktd")
-(let ()
-  (define b1 (get-from-file bmp-5.1.3.rktd))
-  (define b2 (get-from-file bmp-5.1.3.rktd))
-  (test (image? b1) => #t)
-  ;; test that the drawing code doesn't crash (since the images are not
-  ;; eq?, they'll be drawn to be compared)
-  (test (equal? b1 b2) => #t))
-
-(define-runtime-path bmp-5.0.1.rktd "bmp-5.0.1.rktd")
-(let ()
-  (define b1 (get-from-file bmp-5.0.1.rktd))
-  (define b2 (get-from-file bmp-5.0.1.rktd))
-  (test (image? b1) => #t)
-  (test (equal? b1 b2) => #t))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; cropping (and place-image)
-;;
-
-(test (crop 0 0 10 10 (rectangle 20 20 'solid 'black))
-      =>
-      (rectangle 10 10 'solid 'black))
-
-(test (crop/align 'left 'top 10 10 (rectangle 20 20 'solid 'black))
-      =>
-      (rectangle 10 10 'solid 'black))
-(test (crop/align 'center 'center 10 10 (rectangle 20 20 'solid 'black))
-      =>
-      (rectangle 10 10 'solid 'black))
-
-(test (equal~? (crop 0 0 40 40 (circle 40 'solid 'red))
-               (rotate 180 (crop 40 40 40 40 (circle 40 'solid 'red)))
-               0.1)
-      =>
-      #t)
-
-(test (beside/align 'middle
-                    (rectangle 10 10 'solid 'black)
-                    (crop 0 0 10 10 (rectangle 10 10 'solid 'green)))
-      =>
-      (beside/align 'middle
-                    (rectangle 10 10 'solid 'black)
-                    (rectangle 10 10 'solid 'green)))
-
-(test (place-image/align (circle 4 'solid 'black)
-                         10 10
-                         'left 'top
-                         (rectangle 40 40 'solid 'orange))
-      =>
-      (underlay/xy (rectangle 40 40 'solid 'orange)
-                   10 10
-                   (circle 4 'solid 'black)))
-
-(test (place-image/align (circle 4 'solid 'black)
-                         50 50
-                         'left 'top
-                         (rectangle 40 40 'solid 'orange))
-      =>
-      (rectangle 40 40 'solid 'orange))
-
-(test (place-image/align (circle 4 'solid 'black)
-                         36 36
-                         'left 'top
-                         (rectangle 40 40 'solid 'orange))
-      =>
-      (underlay/xy (rectangle 40 40 'solid 'orange)
-                   36 36
-                   (crop 0 0 4 4 (circle 4 'solid 'black))))
-
-(test (place-image/align (circle 8 'solid 'black)
-                         -4 -4
-                         'left 'top
-                         (rectangle 40 40 'solid 'orange))
-      =>
-      (overlay/xy (crop 4 4 16 16 (circle 8 'solid 'black))
-                  0 0
-                  (rectangle 40 40 'solid 'orange)))
-
-(test (place-image/align (circle 4 'solid 'black)
-                         -4 0
-                         'left 'top
-                         (rectangle 40 40 'solid 'orange))
-      =>
-      (overlay/xy (crop 4 0 4 8 (circle 4 'solid 'black))
-                  0 0
-                  (rectangle 40 40 'solid 'orange)))
-
-(test (place-image/align (circle 4 'solid 'black)
-                         5 10 'center 'center
-                         (rectangle 40 40 'solid 'orange))
-      =>
-      (underlay/xy (rectangle 40 40 'solid 'orange)
-                   1 6
-                   (circle 4 'solid 'black)))
-
-
-(test (place-image/align (circle 4 'solid 'black)
-                         10 15 'right 'bottom
-                         (rectangle 40 40 'solid 'orange))
-      =>
-      (underlay/xy (rectangle 40 40 'solid 'orange)
-                   2 7
-                   (circle 4 'solid 'black)))
-
-(test (above
-       (beside (crop/align "right" "bottom" 40 40 (circle 40 "solid" "palevioletred"))
-               (crop/align "left" "bottom" 40 40 (circle 40 "solid" "lightcoral")))
-       (beside (crop/align "right" "top" 40 40 (circle 40 "solid" "lightcoral"))
-               (crop/align "left" "top" 40 40 (circle 40 "solid" "palevioletred"))))
-      =>
-      (above
-       (beside (crop 40 40 40 40 (circle 40 "solid" "palevioletred"))
-               (crop 0 40 40 40 (circle 40 "solid" "lightcoral")))
-       (beside (crop 40 0 40 40 (circle 40 "solid" "lightcoral"))
-               (crop 0 0 40 40 (circle 40 "solid" "palevioletred")))))
-
-(let ()
-  (define image1 (circle 8 'solid 'red))
-  (define image2 (rectangle 40 4 'solid 'blue))
-  (define image3 (rectangle 4 40 'solid 'green))
-  (define background (rectangle 40 40 'solid 'black))
-  (define spot 20)
-  (define p (make-posn spot spot))
-  
-  (test (place-images (list image1 image2 image3)
-                      (list (make-posn 30 10) p p)
-                      background)
-        =>
-        (place-image image1 30 10
-                     (place-image image2 spot spot
-                                  (place-image image3 spot spot
-                                               background))))
-  
-  (test (place-images (list u-bitmap)
-                      (list (make-posn 0 0))
-                      background)
-        =>
-        (place-image u-bitmap 0 0 background))
-  
-  (test (place-images '() '() background)
-        =>
-        background)
-  
-  (test (place-images/align (list image1 image2 image3)
-                            (list (make-posn 30 10) p p)
-                            'center 'center
-                            background)
-        =>
-        (place-image image1 30 10
-                     (place-image image2 spot spot
-                                  (place-image image3 spot spot
-                                               background)))))
-
-
-;; this test case checks to make sure the number of crops doesn't 
-;; grow when normalizing shapes.
-
-(let* ([an-image 
-        (crop
-         0 0 50 50
-         (crop
-          0 10 60 60
-          (crop
-           10 0 60 60
-           (overlay
-            (overlay
-             (ellipse 20 50 'solid 'red)
-             (ellipse 30 40 'solid 'black))
-            (overlay
-             (ellipse 20 50 'solid 'red)
-             (ellipse 30 40 'solid 'black))))))]
-       [an-image+crop
-        (crop 5 5 10 10 an-image)])
-  
-  (define (count-crops s)
-    (define crops 0)
-    (let loop ([s s])
-      (when (crop? s)
-        (set! crops (+ crops 1)))
-      (when (struct? s)
-        (for-each loop (vector->list (struct->vector s)))))
-    crops)
-  
-  (test (+ (count-crops (normalize-shape (image-shape an-image))) 1)
-        =>
-        (count-crops (normalize-shape (image-shape an-image+crop)))))
-
-(test (image-width (crop 0 0 101 61 (rectangle 100 60 'outline 'black)))
-      =>
-      101)
-(test (image-height (crop 0 0 101 61 (rectangle 100 60 'outline 'black)))
-      => 
-      61)
-(test (image-width (crop -1 -1 12 12 (rectangle 10 10 'outline
-                                                (pen "black" 2 "solid" "round" "round"))))
-      =>
-      12)
-(test (image-height (crop -1 -1 12 12 (rectangle 10 10 'outline
-                                                 (pen "black" 4 "solid" "round" "round"))))
-      =>
-      12)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  flipping
-;;
-
-(test (flip-horizontal (rotate -30 (rectangle 100 10 'solid 'red)))
-      =>
-      (rotate 30 (rectangle 100 10 'solid 'red)))
-
-(test (flip-vertical (rotate -30 (rectangle 100 10 'solid 'red)))
-      =>
-      (rotate 30 (rectangle 100 10 'solid 'red)))
-(test (flip-vertical
-       (rotate
-        -30
-        (overlay (rectangle 100 10 'solid 'red)
-                 (ellipse 10 100 'solid 'blue))))
-      =>
-      (rotate
-       30
-       (overlay (rectangle 100 10 'solid 'red)
-                (ellipse 10 100 'solid 'blue))))
-(test (flip-horizontal (overlay/xy (rectangle 100 10 'solid 'red)
-                                   10 10
-                                   (ellipse 10 100 'solid 'blue)))
-      =>
-      (overlay/xy (rectangle 100 10 'solid 'red)
-                  80 10
-                  (ellipse 10 100 'solid 'blue)))
-(test (flip-vertical (overlay/xy (rectangle 100 10 'solid 'red)
-                                 10 10
-                                 (ellipse 10 100 'solid 'blue)))
-      =>
-      (overlay/xy (rectangle 100 10 'solid 'red)
-                  10 -100
-                  (ellipse 10 100 'solid 'blue)))
-
-(test (flip-vertical (add-curve (rectangle 200 100 'solid 'black)
-                                20 20 0 1
-                                180 80 -90 1/3
-                                "white"))
-      =>
-      (add-curve (rectangle 200 100 'solid 'black)
-                 20 80 0 1
-                 180 20 90 1/3
-                 "white"))
-
-(let* ([bdc (make-object bitmap-dc%)]
-       [bm-ul (make-bitmap 10 10)]
-       [bm-ur (make-bitmap 10 10)]
-       [bm-ll (make-bitmap 10 10)])
-  (send bdc set-bitmap bm-ul)
-  (send bdc set-pen "red" 1 'transparent)
-  (send bdc set-brush "red" 'solid)
-  (send bdc clear)
-  (send bdc draw-rectangle 0 0 5 5)
-  (send bdc set-bitmap bm-ur)
-  (send bdc set-pen "red" 1 'solid)
-  (send bdc clear)
-  (send bdc draw-rectangle 5 0 5 5)
-  (send bdc set-bitmap bm-ll)
-  (send bdc clear)
-  (send bdc draw-rectangle 0 5 5 5)
-  (send bdc set-bitmap #f)
-  (test (flip-vertical bm-ul) => (to-img bm-ll))
-  (test (flip-horizontal bm-ul) => (to-img bm-ur)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; pen arguments
-;;
-
-;; just make sure no errors.
-(test (image? (polygon (list (make-posn 0 0)
-                             (make-posn 100 100)
-                             (make-posn 100 0)
-                             (make-posn 0 100))
-                       "outline"
-                       (make-pen "darkslategray" 6 "solid" "round" "round")))
-      =>
-      #t)
-
-(test (image? (line 10 
-                    10 
-                    (make-pen "darkslategray" 6 "solid" "round" "round")))
-      =>
-      #t)
-
-(test (scale 2
-             (polygon (list (make-posn 0 0)
-                            (make-posn 100 0)
-                            (make-posn 100 100))
-                      "outline"
-                      (make-pen "black" 6 "solid" "round" "round")))
-      =>
-      (polygon (list (make-posn 0 0)
-                     (make-posn 200 0)
-                     (make-posn 200 200))
-               "outline"
-               (make-pen "black" 12 "solid" "round" "round")))
-
-(test (scale 2
-             (ellipse 30 40 "outline"
-                      (make-pen "black" 2 "solid" "round" "round")))
-      =>
-      (ellipse 60 80 "outline"
-               (make-pen "black" 4 "solid" "round" "round")))
-
-(test (scale 2
-             (polygon (list (make-posn 0 0)
-                            (make-posn 100 0)
-                            (make-posn 100 100))
-                      "outline"
-                      (make-pen "black" 0 "solid" "round" "round")))
-      =>
-      (polygon (list (make-posn 0 0)
-                     (make-posn 200 0)
-                     (make-posn 200 200))
-               "outline"
-               (make-pen "black" 0 "solid" "round" "round")))
-
-(test (scale 2
-             (add-line
-              (rectangle 100 100 'solid 'black)
-              20 20 80 80
-              (make-pen "black" 6 "solid" "round" "round")))
-      =>
-      (add-line
-       (rectangle 200 200 'solid 'black)
-       40 40 160 160
-       (make-pen "black" 12 "solid" "round" "round")))
-
-(test (scale 2
-             (add-curve
-              (rectangle 100 100 'solid 'black)
-              20 20 0 1/2
-              80 80 0 1/2
-              (make-pen "black" 6 "solid" "round" "round")))
-      =>
-      (add-curve
-       (rectangle 200 200 'solid 'black)
-       40 40 0 1/2
-       160 160 0 1/2
-       (make-pen "black" 12 "solid" "round" "round")))
-
-(test (add-line (rectangle 30 30 "outline" "black")
-                0 0 30 30 
-                (make-pen (make-color 0 0 0 255) 15 "solid" "butt" "round"))
-      =>
-      (add-line (rectangle 30 30 "outline" "black")
-                0 0 30 30 
-                (make-pen "black" 15 "solid" "butt" "round")))
-
-(test (image->color-list
-       (above (beside (rectangle 1 1 'solid (color 1 1 1))
-                      (rectangle 1 1 'solid (color 2 2 2))
-                      (rectangle 1 1 'solid (color 3 3 3)))
-              (beside (rectangle 1 1 'solid (color 4 4 4))
-                      (rectangle 1 1 'solid (color 5 5 5))
-                      (rectangle 1 1 'solid (color 6 6 6)))))
-      =>
-      (list (color 1 1 1) (color 2 2 2) (color 3 3 3) 
-            (color 4 4 4) (color 5 5 5) (color 6 6 6)))
-(test (image->color-list (empty-scene 0 0))
-      =>
-      '())
-
-(test (color-list->bitmap
-       (list (color 1 1 1) (color 2 2 2) (color 3 3 3) 
-             (color 4 4 4) (color 5 5 5) (color 6 6 6))
-       3 2)
-      =>
-      (above (beside (rectangle 1 1 'solid (color 1 1 1))
-                     (rectangle 1 1 'solid (color 2 2 2))
-                     (rectangle 1 1 'solid (color 3 3 3)))
-             (beside (rectangle 1 1 'solid (color 4 4 4))
-                     (rectangle 1 1 'solid (color 5 5 5))
-                     (rectangle 1 1 'solid (color 6 6 6)))))
-
-(test (color-list->bitmap '() 0 0) => (empty-scene 0 0))
-(test (color-list->bitmap '() 0 10) => (empty-scene 0 10))
-(test (color-list->bitmap '() 4 0) => (empty-scene 4 0))
-
-(let ([has-color? 
-       (λ (img) 
-         (ormap (λ (x) (or (not (equal? (color-red x)
-                                        (color-green x)))
-                           (not (equal? (color-red x)
-                                        (color-blue x)))))
-                (image->color-list img)))])
-  (test (has-color? (place-image (rectangle 1 10 "solid" "red") 2 10
-                                 (empty-scene 5 20)))
-        =>
-        #t))
-
-(test (image->color-list
-       (overlay
-        (color-list->bitmap 
-         (list (color 0 0 0 0)
-               (color 0 0 255 255))
-         1 2)
-        (color-list->bitmap 
-         (list (color 255 0 0 255)
-               (color 0 0 0 0))
-         1 2)))
-      =>
-      (list (color 255 0 0 255) 
-            (color 0 0 255 255)))
-
-(let ([i 
-       (overlay (circle 20 'solid 'red)
-                (rectangle 10 60 'solid 'blue))])
-  (test (freeze i)
-        => 
-        i))
-
-(test (freeze 10 10 (rectangle 20 20 'solid 'blue))
-      =>
-      (rectangle 10 10 'solid 'blue))
-
-(test (freeze 5 5 10 10 (rectangle 20 20 'solid 'blue))
-      =>
-      (rectangle 10 10 'solid 'blue))
-
-(test (freeze 5 7 12 10 (rectangle 20 20 'solid 'blue))
-      =>
-      (rectangle 12 10 'solid 'blue))
-
-(test (freeze (rectangle 0 0 'solid 'blue))
-      =>
-      (rectangle 0 0 'solid 'blue))
-
-(test (freeze (rectangle 0 4 'solid 'blue))
-      =>
-      (rectangle 0 4 'solid 'blue))
-
-(test (freeze (rectangle 4 0 'solid 'blue))
-      =>
-      (rectangle 4 0 'solid 'blue))
-
-(let ()
-  (define bkg (rectangle 12 12 'solid 'white))
-  (define i1 (overlay/xy 
-              (freeze 0 0 11 11 (rectangle 10 10 'outline 'orange))
-              0 0
-              bkg))
-  (define i2 (overlay/xy
-              (rectangle 10 10 'outline 'orange)
-              0 0
-              bkg))
-  (test i1 => i2))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  test pinholes.
-;;
-
-(test (pinhole-x (rectangle 10 10 'solid 'blue)) => #f)
-(test (pinhole-y (rectangle 10 10 'solid 'blue)) => #f)
-(test (pinhole-x (put-pinhole 2 3 (rectangle 10 10 'solid 'blue))) => 2)
-(test (pinhole-y (put-pinhole 2 3 (rectangle 10 10 'solid 'blue))) => 3)
-(test (pinhole-x (center-pinhole (rectangle 10 24 'solid 'blue))) => 5)
-(test (pinhole-y (center-pinhole (rectangle 10 24 'solid 'blue))) => 12)
-(test (pinhole-x (clear-pinhole (center-pinhole (rectangle 10 24 'solid 'blue)))) => #f)
-(test (pinhole-y (clear-pinhole (center-pinhole (rectangle 10 24 'solid 'blue)))) => #f)
-(test (pinhole-x (clear-pinhole (rectangle 10 24 'solid 'blue))) => #f)
-(test (pinhole-y (clear-pinhole (rectangle 10 24 'solid 'blue))) => #f)
-
-(test (pinhole-x (scale 11 (center-pinhole (rectangle 10 24 'solid 'blue))))
-      =>
-      55)
-(test (pinhole-y (scale 11 (center-pinhole (rectangle 10 24 'solid 'blue))))
-      =>
-      132)
-(test (round-numbers (pinhole-x (rotate 90 (center-pinhole (rectangle 40 20 'solid 'red)))))
-      =>
-      10.0)
-(test (round-numbers (pinhole-y (rotate 90 (center-pinhole (rectangle 40 20 'solid 'red)))))
-      =>
-      20.0)
-(test (pinhole-x (flip-vertical (put-pinhole 1 2 (rectangle 10 20 'solid 'red))))
-      =>
-      1)
-(test (pinhole-y (flip-vertical (put-pinhole 1 2 (rectangle 10 20 'solid 'red))))
-      =>
-      18)
-(check-= (pinhole-x (flip-horizontal (put-pinhole 1 2 (rectangle 10 20 'solid 'red))))
-         9.0
-         0)
-(check-= (pinhole-y (flip-horizontal (put-pinhole 1 2 (rectangle 10 20 'solid 'red))))
-         2.0
-         0)
-(test (equal? (center-pinhole (rectangle 10 12 'solid 'blue))
-              (rectangle 10 12 'solid 'blue))
-      =>
-      #f)
-(test (equal? (center-pinhole (rectangle 10 12 'solid 'blue))
-              (put-pinhole 5 6 (rectangle 10 12 'solid 'blue)))
-      =>
-      #t)
-(test (pinhole-x (add-line (center-pinhole (rectangle 100 120 'solid 'red)) 10 10 20 20 'blue))
-      =>
-      50)
-(test (pinhole-y (add-line (center-pinhole (rectangle 100 120 'solid 'red)) 10 10 20 20 'blue))
-      =>
-      60)
-(test (pinhole-x (add-curve (center-pinhole (rectangle 100 120 'solid 'red)) 
-                            10 10 30 1/2
-                            20 20 60 1/2
-                            'white))
-      =>
-      50)
-(test (pinhole-y (add-curve (center-pinhole (rectangle 100 120 'solid 'red)) 
-                            10 10 30 1/2
-                            20 20 60 1/2
-                            'white))
-      =>
-      60)
-
-(test (pinhole-x (scene+line (center-pinhole (rectangle 100 120 'solid 'red)) 10 10 20 20 'blue))
-      =>
-      50)
-(test (pinhole-y (scene+line (center-pinhole (rectangle 100 120 'solid 'red)) 10 10 20 20 'blue))
-      =>
-      60)
-(test (pinhole-x (scene+curve (center-pinhole (rectangle 100 120 'solid 'red)) 
-                              10 10 30 1/2
-                              20 20 60 1/2
-                              'white))
-      =>
-      50)
-(test (pinhole-y (scene+curve (center-pinhole (rectangle 100 120 'solid 'red)) 
-                              10 10 30 1/2
-                              20 20 60 1/2
-                              'white))
-      =>
-      60)
-
-(test (pinhole-x (crop 2 2 8 10
-                       (center-pinhole (rectangle 10 12 'solid 'red))))
-      =>
-      3)
-(test (pinhole-y (crop 2 2 8 10
-                       (center-pinhole (rectangle 10 12 'solid 'red))))
-      =>
-      4)
-
-(test (pinhole-x (frame (center-pinhole (rectangle 10 12 'solid 'red))))
-      =>
-      5)
-(test (pinhole-y (frame (center-pinhole (rectangle 10 12 'solid 'red))))
-      =>
-      6)
-(test (pinhole-x (color-frame "red"
-                              (center-pinhole (rectangle 10 12 'solid 'red))))
-      =>
-      5)
-(test (pinhole-y (color-frame 'blue
-                              (center-pinhole (rectangle 10 12 'solid 'red))))
-      =>
-      6)
-
-(test (pinhole-x (overlay (put-pinhole 1 2 (rectangle 10 100 'solid 'red))
-                          (put-pinhole 75 9 (rectangle 100 10 'solid 'blue))))
-      =>
-      46)
-(test (pinhole-y (overlay (put-pinhole 1 2 (rectangle 10 100 'solid 'red))
-                          (put-pinhole 75 9 (rectangle 100 10 'solid 'blue))))
-      =>
-      2)
-(test (pinhole-x (overlay (put-pinhole 75 9 (rectangle 100 10 'solid 'blue))
-                          (put-pinhole 1 2 (rectangle 10 100 'solid 'red))))
-      =>
-      75)
-(test (pinhole-y (overlay (put-pinhole 75 9 (rectangle 100 10 'solid 'blue))
-                          (put-pinhole 1 2 (rectangle 10 100 'solid 'red))))
-      =>
-      54)
-(test (pinhole-x (overlay (rectangle 100 10 'solid 'blue)
-                          (put-pinhole 1 2 (rectangle 10 100 'solid 'red))))
-      =>
-      #f)
-(test (pinhole-y (overlay (rectangle 100 10 'solid 'blue)
-                          (put-pinhole 1 2 (rectangle 10 100 'solid 'red))))
-      =>
-      #f)
-(test (pinhole-x (beside (center-pinhole (rectangle 10 100 'solid 'red))
-                         (center-pinhole (rectangle 100 10 'solid 'blue))))
-      =>
-      5)
-(test (pinhole-y (beside (center-pinhole (rectangle 10 100 'solid 'red))
-                         (center-pinhole (rectangle 100 10 'solid 'blue))))
-      =>
-      50)
-(test (pinhole-x (above (center-pinhole (rectangle 10 100 'solid 'red))
-                        (center-pinhole (rectangle 100 10 'solid 'blue))))
-      =>
-      50)
-(test (pinhole-y (above (center-pinhole (rectangle 10 100 'solid 'red))
-                        (center-pinhole (rectangle 100 10 'solid 'blue))))
-      =>
-      50)
-
-(test (pinhole-x (place-image (center-pinhole (rectangle 10 100 'solid 'red))
-                              0 0
-                              (center-pinhole (rectangle 100 10 'solid 'blue))))
-      =>
-      50)
-(test (pinhole-y (place-image (center-pinhole (rectangle 10 100 'solid 'red))
-                              0 0
-                              (center-pinhole (rectangle 100 10 'solid 'blue))))
-      =>
-      5)
-
-(test (clear-pinhole
-       (overlay/align "pinhole" 'pinhole
-                      (center-pinhole (rectangle 40 100 'solid 'red))
-                      (put-pinhole 0 0 (rectangle 100 40 'solid 'blue))))
-      =>
-      (overlay/xy (rectangle 40 100 'solid 'red)
-                  20 50
-                  (rectangle 100 40 'solid 'blue)))
-
-(test (clear-pinhole
-       (underlay/align "pinhole" 'pinhole
-                       (center-pinhole (rectangle 40 100 'solid 'red))
-                       (put-pinhole 100 40 (rectangle 100 40 'solid 'blue))))
-      =>
-      (underlay/xy (rectangle 40 100 'solid 'red)
-                   -80 10
-                   (rectangle 100 40 'solid 'blue)))
-
-(test (clear-pinhole
-       (beside/align "pinhole"
-                     (center-pinhole (rectangle 100 40 'solid 'purple))
-                     (center-pinhole (rectangle 40 100 'solid 'purple))))
-      =>
-      (beside (rectangle 100 40 'solid 'purple)
-              (rectangle 40 100 'solid 'purple)))
-
-
-(test (clear-pinhole
-       (above/align "pinhole"
-                    (center-pinhole (rectangle 100 40 'solid 'purple))
-                    (center-pinhole (rectangle 40 100 'solid 'purple))))
-      =>
-      (above (rectangle 100 40 'solid 'purple)
-             (rectangle 40 100 'solid 'purple)))
-
-(test (clear-pinhole
-       (place-image/align
-        (center-pinhole (rectangle 100 10 'solid 'red))
-        0 0 "pinhole" "pinhole"
-        (center-pinhole (rectangle 10 100 'solid 'blue))))
-      =>
-      (place-image/align
-       (rectangle 100 10 'solid 'red)
-       0 0 "center" "center"
-       (rectangle 10 100 'solid 'blue)))
-
-(test (clear-pinhole
-       (place-image/align
-        (center-pinhole (rectangle 100 10 'solid 'red))
-        0 0 "pinhole" "pinhole"
-        (rectangle 10 100 'solid 'blue)))
-      =>
-      (place-image/align
-       (rectangle 100 10 'solid 'red)
-       0 0 "center" "center"
-       (rectangle 10 100 'solid 'blue)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  make sure color and pen structs cooperate with racket
-;;  struct operations (not just teaching langs)
-;;
-
-(test (struct-copy color (color 0 0 0) [red 2])
-      =>
-      (color 2 0 0))
-
-(test (struct-copy pen (pen "red" 1 "solid" "round" "round") [color "blue"])
-      =>
-      (pen "blue" 1 "solid" "round" "round"))
-
-(test (match (color 1 2 3)
-        [(color r g b a) (list r g b)]
-        [_ #f])
-      =>
-      (list 1 2 3))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  test errors.
-;;  mostly test that the extra mode check is there
-;;
-
-(test/exn (rectangle 10 10 "solid" (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^rectangle: expects an image-color")
-
-(test/exn (rectangle 10 10 'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^rectangle: expects an image-color")
-
-(test/exn (circle 10 'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^circle: expects an image-color")
-
-(test/exn (ellipse 10 10 'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^ellipse: expects an image-color")
-
-(test/exn (triangle 10 'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^triangle: expects an image-color")
-
-(test/exn (right-triangle 10 12 'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^right-triangle: expects an image-color")
-
-(test/exn (isosceles-triangle 10 120 'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^isosceles-triangle: expects an image-color")
-
-(test/exn (square 10 'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^square: expects an image-color")
-
-(test/exn (rhombus 40 45 'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^rhombus: expects an image-color")
-
-(test/exn (regular-polygon 40 6 'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^regular-polygon: expects an image-color")
-
-(test/exn (star 40 'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^star: expects an image-color")
-
-(test/exn (star-polygon 40 7 3 'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^star-polygon: expects an image-color")
-
-(test/exn (polygon (list (make-posn 0 0) (make-posn 100 0) (make-posn 100 100))
-                   'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^polygon: expects an image-color")
-(test/exn (polygon (list (make-posn 0 0+1i) (make-posn 100 0) (make-posn 100 100))
-                   'solid (make-pen "black" 12 "solid" "round" "round"))
-          =>
-          #rx"^polygon: expects a list-of-posns-with-real-valued-x-and-y-coordinates")
-
-
-(test/exn (save-image "tri.png" (triangle 50 "solid" "purple"))
-          =>
-          #rx"^save-image:")
-(test/exn (save-image (rectangle 0 0 'solid 'blue) "sq.png")
-          =>
-          #rx"^save-image:")
-(test/exn (save-image (rectangle 10 0 'solid 'blue) "sq.png")
-          =>
-          #rx"^save-image:")
-(test/exn (save-image (rectangle 0 10 'solid 'blue) "sq.png")
-          =>
-          #rx"^save-image:")
-
-(test/exn (save-svg-image "tri.png" (triangle 50 "solid" "purple"))
-          =>
-          #rx"^save-svg-image:")
-
-(test/exn (pen 1 2 3 4 5)
-          =>
-          #rx"^pen:")
-
-(test/exn (make-pen 1 2 3 4 5)
-          =>
-          #rx"^make-pen:")
-
-(test/exn (make-color #f #f #f)
-          =>
-          #rx"^make-color:")
-(test/exn (color #f #f #f)
-          =>
-          #rx"^color:")
-(test/exn (color-list->bitmap
-           (list (color 1 1 1) (color 2 2 2) (color 3 3 3) 
-                 (color 4 4 4) (color 5 5 5) (color 6 6 6))
-           3 3)
-          =>
-          #rx"^color-list->bitmap")
-
-(test/exn (overlay/align
-           "pinhole" "center"
-           (center-pinhole (rectangle 10 100 'solid 'blue))
-           (rectangle 100 10 'solid 'red))
-          =>
-          #rx"^overlay/align")
-(test/exn (overlay/align
-           "center" "pinhole" 
-           (center-pinhole (rectangle 10 100 'solid 'blue))
-           (rectangle 100 10 'solid 'red))
-          =>
-          #rx"^overlay/align")
-(test/exn (overlay/align
-           "pinhole" "center"
-           (rectangle 100 10 'solid 'red)
-           (center-pinhole (rectangle 10 100 'solid 'blue)))
-          =>
-          #rx"^overlay/align")
-(test/exn (overlay/align
-           "center" "pinhole" 
-           (rectangle 100 10 'solid 'red)
-           (center-pinhole (rectangle 10 100 'solid 'blue)))
-          =>
-          #rx"^overlay/align")
-
-(test/exn (underlay/align
-           "pinhole" "center"
-           (center-pinhole (rectangle 10 100 'solid 'blue))
-           (rectangle 100 10 'solid 'red))
-          =>
-          #rx"^underlay/align")
-(test/exn (underlay/align
-           "center" "pinhole" 
-           (center-pinhole (rectangle 10 100 'solid 'blue))
-           (rectangle 100 10 'solid 'red))
-          =>
-          #rx"^underlay/align")
-(test/exn (underlay/align
-           "pinhole" "center"
-           (rectangle 100 10 'solid 'red)
-           (center-pinhole (rectangle 10 100 'solid 'blue)))
-          =>
-          #rx"^underlay/align")
-(test/exn (underlay/align
-           "center" "pinhole" 
-           (rectangle 100 10 'solid 'red)
-           (center-pinhole (rectangle 10 100 'solid 'blue)))
-          =>
-          #rx"^underlay/align")
-
-
-(test/exn (place-image/align
-           (rectangle 100 10 'solid 'red)
-           0 0 "pinhole" "center"
-           (center-pinhole (rectangle 10 100 'solid 'blue)))
-          =>
-          #rx"^place-image/align")
-(test/exn (place-image/align
-           (rectangle 100 10 'solid 'red)
-           0 0 "center" "pinhole" 
-           (center-pinhole (rectangle 10 100 'solid 'blue)))
-          =>
-          #rx"^place-image/align")
-
-
-
-(test/exn (above/align
-           "pinhole" 
-           (rectangle 100 10 'solid 'red)
-           (center-pinhole (rectangle 10 100 'solid 'blue)))
-          =>
-          #rx"^above/align")
-(test/exn (beside/align
-           "pinhole" 
-           (center-pinhole (rectangle 10 100 'solid 'blue))
-           (rectangle 100 10 'solid 'red))
-          =>
-          #rx"^beside/align")
-
-(test/exn (beside (empty-scene 10 10) (empty-scene 10 10) '())
-          =>
-          #rx"^beside:")
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  testing the wxme connection for 2htdp/image images
-;;
-
-(let ()
-  (define txt (new text%))
-  (define img1 (overlay (rectangle 100 20 'solid 'red)
-                        (rectangle 20 100 'solid 'red)))
-  (define img2 
-    (put-pinhole 50 
-                 20
-                 (overlay (rectangle 100 20 'solid 'red)
-                          (rectangle 20 100 'solid 'red))))
-
-  (send txt insert "(define img (list ")
-  (send txt insert img1)
-  (send txt insert " ")
-  (send txt insert img2)
-  (send txt insert "))")
-
-  (define sp (open-output-string))
-  (send txt save-port sp)
-  (test (port->string (wxme-port->text-port (open-input-string (get-output-string sp))))
-        =>
-        "(define img (list . .))"))
-
-(let ()
-  (define txt (new text%))
-  (define img1 (overlay (rectangle 100 20 'solid 'red)
-                        (rectangle 20 200 'solid 'red)))
-  (define img2 
-    (put-pinhole 50 
-                 20
-                 (overlay (rectangle 200 20 'solid 'red)
-                          (rectangle 20 100 'solid 'red))))
-  (define img3 (text "Hello" 32 'black))
-
-  (send txt insert "(")
-  (send txt insert img1)
-  (send txt insert " ")
-  (send txt insert img2)
-  (send txt insert " ")
-  (send txt insert img3)
-  (send txt insert ")")
-
-  (define sp (open-output-string))
-  (send txt save-port sp)
-  (define washed (read (wxme-port->port (open-input-string (get-output-string sp)))))
-  (test (list? washed) => #t)
-  (test (map pinhole-x washed) => (list #f 50 #f))
-  (test (map pinhole-y washed) => (list #f 20 #f))
-  (test (image-width (car washed)) => 100)
-  (test (image-height (car washed)) => 200)
-  (test (image-baseline (car washed)) => 200)
-  (test (equal? (image-baseline (list-ref washed 2))
-                (image-height (list-ref washed 2)))
-        =>
-        #f)
-  (test washed => (list img1 img2 img3)))
-
-(test (convertible? (circle 20 "solid" "red")) => #t)
-(test (bytes? (convert (circle 20 "solid" "red") 'png-bytes)) => #t)
-(test (pict-convertible? (circle 20 "solid" "red")) => #t)
-(test (pict? (pict-convert (circle 20 "solid" "red"))) => #t)
-(let ()
-  (define tmpfile (make-temporary-file "2htdpimage-test-~a"))
-  (define i (circle 15 "solid" "red"))
-  (call-with-output-file tmpfile
-    (lambda (p)
-      (display (convert i 'png-bytes) p))
-    #:exists 'truncate)
-  ;; add rotate to be sure we get an image so that equal? works properly
-  (define i2 (rotate 0 (read-bitmap tmpfile))) 
-  (delete-file tmpfile)
-  (test (image-width i2) => 30)
-  (test (image-height i2) => 30)
-  (test i2 => i))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  random testing of normalization
-;;    make sure normalization actually normalizes
-;;    and that normalization doesn't introduce new structs
-;;
-
-(require redex/reduction-semantics)
-
-(define-language 2htdp/image
-  (image (rectangle size size mode color)
-         (line coord coord color)
-         (add-curve (rectangle size size mode color)
-                    coord coord pull angle
-                    coord coord pull angle
-                    color)
-         (overlay image image)
-         (overlay/xy image coord coord image)
-         (underlay image image)
-         (underlay/xy image coord coord image)
-         (let ([i image])
-           (crop (max 0 (min (image-width i) coord))
-                 (max 0 (min (image-height i) coord))
-                 size
-                 size
-                 i))
-         (scale/xy factor factor image)
-         (scale factor image)
-         (rotate angle image)
-         (flip-vertical image)
-         (flip-horizontal image)
-         (bitmap bmp-spec))
-  
-  (bmp-spec icons/b-run.png
-            icons/stop-16x16.png)
-
-  (factor (+ 1 big-nat) 1/2 1/3 1/4) ;; scaling factors
-  (size big-nat)
-  (mode 'outline 'solid "outline" "solid")
-  (color "red" 'red "blue" "orange" "green" "black")
-  (coord big-int)
-  (pull 0 1/2 1/3 2 (/ big-nat (+ 1 big-nat)))
-  (angle 0 90 45 30 180 natural (* 4 natural))
-  
-  ; Redex tends to choose small numbers.
-  (big-nat (+ (* 10 natural) natural))
-  (big-int (+ (* 10 integer) integer)))
-
-(define-namespace-anchor anchor)
-
-;; scale-down : image -> image
-;; scale image so that it is at most 10000 pixels in area
-(define (scale-down img)
-  (let* ([w (image-width img)]
-         [h (image-height img)]
-         [s (* w h)]
-         [max-s (sqr 100)])
-    (if (< s max-s)
-        img
-        (scale/xy (/ (sqrt max-s) w) 
-                  (/ (sqrt max-s) h)
-                  img))))
-
-(define (image-struct-count obj)
-  (let ([counts (make-hash)])
-    (let loop ([obj obj])
-      (when (struct? obj)
-        (let ([stuff (vector->list (struct->vector obj))])
-           ;; skip these because normalization eliminates them
-          (unless (member (car stuff) '(struct:flip struct:translate struct:scale))
-            (hash-set! counts (car stuff) (+ 1 (hash-ref counts (car stuff) 0))))
-          (for-each loop (cdr stuff)))))
-    (sort (hash-map counts list) string<=? #:key (λ (x) (symbol->string (car x))))))
-
-(define (check-image-properties img-sexp img)
-  (let* ([raw-size (image-struct-count (image-shape img))]
-         [normalized (normalize-shape (image-shape img))]
-         [norm-size (image-struct-count normalized)]) 
-    (unless (normalized-shape? normalized)
-      (error 'test-image.rkt "found a non-normalized shape after normalization:\n~s" 
-             img-sexp))
-    (unless (equal? norm-size raw-size)
-      (error 'test-image.rkt "found differing sizes for ~s:\n  ~s\n  ~s" 
-             img-sexp raw-size norm-size))))
-
-(time
- (redex-check
-  2htdp/image
-  image
-  (check-image-properties 
-   (term image)
-   (to-img (eval (term image) (namespace-anchor->namespace anchor))))
-  #:attempts 1000))
-
-
-;; random testing finds differences here but they
-;; seem to be due to imprecision in inexact arithmetic.
-#;
-(let ()
-  (define w 200)
-  (define h 200)
-  (define bm1 (make-bitmap w h))
-  (define bm2 (make-bitmap w h))
-  (define bytes1 (make-bytes (* w h 4) 0))
-  (define bytes2 (make-bytes (* w h 4) 0))
-  (define bdc1 (make-object bitmap-dc% bm1))
-  (define bdc2 (make-object bitmap-dc% bm2))
-  
-  (define (render-and-compare img)
-    (send bdc1 erase)
-    (send bdc2 erase)
-    (parameterize ([render-normalized #f])
-      (render-image img bdc1 10 10))
-    (parameterize ([render-normalized #t])
-      (render-image img bdc2 10 10))
-    (send bdc1 get-argb-pixels 0 0 w h bytes1)
-    (send bdc2 get-argb-pixels 0 0 w h bytes2)
-    (equal? bytes1 bytes2))
-  (time
-   (redex-check
-    2htdp/image
-    image
-    (render-and-compare (scale-down (eval (term image) (namespace-anchor->namespace anchor))))
-    #:attempts 100)))
-
-(define (test-save/load img fn)
-  (let ([t1 (new text%)]
-        [t2 (new text%)])
-    (send t1 insert img)
-    (send t1 save-file fn)
-    (send t2 load-file fn)
-    (let ([s1 (send t1 find-first-snip)]
-          [s2 (send t2 find-first-snip)])
-      (equal? s1 s2))))
-
-
-#;
-(time
- (let ([fn (make-temporary-file "test-image~a")])
-   (redex-check
-    2htdp/image
-    image
-    (let-values ([(ans real cpu gc)
-                  (time-apply
-                   (λ ()
-                     (let ([img (to-img (eval (term image) (namespace-anchor->namespace anchor)))])
-                       (test-save/load (scale-down img) fn)))
-                   '())])
-      (unless (car ans)
-        (error 'test-image.rkt
-               "saving and loading this image fails:\n  ~s"
-               (term image)))
-      (unless (< cpu 4000)
-        (error 'test-image.rkt
-               "saving and loading this image takes too longer than 4 seconds:\n  ~s"
-               (term image))))
-    #:attempts 1000)))
-
-;;This expression was found by the above. Its problematic because it has a negative width.
-#;
-(begin
-  (define i
-   (let* ([b (rectangle 17 17 "solid" "black")]
-          [i (overlay/xy b -37 40 b)])
-     (rotate 30 (crop 54 30 20 10 i))))
-  (image-width i) (image-height i) i)
-
-
-#|
-
-This was found by the first redex check above:
-
-(let ((i (flip-horizontal 
-          (let ((i (line (+ (* 10 1) -2) (+ (* 10 3) 4) "green")))
-            (crop (max 0 (min (image-width i) (+ (* 10 4) 13)))
-                  (max 0 (min (image-height i) (+ (* 10 2) 0)))
-                  (+ (* 10 3) 2)
-                  (+ (* 10 7) 0)
-                  i)))))
-  (crop (max 0 (min (image-width i) (+ (* 10 0) 2))) 
-        (max 0 (min (image-height i) (+ (* 10 2) 12))) 
-        (+ (* 10 1) 7) (+ (* 10 1) 2)
-        i))
-raises an exception crop: expected <number that is between 0 than the width (-1)> 
-as first argument, given: 0
-
-|#
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/to-draw-error.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/to-draw-error.rkt
deleted file mode 100644
index 6c2dd2d1d5..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/to-draw-error.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket
-
-(require 2htdp/universe rackunit)
-
-(check-equal? (with-handlers ((exn:fail:contract? exn-message))
-                (big-bang #f (to-draw (λ (_) '...) "not-a-number" "either")))
-              "to-draw: expects a natural number as width argument, given \"not-a-number\"")
-
-
-(check-equal? (with-handlers ((exn:fail:contract? exn-message))
-                (big-bang #f (to-draw (λ (_) '...) 100 "either")))
-              "to-draw: expects a natural number as height argument, given \"either\"")
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/two-ports.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/two-ports.rkt
deleted file mode 100644
index 0be8c44d13..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/two-ports.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket
-
-(require 2htdp/universe 2htdp/image)
-
-;; Run two client-server pairs
-(define (run)
-  (launch-many-worlds
-   (server 8081) (client 'a 8081 'blue) (client 'b 8081 'blue)
-   (server 8082) (client 'c 8082 'green) (client 'd 8082 'green)))
-
-;; Port -> #f
-(define (server p)
-  (define (noop s msg) (make-bundle s (map (λ (s) (make-mail s msg)) s) '()))
-  (universe '()
-            (port p)
-            (on-tick (λ (u) (make-bundle u '() '())) 1 5)
-            (on-new (λ (u iw) (make-bundle (cons iw u) '() '())))
-            (on-msg (λ (u _iw msg) (noop u msg)))))
-
-;; Symbol Port ColorSymbol -> #f
-(define (client name p c)
-  (define mt (place-image (text (symbol->string name) 22 'blue) 100 100 (empty-scene 400 400)))
-  (big-bang (list #f 0)
-            (port p)
-            (on-tick
-             (λ (s) (if (first s) 
-                        (make-package (list #f (add1 (second s))) (second s))
-                        (list #t (second s))))
-             1)
-            (on-receive 
-             (λ (s msg) (displayln msg) (list (first s) (+ (second s) msg))))
-            (to-draw 
-             (λ (s) (if (first s) (place-image (circle (second s) 'solid c) 200 200 mt) mt)))
-            (register LOCALHOST)))
-(run)
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/u.png b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/u.png
deleted file mode 100644
index b07f4d5ba0..0000000000
Binary files a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/u.png and /dev/null differ
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/ufo-rename.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/ufo-rename.rkt
deleted file mode 100644
index 208bcc5ef9..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/ufo-rename.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scheme
-(require (prefix-in uni: 2htdp/universe)
-         (prefix-in uni: htdp/image)
-	 "test-aux.rkt")
-
-(define (create-UFO-scene height)
-  (uni:place-image UFO 50 height (uni:empty-scene 100 100)))
-
-(define UFO
-  (uni:overlay (uni:circle 10 'solid 'green)
-               (uni:rectangle 40 4 'solid 'green)))
-
-(testing
-  (uni:big-bang 0
-    (uni:on-tick add1)
-    (uni:stop-when (lambda (y) (>= y 100)))
-    (uni:on-draw create-UFO-scene)))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-disappearing.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-disappearing.rkt
deleted file mode 100644
index b2f56183b3..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-disappearing.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang racket
-
-(module universe racket
-  (provide
-   ;; Boolean -> [Listof IWorld]
-   ;; run a univsere server, show state if given #true
-   run)
-  ;; ---------------------------------------------------------------------------
-  
-  (require 2htdp/universe)
-  (require 2htdp/image)
-  
-  (define (run show?)
-    (universe '()
-              (on-tick identity 1 15)
-              (state show?)
-              (on-new (lambda (u nw) (cons nw u)))
-              (on-msg (lambda (u sender msg)
-                        (define new-u (remq sender u))
-                        (define throw (list sender))
-                        (make-bundle new-u (mail2 new-u msg) throw)))
-              (on-disconnect (lambda (u gone)
-                               (remq gone u)))))
-  
-  ;; [Listof IWorld] String -> [Listof Mail]
-  (define (mail2 lo-iw sender)
-    (for/list ((iw lo-iw))
-      (make-mail iw (format "~a says good-bye" sender)))))
-
-(module client racket
-  (provide 
-   ;; Boolean -> ???
-   run)
-  ;; -----------------------------------------------------------------------------
-  
-  (require 2htdp/universe)
-  (require 2htdp/image)  
-  
-  ;; String -> Natural 
-  ;; run for at most 9 seconds, send your secret to server at t = 1
-  (define (run secret)
-    (big-bang (random 10)
-              (register LOCALHOST)
-              (on-receive (lambda (x msg)
-                            (displayln msg)
-                            x))
-              (to-draw (lambda (x) 
-                         (overlay (text secret 12 'blue)
-                                  (circle (+ 100 (* 10 x)) 'solid 'red))))
-              (on-tick (lambda (x)
-                         (if (= x 1)
-                             (make-package 0 secret)
-                             (sub1 x)))
-                       1
-                       10)
-              (stop-when zero?))))
-
-(require (prefix-in server: (submod "." universe))
-         (prefix-in client: (submod "." client))
-         2htdp/universe)
-
-(define (main show?)
-  (launch-many-worlds 
-   (server:run show?)
-   (client:run "matthias") 
-   (client:run "matthew") 
-   (client:run "robby") 
-   (client:run "shriram")))
-
-(main #f)
\ No newline at end of file
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-receive.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-receive.rkt
deleted file mode 100644
index 4f6c05eae8..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-receive.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname universe-receive) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require 2htdp/universe)
-(require 2htdp/image)
-
-;; Distinct from other tests:
-(define PORT-NO 19202)
-
-;; Nat Nat ->* World1 World2 [Listof IWorld]
-;; launch a sending world, a receiving world, and a connecting universe
-(define (main rate limit)
-  (local (;; UniSt = [Listof IWorld]
-          
-          ;; UniSt IWorld -> UniSt 
-          (define (accept-another-world u iw)
-            (make-bundle (cons iw u) '() '()))
-          
-          ;; UniSt IWorld Message -> [bundle UniSt [List [Mail IWorld 'reset]] '()]
-          (define (forward-message u iw msg)
-            (make-bundle u (list (make-mail (other iw u) 'reset)) '()))
-          
-          ;; IWorld [List IWorld IWorld] -> IWorld 
-          ;; given one iworld, pick the other one from a list of two 
-          (define (other iw lo-iworld)
-            (if (iworld=? (first lo-iworld) iw)
-                (second lo-iworld)
-                (first lo-iworld))))
-    (launch-many-worlds 
-     (sending-world rate limit)
-     (receiving-world 10)
-     ;; a universe that channels all messages from one world to another
-     (universe '()
-               (on-tick (lambda (s) (make-bundle s '() '())) 1 10)
-               (on-new accept-another-world)
-               (on-msg forward-message)
-	       (port PORT-NO)))))
-
-;; World1 = Number 
-
-;; Nat -> World1
-;; a world that counts down from n to 0, but resets to n for every message 
-(define (receiving-world n)
-  (local (;; World1 -> World1
-          (define (reset _1 _2) n))
-    (big-bang n
-              (on-tick sub1 1)
-              (to-draw (draw 'red))
-              (on-receive reset)
-              (stop-when zero?)
-              (register LOCALHOST)
-              (port PORT-NO))))
-
-;; World2 = Number 
-
-;; Number Number -> World2 
-;; a world that counts up to limit at rate r, sending a message at every tick
-(define (sending-world r l)
-  (local (;; World2 -> [package World2 Nat]
-          (define (inc w) (make-package (add1 w) w)))
-  (big-bang 0 (on-tick inc r l) (to-draw (draw 'blue)) (register LOCALHOST))))
-
-;; Color -> [Number -> Image]
-;; create an image for a number, in a fixed color c 
-(define (draw c)
-  (lambda (w) 
-    (overlay (text (number->string w) 22 c) (empty-scene 100 100))))
-
-;; run universe run 
-(main 1 3)
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-restart.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-restart.rkt
deleted file mode 100644
index ccff809c75..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-restart.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket
-
-(module drop-on-message racket
-  (require 2htdp/universe 2htdp/image)
-
-  ;; Distinct from other tests:
-  (define PORT-NO 19201)
-
-  (define (u)
-    (universe 0
-              (on-new (lambda (u w) (make-bundle (+ u 1) '() '())))
-              (on-tick (lambda (w) (make-bundle w '() '())) 1 3)
-              (on-msg (lambda (u w m) (make-bundle (- u 1) '() (list w))))
-              (state #t)
-              (port PORT-NO)))
-  
-  (define (w n)
-    (big-bang 3
-              [to-draw (lambda (w) 
-                         (overlay (text (number->string w) 22 'black) (circle 100 'solid 'red)))]
-              [on-tick (lambda (w) (if (<= w 1) (make-package 0 n) (- w 1)))]
-              [register LOCALHOST]
-              [port PORT-NO]
-              [name n]))
-  
-  (launch-many-worlds (u) (w "one") (w "two")))
-
-(require (submod "." drop-on-message))
-
-(module drop-bad racket
-  (require 2htdp/universe 2htdp/image)
-  
-  ;; Distinct from other tests:
-  (define PORT-NO 19205)
-
-  (define *world* #false)
-
-  (define (u)
-    (universe '()
-              (on-new (lambda (u w) (make-bundle (cons w u) '() '())))
-              (on-tick (lambda (w) w) 1 5)
-              (on-msg (lambda (u w m) 
-                        ;; set *world* to the first world that comes around, reuse
-                        (unless *world* (set! *world* w))
-                        (make-bundle u '() (list *world*))))
-              (port PORT-NO)))
-  
-  (define (w n)
-    (big-bang 3
-              [to-draw (lambda (w) 
-                         (overlay (text (number->string w) 22 'black) (circle 100 'solid 'red)))]
-              [on-tick (lambda (w) (if (= w 1) (make-package 0 n) (- w 1)))]
-              [register LOCALHOST]
-              [port PORT-NO]
-              [name n]))
-  
-  (launch-many-worlds (u) (w "one") (w "two") (w "three")))
-
-; (require (submod "." drop-bad))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/world0-stops.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/world0-stops.rkt
deleted file mode 100644
index e3fedc3bbc..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/world0-stops.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket 
-
-;; ---------------------------------------------------------------------------------------------------
-;; does big-bang stop when the initial world is already a final world? does it draw the final image? 
-
-(require 2htdp/universe 2htdp/image "test-aux.rkt")
-
-(define ((draw message) x)
-  (display message) 
-  (circle 3 'solid 'red))
-
-(define-syntax-rule 
-  (test body expected-value expected-output)
-  (begin
-    (define actual-value (gensym))
-    (define actual-output (with-output-to-string (lambda () (set! actual-value body))))
-    (unless (equal? actual-value expected-value)
-      (error 'failure "~a expected value ~e, value produced ~e" 'test expected-value actual-value))
-    (unless (string=? actual-output expected-output)
-      (error 'failure "~a expected output ~e, output produced ~e" 'test expected-output actual-output))))
-
-(testing
-  (test (big-bang 0 (stop-when zero?) (on-tick add1) (to-draw (draw ""))) 0 "")
-  (test (big-bang (stop-with 0) (on-tick add1) (to-draw (draw ""))) 0 "")
-  (test (big-bang 0 (on-draw (draw 0)) (stop-when zero? (draw 1))) 0 "1"))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/README b/pkgs/htdp-pkgs/htdp-test/2htdp/utest/README
deleted file mode 100644
index 186b0113a4..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/README
+++ /dev/null
@@ -1,11 +0,0 @@
-
-to test:         $ ./xrun  
-to add a player: $ ./player Foo
-
-shared.ss : player infrastructure 
-carl.ss   : one specific player derived from shared.ss
-sam.ss    : another one 
-  -- add more with player plus string 
-
-balls.ss  : the server 
-
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/balls.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/utest/balls.rkt
deleted file mode 100644
index 6c41a9737f..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/balls.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang scheme
-
-(provide run)
-
-(require 2htdp/universe htdp/testing)
-
-;; rotate through a bunch of players with the ball until nobody is left 
-
-;; -----------------------------------------------------------------------------
-;; Universe = [Listof IWorld]
-;; BallMail = (make-mail IWorld 'go)
-;; Result   = (make-bundle [Listof IWorld] [Listof BallMail] '())
-
-(define Result0 '() #;(make-bundle '() '() '()))
-
-;; -----------------------------------------------------------------------------
-;; Any -> [Listof IWorld]
-
-(define (run _)
-  (universe '() 
-            (on-new add-world)
-            (check-with list?)
-            (on-msg switch)
-            (on-disconnect disconnect)))
-
-;; -----------------------------------------------------------------------------
-;; [Listof IWorld] -> Result
-;; create bundle with a singleton list of mails to the first world on the list 
-(define (mail2 lw)
-  (make-bundle lw (list (make-mail (first lw) 'go)) '()))
-
-;; -----------------------------------------------------------------------------
-;; Universe IWorld -> Result
-;; add w to the list of worlds; get the first one to play 
-
-(check-expect (add-world '() iworld1) (mail2 (list iworld1)))
-
-(define (add-world univ wrld)
-  (mail2 (append univ (list wrld))))
-
-;; -----------------------------------------------------------------------------
-;; Universe IWorld Sexp -> Result
-;; w sent message m in universe u 
-
-(check-expect
- (switch (list iworld1 iworld2) iworld1 'go) (mail2 (list iworld2 iworld1)))
-
-(check-error 
- (switch (list iworld1 iworld2) iworld2 'go) "switch: wrong world sent message")
-
-(check-error 
- (switch (list iworld2 iworld1) iworld2 'stop) "switch: bad message: stop")
-
-(define (switch u w m)
-  (local ((define fst (first u))
-          (define nxt (append (rest u) (list fst))))
-    (cond
-      [(and (iworld=? fst w) (symbol=? m 'go)) (mail2 nxt)]
-      [(iworld=? fst w) (error 'switch "bad message: ~s" m)]
-      [else (error 'switch "wrong world sent message")])))
-
-;; -----------------------------------------------------------------------------
-;; [Listof IWorld] Universe IWorld -> Result
-;; w disconnected from the universe 
-
-(check-expect (disconnect (list iworld1 iworld2 iworld3) iworld2) 
-              (mail2 (list iworld1 iworld3)))
-(check-expect (disconnect '() iworld2) Result0)
-
-(define (disconnect u w)
-  (local ((define nxt (remq w u)))
-    (if (empty? nxt) Result0  (mail2 nxt))))
-
-;; IWorld [Listof IWorld] -> [Listof IWorld]
-;; remove w from low
-
-(check-expect (remq 'a '(a b c)) '(b c))
-(check-expect (remq 'a '(a b a c)) '(b c))
-(check-expect (remq 'b '(a b a c)) '(a a c))
-
-(define (remq w low)
-  (cond
-    [(empty? low) '()]
-    [else (local ((define fst (first low))
-                  (define rst (remq w (rest low))))
-            (if (eq? fst w) rst (cons fst rst)))]))
-
-;; -- run program run 
-
-(test)
-
-; (run 'go)
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/design.txt b/pkgs/htdp-pkgs/htdp-test/2htdp/utest/design.txt
deleted file mode 100644
index b163e5fb71..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/design.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-
- Two collaboration worlds display a moving ball, one of them should rest. 
-
-Pass Through (Distributed) Version
-----------------------------------
-
- Two screens pop up and a ball moves from the bottom to the top, on each of
- them. When one reaches the top, it rests and sends a signal to the other
- to 'go. This means only one of the worlds will have a moving ball, the
- other one rests. 
-
- use ../pass-through.ss 
-
- World and Messages: 
- ;; World   = Number | 'resting 
- ;; Message = 'go
-
-Arbitrated Version
-----------------------------------
-
- Two screen pop up. The server sends one of them a go signal and the other
- one a rest signal. Until then both move so I can use the same shared
- code. 
-
- use ball-universe.ss 
-
- World and Messages: 
- ;; World    = Number | 'resting 
- ;; ReceivedMessage = 'go
- ;; SendMessages    = ... any token will do ... 
-
- Server: 
- ;; ReceivedMessages = ... any token will do ... 
- ;; SendMessages     = 'go 
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/info.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/utest/info.rkt
deleted file mode 100644
index 6054c16f0f..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define test-omit-paths
-  '("sam.rkt"))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/player b/pkgs/htdp-pkgs/htdp-test/2htdp/utest/player
deleted file mode 100755
index 98d18e3447..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/player
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-#| -*- scheme -*-
-exec mred -qu "$0" ${1+"$@"}
-|#
-
-#lang racket
-
-(require "shared.ss")
-
-(define argv (current-command-line-arguments))
-
-(unless (= (vector-length argv) 1)
-  (error 'player "name of one player expected: $ ./player name"))
-
-(make-player 200 (vector-ref argv 0))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/sam.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/utest/sam.rkt
deleted file mode 100644
index d69d0c0e1a..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/sam.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname sam) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require "shared.rkt")
-(require 2htdp/universe)
-
-(launch-many-worlds (make-player 200 "sam") (make-player 100 "carl"))
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/shared.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/utest/shared.rkt
deleted file mode 100644
index 4d304b19a2..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/shared.rkt
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang scheme
-
-(require 2htdp/universe htdp/testing htdp/image)
-;(require "../universe.rkt" htdp/testing)
-
-;; World   = Number | 'resting 
-(define WORLD0 'resting)
-
-;; constants 
-(define HEIGHT 100)
-(define DefWidth 50)
-
-;; visual constants 
-(define BALL (circle 3 'solid 'red))
-
-(define mt (nw:rectangle DefWidth HEIGHT 'solid 'gray))
-
-;; -----------------------------------------------------------------------------
-;; Number (U String Symbol) -> true
-;; create and hook up a player with the localhost server 
-(define (make-player width t)
-  (local ((define mt (place-image (text (format "~a" t) 11 'black) 
-                                  5 85 
-                                  (empty-scene width HEIGHT)))
-          
-          ;; ----------------------------------------------------------------
-          ;; World Number -> Message 
-          ;; on receiving a message from server, place the ball at lower end or stop
-          #|
-          (check-expect (receive 'resting 'go) HEIGHT)
-          (check-expect (receive HEIGHT 'go) HEIGHT)
-          (check-expect (receive (- HEIGHT 1) 'go) (- HEIGHT 1))
-          (check-expect (receive 0 'go) 0)
-          |#
-          (define (receive w n) 
-            (cond
-              [(number? w) w]
-              [else HEIGHT]))
-          ;; World -> World 
-          #|
-          (check-expect (move 'resting) 'resting)
-          (check-expect (move HEIGHT) (- HEIGHT 1))
-          (check-expect (move 0) (make-package 'resting 'go))
-          |#
-          (define (move x)
-            (cond
-              [(symbol? x) x]
-              [(number? x) (if (<= x 0) (make-package 'resting 'go) (sub1 x))]))
-          
-          ;; World -> Scene 
-          ;; render the world 
-          
-          ; (check-expect (draw 100) (place-image BALL 50 100 mt))
-          
-          (define (draw w)
-            (cond
-              [(symbol? w) (place-image (text "resting" 11 'red) 10 10 mt)]
-              [(number? w) (place-image BALL 50 w mt)])))
-    (big-bang WORLD0 
-              (on-draw draw)
-              (on-receive receive)
-              (on-tick move .01)
-              (name t)
-              (check-with (lambda (w) (or (symbol? w) (number? w))))
-              (register LOCALHOST))))
-
-; (generate-report)
-
-;; --- 
-
-(require scheme/contract)
-
-(provide/contract
- [make-player (-> (and/c number? (>=/c 100)) (or/c string? symbol?) any/c)])
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/xrun b/pkgs/htdp-pkgs/htdp-test/2htdp/utest/xrun
deleted file mode 100755
index 70a8dfeaaf..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/utest/xrun
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-#|
-exec racket -t "$0" ${1+"$@"}
-|#
-
-#lang racket 
-
-(require 2htdp/universe "balls.rkt" "shared.ss")
-
-(launch-many-worlds (run 'go) (make-player 200 "carl") (make-player 200 "sam"))
-
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/xmanual b/pkgs/htdp-pkgs/htdp-test/2htdp/xmanual
deleted file mode 100755
index 38893cdb6c..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/xmanual
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-run() {
-  exe="gracket"
-  if [ "x$1" = "x-t" ]; then exe="racket"; shift; fi
-  "$exe" "$1"
-  echo "done:--- $1 ---"
-  echo ""
-}
-
-cd tests 
-
-run -t batch-io-xexpr.rkt
-run random-seed-works.rkt
-run mouse-evt.rkt
-run release.rkt
-run on-release-no-key.rkt
-run pad1.rkt
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/xtest b/pkgs/htdp-pkgs/htdp-test/2htdp/xtest
deleted file mode 100755
index 3b8eba60a2..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/xtest
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-run() {
-  exe="gracket"
-  if [ "x$1" = "x-t" ]; then exe="racket"; shift; fi
-  "$exe" "$1"
-  echo "done:--- $1 ---"
-  echo ""
-}
-
-cd tests 
-
-run universe-disappearing.rkt
-run bitmap-as-image-in-universe.rkt
-run key-error.rkt
-run to-draw-error.rkt
-run run-movie.rkt
-run bad-draw.rkt
-run error-in-tick.rkt
-run error-in-draw.rkt
-run error-to-draw.rkt
-run -t batch-io.rkt
-run -t batch-io2.rkt
-run -t batch-io3.rkt
-run -t batch-io-csv-ho.rkt
-run clause-once.rkt
-run full-scene-visible.rkt
-run image-too-large.rkt
-run image-equality-performance-htdp.rkt
-run image-equality-performance.rkt
-run on-tick-defined.rkt
-run perform-robby.rkt
-run profile-robby.rkt
-run stop.rkt
-run test-image.rkt
-run ufo-rename.rkt
-run server-rename.rkt
-run world0-stops.rkt
-run record.rkt
-run record-stop-when.rkt
-run stop-when-error.rkt
-run stop-when-crash.rkt
-run stop-when-not-boolean.rkt
-run on-tick-universe-with-limit.rkt
-run on-tick-with-limit.rkt
-run struct-universe.rkt
-run universe-receive.rkt
-run universe-restart.rkt
-run name.rkt
-run pad1-handler.rkt
-run pad1-in-bsl.rkt
-run error-messages.rkt
-run two-ports.rkt
diff --git a/pkgs/htdp-pkgs/htdp-test/LICENSE.txt b/pkgs/htdp-pkgs/htdp-test/LICENSE.txt
deleted file mode 100644
index 88097f4394..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-htdp-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/info.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/info.rkt
deleted file mode 100644
index 2f992b4440..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define name "HtDP Teachpack Tests")
-(define compile-omit-paths '("tests"))
-
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/TEST b/pkgs/htdp-pkgs/htdp-test/htdp/tests/TEST
deleted file mode 100644
index e9a5b50f53..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/TEST
+++ /dev/null
@@ -1,19 +0,0 @@
-TEST: 
-----
-
-* draw.ss
-* arrow.ss
-* arrow-gui.ss
-* convert.ss
-* dir.ss 
-* docs.ss
-* elevator.ss
-* graphing.ss
-* guess1.ss
-* guess2.ss
-* guess3.ss
-* gui.ss
-* lkup-gui.ss
-* hangman1.ss
-* master.ss
-* matrix.ss
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/TODO b/pkgs/htdp-pkgs/htdp-test/htdp/tests/TODO
deleted file mode 100644
index fd66b5a698..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/TODO
+++ /dev/null
@@ -1,24 +0,0 @@
------------------------------------------------------------------------------------
-
-docs: 
-
------------------------------------------------------------------------------------
-code: 
-
-General comment: 
- the word repl should disappear
-
-guess.ss: repl, repl3,
-  check that the result is a symbol gives bad error message 
-
-master.ss 
-  add close? button 
-
-hangman.ss
-  error messages: can we do better? 
-  (test-error (hangman-list (lambda (x y z) x) first))
-  (test-error (hangman-list (lambda (x y z) x) list))
-  
-  the game should be "start-once only"
-
------------------------------------------------------------------------------------
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/arrow-gui.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/arrow-gui.rkt
deleted file mode 100644
index c18fb8e9ef..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/arrow-gui.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname arrow-gui) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require htdp/arrow-gui)
-(require htdp/gui)
-
-(define (left b e) (draw-message msg "left"))
-(define (right b e) (draw-message msg "right"))
-(define (up b e) (draw-message msg "up"))
-(define (down b e) (draw-message msg "down"))
-
-(define msg (make-message (make-string 22 #\space)))
-(check-expect (window? (create-window (list (list msg)))) true)
-(check-expect (connect left right up down) true)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/arrow.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/arrow.rkt
deleted file mode 100644
index aa12abb359..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/arrow.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname arrow) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require htdp/arrow)
-(require htdp/draw)
-
-;; ---------------------------------------------------------------------
-;; 
-
-;; A shape is a structure: 
-;;   (make-posn num num)
-
-;; RAD : the radius of the simple disk moving across a canvas
-(define RAD 10)
-
-;; move : number shape   -> shape or false 
-;; to move a shape by delta according to translate 
-;; effect: to redraw it 
-(define (move delta sh)
-  (cond
-    [(and (clear-solid-disk sh RAD)
-          (draw-solid-disk (translate sh delta) RAD))
-     (translate sh delta)]
-    [else false]))
-
-;; translate : shape number -> shape 
-;; to translate a shape by delta in the x direction 
-(define (translate sh delta)
-  (make-posn (+ (posn-x sh) delta) (posn-y sh)))
-
-;; draw-it : shape -> true
-;; to draw a shape on the canvas: a disk with radius
-(define (draw-it sh)
-  (draw-solid-disk sh RAD))
-
-;; TESTS: 
-
-;; this creates the canvas
-(check-expect (start 100 50) true)
-(check-expect (draw-solid-string (make-posn 5 10) "click on arrow keys") true)
-
-;; this creates the controller GUI
-(check-expect (control-left-right (make-posn 10 20) 10 move draw-it) true)
-
-; (load "tester.rkt")
-
-; (test-error (control-left-right 'aa 10 move))
-
-;; cannot raise an exception:
-;(control-left-right 'aa 10 move draw-it)
-;; shape is polymorphic!!
-
-; (test-error (control-left-right 'aa 'bb move draw-it))
-; (control-left-right 'aa 'bb move draw-it)
-; (test-error (control-left-right 'aa 10 'cc draw-it))
-; (control-left-right 'aa 10 'cc draw-it)
-; (test-error (control-left-right 'aa 10 move 'cc))
-; (control-left-right 'aa 10 move 'cc)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-error.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-error.rkt
deleted file mode 100644
index f846de3859..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-error.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket
-(require racket/runtime-path
-         htdp/convert)
-
-(define-runtime-path non-error-pth "convert-drracket-non-error.txt")
-(define-runtime-path error-pth "convert-drracket-error.txt")
-
-(define (Fahrenheit->Celsius x) (* (/ 100 180) (- x 32)))
-
-(convert-file non-error-pth Fahrenheit->Celsius
-              (build-path (find-system-path 'temp-dir) "out.dat"))
-
-(with-handlers ((exn:fail:read? void))
-  "The input file contains a bad header. The next line should raise an exn."
-  (convert-file error-pth Fahrenheit->Celsius
-                (build-path (find-system-path 'temp-dir) "out.dat"))
-  (raise `(test "this test should have failed but didn't")))
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-error.txt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-error.txt
deleted file mode 100644
index 0b736d5a2b..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-error.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-;; MATTHIAS ADDED THIS LINE TO BREAK THE BRITTLE ASSUMPTION IN HTDP/CONVERT. 
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname convert-drracket-error) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-
-214
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-non-error.txt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-non-error.txt
deleted file mode 100644
index fe48ca4a9a..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-non-error.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname convert-drracket-non-error) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-214
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert.rkt
deleted file mode 100644
index dcc0aa8ef1..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert.rkt
+++ /dev/null
@@ -1,71 +0,0 @@
-#lang racket 
-
-(require htdp/testing)
-(require htdp/convert)
-
-;; f2c : num -> num
-;; to convert a Fahrenheit temperature into a Celsius temperature 
-(define (f2c f)
-  (* 5/9 (- f 32)))
-
-(define (fx y) 
-  'xyz)
-
-#| Tests: with teach-pack convert.ss |#
-
-(= (f2c 212) 100)
-(= (f2c 32) 0)
-(= (f2c -40) -40)
-
-;; ----------------------------------------------------------------------------
-(define IN (build-path (find-system-path 'temp-dir) "convert-in.dat"))
-(define OUT (build-path (find-system-path 'temp-dir) "convert-out.dat"))
-
-(define (create-convert-in)
-  (printf "212 32\n-40\n"))
-
-(define (check-convert-out)
-  (and (= (read) 100)
-       (= (read) 0)
-       (= (read) -40)))
-
-(when (file-exists? IN) (delete-file IN))
-(with-output-to-file IN create-convert-in)
-(when (file-exists? OUT) (delete-file OUT))
-(convert-file IN f2c OUT)
-(with-input-from-file OUT check-convert-out)
-
-(check-error (convert-file IN list OUT)
-             "convert: The conversion function must produce a number; but it produced '(212)")
-
-(check-error (convert-file IN first OUT)
-             "first: expects non-empty list; given 212")
-
-(check-error (convert-file IN fx OUT)
-             "convert: The conversion function must produce a number; but it produced 'xyz")
-
-(check-error (convert-file IN f2c 10)
-             "convert-file: expects a string as third argument, given 10")
-
-;; ----------------------------------------------------------------------------
-;; convert by repl: 
-(convert-repl f2c) 
-;; type in 0 212 40 into the repl 
-
-;; ----------------------------------------------------------------------------
-;; convert by GUI 
-
-(convert-gui f2c) 
-
-(define (f2x x) (* x x x x))
-
-(convert-gui f2x)
-;; must result in an error 
-
-;; TEST BY HAND: (convert-gui first)
-;; first is blamed but not nicely 
-
-;; TEST BY HAND: (convert-gui fx)
-;; signal an error about not returning a number
-
-(generate-report)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/dir.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/dir.rkt
deleted file mode 100644
index 765346a8e0..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/dir.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname dir) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require htdp/dir)
-
-(define current (create-dir "."))
-(define teachps (create-dir (string-append "/Users/matthias/plt/" "collects/teachpack/htdp")))
-
-(define current-files (map file-name (dir-files current)))
-(define teachps-files (map file-name (dir-files teachps)))
-
-(append
- (map (lambda (x) (format "in Teachpacks, not in Test: ~s" x))
-      (filter (lambda (x) (not (member x current-files))) teachps-files))
- (map (lambda (x) (format "in Test, not in  Teachpacks: ~s" x))
-      (filter (lambda (x) (not (member x teachps-files))) current-files)))
-
-(check-expect (make-file 'a 1 2) (make-file 'a 1 2))
-
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/docs.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/docs.rkt
deleted file mode 100644
index afa33721f2..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/docs.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname docs) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require htdp/docs)
-
-(check-expect (annotation? '<html>) true)
-(check-expect (annotation? 'html) false)
-(check-expect (annotation? '<p>) true)
-
-(check-expect (end-annotation '<html>) '</html>)
-
-(check-expect 
- (write-file
-  (list '<p> 'hello 'world 'is 'the 'most 'stupid 'program 'in 'the 'world '</p>
-        "so let's test this" 'with "How's that"))
- true)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/draw.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/draw.rkt
deleted file mode 100644
index b5a84975ce..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/draw.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname draw) (read-case-sensitive #t) (teachpacks ((lib "draw.ss" "teachpack" "htdp"))) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ((lib "draw.ss" "teachpack" "htdp")))))
-;; This tests a good portion but needs some more 
-;; This needs some tests for error behavior of functions ... 
-
-;; draw-next-part : symbol -> true
-;; consumes one of the seven body-part symbols and draws that part.
-
-(define (draw-next-part body-part)
-  (cond 
-    [(eq? body-part 'body)
-     (draw-solid-line (make-posn 100 60) (make-posn 100 130) 'black)]
-    [(eq? body-part 'right-leg)
-     (draw-solid-line (make-posn 100 130) (make-posn 30 170) 'black)]
-    [(eq? body-part 'left-leg)
-     (draw-solid-line (make-posn 100 130) (make-posn 170 170) 'black)]
-    [(eq? body-part 'right-arm)
-     (draw-solid-line (make-posn 100 75) (make-posn 40 65) 'black)]
-    [(eq? body-part 'left-arm)
-     (draw-solid-line (make-posn 100 75) (make-posn 160 65) 'black)]
-    [(eq? body-part 'head)
-     (draw-solid-disk (make-posn 100 50) 10 'black)]
-    [(eq? body-part 'noose)
-     (and
-      (draw-solid-disk (make-posn 120 50) 30 'red)
-      (draw-solid-line (make-posn 100 30) (make-posn 100 10) 'black)
-      (draw-solid-line (make-posn 100 10) (make-posn 0 10) 'black)
-      (draw-solid-line (make-posn 115 35) (make-posn 123 43) 'black)
-      (draw-solid-line (make-posn 123 35) (make-posn 115 43) 'black)
-      (draw-solid-line (make-posn 131 40) (make-posn 139 48) 'black)
-      (draw-solid-line (make-posn 139 40) (make-posn 131 48) 'black))]))
-
-;; ----- Tests -----------------------------------------------------------------
-
-(check-expect (start 200 400) true)
-(check-expect (sleep-for-a-while 1) true)
-(check-expect (draw-next-part 'noose) true)
-(check-expect (sleep-for-a-while 1) true)
-(check-expect (draw-next-part 'head) true)
-(check-expect (sleep-for-a-while 1) true)
-(check-expect (draw-next-part 'left-arm) true)
-(check-expect (sleep-for-a-while 1) true)
-(check-expect (draw-next-part 'right-arm) true)
-(check-expect (sleep-for-a-while 1) true)
-(check-expect (draw-next-part 'body) true)
-(check-expect (sleep-for-a-while 1) true)
-(check-expect (draw-next-part 'left-leg) true)
-(check-expect (sleep-for-a-while 1) true)
-(check-expect (draw-next-part 'right-leg) true)
-(check-expect (draw-solid-string (make-posn 10 200) "please click on the canvas") true)
-(check-expect (posn? (wait-for-mouse-click)) true)
-(check-expect (stop) true)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/elevator.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/elevator.rkt
deleted file mode 100644
index a7577170ae..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/elevator.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname elevator) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require htdp/elevator)
-
-;; next3 : (union 'up 'down) N X -> N
-;; always sends elevator to next floor up or down, 
-;; switches direction at either end 
-(define (next3 x y z)
-  (cond
-    ((and (eq? 'up x) (< y 8)) (+ y 1))
-    ((eq? 'up x) 7) ; anything down
-    ((and (eq? 'down x) (> y 1)) (- y 1))
-    (else 2))) ; anything up
-
-(run next3)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/graphing.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/graphing.rkt
deleted file mode 100644
index 2b0cdf38b7..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/graphing.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname graphing) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require htdp/graphing)
-
-(define (fun1 x) (+ (* x x) 1))
-(check-expect (graph-fun fun1 'red) true)
-
-(define (fun2 x) (+ (* -1 x x) 1))
-(check-expect (graph-fun fun2 'blue) true)
-
-(define (line1 x) (+ (* +1 x) 10))
-(check-expect (graph-line line1 'black) true)
-
-(define (line2 x) (+ (* -1 x) 10))
-(check-expect (graph-line line2 'green) true)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess1.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess1.rkt
deleted file mode 100644
index 1fb35f7499..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess1.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname guess1) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require htdp/guess)
-
-;; check-guess : number number -> symbol 
-;; to determine how guess and target relate to each other 
-(define (check-guess guess target)
-  (cond
-    ((< target guess) 'TooLarge)
-    ((= target guess) 'Perfect)
-    ((> target guess) 'TooSmall)))
-
-;; Tests: 
-(eq? (check-guess 5000 5631) 'TooSmall)
-(eq? (check-guess 6000 5631) 'TooLarge)
-(eq? (check-guess 5631 5631) 'Perfect)
-
-;; Test with GUI lib: set lib to guess-lib.ss
-(check-expect (guess-with-gui check-guess) true)
-
-; (guess-with-gui list)
-; (define (foo x) x) (guess-with-gui foo)
-; (guess-with-gui first)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess2.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess2.rkt
deleted file mode 100644
index 1d3f2ec201..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess2.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname guess2) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require htdp/guess)
-
-;; check-guess3 : digit digit digit number -> symbol
-;; to determine how three guess digits and target relate to each other 
-(define (check-guess3 d0 d1 d2 target)
-  (check-guess (convert3 d0 d1 d2) target))
-
-;; convert3: digit digit digit -> number
-;; to convert three digits, from right to left, into a number 
-(define (convert3 d0 d1 d2) 
-  (+ (* 100 d2)(+ (* 10 d1) d0)))
-
-;; check-guess : number number -> symbol 
-;; to determine how guess and target relate to each other 
-(define (check-guess guess target)
-  (cond
-    ((< target guess) 'TooLarge)
-    ((= target guess) 'Perfect)
-    ((> target guess) 'TooSmall)))
-
-;; Tests for check-guess3:
-(= (convert3 0 0 5) 500)
-(= (convert3 1 2 3) 321)
-
-;; Tests for check-guess3:
-(eq? (check-guess3 0 0 5 631) 'TooSmall)
-(eq? (check-guess3 0 0 7 631) 'TooLarge)
-(eq? (check-guess3 1 3 6 631) 'Perfect)
-
-;; Test with GUI: set lib to guess-lib.ss
-(check-expect (guess-with-gui-3 check-guess3) true)
-
-; (define (foo x) x) (guess-with-gui-3 foo) 
-; (guess-with-gui-3 'a)
-       
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess3.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess3.rkt
deleted file mode 100644
index 1ffb8cf012..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess3.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname guess3) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require htdp/guess)
-
-;; check-guess-for-list : (listof DIGIT) number -> symbol
-;; to determine how guess digits and target relate to each other 
-(define (check-guess-for-list guess-list target)
-  (check-guess (convert guess-list)target))
-
-;; check-guess : number number -> symbol 
-;; to determine how guess and target relate to each other 
-(define (check-guess guess target)
-  (cond
-    ((< target guess) 'TooLarge)
-    ((= target guess) 'Perfect)
-    ((> target guess) 'TooSmall)))
-
-;; convert : (listof DIGIT) -> number
-;; to convert a vector of digits into a number 
-;; 0-th digit is right-most digit in number, 
-;; N-th digit is left-most digit in number
-(define (convert digits)
-  (cond
-    ((empty? digits) 0)
-    (else (+ (first digits) (* (convert (rest digits)) 10)))))
-
-;; EXAMPLES/TESTS for convert:
-(= (convert (cons 1 (cons 2 (cons 3 empty)))) 321)
-(= (convert (cons 4 (cons 5 (cons 6 empty)))) 654)
-
-;; EXAMPLES/TESTS for check-guess-for-list:
-(eq? (check-guess-for-list (cons 0 (cons 0 (cons 5 empty))) 631) 'TooSmall)
-(eq? (check-guess-for-list (cons 6 (cons 0 (cons 7 empty))) 631) 'TooLarge)
-(eq? (check-guess-for-list (cons 1 (cons 3 (cons 6 empty))) 631) 'Perfect)
-
-;; Test with GUI: set lib to guess-lib.ss
-(check-expect (guess-with-gui-list 2 check-guess-for-list) true)
-
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/gui.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/gui.rkt
deleted file mode 100644
index 2269cf0ecb..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/gui.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-advanced-reader.ss" "lang")((modname gui) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #t #t none #f ())))
-(require htdp/gui)
-
-;; type in text, choose, click okay, watch message field change, close
-
-(define msg (make-message "Hello World"))
-
-(define txt (make-text "Enter your password please"))
-
-(define chc (make-choice (list "Choose something" "Or other")))
-
-(define call-back
-  (lambda (x)
-    (begin
-      (draw-message msg (format "~s ~s\n" (choice-index chc) (text-contents txt)))
-      (draw-message msg "Bye World"))))
-
-(define (destroy x) (hide-window x))
-
-(define w 
-  (create-window
-   (list (list txt msg chc)
-         (list (make-button "Okay?" call-back))
-         (list (make-button "Close" (lambda (x) (hide-window w)))))))
-
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/hangman-error.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/hangman-error.rkt
deleted file mode 100644
index 79a645049f..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/hangman-error.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-advanced-reader.ss" "lang")((modname hangman-error) (read-case-sensitive #t) (teachpacks ((lib "hangman.ss" "teachpack" "htdp"))) (htdp-settings #(#t constructor repeating-decimal #t #t none #f ((lib "hangman.ss" "teachpack" "htdp")))))
-(define (reveal-list chosen status guess)
-  '(a))
-
-(define (draw-next-part body-part)
-  (begin
-    "this revealed an omission in the teachpack"
-    (printf "body-part ~s\n" body-part)))
-
-(start 200 200)
-(check-error (hangman-list reveal-list draw-next-part) 
-             "draw-next-part: is expected to return a boolean, but it returned (void)")
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/hangman1.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/hangman1.rkt
deleted file mode 100644
index 10a0a9278b..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/hangman1.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname hangman1) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require htdp/hangman)
-
-; (load "tester.rkt")
-;; by hand, Beginner for plain, Full for errors 
-
-
-(define-struct word (a b c))
-;; A word is a structure: (make-word letter letter letter)
-
-;; DEFINITION: 
-(define (reveal chosen status guess)
-  (make-word (reveal1 (word-a chosen) (word-a status) guess)
-             (reveal1 (word-b chosen) (word-b status) guess)
-             (reveal1 (word-c chosen) (word-c status) guess)))
-
-;; EXAMPLES:
-;; reveal1: 'a 'a 'x => 'a 
-;; reveal1: 'x '_ 'x => 'x
-;; reveal1: 'x '_ 'y => '_
-
-;; The inputs are atomic, which means we need domain knowledge.
-;; The domain knowledge is given in the problem statement. 
-
-;; DEFINITION: 
-(define (reveal1 ch st gu) 
-  (cond
-    ((eq? ch st) ch)
-    ((eq? ch gu) gu)
-    (else st)))
-
-
-
-;; TESTS:
-(eq? (reveal1 'a 'a 'x) 'a)
-(eq? (reveal1 'x '_ 'x) 'x)
-(eq? (reveal1 'x '_ 'y) '_)
-
-(equal? (reveal (make-word 'd 'e 'r) (make-word '_ '_ '_) 'd)
-        (make-word 'd '_ '_))
-(equal? (reveal (make-word 'd 'e 'r) (make-word '_ '_ '_) 'f)
-        (make-word '_ '_ '_))
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/info.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/info.rkt
deleted file mode 100644
index 6cc5bfb000..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define test-omit-paths
-  '("convert.rkt"
-    "elevator.rkt"
-    "dir.rkt"
-    "graphing.rkt"
-    "gui.rkt"
-    "hangman-error.rkt"
-    "world-mouse.rkt"
-    "matrix-client.rkt"
-    "matrix-example.rkt"))
-
-(define test-responsibles '(("gui.rkt" robby)))
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/lkup-gui.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/lkup-gui.rkt
deleted file mode 100644
index 9afe66752b..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/lkup-gui.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-advanced-reader.ss" "lang")((modname lkup-gui) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #t #t none #f ())))
-(require htdp/lkup-gui)
-
-(check-expect (connect
-               (lambda (e b)
-                 (view (control))))
-              true)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/master.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/master.rkt
deleted file mode 100644
index ca18733c04..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/master.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-beginner-reader.ss" "lang")((modname master) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require htdp/master)
-
-; (load "tester.rkt")
-
-;; check-guess : color color color color -> symbol
-
-(define (check-guess target1 target2 guess1 guess2)
-  (cond
-    ((and (eq? target1 guess1) (eq? target2 guess2))
-     'perfect)
-    ((or  (eq? target1 guess1) (eq? target2 guess2))
-     'one_color-at_correct_position)
-    ((or  (eq? target1 guess2) (eq? target2 guess1))
-     'the_colors_occur)
-    (else 'nothing_correct)))
-
-;; Tests: 
-(eq? (check-guess 'white 'blue 'white 'blue) 'perfect)
-(eq? (check-guess 'white 'blue 'red 'blue) 'one_color-at_correct_position)
-(eq? (check-guess 'white 'blue 'blue 'red) 'the_colors_occur)
-(eq? (check-guess 'white 'blue 'red 'green) 'nothing_correct)
-
-(check-expect (master check-guess) true)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-client.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-client.rkt
deleted file mode 100644
index ba9ec45fea..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-client.rkt
+++ /dev/null
@@ -1,1648 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.3.1.5 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 30 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 93
-(
- #"((lib \"collapsed-snipclass.ss\" \"framework\") (lib \"collapsed-sni"
- #"pclass-wxme.ss\" \"framework\"))\0"
-) 0 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 88
-(
- #"((lib \"pict-snip.rkt\" \"drracket\" \"private\") (lib \"pict-snip.r"
- #"kt\" \"drracket\" \"private\"))\0"
-) 0 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 26 #"drracket:spacer-snipclass\0"
-0 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 1 6 #"wxloc\0"
-          0 0 136 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 12 #"Courier New\0"
-0 14 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 38
-#"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 16
-#"Misspelled Text\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
-#"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 37
-#"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 13 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-0.0 13 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-0.0 13 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 0 1 #"\0"
-0 75 13 #" Inconsolata\0"
-0.0 20 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 38 #"drscheme:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-28 #"drscheme:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 31
-#"drscheme:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 8 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 8 24 #"drscheme:text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 41 #"profj:syntax-colors:scheme:block-comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-35 #"profj:syntax-colors:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 37 #"profj:syntax-colors:scheme:prim-type\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 38 #"profj:syntax-colors:scheme:identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 34
-#"profj:syntax-colors:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 35
-#"profj:syntax-colors:scheme:literal\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 35
-#"profj:syntax-colors:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-33 #"profj:syntax-colors:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 35
-#"profj:syntax-colors:scheme:default\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-colors:scheme:uncovered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 35
-#"profj:syntax-colors:scheme:covered\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 200 0 0 0 0
-0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 65 105 225 0
-0 0 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 178 34 34
-255 255 255 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-0 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 0 1 #"\0"
-0 75 23 #"Lucida Sans Typewriter\0"
-0.0 12 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 44 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1
-          0 734 0 4 3 85
-(
- #";; The first three lines of this file were inserted by DrRacket. The"
- #"y record metadata"
-) 0 0 4 29 1 #"\n"
-0 0 4 3 85
-(
- #";; about the language level of this file in a form that our tools ca"
- #"n easily process."
-) 0 0 4 29 1 #"\n"
-0 0 4 3 261
-(
- #"#reader(lib \"htdp-intermediate-lambda-reader.ss\" \"lang\")((modnam"
- #"e matrix-client) (read-case-sensitive #t) (teachpacks ((lib \"world."
- #"ss\" \"teachpack\" \"htdp\"))) (htdp-settings #(#t constructor repea"
- #"ting-decimal #f #t none #f ((lib \"world.ss\" \"teachpack\" \"htdp\""
- #")))))"
-) 0 0 4 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 7 #"require"
-0 0 22 3 2 #" ("
-0 0 14 3 3 #"lib"
-0 0 22 3 1 #" "
-0 0 19 3 11 #"\"matrix.ss\""
-0 0 22 3 1 #" "
-0 0 19 3 6 #"\"htdp\""
-0 0 22 3 2 #"))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 2 #" ("
-0 0 14 3 11 #"make-matrix"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"2"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"3"
-0 0 22 3 2 #" ("
-0 0 14 3 4 #"list"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"a"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"b"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"c"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"d"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"e"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"f"
-0 0 22 3 3 #")))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"m2"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-set"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"x"
-0 0 22 3 2 #"))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"a"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"b"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"2"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"c"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"d"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"e"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"2"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"f"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"m2"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 1 #"x"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix1"
-0 0 22 3 2 #" ("
-0 0 14 3 11 #"make-matrix"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"2"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"3"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 1 #"("
-0 0 14 3 3 #"a00"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a01"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a02"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a10"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a11"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a12"
-0 0 22 3 3 #")))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 22 3 1 #" "
-0 0 14 3 9 #"matrix1-2"
-0 0 22 3 1 #" "
-0 0 22 29 1 #"\n"
-0 0 22 3 2 #"  "
-0 16           4 135 29624
-(
- #"(((a00 a01 a02) (a10 a11 a12)) (#(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 210 0 0 0 116 0 0 0 246 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 210 0 0 0 11"
- #"6 0 0 0 246 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 210 0 0 0 116 0 0 0 246 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 191 0 0 0 3 0 0 0 253 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 234 0 "
- #"0 0 56 0 0 0 69 0 0 0 39 0 0 0 133 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 234 0 0 0 56 0 0 0 69 0 0 0 39 0 0 0 133 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 191 0 0 0 3 0 0 0 253 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 234 0 0 0 56 0 0 0 69 0 0 0 39 0 0 0 133 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 229 0 0 0 84 0 0 0 27 0 0 0 76 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 191 0 0 0 3 0 0 0 253 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 234 0 0 0 56 0 0 0 69 0 0 0 39 0 0 0 133 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 102 0 0 0 42 0 0 0 72 0 0 0 43 0 0 0 162 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 "
- #"0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 216 0 0 0 25 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 93 0 0 0 117 0 0 0 255 0 0 0 242 0 0 0 29 0 0"
- #" 0 196 0 0 0 255 0 0 0 255 0 0 0 93 0 0 0 117 0 0 0 255 0 0 0 242 0 "
- #"0 0 29 0 0 0 196 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 216 0"
- #" 0 0 25 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 93 0 0 0 117 0 0 0 255 0 0 0 242"
- #" 0 0 0 29 0 0 0 196 0 0 0 255 0 0 0 255 0 0 0 242 0 0 0 218 0 0 0 13"
- #"7 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 216 0 0 0 25 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 93 0 0 0 117 0 0 0"
- #" 255 0 0 0 242 0 0 0 29 0 0 0 196 0 0 0 255 0 0 0 255 0 0 0 227 0 0 "
- #"0 255 0 0 0 255 0 0 0 190 0 0 0 20 0 0 0 245 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 245 0 0 0 156 0 0 0 255 0 0 0 255 0 0 0 129 0 0"
- #" 0 50 0 0 0 24 0 0 0 100 0 0 0 254 0 0 0 255 0 0 0 245 0 0 0 5 0 0 0"
- #" 210 0 0 0 255 0 0 0 255 0 0 0 109 0 0 0 99 0 0 0 255 0 0 0 245 0 0 "
- #"0 5 0 0 0 210 0 0 0 255 0 0 0 255 0 0 0 109 0 0 0 99 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 245 0 0 0 156 0 0 0 255 0 0 0 255 0 0"
- #" 0 129 0 0 0 50 0 0 0 24 0 0 0 100 0 0 0 254 0 0 0 255 0 0 0 245 0 0"
- #" 0 5 0 0 0 210 0 0 0 255 0 0 0 255 0 0 0 109 0 0 0 99 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 245 0 0 0 156 0 0 0 255 0"
- #" 0 0 255 0 0 0 129 0 0 0 50 0 0 0 24 0 0 0 100 0 0 0 254 0 0 0 255 0"
- #" 0 0 245 0 0 0 5 0 0 0 210 0 0 0 255 0 0 0 255 0 0 0 109 0 0 0 99 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 219 0 0 0 1 0 "
- #"0 0 234 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 "
- #"0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 165 0 0 0 221 0 0 0 234 0 0 0 20 0 0 0 199 0"
- #" 0 0 255 0 0 0 217 0 0 0 0 0 0 0 243 0 0 0 255 0 0 0 255 0 0 0 141 0"
- #" 0 0 65 0 0 0 255 0 0 0 217 0 0 0 0 0 0 0 243 0 0 0 255 0 0 0 255 0 "
- #"0 0 141 0 0 0 65 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 165 0 0 0 221 0 0 0 234 0 0 0 20 "
- #"0 0 0 199 0 0 0 255 0 0 0 217 0 0 0 0 0 0 0 243 0 0 0 255 0 0 0 255 "
- #"0 0 0 141 0 0 0 65 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138"
- #" 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 165 0 0 0 221 0 0 0 "
- #"234 0 0 0 20 0 0 0 199 0 0 0 255 0 0 0 217 0 0 0 0 0 0 0 243 0 0 0 2"
- #"55 0 0 0 255 0 0 0 141 0 0 0 65 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 119 0 0 0 63 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 65 0 0 0 149 0 0 0 255 0 0 0 202 0 0 0 0 0 0 0 "
- #"253 0 0 0 255 0 0 0 255 0 0 0 150 0 0 0 50 0 0 0 255 0 0 0 202 0 0 0"
- #" 0 0 0 0 253 0 0 0 255 0 0 0 255 0 0 0 150 0 0 0 50 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 65 0 0 0 149 0 0 0 255 0 0 0 202 0 0"
- #" 0 0 0 0 0 253 0 0 0 255 0 0 0 255 0 0 0 150 0 0 0 50 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 65 0 0 0 149 0 0 0 255 "
- #"0 0 0 202 0 0 0 0 0 0 0 253 0 0 0 255 0 0 0 255 0 0 0 150 0 0 0 50 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 173 0 0 0 34 0 0 0 232 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 "
- #"0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 169 0 0 0 87 0 0 0 76 0 0 0 20 0 0 0 148 0"
- #" 0 0 255 0 0 0 225 0 0 0 0 0 0 0 239 0 0 0 255 0 0 0 255 0 0 0 135 0"
- #" 0 0 74 0 0 0 255 0 0 0 225 0 0 0 0 0 0 0 239 0 0 0 255 0 0 0 255 0 "
- #"0 0 135 0 0 0 74 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 169 0 0 0 87 0 0 0 76 0 0 0 20 0 "
- #"0 0 148 0 0 0 255 0 0 0 225 0 0 0 0 0 0 0 239 0 0 0 255 0 0 0 255 0 "
- #"0 0 135 0 0 0 74 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0"
- #" 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 169 0 0 0 87 0 0 0 76 "
- #"0 0 0 20 0 0 0 148 0 0 0 255 0 0 0 225 0 0 0 0 0 0 0 239 0 0 0 255 0"
- #" 0 0 255 0 0 0 135 0 0 0 74 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 184 "
- #"0 0 0 33 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 206 0 0 0 8 0 0 0 219 0"
- #" 0 0 255 0 0 0 68 0 0 0 148 0 0 0 255 0 0 0 251 0 0 0 17 0 0 0 201 0"
- #" 0 0 255 0 0 0 255 0 0 0 95 0 0 0 116 0 0 0 255 0 0 0 251 0 0 0 17 0"
- #" 0 0 201 0 0 0 255 0 0 0 255 0 0 0 95 0 0 0 116 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 206 0 0 0 8 "
- #"0 0 0 219 0 0 0 255 0 0 0 68 0 0 0 148 0 0 0 255 0 0 0 251 0 0 0 17 "
- #"0 0 0 201 0 0 0 255 0 0 0 255 0 0 0 95 0 0 0 116 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"206 0 0 0 8 0 0 0 219 0 0 0 255 0 0 0 68 0 0 0 148 0 0 0 255 0 0 0 2"
- #"51 0 0 0 17 0 0 0 201 0 0 0 255 0 0 0 255 0 0 0 95 0 0 0 116 0 0 0 2"
- #"55 0 0 0 255 0 0 0 212 0 0 0 23 0 0 0 210 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 "
- #"0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 181 0 0 0 25 0 0 0 247 0 0 0 212 0 0 0 37 0 0 0 135 0 0 0 "
- #"255 0 0 0 255 0 0 0 110 0 0 0 105 0 0 0 255 0 0 0 233 0 0 0 20 0 0 0"
- #" 213 0 0 0 255 0 0 0 255 0 0 0 110 0 0 0 105 0 0 0 255 0 0 0 233 0 0"
- #" 0 20 0 0 0 213 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 181 0 0 0 25 0 0 0 247 0 0 0 212 0 0 0 37 0 "
- #"0 0 135 0 0 0 255 0 0 0 255 0 0 0 110 0 0 0 105 0 0 0 255 0 0 0 233 "
- #"0 0 0 20 0 0 0 213 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138"
- #" 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 181 0 0 0 25 0 0 0 247 0 0 0 2"
- #"12 0 0 0 37 0 0 0 135 0 0 0 255 0 0 0 255 0 0 0 110 0 0 0 105 0 0 0 "
- #"255 0 0 0 233 0 0 0 20 0 0 0 213 0 0 0 255 0 0 0 255 0 0 0 63 0 0 0 "
- #"98 0 0 0 240 0 0 0 240 0 0 0 240 0 0 0 253 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 250 0 0 0 57 0 0 0 "
- #"16 0 0 0 52 0 0 0 123 0 0 0 20 0 0 0 205 0 0 0 255 0 0 0 242 0 0 0 6"
- #"1 0 0 0 58 0 0 0 31 0 0 0 148 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 24"
- #"2 0 0 0 61 0 0 0 58 0 0 0 31 0 0 0 148 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 250 0 0 0 5"
- #"7 0 0 0 16 0 0 0 52 0 0 0 123 0 0 0 20 0 0 0 205 0 0 0 255 0 0 0 242"
- #" 0 0 0 61 0 0 0 58 0 0 0 31 0 0 0 148 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 210 0 0 0 25 0 0 0 13 0 0 0 7 0 0 0 25 0 0 0 155 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 250 0"
- #" 0 0 57 0 0 0 16 0 0 0 52 0 0 0 123 0 0 0 20 0 0 0 205 0 0 0 255 0 0"
- #" 0 242 0 0 0 61 0 0 0 58 0 0 0 31 0 0 0 148 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 215 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 "
- #"0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 210 0 0 0 11"
- #"6 0 0 0 246 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 210 0 0 0 116 0 0 0 246 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 210 0 0 0 116 0 0 0 246 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 191 0 0 0 3 0 0 0 253 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 229 0 0 0 84 0 0 0 27 0 0 0 76 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 234 0 0 0 56 0 0 0 69 0 0 0 39 0 0 0 133 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 191 0 0 0 3 0 0 0 "
- #"253 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 229 0 0 0 84 0 0 0 27 0 0 0 76 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 229 0 0 0 84 0 0 0 27 0 0 0 76 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 191 0 0 "
- #"0 3 0 0 0 253 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 229 0 0 0 84 0 0 0 27 0 0 0 76 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 102 0 0 0 42 0 0 0 72 0 0 0"
- #" 43 0 0 0 162 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"216 0 0 0 25 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 242 0 0 0 218 0 0 0 137 0 0"
- #" 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 93 0 0 0 117 0 0"
- #" 0 255 0 0 0 242 0 0 0 29 0 0 0 196 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 216 0 0 0 25 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 242 0 0 0 218"
- #" 0 0 0 137 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 24"
- #"2 0 0 0 218 0 0 0 137 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 216 0 0 0 25 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 242 0 0 0 218 0 0 0 137 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 227 0 0 0 255 0 0 0 255 0 0 0 190 0 0 0 20 0 0 0 245 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 245 0 0 0 156 0 0 0 255 0 "
- #"0 0 255 0 0 0 129 0 0 0 50 0 0 0 24 0 0 0 100 0 0 0 254 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 245 0 0 0 5 0 0 0 210 0 0 0 255 0 0 0 255 0 0 0 109 0"
- #" 0 0 99 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 245 0 0 0 156 "
- #"0 0 0 255 0 0 0 255 0 0 0 129 0 0 0 50 0 0 0 24 0 0 0 100 0 0 0 254 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 7"
- #"7 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"245 0 0 0 156 0 0 0 255 0 0 0 255 0 0 0 129 0 0 0 50 0 0 0 24 0 0 0 "
- #"100 0 0 0 254 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 "
- #"0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 219 0 0 0 1 0 0 0 234 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 165 0 0 0 221 0 0"
- #" 0 234 0 0 0 20 0 0 0 199 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 217 0 0 0 0 0 0"
- #" 0 243 0 0 0 255 0 0 0 255 0 0 0 141 0 0 0 65 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 165 "
- #"0 0 0 221 0 0 0 234 0 0 0 20 0 0 0 199 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 165 0 0 0 221 0 0 0 234 0 0 0 20 0 0 0 199 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 119 0 0 0 63 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 "
- #"0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 65 0 0 0 149 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 202 0 0 0 0 0 0 0 253 0 0 0 255 0 0 0 255 "
- #"0 0 0 150 0 0 0 50 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 6"
- #"5 0 0 0 149 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 "
- #"77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 65 0 0 0 149 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 173 0 0 0 34 0 0 0 232 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 169"
- #" 0 0 0 87 0 0 0 76 0 0 0 20 0 0 0 148 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 225"
- #" 0 0 0 0 0 0 0 239 0 0 0 255 0 0 0 255 0 0 0 135 0 0 0 74 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 169 0 0 0 87 0 0 0 76 0 0 0 20 0 0 0 148 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 169 0 0 0 87 0 0 0 76 0 0 0 20 0 0 0 148 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 184 0 0 0 33 0 0 0 221 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 206 0 0 0 8 0 0 0 219 0 0 0 255 0 0 0 68 0 0 0"
- #" 148 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 251 0 0 0 17 0 0 0 201 0 0 0 255 0 0"
- #" 0 255 0 0 0 95 0 0 0 116 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 206 0 0 0 8 0 0 0 219 0 0 0 255 0 "
- #"0 0 68 0 0 0 148 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0"
- #" 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 206 0 0 0 8 0 0 0 219"
- #" 0 0 0 255 0 0 0 68 0 0 0 148 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"12 0 0 0 23 0 0 0 210 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 181 0 0 0 "
- #"25 0 0 0 247 0 0 0 212 0 0 0 37 0 0 0 135 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 110 0 0 0 105 0 0 0 255 0 0 0 233 0 0 0 20 0 0 0 213 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 181 0 0 0 25 0 0 0 247 0 0 0 212 0 0 0 37 0 0 0 135 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 181 0 0 0 25 0 0 0 247 0 0 0 212 0 0 0 37 0 0 0 13"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 138 0 0 0 77 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 63 0 0 0 98 0 0 0 240 0 0 0 2"
- #"40 0 0 0 240 0 0 0 253 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 250 0 0 0 57 0 0 0 16 0 0 0 52 0 0 0 12"
- #"3 0 0 0 20 0 0 0 205 0 0 0 255 0 0 0 210 0 0 0 25 0 0 0 13 0 0 0 7 0"
- #" 0 0 25 0 0 0 155 0 0 0 255 0 0 0 255 0 0 0 242 0 0 0 61 0 0 0 58 0 "
- #"0 0 31 0 0 0 148 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 250 0 0 0 57 0 0 0 16 0 0 0 52 0 "
- #"0 0 123 0 0 0 20 0 0 0 205 0 0 0 255 0 0 0 210 0 0 0 25 0 0 0 13 0 0"
- #" 0 7 0 0 0 25 0 0 0 155 0 0 0 255 0 0 0 255 0 0 0 210 0 0 0 25 0 0 0"
- #" 13 0 0 0 7 0 0 0 25 0 0 0 155 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 250 0 0 0 57 0 0 0 16 0 0 0 5"
- #"2 0 0 0 123 0 0 0 20 0 0 0 205 0 0 0 255 0 0 0 210 0 0 0 25 0 0 0 13"
- #" 0 0 0 7 0 0 0 25 0 0 0 155 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 0 0 0 0 0 0 0 0 0 0 215 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) 94 0 0))\0"
-) 0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix1"
-0 0 22 3 1 #" "
-0 0 14 3 9 #"matrix1-2"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"r1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 2 #"(("
-0 0 14 3 3 #"a00"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a01"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a02"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 14 #"             ("
-0 0 14 3 3 #"a10"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a11"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a12"
-0 0 22 3 3 #")))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 13 #"matrix-render"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix1"
-0 0 22 3 3 #") ("
-0 0 14 3 13 #"matrix-render"
-0 0 22 3 2 #" ("
-0 0 14 3 17 #"rectangle->matrix"
-0 0 22 3 1 #" "
-0 0 14 3 2 #"r1"
-0 0 22 3 3 #")))"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 3 #"a00"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 3 #"a01"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"2"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 3 #"a02"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 3 #"a10"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 3 #"a11"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"2"
-0 0 22 3 2 #") "
-0 0 20 3 1 #"'"
-0 0 14 3 3 #"a12"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 13 #"matrix-render"
-0 0 22 3 2 #" ("
-0 0 14 3 12 #"build-matrix"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"2"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"3"
-0 0 22 3 2 #" ("
-0 0 15 3 6 #"lambda"
-0 0 22 3 2 #" ("
-0 0 14 3 1 #"i"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 3 #") ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix1"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 4 #"))))"
-0 0 22 29 1 #"\n"
-0 0 22 3 15 #"              ("
-0 0 14 3 13 #"matrix-render"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix1"
-0 0 22 3 2 #"))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix2"
-0 0 22 3 2 #" ("
-0 0 14 3 11 #"make-matrix"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"2"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"2"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 1 #"("
-0 0 14 3 3 #"a00"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a01"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a10"
-0 0 22 3 1 #" "
-0 0 14 3 3 #"a11"
-0 0 22 3 3 #")))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 13 #"matrix-render"
-0 0 22 3 2 #" ("
-0 0 14 3 12 #"matrix-minor"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix2"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 2 #"))"
-0 0 22 29 1 #"\n"
-0 0 22 3 15 #"              ("
-0 0 14 3 13 #"matrix-render"
-0 0 22 3 2 #" ("
-0 0 14 3 11 #"make-matrix"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 1 #"("
-0 0 14 3 3 #"a11"
-0 0 22 3 4 #"))))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 13 #"matrix-render"
-0 0 22 3 2 #" ("
-0 0 14 3 12 #"matrix-minor"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix2"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 2 #"))"
-0 0 22 29 1 #"\n"
-0 0 22 3 15 #"              ("
-0 0 14 3 13 #"matrix-render"
-0 0 22 3 2 #" ("
-0 0 14 3 11 #"make-matrix"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 1 #"("
-0 0 14 3 3 #"a00"
-0 0 22 3 4 #"))))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 17 3 78
-(
- #";; ================================================================="
- #"=========="
-) 0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 17 3 20 #";; Matrix -> Number "
-0 0 22 29 1 #"\n"
-0 0 17 3 53 #";; compute the determinat of a square (n x n) matrix "
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 22 3 2 #" ("
-0 0 14 3 11 #"determinant"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"M"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 3 #"  ("
-0 0 15 3 5 #"local"
-0 0 22 3 1 #" "
-0 0 22 29 1 #"\n"
-0 0 22 3 6 #"    (("
-0 0 15 3 6 #"define"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"n"
-0 0 22 3 2 #" ("
-0 0 14 3 11 #"matrix-rows"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"M"
-0 0 22 3 2 #"))"
-0 0 22 29 1 #"\n"
-0 0 22 3 6 #"     ("
-0 0 15 3 6 #"define"
-0 0 22 3 2 #" ("
-0 0 14 3 6 #"series"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 8 #"       ("
-0 0 14 3 1 #"*"
-0 0 22 3 2 #" ("
-0 0 14 3 4 #"expt"
-0 0 22 3 1 #" "
-0 0 20 3 2 #"-1"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 22 3 3 #") ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"M"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 22 3 3 #") ("
-0 0 14 3 11 #"determinant"
-0 0 22 3 2 #" ("
-0 0 14 3 12 #"matrix-minor"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"M"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 22 3 5 #")))))"
-0 0 22 29 1 #"\n"
-0 0 22 3 5 #"    ("
-0 0 14 3 2 #"if"
-0 0 22 3 2 #" ("
-0 0 14 3 1 #"="
-0 0 22 3 1 #" "
-0 0 14 3 1 #"n"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 9 #"        ("
-0 0 14 3 10 #"matrix-ref"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"M"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 9 #"        ("
-0 0 14 3 5 #"foldl"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"+"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"build-list"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"n"
-0 0 22 3 1 #" "
-0 0 14 3 6 #"series"
-0 0 22 3 5 #")))))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 11 #"determinant"
-0 0 22 3 2 #" ("
-0 0 14 3 17 #"rectangle->matrix"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 2 #"(("
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 49 #"                                                ("
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 4 #"))))"
-0 0 22 29 1 #"\n"
-0 0 22 3 14 #"              "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 11 #"determinant"
-0 0 22 3 2 #" ("
-0 0 14 3 17 #"rectangle->matrix"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 2 #"(("
-0 0 20 3 1 #"2"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 3 49 #"                                                ("
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 4 #"))))"
-0 0 22 29 1 #"\n"
-0 0 22 3 14 #"              "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 17 3 78
-(
- #";; ================================================================="
- #"=========="
-) 0 0 22 29 1 #"\n"
-0 0 17 3 32 #";; matrix with structure inside "
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 13 #"define-struct"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"p"
-0 0 22 3 2 #" ("
-0 0 14 3 1 #"x"
-0 0 22 3 1 #" "
-0 0 14 3 1 #"y"
-0 0 22 3 2 #"))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix3"
-0 0 22 3 1 #" "
-0 0 22 29 1 #"\n"
-0 0 22 3 3 #"  ("
-0 0 14 3 17 #"rectangle->matrix"
-0 0 22 3 1 #" "
-0 0 22 29 1 #"\n"
-0 0 22 3 4 #"   ("
-0 0 14 3 4 #"list"
-0 0 22 3 2 #" ("
-0 0 14 3 4 #"list"
-0 0 22 3 2 #" ("
-0 0 14 3 6 #"make-p"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 3 #") ("
-0 0 14 3 6 #"make-p"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 2 #"))"
-0 0 22 29 1 #"\n"
-0 0 22 3 10 #"         ("
-0 0 14 3 4 #"list"
-0 0 22 3 2 #" ("
-0 0 14 3 6 #"make-p"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 3 #") ("
-0 0 14 3 6 #"make-p"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 5 #")))))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix4"
-0 0 22 3 2 #" ("
-0 0 14 3 10 #"matrix-set"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix3"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 19 3 29 #"\"intentionally failing check\""
-0 0 22 3 2 #"))"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix3"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix3"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 22 3 2 #" ("
-0 0 14 3 6 #"equal?"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix3"
-0 0 22 3 1 #" "
-0 0 14 3 7 #"matrix4"
-0 0 22 3 2 #") "
-0 0 14 3 5 #"false"
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 19 3 28 #"\"the above test should fail\""
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 11 #"check-error"
-0 0 22 3 2 #" ("
-0 0 14 3 13 #"matrix-where?"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 2 #") "
-0 0 22 29 1 #"\n"
-0 0 22 3 13 #"             "
-0 0 19 3 58
-#"\"matrix-where?: expects a matrix as first argument, given "
-0 0 19 3 2 #"0\""
-0 0 22 3 1 #")"
-0 0 22 29 1 #"\n"
-0 0 22 29 1 #"\n"
-0           0
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-example.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-example.rkt
deleted file mode 100644
index 94b7659ec3..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-example.rkt
+++ /dev/null
@@ -1,2459 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.0.99.900 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 28 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 125 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 12 #"Courier New\0"
-0 13 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 38
-#"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
-#"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1 0 1 #"\0"
-0 -1 1 #"\0"
-0 13 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-0 13 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1 0 1 #"\0"
-0 75 13 #" Inconsolata\0"
-0.0 20 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 38 #"drscheme:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-28 #"drscheme:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 31
-#"drscheme:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 8 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 8 24 #"drscheme:text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 41 #"profj:syntax-colors:scheme:block-comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-35 #"profj:syntax-colors:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 37 #"profj:syntax-colors:scheme:prim-type\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 38 #"profj:syntax-colors:scheme:identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 34 #"profj:syntax-colors:scheme:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:literal\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-33 #"profj:syntax-colors:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 35
-#"profj:syntax-colors:scheme:default\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-colors:scheme:uncovered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 35
-#"profj:syntax-colors:scheme:covered\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 200 0 0 0 0
-0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 65 105 225 0
-0 0 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 178 34 34
-255 255 255 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-0 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 0 1 #"\0"
-0 75 23 #"Lucida Sans Typewriter\0"
-0.0 12 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1           0 733 0 17 3 85
-(
- #";; The first three lines of this file were inserted by DrRacket. The"
- #"y record metadata"
-) 0 0 81 29 1 #"\n"
-0 0 17 3 85
-(
- #";; about the language level of this file in a form that our tools ca"
- #"n easily process."
-) 0 0 81 29 1 #"\n"
-0 0 24 3 7 #"#reader"
-0 0 22 3 1 #"("
-0 0 14 3 3 #"lib"
-0 0 81 3 1 #" "
-0 0 19 3 36 #"\"htdp-intermediate-lambda-reader.ss\""
-0 0 81 3 1 #" "
-0 0 19 3 6 #"\"lang\""
-0 0 22 3 3 #")(("
-0 0 14 3 7 #"modname"
-0 0 81 3 1 #" "
-0 0 14 3 14 #"matrix-example"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 19 #"read-case-sensitive"
-0 0 81 3 1 #" "
-0 0 20 3 2 #"#t"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"teachpacks"
-0 0 81 3 1 #" "
-0 0 22 3 3 #"())"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 13 #"htdp-settings"
-0 0 81 3 1 #" "
-0 0 22 3 2 #"#("
-0 0 20 3 2 #"#t"
-0 0 81 3 1 #" "
-0 0 14 3 11 #"constructor"
-0 0 81 3 1 #" "
-0 0 14 3 17 #"repeating-decimal"
-0 0 81 3 1 #" "
-0 0 20 3 2 #"#f"
-0 0 81 3 1 #" "
-0 0 20 3 2 #"#t"
-0 0 81 3 1 #" "
-0 0 14 3 4 #"none"
-0 0 81 3 1 #" "
-0 0 20 3 2 #"#f"
-0 0 81 3 1 #" "
-0 0 22 3 5 #"())))"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 7 #"require"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 3 #"lib"
-0 0 81 3 1 #" "
-0 0 19 3 11 #"\"matrix.ss\""
-0 0 81 3 1 #" "
-0 0 19 3 6 #"\"htdp\""
-0 0 22 3 2 #"))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 17 3 26 #";; Matrix Matrix -> Matrix"
-0 0 81 29 1 #"\n"
-0 0 17 3 20 #";; add two matrices "
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"+m"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"one"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"two"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 2 #"  "
-0 0 22 3 1 #"("
-0 0 14 3 12 #"build-matrix"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"matrix-rows"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"one"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"matrix-cols"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"one"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 16 #"                "
-0 0 22 3 1 #"("
-0 0 15 3 6 #"lambda"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 1 #"i"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 18 #"                  "
-0 0 22 3 1 #"("
-0 0 14 3 1 #"+"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"matrix-ref"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"one"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 21 #"                     "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"matrix-ref"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"two"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 5 #")))))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 81 3 2 #"  "
-0 14           4 81 12523
-(
- #"(((2 3 4) (2 0 2)) (#(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 0 0 0 204"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0"
- #" 0 0 0 0 0 0 0 0 0 0 0 34 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 153 "
- #"0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 136 0 0 0 34 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 204 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 51 0 0 0 0 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 238 0 0 0 34 0 0 0 221 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187"
- #" 0 0 0 51 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 85 0 0 0 153 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 68 0 0 0 "
- #"187 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 17 0 0 0 204 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 0 0 0 0 0 0 0 0 153 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 119 0 0 0 153 0 0 0 255 0 0 0 255 0 0 0"
- #" 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 204 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 238 0 0 "
- #"0 102 0 0 0 153 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 51 0 0 0 238 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 51 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 "
- #"0 0 0 204 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 0 0 0 204 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 170 0"
- #" 0 0 17 0 0 0 17 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 0 0 0 204 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 "
- #"0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 136 0 0 0 34 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 34 0 0 0 238 0 0 0 238 0 0 "
- #"0 34 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 136 0 0 0 34 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 68 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 68 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 51 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187"
- #" 0 0 0 51 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 17 0 0 0 204 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 17 0 0 0 204 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 20"
- #"4 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 204 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 51 0 0 0 238 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 68 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 68 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 51 0 0 "
- #"0 238 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0"
- #" 0 0 34 0 0 0 238 0 0 0 238 0 0 0 34 0 0 0 170 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 17 0 0 0 0"
- #" 0 0 0 119 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"
- #") 40 0 0))\0"
-) 0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m2"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"+m"
-0 0 81 3 1 #" "
-0 14           4 81 12527
-(
- #"(((1 2 3) (0 0 1)) (#(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 102 0 0 0 17 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 0 0 0 204 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 34 0"
- #" 0 0 170 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 85 0 0 0 136 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 136 0 0 0 34 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 0 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 51 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 221 0 0 0 85 0 0 0 153 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 221 0 0 0 17 0 0 0 204 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 153 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 51 0 0"
- #" 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 238 0 0 0 102 0 0 0 153 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 51 0 0 0 238 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 170 0 0 0 51 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 0 0 0 204 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0"
- #" 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 17 0 0 0 17 0 0 0 170 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 170 0 0 0 17 0 0 0 17 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 102 0 0 0 17 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 187 0 0 0 34 0 0 0 238 0 0 0 238 0 0 0 34 0 0 0 187 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 34 0 0 0 238"
- #" 0 0 0 238 0 0 0 34 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 85 0 0 0 136 0 0 0 0 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 68 0 0 0 170 "
- #"0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 68 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 68 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 18"
- #"7 0 0 0 68 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0"
- #" 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 68 0 0 0 187 0 0 0 255 0 0 0 "
- #"255 0 0 0 170 0 0 0 68 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 68 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 68 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 187 0 0 0 34 0 0 0 238 0 0 0 238 0 0 0 34 0 0 0"
- #" 170 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0"
- #" 0 34 0 0 0 238 0 0 0 238 0 0 0 34 0 0 0 170 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 170 0 0 0 17 0 0 0 0 0 0 0 119 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 17 0 0"
- #" 0 0 0 0 0 119 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"
- #" 0 0) 40 0 0))\0"
-) 0 0 81 3 1 #" "
-0 14           4 81 12526
-(
- #"(((1 1 1) (2 0 1)) (#(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 102 0 0 0 17 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 204 0 0 0 102 0 0 0 17 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 10"
- #"2 0 0 0 17 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 85 0 0 0 136 0 0 0 0 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 85"
- #" 0 0 0 136 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 85 0 0 0 136 0 0 0 0 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 "
- #"0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 "
- #"0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 "
- #"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 "
- #"0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 0 0 0 204 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 1"
- #"70 0 0 0 17 0 0 0 17 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 102 0 0 0 17 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 136 0 0 0 34 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 34 0 0 0 238 0 0 "
- #"0 238 0 0 0 34 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 85 0 0 0 136 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 68 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 187 0 0"
- #" 0 68 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 "
- #"0 0 51 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 17 0 0 0 204 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 "
- #"0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 204 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 51 0 0 0 238 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 68 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 68 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 1"
- #"87 0 0 0 34 0 0 0 238 0 0 0 238 0 0 0 34 0 0 0 170 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 17 0 0 "
- #"0 0 0 0 0 119 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0) 40 0 0))\0"
-) 0 0 22 3 2 #"))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 7 #"require"
-0 0 81 3 1 #" "
-0 0 14 3 10 #"htdp/image"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 14 3 7 #"m1:list"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 17 #"image->color-list"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 2 #"))"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 14 3 7 #"m2:list"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 17 #"image->color-list"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m2"
-0 0 22 3 2 #"))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 4 #"diff"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m2"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 2 #"  "
-0 0 22 3 1 #"("
-0 0 15 3 4 #"cond"
-0 0 81 29 1 #"\n"
-0 0 81 3 4 #"    "
-0 0 22 3 2 #"[("
-0 0 14 3 6 #"empty?"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 4 #"list"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 14 3 3 #"m2:"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m2"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 22 3 2 #")]"
-0 0 81 29 1 #"\n"
-0 0 81 3 4 #"    "
-0 0 22 3 2 #"[("
-0 0 14 3 6 #"empty?"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m2"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 4 #"list"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 14 3 3 #"m1:"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 22 3 2 #")]"
-0 0 81 29 1 #"\n"
-0 0 81 3 4 #"    "
-0 0 22 3 1 #"["
-0 0 14 3 4 #"else"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"if"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 6 #"equal?"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 5 #"first"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 5 #"first"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m2"
-0 0 22 3 2 #"))"
-0 0 81 29 1 #"\n"
-0 0 81 3 14 #"              "
-0 0 22 3 1 #"("
-0 0 14 3 4 #"diff"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 4 #"rest"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 4 #"rest"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m2"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 1 #"+"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 2 #"))"
-0 0 81 29 1 #"\n"
-0 0 81 3 14 #"              "
-0 0 22 3 1 #"("
-0 0 14 3 4 #"list"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 5 #"first"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m1"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 5 #"first"
-0 0 81 3 1 #" "
-0 0 14 3 2 #"m2"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 22 3 5 #"))]))"
-0 0 81 29 1 #"\n"
-0 0 81 3 2 #"  "
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 4 #"diff"
-0 0 81 3 1 #" "
-0 0 14 3 7 #"m1:list"
-0 0 81 3 1 #" "
-0 0 14 3 7 #"m2:list"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"+m"
-0 0 81 3 1 #" "
-0 14           4 81 12527
-(
- #"(((1 2 3) (0 0 1)) (#(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 102 0 0 0 17 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 0 0 0 204 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 34 0"
- #" 0 0 170 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 85 0 0 0 136 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 136 0 0 0 34 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 0 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 51 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 221 0 0 0 85 0 0 0 153 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 221 0 0 0 17 0 0 0 204 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 153 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 51 0 0"
- #" 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 238 0 0 0 102 0 0 0 153 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 51 0 0 0 238 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 170 0 0 0 51 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 0 0 0 204 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0"
- #" 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 17 0 0 0 17 0 0 0 170 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 170 0 0 0 17 0 0 0 17 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 102 0 0 0 17 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 187 0 0 0 34 0 0 0 238 0 0 0 238 0 0 0 34 0 0 0 187 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 34 0 0 0 238"
- #" 0 0 0 238 0 0 0 34 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 85 0 0 0 136 0 0 0 0 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 68 0 0 0 170 "
- #"0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 68 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 68 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 18"
- #"7 0 0 0 68 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0"
- #" 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 68 0 0 0 187 0 0 0 255 0 0 0 "
- #"255 0 0 0 170 0 0 0 68 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 68 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 68 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 187 0 0 0 34 0 0 0 238 0 0 0 238 0 0 0 34 0 0 0"
- #" 170 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0"
- #" 0 34 0 0 0 238 0 0 0 238 0 0 0 34 0 0 0 170 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 170 0 0 0 17 0 0 0 0 0 0 0 119 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 17 0 0"
- #" 0 0 0 0 0 119 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"
- #" 0 0) 40 0 0))\0"
-) 0 0 81 3 1 #" "
-0 14           4 81 12526
-(
- #"(((1 1 1) (2 0 1)) (#(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 102 0 0 0 17 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 204 0 0 0 102 0 0 0 17 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 10"
- #"2 0 0 0 17 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 85 0 0 0 136 0 0 0 0 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 85"
- #" 0 0 0 136 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 85 0 0 0 136 0 0 0 0 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 "
- #"0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 "
- #"0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 "
- #"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 "
- #"0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 0 0 0 204 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 1"
- #"70 0 0 0 17 0 0 0 17 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 102 0 0 0 17 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 136 0 0 0 34 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 34 0 0 0 238 0 0 "
- #"0 238 0 0 0 34 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 85 0 0 0 136 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 68 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 187 0 0"
- #" 0 68 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 "
- #"0 0 51 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 17 0 0 0 204 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 "
- #"0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 204 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 51 0 0 0 238 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 68 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 68 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 1"
- #"87 0 0 0 34 0 0 0 238 0 0 0 238 0 0 0 34 0 0 0 170 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 17 0 0 "
- #"0 0 0 0 0 119 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0) 40 0 0))\0"
-) 0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 14           4 81 12561
-(
- #"(((2 3 4) (2 0 2)) (#(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 102 0 0 0 42 0 0 0 72 0 0 0 43 0 0 0"
- #" 162 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 102 0 0 0 50 0 0 0 74 0 0 0 33 0 0 0 158 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 248 0 "
- #"0 0 47 0 0 0 101 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 227 0 0 0 255 0 0 0 255 0 0 0 190 0 0 0 20 0 0 0 245 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 253 0 0 0 255 "
- #"0 0 0 255 0 0 0 171 0 0 0 34 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 112 0 0 0 41 0 0 0 10"
- #"1 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 219 0 0 0 1 0 0 0 234 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"135 0 0 0 74 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 183 0 0 0 64 0 0 0 149 0 0 0 102 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 119 0 0 0 63 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 153 0 0 0 92 0 0 0 82 0 0 0 227 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 233 0"
- #" 0 0 39 0 0 0 225 0 0 0 152 0 0 0 102 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 173 0 0 0 34 0"
- #" 0 0 232 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 127 0 0 0 66 0 0 0 47 0 0 0 182 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 74 0 0 0 165 0 0 0 25"
- #"5 0 0 0 152 0 0 0 102 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 184 0 0 0 33 0 0 0 221 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 160 0 0 0 14 0 0 0 249 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 175 0 0 0 11 0 0 0 92 0 0 0 92 0 0 0 54 0 0 0 "
- #"36 0 0 0 131 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"12 0 0 0 23 0 0 0 210 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 239 0 0 0 0 0 0 0 200 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 218 0 0 0 158 0 0 0 158 0 0 0 158 0 0 0 82 0 0 0 63 0 0 0 181 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 63 0 0 0 98 0 0 0 "
- #"240 0 0 0 240 0 0 0 240 0 0 0 253 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 237 0 0 0 255 0 0 0 255 0 0 0 153 0 0 0 6 0 0 "
- #"0 234 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 132 0 0 0 102 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 215 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 60"
- #" 0 0 0 38 0 0 0 50 0 0 0 45 0 0 0 162 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 13"
- #"2 0 0 0 102 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 "
- #"0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 "
- #"0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 102 0 0 0 42 0 0 0 7"
- #"2 0 0 0 43 0 0 0 162 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 234 0 0 0 56 0 0 0 69 0 0 0 39 0 0 0 133 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 102 0 0 0 "
- #"42 0 0 0 72 0 0 0 43 0 0 0 162 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 227 0 0 0 255 0 0 0 255 0 0 0 190 0 0 0 2"
- #"0 0 0 0 245 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"93 0 0 0 117 0 0 0 255 0 0 0 242 0 0 0 29 0 0 0 196 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 227 0 0 0 255 0 0 0 255 0 0 "
- #"0 190 0 0 0 20 0 0 0 245 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 219 0 0 0 1 0 0 0 234 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 245 0 0 0 5 0 0 0 210 0 0 0"
- #" 255 0 0 0 255 0 0 0 109 0 0 0 99 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 219 0 0 0 1 0 0 "
- #"0 234 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 "
- #"0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 119 0 0 0 63 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 217 0 0 0 0 0 0 0 243 0 0 0 255 0 0 0 255 0 0"
- #" 0 141 0 0 0 65 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 119 0 0 0 63 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 173 0"
- #" 0 0 34 0 0 0 232 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 202 0 0 0 0 0 0 0 253 0 0 0 255 0 0 0 255 0 0 0 150 0 0 0 50 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 173 0 0 0 34 0 0 0 232 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 184 0 0 0 33 0 0 0 221 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 225 0 0 0 0"
- #" 0 0 0 239 0 0 0 255 0 0 0 255 0 0 0 135 0 0 0 74 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 184 0 0 0 33 0 0 0 2"
- #"21 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 212 0 0 0 23 0 0 0 210 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 251 0 0 0 17 0 0 0 201 0 0 0"
- #" 255 0 0 0 255 0 0 0 95 0 0 0 116 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 212 0 0 0 23 0 0 0 210 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0"
- #" 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 63 0 0 "
- #"0 98 0 0 0 240 0 0 0 240 0 0 0 240 0 0 0 253 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 110 0 0 0 105 0 0 0 255 0 0 0 233 0"
- #" 0 0 20 0 0 0 213 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 63 0 0 0 98 0 0 0 240 0 0 0 240 0 0 0 240 0 0 0 253 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 0 0 0 0 0 215 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 242 0 0 0 61 0 0 0 58 0 0 0 31 0 0 0 148 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0"
- #" 0 0 0 0 0 0 0 0 0 215 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0"
- #" 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0"
- #" 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) 40 0 0))\0"
-) 0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 17 3 27 #";; Number Matrix -> Matrix "
-0 0 81 29 1 #"\n"
-0 0 17 3 35 #";; multiply a matrix with a scalar "
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"*s"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"s"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"mat"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 2 #"  "
-0 0 22 3 1 #"("
-0 0 14 3 12 #"build-matrix"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"matrix-rows"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"mat"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"matrix-cols"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"mat"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 16 #"                "
-0 0 22 3 1 #"("
-0 0 15 3 6 #"lambda"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 1 #"i"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 1 #"*"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"s"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"matrix-ref"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"mat"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 5 #")))))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"*s"
-0 0 81 3 1 #" "
-0 0 20 3 3 #"100"
-0 0 81 3 1 #" "
-0 14           4 81 12523
-(
- #"(((2 3 4) (2 0 2)) (#(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 0 0 0 204"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0"
- #" 0 0 0 0 0 0 0 0 0 0 0 34 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 153 "
- #"0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 136 0 0 0 34 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 204 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 204 0 0 0 51 0 0 0 0 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 238 0 0 0 34 0 0 0 221 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187"
- #" 0 0 0 51 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 85 0 0 0 153 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 68 0 0 0 "
- #"187 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 17 0 0 0 204 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 0 0 0 0 0 0 0 0 153 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 119 0 0 0 153 0 0 0 255 0 0 0 255 0 0 0"
- #" 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 204 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 238 0 0 "
- #"0 102 0 0 0 153 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 51 0 0 0 238 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 51 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 "
- #"0 0 0 204 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 0 0 0 204 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 170 0"
- #" 0 0 17 0 0 0 17 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 0 0 0 204 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 "
- #"0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 136 0 0 0 34 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 34 0 0 0 238 0 0 0 238 0 0 "
- #"0 34 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 136 0 0 0 34 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 68 0 0 0 170 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 68 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0 0 0 51 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187"
- #" 0 0 0 51 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 17 0 0 0 204 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 17 0 0 0 204 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 20"
- #"4 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 204 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 "
- #"255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 51 0 0 0 238 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 68 0 0 0 187 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 68 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 221 0 0 0 51 0 0 "
- #"0 238 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 "
- #"0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 "
- #"0 255 0 0 0 255 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 187 0"
- #" 0 0 34 0 0 0 238 0 0 0 238 0 0 0 34 0 0 0 170 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 51 0 0 0 221 0 0 0 255 0 0 0 255 "
- #"0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 "
- #"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 25"
- #"5 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 170 0 0 0 17 0 0 0 0"
- #" 0 0 0 119 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 2"
- #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0"
- #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0"
- #" 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0"
- #" 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255"
- #" 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"
- #") 40 0 0))\0"
-) 0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 81 29 1 #"\n"
-0 0 81 3 14 #"              "
-0 0 22 3 1 #"("
-0 0 14 3 17 #"rectangle->matrix"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 2 #"(("
-0 0 20 3 3 #"200"
-0 0 81 3 1 #" "
-0 0 20 3 3 #"300"
-0 0 81 3 1 #" "
-0 0 20 3 3 #"400"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 35 #"                                   "
-0 0 22 3 1 #"("
-0 0 20 3 3 #"200"
-0 0 81 3 1 #" "
-0 0 81 3 1 #" "
-0 0 81 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 81 3 1 #" "
-0 0 20 3 3 #"200"
-0 0 22 3 4 #"))))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 17 3 41 #";; Matrix[n x m] Matrix[m x k] -> Matrix "
-0 0 81 29 1 #"\n"
-0 0 17 3 25 #";; multiply two matrices "
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"*m"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"one"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"two"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 2 #"  "
-0 0 22 3 1 #"("
-0 0 14 3 12 #"build-matrix"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"matrix-rows"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"one"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"matrix-cols"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"two"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 16 #"                "
-0 0 22 3 1 #"("
-0 0 15 3 6 #"lambda"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 1 #"i"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 18 #"                  "
-0 0 22 3 1 #"("
-0 0 14 3 3 #"Sum"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 12 #"MultiplyEach"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"matrix-row"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"one"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"matrix-col"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"two"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 6 #"))))))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 17 3 35 #";; Sum : [Listof Number] -> Number "
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 3 #"Sum"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"lon"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 5 #"apply"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"+"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"lon"
-0 0 22 3 2 #"))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 17 3 60
-#";; MultiplyEach : [Listof Number] [Listof Number] -> Number "
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 12 #"MultiplyEach"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"one"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"two"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 3 #"map"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"*"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"one"
-0 0 81 3 1 #" "
-0 0 14 3 3 #"two"
-0 0 22 3 2 #"))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"matrix-row"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"M"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"build-list"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"matrix-cols"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"M"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 15 3 6 #"lambda"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 1 #"j"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"matrix-ref"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"M"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 4 #"))))"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"matrix-col"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"M"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"build-list"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"matrix-rows"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"M"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 15 3 6 #"lambda"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 1 #"i"
-0 0 22 3 1 #")"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 10 #"matrix-ref"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"M"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"i"
-0 0 81 3 1 #" "
-0 0 14 3 1 #"j"
-0 0 22 3 4 #"))))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 2 #"*m"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 17 #"rectangle->matrix"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 2 #"(("
-0 0 20 3 1 #"1"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 39 #"                                       "
-0 0 22 3 1 #"("
-0 0 20 3 1 #"0"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 39 #"                                       "
-0 0 22 3 1 #"("
-0 0 20 3 1 #"2"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 3 #")))"
-0 0 81 29 1 #"\n"
-0 0 81 3 18 #"                  "
-0 0 22 3 1 #"("
-0 0 14 3 17 #"rectangle->matrix"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 2 #"(("
-0 0 20 3 1 #"1"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 39 #"                                       "
-0 0 22 3 1 #"("
-0 0 20 3 1 #"0"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 4 #"))))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0 0 17 3 2 #"#;"
-0 0 81 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 14 3 12 #"check-expect"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 2 #"*m"
-0 0 81 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 17 #"rectangle->matrix"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 2 #"(("
-0 0 20 3 1 #"1"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 39 #"                                       "
-0 0 22 3 1 #"("
-0 0 20 3 1 #"0"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 39 #"                                       "
-0 0 22 3 1 #"("
-0 0 20 3 1 #"2"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 3 #")))"
-0 0 81 29 1 #"\n"
-0 0 81 3 18 #"                  "
-0 0 22 3 1 #"("
-0 0 14 3 17 #"rectangle->matrix"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 2 #"(("
-0 0 20 3 1 #"1"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 39 #"                                       "
-0 0 22 3 1 #"("
-0 0 20 3 1 #"0"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 4 #"))))"
-0 0 81 29 1 #"\n"
-0 0 81 3 14 #"              "
-0 0 22 3 1 #"("
-0 0 14 3 17 #"rectangle->matrix"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"'"
-0 0 22 3 2 #"(("
-0 0 20 3 1 #"1"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 35 #"                                   "
-0 0 22 3 1 #"("
-0 0 20 3 1 #"0"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 1 #")"
-0 0 81 29 1 #"\n"
-0 0 81 3 35 #"                                   "
-0 0 22 3 1 #"("
-0 0 20 3 1 #"2"
-0 0 81 3 1 #" "
-0 0 20 3 1 #"1"
-0 0 22 3 4 #"))))"
-0 0 81 29 1 #"\n"
-0 0 81 29 1 #"\n"
-0           0
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-test.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-test.rkt
deleted file mode 100644
index 5b02fc571a..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-test.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname matrix-test) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-;(require htdp/matrix-invisible)
-(require (lib "matrix.rkt" "htdp"))
-
-(define r1 '((a00 a01 a02)
-             (a10 a11 a12)))
-
-(define m1 (rectangle->matrix r1))
-
-(check-expect (matrix? m1) true)
-(check-expect (matrix-rows m1) 2)
-(check-expect (matrix-cols m1) 3)
-(check-expect (matrix->rectangle m1) r1)
-
-(define x (random 2))
-(define y (random 3))
-  
-(check-expect (matrix-ref (make-matrix 2 3 '(a00 a01 a02 a10 a11 a12)) x y)
-              (matrix-ref m1 x y))
-
-(check-expect
- (matrix-ref (build-matrix 2 3 (lambda (row col) (matrix-ref m1 row col))) x y)
- (matrix-ref m1 x y))
-
-(define lpons (list (make-posn 0 0)
-                    (make-posn 1 0)
-                    (make-posn 0 1)
-                    (make-posn 1 2)
-                    (make-posn 1 1)
-                    (make-posn 0 2)))
-
-(define m2 
-  (foldl (lambda (x m) (matrix-set m (posn-x x) (posn-y x) 1)) m1 lpons))
-
-(check-expect 1  (matrix-ref m2 (random 2) (random 3)))
-
-
-(define (is1 x) (= x 1))
-(check-expect (matrix-where? m2 is1)
-              (list (make-posn 0 0) (make-posn 0 1) (make-posn 0 2)
-                    (make-posn 1 0) (make-posn 1 1) (make-posn 1 2)))
-
-(define (is2 x) (= x 2))
-(check-expect (matrix-where? m2 is2) empty)
-
-(define m1-minor (matrix-minor m1 1 1))
-
-(check-expect (matrix-ref m1-minor 0 0) 'a00)
-(check-expect (matrix-ref m1-minor 0 1) 'a02)
-
-(check-expect (matrix-ref m1 0 0) 'a00)
-;; --- IMPERATIVE ---
-;; see comment in matrix-unit.rkt
-;; ---------------------------------
-;; (define M-imperative (build-matrix 2 3 (λ (i j) (* (expt 2 i) (expt 3 j)))))
-;; (define M-modified   (matrix-set! M-imperative 0 0 'xxx))
-;; (check-expect (matrix-ref M-modified 0 0) 'xxx)
-;; (check-expect (matrix-ref M-imperative 0 0) 'xxx)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/test-docs-complete.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/test-docs-complete.rkt
deleted file mode 100644
index a17cf12120..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-
-(define (private-module s) #true)
-(define (legacy-module s) #true)
-
-(define hidden?
-  (lambda (h)
-    ;; These identifiers are useful in some tests. They are like
-    ;; 'friend' in C++ classes. If this weren't a legacy module, I'd
-    ;; revise the architecture. -- Matthias
-    (define *hidden
-      '(draw begin-draw-sequence end-draw-sequence get-@VP get-mouse-event start-and-export))
-    (memq h *hidden)))
-
-(check-docs (quote htdp/world))
-(check-docs (quote htdp/testing))
-(check-docs (quote htdp/show-queen))
-(check-docs (quote htdp/servlet2) #:skip legacy-module)
-(check-docs (quote htdp/servlet) #:skip legacy-module)
-(check-docs (quote htdp/matrix))
-(check-docs (quote htdp/matrix-unit) #:skip private-module)
-(check-docs (quote htdp/matrix-sig) #:skip private-module)
-(check-docs (quote htdp/matrix-render-sig) #:skip private-module)
-(check-docs (quote htdp/matrix-invisible) #:skip private-module)
-(check-docs (quote htdp/master))
-(check-docs (quote htdp/master-play))
-(check-docs (quote htdp/lkup-gui))
-(check-docs (quote htdp/image))
-(check-docs (quote htdp/hangman) #:skip hidden?)
-(check-docs (quote htdp/hangman-play))
-(check-docs (quote htdp/gui))
-(check-docs (quote htdp/guess))
-(check-docs (quote htdp/guess-gui))
-(check-docs (quote htdp/graphing) #:skip hidden?)
-(check-docs (quote htdp/error))
-(check-docs (quote htdp/elevator))
-(check-docs (quote htdp/draw) #:skip hidden?)
-(check-docs (quote htdp/draw-sig) #:skip private-module)
-(check-docs (quote htdp/docs))
-(check-docs (quote htdp/dir))
-(check-docs (quote htdp/convert))
-(check-docs (quote htdp/big-draw) #:skip private-module)
-(check-docs (quote htdp/arrow))
-(check-docs (quote htdp/arrow-gui))
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/tester.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/tester.rkt
deleted file mode 100644
index fa094d4980..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/tester.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scheme 
-
-(provide test-error)
-
-(define-syntax test-error 
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ form ...)
-       (syntax
-        (with-handlers ([exn? (lambda (e) 
-                                (printf "~a\n" (exn-message e))
-                                #t)])
-          form ...
-          #f))])))
-
-
-#| Tests: 
-(not (test-error 1 2 3))
-(test-error (/ 1 0) 2 3)
-|#
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/world-add-line.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/world-add-line.rkt
deleted file mode 100644
index f774c13116..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/world-add-line.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang scheme/base
-(require htdp/image test-engine/scheme-tests)
-
-(define plain (empty-scene 100 100))
-
-; (scene+line plain .5 10.3 -20 80 'red)
-
-'verticals
-(check-expect (scene+line plain -10 90 -10 80 'red) plain) 
-(check-expect (scene+line plain 110 90 110 80 'red) plain)
-(check-expect (scene+line plain +10 90 +10 80 'red) 
-              (scene+line plain +10 90 +10 80 'red))
-#;
-(check-expect (scene+line plain +10 900000 +10 80 'red) 
-              (scene+line plain +10 100 +10 80 'red))
-;; can't make image of this size 
-
-(check-expect (scene+line plain +10 -10 +10 80 'red) 
-              (scene+line plain +10 0 +10 80 'red))
-
-'horizontals
-(check-expect (scene+line plain 20 -10 30 -10 'red) plain)
-(check-expect (scene+line plain 20 110 30 110 'red) plain)
-(check-expect (scene+line plain 20 +10 30 +10 'red) 
-              (scene+line plain 20 +10 30 +10 'red))
-#;
-(check-expect (scene+line plain 20 +10 30000 +10 'red) 
-              (scene+line plain 20 +10 100 +10 'red))
-;; can't make image of this size 
-
-'inside-outside
-(check-expect (scene+line plain 10 10 -10 -10 'red) ; upper-left
-              (scene+line plain 10 10 0 0 'red))
-(check-expect (scene+line plain 10 10 -10 0 'red) ; upper-left
-              (scene+line plain 10 10 0 5 'red))
-(check-expect (scene+line plain 90 10 110 -10 'red) ; upper-right 
-              (scene+line plain 90 10 100 0 'red))
-(check-expect (scene+line plain 90 10 110 0 'red) ; upper-left
-              (scene+line plain 90 10 100 5 'red))
-(check-expect (scene+line plain 90 90 110 110 'red) ; lower-right
-              (scene+line plain 90 90 100 100 'red))
-(check-expect (scene+line plain 90 90 110 100 'red) ; lower-right
-              (scene+line plain 90 90 100 95 'red))
-(check-expect (scene+line plain 110 110 10 10 'red) ; lower-right
-              (scene+line plain 10 10 100 100 'red))
-(check-expect (scene+line plain 10 10 210 110 'red) ; lower-right 
-              (scene+line plain 10 10 100 55 'red))
-(check-expect (scene+line plain 10 10 -10 30 'red) ; lower-left
-              (scene+line plain 10 10 0 20 'red))
-(check-expect (scene+line plain 10 10 -10 210 'red) ; lower-left
-              (scene+line plain 10 10 0 110 'red))
-
-'outside-outside
-(check-expect (scene+line plain  -100 10 300 50 'red) ;; left-right 
-              (scene+line plain 0 20 100 30 'red))
-(check-expect (scene+line plain -50 0 60 110 'red) ;; left-low
-              (scene+line plain 0 50 50 100 'red))
-(check-expect (scene+line plain -50 50 60 -5 'red) ;; left-top
-              (scene+line plain 0 25 50 0 'red))
-(check-expect (scene+line plain -10 -10 110 50 'red) ;; top-right
-              (scene+line plain 10 0 100 45 'red))
-
-(check-expect (scene+line plain -10 -10 110 110 'red) ;; top-low
-              (scene+line plain 0 0 100 100 'red))
-
-(check-expect (scene+line plain -10 110 110 50 'red) ;; low-right
-              (scene+line plain 0 105 100 55 'red))
-
-'totally-outside
-(check-expect (scene+line plain -100 -100 -200 -500 'red) plain)
-
-(test)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/world-mouse.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/world-mouse.rkt
deleted file mode 100644
index 6a1873b2a8..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/world-mouse.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang scheme
-
-(require htdp/world)
-
-(with-handlers ((exn? (lambda (x) #t)))
-  (place-image (circle 3 'solid 'red) 1.2 3.14 (empty-scene 100 100)))
-
-(define (ms w x y e)
-  (if (eq? e 'button-down) (list x y) w))
-(define (rd w) 
-  (local ((define mt (empty-scene 300 300))
-          (define x1 (first w))
-          (define y1 (second w))
-          (define tx (text (format "(~s,~s)" x1 y1) 22 'red))
-          (define cr (circle 3 'solid 'red))
-          (define m1 (place-image tx 50 50 mt))
-          (define m2 (place-image cr x1 y1 m1)))
-    m2))
-(big-bang 300 300 1 (list 50 50))
-(on-redraw rd)
-(on-mouse-event ms)
diff --git a/pkgs/htdp-pkgs/htdp-test/htdp/tests/world.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/world.rkt
deleted file mode 100644
index b51fefaa6e..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/htdp/tests/world.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname world) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(require 2htdp/universe)
-(require htdp/image)
-
-;; testing world
-;; World = Nat
-
-(define world0 100)
-
-(define (world->image w)
-  (place-image (circle 3 'solid 'red) 50 w (empty-scene 100 100)))
-
-(define (world->next w) (sub1 w))
-
-(define (world->steer w ke)
-  (cond
-    [(char? ke) w]
-    [(symbol=? ke 'left) 100]
-    [(symbol=? ke 'right) 90]
-    [else w]))
-
-;; --- 
-(check-expect (key-event? 'a) false)
-(check-expect (key-event? 0) false)
-(check-expect (key-event? "a") true)
-
-(check-expect (key=? "b" "a") false)
-
-(check-error (key=? "a" 0) "key=?: expects a KEY-EVTS as second argument, given 0")
-
-;; run world run
-
-(define (main world0)
-  (big-bang world0
-            (on-draw world->image)
-            (on-tick world->next)
-            (on-key world->steer)
-            (stop-when zero?)))
diff --git a/pkgs/htdp-pkgs/htdp-test/info.rkt b/pkgs/htdp-pkgs/htdp-test/info.rkt
deleted file mode 100644
index be79c2ca21..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/info.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"
-               "htdp-lib"))
-(define build-deps '("scheme-lib"
-                     "srfi-lite-lib"
-                     "compatibility-lib"
-                     "gui-lib"
-                     "racket-test"
-                     "rackunit-lib"
-                     "profile-lib"
-                     "wxme-lib"))
-(define update-implies '("htdp-lib"))
-
-(define pkg-desc "tests for \"htdp\"")
-
-(define pkg-authors '(matthias mflatt robby))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/README b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/README
deleted file mode 100644
index 7fb78ad2a7..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/README
+++ /dev/null
@@ -1,9 +0,0 @@
-The files in this directory test the teaching language implementation.
-
-test-htdp.rkt
- this module runs most of the tests
-  
-test-image.rktl
- this module runs the htdp/image tests
-
-See beginner.rktl for more.
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/advanced.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/advanced.rktl
deleted file mode 100644
index 9a5627ed3b..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/advanced.rktl
+++ /dev/null
@@ -1,588 +0,0 @@
-
-;; Basic checks for the advanced language. See also
-;;  beginner.rkt
-
-(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
-
-;; Don't need these:
-(define no-extra-if-tests? #t)
-
-;; Check export names:
-;; based on new docs: 
-(require (submod lang/htdp-advanced procedures))
-(for ((s (docs)))
-  (for ((rows (cdr s)))
-    (for ((r rows))
-      (define sy (syntax-e (car r)))
-      (define vv (dynamic-require 'lang/htdp-advanced sy))
-      (when (and (procedure? vv) (not (eq? vv call/cc)))
-	(test sy object-name vv)))))
-
-;; based on old docs: 
-
-#;
-(require syntax/docprovide)
-#;
-(let ([docs (lookup-documentation '(lib "htdp-advanced.rkt" "lang") 'procedures)])
-  (for-each
-   (lambda (row)
-     (for-each
-      (lambda (doc)
-	(let ([v (dynamic-require '(lib "htdp-advanced.rkt" "lang") (car doc))])
-	  (when (and (procedure? v)
-		     (not (eq? v call/cc)))
-	    (test (car doc) object-name v))))
-      (cdr row)))
-   docs))
-
-(define current-htdp-lang 'lang/htdp-advanced)
-(load-relative "htdp-test.rktl")
-
-(require (lib "htdp-advanced.rkt" "lang"))
-
-(load-relative "beg-adv.rktl")
-(load-relative "bega-adv.rktl")
-(load-relative "intm-adv.rktl")
-
-(define (f6 a) (a))
-(test (void) f6 void)
-
-(define (x7) 10)
-(test 10 x7)
-(define x8 (lambda () 11))
-(test 11 x8)
-
-(htdp-syntax-test #'begin "begin: expected an open parenthesis before begin, but found none")
-(htdp-syntax-test #'(begin) "begin: expected at least one expression after begin, but nothing's there")
-(htdp-syntax-test #'(begin (define x 10)) "define: found a definition that is not at the top level")
-(htdp-syntax-test #'(begin (define x 10) x) "define: found a definition that is not at the top level")
-(htdp-syntax-test #'(let () (begin (define x 10) x)) "define: found a definition that is not at the top level")
-(htdp-syntax-test #'(+ 1 (begin)) "begin: expected at least one expression after begin, but nothing's there")
-
-(test 1 'begin (begin 1))
-(test 2 'begin (begin 1 2))
-(test 3 'begin (begin 1 2 3))
-
-(htdp-top (define ex 12))
-(htdp-test 13 'begin+set! (begin (set! ex 13) ex))
-(htdp-test 12 'begin+set! (begin 12 ex))
-(htdp-top-pop 1)
-
-(htdp-syntax-test #'begin0 "begin0: expected an open parenthesis before begin0, but found none")
-(htdp-syntax-test #'(begin0) "begin0: expected at least one expression after begin0, but nothing's there")
-
-(htdp-test 1 'begin0 (begin0 1))
-(htdp-test 2 'begin0 (begin0 2 1))
-(htdp-test 3 'begin0 (begin0 3 2 1))
-
-
-(htdp-syntax-test #'set! "set!: expected an open parenthesis before set!, but found none")
-(htdp-syntax-test #'(set!) "set!: expected a variable after set!, but nothing's there")
-(htdp-syntax-test #'(set! x) "set!: expected an expression for the new value, but nothing's there")
-(htdp-syntax-test #'(set! 1 2) "set!: expected a variable after set!, but found a number")
-(htdp-syntax-test #'(set! x 2 3) "set!: expected only one expression for the new value, but found 1 extra part")
-(htdp-syntax-test #'(set! set! 2) "set!: expected a variable after set!, but found a set!")
-(htdp-syntax-test #'(set! x 1) "x: this variable is not defined")
-(htdp-syntax-test #'(lambda (x) (set! x 2)) "set!: expected a mutable variable after set!, but found a variable that cannot be modified: x")
-(htdp-syntax-test #'(let ([x 5]) (lambda (x) (set! x 2))) "set!: expected a mutable variable after set!, but found a variable that cannot be modified")
-
-(htdp-top (set! x 5))
-(htdp-err/rt-test (define x 10) "set!: cannot set variable before its definition: x")
-(htdp-top-pop 1)
-
-(htdp-top (define x 5))
-(htdp-top (set! x 'hello))
-(htdp-test 'hello 'access-x x)
-(htdp-test 18 'set! (local [(define x 12)]
-		 (begin
-		   (set! x 18)
-		   x)))
-(htdp-test 19 (lambda (x)
-	   (local [(define x 12)]
-		  (begin
-		    (set! x 19)
-		    x)))
-      45)
-
-(htdp-syntax-test #'delay "delay: expected an open parenthesis before delay, but found none")
-(htdp-syntax-test #'(delay) "delay: expected an expression after delay, but nothing's there")
-(htdp-syntax-test #'(delay 1 2) "delay: expected only one expression after delay, but found 1 extra part")
-
-(htdp-top (define d (delay (begin (set! x 89) 12))))
-(htdp-test #t promise? d)
-(htdp-test 12 force d)
-(htdp-top (force d))
-(htdp-test 89 'access-x x)
-(htdp-top (set! x 13))
-(htdp-test 12 force d)
-(htdp-test 13 'access-x x)
-(htdp-top-pop 4)
-
-(htdp-syntax-test #'(let name) "let: expected at least one binding (in parentheses) after let, but nothing's there")
-(htdp-syntax-test #'(let name 10) "let: expected at least one binding (in parentheses) after let, but found a number")
-(htdp-syntax-test #'(let name ()) "let: expected an expression after the bindings, but nothing's there")
-(htdp-syntax-test #'(let name ([x]) 1) "let: expected an expression after the name x, but nothing's there")
-(htdp-syntax-test #'(let name ([x 10] 2) 1) "let: expected a binding with a variable and an expression, but found a number")
-(htdp-syntax-test #'(let name ([11 10]) 1) "let: expected a variable for the binding, but found a number")
-(htdp-syntax-test #'(let name ([x 10]) 1 2) "let: expected only one expression after the bindings, but found 1 extra part")
-(htdp-syntax-test #'(let name ([x 10][x 11]) 1) "let: x was defined locally more than once")
-(htdp-test 10 'lookup (let name () 10))
-(htdp-test 1024 'loop (let loop ([n 10]) (if (zero? n) 1 (* 2 (loop (sub1 n))))))
-
-(htdp-test 19 'lookup (recur empty-f () 19))
-
-(htdp-syntax-test #'case "case: expected an open parenthesis before case, but found none")
-(htdp-syntax-test #'(case) "case: expected an expression after case, but nothing's there")
-(htdp-syntax-test #'(case 5) "expected a clause with at least one choice (in parentheses) and an answer after the expression, but nothing's there")
-(htdp-syntax-test #'(case 5 12) "case: expected a clause with at least one choice (in parentheses) and an answer, but found a number")
-(htdp-syntax-test #'(case 5 []) "case: expected a clause with at least one choice (in parentheses) and an answer, but found an empty part")
-(htdp-syntax-test #'(case 5 [5 10]) "case: expected at least one choice (in parentheses), but found a number")
-(htdp-syntax-test #'(case 5 [(5) 10] 12) "case: expected a clause with at least one choice (in parentheses) and an answer, but found a number")
-(htdp-syntax-test #'(case 5 [(5)]) "case: expected an expression for the answer in the case clause, but nothing's there")
-(htdp-syntax-test #'(case 5 [(5) 12 13]) "case: expected only one expression for the answer in the case clause, but found 1 extra part")
-(htdp-syntax-test #'(case 5 [("a") 10]) "case: expected a symbol (without its quote) or a number as a choice, but found a string")
-(htdp-syntax-test #'(case 5 [() 10]) "expected a symbol (without its quote) or a number as a choice, but nothing's there")
-(htdp-syntax-test #'(case 5 [(5 "a") 10]) "case: expected a symbol (without its quote) or a number as a choice, but found a string")
-(htdp-syntax-test #'(case 5 [else 12][(5) 10]) "case: found an else clause that isn't the last clause in its case expression")
-(htdp-syntax-test #'(case 5 [(5) 10][else 12][else 13]) "case: found an else clause that isn't the last clause in its case expression")
-
-(htdp-test 'a 'case (case 5 [(5) 'a]))
-(htdp-test 'b 'case (case 5 [(6) 'a][else 'b]))
-(htdp-test 'c 'case (case 5 [(6 5) 'c][else 'b]))
-(htdp-test 'd 'case (case 'hello [(6 5 hello) 'd][else 'b]))
-(htdp-test 'd 'case (case 'hello [(no) 10][(6 5 hello) 'd][else 'b]))
-(htdp-test 'cc 'case (case (+ 2 3) [(6 5) 'cc][else 'b]))
-
-(htdp-syntax-test #'when "when: expected an open parenthesis before when, but found none")
-(htdp-syntax-test #'(when) "when: expected a question and an answer, but nothing's there")
-(htdp-syntax-test #'(when 10) "when: expected a question and an answer, but found only one part")
-(htdp-syntax-test #'(when 10 12 13) "when: expected a question and an answer, but found 3 parts")
-
-(htdp-err/rt-test (when 1 2) rx:not-true-or-false)
-
-(htdp-test (void) 'when (when false 1))
-(htdp-test 11 'when (when true 11))
-
-(htdp-syntax-test #'unless "unless: expected an open parenthesis before unless, but found none")
-(htdp-syntax-test #'(unless) "unless: expected a question and an answer, but nothing's there")
-(htdp-syntax-test #'(unless 10) "unless: expected a question and an answer, but found only one part")
-(htdp-syntax-test #'(unless 10 12 13) "unless: expected a question and an answer, but found 3 parts")
-
-(htdp-err/rt-test (unless 1 2) rx:not-true-or-false)
-
-(htdp-test (void) 'unless (unless true 1))
-(htdp-test 11 'unless (unless false 11))
-
-(htdp-syntax-test #'shared "shared: expected an open parenthesis before shared, but found none")
-(htdp-syntax-test #'(shared) "shared: expected at least one binding (in parentheses) after shared, but nothing's there")
-(htdp-syntax-test #'(shared ()) "shared: expected an expression after the bindings, but nothing's there")
-(htdp-syntax-test #'(shared 1 2) "shared: expected at least one binding (in parentheses) after shared, but found a number")
-(htdp-syntax-test #'(shared () 1 2) "shared: expected only one expression after the bindings, but found 1 extra part")
-(htdp-syntax-test #'(shared (x) 2) "shared: expected a binding with a variable and an expression, but found something else")
-(htdp-syntax-test #'(shared ([]) 2) "shared: expected a variable for a binding, but nothing's there")
-(htdp-syntax-test #'(shared ([x]) 2) "shared: expected an expression after the binding name, but nothing's there")
-(htdp-syntax-test #'(shared ([x 1 3]) 2) "shared: expected only one expression after the binding name, but found 1 extra part")
-(htdp-syntax-test #'(shared ([1 3]) 2) "shared: expected a variable for the binding, but found a number")
-(htdp-syntax-test #'(shared ([x 1][x 2]) 2) "shared: found a variable that is used more than once: x")
-
-(htdp-test 1 'shared (shared () 1))
-(htdp-test 1 'shared (shared ([x 1]) x))
-(htdp-test '(1) 'shared (shared ([x (cons 1 null)]) x))
-(htdp-test 1 car (shared ([x (cons 1 x)]) x))
-(htdp-test 1 cadr (shared ([x (cons 1 x)][y (cons 2 x)]) y))
-(htdp-test 1 cadddr (shared ([x (cons 1 x)][y (cons 2 x)]) y))
-(htdp-test 1 first (shared ([x (cons 1 x)]) x))
-(htdp-test 1 second (shared ([x (cons 1 x)]) x))
-(htdp-test 1 third (shared ([x (cons 1 x)]) x))
-(htdp-test 1 fourth (shared ([x (cons 1 x)]) x))
-(htdp-test 1 fifth (shared ([x (cons 1 x)]) x))
-(htdp-test 1 sixth (shared ([x (cons 1 x)]) x))
-(htdp-test 1 seventh (shared ([x (cons 1 x)]) x))
-(htdp-test 1 eighth (shared ([x (cons 1 x)]) x))
-(htdp-test #t (lambda (l) (eq? l (cdr l))) (shared ([x (cons 1 x)]) x))
-(htdp-test #t (lambda (l) (eq? l (car l))) (shared ([x (list x x)]) x))
-(htdp-test #t (lambda (l) (eq? l (cadr l))) (shared ([x (list x x)]) x))
-(htdp-err/rt-test (shared ([x (cons 1 y)][y 5]) x))
-
-(htdp-syntax-test #'recur "recur: expected an open parenthesis before recur, but found none")
-(htdp-syntax-test #'(recur) "recur: expected a function name after recur, but nothing's there")
-(htdp-syntax-test #'(recur 10) "recur: expected a function name after recur, but found a number")
-(htdp-syntax-test #'(recur name) "recur: expected at least one binding (in parentheses) after recur, but nothing's there")
-(htdp-syntax-test #'(recur name 10) "recur: expected at least one binding (in parentheses) after recur, but found a number")
-(htdp-syntax-test #'(recur name ([x 1])) "recur: expected an expression after the bindings, but nothing's there")
-(htdp-syntax-test #'(recur name ([x]) 1) "recur: expected an expression after the name x, but nothing's there")
-(htdp-syntax-test #'(recur name ([x 10] 2) 1) "recur: expected a binding with a variable and an expression, but found a number")
-(htdp-syntax-test #'(recur name ([11 10]) 1) "recur: expected a variable for the binding, but found a number")
-(htdp-syntax-test #'(recur name ([x 10]) 1 2) "recur: expected only one expression after the bindings, but found 1 extra part")
-(htdp-syntax-test #'(recur name ([x 10][x 11]) 1) "recur: x was defined locally more than once")
-(htdp-test 18 'lookup (recur name ([x 18]) x))
-(htdp-test 1024 'loop (recur loop ([n 10]) (if (zero? n) 1 (* 2 (loop (sub1 n))))))
-(htdp-test 13 'loop (recur f ([f 13]) f))
-(htdp-test 14 'loop (let ([f 14]) (recur f ([f f]) f)))
-
-(load (collection-file-path "shared-tests.rktl" "tests" "racket"))
-
-(htdp-err/rt-test (cons 1 2) "cons: second argument must be a list, but received 1 and 2")
-(htdp-err/rt-test (append (list 1) 2) "append: last argument must be a list, but received 2")
-
-(htdp-err/rt-test (first 1) "first: expects a non-empty list; given: 1")
-(htdp-err/rt-test (rest 1) "rest: expects a non-empty list; given: 1")
-
-
-(htdp-test #t 'equal? (equal? (vector (list 10) 'apple) (vector (list 10) 'apple)))
-(htdp-test #t 'equal? (equal?  (shared ([x (cons 10 x)]) x) (shared ([x (cons 10 x)]) x)))
-(htdp-test #t 'equal? (equal?  (shared ([x (cons (vector x) x)]) x) (shared ([x (cons (vector x) x)]) x)))
-(htdp-test #f 'equal? (equal?  (shared ([x (cons 10 x)]) x) (shared ([x (cons 10 (cons 11 x))]) x)))
-(htdp-test #f 'equal? (equal?  (shared ([x (cons (vector x) x)]) x) (shared ([x (cons (box x) x)]) x)))
-
-(htdp-test #t 'equal~? (equal~? (vector (list 10) 'apple) (vector (list 10) 'apple) 0.1))
-(htdp-test #t 'equal~? (equal~? (vector (list 10) 'apple) (vector (list 10.02) 'apple) 0.1))
-(htdp-test #f 'equal~? (equal~? (vector (list 10) 'apple) (vector (list 10.2) 'apple) 0.1))
-(htdp-test #t 'equal? (equal? (box (list 10)) (box (list 10))))
-(htdp-test #t 'equal~? (equal~? (box (list 10)) (box (list 10)) 0.1))
-(htdp-test #t 'equal~? (equal~? (box (list 10)) (box (list 10.02)) 0.1))
-
-(htdp-test #t 'equal~? (equal~?  (shared ([x (cons 10 x)]) x) (shared ([x (cons 10.02 x)]) x) 0.1))
-(htdp-test #f 'equal~? (equal~?  (shared ([x (cons 10 x)]) x) (shared ([x (cons 10.2 x)]) x) 0.1))
-
-(htdp-test 1 'hash-copy
-           (local [(define ht (make-hash (list (list 'a 1))))
-                   (define htp (hash-copy ht))]
-             (begin (hash-set! htp 'a 2)
-                    (hash-ref ht 'a))))
-(htdp-test 1 'hash-count (hash-count (make-hash (list (list 'a 1)))))
-(htdp-test 42 'hash-for-each 
-           (local [(define x 0)
-                   (define (f k v) (set! x 42))]
-             (begin (hash-for-each (make-hash (list (list 1 2))) f)
-                    x)))
-(htdp-test #t 'hash-has-key? (hash-has-key? (make-hash (list (list 1 2))) 1))
-(htdp-test #f 'hash-has-key? (hash-has-key? (make-hash (list (list 1 2))) 2))
-(htdp-test (list #f #f) 'hash-map
-           (hash-map (make-hash (list (list 1 #t) (list 2 #t)))
-                     (lambda (k v) (not v))))
-(htdp-test 1 'hash-ref (hash-ref (make-hash (list (list 'a 1))) 'a))
-(htdp-test 2 'hash-ref (hash-ref (make-hash (list (list 'a 1))) 'b 2))
-(htdp-test 2 'hash-ref (hash-ref (make-hash (list (list 'a 1))) 'b (lambda () 2)))
-(htdp-test 1 'hash-ref!
-           (local [(define ht (make-hash (list (list 'a 1))))]
-             (hash-ref! ht 'a 2)))
-(htdp-test 2 'hash-ref!
-           (local [(define ht (make-hash (list (list 'a 1))))]
-             (hash-ref! ht 'b 2)))
-(htdp-test 2 'hash-ref!
-           (local [(define ht (make-hash (list (list 'a 1))))]
-             (begin (hash-ref! ht 'b 2)
-                    (hash-ref ht 'b))))
-(htdp-test (list #t #f) 'hash-remove! 
-           (local [(define ht (make-hash (list (list 'a 1))))]
-             (list (hash-has-key? ht 'a)
-                   (begin (hash-remove! ht 'a)
-                          (hash-has-key? ht 'a)))))
-(htdp-err/rt-test
-           (local [(define ht (make-hash (list (list 'a 1))))]
-             (list (hash-has-key? ht 'a)
-                   (begin (hash-remove ht 'a)
-                          (hash-has-key? ht 'a)))))
-(htdp-test 2 'hash-set!
-           (local [(define ht (make-hash (list (list 'a 1))))]
-             (begin (hash-set! ht 'a 2)
-                    (hash-ref ht 'a))))
-(htdp-err/rt-test
-           (local [(define ht (make-hash (list (list 'a 1))))]
-             (begin (hash-set ht 'a 2)
-                    (hash-ref ht 'a))))
-(htdp-err/rt-test
-           (local [(define ht (make-hash (list (list 'a 1))))]
-             (begin (hash-update ht 'a add1)
-                    (hash-ref ht 'a))))
-(htdp-test 2 'hash-update!
-           (local [(define ht (make-hash (list (list 'a 1))))]
-             (begin (hash-update! ht 'a add1)
-                    (hash-ref ht 'a))))
-(htdp-test 2 'hash-update!
-           (local [(define ht (make-hash (list (list 'a 1))))]
-             (begin (hash-update! ht 'b add1 1)
-                    (hash-ref ht 'b))))
-(htdp-test 2 'hash-update!
-           (local [(define ht (make-hash (list (list 'a 1))))]
-             (begin (hash-update! ht 'b add1 (lambda () 1))
-                    (hash-ref ht 'b))))
-(htdp-test #t 'hash?
-           (hash? (make-hash)))
-(htdp-test #t 'hash?
-           (hash? (make-hasheq)))
-(htdp-test #t 'hash?
-           (hash? (make-hasheqv)))
-(htdp-test #t 'hash?
-           (hash? (make-hash (list (list 'a 1)))))
-(htdp-test #t 'hash?
-           (hash? (make-hasheq (list (list 'a 1)))))
-(htdp-test #t 'hash?
-           (hash? (make-hasheqv (list (list 'a 1)))))
-(htdp-test #f 'hash?
-           (hash? 1))
-(htdp-test #t 'hash-equal?
-           (hash-equal? (make-hash (list (list 'a 1)))))
-(htdp-test #f 'hash-equal?
-           (hash-equal? (make-hasheq (list (list 'a 1)))))
-(htdp-test #f 'hash-equal?
-           (hash-equal? (make-hasheqv (list (list 'a 1)))))
-(htdp-test #f 'hash-eq?
-           (hash-eq? (make-hash (list (list 'a 1)))))
-(htdp-test #t 'hash-eq?
-           (hash-eq? (make-hasheq (list (list 'a 1)))))
-(htdp-test #f 'hash-eq?
-           (hash-eq? (make-hasheqv (list (list 'a 1)))))
-(htdp-test #f 'hash-eqv?
-           (hash-eqv? (make-hash (list (list 'a 1)))))
-(htdp-test #f 'hash-eqv?
-           (hash-eqv? (make-hasheq (list (list 'a 1)))))
-(htdp-test #t 'hash-eqv?
-           (hash-eqv? (make-hasheqv (list (list 'a 1)))))
-
-;; immutable tests
-(htdp-test 1 'hash-copy
-           (local [(define ht (make-immutable-hash (list (list 'a 1))))
-                   (define htp (hash-copy ht))]
-             (hash-ref htp 'a)))
-(htdp-test 1 'hash-count (hash-count (make-immutable-hash (list (list 'a 1)))))
-(htdp-test 42 'hash-for-each 
-           (local [(define x 0)
-                   (define (f k v) (set! x 42))]
-             (begin (hash-for-each (make-immutable-hash (list (list 1 2))) f)
-                    x)))
-(htdp-test #t 'hash-has-key? (hash-has-key? (make-immutable-hash (list (list 1 2))) 1))
-(htdp-test #f 'hash-has-key? (hash-has-key? (make-immutable-hash (list (list 1 2))) 2))
-(htdp-test (list #f #f) 'hash-map
-           (hash-map (make-immutable-hash (list (list 1 #t) (list 2 #t)))
-                     (lambda (k v) (not v))))
-(htdp-test 1 'hash-ref (hash-ref (make-immutable-hash (list (list 'a 1))) 'a))
-(htdp-test 2 'hash-ref (hash-ref (make-immutable-hash (list (list 'a 1))) 'b 2))
-(htdp-test 2 'hash-ref (hash-ref (make-immutable-hash (list (list 'a 1))) 'b (lambda () 2)))
-(htdp-err/rt-test
-             (local [(define ht (make-immutable-hash (list (list 'a 1))))]
-               (hash-ref! ht 'a 2)))
-(htdp-err/rt-test 
-           (local [(define ht (make-immutable-hash (list (list 'a 1))))]
-             (list (hash-has-key? ht 'a)
-                   (begin (hash-remove! ht 'a)
-                          (hash-has-key? ht 'a)))))
-(htdp-test (list #t #f) 'hash-remove
-           (local [(define ht (make-immutable-hash (list (list 'a 1))))]
-             (list (hash-has-key? ht 'a)
-                   (hash-has-key? (hash-remove ht 'a) 'a))))
-(htdp-err/rt-test
-           (local [(define ht (make-immutable-hash (list (list 'a 1))))]
-             (begin (hash-set! ht 'a 2)
-                    (hash-ref ht 'a))))
-(htdp-test 2 'hash-set
-           (local [(define ht (make-immutable-hash (list (list 'a 1))))]
-             (hash-ref (hash-set ht 'a 2) 'a)))
-(htdp-err/rt-test
-           (local [(define ht (make-immutable-hash (list (list 'a 1))))]
-             (begin (hash-update! ht 'a add1)
-                    (hash-ref ht 'a))))
-(htdp-test 2 'hash-update
-           (local [(define ht (make-immutable-hash (list (list 'a 1))))]
-             (hash-ref (hash-update ht 'a add1) 'a)))
-(htdp-test 2 'hash-update
-           (local [(define ht (make-immutable-hash (list (list 'a 1))))]
-             (hash-ref (hash-update ht 'b add1 1) 'b)))
-(htdp-test 2 'hash-update
-           (local [(define ht (make-immutable-hash (list (list 'a 1))))]
-             (hash-ref (hash-update ht 'b add1 (lambda () 1)) 'b)))
-(htdp-test #t 'hash?
-           (hash? (make-immutable-hash)))
-(htdp-test #t 'hash?
-           (hash? (make-immutable-hasheq)))
-(htdp-test #t 'hash?
-           (hash? (make-immutable-hasheqv)))
-(htdp-test #t 'hash?
-           (hash? (make-immutable-hash (list (list 'a 1)))))
-(htdp-test #t 'hash?
-           (hash? (make-immutable-hasheq (list (list 'a 1)))))
-(htdp-test #t 'hash?
-           (hash? (make-immutable-hasheqv (list (list 'a 1)))))
-(htdp-test #f 'hash?
-           (hash? 1))
-(htdp-test #t 'hash-equal?
-           (hash-equal? (make-immutable-hash (list (list 'a 1)))))
-(htdp-test #f 'hash-equal?
-           (hash-equal? (make-immutable-hasheq (list (list 'a 1)))))
-(htdp-test #f 'hash-equal?
-           (hash-equal? (make-immutable-hasheqv (list (list 'a 1)))))
-(htdp-test #f 'hash-eq?
-           (hash-eq? (make-immutable-hash (list (list 'a 1)))))
-(htdp-test #t 'hash-eq?
-           (hash-eq? (make-immutable-hasheq (list (list 'a 1)))))
-(htdp-test #f 'hash-eq?
-           (hash-eq? (make-immutable-hasheqv (list (list 'a 1)))))
-(htdp-test #f 'hash-eqv?
-           (hash-eqv? (make-immutable-hash (list (list 'a 1)))))
-(htdp-test #f 'hash-eqv?
-           (hash-eqv? (make-immutable-hasheq (list (list 'a 1)))))
-(htdp-test #t 'hash-eqv?
-           (hash-eqv? (make-immutable-hasheqv (list (list 'a 1)))))
-
-;; Check set...! error message:
-(htdp-top (define-struct a1 (b)))
-(htdp-err/rt-test (set-a1-b! 1 2) #rx"set-a1-b!")
-(htdp-top-pop 1)
-
-;; Simulate set! in the repl
-(module my-advanced-module (lib "htdp-advanced.rkt" "lang")
-  (define x 10)
-  (define (f y) f)
-  (define-struct s (x y)))
-(mz-require 'my-advanced-module)
-(parameterize ([current-namespace (module->namespace ''my-advanced-module)])
-  (eval #'(set! x 12))
-  (eval #'(set! f 12))
-  (eval #'(set! make-s 12))
-  (eval #'(set! s-x 12))
-  (eval #'(set! s? 12))
-  (eval #'(set! set-s-x! 12)))
-
-;; define-datatype
-
-(htdp-syntax-test #'define-datatype #rx"define-datatype: expected an open parenthesis before define-datatype, but found none")
-(htdp-syntax-test #'(define-datatype) #rx"define-datatype: expected a datatype type name after `define-datatype', but nothing's there")
-(htdp-syntax-test #'(define-datatype dt 10) #rx"define-datatype: expected a variant after the datatype type name in `define-datatype', but found a number")
-(htdp-syntax-test #'(define-datatype dt [v1] 10) #rx"define-datatype: expected a variant after the datatype type name in `define-datatype', but found a number")
-(htdp-syntax-test #'(define-datatype dt v1) #rx"define-datatype: expected a variant after the datatype type name in `define-datatype', but found something else")
-(htdp-syntax-test #'(define-datatype dt [v1 f1 f1]) #rx"define-datatype: in variant `v1': found a field name that is used more than once: f1")
-(htdp-syntax-test #'(define-datatype dt [10]) #rx"define-datatype: expected a variant name, found a number")
-(htdp-syntax-test #'(define-datatype dt [(v1)]) #rx"define-datatype: expected a variant name, found a part")
-(htdp-syntax-test #'(define-datatype dt [v1 10]) #rx"define-datatype: in variant `v1': expected a field name, found a number")
-(htdp-syntax-test #'(define-datatype dt [v1] [v1]) #rx"define-datatype: found a variant name that is used more than once: v1")
-(htdp-syntax-test #'(define-datatype posn [v1]) "posn?: this name was defined previously and cannot be re-defined")
-(htdp-syntax-test #'(define-datatype dt [posn]) "posn: this name was defined previously and cannot be re-defined")
-(htdp-syntax-test #'(define-datatype lambda [v1]) #rx"define-datatype: expected a datatype type name after `define-datatype', but found a keyword")
-(htdp-syntax-test #'(define-datatype dt [lambda]) #rx"define-datatype: expected a variant name, found a keyword")
-(htdp-syntax-test #'(define-datatype (dt)) #rx"define-datatype: expected a datatype type name after `define-datatype', but found a part")
-(htdp-syntax-test #'(+ 1 (define-datatype dt [v1])) #rx"define-datatype: found a definition that is not at the top level")
-
-(htdp-top (define-datatype dt))
-(htdp-test #f 'dt? (dt? 1))
-(htdp-top-pop 1)
-
-(htdp-top (define x 5))
-(htdp-syntax-test #'(define-datatype x [v1]) #rx"x: this name was defined previously and cannot be re-defined")
-(htdp-syntax-test #'(define-datatype dt [x]) #rx"x: this name was defined previously and cannot be re-defined")
-(htdp-top-pop 1)
-
-(htdp-top (define-datatype a
-            [a0]
-            [a1 b]
-            [a3 b c d]))
-(htdp-test #t 'a0? (a0? (make-a0)))
-(htdp-test #t 'a? (a? (make-a0)))
-(htdp-test #t 'a1? (a1? (make-a1 1)))
-(htdp-test #t 'a? (a? (make-a1 1)))
-(htdp-test #t 'a3? (a3? (make-a3 1 2 3)))
-(htdp-test #t 'a? (a? (make-a3 1 2 3)))
-(htdp-test #f 'a1? (a1? (make-a3 1 2 3)))
-(htdp-test #f 'a3? (a3? (make-a1 1)))
-(htdp-test #f 'a? (a? 1))
-(htdp-top-pop 1)
-
-;; match
-
-(htdp-syntax-test #'match #rx"match: expected an open parenthesis before match, but found none")
-(htdp-syntax-test #'(match) #rx"match: expected an expression after `match', but nothing's there")
-(htdp-syntax-test #'(match 1) #rx"match: expected a pattern--answer clause after the expression following `match', but nothing's there")
-
-(htdp-syntax-test #'(match 1 10) #rx"match: expected a pattern--answer clause, but found a number")
-(htdp-syntax-test #'(match 1 x) #rx"match: expected a pattern--answer clause, but found something else")
-(htdp-syntax-test #'(match 1 []) #rx"match: expected a pattern--answer clause, but found an empty clause")
-(htdp-syntax-test #'(match 1 [x]) #rx"expected an expression for the answer in a `match' clause, but nothing's there")
-(htdp-syntax-test #'(match 1 [x 10 10]) #rx"expected only one expression for the answer in a `match' clause, but found 1 extra part")
-(htdp-syntax-test #'(match 1 [x 10 x]) #rx"expected only one expression for the answer in a `match' clause, but found 1 extra part")
-
-(htdp-syntax-test #'(match 1 [x 10] 10) #rx"match: expected a pattern--answer clause, but found a number")
-(htdp-syntax-test #'(match 1 [x 10] x) #rx"match: expected a pattern--answer clause, but found something else")
-(htdp-syntax-test #'(match 1 [x 10] []) #rx"match: expected a pattern--answer clause, but found an empty clause")
-(htdp-syntax-test #'(match 1 [x 10] [x]) #rx"expected an expression for the answer in a `match' clause, but nothing's there")
-(htdp-syntax-test #'(match 1 [x 10] [x 10 10]) #rx"expected only one expression for the answer in a `match' clause, but found 1 extra part")
-(htdp-syntax-test #'(match 1 [x 10] [x 10 x]) #rx"expected only one expression for the answer in a `match' clause, but found 1 extra part")
-
-(define-syntax-rule (htdp-match/v res pat expr val)
-  (htdp-test res 'pat (match expr [pat val] [else #f])))
-(define-syntax-rule (htdp-match res pat expr)
-  (htdp-match/v res pat expr #t))
-
-(htdp-match #t true true)
-(htdp-match #f true false)
-(htdp-match #f true 1)
-
-(htdp-match #f false true)
-(htdp-match #t false false)
-(htdp-match #f false 1)
-
-(htdp-match #t empty empty)
-(htdp-match #f empty 1)
-
-(htdp-match #t 1 1)
-(htdp-match #t '1 1)
-(htdp-match #t `1 1)
-(htdp-match #f 1 2)
-
-(htdp-match #t "foo" "foo")
-(htdp-match #t '"foo" "foo")
-(htdp-match #t `"foo" "foo")
-(htdp-match #f "foo" "bar")
-
-(htdp-match #t #\a #\a)
-(htdp-match #t '#\a #\a)
-(htdp-match #t `#\a #\a)
-(htdp-match #f #\a #\b)
-
-(htdp-match #t 'a 'a)
-(htdp-match #f 'a 'b)
-
-(htdp-match #t '(a b) (list 'a 'b))
-(htdp-match #t ''a ''a)
-(htdp-match #t '`a '`a)
-(htdp-match #t ',a ',a)
-(htdp-match #t ',@a ',@a)
-
-(htdp-match #t `(a b) (list 'a 'b))
-(htdp-match #t `'a ''a)
-(htdp-match #t ``a '`a)
-
-(htdp-match #t (cons a b) (list 1))
-(htdp-match #f (cons 1 2) 1)
-(htdp-match #t (list a b) (list 1 2))
-(htdp-match #f (list a b) (list 1))
-(htdp-match #t (list* a b) (list 1))
-(htdp-match #f (list* a b) empty)
-
-(htdp-match #t (vector x y) (vector 1 2))
-(htdp-match #f (vector x x) (vector 1 2))
-(htdp-match #t (vector _ _) (vector 1 2))
-(htdp-match #f (vector x y) (vector 1))
-
-(htdp-match #t (box x) (box 1))
-(htdp-match #f (box x) 1)
-
-(htdp-match/v 1 a 1 a)
-
-(htdp-top (define-struct my-posn (x y)))
-(htdp-match/v 3 (struct my-posn (x y)) (make-my-posn 1 2) (+ x y))
-(htdp-top-pop 1)
-
-(htdp-match/v 3 (struct posn (x y)) (make-posn 1 2) (+ x y))
-(htdp-match/v 3 (cons (struct posn (x y)) empty) (cons (make-posn 1 2) empty) (+ x y))
-(htdp-match/v 3 (list* (struct posn (x y)) empty) (list* (make-posn 1 2) empty) (+ x y))
-(htdp-match/v 3 (list (struct posn (x y))) (list (make-posn 1 2)) (+ x y))
-(htdp-match/v 3 (vector (struct posn (x y))) (vector (make-posn 1 2)) (+ x y))
-(htdp-match/v 3 (box (struct posn (x y))) (box (make-posn 1 2)) (+ x y))
-
-(htdp-match/v 3 `,(struct posn (x y)) (make-posn 1 2) (+ x y))
-(htdp-match/v 1 `(a ,b) (list 'a 1) b)
-(htdp-match/v 1 `(a ,@(list b)) (list 'a 1) b)
-
-;; ----------------------------------------
-
-(report-errs)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-adv.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-adv.rktl
deleted file mode 100644
index 95a45a65c4..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-adv.rktl
+++ /dev/null
@@ -1,408 +0,0 @@
-
-(htdp-err/rt-test (add1) "add1: expects 1 argument, but found none")
-(htdp-err/rt-test (add1 'a 'b 'c) "add1: expects only 1 argument, but found 3")
-(htdp-err/rt-test (define x x) "x is used here before its definition")
-(htdp-err/rt-test (add1 'a) "add1: expects a number, given 'a")
-(htdp-err/rt-test (+ 'a 1) "[+]: expects a number as 1st argument, given 'a")
-(htdp-err/rt-test (+ 1 'a) "[+]: expects a number as 2nd argument, given 'a")
-
-(htdp-syntax-test #'() "function call: expected a function after the open parenthesis, but nothing's there")
-
-(htdp-syntax-test #'#%app)
-(htdp-syntax-test #'quote)
-(htdp-syntax-test #'(quote 1 2))
-
-(htdp-syntax-test #'define "define: expected an open parenthesis before define, but found none")
-(htdp-syntax-test #'(define) "define: expected a variable name, or a function name and its variables (in parentheses)")
-(htdp-syntax-test #'(define x) "define: expected an expression after the variable name")
-(htdp-syntax-test #'(define x 10 12) "define: expected only one expression after the variable name")
-(htdp-syntax-test #'(define (10 y) 12) "define: expected the name of the function, but found a number")
-(htdp-syntax-test #'(define (10) 12) "define: expected the name of the function, but found a number")
-(htdp-syntax-test #'(define ("x" y) 12) "define: expected the name of the function, but found a string")
-(htdp-syntax-test #'(define (y 10) 12) "define: expected a variable, but found a number")
-(htdp-syntax-test #'(define (y "x") 12) "define: expected a variable, but found a string")
-(htdp-syntax-test #'(define (y z 10) 12) "define: expected a variable, but found a number")
-(htdp-syntax-test #'(define (x y) 10 12) "define: expected only one expression for the function body, but found 1 extra part")
-(htdp-syntax-test #'(define (x y y) 10) "define: found a variable that is used more than once: y")
-(htdp-syntax-test #'(define () 10) "define: expected a name for the function, but nothing's there")
-(htdp-syntax-test #'(define 1 10) "define: expected a variable name, or a function name and its variables (in parentheses), but found a number")
-(htdp-syntax-test #'(define x lambda) "lambda: expected an open parenthesis before lambda, but found none")
-(htdp-syntax-test #'(define x (lambda)) "lambda: expected at least one variable (in parentheses) after lambda, but nothing's there")
-(htdp-syntax-test #'(define x (lambda (x))) "lambda: expected an expression for the function body, but nothing's there")
-(htdp-syntax-test #'(define x (lambda y)) "lambda: expected at least one variable (in parentheses) after lambda, but found something else")
-(htdp-syntax-test #'(define x (lambda y 10) "lambda: expected at least one variable (in parentheses) after lambda, but found something else"))
-(htdp-syntax-test #'(define x (lambda (10) 10)) "lambda: expected a variable, but found a number")
-(htdp-syntax-test #'(define x (lambda (x 10) 10)) "lambda: expected a variable, but found a number")
-(htdp-syntax-test #'(define x (lambda (y) 10 11)) "lambda: expected only one expression for the function body, but found 1 extra part")
-(htdp-syntax-test #'(define x (lambda (y y) 10)) "lambda: found a variable that is used more than once: y")
-(htdp-syntax-test #'(+ (define x 5)) "define: found a definition that is not at the top level")
-
-;; Keywords:
-(htdp-syntax-test #'(define (define y) 12) "define: expected the name of the function, but found a keyword")
-(htdp-syntax-test #'(define (lambda y) 12) "define: expected the name of the function, but found a keyword")
-(htdp-syntax-test #'(define (cond y) 12) "define: expected the name of the function, but found a keyword")
-(htdp-syntax-test #'(define (if y) 12) "define: expected the name of the function, but found a keyword")
-(htdp-syntax-test #'(define (y define) 12) "define: expected a variable, but found a keyword")
-(htdp-syntax-test #'(define (y lambda) 12) "define: expected a variable, but found a keyword")
-(htdp-syntax-test #'(define (y cond) 12) "define: expected a variable, but found a keyword")
-(htdp-syntax-test #'(define (y if) 12) "define: expected a variable, but found a keyword")
-(htdp-syntax-test #'(define (y and) 12) "define: expected a variable, but found a keyword")
-(htdp-syntax-test #'(define (y or) 12) "define: expected a variable, but found a keyword")
-(htdp-syntax-test #'(define (y empty) 12) "define: expected a variable, but found a keyword")
-
-(htdp-syntax-test #'define-struct "define-struct: expected an open parenthesis before define-struct, but found none")
-(htdp-syntax-test #'(define-struct) "define-struct: expected the structure name after define-struct, but nothing's there")
-(htdp-syntax-test #'(define-struct a) "define-struct: expected at least one field name (in parentheses) after the structure name, but nothing's there")
-(htdp-syntax-test #'(define-struct a (b) 10) "define-struct: expected nothing after the field names, but found 1 extra part")
-(htdp-syntax-test #'(define-struct a (b) 10 11 12) "define-struct: expected nothing after the field names, but found 3 extra parts")
-(htdp-syntax-test #'(define-struct 10 (b)) "define-struct: expected the structure name after define-struct, but found a number")
-(htdp-syntax-test #'(define-struct a b) "define-struct: expected at least one field name (in parentheses) after the structure name, but found something else")
-(htdp-syntax-test #'(define-struct a (10)) "define-struct: expected a field name, but found a number")
-(htdp-syntax-test #'(define-struct a (b 10)) "define-struct: expected a field name, but found a number")
-(htdp-syntax-test #'(define-struct (a) (b)) "define-struct: expected the structure name after define-struct, but found a part")
-(htdp-syntax-test #'(define-struct a (b b)) "define-struct: found a field name that is used more than once: b")
-(htdp-syntax-test #'(define-struct lambda (b)) "define-struct: expected the structure name after define-struct, but found a keyword")
-(htdp-syntax-test #'(+ 1 (define-struct a (b))) "define-struct: found a definition that is not at the top level")
-
-(htdp-top (define x 5))
-(htdp-top (define (f y) (+ x y)))
-(htdp-test 5 'lookup x)
-(htdp-test 9 'app-f (f 4))
-(htdp-top (define f2 (lambda (y) (+ x y))))
-(htdp-test 15 'app-f (f 10))
-(htdp-top-pop 1)
-(htdp-top-pop 1)
-(htdp-top-pop 1)
-
-(htdp-top (define-struct a0 ()))
-(htdp-top (define-struct a1 (b)))
-(htdp-top (define-struct a3 (b c d)))
-(htdp-test #t 'a0? (a0? (make-a0)))
-(htdp-test #t 'a1? (a1? (make-a1 1)))
-(htdp-test #t 'a3? (a3? (make-a3 1 2 3)))
-(htdp-test #f 'a1? (a1? (make-a3 1 2 3)))
-(htdp-test #f 'a3? (a3? (make-a1 1)))
-(htdp-err/rt-test (a1-b 10) "a1-b: expects an a1, given 10")
-(htdp-syntax-test #'(a0 1 2 3) "a0: expected a function after the open parenthesis, but found a structure name")
-
-(htdp-syntax-test #'cond "cond: expected an open parenthesis before cond, but found none")
-(htdp-syntax-test #'(cond) "cond: expected a clause after cond, but nothing's there")
-(htdp-syntax-test #'(cond 1) "cond: expected a clause with a question and an answer, but found a number")
-(htdp-syntax-test #'(cond [#t 6] 2) "cond: expected a clause with a question and an answer, but found a number")
-(htdp-syntax-test #'(cond [else 6] [#f 10]) "cond: found an else clause that isn't the last clause in its cond expression")
-(htdp-syntax-test #'(cond [else 6] [else 10]) "cond: found an else clause that isn't the last clause in its cond expression")
-(htdp-syntax-test #'(cond []) "cond: expected a clause with a question and an answer, but found an empty part")
-(htdp-syntax-test #'(cond [1]) "cond: expected a clause with a question and an answer, but found a clause with only one part")
-(htdp-syntax-test #'(cond [1 2 3]) "cond: expected a clause with a question and an answer, but found a clause with 3 parts")
-(htdp-syntax-test #'(cond [1 2][]) "cond: expected a clause with a question and an answer, but found an empty part")
-(htdp-syntax-test #'(cond [1 2][3 4 5]) "cond: expected a clause with a question and an answer, but found a clause with 3 parts")
-
-(htdp-test 17 'cond (cond [else 17]))
-(htdp-test 18 'cond (cond [#t 18]))
-(htdp-test 19 'cond (cond [(zero? 10) 0] [#t 19]))
-(htdp-test 19 'cond (cond [(zero? 10) 0] [else 19]))
-
-
-(htdp-err/rt-test (cond [#f 10]) "cond: all question results were false") ;; Should it be a different exception?
-(define rx:not-true-or-false "not true or false")
-(htdp-err/rt-test (cond [1 10]) rx:not-true-or-false)
-
-(htdp-syntax-test #'if "if: expected an open parenthesis before if, but found none")
-(htdp-syntax-test #'(if) "if: expected a question and two answers, but nothing's there")
-(htdp-syntax-test #'(if #t) "if: expected a question and two answers, but found only 1 part")
-(htdp-syntax-test #'(if #t 1) "if: expected a question and two answers, but found only 2 parts")
-(htdp-syntax-test #'(if #t 1 2 3) "if: expected a question and two answers, but found 4 parts")
-
-(htdp-err/rt-test (if 1 2 3) rx:not-true-or-false)
-
-(htdp-syntax-test #'and "and: expected an open parenthesis before and, but found none")
-(htdp-syntax-test #'(and) "and: expects at least 2 arguments, but found none")
-(htdp-syntax-test #'(and #t) "and: expects at least 2 arguments, but found only 1")
-
-(htdp-err/rt-test (and 1 #t) rx:not-true-or-false)
-(htdp-err/rt-test (and #t 1) rx:not-true-or-false)
-(htdp-test #f 'ok-and (and #t #f 1))
-
-(htdp-syntax-test #'or "or: expected an open parenthesis before or, but found none")
-(htdp-syntax-test #'(or) "or: expects at least 2 arguments, but found none")
-(htdp-syntax-test #'(or #t) "or: expects at least 2 arguments, but found only 1")
-
-(htdp-err/rt-test (or 1 #f) rx:not-true-or-false)
-(htdp-err/rt-test (or #f 1) rx:not-true-or-false)
-(htdp-test #t 'ok-or (or #f #t 1))
-
-(htdp-test #t 'empty? (empty? empty))
-(htdp-test #t 'cons? (cons? (cons 1 empty)))
-
-
-(htdp-test #t 'boolean? (boolean? true))
-(htdp-test #t 'boolean? (boolean? false))
-(htdp-test #t 'eq? (eq? #t true))
-(htdp-test #t 'eq? (eq? #f false))
-
-(htdp-test -9 '- (- 9))
-
-(htdp-top (define-struct an-example-structure (first-field second-field)))
-(htdp-error-test #'(define an-example-structure 5))
-(htdp-error-test #'(define (an-example-structure x) 5))
-(htdp-error-test #'(define-struct an-example-structure (y)))
-(htdp-error-test #'(define-struct an-example (structure y)))
-(htdp-top-pop 1)
-
-(htdp-top (define an-example-value 12))
-(htdp-error-test #'(define an-example-value 5))
-(htdp-error-test #'(define (an-example-value x) 5))
-(htdp-error-test #'(define-struct an-example-value (y)))
-(htdp-error-test #'(define-struct an-example (value y)))
-(htdp-top-pop 1)
-
-(htdp-top (define (an-example-function x) x))
-(htdp-error-test #'(define an-example-function 5))
-(htdp-error-test #'(define (an-example-function x) 5))
-(htdp-error-test #'(define-struct an-example-function (y)))
-(htdp-error-test #'(define-struct an-example (function y)))
-(htdp-top-pop 1)
-
-
-
-
-(htdp-test #t 'equal? (equal? 1 1))
-(htdp-test #t 'equal? (equal? (list 1) (list 1)))
-(htdp-test #t 'equal? (equal? (list #i1.0 2) (list #i1.0 2)))
-(htdp-test #f 'equal? (equal? (list #i1.0 2) (list #i1.0 #i2.0)))
-(htdp-test #t 'equal? (equal? (list "apple") (list "apple")))
-(htdp-test #f 'equal? (equal? (list "apple") (list 'apple)))
-(htdp-test #f 'equal? (equal? (list "apple") (list "banana")))
-(htdp-test #t 'equal? (equal? (make-posn 1 2) (make-posn 1 2)))
-(htdp-test #f 'equal? (equal? (make-posn 1 #i2.0) (make-posn 1 2)))
-(htdp-test #t 'equal? (equal? (make-a1 2) (make-a1 2)))
-(htdp-test #f 'equal? (equal? (make-a1 #i2.0) (make-a1 2)))
-
-(htdp-test #t 'equal~? (equal~? 1 1 #i0.1))
-(htdp-test #t 'equal~? (equal~? (list 1) (list 1) #i0.1))
-(htdp-test #t 'equal~? (equal~? (list #i1.0 2) (list #i1.0 2) #i0.1))
-(htdp-test #t 'equal~? (equal~? (list #i1.0 2) (list #i1.0 #i2.0) #i0.1))
-(htdp-test #f 'equal~? (equal~? (list #i1.0 2) (list #i1.0 2.2) #i0.1))
-(htdp-test #t 'equal~? (equal~? (list "apple") (list "apple") #i0.2))
-(htdp-test #f 'equal~? (equal~? (list "apple") (list 'apple) #i0.2))
-(htdp-test #f 'equal~? (equal~? (list "apple") (list "banana") #i0.2))
-(htdp-test #t 'equal~? (equal~? (make-posn 1 2) (make-posn 1 2) #i0.2))
-(htdp-test #t 'equal~? (equal~? (make-posn 1 #i2.0) (make-posn 1 2) #i0.2))
-(htdp-test #t 'equal~? (equal~? (make-a1 2) (make-a1 2) #i0.2))
-(htdp-test #t 'equal~? (equal~? (make-a1 #i2.0) (make-a1 2) #i0.2))
-(htdp-test #f 'equal~? (equal~? (make-a1 #i2.3) (make-a1 2) #i0.2))
-
-(htdp-test #t 'string-contains (string-contains? "x" "abxy"))
-(htdp-test #f 'string-contains (string-contains? "x" "abc"))
-(htdp-test #f 'string-contains (string-contains? "(" "abc"))
-(htdp-test #t 'string-contains (string-contains? "(" "ab(c"))
-
-(htdp-top-pop 1)
-(htdp-top-pop 1)
-(htdp-top-pop 1)
-
-;; Teachpacks with higher-order primitives
-;;  Some further tests are in beg-bega.rkt
-(module my-teachpack mzscheme
-  (require lang/prim)
-  (provide go)
-  (define-higher-order-primitive go real-go (_ proc))
-  (define (real-go a b) a))
-(htdp-teachpack my-teachpack)
-
-(htdp-top (define (my-f x) x))
-(htdp-top (define-struct foo (a b)))
-
-(htdp-test 5 'tp (go 5 add1))
-(htdp-test 5 'tp (go 5 my-f))
-(htdp-test 5 'tp (go 5 foo?))
-(htdp-test 5 'tp (go 5 make-foo))
-(htdp-test 5 'tp (go 5 foo-a))
-(htdp-test 5 'tp (go 5 go))
-
-(htdp-top-pop 1)
-(htdp-top-pop 1)
-(htdp-teachpack-pop)
-
-;; Check require
-(htdp-top (require (lib "unit.rkt" "mzlib")))
-(htdp-test #f unit? 12)
-(htdp-top-pop 1)
-(htdp-top (require mzlib/unit))
-(htdp-test #f unit? 12)
-(htdp-top-pop 1)
-
-;; Error messages
-(htdp-top (define my-x 5))
-(htdp-top (define (my-f x) (+ x 5)))
-
-(htdp-syntax-test #'(cond [true my-x 5]) #rx"found a clause with 3 parts")
-(htdp-syntax-test #'(define foo17 my-x 5) #rx"define: expected only one expression after the variable name foo17, but found 1 extra part")
-(htdp-syntax-test #'(my-y 17) #rx"my-y: this function is not defined")
-(htdp-syntax-test #'(cond [true my-y 17]) #rx"my-y: this variable is not defined")
-(htdp-syntax-test #'(define my-f 12) #rx"cannot be re-defined")
-(htdp-syntax-test #'(define (my-x h) 12) #rx"cannot be re-defined")
-(htdp-top-pop 1)
-(htdp-top-pop 1)
-(htdp-syntax-test #'define #rx"define: expected an open parenthesis before define, but found none")
-
-
-(htdp-syntax-test #'(require) #rx"found nothing")
-(htdp-syntax-test #'(require a!) #rx"bad syntax for a module path")
-(htdp-syntax-test #'(require "a" "b") #rx"a single module name")
-(htdp-syntax-test #'(require "") #rx"empty")
-(htdp-syntax-test #'(require "/a") #rx"start with a slash")
-(htdp-syntax-test #'(require "a/") #rx"end with a slash")
-(htdp-syntax-test #'(require "a%&#^%") #rx"string can contain only")
-(htdp-syntax-test #'(require (lib)) #rx"expected at least one string")
-(htdp-syntax-test #'(require (lib "a" "b/")) #rx"end with a slash")
-(htdp-syntax-test #'(require (lib "a" 2)) #rx"string for a lib path")
-(htdp-syntax-test #'(require (planet "a" 2)) #rx"not a valid planet path")
-(htdp-syntax-test #'(require (planet "test-connectionλ.ss" ("planet" "test-connection.plt" 1 0)))
-                  #rx"string can contain only")
-
-(define rx:dots-error "found a template")
-
-;; CCE: These test the error handling for ...
-;; They should be duplicated for .. through ......
-;; but (for-each (lambda foo bar) baz) won't work here.
-(htdp-err/rt-test ... rx:dots-error)
-(htdp-err/rt-test (+ 1 ... 2) rx:dots-error)
-(htdp-err/rt-test (... 1 2) rx:dots-error)
-(htdp-err/rt-test (if false 1 ...) rx:dots-error)
-(htdp-test 1 'ok-dots (if true 1 ...))
-(htdp-error-test #'(set! ... true))
-
-(htdp-top (check-expect 1))
-(htdp-syntax-test #'1 "check-expect: expects 2 arguments, but found only 1")
-(htdp-top-pop 1)
-
-(htdp-syntax-test #'(cons (check-expect 1 1) empty))
-(htdp-syntax-test #'(define (f x) (check-expect 1 x)))
-(htdp-syntax-test #'(define (f x) (check-expect 1 x) x))
-
-(htdp-top (check-expect 1 1))
-(htdp-test 2 'two 2)
-(htdp-top-pop 1)
-
-(htdp-top (check-expect 1 2))
-(htdp-test 2 'two 2) ;; test failure recorded in teaching lang...
-(htdp-top-pop 1)
-
-(htdp-top (check-expect 1 (/ 1 0)))
-(htdp-test 2 'two 2)
-(htdp-top-pop 1)
-
-(htdp-top (check-error (/ 1 0) "division by zero"))
-(htdp-test 2 'two 2)
-(htdp-top-pop 1)
-
-(htdp-top (check-error (/ 1 0)))
-(htdp-test 2 'two 2)
-(htdp-top-pop 1)
-
-(htdp-top (check-error 1))
-(htdp-test 2 'two 2)
-(htdp-top-pop 1)
-
-(htdp-top (check-error (/ 1 0) "wrong error"))
-(htdp-test 2 'two 2)
-(htdp-top-pop 1)
-
-(htdp-top (check-error 0 "not error"))
-(htdp-test 2 'two 2)
-(htdp-top-pop 1)
-
-(htdp-top (check-within 1 2 3))
-(htdp-test 2 'two 2)
-(htdp-top-pop 1)
-
-
-;; -----------------------------------------------------------------------------
-;; mf's tests for string functions replacing chars 
-
-(htdp-test "h" 'string-ith (string-ith "hell" 0))
-
-(htdp-err/rt-test (string-ith "hell" 4)
-                  (exn-type-and-msg exn:fail:contract?
-                                    "string-ith: expected an exact integer in [0, 4) (i.e., less than the length of the given string) for the second argument, but received 4"))
-
-(htdp-err/rt-test (string-ith 10 4)
-                  (exn-type-and-msg exn:fail:contract?
-                                    "string-ith: expected a string for the first argument, but received 10"))
-
-
-(htdp-err/rt-test (string-ith "10" 'a)
-                  (exn-type-and-msg exn:fail:contract?
-                                    "string-ith: expected a natural number for the second argument, but received 'a"))
-
-(htdp-test "aaa" 'replicate (replicate 3 "a"))
-
-(htdp-test "ababab" 'replicate (replicate 3 "ab"))
-
-(htdp-err/rt-test (replicate 3 10)
-                  (exn-type-and-msg exn:fail:contract? "replicate: expected a string, but received 10"))
-
-(htdp-test "\n" 'int->string (int->string 10))
-
-(htdp-err/rt-test (int->string 56555)
-                  (exn-type-and-msg exn:fail:contract? "int->string: expected an exact integer in [0,55295] or [57344 1114111], but received 56555"))
-
-(htdp-err/rt-test (int->string "A")
-                  (exn-type-and-msg exn:fail:contract? "int->string: expected an exact integer in [0,55295] or [57344 1114111], but received \"A\""))
-
-(htdp-test 65 'string->int (string->int "A"))
-
-(htdp-err/rt-test (string->int 10)
-                  (exn-type-and-msg exn:fail:contract? "string->int: expected a 1-letter string, but received a string: 10"))
-
-(htdp-err/rt-test (string->int "AB")
-                  (exn-type-and-msg exn:fail:contract? "string->int: expected a 1-letter string, but received \"AB\""))
-
-(htdp-test (list "h" "e" "l" "l" "o") 'explode (explode "hello"))
-
-(htdp-err/rt-test (explode 10)
-                  (exn-type-and-msg exn:fail:contract? "explode: expected a string, but received 10"))
-
-(htdp-test "hello" 'implode (implode (list "h" "e" "l" "l" "o")))
-
-(htdp-err/rt-test (implode 10)
-                  (exn-type-and-msg exn:fail:contract? "implode: expected a list of 1-letter strings, but received: 10"))
-
-(htdp-err/rt-test (implode (list "he" "l"))
-                  (exn-type-and-msg exn:fail:contract? "implode: expected a list of 1-letter strings, but received '(\"he\" \"l\")"))
-
-
-(htdp-test true 'string-numeric? (string-numeric? "0"))
-(htdp-test true 'string-numeric? (string-numeric? "10"))
-(htdp-test false 'string-numeric? (string-numeric? "a"))
-(htdp-test false 'string-numeric? (string-numeric? "ab"))
-
-(htdp-err/rt-test (string-numeric? 10)
-                  (exn-type-and-msg exn:fail:contract? "string-numeric?: expected a string, but received 10"))
-
-(htdp-test false 'string-alphabetic? (string-alphabetic? "a0"))
-(htdp-test true 'string-alphabetic? (string-alphabetic? "a"))
-(htdp-test true 'string-alphabetic? (string-alphabetic? "ba"))
-(htdp-test true 'string-alphabetic? (string-alphabetic? "ab"))
-
-(htdp-test true 'string-whitespace? (string-whitespace? "  "))
-(htdp-test true 'string-whitespace? (string-whitespace? "  \t"))
-(htdp-test false 'string-whitespace? (string-whitespace? "ABC"))
-
-(htdp-test false 'string-upper-case? (string-upper-case? "  "))
-(htdp-test false 'string-upper-case? (string-upper-case? "AB\t"))
-(htdp-test true 'string-upper-case? (string-upper-case? "ABC"))
-
-(htdp-test false 'string-lower-case? (string-lower-case? "  "))
-(htdp-test false 'string-lower-case? (string-lower-case? "ab\t"))
-(htdp-test true 'string-lower-case? (string-lower-case? "abc"))
-
-(htdp-err/rt-test (error "a" "a") #rx"^aa$")
-(htdp-err/rt-test (error 'a "a") #rx"^a: a$")
-(htdp-err/rt-test (error "This is" " an err" "or" " message with a number: " 5)
-                  #rx"^This is an error message with a number: 5$")
-(htdp-err/rt-test (error "several numbers " 1 2 3 4 5 6 7)
-                  #rx"^several numbers 1234567$")
-(htdp-err/rt-test (error "several numbers " 1 " 2 " 3 " 4")
-                  #rx"^several numbers 1 2 3 4$")
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-bega.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-bega.rktl
deleted file mode 100644
index 4ac713c90c..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-bega.rktl
+++ /dev/null
@@ -1,65 +0,0 @@
-
-(htdp-err/rt-test (/) "/: expects at least 2 arguments, but found none")
-(htdp-err/rt-test (+ 1) #rx"^[+]: expects at least 2 arguments, but found only 1$")
-
-(htdp-top (define (f x) x))
-(htdp-syntax-test #'(f 1 2) "f: expects only 1 argument, but found 2")
-(htdp-top-pop 1)
-
-(htdp-syntax-test #'(local [(define x 5)] x) "local: this function is not defined")
-(htdp-syntax-test #'(recur name ([x 18]) x) "recur: this function is not defined")
-
-(htdp-syntax-test #'(define (f78 a) (a)) "function call: expected a function after the open parenthesis, but found a variable")
-
-;; See htdp-top uses in beg-adv.rkt:
-(htdp-error-test #'f)
-(htdp-error-test #'(x 1))
-(htdp-error-test #'(+ f 1))
-(htdp-error-test #'((f 1)) )
-(htdp-error-test #'a1)
-(htdp-error-test #'make-a1)
-(htdp-error-test #'a1?)
-(htdp-error-test #'a1-b)
-
-(htdp-top (define (g w) (h w))) ;; h isn't defined, yet
-(htdp-error-test #'1)
-(htdp-top (define (h j) (add1 j)))
-(htdp-test 3 'h (h 2))
-
-(htdp-top (define (p j) (x j)))
-(htdp-error-test #'1)
-(htdp-top-pop 1)
-
-(htdp-top (define (my-f x) (+ x 5)))
-(htdp-syntax-test #'my-f #rx"expected a function call, but there is no open parenthesis before this function")
-(htdp-top-pop 1)
-
-;; Teachpacks with higher-order primitives
-;;   Builds on tests in beg-adv.rkt
-(htdp-teachpack my-teachpack)
-
-(htdp-top (define (my-f x) x))
-(htdp-top (define-struct foo (a b)))
-
-(htdp-syntax-test #'(go 5 8) "go: expects a function in this position\n  at: 8\n  in: (go 5 8)")
-(htdp-syntax-test #'(go add1 add1) "add1: expected a function call, but there is no open parenthesis before this function")
-(htdp-syntax-test #'(go my-f add1) "my-f: expected a function call, but there is no open parenthesis before this function")
-(htdp-syntax-test #'(go foo? add1) "foo?: expected a function call, but there is no open parenthesis before this function")
-(htdp-syntax-test #'(go make-foo add1) "make-foo: expected a function call, but there is no open parenthesis before this function")
-(htdp-syntax-test #'(go foo-a add1) "foo-a: expected a function call, but there is no open parenthesis before this function")
-(htdp-syntax-test #'(go go add1) "go: expected a function call, but there is no open parenthesis before this function")
-
-(htdp-top-pop 1)
-(htdp-teachpack-pop)
-
-(htdp-err/rt-test (+) exn:application:arity?)
-(htdp-err/rt-test (+ 1) exn:application:arity?)
-(htdp-err/rt-test (*) exn:application:arity?)
-(htdp-err/rt-test (* 1) exn:application:arity?)
-(htdp-err/rt-test (-) exn:application:arity?)
-(htdp-err/rt-test (/) exn:application:arity?)
-(htdp-err/rt-test (/ 1) exn:application:arity?)
-
-(err/rt-test (+) exn:application:arity?)
-
-
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-intm.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-intm.rktl
deleted file mode 100644
index bca832b89e..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-intm.rktl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-;; For every test here, make sure the opposite test is in intml-adv.rkt
-
-(htdp-syntax-test #'(1 2 3) "function call: expected a function after the open parenthesis, but found a number")
-(htdp-syntax-test #'("hello" 1 2) "function call: expected a function after the open parenthesis, but found a string")
-
-(htdp-syntax-test #'(define x17 (lambda (y) (lambda (z) z))) "lambda: found a lambda that is not a function definition")
-(htdp-syntax-test #'(lambda (x) 10) "lambda: found a lambda that is not a function definition")
-
-(htdp-syntax-test #'(lambda (f) (f f)) "lambda: found a lambda that is not a function definition")
-
-(htdp-syntax-test #'(recur empty-f () 10) "recur: this function is not defined")
-
-(htdp-syntax-test #'((unquote-splicing (list 10))) "function call: expected a function after the open parenthesis, but found a part")
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-intml.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-intml.rktl
deleted file mode 100644
index cabf64fd93..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-intml.rktl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-;; For every test here, make sure the opposite test is in advanced.rkt
-
-(htdp-syntax-test #'(define (xthnk) 10) "define: expected at least one variable after the function name, but found none")
-(htdp-syntax-test #'(define xthnk (lambda () 10)) "lambda: expected at least one variable after lambda, but found none")
-
-(htdp-err/rt-test (cons 1 2) "cons: second argument must be a list, but received 1 and 2")
-(htdp-err/rt-test (append (list 1) 2) "append: last argument must be a list, but received 2")
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/bega-adv.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/bega-adv.rktl
deleted file mode 100644
index 585344b376..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/bega-adv.rktl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-(htdp-test 1 'quote '1)
-(htdp-test (list 'quote 1) 'quote ''1)
-(htdp-test "Hello" 'quote '"Hello")
-(htdp-test (list 1 2) 'quote '(1 2))
-(htdp-test (list 1 (list 2 "hi")) 'quote '(1 (2 "hi")))
-
-(htdp-test 1 'qq `1)
-(htdp-test '(1 2) 'qq `(1 2))
-(htdp-test 7 'qq `,(+ 3 4))
-(htdp-test '(1 3) 'qq `(1 ,(+ 1 2)))
-(htdp-test '(99 88 77) 'qq `(,(* 11 9) ,(* 11 `8) ,`,(* 11 7)))
-(htdp-test '(1 2 3 4) 'qq `(1 ,@(list 2 3) 4))
-(htdp-test '(quasiquote 11) 'qq ``11)
-(htdp-test '(quasiquote (unquote 11)) 'qq ``,11)
-(htdp-test '(quasiquote (unquote 22)) 'qq ``,,(* 11 2))
-(htdp-test '(quasiquote ((unquote-splicing (22)))) 'qq ``(,@(,@(list (* 11 2)))))
-
-(htdp-syntax-test #'quasiquote "quasiquote: expected an open parenthesis before quasiquote, but found none")
-(htdp-syntax-test #'`unquote "quasiquote: misuse of unquote within a quasiquoting backquote")
-(htdp-syntax-test #'`unquote-splicing "quasiquote: misuse of ,@ or unquote-splicing within a quasiquoting backquote")
-(htdp-syntax-test #'`(unquote-splicing 10) "quasiquote: misuse of ,@ or unquote-splicing within a quasiquoting backquote")
-
-(htdp-syntax-test #'unquote "unquote: misuse of a comma or unquote, not under a quasiquoting backquote")
-(htdp-syntax-test #'(unquote) "unquote: misuse of a comma or unquote, not under a quasiquoting backquote")
-(htdp-syntax-test #'(unquote 10) "unquote: misuse of a comma or unquote, not under a quasiquoting backquote")
-
-(htdp-syntax-test #'unquote-splicing "unquote-splicing: misuse of ,@ or unquote-splicing, not under a quasiquoting backquote")
-(htdp-syntax-test #'(unquote-splicing (list 10)) "unquote-splicing: misuse of ,@ or unquote-splicing, not under a quasiquoting backquote")
-
-(htdp-err/rt-test `(,@4) (exn-type-and-msg exn:fail:contract? "append: expects a list, given 4"))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner-abbr.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner-abbr.rktl
deleted file mode 100644
index 4f1cd5501d..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner-abbr.rktl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-;; Basic checks for the beginner language. Error messages really
-;; should be inspected manually.
-
-;; Limitations of this test suite:
-;;  - It doesn't check reader-level parameterization, such as use of quotes
-;;  - It doesn't check format of printed results
-;;  - It doesn't check the absence of Racket forms
-
-;; Don't try to run other tests from the test suite after loading this
-;; one into a particular namespace.
-
-(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
-
-;; Don't need these:
-(define no-extra-if-tests? #t)
-
-(require (only-in mzscheme 
-                  exn:fail?
-                  exn:fail:contract?))
-
-(define current-htdp-lang 'lang/htdp-beginner-abbr)
-(load-relative "htdp-test.rktl")
-
-(require (lib "htdp-beginner-abbr.rkt" "lang"))
-
-(load-relative "beg-adv.rktl")
-(load-relative "beg-intml.rktl")
-(load-relative "beg-intm.rktl")
-(load-relative "beg-bega.rktl")
-(load-relative "bega-adv.rktl")
-
-(report-errs)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner.rktl
deleted file mode 100644
index db9cb49178..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beginner.rktl
+++ /dev/null
@@ -1,100 +0,0 @@
-
-;; Basic checks for the beginner language. Error messages really
-;; should be inspected manually, but there's some support for
-;; automatic checking.
-
-;; Limitations of this test suite:
-;;  - It doesn't check reader-level parameterization, such as use of quotes
-;;  - It doesn't check format of printed results
-;;  - It doesn't check the absence of Racket forms
-
-;; Don't try to run other tests from the test suite after loading this
-;; one into a particular namespace.
-
-;; See also htdp-image.rkt, which must be loaded into GRacket (but is in this
-;; directory anyway)
-
-;; Tests that apply to all languages go in beg-adv.rkt.
-;; Tests that apply only to beginner through intermediate go in beg-intm.rkt,
-;;  and so on.
-
-;; Writing tests:
-;;  
-;;   (htdp-test <expected> <name> <expr>)
-;;     checks a run-time result; <expected> is
-;;     an expression evaluated at the top level,
-;;     and <expr> is put into a module and evaluated;
-;;     <name> is usually a symbol, and it is used only for
-;;     naming the test in output
-;;
-;;   (htdp-err/rt-test <expr>)
-;;   (htdp-err/rt-test <expr> <exn-predicate>)
-;;   (htdp-err/rt-test <expr> <message-rx-string>)
-;;     checks for a run-time error by putting <expr> into a
-;;     module and evaluting; if <exn-predicate> is supplied, the
-;;     predicate must produce #t for the resulting exception;
-;;     if <message-rx-string> is supplied, the exception
-;;     message string must match the regexp
-;;
-;;   (htdp-syntax-test #'<expr>)
-;;   (htdp-syntax-test #'<expr> <message-rx-string>)
-;;     check for a syntax error, putting <expr> into a module;
-;;     if <message-rs-string> is supplied, the syntax error
-;;     message must match the regexp
-;;
-;;   (htdp-top <expr>)
-;;     imperatively adds an expression to be included into
-;;     test modules
-;;   (htdp-top-pop <n>)
-;;     removes the last <n> added expressions
-;;
-
-(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
-
-;; Check that expansion doesn't introduce non-equal ids that
-;;  claim to be "original" at the same place
-(let loop ([x (expand #'(module m (lib "htdp-beginner.rkt" "lang")
-			  (define (f x) x)))])
-  (let ([orig-ids (let loop ([x x])
-		    (cond
-		     [(identifier? x)
-		      (if (syntax-original? x)
-			  (list x)
-			  null)]
-		     [(null? x) null]
-		     [(pair? x) (append (loop (car x))
-					(loop (cdr x)))]
-		     [(syntax? x) (loop (syntax-e x))]
-		     [else null]))])
-    (for-each (lambda (id1)
-		(for-each (lambda (id2)
-			    (when (and (= (syntax-position id1)
-                                          (syntax-position id2))
-                                       (not (free-identifier=? id1 id2)))
-                              (error 'original "mismatch: ~e ~e"
-                                     id1 id2)))
-			  orig-ids))
-	      orig-ids)))
-    
-;; Don't need these:
-(define no-extra-if-tests? #t)
-
-(require (only-in mzscheme exn:fail? exn:fail:contract?))
-
-(define current-htdp-lang 'lang/htdp-beginner)
-(load-relative "htdp-test.rktl")
-
-(require (lib "htdp-beginner.rkt" "lang"))
-
-(load-relative "beg-adv.rktl")
-(load-relative "beg-intml.rktl")
-(load-relative "beg-intm.rktl")
-(load-relative "beg-bega.rktl")
-
-(htdp-syntax-test #'quote "quote: expected an open parenthesis before quote, but found none")
-(htdp-syntax-test #''1 "quote: expected the name of a symbol or () after the quote, but found a number")
-(htdp-syntax-test #''"hello" "quote: expected the name of a symbol or () after the quote, but found a string")
-(htdp-syntax-test #''(1 2) "quote: expected the name of a symbol or () after the quote, but found a part")
-(htdp-syntax-test #'''a "quote: expected the name of a symbol or () after the quote, but found a part")
-
-(report-errs)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/htdp-test.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/htdp-test.rktl
deleted file mode 100644
index 4fe666d3dd..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/htdp-test.rktl
+++ /dev/null
@@ -1,191 +0,0 @@
-
-(require lang/private/rewrite-error-message)
-
-(define (strip-context v)
-  ;; Just to be sure, remove all top-level context from the syntax object
-  (cond
-   [(syntax? v)
-    (datum->syntax
-     #f
-     (strip-context (syntax-e v))
-     v
-     v)]
-   [(pair? v) (cons (strip-context (car v))
-                    (strip-context (cdr v)))]
-   [else v]))
-      
-(define body-accum null)
-(define-syntax (htdp-top stx)
-  (syntax-case stx (quote)
-    [(_ expr)
-     #'(set! body-accum (append body-accum (list (strip-context #'expr))))]))
-(define (htdp-top-pop w)
-  (set! body-accum (let loop ([body-accum body-accum])
-		     (if (null? (cdr body-accum))
-			 null
-			 (cons (car body-accum) (loop (cdr body-accum)))))))
-
-(define teachpack-accum null)
-(define-syntax (htdp-teachpack stx)
-  (syntax-case stx ()
-    [(_ lib) 
-     #'(set! teachpack-accum (cons (strip-context (quote-syntax lib)) teachpack-accum))]))
-(define (htdp-teachpack-pop)
-  (set!  teachpack-accum (cdr teachpack-accum)))
-
-(define previous-tp-accum #f)
-(define previous-tp-lang #f)
-(define (add-teachpacks lang)
-  (cond
-   [(null? teachpack-accum) lang]
-   [(equal? teachpack-accum previous-tp-accum)
-    `',previous-tp-lang]
-   [else
-    (let ([name (string->symbol (format "~a+tp~a" lang (gensym)))])
-      (eval #`(module #,name mzscheme
-                (define-syntax (bounce stx)
-                  #'(begin
-                      (require #,lang #,@(map (lambda (t)
-                                                #`(quote #,t))
-                                              teachpack-accum))
-                      (provide (all-from #,lang)
-                               #,@(map (lambda (tp)
-                                         #`(all-from (quote #,tp)))
-                                       teachpack-accum))))
-                (bounce)))
-      (set! previous-tp-accum teachpack-accum)
-      (set! previous-tp-lang name)
-      `',name)]))
-
-(define htdp-syntax-test
-  (case-lambda
-   [(stx) (htdp-syntax-test stx #rx".")]
-   [(stx rx)
-    (error-test #`(module m #,(add-teachpacks current-htdp-lang)
-		    #,@body-accum
-		    #,(strip-context stx))
-		(lambda (x)
-		  (and (exn:fail:syntax? x)
-                       (regexp-match (if (string? rx) (regexp-quote rx) rx) 
-                                     (get-rewriten-error-message x))
-                       (let ([locs ((exn:srclocs-accessor x) x)])
-                         (and (not (empty? locs))
-                              (andmap (lambda (s) (and (srcloc-source s)
-                                                       (regexp-match #rx"htdp-test[/\\]tests" (srcloc-source s))
-                                                       (srcloc-position s) (srcloc-span s))) 
-
-                                      locs))))))]))
-
-(require (only-in mzscheme 
-                  [let mz-let]
-                  [require mz-require]
-                  [quote mz-quote]))
-
-(define-syntax (htdp-test stx)
-  (syntax-case stx ()
-    [(_ expect f . args)
-     #'(begin
-	 (do-htdp-test #'(test expect f . args) #f #f)
-	 (htdp-try-direct-module f . args))]))
-
-(define-syntax (htdp-try-direct-module stx)
-  (syntax-case stx ()
-    [(_ 'nm expr)
-     ;; double-check that there's no error, at least,
-     ;;  when using the real module-begin:
-     #'(mz-let ([name (gensym)])
-               (eval
-                #`(module #,name #,(add-teachpacks current-htdp-lang)
-                    #,@body-accum
-                    #,(strip-context #'expr)))
-               (dynamic-require `',name #f))]
-    [_ 
-     (printf "~s\n" (syntax->datum stx))
-     #'(void)]))
-
-(define (htdp-string-to-pred exn?/rx)
-  (if (or (regexp? exn?/rx) (string? exn?/rx))
-      (lambda (x)
-	(if (regexp-match exn?/rx (get-rewriten-error-message x))
-            #t
-            (begin
-              (printf "written: ~s\n" (get-rewriten-error-message x))
-              #f)))
-      exn?/rx))
-
-(define-syntax (htdp-err/rt-test stx)
-  (syntax-case stx ()
-    [(_ expr)
-     #'(do-htdp-test #'expr #f exn:application:type?)]
-    [(_ expr exn?)
-     #'(do-htdp-test #'expr #f (htdp-string-to-pred exn?))]))
-
-(define (exn-type-and-msg type-pred msg)
-  (lambda (exn)
-    (and (type-pred exn)
-         (regexp-match (if (string? msg) (regexp-quote msg) msg) 
-                       (get-rewriten-error-message exn)))))
-
-
-(define (htdp-error-test stx)
-  (do-htdp-test stx #t #f))
-
-(module helper scheme/base
-  (require (for-syntax scheme/base))
-  (define-syntax (module-begin stx)
-    (syntax-case stx ()
-     [(_ the-test lang mb to-export (tp ...) . rest)
-      (with-syntax ([(tp ...)
-                     (map (lambda (tp)
-                            (datum->syntax
-                             tp
-                             (list #'quote tp)
-                             tp))
-                          (syntax->list #'(tp ...)))])
-        #`(#%module-begin
-           (require (only-in 'tester [test the-test]))
-           (require (except-in lang mb) tp ...)
-           #,@(if (syntax->datum (syntax to-export))
-                  (list (syntax (provide to-export)))
-                  '())
-           . rest))]))
-  (provide (rename-out [module-begin #%module-begin])))
-       
-(module tester mzscheme
-  (define test (namespace-variable-value 'test))
-  (provide test))
-
-(define (print-eval stx)
-  (printf "~s\n" (syntax->datum stx))
-  (eval stx))
-
-(define (do-htdp-test stx stx-err? exn?)
-  (let ([name (gensym 'm)])
-    ((if stx-err? syntax-test print-eval)
-     #`(module #,name 'helper
-	 test
-	 #,current-htdp-lang #%module-begin
-         #f
-         #,teachpack-accum
-	 #,@body-accum
-	 #,(strip-context stx)))
-    (unless stx-err?
-      (if exn?
-	  (err/rt-test (eval #`(mz-require '#,name)) exn?)
-	  (eval #`(mz-require '#,name))))))
-
-(define-syntax (htdp-eval stx)
-  (syntax-case stx ()
-    [(_ arg) (syntax (do-htdp-eval #'arg))]))
-
-(define (do-htdp-eval stx)
-  (let ([name (gensym 'm)])
-    (eval
-     #`(module #,name 'helper
-	 test
-	 #,current-htdp-lang #%module-begin
-         the-answer
-         #,teachpack-accum
-	 #,@body-accum
-	 (define the-answer #,(strip-context stx))))
-    (dynamic-require `',name 'the-answer)))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/info.rkt b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/info.rkt
deleted file mode 100644
index d2b54595f4..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '(("test-image.rkt" robby)))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate-lambda.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate-lambda.rktl
deleted file mode 100644
index 51c5341a79..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate-lambda.rktl
+++ /dev/null
@@ -1,47 +0,0 @@
-
-;; Basic checks for the intermediate language. See also
-;;  beginner.rktl
-
-(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
-
-;; Don't need these:
-(define no-extra-if-tests? #t)
-
-;; Check export names:
-;; based on new docs: 
-(require (submod lang/htdp-intermediate-lambda procedures))
-(for ((s (docs)))
-  (for ((rows (cdr s)))
-    (for ((r rows))
-      (define sy (syntax-e (car r)))
-      (define vv (dynamic-require 'lang/htdp-intermediate-lambda sy))
-      (when (procedure? vv) 
-	(test sy object-name vv)))))
-
-;; based on old docs: 
-#;
-(require syntax/docprovide)
-#;
-(let ([docs (lookup-documentation '(lib "htdp-intermediate-lambda.rkt" "lang") 'procedures)])
-  (for-each
-   (lambda (row)
-     (for-each
-      (lambda (doc)
-	(let ([v (dynamic-require '(lib "htdp-intermediate-lambda.rkt" "lang") (car doc))])
-	  (when (procedure? v)
-	    (test (car doc) object-name v))))
-      (cdr row)))
-   docs))
-
-(define current-htdp-lang 'lang/htdp-intermediate-lambda)
-(load-relative "htdp-test.rktl")
-
-(require (lib "htdp-intermediate-lambda.rkt" "lang"))
-
-(load-relative "beg-adv.rktl")
-(load-relative "beg-intml.rktl")
-(load-relative "bega-adv.rktl")
-(load-relative "intm-intml.rktl")
-(load-relative "intm-adv.rktl")
-
-(report-errs)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate.rktl
deleted file mode 100644
index d728f1e746..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intermediate.rktl
+++ /dev/null
@@ -1,50 +0,0 @@
-
-;; Basic checks for the intermediate language. See also
-;;  beginner.rktl
-
-(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
-
-;; Don't need these:
-(define no-extra-if-tests? #t)
-
-;; Check export names:
-;; based on new docs: 
-(require (submod lang/htdp-intermediate procedures))
-(for ((s (docs)))
-  (for ((rows (cdr s)))
-    (for ((r rows))
-      (define sy (syntax-e (car r)))
-      (define vv (dynamic-require 'lang/htdp-intermediate sy))
-      (when (procedure? vv) 
-	(test sy object-name vv)))))
-
-;; based on old docs: 
-#;
-(require syntax/docprovide)
-#;
-(let ([docs (lookup-documentation '(lib "htdp-intermediate.rkt" "lang") 'procedures)])
-  (for-each
-   (lambda (row)
-     (for-each
-      (lambda (doc)
-	(let ([v (dynamic-require '(lib "htdp-intermediate.rkt" "lang") (car doc))])
-	  (when (procedure? v)
-	    (test (car doc) object-name v))))
-      (cdr row)))
-   docs))
-
-(define current-htdp-lang 'lang/htdp-intermediate)
-(load-relative "htdp-test.rktl")
-
-(require (lib "htdp-intermediate.rkt" "lang"))
-
-(load-relative "beg-adv.rktl")
-(load-relative "beg-intml.rktl")
-(load-relative "beg-intm.rktl")
-(load-relative "bega-adv.rktl")
-(load-relative "intm-intml.rktl")
-(load-relative "intm-adv.rktl")
-
-(htdp-syntax-test #'(local [(lambda (x) x)] 1) "lambda: found a lambda that is not a function definition")
-
-(report-errs)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intm-adv.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intm-adv.rktl
deleted file mode 100644
index 011e1cc3de..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intm-adv.rktl
+++ /dev/null
@@ -1,137 +0,0 @@
-
-(htdp-err/rt-test (/) "/: expects at least 1 argument, but found none")
-(htdp-err/rt-test (pi) #px"function call: expected a function after the open parenthesis, but received 3[.]14\\d+$")
-(htdp-err/rt-test (pi 1 2) #px"function call: expected a function after the open parenthesis, but received 3[.]14\\d+$")
-
-(htdp-top (define (f x) x))
-(htdp-err/rt-test (f 1 2) "f: expects only 1 argument, but found 2")
-(htdp-top-pop 1)
-
-;; These are true for beginner, but the operators are syntax, so
-;; arity-test doesn't work.
-
-(htdp-syntax-test #'local "local: expected an open parenthesis before local, but found none")
-(htdp-syntax-test #'(local) "local: expected at least one definition (in square brackets) after local, but nothing's there")
-(htdp-syntax-test #'(local ()) "local: expected an expression after the local definitions, but nothing's there")
-(htdp-syntax-test #'(local 1) "local: expected at least one definition (in square brackets) after local, but found a number")
-(htdp-syntax-test #'(local 1 1) "local: expected at least one definition (in square brackets) after local, but found a number")
-(htdp-syntax-test #'(local () 1 2) "local: expected only one expression after the local definitions, but found 1 extra part")
-(htdp-syntax-test #'(local [1] 1 2) "local: expected a definition, but found a number")
-(htdp-syntax-test #'(local [(+ 1 2)] 1) "local: expected a definition, but found a part")
-(htdp-syntax-test #'(local [(define x)] 1) "define: expected an expression after the variable name x, but nothing's there")
-(htdp-syntax-test #'(local [(define x 1) (define x 2)] 1) "local: x was defined locally more than once")
-(htdp-syntax-test #'(local [(define (x a) 12) (+ 1 2)] 1) "local: expected a definition, but found a part")
-
-(htdp-err/rt-test (local [(define x y) (define y 5)] 10)
-                  (exn-type-and-msg exn:fail:contract:variable?
-                                    "local variable used before its definition: y"))
-
-(htdp-test 1 'local (local () 1))
-(htdp-test 5 'local (local [(define y 5) (define x y)] x))
-(htdp-test #t 'local (local [(define (even n) (if (zero? n) true (odd (sub1 n))))
-			(define (odd n) (if (zero? n) false (even (sub1 n))))]
-		       (even 100)))
-(htdp-test 19 (local [(define (f x) (+ x 10))] f) 9)
-(htdp-test 16 'local (local [(define (f x) (+ x 10))] (f 6)))
-
-(htdp-syntax-test #'letrec "letrec: expected an open parenthesis before letrec, but found none")
-(htdp-syntax-test #'(letrec) "letrec: expected at least one binding (in parentheses) after letrec, but nothing's there")
-(htdp-syntax-test #'(letrec ()) "letrec: expected an expression after the bindings, but nothing's there")
-(htdp-syntax-test #'(letrec 1 2) "letrec: expected at least one binding (in parentheses) after letrec, but found a number")
-(htdp-syntax-test #'(letrec 1 2 3) "letrec: expected at least one binding (in parentheses) after letrec, but found a number")
-(htdp-syntax-test #'(letrec (10) 1) "letrec: expected a binding with a variable and an expression, but found a number")
-(htdp-syntax-test #'(letrec ([x]) 1) "letrec: expected an expression after the name x, but nothing's there")
-(htdp-syntax-test #'(letrec ([x 2 3]) 1) "letrec: expected only one expression after the name x, but found 1 extra part")
-(htdp-syntax-test #'(letrec ([x 5] 10) 1) "letrec: expected a binding with a variable and an expression, but found a number")
-(htdp-syntax-test #'(letrec ([1 5]) 1) "letrec: expected a variable for the binding, but found a number")
-(htdp-syntax-test #'(letrec ([1 5 6]) 1) "letrec: expected a variable for the binding, but found a number")
-(htdp-syntax-test #'(letrec ([x 5]) 1 2) "letrec: expected only one expression after the bindings, but found 1 extra part")
-(htdp-syntax-test #'(letrec ([x 5][x 6]) 1) "letrec: x was defined locally more than once")
-
-(htdp-err/rt-test (letrec ([x y] [y 5]) 10)
-                  (exn-type-and-msg exn:fail:contract:variable?
-                                    "local variable used before its definition: y"))
-                  
-(htdp-test 1 'letrec (letrec () 1))
-(htdp-test 5 'letrec (letrec ([y 5][x y]) x))
-(htdp-test #t 'letrec (letrec ([even (lambda (n) (if (zero? n) true (odd (sub1 n))))]
-			  [odd (lambda (n) (if (zero? n) false (even (sub1 n))))])
-		   (even 100)))
-(htdp-test 19 (letrec ([f (lambda (x) (+ x 10))]) f) 9)
-(htdp-test 16 'letrec (letrec ([f (lambda (x) (+ x 10))]) (f 6)))
-
-(htdp-syntax-test #'let "let: expected an open parenthesis before let, but found none")
-(htdp-syntax-test #'(let) "let: expected at least one binding (in parentheses) after let, but nothing's there")
-(htdp-syntax-test #'(let ()) "let: expected an expression after the bindings, but nothing's there")
-(htdp-syntax-test #'(let 1 2) "let: expected at least one binding (in parentheses) after let, but found a number")
-(htdp-syntax-test #'(let 1 2 3) "let: expected at least one binding (in parentheses) after let, but found a number")
-(htdp-syntax-test #'(let (10) 1) "let: expected a binding with a variable and an expression, but found a number")
-(htdp-syntax-test #'(let ([x]) 1) "let: expected an expression after the name x, but nothing's there")
-(htdp-syntax-test #'(let ([x 2 3]) 1) "let: expected only one expression after the name x, but found 1 extra part" )
-(htdp-syntax-test #'(let ([x 5] 10) 1) "let: expected a binding with a variable and an expression, but found a number")
-(htdp-syntax-test #'(let ([1 5]) 1) "let: expected a variable for the binding, but found a number")
-(htdp-syntax-test #'(let ([1 5 6]) 1) "let: expected a variable for the binding, but found a number")
-(htdp-syntax-test #'(let ([x 5]) 1 2) "let: expected only one expression after the bindings, but found 1 extra part")
-(htdp-syntax-test #'(let ([x 5][x 6]) 1) "let: x was defined locally more than once")
-
-(htdp-test 1 'let (let () 1))
-(htdp-test 5 'let (let ([y 5]) (let ([x y]) x)))
-(htdp-test 6 'let (let ([y 6]) (let ([y 10][x y]) x)))
-(htdp-test 19 (let ([f (lambda (x) (+ x 10))]) f) 9)
-(htdp-test 16 'let (let ([f (lambda (x) (+ x 10))]) (f 6)))
-
-(htdp-syntax-test #'let* "let*: expected an open parenthesis before let*, but found none")
-(htdp-syntax-test #'(let*) "let*: expected at least one binding (in parentheses) after let*, but nothing's there")
-(htdp-syntax-test #'(let* ()) "let*: expected an expression after the bindings, but nothing's there")
-(htdp-syntax-test #'(let* 1 2) "let*: expected at least one binding (in parentheses) after let*, but found a number")
-(htdp-syntax-test #'(let* 1 2 3) "let*: expected at least one binding (in parentheses) after let*, but found a number")
-(htdp-syntax-test #'(let* (10) 1) "let*: expected a binding with a variable and an expression, but found a number")
-(htdp-syntax-test #'(let* ([x]) 1) "let*: expected an expression after the name x, but nothing's there")
-(htdp-syntax-test #'(let* ([x 2 3]) 1) "let*: expected only one expression after the name x, but found 1 extra part")
-(htdp-syntax-test #'(let* ([x 5] 10) 1) "let*: expected a binding with a variable and an expression, but found a number")
-(htdp-syntax-test #'(let* ([1 5]) 1) "let*: expected a variable for the binding, but found a number")
-(htdp-syntax-test #'(let* ([1 5 6]) 1) "let*: expected a variable for the binding, but found a number")
-(htdp-syntax-test #'(let* ([x 5]) 1 2) "let*: expected only one expression after the bindings, but found 1 extra part")
-
-(htdp-test 1 'let* (let* () 1))
-(htdp-test 6 'let* (let* ([x 5][x 6]) x))
-(htdp-test 9 'let* (let* ([x 8][x (add1 x)]) x))
-(htdp-test 5 'let* (let* ([y 5]) (let* ([x y]) x)))
-(htdp-test 10 'let* (let* ([y 6]) (let* ([y 10][x y]) x)))
-(htdp-test 19 (let* ([f (lambda (x) (+ x 10))]) f) 9)
-(htdp-test 16 'let* (let* ([f (lambda (x) (+ x 10))]) (f 6)))
-
-(htdp-test 7779 'time (time 7779))
-(htdp-syntax-test #'time "time: expected an open parenthesis before time, but found none")
-(htdp-syntax-test #'(time) "time: expected an expression after time, but nothing's there")
-(htdp-syntax-test #'(time 1 2) "time: expected only one expression after time, but found 1 extra part")
-(htdp-syntax-test #'(time (define x 5)) "define: found a definition that is not at the top level")
-
-(htdp-err/rt-test (foldr car 2 '(1 2 3))
-                  "foldr : first argument must be a function that expects two arguments, given")
-
-(htdp-err/rt-test (foldl car 2 '(1 2 3))
-  "foldl : first argument must be a function that expects two arguments, given #<procedure:car>")
-
-(htdp-err/rt-test (build-string 2 add1)
-  "build-string : the second argument must be a function that produces a character, given #<procedure:add1>, which produced 1 when given 0")
-
-(htdp-test 0 '+ (+))
-(htdp-test 1 '+ (+ 1))
-(htdp-test 1 '* (*))
-(htdp-test 1 '* (* 1))
-(htdp-err/rt-test (-) (exn-type-and-msg exn:application:arity? #rx"-: expects at least 1 argument, but found none"))
-(htdp-err/rt-test (/) (exn-type-and-msg exn:application:arity? #rx"/: expects at least 1 argument, but found none"))
-;(htdp-test 1 (/ 1) exn:application:arity?)
-
-;; Check that `local' works with macros that expand to `begin':
-(module my-multi-defn racket/base
-  (provide multi)
-  (define-syntax-rule (multi a b)
-    (begin
-      (define a 1)
-      (define b 2))))
-(htdp-teachpack my-multi-defn)
-
-(htdp-test '(2 1) 'local (local [(multi x y)]
-                           (list y x)))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intm-intml.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intm-intml.rktl
deleted file mode 100644
index 6995d3a9d9..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intm-intml.rktl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-(htdp-syntax-test #'(let name ([x 12]) 10) "let: expected at least one binding (in parentheses) after let, but found something else")
-
-(htdp-top (require "syntax.rkt"))
-
-(htdp-syntax-test #'(let-syntax ([#%app (lambda (stx) (raise-syntax-error #f "app fail" stx))])
-		    (local [(define (x a b) 1)]
-			   (x 1 2)))
-		  "app fail")
-
-(htdp-top-pop 1)
-
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intmlam-adv.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intmlam-adv.rktl
deleted file mode 100644
index 9e077c8fef..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/intmlam-adv.rktl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-(syntax-test #'(lambda (z z) 10))
-
-(define f7 (lambda (y) (lambda (z) z)))
-(test #t procedure? f7)
-(test 778 (lambda (x) 778) 'ignored)
-
-(test values (lambda (f) (f f)) values)
-
-(define (f11 y) ((lambda (x) x) y))
-(test 'id f11 'id)
-
-(err/rt-test (1 2 3))
-
-(htdp-syntax-test #'(recur empty-f () 10) "recur: expected a function name after recur, but nothing's there"
-(htdp-syntax-test #'(local [(lambda (x) x)] 1) "local: expected a definition, but found a part")
-
-(htdp-syntax-test #'((unquote-splicing (list 10))) "unquote-splicing: misuse of ,@ or unquote-splicing, not under a quasiquoting backquote")
-
-
-
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/pr/12117.rkt b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/pr/12117.rkt
deleted file mode 100644
index 9b85447248..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/pr/12117.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang htdp/asl
-
-(require racket/match)
-(define-struct a (b))
- (match (make-a 1) [(struct a (b)) b] [#f 3])
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/prim.rkt b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/prim.rkt
deleted file mode 100644
index 8f5cc33f1c..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/prim.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-
-(define (check-bad form)
-  (with-handlers ([exn:fail? (lambda (exn)
-                               (define msg (exn-message exn))
-                               (unless (regexp-match #rx"unbound identifier.*y$" msg)
-                                 (raise exn)))])
-    (expand form)
-    (error 'check-bad "failed: ~v" form)))
-
-(define (check-good form)
-  (expand form))
-
-(check-bad `(,#'module m racket/base (require lang/prim) (define-primitive x y)))
-(check-bad `(,#'module m racket/base (require lang/prim) (provide-primitive y)))
-(check-good `(,#'module m racket/base (require lang/prim) (provide-primitive y) (define (y z) z)))
-
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/syntax.rkt b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/syntax.rkt
deleted file mode 100644
index 01177341e9..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/syntax.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket
-
-(require (for-syntax racket/base))
-(provide (for-syntax (all-from-out racket/base)))
-(provide let-syntax)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/test-htdp.rkt b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/test-htdp.rkt
deleted file mode 100644
index 01420f1323..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/test-htdp.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/load
-
-(let ([ol (current-load)]) 
-  (current-load
-   (λ x
-     (printf "cl ~s\n" x)
-     (apply ol x))))
-
-(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
-
-(define testing-path (collection-file-path "testing.rktl" "tests/racket"))
-
-(load-in-sandbox "beginner.rktl" #:testing testing-path)
-(load-in-sandbox "beginner-abbr.rktl" #:testing testing-path)
-(load-in-sandbox "intermediate.rktl" #:testing testing-path)
-(load-in-sandbox "intermediate-lambda.rktl" #:testing testing-path)
-(load-in-sandbox "advanced.rktl" #:testing testing-path)
-
-(report-errs)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/test-image.rkt b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/test-image.rkt
deleted file mode 100644
index dbade55b7e..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/test-image.rkt
+++ /dev/null
@@ -1,1381 +0,0 @@
-#lang racket/load
-
-(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
-
-(require racket/draw
-         racket/snip
-         teachpack/htdp/image
-         htdp/error
-         lang/posn
-         mzlib/list
-         lang/imageeq)
-
-(define-values (image-snip1 image-snip2)
-  (let ()
-    (define size 2)
-    
-    (define (do-draw c-bm m-bm)
-      (let ([bdc (make-object bitmap-dc% c-bm)])
-        (send bdc clear)
-        (send bdc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-        (send bdc set-brush (send the-brush-list find-or-create-brush "red" 'solid))
-        (send bdc draw-rectangle 0 0 size size)
-        (send bdc set-bitmap m-bm)
-        (send bdc clear)
-        (send bdc set-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-        (send bdc set-brush (send the-brush-list find-or-create-brush "black" 'solid))
-        (send bdc draw-rectangle 0 0 (/ size 2) size)
-        (send bdc set-bitmap #f)))
-    
-    (define image-snip1 
-      (let* ([c-bm (make-object bitmap% size size)]
-             [m-bm (make-object bitmap% size size #t)])
-        (do-draw c-bm m-bm)
-        (make-object image-snip% c-bm m-bm)))
-    
-    (define image-snip2 
-      (let* ([c-bm (make-object bitmap% size size)]
-             [m-bm (make-object bitmap% size size)])
-        (do-draw c-bm m-bm)
-        (send c-bm set-loaded-mask m-bm)
-        (make-object image-snip% c-bm)))
-    
-    (values image-snip1 image-snip2)))
-
-(define image-snip3 (make-object image-snip%))
-
-;; check-on-bitmap : symbol snip -> void
-;; checks on various aspects of the bitmap snips to make
-;; sure that they draw properly
-(define (check-on-bitmap name snp)
-  (let-values ([(width height) (send snp get-size)])
-    (let ([bdc (make-object bitmap-dc%)]
-          [max-difference
-           (lambda (s1 s2)
-             (cond
-               [(and (zero? (bytes-length s1))
-                     (zero? (bytes-length s2)))
-                0]
-               [else
-                (apply max
-                       (map (lambda (x y) (abs (- x y))) 
-                            (bytes->list s1)
-                            (bytes->list s1)))]))])
-      
-      ;; test that no drawing is outside the snip's drawing claimed drawing area
-      (let* ([extra-space 100]
-             [bm-width (+ width extra-space)]
-             [bm-height (+ height extra-space)]
-             [bm-clip (make-object bitmap% bm-width bm-height)]
-             [bm-noclip (make-object bitmap% bm-width bm-height)]
-             [s-clip (make-bytes (* bm-width bm-height 4))]
-             [s-noclip (make-bytes (* bm-width bm-height 4))]
-             [s-trunc (make-bytes (* bm-width bm-height 4))])
-        (send bdc set-bitmap bm-clip)
-        (send bdc clear)
-        (send bdc set-clipping-rect (/ extra-space 2) (/ extra-space 2) width height) 
-        (send snp draw bdc
-              (/ extra-space 2) (/ extra-space 2) 
-              0 0
-              (+ width extra-space) (+ height extra-space)
-              0 0 #f)
-        (send bdc set-clipping-region #f)
-        (send bdc get-argb-pixels 0 0 (+ width extra-space) (+ height extra-space) s-clip)
-        
-        (send bdc set-bitmap bm-noclip)
-        (send bdc clear)
-        (send snp draw bdc
-              (/ extra-space 2) (/ extra-space 2)
-              0 0
-              (+ width extra-space) (+ height extra-space)
-              0 0 #f)
-        (send bdc get-argb-pixels 0 0 (+ width extra-space) (+ height extra-space) s-noclip)
-        (send bdc set-bitmap #f)
-        
-        (test (list 'bmclip name #t) (lambda () (list 'bmclip name (equal? s-clip s-noclip))))
-        
-        (send bdc set-bitmap bm-noclip)
-        (send bdc set-pen "black" 1 'transparent)
-        (send bdc set-brush "white" 'solid)
-        (send bdc draw-rectangle 0 0 (/ extra-space 2) bm-height)
-        (send bdc draw-rectangle (- bm-width (/ extra-space 2)) 0 (/ extra-space 2) bm-height)
-        (send bdc draw-rectangle 0 0 bm-width (/ extra-space 2))
-        (send bdc draw-rectangle 0 (- bm-height (/ extra-space 2)) bm-width (/ extra-space 2))
-        (send bdc get-argb-pixels 0 0 (+ width extra-space) (+ height extra-space) s-trunc)
-        
-        (test (list 'bmtrunc name #t) (lambda () (list 'bmtrunc name (equal? s-noclip s-trunc)))))
-        
-      (let ([bm-normal (make-object bitmap% (max 1 width) (max 1 height))]
-            [bm-bitmap (make-object bitmap% (max 1 width) (max 1 height))]
-            [s-normal (make-bytes (* (max 1 width) (max 1 height) 4))]
-            [s-bitmap (make-bytes (* (max 1 width) (max 1 height) 4))])
-        
-        (send bdc set-bitmap bm-normal)
-        (send bdc clear)
-        (send snp draw bdc 0 0 0 0 width height 0 0 #f)
-        (send bdc get-argb-pixels 0 0 width height s-normal)
-        (send bdc set-bitmap bm-bitmap)
-        (send bdc clear)
-        
-        ;; force the snip to switch over to bitmap mode
-        (send snp get-argb)
-        
-        (send snp draw bdc 0 0 0 0 width height 0 0 #f)
-        (send bdc get-argb-pixels 0 0 width height s-bitmap)
-        (send bdc set-bitmap #f)
-        (test (list 'bmsame name #t) 
-              (lambda () (list 'bmsame name 
-                               (<= (max-difference s-normal s-bitmap) 2))))))))
-
-(test #t 'image? (image? (rectangle 10 10 'solid 'blue)))
-(test #t 'image? (image? (rectangle 10 10 "solid" 'blue)))
-(test #t 'image? (image? (rectangle 10 10 'outline 'blue)))
-(test #t 'image? (image? (rectangle 10 10 "outline" 'blue)))
-(test #f 'image? (image? 5))
-
-(define red (make-color 255 0 0))
-(define blue (make-color 0 0 255))
-(define black (make-color 0 0 0))
-(define white (make-color 255 255 255))
-
-(define awhite (make-alpha-color 0 255 255 255))
-(define ablack (make-alpha-color 0 0 0 0))
-(define ared (make-alpha-color 0 255 0 0))
-(define aclr (make-alpha-color 255 0 0 0))
-
-(define (p00 i) (move-pinhole i (- (pinhole-x i)) (- (pinhole-y i))))
-(define (ignore x) 'ignore)
-
-(test 3 
-      'pinhole-x
-      (pinhole-x (rectangle 6 8 'solid 'black)))
-(test 4
-      'pinhole-y
-      (pinhole-y (rectangle 6 8 'solid 'black)))
-(test 1
-      'move-pinhole1
-      (pinhole-x (move-pinhole (rectangle 6 8 'solid 'black) -2 -2)))
-(test 2
-      'move-pinhole2
-      (pinhole-y (move-pinhole (rectangle 6 8 'solid 'black) -2 -2)))
-
-(test (list red)
-      'color-list
-      (image->color-list (rectangle 1 1 'solid 'red)))
-
-(test (list (list red) (list blue) (list black) (list white))
-      'colors-set-up-properly
-      (list (image->color-list (rectangle 1 1 'solid 'red))
-            (image->color-list (rectangle 1 1 'solid 'blue))
-            (image->color-list (rectangle 1 1 'solid 'black))
-            (image->color-list (rectangle 1 1 'solid 'white))))
-
-(test (list blue blue blue blue)
-      'color-list
-      (image->color-list (rectangle 2 2 'solid 'blue)))
-
-(test (list blue blue blue
-            blue blue blue
-            blue blue blue)
-      'color-list2
-      (image->color-list (rectangle 3 3 'solid 'blue)))
-(test (list blue blue blue
-            blue blue blue
-            blue blue blue)
-      'color-list2
-      (image->color-list (rectangle 3 3 "solid" 'blue)))
-
-(test #t
-      'color-list4
-      (image=? (color-list->image (list blue blue blue blue) 2 2 0 0)
-               (p00 (rectangle 2 2 'solid 'blue))))
-(test #f
-      'color-list5
-      (image=? (color-list->image (list blue blue blue blue) 2 2 0 0)
-               (rectangle 1 4 'solid 'blue)))
-(test #t
-      'color-list6
-      (image=? (color-list->image (list blue blue blue blue) 1 4 0 0)
-               (p00 (rectangle 1 4 'solid 'blue))))
-(test #t
-      'color-list7
-      (image=? (color-list->image (list 'blue 'blue 'blue 'blue) 2 2 0 0)
-               (p00 (rectangle 2 2 'solid 'blue))))
-
-(test 10
-      'color-list8
-      (image-width (color-list->image '() 10 0 0 0)))
-
-(test 0
-      'color-list9
-      (image-height (color-list->image '() 10 0 0 0)))
-
-(test 0
-      'color-list10
-      (image-width (color-list->image '() 0 10 0 0)))
-
-(test 10
-      'color-list11
-      (image-height (color-list->image '() 0 10 0 0)))
-
-(test 3
-      'color-list12
-      (pinhole-x (color-list->image '() 10 0 3 0)))
-
-(test 3
-      'color-list13
-      (pinhole-y (color-list->image '() 0 10 0 3)))
-
-
-
-(test #t
-      'alpha-color-list1
-      (equal? (make-alpha-color 0 255 0 0)
-              (car (image->alpha-color-list (rectangle 1 1 'solid 'red)))))
-(test #t
-      'alpha-color-list2
-      (equal? (make-alpha-color 0 255 0 0)
-              (car (image->alpha-color-list (rectangle 1 1 "solid" 'red)))))
-
-(test #t
-      'alpha-color-list3
-      (andmap (lambda (x) (equal? x (make-alpha-color 0 255 0 0)))
-              (image->alpha-color-list (rectangle 1 1 "solid" 'red))))
-(test #t
-      'alpha-color-list4
-      (andmap (lambda (x) (equal? x (make-alpha-color 0 255 0 0)))
-              (image->alpha-color-list (rectangle 1 1 'solid 'red))))
-
-(test #t
-      'alpha-color-list5
-      (equal? (make-alpha-color 0 0 255 0)
-              (car (image->alpha-color-list (rectangle 1 1 'solid 'green)))))
-(test #t
-      'alpha-color-list6
-      (equal? (make-alpha-color 0 0 0 255)
-              (car (image->alpha-color-list (rectangle 1 1 'solid 'blue)))))
-
-(test #t
-      'alpha-color-list7
-      (= (image-width
-          (alpha-color-list->image
-           (list ared aclr ared
-                 aclr aclr aclr)
-           3
-           2
-           0
-           0))
-         3))
-
-(test #t
-      'alpha-color-list8
-      (= (image-height
-          (alpha-color-list->image
-           (list ared aclr ared
-                 aclr aclr aclr)
-           3
-           2
-           0
-           0))
-         2))
-
-(test #t
-      'alpha-color-list9
-      (equal? (image->color-list
-               (alpha-color-list->image
-                (list ared aclr ared
-                      aclr aclr aclr)
-                3 2 0 0))
-              (list red   white red
-                    white white white)))
-(test #t
-      'alpha-color-list10
-      (equal? (image->color-list
-               (overlay
-                (p00 (rectangle 3 3 'solid 'blue))
-                (p00 (alpha-color-list->image
-                      (list ared aclr ared
-                            aclr aclr aclr
-                            ared aclr ared)
-                      3
-                      3
-                      0
-                      0))))
-              (list red  blue red
-                    blue blue blue
-                    red  blue red)))
-
-(test 10
-      'alpha-color-list11
-      (image-width (alpha-color-list->image '() 10 0 0 0)))
-
-(test 0
-      'alpha-color-list12
-      (image-height (alpha-color-list->image '() 10 0 0 0)))
-
-(test 0
-      'alpha-color-list13
-      (image-width (alpha-color-list->image '() 0 10 0 0)))
-
-(test 10
-      'alpha-color-list14
-      (image-height (alpha-color-list->image '() 0 10 0 0)))
-
-
-(test 3
-      'alpha-color-list15
-      (pinhole-x (alpha-color-list->image '() 10 0 3 0)))
-
-(test 3
-      'alpha-color-list16
-      (pinhole-y (alpha-color-list->image '() 0 10 0 3)))
-
-
-(test #t
-      'image=?1
-      (image=? (alpha-color-list->image (list (make-alpha-color 200 100 150 175)) 1 1 0 0)
-               (alpha-color-list->image (list (make-alpha-color 200 100 150 175)) 1 1 0 0)))
-
-;; different pinholes => different images
-(test #f
-      'image=?1b
-      (image=? (alpha-color-list->image (list (make-alpha-color 200 100 150 175)) 1 1 1 0)
-               (alpha-color-list->image (list (make-alpha-color 200 100 150 175)) 1 1 0 0)))
-
-(test #f
-      'image=?1c
-      (image=? (alpha-color-list->image (list (make-alpha-color 200 100 150 175)) 1 1 0 0)
-               (alpha-color-list->image (list (make-alpha-color 200 100 150 175)) 1 1 0 1)))
-
-(test #t
-      'image=?2
-      (image=? (alpha-color-list->image (list (make-alpha-color 255 100 100 100)) 1 1 0 0)
-               (alpha-color-list->image (list (make-alpha-color 255 200 200 200)) 1 1 0 0)))
-
-(test #f
-      'image=?3
-      (image=? (alpha-color-list->image (list (make-alpha-color 200 100 100 100)) 1 1 0 0)
-               (alpha-color-list->image (list (make-alpha-color 200 200 200 200)) 1 1 0 0)))
-
-(test #f
-      'image=?4
-      (image=? (alpha-color-list->image (list (make-alpha-color 200 100 150 175)
-                                              (make-alpha-color 200 100 150 175))
-                                        1
-                                        2
-                                        0
-                                        0)
-               (alpha-color-list->image (list (make-alpha-color 200 100 150 175)
-                                              (make-alpha-color 200 100 150 175)) 
-                                        2
-                                        1
-                                        0
-                                        0)))
-
-(test #f
-      'image=?5
-      (image=? (rectangle 4 4 'outline 'black) 
-               (overlay/xy 
-                (rectangle 4 4 'outline 'black)
-                -2
-                -2
-                (circle 2 'solid 'red))))
-
-(test #t
-      'overlay
-      (image=? (color-list->image (list blue red blue red) 2 2 0 0)
-               (overlay (p00 (rectangle 2 2 'solid 'red))
-                        (p00 (rectangle 1 2 'solid 'blue)))))
-
-(test #t
-      'overlay/multiple
-      (image=? (overlay (rectangle 6 6 'solid 'red)
-                        (overlay (rectangle 4 4 'solid 'white)
-                                 (rectangle 2 2 'solid 'blue)))
-               (overlay (rectangle 6 6 'solid 'red)
-                        (rectangle 4 4 'solid 'white)
-                        (rectangle 2 2 'solid 'blue))))
-
-(test #t
-      'overlay/empty-spaces-are-unmasked
-      (image=? (color-list->image (list red red red blue) 2 2 0 0)
-               (overlay
-                (p00 (rectangle 2 2 'solid 'blue))
-                (overlay (p00 (rectangle 1 2 'solid 'red))
-                         (p00 (rectangle 2 1 'solid 'red))))))
-
-(test #t
-      'overlay/xy1
-      (image=? (color-list->image (list red blue red blue) 2 2 0 0)
-               (overlay/xy (p00 (rectangle 2 2 'solid 'red))
-                           1 0
-                           (p00 (rectangle 1 2 'solid 'blue)))))
-
-(test #t
-      'overlay/xy2
-      (image=? (color-list->image (list red red red blue) 2 2 0 0)
-               (overlay/xy (p00 (rectangle 2 2 'solid 'red))
-                           1 1
-                           (p00 (rectangle 1 1 'solid 'blue)))))
-
-(test #t
-      'overlay/xy3
-      (image=? (color-list->image (list red red blue blue) 2 2 0 0)
-               (overlay/xy (p00 (rectangle 2 1 'solid 'red))
-                           0 1
-                           (p00 (rectangle 2 1 'solid 'blue)))))
-
-(test #t
-      'overlay/xy4
-      (image=? (color-list->image (list blue blue red red) 2 2 0 0)
-               (p00 (overlay/xy (p00 (rectangle 2 1 'solid 'red))
-                                0 -1
-                                (p00 (rectangle 2 1 'solid 'blue))))))
-
-(test #t
-      'overlay/xy/white
-      (image=? (alpha-color-list->image (list ablack ablack ablack
-                                              ablack awhite ablack
-                                              ablack ablack ablack)
-                                        3 3 0 0)
-               (overlay/xy (p00 (rectangle 3 3 'solid 'black))
-                           1 1
-                           (p00 (rectangle 1 1 'solid 'white)))))
-
-(test #t
-      'color-list->image/white-in-mask
-      (image=? (color-list->image (list black red   black
-                                        red   red   red
-                                        black red   black)
-                                  3 3 0 0)
-               (overlay (p00 (rectangle 3 3 'solid 'red))
-                        (color-list->image (list black white black
-                                                 white white white
-                                                 black white black)
-                                           3 3 0 0))))
-
-
-(test #t
-      'overlay
-      (image=? (color-list->image (list red blue red red blue red) 3 2 0 0)
-               (overlay/xy (p00 (rectangle 3 2 'solid 'red))
-                           1 0
-                           (p00 (rectangle 1 2 'solid 'blue)))))
-
-(test #t
-      'image=?-zero1
-      (image=? (rectangle 0 10 'solid 'red)
-               (rectangle 0 10 'solid 'red)))
-(test #t
-      'image=?-zero2
-      (image=? (rectangle 0 10 'solid 'red)
-               (rectangle 0 10 'solid 'blue)))
-(test #f
-      'image=?-zero3
-      (image=? (rectangle 0 5 'solid 'red)
-               (rectangle 0 4'solid 'blue)))
-
-(test #t
-      'image-inside?1
-      (image-inside? (overlay/xy (p00 (rectangle 3 2 'solid 'red))
-                                 1 0
-                                 (p00 (rectangle 1 2 'solid 'blue)))
-                     (rectangle 1 2 'solid 'blue)))
-
-(test #f
-      'image-inside?2
-      (image-inside? (overlay/xy (p00 (rectangle 3 2 'solid 'red))
-                                 1 0
-                                 (p00 (rectangle 1 2 'solid 'blue)))
-                     (rectangle 1 2 'solid 'black)))
-
-(test #t
-      'image-inside?3
-      (image-inside? (overlay/xy (p00 (rectangle 3 2 'solid 'red))
-                                 1 0
-                                 (p00 (rectangle 1 2 'solid 'blue)))
-                     (rectangle 1 2 'solid 'red)))
-
-(test #f
-      'image-inside?4
-      (image-inside? (overlay/xy (p00 (rectangle 3 2 'solid 'red))
-                                 1 0
-                                 (p00 (rectangle 1 2 'solid 'blue)))
-                     (rectangle 2 1 'solid 'red)))
-
-(test #t
-      'image-inside?5
-      (image-inside? (alpha-color-list->image (list (make-alpha-color 0 255 0 0)) 1 1 0 0)
-                     (alpha-color-list->image (list (make-alpha-color 255 0 0 0)) 1 1 0 0)))
-
-(test #f
-      'image-inside?6
-      (image-inside? (overlay/xy (p00 (rectangle 3 2 'solid 'red))
-                                 1 0
-                                 (p00 (rectangle 1 2 'solid 'blue)))
-                     (color-list->image (list blue white white) 
-                                        3 1 0 0)))
-
-(test #t
-      'image-inside?7
-      (image-inside? (overlay/xy (p00 (rectangle 16 16 'solid 'red))
-                                 2 5
-                                 (p00 (ellipse 6 6 'outline 'blue)))
-                     (ellipse 6 6 'outline 'blue)))
-
-(test #t
-      'image-inside?8
-      (image-inside?
-       (overlay (p00 (rectangle (image-width (text "x" 12 'red))
-                                (image-height (text "x" 12 'red))
-                                'solid 
-                                'white))
-                (text "x" 12 'red))
-       (text "x" 12 'red)))
-
-(test #t
-      'image-inside?9
-      (image-inside?
-       (text "y x y" 12 'red)
-       (text "x" 12 'red)))
-
-(test (make-posn 2 5)
-      'find-image1
-      (find-image (overlay/xy (p00 (rectangle 16 16 'solid 'red))
-                              2 5
-                              (p00 (ellipse 6 6 'outline 'blue)))
-                  (p00 (ellipse 6 6 'outline 'blue))))
-
-(test (make-posn 0 0)
-      'find-image2
-      (find-image (p00 (rectangle 16 16 'solid 'blue))
-                  (p00 (ellipse 6 6 'outline 'blue))))
-
-(test (make-posn 1 1)
-      'find-image3
-      (find-image (overlay/xy (rectangle 10 10 'solid 'blue)
-                              1
-                              1
-                              (ellipse 5 5 'solid 'red))
-                  (ellipse 5 5 'solid 'red)))
-
-(test 5
-      'image-width
-      (image-width (rectangle 5 7 'solid 'red)))
-
-(test 7
-      'image-height
-      (image-height (rectangle 5 7 'solid 'red)))
-
-(test 1 'color-red (color-red (make-color 1 2 3)))
-(test 2 'color-green (color-green (make-color 1 2 3)))
-(test 3 'color-blue (color-blue (make-color 1 2 3)))
-(test #t 'color?1 (color? (make-color 1 2 3)))
-(test #f 'color?2 (color? 10))
-(test #t 'image-color?1 (image-color? (make-color 1 2 3)))
-(test #t 'image-color?2 (image-color? "blue"))
-(test #t 'image-color?3 (image-color? 'blue))
-(test #f 'image-color?4 (image-color? 10))
-(test #f 'image-color?5 (image-color? "not-a-color"))
-(test #f 'image-color?6 (image-color? 'not-a-color))
-
-(test #t
-      'line 
-      (image=? (line 4 0 'red)
-               (color-list->image (list red red red red red) 5 1 0 0)))
-
-(test #t
-      'line 
-      (image=? (line 0 4 'red)
-               (color-list->image (list red red red red red) 1 5 0 0)))
-
-(test #t
-      'line 
-      (image=? (line 0 -4 'red)
-               (color-list->image (list red red red red red) 1 5 0 4)))
-
-(test #t
-      'line 
-      (image=? (line -4 0 'red)
-               (color-list->image (list red red red red red) 5 1 4 0)))
-
-;; note: the next test may be platform-specific... I'm not sure.
-;; I developed it under macos x. -robby
-
-(test #t
-      'triangle2
-      (image=? (p00 (triangle 3 'solid 'red))
-               (color-list->image 
-                (list white red   white
-                      white red   white
-                      red   red   red
-                      red   red   red)
-                3
-                4
-                0
-                0)))
-
-;; make sure star is relatively white
-(test #t
-      'star1
-      (>= 100
-          (length (filter (λ (x) (equal? (make-color 255 0 0) x))
-                          (image->color-list (star 4 5 10 'outline 'red))))))
-
-;; make solid star is relatively colored
-(test #t
-      'star2
-      (<= 100
-          (length (filter (λ (x) (equal? (make-color 255 0 0) x))
-                          (image->color-list (star 4 5 10 'solid 'red))))))
-
-;; make sure star is relatively white
-(test #t
-      'regular-polygon1
-      (>= 100
-          (length (filter (λ (x) (equal? (make-color 255 0 0) x))
-                          (image->color-list (regular-polygon 4 10 'outline 'red))))))
-
-;; make solid star is relatively colored
-(test #t
-      'regular-polygon2
-      (<= 100
-          (length (filter (λ (x) (equal? (make-color 255 0 0) x))
-                          (image->color-list (regular-polygon 4 10 'solid 'red))))))
-
-(test #t
-      'add-line1
-      (image=? (overlay (p00 (rectangle 5 4 'solid 'black))
-                        (p00 (rectangle 1 4 'solid 'red)))
-               (p00 (add-line (p00 (rectangle 4 4 'solid 'black))
-                              -1 0
-                              -1 3
-                              'red))))
-
-(test #t
-      'add-line2
-      (image=? (overlay (p00 (rectangle 4 5 'solid 'black))
-                        (p00 (rectangle 4 1 'solid 'red)))
-               (p00 (add-line (p00 (rectangle 4 4 'solid 'black))
-                              0 -1
-                              3 -1
-                              'red))))
-
-(test 7
-      'add-line3
-      (image-width (add-line (rectangle 7 7 'solid 'black)
-                             -3 0
-                             2 0
-                             'red)))
-
-(test #t
-      'add-line4
-      (image=? (overlay (rectangle 6 6 'solid 'blue)
-                        (rectangle 6 1 'solid 'red))
-               (add-line (rectangle 6 6 'solid 'blue)
-                         -3 0
-                         2 0
-                         'red)))
-
-(test 26
-      'add-line-w1
-      (image-width
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 -20 -20
-                 0 0
-                 'red)))
-(test 26
-      'add-line-w2
-      (image-width
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 -20 20
-                 0 0
-                 'red)))
-(test 26
-      'add-line-w3
-      (image-width
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 20 -20
-                 0 0
-                 'red)))
-(test 26
-      'add-line-w4
-      (image-width
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 20 20
-                 0 0
-                 'red)))
-
-(test 26
-      'add-line-w5
-      (image-width
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 0 0
-                 -20 -20
-                 'red)))
-(test 26
-      'add-line-w6
-      (image-width
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 0 0
-                 -20 20
-                 'red)))
-(test 26
-      'add-line-w7
-      (image-width
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 0 0
-                 20 -20
-                 'red)))
-(test 26
-      'add-line-w8
-      (image-width
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 0 0
-                 20 20
-                 'red)))
-
-(test 26
-      'add-line-h1
-      (image-height
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 -20 -20
-                 0 0
-                 'red)))
-(test 26
-      'add-line-h2
-      (image-height
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 -20 20
-                 0 0
-                 'red)))
-(test 26
-      'add-line-h3
-      (image-height
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 20 -20
-                 0 0
-                 'red)))
-(test 26
-      'add-line-h4
-      (image-height
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 20 20
-                 0 0
-                 'red)))
-
-(test 26
-      'add-line-h5
-      (image-height
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 0 0
-                 -20 -20
-                 'red)))
-(test 26
-      'add-line-h6
-      (image-height
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 0 0
-                 -20 20
-                 'red)))
-(test 26
-      'add-line-h7
-      (image-height
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 0 0
-                 20 -20
-                 'red)))
-(test 26
-      'add-line-h8
-      (image-height
-       (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                 0 0
-                 20 20
-                 'red)))
-
-(test 5
-      image-width
-      (add-line (line 0 0 'red) 3.141597 3 0 0 'black))
-
-(test 'ignore
-      (lambda (x) 'ignore)
-      ;; Make sure that inexact coordinate doesn't create inexact
-      ;;  width:
-      (send (add-line (line 0 0 'red) 3.141597 3 0 0 'black) get-argb))
-
-(test (list 3 4)
-      'ph-ellipse
-      (list (pinhole-x (ellipse 6 8 'solid 'red))
-            (pinhole-y (ellipse 6 8 'solid 'red))))
-(test (list 3 3)
-      'ph-circle
-      (list (pinhole-x (circle 3 'solid 'red))
-            (pinhole-y (circle 3 'solid 'red))))
-(test (list 0 0)
-      'ph-line
-      (list (pinhole-x (line 10 10 'red))
-            (pinhole-y (line 10 10 'red))))
-(test (list 0 0)
-      'ph-text
-      (list (pinhole-x (text "10" 10 'red))
-            (pinhole-y (text "10" 10 'red))))
-(test (list 0 0)
-      'ph-text
-      (list (pinhole-x (text "" 10 'red))
-            (pinhole-y (text "" 10 'red))))
-
-(test (list 3 3)
-      'ph-add-line
-      (list (pinhole-x (add-line (rectangle 6 6 'solid 'red)
-                                 0 0
-                                 3 3
-                                 'black))
-            (pinhole-y (add-line (rectangle 6 6 'solid 'red)
-                                 0 0
-                                 3 3
-                                 'black))))
-(test (list 3 4)
-      'ph-overlay1
-      (list (pinhole-x (overlay (rectangle 6 8 'solid 'red) (rectangle 2 4 'solid 'red)))
-            (pinhole-y (overlay (rectangle 6 8 'solid 'red) (rectangle 2 4 'solid 'red)))))
-(test (list 0 0)
-      'ph-overlay2
-      (list (pinhole-x (overlay (move-pinhole (rectangle 6 8 'solid 'red) -3 -4)
-                                (move-pinhole (rectangle 2 4 'solid 'red) -1 -2)))
-            (pinhole-y (overlay (move-pinhole (rectangle 6 8 'solid 'red) -3 -4)
-                                (move-pinhole (rectangle 2 4 'solid 'red) -1 -2)))))
-(test (list 5 5)
-      'ph-overlay/xy1
-      (list (pinhole-x (overlay/xy (move-pinhole (rectangle 6 8 'solid 'red) -3 -4)
-                                   -5 -5
-                                   (move-pinhole (rectangle 2 4 'solid 'red) -1 -2)))
-            (pinhole-y (overlay/xy (move-pinhole (rectangle 6 8 'solid 'red) -3 -4)
-                                   -5 -5
-                                   (move-pinhole (rectangle 2 4 'solid 'red) -1 -2)))))
-
-
-(test (image->color-list
-       (overlay
-        (rectangle 11 11 'solid 'green)
-        (shrink (rectangle 11 11 'solid 'red)
-                1 1 1 1)))
-      'shrinking-twice-shrinks-both-times
-      (image->color-list
-       (overlay
-        (rectangle 11 11 'solid 'green)
-        (shrink (shrink (rectangle 11 11 'solid 'red)
-                        5 5 5 5)
-                1 1 1 1))))
-
-(check-on-bitmap 'solid-rect (rectangle 2 2 'solid 'red))
-(check-on-bitmap 'outline-rect (rectangle 2 2 'outline 'red))
-(check-on-bitmap 'solid-ellipse (ellipse 2 4 'solid 'red))
-(check-on-bitmap 'outline-ellipse (ellipse 2 4 'outline 'red))
-(check-on-bitmap 'solid-circle (circle 4 'solid 'red))
-(check-on-bitmap 'outline-circle (circle 4 'outline 'red))
-
-(check-on-bitmap '0solid-rect1 (rectangle 0 2 'solid 'red))
-(check-on-bitmap '0solid-rect2 (rectangle 2 0 'solid 'red))
-(check-on-bitmap '0outline-rect1 (rectangle 2 0 'outline 'red))
-(check-on-bitmap '0outline-rect2 (rectangle 0 0 'outline 'red))
-(check-on-bitmap '0solid-ellipse1 (ellipse 0 3 'solid 'red))
-(check-on-bitmap '0solid-ellipse2 (ellipse 3 0 'solid 'red))
-(check-on-bitmap '0outline-ellipse1 (ellipse 0 4 'outline 'red))
-(check-on-bitmap '0outline-ellipse2 (ellipse 2 0 'outline 'red))
-(check-on-bitmap '0solid-circle (circle 0 'solid 'red))
-(check-on-bitmap '0outline-circle (circle 0 'outline 'red))
-
-(check-on-bitmap 'solid-triangle (triangle 10 'solid 'red))
-(check-on-bitmap 'outline-triangle (triangle 10 'outline 'red))
-(check-on-bitmap 'solid-star (star 4 10 20 'solid 'red))
-(check-on-bitmap 'solid-star/reverse-args (star 4 20 10 'solid 'red))
-(check-on-bitmap 'outline-star (star 4 10 20 'outline 'red))
-(check-on-bitmap 'regular-polygon (regular-polygon 4 10 'outline 'red))
-(check-on-bitmap 'line (line 10 7 'red))
-; (check-on-bitmap 'text (text "XX" 12 'red)) ;; this test fails for reasons I can't control  -robby
-(check-on-bitmap 'overlay1 (overlay (p00 (rectangle 1 4 'solid 'blue))
-                                   (p00 (rectangle 4 1 'solid 'green))))
-(check-on-bitmap 'overlay2 (overlay/xy (p00 (rectangle 4 4 'solid 'blue))
-                                      2 2
-                                      (p00 (rectangle 4 4 'solid 'green))))
-(check-on-bitmap 'overlay3 (overlay image-snip1
-                                    (rectangle (image-width image-snip1) 
-                                               (image-height image-snip1)
-                                               'outline
-                                               'red)))
-(check-on-bitmap 'alpha-color-list
-                 (overlay
-                  (p00 (rectangle 3 3 'solid 'blue))
-                  (alpha-color-list->image
-                   (list ared aclr ared
-                         aclr aclr aclr
-                         ared aclr ared)
-                   3
-                   3
-                   0
-                   0)))
-(check-on-bitmap 'add-line
-                 (add-line
-                  (p00 (rectangle 100 100 'solid 'black))
-                  -10 -10
-                  110 110
-                  'red))
-
-(check-on-bitmap 'add-line1
-                 (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                           -20 -20
-                           0 0
-                           'red))
-(check-on-bitmap 'add-line2
-                 (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                           -20 20
-                           0 0
-                           'red))
-(check-on-bitmap 'add-line3
-                 (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                           20 -20
-                           0 0
-                           'red))
-(check-on-bitmap 'add-line4
-                 (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                           20 20
-                           0 0
-                           'red)) 
-(check-on-bitmap 'add-line5
-                 (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                           0 0
-                           -20 -20
-                           'red))
-(check-on-bitmap 'add-line6
-                 (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                           0 0
-                           -20 20
-                           'red))
-(check-on-bitmap 'add-line7
-                 (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                           0 0
-                           20 -20
-                           'red))
-(check-on-bitmap 'add-line8
-                 (add-line (overlay (rectangle 11 11 'solid 'black) (rectangle 3 3 'solid 'green))
-                           0 0
-                           20 20
-                           'red))
-
-(check-on-bitmap 'shrink
-                 (shrink (shrink (rectangle 11 11 'solid 'red)
-                                 5 5 5 5)
-                         1 1 1 1))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  test images with zero width or zero height 
-;;  for various things
-;;
-
-
-(test 10 image-width (rectangle 10 0 'solid 'red))
-(test 0 image-height (rectangle 10 0 'solid 'red))
-(test 0 image-width (rectangle 0 10 'solid 'red))
-(test 10 image-height (rectangle 0 10 'solid 'red))
-
-(test 0 image-width (text "" 12 'black))
-(test #t 'not-zero-empty-string-height (not (zero? (image-height (text "" 12 'black)))))
-
-(test '() image->color-list (rectangle 0 10 'solid 'red))
-(test '() image->color-list (rectangle 10 0 'solid 'red))
-(test '() image->color-list (rectangle 0 0 'solid 'red))
-
-(test '() image->alpha-color-list (rectangle 0 10 'solid 'red))
-(test '() image->alpha-color-list (rectangle 10 0 'solid 'red))
-(test '() image->alpha-color-list (rectangle 0 0 'solid 'red))
-
-(test 0 image-width (overlay (circle 0 'solid 'red) (circle 0 'solid 'red)))
-(test 0 image-height (overlay (circle 0 'solid 'red) (circle 0 'solid 'red)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  test that the image construction functions
-;;  accept non-integer values (and floor them)
-;;
-
-(test (image->color-list (rectangle 1 1 'solid 'blue))
-      'shrink-tl-accepting-non-integers
-      (image->color-list (shrink-tl (rectangle 10 10 'solid 'blue) 1.5 #e1.5)))
-
-(test (image->color-list (rectangle 1 1 'solid 'blue))
-      'shrink-tr-accepting-non-integers
-      (image->color-list (shrink-tr (rectangle 10 10 'solid 'blue) 1.5 #e1.5)))
-
-(test (image->color-list (rectangle 1 1 'solid 'blue))
-      'shrink-bl-accepting-non-integers
-      (image->color-list (shrink-bl (rectangle 10 10 'solid 'blue) 1.5 #e1.5)))
-
-(test (image->color-list (rectangle 1 1 'solid 'blue))
-      'shrink-br-accepting-non-integers
-      (image->color-list (shrink-br (rectangle 10 10 'solid 'blue) 1.5 #e1.5)))
-      
-(test (image->color-list (rectangle 2 2 'solid 'blue))
-      'rectangle-accepting-non-integers
-      (image->color-list (rectangle #e2.5 2.5 'solid 'blue)))
-
-(test (image->color-list (ellipse 2 2 'solid 'blue))
-      'ellipse-accepting-non-integers
-      (image->color-list (ellipse #e2.5 2.5 'solid 'blue)))
-
-(test (image->color-list (circle 2 'solid 'blue))
-      'circle-accepting-non-integers
-      (image->color-list (circle #e2.5 'solid 'blue)))
-
-(test (image->color-list (star 10 20 30 'solid 'blue))
-      'star-accepting-non-integers
-      (image->color-list (star 10 20.5 #e30.2 'solid 'blue)))
-
-(test (image->color-list (triangle 12 'solid 'blue))
-      'triangle-accepting-non-integers
-      (image->color-list (triangle 12.5 'solid 'blue)))
-
-(test (image->color-list (line 10 12 'blue))
-      'line-accepting-non-integer
-      (image->color-list (line 10.5 #e12.5 'blue)))
-
-(test (image->color-list (shrink (rectangle 10 10 'solid 'blue) 4 4 4 4))
-      'shrink-accepting-non-integers
-      (image->color-list
-       (shrink (rectangle 10 10 'solid 'blue)
-               4.1
-               4.2
-               #e4.3
-               4.4)))
-
-(test (image->color-list (add-line (rectangle 10 10 'solid 'blue)
-                                   0 0 2 2 'red))
-      'add-line-accepting-non-integers
-      (image->color-list (add-line (rectangle 10 10 'solid 'blue)
-                                   0.1 #e.2 2.1 2.2 'red)))
-
-(test #t
-      'flooring/rounding-is-consistent
-      (image=? (overlay (rectangle 10 10 'solid 'black)
-                        (move-pinhole
-                         (rectangle 5 5 'solid 'red)
-                         (- (+ 5 1/10))
-                         (- (+ 5 1/10))))
-               (overlay/xy (rectangle 10 10 'solid 'black)
-                           (+ 5 1/10)
-                           (+ 5 1/10)
-                           (rectangle 5 5 'solid 'red))))
-      
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; The tests beginning with "bs-" ensure
-;; that the operations all can accept bitmap 
-;; snips as arguments
-;;
-
-(test #t
-      'bs-image?
-      (image? image-snip1))
-(test #t
-      'bs-image?
-      (image? image-snip2))
-(test #t
-      'bs-image=?
-      (image=? image-snip1 (send image-snip1 copy)))
-(test #f
-      'bs-image=?
-      ;; They have different masks:
-      (image=? image-snip1 image-snip2))
-(test 2
-      'bs-image-width
-      (image-width image-snip1))
-(test 2
-      'bs-image-width
-      (image-width image-snip2))
-(test 2
-      'bs-image-height
-      (image-height image-snip1))
-(test 2
-      'bs-image-height
-      (image-height image-snip2))
-(test #t
-      'bs-overlay
-      (image=? image-snip1 (overlay image-snip1 image-snip2)))
-(test #t
-      'bs-overlay/xy
-      (image=? image-snip1 (overlay/xy image-snip1 0 0 image-snip2)))
-(test #t
-      'bs-add-line
-      (image=?
-       (add-line image-snip1 0 0 10 10 'green)
-       (add-line image-snip2 0 0 10 10 'green)))
-(test #t
-      'bs-image-inside?1
-      (image-inside? image-snip1 image-snip2))
-(test #t
-      'bs-image-inside?2
-      (image-inside? image-snip1 image-snip2))
-(test (make-posn 0 0)
-      'bs-find-image1
-      (find-image image-snip1 image-snip2))
-(test (make-posn 0 0)
-      'bs-find-image2
-      (find-image image-snip2 image-snip1))
-(test #t
-      'bs-image->color-list
-      (equal? (image->color-list image-snip1)
-              (image->color-list image-snip2)))
-(test #t
-      'bs-image->alpha-color-list
-      (equal? (image->alpha-color-list image-snip1)
-              (image->alpha-color-list image-snip2)))
-(test 1
-      'bs-pinhole-x
-      (pinhole-x image-snip1))
-(test 1
-      'bs-pinhole-y
-      (pinhole-y image-snip2))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; test image-snip that doesnt' have a bitmap
-;;
-
-(test 20
-      'image-snip-no-bitmap1
-      (image-width image-snip3))
-
-(test 'passed
-      'image-snip-no-bitmap2
-      (begin (overlay/xy image-snip3 10 10 image-snip3) 'passed))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; test color arguments
-;;
-
-(test 'ignore
-      'clr-rectangle-sym
-      (ignore (rectangle 10 10 'solid 'blue)))
-(test 'ignore
-      'clr-rectangle-str
-      (ignore (rectangle 10 10 'solid "blue")))
-(test 'ignore
-      'clr-rectangle-clr
-      (ignore (rectangle 10 10 'solid (make-color 0 0 255))))
-
-(test 'ignore
-      'clr-ellipse-sym
-      (ignore (ellipse 10 10 'solid 'blue)))
-(test 'ignore
-      'clr-ellipse-str
-      (ignore (ellipse 10 10 'solid "blue")))
-(test 'ignore
-      'clr-ellipse-clr
-      (ignore (ellipse 10 10 'solid (make-color 0 0 255))))
-
-(test 'ignore
-      'clr-circle-sym
-      (ignore (circle 10 'solid 'blue)))
-(test 'ignore
-      'clr-circle-str
-      (ignore (circle 10 'solid "blue")))
-(test 'ignore
-      'clr-circle-clr
-      (ignore (circle 10 'solid (make-color 0 0 255))))
-
-(test 'ignore
-      'clr-triangle-sym
-      (ignore (triangle 10 'solid 'blue)))
-(test 'ignore
-      'clr-triangle-str
-      (ignore (triangle 10 'solid "blue")))
-(test 'ignore
-      'clr-triangle-clr
-      (ignore (triangle 10 'solid (make-color 0 0 255))))
-
-(test 'ignore
-      'clr-line-sym
-      (ignore (line 10 10 'blue)))
-(test 'ignore
-      'clr-line-str
-      (ignore (line 10 10 "blue")))
-(test 'ignore
-      'clr-line-clr
-      (ignore (line 10 10 (make-color 0 0 255))))
-
-(test 'ignore
-      'clr-add-line-sym
-      (ignore (add-line (rectangle 1 1 'solid 'blue) 0 0 1 1 'blue)))
-(test 'ignore
-      'clr-add-line-str
-      (ignore (add-line (rectangle 1 1 'solid 'blue) 0 0 1 1 "blue")))
-(test 'ignore
-      'clr-add-line-clr
-      (ignore (add-line (rectangle 1 1 'solid 'blue) 0 0 1 1 (make-color 0 0 255))))
-
-(test 'ignore
-      'clr-text-sym
-      (ignore (text "abc" 12 'blue)))
-(test 'ignore
-      'clr-text-str
-      (ignore (text "abc" 12 "blue")))
-(test 'ignore
-      'clr-text-clr
-      (ignore (text "abc" 12 (make-color 0 0 255))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  test scene-based functions
-;;
-
-(test #t
-      'nw:rectangle1
-      (image=? (put-pinhole (rectangle 10 10 'solid 'black) 0 0)
-               (nw:rectangle 10 10 'solid 'black)))
-
-(test #t
-      'empty-scene1
-      (image=? (put-pinhole 
-                (overlay (rectangle 10 10 'solid 'white)
-                         (rectangle 10 10 'outline 'black))
-                0 0)
-               (empty-scene 10 10)))
-
-(test #t
-      'place-image1
-      (image=?
-       (overlay/xy (nw:rectangle 50 50 'solid 'orange)
-                   10 12
-                   (rectangle 10 10 'solid 'purple))
-       (place-image (rectangle 10 10 'solid 'purple)
-                    10 12
-                    (nw:rectangle 50 50 'solid 'orange))))
-
-(define (tp-exn/num re)
-  (lambda (exn)
-    (and (exn:fail? exn)
-         (regexp-match re (exn-message exn)))))
-
-;; tests that the expression
-;;  a) raises a teachpack exception record,
-;;  b) has the right argument position, and
-;;  c) has the right name.
-(define-syntax (err/rt-name-test stx)
-  (syntax-case stx ()
-    [(_ (name . args) position)
-     (identifier? (syntax name))
-     (syntax 
-      (err/rt-test (name . args)                   
-                   (lambda (exn)
-                     (and (exn:fail? exn)
-                          (let* ([msg (exn-message exn)]
-                                 [beg (format "~a:" 'name)]
-                                 [len (string-length beg)])
-                            (and (regexp-match position msg)
-                                 ((string-length msg) . > . len)
-                                 (string=? (substring msg 0 len) beg)))))))]))
-
-(err/rt-name-test (image-width 1) "first")
-(err/rt-name-test (image-height 1) "first")
-(err/rt-name-test (overlay 1 2) "first")
-(err/rt-name-test (overlay image-snip1 2) "second")
-(err/rt-name-test (overlay image-snip1 image-snip2 3) "3")
-(err/rt-name-test (overlay/xy #f #f #f #f) "first")
-(err/rt-name-test (overlay/xy image-snip1 #f #f #f) "second")
-(err/rt-name-test (overlay/xy image-snip1 1 #f #f) "third")
-(err/rt-name-test (overlay/xy image-snip1 1 1 #f) "fourth")
-(err/rt-name-test (place-image #f #f #f #f) "first")
-(err/rt-name-test (place-image image-snip1 #f #f #f) "second")
-(err/rt-name-test (place-image image-snip1 1 #f #f) "third")
-(err/rt-name-test (place-image image-snip1 1 1 #f) "fourth")
-(err/rt-name-test (pinhole-x 1) "first")
-(err/rt-name-test (pinhole-y 1) "first")
-(err/rt-name-test (move-pinhole #f #f #f) "first")
-(err/rt-name-test (move-pinhole image-snip1 #f #f) "second")
-(err/rt-name-test (move-pinhole image-snip1 0 #f) "third")
-(err/rt-name-test (rectangle #f #f #f #f) "first")
-(err/rt-name-test (rectangle 10 #f #f #f) "second")
-(err/rt-name-test (rectangle 10 10 #f #f) "third")
-(err/rt-name-test (rectangle 10 10 'solid #f) "fourth")
-(err/rt-name-test (nw:rectangle #f #f #f #f) "first")
-(err/rt-name-test (nw:rectangle 10 #f #f #f) "second")
-(err/rt-name-test (nw:rectangle 10 10 #f #f) "third")
-(err/rt-name-test (nw:rectangle 10 10 'solid #f) "fourth")
-(err/rt-name-test (empty-scene #f #f) "first")
-(err/rt-name-test (empty-scene 10 #f) "second")
-(err/rt-name-test (circle #f #f #f) "first")
-(err/rt-name-test (circle 10 #f #f) "second")
-(err/rt-name-test (circle 10 'solid #f) "third")
-(err/rt-name-test (ellipse #f #f #f #f) "first")
-(err/rt-name-test (ellipse 10 #f #f #f) "second")
-(err/rt-name-test (ellipse 10 10 #f #f) "third")
-(err/rt-name-test (ellipse 10 10 'solid #f) "fourth")
-(err/rt-name-test (triangle #f #f #f) "first")
-(err/rt-name-test (triangle 10 #f #f) "second")
-(err/rt-name-test (triangle 10 'solid #f) "third")
-(err/rt-name-test (line #f #f #f) "first")
-(err/rt-name-test (line 10 #f #f) "second")
-(err/rt-name-test (line 10 10 #f) "third")
-(err/rt-name-test (add-line #f #f #f #f #f #f) "first")
-(err/rt-name-test (add-line image-snip1 #f #f #f #f #f) "second")
-(err/rt-name-test (add-line image-snip1 10 #f #f #f #f) "third")
-(err/rt-name-test (add-line image-snip1 10 10 #f #f #f) "fourth")
-(err/rt-name-test (add-line image-snip1 10 10 11 #f #f) "fifth")
-(err/rt-name-test (add-line image-snip1 10 10 11 11 #f) "sixth")
-(err/rt-name-test (scene+line #f #f #f #f #f #f) "first")
-(err/rt-name-test (scene+line (nw:rectangle 10 10 'solid 'blue) #f #f #f #f #f) "second")
-(err/rt-name-test (scene+line (nw:rectangle 10 10 'solid 'blue) 10 #f #f #f #f) "third")
-(err/rt-name-test (scene+line (nw:rectangle 10 10 'solid 'blue) 10 10 #f #f #f) "fourth")
-(err/rt-name-test (scene+line (nw:rectangle 10 10 'solid 'blue) 10 10 11 #f #f) "fifth")
-(err/rt-name-test (scene+line (nw:rectangle 10 10 'solid 'blue) 10 10 11 11 #f) "sixth")
-(err/rt-name-test (text #f #f #f) "first")
-(err/rt-name-test (text "abc" #f #f) "second")
-(err/rt-name-test (text "abc" 10 #f) "third")
-(err/rt-name-test (image-inside? #f #f) "first")
-(err/rt-name-test (image-inside? image-snip1 #f) "second")
-(err/rt-name-test (find-image #f #f) "first")
-(err/rt-name-test (find-image image-snip1 #f) "second")
-(err/rt-name-test (image->color-list 1) "first")
-(err/rt-name-test (color-list->image #f #f #f #f #f) "first")
-(err/rt-name-test (color-list->image (list (make-color 0 0 0)) #f #f #f #f) "second")
-(err/rt-name-test (color-list->image (list (make-color 0 0 0)) 1 #f #f #f) "third")
-(err/rt-name-test (color-list->image (list (make-color 0 0 0)) 1 1 #f #f) "fourth")
-(err/rt-name-test (color-list->image (list (make-color 0 0 0)) 1 1 0 #f) "fifth")
-(err/rt-name-test (image->alpha-color-list #f) "first")
-(err/rt-name-test (alpha-color-list->image #f #f #f #f #f) "first")
-(err/rt-name-test (alpha-color-list->image (list (make-alpha-color 0 0 0 0)) #f #f #f #f) "second")
-(err/rt-name-test (alpha-color-list->image (list (make-alpha-color 0 0 0 0)) 1 #f #f #f) "third")
-(err/rt-name-test (alpha-color-list->image (list (make-alpha-color 0 0 0 0)) 1 1 #f #f) "fourth")
-(err/rt-name-test (alpha-color-list->image (list (make-alpha-color 0 0 0 0)) 1 1 0 #f) "fifth")
-
-(err/rt-name-test (overlay/xy #f
-                              'wrong
-                              10
-                              (circle 50 'outline 'blue))
-                  "first")
-(err/rt-name-test (overlay/xy (rectangle 100 200 'outline 'red)
-                              'wrong
-                              10
-                              (circle 50 'outline 'blue))
-                  "second")
-(err/rt-name-test (overlay/xy (rectangle 100 200 'outline 'red)
-                              10
-                              'wrong
-                              (circle 50 'outline 'blue))
-                  "third")
-(err/rt-name-test (overlay/xy (rectangle 100 200 'outline 'red) 10 10 #f) "fourth")
-(err/rt-name-test (overlay/xy (rectangle 100 200 'outline 'red) 10 +inf.0 #f) "third")
-(err/rt-name-test (overlay/xy (rectangle 100 200 'outline 'red) -inf.0 +inf.0 #f) "second")
-
-(parameterize ((current-namespace (make-base-namespace)))
-  (err/rt-test
-    (eval '(module m lang/htdp-beginner
-             (require (lib "image.rkt" "teachpack/htdp"))
-             overlay))
-    (lambda (exn)
-      (regexp-match #rx"no open parenthesis" 
-	(exn-message exn)))))
-
-(report-errs)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/already-defined.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/already-defined.rktl
deleted file mode 100644
index 15b1c038c9..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/already-defined.rktl
+++ /dev/null
@@ -1,2 +0,0 @@
-(define first 3)
-3
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/annotation.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/annotation.rkt
deleted file mode 100644
index 187ebdfec2..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/annotation.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket/base
-
-(require stepper/private/annotate
-         "test-engine.rkt"
-         "language-level-model.rkt"
-         rackunit)
-
-;; this is a pathetic "set" of tests, but I just spent time debugging
-;; a problem that would have been caught by this test, so I'm adding
-;; it anyway. More generally, it might be nice to take every test in
-;; the through-tests suite and make sure that it can be annotated without
-;; failure before trying to run it.
-
-(define (try-annotating str)
-  (define expanded 
-    (car (string->expanded-syntax-list intermediate str)))
-  ;(printf "expanded: ~s\n" expanded)
-  (annotate expanded (lambda (a b c) 'bogus) #f))
-
-
-(check-not-exn (lambda () (try-annotating "(check-expect 2 2)")))
\ No newline at end of file
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/automatic-tests.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/automatic-tests.rkt
deleted file mode 100644
index dc7a7a750a..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/automatic-tests.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scheme
-
-
-;; run shared.rkt unit tests:
-(require "shared-unit-tests.rkt")
-
-;; now, the rest:
-(require "through-tests.rkt" 
-         "test-engine.rkt")
-
-(define lazy-tests 
-  '(lazy1 lazy2 lazy3 lazy-multi lazy-app1 lazy-app2 lazy-app3 
-    lazy-cons1 lazy-cons2 lazy-list1 lazy-list2 lazy-list3 lazy-list4 lazy-list5
-    lazy-caar lazy-cadr lazy-cdar lazy-cddr lazy-caaar lazy-caadr lazy-cadar
-    lazy-caddr lazy-cdaar lazy-cdadr lazy-cddar lazy-cdddr lazy-caaaar 
-    lazy-caaadr lazy-caadar lazy-caaddr lazy-cadaar lazy-cadadr lazy-caddar
-    lazy-cadddr lazy-cdaaar lazy-cdaadr lazy-cdadar lazy-cdaddr lazy-cddaar
-    lazy-cddadr lazy-cdddar lazy-cddddr lazy-second lazy-third lazy-fourth
-    lazy-fifth lazy-sixth lazy-seventh lazy-eighth
-    lazy-if1 lazy-if2 lazy-take-0 lazy-take lazy-take-impl
-    lazy-unknown1 lazy-unknown2 lazy-inf-list1 lazy-cond1 lazy-cond2 lazy-cond3
-    lazy-eq? lazy-eqv? lazy-equal? lazy-list?1 lazy-list?2 lazy-list?3
-    lazy-length lazy-list-ref lazy-list-tail lazy-append lazy-reverse lazy-empty? 
-    lazy-assoc lazy-assq lazy-assv lazy-cons? lazy-remove lazy-remq lazy-remv
-    lazy-member lazy-memq lazy-memv lazy-filter1 lazy-filter2 lazy-fold
-    lazy-cyclic1 lazy-fn-app))
-
-(let ((outer-namespace (current-namespace)))
-  (parameterize ([display-only-errors #t]
-                 ;; display-only-errors is insufficient, because the evals
-                 ;; actually cause output.  So we just eat stdout.
-                 [current-output-port (open-output-string)]
-		 [current-namespace (make-base-namespace)])
-    ;; make sure the tests' print-convert sees the teaching languages' properties
-    #;(namespace-attach-module outer-namespace 'mzlib/pconvert-prop (current-namespace))
-    (namespace-require 'test-engine/racket-tests)
-    (if (and (run-all-tests-except 
-              (append '(bad-and check-error begin-let-bug prims qq-splice time 
-                                set! local-set! local-struct/i local-struct/ilam)
-                      lazy-tests))
-             (run-tests lazy-tests))
-	(exit 0)
-	(exit 1))))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/bad-letrec-test.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/bad-letrec-test.rktl
deleted file mode 100644
index 96d1842ec1..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/bad-letrec-test.rktl
+++ /dev/null
@@ -1 +0,0 @@
-(letrec ([a a]) 3)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/big-bang-test.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/big-bang-test.rkt
deleted file mode 100644
index e4797a5970..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/big-bang-test.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-reader.ss" "lang")((modname big-bang-test) (read-case-sensitive #t) (teachpacks ((lib "universe.ss" "teachpack" "2htdp") (lib "image.ss" "teachpack" "2htdp"))) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ((lib "universe.ss" "teachpack" "2htdp") (lib "image.ss" "teachpack" "2htdp")))))
-(define (draw-world x) (rectangle 100 (round (* x 0.1)) "solid" "red"))
-
-(draw-world 500)
-
-(big-bang 0 
-          [on-tick add1]
-          [to-draw draw-world 500 500])
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/constructor-redexes.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/constructor-redexes.rktl
deleted file mode 100644
index 4c95b71786..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/constructor-redexes.rktl
+++ /dev/null
@@ -1,17 +0,0 @@
-(cons 3 (cons 1 empty))
-
-(cons 1 2)
-
-(list 1 2 3)
-
-(define-struct a (b))
-
-(make-a 3)
-
-(make-a 4 3 5)
-
-(make-b 32)
-
-(make-b 3 4 5)
-
-(define-struct b (c d e))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/find-tag-test.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/find-tag-test.rkt
deleted file mode 100644
index 0a826a04b5..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/find-tag-test.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-(require stepper/private/find-tag
-         racket/gui/base
-         rackunit
-         racket/class)
-
-(define (mk-txt str)
-  (define t (new text%))
-  (send t insert str)
-  t)
-
-(define (find-tag/end str)
-  (find-tag (mk-txt str) (string-length str)))
-
-(check-equal? (find-tag/end "<a>") "a")
-(check-equal? (find-tag/end "<abcdef>") "abcdef")
-(check-equal? (find-tag/end "<abcdef x=\"3\">") "abcdef")
-(check-equal? (find-tag/end "<abcdef >") "abcdef")
-(check-equal? (find-tag/end "<a><b>") "b")
-(check-equal? (find-tag/end "<a x=\"z\"><b>") "b")
-
-(check-equal? (find-tag/end "<a></a>") #f)
-
-(check-equal? (find-tag/end "<!-- whatever -->") #f)
-(check-equal? (find-tag/end "<!--whatever -->") #f)
-(check-equal? (find-tag/end "<!--whatever-->") #f)
-(check-equal? (find-tag/end "<!-->") #f)
-
-(check-equal? (find-tag/end "<>") #f)
-
-;; would be nice to make these two tests work, but 
-;; it isn't clear what the right predicate is when
-;; searching backwards to get thse right but
-;; not also get this one wrong:
-;;   "<a x="z"><b>
-; (check-equal? (find-tag/end "<a y=\"<b>") #f)
-; (check-equal? (find-tag/end "<a y=\"<b><c>") #f)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/global-prim-reduction.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/global-prim-reduction.rktl
deleted file mode 100644
index 27731641fc..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/global-prim-reduction.rktl
+++ /dev/null
@@ -1,13 +0,0 @@
-#t
-
-true
-
-#f
-
-false
-
-null
-
-empty
-
-pi
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/image-test.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/image-test.rktl
deleted file mode 100644
index a460006417..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/image-test.rktl
+++ /dev/null
@@ -1,3457 +0,0 @@
-WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket, or DrScheme version 4 or later
-   to read it.
-
-            http://racket-lang.org/
-|#
- 46 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wxmedia\0"
-3 1 8 #"wximage\0"
-2 0 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 18 #"java-comment-box%\0"
-1 0 23 #"java-interactions-box%\0"
-1 0 15 #"make-line-snip\0"
-1 0 15 #"make-line-snip\0"
-1 0 13 #"example-box%\0"
-2 0 18 #"interactions-box%\0"
-2 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 34 #"drscheme:vertical-separator-snip%\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 10 #"text-box%\0"
-1 0 1 6 #"wxloc\0"
-00000000000 1 87 0 1 #"\0"
-0 75 1 #"\0"
-0 11 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 11 #" Monospace\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 27
-#"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 40
-#"framework:syntax-coloring:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 41
-#"framework:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-41 #"framework:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 40
-#"framework:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 42
-#"framework:syntax-coloring:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 45
-#"framework:syntax-coloring:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 39
-#"framework:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 39
-#"framework:syntax-coloring:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 14
-#"Html Standard\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-49 #"drscheme:check-syntax:lexically-bound-identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 42
-#"drscheme:check-syntax:imported-identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 39
-#"profj:syntax-coloring:scheme:prim-type\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 40
-#"profj:syntax-coloring:scheme:identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 36
-#"profj:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:literal\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-35 #"profj:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:default\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 39
-#"profj:syntax-coloring:scheme:uncovered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:covered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 4
-#"XML\0"
-0 70 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 0 1
-#"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 1
-#"\0"
-0 75 7 #"Monaco\0"
-0 10 90 -1 90 -1 2 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 -1 -1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 -1 -1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 -1 -1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 -1 -1 2 1
-#"\0"
-0 75 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 -1 -1 0 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 -1 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 90 90 90 3 3 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 1 0 1
-#"\0"
-0 75 7 #"Monaco\0"
-0 12 90 90 90 90 3 3 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 92 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 92 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 40 25 15 0 0 0 1 1 2 30
-#"drscheme:check-syntax:keyword\0"
-0 70 1 #"\0"
-1 0 92 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 40 25 15 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1 2 39
-#"drscheme:check-syntax:unbound-variable\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 36 36 140 0 0 0 1 1 2 37
-#"drscheme:check-syntax:bound-variable\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 36 36 140 0 0 0 1 1 2 32
-#"drscheme:check-syntax:primitive\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 36 36 140 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 51 135 39 0 0 0 1 1 2 31
-#"drscheme:check-syntax:constant\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 51 135 39 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 1 1 2 27
-#"drscheme:check-syntax:base\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 2 1 #"\0"
-0 71 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 1 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 90 90 90 90 3 3 1 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 1 1 2 15
-#"mzprizm:syntax\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 18
-#"mzprizm:primitive\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 17
-#"mzprizm:constant\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 1 1 2 23
-#"mzprizm:bound variable\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 1 1 2 25
-#"mzprizm:unbound variable\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 92 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 94 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 1 1 0 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 1 4 1 #"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 4 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 -1 -1
-00000000002 0 00000000000 3 00000000000 156 0 16 3 1 #"("
-0 0 9 3 6 #"define"
-0 0 4 3 1 #" "
-0 0 16 3 1 #"("
-0 0 8 3 11 #"maybe-image"
-0 0 4 3 1 #" "
-0 0 8 3 1 #"n"
-0 0 8 3 1 #"u"
-0 0 8 3 1 #"m"
-0 0 8 3 1 #"-"
-0 0 8 3 1 #"l"
-0 0 8 3 1 #"i"
-0 0 8 3 1 #"s"
-0 0 8 3 1 #"t"
-0 0 16 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 2 #"  "
-0 0 16 3 1 #"("
-0 0 8 3 1 #"i"
-0 0 8 3 1 #"f"
-0 0 4 3 1 #" "
-0 0 16 3 1 #"("
-0 0 8 3 1 #"e"
-0 0 8 3 1 #"m"
-0 0 8 3 1 #"p"
-0 0 8 3 1 #"t"
-0 0 8 3 1 #"y"
-0 0 8 3 1 #"?"
-0 0 4 3 1 #" "
-0 0 8 3 1 #"n"
-0 0 8 3 1 #"u"
-0 0 8 3 1 #"m"
-0 0 8 3 1 #"-"
-0 0 8 3 1 #"l"
-0 0 8 3 1 #"i"
-0 0 8 3 1 #"s"
-0 0 8 3 1 #"t"
-0 0 16 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 6 #"      "
-0 0 8 3 1 #"e"
-0 0 8 3 1 #"m"
-0 0 8 3 1 #"p"
-0 0 8 3 1 #"t"
-0 0 8 3 1 #"y"
-0 0 4 29 1 #"\n"
-0 0 4 3 6 #"      "
-0 0 16 3 1 #"("
-0 0 8 3 2 #"if"
-0 0 4 3 1 #" "
-0 0 16 3 1 #"("
-0 0 8 3 1 #"="
-0 0 4 3 1 #" "
-0 0 16 3 1 #"("
-0 0 8 3 6 #"modulo"
-0 0 4 3 1 #" "
-0 0 16 3 1 #"("
-0 0 8 3 3 #"car"
-0 0 4 3 1 #" "
-0 0 8 3 8 #"num-list"
-0 0 16 3 1 #")"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"2"
-0 0 16 3 1 #")"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"0"
-0 0 16 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 10 #"          "
-0 0 16 3 1 #"("
-0 0 8 3 1 #"c"
-0 0 8 3 1 #"o"
-0 0 8 3 1 #"n"
-0 0 8 3 1 #"s"
-0 0 4 3 1 #" "
-0 3 00000000251 4 1 #"\0"
-2 -1 -1 0 0 0 00000000120 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\0\326\0\0\0\305\b\2\0"
- #"\0\0\247\303\233L\0\0 \0IDATx\234d\274i\217$I\222%\366\336\23U3w"
- #"\217\310\243\216\336\236\236s\a\273\334\v 8\340\237\340\337\342"
- #"/$\301%@`\2073;\263;\273\335\325U\305\252<#\334\315T\344\361\203"
- #"\232G&9\216@f \322#\335\314TTD\336!\312\377\371\177\371_+oO\37"
- #"\177n\334\306\355\303\365\323\273\26\274=?\335\236n\0`\377\351o"
- #"\377\305\237\376\331\237\270\366?\376\360_\177\374\351\17?\377\370"
- #"O\255\313\336\37\37\36|\273z\37\337\275z\263_oEd\34666&^\5"
- #"\276;\351\273\245=\210\360\36dD#\242\204*\214\202\355\252\2@\322"
- #"68H6B\322\374'\233\2228_\6\200\246@U\325\20(\230dS\364\246\263@"
- #"\24\tI\321\334Z\243\201*\333\35\2Kix\b\354\341\210\0\4@"
- #"\254FE\243\300\371\211m\351\0211?N\202\310\246j\255\1\0 1\"B"
- #"\363{\221lM\222\0021\177\22\21RK{\247\325\242\265\36\352\21\21"
- #"\321\325\226\326\26I\244\0241o\331\266zk\313Zv_\37\332\322s`\257"
- #"\224\32{\223\244\306\37142\23\305\252\2\324\333\242\245\365\365"
- #"\34}\31\340\3562\242\202F[N\17\353\345\365\362\360\306}M\265j"
- #"\213O=\333\351v~\330b}\237\343s\302\313\251\270Tf \200r\326\216\254"
- #"\362\200\341f\e\320\310+\0X\0L\220\4D\222\256\210\350\301\326"
- #"\232X$\201\2km\241@PAQ\210\2\225\1j.\e\222$\"m'\234\205B"
- #"\eYU\250\302\310\34\243\332\353\313\371\372T^\326\265\257X"
- #"\342\tu\333>\241\306\266\177\202\275_\257\277\317O\37?\376\321"
- #"\373\366\364\374q\273>\367%\354$YU"
-) 500
-(
- #"\203\4\365\224\271W\321\256\0326\32\321\2\215`\3316\5\0\351"
- #"\"Xi\233H\20\363\336\0\24`\333\0\f\330>\302\216\222$\20\200a"
- #"\222\231I\e@\220\0\4\212\26\n\321D\316pU##P\6\344\2524\b"
- #"\2016D0e\e\304\374\\$\1\23\240\rC{\332D#\r\320U\366\0"
- #"\242\356\267a\332pH\22\354\220\252`\333*\0002lFf\1\351\4P\20CsQ"
- #"\315\4\266\336W\240\252\30\21\210\31\217\262Sj\224\253F\31UIR"
- #"\354\222\"$i>\322//z\306\245\235\240$\200\2028\322U\225\231\231"
- #"\311\346\271\267a\b\220MYI\273\306\30V\270\252\f\332U\265;\253"
- #"0`;i\314\355\17\240P\2301\b\317\34\20\242]\200\n\325T\232"
- #"\e\21\252\2\0\5\r\22\236?\26)&\0r\276K\0T\245 DIU\266"
- #"\35\311\336\252=.\215\233\264\236\3\373n\346>>\276\377\360\371"
- #"\323\257c\377,\344\250\353\363\363\307\334\177\311\353f\243\267\20"
- #"\274\347\356\320\363\276ef\220\37\266\335#\355\354\306\22\270D<,"
- #"\\\244\240g\254\0t\321\250\2\253\362x\230\24\0\esy\347\345"
- #"\3\262gv4P@\330\206\323\6\313 E\220G\270\2\1\313\4\324"
- #"\330\30q,,i\313\349c'XB+\232.\337\323\252\21U\4\2350fR\2522X"
- #"\1\221Y\16C\2064\367\205%\a\t\270\\\335Q\205B\222\324\334"
- #"\0256\200b\1(\203\231\5\321P\3535\222\334\r\354\330\1P\321{"
- #"Wo\0F%*\265\210\231\2643]\0\221\201\"E\232/\1G\222\240E\211"
- #"\4X\303\0050$K\36363s\337w\356{\213\305j4\220\5$\372\b\367&"
- #"\310\256\3343Y3\303eU\325\216\254D\3220P\307R\314\307\341{\354\317d"
- #"1/\246\rED\17k&t\241\212\nT\241\t\1"
-) 500
-(
- #"\213T\220\20a\0\204\1\322\r\200\220\264\323\352t\262@\6l\261"
- #"\5\3665JK<\177\374\370\356\227\237>\374\362\377|\374\370\363~\373"
- #"@\336\254\1_\245.-\211\315.{\205G\26\24\332G\245i\305m\277\251"
- #"\334\r\6\36z{\275\364W\252\223\253\301\2\214\271L\266]"
- #"\230wul\24\337\357\362\353}>\1776\263?Pv\301\16\20D\210\1\3"
- #"\5\e$PE\3324\301Y\v\233H\302\234\267\212,{$\"\2050\22\220"
- #"\21\234i4\203s[\3ut\5\b[\b\203\202\323\264\201\244"
- #"\222$\20\2410\0p\257\244\213$\211\346\371\257\363I\23\200,\272"
- #"\300\2Y#\0310QU\36\203\244[KV\243\343^\221s\277\1\210"
- #"\336\216\273\274\227\351\373\276\250Y\202I\202\244\\\204\\v\302"
- #"\206\2N$\234H%\306\340\330\220]\325\234;\255,G\366\32cQ,\304"
- #"\265\fW\1U\205r\301U(\330E\34[\21B\30\316\257\252\23@\0c"
- #"\f\262R\210\210\21\230EYB5E\242\2n4\f1\b\300\305\271\372&A"
- #"\31\0M\200p\341(\0360\344\252\266=}\30\333\365\371\351\323/?\375"
- #"\360\323\217\377t{z\227\365\221\2766\355\230\e\27C`\325^\205"
- #"\254=i\22\21\3411|\354?7\241\3\257Z\274]\372\233\336\317\30"
- #"\221\206\r1}o\370\300\31l\244\311\243\4\2233\341\315\354\24d"
- #"\0E2f\35\256\")q\206c\0\342|0\236\315Yk\355\345\233\326\32["
- #"\314\16\241\nf\26\2303\231Ai\243@r9*\261mP\320\21\322\224d\250"
- #"L\e\204e\263J*\26H\200`\272\35\267P\2630\315(\224f:7eX!\333t"
- #"f\331\216Y\340J\22Z\27\233*=\224\0304\324BR\372X\351\210\240(\t"
- #"\254\362\b,\263\201\31\225\364,p0\341\32P\207\v\240G*\212"
-) 500
-(
- #"T\4M\30\231\271sl\275u\2\246\230\3\267\36\212\276.\347\36"
- #"\333\346g8\n\263\332\316\fG@\2M\210(\204\302vT\314\2478S0\200"
- #"\252\301{R\250\2\311\"\1E\331\322,\353E\27\2104\351\340|\217"
- #"e\240\370\345\343\212\256\302\221h(\253U=??}\370\345\347\377\376"
- #"\353\317\177x\376\3703\362\251\267a\337\220\331\272\330\262\305\2"
- #"\205[2\313\241\34iI\26\213\221\245\32\r8\31\257\32\3364"
- #"\275mzdi\224\nE\354\6\22\200\217}\300\231\3g\b\232\304,"
- #"\215\363\342L\26\2166\221\244@\223\263)\227\304\371,\352\370\37Z"
- #"\323\262\264\210\350:\342/\"\30\1\300&\220i\16\247\2152`#\v"
- #"3\0240\2\244 \220\236}\242A2\4\321\366\321\223\332\200\253J\302"
- #"\227\2344$\211\262\244\34\305\231\314I#m(\217\36\226\2707\264\0m;"
- #"\253\20\225\n\1agYe\206C 5\357Q\241\240fm\327l0|$E\2020E\313E"
- #"\204\322\2164P\b\21h\21D\f\305\314\376t\2716\272\30-\20\36"
- #"W\334\270.\255\242_\2333\275\301v\231!\3\254\0H\6\0\bE\310"
- #".\16\37qb\3\246m-\355\245\202\5s.\"\371\222D<{\252\371\304"
- #"\213b#\3000\213\220\217Z\307/\325N3\225TU;\237\227\17\357\257\37?"
- #"\374\264m\357\226\366\4\\{\363\310\261\rL\210\203\344\200\312"
- #"LI\250Qh\322\30\3\231\202\273q&\36\e\336v|\323\371\n\265&"
- #"\312Iq02S\240\3108\272\260<\220\324}O\210\260\217\266\375\210\320"
- #"\227\355\302\31(\220\330Dz\302QV\225\330z\3573\354\202\2200\327"
- #"\36\234\371\376\350\2m\273h\0\256\254\234\261\304\242\t\331"
- #"\242\t\a9\257\246\315\262XEC\250\211\224\1\314T\240\243\22"
- #"\342\350n);_\212\324\361\301\367"
-) 500
-(
- #"\356\215\270cy\315m\177G\365\0Q\264d\304DZ\266=\313b\21e\n0\202"
- #"\20\355\243\31\2110\31\241N\322\22E\223.Op\0201?.\"\"I#\253"
- #"\6\223\24\210\n\256\336\367\244bl\247\276^Zd\325|R\226\0"
- #"\264;\306\27\bH\306^\5\270\231U\264UUi\336\323%4\eF\206"
- #"\244\20%\3650\211\320\\\205\371\345b\5fN\341\4F3xq\20 .\303"
- #"p\232e7*\267\375\371\363\323;\3275b\317\375\231\16\27\36\317\v"
- #"\324\257\267\274\355\304\250=\231,\272\f\232\341\221\204\e\260H"
- #"\227\216\307\306G\361,\234`\345\240\351\26\244\v\320\21jsI\216"
- #"\364K\362\250\302\240\341\302\201\266\4P\n\251)\216\314\27\220"
- #"\320[\303\3041>\272\260\230\210\321\230\20\327(\243\210 \357X"
- #"\233\5\300\242\214\202<\357\372\237\275l\277D\376l\2760\341\""
- #"\305\331\303\335+\321\221\341\346\23\265\3\263\324L\216\346 )&z8"
- #"*&\277lz\333\a\302\227f\261\225\24\240\1g\r\17\n%\301-B4"
- #"\311\250\252\210 #\202\223\337\1h\21B\201\256\254\202P\256b\25P"
- #"h\5\34A\303*\"\203`\355pp\337Y\331\311\6\210\363\272U1\351$"
- #"\317\373\212\271\353-V\36)\312\312\262\315\271\t#\32\200\271"
- #"\361&\362\235\277\245(\315?%\252$\316\320\234\20\363\370z\331\200$"
- #"h\327lZ\2142\345\366\303\373\177\374\375\17\377\351\342\317\247"
- #"\250m\363\207\201\247`61\264\220\247\326\267[]i\261\17\3015"
- #"\310\250\32V\266\302\5\370M\253\337\254\355\265\2642\205a1O1\363"
- #"H\37\325\34\20\250#\213H\1\240\212Y5+\341\1\340\221e\v)"
- #"\312Dk\21\2635k\255)\204\252\252\220f\316\231\275\27fO-\205\230N"
- #"\27\357\215\243\252j\37\267=7\273\262\262\312\260)4\265"
-) 500
-(
- #"\240\312{Xd\21\226\331g>+'<\243\32\0020\fPQ\307Sc\32\34F\333"
- #"\233\2\204\214\266\250)Z\237\265s\242m\311\310\252\342.\202j\23"
- #"\212\251ZDoT`\221Z\250\27U\351\201\301I\6p\207\201\316\243\215"
- #"\20\200\214\365\344\254\272\207qU\221\f\204\31A\356\23R\2072r"
- #"\330[m1\36\265,\247X\241^\303;\207\245EQ\5\331\270\356\251"
- #"\247\365ryX\327\367#i\236\242\215}?\253Y,d\204\340R9\2320\223_\226g"
- #"\27<\233\215\257\266\"i\222`\321\0161\300\271\262|\241r\357u\254"
- #"\35\254\332\301\215\20\30H\300\223\30)\233d\373\371\277\374="
- #"\237\336wo\347\b0\37\26}\362\310\1\257;H+,\253\\\360\235"
- #"\326+Tu\340D\274\351x\263\256\257C\217d\30\1\3L\263P6\213e\242"
- #"8p\324)\321/ek\222Z\23+\315\v\344\374\352\212\36\255\265&\203"
- #"\362\344<m\343\370\364{\272\272\277\266\333 \31\223\372\311\234"
- #"\253\225\231$\353%\275A\364\4i\24\333d\246h\316\254\eP\35i"
- #"\f\214\206\0037\261X\260\t\332\0260P,\26@9\341f\24\340\""
- #"\310\344\321\376M\240n\e\5\224\201$\203,\03256\20\205D3\373B*"
- #"\\\260\6\f\210I\23\3\260C\4\334\254\3!\221\314{s"
- #"\222\350\275\311R0HZ\241\bS\202\221\345\221\325*\310\26Q\240\355"
- #"1\206\232\30\215v7K\261\213\vT\321\2&\324$\2105\333\230\202&7"
- #"\357\232\0l\266\"\367&D\270\363|\223\353\345\235\1\2707!\4"
- #"\353\245Vh\226\"\317\352\301\227jP\243z\357\263\372\217\347\233"
- #"]\355\372\373\377zf\235\260\237\24\311\364\332\256\333\266\aX"
- #"Y\30e\247+\241\252\2+\210\211LO\304\267=\276?\365\357\242\277R"
- #"\235*\27\223\340\0\323\336\215=\al"
-) 500
-(
- #"R\232\334\320\4\5w,:/\27G\364\35D\314A\0DD\264\345\b\205"
- #"\322\235_\314}\356\247Y\2165q\206\313F\222dEU\245\253\252\\\234"
- #"\344{%\0Mv\0<\3407\251\311S\202\2Lj2?5\237\344\f%\204\r\273"
- #"\354\331k\317f\e6\320\340\244i \243PU/Yy\202\326\210\371~\0305;$L"
- #"\250\t\27 \226\310\b\220a\323Uj\262\v\36\225%\26\20\226"
- #"\313e\26\324k\246\37\265#\251,\310\fQ\263\25A4\265V\216\260"
- #"\rVU\356C\221$CJW\345.0\3249Fe\256\344\316hH\252\2151d\314z:\210"
- #"\0\r\5H\30d\261\254\311}\361h\35P\367\24\310\257\300\245\n"
- #"\206ud\231#\vN\370\210\331\212\223w%\242\0\240\307R\243P\264qZ"
- #"\326\210h\217\265\237z[\b\346\36B\300](b\30\231\225\3"
- #"\303\330\235\206\217F\3318\21oV}wZ\277\t^\234=G7f\244+=u\222r"
- #"\232\220,\4\352\316|\336\321\345\274\201\227\357\361\322*\370\330"
- #"y\26\3<\2727\213\244=cP\345\252\2038\2357\214\211\254\301\230"
- #"\364s\301\5g\346d\25f\353\310\3\277\tp\31$\322\204\301\2"
- #"\2144\220\236]\36`\242&\21M`Bz\201\1Z\300\250n\227\2245\231"
- #"\213&Y\23R\a%\26\203\244*\v(*\20B\0240\23:\240;\341\3\243"
- #"&\375\1\0\25\202Q\2\211J*0\305\235)\363\250f\314\331-3\vd"
- #"\210\210\331\316\221\214\20\330\a\"\323\270m\202#\n-\24\314"
- #"\332Q\251\34\30\273\214\260\253\246\230\232e\320U\345\301,P5;\347"
- #"/\2132\1o\320w\22\343\5p\334\27\f&5\227i.\346\314/\2665\177"
- #"XG\b\342\376\236\245\267}\337\1\264\326f\253\335^\257=\210"
- #"\200n\373hMO\267=-\222\373H"
-) 500
-(
- #"\262F\261 N\212\16\210\302\"\274\356\374\376\274|\333\373\5"
- #"\243\355\373\324\225\204H8\301\4\6]Sf\24;a\263`\360\270\314"
- #"IP\263X\345\227ZytTfV\215\312\310@\4\213\t\230E0\v/\0205'\231"
- #"\346\1@Q$\243Z\203\31M \252\354\234d\277\247\214B\317X\204\356"
- #"\304@\231\230ag;3\323f\326\230\24\314=\373\26I\2428;j)\f\333"
- #"\243\320\356,\2225a7%Z,Ek\275\240\371~\260\250f-\226\22\202\""
- #"\264X\221f\335Y\201\331\371\223\6\203\b\"\202hB\1\1\246,"
- #"\350\250\205b\21m\262t9\257^\35\351\20\255\210\260\205Bez\3"
- #"\242D\200,R\316\362\310\334\230\303jvV\346`\216;\303\267\273\272"
- #"\242U1\230y\364$\223\266\303\235,\v5\34\204\32\357o\250Y\230p("
- #"\\\366\24\367\370R\23(\250\312\207\226i\220\274^o\357\337"
- #"\277\377\333\277\375\333\277\371\233\277\231\25\271u\252\306p+\n"
- #"\255-\276\16\244\263J\206\205\340Q6\322\325\214\5x\333\360\335"
- #"\322\276_\372\233`\37#\\T:\332\215Y\326@\25d\250\b\320\20"
- #"\213a\345\201\206\0\227\263\16XY\376\302J{f8h/G:\"\241#Q\206\t"
- #"x\257\0040\265\332\364\364!\314\e+I\221n\205\245q\356-\0C\303G"
- #"->\24O\222\231n\252f\316>\203\252\270wo\266'\331\31128\232\202\23"
- #"%\242\246\271\201\214\211\37g\265\216\230\326\204{\353s@\304 &\250"
- #"\271\3\31\304K\e\364\322?\335\323\277\5\26\315\262C\260X"
- #"\226 L\365\333\20\202\r\215h\r\223jFD\204)Cs\3253\r\316\375"
- #"\255@ `\305$z\274ovB\315mw\365\32\203\373\326\372\32\302|\2305U:"
- #"\242\340(&\30\305:\330\v\223\207\35\344Nj|\315f\314\e\t"
-) 500
-(
- #"\0\3414P.\3029\245\235\242\355\312\222TG\326\250\227\333\247\375"
- #"\376\303\323\377\366\277\377\237\377\303\277\371\17\217\217KD4Mq3+"
- #"\"\262\262\207\226L\20P3U`\331\273-o+\361\266\363\267\347\365"
- #"\333\326\337R\347,U1<\261\345\315\32\345\2\t\201P!=\\3"
- #"\331\21\200&\322\263\353\276O\314Ia\350\2706\312T\346\266ih\34"
- #"\255\257\355r\1\330\312$eW\325\300l\367g\16:\24\367\314\334\240"
- #"\210\230\24\356\374\312\257@\314\21\205\225\3$\247\n|Xrp\207{"
- #"@q\312}\223C!'\21\242\203@v(\226\246\210\bU\204\202\367\16D"
- #"\323_3\351FL\221>\214p\205\3112\242\21\5'\fM\220\341,\340(\304"
- #"\223\365\204\340\373*\n6\235vc\314\337P\213\350w\37\207\0M\356:"
- #"\253\340B\237\374:\251(\261\252jde\271eD\213\350\340\206\355\246"
- #"\363\303\211\261\217j\322\0aO\f%Q\5\20q\210lG\377\307\211\""
- #"\t\371\336\v\316\266\357h\222Q\2\f\336\227\270\352Pamf\336"
- #"\333\350{\276\0\20\275\235_\275\376\327\377\356\337/\227\207["
- #"\226G\266\36\2449\306\210\326k\344\251\365\254heJ\246n9n\373\316,"
- #"\1\247\300\333\323\362\315z~m\234\262Z\216\346\202\260\221\303Nz"
- #"\20\225l\4\314\251a\32\225\214\31C\223Q)L\322\225\365U\317!"
- #"\n\367{\253Bf\356A\224\332\204^\256\227\e\310\303\275\1\0&"
- #"\322S\215\214*\354{fzB\3511\206\357\2\353\354\32\357!X\20)4"
- #"\2015\331;Z>\340e\4\351\211\304;#\342\340\234g8J\0221E\301\246"
- #"\210\346\340\21\2463[\204(AH\221b\1\b\242\261\202\223=4\t"
- #"\272\302\aQ\306\252*pm\263\325$\203\320=\323\e`f\25\252*\214"
- #"\212\336\246\229r\362\205"
-) 500
-(
- #"\220\4\21\236\231e\352(\367\226F\0020\2553Bz\337\331\a\366\335"
- #"{F\241A\254\224\216&\216dL\306d\232\0244#\22\223\255\346$\"\201"
- #"\320l<\r8\16\316\3400\232\300xI\215ss\314\235=\273.\370`\363\221"
- #"UU\333\266\221\374\37\377\247\277\331FJ\212hM]O\237\257\313\332"
- #"o\373X\327\305\327\333\e\252\242\r.\237r\277\245\367\314\6<\0"
- #"\337\234\3737k\177\303\274\300\301L\37\274y\35\"X\241P\36\e"
- #"\302\"\17\251\324\273\207Z\b\364\364\221TM\2366\356\355.9\365M"
- #"W\325\236\16a\244\271\247\315\204%\265\b\eT\277W\2642G\301\246"
- #")\332Q\31\333\2366\e\201\231\377\253\266m\332\234b\306\352\f"
- #"\227\240\350\212\242\214N\265h-\202\225U%Q\204b*l9E\227\20Q\6J"
- #"\226@M\255\251\b\251\306\200\34Gd\326\\\221&A\350\1\240GAjLT"
- #"\r5\32\243T\224K\5\254\322\2\6\b\267\223\216\374)\267HN"
- #"\311F\5\21\30s\235g\220zV\24\217\332\233\32\0313\322\203\300"
- #"\32\\(p+\0273\b\312\1\264\210[Vn7\3645\21\272}n\371z\241"
- #"\344\255\244X\245\242\16I\321X,:\32\343\350\371J\367\374L2\370"
- #"\5\21\37\220\321\303\305h\3121\311j\6Y`:\315I\202\30!\e"
- #"\273\231\231\203@(\367b,q\3544f\272\225\20\275I\\\330E%dEY\3"
- #"\310\31416\0\253\360\320\343U\357\247\20\352\340\27^\324\376ag"
- #"a\237\365\321(\224wV\2250\331wT\25@\223\27231\266\347\216\a9EE\0"
- #"e\303\0264\213l\331\240\217\235\210)\210\35\275\373\201\177qX\373"
- #"\322&\320\354$\246\23m\362\202G\220\e \3\24\321!\212\1R"
- #"\325\240\220\273H\335Mo\202\2508\244Y\310E\37\366\304\20(\267\351"
- #"\227"
-) 500
-(
- #"@\1u\370[e\305\301\226)\2\22ZX\215\f\24 \321\263\212\207"
- #"\2\0161\2j\212.\266\24241s\20\23GK$\223H\333U\255--ZDDk\363"
- #"\212\22\226\2z\351,\376?/\266X C\t\2161h\206bmq\e\371\371"
- #"\323'\367\\\317\217\271\0177]\326\365F\210\a\320\231\264\27"
- #"\302\201\352\321u\357w'\24\233\no|\305\5N\344\213iH\254\24"
- #"\246\234\r\323\240\25\264\17\237\246\301*\6\\\214\260s\256"
- #"\236I\3162X\4\333\r\245\245\243\306)\272\235\5\"\264\25"
- #"\253r\324H#\200\207\256\267\247\345\241\305\31\234\374o\340\316"
- #"^\330[9\0170\244\2]H\327\344a8/\267\246\353D-\242\356?"
- #"\211\331\2U\341N~\20_\374\244\223\266\230-\375\320\344Pf\22=n"
- #"\f\240)\20\250(\273\200\2542!H\345\314\374\242\336\22\244&a2"
- #"s\333\304\263\rhD\203EZ\252\251\211\372^.A\272TP\304\314\245m:"
- #"\0314i\356\214\350/\375%\333\3219&\21\f+\fMo\301\354\372\2324P"
- #"\207\324p`5\220\206`\247\24\263\2\317(\234\256JF\223\304\246\210"
- #"&\365\257*\354\244{\357-!U\223^\226Z_\240V`\215\341\234|\251z"
- #"\2170\256O\267\347\347\275\326S\177\365\266\277zD\4\310\272G3\17"
- #"\330\0214\210$\16\263\237\216\320*\340.\262\371X)\370\240\346\255x"
- #"\1_\211<\24J*\330<\35\31\232d\eG\232.\347\221\205\356>)\264"
- #"\233S\2\366\224\32\n\235rp\253)m\r\2g\341\322\332C\264\263"
- #"K\231\316Jq\222\221\5\245\235p\231\263\202x:qp\24^\232\25"
- #"\323~R2d\35\201\213\257h\tNU\201\20\277\272O\331L\247\201\251"
- #"\374\216\343\355\6_v\341]+!l\17T+\24\353+m\366\330\265"
- #"\301\"=\1\256"
-) 500
-(
- #"\b\231\201\212\303\t=9\353#\341\242<\303\344\0\364\300\244\22t"
- #"\347\3064\233&\247-\36u\307\262\17\336\335U\225\200\200\264\17"
- #"\346\306\"\\\206\3(8\0V*t\360\301\2641\246I\20\2\321\211#"
- #"\323\333\31\20\235ww\"\272b\363\314\0\263FR\21\214^\354\323"
- #")\240\26\323{\205\221\223\253\357\210\265\365\321\363\371\323\355"
- #"\343/\277\254\257\2769=\\\354j\f\23VT\325\4\3573\270\16U"
- #"\343+\352e\376\235_!\372\373\22\301>\240\245\17J\365\313\357N"
- #"\323\252\300\311\336O\23@\215I\305\37\357\235\357l\239r\3303\353"
- #"*\212L\327\266]\313^\211\363\22\17\301\325\259\335\265\323"
- #"\3400\365\"$\264\321f\214J\227\323e\263\0R/Z\210\17\231\v9\367"
- #"\322!S\370eo\35Es~_\366\324\177\357D\306`~\335k\277\204\327\213"
- #"\207\200F\272PFY`D{\351\320\357\324\364T\360\374\365\307M\274\222GN"
- #"\375\377\225\264\231r\342@\177\234\fYp\266\4\234\214\6E)&\336"
- #"\325\21%$\207KI\271\214 k\372F\n\212e\322~\4&U~\220\267\231"
- #"\f\25\17\216\356H2sa+\253\346\202\31@8\2064\24\4\202\254"
- #"\240,\250M\371\2j6\207K\3244Pzd\215\264D\340r:e\265_\236\236?\377"
- #"\372\376\374\335\367j\206\253\310\362\360\213W\343@\207\361\362\210"
- #"\246\317%^\364\241\373\353@K\307\337G7\17 \247\3324\253\331\261"
- #"\202\377L\200\370g\257\326\330\340\321\332bO\303(v\327\226\343:L"
- #"\340\322\361\252/\27\261UQeL&\16\26\b\f(\235\303\302\321|"
- #"\322\246\213\16R\362\234\272\0A\316\255\226>\310L\361@\"`\31"
- #"\236\224|\34\210\270f\23\2\30H\227\301\303\f\365\365\2038"
- #"\232\212\252\211\274X0\220\225I\325\321\301\27\0\352\210"
-) 500
-(
- #"\354\"\202U0\241iQ-\24\313\306a\200\360=X\247Zz\264\232\230\313"
- #"\35\322,\375\2632\5\0000\250\230qh\6%\2205\357B\1\f\350\260?"
- #"N+\320\310\nO\247\"\205\2221\361~\21\36\236\23*\211\241\234"
- #"\312L\200V\245\16\370k\333Y\334\267\35]\342Q\v|\370X\225\346"
- #"\221\211\313\224i6s\300te\355\271\217uyx}9_\307\330\236>\337\236"
- #"\236\373\351b`\f\354L3\356\356=J\332\353\260\203\360\270O\34t"
- #"\305W\3617_\225\4\300\366%\4\255\t\\fJ\234\353;Wr\252\237se"
- #"\213\300\313?\23l\215A\326e\275\354\327gP\3u\313\334\366\4\260"
- #"\20\17}}\214\245\263Xcxh\2028\e\211\22\322\265\37\363.Sr%\324"
- #"<?\204\260h#sR\312Ep\324\304\311E3\211\360a\303\230\374\323\244\331"
- #"\343XsH\310)\301\311\344\3646\37\34\37]\2\n\305\373xJ\204"
- #"\2420\265\371\257I`\34r\237]\231\a\25\342<\270\3M\274S\a"
- #"\243!\30\n\264cnLm\312O\24\24\16Y*\230\f\323\232Y\2072"
- #"\233\251\210\26\21\0062\323d!\332\fk\325\301\322\273g\261"
- #"\320\221bM\30\255\246\2\224\304PLp\3\4\301r\264\326\320\332"
- #"\256N\267p\4;\305\"\244\326\242A\215\321\30\215jwf\3045\262"
- #"\315\366\330@&\306P%\34116W]oO\227s\177\365\360\3701y\375\374"
- #"\344\2077\271\340y\257\315\23\353*3\247s<\342^\t\2109\237p"
- #"\370\270d`\332\336^\344\270\231\305\v\207\320\t5\366h\203P"
- #"\35\0\231\344\234\r\3404\335Lx\343\373\224\3231\213\310f\344\322"
- #"O\343\272\25=\\\267\34\327\314\6\364\326\226h\213Z`\237\345"
- #"\240\350\331f\347\324\26\355,\217\232\275\311\354\275\217\22\t"
- #"\0*\340>E\206i\251-\224"
-) 500
-(
- #"'=\27\232\372\300\234\266\372\262\363\32)\262\37\363\224_\344 N"
- #"\301\376\30gK\340\336:\32\222\232\304\31\347/\265\364\356/:\32F"
- #"\36\365m\342\244\360Q\177&\220#\250\273\23\177><)0\31<\nj8h"
- #"\2754\240\3034\20\300l\178\315=U\250\32\303\306\264\211\320GGK$"
- #"\330\332\271\324\321\202\207\311E\251\0024*\205\216\350\2555\252"
- #"\1`S,K\226\23\323\\\315%zkMRDGH\352P@\363Q\305\274\223\312\214"
- #"\346N\261\260\217\364>\224\216\2461vI\333u\333b\273\\^\337vo"
- #"\333\250\347\333N^G]\v\16\203\334\367a\263\2656{n}eJ\230"
- #"\254\347K\"\344!\265\277\274\22\300\264\32\265\256\265\221"
- #"\364\224y\226h\"g\216\"\231p\3464\37\201\230\374,\t6\267\23"
- #"3\266\353\355\322\317\237\363\272\27?3>\tA<.\361\266\371\342\247"
- #"\206\214\316d\277\215B\24BY\34{\r\233\350\210H\262\210\203\n&"
- #"\1\21l\25$\a89\234N\322\325B\202\201\tN\0254\2354\0046*\204"
- #"N4a\316\23B\315v\16Kb\204\rsNh6\0\6B\262w\225=\334 T\320(AR"
- #"\305!\342\205\324\331\231UY2B\251FH%\320}T%\262+\212C`\233\bV"
- #"\r\21\236\326%ii\2755ujm=\250d\206T}\246\"U\254#\226X\316VdU"
- #"\326\263\b\217\234\245\226&Cm\271\270/\261\236\324\272\305r%P\271"
- #"gf[[\254kF\333@-\275\367\325\321\222\334\266\rF3\27\264"
- #"\307\363\353\36mi1\200\315m#\0271\264\4\210Q\21M\321\222tm\327"
- #"\333X\373\202|\222o\343\366T\273\226&\372\24\347\363\266m;\236N"
- #"\227\327\340\270\335>\337\202\37?W\361\222\205[f\5\236x\205X"
- #"\267]8\246\255\347XED"
-) 500
-(
- #"\227\16\313\34\217\352\272c\316/J{\3553GJ:-\270\266\24\\U=\260"
- #",RL\375\370\300\222\222FA\22]\22z\3\211\266,K\225\221\333"
- #"\260w\327u\337nu\23\260.ZC\235\210*\343\310/EL\a\350^\316\312"
- #"aHS\225#C\351\232\202\330\344\322\206\355\232m\37D43\210^s*\4"
- #"\201\211L\21777\360\20\301\2 s:\v\340\251\2475\312Y\231\3052"
- #"\357\36\376\303;Zs\nQPh\312,(W\241\"\250\254\234\3\206\222rR"
- #"Y\275U\20FU\361\356\217N\262\307\31@\251YM\21h'\366N\265~YZ4I0F"
- #"\250@a\264\326\366@_O\261.Z\316Z\316qz`k\"\226\340\30\333\355"
- #"\372t\273\336<\22E\265h\313\371\362\360\320\317\227\345t\206T\30"
- #"\271\217\353\355\363~\275\t\352\255\263/\241\36\247\205\214}T"
- #"\216\334+Zkk_z\357n\17\275\367%d{\270\204J\20\342\303\262,\255"
- #"\355\2319\262\235V\200\310\354\271\215\353\363\363\257?\177\376\365"
- #"\35[\274\372\366\373~\351\321\2272\23\256\334s\250SO{m\333\270"
- #"\345\363^\313\3464\361\271\256s\362\213\305\3641\261\0k\246\3559"
- #"\325\177\24e\24\16MRf\275\230\370\237[\265\346P\1h\362\2620"
- #"\246\355\343\350\227^\204N\4\20A\310$Zogw\271\306v{\276\326"
- #"\330j\237\36\2057\313\372\212mu\266*\3200\207\220\324(\273<\312Y."
- #"\260\312%\300\16\"\vy\234\221\200\220\0\313\20\35\0\211\6"
- #"\4\321\17\235\21\301\fL\23\16\202\24\20\262dS\243*\r\0"
- #"\3\34\243\222`\304}t\356\v\302\235\317\242\220\234\"\302aM#"
- #"\35\263\23h\275'\264\345`\353\25\262eiDE\4\312\246\3\201\211"
- #"\277)\263K\215\275\267~\346z\326\351q=?jYN\17\253Z\314"
-) 500
-(
- #"\236\221\362\374E\364\356\6\254g]NZ\316\356K\256\347h\213\245"
- #"\345\274`\337\267O\37\353\363\223\267\1\e\321}Z\307\351\242"
- #"\323\272\237N\21a\357c\333n\37?\\q\265M\313\203\222p\213\261"
- #"\327\363\330*a\352\341\341\374\240KW/<.\\\232\232\\\214M\265"
- #"\337\312\267\2542N\345\247\347\353\307\17\37\36/\17\215\302\30"
- #"W\373\323\257?\277\377\343\17\237\336\377r:]j\37\257~\203\307"
- #"\365\204e\251\336n@\253\n@\345\32\371\264c\a'\200\253\201*\f"
- #"\267*\344\2501\16ysL\337\245\366\227\307\216C~\324\234*hm\2021\213"
- #"{k\216fI=\260\344a\331:\354\311\250\bGs\204\233\20\205\5\""
- #"\321\316\17o\262]\207\274\345\330\a\320\240\r\215xlm5{Q\b"
- #"3SH \351\0354\271\263\222G\337\356\273\a\253\356J\366]\263\17"
- #"\t\254\275\5It\252\1\35\2\307\264\235\220s.\330\232\352"
- #"\5DWf\332\2259\311R\241\6\305\2303?U\240\3\16\206\346\256:l"
- #"\313\2109\276Z\367\271\fF\5c=k\317\342\226\313\31\275m\225\21"
- #"\321\332\342\210\203\5D\325\3101\206\200\215\354m\355\347s\234_"
- #"\351\341M{x\335\37^\305z\212\313\227\203>\202\256\252\20\226e)"
- #"y=\237\372zJ\252\24\31KE+\250\365\225\252\5g\365\215\343H\333m"
- #"]\322\36l\345\246R\225Gy\260\17U\355u\273\355O\327\333\30\225"
- #"\360\30U\212u=\267ei\265v\236\241\345\251\316\351\365\204E\201X"
- #"\253<\306~\335k8\373\325\374\370<~\371\365\251}\272\236\242{\277r"
- #"\354\37\177\372\341\375\217\177|~\367\363\371t\372nK\264ey\365:"
- #"\316\313\322\"\324m\325>\372\371t^\373'hG46\221\21\254\252kj"
- #"\37\231N\317\303!\312#\277\3142\37M\241sB\212\326"
-) 500
-(
- #"\32\245\210R\03401\"g\b.\215}\363<\326c>?\222M\354\213\233\30"
- #"M\255M\200\245\366\355\357\376\374\227\237~\250\32\312\275\3253"
- #"\266\253\200\313\242\5\350\223\23\222\a\221\306no\311\351\5"
- #"\254c0l\232I=U\v\1lj\246\204\6\306$\233\3050\233\24f\233\304"
- #",\203\306\241\216\314\3230\200\204Q\343\0\16\231tM\377\347\264\226"
- #"\270\4v\242&wOx6m\235\254\352l!\211\214dA\235\275\201=\304xx"
- #"\245J\215\344\303\331}\221+b9\235^\a\333\304L\364\276m\233\267"
- #"\333\260[\320\313\322\36_\265\207\207\270\274\322\345\321\353"
- #"\271\372\262\257\34-\272\242\267&\212Y-\324\327\25\250\276.\212"
- #"^v\271\244\356hNneX\245\371;F\25\312\214\30\333`V^\267\252B"
- #"\355c\214\353\363\365z\335\306\356\17\37>\375\372\2101\256\344\0"
- #"\0 \0IDAT\356\335\266\r\207\"\326\345r\326rZ\227S,\253\373\212e"
- #"\255X\320O\331\273z\3479\202\346>0n\16\224\340$7\214\34\271.\225"
- #"\27l\327q\273\346\365\366\356\323\373\37\337}\370\210\37\306i"
- #"\35\227\207\327\337\350u_\227\26{\372y\337\332\222\17\353zk}q3"
- #"\203\366\34}\352\205-\243oc\357\332\222c\317L\36s\205/\224j\312"
- #"\266\2!2\276x\252\241\264l0\253\256\273\23\216i\267k\207s\""
- #"\310\275\264\204\"\253\327\3410j\277\373\353\177\375\376\363\323"
- #"\365\351s?\235\342yq\242'\336\\\316\264\211I\375`'v;\323Y\270qN"
- #"\230\315i\222\")\24m\26252\344f\322#PQ\23pHd\350\350\5g3%c"
- #"\266\267u(%60Y\264\250y\252\300\204\323\260\201D\336M\252\362t\207"
- #"\203@\204(E\n\200\243%0\2jK;\255`c4_^\a\334\v</\354\vM"
- #"D"
-) 500
-(
- #"\323\345MS\237s\223U\205}\327\270\2\b\271\257\253\36.\361\360"
- #"\320O'.\253\373\262\353p\317)\242/\v\243\251,!N'\22\255w\203"
- #"\330\23$\30i\217\0327\5\252\234\e\355\205\307\30!\263\256"
- #"\266\367\2619\267m\333\366\247\375\266]o\237\267\247m\337\353"
- #"\375\273\217\357>~\260\275^\36\316}\355=\334\243\277~\320\303"
- #"\305K\303\272\346\322s\355\352\275\255k\234.M\300\222\0307\2432\270"
- #"\264\345\365\372\230\310S_\24\356\366\353?\377\213o~\375%\377\3577"
- #"\277\377\317\177\367O\277\274\373\374_\376\351c\365?\3733\210\3537"
- #"\337?,\212\315c{\376xys\362\271\337\252;\346\261I\334+/\324\310\332"
- #"6\356\273\366\301\314eT\315a\267\231\v\1\34b/)\265\31\206>"
- #"\362\342$\t\323v\346hQ\323\276?\25\245\t\247\307\330\354\350"
- #"\363\177sHj\177\371o\376\375\37~\370q\177\376\264}\332iu3\"\326"
- #"\350\323\2128\4\e[a/\217\254\335\30\256\322$\27-\244\300::"
- #"9\206\331PsR\260\35\336,Gc\273\207 \315 \340z\301\364\234^\302;"
- #"\271u\3506\222\346\271\17\20\345\202\2630`\222=\2\255Y0\345\b"
- #"\253\273+)(\212\252\240\226\vO+\34V\324\372\300\203\307c9\nti$"
- #"D9\372$\304\311\256\266Ln\262zG[\250\305q\342L\331\263\362'\315`"
- #"uF?\310i\254\nS-\301$\v\206\332\226\343\266\317\1\313\314m"
- #"\vc\260h\217\275l?\217QUO\333\376\371\363\347\347\347\217\267\347"
- #"\347\347\347\317\333u\257\341}\313Q^\226\245-\347\365|9?\274~x"
- #"\365\315\3537\337\364\276\242\265~>\307\262\266\363\231lZN\\\327"
- #"\364\314\f\355\226c\330Z.\313\372\260\243\240P\307\272\364s~\363"
- #"\355o\177\207\313\253v~\363\237\377\257\377"
-) 500
-(
- #"\343\307w\37\236\376\341\37\237\237\2067{p\371\366m\177\354\316"
- #"\355\262\242u\355P\nFT\303>j\24\253\332\276b\337c\e\2529\210"
- #"\r\315=\233\207\254\332m\213\204u'\322\343\205\333\237\316\243"
- #"\314\210\210I\222\bs6\320$5\17\31\223\357T(\332_\374\313\277"
- #"\376\307\277\377\373\374\364\353\273\353g\333k\353(\315\310p\320"
- #"\342(\178]e\272<\f\323\223\241/\36*jP\1\v\246K\324\""
- #"\265)\301\225\3hpX\r$jj\326\223N\362<q\344\3166\201! \353"
- #"\360h\262j\232i\312\230.\266i\31E\353\220l:h5\3643(\267\306h\354"
- #"\21\353%\326\305\25(0N\24[rGMdl{\364\21l\22\245>0\253\217"
- #"\b6\25\330\\\2552<\0172)\203\210\210*\334M\205\2529\276\233"
- #"\244bT\24\234\f\0\305^DVVm\336Gm\243\322PU\346\355\272W\341"
- #"\363\355:F~z\276~\370\360\341\323\347\17\327\353\365\372\364\264"
- #"\337v\31k?\235.\17\17\313\343\303\372\352\325\351\325\333W\337}"
- #"\373\366\273\327\2277R+\352ay\214\276\236\332\tR\357\vCU\243d"
- #"\24\354\221\345\26m]\227%\242\252(!\272\311\363\303\353?"
- #"\377\253X\232\314\374O\377\361?\376\364\343\257\343jn\5\267\337.q"
- #"y\375\252\211\347S[Z<\217\232n\266Z\300\340\tQ\251t\e{m\31"
- #"\225\204H\364\311\352M\v\22\357~-\"\3061\276=\205\200<\32\263"
- #"\227\201\332\341\2736q\227\25\272c\366\342d\353\4\320\342\362"
- #"\355\237\374\365\277\373\351\307_\306\273\17\347\207o\307\347\217"
- #"\362\365$\224\ay\262\327mk\373\310D&\2661\205\217\35\220#\242"
- #"\5\3\354\256\5\352\250Vh@\v\36\347\211\240DGfWD\34\243"
- #"\215Sox\271\aU\2`@\222\261\325p\23+\207\r"
-) 500
-(
- #"\260\233\200\"@\210\373tr\261\331]j\31\247\266\364\326O\243"
- #"\255\255\257c:a[\364\363\203\327\363\363\355\32\21\e\320C"
- #"\267\333-\367\233$`Tz\e4\361xzl\315\34\243|\333\363\26\21F\30"
- #"V[\242\213(\327\230\"\330v\255\210\20\2039\306\r\222\250u"
- #"\337\\\346\245\235v\f\344\r$\231\254\375\334\361\374\354\2215"
- #"\252F\216\317\267g\333#\307\355v\373\360\351\351\351\351\351\363"
- #"\323\365\375\373\367\37\237\236\306\30\267m\vca\217\305\355\324"
- #"\37\276y\263^\316\217\337~{~\363:\316\253\226Fr\t\365\205M"
- #"\271D\206J\345^\353^\36\225[^E\233y\333\267\276j\25"
- #"\347dv\301my\370dl\353\353\363\237\375\253\357\306\326\177\370\361"
- #"\217\177\370\351\343\247\17\365C\273Y\272\254\177\371\355\333\345|"
- #"Z5n\330/\353\232\205\"\266\341\265\365\315\ta\30]\356\205J"
- #"\246\216\330\252\362\224Uc\32\340s\37\225u\270\221^D\274\243"
- #"\272L\254\207&\251\231_\251V\367\341y\34X\0\215\353\372\352\233o"
- #"\36\277\375\366\362\323\353O\255\257\227\207\372|\253\2\31\231."
- #"\217\251\367W\326p\26\16%]BL\6\223\20(\260)\32\20N\331"
- #"\363\214\221\251\316\266\343\240\224i\242\376b\21\270\37\342\306C"
- #"\206\277\253\361\243\22j\245p\264\35G\351G\251\346\341\212mM\265"
- #"\234:/\224G\331\236>@%5\n\4\2416\375\216i\203\328\30\243\210"
- #"\276\273D8\204\26\200k\347V\351\34\247\323\311\256\275Fw\342>\26"
- #"\233\225\332m{\364\nW \263\262\6\250E\346\364CEL\355\227\341"
- #"\0306\17\223\307\266m[\356\373\30\343z\275>==}\370\364\364\351"
- #"\323\247w\237>\177\374\370q\333\207\244AwhY\326\326{_\227u\355\247"
- #"\323\351\341rzu>_\326\265A\275\365\350m\355\213\304y"
-) 500
-(
- #"r]\357\375e\367\2\330r\30\31s\\\260\317q\203\2569F\n\260"
- #"/\201\272\274\371\315\351\355w\331N\277\274\377\20\5\4\336\374"
- #"\267W\313\333W\313\357\376dIa\351O\311\326\242\202\263\3165\306\264"
- #"\\\24\212\234\3S\200u\2341R\2264\207\230<4\2142\217\361\343"
- #"\251v\360\260;\35:2\254\273\4\357\227\341:\351x\300\200\355v\25"
- #"\327o\276}\375\233\337\374\362\207o\264\234\226\365a\273~\34c;\257"
- #"\221#+\35l\36348\202\b7OK\217\32$\271\31\235h@\237>\20\210\0"
- #"\363~\"\26(:\356\322-M\372\30^<\366\315\2018\246\2467\375"
- #"\27\221\210\222\22\336\251\215\34\21\206\342\264`Y\320\2274\323"
- #"\216X+\2320'E*\264D,&f\317\a\0051\5\26B\201\210}\337a(\224D"
- #"\320)H\250`\0057\217m\333\320\325X1Z\253$\e\210\252\334\366M\306"
- #"\211\247\226[sp\236q\226\203\201\222c\0174\275\30\267\216v6TD"
- #"\272\266\261\337nOOOO\237\336\177\372\360\341\303\363\355\366\361"
- #"\343\307\17O\317O\327gCm]\320Zkbo\313\303\371\361\361\361\341"
- #"\341\341ryxuyxXOK4\331k\204\244i\31?\266\254h\36n\17\0c\f#\35"
- #"\334rp\354K?E\250\356\246\201\242\264^\316\337\376\366\333?\377W"
- #"\247\177\361\17\357\237\236~\315'\275\257\376\17p\323_\265\265"
- #"\375\345h\17\353\323\355\346yX\a\235\231\21\213I\27\4v\311"
- #"\207\314\350I\241\316Q\276i\354\0005\n\243\322\307\3645\357v\270CP="
- #"\334\3\274O0a\342\306y\266\314\341\r\0\330>l\267\352\375\341"
- #"\333\357No\337\256\227\267\317\237>0Np\355y\230R\207\307\234\330"
- #"\230\266g\226\247\266\321\311\0\e\330\221\315fV@\242\217\271\277y"
- #"\232\21\245\373\211\235\307"
-) 500
-(
- #"0\345\335UV\307\272\5\340\3648\300\t\225\241\335\34\351\""
- #"\366PEc\17*\270\254ZWG?&`\325\n\364p\367\310D\264\272\\\24}"
- #"\221\2404M\313l\21A\333\252\346\221c\36J\251;\221T\5L+\0232\363"
- #"v{\316lK\217\362\t\354\323\335\263\357\273GFD\304\255\265 \261m"
- #"\267a#\260\206#\25\\\352\30\317:Nq\330s\e\265\357\265\337\306"
- #"\355\363\323\323\207\17\37~\375\365\227w\357\336==\337\256\327"
- #"\353-\353\272\335\314X\4\21Kk\227\313\345\341\341\341\361\361"
- #"\361r\271\234\327\323\322\272\340\334\267\245\305\"\232_\306\363f"
- #"F\331*3\23\2502\307\30U\345\256m\e\360N\4Z\223\246\233yZS\""
- #"uz\365\375\237?\376\311\237\376\367?\374\376\323x\352y\373o?\376"
- #"\240X\326\207\357\377\364\257\376\355\233\327\337{\253\233\266,\202"
- #"\231\231\252\257,\b3\333M\364s\234\215;\235\224\363x\300\n\222"
- #"!\363\230\364\212\343\240-\0hw/\372\\\355\3421E&%p\344\315\31"
- #"\251\355\3436\28\277\376\356\374\346\373\327\337\375\366\371\327"
- #"\237\324O\256q\333\236\246\373c\37c+\317!F\330\232\263gp\203"
- #"\233\321\2146\17\321,\37\211\30Tx\346\356\343\320\306/V\250\257"
- #"\n1a\242\4\eYq\307'\32\210\335\330\214\222\20\253\226\263{"
- #"\324\324\365\0210s\36\372\4g\226\307\356\25\316[km]\332"
- #"\272,!693\203\21\313\202\300\266m\f\2717\325\200\335L9Xb\251K"
- #"j\370\314\270\216Jl*\327>\220\305$\214\332G\355c\337\367\326\32"
- #"\357\247\325l\333\266\345\0\274\215}\214\321N+\311\274\301\366u\337"
- #"\236\237\237\267=\257\327\353\347\317\237\337\277\177\377\376\335/"
- #"\357\336\275{\377\376\343\207\17\37n\3336\306(p\337\367\1B\274,"
- #"\353y=\275y\365\352"
-) 500
-(
- #"\325\345\341\264\254M!\232(\214\335@\365\245\252\244$\347\334"
- #"\212s\337\267m\333QcO\2522s\214\34c\37\211\314\304Y\21\241e\1"
- #"\16\26\331\310\312J\306\343\333o\277\371\376w\355\374\272\236k"
- #"\20\37\257\327\237~}\327\377\356\357\276\377\213\377\227\255w\353"
- #"\261,\271\322\303\326-b\357}NfV\326\275/\344p8\"=\3I3\32\0300"
- #"\374\17\f\277\371\301\6l\330O~\260!C\360\203%\353\305\177"
- #"\316\20l\b\2264\324\230\34y\214\241\206\34v\263\372\306\352f"
- #"\3352\317\331;b]\374\260b\237*RN4\32]\325Y\231Y\347\304\216"
- #"\265\326\267\276\313\217~\364\350\223`i\et\206H\261x$\345\326\367"
- #"\2573\16\321 +\220\357\323H\362e|\334\240\371\313!\246\32\365x"
- #"\210\262\21\a1x\360\36\362\220\304\350\317 \244\231\213G=\\"
- #"\335>z\332\236\177\372\352\313_\337\337\177g\215\f\242\"\4"
- #"\202Ax(A\31\365\336\203\21\v@\216 \4\301\273!L\256\374 "
- #"\222/\35\36\356\311\235\273\220R\31\1\321\1\35\240\233r\222"
- #"\177 \234\6\21\331\1[\200\22183p\215y\2112\a\243\a\246s"
- #".9dOl\36n\356\252\205\325\315\302\315\264\203\e1I\356K\20\252p"
- #"\252\354\b\231\31N\244\24H\300\2,y\177\247\v\201\bDX7\2"
- #"\204n\276u\243\346\210\326\325\266\16n\266\265\206H\210f\246\252"
- #"\315TU\351|^\327\265\36\216\210\270\265\326{?m\355\376\376>\233"
- #"\277www\257_\277\376\355\353W\367\367\367\367\353y]WwPU\4V5A"
- #"\256(\17\346\303\223\353G7\313q\226\31\"\264w\1\364\256\316"
- #"\202\210\335\232jc\251\5\335\314\34BU#\326\20rw\206\0\17\n"
- #"\b\265\276u(fR\274\260k\315Y\220\211\r\301\301\204\350\346x\365"
- #"\375\217\276\367"
-) 500
-(
- #"\342\371\367\357_O\342\272\351w\337\2367\373\315\313\307\277\370"
- #"\273\353?\370Q}\366\321\331\374\4a\344\36H\320\21\367m\6\2767"
- #"\363L\3576v$\"\35\30.\0\\V\262\210\b\202@\1L\200\0\221"
- #"\326\340\270sV\23\332\241\1\202'\307'\235\30\5\202\b\245L"
- #"\370\350\311\307\366\372\325\313\307OOo\276\351\3477\310\242ic\207"
- #"\356\204\1\226\246\26H$\201\214\316\b\202\300\0\251=\f\204"
- #"\1\303\2\0@\222\324\335\35\351r\367\rZ\256\201{\270\2\32P"
- #"\48\220!\216\201!\2601\202T,\25d\212\"\312\34\204\346"
- #"\20\b\234\336h\303\210+\34\34xo\214\220<@U)\327\314$\"\205"
- #"\2718\f\274\224\310\213\6s\31d\t\a\263\20\301\374\277\0`"
- #"\315(h\333\372\371\274\245)\271\231YWwk\36\256\26M\261JDh\332\212"
- #"\23\226R\312rof\357\356N\333\266\235\267~:\235\254\367m\333\336"
- #"\235Owww\257\357\337\265\326\232[\357\335\35B\215\331+\3622\315"
- #"7\363\341\301r};\35f\252\254\356[w\356\32\250\255\267B\314\214"
- #"\300\335[8\267\326\232\237\231\331\3\211\334;ED\20\206\31"
- #"\21!\200\366\r\301\265\315*\275\326\26\20\251\311f\304\210`"
- #"\337\230\351\323GO\377\350\323?z9-\272\236_nv\177^\251\353/^|"
- #"\366\344\363\317?>^\2773\270#VA\5\24\22\242(ys\fq*03\206"
- #"\355b\326\335O1\5v\343\277\3\21\f\211\22}\e\236Ry\367A"
- #"\332\315\"\1\a\251u\206$\225c\256-\204Y\nI%\276\275}\324"
- #"\37=~\370\350\311w_.\347w\22L\352\335\314\263\331tw0\0dA\240\bA"
- #"\342\354\5\21\323\207\333w\323\220\334\343\347\244\32\210\351"
- #"\366\221\370\237y\22\361\323\374? \320\0b\230\355\222\1t\0\23"
- #"\306Z\251"
-) 500
-(
- #"N\300\245\247i\6`0\346M\300\20\205\310\2\314\34\1\210\310"
- #"\2\230\b\231\34\242\233\203Zu`f\341\231\220\335\215\260\2220E"
- #"\260B)%\365\325\246\341fD \"))Z{3\b\351M\332\26\1y\b\334"
- #"\241\255\315\20{\351\2755*BD\233\351\266m\247\336\210\b\244lk"
- #"\177\375\366\315\266\365n\266\256+F\364\336\317\275\235\267\365\334"
- #"65S\214\256=y\263\225\247eZn\257noon\257\246c\341\212\352N\26]A"
- #"\315%\313\253\372\20 \2ig\346S\353\245\24\221*e\312\356\220\205"
- #"\300\25<\302\\U\31P\373f*\326'J\20\223\0\221\30\35(0\374\361"
- #"\365\203O\237\177D\304\247\323\375Y7;\237\333\333\323\327\337~\373"
- #"\345\327_]}\357\17\336\32n\323\242\265\32\242\2403\243q\312*"
- #"\34\0X\220\3\275+\21\t\343n)q\271'\323q\320\23\375H\326\f"
- #"\"\212P>)\360\3016E\0200GH\"\216qk\312\325BBl\247>=\274=<~6\335"
- #">\245\351\32\260\262,\336CcuKGl\20\24!*\4\225S\4A\204\300"
- #"H\1\341\346\351=\231\360\n\3400\245\363A\367\0317b\0:\220\a"
- #"\4W\0177\240\315\303\211\211D\3\24\221\353\4e\301R\251\26\0"
- #"\340t\312b@\200\0242\22\200C\0!\26v5U\27!\17D\220\373U="
- #"\354\252,\233\343\\+pA\21\3068Lsk\353\272\256\323\\\"\242"
- #"\237\356E\304\244\22\321y\265i\232\210\243\365\263\331\246\272\212"
- #"\20\21\230l\265\326,\235\256\16\0\330\20\21\263\357\331\314{"
- #"\357\247\266\2\300\251m\247\323\351\324\266\326Z7\215@\2050\213,"
- #"\326\3154\327\3\340\0\340\207:]M\363\365\341ps\234\257\346:"
- #"\27\f=o\336g\276^\327N\202\23\341\326[\364\242\272\321"
- #"\271\257\245\253\367\336;\24"
-) 500
-(
- #"\254\265\312T\346y!f\241\"\205\26\251\b\312\252\223#\251"
- #"\307\351\254\0\r\202\256\216\245.\336\233\31\t\25v\352]"
- #"\351X\37|\362h\23\305W\260l\217\360\332\373tz\371\365\313\317_|"
- #"\375\361\177t\3577\327\16\260\255&\245\30\201{\230\345V\304\tQ"
- #"\325\21\323\246\307\220\a;\6v\257\334\301\332M~5Y\32t\20\21"
- #"kV\336\274*y`2a\21*\214El.X\2\30A\246\312\350\316U\212\343\203'"
- #"\217\236~\374\311\317\227\205\347\243m]\3\324\0063>\237\200a"
- #"\274\3 4\372\323\v\3443v\206\2643\351G\351\5Dr\300\356\340"
- #"\216\301\354@=\334=\232\3\226\342D\206\251(\257@\20X\220\t\370"
- #"\275\373%\370\360]\220t0K&NJ2\210\260\240\251\31\230\204\270"
- #"\223\207f\366A\342c\210 %\331\34%\275'U5Mg\326uED)\310\314\252M"
- #"\265\235\317gD\234\246\265\24F\217\374\344\336;A\32\177\3\""
- #"\202\24\08\265\276\256\353\335z\216\210\273u;\237\317\315\233{\6"
- #"1P\36A5\363\375\3\21\231\210\231\347:\35\226\3458/s\251\214)kp"
- #"C]\373J\245n\332%\364\365\273\267\262n\333\266\251[D\250\255"
- #"\252\332\303Dd\2719\334\334\334\36\217\307\271\316\265\26-\2259"
- #"\314\273\273\232\0053\252j\376\314\334*\27L\203;\204a\223x\274\271"
- #"\276\351m\355\355\346\346\206,:\224\2737w9\b\335{\200\2070\206"
- #"\333X\226\232^X\3714\3047\16\0`\310\3140\26B\243\31\314B\f"
- #"\331\222\2211\215U\352\345\246\34.3\203\215\250DT\vu\343\t\240"
- #"0\311T\320\272\303\314\276\351r}\365\360\223\347\207\333\333\27377j"
- #"\367\355\4\315Q \200B\30*aE*\324J\22\262<\2\320\20 \275,\323"
- #"\305(Uj) \37\212HVbs"
-) 500
-(
- #"kH\16`\210\r\331@\272\0\225\312R\3\305\30\247z$&\355\26\b"
- #"\4\250\t\331 1SX\202Bd\246\331\322\302@\276QX6\335\"\242\2339"
- #"4\356,}\215\bwe\fb\220RK\341Zg\2068\267M\325\0213g\306\211\b"
- #"\20Z\203\246\335\302\2735D\3146\257c\357\255\237\317[\357}\222"
- #"\22\21\232o\3\221\273\257]\317mS\213M\373\273\363y]W\205"
- #"\310\211\36\300\233v3K\271v\342\355Bu.\265J9N\363\261\316K\251\5"
- #"\231#-~\e\223\334\255wl\323\252z\266\276\255\35\210\327u\335t"
- #"\353\275#93;\5\21\35\337]\275z\365\352\361\343\247\307\345"
- #"\260,S\233\346e\231\252H\266\255)\2430\263\326\32\222\224\334=\""
- #"\200c\17S\207i\231o\37=\264\360@\330\356N\r\371\372\355\365\365"
- #"\303\333\253\a7\347\210 \236\313\254\206\271\213\37\332a\347\210"
- #"!\223@\300\364nD\204\344\v\352\a\3528\322\304\261\203(\24"
- #"\3\21m\37C#\"\34mw'I\212k\21\\'::\324\312\302a\1\346P"
- #"\325]\303\346\233\233g\337\377\301\2737\337\236\356\277\353\310"
- #"\36`\200\340\6\304\0\301\271\232\311\304\212\b\4\206!(GH"
- #"\307\207\300pG\264\4\263\0H\1\34P\203\272{C\b\244\2150H\240V"
- #"\247\2u\202\20\203@\4Bn`\214`n\21\306\314\214)\230\30\333"
- #"\356t\212afB\314\311C\230H\330\314\f\3245\275\336\300T\325J\2327"
- #"\213\0\342,\"\245\224\326\327\260\336u\363pdB\202\336{\202\177"
- #"\27\214\312B\325{\252_\267\355\274\256k/\205\231\201\270[\250"
- #"\233y4\17\rofko\247\266m\2759#\246\275\20@\17UWN\177-\"\f"
- #"\250U\226\251\3162O\2452\21\306@\20[k\206\261Yk\246\16\30"
- #"\300\216\345|\336\322\31\261\353"
-) 500
-(
- #"y\333\266y.\207\303a>\316\245\24 >\237\267\363\371|}\274\272yp\245"
- #"W7\200\327T\347\0\vwLO\370\b\357j\242\314\34\200\200\261Z#\344"
- #"\356\216D\207\303\1\0H\360\233/\276\262\363y>L\245\222\b>\230"
- #"\16\350@,\206\334M\35\206\365t\226\216\b\201\364\243rw\30>:y"
- #"\366\262\317\2\200\364W\225\24\277\356R\331\210t\302v\3230\e"
- #"\26\376)ul\35\324\331\3\252\242\230\231Y4k\346\341\352\262\34"
- #"\277\377\243\37\177\375\342\27_}\301\315\203H\210b,G\0\206\245iX"
- #"\244[\24\306\3402\21e\251\2624A\bv$rp\f7\b\364\6\261Ah"
- #"\200G81\226B\245zP\306\243\2309\230r\332\371\20y\376\305a8\\\345"
- #"\327\267\275\264\1\200#\232\17\341n\2515Z\313U\254e\262\210\250{"
- #"e\306\332\2445i\255\345\316\27<\\\315L\335]P\302\243k\317\342"
- #"\25\21\335\215 6\355\3306\24\216\210\325\266\373v*Z\2309X\334}"
- #"\370F\0\30\340}\333\326\266\235\265u\327\354|\363gK\351\2\220"
- #"\263HJ;')s\251\313T+q\0t\323@\350\246\340a\341\233\257\335|\353\36"
- #"\316M\21\200z\357\210\201`\255\237\226\271N\247\373\253v\\\226"
- #"\243\6\270\307\353\327\277\275\275y\340\241\2072\271\37\223\4@"
- #"\27\242\300\256\217v\367p\37\0213\204\350(\"\20\261,\213\305"
- #"\315\375\233w\375\3564-\313y;\335\335\277=>\2741\205\326\264\260"
- #"\20\211\217e\aB\336|\21\210\250\311&\36\244`t\367\374\332\373"
- #"\367\315A\4\336s\a!\r\253\363\232\334M\342b(!\335\\{"
- #"\3370\"P,D\303\327f\210l\210\\\312\303\347\317\313\341\20H\356"
- #"\301LB\204\b\204\242\256\346\3\0L\20\\\b\206\263\v\242FF"
- #"\276\221\247\362#\302\2\334\334\220\320"
-) 500
-(
- #"Q\0357\317|\301\222.R\221\227\272F\n\365\335\35Q\211\221P\2"
- #"\321\303\0227\331m\354!Y\322C>=\374CP\1\221\bX@\315\3\335"
- #"\264asw\2tW\265\326\266\363z\346\360)O0\356\bs\22\20=\234\231"
- #"\r\260{\230\5\21Yx7U\267\3744UU\n4\334\35\23\331\20\325"
- #"\255[47\365$\357\246I\235{\232\20\243#\5\0210\202\210\24\244"
- #"R\231\b\34b3E\325\363\376\366\364\336\267\336z\2049l\35\b+"
- #"\313r{\373(`5m\245\n\2715\263\323\3537k\333\204\337]\335\\3"
- #"\227e.\313t\bG\346\302TD*b0\22\5C\20\355\272|OS\371=\4@Dj)"
- #"\275w\360(\245<x\360\200\334\205\30(^\277}uC\237\36\346\2"
- #"\246\16Ze\352\2216#\270\263\3\307[\220-P\36\315\335\376\v|"
- #"Pf\202(\2301\215\215\367#\b\212\206A\220\206\310#2\201\334=\300h"
- #"\330\177\271x\210C\244\a\245S\t\330\346e\271yx;\317\363\335\260"
- #"\251F\ar\244\0\354\6\25A\202s\2655\226\315\341\26\16\16A"
- #"\250\30\212\334\303-\270\241Y\220#Rp\aHcd\221\352\304h\334\1K"
- #"\21\37\207\217\21(9\370\216\356\356a\36\21=\302\22\375B\4"
- #"\246\34\255\263\323\312\235#\365ND\346\303\2271\215\204\315\254"
- #"\233f\245\313+a\232&DL\b\343rU\344\b\225\247\241\265\6\310"
- #"\245\316\245\224\335\327;7\25h\252D\342\4\b\350\b\36\336"
- #"\324\233\366f\252\256\261/\270\335\335\265\17H\202H\2109o\5\4"
- #"\360h\246\315\206\337\222\231\231\203\2737\323\256\6X\324\31\260"
- #"L\265~\377\343\37\374\275?\3721\204\335\275}\5\261\335\275\371"
- #"\366\376\356\325;U\b6C\302zX\256?z\376\370\351\343'\317\236==\36"
- #"nJ\231J\231\20\323C"
-) 500
-(
- #"\2029\231\231(\234\6\276`\303\302&\202\213`\0\6\324Z\321\240"
- #"\37\16\207Z\37\34\256O\353Yu\333\2663\316(\34\347\326\224\260"
- #"\r\35\347p>&tH\262\302\305[b@\274\210\210\356m\314\210\24"
- #"\311^\277`sA\300\31M\351`\346\236\361\2D\226\22\340HsN\222"
- #"\246\340A\201\2\230\353\27\342Z\236={v8\34J)\3217w77AB\bGP"
- #"\a\t\20&\4$p\360\b\327\b\17\"\a\320\300n\261\"u"
- #"\17\365\350@LS [\0\21\2252\207\310\220f\31\36149D\357\e3"
- #"\"\262g\30\334\376\21\21\220\347\217\t\21\205jD\330\a\377"
- #"\327\21@\211\271\240\0033#\3\272\246\277\214\273o\333\206\21"
- #"\333\266\365\255\315uJ\35n\357\275\365\226\267B\276Lj\326\233mk'"
- #"\242Z\3534\325|$r7\357\356\335C\322`\2250<\324\264\233]\320\273t"
- #"\24\246\241}\27f\266\320\304\342GADPWUMX\252\345/v\203\207\341"
- #"\354\352T\246\251.7\177\360\303\37\377\331\237\377'u\342\327\337~c"
- #"\375\364\325\27\277\372\352\313_\2\300\355\365\3154-\237|\362"
- #"\311\323\247\317>\376\350\351\343\207\217\256\257\217\5I\n\316R"
- #"ST\225\30'1g\336\254%\6\6\304\351\367\e\340]\31\360\352x"
- #"\265\351v\276?M\205\227R\247\363\264!\236\316w\59\234\264i\203"
- #"<\202\301<\330\b\203\222\214\2780)\234\261\37;\201!\250\en"
- #"\333\271\275\323<c\bD\314\216\246\241\221B\364\202\30M5\222\303"
- #"\351!\272\232#u\323\2345K9\350\332\236\177\372'\207G?\201/\277>"
- #"\3537\300\301A\246\2338\210\24tG\341\300\320\b'\302\210\36\4,"
- #"\315\315Q6\207\r\340l\336\201\225\310\203\244T\0\4dGT\a\354"
- #"\226\202a$\273\217\23\5\30y\204Q\b\"y"
-) 500
-(
- #"\256t\210\335\3\211\326\276N2%\345\305Z\3\0G\322p\0\1\204\b"
- #"4E\200^\210\21\203\4U\261\233\"x\333ZG{\273\235F+6O\313<"
- #"\vRD45f\356\221\273u8o\333\375\371L\"l\260m\375\352\352\212+"
- #"\233wf\236\347\371|\336\\\255Hq\367I\312\331\eF\200\366\326\266"
- #"\3010\23\n\37\354\v\212aiG\27\17\256ps\353\336\335\335\2"
- #"\315\254YJ\367(\2\200\221\246\3520\361r\3154\35n\36>~\376\351"
- #"\355\303\307\207Z\26\242\365\364\352\356\325\313\363\315\203\333"
- #"\233\353\371\260|\374\361\247\237|\357{\267\327\17\36=~p=\37\352"
- #"$\321\315\265q\6_zHI\2220\340\245t\354\340]6\30\216\310\314"
- #"\233kD\334\336\334\234\317g\21\234\271,R\342\355\375\261^y\211"
- #"\327\353\273\326\32\312\322\334\241\24\305\314\364\263\345 fN\30"
- #"\304\306#\367\1\323\365\22\3118\27\240\220\216\300\201\310\21"
- #"!\16\0\324\334{\213\36\3418f\21\267\236A\214\241\211X\261tOC"
- #"\23\4\b\363 \v&\252\323\362\354\243\217_\374\342\320\267\212"
- #"\336\335,\2\323:\25\207A\370\240\35\4` \232E\ap\217N\330-"
- #"\f1\255d\20\305\"m\\\262\370)\21\221B\6w\215\6\312,\0"
- #"\225\32\241\3448\22\27\376\23Q\0\230\252\252R\21D4\313\317\317"
- #"kd \217 \344h\21\241nj\232\20Q\263;\16@\304F\322{3\325\\:\5s"
- #"  Ax\364\336\267m\313q$\337\252\v\274ID\363</K\243\246\314em\r"
- #"\21\vqp\bq\21\321\336\2\2s\311\275\23\370\20q8!yD"
- #"\230\216\226\334\334\275\217O!\"\2f\0\4)u:\0\36\210\227e"
- #"\276\271\271\276\315\331\210\346\t\0Zk\265\326\217?\376\370\366"
- #"\366\346\301\303\333\307\217\237>|\372\3440\37\244"
-) 500
-(
- #"\340\"\0251\2\325\31\4\210\300\334\f\366\fjuO\26@ZS\346"
- #"\5\31#\2609\0317\224\331ia\316\314R\253\206{(\343|\230\347\363j"
- #"\326zsCd\37\330\262\253\252\340\276\356\335m\251\206`\226s\4NK"
- #"\340D\2422,#\237\321t\212\214l\367\335A\1=@\335uL\235.\246\201<"
- #"\324\341\36\32\21T\247\345\372\372\371'\337/\313\25\335\315\276"
- #"\345.\215aD\331\220\372 \245\206\20\"\256\36\335\275\3\30"
- #"\304\346\326\203\266\364\313%\tH\277!\a\37.\37\24\221\222"
- #"\36\312\2664\242\273\16\361\5{8\226\251&I\314!\202X\3\222"
- #"\206\200\352\211\333y6\25\21\0`\341\26\244\341\22\311\343U5u"
- #"\265\f\370#\vDl\314\335\255\231U\26D\204\302\265Vq\211\210m"
- #"\333\266mk\275\a\0002q\221\21\23\1\34\216U\246\271.\302\226}"
- #"\221\210\210\24\352\255m\35=\300<`\244\311\346\4\220\377\26"
- #"\224K\267\224V\273\32\356\356\346@$i\370\4\314\21\303\333Ija"
- #"\232\226\3510I}\375\335o\277}\371\22\265\337\275~\363\372\325["
- #"\"~\362\370\243O>\375\370\346\366\372p\270\232\216\a\2212O\302"
- #"\200\356\n\0\351\361\0\241\241\206\273\257.\2\4\5\245u7\206"
- #"\357O\327@\211\367_\272\233\251\222H)\254[o\353z\230\312\325q>"
- #"\203\335\235\223\f\2\276\273\312\271;\\\314f\366\207-]O"
- #"\204\0235\4\242\221P\222\361/\221\336)y\372\320\1F\252_\0%f\20"
- #"\231\266\346&\16i\303\26DDN\271\342\347\303\325\323\217?9\\=8"
- #"\275>z\353@Fh\bd\340\346@\2106\250\371\354\21\253A\vh\356N\334"
- #"\00157\2778L\203\322\2701\0\367,\253\21s0\202k\334\314\314-,\260"
- #"\30#\262\366\261\222\316\327\253\253Z8\"\271)\0t\267\201\313"
-) 500
-(
- #"\270{*\364\234\230\231\224\20\321\265\233\31\230C\0043\263C\204"
- #"\263\207\2717\355\251\227a\2512i\255\2\0\275\367\256=\321\332\304"
- #"\362\323\t9\201}a\21\256\302\200H\314RJ!\3467w\357\356\357"
- #"\316\326\307\370{\241?\342\356F:l\237>\4G\2\21\22\315\34\251"
- #"$\211\231Y\327\356\r@QL\317\333]\274\335N\347\31\361\355\343"
- #"\307\326\316\363\0247\327\327\37?{\366\321\323\347\313\315\261\326"
- #"\312Sef\363M=\322@@8\323&\330\263\335\213\240\341\360\202\343'\213"
- #"\0~\357\263\223\345%\334R=\255\275\317\314\205\361^\373v\276?"
- #"\\-W\313\261\21\233\237\243\0013\273)\"\22e8n8\6:\32\307"
- #"\afe\271\217p@\364H\23\261\244\313\223\273\273\345\35\261g{\4"
- #"\376^\22`>\25\222\371\34\224_\216 \0\201)\230\36<}\376\340"
- #"\311\363\273\357~\323{\213\315x\307\357z8\"\3\262!\250S\ao"
- #"A-\260!:\222\21\351\260S\23\3170vJ\317\311\264\245B$\4\244H"
- #"\243\267\0W\355\303\214\21,\35\371u\364|9\37hDk=\a\21\0000\357"
- #"\37\34A'\"P\306]\3150\246\334\b\f`\326\214\317\"\303U"
- #"\221\2676 \314ZJ+\265V\21\201D\215 \245\230N[o\330\"b\256\23"
- #"\1\23R\345\22\204LE\270\326Z\31325s\221wy\340b\277\372\22\n"
- #"\241\335\234\356\2623\260\30\nA\"\2\342l\277\t9#\24S\27"
- #"[\2322\206n\367g\355*\323\273W\337\315\3427\207\303\323\307O\237"
- #"<\272y\366\364\321\365\361Jj\255\265\2s\342D\377\375tR\0\0 \0IDAT"
- #"{\252\326X\207:\0002\215|\213<|\b\26\16\32\0.\\#\"\\\231"
- #"\331\221#\302\335\314\324\321\221\201\5k!\300h\333}\350\325R"
- #"\37]a]73\357"
-) 500
-(
- #"D`\226\356h\311\346\4\fDt\b2Lp%\0\200\35xO\271\324\375y\364"
- #"\b\v\266pu\264`\v\v\37\350\264y\270\207\252\346\276$\""
- #"\2048\353#Hf\245a S\20N\313\361\361\343'/\353\34T\24\b\220\335"
- #"\272\272\2473\224\23\231\203\2027Oe \32\261\23\247\37r\6\215z"
- #"\240\207\307\270\302#\206\373\29b\204\207\246\332\324\322E\0\303"
- #"\321\323\205fL\354\265\326:M\346~j[\346\365|p\362\306\35CD`\n"
- #"\357\1\322\367\317\26\a\321\276P\246]\315JD\344\316]Ko"
- #"\265\326\"C\242\227@V3E\17\202$\aRz\2601\27\21Q\346Z\353\234"
- #"\224\372\0350G\200t\314\336s\257\362\213\271\277\347\254\r\3"
- #"]\0261\207@C\207\0\3\16\310LbPD'Wa>T\271\275\275~tsx\366\370"
- #"\366\243'\217\37?\272\271\271>L\245\206yhw\204\326\254\265F\4"
- #"\314\234\256\3774\274\254\231\0z\312\231\207u\306\5\261\213pu\0rJ"
- #"?\230\313\253DD(9\303B!l\336\373\266\201\367\211\370XI;\31\2063"
- #"\1\202a\354ds\fdOQ\260\223\1F\220\205\247\3151\214\25%x\244U"
- #"\275\273QS\353\315\325\315\r\314\302,L5bo\250\"\"B\212\4"
- #"\21\241\as\30@\262l\334E\346\362\344\351\323Z\247N\234\6\307"
- #"\36J\4\200\242D\36\260\271+F3h\21\216\f\304\16\3\224\316L"
- #"\237\261\321\2411\234#\302\36j\20\276w\243\352\266\333\347\200"
- #"\3018^\211\370;\302\244\375\334\266u\353f6\374\355\334\335}\27"
- #"\243\230\17\23\207\3379|\371B'T\270\vj\"\322\346\37\1\314"
- #"\321\2658i\370d\5\323\3047\a\t\210Bl]\215\34\30,\274\224"
- #"\"\323RJ\251\0\245\224i\236E*b\346\333H\300\360LI>0!\6\2"
- #"\a"
-) 500
-(
- #"\306^\213\2630\355\v\244\374)\206\201\370\260\350\305R\4\5"
- #"\375\301\325\364\354\361\303\347\317\237?{\364\360\371\223\a\217o"
- #"\257\227\271\24bpu%\323\bw\5\303\b\327\334\302\3\342(\261"
- #"\264\267z\260\337\312\243\347K\201\235\31\3430N\315\6~\327\240@"
- #"\21\1\n\304\250\223\250\261y\357m\345\302\207\211TKs\0bG\0017D"
- #"\314$\257Lp\263\24\200\243+\6\230\23\214\256)\251\371\331\373zD"
- #"\4\252[o\326=\262\2\2309\355\357\327\2457\225R\2700\38\6"
- #"\214\347^\300C\204\16\17\237<^\246C\343j\303\3243\09\230"
- #"\"\207m\367\216\321\2012\364\v\3\0021\227H\3731\300Hts\277"
- #"\245v\371\246\271\17\\-\217`\366\364\346f\346\304\273\270\244"
- #"\267\373\323z:\235[k\314\234\375\304\350\256v\255\306\245\347"
- #"\371\17\217`\320\373\357\233\321+\251\361\23\242\210P\f4\215"
- #"\210\364\362J{\20\4L\261\211\357L\340i\232\312<'\262]J)\313"
- #"\304\245\\v\206y\4\307`\221\357\360.g\274LK\36\36\356\224\230"
- #",\21\216^\233\t\5\21\253L7\207\aB\345\223gO>\375\364\323"
- #"\347O\237\36\227\303\365\325Q\b)\334\255k3p\267\346f\6\342\323"
- #"4M\323\222!\5\21\21\26\346\356\240\371\252\2\300x\370?xAb"
- #"\a\221\363\301\260\21\337\a\227\27\a\21\347Z\254\v\206"
- #"\203k\230\26\236\213@\30\364\0Dh\356{s\276?\315\3733F\300\320\r"
- #"\203\34,_\b\0P\357\252\232l\32\r0\215T2z \344\v\16y\373"
- #"\216\307F&\311 G\27\251\352&\\\301\241\314\325N\257\237?y\272"
- #"\34\313w\261\6\2069\22\34Y\4\v5\327M\265\1\30I\0174d"
- #"\342\251\231\272\201\a\22\25\e\266\265AD\202i\224;\250;\200h."
- #"\206\330\303=\300\0\34\334\r\""
-) 500
-(
- #"4\20\2\207\365d\202#oNo#\3029\314[\276f\204\216\234\34\""
- #"\310\213\325\ta7\213\210\234\a\307>\334\337\337\rY\234r\0060c"
- #"$\1\266P!e$\26\254\310\4(\245\232\31\4\300\204\\\3124M"
- #"\3232Ou*Rd\252\3232[\370<\317\\\313T+\20\252*A\244\260\b"
- #"\206f\314\233\235=\314r\342\3B.\231\355 H\245\bW),\245L\205\270"
- #"J\231\246\345x\270]\346\343\263'O\256\16\207e\26)\0\260\366"
- #"\260\363\233\225\231k\255c\212b^\226\205\5\321\225\323\fE"
- #"\323\222\336\223GSJ\311\303\201\210\220\365GXD\202k\302\354h\301"
- #"\4\4\344\304\16(\\S$\322\324\352\\\210\217\350\16\375L"
- #"\\z\367B@\304\253n\346J\210\bf\21\236\246y\236+Y\36I\34>\30"
- #"\251\220{\3231\347R\202rY\25\363\235O/+\0(\273\253\354ph\2575\355,"
- #"\250\326\t\265\247Y\340T+\321\325\361xd.\314\274\1\206\e\0p"
- #"\251T\310\e\30\272\241\1\t!\2\4`\20Q\204Avr\224\337x"
- #"_\22d+\b\0\201\356\203\267\327\264\347\365\344\351X\230nM\21"
- #"\342\37X\311^\214{#\220\31\306-\3\300i\30\234/\367\376\314"
- #"\357\177\352\362\313|r\341\203\17\333_\16\313\2246\214\f^"
- #"\v\240Z\253\205\247\307T\2666\314<MS\2212MS]\16\3232o\2551"
- #"\227Z\346e>\222\365\326Z\206\271qJn\335\335\215\f3\24+\237vD&"
- #"\"B)\\\230YP\252\224Zk\25\2512Mu\2719\314\363<\35\nT\324"
- #"\330\326u=\307\371\16\21\263G\317\237a\232\246eY\20J^T\36"
- #"\250#:!\325h\200\210\"4\246\327<!C\3246l\5`\\x\357\25"
- #"\214\314I#\ru\230H\352$n\35\0Zk\16A\300\2018U\1\313o"
-) 500
-(
- #"\30\273\251Q\202-\224\262\222\34M\303\23\344\30\370s\362<\307Nk"
- #"\224\3761\223\21\221P\20\221\3208\202\210(C\321\353\20j\246\251?"
- #"\2U-\21\307\343\261\314S\0\251\e8\240\260\23;JG\337\274u@f"
- #"\2\312\2347\335{\241\210\b4\"\304t\f4\260\254\16\356a\221v"
- #"\214\343\3v\332c@\336\32\271\372\306\367\347\310b\337G\356\211?"
- #"\273< \366s\372\341!\273\24\235\313\257q\377}Lt+k\tF\352\264"
- #"\25\234!\215\317\211\213t3f\23\336\205Z\251@)e\232\246\303\361"
- #"8O\a\244\363a:^\37n)\312\252\333\266mk[\315\214\320\210H"
- #"\255\201v5\304 D\340L\252KS'J\317\20*D\225i.\265\260\314\265LE\304"
- #"\225{\323\323}C\270\357\253\273\237\362\215\21&\242y\251\f^"
- #"\4MI7n\350}\313\230\235\21K\306\314\4\202D\26\316\304\3]"
- #"\37\323\6\347g\"d\374\257\303%k7\202Y\"\302M{7\237J\2555\220"
- #"\272BXC\312\320\n\232\3532\260\235\335\3342\"W\370\343\25\32"
- #"\30j\fB\215A\304\216D\217\262=\336\212\261\244a\"\"\347!e"
- #"\37\f~\351\32\314dj\233Z\0.\313b]\357\317\247\311\267\351"
- #"\260\34\256\216\6\261\271&\25\354n\353\326lU[\325\201P\3001"
- #"\260\207G\4C\4fs\206\220\276\35c*$s\310\4\341\354\0224\177"
- #"\310\21$\347\37\36\235\364\277!\224\3379O\344{;\27CV\375\276"
- #"\333\331\217\327\a\315\315\357\375G\374\356\355\230\237\237f\t"
- #"\30\236A\"\236\311%\252J\344\331\274\347%\32PD\n\347t>;\341"
- #"\325\361\346\346\372\36\201'\267\265\254e}\327{\a0\0211\3370\210"
- #"\251\230]\242B\20q\20\332\300\24\3!\b\302\303;\22\204"
- #"\21p\363\16jv\n\265m=\tE\204"
-) 500
-(
- #"01s\235K\255\2650Z\351+\336k\333Z[\347y.\245\360\376Q\n\3234"
- #"\5gX\2233\363\236\366\21D8\352F\0\200a\4\304\360|\36\317/!"
- #"\2\206\301\272m\"\4$\24dfH\0\336\302P-j\235j\3325\222\350"
- #"\320\24c\2421Y9!2\323\f\362\24\2461i&\224\354\26\347\371"
- #"\376\322~\4\21\2218\35\313!\220\202(\344\355\375VDT7\306\314"
- #"\va\323\210\326*\23\221\324y1D\247\304x\264m[s\f E\27\22"
- #"\0L\227\"B2\37D\356\334\22\356\v\202\254\242\21#\344C}\3442"
- #"]N\t\306n\f\234O5\6\360\207\321.D\27&\312\245\21\36\315"
- #"\357\357U\336\17\16\337\357\325\337\17\177\231wr\16%\227\204"
- #"\356L\300C\36=J\230k\35319\3W\226\222\5\224%\20\36\\\337"
- #"\334>8\271\331\272m`\0366S\20Q\324Z\3*a=\204oM\267vv\367\361\260"
- #"\205\271\207\244\356\5\334B\315\250\23\240!v\4t\3\316\325"
- #"\334\345`\225\2\25&\2638\255-\220\305\270\326\352HD\202\30\4%"
- #"\203\0\22\362\37\201\244y\367x$\265\2163\215\354\3\205oD\0\372{"
- #"\376e\270\210\30\263\252\336\237\326\0bA\360\230hr\267P\r\5"
- #"\6\315\371\v\231t\327i\270G\242\r\318m)\262\4p\au\210"
- #"\21\336\v\266\323\272\362\34\344},\351\261\201\tdC\222!"
- #"\344~\r\244F\1u\2220\177s\327\20|!2\304m\335\2\241\273"
- #"\21s\357\272\231\256\275\367\0\226\n\302P\30\210\263\37\6$s'"
- #"$\244}F\305d\321\204_\306\330\30\313\242q9\344m\236\2468\341\230)Z"
- #"(\4\274\273=$\371\202\1\300\314\232n\0\220o\352%\334\341\367"
- #"\216c\366y\0\220\330\307\376\233\37^\2019\304\\\30\347i'2,"
- #"\221Ed\256SA"
-) 500
-(
- #"\n3\357\212\36B,\304\214T\2008\242\"?8\36N\17\256l;m\333\371"
- #"b6Z\n\327:\201W\257\274\231\232o\252\32\256D\211TCD>\361\0I\375t"
- #"d\r\vp\300\rL\2508\2Gq\a`\302\0!\266\0S3\334HX\246\205"
- #"\367\307\203\0\vs\251\\\212p\21\21\341\302\227.0\357\370\244"
- #"\312\2x\312\366\20\331w\3659\216M.ZO\3330FD\v\337z\253Q\230"
- #"\bM\243\273i'\24\f\237&1\4\207 \336\301\177\302\0\310<\245"
- #"\210 \16\0\362\300\364\203N\2561\0\220\305^\22!\251}\311#"
- #"\37V\301<\276\22\21\311\26D\26H\304P\34:;F@E^\333\326\3266"
- #"/K\20\32\204\272\251[wKR_\341\232\vo\213\314'\4\304\22"
- #"\227\247\r\234\20\a\22\236\f\277\321\206\215<\2674\25a\334"
- #"\177&\0\336\31o\21\261'V\240\24\26\21K\331\21ADd\3217\260\330"
- #"\361\205@\276\34q\372\300A\347\377\267R\3\0\342{\\*\366\300"
- #"\243\17\377\210\273\247\377\\\16\327\344!\200\204\21\256"
- #"\2000\315r\373\340\252\365\363\273\373w\332@\b\vO\265\326ZgU"
- #"\225\36[74\34\264^@B2\bB\30N\t\236\16\3=\243;\335Hj"
- #"MZM\262\1\",\224\5A9o\216B\30\214 \204L@\20,X\nO\323\224"
- #"\241\264\265\26.\202\210,\5\0\34\3\t8\223\235\0064I\243("
- #"\5yr\f\210\21\18\202\20\202\3124\215\fy\nf\34\4}U*%"
- #"\314\253\220\23w3\24\32\25#\277\6a\4\231\31\23f;\345\216"
- #"\24\356\316\0261\210\332\227v\b\20\21Kb\351\373\03632_\215PN"
- #"\233\t\1\204\271\5\201U)\340~\327\332\221:1\335<|$\265\230C7K"
- #"fk\4`\250\273f+\n\0AL\304\21\201\1\216:@"
-) 500
-(
- #"\371\360\300\360\17\nq\366\257\0\220\323\25#\t\22\23\27$J"
- #"\257\343\261\274\330{]\242\"ED\322\321\221\30\334\235\306-"
- #"\230\260\266G\204\223_\206\233\275R\270\177`g\362{\37\21\37t\212"
- #"46\35L\311Jrk\35\0\241V\"\2\17\357j]\243\246\201\210\3y"
- #")r\265\314\353\325\361\352\352\240\252\6\301T\353<1M\260m\324\264"
- #"P\361tL\b\4\300\21\206\23#\36\0253O*\230\2\300-\310\\"
- #"\273\27\"sp\n\vb\22\246\"\\\230\230y\236\352\\\2440"
- #"\nA\21\230f.\304\"\222T\27\32\2\225\334\342\260\273S\\"
- #"\346\206\21\321\vc/\300\36\26\2161r\331\206\2742\321\234\0351"
- #"\vb\346\356\352nf(a\256D\204\214\16L\"\356\356\256\0C\377?8"
- #"\371<h\372H#V0\0\302C\3120\350\6\0\364\367\325/e\310\373Z8\210Bt"
- #"\353!\324C\1\221\321\303z@?\26\271[\317\327\20\17o\36"
- #"\204\302Fq&\350\n\n\0R,5\300\245L \20\214\341n\200\340\36\341"
- #"h\201A\4D\330\0354\334\324\"\242\224\"\"\256\26\21\314"
- #"\371\223\5g\252%8\2022Kn\276\360\375\356\4U\335\275g\251\35"
- #"\272\3\360\274\263\314\222\2\207\350\301\200\204%\367\342\3"
- #"\270\216\1\325\6$[<Y);\251<\306\325\230o\36\300\buW\325"
- #"\216\235\244\204\365\266\236{\221\273\327\337M\f\23\3\333B\21"
- #"T\230\235\247\303\r9Z\263\231\344\365\335\4\200$\214P\204\21"
- #"\301YbR.gn\255\31x\357\35;re\17\315\2043\202@\307\334D\2059\25r"
- #"W\256\v\0211\222\20/u\236\244^\37\256\223\2323\261,\323|\230"
- #"'aFw\346\244\245R\362\223\335\235>\350\211\307\f\16\261[\317g"
- #"\234\201q\354n[A\356\232Z\354LZ\237\244\n#\250Et_O"
-) 500
-(
- #"\255\a#\27 k=\232\201BW'\0260\n\v5\310x\34w#as\264\21c\343"
- #"\210@\350\16\215\34\21\311\35\208\353\36\262\345\bL\30\20"
- #"\3041\36\22\4\244\b\311\247\263\24\n\260B\4\356\314\30`"
- #"\2104\325\345\376\376\334\232\266\246n9\311g\241\36y!\243\5"
- #"\211\310\205$R\240\347\337> \335W\1sC|\351\202\1 1!p\277\344"
- #"\352\216!#43\31sp\1\0\35Fw\21\21\300\344\356Y|\315z\222"
- #"\240.\2456w\364\251\346Kdz\264\200\373\302\352\362o\372\300\237\357"
- #"\322\21\372>0\345Y44\243\244)j[\267V\267m\333Jq\221E\b\270"
- #"\360<\327G\17\37\0\270L\322\273\31\204Y\332G\314\323\304f\266,K"
- #"\357}\333\326\323\351\32428)7X\261\e.\"\26\226RJ\342\262s]j"
- #"\255\30PJY\16uY\246\251\3224\225:\227y\236\247\271\212H\21Iv\5"
- #"\"\2029^\304c;C\233\210\322\353\21\366j\20\341$26T\203^O"
- #"\230iW\21\0 HS\255\"d\320\264YW\227\200\363z6\207\273u-(\207\353"
- #"^\257\216[\327\261qDIz\224\232\273Gk&\245D\204G\217\214\304C"
- #"\6\204\21\2300\314\350\0201\263\372\0\222\242\362\201\307)\"J-"
- #"\302\214e&7=T\ts\22\304\320\303\341h\333\273_}\376\302\1\221D}"
- #"M..\r\375|\326\363\21\235\220\337,\321\22L\306N\256\"\201\203"
- #"\34\323\351\306/\336\232\300\234\35 @\270%\3217F|\27\2228\216"
- #"\rv\206&\272kD\204\301e\306\34\a%\t\210$I\210\202\35\270"
- #"\3660w\37F\217\303\352)\20\31<\20\231\206\265\367\357\214\322"
- #"\230\324\316\361g3B\\\267\3367\355\353\272\326R\326\323\31\346("
- #"\323RX\322\201m^\344p\250\3077\323\375\375\371\264"
-) 500
-(
- #"\256\353\252\bVxr\230T\365x<\272\373\351t\232\353\234\346\270\314"
- #"\34\226\271@\0035\256,)'@\304Z\244\224\302h\245\224\343\241\316s"
- #"\251\23\325\211\346I\226\271\314\363\304\3149\260\27\31\251Z\0"
- #"\300L\357)BI\332\200\367\3\320\a\317\330\30\324\362\261\314"
- #"\23h\20\256\6\30\350!\200\340`9P\a\206\231\e\274}\373"
- #"\366\273\27_\277z{\372\370\a\177X\352\354\304\\\244[8t\365@"
- #"D\252\22H\247\363\312\273Z \371\202\252\352\336\vK\22#3\214\216"
- #"\210\220r\0353\250\2\27\367A9.S)\314\342n01qa'\"\27\216\376"
- #"\333\337\334\375\362\357>\277\337\266\256\1\230\216\32h\241\21"
- #"\220t\347`\201K\302*\355\254\244\35@\3163\21DL\2\243L\b\0\344"
- #"\332;7\336\373\374\22\227!\303w\372\302\345\345\313\265w~A\333"
- #"\351\25\21\343\256\265\336\207\242\17\370\2\\\303\0\255G3"
- #"\262[E\345\277\223\2609\352T\276p<\314\227\306\325\330]\305"
- #"\311\\\315\324\315\254\365\276\265\302B\340\2101\25\256U\352,"
- #"\363<\325\211\337\276\275\273\273\277\177\373\366\236\321\20J\vk"
- #"\ef\34\353q\232\257\346E-\"\242\260\344\35\2334\vf.<T\350"
- #"\2108\25*\225\t\242T>,\265V\231'\"2@e\211\204\2\35)\"\4"
- #"\231\263\202B&\234\1\215h\3104F\r\317\205M\236\v\206\35\252u"
- #"\4\300\3147E\3$a\312\2278o\rB\304\21\245\36\314|\367\346"
- #"\315\213\317\177\375\177\376\233\177{\373\344\371\217\377\376?\374"
- #"\303\37\375\361\361\346\372x}KE\0\271\3\270E2\233*\247\262\202<"
- #"\302\272\22\5@\20\346\371\3032\0\372\254\2300\302\317\1#b\210"
- #"L\302\345\260\224i\252\36+\232ph\225\251\205\1!\30S]n\237"
- #"<\177\370\344\223W\367\357\314{\251E"
-) 500
-(
- #"\333\206\2244\211\344\306\332\345R\315I#uW\32t94\331)\357Gp\337r_F"
- #"\a\214\0000\264\335~\301\267\335\207\345r\4\363\330\345W\eE\371"
- #"\375\a\305@\336G\6qDPf\277A\177\177\303\3555\210\2102\340\5G>"
- #"m&M\216N\371\303\352\234?\1\0X\230\231\266\276\26e\325f}3\233"
- #"\247i\2\0a\1<\26\306i*\302|_9\234\326\255\257\201\300Tk\255R"
- #"\346:\251\252\252\347<\350\251\234\17H\204\331\335\301\35\21\347"
- #"Ij\25&\257U\16s\21\221if\"\242\222\222$`\"\2b\244<\262)o@s"
- #"0\17\211\313\3371>\370+\214\"\215@\340\311\371\303\360\\\321"
- #"\5\2x\362\f\b|\307]\335\335};\257\275\333\313\227/\177"
- #"\376\363\237\377\354g?\3\231\376\346o\377\356\373?\374\177\377"
- #"\301\237\376\303'\37}r\363\340\301\264\\\323T\20D\2542\363\332"
- #"\0251\0223\"d7`\"\342\\\4\203\0202\207\\\212\361\220\376"
- #"\374\316B\213\377\233\177\374\277\315\23#\366\302@\240U\310\0002\t"
- #"n\236\246\333\353\353'O\36w\353\337|\373\2156\5W`\310\231\233"
- #"\2710\361\373\334\350\21\330\340\264\353\370F\360\354\16\304\1"
- #"\304\205\312\355\356<\310K\371fC\f\246\2145U\317\233\320G\315\315"
- #"OK\2627\0E\0\244\20301 c`)S)\365=\"\3\201\204\26\n\3.\30"
- #"\205\210Y\210H\252\3200\266C\204\240\0D\340\0&\32Is\341\351\37Z"
- #"\247y\256SaAD\22\n\210\274\305\271H)%\35\245\2\234Y\212\260"
- #"\20\2475\216ZO\376\257 \va\"\213\205IH\346i\232K\255\"Eh\236"
- #"j\21\26\246Z\270\26\231kY\226z\230\246\3032\317S)\"R\3124%IB"
- #"\200$k\n\21\273\332\376\303\3\320\3167\311\325,\245\277\4"
- #"]"
-) 500
-(
- #"\370\31\230m`@\352=2t\1\206\v.d\304\37\21\1`X\270\2736\275"
- #";\335}\371\3657\177\363\363\237\377\253\277\370\213\337|\373\335"
- #"\233w\357\336\334\275}\361\342\327\277\372\365\257^~\363\233\337"
- #"\276\372\356|\177\277m[;\257\333\326\264\265d\351\23\20!"
- #"\355\326\3\0\350SebH>\"\23\302N\325\313\306\177\354N=0@\352"
- #"\304\"\310B\256&\314\20\301@\0\324T9\360\17\177\364\307\17o"
- #"\257\3\365\305\27\237\177\375\305\vd@\330\2\314 4\264@&,\1"
- #"\20\4d\203\222\363(\330\5\216\301txIJtrg\310\314\248.\272\332"
- #"]\25\25\21\255\367\321\371\276\247\34\215S\364\341\323\223"
- #"\205\25\0\210\a{\n\21\335\322\357(<\251\370\37\20\227\362"
- #"\26dfBI%\f$f\346C\337\222\357\231\206\273E\0b\300\334\326M\247Y"
- #"\231!N'63\0261SYdY&\232XU\303\200\221j\231\341(\210|\177\177\232"
- #"\267\255\212\244\3148b0\21k\255\340\220\336\210\302C\306\312L\3145"
- #"\237\304IJ-\265\b\324R\231\311\335\t\230Q\20\330\r\242+0\3"
- #"\r\265@\4\24L\3;\206\324\177Ep\346\25013\263\341\370M\0\20$"
- #"\21000@@\36\330\236\273s\21\0\264\210\224\351\250\351i=\337\275{"
- #"\363\325\27\237\377\354g\377\356g\377\317_\377\315\337\376\215\206"
- #"X\220ik\255\335\375\373\267\257~\363\355_\375\273\277\274\276z\370"
- #"\350\331\323\307\217\237=\371\350\371\243\307\317o\37=\271}\364"
- #"\350\341\303\207\265\326\302</\265T\302\0\342d'\3\354L\222}_0\210"
- #"\345\270#\262B\344\1\306\214\341Q\230\267\325\200\320-X\244\23772"
- #";\235\327\343\315\303\253\353\207\\_Z\267\321\276\275'0\177(\6x"
- #"\337\5_\312\1\274'\366\1\354Y\310\210\230\272\265\204B"
-) 500
-(
- #"\354=\371\0`\330e\303\5N\366\337\371\0064\306\335]\262\257n"
- #"\t%_&\356\235\240:\252P\376m\23K+\245dy\315\317\217\321\244#Bz "
- #"\6\0\230\231\3`\300\332[k\315\312\244\240\333\266ED\331V`"
- #"\272j\315\314\2462\253\16\30263\325J\252z>\257\363<\21q[\267"
- #"\373\373so\36n\210\\D\20\331\314\",\231\4\21\316,\307\303"
- #"\234\316-D$B\302\302T8_aG\267! \222\324\235D\264\336\262\"\357"
- #"s\341\245\2168\\l\240\210\306\2761/B\2O\266^  \4\272\a(@"
- #"\17K\215L \272\373\375\351\364\3657_\177\363\342\313\237\376\337"
- #"\177\361\227\177\371\323\27_|\325MY\4\315\317\347\373\b\4"
- #"\226\267\357^\265W\366\222~\363\305\227\237!\24\231\247\345p"
- #"\375\351\17~\364\17\376\364\317\376\374\317\377\343\347\317\237"
- #"\227\271\316\323a\252a\326.\275M\244WuZN\354\204\206\17O\210\324"
- #"\352f\251F\27\245\242\260a a\274y\373\256\257\375\345\375\371\353o"
- #"\317\357N\370\351\37\374\361/~\361\v@$\0247\5\3424a\6\325"
- #"\"\204\210\303\377\352\275\223\370\320D\202:\6\346\332\236\210"
- #"\334`\213\f\224\2\367\360\304\211R_\227\2501f\274\354\300\276"
- #"\"\362\316\335\327.\21\200ta\34!\"\2408\312\340\211\b"
- #"\v\n\6\3\300\340\vR\3760\236\302lw\315)\36\3\3\211"
- #"\221\34=7\211\b\f@\246\306\310\3327a\354\275[\270!\5"
- #"\261\273\272\242\336\335\31\242\257k\270F\340t\274\272?\237Z\357B$"
- #"\4\307\351 \327x\2525\34N@\326=lK\276s\333,-\37\1\2747\213"
- #"\300Zk-%\324\2\225\306\212\306r\265\21\1\351\264\244\321Q\210"
- #"\210\202\221Ke\300\336V,\25\204T\235\31\0D\25\322=F\223\205P\""
- #"4\355P\5(\34"
-) 500
-(
- #"BG\373\20714d\32\20\344L$\250\350H\321`\v\377\346\2737\377\362'"
- #"?\375\253\237\376\345W\277\376\365\267/\277\331\254K\255\347\325"
- #"\f\251L\b\30\"\235L\351\324\346\272\bA\353\247\363v\334"
- #"\356:\301g\23\342\355A\364\364\275'\37?\v\177\4\267\a\""
- #"\332:\226R=t\256\245\365\225@E\330\254{d\212\30\356\234\2\342"
- #"\377\362\177\370_\334\3\1\265\273k\364\246$\365t\277\275~\365"
- #"\366tw~\375\352\335\343\a\267\37?\177zu\234\376\355\277\371\277t"
- #"\275\vN\232)\0\246\207\37eW\227]\27\206_V\323y\240.\f5\334"
- #"\241I\377\17\372\274\301\305\312b\212Y5\371\2X\344\27\206l\1"
- #"\t\201(\e\333$\306\345\256\240\260\324R\252P\21\346\213\364c"
- #"\267u\207=W\34\3\314;\206#\354\274\262\30\231x9\27\207;\1"
- #"\232\2330\23\363T\352q>T)Ex\267\244-\207\343\325\361\372z\271:\226"
- #"\251&\322\234\315q\376\f\216iGL\360\1z5\236\236\1\260\3\""
- #"13\263@\204Z\203=\220c\230\202{ds\22;\307\16\336\247t\0I:&\362n5"
- #"\31\303\316\e\200\211Q\210wc?H\333\36\17\4J\302:\20\"$*"
- #"\223,BR0@\t\244\177\375\27?\371\337\377\305\377\361\331g/\276"
- #"\371\356\e\363hj\3277O~\364'\177\246\6\212\264\251\236\326\25"
- #"\251\24\251\201\260\365s\263\226|\250\273\273\327\337|\375\345\257"
- #"_|\366\345\27/N\247{p'\244\260@\0!\311\35\203 \326:\211\260"
- #"\231\357M8 \202'\220\361_\375\217\377\324=\302P\25\302\243m\36"
- #"\200\237\375\352\213\237\374\344\247\317\236|t}u3\225\332\266\373"
- #"\260\366\257\376\345\277P\3330:\23\204\232pA\0\2*\314\20\201"
- #"\273R\357\3758\6\210\0\226~ZC\333\236\371\31\341C"
-) 500
-(
- #"\303\271\317\272\341\227\2369\231\4L(DL<Rt\"`\370\277\3570'\222"
- #"\2200\361TJa\316\326^\206\t\16D\4\346\364\22\236\341#8\210"
- #"CN\341\204#?#\377I\241\35\"\346\341\243\301\276&@b\342\303\274"
- #"\324R\253p\3566\230hY\226\303\341P\217\v\27\31\211\220\356\230"
- #"\336\300y\205\3 \21\22G\0001\263\324\b\200A-Np\"K\4t\325p"
- #"\315\326#.\330\370{\231w \23\22\16\216%\204C\266\200\2#\203"
- #"\r3\350 }l\21\201\211\30\t\367Z\237\356\226\251\215a\342\341m"
- #"5\372u\4\"wZ\273!M\277\374\354\313_\376\362\305\267\257\337"
- #"\236\326\26\"[\363\233\307\37\375g\377\371\177\361\360\331"
- #"\367\267@\5\242:\247\370\315\335\t\225\v\6\252\331Z\211\300"
- #"\273n\347\357\276\371\352\305\213\317\277\370\374\327\357\336\276A"
- #"\a\n\231\313<M38D\200Y\0\22\263\4\r\20\b\6\20F\374_"
- #"\377O\377\3343\203\332\0\221\265\373y\355\177\365W\177MX>\371\350{"
- #"\302\265\235\317\333z\367\3557_\375\325O\377uo'\3646\tk\323\344"
- #"\230\23r\21\316\a8[\316K\245\a\a\4\320\260\v\216\22"
- #"cIv\301\356\367\236\340\262T'\274\\X9\251\275g\232\0\17\b\17"
- #"\211\221\205\313T\247\251Nu(\3110Y\5\341n\326\3354\35\374\363"
- #"\353\323\30\330\220\1\205\261\02011#!\fG\370\213\346\3033y"
- #"\21\200\220<\2\3')\265\224\302%ih\204\\\247y^\16uY\230"
- #"\305\1l\334\\\36\21\275\367\b\317\36\221\210=\263\212h\210"
- #"/\335/%\201\0\20\fL\373\30j\1.K\302\213\273\203\357vM\252\275"
- #"\367n\356\21\316@L\224{\237\240\360\275\245\313\361*\20r\313\271"
- #"\353K\300\325\a\\\223\267\17\202\201\232\231#\230\a\227\251"
- #"\el\6\6\25\353"
-) 500
-(
- #"Uw\374\356\267\277=\255-\202{\2272\337\376\243\177\364\237\376\340G"
- #"?>\34\37\0\211u\317Lf\363\206\241\26:\325\322\267\246\332]"
- #"\335U\255\367\267\257^\177\366\331\347\277\370\371/\277}\371\362"
- #"\365w\257\233\32\241L\363\f\300\351\213W\ne\240`^\242\210"
- #"\300\377\355?\371\347\31\261\210\200\30\340\346m\333~\365\313_=x"
- #"\370\340\352x<\237\356\317w\357N\367\277\375\365\347\177\373\313"
- #"\177\377\327\353\333\357\230\2740\365\256\314\342\356\210$\234v]"
- #"\343>\213\375\3\6o\314/w\343>b\4dj\310\357 |\243X\17\271\327"
- #"\376\262\345\21\314\301\"a\262Z\312T\352T\353Tk\221\"\270\327}"
- #"wp\273x)&w))\313L\251^!F\252L\214\304\303\250\354\375\216$/"
- #"\327\34T\303\3\b\335\206\331w\21\26.\224zP\3042M\3632O\307C"
- #"\235&\26\36\20\353H\2524@\357]\335\35\0s\272\206p\355\255"
- #"\265\325Lit\242CF\346\356\204\316\351ab\26j\332\272\253\345\2555"
- #"\366\340\0\346\246\2520\270\16\343\301\316K$#\245\230\310wb9!"
- #"\r\261Yv8\273\207\325(\304\1\36n\36\356\246\16,\205xzs\326"
- #"\36\302\345P\3122-\263[\274\372\372\267\310\v\322\374G?\374"
- #"\343\347\237~\372'\177\377O\177\370\303\277w<\334`\210\273#\4Kr"
- #"\377\304]X*\23GD\327\336Z?\337\237\333\271\277\370\342\213/~"
- #"\375\305\27_}\375\346\365\e$~x\373\250\316\223\233q\335\3551\263"
- #"C\5\344\377\356\237\3743FHZ9&\31\f\243\2653\204\367m}\361\331g"
- #"\337}\363\345\313o>{\361\331\337\276\372\366+f\357\333\2110\23\273"
- #"\363M$b4\367\235\37\344\16\373i\314G\236.\315P\226\324qa\354\225"
- #"\227pGN\306\376=E\a\203\254\212\357\301\24"
-) 500
-(
- #"\306\"\\k\231k\235k\251E\4\221 <\255\302\314\334\374bq\220"
- #"\235\20&p\206$\300\4\304\210B$\204\222\233\365\234(\207p%\373O"
- #"\16\317\347$\0G\242Fa\22\36\254\301\354.J\235\346y\231\226e^"
- #"\26\251\25\2112\365\20\21\bIu\353\275\233\366TDCD\250Z\357"
- #"\356\35\302\207<+]j=\334\\\b\230(E4\227I\256\224\202\1"
- #"\326u\34\301\260\310u\16\200\271z\230\233\"D\336\177)\352s7\310"
- #"\351._\321\310/8\34>\206\360}P\25\206\r\23I\355\21k\207\315"
- #"\300\242(\226\303\361\301rX\346\272|\361\305\227\333\251\277\273"
- #"\333>\375\364\373\177\370\303\37\272\307\363\217\277\367\344\351"
- #"\307\317\236~\264\34\2563\213\316yF9J9\2M\352\341\300\204$\245v"
- #"\325\326\232\203\237O\353\313\337~\373\305\227_\275z\375\372\361"
- #"\263g\217\36?f\21\300\360\360\34\241\302\321=\370\277\377\237"
- #"\377\327Z\212 \24\21\"\257\225\377?\262\336\364\271\222\354\272"
- #"\23;\333\275\231\371\36P\0\252\253\253\233\315^\311\346*kd\312"
- #"\346X\213G\263h\302v\310\37\355\317\0231_\374\315\363q\34\366\377"
- #"\344\b\317\214#\306a{\306\2361\251\240\30RH\242(\356\354n\366V"
- #"\275T\25\252\0\274\3672\357\275\347\34\17787\37@\n\321Q\201."
- #"\240\36\3602O\236{\226\337\222\22m6\371\354\374\236\326\5\335"
- #"^\177\365\341\227\337zu\177\363\344\323\217\337s\235\17\207+pC"
- #"\244(-\3\3i\356\235'\333\321\271\02050\21u/*\350\365V?/\314"
- #"\b\273\373\311\255\336\16\221HTt$\34\267\236\231XR\22\221,IDR"
- #"\314\177\373\24\272\251\326\326\364\330\337\364\250\356\214\5D$A"
- #"\354\321\3($\231D\230\326`ZG\227k\16\246\256\237\r\346\346\b"
- #"\246\n\b\334\235\\z"
-) 500
-(
- #"\261hf\314\234\203\\7\216\222$\n\\\350\rG[\16\207VKk"
- #"\325\1\5\321\315j+\252\315\325B\366\326\315\264E\214\232ic&\""
- #"r\215\203\bL\25\34\206<\270y\253\325\335\300\335\342\237\307"
- #"\206\327\24\314j\210\253\36! \0\245U3\203\316.\205\256ch\6"
- #"\1\216\n\177\242(\0000\22'\23\247b\266\233\eP\232\2537\347q"
- #"\332 \313\203\27\37\354o\366\237~\372\231+\252\372[_\371\362+"
- #"\257\275Z\335\267\247gg/<\374\302\27\272\365\250\326\0\0 \0IDAT_"
- #"\177\355\313_}\371\265\267^x\371\315\363\373\257\334;{\27099\313"
- #"\343Vrn\16,\311AI\250U\215\272\177\251\313\315n\377\306[o\276"
- #"\370\362\278\t\230\232\5\3755 >()%\241\204^\30E(R\316\362"
- #"\322\303\213\245\330\313/\274\300\314\313\3155\352\362\223\37\236"
- #"\256c\205\30l\346\20\37?f8\355\35q_\212\3\4*\"\304.:\313?"
- #"\276\371\250\321\v\267\2331rw!f\356\302~}U\321G{\30@\246~\247"
- #"\325\24\25\1\274En\270]\367\365\266\21\334\335\0310\302\216"
- #"\327\4\226\30E\204\311n\177\333\273.ia\302\335\235\243\34\242"
- #"\310s\253\332\346y\26\347\204\224\214Ll\236\347\303\341\260\314uYj"
- #"\2525\21\r)\221\371\262h+\325\2749(X\3@\24\1pW\vOsX\303Bk"
- #"s\17P1XS\303.cL\210\255V\304\320\325$pW5D4PDL\356h\236\306lf\265)"
- #"\23\321\262x\307\20i\213\322\205P\2443o\272\vf`\247@\334\320"
- #"\\WF\37\e\370RfJ\243$\230\265=~\374\244\341f\263=\273\270\270"
- #"\200\263\323\337\377\303?x\367\335\367\236<~\376\321\243\217\256"
- #"\367\327\315t{zJ2\372\241\234oN.^z\361\245W\337,\332"
-) 500
-(
- #"\254\232\36\16\373\253\347\3277Ow\317\237~\360\376/\237~\376\311'"
- #"\237||\330\337\270{m\r\215&\3314o}\346\332\fR\254qc5J\0\20\316"
- #"/\272\35\b\321=sk\206\224\264\301$N\300\207\371\372\344|,\273="
- #"\352!e\21\241\224\30\34LC\261\236\211@\261\2\30R\6'\204"
- #"\204N\346\212n@\25\21\35\311\24\217\333i3#Ct\342\220Z[c1\24"
- #"I\221\bW0O\264Kqr\200y \377\2S\23\332i\330\21Z+\313n\215~c$"
- #"\244f\306\b\312\236\30\t1!1RrL,\252\352\352%\260\334\334"
- #"\aEd`M\273#\17\228\b't\237\233i]\262\f\3561\\s-\265"
- #"\226\262\3242\227e\320-\251\e)\200\273\25\2C\325\2602W-V\226"
- #"\220\223`\200j@@\336\314T\t\261\324\212V\247ir\263\335\315M\34"
- #"\276\241\231\317\"\265\265\224R\251\225\231\25\214\205[m\211"
- #"\21\235\2529\230\"Qm\315\346\331\1\200\273,\t\213\0205\363Y;"
- #"qT\0\234\2330\20\240\2034 7\250\252\204.(\354\204\214\216\332F\341"
- #"6_\376\352\375\237|\355\233\177\357\376K\257_>\277z\363\353_\373"
- #"\326\357\177\353\337\376\357\377\353\340\365\223w\336\375/\177\367"
- #"\333\323d\a{\222\37n\17U\315\3638\342P\16\342lz\272\\\234"
- #"\337\333]\34\16\257\334\177\345\325G\217\36\245_\374\344\303"
- #"\17?lKy\355\341\303q\30r\316\257\275\366\352\213\17\276\230\2202"
- #"\221Bs\320HLa\263(\203\204\332C\34m\310\214\b`\210\306\206Nn\211"
- #"\301=\213\203\222\e\a\314$D\254\327=\b:a\20\207\357t\25+}"
- #"\16\372\3365\342\343\3576\37D\330iS\30\375\20E/\2\6F\206"
- #"\255S\346\326}\335\372:\rV,n\214\202V\261\214\370\267\350\356\341"
- #"/'"
-) 500
-(
- #"\34k~\22\240\304,\304\350\255\227\236\30Z\0\35\222s<\227\217?%"
- #"\32]Fd\207\332\332\322jm\215\23\231Y\253V\346\245\314\325k\3"
- #"I\30\f\330\225\202\324Z#\207\326\352R\272~J\255\265\326ZJ\321"
- #"[\213rw\204\242\315\233\207{\0\255\26\241\361\375\267\337\346"
- #"\241\350G\340h\352X#\267\321\361\225\343\34\307U\371\316D!1\21"
- #"\201)3\223\203\231\20&\6\351\4\2p4#\32\30\311T\5|.\3136"
- #"\347\237\374\350\a\17_~\371\364\205\227\246i\20N\377\340\217"
- #"\376\360\337\375_\377\nI\177\362\323\37\"\376w''g\244\324D\252"
- #"\202\232\27\265VT\315\312R\17\207\345\352\371\263\313\313'\327"
- #"\317/\17\207\335\303\227_z\370\362Ko\275\361\346\v/\274pvz\262"
- #"\331lr\226\a\17\36\0\371RK\nz{\f\226\201\20@\202\322\f"
- #"\35P\351\214\210\202\354\2\346\336\f\223\2406`\322Z:\256\204B"
- #"\242\301\240\17:=\350\tk\207qg/\e\a\\\330\233G\321\350\0p"
- #"\213\32\304\0303\257\263\354\300}9t\255(\0\v\276~\320\213\373"
- #"\271\25~\30]\323\335\216u_\314\35\245\357\345\35\21\tAB"
- #"\303\32\235\301\31\35\321\31\1\220\274)\2\b\222#\240Y\347"
- #"\224\366\"\3756\4\3m\357\346\0044k\335/\363@\222\210\213\266e"
- #"Y\352\262\324y\251K\e2\20\242\0\t\212\2439t\347\16w\17\261kW"
- #"X\346}\251u)\2135%\242P\n\206hL\0U\265\303\356\2435n\r\326b."
- #"\"\22\203T\20<\35b\"&\27P4\204\6\206^\0325Dd\346&MD("
- #"\263\210`\22#\362\1\304M\320\331,V\372`D\301;N\3\0\344\224\226"
- #"}\331\214\351\243w\337\375\213?\373\263as\361\332[_2_^{\355"
- #"\325W^{\345W\277x\357\362\331g\227"
-) 500
-(
- #"\317\36\277\360\362IN<\f\31\221\367\273\372\354\346\372\362\263"
- #"\307u\256\r]8mO7\17\36^\214CJ\2117\3430\216#\5|\6i"
- #"\30\6\307\226Rr2`S4:2\\\311\21A\2\276\202\266\346\231\30)"
- #"\1\20Bs%\6Se\2k\25\254\201k\310?\36\367\r\356\346\346"
- #"\344\344\36\34\356\2765\303\25\273\373\233i\217\271+Pu[\""
- #"\306\25\27\355\335\274.\0X\21\n\315\335\275\357y\273\277\5"
- #"\300:C\214i \365\350GDYU\306\"\312\373D&\202\334\1\35\30\21"
- #"\0\233;X\354\bn\251L\260\326R\221\337\335]C\351\316\275\"4"
- #"\323CY2K\346\304,uY\226C\251\273C\335\317\236G\226\21\t\205\222R"
- #"\v\375\364\343k\272\273\231.\313a9\224y\236\1\200\231#\363\"b"
- #"k\r\221\216\340\261\210\274H\250\307\222\16\21\231\23\204\e7"
- #"2\221\361\252\17\245\256\261uEDFg\346\26\273p\23OF\340\314\254"
- #"\340\252b`b\n\22\200\261\320\222L`\356\234%q\2?I\374\342\371"
- #"\311_}\377{\r\306?9\275\230N\206{'\233\257~\345\353\237|\360\350"
- #"\346\346\371\217~\374\203\267\336~\25\221\313\341\246\314E\213\237"
- #"\214|\372\332\3031M<\216\255\232C\25\241,\f`L \"\314\b\0\246"
- #"Mm\246\360\236CU\r\\i\34u]\23J:\260\317\217\2059\366\236"
- #"\301]\255\218\230\306\341\260f\265\30\251P'dt\271L\213y\373"
- #"\361\252\35\303\216\210\302\244\4\217\264\232\265\v\241\25"
- #"\315\337\207dp\e\202\21\221-\216n7\304n1\2656\330v7\4\255)D"
- #"\265\307L+')\222\212\0\t\263 \261\367CY\325B\356-\370\361q\";"
- #"\35\337W\17>_\221:\325\224\b\325\275\266\266\2242K\311,eiew\250"
- #"\233R\367\305&\305\r%\226\312"
-) 500
-(
- #"\22\217\267\231ik\356\216Q\306\232\231\352R\16K\231\321\\D\f"
- #"\272`\210\273\257g\256\35!\3075\22$\204z\"\0@Jq|cx/\250\1{"
- #"\2\0%\223\216\274\246!\350B\252\6P\321\335=!xrro\221Q\342"
- #"\264\210'\36\21rt\360\206\206dv2\244\257\275\375\346\217\177\364"
- #"\213\277\375\313\277z\341\342\341\37\374\321\37\26\241/\275\361"
- #"\366\177\204\377\260\333\355~\361\323\237\351\177\375'\233\234\35"
- #"\313\224\210\b3\241+dN\nNB\222\206\224\4\301\314\32\2013\2"
- #"\204.\3318\230\31`\v\352\216\273\273\261\"v\272\207#\"J\367{"
- #"\352\33468\366\203\375O\320~F\257Qu|\304\361\316w\252Z\207\243B\b"
- #"rh\b\312C\217I[\261/\330\221\213\330\245\261\203\277\30\212L"
- #"\202\4\0\354\35\304ef\24\212\261\30@\324\225\205\200\210\26;"
- #"\226\230\315Zl\221\5;\243E \314i\21\334\t]\208\254a\310"
- #"\203\270\25\331\316V\334u\300\315\202\211b\335Y*\316f\270}\327\340"
- #"\341\375\22&o\265Vm\315\232\272\202+0\340\220r\263i\251\5\2333"
- #"\247jK\34\243\255\265e\231[+\240\r-\316V5$\0h\212\276^\e"
- #"w\6\260xrb\305W\212\22\tQs\3\221\354\356\210\215\231Y\275"
- #"\265Fm!\242\360&vg\21\321U\343\316\335\315\232\252\2069V\216"
- #"\3274S\325\276\250tG\304j:\f\223\203\21\212;&N\17\356\337?\331"
- #"\f7\317>\377\376\237\376\307\263{\323\327\276\361\325\263\323{"
- #"\207\353\375\311\366\344\203_\275?\337h\22<\370\\\274\0fB1\2u"
- #"\a$w\250\245\265\326\b\0\311E\210\220\320\241,Z\233#\"\v"
- #"\271;\2430smND\1 4pp\220\270\0021\265\354\274?\4G\363^\217uQ"
- #"\272(S\342\315\364#\270\313\"\34"
-) 500
-(
- #"E`\360x\t\356\236\300\266BRc^\205]]\17\341\270M\207n"
- #"\264\267\342\23\202\16\35\247L\334\254.\275F\204\274\266:\336e"
- #"\223\0,\34\310 \1\tr\220A\231\270O\321\2\262\20O\213ZE\aw"
- #" d\340\260a:\376\316\376wV5\277\376\26\f\210#\227\250\2015o\325@"
- #"\301J-\363\\\346)O\233a\30\3246\363\354)\245\312\34k\2722/\273"
- #"\335M\231\17\16\206\4\326B\232\234{L\0\210d\350\313\242\326M"
- #"\26\342\262\2061\220;D\204\251#rJ\211\a\203\n\254\224R\"\20"
- #"w\5\210c\272\304!\214\210\216\36A9 \20s\324\22\6\2161\357"
- #"\304\236D\230\23\261\264\326\34EM\37\276\364`\263\341\247\217"
- #"\36?\375t\371\367\377\367\1\341\277\2729\\\tS)\355\321\307"
- #"\217?\373\3649\361\351\302\324P\314\301\0[)\246\330`Ad&g\346\224"
- #"\303\307\31JQfnM\201\35\21\323 \252F\213\1X\27a\352[y\a"
- #"\200\2205\2\275\35sPo\301\220\220\310L\217\247\347z\340\366c\324"
- #" *\252\310o\277V\366\335\215\302\36f\353Mv\367H\237\201}\377\273/"
- #"\253+\245\362\bl\214\303\232\3'\335\177\236\2572\273\310Las,"
- #"\314\302\34\364d\"B\341x\205U\324\260\2438\205nC\277'\373;k:\212"
- #"\r\317\355o~\247\322\240[|\277\273\327e)\363r8\314H\327<H\336N"
- #"\222%\247\261\265%\245\224Rr\263\205\260\326\262\34\16\313\262"
- #"\4\239\302.\326YA\a[\37\3\323.\324\333\261\217\b\274"
- #"\369\246\26^%\215\210\264\314\356\316&\0@d\352\24\262\377u)"
- #"\361s\343\21013\314\"\"\245\24\"\"pR\3\306(\16\334}\232"
- #"\6Uu\200\346FyR\3257\336xm3\345$M\313\363G\37\314\377\356\377"
- #"\3747/~\341\vn"
-) 500
-(
- #"\255\24\327Q\337\371\371\373\200[\336\266\306Z\n(`)\315\314j"
- #"\310z3\0\0\261\245\224\206$\314\f\216\314\3149\325ZI\310\335\207"
- #"!\21\203k#\206\324\21@\206\2102+\221\3\322*\ti\256\320\305"
- #"\333\303m\b\35J\323R\232VcHY\246R\212YC\204@d\304I\e\210]"
- #"\3522N\340\216\302\231\210\32VD\a\364`\271\205\246\22:\254x\317"
- #"[\250i\277+a\322\343&\4\b\348\302DD\375\331\210\305\177\357"
- #"\36\"\"\a\352Lx\21I@\1\276b\244(\304\300\2021\1\201\244"
- #"\250\240n\336L\t!v\222\213\252\253\243\271\2737\4 4\347H\366"
- #"\202\24pXGR\200b\326\300\e\370\254\a\200\223\246\363\341\372"
- #"\271k\1\364i\332\236\234\237o\246sU\335l}Y\252\315\205%IN\6\320"
- #"\314(\334\347\f\20QKUU\354\\?\217\362\261\265\346a_C\354\356)3"
- #"\"sBp\336\37f\0\2\22-\a\352\313\314\4\r\204\6Dk\245"
- #"\226ya4\327\242\306\3438\326j\0\0\313B,\r\234\223\320\\\0211"
- #"\252F@#\222\nJ$y\30\214P\227\3750\235\226\262\377\342k/\377\362"
- #"\335\237\325Z\3234~\370\356\365\365\263\313d,\224\226\245\376\360g?"
- #";\377\342\eKY\16Z\253:BnU@\275x#\252\241\361\2252\346\354\302"
- #"\25\240J\nR\363\f\0\34f\302b\1\241 \2\26G\254\204J\f2/"
- #"F\200H.q\251{\16@k\212\346nF\32*\255\221\306\314\21\200\34\324"
- #"\356d\22B\b\315\250.l\30)JW\3116\277-\356;\30\332\251O\"\242"
- #"u\360\273\330\301>\347;\226\233\353\377R_\356\341:MD\357\357\r"
- #"\217\332\f\314\4]\377\366\30\331\361\254\343\212\\<\376"
- #"\240\3378y#!\371:\241\211\363W\301\261\343oL!\340R=1\227"
-) 500
-(
- #"RJ)\314\263\201;\313n\267\eON&\236\362\264)Z\206qSkm\336\306q\232"
- #"\266\ew_\16\207\343q\21\362\304\221\342\325;\325\301\326\263"
- #"\302\300\34@\255\202\253#\201+\366\252\335\335\311M\21\221\301"
- #"\3011|\363Dz\213\346\356\n\312\314\n\250n\330Z\231\27r\315\336"
- #"!\313\255!3#\3\221#xnj\311B\332\256\326\312\314_\377\3727"
- #"\277\373\235?k@\245\264R\325\340\t .\363\234\363\275G\217\36=z"
- #"\364\251\16t\260Z\325\231&m\0J\25\n\"\6\222[\22\246\304"
- #"\222\b\300\20ADXb\263\5\1Ygf\26d\346,H\4\302\300\214ry"
- #"\265\20 \261% $\243\365\276\230\31\241CS\322R[\337H23Q\b\353"
- #"GP\31\0\222\207\212>a7ID\0\205`\252\206\352\341\235\251\365\3616D"
- #"\4\20`\337\320\a\320\32\273\1\334\232\347\272VO\314V\34"
- #"\200\20\20584\307\343\34\25\342\343,\346\210H\272\215*\204 N\36"
- #"\23\255\255\310\221;\277\220\367Tw\374\352\n\2\275[*\30"
- #"\364\362@\2556\245e9\354\367{U\315m2\342\303\341P\347\245M#\241\210"
- #"\214\3438im\255\265i\323\316\265\305\330\317\0\324\213\206\207\236"
- #"\e\200!\260\232\"\222\273\251\253\201\253z\b\213Y\365\30"
- #"\210\"2\2200\e\1\233#z\230-`sl\315\210(%6\263,\330Z\3\5fv"
- #"bfm\313\322\324\262&4'\6UE\324\224\22%\341dh\246S\245&\352\2069"
- #"\23\232\210|\365k\337\370\342+o\376\352\203\17\231U\355\260?\\"
- #"\20338\0\352\207\37~\370\253\367\36\301fX\34\32\270\360b\346`H"
- #"\202\3076Q\22\245\224P\3729\27u\0013\247\3149\347\234]D\4I"
- #"\4ZBI$\302\342$O\237\316D$\34>\277\267R4\344F\350X+k"
-) 500
-(
- #"\261R\221\aJ9\345\214{\354\208\rs\23rp\b\215o\200\2602\f"
- #"\257\vC\247_\277\331\206@1\362]g?ws\222D\210\373\359\34dC"
- #"\3[\311\263\340\274\n\315P\210\315;$\26Y\367\n\277\221"
- #"\341\242\361\362Un5\236\21\210\21\250\337\1U\254qv'\346\24 "
- #"\224\354Q\230\21\215\231c\210\250\252\305\213\30\314\230v\207\233"
- #"Z\353\0060M\343\262,\373\375\36\205e\312n8\344\255n\264\224b[Ct"
- #"\226\4\200\273\335\316\256\257\332\254Mkd4D0o\b\254\20T}\303"
- #"\20\224\b\260\257\367bX8;\n\273\3\0\vB8i\231\3E\23Mf"
- #"\6Ff\346!5G\354\216\316\304\334\314\324\335Y\242\240o\265V\31"
- #"r\206!\202\222\315Jm\f8\346\r \235l\317~\367?\373\275\217?"
- #"\375?\256\367\227\212\230\6)\245P\226\353\353'\306\317>\377\3541"
- #"\237\336S\312.D8\3\232\20c\25\"\n\311M37E\b\21\1l\246"
- #"\350 \t\20\325\331@\315A\215\22\351\nQ\216\340\225\307\227"
- #"\373c\b\312\nYAD\267\306\4\254\213x\203jy<uO\16)\240S\256"
- #"\6Gg%\240\360\323\4\0000\210\322\24ok\376u\331\325\323c\24\235"
- #"\20\233\t]\233V$J\304\270N\365\" \30\310\t\211P$T\202 "
- #"\21\vK\f\264C\233+qG!\304Yif\16`a\16\372\353}\22\256\37"
- #"1\2660\263\360\25?\202\307\2\223x\374\eD#b\341L\350\211o\225P"
- #"\232i\251\265PY\226\352\n,c\332/\273\353]N\327\nx\212'@\234"
- #"\363\350\356\3130\267\326pT\f\305_N\265\265R[\360\241\221\34"
- #"\234Z\220\r\335\325\274Zg\250\37\37\2118?\22{rC\254\356N\215"
- #"\2\203\26\n\37\314\254\216U\233\32\273{T\332\nX\253b\222"
- #"\2242"
-) 500
-(
- #"\0\230\271\244\370\345\253\252R\341M\333\216'\233e\236e\30c<I\16"
- #"\315\r\34\277\364\366W\337\372\322;\177\373\323\277*\2452\242"
- #"\233q\212G\245\316\313nsr\306\234b\232A\314\323\220{\23\20\30"
- #"\23\21f\206\20b%\35\206<Ny\30R\32(\347\234\262\20\21Bc\246$"
- #"(\202,\316\342\362\344\351\r\21%\356\376@D\264\206\241\v\201"
- #"\240\17\210\324`:\275\337<7C\241)T6\1\233\1\1\204\300!"
- #"\30\201\243E\215\323\365{<Dg\373\263|7 \216\203GC\210\221\262\254"
- #"\300AD`@@t5D` AJ$\4}\216\315\314\262\252B\205\212Y\207)X\317|\221"
- #"\334\216\233\17\"\342\225\265J\276:\23\35\371\313\2766\327\361"
- #"\370E\363\353\307\303\227U\25,\252\f2\263f\32\325Y\314\b\tp"
- #"Y\26\277\276\311O\237\261\214\224\207q\332r&\222$\242\3029\326\09"
- #"\217D\342\216\25553\300yWk5\210\261\26\232Y5m\255\205\267\224vk"
- #"\360\333r\205\261I\223x\314\246<\4\245\204U)L\344\b\0\240i\364"
- #"\310\340\bM]\325I\223;\30c\2\313}8\323J)\320\240\251\232"
- #"\20\320M\2326'\247\347MQ\253\32\2\363p\357\374\354w\376\363\337"
- #"}r\363\344\235\367\1779/\a\222\334Z\335nr\265\31ION3\217\e\22"
- #"!\242\224a3f\226\360A\21\21\301\225qff(6\f\3038\246<\bg"
- #"\316Y$1\3\252.\204\330\25\247\331C\317\17\315\240u\320y\240\355"
- #"\230\210\230Q\b\6\361\206JU7\247\367\235G\226\215\300\316\335"
- #"\214\26\5G\254\216\275\320s\212\231\276\0\4\237\235\320\tV"
- #"\275!\2723n\350H\227\273\305X\337\221 \254\372\303`\21\266(HI$"
- #"\211H\327\337\5^%\204\261W\0\341N\325e\323o\v\211X\275\230"
- #"\313"
-) 500
-(
- #"\332\355\377\306\a\"\"\232\233\341\252\n\177\\\220\34"
- #"\253UUu\5qf\"\2W\4Eo\4\220\30I\0H\35ZS\237\353\262_\16"
- #"\207\345di\255(\"\32 \32\r2%\334\e6\26\36\aL2\b\347$"
- #"\23]=\275\271\271Y\312\316L\35\331\0\232\266\246^\324Zk\213"
- #"5U\215\"\v\372P\266\212\n!\252\252\272!\4U\201\200Jb&"
- #"\202\204d\226\bQ\204\230Y\r\210*\23\2424\253D9\205H$\21r\22"
- #"\325\266,\v\334\334 2\337\\\215\323\6il\255\31q\32\344\364"
- #"\374\364\355\257~\371\223\313O\256\16\327O\36\177\2363\3157\317w"
- #"\363N\322\262\335\360+_x@\303\26\263\244\224\206\221\206\204\302"
- #"\306\214\221\217\211\323q\376E\f)q\316I\22\241x\260\265\30\20"
- #"\361\4\35 d\220\330\230Y\266\333-\0\200\232\252\326nD\3n\344\0"
- #"\255\205\177\230J\363is*i\224\2741\24Gfg\"\301X\241\305\3366\254"
- #"i\\\t@\35CN\261\257\372\341\3276\rqBS\214\252a\215\36$$\22"
- #"\"\0c\244\30Q2 \0231sfa\344c\332\352Z>\0f\226%\341\272`\355\347,"
- #"\242\e\b\307\301\204D$\3072\21!\22!\255\356\341\210\250"
- #"1\26Y{\216c\4\257;\222\330f\256\226z\235\324F}\bl\321\312\202"
- #"\eZ\323Z\233\252\262Q\314\357C8\v\274\346\234SJ\333i;\216\223Hj"
- #"n\255h\255U\275\212\240\273#\211\203\31\240:4\365\326L}f\346\330Y"
- #"\213Q<\275\326\364Jw\214B\302\210\204\300B\2342+2\n\204)\256\255"
- #"\"O\340\216\241V\306DI\0\200\t%\247ZK\255u\277\337O\323v\277"
- #"\337\357\367\373\315v\b@6\2\f\323\360\360\v\17\377\321?"
- #"\371\247W7\373\357\177\357;\313|\340q`J\356~zo\363\322\313"
-) 500
-(
- #"\3478l\210\3234M\343\304L\226\a'\6\246\304\334\5)\202\302\340"
- #"\256\"\24\316\223\200\241Sh!\344\214\326\257v\327]\375\223"
- #"\177\366/\207\304\222P\4\a\246\201Y\22ef\316\234\23#\372\230"
- #"\5\311\246!-\313\341\243\17\336#=\240\327\326\n\241\221\270"
- #"z3\4`\6J`L\225\3108y\0\3\252\6\205\6\220\210c'GH\f\300"
- #"\353p\17\335\373\357\201\304\")\2454\244P\216r35\347\270\221\222"
- #"\300\301\314\2\177E\0\332\32\32fNA\334V\267#\r\300\272B\2419`"
- #"\325V[#\f\265$\rN\270\253U\rC\353\22004u\267~F\337\372\312"
- #"\0\4\372\e\204\234\2112sfIH\202Y@\246\361\244?[\2149\247\224"
- #"p\314y`\22Ao-\34\235\26-\2456N<L\323f3:\3004\169'7?\354\367\327"
- #"\3277e\251\255\32RJ)\243$@2\300\360\233\26\311\321\204\273z(s5"
- #"\364C-\341\273\326\334\252i\203\332\260)hE\5\302\342\212i0f\5H"
- #"\343\260\231\266\206\220\363\270\331\236\2600\200sN\3034\346A\226"
- #"\262 \221\252\28so\\\211iq\254\274\311'/\214\303\331\v\27"
- #"\17\177\365\253_\\_>\321z\0sI\3230m\277\361\315o\235\235\235\237"
- #"\336\313\323\4\347\367x3\301\270\205\315\211\234le\232p\334\3308"
- #"\3318\3310\3524a\316\226\22\2108\v\211\20S_\212\5\235\336\1"
- #"\fX\35\371\277\377\37\376\347!SJ4\b\r9\rC\32\3064\216"
- #"\231\23\235\236\2149\303\311$\247\333Q\227\375fJO>{T\367\317\321"
- #"\333\262\314\200\256V\315\335\30\211\205\210\303\177\224\202\375"
- #"\317\344d\nGo\255\16\334\307`m\204\22R\360\201C\225\16)\244C%q"
- #"\214i\0\200\b\23\263H\"\304\3165\0$\242\30\3371!\v\205l"
-) 500
-(
- #"\223\337q\327\b \277v\267D53\300\200\242:\"\32x\317\367\321"
- #"\"z('z\213||g`\30\265\251\e\20`w\34w@D\211B\205\220Vt!"
- #"\3\n\2630\t\23\4\31\231\220\20U\2535%\364$\22Y\"\211"
- #"\270\231\252\326Rn\256o\226\303\0345\b\"\22\23Q\22I\304\""
- #"\234\0\321\35\232\233\232\207o\346\\\352\274\224\252VZ\213F7\\"
- #"I\3$in\6\316\304\200\30\324\202<\f\222\223\f\303\264\331"
- #"\244\304]\227\225C\21\322\347y15IiH#I\22N\356h\310\r\363f{"
- #"\206$\233\355\304\2\357\275\367\316\315\315s\221\2615$\36^{"
- #"\363\355W^}u\232\322v3L\223L#\17#\215\3\217\203\344\314I8\t"
- #"\t\a\37\38h\337\201=q3p3\355\240v\3w\217\267\300\377\354"
- #"\177\374_\306\4\231qL8$\32\a\36F\0363O\233t\272M\343\300\333Q"
- #"6#\t\371\203\373\347\313|\375\316\317~\\\313\1\210rb'\317c&"
- #"\341\0\354\21pG\353\5\213\26\275\251ua\257u\v\34\307_hv\3042"
- #"7\230|\20B\277HD\30\\\244X\2040\21B\27\361\210u\34\22\202CL"
- #"\327\0\373[\214\310\261\220I^y\23\0`\35\1\264\206W\327O"
- #"\t\312\223y\367\350r_=3|%^\365\307&\270\30\200DAmfA\22\246D$"
- #"$\211\205\b\31 \224{\204\4\1\252V7M\211\205\331\240\2316\4"
- #"E\200!'D\260\332\312\274\250Y\253\365\346zW\226\"(B\302$,iHc"
- #"\32\206,9\30\202\302\202\302\")\210I\201\373\b9\2\215\346"
- #"\326\264\231U\323\332ZQ\265\376\3709\211\244$)I\32\3628\215\3034"
- #"\310 i\310\310n\340\314HLe\251\255\3518L9\215\304iH#1\2f\347<n"
- #"\317R\36Y\350\374\374\374"
-) 500
-(
- #"\352\372\352\203\367\337\253\213\2\247e\321\373\17\36\374\326o"
- #"\375\3260\311f\223E`\314<d\313\342Y(1\b\1\243\23\304\r\363"
- #"\365\306;\2\204\353\257\e\230i\360\233\325\\\233\233:\377\363"
- #"\177\361/\23\273\26039\263\211P\22L\202\233)%\3011\201\260\273"
- #"\325\323\323-3n\207\341'?\375\333\313\247OS\342\246\255\325\262\335"
- #"n\306q \300Rkw\203^K\377\6\301\207\210\340;\216D\220\220\272"
- #"\232F\237hv\365\247\30C\233\25355\355&\31\324\219\306\310\2606"
- #"\354\356\346\201\340B@\354JD\21dvT\345\352\231\f\0\300B?\4\314"
- #"W\314\201vv\310\221\300\334]$a\215\274\16\245E$\350\2202f\26B"
- #"\"\314\302,\224\203\226\202\335\362\234\t\1MU[Y\22I\36"
- #"\22205-\265\224\252K\323\306\204\207\303\376\352\371\325\365\365"
- #"\2655-\313\262\273\276q\5\21\3112\244\224\223$IC\226\314\222\262"
- #"dN\t\1\231\222\244\201R\2dgA\22\342L\234\34\3RlU-\224\350"
- #"\213V3+\2656\323`#\0\321\220s\236\246\234s\36\3220\f\200^["
- #"\3Db)K\231\227e\310\3\2410\323\230Gs3\340\351\354b\256\226\207M"
- #"l#\356\235\235\375\354g?\277\331\335\20\2226e\221\337\376\355\377"
- #"\344\344\344$\347\204\320\230\235\260\21XWn\3\304\225\310e\346`"
- #"\240n\246\250f\26J\345\6\335\366\303\321\24\232\251\232\363?"
- #"\377\27\377\23\0231\1#3\2210!\2210\246\204L.\214B\344\3206"
- #"\343tX\312\331\331\331\247\37\177\370\316/\177\1\200\240\212\350"
- #"9e0[\226jf\34r\32G\250=\366\365\6\0\256jj\275\363E@b\f\""
- #"#\254\30\231\200,\253\326uv\335\207\356\321\2\367}0\270\271\232"
- #"\e \4\233\356xlF\366\212<\26\205f\27\324"
-) 500
-(
- #"=\266\32\350\2726\275\361o\254\303\323\20\20[\327\r\201cG"
- #"\34\355hT-=(\273&;PW\26\211\243Z\201\34\320Tk)\v\206\204\322 "
- #"\3466\227\375a>,\313~Y\346y\336=~\374\371\223\307\217\257\257oj\255"
- #"\207\303|s\263G\340\315\270\311\303\224:\271/1\v\263\b\v\221"
- #"\230#\21\247a\3102\260d\26N\234H\262Hrb@v\bue0\300P\362Zj\325"
- #"\252\200\235\237\305)\205[N\36\3638\216\200\336Z\v\f\273"
- #"\272\225\245\b'\246$)M\343\326clE#\313DCv\240\335R\36\276\364"
- #"\262\326\366\263\37\377\244\326\203\b\225\245\275\375\366\227_y"
- #"\365\325\234\23\240\207\224 X\240P\t\200\334\372\252V[O\24"
- #"\326\\\343\23\a3k\346\201\352U\0055\327f\322\2578\t2\4>5"
- #"\204\317\320\201\211\321\r\b7\323\275\271\24\244\2018\277\365"
- #"\365\277\267\375\336\367\257\36\177\222h\234rBkK\255\245\24Z;^"
- #"&\202\230\f\205\rK\314\355\220\326\205H\37{\270\241k\207\340"
- #"\0231\304\214\e@\315d\335\35\307]wB\2bf4\327\3008\271\213H("
- #"\260\204\234\372:EC\367\356M\347\1B\211\3520H\305N\241\302\5\0}"
- #"\221\350!<\n\330q\262=\27\342\35\372A\320\305\25\325\0\253"
- #"\39\260\2:$\346\nJ\216\200\4P\275\266\245a\242$\"\207e"
- #"\177s\223\16m\357\30\206SEU\227\303|yyy\330\315\314\351d\332\0"
- #"\240\272O'\333\234Gp\252f\322Z\t#\223\20!\25\3\303%\r"
- #"\200\250\320\206Z\16e\\J\251\16f6Z\251\265.mh\255\251.f\326\320"
- #"j3\325j\265!S\255\315\335\207a\330nO\206\224\307\355\20\317FJ"
- #"\311\301\314,`,\352M\275\1\204\0\0373\332\341\346\371\351x\372"
- #"\311\307\217N\357?\34"
-) 500
-(
- #"\306{\315\365\357\377\376\37\375\353\177\375\277\355w\317\211l\231"
- #"\257\336\371\345\317~\347\333\277\aNN\246n\354\311\300\2aF\16G"
- #"9\322\0\245\200\3\242!\260\257\233\2\302\276\331\361\25@ KE"
- #"pT\267Vai\246\352\35\354D\1\337\2\0000\304\303\336\fR-\345\245"
- #"W\337\374\3227~\373/\376\277\307\250%\200AY\69\221\335a\211\342"
- #"\v\221\22qx?D\231\35\347r\224\316\330\365\317Wp\265\257\225\232"
- #"\337A\244v\315\376\336\220\206Y\2\200\305\234\321!\314\26\241"
- #"5o\255+kS`\321\273\330\36D\333\21\263\236\343\353\373\252eDw\244g"
- #"\0\356\3742k\360\35\ar\356\375R\35\325p\232iA\0pQ$\r\356\v"
- #"\273\266bF\16*\3\227=\0372\336\0\327\354\244E\333\356pu\330\355"
- #"\237?\177~uy\245\265\r\303\366\336\311\351\311\366l\273\335\236"
- #"\235\335\317\303\244js\253\245\24Tsw\216wQ\353 \3\2318B]\325"
- #"\3\5\305\303;\16\264\265vh\363\262,\207\262o\255\261\242\325"
- #"\326\232W\323\303\341\320J%\302\3558\235nO69\267e\0025\36x\30\206"
- #"\346\255\326j\16\314\334\24\202uu\230wC\236\20*\263\227\375\356W"
- #"\357~t\261k\17\276\370\372\345\345\263\263\315\364\312+\257^"
- #"]~bm\2214\275\367\316/\347\375\315f{\nD\215\234\235\34\200"
- #"\232\21A\300\372\34V\223rD$``\352\366`f\n`h\32\202\350N\200@$"
- #"\245\3285\367Z|\251j\346J\220\5\21\271\225%\21\273\343\356p"
- #"\343Nj\320\252\1\345\267\276\364\225\37\375\345_\370\376\32\240"
- #"\21\"\t\273\353\"\332\232\241\2730w\5\205~;\335c\316a\235"
- #"\331\32\360\3265\340\202A\347\356F@\326e\377\3726\331\3275\206\202"
- #"\327\20<\350\260\326u#\247\253\267\346\235\355"
-) 500
-(
- #"K\314\b\35AU\361\316\216\341\356\307qH\331\243\354H'X\347\344"
- #"\375\374v_4\334~\0350\226\270P\334\201\234\3008P9,\240\255\325J\200"
- #">8\316\211S\306\214b\25\304\346\262\\^>\275\274\274|~\371\354"
- #"pX\6I\304\203\272q\222i\273\331l\267\333\323{\2654^\212\310"
- #"\22^V]V\306\20\4\5T\301I\203\6#\214\242\35t\356f\226"
- #"4\315\222P\240\224\322\24*,\252\325\315j\255\326\264\363\235\17"
- #"\207RJ\253UU\31SJ\t\35\203\3517\214c\231+0!\206\226\227\n"
- #"\300\274\333?8\377Bb\374\233\277\371\353Ww\365\342\342\242\24;?{"
- #"\201\211\226\335n\332\302\247\237=:\354f{!\36[\326\276\234u"
- #"\2\0175\245\330q\ev9\277\230\377\272\ac\nHY\21\n\200{T"
- #"^&\273=\20\322R\333\262\324\371\260\244\224\20u\37\276\231"
- #"\356\350\305\314\264\250\252\266\246\265\315\245.\27\257\274~\366"
- #"\362k\237\276\363\213\204\234X\240\316H\16L\226\260\22\232Ck\346"
- #"\0b\t\321A\314\273\e\274\207\252\270\1y\260\327\0H\230\35"
- #"\325ZBJ\210Z\32\220[\30\307\307\26\234\31\1\233;#\251\31"
- #"\2040\355*\22L\24\2479\230\2072\2775o\216\36\203e`0-\256\323\a"
- #"u\0\0 \0IDAT\276\"\272Cl\6\t\35A\35\e\240\23 \v\200"
- #"\271B\254j\321\210\211\303\v\306\301T\225\311\242\250PP\"\2125C"
- #"i\206\350\334\212\273/X\1\214\314\1\240\371\\\201!\v\34"
- #"p\2\a\265\335\315\315\345\223\247\227\227\227\273\303~\232\266"
- #"\3034\235\\\234m\317\316\357=\270\2779=\eN\267\236\22 'a\34"
- #"\22U5\263\245\251/\v\1\262\260jCw&\221Z\301\210X\322fT\267\242"
- #"\325\335\2233\e\265VYH\205\366\na4^\353\342L7\313"
-) 500
-(
- #"\374|\267\273X\366Q\t\354nn\0N6\233\r\29\203\211\35\16\a@"
- #"K\211c\200\214\252\n\5\1T\353+/\177\361o~\372\361\237}\357{o"
- #"\177\345+o|\361\3768\216f9\17\254&\373\303\341z\377\344Ex0N'\255"
- #"\3159uB\32\241\0q\227I\1\220nz\355\210\261p\364\304\bL\215L"
- #"\21\205\241\261\325f\2555\231\27m\265\34\16\207\303\241\332JPP"
- #"\325\30nDU\327J\320\16\255\351\2\246\244\303\375\213\227\237"
- #"\r\37\241\356%\3J*\363\222\206\f\204\fX\232\31U\242\230"
- #"\311\271\207<\367\235\17\a5s\0\n\3132\\\327\377]\310\273"
- #"\17Pn\341U}\225f\321Q\340]\245NuGCG\324`\350G\5\342\340\356"
- #"\261}\357\324\332\336\254D\252\v\325A'\242.l\342\336Z\227\305\r"
- #"1w\0>\16hB0\330I\335\3011\34\215\301\315Im\251\352\356\342\210"
- #"\344\250a?F\254:\317%\347\222R\6\247\375\256\356n\3522\373vs\377"
- #"\374\374\374\342\374\205\27_|i{\357\364\364\344,\245A\362DDn+\25"
- #"\25\310\f\214\2329d\0(\305[\347\321\21\27X\0262c&Af\6U"
- #"\235\303O\227\234%\224\206D\204T]\225\0\240Y+\255\314\363<\317sY"
- #"\232Nn\6\252\235\247\30\222\3001\331TU%UR\"?\275wzss\2639y\361"
- #"\2157\336\370\177\276\373\247\37?z\364;\277\365\245(\251\204\2636"
- #"\3\356\376~\211Xr\26\t\257\352~\353\0:\t-\206\25\301\251B"
- #"\307\200\36\2739\v\0\30\32\b\21\263\253$\331/6\317\365\331"
- #"\263\233\303\276\244\224T\35\220\227ea\244\326V\353\340\22\274"
- #"\e0m\265\0366\311ON_\36\267\367\333\315R\275%4\5\25\316@\302"
- #"\200\250\r\1\20\32b8\34wk\270\2735\326\21\301ef\210"
-) 500
-(
- #"\304\210\352\16n\302\342Q-\3\f\253\f\217\257\v\\\353\342"
- #"\265N\241]f\n\201o\1\207n\261\30\305&\242\367\5 \"#*"
- #"\256t$XI\306@N\321\1u>\214\305R:<A\315c\337\355!\345\31\277C"
- #"\370\2434420\4k\25\0\212u\303-r\20bC\341\2529\271:7\243Vl\231}H"
- #"\347\333\207\17N\317\356]\\\\\234\236\237\237\237\237\247X"
- #"\247 \"\221\244\1\260\2413\t{\325\0\214\3\263\"9\20p\v"
- #"\324\243\v\31\243Y\3139\1\32\251\327\352\261\23\20\241\30"
- #"\200\212\20\347\4Jh\315\334]\255\326\272\333\35nn\366\247"
- #"\373\3038N\3034\246\224(QJC\263*\"n\346\35\25\246\200F\f\315"
- #"\234\205k\263\227^|\341[\337\372\326\237\377\371\367\277\373"
- #"\335\357\216\354\210\314$\ntvz~\262=\235\2061\23+XNb\335\305\34"
- #"c[O\21\177`\34\3041\246\16\231Wt\362\6\304\30\32\23\316F"
- #"\252*Ki\265\351\363\253\35\270\250\2516\250V\227\245\etk\321V"
- #"\255\326\252j\350\4jMufe>=;{\361\361\341\361\241\356\212\317\200"
- #"\356EE\330\220A\21\334\231\0\234\210A\373(\32}\345\211b\347\e"
- #"\2333zw#@X\31$\1\233`$ \2112\302\334\31\261\271\321\261\214\v"
- #"\362\24\365\211LL\4\321\272\2205y\264\35h\210\2\300\214\5"
- #"\325\314\260/D\272&\356\361\337\36\37\206\330\273x\177`{\36\214"
- #"\325rl]\eD\261\212}\273m\r=\0\232H\0\342\6\310Y\252\201"
- #"\306\240\4\0\206\274\31\247\223\323\223\263\263\263\213\223\223"
- #"\223\351d;M\23e\"\"\3\350\350&\n/*bbw\314nH<\233\241+6 "
- #"\346\16\262$\"t$CS\203Z\212\232\265X\221\264\326\34\25\321E"
- #"\30\21\2!\e\320\233R\352a?\357\367"
-) 500
-(
- #"\373\315f3\225\3150\230\f\222s6\250\265V[\275\373\216#\263\322"
- #"\332\264\315\224\323\305\305\3317\267'\0\372\247\377\341\362\363O>"
- #"\30dpU\226\364\372\353o\334;=\335\3461KB\"\226\256\37\26\372"
- #"\272A\16\213\361 \21$\0rG\302\265M\6DrGstwvP\2)\245\0\340<"
- #"\317\247'\27\315\200\222\370<#p\255Z\26+\245\265j\245TUDS0\364"
- #"\206\6\352.\233\363\a\376i*\6\326\352\304\324\202yL\241\32"
- #"\215D\253\270\216\353o4\4=\35vu[30r\f|\4u\371\263\276\316"
- #"s\ff\250\306W\25@V\346\350m4{\34\334=\236\210\b=\364!\364"
- #"\bY\275\r\250\265\5\351K\2745\5\36\373\337\3769\254:\304"
- #"\26?\242Cib\6\323\225\340\34\314\303p\264S\372\304\b\275\345V"
- #"\213\327\242%YM\222\246\355\346\327N\0\4\307\325t\4\0\0\32\270"
- #"!\30\243A\357\330\1\31\301\263% \227\326\375\31\221Rv\21"
- #"\341Z\366\0004\220\316\363\241\224y\277\277\331\355\257k\255$\275>"
- #"\211H\212l\24@\316\243rf\327\332\2 \242\315f\243\252\255VXQE\375"
- #"0 \3179\343f4\366\315\305\366d;\326\303\345\217~\200\237|\370\201"
- #"\252>x\370\352\267\177\357\277\270\177\361`\30\6\263\22\202\264"
- #"\201\300D\242\330\223\228\21\233k\324\323G\270h\277\b\24\360D"
- #"\4'4E'!\6\341\4\240\343$\245\1\202\264\326\177!\216"
- #"\225\31\0031\34\321\346s)\212\5\35Q&\347\301p0\34\25\275\351"
- #"\336\35A[\300\263:\17\24\202\361\320\31\e\253\364\235zT"
- #"\201k\372i\1\365C\354\345`\217?0\263(n\311!6\233a/~LR\221~\242"
- #"\252s\357\222aw{\336pn\352\16\b\204\210\244\16\352V\273^F"
- #"\4\340-\211\335\373\326\304"
-) 500
-(
- #"\373\331\34I\32\\\301\21\3205\246\352\216\200\261qaE'b\357\r"
- #"\221\220\315\322\212\351l\215\346\271J#H\202\244VK\231\211 \230\277"
- #"H\224\22\30\243\231u\356\"\262\305pm\345sm\267\233a\310GM\217"
- #"\360\211Er\4\221\304J\252\317u\267\333]]]\355\226\235"
- #"\231I\356\303\257\30\23C\30\23\336\271\24\307D\20\t\222\23"
- #"\206\235\247i\4\a\203\23\2K\346g\327\317^:\177\361\305{"
- #"\367\256\227vq\361\305\177\374\307\377\360\374\336\364W\177\371\347"
- #"\4\364\372\233_\375\355\377\364w\306\315d\b\356\312\314\356j"
- #"\3360F\200`\340\24bj\22\202\17\6G!5\357\350$\2\360\260"
- #"\312\v\22\252\f\31S\302\234p\32\323\bhJBCkF\344H\312\342"
- #"\255Jb(\244\2555U\317\16hN\316\222\3074\236\316\273\247\4\331"
- #"\241\201\223j\215\371x\234\203\1_\5\240\300\360#\304\24\r"
- #"\343\366\22\270\256\260+u\223\325\234\350\b\333V\325\356\254\4"
- #"`\0\211\5\20\216@\202c\bb\3701\2v\265\3125\327\375Z\316\353"
- #"\363\35\0G\v*o\377\257#\270\340\366Y\216\227\350\231\317\35Z'K"
- #"\3\270\3\205F*B|j\340hh\0\324\5\212\25\301\34\213\371n)\245"
- #"4A\311$\343\270\331\2624-\245\20\36fk*iPu\20i\256\6\352h\30n"
- #"\302\340\314L\204\310,\"\356\331c\353\333\202B\277\250\252fq\367e"
- #"Y\256\256\256\236]=\277\331\357\252\325H{\307\311ThNp8\30C\27"
- #"\fR\r\245\335\376\260\265\256/\307\356\26R\223!\242w(e{\177"
- #"LY8\311\275\224\1\340\245\227^\374\343?\376\307\277\377\a"
- #"\177\277,u\332^\334\177\370\20\22*\266\216\1\356\374DCB\354"
- #"\230\340\0\216\340\361t\352\352\5!\333\3415\262\312\272#q\311B"
- #"\214\230\5\207\204i"
-) 500
-(
- #"\230Z\365q\312\265\3508\216\2071\227\322\264\331<\317!\236\327"
- #"\232\351v\\\16\327\244\246|\262=\275w\3719\t\206\312\e\271"
- #"\31\271!\261\"\271\305fU\232\306D:\246D\200\210\n\350\346"
- #"\n\335\27\312\"[\23\22\263\336Qc\351\307\302j$\324\257"
- #"\362z\260\366\3\305\241\v\224\307_\205\300Ww\270\270\345\206"
- #"\306\27\3\223\\\241\232\5N\346x\240\337\262\236\275\303\314"
- #"\272\211\357\332F\37\277\32\17vo\322\275C\306\221\202\17GH$\216"
- #"<\27U\337g\344,\311$\31\240\231/\3132\215\247\206\244\r\206M5E"
- #"\20\254V1\203\223\263j_\6\21\211\210\273\207\351SPW-YkL\240{k\0"
- #"\260_\346\247\317.?\177\362\370\371\363\347\245\24\3408I\303\6"
- #"\266O\343\0\200\235\219\304\264C\251\246\263\230\231\211\250\336"
- #"\261\6\211\274H\300\361P\327Z\21}\332\f\315\251\326*iB\260q"
- #"\32\232\271\f\247\315\24)MCvt\242\326'\26\0\baA\323\313\312>"
- #"n]\25\333\216d\310\336m\272\2737uPU\231F\3169\215\3'\301\363{"
- #"S)\325\335[\203Zm\231\244V\324\346\255\245e\326\371\320T\2555"
- #"\333\357\320\214\240\370\365\363\27\36},T\331\254Vm\t\301]"
- #"\21\261\324Y\362\210@\216 \36\2704C$$\b6\r\22\22\b\2"
- #"\232G\372\0Us-\260b\225a%\22\230\232#f\t\321\252\36\20\276\342"
- #"U\25\240\313\32\271\3\29\273w\214F\353\333Fp\360\212fh\rMAU"
- #"]\325\232Z\234\370\307\360bNf\246\375%\321\335\241W\1\375\203"
- #"\250\257\220c\307\355j\n@\f\r\335\301\221\21Y*:AE\243\246"
- #"\246\304\246\206\344\4\t\31\e\332\241\34\364\306\266["
- #"\203\3478\216#\345,\302\276\230\f\342\250\rp\330L\356\312C\""
- #"\205\204\344j`\nDs"
-) 500
-(
- #"\255\352JSj\313n\267\\\177\364\361G\357}\360\376\343\347O\346\332"
- #"\2064\f\234\254\265T\31cJ\350\346\214\0\300\23\"\232#\"\b"
- #"\335\21\3030\17=\v6[P\334\265\32q\312\223\1\227j\2460\236"
- #"\312\224\200yi\3468P\255\236\266\247\334\335NZ\22\21.\2555!"
- #"\24\30\252/D\304]\340\326\221\200\203\\\205`\350\r\300,"
- #"\\>I\221\bPM\320\216u\216\273\243l7\231Y^~\351\201Y=\331\16"
- #"5K\210\246-\345\240\232M{\213\272\314m>\264Z[k\266\314\251\225A|"
- #"{u\371\336\371\371\371\315\223\353\245\324!%\324VM%8!\244!"
- #"\356cf!\266\355\253zs\357!\300\25\1\325\320\201\272\26"
- #"\257\366\341\b\0\232a`j\230\320\241\231I\207\347\367\224v{\200"
- #"\376\372\342#\352\305c\177\255\330\341\253\307\346\243\271\251["
- #"\347\360u|D`\247\3\vHk\326t\356\303\233\36\207x\24\255\363."
- #"\35\36\245\254\273\253)\"\226\bTs\16J\e1\210\2439\2'$D"
- #"\26j\200\306(Mu\236\3474\16\303\2206'\23\20012\21e\0263\vM"
- #"^\325\226\211!\212\23tv\237\347\371\311\223'\357}\370\336G"
- #"\37}\364\331\223\247V[\"\316$\243$\342d\34\363Q\215Hp\350"
- #"\\\354\360\320;\266)\307\223\201\326\17\274\2435ED\5\34\205"
- #"!P\230\335\361\304\21\335\254\205\370\301mk\25H\200\340\32AT"
- #"\363\200aH\334Gi\260j\365\305Et\a0\363\b\301\343}\224!!"
- #"\200\275\364\360\354\321\307\237N\31\247,\221\311\246!\257\0233"
- #"sC?\225\326Z\253^J#\330\314\207\314P\223\177\343\223\367~xs\211"
- #"\363<\363\300\344\346\356\305Ki\5\311(\347Q\222\303\240\352\272"
- #"\332=\22Q\214BC\211!\336\24\1\30B\260\350q-\231\1 <x1"
-) 500
-(
- #"\20\26-\206&]+7\352\277HO\0202\363\0\200\350\253\210\257E\360i"
- #"\4\237\307\237\356\256\253\n8u\240b\307\322\206\320y(f\233\31u"
- #"\r2\3502\v1\233\304\276\313;\336\3\2^\217e\214\241\267"
- #"\00357o\316\f\261F\256\265.\264\f\303\24.\312\255\25G\323\326"
- #"\20l\24vkh\214\356\202(L\206 \340\346\312\2\256\265\265\26\252"
- #"\\W7\327\37\177\362\350'\357\276\373\376'\37?{~]k=\337\234"
- #"\334\277wv6mc\202\273\253\207\3055p\233\350\344\212\2\310+\301"
- #"\340\30a\353\265\345\343_\"\242\271\253u\265\27\3270K\313H\204"
- #"\21aJ\241\203\210\350\261\256\352KvTs\207>:]\373\335\256\30"
- #"\t\30\347\214\273;v\307%\307^$\35\341\230D\356.CN\356\236ds"
- #"\265M\356\207i\232\4\271\265&\233\354\253F\23u]\312\324\232"
- #"\355\17\25\35\366\207\311+\236}\343+\357\375\342\233\37\275\377"
- #"\363\355\311\275\371\372\t\223ea\"66Cs\257\340\210\234j\321\246"
- #"\346\353\3660\350 +L+ny\aI\251\1\t\4\275\35\334-\0Q\16f"
- #"^Z\v\261\204\240&\4\257\302\314\270S\256`-\316\372G\204]u"
- #"w\367p\222\t\271\240\6!\255\206N\335\325\234\372A|[8J'"
- #"\3243\"V\253\266\302?(\334+W\237\263c>\b\275\e!&@fF\300@"
- #"\225:Bs\23\253\252\334\32\e\240 \0313\24095\327\344\256\344\16"
- #"nH\304\4\211\320\221\204\2619\240\333\\\227\272,\363<\177\376"
- #"\364\363\217>\372\350\275\17>\374\360\223O\237\224\331\201\2464n"
- #"\306\355\v'\27\17\356\235\273\326\253\233\eGku6\213[\305X"
- #"\eX\260{i\315I\b\341\260\27\263\e\302\20X\211\311\203\273"
- #"\0032 \3\241\4P\317\335@\35\34\t\334\272\210T\270\16"
-) 500
-(
- #"uM,w\01744\364]\177\4v\277\227\2015\216\253\27\0\26B4\357k;"
- #"\357g\213\273\v\203\23\23\0\334?\2737\357\237M\3\346q\"\304"
- #"\332\26\"J\4\2118\3240\315\32\200\335\277\307\265\350v\330"
- #"\200\216\313\274\377\366\267\277\375\235\377\367\337?\275\336\r"
- #"\333S]\16\325\e\231\23'wG\20Udf\ap\253H\300H\201\245G`"
- #"\a[;\3310\"u\\\215[{\323\351p\227g\27\363\32G4\0Gv"
- #"\344\316\236\17,\315-\24\314\325\315\335\233\271\252F\335[\301"
- #"\324\327\334\331\21\22\253\0\303\232\317\4\203\257\24\261\27="
- #"P\374i\352\240\267\207\360Z\275\256\233\233\250\16\303k=\220\375"
- #"\321\354(\202\252\22B\3\254X\343'1b\36$AJ\314\2111!\230VhhE"
- #"\35\334\352\f\0\r\240\266Z\346\245\224r8\34>\377\374\363_}"
- #"\360\376\207\37~\370\364\311\263\245\324$\224\207\351$\217\3676"
- #"\333\223\315v;N\265`\26i\230\263\265u2\307\6\4\335b\334\202"
- #"\231\37\364\336\343h\360\30\4\210h\n\356]|\2\231hH\336"
- #"\275\317\335\274!\22\201\39\3\32\30\270\232\5\225+\216."
- #"\0\200F\206\200\311\330\21,\272A\270\25\270\17\335\34\264\240"
- #"[\374\246\254\250( \0223\370\351\351\351\323\313\317\16\207\203"
- #"\20\213\210p\n\206\4\"\nY<\366\220\274\2656\320`f\314iO"
- #"\374\352\353o\376\203\177\370O\376\355\277\371W\252\240X\34\34ZCB"
- #"7b\24\302\241,\200(H#BC\00145[V( \6\237\23]\343\22@\234"
- #"\310\321\\!\230ySCp\17\f\246i\334{\f\244\2\254K[8n'"
- #"\301\314B\311\246\201)X(\245\206)I\330$\tv(6\36\307f1\314\201_/*"
- #"\327\313\327\303t\375\304}%\244\36\331\371\0\22\304\27bD$#p"
-) 500
-(
- #"P\255@\350j\16\240Hw\314D\215\b\362 \3438\f\243HB&@0T\263\342"
- #"\272PkM\311\227eyvsu8\34\236]>\377\340\203\17>\375\364\363\335"
- #"nW\232\2\320\240\274\305|\2669}\341\374\376\375\363\363L\322\264"
- #"\244\224\6\201\25455\252f+N\n\335{\314\231\37\351\f\266J\b"
- #"[)\245\2668\3531Y\377\22\346\rK\16\235E G\17\2031\214\""
- #"\317\372t\245c\212\243\2\\\365\300\327\334f1\274\275\313\3031"
- #"\fD=v\235\313\273\320`!L\332\\\306\204\346\333\355ikz\371"
- #"\374j\273\335&\316f\340\210\314h\316\30\30\22\2A\2\303\303"
- #"\254\255\231H\336n\316\376\351\177\363\337\376\374\347?\377\341_"
- #"\177_\215$e@v\307\322\252 #Bi\272\331l\230}Y\n\6\366\231X$i+\0`"
- #"\256\341\226CD\26\344>\240xj\4P\335\274\326(\3pej\36?\217w"
- #"\330=Qcp\35\360}pwW\2\5o\252\20\34%7G`@]c\3507B\rVB;"
- #"\4\210\177\315\20\375a_\353\275\300\"\0@\27vr\0\0!N\334"
- #"\265\375\320B\233\361\350n\202\304 B\341\377\201\202(\230\22\247"
- #"\304\261\333\25dr\253\245V\367\252\313n>,\245\\\317\373\317\36"
- #"\177\376\374\372\346\351\263\313\317?{\262,\225\210\3241\221L\224"
- #"\37l.\316\316\316/\356\235o\267[\2,Z\262**\35\352\222g\362"
- #"\246JF\210\216\240\340Zj\253\265\224\262,K\255}$_k\3\266RZ\321ZZC"
- #"\243h\327\3004dU\342\235\n\243\252\22a\354\24\4\311\30\1BU"
- #"4\2508`\206\346\235\350\20\203\277@\271\335\271\272\306D\314\235"
- #"\\\206xW\26\37\0@\232\372<\317$\323\274\224qs\362\344\311\223"
- #"\233\347W\207}=;\275\207HC\312\230\223\3vQ"
-) 500
-(
- #"\37\202,\\[\313y,\213\226R\231\245,-\245\341\342\376\203\253"
- #"\313\307\363rhKeN\346\0044 \346\263{\343\305\305\305r\270~\362\264y"
- #"X\"\32FGvlw\2\355\210\330\307 \356\316\210\266*~0\222\20\2"
- #"\241\252\322\21\213p\304\5\302\235\260\363\16<t\17T\210V\323"
- #"\365\240\217\201\331\212E\355\222\267w'\202~l\17\375H:\306\365\330"
- #"X\237Z\\\253\307[:\375z\271\3\200\315D@\336\313L\354\375\""
- #"3\247\224\204y\34\307a\30R\342\234\273B\357\376p\343\356\241\323"
- #"\245\350\317\257\257\256\366\273g\273\353\317/\237\336\354\367\207e"
- #"\231\347ff\202\2N\333\315\366\225\263\27^~\370\205\315\305"
- #"\t\213\244a\30RB\6\21\271\331_\17sb@p\17\357\354\270JE\273,"
- #"l\255\265\265bf\252\255V\222\225(}\373\326\200\1\b\b=\312D"
- #"\216\3554\20\3Y?\6\372I\5v\4Z\366C\326\21\21*(\2013\270"
- #"\231\365\236\372N\257\215}|v{1\343\23\271\236o\0\340\362\371\316"
- #"\335\313\2)\235\345!}\372\331\323O\36]\276\370\342\213g"
- #"\247\233\335aO\0\323f\20!\253M\331\301\240\224\235\252^\357n"
- #"~\360\203\37|\347;\337}\364\331\323\327\337\376\346\363'\237\375"
- #"\350\307\177\315yS[\e\362\377\317\327\273\375H\227]\367a"
- #"\353\266\3679U\325\375\335g8\274\21263\22E\211\272DF\f\t\"e"
- #"\335\22\311p^\234<$@\20 \b\362\222\374\17yI\376\215<\0310"
- #"\f%\200\221\4H\f)r\244X\266.$\5\222\262\344D\222cY\"g8"
- #"\303\231\357\326\335U\347\354\275.yX\373T\327\214\215\24\0063\375}"
- #"\323]]\347\234\275\327^\227\337\345\301\325\374\360p\365"
- #"\344\361\2637~\346g~\346\217\376\370\353\317\377\340\237\231\237"
- #"\332z\267\333K"
-) 500
-(
- #"k+\222a@N\205\3021<\220H\250\344eu\263lR\b1\0\244W\f\0hD\230"
- #"\262\207\210@\n\205\23\4\200\372\240\342\303\310{\261\347\241"
- #"\23\243\1u\276}\230\202\203\214DdA\333\264\17`\253*bh\4;\6"
- #"\201\243\202\3474)3\"\367`p\242\341\233\222wQ\262\351\36\216\210"
- #"\211\203\347Rf)\205ib\331\25\21\204}\221y\236\347\375~\267\233Vo"
- #"\321\241\255Gk\335{s\325\233\343\355\262,\253\366\327w\267/N\267"
- #"\n\361\352t\354nK\353\314R\270\b\360\233\217\337x\353\361\e_"
- #"\370\344g\366\363\201\4\233\333a7\3\241Q\351 \245Lv4\26\230"
- #"\203\216\255sD\20\265\265W\224\336\3144<\260\273\35\373\t\273"
- #"\224\312\326\225 @{%^\f,\260Cb\252\\\346)\fH\263(D$\24"
- #"\21\327\265 &PE-i?\256\206\210\bN\236\30_\aftf5\35\r\34"
- #"\bD\6\360\bc7D\266\344V\\\314\256\2445\25\21Fr\267\256JDR"
- #"\352\203\a\17\337y\347\273\357~\353\237\a\330\233o>{\366\3441"
- #"\vb\304\\k\230\243\307\a/\337\177\365\352\325\267\277\375\355"
- #"w\337}\367\301\365\243\377\374\277\370/?\365\351O\334\274\374\360"
- #"\277\373\357\377\333\27\357\276\203e^\233\376\315\37\373\361"
- #"\377\364?\371\317\260\324\367\337\377\336\357\177\355\b\204BRy"
- #"\247z*\314\t\211\35z\\\371i <\\\316\177<k\233f\244\3618\357"
- #"\252\310\3665@D\364\310\202&\22\a\23\21\16\3\320v~e=\2270-"
- #"\r\25\30\352\346x\337\332\v\3040s\367\373n\305\30/m\202\301"
- #"\271\203\321sD\3DH\1D$44n\22\31\236\0236\"\230\211\346\""
- #"\225\244HIX'#\21\200\266v\267.\0\260\366\246\252\307e1\263\323\351"
- #"\264\256k\v;.\247\233\333"
-) 500
-(
- #"\333\26\346@\200\\\234\347:\357\352\356z\267\377\201O\177\356"
- #"\a\336\372\324\343\353\307\225\3309\314}\272\232\232\366\26k)"
- #"\245\30MEDDU1M\357q@\3077c\251M\340'\22\340g)pC\24\311r\316\342)"
- #"\24o^\236\352tm\212\340A\302\214\240k+\225i\f\202\221(\275"
- #"\253\202\360\374\276\34[F\215\1n8\312\315\f\235)G\221V\252"
- #"\243'v\377\222\363\267\205\215\2\212\211\3524}\366\263\237["
- #"\336x\363\373\337\373\336\237\375\351\277\372\275\17~\327\314\246"
- #"\2510\363\355\315MD\334\335\275\216\210/}\351K?\373s\277\370\306"
- #"\eo\202\e`\233\246\362\357\375\364O\377\343\337\370\215\376\352"
- #"\365\365\223\267\336y\377\373/^\276\376\324\347>\371\345\37\373"
- #"\322?\375\235'\21\241\321\5|i\353|u\320\265\17\315\350-2\17H"
- #"\336F\300\3\0\r\307\234CF\366\273RU\32lS\255\210H\354`\344]"
- #"V\300H\31\375mEZ\300\226\373BD8\6 (\6\r\25\272<C\2RV7\34"
- #"\375\276\177\226g}\16\375x\214\355\206y\261\0\246\262B.\301A\3563"
- #"\17w&\24$a\256R\252\310\\\253\214\266\210\257\353\322\264E\304"
- #"\253\273;U=\266\265i?\206{D\202\202\1\2405\355!\20LA)\334\373"
- #"\364\361\343g\217\236=}\360\350\323o}\372\315\247\317\246\202\356"
- #"\256a\216\300\23\366\273\26`\200\316\314\363<\317u\352\275#\200"
- #"\273wp\6\352\341\315\255\273\365Q\207\f\267\34\226\350\335\324"
- #"\224\220y\332\1\320\332m\22\\N\376\356;\37\354\257\237\314W"
- #"\23KB\206(\355\20r\244\216A\6\250\6\335!\34\262\241\226;"
- #"\336\222\254\244\203J\v[\342\316\4D\301\226\20\316{s\203"
- #"\334\330R\223'\202\200\205m\343LxD-\365\352j\367\354\311\365\27"
- #"\376\235\37\350\275\253"
-) 500
-(
- #"\352\361\366\346\366\366\266\316;\"xp}\0\210\307\217\237,\3132M"
- #"\323\\\vR_\204~\371\227\177\371\217\277\375\355\357\5\334<"
- #"\177\3164\375\316\357\376\316\337~\366\267\257\37\354\336\375\376;"
- #"\346k\200\5\330\365\325\303\323\361.YM\347\20\b\220\214\266"
- #"\320{Q\266\f_\2337S\242\f\266r!6\271|\4\206\241=MY\tdvh"
- #"\e\361(\207\230\243\327\223\264\256\255\315O\227h\6B\367\1"
- #"\fL\341\3421E\32s\271\321}\225\302\214T\210vE8\220.\314\362\206"
- #"\35\372P\235\1fbf J\375\206\305\272\235l\351\315\314n\227\5\0V"
- #"\355\253\232\212\364\\\331D\256\3214\0e\226)\"\236\\?~\366"
- #"\344\351\347>\365\351\267\336x\353j\267\277\276\276>\314\223aw7'"
- #"\217\210\36\232\216\364.\305\335\366\363n\267\333\255\353*\"\330"
- #"\329\2620\20kh\353\275[s\b\334R\264s\203\306\3y\312\215J"
- #"\302\265\243<\177yS\376\362;\237\374\354g\16\327\263\206\306T\252"
- #"\220\231w\353\t\2771$\265P\317\333\eCk\t \331\333y\275\t"
- #"\230\312\1\f\v\22\5szJj6\211\266NCH\221\24J\213\234M\345"
- #"\22d\3410G\214:\311\365\203\235\273\251*}\342I)%Yjjk\212\312]"
- #"\35f0`\4s\337\355\246\237\374\211/\377\352\257\376\a\277\366k"
- #"\277\326\210\227\345\370\315o}\343\vo\177\246\367\37x\377\335wZ"
- #"[\366\207\311\233F\244P(G6z\317\311\351@,\307}\277\344\242\247"
- #"\352\b\1\221\363\2141\246\e\215\222\21H\317\211n\\`\252/"
- #"\323\336|\267\240l\372$\272\3`\ede\20J\300\24\307\246\262J"
- #"\30\341\f\210\204\222\206\310,\31\377\30\2512g\16\223\300\351"
- #"\341:\223Rw\356\21\321\300[_\315\265%\276T\365\330\233\273\37"
- #"\333*"
-) 500
-(
- #"\"\36\250\0A\324\324\30\250\242\230k\270\\\357\366\317\36>}"
- #"\366\360\361\247\336\374\304[o\276\365\306\323g\373yr\37\26#"
- #"\26\275\326\0024\354$X\260\0241\323\352e\256\323~\236O\3234\365"
- #"\266p\2\235\31\2222\254\275i\217\210\324\37J\277\35\0Bb\3"
- #"\4$\205\240R\251\326\a\17\236\274>\365\357\276\363\2563?y\343"
- #"\251L<\231[-\346-\324\"\220(\24P\r\233\251\a\200ckm\230"
- #"\371xD\204Y\264\326\206\321\aS)%\247\\y\177\300\333(\267E\200"
- #"\21\322\205\30\21+\v\244\2761\204\24\256e\"\202\2217\206"
- #"\26\302y\232\6\nUa]W\302\244\36\240\231\0220\vI\0243o"
- #"\355\364K\377\376/\336\336\336\376\372\257\377\346\213\357\277z\371"
- #"\372\325?\370\a\177\377\253?\373\323\346\35\264\2071\6\234\216"
- #"\267\17\16Wm=A@\f\242\334\205\34\245\17\372G&\bp\21&cs\361"
- #"\f\270W\36\312\261\261mEE\326\277\227\251\3069\267\e\177L#\223"
- #"\313\365\35\367GC.q\5\305\263\330\215\17\245\21F\342\264I`N0"
- #"\34\20\345m\245m\t\2220\0\250[\353K\327\236>J\253\16\243"
- #"\22\0H\25\207\305\214\1\b\205\271h\367~Z\35\270\314<\361\364"
- #"\364\311\223\317\177\3523\237\373\344g>\377\231\317>\271~8\317s-"
- #"\305LO\247\223\202\271\251\223!S\20\365f\313r\4\0A*4T\253\204"
- #"\270\212d\r\356\0\6Q\2112#\334\212bUV\367\360\1\232B\346\22"
- #"\304\6X\353\24,T\313\343\253\207\355\373psj\366\374\265Lu\236e"
- #"\256\225\231\302R.-\34iU\350\246f\16A\353\262z\327D^\231\2316k"
- #"\255\235oo\242\22s\315\225R\262xN\315\261lc\tX \r\353\233\260"
- #"\241\300\202\210\4\350\341\2144\3153\0\265\326T\e\221\4"
-) 500
-(
- #"\6\27\231EZk@\22\1\245Tw=-\313\243\307W\267\257\227\303\325"
- #"\243\237\371\312W\367WO\377\327\377\371\177\353k{\365\372\275_\377"
- #"\215\177t\363\362C\0_\327uWd\232\246\336\373H\360\223\323<\6\274p"
- #"\361\237\2135\4\367s78\307\275s\35\v\31\21\375\274\4\307j"
- #"\304\363\342K\230_\"\27\301\307l\367\36\306y\236\301\340=}}\364"
- #"_\30\20\320\205\200\21(\1\261\30\24\36\30\20a\16\252\220"
- #"\250\16\0h\272\6a\3h\275\267\326T\265%Z\331{\306\6\332\344C="
- #"\325P\t\0@\34\346\240\271\316O\257\237<z\364\350\255go}\3413?"
- #"\360\326\2637\237<x\270\253\223\233Z\272\27U\20D\v'\22`2\357"
- #"\351-\313\314R(@\272R&\3\262-\301@\354c0\36\t\307\32\22\355H"
- #"C\253'\310P\323\232 \20\247\303>\204W\265y?=|\372lmvs\354x\362Zg"
- #"\"OA\325\b4w\rmfk\267\324%\353K\267n\252\232\23\35k\326{"
- #"\a\0173#\360\301\210E\244\"\245\24)\23\21\325*\363<\327Z\211"
- #"H\254\273\201\20793',\304\300\0@[ \242\223\251j&<\4\230\306"
- #"\314\356\361\372\366Tk=\336\336N\323twZ\245\0202\277x\371z\267\237"
- #"\311\375\257\275\375\366|x\362\271\317\277\375\17\377\307\377\351"
- #"\235\277\\O7\317E\212z\307\2600\310\264.\347\e\eU\364B\206u"
- #"\24\31[\2v^e\271\260b\363+\274o~f\205\225\205/\304\26"
- #"\273\363\\G\274\37\204\fB\377=\252`\254\355\374\367\331\363"
- #"\355\34<#E`\3S\315\203\223\305\354C\21\37p\200\231q\3\312"
- #"[\2709\364\360\245k\357\353(\222\222,H\224\372\307\356\371\365"
- #"\220\313\246\340\353\253\275\34\350\321\303'\237z\353\323\317\236="
- #"{\363\311\e\317\36>"
-) 500
-(
- #"\331I\r5\220D\226h\263\265\233\206`\2203\243\372\271\317\327\21S"
- #"Q\211\253\24f.,\31]J)\350n=\264k\r\31\327\24\2515\220b\265"
- #"\344\20\3213\325f\"\332\35\256z\314-\342\366\356$\265\256f\16"
- #"\354AKo\340\370\nU\220\f\242\253\252{s[\222\235\334\254\257"
- #"\352]{k\307\273\323r<\271\252\231i\32[\304=~\261\24.\245P"
- #"\235\230\271\326\232-R\21\221f\f\0=-\a\300#\"g\333\bJDH"
- #"\216\b\30\247|\330\0d.\311\5\274[ND\244\315#B\227\365\372"
- #"\372\260\34\217\321\2460_N\276\277z\372\251\317\355\376\253\377"
- #"\372\277\371\363\177\361G\177\377\357\375\0177\307\23P\t\220e"
- #"\325\303\236\t\303]\35\302\0\3\200\321\2s(\2212\2228p\v"
- #"y\1\1\0\3\377\235\222\217>TB\300\267\221].\227\314\2\3"
- #"\2\20X\370\274\230\362\334\315\eaC\226\0236\211i B\246\364)"
- #"\300d\e\344ZG$\6\2\341\b0\214Tb\3112\23\21\333@\364\20\0"
- #"`\aw\327\2549s\352\355\2365)\0\210\b\1\1\b\aV*\23\b"
- #"\tM,\207\371p\330]=z\364\350\321\303'O\236<y\370\360\341\365"
- #"\365\203D\352\237\264\255\204\307S\327X\231\331\321\f]\230\247"
- #":\e\364\326\264E7\3629\211)ay\205\265V\244[w=\34\16\315\255 "
- #"\2\300\352k[\326\253\303\203\335\364\0P\2Qj!\"*t\272;"
- #"\365\300\231vH\373:=\356\n\17\36?\271Y\313\322\361\345\2077\307"
- #"\246\206\325\203VsS\264\326\317\323f\353\276.\31\351\303\21\326S;"
- #"\235\356\274u\353\252\313\332Z\323\326\307$\20\r\205#\375\305"
- #"\v\327\324\313\r \242\335n\267\277\332\317\363,C\327}\343c\230Y"
- #"\36\304\234\375\n\34\23\356H\24 B\323%\a\17\356Cq"
-) 500
-(
- #"6UV\273\336\231\331i\265R\n\302\204\\k\245\343\335\372\231\317~"
- #"\376o\376\364\317\375/\277\366\367v\207\307\247\273c\255D\302}=B"
- #"\316uH\"\302V[\234\30\0\0 \0IDAT\243\273\31\r2\335\375\261"
- #"\270\305\277\361G<ca\340\"j^\274\362\22.\303\e\216\331\366"
- #"\31\301v\377\375\347w\340\355\244\310\3678\177\347\307\352\30\r"
- #"\243\0\5\240\350\210\330\263_\221\276\245)\356g\227-&\210l\345 "
- #"\326\220\211\312$\263\4\356\246\335\243\253\353\253\335\325\276"
- #"\316\373\375\325a\336=~\374\364\352*M{k\221\272\350\222\b\263\300"
- #"\364\321l\314\354\354f\346\34`\244\336Zo]{\302\205\210\322\206"
- #"\333H\270\224\222\364\320\0360M\223E\364\336\315\24\3\222\0004O{"
- #"\341\232\327\265\256kD\20I\370\360/)\\\302\201\2\314B=\232\332"
- #"\361t\2736_4T-\271\224n\26\216\256\336\273\251\252\e\250G_[k"
- #"\r\22\30\327\325T\315\322\320\17\1\b\35=s!\213@On\21R"
- #" u\240S\357\eS:[>n\240:\300<t1\232J\252i\6\302\224:\3300?i"
- #"\362(\314|cK)\205\300Kqp'\242Z\257xVD|\366\311\317>\372\324\347^"
- #"\276\367=\244\335\203\207\327\257^\277?\325y=\35s\3205\264E\0"
- #"\22x7\372\226c\351\4\244\207\t\fq.\270?\2167\226\335()\262"
- #"\2312\26\300\371\303\347\377\35~5c)\337\e\200\215q\376\3209\317"
- #"\345\233?~Y\t\241\3x\350P\206r\317~$$\234i\264\3151\222T\277}\0"
- #"\306t\0\225\231\313awu\230\346*\265\0]\355\257\337|\372\354\321"
- #"\203\307\265\326I\246R\312\203\253\a\273\335NDL\315\275\333\332"
- #"\214BUib\300\242\250\0\331U\317\32\354\36g\0\0,\\\245\264\356"
- #"\231\24\316"
-) 500
-(
- #"\363\274\337\357\227\266\202t\20^\207\17\367J\210\245\24\21"
- #"\331\357\367\245\24\34\356\25\301,\314\23\261\20\312<\357\367"
- #"\273+\222\n\306\36\36\16np\\\326\273c\353\6\31\5UC[7"
- #"\305\260\254<\"\34\254w\355\211\307BD\301\302\302\205#\220\316"
- #"\372\202\200\230yp \221f{\225\250\224B,\200,\"\230\\\322\314"
- #"\262\2 4\347\22\331\351\1w\367\341\216\32\21\241\341\252\332"
- #"uDOw\a\350D\304(\245\220 p\323\204\246\356\235\35\347i\217o~\362"
- #"so\377\360O|\353\370uh\272;<\266\260uy\215,\21\6\t\312Bb@@B"
- #"\340\330H\237\270\r\2643B\237qo\347\35\222\327\350\27\371\"$"
- #"\307h[\232\227\253\3602\370]\346\202\271\4\263)\23\331\34"
- #"\273\334{\21=\267Db\234b\314\373\0F\323'i\200\230\302\\\200\bP"
- #"Y\b\260p\335\225\272\223\371z\267\177rx\370`\177\230\250\22\340"
- #"\203\253\207\317\236={px\20\21fi\367j\321\265w\355\275\207\240"
- #"\366\16\202f\335\233\2\270\221e\202dfB\354`\203\366\26<\356\t"
- #"!d\17\237\220Hv\273\335\276\255\310\275\314\323\355\335qY\26m"
- #"\355\274\370\250H3%\313-\a\20\tKc\"JM0D\232\346\231\333BEH"
- #"\201ha*\200D\210\241\251\17j\356f\0366\306\3\340@(H\233D>\""
- #"\246\334\202\20\212\bS.L\20\21Nl\" \20R\242!\230\20QjA#"
- #"4\311\340B,\314\35\335\335\1\303\223\205\212\0q\316\3\0227\225"
- #"]\245\2100E\325\36\1D\275\367\327S\251\"\302B\"r<.L\276"
- #"\237\374\263\237\377\302/\377\352\337!\222o\374\356\327~\370\313"
- #"?y{\373\3767\376\340\237\3604\273\255\241\32\340I\201\204`\v\e"
- #"\30\352\313C\20\1\322u\361#U\310XL\24\367\307"
-) 500
-(
- #"\337%>#e\332hD\326\21\0\3\356\315 \316o\3451\34\251c\v\245"
- #"\279\300`\354\345\37R\0\316\a\3663\316\237\16\200\b\211\205%"
- #"\260\224\251 \35\352|\265\333?\234\256\16\363\356\351\341\341\365"
- #"\376:\324\30\345zw}UvLdf\31\327\264\365\6ha\275w(\254f\t+\a"
- #"\302\260P\355\352\34C\300n\2023\215\353\342E\314R\212\233eh\251"
- #"\265:Pa\364\200\246}\236D\270>xp\235\263\273\210`\346R\250\310\224"
- #"\227 \"\273i\22\21B\224R\366RN\335\0\200\204\335\257jm\346\324"
- #"\233\2378z\263&\270\256MUMI\35\334\201fAD`\22\21d\317,\223\231"
- #"\247Y&)R@\0Eh\342\222\350Y\317CG\370\314\"\20\342$\376\214\371"
- #"\201Y0\243;\272\203\e\270\203\363\b\1\246\21\1B\2650\365"
- #"\352\271@U\240w\324\356D\354\356,\203\230T\b\35\343\260\237o\357"
- #"\236\337\334\36w\373\353\317}\376\v\377\372\317\377\352\351\e"
- #"\237<\34\230\251\344\204\302\3010|4P>\n\331\303\215\bx\216H"
- #"\371\300c\203N1 \2Z\236\341\3\273\373\221\210\b\243\371\274"
- #"\231\355l\302 \360\261~5\\\340n\266\334\363\374\205\371\345\370&_"
- #"\233>I@D\b`!\236\244\314\245Vb\2462I\271\336_?:\\?\230\17;"
- #"\251\373i\277\223\332\2653P\230.\307\273U\327\210@&\21QE\v\353"
- #"\336{\357\344\322T\331a5\25\27ri\321\261!I0\263x\1\200u]"
- #"\315\f(R\206!\0202\310\245gG1\233\3479\260K-\1(\"\246+s"
- #"\231\17{f\311\363:\305\240\2119\305\231k\225\375~.\2\0>W$\246"
- #"\303\276\224J\263\316\363<\235V_\233\256\253.\213h\207u]\327E{"
- #"\357f\321\325\315\fK\245\255?\n\342\314,\225Ed\236"
-) 500
-(
- #"\244\224R\5\204X\204\246R\22q\222\340\376\321FH\260\26\5$\366"
- #"\365\34-\34\3\t0\0053\210\"0\204\302\321\304\"B#\252\214"
- #"\242X\335\315\240\v\250x\357}\277\223t\376\0024\17\237\252L\23"
- #"\327\351\361r\222\345\366\346G\277\374\3437\317_\377\237\277\375"
- #"[\350w\352\6\336\302\25\300\323\221\v\2\20\3\3\263"
- #"\324\30;\342\342S\rFt\216\35\3\316{\350#)\340Vv\300yX\222W"
- #"\2645b.\203\350y\241\373\266@\317\357\346\243.>\27\323\367\375\361"
- #"l\32\345[\21\"S\231H&\226\235\324\271\324\211\244\326\271"
- #"\22\357\247\335\203y\177\250\263 \241G\216e\221\310!N\353\342"
- #"\32\0\200\302\233G\b\251w3#/Ko\330C\315\372\235N\323\344\350\""
- #"R\347\251\24<\247\200\343W3'\376\23\20H\270\"\232Y\231\352\1"
- #"\16 MD\24`\236\347\266\36\21\271\314S\272\267\354v\273i\232\334"
- #"]\265\245\200-\23\226\302\0\356\332\1\275\24\273F^\rw"
- #"\216W\373\251i\234\272\367\346\247\323I\325\227\265\257\353\332\315"
- #"\334@\303S\201\210\231\323\3410\307D\245P\255U\n\t\261\24\250,"
- #"\3024<\333\20\213l\367\375\f\326\32\23\320\213\312\222\316\335"
- #"\267\34\331m\260Xg\216\210\346\331UFUS#w\250\314VLUD\244\267\225"
- #"\231k%D\234\252D\330i9\316\363<\v\36\336\334\177\362\357\276A"
- #"\241\277\361\217\376\241\233\21\5\3\6QN\277\335\207\e\362"
- #"\366\211\376\355\257\221\300m\363\357sd\302\0300\202-6E\256&\330"
- #"\26c@\340\260]=W\334\333{nk5\321\3701\340\252\260\215\f?\362"
- #"[\306\35\n($Ed'uW\352^\352\314\245\22\27d\221*\2015\230"
- #"\r\\\303\301\e6'\313\326Lj\302vP\200\24BF\313\342 \23\334"
- #"\211\327uu\206\254\177\367"
-) 500
-(
- #"\341RYj\331\32\316\222\v\317\314\210\221\231\r\334\314\30056,"
- #"\0063O\323\324\267-JD\bS\4\226R\246i\306R\347\375\216\231\227eA"
- #"\214i\252\211\366.\245\24&\0gr*\310\205\251cS(\205jP\321p\207\335"
- #"^\314l\355\272.\223\272E\240\215J \321\220L[ck*\\JaI\30"
- #"\21J\0161\211\22C\24`\260\231\273d\"+<\364\2519\"\272\233"
- #"\e \20ox\306\24\233O\210\215Cw\367R\5 C *@ (\241;D%\0\230k"
- #"\211\b\244\34\2377D\230\16\265\267V\366\207\320x\374\346\263"
- #"\237\373\305_\274\273}\376\315?\370g\257\236\377\325\325\325\356"
- #"\366x\24B\364\264\355\313\341m/\245.\313\302\314\230\215\t3Dt"
- #"\263i\232\254+\21aD!.\"\356N\21\f\330F3/\261-\31\267\316R"
- #"\34p^\210\27\223d\210s\377g\300\35\0\"!\351\203X\262\255"
- #"\320\315?\3121\20$\230\221%\260\2_\227\375~\336\35R\324\276\324"
- #"\210\210\245\227@\362\240UW\273s\321,E\203]\255\21Q\fk\232"
- #"\16\0\1\326\315\250T\203P\300\265+.\322#J\235\271\b\0261\231"
- #"\366\207\303\264\337\23C0\247\365\265\t\360T\300\335\303\230\210"
- #"\220z\326D\205\35\\\21W\265\16\n\16\273}]\327\25\2ED"
- #"\346r\330\357[\230\273\256\3325|\342\2@\f|\265\273\232\213"
- #"\20\2\352\221\243\3\"\22O\3145\"\220\315\242\232\1\360l"
- #"\b1\257j\313I\272\e\247I\204\32\6\310v\"\345\22\224\202"
- #"\"\2\340\"R\n\213\b\r\375\34G\204\346\vb\244\224B8"
- #"\22\221\364\226M\217a\221\340\303$\34\",.\"\3^xk!\""
- #"\22\"\3\201\5P\211\b\24G'\"\316\226\aY\232j\"\206"
- #"\205\222\224\aW\207Px\371\374\305'\336z\353\357\376\307"
-) 500
-(
- #"\377Q\225\370\372\357-\353\361Ejd\242\346\256\32UP\272e\347\253"
- #"\265\226\3\275!\5\244\367\32\2041D\214\2\"\0300\0G\t"
- #"\2\210\210v\236\265\301\3751\0321\242\37~\4\242s^\224\333"
- #"\t~\201\205\36\3212\20\3\30\270\"\27.\225x?\37\16u>Lu"
- #"\226RP\b\b\334,A\353\b\226\336a\bF\316dI\354\315V\277\252"
- #"\256\272\252j\362\233\263\305\35\304\3418_\37\212\324\4C\314"
- #"\373\303n\267;\354w\273\335\234\370<O>^\202\35\23\327mCR\27"
- #"\231\2\221\230K\341@0\207<\262\213\200#\320\346%\226\223\375\240"
- #"\321aH,7\21\271{n\307p\237\330\203\334S>\n\303\21\n\23\2W"
- #"\v\b\236\v\354\0315\34B\34\302\214s\334\262\255\r\334p1"
- #"\204L\314,\3G\224<\342l$%33\ac\20\216\262\271\243g\22\227\f"
- #"\360\241$\6\347G=\236_$w\3177\241\244\34\31\247\252\34#1c\221B"
- #"\4)\20\203d\271\364\25\31\315{\323\353\303\225\365V\367\207_"
- #"\371;\377\341\207\37~\367[\177\370\373\205\v\20\6\236\220"
- #"\b\373\0\342\347\324+\257\313\314\231\207as\376\25s\272\242\216"
- #"\321\b\263\234k\330\234\310\345\36\242\363\232\203\3733\371c\257"
- #"\217\321\3407\376!\\N\215a\363\4\20$!\231\270\356J\255X"
- #"\36\354\16\207:\357\2462<\37-\22\330\225\344u\203\210P4\0274"
- #"\204\201]@L\215]=\256\307\326\232\205\22\211\244ib\341R\307"
- #"\262\333\35\366\245\224\a\17\36\324Z\247\3034M\23\322\0\242"
- #"\20!3B\270y\367\256\204\221v6\245p\17\20Df!\24\265\260e"
- #"\211\0fI\t0\brO\244\26s\270\5`Pa\231\353N\210];\5\241H"
- #"\364\306\326\361|\256\223\4B\305@\300)\325\360\201\242\210A\270AJ"
- #"\374\366\261D"
-) 500
-(
- #"\316\312}\1\4\210.)\315GA\224Ue\322jA-L]\365^\244Yt\254/;"
- #"/\270\214\17\214\bg\3514\204H\23Tu\217\356\230\"l1\2\"xDP"
- #"\00421 \0230\1QZ\217C\251\223\241c\251\326<{\224\200\370\354\3157"
- #"\276\370\243?\366\315o\376\241c\230[7,<Z\337\31\256\211\20\300"
- #"\1\230Yz7\346\3426\350\30\"\342\20\331'\2\200B\2\200L\24"
- #"\314I_\307m\224\f\347\2e\23\302\274\214\210\377f\b\304T}\330"
- #"\370\r\243\345\1i\344Z*\226\"\262\223i\346\251\262\b\222"
- #"\0201\246V\253usL\34624D4\bU\r 6\266\6\356\336\242G\204\205"
- #"\272{\267\246\252DT\n\312$\304u\332\37\366\373\375\223\247O\247i"
- #"\232JE\304i\252\"\302\308\314\221\211$\345\b\321\264EZH\1DDb"
- #"\306zW\"\n\"\221RJm\253u\355\b\230|Y3\357\315x\346\241g\242"
- #"\316%\230y.\265\20\253Z\200\243[_W]\216\\\312\300\26\244"
- #"\30B \242\213\24\267\26\b\304\325\21\314B\363\240\221\342["
- #"T\316a\201m!k\20nc\24wh\346\26\241\250\333p%\361)\222=fJ\376"
- #"\311\206\21!\"\222\32\261\311\220\30\270Go\330\24\232\252"
- #"\371\30\267g\232\231\207x\225\241Lu64'\306T\250\234\2444\323\335T"
- #"\216K\v\304\307\217\37\277z\371\374\257\177\341\355ywm\355\306"
- #"\255%\311\0356\254J>\373$\34\325Z\227e\331\357\367i#=\226\305\2208"
- #"\202\363\37\323u\307\315\207f\214\17\276\315}0\eq\374\3433\275"
- #"\363\377M\214%^\364\a\362\225\3766\"u\")\\+K!\22\0"
- #"\323\326)\211+`\332\335=\17\326\36+\"\32\240\252&rX\207\250Hw"
- #"\367 df\"\240\"\"\"\245\362T\245L\323~w8"
-) 500
-(
- #"\34\366W\373*E\210#\302\255k\30 \203\aV`f\306\202\210\204\21D"
- #"\2058\230\363\351\250\272\252G`\244\256\0062I\245b\303\361\a\3"
- #"\2\34\260\2731\220or\352\3\326P\30)P\r\\M\233\266\305zG$H"
- #"t\344\320\bD\b\20,\206\356HDJ\201\204\316\202\210\b\24\6n"
- #")[\225z\22\211\213\306A\201\310\b\231\210tSGC4\17\353a\232"
- #"\266\267\242I\3@`\32\246\300Li\35#\0\21\356\332\273\232\253zk"
- #"\266\256}\325D\370G\236\364\274\311\217\br\b\17\304\335f\1"
- #"\226.s\275wU\a\240R\231\224\216\267w\3234=y\362\354\372\372\301"
- #"\253\347wH\302R\322\0376\302R\35\314\207\346\210e\262\22\233\6"
- #"\212m\2\250\314\314\231\336  R\32U89\300P\256\31L\327\370\330R"
- #"\313\356\317\271\301w\277F\371b\331\321Vq#\"\6\24b\221RI\4"
- #"\231!e9\303-\20Q\303\"B\207^aw\367\254v3\245\31\352\206"
- #"\27\26\327\"Rj\235\247RkM\353\312\3354\327:\357\247*\222\211"
- #"\2559\2 4u\21!Gwg#\0p\365\3000\b\212<{a\263o\320\300\226"
- #"\336hA\b\200$\245\3240\317\a\2100dv0\220m\243\16\235\23\301"
- #"\330^\2714G<\313\373\217\231\330\4\"\2067\210$\20\247\275"
- #"\\\244}\271\373J\341\350\351\221\234\263%\312\366-\363Pp\363\b`"
- #"R\204Jt\\\225\1\30\320\210\222\6%\3\26\217\4\310@\331"
- #"\356\305\0\354\32\21\321\273\257\253\257\275\367n\353\332\226Sk"
- #"\35\"0\0\230A\330\230\275T\24!\304\b\312\3019\nm4h@d\362"
- #"\336wW\207eYt\351\327\373C[\4\264W\336\35v\17^\352{\224"
- #"\242\0231\260\364)\1\233<\240\314\30\256\256\36\234N'\336\264"
- #"\37\307\212a\346\204\306d"
-) 500
-(
- #"q\264M\311.Rc\200\363\354\2\356\227Z~x\334\246s\347o\226R\0\206=,"
- #"o\326\204\210\350\2564n\211\17\265? \r\300\0\353\251\216\31="
- #"\324\335-\324\3142\346e6i04\334\2636cf*\205\212P\235J\235\204\231"
- #"\2\ns\245Ah\357}5#\221J\224\306\217\20\251\25f\356\1YP\307"
- #"\250\343\t\200\302\300\272\273v\a,u\306B\21\271+F\332\34\20"
- #"\210\34\214`\2416t\306\34R\312\262\244\336u\36\202\6\216\6"
- #"\21\6\321\301\331\211\303\203\23\206\2\0\210\301\b\21\4"
- #"\204\356\310N\204\2\201\350(\270Q\24\203$hL\253\302\254\v\4"
- #"!\3\303\220@\221\242\26s-\352\221\374\306\224\233\22\363\373"
- #"\6X\304\246\230\226\367/p\355\2664kM\333\252\247\265/'=-\n!"
- #"\304@d\210&\205f\255\323\314\20\201X\224\211h\244\221h\0\b\307~"
- #"\332M\363i]X\370p8\264\265\271C)\23F\314\245\252:@J\250b\2"
- #"\331\320rV\226\373\311{\357o\274q}{{\vH\245l\221i4\5#\321\""
- #"\37;XSw\377r!\236a\n\210g*\311GP\203[\332\3\227\177\317"
- #"\200\20\347\26\226'\224\315\2\302G\207\\-\0227\354\243\4QEh"
- #"a\335<\3022\300x8\23#g]\312N\233'\3176\203\301p\306\241\3717"
- #"\232\235\24@a\356\30\256n\350\24\1\314\314\306A\216\265$B\322"
- #"\3145\235\264\211yH\332S@\230E\316p\223\374\205\204\340`\20\32"
- #"\343\321\246\306.\227\302E\34!B79\4\at\2$\fp\v\367\0"
- #"\5\340T\221\301\324\23\203 \"@\310\352\20\0\"|\330\2\215C"
- #"\27a\3405\2030\230!R\274\n0\345i\244\260:Z\20\0\244\223\224"
- #"\334\34\357D\244re\205\241K\23=3\6DV\325\323Qon\227\343]?"
-) 500
-(
- #"\255\256\35\272\271\366%\240\213H\235x\232\212\201+\241B\4\1"
- #"\bi8\vL\302V\2700 \326\323:D\211M1\2\367\373\375\361\365\253c"
- #"ko\274\365\331\357\275\377\374\371{\337\231w3B3\r\355\35\211\3"
- #"\201\b\264\367\264`z\377\235\3571\240\207\257\353\312\214\336\215"
- #"\20\35\242\20\0223lhU\263\f\26\200iev\231\355E\226\304#\231t"
- #"\217R\212\231%\25\323\335\211\20\1\314\2540\201{`/$\315\a?6\0"
- #"\334\275\201\237\t\6\270I8\346\4\331`\270\v\251\373\306\230"
- #"4\fg\3462UadD\21\246\0A\302\200\276\254\267\255\37\346\303n\267"
- #"\3\342\325\fO'\"J\346\21\270\1\363\332\233\211\ba\20"
- #"\256\341\354\214\f\16\6\23\201\207\272\265\336\217\313\261"
- #"\367N\265\242\21\269\255\307\356\241n\16\224X&\4\3605\b\330"
- #"\r\205\313\272j)\245\255}?\315S)U\212 \264\326\204\n\21\""
- #"\21x4]\201\251\210`\266\2672\372C\bG\204\3\5%?\314\315"
- #"\207\370S\270\373\260j3\315^O\326\203d\35\\\307d\25 \210\321"
- #"\301\3ix\372R!\n\f\271\275Y\230\231\271'1\"\317D3\2130U_"
- #"[;\235\332\335m;\336\265\\\202H\242j\21.\305\314d\214V\201"
- #"\323\354\230\30\300P\214\321\3\3011\250\344\3641,1\26\4\224d"
- #"\0265\333]\35\236\275\371\306\361\366\271\373-\230\261H\204\305"
- #"\0gm'\351V\241\343&@}\31\301`\3\266|\224.\2\37\177\207\217V"
- #"!\210\330\325\335\274\324\32\1\211Y<\343c,rN3Z\243\f\3508"
- #"\272\330x\361\16\333\322\317%\230M\207\fO\2430\34\223P@D\24$"
- #"\212a\17\221\237;\201\"\"\262\237w\"2\317\363n\267KU\232\254"
- #"\1\263.\6t\363\256f\21\254J\252\212\225\1\300\325\232uu\313"
-) 500
-(
- #"x\2371iYWG\2d5Uu5\323\336\231\4#\210\304\335\tx08\263\303\345"
- #"\341\270\315\202\300\307\326\365\374\375\312\233\262G\362\t\317"
- #"\267s\3\243\01753W\3078\337\232\314z3wG\334\304\334F\327\314txj%,"
- #"9(\200\tQ\356n\25\321\230\234\210\252\244\340\263&ri]\373\351"
- #"tZ\27=\256\355t\354\255\365p&\236M#\240\27+\16\20\204D\35 \305"
- #"F\0\21\\\240T\216(\0\344N\6.\344\21\32\21a\314 \1zj+P}"
- #"\360\360\351'\336\274\273}\361\342\365\215\236n\357\22\350\220\17"
- #"\355l'\2\0\276!\6\21\200\201\317\222$\6\301qF\216\334W"
- #"\307\2302\310\37m\276\304\206\5\264p\302\n\21R\246y\336\305H"
- #"\\\f\301\20\21)\334,\266\2\2\321\r\ba\360\213\317\333"
- #"\343\274\4\267\276\351\226\324\217\233@CN\362,\372\261\31\342"
- #"\345\303\250\245\\\315\273\207\17\37>\270\272\336\357\257Dd7"
- #"\315\363<\227\302\2705\302\22,\316\3717\30\"\fh\335\r\327"
- #"\301\233\354\332\20\261\224\302\265\4\242C\264\246\316X\v\373"
- #"\310w\t\2U\25\334\245\262o\257y\222i\232J)\367\227\220\373."
- #"\235\234]\311\272\310DD\314\24\21\200I\370\262\200\300\224e"
- #"\344s\266\202M\a#\363\f\341a\3346}.\324\361O\3762eJ\346C\232"
- #"\206\a\"\312\213\17\27\"\"\352\347\315t\306E.\313\322\232"
- #"\252Z\353\326\232\206\23\21\241g:U\20\n\"C\210:\222aW@\216"
- #"\265{\4\6\32\21\261#Z@s\224\214\6\24\310\200\324\e\34O"
- #"\275\324\335n\177\275\277z\364\364\215\267\324o\332zk\320\3a\3"
- #"\260\306\345\352\1H\211\273\21\366\220\334\"\300)u\r \2"
- #"\300\263\25097n\266d\v.\242\27\2\0'6\230Dx\252e~\364\350\311"
- #"\253W\257n"
-) 500
-(
- #"n^\0211\221\179\252@\307\21\315bl}\377\310\347\t\330\322\356"
- #"m;\0\0 \5\4\17\222R\306\260\0s'G \242$\255\22p)\345p8<z\364"
- #"\350\361\303G\214\202\210\245\3604\225\303\341Pk\365\320\344\205D"
- #"\4I^203243\363\276\366\356\335\1 1\322N\244\236x\367\350\32"
- #"\26=\0\334\303\325\0\200\201\273\r\317\201<1K)\207\375<\225\212"
- #"\230\272\n\36\21\16\212\312\332\226u\235\245\324\334b\36\232Y"
- #"r\16,2\377\16@\4\336\344\311\200\322<\206sm\344\315\317\265\30"
- #"\230\n\374t\231\272\0\0\f\347\5\34\367M^<?\212H~\337\20"
- #"\361\332\366a\357i1\304\341H\210\351\332\343C\37\210J)\"\204\210"
- #"\341h\346M\1\30\230\1\21\300H\f{z|\232GpB\223!\20\220"
- #"\326f\267w\335\35\313t]\352a\177x\\\313n\252\373\326\357\220"
- #"\253[\277\300J\337\17\312\"\356'70\272\324\200\200\252J0\240"
- #"\317|6\332\374\267\201b\266H:\302'\"?z\364\354+?\373\325\377\367_"
- #"\375\313o~\363\17{;\216\335\314\333\342\263\0011\374X4M\202Uz\244o"
- #"Ml\300\1x\e+\235\266\233\216Y\345\321\220Q?\347\17\371V\326"
- #"\25\5\252\210\0201\"\2013\6\1\5\22KQ\3258\307)\0H\201"
- #"\350\374\25703Oe&\342\3254\f\273\aK=\36O\307\323ZJU\325eiD\364"
- #"\340\352:\205\305\210\250\367\236\347~N;\21\300\223L\30\16\1"
- #"\216a\326[[\366q\300$V\a\210\b\2442-r\236$\21\201a9\277C"
- #"$f\214\r\25\201p\336\377\367\267%\"\237\326(\354\362\307x\e+"
- #"\273\273h7\bd\311\315\356D\4$\210\34\21@\205\v\2\0\25c"
- #"\317\351\20{\207\340@\4\226\304,\201\272\205\"\262b\316\345"
- #"\20\21"
-) 500
-(
- #"aE@\b\263(\210\336\3\330\20\35\300\211\242w\354N\307\333\223"
- #"\310~\236\37\221|\0004{p \371\246\330\2@\16\201\27I\34\202\3"
- #"\270\1\346C\215\324\35\nPU!&\32\326\17\0p\37\371\357\27"
- #"\316\266\21\a.\220\200\4\271\274\371\306'\277\372\325_x\343"
- #"\215O\374\311\37\377\v\355\247\v\4\3\0P\240\247\374\4\0l"
- #"\36\36gL\341\300q\r}a\30\312\210\0\347\263\315\316*\232\211"
- #"\312\216\210\373\365\24\246\332\216\267w\321\355\352\352J\366{\""
- #"\210\260\2766\fH\301\3\221\222Y\346H\277\200\230\313\204\34B"
- #"\304N\210L\202\210\275\233\a#\223E\32\240\214\307\337{_O\313n"
- #"\267\ek\335\0\30\264w\2543\r\333\01603\210-\363\201\4G\247"
- #"\210m\fW&\310\1\301E&=4\201\35\0`\234\274\4\0\fi:\20\333"
- #"\262;\253\211\346\355\314\223#\2\"\335\204\362\315(\34\302\345"
- #"pU\231\31\345\"'%\2`\217\310\246\24\4\302\20\334l\0216\315"
- #"dI\26\247AXC\17\0Jj0\263\267q\6A\204\v\2P\r\216 \6p\263"
- #"\216\303\370C^\277nM\271L\207:\35\256\37<~\361\374\235\320\f"
- #"]yb\235uM!Y\b\226\356z\371\f\t=\2\35-c\375\205\334Q~"
- #"\261\2557\200K\267\246 $D\b\246\302\304\0\3104]_=\372\342\27"
- #"\277\364\364\351\323\326nC\325A\263\327\207iH\233\215\4\217\254wb"
- #"\244\200\231&\322e\205\3\231_GH\252p\305hR\322&(\a\346\69,"
- #"\241\336\373\272\256\214Gm\235\3009\34\303\333\262&\377#\251$A\24"
- #"\1\304LD\350FD\302\205\v\202p7Ed\21q\203\256\215\310Ij_\327"
- #"\246\212L\273\272'\340\343q\311\314\252\253\253\5\21\345Y\34"
- #"\21\233\360\210'\377\217\210\200s\t\"\21\20\221\252"
-) 500
-(
- #"\366\246\"\202\302\0\4\20\314C\234\367#\250\276\255\243\34"
- #"\21\347m\266\375e\22\37#\253\217\321{\206\210\341n\31\24N\1"
- #"\200\16\350\362\306\233\217\0201H#\322\227\211\3\301\21567\256"
- #"\214\270\32\341\246\324{g`\355\246#\f\234\245y\3014\214B-\304A"
- #"\35\310F*\320\373\261\n#\365\b?\2655S\367\333\343\351tZ\227S"
- #"\23\236\366\273\3537\337|\353\335\357\374\231[\2112\251\256\3"
- #"\250\22\31\0\306kC\240FFowO\376\303%\270\360\334o\273L\a\357O>"
- #"\0\310\2027\202r\236\333\273\252\276\375\366\333?\361\23?\361\375"
- #"\357\177\327\203\3-=Q\342L\245\e`C:G\301\363\335?\177\221\334"
- #"\277\210@\a\340\f+q\376\236\330>\246\273\273w\362 \300B\314("
- #"\256&\4a\276,\v\"\212\310\325\325\225\231\325Z\313TUU\352\\"
- #"\244\3008\4\31\211d\236\365t\n\313\336\0341\207\207\213\24"
- #"[\332\272v \232\247}\272\17\307\205pL\2555\321FD\224\354\335"
- #"\274\245\243\214\270o\224r!v\215\336{\202L\363\32\231y\23 \373"
- #"\310\205\3\200d\27\213\2 )K\351N\365\321\246\330\230)\f\34"
- #"\23$\257n\340\326\\>\365\351\31\0\34v\356n\36\220\202\361\316"
- #"\16\341\226\362\304\244\312\275\2331\227:\273\272\303*\356D\224"
- #"\34\26\bp3f6U=\341\322\301\212\253\b\v1\2028\256\326<\26"
- #"\363\246\241f\326\232\366\346\257nm9\231D\337\355\37Hyc\277{\344"
- #"\355\265\245\2652\22Fqt\312\203\17\2\0+\245\210o&`h\26\21\212"
- #"\1\316\236\247k&&\314l\311m\212\321\335\200\364!\"\"\300@@"
- #"\366@3\0$~\377\305\207\301\262;<\370\352\337\372\245\377\353\237"
- #"\374\366\315\335\353y'\240\312\21\241\235\20\210\30\343\234\343"
- #"\301 \r\341\360\344\316g"
-) 500
-(
- #"\34\36F:\262\0\6\a'\221Q4\246\3644\16fq\236P\24^\315\326"
- #"e\261\326+K\350\316M\361&\0\340j\177\260u\355\247\323\243G\217\254"
- #"\2672O\332\226RyH\27\253\271FEO\212\2609e\277\306!z\263Pc`\344"
- #"\332W_{\17\240\356\246\341;\21w\327~\202\210\303n7\317\304\244"
- #"\210v&\356\232\305L5Wg\17\2130\344\350\246\261\234\250\3124M\0\340"
- #"\310\314\25\"\b,\2238\2,\b\302\204\2041d\364\323|-\322\355"
- #"\212G\\\304\200\300\0t\210 w\240:2\231Q>3\313\343GW\0\340\201\236"
- #"\344\362\300\325\325\24L\303\f\324\314,\220\30\320I9\2[4d"
- #"\202\263d\335\36623\"\n5\21Q%f&F\2*@\332\372\332\216k\273"
- #"\353}\315y\261\e\335\275>\256\247e\342^\241!\3204M/=\324"
- #"\264\226)'7y\210\302\310j/\266\354%S8@\315\316\221\22\267\251\0323"
- #"\3\334\177\333\340\21#8D\341\332\232s\211*t\272\273}\377\275w"
- #"\177\360\355\277\376\366\17~\341\351\323\307\247\345\345rz\305L"
- #"\341\310\314\353\252S\345\363\264\210\210\360\"\344^\36\372"
- #"\0312s\315\345u\323f5\223?H\203\217\275A\"\302\227u\205\r\21"
- #"\f\e\227\231\26R7u\263\360GO\236r\251\206\330V\325\4\241yW"
- #"\207@\352jD(\"\335\255kG$\aE\341\251TsX\327\325\325\204\270\326"
- #"\361\264\265\367\b\2532T\34R\330}]WL\20\0063\f\275\a\201"
- #"@\as\353\210\354\b\332\272\320\200mo\301\217\1)\275\264\262a"
- #"\233]\302Al\35!\177\220\210\21`t\3272\379\313\4\214I\351"
- #"\370B\256\16\25 A\216\341\20\246\300\32\35\242\221c\216\203"
- #"\335iK6}\2537\307\202\a\v\370\310Jl\346g\264_\204a\220Y\312\35"
- #"\257"
-) 500
-(
- #"\275\257\353rZNk\357\35\f\334!\372\22\5d\217\2732?x\374"
- #"\344\203\17f\327\25F\312g\251\317\213\e\312\352\354bw\371\353hc"
- #"\36\235W\3479\354'f\363\274\\\316\377\266\324\32\3260\354\v"
- #"\35\277\365\255?\374\251\237\374\321O<{\372S\177\343\307\337{\377/"
- #"\327\5\315\224Y\230\212\242a\220\207\306FU\336\0\262\227\a{\272"
- #"\344\341\246\375=\0\263\24\340\36\266\341\177\317Ez\270w\b\2"
- #"\224\264X :\256KD\224\24\202\311\237%Z\226\345\365\353\327\0211"
- #"\240PD\265V\aV\365X\327\265\365,\r\233iDP\26\255\204fz<\255"
- #"\347\313g\242i\232\264\367\323\351$\bs\271\22\342\211'\346\22"
- #"\6\16\306\314\211\213s\17U\3\300@\0067\327F(\36\276\234\216"
- #"\351\35\36\304(\274m\36314\211t!\335\244\325\335]C\317zT)q"
- #"\231J\351\4\200\230\2051}\254\267\212\210\302\200y\232$\2105l`r"
- #"\301R\340\277\207F\230\206Y\266l\267\236Hdv\222g\274\273{\342Y\a"
- #"\273q\304E7hK\353\335\254\257\326uY\332\351\356\244kG\200\b\245"
- #"\350>\31\1DY\210\310\2\f\"z\317\ta\334\263\3233\227\302q"
- #"\330\345\223\37\205*\360\20>\205H\332\37\300\345\32\31{w\253"
- #"\315\0\0\35w\323\336\314\301\265\20\376\361\37}\353;\337\371\313"
- #"\37\372\342\17~\345+_\371\255\337\372M\b\273\271y\205@\356^d"
- #"rwbp\17\210\313\4\350\343p\257Q\361\240\247-\312\340\304 \362"
- #"\206C\371\330~\260p&\246Z\2462\225$U0\23\221#\30\204z\234\326fx"
- #"\353\0202\357\34\20\204\221\v\2041P\312\26588\0004Sf\226\b\4N"
- #"\f\337\351t\252\331,\314\346\r\360\262\234tm<\3458\216F\2533"
- #"\2026W\206\34\306\346\207Df\301)<"
-) 500
-(
- #"\242x`\351\353\35\205#Q\204W\234\210\b\230#\17\3D\a\32\366"
- #"\27\b\220\226\210c\250t\241\212F\331\303\312!\214_v\270\3169"
- #"\345\340\302\365n\252f\231\5\232{O\24\32h3\355a\346\256\201\6"
- #"\24h\21\224{g\213\245Y\336o\5\3276\251\361\314\303\202\204\242"
- #"\265\245\265~Z\332\262F7\204(\b$\b\352\241w\247\333\345\4\307"
- #"\323\351\16\0D\252\351\2`\220*\373\333\354\350c\237\373\\\344n"
- #"IE\356\207A\320\4\4\312$\216\320\306\207\274`\247\eP\212\211"
- #"\4\230\353\273\357~\367\e\337\370\306'?\365\326\17\276\375\245"
- #"\37\371\221\37\373\332\327\376\240\324\275\366\25 \361J\301T\0"
- #"\272\17\365\270<\334\317\ba8W\334\271U\f\202\200\f\202\23"
- #"\313C\344\356]S\370,G\276H\1\200h\347w#\2\346D\371\246q\211"
- #"\205\273Et\201\323:\243\224\242\0H\324\3\250\224\332\233\366nM"
- #"\3728\304D\0\0 \0IDATW33\360Z+\210\20\221\233\23\t3\273\273u"
- #"\25b\217XN']\e\21\315S\331\317\225\0300<\\\te8\263E\4"
- #"\242\21\232Q\255\225\b\314\32\2s \5\253c\353\v\254\34`R"
- #"\23\2558\254k\266\n\343\374\\8\302\207\326~\252\245\177\244/"
- #"\353\333\323\333\324/.^rZ\335\314{\327\336\262\272P5O\225B\323P"
- #"\17\367\0007\n@\fb)D\306#\204\236\17\276\334\3456\254\253\303<T"
- #"\225\310;\32!Be\327Bj3!\315\305C\321\326\343\351F\365\365"
- #"\351\364\341z|\321\373\253\365\370\322t\1m\203S<L\313\0066{\373"
- #"\334x\276\260\363o\337ls\316e\327h\342l\347r\342nR\f\t0\202\b"
- #"{[\2\210\331O\247\23\223\374\376\327\277\361\343\377\356O\375"
- #"\360\17\377\320\337\372\371_\371\372\37~;\260u]\367"
-) 500
-(
- #"\373\371\244\267HH\311\216 \37\365\361v\311\37\331\22\227s\355"
- #"\234e\17\346\30\347\256H\214\364\2008\332\206u`\246\"S\251\205"
- #"\305\314\326ui\334\253i\352\373\6\vt&\355\255\e\246?A8\21"
- #"\247oC:8`e\16qw\21\n\204\326\22_\315\231\206\252%\5\307\347Z"
- #"\346y\236j!\0\2\17\353@\210i\342\352\16\210\36\20\216JT"
- #"\211\f\215\1\314\214)\2101\"\264\365\302C\302\272\4p\312"
- #"!l\f\306\355\210\312\310\267\361\350`\3431\216[\224\200\206"
- #"\373\247v\31G\344\366\356\24\233\351r\2B}s\251C\212J\0\202\340%"
- #"6\302KZ\225\346\257\3370\n`fi\307\225\253\330<z\247u\305\266\2526"
- #"\232+\317\205l\26P\365\266\36\357^,\313\353\276\274\277\336"
- #"\275x}\363\376z\367J\375\316{\233\212\3644\20D\37\321%.\322\270"
- #"\324\223\361\217\17\30\362\e\262\245Mf\0@[v\b[\262\354"
- #"[\202\231\t\270\205#\t\21\31\220#\375\325w\336\371\3727"
- #"\276\365\354\215O~\371\307~\352'~\374\247\276\366\365\337Si\21!"
- #"\265\270\253o\251@\226Dq\261\a\356\27b\334o\356\2100p4k4\340\237"
- #"\271?\263\17\22\233?\264\220\344\224\342\372\301\3a\276\275\275"
- #"\275=\336E\213\245\255Le\232\246k*\201T\272\257\353J\36\"b\236"
- #"\355=\317\335\336{/\205\22\336\2338\343\323\3515\0\212\240\17\355"
- #"\1/\245\0\372<OSz\242\200a\200\253\19r\234\203S\236]\356\332"
- #"\35%\2062\261\242\22\227\b\17Uw\327\2762A\32\256q0o\215\247"
- #"\354\b\236\201\231\0\211\230\202ty\247 \nB\32\263r\4L-\236"
- #"\313\354\\\3266\350j\251\325\234\2115 N,\271\245\210(c\2140\227R"
- #"\6:\217ad{\356)\342i\341\356\250\303\220\2U\2715\351"
-) 500
-(
- #"\253jG_\355Td\271\5=\266\323\351t\274\373\360\305\a\337{}\373"
- #"\336r\367\374\346\356\3[\357\220L \246\251.\332\210/\345\3s*"
- #"q\177\350\307v\2\336W\273\27G\363\266%\2\21\t\363\246\303"
- #"\326\240\311\246\24\2307\26\361\360\336{\335\315m\325\343\335\372"
- #"\373\277\367\365\37\374\342\217\374\310\217\374\360/\375\362\257"
- #"\376\351\237\377\231\331zs\373\362j?\367n\303\275\366\342\354\370X "
- #"\274\\\221\210\230f;\251\5\335 5\311b\244\361\231 2\25\26\1"
- #"\304\bk\275\367.\233\b\351X\301\333+\"\34aU\343hS\235-\274"
- #"\265\6,\274A\324\210\362\213\355\352\210R2\241\267\306\314\4"
- #"\342\356\265\310$\5)\\;J\0\272\231\253Q\201a\366\222\223\265"
- #"\255\253\207\371\357\356\26\246S\210{F\30SU\21\311M\225e(D\f"
- #"\217\264\30\352j\204\2\0\201\26\21D\5\300\306\324\370\342L>"
- #"\367\n\356\243\3404\345F \367\234EerR\2052\260\372\200| 2\6\242"
- #"f]\244nf\26\314D\334-T\1H\264\203\266\356\216\24`\302kD7\277"
- #"[\226\333\333\333\343\363\3477/\236\277~\371\374\305\a\337{"
- #"\371\342\335\365\370\242\365\233\276\336\270\336b2S\230\3275\230"
- #"\331|%\b\336\\\177\357\273\315\233v\302`Yn\327sn|\214\204\32"
- #"\221\221\335\200j\356lL\3415$\364Q[W3G\204\"\210\272\22\203"
- #"[\373\213\277\372\213\177\372\265\257\361\376\352\363?\372c\177"
- #"\343+\277\360\333\377\370\1777\24]^\27\256]]\30Y\242"
- #"\265\6`\0!\302\311\376\332\36?\344R00Bd\20\0\b\217v\356"
- #"\346\344N\260\0\0F\32\310p\221@^\324\344\356n9\235\250\212\314"
- #"\265\233\2\240\233\255\21x\\\0'\265\273\335\16v\273\235\252"
- #"\247\177\3234\317\247\323i\177\365\250\316\32B"
-) 500
-(
- #"\\j\20\32\204%\212\205QO\r\320\303<m]&*\fP\1\254\237B"
- #"\243a\354&\356\335\220\262\b*\347\354&B\222\211\26\256D\b\261"
- #"\266\325\211\250\360\4\276 \210\333\252\306\354\210P\21\0A\20"
- #"\321\1\210a\200^\23\314\21c#%\314\333\1\206\251\242;@\224"
- #"\315\v\342\274(\245nf\241\0\214\21D$B\314\234\324$\304 \"F?"
- #"\247\341\bnf\34\5\2408\22\"N\200\0df^\251KkM\255\251["
- #"\353\247\343\353\227\257\336}\367\275\233\347/\277\377\301{\257\237"
- #"\177xws\323N\257\326v\ezgv\fh\4\346\250\340\206\20\251-\274"
- #"\t\311e\2121&\316\347\320\375\261\330s\376\233mw\302@x\4\244"
- #"^X\\\24\"\350q\206\333\214:\6\314\254c_\201\370\377\371"
- #"\223?~\372\364\351\27\277\364C\177\373W~\365\257\376\342\317\376"
- #"\345\237\376\337\307\365X\244\336\34\237\263H\201H\362h\236\252"
- #"\210\310\3048&\252\0164\232\224\260%\251\37Kz\"\302\362\272\210"
- #"\1<%\245\0\300\1onn\212H\361)\"B\210I\0021\233\rK[\213"
- #"\231Y\250[7\255\273Z\335\372\246\17\31\21F@D\253\366u]E"
- #"\252\252j[\333\272\212\210dh\214\360030\23\367 \314\225Q$\241"
- #"\231\27wu\v\323\3\326\2\37\215\372\21\231\334\2379=\367"
- #"\332\251\347\376\300\345O\321\306\257\310\237\365{\360\333e\3656~Jv"
- #"\323=\370\2130\210h*Cx\213\210R\234+R\32;\367\275C\a\3\304\215"
- #"\333\341\200\30\1\336;9c\357\375\356x\2749\276|\371\362\335\357"
- #"\276\363\375\367\336}\361\374\375\323\361\366xs\263.\307\266\236"
- #"\372r\327\326\327\326N\36'\210\36\240n\335\335\221\2341\251\204"
- #"\1xYj\341\271\332\305\3545\376\e'\340\371\332\316\367\24\266"
- #"\n 6\361\227s"
-) 500
-(
- #"\344tw\212\4_eE\250f\335\373\372\235\277\372\327\377\374[\337|"
- #"\362\344\321\333\177\375\257\375\302\317\377\322\315\213\27\337="
- #"\35\357\356nw\373\253RJkG@\244\210\354_\304\5\36\a\267\316"
- #"\345\377\377GJ\261<\v\b\"\260s\35\203\341\26=\326T\326\22>"
- #"\34\16\314EX\216\313\22\272\314\363,\242\201\320{\277\242\253"
- #"\210\270=-\327\327\327\263\\3\2633\22Q\254\334Z[\226c\357k"
- #"[V\355\375\352j\277\225\250a\326Woa\204\210\302\300\2\353\212"
- #"\346=\315\275\6<\17\357\205\3630%\f\214\0\221\3100\302\303T"
- #"\25\2651s\230\207\271\363\bIt\257\313\230\2317\3\244)\326\275v"
- #"T\\\274`\3231;\377=\0\310T\t\323w\0041\233-E\200\31\30\235"
- #"\b\210\21\21\6z\302=\"\30\311\22\314d\b\335(\230\210zs?"
- #"\351\351\366\346\203\17\236\177\370\375\17^\275|\371\362\345"
- #"\313\347\337\377\340\365\253\17Ow\317\333z\\\227\333\326\27\357"
- #"\315u\1\275s_T\eb\20X\250\5z\232\23\272\237u\24\35655r\277"
- #"n\230\213\217\274.\263\264\313\32\345<\222?\3174q\0\2307S\tD\240"
- #"a\24\244\260\222\303\315k\373\223?\376\243\253\253\375$\345\207"
- #"\336\376\342\227\277\374\223/^\274\352\352\304\216\204\243\331"
- #"\t\356H\37aX\3738_\316\213\377#\211O~\36\200\210\320\34\314"
- #"\247R!\222A\270;!r8JADu\327\246HR\212\vA\357\335\25Dd\236"
- #"\367@\204\314\200\34@@A\"\201\336-\5\n\251\265v{{\333\332"
- #"\202\1\346\235!\n#\23B3b\24\246Pu\260\24\216)\304\1\226"
- #"\227\203[+c\220\300\254#\6\306\320\354\"\2424\336\f5\303N"
- #"\226\211\240ED\326\321@\367q\356\243O\201\t)\300\316\301\365\362a"
- #"\305\246X\2259\f\0J\25"
-) 500
-(
- #"DDJE\f\4F(\4\204\301\234\270\t\4\0\203\341\323\345\216"
- #"\246\21\312\226=\322\325\20A\315noo\337\377\336\367_~\370\374\275"
- #"\367\336{\365\342\345\361\366\365\315\315\315\351\356\266\267So/"
- #"\265\35\373r\327\373\342\275\231k\330\2\246\4\0061\366\4\""
- #"\247\243\4\"\372\340\a'\314\344>\234|,\370]\306\363\313"
- #"\323$\6\300)\211\253\233(\300\31\252\216\210\203\244o\0\356\31"
- #"\207\2Bq\332O\257_\276\374\243o\177\373\341\365\243\353\253\375W"
- #"\276\372\363\341\370\177\374\346\257\337\336\275\340p\342\352\321"
- #"\321\371\214\327Ju\4\213\360p\212\373\275\356\367\326=\37\211"
- #"\213\31\30F{1Y\252h\2048M\23\226*\225\241\255k\353\320\326 \374"
- #"\377\32\373\226^Y\222\343\274xdfU\237>w\206C\221\262\340\245AQ0"
- #"l\300\260Esi@\v\2\266\177\263a\3\\Z\260\274\220-B~I$\207c"
- #"\316\343\236{\336]\225\31\17/\"\263\252\372\334;\224{q\247"
- #"\247OuUued<\277\370\"\245\271L',\230\312\\\346\231R.\363\t"
- #"\231\200\360|>\227y\212\210X\221\210Hj[/\313\272^\316\347\363"
- #"\224K\231\3234\25W3\362N\4L\341_qJH\4\214\224S6\213\316\316"
- #"\250\243\373VOJ\0\200\16\220\0<x\336\243\6\217\346h:\244\22075f"
- #"\266/\320\225\223\347LH\21\266\302\210\0241\272\222\261\347\310b"
- #"\361\22\222\23!\a\227\21BB\n\352\316N\211\31.\205\241+"
- #"\250\201\211K\0034r\205\266\310\345eY\226\372x\367x\367\376\375\357"
- #"~\367\333\247\373\207\347\247\207Z\227V\227\227\227\347\365\362b"
- #"\272Vyr]\\W\364\n\330\34\252ySk\261*\301d\35\335*=\377\a"
- #"\f\16}\232\355\301M\271\326+o\345/^\206\243d\353=}\0223:{v"
-) 500
-(
- #"\221\310<\272#\321\2022\323\305\35M\5\301\245&\306\374\373\257"
- #"\276\372O\377\361?\250\352\317\177\376\363\177\371\263\237\375\346"
- #"\313\337\376\267\377\376W\353\362\302\234\321\1\211\332\32\244"
- #"\234\b\3351\350:;rS\0\240\336I\350p\24f\206\217\16\0161\300\247"
- #"oh\5\a\207\224s*\31\v\31\243\232Ui\311\262!\274\273\275M"
- #"\230\301\334\0M\4\0\272\17\260,f\326L[k1\343\334\f^^"
- #"^r\346\323<\3\310\224sb\0200fL\2312\2029sBN\30.\235Y\207\300"
- #"\4\310\22FIs\257\"\272S\200R]!Z\202\206\260Fh\34\306q"
- #"\340\367\17\265\220\2174\5\2G\254\275\311\350\6]\332\374"
- #"\3024\"J\f2\267\350\201t\300\340\34V\17\275k\322\240\212hs"
- #"\0275\361\365R\237\236\236\36\356\36>\274\277\373\346\233\357\36"
- #"\356>\\^\37_^\236^_\236DW\327\265\265j\266 \250\311Ee"
- #"]\353\245\266WU\0010\5uRsT\327H%9X\225\226\0\b\2302E\5\331"
- #"\24\0\17\2153\a\350|\324!\217\32\321\17)\233M\363\354\242"
- #"\331\305%\32\273\22@\314\0014C\t\352ipmu9\315\331\314^\36"
- #"\237\376\313_\375\245\210\374\223?\373\323\177\373\357\376\275B\375"
- #"\325\337\374u].u]s\216&\1$\2421\243\345\23\267\361fct\242"
- #"\304\250\367\300\341=\221;,\2552\363T\246RJV\211\"\233)1\345\222O"
- #"\4P\237\236\346y^\326\25\4\314\3546\201a'\304hb\0\300\234"
- #"\21\361\346t\232\347\331uM\211\21,%\312T\246\222&\346V\227\2040"
- #"\225\334\eEG1}\334\334.\205\233\267'\221X\245D\300\210\221\3407"
- #"\21!\221\326Z\210\340H\276\304\366\363\301\301r\275\"\241\364"
- #"\203-\303#\e\260S\211v\21\324>\370\n-r\334;\335\236"
-) 500
-(
- #"\273cSu'S\20\261\265\212\264\366\372\360\262^\226\207\273\207"
- #"\367\357\337\177x\177\377\341\303\207\247\373\207\272\256\227\313"
- #"\223\264U\333\242\266\232\257\"U\332\"R]\233\272\0\n\2429)"
- #"\240\201I\244)\335\0\321\21\330\265\202\2711\246\3049\345\0\215F"
- #"\335\31\267H\374\260\273\216\246\31\17\343\261\375P\374\3562\352"
- #"d\26\3-\242Ni\206\21\34\30\240\1\3\242\0231\2'\244\313"
- #"\313\313\355\273?zy]~\367\333/M\341iY\376\305?\377g\277\370\305/"
- #"\226\313\363\227\277\371u\275<\202\247>0\25\300\243{\300\341\360@"
- #"\257\324\300'\235\207\217\rt\224:\224\254u\220\37\n8\213|\375"
- #"\3557\357n>\237K1\205\234sk\315\325\227eym\227y\236%\222'\n\210x{"
- #"\373Y\214\361`f\211)\32\b\2318e\232J&\267\6\346\216)\245y\312"
- #"\361d6\252\314\330\234\310{H\252\36ch\34\0\202\224\203\2508\""
- #"\273\232\261\212(3\245H\270\3541\365x\boMS\324i7\205\207{X\351"
- #"\333\237\22\30\206k\252\16m\21D\234r&\242**\322\\:\261\265"
- #"\212\277<\277<|x\274\377\360\372x\377\370\341\3757O\17\217\227\227"
- #"\207\327\227\247\272,`U\333K]^D\252C[\333*R\315\304A["
- #"\273\230E\245/\221\203\251\201E\22I3zSq\220\250)\271\241\e\306"
- #"\240=\4C\350\320\t\244N\264\20?\22\21M4\347\334\2322\263\271"
- #"\302G\257}\261\321(\200\fn\342\16@B\2001\373\f\231\314!\2"
- #"\0220O\356\204\17\317\357K>\e\370o~\363\325\313\253^\36\226"
- #"\177\365\263?\373\213\177\363\27\277\374\345/\237\237.\350\2021"
- #"\34\b\234\330L\25\\\0\0<\206I\223\1\2415D8\32\265\300nEuG"
- #"\315\21I\21\35\220\2210%1ArSs\244L"
-) 500
-(
- #"\223Y\320\362\0203\256\2624\225y\236\233)I\333\326\373\345\345\305"
- #"\300\t\3738\244\326\326w\357~x:e\367\226\22\2\3304\345\333\323"
- #"M\"6m\354\352MR\6b\240\4D\230s\226H\344\226\204\234D\4\334"
- #"\202%@U\315c\304\37\232\231\326\206T\346LHd\212\212\236\1\210H"
- #"\265!z!@\314\e\2\303\314\"\205\27O>\320\327C\34\203"
- #"\245\2m \374B\376B\211\246\\\212E\225\325 \346\273W\221h\255r3"
- #"\27_\226\345\362\262<==}x\377\341\376\273\373\257\277\376zy]"
- #"\327\313\213\324V\333\245]^k]\334\232\333jV\315\327 \205p"
- #"\253a\300\203,+ \332\340=\20\203\1\2\200#\362\300\301\335["
- #"\213\t2\21\32\357dK\35\202\0\373~\352{k\20}\270{L\326\214\36"
- #"\216\220\302\3162\275_e\373\223]%\264\0\23\1Rj\212*\213\231"
- #"\22\346\247\307o\377\307\377\\\336\337\375\372\347?\377\331\237"
- #"\377\371\277&J\177\363\253\277\366VK\231\353\372\n\206\b\bc"
- #"\314\266\273\202S\300\227\336(\2747Vi[\260H\263\5L\v\201\211"
- #"\220\246\210:\21\0\308L[\223\365\371\365imK\377n\303\30\206"
- #"\305\204\1\337/9\237\346y.\245\265j\2529\363\234\3234\345\304\354"
- #"\212\227\227g`\342\3144\22\300\221r\3\240\224R\200a#C\265\335"
- #"^\324\372\21\21\334clX)\310\207\312\rb\360\340\253;\"\363"
- #"\256M\373\213\206\227\334\235\360\3573\2\361aZE\335\235\31\231"
- #"\230\200\1\321\\U\24\221e\225\313\363\345\371\341\361\303ww"
- #"\367w\37\36\356\36\236\36\36/\313s[k[/\255\265V_\327u"
- #"\321\266:4W\1]\300\232\233\200\255\350\2\240\b\356\20S"
- #"\202\25\300\220\24cL\314\250a\307\244\325M\225[\364\310\355"
- #"\370\373\36X\34\335X\37h\333"
-) 500
-(
- #"\330R\35\216JxX\351\243G\262\vk\30\1775\355t\374\221\317C\300"
- #"\230Kk\210\b\211\202\201L\211\264\326\345\233o>\210\376\370?\377"
- #"\345\177\375\311O~\362\223?\375\247\252\372\267\177\373\253\272\\"
- #"\312t\323\352\5\200\270\aF\340\326w\327V]\274\266P~\270\275"
- #"\216\242\350\t^\236\242\364\16\0\"\246n\21|\244\271 \221"
- #"\2517U]^\250v\212p\324\234\2633g\310v*\363\371|\376\354\263"
- #"\317\316\347\0233I3D/LSI\211\221\21 \245R\0223vJ\337B\210\330\1"
- #"\322M\303\262\244h\30\tT9@\236\246`3GDC4\27\325d\246\324\a"
- #"\370\215P\257\27\331\224G\201\nwh\b\34\177\376\366>V\341\b:"
- #"\36\"X\e\0$O\21\2511\0\"\203\2036y\272\177z\377\315\267w_"
- #"\177{\377\376\303\353\323\363\262TY.\313\313\243I\225\272\252\210"
- #"\351\n\272\2425D\253\262\2326\263\26\273\5\321\31\334\\)t)"
- #"\32\222{\350\352\356hv\34\361\366\253 \330\263\30\3146n\203\221"
- #"\31\374\224\02756\237\37\365\234YO\221\364\303\17\337\352nb\237"
- #"]\21\361)\367\"\5\200\210\0\b\247\2242\271\211jef\316\351"
- #"\371\351\351\356\356\301\314\177\372\323\237\376\311\237\374\343"
- #"\313\345\362\325\227\277\271\\\236\21\310{\303@\b\237c\200z"
- #"\207\16\336\356y\254V\377\344\315\17a\316\201\360S\325\326.a\274"
- #"\230\331\272k\351\242\202\216hHD\f\211 \231()\246TN\347\233/\276"
- #"\370\342|>1\272\231\26&.\323\315i:\315\271\24N\30|\\\31\21"
- #"\243Y-\36\332 5\35\223Kz\322\24\2T\272I\311\320sN\334\v\326"
- #"\3333\217\324\372\26\331\34\265;\34\22~p\235%\35;0\362\253\375"
- #"0wO\335\325k\246(H\216\352\"\242k]_^\336\377\376\233\257"
- #"\377"
-) 500
-(
- #"\357\357\37\357>\274<\275\310\262\212\210\327\366\362t\37\363O"
- #"\334]\255\232\250Z\e\314\26\36o\240\227\206ls\24\342\346{+"
- #"\20\200\17\300\263\306\235!\202;\2149\225@}\326\367\e]"
- #"\2\20\341\205\273\233\210\2506\367\250\233\371\200\220\37\177"
- #"\352\1\270\357{\340J\307\236\272.\37\3616\\\23@J`\315U\1)"
- #"\225\333\313z1K_\177\375\373e\271\374\340\363w?\376\361\217M\352"
- #"\227_\376\332\315M@]\301\260;\f\207\320\344\370\6\337\4"
- #"\310\327Y\303\250\342\204\237n\203\243\n\21\305\224\303\336\215"
- #"\1\362\241\237\21\2210%\2\0\230\246\351\3464\21Q\255kb\317"
- #"\354\234\22\261#zJ\224\210\334=\20:\301\366\34\336\236\270\20"
- #"\5:\220\302hF\264\v\0\1D`f\"o\r\3004\360W\210\30D\267"
- #"\334\361\314};\245\4h\f \210A\322\205\356}\210\320p\nq{\266ah"
- #"\266\242\301\2663\223+x\263`6u\323\365\365\362x\377\341\371\376\341"
- #"\361\356\356\376\273\273\307\307GY\326Z\27\251\265\265\246\255\22"
- #"A\267\26\"j\253j\210\240\217\240a/\v\6fm\344\320i\273\2257"
- #"\233f[\268\344\212\256^\336\235\331\335\330\2153D\0311\0;D"
- #"\364\346\233\233\376?~r\255\207\342T\n\a\347\254\265\2061\217"
- #"\305\241\326:\227wU\374\341\376\273\273\367_\377\350\213\37\376"
- #"\361?\372\21\272\377\340\363w\257\317\217\r\334\245\231\331&\326"
- #"\356\273\260o?$R0\373\377^\227\255Z[\315\244\265\f#\363\27"
- #"\262\30|7\333\303\30\305Yg\344<\225\363i:\237O\247\251D\201\215"
- #"\300K)\214J\207\f\213Ao\254\231\246)'P\325\320YHXJ\331\36\2"
- #"\21\251{\224\247\200\b\301R\212\276lq\355CX\343\256\0023\20\375"
- #"\357\333\22\f+\34\377\306\272\203\273\aCV\3708"
-) 500
-(
- #"]1A\317\244\36\5\300\335\239\0010\250Km\313\363\323\323\335"
- #"\375\303\267\337>}\270\377p\367\355\345\371%\360\303\322^\227e"
- #"\211\320I\265\251\324*\253\310\230\360\316\200\340\346\6d\204\346"
- #"\240\330-)b\264\3668Ag/\215\347\b\203\4\25\21Gt\22\335\347"
- #"\30\371\16\355\355\241~\314`\355^T|\30[y\263\16]\233"
- #"\366#w\v\354\356x\245\371\b\0\216\320\376\376'\4 T\0033-A\2"
- #"\256\0\b\317/\367\251\314\231\331\265}\270\377nY_r\212\26\226"
- #"\340\270\360A3\273\237\363c\237aC\364\34\2453L\4\365\226+\301"
- #"\236~\262 0fU\302\321D{8O)\351|>}\361\371\27?\374\301\27\347\333"
- #"\323\224\231\231\230\360\335\315\311A\22\3434\345RJ|%\21)(\17"
- #"\2343C\314\235>luBf\316D\"b\340\352\246*\210\23032c\302\344\216"
- #"\241b\312\330\272\210Q6\e'\31\32'\00414\237\17\244\314\b\316"
- #"v\21<\"\330\373MZsi\332\226\313\313\207\207\273o\276~\374\356ny|"
- #"l\227\305\254Y\23\223\346\356\353rY.\27%+LK{q\25s\5\264\320;"
- #"\6bf\200\32L,D@\34\260\27t Qt7\302\230<\335\253\b\273\221"
- #"\242\375\207\205\330ml\227o\364\345\266\21i\360\260\343 \301\331j'"
- #"\24\261\363Q\n\243|\4\207\223\304\320\327\203\201\30\2\235C"
- #",\334\35\234T\334\314\363Tf\306e}\25\200\234'\327\366\374\264\304"
- #"\\]\223\272IU\357\233\215E\362n\244\336\210\316\233\275\264"
- #"\373\t&\245\24\246\342\16\"*\"\2619k\255\356\36\b{\357T"
- #"]\314\314\323t:\235N77\363\315y\36\35\301@\4\252\212\344\314"
- #")\347\214LU\32\0%\342\251\224L\214\244\350\236\22\6\255\345\210"
- #"X\3738Bu\323\356\333(vR"
-) 500
-(
- #"\24\236\246\211\211\243\251\255\3\1w\234_\b\226\252B0\247"
- #"\35\27\v\17\355cx\230\348\372\215p\3\340\205\273\231\236"
- #"\277}x~z\270\377\366\273\327\247\17\365\371\361\345\341a\271<\241"
- #"\3\243\257\227\347\313\362\34\336\3\202'\251R\215\244\251j\312"
- #"\364\272\254\234\234\231\321\205\300\227\365\22\211rwGH}\204\0212S"
- #"\5o\242b\335\332\233u2\363`et\b\2214#fu\247`\352\355N\261\331\0"
- #"(( %\6\200*\r\35T51\267Z\243\352\212\34\1\233\3!AP\6"
- #"^M3\354\322@\4j\ej\0061&\6\201\273Cg\321cwo\262\306:\325z"
- #"\301\304)\243\253\251\\\334\25\t\r\240\312\342\242\373\231m"
- #"\310\264;\f`\316FC\347\bbzD\210\4(8*Q\342\320j[\315\211"
- #"\310\0\255o\30\a\5%#\20\0\310\310\314\\J\231\246\351\363"
- #"\363\355\355\351\2460%\302\214\212\340S\311sL{\243<\347\224\221\254"
- #"U\23!B\352\255L\222\211\334;\23\0203#\262\273\0201\"\233A"
- #"\264\305\253Jk\225K!\242U\205<\237onk\255\316iY\26\227\232 \25"
- #"<Ui(\234s\256\322\246)\265\252\301\265\0\0\314\235$d\213TTz\32\337"
- #"\35\260\217\233\334]\336\310v\244\277\377\337\377\353\365\351"
- #"\351\361\356\375\362\372\350m\225\345\322\352+\232\3\352\272\256"
- #"\252\r1j\270\2&\32\215Ln\350\236\31\373\302\217\226}\330# "
- #"\a\210\200GcO\204\237;\256\375\t\330_\250\20\"\212JkH\0nFn"
- #"\3\210\a\26\315\372\36\3621\r\340p\216\235\f\370x\356\343"
- #"\205\306\256\355\302\17Cd\335}\313\26m\342%R\207\236\6\f\373"
- #"\253\a\352\270>\313\351\352Z\270\373\3\356#\337\371F\243ow\25"
- #"\37\r\304\312\216}\n\37\303T\335=f\313\244\224\202\241\372t"
-) 500
-(
- #":\335\334\334\244\236\326\341)\345\2349e\314\234JI\341\362C\260I"
- #"\247D\321\243@W\371T\30nt\267-)\206\3258\"*@\255\225\230SJ\265"
- #"\326\370k\20Ss\37,o\e2\222Y\20a\233\257\333/\1\270\377\366"
- #"\303\303\177s\3\3331\351\253\277\373?\322\326\327\227'Y^\311"
- #"\32\252\230Ut\250r\t\357\30\0\252.fFnD(Z\325\0245\5t\257\265V"
- #"\353\"\"]\343\322\333\350\17\16A\303QV>\22\277\1\231t"
- #"\335\217A\340\221\371<\236vK\301o\253\272\331\265\343\371\337\\"
- #"\345\315\23\201\35\353p4\"\346n\243\335&|\35\201\315g\215\351N"
- #"\16\356\300\321'q\325\320\331YG\367\357\306\251\355\312.\277\271"
- #"\237\3\356k\357@E\200Vk\374\314 \300\234\347y\232\246RJ)i\236K."
- #"\211\b\211\341T\246\371T\b\20=\372\202\335L\203\265<'\6\0"
- #"\356=o\341\352H\340\362\335-\370\230\315\325\314\320S)\2052\3SrX"
- #"\226%\374\365\0\353G\354\\\346\323A\225\364\\\264\210\304\263"
- #"\17\266e\21af\270N\213\276\21\301\355\307n\3332\335\177\373UN"
- #"\f\332@.MV0\1oDd\336\314\245\353\30\253`\26U\26N\344`\200"
- #"\312\tR\300i\22\271\a\34o\2106(\240\17\220\301\225\2\370"
- #"\a_\307#w7\361\20R\274\371I=)s\370\372V\3719\312\345v\17\324eg$"
- #"c\302+\2421x1\32qFz\5\320\b\311{Oz\0207\206\25\375\304\235"
- #"\367\276\372+N\322\253\37\365I}\320q\341\275\240\267\207\\\1"
- #"\32(\\r\316\323T\230)Rw\247y\"\4\227\6\211OS9\237O\245$m2H"
- #"\r=\356\2049\245\2248 p\300\303\377\16\26\204(~8s\216\307B\356D"
- #"\224\211\21I\305Whj&\"\257K\235gbuD"
-) 500
-(
- #"\236\246\31\21)\261\252\356FD\325\301\a\303\325x\346@o\177\3541"
- #"4D\334:c\342\223\244\365%yB0\264\325u5m\26\203\357\265\232\0310"
- #"\5\341\22\0\200\213\252\21\1\201\272\366(\22\311'\312\214"
- #"\30Q\217\270\4\357-B\240\331{U0\256z\214\n\351\0\270\305\303"
- #"\346\330\360Oa\302\266_\229\251\343N\212\377\24.\233x},\353\237"
- #"\22\375\275\247u<\251\310\365\320U`\204\210\300\16@#\276\331\356"
- #"\35;\177\331\361\22\216\237\232\230\374\a^G1\ri\3\0\25G"
- #"@d\3169\27N1\25\202\231\31)\21O\323t\276\271)%\221\e8L%\335"
- #"\236n\246R(\250\253\\-z\334G3Mt\302\22eD\34c\274-J\267Q\211Fdd"
- #"\n<\236\273\23q\342\302\3449O1\2222\310\215\202\e8\316\tNL"
- #"\344IU\25\220\r|\373\372\246\310\361`m\207\"\330\227&!\231"
- #"\203\352\30\f\343\236\bMe\25\255\322^\301\314A\314\252\273"
- #"k\307'F\224\327\34<p\3\221\244W5U\305\346&\3129m\27#\241\20"
- #"\304\375A;\34\265.lZ\355\370:\210 \37v\214\233\217\234\5\276e"
- #"\356\35\213\267U'\267O\340\332.\277\261\b\336\301B\26\0162\34"
- #"\214\346Gbb\340\240n\0\344\20\344\336\340\276\351H\0\210\272\34l"
- #"\36\301\233S\35/\375\275\242\31]\365\f\210H\354\0\2308\225"
- #"\224\307\361\206H\304\220\v\237\346r>\237J\2422\245\3234\177~\373"
- #"\356t3\21\1\2021\2436[\327\25l\314\230 \n|\25\315\23\2"
- #"\230hX]\200XY@46\2464\5$D\334r0\24\"L\2479\307\0043m\356"
- #"\330\252\344\234\305\24\231\2S\235z\204\236,F \21\35]\243"
- #"\243\335\363Cr>\4\264\251\305\36\200!\251i]/1\361\302\265"
- #"\22\272\231T]"
-) 500
-(
- #"C;98F\261\305:\2455#\22!sn\255{o\314\234\210\25\344\370\200"
- #"\307\335\354zn\213O\267dXt\273\301PGo<\271\2550\267\305\266\307\233"
- #"\306\203\301\322k\21\304\221\19>\202\343\231?-l='w\225\265\32g"
- #"\2103\363\20\210\315\n\1\0t\226\341]\232\256j!>\274\275O"
- #"]\356\332\20\233\37\307\177\3326\314b\\>,\2115\311\237\335"
- #"\336\314\247\317\3167\267\2677s\231\0 \252j`\22\b\217-o\25\227"
- #"\b\307\255\265\206\264\337\25\"\250\203\270%\227H\270\250j\360"
- #"\222\211X\342\342\t\202\372\307\335Wi\300TW\1'd\247\3041\331>"
- #"\245\254\252\216\243\317hl\376C\212\246;\301\321\22\37O\243\3256"
- #"\224no\206J\265-D\4h\300\344\336bN\25\0\310\0304\217\210\256`"
- #"\242fj\"\356\20\335\354\233&\353\365%\337#\6\362H\221\354\244>"
- #"\333\343\200ki\353Bs\255$\216z\361\370I\234*\"b\35\374yo\22\302"
- #"\37k\2437Z\360p\365+\270/|\317\v\201wi\36[c;O@\21w\306\31"
- #"\b\313\264\273\336\307\275q\274\311\355\322\341\313\366\347I\375"
- #"\257;\314\311\335\335K\3128\310t\231q\232rD'9'D$t3k\353%J;\333 \26"
- #"DLD\255\265\20\301\224G\265\0\1\221\324\372\3D\n\34\245\251"
- #"*\"\3@)%Zw\304=\347RM#:FD\264\300T\224\301e<\374\326C\203H\3678"
- #"\17\313\267Y\212\355\3378>\334\263\4\276\250\f\0322\6C\362"
- #"\230/G@D\t\34\334\233\n\200\23\3\22[k\252\232B\354\326"
- #"\226\230\241ird$@\b\23\356}\"\31)\272\370\220W\242\30\233"
- #"\346\35/\251\261:f\22#\257\20c\242\221G+\v\200\3\231\271G"
- #"\252\232z*'\30\e\372\362\233i\346\4\336g"
-) 500
-(
- #"\"\36\2279\321\336\337\320_\346\16N\351*\254q\367\230\35i\235J"
- #"\316C6#q\213[\301\346\250\21;\253X\334}\317\323\302\366\345\343"
- #"\213\16\363\20\16\313\0205\353\243\356\357^r\257\262(\21\241"
- #"Xl\266\266.+\323\3514\315%\235\346\2229\335L\363\351t\332\306F8h"
- #"[\26\213-\305\344\3\275\246\252\257\257\257\347\363\215\264&Z"
- #"\1\3!O\200l\346*Hh\320\231\36\30\300\335\314\325\300\235"
- #"\211\312i6\340\23g\344\234U\301\223\251\266Zs\316mY5kJi\251\356"
- #"\216\224\24\224Sp\216\4,\35A\af\0\21\334\34\324\203\317\334"
- #"\314R\212\202\252n\271\274\24\0\306\330v\304\224R\342\336\376\243"
- #"\333\243\31\36.\2@J\341&\17\227\213\221\210\t\334\272\357"
- #"\30\337=\220\r\35`T\341\311o\261\352.\34\307\345\271Vf\373j"
- #"\36@\240\273\212:\324[\267O>V\204G\321\214~\225q\314\256_;{\371"
- #"5q\233\177jl\342U02\262\0\361f\234j;\362p\223a\222>\22\315\336\354"
- #"7,\263\273\203\272\231W\320\224R\"N)M9O9O\271\314\363\374\307\177"
- #"\364\243\230\23K\333@aL\350\260^^\247i\202\314\"bj\265\326"
- #"\224RI)\0\177k]\302\2401\263\3\370p\320\2576\0(\202\306\317F"
- #"\304\2343df\312M\205\210\240\323l\212\273\367\351\177\214\321\0hh"
- #"\335#\367\236\22\214n\3630\301\361d\"m\27\v\365\6\220\221"
- #"\36\237\356i\320\365\203\22\0\21063\233r2\263]]\17/\312"
- #"\372E<f\374\355\376Lb\210\211\356\230(0\267\340\204\b\n\16\n"
- #"\335\n\23\";\202\271\305\300\03113\267\341\324\237#\37\341\0"
- #"\0\tzIDAT\3\0 \357\316Vw\374\206\321\207!\251\375\321\205"
- #"\32\202\210\234\307'c\375u\233\206\203\aY\1"
-) 500
-(
- #"\360\215\213\2`D\26W\342\362\306(\177\332F\277\221\313\355\344=7"
- #"x\365]?j\273\220\300\330\250\330\357\303\16\235\336\0\275s\242d"
- #"f\202)\363<\227\233y:M\345\3664\177v\276)e\216G\207\210A\323\257Z"
- #"[k\3203\251\354\256\2555\37\351\5\"\f\25\23\17\223\231"
- #"\325,r\35a3\r:\5\a\4[vd\6\230303\22&\322\f\0\256"
- #"\"\"M\233{\214\374jh\300\f\301\22\254\216x\230a\r\20\215"
- #"\211N\216Ld&n\36\303\36\2M\0031M\f\234\210\22\271eb \214\254"
- #"\t3\317eJ)\5\26&\36g'\342d\0\200\332.\20\233\0\321\t\235"
- #"\260'n\2\307\301\234RR\320\230\270BD1\"\332d\17\201}\253a_\277"
- #"6\244\35t\265\262;j\233\236\3334\34\342\316\354\371IA\371XY\216"
- #"\367<\376>N\30\301\r\367\352\310'\4\356\17;\213\327\342hG\226"
- #"\255m\327\204\342\0342\267i\347\303\375\204\b\6w\5Esg&\236J:"
- #"\a.f*sN\2472\271\211k\257q\342\200h\250jf\216-\215\210#\341\327S"
- #"\307M\326\355\201#\242\250\233Y9\315\221\3143\353\267\34\214n\341"
- #"\234\233\31bfb\346\f\244f\346\4b\272\3758\215\342\261c\316\256"
- #"b\301U\236\367\301t\36J\207\21C\21\30642\302\3366\277E\5f\226T"
- #"Z\212\200&\210BM\r\203\334m\3211E\22,(\20\301\335\373\360I\362}"
- #"B\340\265\371cfw\204>\36\3008\246\311\360^\303A\225\355\241\37"
- #"\327\30G\253Y\310\333\321\221\367A(1\226<\234\352\375$\177@{}\374"
- #"\247O\212\316\220\362N\3r\374k\377\372\233\223|\224g\376\370\22"
- #"\233\201\336\168(\334>\206\304\301\2u\22\302\227R\212a\274\2310"
- #"'\3129\237\246\371f>\315e\"\306\2307"
-) 500
-(
- #"+\"1\23033\245\224\220\2009[\23\0\a\220\355ZfVEZ\3\225"
- #"\32\346^\305\265\364\371d\333\306\336\16\356\31c\"u\363\326"
- #"\210\242k\2773\364\213D\303-\23\347D\331\2\231\242Z\362\4\243G"
- #"\321\206\326\200\216\376\357\214\376\3!%\2109\2\363M\277 b"
- #"\212ry\4\277\231QUk\255\265\2559\347\370~J\311l\357R\253m\335\36"
- #"=\367\351\6\276-CTr\331\221\1\25\310\335\210\220\23\202\306"
- #"\\N\0\306\314\4Fb\n\340\24\323D\306\234\302\315\334\367\245="
- #"D\273\341@lR\270\211\340v\360\e!\370\264L\34\34\307\355\21"
- #"\304qWyG\334\203\233\370\322\341\337\217^\a\331z#v\307;\t"
- #"\17\230\341\3402FK'\332\226\324\b\352i\"b\300R\312<M\347\371t{"
- #"{{>\237\347yf k\326ZK\334\222\241\262\324ZU\225xO5\304U\"\361ff"
- #"\256-%\266\201\177nU\335\235s\3169KS&\v\216\374x(\2555wH%\253\270"
- #"\221\21\ts\"\262\224'B\367\326\2\231\264\315\246\263\217F"
- #"\357\6\327\23\37\344;.\r\270gB\254\17\312\335\277\233J\"0i"
- #"kk\0m$\bF\251'|\224p\36\272\316+\234`p\221@\3529I3\v\214\240"
- #"\6\275!b\247\323sE\212\206{\217\372\2\6\375m\224:F^\204"
- #"\at\305\315\235\336\252\237]}\36\222\237\261\352\356\36\35"
- #"\17\a\t\370\350\315\365k\377\373\265\324\16\230\302[\343~"
- #"\364o\276\347\214W\311\277\336<\322\305kW\201\f{\b\22\302\27"
- #"\312\b Fm\207\17I\21|0\363\347\357>;\317\1\313:\335\314\247"
- #"\r%\0\346\b\300\234s\356\263\e\30\0\19g3S\273Z~\213V#US"
- #"\210\32\201\252b`\237\203\246\b\234\231)\363\330\325\224\0b\3109"
- #"\341\326WEf\26"
-) 500
-(
- #"\334s\0\300\234\272\316\6\30410\e\21a\313(\271\273;\217d\260"
- #"\231m\333\254\203\34v\3E\2108F\177\ru`\346\3144M\323\321\220mo"
- #"\210\320\201|\340_\320\337\226.\242\336@\200\330;\365\311\274B\357"
- #"\227SP\1\263\0f2\365J\3\2X\237\2\356\210W\205\377\243\224"
- #"\34#\342\310<\1\241\273\343!#\365\275Rrx}\302\376\6\241/"
- #"\247\203\311\336-\357v\374\321\211\273\n\212\307\211\216\377G\373"
- #"\201Q\317\273N|\216}\205\b\4\306\340\261\234\314t:M\347\363\273"
- #"i\232\336\235o\317\363\251\224)\21\217a5\f\303w<nN\304\235\333n"
- #"]\327Z\253\212\204.\224Z[\203>\nn\324\231|\224\321[kb"
- #"\312\314\354)^\341G\245\224 3s&\356\3432\334=bp\353\330i\304\316"
- #"\321\2036@\234\210\330-\242\212\273\307\210qGP7\2020\201\235\367"
- #"\366\315Z\244D\254\252\275*\212N\bn\276\\^\335bv\374\204\210"
- #"\352\"\265!Y\316\331\r\211JJ\301V\322\211jb\227\3xN\245"
- #"\265\326L\210\bLSJ\310Sk\1V\263`\350\32\372\253\363\227\""
- #"\2\1\302\240_\346\315\305\364n\34q\244p\267\207n\256\356@Q\257"
- #"\4\355\275*\340\221`\32\222j\0PJq\367Z[\240\225\20\21\264G"
- #"\1WR\211\30\260+\4p\363\210X{\275\302\266\323\37\366\344`\366"
- #"9(\346ah\370\240Y}?\200\266\331\260\0\0\220\0341\242\177\242D\224"
- #"\t\243\n\374\331\315\273\317\336}6\225\233\371\346T\312\234\270"
- #"\204\262LH9\321<eF5Y\270\20\201\324\352Dd\211\20\321DDD;\222\256"
- #"\227RT<\262\332\200XE\300I\24R\"G\316\205\0@\244\251\312\204\340"
- #"\321\215\205\210\210\265\326\211g\" `Fv#&6\264\234&5Q\215)l\220"
- #"\3"
-) 500
-(
- #"\2008M\221\6r\207\314\0\b\212\240f\255Uf\346\230=\b\311\35"
- #"\315\200\210\243K9\30fCv;\275\210\365\207\265\347\212\2\257\26"
- #"\a\305\340P@M)q\32\222\313<f.D\\\211\210H\275\231(lS\"\""
- #"\267>\312\v\267\27 nX\366\357\211[?~\0355\342\e\3\272%/"
- #"\303\343\211\312z\316\331\372|\36\275\226\267\20\257\250\221\357a"
- #"\307\e\255\357Q\241\2140i|~\255\225q\373\360\315\35\342&\177\a"
- #"\225\356~\365\24\30\210\202\223=33\226D\2118j\36\3234\315S\214"
- #"\1+\204\211\211R\242L\234\23\225Rx\fE\32\231\262\36\27\312"
- #"\272\266\326b\236\224\r\34\n\16\342\204\261\317v\32\203@\260"
- #"\216S\271\210\30Pf\25\21J\272\271\376\307\325\301Q\t\353/\353"
- #"\246\351\20&\356\376\250\37 ?\307u\214u\3310`\210\230\216\27\300"
- #"m\214\216\243\203\5\315<v\344H\367\223z\vz\324?\2107\27*N\35"
- #"\277+\31\231\231t\232eswBg\352\232,\271\303\370\326hhw\304\21!"
- #"~\277=\365C]k\363\333:\356\3\321\35T\225\231\247iR\325\20D?t"
- #"Yw\211\351\203\n\0\0\372\330*\330M\333\361Q\372\265\242\374\370~"
- #"\266#\257>\34\362\367\366\273\207{`f\206\260\257N\211K\242\234\271"
- #"\244|3\237nnnN\247\323i\276\271}\367\2169\203Sb\316\23131\2413s\340"
- #"q\324]\335\323\301Q\16\301\n\336\241\350o\214\0207\5\267U"
- #"\307ru\233\356\203\221\266\27\312\300\335-\r\353\214\334\222\344"
- #"\304\26Id\350\203n|\23\270\336/\341\30\247\334\4}\223O\0\320"
- #"\343H\242-\362\er||\245q\304\256\2406\203\275-\366\361\362#\b"
- #"\0303^(*\326}k\352\301\a\242\16\312\355\e\202\231\23\23x"
- #"\367K\302\330\365\n\334\370\312?"
-) 411
-(
- #"(\177o\326\365\270\325\230\301\335\247i\272\275\275\r\271\214\222"
- #"\3171\216\336\3\216\303\327\a_>\36\265\254\217\212\255\331["
- #"\374\337\3077\211\327jv\23\304\375\261B\237sI0\24\311\370KBb\346"
- #"\314i\232\246y\2769\235N\347\363\273\323|\23\\\227\b\34Z\220"
- #"\34\334\4FS\34\217\332\6\21!\302\321\16\264\326\\\32"
- #"\f>\227HA\2439qG\320\304\n\212:R\317\225\0213abf\302\24\""
- #"\230E4)D\r\315\21\21-B\212q\222P\344\21!\23\321V5\241\201"
- #"]\372x\275\372\222Yo\363\215\5\0\367\324q\260\336\351u\267\375"
- #"\304\234\3lk\326\351\205\230cHKL^\354}(\0\260\265\232B\200\202"
- #"\274G\221\304d&\353\353J\301\222\265\357\bD\304D$#\312\306\341"
- #"\37\376\377\304\24\373\306p\a\200`\240\37\357\35`m\255]."
- #"\227\30\377\262\255\323&|x\235Cy\23\235\35%{\214X\337\3n\214i"
- #"\274;9\263\17\221\333\245\220v9\34\340V\2\200`\376\210>\230\320"
- #"\312\301\314\214\2340\21\347<My>\225\351T\2469\227\3234e.)\25\342"
- #"\314H\304\201\325\224c\24\2\335(u \214\212\264\326j\255\265V\320"
- #"=\207\32\3719D\337\350\324C)\320`\30J\211\231\202X7o6t{\\f\206"
- #"\209\277@\370\322\6\203\210\303\230:[\253\231\321 \323\201"
- #"\341\273\373\336\375\211\233\302\336\36W\374\373\377\0\307\221\220"
- #"\275\210\27\312\2\0\0\0\0IEND\256B`\202"
-) 0 0 4 3 1 #" "
-0 0 16 3 1 #"("
-0 0 8 3 1 #"m"
-0 0 8 3 1 #"a"
-0 0 8 3 1 #"y"
-0 0 8 3 1 #"b"
-0 0 8 3 1 #"e"
-0 0 8 3 1 #"-"
-0 0 8 3 2 #"im"
-0 0 8 3 1 #"a"
-0 0 8 3 1 #"g"
-0 0 8 3 1 #"e"
-0 0 4 3 1 #" "
-0 0 16 3 1 #"("
-0 0 8 3 1 #"c"
-0 0 8 3 1 #"d"
-0 0 8 3 1 #"r"
-0 0 4 3 1 #" "
-0 0 8 3 1 #"n"
-0 0 8 3 1 #"u"
-0 0 8 3 1 #"m"
-0 0 8 3 1 #"-"
-0 0 8 3 1 #"l"
-0 0 8 3 1 #"i"
-0 0 8 3 1 #"s"
-0 0 8 3 1 #"t"
-0 0 16 3 3 #")))"
-0 0 4 29 1 #"\n"
-0 0 4 3 10 #"          "
-0 0 16 3 1 #"("
-0 0 8 3 1 #"c"
-0 0 8 3 1 #"o"
-0 0 8 3 1 #"n"
-0 0 8 3 1 #"s"
-0 0 4 3 1 #" "
-0 0 14 3 2 #"14"
-0 0 4 3 1 #" "
-0 0 16 3 1 #"("
-0 0 8 3 1 #"m"
-0 0 8 3 1 #"a"
-0 0 8 3 1 #"y"
-0 0 8 3 1 #"b"
-0 0 8 3 1 #"e"
-0 0 8 3 1 #"-"
-0 0 8 3 1 #"i"
-0 0 8 3 1 #"m"
-0 0 8 3 1 #"a"
-0 0 8 3 1 #"g"
-0 0 8 3 1 #"e"
-0 0 4 3 1 #" "
-0 0 16 3 1 #"("
-0 0 8 3 2 #"cd"
-0 0 8 3 1 #"r"
-0 0 4 3 1 #" "
-0 0 8 3 1 #"n"
-0 0 8 3 1 #"u"
-0 0 8 3 1 #"m"
-0 0 8 3 1 #"-"
-0 0 8 3 1 #"l"
-0 0 8 3 1 #"i"
-0 0 8 3 1 #"s"
-0 0 8 3 1 #"t"
-0 0 16 3 6 #"))))))"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 16 3 1 #"("
-0 0 8 3 11 #"maybe-image"
-0 0 4 3 1 #" "
-0 0 16 3 1 #"("
-0 0 8 3 4 #"list"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"8"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"2"
-0 0 4 3 1 #" "
-0 0 14 3 2 #"93"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"4"
-0 0 16 3 2 #"))"
-0 0 4 29 1 #"\n"
-0 00000000000
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/info.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/info.rkt
deleted file mode 100644
index 4f7a443b2f..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang info
-
-(define test-omit-paths '("jump-to-ui-test.rkt"
-                          "big-bang-test.rkt"))
-
-(define test-responsibles '((all clements)))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/intermediate-y.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/intermediate-y.rktl
deleted file mode 100644
index a2bfcfe2ab..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/intermediate-y.rktl
+++ /dev/null
@@ -1,13 +0,0 @@
-(let ((Y (lambda (f)
-           (let ((g (lambda (x)
-                      (apply f (list (lambda (z1 z2)
-                           (apply (apply x (list x)) (list z1 z2))))))))
-             (g g))))
-      (newappend (lambda (ap)
-                   (lambda (x y)
-                     (if (null? x)
-                         y
-                         (cons (first x)
-                               (apply ap (list (rest x) y)))))))
-      (l (cons 1 (cons 2 (cons 3 null)))))
-  (apply (Y newappend) (list l l)))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/jump-to-ui-test.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/jump-to-ui-test.rkt
deleted file mode 100644
index b311dd3700..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/jump-to-ui-test.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-;; The first three lines of this file were inserted by DrScheme. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-intermediate-reader.ss" "lang")((modname jump-to-ui-test) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ())))
-(+ 3 4)
-
-(+ 4 5)
-
-(check-expect (+ 5 6) 11)
-
-(+ 6 7)
-
-(+ 7 8)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/lambda-test.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/lambda-test.rktl
deleted file mode 100644
index d55e345e4f..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/lambda-test.rktl
+++ /dev/null
@@ -1,11 +0,0 @@
-(define ident (lambda (x) (+ (- x 1) 1)))
-
-(ident 14)
-
-(ident 3)
-
-(define (ident-2 x) (+ (- x 1) 1))
-
-(ident-2 14)
-
-(ident-2 3)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/language-level-model.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/language-level-model.rkt
deleted file mode 100644
index 750ab0dc5e..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/language-level-model.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/base
-
-(require stepper/private/model-settings)
-
-(provide (all-defined-out))
-
-;; DEFINING A LANGUAGE FOR THE PURPOSES OF TESTING
-
-;; ll-model : a representation of the behavior of a language level w.r.t. the stepper
-(define-struct ll-model (namespace-spec render-settings enable-testing?))
-
-;; the built-in ll-models:
-(define mz
-  (make-ll-model 'mzscheme fake-mz-render-settings #f))
-
-(define beginner
-  (make-ll-model `(lib "htdp-beginner.ss" "lang") fake-beginner-render-settings #t))
-
-(define beginner-wla
-  (make-ll-model `(lib "htdp-beginner-abbr.ss" "lang") fake-beginner-wla-render-settings #t))
-
-(define intermediate
-  (make-ll-model `(lib "htdp-intermediate.ss" "lang") fake-intermediate-render-settings #t))
-
-(define intermediate-lambda
-  (make-ll-model `(lib "htdp-intermediate-lambda.ss" "lang") fake-intermediate/lambda-render-settings #t))
-
-(define advanced
-  (make-ll-model `(lib "htdp-advanced.ss" "lang") fake-advanced-render-settings #t))
-
-(define lazy
-  (make-ll-model `(lib "lazy.rkt" "lazy") fake-lazy-render-settings #f))
-
-
-;; unsure about the render-settings, here: 
-(define dmda-a
-  (make-ll-model `(lib "DMdA-beginner.ss" "deinprogramm") fake-beginner-render-settings #t))
-
-
-;; SUPPORT FOR TESTING A BUNCH OF LANGUAGES AT ONCE:
-
-;; built-in multi-language bundles:
-(define upto-int/lam
-  (list beginner
-        beginner-wla
-        intermediate
-        intermediate-lambda))
-
-(define upto-int
-  (list beginner
-        beginner-wla
-        intermediate))
-
-(define bwla-to-int/lam
-  (list beginner-wla
-        intermediate
-        intermediate-lambda))
-
-(define both-intermediates
-  (list intermediate
-        intermediate-lambda))
-
-
-
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/let-test.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/let-test.rktl
deleted file mode 100644
index cf6139ce86..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/let-test.rktl
+++ /dev/null
@@ -1,11 +0,0 @@
-(define a 15)
-
-; basic testing
-
-(define (test x)
-  (let ([a (+ a 3)]
-        [b (- a 39)])
-    (+ a b)))
-
-(test 1)
-(test 2)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/letrec-test.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/letrec-test.rktl
deleted file mode 100644
index e3c9fb7a97..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/letrec-test.rktl
+++ /dev/null
@@ -1,9 +0,0 @@
-(define a 15)
-
-(define (test c)
-  (letrec ([a (+ c 13)]
-           [b (+ a 90)])
-    (+ a b)))
-
-(test 13)
-(test 14)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/local-define-struct.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/local-define-struct.rktl
deleted file mode 100644
index 866b4bac99..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/local-define-struct.rktl
+++ /dev/null
@@ -1,7 +0,0 @@
-(define (gen ignored)
-  (local ((define-struct local-struct (local-field))
-          (define silly-def (+ 3 4)))
-    (make-local-struct 13)))
-
-(define p (gen 1))
-(define q (gen 1))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/local-test-2.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/local-test-2.rktl
deleted file mode 100644
index 923bc40831..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/local-test-2.rktl
+++ /dev/null
@@ -1,10 +0,0 @@
-(define (create-closure x)
-  (local ((define a 13)
-          (define (closure y)
-            (+ a x y)))
-    closure))
-
-(define closure-1 (create-closure 1))
-(define closure-2 (create-closure 2))
-
-(closure-1 100)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/local-test.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/local-test.rktl
deleted file mode 100644
index 75c2e8cdbf..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/local-test.rktl
+++ /dev/null
@@ -1,10 +0,0 @@
-(+ 14
-   (local
-       ((define (fact x)
-          (if (= x 0)
-              1
-              (* x (fact (- x 1)))))
-        (define nother (lambda (x) x))
-        (define a (+ 3 5))
-        (define b (+ a 13)))
-     (fact b)))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/long-error-message.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/long-error-message.rktl
deleted file mode 100644
index b51f7ee9b4..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/long-error-message.rktl
+++ /dev/null
@@ -1 +0,0 @@
-(add1 3 (list 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/manual-tests.txt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/manual-tests.txt
deleted file mode 100644
index 1d6f63e0c7..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/manual-tests.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-open stepper, make sure it works for (+ 3 4).
-
-make sure that stepper button appears and disappears as necessary when
-language level changes.
-
-Make sure that you get a warning when you change the underlying program, and a
-warning when the program window disappears.
-
-Try stepping backward and forward through programs with correct and erroneous
-(syntax errors, runtime errors) executions, incl. jumping to end.
-
-Try programs which print snips (print-convert-test.ss)
-
-try programs that contain test cases; make sure that the popups behave sensibly.
-
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/multiply-defined.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/multiply-defined.rktl
deleted file mode 100644
index dad7a2a534..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/multiply-defined.rktl
+++ /dev/null
@@ -1,3 +0,0 @@
-(define d 3)
-
-(define (d x) 3)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/name-chaining.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/name-chaining.rktl
deleted file mode 100644
index 1a0e701652..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/name-chaining.rktl
+++ /dev/null
@@ -1,9 +0,0 @@
-(define (add-1 x) (+ 1 x))
-
-(define g add-1)
-
-g
-
-(define h g)
-
-(h 4)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/no-else-clause.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/no-else-clause.rktl
deleted file mode 100644
index 09d5a88c1e..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/no-else-clause.rktl
+++ /dev/null
@@ -1,2 +0,0 @@
-(cond [#f 3]
-      [(= 3 4) 4])
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/non-procedure.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/non-procedure.rktl
deleted file mode 100644
index fbb7d3d738..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/non-procedure.rktl
+++ /dev/null
@@ -1,3 +0,0 @@
-(define my-var 15)
-
-(my-var 3)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/print-convert-test.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/print-convert-test.rktl
deleted file mode 100644
index e746029460..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/print-convert-test.rktl
+++ /dev/null
@@ -1,352 +0,0 @@
-WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket, or DrScheme version 4 or later
-   to read it.
-
-            http://racket-lang.org/
-|#
- 46 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wxmedia\0"
-3 1 8 #"wximage\0"
-2 0 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 18 #"java-comment-box%\0"
-1 0 23 #"java-interactions-box%\0"
-1 0 15 #"make-line-snip\0"
-1 0 15 #"make-line-snip\0"
-1 0 13 #"example-box%\0"
-2 0 18 #"interactions-box%\0"
-2 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 34 #"drscheme:vertical-separator-snip%\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 10 #"text-box%\0"
-1 0 1 6 #"wxloc\0"
-00000000000 1 76 0 1 #"\0"
-0 75 1 #"\0"
-0 11 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 11 #" Monospace\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 27
-#"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 40
-#"framework:syntax-coloring:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 41
-#"framework:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-41 #"framework:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 40
-#"framework:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 42
-#"framework:syntax-coloring:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 45
-#"framework:syntax-coloring:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 39
-#"framework:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 39
-#"framework:syntax-coloring:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 14
-#"Html Standard\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-49 #"drscheme:check-syntax:lexically-bound-identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 42
-#"drscheme:check-syntax:imported-identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 39
-#"profj:syntax-coloring:scheme:prim-type\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 40
-#"profj:syntax-coloring:scheme:identifier\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 36
-#"profj:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:literal\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-35 #"profj:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:default\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 39
-#"profj:syntax-coloring:scheme:uncovered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 37
-#"profj:syntax-coloring:scheme:covered\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 0 139 0 0 0 -1 -1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 4
-#"XML\0"
-0 70 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 0 1
-#"\0"
-0 75 1 #"\0"
-0 12 90 90 90 90 3 3 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 92 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 92 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 40 25 15 0 0 0 1 1 2 30
-#"drscheme:check-syntax:keyword\0"
-0 70 1 #"\0"
-1 0 92 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 40 25 15 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1 2 39
-#"drscheme:check-syntax:unbound-variable\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 36 36 140 0 0 0 1 1 2 37
-#"drscheme:check-syntax:bound-variable\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 36 36 140 0 0 0 1 1 2 32
-#"drscheme:check-syntax:primitive\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 36 36 140 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 51 135 39 0 0 0 1 1 2 31
-#"drscheme:check-syntax:constant\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 51 135 39 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 1 1 2 27
-#"drscheme:check-syntax:base\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 2 1 #"\0"
-0 71 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 1 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 90 90 90 90 3 3 1 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 1 1 2 1 #"\0"
-0 75 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 92 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 1 1 2 15
-#"mzprizm:syntax\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 18
-#"mzprizm:primitive\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 17
-#"mzprizm:constant\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 80 80 248 0 0 0 1 1 2 1
-#"\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 1 1 2 23
-#"mzprizm:bound variable\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 1 1 2 25
-#"mzprizm:unbound variable\0"
-0 70 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1 2 1
-#"\0"
-0 71 1 #"\0"
-1 0 90 90 90 90 3 3 0 0 0 0 0 0 0 0 0 1 1 1 248 20 64 0 0 0 1 1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 4 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 255 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 -1 -1
-00000000002 0 00000000000 3 00000000000 48 0 16 3 1 #"("
-0 0 8 3 1 #"+"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"3"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"4"
-0 0 16 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 16 3 1 #"("
-0 0 9 3 6 #"define"
-0 0 4 3 1 #" "
-0 0 8 3 1 #"a"
-0 0 4 3 1 #" "
-0 0 16 3 1 #"("
-0 0 8 3 2 #"if"
-0 0 4 3 1 #" "
-0 0 14 3 2 #"#t"
-0 0 4 3 1 #" "
-0 0 13 3 10 #"\"a string\""
-0 0 4 3 1 #" "
-0 0 14 3 2 #"#f"
-0 0 16 3 2 #"))"
-0 0 4 29 1 #"\n"
-0 3 00000000015 4 1 #"\0"
-2 -1 -1 0 0 0 00000000002 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\0\37\0\0\0\20\b\2\0"
- #"\0\0a\2323\273\0\0\1\347IDAT8\215\255T-l\333@\24\376\274fR\""
- #"\305R\f\"\235\201\201\301\200\315l\266\203\206\201.k\340\240ia`"
- #"`\250Y\aS\226\260\302\31z,\1\223lh\350\3\226lp\300`\222\a"
- #"\236z\272%\316\324\255{\350\335\373\371\336\377\31\3030\340?\221"
- #"\20\242\310O\347<\vx\344\363\22016y'\34\200\"?\321\363y\237"
- #"\26Uf[6\0\237\207\0\376\5]\345\230\237\217\0\254\205\347"
- #"\271^\300#\322\326m\235\237\217A\36\261x\365\27\350:h\335\326"
- #"\277+=\237\207\17H\322\264\254\333Zi\r\352;y\222\210\212RO\242s"
- #"\236\225U\331v\345\25.l\313\266\26\336\303:\321\35\243x\5\300"
- #"\370vxy\336\247mWR\215\0<\327\323\235o\201^\4\340A\274~|d\214"
- #"\351\362;\331|\257\352\37\262\227\346\314\234M\227\0\232\256i\272f"
- #"i-\t\32@\3377\262\227\177@\227\2754`2\313q\275OB\b)\245\224r>"
- #"\237\1778f\2252\242\n\364\254\257\205\243\211\323\236\0\20B\354w"
- #"\273d\3157\311\27!\304\35\0\307\236P|\225>U@L\3377\244\275@T"
- #"\22sf\322\332\330\216\273t\354\t\246\37\177N\233\256a\226s\2713"
- #"mWR\367\257\23\244\326\23\243\217\341\225\367\0\24\371\311\347"
- #"!\215\2271f|\16\246\27(\212\327\303\250\376\334\332\31\265"
- #"\362tS\276\em\323\257\223\355\346\260\331\336_%2B\267Tu[\253<"
- #"\242x\345\363p\277\333\321\314\214a\30\324\231\340u\377\310\372-"
- #"\213H\f\17b\362\245\n\350\223\201\272&\235\204\20\244SQ\313"
- #"\252,\252\354V\0:%\325\23\0\324\26\306\330\b\372(\251c\326K\324"
- #"\347\f\340"
-) 44
-(
- #">J\2\36\221\1]\326[\321G\343\21\243>\37k\341=\35^t"
- #"\233_I\231I\t\2\346W\b\0\0\0\0IEND\256B`\202"
-) 0 0 4 29 1 #"\n"
-0 0 14 3 1 #"'"
-0 0 8 3 8 #"a-symbol"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 16 3 1 #"("
-0 0 8 3 1 #"/"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"3"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"2"
-0 0 16 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 16 3 1 #"("
-0 0 8 3 1 #"s"
-0 0 8 3 1 #"q"
-0 0 8 3 1 #"r"
-0 0 8 3 1 #"t"
-0 0 4 3 1 #" "
-0 0 14 3 1 #"2"
-0 0 16 3 1 #")"
-0 0 4 29 1 #"\n"
-0 00000000000
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/printing-reducing-test.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/printing-reducing-test.rktl
deleted file mode 100644
index 0d7bf0f5f7..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/printing-reducing-test.rktl
+++ /dev/null
@@ -1,3 +0,0 @@
-(first (cons 1 empty))
-
-(vector 1 2 3)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/procedure-display.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/procedure-display.rktl
deleted file mode 100644
index c3a8553319..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/procedure-display.rktl
+++ /dev/null
@@ -1,5 +0,0 @@
-(define a (lambda (b c) (+ b c)))
-
-(define (b c) (+ c 5))
-
-(+ (a 3 5) (b 9))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/recur-test b/pkgs/htdp-pkgs/htdp-test/tests/stepper/recur-test
deleted file mode 100644
index c7f3de83dd..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/recur-test
+++ /dev/null
@@ -1,4 +0,0 @@
-(define (my-proc x)
-  (+ (my-proc (- x 1)) x))
-
-(my-proc 34)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/right-redex.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/right-redex.rktl
deleted file mode 100644
index 011497ab4d..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/right-redex.rktl
+++ /dev/null
@@ -1 +0,0 @@
-(+ #t (if #t #t #t) #t)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/shared-unit-tests.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/shared-unit-tests.rkt
deleted file mode 100644
index 80183a5526..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/shared-unit-tests.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang racket
-
-(require rackunit
-         stepper/private/shared
-         stepper/private/syntax-property)
-  
-; test cases taken from shared.rkt
-;
-(define (lifted-name sym) 
-  (syntax->datum (get-lifted-var sym)))
-(define cd-stx 
-  (datum->syntax #f 'cd))
-
-(check-equal? (lifted-name (datum->syntax #f 'ab)) 'lifter-ab-0)
-(check-equal? (lifted-name cd-stx) 'lifter-cd-1)
-(check-equal? (lifted-name (datum->syntax #f 'ef)) 'lifter-ef-2)
-(check-equal? (lifted-name cd-stx) 'lifter-cd-1)
-
-(check-equal? (map syntax-e (arglist->ilist #'(a b c))) '(a b c))
-(check-equal? (map syntax-e (arglist->ilist #'(a . (b c)))) '(a b c))
-(check-equal? (syntax-e (arglist->ilist #'a)) 'a)
-(let ([result (arglist->ilist #' (a b . c))])
-  (check-equal? (syntax-e (car result)) 'a)
-  (check-equal? (syntax-e (cadr result)) 'b)
-  (check-equal? (syntax-e (cddr result)) 'c))
-(check-equal? (map syntax-e (arglist-flatten #'(a b c))) '(a b c))
-(check-equal? (map syntax-e (arglist-flatten #'(a . (b c)))) '(a b c))
-(check-equal? (map syntax-e (arglist-flatten #'(a b . c))) '(a b c))
-(check-equal? (map syntax-e (arglist-flatten #'a)) '(a))
-
-(define new-queue (make-queue))
-(check-equal? (queue-push new-queue 1) (void))
-(check-equal? (queue-push new-queue 2) (void))
-(check-equal? (queue-pop new-queue) 1)
-(check-equal? (queue-push new-queue 3) (void))
-(check-equal? (queue-pop new-queue) 2)
-(check-equal? (queue-pop new-queue) 3)
-(check-exn exn:fail? (lambda () (queue-pop new-queue)))
-
-(check-equal?
- (call-with-values (lambda ()
-                     (values-map (lambda (a b) (values (+ a b) (- a b)))
-                                 `(1 2 3 4 5)
-                                 `(9 8 7 6 5)))
-                   (lambda (sums diffs)
-                     (list sums diffs)))
- `((10 10 10 10 10)
-   (-8 -6 -4 -2 0)))
-
-(check-exn exn:fail? (lambda () (stepper-syntax-property #`13 'boozle)))
-(check-exn exn:fail? (lambda () (stepper-syntax-property #`13 'boozle #t)))
-(check-equal? (stepper-syntax-property #`13 'stepper-hint) #f)
-(check-equal? (stepper-syntax-property (stepper-syntax-property #`13 'stepper-hint 'yes)
-                                       'stepper-hint) 'yes)
-(check-equal? 
- (stepper-syntax-property (stepper-syntax-property (stepper-syntax-property #`13 
-                                                                            'stepper-hint
-                                                                            'no)
-                                                   'stepper-hint 'yes)
-                          'stepper-hint)
- 'yes)
-(check-equal? (stepper-syntax-property (stepper-syntax-property (stepper-syntax-property #`13 'stepper-hint 'yes) 'stepper-black-box-expr 'arg) 'stepper-hint) 'yes)
-(check-equal? (syntax->datum (stepper-syntax-property (stepper-syntax-property #`13 'stepper-hint 'yes) 'stepper-black-box-expr 'arg)) 13)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/structures.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/structures.rktl
deleted file mode 100644
index 594c474324..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/structures.rktl
+++ /dev/null
@@ -1,15 +0,0 @@
-(define-struct item (name price))
-
-(define inventory (cons (make-item 'rabbit 32.42)
-                        (cons (make-item 'twiggy 3.18)
-                              (cons (make-item 'richard-nixon 0.45)
-                                    empty))))
-
-(+ 3 4)
-
-(define (sum-up-prices item-list)
-  (cond ([null? item-list] 0)
-        (else (+ (item-price (car item-list))
-                 (sum-up-prices (cdr item-list))))))
-
-(sum-up-prices inventory)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/symbol-identifier.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/symbol-identifier.rktl
deleted file mode 100644
index 415af60106..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/symbol-identifier.rktl
+++ /dev/null
@@ -1,3 +0,0 @@
-(define (appy x) (list x 'x))
-
-(define foo (appy 'putz))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/symbols.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/symbols.rktl
deleted file mode 100644
index 753e59de0a..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/symbols.rktl
+++ /dev/null
@@ -1,7 +0,0 @@
-(+ 3 4)
-
-(define f 'foo)
-
-(define g f)
-
-(+ 3 4)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/syntax-error-ordering.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/syntax-error-ordering.rktl
deleted file mode 100644
index 19d26d803d..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/syntax-error-ordering.rktl
+++ /dev/null
@@ -1,3 +0,0 @@
-(lambda) 
-
-(
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-abbrev.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-abbrev.rkt
deleted file mode 100644
index 4554f3a853..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-abbrev.rkt
+++ /dev/null
@@ -1,85 +0,0 @@
-#lang racket
-
-(require (for-syntax scheme/mpair))
-
-(provide t)
-
-;; t : eli's convenient short-cut syntactic form for defining tests.
-
-;; here's an example of how you might use it:
-#;(let* ([defs1 `((define (a x) (+ x 5)) (define b a))]
-       [defs2 (append defs1 `((define c a)))])
-  (t 'top-ref4 m:intermediate
-     ,@defs1 (define c b) (c 3)
-     :: ,@defs1 (define c {b})
-     -> ,@defs1 (define c {a})
-     :: ,@defs2 ({c} 3)
-     -> ,@defs2 ({a} 3)
-     :: ,@defs2 {(a 3)}
-     -> ,@defs2 {(+ 3 5)}
-     -> ,@defs2 {8}))
-
-
-
-(define-syntax (t stx)
-  (define (maybe-mlist->list r)
-    (if (mpair? r) 
-        (mlist->list r)
-        r))
-  (define (split l)
-    (let loop ([l l] [r '()])
-      (cond [(null? l) (reverse (map maybe-mlist->list r))]
-            [(symbol? (car l)) (loop (cdr l) (cons (car l) r))]
-            [(or (null? r) (not (mpair? (car r))))
-             (loop (cdr l) (cons (mlist (car l)) r))]
-            [else (mappend! (car r) (mlist (car l))) 
-                  (loop (cdr l) r)])))
-  (define (process-hilites s)
-    (syntax-case s ()
-      [(x) (eq? #\{ (syntax-property s 'paren-shape))
-           (with-syntax ([x (process-hilites #'x)]) #'(hilite x))]
-      [(x . y) (let* ([x0 #'x]
-                      [y0 #'y]
-                      [x1 (process-hilites #'x)]
-                      [y1 (process-hilites #'y)])
-                 (if (and (eq? x0 x1) (eq? y0 y1))
-                     s
-                     (with-syntax ([x x1] [y y1]) #'(x . y))))]
-      [_else s]))
-  (define (process stx)
-    (split (map (lambda (s)
-                  (if (and (identifier? s)
-                           (memq (syntax-e s) '(:: -> error:)))
-                      (syntax-e s)
-                      (process-hilites s)))
-                (syntax->list stx))))
-  (define (parse l)
-    (syntax-case l (::)
-      [(fst :: rest ...)
-       (cons #'fst
-             (let loop ([rest #'(rest ...)])
-               (syntax-case rest (:: -> error:)
-                 [(error: (err)) (list #'(error err))]
-                 [() (list #'(finished-stepping))]
-                 [(x -> y) (list #'(before-after x y) #'(finished-stepping))]
-                 [(x -> error: (err)) (list #'(before-error x err))]
-                 [(x -> y :: . rest)
-                  (cons #'(before-after x y) (loop #'rest))]
-                 [(x -> y -> . rest)
-                  (cons #'(before-after x y) (loop #'(y -> . rest)))])))]))
-  (syntax-case stx (::)
-    [(_ name ll-models . rest)
-     (with-syntax ([(exprs arg ...) (parse (process #'rest))])
-       (quasisyntax/loc stx
-         (list name
-               ll-models
-               ;printf "exprs = ~s\n args = ~s\n"
-               (exprs->string `exprs) `(arg ...)
-               '())))]))
-
-
-;; (-> (listof sexp) string?)
-(define (exprs->string exprs)
-  (apply string-append
-         (cdr (apply append (map (lambda (x) (list " " (format "~s" x)))
-                                 exprs)))))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-cases.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-cases.rkt
deleted file mode 100644
index 0215a66477..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-cases.rkt
+++ /dev/null
@@ -1,2196 +0,0 @@
-#lang racket
-
-(require "test-abbrev.rkt"
-         (prefix-in m: "language-level-model.rkt")
-         stepper/private/model-settings)
-
-(provide the-test-cases)
-
-
-;; a test with no extra files (a.k.a all but one of them :) )
-(define (t1 name models string expected-steps)
-  (list name models string expected-steps '()))
-
-
-(define (make-teachpack-ll-model teachpack-specs)
-  (m:make-ll-model `(lib "htdp-beginner.ss" "lang") teachpack-specs fake-beginner-render-settings #f #f))
-
-
-(define err '(/ 1 0))
-
-
-
-(define (<delay#> n)
-  (string->symbol 
-   (string-append "<DelayedEvaluation#" (number->string n) ">")))
-
-
-(define the-test-cases
-  (list
-   
-
-;; new test case language:
-;; an expected is (listof step)
-;; a step is one of
-;; (before-after exps exps)
-;; (before-error exps str)
-;; (error str)
-;; (finished)
-;; an exps is a list of s-expressions with certain non-hygienic extensions:
-;;  - (hilite X) denotes the s-expression X, only highlighted
-;;  - any        denotes any s-expression (matches everything)
-;;  ... in principle, these could collide with programs that use the
-;;      identifiers 'hilite' and 'any', but since I'm writing the test cases,
-;;      I can alpha-rename manually to avoid collisions.
-
-;; on top of this, the `t' macro makes things easier to write, informally:
-;; (t 'name ; symbolic name for the test
-;;    tester ; tester function that gets used
-;;    expr1 ... :: expr2 ... -> expr3 ...)
-;; means that `expr1 ...' is the original, the first step is
-;;   (before-after (expr2 ...) (expr3 ...))
-;; Cute stuff:
-;; * use `::' to mark a new step that doesn't continue the previous one
-;;     e1 :: e2 -> e3 -> e4
-;;   is the same as
-;;     e1 :: e2 -> e3 :: e3 -> e4
-;; * use `-> error: "..."' for a `before-error' step
-;; * use `:: error: "..."' for an `error' step
-;; * a `finished-stepping' is added if no error was specified
-;; * a `{...}' is replaced with `(hilite ...)'
-
-(t 'mz1 m:mz
-   (for-each (lambda (x) x) '(1 2 3))
-   :: {(for-each (lambda (x) x) `(1 2 3))} -> (... {1} ...)
-   :: ... -> (... {2} ...)
-   :: ... -> (... {3} ...)
-   :: ... -> {(void)})
-
-(t 'mz-app m:mz
-   (+ 3 4)
-   :: {(+ 3 4)} -> {7})
-
-(t 'mz-app2 m:mz
-   ((lambda (x) (+ x 3)) 4)
-   :: {((lambda (x) (+ x 3)) 4)} -> {(+ 4 3)} -> {7})
-
-(t 'mz-if m:mz
-   (if 3 4 5)
-   :: {(if 3 4 5)} -> {4})
-
-(t 'direct-app m:mz
-   ((lambda (x) x) 3)
-   :: {((lambda (x) x) 3)} -> {3})
-
-;   (m:mz "((lambda (x) x) (begin (+ 3 4) (+ 4 5)))"
-;                     `((before-after ((begin (hilite (+ 3 4)) (+ 4 5)))
-;                                     ((begin (hilite 7) (+ 4 5))))
-;                       (before-after ((hilite (begin 7 (+ 4 5)))) ((hilite (+ 4 5))))
-;                        (before-after ((hilite (+ 4 5))) ((hilite 9)))
-;                       (finished-stepping)))
-
-(t 'curried m:mz
-   ((lambda (a) (lambda (b) (+ a b))) 14)
-   :: {((lambda (a) (lambda (b) (+ a b))) 14)}
-   -> {(lambda (b) (+ 14 b))})
-
-(t 'case-lambda m:mz
-   ((case-lambda ((a) 3) ((b c) (+ b c))) 5 6)
-   :: {((case-lambda ((a) 3) ((b c) (+ b c))) 5 6)}
-   -> {(+ 5 6)}
-   -> {11})
-
-;; not really a part of base mzscheme anymore
-#;(t '2armed-if m:mz
-     (if 3 4)
-     :: {(if 3 4)} -> {4})
-
-;(m:mz "((call-with-current-continuation call-with-current-continuation) (call-with-current-continuation call-with-current-continuation))"
-;                  `((before-after (((hilite ,h-p) (call-with-current-continuation call-with-current-continuation))) ((call-with-current-continuation call-with-current-continuation))
-;                    (((hilite ,h-p) (call-with-current-continuation call-with-current-continuation))) ((lambda args ...)))
-;                    (before-after (((lambda args ...) (hilite ,h-p))) ((call-with-current-continuation call-with-current-continuation))
-;                    (((lambda args ...) (hilite ,h-p))) ((lambda args ...)))))
-
-;(m:mz '(begin (define g 3) g)
-;                  `((before-after ((hilite ,h-p)) (g)
-;                    ((hilite ,h-p)) 3)))
-
-;(syntax-object->datum (cadr (annotate-expr test2 'mzscheme 0 (lambda (x) x))))
-
-   
-
-(t 'simple-if m:upto-int/lam
-   (if true false true)
-   :: {(if true false true)} -> {false})
-
-(t 'if-bool m:upto-int/lam
-   (if (if true false true) false true)
-   :: (if {(if true false true)} false true) -> (if {false} false true)
-   :: {(if false false true)} -> {true})
-
-
-(t 'top-def m:upto-int/lam
-   (define a (+ 3 4))
-   :: (define a {(+ 3 4)})
-   -> (define a {7}))
-
-(t 'top-def-ref m:upto-int/lam
-   (define a 6) a
-   :: (define a 6) {a} -> (define a 6) {6})
-
-(t 'app m:upto-int/lam
-   (+ 4 129)
-   :: {(+ 4 129)} -> {133})
-
-(t 'if m:upto-int/lam (if true 3 4)
-   :: {(if true 3 4)} -> {3})
-
-(let ([def `(define (a3 x) (if true x x))])
-  (t 'top-app m:upto-int
-     ,def (a3 false)
-     :: ,def {(a3 false)}
-     -> ,def {(if true false false)}
-     -> ,def {false})
-  ;;
-  (t 'top-app/lam m:intermediate-lambda
-     ,def (a3 false)
-     :: ,def ({a3} false)
-     -> ,def ({(lambda (x) (if true x x))} false)
-     :: ,def {((lambda (x) (if true x x)) false)}
-     -> ,def {(if true false false)}
-     -> ,def {false}))
-
-(let ([defs `((define (a12 x) (+ x 9)) (define b12 a12))])
-  (t 'top-interref m:intermediate
-     ,@defs (b12 12)
-     :: ,@defs ({b12} 12)
-     -> ,@defs ({a12} 12)
-     :: ,@defs {(a12 12)}
-     -> ,@defs {(+ 12 9)}
-     -> ,@defs {21}))
-
-;;intermediate/lambda hof
-(let ([a-def `(define (a x)
-                (lambda (y) (+ x y)))])
-  (t 'intermediate-lambda-hof m:intermediate-lambda
-     ,a-def (define b (a 9)) (b 5)
-     :: ,a-def (define b ({a} 9))
-     -> ,a-def (define b ({(lambda (x) (lambda (y) (+ x y)))} 9))
-     :: ,a-def (define b {((lambda (x) (lambda (y) (+ x y))) 9)})
-     -> ,a-def (define b {(lambda (y) (+ 9 y))})
-     :: ,a-def (define b (lambda (y) (+ 9 y))) ({b} 5)
-     -> ,a-def (define b (lambda (y) (+ 9 y))) 
-     ({(lambda (y) (+ 9 y))} 5)
-     :: ,a-def (define b (lambda (y) (+ 9 y)))
-     {((lambda (y) (+ 9 y)) 5)}
-     -> ,a-def (define b (lambda (y) (+ 9 y))) {(+ 9 5)}
-     -> ,a-def (define b (lambda (y) (+ 9 y))) {14}))
-
-;;;;;;;;;;;;
-;;
-;;  OR / AND
-;;
-;;;;;;;;;;;;;.
-
-(t 'or1 m:upto-int/lam
-   (or false true false)
-   :: {(or false true false)} -> {true})
-
-(t 'and1 m:upto-int/lam
-   (and true false true)
-   :: {(and true false true)} -> {false})
-
-(t 'and2 m:upto-int/lam
-   (and true (if true true false))
-   :: (and true {(if true true false)}) -> (and true {true})
-   :: {(and true true)} -> {true}) 
-
-
-
-(let ([def `(define (b2 x) (and true x))])
-  (t 'and3 m:upto-int
-     ,def (b2 false)
-     :: ,def {(b2 false)}
-     -> ,def {(and true false)}
-     -> ,def {false})
-  ;;
-  (t 'and3/lam m:intermediate-lambda
-     (define (b2 x) (and true x)) (b2 false)
-     :: ,def ({b2} false)
-     -> ,def ({(lambda (x) (and true x))} false)
-     :: ,def {((lambda (x) (and true x)) false)}
-     -> ,def {(and true false)}
-     -> ,def {false}))
-
-(let ([defs `((define a1 true)
-              (define (b1 x) (and a1 true x)))])
-  (t 'and4 m:upto-int
-     ,@defs (b1 false)
-     :: ,@defs {(b1 false)}
-     -> ,@defs {(and a1 true false)}
-     :: ,@defs (and {a1} true false)
-     -> ,@defs (and {true} true false)
-     :: ,@defs {(and true true false)}
-     -> ,@defs {false})
-  ;;
-  (t 'and4/lam m:intermediate-lambda
-     ,@defs (b1 false)
-     :: ,@defs ({b1} false)
-     -> ,@defs ({(lambda (x) (and a1 true x))} false)
-     :: ,@defs {((lambda (x) (and a1 true x)) false)}
-     -> ,@defs {(and a1 true false)}
-     :: ,@defs (and {a1} true false)
-     -> ,@defs (and {true} true false)
-     :: ,@defs {(and true true false)}
-     -> ,@defs {false}))
-
-(t 'bad-and m:upto-int/lam
-   (and true 1)
-   :: {(and true 1)}
-   -> error: "and: question result is not true or false: 1")
-
-;;;;;;;;;;;;;
-;;
-;;  COND
-;;
-;;;;;;;;;;;;;
-
-(t 'cond1 m:upto-int/lam
-   (cond [false 4] [false 5] [true 3])
-   :: {(cond (false 4) (false 5) (true 3))}
-   -> {(cond (false 5) (true 3))}
-   -> {(cond (true 3))}
-   -> {3})
-
-(t 'cond-else m:upto-int/lam
-   (cond [false 4] [else 9])
-   :: {(cond [false 4] [else 9])}
-   -> {(cond [else 9])}
-   -> {9})
-
-(t 'cond-andelse m:upto-int/lam
-   (cond [true 3] [else (and true true)])
-   :: {(cond (true 3) (else (and true true)))} -> {3})
-
-(t 'bad-cond m:upto-int/lam
-   (cond)
-   :: error: "cond: expected a clause after cond, but nothing's there")
-
-(t 'just-else m:upto-int/lam
-   (cond [else 3])
-   :: {(cond (else 3))} -> {3})
-
-(t 'nested-cond m:upto-int/lam
-   (cond [else (cond [else 3])])
-   :: {(cond (else (cond (else 3))))}
-   -> {(cond (else 3))}
-   -> {3})
-
-;;  reconstruct can't handle 'begin'
-#;
-(m:mz "(cond [#f 3 4] [#t (+ 3 4) (+ 4 9)])"
-                  `((before-after ((hilite (cond (#f 3 4) (#t (+ 3 4) (+ 4 9)))))
-                                  ((hilite (cond (#t (+ 3 4) (+ 4 9))))))
-                    (before-after ((hilite (cond (#t (+ 3 4) (+ 4 9)))))
-                                  ((hilite (begin (+ 3 4) (+ 4 9)))))
-                    (before-after ((begin (hilite (+ 3 4)) (+ 4 9)))
-                                  ((begin (hilite 7) (+ 4 9))))
-                    (before-after ((hilite (begin 7 (+ 4 9))))
-                                  ((hilite (+ 4 9))))
-                    (before-after ((hilite (+ 4 9)))
-                                  ((hilite 13)))
-                    (finished-stepping)))
-
-(t 'nested-cond2 m:upto-int/lam
-   (cond [false 3] [else (cond [true 4])])
-   :: {(cond (false 3) (else (cond (true 4))))}
-   -> {(cond (else (cond (true 4))))}
-   -> {(cond (true 4))}
-   -> {4})
-
-(t 'top-ref m:intermediate
-   (define a4 +) a4
-   :: (define a4 +) {a4}
-   -> (define a4 +) {+})
-
-(t 'top-ref2 m:intermediate
-   (define (f123 x) (+ x 13)) f123
-   ::)
-
-(t 'top-ref3 m:intermediate-lambda
-   (define (f123 x) (+ x 13)) f123
-   :: (define (f123 x) (+ x 13)) {f123}
-   -> (define (f123 x) (+ x 13)) {(lambda (x) (+ x 13))})
-
-(let* ([defs1 `((define (a x) (+ x 5)) (define b a))]
-       [defs2 (append defs1 `((define c a)))])
-  (t 'top-ref4 m:intermediate
-     ,@defs1 (define c b) (c 3)
-     :: ,@defs1 (define c {b})
-     -> ,@defs1 (define c {a})
-     :: ,@defs2 ({c} 3)
-     -> ,@defs2 ({a} 3)
-     :: ,@defs2 {(a 3)}
-     -> ,@defs2 {(+ 3 5)}
-     -> ,@defs2 {8}))
-
-(t 'define-struct m:upto-int/lam
-   (define-struct mamba (rhythm tempo)) (mamba-rhythm (make-mamba 24 2))
-   :: (define-struct mamba (rhythm tempo)) {(mamba-rhythm (make-mamba 24 2))}
-   -> (define-struct mamba (rhythm tempo)) {24})
-
-(let ([def `(define a5 (lambda (a5) (+ a5 13)))])
-  (t 'lam-def m:upto-int
-     ,def (a5 23)
-     :: ,def {(a5 23)}
-     -> ,def {(+ 23 13)}
-     -> ,def {36}))
-
-(let ([def `(define a5 (lambda (a5) (+ a5 13)))])
-  (t 'lam-def/lam m:intermediate-lambda
-     ,def (a5 23)
-     :: ,def ({a5} 23)
-     -> ,def ({(lambda (a5) (+ a5 13))} 23)
-     :: ,def {((lambda (a5) (+ a5 13)) 23)}
-     -> ,def {(+ 23 13)}
-     -> ,def {36}))
-
-(let ([def `(define a_0 (lambda (x) (+ x 5)))])
-  (t 'lam-let m:intermediate
-     (let ([a (lambda (x) (+ x 5))]) (a 6))
-     :: {(let ([a (lambda (x) (+ x 5))]) (a 6))}
-     -> {(define a_0 (lambda (x) (+ x 5)))} {(a_0 6)}
-     :: ,def {(a_0 6)}
-     -> ,def {(+ 6 5)}
-     -> ,def {11}))
-
-(let ([defs `((define c1 false)
-              (define (d2 x) (or c1 false x)))])
-  (t 'whocares m:upto-int
-     ,@defs (d2 false)
-     :: ,@defs {(d2 false)}
-     -> ,@defs {(or c1 false false)}
-     :: ,@defs (or {c1} false false)
-     -> ,@defs (or {false} false false)
-     :: ,@defs {(or false false false)}
-     -> ,@defs {false}))
-
-(let ([defs `((define c1 false)
-              (define (d2 x) (or c1 false x)))])
-  (t 'whocares/lam m:intermediate-lambda
-     ,@defs (d2 false)
-     :: ,@defs ({d2} false)
-     -> ,@defs ({(lambda (x) (or c1 false x))} false)
-     :: ,@defs {((lambda (x) (or c1 false x)) false)}
-     -> ,@defs {(or c1 false false)}
-     :: ,@defs (or {c1} false false)
-     -> ,@defs (or {false} false false)
-     :: ,@defs {(or false false false)}
-     -> ,@defs {false}))
-
-(let ([defs `((define (f x) (+ (g x) 10)) (define (g x) (- x 22)))])
-  (t 'forward-ref m:upto-int
-     ,@defs (f 13)
-     :: ,@defs {(f 13)}
-     -> ,@defs {(+ (g 13) 10)}
-     :: ,@defs (+ {(g 13)} 10)
-     -> ,@defs (+ {(- 13 22)} 10)
-     -> ,@defs (+ {-9} 10)
-     :: ,@defs {(+ -9 10)}
-     -> ,@defs {1}))
-
-(let ([defs `((define (f x) (+ (g x) 10)) (define (g x) (- x 22)))])
-  (t 'forward-ref/lam m:intermediate-lambda
-     ,@defs (f 13)
-     :: ,@defs ({f} 13)
-     -> ,@defs ({(lambda (x) (+ (g x) 10))} 13)
-     :: ,@defs {((lambda (x) (+ (g x) 10)) 13)}
-     -> ,@defs {(+ (g 13) 10)}
-     :: ,@defs (+ ({g} 13) 10)
-     -> ,@defs (+ ({(lambda (x) (- x 22))} 13) 10)
-     :: ,@defs (+ {((lambda (x) (- x 22)) 13)} 10)
-     -> ,@defs (+ {(- 13 22)} 10)
-     -> ,@defs (+ {-9} 10)
-     :: ,@defs {(+ -9 10)}
-     -> ,@defs {1}))
-
-
-;; loops; I should add a mechanism to stop testing after n steps...
-#;(let ([defs '((define (f x) (cond (else (f x))))
-                (define (g x) x))])
-    (t 'pnkfelix m:intermediate-lambda
-       ,@defs (f (g empty))
-       :: ,@defs ({f} (g empty))
-       -> ,@defs ({(lambda (x) (cond (else (f x))))} (g empty))
-       :: ,@defs ((lambda (x) (cond (else (f x)))) ({g} empty))
-       -> ,@defs ((lambda (x) (cond (else (f x)))) ({(lambda (x) x)} empty))))
-
-(t 'bad-cons m:upto-int/lam
-   (cons 1 2)
-   :: {(cons 1 2)}
-   -> error: "cons: second argument must be a list, but received 1 and 2")
-
-
-
-(t1 'prims
-    m:beginner "(cons 3 (cons 1 empty)) (list 1 2 3) (define-struct aa (b)) (make-aa 3)"
-    (let ([defs `((cons 3 (cons 1 empty)))])
-      `((before-after (,@defs (hilite (list 1 2 3)))
-                      (,@defs (hilite (cons 1 (cons 2 (cons 3 empty)))))))))
-
-(t1 'prims/non-beginner
-    m:bwla-to-int/lam "(cons 3 (cons 1 empty)) (list 1 2 3) (define-struct aa (b)) (make-aa 3)"
-    `((before-after ((cons 3 (hilite (cons 1 empty)))) ((cons 3 (hilite (list 1)))))
-      (before-after ((hilite (cons 3 (list 1)))) ((hilite (list 3 1))))))
-
-
-(t1 'map
-    m:mz "(map (lambda (x) x) (list 3 4 5))"
-    `((before-after ((map (lambda (x) x) (hilite (list 3 4 5))))
-                    ((map (lambda (x) x) (hilite `(3 4 5)))))
-      (before-after ((hilite (map (lambda (x) x) `(3 4 5))))
-                    ((... (hilite 3) ...)))
-      (before-after (...)
-                    ((... (hilite 4) ...)))
-      (before-after (...)
-                    ((... (hilite 5) ...)))
-      (before-after (...) ((hilite `(3 4 5))))))
-
-(t1 'quoted-list
-    m:beginner-wla "'(3 4 5)"
-    `())
-
-(t1 'quoted-list-display
-    m:bwla-to-int/lam "(define (f x) '((a))) (+ 3 4)"
-    `((before-after ((define (f x) (list (list 'a))) (hilite (+ 3 4)))
-                    ((define (f x) (list (list 'a))) (hilite 7)))
-      (finished-stepping)))
-
-
-;;;;;;;;;;;;;
-;;
-;;  QUASIQUOTE
-;;
-;;;;;;;;;;;;;.
-
-; note: we currently punt on trying to unwind quasiquote.
-
-(t1 'qq1
-    m:beginner-wla "`(3 4 ,(+ 4 5))"
-    `((before-after ((cons 3 (cons 4 (cons (hilite (+ 4 5)) empty))))
-                    ((cons 3 (cons 4 (cons (hilite 9) empty)))))
-      (before-after ((cons 3 (cons 4 (hilite (cons 9 empty)))))
-                    ((cons 3 (cons 4 (hilite (list 9))))))
-      (before-after ((cons 3 (hilite (cons 4 (list 9)))))
-                    ((cons 3 (hilite (list 4 9)))))
-      (before-after ((hilite (cons 3 (list 4 9)))) ((hilite (list 3 4 9))))
-      (finished-stepping)))
-
-(t1 'qq-splice
-    m:beginner-wla "`(3 ,@(list (+ 3 4) 5) 6)"
-    `((before-after ((cons 3 (append (list (hilite (+ 3 4)) 5) (cons 6 empty)))) ((cons 3 (append (list (hilite 7) 5) (cons 6 empty)))))
-      (before-after ((cons 3 (append (list 7 5) (hilite (cons 6 empty))))) ((cons 3 (append (list 7 5) (list 6)))))
-      (before-after ((cons 3 (hilite (append (list 7 5) (list 6))))) ((cons 3 (hilite (list 7 5 6)))))
-      (before-after ((hilite (cons 3 (list 7 5 6)))) ((hilite (list 3 7 5 6))))
-      (finished-stepping)))
-
-;;;;;;;;;;;;;
-;;
-;;  LET
-;;
-;;;;;;;;;;;;;
-
-(t1 'let1 m:both-intermediates "(let ([a 3]) 4)"
-    `((before-after ((hilite (let ([a 3]) 4))) ((hilite (define a_0 3)) (hilite 4)))
-      (finished-stepping)))
-
-(t1 'let2
-    m:both-intermediates "(let ([a (+ 4 5)] [b (+ 9 20)]) (+ a b))"
-    `((before-after ((hilite (let ([a (+ 4 5)] [b (+ 9 20)]) (+ a b))))
-                    ((hilite (define a_0 (+ 4 5))) (hilite (define b_0 (+ 9 20))) (hilite (+ a_0 b_0))))
-      (before-after ((define a_0 (hilite (+ 4 5))) (define b_0 (+ 9 20)) (+ a_0 b_0))
-                    ((define a_0 (hilite 9)) (define b_0 (+ 9 20)) (+ a_0 b_0)))
-      (before-after ((define a_0 9) (define b_0 (hilite (+ 9 20))) (+ a_0 b_0))
-                    ((define a_0 9) (define b_0 (hilite 29)) (+ a_0 b_0)))
-      (before-after ((define a_0 9) (define b_0 29) (+ (hilite a_0) b_0))
-                    ((define a_0 9) (define b_0 29) (+ (hilite 9) b_0)))
-      (before-after ((define a_0 9) (define b_0 29) (+ 9 (hilite b_0)))
-                    ((define a_0 9) (define b_0 29) (+ 9 (hilite 29))))
-      (before-after ((define a_0 9) (define b_0 29) (hilite (+ 9 29)))
-                    ((define a_0 9) (define b_0 29) (hilite 38)))
-      (finished-stepping)))
-
-(t1 'let-scoping1
-    m:intermediate "(let ([a 3]) (let ([a (lambda (x) (+ a x))]) (a 4)))"
-    (let ([d1 `(define a_0 3)]
-          [d2 `(define a_1 (lambda (x) (+ a_0 x)))])
-      `((before-after ((hilite (let ([a 3]) (let ([a (lambda (x) (+ a x))]) (a 4)))))
-                      ((hilite (define a_0 3)) (hilite (let ([a (lambda (x) (+ a_0 x))]) (a 4)))))
-        (before-after (,d1 (hilite (let ([a (lambda (x) (+ a_0 x))]) (a 4))))
-                      (,d1 (hilite (define a_1 (lambda (x) (+ a_0 x)))) (hilite (a_1 4))))
-        (before-after (,d1 ,d2 (hilite (a_1 4)))
-                      (,d1 ,d2 (hilite (+ a_0 4))))
-        (before-after (,d1 ,d2 (+ (hilite a_0) 4))
-                      (,d1 ,d2 (+ (hilite 3) 4)))
-        (before-after (,d1 ,d2 (hilite (+ 3 4)))
-                      (,d1 ,d2 (hilite 7)))
-        (finished-stepping))))
-
-
-(t1 'let-scoping2
-    m:intermediate-lambda "(let ([a 3]) (let ([a (lambda (x) (+ a x))]) (a 4)))"
-    (let* ([d1 `(define a_0 3)]
-           [defs `(,d1 (define a_1 (lambda (x) (+ a_0 x))))])
-      `((before-after ((hilite (let ([a 3]) (let ([a (lambda (x) (+ a x))]) (a 4)))))
-                      ((hilite (define a_0 3)) (hilite (let ([a (lambda (x) (+ a_0 x))]) (a 4)))))
-        (before-after (,d1 (hilite (let ([a (lambda (x) (+ a_0 x))]) (a 4))))
-                      (,d1 (hilite (define a_1 (lambda (x) (+ a_0 x)))) (hilite (a_1 4))))
-        (before-after (,@defs ((hilite a_1) 4))
-                      (,@defs ((hilite (lambda (x) (+ a_0 x))) 4)))
-        (before-after (,@defs (hilite ((lambda (x) (+ a_0 x)) 4))) (,@defs (hilite (+ a_0 4))))
-        (before-after (,@defs (+ (hilite a_0) 4)) (,@defs (+ (hilite 3) 4)))
-        (before-after (,@defs (hilite (+ 3 4))) (,@defs (hilite 7)))
-        (finished-stepping))))
-
-(t1 'let-scoping3
-    m:intermediate "(define a12 3) (define c12 19) (let ([a12 13] [b12 a12]) (+ b12 a12 c12))"
-    (let* ([defs1 `((define a12 3) (define c12 19))]
-           [defs2 `(,@defs1 (define a12_0 13))]
-           [defs3 `(,@defs2 (define b12_0 3))])
-      `((before-after (,@defs1 (hilite (let ([a12 13] [b12 a12]) (+ b12 a12 c12))))
-                      (,@defs1 (hilite (define a12_0 13)) (hilite (define b12_0 a12)) (hilite (+ b12_0 a12_0 c12))))
-        (before-after (,@defs2 (define b12_0 (hilite a12)) (+ b12_0 a12_0 c12))
-                      (,@defs2 (define b12_0 (hilite 3)) (+ b12_0 a12_0 c12)))
-        (before-after (,@defs3 (+ (hilite b12_0) a12_0 c12))
-                      (,@defs3 (+ (hilite 3) a12_0 c12)))
-        (before-after (,@defs3 (+ 3 (hilite a12_0) c12))
-                      (,@defs3 (+ 3 (hilite 13) c12)))
-        (before-after (,@defs3 (+ 3 13 (hilite c12)))
-                      (,@defs3 (+ 3 13 (hilite 19))))
-        (before-after (,@defs3 (hilite (+ 3 13 19)))
-                      (,@defs3 (hilite 35)))
-        (finished-stepping))))
-
-(t1 'let-lifting1
-    m:intermediate "(let ([a (lambda (x) (+ x 14))] [b (+ 3 4)]) 9)"
-    `((before-after ((hilite (let ([a (lambda (x) (+ x 14))] [b (+ 3 4)]) 9)))
-                    ((hilite (define a_0 (lambda (x) (+ x 14)))) (hilite (define b_0 (+ 3 4))) (hilite 9)))
-      (before-after ((define a_0 (lambda (x) (+ x 14))) (define b_0 (hilite (+ 3 4))) 9)
-                    ((define a_0 (lambda (x) (+ x 14))) (define b_0 (hilite 7)) 9))
-      (finished-stepping)))
-
-(t1 'let-deriv
-    m:intermediate "(define (f g) (let ([gp (lambda (x) (/ (- (g (+ x 0.1)) (g x)) 0.001))]) gp)) (define gprime (f cos))"
-    (let ([defs `((define (f g) 
-                    (let ([gp (lambda (x) (/ (- (g (+ x 0.1)) (g x)) 0.001))])
-                      gp)))])
-      `((before-after (,@defs (define gprime
-                                (hilite (f cos))))
-                      (,@defs (define gprime 
-                                (hilite (let ([gp (lambda (x) 
-                                                    (/ (- (cos (+ x 0.1)) (cos x))
-                                                       0.001))]) 
-                                          gp)))))
-        (before-after (,@defs (define gprime (hilite (let ([gp (lambda (x) (/ (- (cos (+ x 0.1)) (cos x)) 0.001))]) gp))))
-                      (,@defs (hilite (define gp_0 (lambda (x) (/ (- (cos (+ x 0.1)) (cos x)) 0.001)))) (define gprime (hilite gp_0))))
-        (finished-stepping))))
-
-(t1 'let-assigned
-    m:intermediate "(define a (let ([f (lambda (x) (+ x 13))]) f))"
-    `((before-after ((define a (hilite (let ([f (lambda (x) (+ x 13))]) f))))
-                    ((hilite (define f_0 (lambda (x) (+ x 13)))) (define a (hilite f_0))))
-      (finished-stepping)))
-
-(t1 'let-assigned/lam
-    m:intermediate-lambda "(define a (let ([f (lambda (x) (+ x 13))]) f))"
-    `((before-after ((define a (hilite (let ([f (lambda (x) (+ x 13))]) f))))
-                    ((hilite (define f_0 (lambda (x) (+ x 13)))) (define a (hilite f_0))))
-      (before-after ((define f_0 (lambda (x) (+ x 13))) (define a (hilite f_0)))
-                    ((define f_0 (lambda (x) (+ x 13))) (define a (hilite (lambda (x) (+ x 13))))))
-      (finished-stepping)))
-
-
-
-;;;;;;;;;;;;;
-;;
-;;  LET*
-;;
-;;;;;;;;;;;;;
-
-(t1 'let*-scoping1
-    m:both-intermediates "(define a 3) (define c 19) (let* ([a 13] [b a]) (+ b a c))"
-    (let* ([defs1 `((define a 3) (define c 19))]
-           [defs2 (append defs1 `((define a_0 13)))]
-           [defs3 (append defs2 `((define b_1 13)))])
-      `((before-after (,@defs1 (hilite (let* ([a 13] [b a]) (+ b a c))))
-                      (,@defs1 (hilite (define a_0 13)) (hilite (let* ([b a_0]) (+ b a_0 c)))))
-        (before-after (,@defs2 (hilite (let* ([b a_0]) (+ b a_0 c))))
-                      (,@defs2 (hilite (define b_1 a_0)) (hilite (+ b_1 a_0 c))))
-        (before-after (,@defs2 (define b_1 (hilite a_0)) (+ b_1 a_0 c))
-                      (,@defs2 (define b_1 (hilite 13)) (+ b_1 a_0 c)))
-        (before-after (,@defs3 (+ (hilite b_1) a_0 c))
-                      (,@defs3 (+ (hilite 13) a_0 c)))
-        (before-after (,@defs3 (+ 13 (hilite a_0) c))
-                      (,@defs3 (+ 13 (hilite 13) c)))
-        (before-after (,@defs3 (+ 13 13 (hilite c)))
-                      (,@defs3 (+ 13 13 (hilite 19))))
-        (before-after (,@defs3 (hilite (+ 13 13 19)))
-                      (,@defs3 (hilite 45)))
-        (finished-stepping))))
-
-(t1 'let*-lifting1
-    m:intermediate "(let* ([a (lambda (x) (+ x 14))] [b (+ 3 4)]) 9)"
-    (let ([defs `((define a_0 (lambda (x) (+ x 14))))])
-      `((before-after ((hilite (let* ([a (lambda (x) (+ x 14))] [b (+ 3 4)]) 9)))
-                      ((hilite (define a_0 (lambda (x) (+ x 14)))) (hilite (let* ([b (+ 3 4)]) 9))))
-        (before-after (,@defs (hilite (let* ([b (+ 3 4)]) 9)))
-                      (,@defs (hilite (define b_1 (+ 3 4))) (hilite 9)))
-        (before-after (,@defs (define b_1 (hilite (+ 3 4))) 9)
-                      (,@defs (define b_1 (hilite 7)) 9))
-        (finished-stepping))))
-
-(t1 'let*-deriv
-    m:intermediate "(define (f g) (let* ([gp (lambda (x) (/ (- (g (+ x 0.1)) (g x)) 0.001))]) gp)) (define gprime (f cos))"
-    (let ([defs `((define (f g) (let* ([gp (lambda (x) (/ (- (g (+ x 0.1)) (g x)) 0.001))]) gp)))])
-      `((before-after (,@defs (define gprime (hilite (f cos))))
-                      (,@defs (define gprime (hilite (let* ([gp (lambda (x) (/ (- (cos (+ x 0.1)) (cos x)) 0.001))]) gp)))))
-        (before-after (,@defs (define gprime (hilite (let* ([gp (lambda (x) (/ (- (cos (+ x 0.1)) (cos x)) 0.001))]) gp))))
-                      (,@defs (hilite (define gp_0 (lambda (x) (/ (- (cos (+ x 0.1)) (cos x)) 0.001)))) (define gprime (hilite gp_0))))
-        (finished-stepping))))
-
-(t1 'let/let*
-    m:both-intermediates "(let* ([a 9]) (let ([b 6]) a))"
-    `((before-after ((hilite (let* ([a 9]) (let ([b 6]) a)))) ((hilite (define a_0 9)) (hilite (let ([b 6]) a_0))))
-      (before-after ((define a_0 9) (hilite (let ([b 6]) a_0)))
-                    ((define a_0 9) (hilite (define b_1 6)) (hilite a_0)))
-      (before-after ((define a_0 9) (define b_1 6) (hilite a_0))
-                    ((define a_0 9) (define b_1 6) (hilite 9)))
-      (finished-stepping)))
-
-(let ([def '(define (f x) (let* ([a 13] [b 14]) (let* ([c 15] [d 16]) (+ a b c d))))])
-  (t1 'nested-let-unwinding
-      m:both-intermediates 
-      "(define (f x) (let* ([a 13] [b 14]) (let* ([c 15] [d 16]) (+ a b c d)))) (+ 3 4)"
-      `((before-after (,def (hilite (+ 3 4)))
-                      (,def (hilite 7)))
-        (finished-stepping))))
-
-;;;;;;;;;;;;;
-;;
-;;  LETREC
-;;
-;;;;;;;;;;;;;
-
-(t1 'temp-letrec
-    m:intermediate "(letrec ([a 13]) 9)"
-    (let* ([defs2 `((define a_0 13))])
-      `((before-after ((hilite (letrec ([a 13]) 9)))
-                      ((hilite (define a_0 13)) (hilite 9)))
-        (finished-stepping))))
-
-(t1 'letrec1
-    m:intermediate "(define a 3) (define c 19) (letrec ([a 13] [b a]) (+ b a c))"
-    (let* ([defs1 `((define a 3) (define c 19))]
-           [defs2 (append defs1 `((define a_0 13)))]
-           [defs3 (append defs2 `((define b_0 13)))])
-      `((before-after (,@defs1 (hilite (letrec ([a 13] [b a]) (+ b a c))))
-                      (,@defs1 (hilite (define a_0 13)) (hilite (define b_0 a_0)) (hilite (+ b_0 a_0 c))))
-        (before-after (,@defs2 (define b_0 (hilite a_0)) (+ b_0 a_0 c))
-                      (,@defs2 (define b_0 (hilite 13)) (+ b_0 a_0 c)))
-        (before-after (,@defs3 (+ (hilite b_0) a_0 c))
-                      (,@defs3 (+ (hilite 13) a_0 c)))
-        (before-after (,@defs3 (+ 13 (hilite a_0) c))
-                      (,@defs3 (+ 13 (hilite 13) c)))
-        (before-after (,@defs3 (+ 13 13 (hilite c)))
-                      (,@defs3 (+ 13 13 (hilite 19))))
-        (before-after (,@defs3 (hilite (+ 13 13 19)))
-                      (,@defs3 (hilite 45)))
-        (finished-stepping))))
-
-  (t1 'letrec2
-      m:intermediate "(letrec ([a (lambda (x) (+ x 14))] [b (+ 3 4)]) 9)"
-      `((before-after ((hilite (letrec ([a (lambda (x) (+ x 14))] [b (+ 3 4)]) 9)))
-                      ((hilite (define a_0 (lambda (x) (+ x 14)))) (hilite (define b_0 (+ 3 4))) (hilite 9)))
-        (before-after ((define a_0 (lambda (x) (+ x 14))) (define b_0 (hilite (+ 3 4))) 9)
-                      ((define a_0 (lambda (x) (+ x 14))) (define b_0 (hilite 7)) 9))
-        (finished-stepping)))
-
-  (t1 'letrec3
-      m:intermediate "(define (f g) (letrec ([gp (lambda (x) (/ (- (g (+ x 0.1)) (g x)) 0.001))]) gp)) (define gprime (f cos))"
-      (let ([defs `((define (f g) (letrec ([gp (lambda (x) (/ (- (g (+ x 0.1)) (g x)) 0.001))]) gp)))])
-        `((before-after (,@defs (define gprime (hilite (f cos))))
-                        (,@defs (define gprime (hilite (letrec ([gp (lambda (x) (/ (- (cos (+ x 0.1)) (cos x)) 0.001))]) gp)))))
-          (before-after (,@defs (define gprime (hilite (letrec ([gp (lambda (x) (/ (- (cos (+ x 0.1)) (cos x)) 0.001))]) gp))))
-                        (,@defs (hilite (define gp_0 (lambda (x) (/ (- (cos (+ x 0.1)) (cos x)) 0.001)))) (define gprime (hilite gp_0))))
-          (finished-stepping))))
-  
-      ;;;;;;;;;;;;;
-      ;;
-      ;;  RECUR
-      ;;
-      ;;;;;;;;;;;;;
-
-  ;; N.B. : we cheat here.  In particular, the rhs of the double-break expression should highlight the whole application, and not
-  ;; just the applied loop identifier.  This is hard to fix because we have an application which is initially hidden, but then later
-  ;; not hidden.  Fixing this involves parameterizing the unwind by what kind of break it was.  Yuck!  So we just fudge the test case.
-
-  (t1 'recur
-      m:advanced "(define (countdown n) (recur loop ([n n]) (if (= n 0) 13 (loop (- n 1))))) (countdown 2)"
-      (let* ([defs1 `((define (countdown n) (recur loop ([n n]) (if (= n 0) 13 (loop (- n 1))))))]
-             [defs2 (append defs1 `((define (loop_0 n) (if (= n 0) 13 (loop_0 (- n 1))))))])
-        `((before-after (,@defs1 ((hilite countdown) 2))
-                        (,@defs1 ((hilite (lambda (n) (recur loop ([n n]) (if (= n 0) 13 (loop (- n 1)))))) 2)))
-          (before-after (,@defs1 (hilite ((lambda (n) (recur loop ([n n]) (if (= n 0) 13 (loop (- n 1))))) 2)))
-                        (,@defs1 (hilite (recur loop ([n 2]) (if (= n 0) 13 (loop (- n 1)))))))
-          (before-after (,@defs1 (hilite (recur loop ([n 2]) (if (= n 0) 13 (loop (- n 1))))))
-                        (,@defs1 (hilite (define (loop_0 n) (if (= n 0) 13 (loop_0 (- n 1))))) ((hilite loop_0) 2)))
-          (before-after (,@defs2 ((hilite loop_0) 2))
-                        (,@defs2 ((hilite (lambda (n) (if (= n 0) 13 (loop_0 (- n 1))))) 2)))
-          (before-after (,@defs2 (hilite ((lambda (n) (if (= n 0) 13 (loop_0 (- n 1)))) 2)))
-                        (,@defs2 (hilite (if (= 2 0) 13 (loop_0 (- 2 1))))))
-          (before-after (,@defs2 (if (hilite (= 2 0)) 13 (loop_0 (- 2 1))))
-                        (,@defs2 (if (hilite false) 13 (loop_0 (- 2 1)))))
-          (before-after (,@defs2 (hilite (if false 13 (loop_0 (- 2 1)))))
-                        (,@defs2 (hilite (loop_0 (- 2 1)))))
-          (before-after (,@defs2 ((hilite loop_0) (- 2 1)))
-                        (,@defs2 ((hilite (lambda (n) (if (= n 0) 13 (loop_0 (- n 1))))) (- 2 1))))
-          (before-after (,@defs2 ((lambda (n) (if (= n 0) 13 (loop_0 (- n 1)))) (hilite (- 2 1))))
-                        (,@defs2 ((lambda (n) (if (= n 0) 13 (loop_0 (- n 1)))) (hilite 1))))
-          (before-after (,@defs2 (hilite ((lambda (n) (if (= n 0) 13 (loop_0 (- n 1)))) 1)))
-                        (,@defs2 (hilite (if (= 1 0) 13 (loop_0 (- 1 1))))))
-          (before-after (,@defs2 (if (hilite (= 1 0)) 13 (loop_0 (- 1 1))))
-                        (,@defs2 (if (hilite false) 13 (loop_0 (- 1 1)))))
-          (before-after (,@defs2 (hilite (if false 13 (loop_0 (- 1 1)))))
-                        (,@defs2 (hilite (loop_0 (- 1 1)))))
-          (before-after (,@defs2 ((hilite loop_0) (- 1 1)))
-                        (,@defs2 ((hilite (lambda (n) (if (= n 0) 13 (loop_0 (- n 1))))) (- 1 1))))
-          (before-after (,@defs2 ((lambda (n) (if (= n 0) 13 (loop_0 (- n 1)))) (hilite (- 1 1))))
-                        (,@defs2 ((lambda (n) (if (= n 0) 13 (loop_0 (- n 1)))) (hilite 0))))
-          (before-after (,@defs2 (hilite ((lambda (n) (if (= n 0) 13 (loop_0 (- n 1)))) 0)))
-                        (,@defs2 (hilite (if (= 0 0) 13 (loop_0 (- 0 1))))))
-          (before-after (,@defs2 (if (hilite (= 0 0)) 13 (loop_0 (- 0 1))))
-                        (,@defs2 (if (hilite true) 13 (loop_0 (- 0 1)))))
-          (before-after (,@defs2 (hilite (if true 13 (loop_0 (- 0 1)))))
-                        (,@defs2 (hilite 13)))
-          (finished-stepping))))
-
-    ;;;;;;;;;;;;;
-    ;;
-    ;;  LOCAL
-    ;;
-    ;;;;;;;;;;;;;
-
-
-  (t1 'empty-local
-      m:both-intermediates "(local () (+ 3 4))"
-      `((before-after ((hilite (local () (+ 3 4)))) ((hilite (+ 3 4))))
-        (before-after ((hilite (+ 3 4))) ((hilite 7)))
-        (finished-stepping)))
-
-  (t1 'local1
-      m:both-intermediates "(local ((define a 3) (define b 8)) 4)"
-      `((before-after ((hilite (local ((define a 3) (define b 8)) 4)))
-                      ((hilite (define a_0 3)) (hilite (define b_0 8)) (hilite 4)))
-        (finished-stepping)))
-
-  (t1 'local2
-      m:intermediate "(local ((define (a x) (+ x 9))) (a 6))"
-      (let ([defs `((define (a_0 x) (+ x 9)))])
-        `((before-after ((hilite (local ((define (a x) (+ x 9))) (a 6))))
-                        ((hilite (define (a_0 x) (+ x 9))) (hilite (a_0 6))))
-          (before-after (,@defs (hilite (a_0 6)))
-                        (,@defs (hilite (+ 6 9))))
-          (before-after (,@defs (hilite (+ 6 9)))
-                        (,@defs (hilite 15)))
-          (finished-stepping))))
-
-  (t1 'local3
-      m:intermediate-lambda "(local ((define (a x) (+ x 9))) (a 6))"
-      (let ([defs `((define (a_0 x) (+ x 9)))])
-        `((before-after ((hilite (local ((define (a x) (+ x 9))) (a 6))))
-                        ((hilite (define (a_0 x) (+ x 9))) (hilite (a_0 6))))
-          (before-after (,@defs ((hilite a_0) 6))
-                        (,@defs ((hilite (lambda (x) (+ x 9))) 6)))
-          (before-after (,@defs (hilite ((lambda (x) (+ x 9)) 6)))
-                        (,@defs (hilite (+ 6 9))))
-          (before-after (,@defs (hilite (+ 6 9)))
-                        (,@defs (hilite 15)))
-          (finished-stepping))))
-
-  (t1 'local4
-      m:intermediate "(local ((define (a x) (+ x 13))) a)"
-      `((before-after ((hilite (local ((define (a x) (+ x 13))) a))) ((hilite (define (a_0 x) (+ x 13))) (hilite a_0)))
-        (finished-stepping)))
-
-  (t1 'local5
-      m:intermediate-lambda "(local ((define (a x) (+ x 13))) a)"
-      `((before-after ((hilite (local ((define (a x) (+ x 13))) a)))
-                      ((hilite (define (a_0 x) (+ x 13))) (hilite a_0)))
-        (before-after ((define (a_0 x) (+ x 13)) (hilite a_0))
-                      ((define (a_0 x) (+ x 13)) (hilite (lambda (x) (+ x 13)))))
-        (finished-stepping)))
-  
-
-
-  (t1 'local-interref1
-      m:intermediate "(local ((define (a x) (+ x 9)) (define b a) (define p (+ 3 4))) (b 1))"
-      (let* ([defs1 `((define (a_0 x) (+ x 9)) (define b_0 a_0))]
-             [defs2 (append defs1 `((define p_0 7)))])
-        `((before-after ((hilite (local ((define (a x) (+ x 9)) (define b a) (define p (+ 3 4))) (b 1))))
-                        ((hilite (define (a_0 x) (+ x 9))) (hilite (define b_0 a_0)) (hilite (define p_0 (+ 3 4))) (hilite (b_0 1))))
-          (before-after (,@defs1 (define p_0 (hilite (+ 3 4))) (b_0 1))
-                        (,@defs1 (define p_0 (hilite 7)) (b_0 1)))
-          (before-after (,@defs2 ((hilite b_0) 1))
-                        (,@defs2 ((hilite a_0) 1)))
-          (before-after (,@defs2 (hilite (a_0 1)))
-                        (,@defs2 (hilite (+ 1 9))))
-          (before-after (,@defs2 (hilite (+ 1 9)))
-                        (,@defs2 (hilite 10)))
-          (finished-stepping))))
-
-  (t1 'local-interref2
-      m:intermediate-lambda "(local ((define (a x) (+ x 9)) (define b a) (define p (+ 3 4))) (b 1))"
-      (let* ([defs1 `((define (a_0 x) (+ x 9)))]
-             [defs2 (append defs1 `((define b_0 (lambda (x) (+ x 9)))))]
-             [defs3 (append defs2 `((define p_0 7)))])
-        `((before-after ((hilite (local ((define (a x) (+ x 9)) (define b a) (define p (+ 3 4))) (b 1))))
-                        ((hilite (define (a_0 x) (+ x 9))) (hilite (define b_0 a_0)) (hilite (define p_0 (+ 3 4))) (hilite (b_0 1))))
-          (before-after (,@defs1 (define b_0 (hilite a_0)) (define p_0 (+ 3 4)) (b_0 1))
-                        (,@defs1 (define b_0 (hilite (lambda (x) (+ x 9)))) (define p_0 (+ 3 4)) (b_0 1)))
-          (before-after (,@defs2 (define p_0 (hilite (+ 3 4))) (b_0 1))
-                        (,@defs2 (define p_0 (hilite 7)) (b_0 1)))
-          (before-after (,@defs3 ((hilite b_0) 1))
-                        (,@defs3 ((hilite (lambda (x) (+ x 9))) 1)))
-          (before-after (,@defs3 (hilite ((lambda (x) (+ x 9)) 1)))
-                        (,@defs3 (hilite (+ 1 9))))
-          (before-after (,@defs3 (hilite (+ 1 9)))
-                        (,@defs3 (hilite 10)))
-          (finished-stepping))))
-
-  (t1 'local-gprime
-      m:intermediate "(define (f12 g) (local ([define (gp x) (/ (- (g (+ x 0.1)) (g x)) 0.1)]) gp)) (define gprime (f12 cos))"
-      (let ([defs `((define (f12 g) (local ([define (gp x) (/ (- (g (+ x 0.1)) (g x)) 0.1)]) gp)))])
-        `((before-after (,@defs (define gprime (hilite (f12 cos))))
-                        (,@defs (define gprime (hilite (local ([define (gp x) (/ (- (cos (+ x 0.1)) (cos x)) 0.1)]) gp)))))
-          (before-after (,@defs (define gprime (hilite (local ([define (gp x) (/ (- (cos (+ x 0.1)) (cos x)) 0.1)]) gp))))
-                        (,@defs (hilite (define (gp_0 x) (/ (- (cos (+ x 0.1)) (cos x)) 0.1))) (define gprime (hilite gp_0))))
-          (finished-stepping))))
-
-  (t1 'local-gprime/lambda
-      m:intermediate-lambda "(define (f12 g) (local ([define (gp x) (/ (- (g (+ x 0.1)) (g x)) 0.1)]) gp)) (define gprime (f12 cos))"
-      (let ([defs `((define (f12 g) (local ([define (gp x) (/ (- (g (+ x 0.1)) (g x)) 0.1)]) gp)))])
-        `((before-after (,@defs (define gprime ((hilite f12) cos)))
-                        (,@defs (define gprime ((hilite (lambda (g) (local ([define (gp x) (/ (- (g (+ x 0.1)) (g x)) 0.1)]) gp))) cos))))
-          (before-after (,@defs (define gprime (hilite ((lambda (g) (local ([define (gp x) (/ (- (g (+ x 0.1)) (g x)) 0.1)]) gp)) cos))))
-                        (,@defs (define gprime (hilite (local ([define (gp x) (/ (- (cos (+ x 0.1)) (cos x)) 0.1)]) gp)))))
-          (before-after (,@defs (define gprime (hilite (local ([define (gp x) (/ (- (cos (+ x 0.1)) (cos x)) 0.1)]) gp))))
-                        (,@defs (hilite (define (gp_0 x) (/ (- (cos (+ x 0.1)) (cos x)) 0.1))) (define gprime (hilite gp_0))))
-          (before-after (,@defs (define (gp_0 x) (/ (- (cos (+ x 0.1)) (cos x)) 0.1)) (define gprime (hilite gp_0)))
-                        (,@defs
-                         (define (gp_0 x) (/ (- (cos (+ x 0.1)) (cos x)) 0.1))
-                         (define gprime (hilite (lambda (x) (/ (- (cos (+ x 0.1)) (cos x)) 0.1))))))
-          (finished-stepping))))
-
-  ; test generativity... that is, multiple evaluations of a local should get different lifted names:
-
-  (t1 'local-generative
-      m:intermediate "(define (a13 b13 c13) (b13 c13)) (define (f9 x) (local ((define (maker dc) x)) maker)) (define m1 (f9 3)) (a13 (f9 4) 1)"
-      (let* ([defs1 `((define (a13 b13 c13) (b13 c13))
-                      (define (f9 x) (local ((define (maker dc) x)) maker)))]
-             [defs2 (append defs1 `((define (maker_0 dc) 3) (define m1 maker_0)))]
-             [defs3 (append defs2 `((define (maker_1 dc) 4)))])
-        `((before-after (,@defs1 (define m1 (hilite (f9 3))))
-                        (,@defs1 (define m1 (hilite (local ((define (maker dc) 3)) maker)))))
-          (before-after (,@defs1 (define m1 (hilite (local ((define (maker dc) 3)) maker))))
-                        (,@defs1 (hilite (define (maker_0 dc) 3)) (define m1 (hilite maker_0))))
-          (before-after (,@defs2 (a13 (hilite (f9 4)) 1))
-                        (,@defs2 (a13 (hilite (local ((define (maker dc) 4)) maker)) 1)))
-          (before-after (,@defs2 (a13 (hilite (local ((define (maker dc) 4)) maker)) 1))
-                        (,@defs2 (hilite (define (maker_1 dc) 4)) (a13 (hilite maker_1) 1)))
-          (before-after (,@defs3 (hilite (a13 maker_1 1)))
-                        (,@defs3 (hilite (maker_1 1))))
-          (before-after (,@defs3 (hilite (maker_1 1)))
-                        (,@defs3 (hilite 4)))
-          (finished-stepping))))
-
-  (t1 'local-generative/lambda
-      m:intermediate-lambda "(define (a13 b13 c13) (b13 c13)) (define (f9 x) (local ((define (maker dc) x)) maker)) (define m1 (f9 3)) (a13 (f9 4) 1)"
-      (let* ([defs1 `((define (a13 b13 c13) (b13 c13))
-                      (define (f9 x) (local ((define (maker dc) x)) maker)))]
-             [defs2 (append defs1 `((define (maker_0 dc) 3)))]
-             [defs3 (append defs2 `((define m1 (lambda (dc) 3))))]
-             [defs4 (append defs3 `((define (maker_1 dc) 4)))])
-        `((before-after (,@defs1 (define m1 ((hilite f9) 3)))
-                        (,@defs1 (define m1 ((hilite (lambda (x) (local ((define (maker dc) x)) maker))) 3))))
-          (before-after (,@defs1 (define m1 (hilite ((lambda (x) (local ((define (maker dc) x)) maker)) 3))))
-                        (,@defs1 (define m1 (hilite (local ((define (maker dc) 3)) maker)))))
-          (before-after (,@defs1 (define m1 (hilite (local ((define (maker dc) 3)) maker))))
-                        (,@defs1 (hilite (define (maker_0 dc) 3)) (define m1 (hilite maker_0))))
-          (before-after (,@defs2 (define m1 (hilite maker_0)))
-                        (,@defs2 (define m1 (hilite (lambda (dc) 3)))))
-          (before-after (,@defs3 ((hilite a13) (f9 4) 1))
-                        (,@defs3 ((hilite (lambda (b13 c13) (b13 c13))) (f9 4) 1)))
-          (before-after (,@defs3 ((lambda (b13 c13) (b13 c13)) ((hilite f9) 4) 1))
-                        (,@defs3 ((lambda (b13 c13) (b13 c13)) ((hilite (lambda (x) (local ((define (maker dc) x)) maker))) 4) 1)))
-          (before-after (,@defs3 ((lambda (b13 c13) (b13 c13)) (hilite ((lambda (x) (local ((define (maker dc) x)) maker)) 4)) 1))
-                        (,@defs3 ((lambda (b13 c13) (b13 c13)) (hilite (local ((define (maker dc) 4)) maker)) 1)))
-          (before-after (,@defs3 ((lambda (b13 c13) (b13 c13)) (hilite (local ((define (maker dc) 4)) maker)) 1))
-                        (,@defs3 (hilite (define (maker_1 dc) 4)) ((lambda (b13 c13) (b13 c13)) (hilite maker_1) 1)))
-          (before-after (,@defs4 ((lambda (b13 c13) (b13 c13)) (hilite maker_1) 1))
-                        (,@defs4 ((lambda (b13 c13) (b13 c13)) (hilite (lambda (dc) 4)) 1)))
-          (before-after (,@defs4 (hilite ((lambda (b13 c13) (b13 c13)) (lambda (dc) 4) 1)))
-                        (,@defs4 (hilite ((lambda (dc) 4) 1))))
-          (before-after (,@defs4 (hilite ((lambda (dc) 4) 1)))
-                        (,@defs4 (hilite 4)))
-          (finished-stepping))))
-
-  ;;;;;;;;;;;;;
-  ;;
-  ;;  Reduction of Lambda in int/lambda
-  ;;
-  ;;;;;;;;;;;;;
-
-  (t1 'int/lam1
-      m:intermediate-lambda "(define f ((lambda (x) x) (lambda (x) x))) (f f)"
-      (let ([defs `((define f (lambda (x) x)))])
-        `((before-after ((define f (hilite ((lambda (x) x) (lambda (x) x)))))
-                        ((define f (hilite (lambda (x) x)))))
-          (before-after (,@defs ((hilite f) f))
-                        (,@defs ((hilite (lambda (x) x)) f)))
-          (before-after (,@defs ((lambda (x) x) (hilite f)))
-                        (,@defs ((lambda (x) x) (hilite (lambda (x) x)))))
-          (before-after (,@defs (hilite ((lambda (x) x) (lambda (x) x))))
-                        (,@defs (hilite (lambda (x) x))))
-          (finished-stepping))))
-
-
-  (t1 'int/lam2
-      m:intermediate-lambda "(define f (if false (lambda (x) x) (lambda (x) x))) (f f)"
-      (let ([defs `((define f (lambda (x) x)))])
-        `((before-after ((define f (hilite (if false (lambda (x) x) (lambda (x) x)))))
-                        ((define f (hilite (lambda (x) x)))))
-          (before-after (,@defs ((hilite f) f))
-                        (,@defs ((hilite (lambda (x) x)) f)))
-          (before-after (,@defs ((lambda (x) x) (hilite f)))
-                        (,@defs ((lambda (x) x) (hilite (lambda (x) x)))))
-          (before-after (,@defs (hilite ((lambda (x) x) (lambda (x) x))))
-                        (,@defs (hilite (lambda (x) x))))
-          (finished-stepping))))
-
-  ;
-  ;  ;;;;;;;;;;;;;
-  ;  ;;
-  ;  ;;  TIME
-  ;  ;;
-  ;  ;;;;;;;;;;;;;
-  ;
-
-  (t1 'time
-      m:intermediate "(time (+ 3 4))"
-      `((before-after ((hilite (+ 3 4)))
-                      ((hilite 7)))
-        (finished-stepping)))
-
-
-  ;;;;;;;;;;;;;;;;
-  ;;
-  ;;  XML (uses GRacket)
-  ;;
-  ;;;;;;;;;;;;;;;;
-
-  ;; NOT UPDATED FOR NEW TEST CASE FORMAT
-
-  #;
-  (t1 'ddj-screenshot
-     (m:mz (define-syntax (xml stx)
-                                (letrec ([process-xexpr
-                                          (lambda (xexpr)
-                                            (syntax-case xexpr (lmx lmx-splice)
-                                              [(lmx-splice unquoted) #`(unquote-splicing unquoted)]
-                                              [(lmx unquoted) #`(unquote unquoted)]
-                                              [(tag ([attr val] ...) . sub-xexprs)
-                                               (identifier? #`tag)
-                                               #`(tag ([attr val] ...) #,@(map process-xexpr (syntax->list #`sub-xexprs)))]
-                                              [(tag . sub-xexprs)
-                                               (identifier? #`tag)
-                                               #`(tag () #,@(map process-xexpr (syntax->list #`sub-xexprs)))]
-                                              [str
-                                               (string? (syntax-e #`str))
-                                               xexpr]))])
-                                  (syntax-case stx ()
-                                    [(_ xexpr) #`(quasiquote #,(process-xexpr #`xexpr))])))
-     (xml (article (header (author "John Clements")
-                           (title (if (< 3 4)
-                                      (xml "No Title Available")
-                                      (get-title))))
-                   (text "More Sample Text")))
-     '((before-after-finished ((define-syntax (xml stx)
-                                 (letrec ([process-xexpr
-                                           (lambda (xexpr)
-                                             (syntax-case xexpr (lmx lmx-splice)
-                                               [(lmx-splice unquoted) #`(unquote-splicing unquoted)]
-                                               [(lmx unquoted) #`(unquote unquoted)]
-                                               [(tag ([attr val] ...) . sub-xexprs)
-                                                (identifier? #`tag)
-                                                #`(tag ([attr val] ...) #,@(map process-xexpr (syntax->list #`sub-xexprs)))]
-                                               [(tag . sub-xexprs)
-                                                (identifier? #`tag)
-                                                #`(tag () #,@(map process-xexpr (syntax->list #`sub-xexprs)))]
-                                               [str
-                                                (string? (syntax-e #`str))
-                                                xexpr]))])
-                                   (syntax-case stx ()
-                                     [(_ xexpr) #`(quasiquote #,(process-xexpr #`xexpr))]))))
-                              ((xml ))
-                              ((xml (a ([a "x"]) "ab" "hdo" "hon")))))))
-
-  #;
-  (define (test-xml-sequence namespace-spec render-settings track-inferred-names? spec expected-steps)
-    (letrec ([port (open-input-text-editor (construct-text spec))])
-      (test-sequence-core namespace-spec render-settings track-inferred-names? port expected-steps)))
-
-  #;
-  (define (construct-text spec)
-    (let ([new-text (instantiate text% ())])
-      (for-each
-       (match-lambda
-         [`(xml-box ,@(xmlspec ...)) (send new-text insert (construct-xml-box xmlspec))]
-         [(? string? text) (send new-text insert text)])
-       spec)
-      new-text))
-
-  #;
-  (define (test-xml-beginner-sequence spec expected)
-    test-xml-sequence `(lib "htdp-beginner.ss" "lang")
-    fake-beginner-render-settings
-    #t
-    spec
-    expected)
-
-  #;
-  (t1 'xml-box1
-      test-xml-beginner-sequence `((xml-box "<abba>3</abba>"))
-      `((finished-stepping)))
-
-  #;
-  (t1 'xml-box2
-      text-xml-beginnner-sequence `("(cdr (cdr " (xml-box "<foozle>a b</foozle>") "))")
-      `((before-after ((cdr (cdr (xml-box "<foozle>a b</foozle>")))))))
-
-  ;(t1 'filled-rect-image
-  ;   (m:upto-int-lam "(image-width (filled-rect 10 10 'blue))"
-  ;                      `((before-after ((image-width (hilite (filled-rect 10 10 'blue)))) ((image-width (hilite )))))))
-  ; add image test: (image-width (filled-rect 10 10 'blue))
-
-
-  
-  (t 'check-expect m:upto-int/lam
-     (check-expect (+ 3 4) (+ 8 9)) (check-expect (+ 1 1) 2) (check-expect (+ 2 2) 4) (+ 4 5)
-     :: {(+ 4 5)} -> {9}
-     :: 9 (check-expect (+ 3 4) {(+ 8 9)}) -> 9 (check-expect (+ 3 4) {17})
-     :: 9 (check-expect {(+ 3 4)} 17) -> 9 (check-expect {7} 17)
-     :: 9 false (check-expect {(+ 1 1)} 2) -> 9 false (check-expect {2} 2)
-     :: 9 false true (check-expect {(+ 2 2)} 4) -> 9 false true (check-expect {4} 4))
-  
-  (t 'simple-check-expect m:beginner
-     (check-expect (+ 3 4) 7)
-     :: (check-expect {(+ 3 4)} 7) -> (check-expect {7} 7))
-  
-  (t1 'check-within
-      m:upto-int/lam
-      "(check-within (+ 3 4) (+ 8 10) (+ 10 90)) (check-expect (+ 1 1) 2)(+ 4 5)"
-      `((before-after ((hilite (+ 4 5)))
-                      ((hilite 9)))
-        (before-after (9 (check-within (+ 3 4) (hilite (+ 8 10)) (+ 10 90)))
-                      (9 (check-within (+ 3 4) (hilite 18) (+ 10 90))))
-        (before-after (9 (check-within (+ 3 4) 18 (hilite (+ 10 90))))
-                      (9 (check-within (+ 3 4) 18 (hilite 100))))
-        (before-after (9 (check-within (hilite (+ 3 4)) 18 100))
-                      (9 (check-within (hilite 7) 18 100)))
-        (before-after (9 true (check-expect (hilite (+ 1 1)) 2))
-                      (9 true (check-expect (hilite 2) 2)))))
-  
-
-  
-  
-  (t1 'check-within-bad
-      m:upto-int/lam
-      "(check-within (+ 3 4) (+ 8 10) 0.01) (+ 4 5) (check-expect (+ 1 1) 2)"
-      `((before-after ((hilite (+ 4 5)))
-                      ((hilite 9)))
-        (before-after (9 (check-within (+ 3 4) (hilite (+ 8 10)) 0.01))
-                      (9 (check-within (+ 3 4) (hilite 18) 0.01)))
-        (before-after (9 (check-within (hilite (+ 3 4)) 18 0.01))
-                      (9 (check-within (hilite 7) 18 0.01)))
-        (before-after (9 false (check-expect (hilite (+ 1 1)) 2))
-                      (9 false (check-expect (hilite 2) 2)))))
-
-  (let ([errmsg "rest: expected argument of type <non-empty list>; given ()"])
-    (t1 'check-error
-        m:upto-int/lam
-        "(check-error (+ (+ 3 4) (rest empty)) (string-append \"rest: \" \"expected argument of type <non-empty list>; given ()\")) (check-expect (+ 3 1) 4) (+ 4 5)"
-        `((before-after ((hilite (+ 4 5)))
-                        ((hilite 9)))
-          (before-after (9 (check-error (+ (+ 3 4) (rest empty)) (hilite (string-append "rest: " "expected argument of type <non-empty list>; given ()"))))
-                        (9 (check-error (+ (+ 3 4) (rest empty)) (hilite ,errmsg))))
-          (before-after (9 (check-error (+ (hilite (+ 3 4)) (rest empty)) ,errmsg))
-                        (9 (check-error (+ (hilite 7) (rest empty)) ,errmsg)))
-          (before-after (9 true (check-expect (hilite (+ 3 1)) 4))
-                        (9 true (check-expect (hilite 4) 4))))))
-
-  (t1 'check-error-bad
-      m:upto-int/lam
-      "(check-error (+ (+ 3 4) (rest empty)) (string-append \"b\" \"ogus\")) (check-expect (+ 3 1) 4) (+ 4 5)"
-      `((before-after ((hilite (+ 4 5)))
-                      ((hilite 9)))
-        (before-after (9 (check-error (+ (+ 3 4) (rest empty)) (hilite (string-append "b" "ogus"))))
-                      (9 (check-error (+ (+ 3 4) (rest empty)) (hilite "bogus"))))
-        (before-after (9 (check-error (+ (hilite (+ 3 4)) (rest empty)) "bogus"))
-                      (9 (check-error (+ (hilite 7) (rest empty)) "bogus")))
-        (before-after (9 false (check-expect (hilite (+ 3 1)) 4))
-                      (9 false (check-expect (hilite 4) 4)))))
-  
-  ;;;;;;;;;;;;
-  ;;
-  ;;    DMdA TESTS
-  ;;
-  ;;;;;;;;;;;
-  
-  (t1 'dmda-certificate-bug
-       m:dmda-a
-      "(: apply-nim-move (integer? -> integer?))
-  (define apply-nim-move
-    (lambda (s)
-      (if s s s)))"
-      '())
-
-
-  ;  ;;;;;;;;;;;;;
-  ;  ;;
-  ;  ;;  TEACHPACK TESTS
-  ;  ;;
-  ;  ;;;;;;;;;;;;;
-  ;
-
-  ; as you can see, many teachpack tests work only in gracket:
-  ;; (require mred)
-
-
-
-  ; uses set-render-settings!
-  ;(reconstruct:set-render-settings! fake-beginner-render-settings)
-  ;(test-sequence "(define (check-guess guess target) 'TooSmall) (guess-with-gui check-guess)"
-  ;               `((before-after ((hilite ,h-p)) ((guess-with-gui check-guess)))
-  ;                 (((hilite ,h-p)) (true)))
-  ;               `((define (check-guess guess target) 'toosmall) true)
-  ;               tp-namespace)
-
-  #;
-  (t1 'teachpack-drawing
-      (make-teachpack-ll-model
-       `((lib "draw.ss" "htdp")))
-      "(define (draw-limb i) (cond
- [(= i 1) (draw-solid-line (make-posn 20 20) (make-posn 20 100) 'blue)]
- [(= i 0) (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)]))
- (and (start 100 100)
- (draw-limb 0))"
-      `((before-after-finished ((define (draw-limb i) (cond [(= i 1) (draw-solid-line (make-posn 20 20) (make-posn 20 100) 'blue)]
-                                                            [(= i 0) (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)])))
-                               ((and (hilite (start 100 100)) (draw-limb 0)))
-                               ((and (hilite true) (draw-limb 0))))
-        (before-after ((and true (hilite (draw-limb 0))))
-                      ((and true (hilite (cond [(= 0 1) (draw-solid-line (make-posn 20 20) (make-posn 20 100) 'blue)]
-                                               [(= 0 0) (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)])))))
-        (before-after ((and true (cond [(hilite (= 0 1)) (draw-solid-line (make-posn 20 20) (make-posn 20 100) 'blue)]
-                                       [(= 0 0) (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)])))
-                      ((and true (cond [(hilite false) (draw-solid-line (make-posn 20 20) (make-posn 20 100) 'blue)]
-                                       [(= 0 0) (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)]))))
-        (before-after ((and true (hilite (cond [false (draw-solid-line (make-posn 20 20) (make-posn 20 100) 'blue)]
-                                               [(= 0 0) (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)]))))
-                      ((and true (hilite (cond [(= 0 0) (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)])))))
-        (before-after ((and true (cond [(hilite (= 0 0)) (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)])))
-                      ((and true (cond [(hilite true) (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)]))))
-        (before-after ((and true (hilite (cond [true (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)]))))
-                      ((and true (hilite (draw-solid-line (make-posn (+ 1 10) 10) (make-posn 10 100) 'red)))))
-        (before-after ((and true (draw-solid-line (make-posn (hilite (+ 1 10)) 10) (make-posn 10 100) 'red)))
-                      ((and true (draw-solid-line (make-posn (hilite 11) 10) (make-posn 10 100) 'red))))
-        (before-after ((and true (hilite (draw-solid-line (make-posn 11 10) (make-posn 10 100) 'red))))
-                      ((and true (hilite true))))
-        (before-after ((hilite (and true true)))
-                      ((hilite true)))
-        (finished-stepping)))
-  
-  #;(t1 'teachpack-universe
-        (test-teachpack-sequence
-         `((lib "universe.ss" "2htdp")))
-        "(define (z world)
-  (empty-scene 100 100))
-
-(big-bang 3
-          (on-tick add1)
-          (on-draw z))"
-        `((finished-stepping)))
-
-  
-  #;
-  (t1 'teachpack-name-rendering
-      (test-teachpack-sequence
-       `((file "/Users/clements/plt/teachpack/htdp/draw.ss")))
-      "(start 300 300) (if true (get-key-event) 3)"
-      `((before-after ((hilite (start 300 300)))
-                      ((hilite true)))
-        (before-after-finished (true)
-                               ((hilite (if true (get-key-event) 3)))
-                               ((hilite (get-key-event))))
-        (before-after ((hilite (get-key-event)))
-                      ((hilite false)))
-        (finished-stepping)))
-
-  #;
-  (t1 'teachpack-hop-names
-      (make-teachpack-ll-model
-       `((file "/Users/clements/plt/teachpack/htdp/draw.ss")))
-      "(start 300 300) (define (a x y) (+ 3 4)) (if true (on-key-event a) 3)"
-      `((before-after ((hilite (start 300 300)))
-                      ((hilite true)))
-        (before-after-finished (true (define (a x y) (+ 3 4)))
-                               ((hilite (if true (on-key-event a) 3)))
-                               ((hilite (on-key-event a))))
-        (before-after ((hilite (on-key-event a)))
-                      ((hilite true)))
-        (finished-stepping)))
-
-  #;
-  (t1 'teachpack-web-interaction
-      (make-teachpack-ll-model
-       `(htdp/servlet2))
-      "(define (adder go) (inform (number->string (+ (single-query (make-number \"enter 10\")) (single-query (make-number \"enter 20\")))))) (adder true)"
-      `((before-after-finished ((define (adder go) (inform (number->string (+ (single-query (make-number "enter 10")) (single-query (make-number "enter 20")))))))
-                               ((hilite (adder true)))
-                               ((hilite (inform (number->string (+ (single-query (make-number "enter 10")) (single-query (make-number "enter 20"))))))))
-        (before-after ((inform (number->string (+ (single-query (hilite (make-number "enter 10"))) (single-query (make-number "enter 20")))))) ; this step looks wrong wrong wrong.
-                      ((inform (number->string (+ (single-query (hilite (make-numeric "enter 10"))) (single-query (make-number "enter 20")))))))
-        (before-after ((inform (number->string (+ (hilite (single-query (make-numeric "enter 10"))) (single-query (make-number "enter 20"))))))
-                      ((inform (number->string (+ (hilite 10) (single-query (make-number "enter 20")))))))
-        (before-after ((inform (number->string (+ 10 (single-query (hilite (make-number "enter 20")))))))
-                      ((inform (number->string (+ 10 (single-query (hilite (make-numeric "enter 20"))))))))
-        (before-after ((inform (number->string (+ 10 (hilite (single-query (make-numeric "enter 20")))))))
-                      ((inform (nut
-                                mber->string (+ 10 (hilite 20))))))
-        (before-after ((inform (number->string (hilite (+ 10 20)))))
-                      ((inform (number->string (hilite 30)))))
-        (before-after ((inform (hilite (number->string 30))))
-                      ((inform (hilite "30"))))
-        (before-after ((hilite (inform "30")))
-                      ((hilite true)))
-        (finished-stepping)))
-
-  ;;;;;;;;;;;;;
-  ;;
-  ;;  Set!
-  ;;
-  ;;;;;;;;;;;;;
-
-  (t1 'top-ref-to-lifted
-      m:advanced "(define a (local ((define i1 0) (define (i2 x) i1)) i2)) (+ 3 4)"
-      (let ([defs `((define i1_0 0) (define (i2_0 x) i1_0))])
-        `((before-after ((define a (hilite (local ((define i1 0) (define (i2 x) i1)) i2))))
-                        ((hilite (define i1_0 0)) (hilite (define (i2_0 x) i1_0)) (define a (hilite i2_0))))
-          (before-after (,@defs (define a (hilite i2_0)))
-                        (,@defs (define a (hilite (lambda (x) i1_0)))))
-          (before-after (,@defs (define a (lambda (x) i1_0)) (hilite (+ 3 4)))
-                        (,@defs (define a (lambda (x) i1_0)) (hilite 7))))))
-
-  (t1 'set!
-      m:advanced "(define a 3) (set! a (+ 4 5)) a"
-      `((before-after ((define a 3) (set! a (hilite (+ 4 5))))
-                      ((define a 3) (set! a (hilite 9))))
-        (before-after ((hilite (define a 3)) (hilite (set! a 9)))
-                      ((hilite (define a 9)) (hilite (void))))
-        (before-after ((define a 9) (void) (hilite a))
-                      ((define a 9) (void) (hilite 9)))
-        (finished-stepping)))
-
-  (t1 'local-set!
-      m:advanced
-      "(define a (local ((define in 14) (define (getter dc) in) (define (modder n) (set! in n))) modder)) (a 15)"
-      (let ([d1 `(define in_0 14)]
-            [d2 `(define (getter_0 dc) in_0)]
-            [d3 `(define (modder_0 n) (set! in_0 n))]
-            [d4 `(define a (lambda (n) (set! in_0 n)))])
-        `((before-after ((define a (hilite (local ((define in 14) (define (getter dc) in) (define (modder n) (set! in n))) modder))))
-                        ((hilite ,d1) (hilite ,d2) (hilite ,d3) (define a (hilite modder_0))))
-          (before-after (,d1 ,d2 ,d3 (define a (hilite modder_0)))
-                        (,d1 ,d2 ,d3 (define a (hilite (lambda (n) (set! in_0 n))))))
-          (before-after (,d1 ,d2 ,d3 ,d4 ((hilite a) 15))
-                        (,d1 ,d2 ,d3 ,d4 ((hilite (lambda (n) (set! in_0 n))) 15)))
-          (before-after (,d1 ,d2 ,d3 ,d4 (hilite ((lambda (n) (set! in_0 n)) 15)))
-                        (,d1 ,d2 ,d3 ,d4 (hilite (set! in_0 15))))
-          (before-after ((hilite ,d1) ,d2 ,d3 , d4 (hilite (set! in_0 15)))
-                        ((hilite (define in_0 15)) ,d2 ,d3 ,d4 (void)))
-          (finished-stepping))))
-
-  ;;;;;;;;;;;
-  ;;
-  ;;  BEGIN
-  ;;
-  ;;;;;;;;;;;
-
-  (t1 'simple-begin
-      m:advanced "(+ 3 (begin 4 5))"
-      `((before-after ((+ 3 (hilite (begin 4 5))))
-                      ((+ 3 (hilite 5))))
-        (before-after ((hilite (+ 3 5)))
-                      ((hilite 8)))
-        (finished-stepping)))
-
-  (t1 'begin-onlyvalues
-      m:advanced "(+ 3 (begin 4 5 6))"
-      `((before-after ((+ 3 (hilite (begin 4 5 6))))
-                      ((+ 3 (hilite (begin 5 6)))))
-        (before-after ((+ 3 (hilite (begin 5 6))))
-                      ((+ 3 (hilite 6))))
-        (before-after ((hilite (+ 3 6)))
-                      ((hilite 9)))))
-
-  (t1 'begin
-      m:advanced "(begin (+ 3 4) (+ 4 5) (+ 9 8))"
-      `((before-after ((begin (hilite (+ 3 4)) (+ 4 5) (+ 9 8)))
-                      ((begin (hilite 7) (+ 4 5) (+ 9 8))))
-        (before-after ((hilite (begin 7 (+ 4 5) (+ 9 8))))
-                      ((hilite (begin (+ 4 5) (+ 9 8)))))
-        (before-after ((begin (hilite (+ 4 5)) (+ 9 8)))
-                      ((begin (hilite 9) (+ 9 8))))
-        (before-after ((hilite (begin 9 (+ 9 8))))
-                      ((hilite (+ 9 8))))
-        (before-after ((hilite (+ 9 8)))
-                      ((hilite 17)))
-        (finished-stepping)))
-  
-  (t 'begin-let-bug m:advanced
-     (let ([x 3]) (begin 3 4))
-     :: {(let ([x 3]) (begin 3 4))}
-     -> {(define x_0 3)} {(begin 3 4)}
-     :: (define x_0 3) {(begin 3 4)}
-     -> (define x_0 3) 4)
-
-  (t1 'empty-begin
-      m:advanced "(begin)"
-      `((error "begin: expected at least one expression after begin, but nothing's there")))
-
-  ;;;;;;;;;;;;
-  ;;
-  ;; BEGIN0
-  ;;
-  ;;;;;;;;;;;;
-  
-  (t1 'empty-begin0
-      m:advanced "(begin0)"
-      `((error "begin0: expected at least one expression after begin0, but nothing's there")))
-  
-  (t1 'trivial-begin0
-      m:advanced "(begin0 3)"
-      `((before-after ((hilite (begin0 3)))
-                      ((hilite 3)))
-        (finished-stepping)))
-  
-
-  
-  ;; urg.. the first element of a begin0 is in tail position if there's only one.
-  (t1 'one-item-begin0
-      m:advanced "(begin0 (+ 3 4))"
-      `((before-after ((hilite (begin0 (+ 3 4))))
-                      ((hilite (+ 3 4))))
-        (before-after ((hilite (+ 3 4)))
-                      ((hilite 7)))
-        (finished-stepping)))
-  
-  (t 'begin0-onlyvalues m:advanced
-     (begin0 3 4 5)
-     :: {(begin0 3 4 5)}
-     -> {(begin0 3 5)}
-     -> {3})
-  
-  (t 'begin0 m:advanced
-     (begin0 (+ 3 4) (+ 4 5) (+ 6 7))
-     :: (begin0 {(+ 3 4)} (+ 4 5) (+ 6 7))
-     -> (begin0 {7} (+ 4 5) (+ 6 7))
-     :: (begin0 7 {(+ 4 5)} (+ 6 7))
-     -> (begin0 7 {9} (+ 6 7))
-     :: {(begin0 7 9 (+ 6 7))}
-     -> {(begin0 7 (+ 6 7))}
-     :: (begin0 7 {(+ 6 7)})
-     -> (begin0 7 {13})
-     :: {(begin0 7 13)}
-     -> {7})
-  
-
-  ;; --------------------------------------------------------------------------
-  ;; Lazy Stepper tests
-  ;; --------------------------------------------------------------------------
-  
-
-  (t 'lazy1 m:lazy
-     (! (+ 3 4))
-     :: {(+ 3 4)} -> {7})
-
-  (t 'lazy2 m:lazy
-     (+ (+ 3 4) 5)
-     :: (+ {(+ 3 4)} 5)
-     -> (+ {7} 5)
-     :: {(+ 7 5)}
-     -> {12})
-
-  (t 'lazy3 m:lazy
-     ((lambda (x y) (* x x)) (+ 1 2) (/ 1 0))
-     :: {((lambda (x y) (* x x)) (+ 1 2) (/ 1 0))}
-     -> {(* (+ 1 2) (+ 1 2))}
-     :: (* {(+ 1 2)} {(+ 1 2)})
-     -> (* {3} {3})
-     :: {(* 3 3)}
-     -> {9})
-  
-  (t 'lazy-multi m:lazy
-     (+ 1 2) (+ 3 4)
-     :: {(+ 1 2)} -> {3}
-     :: 3 {(+ 3 4)} -> 3 {7})
-  
-  ; lazy-app1: 
-  ; (define (f x) (+ x x))
-  ; (f (+ 1 2))
-  (let* ([body '(+ x x)]
-         [lam `(lambda (x) ,body)]
-         [def `(define (f x) ,body)]
-         [arg '(+ 1 2)])
-    (t 'lazy-app1 m:lazy
-       ,def (f ,arg)
-       :: ,def ({f} ,arg)        -> ,def ({,lam} ,arg)
-       :: ,def {(,lam ,arg)}     -> ,def {(+ ,arg ,arg)}
-       :: ,def (+ {,arg} {,arg}) -> ,def (+ {3} {3})
-       :: ,def {(+ 3 3)}         -> ,def {6}))
-  
-  ; lazy-app2: 
-  ; (define (f x) (+ x x))
-  ; (f (f (+ 1 2)))
-  (let* ([body '(+ x x)]
-         [lam `(lambda (x) ,body)]
-         [def `(define (f x) ,body)]
-         [arg1 '(+ 1 2)]
-         [arg2 `(f ,arg1)])
-    (t 'lazy-app2 m:lazy
-       ,def (f ,arg2)
-       :: ,def ({f} ,arg2)                 -> ,def ({,lam} ,arg2)
-       :: ,def {(,lam ,arg2)}              -> ,def {(+ ,arg2 ,arg2)}
-       :: ,def (+ ({f} ,arg1) ({f} ,arg1)) -> ,def (+ ({,lam} ,arg1) ({,lam} ,arg1))
-       :: ,def (+ {(,lam ,arg1)} {(,lam ,arg1)})           
-       -> ,def (+ {(+ ,arg1 ,arg1)} {(+ ,arg1 ,arg1)})
-       :: ,def (+ (+ {,arg1} {,arg1}) (+ {,arg1} {,arg1})) 
-       -> ,def (+ (+ {3} {3}) (+ {3} {3})) 
-       :: ,def (+ {(+ 3 3)} {(+ 3 3)})     -> ,def (+ {6} {6})
-       :: ,def {(+ 6 6)}                   -> ,def {12}))
-     
-  ; lazy-app3
-  ; (define (f x) (+ (+ x x) x))
-  ; (define (g x) (+ x (+ x x)))
-  ; (f (+ 1 2))
-  ; (g (+ 3 4))
-  (let* ([body '(+ x x)]
-         [body1 `(+ ,body x)]
-         [body2 `(+ x ,body)]
-         [def1 `(define (f x) ,body1)]
-         [def2 `(define (g x) ,body2)]
-         [lam1 `(lambda (x) ,body1)]
-         [lam2 `(lambda (x) ,body2)]
-         [arg1 '(+ 1 2)]
-         [arg2 '(+ 3 4)])
-    (t 'lazy-app3 m:lazy
-       ,def1 ,def2 (f ,arg1) (g ,arg2)
-       :: ,def1 ,def2 ({f} ,arg1) -> ,def1 ,def2 ({,lam1} ,arg1)
-       :: ,def1 ,def2 {(,lam1 ,arg1)} -> ,def1 ,def2 {(+ (+ ,arg1 ,arg1) ,arg1)}
-       :: ,def1 ,def2 (+ (+ {,arg1} {,arg1}) {,arg1}) -> ,def1 ,def2 (+ (+ {3} {3}) {3})
-       :: ,def1 ,def2 (+ {(+ 3 3)} 3) -> ,def1 ,def2 (+ {6} 3)
-       :: ,def1 ,def2 {(+ 6 3)} -> ,def1 ,def2 {9}
-       :: ,def1 ,def2 9 ({g} ,arg2) -> ,def1 ,def2 9 ({,lam2} ,arg2)
-       :: ,def1 ,def2 9 {(,lam2 ,arg2)} -> ,def1 ,def2 9 {(+ ,arg2 (+ ,arg2 ,arg2))}
-       :: ,def1 ,def2 9 (+ {,arg2} (+ {,arg2} {,arg2})) -> ,def1 ,def2 9 (+ {7} (+ {7} {7}))
-       :: ,def1 ,def2 9 (+ 7 {(+ 7 7)}) -> ,def1 ,def2 9 (+ 7 {14})
-       :: ,def1 ,def2 9 {(+ 7 14)} -> ,def1 ,def2 9 {21}))
-
-   (t 'lazy-cons1 m:lazy
-      (car (cons (+ 1 2) ,err))
-      :: {(car (cons (+ 1 2) ,err))} -> {(+ 1 2)} -> {3})
-   
-   (t 'lazy-cons2 m:lazy
-      (cdr (cons ,err (+ 1 2)))
-      :: {(cdr (cons ,err (+ 1 2)))} -> {(+ 1 2)} -> {3})
-   
-   (t 'lazy-list1 m:lazy
-      (car (list (+ 1 2) ,err))
-      :: {(car (list (+ 1 2) ,err))} -> {(+ 1 2)} -> {3})
-   
-   (t 'lazy-list2 m:lazy
-      (cdr (list ,err (+ 1 2)))
-      :: {(cdr (list ,err (+ 1 2)))} -> {(list (+ 1 2))})
-
-   (t 'lazy-list3 m:lazy
-      (cadr (second (third (list ,err ,err (list ,err (list ,err (+ 1 2)))))))
-      :: (cadr (second {(third (list ,err ,err (list ,err (list ,err (+ 1 2)))))}))
-      -> (cadr (second {(list ,err (list ,err (+ 1 2)))}))
-      :: (cadr {(second (list ,err (list ,err (+ 1 2))))})
-      -> (cadr {(list ,err (+ 1 2))})
-      :: {(cadr (list ,err (+ 1 2)))}
-      -> {(+ 1 2)} -> {3})
-   
-   (t 'lazy-caar m:lazy
-      (caar (list (list 1)))
-      :: {(caar (list (list 1)))} -> {1})
-   (t 'lazy-cadr m:lazy
-      (cadr (list 1 2))
-      :: {(cadr (list 1 2))} -> {2})
-   (t 'lazy-cdar m:lazy
-      (cdar (list (list 1)))
-      :: {(cdar (list (list 1)))} -> {empty})
-   
-
-   (t 'lazy-cddr m:lazy
-      (cddr (list 1 2))
-      :: {(cddr (list 1 2))} -> {empty})
-   (t 'lazy-caaar m:lazy
-      (caaar (list (list (list 1))))
-      :: {(caaar (list (list (list 1))))} -> {1})
-   (t 'lazy-caadr m:lazy
-      (caadr (list 1 (list 1)))
-      :: {(caadr (list 1 (list 1)))} -> {1})
-   (t 'lazy-cadar m:lazy
-      (cadar (list (list 1 2)))
-      :: {(cadar (list (list 1 2)))} -> {2})
-   (t 'lazy-caddr m:lazy
-      (caddr (list 1 2 3))
-      :: {(caddr (list 1 2 3))} -> {3})
-   (t 'lazy-cdaar m:lazy
-      (cdaar (list (list (list 1))))
-      :: {(cdaar (list (list (list 1))))} -> {empty})
-   (t 'lazy-cdadr m:lazy
-      (cdadr (list 1 (list 1)))
-      :: {(cdadr (list 1 (list 1)))} -> {empty})
-   (t 'lazy-cddar m:lazy
-      (cddar (list (list 1 2)))
-      :: {(cddar (list (list 1 2)))} -> {empty})
-   (t 'lazy-cdddr m:lazy
-      (cdddr (list 1 2 3))
-      :: {(cdddr (list 1 2 3))} -> {empty})
-   (t 'lazy-caaaar m:lazy
-      (caaaar (list (list (list (list 1)))))
-      :: {(caaaar (list (list (list (list 1)))))} -> {1})
-   (t 'lazy-caaadr m:lazy
-      (caaadr (list 1 (list (list 1))))
-      :: {(caaadr (list 1 (list (list 1))))} -> {1})
-   (t 'lazy-caadar m:lazy
-      (caadar (list (list 1 (list 2))))
-      :: {(caadar (list (list 1 (list 2))))} -> {2})
-   (t 'lazy-caaddr m:lazy
-      (caaddr (list 1 2 (list 1)))
-      :: {(caaddr (list 1 2 (list 1)))} -> {1})
-   (t 'lazy-cadaar m:lazy
-      (cadaar (list (list (list 1 2))))
-      :: {(cadaar (list (list (list 1 2))))} -> {2})
-   (t 'lazy-cadadr m:lazy
-      (cadadr (list 1 (list 1 2)))
-      :: {(cadadr (list 1 (list 1 2)))} -> {2})
-   (t 'lazy-caddar m:lazy
-      (caddar (list (list 1 2 3)))
-      :: {(caddar (list (list 1 2 3)))} -> {3})
-   (t 'lazy-cadddr m:lazy
-      (cadddr (list 1 2 3 4))
-      :: {(cadddr (list 1 2 3 4))} -> {4})
-   (t 'lazy-cdaaar m:lazy
-      (cdaaar (list (list (list (list 1)))))
-      :: {(cdaaar (list (list (list (list 1)))))} -> {empty})
-   (t 'lazy-cdaadr m:lazy
-      (cdaadr (list 1 (list (list 1))))
-      :: {(cdaadr (list 1 (list (list 1))))} -> {empty})
-   (t 'lazy-cdadar m:lazy
-      (cdadar (list (list 1 (list 2))))
-      :: {(cdadar (list (list 1 (list 2))))} -> {empty})
-   (t 'lazy-cdaddr m:lazy
-      (cdaddr (list 1 2 (list 1)))
-      :: {(cdaddr (list 1 2 (list 1)))} -> {empty})
-   (t 'lazy-cddaar m:lazy
-      (cddaar (list (list (list 1 2))))
-      :: {(cddaar (list (list (list 1 2))))} -> {empty})
-   (t 'lazy-cddadr m:lazy
-      (cddadr (list 1 (list 1 2)))
-      :: {(cddadr (list 1 (list 1 2)))} -> {empty})
-   (t 'lazy-cdddar m:lazy
-      (cdddar (list (list 1 2 3)))
-      :: {(cdddar (list (list 1 2 3)))} -> {empty})
-   
-
-   (t 'lazy-cddddr m:lazy
-      (cddddr (list 1 2 3 4))
-      :: {(cddddr (list 1 2 3 4))} -> {empty})
-   (t 'lazy-second m:lazy
-      (second (list 1 2 3 4 5 6 7 8))
-      :: {(second (list 1 2 3 4 5 6 7 8))} -> {2})
-   (t 'lazy-third m:lazy
-      (third (list 1 2 3 4 5 6 7 8))
-      :: {(third (list 1 2 3 4 5 6 7 8))} -> {3})
-   (t 'lazy-fourth m:lazy
-      (fourth (list 1 2 3 4 5 6 7 8))
-      :: {(fourth (list 1 2 3 4 5 6 7 8))} -> {4})
-   (t 'lazy-fifth m:lazy
-      (fifth (list 1 2 3 4 5 6 7 8))
-      :: {(fifth (list 1 2 3 4 5 6 7 8))} -> {5})
-   (t 'lazy-sixth m:lazy
-      (sixth (list 1 2 3 4 5 6 7 8))
-      :: {(sixth (list 1 2 3 4 5 6 7 8))} -> {6})
-   (t 'lazy-seventh m:lazy
-      (seventh (list 1 2 3 4 5 6 7 8))
-      :: {(seventh (list 1 2 3 4 5 6 7 8))} -> {7})
-   (t 'lazy-eighth m:lazy
-      (eighth (list 1 2 3 4 5 6 7 8))
-      :: {(eighth (list 1 2 3 4 5 6 7 8))} -> {8})
- 
-   (t 'lazy-list4 m:lazy
-      (caaaar (cdddar (list (list ,err ,err ,err (list (list (list (+ 1 2))))))))
-      :: (caaaar {(cdddar (list (list ,err ,err ,err (list (list (list (+ 1 2)))))))})
-      -> (caaaar {(list (list (list (list (+ 1 2)))))})
-      :: {(caaaar (list (list (list (list (+ 1 2))))))} -> {(+ 1 2)} -> {3})
-   
-   ; lazy-list5
-   ; (define (f x) (+ (car (caar x)) (cadr (cddr x))))
-   ; (f (list (list (list (+ 1 2))) (/ 1 0) (/ 1 0) (+ 3 4)))
-   (let* ([make-rand1 (λ (x) `(car (caar ,x)))]
-          [make-rand2 (λ (x) `(cadr (cddr ,x)))]
-          [rand1 (make-rand1 'x)]
-          [rand2 (make-rand2 'x)]
-          [make-body (λ (x) `(+ ,(make-rand1 x) ,(make-rand2 x)))]
-          [body (make-body 'x)]
-          [def `(define (f x) ,body)]
-          [lam `(lambda (x) ,body)]
-          [subarg1 '(+ 1 2)]
-          [subarg2 `(list ,subarg1)]
-          [subarg3 '(+ 3 4)]
-          [subarg4 `(list ,err ,subarg3)]
-          [make-arg (λ (x y) `(list (list ,x) ,err ,err ,y))]
-          [arg (make-arg subarg2 subarg3)]
-          [body-subst (make-body arg)]
-          [rand2-subst (make-rand2 arg)])
-     (t 'lazy-list5 m:lazy
-        ,def (f ,arg)
-        :: ,def ({f} ,arg) -> ,def ({,lam} ,arg)
-        :: ,def {(,lam ,arg)} -> ,def {,body-subst}
-        :: ,def (+ (car {(caar ,arg)}) ,rand2-subst)
-        -> ,def (+ (car {,subarg2}) ,rand2-subst)
-        :: ,def (+ {(car ,subarg2)} ,rand2-subst)
-        -> ,def (+ {,subarg1} ,rand2-subst)
-        :: ,def (+ {,subarg1} (cadr (cddr (list (list (list {,subarg1})) ,err ,err ,subarg3))))
-        -> ,def (+ {3} (cadr (cddr (list (list (list {3})) ,err ,err ,subarg3))))
-        :: ,def (+ 3 (cadr {(cddr (list (list (list 3)) ,err ,err ,subarg3))}))
-        -> ,def (+ 3 (cadr {,subarg4}))
-        :: ,def (+ 3 {(cadr ,subarg4)})
-        -> ,def (+ 3 {,subarg3}) -> ,def (+ 3 {7})
-        :: ,def {(+ 3 7)} -> ,def {10}))
-   
-
-   
-   ; lazy-if1
-   ; (define (f x) (if x (/ 1 0) (not x)))
-   ; (f (< 1 0))
-   (let* ([make-body (λ (x) `(if ,x ,err (not ,x)))]
-          [body (make-body 'x)]
-          [def `(define (f x) ,body)]
-          [lam `(lambda (x) ,body)]
-          [arg '(< 1 0)]
-          [body-subst (make-body arg)])
-     (t 'lazy-if1 m:lazy
-        ,def (f ,arg)
-        :: ,def ({f} ,arg) -> ,def ({,lam} ,arg)
-        :: ,def {(,lam ,arg)} -> ,def {,body-subst}
-        :: ,def (if {,arg} ,err (not {,arg})) -> ,def (if {false} ,err (not {false}))
-        :: ,def {(if false ,err (not false))} -> ,def {(not false)} -> ,def {true}))
-   
-   ; lazy-if2
-   ; (define (f x) (if x (not x) (/ 1 0)))
-   ; (f (> 1 0))
-   (let* ([make-body (λ (x) `(if ,x (not ,x) ,err))]
-          [body (make-body 'x)]
-          [def `(define (f x) ,body)]
-          [lam `(lambda (x) ,body)]
-          [arg '(> 1 0)]
-          [body-subst (make-body arg)])
-     (t 'lazy-if2 m:lazy
-        ,def (f ,arg)
-        :: ,def ({f} ,arg) -> ,def ({,lam} ,arg)
-        :: ,def {(,lam ,arg)} -> ,def {,body-subst}
-        :: ,def (if {,arg} (not {,arg}) ,err) -> ,def (if {true} (not {true}) ,err)
-        :: ,def {(if true (not true) ,err)} -> ,def {(not true)} -> ,def {false}))
-
-   ; lazy-take-0
-   (let ([e '(take 0 (list 1 2))])
-     (t 'lazy-take-0 m:lazy
-        ,e :: {,e} -> {empty}))
-     
-   ; lazy-take
-   (t 'lazy-take m:lazy
-      (take (+ 0 2) (list (+ 1 2) (+ 3 4) (/ 1 0)))
-      :: (take {(+ 0 2)} (list (+ 1 2) (+ 3 4) (/ 1 0)))
-      -> (take {2} (list (+ 1 2) (+ 3 4) (/ 1 0)))
-      :: {(take 2 (list (+ 1 2) (+ 3 4) (/ 1 0)))}
-      -> {(cons (+ 1 2) ,(<delay#> 0))})
-   
-   ; lazy-take-impl
-;   (define (take-n n lst)
-;     (if (= n 0)
-;         null
-;         (cons (first lst)
-;               (take-n (- n 1) (rest lst)))))
-;   (define (f lst) (+ (first lst) (second lst)))
-;   (f (take-n 3 (list 1 2 (/ 1 0) 4)))
-   (let* ([make-take-body 
-           (λ (n lst) 
-             `(if (= ,n 0) null
-                  (cons (first ,lst)
-                        (take-n (- ,n 1) (rest ,lst)))))]
-          [take-body (make-take-body 'n 'lst)]
-          [take-def `(define (take-n n lst) ,take-body)]
-          [take-lam `(lambda (n lst) ,take-body)]
-          [make-f-body (λ (lst) `(+ (first ,lst) (second ,lst)))]
-          [f-body (make-f-body 'lst)]
-          [f-def `(define (f lst) ,f-body)]
-          [f-lam `(lambda (lst) ,f-body)]
-          [lst-arg `(list (+ 1 2) (+ 3 4) ,err (+ 5 6))]
-          [lst-arg-red1 `(list 3 (+ 3 4) ,err (+ 5 6))]
-          [make-take-app (λ (n lst) `(take-n ,n ,lst))]
-          [take-arg (make-take-app 3 lst-arg)])
-     (t 'lazy-take-impl m:lazy
-        ,take-def ,f-def (f ,take-arg)
-        :: ,take-def ,f-def ({f} ,take-arg) -> ,take-def ,f-def ({,f-lam} ,take-arg)
-        :: ,take-def ,f-def {(,f-lam ,take-arg)} -> ,take-def ,f-def {,(make-f-body take-arg)}
-        :: ,take-def ,f-def ,(make-f-body `({take-n} 3 ,lst-arg))
-        -> ,take-def ,f-def ,(make-f-body `({,take-lam} 3 ,lst-arg))
-        :: ,take-def ,f-def ,(make-f-body `{(,take-lam 3 ,lst-arg)})
-        -> ,take-def ,f-def ,(make-f-body `{,(make-take-body 3 lst-arg)})
-        :: ,take-def ,f-def ,(make-f-body `(if {(= 3 0)} null
-                                               (cons (first ,lst-arg)
-                                                     (take-n (- 3 1) (rest ,lst-arg)))))
-        -> ,take-def ,f-def ,(make-f-body `(if {false} null
-                                               (cons (first ,lst-arg)
-                                                     (take-n (- 3 1) (rest ,lst-arg)))))
-        :: ,take-def ,f-def ,(make-f-body `{(if false null
-                                                (cons (first ,lst-arg)
-                                                      (take-n (- 3 1) (rest ,lst-arg))))})
-        -> ,take-def ,f-def ,(make-f-body `{(cons (first ,lst-arg) ,(make-take-app '(- 3 1) `(rest ,lst-arg)))})
-        :: ,take-def ,f-def (+ {(first (cons (first ,lst-arg) ,(make-take-app '(- 3 1) `(rest ,lst-arg))))}
-                               (second (cons (first ,lst-arg) ,(make-take-app '(- 3 1) `(rest ,lst-arg)))))
-        -> ,take-def ,f-def (+ {(first ,lst-arg)}
-                               (second (cons (first ,lst-arg) ,(make-take-app '(- 3 1) `(rest ,lst-arg)))))
-        :: ,take-def ,f-def (+ {(first ,lst-arg)}
-                               (second (cons {(first ,lst-arg)} ,(make-take-app '(- 3 1) `(rest ,lst-arg)))))
-        -> ,take-def ,f-def (+ {(+ 1 2)}
-                               (second (cons {(+ 1 2)} ,(make-take-app '(- 3 1) `(rest ,lst-arg)))))
-        :: ,take-def ,f-def (+ {(+ 1 2)}
-                               (second (cons {(+ 1 2)} ,(make-take-app '(- 3 1) `(rest (list {(+ 1 2)} (+ 3 4) ,err (+ 5 6)))))))
-        -> ,take-def ,f-def (+ {3}
-                               (second (cons {3} ,(make-take-app '(- 3 1) `(rest (list {3} (+ 3 4) ,err (+ 5 6)))))))
-        :: ,take-def ,f-def (+ 3 (second (cons 3 ({take-n} (- 3 1) (rest ,lst-arg-red1)))))
-        -> ,take-def ,f-def (+ 3 (second (cons 3 ({,take-lam} (- 3 1) (rest ,lst-arg-red1)))))
-        :: ,take-def ,f-def (+ 3 (second (cons 3 {(,take-lam (- 3 1) (rest ,lst-arg-red1))})))
-        -> ,take-def ,f-def (+ 3 (second (cons 3 {,(make-take-body '(- 3 1) `(rest ,lst-arg-red1))})))
-        :: ,take-def ,f-def (+ 3 (second (cons 3 ,(make-take-body '{(- 3 1)} `(rest ,lst-arg-red1)))))
-        -> ,take-def ,f-def (+ 3 (second (cons 3 ,(make-take-body '{2} `(rest ,lst-arg-red1)))))
-        :: ,take-def ,f-def (+ 3 (second (cons 3 (if {(= 2 0)} null (cons (first (rest ,lst-arg-red1))
-                                                                          (take-n (- 2 1) (rest (rest ,lst-arg-red1))))))))
-        -> ,take-def ,f-def (+ 3 (second (cons 3 (if {false} null (cons (first (rest ,lst-arg-red1))
-                                                                        (take-n (- 2 1) (rest (rest ,lst-arg-red1))))))))
-        :: ,take-def ,f-def (+ 3 (second (cons 3 {(if false null (cons (first (rest ,lst-arg-red1))
-                                                                       (take-n (- 2 1) (rest (rest ,lst-arg-red1)))))})))
-        -> ,take-def ,f-def (+ 3 (second (cons 3 {(cons (first (rest ,lst-arg-red1))
-                                                        (take-n (- 2 1) (rest (rest ,lst-arg-red1))))})))
-        :: ,take-def ,f-def (+ 3 {(second (cons 3 (cons (first (rest ,lst-arg-red1))
-                                                        (take-n (- 2 1) (rest (rest ,lst-arg-red1))))))})
-        -> ,take-def ,f-def (+ 3 {(first (rest ,lst-arg-red1))})
-        :: ,take-def ,f-def (+ 3 (first {(rest ,lst-arg-red1)}))
-        -> ,take-def ,f-def (+ 3 (first {(list (+ 3 4) (/ 1 0) (+ 5 6))}))
-        :: ,take-def ,f-def (+ 3 {(first (list (+ 3 4) (/ 1 0) (+ 5 6)))})
-        -> ,take-def ,f-def (+ 3 {(+ 3 4)}) -> ,take-def ,f-def (+ 3 {7})
-        :: ,take-def ,f-def {(+ 3 7)} -> ,take-def ,f-def {10}
-        ))
-
-   ; lazy-unknown1
-   (t 'lazy-unknown1 m:lazy
-      (second (take 3 (list (+ 1 2) (+ 3 4) (/ 1 0))))
-      :: (second {(take 3 (list (+ 1 2) (+ 3 4) (/ 1 0)))})
-      -> (second {(cons (+ 1 2) ,(<delay#> 0))})
-      :: {(second (cons (+ 1 2) (cons (+ 3 4) ,(<delay#> 1))))}
-      -> {(+ 3 4)} -> {7})
-   
-
-      
-   ; lazy-unknown2
-   (let* ([make-body (λ (x) `(+ (second ,x) (third ,x)))]
-          [body (make-body 'x)]
-          [def `(define (f x) ,body)]
-          [lam `(lambda (x) ,body)]
-          [subarg `(take 4 (list (+ 1 2) (+ 3 4) (+ 5 6) (+ 7 8) (/ 1 0)))]
-          [arg `(cdr ,subarg)]
-          [arg-red `(cons (+ 3 4) (cons (+ 5 6) ,(<delay#> 1)))])
-     (t 'lazy-unknown2 m:lazy
-        ,def (f ,arg)
-        :: ,def ({f} ,arg) -> ,def ({,lam} ,arg)
-        :: ,def {(,lam ,arg)} -> ,def {,(make-body arg)}
-        :: ,def ,(make-body `(cdr {,subarg}))
-        -> ,def ,(make-body `(cdr {(cons (+ 1 2) ,(<delay#> 0))}))
-        :: ,def ,(make-body `{(cdr (cons (+ 1 2) ,(<delay#> 0)))})
-        -> ,def ,(make-body `{,(<delay#> 0)})
-        :: ,def (+ {(second ,arg-red)} (third ,arg-red))
-        -> ,def (+ {(+ 5 6)} (third ,arg-red))
-        :: ,def (+ {(+ 5 6)} (third (cons (+ 3 4) (cons {(+ 5 6)} ,(<delay#> 1)))))
-        -> ,def (+ {11} (third (cons (+ 3 4) (cons {11} ,(<delay#> 1)))))
-        :: ,def (+ 11 {(third (cons (+ 3 4) (cons 11 ,(<delay#> 1))))})
-        -> ,def (+ 11 {(+ 7 8)}) -> ,def (+ 11 {15})
-        :: ,def {(+ 11 15)} -> ,def {26}
-        ))
-   
-   ; lazy-inf-list1
-;   (define (add-one x) (+ x 1))
-;   (define nats (cons 1 (map add-one nats)))
-;   (+ (second nats) (third nats))
-   (let* ([add1-body '(+ x 1)]
-          [add1-def `(define (add-one x) ,add1-body)]
-          [add1-lam `(lambda (x) ,add1-body)]
-          [nats-def '(define nats (cons 1 (map add-one nats)))]
-          [nats-def-expanded `(define nats (cons 1 (cons 2 (cons 3 ,(<delay#> 4)))))])
-     (t 'lazy-inf-list1 m:lazy
-        ,add1-def ,nats-def (+ (second nats) (third nats))
-        :: ,add1-def ,nats-def (+ (second {nats}) (third nats))
-        -> ,add1-def ,nats-def (+ (second {(cons 1 (map add-one nats))}) (third nats))
-        :: ,add1-def (define nats (cons 1 (map {add-one} nats)))
-        (+ (second (cons 1 (map {add-one} nats))) (third nats))
-        -> ,add1-def (define nats (cons 1 (map {,add1-lam} nats)))
-        (+ (second (cons 1 (map {,add1-lam} nats))) (third nats))
-        :: ,add1-def (define nats (cons 1 (map ,add1-lam {nats})))
-        (+ (second (cons 1 (map ,add1-lam {nats}))) (third nats))
-        -> ,add1-def (define nats (cons 1 (map ,add1-lam {(cons 1 ,(<delay#> 0))})))
-        (+ (second (cons 1 (map ,add1-lam {(cons 1 ,(<delay#> 0))}))) (third nats))
-        :: ,add1-def (define nats (cons 1 {(map ,add1-lam (cons 1 ,(<delay#> 0)))}))
-        (+ (second (cons 1 {(map ,add1-lam (cons 1 ,(<delay#> 0)))})) (third nats))
-        -> ,add1-def (define nats (cons 1 {(cons ,(<delay#> 1) ,(<delay#> 2))}))
-        (+ (second (cons 1 {(cons ,(<delay#> 1) ,(<delay#> 2))})) (third nats))
-        :: ,add1-def (define nats (cons 1 (cons ,(<delay#> 1) ,(<delay#> 2))))
-        (+ {(second (cons 1 (cons ,(<delay#> 1) ,(<delay#> 2))))} (third nats))
-        -> ,add1-def (define nats (cons 1 (cons ,(<delay#> 1) ,(<delay#> 2))))
-        (+ {,(<delay#> 1)} (third nats))
-;        :: ,add1-def (define nats (cons 1 (cons {(+ 1 1)} ,(<delay#> 2))))
-;        (+ {,(<delay#> 1)} (third nats))
-        :: ...
-        -> ,add1-def (define nats (cons 1 (cons {(+ 1 1)} ,(<delay#> 2))))
-        (+ {(+ 1 1)} (third nats))
-        -> ,add1-def (define nats (cons 1 (cons {2} ,(<delay#> 2))))
-        (+ {2} (third nats))
-        :: ,add1-def (define nats (cons 1 (cons 2 ,(<delay#> 2))))
-        (+ 2 (third {nats}))
-        -> ,add1-def (define nats (cons 1 (cons 2 ,(<delay#> 2))))
-        (+ 2 (third {(cons 1 (cons 2 ,(<delay#> 2)))}))
-        :: ,add1-def (define nats (cons 1 (cons 2 ,(<delay#> 2))))
-        (+ 2 {(third (cons 1 (cons 2 ,(<delay#> 2))))})
-        -> ,add1-def (define nats (cons 1 (cons 2 (cons ,(<delay#> 3) ,(<delay#> 4)))))
-        (+ 2 {,(<delay#> 3)})
-;        :: ,add1-def (define nats (cons 1 (cons 2 (cons {(+ 2 1)} ,(<delay#> 4)))))
-;        (+ 2 {,(<delay#> 3)})
-        :: ...
-        -> ,add1-def (define nats (cons 1 (cons 2 (cons {(+ 2 1)} ,(<delay#> 4)))))
-        (+ 2 {(+ 2 1)})
-        -> ,add1-def (define nats (cons 1 (cons 2 (cons {3} ,(<delay#> 4)))))
-        (+ 2 {3})
-        :: ,add1-def ,nats-def-expanded {(+ 2 3)}
-        -> ,add1-def ,nats-def-expanded {5}
-        ))
-   
-   ; lazy-cond1, lazy-cond2
-;   (define (f x)
-;     (cond ((> 0 x) (/ 1 0))
-;           ((< 0 x) (* x 10))
-;           (else (+ x 10))))
-;   (f 0)
-;   (f 1)
-   (let* ([make-test1 (λ (x) `(> 0 ,x))]
-          [make-test2 (λ (x) `(< 0 ,x))]
-          [test1 (make-test1 0)]
-          [test2 (make-test2 0)]
-          [test12 (make-test1 2)]
-          [test22 (make-test2 2)]
-          [make-clause1 (λ (x) `(* ,x 10))]
-          [make-clause2 (λ (x) `(+ ,x 10))]
-          [clause1 (make-clause1 0)]
-          [clause2 (make-clause2 0)]
-          [clause12 (make-clause1 2)]
-          [clause22 (make-clause2 2)]
-          [cnd (λ (x) `(cond (,(make-test1 x) ,err)
-                             (,(make-test2 x) ,(make-clause1 x))
-                             (else ,(make-clause2 x))))]
-          [make-def (λ (x) `(define (f x) ,(cnd x)))]
-          [def (make-def 'x)]
-          [lam (λ (x) `(lambda (x) ,(cnd x)))])
-     (t 'lazy-cond1 m:lazy
-        ,def (f 0)
-        :: ,def ({f} 0) -> ,def ({,(lam 'x)} 0)
-        :: ,def {(,(lam 'x ) 0)} -> ,def {,(cnd 0)}
-        :: ,def (cond ({,test1} ,err)
-                      (,test2 ,clause1)
-                      (else ,clause2))
-        -> ,def (cond ({false} ,err)
-                      (,test2 ,clause1)
-                      (else ,clause2))
-        :: ,def {(cond (false ,err)
-                       (,test2 ,clause1)
-                       (else ,clause2))}
-        -> ,def {(cond (,test2 ,clause1)
-                       (else ,clause2))}
-        :: ,def (cond ({,test2} ,clause1)
-                      (else ,clause2))
-        -> ,def (cond ({false} ,clause1)
-                      (else ,clause2))
-        :: ,def {(cond (false ,clause1)
-                       (else ,clause2))}
-        -> ,def {(cond (else ,clause2))} 
-        -> ,def {,clause2} -> ,def {10})
-     )
-   (let* ([make-test1 (λ (x) `(> 0 ,x))]
-          [make-test2 (λ (x) `(< 0 ,x))]
-          [test1 (make-test1 0)]
-          [test2 (make-test2 0)]
-          [test12 (make-test1 2)]
-          [test22 (make-test2 2)]
-          [make-clause1 (λ (x) `(* ,x 10))]
-          [make-clause2 (λ (x) `(+ ,x 10))]
-          [clause1 (make-clause1 0)]
-          [clause2 (make-clause2 0)]
-          [clause12 (make-clause1 2)]
-          [clause22 (make-clause2 2)]
-          [cnd (λ (x) `(cond (,(make-test1 x) ,err)
-                             (,(make-test2 x) ,(make-clause1 x))
-                             (else ,(make-clause2 x))))]
-          [make-def (λ (x) `(define (f x) ,(cnd x)))]
-          [def (make-def 'x)]
-          [lam (λ (x) `(lambda (x) ,(cnd x)))])
-     (t 'lazy-cond2 m:lazy
-        ,def (f 2)
-        :: ,def ({f} 2) -> ,def ({,(lam 'x)} 2)
-        :: ,def {(,(lam 'x ) 2)} -> ,def {,(cnd 2)}
-        :: ,def (cond ({,test12} ,err)
-                      (,test22 ,clause12)
-                      (else ,clause22))
-        -> ,def (cond ({false} ,err)
-                      (,test22 ,clause12)
-                      (else ,clause22))
-        :: ,def {(cond (false ,err)
-                       (,test22 ,clause12)
-                       (else ,clause22))}
-        -> ,def {(cond (,test22 ,clause12)
-                       (else ,clause22))}
-        :: ,def (cond ({,test22} ,clause12)
-                      (else ,clause22))
-        -> ,def (cond ({true} ,clause12)
-                      (else ,clause22))
-        :: ,def {(cond (true ,clause12)
-                       (else ,clause22))}
-        -> ,def {,clause12} -> ,def {20})
-     )
-
-   
-   ; lazy-cond3
-   (t 'lazy-cond3 m:lazy
-      (! (cond [false 1] [else 2]))
-      :: {(cond [false 1] [else 2])} -> {(cond [else 2])} -> {2})
-   
-   
-   (t 'lazy-eq? m:lazy
-      (eq? 'a 'a)
-      :: {(eq? 'a'a)} -> {true})
-   (t 'lazy-eqv? m:lazy
-      (eqv? (integer->char 955) (integer->char 955))
-      :: (eqv? {(integer->char 955)} (integer->char 955))
-      -> (eqv? {#\λ} (integer->char 955))
-      :: (eqv? #\λ {(integer->char 955)})
-      -> (eqv? #\λ {#\λ})
-      :: {(eqv? #\λ #\λ)} -> {true})
-   (t 'lazy-equal? m:lazy
-      (equal? (list 1 2) (list 1 2))
-      :: {(equal? (list 1 2) (list 1 2))} -> {true})
-   (t 'lazy-list?1 m:lazy
-      (list? (list 1 2))
-      :: {(list? (list 1 2))} -> {true})
-   (t 'lazy-list?2 m:lazy
-      (list? empty)
-      :: {(list? empty)} -> {true})
-   (t 'lazy-list?3 m:lazy
-      (list? (+ 1 2))
-      :: (list? {(+ 1 2)}) -> (list? {3})
-      :: {(list? 3)} -> {false})
-   (t 'lazy-length m:lazy
-      (length (list 1 2))
-      :: {(length (list 1 2))} -> {2})
-   (t 'lazy-list-ref m:lazy
-      (list-ref (list 1 2) (+ 1 0))
-      :: (list-ref (list 1 2) {(+ 1 0)}) -> (list-ref (list 1 2) {1})
-      :: {(list-ref (list 1 2) 1)} -> {2})
-   (t 'lazy-list-tail m:lazy
-      (list-tail (list 1 2) 1)
-      :: {(list-tail (list 1 2) 1)} -> {(list 2)})
-   (t 'lazy-append m:lazy
-      (append (list 1 2) (list 3 4))
-      :: {(append (list 1 2) (list 3 4))}
-      -> {(cons 1 ,(<delay#> 0))})
-   (t 'lazy-reverse m:lazy
-      (reverse (list 1 2 3))
-      :: {(reverse (list 1 2 3))} -> {(list 3 2 1)})
-   (t 'lazy-empty? m:lazy
-      (empty? (list 1 2))
-      :: {(empty? (list 1 2))} -> {false})
-   (t 'lazy-assoc m:lazy
-      (assoc 1 (list (list 1 2)))
-      :: {(assoc 1 (list (list 1 2)))} -> {(list 1 2)})
-   (t 'lazy-assq m:lazy
-      (assq 1 (list (list 1 2)))
-      :: {(assq 1 (list (list 1 2)))} -> {(list 1 2)})
-   (t 'lazy-assv m:lazy
-      (assv 1 (list (list 1 2)))
-      :: {(assv 1 (list (list 1 2)))} -> {(list 1 2)})
-   (t 'lazy-cons? m:lazy
-      (cons? (list 1 2))
-      :: {(cons? (list 1 2))} -> {true})
-   (t 'lazy-remove m:lazy
-      (remove 2 (list 1 2 3))
-      :: {(remove 2 (list 1 2 3))} -> {(cons 1 ,(<delay#> 0))})
-   (t 'lazy-remq m:lazy
-      (remq 2 (list 1 2 3))
-      :: {(remq 2 (list 1 2 3))} -> {(cons 1 ,(<delay#> 0))})
-   (t 'lazy-remv m:lazy
-      (remv 2 (list 1 2 3))
-      :: {(remv 2 (list 1 2 3))} -> {(cons 1 ,(<delay#> 0))})
-   (t 'lazy-member m:lazy
-      (member 1 (list 1 2))
-      :: {(member 1 (list 1 2))} -> {(list 1 2)})
-   (t 'lazy-memq m:lazy
-      (memq 1 (list 1 2))
-      :: {(memq 1 (list 1 2))} -> {(list 1 2)})
-   (t 'lazy-memv m:lazy
-      (memv 1 (list 1 2))
-      :: {(memv 1 (list 1 2))} -> {(list 1 2)})
-  
-   
-   (t 'lazy-filter1 m:lazy
-      (third (filter (lambda (x) (>= x 3)) '(1 2 3 4 5)))
-      :: (third {(filter (lambda (x) (>= x 3)) (list 1 2 3 4 5))})
-      -> (third (... {(>= 1 3)} ...))
-      -> (third (... {false} ...))
-      :: ... -> (third {,(<delay#> 0)})
-      :: ... -> (third {(>= 2 3)}) -> (third {false})
-      :: ... -> (third {(>= 3 3)}) -> (third {true})
-      :: ... -> (third (cons 3 {(>= 4 3)})) -> (third (cons 3 {true}))
-      :: ... -> (third (cons 3 (cons 4 {(>= 5 3)})))
-      -> (third (cons 3 (cons 4 {true})))
-      :: {(third (cons 3 (cons 4 (cons 5 ,(<delay#> 1)))))} -> {5})
-   
-   ; same as lazy-filter1 except forcing of the list itself shows up as a step
-   ; only difference is in lazy-filter1 a quote (') is used while in lazy-filter2
-   ; a list constructor is used
-   (t 'lazy-filter2 m:lazy
-      (third (filter (lambda (x) (>= x 3)) (list 1 2 3 4 5)))
-      :: (third {(filter (lambda (x) (>= x 3)) (list 1 2 3 4 5))})
-      -> (third (... {(list 1 2 3 4 5)} ...))
-      :: ... -> (third (... {(>= 1 3)} ...)) -> (third (... {false} ...))
-      :: ... -> (third {,(<delay#> 0)})
-      :: ... -> (third {(>= 2 3)}) -> (third {false})
-      :: ... -> (third {(>= 3 3)}) -> (third {true})
-      :: ... -> (third (cons 3 {(>= 4 3)})) -> (third (cons 3 {true}))
-      :: ... -> (third (cons 3 (cons 4 {(>= 5 3)})))
-      -> (third (cons 3 (cons 4 {true})))
-      :: {(third (cons 3 (cons 4 (cons 5 ,(<delay#> 1)))))} -> {5})
-   
-   (t 'lazy-fold m:lazy
-      (+ (foldr (lambda (x y) (+ x y)) 0 '(1 2 3)) 1000)
-      :: (+ {(foldr (lambda (x y) (+ x y)) 0 (list 1 2 3))} 1000)
-      -> (+ {,(<delay#> 0)} 1000)
-      :: ... -> (+ {(+ 1 ,(<delay#> 1))} 1000)
-      :: ... -> (+ (+ 1 {(+ 2 ,(<delay#> 2))}) 1000)
-      :: ... -> (+ (+ 1 (+ 2 {(+ 3 ,(<delay#> 3))})) 1000)
-      :: (+ (+ 1 (+ 2 {(+ 3 0)})) 1000)
-      -> (+ (+ 1 (+ 2 {3})) 1000)
-      :: (+ (+ 1 {(+ 2 3)}) 1000)
-      -> (+ (+ 1 {5}) 1000)
-      :: (+ {(+ 1 5)} 1000)
-      -> (+ {6} 1000)
-      :: {(+ 6 1000)} -> {1006})
-    
-   (let ([def '(define ones (cons 1 ones))])
-     (t 'lazy-cyclic1 m:lazy
-        ,def (+ (second ones) (third ones))
-        :: ,def (+ (second {ones}) (third ones))
-        -> ,def (+ (second {(cons 1 ones)}) (third ones))
-        :: (define ones {ones}) (+ (second {ones}) (third ones)) ; extra step
-        -> (define ones {,(<delay#> 0)}) (+ (second {,(<delay#> 0)}) (third ones))
-        :: ,def (+ {(second (cons 1 ,(<delay#> 0)))} (third ones))
-        -> ,def (+ {1} (third ones))
-        :: ,def (+ 1 (third {ones}))
-        -> ,def (+ 1 (third {(cons 1 ,(<delay#> 0))}))
-        :: ,def (+ 1 {(third (cons 1 ,(<delay#> 0)))})
-        -> ,def (+ 1 {1})
-        :: ,def {(+ 1 1)} -> ,def {2}))
-   
-   ; application in function position -- checks bug fix
-   (let* ([lxx '(lambda (x) x)]
-          [def `(define I ,lxx)])
-     (t 'lazy-fn-app m:lazy
-        ,def ((I I) I)
-        :: ,def (({I} I) I)       -> ,def (({,lxx} I) I)
-        :: ,def ((,lxx {I}) I)    -> ,def ((,lxx {,lxx}) I)
-        :: ,def ({(,lxx ,lxx)} I) -> ,def ({,lxx} I)
-        :: ,def (,lxx {I})        -> ,def (,lxx {,lxx})
-        :: ,def {(,lxx ,lxx)}     -> ,def {,lxx}))
-    
-   
-  #;
-  (t1 'teachpack-callbacks
-     (test-teachpack-sequence
-      "(define (f2c x) x) (convert-gui f2c)" `() ; placeholder
-      ))
-  
-  ;; SYNTAX ERRORS : 
-  
-  (t1 'bad-parens m:upto-int/lam
-      "("
-      `((error "read: expected a `)' to close `('")))
-  
-  #;(t1 'bad-stx-and m:upto-int/lam
-      "(and)"
-      `((error "foo")))
-  
-  (t 'local-struct/i m:intermediate
-     (define (f x) (local ((define-struct a (b c))) x))  (f 1)
-     :: (define (f x) (local ((define-struct a (b c))) x)) {(f 1)}
-     -> (define (f x) (local ((define-struct a (b c))) x)) 
-     {(define-struct a_1 (b c))} {1})
-  
-  (t 'local-struct/ilam m:intermediate-lambda
-     (define (f x) (local ((define-struct a (b c))) x))  (f 1)
-     :: (define (f x) (local ((define-struct a (b c))) x)) {(f 1)}
-     -> (define (f x) (local ((define-struct a (b c))) x)) 
-     {((lambda (x) (local ((define-struct a (b c))) x)) 1)}
-     -> (define (f x) (local ((define-struct a (b c))) x)) 
-     {(define-struct a_1 (b c))} {1})
-  
-  ;; test of require
-  (list 'require-test m:upto-int/lam
-        "(require \"foo.rkt\") (+ a 4)"
-        '((before-after ((require "foo.rkt") (+ (hilite a) 4))
-                        ((require "foo.rkt") (+ (hilite 3) 4)))
-          (before-after ((require "foo.rkt") (hilite (+ 3 4)))
-                        ((require "foo.rkt") (hilite 7))))
-        '(("foo.rkt" "#lang racket \n(provide a) (define a 3)")))
-   
-    
-   
-   ))
-
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-engine.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-engine.rkt
deleted file mode 100644
index 6cdc5fd28b..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-engine.rkt
+++ /dev/null
@@ -1,306 +0,0 @@
-#lang racket
-
-(require stepper/private/shared
-         stepper/private/model
-         tests/utils/sexp-diff
-         lang/run-teaching-program
-         (only-in srfi/13 string-contains)
-         scheme/contract
-         "language-level-model.rkt")
-
-
-(provide (contract-out [string->expanded-syntax-list (-> ll-model? string? (listof syntax?))]
-                       [run-one-test (-> symbol? model-or-models/c string? (listof step?) (listof (list/c string? string?)) boolean?)]))
-
-;; A SIMPLE EXAMPLE OF USING THIS FRAMEWORK:
-
-;; note that this example uses the abbreviation from test-abbrev; don't uncomment it!
-
-#;
-(let* ([defs1 `((define (a x) (+ x 5)) (define b a))]
-       [defs2 (append defs1 `((define c a)))])
-  (apply         ;; you can abstract over this application with a define-syntax
-   run-one-test  
-   (tt 'top-ref4                   ;; - the name of the test
-       m:intermediate              ;; - the language level (or levels) to run in
-       ,@defs1 (define c b) (c 3)  ;; - the expressions to test (everything up to the first ::)
-       :: ,@defs1 (define c {b})   ;; - the steps; the '::' divides steps, repeated '->'s indicate
-       -> ,@defs1 (define c {a})   ;;    that the 'before' of the second step is the 'after' of
-       :: ,@defs2 ({c} 3)          ;;    the first one.  the curly braces indicate the hilighted sexp.
-       -> ,@defs2 ({a} 3)
-       :: ,@defs2 {(a 3)}
-       -> ,@defs2 {(+ 3 5)}
-       -> ,@defs2 {8})))
-
-
-
-
-;; PARAMETERS THAT CONTROL TESTING
-
-(provide test-directory
-         display-only-errors
-         show-all-steps
-         disable-stepper-error-handling)
-
-(define test-directory (find-system-path 'temp-dir))
-
-;; use this parameter to suppress output except in error cases:
-(define display-only-errors (make-parameter #f))
-
-;; use this parameter to show successful steps as well as unsuccessful ones:
-(define show-all-steps (make-parameter #f))
-
-;; use this parameter to prevent the stepper from capturing errors
-;; (so that you can take advantage of DrRacket's error reporting)
-(define disable-stepper-error-handling (make-parameter #f))
-
-
-;; DATA DEFINITIONS:
-
-;; a step is one of 
-;; - `(before-after ,before ,after) where before and after are sexp-with-hilite's
-;; - `(error ,err-msg) where err-msg is a string
-;; - `(before-error ,before ,err-msg) where before is an sexp-with-hilite and err-msg is a string
-;; - `(finished-stepping)
-;; or
-;; - `(ignore)
-(define (step? sexp)
-  (match sexp
-    [(list 'before-after before after) #t]
-    [(list 'error (? string? msg)) #t]
-    [(list 'before-error before (? string? msg)) #t]
-    [(list 'finished-stepping) #t]
-    [(list 'ignore) #t]
-    [else #f]))
-
-;; a model-or-models is one of
-;; - an ll-model, or
-;; - (listof ll-model?)
-(define model-or-models/c (or/c ll-model? (listof ll-model?)))
-
-;; THE METHOD THAT RUNS A TEST:
-
-
-;; run-one-test : symbol? model-or-models? string? steps? extra-files -> boolean?
-
-;; the ll-model determines the behavior of the stepper w.r.t. "language-level"-y things:
-;; how should values be rendered, should steps be displayed (i.e, will the input & output
-;; steps look just the same), etc. If 
-
-;; the string contains a program to be evaluated. The string is an ironclad if blunt way
-;; of ensuring that the program has no syntax information associated with it.
-
-;; the steps lists the desired steps.  The easiest way to understand these is probably just to 
-;; read the code for the comparison given in "compare-steps", below.
-
-;; the extra-files contain a list of other files that must occur in the same directory. 
-
-;; run the named test, return #t if a failure occurred during the test.
-
-(define (run-one-test name models exp-str expected-steps extra-files)
-  (unless (display-only-errors)
-    (printf "running test: ~v\n" name))
-  (let ([error-has-occurred-box (box #f)])
-    (test-sequence/many models exp-str expected-steps extra-files error-has-occurred-box)
-    (if (unbox error-has-occurred-box)
-        (begin (eprintf "...Error has occurred during test: ~v\n" name)
-               #f)
-        #t)))
-
-
-
-(define (string->expanded-syntax-list ll-model exp-str)
-  (define expander-thunk ((string->expander-thunk ll-model exp-str)))
-  (let loop ()
-    (define next (expander-thunk))
-    (cond [(eof-object? next) '()]
-          [else (cons next (loop))])))
-
-
-
-
-
-;; test-sequence/many : model-or-models/c string? steps? -> (void)
-;; run a given test through a bunch of language models (or just one).
-(define (test-sequence/many models exp-str expected-steps extra-files error-box)
-  (cond [(list? models)(for-each (lambda (model) (test-sequence model exp-str expected-steps extra-files error-box))
-                                 models)]
-        [else (test-sequence models exp-str expected-steps extra-files error-box)]))
-
-(define port null)
-
-;; test-sequence : ll-model? string? steps? extra-files? -> (void)
-;; given a language model and an expression and a sequence of steps,
-;; check to see whether the stepper produces the desired steps
-(define (test-sequence the-ll-model exp-str expected-steps extra-files error-box)
-  (parameterize ([current-directory test-directory])
-    (for ([f (in-list extra-files)])
-      (display-to-file (second f) (first f) #:exists 'truncate))
-    (define expander-thunk (string->expander-thunk the-ll-model exp-str))
-    (match the-ll-model
-      [(struct ll-model (namespace-spec render-settings enable-testing?))
-       (unless (display-only-errors)
-         (printf "testing string: ~v\n" exp-str))
-       (test-sequence/core render-settings expander-thunk expected-steps error-box)
-       (close-input-port port)
-       (delete-file "stepper-test")
-       (for ([f (in-list extra-files)])
-         (delete-file (first f)))])))
-
-
-;; given a language level model and a string, produce a thunk that returns
-;; syntax objects expanded in the given language:
-;; EFFECT: creates a file called "stepper-test" in test-directory
-(define (string->expander-thunk the-ll-model exp-str)
-  (parameterize ([current-directory test-directory])
-    (match the-ll-model
-      [(struct ll-model (namespace-spec render-settings enable-testing?))
-       (let ([filename "stepper-test"])
-         (display-to-file exp-str filename #:exists 'truncate)
-         (set! port (open-input-file "stepper-test"))
-         (let* (#;[port (open-input-file filename)]
-                [module-id (gensym "stepper-module-name-")])
-           ;; thunk this so that syntax errors happen within the error handlers:
-           (lambda () (expand-teaching-program port read-syntax namespace-spec '() module-id enable-testing?))))])))
-
-;; test-sequence/core : render-settings? boolean? syntax? steps?
-;; this is a front end for calling the stepper's "go"; the main 
-;; responsibility here is to fake the behavior of DrRacket and collect the
-;; resulting steps.
-(define (test-sequence/core render-settings expanded-thunk expected-steps error-box)
-  (let* ([current-error-display-handler (error-display-handler)]
-         [all-steps
-          (append expected-steps '((finished-stepping)))]
-         ;; the values of certain parameters aren't surviving; create 
-         ;; lexical bindings for them:
-         [current-show-all-steps (show-all-steps)]
-         [current-display-only-errors (display-only-errors)]
-         [receive-result
-          (lambda (result)
-            (if (null? all-steps)
-                (warn error-box
-                      'test-sequence
-                      "ran out of expected steps. Given result: ~v" result)
-                (begin
-                  (if (compare-steps result (car all-steps) error-box)
-                      (when (and current-show-all-steps (not current-display-only-errors))
-                        (printf "test-sequence: steps match for expected result: ~v\n"
-                                (car all-steps)))
-                      (warn error-box
-                            'test-sequence
-                            "steps do not match\n   given: ~v\nexpected: ~v"
-                            (show-result result error-box)
-                            (car all-steps)))
-                  (set! all-steps (cdr all-steps)))))]
-         [iter-caller
-          (lambda (init iter)
-            (init)
-            (call-iter-on-each (expanded-thunk) iter))])
-    (let/ec escape
-      (parameterize ([error-escape-handler (lambda () (escape (void)))])
-        (go iter-caller receive-result render-settings
-            #:disable-error-handling? (disable-stepper-error-handling))))
-    (error-display-handler current-error-display-handler)))
-
-(define-namespace-anchor n-anchor)
-
-;; it seems to be okay to use the same namespace for all of the tests... 
-(define test-namespace (make-base-namespace))
-(namespace-attach-module (namespace-anchor->empty-namespace n-anchor)
-                         'mzlib/pconvert-prop
-                         test-namespace)
-(namespace-attach-module (namespace-anchor->empty-namespace n-anchor)
-                         'racket/private/promise
-                         test-namespace)
-(parameterize ([current-namespace test-namespace])
-    (namespace-require 'test-engine/racket-tests)
-    ;; make the test engine happy by adding a binding for test~object:
-    (namespace-set-variable-value! 'test~object #f))
-
-;; call-iter-on-each : (-> syntax?) (syntax? (-> 'a) -> 'a) -> void/c
-;; call the given iter on each syntax in turn (iter bounces control
-;; back to us by calling the followup-thunk).
-(define (call-iter-on-each stx-thunk iter)
-  (parameterize ([current-namespace test-namespace])
-    (let iter-loop ()
-      (let* ([next (stx-thunk)]
-             [followup-thunk (if (eof-object? next) 
-                                 void
-                                 iter-loop)]
-             [expanded (expand next)])
-        ;;(printf "~v\n" expanded)
-        (iter expanded followup-thunk)))))
-
-
-(define (warn error-box who fmt . args)
-  (set-box! error-box #t)
-  (eprintf "~a: ~a\n" who (apply format fmt args)))
-
-
-;; (-> step-result? sexp? boolean?)
-(define (compare-steps actual expected error-box)
-  (match expected
-    [`(before-after ,before ,after)
-     (and (before-after-result? actual)
-          (andmap (lambda (fn expected name)
-                    (unless (list? (fn actual))
-                      (warn error-box
-                            'compare-steps "not a list: ~v"
-                            (syntax->hilite-datum (fn actual))))
-                    (noisy-equal? (map syntax->hilite-datum
-                                       (fn actual))
-                                  expected
-                                  name
-                                  error-box))
-                  (list before-after-result-pre-exps
-                        before-after-result-post-exps)
-                  (list before after)
-                  (list 'before 'after)))]
-    [`(error ,err-msg)
-     (and (error-result? actual)
-          (string-contains (error-result-err-msg actual) err-msg))]
-    [`(before-error ,before ,err-msg)
-     (and (before-error-result? actual)
-          (and (noisy-equal? (map syntax->hilite-datum
-                                  (before-error-result-pre-exps actual))
-                             before
-                             'before
-                             error-box)
-               (equal? err-msg (before-error-result-err-msg actual))))]
-    [`(finished-stepping) (finished-stepping? actual)]
-    [`(ignore) (warn error-box 
-                     'compare-steps "ignoring one step") #t]
-    [else (begin (warn error-box 
-                       'compare-steps
-                       "unexpected expected step type: ~v" expected)
-                 #f)]))
-
-
-
-;; used to display results in an error message
-(define (show-result r error-box)
-  (if (before-after-result? r)
-      (list 'before-after-result
-            (map (lambda (fn)
-                   (unless (list? (fn r))
-                     (warn error-box 
-                           'show-result "not a list: ~v"
-                           (syntax->hilite-datum (fn r))))
-                   (map syntax->hilite-datum
-                        (fn r)))
-                 (list before-after-result-pre-exps
-                       before-after-result-post-exps)))
-      r))
-
-;; noisy-equal? : (any any . -> . boolean)
-;; like equal?, but prints a noisy error message
-(define (noisy-equal? actual expected name error-box)
-  (if (equal? actual expected)
-      #t
-      (begin (warn error-box 'not-equal?
-                   "~.s:\nactual:   ~e =/= \nexpected: ~e\n  here's the diff: ~e" name actual expected (sexp-diff actual expected))
-             #f)))
-
-
-
-
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-or.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-or.rktl
deleted file mode 100644
index 6cf89a7347..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/test-or.rktl
+++ /dev/null
@@ -1,3 +0,0 @@
-(define a 3)
-
-(or #f a #t)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/through-tests.rkt b/pkgs/htdp-pkgs/htdp-test/tests/stepper/through-tests.rkt
deleted file mode 100755
index b5914bb6f0..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/through-tests.rkt
+++ /dev/null
@@ -1,125 +0,0 @@
-#lang racket
-
-(require (only-in stepper/private/model stepper-model-debug?)
-         (prefix-in m: "language-level-model.rkt")
-         "test-engine.rkt"
-         "test-cases.rkt"
-         
-         ;; poor man's testing:
-         "annotation.rkt"
-         
-         ;; for xml testing:
-         ;; mzlib/class
-         ;; (all-except xml/xml-snipclass snip-class)
-         ;; (all-except xml/scheme-snipclass snip-class)
-         ;; mred
-
-         )
-
-(require stepper/private/annotate)
-
-
-
-(provide run-test run-tests run-all-tests run-all-tests-except)
-
-
-(define list-of-tests null)
-
-(define (add-test test)
-  (match test
-    [(list name models string expected-steps extra-files)
-     (unless (symbol? name)
-       (error 'add-test "expected name to be a symbol, got: ~e" name))
-     (unless (or (m:ll-model? models)
-                 (and (list? models) (andmap m:ll-model? models)))
-       (error 'add-test "expected models to be a list of models, got: ~e" models))
-     (unless (string? string)
-       (error 'add-test "expected string to be a string, got: ~e" string))
-     (unless (list? expected-steps)
-       (error 'add-test "expected expected-steps to be a list, got: ~e" expected-steps))
-     (match extra-files
-       [(list (list (? string? filename) (? string? content)) ...) #t]
-       [other (error 'add-test 
-                     "expected list of extra file specifications, got: ~e" 
-                     other)])
-     (when (assq name list-of-tests)
-       (error 'add-test "name ~v is already in the list of tests" name))
-     (set! list-of-tests 
-           (append list-of-tests 
-                   (list (list name
-                               (rest test)))))]))
-
-;; add all the tests imported from the test cases file(s):
-(for-each add-test the-test-cases)
-
-
-
-;; run a test : (list symbol test-thunk) -> boolean
-;; run the named test, return #t if a failure occurred during the test
-(define (run-one-test/helper test-pair)
-  (apply run-one-test (car test-pair) (cadr test-pair)))
-
-(define (run-all-tests)
-  (andmap/no-shortcut 
-   run-one-test/helper
-   list-of-tests))
-
-(define (run-all-tests-except nix-list)
-  (andmap/no-shortcut 
-   run-one-test/helper
-   (filter (lambda (pr) (not (member (car pr) nix-list)))
-           list-of-tests)))
-
-(define (run-test name)
-  (let ([maybe-test (assq name list-of-tests)])
-    (if maybe-test
-        (run-one-test/helper maybe-test)
-        (error 'run-test "test not found: ~.s" name))))
-
-(define (run-tests names)
-  (ormap/no-shortcut run-test names))
-
-
-;; like an ormap, but without short-cutting
-(define (ormap/no-shortcut f args)
-  (foldl (lambda (a b) (or a b)) #f (map f args)))
-
-(define (andmap/no-shortcut f args)
-  (foldl (lambda (a b) (and a b)) #t (map f args)))
-
-
-  
-  (provide ggg)
-  ;; run whatever tests are enabled (intended for interactive use):
-  (define (ggg)
-    ;; NB: unlike standard linux config-file convention, the values
-    ;; associated with the commented-out parameters are *not* the 
-    ;; default ones, but rather the ones you're likely to want
-    ;; to use instead of the default.
-    (parameterize (#;[disable-stepper-error-handling #t]
-                   #;[display-only-errors #t]
-                   #;[store-steps #f]
-                   #;[show-all-steps #t]
-                   #;[stepper-model-debug? #t])
-      #;(run-tests '(check-expect forward-ref check-within check-within-bad
-                                  check-error check-error-bad))
-      #;(run-tests '(teachpack-universe))
-      #;(run-test 'temp-letrec)
-      (run-all-tests)
-
-      #;(string->expanded-syntax-list m:mz "(if true 3 4)"
-                                    #;"(define (a3 x) (if true x x))")
-      #;(string->expanded-syntax-list m:intermediate "(letrec ([z 19] [a (lambda (x) (a x))] [b 4]) (+ (a 4) b))")
-      
-      #;(syntax-case
-          (first (string->expanded-syntax-list m:intermediate 
-                                               "(if true 3 4)"
-                                               #;"(letrec ([z 19] [a (lambda (x) (a x))] [b 4]) (+ (a 4) b))"))
-        ()
-        [(_ _ _ 
-            (_ _ (_ _ (_ _ it) _))) #'it])
-      ))
-
-
-
-
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/two-tests.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/two-tests.rktl
deleted file mode 100644
index 468cd03e70..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/two-tests.rktl
+++ /dev/null
@@ -1,8 +0,0 @@
-(define (mult a b) (* a b))
-(define g (if #f mult +))
-(define (f a b)  (g 3 4))
-(f 5 6)
-
-;(define (f x) x)
-;(define g +)
-;g
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/unannotated.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/unannotated.rktl
deleted file mode 100644
index 4b24ac5494..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/unannotated.rktl
+++ /dev/null
@@ -1,14 +0,0 @@
-(define (squar x) (* x x))
-
-(define (square-all list-of-numbers)
-  (map squar list-of-numbers))
-
-(define (my-map a-list)
-  (cond [(empty? a-list) empty]
-        [else (cons (square-all (car a-list))
-                    (my-map (cdr a-list)))]))
-
-(my-map (cons (cons 1 (cons 3 (cons 14 empty)))
-              (cons (cons 3 (cons 4 empty))
-                    (cons (cons 43 empty)
-                          empty))))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/undefined.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/undefined.rktl
deleted file mode 100644
index 587be6b4c3..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/undefined.rktl
+++ /dev/null
@@ -1 +0,0 @@
-x
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/world-test.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/world-test.rktl
deleted file mode 100644
index c9c0b2caec..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/world-test.rktl
+++ /dev/null
@@ -1,10 +0,0 @@
-(define (next t)
-  (+ t 1))
-
-(define (image t)
-  (place-image (circle 3 'solid 'red) 20 t (empty-scene 50 50)))
-
-;; --- run program run
-(big-bang 50 50 .1 0)
-(on-redraw image)
-(on-tick-event next)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/stepper/write-display.rktl b/pkgs/htdp-pkgs/htdp-test/tests/stepper/write-display.rktl
deleted file mode 100644
index 6ae3cae484..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/stepper/write-display.rktl
+++ /dev/null
@@ -1,3 +0,0 @@
-(define (f x) "some string")
-
-(f 3)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/test-engine/TestEngineTest.rkt b/pkgs/htdp-pkgs/htdp-test/tests/test-engine/TestEngineTest.rkt
deleted file mode 100644
index cf59e5e7a2..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/test-engine/TestEngineTest.rkt
+++ /dev/null
@@ -1,139 +0,0 @@
-;; The first three lines of this file were inserted by DrRacket. They record metadata
-;; about the language level of this file in a form that our tools can easily process.
-#reader(lib "htdp-advanced-reader.ss" "lang")((modname TestEngineTest) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #t #t none #f ())))
-;; *****************************************************************************
-;; Expect 44 checks, 20 failures, the last one is finel
-;; *****************************************************************************
-;; 3 additonals must be uncommented to check error message for check-satisfied
-
-;; ---------------------------------------------------------------------------------------------------
-;; MF: This test suite calls for serious re-organization: 
-;; -- BSL issues with check-satisfied 
-;; -- ISL issues for check-random 
-;; -- ASL issues for check-random
-;; -- error message checking for check-expect 
-;; -- ordinary usage 
-
-(define (count f)
-  (cond
-    [(zero? f) 1]
-    [else (add1 (count (sub1 f)))]))
-
-(check-expect (count 3) 3) ; fails
-(check-expect (count 3) 4)
-
-(check-within 1.345 1.3 .05)
-(check-within 1.345 1.3 .005) ; fails
-
-(check-expect (cons 1 (cons 2 (cons 3 empty))) (cons 2 (cons 2 (cons 2 empty)))) ;fails
-(check-expect (cons 1 (cons 2 (cons 3 empty))) empty) ;fails
-(check-expect (cons 1 (cons 2 (cons 3 empty))) (cons 1 (cons 2 (cons 3 empty))))
-(check-within (cons 1 (cons 2 (cons 3 empty))) (cons 1.1 (cons 2.1 (cons 3.1 empty))) .2)
-(check-within (cons 1 (cons 2 (cons 3 empty))) (cons 1.1 (cons 2.1 (cons 3.1 empty))) .01) ;fails
-
-(check-expect 'red 'blue) ;fails
-(check-expect 'red 'red)
-(check-within 'red 'red .002)
-(check-expect 'red "red") ;fails
-
-(check-expect "red" "red")
-(check-expect "red " "red") ;fails
-(check-expect "Hello" "red") ;fails
-(check-within "hello" "Hello" .03) ;fails
-
-(define-struct ball (point rad color))
-(define blue-ball (make-ball (make-posn 1 3) 3.4 "blue"))
-
-(check-expect (make-ball 4 5 'blue) (make-ball 4 5 'blue))
-(check-expect (make-ball (make-posn 1 2) 3.5 'blue) (make-ball (make-posn 1 2) 3.5 'blue))
-(check-expect (make-ball 3 (make-posn 1 2) "blue") (make-ball (make-posn 1 2) 3.3 "blue")) ;fails
-(check-within blue-ball (make-ball (make-posn 1 3) 3.3 "blue") .1)
-(check-within blue-ball (make-ball (make-posn 1 3) 3.3 "blue") .01) ;fails
-
-(check-error (error 'test "hi") "test: hi")
-(check-error (/ 1 0) "/: division by zero")
-(check-error 3 "some message") ;fails
-(check-error (first empty) "another message") ;fails
-
-(define (create n)
-  (make-ball n n 'blue))
-
-(check-member-of (create 1) (make-ball 1 2 'blue) (make-ball 1 1 'blue) (make-ball 1 2 'red) 'red)
-(check-member-of 1 1 1 1 1)
-(check-member-of (create 2) (make-ball 1 2 'blue) (make-ball 1 1 'blue) (make-ball 1 2 'red) 'fails)
-
-(check-range 5 0 10)
-(check-range 0 0 10)
-(check-range 10 0 10)
-(check-range 11 0 10) ;fails
-(check-range 5.01 0 10.5)
-(check-range 0.0 0 10.5)
-(check-range 10.5 0 10.5)
-(check-range 10.5001 0 10.5) ;fails
-
-;; ---------------------------------------------------------------------------------------------------
-;; MF: from DVH 
-
-(define (random-elt ls) (list-ref ls (random (length ls))))
-
-(check-random (random-elt (build-list 100 identity))
-              (list-ref (build-list 100 identity) (random 100)))
-
-
-(define (f _x)
-  (list (random 10) (random 20)))
-
-(define (g _x)
-  (list (random 10) (random 20)))
-
-(check-random (f 0) (list (random 10) (random 20)))
-
-(check-random (g 0)
-              (let* ((x2 (random 20))
-                     (x1 (random 10)))
-                (list x1 x2))) ;; fails 
-
-(define (h _x) (first (list (random 50) (random 20))))
-
-(check-random (h 0) (begin0 (random 50) (random 20)))
-
-(check-random (h 0) (begin (random 20) (random 50))) ;; fails 
-  
-
-
-;; ---------------------------------------------------------------------------------------------------
-;; MF: for SK 
-
-#;
-(check-satisfied
- (random 10)
- (lambda (x) #f))
-; => "check-satisfied: expects named function in second position."
-
-#;
-(check-satisfied
- 3
- equal?)
-; => "check-satisfied: expects function of one argument in second position. Given equal?"
-
-
-(check-satisfied 
- (random 10)
- between-0-and-10?)
-
-(define (between-0-and-10? x)
-  (member x (list 0 1 2 3 4 5 6 7 8 9)))
-
-(check-satisfied 4 odd?) ;; fails 
-
-;; -----------------------------------------------------------------------------
-
-(define (long? x)
-  (lambda (y)
-    (< (string-length (substring y 0 1)) x)))
-
-(define long10 (long? 10))
-#;
-(check-satisfied (trigger-exn-in-pred "") long10)
-
-(define (trigger-exn-in-pred x) x)
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/test-engine/info.rkt b/pkgs/htdp-pkgs/htdp-test/tests/test-engine/info.rkt
deleted file mode 100644
index 74bebc1edf..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/test-engine/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all kathyg)))
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/xml/xml-snip-bug.rkt b/pkgs/htdp-pkgs/htdp-test/tests/xml/xml-snip-bug.rkt
deleted file mode 100644
index 751dfda608..0000000000
--- a/pkgs/htdp-pkgs/htdp-test/tests/xml/xml-snip-bug.rkt
+++ /dev/null
@@ -1,3940 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket, or DrScheme version 4.2.5.12 or later
-   to read it.
-
-            http://racket-lang.org/
-|#
- 44 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wxmedia\0"
-4 1 8 #"wximage\0"
-2 0 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 40 #"(lib \"image-core.ss\" \"2htdp\" \"private\")\0"
-1 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 8 #"gb:core\0"
-5 0 10 #"gb:canvas\0"
-5 0 17 #"gb:editor-canvas\0"
-5 0 10 #"gb:slider\0"
-5 0 9 #"gb:gauge\0"
-5 0 11 #"gb:listbox\0"
-5 0 12 #"gb:radiobox\0"
-5 0 10 #"gb:choice\0"
-5 0 8 #"gb:text\0"
-5 0 11 #"gb:message\0"
-5 0 10 #"gb:button\0"
-5 0 12 #"gb:checkbox\0"
-5 0 18 #"gb:vertical-panel\0"
-5 0 9 #"gb:panel\0"
-5 0 20 #"gb:horizontal-panel\0"
-5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0"
-1 0 56
-#"(lib \"hrule-snip.ss\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 15 #"test-case-box%\0"
-2 0 1 6 #"wxloc\0"
-          0 0 1277 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 12 #"Courier New\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 150 0 150 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 175 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 37 #"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 38 #"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 41 128 38 0
-0 0 -1 -1 2 37 #"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 41 128 38 0
-0 0 -1 -1 2 39 #"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 41 128 38 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 42 #"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 36 #"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 36 #"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 81 112 203 0
-0 0 -1 -1 2 38 #"drscheme:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 81 112 203 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
-#"drscheme:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 0 203 0 0
-0 -1 -1 2 31 #"drscheme:check-syntax:imported\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 0 203 0 0
-0 -1 -1 2 37 #"datalog:syntax-colors:scheme:keyword\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 41 #"datalog:syntax-colors:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 36 #"datalog:syntax-colors:scheme:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 37 #"datalog:syntax-colors:scheme:comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 35 #"datalog:syntax-colors:scheme:error\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 160 32 240 0
-0 0 -1 -1 2 40 #"datalog:syntax-colors:scheme:identifier\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 160 32 240 0
-0 0 -1 -1 2 37 #"datalog:syntax-colors:scheme:default\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 8 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 8 24
-#"drscheme:text:ports err\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
--1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
--1 0 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 200 0 0 0 0 0 -1 -1 0 1
-#"\0"
-0 75 12 #"Courier New\0"
-0.0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 255 255 0 -1 -1 0
-1 #"\0"
-0 75 1 #"\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 15 #"Lucida Console\0"
-0.0 10 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 41 #"profj:syntax-colors:scheme:block-comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:keyword\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 37 #"profj:syntax-colors:scheme:prim-type\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 38 #"profj:syntax-colors:scheme:identifier\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 34 #"profj:syntax-colors:scheme:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:literal\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 33 #"profj:syntax-colors:scheme:error\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 35 #"profj:syntax-colors:scheme:default\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 37 #"profj:syntax-colors:scheme:uncovered\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 35 #"profj:syntax-colors:scheme:covered\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 0 1 #"\0"
-0 75 7 #"Monaco\0"
-0.0 12 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 26 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 17 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 26 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 65 105 225 0
-0 0 -1 -1 26 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 90 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 0 1 #"\0"
-0 75 23 #"Lucida Sans Typewriter\0"
-0.0 12 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 14 #"Html Standard\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 4 1
-#"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 148 0 211 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 4 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 2 40 #"framework:syntax-coloring:scheme:symbol\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 41 #"framework:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 41 #"framework:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 40 #"framework:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 41 128 38 0
-0 0 -1 -1 2 42 #"framework:syntax-coloring:scheme:constant\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 41 128 38 0
-0 0 -1 -1 2 45 #"framework:syntax-coloring:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 39 #"framework:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 39 #"framework:syntax-coloring:scheme:other\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 49 #"drscheme:check-syntax:lexically-bound-identifier\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 81 112 203 0
-0 0 -1 -1 2 42 #"drscheme:check-syntax:imported-identifier\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 0 203 0 0
-0 -1 -1 2 37 #"profj:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 39 #"profj:syntax-coloring:scheme:prim-type\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 40 #"profj:syntax-coloring:scheme:identifier\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 36 #"profj:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 37 #"profj:syntax-coloring:scheme:literal\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 37 #"profj:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 35 #"profj:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 37 #"profj:syntax-coloring:scheme:default\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 39 #"profj:syntax-coloring:scheme:uncovered\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 37 #"profj:syntax-coloring:scheme:covered\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 255 255
-0 0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 128 106 255
-0 0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 119 255 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 47 208 28 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 65 209 60 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 203 91 55 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-0.0 15 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-2.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 -2 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 -2 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 50 205 50 0
-0 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-2.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-2.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-2.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 153 0 0 0 0
-0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.2 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.2 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.2 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.2 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 0 -1 101 1 #"\0"
-0 70 1 #"\0"
-0.6000000000000001 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0
-1.0 0 0 255 0 0 0 0 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-2.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 64 108 0
-0 0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 0 -1 2 36 #"honu:syntax-coloring:scheme:keyword\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 40 #"honu:syntax-coloring:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 35 #"honu:syntax-coloring:scheme:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 36 #"honu:syntax-coloring:scheme:literal\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 36 #"honu:syntax-coloring:scheme:comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 34 #"honu:syntax-coloring:scheme:error\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 39 #"honu:syntax-coloring:scheme:identifier\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 36 #"honu:syntax-coloring:scheme:default\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-0 -1 101 1 #"\0"
-0 70 1 #"\0"
-0.75 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-2.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 -2 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 -2 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 50 205 50 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 0 -1 2 1 #"\0"
-0 70 1 #"\0"
-0.6000000000000001 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0
-1.0 0 0 255 0 0 0 0 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 153 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 0 1 #"\0"
-0 75 8 #"Courier\0"
-0.0 14 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 4 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 175 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 2 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 2 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 2 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-2.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-2.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-0.75 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 94 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 200 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0
-0 0 -1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 2 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 2 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0
-0 0 -1 -1 111 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 107 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 106 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 110 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 111 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 106 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 110 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 111 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 106 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 108 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 107 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 110 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.2000000476837158 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0
-1.0 0 0 0 0 0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.2000000476837158 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0
-1.0 0 0 255 0 0 0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 64 108 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-0.800000011920929 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0
-1.0 0 0 255 0 0 0 0 -1 2 1 #"\0"
-0 70 1 #"\0"
-0.6000000238418579 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0
-1.0 0 0 255 0 0 0 0 -1 2 1 #"\0"
-0 70 1 #"\0"
-0.800000011920929 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0
-1.0 0 0 0 0 0 0 1 -1 2 1 #"\0"
-0 70 1 #"\0"
-0.800000011920929 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0
-1.0 0 0 0 0 0 0 1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 64 108 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 60 248 52 0
-0 0 -1 -1 2 1 #"\0"
-0 70 6 #"Arial\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Arial\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 70 6 #"Arial\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 70 6 #"Arial\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0
-0 0 -1 -1 2 1 #"\0"
-0 70 6 #"Arial\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0
-0 0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 153 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-0.800000011920929 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0
-1.0 68 64 108 0 0 0 0 -1 2 1 #"\0"
-0 70 1 #"\0"
-0.800000011920929 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0
-1.0 0 0 0 0 0 0 0 -1 2 1 #"\0"
-0 75 1 #"\0"
-0.800000011920929 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0
-1.0 132 60 36 0 0 0 0 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 81 112 204 0
-0 0 -1 -1 2 47 #"drscheme:check-syntax:lexically-bound-variable\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 81 112 204 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 122 81 204 0
-0 0 -1 -1 2 40 #"drscheme:check-syntax:imported-variable\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 122 81 204 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 51 204 0 0
-0 -1 -1 2 45 #"drscheme:check-syntax:lexically-bound-syntax\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 51 204 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 0 204 0 0
-0 -1 -1 2 38 #"drscheme:check-syntax:imported-syntax\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 0 204 0 0
-0 -1 -1 0 1 #"\0"
-0 75 8 #"Courier\0"
-0.0 14 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 37 #"syntax-coloring:Scheme Color:keyword\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 36 #"syntax-coloring:Scheme Color:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 37 #"syntax-coloring:Scheme Color:literal\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 105 105 105
-0 0 0 -1 -1 2 37 #"syntax-coloring:Scheme Color:comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 105 105 105
-0 0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0
-0 0 -1 -1 2 35 #"syntax-coloring:Scheme Color:error\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 2 40 #"syntax-coloring:Scheme Color:identifier\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 35 #"syntax-coloring:Scheme Color:other\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 40 25 15 0 0
-0 -1 -1 2 30 #"drscheme:check-syntax:keyword\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 40 25 15 0 0
-0 -1 -1 2 39 #"drscheme:check-syntax:unbound-variable\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 2 37 #"drscheme:check-syntax:bound-variable\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 2 32 #"drscheme:check-syntax:primitive\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 51 135 39 0
-0 0 -1 -1 2 31 #"drscheme:check-syntax:constant\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 51 135 39 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 165 0 0
-0 0 -1 -1 2 32 #"drscheme:check-syntax:tail-call\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 165 0 0
-0 0 -1 -1 2 27 #"drscheme:check-syntax:base\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 29 #"syntax-coloring:Java:keyword\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 2 28 #"syntax-coloring:Java:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 2 29 #"syntax-coloring:Java:literal\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 2 29 #"syntax-coloring:Java:comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 105 105 105
-0 0 0 -1 -1 2 27 #"syntax-coloring:Java:error\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 139 0 0
-0 -1 -1 2 32 #"syntax-coloring:Java:identifier\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 139 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 169 169 169
-0 0 0 -1 -1 2 29 #"syntax-coloring:Java:default\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 169 169 169
-0 0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 40 25 15 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 165 0 0
-0 0 -1 -1 0 1 #"\0"
-0 75 1 #"\0"
-0.0 12 90 -1 90 -1 3 -1 0 1 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 8 #"Courier\0"
-0.0 12 90 -1 90 -1 1 -1 0 1 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 12 90 90 90 90 3 3 0 1 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255 255
-255 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 40 25 15 0 0 0
-1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 51 135 39 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 0 1 #"\0"
-0 75 8 #"Courier\0"
-0.0 13 90 -1 90 -1 1 -1 0 1 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 150 0 150 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 175 0 0
-0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 0 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0 0
-1 1 0 13 #"h-link-style\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0 0
-1 1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 2 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 2 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 2 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-1 330 335 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 335 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0
-0 0 -1 -1 338 1 #"\0"
-1 330 2 1 #"\0"
-0 -1 1 #"\0"
-2.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 340 1 #"\0"
-1 330 341 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 341 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 344 1 #"\0"
-1 330 2 1 #"\0"
-0 -1 1 #"\0"
-0.75 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 335 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 0 1 #"\0"
-0 75 1 #"\0"
-0.0 12 90 90 90 90 3 3 0 1 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255 255
-255 1 1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0 0
-0 1 1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 90 90 90 90 3 3 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0 0
-0 1 1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0 0
-1 1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0 0
-1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0 0
-1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 128 0 0 0
-1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 165 42 42 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 150 0 150 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 94 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0 0
-1 1 0 1 #"\0"
-0 75 7 #"Monaco\0"
-0.0 12 90 90 90 90 3 3 0 1 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255 255
-255 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 0 1 #"\0"
-0 70 1 #"\0"
-0.0 12 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 2 1 #"\0"
-0 70 1 #"\0"
-2.0 0 92 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 0 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 363 1 #"\0"
-1 330 0 1 #"\0"
-0 70 1 #"\0"
-1.0 -2 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 365 1 #"\0"
-1 330 364 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 50 205 50 0 0
-0 1 1 0 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 93 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 93 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0 0
-0 1 1 369 1 #"\0"
-1 330 362 1 #"\0"
-1 330 371 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 371 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 93 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 335 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 93 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0 0
-0 1 1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0 0
-0 1 1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 153 0 0 0 0 0
-1 1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 2 1 #"\0"
-0 70 1 #"\0"
-1.5 0 92 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 382 1 #"\0"
-1 330 335 1 #"\0"
-0 70 1 #"\0"
-0.800000011920929 0 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0
-0 0 0 0 0 0 0 1 335 1 #"\0"
-0 70 1 #"\0"
-0.6000000238418579 0 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0
-0 0 0 0 0 0 0 1 2 1 #"\0"
-0 70 1 #"\0"
-1.2000000476837158 0 92 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0
-0 0 0 0 0 0 1 1 386 1 #"\0"
-1 330 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0 0
-0 1 1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 64 108 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 -2 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 0 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0 0
-0 1 1 0 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 153 0 0 0 0 0
-1 1 0 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0 0
-0 1 1 0 1 #"\0"
-0 70 1 #"\0"
-1.2000000476837158 0 92 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0
-0 0 0 0 0 0 1 1 394 1 #"\0"
-1 330 0 1 #"\0"
-1 330 0 1 #"\0"
-0 70 1 #"\0"
-1.5 0 92 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 397 1 #"\0"
-1 330 0 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 396 1 #"\0"
-0 70 1 #"\0"
-0.800000011920929 0 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0
-0 0 0 0 0 0 0 1 396 1 #"\0"
-0 70 1 #"\0"
-0.6000000238418579 0 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0
-0 0 0 0 0 0 0 1 396 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 93 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 0 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 93 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0 0
-0 1 1 403 1 #"\0"
-1 330 335 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0 0
-0 1 1 399 1 #"\0"
-1 330 406 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0 0
-0 1 1 396 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0 0
-0 1 1 0 1 #"\0"
-0 75 7 #"Monaco\0"
-0.0 10 90 90 90 90 3 3 0 1 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255 255
-255 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 175 0 0 0
-1 1 0 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 200 0 0 0 0 0
-1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 60 248 52 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 -1 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 94 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255 255
-0 1 1 43 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 1
-1 43 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 178 34 34
-255 255 255 -1 -1 0 1 #"\0"
-0 75 8 #"Courier\0"
-0.0 14 90 -1 90 -1 1 -1 0 1 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 165 0 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 -3 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 3 0 153 0 0 0
-1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 -3 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 102 102 102 0
-0 0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0 0
-0 1 1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 12 90 -1 90 -1 3 -1 0 1 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 90 90 90 90 3 3 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 160 32 240 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 90 90 90 3 3 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 90 90 90 90 3 3 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0 0
-0 1 1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 -1 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 153 0 0 0 0
-0 -1 -1 0 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 1 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 -1 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0
-0 0 -1 -1 2 1 #"\0"
-0 70 6 #"Arial\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 60 248 52 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 0 -1 -1 111 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 106 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 109 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 111 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 107 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 106 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 110 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 0 1 #"\0"
-0 75 8 #"Courier\0"
-0.0 13 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 75 1 #"\0"
-0.800000011920929 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0
-1.0 36 36 140 0 0 0 1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 69 0 255
-69 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 99 71
-255 99 71 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 139 0 0 139
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 248 20 64
-248 20 64 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 178 34 34
-178 34 34 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 220 20 60
-220 20 60 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 20 147
-255 20 147 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 176 48 96
-176 48 96 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 205 92 92
-205 92 92 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 199 21 133
-199 21 133 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 208 32 144
-208 32 144 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 240 128 128
-240 128 128 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 105 180
-255 105 180 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 219 112 147
-219 112 147 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 182 193
-255 182 193 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 188 143 143
-188 143 143 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 192 203
-255 192 203 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 218 112 214
-218 112 214 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 240 245
-255 240 245 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 250 250
-255 250 250 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 210 105 30
-210 105 30 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 139 69 19
-139 69 19 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 132 60 36
-132 60 36 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 140 0
-255 140 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 127 80
-255 127 80 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 160 82 45
-160 82 45 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0
-255 165 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 128 114
-250 128 114 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 205 133 63
-205 133 63 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 184 134 11
-184 134 11 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 218 165 32
-218 165 32 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 244 164 96
-244 164 96 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 160 122
-255 160 122 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 233 150 122
-233 150 122 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 215 0
-255 215 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 255 0
-255 255 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 128 128 0
-128 128 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 222 184 135
-222 184 135 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 210 180 140
-210 180 140 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 222 173
-255 222 173 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 218 185
-255 218 185 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 240 230 140
-240 230 140 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 189 183 107
-189 183 107 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 228 181
-255 228 181 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 245 222 179
-245 222 179 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 228 196
-255 228 196 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 238 232 170
-238 232 170 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 235 205
-255 235 205 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 234 234 173
-234 234 173 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 239 213
-255 239 213 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 228 225
-255 228 225 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 250 205
-255 250 205 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 235 215
-250 235 215 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 248 220
-255 248 220 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 250 210
-250 250 210 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 253 245 230
-253 245 230 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 240 230
-250 240 230 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 255 224
-255 255 224 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 245 238
-255 245 238 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 245 245 220
-245 245 220 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 250 240
-255 250 240 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 255 240
-255 255 240 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 60 248 52 60
-248 52 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 124 252 0
-124 252 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 127 255 0
-127 255 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 173 255 47
-173 255 47 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 154 205 50
-154 205 50 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 107 142 35
-107 142 35 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 85 107 47 85
-107 47 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 143 188 139
-143 188 139 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 255 0 0
-255 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 100 0 0
-100 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 50 205 50 50
-205 50 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 34 139 34 34
-139 34 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 255 127 0
-255 127 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 250 154 0
-250 154 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 46 139 87 46
-139 87 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 60 179 113
-60 179 113 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 112 216 144
-112 216 144 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 144 238 144
-144 238 144 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 152 251 152
-152 251 152 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 102 205 170
-102 205 170 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 64 224 208
-64 224 208 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 32 178 170
-32 178 170 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 72 209 204
-72 209 204 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 240 255 240
-240 255 240 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 245 255 250
-245 255 250 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 65 105 225
-65 105 225 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 30 144 255
-30 144 255 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 191 255 0
-191 255 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 100 149 237
-100 149 237 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 70 130 180
-70 130 180 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 135 206 250
-135 206 250 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 206 209 0
-206 209 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 255 255 0
-255 255 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 139 139 0
-139 139 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 128 128 0
-128 128 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 135 206 235
-135 206 235 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 95 158 160
-95 158 160 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 47 79 79 47
-79 79 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 119 136 153
-119 136 153 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 112 128 144
-112 128 144 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 176 196 222
-176 196 222 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 173 216 230
-173 216 230 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 176 224 230
-176 224 230 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 175 238 238
-175 238 238 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 224 255 255
-224 255 255 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 240 248 255
-240 248 255 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 240 255 255
-240 255 255 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 205 0 0
-205 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 139 0 0
-139 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 25 25 112 25
-25 112 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 36 36 140 36
-36 140 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 80 80 248 80
-80 248 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 75 0 130 75
-0 130 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 138 43 226
-138 43 226 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 123 104 238
-123 104 238 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 106 90 205
-106 90 205 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 160 32 240
-160 32 240 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 72 61 139 72
-61 139 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 148 0 211
-148 0 211 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 153 50 204
-153 50 204 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 147 112 219
-147 112 219 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 186 85 211
-186 85 211 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 0 255
-255 0 255 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 139 0 139
-139 0 139 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 238 130 238
-238 130 238 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 221 160 221
-221 160 221 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 230 230 250
-230 230 250 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 216 191 216
-216 191 216 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 248 248 255
-248 248 255 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 255 255
-255 255 255 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 245 245 245
-245 245 245 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 220 220 220
-220 220 220 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 211 211 211
-211 211 211 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 192 192 192
-192 192 192 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 190 190 190
-190 190 190 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 169 169 169
-169 169 169 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 105 105 105
-105 105 105 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-0 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 -2 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 4 1 #"\0"
-0 70 1 #"\0"
-0.0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 150 0 150
-255 255 255 1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 255 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 16 #"Times New Roman\0"
-1.0 1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Courier New\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Courier New\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Courier New\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-2 -1 0 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-2 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 1.0 1.0 1.0 0.0 0.0 0.0 0 0 0 248
-248 250 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 1.0 1.0 1.0 0.0 0.0 0.0 0 0 0 248
-248 250 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 3 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 102 153
-248 248 250 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 255 248
-248 250 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 3 -1 -1 -1 -1 -1 -1 1 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 255 248
-248 250 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 178 34 34
-255 255 255 -1 -1 107 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 0 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.2 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.2 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 109 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 112 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 109 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 70 7 #"Geneva\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Geneva\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Geneva\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Monaco\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Monaco\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Monaco\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Times\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Times\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Times\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Helvetica\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Helvetica\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Helvetica\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Courier\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Courier\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Courier\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Symbol\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Symbol\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Symbol\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #".Keyboard\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #".Keyboard\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #".Keyboard\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #".LastResort\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #".LastResort\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #".LastResort\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Lucida Grande\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Lucida Grande\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Lucida Grande\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Zapf Dingbats\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Zapf Dingbats\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Zapf Dingbats\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #".TimesLTMM_1_Wt_1_Wd\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #".TimesLTMM_1_Wt_1_Wd\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #".TimesLTMM_1_Wt_1_Wd\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26 #".HelveLTMM_170_Wt_1200_Wd\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26 #".HelveLTMM_170_Wt_1200_Wd\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26 #".HelveLTMM_170_Wt_1200_Wd\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Osaka\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Osaka\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Osaka\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"Osaka\342\210\222\347\255\211\345\271\205\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"Osaka\342\210\222\347\255\211\345\271\205\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"Osaka\342\210\222\347\255\211\345\271\205\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 22 #"Apple LiGothic Medium\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 22 #"Apple LiGothic Medium\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 22 #"Apple LiGothic Medium\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"AppleGothic\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"AppleGothic\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"AppleGothic\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Monaco CY\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Monaco CY\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Monaco CY\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 17 #"Lucida Grande CY\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 17 #"Lucida Grande CY\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 17 #"Lucida Grande CY\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Times CY\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Times CY\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Times CY\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 4 #"Hei\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 4 #"Hei\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 4 #"Hei\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Geneva CE\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Geneva CE\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Geneva CE\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Monaco CE\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Monaco CE\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Monaco CE\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Times CE\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Times CE\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Times CE\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Helvetica CE\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Helvetica CE\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Helvetica CE\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Courier CE\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Courier CE\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Courier CE\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\350"
- #"\247\222\343\202\264 Pro W6\0"
-) 0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\350"
- #"\247\222\343\202\264 Pro W6\0"
-) 0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\350"
- #"\247\222\343\202\264 Pro W6\0"
-) 0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\350"
- #"\247\222\343\202\264 Pro W3\0"
-) 0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\350"
- #"\247\222\343\202\264 Pro W3\0"
-) 0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\350"
- #"\247\222\343\202\264 Pro W3\0"
-) 0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\344"
- #"\270\270\343\202\264 Pro W4\0"
-) 0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\344"
- #"\270\270\343\202\264 Pro W4\0"
-) 0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\344"
- #"\270\270\343\202\264 Pro W4\0"
-) 0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\346"
- #"\230\216\346\234\235 Pro W6\0"
-) 0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\346"
- #"\230\216\346\234\235 Pro W6\0"
-) 0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\346"
- #"\230\216\346\234\235 Pro W6\0"
-) 0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\346"
- #"\230\216\346\234\235 Pro W3\0"
-) 0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\346"
- #"\230\216\346\234\235 Pro W3\0"
-) 0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\346"
- #"\230\216\346\234\235 Pro W3\0"
-) 0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 13 #".Aqua \343\201\213\343\201\252\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #".Aqua \343\201\213\343\201\252\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #".Aqua \343\201\213\343\201\252\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\347\273\206\351\273\221\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\347\273\206\351\273\221\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\347\273\206\351\273\221\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\350"
- #"\247\222\343\202\264 Std W8\0"
-) 0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\350"
- #"\247\222\343\202\264 Std W8\0"
-) 0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #"\343\203\222\343\203\251\343\202\256\343\203\216\350"
- #"\247\222\343\202\264 Std W8\0"
-) 0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 15 #"Geeza Pro Bold\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"Geeza Pro Bold\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"Geeza Pro Bold\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 17 #"Lucida Grande CE\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 17 #"Lucida Grande CE\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 17 #"Lucida Grande CE\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"\345\204\267\351\273\221 Pro\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"\345\204\267\351\273\221 Pro\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"\345\204\267\351\273\221 Pro\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Geeza Pro\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Geeza Pro\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Geeza Pro\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26
-(
- #".Aqua \343\201\213\343\201\252 "
- #"\343\203\234\343\203\274\343\203\253\343\203\211\0"
-) 0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #".Aqua \343\201\213\343\201\252 "
- #"\343\203\234\343\203\274\343\203\253\343\203\211\0"
-) 0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 26
-(
- #".Aqua \343\201\213\343\201\252 "
- #"\343\203\234\343\203\274\343\203\253\343\203\211\0"
-) 0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\351\273\221\344\275\223\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\351\273\221\344\275\223\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\351\273\221\344\275\223\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Zapfino\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Zapfino\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Zapfino\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Trebuchet MS\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Trebuchet MS\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Trebuchet MS\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Arial Narrow\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Arial Narrow\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Arial Narrow\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Arial\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Arial\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Arial\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Courier New\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Courier New\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Courier New\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Times New Roman\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Times New Roman\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Times New Roman\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Hoefler Text\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Hoefler Text\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Hoefler Text\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 23 #"Hoefler Text Ornaments\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 23 #"Hoefler Text Ornaments\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 23 #"Hoefler Text Ornaments\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Marker Felt\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Marker Felt\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Marker Felt\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Impact\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Impact\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Impact\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 5 #"Skia\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 5 #"Skia\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 5 #"Skia\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Copperplate\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Copperplate\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Copperplate\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"Apple Chancery\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"Apple Chancery\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"Apple Chancery\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 18 #"Copperplate Light\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 18 #"Copperplate Light\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 18 #"Copperplate Light\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Baskerville\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Baskerville\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Baskerville\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Baskerville Semibold\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Baskerville Semibold\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Baskerville Semibold\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Big Caslon\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Big Caslon\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Big Caslon\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 22 #"Arial Rounded MT Bold\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 22 #"Arial Rounded MT Bold\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 22 #"Arial Rounded MT Bold\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Brush Script MT\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Brush Script MT\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Brush Script MT\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 20 #"American Typewriter\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 20 #"American Typewriter\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 20 #"American Typewriter\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 30 #"American Typewriter Condensed\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 30 #"American Typewriter Condensed\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 30 #"American Typewriter Condensed\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26 #"American Typewriter Light\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26 #"American Typewriter Light\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26 #"American Typewriter Light\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 36 #"American Typewriter Condensed Light\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 36 #"American Typewriter Condensed Light\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 36 #"American Typewriter Condensed Light\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Futura\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Futura\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Futura\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 17 #"Futura Condensed\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 17 #"Futura Condensed\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 17 #"Futura Condensed\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 18 #"Optima ExtraBlack\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 18 #"Optima ExtraBlack\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 18 #"Optima ExtraBlack\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Herculanum\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Herculanum\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Herculanum\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Gill Sans\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Gill Sans\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Gill Sans\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Gill Sans Light\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Gill Sans Light\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Gill Sans Light\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Comic Sans MS\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Comic Sans MS\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Comic Sans MS\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"Helvetica Neue\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"Helvetica Neue\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"Helvetica Neue\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 30 #"Helvetica Neue Bold Condensed\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 30 #"Helvetica Neue Bold Condensed\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 30 #"Helvetica Neue Bold Condensed\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26 #"Helvetica Neue UltraLight\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26 #"Helvetica Neue UltraLight\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 26 #"Helvetica Neue UltraLight\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Helvetica Neue Light\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Helvetica Neue Light\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Helvetica Neue Light\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 31 #"Helvetica Neue Black Condensed\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 31 #"Helvetica Neue Black Condensed\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 31 #"Helvetica Neue Black Condensed\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Papyrus\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Papyrus\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Papyrus\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Optima\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Optima\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Optima\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Andale Mono\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Andale Mono\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Andale Mono\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Verdana\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Verdana\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Verdana\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Didot\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Didot\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Didot\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Arial Black\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Arial Black\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Arial Black\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Georgia\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Georgia\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Georgia\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Webdings\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Webdings\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Webdings\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Cochin\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Cochin\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 7 #"Cochin\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"BiauKai\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"BiauKai\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"BiauKai\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 19 #"Apple LiSung Light\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 19 #"Apple LiSung Light\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 19 #"Apple LiSung Light\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"AppleMyungjo\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"AppleMyungjo\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"AppleMyungjo\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"#\352\266\201\354\204\234\354\262\264\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"#\352\266\201\354\204\234\354\262\264\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"#\352\266\201\354\204\234\354\262\264\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"#\355\227\244\353\223\234\353\235\274\354\235\270A\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"#\355\227\244\353\223\234\353\235\274\354\235\270A\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"#\355\227\244\353\223\234\353\235\274\354\235\270A\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"#\355\225\204\352\270\260\354\262\264\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"#\355\225\204\352\270\260\354\262\264\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"#\355\225\204\352\270\260\354\262\264\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"#PC\353\252\205\354\241\260\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"#PC\353\252\205\354\241\260\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"#PC\353\252\205\354\241\260\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Geneva CY\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Geneva CY\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Geneva CY\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Charcoal CY\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Charcoal CY\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 12 #"Charcoal CY\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Helvetica CY\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Helvetica CY\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"Helvetica CY\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 4 #"Kai\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 4 #"Kai\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 4 #"Kai\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\345\256\213\344\275\223\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\345\256\213\344\275\223\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\345\256\213\344\275\223\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Chalkboard\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Chalkboard\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"Chalkboard\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Euphemia UCAS Italic\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Euphemia UCAS Italic\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Euphemia UCAS Italic\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"\345\204\267\345\256\213 Pro\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"\345\204\267\345\256\213 Pro\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 11 #"\345\204\267\345\256\213 Pro\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Ayuthaya\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Ayuthaya\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Ayuthaya\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Thonburi\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Thonburi\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 9 #"Thonburi\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\346\245\267\344\275\223\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\346\245\267\344\275\223\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\346\245\267\344\275\223\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 19 #"Euphemia UCAS Bold\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 19 #"Euphemia UCAS Bold\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 19 #"Euphemia UCAS Bold\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"InaiMathi\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"InaiMathi\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"InaiMathi\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Euphemia UCAS\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Euphemia UCAS\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 14 #"Euphemia UCAS\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Chalkboard Bold\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Chalkboard Bold\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 16 #"Chalkboard Bold\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Silom\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Silom\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Silom\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\344\273\277\345\256\213\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\344\273\277\345\256\213\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 13 #"\345\215\216\346\226\207\344\273\277\345\256\213\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"GB18030 Bitmap\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"GB18030 Bitmap\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 15 #"GB18030 Bitmap\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Krungthep\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Krungthep\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 10 #"Krungthep\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Sathu\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Sathu\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 6 #"Sathu\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Plantagenet Cherokee\0"
-0.0 72 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Plantagenet Cherokee\0"
-0.0 72 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 21 #"Plantagenet Cherokee\0"
-0.0 72 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 2 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 2 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 2 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 2 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-0 -1 2 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-0 -1 0 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-0 -1 0 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-0 -1 0 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-2 -1 0 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-2 -1 0 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 2 -1 0 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-2 -1 0 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-2 -1 0 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 0 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 0 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-0 -1 0 1 #"\0"
-0 70 1 #"\0"
-0.6400000000000001 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0
-1.0 0 0 0 0 0 0 1 -1 0 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 0 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 0 1 #"\0"
-0 70 1 #"\0"
-1.2 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-2 -1 0 1 #"\0"
-0 70 1 #"\0"
-1.2 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 2 -1 0 1 #"\0"
-0 70 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-2 -1 0 1 #"\0"
-0 70 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 2 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-2 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 112 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 108 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 108 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 112 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 0 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 94 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 0 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 108 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 178 34 34
-255 255 255 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 106 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 178 34 34
-255 255 255 -1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 112 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 178 34 34
-255 255 255 -1 -1 109 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 153 0 0 0 0
-0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 7 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255 255
-255 1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 160 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 160 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 90 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 90 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 90 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 160 0 0 0
-0 -1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-2 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.5 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 109 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 178 34 34
-255 255 255 -1 -1 110 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 178 34 34
-255 255 255 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 101 1 #"\0"
-0 70 1 #"\0"
-0.8 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 64 108 0
-0 0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 1 -1 101 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-2 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 255 0 0 0
-0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 255 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 2 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.0 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 -1 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 94 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-2.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.2 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 101 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 110 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 90 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 64 128 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 255 0 0 0
-0 -1 -1 0 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 255 0 0 0
-0 2 -1 2 1 #"\0"
-0 70 6 #"Arial\0"
-0.75 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 2 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 1 -1 2 1 #"\0"
-0 75 1 #"\0"
-0.8 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 1 -1 19 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 75 1 #"\0"
-1.0 0 92 -1 93 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 69 0 255
-69 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 99 71
-255 99 71 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 139 0 0 139
-0 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 0 0 255
-0 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 178 34 34
-178 34 34 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 220 20 60
-220 20 60 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 20 147
-255 20 147 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 176 48 96
-176 48 96 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 205 92 92
-205 92 92 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 199 21 133
-199 21 133 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 208 32 144
-208 32 144 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 240 128 128
-240 128 128 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 105 180
-255 105 180 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 219 112 147
-219 112 147 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 182 193
-255 182 193 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 188 143 143
-188 143 143 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 192 203
-255 192 203 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 218 112 214
-218 112 214 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 240 245
-255 240 245 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 250 250
-255 250 250 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 210 105 30
-210 105 30 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 139 69 19
-139 69 19 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 132 60 36
-132 60 36 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 140 0
-255 140 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 127 80
-255 127 80 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 160 82 45
-160 82 45 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0
-255 165 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 128 114
-250 128 114 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 205 133 63
-205 133 63 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 184 134 11
-184 134 11 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 218 165 32
-218 165 32 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 244 164 96
-244 164 96 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 160 122
-255 160 122 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 233 150 122
-233 150 122 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 215 0
-255 215 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 255 0
-255 255 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 128 128 0
-128 128 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 222 184 135
-222 184 135 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 210 180 140
-210 180 140 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 222 173
-255 222 173 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 218 185
-255 218 185 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 240 230 140
-240 230 140 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 189 183 107
-189 183 107 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 228 181
-255 228 181 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 245 222 179
-245 222 179 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 228 196
-255 228 196 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 238 232 170
-238 232 170 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 235 205
-255 235 205 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 234 234 173
-234 234 173 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 239 213
-255 239 213 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 228 225
-255 228 225 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 250 205
-255 250 205 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 235 215
-250 235 215 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 248 220
-255 248 220 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 250 210
-250 250 210 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 253 245 230
-253 245 230 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 240 230
-250 240 230 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 255 224
-255 255 224 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 245 238
-255 245 238 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 245 245 220
-245 245 220 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 250 240
-255 250 240 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 255 240
-255 255 240 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 255 0 0
-255 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 124 252 0
-124 252 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 127 255 0
-127 255 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 173 255 47
-173 255 47 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 154 205 50
-154 205 50 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 107 142 35
-107 142 35 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 85 107 47 85
-107 47 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 143 188 139
-143 188 139 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 100 0 0
-100 0 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 50 205 50 50
-205 50 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 34 139 34 34
-139 34 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 255 127 0
-255 127 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 250 154 0
-250 154 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 46 139 87 46
-139 87 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 60 179 113
-60 179 113 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 112 216 144
-112 216 144 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 144 238 144
-144 238 144 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 152 251 152
-152 251 152 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 102 205 170
-102 205 170 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 64 224 208
-64 224 208 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 32 178 170
-32 178 170 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 72 209 204
-72 209 204 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 240 255 240
-240 255 240 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 245 255 250
-245 255 250 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 65 105 225
-65 105 225 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 30 144 255
-30 144 255 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 191 255 0
-191 255 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 100 149 237
-100 149 237 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 70 130 180
-70 130 180 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 135 206 250
-135 206 250 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 206 209 0
-206 209 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 255 255 0
-255 255 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 139 139 0
-139 139 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 128 128 0
-128 128 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 135 206 235
-135 206 235 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 95 158 160
-95 158 160 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 47 79 79 47
-79 79 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 119 136 153
-119 136 153 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 112 128 144
-112 128 144 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 176 196 222
-176 196 222 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 173 216 230
-173 216 230 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 176 224 230
-176 224 230 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 175 238 238
-175 238 238 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 224 255 255
-224 255 255 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 240 248 255
-240 248 255 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 240 255 255
-240 255 255 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 205 0 0
-205 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 139 0 0
-139 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 25 25 112 25
-25 112 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 36 36 140 36
-36 140 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 255 0 0
-255 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 75 0 130 75
-0 130 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 138 43 226
-138 43 226 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 123 104 238
-123 104 238 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 106 90 205
-106 90 205 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 160 32 240
-160 32 240 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 72 61 139 72
-61 139 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 148 0 211
-148 0 211 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 153 50 204
-153 50 204 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 147 112 219
-147 112 219 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 186 85 211
-186 85 211 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 0 255
-255 0 255 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 139 0 139
-139 0 139 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 238 130 238
-238 130 238 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 221 160 221
-221 160 221 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 230 230 250
-230 230 250 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 216 191 216
-216 191 216 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 248 248 255
-248 248 255 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 255 255
-255 255 255 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 245 245 245
-245 245 245 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 220 220 220
-220 220 220 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 211 211 211
-211 211 211 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 192 192 192
-192 192 192 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 190 190 190
-190 190 190 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 169 169 169
-169 169 169 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 105 105 105
-105 105 105 -1 -1 101 1 #"\0"
-0 70 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-228 225 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 224
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 255 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 255 224
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 245
-245 245 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 107 142 35 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 107 142 35
-255 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 107 142 35
-224 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 139 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 139 0 0 224
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 139 0 0 255
-228 225 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 70 130 180 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 70 130 180
-255 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 70 130 180
-224 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 70 130 180
-255 228 225 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 47 79 79 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 47 79 79 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 47 79 79 224
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 47 79 79 255
-228 225 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 139 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 139 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 139 224
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 47 79 79 245
-245 245 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 160 32 240
-255 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 160 32 240
-224 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0
-255 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0
-224 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 250 128 114
-0 0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 128 114
-255 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 128 114
-224 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 128 114
-245 245 245 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 250 128 114
-255 228 225 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 184 134 11 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 184 134 11
-255 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 184 134 11
-224 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 184 134 11
-245 245 245 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 184 134 11
-255 228 225 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 128 128 0 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 128 128 0
-255 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 128 128 0
-224 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 169 169 169
-0 0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 169 169 169
-255 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 169 169 169
-224 255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 169 169 169
-255 228 225 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 1 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 169 169 169
-245 245 245 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 192 46 214 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 90 -1 94 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 94 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 57 89 216 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 90 -1 -1 94 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 102 102 255
-0 0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 94 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 102 102 255
-0 0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 94 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 249 148 40 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 51 174 51 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 60 194 57 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 94 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 151 69 43 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 94 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 50 163 255 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 94 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 166 0 255 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 94 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 175 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 94 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 94 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 94 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 94 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 94 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 81 112 203 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 94 -1 -1 0 1 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 0 203 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 1 1.0 1.0 1.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-228 225 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 0 0 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 255 255
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 0 0 224
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 224
-255 255 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 92 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 255 224
-255 255 -1 -1 2 1 #"\0"
-0 70 8 #"Courier\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Courier\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 70 8 #"Courier\0"
-1.0 0 92 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 192 192 192
-0 0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 192 192 192
-0 0 0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 22 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 15 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 20 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1           0 20 0 26 3 12 #"#lang racket"
-0 0 26 3 4 #"/gui"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0 0 22 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 4 3 1 #" "
-0 0 22 3 1 #"("
-0 0 14 3 11 #"single-line"
-0 0 4 3 1 #" "
-0 0 14 3 4 #"name"
-0 0 4 3 1 #" "
-0 0 14 3 4 #"link"
-0 0 22 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 3 2 #"  "
-0 38          58 4 0           0 0           0 5 0 43 3 8 #"<a href="
-0 40          14 43 1           0 0           0 1 0 14 3 4 #"link"
-0           0 0 0 43 3 1 #">"
-0 40          14 43 1           0 0           0 1 0 14 3 4 #"name"
-0           0 0 0 43 3 4 #"</a>"
-0           0 0 0 22 3 1 #")"
-0 0 4 29 1 #"\n"
-0 0 4 29 1 #"\n"
-0           0
diff --git a/pkgs/htdp-pkgs/htdp/LICENSE.txt b/pkgs/htdp-pkgs/htdp/LICENSE.txt
deleted file mode 100644
index 9e1c19ba4c..0000000000
--- a/pkgs/htdp-pkgs/htdp/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-htdp
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/htdp-pkgs/htdp/info.rkt b/pkgs/htdp-pkgs/htdp/info.rkt
deleted file mode 100644
index 56c8d26f67..0000000000
--- a/pkgs/htdp-pkgs/htdp/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("htdp-lib" "htdp-doc"))
-(define implies '("htdp-lib" "htdp-doc"))
-
-(define pkg-desc "Teaching languages for _How to Design Programs_")
-
-(define pkg-authors '(matthias mflatt robby))
diff --git a/pkgs/html-pkgs/html-doc/LICENSE.txt b/pkgs/html-pkgs/html-doc/LICENSE.txt
deleted file mode 100644
index 5757ab34e2..0000000000
--- a/pkgs/html-pkgs/html-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-html-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/html-pkgs/html-doc/html/html.scrbl b/pkgs/html-pkgs/html-doc/html/html.scrbl
deleted file mode 100644
index abcbba71c2..0000000000
--- a/pkgs/html-pkgs/html-doc/html/html.scrbl
+++ /dev/null
@@ -1,855 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          (for-label html
-                     xml
-                     racket/contract))
-
-@(define xexpr @tech[#:doc '(lib "xml/xml.scrbl")]{X-expression})
-
-@title{HTML: Parsing Library}
-
-@defmodule[html]{The @racketmodname[html] library provides
-functions to read html documents and structures to represent them.}
-
-
-@deftogether[(
-@defproc[(read-xhtml [port input-port?])
-         html?]{}
-
-@defproc[(read-html [port input-port?])
-         html?]{}
-)]{
-
-Reads (X)HTML from a port, producing an @racket[html] instance.}
-
-
-@defproc[(read-html-as-xml [port input-port?])
-         (listof content/c)]{
- 
-Reads HTML from a port, producing a list of XML content, each of which could be
-turned into an @|xexpr|, if necessary, with @racket[xml->xexpr].}
-
-@defboolparam[read-html-comments v]{
- If @racket[v] is not @racket[#f], then comments are read and returned. Defaults to @racket[#f].
-}
-
-@defboolparam[use-html-spec v]{
- If @racket[v] is not @racket[#f], then the HTML must respect the HTML specification 
- with regards to what elements are allowed to be the children of
- other elements. For example, the top-level @racket["<html>"]
- element may only contain a @racket["<body>"] and @racket["<head>"]
- element. Defaults to @racket[#t].
-}
-
-@section{Example}
-@(require (only-in (for-label racket)
-                   open-input-string string-append
-                   list cond match apply append map printf define require module)
-          (for-label (prefix-in h: html))
-          (for-label (prefix-in x: xml)))
-@def+int[
-(module html-example racket
-
-  (code:comment @#,t{Some of the symbols in @racketmodname[html] and @racketmodname[xml] conflict with})
-  (code:comment @#,t{each other and with racket/base language, so we prefix})
-  (code:comment @#,t{to avoid namespace conflict.})
-  (require (prefix-in h: html)
-           (prefix-in x: xml))
-
-  (define an-html
-    (h:read-xhtml 
-     (open-input-string 
-      (string-append 
-       "<html><head><title>My title</title></head><body>"
-       "<p>Hello world</p><p><b>Testing</b>!</p>"
-       "</body></html>"))))
-  
-  (code:comment @#,t{extract-pcdata: html-content/c -> (listof string)})
-  (code:comment @#,t{Pulls out the pcdata strings from some-content.})
-  (define (extract-pcdata some-content)
-    (cond [(x:pcdata? some-content)
-           (list (x:pcdata-string some-content))]
-          [(x:entity? some-content)
-           (list)]
-          [else
-           (extract-pcdata-from-element some-content)]))
-  
-  (code:comment @#,t{extract-pcdata-from-element: html-element -> (listof string)})
-  (code:comment @#,t{Pulls out the pcdata strings from an-html-element.})
-  (define (extract-pcdata-from-element an-html-element)
-    (match an-html-element
-      [(struct h:html-full (attributes content))
-       (apply append (map extract-pcdata content))]
-      
-      [(struct h:html-element (attributes))
-       '()]))
-  
-  (printf "~s\n" (extract-pcdata an-html)))
-(require 'html-example)
-]
-
-
-
-@section{HTML Structures}
-
-@racket[pcdata], @racket[entity], and @racket[attribute] are defined
-in the @racketmodname[xml] documentation.
-
-@defthing[html-content/c contract?]{
-A @racket[html-content/c] is either
-@itemize[
-  @item[@racket[html-element]]
-  @item[@racket[pcdata]]
-  @item[@racket[entity]]]
-}
-
-@defstruct[html-element ([attributes (listof attribute)])]{
-  Any of the structures below inherits from @racket[html-element].}
-
-@defstruct[(html-full struct:html-element) ([content (listof html-content/c)])]{
-  Any html tag that may include content also inherits from
-  @racket[html-full] without adding any additional fields.}
-
-@defstruct[(mzscheme html-full) ()]{
-  A @racket[mzscheme] is special legacy value for the old documentation system.
-}
-
-@defstruct[(html html-full) ()]{
-  A @racket[html] is
-  @racket[(make-html (listof attribute) (listof Contents-of-html))]
-}
-
-A @racket[Contents-of-html] is either
-@itemize[
-  @item{@racket[body]}
-  @item{@racket[head]}
-]
-
-
-@defstruct[(div html-full)()]{
-  A @racket[div] is
-  @racket[(make-div (listof attribute) (listof G2))]}
-
-
-@defstruct[(center html-full)()]{
-  A @racket[center] is
-  @racket[(make-center (listof attribute) (listof G2))]
-}
-
-
-@defstruct[(blockquote html-full) ()]{
-  A @racket[blockquote] is
-  @racket[(make-blockquote (listof attribute) (listof G2))]
-}
-
-@defstruct[(ins html-full) ()]{
-  An Ins is
-  @racket[(make-ins (listof attribute) (listof G2))]
-}
-
-@defstruct[(del html-full) ()]{
-  A @racket[del] is
-  @racket[(make-del (listof attribute) (listof G2))]
-}
-
-@defstruct[(dd html-full) ()]{
-  A @racket[dd] is
-  @racket[(make-dd (listof attribute) (listof G2))]
-}
-
-@defstruct[(li html-full) ()]{
-  A @racket[li] is
-  @racket[(make-li (listof attribute) (listof G2))]
-}
-
-@defstruct[(th html-full) ()]{
-  A @racket[th] is
-  @racket[(make-th (listof attribute) (listof G2))]
-}
-
-@defstruct[(td html-full) ()]{
-A @racket[td] is
-@racket[(make-td (listof attribute) (listof G2))]
-}
-
-@defstruct[(iframe html-full) ()]{
-An @racket[iframe] is
-@racket[(make-iframe (listof attribute) (listof G2))]
-}
-
-@defstruct[(noframes html-full) ()]{
-A @racket[noframes] is
-@racket[(make-noframes (listof attribute) (listof G2))]
-}
-
-
-@defstruct[(noscript html-full) ()]{
-A @racket[noscript] is
-@racket[(make-noscript (listof attribute) (listof G2))]
-}
-
-
-@defstruct[(style html-full) ()]{
-A @racket[style] is
-@racket[(make-style (listof attribute) (listof pcdata))]
-}
-
-
-@defstruct[(script html-full) ()]{
-A @racket[script] is
-@racket[(make-script (listof attribute) (listof pcdata))]
-}
-
-
-@defstruct[(basefont html-element) ()]{
-A @racket[basefont] is
-@racket[(make-basefont (listof attribute))]
-}
-
-
-@defstruct[(br html-element) ()]{
-A @racket[br] is
-@racket[(make-br (listof attribute))]
-}
-
-@defstruct[(area html-element) ()]{
-An @racket[area] is
-@racket[(make-area (listof attribute))]
-}
-
-@defstruct[(alink html-element) ()]{
-A @racket[alink] is
-@racket[(make-alink (listof attribute))]
-}
-
-@defstruct[(img html-element) ()]{
-An @racket[img] is
-@racket[(make-img (listof attribute))]
-}
-
-@defstruct[(param html-element) ()]{
-A @racket[param] is
-@racket[(make-param (listof attribute))]
-}
-
-@defstruct[(hr html-element) ()]{
-A @racket[hr] is
-@racket[(make-hr (listof attribute))]
-}
-
-@defstruct[(input html-element) ()]{
-An @racket[input] is
-@racket[(make-input (listof attribute))]
-}
-
-@defstruct[(col html-element) ()]{
-A @racket[col] is
-@racket[(make-col (listof attribute))]
-}
-
-@defstruct[(isindex html-element) ()]{
-An @racket[isindex] is
-@racket[(make-isindex (listof attribute))]
-}
-
-@defstruct[(base html-element) ()]{
-A @racket[base] is
-@racket[(make-base (listof attribute))]
-}
-
-@defstruct[(meta html-element) ()]{
-A @racket[meta] is
-@racket[(make-meta (listof attribute))]
-}
-
-@defstruct[(option html-full) ()]{
-An @racket[option] is
-@racket[(make-option (listof attribute) (listof pcdata))]
-}
-
-
-@defstruct[(textarea html-full) ()]{
-A @racket[textarea] is
-@racket[(make-textarea (listof attribute) (listof pcdata))]
-}
-
-
-@defstruct[(title html-full) ()]{
-A @racket[title] is
-@racket[(make-title (listof attribute) (listof pcdata))]
-}
-
-
-@defstruct[(head html-full) ()]{
-  A @racket[head] is
-  @racket[(make-head (listof attribute) (listof Contents-of-head))]
-}
-
-
-A @racket[Contents-of-head] is either
-@itemize[
-  @item[@racket[base]]
-  @item[@racket[isindex]]
-  @item[@racket[alink]]
-  @item[@racket[meta]]
-  @item[@racket[object]]
-  @item[@racket[script]]
-  @item[@racket[style]]
-  @item[@racket[title]]
-]
-
-
-@defstruct[(tr html-full) ()]{
-A @racket[tr] is
-@racket[(make-tr (listof attribute) (listof Contents-of-tr))]
-}
-
-
-A @racket[Contents-of-tr] is either
-@itemize[
-  @item[@racket[td]]
-  @item[@racket[th]]
-]
-
-
-@defstruct[(colgroup html-full) ()]{
-A @racket[colgroup] is
-@racket[(make-colgroup (listof attribute) (listof col))]
-}
-
-
-@defstruct[(thead html-full) ()]{
-A @racket[thead] is
-@racket[(make-thead (listof attribute) (listof tr))]
-}
-
-
-@defstruct[(tfoot html-full) ()]{
-A @racket[tfoot] is
-@racket[(make-tfoot (listof attribute) (listof tr))]
-}
-
-
-@defstruct[(tbody html-full) ()]{
-A @racket[tbody] is
-@racket[(make-tbody (listof attribute) (listof tr))]
-}
-
-
-@defstruct[(tt html-full) ()]{
-A @racket[tt] is
-@racket[(make-tt (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(i html-full) ()]{
-An @racket[i] is
-@racket[(make-i (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(b html-full) ()]{
-A @racket[b] is
-@racket[(make-b (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(u html-full) ()]{
-An @racket[u] is
-@racket[(make-u (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(s html-full) ()]{
-A @racket[s] is
-@racket[(make-s (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(strike html-full) ()]{
-A @racket[strike] is
-@racket[(make-strike (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(big html-full) ()]{
-A @racket[big] is
-@racket[(make-big (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(small html-full) ()]{
-A @racket[small] is
-@racket[(make-small (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(em html-full) ()]{
-An @racket[em] is
-@racket[(make-em (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(strong html-full) ()]{
-A @racket[strong] is
-@racket[(make-strong (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(dfn html-full) ()]{
-A @racket[dfn] is
-@racket[(make-dfn (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(code html-full) ()]{
-A @racket[code] is
-@racket[(make-code (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(samp html-full) ()]{
-A @racket[samp] is
-@racket[(make-samp (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(kbd html-full) ()]{
-A @racket[kbd] is
-@racket[(make-kbd (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(var html-full) ()]{
-A @racket[var] is
-@racket[(make-var (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(cite html-full) ()]{
-A @racket[cite] is
-@racket[(make-cite (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(abbr html-full) ()]{
-An @racket[abbr] is
-@racket[(make-abbr (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(acronym html-full) ()]{
-An @racket[acronym] is
-@racket[(make-acronym (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(sub html-full) ()]{
-A @racket[sub] is
-@racket[(make-sub (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(sup html-full) ()]{
-A @racket[sup] is
-@racket[(make-sup (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(span html-full) ()]{
-A @racket[span] is
-@racket[(make-span (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(bdo html-full) ()]{
-A @racket[bdo] is
-@racket[(make-bdo (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(font html-full) ()]{
-A @racket[font] is
-@racket[(make-font (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(p html-full) ()]{
-A @racket[p] is
-@racket[(make-p (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(h1 html-full) ()]{
-A @racket[h1] is
-@racket[(make-h1 (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(h2 html-full) ()]{
-A @racket[h2] is
-@racket[(make-h2 (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(h3 html-full) ()]{
-A @racket[h3] is
-@racket[(make-h3 (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(h4 html-full) ()]{
-A @racket[h4] is
-@racket[(make-h4 (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(h5 html-full) ()]{
-A @racket[h5] is
-@racket[(make-h5 (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(h6 html-full) ()]{
-A @racket[h6] is
-@racket[(make-h6 (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(q html-full) ()]{
-A @racket[q] is
-@racket[(make-q (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(dt html-full) ()]{
-A @racket[dt] is
-@racket[(make-dt (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(legend html-full) ()]{
-A @racket[legend] is
-@racket[(make-legend (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(caption html-full) ()]{
-A @racket[caption] is
-@racket[(make-caption (listof attribute) (listof G5))]
-}
-
-
-@defstruct[(table html-full) ()]{
-A @racket[table] is
-@racket[(make-table (listof attribute) (listof Contents-of-table))]
-}
-
-
-A @racket[Contents-of-table] is either
-@itemize[
-  @item[@racket[caption]]
-  @item[@racket[col]]
-  @item[@racket[colgroup]]
-  @item[@racket[tbody]]
-  @item[@racket[tfoot]]
-  @item[@racket[thead]]
-]
-
-@defstruct[(button html-full) ()]{
-A @racket[button] is
-@racket[(make-button (listof attribute) (listof G4))]
-}
-
-
-@defstruct[(fieldset html-full) ()]{
-A @racket[fieldset] is
-@racket[(make-fieldset (listof attribute) (listof Contents-of-fieldset))]
-}
-
-
-A @racket[Contents-of-fieldset] is either
-@itemize[
-  @item[@racket[legend]]
-  @item{G2}
-]
-
-
-@defstruct[(optgroup html-full) ()]{
-An @racket[optgroup] is
-@racket[(make-optgroup (listof attribute) (listof option))]
-}
-
-
-@defstruct[(select html-full) ()]{
-A @racket[select] is
-@racket[(make-select (listof attribute) (listof Contents-of-select))]
-}
-
-
-A @racket[Contents-of-select] is either
-@itemize[
-  @item[@racket[optgroup]]
-  @item[@racket[option]]
-]
-
-@defstruct[(label html-full) ()]{
-A @racket[label] is
-@racket[(make-label (listof attribute) (listof G6))]
-}
-
-
-@defstruct[(form html-full) ()]{
-A @racket[form] is
-@racket[(make-form (listof attribute) (listof G3))]
-}
-
-
-@defstruct[(ol html-full) ()]{
-An @racket[ol] is
-@racket[(make-ol (listof attribute) (listof li))]
-}
-
-
-@defstruct[(ul html-full) ()]{
-An @racket[ul] is
-@racket[(make-ul (listof attribute) (listof li))]
-}
-
-
-@defstruct[(dir html-full) ()]{
-A @racket[dir] is
-@racket[(make-dir (listof attribute) (listof li))]
-}
-
-
-@defstruct[(menu html-full) ()]{
-A @racket[menu] is
-@racket[(make-menu (listof attribute) (listof li))]
-}
-
-
-@defstruct[(dl html-full) ()]{
-A @racket[dl] is
-@racket[(make-dl (listof attribute) (listof Contents-of-dl))]
-}
-
-
-A @racket[Contents-of-dl] is either
-@itemize[
-  @item[@racket[dd]]
-  @item[@racket[dt]]
-]
-
-
-@defstruct[(pre html-full) ()]{
-A @racket[pre] is
-@racket[(make-pre (listof attribute) (listof Contents-of-pre))]
-}
-
-
-A @racket[Contents-of-pre] is either
-@itemize[
-  @item{G9}
-  @item{G11}
-]
-
-
-@defstruct[(object html-full) ()]{
-An @racket[object] is
-@racket[(make-object (listof attribute) (listof Contents-of-object-applet))]
-}
-
-
-@defstruct[(applet html-full) ()]{
-An @racket[applet] is
-@racket[(make-applet (listof attribute) (listof Contents-of-object-applet))]
-}
-
-
-A @racket[Contents-of-object-applet] is either
-@itemize[
-  @item[@racket[param]]
-  @item{G2}
-]
-
-
-@defstruct[(-map html-full) ()]{
-A Map is
-@racket[(make--map (listof attribute) (listof Contents-of-map))]
-}
-
-
-A @racket[Contents-of-map] is either
-@itemize[
-  @item[@racket[area]]
-  @item[@racket[fieldset]]
-  @item[@racket[form]]
-  @item[@racket[isindex]]
-  @item{G10}
-]
-
-
-@defstruct[(a html-full) ()]{
-An @racket[a] is
-@racket[(make-a (listof attribute) (listof Contents-of-a))]
-}
-
-
-A @racket[Contents-of-a] is either
-@itemize[
-  @item[@racket[label]]
-  @item{G7}
-]
-
-@defstruct[(address html-full) ()]{
-An @racket[address] is
-@racket[(make-address (listof attribute) (listof Contents-of-address))]
-}
-
-
-A @racket[Contents-of-address] is either
-@itemize[
-  @item[@racket[p]]
-  @item{G5}
-]
-
-
-@defstruct[(body html-full) ()]{
-  A @racket[body] is
-  @racket[(make-body (listof attribute) (listof Contents-of-body))]
-}
-
-A @racket[Contents-of-body] is either
-@itemize[
-  @item[@racket[del]]
-  @item[@racket[ins]]
-  @item{G2}
-]
-
-
-A @racket[G12] is either
-@itemize[
-  @item[@racket[button]]
-  @item[@racket[iframe]]
-  @item[@racket[input]]
-  @item[@racket[select]]
-  @item[@racket[textarea]]
-]
-
-
-A @racket[G11] is either
-@itemize[
-  @item[@racket[a]]
-  @item[@racket[label]]
-  @item[@racket[G12]]
-]
-
-A @racket[G10] is either
-@itemize[
-  @item[@racket[address]]
-  @item[@racket[blockquote]]
-  @item[@racket[center]]
-  @item[@racket[dir]]
-  @item[@racket[div]]
-  @item[@racket[dl]]
-  @item[@racket[h1]]
-  @item[@racket[h2]]
-  @item[@racket[h3]]
-  @item[@racket[h4]]
-  @item[@racket[h5]]
-  @item[@racket[h6]]
-  @item[@racket[hr]]
-  @item[@racket[menu]]
-  @item[@racket[noframes]]
-  @item[@racket[noscript]]
-  @item[@racket[ol]]
-  @item[@racket[p]]
-  @item[@racket[pre]]
-  @item[@racket[table]]
-  @item[@racket[ul]]
-]
-
-
-A @racket[G9] is either
-@itemize[
-  @item[@racket[abbr]]
-  @item[@racket[acronym]]
-  @item[@racket[b]]
-  @item[@racket[bdo]]
-  @item[@racket[br]]
-  @item[@racket[cite]]
-  @item[@racket[code]]
-  @item[@racket[dfn]]
-  @item[@racket[em]]
-  @item[@racket[i]]
-  @item[@racket[kbd]]
-  @item[@racket[-map]]
-  @item[@racket[pcdata]]
-  @item[@racket[q]]
-  @item[@racket[s]]
-  @item[@racket[samp]]
-  @item[@racket[script]]
-  @item[@racket[span]]
-  @item[@racket[strike]]
-  @item[@racket[strong]]
-  @item[@racket[tt]]
-  @item[@racket[u]]
-  @item[@racket[var]]
-]
-
-
-A @racket[G8] is either
-@itemize[
-  @item[@racket[applet]]
-  @item[@racket[basefont]]
-  @item[@racket[big]]
-  @item[@racket[font]]
-  @item[@racket[img]]
-  @item[@racket[object]]
-  @item[@racket[small]]
-  @item[@racket[sub]]
-  @item[@racket[sup]]
-  @item{G9}
-]
-
-
-A @racket[G7] is either
-@itemize[
-  @item{G8}
-  @item{G12}
-]
-
-A @racket[G6] is either
-@itemize[
-  @item[@racket[a]]
-  @item{G7}
-]
-
-A @racket[G5] is either
-@itemize[
-  @item[@racket[label]]
-  @item{G6}
-]
-
-A @racket[G4] is either
-@itemize[
-  @item{G8}
-  @item{G10}
-]
-
-A @racket[G3] is either
-@itemize[
-  @item[@racket[fieldset]]
-  @item[@racket[isindex]]
-  @item{G4}
-  @item{G11}
-]
-
-A @racket[G2] is either
-@itemize[
-  @item[@racket[form]]
-  @item{G3}
-]
-
diff --git a/pkgs/html-pkgs/html-doc/html/info.rkt b/pkgs/html-pkgs/html-doc/html/info.rkt
deleted file mode 100644
index 07ef56c59a..0000000000
--- a/pkgs/html-pkgs/html-doc/html/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("html.scrbl" () (parsing-library))))
diff --git a/pkgs/html-pkgs/html-doc/info.rkt b/pkgs/html-pkgs/html-doc/info.rkt
deleted file mode 100644
index cc9ed10130..0000000000
--- a/pkgs/html-pkgs/html-doc/info.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("scribble-lib"
-                     "html-lib"
-                     "racket-doc"))
-(define deps '("base"))
-(define update-implies '("html-lib"))
-
-(define pkg-desc "documentation part of \"html\"")
-
-(define pkg-authors '(jay mflatt))
diff --git a/pkgs/html-pkgs/html-lib/LICENSE.txt b/pkgs/html-pkgs/html-lib/LICENSE.txt
deleted file mode 100644
index 72e17ce163..0000000000
--- a/pkgs/html-pkgs/html-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-html-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/html-pkgs/html-lib/html/html-spec.rkt b/pkgs/html-pkgs/html-lib/html/html-spec.rkt
deleted file mode 100644
index 1a0a3ad173..0000000000
--- a/pkgs/html-pkgs/html-lib/html/html-spec.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-(require racket/contract
-         "sgml-reader.rkt")
-(provide/contract
- [html-spec spec/c])
-
-(define html-spec
-  '(((mzscheme) pcdata)
-    ((html) body head)
-    ((div center blockquote ins del dd li th td iframe noframes noscript) a abbr acronym address applet b basefont bdo big blockquote br button center cite code dfn dir div dl em fieldset font form h1 h2 h3 h4 h5 h6 hr i iframe img input isindex kbd label map menu noframes noscript object ol p pcdata pre q s samp script select small span strike strong sub sup table textarea tt u ul var)
-    ((style script) cdata)
-    ((basefont br area link img param hr input col isindex base meta))
-    ((option textarea title) pcdata)
-    ((head) base isindex link meta object script style title)
-    ((tr) td th)
-    ((colgroup) col)
-    ((thead tfoot tbody) tr)
-    ((tt i b u s strike big small em strong dfn code samp kbd var cite abbr acronym sub sup span bdo font p h1 h2 h3 h4 h5 h6 q dt legend caption) a abbr acronym applet b basefont bdo big br button cite code dfn em font i iframe img input kbd label map object pcdata q s samp script select small span strike strong sub sup textarea tt u var)
-    ((table) caption col colgroup tbody tfoot thead)
-    ((button) abbr acronym address applet b basefont bdo big blockquote br center cite code dfn dir div dl em font h1 h2 h3 h4 h5 h6 hr i img kbd map menu noframes noscript object ol p pcdata pre q s samp script small span strike strong sub sup table tt u ul var)
-    ((fieldset) a abbr acronym address applet b basefont bdo big blockquote br button center cite code dfn dir div dl em fieldset font form h1 h2 h3 h4 h5 h6 hr i iframe img input isindex kbd label legend map menu noframes noscript object ol p pcdata pcdata pre q s samp script select small span strike strong sub sup table textarea tt u ul var)
-    ((optgroup) option)
-    ((select) optgroup option)
-    ((label) a abbr acronym applet b basefont bdo big br button cite code dfn em font i iframe img input kbd map object pcdata q s samp script select small span strike strong sub sup textarea tt u var)
-    ((form) a abbr acronym address applet b basefont bdo big blockquote br button center cite code dfn dir div dl em fieldset font h1 h2 h3 h4 h5 h6 hr i iframe img input isindex kbd label map menu noframes noscript object ol p pcdata pre q s samp script select small span strike strong sub sup table textarea tt u ul var)
-    ((ol ul dir menu) li)
-    ((dl) dd dt)
-    ((pre) a abbr acronym b bdo br button cite code dfn em i iframe input kbd label map pcdata q s samp script select span strike strong textarea tt u var)
-    ((object applet) a abbr acronym address applet b basefont bdo big blockquote br button center cite code dfn dir div dl em fieldset font form h1 h2 h3 h4 h5 h6 hr i iframe img input isindex kbd label map menu noframes noscript object ol p param pcdata pre q s samp script select small span strike strong sub sup table textarea tt u ul var)
-    ((map) address area blockquote center dir div dl fieldset form h1 h2 h3 h4 h5 h6 hr isindex menu noframes noscript ol p pre table ul)
-    ((a) abbr acronym applet b basefont bdo big br button cite code dfn em font i iframe img input kbd label map object pcdata q s samp script select small span strike strong sub sup textarea tt u var)
-    ((address) a abbr acronym applet b basefont bdo big br button cite code dfn em font i iframe img input kbd label map object p pcdata q s samp script select small span strike strong sub sup textarea tt u var)
-    ((body) a abbr acronym address applet b basefont bdo big blockquote br button center cite code del dfn dir div dl em fieldset font form h1 h2 h3 h4 h5 h6 hr i iframe img input ins isindex kbd label map menu noframes noscript object ol p pcdata pre q s samp script select small span strike strong sub sup table textarea tt u ul var)
-    ))
diff --git a/pkgs/html-pkgs/html-lib/html/html-structs.rkt b/pkgs/html-pkgs/html-lib/html/html-structs.rkt
deleted file mode 100644
index f3a353ad58..0000000000
--- a/pkgs/html-pkgs/html-lib/html/html-structs.rkt
+++ /dev/null
@@ -1,365 +0,0 @@
-#lang racket/base
-(require racket/contract
-         xml)
-
-(define-struct html-element (attributes))
-(define-struct (html-full html-element) (content))
-(define-struct (mzscheme html-full) ())
-(define-struct (html html-full) ())
-(define-struct (div html-full) ())
-(define-struct (center html-full) ())
-(define-struct (blockquote html-full) ())
-(define-struct (ins html-full) ())
-(define-struct (del html-full) ())
-(define-struct (dd html-full) ())
-(define-struct (li html-full) ())
-(define-struct (th html-full) ())
-(define-struct (td html-full) ())
-(define-struct (iframe html-full) ())
-(define-struct (noframes html-full) ())
-(define-struct (noscript html-full) ())
-(define-struct (style html-full) ())
-(define-struct (script html-full) ())
-(define-struct (option html-full) ())
-(define-struct (textarea html-full) ())
-(define-struct (title html-full) ())
-(define-struct (head html-full) ())
-(define-struct (tr html-full) ())
-(define-struct (colgroup html-full) ())
-(define-struct (thead html-full) ())
-(define-struct (tfoot html-full) ())
-(define-struct (tbody html-full) ())
-(define-struct (tt html-full) ())
-(define-struct (i html-full) ())
-(define-struct (b html-full) ())
-(define-struct (u html-full) ())
-(define-struct (s html-full) ())
-(define-struct (strike html-full) ())
-(define-struct (big html-full) ())
-(define-struct (small html-full) ())
-(define-struct (em html-full) ())
-(define-struct (strong html-full) ())
-(define-struct (dfn html-full) ())
-(define-struct (code html-full) ())
-(define-struct (samp html-full) ())
-(define-struct (kbd html-full) ())
-(define-struct (var html-full) ())
-(define-struct (cite html-full) ())
-(define-struct (abbr html-full) ())
-(define-struct (acronym html-full) ())
-(define-struct (sub html-full) ())
-(define-struct (sup html-full) ())
-(define-struct (span html-full) ())
-(define-struct (bdo html-full) ())
-(define-struct (font html-full) ())
-(define-struct (p html-full) ())
-(define-struct (h1 html-full) ())
-(define-struct (h2 html-full) ())
-(define-struct (h3 html-full) ())
-(define-struct (h4 html-full) ())
-(define-struct (h5 html-full) ())
-(define-struct (h6 html-full) ())
-(define-struct (q html-full) ())
-(define-struct (dt html-full) ())
-(define-struct (legend html-full) ())
-(define-struct (caption html-full) ())
-(define-struct (table html-full) ())
-(define-struct (button html-full) ())
-(define-struct (fieldset html-full) ())
-(define-struct (optgroup html-full) ())
-(define-struct (select html-full) ())
-(define-struct (label html-full) ())
-(define-struct (form html-full) ())
-(define-struct (ol html-full) ())
-(define-struct (ul html-full) ())
-(define-struct (dir html-full) ())
-(define-struct (menu html-full) ())
-(define-struct (dl html-full) ())
-(define-struct (pre html-full) ())
-(define-struct (object html-full) ())
-(define-struct (applet html-full) ())
-(define-struct (-map html-full) ())
-(define-struct (a html-full) ())
-(define-struct (address html-full) ())
-(define-struct (body html-full) ())
-(define-struct (basefont html-element) ())
-(define-struct (br html-element) ())
-(define-struct (area html-element) ())
-(define-struct (alink html-element) ())
-(define-struct (img html-element) ())
-(define-struct (param html-element) ())
-(define-struct (hr html-element) ())
-(define-struct (input html-element) ())
-(define-struct (col html-element) ())
-(define-struct (isindex html-element) ())
-(define-struct (base html-element) ())
-(define-struct (meta html-element) ())
-
-;; Html-content = Html-element | Pc-data | Entity   
-(define html-content/c
-  (or/c html-element? pcdata? entity?))
-
-(provide/contract
- [html-content/c contract?]
- [struct html-element ([attributes (listof attribute?)])]
- [struct (html-full html-element)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
-  [struct (mzscheme html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (html html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (div html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (center html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (blockquote html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (ins html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (del html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (dd html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (li html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (th html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (td html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (iframe html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (noframes html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (noscript html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (style html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (script html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (option html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (textarea html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (title html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (head html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (tr html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (colgroup html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (thead html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (tfoot html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (tbody html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (tt html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (i html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (b html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (u html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (s html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (strike html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (big html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (small html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (em html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (strong html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (dfn html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (code html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (samp html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (kbd html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (var html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (cite html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (abbr html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (acronym html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (sub html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (sup html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (span html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (bdo html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (font html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (p html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (h1 html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (h2 html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (h3 html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (h4 html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (h5 html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (h6 html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (q html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (dt html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (legend html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (caption html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (table html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (button html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (fieldset html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (optgroup html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (select html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (label html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (form html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (ol html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (ul html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (dir html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (menu html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (dl html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (pre html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (object html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (applet html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (-map html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (a html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (address html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (body html-full)
-         ([attributes (listof attribute?)]
-          [content (listof html-content/c)])]
- [struct (basefont html-element)
-         ([attributes (listof attribute?)])]
- [struct (br html-element)
-         ([attributes (listof attribute?)])]
- [struct (area html-element)
-         ([attributes (listof attribute?)])]
- [struct (alink html-element)
-         ([attributes (listof attribute?)])]
- [struct (img html-element)
-         ([attributes (listof attribute?)])]
- [struct (param html-element)
-         ([attributes (listof attribute?)])]
- [struct (hr html-element)
-         ([attributes (listof attribute?)])]
- [struct (input html-element)
-         ([attributes (listof attribute?)])]
- [struct (col html-element)
-         ([attributes (listof attribute?)])]
- [struct (isindex html-element)
-         ([attributes (listof attribute?)])]
- [struct (base html-element)
-         ([attributes (listof attribute?)])]
- [struct (meta html-element)
-         ([attributes (listof attribute?)])])
diff --git a/pkgs/html-pkgs/html-lib/html/html.rkt b/pkgs/html-pkgs/html-lib/html/html.rkt
deleted file mode 100644
index 163ee9c809..0000000000
--- a/pkgs/html-pkgs/html-lib/html/html.rkt
+++ /dev/null
@@ -1,620 +0,0 @@
-#lang racket/base
-;; copyright by Paul Graunke June 2000 AD
-
-(require "html-structs.rkt"
-         "html-spec.rkt"
-         "sgml-reader.rkt"
-         racket/contract
-         xml)
-
-(provide (all-from-out "html-structs.rkt")
-         read-html-comments)
-(provide/contract
- [use-html-spec (parameter/c boolean?)]
- [read-html (() (input-port?) . ->* . html?)]
- [read-xhtml (() (input-port?) . ->* . html?)]
- [read-html-as-xml (() (input-port?) . ->* . (listof content/c))])
-
-;; xml-single-content->html : Content (listof Html-content) -> (listof Html-content)
-(define (xml-single-content->html x acc)
-  (cond
-   ((element? x)
-    (case (element-name x)
-      ((basefont) (cons (make-basefont (element-attributes x)) acc))
-      ((br) (cons (make-br (element-attributes x)) acc))
-      ((area) (cons (make-area (element-attributes x)) acc))
-      ((link) (cons (make-alink (element-attributes x)) acc))
-      ((img) (cons (make-img (element-attributes x)) acc))
-      ((param) (cons (make-param (element-attributes x)) acc))
-      ((hr) (cons (make-hr (element-attributes x)) acc))
-      ((input) (cons (make-input (element-attributes x)) acc))
-      ((col) (cons (make-col (element-attributes x)) acc))
-      ((isindex) (cons (make-isindex (element-attributes x)) acc))
-      ((base) (cons (make-base (element-attributes x)) acc))
-      ((meta) (cons (make-meta (element-attributes x)) acc))
-      ((mzscheme)
-       (cons
-        (make-mzscheme
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((html)
-       (cons
-        (make-html
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((div)
-       (cons
-        (make-div
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((center)
-       (cons
-        (make-center
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((blockquote)
-       (cons
-        (make-blockquote
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((ins)
-       (cons
-        (make-ins
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((del)
-       (cons
-        (make-del
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((dd)
-       (cons
-        (make-dd
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((li)
-       (cons
-        (make-li
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((th)
-       (cons
-        (make-th
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((td)
-       (cons
-        (make-td
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((iframe)
-       (cons
-        (make-iframe
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((noframes)
-       (cons
-        (make-noframes
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((noscript)
-       (cons
-        (make-noscript
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((style)
-       (cons
-        (make-style
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((script)
-       (cons
-        (make-script
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((option)
-       (cons
-        (make-option
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((textarea)
-       (cons
-        (make-textarea
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((title)
-       (cons
-        (make-title
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((head)
-       (cons
-        (make-head
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((tr)
-       (cons
-        (make-tr
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((colgroup)
-       (cons
-        (make-colgroup
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((thead)
-       (cons
-        (make-thead
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((tfoot)
-       (cons
-        (make-tfoot
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((tbody)
-       (cons
-        (make-tbody
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((tt)
-       (cons
-        (make-tt
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((i)
-       (cons
-        (make-i
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((b)
-       (cons
-        (make-b
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((u)
-       (cons
-        (make-u
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((s)
-       (cons
-        (make-s
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((strike)
-       (cons
-        (make-strike
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((big)
-       (cons
-        (make-big
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((small)
-       (cons
-        (make-small
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((em)
-       (cons
-        (make-em
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((strong)
-       (cons
-        (make-strong
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((dfn)
-       (cons
-        (make-dfn
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((code)
-       (cons
-        (make-code
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((samp)
-       (cons
-        (make-samp
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((kbd)
-       (cons
-        (make-kbd
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((var)
-       (cons
-        (make-var
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((cite)
-       (cons
-        (make-cite
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((abbr)
-       (cons
-        (make-abbr
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((acronym)
-       (cons
-        (make-acronym
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((sub)
-       (cons
-        (make-sub
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((sup)
-       (cons
-        (make-sup
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((span)
-       (cons
-        (make-span
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((bdo)
-       (cons
-        (make-bdo
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((font)
-       (cons
-        (make-font
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((p)
-       (cons
-        (make-p
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((h1)
-       (cons
-        (make-h1
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((h2)
-       (cons
-        (make-h2
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((h3)
-       (cons
-        (make-h3
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((h4)
-       (cons
-        (make-h4
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((h5)
-       (cons
-        (make-h5
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((h6)
-       (cons
-        (make-h6
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((q)
-       (cons
-        (make-q
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((dt)
-       (cons
-        (make-dt
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((legend)
-       (cons
-        (make-legend
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((caption)
-       (cons
-        (make-caption
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((table)
-       (cons
-        (make-table
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((button)
-       (cons
-        (make-button
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((fieldset)
-       (cons
-        (make-fieldset
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((optgroup)
-       (cons
-        (make-optgroup
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((select)
-       (cons
-        (make-select
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((label)
-       (cons
-        (make-label
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((form)
-       (cons
-        (make-form
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((ol)
-       (cons
-        (make-ol
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((ul)
-       (cons
-        (make-ul
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((dir)
-       (cons
-        (make-dir
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((menu)
-       (cons
-        (make-menu
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((dl)
-       (cons
-        (make-dl
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((pre)
-       (cons
-        (make-pre
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((object)
-       (cons
-        (make-object (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((applet)
-       (cons
-        (make-applet
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((map)
-       (cons
-        (make--map
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((a)
-       (cons
-        (make-a
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((address)
-       (cons
-        (make-address
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      ((body)
-       (cons
-        (make-body
-          (element-attributes x)
-          (xml-contents->html (element-content x)))
-        acc))
-      (else acc)))
-   ((or (pcdata? x) (entity? x)) (cons x acc))
-   (else acc)))
-
-;; xml->html : Document -> Html
-(define (xml->html doc)
-  (let ([root (document-element doc)])
-    (unless (eq? 'html (element-name root))
-      (error 'xml->html "This is not an html document.  Expected 'html, given ~a" (element-name root)))
-    (make-html (element-attributes root) (xml-contents->html (element-content root)))))
-
-
-;; xml-content->html : (listof Content) -> (listof Html-element)
-(define (xml-contents->html contents)
-  (foldr xml-single-content->html
-         null
-         contents))
-
-;; read-xhtml : [Input-port] -> Html
-(define read-xhtml (compose xml->html read-xml))
-
-;; peel-f : (Html-content -> Bool) (listof Html-content) (listof Html-content) -> (listof Html-content)
-(define (peel-f toss? to-toss acc0)
-  (foldr (lambda (x acc)
-           (if (toss? x)
-               (append (html-full-content x) acc)
-               (cons x acc)))
-         acc0
-         to-toss))
-
-;; repackage-html : (listof Html-content) -> Html
-(define (repackage-html contents)
-  (let* ([html (memf html? contents)]
-         [peeled (peel-f html? contents null)]
-         [body (memf body? peeled)])
-    (make-html (if html
-                   (html-element-attributes (car html))
-                   null)
-               (append (filter head? peeled)
-                       (list (make-body (if body
-                                            (html-element-attributes (car body))
-                                            null)
-                                        (filter (compose not head?) (peel-f body? peeled null))))))))
-
-;; clean-up-pcdata : (listof Content) -> (listof Content)
-;; Each pcdata inside a tag that isn't supposed to contain pcdata is either
-;; a) appended to the end of the previous subelement, if that subelement may contain pcdata
-;; b) prepended to the front of the next subelement, if that subelement may contain pcdata
-;; c) discarded
-;; unknown tags may contain pcdata
-;; the top level may contain pcdata
-(define clean-up-pcdata
-  ;; clean-up-pcdata : (listof Content) -> (listof Content)
-  (letrec ([clean-up-pcdata
-            (lambda (content)
-              (map (lambda (to-fix)
-                     (cond
-                       [(element? to-fix)
-                        (recontent-xml to-fix
-                                       (let ([possible (may-contain (element-name to-fix))]
-                                             [content (element-content to-fix)])
-                                         (if (or (not possible) (memq 'pcdata possible))
-                                             (clean-up-pcdata content)
-                                             (eliminate-pcdata content))))]
-                       [else to-fix]))
-                   content))]
-           [eliminate-pcdata
-            ;: (listof Content) -> (listof Content)
-            (lambda (content)
-              (let ([non-elements (first-non-elements content)]
-                    [more (memf element? content)])
-                (if more
-                    (let* ([el (car more)]
-                           [possible (may-contain (element-name el))])
-                      (if (or (not possible) (memq 'pcdata possible))
-                          (cons (recontent-xml el (append non-elements (clean-up-pcdata (element-content el)) (eliminate-pcdata (first-non-elements (cdr more)))))
-                                (or (memf element? (cdr more)) null))
-                          (cons (recontent-xml el (eliminate-pcdata (element-content el)))
-                                (eliminate-pcdata (cdr more)))))
-                    null)))])
-    clean-up-pcdata))
-
-;; first-non-elements : (listof Content) -> (listof Content)
-(define (first-non-elements content)
-  (cond
-    [(null? content) null]
-    [else (if (element? (car content))
-              null
-              (cons (car content) (first-non-elements (cdr content))))]))
-
-;; recontent-xml : Element (listof Content) -> Element
-(define (recontent-xml e c)
-  (make-element (source-start e) (source-stop e) (element-name e) (element-attributes e) c))
-
-;; implicit-starts : Symbol Symbol -> (U #f Symbol)
-(define (implicit-starts parent child)
-  (or (and (eq? child 'tr) (eq? parent 'table) 'tbody)
-      (and (eq? child 'td) (memq parent '(table tbody tfoot thead)) 'tr)))
-
-;; may-contain : Kid-lister
-(define may-contain
-  (gen-may-contain html-spec))
-
-(define may-contain-anything
-  (gen-may-contain null))
-
-(define use-html-spec (make-parameter #t))
-
-;; read-html-as-xml : [Input-port] -> (listof Content)
-(define (read-html-as-xml [port (current-input-port)])
-  ((if (use-html-spec) clean-up-pcdata values)
-   ((gen-read-sgml (if (use-html-spec)
-                       may-contain 
-                       may-contain-anything)
-                   implicit-starts) port)))
-
-;; read-html : [Input-port] -> Html
-(define read-html
-  (compose repackage-html xml-contents->html read-html-as-xml))
diff --git a/pkgs/html-pkgs/html-lib/html/main.rkt b/pkgs/html-pkgs/html-lib/html/main.rkt
deleted file mode 100644
index 077bcf88fd..0000000000
--- a/pkgs/html-pkgs/html-lib/html/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require "html.rkt")
-(provide (all-from-out "html.rkt"))
diff --git a/pkgs/html-pkgs/html-lib/html/sgml-reader.rkt b/pkgs/html-pkgs/html-lib/html/sgml-reader.rkt
deleted file mode 100644
index c20289cea9..0000000000
--- a/pkgs/html-pkgs/html-lib/html/sgml-reader.rkt
+++ /dev/null
@@ -1,442 +0,0 @@
-;; copyright by Paul Graunke June 2000 AD
-;; warning - this was copied from the XML collection.
-;; It needs to be abstracted back in.
-#lang racket/base
-(require xml
-         racket/contract
-         (prefix-in racket: racket/base))
-
-;; Kid-lister : (Symbol -> (U (listof Symbol) #f))
-(define kid-lister/c
-  (symbol? . -> . (or/c (listof symbol?) false/c)))
-
-(define spec/c
-  (listof (cons/c (listof symbol?) (listof symbol?))))
-
-(provide/contract
- [spec/c contract?]
- [read-html-comments (parameter/c boolean?)]
- [trim-whitespace (parameter/c boolean?)]
- [gen-may-contain (spec/c . -> . kid-lister/c)]
- [gen-read-sgml (kid-lister/c (symbol? symbol? . -> . (or/c symbol? false/c)) . -> . (() (input-port?) . ->* . (listof content/c)))])
-
-(define (file-position in)
-  (make-location 0 0 (racket:file-position in)))
-
-;; Start-tag ::= (make-start-tag Location Location Symbol (listof Attribute))
-(define-struct (start-tag source) (name attrs))
-
-;; End-tag ::= (make-end-tag Location Location Symbol)
-(define-struct (end-tag source) (name))
-
-;; Token ::= Contents | Start-tag | End-tag | Eof
-
-(define read-html-comments (make-parameter #f))
-(define trim-whitespace (make-parameter #f))
-
-;; gen-may-contain : Spec -> Kid-lister
-(define (gen-may-contain spec)
-  (let ([table (make-hash)])
-    (for-each (lambda (def)
-                (let ([rhs (cdr def)])
-                  (for-each (lambda (name) (hash-set! table name rhs))
-                            (car def))))
-              spec)
-    (lambda (name)
-      (hash-ref table name (lambda () #f)))))
-
-;; gen-read-sgml : Kid-lister (Symbol Symbol -> (U #f Symbol)) -> [Input-port] -> (listof Content)
-(define ((gen-read-sgml may-contain auto-insert) [in (current-input-port)])
-   (read-from-port may-contain auto-insert in))
-
-;; read-from-port : Kid-lister (Symbol Symbol -> (U #f Symbol)) Input-port -> (listof Content)
-(define (read-from-port may-contain auto-insert in)
-  (let loop ([tokens (let read-tokens ()
-                       (let ([tok (lex in)])
-                         (cond
-                           [(eof-object? tok) null]
-                           [else (cons tok (read-tokens))])))])
-    (cond
-      [(null? tokens) null]
-      [else
-       (let ([tok (car tokens)] [rest-tokens (cdr tokens)])
-         (cond
-           [(start-tag? tok)
-            (let-values ([(el more-tokens) (read-element tok null may-contain auto-insert rest-tokens)])
-              (cons el (loop more-tokens)))]
-           [(end-tag? tok) (loop rest-tokens)]
-           [else (let ([rest-contents (loop rest-tokens)])
-                   (expand-content tok rest-contents))]))])))
-
-;; read-element : Start-tag (listof Symbol) Kid-lister (Symbol Symbol -> (U #f Symbol)) (listof Token) -> Element (listof Token)
-;; Note: How elements nest depends on their content model.
-;;   If a kind of element can't contain anything, then its start tags are implicitly ended, and
-;;   end tags are implicitly started.
-;;   Unknown elements can contain anything and can go inside anything.
-;;   Otherwise, only the subelements listed in the content model can go inside an element.
-;; more here - may-contain shouldn't be used to decide if an element is known or not.
-;;             The edgar dtd puts tags in may-contain's range that aren't in its domain.
-;; more here (or not) - the (memq name context) test leaks for a worst case of O(n^2) in the
-;;                      tag nesting depth.  However, this only should be a problem when the tag is there,
-;;                      but far back.  That shouldn't happen often.  I'm guessing n will be about 3.
-(define (read-element start-tag context may-contain auto-insert tokens)
-  (let read-el ([start-tag start-tag] [context (cons (start-tag-name start-tag) context)] [tokens tokens])
-    (let* ([start-name (start-tag-name start-tag)]
-           [ok-kids (may-contain start-name)])
-      (let-values ([(content remaining)
-                    (cond
-                      [(null? ok-kids) (values null tokens)]
-                      [else 
-                       ;; read-content : (listof Token) -> (listof Content) (listof Token)
-                       (let read-content ([tokens tokens])
-                         (cond
-                           [(null? tokens) (values null tokens)]
-                           [else
-                            (let ([tok (car tokens)] [next-tokens (cdr tokens)])
-                              (cond
-                                [(start-tag? tok)
-                                 (let* ([name (start-tag-name tok)]
-                                        [auto-start (auto-insert start-name name)])
-                                   (if auto-start
-                                       (read-content (cons (make-start-tag (source-start tok) (source-stop tok) auto-start null) tokens))
-                                       (if (and ok-kids
-                                                (not (memq name ok-kids))
-                                                (may-contain name))
-                                           (values null tokens)
-                                           (let*-values ([(element post-element)
-                                                          (read-el tok (cons name context) next-tokens)]
-                                                         [(more-contents left-overs) (read-content post-element)])
-                                             (values (cons element more-contents) left-overs)))))]
-                                [(end-tag? tok)
-                                 (let ([name (end-tag-name tok)])
-                                   (if (eq? name start-name)
-                                       (values null next-tokens)
-                                       (if (memq name context)
-                                           (values null tokens)
-                                           (read-content next-tokens))))]
-                                [else ;; content
-                                 (let-values ([(more-contents left-overs) (read-content next-tokens)])
-                                   (values
-                                    (expand-content tok more-contents)
-                                    left-overs))]))]))])])
-        (values (make-element (source-start start-tag)
-                              (source-stop start-tag)
-                              start-name
-                              (start-tag-attrs start-tag)
-                              content)
-                remaining)))))
-
-;; expand-content : Content (listof Content) -> (listof Content)
-(define (expand-content x lst)
-  (cond
-    [(entity? x) (cons (expand-entity x) lst)]
-    [(comment? x) (if (read-html-comments)
-                      (cons x lst)
-                      lst)]
-    [else (cons x lst)]))
-
-;; expand-entity : Entity -> (U Entity Pcdata)
-;; more here - allow expansion of user defined entities
-(define (expand-entity x)
-  (let ([expanded (default-entity-table (entity-text x))])
-    (if expanded
-        (make-pcdata (source-start x) (source-stop x) expanded)
-        x)))
-
-;; default-entity-table : Symbol -> (U #f String)
-(define (default-entity-table name)
-  (case name
-    [(amp) "&"]
-    [(lt) "<"]
-    [(gt) ">"]
-    [(quot) "\""]
-    [(apos) "'"]
-    [else #f]))
-
-;; lex : Input-port -> Token
-(define (lex in)
-  (when (trim-whitespace)
-    (skip-space in))
-  (let ([c (peek-char in)])
-    (cond
-      [(eof-object? c) c]
-      [(eq? c #\&) (lex-entity in)]
-      [(eq? c #\<) (lex-tag-cdata-pi-comment in)]
-      [else (lex-pcdata in)])))
-
-;; lex-entity : Input-port -> Token
-;; This might not return an entity if it doesn't look like one afterall.
-(define (lex-entity in)
-  (let ([start (file-position in)])
-    (read-char in)
-    (case (peek-char in)
-      ;; more here - read while it's numeric (or hex) not until #\;
-      [(#\#)
-       (read-char in)
-       (let* ([hex? (if (equal? #\x (peek-char in))
-                        (and (read-char in) #t)
-                        #f)]
-              [str (read-until #\; in)]
-              [n (cond
-                   [hex?
-                    (string->number str 16)]
-                   [else (string->number str)])])
-         (if (number? n)
-             (make-entity start (file-position in) n)
-             (make-pcdata start (file-position in) (string-append "&#" str))))]
-      [else
-       (let ([name (lex-name/case-sensitive in)]
-             [c (peek-char in)])
-         (if (eq? c #\;)
-             (begin (read-char in) (make-entity start (file-position in) name))
-             (make-pcdata start (file-position in) (format "&~a" name))))])))
-
-;; lex-tag-cdata-pi-comment : Input-port -> Start-tag | Element | End-tag | Pcdata | Pi | Comment
-(define (lex-tag-cdata-pi-comment in)
-  (let ([start (file-position in)])
-    (read-char in)
-    (case (peek-char in)
-      [(#\!)
-       (read-char in)
-       (case (peek-char in)
-         [(#\-) (read-char in)
-                (let ([c (read-char in)])
-                  (cond
-                    [(eq? c #\-)
-                     (let ([data (lex-comment-contents in)])
-                       (make-comment data))]
-                    [else (make-pcdata start (file-position in) (format "<!-~a" c))]))]
-         [(#\[) (read-char in)
-                (let ([s (read-string 6 in)])
-                  (if (string=? s "CDATA[")
-                      (let ([data (lex-cdata-contents in)])
-                        (make-pcdata start (file-position in) data))
-                      (make-pcdata start (file-position in) (format "<[~a" s))))]
-         [else (skip-dtd in) (lex in)])]
-      [(#\?) (read-char in)
-             (let ([name (lex-name in)])
-               (skip-space in)
-               (let ([data (lex-pi-data in)])
-                 (make-p-i start (file-position in) name data)))]
-      [(#\/) (read-char in)
-             (let ([name (lex-name in)])
-               (skip-space in)
-               (read-char in) ;; skip #\> or whatever else is there
-               (make-end-tag start (file-position in) name))]
-      [else
-       (let ([name (lex-name in)]
-             [attrs (lex-attributes in)])
-         (skip-space in)
-         (case (read-char in)
-           [(#\/)
-            (read-char in) ;; skip #\> or something
-            (make-element start (file-position in) name attrs null)]
-           [else (make-start-tag start (file-position in) name attrs)]))])))
-
-
-;; lex-attributes : Input-port -> (listof Attribute)
-(define (lex-attributes in)
-  (sort (let loop ()
-          (skip-space in)
-          (cond [(name-start? (peek-char in))
-                 (cons (lex-attribute in) (loop))]
-                [else null]))
-        (lambda (a b)
-          (string<? (symbol->string (attribute-name a))
-                    (symbol->string (attribute-name b))))))
-
-;; lex-attribute : Input-port -> Attribute
-;; Note: entities in attributes are ignored, since defacto html uses & in them for URL syntax
-(define (lex-attribute in)
-  (let ([start (file-position in)]
-        [name (lex-name in)])
-    (skip-space in)
-    (cond
-      [(eq? (peek-char in) #\=)
-       (read-char in)
-       (skip-space in)
-       (let* ([delimiter (read-char in)]
-              [value (list->string
-                      (case delimiter
-                        [(#\' #\")
-                         (let read-more ()
-                           (let ([c (read-char in)])
-                             (cond
-                               [(or (eq? c delimiter) (eof-object? c)) null]
-                               [else (cons c (read-more))])))]
-                        [else (cons delimiter (read-up-to (lambda (c) (or (char-whitespace? c) (eq? c #\>))) in))]))])
-         (make-attribute start (file-position in) name value))]
-      [else (make-attribute start (file-position in) name (symbol->string name))])))
-
-;; skip-space : Input-port -> Void
-;; deviation - should sometimes insist on at least one space
-(define (skip-space in)
-  (let loop ()
-    (let ([c (peek-char in)])
-      (when (and (not (eof-object? c)) (char-whitespace? c))
-        (read-char in)
-        (loop)))))
-
-;; lex-pcdata : Input-port -> Pcdata
-;; deviation - disallow ]]> "for compatability" with SGML, sec 2.4 XML spec 
-(define (lex-pcdata in)
-  (let ([start (file-position in)])
-    ;; The following regexp match must use bytes, not chars, because
-    ;; `in' might not be a well-formed UTF-8 sequence. If it isn't,
-    ;; and it goes wrong with the first byte sequence, then a char-based
-    ;; pattern would match 0 characters. Meanwhile, the caller of this function
-    ;; expects characters to be read.
-    (let ([s (regexp-match #rx#"^[^&<]*" in)])
-      (make-pcdata start
-                   (file-position in)
-                   (bytes->string/utf-8
-                    (if (trim-whitespace)
-                        (regexp-replace* #rx#"[ \t\v\r\n]+" (car s) #"")
-                        (car s))
-                    #\?)))))
-#|
-      ;; Original slow version:
-      (define (lex-pcdata in)
-	(let ([start (file-position in)]
-	      [data (let loop ([c (read-char in)])
-		      (let ([next (peek-char in)])
-			(cond
-			 [(or (eof-object? next) (eq? next #\&) (eq? next #\<))
-			  (list c)]
-			 [(and (char-whitespace? next) (trim-whitespace))
-			  (skip-space in)
-			  (let ([lst (loop #\space)])
-			    (cond
-			     [(null? (cdr lst)) (list c)]
-			     [else (cons c lst)]))]
-			 [else (cons c (loop (read-char in)))])))])
-	  (make-pcdata start
-		       (file-position in)
-		       (list->string data))))
-  |#
-
-(define (lex-name* in)
-  (define os (open-output-string))
-  (let loop ()
-    (define ch (peek-char in))
-    (when (name-char? ch)
-      (read-char in)
-      (display ch os)
-      (loop)))
-  (get-output-string os))
-;; lex-name : Input-port -> Symbol
-(define (lex-name in)
-  (string->symbol 
-   (string-downcase
-    (lex-name* in))))
-;; lex-name/case-sensitive : Input-port -> Symbol
-(define (lex-name/case-sensitive in)
-  (string->symbol 
-   (lex-name* in)))
-#|
-      (define (lex-name in)
-        (string->symbol
-         (list->string
-          (let lex-rest ()
-            (cond
-             [(name-char? (peek-char in))
-              (cons (char-downcase (read-char in)) (lex-rest))]
-             [else null])))))
-|#
-
-
-;; skip-dtd : Input-port -> Void
-(define (skip-dtd in)
-  (let skip ()
-    (let ([c (read-char in)])
-      (if (eof-object? c)
-          (void)
-          (case c
-            [(#\') (read-until #\' in) (skip)]
-            [(#\") (read-until #\" in) (skip)]
-            [(#\<)
-             (case (read-char in)
-               [(#\!) (case (read-char in)
-                        [(#\-) (read-char in) (lex-comment-contents in) (skip)]
-                        [else (skip) (skip)])]
-               [(#\?) (lex-pi-data in) (skip)]
-               [else (skip) (skip)])]
-            [(#\>) (void)]
-            [else (skip)])))))
-
-;; name-start? : TST -> Bool
-(define (name-start? ch)
-  (and (char? ch) (char-name-start? ch)))
-
-;; char-name-start? : Char -> Bool
-(define (char-name-start? ch)
-  (or (char-alphabetic? ch) 
-      (eq? ch #\_)
-      (eq? ch #\:)))
-
-;; name-char? : TST -> Bool
-(define (name-char? ch)
-  (and (char? ch)
-       (or (char-name-start? ch)
-           (char-numeric? ch)
-           (eq? ch #\&) ; ugly illegal junk for SEC's EDGAR database
-           (eq? ch #\.)
-           (eq? ch #\-))))
-
-;; read-up-to : (Char -> Bool) Input-port -> (listof Char)
-;; abstract this with read-until
-(define (read-up-to p? in)
-  (let loop ()
-    (let ([c (peek-char in)])
-      (cond
-        [(or (eof-object? c) (p? c)) null]
-        [else (cons (read-char in) (loop))]))))
-
-;; read-until : Char Input-port -> String
-;; discards the stop character, too
-(define (read-until char in)
-  (list->string
-   (let read-more ()
-     (let ([c (read-char in)])
-       (cond
-         [(or (eof-object? c) (eq? c char)) null]
-         [else (cons c (read-more))])))))
-
-;; gen-read-until-string : String -> Input-port -> String
-;; uses Knuth-Morris-Pratt from
-;; Introduction to Algorithms, Cormen, Leiserson, and Rivest, pages 869-876
-;; discards stop from input
-(define (gen-read-until-string stop)
-  (let* ([len (string-length stop)]
-         [prefix (make-vector len 0)]
-         [fall-back
-          (lambda (k c)
-            (let ([k (let loop ([k k])
-                       (cond
-                         [(and (> k 0) (not (eq? (string-ref stop k) c)))
-                          (loop (vector-ref prefix (sub1 k)))]
-                         [else k]))])
-              (if (eq? (string-ref stop k) c)
-                  (add1 k)
-                  k)))])
-    (let init ([k 0] [q 1])
-      (when (< q len)
-        (let ([k (fall-back k (string-ref stop q))])
-          (vector-set! prefix q k)
-          (init k (add1 q)))))
-    ;; (vector-ref prefix x) = the longest suffix that matches a prefix of stop
-    (lambda (in)
-      (list->string
-       (let/ec out
-         (let loop ([matched 0] [out out])
-           (let* ([c (read-char in)]
-                  [matched (fall-back matched c)])
-             (cond
-               [(or (eof-object? c) (= matched len)) (out null)]
-               [(zero? matched) (cons c (let/ec out (loop matched out)))]
-               [else (cons c (loop matched out))]))))))))
-
-;; "-->" makes more sense, but "--" follows the spec, but this isn't XML anymore.
-(define lex-comment-contents (gen-read-until-string "-->"))
-(define lex-pi-data (gen-read-until-string "?>"))
-(define lex-cdata-contents (gen-read-until-string "]]>"))
diff --git a/pkgs/html-pkgs/html-lib/info.rkt b/pkgs/html-pkgs/html-lib/info.rkt
deleted file mode 100644
index 7f021fec97..0000000000
--- a/pkgs/html-pkgs/html-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "implementation (no documentation) part of \"html\"")
-
-(define pkg-authors '(jay mflatt))
diff --git a/pkgs/html-pkgs/html-test/LICENSE.txt b/pkgs/html-pkgs/html-test/LICENSE.txt
deleted file mode 100644
index 57e422f8d4..0000000000
--- a/pkgs/html-pkgs/html-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-html-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/html-pkgs/html-test/info.rkt b/pkgs/html-pkgs/html-test/info.rkt
deleted file mode 100644
index fdac46b512..0000000000
--- a/pkgs/html-pkgs/html-test/info.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '())
-
-(define pkg-desc "tests for \"html\"")
-
-(define pkg-authors '(jay mflatt))
-
-(define build-deps 
-  '("racket-index"
-    "base"
-    "html-lib"
-    "rackunit-lib"))
-(define update-implies '("html-lib"))
diff --git a/pkgs/html-pkgs/html-test/tests/html/test-docs-complete.rkt b/pkgs/html-pkgs/html-test/tests/html/test-docs-complete.rkt
deleted file mode 100644
index fa93291f3a..0000000000
--- a/pkgs/html-pkgs/html-test/tests/html/test-docs-complete.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote html))
diff --git a/pkgs/html-pkgs/html-test/tests/html/test.rkt b/pkgs/html-pkgs/html-test/tests/html/test.rkt
deleted file mode 100644
index 1e34b85fad..0000000000
--- a/pkgs/html-pkgs/html-test/tests/html/test.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket
-(require rackunit
-         rackunit/text-ui
-         net/url
-         (prefix-in h: html)
-         (prefix-in x: xml))
-
-(define html-tests
-  (test-suite
-   "HTML"
-
-   (test-case
-    "Example"
-    (local
-     [(define an-html
-        (h:read-xhtml
-         (open-input-string
-          (string-append
-           "<html><head><title>My title</title></head><body>"
-           "<p>Hello world</p><p><b>Testing</b>!</p>"
-           "</body></html>"))))
-
-                                        ; extract-pcdata: html-content -> (listof string)
-                                        ; Pulls out the pcdata strings from some-content.
-      (define (extract-pcdata some-content)
-        (cond [(x:pcdata? some-content)
-               (list (x:pcdata-string some-content))]
-              [(x:entity? some-content)
-               (list)]
-              [else
-               (extract-pcdata-from-element some-content)]))
-
-                                        ; extract-pcdata-from-element: html-element -> (listof string)
-                                        ; Pulls out the pcdata strings from an-html-element.
-      (define (extract-pcdata-from-element an-html-element)
-        (match an-html-element
-          [(struct h:html-full (attributes content))
-           (apply append (map extract-pcdata content))]
-
-          [(struct h:html-element (attributes))
-           '()]))]
-
-     (check-equal? (extract-pcdata an-html)
-                   ' ("My title" "Hello world" "Testing" "!"))))
-
-
-   (test-case
-    "Eli - March 1"
-    (check-not-false
-     (lambda ()
-       (h:read-html-as-xml
-        (get-pure-port
-         (string->url
-          "http://list.cs.brown.edu/pipermail/plt-scheme/"))))))
-
-   (test-case
-    "DW - Jan 18 2013"
-    (check-equal?
-     (h:read-html-as-xml (open-input-string "<новости новости=\"новости\">"))
-     (list
-      (x:element
-       (x:location 0 0 0)
-       (x:location 0 0 48)
-       'новости
-       (list (x:attribute (x:location 0 0 16) (x:location 0 0 47) 'новости "новости"))
-       '()))))))
-
-(run-tests html-tests)
diff --git a/pkgs/html-pkgs/html/LICENSE.txt b/pkgs/html-pkgs/html/LICENSE.txt
deleted file mode 100644
index fea4f1fb5c..0000000000
--- a/pkgs/html-pkgs/html/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-html
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/html-pkgs/html/info.rkt b/pkgs/html-pkgs/html/info.rkt
deleted file mode 100644
index d1bf9aab18..0000000000
--- a/pkgs/html-pkgs/html/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("html-lib"
-               "html-doc"))
-(define implies '("html-lib"
-                  "html-doc"))
-
-(define pkg-desc "HTML parsing and generation")
-
-(define pkg-authors '(jay mflatt))
diff --git a/pkgs/icons/LICENSE.txt b/pkgs/icons/LICENSE.txt
deleted file mode 100644
index 4c0e2e4af7..0000000000
--- a/pkgs/icons/LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-icons
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
-
-  Stop icon
-  Everaldo Coelho
-  http://www.everaldo.com/
-
-  Save icon
-  David Vignoni
-  http://icon-king.com/
diff --git a/pkgs/icons/PLT-206-larval.png b/pkgs/icons/PLT-206-larval.png
deleted file mode 100644
index ed68404b36..0000000000
Binary files a/pkgs/icons/PLT-206-larval.png and /dev/null differ
diff --git a/pkgs/icons/PLT-206-mars.jpg b/pkgs/icons/PLT-206-mars.jpg
deleted file mode 100644
index 3fc90bfe8c..0000000000
Binary files a/pkgs/icons/PLT-206-mars.jpg and /dev/null differ
diff --git a/pkgs/icons/PLT-206-small.png b/pkgs/icons/PLT-206-small.png
deleted file mode 100644
index b959a1f356..0000000000
Binary files a/pkgs/icons/PLT-206-small.png and /dev/null differ
diff --git a/pkgs/icons/PLT-206.png b/pkgs/icons/PLT-206.png
deleted file mode 100644
index 694baa647a..0000000000
Binary files a/pkgs/icons/PLT-206.png and /dev/null differ
diff --git a/pkgs/icons/PLT-pumpkin.png b/pkgs/icons/PLT-pumpkin.png
deleted file mode 100644
index 4ceb2aa702..0000000000
Binary files a/pkgs/icons/PLT-pumpkin.png and /dev/null differ
diff --git a/pkgs/icons/PLTnolarval.jpg b/pkgs/icons/PLTnolarval.jpg
deleted file mode 100644
index 960b2d3fee..0000000000
Binary files a/pkgs/icons/PLTnolarval.jpg and /dev/null differ
diff --git a/pkgs/icons/PLTylarval.jpg b/pkgs/icons/PLTylarval.jpg
deleted file mode 100644
index d378aefe42..0000000000
Binary files a/pkgs/icons/PLTylarval.jpg and /dev/null differ
diff --git a/pkgs/icons/anchor.gif b/pkgs/icons/anchor.gif
deleted file mode 100644
index 1dd1ca3615..0000000000
Binary files a/pkgs/icons/anchor.gif and /dev/null differ
diff --git a/pkgs/icons/animate1.gif b/pkgs/icons/animate1.gif
deleted file mode 100644
index 5cbf5cc0fa..0000000000
Binary files a/pkgs/icons/animate1.gif and /dev/null differ
diff --git a/pkgs/icons/animate2.gif b/pkgs/icons/animate2.gif
deleted file mode 100644
index 8dec520ba3..0000000000
Binary files a/pkgs/icons/animate2.gif and /dev/null differ
diff --git a/pkgs/icons/animate3.gif b/pkgs/icons/animate3.gif
deleted file mode 100644
index 44ce87cf68..0000000000
Binary files a/pkgs/icons/animate3.gif and /dev/null differ
diff --git a/pkgs/icons/arrow.blue.down.gif b/pkgs/icons/arrow.blue.down.gif
deleted file mode 100644
index a6461cbae6..0000000000
Binary files a/pkgs/icons/arrow.blue.down.gif and /dev/null differ
diff --git a/pkgs/icons/arrow.blue.left.gif b/pkgs/icons/arrow.blue.left.gif
deleted file mode 100644
index 6c7bd94dbd..0000000000
Binary files a/pkgs/icons/arrow.blue.left.gif and /dev/null differ
diff --git a/pkgs/icons/arrow.blue.right.gif b/pkgs/icons/arrow.blue.right.gif
deleted file mode 100644
index b44632b8fc..0000000000
Binary files a/pkgs/icons/arrow.blue.right.gif and /dev/null differ
diff --git a/pkgs/icons/arrow.blue.up.gif b/pkgs/icons/arrow.blue.up.gif
deleted file mode 100644
index 82aa8ccc68..0000000000
Binary files a/pkgs/icons/arrow.blue.up.gif and /dev/null differ
diff --git a/pkgs/icons/b-run.png b/pkgs/icons/b-run.png
deleted file mode 100644
index 7d2f35aea9..0000000000
Binary files a/pkgs/icons/b-run.png and /dev/null differ
diff --git a/pkgs/icons/b-wait.png b/pkgs/icons/b-wait.png
deleted file mode 100644
index 54018fa117..0000000000
Binary files a/pkgs/icons/b-wait.png and /dev/null differ
diff --git a/pkgs/icons/b-wait2.png b/pkgs/icons/b-wait2.png
deleted file mode 100644
index e65f72a00c..0000000000
Binary files a/pkgs/icons/b-wait2.png and /dev/null differ
diff --git a/pkgs/icons/bb-sm-bw.bmp b/pkgs/icons/bb-sm-bw.bmp
deleted file mode 100644
index fabbf56b76..0000000000
Binary files a/pkgs/icons/bb-sm-bw.bmp and /dev/null differ
diff --git a/pkgs/icons/bb-small.bmp b/pkgs/icons/bb-small.bmp
deleted file mode 100644
index cb8a635f78..0000000000
Binary files a/pkgs/icons/bb-small.bmp and /dev/null differ
diff --git a/pkgs/icons/bb.gif b/pkgs/icons/bb.gif
deleted file mode 100644
index 4d5051d66f..0000000000
Binary files a/pkgs/icons/bb.gif and /dev/null differ
diff --git a/pkgs/icons/bomb-32x32.png b/pkgs/icons/bomb-32x32.png
deleted file mode 100644
index ba3f641e23..0000000000
Binary files a/pkgs/icons/bomb-32x32.png and /dev/null differ
diff --git a/pkgs/icons/bomb-32x32@2x.png b/pkgs/icons/bomb-32x32@2x.png
deleted file mode 100644
index 5b7ef7c892..0000000000
Binary files a/pkgs/icons/bomb-32x32@2x.png and /dev/null differ
diff --git a/pkgs/icons/book.gif b/pkgs/icons/book.gif
deleted file mode 100644
index 589ed50771..0000000000
Binary files a/pkgs/icons/book.gif and /dev/null differ
diff --git a/pkgs/icons/break.png b/pkgs/icons/break.png
deleted file mode 100644
index 7f2ddc2e0e..0000000000
Binary files a/pkgs/icons/break.png and /dev/null differ
diff --git a/pkgs/icons/bug09.png b/pkgs/icons/bug09.png
deleted file mode 100644
index 165496def9..0000000000
Binary files a/pkgs/icons/bug09.png and /dev/null differ
diff --git a/pkgs/icons/checksyn.jpg b/pkgs/icons/checksyn.jpg
deleted file mode 100644
index eeb5c18420..0000000000
Binary files a/pkgs/icons/checksyn.jpg and /dev/null differ
diff --git a/pkgs/icons/close.png b/pkgs/icons/close.png
deleted file mode 100644
index edf5f76f9b..0000000000
Binary files a/pkgs/icons/close.png and /dev/null differ
diff --git a/pkgs/icons/close@2x.png b/pkgs/icons/close@2x.png
deleted file mode 100644
index 3289ea6d21..0000000000
Binary files a/pkgs/icons/close@2x.png and /dev/null differ
diff --git a/pkgs/icons/eli-purple.jpg b/pkgs/icons/eli-purple.jpg
deleted file mode 100644
index 0438d59be6..0000000000
Binary files a/pkgs/icons/eli-purple.jpg and /dev/null differ
diff --git a/pkgs/icons/eof.gif b/pkgs/icons/eof.gif
deleted file mode 100644
index f5cb90b63f..0000000000
Binary files a/pkgs/icons/eof.gif and /dev/null differ
diff --git a/pkgs/icons/execute.bmp b/pkgs/icons/execute.bmp
deleted file mode 100644
index 5ca90c725b..0000000000
Binary files a/pkgs/icons/execute.bmp and /dev/null differ
diff --git a/pkgs/icons/file.gif b/pkgs/icons/file.gif
deleted file mode 100644
index 89f9f1362e..0000000000
Binary files a/pkgs/icons/file.gif and /dev/null differ
diff --git a/pkgs/icons/foot-up.png b/pkgs/icons/foot-up.png
deleted file mode 100644
index 909c255bf8..0000000000
Binary files a/pkgs/icons/foot-up.png and /dev/null differ
diff --git a/pkgs/icons/foot.png b/pkgs/icons/foot.png
deleted file mode 100644
index 8205339f16..0000000000
Binary files a/pkgs/icons/foot.png and /dev/null differ
diff --git a/pkgs/icons/heart.png b/pkgs/icons/heart.png
deleted file mode 100644
index ff911cf9fd..0000000000
Binary files a/pkgs/icons/heart.png and /dev/null differ
diff --git a/pkgs/icons/help.bmp b/pkgs/icons/help.bmp
deleted file mode 100644
index 8f12ea5d2f..0000000000
Binary files a/pkgs/icons/help.bmp and /dev/null differ
diff --git a/pkgs/icons/help16x16.xbm b/pkgs/icons/help16x16.xbm
deleted file mode 100644
index cd13334aeb..0000000000
--- a/pkgs/icons/help16x16.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define mred_width 16
-#define mred_height 16
-static char mred_bits[] = {
- 0xe0,0x07,0xf8,0x1f,0xfc,0x3f,0xfe,0x7f,0xfe,0x7f,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0x7f,0xfe,0x7f,0xfc,0x3f,0xf8,0x1f,
- 0xe0,0x07};
diff --git a/pkgs/icons/help16x16.xpm b/pkgs/icons/help16x16.xpm
deleted file mode 100644
index 62f764fb32..0000000000
--- a/pkgs/icons/help16x16.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * mred[] = {
-"16 16 4 1",
-" 	c #000000",
-".	c #0000ff",
-"X	c #ffffff",
-"o	c #ff0000",
-"                ",
-"     .XXXX.     ",
-"   ooXXXXXX..   ",
-"  ooXXXooXXX..  ",
-"  ooXXooooXX..  ",
-" oooooooooXX... ",
-" ooooooooXXX... ",
-" oooooooXXX.... ",
-" ooooooXXX..... ",
-" ooooooXX...... ",
-" ooooooXX...... ",
-"  oooooXX.....  ",
-"  oooooo......  ",
-"   ooooXX....   ",
-"     ooXX..     ",
-"                "};
diff --git a/pkgs/icons/help32x32.xbm b/pkgs/icons/help32x32.xbm
deleted file mode 100644
index e363084108..0000000000
--- a/pkgs/icons/help32x32.xbm
+++ /dev/null
@@ -1,12 +0,0 @@
-#define mred_width 32
-#define mred_height 32
-static char mred_bits[] = {
- 0x00,0xf8,0x1f,0x00,0x00,0xfe,0x7f,0x00,0x80,0xff,0xff,0x01,0xc0,0xff,0xff,
- 0x03,0xe0,0xff,0xff,0x07,0xf0,0xff,0xff,0x0f,0xf8,0xff,0xff,0x1f,0xfc,0xff,
- 0xff,0x3f,0xfc,0xff,0xff,0x3f,0xfe,0xff,0xff,0x7f,0xfe,0xff,0xff,0x7f,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0xff,0xff,0x7f,0xfe,0xff,
- 0xff,0x7f,0xfc,0xff,0xff,0x3f,0xfc,0xff,0xff,0x3f,0xf8,0xff,0xff,0x1f,0xf0,
- 0xff,0xff,0x0f,0xe0,0xff,0xff,0x07,0xc0,0xff,0xff,0x03,0x80,0xff,0xff,0x01,
- 0x00,0xfe,0x7f,0x00,0x00,0xfc,0x1f,0x00};
diff --git a/pkgs/icons/help32x32.xpm b/pkgs/icons/help32x32.xpm
deleted file mode 100644
index e8be0098c6..0000000000
--- a/pkgs/icons/help32x32.xpm
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char * mred[] = {
-"32 32 4 1",
-" 	c #000000",
-".	c #ff0000",
-"X	c #0000ff",
-"o	c #ffffff",
-"                                ",
-"          ..       XX           ",
-"        ..  ooooooo  XX         ",
-"       .. ooooooooooo XXX       ",
-"      .. ooooooooooooo XXX      ",
-"     .. ooooooooooooooo XXX     ",
-"    .. ooooo       ooooo XXX    ",
-"   ... oooo ....... oooo XXXX   ",
-"   ... oooo ....... oooo XXXX   ",
-"  .... oooo ....... oooo XXXXX  ",
-"  .....    ........ oooo XXXXX  ",
-" ................. ooooo XXXXXX ",
-" ................ oooooo XXXXXX ",
-" ............... oooooo XXXXXXX ",
-" .............. oooooo XXXXXXXX ",
-" ............. oooooo XXXXXXXXX ",
-" ............ oooooo XXXXXXXXXX ",
-" ............ ooooo XXXXXXXXXXX ",
-" ............ oooo XXXXXXXXXXXX ",
-" ............ oooo XXXXXXXXXXXX ",
-" ............ oooo XXXXXXXXXXXX ",
-"  ........... oooo XXXXXXXXXXX  ",
-"  ............ oo XXXXXXXXXXXX  ",
-"   ............  XXXXXXXXXXXX   ",
-"   .............XXXXXXXXXXXXX   ",
-"    ...........  XXXXXXXXXXX    ",
-"     ........  oo  XXXXXXXX     ",
-"      ...... oooooo XXXXXX      ",
-"        .... oooooo XXXX        ",
-"         ....  oo  XXXX         ",
-"           ....  XXXX           ",
-"                                "};
diff --git a/pkgs/icons/htdp-icon.gif b/pkgs/icons/htdp-icon.gif
deleted file mode 100644
index 0b136ece9f..0000000000
Binary files a/pkgs/icons/htdp-icon.gif and /dev/null differ
diff --git a/pkgs/icons/info.rkt b/pkgs/icons/info.rkt
deleted file mode 100644
index 0e064ee1c7..0000000000
--- a/pkgs/icons/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection "icons")
-(define deps '("base"))
-
-(define pkg-desc "An assortment of images")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/icons/j.gif b/pkgs/icons/j.gif
deleted file mode 100644
index c9cdf51d0d..0000000000
Binary files a/pkgs/icons/j.gif and /dev/null differ
diff --git a/pkgs/icons/java-interactions-box.gif b/pkgs/icons/java-interactions-box.gif
deleted file mode 100644
index ca4a4ca0f0..0000000000
Binary files a/pkgs/icons/java-interactions-box.gif and /dev/null differ
diff --git a/pkgs/icons/left-right-cursor.xbm b/pkgs/icons/left-right-cursor.xbm
deleted file mode 100644
index cf72bab272..0000000000
--- a/pkgs/icons/left-right-cursor.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define left_right_cursor_xbm_width 16
-#define left_right_cursor_xbm_height 16
-static char left_right_cursor_xbm_bits[] = {
-   0x00, 0x00, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x88, 0x11,
-   0x8C, 0x31, 0xFE, 0x7F, 0x8C, 0x31, 0x88, 0x11, 0x80, 0x01, 0x80, 0x01,
-   0x80, 0x01, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00 };
diff --git a/pkgs/icons/left-right-mask.xbm b/pkgs/icons/left-right-mask.xbm
deleted file mode 100644
index 31df70975d..0000000000
--- a/pkgs/icons/left-right-mask.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define left_right_mask_xbm_width 16
-#define left_right_mask_xbm_height 16
-static char left_right_mask_xbm_bits[] = {
-   0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0xD8, 0x1B, 0xDC, 0x3B,
-   0xFE, 0x7F, 0xFF, 0xFF, 0xFE, 0x7F, 0xDC, 0x3B, 0xD8, 0x1B, 0xC0, 0x03,
-   0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0x00, 0x00 };
diff --git a/pkgs/icons/lock.gif b/pkgs/icons/lock.gif
deleted file mode 100644
index 57d01e6ea1..0000000000
Binary files a/pkgs/icons/lock.gif and /dev/null differ
diff --git a/pkgs/icons/macro-stepper-32x32.png b/pkgs/icons/macro-stepper-32x32.png
deleted file mode 100644
index c6c9a6e661..0000000000
Binary files a/pkgs/icons/macro-stepper-32x32.png and /dev/null differ
diff --git a/pkgs/icons/macro-stepper-32x32@2x.png b/pkgs/icons/macro-stepper-32x32@2x.png
deleted file mode 100644
index 2d184e56db..0000000000
Binary files a/pkgs/icons/macro-stepper-32x32@2x.png and /dev/null differ
diff --git a/pkgs/icons/macro-stepper-narrow.png b/pkgs/icons/macro-stepper-narrow.png
deleted file mode 100644
index ed70f77716..0000000000
Binary files a/pkgs/icons/macro-stepper-narrow.png and /dev/null differ
diff --git a/pkgs/icons/macro-stepper.png b/pkgs/icons/macro-stepper.png
deleted file mode 100644
index 15a3119621..0000000000
Binary files a/pkgs/icons/macro-stepper.png and /dev/null differ
diff --git a/pkgs/icons/medium-plt.jpg b/pkgs/icons/medium-plt.jpg
deleted file mode 100644
index 9f27eafd7b..0000000000
Binary files a/pkgs/icons/medium-plt.jpg and /dev/null differ
diff --git a/pkgs/icons/mf.gif b/pkgs/icons/mf.gif
deleted file mode 100644
index ada14512c0..0000000000
Binary files a/pkgs/icons/mf.gif and /dev/null differ
diff --git a/pkgs/icons/mini-plt.gif b/pkgs/icons/mini-plt.gif
deleted file mode 100644
index 3bda50155f..0000000000
Binary files a/pkgs/icons/mini-plt.gif and /dev/null differ
diff --git a/pkgs/icons/mini-plt.xbm b/pkgs/icons/mini-plt.xbm
deleted file mode 100644
index a0bbabadbc..0000000000
--- a/pkgs/icons/mini-plt.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define mini-plt_width 15
-#define mini-plt_height 14
-static char mini-plt_bits[] = {
- 0xe0,0x03,0xf8,0x0f,0xcc,0x1f,0xde,0x3f,0x9e,0x3f,0x3f,0x7f,0x7f,0x7f,0x7f,
- 0x7e,0x7f,0x7c,0x3e,0x3d,0x9e,0x39,0xcc,0x13,0xf8,0x0f,0xe0,0x03};
diff --git a/pkgs/icons/mini-plt.xpm b/pkgs/icons/mini-plt.xpm
deleted file mode 100644
index dbf3310af0..0000000000
--- a/pkgs/icons/mini-plt.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char *mini-plt[] = {
-/* width height num_colors chars_per_pixel */
-"    15    14        5            1",
-/* colors */
-" 	c None s None",
-". c #f8fcf8",
-"# c #000000",
-"a c #5050f8",
-"b c #f81440",
-/* pixels */
-"     #####     ",
-"   ##aaaaa##   ",
-"  #b..aaaaaa#  ",
-" #bbb.aaaaaaa# ",
-" #bbb..aaaaaa# ",
-"#bbbbb..aaaaaa#",
-"#bbbbbb.aaaaaa#",
-"#bbbbbb..aaaaa#",
-"#bbbbbb...aaaa#",
-" #bbbb..b.aaa# ",
-" #bbb..bb..aa# ",
-"  #b..bbbb..#  ",
-"   ##bbbbb##   ",
-"     #####     "
-};
diff --git a/pkgs/icons/mred.gif b/pkgs/icons/mred.gif
deleted file mode 100644
index 008931b346..0000000000
Binary files a/pkgs/icons/mred.gif and /dev/null differ
diff --git a/pkgs/icons/mred.xbm b/pkgs/icons/mred.xbm
deleted file mode 100644
index 9e42c634e0..0000000000
--- a/pkgs/icons/mred.xbm
+++ /dev/null
@@ -1,41 +0,0 @@
-#define mred_width 70
-#define mred_height 62
-static char mred_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x80,0x00,0xc0,0x00,0xe0,0x00,0x00,0x00,0x00,0x80,0x01,0xc0,
- 0x00,0x70,0x00,0x00,0x00,0x00,0x80,0x03,0xc0,0x00,0x30,0x00,0x00,0x00,0x00,
- 0x00,0x03,0xc0,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x07,0xc0,0x00,0x18,0x00,
- 0x00,0x00,0x00,0x00,0x0e,0xc0,0x00,0x1c,0x00,0x00,0x00,0x00,0x00,0x0e,0xc0,
- 0x00,0x0e,0x00,0x00,0x00,0x1d,0x00,0x1c,0xc0,0x00,0x0e,0x00,0x00,0xfc,0xf7,
- 0x00,0x1c,0xc0,0x00,0x07,0x00,0x00,0x28,0xc0,0x00,0x38,0xc0,0x00,0x07,0x00,
- 0x00,0x00,0xc0,0x00,0x38,0xc0,0x80,0x07,0x00,0x00,0x00,0xc0,0x00,0x78,0xc0,
- 0x80,0x03,0x00,0x00,0x00,0x60,0x00,0x70,0xc0,0xc0,0x03,0x00,0x00,0x00,0x70,
- 0x00,0xf0,0xc0,0xc0,0x01,0x00,0x00,0x00,0x30,0x00,0xe0,0xc0,0xc0,0x01,0x00,
- 0x00,0x00,0x18,0x00,0xe0,0xc0,0xe0,0x01,0x00,0x00,0x03,0x08,0x00,0xe0,0xc1,
- 0xe0,0x01,0x00,0x80,0x01,0x0c,0x00,0xe0,0xc1,0xe0,0x00,0x00,0xc0,0x00,0x06,
- 0x00,0xe0,0xc1,0xe0,0x01,0x00,0x60,0x00,0x03,0x00,0xc0,0xc1,0xf0,0x00,0x00,
- 0x20,0x00,0x01,0x00,0xc0,0xc3,0xf0,0x00,0x00,0x30,0x80,0x00,0x00,0xc0,0xc3,
- 0xf0,0x00,0x00,0x18,0x40,0x00,0x00,0xc0,0xc3,0xf0,0x00,0x00,0x0c,0x00,0x00,
- 0x00,0xc0,0xc3,0xf0,0x00,0x00,0x04,0x00,0x00,0x00,0xc0,0xc3,0x70,0x00,0x00,
- 0x8c,0xda,0x2f,0x00,0xc0,0xc3,0xf0,0x00,0x00,0xfc,0xff,0xff,0x07,0xc0,0xc3,
- 0xf0,0x00,0x00,0xf0,0x05,0x80,0x0e,0x80,0xc3,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0x18,0xc0,0xc3,0xf0,0x00,0x00,0x00,0x00,0x00,0x18,0xc0,0xc3,0x70,0x00,0x00,
- 0x00,0x00,0x00,0x18,0xc0,0xc3,0xf0,0x00,0x00,0x00,0x00,0x00,0x18,0xc0,0xc3,
- 0xf0,0x00,0x00,0x00,0x00,0x00,0x18,0xc0,0xc3,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0x08,0xc0,0xc3,0xf0,0x00,0x00,0x00,0x00,0x00,0x0c,0xc0,0xc3,0xf0,0x00,0x00,
- 0x00,0xfe,0x03,0x0c,0xc0,0xc1,0xe0,0x00,0xff,0xff,0xff,0x07,0x06,0xc0,0xc3,
- 0xe0,0x01,0xfe,0x57,0x00,0x00,0x06,0xe0,0xc1,0xe0,0x01,0x00,0x00,0x00,0x00,
- 0x03,0xc0,0xc1,0xe0,0x01,0x00,0x00,0x00,0x00,0x03,0xe0,0xc1,0xc0,0x01,0x00,
- 0x00,0x00,0x80,0x01,0xe0,0xc0,0xc0,0x01,0x00,0x00,0x00,0x80,0x01,0xe0,0xc0,
- 0xc0,0x03,0x00,0x00,0x00,0xc0,0x00,0xf0,0xc0,0x80,0x03,0x00,0x00,0x00,0xc0,
- 0x00,0x70,0xc0,0x80,0x03,0x00,0x00,0x00,0x60,0x00,0x70,0xc0,0x80,0x07,0x00,
- 0x00,0x00,0x70,0x00,0x78,0xc0,0x00,0x07,0x00,0x00,0x00,0x30,0x00,0x38,0xc0,
- 0x00,0x07,0x00,0x00,0x80,0x19,0x00,0x38,0xc0,0x00,0x0e,0x00,0x00,0x00,0x1f,
- 0x00,0x1c,0xc0,0x00,0x0e,0x00,0x00,0x00,0x0f,0x00,0x1c,0xc0,0x00,0x1c,0x00,
- 0x00,0x00,0x06,0x00,0x0e,0xc0,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x06,0xc0,
- 0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x07,0xc0,0x00,0x30,0x00,0x00,0x00,0x00,
- 0x00,0x03,0xc0,0x00,0x60,0x00,0x00,0x00,0x00,0x80,0x03,0xc0,0x00,0xe0,0x00,
- 0x00,0x00,0x00,0x80,0x01,0xc0,0x00,0x40,0x00,0x00,0x00,0x00,0x40,0x00,0xc0,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xc0};
diff --git a/pkgs/icons/mrf.png b/pkgs/icons/mrf.png
deleted file mode 100644
index 58d03af45e..0000000000
Binary files a/pkgs/icons/mrf.png and /dev/null differ
diff --git a/pkgs/icons/mrspidey.bmp b/pkgs/icons/mrspidey.bmp
deleted file mode 100644
index 6d289766b8..0000000000
Binary files a/pkgs/icons/mrspidey.bmp and /dev/null differ
diff --git a/pkgs/icons/paren.bmp b/pkgs/icons/paren.bmp
deleted file mode 100644
index 4e2ca23ad4..0000000000
Binary files a/pkgs/icons/paren.bmp and /dev/null differ
diff --git a/pkgs/icons/paren.xbm b/pkgs/icons/paren.xbm
deleted file mode 100644
index f0581812dc..0000000000
--- a/pkgs/icons/paren.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define paren_width 8
-#define paren_height 8
-static char paren_bits[] = {
- 0x11,0x00,0x44,0x00,0x11,0x00,0x44,0x00};
diff --git a/pkgs/icons/performance-report.png b/pkgs/icons/performance-report.png
deleted file mode 100644
index c9c07d62e1..0000000000
Binary files a/pkgs/icons/performance-report.png and /dev/null differ
diff --git a/pkgs/icons/plt-16x16.png b/pkgs/icons/plt-16x16.png
deleted file mode 100644
index 21a42f008b..0000000000
Binary files a/pkgs/icons/plt-16x16.png and /dev/null differ
diff --git a/pkgs/icons/plt-32x32.png b/pkgs/icons/plt-32x32.png
deleted file mode 100644
index f72bb23d55..0000000000
Binary files a/pkgs/icons/plt-32x32.png and /dev/null differ
diff --git a/pkgs/icons/plt-48x48.png b/pkgs/icons/plt-48x48.png
deleted file mode 100644
index 95bc1648b8..0000000000
Binary files a/pkgs/icons/plt-48x48.png and /dev/null differ
diff --git a/pkgs/icons/plt-flat.gif b/pkgs/icons/plt-flat.gif
deleted file mode 100644
index 5df03e5998..0000000000
Binary files a/pkgs/icons/plt-flat.gif and /dev/null differ
diff --git a/pkgs/icons/plt-logo-no-hole.gif b/pkgs/icons/plt-logo-no-hole.gif
deleted file mode 100644
index 120a0feb7e..0000000000
Binary files a/pkgs/icons/plt-logo-no-hole.gif and /dev/null differ
diff --git a/pkgs/icons/plt-logo-red-diffuse.png b/pkgs/icons/plt-logo-red-diffuse.png
deleted file mode 100644
index 8b56be425c..0000000000
Binary files a/pkgs/icons/plt-logo-red-diffuse.png and /dev/null differ
diff --git a/pkgs/icons/plt-logo-red-diffuse@2x.png b/pkgs/icons/plt-logo-red-diffuse@2x.png
deleted file mode 100644
index 4ec3d484f2..0000000000
Binary files a/pkgs/icons/plt-logo-red-diffuse@2x.png and /dev/null differ
diff --git a/pkgs/icons/plt-logo-red-flat.png b/pkgs/icons/plt-logo-red-flat.png
deleted file mode 100644
index e8830883d1..0000000000
Binary files a/pkgs/icons/plt-logo-red-flat.png and /dev/null differ
diff --git a/pkgs/icons/plt-logo-red-gradient.png b/pkgs/icons/plt-logo-red-gradient.png
deleted file mode 100644
index 6df513f022..0000000000
Binary files a/pkgs/icons/plt-logo-red-gradient.png and /dev/null differ
diff --git a/pkgs/icons/plt-logo-red-shiny.png b/pkgs/icons/plt-logo-red-shiny.png
deleted file mode 100644
index f08a8d341f..0000000000
Binary files a/pkgs/icons/plt-logo-red-shiny.png and /dev/null differ
diff --git a/pkgs/icons/plt-logo-red-shiny@2x.png b/pkgs/icons/plt-logo-red-shiny@2x.png
deleted file mode 100644
index b9b8592ac8..0000000000
Binary files a/pkgs/icons/plt-logo-red-shiny@2x.png and /dev/null differ
diff --git a/pkgs/icons/plt-logo.gif b/pkgs/icons/plt-logo.gif
deleted file mode 100644
index 99c0e15928..0000000000
Binary files a/pkgs/icons/plt-logo.gif and /dev/null differ
diff --git a/pkgs/icons/plt-old.gif b/pkgs/icons/plt-old.gif
deleted file mode 100644
index 7f74708194..0000000000
Binary files a/pkgs/icons/plt-old.gif and /dev/null differ
diff --git a/pkgs/icons/plt-small-shield.gif b/pkgs/icons/plt-small-shield.gif
deleted file mode 100644
index 0421e77465..0000000000
Binary files a/pkgs/icons/plt-small-shield.gif and /dev/null differ
diff --git a/pkgs/icons/plt.gif b/pkgs/icons/plt.gif
deleted file mode 100644
index 652dacbc73..0000000000
Binary files a/pkgs/icons/plt.gif and /dev/null differ
diff --git a/pkgs/icons/plt.jpg b/pkgs/icons/plt.jpg
deleted file mode 100644
index 6f2e488d62..0000000000
Binary files a/pkgs/icons/plt.jpg and /dev/null differ
diff --git a/pkgs/icons/plt.xpm b/pkgs/icons/plt.xpm
deleted file mode 100644
index e068ab8aef..0000000000
--- a/pkgs/icons/plt.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static char *plt[] = {
-/* width height num_colors chars_per_pixel */
-"    40    40       11           1",
-/* colors */
-"d	c None s None",
-". c #970400",
-"# c #0004a1",
-"a c #ff0000",
-"b c #8fa38b",
-"c c #060b04",
-"i c #ffffff",
-"e c #f7fff7",
-"f c #0c1324",
-"g c #242213",
-"h c #0000ff",
-/* pixels */
-"dddddddddddddddddddddddddddddddddddddddd",
-"dddddddddddddddddddddddddddddddddddddddd",
-"ddddddddddddddbggcccccgggbeddddddddddddd",
-"ddddddddddddegccccccfccccccgeddddddddddd",
-"ddddddddddegcgdeebchhhhhh#ccccbddddddddd",
-"dddddddddbgcgiiiiig#hhhhhhhhcccgdddddddd",
-"ddddddddbccciibbbibchhhhhhhhh#cccedddddd",
-"dddddddgcaagecg.ggichhhhhhhhhhh#cceddddd",
-"ddddddbcaaaccaaaa.ebfhhhhhhhhhhh#ccedddd",
-"dddddecaaaagaaaaaagichhhhhhhhhhhhhcceddd",
-"ddddecaaaaaaaaaaaagigfhhhhhhhhhhhh#cgddd",
-"ddddcgaaaaaaaaaaaa.bechhhhhhhhhhhhhfcedd",
-"dddbcaaaaaaaaaaaaaagig#hhhhhhhhhhhhhccdd",
-"ddeggaaaaaaaaaaaaaagiechhhhhhhhhhhhhfced",
-"ddbcaaaaaaaaaaaaaaagiic#hhhhhhhhhhhhhccd",
-"ddgcaaaaaaaaaaaaaa.giicfhhhhhhhhhhhhhfcd",
-"ddcgaaaaaaaaaaaaaagbiigchhhhhhhhhhhhh#ce",
-"decaaaaaaaaaaaaaaaciiiechhhhhhhhhhhhhhcb",
-"decaaaaaaaaaaaaaacbiiiichhhhhhhhhhhhhhcb",
-"dbcaaaaaaaaaaaaaaciiiiibfhhhhhhhhhhhhhcb",
-"dbcaaaaaaaaaaaaacbiiibiichhhhhhhhhhhhhcb",
-"dbcaaaaaaaaaaaaaciiiiccigfhhhhhhhhhhhhcb",
-"dbcaaaaaaaaaaaa.biiib.ciechhhhhhhhhhh#ce",
-"decaaaaaaaaaaaaciiiiga.gig#hhhhhhhhhh#cd",
-"decaaaaaaaaaaa.giiibaaacib#hhhhhhhhhhfcd",
-"ddcaaaaaaaaaaaciiiigaaaceichhhhhhhhhhcgd",
-"ddgaaaaaaaaaaabiiibaaaaagighhhhhhhhhhced",
-"ddbcaaaaaaaaacdiiigaaaaacib#hhhhhhhhfcdd",
-"ddecaaaaaaaaacdiib.aaaaaceichhhhhhhhcbdd",
-"dddggaaaaaaagbiiigaaaaaaggig#hhhh#h#cddd",
-"dddec.aaaaaaciiiegaaaaaaaciec#h#ccgcgddd",
-"ddddbcaaaaagbiiigaaaaaaaa.eiggccbcgceddd",
-"ddddebcaaa.ciiiegaaaaaaaaaciiiiiiccgdddd",
-"ddddddgcaacbiiigaaaaaaaaaaggiiiiigcedddd",
-"dddddddgccgeiibcaaaaaaaaaaacgiiiccdddddd",
-"ddddddddgccggaaaaaaaaaaaaaaacccccedddddd",
-"dddddddddbcgaaaaaaaaaaaaaaacccccdddddddd",
-"ddddddddddegcg.aaaaaaaaagcccccbddddddddd",
-"ddddddddddddbccccgcccccccccgbddddddddddd",
-"ddddddddddddddebbbggggbbbedddddddddddddd"
-};
diff --git a/pkgs/icons/pltbw.gif b/pkgs/icons/pltbw.gif
deleted file mode 100644
index 23944521a8..0000000000
Binary files a/pkgs/icons/pltbw.gif and /dev/null differ
diff --git a/pkgs/icons/r-logo-glass-256x256.png b/pkgs/icons/r-logo-glass-256x256.png
deleted file mode 100644
index 32e60d165b..0000000000
Binary files a/pkgs/icons/r-logo-glass-256x256.png and /dev/null differ
diff --git a/pkgs/icons/r-logo-plastic-256x256.png b/pkgs/icons/r-logo-plastic-256x256.png
deleted file mode 100644
index c9b2bd6fd8..0000000000
Binary files a/pkgs/icons/r-logo-plastic-256x256.png and /dev/null differ
diff --git a/pkgs/icons/r5rs.png b/pkgs/icons/r5rs.png
deleted file mode 100644
index 4176d8eeb9..0000000000
Binary files a/pkgs/icons/r5rs.png and /dev/null differ
diff --git a/pkgs/icons/recycle.png b/pkgs/icons/recycle.png
deleted file mode 100644
index 04842731ba..0000000000
Binary files a/pkgs/icons/recycle.png and /dev/null differ
diff --git a/pkgs/icons/recycle@2x.png b/pkgs/icons/recycle@2x.png
deleted file mode 100644
index 2a3d21a913..0000000000
Binary files a/pkgs/icons/recycle@2x.png and /dev/null differ
diff --git a/pkgs/icons/red-arrow.bmp b/pkgs/icons/red-arrow.bmp
deleted file mode 100644
index 0d1c1ebdee..0000000000
Binary files a/pkgs/icons/red-arrow.bmp and /dev/null differ
diff --git a/pkgs/icons/reset.xbm b/pkgs/icons/reset.xbm
deleted file mode 100644
index 954f790ed3..0000000000
--- a/pkgs/icons/reset.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define reset_width 16
-#define reset_height 16
-static unsigned char reset_bits[] = {
-  0x01, 0x80, 0x03, 0x00, 0x06, 0x00, 0x0c, 0x00, 0x18, 0x00, 0x30, 0x00,
-  0x60, 0x00, 0xc0, 0x00, 0x80, 0x01, 0x00, 0x03, 0x00, 0x06, 0x00, 0x0c,
-  0x00, 0x18, 0x00, 0x30, 0x00, 0x60, 0x00, 0xc0, };
diff --git a/pkgs/icons/return.xbm b/pkgs/icons/return.xbm
deleted file mode 100644
index 7285ce88b7..0000000000
--- a/pkgs/icons/return.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define return_width 6
-#define return_height 9
-static char return_bits[] = {
- 0x1e,0x3e,0x30,0x30,0x39,0x1f,0x0f,0x0f,0x1f};
diff --git a/pkgs/icons/run.png b/pkgs/icons/run.png
deleted file mode 100644
index 875a07872c..0000000000
Binary files a/pkgs/icons/run.png and /dev/null differ
diff --git a/pkgs/icons/save.png b/pkgs/icons/save.png
deleted file mode 100644
index fd0048ded9..0000000000
Binary files a/pkgs/icons/save.png and /dev/null differ
diff --git a/pkgs/icons/scheme-box.jpg b/pkgs/icons/scheme-box.jpg
deleted file mode 100644
index 470895c071..0000000000
Binary files a/pkgs/icons/scheme-box.jpg and /dev/null differ
diff --git a/pkgs/icons/scheme-splice-box.jpg b/pkgs/icons/scheme-splice-box.jpg
deleted file mode 100644
index 7e2fb2c730..0000000000
Binary files a/pkgs/icons/scheme-splice-box.jpg and /dev/null differ
diff --git a/pkgs/icons/schemedoc.ico b/pkgs/icons/schemedoc.ico
deleted file mode 100644
index a3bd511658..0000000000
Binary files a/pkgs/icons/schemedoc.ico and /dev/null differ
diff --git a/pkgs/icons/semicolon.gif b/pkgs/icons/semicolon.gif
deleted file mode 100644
index e67a0f0481..0000000000
Binary files a/pkgs/icons/semicolon.gif and /dev/null differ
diff --git a/pkgs/icons/sk.jpg b/pkgs/icons/sk.jpg
deleted file mode 100644
index 8c0c23d82e..0000000000
Binary files a/pkgs/icons/sk.jpg and /dev/null differ
diff --git a/pkgs/icons/slash-slash.gif b/pkgs/icons/slash-slash.gif
deleted file mode 100644
index f3dbfc8c57..0000000000
Binary files a/pkgs/icons/slash-slash.gif and /dev/null differ
diff --git a/pkgs/icons/small-planet.png b/pkgs/icons/small-planet.png
deleted file mode 100644
index a7ea688562..0000000000
Binary files a/pkgs/icons/small-planet.png and /dev/null differ
diff --git a/pkgs/icons/stepper-32x32.png b/pkgs/icons/stepper-32x32.png
deleted file mode 100644
index 82d2b492f7..0000000000
Binary files a/pkgs/icons/stepper-32x32.png and /dev/null differ
diff --git a/pkgs/icons/stepper-32x32@2x.png b/pkgs/icons/stepper-32x32@2x.png
deleted file mode 100644
index 02f9aa2c96..0000000000
Binary files a/pkgs/icons/stepper-32x32@2x.png and /dev/null differ
diff --git a/pkgs/icons/stop-16x16.png b/pkgs/icons/stop-16x16.png
deleted file mode 100644
index 28070132eb..0000000000
Binary files a/pkgs/icons/stop-16x16.png and /dev/null differ
diff --git a/pkgs/icons/stop-22x22.png b/pkgs/icons/stop-22x22.png
deleted file mode 100644
index 5615288519..0000000000
Binary files a/pkgs/icons/stop-22x22.png and /dev/null differ
diff --git a/pkgs/icons/stop-32x32.png b/pkgs/icons/stop-32x32.png
deleted file mode 100644
index 3e788f5e79..0000000000
Binary files a/pkgs/icons/stop-32x32.png and /dev/null differ
diff --git a/pkgs/icons/stop-multi.png b/pkgs/icons/stop-multi.png
deleted file mode 100644
index 796872bbc1..0000000000
Binary files a/pkgs/icons/stop-multi.png and /dev/null differ
diff --git a/pkgs/icons/syncheck.png b/pkgs/icons/syncheck.png
deleted file mode 100644
index be07bc9cbc..0000000000
Binary files a/pkgs/icons/syncheck.png and /dev/null differ
diff --git a/pkgs/icons/texas-plt-bw.gif b/pkgs/icons/texas-plt-bw.gif
deleted file mode 100644
index a93eadacf1..0000000000
Binary files a/pkgs/icons/texas-plt-bw.gif and /dev/null differ
diff --git a/pkgs/icons/touch.bmp b/pkgs/icons/touch.bmp
deleted file mode 100644
index d4e7ad4931..0000000000
Binary files a/pkgs/icons/touch.bmp and /dev/null differ
diff --git a/pkgs/icons/trumpet.xbm b/pkgs/icons/trumpet.xbm
deleted file mode 100644
index 1e7addae32..0000000000
--- a/pkgs/icons/trumpet.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define trumpet_width 24
-#define trumpet_height 24
-static unsigned char trumpet_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x60,
- 0x00,0x00,0x50,0x00,0x00,0x68,0x00,0x00,0x76,0x06,0xe0,0x7d,0xfa,0x4f,0x7f,
- 0xa6,0xbf,0x7f,0xfe,0x7f,0x7f,0x86,0xfa,0x7e,0xc0,0xe7,0x78,0xa0,0xc1,0x71,
- 0xe0,0xc0,0x61,0xe0,0x40,0x41,0xe0,0x40,0x41,0xc0,0xa1,0x00,0xc0,0xff,0x00,
- 0x80,0x7f,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
diff --git a/pkgs/icons/unlock.gif b/pkgs/icons/unlock.gif
deleted file mode 100644
index 2c56f154a1..0000000000
Binary files a/pkgs/icons/unlock.gif and /dev/null differ
diff --git a/pkgs/icons/up-down-cursor.xbm b/pkgs/icons/up-down-cursor.xbm
deleted file mode 100644
index b1043d5343..0000000000
--- a/pkgs/icons/up-down-cursor.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define up_down_cursor_xbm_width 16
-#define up_down_cursor_xbm_height 16
-static char up_down_cursor_xbm_bits[] = {
-   0x00, 0x00, 0x00, 0x01, 0x80, 0x03, 0xC0, 0x07, 0x00, 0x01, 0x00, 0x01,
-   0x00, 0x01, 0xFC, 0x7F, 0xFC, 0x7F, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-   0xC0, 0x07, 0x80, 0x03, 0x00, 0x01, 0x00, 0x00 };
diff --git a/pkgs/icons/up-down-mask.xbm b/pkgs/icons/up-down-mask.xbm
deleted file mode 100644
index 7457e7b07e..0000000000
--- a/pkgs/icons/up-down-mask.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define up_down_mask_xbm_width 16
-#define up_down_mask_xbm_height 16
-static char up_down_mask_xbm_bits[] = {
-   0x00, 0x01, 0x80, 0x03, 0xC0, 0x07, 0xE0, 0x0F, 0xE0, 0x0F, 0x80, 0x03,
-   0xFE, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF, 0x80, 0x03, 0xE0, 0x0F,
-   0xE0, 0x0F, 0xC0, 0x07, 0x80, 0x03, 0x00, 0x01 };
diff --git a/pkgs/icons/very-small-planet.png b/pkgs/icons/very-small-planet.png
deleted file mode 100644
index 4bf4b39966..0000000000
Binary files a/pkgs/icons/very-small-planet.png and /dev/null differ
diff --git a/pkgs/icons/wizard-image.jpg b/pkgs/icons/wizard-image.jpg
deleted file mode 100644
index 3b12c48a10..0000000000
Binary files a/pkgs/icons/wizard-image.jpg and /dev/null differ
diff --git a/pkgs/icons/xml-box-open.jpg b/pkgs/icons/xml-box-open.jpg
deleted file mode 100644
index 275b4cfeeb..0000000000
Binary files a/pkgs/icons/xml-box-open.jpg and /dev/null differ
diff --git a/pkgs/icons/xml-box.jpg b/pkgs/icons/xml-box.jpg
deleted file mode 100644
index 385e936016..0000000000
Binary files a/pkgs/icons/xml-box.jpg and /dev/null differ
diff --git a/pkgs/images-pkgs/images-doc/LICENSE.txt b/pkgs/images-pkgs/images-doc/LICENSE.txt
deleted file mode 100644
index 28eed0045c..0000000000
--- a/pkgs/images-pkgs/images-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-images
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/images-pkgs/images-doc/images/info.rkt b/pkgs/images-pkgs/images-doc/images/info.rkt
deleted file mode 100644
index ab97279116..0000000000
--- a/pkgs/images-pkgs/images-doc/images/info.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang info
-(define scribblings '(["scribblings/images.scrbl" (multi-page) (gui-library)]))
diff --git a/pkgs/images-pkgs/images-doc/images/scribblings/compile-time.scrbl b/pkgs/images-pkgs/images-doc/images/scribblings/compile-time.scrbl
deleted file mode 100644
index c8894be5a6..0000000000
--- a/pkgs/images-pkgs/images-doc/images/scribblings/compile-time.scrbl
+++ /dev/null
@@ -1,96 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          (for-label images/compile-time
-                     images/icons/control
-                     images/icons/style
-                     images/logos
-                     racket racket/draw))
-
-@(define ctime-eval (make-base-eval))
-@interaction-eval[#:eval ctime-eval (require (for-syntax racket/base))]
-
-@(define (author-email) "neil.toronto@gmail.com")
-
-@title{Embedding Bitmaps in Compiled Files}
-@author{@(author+email "Neil Toronto" (author-email))}
-
-@defmodule[images/compile-time]
-
-Producing computed bitmaps can take time.
-To reduce the startup time of programs that use computed bitmaps, use the macros exported by @racketmodname[images/compile-time] to @italic{compile} them: to embed the computed bitmaps in fully expanded, compiled modules.
-
-@margin-note*{This is a form of constant folding, or equivalently a form of @italic{safe} ``3D'' values.}
-The macros defined here compute bitmaps at expansion time, and expand to the bitmap's @racket[bytes] and a simple wrapper that converts @racket[bytes] to a @racket[bitmap%].
-Thus, fully expanded, compiled modules contain (more or less) literal bitmap values, which do not need to be computed again when the module is @racket[require]d by another.
-
-The literal bitmap values are encoded in @link["http://en.wikipedia.org/wiki/Portable_Network_Graphics"]{PNG} or @link["http://en.wikipedia.org/wiki/JPEG"]{JPEG} format, so they are compressed in the compiled module.
-
-To get the most from compiled bitmaps during development, it is best to put them in files that are changed infrequently.
-For example, for games, we suggest having a separate module called something like @tt{images.rkt} or @tt{resources.rkt} that @racket[provide]s all the game's images.
-
-@defform[(compiled-bitmap expr [quality])
-         #:contracts ([expr (is-a?/c bitmap%)]
-                      [quality (integer-in 0 100)])]{
-Evaluates @racket[expr] at expansion time, which must return a @racket[bitmap%], and returns to the bitmap at run time.
-Keep in mind that @racket[expr] has access only to expansion-time values, not run-time values.
-
-If @racket[quality] is @racket[100], the bitmap is stored as a PNG.
-If @racket[quality] is between @racket[0] and @racket[99] inclusive, it is stored as a JPEG with quality @racket[quality].
-(See @method[bitmap% save-file].)
-If the bitmap has an alpha channel, its alpha channel is stored as a separate JPEG.
-The default value is @racket[100].
-
-Generally, to use this macro, wrap a @racket[bitmap%]-producing expression with it and move any identifiers it depends on into the expansion phase.
-For example, suppose we are computing a large PLT logo at run time:
-@codeblock|{#lang racket}|
-@racketblock+eval[#:eval ctime-eval
-(require images/logos)
-
-(define the-logo (plt-logo #:height 384))
-]
-Running this takes several seconds. It produces
-@interaction[#:eval ctime-eval the-logo]
-
-To move the cost to expansion time, we change the program to
-@codeblock|{
-#lang racket
-
-(require images/compile-time
-         (for-syntax images/logos))
-         
-(define the-logo (compiled-bitmap (plt-logo #:height 384)))
-}|
-The logo is unchanged, but now @italic{expanding} (and thus compiling) the program takes several seconds, and running it takes a few milliseconds.
-Note that @racketmodname[images/logos] is now required @racket[for-syntax], so that the expansion-phase expression @racket[(plt-logo #:height 384)]
-has access to the identifier @racket[plt-logo].
-}
-
-@defform[(compiled-bitmap-list expr [quality])
-         #:contracts ([expr (listof (is-a?/c bitmap%))]
-                      [quality (integer-in 0 100)])]{
-Like @racket[compiled-bitmap], but it expects @racket[expr] to return a @racket[list] of @racket[bitmap%]s, and it returns the list at run time.
-The @racket[quality] argument works as in @racket[compiled-bitmap], but is applied to all the images in the list.
-
-Use this for animations. For example,
-@codeblock|{#lang racket}|
-@racketblock+eval[#:eval ctime-eval
-(require images/compile-time
-         (for-syntax images/icons/stickman))
-
-(begin-for-syntax
-  (define num-stickman-frames 12))
-
-(define running-stickman-frames
-  (compiled-bitmap-list
-   (for/list ([t  (in-range 0 1 (/ 1 num-stickman-frames))])
-     (running-stickman-icon t #:height 32
-                            #:body-color "red"
-                            #:arm-color "white"
-                            #:head-color "red"))
-   50))
-]
-This computes
-@interaction[#:eval ctime-eval running-stickman-frames]
-at expansion time.
-}
diff --git a/pkgs/images-pkgs/images-doc/images/scribblings/flomap.scrbl b/pkgs/images-pkgs/images-doc/images/scribblings/flomap.scrbl
deleted file mode 100644
index f1c13428b2..0000000000
--- a/pkgs/images-pkgs/images-doc/images/scribblings/flomap.scrbl
+++ /dev/null
@@ -1,1310 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          (for-label racket
-                     images/flomap
-                     racket/draw
-                     racket/flonum
-                     slideshow)
-          images/flomap
-          pict)
-
-@(require (for-label (only-in typed/racket
-                              Integer Float Nonnegative-Fixnum Real Boolean
-                              FlVector Vectorof
-                              U Any Option)))
-
-@(define flomap-eval (make-base-eval))
-@interaction-eval[#:eval flomap-eval (require racket racket/flonum images/flomap)]
-
-@title[#:tag "flomap:title" #:style 'toc]{Floating-Point Bitmaps}
-@author{@(author+email "Neil Toronto" "neil.toronto@gmail.com")}
-
-@defmodule[images/flomap]
-
-The @racketmodname[images/flomap] module provides the struct type @racket[flomap], whose instances represent floating-point bitmaps with any number of color components.
-It also provides purely functional operations on flomaps for compositing, pointwise floating-point math, blur, gradient calculation, arbitrary spatial transforms (such as rotation), and conversion to and from @racket[bitmap%] instances.
-
-@bold{This is a Typed Racket module.}
-Its exports can generally be used from untyped code with negligible performance loss over typed code.
-Exceptions are documented @bold{in bold text}.
-Most exceptions are macros used to inline floating-point operations.
-
-The following flomap @racket[fm] is used in various examples:
-@interaction[#:eval flomap-eval
-                    (define fm
-                      (draw-flomap
-                       (λ (fm-dc)
-                         (send fm-dc set-alpha 0)
-                         (send fm-dc set-background "black")
-                         (send fm-dc clear)
-                         (send fm-dc set-alpha 1/3)
-                         (send fm-dc translate 2 2)
-                         (send fm-dc set-pen "black" 4 'long-dash)
-                         (send fm-dc set-brush "red" 'solid)
-                         (send fm-dc draw-ellipse 0 0 192 192)
-                         (send fm-dc set-brush "green" 'solid)
-                         (send fm-dc draw-ellipse 64 0 192 192)
-                         (send fm-dc set-brush "blue" 'solid)
-                         (send fm-dc draw-ellipse 32 44 192 192))
-                       260 240))
-                    (flomap->bitmap fm)]
-It is typical to use @racket[flomap->bitmap] to visualize a flomap at the REPL.
-
-Contents:
-@local-table-of-contents[]
-
-
-@; ===================================================================================================
-
-
-@section{Overview}
-
-Contents:
-@local-table-of-contents[]
-
-@subsection{Motivation}
-
-There are three main reasons to use flomaps:
-@(itemlist
-  @item{@bold{Precision.}
-         A point in a typical bitmap is represented by a few bytes, each of which can have one of 256 distinct values.
-         In contrast, a point in a flomap is represented by double-precision floating-point numbers, typically between @racket[0.0] and @racket[1.0] inclusive.
-         This range contains about 4.6 @italic{quintillion} (or 4.6×10@superscript{18}) distinct values.
-         While bytes are fine for many applications, their low precision becomes a problem when images are repeatedly operated on, or when their values are built by adding many small amounts---which are often rounded to zero.
-         }
-  @item{@bold{Range.}
-         A floating-point value can also represent about 4.6 quintillion distinct intensities above saturation (@racket[1.0]).
-         If distinguishing oversaturated values is important, flomaps have the range for it.
-         Further, floating-point images are closed under pointwise arithmetic (up to floating-point error).
-         }
-  @item{@bold{Speed.}
-         The @racketmodname[images/flomap] module benefits greatly from Typed Racket's type-directed optimizations.
-         Even getting individual color values---interpolated between points, if desired---is fast.
-         }
-  )
-For these reasons, other parts of the @racket[images] library use flomaps internally, to represent and operate on
-RGB and ARGB images, light maps, shadow maps, height maps, and normal maps.
-
-@subsection[#:tag "flomap:conceptual"]{Conceptual Model}
-
-A flomap is conceptually infinite in its width and height, but has nonzero values in a finite rectangle starting at coordinate @racket[0] @racket[0]
-and extending to its width and height (exclusive).
-A flomap is @bold{not} conceptually infinite in its components because there is no natural linear order on component coordinates, as the meaning of components depends on programmer intent.
-
-The following example creates a 10×10 bitmap with RGB components, and indexes its top-left red value and two values outside the finite, nonzero rectangle.
-It also attempts to index component @racket[3], which doesn't exist.
-Note that @racket[flomap-ref] accepts its coordinate arguments in a standard order: @racket[k] @racket[x] @racket[y] (with @racket[k] for @bold{k}omponent).
-@interaction[#:eval flomap-eval
-                    (define magenta-fm (make-flomap* 10 10 #(0.5 0.0 1.0)))
-                    (flomap->bitmap magenta-fm)
-                    (flomap-ref* magenta-fm 0 0)
-                    (flomap-ref* magenta-fm -1 0)
-                    (flomap-ref* magenta-fm 0 1000)
-                    (flomap-ref magenta-fm 3 0 0)]
-
-Many flomap functions, such as @racket[flomap-bilinear-ref] and @racket[flomap-rotate], treat their arguments as if every @italic{real} @racket[x] @racket[y] coordinate has values.
-In all such cases, known values are at half-integer coordinates and others are interpolated.
-
-@examples[#:eval flomap-eval
-                 (flomap-bilinear-ref* magenta-fm 0.5 0.5)
-                 (flomap-bilinear-ref* magenta-fm 0.25 0.25)
-                 (flomap-bilinear-ref* magenta-fm 0.0 0.0)
-                 (flomap-bilinear-ref* magenta-fm -0.25 -0.25)]
-
-This conceptual model allows us to treat flomaps as if they were multi-valued functions on @racket[Real]×@racket[Real].
-For example, we might plot the red component of an ARGB icon:
-@interaction[#:eval flomap-eval
-                    (require images/icons/misc plot)
-                    (define icon-fm (bomb-flomap #:bomb-color "orange" #:height 48))
-                    (flomap->bitmap icon-fm)
-                    (define-values (icon-width icon-height) (flomap-size icon-fm))
-                    (plot3d-bitmap (contour-intervals3d
-                                    (λ (x y) (flomap-bilinear-ref icon-fm 1 x y))
-                                    -0.5 (+ 0.5 icon-width) -0.5 (+ 0.5 icon-height)))]
-Notice that the plot's maximum height is above saturation (@racket[1.0]).
-The tallest peak corresponds to the specular highlight (the shiny part) on the bomb.
-Specular highlights are one case where it is important to operate on oversaturated values without truncating them---until it is time to display the image.
-
-If we have a @racket[w]×@racket[h] flomap and consider its known values as being at half-integer coordinates, the exact center of the flomap is at @racket[(* 1/2 w)] @racket[(* 1/2 h)].
-When unknown values are estimated using bilinear interpolation, the finite rectangle containing all the known @italic{and estimated} nonzero values is from @racket[-1/2] @racket[-1/2] to @racket[(+ w 1/2)] @racket[(+ h 1/2)].
-
-@subsection[#:tag "flomap:opacity"]{Opacity (Alpha Components)}
-
-A partially transparent flomap is simply a flomap in which component @racket[0] is assumed to be an alpha (opacity) component.
-The other components should be multiplied by their corresponding alpha value;
-i.e. an RGB triple @racket[1.0] @racket[0.5] @racket[0.25] with opacity @racket[0.5] should be represented
-by @racket[0.5] @racket[0.5] @racket[0.25] @racket[0.125].
-
-@margin-note*{This representation generally goes by the unfortunate misnomer ``premultiplied alpha,'' which makes it seem as if the @italic{alpha} component is multiplied by something.}
-We will refer to this representation as @italic{alpha-multiplied} because the color components are multiplied by the alpha component.
-All alpha-aware functions consume alpha-multiplied flomaps and produce alpha-multiplied flomaps.
-
-There are many good reasons to use alpha-multiplied flomaps instead of non-alpha-multiplied flomaps.
-Some are:
-@(itemlist
-  @item{Compositing requires fewer operations per point.}
-  @item{Compositing is associative; i.e. @racket[(flomap-lt-superimpose fm1 (flomap-lt-superimpose fm2 fm3))]
-        is the same as @racket[(flomap-lt-superimpose (flomap-lt-superimpose fm1 fm2) fm3)], up to floating-point error.}
-  @item{There is only one transparent point: all zeros.
-        We could not conceptualize partially transparent flomaps as being infinite in size without a unique transparent point.}
-  @item{Many functions can operate on flomaps without treating the alpha component specially and still be correct.}
-  )
-
-As an example of the last point, consider blur.
-The following example creates an alpha-multiplied flomap using @racket[draw-flomap].
-It blurs the flomap using a general-purpose (i.e. non-alpha-aware) blur function, then converts the flomap to non-alpha-multiplied and does the same.
-@interaction[#:eval flomap-eval
-                    (define circle-fm (draw-flomap (λ (fm-dc)
-                                                     (send fm-dc set-pen "black" 1 'transparent)
-                                                     (send fm-dc set-brush "green" 'solid)
-                                                     (send fm-dc draw-ellipse 10 10 30 30))
-                                                   50 50))
-                    (flomap->bitmap circle-fm)
-                    (flomap->bitmap (flomap-blur circle-fm 4 4))
-                    (let* ([fm  (flomap-divide-alpha circle-fm)]
-                           [fm  (flomap-blur fm 4 4)]
-                           [fm  (flomap-multiply-alpha fm)])
-                      (flomap->bitmap fm))]
-Notice the dark band around the second blurred circle.
-
-Of course, this could be fixed by making @racket[flomap-blur] operate differently on flomaps with an alpha component.
-But the implementation would amount to converting them to alpha-multiplied flomaps anyway.
-
-The only valid reason to not multiply color components by alpha is loss of precision, which is not an issue with flomaps.
-
-@subsection[#:tag "flomap:layout"]{Data Layout}
-
-For most applications, there should be enough flomap functions available that you should not need to access their fields directly.
-However, there will always be use cases for direct manipulation, so the fields are public.
-
-@(define (color-square n col [size 30])
-   (lt-superimpose (colorize (filled-rectangle size size) col)
-                   (colorize (rectangle size size) "black")
-                   (colorize (inset (text (number->string n) '(bold)) 2 1) "white")))
-
-@(define (rgb-squares n)
-   (panorama
-    (pin-over (color-square n "red")
-              10 10 (pin-over (color-square (+ n 1) "green")
-                              10 10 (color-square (+ n 2) "blue")))))
-
-@(define (rgb-square n)
-   (cc-superimpose (colorize (filled-rectangle 60 60) "white")
-                   (colorize (rectangle 60 60) "black")
-                   (rgb-squares n)))
-
-@(define (row n)
-   (cc-superimpose (colorize (filled-rectangle 135 70) "lightgray")
-                   (colorize (rectangle 135 70) "black")
-                   (ht-append (rgb-square n) (blank 5) (rgb-square (+ n 3)))))
-
-@(define (rgb-rect n)
-   (ht-append (color-square n "red")
-              (color-square (+ n 1) "green")
-              (color-square (+ n 2) "blue")))
-
-The color values in a flomap are stored flattened in a single @racket[FlVector], in row-major order with adjacent color components.
-For example, a 2×2 RGB flomap can be visualized as
-
-@(vl-append (row 0) (blank 5) (row 6))
-
-In a flomap, it would be stored as
-
-@(ht-append (rgb-rect 0) (rgb-rect 3) (rgb-rect 6) (rgb-rect 9))
-
-Mathematically, for a @racket[c]-component, @racket[w]-width flomap, the @racket[k]th color component at position @racket[x] @racket[y] is at index
-@racketblock[(+ k (* c (+ x (* y w))))]
-The @racket[coords->index] function carries out this calculation quickly using only fixnum arithmetic.
-
-If @racket[i] is a calculated index for the value at @racket[k] @racket[x] @racket[y],
-then the @racket[(+ k 1)]th value is at index @racket[(+ i 1)],
-the @racket[(+ x 1)]th value is at index @racket[(+ i c)],
-and the @racket[(+ y 1)]th value is at index @racket[(+ i (* c w))].
-
-
-@; ===================================================================================================
-
-
-@section{Struct Type and Accessors}
-
-@defstruct*[flomap ([values FlVector] [components Integer] [width Integer] [height Integer])]{
-Represents a @racket[width]×@racket[height] floating-point bitmap with @racket[components] color components.
-The @racketid[values] vector contains the flattened image data (see @secref{flomap:layout}).
-
-A guard ensures that the @racketid[values] field has length @racket[(* components width height)],
-and that each size field is a nonnegative fixnum.
-
-@examples[#:eval flomap-eval
-                 (require racket/flonum)
-                 (flomap (flvector 0.0 0.0 0.0 0.0) 4 1 1)
-                 (flomap (flvector) 0 0 0)
-                 (flomap (flvector 0.0) 2 1 1)]
-
-The default @racket[flomap] constructor is perhaps the hardest to use.
-Instead, to construct a @racket[flomap] from scratch, you should generally use @racket[make-flomap], @racket[make-flomap*], @racket[build-flomap] or @racket[draw-flomap].
-}
-
-@defproc[(flomap-size [fm flomap]) (values Nonnegative-Fixnum Nonnegative-Fixnum)]{
-Returns the width and height of @racket[fm] as nonnegative fixnums.
-}
-
-@defproc[(flomap-ref [fm flomap] [k Integer] [x Integer] [y Integer]) Float]{
-Returns @racket[fm]'s value at @racket[k] @racket[x] @racket[y].
-
-If @racket[x] or @racket[y] is out of bounds, this function returns @racket[0.0].
-If @racket[k] is out of bounds, it raises an error.
-The @secref{flomap:conceptual} section explains why @racket[k] is treated differently.
-}
-
-@defproc[(flomap-ref* [fm flomap] [x Integer] [y Integer]) FlVector]{
-Returns @racket[fm]'s component values at @racket[x] @racket[y] as an flvector.
-
-If @racket[x] or @racket[y] is out of bounds, this function returns an flvector filled with @racket[0.0].
-It always returns an flvector of length @racket[(flomap-components fm)].
-}
-
-@defproc[(flomap-bilinear-ref [fm flomap] [k Integer] [x Real] [y Real]) Float]{
-Returns an estimated value at any given @racket[k] @racket[x] @racket[y] coordinate, calculated from known values in @racket[fm].
-
-Like all other @racket[flomap] functions that operate on real-valued coordinates, @racket[flomap-bilinear-ref] regards known values as being at half-integer coordinates.
-Mathematically, if @racket[x] = @racket[(+ i 0.5)] and @racket[y] = @racket[(+ j 0.5)] for any integers @racket[i] and @racket[j],
-then @racket[(flomap-bilinear-ref fm k x y)] = @racket[(flomap-ref fm k i j)].
-
-Suppose @racket[fm] is size @racket[w]×@racket[h].
-If @racket[x] ≤ @racket[-0.5] or @racket[x] ≥ @racket[(+ w 0.5)], this function returns @racket[0.0]; similarly for @racket[y] and @racket[h].
-If @racket[k] is out of bounds, it raises an error.
-The @secref{flomap:conceptual} section explains why @racket[k] is treated differently.
-}
-
-@defproc[(flomap-bilinear-ref* [fm flomap] [x Real] [y Real]) FlVector]{
-Like @racket[flomap-bilinear-ref], but returns an flvector containing estimates of all the components at @racket[x] @racket[y].
-}
-
-@defproc[(flomap-min-value [fm flomap]) Float]
-@defproc[(flomap-max-value [fm flomap]) Float]{
-These return the minimum and maximum values in @racket[fm].
-}
-
-@defproc[(flomap-extreme-values [fm flomap]) (values Float Float)]{
-Equivalent to @racket[(values (flomap-min-value fm) (flomap-max-value fm))], but faster.
-}
-
-@defproc[(flomap-nonzero-rect [fm flomap]) (values Nonnegative-Fixnum Nonnegative-Fixnum
-                                                   Nonnegative-Fixnum Nonnegative-Fixnum)]{
-Returns the smallest rectangle containing every nonzero value (in any component) in @racket[fm].
-The values returned are @italic{x} minimum, @italic{y} minimum, @italic{x} maximum + 1, and @italic{y} maximum + 1.
-
-The values returned by @racket[flomap-nonzero-rect] can be sent to @racket[subflomap] to trim away zero values.
-But see @racket[flomap-trim], which is faster for alpha-multiplied flomaps.
-}
-
-@defproc[(coords->index [c Integer] [w Integer] [k Integer] [x Integer] [y Integer]) Fixnum]{
-Returns the index of the value at coordinates @racket[k] @racket[x] @racket[y] of a flomap with @racket[c] color components and width @racket[w].
-This function does not check any coordinates against their bounds.
-}
-
-@defproc[(unsafe-flomap-ref [vs FlVector]
-                            [c Integer] [w Integer] [h Integer]
-                            [k Integer] [x Integer] [y Integer]) Float]{
-If @racket[fm] = @racket[(flomap vs c w h)], returns @racket[fm]'s value at @racket[k] @racket[x] @racket[y].
-If @racket[x] or @racket[y] is out of bounds, this returns @racket[0.0].
-It is unsafe because @racket[k] is unchecked, as well as indexing into @racket[vs].
-
-This function is used by some library functions, such as @racket[flomap-bilinear-ref], to index into already-destructured flomaps.
-From untyped code, applying this function is likely no faster than applying @racket[flomap-ref], because of extra contract checks.
-}
-
-@defproc[(unsafe-flomap-ref* [vs FlVector]
-                             [c Integer] [w Integer] [h Integer]
-                             [x Integer] [y Integer]) FlVector]{
-Like @racket[unsafe-flomap-ref], but returns an flvector containing all the component values at @racket[x] @racket[y].
-}
-
-
-@; ===================================================================================================
-
-                                                                                          
-@section{Conversion and Construction}
-
-@defproc[(flomap->bitmap [fm flomap] [#:backing-scale backing-scale Positive-Real]) Any]{
-Converts a flomap to a @racket[bitmap%].
-
-The return type is imprecise because Typed Racket does not support the object system well yet.
-As a typed function, this is most useful in DrRacket's REPL to visualize flomaps; any other typed use is difficult.
-
-Flomaps are interpreted differently depending on the number of components:
-@(itemlist
-  @item{@bold{Zero components.} Raises an error.}
-  @item{@bold{One component.} Interpreted as intensity (grayscale).}
-  @item{@bold{Two components.} Interpreted as AL, or alpha+intensity, with intensity multiplied by alpha.}
-  @item{@bold{Three components.} Interpreted as RGB.}
-  @item{@bold{Four components.} Interpreted as ARGB with color components multiplied by alpha.}
-  @item{@bold{More components.} Raises an error.}
-  )
-See @secref{flomap:opacity} for a discussion of opacity (alpha) representation.
-
-A zero-size @racket[fm] is padded by one point in any zero direction before conversion.
-For example, if @racket[fm] is size 0×1, the result of @racket[(flomap->bitmap fm)] is size 1×1.
-
-Values are clamped to between @racket[0.0] and @racket[1.0] before conversion.
-}
-
-@defproc[(bitmap->flomap [bm Any] [#:unscaled? unscaled? Any]) flomap]{
-Given a @racket[bitmap%] instance @racket[bm], returns an ARGB flomap with alpha-multiplied color components.
-See @secref{flomap:opacity} for a discussion of opacity (alpha) representation.
-
-If @racket[unscaled?] is true, the flomap is converted from the actual bitmap backing @racket[bm] rather than a scaled version.
-See the @racket[#:unscaled?] keyword parameter of @method[bitmap% get-argb-pixels] for more information.
-
-The argument type is imprecise because Typed Racket does not support the object system well yet.
-}
-
-@defproc[(make-flomap [c Integer] [w Integer] [h Integer] [v Real 0.0]) flomap]{
-Returns a @racket[w]×@racket[h] flomap with @racket[c] components, with every value initialized to @racket[v].
-Analogous to @racket[make-vector].
-
-To create flomaps filled with a solid color, use @racket[make-flomap*].
-}
-
-@defproc[(make-flomap* [w Integer] [h Integer] [vs (U (Vectorof Real) FlVector)]) flomap]{
-Returns a @racket[w]×@racket[h] flomap with each point's components initialized using the values in @racket[vs].
-Analogous to @racket[make-vector].
-
-The following two examples create an RGB and an ARGB flomap:
-@interaction[#:eval flomap-eval
-                    (flomap->bitmap (make-flomap* 100 100 #(0.5 0.0 1.0)))
-                    (flomap->bitmap (make-flomap* 100 100 #(0.5 0.25 0.0 0.5)))]
-See @secref{flomap:opacity} for a discussion of opacity (alpha) representation.
-}
-
-@defproc[(build-flomap [c Integer] [w Integer] [h Integer]
-                       [f (Nonnegative-Fixnum Nonnegative-Fixnum Nonnegative-Fixnum -> Real)]) flomap]{
-Returns a @racket[w]×@racket[h] flomap with @racket[c] color components, with values defined by @racket[f].
-Analogous to @racket[build-vector].
-
-The function @racket[f] receives three arguments @racket[k] @racket[x] @racket[y]: the color component and two positional coordinates.
-
-@examples[#:eval flomap-eval
-                 (flomap->bitmap
-                  (build-flomap 1 100 100
-                                (λ (k x y) (/ (+ x y) 200))))
-                 (define sine-fm
-                   (build-flomap
-                    1 100 100
-                    (λ (k x y)
-                      (* 1/2 (+ 1 (sin (sqrt (+ (sqr (- x 50))
-                                                (sqr (- y 50))))))))))
-                 (flomap->bitmap sine-fm)]
-
-To build a flomap using a function that returns vectors, see @racket[build-flomap*].
-}
-
-@defproc[(build-flomap* [c Integer] [w Integer] [h Integer]
-                        [f (Nonnegative-Fixnum Nonnegative-Fixnum
-                            -> (U (Vectorof Real) FlVector))]) flomap]{
-Returns a @racket[w]×@racket[h] flomap with @racket[c] color components.
-Its values are defined by @racket[f], which returns vectors of point components.
-The vectors returned by @racket[f] must be length @racket[c].
-
-Analogous to @racket[build-vector].
-
-@examples[#:eval flomap-eval
-                 (flomap->bitmap
-                  (build-flomap* 4 100 100
-                                 (λ (x y)
-                                   (vector (/ (+ x y) 200)
-                                           (/ (+ (- 100 x) y) 200)
-                                           (/ (+ (- 100 x) (- 100 y)) 200)
-                                           (/ (+ x (- 100 y)) 200)))))
-                 
-                 (build-flomap* 4 100 100
-                                (λ (x y) (vector (/ (+ x y) 200))))]
-}
-
-@defproc[(draw-flomap [draw (Any -> Any)] [w Integer] [h Integer]) flomap]{
-Returns a @racket[w]×@racket[h] bitmap drawn by @racket[draw].
-Analogous to @racketmodname[slideshow]'s @racket[dc].
-
-The @racket[draw] function should accept a @racket[dc<%>] instance and use its drawing methods to draw on an underlying bitmap.
-The bitmap is converted to a flomap using @racket[bitmap->flomap] and returned.
-See @secref{flomap:title} for an example.
-
-This function is very difficult to use in Typed Racket, requiring occurrence checks for, and use of, experimental types.
-However, as Typed Racket grows to handle Racket's object system, the types will be made more precise.
-}
-
-@defproc[(flomap-multiply-alpha [fm flomap]) flomap]
-@defproc[(flomap-divide-alpha [fm flomap]) flomap]{
-Multiplies/divides each nonzero-component value with the corresponding zero-component value.
-Dividing by @racket[0.0] produces @racket[0.0].
-
-In other words, @racket[flomap-multiply-alpha] converts non-alpha-multiplied flomaps into alpha-multiplied flomaps,
-and @racket[flomap-divide-alpha] converts them back.
-
-You should not generally have to use these functions, because @racket[bitmap->flomap] returns an alpha-multiplied flomap and every alpha-aware flomap function assumes its arguments are alpha-multiplied and produces alpha-multiplied flomaps.
-
-See @secref{flomap:opacity} for a discussion of opacity (alpha) representation.
-}
-
-@defform[(inline-build-flomap c w h f)
-         #:contracts ([c Integer]
-                      [w Integer]
-                      [h Integer]
-                      [f (Nonnegative-Fixnum Nonnegative-Fixnum Nonnegative-Fixnum
-                          Nonnegative-Fixnum -> Float)])]{
-A macro version of @racket[build-flomap].
-
-There are three differences between the function @racket[f] passed to @racket[build-flomap] and the @racket[f] passed to @racket[inline-build-flomap].
-First, the @racket[f] passed to @racket[inline-build-flomap] can be a macro.
-Second, it receives arguments @racket[k] @racket[x] @racket[y] @racket[i], where @racket[i] is a precalculated index into the result's @racketid[values].
-Third, it must return a @racket[Float].
-
-Using @racket[inline-build-flomap] instead of @racket[build-flomap] may ensure that @racket[f] is inlined, and therefore floats remain unboxed.
-Many library functions use @racket[inline-build-flomap] internally for speed, notably @racket[fm+] and the other pointwise arithmetic operators.
-
-@bold{This is not available in untyped Racket.}
-}
-
-@defform[(inline-build-flomap* c w h f)
-         #:contracts ([c Integer]
-                      [w Integer]
-                      [h Integer]
-                      [f (Nonnegative-Fixnum Nonnegative-Fixnum
-                          Nonnegative-Fixnum -> FlVector)])]{
-A macro version of @racket[build-flomap*].
-
-There are three differences between the function @racket[f] passed to @racket[build-flomap*] and the @racket[f] passed to @racket[inline-build-flomap*].
-First, the @racket[f] passed to @racket[inline-build-flomap*] can be a macro.
-Second, it receives arguments @racket[x] @racket[y] @racket[i], where @racket[i] is a precalculated index into the result's @racketid[values].
-Third, it must return a @racket[FlVector].
-
-@bold{This is not available in untyped Racket.}
-}
-
-
-@; ===================================================================================================
-
-
-@section{Component Operations}
-
-@defproc[(flomap-ref-component [fm flomap] [k Integer]) flomap]{
-Extracts one component of a flomap and returns it as a new flomap.
-Raises an error if @racket[k] is out of bounds.
-
-Use this, for example, to extract the A and R components from an ARGB flomap:
-@interaction[#:eval flomap-eval
-                    (flomap->bitmap (flomap-ref-component fm 0))
-                    (flomap->bitmap (flomap-ref-component fm 1))]
-}
-
-@defproc[(flomap-take-components [fm flomap] [k Integer]) flomap]{
-Extracts the first @racket[k] components and returns them as a new flomap.
-Raises an error if @racket[k] is out of bounds.
-@examples[#:eval flomap-eval (flomap->bitmap (flomap-take-components fm 2))]
-}
-
-@defproc[(flomap-drop-components [fm flomap] [k Integer]) flomap]{
-Extracts all but the first @racket[k] components and returns them as a new flomap.
-Raises an error if @racket[k] is out of bounds.
-
-Use this, for example, to operate on only the RGB channels of an ARGB flomap:
-@interaction[#:eval flomap-eval
-                    (flomap->bitmap
-                     (flomap-append-components (flomap-take-components fm 1)
-                                               (fm* 0.25 (flomap-drop-components fm 1))))]
-}
-
-@defproc[(flomap-append-components [fm0 flomap] [fm flomap] ...) flomap]{
-Appends the components of the given flomaps pointwise.
-Raises an error if not all flomaps are the same width and height.
-
-@examples[#:eval flomap-eval
-                 (equal? fm (flomap-append-components (flomap-take-components fm 2)
-                                                      (flomap-drop-components fm 2)))
-                 (flomap-append-components (make-flomap 1 10 10)
-                                           (make-flomap 3 20 20))]
-
-This function could behave according to the @secref{flomap:conceptual}---that is, expand the smaller ones to the largest size before appending.
-However, appending the components of two different-size flomaps almost always indicates a logic or design error.
-If it really is intended, use @racket[flomap-inset] or @racket[subflomap] to expand the smaller flomaps manually, with more control over the expansion.
-}
-
-
-@; ===================================================================================================
-
-
-@section{Pointwise Operations}
-
-@defproc[(fmsqrt [fm flomap]) flomap]
-@defproc[(fmsqr [fm flomap]) flomap]{
-Unary functions, lifted pointwise to operate on flomaps.
-Defined as @racket[(inline-flomap-lift flsqrt)] and so on.
-
-For example, to estimate the local gradient magnitude at each point in a flomap:
-@interaction[#:eval flomap-eval
-                    (define-values (dx-fm dy-fm)
-                      (flomap-gradient (flomap-drop-components fm 1)))
-                    (flomap->bitmap
-                     (fmsqrt (fm+ (fmsqr dx-fm) (fmsqr dy-fm))))]
-}
-
-@defproc[(flomap-lift [f (Float -> Real)]) (flomap -> flomap)]{
-Lifts a unary floating-point function to operate pointwise on flomaps.
-}
-
-@defproc[(flomap-normalize [fm flomap]) flomap]{
-Returns a flomap like @racket[fm], but with values linearly rescaled to be between @racket[0.0] and @racket[1.0] inclusive.
-@examples[#:eval flomap-eval
-                 (define gray-fm
-                   (build-flomap 1 100 100 (λ (k x y) (+ 0.375 (/ (+ x y) 800)))))
-                 (flomap->bitmap gray-fm)
-                 (flomap->bitmap (flomap-normalize gray-fm))]
-Besides increasing contrast, you could use this function to visualize oversaturated flomaps, or visualize flomaps that don't correspond directly to displayed images, such as height maps and normal maps.
-}
-
-@defproc[(fm+ [fm1 (U Real flomap)] [fm2 (U Real flomap)]) flomap]
-@defproc[(fm- [fm1 (U Real flomap)] [fm2 (U Real flomap)]) flomap]
-@defproc[(fm* [fm1 (U Real flomap)] [fm2 (U Real flomap)]) flomap]
-@defproc[(fm/ [fm1 (U Real flomap)] [fm2 (U Real flomap)]) flomap]
-@defproc[(fmmin [fm1 (U Real flomap)] [fm2 (U Real flomap)]) flomap]
-@defproc[(fmmax [fm1 (U Real flomap)] [fm2 (U Real flomap)]) flomap]{
-Arithmetic, @racket[flmin] and @racket[flmax] lifted to operate pointwise on flomaps.
-Defined as @racket[(inline-flomap-lift2 +)] and so on.
-
-Binary operations accept the following argument combinations, in either order:
-@(itemlist
-  @item{@bold{Two @racket[flomap]s.} Both flomaps must have the same number of components, or one of them must have one component.
-         If one flomap has one component, it is (conceptually) self-appended (see @racket[flomap-append-components]) as much as needed before the operation.
-         In either case, both flomaps must have the same width and height.}
-  @item{@bold{One @racket[flomap], one @racket[Real].} In this case, the real value is (conceptually) made into a uniform flomap (see @racket[make-flomap]) before applying the operation.}
-  )
-Any other argument combination will raise a type error.
-
-@examples[#:eval flomap-eval
-                 (define fm1 (build-flomap 1 260 240 (λ (k x y) (/ (+ x y) 500))))
-                 (define fm2 (fm- 1.0 fm1))
-                 (flomap->bitmap fm1)
-                 (flomap->bitmap fm2)
-                 (flomap->bitmap (fmmax fm1 fm2))
-                 (flomap->bitmap (fm* fm1 fm))
-                 (fm/ (make-flomap 1 10 10 0.5)
-                      (make-flomap 1 30 30 0.25))]
-}
-
-Binary pointwise operators could behave according to the @secref{flomap:conceptual}---that is, expand the smaller one to the larger size by filling it with @racket[0.0].
-However, operating on the components of two different-size flomaps almost always indicates a logic or design error.
-If it really is intended, use @racket[flomap-inset] or @racket[subflomap] to expand the smaller flomap manually, with more control over the expansion.
-
-Because @racket[fm] is an alpha-multiplied flomap (see @secref{flomap:opacity}), multiplying each component by a scalar less than @racket[1.0] results in a more transparent flomap:
-@interaction[#:eval flomap-eval
-                    (flomap->bitmap (fm* fm 0.2))]
-
-@defproc[(flomap-lift2 [f (Float Float -> Real)]) ((U Real flomap) (U Real flomap) -> flomap)]{
-Lifts a binary floating-point function to operate pointwise on flomaps, allowing the same argument combinations as @racket[fm+] and others.
-}
-
-@defform[(inline-flomap-lift f) #:contracts ([f (Float -> Float)])]{
-A macro version of @racket[flomap-lift].
-The function or macro @racket[f] must return a @racket[Float], not a @racket[Real] as the @racket[f] argument to @racket[flomap-lift] can.
-
-Using @racket[inline-flomap-lift] instead of @racket[flomap-lift] may ensure that @racket[f] is inlined, and therefore floats remain unboxed.
-
-@bold{This is not available in untyped Racket.}
-}
-
-@defform[(inline-flomap-lift2 f) #:contracts ([f (Float Float -> Float)])]{
-A macro version of @racket[flomap-lift2].
-The function or macro @racket[f] must return a @racket[Float], not a @racket[Real] as the @racket[f] argument to @racket[flomap-lift2] can.
-
-Using @racket[inline-flomap-lift2] instead of @racket[flomap-lift2] may ensure that @racket[f] is inlined, and therefore floats remain unboxed.
-
-@bold{This is not available in untyped Racket.}
-}
-
-
-@; ===================================================================================================
-
-
-@section{Gradients and Normals}
-
-@defproc[(flomap-gradient-x [fm flomap]) flomap]
-@defproc[(flomap-gradient-y [fm flomap]) flomap]{
-These return, per-component, estimates of the local @italic{x}- and @italic{y}-directional derivatives using a 3×3 @link["http://en.wikipedia.org/wiki/Sobel_operator#Alternative_operators"]{Scharr operator}.
-}
-
-@defproc[(flomap-gradient [fm flomap]) (values flomap flomap)]{
-Equivalent to @racket[(values (flomap-gradient-x fm) (flomap-gradient-y fm))].
-
-@examples[#:eval flomap-eval
-                 (define-values (dx-fm dy-fm)
-                   (flomap-gradient (flomap-drop-components fm 1)))
-                 (values (flomap->bitmap (fm* 0.5 (fm+ 1.0 dx-fm)))
-                         (flomap->bitmap (fm* 0.5 (fm+ 1.0 dy-fm))))]
-}
-
-@defproc[(flomap-gradient-normal [fm flomap]) flomap]{
-Given a one-component flomap, returns a @racket[3]-component flomap containing estimated normals.
-In other words, @racket[flomap-normal] converts height maps to normal maps.
-@examples[#:eval flomap-eval
-                 (flomap->bitmap sine-fm)
-                 (flomap->bitmap (flomap-gradient-normal sine-fm))
-                 (flomap-gradient-normal fm)]
-}
-
-
-@; ===================================================================================================
-
-
-@section{Blur}
-
-@defproc[(flomap-gaussian-blur [fm flomap] [xσ Real] [yσ Real xσ]) flomap]{
-Returns @racket[fm] convolved, per-component, with an axis-aligned Gaussian kernel with standard deviations @racket[xσ] and @racket[yσ].
-
-If perfect Gaussian blur is not important, use @racket[flomap-blur] instead, which approximates Gaussian blur closely and is faster.
-
-@examples[#:eval flomap-eval
-                 (flomap->bitmap (flomap-gaussian-blur (flomap-inset fm 12) 4))
-                 (flomap->bitmap (flomap-gaussian-blur (flomap-inset fm 12 3) 4 1))]
-}
-
-@defproc[(flomap-gaussian-blur-x [fm flomap] [σ Real]) flomap]{
-Returns @racket[fm] convolved, per-component and per-row, with a Gaussian kernel with standard deviation @racket[σ].
-
-If perfect Gaussian blur is not important, use @racket[flomap-blur-x] instead, which approximates Gaussian blur closely and is usually much faster.
-
-@examples[#:eval flomap-eval
-                 (flomap->bitmap (flomap-gaussian-blur-x (flomap-inset fm 12 0) 4))]
-}
-
-@defproc[(flomap-gaussian-blur-y [fm flomap] [σ Real]) flomap]{
-Like @racket[flomap-gaussian-blur-x], but per-column instead of per-row.
-}
-
-@defproc[(flomap-box-blur [fm flomap] [x-radius Real] [y-radius Real x-radius]) flomap]{
-Returns @racket[fm] convolved, per-component, with a box kernel with radii @racket[x-radius] and @racket[y-radius].
-The radii are of the largest axis-aligned ellipse that would fit in the box.
-@examples[#:eval flomap-eval
-                 (flomap->bitmap (flomap-box-blur (flomap-inset fm 4) 4))
-                 (flomap->bitmap (flomap-box-blur (flomap-inset fm 4 1) 4 1))]
-}
-
-@defproc[(flomap-box-blur-x [fm flomap] [radius Real]) flomap]{
-Returns @racket[fm] convolved, per-component and per-row, with a box kernel with radius @racket[radius].
-@examples[#:eval flomap-eval
-                 (flomap->bitmap (flomap-box-blur-x (flomap-inset fm 4 0) 4))]
-}
-
-@defproc[(flomap-box-blur-y [fm flomap] [radius Real]) flomap]{
-Like @racket[flomap-box-blur-x], but per-column instead of per-row.
-}
-
-@defproc[(flomap-blur [fm flomap] [xσ Real] [yσ Real xσ]) flomap]{
-Returns approximately the result of @racket[(flomap-gaussian-blur fm xσ yσ)].
-
-Gaussian blur, as it is implemented by @racket[flomap-gaussian-blur], is O(@racket[xσ] + @racket[yσ]) for any fixed flomap size.
-On the other hand, @racket[flomap-blur] is O(1) for the same size.
-@examples[#:eval flomap-eval
-                 (define gauss-blur-fm (time (flomap-gaussian-blur fm 12)))
-                 (define blur-fm (time (flomap-blur fm 12)))
-                 (flomap-extreme-values
-                  (fmsqr (fm- gauss-blur-fm blur-fm)))]
-}
-
-@defproc[(flomap-blur-x [fm flomap] [xσ Real]) flomap]{
-Like @racket[flomap-blur], but blurs per-row only.
-}
-
-@defproc[(flomap-blur-y [fm flomap] [yσ Real]) flomap]{
-Like @racket[flomap-blur], but blurs per-column only.
-}
-
-
-@; ===================================================================================================
-
-
-@section{Resizing}
-
-@defproc[(flomap-copy [fm flomap] [x-start Integer] [y-start Integer] [x-end Integer] [y-end Integer]) flomap]{
-Returns the part of @racket[fm] for which the @racket[x] coordinate is @racket[x-start] ≤ @racket[x] < @racket[x-end] and the @racket[y] coordinate is @racket[y-start] ≤ @racket[y] < @racket[y-end].
-If @racket[x-start] ≥ @racket[x-end], the result is width @racket[0], and if @racket[y-start] ≥ @racket[y-end], the result is height @racket[0].
-
-The interval arguments may identify a rectangle with points outside the bounds of @racket[fm].
-In this case, the points' values in the returned flomap are @racket[0.0], as per the @secref{flomap:conceptual}.
-
-This function is guaranteed to return a copy.
-}
-
-@defproc[(subflomap [fm flomap] [x-start Integer] [y-start Integer] [x-end Integer] [y-end Integer]) flomap]{
-Like @racket[flomap-copy], but returns @racket[fm] when @racket[x-start] and @racket[y-start] are @racket[0], and @racket[x-end] and @racket[y-end] are respectively the width and height of @racket[fm].
-
-Use @racket[subflomap] instead of @racket[flomap-copy] when programming functionally.
-Every library function that returns parts of a flomap (such as @racket[flomap-trim] and @racket[flomap-inset]) is defined using @racket[subflomap].
-}
-
-@defproc[(flomap-trim [fm flomap] [alpha? Boolean #t]) flomap]{
-Shrinks @racket[fm] to its largest nonzero rectangle.
-If @racket[alpha?] is @racket[#t], it uses only component 0 to determine the largest nonzero rectangle; otherwise, it uses every component.
-
-This function cannot return a larger flomap.
-
-@examples[#:eval flomap-eval
-                 (define small-circle-fm
-                   (draw-flomap (λ (fm-dc)
-                                  (send fm-dc draw-ellipse 20 20 10 10))
-                                100 100))
-                 (flomap->bitmap small-circle-fm)
-                 (flomap->bitmap (flomap-trim small-circle-fm))]
-See @racket[flomap-nonzero-rect].
-}
-
-@defproc*[([(flomap-inset [fm flomap] [amt Integer]) flomap]
-           [(flomap-inset [fm flomap] [h-amt Integer] [v-amt Integer]) flomap]
-           [(flomap-inset [fm flomap] [l-amt Integer] [t-amt Integer] [r-amt Integer] [b-amt Integer]) flomap])]{
-Extends @racket[fm] by some amount on each side, filling any new values with @racket[0.0].
-Positive inset amounts grow the flomap; negative insets shrink it.
-Large negative insets may shrink it to 0×0, which is a valid flomap size.
-@examples[#:eval flomap-eval (flomap->bitmap (flomap-inset fm -10 20 -30 -40))]
-}
-
-@defproc[(flomap-crop [fm flomap] [w Integer] [h Integer] [left-frac Real] [top-frac Real]) flomap]{
-Shrinks or grows @racket[fm] to be size @racket[w]×@racket[h].
-The proportion of points removed/added to the left and top are given by @racket[left-frac] and @racket[top-frac];
-e.g. @racket[left-frac] = @racket[1/2] causes the same number to be removed/added to the left and right sides.
-
-You will most likely want to use one of the following cropping functions instead, which are defined using @racket[flomap-crop].
-}
-
-@defproc[(flomap-lt-crop [fm flomap] [w Integer] [h Integer]) flomap]
-@defproc[(flomap-lc-crop [fm flomap] [w Integer] [h Integer]) flomap]
-@defproc[(flomap-lb-crop [fm flomap] [w Integer] [h Integer]) flomap]
-@defproc[(flomap-ct-crop [fm flomap] [w Integer] [h Integer]) flomap]
-@defproc[(flomap-cc-crop [fm flomap] [w Integer] [h Integer]) flomap]
-@defproc[(flomap-cb-crop [fm flomap] [w Integer] [h Integer]) flomap]
-@defproc[(flomap-rt-crop [fm flomap] [w Integer] [h Integer]) flomap]
-@defproc[(flomap-rc-crop [fm flomap] [w Integer] [h Integer]) flomap]
-@defproc[(flomap-rb-crop [fm flomap] [w Integer] [h Integer]) flomap]{
-These shrink or grow @racket[fm] to be size @racket[w]×@racket[h].
-The two-letter abbreviation determines which area of the flomap is preserved.
-For example, @racket[flomap-lt-crop] (``flomap left-top crop'') preserves the left-top corner:
-@interaction[#:eval flomap-eval (flomap->bitmap (flomap-lt-crop fm 150 150))]
-}
-
-@defproc[(flomap-scale [fm flomap] [x-scale Real] [y-scale Real x-scale]) flomap]{
-Scales @racket[fm] to a proportion of its size.
-Uses bilinear interpolation to sample between integer coordinates, and reduces resolution (blurs) correctly before downsampling so that shrunk images are still sharp but not aliased (pixelated-looking).
-@examples[#:eval flomap-eval
-                 (flomap->bitmap (flomap-scale fm 1/8))
-                 (flomap->bitmap (flomap-scale sine-fm 4))
-                 (flomap-scale fm 0)]
-}
-
-@defproc[(flomap-resize [fm flomap] [w (Option Integer)] [h (Option Integer)]) flomap]{
-Like @racket[flomap-scale], but accepts a width @racket[w] and height @racket[h] instead of scaling proportions.
-If either size is @racket[#f], the flomap is scaled in that direction to maintain its aspect ratio.
-@examples[#:eval flomap-eval
-                 (flomap->bitmap (flomap-resize fm 50 #f))
-                 (flomap->bitmap (flomap-resize fm #f 50))
-                 (flomap->bitmap (flomap-resize fm 20 50))
-                 (flomap-resize fm 0 0)]
-}
-
-
-@; ===================================================================================================
-
-
-@section{Compositing}
-
-Unless stated otherwise, compositing functions assume every flomap argument has an alpha component.
-
-@defproc*[([(flomap-pin [fm1 flomap] [x1 Integer] [y1 Integer] [fm2 flomap]) flomap]
-           [(flomap-pin [fm1 flomap] [x1 Integer] [y1 Integer]
-                        [fm2 flomap] [x2 Integer] [y2 Integer]) flomap])]{
-Superimposes @racket[fm2] over @racket[fm1] so that point @racket[x2] @racket[y2] on flomap @racket[f2] is directly over point @racket[x1] @racket[y1] on flomap @racket[f1].
-If @racket[x2] and @racket[y2] are not provided, they are assumed to be @racket[0].
-The result is expanded as necessary.
-
-@racket[fm1] and @racket[fm2] must have the same number of components.
-
-@examples[#:eval flomap-eval
-                 (flomap-pin fm -10 -10 sine-fm)
-                 (define circle-fm
-                   (draw-flomap (λ (fm-dc)
-                                  (send fm-dc set-pen "black" 4 'short-dash)
-                                  (send fm-dc set-brush "yellow" 'solid)
-                                  (send fm-dc set-alpha 1/2)
-                                  (send fm-dc draw-ellipse 2 2 124 124))
-                                128 128))
-                 (flomap->bitmap (flomap-pin fm 0 0 circle-fm 64 64))
-                 (flomap->bitmap (flomap-pin sine-fm 50 0 sine-fm))]
-
-The other compositing functions are defined in terms of @racket[flomap-pin].
-}
-
-@defproc[(flomap-pin* [x1-frac Real] [y1-frac Real]
-                      [x2-frac Real] [y2-frac Real]
-                      [fm0 flomap] [fm flomap] ...) flomap]{
-For each adjacent pair @racket[fm1] @racket[fm2] in the argument list, pins @racket[fm2] over @racket[fm1].
-
-The pin-over points are calculated from the four real arguments as follows.
-If @racket[fm1] is size @racket[w1]×@racket[h1], then @racket[x1] = @racket[(* w1 x1-frac)] and @racket[y1] = @racket[(* h1 y1-frac)], and similarly for @racket[x2] and @racket[y2].
-
-The following example pins the upper-left corner of each @racket[fm2] over a point near the upper-left corner of each @racket[fm1]:
-@interaction[#:eval flomap-eval
-                    (flomap->bitmap (flomap-pin* 1/8 1/8 0 0
-                                                 circle-fm circle-fm circle-fm))]
-
-All the flomap superimpose and append functions are defined using @racket[flomap-pin*] with different pin-over point fractions.
-For example, @racket[(flomap-lt-superimpose fm0 fm ...)] = @racket[(flomap-pin* 0 0 0 0 fm0 fm ...)],
-and @racket[(flomap-vc-append fm0 fm ...)] = @racket[(flomap-pin* 1/2 1 1/2 0 fm0 fm ...)].
-}
-
-@defproc[(flomap-lt-superimpose [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-lc-superimpose [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-lb-superimpose [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-ct-superimpose [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-cc-superimpose [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-cb-superimpose [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-rt-superimpose [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-rc-superimpose [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-rb-superimpose [fm0 flomap] [fm flomap] ...) flomap]{
-These create a new flomap by superimposing the flomaps in the argument list.
-The two-letter abbreviation determines the pin-over points.
-For example, @racket[flomap-lt-superimpose] (``flomap left-top superimpose'') pins points @racket[0] @racket[0] together on each adjacent pair of flomaps:
-@interaction[#:eval flomap-eval
-                    (flomap->bitmap (flomap-lt-superimpose fm circle-fm))]
-See @racket[flomap-pin] and @racket[flomap-pin*] for implementation details.
-}
-
-@defproc[(flomap-vl-append [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-vc-append [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-vr-append [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-ht-append [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-hc-append [fm0 flomap] [fm flomap] ...) flomap]
-@defproc[(flomap-hb-append [fm0 flomap] [fm flomap] ...) flomap]{
-These create a new flomap by spatially appending the flomaps in the argument list.
-The two-letter abbreviation determines direction (@racketid[v] or @racketid[h]) and alignment (@racketid[l], @racketid[c], @racketid[r], or @racketid[t], @racketid[c], @racketid[b]).
-@examples[#:eval flomap-eval
-                 (flomap->bitmap (flomap-ht-append circle-fm fm
-                                                   (flomap-scale circle-fm 1/2)))]
-See @racket[flomap-pin] and @racket[flomap-pin*] for implementation details.
-}
-
-
-@; ===================================================================================================
-
-
-@section{Spatial Transformations}
-
-This section gives the API for applying spatial transforms to a flomap, such as rotations, warps, morphs, and lens distortion effects.
-
-To use the provided transforms, apply a function like @racket[flomap-flip-horizontal] directly,
-or apply something like a @racket[flomap-rotate-transform] to a flomap using @racket[flomap-transform].
-
-To make your own transforms, compose existing ones with @racket[flomap-transform-compose], or construct a value of type @racket[Flomap-Transform] directly:
-@racketblock[(: my-awesome-transform Flomap-Transform)
-             (define (my-awesome-transform w h)
-               (make-flomap-2d-mapping fun inv))]
-Here, @racket[fun] is a mapping from input coordinates to output coordinates and @racket[inv] is its inverse.
-
-Contents:
-@local-table-of-contents[]
-
-@subsection{Provided Transformations}
-
-@defproc[(flomap-flip-horizontal [fm flomap]) flomap]
-@defproc[(flomap-flip-vertical [fm flomap]) flomap]
-@defproc[(flomap-transpose [fm flomap]) flomap]
-@defproc[(flomap-cw-rotate [fm flomap]) flomap]
-@defproc[(flomap-ccw-rotate [fm flomap]) flomap]{
-Some standard image transforms.
-These are lossless, in that repeated applications do not degrade (blur or alias) the image.
-@examples[#:eval flomap-eval
-                 (require pict)
-                 (define text-fm
-                   (flomap-trim
-                    (bitmap->flomap
-                     (pict->bitmap (vc-append (text "We CLAIM the" '(bold) 25)
-                                              (text "PRIVILEGE" '(bold) 25))))))
-                 (flomap->bitmap text-fm)
-                 (flomap->bitmap (flomap-flip-horizontal text-fm))
-                 (flomap->bitmap (flomap-flip-vertical text-fm))
-                 (flomap->bitmap (flomap-transpose text-fm))
-                 (flomap->bitmap (flomap-cw-rotate text-fm))
-                 (flomap->bitmap (flomap-ccw-rotate text-fm))
-                 (equal? (flomap-cw-rotate fm)
-                         (flomap-flip-vertical (flomap-transpose fm)))
-                 (equal? (flomap-ccw-rotate fm)
-                         (flomap-flip-horizontal (flomap-transpose fm)))]
-}
-
-@defproc[(flomap-rotate [fm flomap] [θ Real]) flomap]{
-Returns a flomap rotated by @racket[θ] radians counterclockwise.
-Equivalent to @racket[(flomap-transform fm (flomap-rotate-transform θ))].
-@examples[#:eval flomap-eval
-                 (flomap->bitmap (flomap-rotate text-fm (* 1/4 pi)))]
-}
-
-@defproc[(flomap-rotate-transform [θ Real]) Flomap-Transform]{
-Returns a flomap transform that rotates a flomap @racket[θ] radians counterclockwise around its (@racket[Real]-valued) center.
-
-Use @racket[flomap-rotate-transform] if you need to know the bounds of the rotated flomap or need to compose a rotation with another transform using @racket[flomap-transform-compose].
-
-@examples[#:eval flomap-eval
-                 (flomap-transform-bounds (flomap-rotate-transform (* 1/4 pi))
-                                          100 100)
-                 (flomap->bitmap
-                  (flomap-transform text-fm (flomap-rotate-transform (* 1/4 pi))))]
-}
-
-@defproc[(flomap-whirl-transform [θ Real]) Flomap-Transform]{
-Returns a flomap transform that ``whirls'' a flomap: rotates it counterclockwise @racket[θ] radians in the center, and rotates less with more distance from the center.
-
-This transform does not alter the size of its input.
-
-@examples[#:eval flomap-eval
-                 (flomap->bitmap
-                  (flomap-transform text-fm (flomap-whirl-transform pi)))]
-}
-
-@defproc[(flomap-fisheye-transform [α Real]) Flomap-Transform]{
-Returns a flomap transform that simulates ``fisheye'' lens distortion with an @racket[α] diagonal angle of view.
-Equivalent to
-@racketblock[(flomap-projection-transform (equal-area-projection α)
-                                          (perspective-projection α)
-                                          #f)]
-
-@examples[#:eval flomap-eval
-                 (flomap->bitmap
-                  (flomap-transform text-fm (flomap-fisheye-transform (* 2/3 pi))))]
-}
-
-@defproc[(flomap-scale-transform [x-scale Real] [y-scale Real x-scale]) Flomap-Transform]{
-Returns a flomap transform that scales flomaps by @racket[x-scale] horizontally and @racket[y-scale] vertically.
-
-You should generally prefer to use @racket[flomap-scale], which is faster and correctly reduces resolution before downsampling to avoid aliasing.
-This is provided for composition with other transforms using @racket[flomap-transform-compose].
-}
-
-@defthing[flomap-id-transform Flomap-Transform]{
-A flomap transform that does nothing.
-See @racket[flomap-transform-compose] for an example of using @racket[flomap-id-transform] as the initial value for a fold.
-}
-
-@subsection{General Transformations}
-
-@defproc*[([(flomap-transform [fm flomap] [t Flomap-Transform]) flomap]
-           [(flomap-transform [fm flomap] [t Flomap-Transform]
-                              [x-start Integer] [y-start Integer]
-                              [x-end Integer] [y-end Integer])
-            flomap])]{
-Applies spatial transform @racket[t] to @racket[fm].
-
-The rectangle @racket[x-start] @racket[y-start] @racket[x-end] @racket[y-end] is with respect to the @racket[fm]'s @italic{transformed} coordinates.
-If given, points in @racket[fm] are transformed only if their transformed coordinates are within that rectangle.
-If not given, @racket[flomap-transform] uses the rectangle returned by @racket[(flomap-transform-bounds t w h)], where @racket[w] and @racket[h] are the size of @racket[fm].
-
-This transform doubles a flomap's size:
-@interaction[#:eval flomap-eval
-                    (define (double-transform w h)
-                      (make-flomap-2d-mapping (λ (x y) (values (* x 2) (* y 2)))
-                                              (λ (x y) (values (/ x 2) (/ y 2)))))
-                    (flomap->bitmap
-                     (flomap-transform text-fm double-transform))]
-Transforms can use the width and height arguments @racket[w] @racket[h] however they wish; for example, @racket[double-transform] ignores them, and @racket[flomap-rotate-transform] uses them to calculate the center coordinate.
-
-The @racket[flomap-rotate] function usually increases the size of a flomap to fit its corners in the result.
-To rotate in a way that does not change the size---i.e. to do an @italic{in-place} rotation---use @racket[0] @racket[0] @racket[w] @racket[h] as the transformed rectangle:
-@interaction[#:eval flomap-eval
-                    (define (flomap-in-place-rotate fm θ)
-                      (define-values (w h) (flomap-size fm))
-                      (flomap-transform fm (flomap-rotate-transform θ) 0 0 w h))]
-Using it on @racket[text-fm] with a purple background:
-@interaction[#:eval flomap-eval
-                    (define-values (text-fm-w text-fm-h) (flomap-size text-fm))
-                    (define purple-text-fm
-                      (flomap-lt-superimpose (make-flomap* text-fm-w text-fm-h #(1 1/2 0 1))
-                                             text-fm))
-                    (flomap->bitmap purple-text-fm)
-                    (flomap->bitmap (flomap-in-place-rotate purple-text-fm (* 1/8 pi)))]
-See @racket[flomap-projection-transform] for another example of using @racket[flomap-transform]'s rectangle arguments, to manually crop a lens projection.
-
-Alternatively, we could define a new transform-producing function @racket[flomap-in-place-rotate-transform]
-that never transforms points outside of the orginal flomap:
-@interaction[#:eval flomap-eval
-                    (define ((flomap-in-place-rotate-transform θ) w h)
-                      (match-define (flomap-2d-mapping fun inv _)
-                        ((flomap-rotate-transform θ) w h))
-                      (make-flomap-2d-mapping (λ (x y)
-                                                (let-values ([(x y)  (fun x y)])
-                                                  (values (if (<= 0 x w) x +nan.0)
-                                                          (if (<= 0 y h) y +nan.0))))
-                                              inv))
-                    (flomap->bitmap
-                     (flomap-transform purple-text-fm
-                                       (flomap-in-place-rotate-transform (* 1/8 pi))))]
-
-To transform @racket[fm], @racket[flomap-transform] uses only the @racketid[inv] field of @racket[(t w h)].
-Every point @racket[new-x] @racket[new-y] in the transformed bounds is given the components returned by
-@racketblock[(let-values ([(old-x old-y)  (inv new-x new-y)])
-               (flomap-bilinear-ref* fm old-x old-y))]
-The forward mapping @racket[fun] is used by @racket[flomap-transform-bounds].
-}
-
-@defidform[Flomap-Transform]{
-Defined as @racket[(Integer Integer -> flomap-2d-mapping)].
-
-A value of type @racket[Flomap-Transform] receives the width and height of a flomap to operate on, and returns a @racket[flomap-2d-mapping] on the coordinates of flomaps of that size.
-}
-
-@defstruct*[flomap-2d-mapping ([fun (Float Float -> (values Float Float))]
-                               [inv (Float Float -> (values Float Float))]
-                               [bounded-by (U 'id 'corners 'edges 'all)])]{
-Represents an invertible mapping from @racket[Real]×@racket[Real] to @racket[Real]×@racket[Real], or from real-valued flomap coordinates to real-valued flomap coordinates.
-See @racket[flomap-transform] for examples.
-See @secref{flomap:conceptual} for the meaning of real-valued flomap coordinates.
-
-The forward mapping @racket[fun] is used to determine the bounds of a transformed flomap.
-(See @racket[flomap-transform-bounds] for details.)
-The inverse mapping @racket[inv] is used to actually transform the flomap.
-(See @racket[flomap-transform] for details.)
-
-The symbol @racket[bounded-by] tells @racket[flomap-transform-bounds] how to transform bounds.
-In order of efficiency:
-@(itemlist
-  @item{@racket['id]: Do not transform bounds.
-         Use this for in-place transforms such as @racket[flomap-whirl-transform].}
-  @item{@racket['corners]: Return the smallest rectangle containing only the transformed corners.
-         Use this for linear and affine transforms (such as @racket[flomap-rotate-transform] or a skew transform),
-         transforms that do not produce extreme points, and others for which it can be proved (or at least empirically demonstrated)
-         that the rectangle containing the transformed corners contains all the transformed points.}
-  @item{@racket['edges]: Return the smallest rectangle containing only the transformed left, top, right, and bottom edges.
-         Use this for transforms that are almost-everywhere continuous and invertible---which describes most interesting transforms.}
-  @item{@racket['all]: Return the smallest rectangle containing all the transformed points.
-         Use this for transforms that produce overlaps and other non-invertible results.}
-  )
-
-For good performance, define instances of @racket[flomap-2d-mapping] and functions that return them (e.g. instances of @racket[Flomap-Transform]), in Typed Racket.
-Defining them in untyped Racket makes every application of @racket[fun] and @racket[inv] contract-checked when used in typed code, such as the implementation of @racket[flomap-transform].
-(In the worst case, @racket[flomap-transform] applies @racket[fun] to every pair of coordinates in the input flomap.
-It always applies @racket[inv] to every pair of coordinates in the output flomap.)
-}
-
-@defproc[(make-flomap-2d-mapping [fun (Float Float -> (values Real Real))]
-                                 [inv (Float Float -> (values Real Real))]
-                                 [bounded-by (U 'id 'corners 'edges 'all) 'edges]) flomap-2d-mapping]{
-A more permissive, more convenient constructor for @racket[flomap-2d-mapping].
-}
-
-@defproc[(flomap-transform-compose [t2 Flomap-Transform] [t1 Flomap-Transform]) Flomap-Transform]{
-Composes two flomap transforms.
-Applying the result of @racket[(flomap-transform-compose t2 t1)] is the same as applying @racket[t1] and then @racket[t2], @bold{except}:
-@(itemlist
-  @item{The points are transformed only once, meaning their component values are estimated only once, so the result is less degraded (blurry or aliased).}
-  @item{The bounds are generally tighter.}
-  )
-
-The following example ``whirls'' @racket[text-fm] clockwise 360 degrees and back.
-This is first done by applying the two transforms separately, and secondly by applying a composition of them.
-@interaction[#:eval flomap-eval
-                    (let* ([text-fm  (flomap-transform
-                                      text-fm (flomap-whirl-transform (* 2 pi)))]
-                           [text-fm  (flomap-transform
-                                      text-fm (flomap-whirl-transform (* -2 pi)))])
-                      (flomap->bitmap text-fm))
-                    (flomap->bitmap
-                     (flomap-transform text-fm (flomap-transform-compose
-                                                (flomap-whirl-transform (* -2 pi))
-                                                (flomap-whirl-transform (* 2 pi)))))]
-Notice the heavy aliasing (a ``Moiré pattern'') in the first result is not in the second.
-
-In the next example, notice that rotating multiple times blurs the result and pads it with transparent points, but that applying composed rotation transforms doesn't:
-@interaction[#:eval flomap-eval
-                    (let* ([text-fm  (flomap-rotate text-fm (* 1/8 pi))]
-                           [text-fm  (flomap-rotate text-fm (* 1/8 pi))]
-                           [text-fm  (flomap-rotate text-fm (* 1/8 pi))]
-                           [text-fm  (flomap-rotate text-fm (* 1/8 pi))])
-                      (flomap->bitmap text-fm))
-                    (define rotate-pi/2
-                      (for/fold ([t flomap-id-transform]) ([_  (in-range 4)])
-                        (flomap-transform-compose (flomap-rotate-transform (* 1/8 pi)) t)))
-                    (flomap->bitmap (flomap-transform text-fm rotate-pi/2))]
-
-How the bounds for the composed transform are calculated depends on how they would have been calculated for @racket[t1] and @racket[t2].
-Suppose @racket[b1] is the bounds rule for @racket[(t1 w h)] and @racket[b2] is the bounds rule for @racket[(t2 w h)].
-Then the bounds rule @racket[b] for @racket[(flomap-transform-compose t2 t1)] is determined by the following rules, applied in order:
-@(itemlist
-  @item{If either @racket[b1] = @racket['all] or @racket[b2] = @racket['all], then @racket[b] = @racket['all].}
-  @item{If either @racket[b1] = @racket['edges] or @racket[b2] = @racket['edges], then @racket[b] = @racket['edges].}
-  @item{If either @racket[b1] = @racket['corners] or @racket[b2] = @racket['corners], then @racket[b] = @racket['corners].}
-  @item{Otherwise, @racket[b1] = @racket[b2] = @racket['id], so @racket[b] = @racket['id].}
-  )
-See @racket[flomap-2d-mapping] for details on how @racket[b] affects bounds calculation.
-}
-
-@defproc[(flomap-transform-bounds [t Flomap-Transform] [w Integer] [h Integer])
-                                  (values Integer Integer Integer Integer)]{
-Returns the rectangle that would contain a @racket[w]×@racket[h] flomap after transform by @racket[t].
-                                                 
-How the rectangle is determined depends on the @racket[bounded-by] field of @racket[(t w h)].
-See @racket[flomap-2d-mapping] for details.
-
-See @racket[flomap-rotate-transform] and @racket[flomap-projection-transform] for examples.
-}
-
-@subsection{Lens Projection and Correction}
-
-The following API demonstrates a parameterized family of spatial transforms.
-It also provides a physically grounded generalization of the flomap transforms returned by @racket[flomap-fisheye-transform].
-
-@interaction-eval[#:eval flomap-eval
-                         (begin (require racket/draw)
-                                (define state-of-the-union-fm
-                                  (bitmap->flomap (read-bitmap (collection-file-path "state-of-the-union.jpg"
-                                                                                     (build-path "images" "scribblings" "images"))
-                                                               'jpeg))))]
-
-@defproc[(flomap-projection-transform [to-proj Projection] [from-proj Projection] [crop? Boolean]) Flomap-Transform]{
-Returns a flomap transform that corrects for or simulates lens distortion.
-
-To correct for lens distortion in a flomap:
-@(itemlist
-  @item{Find a projection @racket[from-proj] that models the actual lens.}
-  @item{Find a projection @racket[to-proj] that models the desired (but fictional) lens.}
-  @item{Apply @racket[(flomap-projection-transform to-proj from-proj)] to the flomap.}
-  )
-
-@margin-note*{This photo is in the public domain.}
-In the following example, a photo of the State of the Union address was taken using an ``equal area'' (or ``equisolid angle'') fisheye lens with a 180-degree diagonal angle of view:
-@interaction[#:eval flomap-eval
-                    (flomap->bitmap state-of-the-union-fm)]
-We would like it to have been taken with a perfect ``rectilinear'' (or ``perspective projection'') lens with a 120-degree diagonal angle of view.
-Following the steps above, we apply a projection transform using @racket[(equal-area-projection (degrees->radians 180))] for @racket[from-proj] and @racket[(perspective-projection (degrees->radians 120))] for @racket[to-proj]:
-@interaction[#:eval flomap-eval
-                    (flomap->bitmap
-                     (flomap-transform
-                      state-of-the-union-fm
-                      (flomap-projection-transform
-                       (perspective-projection (degrees->radians 120))
-                       (equal-area-projection (degrees->radians 180)))))]
-Notice that the straight geometry in the House chamber (especially the trim around the ceiling) is represented by straight edges in the corrected photo.
-
-When @racket[crop?] is @racket[#t], the output flomap is no larger than the input flomap.
-When @racket[crop?] is @racket[#f], the output flomap is large enough to contain the entire transformed flomap.
-An uncropped result can be quite large, especially with angles of view at or near @racket[180] degrees.
-@interaction[#:eval flomap-eval
-                    (define rectangle-fm
-                      (draw-flomap (λ (fm-dc)
-                                     (send fm-dc set-pen "black" 4 'dot)
-                                     (send fm-dc set-brush "yellow" 'solid)
-                                     (send fm-dc set-alpha 1/2)
-                                     (send fm-dc draw-rectangle 0 0 32 32))
-                                   32 32))
-                    (flomap->bitmap rectangle-fm)
-                    (flomap-transform-bounds
-                     (flomap-projection-transform
-                      (perspective-projection (degrees->radians 90))
-                      (equal-area-projection (degrees->radians 180))
-                      #f)
-                     32 32)
-                    (flomap->bitmap
-                     (flomap-transform
-                      rectangle-fm
-                      (flomap-projection-transform
-                       (perspective-projection (degrees->radians 90))
-                       (orthographic-projection (degrees->radians 160))
-                       #f)))]
-To crop manually, apply @racket[flomap-transform] to explicit rectangle arguments:
-@interaction[#:eval flomap-eval
-                    (flomap->bitmap
-                     (flomap-transform
-                      rectangle-fm
-                      (flomap-projection-transform
-                       (perspective-projection (degrees->radians 90))
-                       (orthographic-projection (degrees->radians 160))
-                       #f)
-                      -10 -10 42 42))]
-}
-
-@defproc[(perspective-projection [α Real]) Projection]
-@defproc[(linear-projection [α Real]) Projection]
-@defproc[(orthographic-projection [α Real]) Projection]
-@defproc[(equal-area-projection [α Real]) Projection]
-@defproc[(stereographic-projection [α Real]) Projection]{
-Given a diagonal angle of view @racket[α], these all return a projection modeling some kind of camera lens.
-See @link["http://en.wikipedia.org/wiki/Fisheye_lens"]{Fisheye Lens} for the defining formulas.
-}
-
-@defidform[Projection]{
-Equivalent to @racket[(Float -> projection-mapping)].
-
-A value of type @racket[Projection] receives the diagonal size of a flomap to operate on, and returns a @racket[projection-mapping] instance.
-The provided projections (such as @racket[perspective-projection]) use a closed-over diagonal angle of view @racketid[α] and the diagonal size to calculate the focal length.
-}
-
-@defstruct*[projection-mapping ([fun (Float -> Float)]
-                                [inv (Float -> Float)])]{
-Represents an invertible function from a point's angle @racket[ρ] from the optical axis, to the distance @racket[r] to the center of a photo, in flomap coordinates.
-
-For example, given a diagonal angle of view @racket[α] and the diagonal size @racket[d] of a flomap, the @racket[perspective-projection] function calculates the focal length @racket[f]:
-@racketblock[(define f (/ d 2.0 (tan (* 0.5 α))))]
-It then constructs the projection mapping as
-@racketblock[(projection-mapping (λ (ρ) (* (tan ρ) f))
-                                 (λ (r) (atan (/ r f))))]
-See @link["http://en.wikipedia.org/wiki/Fisheye_lens"]{Fisheye Lens} for details.
-}
-
-
-@; ===================================================================================================
-
-
-@section{Effects}
-
-@defproc[(flomap-shadow [fm flomap] [σ Real] [color (Option (U (Vectorof Real) FlVector)) #f]) flomap]{
-Returns the alpha (zeroth) component of @racket[fm], blurred with standard deviation @racket[σ] and colorized by @racket[color].
-Assumes @racket[fm] and @racket[color] are alpha-multiplied; see @secref{flomap:opacity}.
-
-If @racket[color] = @racket[#f], it is interpreted as @racket[(flvector 1.0 0.0 ...)], or opaque black.
-@examples[#:eval flomap-eval
-                 (flomap->bitmap
-                  (flomap-shadow (flomap-inset text-fm 12) 4 #(1/2 1/8 0 1/4)))
-                 (flomap->bitmap
-                  (flomap-cc-superimpose
-                   (flomap-shadow (flomap-inset text-fm 12) 4 #(1/2 1/8 0 1/4))
-                   text-fm))]
-}
-
-@defproc[(flomap-outline [fm flomap] [radius Real] [color (Option (U (Vectorof Real) FlVector)) #f]) flomap]{
-Returns a flomap that outlines @racket[fm] with a @racket[radius]-thick line when @racket[fm] is superimposed over it.
-Assumes @racket[fm] and @racket[color] are alpha-multiplied; see @secref{flomap:opacity}.
-
-If @racket[color] = @racket[#f], it is interpreted as @racket[(flvector 1.0 0.0 ...)], or opaque black.
-@examples[#:eval flomap-eval
-                 (flomap->bitmap
-                  (flomap-outline (flomap-inset text-fm 2) 2 #(1 0 1 1)))
-                 (flomap->bitmap
-                  (flomap-cc-superimpose
-                   (flomap-outline (flomap-inset text-fm 2) 2 #(1 0 1 1))
-                   text-fm))]
-
-The greatest alpha value in the returned outline is the greatest alpha value in @racket[fm].
-Because of this, @racket[flomap-outline] does fine with flomaps with fully opaque regions that are made semi-transparent:
-@interaction[#:eval flomap-eval
-                    (define trans-text-fm (fm* 0.5 text-fm))
-                    (flomap->bitmap trans-text-fm)
-                    (flomap->bitmap
-                     (flomap-cc-superimpose
-                      (flomap-outline (flomap-inset trans-text-fm 2) 2 #(1 0 1 1))
-                      trans-text-fm))]
-However, it does not do so well with flomaps that are partly opaque and partly semi-transparent:
-@interaction[#:eval flomap-eval
-                    (define mixed-text-fm
-                      (flomap-vc-append text-fm (make-flomap 4 0 10) trans-text-fm))
-                    (flomap->bitmap
-                     (flomap-cc-superimpose
-                      (flomap-outline (flomap-inset mixed-text-fm 2) 2 #(1 0 1 1))
-                      mixed-text-fm))]
-}
-
-
-@close-eval[flomap-eval]
diff --git a/pkgs/images-pkgs/images-doc/images/scribblings/icons.scrbl b/pkgs/images-pkgs/images-doc/images/scribblings/icons.scrbl
deleted file mode 100644
index 4ca0a94dd9..0000000000
--- a/pkgs/images-pkgs/images-doc/images/scribblings/icons.scrbl
+++ /dev/null
@@ -1,507 +0,0 @@
-#lang scribble/manual
- 
-@(require scribble/eval
-          unstable/latent-contract/defthing
-          (for-label racket racket/draw
-                     images/icons/arrow
-                     images/icons/control
-                     images/icons/file
-                     images/icons/symbol
-                     images/icons/misc
-                     images/icons/stickman
-                     images/icons/tool
-                     images/icons/style
-                     images/logos
-                     mrlib/switchable-button
-                     pict)
-          racket/class racket/draw
-          images/icons/arrow
-          images/icons/control
-          images/icons/file
-          images/icons/misc
-          images/icons/stickman
-          images/icons/symbol
-          images/icons/tool
-          images/icons/style)
-
-@(define (author-email) "neil.toronto@gmail.com")
-
-@title{Icons}
-@author{@(author+email "Neil Toronto" (author-email))}
-
-
-@(define icons-eval (make-base-eval))
-@interaction-eval[#:eval icons-eval (require racket/class racket/draw racket/math racket/list)]
-
-@;====================================================================================================
-
-@section{What is an icon?}
-@margin-note*{This section describes an ideal that DrRacket and its tools are steadily approaching.}
-
-As a first approximation, an icon is just a small @racket[bitmap%], usually with an alpha channel.
-
-But an icon also communicates.
-Its shape and color are a visual metaphor for an action or a message.
-Icons should be @bold{easily recognizable}, @bold{distinguishable}, @bold{visually consistent}, and @bold{metaphorically appropriate} for the actions and messages they are used with.
-It can be difficult to meet all four requirements at once (``distinguishable'' and ``visually consistent' are often at odds), but good examples, good abstractions, and an existing icon library help considerably.
-
-@(define (hash-quote) (hash-quote-icon #:color macro-stepper-hash-color #:height 16))
-@(define (step) (step-icon #:color syntax-icon-color #:height 16))
-@(define (play) (play-icon #:color syntax-icon-color #:height 16))
-@(define (bar) (bar-icon #:color syntax-icon-color #:height 16))
-@(define (macro-stepper) (macro-stepper-icon #:height 16))
-
-Example: The Macro Stepper icon is composed by appending a text icon @(hash-quote) and a step icon @(step) to get @(macro-stepper).
-The syntax quote icon @(hash-quote) is the color that DrRacket colors syntax quotes by default.
-The step icon @(step) is colored like DrRacket colors identifier syntax by default, and is shaped using metaphors used in debugger toolbars, TV remotes, and music players around the world.
-It is composed of @(play) to connote starting and @(bar) to connote immediately stopping.
-
-It would not do to have just @(step) as the Macro Stepper icon: it would be too easily confused with the Debugger icon @(step-icon #:color run-icon-color #:height 16),
-especially for new users and people with certain forms of color-blindness, and thus fail to be distinguishable enough.
-
-As another example, the Check Syntax icon @(check-syntax-icon #:height 16) connotes inspecting and passing.
-Notice that the check mark is also the color of syntax.
-
-@;====================================================================================================
-
-@section{About These Icons}
-
-The icons in this collection are designed to be composed to create new ones: they are simple, thematically consistent, and can be constructed in any size and color.
-Further, slideshow's @racket[pict] combiners offer a way to compose them almost arbitrarily.
-For example, a media player application might create a large ``step'' button by superimposing a @racket[record-icon] and a @racket[step-icon]:
-@interaction[#:eval icons-eval
-                    (require pict images/icons/control images/icons/style)
-                    (pict->bitmap
-                     (cc-superimpose
-                      (bitmap (record-icon #:color "forestgreen" #:height 96
-                                           #:material glass-icon-material))
-                      (bitmap (step-icon #:color light-metal-icon-color #:height 48
-                                         #:material metal-icon-material))))]
-
-All the icons in this collection are first drawn using standard @racket[dc<%>] drawing commands.
-Then, to get lighting effects, they are turned into 3D objects and @link["http://en.wikipedia.org/wiki/Ray_tracing_%28graphics%29"]{ray traced}.
-Many are afterward composed to create new icons; for example, the @racket[stop-signs-icon] @(stop-signs-icon #:height 16) superimposes three @racket[stop-sign-icon]s, and the @racket[magnifying-glass-icon] @(magnifying-glass-icon #:height 16) is composed of three others (frame, glass and handle).
-
-The ray tracer helps keep icons visually consistent with each other and with physical objects in day-to-day life.
-As an example of the latter, the @racket[record-icon], when rendered in clear glass, looks like the clear, round button on a @link["http://en.wikipedia.org/wiki/Wiimote"]{Wii Remote}.
-See the @racket[plt-logo] and @racket[planet-logo] functions for more striking examples.
-
-When the rendering API is stable enough to publish, it will allow anyone who can draw a shape to turn that shape into a visually consistent icon.
-
-As with any sort of rendering (such as @link["http://en.wikipedia.org/wiki/Scalable_Vector_Graphics"]{SVG} rendering), ray tracing takes time.
-For icons, this usually happens during tool or application start up.
-You can reduce the portion of start-up time taken by rendering to almost nothing by using the @racketmodname[images/compile-time] library to embed bitmaps directly into compiled modules.
-
-@;====================================================================================================
-
-@section{Icon Style}
-
-@defmodule[images/icons/style]
-@interaction-eval[#:eval icons-eval (require images/icons/style)]
-
-Use these constants and parameters to help keep icon sets visually consistent.
-
-@doc-apply[light-metal-icon-color]
-@doc-apply[metal-icon-color]
-@doc-apply[dark-metal-icon-color]{
-Good colors to use with @racket[metal-icon-material]. See @racket[bomb-icon] and @racket[magnifying-glass-icon] for examples.
-}
-
-@doc-apply[syntax-icon-color]
-@doc-apply[halt-icon-color]
-@doc-apply[run-icon-color]{
-Standard toolbar icon colors.
-
-Use @racket[syntax-icon-color] in icons that connote macro expansion or syntax. Example:
-@interaction[#:eval icons-eval (step-icon #:color syntax-icon-color #:height 32)]
-
-Use @racket[halt-icon-color] in icons that connote stopping or errors. Example:
-@interaction[#:eval icons-eval (stop-icon #:color halt-icon-color #:height 32)]
-
-Use @racket[run-icon-color] in icons that connote executing programs or evaluation. Examples:
-@interaction[#:eval icons-eval
-                    (play-icon #:color run-icon-color #:height 32)
-                    (require images/icons/stickman)
-                    (running-stickman-icon 0.9 #:height 32
-                                           #:body-color run-icon-color
-                                           #:arm-color "white"
-                                           #:head-color run-icon-color)]
-
-For new users and for accessibility reasons, do not try to differentiate icons for similar functions only by color.
-}
-
-@doc-apply[default-icon-height]{
-The height of DrRacket's standard icons.}
-
-@doc-apply[toolbar-icon-height]{
-The height of DrRacket toolbar icons.
-
-Use @racket[(toolbar-icon-height)] as the @racket[height] argument for common icons that will be used in toolbars, status bars, and buttons.
-
-(When making an icon for DrRacket's main toolbar, try to keep it nearly square so that it will not take up too much horizontal space when the toolbar is docked vertically.
-If you cannot, as with the Macro Stepper, send a thinner icon as the @racket[alternate-bitmap] argument to a @racket[switchable-button%].)
-}
-
-@doc-apply[default-icon-backing-scale]{
-The backing scale of DrRacket icons.
-
-A backing scale of 2 means that the icon bitmap internally has two
-pixels per drawing unit, so it it renders well a double resolution,
-such as Retina display mode for Mac OS X.
-
-@history[#:added "1.1"]}
-
-@doc-apply[plastic-icon-material]
-@doc-apply[rubber-icon-material]
-@doc-apply[glass-icon-material]
-@doc-apply[metal-icon-material]{
-Materials for icons.
-
-Plastic is opaque and reflects a little more than glass.
-
-Rubber is also opaque, reflects more light than plastic, but diffuses less.
-
-Glass is transparent but frosted, so it scatters refracted light.
-It has the high refractive index of @link["http://en.wikipedia.org/wiki/Cubic_zirconia"]{cubic zirconia}, or fake diamond.
-The ``glassy look'' cannot actually be achieved using glass.
-
-Metal reflects the most, its @link["http://en.wikipedia.org/wiki/Specular_highlight"]{specular highlight} is nearly the same color as the material (in the others, the highlight is white),
-and it diffuses much more ambient light than directional.
-This is because while plastic and glass mostly reflect light directly, metal mostly absorbs light and re-emits it.
-
-@examples[#:eval icons-eval
-                 (require images/icons/misc)
-                 (for/list ([material  (list plastic-icon-material
-                                             rubber-icon-material
-                                             glass-icon-material
-                                             metal-icon-material)])
-                   (bomb-icon #:height 32 #:material material))]
-}
-
-@doc-apply[default-icon-material]{
-The material used for rendering most icons and icon parts.
-There are exceptions; for example, the @racket[floppy-disk-icon] always renders the sliding cover in metal.
-}
-
-@doc-apply[bitmap-render-icon]{
-Makes a 3D object out of @racket[bitmap] and renders it as an icon.
-
-The @racket[z-ratio] argument only makes a difference when @racket[material] is transparent, such as @racket[glass-icon-material].
-It controls what fraction of @racket[bitmap]'s height the icon is raised, which in turn affects the refracted shadow under the icon:
-the higher the @racket[z-ratio], the lower the shadow.
-
-@examples[#:eval icons-eval
-                 (define bitmap
-                   (pict->bitmap (colorize (filled-ellipse 64 64) "tomato")))
-                 (for/list ([z-ratio  (in-range 0 2 1/3)])
-                   (bitmap-render-icon bitmap z-ratio glass-icon-material))]
-
-More complex shapes than ``embossed and rounded'' are possible with the full rendering API, which will be made public in a later release.
-Still, most of the simple icons (such as those in @racketmodname[images/icons/arrow] and @racketmodname[images/icons/control]) can be rendered using only @racket[bitmap-render-icon].
-}
-
-@doc-apply[icon-color->outline-color]{
-For a given icon color, returns the proper outline @racket[color%].
-
-As an example, here is how to duplicate the @racket[record-icon] using @racketmodname[pict]:
-@interaction[#:eval icons-eval
-                    (define outline-color (icon-color->outline-color "forestgreen"))
-                    (define brush-pict (colorize (filled-ellipse 62 62) "forestgreen"))
-                    (define pen-pict (linewidth 2 (colorize (ellipse 62 62) outline-color)))
-                    (bitmap-render-icon
-                     (pict->bitmap (inset (cc-superimpose brush-pict pen-pict) 1))
-                     5/8 glass-icon-material)
-                    
-                    (record-icon #:color "forestgreen" #:height 64
-                                 #:material glass-icon-material)]
-
-The outline width is usually @racket[(/ height 32)] (in this case, @racket[2]), but not always.
-(For example, @racket[recycle-icon] is an exception, as are parts of @racket[floppy-disk-icon].)
-}
-
-@;====================================================================================================
-
-@section[#:tag "arrows"]{Arrow Icons}
-
-@defmodule[images/icons/arrow]
-@interaction-eval[#:eval icons-eval (require images/icons/arrow)]
-
-@history[#:changed "1.1" @elem{Added optional @racket[#:backing-scale] arguments.}]
-
-@doc-apply[right-arrow-icon]
-@doc-apply[left-arrow-icon]
-@doc-apply[up-arrow-icon]
-@doc-apply[down-arrow-icon]{
-Standard directional arrows.
-@examples[#:eval icons-eval
-                 (list (right-arrow-icon #:color syntax-icon-color
-                                         #:height (toolbar-icon-height))
-                       (left-arrow-icon #:color run-icon-color)
-                       (up-arrow-icon #:color halt-icon-color #:height 37)
-                       (down-arrow-icon #:color "lightblue" #:height 44
-                                        #:material glass-icon-material))]}
-
-@doc-apply[right-over-arrow-icon]
-@doc-apply[left-over-arrow-icon]
-@doc-apply[right-under-arrow-icon]
-@doc-apply[left-under-arrow-icon]{
-Standard bent arrows.
-@examples[#:eval icons-eval
-                 (list (right-over-arrow-icon #:color metal-icon-color
-                                              #:height (toolbar-icon-height))
-                       (left-over-arrow-icon #:color dark-metal-icon-color)
-                       (right-under-arrow-icon #:color run-icon-color #:height 37)
-                       (left-under-arrow-icon #:color "lightgreen" #:height 44
-                                              #:material glass-icon-material))]
-}
-
-@;====================================================================================================
-
-@section[#:tag "control"]{Control Icons}
-
-@defmodule[images/icons/control]
-@interaction-eval[#:eval icons-eval (require images/icons/control)]
-
-@history[#:changed "1.1" @elem{Added optional @racket[#:backing-scale] arguments.}]
-
-@doc-apply[bar-icon]{
-@examples[#:eval icons-eval (bar-icon #:color run-icon-color #:height 32)]
-This is not a ``control'' icon @italic{per se}, but is used to make many others.
-}
-@doc-apply[play-icon]{ @examples[#:eval icons-eval (play-icon #:color run-icon-color #:height 32)] }
-@doc-apply[back-icon]{ @examples[#:eval icons-eval (back-icon #:color run-icon-color #:height 32)] }
-@doc-apply[fast-forward-icon]{ @examples[#:eval icons-eval (fast-forward-icon #:color syntax-icon-color #:height 32)] }
-@doc-apply[rewind-icon]{ @examples[#:eval icons-eval (rewind-icon #:color syntax-icon-color #:height 32)] }
-@doc-apply[stop-icon]{ @examples[#:eval icons-eval (stop-icon #:color halt-icon-color #:height 32)] }
-@doc-apply[record-icon]{ @examples[#:eval icons-eval (record-icon #:color "red" #:height 32)] }
-@doc-apply[pause-icon]{ @examples[#:eval icons-eval (pause-icon #:color halt-icon-color #:height 32)] }
-@doc-apply[step-icon]{ @examples[#:eval icons-eval (step-icon #:color run-icon-color #:height 32)] }
-@doc-apply[step-back-icon]{ @examples[#:eval icons-eval (step-back-icon #:color run-icon-color #:height 32)] }
-@doc-apply[continue-forward-icon]{ @examples[#:eval icons-eval (continue-forward-icon #:color run-icon-color #:height 32)] }
-@doc-apply[continue-backward-icon]{ @examples[#:eval icons-eval (continue-backward-icon #:color run-icon-color #:height 32)] }
-@doc-apply[search-forward-icon]{ @examples[#:eval icons-eval (search-forward-icon #:color syntax-icon-color #:height 32)] }
-@doc-apply[search-backward-icon]{ @examples[#:eval icons-eval (search-backward-icon #:color syntax-icon-color #:height 32)] }
-
-@;====================================================================================================
-
-@section[#:tag "file"]{File Icons}
-
-@defmodule[images/icons/file]
-@interaction-eval[#:eval icons-eval (require images/icons/file)]
-
-@history[#:changed "1.1" @elem{Added optional @racket[#:backing-scale] arguments.}]
-
-@doc-apply[floppy-disk-icon]{ @examples[#:eval icons-eval (floppy-disk-icon #:height 32 #:material glass-icon-material)] }
-@doc-apply[save-icon]{ @examples[#:eval icons-eval (save-icon #:height 32)] }
-@doc-apply[load-icon]{ @examples[#:eval icons-eval (load-icon #:height 32)] }
-@doc-apply[small-save-icon]{ @examples[#:eval icons-eval (small-save-icon #:height 32)] }
-@doc-apply[small-load-icon]{ @examples[#:eval icons-eval (small-load-icon #:height 32)] }
-
-@;====================================================================================================
-
-@section[#:tag "symbol"]{Symbol and Text Icons}
-
-@defmodule[images/icons/symbol]
-@interaction-eval[#:eval icons-eval (require images/icons/symbol)]
-
-@history[#:changed "1.1" @elem{Added optional @racket[#:backing-scale] arguments.}]
-
-@doc-apply[text-icon]{
-Renders a text string as an icon. For example,
-@interaction[#:eval icons-eval
-                    (text-icon "An Important Point!"
-                               (make-font #:weight 'bold #:underlined? #t)
-                               #:color "lightskyblue" #:height 44)]
-
-The size of @racket[font] is ignored. If @racket[trim?] is @racket[#f], the drawn text is not cropped before rendering.
-Otherwise, it is cropped to the smallest rectangle containing all the non-zero-alpha pixels.
-Rendering very small glyphs shows the difference dramatically:
-@interaction[#:eval icons-eval
-                    (list (text-icon "." #:trim? #t)
-                          (text-icon "." #:trim? #f))]
-Notice that both icons are @racket[(default-icon-height)] pixels tall.
-
-Because different platforms have different fonts, @racket[text-icon] cannot guarantee the icons it returns have a consistent look or width across all platforms, or that any unicode characters in @racket[str] will exist.
-}
-
-@doc-apply[recycle-icon]{
-Returns the universal recycling symbol, rendered as an icon.
-@examples[#:eval icons-eval (recycle-icon #:height 48)]
-}
-
-@doc-apply[x-icon]{
-Returns an ``x'' icon that is guaranteed to look the same on all platforms.
-(Anything similar that would be constructed by @racket[text-icon] would differ at least slightly across platforms.)
-@examples[#:eval icons-eval (x-icon #:height 32)]
-
-@history[#:changed "1.1" @elem{Added optional @racket[#:thickness] argument.}]}
-
-@doc-apply[check-icon]{
-@examples[#:eval icons-eval (check-icon #:height 32)]
-}
-
-@doc-apply[lambda-icon]{
-@examples[#:eval icons-eval
-                 (lambda-icon #:height 32 #:material metal-icon-material)]
-}
-
-@doc-apply[hash-quote-icon]{
-@examples[#:eval icons-eval
-                 (require (only-in images/icons/tool macro-stepper-hash-color))
-                 (hash-quote-icon #:color macro-stepper-hash-color #:height 32)]
-}
-
-@;====================================================================================================
-
-@section[#:tag "misc"]{Miscellaneous Icons}
-
-@defmodule[images/icons/misc]
-@interaction-eval[#:eval icons-eval (require images/icons/misc)]
-
-@history[#:changed "1.1" @elem{Added optional @racket[#:backing-scale] arguments.}]
-
-@doc-apply[regular-polygon-icon]{
-Renders the largest regular polygon with @racket[sides] sides, with the first vertex at angle @racket[start], that can be centered in a @racket[height] × @racket[height] box.
-The default @racket[start] angle is chosen so that the polygon has a horizontal bottom edge.
-@examples[#:eval icons-eval (for/list ([sides  (in-range 1 9)]
-                                       [material  (in-cycle (list plastic-icon-material
-                                                                  glass-icon-material))])
-                              (regular-polygon-icon sides #:color "cornflowerblue" #:height 32
-                                                    #:material material))]
-}
-
-@doc-apply[stop-sign-icon]{
-@examples[#:eval icons-eval
-                 (stop-sign-icon #:height 32 #:material glass-icon-material)]
-}
-
-@doc-apply[stop-signs-icon]{
-@examples[#:eval icons-eval
-                 (stop-signs-icon #:height 32 #:material plastic-icon-material)]
-}
-
-@doc-apply[foot-icon]{
-@examples[#:eval icons-eval
-                 (foot-icon #:color "chocolate" #:height 32
-                            #:material glass-icon-material)]
-}
-
-@doc-apply[magnifying-glass-icon]{
-@examples[#:eval icons-eval
-                 (magnifying-glass-icon #:height 32)]
-}
-
-@doc-apply[left-magnifying-glass-icon]{
-@examples[#:eval icons-eval
-                 (left-magnifying-glass-icon #:height 32)]
-}
-
-@doc-apply[bomb-icon]{
-@examples[#:eval icons-eval
-                 (bomb-icon #:height 48 #:material glass-icon-material)]
-}
-
-@doc-apply[left-bomb-icon]{
-@examples[#:eval icons-eval
-                 (left-bomb-icon #:height 48)]
-}
-
-@doc-apply[clock-icon]{
-@examples[#:eval icons-eval
-                 (clock-icon #:height 96)
-                 (clock-icon 3 21 #:height 48
-                             #:face-color "lightblue"
-                             #:hand-color "darkblue")]
-}
-
-@doc-apply[stopwatch-icon]{
-@examples[#:eval icons-eval (stopwatch-icon #:height 96)]
-}
-
-@doc-apply[stethoscope-icon]{
-@examples[#:eval icons-eval (stethoscope-icon #:height 96)]
-}
-
-@doc-apply[short-stethoscope-icon]{
-@examples[#:eval icons-eval (short-stethoscope-icon #:color "purple" #:height 96)]
-}
-
-@doc-apply[lock-icon]{
-@examples[#:eval icons-eval
-                 (lock-icon #:height 32)
-                 (lock-icon #t #:height 48
-                            #:body-color "navajowhite"
-                            #:shackle-color "lemonchiffon"
-                            #:material glass-icon-material)]
-}
-
-@doc-apply[close-icon]{
-@examples[#:eval icons-eval
-                 (close-icon #:height 32 #:material glass-icon-material)]
-@history[#:added "1.1"]}
-
-@;====================================================================================================
-
-@section[#:tag "stickman"]{Stickman Icons}
-
-@defmodule[images/icons/stickman]
-@interaction-eval[#:eval icons-eval (require images/icons/stickman)]
-
-@history[#:changed "1.1" @elem{Added optional @racket[#:backing-scale] arguments.}]
-
-@doc-apply[standing-stickman-icon]{
-Returns the icon displayed in DrRacket's lower-right corner when no program is running.
-@examples[#:eval icons-eval (standing-stickman-icon #:height 64)]
-}
-
-@doc-apply[running-stickman-icon]{
-Returns a frame of the icon animated in DrRacket's lower-right corner when a program is running.
-The frame returned is for time @racket[t] of a run cycle with a one-second period.
-
-The following example samples the run cycle at 12 Hz, or every @racket[1/12] second:
-@interaction[#:eval icons-eval
-                    (for/list ([t  (in-range 0 1 1/12)])
-                      (running-stickman-icon t #:height 32))]
-
-The stickman's joint angles are defined by continuous periodic functions, so the run cycle can be sampled at any resolution, or at any real-valued time @racket[t].
-The cycle is modeled after the run cycle of the player's avatar in the Commodore 64 game @link["http://en.wikipedia.org/wiki/Impossible_Mission"]{Impossible Mission}.
-}
-
-@;====================================================================================================
-
-@section[#:tag "tool"]{Tool Icons}
-
-@defmodule[images/icons/tool]
-@interaction-eval[#:eval icons-eval (require images/icons/tool)]
-
-@history[#:changed "1.1" @elem{Added optional @racket[#:backing-scale] arguments.}]
-
-@doc-apply[check-syntax-icon]
-@doc-apply[small-check-syntax-icon]{
-Icons for Check Syntax. The @racket[small-check-syntax-icon] is used when the toolbar is on the side.
-@examples[#:eval icons-eval (list (check-syntax-icon #:height 32)
-                                  (small-check-syntax-icon #:height 32))]
-}
-
-@doc-apply[macro-stepper-icon]
-@doc-apply[small-macro-stepper-icon]{
-Icons for the Macro Stepper. The @racket[small-macro-stepper-icon] is used when the toolbar is on the side.
-@examples[#:eval icons-eval (list (macro-stepper-icon #:height 32)
-                                  (small-macro-stepper-icon #:height 32))]
-}
-
-@doc-apply[debugger-icon]
-@doc-apply[small-debugger-icon]{
-Icons for the Debugger. The @racket[small-debugger-icon] is used when the toolbar is on the side.
-@examples[#:eval icons-eval (list (debugger-icon #:height 32)
-                                  (small-debugger-icon #:height 32))]
-}
-
-@doc-apply[debugger-bomb-color]
-@doc-apply[macro-stepper-hash-color]
-@doc-apply[small-macro-stepper-hash-color]{
-Constants used within @racketmodname[images/icons/tool].
-}
-
-
-@close-eval[icons-eval]
diff --git a/pkgs/images-pkgs/images-doc/images/scribblings/images.scrbl b/pkgs/images-pkgs/images-doc/images/scribblings/images.scrbl
deleted file mode 100644
index ec9d3091c2..0000000000
--- a/pkgs/images-pkgs/images-doc/images/scribblings/images.scrbl
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang scribble/manual
-
-@(define (author-email) "neil.toronto@gmail.com")
-
-@title{Images}
-@author{@(author+email "Neil Toronto" (author-email))}
-
-This library contains convenient functions for constructing icons and logos, and will eventually offer the same for other @racket[bitmap%]s.
-The idea is to make it easy to include such things in your own programs.
-
-Generally, the images in this library are computed when requested, not loaded from disk.
-Most of them are drawn on a @racket[dc<%>] and then @link["http://en.wikipedia.org/wiki/Ray_tracing_%28graphics%29"]{ray traced}.
-Ray tracing images can become computationally expensive, so this library also includes @racketmodname[images/compile-time], which makes it easy to compute images at compile time and access them at run time.
-
-The ray tracing API will eventually be finalized and made public.
-This Racket release begins doing so by finalizing and making public the basic image API used by the ray tracer.
-It is provided by the @racketmodname[images/flomap] module.
-
-@table-of-contents[]
-
-@include-section["icons.scrbl"]
-@include-section["logos.scrbl"]
-@include-section["compile-time.scrbl"]
-@include-section["flomap.scrbl"]
diff --git a/pkgs/images-pkgs/images-doc/images/scribblings/images/state-of-the-union.jpg b/pkgs/images-pkgs/images-doc/images/scribblings/images/state-of-the-union.jpg
deleted file mode 100644
index 34a070d6fe..0000000000
Binary files a/pkgs/images-pkgs/images-doc/images/scribblings/images/state-of-the-union.jpg and /dev/null differ
diff --git a/pkgs/images-pkgs/images-doc/images/scribblings/logos.scrbl b/pkgs/images-pkgs/images-doc/images/scribblings/logos.scrbl
deleted file mode 100644
index 32b9df2379..0000000000
--- a/pkgs/images-pkgs/images-doc/images/scribblings/logos.scrbl
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          unstable/latent-contract/defthing
-          (for-label images/logos
-                     racket racket/draw)
-          images/logos)
-
-@(define (author-email) "neil.toronto@gmail.com")
-
-@title{Logos}
-@author{@(author+email "Neil Toronto" (author-email))}
-
-@defmodule[images/logos]
-
-@(define logos-eval (make-base-eval))
-@interaction-eval[#:eval logos-eval (require images/logos images/icons/style)]
-
-@doc-apply[plt-logo]{
-Returns the PLT logo, rendered in tinted glass and azure metal by the ray tracer that renders icons.
-@examples[#:eval logos-eval (plt-logo)]
-The default height is the size used for DrRacket splash screen.
-}
-
-@doc-apply[planet-logo]{
-Returns an unofficial PLaneT logo. This is used as the PLaneT icon when DrRacket downloads PLaneT packages.
-@examples[#:eval logos-eval
-                 (planet-logo)
-                 (planet-logo #:height (default-icon-height))]
-}
-
-@doc-apply[stepper-logo]{
-Returns the algebraic stepper logo.
-@examples[#:eval logos-eval (stepper-logo)]
-}
-
-@doc-apply[macro-stepper-logo]{
-Returns the macro stepper logo.
-@examples[#:eval logos-eval (macro-stepper-logo)]
-}
-
-
-@close-eval[logos-eval]
diff --git a/pkgs/images-pkgs/images-doc/info.rkt b/pkgs/images-pkgs/images-doc/info.rkt
deleted file mode 100644
index 0a1d375201..0000000000
--- a/pkgs/images-pkgs/images-doc/info.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-(define build-deps '("images-lib"
-                     "draw-doc"
-                     "gui-doc"
-                     "pict-doc"
-                     "slideshow-doc"
-                     "typed-racket-doc"
-                     "draw-lib"
-                     "gui-lib"
-                     "pict-lib"
-                     "racket-doc"
-                     "scribble-lib"
-                     "slideshow-lib"
-                     "typed-racket-lib"
-                     "unstable-latent-contract-lib"))
-(define update-implies '("images-lib"))
-
-(define pkg-desc "Documentation for images-lib")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/images-pkgs/images-gui-lib/LICENSE.txt b/pkgs/images-pkgs/images-gui-lib/LICENSE.txt
deleted file mode 100644
index 28eed0045c..0000000000
--- a/pkgs/images-pkgs/images-gui-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-images
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/images-pkgs/images-gui-lib/images/gui.rkt b/pkgs/images-pkgs/images-gui-lib/images/gui.rkt
deleted file mode 100644
index 3ea5c95af7..0000000000
--- a/pkgs/images-pkgs/images-gui-lib/images/gui.rkt
+++ /dev/null
@@ -1,97 +0,0 @@
-#lang racket/base
-
-(require racket/gui racket/class string-constants)
-
-(provide bitmap-canvas% logo-about-dialog%)
-
-(define bitmap-canvas%
-  (class canvas%
-    (init parent)
-    (init-field bitmap)
-    (init [enabled #t] [vert-margin 0] [horiz-margin 0])
-    
-    (inherit get-dc refresh min-width min-height)
-    
-    (super-new [parent parent]
-               [enabled enabled]
-               [vert-margin vert-margin]
-               [horiz-margin horiz-margin]
-               [stretchable-width #f]
-               [stretchable-height #f]
-               [style '(transparent no-focus)])
-    
-    (min-width (send bitmap get-width))
-    (min-height (send bitmap get-height))
-    
-    (define/public (set-bitmap new-bitmap)
-      (set! bitmap new-bitmap)
-      (min-width (send bitmap get-width))
-      (min-height (send bitmap get-height))
-      (refresh))
-    
-    (define/override (on-paint) 
-      (send (get-dc) draw-bitmap bitmap 0 0))
-    ))
-
-(define message-text%
-  (class text%
-    (init messages)
-    (super-new [auto-wrap #t])
-    
-    (define writable? #t)
-    (define/augment (can-change-style? start len) writable?)
-    (define/augment (can-delete? start len) writable?)
-    (define/augment (can-insert? start len) writable?)
-    (define/augment (can-load-file? filename format) writable?)
-    (define/augment (can-save-file? filename format) writable?)
-    (define/override (can-do-edit-operation? op [recursive? #t])
-      (case op
-        [(copy select-all)  #t]
-        [else    writable?]))
-    
-    (for ([message  (in-list messages)])
-      (send this insert message))
-    (set! writable? #f)))
-
-(define message-canvas%
-  (class editor-canvas%
-    (init parent messages [horiz-margin 0] [vert-margin 0])
-    (super-new [parent parent]
-               [editor (new message-text% [messages messages])]
-               [horizontal-inset 0] [vertical-inset 0]
-               [horiz-margin 0] [vert-margin 0]
-               [enabled #t] [style '(auto-vscroll auto-hscroll no-border transparent)])))
-
-(define logo-about-dialog%
-  (class dialog%
-    (init label parent bitmap messages [width 640] [height 200] [enabled #t])
-    (super-new [label label]
-               [parent parent]
-               [width width]
-               [height height]
-               [enabled enabled]
-               [spacing 10]
-               [border 10])
-    
-    (define top-panel
-      (new horizontal-panel% [parent this] [alignment '(center top)] [spacing 20]))
-    
-    (define bitmap-canvas
-      (new bitmap-canvas% [parent top-panel] [bitmap bitmap]))
-    
-    (define message-canvas
-      (new message-canvas% [parent top-panel] [messages messages]))
-    
-    (define close-button
-      (new button%
-           [label (string-constant close)]
-           [parent this]
-           [callback (λ (_1 _2)
-                       (when (send this can-close?)
-                         (send this on-close)
-                         (send this show #f)))]
-           [style '(border)]))
-    
-    (send close-button focus)
-    ))
-
diff --git a/pkgs/images-pkgs/images-gui-lib/info.rkt b/pkgs/images-pkgs/images-gui-lib/info.rkt
deleted file mode 100644
index 010238641b..0000000000
--- a/pkgs/images-pkgs/images-gui-lib/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "draw-lib"
-               "gui-lib"
-               "string-constants-lib"))
-
-(define pkg-desc "Functions for constructing icons and logos")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/images-pkgs/images-lib/LICENSE.txt b/pkgs/images-pkgs/images-lib/LICENSE.txt
deleted file mode 100644
index 28eed0045c..0000000000
--- a/pkgs/images-pkgs/images-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-images
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/images-pkgs/images-lib/images/compile-time.rkt b/pkgs/images-pkgs/images-lib/images/compile-time.rkt
deleted file mode 100644
index 9a56731cfe..0000000000
--- a/pkgs/images-pkgs/images-lib/images/compile-time.rkt
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     racket/class racket/draw racket/math)
-         racket/class racket/draw)
-
-(provide compiled-bitmap compiled-bitmap-list)
-
-(begin-for-syntax
-  (define (save-png bm)
-    (define p (open-output-bytes))
-    (send bm save-file p 'png #:unscaled? #t)
-    (define bs (get-output-bytes p))
-    ;(printf "Wrote PNG: ~v bytes~n" (bytes-length bs))
-    bs)
-  
-  (define (save-jpeg bm quality)
-    (define s (send bm get-backing-scale))
-    (define (scale v) (inexact->exact (ceiling (* s v))))
-    (define w (scale (send bm get-width)))
-    (define h (scale (send bm get-height)))
-    (define bs (make-bytes (* 4 w h)))
-    
-    (send bm get-argb-pixels 0 0 w h bs #t #:unscaled? #t)
-    (for ([i  (in-range 0 (* 4 w h) 4)])
-      (define a (bytes-ref bs i))
-      (bytes-set! bs i 255)
-      (bytes-set! bs (+ i 1) a)
-      (bytes-set! bs (+ i 2) a)
-      (bytes-set! bs (+ i 3) a))
-    
-    (define alpha-bm (make-bitmap w h #f))
-    (send alpha-bm set-argb-pixels 0 0 w h bs)
-    (define alpha-p (open-output-bytes))
-    (send alpha-bm save-file alpha-p 'jpeg quality)
-    
-    (send bm get-argb-pixels 0 0 w h bs #f #:unscaled? #t)
-    (define rgb-bm (make-bitmap w h #f))
-    (send rgb-bm set-argb-pixels 0 0 w h bs #f)
-    (define rgb-p (open-output-bytes))
-    (send rgb-bm save-file rgb-p 'jpeg quality)
-    
-    (define alpha-bs (get-output-bytes alpha-p))
-    (define rgb-bs (get-output-bytes rgb-p))
-    ;(printf "Wrote JPEG: ~v bytes~n" (+ (bytes-length alpha-bs) (bytes-length rgb-bs)))
-    
-    (values alpha-bs rgb-bs))
-  
-  (define (make-3d-bitmap ctxt bm quality)
-    (unless (is-a? bm bitmap%)
-      (raise-type-error 'make-3d-bitmap "bitmap%" 0 bm quality))
-    (unless (and (exact-integer? quality) (<= 0 quality 100))
-      (raise-type-error 'make-3d-bitmap "(integer-in 0 100)" 1 bm quality))
-    (cond [(= quality 100)
-           (with-syntax ([bs  (datum->syntax ctxt (save-png bm))]
-                         [scale (send bm get-backing-scale)])
-             (syntax/loc ctxt (load-png bs scale)))]
-          [else
-           (define-values (alpha-bs rgb-bs) (save-jpeg bm quality))
-           (with-syntax ([alpha-bs  (datum->syntax ctxt alpha-bs)]
-                         [rgb-bs    (datum->syntax ctxt rgb-bs)]
-                         [scale (send bm get-backing-scale)])
-             (syntax/loc ctxt (load-jpeg alpha-bs rgb-bs scale)))]))
-  )
-
-(define (load-png bs scale)
-  (read-bitmap (open-input-bytes bs) 'png/alpha #:backing-scale scale))
-
-(define (load-jpeg alpha-bs rgb-bs scale)
-  (define alpha-bm (read-bitmap (open-input-bytes alpha-bs) 'jpeg))
-  (define rgb-bm (read-bitmap (open-input-bytes rgb-bs) 'jpeg))
-  (define w (send rgb-bm get-width))
-  (define h (send rgb-bm get-height))
-  
-  (define new-bs (make-bytes (* 4 w h)))
-  (send rgb-bm get-argb-pixels 0 0 w h new-bs #f)
-  
-  (define bs (make-bytes (* 4 w h)))
-  (send alpha-bm get-argb-pixels 0 0 w h bs #f)
-  (for ([i  (in-range 0 (* 4 w h) 4)])
-    (define a (bytes-ref bs (+ i 2)))
-    (bytes-set! new-bs i a))
-  
-  (define (/* n d) (inexact->exact (ceiling (/ n d))))
-  (define new-bm (make-bitmap (/* w scale) (/* h scale) #:backing-scale scale))
-  (send new-bm set-argb-pixels 0 0 w h new-bs #f #:unscaled? #t)
-  new-bm)
-
-(define-syntax (compiled-bitmap stx)
-  (syntax-case stx ()
-    [(_ expr)
-     (syntax/loc stx (compiled-bitmap expr 100))]
-    [(_ expr quality)
-     (syntax/loc stx
-       (let-syntax ([maker  (λ (inner-stx)
-                              (define bm expr)
-                              (unless (is-a? bm bitmap%)
-                                (raise-syntax-error
-                                 'compiled-bitmap
-                                 (format "expected argument of type <bitmap%>; given ~e" bm)
-                                 #'expr))
-                              (make-3d-bitmap inner-stx bm quality))])
-         (maker)))]))
-
-(define-syntax (compiled-bitmap-list stx)
-  (syntax-case stx ()
-    [(_ expr)
-     (syntax/loc stx (compiled-bitmap-list expr 100))]
-    [(_ expr quality)
-     (syntax/loc stx
-       (let-syntax ([maker  (λ (inner-stx)
-                              (define bms expr)
-                              (unless (and (list? bms) (andmap (λ (bm) (is-a? bm bitmap%)) bms))
-                                (raise-syntax-error
-                                 'compiled-bitmap-list
-                                 (format "expected argument of type <list of bitmap%>; given ~e" bms)
-                                 #'expr))
-                              (with-syntax ([(bm (... ...))
-                                             (map (λ (e) (make-3d-bitmap inner-stx e quality)) bms)])
-                                #'(list bm (... ...))))])
-         (maker)))]))
diff --git a/pkgs/images-pkgs/images-lib/images/flomap.rkt b/pkgs/images-pkgs/images-lib/images/flomap.rkt
deleted file mode 100644
index 22f2930f03..0000000000
--- a/pkgs/images-pkgs/images-lib/images/flomap.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed/racket/base
-
-(require "private/flomap.rkt")
-
-(provide (all-from-out "private/flomap.rkt"))
diff --git a/pkgs/images-pkgs/images-lib/images/icons/arrow.rkt b/pkgs/images-pkgs/images-lib/images/icons/arrow.rkt
deleted file mode 100644
index 145d99569d..0000000000
--- a/pkgs/images-pkgs/images-lib/images/icons/arrow.rkt
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/draw
-         racket/contract unstable/latent-contract unstable/latent-contract/defthing
-         "../private/flomap.rkt"
-         "../private/deep-flomap.rkt"
-         "../private/utils.rkt"
-         "style.rkt")
-
-(provide (activate-contract-out
-          flat-right-arrow-flomap
-          flat-right-over-arrow-flomap
-          right-arrow-icon right-arrow-flomap
-          left-arrow-icon left-arrow-flomap
-          up-arrow-icon up-arrow-flomap
-          down-arrow-icon down-arrow-flomap
-          right-over-arrow-icon right-over-arrow-flomap
-          left-over-arrow-icon left-over-arrow-flomap
-          right-under-arrow-icon right-under-arrow-flomap
-          left-under-arrow-icon left-under-arrow-flomap)
-         (only-doc-out (all-defined-out)))
-
-(defproc (flat-right-arrow-flomap [color (or/c string? (is-a?/c color%))]
-                                  [height (and/c rational? (>=/c 0))]
-                                  ) flomap?
-  (let ([color  (->color% color)])
-    (draw-icon-flomap
-     (λ (dc)
-       (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-       (send dc set-brush color 'solid)
-       (send dc draw-polygon (list '(0 . 9) '(15 . 9) '(14 . 0)
-                                   '(31 . 15.5)
-                                   '(14 . 31) '(15 . 22) '(0 . 22))))
-     32 32 (/ height 32))))
-
-(defproc (flat-right-over-arrow-flomap [color (or/c string? (is-a?/c color%))]
-                                       [height (and/c rational? (>=/c 0))]
-                                       ) flomap?
-  (draw-icon-flomap
-   (λ (dc)
-     (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-     (send dc set-brush color 'solid)
-     (draw-path-commands dc '((m 0 15)
-                              (c 9 -14 19.5 -8 24 -2)
-                              (l 5 -7 2 20 -20 -2 7 -5)
-                              (c -2.5 -4 -8 -8.5 -14 0)
-                              (l -4 -4))
-                         0 0))
-   32 32 (/ height 32)))
-
-(defproc (right-arrow-flomap [#:color color (or/c string? (is-a?/c color%))]
-                             [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                             [#:material material deep-flomap-material-value? (default-icon-material)]
-                             ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (flomap-render-thin-icon (flat-right-arrow-flomap color height) material)))
-
-(defproc (up-arrow-flomap [#:color color (or/c string? (is-a?/c color%))]
-                          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                          [#:material material deep-flomap-material-value? (default-icon-material)]
-                          ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (flomap-render-icon (flomap-cw-rotate (flat-right-arrow-flomap color height)) material)))
-
-(defproc (down-arrow-flomap [#:color color (or/c string? (is-a?/c color%))]
-                            [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                            [#:material material deep-flomap-material-value? (default-icon-material)]
-                            ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (flomap-render-icon (flomap-ccw-rotate (flat-right-arrow-flomap color height)) material)))
-
-(defproc (right-over-arrow-flomap
-          [#:color color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (flomap-render-thin-icon (flat-right-over-arrow-flomap color height) material)))
-
-(defproc (right-under-arrow-flomap
-          [#:color color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (flomap-render-thin-icon
-    (flomap-flip-vertical (flat-right-over-arrow-flomap color height)) material)))
-
-(defproc (left-arrow-flomap [#:color color (or/c string? (is-a?/c color%))]
-                            [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                            [#:material material deep-flomap-material-value? (default-icon-material)]
-                            ) flomap?
-  (flomap-flip-horizontal
-   (right-arrow-flomap #:color color #:height height #:material material)))
-
-
-(defproc (left-over-arrow-flomap
-          [#:color color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-flip-horizontal
-   (right-over-arrow-flomap #:color color #:height height #:material material)))
-
-(defproc (left-under-arrow-flomap
-          [#:color color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-flip-horizontal
-   (right-under-arrow-flomap #:color color #:height height #:material material)))
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%))]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [left-arrow-icon left-arrow-flomap]
-  [right-arrow-icon right-arrow-flomap]
-  [up-arrow-icon up-arrow-flomap]
-  [down-arrow-icon down-arrow-flomap]
-  [right-over-arrow-icon right-over-arrow-flomap]
-  [left-over-arrow-icon left-over-arrow-flomap]
-  [right-under-arrow-icon right-under-arrow-flomap]
-  [left-under-arrow-icon left-under-arrow-flomap])
diff --git a/pkgs/images-pkgs/images-lib/images/icons/control.rkt b/pkgs/images-pkgs/images-lib/images/icons/control.rkt
deleted file mode 100644
index d12c3e4984..0000000000
--- a/pkgs/images-pkgs/images-lib/images/icons/control.rkt
+++ /dev/null
@@ -1,198 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/draw
-         racket/contract unstable/latent-contract unstable/latent-contract/defthing
-         "../private/flomap.rkt"
-         "../private/deep-flomap.rkt"
-         "../private/utils.rkt"
-         "style.rkt")
-
-(provide (activate-contract-out
-          play-icon play-flomap
-          back-icon back-flomap
-          fast-forward-icon fast-forward-flomap
-          rewind-icon rewind-flomap
-          bar-icon bar-flomap
-          stop-icon stop-flomap
-          record-icon record-flomap
-          pause-icon pause-flomap
-          step-icon step-flomap
-          step-back-icon step-back-flomap
-          continue-forward-icon continue-forward-flomap
-          continue-backward-icon continue-backward-flomap
-          search-forward-icon search-forward-flomap
-          search-backward-icon search-backward-flomap)
-         (only-doc-out (all-defined-out)))
-
-(define (flat-play-flomap color height)
-  (draw-icon-flomap
-   (λ (dc)
-     (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-     (send dc set-brush color 'solid)
-     (send dc draw-polygon (list (cons 0 0) (cons 4 0)
-                                 (cons 23 13) (cons 23 18)
-                                 (cons 4 31) (cons 0 31))))
-   24 32 (/ height 32)))
-
-(defproc (play-flomap [#:color color (or/c string? (is-a?/c color%))]
-                      [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                      [#:material material deep-flomap-material-value? (default-icon-material)]
-                      ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (define fm (flat-play-flomap color height))
-   (flomap-render-icon fm material)))
-
-(defproc (fast-forward-flomap
-          [#:color color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (define fm
-     (draw-rendered-icon-flomap
-      (λ (dc)
-        (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-        (send dc set-brush color 'solid)
-        (send dc draw-polygon (list (cons 0 0) (cons 4 0)
-                                    (cons 19 13) (cons 19 18)
-                                    (cons 4 31) (cons 0 31))))
-      20 32 (/ height 32) material))
-   (flomap-hc-append fm fm)))
-
-(defproc (stop-flomap [#:color color (or/c string? (is-a?/c color%))]
-                      [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                      [#:material material deep-flomap-material-value? (default-icon-material)]
-                      ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (draw-rendered-icon-flomap
-    (λ (dc)
-      (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-      (send dc set-brush color 'solid)
-      (send dc draw-polygon (list '(0 . 0) '(31 . 0) '(31 . 31) '(0 . 31))))
-    32 32 (/ height 32) material)))
-
-(defproc (record-flomap [#:color color (or/c string? (is-a?/c color%))]
-                        [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                        [#:material material deep-flomap-material-value? (default-icon-material)]
-                        ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (draw-rendered-icon-flomap
-    (λ (dc)
-      (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-      (send dc set-brush color 'solid)
-      (send dc draw-ellipse 0 0 31 31))
-    32 32 (/ height 32) material)))
-
-(defproc (bar-flomap [#:color color (or/c string? (is-a?/c color%))]
-                     [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                     [#:material material deep-flomap-material-value? (default-icon-material)]
-                     ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (draw-rendered-icon-flomap
-    (λ (dc)
-      (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-      (send dc set-brush color 'solid)
-      (send dc draw-polygon (list '(0 . 0) '(7 . 0) '(7 . 31) '(0 . 31))))
-    8 32 (/ height 32) material)))
-
-(defproc (back-flomap [#:color color (or/c string? (is-a?/c color%))]
-                      [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                      [#:material material deep-flomap-material-value? (default-icon-material)]
-                      ) flomap?
-  (flomap-flip-horizontal (play-flomap #:color color #:height height #:material material)))
-
-(defproc (rewind-flomap [#:color color (or/c string? (is-a?/c color%))]
-                        [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                        [#:material material deep-flomap-material-value? (default-icon-material)]
-                        ) flomap?
-  (flomap-flip-horizontal (fast-forward-flomap #:color color #:height height #:material material)))
-
-(defproc (pause-flomap [#:color color (or/c string? (is-a?/c color%))]
-                       [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                       [#:material material deep-flomap-material-value? (default-icon-material)]
-                       ) flomap?
-  (define bar (bar-flomap #:color color #:height height #:material material))
-  (flomap-hc-append bar (make-flomap 4 (max 1 (inexact->exact (round (* 1/8 height)))) 0) bar))
-
-(defproc (step-flomap [#:color color (or/c string? (is-a?/c color%))]
-                      [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                      [#:material material deep-flomap-material-value? (default-icon-material)]
-                      ) flomap?
-  (flomap-hc-append
-   (play-flomap #:color color #:height height #:material material)
-   (make-flomap 4 (max 1 (inexact->exact (round (* 1/16 height)))) 0)
-   (bar-flomap #:color color #:height height #:material material)))
-
-(defproc (step-back-flomap [#:color color (or/c string? (is-a?/c color%))]
-                           [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                           [#:material material deep-flomap-material-value? (default-icon-material)]
-                           ) flomap?
-  (flomap-hc-append
-   (bar-flomap #:color color #:height height #:material material)
-   (make-flomap 4 (max 1 (inexact->exact (round (* 1/16 height)))) 0)
-   (back-flomap #:color color #:height height #:material material)))
-
-(defproc (continue-forward-flomap
-          [#:color color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-hc-append
-   (bar-flomap #:color color #:height height #:material material)
-   (make-flomap 4 (max 1 (inexact->exact (round (* 1/16 height)))) 0)
-   (play-flomap #:color color #:height height #:material material)))
-
-(defproc (continue-backward-flomap
-          [#:color color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-hc-append
-   (back-flomap #:color color #:height height #:material material)
-   (make-flomap 4 (max 1 (inexact->exact (round (* 1/16 height)))) 0)
-   (bar-flomap #:color color #:height height #:material material)))
-
-(defproc (search-forward-flomap
-          [#:color color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-hc-append
-   (fast-forward-flomap #:color color #:height height #:material material)
-   (make-flomap 4 (max 1 (inexact->exact (round (* 1/16 height)))) 0)
-   (bar-flomap #:color color #:height height #:material material)))
-
-(defproc (search-backward-flomap
-          [#:color color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-hc-append
-   (bar-flomap #:color color #:height height #:material material)
-   (make-flomap 4 (max 1 (inexact->exact (round (* 1/16 height)))) 0)
-   (rewind-flomap #:color color #:height height #:material material)))
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%))]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [play-icon play-flomap]
-  [back-icon back-flomap]
-  [fast-forward-icon fast-forward-flomap]
-  [rewind-icon rewind-flomap]
-  [bar-icon bar-flomap]
-  [stop-icon stop-flomap]
-  [record-icon record-flomap]
-  [pause-icon pause-flomap]
-  [step-icon step-flomap]
-  [step-back-icon step-back-flomap]
-  [continue-forward-icon continue-forward-flomap]
-  [continue-backward-icon continue-backward-flomap]
-  [search-forward-icon search-forward-flomap]
-  [search-backward-icon search-backward-flomap])
diff --git a/pkgs/images-pkgs/images-lib/images/icons/file.rkt b/pkgs/images-pkgs/images-lib/images/icons/file.rkt
deleted file mode 100644
index 0fa948952a..0000000000
--- a/pkgs/images-pkgs/images-lib/images/icons/file.rkt
+++ /dev/null
@@ -1,167 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/draw
-         racket/contract unstable/latent-contract unstable/latent-contract/defthing
-         "../private/flomap.rkt"
-         "../private/deep-flomap.rkt"
-         "../private/utils.rkt"
-         "arrow.rkt"
-         "style.rkt")
-
-(provide (activate-contract-out
-          floppy-disk-icon floppy-disk-flomap
-          save-icon save-flomap
-          load-icon load-flomap
-          small-save-icon small-save-flomap
-          small-load-icon small-load-flomap)
-         (only-doc-out (all-defined-out)))
-
-(defproc (floppy-disk-flomap
-          [#:color color (or/c string? (is-a?/c color%)) "slategray"]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (define scale (/ height 32))
-   
-   (define metal-fm
-     (let* ([fm  (draw-icon-flomap
-                  (λ (dc)
-                    (send dc set-background "lightgray")
-                    (define outer-path (new dc-path%))
-                    (send outer-path rounded-rectangle 0.5 0.5 13 12 1)
-                    (define inner-path (new dc-path%))
-                    (send inner-path rectangle 2.5 2.5 4 6)
-                    (define outer-rgn (new region%))
-                    (send outer-rgn set-path outer-path)
-                    (define inner-rgn (new region%))
-                    (send inner-rgn set-path inner-path)
-                    (send outer-rgn subtract inner-rgn)
-                    (send dc set-clipping-region outer-rgn)
-                    (send dc clear))
-                  18 11 scale)]
-            [dfm  (flomap->deep-flomap fm)]
-            [dfm  (deep-flomap-icon-style dfm)]
-            [dfm  (deep-flomap-scale-z dfm 1/16)])
-       (deep-flomap-render-icon dfm metal-icon-material)))
-   
-   (define bottom-indent-fm
-     (draw-icon-flomap
-      (λ (dc)
-        (send dc set-alpha 1/4)
-        (send dc set-pen "black" 1 'transparent)
-        (send dc set-brush "black" 'solid)
-        (send dc draw-rounded-rectangle 1.5 0.5 18 11 1))
-      20 11 scale))
-   
-   (define label-fm
-     (let* ([fm  (draw-icon-flomap
-                  (λ (dc)
-                    (send dc set-pen "black" 1 'transparent)
-                    (send dc set-brush "black" 'solid)
-                    (send dc draw-rounded-rectangle -0.5 -3.5 22 21 3)
-                    (send dc set-brush "lemonchiffon" 'solid)
-                    (send dc draw-rounded-rectangle 0.5 -3.5 20 20 2)
-                    (send dc set-brush "chocolate" 'solid)
-                    (send dc draw-rectangle 0.5 -0.5 20 4)
-                    (send dc set-brush "navy" 'solid)
-                    (for ([i  (in-range 5.5 15 3)])
-                      (send dc draw-rectangle 2.5 i 16 1)))
-                  22 20 scale)]
-            [dfm  (flomap->deep-flomap fm)]
-            [dfm  (deep-flomap-bulge-vertical dfm (* 2 scale))])
-       (deep-flomap-render-icon dfm matte-material)))
-   
-   (define top-indent-fm
-     (draw-icon-flomap
-      (λ (dc)
-        (send dc set-alpha 1)
-        (send dc set-pen "black" 1 'transparent)
-        (send dc set-brush "black" 'solid)
-        (send dc draw-rounded-rectangle -0.5 -2.5 22 20 2.5))
-      22 19 scale))
-   
-   (define case-fm
-     (draw-icon-flomap
-      (λ (dc)
-        (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-        (send dc set-brush color 'solid)
-        (send dc draw-polygon (list '(0 . 3) '(3 . 0)
-                                    '(28 . 0) '(31 . 3)
-                                    '(31 . 28) '(28 . 31)
-                                    '(3 . 31) '(0 . 28))))
-      32 32 scale))
-   
-   (define disk-fm
-     (let* ([dfm  (deep-flomap-ct-superimpose
-                   'add
-                   (deep-flomap-cb-superimpose
-                    'add
-                    (flomap->deep-flomap case-fm)
-                    (deep-flomap-raise (flomap->deep-flomap bottom-indent-fm) (* -4 scale)))
-                   (deep-flomap-raise (flomap->deep-flomap top-indent-fm) (* -1 scale)))]
-            [dfm  (deep-flomap-icon-style dfm)])
-       (deep-flomap-render-icon dfm material)))
-   
-   (let* ([fm  (flomap-cb-superimpose disk-fm metal-fm)]
-          [fm  (flomap-ct-superimpose fm label-fm)])
-     fm)))
-
-(defproc (save-flomap [#:disk-color disk-color (or/c string? (is-a?/c color%)) "gold"]
-                      [#:arrow-color arrow-color (or/c string? (is-a?/c color%)) syntax-icon-color]
-                      [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                      [#:material material deep-flomap-material-value? (default-icon-material)]
-                      ) flomap?
-  (flomap-hc-append
-   (right-arrow-flomap #:color arrow-color #:height (* 3/4 height) #:material material)
-   (make-flomap 4 (max 1 (inexact->exact (round (* 1/16 height)))) 0)
-   (floppy-disk-flomap #:color disk-color #:height height #:material material)))
-
-(defproc (load-flomap [#:disk-color disk-color (or/c string? (is-a?/c color%)) "gold"]
-                      [#:arrow-color arrow-color (or/c string? (is-a?/c color%)) syntax-icon-color]
-                      [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                      [#:material material deep-flomap-material-value? (default-icon-material)]
-                      ) flomap?
-  (flomap-hc-append
-   (floppy-disk-flomap #:color disk-color #:height height #:material material)
-   (make-flomap 4 (max 1 (inexact->exact (round (* 1/16 height)))) 0)
-   (right-arrow-flomap #:color arrow-color #:height (* 3/4 height) #:material material)))
-
-(defproc (small-save-flomap
-          [#:disk-color disk-color (or/c string? (is-a?/c color%)) "gold"]
-          [#:arrow-color arrow-color (or/c string? (is-a?/c color%)) syntax-icon-color]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-pin* 0 0 11/16 0
-               (floppy-disk-flomap #:color disk-color #:height height #:material material)
-               (right-arrow-flomap #:color arrow-color #:height (* 3/4 height) #:material material)))
-
-(defproc (small-load-flomap
-          [#:disk-color disk-color (or/c string? (is-a?/c color%)) "gold"]
-          [#:arrow-color arrow-color (or/c string? (is-a?/c color%)) syntax-icon-color]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-pin* 1 1 5/16 1
-               (floppy-disk-flomap #:color disk-color #:height height #:material material)
-               (right-arrow-flomap #:color arrow-color #:height (* 3/4 height) #:material material)))
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%)) "slategray"]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [floppy-disk-icon floppy-disk-flomap])
-
-(define-icon-wrappers
-  ([#:disk-color disk-color (or/c string? (is-a?/c color%)) "gold"]
-   [#:arrow-color arrow-color (or/c string? (is-a?/c color%)) syntax-icon-color]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [save-icon save-flomap]
-  [load-icon load-flomap]
-  [small-save-icon small-save-flomap]
-  [small-load-icon small-load-flomap])
diff --git a/pkgs/images-pkgs/images-lib/images/icons/misc.rkt b/pkgs/images-pkgs/images-lib/images/icons/misc.rkt
deleted file mode 100644
index 7ca899b72d..0000000000
--- a/pkgs/images-pkgs/images-lib/images/icons/misc.rkt
+++ /dev/null
@@ -1,672 +0,0 @@
-#lang racket/base
-
-(require racket/draw racket/class racket/math racket/sequence
-         racket/contract unstable/latent-contract unstable/latent-contract/defthing
-         "../private/flomap.rkt"
-         "../private/deep-flomap.rkt"
-         "../private/utils.rkt"
-         "symbol.rkt"
-         "style.rkt")
-
-(provide (activate-contract-out
-          regular-polygon-icon regular-polygon-flomap
-          stop-sign-icon stop-sign-flomap
-          stop-signs-icon stop-signs-flomap
-          close-icon close-flomap
-          foot-icon foot-flomap
-          magnifying-glass-icon magnifying-glass-flomap
-          left-magnifying-glass-icon left-magnifying-glass-flomap
-          bomb-icon bomb-flomap
-          left-bomb-icon left-bomb-flomap
-          clock-icon clock-flomap
-          stopwatch-icon stopwatch-flomap
-          stethoscope-icon stethoscope-flomap
-          short-stethoscope-icon short-stethoscope-flomap
-          lock-icon lock-flomap)
-         (only-doc-out (all-defined-out)))
-
-(define (flat-regular-polygon-flomap sides start color size)
-  (let ([start  (- start)])
-    (draw-icon-flomap
-     (λ (dc)
-       (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-       (send dc set-brush color 'solid)
-       (define dθ (/ (* 2 pi) sides))
-       (define θs (sequence->list (in-range start (+ start (* 2 pi)) dθ)))
-       (define max-frac (apply max (append (map (compose abs cos) θs)
-                                           (map (compose abs sin) θs))))
-       (send dc draw-polygon (for/list ([θ  (in-list θs)])
-                               (cons (+ 15.5 (/ (* 15.5 (cos θ)) max-frac))
-                                     (+ 15.5 (/ (* 15.5 (sin θ)) max-frac))))))
-     32 32 (/ size 32))))
-
-(defproc (regular-polygon-flomap
-          [sides exact-positive-integer?]
-          [start real? (- (/ pi sides) (* 1/2 pi))]
-          [#:color color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height sides start color material]
-   (flomap-render-icon (flat-regular-polygon-flomap sides start color height) material)))
-
-(defproc (stop-sign-flomap
-          [#:color color (or/c string? (is-a?/c color%)) halt-icon-color]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (define scale (/ height 32))
-   (let* ([indent-fm  (fm* 0.5 (flat-x-flomap "black" (* 22 scale)))]
-          [indent-dfm  (deep-flomap-raise (flomap->deep-flomap indent-fm) (* -1 scale))]
-          [fm   (flat-regular-polygon-flomap 8 (/ (* 2 pi) 16) color height)]
-          [dfm  (flomap->deep-flomap fm)]
-          [dfm  (deep-flomap-icon-style dfm)]
-          [dfm  (deep-flomap-cc-superimpose 'add dfm indent-dfm)]
-          [fm  (deep-flomap-render-icon dfm material)])
-     (flomap-cc-superimpose fm (x-flomap #:color light-metal-icon-color
-                                         #:height (* 22 scale)
-                                         #:material metal-icon-material)))))
-
-(defproc (stop-signs-flomap
-          [#:color color (or/c string? (is-a?/c color%)) halt-icon-color]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (define fm (stop-sign-flomap #:color color #:height (* height 2/3) #:material material))
-  (flomap-pin* 3/16 1/4 0 0 fm fm fm))
-
-(defproc (close-flomap
-          [#:color color (or/c string? (is-a?/c color%)) "black"]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (define scale (/ height 32))
-   (let* ([indent-fm  (fm* 0.5 (flat-x-flomap "black" (* 22 scale) #:thickness 6))]
-          [indent-dfm  (deep-flomap-raise (flomap->deep-flomap indent-fm) (* -1 scale))]
-          [fm   (draw-rendered-icon-flomap
-                 (λ (dc)
-                   (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-                   (send dc set-brush color 'solid)
-                   (send dc draw-ellipse 0 0 31 31))
-                 32 32 (/ height 32) material)]
-          [dfm  (flomap->deep-flomap fm)]
-          [dfm  (deep-flomap-icon-style dfm)]
-          [dfm  (deep-flomap-cc-superimpose 'add dfm indent-dfm)]
-          [fm  (deep-flomap-render-icon dfm material)])
-     (flomap-cc-superimpose fm (x-flomap #:color light-metal-icon-color
-                                         #:height (* 22 scale)
-                                         #:material metal-icon-material
-                                         #:thickness 6)))))
-
-(defproc (foot-flomap
-          [#:color color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (draw-rendered-icon-flomap
-    (λ (dc)
-      (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-      (send dc set-brush color 'solid)
-      (send dc draw-ellipse 4 8 23 23)
-      (send dc draw-ellipse 0 10 4 3.5)
-      (send dc draw-ellipse 3 4.5 4.5 4.5)
-      (send dc draw-ellipse 8.75 1 5.25 5.25)
-      (send dc draw-ellipse 16 0 6 6)
-      (send dc draw-ellipse 23.5 1.5 7.5 9))
-    32 32 (/ height 32) material)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Magnifying glass
-
-(define magnifying-glass-material
-  (deep-flomap-material-value
-   'glass 1.0 0.75 1.0
-   0.25 0.15 1.0
-   0.25 0.25 0.0
-   0.0))
-
-(defproc (magnifying-glass-flomap
-          [#:frame-color frame-color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-          [#:handle-color handle-color (or/c string? (is-a?/c color%)) "brown"]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height frame-color handle-color material]
-   (define scale (/ height 32))
-   (define glass-fm
-     (let* ([fm  (draw-icon-flomap
-                  (λ (dc)
-                    (set-icon-pen dc (icon-color->outline-color "azure") 1 'solid)
-                    (send dc set-brush "azure" 'solid)
-                    (send dc draw-ellipse 0 0 17 17))
-                  18 18 scale)]
-            [dfm  (flomap->deep-flomap fm)]
-            [dfm  (deep-flomap-bulge-spheroid dfm (* 4 scale))]
-            [dfm  (deep-flomap-raise dfm (* 4 scale))])
-       (deep-flomap-render-icon dfm magnifying-glass-material)))
-   
-   (define circle-fm
-     (let* ([fm  (draw-icon-flomap
-                  (λ (dc)
-                    (define outline-color (icon-color->outline-color frame-color))
-                    (send dc set-pen outline-color 3 'solid)
-                    (send dc set-brush outline-color 'solid)
-                    (send dc draw-ellipse 1 1 25 25)
-                    (send dc set-pen frame-color 1 'solid)
-                    (send dc set-brush frame-color 'solid)
-                    (send dc draw-ellipse 1 1 25 25))
-                  28 28 scale)]
-            [indent-fm  (draw-icon-flomap
-                         (λ (dc)
-                           (send dc set-pen frame-color 1 'solid)
-                           (send dc set-brush frame-color 'solid)
-                           (send dc draw-ellipse 5 5 17 17))
-                         28 28 scale)]
-            [indent-dfm  (flomap->deep-flomap indent-fm)]
-            [indent-dfm  (deep-flomap-raise indent-dfm (* -4 scale))]
-            [dfm  (flomap->deep-flomap fm)]
-            [dfm  (deep-flomap-raise dfm (* 12 scale))]
-            [dfm  (deep-flomap-cc-superimpose 'add dfm indent-dfm)]
-            [dfm  (deep-flomap-smooth-z dfm (* 2/3 scale))])
-       (deep-flomap-render-icon dfm metal-icon-material)))
-   
-   (define handle-fm
-     (let* ([fm  (draw-icon-flomap
-                  (λ (dc)
-                    (set-icon-pen dc (icon-color->outline-color handle-color) 1 'solid)
-                    (send dc set-brush handle-color 'solid)
-                    (define p (new dc-path%))
-                    (send p move-to 4 0)
-                    (send p line-to 10 5)
-                    (send p curve-to 10 8 8 10 5 10)
-                    (send p line-to 0 4)
-                    (send p move-to 4 0)
-                    (send dc draw-path p))
-                  11 11 scale)])
-       (flomap-render-icon fm material)))
-   
-   (flomap-pin* 0 0 21/28 21/28
-                handle-fm
-                (flomap-pin* 1/2 1/2 1/2 1/2 circle-fm glass-fm))))
-
-(defproc (left-magnifying-glass-flomap
-          [#:frame-color frame-color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-          [#:handle-color handle-color (or/c string? (is-a?/c color%)) "brown"]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-flip-horizontal
-   (magnifying-glass-flomap #:frame-color frame-color #:handle-color handle-color
-                            #:height height #:material material)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Bomb
-
-(defproc (left-bomb-flomap
-          [#:cap-color cap-color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-          [#:bomb-color bomb-color (or/c string? (is-a?/c color%)) dark-metal-icon-color]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height cap-color bomb-color material]
-   (define scale (/ height 32))
-   (define fuse-fm
-     (let* ([fm  (draw-icon-flomap
-                  (λ (dc)
-                    (send dc set-pen "darkred" 1 'solid)
-                    (send dc set-brush "gold" 'solid)
-                    (draw-path-commands dc '((m 3.5 0)
-                                             (c -5 0 -3.29080284 10.4205 -3 11.5
-                                                1.1137011 4.1343 2 6.5 0 8.5
-                                                -0.5711131 2.0524 1.5 4 3.5 3.5
-                                                2.5711131 -2.5524 3.1327042 -5.5355 2 -9.5
-                                                -2 -7 -2 -9 -1.5 -9
-                                                0 1 -0.5 2 1 3.5
-                                                2 0.5 4 -1.5 3.5 -3.5
-                                                -2 -2 -2 -5 -5.5 -5))
-                                        0 0))
-                  10 25 scale)]
-            [dfm  (flomap->deep-flomap fm)]
-            [dfm  (deep-flomap-icon-style dfm)]
-            [dfm  (deep-flomap-scale-z dfm 1)])
-       (deep-flomap-render-icon dfm matte-material)))
-   
-   (define (bomb-cap-flomap color)
-     (draw-icon-flomap
-      (λ (dc)
-        (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-        (send dc set-brush color 'solid)
-        (draw-path-commands dc '((m 1.5 11.5)
-                                 (l 10 -10 2.5 2.5)
-                                 (c 4 5 -5 14 -10 10)
-                                 (l -2.5 -2.5))
-                            0 0)
-        (draw-path-commands dc '((m 1.5 11.5)
-                                 (c -2 -5 5 -12 10 -10
-                                    4 5 -5 14 -10 10))
-                            0 0))
-      20 20 scale))
-   
-   (define cap-fm
-     (let* ([cap-fm  (bomb-cap-flomap cap-color)]
-            [cap-dfm  (flomap->deep-flomap cap-fm)]
-            [cap-dfm  (deep-flomap-icon-style cap-dfm)])
-       (deep-flomap-render-icon cap-dfm material)))
-   
-   (define sphere-fm
-     (let* ([sphere-fm  (draw-icon-flomap
-                         (λ (dc)
-                           (set-icon-pen dc (icon-color->outline-color bomb-color) 1 'solid)
-                           (send dc set-brush bomb-color 'solid)
-                           (send dc draw-ellipse 0 0 29 29))
-                         30 30 scale)]
-            [cap-fm  (bomb-cap-flomap cap-color)]
-            [cap-dfm  (flomap->deep-flomap cap-fm)]
-            [cap-dfm  (deep-flomap-raise cap-dfm (* -2 scale))]
-            [cap-dfm  (deep-flomap-smooth-z cap-dfm (* 1 scale))]
-            [sphere-dfm  (flomap->deep-flomap sphere-fm)]
-            [sphere-dfm  (deep-flomap-bulge-spheroid sphere-dfm (* 15 scale))]
-            [sphere-dfm  (deep-flomap-inset sphere-dfm 2 2 0 0)]
-            [sphere-dfm  (deep-flomap-lt-superimpose 'add sphere-dfm cap-dfm)])
-       (deep-flomap-render-icon sphere-dfm material)))
-   (flomap-lt-superimpose sphere-fm cap-fm fuse-fm)))
-
-(defproc (bomb-flomap
-          [#:cap-color cap-color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-          [#:bomb-color bomb-color (or/c string? (is-a?/c color%)) dark-metal-icon-color]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-flip-horizontal
-   (left-bomb-flomap #:cap-color cap-color #:bomb-color bomb-color
-                     #:height height #:material material)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Clock
-
-(define clock-shell-material
-  (deep-flomap-material-value
-   'glass 1.5 0.75 0.0
-   0.15 0.05 1.0
-   0.1 0.1 0.6
-   0.0))
-
-(defproc (clock-flomap
-          [hours (integer-in 0 11) 1]
-          [minutes (real-in 0 60) 47]
-          [#:face-color face-color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-          [#:hand-color hand-color (or/c string? (is-a?/c color%)) "firebrick"]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          ) flomap?
-  (make-cached-flomap
-   [height face-color hand-color hours minutes]
-   (define R 12.5)
-   (define hour-θ (* (+ (- hours 3) (/ minutes 60)) (/ (* 2 pi) 12)))
-   (define minute-θ (* (- minutes 15) (/ (* 2 pi) 60)))
-   (define scale (/ height 32))
-   (define face-fm
-     (flomap-cc-superimpose
-      ;; face and ticks
-      (draw-icon-flomap
-       (λ (dc)
-         (set-icon-pen dc (icon-color->outline-color (icon-color->outline-color face-color))
-                       1 'solid)
-         (send dc set-brush face-color 'solid)
-         (send dc draw-ellipse 0 0 31 31)
-         (set-icon-pen dc "black" 1 'solid)
-         (for ([i  (in-range 60)]
-               [r  (in-cycle (list 1.5 .5 .5 .5 .5
-                                   1.0 .5 .5 .5 .5
-                                   1.0 .5 .5 .5 .5))]
-               [t  (in-cycle (list 1.0 .25 .25 .25 .25
-                                   .75 .25 .25 .25 .25
-                                   .75 .25 .25 .25 .25))])
-           (define θ (* i (* 1/30 pi)))
-           (set-icon-pen dc "black" t 'solid)
-           (send dc draw-line
-                 (+ 15.5 (* (- R r) (cos θ)))
-                 (+ 15.5 (* (- R r) (sin θ)))
-                 (+ 15.5 (* R (cos θ)))
-                 (+ 15.5 (* R (sin θ))))))
-       32 32 scale)
-      ;; lambda logo
-      (fm* 0.33 (lambda-flomap #:color face-color #:height (* 1/2 height)
-                               #:material glass-icon-material))
-      ;; minute hand
-      (draw-rendered-icon-flomap
-       (λ (dc)
-         (set-icon-pen dc (icon-color->outline-color hand-color) 1/2 'solid)
-         (send dc set-brush hand-color 'solid)
-         (send dc draw-polygon
-               (list (cons (+ 15.5 (* R (cos minute-θ)))
-                           (+ 15.5 (* R (sin minute-θ))))
-                     (cons (+ 15.5 (* 1 (cos (+ minute-θ (* 1/2 pi)))))
-                           (+ 15.5 (* 1 (sin (+ minute-θ (* 1/2 pi))))))
-                     (cons (+ 15.5 (* 1 (cos (+ minute-θ pi))))
-                           (+ 15.5 (* 1 (sin (+ minute-θ pi)))))
-                     (cons (+ 15.5 (* 1 (cos (+ minute-θ (* 3/2 pi)))))
-                           (+ 15.5 (* 1 (sin (+ minute-θ (* 3/2 pi)))))))))
-       32 32 scale metal-icon-material)
-      ;; hour hand
-      (draw-rendered-icon-flomap
-       (λ (dc)
-         (set-icon-pen dc (icon-color->outline-color hand-color) 1/2 'solid)
-         (send dc set-brush hand-color 'solid)
-         (send dc draw-polygon
-               (list (cons (+ 15.5 (* (- R 5) (cos hour-θ)))
-                           (+ 15.5 (* (- R 5) (sin hour-θ))))
-                     (cons (+ 15.5 (* 1.25 (cos (+ hour-θ (* 1/2 pi)))))
-                           (+ 15.5 (* 1.25 (sin (+ hour-θ (* 1/2 pi))))))
-                     (cons (+ 15.5 (* 1.25 (cos (+ hour-θ pi))))
-                           (+ 15.5 (* 1.25 (sin (+ hour-θ pi)))))
-                     (cons (+ 15.5 (* 1.25 (cos (+ hour-θ (* 3/2 pi)))))
-                           (+ 15.5 (* 1.25 (sin (+ hour-θ (* 3/2 pi)))))))))
-       32 32 scale metal-icon-material)))
-   
-   (define shell-fm
-     (draw-icon-flomap
-      (λ (dc)
-        (set-icon-pen dc "white" 1 'solid)
-        (send dc set-brush "white" 'solid)
-        (send dc draw-ellipse 1 1 29 29))
-      32 32 scale))
-   
-   (let* ([dfm  (flomap->deep-flomap shell-fm)]
-          [dfm  (deep-flomap-bulge-spheroid dfm (* 9 scale))]
-          [dfm  (deep-flomap-raise dfm (* -2 scale))]
-          [dfm  (deep-flomap-smooth-z dfm (* 1/3 scale))])
-     (flomap-cc-superimpose
-      face-fm
-      (deep-flomap-render-icon dfm clock-shell-material face-fm)))))
-
-(defproc (stopwatch-flomap
-          [hours (integer-in 0 11) 0]
-          [minutes (real-in 0 60) 47]
-          [#:face-color face-color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-          [#:hand-color hand-color (or/c string? (is-a?/c color%)) "firebrick"]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          ) flomap?
-  (make-cached-flomap
-   [height face-color hand-color hours minutes]
-   (define clock-fm (clock-flomap hours minutes
-                                  #:face-color face-color
-                                  #:hand-color hand-color
-                                  #:height (* 30/32 height)))
-   (define buttons-fm
-     (draw-rendered-icon-flomap
-      (λ (dc)
-        (set-icon-pen dc (make-object color% 128 0 0) 1 'solid)
-        (send dc set-brush (make-object color% 144 0 0) 'solid)
-        (send dc draw-polygon '((2 . 4) (4 . 2) (31 . 31)))
-        (send dc draw-polygon '((0 . 5) (5 . 0) (6 . 1) (1 . 6)))
-        (set-icon-pen dc "black" 1 'solid)
-        (send dc set-brush (make-object color% 16 16 16) 'solid)
-        (send dc draw-polygon '((28.5 . 5.5) (25.5 . 2.5) (0 . 31)))
-        (send dc draw-polygon '((31 . 5) (26 . 0) (24.5 . 1.5) (29.5 . 6.5))))
-      32 8 (/ height 32) metal-icon-material))
-   (flomap-pin* 1/2 0 1/2 -2/32 buttons-fm clock-fm)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Stethoscopes
-
-(define rubber-t-commands
-  '((m 6 13)
-    (c 0 6 3 7.5 9.5 7.5
-       6.5 0 9.5 -1.5 9.5 -7.5)))
-
-(define rubber-hose-commands
-  '((m 15 21.25)
-    (c 0 0 1 3.5 -3 4.5
-       -4 1 -7 -8.5 -10.5 -3.5
-       -3.5 5 4.0182351 8.2793 11 8
-       6.981765 -0.2793 13 -4.5 13 -4.5)))
-
-(define left-metal-commands
-  '((m 6 1.5)
-    (c -4 2 0 5.5 0 11.5)))
-
-(define right-metal-commands
-  '((m 25 1.5)
-    (c 4 2 0 5.5 0 11.5)))
-
-(defproc (stethoscope-flomap
-          [#:color color (or/c string? (is-a?/c color%)) "black"]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]) flomap?
-  (define scale (/ height 32))
-  (flomap-ct-superimpose
-   (draw-rendered-icon-flomap
-    (λ (dc)
-      (send dc set-pen (make-object pen% color 2 'solid 'round 'round))
-      (send dc set-brush "white" 'transparent)
-      (draw-path-commands dc rubber-hose-commands 0 0)
-      (draw-path-commands dc rubber-t-commands 0 0)
-      (send dc set-pen (make-object pen% "black" 3 'solid 'round 'round))
-      (send dc draw-line 23.5 1 25 1.5)
-      (send dc draw-line 7.5 1 6 1.5))
-    32 32 scale rubber-icon-material)
-   (draw-rendered-icon-flomap
-    (λ (dc)
-      (send dc set-pen (make-object pen% dark-metal-icon-color 2.5 'solid 'round 'round))
-      (send dc set-brush "white" 'transparent)
-      (draw-path-commands dc left-metal-commands 0 0)
-      (draw-path-commands dc right-metal-commands 0 0)
-      (send dc set-pen (make-object pen% metal-icon-color 2 'solid 'round 'round))
-      (draw-path-commands dc left-metal-commands 0 0)
-      (draw-path-commands dc right-metal-commands 0 0)
-      (set-icon-pen dc dark-metal-icon-color 0.5 'solid)
-      (send dc set-brush metal-icon-color 'solid)
-      (send dc draw-ellipse 21.25 21.25 10 10)
-      (set-icon-pen dc dark-metal-icon-color 0.25 'solid)
-      (send dc set-brush light-metal-icon-color 'solid)
-      (send dc draw-ellipse 22.25 22.25 8 8))
-    32 32 scale metal-icon-material)))
-
-(define short-rubber-t-commands
-  '((m 3 12.5)
-    (c 0 6 10 6.5 12.5 6.5
-       2.5 0 12.5 -0.5 12.5 -6.5)))
-
-(define short-rubber-hose-commands
-  '((m 15 19.25)
-    (c 0 0 -3 1 -10 1
-       -7 0 -6.5 4.5 6 4
-       12.5 -0.5 14.5 -5 14.5 -5)))
-
-(defproc (short-stethoscope-flomap
-          [#:color color (or/c string? (is-a?/c color%)) "black"]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          ) flomap?
-  (define scale (/ height 32))
-  (flomap-ct-superimpose
-   (draw-rendered-icon-flomap
-    (λ (dc)
-      (send dc translate 0 6)
-      (send dc set-pen (make-object pen% color 2 'solid 'round 'round))
-      (send dc set-brush "white" 'transparent)
-      (draw-path-commands dc short-rubber-hose-commands 0 0)
-      (draw-path-commands dc short-rubber-t-commands 0 0)
-      (send dc set-pen (make-object pen% "black" 3 'solid 'round 'round))
-      (send dc draw-line 4.5 1 3 1.5)
-      (send dc draw-line 26.5 1 28 1.5))
-    32 32 scale rubber-icon-material)
-   (draw-rendered-icon-flomap
-    (λ (dc)
-      (send dc translate 0 6)
-      (send dc set-pen (make-object pen% dark-metal-icon-color 2.5 'solid 'round 'round))
-      (send dc set-brush "white" 'transparent)
-      (draw-path-commands dc left-metal-commands -3 0)
-      (draw-path-commands dc right-metal-commands 3 0)
-      (send dc set-pen (make-object pen% metal-icon-color 2 'solid 'round 'round))
-      (draw-path-commands dc left-metal-commands -3 0)
-      (draw-path-commands dc right-metal-commands 3 0)
-      (set-icon-pen dc dark-metal-icon-color 0.5 'solid)
-      (send dc set-brush metal-icon-color 'solid)
-      (send dc draw-ellipse 21.25 15.25 10 10)
-      (set-icon-pen dc dark-metal-icon-color 0.25 'solid)
-      (send dc set-brush light-metal-icon-color 'solid)
-      (send dc draw-ellipse 22.25 16.25 8 8))
-    32 32 scale metal-icon-material)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Lock
-
-(define shackle-commands
-  '((m 10.5 0)
-    (c -6 0 -10 4 -10 10)
-    (l 0 5)
-    (l 4 0)
-    (l 0 -5)
-    (c 0 -4 2 -6 6 -6)
-    (c 4 0 6 2 6 6)
-    (l 0 5)
-    (l 4 0)
-    (l 0 -5)
-    (c 0 -6 -4 -10 -10 -10)))
-
-(defproc (lock-flomap
-          [open? boolean? #f]
-          [#:body-color body-color (or/c string? (is-a?/c color%)) "orange"]
-          [#:shackle-color shackle-color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height open? body-color shackle-color material]
-   (define scale (/ height 32))
-   
-   (define body-fm
-     (draw-icon-flomap
-      (λ (dc)
-        (set-icon-pen dc (icon-color->outline-color body-color) 1 'solid)
-        (send dc set-brush body-color 'solid)
-        (send dc draw-rounded-rectangle 2 0 27 19 2))
-      32 20 scale))
-   
-   (define face-fm
-     (draw-icon-flomap
-      (λ (dc)
-        (send dc set-pen "black" 1 'transparent)
-        (send dc set-brush "black" 'solid)
-        (send dc draw-ellipse 13 4.5 5 5)
-        (send dc draw-polygon '((14.5 . 8)
-                                (16.5 . 8)
-                                (17.5 . 15.5)
-                                (13.5 . 15.5)))
-        (send dc set-alpha 1/8)
-        (for ([i  (in-range 4)])
-          (send dc draw-rectangle 3.5 (+ 3 (* 4 i)) 24 1)))
-      32 20 scale))
-   
-   (define face-alpha-fm (flomap-ref-component face-fm 0))
-   
-   (define body-rfm
-     (let* ([dfm  (flomap->deep-flomap body-fm)]
-            [dfm  (deep-flomap-bulge-horizontal dfm (* scale 6))]
-            [dfm  (deep-flomap-emboss dfm (* scale 3) (* scale 2))]
-            [dfm  (deep-flomap-raise dfm (* scale 20))]
-            [dfm  (deep-flomap-raise dfm (fm* (* scale -1/2) (flomap-blur face-alpha-fm
-                                                                          (* 1/2 scale))))])
-       (flomap-cc-superimpose (deep-flomap-render-icon dfm material)
-                              face-fm)))
-   
-   (define shackle-fm
-     (draw-icon-flomap
-      (λ (dc)
-        (set-icon-pen dc (icon-color->outline-color shackle-color) 1 'solid)
-        (send dc set-brush shackle-color 'solid)
-        (draw-path-commands dc shackle-commands 0 0))
-      22 16 scale))
-   
-   (define shackle-rfm
-     (let* ([dfm  (flomap->deep-flomap shackle-fm)]
-            [dfm  (deep-flomap-emboss dfm (* scale 3) (* scale 10))])
-       (deep-flomap-render-icon dfm metal-icon-material)))
-   
-   (flomap-pin* 1/2 3/4 (if open? 1 1/2) 0 shackle-rfm body-rfm)))
-
-;; ===================================================================================================
-;; Bitmaps (icons)
-
-(define-icon-wrappers
-  ([sides exact-positive-integer?]
-   [start real? (- (/ pi sides) (* 1/2 pi))]
-   [#:color color (or/c string? (is-a?/c color%))]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [regular-polygon-icon regular-polygon-flomap])
-
-(define-icon-wrappers
-  ([hours (integer-in 0 11) 0]
-   [minutes (real-in 0 60) 47]
-   [#:face-color face-color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-   [#:hand-color hand-color (or/c string? (is-a?/c color%)) "firebrick"]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)])
-  (height)
-  [clock-icon clock-flomap]
-  [stopwatch-icon stopwatch-flomap])
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%)) halt-icon-color]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [stop-sign-icon stop-sign-flomap]
-  [stop-signs-icon stop-signs-flomap])
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%)) "black"]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [close-icon close-flomap])
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%))]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [foot-icon foot-flomap])
-
-(define-icon-wrappers
-  ([#:frame-color frame-color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-   [#:handle-color handle-color (or/c string? (is-a?/c color%)) "brown"]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [magnifying-glass-icon magnifying-glass-flomap]
-  [left-magnifying-glass-icon  left-magnifying-glass-flomap])
-
-(define-icon-wrappers
-  ([#:cap-color cap-color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-   [#:bomb-color bomb-color (or/c string? (is-a?/c color%)) dark-metal-icon-color]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [bomb-icon bomb-flomap]
-  [left-bomb-icon left-bomb-flomap])
-
-(define-icon-wrappers
-  ([open? boolean? #f]
-   [#:body-color body-color (or/c string? (is-a?/c color%)) "orange"]
-   [#:shackle-color shackle-color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [lock-icon lock-flomap])
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%)) "black"]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)])
-  (height)
-  [stethoscope-icon stethoscope-flomap]
-  [short-stethoscope-icon short-stethoscope-flomap])
diff --git a/pkgs/images-pkgs/images-lib/images/icons/stickman.rkt b/pkgs/images-pkgs/images-lib/images/icons/stickman.rkt
deleted file mode 100644
index e4994075c6..0000000000
--- a/pkgs/images-pkgs/images-lib/images/icons/stickman.rkt
+++ /dev/null
@@ -1,366 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/draw racket/vector racket/match racket/math
-         racket/contract unstable/latent-contract unstable/latent-contract/defthing
-         "../private/flomap.rkt"
-         "../private/deep-flomap.rkt"
-         "../private/utils.rkt"
-         "style.rkt")
-
-(provide (activate-contract-out
-          standing-stickman-icon standing-stickman-flomap
-          running-stickman-icon running-stickman-flomap)
-         (only-doc-out (all-defined-out)))
-
-;; ===================================================================================================
-;; Common
-
-(define (cons+ p1 p2)
-  (match-define (cons x1 y1) p1)
-  (match-define (cons x2 y2) p2)
-  (cons (+ x1 x2) (+ y1 y2)))
-
-(define (polar->cartesian angle mag)
-  (cons (* mag (cos (* (/ pi 180) angle)))
-        (* mag (sin (* (/ pi 180) angle)))))
-
-(define line-width 1)
-(define body-width 4.5)
-(define leg-width 4)
-(define arm-width 3.5)
-
-(define neck-length 6)
-(define torso-length 6)
-(define upper-arm-length 5)
-(define lower-arm-length 5.5)
-(define thigh-length 6.5)
-(define shin-length 6.5)
-(define shoulder-breadth 7)
-
-;; ===================================================================================================
-;; Standing
-
-(define standing-torso-angle -90)
-(define standing-neck-angle 5)
-(define standing-left-knee-angle 200)
-(define standing-left-foot-angle 0)
-(define standing-right-knee-angle 150)
-(define standing-right-foot-angle 20)
-(define standing-left-elbow-angle 230)
-(define standing-left-hand-angle -90)
-(define standing-right-elbow-angle 140)
-(define standing-right-hand-angle 90)
-
-(define standing-hip-point (cons 14 (- 29 (+ thigh-length shin-length))))
-
-(define standing-neck-point
-  (cons+ standing-hip-point
-         (polar->cartesian standing-torso-angle torso-length)))
-
-(define standing-head-point
-  (cons+ standing-neck-point
-         (polar->cartesian (+ standing-neck-angle standing-torso-angle)
-                           neck-length)))
-
-(define standing-left-knee-point
-  (cons+ standing-hip-point
-         (polar->cartesian (+ standing-left-knee-angle standing-torso-angle)
-                           thigh-length)))
-
-(define standing-left-foot-point
-  (cons+ standing-left-knee-point
-         (polar->cartesian (+ standing-left-knee-angle standing-torso-angle standing-left-foot-angle)
-                           shin-length)))
-
-(define standing-left-shoulder-point
-  (cons+ standing-neck-point (cons (* -1/2 shoulder-breadth) 0)))
-
-(define standing-left-elbow-point
-  (cons+ standing-left-shoulder-point
-         (polar->cartesian (+ standing-left-elbow-angle standing-torso-angle)
-                           upper-arm-length)))
-
-(define standing-left-hand-point
-  (cons+ standing-left-elbow-point
-         (polar->cartesian (+ standing-left-elbow-angle standing-torso-angle standing-left-hand-angle)
-                           lower-arm-length)))
-
-(define standing-right-knee-point
-  (cons+ standing-hip-point
-         (polar->cartesian (+ standing-right-knee-angle standing-torso-angle)
-                           thigh-length)))
-
-(define standing-right-foot-point
-  (cons+ standing-right-knee-point
-         (polar->cartesian (+ standing-right-knee-angle standing-torso-angle standing-right-foot-angle)
-                           shin-length)))
-
-(define standing-right-shoulder-point
-  (cons+ standing-neck-point (cons (* 1/2 shoulder-breadth) 0)))
-  
-
-(define standing-right-elbow-point
-  (cons+ standing-right-shoulder-point
-         (polar->cartesian (+ standing-right-elbow-angle standing-torso-angle)
-                           upper-arm-length)))
-
-(define standing-right-hand-point
-  (cons+ standing-right-elbow-point
-         (polar->cartesian
-          (+ standing-right-elbow-angle standing-torso-angle standing-right-hand-angle)
-          lower-arm-length)))
-
-(defproc (standing-stickman-flomap
-          [#:body-color body-color (or/c string? (is-a?/c color%)) run-icon-color]
-          [#:arm-color arm-color (or/c string? (is-a?/c color%)) "white"]
-          [#:head-color head-color (or/c string? (is-a?/c color%)) run-icon-color]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height body-color arm-color head-color material]
-   (flomap-lt-superimpose
-    (draw-short-rendered-icon-flomap 
-     (λ (dc)
-       (send dc set-pen (icon-color->outline-color arm-color)
-             (+ arm-width (* 2 line-width)) 'solid)
-       (send dc draw-lines (list standing-right-shoulder-point
-                                 standing-right-elbow-point
-                                 standing-right-hand-point))
-       (send dc set-pen arm-color arm-width 'solid)
-       (send dc draw-lines (list standing-right-shoulder-point
-                                 standing-right-elbow-point
-                                 standing-right-hand-point)))
-     26 32 (/ height 32) material)
-    (draw-short-rendered-icon-flomap 
-     (λ (dc)
-       (send dc set-pen (icon-color->outline-color body-color)
-             (+ body-width (* 2 line-width)) 'solid)
-       (send dc draw-lines (list standing-neck-point standing-hip-point))
-       
-       (send dc set-pen (icon-color->outline-color body-color)
-             (+ leg-width (* 2 line-width)) 'solid)
-       (send dc draw-lines (list standing-hip-point
-                                 standing-left-knee-point
-                                 standing-left-foot-point))
-       (send dc draw-lines (list standing-hip-point
-                                 standing-right-knee-point
-                                 standing-right-foot-point))
-       
-       (send dc set-pen body-color body-width 'solid)
-       (send dc draw-lines (list standing-neck-point standing-hip-point))
-       
-       (send dc set-pen body-color leg-width 'solid)
-       (send dc draw-lines (list standing-hip-point
-                                 standing-left-knee-point
-                                 standing-left-foot-point))
-       (send dc draw-lines (list standing-hip-point
-                                 standing-right-knee-point
-                                 standing-right-foot-point)))
-     26 32 (/ height 32) material)
-    (draw-short-rendered-icon-flomap 
-     (λ (dc)
-       (send dc set-pen (icon-color->outline-color arm-color)
-             (+ arm-width (* 2 line-width)) 'solid)
-       (send dc draw-lines (list standing-left-shoulder-point
-                                 standing-left-elbow-point
-                                 standing-left-hand-point))
-       (send dc set-pen arm-color arm-width 'solid)
-       (send dc draw-lines (list standing-left-shoulder-point
-                                 standing-left-elbow-point
-                                 standing-left-hand-point)))
-     26 32 (/ height 32) material)
-    (draw-short-rendered-icon-flomap 
-     (λ (dc)
-       (send dc set-pen (icon-color->outline-color head-color) line-width 'solid)
-       (send dc set-brush head-color 'solid)
-       (match-define (cons x y) standing-head-point)
-       (send dc draw-ellipse (- x 3.5) (- y 3.5) 7 7))
-     26 32 (/ height 32) material))))
-
-;; ===================================================================================================
-;; Running
-
-(define running-neck-angle 20)
-(define running-torso-angle -70)
-
-(define (squash* x scale)
-  (/ 1 (+ 1 (exp (- (* scale (- x 1/2)))))))
-
-(define (squash x scale)
-  (define y-min (squash* 0 scale))
-  (define y-max (squash* 1 scale))
-  (let* ([x  (max 0.0 (min 1.0 x))]
-         [y  (squash* x scale)]
-         [y  (/ (- y y-min) (- y-max y-min))])
-    (max 0.0 (min 1.0 y))))
-
-(define (cycle t)
-  (* 0.5 (+ 1.0 (cos (* 2.0 pi (+ 0.5 t))))))
-
-(define (scale-angle θ θ-min θ-max)
-  (+ θ-min (* θ (- θ-max θ-min))))
-
-(define (running-foot-angle t)
-  (scale-angle (squash (cycle (+ -0.3333 t)) 3) 0 125))
-
-(define (running-knee-angle t)
-  (scale-angle (squash (cycle t) 2) 90 210))
-
-(define (running-hip-height t)
-  (+ (- 27 (+ thigh-length shin-length))
-     (* 2 (squash (cycle (+ 0.125 (* 2 t))) 5))))
-
-(define (running-elbow-angle t)
-  (scale-angle (squash (cycle (+ 0.5 t)) 4) 150 240))
-
-(define (running-hand-angle t)
-  (scale-angle (squash (cycle (+ 0.6666 t)) 6) -115 -30))
-
-(define (running-hip-point t) (cons 14 (running-hip-height t)))
-
-(define (running-shoulder-point t)
-  (cons+ (running-hip-point t)
-         (polar->cartesian running-torso-angle torso-length)))
-
-(define (running-head-point t)
-  (cons+ (running-shoulder-point t)
-         (polar->cartesian (+ running-neck-angle running-torso-angle)
-                           neck-length)))
-
-(define (running-knee-point t)
-  (cons+ (running-hip-point t)
-         (polar->cartesian (+ (running-knee-angle t) running-torso-angle)
-                           thigh-length)))
-
-(define (running-foot-point t)
-  (cons+ (running-knee-point t)
-         (polar->cartesian (+ (running-knee-angle t) running-torso-angle (running-foot-angle t))
-                           shin-length)))
-
-(define (running-elbow-point t)
-  (cons+ (running-shoulder-point t)
-         (polar->cartesian (+ (running-elbow-angle t) running-torso-angle)
-                           upper-arm-length)))
-
-(define (running-hand-point t)
-  (cons+ (running-elbow-point t)
-         (polar->cartesian (+ (running-elbow-angle t) running-torso-angle (running-hand-angle t))
-                           lower-arm-length)))
-
-(define (draw-running-body dc t color width)
-  (send dc set-pen color width 'solid)
-  (send dc draw-lines (list (running-hip-point t) (running-shoulder-point t))))
-
-(define (draw-running-leg dc t color width)
-  (send dc set-pen color width 'solid)
-  (send dc draw-lines
-        (list (running-hip-point t) (running-knee-point t) (running-foot-point t))))
-
-(define (draw-running-arm dc t color width)
-  (send dc set-pen color width 'solid)
-  (send dc draw-lines
-        (list (running-shoulder-point t) (running-elbow-point t) (running-hand-point t))))
-
-(define (running-head-flomap t color height material)
-  (make-cached-flomap
-   [height t color material]
-   (draw-rendered-icon-flomap 
-    (λ (dc)
-      (send dc set-pen (icon-color->outline-color color) line-width 'solid)
-      (send dc set-brush color 'solid)
-      (match-define (cons x y) (running-head-point t))
-      (send dc draw-ellipse (- x 3.5) (- y 3.5) 7 7))
-    26 32 (/ height 32) material)))
-
-(define (running-leg-flomap t body? color height material)
-  (make-cached-flomap
-   [height t body? color material]
-   (draw-rendered-icon-flomap 
-    (λ (dc)
-      (draw-running-leg dc t (icon-color->outline-color color) (+ leg-width (* 2 line-width)))
-      (when body?
-        (draw-running-body dc t (icon-color->outline-color color)
-                           (+ body-width (* 2 line-width)))
-        (draw-running-body dc t color body-width))
-      (draw-running-leg dc t color leg-width))
-    26 32 (/ height 32) material)))
-
-(define (running-arm-flomap t color height material)
-  (make-cached-flomap
-   [height t color material]
-   (draw-rendered-icon-flomap 
-    (λ (dc)
-      (draw-running-arm dc t (icon-color->outline-color color) (+ arm-width (* 2 line-width)))
-      (draw-running-arm dc t color arm-width))
-    26 32 (/ height 32) material)))
-
-(defproc (running-stickman-flomap
-          [t rational?]
-          [#:body-color body-color (or/c string? (is-a?/c color%))]
-          [#:arm-color arm-color (or/c string? (is-a?/c color%))]
-          [#:head-color head-color (or/c string? (is-a?/c color%))]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (make-cached-flomap
-   [height t body-color arm-color head-color material]
-   (flomap-lt-superimpose (running-arm-flomap (+ t 0.5) arm-color height material)
-                          (running-leg-flomap (+ t 0.5) #f body-color height material)
-                          (running-leg-flomap t #t body-color height material)
-                          (running-head-flomap t head-color height material)
-                          (running-arm-flomap t arm-color height material))))
-
-;; ---------------------------------------------------------------------------------------------------
-
-(define-icon-wrappers
-  ([#:body-color body-color (or/c string? (is-a?/c color%)) run-icon-color]
-   [#:arm-color arm-color (or/c string? (is-a?/c color%)) "white"]
-   [#:head-color head-color (or/c string? (is-a?/c color%)) run-icon-color]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [standing-stickman-icon standing-stickman-flomap])
-
-(define-icon-wrappers
-  ([t rational?]
-   [#:body-color body-color (or/c string? (is-a?/c color%)) run-icon-color]
-   [#:arm-color arm-color (or/c string? (is-a?/c color%)) "white"]
-   [#:head-color head-color (or/c string? (is-a?/c color%)) run-icon-color]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [running-stickman-icon running-stickman-flomap])
-
-#;; FOR TESTING ONLY: Do not let this find its way into the repo uncommented!
-(begin
-  (require racket/gui (planet "animated-canvas.rkt" ("williams" "animated-canvas.plt" 2 4)))
-  
-  (define size 64)
-  
-  (standing-stickman-icon halt-icon-color "white" halt-icon-color size)
-  
-  (define framerate 12)
- 
-  (default-icon-material glass-icon-material)
-  (define frame-bitmaps
-    (for/vector ([t  (in-range 0 1 (/ 1 framerate))])
-      (time (running-stickman-icon t run-icon-color "white" run-icon-color size))))
-  (printf "~v~n" frame-bitmaps)
-  
-  (define frame (make-object frame% "Canvas"))
-  (define canvas (new animated-canvas%
-                      [parent frame] [style '(border)]
-                      [min-width (+ size 4)] [min-height (+ size 4)]))
-  (send frame show #t)
-  
-  (define i 0)
-  (define timer (make-object timer% (λ ()
-                                      (define bm (vector-ref frame-bitmaps i))
-                                      (set! i (modulo (+ i 1) framerate))
-                                      (define dc (send canvas get-dc))
-                                      (send dc draw-bitmap bm 0 0)
-                                      (send canvas swap-bitmaps)
-                                      (yield))
-                  (round (* 1000 (/ 1 framerate)))))
-  )
diff --git a/pkgs/images-pkgs/images-lib/images/icons/style.rkt b/pkgs/images-pkgs/images-lib/images/icons/style.rkt
deleted file mode 100644
index 63c59d7320..0000000000
--- a/pkgs/images-pkgs/images-lib/images/icons/style.rkt
+++ /dev/null
@@ -1,189 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/draw unstable/parameter-group
-         racket/contract unstable/latent-contract unstable/latent-contract/defthing
-         "../private/flomap.rkt"
-         "../private/deep-flomap.rkt"
-         (for-syntax racket/base syntax/parse))
-
-(provide light-metal-icon-color
-         metal-icon-color
-         dark-metal-icon-color
-         syntax-icon-color
-         halt-icon-color
-         run-icon-color
-         plastic-icon-material
-         rubber-icon-material
-         glass-icon-material
-         metal-icon-material
-         bitmap-render-icon
-         (activate-contract-out
-          default-icon-backing-scale
-          default-icon-height
-          toolbar-icon-height
-          default-icon-material
-          icon-color->outline-color)
-         (only-doc-out (all-defined-out)))
-
-(defthing light-metal-icon-color (or/c string? (is-a?/c color%)) #:document-value
-  "azure")
-
-(defthing metal-icon-color (or/c string? (is-a?/c color%)) #:document-value
-  "lightsteelblue")
-
-(defthing dark-metal-icon-color (or/c string? (is-a?/c color%)) #:document-value
-  "steelblue")
-
-(defthing syntax-icon-color (or/c string? (is-a?/c color%)) #:document-value
-  (make-object color% 76 76 255))
-
-(defthing halt-icon-color (or/c string? (is-a?/c color%)) #:document-value
-  (make-object color% 255 32 24))
-
-(defthing run-icon-color (or/c string? (is-a?/c color%)) #:document-value
-  "lawngreen")
-
-(defparam default-icon-backing-scale (and/c rational? (>/c 0)) 2)
-(defparam default-icon-height (and/c rational? (>=/c 0)) 24)
-(defparam toolbar-icon-height (and/c rational? (>=/c 0)) 16)
-
-(defthing plastic-icon-material deep-flomap-material-value?
-  (deep-flomap-material-value
-   'cubic-zirconia 1.0 0.0 1.0
-   1.0 0.3 1.0
-   0.8 0.2 0.0
-   0.0))
-
-(defthing rubber-icon-material deep-flomap-material-value?
-  (deep-flomap-material-value
-   'cubic-zirconia 2.0 0.0 1.0
-   1.5 0.25 1.0
-   0.25 0.5 0.0
-   0.03))
-
-(defthing glass-icon-material deep-flomap-material-value?
-  (deep-flomap-material-value
-   'cubic-zirconia 1.0 0.75 0.2
-   1.0 0.2 1.0
-   0.2 0.4 0.25
-   0.08))
-
-(defthing metal-icon-material deep-flomap-material-value?
-  (deep-flomap-material-value
-   2.0 2.0 0.0 1.0
-   0.7 0.15 0.0
-   0.2 0.8 0.0
-   0.0))
-
-(defparam default-icon-material deep-flomap-material-value? plastic-icon-material)
-
-(defproc (bitmap-render-icon [bitmap (is-a?/c bitmap%)]
-                             [z-ratio (and rational? (>=/c 0)) 5/8]
-                             [material deep-flomap-material-value? (default-icon-material)]
-                             ) (is-a?/c bitmap%)
-  (let* ([fm  (bitmap->flomap bitmap)]
-         [dfm  (flomap->deep-flomap fm)]
-         [dfm  (deep-flomap-icon-style dfm (* 32 z-ratio))])
-    (flomap->bitmap (deep-flomap-render-icon dfm material))))
-
-(defproc (icon-color->outline-color [color (or/c string? (is-a?/c color%))]) (is-a?/c color%)
-  (cond [(string? color)  (define c (send the-color-database find-color color))
-                          (cond [c  (icon-color->outline-color c)]
-                                [else  (icon-color->outline-color "black")])]
-        [else
-         (define r (send color red))
-         (define g (send color green))
-         (define b (send color blue))
-         (make-object color% (quotient r 2) (quotient g 2) (quotient b 2))]))
-
-;; ===================================================================================================
-;; Unpublished so far
-
-(provide deep-flomap-render-icon
-         deep-flomap-icon-style
-         draw-icon-flomap
-         flomap-render-icon
-         draw-rendered-icon-flomap
-         flomap-render-thin-icon
-         draw-short-rendered-icon-flomap
-         define-icon-wrappers
-         (activate-contract-out
-          set-icon-pen))
-
-(defproc (set-icon-pen [dc (is-a?/c dc<%>)]
-                       [color (or/c string? (is-a?/c color%))]
-                       [width (>=/c 0)]
-                       [style symbol?]) void?
-  (send dc set-pen (make-object pen% color width style 'projecting 'miter)))
-
-(define icon-lighting
-  (deep-flomap-lighting-value
-   '(0.0 -1.0 1.0)
-   '(1.0 1.0 1.0)
-   '(1.0 1.0 1.0)
-   '(1.0 1.0 1.0)))
-
-(define (deep-flomap-render-icon dfm material [background-fm #f])
-  ;(printf "rendering~n")
-  (parameterize/group ([deep-flomap-material  material]
-                       [deep-flomap-lighting  icon-lighting])
-    (deep-flomap-render dfm background-fm)))
-
-(define (deep-flomap-icon-style dfm [height 20])
-  (define s (/ (deep-flomap-height dfm) 32))
-  (let* ([dfm  (deep-flomap-emboss dfm (* s 2) (* s 2))]
-         [dfm  (deep-flomap-bulge-round dfm (* s 6))]
-         [dfm  (deep-flomap-raise dfm (* s height))])
-    dfm))
-
-(define (draw-icon-flomap draw-proc w h scale)
-  (draw-flomap (λ (dc)
-                 (send dc set-scale scale scale)
-                 (send dc set-smoothing 'smoothed)
-                 (send dc set-origin (* 0.5 scale) (* 0.5 scale))
-                 (set-icon-pen dc "black" 10 'solid)
-                 (draw-proc dc))
-               (inexact->exact (ceiling (* w scale)))
-               (inexact->exact (ceiling (* h scale)))))
-
-(define (flomap-render-icon fm material)
-  (deep-flomap-render-icon (deep-flomap-icon-style (flomap->deep-flomap fm)) material))
-
-(define (draw-rendered-icon-flomap draw-proc w h scale material)
-  (let* ([fm  (draw-icon-flomap draw-proc w h scale)]
-         [fm  (flomap-render-icon fm material)])
-    fm))
-
-(define (flomap-render-thin-icon fm material)
-  (define scale (/ (flomap-height fm) 32))
-  (define dfm
-    (let* ([dfm  (flomap->deep-flomap fm)]
-           [dfm  (deep-flomap-icon-style dfm 8)])
-      dfm))
-  (deep-flomap-render-icon dfm material))
-
-(define (draw-short-rendered-icon-flomap draw-proc w h scale material)
-  (flomap-render-thin-icon (draw-icon-flomap draw-proc w h scale) material))
-
-;; ===================================================================================================
-;; Syntax for writing icon functions
-
-(define-for-syntax (arg-actual arg-stx)
-  (syntax-parse arg-stx
-    [[arg-kw:keyword arg-name:id arg-props:expr ...]
-     (list #'arg-kw #'arg-name)]
-    [[arg-name:id arg-props:expr ...]
-     (list #'arg-name)]))
-
-(define-syntax (define-icon-wrappers stx)
-  (syntax-case stx ()
-    [(_ (arg ...) (scale-arg ...) [icon-fun flomap-fun] ...)
-     (with-syntax ([(actual-args ...)  (apply append (map arg-actual (syntax->list #'(arg ...))))]
-                   [backing-arg #'[#:backing-scale backing-scale (and/c rational? (>/c 0.0))
-                                                   (default-icon-backing-scale)]])
-       (syntax/loc stx
-         (begin
-           (defproc (icon-fun arg ... backing-arg) (is-a?/c bitmap%)
-             (let ([scale-arg (* scale-arg backing-scale)] ...)
-               (flomap->bitmap (flomap-fun actual-args ...) #:backing-scale backing-scale)))
-           ...)))]))
diff --git a/pkgs/images-pkgs/images-lib/images/icons/symbol.rkt b/pkgs/images-pkgs/images-lib/images/icons/symbol.rkt
deleted file mode 100644
index be67d43fea..0000000000
--- a/pkgs/images-pkgs/images-lib/images/icons/symbol.rkt
+++ /dev/null
@@ -1,326 +0,0 @@
-#lang racket/base
-
-(require racket/draw racket/class racket/math racket/sequence racket/flonum
-         racket/contract unstable/latent-contract unstable/latent-contract/defthing
-         "../private/flomap.rkt"
-         "../private/deep-flomap.rkt"
-         "../private/utils.rkt"
-         "style.rkt")
-
-(provide flat-x-flomap flat-check-flomap
-         (activate-contract-out
-          text-icon text-flomap
-          recycle-icon recycle-flomap
-          x-icon x-flomap
-          check-icon check-flomap
-          lambda-icon lambda-flomap
-          hash-quote-icon hash-quote-flomap)
-         (only-doc-out (all-defined-out)))
-
-(define (flat-x-flomap color height #:thickness [thickness 10])
-  (define mn 7.5)
-  (define mx 23.5)
-  (draw-icon-flomap
-   (λ (dc)
-     (send dc set-pen (make-object pen% (icon-color->outline-color color) 
-                        (+ thickness 2) 'solid 'projecting 'miter))
-     (send dc draw-line mn mn mx mx)
-     (send dc draw-line mn mx mx mn)
-     (send dc set-pen (make-object pen% color thickness 'solid 'projecting  'miter))
-     (send dc draw-line mn mn mx mx)
-     (send dc draw-line mn mx mx mn))
-   32 32 (/ height 32)))
-
-(define (flat-check-flomap color height)
-  (draw-icon-flomap
-   (λ (dc)
-     (set-icon-pen dc (icon-color->outline-color color) 1 'solid)
-     (send dc set-brush color 'solid)
-     (draw-path-commands dc '((m 0 19)
-                              (c 0 0 7 4 14 12 5.5 -13.5 17 -23 17 -23)
-                              (l -9 -8)
-                              (c 0 0 -6.5 7.5 -9.5 16 -2.5 -4 -6 -6.5 -6 -6.5)
-                              (l -6 9))
-                         0 0))
-   32 32 (/ height 32)))
-
-(defproc (text-flomap [str string?]
-                      [font (is-a?/c font%) (make-font)]
-                      [#:trim? trim? boolean? #t]
-                      [#:color color (or/c string? (is-a?/c color%)) "white"]
-                      [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                      [#:material material deep-flomap-material-value? (default-icon-material)]
-                      [#:outline outline (and/c rational? (>=/c 0)) (/ height 32)]
-                      ) flomap?
-  (define family (send font get-family))
-  (define style (send font get-style))
-  (define weight (send font get-weight))
-  (define underline? (send font get-underlined))
-  (define smoothing (send font get-smoothing))
-  
-  (make-cached-flomap
-   [height str family style weight underline? smoothing trim? outline color material]
-   (let ([font  (make-object font% (min height 1024) family style weight underline? smoothing #t)])
-     (define outline-color (icon-color->outline-color color))
-     (define r (real->double-flonum (/ (send outline-color red) 255)))
-     (define g (real->double-flonum (/ (send outline-color green) 255)))
-     (define b (real->double-flonum (/ (send outline-color blue) 255)))
-     (define-values (w h) (get-text-size str font))
-     (define ceiling-amt (inexact->exact (min (/ height 2) (ceiling outline))))
-     (let* ([fm  (draw-flomap
-                  (λ (dc)
-                    (send dc scale 2 2)
-                    (send dc set-font font)
-                    (send dc set-text-foreground color)
-                    (send dc draw-text str 0 0 #t))
-                  (* w 2) (* h 2))]
-            [fm  (if trim? (flomap-trim fm) fm)]
-            [fm  (flomap-resize fm #f (- height (* 2 ceiling-amt)))]
-            [fm  (flomap-inset fm ceiling-amt)]
-            [fm  (cond [(outline . > . 0)
-                        (flomap-cc-superimpose (flomap-outline fm outline (vector 1.0 r g b)) fm)]
-                       [else  fm])])
-       (flomap-render-icon fm material)))))
-
-(define recycle-path-commands
-  '((m 13.28125 0.65625)
-    (c 0.463636 0.0842975 0.965857 0.50656 1.21875 0.84375)
-    (l 4.09375 7.09375)
-    (l -2.125 1.25)
-    (l 7.0 0.0)
-    (l 3.5 -6.0625)
-    (l -2.15625 1.21875)
-    (l -2.125 -3.78125)
-    (c -0.210743 -0.37933886 -0.630114 -0.5625 -1.09375 -0.5625)
-    (l -8.3125 0.0)
-    (m -2.40625 0.4375)
-    (c -1.0747934 0.0368802 -2.119938 0.438998 -2.5625 1.21875)
-    (l -3.21875 5.59375)
-    (l 6.15625 3.59375)
-    (l 3.9375 -6.84375)
-    (l -1.5625 -2.59375)
-    (c -0.569008 -0.6743802 -1.675207 -1.0056302 -2.75 -0.96875)
-    (m 16.65625 8.65625)
-    (l -6.21875 3.5625)
-    (l 3.9375 6.6875)
-    (l 3.3125 0)
-    (c 1.34876 -0.252893 3.398916 -2.442717 2.21875 -4.71875)
-    (l -3.25 -5.53125)
-    (m -27.4375 1.5)
-    (l 2.21875 1.28125)
-    (l -1.4375 2.40625)
-    (c -1.2644628 2.360331 0.8605372 4.956767 2.125 5.09375)
-    (l 3.28125 0.0)
-    (l 2.21875 -3.875)
-    (l 2.25 1.21875)
-    (l -3.59375 -6.125)
-    (l -7.0625 0.0)
-    (m 20.09375 7.1875)
-    (l -3.59375 6.15625)
-    (l 3.59375 6.125)
-    (l 0.0 -2.59375)
-    (l 4.375 0.0)
-    (c 0.505785 0.0 0.862655 -0.28781 1.03125 -0.625)
-    (l 3.96875 -7.0)
-    (c -0.210743 0.126446 -0.355424 0.3532 -1.15625 0.4375)
-    (l -8.21875 0.0)
-    (l 0.0 -2.5)
-    (m -18.21875 2.15625)
-    (c 0.168595 0.210744 0.1346592 0.174793 3.84375 6.75)
-    (c 0.2528926 0.379339 0.5988637 0.8234 1.0625 0.78125)
-    (l 7.875 0.0)
-    (l 0.0 -7.1875)
-    (l -11.71875 0.0)
-    (c -0.6322314 0.0 -0.8622934 -0.175155 -1.0625 -0.34375)))
-
-(defproc (recycle-flomap [#:color color (or/c string? (is-a?/c color%)) "forestgreen"]
-                         [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                         [#:material material deep-flomap-material-value? (default-icon-material)]
-                         ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (draw-short-rendered-icon-flomap
-    (λ (dc)
-      (set-icon-pen dc (icon-color->outline-color color) 1/2 'solid)
-      (send dc set-brush color 'solid)
-      (draw-path-commands dc recycle-path-commands 0 0))
-    32 32 (/ height 32) material)))
-
-(defproc (x-flomap [#:color color (or/c string? (is-a?/c color%)) halt-icon-color]
-                   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                   [#:material material deep-flomap-material-value? (default-icon-material)]
-                   [#:thickness thickness (and/c rational? (>=/c 0)) 10]
-                   ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (define scale (/ height 32))
-   (let* ([fm   (flat-x-flomap color height #:thickness thickness)]
-          [dfm  (flomap->deep-flomap fm)]
-          [dfm  (deep-flomap-icon-style dfm)]
-          [dfm  (deep-flomap-raise dfm (* -8 scale))])
-     (deep-flomap-render-icon dfm material))))
-
-(defproc (check-flomap [#:color color (or/c string? (is-a?/c color%)) run-icon-color]
-                       [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                       [#:material material deep-flomap-material-value? (default-icon-material)]
-                       ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (define scale (/ height 32))
-   (let* ([fm   (flat-check-flomap color height)]
-          [dfm  (flomap->deep-flomap fm)]
-          [dfm  (deep-flomap-icon-style dfm)]
-          [dfm  (deep-flomap-raise dfm (* -12 scale))])
-     (deep-flomap-render-icon dfm material))))
-
-(define lambda-path-commands
-  '((m 8.5 1.5)
-    (c -1.6356765828908555 0.029546719528023596
-       -3.191760877876106 0.5981878749262537
-       -4.720477489085545 1.1242189706194692)
-    (c 0.6669351268436579 0.7142825307374631
-       0.5663221427728614 0.9399074888495575
-       0.8574087929203539 0.8856493838348083)
-    (c 1.1139361982300886 -0.26979469970501474
-       2.7661170029498527 -0.8976661899705014
-       3.5022074713864306 0.2920653404129794)
-    (c 1.604836361061947 2.027318824778761
-       2.2854387162241885 4.621830343362832
-       2.528554440117994 7.151444427138643)
-    (c 0.3116530407079646 1.536908007079646
-       -2.857777387610619 7.039676186430679
-       -3.8315742017699113 9.23609637758112)
-    (c -1.5828472448377582 2.792818935693215
-       -2.9889992117994097 5.691217406489675
-       -4.772427818289086 8.366316818879056)
-    (c 0.42649146902654866 0.5644402784660767
-       1.0427237946902654 0.34355411445427725
-       1.6228086182890855 0.25676724483775815)
-    (c 0.49529097817109147 -0.07420284601769911
-       0.9905831646017699 -0.14840448377581122
-       1.4858741427728612 -0.22260672566371684)
-    (c 1.5973270277286136 -3.787185161061947
-       3.3219870961651914 -7.263537085545722
-       4.820870569911505 -11.091467780530973)
-    (c 0.6830176660766961 -1.5775599008849557
-       1.0166688849557521 -2.445292667846608
-       1.8281710631268435 -3.4783485734513273)
-    (c 0.9620301781710914 0.5885710348082596
-       1.2484493215339232 2.040281637758112
-       1.77328405899705 3.0419137321533922)
-    (c 1.5467160542772862 3.979993184660766
-       3.0867486206489674 7.962568420058997
-       4.546565437168141 11.975105472566373)
-    (c 0.3820927622418879 0.13305596224188793
-       0.7742605970501475 0.5306156554572271
-       1.1366913510324481 0.14744150088495575)
-    (c 0.9533687693215339 -0.5878412460176992
-       2.0633098572271384 -0.9560281486725664
-       2.857080825958702 -1.7685525144542773)
-    (c -0.2264924884955752 -1.0982469474926253
-       -0.9541940106194691 -2.1254820625368733
-       -1.3975098902654866 -3.181664056637168)
-    (c -2.8100934230088495 -5.615961562241888
-       -5.519535197640117 -11.572843233038348
-       -7.278479027728613 -17.620018746902655)
-    (c -0.6478138147492625 -1.9033066855457228
-       -1.4455158560471977 -4.19687149120944
-       -3.5071903339233037 -4.948212008023599)
-    (c -0.46965654277286134 -0.13943394171091444
-       -0.9645608778761062 -0.1662308436578171
-       -1.451858010619469 -0.16614886324483774)))
-
-(defproc (lambda-flomap [#:color color (or/c string? (is-a?/c color%)) "white"]
-                        [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-                        [#:material material deep-flomap-material-value? (default-icon-material)]
-                        ) flomap?
-  (make-cached-flomap
-   [height color material]
-   (draw-rendered-icon-flomap
-    (λ (dc)
-      (set-icon-pen dc (icon-color->outline-color color) 4 'solid)
-      (send dc set-brush (icon-color->outline-color color) 'solid)
-      (draw-path-commands dc lambda-path-commands 4 0)
-      (set-icon-pen dc color 2 'solid)
-      (send dc set-brush color 'solid)
-      (draw-path-commands dc lambda-path-commands 4 0))
-    32 32 (/ height 32) material)))
-
-(defproc (hash-quote-flomap
-          [#:color color (or/c string? (is-a?/c color%)) "mediumseagreen"]
-          [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]) flomap?
-  (make-cached-flomap
-   [height color material]
-   (define (draw-hash-quote dc)
-     ;; vertical lines
-     (send dc draw-polygon '((6 . 0) (11 . 0) (9 . 30) (4 . 30)))
-     (send dc draw-polygon '((17 . 0) (22 . 0) (20 . 30) (15 . 30)))
-     ;; horizontal lines
-     (send dc draw-polygon '((1 . 6.5) (26 . 6.5) (26 . 11.5) (1 . 11.5)))
-     (send dc draw-polygon '((0 . 18.5) (25 . 18.5) (25 . 23.5) (0 . 23.5)))
-     ;; quote
-     (send dc draw-polygon '((30 . 0) (34 . 0) (33 . 9) (30 . 9))))
-   
-   (define outline-color (icon-color->outline-color color))
-   
-   (draw-rendered-icon-flomap
-    (λ (dc)
-      (send dc translate 0.5 0.5)
-      (set-icon-pen dc outline-color 2 'solid)
-      (send dc set-brush outline-color 'solid)
-      (draw-hash-quote dc)
-      (send dc set-pen "black" 1 'transparent)
-      (send dc set-brush color 'solid)
-      (draw-hash-quote dc))
-    36 32 (/ height 32) material)))
-
-;; ===================================================================================================
-;; Bitmaps (icons)
-
-(define-icon-wrappers
-  ([str string?]
-   [font (is-a?/c font%) (make-font)]
-   [#:trim? trim? boolean? #t]
-   [#:color color (or/c string? (is-a?/c color%)) "white"]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)]
-   [#:outline outline (and/c rational? (>=/c 0)) (/ height 32)])
-  (height outline)
-  [text-icon text-flomap])
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%)) "forestgreen"]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [recycle-icon recycle-flomap])
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%)) halt-icon-color]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)]
-   [#:thickness thickness (and/c rational? (>=/c 0)) 10])
-  (height)
-  [x-icon x-flomap])
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%)) run-icon-color]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [check-icon check-flomap])
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%)) light-metal-icon-color]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [lambda-icon lambda-flomap])
-
-(define-icon-wrappers
-  ([#:color color (or/c string? (is-a?/c color%)) "mediumseagreen"]
-   [#:height height (and/c rational? (>=/c 0)) (default-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [hash-quote-icon hash-quote-flomap])
diff --git a/pkgs/images-pkgs/images-lib/images/icons/tool.rkt b/pkgs/images-pkgs/images-lib/images/icons/tool.rkt
deleted file mode 100644
index 78cf70d834..0000000000
--- a/pkgs/images-pkgs/images-lib/images/icons/tool.rkt
+++ /dev/null
@@ -1,102 +0,0 @@
-#lang racket/base
-
-(require racket/draw racket/class racket/math racket/sequence
-         racket/contract unstable/latent-contract unstable/latent-contract/defthing
-         "../private/flomap.rkt"
-         "../private/deep-flomap.rkt"
-         "../private/utils.rkt"
-         "control.rkt"
-         "symbol.rkt"
-         "misc.rkt"
-         "style.rkt")
-
-(provide debugger-bomb-color
-         macro-stepper-hash-color
-         small-macro-stepper-hash-color
-         (activate-contract-out
-          check-syntax-icon check-syntax-flomap
-          small-check-syntax-icon small-check-syntax-flomap
-          macro-stepper-icon macro-stepper-flomap
-          small-macro-stepper-icon small-macro-stepper-flomap
-          debugger-icon debugger-flomap
-          small-debugger-icon small-debugger-flomap)
-         (only-doc-out (all-defined-out)))
-
-(defthing debugger-bomb-color (or/c string? (is-a?/c color%)) #:document-value
-  (make-object color% 128 32 32))
-
-;; Actual color is too dark after rendering
-(defthing macro-stepper-hash-color (or/c string? (is-a?/c color%)) #:document-value
-  (make-object color% 60 192 60))
-(defthing small-macro-stepper-hash-color (or/c string? (is-a?/c color%)) #:document-value
-  (make-object color% 128 255 128))
-
-(defproc (check-syntax-flomap
-          [#:height height (and/c rational? (>=/c 0)) (toolbar-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-ht-append
-   (left-magnifying-glass-flomap #:frame-color metal-icon-color #:handle-color "chocolate"
-                                 #:height height  #:material material)
-   (make-flomap 4 (max 1 (inexact->exact (round (* 1/32 height)))) 0)
-   (check-flomap #:color syntax-icon-color #:height height #:material material)))
-
-(defproc (small-check-syntax-flomap
-          [#:height height (and/c rational? (>=/c 0)) (toolbar-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-pin*
-   1 1 5/16 1
-   (check-flomap #:color syntax-icon-color #:height height #:material material)
-   (magnifying-glass-flomap #:frame-color metal-icon-color #:handle-color "chocolate"
-                            #:height (* 3/4 height) #:material material)))
-
-(defproc (macro-stepper-flomap
-          [#:height height (and/c rational? (>=/c 0)) (toolbar-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-ht-append
-   (hash-quote-flomap #:color macro-stepper-hash-color #:height height #:material material)
-   (make-flomap 4 (max 1 (inexact->exact (round (* 1/32 height)))) 0)
-   (step-flomap #:color syntax-icon-color #:height height #:material material)))
-
-(defproc (small-macro-stepper-flomap
-          [#:height height (and/c rational? (>=/c 0)) (toolbar-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-pin*
-   0 0 7/16 0
-   (step-flomap #:color syntax-icon-color #:height height #:material material)
-   (hash-quote-flomap #:color small-macro-stepper-hash-color
-                      #:height (* 3/4 height) #:material material)))
-
-(defproc (debugger-flomap
-          [#:height height (and/c rational? (>=/c 0)) (toolbar-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-ht-append
-   (left-bomb-flomap #:cap-color metal-icon-color #:bomb-color debugger-bomb-color
-                     #:height height #:material material)
-   (make-flomap 4 (max 1 (inexact->exact (round (* 1/16 height)))) 0)
-   (step-flomap #:color run-icon-color #:height height #:material material)))
-
-(defproc (small-debugger-flomap
-          [#:height height (and/c rational? (>=/c 0)) (toolbar-icon-height)]
-          [#:material material deep-flomap-material-value? (default-icon-material)]
-          ) flomap?
-  (flomap-pin*
-   0 0 9/16 0
-   (step-flomap #:color run-icon-color #:height height #:material material)
-   (left-bomb-flomap #:cap-color metal-icon-color #:bomb-color debugger-bomb-color
-                     #:height (* 3/4 height) #:material material)))
-
-(define-icon-wrappers
-  ([#:height height (and/c rational? (>=/c 0)) (toolbar-icon-height)]
-   [#:material material deep-flomap-material-value? (default-icon-material)])
-  (height)
-  [check-syntax-icon check-syntax-flomap]
-  [small-check-syntax-icon small-check-syntax-flomap]
-  [macro-stepper-icon macro-stepper-flomap]
-  [small-macro-stepper-icon small-macro-stepper-flomap]
-  [debugger-icon debugger-flomap]
-  [small-debugger-icon small-debugger-flomap])
diff --git a/pkgs/images-pkgs/images-lib/images/info.rkt b/pkgs/images-pkgs/images-lib/images/info.rkt
deleted file mode 100644
index e0c94f2762..0000000000
--- a/pkgs/images-pkgs/images-lib/images/info.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang info
diff --git a/pkgs/images-pkgs/images-lib/images/logos.rkt b/pkgs/images-pkgs/images-lib/images/logos.rkt
deleted file mode 100644
index 6d20a1c17c..0000000000
--- a/pkgs/images-pkgs/images-lib/images/logos.rkt
+++ /dev/null
@@ -1,420 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/draw racket/math racket/match
-         racket/contract unstable/latent-contract unstable/latent-contract/defthing
-         "private/flomap.rkt"
-         "private/deep-flomap.rkt"
-         "private/utils.rkt"
-         "icons/symbol.rkt"
-         "icons/misc.rkt"
-         "icons/style.rkt")
-
-(provide (activate-contract-out
-          plt-logo plt-flomap
-          planet-logo planet-flomap
-          racket-logo racket-flomap
-          stepper-logo stepper-flomap
-          macro-stepper-logo macro-stepper-logo-flomap)
-         (only-doc-out (all-defined-out)))
-
-;; ===================================================================================================
-;; PLT logo
-
-(define glass-logo-material
-  (deep-flomap-material-value
-   'cubic-zirconia 0.7 0.6 0.4
-   0.2 0.1 1.0
-   0.2 0.1 0.1
-   0.0))
-
-(define lambda-path-commands
-  '((m 97.5 10)
-    (c -12.267574371681416 0.22160039646017698
-       -23.938206584070794 4.486409061946903
-       -35.40358116814159 8.431642279646018
-       5.002013451327434 5.357118980530973
-       4.2474160707964606 7.049306166371681
-       6.430565946902655 6.642370378761062
-       8.354521486725664 -2.0234602477876105
-       20.745877522123894 -6.732496424778761
-       26.26655603539823 2.1904900530973452
-       12.036272707964603 15.204891185840708
-       17.140790371681415 34.66372757522124
-       18.964158300884954 53.635833203539825
-       2.3373978053097346 11.526810053097345
-       -21.433330407079644 52.79757139823009
-       -28.736806513274335 69.27072283185841
-       -11.871354336283186 20.946142017699113
-       -22.417494088495573 42.68413054867256
-       -35.79320863716814 62.74737614159292
-       3.198686017699115 4.233302088495575
-       7.820428460176991 2.5766558584070793
-       12.171064637168142 1.925754336283186
-       3.714682336283186 -0.5565213451327433
-       7.429373734513274 -1.1130336283185842
-       11.14405607079646 -1.6695504424778762
-       11.979952707964602 -28.4038887079646
-       24.914903221238937 -54.476528141592915
-       36.156529274336286 -83.1860083539823
-       5.122632495575221 -11.831699256637167
-       7.625016637168141 -18.33969500884956
-       13.711282973451327 -26.087614300884955
-       7.215226336283186 4.414282761061947
-       9.363369911504424 15.302112283185838
-       13.299630442477875 22.814352991150443
-       11.600370407079646 29.849948884955747
-       23.150614654867255 59.71926315044247
-       34.09924077876106 89.81329104424779
-       2.8656957168141592 0.9979197168141594
-       5.806954477876106 3.9796174159292033
-       8.525185132743362 1.105811256637168
-       7.150265769911504 -4.4088093451327435
-       15.474823929203538 -7.170211115044248
-       21.428106194690265 -13.26414385840708
-       -1.6986936637168142 -8.23685210619469
-       -7.156455079646018 -15.941115469026549
-       -10.48132417699115 -23.86248042477876
-       -21.07570067256637 -42.11971171681416
-       -41.39651398230088 -86.79632424778761
-       -54.5885927079646 -132.15014060176992
-       -4.858603610619468 -14.274800141592921
-       -10.841368920353982 -31.4765361840708
-       -26.303927504424777 -37.111590060176994
-       -3.5224240707964602 -1.0457545628318583
-       -7.2342065840707965 -1.2467313274336282
-       -10.888935079646018 -1.2461164743362831)))
-
-(define (draw-lambda dc x y w h)
-  (define-values (sx sy) (send dc get-scale))
-  (draw-path-commands dc (scale-path-commands lambda-path-commands (/ w 240) (/ h 240)) x y)
-  (send dc set-scale sx sy))
-
-(define blue-θ-start (* -45 (/ pi 180)))
-(define blue-θ-end (* 110 (/ pi 180)))
-
-(define logo-red-color (make-object color% 255 36 32))
-(define logo-blue-color (make-object color% 32 36 255))
-(define lambda-outline-color (make-object color% 16 16 64))
-(define (lambda-pen color width) (make-object pen% color width 'solid 'projecting 'miter))
-
-(define (make-arc-path x y w h start end [ccw? #t])
-  (define p (new dc-path%))
-  (send p arc x y w h start end ccw?)
-  (send p close)
-  p)
-
-(define (make-random-flomap c w h)
-  (build-flomap c w h (λ (k x y i) (random))))
-
-(define (flomap-rough fm z-amt)
-  (match-define (flomap _ c w h) fm)
-  (fm+ fm (fm* z-amt (make-random-flomap c w h))))
-
-(defproc (plt-flomap [#:height height (and/c rational? (>=/c 0)) 256]) flomap?
-  (make-cached-flomap
-   [height]
-   (define scale (/ height 256))
-   (define bulge-fm
-     (draw-icon-flomap
-      (λ (dc)
-        (send dc set-pen logo-red-color 2 'transparent)
-        (send dc set-brush logo-red-color 'solid)
-        (send dc draw-path (make-arc-path 8 8 239 239 blue-θ-end blue-θ-start))
-        (send dc set-pen logo-blue-color 2 'transparent)
-        (send dc set-brush logo-blue-color 'solid)
-        (send dc draw-path (make-arc-path 8 8 239 239 blue-θ-start blue-θ-end))
-        (send dc set-pen (lambda-pen lambda-outline-color 10))
-        (send dc set-brush lambda-outline-color 'solid)
-        (draw-lambda dc 8 8 240 240))
-      256 256 scale))
-   
-   (define (lambda-flomap color pen-width)
-     (draw-icon-flomap
-      (λ (dc)
-        (send dc set-scale scale scale)
-        (send dc set-pen (lambda-pen color pen-width))
-        (send dc set-brush color 'solid)
-        (draw-lambda dc 8 8 240 240))
-      256 256 scale))
-   
-   (let* ([bulge-dfm  (flomap->deep-flomap bulge-fm)]
-          [bulge-dfm  (deep-flomap-bulge-spheroid bulge-dfm (* 112 scale))]
-          [lambda-dfm  (flomap->deep-flomap (lambda-flomap "azure" 4))]
-          [lambda-dfm  (deep-flomap-bulge-spheroid lambda-dfm (* 112 scale))]
-          [lambda-dfm  (deep-flomap-smooth-z lambda-dfm (* 3 scale))]
-          [lambda-fm  (deep-flomap-render-icon lambda-dfm metal-material)]
-          [fm  (deep-flomap-render-icon bulge-dfm glass-logo-material)]
-          [fm  (flomap-cc-superimpose
-                fm
-                (lambda-flomap lambda-outline-color 10)
-                lambda-fm)]
-          [fm  (flomap-cc-superimpose
-                (draw-icon-flomap
-                 (λ (dc)
-                   (send dc set-pen lambda-outline-color 1/2 'solid)
-                   (send dc set-brush "white" 'solid)
-                   (send dc draw-ellipse -0.25 -0.25 31.5 31.5)
-                   (send dc set-pen "lightblue" 1/2 'solid)
-                   (send dc set-brush "white" 'transparent)
-                   (send dc draw-ellipse 0.5 0.5 30 30))
-                 32 32 (/ height 32))
-                fm)])
-     fm)))
-
-;; ===================================================================================================
-;; Planet logo
-
-(define continents-path-commands
-  '((m 11.526653 18.937779)
-    (c 0.05278 0.724075 1.940414 1.202607 0.678885 2.296248
-       0.249172 0.918181 1.040063 1.620575 1.448285 0.308034
-       1.219485 -0.885607 3.250882 -0.938443 3.317014 -2.906655
-       -1.599965 -1.033954 -4.029479 -0.431148 -5.444184 0.302373)
-    (M 11.53125 18.125)
-    (C 10.786965 18.380649 9.3917452 18.611001 9.1304904 19.245707
-       10.289001 19.269837 11.178405 18.606302 11.53125 18.125)
-    (M 8.1875 19.65625)
-    (C 7.2652998 23.370888 8.6787734 19.63772 9.9124431 20.95891
-       10.727811 21.80382 11.739516 20.92275 10.465247 20.422456
-       9.7714766 19.980166 8.3964342 19.699414 8.1875 19.65625)
-    (M 7.5625 21.125)
-    (c -0.9196331 -1.962382 -3.205955 1.390782 -4.0978229 2.41995
-       -1.707808 2.289408 -2.72190385 5.078558 -2.9334271 7.9238
-       1.0237952 1.983695 5.5272247 2.76676 4.7145431 4.084262
-       -0.7368064 1.151552 -0.8906555 2.601652 0.1135446 3.680893
-       2.7495495 2.364498 1.2541019 5.824595 2.5609489 6.229519
-       2.5755284 0.853846 2.7512924 -3.696022 4.1297234 -3.843434
-       0.745066 -1.051147 0.04765 -2.428466 1.056101 -3.411232)
-    (C 12.318556 36.222109 8.8169859 35.479018 8.6188979 33.8253
-       7.7181807 34.141675 7.0679715 33.334232 6.30372 33.30415
-       5.7220663 34.646967 3.9378253 34.122031 4.3012403 32.699798
-       3.024533 33.043038 4.3605584 31.222879 3.40625 31.28125
-       0.5 33 2.5 26.5 5.0295875 29.903027
-       5.5 30.5 6.9002733 26.371666 8.8261905 25.876953
-       9.8027554 25.533149 9.5159021 24.727855 8.5279357 25.0625
-       7.6214946 24.941384 9.6975411 24.462771 10.075856 24.483273
-       11.540792 24.233047 9.904685 23.334106 9.8601011 22.602389
-       9.0900535 22.676405 9.4028275 22.737933 9.1185443 22.100147
-       6.8948741 22.58513 7.6831847 24.739145 5.9002404 23.244912
-       4.6247757 22.264239 7.321322 21.942832 7.5625 21.125)
-    (m 15.15625 -0.9375)
-    (c -1.37421 0.06218 -2.005432 1.159129 -2.784107 1.978327
-       -0.114565 1.368674 0.952693 -0.07002 1.385771 0.968032
-       0.953881 -0.129572 -0.01507 -1.993413 1.425543 -2.008859
-       -0.269351 0.525838 -0.494795 1.470731 0.411144 1.15174
-       -0.646943 0.90275 -1.874871 2.045333 -2.613442 0.960703
-       0.08813 0.809648 -1.042388 0.509104 -1.186702 1.40851
-       -0.738698 0.338761 -1.028513 0.375271 -0.383294 1.119927
-       -1.340908 -0.226887 -1.979854 2.002883 -0.346874 1.903539
-       3.128783 -3.578714 2.7333 -0.07275 3.379252 -0.61531
-       -0.408321 -3.069544 0.823059 1.69915 1.30948 -0.328623
-       0.476726 0.916648 1.583858 0.757279 2.129612 1.386838
-       -2.140558 2.214946 -4.171988 -1.055384 -6.363065 -0.232922
-       -2.486751 0.823935 -2.418258 3.347586 -3.103635 4.864439
-       0.687061 3.597921 3.669743 1.43585 5.132502 2.724104
-       -0.344691 1.08929 0.484513 1.884668 0.473244 3.022942
-       -0.01352 2.068761 0.378264 6.65826 1.845318 5.542497
-       1.472489 0.175399 1.430793 -1.740909 2.30904 -2.30502
-       -1.36358 -1.181833 2.025569 -1.358588 0.887958 -2.838158
-       -0.499809 -1.988948 1.367195 -3.177085 1.789594 -4.928946
-       0.579613 -0.960476 -1.588234 -0.05789 -0.373062 -1.023304
-       0.927113 -0.301781 2.379761 -2.07879 0.994298 -2.428506
-       -0.676988 0.933612 -1.737597 -2.080985 -0.549773 -0.651497
-       0.699549 -0.419557 1.900516 1.563553 1.759683 -0.08984
-       -0.608903 -3.386912 -2.4601 -6.520148 -5.090986 -8.736865
-       -0.200722 0.802307 -1.230158 0.889683 -1.228926 0.0694
-       2.155263 -0.50116 -0.789058 -0.572123 -1.208573 -0.913148)
-    (M 17.09375 21)
-    (c -1.221276 0.05745 -0.44882 1.331427 0.232503 0.449916)
-    (C 17.458514 21.23484 17.234278 21.104353 17.09375 21)
-    (m -7.5 0.125)
-    (c -1.2040413 0.60218 1.459244 1.052142 0.289004 0.112253)
-    (m 8.96875 1.5)
-    (c 0.38412 0.655402 -0.236077 2.74213 1.030518 1.55154
-       0.0634 -0.524592 -0.59842 -1.401743 -1.030518 -1.55154)
-    (m -0.21875 0.75)
-    (c -1.155615 0.198578 0.509999 1.388302 0.06733 0.201634)
-    (M 10.5 24.53125)
-    (c -0.117519 1.313533 1.058399 0.642504 0 0)))
-
-(define water-logo-material
-  (deep-flomap-material-value
-   'cubic-zirconia 1.0 0.7 1.0
-   0.25 0.15 1.0
-   0.15 0.1 0.2
-   0.0))
-
-(define logo-under-continents-color "black")
-(define logo-continents-color "azure")
-(define logo-water-color "lightskyblue")
-(define logo-earth-outline-color logo-red-color)
-
-(define (continents-flomap color height)
-  (define scale (/ height 32))
-  (draw-icon-flomap
-   (λ (dc)
-     (send dc set-pen lambda-outline-color 3/8 'solid)
-     (send dc set-brush color 'solid)
-     (draw-path-commands dc continents-path-commands 0 -17))
-   32 32 scale))
-
-(defproc (planet-flomap [#:height height (and/c rational? (>=/c 0)) 256]) flomap?
-  (make-cached-flomap
-   [height]
-   (define scale (/ height 32))
-   (define earth-fm
-     (let* ([indent-fm  (continents-flomap logo-red-color height)]
-            [indent-dfm  (flomap->deep-flomap indent-fm)]
-            [indent-dfm  (deep-flomap-raise indent-dfm (* -1/8 scale))]
-            [indent-dfm  (deep-flomap-smooth-z indent-dfm (* 1 scale))]
-            [earth-fm  (draw-icon-flomap
-                        (λ (dc)
-                          (send dc set-pen logo-water-color 1/2 'solid)
-                          (send dc set-brush logo-water-color 'solid)
-                          (send dc draw-ellipse 0.75 0.75 29.5 29.5))
-                        32 32 scale)]
-            [earth-dfm  (flomap->deep-flomap earth-fm)]
-            [earth-dfm  (deep-flomap-bulge-spheroid earth-dfm (* 16 scale))]
-            [earth-dfm  (deep-flomap-cc-superimpose 'add earth-dfm indent-dfm)])
-       (deep-flomap-render-icon earth-dfm water-logo-material)))
-   
-   (define land-fm
-     (let* ([land-fm  (continents-flomap logo-continents-color height)]
-            [land-dfm  (flomap->deep-flomap land-fm)]
-            ;[land-dfm  (deep-flomap-emboss land-dfm (* 2 scale) (* 8 scale))]
-            [land-dfm  (deep-flomap-bulge-spheroid land-dfm (* 16 scale))]
-            [land-dfm  (deep-flomap-smooth-z land-dfm (* 1/2 scale))])
-       (deep-flomap-render-icon land-dfm metal-material)))
-   
-   (flomap-cc-superimpose
-    (draw-icon-flomap
-     (λ (dc)
-       (send dc set-pen lambda-outline-color 1/2 'solid)
-       (send dc set-brush "white" 'solid)
-       (send dc draw-ellipse -0.25 -0.25 31.5 31.5)
-       (send dc set-pen "lightblue" 1/2 'solid)
-       (send dc set-brush "white" 'transparent)
-       (send dc draw-ellipse 0.5 0.5 30 30))
-     32 32 scale)
-    earth-fm
-    land-fm)))
-
-;; ===================================================================================================
-;; Algebraic stepper logo
-
-(defproc (stepper-flomap [#:height height (and/c rational? (>=/c 0)) 96]) flomap?
-  (flomap-pin*
-   1/2 20/32 1/2 1/2
-   (foot-flomap #:color "forestgreen" #:height height #:material glass-icon-material)
-   (lambda-flomap #:color light-metal-icon-color
-                  #:height (* 5/8 height) #:material metal-icon-material)))
-
-;; ===================================================================================================
-;; Macro stepper logo
-
-(defproc (macro-stepper-logo-flomap [#:height height (and/c rational? (>=/c 0)) 96]) flomap?
-  (flomap-pin*
-   1/2 20/32 15/36 1/2
-   (foot-flomap #:color (make-object color% 34 42 160) #:height height #:material glass-icon-material)
-   (hash-quote-flomap #:color light-metal-icon-color
-                      #:height (* 1/2 height)
-                      #:material metal-icon-material)))
-
-;; ===================================================================================================
-;; Racket logo
-
-(define racket-r-commands
-  (scale-path-commands
-   '((m 4 76)
-     (c 12 28 20 56 28 92
-        5.560411 25.02185 4 44.00002 12 76.00002
-        20 0 39.835333 -8 56 -24
-        -20 -36.00004 -28 -72.00002 -28 -108.00002
-        60 -40 96 -44 144 -40
-        6 -12 16.19861 -35.94773 16 -48
-        -60 -4 -112 4 -168 48
-        -1 -12 -0.958295 -20 0 -28
-        -28 4 -44 12 -60 32))
-   1/8 1/8))
-
-(define racket-r-outline-color (make-object color% 64 16 16))
-
-(define (racket-r-flomap color height)
-  (draw-icon-flomap
-   (λ (dc)
-     (set-icon-pen dc racket-r-outline-color 3/8 'solid)
-     (send dc set-brush color 'solid)
-     (draw-path-commands dc racket-r-commands 0 0))
-   32 32 (/ height 32)))
-
-(define racket-sphere-material
-  (deep-flomap-material-value
-   'cubic-zirconia 0.75 0.75 0.75
-   3.5 0.25 0.25
-   0.5 0.25 0.0
-   0.01))
-
-(defproc (racket-flomap [#:height height (and/c rational? (>=/c 0)) 256]) flomap?
-  (make-cached-flomap
-   [height]
-   (define scale (/ height 32))
-   (define sphere-fm
-     (let* ([indent-fm  (racket-r-flomap racket-r-outline-color height)]
-            [indent-dfm  (flomap->deep-flomap indent-fm)]
-            [indent-dfm  (deep-flomap-raise indent-dfm (* -0.75 scale))]
-            [indent-dfm  (deep-flomap-smooth-z indent-dfm (* 0.5 scale))]
-            [sphere-fm  (draw-icon-flomap
-                         (λ (dc)
-                           (define top-rgn (make-object region% dc))
-                           (send top-rgn set-polygon
-                                 '((0 . 0) (31 . 0) (31 . 4) (5 . 13) (8 . 31) (0 . 31)))
-                           
-                           (send dc set-pen logo-blue-color 1/2 'solid)
-                           (send dc set-brush logo-blue-color 'solid)
-                           (send dc draw-ellipse 0.75 0.75 29.5 29.5)
-                           
-                           (send dc set-clipping-region top-rgn)
-                           (send dc set-pen logo-red-color 1/2 'solid)
-                           (send dc set-brush logo-red-color 'solid)
-                           (send dc draw-ellipse 0.75 0.75 29.5 29.5))
-                         32 32 scale)]
-            [sphere-dfm  (flomap->deep-flomap sphere-fm)]
-            [sphere-dfm  (deep-flomap-bulge-spheroid sphere-dfm (* 14 scale))]
-            [sphere-dfm  (deep-flomap-cc-superimpose 'add sphere-dfm indent-dfm)])
-       (deep-flomap-render-icon sphere-dfm glass-logo-material)))
-   
-   (define r-fm
-     (let* ([r-fm  (racket-r-flomap light-metal-icon-color height)]
-            [r-dfm  (flomap->deep-flomap r-fm)]
-            [r-dfm  (deep-flomap-bulge-round r-dfm (* 48 scale))]
-            [r-dfm  (deep-flomap-smooth-z r-dfm (* 1/2 scale))])
-       (deep-flomap-render-icon r-dfm metal-material)))
-   
-   (flomap-cc-superimpose
-    (draw-icon-flomap
-     (λ (dc)
-       (send dc set-pen racket-r-outline-color 1/2 'solid)
-       (send dc set-brush "white" 'solid)
-       (send dc draw-ellipse -0.25 -0.25 31.5 31.5)
-       (send dc set-pen "lightblue" 1/2 'solid)
-       (send dc set-brush "white" 'transparent)
-       (send dc draw-ellipse 0.5 0.5 30 30))
-     32 32 scale)
-    sphere-fm
-    r-fm)))
-
-;; ===================================================================================================
-;; Bitmaps
-
-(define-icon-wrappers
-  ([#:height height (and/c rational? (>=/c 0)) 256])
-  (height)
-  [plt-logo plt-flomap]
-  [racket-logo racket-flomap])
-
-(define-icon-wrappers
-  ([#:height height (and/c rational? (>=/c 0)) 96])
-  (height)
-  [planet-logo planet-flomap]
-  [stepper-logo stepper-flomap]
-  [macro-stepper-logo macro-stepper-logo-flomap])
diff --git a/pkgs/images-pkgs/images-lib/images/private/deep-flomap-parameters.rkt b/pkgs/images-pkgs/images-lib/images/private/deep-flomap-parameters.rkt
deleted file mode 100644
index 1c9220a394..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/deep-flomap-parameters.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang typed/racket/base
-
-(require (except-in "deep-flomap-untyped-parameters.rkt"
-                    light-direction light-intensity ambient-intensity reflected-intensity
-                    refractive-index ideal-reflectance ideal-transmission transmission-density  
-                    specular-reflectance specular-roughness specular-purity       
-                    diffuse-reflectance ambient-reflectance ambient-transmission
-                    shadow-blur
-                    ->refractive-index))
-
-(provide (all-from-out "deep-flomap-untyped-parameters.rkt"))
-
-(require/typed/provide
- "deep-flomap-untyped-parameters.rkt"
- ;; lighting parameters
- [light-direction       (Parameterof (List Flonum Flonum Flonum))]
- [light-intensity       (Parameterof (List Flonum Flonum Flonum))]
- [ambient-intensity     (Parameterof (List Flonum Flonum Flonum))]
- [reflected-intensity   (Parameterof (List Flonum Flonum Flonum))]
- ;; material parameters
- [refractive-index      (Parameterof Flonum)]
- [ideal-reflectance     (Parameterof Flonum)]
- [ideal-transmission    (Parameterof Flonum)]
- [transmission-density  (Parameterof Flonum)]
- [specular-reflectance  (Parameterof Flonum)]
- [specular-roughness    (Parameterof Flonum)]
- [specular-purity       (Parameterof Flonum)]
- [diffuse-reflectance   (Parameterof Flonum)]
- [ambient-reflectance   (Parameterof Flonum)]
- [ambient-transmission  (Parameterof Flonum)]
- [shadow-blur           (Parameterof Flonum)]
- [->refractive-index    ((U Symbol Real) -> Flonum)])
diff --git a/pkgs/images-pkgs/images-lib/images/private/deep-flomap-render.rkt b/pkgs/images-pkgs/images-lib/images/private/deep-flomap-render.rkt
deleted file mode 100644
index f8cd8803c3..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/deep-flomap-render.rkt
+++ /dev/null
@@ -1,506 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match racket/math
-         "flonum.rkt"
-         "flomap.rkt"
-         "deep-flomap-struct.rkt"
-         "deep-flomap-parameters.rkt")
-
-(provide deep-flomap-render)
-
-;; Hacks
-(define specular-blur 1/2)
-(define diffuse-blur 1/2)
-(define ambient-transmission-blur-fraction 1/32)
-
-;; ===================================================================================================
-;; Ray tracing ops
-
-;; assumes direction to viewer is 0.0 0.0 1.0 (i.e. viewer above at infinity)
-(: reflect-view-ray (Flonum Flonum Flonum -> (values Flonum Flonum Flonum)))
-(define (reflect-view-ray nx ny nz)
-  (values (* 2.0 (* nz nx))
-          (* 2.0 (* nz ny))
-          (- (* 2.0 (* nz nz)) 1.0)))
-
-;; calculates intensity of transmitted rays using Fresnel's equation
-(: transmission-intensity (Flonum Flonum Flonum -> Flonum))
-(define (transmission-intensity cos-i η1 η2)
-  (define n1/n2 (/ η1 η2))
-  (define cos^2-i (* cos-i cos-i))
-  (define sin^2-t (* (* n1/n2 n1/n2) (- 1.0 cos^2-i)))
-  (define cos-t (flsqrt (- 1.0 sin^2-t)))
-  (define n1-cos-i (* η1 cos-i))
-  (define n2-cos-t (* η2 cos-t))
-  (define n1-cos-t (* η1 cos-t))
-  (define n2-cos-i (* η2 cos-i))
-  (define perp (/ (- n1-cos-i n2-cos-t)
-                  (+ n1-cos-i n2-cos-t)))
-  (define parl (/ (- n2-cos-i n1-cos-t)
-                  (+ n2-cos-i n1-cos-t)))
-  (- 1.0 (* 0.5 (+ (* perp perp) (* parl parl)))))
-
-(: transmitted-vector (Flonum Flonum Flonum Flonum Flonum Flonum Flonum Flonum
-                              -> (values Flonum Flonum Flonum)))
-(define (transmitted-vector nx ny nz ix iy iz η1 η2)
-  (define η1/η2  (/ η1 η2))
-  (define cos-i (- (fl3dot nx ny nz ix iy iz)))
-  (define cos^2-i (* cos-i cos-i))
-  (define sin^2-t (* (* η1/η2 η1/η2) (- 1.0 cos^2-i)))
-  (define c (- (* η1/η2 cos-i) (flsqrt (- 1.0 sin^2-t))))
-  (define-values (tx1 ty1 tz1) (fl3* ix iy iz η1/η2))
-  (define-values (tx2 ty2 tz2) (fl3* nx ny nz c))
-  (fl3+ tx1 ty1 tz1 tx2 ty2 tz2))
-
-(: absorb-intensity (Flonum Flonum -> Flonum))
-(define (absorb-intensity opacity dist)
-  (let* ([o  (+ (* opacity 0.99) 0.005)])
-    (cond [(o . = . 0.0)  0.0]
-          [else  (exp (* (fllog o) dist))])))
-
-(: beckmann-distribution (Flonum Flonum -> Flonum))
-(define (beckmann-distribution cos-θ m)
-  (define x (/ (tan (acos cos-θ)) m))
-  (define m*cos^2-θ (* m cos-θ cos-θ))
-  (/ (exp (- (* x x))) (* pi m*cos^2-θ m*cos^2-θ)))
-
-;; ===================================================================================================
-;; Pass 1: tracing from a directional light source
-
-(: trace-directional-light (flomap flomap flomap flomap
-                                   Integer Integer Integer Integer -> (values flomap flomap)))
-(define (trace-directional-light alpha-fm rgb-fm z-fm normal-fm
-                                 x-min x-max y-min y-max)
-  (match-define (flomap alpha-vs 1 w h) alpha-fm)
-  (match-define (list rgb-vs z-vs normal-vs)
-    (map flomap-values (list rgb-fm z-fm normal-fm)))
-  
-  (define z-max (flomap-max-value z-fm))
-  (define opacity-z (/ z-max (transmission-density)))
-  ;; max coordinates of the shadow image
-  (define sx-max (- w 1.0))
-  (define sy-max (- h 1.0))
-  ;; vector pointing toward light source, incident vector, and light color
-  (define-values (lx ly lz) (match-let ([(list lx ly lz)  (light-direction)])
-                              (fl3normalize lx ly lz)))
-  (define-values (ix iy iz) (fl3- lx ly lz))
-  (match-define (list lr lg lb) (light-intensity))
-  ;; view and "half" directions
-  (define-values (hx hy hz) (fl3-half-norm lx ly lz 0.0 0.0 1.0))
-  ;; material properties
-  (define η2 (real->double-flonum (refractive-index)))
-  (define η1/η2 (/ 1.0 η2))
-  ;; proportion of diffracted reflection
-  (define 0.5*v-dot-h (* 0.5 hz))
-  (define Ra (ambient-reflectance))
-  (define Ta (ambient-transmission))
-  (define Rd (diffuse-reflectance))
-  (define Rs (specular-reflectance))
-  (define Ti (ideal-transmission))
-  (define roughness (specular-roughness))
-  (define purity (specular-purity))
-  
-  (match-define (list ar ag ab) (ambient-intensity))
-  (define-values (Tar Tag Tab) (fl3* ar ag ab Ta))
-  (define-values (Rar Rag Rab) (fl3* ar ag ab Ra))
-  
-  (define intensity-fm (make-flomap 3 w h))
-  (define intensity-vs (flomap-values intensity-fm))
-  (define specular-fm (make-flomap 1 w h))
-  (define specular-vs (flomap-values specular-fm))
-  (define diffuse-fm (make-flomap 3 w h lz))
-  (define diffuse-vs (flomap-values diffuse-fm))
-  
-  ;(define sx-vs (make-flvector (* w h) +nan.0))
-  ;(define sy-vs (make-flvector (* w h) +nan.0))
-  (define sx-fm (inline-build-flomap 1 w h (λ (k x y i) (+ (fx->fl x) 0.5))))
-  (define sy-fm (inline-build-flomap 1 w h (λ (k x y i) (+ (fx->fl y) 0.5))))
-  (define sx-vs (flomap-values sx-fm))
-  (define sy-vs (flomap-values sy-fm))
-  (define Irgb-vs (make-flvector (* 3 w h)))
-  
-  (for*: ([int-y : Integer  (in-range y-min y-max)]
-          [int-x : Integer  (in-range x-min x-max)])
-    (define i (fx+ int-x (fx* int-y w)))
-    (define a (flvector-ref alpha-vs i))
-    (when (a . > . 0.0)
-      (define j (fx* 3 i))
-      ;; altitude and surface normal
-      (define z (flvector-ref z-vs i))
-      (define nx (flvector-ref normal-vs j))
-      (define ny (flvector-ref normal-vs (fx+ j 1)))
-      (define nz (flvector-ref normal-vs (fx+ j 2)))
-      ;; cosine of angle between light and surface normal
-      (define n-dot-l (fl3dot nx ny nz lx ly lz))
-      ;; intensity of incident light (Lambert's cosine law)
-      (define-values (Ilr Ilg Ilb) (fl3* lr lg lb n-dot-l))
-      (flvector-set! intensity-vs j Ilr)
-      (flvector-set! intensity-vs (fx+ j 1) Ilg)
-      (flvector-set! intensity-vs (fx+ j 2) Ilb)
-      ;; diffraction intensity due to specular, diffuse and ambient reflection
-      (cond
-        [(n-dot-l . > . 0.0)  ; does the microfacet face the light?
-         (define Is
-           (cond
-             ;; Cook-Torrance specular reflection intensity
-             [(Rs . > . 0.0)
-              (define n-dot-h (fl3dot nx ny nz hx hy hz))
-              (define n-dot-v nz)
-              ;; geometrical attenuation factor (has something to do with local reflections)
-              (define G (min 1.0
-                             (/ (* n-dot-h n-dot-v) 0.5*v-dot-h)
-                             (/ (* n-dot-h n-dot-l) 0.5*v-dot-h)))
-              ;; scatter distribution
-              (define D (beckmann-distribution n-dot-h roughness))
-              ;; Fresnel term
-              (define F (- 1.0 (transmission-intensity n-dot-l 1.0 η2)))
-              (* Rs F (/ D n-dot-l) (/ G n-dot-v))]
-             [else  0.0]))
-         (flvector-set! specular-vs i Is)
-         
-         (let*-values ([(Idr Idg Idb)  (fl3* Ilr Ilg Ilb Rd)]
-                       [(Idr Idg Idb)  (fl3+ Idr Idg Idb Rar Rag Rab)])
-           (flvector-set! diffuse-vs j Idr)
-           (flvector-set! diffuse-vs (fx+ j 1) Idg)
-           (flvector-set! diffuse-vs (fx+ j 2) Idb))]
-        [else
-         (flvector-set! diffuse-vs j Rar)
-         (flvector-set! diffuse-vs (fx+ j 1) Rag)
-         (flvector-set! diffuse-vs (fx+ j 2) Rab)])
-      
-      (when (and (Ti . > . 0.0) (n-dot-l . > . 0.0))
-        ;; ideal transmission vector
-        (define-values (tx ty tz) (transmitted-vector nx ny nz ix iy iz 1.0 η2))
-        ;; sz = z + dist * tz, so dist = (sz - z) / tz
-        (define dist (/ (- 0.0 z) tz))
-        (when (and (dist . >= . 0.0) (dist . < . +inf.0))
-          ;; transmitted ray intersects with shadow plane at sx sy 0.0
-          (define sx (+ 0.5 (->fl int-x) (* dist tx)))
-          (define sy (+ 0.5 (->fl int-y) (* dist ty)))
-          ;; actual transmission proportion (Fresnel's law)
-          (define T (* Ti (transmission-intensity n-dot-l 1.0 η2)))
-          ;; intensity of incident light (Lambert's cosine law)
-          (define-values (Ilr Ilg Ilb) (fl3* lr lg lb n-dot-l))
-          ;; normalized distance to the surface
-          (define norm-dist (/ dist opacity-z))
-          ;; intensity of the light that strikes the surface
-          (define r (flvector-ref rgb-vs j))
-          (define g (flvector-ref rgb-vs (fx+ j 1)))
-          (define b (flvector-ref rgb-vs (fx+ j 2)))
-          (define-values (Ir Ig Ib)
-            (values (* T Ilr (absorb-intensity r norm-dist))
-                    (* T Ilg (absorb-intensity g norm-dist))
-                    (* T Ilb (absorb-intensity b norm-dist))))
-          (flvector-set! sx-vs i sx)
-          (flvector-set! sy-vs i sy)
-          (flvector-set! Irgb-vs j Ir)
-          (flvector-set! Irgb-vs (fx+ j 1) Ig)
-          (flvector-set! Irgb-vs (fx+ j 2) Ib)))))
-  
-  (define diffracted-fm (fm+ (fm* (flomap-blur diffuse-fm diffuse-blur)
-                                  rgb-fm)
-                             (fm* (flomap-blur specular-fm specular-blur)
-                                  (fm+ (fm* (- 1.0 purity) rgb-fm)
-                                       (fm* purity intensity-fm)))))
-  
-  ;; approximate ambient transmission by casting light downward with no refraction, then blurring
-  (define ambient-shadow-fm (make-flomap 3 w h))
-  (define ambient-shadow-vs (flomap-values ambient-shadow-fm))
-  (when (Ta . > . 0.0)
-    (for*: ([int-y : Integer  (in-range y-min y-max)]
-            [int-x : Integer  (in-range x-min x-max)])
-      (define i (fx+ int-x (fx* int-y w)))
-      (define a (flvector-ref alpha-vs i))
-      (when (a . > . 0.0)
-        (define z (flvector-ref z-vs i))
-        (define j (fx* 3 i))
-        (define r (flvector-ref rgb-vs j))
-        (define g (flvector-ref rgb-vs (fx+ j 1)))
-        (define b (flvector-ref rgb-vs (fx+ j 2)))
-        (define norm-dist (/ z opacity-z))
-        (define-values (Ir Ig Ib)
-          (values (* Tar (absorb-intensity r norm-dist))
-                  (* Tag (absorb-intensity g norm-dist))
-                  (* Tab (absorb-intensity b norm-dist))))
-        (flvector-set! ambient-shadow-vs j Ir)
-        (flvector-set! ambient-shadow-vs (fx+ j 1) Ig)
-        (flvector-set! ambient-shadow-vs (fx+ j 2) Ib))))
-  
-  ;; cast approximate shadow volumes
-  (define shadow-fm (flomap-blur ambient-shadow-fm (* ambient-transmission-blur-fraction (min w h))))
-  (define shadow-vs (flomap-values shadow-fm))
-  (when (Ti . > . 0.0)
-    ;; Gaussian kernels - make as wide as possible to keep from having to reallocate
-    (define kxs (make-flvector w))
-    (define kys (make-flvector h))
-    (for*: ([int-y : Integer  (in-range y-min (- y-max 1))]
-            [int-x : Integer  (in-range x-min (- x-max 1))])
-      (define i00 (fx+ int-x (fx* int-y w)))
-      (define i01 (fx+ i00 1))
-      (define i10 (fx+ i00 w))
-      (define i11 (fx+ i10 1))
-      (define sx00 (flvector-ref sx-vs i00))
-      (define sx01 (flvector-ref sx-vs i01))
-      (define sx10 (flvector-ref sx-vs i10))
-      (define sx11 (flvector-ref sx-vs i11))
-      (when (and (flrational? sx00) (flrational? sx01)
-                 (flrational? sx10) (flrational? sx11))
-        (define sy00 (flvector-ref sy-vs i00))
-        (define sy01 (flvector-ref sy-vs i01))
-        (define sy10 (flvector-ref sy-vs i10))
-        (define sy11 (flvector-ref sy-vs i11))
-        (define sx-min (min sx00 sx01 sx10 sx11))
-        (define sy-min (min sy00 sy01 sy10 sy11))
-        (define sx-max (max sx00 sx01 sx10 sx11))
-        (define sy-max (max sy00 sy01 sy10 sy11))
-        ;; find the mean and standard deviation
-        (define sx-mid (* 0.25 (+ sx00 sx01 sx10 sx11)))
-        (define sy-mid (* 0.25 (+ sy00 sy01 sy10 sy11)))
-        (define sx-mid^2 (* 0.25 (+ (* sx00 sx00) (* sx01 sx01) (* sx10 sx10) (* sx11 sx11))))
-        (define sy-mid^2 (* 0.25 (+ (* sy00 sy00) (* sy01 sy01) (* sy10 sy10) (* sy11 sy11))))
-        (define sx-stddev (flsqrt (- sx-mid^2 (* sx-mid sx-mid))))
-        (define sy-stddev (flsqrt (- sy-mid^2 (* sy-mid sy-mid))))
-        (define x-min (fxmax 0 (fl->fx (floor sx-min))))
-        (define x-max (fxmin w (fx+ 1 (fl->fx (floor sx-max)))))
-        (define y-min (fxmax 0 (fl->fx (floor sy-min))))
-        (define y-max (fxmin h (fx+ 1 (fl->fx (floor sy-max)))))
-        (define x-size (fx- x-max x-min))
-        (define y-size (fx- y-max y-min))
-        (when (and (x-size . fx> . 0) (y-size . fx> . 0))
-          ;; average the color
-          (define j00 (fx* 3 i00))
-          (define j01 (fx* 3 i01))
-          (define j10 (fx* 3 i10))
-          (define j11 (fx* 3 i11))
-          (define r (* 0.25 (+ (flvector-ref Irgb-vs j00)
-                               (flvector-ref Irgb-vs j01)
-                               (flvector-ref Irgb-vs j10)
-                               (flvector-ref Irgb-vs j11))))
-          (define g (* 0.25 (+ (flvector-ref Irgb-vs (fx+ j00 1))
-                               (flvector-ref Irgb-vs (fx+ j01 1))
-                               (flvector-ref Irgb-vs (fx+ j10 1))
-                               (flvector-ref Irgb-vs (fx+ j11 1)))))
-          (define b (* 0.25 (+ (flvector-ref Irgb-vs (fx+ j00 2))
-                               (flvector-ref Irgb-vs (fx+ j01 2))
-                               (flvector-ref Irgb-vs (fx+ j10 2))
-                               (flvector-ref Irgb-vs (fx+ j11 2)))))
-          ;; precalculate the Gaussian kernel for the x direction
-          (for ([dx  (in-range x-size)])
-            (define x (fx+ dx x-min))
-            (define d (/ (- (+ 0.5 (fx->fl x)) sx-mid) sx-stddev))
-            (define kx (exp (* -0.5 (* d d))))
-            (flvector-set! kxs dx kx))
-          ;; precalculate the Gaussian kernel for the y direction
-          ;; this shouldn't help because it's used only once per y iteration, but it reduces allocs
-          ;; within the loop (unsafe-flexp has no bytecode op yet, so its args and return are boxed)
-          (for ([dy  (in-range y-size)])
-            (define y (fx+ dy y-min))
-            (define d (/ (- (+ 0.5 (fx->fl y)) sy-mid) sy-stddev))
-            (define ky (exp (* -0.5 (* d d))))
-            (flvector-set! kys dy ky))
-          ;; normalization constant for a 2D Gaussian kernel
-          (define c (* 2.0 pi sx-stddev sy-stddev))
-          ;; cast the approximate shadow volume
-          (let y-loop ([dy 0])
-            (when (dy . fx< . y-size)
-              (define ky (flvector-ref kys dy))
-              (cond [(ky . > . 0.1)
-                     (define a (/ ky c))
-                     (define Ir (* r a))
-                     (define Ig (* g a))
-                     (define Ib (* b a))
-                     (define i (fx* 3 (fx+ x-min (fx* (fx+ dy y-min) w))))
-                     (let x-loop ([dx 0] [i i])
-                       (cond [(dx . fx< . x-size)
-                              (define kx (flvector-ref kxs dx))
-                              (when (kx . > . 0.1)
-                                (flvector-set!
-                                 shadow-vs i (+ (* Ir kx) (flvector-ref shadow-vs i)))
-                                (define i1 (fx+ i 1))
-                                (flvector-set!
-                                 shadow-vs i1 (+ (* Ig kx) (flvector-ref shadow-vs i1)))
-                                (define i2 (fx+ i 2))
-                                (flvector-set!
-                                 shadow-vs i2 (+ (* Ib kx) (flvector-ref shadow-vs i2))))
-                              (x-loop (fx+ 1 dx) (fx+ 3 i))]
-                             [else
-                              (y-loop (fx+ 1 dy))]))]
-                    [else
-                     (y-loop (fx+ 1 dy))])))))))
-  
-  ;; blur the shadow a bit to make up for approximating it with Gaussians
-  (values diffracted-fm (flomap-box-blur shadow-fm 1)))
-
-;; ===================================================================================================
-;; Pass 2: tracing from a directional viewer
-
-(: trace-directional-view (flomap flomap flomap flomap flomap
-                                  Integer Integer Integer Integer -> (values flomap flomap)))
-(define (trace-directional-view alpha-fm rgb-fm z-fm normal-fm shadow-fm
-                                x-min x-max y-min y-max)
-  (define-values (w h) (flomap-size alpha-fm))
-  (match-define (list alpha-vs rgb-vs z-vs normal-vs shadow-vs)
-    (map flomap-values (list alpha-fm rgb-fm z-fm normal-fm shadow-fm)))
-  
-  (define w-1 (fx- w 1))
-  (define h-1 (fx- h 1))
-  (define x-size (fx->fl w))
-  (define y-size (fx->fl h))
-  (define z-size (flomap-max-value z-fm))
-  (define x-mid (* 0.5 x-size))
-  (define y-mid (* 0.5 y-size))
-  (define opacity-z (/ z-size (transmission-density)))
-  
-  ;; reflected wall is tilted a bit toward the viewer
-  (define wall-tilt-θ (* 1/8 pi))
-  (define cos-wall-tilt-θ (cos wall-tilt-θ))
-  (define sin-wall-tilt-θ (sin wall-tilt-θ))
-  (match-define (list Irr Irg Irb) (reflected-intensity))
-  
-  ;; material properties
-  (define η2 (refractive-index))
-  (define η1/η2 (/ 1.0 η2))
-  (define Ri (ideal-reflectance))
-  (define Ti (ideal-transmission))
-  
-  (define reflected-fm (make-flomap 3 w h))
-  (define reflected-vs (flomap-values reflected-fm))
-  (define transmitted-fm (make-flomap 3 w h))
-  (define transmitted-vs (flomap-values transmitted-fm))
-  
-  (when (or (Ri . > . 0.0) (Ti . > . 0.0))
-    (for*: ([int-y : Integer  (in-range y-min y-max)]
-            [int-x : Integer  (in-range x-min x-max)])
-      (define i (fx+ int-x (fx* int-y w)))
-      (define a (flvector-ref alpha-vs i))
-      (when (a . > . 0.0)
-        (define j (fx* 3 i))
-        ;; surface normal
-        (define nx (flvector-ref normal-vs j))
-        (define ny (flvector-ref normal-vs (fx+ j 1)))
-        (define nz (flvector-ref normal-vs (fx+ j 2)))
-        ;; cosine of angle between viewer and surface normal
-        ;; with gradient inferred from z flomap, this is always > 0.0
-        (define cos-i nz)
-        ;; transmitted intensity
-        (define orig-T (transmission-intensity cos-i 1.0 η2))
-        (define T (* Ti orig-T))
-        (define R (* Ri (- 1.0 orig-T)))
-        ;; surface coordinates
-        (define x (+ 0.5 (->fl int-x)))
-        (define y (+ 0.5 (->fl int-y)))
-        (define z (flvector-ref z-vs i))
-        ;; reflection
-        (when (and (Ri . > . 0.0)
-                   (int-x . fx> . 0) (int-x . fx< . w-1)
-                   (int-y . fx> . 0) (int-y . fx< . h-1))
-          (define-values (rx ry rz) (reflect-view-ray nx ny nz))
-          ;; tilt the wall a little so flat surfaces reflect something
-          (define ry* (- (* ry cos-wall-tilt-θ) (* rz sin-wall-tilt-θ)))
-          ;(define rz* (+ (* ry sin-wall-tilt-θ) (* rz cos-wall-tilt-θ)))
-          ;; distance to the wall
-          (define rdist (/ (- (- z-size) y) ry*))
-          (define sx (+ x (* rx rdist)))
-          (define sy (+ y (* ry rdist)))
-          (define sz (+ z (* rz rdist)))
-          (when (rdist . >= . 0.0)
-            (define cdist (fl3dist sx sy sz x-mid y-mid 0.0))
-            (define v (flsigmoid (* 0.25 (- (* 4.5 z-size) cdist))))
-            (let-values ([(r g b) (fl3* Irr Irg Irb (* R v))])
-              (flvector-set! reflected-vs j r)
-              (flvector-set! reflected-vs (fx+ j 1) g)
-              (flvector-set! reflected-vs (fx+ j 2) b))))
-        ;; transmission (refraction)
-        (when (Ti . > . 0.0)
-          (define snx (flvector-ref normal-vs j))
-          (define sny (flvector-ref normal-vs (fx+ j 1)))
-          (define snz (flvector-ref normal-vs (fx+ j 2)))
-          (define-values (tx ty tz) (transmitted-vector snx sny snz 0.0 0.0 -1.0 1.0 η2))
-          ;; sz = z + dist * tz, so dist = (sz - z) / tz
-          (define dist (/ (- 0.0 z) tz))
-          (when (and (dist . >= . 0.0) (dist . < . +inf.0))
-            ;; Shadow intersection point
-            (define sx (+ x (* dist tx)))
-            (define sy (+ y (* dist ty)))
-            ;; Shadow intersection color
-            (define sr (flomap-bilinear-ref shadow-fm 0 sx sy))
-            (define sg (flomap-bilinear-ref shadow-fm 1 sx sy))
-            (define sb (flomap-bilinear-ref shadow-fm 2 sx sy))
-            ;; normalized distance to the surface
-            (define norm-dist (/ dist opacity-z))
-            ;; intensities of each r g b by the time the light emerges from the surface
-            (define-values (r g b)
-              ;; colors represent absorption rates
-              (let ([r  (flvector-ref rgb-vs j)]
-                    [g  (flvector-ref rgb-vs (fx+ j 1))]
-                    [b  (flvector-ref rgb-vs (fx+ j 2))])
-                (values (* T sr (absorb-intensity r norm-dist))
-                        (* T sg (absorb-intensity g norm-dist))
-                        (* T sb (absorb-intensity b norm-dist)))))
-            (flvector-set! transmitted-vs j r)
-            (flvector-set! transmitted-vs (fx+ j 1) g)
-            (flvector-set! transmitted-vs (fx+ j 2) b))))))
-  
-  (values reflected-fm transmitted-fm))
-
-;; ===================================================================================================
-;; Full rendering
-
-(: prep-background (flomap Integer Integer -> (Option flomap)))
-(define (prep-background fm w h)
-  (let loop ([fm  (flomap-cc-crop fm w h)])
-    (case (flomap-components fm)
-      [(0)  #f]
-      [(1)  (flomap-append-components fm fm fm)]
-      [(2)  (define value-fm (flomap-ref-component fm 1))
-            (loop (flomap-append-components fm value-fm value-fm))]
-      [(3)  fm]
-      [(4)  (flomap-drop-components (flomap-cc-superimpose (make-flomap 4 w h 1.0) fm) 1)]
-      [else  (raise-type-error 'deep-flomap-render "flomap with 0, 1, 2, 3 or 4 components" fm)])))
-
-(: deep-flomap-render (case-> (deep-flomap -> flomap)
-                              (deep-flomap (Option flomap) -> flomap)))
-(define deep-flomap-render
-  (case-lambda
-    [(dfm)  (deep-flomap-render dfm #f)]
-    [(dfm background-fm)
-     (let ([dfm  (deep-flomap-inset dfm 1)])
-       (define-values (w h) (deep-flomap-size dfm))
-       (define argb-fm (flomap-divide-alpha (deep-flomap-argb dfm)))
-       (define alpha-fm (flomap-ref-component argb-fm 0))
-       (define rgb-fm (flomap-drop-components argb-fm 1))
-       (define z-fm (fmmax 0.0 (deep-flomap-z dfm)))
-       (define normal-fm (flomap-gradient-normal z-fm))
-       (define bg-fm (if background-fm (prep-background background-fm w h) #f))
-       (define-values (x-min y-min x-max y-max)
-         (let-values ([(x-min y-min x-max y-max) (flomap-nonzero-rect alpha-fm)])
-           (values (max 0 (- x-min 1)) (max 0 (- y-min 1))
-                   (min w (+ x-max 1)) (min h (+ y-max 1)))))
-       
-       ;; pass 1: trace from the light source
-       (define-values (diffracted-fm raw-shadow-fm)
-         (trace-directional-light alpha-fm rgb-fm z-fm normal-fm x-min x-max y-min y-max))
-       
-       ;; two Gaussian blurs by half of σ^2 is equivalent to one Gaussian blur by σ^2
-       (define σ^2 (real->double-flonum (sqr (* (min w h) (shadow-blur)))))
-       
-       ;; blur the shadow to simulate internal scatter
-       (define shadow-fm
-         (cond [bg-fm
-                (let* ([fm  (flomap-blur raw-shadow-fm (flsqrt (* 1/3 σ^2)))]
-                       [fm  (fm* fm bg-fm)]
-                       [fm  (flomap-blur fm (flsqrt (* 1/3 σ^2)))])
-                  fm)]
-               [else
-                (flomap-blur raw-shadow-fm (flsqrt (* 2/3 σ^2)))]))
-       
-       ;; pass 2: trace from the viewer
-       (define-values (reflected-fm raw-transmitted-fm)
-         (trace-directional-view alpha-fm rgb-fm z-fm normal-fm shadow-fm x-min x-max y-min y-max))
-       ;; simulate scatter some more
-       (define transmitted-fm (flomap-blur raw-transmitted-fm (flsqrt (* 1/3 σ^2))))
-       ;; add all the light together, convert to premultiplied-alpha flomap
-       (let* ([fm  (fm+ (fm+ diffracted-fm transmitted-fm) reflected-fm)]
-              [fm  (flomap-append-components alpha-fm fm)]
-              [fm  (flomap-multiply-alpha fm)])
-         (flomap-inset fm -1)))]))
diff --git a/pkgs/images-pkgs/images-lib/images/private/deep-flomap-struct.rkt b/pkgs/images-pkgs/images-lib/images/private/deep-flomap-struct.rkt
deleted file mode 100644
index 978467b0a1..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/deep-flomap-struct.rkt
+++ /dev/null
@@ -1,489 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match racket/math
-         "flonum.rkt"
-         "flomap.rkt")
-
-(provide deep-flomap deep-flomap? deep-flomap-argb deep-flomap-z
-         deep-flomap-width deep-flomap-height deep-flomap-z-min deep-flomap-z-max
-         deep-flomap-size deep-flomap-alpha deep-flomap-rgb
-         flomap->deep-flomap
-         ;; Sizing
-         deep-flomap-inset deep-flomap-trim deep-flomap-scale deep-flomap-resize
-         ;; Z-adjusting
-         deep-flomap-scale-z deep-flomap-smooth-z deep-flomap-raise deep-flomap-tilt
-         deep-flomap-emboss
-         deep-flomap-bulge deep-flomap-bulge-round deep-flomap-bulge-round-rect
-         deep-flomap-bulge-spheroid deep-flomap-bulge-horizontal deep-flomap-bulge-vertical
-         deep-flomap-bulge-ripple
-         ;; Compositing
-         deep-flomap-pin deep-flomap-pin*
-         deep-flomap-lt-superimpose deep-flomap-lc-superimpose deep-flomap-lb-superimpose
-         deep-flomap-ct-superimpose deep-flomap-cc-superimpose deep-flomap-cb-superimpose
-         deep-flomap-rt-superimpose deep-flomap-rc-superimpose deep-flomap-rb-superimpose
-         deep-flomap-vl-append deep-flomap-vc-append deep-flomap-vr-append
-         deep-flomap-ht-append deep-flomap-hc-append deep-flomap-hb-append)
-
-(struct: deep-flomap ([argb : flomap] [z : flomap])
-  #:transparent
-  #:guard
-  (λ (argb-fm z-fm name)
-    (match-define (flomap _ 4 w h) argb-fm)
-    (match-define (flomap _ 1 zw zh) z-fm)
-    (unless (and (= w zw) (= h zh))
-      (error 'deep-flomap "expected same-size flomaps; given sizes ~e×~e and ~e×~e" w h zw zh))
-    (values argb-fm z-fm)))
-
-(: flomap->deep-flomap (flomap -> deep-flomap))
-(define (flomap->deep-flomap argb-fm)
-  (match-define (flomap _ 4 w h) argb-fm)
-  (deep-flomap argb-fm (make-flomap 1 w h)))
-
-(: deep-flomap-width (deep-flomap -> Nonnegative-Fixnum))
-(define (deep-flomap-width dfm)
-  (define w (flomap-width (deep-flomap-argb dfm)))
-  (with-asserts ([w  nonnegative-fixnum?])
-    w))
-
-(: deep-flomap-height (deep-flomap -> Nonnegative-Fixnum))
-(define (deep-flomap-height dfm)
-  (define h (flomap-height (deep-flomap-argb dfm)))
-  (with-asserts ([h  nonnegative-fixnum?])
-    h))
-
-(: deep-flomap-z-min (deep-flomap -> Flonum))
-(define (deep-flomap-z-min dfm)
-  (flomap-min-value (deep-flomap-z dfm)))
-
-(: deep-flomap-z-max (deep-flomap -> Flonum))
-(define (deep-flomap-z-max dfm)
-  (flomap-max-value (deep-flomap-z dfm)))
-
-(: deep-flomap-size (deep-flomap -> (values Nonnegative-Fixnum Nonnegative-Fixnum)))
-(define (deep-flomap-size dfm)
-  (values (deep-flomap-width dfm) (deep-flomap-height dfm)))
-
-(: deep-flomap-alpha (deep-flomap -> flomap))
-(define (deep-flomap-alpha dfm)
-  (flomap-ref-component (deep-flomap-argb dfm) 0))
-
-(: deep-flomap-rgb (deep-flomap -> flomap))
-(define (deep-flomap-rgb dfm)
-  (flomap-drop-components (deep-flomap-argb dfm) 1))
-
-;; ===================================================================================================
-;; Z adjusters
-
-(: deep-flomap-scale-z (deep-flomap (U Real flomap) -> deep-flomap))
-(define (deep-flomap-scale-z dfm z)
-  (match-define (deep-flomap argb-fm z-fm) dfm)
-  (deep-flomap argb-fm (fm* z-fm z)))
-
-(: deep-flomap-smooth-z (deep-flomap Real -> deep-flomap))
-(define (deep-flomap-smooth-z dfm σ)
-  (let ([σ  (real->double-flonum σ)])
-    (match-define (deep-flomap argb-fm z-fm) dfm)
-    (define new-z-fm (flomap-blur z-fm σ))
-    (deep-flomap argb-fm new-z-fm)))
-
-;; deep-flomap-raise and everything derived from it observe an invariant:
-;; when z is added, added z must be 0.0 everywhere alpha is 0.0
-
-(: deep-flomap-raise (deep-flomap (U Real flomap) -> deep-flomap))
-(define (deep-flomap-raise dfm z)
-  (match-define (deep-flomap argb-fm z-fm) dfm)
-  (define alpha-fm (deep-flomap-alpha dfm))
-  (deep-flomap argb-fm (fm+ z-fm (fm* alpha-fm z))))
-
-(: deep-flomap-emboss (deep-flomap Real (U Real flomap) -> deep-flomap))
-(define (deep-flomap-emboss dfm xy-amt z-amt)
-  (let ([σ      (/ xy-amt 3.0)])
-    (define z-fm (flomap-normalize (deep-flomap-alpha dfm)))
-    (define new-z-fm (fm* (flomap-blur z-fm σ) z-amt))
-    (deep-flomap-raise dfm new-z-fm)))
-
-(define-syntax-rule (inline-deep-flomap-bulge dfm f)
-  (let ()
-    (define-values (w h) (deep-flomap-size dfm))
-    (define half-x-size (- (* 0.5 (fx->fl w)) 0.5))
-    (define half-y-size (- (* 0.5 (fx->fl h)) 0.5))
-    (define z-fm
-      (inline-build-flomap
-       1 w h
-       (λ (_ x y _i)
-         (f (- (/ (fx->fl x) half-x-size) 1.0)
-            (- (/ (fx->fl y) half-y-size) 1.0)))))
-    (deep-flomap-raise dfm z-fm)))
-
-(: deep-flomap-bulge (deep-flomap (Flonum Flonum -> Real) -> deep-flomap))
-(define (deep-flomap-bulge dfm f)
-  (inline-deep-flomap-bulge dfm (λ (cx cy) (real->double-flonum (f cx cy)))))
-
-(: deep-flomap-tilt (deep-flomap Real Real Real Real -> deep-flomap))
-(define (deep-flomap-tilt dfm left-z-amt top-z-amt right-z-amt bottom-z-amt)
-  (let ([l  (real->double-flonum left-z-amt)]
-        [t  (real->double-flonum top-z-amt)]
-        [r  (real->double-flonum right-z-amt)]
-        [b  (real->double-flonum bottom-z-amt)])
-    (define: (f [x : Flonum] [y : Flonum]) : Flonum
-      (define α (/ (+ x 1.0) 2.0))
-      (define β (/ (+ y 1.0) 2.0))
-      (+ (* (- 1.0 α) l) (* α r)
-         (* (- 1.0 β) t) (* β b)))
-    (inline-deep-flomap-bulge dfm f)))
-
-(: deep-flomap-bulge-round (deep-flomap Real -> deep-flomap))
-(define (deep-flomap-bulge-round dfm z-amt)
-  (let ([z-amt  (real->double-flonum z-amt)])
-    (define: (f [x : Flonum] [y : Flonum]) : Flonum
-      (define d^2 (+ (* x x) (* y y)))
-      (* z-amt (flsqrt (/ (- 2.0 d^2) 2.0))))
-    (inline-deep-flomap-bulge dfm f)))
-
-(: deep-flomap-bulge-round-rect (deep-flomap Real -> deep-flomap))
-(define (deep-flomap-bulge-round-rect dfm z-amt)
-  (let ([z-amt  (real->double-flonum z-amt)])
-    (define: (f [x : Flonum] [y : Flonum]) : Flonum
-      (* z-amt (flsqrt (* (- 1.0 (* x x))
-                          (- 1.0 (* y y))))))
-    (inline-deep-flomap-bulge dfm f)))
-
-(: deep-flomap-bulge-spheroid (deep-flomap Real -> deep-flomap))
-(define (deep-flomap-bulge-spheroid dfm z-amt)
-  (let ([z-amt  (real->double-flonum z-amt)])
-    (define: (f [x : Flonum] [y : Flonum]) : Flonum
-      (define d^2 (+ (* x x) (* y y)))
-      (if (d^2 . < . 1.0) (* z-amt (flsqrt (- 1.0 d^2))) 0.0))
-    (inline-deep-flomap-bulge dfm f)))
-
-(: deep-flomap-bulge-horizontal (deep-flomap Real -> deep-flomap))
-(define (deep-flomap-bulge-horizontal dfm z-amt)
-  (let ([z-amt  (real->double-flonum z-amt)])
-    (define: (f [x : Flonum] [y : Flonum]) : Flonum
-      (* z-amt (flsqrt (- 1.0 (* x x)))))
-    (inline-deep-flomap-bulge dfm f)))
-
-(: deep-flomap-bulge-vertical (deep-flomap Real -> deep-flomap))
-(define (deep-flomap-bulge-vertical dfm z-amt)
-  (let ([z-amt  (real->double-flonum z-amt)])
-    (define: (f [x : Flonum] [y : Flonum]) : Flonum
-      (* z-amt (flsqrt (- 1.0 (* y y)))))
-    (inline-deep-flomap-bulge dfm f)))
-
-(: deep-flomap-bulge-ripple (deep-flomap Real Real -> deep-flomap))
-(define (deep-flomap-bulge-ripple dfm freq z-amt)
-  (let ([freq   (real->double-flonum freq)]
-        [z-amt  (real->double-flonum z-amt)])
-    (define: (f [x : Flonum] [y : Flonum]) : Flonum
-      (define d^2 (+ (* x x) (* y y)))
-      (define d (* freq pi (flsqrt d^2)))
-      (* z-amt 0.5 (- 1.0 (cos d))))
-    (inline-deep-flomap-bulge dfm f)))
-
-;; ===================================================================================================
-;; Sizing
-
-(: deep-flomap-inset (case-> (deep-flomap Integer -> deep-flomap)
-                             (deep-flomap Integer Integer -> deep-flomap)
-                             (deep-flomap Integer Integer Integer Integer -> deep-flomap)))
-(define deep-flomap-inset
-  (case-lambda
-    [(dfm amt)          (deep-flomap-inset dfm amt amt amt amt)]
-    [(dfm h-amt v-amt)  (deep-flomap-inset dfm h-amt v-amt h-amt v-amt)]
-    [(dfm l-amt t-amt r-amt b-amt)
-     (match-define (deep-flomap argb-fm z-fm) dfm)
-     (deep-flomap (flomap-inset argb-fm l-amt t-amt r-amt b-amt)
-                  (flomap-inset z-fm l-amt t-amt r-amt b-amt))]))
-
-(: deep-flomap-trim (deep-flomap -> deep-flomap))
-(define (deep-flomap-trim dfm)
-  (define-values (w h) (deep-flomap-size dfm))
-  (define-values (x-min y-min x-max y-max)
-    (flomap-nonzero-rect (deep-flomap-alpha dfm)))
-  (deep-flomap-inset dfm (- x-min) (- y-min) (- x-max w) (- y-max h)))
-
-(: deep-flomap-scale (case-> (deep-flomap Real -> deep-flomap)
-                             (deep-flomap Real Real Real -> deep-flomap)))
-(define deep-flomap-scale
-  (case-lambda
-    [(dfm scale)
-     (match-define (deep-flomap argb-fm z-fm) (deep-flomap-scale-z dfm scale))
-     (deep-flomap (flomap-scale argb-fm scale)
-                  (flomap-scale z-fm scale))]
-    [(dfm x-scale y-scale z-scale)
-     (match-define (deep-flomap argb-fm z-fm) (deep-flomap-scale-z dfm z-scale))
-     (deep-flomap (flomap-scale argb-fm x-scale y-scale)
-                  (flomap-scale z-fm x-scale y-scale))]))
-
-(: deep-flomap-resize (deep-flomap (Option Integer) (Option Integer) (Option Real) (Option Real)
-                                   -> deep-flomap))
-(define (deep-flomap-resize dfm width height z-min z-max)
-  (match-define (deep-flomap argb-fm z-fm) dfm)
-  (define new-z-fm
-    (cond [(or z-min z-max)
-           (let ([z-min  (if z-min z-min (flomap-min-value z-fm))]
-                 [z-max  (if z-max z-max (flomap-max-value z-fm))])
-             (fm+ (fm* (flomap-normalize z-fm) (- z-max z-min)) z-min))]
-          [else  z-fm]))
-  (deep-flomap (flomap-resize argb-fm width height)
-               (flomap-resize new-z-fm width height)))
-
-;; ===================================================================================================
-;; Combining
-
-(define-type Z-Mode (U 'add 'blend 'place 'replace))
-
-(: deep-flomap-pin (Z-Mode deep-flomap Real Real deep-flomap Real Real -> deep-flomap))
-(define (deep-flomap-pin z-mode dfm1 x1 y1 dfm2 x2 y2)
-  (cond
-    [(not (and (zero? x2) (zero? y2)))
-     (deep-flomap-pin z-mode dfm1 (- x1 x2) (- y1 y2) dfm2 0 0)]
-    [else
-     (define-values (w1 h1) (deep-flomap-size dfm1))
-     (define-values (w2 h2) (deep-flomap-size dfm2))
-     (let ([x1  (real->double-flonum x1)]
-           [y1  (real->double-flonum y1)])
-       ;; dfm1 and dfm2 offsets, in final image coordinates
-       (define dx1 (fl->fx (round (max 0.0 (- x1)))))
-       (define dy1 (fl->fx (round (max 0.0 (- y1)))))
-       (define dx2 (fl->fx (round (max 0.0 x1))))
-       (define dy2 (fl->fx (round (max 0.0 y1))))
-       ;; final image size
-       (define w (fxmax (fx+ dx1 w1) (fx+ dx2 w2)))
-       (define h (fxmax (fx+ dy1 h1) (fx+ dy2 h2)))
-       
-       (case z-mode
-         [(place)  (deep-flomap-superimpose/place w h dfm1 dx1 dy1 w1 h1 dfm2 dx2 dy2 w2 h2)]
-         [(blend)  (deep-flomap-superimpose/blend w h dfm1 dx1 dy1 w1 h1 dfm2 dx2 dy2 w2 h2)]
-         [else     (deep-flomap-superimpose/replace z-mode w h
-                                                    dfm1 dx1 dy1 w1 h1
-                                                    dfm2 dx2 dy2 w2 h2)]))]))
-
-(: deep-flomap-superimpose/replace
-   (Z-Mode Integer Integer
-           deep-flomap Integer Integer Integer Integer
-           deep-flomap Integer Integer Integer Integer -> deep-flomap))
-(define (deep-flomap-superimpose/replace z-mode w h dfm1 dx1 dy1 w1 h1 dfm2 dx2 dy2 w2 h2)
-  (match-define (deep-flomap argb1-fm z1-fm) dfm1)
-  (match-define (deep-flomap argb2-fm z2-fm) dfm2)
-  (define argb1-vs (flomap-values argb1-fm))
-  (define argb2-vs (flomap-values argb2-fm))
-  (define z1-vs (flomap-values z1-fm))
-  (define z2-vs (flomap-values z2-fm))
-  
-  (: get-argbz-pixel (FlVector FlVector Integer Integer Integer Integer Integer Integer
-                               -> (values Flonum Flonum Flonum Flonum Flonum)))
-  (define (get-argbz-pixel argb-vs z-vs dx dy w h x y)
-    (let ([x  (fx- x dx)] [y  (fx- y dy)])
-      (cond [(and (x . fx>= . 0) (x . fx< . w) (y . fx>= . 0) (y . fx< . h))
-             (define i (fx+ x (fx* y w)))
-             (define j (fx* 4 i))
-             (values (flvector-ref argb-vs j)
-                     (flvector-ref argb-vs (fx+ j 1))
-                     (flvector-ref argb-vs (fx+ j 2))
-                     (flvector-ref argb-vs (fx+ j 3))
-                     (flvector-ref z-vs i))]
-            [else
-             (values 0.0 0.0 0.0 0.0 0.0)])))
-  
-  (define argb-vs (make-flvector (* 4 w h)))
-  (define z-vs (make-flvector (* w h)))
-  (let: y-loop : Void ([y : Nonnegative-Fixnum  0])
-    (when (y . fx< . h)
-      (let: x-loop : Void ([x : Nonnegative-Fixnum  0])
-        (cond [(x . fx< . w)
-               (define-values (a1 r1 g1 b1 z1) (get-argbz-pixel argb1-vs z1-vs dx1 dy1 w1 h1 x y))
-               (define-values (a2 r2 g2 b2 z2) (get-argbz-pixel argb2-vs z2-vs dx2 dy2 w2 h2 x y))
-               
-               (define i (fx+ x (fx* y w)))
-               (define j (fx* 4 i))
-               (flvector-set! argb-vs j (fl-alpha-blend a1 a2 a2))
-               (flvector-set! argb-vs (fx+ j 1) (fl-alpha-blend r1 r2 a2))
-               (flvector-set! argb-vs (fx+ j 2) (fl-alpha-blend g1 g2 a2))
-               (flvector-set! argb-vs (fx+ j 3) (fl-alpha-blend b1 b2 a2))
-               (flvector-set! z-vs i (case z-mode
-                                       [(replace)  (fl-alpha-blend z1 z2 a2)]
-                                       [else       (+ z1 z2)]))
-               (x-loop (fx+ x 1))]
-              [else
-               (y-loop (fx+ y 1))]))))
-  
-  (deep-flomap (flomap argb-vs 4 w h)
-               (flomap z-vs 1 w h)))
-
-(: deep-flomap-superimpose/place (Integer Integer
-                                          deep-flomap Integer Integer Integer Integer
-                                          deep-flomap Integer Integer Integer Integer -> deep-flomap))
-(define (deep-flomap-superimpose/place w h dfm1 dx1 dy1 w1 h1 dfm2 dx2 dy2 w2 h2)
-  (match-define (deep-flomap argb1-fm z1-fm) dfm1)
-  (match-define (deep-flomap argb2-fm z2-fm) dfm2)
-  (match-define (flomap argb1-vs 4 argb1-w argb1-h) argb1-fm)
-  (match-define (flomap argb2-vs 4 argb2-w argb2-h) argb2-fm)
-  (match-define (flomap z1-vs 1 z1-w z1-h) z1-fm)
-  (match-define (flomap z2-vs 1 z2-w z2-h) z2-fm)
-  
-  (: get-alpha-pixel (FlVector Integer Integer Integer Integer Integer Integer
-                               -> Flonum))
-  (define (get-alpha-pixel vs dx dy w h x y)
-    (let ([x  (fx- x dx)] [y  (fx- y dy)])
-      (cond [(and (x . fx>= . 0) (x . fx< . w) (y . fx>= . 0) (y . fx< . h))
-             (flvector-ref vs (fx* 4 (fx+ x (fx* y w))))]
-            [else  0.0])))
-  
-  (: get-z-pixel (FlVector Integer Integer Integer Integer Integer Integer
-                           -> Flonum))
-  (define (get-z-pixel vs dx dy w h x y)
-    (let ([x  (fx- x dx)] [y  (fx- y dy)])
-      (cond [(and (x . fx>= . 0) (x . fx< . w) (y . fx>= . 0) (y . fx< . h))
-             (flvector-ref vs (fx+ x (fx* y w)))]
-            [else  0.0])))
-  
-  (define z1-max -inf.0)
-  (let: y-loop : Void ([y : Nonnegative-Fixnum  0])
-    (when (y . fx< . h)
-      (let: x-loop : Void ([x : Nonnegative-Fixnum  0])
-        (cond [(x . fx< . w)
-               (define a1 (get-alpha-pixel argb1-vs dx1 dy1 w1 h1 x y))
-               (define a2 (get-alpha-pixel argb2-vs dx2 dy2 w2 h2 x y))
-               (when (and (a1 . > . 0.0) (a2 . > . 0.0))
-                 (define z1 (get-z-pixel z1-vs dx1 dy1 w1 h1 x y))
-                 (set! z1-max (max z1-max z1)))
-               (x-loop (fx+ x 1))]
-              [else
-               (y-loop (fx+ y 1))]))))
-  
-  (define new-dfm2 (deep-flomap argb2-fm (fm+ z2-fm z1-max)))
-  (deep-flomap-superimpose/replace 'replace w h dfm1 dx1 dy1 w1 h1 new-dfm2 dx2 dy2 w2 h2))
-
-(: deep-flomap-superimpose/blend (Integer Integer
-                                          deep-flomap Integer Integer Integer Integer
-                                          deep-flomap Integer Integer Integer Integer -> deep-flomap))
-(define (deep-flomap-superimpose/blend w h dfm1 dx1 dy1 w1 h1 dfm2 dx2 dy2 w2 h2)
-  (match-define (deep-flomap argb1-fm z1-fm) dfm1)
-  (match-define (deep-flomap argb2-fm z2-fm) dfm2)
-  (define argb1-vs (flomap-values argb1-fm))
-  (define argb2-vs (flomap-values argb2-fm))
-  (define z1-vs (flomap-values z1-fm))
-  (define z2-vs (flomap-values z2-fm))
-  
-  (define-values (u1-fm v1-fm) (flomap-gradient z1-fm))
-  (define-values (u2-fm v2-fm) (flomap-gradient z2-fm))
-  (define u1-vs (flomap-values u1-fm))
-  (define v1-vs (flomap-values v1-fm))
-  (define u2-vs (flomap-values u2-fm))
-  (define v2-vs (flomap-values v2-fm))
-  
-  (: get-argbzuv-pixel (FlVector FlVector FlVector FlVector
-                                 Integer Integer Integer Integer Integer Integer
-                                 -> (values Flonum Flonum Flonum Flonum Flonum Flonum Flonum)))
-  (define (get-argbzuv-pixel argb-vs z-vs u-vs v-vs dx dy w h x y)
-    (let ([x  (fx- x dx)] [y  (fx- y dy)])
-      (cond [(and (x . fx>= . 0) (x . fx< . w) (y . fx>= . 0) (y . fx< . h))
-             (define i (fx+ x (fx* y w)))
-             (define j (fx* 4 i))
-             (values (flvector-ref argb-vs j)
-                     (flvector-ref argb-vs (fx+ j 1))
-                     (flvector-ref argb-vs (fx+ j 2))
-                     (flvector-ref argb-vs (fx+ j 3))
-                     (flvector-ref z-vs i)
-                     (flvector-ref u-vs i)
-                     (flvector-ref v-vs i))]
-            [else
-             (values 0.0 0.0 0.0 0.0 0.0 0.0 0.0)])))
-  
-  (define argb-vs (make-flvector (* 4 w h)))
-  (define z-vs (make-flvector (* w h)))
-  (let: y-loop : Void ([y : Nonnegative-Fixnum  0])
-    (when (y . fx< . h)
-      (let: x-loop : Void ([x : Nonnegative-Fixnum  0])
-        (cond [(x . fx< . w)
-               (define-values (a1 r1 g1 b1 z1 u1 v1)
-                 (get-argbzuv-pixel argb1-vs z1-vs u1-vs v1-vs dx1 dy1 w1 h1 x y))
-               (define-values (a2 r2 g2 b2 z2 u2 v2)
-                 (get-argbzuv-pixel argb2-vs z2-vs u2-vs v2-vs dx2 dy2 w2 h2 x y))
-               
-               ;; softmax blending
-               (define α
-                 (cond [(and (a1 . > . 0.0) (a2 . > . 0.0))
-                        (define u (- (* a2 u2) (* a1 u1)))
-                        (define v (- (* a2 v2) (* a1 v1)))
-                        (define β (/ (- (* a2 z2) (* a1 z1))
-                                     (flsqrt (+ (* u u) (* v v)))))
-                        (flsigmoid (* 15.0 β))]
-                       [(a1 . > . 0.0)  0.0]
-                       [(a2 . > . 0.0)  1.0]
-                       [else  0.5]))
-               
-               (define i (fx+ x (fx* y w)))
-               (define j (fx* 4 i))
-               (flvector-set! argb-vs j (fl-convex-combination a1 a2 α))
-               (flvector-set! argb-vs (fx+ j 1) (fl-convex-combination r1 r2 α))
-               (flvector-set! argb-vs (fx+ j 2) (fl-convex-combination g1 g2 α))
-               (flvector-set! argb-vs (fx+ j 3) (fl-convex-combination b1 b2 α))
-               (flvector-set! z-vs i (fl-convex-combination z1 z2 α))
-               (x-loop (fx+ x 1))]
-              [else
-               (y-loop (fx+ y 1))]))))
-  
-  (deep-flomap (flomap argb-vs 4 w h)
-               (flomap z-vs 1 w h)))
-
-(: deep-flomap-pin* (Z-Mode Real Real Real Real deep-flomap deep-flomap * -> deep-flomap))
-(define (deep-flomap-pin* z-mode x1-frac y1-frac x2-frac y2-frac dfm . dfms)
-  (for/fold ([dfm1 dfm]) ([dfm2  (in-list dfms)])
-    (define-values (w1 h1) (deep-flomap-size dfm1))
-    (define-values (w2 h2) (deep-flomap-size dfm2))
-    (deep-flomap-pin z-mode
-                     dfm1 (* x1-frac w1) (* y1-frac h1)
-                     dfm2 (* x2-frac w2) (* y2-frac h2))))
-
-(: deep-flomap-lt-superimpose (Z-Mode deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-lc-superimpose (Z-Mode deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-lb-superimpose (Z-Mode deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-ct-superimpose (Z-Mode deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-cc-superimpose (Z-Mode deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-cb-superimpose (Z-Mode deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-rt-superimpose (Z-Mode deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-rc-superimpose (Z-Mode deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-rb-superimpose (Z-Mode deep-flomap deep-flomap * -> deep-flomap))
-
-(define (deep-flomap-lt-superimpose z-mode dfm . dfms)
-  (apply deep-flomap-pin* z-mode 0 0 0 0 dfm dfms))
-
-(define (deep-flomap-lc-superimpose z-mode dfm . dfms)
-  (apply deep-flomap-pin* z-mode 0 1/2 0 1/2 dfm dfms))
-
-(define (deep-flomap-lb-superimpose z-mode dfm . dfms)
-  (apply deep-flomap-pin* z-mode 0 1 0 1 dfm dfms))
-
-(define (deep-flomap-ct-superimpose z-mode dfm . dfms)
-  (apply deep-flomap-pin* z-mode 1/2 0 1/2 0 dfm dfms))
-
-(define (deep-flomap-cc-superimpose z-mode dfm . dfms)
-  (apply deep-flomap-pin* z-mode 1/2 1/2 1/2 1/2 dfm dfms))
-
-(define (deep-flomap-cb-superimpose z-mode dfm . dfms)
-  (apply deep-flomap-pin* z-mode 1/2 1 1/2 1 dfm dfms))
-
-(define (deep-flomap-rt-superimpose z-mode dfm . dfms)
-  (apply deep-flomap-pin* z-mode 1 0 1 0 dfm dfms))
-
-(define (deep-flomap-rc-superimpose z-mode dfm . dfms)
-  (apply deep-flomap-pin* z-mode 1 1/2 1 1/2 dfm dfms))
-
-(define (deep-flomap-rb-superimpose z-mode dfm . dfms)
-  (apply deep-flomap-pin* z-mode 1 1 1 1 dfm dfms))
-
-(: deep-flomap-vl-append (deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-vc-append (deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-vr-append (deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-ht-append (deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-hc-append (deep-flomap deep-flomap * -> deep-flomap))
-(: deep-flomap-hb-append (deep-flomap deep-flomap * -> deep-flomap))
-
-(define (deep-flomap-vl-append dfm . dfms) (apply deep-flomap-pin* 'add 0 1 0 0 dfm dfms))
-(define (deep-flomap-vc-append dfm . dfms) (apply deep-flomap-pin* 'add 1/2 1 1/2 0 dfm dfms))
-(define (deep-flomap-vr-append dfm . dfms) (apply deep-flomap-pin* 'add 1 1 1 0 dfm dfms))
-(define (deep-flomap-ht-append dfm . dfms) (apply deep-flomap-pin* 'add 1 0 0 0 dfm dfms))
-(define (deep-flomap-hc-append dfm . dfms) (apply deep-flomap-pin* 'add 1 1/2 0 1/2 dfm dfms))
-(define (deep-flomap-hb-append dfm . dfms) (apply deep-flomap-pin* 'add 1 1 0 1 dfm dfms))
diff --git a/pkgs/images-pkgs/images-lib/images/private/deep-flomap-untyped-parameters.rkt b/pkgs/images-pkgs/images-lib/images/private/deep-flomap-untyped-parameters.rkt
deleted file mode 100644
index 3325a2f6c0..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/deep-flomap-untyped-parameters.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang racket/base
-
-(require unstable/parameter-group)
-
-(provide (all-defined-out))
-
-(define refractive-indexes
-  #hash((diamond . 2.42)
-        (cubic-zirconia . 2.15)
-        (ruby . 1.76)
-        (enamel . 1.63)
-        (glass . 1.54)
-        (wax . 1.43)
-        (water . 1.33)
-        (vacuum . 1.0)))
-
-(define (->refractive-index idx)
-  (cond [(symbol? idx)
-         (hash-ref refractive-indexes idx
-                   (λ () (error 'refractive-index
-                                "`refractive-indexes' does not have a refractive index for ~e"
-                                idx)))]
-        [else  (real->double-flonum idx)]))
-
-(define (list-real->double-flonum vs)
-  (map real->double-flonum vs))
-
-;; light parameters
-(define light-direction (make-parameter '(0.0 -1.0 1.0) list-real->double-flonum))
-(define light-intensity (make-parameter '(1.0 1.0 1.0) list-real->double-flonum))
-(define ambient-intensity (make-parameter '(1.0 1.0 1.0) list-real->double-flonum))
-(define reflected-intensity (make-parameter '(1.0 1.0 1.0) list-real->double-flonum))
-
-;; material parameters
-(define refractive-index (make-parameter (->refractive-index 'glass) ->refractive-index))
-(define ideal-reflectance (make-parameter 1.0 real->double-flonum))
-(define ideal-transmission (make-parameter 1.0 real->double-flonum))
-(define transmission-density (make-parameter 0.65 real->double-flonum))
-(define specular-reflectance (make-parameter 0.15 real->double-flonum))
-(define specular-roughness (make-parameter 0.15 real->double-flonum))
-(define specular-purity (make-parameter 1.0 real->double-flonum))
-(define diffuse-reflectance (make-parameter 0.25 real->double-flonum))
-(define ambient-reflectance (make-parameter 0.1 real->double-flonum))
-(define ambient-transmission (make-parameter 0.7 real->double-flonum))
-(define shadow-blur (make-parameter 0.02 real->double-flonum))
-
-(define-parameter-group deep-flomap-lighting
-  (light-direction light-intensity ambient-intensity reflected-intensity))
-
-(define-parameter-group deep-flomap-material
-  (refractive-index ideal-reflectance ideal-transmission transmission-density
-                    specular-reflectance specular-roughness specular-purity
-                    diffuse-reflectance ambient-reflectance ambient-transmission
-                    shadow-blur))
-
-(define matte-material
-  (deep-flomap-material-value
-   'vacuum 0.0 0.0 1.0
-   0.0 1.0 1.0
-   1.0 0.25 0.0
-   0.0))
-
-(define dull-plastic-material
-  (deep-flomap-material-value
-   'glass 0.0 0.0 1.0
-   1.0 0.25 1.0
-   1.0 0.25 0.0
-   0.0))
-
-(define wax-material
-  (deep-flomap-material-value
-   'wax 1.0 0.5 1.25
-   0.5 0.5 0.5
-   0.5 0.5 0.5
-   0.04))
-
-(define plastic-material
-  (deep-flomap-material-value
-   'glass 0.375 1.0 2.0
-   0.25 0.15 1.0
-   0.6 0.5 0.1
-   0.03))
-
-(define metal-material
-  (deep-flomap-material-value
-   3.0 0.3 0.0 1.0
-   0.8 0.1 0.2
-   0.2 0.8 0.0
-   0.0))
-
-(define porcelain-material
-  (deep-flomap-material-value
-   'enamel 0.9 0.5 1.5
-   0.4 0.2 1.0
-   0.5 0.5 0.5
-   0.04))
-
-(define frosted-glass-material
-  (deep-flomap-material-value
-   'glass 0.9 1.0 0.8
-   0.4 0.2 1.0
-   0.5 0.1 0.5
-   0.04))
-
-(define glass-material
-  (deep-flomap-material-value
-   'glass 1.0 1.0 0.65
-   0.15 0.15 1.0
-   0.25 0.1 0.7
-   0.02))
-
-(define diamond-material
-  (deep-flomap-material-value
-   'diamond 1.0 1.0 0.5
-   0.15 0.15 1.0
-   0.15 0.1 0.7
-   0.02))
diff --git a/pkgs/images-pkgs/images-lib/images/private/deep-flomap.rkt b/pkgs/images-pkgs/images-lib/images/private/deep-flomap.rkt
deleted file mode 100644
index 2f0f4b6a2c..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/deep-flomap.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket/base
-
-(require "deep-flomap-struct.rkt"
-         "deep-flomap-parameters.rkt"
-         "deep-flomap-render.rkt")
-
-(provide (all-from-out "deep-flomap-struct.rkt"
-                       "deep-flomap-parameters.rkt"
-                       "deep-flomap-render.rkt"))
diff --git a/pkgs/images-pkgs/images-lib/images/private/flomap-blur.rkt b/pkgs/images-pkgs/images-lib/images/private/flomap-blur.rkt
deleted file mode 100644
index cbf0b2b075..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flomap-blur.rkt
+++ /dev/null
@@ -1,343 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match racket/math
-         (only-in racket/unsafe/ops unsafe-flvector-ref)
-         "flonum.rkt"
-         "flomap-struct.rkt")
-
-(provide flomap-gaussian-blur-x flomap-gaussian-blur-y flomap-gaussian-blur
-         flomap-box-blur-x flomap-box-blur-y flomap-box-blur
-         flomap-blur-x flomap-blur-y flomap-blur)
-
-;; ===================================================================================================
-;; Gaussian blur
-
-(: flomap-gaussian-blur (case-> (flomap Real -> flomap)
-                                (flomap Real Real -> flomap)))
-(define flomap-gaussian-blur
-  (case-lambda
-    [(fm xσ)  (flomap-gaussian-blur fm xσ xσ)]
-    [(fm xσ yσ)
-     (flomap-gaussian-blur-y (flomap-gaussian-blur-x fm (abs (real->double-flonum xσ)))
-                             (abs (real->double-flonum yσ)))]))
-
-(: flomap-gaussian-blur-x (flomap Real -> flomap))
-(define (flomap-gaussian-blur-x fm σ*)
-  (cond
-    [(σ* . = . 0)  fm]
-    [else
-     (define σ (abs (real->double-flonum σ*)))
-     (define dx-min (fl->fx (floor (* (- 3.0) σ))))
-     (define dx-max (fx+ 1 (fl->fx (ceiling (* 3.0 σ)))))
-     (define ss (gaussian-kernel-1d dx-min dx-max σ))
-     
-     (match-define (flomap vs c w h) fm)
-     (inline-build-flomap
-      c w h
-      (λ (k x y i)
-        (define dx-start (fx- (fxmax (fx+ x dx-min) 0) x))
-        (define dx-end (fx- (fxmin (fx+ x dx-max) w) x))
-        (define j (fx+ i (fx* c dx-start)))
-        (let: src-loop : Float ([sum : Float  0.0] [dx : Fixnum  dx-start] [j : Fixnum  j])
-          (cond [(dx . fx< . dx-end)  (define s (unsafe-flvector-ref ss (fx- dx dx-min)))
-                                      (src-loop (+ sum (* s (unsafe-flvector-ref vs j)))
-                                                (fx+ dx 1)
-                                                (fx+ j c))]
-                [else  sum]))))]))
-
-(: flomap-gaussian-blur-y (flomap Real -> flomap))
-(define (flomap-gaussian-blur-y fm σ*)
-  (cond
-    [(σ* . = . 0)  fm]
-    [else
-     (define σ (abs (real->double-flonum σ*)))
-     (define dy-min (fl->fx (floor (* (- 3.0) σ))))
-     (define dy-max (fx+ 1 (fl->fx (ceiling (* 3.0 σ)))))
-     (define ss (gaussian-kernel-1d dy-min dy-max σ))
-     
-     (match-define (flomap vs c w h) fm)
-     (define cw (* c w))
-     (inline-build-flomap
-      c w h
-      (λ (k x y i)
-        (define dy-start (fx- (fxmax (fx+ y dy-min) 0) y))
-        (define dy-end (fx- (fxmin (fx+ y dy-max) h) y))
-        (define j (fx+ i (fx* cw dy-start)))
-        (let: src-loop : Float ([sum : Float  0.0] [dy : Fixnum  dy-start] [j : Fixnum  j])
-          (cond [(dy . fx< . dy-end)  (define s (unsafe-flvector-ref ss (fx- dy dy-min)))
-                                      (src-loop (+ sum (* s (unsafe-flvector-ref vs j)))
-                                                (fx+ dy 1)
-                                                (fx+ j cw))]
-                [else  sum]))))]))
-
-(: gaussian-kernel-1d (Fixnum Fixnum Float -> FlVector))
-(define (gaussian-kernel-1d mn mx σ)
-  (define n (fx- mx mn))
-  (define ys (make-flvector n))
-  (define sum
-    (let: loop : Float ([i : Fixnum  0] [sum : Float  0.0])
-      (cond [(i . fx< . n)  (define v (flgaussian (fx->fl (fx+ i mn)) σ))
-                            (flvector-set! ys i v)
-                            (loop (fx+ i 1) (+ sum v))]
-            [else  sum])))
-  (let: loop : FlVector ([i : Integer  0])
-    (cond [(i . fx< . n)  (flvector-set! ys i (/ (flvector-ref ys i) sum))
-                          (loop (fx+ i 1))]
-          [else  ys])))
-
-
-;; ===================================================================================================
-;; Integral images
-
-(: flomap-integral (flomap -> flomap))
-(define (flomap-integral fm)
-  (match-define (flomap vs c w h) fm)
-  (define w+1 (fx+ w 1))
-  (define c*w+1 (fx* c w+1))
-  (define h+1 (fx+ h 1))
-  (define new-vs (make-flvector (* c w+1 h+1)))
-  (let: y-loop : Void ([y : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  0])
-    (when (y . fx< . h)
-      (let: x-loop : Void ([x : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  i])
-        (cond [(x . fx< . w)
-               (let: k-loop : Void ([k : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  i])
-                 (cond [(k . fx< . c)
-                        (define j00 (coords->index c w+1 k x y))
-                        (define j01 (fx+ j00 c*w+1))
-                        (flvector-set! new-vs (fx+ j01 c)
-                                       (- (+ (flvector-ref vs i)
-                                             (flvector-ref new-vs j01)
-                                             (flvector-ref new-vs (fx+ j00 c)))
-                                          (flvector-ref new-vs j00)))
-                        (k-loop (fx+ k 1) (fx+ i 1))]
-                       [else  (x-loop (fx+ x 1) i)]))]
-              [else  (y-loop (fx+ y 1) i)]))))
-  (flomap new-vs c w+1 h+1))
-
-(: flomap-integral-x (flomap -> flomap))
-(define (flomap-integral-x fm)
-  (match-define (flomap vs c w h) fm)
-  (define w+1 (fx+ w 1))
-  (define new-vs (make-flvector (* c w+1 h)))
-  (let: y-loop : Void ([y : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  0])
-    (when (y . fx< . h)
-      (let: x-loop : Void ([x : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  i])
-        (cond [(x . fx< . w)
-               (let: k-loop : Void ([k : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  i])
-                 (cond [(k . fx< . c)
-                        (define j0 (coords->index c w+1 k x y))
-                        (define j1 (fx+ j0 c))
-                        (flvector-set! new-vs j1 (+ (flvector-ref vs i)
-                                                    (flvector-ref new-vs j0)))
-                        (k-loop (fx+ k 1) (fx+ i 1))]
-                       [else  (x-loop (fx+ x 1) i)]))]
-              [else  (y-loop (fx+ y 1) i)]))))
-  (flomap new-vs c w+1 h))
-
-(: flomap-integral-y (flomap -> flomap))
-(define (flomap-integral-y fm)
-  (match-define (flomap vs c w h) fm)
-  (define h+1 (fx+ h 1))
-  (define cw (fx* c w))
-  (define new-vs (make-flvector (* c w h+1)))
-  (let: y-loop : Void ([y : Nonnegative-Fixnum  0])
-    (when (y . fx< . h)
-      (let: x-loop : Void ([x : Nonnegative-Fixnum  0])
-        (cond [(x . fx< . w)
-               (let: k-loop : Void ([k : Nonnegative-Fixnum  0])
-                 (cond [(k . fx< . c)
-                        (define j0 (coords->index c w k x y))
-                        (define j1 (fx+ j0 cw))
-                        (flvector-set! new-vs j1 (+ (flvector-ref vs j0)
-                                                    (flvector-ref new-vs j0)))
-                        (k-loop (fx+ k 1))]
-                       [else  (x-loop (fx+ x 1))]))]
-              [else  (y-loop (fx+ y 1))]))))
-  (flomap new-vs c w h+1))
-
-(: raw-flomap-integral-sum (FlVector Integer Integer Integer
-                                     Integer Integer Integer Integer Integer
-                                     -> Float))
-(define (raw-flomap-integral-sum vs c w h k x-start y-start x-end y-end)
-  (define w-1 (fx- w 1))
-  (define h-1 (fx- h 1))
-  (define x1 (fxmax 0 (fxmin x-start w-1)))
-  (define x2 (fxmax 0 (fxmin x-end w-1)))
-  (define y1 (fxmax 0 (fxmin y-start h-1)))
-  (define y2 (fxmax 0 (fxmin y-end h-1)))
-  (- (+ (flvector-ref vs (coords->index c w k x1 y1))
-        (flvector-ref vs (coords->index c w k x2 y2)))
-     (+ (flvector-ref vs (coords->index c w k x1 y2))
-        (flvector-ref vs (coords->index c w k x2 y1)))))
-
-(: raw-flomap-integral-x-sum (FlVector Integer Integer
-                                       Integer Integer Integer Integer -> Float))
-(define (raw-flomap-integral-x-sum vs c w k x-start x-end y)
-  (define w-1 (fx- w 1))
-  (define x1 (fxmax 0 (fxmin x-start w-1)))
-  (define x2 (fxmax 0 (fxmin x-end w-1)))
-  (- (flvector-ref vs (coords->index c w k x2 y))
-     (flvector-ref vs (coords->index c w k x1 y))))
-
-(: raw-flomap-integral-y-sum (FlVector Integer Integer Integer
-                                       Integer Integer Integer Integer -> Float))
-(define (raw-flomap-integral-y-sum vs c w h k x y-start y-end)
-  (define h-1 (fx- h 1))
-  (define y1 (fxmax 0 (fxmin y-start h-1)))
-  (define y2 (fxmax 0 (fxmin y-end h-1)))
-  (- (flvector-ref vs (coords->index c w k x y2))
-     (flvector-ref vs (coords->index c w k x y1))))
-
-;; ===================================================================================================
-;; Box blur
-
-(: flomap-box-blur (case-> (flomap Real -> flomap)
-                           (flomap Real Real -> flomap)))
-(define flomap-box-blur
-  (case-lambda
-    [(fm xr)  (flomap-box-blur fm xr xr)]
-    [(fm xr yr)
-     (let ([xr  (abs (real->double-flonum xr))]
-           [yr  (abs (real->double-flonum yr))])
-       (cond [(and (integer? xr) (integer? yr))
-              (let ([xr  (fl->fx xr)] [yr  (fl->fx yr)])
-                (with-asserts ([xr  nonnegative-fixnum?] [yr  nonnegative-fixnum?])
-                  (flomap-box-blur/int fm xr yr)))]
-             [else
-              (flomap-box-blur-y (flomap-box-blur-x fm xr) yr)]))]))
-
-(: flomap-box-blur-x (flomap Real -> flomap))
-(define (flomap-box-blur-x fm r*)
-  (define r (abs (real->double-flonum r*)))
-  (cond
-    [(integer? r)  (let ([r  (fl->fx r)])
-                     (with-asserts ([r  nonnegative-fixnum?])
-                       (flomap-box-blur-x/int fm r)))]
-    [else
-     (define r1 (fl->fx (floor r)))
-     (define r2 (fx+ r1 1))
-     (define s (+ 1.0 (* 2.0 r)))
-     (define s1 (+ 1.0 (* 2.0 r1)))
-     (define s2 (+ 1.0 (* 2.0 r2)))
-     (define α (/ (- (sqr s2) (sqr s)) (- (sqr s2) (sqr s1))))
-     (define norm1 (/ α s1))
-     (define norm2 (/ (- 1.0 α) s2))
-     (define r1+1 (fx+ r1 1))
-     (define r2+1 (fx+ r2 1))
-     (match-define (flomap _ c w h) fm)
-     (match-define (flomap int-vs int-c int-w int-h) (flomap-integral-x fm))
-     (inline-build-flomap
-      c w h
-      (λ (k x y _i)
-        (+ (* norm1 (raw-flomap-integral-x-sum int-vs int-c int-w k (fx- x r1) (fx+ x r1+1) y))
-           (* norm2 (raw-flomap-integral-x-sum int-vs int-c int-w k (fx- x r2) (fx+ x r2+1) y))
-           )))]))
-
-(: flomap-box-blur-y (flomap Real -> flomap))
-(define (flomap-box-blur-y fm r*)
-  (define r (abs (real->double-flonum r*)))
-  (cond
-    [(integer? r)  (let ([r  (fl->fx r)])
-                     (with-asserts ([r  nonnegative-fixnum?])
-                       (flomap-box-blur-y/int fm r)))]
-    [else
-     (define r1 (fl->fx (floor r)))
-     (define r2 (fx+ r1 1))
-     (define s (+ 1.0 (* 2.0 r)))
-     (define s1 (+ 1.0 (* 2.0 r1)))
-     (define s2 (+ 1.0 (* 2.0 r2)))
-     (define α (/ (- (sqr s2) (sqr s)) (- (sqr s2) (sqr s1))))
-     (define norm1 (/ α s1))
-     (define norm2 (/ (- 1.0 α) s2))
-     (define r1+1 (fx+ r1 1))
-     (define r2+1 (fx+ r2 1))
-     (match-define (flomap _ c w h) fm)
-     (match-define (flomap int-vs int-c int-w int-h) (flomap-integral-y fm))
-     (inline-build-flomap
-      c w h
-      (λ (k x y _i)
-        (+ (* norm1 (raw-flomap-integral-y-sum int-vs int-c int-w int-h k x (fx- y r1) (fx+ y r1+1)))
-           (* norm2 (raw-flomap-integral-y-sum int-vs int-c int-w int-h k x (fx- y r2) (fx+ y r2+1)))
-           )))]))
-
-(: flomap-box-blur/int (flomap Nonnegative-Fixnum Nonnegative-Fixnum -> flomap))
-(define (flomap-box-blur/int fm xr yr)
-  (define norm (/ 1.0 (* (+ 1.0 (* 2.0 xr)) (+ 1.0 (* 2.0 yr)))))
-  (define xr+1 (fx+ xr 1))
-  (define yr+1 (fx+ yr 1))
-  (match-define (flomap _ c w h) fm)
-  (match-define (flomap int-vs int-c int-w int-h) (flomap-integral fm))
-  (inline-build-flomap
-   c w h
-   (λ (k x y _i)
-     (* norm (raw-flomap-integral-sum int-vs int-c int-w int-h k
-                                      (fx- x xr) (fx- y yr)
-                                      (fx+ x xr+1) (fx+ y yr+1))))))
-
-(: flomap-box-blur-x/int (flomap Nonnegative-Fixnum -> flomap))
-(define (flomap-box-blur-x/int fm r)
-  (define norm (/ 1.0 (+ 1.0 (* 2.0 r))))
-  (define r+1 (fx+ r 1))
-  (match-define (flomap _ c w h) fm)
-  (match-define (flomap int-vs int-c int-w int-h) (flomap-integral-x fm))
-  (inline-build-flomap
-   c w h
-   (λ (k x y _i)
-     (* norm (raw-flomap-integral-x-sum int-vs int-c int-w k (fx- x r) (fx+ x r+1) y)))))
-
-(: flomap-box-blur-y/int (flomap Nonnegative-Fixnum -> flomap))
-(define (flomap-box-blur-y/int fm r)
-  (define norm (/ 1.0 (+ 1.0 (* 2.0 r))))
-  (define r+1 (fx+ r 1))
-  (match-define (flomap _ c w h) fm)
-  (match-define (flomap int-vs int-c int-w int-h) (flomap-integral-y fm))
-  (inline-build-flomap
-   c w h
-   (λ (k x y _i)
-     (* norm (raw-flomap-integral-y-sum int-vs int-c int-w int-h k x (fx- y r) (fx+ y r+1))))))
-
-;; ===================================================================================================
-;; Default blur
-
-(: box-radius->variance (Float -> Float))
-(define (box-radius->variance r)
-  (* 1/12 (sqr (+ 1 (* 2 r)))))
-
-(: variance->box-radius (Float -> Float))
-(define (variance->box-radius σ^2)
-  (* 1/2 (- (flsqrt (* 12 σ^2)) 1)))
-
-(: flomap-blur (case-> (flomap Real -> flomap)
-                       (flomap Real Real -> flomap)))
-(define flomap-blur
-  (case-lambda
-    [(fm σ)  (flomap-blur fm σ σ)]
-    [(fm xσ yσ)
-     (let ([xσ  (abs (real->double-flonum xσ))]
-           [yσ  (abs (real->double-flonum yσ))])
-       (cond
-         [(and (xσ . >= . 1.5) (yσ . >= . 1.5))
-          (define xσ^2 (sqr xσ))
-          (define yσ^2 (sqr yσ))
-          (define xr (floor (variance->box-radius (/ xσ^2 3.0))))
-          (define yr (floor (variance->box-radius (/ yσ^2 3.0))))
-          (flomap-box-blur (flomap-box-blur (flomap-box-blur fm xr yr) xr yr)
-                           (variance->box-radius (- xσ^2 (* 2.0 (box-radius->variance xr))))
-                           (variance->box-radius (- yσ^2 (* 2.0 (box-radius->variance yr)))))]
-         [else
-          (flomap-blur-x (flomap-blur-y fm yσ) xσ)]))]))
-
-(: make-flomap-blur-dimension
-   ((flomap Float -> flomap) (flomap Float -> flomap) -> (flomap Float -> flomap)))
-(define ((make-flomap-blur-dimension gaussian-blur box-blur) fm σ)
-  (cond
-    [(σ . = . 0.0)  fm]
-    [(σ . < . 1.5)  (gaussian-blur fm σ)]
-    [else
-     (define σ^2 (sqr σ))
-     (define r (floor (variance->box-radius (/ σ^2 3.0))))
-     (box-blur (box-blur (box-blur fm r) r)
-               (variance->box-radius (- σ^2 (* 2.0 (box-radius->variance r)))))]))
-
-(define flomap-blur-x (make-flomap-blur-dimension flomap-gaussian-blur-x flomap-box-blur-x))
-(define flomap-blur-y (make-flomap-blur-dimension flomap-gaussian-blur-y flomap-box-blur-y))
diff --git a/pkgs/images-pkgs/images-lib/images/private/flomap-composite.rkt b/pkgs/images-pkgs/images-lib/images/private/flomap-composite.rkt
deleted file mode 100644
index 2ce11687e4..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flomap-composite.rkt
+++ /dev/null
@@ -1,140 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match racket/unsafe/ops
-         "flonum.rkt"
-         "flomap-struct.rkt")
-
-(provide flomap-pin flomap-pin*
-         flomap-lt-superimpose flomap-lc-superimpose flomap-lb-superimpose
-         flomap-ct-superimpose flomap-cc-superimpose flomap-cb-superimpose
-         flomap-rt-superimpose flomap-rc-superimpose flomap-rb-superimpose
-         flomap-vl-append flomap-vc-append flomap-vr-append
-         flomap-ht-append flomap-hc-append flomap-hb-append)
-
-(: flomap-pin (case-> (flomap Integer Integer flomap -> flomap)
-                      (flomap Integer Integer flomap Integer Integer -> flomap)))
-(define flomap-pin
-  (case-lambda
-    [(fm1 x1 y1 fm2)
-     (match-define (flomap argb1-vs c w1 h1) fm1)
-     (match-define (flomap argb2-vs c2 w2 h2) fm2)
-     
-     (unless (c . > . 0)
-       (raise-type-error 'flomap-pin "flomap with at least one component" fm1))
-     
-     (unless (= c c2)
-       (error 'flomap-pin 
-              (string-append "expected two flomaps with the same number of components; "
-                             "given one with ~e and one with ~e")
-              c c2))
-     
-     ;; fm1 and fm2 offsets, in final image coordinates
-     (define dx1 (fxmax 0 (fx- 0 x1)))
-     (define dy1 (fxmax 0 (fx- 0 y1)))
-     (define dx2 (fxmax 0 x1))
-     (define dy2 (fxmax 0 y1))
-     
-     ;; final image size
-     (define w (fxmax (unsafe-fx+ dx1 w1) (unsafe-fx+ dx2 w2)))
-     (define h (fxmax (unsafe-fx+ dy1 h1) (unsafe-fx+ dy2 h2)))
-     
-     (define argb-vs (make-flvector (* c w h)))
-     (let: y-loop : Void ([y : Nonnegative-Fixnum  0])
-       (when (y . fx< . h)
-         (define y1 (unsafe-fx- y dy1))
-         (define y2 (unsafe-fx- y dy2))
-         (let: x-loop : Void ([x : Nonnegative-Fixnum  0])
-           (cond
-             [(x . fx< . w)
-              (define x1 (unsafe-fx- x dx1))
-              (define x2 (unsafe-fx- x dx2))
-              
-              (define i (coords->index c w 0 x y))
-              (define-values (i1 a1)
-                (cond [(and (x1 . fx>= . 0) (x1 . fx< . w1) (y1 . fx>= . 0) (y1 . fx< . h1))
-                       (define i1 (coords->index c w1 0 x1 y1))
-                       (values i1 (flvector-ref argb1-vs i1))]
-                      [else  (values 0 0.0)]))
-              (define-values (i2 a2)
-                (cond [(and (x2 . fx>= . 0) (x2 . fx< . w2) (y2 . fx>= . 0) (y2 . fx< . h2))
-                       (define i2 (coords->index c w2 0 x2 y2))
-                       (values i2 (flvector-ref argb2-vs i2))]
-                      [else  (values 0 0.0)]))
-              
-              (cond
-                [(and (a1 . > . 0.0) (a2 . > . 0.0))
-                 (let: k-loop : Void ([k : Nonnegative-Fixnum  0])
-                   (cond [(k . fx< . c)  (define v1 (flvector-ref argb1-vs (unsafe-fx+ i1 k)))
-                                         (define v2 (flvector-ref argb2-vs (unsafe-fx+ i2 k)))
-                                         (define v (fl-alpha-blend v1 v2 a2))
-                                         (flvector-set! argb-vs (unsafe-fx+ i k) v)
-                                         (k-loop (unsafe-fx+ k 1))]
-                         [else  (x-loop (unsafe-fx+ x 1))]))]
-                [(a1 . > . 0.0)
-                 (let: k-loop : Void ([k : Nonnegative-Fixnum  0])
-                   (cond [(k . fx< . c)  (define v1 (flvector-ref argb1-vs (unsafe-fx+ i1 k)))
-                                         (flvector-set! argb-vs (unsafe-fx+ i k) v1)
-                                         (k-loop (unsafe-fx+ k 1))]
-                         [else  (x-loop (unsafe-fx+ x 1))]))]
-                [(a2 . > . 0.0)
-                 (let: k-loop : Void ([k : Nonnegative-Fixnum  0])
-                   (cond [(k . fx< . c)  (define v2 (flvector-ref argb2-vs (unsafe-fx+ i2 k)))
-                                         (flvector-set! argb-vs (unsafe-fx+ i k) v2)
-                                         (k-loop (unsafe-fx+ k 1))]
-                         [else  (x-loop (unsafe-fx+ x 1))]))]
-                [else  (x-loop (unsafe-fx+ x 1))])]
-             [else  (y-loop (unsafe-fx+ y 1))]))))
-     (flomap argb-vs c w h)]
-    [(fm1 x1 y1 fm2 x2 y2)  (flomap-pin fm1 (- x1 x2) (- y1 y2) fm2)]))
-
-(: flomap-pin* (Real Real Real Real flomap flomap * -> flomap))
-(define (flomap-pin* x1-frac y1-frac x2-frac y2-frac fm0 . fms)
-  (define-values (fm _x _y)
-    (for/fold: ([fm : flomap  fm0]
-                [x : Exact-Rational  0]
-                [y : Exact-Rational  0]
-                ) ([fm1 : flomap  (in-list (cons fm0 fms))]
-                   [fm2 : flomap  (in-list fms)])
-      (define-values (w1 h1) (flomap-size fm1))
-      (define-values (w2 h2) (flomap-size fm2))
-      (define x1 (+ x (- (inexact->exact (* x1-frac w1))
-                         (inexact->exact (* x2-frac w2)))))
-      (define y1 (+ y (- (inexact->exact (* y1-frac h1))
-                         (inexact->exact (* y2-frac h2)))))
-      (values (flomap-pin fm (round x1) (round y1) fm2)
-              (max 0 x1) (max 0 y1))))
-  fm)
-
-(: flomap-lt-superimpose (flomap flomap * -> flomap))
-(: flomap-lc-superimpose (flomap flomap * -> flomap))
-(: flomap-lb-superimpose (flomap flomap * -> flomap))
-(: flomap-ct-superimpose (flomap flomap * -> flomap))
-(: flomap-cc-superimpose (flomap flomap * -> flomap))
-(: flomap-cb-superimpose (flomap flomap * -> flomap))
-(: flomap-rt-superimpose (flomap flomap * -> flomap))
-(: flomap-rc-superimpose (flomap flomap * -> flomap))
-(: flomap-rb-superimpose (flomap flomap * -> flomap))
-
-(define (flomap-lt-superimpose fm . fms) (apply flomap-pin* 0 0 0 0 fm fms))
-(define (flomap-lc-superimpose fm . fms) (apply flomap-pin* 0 1/2 0 1/2 fm fms))
-(define (flomap-lb-superimpose fm . fms) (apply flomap-pin* 0 1 0 1 fm fms))
-(define (flomap-ct-superimpose fm . fms) (apply flomap-pin* 1/2 0 1/2 0 fm fms))
-(define (flomap-cc-superimpose fm . fms) (apply flomap-pin* 1/2 1/2 1/2 1/2 fm fms))
-(define (flomap-cb-superimpose fm . fms) (apply flomap-pin* 1/2 1 1/2 1 fm fms))
-(define (flomap-rt-superimpose fm . fms) (apply flomap-pin* 1 0 1 0 fm fms))
-(define (flomap-rc-superimpose fm . fms) (apply flomap-pin* 1 1/2 1 1/2 fm fms))
-(define (flomap-rb-superimpose fm . fms) (apply flomap-pin* 1 1 1 1 fm fms))
-
-(: flomap-vl-append (flomap flomap * -> flomap))
-(: flomap-vc-append (flomap flomap * -> flomap))
-(: flomap-vr-append (flomap flomap * -> flomap))
-(: flomap-ht-append (flomap flomap * -> flomap))
-(: flomap-hc-append (flomap flomap * -> flomap))
-(: flomap-hb-append (flomap flomap * -> flomap))
-
-(define (flomap-vl-append fm . fms) (apply flomap-pin* 0 1 0 0 fm fms))
-(define (flomap-vc-append fm . fms) (apply flomap-pin* 1/2 1 1/2 0 fm fms))
-(define (flomap-vr-append fm . fms) (apply flomap-pin* 1 1 1 0 fm fms))
-(define (flomap-ht-append fm . fms) (apply flomap-pin* 1 0 0 0 fm fms))
-(define (flomap-hc-append fm . fms) (apply flomap-pin* 1 1/2 0 1/2 fm fms))
-(define (flomap-hb-append fm . fms) (apply flomap-pin* 1 1 0 1 fm fms))
diff --git a/pkgs/images-pkgs/images-lib/images/private/flomap-convert.rkt b/pkgs/images-pkgs/images-lib/images/private/flomap-convert.rkt
deleted file mode 100644
index ac38bc7ec9..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flomap-convert.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-
-(require racket/draw racket/class racket/match
-         racket/unsafe/ops
-         "flomap-struct.rkt"
-         "flomap-pointwise.rkt"
-         "flomap-resize.rkt")
-
-(provide bitmap->flomap flomap->bitmap draw-flomap)
-
-(define (bitmap->flomap bm #:unscaled? [unscaled? #f])
-  (unless (is-a? bm bitmap%)
-    (raise-type-error 'bitmap->flomap "bitmap% instance" bm))
-  
-  (define backing-scale (send bm get-backing-scale))
-  (define (scale d)
-    (if unscaled? (inexact->exact (ceiling (* d backing-scale))) d))
-  
-  (define w (scale (send bm get-width)))
-  (define h (scale (send bm get-height)))
-  (define bs (make-bytes (* 4 w h)))
-  (send bm get-argb-pixels 0 0 w h bs #t #t #:unscaled? unscaled?)
-  (send bm get-argb-pixels 0 0 w h bs #f #t #:unscaled? unscaled?)
-  
-  (define argb-fm (make-flomap 4 w h))
-  (define argb-vs (flomap-values argb-fm))
-  (for ([i0  (in-range 0 (* 4 w h) 4)])
-    (define i1 (unsafe-fx+ i0 1))
-    (define i2 (unsafe-fx+ i0 2))
-    (define i3 (unsafe-fx+ i0 3))
-    (define a (unsafe-bytes-ref bs i0))
-    (define r (unsafe-bytes-ref bs i1))
-    (define g (unsafe-bytes-ref bs i2))
-    (define b (unsafe-bytes-ref bs i3))
-    (unsafe-flvector-set! argb-vs i0 (unsafe-fl/ (unsafe-fx->fl a) 255.0))
-    (unsafe-flvector-set! argb-vs i1 (unsafe-fl/ (unsafe-fx->fl r) 255.0))
-    (unsafe-flvector-set! argb-vs i2 (unsafe-fl/ (unsafe-fx->fl g) 255.0))
-    (unsafe-flvector-set! argb-vs i3 (unsafe-fl/ (unsafe-fx->fl b) 255.0)))
-  
-  argb-fm)
-
-(define (unsafe-fl->byte x)
-  (unsafe-fl->fx
-   (unsafe-flround
-    (unsafe-flmax 0.0 (unsafe-flmin 255.0 (unsafe-fl* x 255.0))))))
-
-(define (flomap->bitmap fm #:backing-scale [backing-scale 1.0])
-  (match-define (flomap vs c w h) fm)
-  (let* ([fm  (case c
-                [(0)  (make-flomap 4 w h)]
-                [(1)  (flomap-append-components (make-flomap 1 w h 1.0) fm fm fm)]
-                [(2)  (define alpha-fm (flomap-ref-component fm 0))
-                      (define value-fm (flomap-drop-components fm 1))
-                      (flomap-append-components alpha-fm value-fm value-fm value-fm)]
-                [(3)  (flomap-append-components (make-flomap 1 w h 1.0) fm)]
-                [(4)  fm]
-                [else  (raise-type-error 'flomap->bitmap "flomap with 1, 2, 3 or 4 components" fm)])]
-         ;; inset if zero (bitmaps can't have zero size)
-         [fm  (flomap-inset fm 0 0 (if (= w 0) 1 0) (if (= h 0) 1 0))])
-    ;; guaranteed an ARGB flomap now
-    (match-define (flomap vs 4 w h) fm)
-    (define bs (make-bytes (* 4 w h)))
-    (for ([i0  (in-range 0 (* 4 w h) 4)])
-      (define i1 (unsafe-fx+ i0 1))
-      (define i2 (unsafe-fx+ i0 2))
-      (define i3 (unsafe-fx+ i0 3))
-      (define a (unsafe-flvector-ref vs i0))
-      (define r (unsafe-flvector-ref vs i1))
-      (define g (unsafe-flvector-ref vs i2))
-      (define b (unsafe-flvector-ref vs i3))
-      (unsafe-bytes-set! bs i0 (unsafe-fl->byte a))
-      (unsafe-bytes-set! bs i1 (unsafe-fl->byte r))
-      (unsafe-bytes-set! bs i2 (unsafe-fl->byte g))
-      (unsafe-bytes-set! bs i3 (unsafe-fl->byte b)))
-    
-    (define (scale d) (inexact->exact (ceiling (/ d backing-scale))))
-    (define bm (make-bitmap (scale w) (scale h) #:backing-scale backing-scale))
-    (send bm set-argb-pixels 0 0 w h bs #t #t #:unscaled? #t)
-    (send bm set-argb-pixels 0 0 w h bs #f #t #:unscaled? #t)
-    bm))
-
-(define (draw-flomap draw-proc w h)
-  (unless (w . >= . 0) (raise-type-error 'draw-flomap "nonnegative fixnum" 0 w h draw-proc))
-  (unless (h . >= . 0) (raise-type-error 'draw-flomap "nonnegative fixnum" 1 w h draw-proc))
-  
-  (define bm (make-bitmap (max w 1) (max h 1)))
-  (define dc (make-object bitmap-dc% bm))
-  (send dc set-smoothing 'smoothed)
-  (draw-proc dc)
-  (flomap-inset (bitmap->flomap bm) 0 0 (if (= w 0) -1 0) (if (= h 0) -1 0)))
diff --git a/pkgs/images-pkgs/images-lib/images/private/flomap-effects.rkt b/pkgs/images-pkgs/images-lib/images/private/flomap-effects.rkt
deleted file mode 100644
index 9abfe2a4e2..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flomap-effects.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang typed/racket/base
-
-(require racket/math racket/match racket/list
-         "flonum.rkt"
-         "flomap-struct.rkt"
-         "flomap-stats.rkt"
-         "flomap-pointwise.rkt"
-         "flomap-blur.rkt"
-         "flomap-composite.rkt"
-         "flomap-resize.rkt"
-         "flomap-transform.rkt")
-
-(provide flomap-shadow flomap-outline
-         flomap-whirl-morph)
-
-(: colorize-alpha (flomap (U (Vectorof Real) FlVector) -> flomap))
-(define (colorize-alpha fm vs)
-  (match-define (flomap _ 1 w h) fm)
-  (fm* fm (make-flomap* w h vs)))
-
-(: shadow-color (Integer (Option (U (Vectorof Real) FlVector)) -> (U (Vectorof Real) FlVector)))
-(define (shadow-color c color)
-  (cond [color  color]
-        [else  (define vs (make-flvector c))
-               (flvector-set! vs 0 1.0)
-               vs]))
-
-(: flomap-shadow (case-> (flomap Real -> flomap)
-                         (flomap Real (Option (U (Vectorof Real) FlVector)) -> flomap)))
-(define flomap-shadow
-  (case-lambda
-    [(fm σ)  (flomap-shadow fm σ #f)]
-    [(fm σ color)
-     (define c (flomap-components fm))
-     (cond [(= c 0)  (raise-type-error 'flomap-shadow "flomap with at least one component" fm)]
-           [(= c 1)  (flomap-blur fm σ)]
-           [else     (colorize-alpha (flomap-blur (flomap-ref-component fm 0) σ)
-                                     (shadow-color c color))])]))
-
-(: flomap-outline (case-> (flomap Real -> flomap)
-                          (flomap Real (Option (U (Vectorof Real) FlVector)) -> flomap)))
-(define flomap-outline
-  (case-lambda
-    [(fm amt)  (flomap-outline fm amt #f)]
-    [(fm amt color)
-     (define c (flomap-components fm))
-     (unless (c . > . 0)
-       (raise-type-error 'flomap-outline "flomap with at least one component" fm))
-     (let ([amt  (real->double-flonum amt)])
-       (define σ (* 0.5 (max 1.0 amt)))
-       (define ceiling-amt (fl->fx (ceiling amt)))
-       (define test-size (fx* 2 (fx+ 1 ceiling-amt)))
-       (define test-mid (fxquotient test-size 2))
-       (define alpha-fm (flomap-ref-component fm 0))
-       (define-values (a-min a-max) (flomap-extreme-values alpha-fm))
-       (define a-size (- a-max a-min))
-       (define test-fm (inline-build-flomap 1 test-size 1
-                                            (λ (k x y i) (if (x . fx>= . test-mid) a-max a-min))))
-       (define blur-test-fm (flomap-blur-x test-fm σ))
-       (define v-min (flomap-bilinear-ref blur-test-fm 0 (+ 0.5 (- test-mid amt 1.0)) 0.5))
-       (define v-max (flomap-bilinear-ref blur-test-fm 0 (+ 0.5 (- test-mid amt)) 0.5))
-       (define av-scale (/ a-size (- v-max v-min)))
-       (let* ([outline-fm  (flomap-blur alpha-fm σ)]
-              [outline-fm  ((inline-flomap-lift
-                             (λ (v) (+ a-min (max 0.0 (min a-size (* av-scale (- v v-min)))))))
-                            outline-fm)]
-              [outline-fm  ((inline-flomap-lift2
-                             'subtract-alpha
-                             (λ (o a) (if (= a 1.0) 0.0 (/ (- o a) (- 1.0 a)))))
-                            outline-fm alpha-fm)])
-         (define color-vs (shadow-color c color))
-         (colorize-alpha outline-fm color-vs)))]))
-
-(define blend-start 1/3)
-(define blend-end 2/3)
-
-(: flomap-whirl-morph (flomap flomap -> (Real -> flomap)))
-(define (flomap-whirl-morph fm1 fm2)
-  (define w (max (flomap-width fm1) (flomap-width fm2)))
-  (define h (max (flomap-height fm1) (flomap-height fm2)))
-  (let ([fm1  (flomap-cc-crop fm1 w h)]
-        [fm2  (flomap-cc-crop fm2 w h)])
-    
-    (define: (whirled-fm1 [t : Real]) : flomap
-      (define t1 (sqr t))
-      (define trans1
-        (flomap-transform-compose (flomap-rotate-transform (* t1 (* -1 pi)))
-                                  (flomap-whirl-transform (* t1 (* -8 pi)))))
-      (flomap-transform fm1 trans1 0 0 w h))
-    
-    (define: (whirled-fm2 [t : Real]) : flomap
-      (define t2 (sqr (- 1 t)))
-      (define trans2
-        (flomap-transform-compose (flomap-rotate-transform (* t2 (* 1 pi)))
-                                  (flomap-whirl-transform (* t2 (* 8 pi)))))
-      (flomap-transform fm2 trans2 0 0 w h))
-    
-    (λ (t)
-      (cond [(t . <= . 0)  fm1]
-            [(t . >= . 1)  fm2]
-            [else
-             (cond [(t . <= . blend-start)  (whirled-fm1 t)]
-                   [(t . >= . blend-end)    (whirled-fm2 t)]
-                   [else
-                    (define b (/ (- t blend-start) (- blend-end blend-start)))
-                    (fm+ (fm* (- 1 b) (whirled-fm1 t)) (fm* b (whirled-fm2 t)))])]))))
diff --git a/pkgs/images-pkgs/images-lib/images/private/flomap-gradient.rkt b/pkgs/images-pkgs/images-lib/images/private/flomap-gradient.rkt
deleted file mode 100644
index 23ac7c4ea9..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flomap-gradient.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match
-         (only-in racket/unsafe/ops unsafe-flvector-ref)
-         "flonum.rkt"
-         "flomap-struct.rkt")
-
-(provide flomap-gradient-x flomap-gradient-y flomap-gradient flomap-gradient-normal)
-
-;; ===================================================================================================
-;; Derivatives (Scharr operator)
-
-(: flomap-gradient-x (flomap -> flomap))
-(define (flomap-gradient-x fm)
-  (match-define (flomap vs c w h) fm)
-  (define +x (fx* c 1))
-  (define -x+y (fx* c (fx- w 1)))
-  (define +x+y (fx* c (fx+ w 1)))
-  (define w-1 (fx- w 1))
-  (define h-1 (fx- h 1))
-  (inline-build-flomap
-   c w h
-   (λ (k x y i)
-     (cond [(and (x . fx> . 0) (x . fx< . w-1)
-                 (y . fx> . 0) (y . fx< . h-1))
-            (+ (- (* 0.1875 (unsafe-flvector-ref vs (fx- i -x+y)))
-                  (* 0.1875 (unsafe-flvector-ref vs (fx- i +x+y))))
-               (- (* 0.6250 (unsafe-flvector-ref vs (fx+ i +x)))
-                  (* 0.6250 (unsafe-flvector-ref vs (fx- i +x))))
-               (- (* 0.1875 (unsafe-flvector-ref vs (fx+ i +x+y)))
-                  (* 0.1875 (unsafe-flvector-ref vs (fx+ i -x+y)))))]
-           [else
-            (+ (- (* 0.1875 (flomap-ref fm k (+ x 1) (- y 1)))
-                  (* 0.1875 (flomap-ref fm k (- x 1) (- y 1))))
-               (- (* 0.6250 (flomap-ref fm k (+ x 1) y))
-                  (* 0.6250 (flomap-ref fm k (- x 1) y)))
-               (- (* 0.1875 (flomap-ref fm k (+ x 1) (+ y 1)))
-                  (* 0.1875 (flomap-ref fm k (- x 1) (+ y 1)))))]))))
-
-(: flomap-gradient-y (flomap -> flomap))
-(define (flomap-gradient-y fm)
-  (match-define (flomap vs c w h) fm)
-  (define +y (fx* c w))
-  (define -x+y (fx* c (fx- w 1)))
-  (define +x+y (fx* c (fx+ w 1)))
-  (define w-1 (fx- w 1))
-  (define h-1 (fx- h 1))
-  (inline-build-flomap
-   c w h
-   (λ (k x y i)
-     (cond [(and (x . fx> . 0) (x . fx< . w-1)
-                 (y . fx> . 0) (y . fx< . h-1))
-            (+ (- (* 0.1875 (unsafe-flvector-ref vs (fx+ i -x+y)))
-                  (* 0.1875 (unsafe-flvector-ref vs (fx- i +x+y))))
-               (- (* 0.6250 (unsafe-flvector-ref vs (fx+ i +y)))
-                  (* 0.6250 (unsafe-flvector-ref vs (fx- i +y))))
-               (- (* 0.1875 (unsafe-flvector-ref vs (fx+ i +x+y)))
-                  (* 0.1875 (unsafe-flvector-ref vs (fx- i -x+y)))))]
-           [else
-            (+ (- (* 0.1875 (flomap-ref fm k (- x 1) (+ y 1)))
-                  (* 0.1875 (flomap-ref fm k (- x 1) (- y 1))))
-               (- (* 0.6250 (flomap-ref fm k x (+ y 1)))
-                  (* 0.6250 (flomap-ref fm k x (- y 1))))
-               (- (* 0.1875 (flomap-ref fm k (+ x 1) (+ y 1)))
-                  (* 0.1875 (flomap-ref fm k (+ x 1) (- y 1)))))]))))
-
-(: flomap-gradient (flomap -> (values flomap flomap)))
-(define (flomap-gradient fm)
-  (values (flomap-gradient-x fm) (flomap-gradient-y fm)))
-
-(: flomap-gradient-normal (flomap -> flomap))
-(define (flomap-gradient-normal z-fm)
-  (unless (= 1 (flomap-components z-fm))
-    (raise-type-error 'flomap-gradient-normal "flomap with 1 component" z-fm))
-  (define-values (dx-fm dy-fm) (flomap-gradient z-fm))
-  (match-define (flomap dx-vs 1 w h) dx-fm)
-  (match-define (flomap dy-vs 1 _w _h) dy-fm)
-  (define normal-vs (make-flvector (* 3 w h)))
-  (for ([i  (in-range (* w h))])
-    (define dx (flvector-ref dx-vs i))
-    (define dy (flvector-ref dy-vs i))
-    (define-values (nx ny nz) (fl3normalize (- dx) (- dy) 2.0))
-    (define j (fx* 3 i))
-    (flvector-set! normal-vs j nx)
-    (flvector-set! normal-vs (fx+ j 1) ny)
-    (flvector-set! normal-vs (fx+ j 2) nz))
-  (flomap normal-vs 3 w h))
diff --git a/pkgs/images-pkgs/images-lib/images/private/flomap-pointwise.rkt b/pkgs/images-pkgs/images-lib/images/private/flomap-pointwise.rkt
deleted file mode 100644
index fc27ef975c..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flomap-pointwise.rkt
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match racket/math
-         "flonum.rkt"
-         "flomap-struct.rkt"
-         "flomap-stats.rkt")
-
-(provide flomap-lift flomap-lift2 inline-flomap-lift inline-flomap-lift2
-         fmsqrt fm+ fm- fm* fm/ fmmin fmmax fmsqr
-         flomap-normalize flomap-multiply-alpha flomap-divide-alpha)
-
-;; ===================================================================================================
-;; Unary
-
-;(: inline-flomap-lift ((Float -> Float) -> (flomap -> flomap)))
-(define-syntax-rule (inline-flomap-lift f)
-  (λ: ([fm : flomap])
-    (match-define (flomap vs c w h) fm)
-    (flomap (inline-build-flvector (* c w h) (λ (i) (f (flvector-ref vs i))))
-            c w h)))
-
-(: flomap-lift ((Float -> Real) -> (flomap -> flomap)))
-(define (flomap-lift op)
-  (inline-flomap-lift (λ (x) (real->double-flonum (op x)))))
-
-(define fmsqrt (inline-flomap-lift flsqrt))
-
-;; ===================================================================================================
-;; Binary
-
-(: raise-two-reals-error (Symbol Real Real -> flomap))
-(define (raise-two-reals-error name r1 r2)
-  (error name "expected at least one flomap argument; given ~e and ~e" r1 r2))
-
-(: raise-size-error (Symbol Integer Integer Integer Integer -> flomap))
-(define (raise-size-error name w h w2 h2)
-  (error name "expected same-size flomaps; given sizes ~e×~e and ~e×~e" w h w2 h2))
-
-(: raise-component-error (Symbol Integer Integer -> flomap))
-(define (raise-component-error name c1 c2)
-  (error name (string-append "expected flomaps with the same number of components, "
-                             "or a flomap with 1 component and any same-size flomap; "
-                             "given flomaps with ~e and ~e components")
-         c1 c2))
-
-#;
-(: inline-flomap-lift2* (Symbol (Float Float -> Float)
-                                -> (flomap flomap -> flomap)))
-(define-syntax-rule (inline-flomap-lift2* name f)
-  (λ: ([fm1 : flomap] [fm2 : flomap])
-    (match-define (flomap vs1 c1 w h) fm1)
-    (match-define (flomap vs2 c2 w2 h2) fm2)
-    (cond
-      [(not (and (= w w2) (= h h2)))  (raise-size-error name w h w2 h2)]
-      [(= c1 c2)  (flomap (inline-build-flvector (* c1 w h)
-                                                 (λ (i) (f (flvector-ref vs1 i)
-                                                           (flvector-ref vs2 i))))
-                          c1 w h)]
-      [(= c1 1)  (inline-build-flomap
-                  c2 w h
-                  (λ (k x y i) (f (flvector-ref vs1 (coords->index 1 w 0 x y))
-                                  (flvector-ref vs2 i))))]
-      [(= c2 1)  (inline-build-flomap
-                  c1 w h
-                  (λ (k x y i) (f (flvector-ref vs1 i)
-                                  (flvector-ref vs2 (coords->index 1 w 0 x y)))))]
-      [else  (raise-component-error name c1 c2)])))
-
-#;
-(: inline-flomap-lift2 (Symbol (Float Float -> Float)
-                               -> ((U Real flomap) (U Real flomap) -> flomap)))
-(define-syntax-rule (inline-flomap-lift2 name f)
-  (λ: ([fm1 : (U Real flomap)] [fm2 : (U Real flomap)])
-    (cond
-      [(and (real? fm1) (real? fm2))  (raise-two-reals-error name fm1 fm2)]
-      [(real? fm1)  (let ([fm1  (real->double-flonum fm1)])
-                      ((inline-flomap-lift (λ (v) (f fm1 v))) fm2))]
-      [(real? fm2)  (let ([fm2  (real->double-flonum fm2)])
-                      ((inline-flomap-lift (λ (v) (f v fm2))) fm1))]
-      [else  ((inline-flomap-lift2* name f) fm1 fm2)])))
-
-(: flomap-lift2 (Symbol (Float Float -> Real) -> ((U Real flomap) (U Real flomap) -> flomap)))
-(define (flomap-lift2 name f)
-  (inline-flomap-lift2 name (λ (x y) (real->double-flonum (f x y)))))
-
-(define fm+ (inline-flomap-lift2 'fm+ +))
-(define fm- (inline-flomap-lift2 'fm- -))
-(define fm* (inline-flomap-lift2 'fm* *))
-(define fm/ (inline-flomap-lift2 'fm/ /))
-(define fmmin (inline-flomap-lift2 'fmmin min))
-(define fmmax (inline-flomap-lift2 'fmmax max))
-
-(: fmsqr (flomap -> flomap))
-(define (fmsqr fm) (fm* fm fm))
-
-(: flomap-normalize (flomap -> flomap))
-(define (flomap-normalize fm)
-  (define-values (v-min v-max) (flomap-extreme-values fm))
-  (define v-size (- v-max v-min))
-  (let* ([fm  (fm- fm v-min)]
-         [fm  (if (v-size . = . 0.0) fm (fm/ fm v-size))])
-    fm))
-
-(define fmdiv/zero
-  (inline-flomap-lift2* 'fmdiv/zero (λ (x y) (if (y . = . 0.0) 0.0 (/ x y)))))
-
-(: flomap-divide-alpha (flomap -> flomap))
-(define (flomap-divide-alpha fm)
-  (match-define (flomap _ c w h) fm)
-  (cond [(c . <= . 1)  fm]
-        [else
-         (define alpha-fm (flomap-ref-component fm 0))
-         (flomap-append-components alpha-fm (fmdiv/zero (flomap-drop-components fm 1) alpha-fm))]))
-
-(: flomap-multiply-alpha (flomap -> flomap))
-(define (flomap-multiply-alpha fm)
-  (match-define (flomap _ c w h) fm)
-  (cond [(c . > . 1)
-         (define alpha-fm (flomap-ref-component fm 0))
-         (flomap-append-components alpha-fm (fm* (flomap-drop-components fm 1) alpha-fm))]
-        [else  fm]))
diff --git a/pkgs/images-pkgs/images-lib/images/private/flomap-resize.rkt b/pkgs/images-pkgs/images-lib/images/private/flomap-resize.rkt
deleted file mode 100644
index 8e4ca893d0..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flomap-resize.rkt
+++ /dev/null
@@ -1,235 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match racket/math
-         (only-in racket/unsafe/ops unsafe-fx+)
-         "flonum.rkt"
-         "flomap-struct.rkt"
-         "flomap-stats.rkt"
-         "flomap-blur.rkt")
-
-(provide flomap-copy subflomap flomap-trim flomap-inset flomap-crop
-         flomap-lt-crop flomap-lc-crop flomap-lb-crop
-         flomap-ct-crop flomap-cc-crop flomap-cb-crop
-         flomap-rt-crop flomap-rc-crop flomap-rb-crop
-         flomap-scale flomap-resize)
-
-(: flomap-copy (flomap Integer Integer Integer Integer -> flomap))
-(define (flomap-copy fm x-start y-start x-end y-end)
-  (match-define (flomap src-vs c src-w src-h) fm)
-  (define dst-w (max 0 (- x-end x-start)))
-  (define dst-h (max 0 (- y-end y-start)))
-  (define new-fm (make-flomap c dst-w dst-h))
-  (define dst-vs (flomap-values new-fm))
-  (when (and (dst-w . > . 0) (dst-h . > . 0))
-    (let: y-loop : Void ([dst-y : Nonnegative-Fixnum  0])
-      (when (dst-y . fx< . dst-h)
-        (define src-y (fx+ dst-y y-start))
-        (when (and (src-y . fx>= . 0) (src-y . fx< . src-h))
-          (let: x-loop : Void ([dst-x : Nonnegative-Fixnum  0])
-            (when (dst-x . fx< . dst-w)
-              (define src-x (fx+ dst-x x-start))
-              (when (and (src-x . fx>= . 0) (src-x . fx< . src-w))
-                (let: k-loop : Void ([k : Nonnegative-Fixnum  0])
-                  (when (k . fx< . c)
-                    (define src-i (coords->index c src-w k src-x src-y))
-                    (define dst-i (coords->index c dst-w k dst-x dst-y))
-                    (flvector-set! dst-vs dst-i (flvector-ref src-vs src-i))
-                    (k-loop (unsafe-fx+ k 1)))))
-              (x-loop (unsafe-fx+ dst-x 1)))))
-        (y-loop (unsafe-fx+ dst-y 1)))))
-  new-fm)
-
-(: subflomap (flomap Integer Integer Integer Integer -> flomap))
-(define (subflomap fm x-start y-start x-end y-end)
-  (match-define (flomap _ _ src-w src-h) fm)
-  (cond [(and (= x-start 0) (= y-start 0) (= x-end src-w) (= y-end src-h))  fm]
-        [else  (flomap-copy fm x-start y-start x-end y-end)]))
-
-(: flomap-trim (case-> (flomap -> flomap)
-                       (flomap Boolean -> flomap)))
-(define flomap-trim
-  (case-lambda
-    [(fm)  (flomap-trim fm #t)]
-    [(fm alpha?)
-     (cond [(= (flomap-components fm) 0)  (make-flomap 0 0 0)]
-           [else
-            (define-values (x-start y-start x-end y-end)
-              (flomap-nonzero-rect (if alpha? (flomap-ref-component fm 0) fm)))
-            (subflomap fm x-start y-start x-end y-end)])]))
-
-(: flomap-inset (case-> (flomap Integer -> flomap)
-                        (flomap Integer Integer -> flomap)
-                        (flomap Integer Integer Integer Integer -> flomap)))
-(define flomap-inset
-  (case-lambda
-    [(fm amt)          (flomap-inset fm amt amt amt amt)]
-    [(fm h-amt v-amt)  (flomap-inset fm h-amt v-amt h-amt v-amt)]
-    [(fm l-amt t-amt r-amt b-amt)
-     (match-define (flomap _ _ w h) fm)
-     (subflomap fm (- l-amt) (- t-amt) (+ w r-amt) (+ h b-amt))]))
-
-(: flomap-crop (flomap Integer Integer Real Real -> flomap))
-(define (flomap-crop fm width height x-frac y-frac)
-  (unless (width . >= . 0)
-    (raise-type-error 'flomap-crop "nonnegative integer" 1 fm width height x-frac y-frac))
-  (unless (height . >= . 0)
-    (raise-type-error 'flomap-crop "nonnegative integer" 2 fm width height x-frac y-frac))
-  (let ([x-frac  (real->double-flonum x-frac)]
-        [y-frac  (real->double-flonum y-frac)])
-    (match-define (flomap _ c w h) fm)
-    (define l-amt (fl->fx (round (* x-frac (fx->fl (fx- width w))))))
-    (define r-amt (fx- (fx- width w) l-amt))
-    (define t-amt (fl->fx (round (* y-frac (fx->fl (fx- height h))))))
-    (define b-amt (fx- (fx- height h) t-amt))
-    (flomap-inset fm l-amt t-amt r-amt b-amt)))
-
-(: flomap-lt-crop (flomap Integer Integer -> flomap))
-(: flomap-lc-crop (flomap Integer Integer -> flomap))
-(: flomap-lb-crop (flomap Integer Integer -> flomap))
-(: flomap-ct-crop (flomap Integer Integer -> flomap))
-(: flomap-cc-crop (flomap Integer Integer -> flomap))
-(: flomap-cb-crop (flomap Integer Integer -> flomap))
-(: flomap-rt-crop (flomap Integer Integer -> flomap))
-(: flomap-rc-crop (flomap Integer Integer -> flomap))
-(: flomap-rb-crop (flomap Integer Integer -> flomap))
-
-(define (flomap-lt-crop fm w h) (flomap-crop fm w h 0 0))
-(define (flomap-lc-crop fm w h) (flomap-crop fm w h 0 1/2))
-(define (flomap-lb-crop fm w h) (flomap-crop fm w h 0 1))
-(define (flomap-ct-crop fm w h) (flomap-crop fm w h 1/2 0))
-(define (flomap-cc-crop fm w h) (flomap-crop fm w h 1/2 1/2))
-(define (flomap-cb-crop fm w h) (flomap-crop fm w h 1/2 1))
-(define (flomap-rt-crop fm w h) (flomap-crop fm w h 1 0))
-(define (flomap-rc-crop fm w h) (flomap-crop fm w h 1 1/2))
-(define (flomap-rb-crop fm w h) (flomap-crop fm w h 1 1))
-
-(: flomap-scale (case-> (flomap Real -> flomap)
-                        (flomap Real Real -> flomap)))
-(define flomap-scale
-  (case-lambda
-    [(fm scale)
-     (cond [(< scale 0)  (raise-type-error 'flomap-scale "nonnegative real" 1 fm scale)]
-           [else  (flomap-scale fm scale scale)])]
-    [(fm x-scale y-scale)
-     (cond [(< x-scale 0)  (raise-type-error 'flomap-scale "nonnegative real" 1 fm x-scale y-scale)]
-           [(< y-scale 0)  (raise-type-error 'flomap-scale "nonnegative real" 2 fm x-scale y-scale)]
-           [else  (flomap-scale-x (flomap-scale-y fm (real->double-flonum y-scale))
-                                  (real->double-flonum x-scale))])]))
-
-(: flomap-resize (flomap (Option Integer) (Option Integer) -> flomap))
-(define (flomap-resize fm width height)
-  (when (and width (width . < . 0))
-    (raise-type-error 'flomap-resize "nonnegative integer" 1 fm width height))
-  (when (and height (height . < . 0))
-    (raise-type-error 'flomap-resize "nonnegative integer" 2 fm width height))
-  (match-define (flomap _ c w h) fm)
-  (cond [(and width height)  (flomap-resize-x (flomap-resize-y fm height) width)]
-        [width   (cond [(= w 0)  (error 'flomap-resize
-                                        "cannot proportionally scale ~e×~e flomap's height"
-                                        w h)]
-                       [else  (define s (real->double-flonum (/ width w)))
-                              (flomap-resize-x (flomap-scale-y fm s) width)])]
-        [height  (cond [(= h 0)  (error 'flomap-resize
-                                        "cannot proportionally scale ~e×~e flomap's width"
-                                        w h)]
-                       [else  (define s (real->double-flonum (/ height h)))
-                              (flomap-scale-x (flomap-resize-y fm height) s)])]
-        [else  (error 'flomap-resize "can't happen")]))
-
-(: flomap-scale-x (flomap Float -> flomap))
-(define (flomap-scale-x fm scale)
-  (match-define (flomap _ c w h) fm)
-  (cond [(= 0.0 scale)  (make-flomap c 0 h)]
-        [else
-         (let ([scale  (abs scale)])
-           (flomap-scale*-x fm scale (abs (fl->fx (ceiling (* (real->double-flonum w) scale))))))]))
-
-(: flomap-scale-y (flomap Float -> flomap))
-(define (flomap-scale-y fm scale)
-  (match-define (flomap _ c w h) fm)
-  (cond [(= 0.0 scale)  (make-flomap c w 0)]
-        [else
-         (let ([scale  (abs scale)])
-           (flomap-scale*-y fm scale (abs (fl->fx (ceiling (* (real->double-flonum h) scale))))))]))
-
-(: flomap-resize-x (flomap Integer -> flomap))
-(define (flomap-resize-x fm width)
-  (match-define (flomap _ c w h) fm)
-  (cond [(= 0 width)  (make-flomap c 0 h)]
-        [else  (let ([width  (abs width)])
-                 (flomap-scale*-x fm (abs (real->double-flonum (/ width w))) width))]))
-
-(: flomap-resize-y (flomap Integer -> flomap))
-(define (flomap-resize-y fm height)
-  (match-define (flomap _ c w h) fm)
-  (cond [(= 0 height)  (make-flomap c w 0)]
-        [else  (let ([height  (abs height)])
-                 (flomap-scale*-y fm (abs (real->double-flonum (/ height h))) height))]))
-
-;; variance of an unscaled box filter (i.e. f([-1/2,1/2]) = {1}, zero elsewhere)
-(define box-filter-variance (/ 1.0 12.0))
-;; variance of an unscaled triangle filter (simulates effect of linear interpolation)
-(define triangle-filter-variance (/ 1.0 24.0))
-
-;; calculates the standard deviation of downscaling blur, assuming linear interpolation will be
-;; carried out on the blurred image
-(: stddev-for-scale (Float -> Float))
-(define (stddev-for-scale scale)
-  (define var (- (/ box-filter-variance (sqr scale))
-                 triangle-filter-variance))
-  (flsqrt (max 0.0 var)))
-
-(: flomap-scale*-x (flomap Float Exact-Nonnegative-Integer -> flomap))
-(define (flomap-scale*-x fm scale width)
-  (cond [(scale . = . 1.0)  fm]
-        [(scale . > . 1.0)  (flomap-scale*-x/linear fm scale width)]
-        [else  (define low-res-fm
-                 (flomap-gaussian-blur-x fm (stddev-for-scale scale)))
-               (flomap-scale*-x/linear low-res-fm scale width)]))
-
-(: flomap-scale*-y (flomap Float Exact-Nonnegative-Integer -> flomap))
-(define (flomap-scale*-y fm scale height)
-  (cond [(scale . = . 1.0)  fm]
-        [(scale . > . 1.0)  (flomap-scale*-y/linear fm scale height)]
-        [else  (define low-res-fm
-                 (flomap-gaussian-blur-y fm (stddev-for-scale scale)))
-               (flomap-scale*-y/linear low-res-fm scale height)]))
-
-(: flomap-scale*-x/linear (flomap Float Exact-Nonnegative-Integer -> flomap))
-(define (flomap-scale*-x/linear fm s new-w)
-  (match-define (flomap vs c w h) fm)
-  (define w-1 (unsafe-fx+ w -1))
-  (inline-build-flomap
-   c new-w h
-   (λ (k new-x y _i)
-     (define scaled-x (- (/ (+ (fx->fl new-x) 0.5) s) 0.5))
-     (define floor-scaled-x (floor scaled-x))
-     (define x0 (fl->fx floor-scaled-x))
-     (cond [(or (x0 . fx< . -1) (x0 . fx>= . w))  0.0]
-           [else
-            (define i0 (coords->index c w k x0 y))
-            (define v0 (cond [(x0 . fx= . -1)  0.0]
-                             [else  (flvector-ref vs i0)]))
-            (define v1 (cond [(x0 . fx= . w-1)  0.0]
-                             [else  (flvector-ref vs (unsafe-fx+ i0 c))]))
-            (fl-convex-combination v0 v1 (- scaled-x floor-scaled-x))]))))
-
-(: flomap-scale*-y/linear (flomap Float Exact-Nonnegative-Integer -> flomap))
-(define (flomap-scale*-y/linear fm s new-h)
-  (match-define (flomap vs c w h) fm)
-  (define h-1 (unsafe-fx+ h -1))
-  (define cw (* c w))
-  (inline-build-flomap
-   c w new-h
-   (λ (k x new-y _i)
-     (define scaled-y (- (/ (+ (fx->fl new-y) 0.5) s) 0.5))
-     (define floor-scaled-y (floor scaled-y))
-     (define y0 (fl->fx floor-scaled-y))
-     (cond [(or (y0 . fx< . -1) (y0 . fx>= . h))  0.0]
-           [else
-            (define i0 (coords->index c w k x y0))
-            (define v0 (cond [(y0 . fx= . -1)  0.0]
-                             [else  (flvector-ref vs i0)]))
-            (define v1 (cond [(y0 . fx= . h-1)  0.0]
-                             [else  (flvector-ref vs (unsafe-fx+ i0 cw))]))
-            (fl-convex-combination v0 v1 (- scaled-y floor-scaled-y))]))))
diff --git a/pkgs/images-pkgs/images-lib/images/private/flomap-stats.rkt b/pkgs/images-pkgs/images-lib/images/private/flomap-stats.rkt
deleted file mode 100644
index e29b2a5d08..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flomap-stats.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match
-         "flonum.rkt"
-         "flomap-struct.rkt")
-
-(provide flomap-min-value flomap-max-value flomap-extreme-values
-         flomap-nonzero-rect)
-
-(: flomap-min-value (flomap -> Float))
-(define (flomap-min-value fm)
-  (for/fold ([v-min +inf.0]) ([v  (in-flvector (flomap-values fm))])
-    (min v-min v)))
-
-(: flomap-max-value (flomap -> Float))
-(define (flomap-max-value fm)
-  (for/fold ([v-max -inf.0]) ([v  (in-flvector (flomap-values fm))])
-    (max v-max v)))
-
-(: flomap-extreme-values (flomap -> (values Float Float)))
-(define (flomap-extreme-values fm)
-  (for/fold: ([v-min : Float  +inf.0]
-              [v-max : Float  -inf.0]
-              ) ([v : Float  (in-flvector (flomap-values fm))])
-    (values (min v-min v) (max v-max v))))
-
-(: flomap-nonzero-rect (flomap -> (values Nonnegative-Fixnum Nonnegative-Fixnum
-                                          Nonnegative-Fixnum Nonnegative-Fixnum)))
-(define (flomap-nonzero-rect fm)
-  (match-define (flomap vs c w h) fm)
-  (with-asserts ([c  nonnegative-fixnum?] [w  nonnegative-fixnum?] [h  nonnegative-fixnum?])
-    (define: x-min : Nonnegative-Fixnum  w)
-    (define: y-min : Nonnegative-Fixnum  h)
-    (define: x-max : Nonnegative-Fixnum  0)
-    (define: y-max : Nonnegative-Fixnum  0)
-    (let: y-loop : Void ([y : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  0])
-      (when (y . fx< . h)
-        (let: x-loop : Void ([x : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  i])
-          (cond [(x . fx< . w)
-                 (let: k-loop : Void ([k : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  i])
-                   (cond [(k . fx< . c)  (define v (flvector-ref vs i))
-                                         (when (not (v . = . 0.0))
-                                           (set! x-min (fxmin x-min x))
-                                           (set! y-min (fxmin y-min y))
-                                           (set! x-max (fxmax x-max (fx+ 1 x)))
-                                           (set! y-max (fxmax y-max (fx+ 1 y))))
-                                         (k-loop (fx+ k 1) (fx+ i 1))]
-                         [else  (x-loop (fx+ x 1) i)]))]
-                [else  (y-loop (fx+ y 1) i)]))))
-    (values x-min y-min x-max y-max)))
diff --git a/pkgs/images-pkgs/images-lib/images/private/flomap-struct.rkt b/pkgs/images-pkgs/images-lib/images/private/flomap-struct.rkt
deleted file mode 100644
index ee8e28354a..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flomap-struct.rkt
+++ /dev/null
@@ -1,269 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match
-         (only-in racket/unsafe/ops
-                  unsafe-flvector-ref unsafe-flvector-set!
-                  unsafe-fx+)
-         racket/performance-hint
-         "flonum.rkt")
-
-(provide flomap flomap? flomap-values flomap-components flomap-width flomap-height
-         ;; Accessors
-         flomap-size coords->index
-         unsafe-flomap-ref flomap-ref flomap-bilinear-ref
-         unsafe-flomap-ref* flomap-ref* flomap-bilinear-ref*
-         ;; Basic constructors
-         make-flomap build-flomap inline-build-flomap
-         make-flomap* build-flomap* inline-build-flomap*
-         flomap-ref-component flomap-take-components flomap-drop-components flomap-append-components)
-
-(struct: flomap ([values : FlVector] [components : Integer] [width : Integer] [height : Integer])
-  #:transparent
-  #:guard
-  (λ (vs c w h name)
-    (with-asserts ([c  nonnegative-fixnum?] [w  nonnegative-fixnum?] [h  nonnegative-fixnum?])
-      (unless (= (flvector-length vs) (* c w h))
-        (error 'flomap "expected flvector of length ~e; given one of length ~e"
-               (* c w h) (flvector-length vs)))
-      (values vs c w h))))
-
-(begin-encourage-inline
-
-  (: flomap-size (flomap -> (values Nonnegative-Fixnum Nonnegative-Fixnum)))
-  (define (flomap-size fm)
-    (match-define (flomap _vs _c w h) fm)
-    (with-asserts ([w  nonnegative-fixnum?] [h  nonnegative-fixnum?])
-      (values w h)))
-  
-  (: coords->index (Integer Integer Integer Integer Integer -> Fixnum))
-  (define (coords->index c w k x y)
-    (fx+ k (fx* c (fx+ x (fx* y w)))))
-  
-  (: unsafe-flomap-ref (FlVector Integer Integer Integer Integer Integer Integer -> Float))
-  (define (unsafe-flomap-ref vs c w h k x y)
-    (cond [(and (x . fx>= . 0) (x . fx< . w)
-                (y . fx>= . 0) (y . fx< . h))
-           (unsafe-flvector-ref vs (coords->index c w k x y))]
-          [else  0.0]))
-  
-  (: unsafe-flomap-ref* (FlVector Integer Integer Integer Integer Integer -> FlVector))
-  (define (unsafe-flomap-ref* vs c w h x y)
-    (cond [(and (x . fx>= . 0) (x . fx< . w)
-                (y . fx>= . 0) (y . fx< . h))
-           (define i (coords->index c w 0 x y))
-           (define point-vs (make-flvector c))
-           (let: loop : Void ([k : Nonnegative-Fixnum  0])
-             (when (k . < . c)
-               (unsafe-flvector-set! point-vs k (unsafe-flvector-ref vs (unsafe-fx+ i k)))
-               (loop (unsafe-fx+ k 1))))
-           point-vs]
-          [else  (make-flvector c 0.0)]))
-  
-  (: flomap-ref (flomap Integer Integer Integer -> Float))
-  (define (flomap-ref fm k x y)
-    (match-define (flomap vs c w h) fm)
-    (unless (and (k . >= . 0) (k . < . c))
-      (raise-type-error 'flomap-ref (format "nonnegative fixnum < ~e" c) k))
-    (unsafe-flomap-ref vs c w h k x y))
-  
-  (: flomap-ref* (flomap Integer Integer -> FlVector))
-  (define (flomap-ref* fm x y)
-    (match-define (flomap vs c w h) fm)
-    (unsafe-flomap-ref* vs c w h x y))
-  
-  ) ; begin-encourage-inline
-
-(: flomap-bilinear-ref (flomap Integer Real Real -> Float))
-(define (flomap-bilinear-ref fm k x y)
-  (match-define (flomap vs c w h) fm)
-  (cond [(and (k . >= . 0) (k . < . c))
-         (let ([x  (- (real->double-flonum x) 0.5)]
-               [y  (- (real->double-flonum y) 0.5)])
-           (cond [(and (x . > . -1.0) (x . < . (->fl w))
-                       (y . > . -1.0) (y . < . (->fl h)))
-                  (define floor-x (floor x))
-                  (define floor-y (floor y))
-                  (define x0 (fl->fx floor-x))
-                  (define y0 (fl->fx floor-y))
-                  (define x1 (unsafe-fx+ x0 1))
-                  (define y1 (unsafe-fx+ y0 1))
-                  (define v00 (unsafe-flomap-ref vs c w h k x0 y0))
-                  (define v10 (unsafe-flomap-ref vs c w h k x1 y0))
-                  (define v01 (unsafe-flomap-ref vs c w h k x0 y1))
-                  (define v11 (unsafe-flomap-ref vs c w h k x1 y1))
-                  (define xα (- x floor-x))
-                  (fl-convex-combination (fl-convex-combination v00 v10 xα)
-                                         (fl-convex-combination v01 v11 xα)
-                                         (- y floor-y))]
-                 [else  0.0]))]
-        [else
-         (raise-type-error 'flomap-bilinear-ref (format "nonnegative fixnum < ~e" c) 1 fm k x y)]))
-
-(: flomap-bilinear-ref* (flomap Real Real -> FlVector))
-(define (flomap-bilinear-ref* fm x y)
-  (match-define (flomap vs c w h) fm)
-  (let ([x  (- (real->double-flonum x) 0.5)]
-        [y  (- (real->double-flonum y) 0.5)])
-    (cond [(and (x . > . -1.0) (x . < . (->fl w))
-                (y . > . -1.0) (y . < . (->fl h)))
-           (define floor-x (floor x))
-           (define floor-y (floor y))
-           (define x0 (fl->fx floor-x))
-           (define y0 (fl->fx floor-y))
-           (define x1 (unsafe-fx+ x0 1))
-           (define y1 (unsafe-fx+ y0 1))
-           (define vs00 (unsafe-flomap-ref* vs c w h x0 y0))
-           (define vs10 (unsafe-flomap-ref* vs c w h x1 y0))
-           (define vs01 (unsafe-flomap-ref* vs c w h x0 y1))
-           (define vs11 (unsafe-flomap-ref* vs c w h x1 y1))
-           (define xα (- x floor-x))
-           (define yα (- y floor-y))
-           (define point-vs (make-flvector c))
-           (let: loop : FlVector ([k : Nonnegative-Fixnum  0])
-             (cond [(k . < . c)
-                    (define v00 (unsafe-flvector-ref vs00 k))
-                    (define v10 (unsafe-flvector-ref vs10 k))
-                    (define v01 (unsafe-flvector-ref vs01 k))
-                    (define v11 (unsafe-flvector-ref vs11 k))
-                    (define v (fl-convex-combination (fl-convex-combination v00 v10 xα)
-                                                     (fl-convex-combination v01 v11 xα)
-                                                     yα))
-                    (unsafe-flvector-set! point-vs k v)
-                    (loop (unsafe-fx+ k 1))]
-                   [else  point-vs]))]
-          [else  (make-flvector c 0.0)])))
-
-;; ===================================================================================================
-;; Construction and conversion
-
-(: make-flomap (case-> (Integer Integer Integer -> flomap)
-                       (Integer Integer Integer Real -> flomap)))
-(define make-flomap
-  (case-lambda
-    [(c w h)    (flomap (make-flvector (* c w h)) c w h)]
-    [(c w h v)  (flomap (make-flvector (* c w h) (real->double-flonum v)) c w h)]))
-
-#;
-(: inline-build-flomap (Integer Integer Integer
-                                (Nonnegative-Fixnum Nonnegative-Fixnum Nonnegative-Fixnum
-                                                    Nonnegative-Fixnum -> Float)
-                                -> flomap))
-(define-syntax-rule (inline-build-flomap components width height f)
-  (let: ([c : Integer  components]
-         [w : Integer  width]
-         [h : Integer  height])
-    (with-asserts ([c  nonnegative-fixnum?] [w  nonnegative-fixnum?] [h  nonnegative-fixnum?])
-      (define fm (make-flomap c w h))
-      (define vs (flomap-values fm))
-      (let: y-loop : flomap ([y : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  0])
-        (cond
-          [(y . fx< . h)
-           (let: x-loop : flomap ([x : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  i])
-             (cond
-               [(x . fx< . w)
-                (let: k-loop : flomap ([k : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  i])
-                  (cond
-                    [(k . fx< . c)  (unsafe-flvector-set! vs i (f k x y i))
-                                    (k-loop (unsafe-fx+ k 1) (unsafe-fx+ i 1))]
-                    [else  (x-loop (unsafe-fx+ x 1) i)]))]
-               [else  (y-loop (unsafe-fx+ y 1) i)]))]
-          [else  fm])))))
-
-(: build-flomap (Integer Integer Integer
-                         (Nonnegative-Fixnum Nonnegative-Fixnum Nonnegative-Fixnum -> Real)
-                         -> flomap))
-(define (build-flomap c w h f)
-  (inline-build-flomap c w h (λ (k x y i) (real->double-flonum (f k x y)))))
-
-#;
-(: inline-build-flomap* (Integer Integer Integer
-                                 (Nonnegative-Fixnum Nonnegative-Fixnum Nonnegative-Fixnum
-                                                     -> FlVector)
-                                 -> flomap))
-(define-syntax-rule (inline-build-flomap* components width height f)
-  (let: ([c : Integer  components]
-         [w : Integer  width]
-         [h : Integer  height])
-    (with-asserts ([c  nonnegative-fixnum?] [w  nonnegative-fixnum?] [h  nonnegative-fixnum?])
-      (define fm (make-flomap c w h))
-      (define vs (flomap-values fm))
-      (let: y-loop : flomap ([y : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  0])
-        (cond
-          [(y . fx< . h)
-           (let: x-loop : flomap ([x : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  i])
-             (cond
-               [(x . fx< . w)
-                (define: point-vs : FlVector  (f x y i))
-                (cond
-                  [(fx= (flvector-length point-vs) c)
-                   (let: k-loop : flomap ([k : Nonnegative-Fixnum  0] [i : Nonnegative-Fixnum  i])
-                     (cond
-                       [(k . fx< . c)  (unsafe-flvector-set! vs i (unsafe-flvector-ref point-vs k))
-                                       (k-loop (unsafe-fx+ k 1) (unsafe-fx+ i 1))]
-                       [else  (x-loop (unsafe-fx+ x 1) i)]))]
-                  [else  (raise-type-error 'inline-build-flomap* (format "length-~e FlVector" c)
-                                           point-vs)])]
-               [else  (y-loop (unsafe-fx+ y 1) i)]))]
-          [else  fm])))))
-
-(: make-flomap* (Integer Integer (U (Vectorof Real) FlVector) -> flomap))
-(define (make-flomap* w h vs)
-  (let ([vs  (->flvector vs)])
-    (define c (flvector-length vs))
-    (inline-build-flomap* c w h (λ (_x _y _i) vs))))
-
-(: build-flomap* (Integer Integer Integer
-                          (Nonnegative-Fixnum Nonnegative-Fixnum -> (U (Vectorof Real) FlVector))
-                          -> flomap))
-(define (build-flomap* c w h f)
-  (inline-build-flomap*
-   c w h
-   (λ (x y i)
-     (define point-vs0 (f x y))
-     (define point-vs1 (->flvector point-vs0))
-     (cond [(fx= (flvector-length point-vs1) c)  point-vs1]
-           [else  (raise-type-error 'build-flomap* (format "length-~e Vector or FlVector" c)
-                                    point-vs0)]))))
-
-(: flomap-ref-component (flomap Integer -> flomap))
-(define (flomap-ref-component fm k)
-  (match-define (flomap vs c w h) fm)
-  (unless (and (k . >= . 0) (k . < . c))
-    (raise-type-error 'flomap-ref-components (format "nonnegative fixnum < ~e" c) k))
-  (inline-build-flomap 1 w h (λ (_k x y _i) (unsafe-flvector-ref vs (coords->index c w k x y)))))
-
-(: flomap-take-components (flomap Integer -> flomap))
-(define (flomap-take-components fm c)
-  (match-define (flomap vs old-c w h) fm)
-  (unless (and (c . >= . 0) (c . <= . old-c))
-    (raise-type-error 'flomap-take-components (format "nonnegative fixnum <= ~e" old-c) c))
-  (inline-build-flomap c w h (λ (k x y _i) (unsafe-flvector-ref vs (coords->index old-c w k x y)))))
-
-(: flomap-drop-components (flomap Integer -> flomap))
-(define (flomap-drop-components fm c)
-  (match-define (flomap vs old-c w h) fm)
-  (unless (and (c . >= . 0) (c . <= . old-c))
-    (raise-type-error 'flomap-drop-components (format "nonnegative fixnum <= ~e" old-c) c))
-  (define new-c (fx- old-c c))
-  (with-asserts
-   ([new-c  nonnegative-fixnum?])
-   (inline-build-flomap new-c w h (λ (k x y _i)
-                                    (unsafe-flvector-ref vs (coords->index old-c w (fx+ k c) x y))))))
-
-(: flomap-append-components2 (flomap flomap -> flomap))
-(define (flomap-append-components2 fm1 fm2)
-  (match-define (flomap vs1 d1 w1 h1) fm1)
-  (match-define (flomap vs2 d2 w2 h2) fm2)
-  (unless (and (= w1 w2) (= h1 h2))
-    (error 'flomap-append-components "expected same-size flomaps; given sizes ~e×~e and ~e×~e"
-           w1 h1 w2 h2))
-  (inline-build-flomap (fx+ d1 d2) w1 h1
-                       (λ (k x y _i)
-                         (define k2 (fx- k d1))
-                         (cond [(k2 . fx< . 0)  (unsafe-flvector-ref vs1 (coords->index d1 w1 k x y))]
-                               [else  (unsafe-flvector-ref vs2 (coords->index d2 w2 k2 x y))]))))
-
-(: flomap-append-components (flomap flomap * -> flomap))
-(define (flomap-append-components fm . fms)
-  (for/fold ([fm1 fm]) ([fm2  (in-list fms)])
-    (flomap-append-components2 fm1 fm2)))
diff --git a/pkgs/images-pkgs/images-lib/images/private/flomap-transform.rkt b/pkgs/images-pkgs/images-lib/images/private/flomap-transform.rkt
deleted file mode 100644
index 2465026237..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flomap-transform.rkt
+++ /dev/null
@@ -1,346 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match racket/math racket/bool
-         (only-in racket/unsafe/ops
-                  unsafe-flvector-ref
-                  unsafe-fx+ unsafe-fx-)
-         "flonum.rkt"
-         "flomap-struct.rkt")
-
-(provide flomap-flip-horizontal flomap-flip-vertical flomap-transpose
-         flomap-cw-rotate flomap-ccw-rotate flomap-rotate
-         flomap-2d-mapping flomap-2d-mapping-fun flomap-2d-mapping-inv
-         flomap-2d-mapping-bounded-by make-flomap-2d-mapping
-         Flomap-Transform
-         flomap-transform flomap-transform-bounds
-         flomap-id-transform flomap-rotate-transform flomap-scale-transform flomap-whirl-transform
-         flomap-transform-compose
-         perspective-projection linear-projection orthographic-projection
-         equal-area-projection stereographic-projection flomap-projection-transform
-         flomap-fisheye-transform
-         Projection (struct-out projection-mapping))
-
-;; ===================================================================================================
-;; Basic transformations
-
-(: flomap-flip-horizontal (flomap -> flomap))
-(define (flomap-flip-horizontal fm)
-  (match-define (flomap vs c w h) fm)
-  (define w-1 (fx- w 1))
-  (inline-build-flomap c w h (λ (k x y _i)
-                               (unsafe-flvector-ref vs (coords->index c w k (unsafe-fx- w-1 x) y)))))
-
-(define (flomap-flip-vertical fm)
-  (match-define (flomap vs c w h) fm)
-  (define h-1 (fx- h 1))
-  (inline-build-flomap c w h (λ (k x y _i)
-                               (unsafe-flvector-ref vs (coords->index c w k x (unsafe-fx- h-1 y))))))
-
-(define (flomap-transpose fm)
-  (match-define (flomap vs c w h) fm)
-  (inline-build-flomap c h w (λ (k x y _i)
-                               (unsafe-flvector-ref vs (coords->index c w k y x)))))
-
-(define (flomap-cw-rotate fm)
-  (match-define (flomap vs c w h) fm)
-  (define w-1 (fx- w 1))
-  (inline-build-flomap c h w (λ (k x y _i)
-                               (unsafe-flvector-ref vs (coords->index c w k (unsafe-fx- w-1 y) x)))))
-
-(define (flomap-ccw-rotate fm)
-  (match-define (flomap vs c w h) fm)
-  (define h-1 (fx- h 1))
-  (inline-build-flomap c h w (λ (k x y _i)
-                               (unsafe-flvector-ref vs (coords->index c w k y (unsafe-fx- h-1 x))))))
-
-(: flomap-rotate (flomap Real -> flomap))
-(define (flomap-rotate fm θ)
-  (flomap-transform fm (flomap-rotate-transform θ)))
-
-;; ===================================================================================================
-;; Data types
-
-(struct: flomap-2d-mapping ([fun : (Float Float -> (values Float Float))]
-                            [inv : (Float Float -> (values Float Float))]
-                            [bounded-by : (U 'id 'corners 'edges 'all)])
-  #:transparent)
-
-(: 2d-mapping-real->double-flonum ((Float Float -> (values Real Real))
-                                   -> (Float Float -> (values Float Float))))
-(define ((2d-mapping-real->double-flonum f) x y)
-  (let-values ([(x y)  (f x y)])
-    (values (real->double-flonum x) (real->double-flonum y))))
-
-(: make-flomap-2d-mapping (case-> ((Float Float -> (values Real Real))
-                                   (Float Float -> (values Real Real))
-                                   -> flomap-2d-mapping)
-                                  ((Float Float -> (values Real Real))
-                                   (Float Float -> (values Real Real))
-                                   (U 'id 'corners 'edges 'all) -> flomap-2d-mapping)))
-(define make-flomap-2d-mapping
-  (case-lambda
-    [(fun inv)  (make-flomap-2d-mapping fun inv 'edges)]
-    [(fun inv bounded-by)  (flomap-2d-mapping (2d-mapping-real->double-flonum fun)
-                                              (2d-mapping-real->double-flonum inv)
-                                              bounded-by)]))
-
-(define-type Flomap-Transform (Integer Integer -> flomap-2d-mapping))
-
-;; ===================================================================================================
-;; Transformations
-
-(: flomap-transform-bounds (Flomap-Transform Integer Integer
-                                               -> (values Integer Integer Integer Integer)))
-(define (flomap-transform-bounds t w h)
-  (match-define (flomap-2d-mapping fun _ bounded-by) (t w h))
-  
-  (: maybe-expand (Integer Integer Float Float Float Float -> (values Float Float Float Float)))
-  (define (maybe-expand x y x-min y-min x-max y-max)
-    ;; transform the coordinate, possibly update the mins and maxes
-    (define-values (new-x new-y) (fun (->fl x) (->fl y)))
-    (values (if (new-x . < . x-min) new-x x-min)
-            (if (new-y . < . y-min) new-y y-min)
-            (if (new-x . > . x-max) new-x x-max)
-            (if (new-y . > . y-max) new-y y-max)))
-  
-  (define-values (x-min y-min x-max y-max)
-    (case bounded-by
-      [(id)  (values 0 0 w h)]
-      [(corners)
-       (for*/fold: ([x-min : Float  +inf.0]
-                    [y-min : Float  +inf.0]
-                    [x-max : Float  -inf.0]
-                    [y-max : Float  -inf.0]
-                    ) ([y : Integer  (list 0 h)]
-                       [x : Integer  (list 0 w)])
-         (maybe-expand x y x-min y-min x-max y-max))]
-      [(edges)
-       (define-values (x-min1 y-min1 x-max1 y-max1)
-         (for*/fold: ([x-min : Float  +inf.0]
-                      [y-min : Float  +inf.0]
-                      [x-max : Float  -inf.0]
-                      [y-max : Float  -inf.0]
-                      ) ([y : Integer  (in-range (fx+ h 1))]
-                         [x : Integer  (list 0 w)])
-           (maybe-expand x y x-min y-min x-max y-max)))
-       (define-values (x-min2 y-min2 x-max2 y-max2)
-         (for*/fold: ([x-min : Float  +inf.0]
-                      [y-min : Float  +inf.0]
-                      [x-max : Float  -inf.0]
-                      [y-max : Float  -inf.0]
-                      ) ([y : Integer  (list 0 h)]
-                         [x : Integer  (in-range (fx+ w 1))])
-           (maybe-expand x y x-min y-min x-max y-max)))
-       (values (min x-min1 x-min2) (min y-min1 y-min2)
-               (max x-max1 x-max2) (max y-max1 y-max2))]
-      [(all)
-       ;; these will be mutated within the loop (instead of accumulating them, which is annoying)
-       (define-values (x-min y-min x-max y-max) (values +inf.0 +inf.0 -inf.0 -inf.0))
-       ;; for each point...
-       (let: y-loop : Void ([y : Nonnegative-Fixnum  0])
-         (when (y . fx<= . h)
-           (let: x-loop : Void ([x : Nonnegative-Fixnum  0])
-             (cond [(x . fx<= . w)
-                    ;; transform the coordinate, possibly set the mins and maxes
-                    (define-values (new-x new-y) (fun (->fl x) (->fl y)))
-                    (when (new-x . < . x-min) (set! x-min new-x))
-                    (when (new-x . > . x-max) (set! x-max new-x))
-                    (when (new-y . < . y-min) (set! y-min new-y))
-                    (when (new-y . > . y-max) (set! y-max new-y))
-                    (x-loop (unsafe-fx+ x 1))]
-                   [else
-                    (y-loop (unsafe-fx+ y 1))]))))
-       (values x-min y-min x-max y-max)]))
-  ;; return integer bounds
-  (cond [(and (rational? x-min) (rational? y-min) (rational? x-max) (rational? y-max))
-         (values (round (inexact->exact x-min))
-                 (round (inexact->exact y-min))
-                 (round (inexact->exact x-max))
-                 (round (inexact->exact y-max)))]
-        [else  (values 0 0 0 0)]))
-
-(: flomap-transform-compose (Flomap-Transform Flomap-Transform -> Flomap-Transform))
-(define ((flomap-transform-compose t2 t1) w0 h0)
-  (match-define (flomap-2d-mapping fun1 inv1 bounded-by1) (t1 w0 h0))
-  (define-values (x-start y-start x-end y-end) (flomap-transform-bounds t1 w0 h0))
-  (define w1 (- x-end x-start))
-  (define h1 (- y-end y-start))
-  (match-define (flomap-2d-mapping fun2 inv2 bounded-by2) (t2 w1 h1))
-  (flomap-2d-mapping
-   (λ (x y)
-     (let-values ([(x y)  (fun1 x y)])
-       (fun2 (- x x-start) (- y y-start))))
-   (λ (x y)
-     (let-values ([(x y)  (inv2 x y)])
-       (inv1 (+ x x-start) (+ y y-start))))
-   (cond [(or (symbol=? bounded-by1 'all) (symbol=? bounded-by2 'all))  'all]
-         [(or (symbol=? bounded-by1 'edges) (symbol=? bounded-by2 'edges))  'edges]
-         [(or (symbol=? bounded-by1 'corners) (symbol=? bounded-by2 'corners))  'corners]
-         [(or (symbol=? bounded-by1 'id) (symbol=? bounded-by2 'id))  'id])))
-
-(: flomap-transform (case-> (flomap Flomap-Transform -> flomap)
-                            (flomap Flomap-Transform Integer Integer Integer Integer -> flomap)))
-(define flomap-transform
-  (case-lambda
-    [(fm t)  (match-define (flomap _vs _c w h) fm)
-             (define-values (x-start y-start x-end y-end)
-               (flomap-transform-bounds t w h))
-             (flomap-transform fm t x-start y-start x-end y-end)]
-    [(fm t x-start y-start x-end y-end)
-     (match-define (flomap _ c w h) fm)
-     (match-define (flomap-2d-mapping _ inv _) (t w h))  ; only need the inverse mapping
-     (define new-w (- x-end x-start))
-     (define new-h (- y-end y-start))
-     (define x-offset (+ 0.5 x-start))
-     (define y-offset (+ 0.5 y-start))
-     (inline-build-flomap*
-      c new-w new-h
-      (λ (x y _i)
-        (define-values (old-x old-y) (inv (+ (fx->fl x) x-offset)
-                                          (+ (fx->fl y) y-offset)))
-        (flomap-bilinear-ref* fm old-x old-y)))]))
-
-(: flomap-id-transform Flomap-Transform)
-(define (flomap-id-transform w h)
-  (flomap-2d-mapping (λ (x y) (values x y)) (λ (x y) (values x y)) 'id))
-
-(: flomap-scale-transform (case-> (Real -> Flomap-Transform)
-                                  (Real Real -> Flomap-Transform)))
-(define flomap-scale-transform
-  (case-lambda
-    [(x-scale)  (flomap-scale-transform x-scale x-scale)]
-    [(x-scale y-scale)
-     (let ([x-scale  (real->double-flonum x-scale)]
-           [y-scale  (real->double-flonum y-scale)])
-       (λ (w h)
-         (flomap-2d-mapping (λ (x y) (values (* x x-scale) (* y y-scale)))
-                            (λ (x y) (values (/ x x-scale) (/ y y-scale)))
-                            'corners)))]))
-
-(: flomap-rotate-transform (Real -> Flomap-Transform))
-(define ((flomap-rotate-transform θ) w h)
-  (let ([θ  (- (real->double-flonum θ))])
-    (define cos-θ (cos θ))
-    (define sin-θ (sin θ))
-    (define x-mid (* 0.5 (->fl w)))
-    (define y-mid (* 0.5 (->fl h)))
-    (flomap-2d-mapping
-     (λ: ([x : Float] [y : Float])
-       (let ([x  (- x x-mid)]
-             [y  (- y y-mid)])
-         (values (+ x-mid (- (* x cos-θ) (* y sin-θ)))
-                 (+ y-mid (+ (* x sin-θ) (* y cos-θ))))))
-     (λ: ([x : Float] [y : Float])
-       (let ([x  (- x x-mid)]
-             [y  (- y y-mid)])
-         (values (+ x-mid (+ (* x cos-θ) (* y sin-θ)))
-                 (+ y-mid (- (* y cos-θ) (* x sin-θ))))))
-     'corners)))
-
-(: whirl-function (Real Integer Integer -> (Float Float -> (values Float Float))))
-(define (whirl-function θ w h)
-  (let ([θ  (real->double-flonum θ)])
-    (define x-mid (* 0.5 (->fl w)))
-    (define y-mid (* 0.5 (->fl h)))
-    (define-values (x-scale y-scale)
-      (cond [(x-mid . < . y-mid)  (values (/ y-mid x-mid) 1.0)]
-            [(x-mid . > . y-mid)  (values 1.0 (/ x-mid y-mid))]
-            [else  (values 1.0 1.0)]))
-    (define fm-radius (* 0.5 (->fl (max w h))))
-    (define fm-radius^2 (sqr fm-radius))
-    (define x-max (->fl w))
-    (define y-max (->fl h))
-    (λ: ([x : Float] [y : Float])
-      (define dx (* (- x x-mid) x-scale))
-      (define dy (* (- y y-mid) y-scale))
-      (define r^2 (+ (sqr dx) (sqr dy)))
-      (cond [(r^2 . < . fm-radius^2)
-             (define r (flsqrt (/ r^2 fm-radius^2)))
-             (define ang (* θ (sqr (- 1.0 r))))
-             (define cos-a (cos ang))
-             (define sin-a (sin ang))
-             (define old-x (+ (/ (- (* dx cos-a) (* dy sin-a)) x-scale) x-mid))
-             (define old-y (+ (/ (+ (* dx sin-a) (* dy cos-a)) y-scale) y-mid))
-             (values (max 0.0 (min x-max old-x))
-                     (max 0.0 (min y-max old-y)))]
-            [else
-             (values x y)]))))
-
-(: flomap-whirl-transform (Real -> Flomap-Transform))
-(define ((flomap-whirl-transform θ) w h)
-  (flomap-2d-mapping (whirl-function (- θ) w h) (whirl-function θ w h) 'id))
-
-;; ===================================================================================================
-;; Projection transforms
-
-(struct: projection-mapping ([fun : (Float -> Float)]
-                             [inv : (Float -> Float)]))
-
-(define-type Projection (Float -> projection-mapping))
-
-(: perspective-projection (Real -> Projection))
-(define ((perspective-projection α) d)
-  (define f (/ d 2.0 (tan (* 0.5 (real->double-flonum α)))))
-  (projection-mapping (λ (ρ) (* (tan ρ) f))
-                      (λ (r) (atan (/ r f)))))
-
-(: linear-projection (Real -> Projection))
-(define ((linear-projection α) d)
-  (define f (/ d (real->double-flonum α)))
-  (projection-mapping (λ (ρ) (* ρ f))
-                      (λ (r) (/ r f))))
-
-(: orthographic-projection (Real -> Projection))
-(define ((orthographic-projection α) d)
-  (define f (/ d 2.0 (sin (* 0.5 (real->double-flonum α)))))
-  (projection-mapping (λ (ρ) (* (sin ρ) f))
-                      (λ (r) (asin (/ r f)))))
-
-(: equal-area-projection (Real -> Projection))
-(define ((equal-area-projection α) d)
-  (define f (/ d 4.0 (sin (* 0.25 (real->double-flonum α)))))
-  (projection-mapping (λ (ρ) (* 2.0 (sin (* 0.5 ρ)) f))
-                      (λ (r) (* 2.0 (asin (/ r 2.0 f))))))
-
-(: stereographic-projection (Real -> Projection))
-(define ((stereographic-projection α) d)
-  (define f (/ d 4.0 (tan (* 0.25 (real->double-flonum α)))))
-  (projection-mapping (λ (ρ) (* 2.0 (tan (* 0.5 ρ)) f))
-                      (λ (r) (* 2.0 (atan (/ r 2.0 f))))))
-
-(: reproject (Projection Projection Boolean Integer Integer -> (Float Float -> (values Float Float))))
-(define (reproject to-proj from-proj crop? w h)
-  (define x-max (->fl w))
-  (define y-max (->fl h))
-  (define x-mid (* 0.5 x-max))
-  (define y-mid (* 0.5 y-max))
-  (define d (* 2.0 (flsqrt (+ (sqr x-mid) (sqr y-mid)))))
-  (match-define (projection-mapping _ inv) (from-proj d))
-  (match-define (projection-mapping fun _) (to-proj d))
-  (λ: ([x : Float] [y : Float])
-    (define dx (- x x-mid))
-    (define dy (- y y-mid))
-    (define θ (atan dy dx))
-    (define r (flsqrt (+ (sqr dx) (sqr dy))))
-    (define new-r (fun (inv r)))
-    (define new-x (+ x-mid (* (cos θ) new-r)))
-    (define new-y (+ y-mid (* (sin θ) new-r)))
-    (cond [crop?  (values (if (or (new-x . < . 0.0) (new-x . > . x-max)) +nan.0 new-x)
-                          (if (or (new-y . < . 0.0) (new-y . > . y-max)) +nan.0 new-y))]
-          [else   (values new-x new-y)])))
-
-(: flomap-projection-transform (case-> (Projection Projection -> Flomap-Transform)
-                                       (Projection Projection Boolean -> Flomap-Transform)))
-(define flomap-projection-transform
-  (case-lambda
-    [(to-proj from-proj)  (flomap-projection-transform to-proj from-proj #t)]
-    [(to-proj from-proj crop?)
-     (λ (w h) (flomap-2d-mapping (reproject to-proj from-proj crop? w h)
-                                 (reproject from-proj to-proj crop? w h)
-                                 'edges))]))
-
-(: flomap-fisheye-transform (Real -> Flomap-Transform))
-(define (flomap-fisheye-transform α)
-  (flomap-projection-transform (equal-area-projection α)
-                               (perspective-projection α)
-                               #f))
diff --git a/pkgs/images-pkgs/images-lib/images/private/flomap.rkt b/pkgs/images-pkgs/images-lib/images/private/flomap.rkt
deleted file mode 100644
index 142dd0ce87..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flomap.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang typed/racket/base
-
-(require "flomap-struct.rkt"
-         "flomap-stats.rkt"
-         "flomap-pointwise.rkt"
-         "flomap-transform.rkt"
-         "flomap-gradient.rkt"
-         "flomap-effects.rkt"
-         "flomap-blur.rkt"
-         "flomap-composite.rkt"
-         "flomap-resize.rkt")
-
-;; This is a copy of the definition in typed/mred/mred
-;; but requiring that produces an error when building
-;; the docs
-(define-type Bitmap%
-  (Class [get-width (-> Integer)]
-         [get-height (-> Integer)]
-         [get-argb-pixels
-          (case-> 
-           (Integer Integer Integer Integer Bytes [#:unscaled? Boolean]
-                    -> Void)
-           (Integer Integer Integer Integer Bytes Boolean [#:unscaled? Boolean]
-                    -> Void)
-           (Integer Integer Integer Integer Bytes Boolean Boolean [#:unscaled? Boolean]
-                    -> Void))]))
-
-(require/typed
- "flomap-convert.rkt"
- [bitmap->flomap  ((Instance Bitmap%) [#:unscaled? Any] -> flomap)]
- [flomap->bitmap  (flomap [#:backing-scale Positive-Real] -> (Instance Bitmap%))]
- [draw-flomap     ((Any -> Any) Integer Integer -> flomap)])
-
-(provide (all-from-out "flomap-struct.rkt"
-                       "flomap-stats.rkt"
-                       "flomap-pointwise.rkt"
-                       "flomap-transform.rkt"
-                       "flomap-gradient.rkt"
-                       "flomap-effects.rkt"
-                       "flomap-blur.rkt"
-                       "flomap-composite.rkt"
-                       "flomap-resize.rkt")
-         bitmap->flomap flomap->bitmap draw-flomap)
diff --git a/pkgs/images-pkgs/images-lib/images/private/flonum.rkt b/pkgs/images-pkgs/images-lib/images/private/flonum.rkt
deleted file mode 100644
index c08fef35c7..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/flonum.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang typed/racket/base
-
-(require (for-syntax typed/racket/base)
-         (rename-in racket/flonum
-                    [flvector-ref old:flvector-ref]
-                    [flvector-set! old:flvector-set!])
-         (except-in racket/fixnum fl->fx fx->fl)  ; these two functions are untyped
-         racket/math
-         (only-in racket/unsafe/ops
-                  unsafe-flvector-set! unsafe-flvector-ref
-                  unsafe-vector-set! unsafe-vector-ref
-                  unsafe-fx+)
-         racket/performance-hint)
-
-(provide (all-defined-out)
-         (except-out (all-from-out racket/flonum
-                                   racket/fixnum)
-                     old:flvector-ref
-                     old:flvector-set!))
-
-(define-predicate nonnegative-fixnum? Nonnegative-Fixnum)
-
-;; This looks stupid, but it avoids an optimization TR does that is actually a pessimization, by
-;; keeping it from recognizing flvector-ref
-(: flvector-ref (FlVector Integer -> Float))
-(define flvector-ref old:flvector-ref)
-
-;; Ditto above
-(: flvector-set! (FlVector Integer Float -> Void))
-(define flvector-set! old:flvector-set!)
-
-(define-syntax-rule (inline-build-flvector size f)
-  (let: ([n : Integer  size])
-    (with-asserts ([n  nonnegative-fixnum?])
-      (define vs (make-flvector n))
-      (let: loop : FlVector ([i : Nonnegative-Fixnum  0])
-        (cond [(i . fx< . n)  (unsafe-flvector-set! vs i (f i))
-                              (loop (unsafe-fx+ i 1))]
-              [else  vs])))))
-
-(: flvector->vector (FlVector -> (Vectorof Float)))
-(define (flvector->vector vs)
-  (define n (flvector-length vs))
-  (define new-vs (make-vector n 0.0))
-  (let: loop : (Vectorof Float) ([k : Nonnegative-Fixnum  0])
-    (cond [(k . < . n)  (unsafe-vector-set! new-vs k (unsafe-flvector-ref vs k))
-                        (loop (unsafe-fx+ k 1))]
-          [else  new-vs])))
-
-(: real-vector->flvector ((Vectorof Real) -> FlVector))
-(define (real-vector->flvector vs)
-  (define n (vector-length vs))
-  (define new-vs (make-flvector n 0.0))
-  (let: loop : FlVector ([k : Nonnegative-Fixnum  0])
-    (cond [(k . < . n)
-           (unsafe-flvector-set! new-vs k (real->double-flonum (unsafe-vector-ref vs k)))
-           (loop (unsafe-fx+ k 1))]
-          [else  new-vs])))
-
-(begin-encourage-inline
-  
-  (: ->flvector ((U (Vectorof Real) FlVector) -> FlVector))
-  (define (->flvector vs)
-    (cond [(flvector? vs)  vs]
-          [else  (real-vector->flvector vs)]))
-  
-  (: fx->fl (Fixnum -> Float))
-  (define fx->fl ->fl)
-  
-  (: fl->fx (Float -> Fixnum))
-  (define (fl->fx x)
-    (define i (fl->exact-integer x))
-    (with-asserts ([i fixnum?]) i))
-  
-  (: flrational? (Float -> Boolean))
-  (define (flrational? x)
-    ;; if x = +nan.0, both tests return #f
-    (and (x . > . -inf.0) (x . < . +inf.0)))
-  
-  (: fl-convex-combination (Float Float Float -> Float))
-  (define (fl-convex-combination dv sv sa)
-    (+ (* sv sa) (* dv (- 1.0 sa))))
-  
-  (: fl-alpha-blend (Float Float Float -> Float))
-  (define (fl-alpha-blend dca sca sa)
-    (+ sca (* dca (- 1.0 sa))))
-  
-  (: flgaussian (Float Float -> Float))
-  (define (flgaussian x s)
-    (define x/s (/ x s))
-    (/ (exp (* -0.5 (* x/s x/s)))
-       (* (sqrt (* 2.0 pi)) s)))
-  
-  (: flsigmoid (Float -> Float))
-  (define (flsigmoid x)
-    (/ 1.0 (+ 1.0 (exp (- x)))))
-  
-  ;; =================================================================================================
-  ;; 3-vectors
-  
-  (: fl3dot (Float Float Float Float Float Float -> Float))
-  (define (fl3dot x1 y1 z1 x2 y2 z2)
-    (+ (* x1 x2) (* y1 y2) (* z1 z2)))
-  
-  (: fl3* (case-> (Float Float Float Float -> (values Float Float Float))
-                  (Float Float Float Float Float Float -> (values Float Float Float))))
-  (define fl3*
-    (case-lambda
-      [(x y z c)  (values (* x c) (* y c) (* z c))]
-      [(x1 y1 z1 x2 y2 z2)  (values (* x1 x2) (* y1 y2) (* z1 z2))]))
-  
-  (: fl3+ (Float Float Float Float Float Float -> (values Float Float Float)))
-  (define (fl3+ x1 y1 z1 x2 y2 z2)
-    (values (+ x1 x2) (+ y1 y2) (+ z1 z2)))
-  
-  (: fl3- (case-> (Float Float Float -> (values Float Float Float))
-                  (Float Float Float Float Float Float -> (values Float Float Float))))
-  (define fl3-
-    (case-lambda
-      [(x y z)  (values (- x) (- y) (- z))]
-      [(x1 y1 z1 x2 y2 z2)  (values (- x1 x2) (- y1 y2) (- z1 z2))]))
-  
-  (: fl3mag^2 (Float Float Float -> Float))
-  (define (fl3mag^2 x y z)
-    (+ (* x x) (* y y) (* z z)))
-  
-  (: fl3mag (Float Float Float -> Float))
-  (define (fl3mag x y z)
-    (flsqrt (fl3mag^2 x y z)))
-  
-  (: fl3dist (Float Float Float Float Float Float -> Float))
-  (define (fl3dist x1 y1 z1 x2 y2 z2)
-    (fl3mag (- x1 x2) (- y1 y2) (- z1 z2)))
-  
-  (: fl3normalize (Float Float Float -> (values Float Float Float)))
-  (define (fl3normalize x y z)
-    (define d (fl3mag x y z))
-    (values (/ x d) (/ y d) (/ z d)))
-  
-  (: fl3-half-norm (Float Float Float Float Float Float -> (values Float Float Float)))
-  (define (fl3-half-norm x1 y1 z1 x2 y2 z2)
-    (fl3normalize (+ x1 x2) (+ y1 y2) (+ z1 z2)))
-  
-  ) ; begin-encourage-inline
diff --git a/pkgs/images-pkgs/images-lib/images/private/utils.rkt b/pkgs/images-pkgs/images-lib/images/private/utils.rkt
deleted file mode 100644
index fa0793b4b2..0000000000
--- a/pkgs/images-pkgs/images-lib/images/private/utils.rkt
+++ /dev/null
@@ -1,182 +0,0 @@
-#lang racket/base
-
-(require racket/draw racket/class racket/match racket/list ffi/unsafe
-         (for-syntax racket/base)
-         "flomap.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Caching flomaps with a hash table of weak box values
-
-(define num-callbacks 0)
-(define (get-num-callbacks) num-callbacks)
- 
-(define (register-gc-callback proc)
-  (register-finalizer (malloc 4) (λ (val)
-                                  (set! num-callbacks (+ 1 num-callbacks))
-                                  (printf "here~n")
-                                  (when (proc) (register-gc-callback proc)))))
-
-(define (weak-value-hash-clean! h)
-  (define ks (for*/list ([(k bx)  (in-hash h)]
-                         [val  (in-value (weak-box-value (car bx)))]
-                         #:when (not val))
-               k))
-  (for ([k  (in-list ks)]) (hash-remove! h k)))
-
-(define total-time-saved 0)
-(define total-time-spent 0)
-
-;; Can't simply wrap hash-ref! with weak-box-value and thnk with make-weak-box, because
-;; 1. If weak-box-value returns #f, we need to regenerate the value
-;; 2. We need to keep a handle to the generated value while it's being stored in the hash
-(define (weak-value-hash-ref! h k thnk)
-  (define (cache-ref!)
-    (define start (current-milliseconds))
-    (define val (thnk))
-    (define time (- (current-milliseconds) start))
-    (set! total-time-spent (+ total-time-spent time))
-    ;(printf "total-time-spent = ~v~n" total-time-spent)
-    (hash-set! h k (cons (make-weak-box val) time))
-    val)
-  (cond [(hash-has-key? h k)  (define bx (hash-ref h k))
-                              (define val (weak-box-value (car bx)))
-                              (cond [val   (set! total-time-saved (+ total-time-saved (cdr bx)))
-                                           ;(printf "total-time-saved = ~v~n" total-time-saved)
-                                           val]
-                                    [else  (cache-ref!)])]
-        [else  (cache-ref!)]))
-
-(define flomap-cache (make-hash))
-
-(define (clean-flomap-cache!)
-  (weak-value-hash-clean! flomap-cache)
-  #t)
-
-(register-gc-callback clean-flomap-cache!)
-
-(define (get-flomap-cache)
-  (for/list ([(k bx)  (in-hash flomap-cache)])
-    (cons k (cons (weak-box-value (car bx)) (cdr bx)))))
-
-(define (get-total-time-saved) total-time-saved)
-(define (get-total-time-spent) total-time-spent)
-
-(define (make-cached-flomap* name proc size . args)
-  (define rendered-size (if (size . < . 32) 32 size))
-  (define fm (weak-value-hash-ref! flomap-cache (list name rendered-size args)
-                        (λ () (apply proc rendered-size args))))
-  (flomap-scale fm (/ size rendered-size)))
-
-(define-syntax (make-cached-flomap stx)
-  (syntax-case stx ()
-    [(_ (size args ...) expr0 expr ...)
-     ;; for some reason, generate-temporaries doesn't work here
-     (with-syntax ([name  (gensym)])
-       (syntax/loc stx
-         (make-cached-flomap* 'name (λ (size args ...) expr0 expr ...) size args ...)))]))
-
-;; ===================================================================================================
-;; Drawing
-
-(define (->color% c)
-  (match c
-    [(list r g b)  (make-object color% r g b)]
-    [(? (is-a?/c color%))  c]
-    [(? string?)  (send the-color-database find-color c)]
-    [else  (raise-type-error '->color% "list, color% or string" c)]))
-
-(define (apply-path-commands p cmds)
-  (let loop ([x 0] [y 0] [cmds cmds])
-    (cond
-      [(empty? cmds)  (values x y)]
-      [else
-       (define cmd (first cmds))
-       (match cmd
-         ;; absolute commands
-         [`(M)  (loop x y (rest cmds))]
-         [`(L)  (loop x y (rest cmds))]
-         [`(C)  (loop x y (rest cmds))]
-         [`(M ,ax ,ay ,as ...)  (send p move-to ax ay)
-                                (loop ax ay (cons `(M ,@as) (rest cmds)))]
-         [`(L ,ax ,ay ,as ...)  (send p line-to ax ay)
-                                (loop ax ay (cons `(L ,@as) (rest cmds)))]
-         [`(C ,ax1 ,ay1 ,ax2 ,ay2 ,ax ,ay ,as ...)
-          (send p curve-to ax1 ay1 ax2 ay2 ax ay)
-          (loop ax ay (cons `(C ,@as) (rest cmds)))]
-         ;; relative commands
-         [`(m)  (loop x y (rest cmds))]
-         [`(l)  (loop x y (rest cmds))]
-         [`(c)  (loop x y (rest cmds))]
-         [`(m ,dx ,dy ,ds ...)  (send p move-to (+ x dx) (+ y dy))
-                                (loop (+ x dx) (+ y dy) (cons `(m ,@ds) (rest cmds)))]
-         [`(l ,dx ,dy ,ds ...)  (send p line-to (+ x dx) (+ y dy))
-                                (loop (+ x dx) (+ y dy) (cons `(l ,@ds) (rest cmds)))]
-         [`(c ,dx1 ,dy1 ,dx2 ,dy2 ,dx ,dy ,ds ...)
-          (send p curve-to (+ dx1 x) (+ dy1 y) (+ dx2 x) (+ dy2 y) (+ dx x) (+ dy y))
-          (loop (+ x dx) (+ y dy) (cons `(c ,@ds) (rest cmds)))]
-         [_  (error 'apply-path-commands "unknown path command ~e" cmd)])]))
-  (void))
-
-(define (draw-path-commands dc cmds x y)
-  (define p (new dc-path%))
-  (apply-path-commands p cmds)
-  (define t (send dc get-transformation))
-  (send dc translate x y)
-  (send dc draw-path p)
-  (send dc set-transformation t))
-
-(define (list->pairs lst)
-  (match lst
-    [(list x y xs ...)  (cons (cons x y) (list->pairs xs))]
-    [(list)  (list)]))
-
-(define (scale-path-commands cmds sx sy)
-  (match cmds
-    [(list `(,sym ,xys ...) cmds ...)
-     (cons
-      `(,sym ,@(flatten (map (λ (xy)
-                               (match-define (cons x y) xy)
-                               (list (* x sx) (* y sy)))
-                             (list->pairs xys))))
-      (scale-path-commands cmds sx sy))]
-    [(list)  (list)]))
-
-(define (relativize-path-commands cmds)
-  (let loop ([x 0] [y 0] [cmds cmds])
-    (cond
-      [(empty? cmds)  empty]
-      [else
-       (define cmd (first cmds))
-       (match cmd
-         ;; absolute commands
-         [`(M)  (loop x y (rest cmds))]
-         [`(L)  (loop x y (rest cmds))]
-         [`(C)  (loop x y (rest cmds))]
-         [`(M ,ax ,ay ,as ...)  (cons `(m ,(- ax x) ,(- ay y))
-                                      (loop ax ay (cons `(M ,@as) (rest cmds))))]
-         [`(L ,ax ,ay ,as ...)  (cons `(l ,(- ax x) ,(- ay y))
-                                      (loop ax ay (cons `(L ,@as) (rest cmds))))]
-         [`(C ,ax1 ,ay1 ,ax2 ,ay2 ,ax ,ay ,as ...)
-          (cons `(c ,(- ax1 x) ,(- ay1 y) ,(- ax2 x) ,(- ay2 y) ,(- ax x) ,(- ay y))
-                (loop ax ay (cons `(C ,@as) (rest cmds))))]
-         ;; relative commands
-         [`(m)  (loop x y (rest cmds))]
-         [`(l)  (loop x y (rest cmds))]
-         [`(c)  (loop x y (rest cmds))]
-         [`(m ,dx ,dy ,ds ...)  (cons `(m ,dx ,dy) (loop (+ x dx) (+ y dy)
-                                                         (cons `(m ,@ds) (rest cmds))))]
-         [`(l ,dx ,dy ,ds ...)  (cons `(l ,dx ,dy) (loop (+ x dx) (+ y dy)
-                                                         (cons `(l ,@ds) (rest cmds))))]
-         [`(c ,dx1 ,dy1 ,dx2 ,dy2 ,dx ,dy ,ds ...)
-          (cons `(c ,dx1 ,dy1 ,dx2 ,dy2 ,dx ,dy)
-                (loop (+ x dx) (+ y dy) (cons `(c ,@ds) (rest cmds))))]
-         [_  (error 'apply-path-commands "unknown path command ~e" cmd)])])))
-
-(define (get-text-size str font)
-  (define bm (make-bitmap 1 1))
-  (define dc (make-object bitmap-dc% bm))
-  (define-values (w h _1 _2) (send dc get-text-extent str font #t))
-  (values (inexact->exact (ceiling w))
-          (inexact->exact (ceiling h))))
diff --git a/pkgs/images-pkgs/images-lib/info.rkt b/pkgs/images-pkgs/images-lib/info.rkt
deleted file mode 100644
index 419bb570fa..0000000000
--- a/pkgs/images-pkgs/images-lib/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "draw-lib"
-               "unstable-latent-contract-lib"
-               "unstable-parameter-group-lib"
-               "typed-racket-lib"))
-
-(define pkg-desc "Functions for constructing icons and logos")
-
-(define pkg-authors '(ntoronto))
-
-(define version "1.1")
diff --git a/pkgs/images-pkgs/images-test/LICENSE.txt b/pkgs/images-pkgs/images-test/LICENSE.txt
deleted file mode 100644
index 28eed0045c..0000000000
--- a/pkgs/images-pkgs/images-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-images
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/images-pkgs/images-test/images/info.rkt b/pkgs/images-pkgs/images-test/images/info.rkt
deleted file mode 100644
index a383220ec3..0000000000
--- a/pkgs/images-pkgs/images-test/images/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("tests"))
diff --git a/pkgs/images-pkgs/images-test/images/tests/effects-tests.rkt b/pkgs/images-pkgs/images-test/images/tests/effects-tests.rkt
deleted file mode 100644
index 9a83d63b8b..0000000000
--- a/pkgs/images-pkgs/images-test/images/tests/effects-tests.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang racket/gui
-
-(require racket/math
-         images/gui
-         images/flomap
-         images/logos)
-
-(module test racket/base)
-
-(define frame-delay 1/30)
-
-(define size 256)
-(define blur 8)
-(define frame-num 10)
-(define end-frame-quality 90)
-(define mid-frame-quality 35)
-
-(define background-fm (make-flomap* size size #(1 1 1 1)))
-
-(define (flomap-shadowed fm σ color)
-  (flomap-cc-superimpose (flomap-shadow fm σ color) fm))
-
-(define plt-fm
-  (flomap-shadowed (flomap-inset (plt-flomap #:height (- size (* 4 blur))) (* 2 blur))
-                   blur #(1/2 0 0 1/8)))
-
-(define racket-fm
-  (flomap-shadowed (flomap-inset (racket-flomap #:height (- size (* 4 blur))) (* 2 blur))
-                   blur #(1/2 1/8 0 0)))
-
-(define logo-flomap* (flomap-whirl-morph plt-fm racket-fm))
-
-(define (logo-flomap t)
-  (flomap-cc-superimpose background-fm (logo-flomap* t)))
-
-(define logo-frames
-  (time
-   (append (list (time (flomap->bitmap (logo-flomap 0))))
-           (time
-            (for/list ([t  (in-range 1 frame-num)])
-              (flomap->bitmap (logo-flomap (/ t frame-num)))))
-           (list (time (flomap->bitmap (logo-flomap 1)))))))
-
-(define frame (new frame% [label "Whirl Morph Logo"] [width 256] [height 256]))
-(define canvas (make-object bitmap-canvas% frame (first logo-frames)))
-(send frame show #t)
-
-(for ([_  (in-range 5)])
-  (for ([frame  (in-list logo-frames)])
-    (send canvas set-bitmap frame)
-    (send canvas refresh)
-    (sleep/yield frame-delay))
-  (sleep 1)
-  (for ([frame  (in-list (reverse logo-frames))])
-    (send canvas set-bitmap frame)
-    (send canvas refresh)
-    (sleep/yield frame-delay))
-  (sleep 1))
-
-(send frame show #f)
diff --git a/pkgs/images-pkgs/images-test/images/tests/icon-tests.rkt b/pkgs/images-pkgs/images-test/images/tests/icon-tests.rkt
deleted file mode 100644
index ccce808f06..0000000000
--- a/pkgs/images-pkgs/images-test/images/tests/icon-tests.rkt
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang racket
-
-(require racket/draw
-         images/icons/control
-         images/icons/arrow
-         images/icons/file
-         images/icons/symbol
-         images/icons/misc
-         images/icons/tool
-         images/icons/style
-         images/private/deep-flomap-render
-         images/private/utils
-         images/compile-time
-         (for-syntax images/icons/stickman
-                     images/icons/style))
-
-(default-icon-height 16)
-;(default-icon-material glass-icon-material)
-#;(default-icon-material
-  (deep-flomap-material-value 3.0 1.0 0.0 0.0
-                              0.0 0.0 0.0
-                              0.0 0.0 0.0
-                              0.0))
-;(default-icon-material diamond-material)
-
-;; ===================================================================================================
-;; Compiled stickman test
-
-(begin-for-syntax
-  (define stickman-height 32)
-  (define num-running-frames 12))
-
-(compiled-bitmap-list
- (for/list ([t  (in-range 0 1 (/ 1 num-running-frames))])
-   (running-stickman-icon t #:height stickman-height)))
-
-;; ===================================================================================================
-;; Other icons, various colors
-
-(define icon-procss
-  (list (list search-backward-icon rewind-icon continue-backward-icon step-back-icon back-icon
-              pause-icon stop-icon record-icon play-icon step-icon continue-forward-icon
-              fast-forward-icon search-forward-icon)
-        (list right-arrow-icon left-arrow-icon up-arrow-icon down-arrow-icon
-              right-over-arrow-icon left-over-arrow-icon right-under-arrow-icon left-under-arrow-icon)
-        (list floppy-disk-icon
-              (λ (#:color color) (save-icon #:arrow-color syntax-icon-color #:disk-color color))
-              (λ (#:color color) (load-icon #:arrow-color syntax-icon-color #:disk-color color))
-              (λ (#:color color) (small-save-icon #:arrow-color syntax-icon-color #:disk-color color))
-              (λ (#:color color) (small-load-icon #:arrow-color syntax-icon-color #:disk-color color)))
-        (list x-icon check-icon recycle-icon lambda-icon hash-quote-icon)
-        (list stop-sign-icon stop-signs-icon foot-icon
-              (λ (#:color color) (magnifying-glass-icon #:frame-color metal-icon-color
-                                                        #:handle-color color))
-              (λ (#:color color) (left-magnifying-glass-icon #:frame-color metal-icon-color
-                                                             #:handle-color color))
-              (λ (#:color color) (bomb-icon #:bomb-color color))
-              (λ (#:color color) (left-bomb-icon #:bomb-color color))
-              (λ (#:color color) (stopwatch-icon #:height (default-icon-height) #:face-color color)))))
-
-(define tool-icon-procs
-  (list check-syntax-icon small-check-syntax-icon
-        macro-stepper-icon small-macro-stepper-icon
-        debugger-icon small-debugger-icon))
-
-(define (icons color)
-  (for/list ([fs  icon-procss])
-    (for/list ([f   fs])
-      (f #:color color))))
-
-(define (colored-icons-test)
-  (printf "~v~n" (for/list ([f  tool-icon-procs])
-                   (define bm (f))
-                   (cons (send bm get-width) bm)))
-  (for ([color  (list "red" "blue" "green"
-                      "pink" "lightblue" "lightgreen"
-                      "darkred" "darkgreen" "darkblue"
-                      "white" "black" "tomato"
-                      "orange" "cyan" "purple")])
-    (define lst (time (icons color)))
-    (void)
-    (printf "~v~n" lst)
-    #;(printf "~v~n" (read-caches))
-    ))
-
-(colored-icons-test)
diff --git a/pkgs/images-pkgs/images-test/images/tests/logo-tests.rkt b/pkgs/images-pkgs/images-test/images/tests/logo-tests.rkt
deleted file mode 100644
index 6bd257c90c..0000000000
--- a/pkgs/images-pkgs/images-test/images/tests/logo-tests.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket
-
-(require images/logos)
-
-(time (plt-logo))
-(time (planet-logo))
-(time (stepper-logo))
-(time (macro-stepper-logo))
diff --git a/pkgs/images-pkgs/images-test/images/tests/other-tests.rkt b/pkgs/images-pkgs/images-test/images/tests/other-tests.rkt
deleted file mode 100644
index a66114d68f..0000000000
--- a/pkgs/images-pkgs/images-test/images/tests/other-tests.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/gui
-(require images/flomap)
-
-(require rackunit)
-
-;; checks pr 13717
-
-(define bmp
-  (flomap->bitmap
-   (build-flomap 1 10 10
-                 (lambda (k x y) (/ (+ x y) 200)))))
-
-(define bmp-buf1 (make-bytes (* 10 10 4)))
-(define bmp-buf2 (make-bytes (* 10 10 4)))
-
-(send bmp get-argb-pixels 0 0 10 10 bmp-buf1)
-(send bmp set-argb-pixels 0 0 10 10 bmp-buf1)
-(send bmp get-argb-pixels 0 0 10 10 bmp-buf2)
-
-(check-equal? bmp-buf1 bmp-buf2)
\ No newline at end of file
diff --git a/pkgs/images-pkgs/images-test/info.rkt b/pkgs/images-pkgs/images-test/info.rkt
deleted file mode 100644
index 0ef77ebdd1..0000000000
--- a/pkgs/images-pkgs/images-test/info.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "images-lib"))
-(define build-deps '("pict-lib"
-                     "slideshow-lib"
-                     "racket-doc"
-                     "unstable-latent-contract-lib"
-                     "unstable-parameter-group-lib"))
-(define update-implies '("images-lib"))
-
-(define compile-omit-paths '("tests"))
-
-(define pkg-desc "Tests for images-pkg")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/images-pkgs/images/info.rkt b/pkgs/images-pkgs/images/info.rkt
deleted file mode 100644
index 10d0b62833..0000000000
--- a/pkgs/images-pkgs/images/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("images-lib" "images-gui-lib" "images-doc"))
-(define implies '("images-lib" "images-gui-lib" "images-doc"))
-
-(define pkg-desc "Functions (and docs and tests) for constructing icons and logos")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/lazy/LICENSE.txt b/pkgs/lazy/LICENSE.txt
deleted file mode 100644
index 1d1a561835..0000000000
--- a/pkgs/lazy/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-lazy
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/lazy/force.rkt b/pkgs/lazy/force.rkt
deleted file mode 100644
index 0ca6d6e89d..0000000000
--- a/pkgs/lazy/force.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang racket/base
-
-(require racket/promise (for-syntax racket/base))
-
-(provide (all-defined-out))
-
-(define-syntax ~ (make-rename-transformer #'lazy))
-(define ! force)
-(define ~? promise?)
-
-;; force a top-level list structure; works with improper lists (will force the
-;; dotted item when it checks if it's a pair); does not handle cycles
-(define (!list x)
-  (let ([x (! x)])
-    (if (list? x) ; cheap check,
-      x           ; and big savings on this case
-      (let loop ([x x])
-        (if (pair? x)
-          ;; avoid allocating when possible
-          (let ([r (loop (! (cdr x)))]) (if (eq? r (cdr x)) x (cons (car x) r)))
-          x)))))
-
-;; similar to !list, but also force the values in the list
-(define (!!list x)
-  (let ([x (! x)])
-    (if (list? x)                   ; cheap check,
-      (if (ormap ~? x) (map ! x) x) ; and big savings on these cases
-      (let loop ([x x])
-        (if (pair? x)
-          ;; avoid allocating when possible
-          (if (~? (car x))
-            (cons (! (car x)) (loop (! (cdr x))))
-            (let ([r (loop (! (cdr x)))])
-              (if (eq? r (cdr x)) x (cons (car x) r))))
-          x)))))
-
-(define (!! x)
-  ;; Recursively force the input value, preserving sharing (usually indirectly
-  ;; specified through self-referential promises).  The result is a copy of the
-  ;; input structure, where the scan goes down the structure that
-  ;; `make-reader-graph' handles.
-  (define t (make-weak-hasheq))
-  (define placeholders? #f)
-  (define (loop x)
-    (let ([x (! x)])
-      ;; * Save on placeholder allocation (which will hopefully save work
-      ;;   recopying values again when passed through `make-reader-graph') --
-      ;;   basic idea: scan the value recursively, marking values as visited
-      ;;   *before* we go inside; when we get to a value that was marked,
-      ;;   create a placeholder and use it as the mark (or use the mark value
-      ;;   if it's already a placeholder); finally, if after we finished
-      ;;   scanning a value -- if we see that its mark was changed to a
-      ;;   placeholder, then put the value in it.
-      ;; * Looks like we could modify the structure if it's mutable instead of
-      ;;   copying it, but that might leave the original copy with a
-      ;;   placeholder in it.
-      (define-syntax-rule (do-value expr)
-        (let ([y (hash-ref t x #f)])
-          (cond ;; first visit to this value
-                [(not y) (hash-set! t x #t)
-                         (let* ([r expr] [y (hash-ref t x #f)])
-                           (when (placeholder? y)
-                             (placeholder-set! y r)
-                             (set! placeholders? #t))
-                           r)]
-                ;; already visited it twice => share the placeholder
-                [(placeholder? y) y]
-                ;; second visit => create a placeholder request
-                [else (let ([p (make-placeholder #f)]) (hash-set! t x p) p)])))
-      ;; deal with only with values that `make-reader-graph' can handle (for
-      ;; example, no mpairs) -- otherwise we can get back placeholder values
-      ;; (TODO: hash tables)
-      (cond [(pair? x)
-             (do-value (cons (loop (car x)) (loop (cdr x))))]
-            [(vector? x)
-             (do-value (let* ([len (vector-length x)] [v (make-vector len)])
-                         (for ([i (in-range len)])
-                           (vector-set! v i (loop (vector-ref x i))))
-                         (if (immutable? x) (vector->immutable-vector v) v)))]
-            [(box? x)
-             (do-value ((if (immutable? x) box-immutable box)
-                        (loop (unbox x))))]
-            [else
-             (let ([k (prefab-struct-key x)])
-               (if k
-                 (do-value (let ([v (struct->vector x)])
-                             (for ([i (in-range 1 (vector-length v))])
-                               (vector-set! v i (loop (vector-ref v i))))
-                             (apply make-prefab-struct k
-                                    (cdr (vector->list v)))))
-                 x))])))
-  (let ([x (loop x)]) (if placeholders? (make-reader-graph x) x)))
diff --git a/pkgs/lazy/info.rkt b/pkgs/lazy/info.rkt
deleted file mode 100644
index 54303c6de6..0000000000
--- a/pkgs/lazy/info.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang info
-
-(define collection "lazy")
-
-(define scribblings '(("lazy.scrbl" () (experimental 50))))
-
-;; STC 2010-06-01
-;; Changing lazy to be a tools-based language so I can use 
-;; stepper-language-interface to add a stepper button. This change is temporary
-;; until the stepper works with #lang languages.
-
-;(require string-constants)
-;(define name "Lazy Scheme")
-;(define drscheme-language-modules '(("lazy.rkt" "lazy")))
-;(define drscheme-language-positions
-;  `((,(string-constant experimental-languages) "Lazy Racket")))
-;(define drscheme-language-numbers '((1000 -500)))
-;(define drscheme-language-one-line-summaries '("Lazy Racket"))
-
-(define drracket-tools '(("lazy-tool.rkt")))
-(define drracket-tool-names '("Lazy Racket"))
-(define deps '("base"
-               "drracket-plugin-lib"
-               "htdp-lib"
-               "string-constants-lib"
-               "compatibility-lib"))
-(define build-deps '("mzscheme-doc"
-                     "scheme-lib"
-                     "eli-tester"
-                     "racket-doc"
-                     "scribble-lib"))
-
-(define pkg-desc "The implementation of the Lazy Racket language")
-
-(define pkg-authors '(eli stchang))
diff --git a/pkgs/lazy/lang/reader.rkt b/pkgs/lazy/lang/reader.rkt
deleted file mode 100644
index 269dd8e18d..0000000000
--- a/pkgs/lazy/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-lazy
diff --git a/pkgs/lazy/lazy-tool.rkt b/pkgs/lazy/lazy-tool.rkt
deleted file mode 100644
index 8dadeb65c0..0000000000
--- a/pkgs/lazy/lazy-tool.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang racket/base
-
-(require racket/unit
-         racket/class
-         string-constants
-         drracket/tool
-         lang/stepper-language-interface)
-
-(provide tool@)
-
-(define tool@
-  (unit
-    (import drracket:tool^)
-    (export drracket:tool-exports^)
-
-    (define (stepper-settings-language %)
-      (if (implementation? % stepper-language<%>)
-          (class* % (stepper-language<%>)
-            (init-field stepper:supported)
-            (init-field stepper:enable-let-lifting)
-            (init-field stepper:show-lambdas-as-lambdas)
-            (define/override (stepper:supported?) 
-              stepper:supported)
-            (define/override (stepper:enable-let-lifting?) 
-              stepper:enable-let-lifting)
-            (define/override (stepper:show-lambdas-as-lambdas?) 
-              stepper:show-lambdas-as-lambdas)
-            (super-new))
-          (class* % ()
-            (init stepper:supported)
-            (init stepper:enable-let-lifting)
-            (init stepper:show-lambdas-as-lambdas)
-            (super-new))))
-      
-    ; extends class implementing module-based-language<%> to use different 
-    ; default-settings, ie, 'constructor printing-style instead of 'print
-    (define (module-based-language-extension %)
-      (class* % ()
-        (define/override (default-settings)
-          (drracket:language:make-simple-settings
-           #t                 ; case sensitive
-           'constructor       ; printing-style
-           'mixed-fraction-e  ; fraction-style
-           #f                 ; show-sharing
-           #t                 ; insert-newlines
-           'none))            ; annotations
-        (define/override (default-settings? s)
-          (and (super default-settings? s)
-               (eq? (drracket:language:simple-settings-printing-style s)
-                    'constructor)))
-;      (equal? (drracket:language:simple-settings->vector s)
-;              (drracket:language:simple-settings->vector (default-settings))))
-        (super-new)))
-
-    (define (phase1) (void))
-
-    ;; phase2 : -> void
-    (define (phase2)
-
-      (define lazy-language%
-        (stepper-settings-language
-         ((drracket:language:get-default-mixin)
-          (drracket:language:module-based-language->language-mixin
-           (module-based-language-extension
-            (drracket:language:simple-module-based-language->module-based-language-mixin
-             drracket:language:simple-module-based-language%))))))
-
-      (drracket:language-configuration:add-language
-       (instantiate lazy-language% ()
-         (one-line-summary "Lazy Racket")
-         (module '(lib "lazy/lazy.rkt"))
-         (language-position `(,(string-constant experimental-languages) 
-                              "Lazy Racket"))
-         (language-numbers '(1000 -500))
-         (stepper:supported #t)
-         (stepper:enable-let-lifting #t)
-         (stepper:show-lambdas-as-lambdas #t)))
-      )))
diff --git a/pkgs/lazy/lazy.rkt b/pkgs/lazy/lazy.rkt
deleted file mode 100644
index bdeb4540f9..0000000000
--- a/pkgs/lazy/lazy.rkt
+++ /dev/null
@@ -1,865 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         (for-syntax stepper/private/syntax-property))
-
-  ;; ~ = lazy (or delayed)
-  ;; ! = strict (or forced)
-  ;; (See below for app-related names)
-
-  ;; --------------------------------------------------------------------------
-  ;; Syntax utilities
-
-  ;; taken & modified from swindle/misc.rkt
-  (provide defsubst) ; useful utility
-  (define-syntax (defsubst-process stx)
-    (syntax-case stx ()
-      [(_ name (acc ...))
-       #'(define-syntax (name stx)
-           (syntax-case stx () acc ...))]
-      [(_ name (acc ...) id subst . more) (identifier? #'id)
-       #'(defsubst-process
-           name (acc ...
-                 (id (identifier? #'id) #'subst)
-                 ((id x (... ...)) #'(subst x (... ...))))
-           . more)]
-      [(_ name (acc ...) n+a subst . more)
-       #'(defsubst-process name (acc ... (n+a #'subst)) . more)]))
-  (define-syntax defsubst
-    (syntax-rules ()
-      [(_ (name . args) subst . more)
-       (defsubst-process name () (name . args) subst . more)]
-      [(_ name subst . more)
-       (defsubst-process name () name subst . more)]))
-
-  ;; utility for defining ~foo but make it look like #<procedure:foo>
-  (define-syntax (define* stx)
-    (syntax-case stx ()
-      [(_ ~name val) (identifier? #'~name)
-       (let* ([~str (symbol->string (syntax-e #'~name))]
-              [str  (string->symbol (regexp-replace #rx"^[~*]" ~str ""))])
-         (with-syntax ([name (datum->syntax #'~name str #'~name)])
-           #'(define ~name (let ([name val]) (mark-lazy name)))))]
-      [(_ (~name . xs) body ...) (identifier? #'~name)
-       #'(define* ~name (lambda xs body ...))]))
-
-  ;; --------------------------------------------------------------------------
-  ;; Delay/force etc
-
-  (require "force.rkt")
-
-  (provide ~)
-
-  ;; the exposed `!' (and other similar !s) must be a special form in the lazy
-  ;; language -- but this is achieved through the lazy #%app (~!%app below)
-  ;; that treats it (and the others) specially: uses mzscheme's application
-  (define-for-syntax strict-names
-    (syntax->list #'(! !! !list !!list !values !!values)))
-
-  ;; --------------------------------------------------------------------------
-  ;; Stepper utility fns
-
-  (define-for-syntax (stepper-hide-operator stx)
-    (stepper-syntax-property stx 'stepper-skipto (append skipto/cdr skipto/second)))
-  (define-for-syntax (stepper-add-lazy-op-prop stx)
-    (stepper-syntax-property stx 'lazy-op #t))
-  
-  (define-syntax (hidden-car stx)
-    (syntax-case stx ()
-      [(_ arg) (stepper-hide-operator (syntax/loc stx (car arg)))]))
-  
-  (define-syntax (hidden-cdr stx)
-    (syntax-case stx ()
-      [(_ arg) (stepper-hide-operator (syntax/loc stx (cdr arg)))]))
-  
-  (define-syntax (hidden-! stx)
-    (syntax-case stx ()
-      [(_ arg) (stepper-hide-operator (syntax/loc stx (! arg)))]))
-  
-  (define-syntax (mark-as-lazy-op stx)
-    (syntax-case stx ()
-      [(_ arg) 
-       (identifier? #'arg)
-       (stepper-add-lazy-op-prop (syntax/loc stx arg))]
-      [(_ arg) #'arg]))
-    
-  (define-syntax (hidden-~ stx)
-    (syntax-case stx ()
-      [(_ arg) (stepper-hide-operator (syntax/loc stx (~ arg)))]))
-  
-  ;; --------------------------------------------------------------------------
-  ;; Determine laziness
-
-  (define-values (lazy-proc lazy-proc?)
-    (let-values ([(type make pred ref set)
-                  (make-struct-type
-                   'lazy-proc #f 1 0 #f null (current-inspector) 0)])
-      (values make pred)))
-  (defsubst (lazy? x) (if (lazy-proc? x) #t (struct-constructor-procedure? x)))
-  ;; a version that works on any value
-  (defsubst (mark-lazy x) (if (procedure? x) (lazy-proc x) x))
-
-  ;; a few primitive constructors
-  (define ~cons   (lazy-proc cons))
-  (define ~list   (lazy-proc list))
-  (define ~list*  (lazy-proc list*))
-  (define ~vector (lazy-proc vector))
-  (define ~box    (lazy-proc box))
-  ;; values is special, see below
-
-  ;; --------------------------------------------------------------------------
-  ;; Implicit begin & multiple values
-
-  ;; This is used for implicit body begins.  It is slightly complex since it
-  ;; should still be possible to use it for splicing up macro contents, so
-  ;; definitions are used with a normal begin.  The actual body turns into one
-  ;; promise that, when forced, forces each of its expressions and returns the
-  ;; last value.  This effectively ties evaluation of all expressions in one
-  ;; package, so (~begin foo bar) will always evaluate `foo' when the value of
-  ;; `bar' is forced.
-  (define-syntax ~begin
-    (let ([ids (syntax->list
-                #'(~define ~define-values define-syntax define-syntaxes
-                   define-struct struct require provide))])
-      (define (definition? stx)
-        (ormap (lambda (id) (free-identifier=? id stx)) ids))
-      (lambda (stx)
-        (syntax-case stx ()
-          ;; optimize simple cases
-          [(_) #'(begin)]
-          [(_ expr) #'expr]
-          [(_ expr ...)
-           (let loop ([exprs #'(expr ...)] [defs '()])
-             (syntax-case exprs ()
-               [((head . rest) expr ...)
-                (definition? #'head)
-                (loop #'(expr ...) (cons #'(head . rest) defs))]
-               ;; only definitions
-               [() #`(begin #,@(reverse defs))]
-               ;; single expr
-               [(expr) #`(begin #,@(reverse defs) expr)]
-               [(expr ...)
-                #`(begin #,@(reverse defs) (hidden-~ (begin (hidden-! expr) ...)))]))]))))
-
-  ;; redefined to use lazy-proc and ~begin
-  (define-syntax (~lambda stx)
-    (syntax-case stx ()
-      [(_ args body0 body ...)
-       (let ([n (syntax-local-name)])
-         (with-syntax ([lam (syntax-property
-                             (syntax/loc stx
-                               (lambda args (~begin body0 body ...)))
-                             'inferred-name n)])
-           (syntax/loc stx (lazy-proc lam))))]))
-  (provide (rename-out [~lambda λ]))
-  
-;  (defsubst
-;    (~define (f . xs) body0 body ...) (define f (~lambda xs body0 body ...))
-;    (~define v x) (define v x))
-  ;; STC: define ~define to add stepper-properties
-  ;; had to duplicate some stuff from ~lambda
-  (define-syntax (~define stx)
-    (define (attach-inferred-name stx fn-name-stx)
-      (syntax-property
-       (stepper-syntax-property
-        (stepper-syntax-property
-         stx
-         'stepper-define-type 'shortened-proc-define)
-        'stepper-proc-define-name fn-name-stx)
-       'inferred-name fn-name-stx))
-    ; duplicated some stuff from ~lambda so I could add stepper-properties
-    (syntax-case stx ()
-      [(_ (f . args) body0 body ...)
-       (quasisyntax/loc stx
-         (define f 
-           (lazy-proc
-            #,(attach-inferred-name
-               #'(lambda args (~begin body0 body ...))
-               #'f)
-            )))]
-      [(_ name expr) #'(define name expr)]))
-  
-  (defsubst
-    (~let [(x v) ...] body0 body ...)
-      (let ([x v] ...) (~begin body0 body ...))
-    (~let name [(x v) ...] body0 body ...)
-      (let name [(x v) ...] (~begin body0 body ...)))
-  (defsubst (~let* [(x v) ...] body0 body ...)
-    (let* ([x v] ...) (~begin body0 body ...)))
-  (defsubst (~letrec [(x v) ...] body0 body ...)
-    (letrec ([x v] ...) (~begin body0 body ...)))
-
-  ;; parameterize should force its arguments
-  (defsubst (~parameterize ([param val] ...) body ...)
-    ;; like ~begin, delaying the whole thing is necessary to tie the evaluation
-    ;; to whenever the value is actually forced
-    (hidden-~ (parameterize ([param (hidden-! val)] ...) (~begin body ...))))
-
-  ;; Multiple values are problematic: Racket promises can use multiple
-  ;; values, but to carry that out `call-with-values' should be used in all
-  ;; places that deal with multiple values, which will make the whole thing
-  ;; much slower (about twice in tight loops) -- but multiple values are rarely
-  ;; used (spceifically, students never use them).  So `values' is redefined to
-  ;; produce a first-class tuple-holding struct, and `split-values' turns that
-  ;; into multiple values.
-  ;; STC: add inspector for lazy stepper
-  (struct multiple-values (values) #:inspector (make-inspector))
-  (define (split-values x)
-    (let ([x (! x)])
-      (if (multiple-values? x) (apply values (multiple-values-values x)) x)))
-  (define-syntax (hidden-split-values stx)
-    (syntax-case stx ()
-      [(_ arg) (stepper-hide-operator (syntax/loc stx (split-values arg)))]))
-  ;; Force and split resulting values.
-  (define (!values x)
-    (split-values (! x)))
-  ;; Similar, but forces the actual values too.
-  (define (!!values x)
-    (let ([x (! x)])
-      (if (multiple-values? x)
-        (apply values (map ! (multiple-values-values x)))
-        x)))
-
-  (define* ~values
-    (lambda xs (multiple-values xs)))
-
-  ;; Redefine multiple-value constructs so they split the results
-  (defsubst (~define-values (v ...) body)
-    (define-values (v ...) (hidden-split-values body)))
-  (defsubst (~let-values ([(x ...) v] ...) body ...)
-    (let-values ([(x ...) (split-values v)] ...) (~begin body ...)))
-  (defsubst (~let*-values ([(x ...) v] ...) body ...)
-    (let*-values ([(x ...) (split-values v)] ...) (~begin body ...)))
-  (defsubst (~letrec-values ([(x ...) v] ...) body ...)
-    (letrec-values ([(x ...) (split-values v)] ...) (~begin body ...)))
-
-  ;; Redefine things that return multiple values.
-  ;; (todo: only stuff necessary for the datatypes are done, more needed)
-  (define* (~make-struct-type . args)
-    (let ([args (!!list args)])
-      (call-with-values (lambda () (apply make-struct-type args)) ~values)))
-
-  ;; --------------------------------------------------------------------------
-  ;; Applications
-
-  ;; Basic names:
-  ;; `app':    syntax, calls a function over given arguments
-  ;; `apply':  function, last argument is a list of arguments to the function
-  ;; Conventions:
-  ;; `!*---':  forces args when needed (depending on the function)
-  ;;           doesn't force the function (internal use only)
-  ;; `!---':   forces function, and forces args when needed
-  ;; `~!---':  adds a delay wrapper to the application (uses the above)
-  ;;           (this is a macro in the `apply' case too)
-  ;; `~!*---': like the previous, but does not force the function (internal)
-  ;; Provided stuff:
-  ;; `~!%app': provided as `#%app' -- similar to `~!app' but treats a few
-  ;;           application kinds as special (mostly all kinds of forces)
-  ;; `!apply': provided as `apply' (no need to provide `~!apply', since all
-  ;;           function calls are delayed by `#%app')
-
-  (define (extract-if-lazy-proc f)
-    (or (procedure-extract-target f) f))
-  (define-syntax (!*app stx)
-    (syntax-case stx ()
-      [(_ f x ...)
-       (let ([$$ (lambda (stx)
-                   (stepper-syntax-property 
-                    stx
-                    'stepper-skipto
-                    (append skipto/cddr
-                            `(both-l () (car)))))]
-             [$  (lambda (stx)
-                   (stepper-syntax-property
-                    stx
-                    'stepper-skipto
-                    (append skipto/cdr 
-                            skipto/first)))])
-         (with-syntax ([(y ...) (generate-temporaries #'(x ...))])
-           ;; use syntax/loc for better errors etc
-           (with-syntax ([lazy   (syntax/loc stx ((extract-if-lazy-proc p) y ...))]
-                         [strict (syntax/loc stx (p (hidden-! y) ...))])
-             (quasisyntax/loc stx
-               ((lambda (p y ...)
-                  #,($$ #'(if (lazy? p) lazy strict)))
-                f x ...)
-               #;(let ([p f] [y x] ...)
-                 ;; #,($$ #`(if (lazy? p) lazy strict))
-                 (if (lazy? p) lazy strict))))))]))
-
-  (defsubst (!app   f x ...) (!*app (hidden-! (mark-as-lazy-op f)) x ...))
-  (defsubst (~!*app f x ...) (hidden-~ (!*app f x ...)))
-  (defsubst (~!app  f x ...) (hidden-~ (!app f x ...)))
-
-  (define-for-syntax (toplevel?)
-    (memq (syntax-local-context)
-          '(top-level module module-begin))) ; not sure about module-begin
-
-  ;; What happens when encoutering a toplevel non-definition expression?
-  (provide toplevel-forcer)
-  (define toplevel-forcer (make-parameter !))
-
-  (provide (rename-out [~!%app #%app])) ; all applications are delayed
-  (define-syntax (~!%app stx) ; provided as #%app
-    #;(define (unwinder stx rec)
-      (syntax-case stx (!)
-        [(let-values ([(_p) (_app ! f)] [(_y) x] ...) _body)
-         (with-syntax ([(f x ...) (rec #'(f x ...))])
-           #'(f x ...))]))
-    #;(define (stepper-annotate stx)
-      (let* ([stx (stepper-syntax-property stx 'stepper-hint unwinder)]
-             [stx (stepper-syntax-property stx 'stepper-skip-double-break #t)])
-        stx))
-    (syntax-case stx (~)
-      ;; the usual () shorthand for null
-      [(_) #'null]
-      [(_ ~ x) (syntax/loc stx (~ x))] ; not really needed
-      [(_ f x ...)
-       (cond [(let ([f #'f])
-               (and (identifier? f)
-                    (ormap (lambda (s) (free-identifier=? f s))
-                           strict-names)))
-              ;; strict function => special forms => use plain application
-              (syntax/loc stx (f x ...))]
-             [(toplevel?)
-              ;; toplevel expressions are always forced
-              (syntax/loc stx ((toplevel-forcer) (!app f x ...)))]
-             [else (syntax/loc stx (~!app f x ...))])]))
-
-  (define (!*apply f . xs)
-    (let ([xs (!list (apply list* xs))])
-      (apply f (if (lazy? f) xs (map ! xs)))))
-  (define* (!apply f . xs)
-    (let ([f (! f)] [xs (!list (apply list* xs))])
-      (apply f (if (lazy? f) xs (map ! xs)))))
-  (defsubst (~!*apply f . xs) (hidden-~ (!*apply f . xs)))
-  (defsubst (~!apply  f . xs) (hidden-~ (!apply  f . xs)))
-
-  (provide (rename-out [!apply apply])) ; can only be used through #%app => delayed
-
-  ;; do the same special treatment for toplevel variable expressions
-  (provide (rename-out [!top #%top]))
-  (define-syntax (!top stx)
-    (syntax-case stx ()
-      [(_ . id) (if (toplevel?) #'(! (#%top . id)) #'(#%top . id))]))
-
-  ;; used for explicitly strict/lazy calls
-  (defsubst (strict-call f x ...) (hidden-~ (f (! x) ...)))
-  (defsubst (lazy-call f x ...) (hidden-~ (f x ...)))
-
-  ;; --------------------------------------------------------------------------
-  ;; Special forms that are now functions
-
-  ;; Since these things are rarely used as functions, they are defined as
-  ;; macros that expand to the function form when used as an expression.
-
-  (define* *if
-    (case-lambda [(e1 e2 e3) (if (! e1) e2 e3)]
-                 [(e1 e2   ) (when (! e1) e2   )]))
-  (defsubst (~if e1 e2 e3) (hidden-~ (if (hidden-! e1) e2 e3))
-            (~if e1 e2   ) (hidden-~ (if (hidden-! e1) e2   ))
-            ~if *if)
-
-  (define* (*and . xs)
-    (let ([xs (!list xs)])
-      (or (null? xs)
-          (let loop ([x (car xs)] [xs (cdr xs)])
-            (if (null? xs) x (and (! x) (loop (car xs) (cdr xs))))))))
-  (define-syntax !and
-    (syntax-rules ()
-      [(_) (and)]
-      [(_ x ... y) (and (hidden-! x) ... y)]))
-  (defsubst (~and x ...) (hidden-~ (!and x ...)) ~and *and)
-
-  (define* (*or . xs)
-    (let ([xs (!list xs)])
-      (and (pair? xs)
-           (let loop ([x (car xs)] [xs (cdr xs)])
-             (if (null? xs) x (or (! x) (loop (car xs) (cdr xs))))))))
-  (define-syntax !or
-    (syntax-rules ()
-      [(_) (or)]
-      [(_ x ... y) (or (hidden-! x) ... y)]))
-  (defsubst (~or x ...) (hidden-~ (!or x ...)) ~or *or)
-
-  ;; --------------------------------------------------------------------------
-  ;; Special forms that are still special forms since they use ~begin
-
-  (defsubst (~begin0 x y ...) ; not using ~begin, but equivalent
-    (hidden-~ (let ([val (hidden-! x)]) (hidden-! y) ... val)))
-
-  (defsubst (~when   e x ...) (hidden-~ (when   (hidden-! e) (~begin x ...))))
-  (defsubst (~unless e x ...) (hidden-~ (unless (hidden-! e) (~begin x ...))))
-
-  ;; --------------------------------------------------------------------------
-  ;; Misc stuff
-
-  ;; Just for fun...
-  (defsubst (~set! id expr) (hidden-~ (set! id (hidden-! expr))))
-  ;; The last ! above is needed -- without it:
-  ;;   (let ([a 1] [b 2]) (set! a (add1 b)) (set! b (add1 a)) a)
-  ;; goes into an infinite loop.  (Thanks to Jos Koot)
-
-  (define* (~set-mcar! mpair val) (~ (set-mcar! (! mpair) val)))
-  (define* (~set-mcdr! mpair val) (~ (set-mcdr! (! mpair) val)))
-  (define* (~vector-set! vec i val) (~ (vector-set! (! vec) (! i) val)))
-  (define* (~set-box! box val) (~ (set-box! (! box) val)))
-
-  ;; not much to do with these besides inserting strictness points and ~begin
-  ; for stepper: change else to #t test, add new error else branch
-  (define-syntax (~cond stx)
-    (syntax-case stx ()
-      [(_ clause ...) ; stepper needs the loc of the full clause
-       (with-syntax
-           ([(new-clause ...)
-             (map 
-              (λ (c)
-                (with-syntax ([(test body ...) c])
-                  (with-syntax
-                      ([new-test
-                        (syntax-case #'test (else)
-                          [else ; for stepper
-                           (stepper-syntax-property #'#t 'stepper-else #t)]
-                          [x (syntax/loc #'x (hidden-! x))])])
-                    (syntax/loc c (new-test (~begin body ...))))))
-              (syntax->list #'(clause ...)))]
-            [new-else-body (syntax/loc stx (error 'cond "should not get here"))])
-         (quasisyntax/loc stx
-           (hidden-~ 
-            #,(syntax/loc stx
-                (cond
-                  new-clause ...
-                  [else new-else-body])))))]))
-  (defsubst (~case v [keys body ...] ...)
-    (hidden-~ (case (hidden-! v) [keys (~begin body ...)] ...)))
-
-  ;; Doing this will print the whole thing, but problems with infinite things
-  (define* (~error . args) (apply error (!! args)))
-
-  ;; I/O shows the whole thing
-  (define* (~printf fmt . args) (apply printf (! fmt) (!! args)))
-  (define* (~fprintf p fmt . args) (apply fprintf (! p) (! fmt) (!! args)))
-  (define* (~display x . port)  (apply display (!! x) (!!list port)))
-  (define* (~write   x . port)  (apply write   (!! x) (!!list port)))
-  (define* (~print   x . port)  (apply print   (!! x) (!!list port)))
-
-  ;; --------------------------------------------------------------------------
-  ;; Equality functions
-
-  ;; All of these try to stop if the promises are the same.
-
-  (define* (~eq? . args)
-    (or (apply eq? (!list args)) (apply eq? (!!list args))))
-
-  (define* (~eqv? . args)
-    (or (apply eqv? (!list args)) (apply eqv? (!!list args))))
-
-  ;; for `equal?' we must do a recursive scan
-  (define (equal2? x y)
-    (cond [(pair? x) (and (pair? y)
-                          (~equal? (car x) (car y))
-                          (~equal? (cdr x) (cdr y)))]
-          [(vector? x)
-           (let ([k (vector-length x)])
-             (and (vector? y)
-                  (= k (vector-length y))
-                  (let loop ([i 0])
-                    (or (= i k)
-                        (and (~equal? (vector-ref x i) (vector-ref y i))
-                             (loop (add1 i)))))))]
-          [(struct? x)
-           (and (struct? y)
-                (let-values ([(xtype xskipped?) (struct-info x)]
-                             [(ytype yskipped?) (struct-info y)])
-                  (and xtype ytype (not xskipped?) (not yskipped?)
-                       (eq? xtype ytype)
-                       (let*-values ([(name initk autok ref set imms spr skp?)
-                                      (struct-type-info xtype)]
-                                     [(k) (+ initk autok)])
-                         (let loop ([i 0])
-                           (or (= i k) (and (~equal? (ref x i) (ref y i))
-                                            (loop (add1 i)))))))))]
-          [(box? x) (and (box? y) (~equal? (unbox x) (unbox y)))]
-          [else #f]))
-  (define* (~equal? x y . args)
-    (let ([args (!list args)])
-      (if (pair? args)
-        (and (~equal? x y) (apply ~equal? x (cdr args)))
-        (or (equal? x y)
-            (let ([x (! x)] [y (! y)])
-              (or (equal? x y) (equal2? x y)))))))
-
-  ;; --------------------------------------------------------------------------
-  ;; List functions
-
-  (define* (~list?  x) (list?  (!list x))) ; must force the whole list
-  (define* (~length l) (length (!list l))) ; for these
-
-  (define* (~car    x) (car (! x))) ; these are for internal use: ~!app will do
-  (define* (~cdr    x) (cdr (! x))) ; this job when using this language
-  (define* (~caar   x) (car (! (car (! x)))))
-  (define* (~cadr   x) (car (! (cdr (! x)))))
-  (define* (~cdar   x) (cdr (! (car (! x)))))
-  (define* (~cddr   x) (cdr (! (cdr (! x)))))
-  (define* (~caaar  x) (car (! (~caar x))))
-  (define* (~caadr  x) (car (! (~cadr x))))
-  (define* (~cadar  x) (car (! (~cdar x))))
-  (define* (~caddr  x) (car (! (~cddr x))))
-  (define* (~cdaar  x) (cdr (! (~caar x))))
-  (define* (~cdadr  x) (cdr (! (~cadr x))))
-  (define* (~cddar  x) (cdr (! (~cdar x))))
-  (define* (~cdddr  x) (cdr (! (~cddr x))))
-  (define* (~caaaar x) (car (! (~caaar x))))
-  (define* (~caaadr x) (car (! (~caadr x))))
-  (define* (~caadar x) (car (! (~cadar x))))
-  (define* (~caaddr x) (car (! (~caddr x))))
-  (define* (~cadaar x) (car (! (~cdaar x))))
-  (define* (~cadadr x) (car (! (~cdadr x))))
-  (define* (~caddar x) (car (! (~cddar x))))
-  (define* (~cadddr x) (car (! (~cdddr x))))
-  (define* (~cdaaar x) (cdr (! (~caaar x))))
-  (define* (~cdaadr x) (cdr (! (~caadr x))))
-  (define* (~cdadar x) (cdr (! (~cadar x))))
-  (define* (~cdaddr x) (cdr (! (~caddr x))))
-  (define* (~cddaar x) (cdr (! (~cdaar x))))
-  (define* (~cddadr x) (cdr (! (~cdadr x))))
-  (define* (~cdddar x) (cdr (! (~cddar x))))
-  (define* (~cddddr x) (cdr (! (~cdddr x))))
-
-  (define* (~list-ref l k)
-    (let ([k (! k)])
-      (unless (exact-nonnegative-integer? k)
-        (raise-type-error 'list-ref "non-negative exact integer" 1 l k))
-      (let loop ([k k] [l (! l)])
-        (cond [(not (pair? l))
-               (raise-type-error 'list-ref "proper list" l)]
-              [(zero? k) (car l)]
-              [else (loop (sub1 k) (! (cdr l)))]))))
-  (define* (~list-tail l k)
-    (let ([k (! k)])
-      (unless (exact-nonnegative-integer? k)
-        (raise-type-error 'list-tail "non-negative exact integer" 1 l k))
-      (let loop ([k k] [l l]) ; don't force here -- unlike list-ref
-        (cond [(zero? k) l]
-              [else (let ([l (! l)])
-                      (unless (pair? l)
-                        (raise-type-error 'list-tail "list" l))
-                      (loop (sub1 k) (cdr l)))]))))
-
-  (define* (~append . xs)
-    (let ([xs (!list xs)])
-      (cond [(null? xs) '()]
-            [(null? (cdr xs)) (car xs)]
-            [else (let ([ls (~ (apply ~append (cdr xs)))])
-                    (let loop ([l (! (car xs))])
-                      (if (null? l)
-                        ls
-                        (cons (car l) (~ (loop (! (cdr l))))))))])))
-
-  ;; useful utility for many list functions below
-  (define (!cdr l) (! (cdr l)))
-
-  (define-syntax (deflistiter stx)
-    (syntax-case stx (extra: null ->)
-      [(deflistiter (?~name ?proc ?args ... ?l . ?ls)
-         null -> ?base
-         ?loop -> ?step-single ?step-multiple)
-       #'(deflistiter (?~name ?proc ?args ... ?l . ?ls)
-           extra:
-           null -> ?base
-           ?loop -> ?step-single ?step-multiple)]
-      [(deflistiter (?~name ?proc ?args ... ?l . ?ls)
-         extra: [?var ?init] ...
-         null -> ?base
-         ?loop -> ?step-single ?step-multiple)
-       (with-syntax ([?name (let* ([x (symbol->string (syntax-e #'?~name))]
-                                   [x (regexp-replace #rx"^~" x "")]
-                                   [x (string->symbol x)])
-                              (datum->syntax #'?~name x #'?~name))])
-         #'(define* ?~name
-             (case-lambda
-               [(?proc ?args ... ?l)
-                (let ([?proc (hidden-! ?proc)])
-                  (let ?loop ([?l (hidden-! ?l)] [?var ?init] ...)
-                    (if (null? ?l)
-                      ?base
-                      ?step-single)))]
-               [(?proc ?args ... ?l . ?ls)
-                (let ([?proc (hidden-! ?proc)])
-                  (let ?loop ([?ls (cons (hidden-! ?l) (!!list ?ls))] [?var ?init] ...)
-                    (if (ormap null? ?ls)
-                      (if (andmap null? ?ls)
-                        ?base
-                        (error '?name "all lists must have same size"))
-                      ?step-multiple)))])))]))
-
-  ;; These use the `*' version of app/ly, to avoid forcing the function over
-  ;; and over -- `deflistiter' forces it on entry
-  (deflistiter (~map proc l . ls)
-    null -> '()
-    loop -> (cons (~!*app proc (car l)) (~ (loop (! (cdr l)))))
-            (cons (~!*apply proc (map car ls)) (~ (loop (map !cdr ls)))))
-  (deflistiter (~for-each proc l . ls)
-    null -> (void)
-    loop -> (begin (! (!*app proc (car l))) (loop (! (cdr l))))
-            (begin (! (!*apply proc (map car ls))) (loop (map !cdr ls))))
-  (deflistiter (~andmap proc l . ls)
-    null -> #t
-    loop -> (and (! (!*app proc (car l))) (loop (! (cdr l))))
-            (and (! (!*apply proc (map car ls))) (loop (map !cdr ls))))
-  (deflistiter (~ormap proc l . ls)
-    null -> #f
-    loop -> (or (! (!*app proc (car l))) (loop (! (cdr l))))
-            (or (! (!*apply proc (map car ls))) (loop (map !cdr ls))))
-  (deflistiter (foldl proc init l . ls)
-    extra: [acc init]
-    null -> acc
-    loop ->
-      (~ (loop (! (cdr l)) (~!*app proc (car l) acc)))
-      (~ (loop (map !cdr ls)
-               (~!*apply proc (append (map car ls) (list acc))))))
-  (deflistiter (foldr proc init l . ls)
-    null -> init
-    loop ->
-      (~!*app proc (car l) (~ (loop (! (cdr l)))))
-      (~!*apply proc (append (map car ls) (list (~ (loop (map !cdr ls)))))))
-
-  (define (do-member name = elt list) ; no currying for procedure names
-    ;; `elt', `=', and `name' are always forced values
-    (let loop ([list (! list)])
-      (cond [(null? list) #f]
-            [(not (pair? list)) (error name "not a proper list: ~e" list)]
-            [(= elt (! (car list))) list]
-            [else (loop (! (cdr list)))])))
-  (define* (~member elt list) (do-member 'member ~equal? (! elt) list))
-  (define* (~memq   elt list) (do-member 'memq   ~eq?    (! elt) list))
-  (define* (~memv   elt list) (do-member 'memv   ~eqv?   (! elt) list))
-
-  (define (do-assoc name = key alist) ; no currying for procedure names
-    ;; `key', `=', and `name' are always forced values
-    (let loop ([alist (! alist)])
-      (cond [(null? alist) #f]
-            [(not (pair? alist)) (error name "not a proper list: ~e" alist)]
-            [else (let ([cell (! (car alist))])
-                    (cond [(not (pair? cell))
-                           (error name "non-pair found in list: ~e" cell)]
-                          [(= (! (car cell)) key) cell]
-                          [else (loop (! (cdr alist)))]))])))
-  (define* (~assoc key alist) (do-assoc 'assoc ~equal? (! key) alist))
-  (define* (~assq  key alist) (do-assoc 'assq  ~eq?    (! key) alist))
-  (define* (~assv  key alist) (do-assoc 'assv  ~eqv?   (! key) alist))
-
-  (define* (~reverse list)
-    (let ([list (!list list)])
-      (reverse list)))
-
-  ;; --------------------------------------------------------------------------
-  ;; Extra functionality that is useful for lazy list stuff
-
-  (define* (take n l)
-    (let ([n0 (! n)])
-      (unless (exact-nonnegative-integer? n0)
-        (raise-type-error 'take "non-negative exact integer" 0 n0 l))
-      (let loop ([n n0] [l l])
-        (if (zero? n)
-          '()
-          (let ([l (! l)])
-            (cond [(null? l)
-                   ;; it would be fine to force the whole list (since we now
-                   ;; know it's finite), but doing so means keeping a reference
-                   ;; to its head, which can lead to memory leaks.
-                   (error 'take "index ~e too large for input list" n0)]
-                  [(pair? l) (cons (car l) (~ (loop (sub1 n) (cdr l))))]
-                  [else (error 'take "not a proper list: ~e" l)]))))))
-
-  ;; not like Haskell's `cycle' that consumes a list
-  (define* (cycle . l)
-    (letrec ([r (~ (~append (! l) r))])
-      r))
-
-  ;; --------------------------------------------------------------------------
-  ;; mzlib/list functionality
-
-  ;; These are a hack, they're not the same due to different error
-  ;; messages (and they work with improper lists too).
-  (define* (rest x) (~cdr x))
-  (define* (first   x) (~car    x))
-  (define* (second  x) (~cadr   x))
-  (define* (third   x) (~caddr  x))
-  (define* (fourth  x) (~cadddr x))
-  (define* (fifth   x) (~car    (~cddddr x)))
-  (define* (sixth   x) (~cadr   (~cddddr x)))
-  (define* (seventh x) (~caddr  (~cddddr x)))
-  (define* (eighth  x) (~cadddr (~cddddr x)))
-  (define* (cons? x) (pair? (! x)))
-  (define* empty null)
-  (define* (empty? x) (null? (! x)))
-
-  (require (only-in racket/list [last-pair !last-pair]))
-  (define* (last-pair list) (!last-pair (!list list)))
-
-  (define (do-remove name item list =)
-    (let ([= (! =)])
-      (let loop ([list (! list)])
-        (cond [(null? list) list]
-              [(not (pair? list))
-               (error name "not a proper list: ~e" list)]
-              [(!*app = item (car list)) (cdr list)]
-              [else (cons (car list) (~ (loop (! (cdr list)))))]))))
-  (define* remove
-    (case-lambda [(item list  ) (do-remove 'remove item list ~equal?)]
-                 [(item list =) (do-remove 'remove item list =)]))
-  (define* (remq item list)     (do-remove 'remq   item list ~eq?))
-  (define* (remv item list)     (do-remove 'remv   item list ~eqv?))
-
-  (define (do-remove* name items list =)
-    (let ([= (! =)] [items (!list items)])
-      (let loop ([list (! list)])
-        (cond [(null? list) list]
-              [(not (pair? list))
-               (error name "not a proper list: ~e" list)]
-              [else
-               (let ([xs (~ (loop (! (cdr list))))])
-                 (if (memf (lambda (item) (!*app = item (car list))) items)
-                   xs
-                   (cons (car list) xs)))]))))
-  (define* remove*
-    (case-lambda [(items list  ) (do-remove* 'remove* items list ~equal?)]
-                 [(items list =) (do-remove* 'remove* items list =)]))
-  (define* (remq* items list)    (do-remove* 'remq*   items list ~eq?))
-  (define* (remv* items list)    (do-remove* 'remv*   items list ~eqv?))
-
-  (define* (memf pred list)
-    (let ([pred (! pred)])
-      (let loop ([list (! list)])
-        (cond [(null? list) #f]
-              [(not (pair? list)) (error 'memf "not a proper list: ~e" list)]
-              [(!*app pred (car list)) list]
-              [else (loop (! (cdr list)))]))))
-
-  (define* (assf pred alist)
-    (let ([pred (! pred)])
-      (let loop ([alist (! alist)])
-        (cond [(null? alist) #f]
-              [(not (pair? alist)) (error 'assf "not a proper list: ~e" alist)]
-              [else (let ([cell (! (car alist))])
-                      (cond [(not (pair? cell))
-                             (error 'assf "non-pair found in list: ~e" cell)]
-                            [(!*app pred (car cell)) cell]
-                            [else (loop (! (cdr alist)))]))]))))
-
-  (define* (filter pred list)
-    (let ([pred (! pred)])
-      (let loop ([list (! list)])
-        (cond [(null? list) list]
-              [(pair? list)
-               (let ([x (car list)]
-                     [xs (~ (loop (! (cdr list))))])
-                 (if (! (!*app pred x)) (cons x xs) xs))]
-              [else (error 'filter "not a proper list: ~e" list)]))))
-
-  (require (only-in racket/base [sort !sort]))
-  (define* (sort list less?)
-    (let ([less? (! less?)])
-      (!sort (!list list) (lambda (x y) (! (!*app less? x y))))))
-
-  ;; --------------------------------------------------------------------------
-  ;; mzlib/etc functionality
-
-  (require (only-in racket/bool boolean=? symbol=?))
-  (define* true  #t)
-  (define* false #f)
-
-  (define* (identity x) x)
-  ;; no need for dealing with multiple values since students don't use them
-  (define* (compose . fs)
-    (let ([fs (!list fs)])
-      (cond [(null? fs) identity]
-            [(null? (cdr fs)) (car fs)]
-            [else (let ([fs (reverse fs)])
-                    (lambda xs
-                      (let loop ([fs (cdr fs)]
-                                 [x  (~!apply (car fs) xs)])
-                        (if (null? fs)
-                          x
-                          (loop (cdr fs) (~!app (car fs) x))))))])))
-
-  (define* (build-list n f)
-    (let ([n (! n)] [f (! f)])
-      (unless (exact-nonnegative-integer? n)
-        (error 'build-list "~s must be an exact integer >= 0" n))
-      (unless (procedure? f)
-        (error 'build-list "~s must be a procedure" f))
-      (let loop ([i 0])
-        (if (>= i n)
-          '()
-          (cons (~ (f i)) (~ (loop (add1 i))))))))
-
-  ;; --------------------------------------------------------------------------
-  ;; Provide everything except some renamed stuff
-
-  (define-syntax (provide-strict-names stx)
-    #`(provide #,@strict-names))
-  (provide-strict-names)
-
-  (define-syntax (renaming-provide stx)
-    (syntax-case stx ()
-      [(_ id ...)
-       (with-syntax
-           ([(~id ...)
-             (map (lambda (id)
-                    (let* ([str (symbol->string (syntax-e id))]
-                           [~id (string->symbol (string-append "~" str))])
-                      (datum->syntax id ~id id)))
-                  (syntax->list #'(id ...)))])
-         #'(provide (except-out (all-from-out racket/base) module #%app apply #%top λ
-                                id ...)
-                    (rename-out [~id id] ...)))]))
-  (renaming-provide
-   lambda define let let* letrec parameterize
-   values define-values let-values let*-values letrec-values make-struct-type
-   cons list list* vector box
-   if and or begin begin0 when unless
-   set! set-mcar! set-mcdr! vector-set! set-box!
-   cond case error printf fprintf display write print
-   eq? eqv? equal?
-   list? length list-ref list-tail append map for-each andmap ormap
-   member memq memv assoc assq assv reverse
-   caar cadr cdar cddr caaar caadr cadar caddr cdaar cdadr cddar cdddr caaaar
-   caaadr caadar caaddr cadaar cadadr caddar cadddr cdaaar cdaadr cdadar cdaddr
-   cddaar cddadr cdddar cddddr)
-
-  (provide
-   ;; multiple values (see above)
-   split-values
-   ;; explicit strict/lazy calls
-   strict-call lazy-call
-   ;; `list' stuff
-   first second third fourth fifth sixth seventh eighth rest cons? empty empty?
-   foldl foldr last-pair remove remq remv remove* remq* remv* memf assf filter
-   sort
-   ;; `etc' stuff
-   true false boolean=? symbol=? identity compose build-list
-   ;; extra stuff for lazy Scheme
-   take cycle)
-
-
-#|
-;; Some tests
-(cadr (list (/ 1 0) 1 (/ 1 0))) -> 1
-(foldl + 0 '(1 2 3 4)) -> 10
-(foldl (lambda (x y) y) 0 (list (/ 1 0) (/ 2 0) (/ 3 0))) -> 0
-(foldl (lambda (x y) y) 0 (cons (/ 1 0) (cons (/ 2 0) '()))) -> 0
-(foldr + 0 '(1 2 3 4)) -> 10
-(foldr (lambda (x y) y) 0 (list (/ 1 0) (/ 2 0) (/ 3 0))) -> 0
-(foldr (lambda (x y) y) 0 (cons (/ 1 0) (cons (/ 2 0) '()))) -> 0
-(define ones (cons 1 ones))
-(take 5 (foldr cons '() ones)) -> (1 1 1 1 1)
-(define a (list (/ 1 0) 2 (/ 3 0)))
-(caadr (map list a)) -> 2
-(cadr (map + a a)) -> 4
-(andmap even? '(1 2 3 4)) -> #f
-(ormap even? '(1 2 3 4)) -> #t
-(ormap even? '(1 21 3 41)) -> #f
-(andmap even? (list 1 2 3 (/ 4 0))) -> #f
-|#
diff --git a/pkgs/lazy/lazy.scrbl b/pkgs/lazy/lazy.scrbl
deleted file mode 100644
index 3dc23e4d5b..0000000000
--- a/pkgs/lazy/lazy.scrbl
+++ /dev/null
@@ -1,187 +0,0 @@
-#lang scribble/doc
-@(require (for-label (except-in lazy)
-                     (only-in lazy/force ! !! !list !!list)
-                     racket/contract
-                     (only-in racket/promise promise?)))
-
-@(define-syntax-rule (deflazy mod def id)
-   (begin
-     (def-mz-req mod id mz-id)
-     @def[id]{Lazy variant of @|mz-id|.}))
-
-@(define-syntax-rule (def-mz-req mod id in-mz-id)
-   (begin
-     (define-syntax-rule (intro mz-id)
-       (begin
-         (require (for-label (only-in mod id)))
-         (define mz-id (racket id))))
-     (intro in-mz-id)))
-
-@(define-syntax-rule (defprocthing* mod id ...)
-   (begin
-     (deflazy mod defprocthing id)
-     ...))
-
-@(define-syntax-rule (defprocthing id . rest)
-   (defthing id procedure? . rest))
-
-@(define-syntax-rule (defidform* mod id ...)
-   (begin
-     (deflazy mod defidform id)
-     ...))
-
-@; ----------------------------------------
-
-@(require scribble/manual)
-
-@title{Lazy Racket}
-
-@author["Eli Barzilay"]
-
-@defmodulelang[lazy]
-
-Lazy Racket is available as both a language level and a module that
-can be used to write lazy code. To write lazy code, simply use
-@racketmodname[lazy] as your module's language:
-
-@racketmod[
-lazy
-... @#,elem{lazy code here}...]
-
-Function applications are delayed, and promises are automatically
-forced. The language provides bindings that are equivalent to most of
-the @racketmodname[racket/base] and @racketmodname[racket/list]
-libraries. Primitives are strict in the expected places; struct
-constructors are lazy; @racket[if], @racket[and], @racket[or] @|etc|
-are plain (lazy) functions. Strict functionality is provided as-is:
-@racket[begin], I/O, mutation, parameterization, etc. To have your
-code make sense, you should chain side effects in @racket[begin]s,
-which will sequence things properly. (Note: This is similar to
-threading monads through your code---only use @racket[begin] where
-order matters.)
-
-Mixing lazy and strict code is simple: you just write the lazy code in
-the lazy language, and strict code as usual. The lazy language treats
-imported functions (those that were not defined in the lazy language)
-as strict, and on the strict side you only need to force (possibly
-recursively) through promises.
-
-A few side-effect bindings are provided as-is. For example,
-@racket[read] and @racket[printf] do the obvious thing---but note that
-the language is a call-by-need, and you need to be aware when promises
-are forced. There are also bindings for @racket[begin] (delays a
-computation that forces all sub-expressions), @racket[when],
-@racket[unless], etc. There are, however, less reliable and might
-change (or be dropped) in the future.
-
-There are a few additional bindings, the important ones are special
-forms that force strict behaviour---there are several of these that
-are useful in forcing different parts of a value in different ways, as
-described in @secref["forcing"].
-
-@; ----------------------------------------
-
-@section{Lazy Forms and Functions}
-
-@defidform*[mzscheme
-lambda
-define
-]
-
-@defidform*[scheme
-let
-let*
-letrec
-parameterize
-define-values
-let-values
-let*-values
-letrec-values
-if
-set!
-begin begin0 when unless
-cond case
-]
-
-@defprocthing*[scheme
-   values make-struct-type
-   cons list list* vector box
-   and or
-   set-mcar! set-mcdr! vector-set! set-box!
-   error printf fprintf display write print
-   eq? eqv? equal?
-   list? length list-ref list-tail append map for-each andmap ormap
-   member memq memv assoc assq assv reverse
-   caar cadr cdar cddr caaar caadr cadar caddr cdaar cdadr cddar cdddr caaaar
-   caaadr caadar caaddr cadaar cadadr caddar cadddr cdaaar cdaadr cdadar cdaddr
-   cddaar cddadr cdddar cddddr
-   first second third fourth fifth sixth seventh eighth rest cons? empty empty?
-   foldl foldr last-pair remove remq remv remove* remq* remv* memf assf filter
-   sort
-   true false boolean=? symbol=? compose build-list
-   take
-]
-
-@defprocthing[identity]{Lazy identity function.}
-
-@defprocthing[cycle]{Creates a lazy infinite list that repeats its
-input arguments in order.}
-
-@; ----------------------------------------
-
-@section[#:tag "forcing"]{Forcing Values}
-
-@defmodule[lazy/force]
-
-The bindings of @racketmodname[lazy/force] are re-provided by
-@racketmodname[lazy].
-
-@defproc[(! [expr any/c]) any/c]{
-
-Evaluates @racket[expr] strictly. The result is always forced, over
-and over until it gets a non-promise value.}
-
-
-@defproc[(!! [expr any/c]) any/c]{
-
-Similar to @racket[!], but recursively forces a structure (e.g:
-lists).}
-
-
-@defproc[(!list [expr (or/c promise? list?)]) list?]{
-
-Forces the @racket[expr] which is expected to be a list, and forces
-the @racket[cdr]s recursively to expose a proper list structure.}
-
-
-@defproc[(!!list [expr (or/c promise? list?)]) list?]{
-
-Similar to @racket[!list] but also forces (using @racket[!]) the
-elements of the list.}
-
-
-@;{ This moved into lazy.rkt, and all the other forces will move there too.
-
-@subsection{Multiple values}
-
-To avoid dealing with multiple values, they are treated as a single
-tuple in the lazy language. This is implemented as a
-@racket[multiple-values] struct, with a @racket[values] slot.
-
-@defproc[(split-values [x multiple-values?]) any]{
-
-Used to split such a tuple to actual multiple values. (This may change
-in the future.)}
-
-
-@defproc[(!values [expr (or/c promise? multiple-values?)]) any]{
-
-Forces @racket[expr] and uses @racket[split-values] on the result.}
-
-
-@defproc[(!!values [expr (or/c promise? multiple-values?)]) any]{
-
-Similar to @racket[!values], but forces each of the values
-recursively.}
-
-;}
diff --git a/pkgs/lazy/main.rkt b/pkgs/lazy/main.rkt
deleted file mode 100644
index 12a5e542bc..0000000000
--- a/pkgs/lazy/main.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-(module main "lazy.rkt"
-  (provide (all-from-out "lazy.rkt")))
diff --git a/pkgs/lazy/tests/forcers.rkt b/pkgs/lazy/tests/forcers.rkt
deleted file mode 100644
index 92baee7aac..0000000000
--- a/pkgs/lazy/tests/forcers.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester lazy/force)
-
-(define (test-lazy/force)
-  (test (! 1) => 1
-        (! (! 1)) => 1
-        (! (~ 1)) => 1
-        (! (~ (~ (~ 1)))) => 1))
-
-(define (test-!list)
-  (test (!list (list 1 2 3)) => '(1 2 3)
-        (!list (~ (list 1 2 3))) => '(1 2 3)
-        (!list (~ (cons 1 (~ (cons 2 (~ (cons 3 (~ null)))))))) => '(1 2 3)
-        (!list 1) => 1 ; works on dotted lists
-        (!list (cons 1 2)) => '(1 . 2)))
-
-(define (test-!!list)
-  (test (!!list (list 1 2 3)) => '(1 2 3)
-        (!!list (list (~ 1) (~ 2) (~ 3))) => '(1 2 3)
-        (!!list (list* (~ 1) (~ 2) (~ 3))) => '(1 2 . 3)
-        (!!list (~ (cons (~ 1) (~ (cons (~ 2) (~ (cons (~ 3) (~ null))))))))
-        => '(1 2 3)
-        (!!list (~ (cons (~ 1) (~ (list 2 3))))) => '(1 2 3)
-        (!!list (~ (cons (~ 1) (~ (list 2 (~ 3)))))) => '(1 2 3)))
-
-(define (test-!!)
-  (parameterize ([print-graph #t])
-    (test
-     (!! (~ (cons (~ 1) (~ (cons (~ 2) (~ (cons (~ 3) (~ null))))))))
-     => '(1 2 3)
-     (format "~s" (!! (letrec ([ones (~ (cons 1 (~ ones)))]) ones)))
-     => "#0=(1 . #0#)"
-     (format "~s" (!! (letrec ([ones (~ (cons 1 (~ ones)))]) (list ones ones))))
-     => "(#0=(1 . #0#) #0#)"
-     (format "~s" (!! (letrec ([x (vector 1 (~ x))]) x)))
-     => "#0=#(1 #0#)"
-     (format "~s" (!! (letrec ([x (vector-immutable 1 (~ x))]) x)))
-     => "#0=#(1 #0#)"
-     (format "~s" (!! (letrec ([x (box (~ x))]) x)))
-     => "#0=#&#0#"
-     (format "~s" (!! (letrec ([x (box-immutable (~ x))]) x)))
-     => "#0=#&#0#"
-     (format "~s" (!! (letrec ([x (make-prefab-struct 'foo 1 (~ x))]) x)))
-     => "#0=#s(foo 1 #0#)")))
-
-(provide forcer-tests)
-(module+ main (forcer-tests))
-(define (forcer-tests)
-  (test do (test-lazy/force)
-        do (test-!list)
-        do (test-!!list)
-        do (test-!!)))
diff --git a/pkgs/lazy/tests/lang.rkt b/pkgs/lazy/tests/lang.rkt
deleted file mode 100644
index 104701820c..0000000000
--- a/pkgs/lazy/tests/lang.rkt
+++ /dev/null
@@ -1,240 +0,0 @@
-#lang lazy
-
-(require tests/eli-tester)
-
-;; tests for lazy language constructs
-
-(define (basic-tests)
-  (test
-   (! ((car (list if)) (< 1 2) 3 (error "poof"))) => 3
-   (! ((car (list or)) 3 (error "poof"))) => 3
-   (! ((car (list and)) (< 2 1) (error "poof"))) => #f
-   (!! (let ([x 0]) (set! x 1) (list x))) => '(1) ; implicit begin forces
-   (! (let ([x 0]) (when (zero? x) (error "poof")) 1)) =error> "poof"
-   (! (let ([x 0]) (when (zero? x) (set! x (add1 x)) (set! x (add1 x))) x))
-   => 2
-   (! (let ([x 1]) (unless (zero? x) (set! x (add1 x)) (set! x (add1 x))) x))
-   => 3
-   (! (let ([x 0]) (cond [(zero? x) (set! x (add1 x)) (set! x (add1 x))]) x))
-   => 2
-   (! (eq? 1 1)) => #t
-   (! (eq? 1 2)) => #f
-   (! (eqv? 1.0 1.0)) => #t
-   (! (eqv? 1.0 1)) => #f
-   (! (= 1.0 1)) => #t
-   (! (equal? (list 1.0) (list 1.0))) => #t
-   (! (letrec ([zs (cons 0 zs)]) (equal? (list zs zs) (list zs zs)))) => #t
-   ))
-
-(define (list-tests)
-  (test
-   (! (car 0)) =error> "car: contract violation\n  expected: pair?"
-   (! (cdr 0)) =error> "cdr: contract violation\n  expected: pair?"
-   (! (car (cons 1 (/ 1 0)))) => 1
-   (! (cdr (cons (/ 1 0) 1))) => 1
-   (! (list-ref (list (/ 1 0) 1 (/ 1 0)) 1)) => 1
-   (! (list-ref (cons 1 (/ 1 0)) 0)) => 1 ; doesn't force list structure
-   (! (list-tail (cons (/ 1 0) 0) 1)) => 0
-   (! (length (list (/ 1 0) (/ 1 0) (/ 1 0)))) => 3
-   (! (let ([l (list (/ 1 0) (/ 1 0))]) (length (append l l l)))) => 6
-   (!! (member 1 (cons 0 (cons 1 2)))) => '(1 . 2)
-   (!! (memq   1 (cons 0 (cons 1 2)))) => '(1 . 2)
-   (!! (memv   1 (cons 0 (cons 1 2)))) => '(1 . 2)
-   (! (second (map car (list 1 2 3)))) =error> "contract violation"
-   (! (second (map car (list 1 '(2) 3)))) => 2
-   ))
-
-(define (take-tests)
-  (define test-lst1 '(1 2 3))
-  (test
-   (! (take "nonnum" test-lst1))
-   =error>
-   #rx"take: expects type <non-negative exact integer> as 1st argument, given: \"nonnum\"; other arguments were: .*\\((list )?1 2 3\\)"
-   (! (take -1 test-lst1))
-   =error> "take: expects type <non-negative exact integer> as 1st argument"
-   (! (take -1 "nonlist"))
-   =error> "take: expects type <non-negative exact integer> as 1st argument"
-   (! (take 0 "nonlist")) => '()
-   (! (take 1 "nonlist")) =error> "take: not a proper list: \"nonlist\""
-   (! (take 0 null)) => '()
-   (! (take 0 test-lst1)) => '()
-   (!! (take 1 test-lst1)) => '(1)
-   (!! (take 2 test-lst1)) => '(1 2)
-   (!! (take 3 (take 4 test-lst1))) => '(1 2 3) ; doesn't force the error
-   (! (fourth (take 4 test-lst1)))              ; this one does
-   =error> "take: index 4 too large for input list"
-   (! (list-ref (take (~ 1) (list 2)) 0)) => 2
-   (! (take 0 (error))) => '() ; doesn't even force the list structure
-   (!! (take 1 (cons 0 (error "poof")))) => '(0)
-   ))
-
-(define (misc-tests)
-  (define-struct a (b c))
-  (define-struct d (e f))
-  (test
-   (! (a-b (make-a 1 2))) => 1
-   (! (a-c (make-a 1 2))) => 2
-   (! (a-b (a 1 2))) => 1
-   (! (a-c (a 1 2))) => 2
-   (! (a? (a 1 2))) => true
-   (! (a? (d 1 2))) => false
-   ))
-
-; Lazy Racket examples from Premiers cours de programmation avec Scheme (Roy)
-(define (pcps-tests)
-  ;; Definitions --------------------------------------------------------------
-  (define (f x y) x)
-  (define (fac n)
-    (if (= n 0) 1 (* n (fac (- n 1)))))
-  (define (new-if test p q)
-    (cond (test p)
-          (else q)))
-  (define fibs (cons 0 (cons 1 (map + fibs (cdr fibs)))))
-  #;(define ($list-ref L k)
-    (let loop ((k (force k)) (L (force L)))
-      (if (= k 0)
-          (car L)
-          (loop (- k 1) (cdr (force L))))))
-  (define L2 (cons 2 (map add1 L2)))
-  (define (rayer n L)     ; L prive des multiples de n
-    (filter (lambda (x) (not (= 0 (modulo x n)))) L))
-  (define (crible L)
-    (cons (car L) (crible (rayer (car L) (cdr L)))))
-  (define PREMS (crible L2)) ; primes
-  (define ZERO (cons 0 ZERO))     ; le flot infini <0,0,0,0,...>
-  (define (poly->serie L)         ; L = coeffs en puissances croissantes
-    (define (copy L)
-      (if (null? L)
-          ZERO                    ; padding à droite par des 0
-          (cons (car L) (copy (cdr L)))))
-    (copy L))
-  (define (int-serie S)           ; integration terme a terme
-    (define (aux S i)
-      (cons (/ (car S) i) (aux (cdr S) (+ i 1))))
-    (aux S 1))
-  (define EXPO (cons 1 (int-serie EXPO)))
-  (define SIN (cons 0 (int-serie COS)))
-  (define COS (cons 1 (map - (int-serie SIN))))
-  (define (ints-from n)
-    (cons n (ints-from (+ n 1))))
-  (define NAT (ints-from 0))
-  (define UN (cons 1 UN))
-  (define nats (cons 0 (map + nats UN)))
-  (define QUATRE (filter (lambda (x) (zero? (modulo x 4))) NAT))
-  (define (melanger F1 F2)     ; F1 et F2 infinis strictement croissants
-    (cond ((< (car F1) (car F2)) (cons (car F1) (melanger (cdr F1) F2)))
-          ((> (car F1) (car F2)) (cons (car F2) (melanger F1 (cdr F2))))
-          (else (cons (car F1) (melanger (cdr F1) (cdr F2))))))
-  (define (zoom x F)
-    (cons (* (car F) x) (zoom x (cdr F))))
-  (define PAIR (zoom 2 NAT))
-  (define (hamming)
-    (define h (cons 1 (melanger (zoom 2 h) (melanger (zoom 3 h) (zoom 5 h)))))
-    h)
-  (define h (hamming))
-  (define FACT (cons 1 (map * FACT (cdr NAT))))
-  (define (entrelacer s1 s2)
-    (cons (car s1) (entrelacer s2 (cdr s1))))
-  (define F (entrelacer NAT F))
-  ;; Tests --------------------------------------------------------------------
-  (test
-   (!! (fac 5)) => 120
-   (!! (new-if (= 1 2) (/ 1 0) 3)) => 3
-   (!! (take 20 PREMS)) =>
-   '(2 3 5 7 11 13 17 19 23 29 31 37 41 43 47 53 59 61 67 71)
-   (!! (list-ref PREMS 999)) => 7919
-   (!! (apply + (take 100 PREMS))) => 24133
-   (!! (take 10 (poly->serie '(1 2 3)))) => '(1 2 3 0 0 0 0 0 0 0)
-   (!! (take 10 EXPO)) => 
-   '(1 1 1/2 1/6 1/24 1/120 1/720 1/5040 1/40320 1/362880)
-   (!! (take 8 SIN)) => '(0 1 0 -1/6 0 1/120 0 -1/5040)
-   (!! (take 8 COS)) => '(1 0 -1/2 0 1/24 0 -1/720 0)
-   (!! (take 10 (ints-from 5))) => '(5 6 7 8 9 10 11 12 13 14)
-   (!! (take 10 NAT)) => '(0 1 2 3 4 5 6 7 8 9)
-   (!! (take 10 UN)) => '(1 1 1 1 1 1 1 1 1 1)
-   (!! (take 10 nats)) => '(0 1 2 3 4 5 6 7 8 9)
-   (!! (take 10 QUATRE)) => '(0 4 8 12 16 20 24 28 32 36)
-   (!! (take 10 (melanger NAT QUATRE))) => '(0 1 2 3 4 5 6 7 8 9)
-   (!! (take 10 PAIR)) => '(0 2 4 6 8 10 12 14 16 18)
-   (!! (take 30 h)) => 
-   '(1 2 3 4 5 6 8 9 10 12 15 16 18 20 24 25 27 30 32 36 40 45 48 50 54 60 64 72 75 80)
-   (!! (list-ref h 10000)) => 288555831593533440
-   (!! (take 10 FACT)) => '(1 1 2 6 24 120 720 5040 40320 362880)
-   (!! (take 10 (entrelacer NAT PAIR))) => '(0 0 1 2 2 4 3 6 4 8)
-   (!! (take 10 F)) => '(0 0 1 0 2 1 3 0 4 2)))
-
-(define (strictness-tests)
-  (test
-   (! (and (/ 1 0))) =error> "/: division by zero"
-   (! (and #f (/ 1 0))) => #f
-   (! (and #t (/ 1 0))) =error> "/: division by zero"
-   (! (cdr (append (list (/ 1 0)) '()))) => '()
-   (! (cdr (append '() (list (/ 1 0))))) => '()
-   (! (append (/ 1 0) '())) =error> "/: division by zero"
-   (! (append (/ 1 0) '() '())) =error> "/: division by zero"
-   (! (append (/ 1 0) '(1))) =error> "/: division by zero"
-   (! (append '() (/ 1 0))) =error> "/: division by zero"
-   (! (car (append '(1) (/ 1 0)))) => 1
-   (! (cdr (append '(1) (/ 1 0)))) =error> "/: division by zero"
-   (! (car (append '(1) 1 (/ 1 0)))) => 1
-   (! (foldr (/ 1 0) 0 '())) =error> "/: division by zero"
-   (! (foldr 1 (/ 1 0) '())) =error> "/: division by zero"
-   (! (foldr 1 2 (/ 1 0))) =error> "/: division by zero"
-   (! (foldr (/ 1 0) 1 '(1))) =error> "/: division by zero"
-   (! (foldr 1 (/ 1 0) '(1))) =error> "/: division by zero"
-   (! (foldl (/ 1 0) 0 '())) =error> "/: division by zero"
-   (! (foldl 1 (/ 1 0) '())) =error> "/: division by zero"
-   (! (foldl 1 2 (/ 1 0))) =error> "/: division by zero"
-   (! (foldl (/ 1 0) 1 '(1))) =error> "/: division by zero"
-   (! (foldl 1 (/ 1 0) '(1))) =error> "/: division by zero"
-   (! (filter (/ 1 0) '())) =error> "/: division by zero"
-   (! (filter 1 (/ 1 0))) =error> "/: division by zero"
-   (! (filter (/ 1 0) '(1))) =error> "/: division by zero"
-   (! (map (/ 1 0) '())) =error> "/: division by zero"
-   (! (map (/ 1 0) '(1))) =error> "/: division by zero"
-   (! (map 1 (/ 1 0))) =error> "/: division by zero"
-   (! (if (/ 1 0) 1 2)) =error> "/: division by zero"
-   (! (if #t 1 (/ 1 0))) => 1
-   (! (if #f (/ 1 0) 1)) => 1
-   (! (andmap (/ 1 0) '())) =error> "/: division by zero"
-   (! (andmap (/ 1 0) '(1))) =error> "/: division by zero"
-   (! (andmap 1 (/ 1 0))) =error> "/: division by zero"
-   ))
-
-(define (values-tests)
-  (test
-   ;; Tests from Luke Whittlesey
-   (! (let-values ([(x) (values (error "a"))]) 1)) => 1
-   (! (let-values ([(x y) (values (error "a") (error "b"))]) 1)) => 1
-   (! (let*-values ([(x) (values (error "a"))]) 1)) => 1
-   (! (let*-values ([(x0 x1) (values (error "a") (error "b"))] [(y) (values x0)]) 1)) => 1
-   (! (letrec ([x y] [y 1]) x)) =error> "y: undefined"
-   (! (letrec ([x (list y)] [y 1]) (car x))) => 1
-   (! (letrec-values ([(x) (values (error "a"))]) 1)) => 1
-   (! (letrec-values ([(x y) (values (error "a") (error "b"))]) 1)) => 1
-   (! (letrec-values ([(x) (values (list y))] [(y) (values 1)]) (car x))) => 1
-   (! (letrec-values ([(x0 x1) (values (list y0) (list y1))] [(y0 y1) (values 1 2)])
-        (+ (car x0) (car x1)))) => 3
-   (! (letrec-values ([(A) (values (list 'a B))]
-                      [(B) (values (list 'b A))]) (car A))) => 'a
-   (! (letrec-values ([(A) (values (list 'a B))]
-                      [(B) (values (list 'b A))]) (caadr A))) => 'b
-   (! (letrec-values ([(A) (values (list 'a B))]
-                      [(B) (values (list 'b A))]) (car B))) => 'b
-   (! (letrec-values ([(A) (values (list 'a B))]
-                      [(B) (values (list 'b A))]) (caadr B))) => 'a
-   ;; this errors because let-values (and other values-extractors) must force
-   ;; the rhs (one level down) to extract the values
-   (let-values ([(x) (error "a")]) 1) =error> "a"
-   ))
-
-(provide lang-tests)
-(module+ main (lang-tests))
-(define (lang-tests)
-  (! (begin (basic-tests)
-            (list-tests)
-            (take-tests)
-            (misc-tests)
-            (pcps-tests)
-            (strictness-tests)
-            (values-tests))))
diff --git a/pkgs/lazy/tests/main.rkt b/pkgs/lazy/tests/main.rkt
deleted file mode 100644
index 13a1cac266..0000000000
--- a/pkgs/lazy/tests/main.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-
-(module+ test 
-  (require tests/eli-tester "promise.rkt" "forcers.rkt" "lang.rkt" "space.rkt")
-  
-  (test do (promise-tests)
-        do (forcer-tests)
-        do (lang-tests)
-        do (space-tests)))
diff --git a/pkgs/lazy/tests/promise.rkt b/pkgs/lazy/tests/promise.rkt
deleted file mode 100644
index 110330af64..0000000000
--- a/pkgs/lazy/tests/promise.rkt
+++ /dev/null
@@ -1,199 +0,0 @@
-#lang racket/base
-
-;; Tests for the various racket promises
-
-(require racket/promise tests/eli-tester (for-syntax racket/base))
-
-;; check that things are `promise?'s or not
-(define (test-types)
-  (for ([v (list 1 '(1) (lambda () 1))])
-    (test (promise? v) => #f))
-  (for ([v (list (delay 1) (lazy 1) (delay (delay 1)) (lazy (lazy 1)))])
-    (test (promise? v) => #t)))
-
-(define (test-syntax)
-  (test (delay) =error> "bad syntax"
-        (lazy)  =error> "bad syntax"
-        (delay #:foo 1 2) =error> "bad syntax"
-        (force (delay/thread #:group #f)) =error> "bad syntax"
-        (force (delay/thread #:group #f 1)) => 1
-        (force (delay/thread 1 #:group #f 2)) => 2
-        (force (delay/thread #:groupie #f 1)) =error> "bad syntax"))
-
-;; basic delay/lazy/force tests
-(define (test-basic-promises)
-  (define thunk1 (lambda () 1))
-  (define promise1 (delay 1))
-  (define ? #f)
-  ;; test a few different values
-  (define-syntax-rule (t (f x ...))
-    (begin (set! ? 1)      (test (f x ...) => ?)
-           (set! ? '())    (test (f x ...) => ?)
-           (set! ? '(1))   (test (f x ...) => ?)
-           (set! ? thunk1) (test (f x ...) => ?)))
-  (define-syntax-rule (t* (f x ...))
-    (begin (t (f x ...)) (set! ? promise1) (test (f x ...) => ?)))
-  ;; `force' is identity for non-promises
-  (t (force ?))
-  ;; basic checks that `delay' works as expected with all kinds of values
-  (t* (force (delay ?)))
-  (t* (force (force (delay (delay ?)))))
-  (t* (force (delay (force (delay ?)))))
-  ;; basic checks that `lazy' works as expected with all kinds of values
-  (t (force (lazy ?)))
-  (t (force (lazy (lazy ?))))
-  (t (force (force (lazy (lazy ?)))))
-  (t (force (lazy (lazy (lazy (lazy ?))))))
-  ;; check that `lazy' combines as expected with `delay' in regards to `force'
-  ;;   (generally, each `L*D?' sequence requires a force)
-  (t* (force (lazy (delay ?))))
-  (t* (force (lazy (lazy (delay ?)))))
-  (t* (force (lazy (lazy (lazy (delay ?))))))
-  ;; two delays = two forces
-  (t* (force (force (lazy (delay (delay ?))))))
-  (t* (force (force (delay (lazy (delay ?))))))
-  (t* (force (force (lazy (lazy (delay (delay ?)))))))
-  (t* (force (force (lazy (delay (lazy (delay ?)))))))
-  (t* (force (force (delay (lazy (lazy (delay ?)))))))
-  (t* (force (force (lazy (lazy (lazy (delay (delay ?))))))))
-  (t* (force (force (lazy (lazy (delay (lazy (delay ?))))))))
-  (t* (force (force (lazy (delay (lazy (lazy (delay ?))))))))
-  (t* (force (force (delay (lazy (lazy (lazy (delay ?))))))))
-  ;; now push the second force inside
-  (t* (force (lazy  (force (delay (delay ?))))))
-  (t* (force (delay (force (lazy (delay ?))))))
-  (t* (force (lazy  (force (lazy (delay (delay ?)))))))
-  (t* (force (lazy  (force (delay (lazy (delay ?)))))))
-  (t* (force (delay (force (lazy (lazy (delay ?)))))))
-  (t* (force (lazy  (force (lazy (lazy (delay (delay ?))))))))
-  (t* (force (lazy  (force (lazy (delay (lazy (delay ?))))))))
-  (t* (force (lazy  (force (delay (lazy (lazy (delay ?))))))))
-  (t* (force (delay (force (lazy (lazy (lazy (delay ?))))))))
-  (t* (force (lazy  (delay (force (delay ?))))))
-  (t* (force (lazy  (lazy  (force (delay (delay ?)))))))
-  (t* (force (lazy  (delay (force (lazy (delay ?)))))))
-  (t* (force (lazy  (lazy  (force (lazy (delay (delay ?))))))))
-  (t* (force (lazy  (lazy  (force (delay (lazy (delay ?))))))))
-  (t* (force (lazy  (delay (force (lazy (lazy (delay ?))))))))
-  (t* (force (lazy  (lazy  (delay (force (delay ?)))))))
-  (t* (force (lazy  (lazy  (lazy  (force (delay (delay ?))))))))
-  (t* (force (lazy  (lazy  (delay (force (lazy (delay ?)))))))))
-
-(define (test-basic-promise-behavior)
-  (define (force+catch p) (with-handlers ([exn? values]) (force p)))
-  ;; results are cached
-  (let* ([c 0] [p (delay (set! c (add1 c)) c)])
-    (test c => 0
-          (force p) => 1
-          (force p) => 1
-          (force p) => 1
-          c => 1))
-  ;; errors are caught
-  (let ([p #f])
-    (test (void? (set! p (delay (error "BOOM"))))
-          (force p) =error> "BOOM"
-          (eq? (force+catch p) (force+catch p)))) ; and cached
-  ;; raised values too
-  (let ([c 0] [p #f])
-    (test (void? (set! p (delay (set! c (add1 c)) (raise c))))
-          c => 0
-          (force p) => (raise 1)
-          (force p) => (raise 1)
-          c => 1))
-  ;; test the predicates
-  (letrec ([forced+running?
-            (lambda (p) (list (promise-forced? p) (promise-running? p)))]
-           [p (delay (forced+running? p))])
-    (test (forced+running? p) => '(#f #f)
-          (force p)           => '(#f #t)
-          (forced+running? p) => '(#t #f))))
-
-(define (test-printout)
-  (letrec ([foo (delay (set! s (format "~a" foo)) 3)] [s #f])
-    (test (format "~a" foo) => "#<promise:foo>"
-          (force foo) => 3
-          s => "#<promise:!running!foo>"
-          (format "~a" foo) => "#<promise!3>"))
-  (let ([foo (delay (values 1 2 3))])
-    (test (format "~a" foo) => "#<promise:foo>"
-          (force foo) => (values 1 2 3)
-          (format "~a" foo) => "#<promise!(values 1 2 3)>"))
-  (let ([foo (delay (error "boom"))])
-    (test (format "~a" foo) => "#<promise:foo>"
-          (force foo) => (error "boom")
-          (format "~a" foo) => "#<promise!exn!boom>"
-          (format "~s" foo) => "#<promise!exn!\"boom\">"))
-  (let ([foo (delay (raise 3))])
-    (test (format "~a" foo) => "#<promise:foo>"
-          (force foo) => (raise 3)
-          (format "~a" foo) => "#<promise!raise!3>")))
-
-(define (test-delay/name)
-  (let* ([x 1] [p (delay/name (set! x (add1 x)) x)])
-    (test (promise? p)
-          x => 1
-          (force p) => 2
-          x => 2
-          (format "~a" p) => "#<promise:p>"
-          (force p) => 3
-          x => 3)))
-
-(define (test-delay/strict)
-  (let* ([x 1] [p (delay/strict (set! x (add1 x)) x)])
-    (test (promise? p)
-          x => 2
-          (force p) => 2
-          x => 2
-          (force (delay/strict (values 1 2 3))) => (values 1 2 3)
-          (promise? (force (delay/strict (delay 1)))))))
-
-(define (test-delay/sync)
-  (letrec ([p (delay/sync (force p))])
-    (test (force p) =error> "reentrant"))
-  (let* ([ch (make-channel)]
-         [p (delay/sync (channel-get ch) (channel-get ch) 99)])
-    (test (format "~a" p) => "#<promise:p>")
-    (thread (lambda () (force p) (channel-get ch)))
-    (channel-put ch 'x)
-    (test (format "~a" p) => "#<promise:!running!p>")
-    (channel-put ch 'x)
-    (channel-put ch 'x)
-    (test (format "~a" p) => "#<promise!99>"
-          (force p) => 99)))
-
-(define (test-delay/thread)
-  (define-syntax-rule (t delayer)
-    (begin (let* ([ch (make-channel)]
-                  [p (delayer (channel-get ch) 99)])
-             (thread (lambda () (channel-put ch 'x)))
-             (test (force p) => 99))
-           (test (force (delayer (+ 1 "2"))) =error> "contract violation")))
-  (t delay/sync)
-  (t delay/idle)
-  (let* ([ch (make-channel)] [p (delay/idle #:wait-for ch 99)])
-    (test (format "~a" p) => "#<promise:p>"
-          (force p) => 99
-          (format "~a" p) => "#<promise!99>"))
-  (let* ([ch (make-channel)]
-         [p (delay/idle #:wait-for ch (channel-get ch) 99)])
-    (channel-put ch 'x)
-    (test (format "~a" p) => "#<promise:!running!p>"
-          (channel-put ch 'x)
-          (force p) => 99
-          (format "~a" p) => "#<promise!99>")))
-
-(provide promise-tests)
-(module+ main (promise-tests))
-(define (promise-tests)
-  (test do (test-syntax)
-        do (test-types)
-        do (test-basic-promises)
-        do (test-basic-promise-behavior)
-        do (test-printout)
-        do (test-delay/name)
-        do (test-delay/strict)
-        do (test-delay/sync)
-        do (test-delay/thread)
-        ;; misc tests
-        (let ([x (lazy (delay 1))]) (force x) (force x)) => 1
-        ))
diff --git a/pkgs/lazy/tests/space.rkt b/pkgs/lazy/tests/space.rkt
deleted file mode 100644
index 12841befd8..0000000000
--- a/pkgs/lazy/tests/space.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester)
-
-;; tests for space safety, especially for `or' and `and'
-(provide space-tests)
-(module+ main (space-tests))
-(define (space-tests)
-  (define (one-test first-class?)
-    (collect-garbage)
-    (define mem (current-memory-use))
-    (define t
-      (thread
-       (lambda ()
-         (parameterize ([current-namespace (make-base-namespace)])
-           (eval
-            `(module loop lazy
-               (let ()
-                 (define (list-from n)
-                   (if (= n 500000)
-                       empty
-                       (cons n (list-from (add1 n)))))
-                 ,@(if first-class?
-                       `((define (my-or  x y) (or  x y))
-                         (define (my-and x y) (and x y)))
-                       '())
-                 (define (has-negative? l)
-                   (,(if first-class? 'my-and 'and)
-                    (pair? l)
-                    (,(if first-class? 'my-or 'or)
-                     (negative? (car l))
-                     (has-negative? (rest l)))))
-                 (! (has-negative? (list-from 0))))))
-           (parameterize ([current-output-port (open-output-bytes)])
-             (eval `(require 'loop)))))))
-    (thread (lambda ()
-              (let loop ()
-                (sleep 0.2)
-                (unless ((current-memory-use) . < . (* 10 mem))
-                  (eprintf "too much memory!")
-                  (kill-thread t))
-                (when (thread-running? t)
-                  (loop)))))
-    (sync t)
-    (void))
-  (one-test #f)
-  (one-test #t))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/LICENSE.txt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/LICENSE.txt
deleted file mode 100644
index 21e0ca3c02..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-macro-debugger-text-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/info.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/info.rkt
deleted file mode 100644
index d60961b29b..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"
-               "parser-tools-lib"
-               "unstable-list-lib"))
-
-(define pkg-desc "The macro debugger tool with a console interface")
-
-(define pkg-authors '(ryanc))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/check-requires.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/check-requires.rkt
deleted file mode 100644
index 1b13c8915e..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/check-requires.rkt
+++ /dev/null
@@ -1,299 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         racket/cmdline
-         racket/match
-         syntax/modcollapse
-         "private/get-references.rkt"
-         "private/nom-use-alg.rkt"
-         "private/util.rkt")
-(provide/contract
- [check-requires
-  (->* (module-path?)
-       (#:show-keep? any/c
-        #:show-bypass? any/c
-        #:show-drop? any/c
-        #:show-uses? any/c)
-       void?)]
- [show-requires (-> module-path? list?)]
- [mpi->key (-> module-path-index? any/c)])
-
-#|
-==========
-
-Notes
-
-  Ignore recommendations to DROP or BYPASS modules with side
-  effects. Read the section below (How it works) and also see
-  util/moduledb.rkt for whitelisting side-effectful modules.
-
-  The script is not intelligent about the language, which causes
-  certain spurious recommendations to appear frequently. For example,
-
-    DROP scheme/mzscheme at 1
-
-  means that the module's language is mzscheme, which automatically
-  inserts (require-for-syntax scheme/mzscheme). It's infeasible to
-  remove it except by rewriting the module in scheme/base or
-  racket/base.
-
-==========
-
-How it works
-
-Determining whether a require is actually useless is impossible: a
-module may be required for compile-time side effect only, and there's
-no way to monitor that.
-
-Here are some approximations that are feasible to calculate:
-
-NOM-USES = A require R is "used" by a module M if, during the
-compilation of M, a reference is resolved to a binding exported by R.
-
-DEF-USES = A require R is "used" by a module M if, during the
-compilation of M, a reference is resolved to a binding defined in R.
-
-The limitations:
- - misses side-effects
- - misses identifiers recognized via 'free-identifier=?'
-   (But those should be recorded as 'disappeared-use anyway.)
-
-==========
-
-TODO
-
-Handle for-label.
-
-Let user provide database of modules that should never be dropped, eg
-because they have side effects.
-  - wouldn't it be awesome if this db could be a datalog program?
-  - start simpler, though
-
-Ambitious mode could analyze module and recommend ways to split module
-into independent submodules.
-|#
-
-;; ========================================
-
-#|
-A recommendation is one of
-  (list 'keep   module-path-index phase Refs)
-  (list 'bypass module-path-index phase RefineTable)
-  (list 'drop   module-path-index phase)
-|#
-
-;; analyze-requires : module-path -> (listof recommendation)
-(define (analyze-requires mod-path)
-  (let-values ([(compiled deriv) (get-module-code/trace mod-path)])
-    (nom-use-alg (deriv->refs deriv) compiled)))
-
-;; ========================================
-
-#|
-A displayed-recommendation is one of
-  (list 'keep   module-path phase)
-  (list 'bypass module-path phase (listof (list module-path phase)))
-  (list 'drop   module-path phase)
-
-A displayed-recommendation is similar to a recommendation, but
-converts the module-path-indexes to module paths, omits the use-lists,
-and simplifies the replacements lists.
-|#
-
-;; show-requires: module-path -> (listof displayed-recommendation)
-(define (show-requires mod-path)
-  (for/list ([entry (in-list (analyze-requires mod-path))])
-    (match entry
-      [(list 'keep mpi phase uses)
-       (list 'keep (mpi->key mpi) phase)]
-      [(list 'bypass mpi phase bypass)
-       (list 'bypass (mpi->key mpi) phase
-             (let ([bypass (flatten-bypass bypass)])
-               (for/list ([(modpath+reqphase inner) (in-hash bypass)])
-                 (list (car modpath+reqphase)
-                       (cdr modpath+reqphase)
-                       (any-renames? (imps->use-table inner))))))]
-      [(list 'drop mpi phase)
-       (list 'drop (mpi->key mpi) phase)])))
-
-;; ========================================
-
-(define (check-requires mod
-                        #:show-keep? [show-keep? #t]
-                        #:show-bypass? [show-bypass? #t]
-                        #:show-drop? [show-drop? #t]
-                        #:show-uses? [show-uses? #f])
-
-  (define (show-bypass mpi bypass)
-    (for ([(modname+reqphase inner) (flatten-bypass bypass)])
-      (let ([modname (car modname+reqphase)]
-            [reqphase (cdr modname+reqphase)]
-            [use-table (imps->use-table inner)])
-        (printf "  TO ~s at ~s~a\n" modname reqphase
-                (cond [(any-renames? use-table)
-                       " WITH RENAMING"]
-                      [else ""]))
-        (when show-uses?
-          (show-uses use-table 4)))))
-
-  (let ([recs (analyze-requires mod)])
-    (for ([rec (in-list recs)])
-      (match rec
-        [(list 'keep mpi phase uses)
-         (when show-keep?
-           (printf "KEEP ~s at ~s\n"
-                   (mpi->key mpi) phase)
-           (when show-uses?
-             (show-uses (imps->use-table uses) 2)))]
-        [(list 'bypass mpi phase bypass)
-         (when show-bypass?
-           (printf "BYPASS ~s at ~s\n" (mpi->key mpi) phase)
-           (show-bypass mpi bypass))]
-        [(list 'drop mpi phase)
-         (when show-drop?
-           (printf "DROP ~s at ~s\n" (mpi->key mpi) phase))]))))
-
-;; ----
-
-;; flatten-bypass : RefineTable -> hash[(cons module-path int) => Imps]
-(define (flatten-bypass table)
-  (let ([flat-table (make-hash)]) ;; hash[(cons module-path int) => Imps]
-    (let loop ([table table] [mpi-ctx null])
-      (for ([(mod+reqphase inner) (in-hash table)])
-        (let* ([mod (car mod+reqphase)]
-               [reqphase (cdr mod+reqphase)]
-               [mpis (cons mod mpi-ctx)])
-          (cond [(hash? inner)
-                 (loop inner mpis)]
-                [else
-                 ;; key may already exist, eg with import diamonds; so append
-                 (let* ([modpath (mpi-list->module-path mpis)]
-                        [key (cons modpath reqphase)])
-                   (hash-set! flat-table key
-                              (append inner (hash-ref flat-table key null))))]))))
-    flat-table))
-
-(define (ref->symbol r)
-  (match r
-    [(ref phase id mode (list dm ds nm ns dp ips np))
-     (cond [id (syntax-e id)]
-           [else ns])]))
-
-;; imps->use-table : Imps -> hash[(list phase prov-sym ref-sym) => (listof mode)]
-(define (imps->use-table imps)
-  (let ([table (make-hash)])
-    (for ([i (in-list imps)])
-      (match i
-        [(imp _m _p prov-sym _prov-phase r)
-         (let* ([phase (ref-phase r)]
-                [ref-sym (ref->symbol r)]
-                [mode (ref-mode r)]
-                [key (list phase prov-sym ref-sym)]
-                [modes (hash-ref table key null)])
-           (unless (memq mode modes)
-             (hash-set! table key (cons mode modes))))]))
-    table))
-
-;; any-renames? : use-table -> boolean
-(define (any-renames? use-table)
-  (for/or ([key (in-hash-keys use-table)])
-    (match key
-      [(list phase prov-sym ref-sym)
-       (not (eq? prov-sym ref-sym))])))
-
-;; show-uses : use-table nat -> void
-(define (show-uses use-table indent)
-  (let* ([unsorted
-          (for/list ([(key modes) (in-hash use-table)])
-            (cons key (sort modes < #:key mode->nat)))]
-         [sorted
-          (sort unsorted
-                (lambda (A B)
-                  (let ([pA (car A)]
-                        [pB (car B)])
-                    (or (< pA pB)
-                        (and (= pA pB)
-                             (let ([strA (symbol->string (cadr A))]
-                                   [strB (symbol->string (cadr B))])
-                               (string<? strA strB))))))
-                #:key car)]
-         [spacer (make-string indent #\space)])
-    (for ([elem (in-list sorted)])
-      (match elem
-        [(cons (list phase prov-sym ref-sym) modes)
-         (printf "~a~a at ~a ~a~a\n"
-                 spacer prov-sym phase modes
-                 (cond [(eq? ref-sym prov-sym) ""]
-                       [else (format " RENAMED TO ~a" ref-sym)]))]))))
-
-;; ========================================
-
-(require racket/cmdline
-         raco/command-name)
-(provide main)
-
-#|
-Example (from racket root directory):
-
-  racket -lm macro-debugger/analysis/check-requires \
-    collects/syntax/*.rkt
-
-  racket -lm macro-debugger/analysis/check-requires -- -bu \
-    collects/syntax/*.rkt
-
-|#
-
-(define (main . args)
-
-  ;; show-keep? : boolean
-  ;; Show KEEP messages in output.
-  (define show-keep? #f)
-
-  ;; show-bypass? : boolean
-  ;; Show BYPASS messages in output.
-  (define show-bypass? #f)
-
-  ;; show-uses? : boolean
-  (define show-uses? #f)
-
-  ;; ========
-
-  (define (go mod)
-    (printf "~s:\n" mod)
-    (with-handlers ([exn:fail?
-                     (lambda (exn)
-                       (printf "ERROR in ~s\n" mod)
-                       ((error-display-handler) (exn-message exn) exn))])
-      (check-requires mod
-                      #:show-keep? show-keep?
-                      #:show-bypass? show-bypass?
-                      #:show-uses? show-uses?))
-    (newline))
-
-  ;; Command-line args are interpreted as files if the file exists,
-  ;; module names otherwise.
-  (command-line
-   #:program (short-program+command-name)
-   #:argv args
-   #:once-each
-   [("-k" "--show-keep")
-    "Show KEEP recommendations"
-    (set! show-keep? #t)]
-   [("-b" "--show-bypass")
-    "Show BYPASS recommendations"
-    (set! show-bypass? #t)]
-   [("-u" "--show-uses")
-    "Show uses for each module"
-    (set! show-uses? #t)]
-   #:args args
-   (for ([arg (in-list args)])
-     (cond [(file-exists? arg)
-            (go `(file ,arg))]
-           [else
-            (let* ([inport (open-input-string arg)]
-                   [mod (read inport)])
-              (unless (eof-object? (peek-char inport))
-                (error "bad module name:" arg))
-              (go mod))]))))
-
-(module* main #f
-  (apply main (vector->list (current-command-line-arguments))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/get-references.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/get-references.rkt
deleted file mode 100644
index 48f6daec7b..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/get-references.rkt
+++ /dev/null
@@ -1,226 +0,0 @@
-#lang racket/base
-(require racket/match
-         macro-debugger/model/deriv
-         unstable/struct
-         "util.rkt")
-(provide deriv->refs)
-
-;; ========
-
-;; phase : (parameterof nat)
-(define phase (make-parameter 0))
-(define (add-disappeared-uses?) #t)
-
-;; ========
-
-;; deriv->refs : *Deriv* -> Refs
-;; *Deriv* = Deriv | LDeriv | BRule | ModRule | ... (anything from deriv.rkt)
-(define (deriv->refs deriv0)
-
-  ;; refs : (listof Refs), mutable
-  (define refs null)
-
-  (define (recur . args)
-    (let check ([arg args])
-      (cond [(syntax? arg) (error 'deriv->refs "internal error on ~s" arg)]
-            [(list? arg) (for-each check arg)]
-            [else (void)]))
-    (for ([arg (in-list args)])
-      (if (list? arg)
-          (apply recur arg)
-          (analyze-deriv arg))))
-  (define (recur/phase-up . args)
-    (parameterize ((phase (add1 (phase))))
-      (apply recur args)))
-  (define (add-refs! rs)
-    (set! refs (append rs refs)))
-  (define (add! ids [mode 'reference])
-    (let ([p (phase)])
-      (add-refs! (for/list ([id (in-list ids)])
-                   (ref p id mode (identifier-binding id p))))))
-  (define (add/binding! id binding mode)
-    (add-refs! (list (ref (phase) id mode binding))))
-
-  ;; analyze/quote-syntax : stx -> void
-  ;; Current approach: estimate that an identifier in a syntax template
-  ;; may be used at (sub1 (phase)) or (phase).
-  ;; FIXME: Allow for more conservative choices, too.
-  ;; FIXME: #%top, #%app, #%datum, etc?
-  ;; FIXME: Track tentative (in quote-syntax) references separately?
-  (define (analyze/quote-syntax qs-stx)
-    (let ([phases (for/list ([offset '(0 1 -1 2 -2)]) (+ (phase) offset))]
-          [stx (syntax-case qs-stx ()
-                 [(_quote-syntax x) #'x])])
-      (define (add*! id)
-        (add-refs! (for/list ([p (in-list phases)])
-                     (ref p id 'quote-syntax (identifier-binding id p)))))
-      (let loop ([stx stx])
-        (let ([d (if (syntax? stx) (syntax-e stx) stx)])
-          (cond [(identifier? stx) (add*! stx)]
-                [(pair? d)
-                 (loop (car d))
-                 (loop (cdr d))]
-                [(vector? d)
-                 (map loop (vector->list d))]
-                [(prefab-struct-key d)
-                 (map loop (struct->list d))]
-                [(box? d)
-                 (loop (unbox d))]
-                [else
-                 (void)])))))
-
-  (define (analyze-deriv deriv)
-    ;; Handle common base (ie, resolves) part of derivs, if applicable
-    (match deriv
-      [(base z1 z2 resolves ?1)
-       (add! resolves)
-       (when (and (syntax? z2) (add-disappeared-uses?))
-         (let ([uses (syntax-property z2 'disappeared-use)])
-           (add! (let loop ([x uses] [onto null])
-                   (cond [(identifier? x) (cons x onto)]
-                         [(pair? x) (loop (car x) (loop (cdr x) onto))]
-                         [else onto]))
-                 'disappeared-use)))]
-      [_
-       (void)])
-    ;; Handle individual variants
-    (match deriv
-      [(lift-deriv z1 z2 first lift-stx second)
-       (recur first second)]
-      [(tagrule z1 z2 tagged-stx next)
-       (recur next)]
-      [(lift/let-deriv z1 z2 first lift-stx second)
-       (recur first second)]
-      [(mrule z1 z2 rs ?1 me1 locals me2 ?2 etx next)
-       (recur locals next)]
-      [(local-exn exn)
-       (void)]
-      [(local-expansion z1 z2 for-stx? me1 inner lifted me2 opaque)
-       ((if for-stx? recur/phase-up recur) inner)]
-      [(local-lift expr ids)
-       (void)]
-      [(local-lift-end decl)
-       (void)]
-      [(local-lift-require req expr mexpr)
-       (void)]
-      [(local-lift-provide prov)
-       (void)]
-      [(local-bind names ?1 renames bindrhs)
-       (recur bindrhs)]
-      [(local-value name ?1 resolves bound? binding)
-       #|
-       Beware: in one common case, local-member-name, the binding of name is
-       mutated (because used as binder in class body), so original binding is lost!
-       Use binding instead.
-       |#
-       (when (and bound? (pair? binding))
-         (add/binding! name binding 'syntax-local-value))]
-      [(track-origin before after)
-       (void)]
-      [(local-remark contents)
-       (void)]
-      [(p:variable z1 z2 rs ?1)
-       (void)]
-      [(p:module z1 z2 rs ?1 locals tag rename check tag2 ?3 body shift)
-       (recur locals check body)]
-      [(p:#%module-begin z1 z2 rs ?1 me body ?2 subs)
-       (recur body subs)]
-      [(p:define-syntaxes z1 z2 rs ?1 prep rhs locals)
-       (recur prep locals)
-       (recur/phase-up rhs)]
-      [(p:define-values z1 z2 rs ?1 rhs)
-       (recur rhs)]
-      [(p:begin-for-syntax z1 z2 rs ?1 prep body locals)
-       (recur prep locals)
-       (recur/phase-up body)]
-      [(p:#%expression z1 z2 rs ?1 inner untag)
-       (recur inner)]
-      [(p:if z1 z2 rs ?1 test then else)
-       (recur test then else)]
-      [(p:wcm z1 z2 rs ?1 key mark body)
-       (recur key mark body)]
-      [(p:set! _ _ _ _ id-resolves ?2 rhs)
-       (add! id-resolves)
-       (recur rhs)]
-      [(p:set!-macro _ _ _ _ deriv)
-       (recur deriv)]
-      [(p:#%app _ _ _ _ lderiv)
-       (recur lderiv)]
-      [(p:begin _ _ _ _ lderiv)
-       (recur lderiv)]
-      [(p:begin0 _ _ _ _ first lderiv)
-       (recur first lderiv)]
-      [(p:lambda _ _ _ _ renames body)
-       (recur body)]
-      [(p:case-lambda _ _ _ _ renames+bodies)
-       (recur renames+bodies)]
-      [(p:let-values _ _ _ _ renames rhss body)
-       (recur rhss body)]
-      [(p:letrec-values _ _ _ _ renames rhss body)
-       (recur rhss body)]
-      [(p:letrec-syntaxes+values _ _ _ _ srenames prep sbindrhss vrenames vrhss body tag)
-       (recur prep sbindrhss vrhss body)]
-      [(p:provide _ _ _ _ inners ?2)
-       (recur inners)]
-      [(p:require _ _ _ _ locals)
-       (recur locals)]
-      [(p:submodule _ _ _ _ exp)
-       (recur exp)]
-      [(p:submodule* _ _ _ _)
-       (void)]
-      [(p:#%stratified-body _ _ _ _ bderiv)
-       (recur bderiv)]
-      [(p:stop _ _ _ _) (void)]
-      [(p:unknown _ _ _ _) (void)]
-      [(p:#%top _ _ _ _)
-       (void)]
-      [(p:#%datum _ _ _ _) (void)]
-      [(p:quote _ _ _ _) (void)]
-      [(p:quote-syntax z1 z2 _ _)
-       (when z2 (analyze/quote-syntax z2))]
-      [(p:#%variable-reference _ _ _ _)
-       (void)]
-      [(lderiv _ _ ?1 derivs)
-       (recur derivs)]
-      [(bderiv _ _ pass1 trans pass2)
-       (recur pass1 pass2)]
-      [(b:error ?1)
-       (void)]
-      [(b:expr _ head)
-       (recur head)]
-      [(b:splice _ head ?1 tail ?2)
-       (recur head)]
-      [(b:defvals _ head ?1 rename ?2)
-       (recur head)]
-      [(b:defstx _ head ?1 rename ?2 prep bindrhs)
-       (recur head prep bindrhs)]
-      [(bind-syntaxes rhs locals)
-       (recur/phase-up rhs)
-       (recur locals)]
-      [(clc ?1 renames body)
-       (recur body)]
-      [(module-begin/phase pass1 pass2 pass3)
-       (recur pass1 pass2 pass3)]
-      [(mod:prim head rename prim)
-       (recur head prim)]
-      [(mod:splice head rename ?1 tail)
-       (recur head)]
-      [(mod:lift head locals renames tail)
-       (recur head locals)]
-      [(mod:lift-end tail)
-       (void)]
-      [(mod:cons head locals)
-       (recur head locals)]
-      [(mod:skip)
-       (void)]
-      ;; Shouldn't occur in module expansion.
-      ;; (Unless code calls 'expand' at compile-time; weird, but possible.)
-      [(ecte _ _ locals first second locals2)
-       (recur locals first second locals2)]
-      [(bfs:lift lderiv lifts)
-       (recur lderiv)]
-      [#f
-       (void)]))
-
-  (analyze-deriv deriv0)
-  refs)
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/moduledb.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/moduledb.rkt
deleted file mode 100644
index e005eed8a3..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/moduledb.rkt
+++ /dev/null
@@ -1,96 +0,0 @@
-#lang racket/base
-(require syntax/modresolve
-         setup/path-to-relative
-         racket/match)
-(provide allow-bypass?
-         allow-drop?
-         bypass-ok-mpi?)
-
-(define (allow-bypass? mod)
-  (not (memq (lookup mod) '(no-bypass no-drop))))
-
-(define (allow-drop? mod)
-  (not (memq (lookup mod) '(no-drop))))
-
-;; A ModuleDB = hash[path/symbol => (U 'no-drop 'no-bypass)]
-;;   'no-drop = must not be dropped or bypassed because of, eg, side effects
-;;   'no-bypass = don't bypass in favor of private component modules
-;;                but if the module is unused, can drop it
-;;                (FIXME: replace with component module calculation and checking)
-
-(define (make-module-db no-drop-list no-bypass-list)
-  (let ([mod+config-list
-         (append (for/list ([no-drop (in-list no-drop-list)])
-                   (list no-drop 'no-drop))
-                 (for/list ([no-bypass (in-list no-bypass-list)])
-                   (list no-bypass 'no-bypass)))])
-    (for/hash ([mod+config (in-list mod+config-list)])
-      (values (resolve-module-path (car mod+config) #f) (cadr mod+config)))))
-
-(define (lookup mod)
-  (let ([name (resolved-module-path-name (module-path-index-resolve mod))])
-    (cond [(symbol? name) 'no-bypass]
-          [(hash-ref module-db name #f)
-           => values]
-          [(path? name)
-           (let ([str (path->relative-string/library name)])
-             (for/or ([rx (in-list no-bypass-rxs)])
-               (and (regexp-match? rx str) 'no-bypass)))]
-          [else #f])))
-
-;; module-db : ModuleDB
-(define module-db
-  (make-module-db
-   ;; no-drop
-   '('#%builtin
-     errortrace
-     scheme/mzscheme ;; introduced by mzscheme's #%module-begin; can't drop
-     racket/contract/private/basic-opters
-     racket/contract/private/opters
-     typed-racket/private/base-env
-     typed-racket/private/base-special-env
-     typed-racket/private/base-env-numeric
-     typed-racket/private/base-env-indexing)
-   ;; no-bypass
-   '(mred
-     mzscheme
-     openssl
-     racket/gui/base
-     racket/match
-     scheme/gui/base
-     slideshow/base
-     string-constants
-     syntax/parse
-     wxme)))
-
-(define no-bypass-rxs
-  '(#rx"^<collects>/srfi/[0-9]+\\.rkt$"))
-
-;; ========================================
-
-;; bypass-ok-mpi? : mpi -> boolean
-;; Okay to recommend mod as a replacement in bypass? (heuristic)
-(define (bypass-ok-mpi? mpi)
-  (define (no-private? s) (not (regexp-match? #rx"private" s)))
-  (define legacy-rxs (list #rx"^mzlib" #rx"^texpict"))
-  (define (ok? s)
-    (and (no-private? s)
-         (for/and ([rx (in-list legacy-rxs)])
-           (not (regexp-match? rx s)))))
-  (let-values ([(modpath relto) (module-path-index-split mpi)])
-    (match modpath
-      [(list 'quote name)
-       (not (regexp-match? #rx"^#%" (symbol->string name)))]
-      [(? string?)
-       (ok? modpath)]
-      [(list 'lib parts ...)
-       (andmap ok? parts)]
-      [(? symbol?)
-       (ok? (symbol->string modpath))]
-      [(list 'file part)
-       (ok? part)]
-      [(list 'planet part ...)
-       #t]
-      [(list* 'submod base _)
-       ;; Never bypass to submodules
-       #f])))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/nom-use-alg.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/nom-use-alg.rkt
deleted file mode 100644
index a7dc997e66..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/nom-use-alg.rkt
+++ /dev/null
@@ -1,197 +0,0 @@
-#lang racket/base
-(require racket/match
-         "moduledb.rkt"
-         "util.rkt")
-(provide nom-use-alg)
-
-;; nom-use-alg : Refs compiled -> (listof recommendation)
-(define (nom-use-alg refs0 compiled)
-  (let ([refs (append (provides->refs compiled) refs0)])
-    (let-values ([(NOM-USES DEF-USES) (calculate-used-approximations refs)])
-      (report NOM-USES DEF-USES (get-requires compiled)))))
-
-;; ========
-
-;; sMPI = S-expr form of mpi (see mpi->key)
-;; Using MPIs doesn't work. I conjecture that the final module shift means that
-;; all during-expansion MPIs are different from all compiled-expr MPIs.
-
-;; A UsedTable = hash[(list int sMPI) => Refs]
-
-;; calculate-used-approximations : Refs -> (values UsedTable UsedTable)
-(define (calculate-used-approximations refs)
-  (let ([NOM-USES (make-hash)]
-        [DEF-USES (make-hash)])
-    (for ([ref (in-list refs)])
-      (when (relevant? ref)
-        (match (ref-binding ref)
-          [(list def-mod def-sym nom-mod nom-sym
-                 def-phase nom-imp-phase nom-exp-phase)
-           (define use-phase (ref-phase ref))
-           (when def-mod
-             ;; use-phase = def-phase + required-phase
-             ;; thus required-phase = use-phase - def-phase
-             (let* ([required-phase (- use-phase def-phase)]
-                    [key (list required-phase (mpi->key def-mod))])
-               (hash-set! DEF-USES key
-                          (cons ref (hash-ref DEF-USES key null)))))
-           ;; We just care about nom-imp-phase, since importing into *here*
-           (let* ([key (list nom-imp-phase (mpi->key nom-mod))])
-             (hash-set! NOM-USES key
-                        (cons ref (hash-ref NOM-USES key null))))]
-          [_ (void)])))
-    (values NOM-USES DEF-USES)))
-
-;; relevant? : Ref -> boolean
-;; Only want identifiers actually originating from module being analyzed,
-;; not identifiers from other modules inserted by macro expansion.
-;; - Actually, want identifiers with lexical context of module, which includes
-;;   some identifiers not originating from module (eg, inserted by unit-from-context).
-;; - Also, if ref represents a re-export, no identifier but still relevant.
-;; So, use syntax-source-module conservatively: only to disqualify refs.
-(define (relevant? ref)
-  (let* ([phase (ref-phase ref)]
-         [id (ref-id ref)]
-         [binding (ref-binding ref)]
-         [srcmod (and id (syntax-source-module id))])
-    (cond [(and srcmod (not (here-mpi? srcmod))) #f]
-          [else #t])))
-
-;; ========
-
-;; get-requires : compiled-module-expr -> (listof (list int MPI))
-(define (get-requires compiled)
-  (let ([phase+mods-list (module-compiled-imports compiled)])
-    (for*/list ([phase+mods (in-list phase+mods-list)]
-                #:when (car phase+mods) ;; Skip for-label requires
-                [mod (cdr phase+mods)])
-      (list (car phase+mods) mod))))
-
-;; provides->refs : compiled-module-expr -> Refs
-(define (provides->refs compiled)
-  (let-values ([(vprov sprov) (module-compiled-exports compiled)])
-    (for*/list ([phase+exps (in-list (append vprov sprov))]
-                #:when (car phase+exps) ;; Skip for-label provides
-                [name+srcs (in-list (cdr phase+exps))]
-                [src (in-list (cadr name+srcs))])
-      (let ([phase (car phase+exps)]
-            [name (car name+srcs)])
-
-        (define (->ref nom-mod exp-sym phase-shift sym orig-phase)
-          ;; We don't have the DEF information, so put #f
-          (let ([b (list #f #f nom-mod sym #f phase-shift orig-phase)])
-            (ref phase #f 'provide b)))
-
-        (match src
-          [(? module-path-index?)
-           (->ref src name 0 name phase)]
-          [(list imp-mod imp-phase-shift imp-name imp-orig-phase)
-           (->ref imp-mod name imp-phase-shift imp-name imp-orig-phase)])))))
-
-;; ========
-
-;; A RefineTable is hash[(cons mpi phase) => (or RefineTable Imps)]
-;; preserve nesting because inner MPIs need to be resolved wrt outer MPIs
-
-;; try-bypass : mpi phase Refs -> RefineTable or #f
-(define (try-bypass mod reqphase refs)
-  ;; refs are all nominally from mod
-  (let* ([imps (map ref->imp refs)])
-    (refine-imps/one-require mod reqphase imps)))
-
-;; refine-imps/one-require : mpi phase Imps -> RefineTable or #f
-;; where all imps come from mod at phase
-;; the result table contains new (refined) imps
-(define (refine-imps/one-require mod reqphase imps)
-  (let ([use-table (make-hash)] ;; RefineTable
-        [bytable (mod->bypass-table mod)])
-    (and (for/and ([i (in-list imps)])
-           (match i
-             [(imp _m _rp sym exp-phase r)
-              (let* ([bykey (cons sym exp-phase)]
-                     [src (hash-ref bytable bykey #f)])
-                (match src
-                  [(renm srcmod phase-shift srcsym srcphase)
-                   (let ([use-key (cons srcmod (+ reqphase phase-shift))]
-                         [imp* (imp srcmod (+ reqphase phase-shift) srcsym srcphase r)])
-                     (hash-set! use-table use-key (cons imp* (hash-ref use-table use-key null))))
-                   #t]
-                  [else #f]))]))
-         (refine-imps* use-table))))
-
-(define (refine-imps* partitions)
-  (for/hash ([(mod+reqphase imps) (in-hash partitions)])
-    (values mod+reqphase
-            (let ([mod (car mod+reqphase)]
-                  [reqphase (cdr mod+reqphase)])
-              (or (and (allow-bypass? mod)
-                       (refine-imps/one-require mod reqphase imps))
-                  imps)))))
-
-;; ========
-
-;; A BypassTable is hash[(cons sym phase) => Renm
-;; Contains only approved modules (no private, etc).
-
-;; A Renm is (renm srcmod reqphase srcsym)
-(struct renm (srcmod phase-shift srcsym srcphase))
-
-;; mod->bypass-table : mpi -> BypassTable
-;; FIXME: cache tables
-(define (mod->bypass-table mod)
-  (define table (make-hash))
-  (let/ec escape
-    (define prov
-      ;; FIXME: hack around mis-resolution of mpis in case of submodules
-      ;; by just bailing out; should just result in missed bypass opportunities
-      (with-handlers ([(lambda (e) #t)
-                       (lambda (e) (escape (void)))])
-        (get-module-all-exports mod)))
-    (for* ([phase+exps (in-list prov)]
-           #:when (car phase+exps) ;; Skip for-label provides
-           [name+srcs (in-list (cdr phase+exps))]
-           [src (in-list (cadr name+srcs))])
-      (let ([phase (car phase+exps)]
-            [name (car name+srcs)])
-
-        (define (add-source! src-mod phase-offset src-sym)
-          (when (bypass-ok-mpi? src-mod)
-            (let ([key (cons name phase)]
-                  ;; src-phase + phase-shift = phase
-                  [src-phase (- phase phase-offset)])
-              (hash-ref! table key (renm src-mod phase-offset src-sym src-phase)))))
-
-        (match src
-          [(? module-path-index?)
-           (add-source! src 0 name)]
-          [(list imp-mod imp-phase-shift imp-name imp-orig-phase)
-           (add-source! imp-mod imp-phase-shift imp-name)]))))
-  table)
-
-;; ========
-
-;; report : UseTable UseTable (listof (list int mpi)) -> (listof recommendation)
-(define (report NOM-USES DEF-USES phase+mod-list)
-  (for/list ([phase+mod (in-list phase+mod-list)])
-    (let* ([phase (car phase+mod)]
-           [mod (cadr phase+mod)]
-           [key (list phase (mpi->key mod))]
-           [nom-refs (hash-ref NOM-USES key null)]
-           [def-refs (hash-ref DEF-USES key null)])
-      (cond [(and (pair? nom-refs) (pair? def-refs))
-             ;; We use refs defined in the module (and we got them from the module)
-             (list 'keep mod phase (map ref->imp nom-refs))]
-            [(pair? nom-refs)
-             ;; We use refs gotten from the module (but defined elsewhere)
-             (let ([bypass
-                    (and (allow-bypass? mod)
-                         (try-bypass mod phase nom-refs))])
-               (if bypass
-                   (list 'bypass mod phase bypass)
-                   (list 'keep mod phase (map ref->imp nom-refs))))]
-            [else
-             ;; We don't have any refs gotten from the module
-             ;; (although we may---possibly---have refs defined in it, but gotten elsewhere)
-             (if (allow-drop? mod)
-                 (list 'drop mod phase)
-                 (list 'keep mod phase null))]))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/refine-alg.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/refine-alg.rkt
deleted file mode 100644
index 1aff99154e..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/refine-alg.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket/base
-
-;; intern Def, Use?
-
-;; A Def is (def sym resolved-module-path int)
-(struct def (sym mod phase) #:prefab)
-
-;; A Use is (use Def int)
-;; the offset is (ref-phase - def-phase)
-(struct use (def offset) #:prefab)
-
-;; A resolved is path or symbol.
-
-;; An import is (import resolved int)
-(struct import (resolved offset))
-
-;; ========
-
-;; uses : hash[Use => #t]
-;; reqs : hash[import => mpi]
-;; keeps : hash[import => mpi]
-
-#|
-
-(define (refine uses reqs keeps)
-  (unless (= (hash-count uses) 0)
-    (direct-def-uses uses reqs keeps)
-    (recur-on-imports uses reqs keeps)))
-
-|#
-
-(define (hash-choose h)
-  (let ([i (hash-iterate-first h)])
-    (and i (hash-iterate-value h i))))
-
-#|
-Algorithm for refining bypass modules
-
-loop: set of references (id, phase), set of requires (mod, phase)
-  for every reference DEFINED* in a require R
-    mark that require R NEEDED and remove from set
-    eliminate every reference provided by R
-      (including re-provides)
-  now every reference left is re-provided by some remaining require
-  recur on imports of requires
-
-DEFINED* : really, defined in this module OR imported from a "private" module.
-|#
-
-
-;; ====================
-
-#|
-Another algorithm
-
-Put all requires in priority queue, with max-depth-to-kernel
-priority...
-
-|#
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/util.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/util.rkt
deleted file mode 100644
index 0165ea55fe..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/util.rkt
+++ /dev/null
@@ -1,214 +0,0 @@
-#lang racket/base
-(require racket/path
-         racket/list
-         racket/match
-         syntax/modcode
-         syntax/modresolve
-         syntax/modcollapse
-         macro-debugger/model/trace)
-
-;; --------
-
-(provide (struct-out ref)
-         mode->nat
-         (struct-out imp)
-         ref->imp)
-
-;; A Ref is (ref phase id/#f identifier-binding Mode)
-;; the def-mod, def-sym, etc parts of identifier-binding may be #f (eg, provide)
-(struct ref (phase id mode binding))
-
-;; A Mode is one of '(reference syntax-local-value quote-syntax disappeared-use provide)
-(define (mode->nat mode)
-  (case mode
-    ((reference) 0)
-    ((provide) 1)
-    ((syntax-local-value) 2)
-    ((quote-syntax) 3)
-    ((disappeared-use) 4)
-    (else (error 'mode->nat "bad mode: ~s" mode))))
-
-;; An Imp is (imp mpi phase symbol phase Ref)
-(struct imp (mod reqphase sym exp-phase ref))
-;; interpretation: reference ref could be satisfied by
-;;   (require (only (for-meta reqphase (just-meta exp-phase mod)) sym))
-
-;; ref->imp : Ref -> Imp
-;; Assumes id gotten from nom-mod, etc.
-(define (ref->imp r)
-  (match (ref-binding r)
-    [(list _dm _ds nom-mod nom-sym _dp imp-shift nom-orig-phase)
-     (imp nom-mod imp-shift nom-sym nom-orig-phase r)]))
-
-;; --------
-
-(provide get-module-code/trace
-         here-mpi?
-         mpi->key
-         mpi->list
-         mpi-list->module-path)
-
-;; get-module-derivation : module-path -> (values compiled Deriv)
-(define (get-module-code/trace modpath)
-  (let-values ([(path subs)
-                (match (resolve-module-path modpath #f)
-                  [`(submod ,path . ,subs) (values path subs)]
-                  [path (values path null)])])
-    (get-module-code path
-                     #:submodule-path subs
-                     #:choose (lambda _ 'src)
-                     #:compile (lambda (stx)
-                                 (let-values ([(stx deriv) (trace/result stx expand)])
-                                   (values (compile stx) deriv))))))
-
-;; here-mpi? : any -> boolean
-(define (here-mpi? x)
-  (and (module-path-index? x)
-       (let-values ([(rel base) (module-path-index-split x)])
-         (and (eq? rel #f) (eq? base #f)))))
-
-(define (mpi->key x)
-  (let ([l (mpi->list x)])
-    (if (and (pair? l) (null? (cdr l)))
-        (car l)
-        l)))
-
-(define (mpi->list x)
-  (cond [(module-path-index? x)
-         (let-values ([(rel base) (module-path-index-split x)])
-           (if rel
-               (cons rel (mpi->list base))
-               null))]
-        [(eq? x #f)
-         null]
-        [else
-         (list x)]))
-
-(define (mpi-list->module-path mpi-list)
-  (let* ([mpi*
-          (let loop ([mpi #f] [mpi-list mpi-list])
-            (cond [mpi
-                   (let-values ([(mod base) (module-path-index-split mpi)])
-                     (cond [mod (module-path-index-join mod (loop base mpi-list))]
-                           [else (loop #f mpi-list)]))]
-                  [(pair? mpi-list)
-                   (loop (car mpi-list) (cdr mpi-list))]
-                  [else #f]))]
-         [collapsed
-          (let loop ([mpi mpi*])
-            (cond [mpi 
-                   (let-values ([(mod base) (module-path-index-split mpi)])
-                     (cond [mod
-                            (collapse-module-path mod (lambda () (loop base)))]
-                           [else (build-path 'same)]))]
-                  [else (build-path 'same)]))])
-    (let simplify ([collapsed collapsed])
-      (match collapsed
-        [(list* 'submod base subs)
-         (list* 'submod (simplify base) subs)]
-        [(list 'lib str)
-         (cond [(regexp-match? #rx"\\.rkt$" str)
-                (let* ([no-suffix (path->string (path-replace-suffix str ""))]
-                       [no-main
-                        (cond [(regexp-match #rx"^([^/]+)/main$" no-suffix)
-                               => cadr]
-                              [else no-suffix])])
-                  (string->symbol no-main))]
-               [else collapsed])]
-        [(? path?)
-         (path->string (simplify-path collapsed #f))] ;; to get rid of "./" at beginning
-        [_ collapsed]))))
-
-;; --------
-
-(provide get-module-imports
-         get-module-exports
-         get-module-var-exports
-         get-module-stx-exports
-         get-module-all-exports)
-
-(struct modinfo (imports var-exports stx-exports imports/r var-exports/r stx-exports/r)
-  #:prefab)
-
-;; cache : hash[path/symbol/list => modinfo]
-(define cache (make-hash))
-
-;; get-module-code* : (U path (cons path (listof symbol))) -> compiled-module
-(define (get-module-code* resolved)
-  (let* ([path (if (pair? resolved) (car resolved) resolved)]
-         [subs (if (pair? resolved) (cdr resolved) null)]
-         [code (get-module-code path)])
-    (for/fold ([code code]) ([submod-name (in-list subs)])
-      (define (choose-submod? sub)
-        (let* ([sub-name (module-compiled-name sub)])
-          (equal? (last sub-name) submod-name)))
-      (or (for/or ([sub (in-list (module-compiled-submodules code #t))])
-            (and (choose-submod? sub) sub))
-          (for/or ([sub (in-list (module-compiled-submodules code #f))])
-            (and (choose-submod? sub) sub))
-          (error 'get-module-code* "couldn't get code for: ~s" resolved)))))
-
-;; get-module-info/no-cache : path -> modinfo
-(define (get-module-info/no-cache resolved)
-  (let ([compiled (get-module-code* resolved)]
-        [resolved-base (if (pair? resolved) (car resolved) resolved)])
-    (let-values ([(imports) (module-compiled-imports compiled)]
-                 [(var-exports stx-exports) (module-compiled-exports compiled)]
-                 [(dir) (path-only (if (pair? resolved) (car resolved) resolved))])
-      (parameterize ((current-directory dir)
-                     (current-load-relative-directory dir))
-        (force-all-mpis imports)
-        (force-all-mpis (cons var-exports stx-exports)))
-      (modinfo imports var-exports stx-exports
-               (resolve-all-mpis imports resolved-base)
-               (resolve-all-mpis var-exports resolved-base)
-               (resolve-all-mpis stx-exports resolved-base)))))
-
-;; get-module-info : (or module-path module-path-index) -> modinfo
-(define (get-module-info mod)
-  (let ([resolved (resolve mod)])
-    (when #f
-      (eprintf "fetch ~s => ~s\n"
-               (if (module-path-index? mod) (cons 'mpi (mpi->list mod)) mod)
-               resolved))
-    (hash-ref! cache resolved (lambda () (get-module-info/no-cache resolved)))))
-
-;; resolve : (or module-path resolved-module-path module-path-index)
-;;        -> (U (U path symbol) (cons (U path symbol) (listof symbol)))
-(define (resolve mod)
-  (cond [(module-path-index? mod)
-         (resolved-module-path-name (module-path-index-resolve mod))]
-        [(resolved-module-path? mod)
-         (resolved-module-path-name mod)]
-        [else (resolve-module-path mod #f)]))
-
-(define (get-module-imports path #:resolve? [resolve? #f])
-  ((if resolve? modinfo-imports/r modinfo-imports) (get-module-info path)))
-(define (get-module-var-exports path #:resolve? [resolve? #f])
-  ((if resolve? modinfo-var-exports/r modinfo-var-exports) (get-module-info path)))
-(define (get-module-stx-exports path #:resolve? [resolve? #f])
-  ((if resolve? modinfo-stx-exports/r modinfo-stx-exports) (get-module-info path)))
-(define (get-module-exports path #:resolve? [resolve? #f])
-  (values (get-module-var-exports path #:resolve? resolve?)
-          (get-module-stx-exports path #:resolve? resolve?)))
-(define (get-module-all-exports path #:resolve? [resolve? #f])
-  (append (get-module-var-exports path #:resolve? resolve?)
-          (get-module-stx-exports path #:resolve? resolve?)))
-
-(define (resolve-all-mpis x base)
-  (let loop ([x x])
-    (cond [(pair? x)
-           (cons (loop (car x)) (loop (cdr x)))]
-          [(module-path-index? x)
-           (resolve-module-path-index x base)]
-          [else x])))
-
-(define (force-all-mpis x)
-  (let loop ([x x])
-    (cond [(pair? x)
-           (loop (car x))
-           (loop (cdr x))]
-          [(module-path-index? x)
-           ;; uses current-directory, hopefully
-           (module-path-index-resolve x)]
-          [else (void)])))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/show-dependencies.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/show-dependencies.rkt
deleted file mode 100644
index 6c2c5756b0..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/show-dependencies.rkt
+++ /dev/null
@@ -1,190 +0,0 @@
-#lang racket/base
-(require racket/cmdline
-         racket/match
-         racket/pretty
-         raco/command-name
-         syntax/modresolve
-         "private/util.rkt")
-(provide get-dependencies
-         show-dependencies
-         main)
-
-;; A Table is hash[resolved-module-path => (listof mpi-list)]
-
-(define (get-dependencies-table ms #:include? include?)
-  (define visited (make-hash)) ;; Table
-  (define (loop m ctx relto)
-    (let* ([resolved (resolve-module-path-index* m relto)]
-           [ctx (cons m ctx)]
-           [already-visited? (hash-ref visited resolved #f)])
-      (when (or include? (pair? (cdr ctx)))
-        ;; hack to not record initial list (unless inter-dependencies)
-        (hash-set! visited resolved
-                   (cons ctx (hash-ref visited resolved null))))
-      (unless already-visited?
-        (let* ([resolved-mod (resolved-module-path-name resolved)]
-               [resolved-base (if (pair? resolved-mod) (car resolved-mod) resolved-mod)])
-          (unless (symbol? resolved-base)
-            (let ([imports (get-module-imports resolved)])
-              (for* ([phase+mods (in-list imports)]
-                     [mod (in-list (cdr phase+mods))])
-                (loop mod ctx resolved-base))))))))
-  (for ([m (in-list ms)])
-    (loop (module-path-index-join m #f) null #f))
-  visited)
-
-;; resolve-module-path-index* : mpi file-path -> resolved-module-path
-(define (resolve-module-path-index* mpi relto)
-  (let ([v (resolve-module-path-index mpi relto)])
-    (match v
-      [(? path?) (make-resolved-module-path (simplify-path v))]
-      [(? symbol?) (make-resolved-module-path v)]
-      [(list* 'submod (? path? base) syms)
-       (make-resolved-module-path (cons (simplify-path base) syms))]
-      [(list* 'submod (? symbol? base) syms)
-       (error 'resolve-module-path-index*
-              "failed to resolve submodule path base in: ~e" v)])))
-
-;; table->dependencies : Table -> (listof (list module-path (listof module-path)))
-(define (table->dependencies visited)
-  (let* ([unsorted
-          (for/list ([(key mpi-lists) (in-hash visited)])
-            (list (mpi-list->module-path (car mpi-lists))
-                  (sort (map mpi-list->module-path
-                             (filter pair? (map cdr mpi-lists)))
-                        module-path<?)))])
-    (sort unsorted
-          module-path<?
-          #:key car)))
-
-(define (module-path<? A B)
-  (cond [(and (symbol? A) (symbol? B))
-         (symbol<? A B)]
-        [(symbol? A) #t]
-        [(symbol? B) #f]
-        [(and (string? A) (string? B))
-         (string<? A B)]
-        [(string? A) #t]
-        [(string? B) #f]
-        [else
-         ;; obviously, we don't care that much about performance in this case
-         (string<? (format "~s" A) (format "~s" B))]))
-
-;; get-dependencies : module-path ... #:exclude (listof module-path)
-;;                 -> (listof (list module-path (listof module-path)))
-(define (get-dependencies #:exclude [exclude null]
-                          #:exclude-deps [exclude-deps null]
-                          . module-paths)
-  (let* ([table
-          (get-dependencies-table #:include? #f module-paths)]
-         [exclude-table
-          (get-dependencies-table #:include? #t exclude)]
-         [exclude-deps-roots
-          (for/hash ([mod (in-list exclude-deps)])
-            (values (resolve-module-path-index* (module-path-index-join mod #f) #f) #t))]
-         [exclude-deps-table
-          (get-dependencies-table #:include? #f exclude-deps)])
-    (for ([key (in-hash-keys exclude-table)])
-      (hash-remove! table key))
-    (for ([key (in-hash-keys exclude-deps-table)])
-      (unless (hash-ref exclude-deps-roots key #f)
-        (hash-remove! table key)))
-    (table->dependencies table)))
-
-(define (show-dependencies #:exclude [exclude null]
-                           #:exclude-deps [exclude-deps null]
-                           #:show-context? [context? #f]
-                           #:multi-line-context? [multi-line-context? #f]
-                           . module-paths)
-  (for ([dep (in-list (apply get-dependencies
-                             #:exclude exclude
-                             #:exclude-deps exclude-deps
-                             module-paths))])
-    (let ([mod (car dep)]
-          [direct-requirers (cadr dep)])
-      (parameterize ([pretty-print-columns 'infinity]) (pretty-write mod))
-      (when context?
-        (printf " <- ")
-        (cond
-          [multi-line-context?
-           (for ([direct-requirer (in-list direct-requirers)]
-                 [i (in-naturals)])
-             (if (zero? i)
-                 (printf "\n (")
-                 (printf "\n  "))
-             (parameterize ([pretty-print-columns 'infinity])
-               (pretty-write direct-requirer)))
-           (printf ")")]
-          [else
-           (parameterize ([pretty-print-columns 'infinity])
-             (pretty-write direct-requirers))]))
-      (newline))))
-
-;; ====
-
-(define (main . argv)
-  (define mode 'auto)
-  (define context? #f)
-  (define multi-line-context? #f)
-  (define excludes null)
-  (define exclude-deps null)
-  (command-line
-   #:program (short-program+command-name)
-   #:argv argv
-   #:once-each
-   [("-c" "--context") "Show who directly requires each module"
-    (set! context? #t)]
-   [("-l" "--multi-line-context") "Like --context, but use multiple lines"
-    (set! context? #t)
-    (set! multi-line-context? #t)]
-   [("-f" "--file") "Interpret arguments as file-paths"
-    (set! mode 'file)]
-   [("-m" "--module-path") "Interpret arguments as module-paths"
-    (set! mode 'module-path)]
-   [("-x" "--exclude") mod "Exclude <mod> and its dependencies"
-    (set! excludes (cons mod excludes))]
-   [("-X" "--exclude-deps") mod "Exclude the dependencies of <mod> (but not <mod> itself)"
-    (set! exclude-deps (cons mod exclude-deps))]
-   [("-b") "Same as --exclude racket/base"
-    (set! excludes (cons 'racket/base excludes))]
-   #:args module-path
-   (let ()
-     (define (->modpath x)
-       (cond [(string? x)
-              (case mode
-                ((auto)
-                 (if (file-exists? x)
-                     `(file ,x)
-                     (read (open-input-string x))))
-                ((file) `(file ,x))
-                ((module-path)
-                 (read (open-input-string x))))]
-             [else x]))
-     (apply show-dependencies
-            #:exclude (map ->modpath excludes)
-            #:exclude-deps (map ->modpath exclude-deps)
-            #:show-context? context?
-            #:multi-line-context? multi-line-context?
-            (map ->modpath module-path)))))
-
-(module* main #f
-  (apply main (vector->list (current-command-line-arguments))))
-
-#|
-
-For example,
-
-  raco show-dependencies -bc mzscheme
-
-shows the additional modules used to implement mzscheme beyond those
-already needed for the implementation of racket/base. And
-
-  raco show-dependencies -bl syntax/parse/pre
-
-shows that syntax/parse/pre has no dependencies on the contract
-library. Actually, it shows that it has no *residual* dependencies;
-contracts are used in the code that is lazily loaded, but using
-syntax/parse/pre does not cause a module's compiled code to depend on
-racket/contract/base.
-
-|#
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/expand.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/expand.rkt
deleted file mode 100644
index 345b8a6419..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/expand.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         "model/trace.rkt"
-         "model/reductions-config.rkt"
-         "model/reductions.rkt")
-
-(provide/contract
- [expand-only 
-  (any/c (listof identifier?) . -> . syntax?)]
- [expand/hide
-  (any/c (listof identifier?) . -> . syntax?)]
- [expand/show-predicate
-  (any/c (-> identifier? any/c) . -> . syntax?)])
-
-(define (->predicate ids)
-  (lambda (id)
-    (for/or ([x ids]) (free-identifier=? id x))))
-
-(define (expand-only stx to-show)
-  (expand/show-predicate stx (->predicate to-show)))
-
-(define (expand/hide stx to-hide)
-  (expand/show-predicate stx (compose not (->predicate to-hide))))
-
-(define (expand/show-predicate stx show?)
-  (let-values ([(result deriv) (trace/result stx)])
-    (when (exn? result) (raise result))
-    (let-values ([(_steps _defs _uses stx exn2)
-                  (parameterize ((macro-policy show?))
-                    (reductions+ deriv))])
-      (when (exn? exn2) (raise exn2))
-      stx)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/info.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/info.rkt
deleted file mode 100644
index c163f290c0..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang info
-
-(define raco-commands
-  '(("check-requires"
-     (submod macro-debugger/analysis/check-requires main)
-     "check for useless requires"
-     #f)
-    ("show-dependencies"
-     (submod macro-debugger/analysis/show-dependencies main)
-     "show module dependencies"
-     #f)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/context.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/context.rkt
deleted file mode 100644
index 632f3464da..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/context.rkt
+++ /dev/null
@@ -1,112 +0,0 @@
-#lang racket/base
-(require syntax/stx
-         "stx-util.rkt")
-(provide (struct-out ref)
-         (struct-out tail)
-         path-get
-         pathseg-get
-         path-replace
-         pathseg-replace)
-
-;; A Path is a (list-of PathSeg)
-;; where the PathSegs are listed outermost to innermost
-;; for example: (path-get #'((a b) (c d)) (list (make-ref 0) (make-ref 1))) = #'b, not #'c
-
-;; A PathSeg is one of:
-;;   - (make-ref number)
-;;   - (make-tail number)
-
-(define-struct pathseg () #:transparent)
-(define-struct (ref pathseg) (n) #:transparent)
-(define-struct (tail pathseg) (n) #:transparent)
-
-;; path-get : syntax Path -> syntax
-(define (path-get stx path)
-  (let loop ([stx stx] [path path])
-    (cond [(null? path) stx]
-          [(pair? path)
-           (loop (pathseg-get stx (car path)) (cdr path))]
-          [else
-           (error 'path-get "bad path: ~s" path)])))
-
-;; pathseg-get : syntax PathSeg -> syntax
-(define (pathseg-get stx path)
-  (cond [(ref? path) (pathseg-get/ref stx (ref-n path))]
-        [(tail? path) (pathseg-get/tail stx (tail-n path))]))
-
-;; pathseg-get/ref : syntax number -> syntax
-(define (pathseg-get/ref stx0 n0)
-  (let loop ([n n0] [stx stx0])
-    (unless (stx-pair? stx)
-      (error 'pathseg-get "ref path out of bounds for syntax: ~s, ~s" 
-             n0
-             (syntax->datum stx0)))
-    (if (zero? n)
-        (stx-car* stx)
-        (loop (sub1 n) (stx-cdr* stx)))))
-
-;; pathseg-get/tail : syntax number -> syntax
-(define (pathseg-get/tail stx0 n0)
-  (let loop ([n n0] [stx stx0])
-    (unless (stx-pair? stx)
-      (error 'pathseg-get "tail path out of bounds for syntax: ~s, ~s" n0 stx0))
-    (if (zero? n)
-        (stx-cdr* stx)
-        (loop (sub1 n) (stx-cdr* stx)))))
-
-;; path-replace : syntax Path syntax -> syntax
-(define (path-replace stx path x)
-  (cond [(null? path) x]
-        [(pair? path)
-         (let ([pathseg0 (car path)])
-           (pathseg-replace stx
-                            pathseg0
-                            (path-replace (pathseg-get stx pathseg0)
-                                          (cdr path)
-                                          x)))]
-        [else
-         (error 'path-replace "bad path: ~s" path)]))
-
-;; pathseg-replace : syntax PathSeg syntax -> syntax
-(define (pathseg-replace stx pathseg x)
-  (cond [(ref? pathseg) (pathseg-replace/ref stx (ref-n pathseg) x)]
-        [(tail? pathseg) (pathseg-replace/tail stx (tail-n pathseg) x)]
-        [else (error 'pathseg-replace "bad path: ~s" pathseg)]))
-
-;; pathseg-replace/ref : syntax number syntax -> syntax
-(define (pathseg-replace/ref stx0 n0 x)
-  (let loop ([n n0] [stx stx0])
-    (unless (stx-pair? stx)
-      (error 'pathseg-replace "ref path out of bounds for syntax: ~s, ~s" n0 stx0))
-    (if (zero? n)
-        (stx-replcar stx x)
-        (stx-replcdr stx (loop (sub1 n) (stx-cdr* stx))))))
-
-;; pathseg-replace/tail : syntax number syntax -> syntax
-(define (pathseg-replace/tail stx0 n0 x)
-  (let loop ([n n0] [stx stx0])
-    (unless (stx-pair? stx)
-      (error 'pathseg-replace "tail path out of bounds for syntax: ~s, ~s" n0 stx0))
-    (if (zero? n)
-        (stx-replcdr stx x)
-        (stx-replcdr stx (loop (sub1 n) (stx-cdr* stx))))))
-
-;; stx-replcar : syntax syntax -> syntax
-(define (stx-replcar stx x)
-  (cond [(pair? stx)
-         (cons x (cdr stx))]
-        [(syntax? stx)
-         (syntax-rearm
-          (datum->syntax stx (cons x (cdr (syntax-e stx))) stx stx)
-          stx)]
-        [else (raise-type-error 'stx-replcar "stx-pair" stx)]))
-
-;; stx-replcdr : syntax syntax -> syntax
-(define (stx-replcdr stx x)
-  (cond [(pair? stx)
-         (cons (car stx) x)]
-        [(and (syntax? stx) (pair? (syntax-e stx)))
-         (syntax-rearm
-          (datum->syntax stx (cons (car (syntax-e stx)) x) stx stx)
-          stx)]
-        [else (raise-type-error 'stx-replcdr "stx-pair" stx)]))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/debug.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/debug.rkt
deleted file mode 100644
index 1bb8157a12..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/debug.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/base
-(require racket/match
-         "trace.rkt"
-         "reductions.rkt"
-         "reductions-config.rkt"
-         "deriv-util.rkt"
-         "hiding-policies.rkt"
-         "deriv.rkt"
-         "steps.rkt")
-
-(provide (all-from-out "trace.rkt")
-         (all-from-out "reductions.rkt")
-         (all-from-out "reductions-config.rkt")
-         (all-from-out "deriv.rkt")
-         (all-from-out "deriv-util.rkt")
-         (all-from-out "hiding-policies.rkt")
-         (all-from-out "steps.rkt")
-         (all-from-out racket/match))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-c.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-c.rkt
deleted file mode 100644
index e7342efdcc..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-c.rkt
+++ /dev/null
@@ -1,204 +0,0 @@
-#lang racket/base
-(provide (all-defined-out))
-
-;; PrepareExpEnv = (listof LocalAction)
-
-;; A Node(a) is:
-;;   (make-node a ?a)
-(define-struct node (z1 z2) #:transparent)
-
-;; A TopDeriv is one of
-;;   (make-lift-deriv <Node(Stx)> Deriv Stxs TopDeriv)
-;;   Deriv
-
-;; A Deriv is one of
-;;   MRule
-;;   PrimDeriv
-
-;; Base = << Node(Stx) Rs ?exn >>
-
-(define-struct (deriv node) () #:transparent)
-(define-struct (base deriv) (resolves ?1) #:transparent)
-
-(define-struct (lift-deriv deriv) (first lift-stx second) #:transparent)
-(define-struct (tagrule deriv) (tagged-stx next) #:transparent)
-
-;; A DerivLL is one of
-;;   (make-lift/let-deriv <Node(Stx)> Deriv Stx Deriv)
-;;   Deriv
-(define-struct (lift/let-deriv deriv) (first lift-stx second) #:transparent)
-
-;; A MRule is
-;;   (make-mrule <Base(Stx)> ?Stx (listof LocalAction) ?exn ?Stx ?Deriv)
-(define-struct (mrule base) (me1 locals me2 ?2 etx next) #:transparent)
-
-;; A LocalAction is one of:
-(define-struct local-exn (exn) #:transparent)
-(define-struct (local-expansion node) (for-stx? me1 inner lifted me2 opaque)
-  #:transparent)
-(define-struct local-lift (expr ids) #:transparent)
-(define-struct local-lift-end (decl) #:transparent)
-(define-struct local-lift-require (req expr mexpr) #:transparent)
-(define-struct local-lift-provide (prov) #:transparent)
-(define-struct local-bind (names ?1 renames bindrhs) #:transparent)
-(define-struct local-value (name ?1 resolves bound? binding) #:transparent)
-  ;; binding is saved (identifier-binding name) at time of lookup, since it may change
-  ;; if name is rebound in definition context
-(define-struct track-origin (before after) #:transparent)
-(define-struct local-remark (contents) #:transparent)
-  ;; contents : (listof (U string syntax))
-(define-struct local-mess (events) #:transparent)
-
-;; A PrimDeriv is one of
-(define-struct (prule base) () #:transparent)
-(define-struct (p:variable prule) () #:transparent)
-
-;;   (make-p:module <Base> PrepareEnv ?stx stx ?Deriv ?stx ?exn Deriv ?stx)
-;;   (make-p:#%module-begin <Base> Stx ModuleBegin/Phase ?exn)
-(define-struct (p:module prule) (prep tag rename check tag2 ?3 body shift)
-  #:transparent)
-(define-struct (p:#%module-begin prule) (me body ?2 subs) #:transparent)
-
-;;   (make-p:define-syntaxes <Base> (listof LocalAction) DerivLL (listof LocalAction))
-;;   (make-p:define-values <Base> Deriv)
-(define-struct (p:define-syntaxes prule) (prep rhs locals) #:transparent)
-(define-struct (p:define-values prule) (rhs) #:transparent)
-
-;;   (make-p:#%expression <Base> Deriv ?Stx)
-;;   (make-p:if <Base> Boolean Deriv Deriv Deriv)
-;;   (make-p:wcm <Base> Deriv Deriv Deriv)
-;;   (make-p:set! <Base> Rs ?Exn Deriv)
-;;   (make-p:set!-macro <Base> Rs Deriv)
-(define-struct (p:#%expression prule) (inner untag) #:transparent)
-(define-struct (p:if prule) (test then else) #:transparent)
-(define-struct (p:wcm prule) (key mark body) #:transparent)
-(define-struct (p:set! prule) (id-resolves ?2 rhs) #:transparent)
-(define-struct (p:set!-macro prule) (deriv) #:transparent)
-
-;;   (make-p:#%app <Base> Stx LDeriv)
-;;   (make-p:begin <Base> LDeriv)
-;;   (make-p:begin0 <Base> Deriv LDeriv)
-(define-struct (p:#%app prule) (lderiv) #:transparent)
-(define-struct (p:begin prule) (lderiv) #:transparent)
-(define-struct (p:begin0 prule) (first lderiv) #:transparent)
-
-;;   (make-p:lambda <Base> LambdaRenames BDeriv)
-;;   (make-p:case-lambda <Base> (list-of CaseLambdaClause))
-;;   (make-p:let-values <Base> LetRenames (list-of Deriv) BDeriv)
-;;   (make-p:letrec-values <Base> LetRenames (list-of Deriv) BDeriv)
-;;   (make-p:letrec-syntaxes+values <Base> LSVRenames PrepareExpEnv
-;;      (list-of BindSyntaxes) (list-of Deriv) BDeriv ?Stx)
-(define-struct (p:lambda prule) (renames body) #:transparent)
-(define-struct (p:case-lambda prule) (renames+bodies) #:transparent)
-(define-struct (p:let-values prule) (renames rhss body) #:transparent)
-(define-struct (p:letrec-values prule) (renames rhss body) #:transparent)
-(define-struct (p:letrec-syntaxes+values prule)
-  (srenames prep sbindrhss vrenames vrhss body tag)
-  #:transparent)
-
-;;   (make-p:provide <Base> (listof Deriv) ?exn)
-(define-struct (p:provide prule) (inners ?2) #:transparent)
-
-;;   (make-p:require <Base> (listof LocalAction))
-(define-struct (p:require prule) (locals) #:transparent)
-
-(define-struct (p:submodule prule) (exp) #:transparent)
-(define-struct (p:submodule* prule) () #:transparent)
-
-;;   (make-p:#%stratified-body <Base> BDeriv)
-(define-struct (p:#%stratified-body prule) (bderiv) #:transparent)
-
-;;   (make-p:begin-for-syntax <base> (listof LocalAction) BFSBody)
-;;     where BFSBody is one of
-;;       - ModuleBegin/Phase
-;;       - (list BeginForSyntaxLifts ... LDeriv))
-(define-struct (p:begin-for-syntax prule) (prep body locals) #:transparent)
-
-;;   (make-p:stop <Base>)
-;;   (make-p:unknown <Base>)
-;;   (make-p:#%top <Base> Stx)
-;;   (make-p:#%datum <Base> Stx)
-;;   (make-p:quote <Base>)
-;;   (make-p:quote-syntax <Base>)
-;;   (make-p:#%variable-reference <Base>)
-(define-struct (p::STOP prule) () #:transparent)
-(define-struct (p:stop p::STOP) () #:transparent)
-(define-struct (p:unknown p::STOP) () #:transparent)
-(define-struct (p:#%top p::STOP) () #:transparent)
-(define-struct (p:#%datum p::STOP) () #:transparent)
-(define-struct (p:quote p::STOP) () #:transparent)
-(define-struct (p:quote-syntax p::STOP) () #:transparent)
-(define-struct (p:#%variable-reference p::STOP) () #:transparent)
-
-;; A LDeriv is
-;;   (make-lderiv <Node(Stxs)> ?exn (list-of Deriv))
-(define-struct (lderiv node) (?1 derivs) #:transparent)
-
-;; A BDeriv is
-;;   (make-bderiv <Node(Stxs)> (list-of BRule) (U 'list 'letrec) LDeriv/Deriv)
-;;   pass2 is Deriv if 'letrec, LDeriv if 'list
-(define-struct (bderiv node) (pass1 trans pass2) #:transparent)
-
-;; A BRule is one of
-;;   (make-b:error exn)
-;;   (make-b:expr BlockRenames Deriv)
-;;   (make-b:splice BlockRenames Deriv ?exn Stxs ?exn)
-;;   (make-b:defvals BlockRenames Deriv ?exn Stx ?exn)
-;;   (make-b:defstx BlockRenames Deriv ?exn Stx ?exn PrepareExpEnv BindSyntaxes)
-(define-struct b:error (?1) #:transparent)
-(define-struct brule (renames) #:transparent)
-(define-struct (b:expr brule) (head) #:transparent)
-(define-struct (b:splice brule) (head ?1 tail ?2) #:transparent)
-(define-struct (b:defvals brule) (head ?1 rename ?2) #:transparent)
-(define-struct (b:defstx brule) (head ?1 rename ?2 prep bindrhs) #:transparent)
-
-;; A BindSyntaxes is
-;;   (make-bind-syntaxes DerivLL (listof LocalAction))
-(define-struct bind-syntaxes (rhs locals) #:transparent)
-
-;; A CaseLambdaClause is
-;;   (make-clc ?exn CaseLambdaRename BDeriv)
-(define-struct clc (?1 renames body) #:transparent)
-
-;; A BlockRename is (cons Stx Stx)
-
-;; A BeginForSyntaxLifts is
-;;   (make-bfs:lift LDeriv (listof stx))
-(define-struct bfs:lift (lderiv lifts) #:transparent)
-
-;; A ModuleBegin/Phase is (module-begin/phase ModulePass1 ModulePass2 ModulePass3)
-(define-struct module-begin/phase (pass1 pass2 pass3) #:transparent)
-
-;; A ModPass1 is (list-of ModRule1)
-;; A ModPass2 is (list-of ModRule2)
-;; A ModPass3 is (list-of p:provide)
-
-;; A ModRule1 is one of 
-;;   (make-mod:prim Deriv Stx ModPrim)
-;;   (make-mod:splice Deriv Stx ?exn Stxs)
-;;   (make-mod:lift Deriv ?Stxs Stxs)
-;;   (make-mod:lift-end Stxs)
-;; A ModRule2 is one of
-;;   (make-mod:skip)
-;;   (make-mod:cons Deriv)
-;;   (make-mod:lift Deriv Stxs)
-(define-struct modrule () #:transparent)
-(define-struct (mod:prim modrule) (head rename prim) #:transparent)
-(define-struct (mod:splice modrule) (head rename ?1 tail) #:transparent)
-(define-struct (mod:lift modrule) (head locals renames tail) #:transparent)
-(define-struct (mod:lift-end modrule) (tail) #:transparent)
-(define-struct (mod:cons modrule) (head locals) #:transparent)
-(define-struct (mod:skip modrule) () #:transparent)
-
-;; A ModPrim is either #f or one of the following PRule variants:
-;;  - p:define-values
-;;  - p:define-syntaxes
-;;  - p:begin-for-syntax
-;;  - p:require
-;;  - p:provide
-
-
-;; ECTE represents expand/compile-time-evals
-;; (make-ecte stx ?stx (listof LocalAction) Deriv Deriv (listof LocalAction))
-
-(define-struct (ecte deriv) (locals first second locals2) #:transparent)
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-parser.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-parser.rkt
deleted file mode 100644
index 4eed82b804..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-parser.rkt
+++ /dev/null
@@ -1,610 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         syntax/stx
-         "yacc-ext.rkt"
-         "yacc-interrupted.rkt"
-         "deriv.rkt"
-         "deriv-util.rkt"
-         "deriv-tokens.rkt")
-(provide parse-derivation)
-
-(define (deriv-error ok? name value start end)
-  (if ok?
-      (error 'derivation-parser
-             "error on token #~a: <~s, ~s>"
-             start name value)
-      (error 'derivation-parser "bad token #~a" start)))
-
-;; PARSER
-
-(define-production-splitter production/I values values)
-
-(define-syntax (productions/I stx)
-  (syntax-case stx ()
-    [(productions/I def ...)
-     #'(begin (production/I def) ...)]))
-
-(define parse-derivation
-  (parser
-   (options (start Expansion)
-            (src-pos)
-            (tokens basic-empty-tokens basic-tokens prim-tokens renames-tokens)
-            (end EOF)
-            #| (debug "/tmp/DEBUG-PARSER.txt") |#
-            (error deriv-error))
-
-   ;; tokens
-   (skipped-token-values
-    visit resolve next next-group return
-    enter-macro macro-pre-transform macro-post-transform exit-macro 
-    enter-prim exit-prim
-    enter-block block->list block->letrec splice
-    enter-list exit-list
-    enter-check exit-check
-    local-post exit-local exit-local/expr
-    local-bind enter-bind exit-bind exit-local-bind
-    local-value-result local-value-binding
-    phase-up module-body
-    renames-lambda
-    renames-case-lambda
-    renames-let
-    renames-letrec-syntaxes
-    renames-block
-    rename-one
-    rename-list
-    tag
-    IMPOSSIBLE
-    start
-    top-non-begin
-    prepare-env)
-
-    ;; Entry point
-   (productions
-    (Expansion
-     [(start EE/Lifts) $2]
-     [(start EE/Lifts/Interrupted) $2]
-     [(start ExpandCTE) $2]
-     [(start ExpandCTE/Interrupted) $2]))
-
-   (productions/I
-
-    (ExpandCTE
-     ;; The first 'Eval' is there for---I believe---lazy phase 1 initialization.
-     [(visit start (? Eval) (? CheckImmediateMacro/Lifts)
-             top-non-begin start (? EE) (? Eval) return)
-      (make ecte $1 $9 $3 $4 $7 $8)]
-     [(visit start Eval CheckImmediateMacro/Lifts
-             top-begin (? NextExpandCTEs) return)
-      (begin
-        (unless (list? $6)
-          (error "NextExpandCTEs returned non-list ~s" $6))
-        (make ecte $1 $7 $3 $4
-              (make p:begin $5 $7 (list (stx-car $5)) #f
-                    (make lderiv (cdr (stx->list $5))
-                          (and $7 (cdr (stx->list $7)))
-                          #f
-                          $6))
-              null))])
-
-    (CheckImmediateMacro/Lifts
-     [((? CheckImmediateMacro))
-      $1]
-     [(CheckImmediateMacro lift-loop)
-      (let ([e1 (wderiv-e1 $1)]
-            [e2 $2])
-        (make lift-deriv e1 e2 $1 $2 (make p:stop $2 $2 null #f)))])
-
-    (NextExpandCTEs
-     (#:skipped null)
-     [() null]
-     [(next (? ExpandCTE) (? NextExpandCTEs)) (cons $2 $3)])
-
-    ;; Expand with possible lifting
-    (EE/Lifts
-     [((? EE)) $1]
-     [(EE lift-loop (? EE/Lifts))
-      (let ([e1 (wderiv-e1 $1)]
-            [e2 (wderiv-e2 $3)])
-        (make lift-deriv e1 e2 $1 $2 $3))])
-
-    ;; Expand, convert lifts to let (rhs of define-syntaxes, mostly)
-    (EE/LetLifts
-     [((? EE)) $1]
-     [(EE lift/let-loop (? EE/LetLifts))
-      (let ([initial (wderiv-e1 $1)]
-            [final (wderiv-e2 $3)])
-        (make lift/let-deriv initial final $1 $2 $3))])
-
-    ;; Evaluation
-    ;; Answer = (listof LocalAction)
-    (Eval
-     (#:skipped null)
-     [((? LocalActions)) $1])
-
-    ;; Prepare env for compilation
-    (PrepareEnv
-     [(prepare-env (? Eval)) $2])
-
-    ;; Expansion of an expression to primitive form
-    (CheckImmediateMacro
-     [(enter-check (? CheckImmediateMacro/Inner) exit-check)
-      ($2 $1 $3)])
-    (CheckImmediateMacro/Inner
-     (#:args le1 e2)
-     [(!)
-      (make p:stop le1 e2 null $1)]
-     [(visit Resolves (? MacroStep) return (? CheckImmediateMacro/Inner))
-      ($3 $1 $2 ($5 $4 e2))]
-     [(visit Resolves tag (? MacroStep) return (? CheckImmediateMacro/Inner))
-      (let ([mnode ($4 $3 $2 ($6 $5 e2))])
-        (make tagrule $1 (wderiv-e2 mnode) $3 mnode))])
-
-    ;; Expansion of multiple expressions, next-separated
-    (NextEEs
-     (#:skipped null)
-     [() null]
-     [(next (? EE) (? NextEEs)) (cons $2 $3)])
-
-    ;; EE
-
-    ;; Expand expression (term)
-    (EE
-     [(visit Resolves (? EE/k))
-      ($3 $1 $2)]
-     [(visit Resolves tag (? EE/k))
-      (let ([next ($4 $3 $2)])
-        (make tagrule $1 (wderiv-e2 next) $3 next))])
-
-    (EE/k
-     (#:args e1 rs)
-     [(!!)
-      (make p:unknown e1 #f rs $1)]
-     [(variable return)
-      (make p:variable e1 $2 rs #f)]
-     [(enter-prim (? Prim) exit-prim return)
-      (begin
-        (unless (eq? $3 $4)
-          (eprintf "warning: exit-prim and return differ:\n~s\n~s\n" $3 $4))
-        ($2 $1 $3 rs))]
-     [((? MacroStep) (? EE))
-      ($1 e1 rs $2)])
-
-    (MacroStep
-     (#:args e1 rs next)
-     [(enter-macro ! macro-pre-transform (? LocalActions)
-                   macro-post-transform ! exit-macro)
-      (let ([e2 (and next (wderiv-e2 next))])
-        (make mrule e1 e2 rs $2
-              $3 $4 (and $5 (car $5)) $6 $7 next))])
-
-    ;; Keyword resolution
-    (Resolves
-     [() null]
-     [(resolve Resolves) (cons $1 $2)])
-
-    ;; Local actions taken by macro
-    ;; LocalAction Answer = (list-of LocalAction)
-    (LocalActions
-     (#:skipped null)
-     [() null]
-     [((? LocalAction) (? LocalActions)) (cons $1 $2)])
-
-    (LocalAction
-     [(!!) (make local-exn $1)]
-     [(enter-local OptPhaseUp
-       local-pre (? LocalExpand/Inner) OptLifted local-post
-       OptOpaqueExpr exit-local)
-      (make local-expansion $1 $8 $2 $3 $4 $5 $6 $7)]
-     [(lift)
-      (make local-lift (cdr $1) (car $1))]
-     [(lift-statement)
-      (make local-lift-end $1)]
-     [(lift-require)
-      (make local-lift-require (car $1) (cadr $1) (cddr $1))]
-     [(lift-provide)
-      (make local-lift-provide $1)]
-     [(local-bind ! rename-list exit-local-bind)
-      (make local-bind $1 $2 $3 #f)]
-     [(local-bind rename-list (? BindSyntaxes) exit-local-bind)
-      (make local-bind $1 #f $2 $3)]
-     [(track-origin)
-      (make track-origin (car $1) (cdr $1))]
-     [(local-value ! Resolves local-value-result local-value-binding)
-      (make local-value $1 $2 $3 $4 $5)]
-     [(local-remark)
-      (make local-remark $1)]
-     [(local-artificial-step)
-      (let ([ids (list-ref $1 0)]
-            [before (list-ref $1 1)]
-            [mbefore (list-ref $1 2)]
-            [mafter (list-ref $1 3)]
-            [after (list-ref $1 4)])
-        (make local-expansion
-          before after #f mbefore
-          (make mrule mbefore mafter ids #f
-                before null after #f mafter
-                (make p:stop mafter mafter null #f))
-          #f after #f))]
-     [(local-mess)
-      ;; Represents subsequence of event stream incoherent due to
-      ;; jump (eg, macro catches exn raised from within local-expand).
-      (make local-mess $1)]
-     ;; -- Not really local actions, but can occur during evaluation
-     ;; called 'expand' (not 'local-expand') within transformer
-     [(start (? EE)) #f]
-     [(start (? CheckImmediateMacro)) #f])
-
-    (LocalExpand/Inner
-     [(start (? EE)) $2]
-     [((? CheckImmediateMacro)) $1])
-
-    (OptLifted
-     [(lift-loop) $1]
-     [() #f])
-    (OptOpaqueExpr
-     [(opaque) $1]
-     [() #f])
-    (OptPhaseUp
-     [(phase-up) #t]
-     [() #f])
-
-    (Prim
-     (#:args e1 e2 rs)
-     [((? PrimModule)) ($1 e1 e2 rs)]
-     [((? Prim#%ModuleBegin)) ($1 e1 e2 rs)]
-     [((? PrimDefineSyntaxes)) ($1 e1 e2 rs)]
-     [((? PrimDefineValues)) ($1 e1 e2 rs)]
-     [((? PrimExpression)) ($1 e1 e2 rs)]
-     [((? Prim#%App)) ($1 e1 e2 rs)]
-     [((? Prim#%Datum)) ($1 e1 e2 rs)]
-     [((? Prim#%Top)) ($1 e1 e2 rs)]
-     [((? PrimIf)) ($1 e1 e2 rs)]
-     [((? PrimWCM)) ($1 e1 e2 rs)]
-     [((? PrimSet)) ($1 e1 e2 rs)]
-     [((? PrimBegin)) ($1 e1 e2 rs)]
-     [((? PrimBegin0)) ($1 e1 e2 rs)]
-     [((? PrimLambda)) ($1 e1 e2 rs)]
-     [((? PrimCaseLambda)) ($1 e1 e2 rs)]
-     [((? PrimLetValues)) ($1 e1 e2 rs)]
-     [((? PrimLet*Values)) ($1 e1 e2 rs)]
-     [((? PrimLetrecValues)) ($1 e1 e2 rs)]
-     [((? PrimLetrecSyntaxes+Values)) ($1 e1 e2 rs)]
-     [((? PrimSTOP)) ($1 e1 e2 rs)]
-     [((? PrimQuote)) ($1 e1 e2 rs)]
-     [((? PrimQuoteSyntax)) ($1 e1 e2 rs)]
-     [((? PrimRequire)) ($1 e1 e2 rs)]
-     [((? PrimProvide)) ($1 e1 e2 rs)]
-     [((? PrimVarRef)) ($1 e1 e2 rs)]
-     [((? PrimStratifiedBody)) ($1 e1 e2 rs)]
-     [((? PrimBeginForSyntax)) ($1 e1 e2 rs)])
-
-    (PrimModule
-     (#:args e1 e2 rs)
-     [(prim-module ! (? PrepareEnv) OptTag rename-one
-                   (? OptCheckImmediateMacro) OptTag !
-                   (? EE) rename-one)
-      (make p:module e1 e2 rs $2 $3 $4 $5 $6 $7 $8 $9 $10)])
-    (OptTag
-     [() #f]
-     [(tag) $1])
-    (OptCheckImmediateMacro
-     [() #f]
-     [((? CheckImmediateMacro)) $1])
-
-    ;; FIXME: workaround for problem in expander instrumentation:
-    ;;   observer not propagated correctly to expand_all_provides
-    ;;   so local actions that should be within prim-provide's EE 
-    ;;   instead appear directly here
-    (Prim#%ModuleBegin
-     (#:args e1 e2 rs)
-     [(prim-#%module-begin ! rename-one (? ModuleBegin/Phase) (? Eval) next (? ExpandSubmodules))
-      (make p:#%module-begin e1 e2 rs $2 $3 $4
-            (for/or ([la (in-list $5)])
-              (and (local-exn? la) (local-exn-exn la)))
-            $7)])
-    #|
-    ;; restore this version when expander fixed
-    (Prim#%ModuleBegin-REAL
-     (#:args e1 e2 rs)
-     [(prim-#%module-begin ! rename-one (? ModuleBegin/Phase) ! (? ExpandSubmodules))
-      (make p:#%module-begin e1 e2 rs $2 $3 $4 $5)])
-    |#
-    (ExpandSubmodules
-     (#:skipped null)
-     [(enter-prim (? PrimModule) exit-prim (? ExpandSubmodules))
-      (cons ($2 $1 $3 null) $4)]
-     [() null])
-
-    (ModuleBegin/Phase
-     [((? ModulePass1) next-group (? ModulePass2) next-group (? ModulePass3))
-      (make module-begin/phase $1 $3 $5)])
-
-    (ModulePass1
-     (#:skipped null)
-     [() null]
-     [(next (? ModulePass1-Part) (? ModulePass1))
-      (cons $2 $3)]
-     [(module-lift-end-loop (? ModulePass1))
-      (cons (make mod:lift-end $1) $2)])
-
-    (ModulePass1-Part
-     [((? EE) rename-one (? ModulePass1/Prim))
-      (make mod:prim $1 $2 ($3 $2))]
-     [(EE rename-one ! splice)
-      (make mod:splice $1 $2 $3 $4)]
-     [(EE rename-list module-lift-loop)
-      (make mod:lift $1 null $2 $3)])
-
-    (ModulePass1/Prim
-     (#:args e1)
-     [(enter-prim prim-define-values ! exit-prim)
-      (make p:define-values $1 $4 null $3 #f)]
-     [(enter-prim prim-define-syntaxes ! (? PrepareEnv)
-                  phase-up (? EE/LetLifts) (? Eval) exit-prim)
-      (make p:define-syntaxes $1 $8 null $3 $4 $6 $7)]
-     [(enter-prim prim-begin-for-syntax ! (? PrepareEnv)
-                  phase-up (? ModuleBegin/Phase) (? Eval) exit-prim)
-      (make p:begin-for-syntax $1 $7 null $3 $4 $6 $7)]
-     [(enter-prim prim-require (? Eval) exit-prim)
-      (make p:require $1 $4 null #f $3)]
-     [(enter-prim prim-submodule ! (? ExpandSubmodules #|one|#) exit-prim)
-      (make p:submodule $1 $5 null $3 (car $4))]
-     [(enter-prim prim-submodule* ! exit-prim)
-      (make p:submodule* $1 $4 null $3)]
-     [()
-      (make p:stop e1 e1 null #f)])
-
-    (ModulePass2
-     (#:skipped null)
-     [() null]
-     [(next (? ModulePass2-Part) (? ModulePass2))
-      (cons $2 $3)]
-     [(module-lift-end-loop (? ModulePass2))
-      (cons (make mod:lift-end $1) $2)])
-
-    (ModulePass2-Part
-     ;; not normal; already handled
-     [()
-      (make mod:skip)]
-     ;; normal: expand completely
-     [((? EE) (? Eval))
-      ;; after expansion, may compile => may eval letstx rhss again!
-      ;; need to include those evals too (for errors, etc)
-      (make mod:cons $1 $2)]
-     ;; catch lifts
-     [(EE Eval module-lift-loop)
-      ;; same as above: after expansion, may compile => may eval
-      (make mod:lift $1 $2 #f $3)])
-
-    (ModulePass3
-     (#:skipped null)
-     [() null]
-     [((? ModulePass3-Part) (? ModulePass3))
-      (cons $1 $2)])
-
-    (ModulePass3-Part
-     [(enter-prim prim-provide (? ModuleProvide/Inner) ! exit-prim)
-      (make p:provide $1 $5 null #f $3 $4)])
-
-    (ModuleProvide/Inner
-     (#:skipped null)
-     [() null]
-     [((? EE) (? ModuleProvide/Inner))
-      (cons $1 $2)])
-
-    ;; Definitions
-    (PrimDefineSyntaxes
-     (#:args e1 e2 rs)
-     [(prim-define-syntaxes ! (? PrepareEnv) (? EE/LetLifts) (? Eval))
-      (make p:define-syntaxes e1 e2 rs $2 $3 $4 $5)])
-
-    (PrimDefineValues
-     (#:args e1 e2 rs)
-     [(prim-define-values ! (? EE))
-      (make p:define-values e1 e2 rs $2 $3)])
-
-    ;; Simple expressions
-    (PrimExpression
-     (#:args e1 e2 rs)
-     [(prim-expression ! (? EE))
-      (make p:#%expression e1 e2 rs $2 $3 #f)]
-     [(prim-expression EE tag)
-      (make p:#%expression e1 e2 rs #f $2 $3)])
-
-    (PrimIf
-     (#:args e1 e2 rs)
-     [(prim-if ! (? EE) next (? EE) next (? EE))
-      (make p:if e1 e2 rs $2 $3 $5 $7)])
-
-    (PrimWCM 
-     (#:args e1 e2 rs)
-     [(prim-wcm ! (? EE) next (? EE) next (? EE))
-      (make p:wcm e1 e2 rs $2 $3 $5 $7)])
-
-    ;; Sequence-containing expressions
-    (PrimBegin
-     (#:args e1 e2 rs)
-     [(prim-begin ! (? EL))
-      (make p:begin e1 e2 rs $2 $3)])
-
-    (PrimBegin0
-     (#:args e1 e2 rs)
-     [(prim-begin0 ! next (? EE) next (? EL))
-      (make p:begin0 e1 e2 rs $2 $4 $6)])
-
-    (Prim#%App
-     (#:args e1 e2 rs)
-     [(prim-#%app !)
-      (make p:#%app e1 e2 rs $2 #f)]
-     [(prim-#%app (? EL))
-      (make p:#%app e1 e2 rs #f $2)])
-
-    ;; Binding expressions
-    (PrimLambda
-     (#:args e1 e2 rs)
-     [(prim-lambda ! renames-lambda (? EB))
-      (make p:lambda e1 e2 rs $2 $3 $4)])
-
-    (PrimCaseLambda
-     (#:args e1 e2 rs)
-     [(prim-case-lambda ! (? NextCaseLambdaClauses))
-      (make p:case-lambda e1 e2 rs $2 $3)])
-
-    (NextCaseLambdaClauses
-     (#:skipped null)
-     [(next (? CaseLambdaClause) (? NextCaseLambdaClauses))
-      (cons $2 $3)]
-     [() null])
-
-    (CaseLambdaClause
-     [(! renames-case-lambda (? EB))
-      (make clc $1 $2 $3)])
-
-    (PrimLetValues
-     (#:args e1 e2 rs)
-     [(prim-let-values ! renames-let (? NextEEs) next-group (? EB))
-      (make p:let-values e1 e2 rs $2 $3 $4 $6)])
-
-    (PrimLet*Values
-     (#:args e1 e2 rs)
-     ;; let*-values with bindings is "macro-like"
-     [(prim-let*-values !!)
-      (make mrule e1 e2 rs $2 #f null #f #f #f #f)]
-     [(prim-let*-values (? EE))
-      (let* ([next-e1 (wderiv-e1 $2)])
-        (make mrule e1 e2 rs #f e1 null next-e1 #f next-e1 $2))]
-     ;; No bindings... model as "let"
-     [(prim-let*-values renames-let (? NextEEs) next-group (? EB))
-      (make p:let-values e1 e2 rs #f $2 $3 $5)])
-
-    (PrimLetrecValues
-     (#:args e1 e2 rs)
-     [(prim-letrec-values ! renames-let (? NextEEs) next-group (? EB))
-      (make p:letrec-values e1 e2 rs $2 $3 $4 $6)])
-
-    (PrimLetrecSyntaxes+Values
-     (#:args e1 e2 rs)
-     [(prim-letrec-syntaxes+values ! renames-letrec-syntaxes
-       (? PrepareEnv) (? NextBindSyntaxess) next-group (? EB) OptTag)
-      (make p:letrec-syntaxes+values e1 e2 rs $2 $3 $4 $5 #f null $7 $8)]
-     [(prim-letrec-syntaxes+values renames-letrec-syntaxes 
-       PrepareEnv NextBindSyntaxess next-group
-       prim-letrec-values
-       renames-let (? NextEEs) next-group (? EB) OptTag)
-      (make p:letrec-syntaxes+values e1 e2 rs #f $2 $3 $4 $7 $8 $10 $11)])
-
-    ;; Atomic expressions
-    (Prim#%Datum
-     (#:args e1 e2 rs)
-     [(prim-#%datum !) (make p:#%datum e1 e2 rs $2)])
-
-    (Prim#%Top
-     (#:args e1 e2 rs)
-     [(prim-#%top !) (make p:#%top e1 e2 rs $2)])
-
-    (PrimSTOP
-     (#:args e1 e2 rs)
-     [(prim-stop !) (make p:stop e1 e2 rs $2)])
-
-    (PrimQuote
-     (#:args e1 e2 rs)
-     [(prim-quote !) (make p:quote e1 e2 rs $2)])
-
-    (PrimQuoteSyntax
-     (#:args e1 e2 rs)
-     [(prim-quote-syntax !) (make p:quote-syntax e1 e2 rs $2)])
-
-    (PrimRequire
-     (#:args e1 e2 rs)
-     [(prim-require (? Eval))
-      (make p:require e1 e2 rs #f $2)])
-
-    (PrimProvide 
-     (#:args e1 e2 rs)
-     [(prim-provide !) (make p:provide e1 e2 rs $2 null #f)])
-
-    (PrimVarRef
-     (#:args e1 e2 rs)
-     [(prim-varref !) (make p:#%variable-reference e1 e2 rs $2)])
-
-    (PrimStratifiedBody
-     (#:args e1 e2 rs)
-     [(prim-#%stratified-body ! (? EB)) (make p:#%stratified-body e1 e2 rs $2 $3)])
-
-    (PrimBeginForSyntax
-     (#:args e1 e2 rs)
-     [(prim-begin-for-syntax ! (? PrepareEnv) (? BeginForSyntax*) (? Eval))
-      (make p:begin-for-syntax e1 e2 rs $2 $3 $4 $5)])
-    (BeginForSyntax*
-     [((? EL))
-      (list $1)]
-     [(EL module-lift-loop (? BeginForSyntax*))
-      (cons (make bfs:lift $1 $2) $3)])
-
-    (PrimSet
-     (#:args e1 e2 rs)
-     ;; Unrolled to avoid shift/reduce
-     [(prim-set! ! resolve Resolves ! next (? EE))
-      (make p:set! e1 e2 rs $2 (cons $3 $4) $5 $7)]
-     [(prim-set! Resolves (? MacroStep) (? EE))
-      (make p:set!-macro e1 e2 rs #f ($3 e1 $2 $4))])
-
-    ;; Blocks
-    ;; EB Answer = BlockDerivation
-    (EB
-     [(enter-block (? BlockPass1) block->list (? EL))
-      (make bderiv $1 (and $4 (wlderiv-es2 $4))
-            $2 'list $4)]
-     [(enter-block BlockPass1 block->letrec (? EE))
-      (make bderiv $1 (and $4 (list (wderiv-e2 $4)))
-            $2 'letrec $4)])
-
-    ;; BlockPass1 Answer = (list-of BRule)
-    (BlockPass1
-     (#:skipped null)
-     [() null]
-     [((? BRule) (? BlockPass1))
-      (cons $1 $2)])
-
-    ;; BRule Answer = BRule
-    (BRule
-     [(next !!)
-      (make b:error $2)]
-     [(next renames-block (? CheckImmediateMacro))
-      (make b:expr $2 $3)]
-     [(next renames-block CheckImmediateMacro prim-begin ! splice !)
-      (make b:splice $2 $3 $5 $6 $7)]
-     [(next renames-block CheckImmediateMacro prim-define-values ! rename-one !)
-      (make b:defvals $2 $3 $5 $6 $7)]
-     [(next renames-block CheckImmediateMacro
-            prim-define-syntaxes ! rename-one ! (? PrepareEnv) (? BindSyntaxes))
-      (make b:defstx $2 $3 $5 $6 $7 $8 $9)])
-
-    ;; BindSyntaxes Answer = Derivation
-    (BindSyntaxes
-     [(enter-bind (? EE/LetLifts) next (? Eval) exit-bind)
-      (make bind-syntaxes $2 $4)])
-
-    ;; NextBindSyntaxess Answer = (list-of Derivation)
-    (NextBindSyntaxess
-     (#:skipped null)
-     [() null]
-     [(next (? BindSyntaxes) (? NextBindSyntaxess)) (cons $2 $3)])
-
-    ;; Lists
-    ;; EL Answer = ListDerivation
-    (EL
-     (#:skipped #f)
-     [(enter-list ! (? EL*) exit-list)
-      ;; FIXME: Workaround for bug in events
-      (if (null? $3)
-          (make lderiv null null $2 $3)
-          (make lderiv $1 $4 $2 $3))])
-
-    ;; EL* Answer = (listof Derivation)
-    (EL*
-     (#:skipped null)
-     [() null]
-     [(next (? EE) (? EL*)) (cons $2 $3)])
-
-    )))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-tokens.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-tokens.rkt
deleted file mode 100644
index 89a1100d57..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-tokens.rkt
+++ /dev/null
@@ -1,221 +0,0 @@
-#lang racket/base
-(require parser-tools/lex
-         "deriv.rkt")
-(provide (all-defined-out))
-
-;; NOTE: trace.rkt also depends on some token numbers
-;; eg for enter-macro, local-value, etc
-
-(define-tokens basic-empty-tokens
-  (start                ; .
-   next                 ; .
-   next-group           ; .
-   phase-up             ; .
-   ...                  ; .
-   EOF                  ; .
-   enter-bind           ; .
-   exit-bind            ; .
-   exit-local-bind      ; .
-   IMPOSSIBLE           ; useful for error-handling clauses that have no
-                        ; NoError counterpart
-   top-non-begin        ; .
-   prepare-env          ; .
-   ))
-
-(define-tokens basic-tokens
-  (visit                ; syntax
-   resolve              ; identifier
-   enter-macro          ; syntax
-   macro-pre-transform  ; syntax
-   macro-post-transform ; (cons syntax syntax)
-   exit-macro           ; syntax
-   enter-prim           ; syntax
-   exit-prim            ; syntax
-   return               ; syntax
-   enter-block          ; syntaxes
-   block->list          ; syntaxes
-   block->letrec        ; syntax(es?)
-   splice               ; syntaxes
-   enter-list           ; syntaxes
-   exit-list            ; syntaxes
-   enter-check          ; syntax
-   exit-check           ; syntax
-   module-body          ; (list-of (cons syntax boolean))
-   syntax-error         ; exn
-   lift-loop            ; syntax = new form (let or begin; let if for_stx)
-   lift/let-loop        ; syntax = new let form
-   module-lift-loop     ; syntaxes = def-lifts, in reverse order lifted (???)
-   module-lift-end-loop ; syntaxes = statement-lifts ++ provide-lifts, in order lifted
-   lift                 ; (cons (listof id) syntax)
-   lift-statement       ; syntax
-   lift-require         ; (cons syntax (cons syntax syntax))
-   lift-provide         ; syntax
-
-   enter-local          ; syntax
-   local-pre            ; syntax
-   local-post           ; syntax
-   exit-local           ; syntax
-
-   local-bind           ; (listof identifier)
-   opaque               ; opaque-syntax
-
-   variable             ; (cons identifier identifier)
-   tag                  ; syntax
-
-   rename-one           ; syntax
-   rename-list          ; (list-of syntax)
-
-   top-begin            ; identifier
-
-   local-remark         ; (listof (U string syntax))
-   local-artificial-step ; (list syntax syntax syntax syntax)
-
-   track-origin         ; (cons stx stx)
-   local-value          ; identifier
-   local-value-result   ; boolean
-   local-value-binding  ; result of identifier-binding; added by trace.rkt, not expander
-   local-mess           ; (listof event)
-   ))
-
-(define-tokens renames-tokens
-  (renames-lambda           ; (cons syntax syntax)
-   renames-case-lambda      ; (cons syntax syntax)
-   renames-let              ; (cons (listof syntax) syntax)
-   renames-letrec-syntaxes  ; (cons (listof syntax) (cons (listof syntax) syntax))
-   renames-block            ; (cons syntax syntax) ... different, contains both pre+post
-   ))
-
-;; Empty tokens
-(define-tokens prim-tokens
-  (prim-module prim-#%module-begin
-   prim-define-syntaxes prim-define-values
-   prim-if prim-wcm prim-begin prim-begin0 prim-#%app prim-lambda
-   prim-case-lambda prim-let-values prim-let*-values prim-letrec-values 
-   prim-letrec-syntaxes+values prim-#%datum prim-#%top prim-stop
-   prim-quote prim-quote-syntax prim-require prim-require-for-syntax
-   prim-require-for-template prim-provide
-   prim-set!
-   prim-expression
-   prim-varref
-   prim-#%stratified-body
-   prim-begin-for-syntax
-   prim-submodule prim-submodule*
-   ))
-
-;; ** Signals to tokens
-
-(define signal-mapping
-  ;; (number/#f symbol [token-constructor])
-  `(;; Emitted from Scheme
-    (#f  EOF)
-    (#f  error                   ,token-syntax-error)
-    (#f  start                   ,token-start)
-    (#f  top-begin               ,token-top-begin)
-    (#f  top-non-begin           ,token-top-non-begin)
-    (#f  local-remark            ,token-local-remark)
-    (#f  local-artificial-step   ,token-local-artificial-step)
-    (#f  local-value-binding     ,token-local-value-binding)
-    (#f  local-mess              ,token-local-mess)
-
-    ;; Standard signals
-    (0   visit                   ,token-visit)
-    (1   resolve                 ,token-resolve)
-    (2   return                  ,token-return)
-    (3   next                    ,token-next)
-    (4   enter-list              ,token-enter-list)
-    (5   exit-list               ,token-exit-list)
-    (6   enter-prim              ,token-enter-prim)
-    (7   exit-prim               ,token-exit-prim)
-    (8   enter-macro             ,token-enter-macro)
-    (9   exit-macro              ,token-exit-macro)
-    (10  enter-block             ,token-enter-block)
-    (11  splice                  ,token-splice)
-    (12  block->list             ,token-block->list)
-    (13  next-group              ,token-next-group)
-    (14  block->letrec           ,token-block->letrec)
-    (16  renames-let             ,token-renames-let)
-    (17  renames-lambda          ,token-renames-lambda)
-    (18  renames-case-lambda     ,token-renames-case-lambda)
-    (19  renames-letrec-syntaxes ,token-renames-letrec-syntaxes)
-    (20  phase-up)
-    (21  macro-pre-transform     ,token-macro-pre-transform)
-    (22  macro-post-transform    ,token-macro-post-transform)
-    (23  module-body             ,token-module-body)
-    (24  renames-block           ,token-renames-block)
-
-    (100 prim-stop)
-    (101 prim-module)
-    (102 prim-#%module-begin)
-    (103 prim-define-syntaxes)
-    (104 prim-define-values)
-    (105 prim-if)
-    (106 prim-wcm)
-    (107 prim-begin)
-    (108 prim-begin0)
-    (109 prim-#%app)
-    (110 prim-lambda)
-    (111 prim-case-lambda)
-    (112 prim-let-values)
-    (113 prim-letrec-values)
-    (114 prim-letrec-syntaxes+values)
-    (115 prim-#%datum)
-    (116 prim-#%top)
-    (117 prim-quote)
-    (118 prim-quote-syntax)
-    (119 prim-require)
-    (120 prim-require-for-syntax)
-    (121 prim-require-for-template)
-    (122 prim-provide)
-    (123 prim-set!)
-    (124 prim-let*-values)
-    (125 variable                ,token-variable)
-    (126 enter-check             ,token-enter-check)
-    (127 exit-check              ,token-exit-check)
-    (128 lift-loop               ,token-lift-loop)
-    (129 lift                    ,token-lift)
-    (130 enter-local             ,token-enter-local)
-    (131 exit-local              ,token-exit-local)
-    (132 local-pre               ,token-local-pre)
-    (133 local-post              ,token-local-post)
-    (134 lift-statement          ,token-lift-statement)
-    (135 lift-end-loop           ,token-module-lift-end-loop)
-    (136 lift/let-loop           ,token-lift/let-loop)
-    (137 module-lift-loop        ,token-module-lift-loop)
-    (138 prim-expression)
-    (141 start                   ,token-start)
-    (142 tag                     ,token-tag)
-    (143 local-bind              ,token-local-bind)
-    (144 enter-bind              ,token-enter-bind)
-    (145 exit-bind               ,token-exit-bind)
-    (146 opaque                  ,token-opaque)
-    (147 rename-list             ,token-rename-list)
-    (148 rename-one              ,token-rename-one)
-    (149 prim-varref)
-    (150 lift-require            ,token-lift-require)
-    (151 lift-provide            ,token-lift-provide)
-    (152 track-origin            ,token-track-origin)
-    (153 local-value             ,token-local-value)
-    (154 local-value-result      ,token-local-value-result)
-    (155 prim-#%stratified-body)
-    (156 prim-begin-for-syntax)
-    (157 prepare-env)
-    (158 prim-submodule)
-    (159 prim-submodule*)
-    (160 exit-local-bind)
-    ))
-
-(define (signal->symbol sig)
-  (if (symbol? sig)
-      sig
-      (cadr (assv sig signal-mapping))))
-
-(define token-mapping (map cdr signal-mapping))
-
-(define (tokenize sig val pos)
-  (let ([p (assv sig token-mapping)])
-    (cond [(not p)
-           (error 'tokenize "bad signal: ~s" sig)]
-          [(null? (cdr p))
-           (make-position-token sig pos pos)]
-          [else
-           (make-position-token ((cadr p) val) pos pos)])))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-util.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-util.rkt
deleted file mode 100644
index 953ead900b..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-util.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/match
-         unstable/struct
-         "deriv.rkt")
-
-(provide make
-
-         Wrap
-         
-         ok-node?
-         interrupted-node?
-
-         wderiv-e1
-         wderiv-e2
-         wlderiv-es1
-         wlderiv-es2
-         wbderiv-es1
-         wbderiv-es2
-
-         wderivlist-es2)
-
-;; Wrap matcher
-;; Matches unwrapped, interrupted wrapped, or error wrapped
-(define-match-expander Wrap
-  (lambda (stx)
-    (syntax-case stx ()
-      [(Wrap S (var ...))
-       (syntax/loc stx (struct S (var ...)))])))
-
-;; ----
-
-(define (check sym pred type x)
-  (unless (pred x)
-    (raise-type-error sym type x)))
-
-(define (ok-node? x)
-  (check 'ok-node? node? "node" x)
-  (and (node-z2 x) #t))
-(define (interrupted-node? x)
-  (check 'interrupted-node? node? "node" x)
-  (not (node-z2 x)))
-
-
-(define (wderiv-e1 x)
-  (check 'wderiv-e1 deriv? "deriv" x)
-  (node-z1 x))
-(define (wderiv-e2 x)
-  (check 'wderiv-e2 deriv? "deriv" x)
-  (node-z2 x))
-
-(define (wlderiv-es1 x)
-  (check 'wlderiv-es1 lderiv? "lderiv" x)
-  (node-z1 x))
-(define (wlderiv-es2 x)
-  (check 'wlderiv-es2 lderiv? "lderiv" x)
-  (node-z2 x))
-
-(define (wbderiv-es1 x)
-  (check 'wbderiv-es1 bderiv? "bderiv" x)
-  (node-z1 x))
-(define (wbderiv-es2 x)
-  (check 'wbderiv-es2 bderiv? "bderiv" x))
-
-;; wderivlist-es2 : (list-of WDeriv) -> (list-of Stx)/#f
-(define (wderivlist-es2 xs)
-  (let ([es2 (map wderiv-e2 xs)])
-    (and (andmap syntax? es2) es2)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv.rkt
deleted file mode 100644
index 9f397d305b..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "deriv-c.rkt")
-(provide (all-from-out "deriv-c.rkt"))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/hiding-policies.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/hiding-policies.rkt
deleted file mode 100644
index 58d499570c..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/hiding-policies.rkt
+++ /dev/null
@@ -1,346 +0,0 @@
-#lang racket/base
-(require racket/match
-         "reductions-config.rkt"
-         "../util/mpi.rkt")
-(provide policy->predicate)
-
-;; A Policy is one of
-;;   'disable
-;;   'standard
-;;   (list 'custom boolean boolean boolean boolean (listof Entry))
-
-;; An Entry is one of
-;; (list 'show-if Condition)
-;; (list 'hide-if Condition)
-
-;; A Condition is one of:
-;; (list 'free=? identifier)
-;; (list 'lexical)
-;; (list 'unbound)
-;; (list 'binding IdentifierBinding)
-;; (list 'symbol=? symbol)
-;; (list 'symbol-like regexp)
-;; (list 'from-kernel-module)
-;; (list 'from-def-module ModulePath)
-;; (list 'from-nom-module ModulePath)
-;; (list 'from-collection (listof String))
-;; (list 'from-planet-collection String/#f String/#f (listof String))
-;; (list 'phase>=? nat)
-;; (cons 'and Condition)
-;; (cons 'or Condition)
-
-;; policy->predicate
-(define (policy->predicate policy)
-  (define fun (policy->function policy))
-  (lambda (id)
-    (case (fun id)
-      [(show) #t]
-      [(hide) #f]
-      [else (error 'policy->predicate "incomplete policy (returned ~s): ~s"
-                   (fun id)
-                   policy)])))
-
-;; policy->function : Policy -> (id -> choice)
-(define (policy->function policy)
-  (match policy
-    ['disable
-     (lambda (id) 'show)]
-    ['standard
-     (policy->function '(custom #t #t #t #t ()))]
-    [(list 'custom hide-racket? hide-libs? hide-contracts? hide-phase1? entries)
-     (entries->function entries
-                        (policy-base->function hide-racket?
-                                               hide-libs?
-                                               hide-contracts?
-                                               hide-phase1?))]))
-
-;; policy-base->function : boolean boolean boolean boolean -> (id -> choice)
-(define (policy-base->function hide-racket? hide-libs? hide-contracts? hide-phase1?)
-  (entries->function
-   `[(hide-if
-      (or ,@(filter values
-                    (list (and hide-racket?
-                               '(or (from-kernel-module)
-                                    (from-collection ("racket"))))
-                          (and hide-libs?
-                               '(or (from-collection ())
-                                    #|(from-planet-collection #f #f ())|#))
-                          (and hide-contracts?
-                               '(symbol-like #rx"^provide/contract-id-"))
-                          (and hide-phase1?
-                               '(phase>=? 1))))))]
-   (lambda (id) 'show)))
-
-;; entries->function : (listof Entry) (id -> choice) -> (id -> choice)
-(define (entries->function entries base-fun)
-  (if (pair? entries)
-      (entry->function (car entries)
-                       (entries->function (cdr entries) base-fun))
-      base-fun))
-
-;; entry->function : Entry -> (id -> choice)
-(define (entry->function entry base-fun)
-  (match entry
-    [(list 'show-if condition)
-     (let ([pred (condition->predicate condition)])
-       (lambda (id)
-         (if (pred id) 'show (base-fun id))))]
-    [(list 'hide-if condition)
-     (let ([pred (condition->predicate condition)])
-       (lambda (id)
-         (if (pred id) 'hide (base-fun id))))]
-    [(list 'splice entries)
-     (entries->function entries base-fun)]))
-
-;; condition->predicate : condition -> (id -> boolean)
-(define (condition->predicate condition)
-  (match condition
-    [(list 'free=? the-id)
-     (lambda (id)
-       (free-identifier=? id the-id (phase)))]
-    [(list 'lexical)
-     (lambda (id)
-       (eq? (get-binding id) 'lexical))]
-    [(list 'unbound)
-     (lambda (id)
-       (eq? (get-binding id) #f))]
-    [(list 'binding module-binding)
-     (lambda (id)
-       (let ([binding (get-binding id)])
-         (and (pair? binding)
-              (same-binding? binding module-binding))))]
-    [(list 'symbol=? name)
-     (lambda (id)
-       (eq? (syntax-e id) name))]
-    [(list 'symbol-like rx)
-     (lambda (id)
-       (regexp-match? rx (symbol->string (syntax-e id))))]
-    [(list 'from-kernel-module)
-     (lambda (id)
-       (let ([binding (get-binding id)])
-         (and (pair? binding)
-              (kernel-module? (binding-def-module binding)))))]
-    [(list 'from-def-module module-path)
-     (lambda (id)
-       (let ([binding (get-binding id)])
-         (and (pair? binding)
-              (same-module-path? (binding-def-module binding)
-                                 module-path))))]
-    [(list 'from-nom-module module-path)
-     (lambda (id)
-       (let ([binding (get-binding id)])
-         (and (pair? binding)
-              (same-module-path? (binding-nom-module binding)
-                                 module-path))))]
-    [(list 'from-collection collection)
-     (lambda (id)
-       (let ([binding (get-binding id)])
-         (and (pair? binding)
-              (collection-prefix? collection
-                                  (binding-def-module binding)))))]
-    [(list 'phase>=? num)
-     (lambda (id)
-       (>= (phase) num))]
-    [(cons 'and conditions)
-     (let ([predicates (map condition->predicate conditions)])
-       (lambda (id)
-         (for/and ([predicate predicates])
-           (predicate id))))]
-    [(cons 'or conditions)
-     (let ([predicates (map condition->predicate conditions)])
-       (lambda (id)
-         (for/or ([predicate predicates])
-           (predicate id))))]))
-
-(define (kernel-module? mpi)
-  (cond [(module-path-index? mpi)
-         (let-values ([(a b) (module-path-index-split mpi)])
-           (match a
-             [`(quote ,name)
-              (regexp-match? #rx"^#%" (symbol->string name))]
-             [_ #f]))]
-        [else #f]))
-
-;; same-module-path? : mpi mpi -> boolean
-(define (same-module-path? actual expected)
-  (equal? (module-path-index-resolve actual)
-          (module-path-index-resolve expected)))
-
-;; same-binding? : binding binding -> boolean
-(define (same-binding? actual expected)
-  (and (list? actual)
-       (same-module-path? (car actual) (car expected))
-       (eq? (cadr actual) (cadr expected))))
-
-;; collection-prefix? : (listof string) mpi -> boolean
-(define (collection-prefix? collection mpi)
-  (define library-frame
-    (expanded-mpi-sexpr->library
-     (mpi-sexpr->expanded-mpi-sexpr
-      (mpi->mpi-sexpr mpi))))
-  (match library-frame
-    [`(LIB ,paths)
-     (let loop ([cpaths collection] [paths paths])
-       (cond [(and (pair? cpaths) (pair? paths))
-              (and (equal? (car cpaths) (car paths))
-                   (loop (cdr cpaths) (cdr paths)))]
-             [(pair? cpaths) #f]
-             [(pair? paths) #t]))]
-    [_ #f]))
-
-
-;; get-binding : id -> binding
-(define (get-binding id)
-  (identifier-binding id (phase)))
-
-;; binding-def-module : binding -> module-path
-(define (binding-def-module binding)
-  (car binding))
-
-;; binding-def-name : binding -> module-path
-(define (binding-def-name binding)
-  (cadr binding))
-
-;; binding-nom-module : binding -> module-path
-(define (binding-nom-module binding)
-  (caddr binding))
-
-;; binding-nom-name : binding -> module-path
-(define (binding-nom-name binding)
-  (cadddr binding))
-
-
-;; ----
-
-;; Conversion to and from S-expr form.
-;; Conversion is lossy (identifier policies)
-
-;; policy->policy-sexpr
-(define (policy->policy-sexpr policy)
-  (match policy
-    [`(custom ,b1 ,b2 ,b3 ,b4 ,entries)
-     `(CUSTOM ,b1 ,b2 ,b3 ,b4 ,(map entry->entry-sexpr entries))]
-    [_ policy]))
-
-;; policy-sexpr->policy
-(define (policy-sexpr->policy sexpr)
-  (match sexpr
-    [`(CUSTOM ,b1 ,b2 ,b3 ,b4 ,entries)
-     `(custom ,b1 ,b2 ,b3 ,b4 ,(map entry-sexpr->entry entries))]
-    [_ sexpr]))
-
-;; entry->entry-sexpr
-(define (entry->entry-sexpr entry)
-  (match entry
-    [`(show-if ,condition)
-     `(show-if ,(condition->condition-sexpr condition))]
-    [`(hide-if ,condition)
-     `(hide-if ,(condition->condition-sexpr condition))]))
-
-;; entry-sexpr->entry
-(define (entry-sexpr->entry sexpr)
-  (match sexpr
-    [`(show-if ,condition)
-     `(show-if ,(condition-sexpr->condition condition))]
-    [`(hide-if ,condition)
-     `(hide-if ,(condition-sexpr->condition condition))]))
-
-;; condition->condition-sexpr
-(define (condition->condition-sexpr condition)
-  (match condition
-    [(list 'free=? id)
-     (let ([binding (identifier-binding id)])
-       (cond [(list? binding)
-              (condition->condition-sexpr `(binding ,binding))]
-             [(eq? binding 'lexical)
-              `(and (lexical)
-                    (symbol=? ,(syntax-e id)))]
-             [else
-              `(and (unbound)
-                    (symbol=? ,(syntax-e id)))]))]
-    [`(binding (,mod1 ,name1 ,mod2 ,name2 . ,rest))
-     `(BINDING (,(mpi->mpi-sexpr mod1)
-                ,name1
-                ,(mpi->mpi-sexpr mod2)
-                ,name2
-                . ,rest))]
-    [`(from-def-module ,mod)
-     `(FROM-DEF-MODULE ,(mpi->mpi-sexpr mod))]
-    [`(from-nom-module ,mod)
-     `(FROM-NOM-MODULE ,(mpi->mpi-sexpr mod))]
-    [`(and . ,conditions)
-     `(and ,@(map condition->condition-sexpr conditions))]
-    [`(or . ,conditions)
-     `(or ,@(map condition->condition-sexpr conditions))]
-    [_
-     condition]))
-
-;; condition-sexpr->condition
-(define (condition-sexpr->condition sexpr)
-  (match sexpr
-    [`(BINDING (,mod1 ,name1 ,mod2 ,name2 . ,rest))
-     `(binding (,(mpi-sexpr->mpi mod1)
-                ,name1
-                ,(mpi-sexpr->mpi mod2)
-                ,name2
-                . ,rest))]
-    [`(FROM-DEF-MODULE ,mod)
-     `(from-def-module ,(mpi-sexpr->mpi mod))]
-    [`(FROM-NOM-MODULE ,mod)
-     `(from-nom-module ,(mpi-sexpr->mpi mod))]
-    [`(and . ,sexprs)
-     `(and ,@(map condition-sexpr->condition sexprs))]
-    [`(or . ,sexprs)
-     `(or ,@(map condition-sexpr->condition sexprs))]
-    [_ sexpr]))
-
-
-;; ----
-
-(provide same-condition?)
-
-;; same-condition? : condition condition -> boolean
-(define (same-condition? a b)
-  (and (eq? (car a) (car b))
-       (match a
-         [`(free=? ,aid)
-          (let ([bid (cadr b)])
-            (for/and ([n '(0 #| 1 -1 |#)])
-              (free-identifier=? aid bid n)))]
-         [`(binding ,ab)
-          (let ([bb (cadr b)]) 
-            (and (same-module-path? (car ab) (car bb))
-                 (eq? (cadr ab) (cadr bb))
-                 (equal? (list-tail ab 4) (list-tail bb 4))))]
-         [`(from-def-module ,ampi)
-          (same-module-path? ampi (cadr b))]
-         [`(from-nom-module ,ampi)
-          (same-module-path? ampi (cadr b))]
-         [`(and . ,aconditions)
-          (let ([bconditions (cdr b)])
-            (and (= (length aconditions) (length bconditions))
-                 (andmap same-condition? aconditions (cdr b))))]
-         [`(or . ,aconditions)
-          (let ([bconditions (cdr b)])
-            (and (= (length aconditions) (length bconditions))
-                 (andmap same-condition? aconditions (cdr b))))]
-         [_
-          (equal? a b)])))
-
-
-;; ----
-
-(provide standard-policy
-         base-policy
-         hide-all-policy
-         hide-none-policy)
-
-(define standard-policy
-  (policy->predicate 'standard))
-
-(define base-policy
-  (policy->predicate
-   '(custom #t #f #f #f ())))
-
-(define (hide-all-policy id) #f)
-(define (hide-none-policy id) #t)
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions-config.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions-config.rkt
deleted file mode 100644
index e6ab4fb81e..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions-config.rkt
+++ /dev/null
@@ -1,496 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/contract/base
-         racket/match
-         "../util/eomap.rkt"
-         "deriv-util.rkt"
-         "stx-util.rkt"
-         "context.rkt"
-         "steps.rkt")
-
-(define-syntax-rule (STRICT-CHECKS form ...)
-  (when #f
-    form ... (void)))
-
-(define state/c (or/c state? false/c))
-(define context/c any/c)
-(define big-context/c any/c)
-
-(define (parameterlike/c c)
-  (case-> [-> c] [c . -> . any/c]))
-
-(define (list-parameter/c c)
-  (parameter/c (listof (box/c c))))
-
-(define subterms-table/c hash?)
-
-(define-syntax-rule (provide/contract* [name c] ...)
-  #;(provide/contract [name c] ...)
-  (provide name ...))
-
-(provide/contract*
- [state/c contract?]
- [context (parameter/c context/c)]
- [big-context (parameter/c big-context/c)]
- [marking-table (parameter/c (or/c hash? false/c))]
- [current-binders (parameter/c (listof identifier?))]
- [current-definites (parameter/c eomap?)] ;; eomap[identifier => phase-level]
- [current-binders (parameter/c hash?)] ;; hash[identifier => phase-level]
- [current-frontier (parameter/c (listof syntax?))]
- [sequence-number (parameter/c (or/c false/c exact-nonnegative-integer?))]
- [phase (parameter/c exact-nonnegative-integer?)]
- [visibility (parameter/c boolean?)]
- [macro-policy (parameter/c (identifier? . -> . any))]
- [subterms-table (parameter/c (or/c subterms-table/c false/c))]
- [hides-flags (list-parameter/c boolean?)]
-
- [learn-binders ((listof identifier?) . -> . any)]
- [learn-definites ((listof identifier?) . -> . any)]
-
- [add-frontier ((listof syntax?) . -> . any)]
- [blaze-frontier (syntax? . -> . any)]
-
- [current-state-with (syntaxish? syntaxish? . -> . state?)]
- [walk ([syntaxish? syntaxish? symbol?]
-        [#:foci1 syntaxish? #:foci2 syntaxish?]
-        . ->* . step?)]
- [stumble ([syntaxish? exn?] [#:focus syntaxish?] . ->* . misstep?)]
- [walk/talk
-  (-> (or/c symbol? string?) (listof (or/c syntax? string? 'arrow))
-      remarkstep?)]
-
- [current-pass-hides? (parameterlike/c boolean?)]
-
- [available-lift-stxs (parameter/c (listof syntaxish?))]
- [visible-lift-stxs (parameter/c (listof syntaxish?))])
-
-(provide with-context
-         with-new-local-context)
-
-;; FIXME: Steps are pairs of Configurations
-;; Configurations contain contexts, definites, etc.
-
-;; Classical Parameters
-
-;; context: parameter of Context
-(define context (make-parameter null))
-
-;; big-context: parameter of BigContext
-(define big-context (make-parameter null))
-
-;; marking-table
-(define marking-table (make-parameter #f))
-
-;; current-binders : parameter of hash[identifier => phase-level]
-(define current-binders (make-parameter #f))
-
-;; current-definites : parameter of eomap[identifier => phase-level]
-(define current-definites (make-parameter #f))
-
-;; current-frontier : parameter of (list-of syntax)
-(define current-frontier (make-parameter null))
-
-;; sequence-number : parameter of nat
-(define sequence-number (make-parameter #f))
-
-;; New Hiding Parameters
-
-;; visibility : (parameterof boolean)
-(define visibility (make-parameter #t))
-
-;; macro-policy : (parameterof (identifier -> boolean))
-(define macro-policy (make-parameter (lambda (id) #t)))
-
-;; phase : (parameterof nat)
-(define phase (make-parameter 0))
-
-;; subterms-table : parameter of hash[syntax => (list-of Path)]
-(define subterms-table (make-parameter #f))
-
-;; hides-flags : (parameterof (listof (boxof boolean)))
-(define hides-flags (make-parameter null))
-
-;; lift params
-(define available-lift-stxs (make-parameter null))
-(define visible-lift-stxs (make-parameter null))
-
-;; Hiding Structures
-
-(provide (struct-out hiding-failure)
-         (struct-out nonlinearity)
-         (struct-out localactions)
-         (struct-out hidden-lift-site))
-
-;; Machinery for reporting things that macro hiding can't handle
-(define-struct hiding-failure ())
-(define-struct (nonlinearity hiding-failure) (term paths))
-(define-struct (localactions hiding-failure) ())
-(define-struct (hidden-lift-site hiding-failure) ())
-
-;; Operations
-
-(define-syntax with-context
-  (syntax-rules ()
-    [(with-context f . body)
-     (let ([c (context)])
-       (parameterize ([context
-                       (if (visibility)
-                           (cons f c)
-                           c)])
-         (let () . body)))]))
-
-(define-syntax with-new-local-context
-  (syntax-rules ()
-    [(with-new-local-context e . body)
-     (parameterize ([big-context
-                     (cons (make bigframe (context) (list e) e)
-                           (big-context))]
-                    [context null])
-       . body)]))
-
-(define (learn-definites ids)
-  (current-definites
-   (eomap-set* (current-definites) ids (phase))))
-
-(define (learn-binders ids)
-  (current-binders
-   (for/fold ([binders (current-binders)]) ([id (in-list ids)])
-     (hash-set binders id (phase)))))
-
-(define (get-frontier) (or (current-frontier) null))
-
-(define (add-frontier stxs)
-  (current-frontier
-   (let ([frontier0 (current-frontier)])
-     (and frontier0 (append stxs frontier0)))))
-
-(define (blaze-frontier stx)
-  (current-frontier
-   (let ([frontier0 (current-frontier)])
-     (and frontier0
-          (remq stx frontier0)))))
-
-;; Renames mapping
-
-(define renames-mapping/c
-  ([syntax?] [#:allow-nonstx? boolean? #:default any/c] . ->* . any))
-
-(provide/contract*
- [renames-mapping/c contract?]
- [make-renames-mapping
-  (syntaxish? syntaxish? . -> . renames-mapping/c)]
- [compose-renames-mappings
-  (renames-mapping/c renames-mapping/c . -> . renames-mapping/c)]
- [apply-renames-mapping (renames-mapping/c syntaxish? . -> . syntaxish?)]
-
- [table->renames-mapping
-  (hash? . -> . renames-mapping/c)]
- [make-renames-table
-  (syntaxish? syntaxish? . -> . hash?)]
- [add-to-renames-table
-  (hash? syntaxish? syntaxish? . -> . any)]
-
- [rename-frontier/mapping
-  (renames-mapping/c . -> . any)])
-
-(define (rename-frontier/mapping mapping)
-  (current-frontier
-   (with-handlers ([exn:fail? (lambda _ #f)])
-     (for/list ([fstx (current-frontier)])
-       (let ([renamed-fstx (mapping fstx #:allow-nonstx? #t #:default null)])
-         (flatten-syntaxes renamed-fstx))))))
-
-;; apply-renames-mapping : (stx -> stx) stx -> stx
-(define (apply-renames-mapping mapping stx)
-  (cond [(and (syntax? stx)
-              (mapping stx #:allow-nonstx? #t #:default #f))
-         => (lambda (rstx)
-              (datum->syntax stx rstx stx stx))]
-        [(syntax? stx)
-         (let* ([inner (syntax-e stx)]
-                [rinner (apply-renames-mapping mapping inner)])
-           (if (eq? rinner inner)
-               stx
-               (datum->syntax stx rinner stx stx)))]
-        [(pair? stx)
-         (let ([ra (apply-renames-mapping mapping (car stx))]
-               [rb (apply-renames-mapping mapping (cdr stx))])
-           (if (and (eq? ra (car stx)) (eq? rb (cdr stx)))
-               stx
-               (cons ra rb)))]
-        [(vector? stx)
-         (let* ([elems (vector->list stx)]
-                [relems (apply-renames-mapping mapping elems)])
-           (if (eq? relems elems)
-               stx
-               (list->vector relems)))]
-        [(box? stx)
-         (let* ([inner (unbox stx)]
-                [rinner (apply-renames-mapping mapping inner)])
-           (if (eq? rinner inner)
-               stx
-               (box inner)))]
-        [(prefab-struct-key stx)
-         (let* ([inner (struct->vector stx)]
-                [rinner (apply-renames-mapping mapping inner)])
-           (if (eq? rinner inner)
-               stx
-               (apply make-prefab-struct
-                      (prefab-struct-key stx)
-                      (cdr (vector->list rinner)))))]
-        [else stx]))
-
-;; make-renames-mapping : stx stx -> stx kw-args -> stx
-(define (make-renames-mapping from0 to0)
-  (define table (make-renames-table from0 to0))
-  (table->renames-mapping table))
-
-(define (table->renames-mapping table)
-  (lambda (stx #:allow-nonstx? [allow-nonstx? #f] #:default [default #f])
-    (let ([replacement (hash-ref table stx #f)])
-      (if replacement
-          (begin #;(printf "  replacing ~s with ~s\n" stx replacement)
-                 replacement)
-          (begin #;(printf "  not replacing ~s\n" stx)
-                 default)))))
-
-(define (make-renames-table from0 to0)
-  (define table (make-hasheq))
-  (add-to-renames-table table from0 to0)
-  table)
-
-(define (add-to-renames-table table from0 to0)
-  (let loop ([from from0] [to to0])
-    (cond [(and (syntax? from) (syntax? to))
-           (hash-set! table from to)
-           (loop (syntax-e from) (syntax-e to))]
-          [(syntax? from)
-           (hash-set! table from to)
-           (loop (syntax-e from) to)]
-          [(syntax? to)
-           (loop from (syntax-e to))]
-          [(and (pair? from) (pair? to))
-           (loop (car from) (car to))
-           (loop (cdr from) (cdr to))]
-          [(and (vector? from) (vector? to))
-           (loop (vector->list from) (vector->list to))]
-          [(and (box? from) (box? to))
-           (loop (unbox from) (unbox to))]
-          [(and (struct? from) (struct? to))
-           (loop (struct->vector from) (struct->vector to))]
-          [(eqv? from to)
-           (void)]
-          [else
-           ;; FIXME: bad rename indicates something out of sync
-           ;; But for now, just drop it to avoid macro stepper error.
-           ;; Only bad effect should be missed subterms (usually at phase1).
-           (STRICT-CHECKS
-            (eprintf "from:\n~.s\n\nto:\n~.s\n\n"
-                     (stx->datum from)
-                     (stx->datum to))
-            (eprintf "original from:\n~.s\n\noriginal to:\n~.s\n\n"
-                     (stx->datum from0)
-                     (stx->datum to0))
-            (error 'add-to-renames-table))
-           (void)])))
-
-(define (compose-renames-mappings first second)
-  (lambda (stx #:allow-nonstx? [allow-nonstx? #f] #:default [default #f])
-    (let ([r (first stx #:allow-nonstx? allow-nonstx? #:default #f)])
-      (if r
-          (second r #:allow-nonstx? allow-nonstx? #:default default)
-          default))))
-
-(define (flatten-syntaxes x)
-  (cond [(syntax? x)
-         (list x)]
-        [(pair? x)
-         (append (flatten-syntaxes (car x))
-                 (flatten-syntaxes (cdr x)))]
-        [(vector? x)
-         (flatten-syntaxes (vector->list x))]
-        [(box? x)
-         (flatten-syntaxes (unbox x))]
-        [else null]))
-
-;; -----------------------------------
-
-(define (current-state-with e fs)
-  (make state e (foci fs) (context) (big-context)
-        (current-binders) (current-definites)
-        (current-frontier) (sequence-number)))
-
-(define (walk e1 e2 type
-              #:foci1 [foci1 e1]
-              #:foci2 [foci2 e2])
-  (make step type
-        (current-state-with e1 foci1)
-        (current-state-with e2 foci2)))
-
-(define (stumble stx exn
-                 #:focus [focus stx])
-  (make misstep 'error
-        (current-state-with stx focus)
-        exn))
-
-(define (walk/talk type contents)
-  (make remarkstep type
-        (current-state-with #f null)
-        contents))
-
-(define (foci x)
-  (cond [(syntax? x)
-         (list x)]
-        [(null? x)
-         null]
-        [(pair? x)
-         (append (foci (car x))
-                 (foci (cdr x)))]))
-
-
-;; RS: the reductions monad
-
-;; Datastructure RS
-;; Better for debugging
-
-;; RS = (rsok ReductionSequence stx stx state)
-;;    | (rsfailed ReductionSequence exn)
-
-(define-struct rsok (rs real vis s))
-(define-struct rsfailed (rs exn))
-
-(define RS/c
-  (lambda (x)
-    (or (rsok? x) (rsfailed? x))))
-
-(define (RSunit steps x y s) (make rsok steps x y s))
-
-(define (RSfail steps exn) (make rsfailed steps exn))
-
-(define (RSbind a f)
-  (match a
-    [(struct rsok (rs a b s))
-     (f a b s rs)]
-    [(struct rsfailed (rs exn))
-     a]))
-
-(define (RScase a k f)
-  (match a
-    [(struct rsok (rs a b s))
-     (k rs a b s)]
-    [(struct rsfailed (rs exn))
-     (f rs exn)]))
-
-(provide RS/c)
-(provide/contract*
- [RSunit ((listof protostep?) any/c any/c state/c . -> . RS/c)]
- [RSfail ((listof protostep?) exn? . -> . RS/c)]
- [RSbind (RS/c (any/c any/c state/c (listof protostep?) . -> . RS/c) . -> . RS/c)]
- [RScase (RS/c
-          ((listof protostep?) any/c any/c state/c . -> . any)
-          ((listof protostep?) exn? . -> . any)
-          . -> . any)])
-
-#|
-;; Alternate RS = (values ?exn steps ?stx ?stx state)
-;; Avoids allocation
-;; Doesn't seem to actually matter
-
-(define (RSunit ws x y s)
-  (values #f ws x y s))
-
-(define (RSfail ws e)
-  (values e ws #f #f #f))
-
-(define-syntax-rule (RSbind a f)
-  (let-values ([(e ws x y s) a])
-    (if (not e)
-        (f x y s ws)
-        (values e ws x y s))))
-
-(define-syntax-rule (RScase a k f)
-  (let-values ([(e ws x y s) a])
-    (if (not e)
-        (k ws x y s)
-        (f ws e))))
-
-(define-syntax RS/c (make-rename-transformer #'any/c))
-
-(provide RS/c
-         RSunit
-         RSfail
-         RSbind
-         RScase)
-|#
-
-
-;; Table
-
-(provide/contract*
- [gather-proper-subterms (syntaxish? . -> . subterms-table/c)]
- [table-get (subterms-table/c syntax? . -> . list?)]
- [table-apply-renames-mapping
-  ((or/c subterms-table/c false/c) renames-mapping/c boolean?
-   . -> . (or/c subterms-table/c false/c))])
-
-;; gather-proper-subterms : Syntax -> SubtermTable
-;; FIXME: Eventually, need to descend into vectors, boxes, etc.
-(define (gather-proper-subterms stx0)
-  (define (table-add! table stx v)
-    (hash-set! table stx (cons v (table-get table stx))))
-  (define (table-get table stx)
-    (hash-ref table stx null))
-  (let ([table (make-hasheq)])
-    ;; loop : Syntax Path -> void
-    (define (loop stx rpath)
-      (unless (eq? stx0 stx)
-        (table-add! table stx (reverse rpath)))
-      (let ([p (if (syntax? stx) (syntax-e stx) stx)])
-        (when (pair? p)
-          (loop-cons p rpath 0))))
-    ;; loop-cons : (cons Syntax ?) Path number -> void
-    (define (loop-cons p rpath pos)
-      (loop (car p) (cons (make ref pos) rpath))
-      (let ([t (cdr p)])
-        (cond [(syntax? t)
-               (let ([te (syntax-e t)])
-                 (if (pair? te)
-                     (begin
-                       (table-add! table t (reverse (cons (make tail pos) rpath)))
-                       (loop-cons te rpath (add1 pos)))
-                     (loop t (cons (make tail pos) rpath))))]
-              [(pair? t)
-               (loop-cons t rpath (add1 pos))]
-              [(null? t)
-               (void)])))
-    (loop stx0 null)
-    table))
-
-;; table-get : Table stx -> (listof Path)
-(define (table-get t x)
-  (hash-ref t x null))
-
-;; table-apply-renames-mapping boolean : Table (stx -> stx) -> Table
-(define (table-apply-renames-mapping old mapping whole-form-rename?)
-  (and old
-       (let ([t (make-hasheq)])
-         (hash-for-each
-          old
-          (if whole-form-rename?
-              (lambda (stx paths)
-                (let ([rstx (mapping stx #:default #f)])
-                  (when rstx
-                    (hash-set! t rstx paths))))
-              (lambda (stx paths)
-                (let ([rstx (mapping stx #:default stx)])
-                  (hash-set! t rstx paths)))))
-         t)))
-
-;; list-parameter->parameterlike : (list-parameter/c X) -> (parameterlike X)
-(define (list-parameter->parameterlike p)
-  (case-lambda
-    [() (unbox (car (p)))]
-    [(v) (set-box! (car (p)) v)]))
-
-;; current-pass-hides?
-(define current-pass-hides? (list-parameter->parameterlike hides-flags))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions-engine.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions-engine.rkt
deleted file mode 100644
index 7e9ea22d75..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions-engine.rkt
+++ /dev/null
@@ -1,575 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     syntax/parse
-                     syntax/parse/experimental/contract)
-         racket/contract/base
-         syntax/stx
-         "deriv-util.rkt"
-         "stx-util.rkt"
-         "context.rkt"
-         "steps.rkt"
-         "reductions-config.rkt")
-(provide (all-from-out "steps.rkt")
-         (all-from-out "reductions-config.rkt")
-         DEBUG
-         R
-         !)
-
-(define-syntax ! (syntax-rules ()))
-
-(define-syntax-rule (with-syntax1 ([pattern rhs]) . body)
-  (syntax-case rhs ()
-    [pattern (let () . body)]
-    [x (raise-syntax-error 'with-syntax1
-                           (format "failed pattern match against ~s"
-                                   'pattern)
-                           #'x)]))
-
-(define-syntax-rule (DEBUG form ...)
-  (when #f
-    form ... (void)))
-
-(define-syntax-rule (STRICT-CHECKS form ...)
-  (when #f
-    form ... (void)))
-
-(define RST/c (syntaxish? syntaxish? state/c list? . -> . RS/c))
-
-;; (R R-clause ...) : RST
-
-;; An R-clause is one of
-;;   [! expr]
-;;   [#:set-syntax expr]
-;;   [#:expect-syntax expr]
-;;   [#:pattern pattern]
-;;   [#:do expr ...]
-;;   [#:let var expr]
-;;   [#:left-foot]
-;;   [#:walk term2 description]
-;;   [#:rename pattern rename [description]]
-;;   [#:rename/no-step pattern stx stx]
-;;   [#:reductions expr]
-;;   [#:learn ids]
-;;   [#:if test R-clause ...]
-;;   [#:when test R-clause ...]
-;;   [#:hide-check ids]
-;;   [#:seek-check]
-;;   [generator hole fill]
-
-(define-syntax R
-  (syntax-parser
-    [(R . clauses)
-     #'(lambda (f v s ws)
-         (R** f v _ s ws . clauses))]))
-
-(define-syntax RP
-  (syntax-parser
-   [(RP p . clauses)
-    #'(lambda (f v s ws)
-        (R** f v p s ws . clauses))]))
-
-;; (R** form virtual-form pattern . clauses)
-(define-syntax R**
-  (syntax-parser #:literals (! =>)
-
-    ;; (R** f v p s ws . clauses)
-    ;;   f is the "real" form
-    ;;   v is the "virtual" form (used for steps)
-    ;;      - vis=#t: starts as f
-    ;;      - vis=#f: starts as last visible term
-    ;;   s is the last marked state
-    ;;   ws is the list of steps, reversed
-
-    ;; Base: done
-    [(R** f v p s ws)
-     #'(RSunit ws f v s)]
-
-    [(R** f v p s ws => k . more)
-     #:declare k (expr/c #'RST/c)
-     #'(RSbind (k f v s ws)
-               (RP p . more))]
-
-    ;; Error-point case
-    [(R** f v p s ws [! maybe-exn] . more)
-     #:declare maybe-exn (expr/c #'(or/c exn? false/c))
-     #'(let ([x maybe-exn])
-         (if x
-             ;; FIXME
-             (RSfail (cons (stumble v x) ws) x)
-             (R** f v p s ws . more)))]
-
-    ;; Change patterns
-    [(R** f v p s ws [#:pattern p2] . more)
-     #'(R** f v p2 s ws . more)]
-
-    ;; Execute expressions for effect
-    [(R** f v p s ws [#:do expr ...] . more)
-     #'(begin
-         (with-syntax1 ([p f])
-           expr ... (void))
-         (R** f v p s ws . more))]
-
-    [(R** f v p s ws [#:let var expr] . more)
-     #'(let ([var (with-syntax1 ([p f]) expr)])
-         (R** f v p s ws . more))]
-
-    [(R** f v p s ws [#:parameterize ((param expr) ...) . clauses] . more)
-     #:declare param (expr/c #'parameter?)
-     #'(RSbind (parameterize ((param expr) ...)
-                 (R** f v p s ws . clauses))
-               (RP p . more))]
-
-    ;; Change syntax
-    [(R** f v p s ws [#:set-syntax form] . more)
-     #:declare form (expr/c #'syntaxish?)
-     #'(let ([f2 (with-syntax1 ([p f]) form)])
-         ;; FIXME: should (current-pass-hides?) be relevant?
-         (let ([v2 (if (visibility) f2 v)])
-           (R** f2 v2 p s ws . more)))]
-
-    [(R** f v p s ws [#:expect-syntax expr ds] . more)
-     #:declare expr (expr/c #'syntax?)
-     #'(let ([expected (with-syntax1 ([p f]) expr)])
-         (STRICT-CHECKS
-          (check-same-stx 'expect-syntax f expected ds))
-         (R** f v p s ws . more))]
-
-    [(R** f v p s ws [#:left-foot] . more)
-     #'(R** f v p s ws [#:step #f v] . more)]
-    [(R** f v p s ws [#:left-foot fs] . more)
-     #'(R** f v p s ws [#:step #f fs] . more)]
-
-    [(R** f v p s ws [#:step type] . more)
-     #'(R** f v p s ws [#:step type v] . more)]
-
-    [(R** f v p s ws [#:step type fs] . more)
-     #:declare fs (expr/c #'syntaxish?)
-     #:declare type (expr/c #'(or/c step-type? false/c))
-     #'(let ([s2 (and (visibility)
-                      (current-state-with v (with-syntax1 ([p f]) fs)))]
-             [type-var type])
-         (DEBUG
-          (printf "visibility = ~s\n" (if (visibility) 'VISIBLE 'HIDDEN))
-          (printf "step: s1 = ~s\n" s)
-          (printf "step: s2 = ~s\n\n" s2))
-         (let ([ws2
-                (if (and (visibility) type-var)
-                    (cons (make step type-var s s2) ws)
-                    ws)])
-           (R** f v p s2 ws2 . more)))]
-
-    [(R** f v p s ws [#:walk form2 description] . more)
-     #:declare form2 (expr/c #'syntaxish?)
-     #'(let ([wfv (with-syntax1 ([p f]) form2)])
-         (R** f v p s ws
-              [#:left-foot]
-              [#:set-syntax wfv]
-              [#:step description]
-              . more))]
-
-    [(R** f v p s ws [#:reductions rs] . more)
-     #:declare rs (expr/c #'(listof step?))
-     #'(let ([ws2
-              (if (visibility)
-                  (revappend (with-syntax1 ([p f]) rs) ws)
-                  ws)])
-         (R** f v p s ws2 . more))]
-
-    [(R** f v p s ws [#:in-hole hole . clauses] . more)
-     #'(let ([k (RP p . more)]
-             [reducer
-              (lambda (_)
-                (R . clauses))])
-         (Run reducer f v p s ws hole #f k))]
-
-    ;; Rename
-    [(R** f v p s ws [#:rename pattern renames] . more)
-     #'(R** f v p s ws [#:rename pattern renames #f] . more)]
-    [(R** f v p s ws [#:rename pattern renames description] . more)
-     #'(R** f v p s ws [#:rename* pattern renames description #f]. more)]
-
-    [(R** f v p s ws [#:rename* pattern renames description mark-flag] . more)
-     #'(let-values ([(renames-var description-var)
-                     (with-syntax1 ([p f])
-                       (values renames description))])
-         (let* ([pre-renames-var
-                 (with-syntax1 ([p f]) (syntax pattern))]
-                [f2
-                 ((CC pattern f p) renames)]
-                [whole-form-rename? (eq? f pre-renames-var)]
-                [renames-mapping
-                 (make-renames-mapping pre-renames-var renames-var)]
-                [v2
-                 (cond [(or (visibility) (eq? mark-flag #f))
-                        (apply-renames-mapping renames-mapping v)]
-                       [(eq? mark-flag 'mark)
-                        v]
-                       [(eq? mark-flag 'unmark)
-                        (apply-renames-mapping
-                         (compose-renames-mappings
-                          (table->renames-mapping (marking-table))
-                          renames-mapping)
-                         v)])]
-                [ws2
-                 (if (and description-var (visibility))
-                     (cons (walk v v2 description-var
-                                 #:foci1 pre-renames-var
-                                 #:foci2 renames-var)
-                           ws)
-                     ws)])
-           (parameterize ((subterms-table
-                           (table-apply-renames-mapping
-                            (subterms-table)
-                            renames-mapping
-                            whole-form-rename?)))
-             (R** f2 v2 p s ws2 . more))))]
-
-    [(R** f v p s ws [#:rename/mark pvar from to] . more)
-     #:declare from (expr/c #'syntaxish?)
-     #:declare to (expr/c #'syntaxish?)
-     #'(let ([real-from (with-syntax1 ([p f]) #'pvar)])
-         (STRICT-CHECKS
-          (check-same-stx 'rename/mark real-from from))
-         (when (marking-table)
-           (add-to-renames-table (marking-table) from to))
-         (R** f v p s ws [#:rename* pvar to #f 'mark] . more))]
-
-    [(R** f v p s ws [#:rename/unmark pvar from to] . more)
-     #:declare from (expr/c #'syntaxish?)
-     #:declare to (expr/c #'syntaxish?)
-     #'(let ([real-from (with-syntax1 ([p f]) #'pvar)])
-         (STRICT-CHECKS
-          (check-same-stx 'rename/mark real-from from))
-         (R** f v p s ws [#:rename* pvar to #f 'unmark] . more))]
-
-    ;; Change syntax with rename (but no step)
-    [(R** f v p s ws [#:rename/no-step pvar from to] . more)
-     #:declare from (expr/c #'syntaxish?)
-     #:declare to (expr/c #'syntaxish?)
-     #'(let ([real-from (with-syntax1 ([p f]) #'pvar)])
-         (STRICT-CHECKS
-          (check-same-stx 'rename/no-step real-from from))
-         (R** f v p s ws [#:rename pvar to] . more))]
-
-    ;; Add to definite binders
-    [(R** f v p s ws [#:binders ids] . more)
-     #:declare ids (expr/c #'(listof identifier))
-     #'(begin (learn-binders (flatten-identifiers (with-syntax1 ([p f]) ids)))
-              (R** f v p s ws . more))]
-
-    ;; Add to definite uses
-    [(R** f v p s ws [#:learn ids] . more)
-     #:declare ids (expr/c #'(listof identifier?))
-     #'(begin (learn-definites (with-syntax1 ([p f]) ids))
-              (R** f v p s ws . more))]
-
-    ;; Conditional (pattern changes lost afterwards ...)
-    [(R** f v p s ws [#:if test [consequent ...] [alternate ...]] . more)
-     #'(let ([continue (RP p . more)])
-         (if (with-syntax1 ([p f]) test)
-             (R** f v p s ws consequent ... => continue)
-             (R** f v p s ws alternate ... => continue)))]
-
-    ;; Conditional (pattern changes lost afterwards ...)
-    [(R** f v p s ws [#:when test consequent ...] . more)
-     #'(let ([continue (RP p . more)])
-         (if (with-syntax1 ([p f]) test)
-             (R** f v p s ws consequent ... => continue)
-             (continue f v s ws)))]
-
-    ;; HIDING DIRECTIVES
-    [(R** f v p s ws [#:hide-check ids] . more)
-     #:declare ids (expr/c #'(listof identifier?))
-     #'(visibility-off (andmap (macro-policy) ids)
-                       v
-                       (lambda () (R** f v p s ws . more)))]
-
-    [(R** f v p s ws [#:seek-check] . more)
-     #'(seek-point f v (lambda (v2) (R** f v2 p s ws . more)))]
-
-    [(R** f v p s ws [#:print-state msg] . more)
-     #'(begin (printf "** ~s\n" msg)
-              (printf "f = ~.s\n" (stx->datum f))
-              (printf "v = ~.s\n" (stx->datum v))
-              (printf "s = ~.s\n" (stx->datum s))
-              (R** f v p s ws . more))]
-
-    ;; ** Multi-pass reductions **
-
-    ;; Pass1 does expansion.
-    ;; If something should happen regardless of whether hiding occurred
-    ;; in pass1 (eg, lifting), put it before the Pass2 marker.
-
-    ;; Use #:unsafe-bind-visible to access 'v'
-    ;; Warning: don't do anything that relies on real 'f' before pass2
-
-    ;; If something should be hidden if any hiding occurred in pass1,
-    ;; put it after the Pass2 marker (eg, splice, block->letrec).
-
-    [(R** f v p s ws [#:pass1] . more)
-     #'(parameterize ((hides-flags
-                       (cons (box (not (visibility))) (hides-flags))))
-         (DEBUG (printf "** pass1\n"))
-         (R** f v p s ws . more))]
-
-    [(R** f v p s ws [#:pass2 clause ...] . more)
-     #'(let* ([previous-pass-hides? (current-pass-hides?)]
-              [k (lambda (f2 v2 s2 ws2)
-                   (parameterize ((hides-flags (cdr (hides-flags))))
-                     (when previous-pass-hides? (current-pass-hides? #t))
-                     (R** f2 v2 p s2 ws2 . more)))])
-         (DEBUG (printf "** pass2\n"))
-         ;; FIXME: maybe refresh subterms table from v?
-         (visibility-off (not previous-pass-hides?)
-                         v
-                         (lambda ()
-                           (when #f (print-viable-subterms v))
-                           (R** f v p s ws clause ... => k))
-                         #t))]
-
-    [(R** f v p s ws [#:with-visible-form clause ...] . more)
-     #'(let ([k (RP p #| [#:set-syntax f] |# . more)])
-         (if (visibility)
-             (R** v v p s ws clause ... => k)
-             (k f v s ws)))]
-
-    [(R** f v p s ws [#:new-local-context clause ...] . more)
-     ;; If vis = #t, then (clause ...) do not affect local config
-     ;; If vis = #f, then proceed normally
-     ;;   *except* must save & restore real term
-     #'(let* ([vis (visibility)]
-              [process-clauses (lambda () (R** #f (if vis #f v) _ #f ws clause ...))])
-         (RSbind (if vis
-                     (with-new-local-context v (process-clauses))
-                     (process-clauses))
-                 (lambda (f2 v2 s2 ws2)
-                   (let ([v2 (if vis v v2)]
-                         [s2 (if vis s s2)])
-                     (R** f v2 p s2 ws2 . more)))))]
-
-    ;; Subterm handling
-    [(R** f v p s ws [reducer hole fill] . more)
-     #:declare reducer (expr/c #'(any/c . -> . RST/c))
-     #'(let ([k (RP p . more)]
-             [reducer-var reducer])
-         (Run reducer-var f v p s ws hole fill k))]))
-
-(define-syntax (Run stx)
-  (syntax-case stx ()
-    ;; Implementation of subterm handling for (hole ...) sequences
-    [(Run reducer f v p s ws (hole :::) fills-e k)
-     (and (identifier? #':::)
-          (free-identifier=? #'::: (quote-syntax ...)))
-     #'(let* ([fctx (CC (hole :::) f p)]
-              [init-e1s (with-syntax1 ([p f]) (syntax->list #'(hole :::)))]
-              [fills fills-e])
-         (DEBUG
-           (printf "Run (multi, vis=~s)\n" (visibility))
-           (printf " f: ~.s\n" (stx->datum f))
-           (printf " v: ~.s\n" (stx->datum v))
-           (printf " p: ~.s\n" 'p)
-           (printf " hole: ~.s\n" '(hole :::))
-           (print-viable-subterms v))
-         (if (visibility)
-             (let ([vctx (CC (hole :::) v p)]
-                   [vsubs (with-syntax1 ([p v]) (syntax->list #'(hole :::)))])
-               (run-multiple/visible reducer init-e1s fctx vsubs vctx fills s ws k))
-             (run-multiple/nonvisible reducer init-e1s fctx v fills s ws k)))]
-    ;; Implementation of subterm handling
-    [(Run reducer f v p s ws hole fill k)
-     #'(let* ([init-e (with-syntax1 ([p f]) #'hole)]
-              [fctx (CC hole f p)])
-         (DEBUG
-           (printf "Run (single, vis=~s)\n" (visibility))
-           (printf " f: ~.s\n" (stx->datum f))
-           (printf " v: ~.s\n" (stx->datum v))
-           (printf " p: ~.s\n" 'p)
-           (printf " hole: ~.s\n" 'hole)
-           (print-viable-subterms v))
-         (if (visibility)
-             (let ([vctx (CC hole v p)]
-                   [vsub (with-syntax1 ([p v]) #'hole)])
-               (run-one reducer init-e fctx vsub vctx fill s ws k))
-             (run-one reducer init-e fctx v values fill s ws k)))]))
-
-;; run-one
-(define (run-one reducer init-e fctx vsub vctx fill s ws k)
-  (DEBUG
-    (printf "run-one\n")
-    (printf "  fctx: ~.s\n" (stx->datum (fctx #'HOLE)))
-    (printf "  vctx: ~.s\n" (stx->datum (vctx #'HOLE))))
-  (RSbind (with-context vctx
-            ((reducer fill) init-e vsub s ws))
-          (lambda (f2 v2 s2 ws2) (k (fctx f2) (vctx v2) s2 ws2))))
-
-;; run-multiple/visible
-(define (run-multiple/visible reducer init-e1s fctx vsubs vctx fills s ws k)
-  (DEBUG
-    (printf "run-multiple/visible\n")
-    (printf "  fctx: ~.s\n" (stx->datum (fctx (for/list ([dummy init-e1s]) #'HOLE))))
-    (printf "  vctx: ~.s\n" (stx->datum (vctx (for/list ([dummy init-e1s]) #'HOLE))))
-    (unless (= (length fills) (length init-e1s))
-      (printf "  fills(~s): ~.s\n" (length fills) fills)
-      (printf "  init-e1s: ~.s\n" (stx->datum init-e1s))
-      (printf "  vsubs: ~.s\n" (stx->datum vsubs))))
-  (let loop ([fills fills] [prefix null] [vprefix null] [suffix init-e1s] [vsuffix vsubs] [s s] [ws ws])
-    (cond
-     [(pair? fills)
-      (RSbind (with-context (lambda (x) (vctx (revappend vprefix (cons x (cdr vsuffix)))))
-                ((reducer (car fills)) (car suffix) (car vsuffix) s ws))
-              (lambda (f2 v2 s2 ws2)
-                (loop (cdr fills)
-                      (cons f2 prefix)
-                      (cons v2 vprefix)
-                      (cdr suffix)
-                      (cdr vsuffix)
-                      s2
-                      ws2)))]
-     [(null? fills)
-      (k (fctx (reverse prefix)) (vctx (reverse vprefix)) s ws)])))
-
-;; run-multiple/nonvisible
-(define (run-multiple/nonvisible reducer init-e1s fctx v fills s ws k)
-  (DEBUG
-    (printf "run-multiple/nonvisible\n")
-    (printf "  fctx: ~.s\n" (stx->datum (fctx (for/list ([dummy init-e1s]) #'HOLE)))))
-  (let loop ([fills fills] [prefix null] [suffix init-e1s] [v v] [s s] [ws ws])
-    (DEBUG
-      (printf "  v: ~.s\n" (stx->datum (datum->syntax #f v))))
-    (cond
-     [(pair? fills)
-      (RSbind ((reducer (car fills)) (car suffix) v s ws)
-              (lambda (f2 v2 s2 ws2)
-                (loop (cdr fills)
-                      (cons f2 prefix)
-                      (cdr suffix)
-                      v2
-                      s2
-                      ws2)))]
-     [(null? fills)
-      (k (fctx (reverse prefix)) v s ws)])))
-
-;; ------------------------------------
-
-;; CC
-;; the context constructor
-(define-syntax (CC stx)
-  (syntax-case stx ()
-    [(CC HOLE expr pattern)
-     #'(syntax-copier HOLE expr pattern)]))
-
-(define (revappend a b)
-  (cond [(pair? a) (revappend (cdr a) (cons (car a) b))]
-        [(null? a) b]))
-
-
-;; visibility-off : boolean stx stx (-> a) -> a
-(define (visibility-off new-visible? stx k [reset-subterms? #f])
-  (cond [(and (not new-visible?) (or (visibility) reset-subterms?))
-         (begin
-           (DEBUG
-            (printf "hide => seek: ~.s\n" (stx->datum stx)))
-           (current-pass-hides? #t)
-           (let* ([subterms (gather-proper-subterms stx)]
-                  [marking (marking-table)]
-                  [subterms
-                   (if marking
-                       (table-apply-renames-mapping
-                        subterms
-                        (table->renames-mapping marking)
-                        #f)
-                       subterms)])
-             (parameterize ((visibility #f)
-                            (subterms-table subterms)
-                            (marking-table (or marking (make-hasheq))))
-               (k))))]
-        [else (k)]))
-
-;; Seek
-
-(provide/contract
- [seek-point (syntaxish? syntaxish? (syntaxish? . -> . RS/c) . -> . RS/c)])
-
-;; seek-point : stx (-> RS/c) -> RS/c
-(define (seek-point stx vstx k)
-  (if (visibility)
-      (k vstx)
-      (begin
-        (DEBUG (printf "Seek point\n")
-               (print-viable-subterms stx))
-        (let ([paths (table-get (subterms-table) stx)])
-          (cond [(null? paths)
-                 (DEBUG (printf "seek-point: failed on ~.s\n" (stx->datum stx)))
-                 (k vstx)]
-                [(null? (cdr paths))
-                 (let ([path (car paths)])
-                   (DEBUG (printf "seek => hide: ~.s\n" (stx->datum stx)))
-                   (let ([ctx (lambda (x) (path-replace vstx path x))])
-                     (RScase (parameterize ((visibility #t)
-                                            (subterms-table #f)
-                                            (marking-table #f))
-                               ;; Found stx within vstx
-                               (with-context ctx (k stx)))
-                             (lambda (ws2 stx2 vstx2 s2)
-                               (let ([vstx2 (ctx vstx2)])
-                                 (RSunit ws2 stx2 vstx2 s2)))
-                             (lambda (ws exn)
-                               (RSfail ws exn)))))]
-                [else
-                 (raise (make nonlinearity stx paths))])))))
-
-(provide print-viable-subterms)
-(define (print-viable-subterms stx)
-  (DEBUG
-    (let ([t (subterms-table)])
-      (when t
-        (printf "viable subterms:\n")
-        (let loop ([stx stx])
-          (cond [(syntax? stx)
-                 (let ([paths (table-get t stx)])
-                   (if (pair? paths)
-                       (printf "  ~s\n" (stx->datum stx))
-                       (loop (syntax-e stx))))]
-                [(pair? stx)
-                 (loop (car stx))
-                 (loop (cdr stx))]))))))
-
-(define (check-same-stx function actual expected [derivs null])
-  (unless (eq? actual expected)
-    (let* ([actual-datum (stx->datum actual)]
-           [expected-datum (stx->datum expected)]
-           [same-form? (equal? actual-datum expected-datum)])
-      (if same-form?
-          (eprintf "same form but wrong wrappings:\n~.s\nwrongness:\n~.s\n"
-                   actual-datum
-                   (wrongness actual expected))
-          (eprintf "got:\n~.s\n\nexpected:\n~.s\n"
-                   actual-datum
-                   expected-datum))
-      (for ([d derivs]) (eprintf "\n~.s\n" d))
-      (error function
-             (if same-form?
-                 "wrong starting point (wraps)!"
-                 "wrong starting point (form)!")))))
-
-(define (wrongness a b)
-  (cond [(eq? a b)
-         '---]
-        [(stx-list? a)
-         (map wrongness (stx->list a) (stx->list b))]
-        [(stx-pair? a)
-         (cons (wrongness (stx-car a) (stx-car b))
-               (wrongness (stx-cdr a) (stx-cdr b)))]
-        [else (stx->datum a)]))
-
-
-;; flatten-identifiers : syntaxlike -> (list-of identifier)
-(define (flatten-identifiers stx)
-  (syntax-case stx ()
-    [id (identifier? #'id) (list #'id)]
-    [() null]
-    [(x . y) (append (flatten-identifiers #'x) (flatten-identifiers #'y))]
-    [else (error 'flatten-identifiers "neither syntax list nor identifier: ~s"
-                 (if (syntax? stx)
-                     (syntax->datum stx)
-                     stx))]))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions.rkt
deleted file mode 100644
index 72955570c0..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions.rkt
+++ /dev/null
@@ -1,813 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/match
-         racket/format
-         syntax/stx
-         "../util/eomap.rkt"
-         "deriv-util.rkt"
-         "deriv.rkt"
-         "reductions-engine.rkt")
-
-(provide reductions
-         reductions+)
-
-;; Reductions
-
-;; reductions : WDeriv -> ReductionSequence
-(define (reductions d)
-  (let-values ([(steps binders definites estx exn) (reductions+ d)])
-    steps))
-
-;; Binders = hasheq[identifier => phase-level]
-;; Definites = eomap[identifier => phase-level]
-
-;; reductions+ : WDeriv -> (list-of step) Binders Definites ?stx ?exn
-(define (reductions+ d)
-  (parameterize ((current-definites (empty-eomap))
-                 (current-binders #hasheq())
-                 (current-frontier null)
-                 (hides-flags (list (box #f)))
-                 (sequence-number 0))
-    (RScase ((Expr d) (wderiv-e1 d) (wderiv-e1 d) #f null)
-            (lambda (steps stx vstx s)
-              (values (reverse steps) (current-binders) (current-definites) vstx #f))
-            (lambda (steps exn)
-              (values (reverse steps) (current-binders) (current-definites) #f exn)))))
-
-;; Syntax
-
-(define-syntax-rule (match/count x clause ...)
-  (begin (sequence-number (add1 (sequence-number)))
-         (let ([v x])
-           (match v
-             clause ...
-             [_ (error 'match "failed to match ~e at line ~s" v (line-of x))]))))
-
-(define-syntax (line-of stx)
-  (syntax-case stx ()
-    [(line-of x) #`(quote #,(syntax-line #'x))]))
-
-;; Derivations => Steps
-
-;; Expr : Deriv -> RST
-(define (Expr d)
-  (match/count d
-    [(Wrap deriv (e1 e2))
-     (R [#:pattern ?form]
-        [#:let transparent-stx (hash-ref opaque-table (syntax-e #'?form) #f)]
-        [#:when transparent-stx
-                [#:set-syntax transparent-stx]]
-        [#:expect-syntax e1 (list d)]
-        [#:when (base? d)
-                [#:learn (or (base-resolves d) null)]]
-        [#:seek-check]
-        [Expr* ?form d]
-        [#:when (not (current-pass-hides?))
-                [#:set-syntax e2]])]
-    [#f
-     (R [#:seek-check]
-        => (Expr* d))]))
-
-(define (Expr* d)
-  (match d
-    ;; Primitives
-    [(Wrap p:variable (e1 e2 rs ?1))
-     (R [#:learn (list e2)]
-        [#:when (or (not (identifier? e1))
-                    (not (bound-identifier=? e1 e2)))
-                [#:walk e2 'resolve-variable]])]
-    [(Wrap p:module (e1 e2 rs ?1 prep tag rename check tag2 ?3 body shift))
-     (R [#:hide-check rs]
-        [! ?1]
-        [#:pattern ?form]
-        [PrepareEnv ?form prep]
-        [#:pattern (?module ?name ?language . ?body-parts)]
-        [#:when tag
-                [#:in-hole ?body-parts
-                           [#:walk (list tag) 'tag-module-begin]]]
-        [#:pattern (?module ?name ?language ?body)]
-        [#:rename ?body rename]
-        [#:pass1]
-        [#:when check
-                [Expr ?body check]]
-        [#:when tag2
-                [#:in-hole ?body
-                           [#:walk tag2 'tag-module-begin]]]
-        [#:pass2]
-        [! ?3]
-        [Expr ?body body]
-        [#:pattern ?form]
-        [#:rename ?form shift])]
-    [(Wrap p:#%module-begin (e1 e2 rs ?1 me body ?2 subs))
-     (R [! ?1]
-        [#:pattern ?form]
-        [#:rename ?form me]
-        [#:pattern (?module-begin . ?forms)]
-        [ModuleBegin/Phase ?forms body]
-        [! ?2]
-        [Submodules ?forms subs])]
-    [(Wrap p:define-syntaxes (e1 e2 rs ?1 prep rhs locals))
-     (R [! ?1]
-        [#:pattern ?form]
-        [PrepareEnv ?form prep]
-        [#:pattern (?define-syntaxes ?vars ?rhs)]
-        [#:binders #'?vars]
-        [Expr/PhaseUp ?rhs rhs]
-        [LocalActions ?rhs locals])]
-    [(Wrap p:define-values (e1 e2 rs ?1 rhs))
-     (R [! ?1]
-        [#:pattern (?define-values ?vars ?rhs)]
-        [#:binders #'?vars]
-        [#:when rhs
-                [Expr ?rhs rhs]])]
-    [(Wrap p:#%expression (e1 e2 rs ?1 inner #f))
-     (R [! ?1]
-        [#:pattern (?expr-kw ?inner)]
-        [Expr ?inner inner])]
-    [(Wrap p:#%expression (e1 e2 rs ?1 inner untag))
-     (R [! ?1]
-        [#:pattern (?expr-kw ?inner)]
-        [#:pass1]
-        [Expr ?inner inner]
-        [#:pattern ?form]
-        [#:let oldform #'?form]
-        [#:with-visible-form
-         [#:left-foot]
-         [#:set-syntax (stx-car (stx-cdr #'?form))]
-         [#:step 'macro]] ;; FIXME: 'untag-expr
-        [#:pass2]
-        [#:set-syntax (stx-car (stx-cdr oldform))]
-        [#:rename ?form untag])]
-    [(Wrap p:if (e1 e2 rs ?1 test then else))
-     (R [! ?1]
-        [#:pattern (?if TEST THEN ELSE)]
-        [Expr TEST test]
-        [Expr THEN then]
-        [Expr ELSE else])]
-    [(Wrap p:wcm (e1 e2 rs ?1 key mark body))
-     (R [! ?1]
-        [#:pattern (?wcm KEY MARK BODY)]
-        [Expr KEY key]
-        [Expr MARK mark]
-        [Expr BODY body])]
-    [(Wrap p:begin (e1 e2 rs ?1 lderiv))
-     (R [! ?1]
-        [#:pattern (?begin . ?lderiv)]
-        [List ?lderiv lderiv])]
-    [(Wrap p:begin0 (e1 e2 rs ?1 first lderiv))
-     (R [! ?1]
-        [#:pattern (?begin0 FIRST . LDERIV)]
-        [Expr FIRST first]
-        [List LDERIV lderiv])]
-    [(Wrap p:#%app (e1 e2 rs ?1 lderiv))
-     (R [! ?1]
-        [#:pattern (?app . LDERIV)]
-        [#:if lderiv
-              ([List LDERIV lderiv])
-              ([#:walk e2 'macro])])]
-    [(Wrap p:lambda (e1 e2 rs ?1 renames body))
-     (R [! ?1]
-        [#:pattern (?lambda ?formals . ?body)]
-        [#:rename (?formals . ?body) renames 'rename-lambda]
-        [#:binders #'?formals]
-        [Block ?body body])]
-    [(Wrap p:case-lambda (e1 e2 rs ?1 clauses))
-     (R [! ?1]
-        [#:pattern (?case-lambda . ?clauses)]
-        [CaseLambdaClauses ?clauses clauses])]
-    [(Wrap p:let-values (e1 e2 rs ?1 renames rhss body))
-     (R [! ?1]
-        [#:pattern (?let-values ([?vars ?rhs] ...) . ?body)]
-        [#:rename (((?vars ?rhs) ...) . ?body) renames 'rename-let-values]
-        [#:binders #'(?vars ...)]
-        [Expr (?rhs ...) rhss]
-        [Block ?body body])]
-    [(Wrap p:letrec-values (e1 e2 rs ?1 renames rhss body))
-     (R [! ?1]
-        [#:pattern (?letrec-values ([?vars ?rhs] ...) . ?body)]
-        [#:rename (((?vars ?rhs) ...) . ?body) renames 'rename-letrec-values]
-        [#:binders #'(?vars ...)]
-        [Expr (?rhs ...) rhss]
-        [Block ?body body])]
-    [(Wrap p:letrec-syntaxes+values
-           (e1 e2 rs ?1 srenames prep srhss vrenames vrhss body tag))
-     (R [! ?1]
-        [#:pattern ?form]
-        [PrepareEnv ?form prep]
-        [#:pass1]
-        [#:pattern (?lsv ([?svars ?srhs] ...) ([?vvars ?vrhs] ...) . ?body)]
-        [#:rename (((?svars ?srhs) ...) ((?vvars ?vrhs) ...) . ?body)
-                   srenames
-                   'rename-lsv]
-        [#:binders #'(?svars ... ?vvars ...)]
-        [#:when (pair? srhss) ;; otherwise, we're coming from a block expansion
-                [BindSyntaxes (?srhs ...) srhss]]
-        ;; If vrenames is #f, no var bindings to rename
-        [#:when vrenames
-                [#:rename (((?vvars ?vrhs) ...) . ?body) vrenames 'rename-lsv]
-                [#:binders #'(?vvars ...)]]
-        [Expr (?vrhs ...) vrhss]
-        [Block ?body body]
-        [#:pass2]
-        [#:pattern ?form]
-        [#:when tag
-                [#:walk tag 'lsv-remove-syntax]])]
-    [(Wrap p:#%datum (e1 e2 rs ?1))
-     (R [! ?1]
-        [#:hide-check rs]
-        [#:walk e2 'macro])]
-    [(Wrap p:#%top (e1 e2 rs ?1))
-     (R [! ?1]
-        [#:pattern ?form]
-        [#:learn
-         (syntax-case #'?form ()
-           [(?top . ?var) (identifier? #'?var) (list #'?var)]
-           [?var (identifier? #'?var) (list #'?var)]
-           [_ (error 'macro-debugger "#%top has wrong form: ~s\n" #'?form)])])]
-
-    [(Wrap p:provide (e1 e2 rs ?1 inners ?2))
-     (let ([wrapped-inners (map expr->local-action inners)])
-       (R [! ?1]
-          [#:pattern ?form]
-          [#:pass1]
-          [#:left-foot]
-          [LocalActions ?form wrapped-inners]
-          [! ?2]
-          [#:pass2]
-          [#:set-syntax e2]
-          [#:step 'provide]
-          [#:set-syntax e2]))]
-
-    [(Wrap p:require (e1 e2 rs ?1 locals))
-     (R [! ?1]
-        [#:pattern ?form]
-        [LocalActions ?form locals])]
-
-    [(Wrap p:#%stratified-body (e1 e2 rs ?1 bderiv))
-     (R [! ?1]
-        [#:pass1]
-        [#:pattern (?sb . ?body)]
-        [Block ?body bderiv]
-        [#:pass2]
-        [#:hide-check rs]
-        [#:pattern ?form]
-        [#:walk e2 'macro])]
-
-    [(Wrap p:submodule* (e1 e2 rs ?1))
-     (R [! ?1])]
-    [(Wrap p:submodule (e1 e2 rs ?1 exp))
-     (R [! ?1]
-        [#:pattern ?form]
-        [Expr ?form exp])]
-
-    [(Wrap p:stop (e1 e2 rs ?1))
-     (R [! ?1])]
-
-    ;; The rest of the automatic primitives
-    [(Wrap p::STOP (e1 e2 rs ?1))
-     (R [! ?1])]
-
-    [(Wrap p:set!-macro (e1 e2 rs ?1 deriv))
-     (R [! ?1]
-        [#:pattern ?form]
-        [Expr ?form deriv])]
-    [(Wrap p:set! (e1 e2 rs ?1 id-rs ?2 rhs))
-     (R [! ?1]
-        [#:pattern (?set! ?var ?rhs)]
-        [#:learn id-rs]
-        [! ?2]
-        [Expr ?rhs rhs])]
-
-    [(Wrap p:begin-for-syntax (e1 e2 rs ?1 prep body locals))
-     (R [! ?1]
-        [#:pattern ?form]
-        [PrepareEnv ?form prep]
-        [#:pattern (?bfs . ?forms)]
-        [#:parameterize ((phase (add1 (phase))))
-          [#:if (module-begin/phase? body)
-                [[ModuleBegin/Phase ?forms body]]
-                [[BeginForSyntax ?forms body]]]]
-        [LocalActions ?forms locals])]
-
-    ;; Macros
-    [(Wrap mrule (e1 e2 rs ?1 me1 locals me2 ?2 etx next))
-     (R [! ?1]
-        [#:pattern ?form]
-        [#:hide-check rs]
-        [#:learn rs]
-        [#:pass1]
-        [#:left-foot]
-        [#:rename/mark ?form e1 me1] ;; MARK
-        [LocalActions ?form locals]
-        [! ?2]
-        [#:pass2]
-        [#:set-syntax me2]
-        [#:rename/unmark ?form me2 etx] ;; UNMARK
-        [#:step 'macro]
-        [#:set-syntax etx]
-        [Expr ?form next])]
-
-    [(Wrap tagrule (e1 e2 tagged-stx next))
-     (R [#:pattern ?form]
-        [#:hide-check (list (stx-car tagged-stx))]
-        [#:walk tagged-stx
-                (case (syntax-e (stx-car tagged-stx))
-                  ((#%app) 'tag-app)
-                  ((#%datum) 'tag-datum)
-                  ((#%top) 'tag-top)
-                  (else
-                   (error 'reductions "unknown tagged syntax: ~s" tagged-stx)))]
-        [Expr ?form next])]
-
-    ;; expand/compile-time-evals
-
-    [(Wrap ecte (e1 e2 locals first second locals2))
-     (R [#:pattern ?form]
-        [#:pass1]
-        [LocalActions ?form locals]
-        [Expr ?form first]
-        [#:pass2]
-        [Expr ?form second]
-        [LocalActions ?form locals2])]
-
-    ;; Lifts
-
-    [(Wrap lift-deriv (e1 e2 first lifted-stx second))
-     (R [#:pattern ?form]
-        ;; lifted-stx has form (begin lift-n ... lift-1 orig-expr)
-        [#:let avail (cdr (reverse (stx->list (stx-cdr lifted-stx))))]
-        [#:parameterize ((available-lift-stxs avail)
-                         (visible-lift-stxs null))
-          [#:pass1]
-          [Expr ?form first]
-          [#:do (when (pair? (available-lift-stxs))
-                  (lift-error 'lift-deriv "available lifts left over"))]
-          [#:with-visible-form
-           ;; If no lifts visible, then don't show begin-wrapping
-           [#:when (pair? (visible-lift-stxs))
-                   [#:walk (reform-begin-lifts lifted-stx
-                                               (visible-lift-stxs)
-                                               #'?form)
-                           'capture-lifts]]]
-          [#:pass2]
-          [#:set-syntax lifted-stx]
-          [Expr ?form second]])]
-
-    [(Wrap lift/let-deriv (e1 e2 first lifted-stx second))
-     (R [#:pattern ?form]
-        ;; lifted-stx has form
-        ;; (let-values ((last-v last-lifted))
-        ;;   ...
-        ;;     (let-values ((first-v first-lifted)) orig-expr))
-        [#:let avail lifted-stx]
-        [#:parameterize ((available-lift-stxs avail)
-                         (visible-lift-stxs null))
-          [#:pass1]
-          [Expr ?form first]
-          [#:let visible-lifts (visible-lift-stxs)]
-          [#:with-visible-form
-           [#:left-foot]
-           [#:set-syntax (reform-let-lifts lifted-stx visible-lifts #'?form)]
-           [#:step 'capture-lifts]]
-          [#:pass2]
-          [#:set-syntax lifted-stx]
-          [Expr ?form second]])]
-
-    ;; Skipped
-    [#f
-     (R)]))
-
-;; Expr/PhaseUp : Deriv -> RST
-(define (Expr/PhaseUp d)
-  (R [#:parameterize ((phase (add1 (phase))))
-     => (Expr* d)]))
-
-;; case-lambda-clauses-reductions : 
-;;   (list-of (W (list ?exn rename (W BDeriv)))) stxs -> RST
-(define (CaseLambdaClauses clauses)
-  (match/count clauses
-    ['()
-     (R)]
-    [(cons (Wrap clc (?1 rename body)) rest)
-     (R [! ?1]
-        [#:pattern ((?formals . ?body) . ?rest)]
-        [#:rename (?formals . ?body) rename 'rename-case-lambda]
-        [#:binders #'?formals]
-        [Block ?body body]
-        [CaseLambdaClauses ?rest rest])]))
-
-(define (PrepareEnv prep)
-  (LocalActions prep))
-
-;; local-actions-reductions
-(define (LocalActions locals)
-  (match locals
-    ['()
-     (R)]
-    [(cons local rest)
-     (R [#:pattern ?form]
-        [#:parameterize ((macro-policy
-                          ;; If macro with local-expand is transparent,
-                          ;; then all local-expansions must be transparent.
-                          (if (visibility) (lambda _ #t) (macro-policy))))
-          [#:new-local-context
-           [#:pattern ?form]
-           [LocalAction ?form local]]]
-        [LocalActions ?form rest])]))
-
-(define (LocalAction local)
-  (match/count local
-    [(struct local-exn (exn))
-     (R [! exn])]
-
-    [(struct local-expansion (e1 e2 for-stx? me1 inner #f me2 opaque))
-     (R [#:parameterize ((phase (if for-stx? (add1 (phase)) (phase))))
-         [#:set-syntax e1]
-         [#:pattern ?form]
-         [#:rename/mark ?form e1 me1]
-         [Expr ?form inner]
-         [#:rename/mark ?form me2 e2]
-         [#:do (when opaque
-                 (hash-set! opaque-table (syntax-e opaque) e2))]])]
-
-    [(struct local-expansion (e1 e2 for-stx? me1 inner lifted me2 opaque))
-     (R [#:let avail
-               (if for-stx?
-                   lifted
-                   (cdr (reverse (stx->list (stx-cdr lifted)))))]
-        [#:let recombine
-               (lambda (lifts form)
-                 (if for-stx?
-                     (reform-let-lifts lifted lifts form)
-                     (reform-begin-lifts lifted lifts form)))]
-        [#:parameterize ((phase (if for-stx? (add1 (phase)) (phase)))
-                         (available-lift-stxs avail)
-                         (visible-lift-stxs null))
-         [#:set-syntax e1]
-         [#:pattern ?form]
-         [#:rename/unmark ?form e1 me1]
-         [#:pass1]
-         [Expr ?form inner]
-         [#:let visible-lifts (visible-lift-stxs)]
-         [#:with-visible-form
-          [#:left-foot]
-          [#:set-syntax (recombine visible-lifts #'?form)]
-          [#:step 'splice-lifts visible-lifts]]
-         [#:pass2]
-         [#:set-syntax lifted]
-         [#:rename/mark ?form me2 e2]
-         [#:do (when opaque
-                 (hash-set! opaque-table (syntax-e opaque) e2))]])]
-
-    [(struct local-lift (expr ids))
-     ;; FIXME: add action
-     (R [#:do (take-lift!)]
-        [#:binders ids]
-        [#:reductions
-         (list
-          (walk/talk 'local-lift
-                     (list "The macro lifted an expression"
-                           ""
-                           "Expression:"
-                           expr
-                           "Identifiers:"
-                           (datum->syntax #f ids))))])]
-
-    [(struct local-lift-end (decl))
-     ;; (walk/mono decl 'module-lift)
-     (R)]
-    [(struct local-lift-require (req expr mexpr))
-     ;; lift require
-     (R [#:set-syntax expr]
-        [#:pattern ?form]
-        [#:rename/mark ?form expr mexpr])]
-    [(struct local-lift-provide (prov))
-     ;; lift provide
-     (R)]
-    [(struct local-bind (names ?1 renames bindrhs))
-     [R [! ?1]
-        ;; FIXME: use renames
-        [#:binders names]
-        [#:when bindrhs => (BindSyntaxes bindrhs)]]]
-    [(struct track-origin (before after))
-     (R)
-     #|
-     ;; Do nothing for now... need to account for marks also.
-     [R [#:set-syntax before]
-        [#:pattern ?form]
-        [#:rename ?form after 'track-origin]]
-     |#]
-    [(struct local-value (name ?1 resolves bound? binding))
-     [R [! ?1]
-        ;; FIXME: notify if binding != current (identifier-binding name)???
-        ;; [#:learn (list name)]
-        ;; Add remark step?
-        ]]
-    [(struct local-remark (contents))
-     (R [#:reductions (list (walk/talk 'remark contents))])]
-    [(struct local-mess (events))
-     ;; FIXME: While it is not generally possible to parse tokens as one or more
-     ;; interrupted derivations (possibly interleaved with successful derivs),
-     ;; it should be possible to recover *some* information and display it.
-     (R [#:reductions
-         (let ([texts
-                (list (~a "Some expansion history has been lost due to a jump "
-                          "within expansion.")
-                      (~a "For example, a macro may have caught an "
-                          "exception coming from within a call to `local-expand'."))])
-           (list (walk/talk 'remark texts)))])]
-    [#f
-     (R)]))
-
-(define (Submodules subs)
-  (match subs
-    ['()
-     (R)]
-    [(cons sub rest)
-     (R [#:pattern ?form]
-        [#:new-local-context
-         [#:pattern ?form]
-         [#:set-syntax (wderiv-e1 sub)]
-         [Expr ?form sub]]
-        [Submodules ?form rest])]))
-
-;; List : ListDerivation -> RST
-(define (List ld)
-  (match ld
-    [(Wrap lderiv (es1 es2 ?1 derivs))
-     (R [! ?1]
-        [#:pattern (?form ...)]
-        [Expr (?form ...) derivs])]
-    [#f
-     (R)]))
-
-;; Block  : BlockDerivation -> RST
-(define (Block bd)
-  (match/count bd
-    [(Wrap bderiv (es1 es2 pass1 trans pass2))
-     (R [#:pattern ?block]
-        [#:pass1]
-        [BlockPass ?block pass1]
-        [#:pass2]
-        [#:if (eq? trans 'letrec)
-              (;; FIXME: foci (difficult because of renaming?)
-               [#:walk (list (wderiv-e1 pass2)) 'block->letrec]
-               [#:pattern (?expr)]
-               [Expr ?expr pass2])
-              ([#:rename ?block (wlderiv-es1 pass2)]
-               [#:set-syntax (wlderiv-es1 pass2)]
-               [List ?block pass2])])]
-    [#f
-     (R)]))
-
-;; BlockPass : (list-of BRule) -> RST
-(define (BlockPass brules)
-  (match/count brules
-    ['()
-     (R)]
-    [(cons (Wrap b:error (exn)) rest)
-     (R [! exn])]
-    [(cons (Wrap b:splice (renames head ?1 tail ?2)) rest)
-     (R [#:pattern (?first . ?rest)]
-        [#:rename/no-step ?first (car renames) (cdr renames)]
-        [#:pass1]
-        [Expr ?first head]
-        [! ?1]
-        [#:pass2]
-        [#:let begin-form #'?first]
-        [#:let rest-forms #'?rest]
-        [#:pattern ?forms]
-        [#:left-foot (list begin-form)]
-        [#:set-syntax (append (stx->list (stx-cdr begin-form)) rest-forms)]
-        [#:step 'splice-block (stx->list (stx-cdr begin-form))]
-        [#:rename ?forms tail]
-        [! ?2]
-        [#:pattern ?forms]
-        [BlockPass ?forms rest])]
-
-    ;; FIXME: are these pass1/2 necessary?
-
-    [(cons (Wrap b:defvals (renames head ?1 rename ?2)) rest)
-     (R [#:pattern (?first . ?rest)]
-        [#:rename/no-step ?first (car renames) (cdr renames)]
-        [#:pass1]
-        [Expr ?first head]
-        [! ?1]
-        [#:pattern ((?define-values ?vars . ?body) . ?rest)]
-        [#:rename (?vars . ?body) rename]
-        [#:binders #'?vars]
-        [! ?2]
-        [#:pass2]
-        [#:pattern (?first . ?rest)]
-        [BlockPass ?rest rest])]
-    [(cons (Wrap b:defstx (renames head ?1 rename ?2 prep bindrhs)) rest)
-     (R [#:pattern (?first . ?rest)]
-        [#:rename/no-step ?first (car renames) (cdr renames)]
-        [#:pass1]
-        [Expr ?first head]
-        [! ?1]
-        [#:pattern ((?define-syntaxes ?vars . ?body) . ?rest)]
-        [#:rename (?vars . ?body) rename]
-        [#:binders #'?vars]
-        [! ?2]
-        [#:pass2]
-        [#:pattern ?form]
-        [PrepareEnv ?form prep]
-        [#:pattern ((?define-syntaxes ?vars ?rhs) . ?rest)]
-        [BindSyntaxes ?rhs bindrhs]
-        [#:pattern (?first . ?rest)]
-        [BlockPass ?rest rest])]
-    [(cons (Wrap b:expr (renames head)) rest)
-     (R [#:pattern (?first . ?rest)]
-        [#:rename/no-step ?first (car renames) (cdr renames)]
-        [Expr ?first head]
-        [BlockPass ?rest rest])]
-    ))
-
-;; BindSyntaxes : BindSyntaxes -> RST
-(define (BindSyntaxes bindrhs)
-  (match bindrhs
-    [(Wrap bind-syntaxes (rhs locals))
-     (R [#:set-syntax (node-z1 rhs)] ;; set syntax; could be in local-bind
-        [#:pattern ?form]
-        [Expr/PhaseUp ?form rhs]
-        [LocalActions ?form locals])]))
-
-(define (BeginForSyntax passes)
-  ;; Note: an lderiv doesn't necessarily cover all stxs, due to lifting.
-  (match/count passes
-    [(cons (? lderiv? lderiv) '())
-     (R [#:pattern ?forms]
-        [List ?forms lderiv])]
-    [(cons (Wrap bfs:lift (lderiv stxs)) rest)
-     (R [#:pattern LDERIV]
-        [#:parameterize ((available-lift-stxs (reverse stxs))
-                         (visible-lift-stxs null))
-          [#:pass1]
-          [List LDERIV lderiv]
-          [#:do (when (pair? (available-lift-stxs))
-                  (lift-error 'bfs:lift "available lifts left over"))]
-          [#:let visible-lifts (visible-lift-stxs)]
-          [#:pattern ?forms]
-          [#:pass2]
-          [#:let old-forms #'?forms]
-          [#:left-foot null]
-          [#:set-syntax (append visible-lifts old-forms)]
-          [#:step 'splice-lifts visible-lifts]
-          [#:set-syntax (append stxs old-forms)]
-          [BeginForSyntax ?forms rest]])]))
-
-(define (ModuleBegin/Phase body)
-  (match/count body
-    [(Wrap module-begin/phase (pass1 pass2 pass3))
-     (R [#:pass1]
-        [#:pattern ?forms]
-        [ModulePass ?forms pass1]
-        [#:pass2]
-        [#:do (DEBUG (printf "** module begin pass 2\n"))]
-        [ModulePass ?forms pass2]
-        ;; ignore pass3 for now: only provides
-        [#:new-local-context
-         [#:pattern ?form]
-         [LocalActions ?form (map expr->local-action (or pass3 null))]])]))
-
-;; ModulePass : (list-of MBRule) -> RST
-(define (ModulePass mbrules)
-  (match/count mbrules
-    ['()
-     (R)]
-    [(cons (Wrap mod:prim (head rename prim)) rest)
-     (R [#:pattern (?firstP . ?rest)]
-        [Expr ?firstP head]
-        [#:do (DEBUG (printf "** after head\n"))]
-        [#:rename ?firstP rename]
-        [#:do (DEBUG (printf "** after rename\n"))]
-        [#:when prim
-                [Expr ?firstP prim]]
-        [#:do (DEBUG (printf "** after prim\n"))]
-        [ModulePass ?rest rest])]
-    [(cons (Wrap mod:splice (head rename ?1 tail)) rest)
-     (R [#:pattern (?firstB . ?rest)]
-        [#:pass1]
-        [Expr ?firstB head]
-        [#:pass2]
-        [#:rename ?firstB rename]
-        [! ?1]
-        [#:let begin-form #'?firstB]
-        [#:let rest-forms #'?rest]
-        [#:left-foot (list #'?firstB)]
-        [#:pattern ?forms]
-        [#:set-syntax (append (stx->list (stx-cdr begin-form)) rest-forms)]
-        [#:step 'splice-module (stx->list (stx-cdr begin-form))]
-        [#:rename ?forms tail]
-        [ModulePass ?forms rest])]
-    [(cons (Wrap mod:lift (head locals renames stxs)) rest)
-     (R [#:pattern (?firstL . ?rest)]
-        ;; renames has form (head-e2 . ?rest)
-        ;; stxs has form (lifted ...),
-        ;;   specifically (last-lifted ... first-lifted)
-        [#:parameterize ((available-lift-stxs (reverse stxs))
-                         (visible-lift-stxs null))
-          [#:pass1]
-          [Expr ?firstL head]
-          [LocalActions ?firstL locals]
-          [#:do (when (pair? (available-lift-stxs))
-                  (lift-error 'mod:lift "available lifts left over"))]
-          [#:let visible-lifts (visible-lift-stxs)]
-          [#:pattern ?forms]
-          [#:pass2]
-          [#:when renames
-                  [#:rename ?forms renames]]
-          [#:let old-forms #'?forms]
-          [#:left-foot null]
-          [#:set-syntax (append visible-lifts old-forms)]
-          [#:step 'splice-lifts visible-lifts]
-          [#:set-syntax (append stxs old-forms)]
-          [ModulePass ?forms rest]])]
-    [(cons (Wrap mod:lift-end (stxs)) rest)
-     ;; In pass2, stxs contains a mixture of terms and kind-tagged terms (pairs)
-     (let ([stxs (map (lambda (e) (if (pair? e) (car e) e)) stxs)])
-       (R [#:pattern ?forms]
-          [#:when (pair? stxs)
-                  [#:left-foot null]
-                  [#:set-syntax (append stxs #'?forms)]
-                  [#:step 'splice-module-lifts stxs]]
-          [ModulePass ?forms rest]))]
-    [(cons (Wrap mod:skip ()) rest)
-     (R [#:pattern (?firstS . ?rest)]
-        [ModulePass ?rest rest])]
-    [(cons (Wrap mod:cons (head locals)) rest)
-     (R [#:pattern (?firstC . ?rest)]
-        [Expr ?firstC head]
-        [LocalActions ?firstC locals]
-        [ModulePass ?rest rest])]))
-
-;; Lifts
-
-(define (take-lift!)
-  (define avail (available-lift-stxs))
-  (cond [(list? avail)
-         #|
-         ;; This check is wrong! (and thus disabled)
-         ;; If a syntax error occurs between the time a lift is "thrown"
-         ;; and when it is "caught", no lifts will be available to take.
-         ;; But that's not a bug, so don't complain.
-         (unless (pair? avail)
-           (lift-error 'local-lift "out of lifts (begin)!"))
-         |#
-         (when (pair? avail)
-           (let ([lift-stx (car avail)])
-             (available-lift-stxs (cdr avail))
-             (when (visibility)
-               (visible-lift-stxs
-                (cons lift-stx (visible-lift-stxs))))))]
-        [else
-         (syntax-case avail ()
-           [(?let-values ?lift ?rest)
-            (eq? (syntax-e #'?let-values) 'let-values)
-            (begin (available-lift-stxs #'?rest)
-                   (when (visibility)
-                     (visible-lift-stxs
-                      (cons (datum->syntax avail (list #'?let-values #'?lift)
-                                           avail avail)
-                            (visible-lift-stxs)))))]
-           [_
-            (lift-error 'local-lift "out of lifts (let)!")])]))
-
-(define (reform-begin-lifts orig-lifted lifts body)
-  (define begin-kw (stx-car orig-lifted))
-  (datum->syntax orig-lifted
-                 `(,begin-kw ,@lifts ,body)
-                 orig-lifted
-                 orig-lifted))
-
-(define (reform-let-lifts orig-lifted lifts body)
-  (if (null? lifts)
-      body
-      (reform-let-lifts orig-lifted
-                        (cdr lifts)
-                        (with-syntax ([(?let-values ?lift) (car lifts)])
-                          (datum->syntax (car lifts)
-                                         `(,#'?let-values ,#'?lift ,body)
-                                         (car lifts)
-                                         (car lifts))))))
-
-;; lift-error
-(define (lift-error sym . args)
-  (apply eprintf args)
-  (newline (current-error-port))
-  (when #f
-    (apply error sym args)))
-
-(define (expr->local-action d)
-  (match d
-    [(Wrap deriv (e1 e2))
-     (make local-expansion e1 e2
-           #f e1 d #f e2 #f)]))
-
-;; opaque-table
-;; Weakly remembers assoc between opaque values and
-;; actual syntax, so that actual can be substituted in
-;; for destructuring.
-;; FIXME: perhaps add event for opaque-stx unwrapping?
-(define opaque-table (make-weak-hasheq))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/steps.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/steps.rkt
deleted file mode 100644
index 716277fc6b..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/steps.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang racket/base
-(provide (struct-out protostep)
-         (struct-out step)
-         (struct-out misstep)
-         (struct-out remarkstep)
-         (struct-out state)
-         (struct-out bigframe)
-         context-fill
-         state-term
-         step-term1
-         step-term2
-         misstep-term1
-         bigframe-term
-         step-type?
-         step-type->string
-         rewrite-step?
-         rename-step?)
-
-;; A ReductionSequence is (listof Step)
-;; A Step is one of
-;;  - (make-step StepType State State)
-;;  - (make-misstep StepType State exn)
-;;  - (make-remarkstep StepType State (listof (U string syntax 'arrow)))
-(define-struct protostep (type s1) #:transparent)
-(define-struct (step protostep) (s2) #:transparent)
-(define-struct (misstep protostep) (exn) #:transparent)
-(define-struct (remarkstep protostep) (contents) #:transparent)
-
-;; A State is
-;;  (make-state stx stxs Context BigContext (listof id) (listof id) (listof stx) nat/#f)
-(define-struct state (e foci ctx lctx binders uses frontier seq) #:transparent)
-
-;; A Context is a list of Frames
-;; A Frame is (syntax -> syntax)
-
-;; A BigContext is (list-of BigFrame)
-;; A BigFrame is (make-bigframe Context Syntaxes Syntax)
-(define-struct bigframe (ctx foci e))
-
-;; context-fill : Context Syntax -> Syntax
-(define (context-fill ctx stx)
-  (datum->syntax
-   #f
-   (let loop ([ctx ctx] [stx stx])
-     (if (null? ctx)
-         stx
-         (let ([frame0 (car ctx)])
-           (loop (cdr ctx) (frame0 stx)))))))
-
-(define (state-term s)
-  (context-fill (state-ctx s) (state-e s)))
-
-(define (step-term1 s)
-  (state-term (protostep-s1 s)))
-(define (step-term2 s)
-  (state-term (step-s2 s)))
-
-(define (misstep-term1 s)
-  (state-term (protostep-s1 s)))
-
-(define (bigframe-term bf)
-  (context-fill (bigframe-ctx bf) (bigframe-e bf)))
-
-;; A StepType is a simple in the following alist.
-
-(define step-type-meanings
-  '((macro            . "Macro transformation")
-    
-    (rename-lambda    . "Rename formal parameters")
-    (rename-case-lambda . "Rename formal parameters")
-    (rename-let-values . "Rename bound variables")
-    (rename-letrec-values . "Rename bound variables")
-    (rename-lsv       . "Rename bound variables")
-    (lsv-remove-syntax . "Remove syntax bindings")
-
-    (resolve-variable . "Resolve variable (remove extra marks)")
-    (tag-module-begin . "Tag #%module-begin")
-    (tag-app          . "Tag application")
-    (tag-datum        . "Tag datum")
-    (tag-top          . "Tag top-level variable")
-    (capture-lifts    . "Capture lifts")
-    (provide          . "Expand provide-specs")
-
-    (local-lift       . "Macro lifted expression to top-level")
-    (module-lift      . "Macro lifted declaration to end of module")
-    (block->letrec    . "Transform block to letrec")
-    (splice-block     . "Splice block-level begin")
-    (splice-module    . "Splice module-level begin")
-    (splice-lifts     . "Splice definitions from lifted expressions")
-    (splice-module-lifts . "Splice lifted module declarations")
-
-    (remark           . "Macro made a remark")
-    (track-origin     . "Macro called syntax-track-origin")
-
-    (error            . "Error")))
-
-(define (step-type->string x)
-  (cond [(assq x step-type-meanings) => cdr]
-        [(string? x) x]
-        [else (error 'step-type->string "not a step type: ~s" x)]))
-
-(define step-type?
-  (let ([step-types (map car step-type-meanings)])
-    (lambda (x)
-      (and (memq x step-types) #t))))
-
-(define (rename-step? x)
-  (memq (protostep-type x) 
-        '(rename-lambda
-          rename-case-lambda
-          rename-let-values
-          rename-letrec-values
-          rename-lsv
-          track-origin)))
-
-(define (rewrite-step? x)
-  (and (step? x) (not (rename-step? x))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/stx-util.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/stx-util.rkt
deleted file mode 100644
index af7b9a2f64..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/stx-util.rkt
+++ /dev/null
@@ -1,104 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         syntax/stx)
-(provide stx-disarm
-         stx-car*
-         stx-cdr*
-         syntax-e*
-         stx->list*
-         stx->datum
-         syntaxish?
-         syntax-copier)
-
-;; Update for syntax taint: On get, disarm stx on the way, but don't
-;; disarm final stx. On replace, disarm and rearm along the way.
-
-(define (stx-disarm stx)
-  (if (syntax? stx) (syntax-disarm stx (current-code-inspector)) stx))
-
-(define (stx-car* stx)
-  (let ([stx (stx-disarm stx)]) (stx-car stx)))
-
-(define (stx-cdr* stx)
-  (let ([stx (stx-disarm stx)]) (stx-cdr stx)))
-
-(define (syntax-e* stx)
-  (syntax-e (stx-disarm stx)))
-
-(define (stx->list* stx)
-  (if (stx-list? stx)
-      (let loop ([stx stx])
-        (cond [(syntax? stx)
-               (loop (syntax-e* stx))]
-              [(pair? stx)
-               (cons (car stx) (loop (cdr stx)))]
-              [else stx]))
-      #f))
-
-;; ----
-
-(define (stx->datum x)
-  (syntax->datum (datum->syntax #f x)))
-
-(define (syntaxish? x)
-  (or (syntax? x)
-      (null? x)
-      (and (pair? x)
-           (syntaxish? (car x))
-           (syntaxish? (cdr x)))))
-
-;; ----
-
-(define-syntax (syntax-copier stx)
-  (syntax-case stx ()
-    [(syntax-copier hole expr pattern)
-     #'(let ([expr-var expr])
-         (lambda (in-the-hole)
-           (with-syntax ([pattern expr-var])
-             (with-syntax ([hole in-the-hole])
-               (syntax/restamp pattern #'pattern expr-var)))))]))
-
-(define-syntax syntax/skeleton
-  (syntax-rules ()
-    [(syntax/skeleton old-expr pattern)
-     (syntax/restamp pattern #'pattern old-expr)]))
-
-;; FIXME: Need to avoid turning syntax lists into syntax pairs
-(define-syntax (syntax/restamp stx)
-  (syntax-case stx (...)
-    [(syntax/restamp (pa (... ...)) new-expr old-expr)
-     #`(let ([new-parts (stx->list new-expr)]
-             [old-parts (stx->list old-expr)])
-         ;; FIXME 
-         (unless (= (length new-parts) (length old-parts))
-           (printf "** syntax/restamp\n~s\n" (quote-syntax #,stx))
-           (printf "pattern : ~s\n" (syntax->datum #'(pa (... ...))))
-           (printf "old parts: ~s\n" (map syntax->datum old-parts))
-           (printf "new parts: ~s\n" (map syntax->datum new-parts)))
-         (d->so
-          old-expr
-          (map (lambda (new old) (syntax/restamp pa new old))
-               new-parts
-               old-parts)))]
-    [(syntax/restamp (pa . pb) new-expr old-expr)
-     ;; FIXME 
-     #'(begin
-         (unless (and (stx-pair? new-expr) (stx-pair? old-expr))
-           (printf "** syntax/restamp\n~s\n" (quote-syntax #,stx))
-           (printf "pattern : ~s\n" (syntax->datum (quote-syntax (pa . pb))))
-           (printf "old parts: ~s\n" old-expr)
-           (printf "new parts: ~s\n" new-expr))
-         (let ([na (stx-car new-expr)]
-               [nb (stx-cdr new-expr)]
-               [oa (stx-car old-expr)]
-               [ob (stx-cdr old-expr)])
-           (d->so old-expr
-                  (cons (syntax/restamp pa na oa)
-                        (syntax/restamp pb nb ob)))))]
-    [(syntax/restamp pvar new-expr old-expr)
-     #'new-expr]))
-
-(define (d->so template datum)
-  (if (syntax? template)
-      (datum->syntax template datum template template)
-      datum))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/trace.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/trace.rkt
deleted file mode 100644
index f58c5b9b17..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/trace.rkt
+++ /dev/null
@@ -1,205 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/promise
-         racket/list
-         syntax/modcode
-         syntax/modresolve
-         parser-tools/lex
-         "deriv-parser.rkt"
-         "deriv-tokens.rkt")
-
-(provide trace
-         trace*
-         trace-module
-         trace*-module
-         trace/result
-         trace-verbose?
-         events->token-generator
-         current-expand-observe
-         expand/compile-time-evals
-
-         trace-macro-limit
-         trace-limit-handler)
-
-(define current-expand-observe
-  (dynamic-require ''#%expobs 'current-expand-observe))
-
-(define trace-verbose? (make-parameter #f))
-
-;; trace : stx -> Deriv
-(define (trace stx [expander expand/compile-time-evals])
-  (let-values ([(result events derivp) (trace* stx expander)])
-    (force derivp)))
-
-;; trace-module : module-path -> Deriv
-(define (trace-module module-path)
-  (let-values ([(result events derivp) (trace*-module module-path)])
-    (force derivp)))
-
-;; trace/result : stx -> stx/exn Deriv
-(define (trace/result stx [expander expand/compile-time-evals])
-  (let-values ([(result events derivp) (trace* stx expander)])
-    (values result
-            (force derivp))))
-
-;; trace* : stx (stx -> stx) -> stx/exn (list-of event) (promise-of Deriv)
-(define (trace* stx [expander expand/compile-time-evals])
-  (let-values ([(result events) (expand/events stx expander)])
-    (values result
-            events
-            (delay (parse-derivation
-                    (events->token-generator events))))))
-
-;; trace*-module : module-path -> stx/exn (listof event) (promiseof Deriv)
-(define (trace*-module module-path)
-  (get-module-code (resolve-module-path module-path #f)
-                   #:choose (lambda _ 'src)
-                   #:compile (lambda (stx)
-                               (trace* stx expand))))
-
-;; events->token-generator : (list-of event) -> (-> token)
-(define (events->token-generator events)
-  (let ([pos 1])
-    (lambda ()
-      (define sig+val (car events))
-      (set! events (cdr events))
-      (let* ([sig (car sig+val)]
-             [val (cdr sig+val)]
-             [t (tokenize sig val pos)])
-        (when (trace-verbose?)
-          (printf "~s: ~s\n" pos
-                  (token-name (position-token-token t))))
-        (set! pos (add1 pos))
-        t))))
-
-(define trace-macro-limit (make-parameter +inf.0))
-(define trace-limit-handler (make-parameter #f))
-
-;; expand/events : stx (stx -> stx) -> stx/exn (list-of event)
-(define (expand/events sexpr expander)
-  (define events null)
-  ;; Problem: jumps within expansion (eg, macro catches error thrown from within
-  ;; call to 'local-expand') can result in ill-formed event stream.
-  ;; In general, not possible to detect jump endpoints, but we can at least isolate
-  ;; the bad parts by watching for mismatched bracketing events
-  ;; (eg, macro-{pre,post}-transform).
-  (define counter 0)        ;; = (length events)
-  (define macro-stack null) ;; (listof (cons (U stx 'local-bind) nat))
-  (define (add! x y)
-    (set! counter (add1 counter))
-    (set! events (cons (cons (signal->symbol x) y) events)))
-  (define add!/check
-    (let ([limit (trace-macro-limit)]
-          [handler (trace-limit-handler)]
-          [limit-counter 0]
-          [last-local-value-id #f])
-      (lambda (x y)
-        (add! x y)
-        (case x
-          ((8) ;; enter-macro
-           (set! limit-counter (add1 limit-counter))
-           (when (>= limit-counter limit)
-             (set! limit (handler limit-counter))))
-          ((21) ;; macro-pre-transform
-           (let ([rec (cons y counter)])
-             (set! macro-stack (cons rec macro-stack))))
-          ((22) ;; macro-post-transform
-           (cond [(and (pair? macro-stack)
-                       (eq? (car (car macro-stack)) (cdr y)))
-                  (set! macro-stack (cdr macro-stack))]
-                 [else ;; Jumped!
-                  (let loop ([ms macro-stack])
-                    (let ([top (car ms)])
-                      (cond [(eq? (car top) (cdr y))
-                             (let* ([reset-to (cdr top)]
-                                    [len (- counter reset-to 1)]
-                                    [pfx (take (cdr events) len)]
-                                    [sfx (drop (cdr events) len)])
-                               (set! macro-stack (cdr ms))
-                               (set! events sfx)
-                               (set! counter (cdr top))
-                               (add! 'local-mess (reverse pfx))
-                               (add! 'macro-post-transform y))]
-                            [else (loop (cdr ms))])))]))
-          ((143) ;; local-bind
-           (let ([rec (cons 'local-bind counter)])
-             (set! macro-stack (cons rec macro-stack))))
-          ((160) ;; exit-local-bind
-           (let ([top (car macro-stack)])
-             (cond [(eq? (car top) 'local-bind)
-                    (set! macro-stack (cdr macro-stack))]
-                   [else ;; Jumped!
-                    (error 'trace "internal error: cannot handle catch within bind")])))
-          ((153) ;; local-value
-           (set! last-local-value-id y))
-          ((154) ;; local-value-result
-           (add! 'local-value-binding
-                 (and y (identifier-binding last-local-value-id)))
-           (set! last-local-value-id #f))))))
-  (parameterize ((current-expand-observe add!/check))
-    (let ([result
-           (with-handlers ([(lambda (exn) #t)
-                            (lambda (exn)
-                              (add! 'error exn)
-                              exn)])
-             (expander sexpr))])
-      (add! 'EOF #f)
-      (values result
-              (reverse events)))))
-
-(require syntax/stx
-         syntax/kerncase)
-
-(define (emit sig [val #f])
-  ((current-expand-observe) sig val))
-
-(define (expand/compile-time-evals stx)
-  (define (expand/cte stx)
-    (define _ (emit 'visit stx))
-    (define e1 (expand-syntax-to-top-form stx))
-    (define e2
-      (syntax-case e1 (begin)
-        [(begin expr ...)
-         (begin
-           (emit 'top-begin e1)
-           (with-syntax ([(expr ...) 
-                          ;;left-to-right part of this map is important:
-                          (map (lambda (e)
-                                 (emit 'next)
-                                 (expand/cte e))
-                               (syntax->list #'(expr ...)))]
-                         [beg (stx-car e1)])
-             (datum->syntax e1 (syntax-e (syntax (beg expr ...))) e1 e1)))]
-        [else
-         (begin
-           (emit 'top-non-begin)
-           (let ([e (expand-syntax e1)])
-             ;; Must set to void to avoid catching DrRacket's annotations...
-             (parameterize ((current-expand-observe void))
-               (eval-compile-time-part e))
-             e))]))
-    (emit 'return e2)
-    e2)
-  (emit 'start)
-  (expand/cte (namespace-syntax-introduce (datum->syntax #f stx))))
-
-;; eval-compile-time-part : syntax boolean -> void
-;; compiles the syntax it receives as an argument and evaluates the compile-time part of it.
-;; pre: there are no top-level begins in stx.
-(define (eval-compile-time-part stx)
-  (define (eval/compile stx)
-    (eval (compile-syntax stx)))
-  (kernel-syntax-case stx #f
-    [(#%require req ...)
-     (for ([req (syntax->list #'(req ...))])
-       (namespace-require/expansion-time (syntax->datum req)))]
-    [(module . _)
-     (eval/compile stx)]
-    [(define-syntaxes . _)
-     (eval/compile stx)]
-    [(begin-for-syntax . _)
-     (eval/compile stx)]
-    [(define-values (id ...) . _)
-     (eval/compile #'(define-syntaxes (id ...) (values)))]
-    [_else
-     (void)]))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/yacc-ext.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/yacc-ext.rkt
deleted file mode 100644
index a8d262a4bf..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/yacc-ext.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         (prefix-in yacc: parser-tools/yacc))
-(provide parser
-         options
-         productions
-         definitions)
-
-(define-syntax options
-  (lambda (stx)
-    (raise-syntax-error #f "options keyword used out of context" stx)))
-
-(define-syntax productions
-  (lambda (stx)
-    (raise-syntax-error #f "productions keyword used out of context" stx)))
-
-(define-syntax definitions
-  (lambda (stx)
-    (raise-syntax-error #f "definitions keyword used out of context" stx)))
-
-(define-syntax (parser stx)
-  (syntax-case stx ()
-    [(parser form ...)
-     (let ([stop-list (list #'begin #'options #'productions #'definitions)]
-           [forms (syntax->list #'(form ...))])
-       (define-values (opts prods defs)
-         (let loop ([forms forms] [opts null] [prods null] [defs null])
-           (if (pair? forms)
-               (let ([eform0 (local-expand (car forms) 'expression stop-list)]
-                     [forms (cdr forms)])
-                 (syntax-case eform0 (begin options productions definitions)
-                   [(begin subform ...)
-                    (loop (append (syntax->list #'(subform ...)) forms) opts prods defs)]
-                   [(options subform ...)
-                    (loop forms (append (syntax->list #'(subform ...)) opts) prods defs)]
-                   [(productions subform ...)
-                    (loop forms opts (append (syntax->list #'(subform ...)) prods) defs)]
-                   [(definitions subform ...)
-                    (loop forms opts prods (append (syntax->list #'(subform ...)) defs))]
-                   [else
-                    (raise-syntax-error #f "bad parser subform" eform0)]))
-               (values opts prods defs))))
-       (with-syntax ([(opt ...) opts]
-                     [(prod ...) prods]
-                     [(def ...) defs])
-         #'(let ()
-             def ...
-             (#%expression (yacc:parser opt ... (grammar prod ...))))))]))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/yacc-interrupted.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/yacc-interrupted.rkt
deleted file mode 100644
index 944b9cc3b3..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/yacc-interrupted.rkt
+++ /dev/null
@@ -1,298 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     racket/syntax)
-         "yacc-ext.rkt")
-(provide ! ? !!
-         define-production-splitter
-         skipped-token-values
-         %skipped
-         %action)
-
-;; Grammar macros for "interrupted parses"
-
-(define-syntax !
-  (lambda (stx)
-    (raise-syntax-error #f "keyword ! used out of context" stx)))
-
-(define-syntax !!
-  (lambda (stx)
-    (raise-syntax-error #f "keyword !! used out of context" stx)))
-
-(define-syntax ?
-  (lambda (stx)
-    (raise-syntax-error #f "keyword ? used out of context" stx)))
-
-(define-syntax define-production-splitter
-  (syntax-rules ()
-    [(define-production-splitter name ok intW)
-     (define-syntax name
-       (make-production-splitter #'ok #'intW))]))
-
-(define-for-syntax (partition-options/alternates forms)
-  (let loop ([forms forms] [options null] [alts null])
-    (if (pair? forms)
-        (syntax-case (car forms) ()
-          [(#:args . args)
-           (loop (cdr forms) (cons (cons '#:args #'args) options) alts)]
-          [(#:skipped expr)
-           (loop (cdr forms) (cons (cons '#:skipped #'expr) options) alts)]
-          [(#:wrap)
-           (loop (cdr forms) (cons (cons '#:wrap #t) options) alts)]
-          [(#:no-wrap)
-           (loop (cdr forms) (cons (cons '#:no-wrap #t) options) alts)]
-          [(kw . args)
-           (keyword? (syntax-e #'kw))
-           (raise-syntax-error 'split "bad keyword" (car forms))]
-          [(pattern action)
-           (loop (cdr forms) options (cons (cons #'pattern #'action) alts))]
-          [other
-           (raise-syntax-error 'split "bad grammar option or alternate" #'other)])
-        (values options (reverse alts)))))
-
-(define-for-syntax (I symbol)
-  (syntax-local-introduce
-   (syntax-local-get-shadower (datum->syntax #f symbol))))
-
-(define-for-syntax ($name n)
-  (I (format-symbol "$~a" n)))
-
-(define-for-syntax (interrupted-name id)
-  (I (format-symbol "~a/Interrupted" (syntax-e id))))
-
-(define-for-syntax (skipped-name id)
-  (I (format-symbol "~a/Skipped" (syntax-e id))))
-
-(define-for-syntax (elaborate-skipped-tail head tail position args mk-action)
-  (define-values (new-tail new-arguments)
-    (let loop ([parts tail] [position position] [rtail null] [arguments null])
-      (syntax-case parts (? ! !!)
-        [()
-         (values (reverse rtail) (reverse arguments))]
-        [(! . parts-rest)
-         (loop #'parts-rest position rtail (cons #'#f arguments))]
-        [(!! . parts-rest)
-         (raise-syntax-error 'split
-                             "cannot have !! after potential error"
-                             #'!!)]
-        [((? NT) . parts-rest)
-         (loop #'(NT . parts-rest) position rtail arguments)]
-        [(NT . parts-rest)
-         (identifier? #'NT)
-         (loop #'parts-rest
-               (add1 position)
-               (cons (skipped-name #'NT) rtail)
-               (cons ($name position) arguments))])))
-  (define arguments (append (reverse args) new-arguments))
-  (cons #`(#,head . #,new-tail)
-        (mk-action arguments)))
-
-(define-for-syntax ((make-elaborate-successful-alternate wrap? okW) alt)
-  (define pattern (car alt))
-  (define action-function (cdr alt))
-  (define-values (new-patterns arguments)
-    (let loop ([parts pattern] [rpattern null] [position 1] [args null])
-      (syntax-case parts (? ! !!)
-        [() (values (list (reverse rpattern)) (reverse args))]
-        [(! . parts-rest)
-         (loop #'parts-rest rpattern position (cons #'#f args))]
-        [(!!)
-         (values null null)]
-        [((? NT) . parts-rest)
-         (loop (cons #'NT #'parts-rest) rpattern position args)]
-        [(NT . parts-rest)
-         (identifier? #'NT)
-         (loop #'parts-rest (cons #'NT rpattern)
-               (add1 position) (cons ($name position) args))])))
-  (map (lambda (new-pattern)
-         (cons (datum->syntax #f new-pattern pattern)
-               #`(#,action-function #,(if wrap? okW #'values) #,@arguments)))
-       new-patterns))
-
-(define-for-syntax ((make-elaborate-interrupted-alternate wrap? intW) alt)
-  (define pattern (car alt))
-  (define action-function (cdr alt))
-  (define (int-action args)
-    (let ([wrapf (if wrap? #`(lambda (x) (#,intW x)) #'values)])
-      #`(#,action-function #,wrapf #,@args)))
-  (let loop ([parts pattern] [position 1] [args null])
-    (syntax-case parts (? ! !!)
-      [()
-       ;; Can't be interrupted
-       null]
-      [(! . parts-rest)
-       (cons
-        ;; Error occurs
-        (elaborate-skipped-tail (I 'syntax-error)
-                                #'parts-rest
-                                (add1 position)
-                                (cons ($name position) args)
-                                int-action)
-        ;; Error doesn't occur
-        (loop #'parts-rest position (cons #'#f args)))]
-      [(!!)
-       (cons
-        (elaborate-skipped-tail (I 'syntax-error)
-                                #'()
-                                (add1 position)
-                                (cons ($name position) args)
-                                int-action)
-        null)]
-      [((? NT) . parts-rest)
-       (cons 
-        ;; NT is interrupted
-        (elaborate-skipped-tail (interrupted-name #'NT)
-                                #'parts-rest
-                                (add1 position)
-                                (cons ($name position) args)
-                                int-action)
-        ;; NT is not interrupted
-        (loop #'(NT . parts-rest) position args))]
-      [(part0 . parts-rest)
-       (identifier? #'part0)
-       (map (lambda (clause) (cons #`(part0 . #,(car clause)) (cdr clause)))
-            (loop #'parts-rest (add1 position) (cons ($name position) args)))])))
-
-(define-for-syntax (generate-action-name nt pos)
-  (syntax-local-get-shadower
-   (format-id #f "action-for-~a/~a" (syntax-e nt) pos)))
-
-(define-for-syntax ((make-rewrite-alt+def nt args-spec) alt pos)
-  (define pattern (car alt))
-  (define action (cdr alt))
-  (define-values (var-indexes non-var-indexes)
-    (let loop ([pattern pattern] [n 1] [vars null] [nonvars null])
-      (syntax-case pattern ()
-        [(first . more)
-         (syntax-case #'first (! ? !!)
-           [!
-            (loop #'more (add1 n) (cons n vars) nonvars)]
-           [(! . _)
-            (raise-syntax-error 'split
-                                "misuse of ! grammar form"
-                                pattern #'first)]
-           [!!
-            (when (pair? (syntax-e #'more))
-              (raise-syntax-error 'split
-                                  "nothing may follow !!"
-                                  pattern))
-            (loop #'more (add1 n) (cons n vars) nonvars)]
-           [(!! . _)
-            (raise-syntax-error 'split
-                                "misuse of !! grammar form"
-                                pattern #'first)]
-           [(? NT)
-            (identifier? #'NT)
-            (loop #'more (add1 n) (cons n vars) nonvars)]
-           [(? . _)
-            (raise-syntax-error 'split
-                                "misuse of ? grammar form"
-                                pattern #'first)]
-           [NT
-            (identifier? #'NT)
-            (loop #'more (add1 n) (cons n vars) nonvars)]
-           [other
-            (raise-syntax-error 'rewrite-pattern
-                                "invalid grammar pattern"
-                                pattern #'first)])]
-        [()
-         (values (reverse vars) (reverse nonvars))])))
-  (define variables (map $name var-indexes))
-  (define non-var-names (map $name non-var-indexes))
-  (define action-function (generate-action-name nt pos))
-  (cons (cons pattern action-function)
-        (with-syntax ([(var ...) variables]
-                      [(nonvar ...) non-var-names]
-                      [action-function action-function]
-                      [action action])
-          #`(define (action-function wrap var ...)
-              (let-syntax ([nonvar invalid-$name-use] ...)
-                #,(if args-spec
-                      #`(lambda #,args-spec (wrap action))
-                      #`(wrap action)))))))
-
-(define-for-syntax (invalid-$name-use stx)
-  (raise-syntax-error #f "no value for positional variable" stx))
-
-;; An alternate is (cons pattern action-expr)
-;; An alternate* is (cons pattern action-function-name)
-
-(define-for-syntax ((make-production-splitter okW intW) stx)
-  (syntax-case stx ()
-    [(_ (name form ...))
-     (let ()
-       (define-values (options alternates0)
-         (partition-options/alternates (syntax->list #'(form ...))))
-       (define wrap?
-         (let ([wrap? (assq '#:wrap options)]
-               [no-wrap? (assq '#:no-wrap options)])
-           (when (and wrap? no-wrap?)
-             (raise-syntax-error 'split
-                                 "cannot specify both #:wrap and #:no-wrap"
-                                 stx))
-           #;
-           (unless (and (or wrap? no-wrap?) (not (and wrap? no-wrap?)))
-             (raise-syntax-error 'split
-                                 "must specify exactly one of #:wrap, #:no-wrap"
-                                 stx))
-           (and wrap? #t)))
-       (define args-spec
-         (let ([p (assq '#:args options)]) (and p (cdr p))))
-       (define rewrite-alt+def (make-rewrite-alt+def #'name args-spec))
-       (define alternates+definitions
-         (map rewrite-alt+def alternates0 (build-list (length alternates0) add1)))
-       (define alternates (map car alternates+definitions))
-       (define action-definitions (map cdr alternates+definitions))
-       (define elaborate-successful-alternate
-         (make-elaborate-successful-alternate wrap? okW))
-       (define elaborate-interrupted-alternate
-         (make-elaborate-interrupted-alternate wrap? intW))
-       (define successful-alternates
-         (apply append (map elaborate-successful-alternate alternates)))
-       (define interrupted-alternates 
-         (apply append (map elaborate-interrupted-alternate alternates)))
-       (with-syntax ([((success-pattern . success-action) ...)
-                      successful-alternates]
-                     [((interrupted-pattern . interrupted-action) ...)
-                      interrupted-alternates]
-                     [skip-spec (assq '#:skipped options)]
-                     [args-spec (assq '#:args options)]
-                     [name/Skipped (skipped-name #'name)]
-                     [name/Interrupted (interrupted-name #'name)]
-                     [%action ((syntax-local-certifier) #'%action)])
-         #`(begin
-             (definitions #,@action-definitions)
-             (productions
-              (name [success-pattern success-action] ...)
-              #,(if (pair? interrupted-alternates)
-                    #'(name/Interrupted [interrupted-pattern interrupted-action]
-                                        ...)
-                    #'(name/Interrupted [(IMPOSSIBLE) #f]))
-              (name/Skipped [() (%skipped args-spec skip-spec)])))))]))
-
-(define-syntax (skipped-token-values stx)
-  (syntax-case stx ()
-    [(skipped-token-values)
-     #'(begin)]
-    [(skipped-token-values name . more)
-     (identifier? #'name)
-     (with-syntax ([name/Skipped (skipped-name #'name)])
-       #'(begin (productions (name/Skipped [() #f]))
-                (skipped-token-values . more)))]
-    [(skipped-token-values (name value) . more)
-     (with-syntax ([name/Skipped (skipped-name #'name)])
-       #'(begin (productions (name/Skipped [() value]))
-                (skipped-token-values . more)))]))
-
-(define-syntax (%skipped stx)
-  (syntax-case stx ()
-    [(%skipped args (#:skipped . expr))
-     #'(%action args expr)]
-    [(%skipped args #f)
-     #'(%action args #f)]))
-
-(define-syntax (%action stx)
-  (syntax-case stx ()
-    [(%action (#:args . args) action)
-     #'(lambda args action)]
-    [(%action #f action)
-     #'action]))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/stepper-text.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/stepper-text.rkt
deleted file mode 100644
index 0cb3422cde..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/stepper-text.rkt
+++ /dev/null
@@ -1,125 +0,0 @@
-#lang racket/base
-(require racket/pretty
-         racket/promise
-         "model/trace.rkt"
-         "model/reductions.rkt"
-         "model/reductions-config.rkt"
-         "model/steps.rkt"
-         "syntax-browser/partition.rkt"
-         "syntax-browser/pretty-helper.rkt"
-         "view/debug-format.rkt")
-(provide expand/step-text
-         stepper-text)
-
-(define (expand/step-text stx [show #f]
-                          #:internal-error-file [error-file #f])
-  (let ([s (stepper-text stx (->show-function show) #:internal-error-file error-file)])
-    (s 'all)))
-
-(define (stepper-text stx [show #f]
-                      #:internal-error-file [error-file #f])
-  (internal-stepper stx (->show-function show) error-file))
-
-;; internal procedures
-
-(define (internal-stepper stx show? error-file)
-  (define steps (get-steps stx show? error-file))
-  (define used-steps null)
-  (define partition (new-bound-partition))
-  (define dispatch
-    (case-lambda
-     [() (dispatch 'next)]
-     [(sym)
-      (case sym
-        ((next)
-         (if (pair? steps)
-             (begin (show-step (car steps) partition)
-                    (set! used-steps (cons (car steps) used-steps))
-                    (set! steps (cdr steps)))
-             #f))
-        ((prev)
-         (if (pair? used-steps)
-             (begin (show-step (car used-steps) partition)
-                    (set! steps (cons (car used-steps) steps))
-                    (set! used-steps (cdr used-steps)))
-             #f))
-        ((all)
-         (when (pair? steps)
-           (dispatch 'next)
-           (dispatch 'all))))]))
-  dispatch)
-
-(define (get-steps stx show? error-file)
-  (let-values ([(_result events derivp) (trace* stx)])
-    (with-handlers ([exn:fail?
-                     (lambda (exn)
-                       (when error-file
-                         (write-debug-file error-file exn events))
-                       (raise exn))])
-      (define deriv (force derivp))
-      (define steps
-        (parameterize ((macro-policy show?))
-          (reductions deriv)))
-      (define (ok? x)
-        (or (rewrite-step? x) (misstep? x)))
-      (filter ok? steps))))
-
-(define (show-step step partition)
-  (cond [(step? step)
-         (display (step-type->string (protostep-type step)))
-         (newline)
-         (show-term (step-term1 step) partition)
-         (display "  ==>")
-         (newline)
-         (show-term (step-term2 step) partition)
-         (newline)]
-        [(misstep? step)
-         (display (exn-message (misstep-exn step)))
-         (newline)
-         (show-term (misstep-term1 step) partition)]))
-
-(define (show-term stx partition)
-  (define-values (datum flat=>stx stx=>flat)
-    (table stx partition 0 'always #t))
-  (define identifier-list 
-    (filter identifier? (hash-map stx=>flat (lambda (k v) k))))
-  (define (pp-size-hook obj display-like? port)
-    (cond [(syntax-dummy? obj)
-           (let ((ostring (open-output-string)))
-             ((if display-like? display write)
-              (syntax-dummy-val obj)
-              ostring)
-             (string-length (get-output-string ostring)))]
-          [else #f]))
-  (define (pp-print-hook obj display-like? port)
-    (cond [(syntax-dummy? obj)
-           ((if display-like? display write) (syntax-dummy-val obj) port)]
-          [else 
-           (error 'pretty-print-hook "unexpected special value: ~e" obj)]))
-  (define (pp-better-style-table)
-    (pretty-print-extend-style-table (pretty-print-current-style-table)
-                                     (map car extended-style-list)
-                                     (map cdr extended-style-list)))
-  (parameterize 
-   ([pretty-print-size-hook pp-size-hook]
-    [pretty-print-print-hook pp-print-hook]
-    [pretty-print-current-style-table (pp-better-style-table)])
-   (pretty-print/defaults datum)))
-
-(define (->show-function show)
-  (cond [(procedure? show)
-         show]
-        [(list? show)
-         (lambda (id)
-           (ormap (lambda (x) (free-identifier=? x id))
-                  show))]
-        [(eq? show #f)
-         (lambda (id) #t)]
-        [else
-         (error 'expand/trace-text
-                "expected procedure or list of identifiers for macros to show; got: ~e"
-                show)]))
-
-(define extended-style-list
-  '((define-values          . define)
-    (define-syntaxes        . define-syntax)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/interfaces.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/interfaces.rkt
deleted file mode 100644
index 53306ea6d5..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/interfaces.rkt
+++ /dev/null
@@ -1,186 +0,0 @@
-#lang racket/base
-(require unstable/class-iop
-         (for-syntax racket/base))
-(provide (all-defined-out))
-
-;; Helpers
-
-(define-for-syntax (join . args)
-  (define (->string x)
-    (cond [(string? x) x]
-          [(symbol? x) (symbol->string x)]
-          [(identifier? x) (symbol->string (syntax-e x))]
-          [else (error '->string)]))
-  (string->symbol (apply string-append (map ->string args))))
-
-;; not in notify.rkt because notify depends on gui
-(define-interface-expander methods:notify
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ name ...)
-       (datum->syntax #f
-         (apply append
-                (for/list ([name (syntax->list #'(name ...))])
-                  (list ;; (join "init-" #'name)
-                   (join "get-" name)
-                   (join "set-" name)
-                   (join "listen-" name)))))])))
-
-;; Interfaces
-
-;; config<%>
-(define-interface config<%> ()
-  ((methods:notify suffix-option
-                   syntax-font-size
-                   colors
-                   width
-                   height
-                   props-percentage
-                   props-shown?)))
-
-;; displays-manager<%>
-(define-interface displays-manager<%> ()
-  (;; add-syntax-display : display<%> -> void
-   add-syntax-display
-
-   ;; remove-all-syntax-displays : -> void
-   remove-all-syntax-displays))
-
-;; selection-manager<%>
-(define-interface selection-manager<%> ()
-  (;; selected-syntax : notify-box of syntax/#f
-   (methods:notify selected-syntax)))
-
-;; mark-manager<%>
-;; Manages marks, mappings from marks to colors
-(define-interface mark-manager<%> ()
-  (;; get-primary-partition : -> partition
-   get-primary-partition
-
-   ;; reset-primary-partition : -> void
-   reset-primary-partition))
-
-;; secondary-relation<%>
-(define-interface secondary-relation<%> ()
-  (;; identifier=? : notify-box of (cons string (U #f (id id -> bool)))
-   (methods:notify identifier=?)))
-
-;; controller<%>
-(define-interface controller<%> (displays-manager<%>
-                                 selection-manager<%>
-                                 mark-manager<%>
-                                 secondary-relation<%>)
-  ())
-
-
-;; host<%>
-(define-interface host<%> ()
-  (;; get-controller : -> controller<%>
-   get-controller
-
-   ;; add-keymap : text snip
-   add-keymap))
-
-;; keymap/popup<%>
-(define-interface keymap/popup<%> ()
-  (;; add-context-menu-items : popup-menu -> void
-   add-context-menu-items))
-
-;; display<%>
-(define-interface display<%> ()
-  (;; refresh : -> void
-   refresh
-
-   ;; highlight-syntaxes : (list-of syntax) color -> void
-   highlight-syntaxes
-
-   ;; underline-syntaxes : (listof syntax) -> void
-   underline-syntaxes
-
-   ;; get-start-position : -> number
-   get-start-position
-
-   ;; get-end-position : -> number
-   get-end-position
-
-   ;; get-range : -> range<%>
-   get-range))
-
-;; range<%>
-(define-interface range<%> ()
-  (;; get-ranges : datum -> (list-of (cons number number))
-   get-ranges
-
-   ;; get-treeranges : -> (listof TreeRange)
-   get-treeranges
-
-   ;; all-ranges : (list-of Range)
-   ;; Sorted outermost-first
-   all-ranges
-
-   ;; get-identifier-list : (list-of identifier)
-   get-identifier-list))
-
-
-;; A Range is (make-range datum number number)
-(define-struct range (obj start end))
-
-;; A TreeRange is (make-treerange syntax nat nat (listof TreeRange))
-;; where subs are disjoint, in order, and all contained within [start, end]
-(define-struct treerange (obj start end subs))
-
-;; syntax-prefs<%>
-(define-interface syntax-prefs<%> ()
-  (pref:width
-   pref:height
-   pref:props-percentage
-   pref:props-shown?))
-
-;; widget-hooks<%>
-(define-interface widget-hooks<%> ()
-  (;; setup-keymap : -> void
-   setup-keymap
-
-   ;; shutdown : -> void
-   shutdown))
-
-;; keymap-hooks<%>
-(define-interface keymap-hooks<%> ()
-  (;; make-context-menu : -> context-menu<%>
-   make-context-menu
-
-   ;; get-context-menu% : -> class
-   get-context-menu%))
-
-;; context-menu-hooks<%>
-(define-interface context-menu-hooks<%> ()
-  (add-edit-items
-   after-edit-items
-   add-selection-items
-   after-selection-items
-   add-partition-items
-   after-partition-items))
-
-
-;;----------
-
-;; Convenience widget, specialized for displaying stx and not much else
-(define-interface syntax-browser<%> ()
-  (add-syntax
-   add-text
-   add-error-text
-   add-clickback
-   add-separator
-   erase-all
-   get-controller
-   get-text))
-
-(define-interface partition<%> ()
-  (;; get-partition : any -> number
-   get-partition
-
-   ;; same-partition? : any any -> number
-   same-partition?
-
-   ;; count : -> number
-   count))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/partition.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/partition.rkt
deleted file mode 100644
index 10a53e8bcf..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/partition.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-(require racket/class
-         "interfaces.rkt"
-         "../util/stxobj.rkt")
-(provide new-bound-partition
-         identifier=-choices)
-
-(define (new-bound-partition)
-  (new bound-partition%))
-
-;; bound-partition%
-(define bound-partition%
-  (class* object% (partition<%>)
-
-    ;; simplified : hash[(listof nat) => nat]
-    (define simplified (make-hash))
-
-    ;; next-number : nat
-    (define next-number 0)
-
-    (define/public (get-partition stx)
-      (let ([marks (get-marks stx)])
-        (or (hash-ref simplified marks #f)
-            (let ([n next-number])
-              (hash-set! simplified marks n)
-              (set! next-number (add1 n))
-              n))))
-
-    (define/public (same-partition? a b)
-      (= (get-partition a) (get-partition b)))
-
-    (define/public (count)
-      next-number)
-
-    (get-partition (datum->syntax #f 'nowhere))
-    (super-new)))
-
-;; ==== Identifier relations ====
-
-(define identifier=-choices
-  (make-parameter
-   `(("<nothing>" . #f)
-     ("bound-identifier=?"  . ,bound-identifier=?)
-     ("free-identifier=?" . ,free-identifier=?))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/pretty-helper.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/pretty-helper.rkt
deleted file mode 100644
index 10329ee244..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/pretty-helper.rkt
+++ /dev/null
@@ -1,178 +0,0 @@
-#lang racket/base
-(require racket/pretty
-         unstable/class-iop
-         unstable/struct
-         "interfaces.rkt"
-         "../model/stx-util.rkt")
-(provide (all-defined-out))
-
-;; Problem: If stx1 and stx2 are two distinguishable syntax objects, it
-;; still may be the case that (syntax-e stx1) and (syntax-e stx2) are 
-;; indistinguishable.
-
-;; Solution: Rather than map stx to (syntax-e stx), in the cases where
-;; (syntax-e stx) is confusable, map it to a different, unique, value.
-;; Use syntax-dummy, and extend pretty-print-remap-stylable to look inside.
-
-;; Old solution: same, except map identifiers to uninterned symbols instead
-
-;; NOTE: Nulls are only wrapped when *not* list-terminators.  
-;; If they were always wrapped, the pretty-printer would screw up
-;; list printing (I think).
-
-;; UPDATE: In fact, want to treat all atomic values as confusable. The recent
-;; reader change (interning strings, etc) highlights the issue.
-
-(define (pretty-print/defaults datum [port (current-output-port)])
-  (parameterize
-    (;; Printing parameters (defaults from MzScheme and DrScheme 4.2.2.2)
-     [print-unreadable #t]
-     [print-graph #f]
-     [print-struct #t]
-     [print-box #t]
-     [print-vector-length #f]
-     [print-hash-table #t])
-    (pretty-write datum port)))
-
-(define-struct syntax-dummy (val))
-(define-struct (id-syntax-dummy syntax-dummy) (remap))
-
-;; A SuffixOption is one of
-;; - 'never             -- never
-;; - 'always            -- suffix > 0
-;; - 'over-limit        -- suffix > limit
-;; - 'all-if-over-limit -- suffix > 0 if any over limit
-
-;; syntax->datum/tables : stx partition% num SuffixOption
-;;                        -> (values s-expr hashtable hashtable)
-;; When partition is not false, tracks the partititions that subterms belong to
-;; When limit is a number, restarts processing with numbering? set to true
-;; 
-;; Returns three values:
-;;   - an S-expression
-;;   - a hashtable mapping S-expressions to syntax objects
-;;   - a hashtable mapping syntax objects to S-expressions
-;; Syntax objects which are eq? will map to same flat values
-(define (syntax->datum/tables stx partition limit suffixopt abbrev?)
-  (table stx partition limit suffixopt abbrev?))
-
-;; table : syntax maybe-partition% maybe-num SuffixOption boolean -> (values s-expr hashtable hashtable)
-(define (table stx partition limit suffixopt abbrev?)
-  (define (make-identifier-proxy id)
-    (define sym (syntax-e id))
-    (case suffixopt
-      ((never)
-       (make-id-syntax-dummy sym sym))
-      ((always)
-       (let ([n (send/i partition partition<%> get-partition id)])
-         (if (zero? n)
-             (make-id-syntax-dummy sym sym)
-             (make-id-syntax-dummy (suffix sym n) sym))))
-      ((over-limit)
-       (let ([n (send/i partition partition<%> get-partition id)])
-         (if (<= n limit)
-             (make-id-syntax-dummy sym sym)
-             (make-id-syntax-dummy (suffix sym n) sym))))))
-
-  (let/ec escape
-    (let ([flat=>stx (make-hasheq)]
-          [stx=>flat (make-hasheq)])
-      (define (loop obj)
-        (cond [(hash-ref stx=>flat obj (lambda _ #f))
-               => (lambda (datum) datum)]
-              [(and partition (identifier? obj))
-               (when (and (eq? suffixopt 'all-if-over-limit)
-                          (> (send/i partition partition<%> count) limit))
-                 (call-with-values (lambda () (table stx partition #f 'always abbrev?))
-                                   escape))
-               (let ([lp-datum (make-identifier-proxy obj)])
-                 (hash-set! flat=>stx lp-datum obj)
-                 (hash-set! stx=>flat obj lp-datum)
-                 lp-datum)]
-              [(and (syntax? obj) abbrev? (check+convert-special-expression obj))
-               => (lambda (newobj)
-                    (when partition (send/i partition partition<%> get-partition obj))
-                    (let* ([inner (cadr newobj)]
-                           [lp-inner-datum (loop inner)]
-                           [lp-datum (list (car newobj) lp-inner-datum)])
-                      (hash-set! flat=>stx lp-inner-datum inner)
-                      (hash-set! stx=>flat inner lp-inner-datum)
-                      (hash-set! flat=>stx lp-datum obj)
-                      (hash-set! stx=>flat obj lp-datum)
-                      lp-datum))]
-              [(syntax? obj)
-               (when partition (send/i partition partition<%> get-partition obj))
-               (let ([lp-datum (loop (syntax-e* obj))])
-                 (hash-set! flat=>stx lp-datum obj)
-                 (hash-set! stx=>flat obj lp-datum)
-                 lp-datum)]
-              ;; -- Traversable structures
-              [(pair? obj)
-               (pairloop obj)]
-              [(prefab-struct-key obj)
-               => (lambda (pkey)
-                    (let-values ([(refold fields) (unfold-pstruct obj)])
-                      (refold (map loop fields))))]
-              [(vector? obj) 
-               (list->vector (map loop (vector->list obj)))]
-              [(box? obj)
-               (box (loop (unbox obj)))]
-              [(hash? obj)
-               (let ([constructor
-                      (cond [(hash-equal? obj) make-immutable-hash]
-                            [(hash-eqv? obj) make-immutable-hasheqv]
-                            [(hash-eq? obj) make-immutable-hasheq])])
-                 (constructor
-                  (for/list ([(k v) (in-hash obj)])
-                    (cons k (loop v)))))]
-              ;; -- Atoms ("confusable")
-              [(symbol? obj)
-               (make-id-syntax-dummy obj obj)]
-              [else ;; null, boolean, number, keyword, string, bytes, char, regexp, 3D vals
-               (make-syntax-dummy obj)]))
-      (define (pairloop obj)
-        (cond [(pair? obj)
-               (cons (loop (car obj))
-                     (pairloop (cdr obj)))]
-              [(null? obj)
-               null]
-              [(and (syntax? obj) (null? (syntax-e obj)))
-               null]
-              [else (loop obj)]))
-      (values (loop stx)
-              flat=>stx
-              stx=>flat))))
-
-;; unfold-pstruct : prefab-struct -> (values (list -> prefab-struct) list)
-(define (unfold-pstruct obj)
-  (define key (prefab-struct-key obj))
-  (define fields (struct->list obj))
-  (values (lambda (new-fields)
-            (apply make-prefab-struct key new-fields))
-          fields))
-
-;; check+convert-special-expression : syntax -> #f/syntaxish
-(define (check+convert-special-expression stx)
-  (define stx-list (stx->list* stx))
-  (and stx-list (= 2 (length stx-list))
-       (let ([kw (car stx-list)]
-             [expr (cadr stx-list)])
-         (and (identifier? kw)
-              (memq (syntax-e kw) special-expression-keywords)
-              (bound-identifier=? kw (datum->syntax stx (syntax-e kw)))
-              (andmap (lambda (f) (equal? (f stx) (f kw)))
-                      (list syntax-source
-                            syntax-line
-                            syntax-column
-                            syntax-position
-                            syntax-original?
-                            syntax-source-module))
-              (cons (syntax-e kw)
-                    (list expr))))))
-
-(define special-expression-keywords
-  '(quote quasiquote unquote unquote-splicing syntax
-    quasisyntax unsyntax unsyntax-splicing))
-
-(define (suffix sym n)
-  (string->symbol (format "~a:~a" sym n)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/eomap.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/eomap.rkt
deleted file mode 100644
index fd2f69a05f..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/eomap.rkt
+++ /dev/null
@@ -1,140 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         racket/dict
-         racket/match)
-
-#|
-eomap = "extend-only" mapping
-
-Used to represent persistent mappings that are typically extended only once,
-where both lookup and extend must be fast, but no other operations are needed.
-
-Like association list (sharing, fast extend), but lookup is fast too.
-Like immutable hash (fast lookup), but extend (hopefully) involves less allocation.
-
-----
-
-An eomap[K,V] is (eomap store[K,V] timestamp (box timestamp)).
-A store[K,V] is mutable-dict[K, (listof (cons timestamp V))].
-
-A timestamp is either
-  - nat
-  - (cons nat (cons symbol timestamp))
-
-Timestamps are arranged into Branches. The main Branch goes 1, 2, 3 ....
-A box stores the latest timestamp in a Branch.
-If another eomap is branched off of 2, that Branch is tagged (g0 . 2) and
-its successor for 2 is (1 g0 . 2).
-
-Timestamps and branches are compared using eqv?.
-
-Comparison:
-  t1 < nat2 if 
-    - t1 = nat1 < nat2
-  t1 < (nat2 sym2 . bt2) if
-    - t1 = (nat1 sym2 . bt2)    ;; same branch
-      and nat1 < nat2
-    - t1 < bt2, or              ;; less than branch point
-
-====
-
-The data structure works best, of course, when a mapping is extended only once,
-so we can stick to simple numbered timestamps.
-
-An alternative is to make eomaps enforce the extend-once property; so
-instead of branching a second extension just errors.
-
-TODO: check if macro stepper strictly follows extend-once discipline.
-
-|#
-
-(struct eomap (store ts latest))
-
-(define (empty-eomap [store (make-hasheq)])
-  (eomap store 1 (box 1)))
-
-(define (eomap-bump eom)
-  (match eom
-    [(eomap store ts latest)
-     (let-values ([(ts* latest*) (successor ts latest)])
-       (eomap store ts* latest*))]))
-
-(define (eomap-add eom to-add)
-  (let ([eom* (eomap-bump eom)])
-    (match eom*
-      [(eomap store ts latest)
-       (for ([(key value) (in-dict to-add)])
-         (dict-set! store key
-                    (cons (cons ts value) (dict-ref store key null))))])
-    eom*))
-
-(define (eomap-set* eom keys value)
-  (let ([eom* (eomap-bump eom)])
-    (match eom*
-      [(eomap store ts latest)
-       (for ([key (in-list keys)])
-         (dict-set! store key
-                    (cons (cons ts value) (dict-ref store key null))))])
-    eom*))
-
-(define (eomap-ref eom key [default not-given])
-  (match eom
-    [(eomap store ts _latest)
-     (let loop ([ts+value-list (dict-ref store key null)])
-       (cond [(pair? ts+value-list)
-              (let ([entry-ts (car (car ts+value-list))]
-                    [entry-value (cdr (car ts+value-list))])
-                (cond [(t<=? entry-ts ts)
-                       entry-value]
-                      [else (loop (cdr ts+value-list))]))]
-             [else
-              (cond [(eq? default not-given)
-                     (error 'eomap-ref "key not found: ~e" key)]
-                    [(procedure? default) (default)]
-                    [else default])]))]))
-
-(define not-given (gensym 'not-given))
-
-;; Timestamps
-
-(define (successor ts latest)
-  (define (tadd1 ts)
-    (cond [(pair? ts) (cons (add1 (car ts)) (cdr ts))]
-          [else (add1 ts)]))
-  (cond [(eqv? ts (unbox latest))
-         (let ([ts+1 (tadd1 ts)])
-           (set-box! latest ts+1)
-           (values ts+1 latest))]
-        [else
-         (let* ([tag (cons (gensym) ts)]
-                [next (cons 1 tag)])
-           (values next (box next)))]))
-
-(define (t<=? x y)
-  (or (eqv? x y) (t<? x y)))
-
-(define (t<? x y)
-  (match y
-    [(cons yn ytag)
-     (match x
-       [(cons xn (? (lambda (v) (eqv? v ytag))))
-        (< xn yn)]
-       [x
-        (t<? x (cdr ytag))])]
-    [yn
-     (and (number? x)
-          (< x yn))]))
-
-;; ----
-
-(provide/contract
- [eomap?
-  (-> any/c boolean?)]
- [empty-eomap
-  (->* () (dict?) eomap?)]
- [eomap-add
-  (-> eomap? dict? eomap?)]
- [eomap-set*
-  (-> eomap? list? any/c eomap?)]
- [eomap-ref
-  (->* (eomap? any/c) (any/c) any)])
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/mpi.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/mpi.rkt
deleted file mode 100644
index c754dc860f..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/mpi.rkt
+++ /dev/null
@@ -1,237 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/string)
-
-(provide mpi->list
-         mpi->string
-         self-mpi?)
-
-;; mpi->list : module-path-index -> list
-(define (mpi->list mpi)
-  (cond [(module-path-index? mpi)
-         (let-values ([(path relto) (module-path-index-split mpi)])
-           (cond [(not path) #| relto = #f |# null]
-                 [(not relto) (list path)]
-                 [else (cons path (mpi->list relto))]))]
-        [else (list mpi)]))
-
-;; mpi->string : module-path-index -> string
-(define (mpi->string mpi)
-  (if (module-path-index? mpi)
-      (let ([mps (mpi->list mpi)])
-        (cond [(pair? mps)
-               (string-join (map (lambda (x) (format "~s" x)) mps)
-                            " <= ")]
-              [(null? mps) "this module"]))
-      (format "~s" mpi)))
-
-;; self-mpi? : module-path-index -> bool
-(define (self-mpi? mpi)
-  (let-values ([(path relto) (module-path-index-split mpi)])
-    (eq? path #f)))
-
-;; --
-
-(provide mpi->mpi-sexpr
-         mpi-sexpr->mpi)
-
-;; mp = module-path
-;; mpi = module-path-index
-;; rmp = resolved-module-path
-
-;; An mpi-sexpr is one of
-;;   (cons mp-sexpr mpi-sexpr)
-;;   (list rmp-sexpr)
-;;   (list #f)  ;; "self" module
-;;   null
-
-;; An rmp-sexpr is
-;;   (list 'resolved path/symbol)
-
-;; mpi->mpi-sexpr : mpi -> mpi-sexpr
-(define (mpi->mpi-sexpr mpi)
-  (cond [(module-path-index? mpi)
-         (let-values ([(mod next) (module-path-index-split mpi)])
-           (cons (mp->mp-sexpr mod) (mpi->mpi-sexpr next)))]
-        [(resolved-module-path? mpi)
-         (list (rmp->rmp-sexpr mpi))]
-        [else null]))
-
-;; mp->mp-sexpr : mp -> mp-sexpr
-(define (mp->mp-sexpr mp)
-  (if (path? mp)
-      (if (absolute-path? mp)
-          `(file ,(path->string mp))
-          (path->string mp))
-      mp))
-
-;; mpi-sexpr->mpi : mpi-sexpr -> mpi
-(define (mpi-sexpr->mpi sexpr)
-  (match sexpr
-    ['() #f]
-    [(list (list 'resolved path))
-     (rmp-sexpr->rmp path)]
-    [(cons first rest)
-     (module-path-index-join first (mpi-sexpr->mpi rest))]))
-
-;; rmp->rmp-sexpr : rmp -> rmp-sexpr
-(define (rmp->rmp-sexpr rmp)
-  (list 'resolved (resolved-module-path-name rmp)))
-
-;; rmp-sexpr->rmp : rmp-sexpr -> rmp
-(define (rmp-sexpr->rmp sexpr)
-  (make-resolved-module-path (cadr sexpr)))
-
-;; ----
-
-(provide mpi-sexpr->expanded-mpi-sexpr
-         expanded-mpi-sexpr->library)
-
-;; An expanded-mpi-sexpr is (listof expanded-mpi-frame)
-
-;; An expanded-mpi-frame is one of:
-;;   (list 'LIB (listof string))
-;;   (list 'PLANET (listof string) PackageSpec)
-;;   (list 'FILE string)
-;;      absolute file path (not relative)
-;;   (list 'QUOTE symbol)
-;;   (list 'SELF)
-;;   (list 'REL (listof string))
-;;   (list 'SUBMOD (U module-path ".") (listof (U ".." symbol)))
-;; The first 5 variants are considered "absolute" frames.
-;; The first 2 variants are consider "library" frames.
-
-;; mpi-sexpr->expanded-mpi-sexpr
-(define (mpi-sexpr->expanded-mpi-sexpr sexpr)
-  (map mpi-frame->expanded-mpi-frame sexpr))
-
-;; mpi-frame->expanded-mpi-frame
-(define (mpi-frame->expanded-mpi-frame sexpr)
-  (match sexpr
-    [#f
-     `(SELF)]
-    [`(quote ,mod)
-     `(QUOTE ,mod)]
-    [`(lib ,path)
-     (cond [(symbol? path)
-            (mpi-frame->expanded-mpi-frame path)]
-           [(regexp-match? #rx"/" path)
-            `(LIB ,(split-mods path))]
-           [else
-            `(LIB ,(list "mzlib" path))])]
-    [`(lib ,path . ,more)
-     `(LIB ,(split-mods path more))]
-    [`(planet ,(? symbol? spec))
-     (mpi-frame->expanded-mpi-frame (parse-planet-spec spec))]
-    [`(planet ,path ,package . ,more)
-     `(PLANET ,(split-mods path more) ,package)]
-    [(? symbol? mod)
-     `(LIB ,(split-mods* (symbol->string mod)))]
-    [`(file ,path)
-     (cond [(absolute-path? path)
-            `(FILE ,path)]
-           [else
-            `(REL (split-mods path))])]
-    [(? string? path)
-     `(REL ,(split-mods path))]
-    [`(resolved ,(? path? path))
-     `(FILE ,path)]
-    [`(resolved ,(? symbol? symbol))
-     `(QUOTE ,symbol)]
-    [`(submod ,base . ,elems)
-     (cond [(equal? base "..")
-            `(SUBMOD "." ,(cons ".." elems))]
-           [else
-            `(SUBMOD ,base ,@elems)])]
-    ))
-
-;; expanded-mpi-sexpr->mpi-sexpr
-(define (expanded-mpi-sexpr->mpi-sexpr sexpr)
-  (map expanded-mpi-frame->mpi-frame sexpr))
-
-;; expanded-mpi-frame->mpi-frame
-(define (expanded-mpi-frame->mpi-frame sexpr)
-  (match sexpr
-    [`(SELF)
-     #f]
-    [`(QUOTE ,mod)
-     `(quote ,mod)]
-    [`(LIB ,paths)
-     `(lib ,(apply string-append (intersperse "/" paths)))]
-    [`(PLANET ,paths ,package)
-     `(planet ,(apply string-append (intersperse "/" paths)) ,package)]
-    [`(FILE ,path)
-     `(file ,path)]
-    [`(REL ,paths)
-     (apply string-append (intersperse "/" paths))]
-    [`(SUBMOD ,base ,elems)
-     `(submod ,base ,@elems)]))
-
-(define (parse-planet-spec spec-sym)
-  (define spec (symbol->string spec-sym))
-  (let ([m (regexp-match #rx"([^/]*)/([^:/]*)(?:[:]([^/]*))?(?:/(.*))?" spec)])
-    (unless m (error "bad planet symbol" spec-sym))
-    (let ([owner (cadr m)]
-          [package (string-append (caddr m) ".plt")]
-          [version (and (cadddr m) (parse-version (cadddr m)))]
-          [path (list-ref m 4)])
-      `(planet ,(string-append (or path "main") ".rkt")
-               (,owner ,package . ,version)))))
-
-(define (parse-version str)
-  ;; FIXME!!!
-  '())
-
-(define (split-mods* path)
-  (let ([mods (split-mods path)])
-    (if (and (pair? mods) (null? (cdr mods)))
-        (append mods (list "main.rkt"))
-        mods)))
-
-(define (split-mods path [more null])
-  (append (apply append (map split-mods more))
-          (regexp-split #rx"/" path)))
-
-(define (flatten-mods more path)
-  (path->string (apply build-path (append more (list path)))))
-
-;; expanded-mpi-sexpr->library : expanded-mpi-sexpr -> expanded-mpi-frame
-(define (expanded-mpi-sexpr->library sexpr0)
-  (define (abs? link)
-    (and (pair? link) (memq (car link) '(LIB PLANET))))
-  (define (loop stack stacks)
-    (cond [(pair? (cdr stack))
-           (cons (car stack) (loop (cdr stack) stacks))]
-          [(pair? stacks)
-           (unless (eq? 'REL (car (car stacks)))
-             (error 'expanded-mpi-sexpr->library
-                    "internal error: absolute frame"))
-           (loop (cadr (car stacks)) (cdr stacks))]
-          [else stack]))
-  (define sexpr1 (reverse (cut-to-absolute sexpr0)))
-  (and (library-expanded-mpi-frame? (car sexpr1))
-       `(,(car (car sexpr1))
-         ,(loop (cadr (car sexpr1)) (cdr sexpr1))
-         . ,(cddr (car sexpr1)))))
-
-;; cut-to-absolute : expanded-mpi-sexpr -> expanded-mpi-sexpr
-(define (cut-to-absolute sexpr)
-  (cond [(and (pair? sexpr)
-              (absolute-expanded-mpi-frame? (car sexpr)))
-         (list (car sexpr))]
-        [(pair? sexpr)
-         (cons (car sexpr) (cut-to-absolute (cdr sexpr)))]))
-
-;; absolute-expanded-mpi-frame? : expanded-mpi-frame -> boolean
-(define (absolute-expanded-mpi-frame? sexpr)
-  (not (memq (car sexpr) '(REL))))
-
-;; library-expanded-mpi-frame? : expanded-mpi-frame -> boolean
-(define (library-expanded-mpi-frame? sexpr)
-  (memq (car sexpr) '(LIB PLANET)))
-
-;; intersperse : X (listof X) -> (listof X)
-(define (intersperse sep items)
-  (cond [(and (pair? items) (pair? (cdr items)))
-         (cons (car items) (cons sep (intersperse sep (cdr items))))]
-        [else items]))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/stxobj.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/stxobj.rkt
deleted file mode 100644
index 95d7aad88f..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/stxobj.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-(require (rename-in racket/contract/base [-> c:->])
-         ffi/unsafe)
-
-(define lib (ffi-lib #f))
-
-(define get-marks
-  (get-ffi-obj "scheme_stx_extract_marks" lib
-               (_fun _scheme -> _scheme)))
-
-#|
-(define (simplify-marks marklist)
-  (simplify* (sort marklist <)))
-
-(define (simplify* marklist)
-  (cond [(null? marklist) marklist]
-        [(null? (cdr marklist)) marklist]
-        [(= (car marklist) (cadr marklist))
-         (simplify* (cddr marklist))]
-        [else
-         (let ([result (simplify* (cdr marklist))])
-           (if (eq? result (cdr marklist))
-               marklist
-               (cons (car marklist) result)))]))
-
-(provide simplify-marks)
-|#
-
-(provide/contract
- [get-marks
-  ;; syntax? check needed for safety!
-  (c:-> syntax? any)])
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/view/debug-format.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/view/debug-format.rkt
deleted file mode 100644
index 1a5a21639f..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/view/debug-format.rkt
+++ /dev/null
@@ -1,108 +0,0 @@
-#lang racket/base
-(require racket/pretty)
-(provide write-debug-file
-         load-debug-file
-         serialize-datum
-         approx-parse-state)
-
-(define (write-debug-file file exn events)
-  (with-output-to-file file
-    (lambda ()
-      (write-string "`(\n")
-      (for ([event (in-list events)])
-        (let ([event (list (car event) (cdr event))])
-          (pretty-write (serialize-datum* event))))
-      (write-string ")\n")
-      (newline)
-      (write (exn-message exn))
-      (newline)
-      (pretty-write
-       (map serialize-context-frame
-            (continuation-mark-set->context
-             (exn-continuation-marks exn)))))
-    #:exists 'replace))
-
-(define (quoted? x) (and (pair? x) (eq? (car x) 'quote)))
-
-(define (serialize-datum d)
-  (list 'quasiquote (serialize-datum* d)))
-
-(define (serialize-datum* d)
-  (define (UNQUOTE x) (list 'unquote x))
-  (cond [(number? d) d]
-        [(boolean? d) d]
-        [(symbol? d)
-         (case d
-           ((unquote) (UNQUOTE '(quote unquote)))
-           ((unquote-splicing) (UNQUOTE '(quote unquote-splicing)))
-           (else d))]
-        [(string? d) d]
-        [(bytes? d) d]
-        [(null? d) d]
-        [(pair? d)
-         (cons (serialize-datum* (car d)) (serialize-datum* (cdr d)))]
-        [(exn? d) (UNQUOTE `(make-exn ,(exn-message d) (current-continuation-marks)))]
-        [(syntax? d) (UNQUOTE `(datum->syntax #f ',(syntax->datum d)))]
-        [(module-path-index? d)
-         (define-values (path rel)
-           (module-path-index-split d))
-         (UNQUOTE `(module-path-index-join
-                    ,(serialize-datum path)
-                    ,(serialize-datum rel)))]
-        [(resolved-module-path? d)
-         (UNQUOTE `(make-resolved-module-path
-                    ,(serialize-datum
-                      (resolved-module-path-name d))))]
-        [(path? d)
-         (UNQUOTE `(bytes->path
-                    ,(serialize-datum (path->bytes d))
-                    ,(serialize-datum (path-convention-type d))))]
-        [else
-         (eprintf "unserializable value: ~e" d)
-         `(UNSERIALIZABLE ,(format "~s" d))]))
-
-(define (serialize-context-frame frame)
-  (cons (car frame)
-        (if (cdr frame)
-            (serialize-srcloc (cdr frame))
-            null)))
-
-(define (serialize-srcloc s)
-  (list (let ([src (srcloc-source s)])
-          (cond [(path? src) (path->string src)]
-                [(string? src) src]
-                [else '?]))
-        (srcloc-line s)
-        (srcloc-column s)))
-
-(define (load-debug-file file)
-  (parameterize ((read-accept-compiled #t))
-    (with-input-from-file file
-      (lambda ()
-        (let* ([events-expr (read)]
-               [exnmsg (read)]
-               [ctx (read)])
-          (let* ([events (eval events-expr)]
-                 [events
-                  (if (andmap (lambda (e) (and (list? e) (= 2 (length e)))) events)
-                      (map (lambda (l) (cons (car l) (cadr l))) events)
-                      events)])
-            (values events exnmsg ctx)))))))
-
-(define (approx-parse-state events N)
-  (for/fold ([state null]) ([event (in-list events)] [index (in-range N)])
-    (define (pop expect)
-      (let ([top (car state)])
-        (unless (eq? (cadr top) expect)
-          (error "bad state on ~e: ~e" (car event) state))
-        (cdr state)))
-    (case (car event)
-      ((enter-macro enter-prim enter-local)
-       (cons (cons index event) state))
-      ((exit-macro)
-       (pop 'enter-macro))
-      ((exit-prim)
-       (pop 'enter-prim))
-      ((exit-local)
-       (pop 'enter-local))
-      (else state))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/LICENSE.txt b/pkgs/macro-debugger-pkgs/macro-debugger/LICENSE.txt
deleted file mode 100644
index 9bb16094ee..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-macro-debugger
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt
deleted file mode 100644
index 1da07c5a9f..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "compatibility-lib"
-               "data-lib"
-               "gui-lib"
-               "images-lib"
-               "images-gui-lib"
-               "parser-tools-lib"
-               "unstable-lib"
-               "unstable-list-lib"
-               "macro-debugger-text-lib"))
-(define build-deps '("racket-index"
-                     "rackunit-lib"
-                     "scribble-lib"
-                     "racket-doc"
-                     "unstable-doc"))
-
-(define pkg-desc "The macro debugger tool")
-
-(define pkg-authors '(ryanc))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/emit.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/emit.rkt
deleted file mode 100644
index a8b91ac5bd..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/emit.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-(require racket/contract/base)
-
-(define current-expand-observe
-  (dynamic-require ''#%expobs 'current-expand-observe))
-
-(define (emit-remark #:unmark? [unmark? (syntax-transforming?)] . args)
-  (let ([observe (current-expand-observe)])
-    (when observe
-      (let ([args (flatten-emit-args args unmark?)])
-        (observe 'local-remark args)))))
-
-(define (emit-local-step before after #:id id)
-  (let ([observe (current-expand-observe)])
-    (when observe
-      (observe 'local-artificial-step
-               (list (list id)
-                     before (syntax-local-introduce before)
-                     (syntax-local-introduce after) after)))))
-
-(define emit-arg/c
-  (recursive-contract
-   (or/c string?
-         syntax?
-         (listof emit-arg/c)
-         (-> emit-arg/c))))
-
-(define (flatten-emit-args x unmark?)
-  (define (loop x onto)
-    (cond [(string? x)
-           (cons x onto)]
-          [(syntax? x)
-           (cons (if unmark? (syntax-local-introduce x) x) onto)]
-          [(list? x)
-           (foldr loop onto x)]
-          [(procedure? x)
-           (loop (x) onto)]))
-  (loop x null))
-
-(provide/contract
- [emit-remark
-  (->* () (#:unmark? any/c) #:rest (listof emit-arg/c)
-       any)]
- [emit-local-step
-  (-> syntax? syntax? #:id identifier? any)])
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/info.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/info.rkt
deleted file mode 100644
index 38df5c07a5..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("macro-debugger.scrbl" () (tool-library))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/macro-debugger.scrbl b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/macro-debugger.scrbl
deleted file mode 100644
index 63dc514102..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/macro-debugger.scrbl
+++ /dev/null
@@ -1,577 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/struct
-          scribble/decode
-          scribble/eval
-          (for-label racket/base
-                     racket/contract/base
-                     racket/lazy-require
-                     racket/runtime-path
-                     macro-debugger/expand
-                     macro-debugger/emit
-                     macro-debugger/stepper
-                     macro-debugger/stepper-text
-                     macro-debugger/syntax-browser
-                     (except-in macro-debugger/analysis/check-requires main)
-                     (except-in macro-debugger/analysis/show-dependencies main)))
-
-@(define the-eval
-   (let ([the-eval (make-base-eval)])
-     (the-eval '(require racket/pretty
-                         macro-debugger/expand
-                         macro-debugger/stepper-text
-                         (except-in macro-debugger/analysis/check-requires main)
-                         (except-in macro-debugger/analysis/show-dependencies main)))
-     (the-eval '(current-print pretty-print-handler))
-     the-eval))
-
-@(define (defoutput proto . text)
-   (nested #:style "leftindent"
-          (tabular #:style 'boxed (list (list proto)))
-          "\n" "\n"
-          (splice text)))
-
-@title{Macro Debugger: Inspecting Macro Expansion}
-
-@author["Ryan Culpepper"]
-
-The macro-debugger collection contains two tools: a stepper for macro
-expansion and a standalone syntax browser. The macro stepper shows the
-programmer the expansion of a program as a sequence of rewriting
-steps, using the syntax browser to display the individual terms. The
-syntax browser uses colors and a properties panel to show the term's
-syntax properties, such as lexical binding information and source
-location.
-
-
-@section{Macro Stepper}
-
-@defmodule[macro-debugger/stepper]
-
-@defproc[(expand/step [stx any/c])
-         void?]{
-
-Expands the syntax (or S-expression) and opens a macro stepper frame
-for stepping through the expansion. 
-}
-
-@defproc[(expand-module/step [mod module-path?])
-         void?]{
-
-Expands the source file named by @racket[mod], which must contains a
-single module declaration, and opens a macro stepper frame for
-stepping through the expansion.
-}
-
-@section{Macro Expansion Tools}
-
-@defmodule[macro-debugger/expand]
-
-This module provides @racket[expand]-like procedures that allow the
-user to specify macros whose expansions should be hidden.
-
-Warning: because of limitations in the way macro expansion is
-selectively hidden, the resulting syntax may not evaluate to the same
-result as the original syntax.
-
-@defproc[(expand-only [stx any/c] [transparent-macros (listof identifier?)])
-         syntax?]{
-
-  Expands the given syntax @racket[stx], but only shows the expansion
-  of macros whose names occur in @racket[transparent-macros].
-
-  @(examples #:eval the-eval
-             (syntax->datum
-              (expand-only #'(let ([x 1] [y 2]) (or (even? x) (even? y)))
-                           (list #'or))))
-
-}
-
-@defproc[(expand/hide [stx any/c] [hidden-macros (listof identifier?)])
-         syntax?]{
-
-  Expands the given syntax @racket[stx], but hides the expansion of macros in the
-  given identifier list (conceptually, the complement of expand-only).
-
-  @(examples #:eval the-eval
-             (syntax->datum
-              (expand/hide #'(let ([x 1] [y 2]) (or (even? x) (even? y)))
-                           (list #'or))))
-}
-
-@defproc[(expand/show-predicate [stx any/c] [show? (-> identifier? boolean?)])
-         syntax?]{
-
-  Expands the given syntax @racket[stx], but only shows the expansion of macros
-  whose names satisfy the predicate @racket[show?].
-
-  @(examples #:eval the-eval
-             (syntax->datum
-              (expand/show-predicate
-               #'(let ([x 1] [y 2]) (or (even? x) (even? y)))
-               (lambda (id) (memq (syntax-e id) '(or #%app))))))
-}
-
-
-@section{Macro Stepper API for Macros}
-
-@defmodule[macro-debugger/emit]
-
-Macros can explicitly send information to a listening macro stepper by
-using the procedures in this module.
-
-@defproc[(emit-remark [fragment
-                       (letrec ([emit-arg/c
-                                 (recursive-contract
-                                  (or/c string?
-                                        syntax?
-                                        (listof emit-arg/c)
-                                        (-> emit-arg/c)))])
-                         emit-arg/c)] ...
-                      [#:unmark? unmark? boolean? (syntax-transforming?)])
-         void?]{
-
-Emits an event to the macro stepper (if one is listening) containing
-the given strings and syntax objects. The macro stepper displays a
-remark by printing the strings and syntax objects above a rendering of
-the macro's context. The remark is only displayed if the macro that
-emits it is considered transparent by the hiding policy.
-
-By default, syntax objects in remarks have the transformer's mark
-applied (using @racket[syntax-local-introduce]) so that their
-appearance in the macro stepper matches their appearance after the
-transformer returns. Unmarking is suppressed if @racket[unmark?] is
-@racket[#f].
-
-@racketblock[
-(define-syntax (mymac stx)
-  (syntax-case stx ()
-    [(_ x y)
-     (emit-remark "I got some arguments!"
-                  #'x
-                  "and"
-                  #'y)
-     #'(list 'x 'y)]))
-(mymac 37 (+ 1 2))
-]
-
-(Run the fragment above in the macro stepper.)
-}
-
-@defproc[(emit-local-step [before syntax?] [after syntax?]
-                          [#:id id identifier?])
-         void?]{
-
-Emits an event that simulates a local expansion step from
-@racket[before] to @racket[after].
-
-The @racket[id] argument acts as the step's ``macro'' for the purposes
-of macro hiding.
-}
-
-
-@section{Macro Stepper Text Interface}
-
-@defmodule[macro-debugger/stepper-text]
-
-@defproc[(expand/step-text [stx any/c]
-                           [show? (or/c (-> identifier? boolean?)
-                                        (listof identifier?))
-                                  (lambda (x) #t)])
-         void?]{
-
-  Expands the syntax and prints the macro expansion steps. If the
-  identifier predicate is given, it determines which macros are shown
-  (if absent, all macros are shown). A list of identifiers is also
-  accepted.
-
-  @(examples #:eval the-eval
-             (expand/step-text #'(let ([x 1] [y 2]) (or (even? x) (even? y)))
-                               (list #'or))
-             #;(expand/step-text #'(let ([x 1]) (even? x)))
-             #;(expand/step-text #'(let ([x 1] [y 2]) (or (even? x) (even? y)))
-                               (lambda (id) (eq? (syntax-e id) 'or))))
-}
-
-@defproc[(stepper-text [stx any/c]
-                       [show? (or/c (-> identifier? boolean?)
-                                    (listof identifier?))
-                              (lambda (x) #t)])
-         (symbol? -> void?)]{
-
-  Returns a procedure that can be called on the symbol
-  @racket['next] to print the next step or on the symbol
-  @racket['all] to print out all remaining steps.
-}
-
-
-@section{Syntax Browser}
-
-@defmodule[macro-debugger/syntax-browser]
-
-@defproc[(browse-syntax [stx syntax?])
-         void?]{
-
-  Creates a frame with the given syntax object shown. More information
-  on using the GUI is available below.
-}
-
-@defproc[(browse-syntaxes [stxs (listof syntax?)])
-         void?]{
-
-  Like @racket[browse-syntax], but shows multiple syntax objects in
-  the same frame. The coloring partitions are shared between the two,
-  showing the relationships between subterms in different syntax
-  objects.
-}
-
-
-@section{Using the Macro Stepper}
-
-@subsection{Navigation}
-
-The stepper presents expansion as a linear sequence of rewriting
-process, and it gives the user controls to step forward or backwards
-as well as to jump to the beginning or end of the expansion process.
-
-If the macro stepper is showing multiple expansions, then it also
-provides ``Previous term'' and ``Next term'' buttons to go up and down in
-the list of expansions. Horizontal lines delimit the current expansion
-from the others.
-
-@subsection{Macro Hiding}
-
-Macro hiding lets one see how expansion would look if certain macros
-were actually primitive syntactic forms. The macro stepper skips over
-the expansion of the macros you designate as opaque, but it still
-shows the expansion of their subterms.
-
-The bottom panel of the macro stepper controls the macro hiding
-policy. The user changes the policy by selecting an identifier in the
-syntax browser pane and then clicking one of ``Hide module'', ``Hide
-macro'', or ``Show macro''. The new rule appears in the policy display,
-and the user may later remove it using the "Delete" button.
-
-The stepper also offers coarser-grained options that can hide
-collections of modules at once. These options have lower precedence
-than the rules above.
-
-Macro hiding, even with no macros marked opaque, also hides certain
-other kinds of steps: internal defines are not rewritten to letrecs,
-begin forms are not spliced into module or block bodies, etc.
-
-@section{Using the Syntax Browser}
-
-@subsection{Selection}
-
-The selection is indicated by bold text.
-
-The user can click on any part of a subterm to select it. To select a
-parenthesized subterm, click on either of the parentheses. The
-selected syntax is bolded. Since one syntax object may occur inside of
-multiple other syntax objects, clicking on one occurrence will cause
-all occurrences to be bolded.
-
-The syntax browser displays information about the selected syntax
-object in the properties panel on the right, when that panel is
-shown. The selected syntax also determines the highlighting done by
-the secondary partitioning (see below).
-
-@subsection{Primary Partition}
-
-The primary partition is indicated by foreground color.
-
-The primary partitioning always assigns two syntax subterms the same
-color if they have the same marks. In the absence of unhygienic
-macros, this means that subterms with the same foreground color were
-either present in the original pre-expansion syntax or generated by
-the same macro transformation step.
-
-Syntax colored in black always corresponds to unmarked syntax. Such
-syntax may be original, or it may be produced by the expansion of a
-nonhygienic macro.
-
-Note: even terms that have the same marks might not be
-@racket[bound-identifier=?] to each other, because they might occur in
-different environments.
-
-@;@example[(bound-identifier=? (let ([x 1]) #'x) #'x)]
-
-@subsection{Secondary Partitioning}
-
-The user may select a secondary partitioning through the Syntax
-menu. This partitioning applies only to identifiers. When the user
-selects an identifier, all terms in the same equivalence class as the
-selected term are highlighted in yellow.
-
-The available secondary partitionings are:
-@itemize[
-@item{@racket[bound-identifier=?]}
-@item{@racket[free-identifier=?]}
-]
-
-@subsection{Properties}
-
-When the properties pane is shown, it displays properties of the
-selected syntax object. The properties pane has two tabbed pages:
-
-@itemize[
-@item{@bold{Term}:
-
-      If the selection is an identifier, shows the binding information
-      associated with the syntax object. For more information, see
-      @racket[identifier-binding], etc.
-}
-@item{@bold{Syntax Object}:
-
-      Displays source location information and other properties (see
-      @racket[syntax-property]) carried by the syntax object.
-}
-]
-
-@subsection{Interpreting Syntax}
-
-The binding information of a syntax object may not be the same as
-the binding structure of the program it represents. The binding
-structure of a program is only determined after macro expansion is
-complete.
-
-
-@section{Finding Useless @racket[require]s}
-@section-index["useless-requires"]
-
-@defmodule[macro-debugger/analysis/check-requires]
-
-The ``Check Requires'' utility can be run as a raco subcommand. For
-example (from racket root directory):
-
-@commandline{
-raco check-requires racket/collects/syntax/*.rkt
-}
-
-@commandline{
-raco check-requires -kbu openssl
-}
-
-Each argument is interpreted as a file path if it exists; otherwise,
-it is interpreted as a module path. See @racket[check-requires] for a
-description of the output format, known limitations in the script's
-recommendations, etc.
-
-@defproc[(check-requires [module-to-analyze module-path?]
-                         [#:show-keep? show-keep? boolean? #t]
-                         [#:show-bypass? show-bypass? boolean? #t]
-                         [#:show-drop? show-drop? boolean? #t]
-                         [#:show-uses? show-uses? boolean? #f])
-         void?]{
-
-Analyzes @racket[module-to-analyze], detecting useless requires. Each
-module imported by @racket[module-to-analyze] is classified as one of
-KEEP, BYPASS, or DROP. For each required module, one or more lines is
-printed with the module's classification and supporting
-information. Output may be suppressed based on classification via
-@racket[show-keep?], @racket[show-bypass?], and @racket[show-drop?];
-by default, only DROP recommendations are printed.
-
-Modules required @racket[for-label] are not analyzed.
-
-@defoutput[@tt{KEEP @racket[_req-module] at @racket[_req-phase]}]{
-
-  The require of module @racket[_req-module] at phase
-  @racket[_req-phase] must be kept because bindings defined within it
-  are used. 
-
-  If @racket[show-uses?] is true, the dependencies of
-  @racket[module-to-analyze] on @racket[_req-module] are enumerated,
-  one per line, in the following format:
-
-  @defoutput[@tt{@racket[_exp-name] at @racket[_use-phase] (@racket[_mode ...]) [RENAMED TO @racket[_ref-name]]}]{
-
-    Indicates an export named @racket[_exp-name] is used at phase
-    @racket[_use-phase] (not necessarily the phase it was provided at,
-    if @racket[_req-phase] is non-zero). 
-
-    The @racket[_modes] indicate what kind(s) of dependencies were
-    observed: used as a @tt{reference}, appeared in a syntax template
-    (@tt{quote-syntax}), etc.
-
-    If the @tt{RENAMED TO} clause is present, it indicates that the
-    binding is renamed on import into the module, and
-    @racket[_ref-name] gives the local name used (@racket[_exp-name]
-    is the name under which @racket[_req-module] provides the
-    binding).
-  }
-}
-
-@defoutput[@tt{BYPASS @racket[_req-module] at @racket[_req-phase]}]{
-
-  The require is used, but only for bindings that could be more
-  directly obtained via one or more other modules. For example, a use
-  of @racketmodname[racket] might be bypassed in favor of
-  @racketmodname[racket/base], @racketmodname[racket/match], and
-  @racketmodname[racket/contract], etc.
-
-  A list of replacement requires is given, one per line, in the
-  following format:
-
-  @defoutput[@tt{TO @racket[_repl-module] at @racket[_repl-phase] [WITH RENAMING]}]{
-
-    Add a require of @racket[_repl-module] at phase
-    @racket[_repl-phase]. If @racket[show-uses?] is true, then
-    following each @tt{TO} line is an enumeration of the dependencies
-    that would be satisfied by @racket[_repl-module] in the same
-    format as described under @tt{KEEP} below.
-
-    If the @tt{WITH RENAMING} clause is present, it indicates that at
-    least one of the replacement modules provides a binding under a
-    different name from the one used locally in the module. Either the
-    references should be changed or @racket[rename-in] should be used
-    with the replacement modules as necessary.
-  }
-
-  Bypass recommendations are restricted by the following rules:
-  @itemlist[
-
-  @item{@racket[_repl-module] must not involve crossing a new
-    @tt{private} directory from @racket[_req-module]}
-
-  @item{@racket[_repl-module] is never a built-in (``@litchar{#%}'')
-    module}
-
-  @item{@racket[_req-module] must not be in the ``no-bypass''
-    whitelist}
-  ]
-}
-
-@defoutput[@tt{DROP @racket[_req-module] at @racket[_req-phase]}]{
-
-  The require appears to be unused, and it can probably be dropped
-  entirely.
-}
-
-Due to limitations in its implementation strategy,
-@racket[check-requires] occasionally suggests dropping or bypassing a
-module that should not be dropped or bypassed. The following are
-typical reasons for such bad suggestions:
-
-@itemlist[
-
-@item{The module's invocation has side-effects. For example, the
-  module body may update a shared table or perform I/O, or it might
-  transitively require a module that does. (Consider adding the module
-  to the whitelist.)}
-
-@item{Bindings from the module are used in identifier comparisons by a
-  macro, such as appearing in the macro's ``literals list.'' In such
-  cases, a macro should annotate its expansion with the
-  @racket['disappeared-use] property containing the identifier(s)
-  compared with its literals; however, most casually-written macros do
-  not do so. On the other hand, macros and their literal identifiers
-  are typically provided by the same module, so this problem is
-  somewhat uncommon.}
-]
-
-@examples[#:eval the-eval
-(check-requires 'framework)
-(check-requires 'openssl #:show-uses? #t)
-]
-}
-
-@defproc[(show-requires [module-name module-path?])
-         (listof (list/c 'keep   module-path? number?)
-	         (list/c 'bypass module-path? number? list?)
-		 (list/c 'drop   module-path? number?))]{
-
-Like @racket[check-requires], but returns the analysis as a list
-instead of printing it. The procedure
-returns one element per (non-label) require in the following format:
-@itemlist[
-@item{@racket[(list 'keep _req-module _req-phase)]}
-@item{@racket[(list 'bypass _req-module _req-phase _replacements)]}
-@item{@racket[(list 'drop _req-module _req-phase)]}
-]
-
-@examples[#:eval the-eval
-(show-requires 'framework)
-]
-}
-
-
-@section{Showing Module Dependencies}
-@section-index["show-dependencies"]
-
-@defmodule[macro-debugger/analysis/show-dependencies]
-
-The ``Show Dependencies'' utility can be run as a raco subcommand. For
-example (from racket root directory):
-
-@commandline{
-raco show-dependencies -bc racket/collects/openssl/main.rkt
-}
-
-@commandline{
-raco show-dependencies -c --exclude racket openssl
-}
-
-Each argument is interpreted as a file path if it exists; otherwise it
-is interpreted as a module path. See @racket[show-dependencies] for a
-description of the output format.
-
-@defproc[(show-dependencies [root module-path?] ...
-                            [#:exclude exclude
-                             (listof module-path?) null]
-                            [#:exclude-deps exclude-deps
-                             (listof module-path?) null]
-                            [#:show-context? show-context? boolean? #f])
-         void?]{
-
-Computes the set of modules transitively required by the @racket[root]
-module(s). A @racket[root] module is included in the output
-only if it is a dependency of another @racket[root] module. The
-computed dependencies do not include modules reached through
-@racket[dynamic-require] or @racket[lazy-require] or referenced by
-@racket[define-runtime-module-path-index] but do include modules
-referenced by @racket[define-runtime-module-path] (since that
-implicitly creates a @racket[for-label] dependency).
-
-Dependencies are printed, one per line, in the following format:
-
-@defoutput[@tt{@racket[_dep-module] [<- @racket[(_direct-dependent ...)]]}]{
-
-Indicates that @racket[_dep-module] is transitively required by one or
-more @racket[root] modules. If @racket[show-context?] is true, then
-the @racket[_direct-dependent]s are shown; they are the modules
-reachable from (and including) the @racket[root] modules that directly
-require @racket[_dep-module].
-}
-
-The dependencies are trimmed by removing any module reachable from (or
-equal to) a module in @racket[exclude] as well as any module
-reachable from (but not equal to) a module in @racket[exclude-deps].
-
-@examples[#:eval the-eval
-(show-dependencies 'openssl
-                   #:exclude (list 'racket))
-(show-dependencies 'openssl
-                   #:show-context? #t
-                   #:exclude (list 'racket))
-]
-}
-
-@defproc[(get-dependencies [root module-path?] ...
-                           [#:exclude exclude
-                            (listof module-path?) null]
-                           [#:exclude-deps exclude-deps
-                            (listof module-path?) null])
-         (listof (list module-path? (listof module-path?)))]{
-
-Like @racket[show-dependencies], but returns a list instead of
-producing output. Each element of the list is a list containing a
-module path and the module paths of its immediate dependents.
-
-@examples[#:eval the-eval
-(get-dependencies 'openssl #:exclude (list 'racket))
-]
-}
-
-@close-eval[the-eval]
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/model/trace-raw.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/model/trace-raw.rkt
deleted file mode 100644
index 1db8ad0ea6..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/model/trace-raw.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-(require racket/class
-         parser-tools/lex
-         macro-debugger/model/deriv-tokens
-         "../syntax-browser/frame.rkt")
-(provide (all-defined-out))
-
-(define current-expand-observe
-  (dynamic-require ''#%expobs 'current-expand-observe))
-
-(define (go-trace sexpr)
-  (define events null)
-  (define pos 0)
-  (define browser (make-syntax-browser))
-  (define (show sig+val)
-    (define sig (car sig+val))
-    (define val (cdr sig+val))
-    (define t (tokenize sig val pos))
-    (send browser add-text
-          (format "Signal: ~s: ~s\n"
-                  pos
-                  (token-name (position-token-token t))))
-    (when val
-          (send browser add-syntax
-                (datum->syntax #f val)))
-    (set! pos (add1 pos)))
-  (parameterize ((current-expand-observe
-                  (lambda (sig val)
-                    (define t (tokenize sig val pos))
-                    (set! events (cons (cons sig val) events))
-                    #;(show (cons sig val)))))
-    (expand sexpr)
-    (for-each show (reverse events))))
-
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/stepper.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/stepper.rkt
deleted file mode 100644
index bd977b3250..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/stepper.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/contract/base
-         unstable/class-iop
-         macro-debugger/model/trace
-         "view/interfaces.rkt"
-         "view/view.rkt")
-
-(define (create-stepper deriv)
-  (define director (new macro-stepper-director%))
-  (define stepper (send/i director director<%> new-stepper))
-  (send/i director director<%> add-deriv deriv)
-  (void))
-
-(define (expand/step stx)
-  (create-stepper (trace stx)))
-
-(define (expand-module/step module-path)
-  (create-stepper (trace-module module-path)))
-
-(provide/contract
- [expand/step
-  (-> syntax? void?)]
- [expand-module/step
-  (-> module-path? void?)])
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser.rkt
deleted file mode 100644
index 8b879304bf..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require "syntax-browser/frame.rkt")
-(provide browse-syntax
-         browse-syntaxes)
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/controller.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/controller.rkt
deleted file mode 100644
index a9d7a5b036..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/controller.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang racket/base
-(require racket/class
-         unstable/class-iop
-         macro-debugger/syntax-browser/interfaces
-         macro-debugger/syntax-browser/partition
-         unstable/gui/notify)
-(provide controller%)
-
-;; displays-manager-mixin
-(define displays-manager-mixin
-  (mixin () (displays-manager<%>)
-    ;; displays : (list-of display<%>)
-    (field [displays null])
-
-    ;; add-syntax-display : display<%> -> void
-    (define/public (add-syntax-display c)
-      (set! displays (cons c displays)))
-
-    ;; remove-all-syntax-displays : -> void
-    (define/public (remove-all-syntax-displays)
-      (set! displays null))
-
-    (super-new)))
-
-;; selection-manager-mixin
-(define selection-manager-mixin
-  (mixin (displays-manager<%>) (selection-manager<%>)
-    (inherit-field displays)
-    (define-notify selected-syntax (new notify-box% (value #f)))
-
-    (super-new)
-    (listen-selected-syntax
-     (lambda (new-value)
-       (for-each (lambda (display) (send/i display display<%> refresh))
-                 displays)))))
-
-;; mark-manager-mixin
-(define mark-manager-mixin
-  (mixin () (mark-manager<%>)
-    (init-field/i [primary-partition partition<%> (new-bound-partition)])
-    (super-new)
-
-    ;; get-primary-partition : -> partition
-    (define/public-final (get-primary-partition)
-      primary-partition)
-
-    ;; reset-primary-partition : -> void
-    (define/public-final (reset-primary-partition)
-      (set! primary-partition (new-bound-partition)))))
-
-;; secondary-relation-mixin
-(define secondary-relation-mixin
-  (mixin (displays-manager<%>) (secondary-relation<%>)
-    (inherit-field displays)
-    (define-notify identifier=? (new notify-box% (value #f)))
-
-    (listen-identifier=?
-     (lambda (name+proc)
-       (for ([d (in-list displays)])
-         (send/i d display<%> refresh))))
-    (super-new)))
-
-(define controller%
-  (class* (secondary-relation-mixin
-           (selection-manager-mixin
-            (mark-manager-mixin
-             (displays-manager-mixin
-              object%))))
-    (controller<%>)
-    (super-new)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/display.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/display.rkt
deleted file mode 100644
index 02206bcf01..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/display.rkt
+++ /dev/null
@@ -1,418 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/promise
-         data/interval-map
-         framework
-         unstable/class-iop
-         "pretty-printer.rkt"
-         macro-debugger/syntax-browser/interfaces
-         "prefs.rkt"
-         "util.rkt"
-         "../util/logger.rkt")
-(provide print-syntax-to-editor
-         code-style)
-
-(define-syntax-rule (uninterruptible e ...)
-  ;; (coarsely) prevent breaks within editor operations
-  (parameterize-break #f (begin e ...))
-  #|
-  (parameterize-break #f
-    (let ([ta (now)])
-      (begin0 (begin e ...)
-        (let ([tb (now)])
-          (eprintf "****\n")
-          (pretty-write '(begin e ...) (current-error-port))
-          (eprintf "  -- ~s ms\n\n" (- tb ta))))))
-  |#)
-
-(define (now) (current-inexact-milliseconds))
-
-;; FIXME: assumes text never moves
-
-;; print-syntax-to-editor : syntax text controller<%> config number number
-;;                       -> display<%>
-;; Note: must call display<%>::refresh to finish styling.
-(define (print-syntax-to-editor stx text controller config columns
-                                [insertion-point (send text last-position)])
-  (define output-port (open-output-string/count-lines))
-  (define range
-    (with-log-time "** pretty-print-syntax"
-      (pretty-print-syntax stx output-port 
-                           (send/i controller controller<%> get-primary-partition)
-                           (length (send/i config config<%> get-colors))
-                           (send/i config config<%> get-suffix-option)
-                           (send config get-pretty-styles)
-                           columns
-                           (send config get-pretty-abbrev?))))
-  (define output-string (get-output-string output-port))
-  (define output-length (sub1 (string-length output-string))) ;; skip final newline
-  (log-macro-stepper-debug "size of pretty-printed text: ~s" output-length)
-  (with-log-time "fixup-parentheses"
-    (fixup-parentheses output-string range))
-  (with-unlock text
-    (with-log-time "inserting pretty-printed text"
-      (uninterruptible
-       (send text insert output-length output-string insertion-point)))
-    (new display%
-         (text text)
-         (controller controller)
-         (config config)
-         (range range)
-         (start-position insertion-point)
-         (end-position (+ insertion-point output-length)))))
-
-;; display%
-;; Note: must call refresh method to finish styling.
-(define display%
-  (class* object% (display<%>)
-    (init-field/i [controller controller<%>]
-                  [config config<%>]
-                  [range range<%>])
-    (init-field text
-                start-position
-                end-position)
-
-    (define base-style
-      (code-style text (send/i config config<%> get-syntax-font-size)))
-
-    ;; on-next-refresh : (listof (cons stx style-delta))
-    ;; Styles to be applied on next refresh only. (eg, underline)
-    (define on-next-refresh null)
-
-    ;; extra-styles : hash[stx => (listof style-delta)]
-    ;; Styles to be re-applied on every refresh.
-    (define extra-styles (make-hasheq))
-
-    ;; to-undo-styles : (listof (cons nat nat))
-    ;; Ranges to unbold or unhighlight when selection changes.
-    ;; FIXME: ought to be managed by text:region-data (to auto-update ranges)
-    ;;   until then, positions are relative
-    (define to-undo-styles null)
-
-    ;; initialize : -> void
-    (define/private (initialize)
-      (with-log-time "changing base style"
-        (uninterruptible
-         (send text change-style base-style start-position end-position #f)))
-      (with-log-time "applying primary styles"
-        (uninterruptible (apply-primary-partition-styles)))
-      (with-log-time "adding clickbacks"
-        (uninterruptible (add-clickbacks))))
-
-    ;; add-clickbacks : -> void
-    (define/private (add-clickbacks)
-      (define mapping (send text get-region-mapping 'syntax))
-      (define lazy-interval-map-init
-        (delay
-          (with-log-time "forcing clickback mapping"
-           (uninterruptible
-            (for ([range (send/i range range<%> all-ranges)])
-              (let ([stx (range-obj range)]
-                    [start (range-start range)]
-                    [end (range-end range)])
-                (interval-map-set! mapping (+ start-position start) (+ start-position end) stx)))))))
-      (define (the-callback position)
-        (force lazy-interval-map-init)
-        (send/i controller selection-manager<%> set-selected-syntax
-                (interval-map-ref mapping position #f)))
-      (send text set-clickregion start-position end-position the-callback)
-      (send text set-clickregion start-position end-position the-callback 'right-down))
-
-    ;; refresh : -> void
-    ;; Clears all highlighting and reapplies all non-foreground styles.
-    (define/public (refresh)
-      (with-log-time "refresh"
-       (with-unlock text
-        (uninterruptible
-         (let ([undo-select/highlight-d (get-undo-select/highlight-d)])
-           (for ([r (in-list to-undo-styles)])
-             (send text change-style undo-select/highlight-d
-                   (relative->text-position (car r))
-                   (relative->text-position (cdr r)))))
-         (set! to-undo-styles null))
-        (uninterruptible
-         (for ([stx+delta (in-list on-next-refresh)])
-           (for ([r (in-list (send/i range range<%> get-ranges (car stx+delta)))])
-             (restyle-range r (cdr stx+delta) #f)))
-         (set! on-next-refresh null))
-        (uninterruptible
-         (apply-extra-styles))
-        (let ([selected-syntax
-               (send/i controller selection-manager<%>
-                       get-selected-syntax)])
-          (uninterruptible
-           (apply-secondary-relation-styles selected-syntax))
-          (uninterruptible
-           (apply-selection-styles selected-syntax))))))
-
-    ;; get-range : -> range<%>
-    (define/public (get-range) range)
-
-    ;; get-start-position : -> number
-    (define/public (get-start-position) start-position)
-
-    ;; get-end-position : -> number
-    (define/public (get-end-position) end-position)
-
-    ;; highlight-syntaxes : (list-of syntax) string -> void
-    (define/public (highlight-syntaxes stxs hi-color)
-      (let ([delta (highlight-style-delta hi-color)])
-        (for ([stx (in-list stxs)])
-          (hash-set! extra-styles stx
-                     (cons delta (hash-ref extra-styles stx null))))))
-
-    ;; underline-syntaxes : (listof syntax) -> void
-    (define/public (underline-syntaxes stxs)
-      (for ([stx (in-list stxs)])
-        (set! on-next-refresh
-              (cons (cons stx underline-d) on-next-refresh))))
-
-    ;; Primary styles
-    ;; (Done once on initialization, never repeated)
-
-    ;; apply-primary-partition-styles : -> void
-    ;; Changes the foreground color according to the primary partition.
-    ;; Only called once, when the syntax is first drawn.
-    (define/private (apply-primary-partition-styles)
-      (define style-list (send text get-style-list))
-      (define (color-style color)
-        (let ([delta (new style-delta%)])
-          (send delta set-delta-foreground color)
-          (send style-list find-or-create-style base-style delta)))
-      (define color-styles
-        (list->vector
-         (map color-style
-              (map translate-color
-                   (send/i config config<%> get-colors)))))
-      (define overflow-style (color-style (translate-color "darkgray")))
-      (define color-partition
-        (send/i controller mark-manager<%> get-primary-partition))
-      (define offset start-position)
-      ;; Optimization: don't call change-style when new style = old style
-      (let tr*loop ([trs (send/i range range<%> get-treeranges)] [old-style #f])
-        (for ([tr trs])
-          (define stx (treerange-obj tr))
-          (define start (treerange-start tr))
-          (define end (treerange-end tr))
-          (define subs (treerange-subs tr))
-          (define new-style
-            (primary-style stx color-partition color-styles overflow-style))
-          (unless (eq? old-style new-style)
-            (send text change-style new-style (+ offset start) (+ offset end) #f))
-          (tr*loop subs new-style)))
-      (void))
-
-    ;; primary-style : syntax partition (vector-of style-delta%) style-delta%
-    ;;               -> style-delta%
-    (define/private (primary-style stx partition color-vector overflow)
-      (let ([n (send/i partition partition<%> get-partition stx)])
-        (cond [(< n (vector-length color-vector))
-               (vector-ref color-vector n)]
-              [else
-               overflow])))
-
-    ;; Secondary Styling
-    ;; May change in response to user actions
-
-    ;; apply-extra-styles : -> void
-    ;; Applies externally-added styles (such as highlighting)
-    (define/private (apply-extra-styles)
-      (for ([(stx deltas) (in-hash extra-styles)])
-        (for ([r (in-list (send/i range range<%> get-ranges stx))])
-          (for ([delta (in-list deltas)])
-            (restyle-range r delta #t)))))
-
-    ;; apply-selection-styles : syntax -> void
-    ;; Styles subterms eq to the selected syntax
-    (define/private (apply-selection-styles selected-syntax)
-      (for ([r (in-list (send/i range range<%> get-ranges selected-syntax))])
-        (restyle-range r select-d #t)))
-
-    ;; apply-secondary-relation-styles : selected-syntax -> void
-    ;; If the selected syntax is an identifier, then styles all identifiers
-    ;; in the relation with it.
-    (define/private (apply-secondary-relation-styles selected-syntax)
-      (when (identifier? selected-syntax)
-        (let* ([name+relation
-                (send/i controller secondary-relation<%>
-                        get-identifier=?)]
-               [relation (and name+relation (cdr name+relation))]
-               [secondary-highlight-d (get-secondary-highlight-d)])
-          (when relation
-            (for ([id (in-list (send/i range range<%> get-identifier-list))])
-              (when (relation selected-syntax id)
-                (for ([r (in-list (send/i range range<%> get-ranges id))])
-                  (restyle-range r secondary-highlight-d #t))))))))
-
-    ;; restyle-range : (cons num num) style-delta% boolean -> void
-    (define/private (restyle-range r style need-undo?)
-      (when need-undo? (set! to-undo-styles (cons r to-undo-styles)))
-      (send text change-style style
-            (relative->text-position (car r))
-            (relative->text-position (cdr r))))
-
-    ;; relative->text-position : number -> number
-    (define/private (relative->text-position pos)
-      (+ pos start-position))
-
-    ;; Initialize
-    (super-new)
-    (send/i controller controller<%> add-syntax-display this)
-    (initialize)))
-
-;; fixup-parentheses : string range -> void
-(define (fixup-parentheses string range)
-  (for ([r (send/i range range<%> all-ranges)])
-    (let ([stx (range-obj r)]
-          [start (range-start r)]
-          [end (range-end r)])
-      (when (and (syntax? stx) (pair? (syntax-e stx)))
-        (case (syntax-property stx 'paren-shape)
-          ((#\[)
-           (string-set! string start #\[)
-           (string-set! string (sub1 end) #\]))
-          ((#\{) 
-           (string-set! string start #\{)
-           (string-set! string (sub1 end) #\})))))))
-
-(define (open-output-string/count-lines)
-  (let ([os (open-output-string)])
-    (port-count-lines! os)
-    os))
-
-;; code-style : text<%> number/#f -> style<%>
-(define (code-style text font-size)
-  (let* ([style-list (send text get-style-list)]
-         [style (send style-list find-named-style (editor:get-default-color-style-name))])
-    (if font-size
-        (send style-list find-or-create-style
-              style
-              (make-object style-delta% 'change-size font-size))
-        style)))
-
-;; anchor-snip%
-(define anchor-snip%
-  (class snip%
-    (define/override (copy)
-      (make-object string-snip% ""))
-    (super-instantiate ())))
-
-;; Color translation
-
-;; translate-color : color-string -> color%
-(define (translate-color color-string)
-  (let ([c (make-object color% color-string)])
-    (if (pref:invert-colors?)
-        (let-values ([(r* g* b*)
-                      (lightness-invert (send c red) (send c green) (send c blue))])
-          #|
-          (printf "translate: ~s -> ~s\n"
-                  (list (send c red) (send c green) (send c blue))
-                  (list r* g* b*))
-          |#
-          (make-object color% r* g* b*))
-        c)))
-
-;; lightness-invert : uint8 uint8 uint8 -> (values uint8 uint8 uint8)
-(define (lightness-invert r g b)
-  (define (c x)
-    (/ (exact->inexact x) 255.0))
-  (define (d x)
-    (inexact->exact (round (* x 255))))
-  (let-values ([(r g b) (lightness-invert* (c r) (c g) (c b))])
-    (values (d r) (d g) (d b))))
-
-(define (lightness-invert* R G B)
-  (let-values ([(Hp Sl L) (rgb->hsl* R G B)])
-    (hsl*->rgb Hp Sl (- 1.0 L))))
-
-(define (rgb->hsl* R G B)
-  (define M (max R G B))
-  (define m (min R G B))
-  (define C (- M m))
-  (define Hp
-    (cond [(zero? C)
-           ;; Undefined, but use 0
-           0.0]
-          [(= M R)
-           (realmod* (/ (- G B) C) 6)]
-          [(= M G)
-           (+ (/ (- B R) C) 2)]
-          [(= M B)
-           (+ (/ (- R G) C) 4)]))
-  (define L (* 0.5 (+ M m)))
-  (define Sl
-    (cond [(zero? C) 0.0]
-          [(>= L 0.5) (/ C (* 2 L))]
-          [else (/ C (- 2 (* 2 L)))]))
-  
-  (values Hp Sl L))
-
-(define (hsl*->rgb Hp Sl L)
-  (define C
-    (cond [(>= L 0.5) (* 2 L Sl)]
-          [else (* (- 2 (* 2 L)) Sl)]))
-  (define X (* C (- 1 (abs (- (realmod Hp 2) 1)))))
-  (define-values (R1 G1 B1)
-    (cond [(< Hp 1) (values C X 0)]
-          [(< Hp 2) (values X C 0)]
-          [(< Hp 3) (values 0 C X)]
-          [(< Hp 4) (values 0 X C)]
-          [(< Hp 5) (values X 0 C)]
-          [(< Hp 6) (values C 0 X)]))
-  (define m (- L (* 0.5 C)))
-  (values (+ R1 m) (+ G1 m) (+ B1 m)))
-
-;; realmod : real integer -> real
-;; Adjusts a real number to [0, base]
-(define (realmod x base)
-  (define xint (ceiling x))
-  (define m (modulo xint base))
-  (realmod* (- m (- xint x)) base))
-
-;; realmod* : real real -> real
-;; Adjusts a number in [-base, base] to [0,base]
-;; Not a real mod, but faintly reminiscent.
-(define (realmod* x base)
-  (if (negative? x)
-      (+ x base)
-      x))
-
-;; Styles
-
-(define select-d
-  (make-object style-delta% 'change-weight 'bold))
-
-(define underline-d
-  (make-object style-delta% 'change-underline #t))
-
-(define (highlight-style-delta raw-color #:translate-color? [translate-color? #t])
-  (let ([sd (new style-delta%)]
-        [color (if translate-color? (translate-color raw-color) raw-color)])
-    (send sd set-delta-background color)
-    sd))
-
-(define (mk-2-constant-style bow-color [wob-color (translate-color bow-color)])
-  (let ([wob-version (highlight-style-delta wob-color #:translate-color? #f)]
-        [bow-version (highlight-style-delta bow-color #:translate-color? #f)])
-    (λ ()
-      (if (pref:invert-colors?)
-          wob-version
-          bow-version))))
-
-(define get-secondary-highlight-d
-  (mk-2-constant-style "yellow" "darkgoldenrod"))
-
-#|
-(define undo-select-d
-  (make-object style-delta% 'change-weight 'normal))
-(define get-undo-highlight-d
-  (mk-2-constant-style "white" "black"))
-|#
-
-(define (get-undo-select/highlight-d)
-  (let ([sd (make-object style-delta% 'change-weight 'normal)]
-        [bg (if (pref:invert-colors?) "black" "white")])
-    (send sd set-delta-background bg)
-    sd))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/embed.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/embed.rkt
deleted file mode 100644
index f95756cb89..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/embed.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require macro-debugger/syntax-browser/interfaces
-         "widget.rkt"
-         "keymap.rkt"
-         macro-debugger/syntax-browser/partition)
-
-(provide (all-from-out macro-debugger/syntax-browser/interfaces)
-         (all-from-out "widget.rkt")
-         (all-from-out "keymap.rkt")
-         identifier=-choices)
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/frame.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/frame.rkt
deleted file mode 100644
index 2447441c11..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/frame.rkt
+++ /dev/null
@@ -1,97 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         unstable/class-iop
-         macro-debugger/syntax-browser/interfaces
-         macro-debugger/syntax-browser/partition
-         "prefs.rkt"
-         "widget.rkt")
-(provide browse-syntax
-         browse-syntaxes
-         make-syntax-browser
-         syntax-browser-frame%
-         syntax-widget/controls%)
-
-;; browse-syntax : syntax -> void
-(define (browse-syntax stx)
-  (browse-syntaxes (list stx)))
-
-;; browse-syntaxes : (list-of syntax) -> void
-(define (browse-syntaxes stxs)
-  (let ((w (make-syntax-browser)))
-    (for ([stx stxs])
-      (send*/i w syntax-browser<%>
-        (add-syntax stx)
-        (add-separator)))))
-
-;; make-syntax-browser : -> syntax-browser<%>
-(define (make-syntax-browser)
-  (let* ([view (new syntax-browser-frame%)])
-    (send view show #t)
-    (send view get-widget)))
-
-;; syntax-browser-frame%
-(define syntax-browser-frame%
-  (class* frame% ()
-    (inherit get-width
-             get-height)
-    (init-field/i [config config<%> (new syntax-prefs%)])
-    (super-new (label "Syntax Browser")
-               (width (send/i config config<%> get-width))
-               (height (send/i config config<%> get-height)))
-    (define/i widget syntax-browser<%>
-      (new syntax-widget/controls%
-           (parent this)
-           (config config)))
-    (define/public (get-widget) widget)
-    (define/augment (on-close)
-      (send*/i config config<%>
-        (set-width (get-width))
-        (set-height (get-height)))
-      (send widget shutdown)
-      (inner (void) on-close))))
-
-;; syntax-widget/controls%
-(define syntax-widget/controls%
-  (class* widget% ()
-    (inherit get-main-panel
-             get-controller)
-    (super-new)
-    (inherit-field config)
-
-    (define -control-panel 
-      (new horizontal-pane%
-           (parent (get-main-panel))
-           (stretchable-height #f)))
-
-    ;; Put the control panel up front
-    (send (get-main-panel) change-children
-          (lambda (children)
-            (cons -control-panel (remq -control-panel children))))
-
-    (define -identifier=-choices (identifier=-choices))
-    (define -choice
-      (new choice% (label "identifier=?") (parent -control-panel)
-           (choices (map car -identifier=-choices))
-           (callback 
-            (lambda (c e)
-              (send/i (get-controller) controller<%> set-identifier=?
-                     (assoc (send c get-string-selection)
-                            -identifier=-choices))))))
-    (new button% 
-         (label "Clear")
-         (parent -control-panel)
-         (callback (lambda _ (send/i (get-controller) controller<%> set-selected-syntax #f))))
-    (new button%
-         (label "Properties")
-         (parent -control-panel)
-         (callback
-          (lambda _ 
-            (send/i config config<%> set-props-shown? 
-                   (not (send/i config config<%> get-props-shown?))))))
-
-    (send/i (get-controller) controller<%> listen-identifier=?
-           (lambda (name+func)
-             (send -choice set-selection
-                   (or (send -choice find-string (car name+func)) 0))))
-    ))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/hrule-snip.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/hrule-snip.rkt
deleted file mode 100644
index a48d13547e..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/hrule-snip.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base)
-(provide hrule-snip%)
-
-;; hrule-snip%
-;; A snip for drawing horizontal separating lines.
-(define hrule-snip%
-  (class snip%
-    (inherit get-admin)
-    (define/override (get-extent dc x y bw bh bdescent bspace blspace brspace)
-      (let-values [((h) (get-xheight dc))
-                   ((fw fh) (send dc get-size))]
-        (let ([ad-x (box 0)]
-              [ad-y (box 0)])
-          (send (get-admin) get-view-size ad-x ad-y)
-          #;(set-box?! bw fw)
-          (set-box?! bw (max 0 (- (unbox ad-x) (get-xheight dc))))
-          (set-box?! bh h))))
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (let* [(xh (get-xheight dc))
-             (ny (+ y (/ xh 2)))]
-        (send dc draw-line x ny right ny)))
-    (define/private (set-box?! b v)
-      (when (box? b) (set-box! b v)))
-    (define/private (get-xheight dc)
-      (or cached-xheight
-          (let-values [((w h descent extra) (send dc get-text-extent "x"))]
-            (set! cached-xheight h)
-            h)))
-    (define cached-xheight #f)
-
-    ;; Snip methods
-    (define/override (copy)
-      (new hrule-snip%))
-    (define/override (write stream)
-      (void))
-    (inherit set-snipclass)
-    (super-new)
-
-    (set-snipclass snip-class)))
-
-
-(define hrule-snipclass%
-  (class snip-class%
-    (define/override (read stream)
-      (let ([str (send stream get-bytes)])
-        (new hrule-snip%)))
-    (super-new)))
-
-(define snip-class (new hrule-snipclass%))
-(send snip-class set-version 1)
-(send snip-class set-classname
-      (format "~s" '(lib "hrule-snip.rkt" "macro-debugger" "syntax-browser")))
-(send (get-the-snip-class-list) add snip-class)
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/image.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/image.rkt
deleted file mode 100644
index eab4c649f2..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/image.rkt
+++ /dev/null
@@ -1,105 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         racket/class
-         racket/gui/base
-         framework
-         "prefs.rkt"
-         "controller.rkt"
-         "display.rkt"
-         "text.rkt")
-
-#|
-
-Code for generating images that look like the contents of a syntax
-browser, with the same pretty-printing, mark-based coloring,
-suffixing, etc.
-
-TODO: tacked arrows
-
-|#
-
-(provide/contract
- [print-syntax-columns
-  (parameter/c (or/c exact-positive-integer? 'infinity))]
- [print-syntax-to-png
-  (->* (syntax? path-string?)
-       (#:columns (or/c exact-positive-integer? 'infinity))
-       any)]
- [print-syntax-to-bitmap
-  (->* (syntax?)
-       (#:columns (or/c exact-positive-integer? 'infinity))
-       (is-a?/c bitmap%))]
- [print-syntax-to-eps
-  (->* (syntax? path-string?)
-       (#:columns (or/c exact-positive-integer? 'infinity))
-       any)])
-
-;; print-syntax-columns : (parameter-of (U number 'infinity))
-(define print-syntax-columns (make-parameter 40))
-
-;; print-syntax-to-png : syntax path -> void
-(define (print-syntax-to-png stx file
-                             #:columns [columns (print-syntax-columns)])
-  (let ([bmp (print-syntax-to-bitmap stx #:columns columns)])
-    (send bmp save-file file 'png))
-  (void))
-
-;; print-syntax-to-bitmap : syntax -> (is-a?/c bitmap%)
-(define (print-syntax-to-bitmap stx
-                                #:columns [columns (print-syntax-columns)])
-  (define t (prepare-editor stx columns))
-  (define admin (new dummy-admin%))
-  (send t set-admin admin)
-  (define dc (new bitmap-dc% (bitmap (make-object bitmap% 1 1))))
-  (define char-width
-    (let* ([sl (send t get-style-list)]
-           [style (send sl find-named-style (editor:get-default-color-style-name))]
-           [font (send style get-font)])
-      (send dc set-font font)
-      (send dc get-char-width)))
-  (let ([ew (box 0.0)] 
-        [eh (box 0.0)])
-    (send t set-min-width (* columns char-width))
-    (send t get-extent ew eh)
-    (let* ([w (inexact->exact (unbox ew))]
-           [h (inexact->exact (unbox eh))]
-           [bmp (make-object bitmap% w (+ 1 h))]
-           [ps (new ps-setup%)])
-      (send dc set-bitmap bmp)
-      (send dc set-background (make-object color% "White"))
-      (send dc clear)
-      (send ps set-margin 0 0)
-      (send ps set-editor-margin 0 0)
-      (parameterize ((current-ps-setup ps))
-        (send t print-to-dc dc 1))
-      bmp)))
-
-;; print-syntax-to-eps : syntax path -> void
-(define (print-syntax-to-eps stx file
-                             #:columns [columns (print-syntax-columns)])
-  (define t (prepare-editor stx columns))
-  (define ps-setup (new ps-setup%))
-  (send ps-setup set-mode 'file)
-  (send ps-setup set-file file)
-  (send ps-setup set-scaling 1 1)
-  (parameterize ((current-ps-setup ps-setup))
-    (send t print #f #f 'postscript #f #f #t)))
-
-(define (prepare-editor stx columns)
-  (define t (new browser-text%))
-  (define sl (send t get-style-list))
-  (send t change-style (send sl find-named-style (editor:get-default-color-style-name)))
-  (print-syntax-to-editor stx t 
-                          (new controller%) (new syntax-prefs/readonly%)
-                          columns (send t last-position))
-  t)
-
-;; dummy editor-admin
-(define dummy-admin%
-  (class editor-admin%
-    (define the-dc (new bitmap-dc% (bitmap (make-object bitmap% 1 1))))
-    (define/override (get-dc [x #f] [y #f])
-      (when x (set-box! x 0.0))
-      (when y (set-box! y 0.0))
-      the-dc)
-    (super-new)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/keymap.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/keymap.rkt
deleted file mode 100644
index 21d7b6067f..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/keymap.rkt
+++ /dev/null
@@ -1,125 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/pretty
-         unstable/gui/notify
-         macro-debugger/syntax-browser/interfaces)
-(provide syntax-keymap%)
-
-(define keymap/popup%
-  (class* keymap% (keymap/popup<%>)
-    (init editor)
-    (super-new)
-    (inherit add-function
-             map-function
-             chain-to-keymap)
-
-    (define/public (add-context-menu-items menu)
-      (void))
-
-    (map-function "rightbutton" "popup-context-menu")
-    (add-function "popup-context-menu"
-                  (lambda (editor event)
-                    (popup-context-menu editor event)))
-
-    (define/private (popup-context-menu editor event)
-      (define-values (x y)
-        (send editor dc-location-to-editor-location
-              (send event get-x)
-              (send event get-y)))
-      (define admin (send editor get-admin))
-      (define menu (new popup-menu%))
-      (add-context-menu-items menu)
-      (send admin popup-menu menu x y))
-
-    ;; FIXME: move out of constructor to use sites
-    (chain-to-keymap (send editor get-keymap) #t)
-    (send editor set-keymap this)))
-
-(define syntax-keymap%
-  (class keymap/popup%
-    (init-field controller
-                config)
-    (inherit add-function
-             map-function
-             call-function
-             chain-to-keymap)
-    (super-new)
-
-    (define/private (selected-syntax)
-      (send controller get-selected-syntax))
-
-    ;; Functionality
-
-    (add-function "copy-syntax-as-text"
-                  (lambda (_ event)
-                    (define stx (send controller get-selected-syntax))
-                    (when stx
-                      (send the-clipboard set-clipboard-string
-                            (let ([out (open-output-string)])
-                              (pretty-print (syntax->datum stx) out)
-                              (get-output-string out))
-                            (send event get-time-stamp)))))
-
-    (add-function "clear-syntax-selection"
-                  (lambda (i e)
-                    (send controller set-selected-syntax #f)))
-
-    (add-function "show-syntax-properties"
-                  (lambda (i e)
-                    (send config set-props-shown? #t)))
-
-    (add-function "hide-syntax-properties"
-                  (lambda (i e)
-                    (send config set-props-shown? #f)))
-
-    (define ((pretty-print-as sym) i e)
-      (let ([stx (selected-syntax)])
-        (when (identifier? stx)
-          (send config set-pretty-styles
-                (hash-set (send config get-pretty-styles)
-                          (syntax-e stx)
-                          sym)))))
-
-    (define/override (add-context-menu-items menu)
-      (new menu-item% (label "Copy") (parent menu)
-           (demand-callback
-            (lambda (i)
-              (send i enable (and (selected-syntax) #t))))
-           (callback
-            (lambda (i e)
-              (call-function "copy-syntax-as-text" i e))))
-      (new separator-menu-item% (parent menu))
-      (new menu-item%
-           (label "Clear selection")
-           (parent menu)
-           (demand-callback
-            (lambda (i)
-              (send i enable (and (selected-syntax) #t))))
-           (callback 
-            (lambda (i e)
-              (call-function "clear-syntax-selection" i e))))
-      (menu-option/notify-box menu "View syntax properties"
-                              (get-field props-shown? config))
-      (let ([pretty-menu
-             (new menu%
-                  (label "Change layout")
-                  (parent menu)
-                  (demand-callback
-                   (lambda (i)
-                     (send i enable (and (identifier? (selected-syntax)) #t)))))])
-        (for ([sym+desc '((and    "like and")
-                          (begin  "like begin (0 up)")
-                          (lambda "like lambda (1 up)")
-                          (do     "like do (2 up)"))])
-          (new menu-item%
-               (label (format "Format identifier ~a" (cadr sym+desc)))
-               (parent pretty-menu)
-               (demand-callback
-                (lambda (i)
-                  (let ([stx (selected-syntax)])
-                    (when (identifier? stx)
-                      (send i set-label
-                            (format "Format ~s ~a" (syntax-e stx) (cadr sym+desc)))))))
-               (callback
-                (pretty-print-as (car sym+desc)))))))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/prefs.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/prefs.rkt
deleted file mode 100644
index bdeaf1ced8..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/prefs.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang racket/base
-(require racket/class
-         framework/preferences
-         macro-debugger/syntax-browser/interfaces
-         unstable/gui/notify
-         unstable/gui/prefs)
-(provide prefs-base%
-         syntax-prefs-base%
-         syntax-prefs%
-         syntax-prefs/readonly%
-
-         pref:invert-colors?)
-
-(preferences:set-default 'SyntaxBrowser:Width 700 number?)
-(preferences:set-default 'SyntaxBrowser:Height 600 number?)
-(preferences:set-default 'SyntaxBrowser:PropertiesPanelPercentage 1/3 number?)
-(preferences:set-default 'SyntaxBrowser:PropertiesPanelShown #t boolean?)
-(preferences:set-default 'SyntaxBrowser:DrawArrows? #t boolean?)
-
-(define pref:width (pref:get/set 'SyntaxBrowser:Width))
-(define pref:height (pref:get/set 'SyntaxBrowser:Height))
-(define pref:props-percentage (pref:get/set 'SyntaxBrowser:PropertiesPanelPercentage))
-(define pref:props-shown? (pref:get/set 'SyntaxBrowser:PropertiesPanelShown))
-(define pref:draw-arrows? (pref:get/set 'SyntaxBrowser:DrawArrows?))
-
-(define pref:invert-colors? (pref:get/set 'framework:white-on-black?))
-
-(define prefs-base%
-  (class object%
-    ;; suffix-option : SuffixOption
-    (define-notify suffix-option (new notify-box% (value 'over-limit)))
-
-    ;; pretty-abbrev? : boolean
-    (define-notify pretty-abbrev? (new notify-box% (value #t)))
-
-    ;; pretty-styles : ImmutableHash[symbol -> symbol]
-    (define-notify pretty-styles
-      (new notify-box% (value (make-immutable-hasheq null))))
-
-    ;; syntax-font-size : number/#f
-    ;; When non-false, overrides the default font size
-    (define-notify syntax-font-size (new notify-box% (value #f)))
-
-    ;; colors : (listof string)
-    (define-notify colors
-      (new notify-box% (value the-colors)))
-
-    (super-new)))
-
-(define alt-colors
-  '("black"
-    "red"       "blue"           "forestgreen" "purple"       "brown"
-    "firebrick" "darkblue"       "seagreen"    "violetred"    "chocolate"
-    "darkred"   "cornflowerblue" "darkgreen"   "indigo"       "sandybrown"
-    "orange"    "cadetblue"      "olive"       "mediumpurple" "goldenrod"))
-
-(define the-colors
-  '("black" "red" "blue"
-    "mediumforestgreen" "darkgreen" 
-    "darkred"
-    "cornflowerblue" "royalblue" "steelblue" "darkslategray" "darkblue"
-    "indigo" "purple" 
-    "orange" "salmon" "darkgoldenrod" "olive"))
-
-(define syntax-prefs-base%
-  (class* prefs-base% (config<%>)
-    (init readonly?)
-
-    (define-syntax-rule (define-pref-notify* (name pref) ...)
-      (begin (define-notify name (notify-box/pref pref #:readonly? readonly?)) ...))
-
-    (define-pref-notify*
-      (width pref:width)
-      (height pref:height)
-      (props-percentage pref:props-percentage)
-      (props-shown? pref:props-shown?)
-      (draw-arrows? pref:draw-arrows?))
-
-    (super-new)))
-
-(define syntax-prefs%
-  (class syntax-prefs-base%
-    (super-new (readonly? #f))))
-
-(define syntax-prefs/readonly%
-  (class syntax-prefs-base%
-    (super-new (readonly? #t))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/pretty-printer.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/pretty-printer.rkt
deleted file mode 100644
index e2478d376d..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/pretty-printer.rkt
+++ /dev/null
@@ -1,192 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/pretty
-         racket/gui/base
-         racket/promise
-         macro-debugger/syntax-browser/pretty-helper
-         macro-debugger/syntax-browser/interfaces)
-(provide pretty-print-syntax)
-
-;; FIXME: Need to disable printing of structs with custom-write property
-
-;; pretty-print-syntax : syntax port partition number SuffixOption hasheq number bool
-;;                    -> range%
-(define (pretty-print-syntax stx port
-                             primary-partition colors suffix-option styles columns abbrev?)
-  (define range-builder (new range-builder%))
-  (define-values (datum ht:flat=>stx ht:stx=>flat)
-    (syntax->datum/tables stx primary-partition colors suffix-option abbrev?))
-  (define identifier-list
-    (filter identifier? (hash-map ht:stx=>flat (lambda (k v) k))))
-  (define (flat=>stx obj)
-    (hash-ref ht:flat=>stx obj #f))
-  (define (stx=>flat stx)
-    (hash-ref ht:stx=>flat stx))
-  (define (current-position)
-    (let-values ([(line column position) (port-next-location port)])
-      (sub1 position)))
-  (define (pp-pre-hook obj port)
-    (when (flat=>stx obj)
-      (send range-builder push! (current-position)))
-    (send range-builder set-start obj (current-position)))
-  (define (pp-post-hook obj port)
-    (define stx (flat=>stx obj))
-    (when stx
-      (send range-builder pop! stx (current-position)))
-    (let ([start (send range-builder get-start obj)]
-          [end (current-position)])
-      (when (and start stx)
-        (send range-builder add-range stx (cons start end)))))
-
-  (unless (syntax? stx)
-    (raise-type-error 'pretty-print-syntax "syntax" stx))
-  (parameterize 
-   ([pretty-print-pre-print-hook pp-pre-hook]
-    [pretty-print-post-print-hook pp-post-hook]
-    [pretty-print-size-hook pp-size-hook]
-    [pretty-print-print-hook pp-print-hook]
-    [pretty-print-remap-stylable pp-remap-stylable]
-    [pretty-print-abbreviate-read-macros abbrev?]
-    [pretty-print-current-style-table (pp-better-style-table styles)]
-    [pretty-print-columns columns])
-   (pretty-print/defaults datum port)
-   (new range%
-        (range-builder range-builder)
-        (identifier-list identifier-list))))
-
-(define (pp-print-hook obj display-like? port)
-  (cond [(syntax-dummy? obj)
-         ((if display-like? display write) (syntax-dummy-val obj) port)]
-        [(is-a? obj editor-snip%)
-         (write-special obj port)]
-        [else 
-         (error 'pretty-print-hook "unexpected special value: ~e" obj)]))
-
-(define (pp-size-hook obj display-like? port)
-  (cond [(is-a? obj editor-snip%)
-         (pretty-print-columns)]
-        [(syntax-dummy? obj)
-         (let ((ostring (open-output-string)))
-           ((if display-like? display write) (syntax-dummy-val obj) ostring)
-           (string-length (get-output-string ostring)))]
-        [else #f]))
-
-(define (pp-remap-stylable obj)
-  (and (id-syntax-dummy? obj)
-       (let ([remap (id-syntax-dummy-remap obj)])
-         (and (not (memq remap special-expression-keywords))
-              remap))))
-
-(define (pp-better-style-table styles)
-  (define style-list (for/list ([(k v) (in-hash styles)]) (cons k v)))
-  (pretty-print-extend-style-table
-   (basic-style-list)
-   (map car style-list)
-   (map cdr style-list)))
-
-(define (basic-style-list)
-  (pretty-print-extend-style-table
-   (pretty-print-current-style-table)
-   (map car basic-styles)
-   (map cdr basic-styles)))
-(define basic-styles
-  '((define-values          . define)
-    (define-syntaxes        . define-syntax)
-    (define-for-syntax      . define)
-    (define-values-for-syntax . define))
-  #|
-  ;; Messes up formatting too much :(
-  (let* ([pref (pref:tabify)]
-         [table (car pref)]
-         [begin-rx (cadr pref)]
-         [define-rx (caddr pref)]
-         [lambda-rx (cadddr pref)])
-    (let ([style-list (hash-table-map table cons)])
-      (pretty-print-extend-style-table
-       (basic-style-list)
-       (map car style-list)
-       (map cdr style-list))))
-  |#)
-
-(define-local-member-name range:get-ranges)
-
-;; range-builder%
-(define range-builder%
-  (class object%
-    (define starts (make-hasheq))
-    (define ranges (make-hasheq))
-
-    (define/public (set-start obj n)
-      (hash-set! starts obj n))
-
-    (define/public (get-start obj)
-      (hash-ref starts obj #f))
-
-    (define/public (add-range obj range)
-      (hash-set! ranges obj (cons range (get-ranges obj))))
-
-    (define (get-ranges obj)
-      (hash-ref ranges obj null))
-
-    (define/public (range:get-ranges) ranges)
-
-    ;; ----
-
-    (define/public (get-subs)
-      working-subs)
-
-    (define working-start #f)
-    (define working-subs null)
-    (define saved-starts null)
-    (define saved-subss null)
-
-    (define/public (push! start)
-      (set! saved-starts (cons working-start saved-starts))
-      (set! saved-subss (cons working-subs saved-subss))
-      (set! working-start start)
-      (set! working-subs null))
-
-    (define/public (pop! stx end)
-      (define latest (make-treerange stx working-start end (reverse working-subs)))
-      (set! working-start (car saved-starts))
-      (set! working-subs (car saved-subss))
-      (set! saved-starts (cdr saved-starts))
-      (set! saved-subss (cdr saved-subss))
-      (set! working-subs (cons latest working-subs)))
-
-    (super-new)))
-
-;; range%
-(define range%
-  (class* object% (range<%>)
-    (init range-builder)
-    (init-field identifier-list)
-    (super-new)
-
-    (define ranges (hash-copy (send range-builder range:get-ranges)))
-    (define subs (reverse (send range-builder get-subs)))
-
-    (define/public (get-ranges obj)
-      (hash-ref ranges obj null))
-
-    (define/public (get-treeranges)
-      subs)
-
-    (define/public (all-ranges)
-      (force sorted-ranges))
-
-    (define/public (get-identifier-list)
-      identifier-list)
-
-    (define sorted-ranges
-      (delay
-        (sort 
-         (apply append 
-                (hash-map
-                 ranges
-                 (lambda (k vs)
-                   (map (lambda (v) (make-range k (car v) (cdr v))) vs))))
-         (lambda (x y)
-           (>= (- (range-end x) (range-start x))
-               (- (range-end y) (range-start y)))))))
-    ))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/properties.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/properties.rkt
deleted file mode 100644
index b6d022238b..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/properties.rkt
+++ /dev/null
@@ -1,356 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/match
-         racket/gui/base
-         framework
-         unstable/class-iop
-         macro-debugger/syntax-browser/interfaces
-         "util.rkt"
-         macro-debugger/util/mpi
-         macro-debugger/util/stxobj)
-(provide properties-view%
-         properties-snip%)
-
-(define color-text-default-style-name
-  "macro-debugger/syntax-browser/properties color-text% basic")
-
-(define color-text%
-  (class (editor:standard-style-list-mixin text:basic%)
-    (inherit get-style-list)
-    (define/override (default-style-name)
-      color-text-default-style-name)
-    (super-new)
-    (let* ([sl (get-style-list)]
-           [standard
-            (send sl find-named-style (editor:get-default-color-style-name))]
-           [basic
-            (send sl find-or-create-style standard
-                  (make-object style-delta% 'change-family 'default))])
-      (send sl new-named-style color-text-default-style-name basic))))
-
-;; properties-view-base-mixin
-(define properties-view-base-mixin
-  (mixin () ()
-    ;; controller : controller<%>
-    (init-field controller)
-
-    ;; selected-syntax : syntax
-    (field (selected-syntax #f))
-
-    ;; mode : maybe symbol in '(term stxobj)
-    (define mode 'term)
-
-    ;; text : text%
-    (field (text (new color-text%)))
-    (field (pdisplayer (new properties-displayer% (text text))))
-
-    (send/i controller selection-manager<%> listen-selected-syntax
-            (lambda (stx)
-              (set! selected-syntax stx)
-              (refresh)))
-    (super-new)
-
-    ;; get-mode : -> symbol
-    (define/public (get-mode) mode)
-
-    ;; set-mode : symbol -> void
-    (define/public (set-mode m)
-      (set! mode m)
-      (refresh))
-
-    ;; refresh : -> void
-    (define/public (refresh)
-      (with-unlock text
-        (send text erase)
-        (if (syntax? selected-syntax)
-            (refresh/mode mode)
-            (refresh/mode #f)))
-      (send text scroll-to-position 0))
-
-    ;; refresh/mode : symbol -> void
-    (define/public (refresh/mode mode)
-      (case mode
-        ((term) (send pdisplayer display-meaning-info selected-syntax))
-        ((stxobj) (send pdisplayer display-stxobj-info selected-syntax))
-        ((#f) (send pdisplayer display-null-info))
-        (else (error 'properties-view-base:refresh
-                     "internal error: no such mode: ~s" mode))))
-
-    (send text set-styles-sticky #f)
-    #;(send text hide-caret #t)
-    (send text lock #t)
-    (refresh)))
-
-
-;; properties-snip%
-(define properties-snip%
-  (class (properties-view-base-mixin editor-snip%)
-    (inherit-field text)
-    (inherit-field pdisplayer)
-    (inherit set-mode)
-
-    (define/private outer:insert
-      (case-lambda
-       [(obj)
-        (outer:insert obj style:normal)]
-       [(text style)
-        (outer:insert text style #f)]
-       [(text style clickback)
-        (let ([start (send outer-text last-position)])
-          (send outer-text insert text)
-          (let ([end (send outer-text last-position)])
-            (send outer-text change-style style start end #f)
-            (when clickback
-                  (send outer-text set-clickback start end clickback))))]))
-
-    (define outer-text (new text%))
-    (super-new (editor outer-text))
-    (outer:insert "Term" style:hyper (lambda _ (set-mode 'term)))
-    (outer:insert " ")
-    (outer:insert "Syntax Object" style:hyper (lambda _ (set-mode 'stxobj)))
-    (outer:insert "\n")
-    (outer:insert (new editor-snip% (editor text)))
-    (send outer-text hide-caret #t)
-    (send outer-text lock #t)))
-
-;; properties-view%
-(define properties-view%
-  (class* (properties-view-base-mixin object%) ()
-    (init parent)
-    (inherit-field text)
-    (inherit-field pdisplayer)
-    (inherit set-mode)
-
-    ;; get-tab-choices : (listof (cons string thunk))
-    ;; Override to add or remove panels
-    (define/public (get-tab-choices)
-      (list (cons "Term" 'term)
-            (cons "Syntax Object" 'stxobj)))
-
-    (super-new)
-    (define tab-choices (get-tab-choices))
-    (define tab-panel
-      (new tab-panel% 
-           (choices (map car tab-choices))
-           (parent parent)
-           (callback
-            (lambda (tp e)
-              (set-mode (cdr (list-ref tab-choices (send tp get-selection))))))))
-    (define ecanvas (new canvas:color% (editor text) (parent tab-panel)))))
-
-;; properties-displayer%
-(define properties-displayer%
-  (class* object% ()
-    (init-field text)
-
-    ;; display-null-info : -> void
-    (define/public (display-null-info)
-      (display "No syntax selected\n" n/a-sd))
-
-    ;; display-meaning-info : syntax -> void
-    (define/public (display-meaning-info stx)
-      (when (and (identifier? stx)
-                 (uninterned? (syntax-e stx)))
-        (display "Uninterned symbol!\n\n" key-sd))
-      (display-binding-info stx)
-      (display-indirect-binding-info stx))
-
-    ;; display-binding-info : syntax -> void
-    (define/private (display-binding-info stx)
-      (display "Apparent identifier binding\n" key-sd)
-      (display-bindings stx))
-
-    ;; display-indirect-binding-info : syntax -> void
-    (define/private (display-indirect-binding-info stx)
-      (cond
-       [(identifier? stx)
-        (display "Binding if used for #%top\n" key-sd)
-        (display-bindings (datum->syntax stx '#%top))]
-       [(and (syntax? stx) (pair? (syntax-e stx)))
-        (display "Binding if used for #%app\n" key-sd)
-        (display-bindings (datum->syntax stx '#%app))]
-       [else
-        (display "Binding if used for #%datum\n" key-sd)
-        (display-bindings (datum->syntax stx '#%datum))]))
-
-    ;; display-bindings : syntax -> void
-    (define/private (display-bindings stx)
-      (define phases-to-search '(0 1 -1 #f 2 3 4 5 -2 -3 -4 -5))
-      (unless (identifier? stx)
-        (display "Not applicable\n\n" n/a-sd))
-      (when (identifier? stx)
-        (cond [(eq? (identifier-binding stx) 'lexical)
-               (display "lexical (all phases)\n" #f)]
-              [else
-               (let ([bindings (for/hash ([phase (in-list phases-to-search)])
-                                 (values phase (identifier-binding stx phase)))])
-                 (cond [(for/or ([(p b) (in-hash bindings)]) b)
-                        (for ([phase (in-list phases-to-search)])
-                          (display-binding-kvs phase (hash-ref bindings phase #f) stx))]
-                       [else (display "none\n" #f)]))])
-        (display "\n" #f)))
-
-    ;; display-binding-kvs : phase bindinginfo identifier -> void
-    (define/private (display-binding-kvs phase v stx)
-      (when v
-        (display (format "in phase ~a~a:"
-                         phase
-                         (case phase
-                           ((1) " (transformer phase)")
-                           ((-1) " (template phase)")
-                           ((#f) " (label phase)")
-                           (else "")))
-                 sub-key-sd)
-        (display "\n" #f)
-        (match v
-          [(list* def-mpi def-sym imp-mpi imp-sym defined-at-phase _)
-           (display-subkv "  defined in" (mpi->string def-mpi))
-           (unless (eq? def-sym (syntax-e stx))
-             (display-subkv "    as" def-sym))
-           (display-subkv "  imported from" (mpi->string imp-mpi))
-           (unless (eq? imp-sym (syntax-e stx))
-             (display-subkv "    provided as" (list-ref v 3)))
-           (unless (zero? defined-at-phase)
-             (display-subkv "  defined at phase" defined-at-phase))]
-          [_ (void)])))
-
-    ;; display-stxobj-info : syntax -> void
-    (define/public (display-stxobj-info stx)
-      (display-source-info stx)
-      (display-extra-source-info stx)
-      (display-symbol-property-info stx)
-      (display-marks stx)
-      ;; Disable until correct:
-      (when #f (display-taint stx)))
-
-    ;; display-source-info : syntax -> void
-    (define/private (display-source-info stx)
-      (define s-source (syntax-source stx))
-      (define s-line (syntax-line stx))
-      (define s-column (syntax-column stx))
-      (define s-position (syntax-position stx))
-      (define s-span (syntax-span stx))
-      (define s-span-known? (not (memv s-span '(0 #f))))
-      (display "Source location\n" key-sd)
-      (if (or s-source s-line s-column s-position s-span-known?)
-          (begin
-            (display-subkv "source" (prettify-source s-source))
-            (display-subkv "line" s-line)
-            (display-subkv "column" s-column)
-            (display-subkv "position" s-position)
-            (display-subkv "span" s-span))
-          (display "No source location available\n" n/a-sd))
-      (display "\n" #f))
-
-    ;; display-extra-source-info : syntax -> void
-    (define/private (display-extra-source-info stx)
-      (display "Built-in properties\n" key-sd)
-      (display-subkv "source module"
-                     (let ([mod (syntax-source-module stx)])
-                       (and mod (mpi->string mod))))
-      (display-subkv "original?" (syntax-original? stx))
-      (display "\n" #f))
-
-    ;; display-symbol-property-info : syntax -> void
-    (define/private (display-symbol-property-info stx)
-      (let ([keys (syntax-property-symbol-keys stx)])
-        (display "Additional properties\n" key-sd)
-        (when (null? keys)
-          (display "No additional properties available.\n" n/a-sd))
-        (when (pair? keys)
-          (for-each (lambda (k) (display-subkv/value k (syntax-property stx k)))
-                    keys))
-        (display "\n" #f)))
-
-    ;; display-marks : syntax -> void
-    (define/private (display-marks stx)
-      (display "Marks: " key-sd)
-      (display (format "~s\n" (get-marks stx)) #f)
-      (display "\n" #f))
-
-    ;; display-taint : syntax -> void
-    (define/private (display-taint stx)
-      (define (syntax-armed? stx)
-        (syntax-tainted? (datum->syntax stx 'dummy)))
-      (display "Tamper status: " key-sd)
-      (display (cond [(syntax-tainted? stx)
-                      "tainted"]
-                     [(syntax-armed? stx)
-                      "armed"]
-                     [else "clean"])
-               #f))
-
-    ;; display-kv : any any -> void
-    (define/private (display-kv key value)
-      (display (format "~a\n" key) key-sd)
-      (display (format "~s\n\n" value) #f))
-
-    ;; display-subkv : any any -> void
-    (define/public (display-subkv k v)
-      (display (format "~a: " k) sub-key-sd)
-      (display (format "~a\n" v) #f))
-
-    (define/public (display-subkv/value k v)
-      (display-subkv k v)
-      #;
-      (begin
-        (display (format "~a:\n" k) sub-key-sd)
-        (let* ([value-text (new text:standard-style-list% (auto-wrap #t))]
-               [value-snip (new editor-snip% (editor value-text))]
-               [value-port (make-text-port value-text)])
-          (set-interactive-write-handler value-port)
-          (set-interactive-print-handler value-port)
-          (set-interactive-display-handler value-port)
-          (write v value-port)
-          (send value-text lock #t)
-          (send text insert value-snip)
-          (send text insert "\n")
-          #;(send ecanvas add-wide-snip value-snip))))
-
-    ;; display : string style-delta -> void
-    (define/private (display item sd)
-      (let ([p0 (send text last-position)])
-        (send text insert item)
-        (let ([p1 (send text last-position)])
-          (send text change-style sd p0 p1))))
-
-    (super-new)))
-
-
-;; lift/id : (identifier -> void) 'a -> void
-(define (lift/id f)
-  (lambda (stx) (when (identifier? stx) (f stx))))
-
-(define (uninterned? s)
-  (not (eq? s (string->symbol (symbol->string s)))))
-
-(define (prettify-source s)
-  (cond [(is-a? s editor<%>)
-         'editor]
-        [else s]))
-
-;; Styles
-  
-(define key-sd
-  (let ([sd (new style-delta%)])
-    (send sd set-delta-foreground "blue")
-    (send sd set-weight-on 'bold)
-    sd))
-
-(define sub-key-sd
-  (let ([sd (new style-delta%)])
-    (send sd set-delta-foreground "blue")
-    sd))
-
-(define n/a-sd
-  (let ([sd (new style-delta%)])
-    (send sd set-delta-foreground "gray")
-    sd))
-
-(define style:normal (make-object style-delta% 'change-normal))
-
-(define style:hyper
-  (let ([s (make-object style-delta% 'change-normal)])
-    (send s set-delta 'change-toggle-underline)
-    (send s set-delta-foreground "blue")
-    s))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/snip-decorated.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/snip-decorated.rkt
deleted file mode 100644
index 4cbd0bf009..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/snip-decorated.rkt
+++ /dev/null
@@ -1,208 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         (only-in mzlib/string read-from-string)
-         unstable/class-iop
-         macro-debugger/syntax-browser/interfaces
-         "controller.rkt"
-         "properties.rkt"
-         "prefs.rkt"
-         "util.rkt"
-         (except-in "snip.rkt"
-                    snip-class))
-
-(provide decorated-syntax-snip%
-         snip-class)
-
-(define top-aligned
-  (make-object style-delta% 'change-alignment 'top))
-
-(define-struct styled (contents style clickback))
-
-;; clicky-snip%
-(define clicky-snip%
-  (class* editor-snip% ()
-
-    (init-field [open-style '(border)]
-                [closed-style '(tight-text-fit)])
-
-    (inherit set-margin
-             set-inset
-             set-snipclass
-             set-tight-text-fit
-             show-border
-             get-admin)
-
-    (define -outer (new text%))
-    (super-new (editor -outer) (with-border? #f))
-    (set-margin 2 2 2 2)
-    (set-inset 2 2 2 2)
-    ;;(set-margin 3 0 0 0)
-    ;;(set-inset 1 0 0 0)
-    ;;(set-margin 0 0 0 0)
-    ;;(set-inset 0 0 0 0)
-
-    (define/public (closed-contents) null)
-    (define/public (open-contents) null)
-
-    (define open? #f)
-
-    (define/public (refresh-contents)
-      (with-unlock -outer
-        (send -outer erase)
-        (do-style (if open? open-style closed-style))
-        (outer:insert (if open? (hide-icon) (show-icon))
-                      style:hyper
-                      (if open?
-                          (lambda _
-                            (set! open? #f)
-                            (refresh-contents))
-                          (lambda _
-                            (set! open? #t)
-                            (refresh-contents))))
-        (for-each (lambda (s) (outer:insert s))
-                  (if open? (open-contents) (closed-contents)))
-        (send -outer change-style top-aligned 0 (send -outer last-position))))
-
-    (define/private (do-style style)
-      (show-border (memq 'border style))
-      (set-tight-text-fit (memq 'tight-text-fit style)))
-
-    (define/private outer:insert
-      (case-lambda
-       [(obj)
-        (if (styled? obj)
-            (outer:insert (styled-contents obj)
-                          (styled-style obj)
-                          (styled-clickback obj))
-            (outer:insert obj style:normal))]
-       [(text style)
-        (outer:insert text style #f)]
-       [(text style clickback)
-        (let ([start (send -outer last-position)])
-          (send -outer insert text)
-          (let ([end (send -outer last-position)])
-            (send -outer change-style style start end #f)
-            (when clickback
-                  (send -outer set-clickback start end clickback))))]))
-
-    (send -outer hide-caret #t)
-    (send -outer lock #t)
-    (refresh-contents)
-    ))
-
-;; decorated-syntax-snip%
-(define decorated-syntax-snip%
-  (class* clicky-snip% (readable-snip<%>)
-    (init-field ((stx syntax)))
-    (init-field [controller (new controller%)])
-    (init-field [config (new syntax-prefs%)])
-
-    (inherit set-snipclass
-             refresh-contents)
-
-    (define the-syntax-snip
-      (new syntax-snip%
-           (syntax stx)
-           (controller controller)
-           (config config)))
-    (define the-summary
-      (let* ([t (new text%)]
-             [es (new editor-snip% (editor t) (with-border? #f))])
-        (send es set-margin 0 0 0 0)
-        (send es set-inset 0 0 0 0)
-        (send t insert (format "~s" stx))
-        es))
-
-    (define properties-snip
-      (new properties-container-snip%
-           (controller controller)))
-
-    (define/override (closed-contents)
-      (list the-summary))
-
-    (define/override (open-contents)
-      (list " "
-            the-syntax-snip
-            " "
-            properties-snip))
-
-    ;; Snip methods
-    (define/override (copy)
-      (new decorated-syntax-snip%
-           (syntax stx)
-           (controller controller)
-           (config config)))
-    (define/override (write stream)
-      (send stream put
-            (string->bytes/utf-8
-             (format "~s" (marshall-syntax stx)))))
-    (define/public (read-special src line col pos)
-      (send the-syntax-snip read-special src line col pos))
-
-    (send/i config config<%> listen-props-shown?
-            (lambda (?) (refresh-contents)))
-
-    (super-new)
-    (set-snipclass snip-class)
-    ))
-
-(define properties-container-snip%
-  (class clicky-snip%
-    (init controller)
-
-    (define properties-snip
-      (new properties-snip% (controller controller)))
-
-    (define/override (open-contents)
-      (list #;(show-properties-icon)
-            properties-snip))
-
-    (define/override (closed-contents)
-      (list (show-properties-icon)))
-
-    (super-new (open-style '())
-               (closed-style '()))))
-
-(define style:normal (make-object style-delta% 'change-normal))
-(define style:hyper
-  (let ([s (make-object style-delta% 'change-normal)])
-    (send s set-delta 'change-toggle-underline)
-    (send s set-delta-foreground "blue")
-    s))
-(define style:green
-  (let ([s (make-object style-delta% 'change-normal)])
-    (send s set-delta-foreground "darkgreen")
-    s))
-(define style:bold
-  (let ([s (make-object style-delta% 'change-normal)])
-    (send s set-delta 'change-bold)
-    s))
-
-(define (show-icon)
-  (make-object image-snip%
-    (collection-file-path "turn-up.png" "icons")))
-(define (hide-icon)
-  (make-object image-snip%
-    (collection-file-path "turn-down.png" "icons")))
-
-(define (show-properties-icon)
-  (make-object image-snip%
-    (collection-file-path "syncheck.png" "icons")))
-
-
-;; SNIPCLASS
-
-;; COPIED AND MODIFIED from mrlib/syntax-browser.rkt
-(define decorated-syntax-snipclass%
-  (class snip-class%
-    (define/override (read stream)
-      (new decorated-syntax-snip%
-           (syntax (unmarshall-syntax
-                    (read-from-string (send stream get-bytes))))))
-    (super-new)))
-
-(define snip-class (make-object decorated-syntax-snipclass%))
-(send snip-class set-version 2)
-(send snip-class set-classname
-      (format "~s" '(lib "macro-debugger/syntax-browser/snip-decorated.rkt")))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/snip.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/snip.rkt
deleted file mode 100644
index b292ca921a..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/snip.rkt
+++ /dev/null
@@ -1,178 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/match
-         (only-in mzlib/string read-from-string)
-         framework
-         "display.rkt"
-         "controller.rkt"
-         "keymap.rkt"
-         "util.rkt"
-         "text.rkt"
-         "prefs.rkt")
-
-(provide syntax-snip%
-         marshall-syntax
-         unmarshall-syntax
-         snip-class)
-
-;; syntax-snip%
-(define syntax-snip%
-  (class* editor-snip% (readable-snip<%>)
-    (init-field ((stx syntax)))
-    (init-field (controller (new controller%)))
-    (init-field (config (new syntax-prefs/readonly%)))
-    (init-field (columns 40))
-
-    (inherit set-margin
-             set-inset
-             set-snipclass)
-
-    (define text (new browser-text%))
-    (super-new (editor text) (with-border? #f))
-
-    (set-margin 0 0 0 0)
-    ;;(set-inset 2 2 2 2)
-    ;;(set-margin 2 2 2 2)
-    (set-inset 0 0 0 0)
-
-    (define display
-      (with-unlock text
-        (send text change-style (make-object style-delta% 'change-alignment 'top))
-        (print-syntax-to-editor stx text controller config columns)))
-    (send text hide-caret #t)
-
-    (setup-keymap text)
-
-    (define/public (setup-keymap text)
-      (new syntax-keymap%
-           (controller controller)
-           (config config)
-           (editor text)))
-
-    ;; snip% Methods
-    (define/override (copy)
-      (new syntax-snip%
-           (config config)
-           (controller controller)
-           (syntax stx)))
-
-    ;; read-special : any number/#f number/#f number/#f -> syntax
-    ;; Produces 3D syntax to preserve eq-ness of syntax
-    ;; #'#'stx would be lose identity when wrapped
-    (define/public (read-special src line col pos)
-      (with-syntax ([p (lambda () stx)])
-        #'(p)))
-    
-    (define/override (write stream)
-      (send stream put
-            (string->bytes/utf-8
-             (format "~s" (marshall-syntax stx)))))
-
-    (set-snipclass snip-class)))
-
-;; Marshalling stuff
-
-;; marshall-syntax : syntax -> printable
-(define (marshall-syntax stx)
-  (unless (syntax? stx)
-    (error 'marshall-syntax "not syntax: ~s\n" stx))
-  `(syntax
-    (source ,(marshall-object (syntax-source stx)))
-    (source-module ,(marshall-object (syntax-source-module stx)))
-    (position ,(syntax-position stx))
-    (line ,(syntax-line stx))
-    (column ,(syntax-column stx))
-    (span ,(syntax-span stx))
-    (original? ,(syntax-original? stx))
-    (properties 
-     ,@(map (λ (x) `(,x ,(marshall-object (syntax-property stx x))))
-            (syntax-property-symbol-keys stx)))
-    (contents
-     ,(marshall-object (syntax-e stx)))))
-
-;; marshall-object : any -> printable
-;; really only intended for use with marshall-syntax
-(define (marshall-object obj)
-  (cond
-    [(syntax? obj) (marshall-syntax obj)]
-    [(pair? obj) 
-     `(pair ,(cons (marshall-object (car obj))
-                   (marshall-object (cdr obj))))]
-    [(or (symbol? obj)
-         (char? obj)
-         (number? obj)
-         (string? obj)
-         (boolean? obj)
-         (null? obj))
-     `(other ,obj)]
-    [else (string->symbol (format "unknown-object: ~s" obj))]))
-
-(define (unmarshall-syntax stx)
-  (match stx
-    [`(syntax
-       (source ,src)
-       (source-module ,source-module) ;; marshalling
-       (position ,pos)
-       (line ,line)
-       (column ,col)
-       (span ,span)
-       (original? ,original?)
-       (properties . ,properties)
-       (contents ,contents))
-      (foldl
-       add-properties
-       (datum->syntax
-        #'here ;; ack
-        (unmarshall-object contents)
-        (list (unmarshall-object src)
-              line
-              col
-              pos
-              span))
-       properties)]
-    [else #'unknown-syntax-object]))
-
-;; add-properties : syntax any -> syntax
-(define (add-properties prop-spec stx)
-  (match prop-spec
-    [`(,(and sym (? symbol?))
-        ,prop)
-      (syntax-property stx sym (unmarshall-object prop))]
-    [else stx]))
-
-(define (unmarshall-object obj)
-  (let ([unknown (lambda () (string->symbol (format "unknown: ~s" obj)))])
-    (if (and (pair? obj)
-             (symbol? (car obj)))
-        (case (car obj)
-          [(pair) 
-           (if (pair? (cdr obj))
-               (let ([raw-obj (cadr obj)])
-                 (if (pair? raw-obj)
-                     (cons (unmarshall-object (car raw-obj))
-                           (unmarshall-object (cdr raw-obj)))
-                     (unknown)))
-               (unknown))]
-          [(other) 
-           (if (pair? (cdr obj))
-               (cadr obj)
-               (unknown))]
-          [(syntax) (unmarshall-syntax obj)]
-          [else (unknown)])
-        (unknown))))
-
-;; SNIPCLASS
-
-;; COPIED AND MODIFIED from mrlib/syntax-browser.rkt
-(define syntax-snipclass%
-  (class snip-class%
-    (define/override (read stream)
-      (make-object syntax-snip%
-        (unmarshall-syntax (read-from-string (send stream get-bytes)))))
-    (super-instantiate ())))
-
-(define snip-class (new syntax-snipclass%))
-(send snip-class set-version 2)
-(send snip-class set-classname
-      (format "~s" '(lib "macro-debugger/syntax-browser/snip.rkt")))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/text.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/text.rkt
deleted file mode 100644
index 57ea784c44..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/text.rkt
+++ /dev/null
@@ -1,475 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         data/interval-map
-         unstable/arrow
-         framework
-         data/interval-map
-         macro-debugger/syntax-browser/interfaces)
-
-(provide text:hover<%>
-         text:hover-drawings<%>
-         text:arrows<%>
-
-         text:hover-mixin
-         text:hover-drawings-mixin
-         text:tacking-mixin
-         text:arrows-mixin
-         text:region-data-mixin
-         text:clickregion-mixin
-         browser-text%)
-
-(define arrow-cursor (make-object cursor% 'arrow))
-
-(define arrow-brush
-  (send the-brush-list find-or-create-brush "white" 'solid))
-(define (tacked-arrow-brush color)
-  (send the-brush-list find-or-create-brush color 'solid))
-
-(define billboard-brush
-  (send the-brush-list find-or-create-brush "white" 'solid))
-
-(define white (send the-color-database find-color "white"))
-
-;; A Drawing is (make-drawing (??? -> void) (box boolean))
-(define-struct drawing (draw tacked?))
-
-(define-struct idloc (start end id))
-
-(define (mean x y)
-  (/ (+ x y) 2))
-
-;; save+restore pen, brush, also smoothing
-(define-syntax with-saved-pen&brush
-  (syntax-rules ()
-    [(with-saved-pen&brush dc . body)
-     (save-pen&brush dc (lambda () . body))]))
-
-(define (save-pen&brush dc thunk)
-  (let ([old-pen (send dc get-pen)]
-        [old-brush (send dc get-brush)]
-        [old-smoothing (send dc get-smoothing)])
-    (begin0 (thunk)
-      (send* dc
-        (set-pen old-pen)
-        (set-brush old-brush)
-        (set-smoothing old-smoothing)))))
-
-(define-syntax with-saved-text-config
-  (syntax-rules ()
-    [(with-saved-text-config dc . body)
-     (save-text-config dc (lambda () . body))]))
-
-(define (save-text-config dc thunk)
-  (let ([old-font (send dc get-font)]
-        [old-color (send dc get-text-foreground)]
-        [old-background (send dc get-text-background)]
-        [old-mode (send dc get-text-mode)])
-    (begin0 (thunk)
-      (send* dc
-        (set-font old-font)
-        (set-text-foreground old-color)
-        (set-text-background old-background)
-        (set-text-mode old-mode)))))
-
-;; Interfaces
-
-(define text:region-data<%>
-  (interface (text:basic<%>)
-    get-region-mapping))
-
-(define text:hover<%>
-  (interface (text:basic<%>)
-    update-hover-position))
-
-(define text:hover-drawings<%>
-  (interface (text:basic<%>)
-    add-hover-drawing
-    get-position-drawings))
-
-(define text:arrows<%>
-  (interface (text:hover-drawings<%>)
-    add-arrow
-    add-billboard))
-
-;; Mixins
-
-(define text:region-data-mixin
-  (mixin (text:basic<%>) (text:region-data<%>)
-
-    (define table (make-hasheq))
-
-    (define/public (get-region-mapping key)
-      (hash-ref! table key (lambda () (make-interval-map))))
-
-    (define/augment (after-delete start len)
-      (for ([im (in-hash-values table)])
-        (interval-map-contract! im start (+ start len)))
-      (inner (void) after-delete start len))
-
-    (define/augment (after-insert start len)
-      (for ([im (in-hash-values table)])
-        (interval-map-expand! im start (+ start len)))
-      (inner (void) after-insert start len))
-
-    (super-new)))
-
-(define text:hover-mixin
-  (mixin (text:basic<%>) (text:hover<%>)
-    (inherit dc-location-to-editor-location
-             find-position)
-
-    (define/override (on-default-event ev)
-      (super on-default-event ev)
-      (case (send ev get-event-type)
-        ((enter motion leave)
-         (define-values (x y)
-           (let ([gx (send ev get-x)]
-                 [gy (send ev get-y)])
-             (dc-location-to-editor-location gx gy)))
-         (define on-it? (box #f))
-         (define pos (find-position x y #f on-it?))
-         (update-hover-position (and (unbox on-it?) pos)))))
-
-    (define/public (update-hover-position pos)
-      (void))
-
-    (super-new)))
-
-(define text:hover-drawings-mixin
-  (mixin (text:hover<%> text:region-data<%>) (text:hover-drawings<%>)
-    (inherit dc-location-to-editor-location
-             find-position
-             invalidate-bitmap-cache
-             get-region-mapping)
-    (super-new)
-
-    ;; interval-map of Drawings
-    (define drawings-list (get-region-mapping 'hover-drawings))
-
-    (field [hover-position #f])
-
-    (define/override (update-hover-position pos)
-      (define old-pos hover-position)
-      (super update-hover-position pos)
-      (set! hover-position pos)
-      (unless (same-drawings? old-pos pos)
-        (invalidate-bitmap-cache 0.0 0.0 +inf.0 +inf.0)))
-
-    (define/public (add-hover-drawing start end draw [tack-box (box #f)])
-      (let ([drawing (make-drawing draw tack-box)])
-        (interval-map-cons*! drawings-list
-                             start (add1 end)
-                             drawing
-                             null)))
-
-    (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-      (super on-paint before? dc left top right bottom dx dy draw-caret)
-      (unless before?
-        (for ([d (get-position-drawings hover-position)])
-          ((drawing-draw d) this dc left top right bottom dx dy))))
-
-    (define/public (get-position-drawings pos)
-      (if pos (interval-map-ref drawings-list pos null) null))
-
-    (define/private (same-drawings? old-pos pos)
-      ;; relies on order drawings added & list-of-eq?-struct equality
-      (equal? (get-position-drawings old-pos)
-              (get-position-drawings pos)))))
-
-(define text:tacking-mixin
-  (mixin (text:basic<%> text:hover-drawings<%>) ()
-    (inherit get-canvas
-             get-keymap
-             get-position-drawings)
-    (inherit-field hover-position)
-    (super-new)
-
-    (define tacked-table (make-hasheq))
-
-    (define/override (on-local-event ev)
-      (case (send ev get-event-type)
-        ((right-down)
-         (if (pair? (get-position-drawings hover-position))
-             (send (get-canvas) popup-menu
-                   (make-tack/untack-menu (get-position-drawings hover-position))
-                   (send ev get-x)
-                   (send ev get-y))
-             (super on-local-event ev)))
-        (else
-         (super on-local-event ev))))
-
-    ;; Clear tacked-table on any modification.
-    ;; FIXME: possible to be more precise? (but not needed for macro stepper)
-    (define/augment (after-delete start len)
-      (set! tacked-table (make-hasheq))
-      (inner (void) after-delete start len))
-    (define/augment (after-insert start len)
-      (set! tacked-table (make-hasheq))
-      (inner (void) after-insert start len))
-
-    (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-      (super on-paint before? dc left top right bottom dx dy draw-caret)
-      (unless before?
-        (for ([draw (in-hash-keys tacked-table)])
-          (draw this dc left top right bottom dx dy))))
-
-    (define/private (make-tack/untack-menu drawings)
-      (define menu (new popup-menu%))
-      (define keymap (get-keymap))
-      (define tack-item
-        (new menu-item% (label "Tack")
-             (parent menu)
-             (callback (lambda _ (tack drawings)))))
-      (define untack-item
-        (new menu-item% (label "Untack")
-             (parent menu)
-             (callback (lambda _ (untack drawings)))))
-      (send tack-item enable
-            (for/or ([d (in-list drawings)]) (not (unbox (drawing-tacked? d)))))
-      (send untack-item enable
-            (for/or ([d (in-list drawings)]) (unbox (drawing-tacked? d))))
-      (when (is-a? keymap keymap/popup<%>)
-        (new separator-menu-item% (parent menu))
-        (send keymap add-context-menu-items menu))
-      menu)
-
-    (define/private (tack drawings)
-      (for ([d (in-list drawings)])
-        (hash-set! tacked-table (drawing-draw d) #t)
-        (set-box! (drawing-tacked? d) #t)))
-    (define/private (untack drawings)
-      (for ([d (in-list drawings)])
-        (hash-remove! tacked-table (drawing-draw d))
-        (set-box! (drawing-tacked? d) #f)))))
-
-(define text:arrows-mixin
-  (mixin (text:hover-drawings<%>) (text:arrows<%>)
-    (inherit position-location
-             add-hover-drawing
-             find-wordbreak)
-
-    (define/public (add-billboard pos1 pos2 str color-name)
-      (define color (send the-color-database find-color color-name))
-      (let ([draw 
-             (lambda (text dc left top right bottom dx dy)
-               (let-values ([(x y) (range->mean-loc pos1 pos1)]
-                            [(fw fh _d _v) (send dc get-text-extent "y")])
-                 (with-saved-pen&brush dc
-                   (with-saved-text-config dc
-                     (send* dc
-                       (set-pen color 1 'solid)
-                       (set-brush billboard-brush)
-                       (set-text-mode 'solid)
-                       (set-font (billboard-font dc))
-                       (set-text-foreground color))
-                     (let-values ([(w h d v) (send dc get-text-extent str)]
-                                  [(adj-y) fh]
-                                  [(mini) _d])
-                       (send* dc
-                         (set-smoothing 'smoothed)
-                         (draw-rounded-rectangle
-                          (+ x dx)
-                          (+ y dy adj-y)
-                          (+ w mini mini)
-                          (+ h mini mini))
-                         (draw-text str (+ x dx mini) (+ y dy mini adj-y))))))))])
-        (add-hover-drawing pos1 pos2 draw)))
-
-    (define/public (add-arrow from1 from2 to1 to2 color-name label where)
-      (define color (send the-color-database find-color color-name))
-      (define tack-box (box #f))
-      (unless (and (= from1 to1) (= from2 to2))
-        (let ([draw 
-               (lambda (text dc left top right bottom dx dy)
-                 (let-values ([(startx starty) (range->mean-loc from1 from2)]
-                              [(endx endy) (range->mean-loc to1 to2)]
-                              [(fw fh _d _v) (send dc get-text-extent "x")]
-                              [(lw lh ld _V) (send dc get-text-extent (or label "x"))])
-                   (with-saved-pen&brush dc
-                     (with-saved-text-config dc
-                       (send dc set-pen color 1 'solid)
-                       (send dc set-brush
-                             (if (unbox tack-box)
-                                 (tacked-arrow-brush color)
-                                 arrow-brush))
-                       (draw-arrow dc startx
-                                   (+ starty (/ fh 2))
-                                   endx
-                                   (+ endy (/ fh 2))
-                                   dx dy)
-                       (when label
-                         (let* ([lx (+ endx dx fw)]
-                                [ly (- (+ endy dy) fh)])
-                           (send* dc
-                             (set-brush billboard-brush)
-                             (set-font (billboard-font dc))
-                             (set-text-foreground color)
-                             (set-smoothing 'smoothed)
-                             (draw-rounded-rectangle (- lx ld) (- ly ld)
-                                                     (+ lw ld ld) (+ lh ld ld))
-                             (draw-text label lx ly))))))))])
-          (add-hover-drawing from1 from2 draw tack-box)
-          (add-hover-drawing to1 to2 draw tack-box))))
-
-    (define/private (position->location p)
-      (define xbox (box 0.0))
-      (define ybox (box 0.0))
-      (position-location p xbox ybox)
-      (values (unbox xbox) (unbox ybox)))
-
-    (define/private (?-font dc)
-      (let ([size (send (send dc get-font) get-point-size)])
-        (send the-font-list find-or-create-font size 'default 'normal 'bold)))
-
-    (define/private (billboard-font dc)
-      (let ([size (send (send dc get-font) get-point-size)])
-        (send the-font-list find-or-create-font size 'default 'normal)))
-
-    (define/private (range->mean-loc pos1 pos2)
-      (let*-values ([(loc1x loc1y) (position->location pos1)]
-                    [(loc2x loc2y) (position->location pos2)]
-                    [(locx) (mean loc1x loc2x)]
-                    [(locy) (mean loc1y loc2y)])
-        (values locx locy)))
-
-    (super-new)))
-
-#|
-text:clickregion-mixin
-
-Like clickbacks, but:
-  - use interval-map to avoid linear search
-    (major problem w/ macro stepper and large expansions!)
-  - callback takes position of click, not (start, end)
-  - different rules for removal
-  - TODO: extend to double-click
-|#
-(define text:clickregion-mixin
-  (mixin (text:region-data<%>) ()
-    (inherit get-admin
-             get-region-mapping
-             dc-location-to-editor-location
-             find-position)
-
-    (super-new)
-
-    ;; Two mappings: one for left clicks, another for right
-    ;; mouse-downs.  Rationale: macro stepper wants to handle left
-    ;; clicks normally, but wants to insert behavior (ie, change
-    ;; focus) before normal processing of right-down (ie, editor
-    ;; passes to keymap, opens popup menu).
-    (define clickbacks (get-region-mapping 'click-region))
-    (define right-clickbacks (get-region-mapping 'right-click-region))
-    (define tracking #f)
-
-    (define/public (set-clickregion start end callback [region 'click])
-      (let ([mapping
-             (case region
-               ((click) clickbacks)
-               ((right-down) right-clickbacks)
-               (else (error 'set-clickregion
-                            "bad region symbol: expected 'click or 'right-down, got ~e"
-                            region)))])
-        (if callback
-            (interval-map-set! mapping start end callback)
-            (interval-map-remove! mapping start end))))
-
-    (define/private (get-event-position ev)
-      (define-values (x y)
-        (let ([gx (send ev get-x)]
-              [gy (send ev get-y)])
-          (dc-location-to-editor-location gx gy)))
-      (define on-it? (box #f))
-      (define pos (find-position x y #f on-it?))
-      (and (unbox on-it?) pos))
-
-    ;; on-default-event called if keymap does not handle event
-    (define/override (on-default-event ev)
-      (define admin (get-admin))
-      (when admin
-        (define pos (get-event-position ev))
-        (case (send ev get-event-type)
-          ((left-down)
-           (set! tracking (and pos (interval-map-ref clickbacks pos #f)))
-           (send admin update-cursor))
-          ((left-up)
-           (when tracking
-             (let ([cb (and pos (interval-map-ref clickbacks pos #f))]
-                   [tracking* tracking])
-               (set! tracking #f)
-               (when (eq? tracking* cb)
-                 (cb pos)))
-             (send admin update-cursor)))))
-      (super on-default-event ev))
-
-    ;; on-local-event called before keymap consulted
-    (define/override (on-local-event ev)
-      (case (send ev get-event-type)
-        ((right-down)
-         (when (get-admin)
-           (define pos (get-event-position ev))
-           (let ([cb (and pos (interval-map-ref right-clickbacks pos #f))])
-             (when cb (cb pos))))))
-      (super on-local-event ev))
-
-    (define/override (adjust-cursor ev)
-      (define pos (get-event-position ev))
-      (define cb (and pos (interval-map-ref clickbacks pos #f)))
-      (if cb
-          arrow-cursor
-          (super adjust-cursor ev)))))
-
-
-#|
-(define text:hover-identifier<%>
-  (interface ()
-    get-hovered-identifier
-    set-hovered-identifier
-    listen-hovered-identifier))
-
-(define text:hover-identifier-mixin
-  (mixin (text:hover<%>) (text:hover-identifier<%>)
-    (define-notify hovered-identifier (new notify-box% (value #f)))
-
-    (define idlocs null)
-
-    (define/public (add-identifier-location start end id)
-      (set! idlocs (cons (make-idloc start end id) idlocs)))
-
-    (define/public (delete-all-identifier-locations)
-      (set! idlocs null)
-      (set-hovered-identifier #f))
-
-    (define/override (update-hover-position pos)
-      (super update-hover-position pos)
-      (let search ([idlocs idlocs])
-        (cond [(null? idlocs) (set-hovered-identifier #f)]
-              [(and (<= (idloc-start (car idlocs)) pos)
-                    (< pos (idloc-end (car idlocs))))
-               (set-hovered-identifier (idloc-id (car idlocs)))]
-              [else (search (cdr idlocs))])))
-    (super-new)))
-|#
-
-
-(define browser-text%
-  (let ([browser-text-default-style-name "widget.rkt::browser-text% basic"])
-    (class (text:clickregion-mixin
-            (text:arrows-mixin
-             (text:tacking-mixin
-              (text:hover-drawings-mixin
-               (text:hover-mixin
-                (text:region-data-mixin
-                 (text:hide-caret/selection-mixin
-                  (text:foreground-color-mixin
-                   (editor:standard-style-list-mixin text:basic%)))))))))
-      (inherit set-autowrap-bitmap get-style-list)
-      (define/override (default-style-name) browser-text-default-style-name)
-      (super-new (auto-wrap #t))
-      (let* ([sl (get-style-list)]
-             [standard (send sl find-named-style (editor:get-default-color-style-name))]
-             [browser-basic (send sl find-or-create-style standard
-                                  (make-object style-delta% 'change-family 'default))])
-        (send sl new-named-style browser-text-default-style-name browser-basic))
-      (set-autowrap-bitmap #f))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/util.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/util.rkt
deleted file mode 100644
index 2efd494c00..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/util.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-(require racket/class)
-(provide with-unlock
-         make-text-port)
-
-;; with-unlock SYNTAX (expression)
-;; (with-unlock text-expression . body)
-(define-syntax with-unlock
-  (syntax-rules ()
-    [(with-unlock text . body)
-     (let* ([t text]
-            [locked? (send t is-locked?)])
-       (dynamic-wind
-         (lambda ()
-           (send* t
-             (begin-edit-sequence #f)
-             (lock #f)))
-         (lambda () . body)
-         (lambda ()
-           (send* t
-             (lock locked?)
-             (end-edit-sequence)))))]))
-
-;; make-text-port : text (-> number) -> port
-;; builds a port from a text object.  
-(define (make-text-port text end-position)
-  (make-output-port #f
-                    always-evt
-                    (lambda (s start end flush? enable-break?)
-                      (send text insert
-                            (bytes->string/utf-8 s #f start end)
-                            (end-position))
-                      (- end start))
-                    void
-                    (lambda (special buffer? enable-break?)
-                      (send text insert special (end-position))
-                      #t)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/widget.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/widget.rkt
deleted file mode 100644
index 09288a11e3..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/widget.rkt
+++ /dev/null
@@ -1,269 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/match
-         framework
-         syntax/id-table
-         unstable/class-iop
-         macro-debugger/syntax-browser/interfaces
-         "controller.rkt"
-         "display.rkt"
-         "keymap.rkt"
-         "hrule-snip.rkt"
-         "properties.rkt"
-         "text.rkt"
-         "util.rkt"
-         macro-debugger/util/eomap
-         macro-debugger/util/logger
-         macro-debugger/util/mpi)
-(provide widget%)
-
-;; widget%
-;; A syntax widget creates its own syntax-controller.
-(define widget%
-  (class* object% (syntax-browser<%> widget-hooks<%>)
-    (init parent)
-    (init-field config)
-
-    (field [controller (new controller%)])
-
-    (define -main-panel
-      (new vertical-panel% (parent parent)))
-    (define -split-panel
-      (new panel:horizontal-dragable% (parent -main-panel)))
-    (define -text (new browser-text%))
-    (define -ecanvas
-      (new canvas:color% (parent -split-panel) (editor -text)))
-    (define -props-panel
-      (new horizontal-panel% (parent -split-panel) (style '(deleted))))
-    (define props
-      (new properties-view%
-           (parent -props-panel)
-           (controller controller)))
-
-    (define/public (setup-keymap)
-      (new syntax-keymap% 
-           (editor -text)
-           (controller controller)
-           (config config)))
-
-    (send -text set-styles-sticky #f)
-    (send -text lock #t)
-
-    (define/public (show-props show?)
-      (internal-show-props show?))
-
-    (define saved-props-percentage #f)
-
-    (define/private (internal-show-props show?)
-      (if show?
-          (unless (send -props-panel is-shown?)
-            (send -split-panel begin-container-sequence)
-            (let ([p (or saved-props-percentage
-                         (send/i config config<%> get-props-percentage))])
-              (send -split-panel add-child -props-panel)
-              (update-props-percentage p))
-            (send -props-panel show #t)
-            (send -split-panel end-container-sequence))
-          (when (send -props-panel is-shown?)
-            (send -split-panel begin-container-sequence)
-            (set! saved-props-percentage
-                  (cadr (send -split-panel get-percentages)))
-            (send -split-panel delete-child -props-panel)
-            (send -props-panel show #f)
-            (send -split-panel end-container-sequence))))
-
-    (define/private (update-props-percentage p)
-      (send -split-panel set-percentages
-            (list (- 1 p) p)))
-
-    (define/private (props-panel-shown?)
-      (send -props-panel is-shown?))
-
-    ;;
-
-    (define/public (get-controller)
-      controller)
-
-    ;;
-
-    (define/public (get-main-panel)
-      -main-panel)
-
-    (define/public (shutdown)
-      (when (props-panel-shown?)
-        (send/i config config<%> set-props-percentage
-               (cadr (send -split-panel get-percentages)))))
-
-    ;; syntax-browser<%> Methods
-
-    (define/public (add-text text)
-      (with-unlock -text
-        (send -text insert text)))
-
-    (define/public (add-error-text text)
-      (with-unlock -text
-        (let ([a (send -text last-position)])
-          (send -text insert text)
-          (let ([b (send -text last-position)])
-            (send -text change-style error-text-style a b)))))
-
-    (define/public (add-clickback text handler)
-      (with-unlock -text
-        (let ([a (send -text last-position)])
-          (send -text insert text)
-          (let ([b (send -text last-position)])
-            (send -text set-clickback a b handler)
-            (send -text change-style clickback-style a b)))))
-
-    (define/public (add-syntax stx
-                               #:binders [binders '#hash()]
-                               #:shift-table [shift-table '#hash()]
-                               #:definites [definites #f]
-                               #:hi-colors [hi-colors null]
-                               #:hi-stxss [hi-stxss null]
-                               #:substitutions [substitutions null])
-      (define (get-shifted id) (hash-ref shift-table id null))
-
-      (with-unlock -text
-        (define display
-          (print-syntax-to-editor stx -text controller config
-                                  (calculate-columns)
-                                  (send -text last-position)))
-        (send -text insert "\n")
-        (define range (send/i display display<%> get-range))
-        (define offset (send/i display display<%> get-start-position))
-        (with-log-time "substitutions"
-         (for ([subst (in-list substitutions)])
-           (for ([r (in-list (send/i range range<%> get-ranges (car subst)))])
-             (send -text insert (cdr subst)
-                   (+ offset (car r))
-                   (+ offset (cdr r))
-                   #f)
-             (send -text change-style
-                   (code-style -text (send/i config config<%> get-syntax-font-size))
-                   (+ offset (car r))
-                   (+ offset (cdr r))
-                   #f))))
-        ;; Apply highlighting
-        (with-log-time "highlights"
-         (for ([hi-stxs (in-list hi-stxss)] [hi-color (in-list hi-colors)])
-           (send/i display display<%> highlight-syntaxes hi-stxs hi-color)))
-        ;; Underline binders (and shifted binders)
-        (with-log-time "underline binders"
-         (send/i display display<%> underline-syntaxes
-                 (let ([binder-list (hash-map binders (lambda (k v) k))])
-                   (append (apply append (map get-shifted binder-list))
-                           binder-list))))
-        (send display refresh)
-
-        ;; Make arrows (& billboards, when enabled)
-        (with-log-time "add arrows"
-         (when (send config get-draw-arrows?)
-          (define (definite-phase id)
-            (and definites
-                 (or (eomap-ref definites id #f)
-                     (for/or ([shifted (in-list (hash-ref shift-table id null))])
-                       (eomap-ref definites shifted #f)))))
-
-          (define phase-binder-table (make-hash))
-          (define (get-binder-table phase)
-            (hash-ref! phase-binder-table phase (lambda () (make-free-id-table #:phase phase))))
-          (for ([(binder phase) (in-hash binders)])
-            (free-id-table-set! (get-binder-table phase) binder binder))
-
-          (define (get-binders id phase)
-            (define (for-one-table table id)
-              (let ([binder (free-id-table-ref table id #f)])
-                (cond [(not binder) null]
-                      [shift-table (cons binder (get-shifted binder))]
-                      [else (list binder)])))
-            (cond [phase (for-one-table (get-binder-table phase) id)]
-                  [else
-                   (apply append
-                          (for/list ([table (in-hash-values phase-binder-table)])
-                            (for-one-table table id)))]))
-
-          (for ([id (in-list (send/i range range<%> get-identifier-list))])
-            (define phase (definite-phase id))
-            (when #f ;; DISABLED
-              (add-binding-billboard offset range id phase))
-            (for ([binder (in-list (get-binders id phase))])
-              (for ([binder-r (in-list (send/i range range<%> get-ranges binder))])
-                (for ([id-r (in-list (send/i range range<%> get-ranges id))])
-                  (add-binding-arrow offset binder-r id-r phase)))))))
-        (void)))
-
-    (define/private (add-binding-arrow start binder-r id-r phase)
-      ;; phase = #f means not definite binding (ie, "?" arrow)
-      (send -text add-arrow
-            (+ start (car binder-r))
-            (+ start (cdr binder-r))
-            (+ start (car id-r))
-            (+ start (cdr id-r))
-            (if phase "blue" "purple")
-            (cond [(equal? phase 0) #f]
-                  [phase (format "phase ~s" phase)]
-                  [else "?"])
-            (if phase 'end 'start)))
-
-    (define/private (add-binding-billboard start range id definite?)
-      (match (identifier-binding id)
-        [(list-rest src-mod src-name nom-mod nom-name _)
-         (for ([id-r (in-list (send/i range range<%> get-ranges id))])
-           (send -text add-billboard
-                 (+ start (car id-r))
-                 (+ start (cdr id-r))
-                 (string-append "from " (mpi->string src-mod))
-                 (if definite? "blue" "purple")))]
-        [_ (void)]))
-
-    (define/public (add-separator)
-      (with-unlock -text
-        (send* -text
-          (insert (new hrule-snip%))
-          (insert "\n"))))
-
-    (define/public (erase-all)
-      (with-unlock -text
-        (send -text erase))
-      (send/i controller displays-manager<%> remove-all-syntax-displays))
-
-    (define/public (get-text) -text)
-
-    (define/private (calculate-columns)
-      (define style (code-style -text (send/i config config<%> get-syntax-font-size)))
-      (define char-width (send style get-text-width (send -ecanvas get-dc)))
-      #|
-      (define-values (canvas-w canvas-h) (send -ecanvas get-client-size))
-      (sub1 (inexact->exact (floor (/ canvas-w char-width))))
-      |#
-      (let ([admin (send -text get-admin)]
-            [w-box (box 0.0)])
-        (send admin get-view #f #f w-box #f)
-        (sub1 (inexact->exact (floor (/ (unbox w-box) char-width))))))
-
-    ;; Initialize
-    (super-new)
-    (setup-keymap)
-
-    (send/i config config<%> listen-props-shown?
-           (lambda (show?)
-             (show-props show?)))
-    (send/i config config<%> listen-props-percentage
-           (lambda (p)
-             (update-props-percentage p)))
-    (internal-show-props (send/i config config<%> get-props-shown?))))
-
-
-(define clickback-style
-  (let ([sd (new style-delta%)])
-    (send sd set-delta 'change-toggle-underline)
-    (send sd set-delta-foreground "blue")
-    sd))
-
-(define error-text-style
-  (let ([sd (new style-delta%)])
-    (send sd set-delta 'change-italic)
-    (send sd set-delta-foreground "red")
-    sd))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/tests/test-docs-complete.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/tests/test-docs-complete.rkt
deleted file mode 100644
index b328a0634c..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote macro-debugger/syntax-browser))
-(check-docs (quote macro-debugger/stepper))
-(check-docs (quote macro-debugger/stepper-text))
-(check-docs (quote macro-debugger/expand))
-(check-docs (quote macro-debugger/emit))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/util/logger.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/util/logger.rkt
deleted file mode 100644
index 32a3f2d4ba..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/util/logger.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(require racket/format)
-(provide (all-defined-out))
-
-(define-logger macro-stepper)
-
-(define (log-macro-stepper-time task msecs)
-  (log-macro-stepper-debug
-   (format "time for ~a: ~ams" task (~r msecs #:precision 0))))
-
-(define-syntax-rule (with-log-time task body ...)
-  (let ([time1 (current-inexact-milliseconds)])
-    (begin0 (begin body ...)
-      (let ([time2 (current-inexact-milliseconds)])
-        (log-macro-stepper-time task (- time2 time1))))))
-
-(define-syntax-rule (splicing-with-log-time task body ...)
-  (begin (define time1 (current-inexact-milliseconds))
-         body ...
-         (define time2 (current-inexact-milliseconds))
-         (define-values ()
-           (begin0 (values)
-             (log-macro-stepper-time task (- time2 time1))))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/cursor.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/cursor.rkt
deleted file mode 100644
index 080c1ec7a8..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/cursor.rkt
+++ /dev/null
@@ -1,133 +0,0 @@
-#lang racket/base
-(provide cursor?
-         cursor-position
-         cursor:new
-         cursor:add-to-end!
-         cursor:remove-current!
-
-         cursor:next
-         cursor:prev
-
-         cursor:at-start?
-         cursor:at-end?
-
-         cursor:has-next?
-         cursor:has-prev?
-
-         cursor:move-next
-         cursor:move-prev
-         cursor:move-to-start
-         cursor:move-to-end
-         cursor:skip-to
-
-         cursor->list
-         cursor:prefix->list
-         cursor:suffix->list
-         cursor-count)
-
-(define-struct cursor (vector count position)
-  #:mutable)
-
-(define (cursor:ensure-capacity c capacity)
-  (define v (cursor-vector c))
-  (when (< (vector-length v) capacity)
-    (let* ([new-capacity (ceiling (* capacity 3/2))]
-           [new-v (make-vector new-capacity)])
-      (vector-copy! new-v 0 v 0)
-      (set-cursor-vector! c new-v))))
-
-(define (cursor:new items)
-  (define v (list->vector items))
-  (make-cursor v (vector-length v) 0))
-
-(define (cursor:add-to-end! c items)
-  (define count0 (cursor-count c))
-  (define items-vector (list->vector items))
-  (cursor:ensure-capacity c (+ (cursor-count c) (length items)))
-  (vector-copy! (cursor-vector c) count0 items-vector)
-  (set-cursor-count! c (+ (cursor-count c) (vector-length items-vector))))
-
-(define (cursor:remove-current! c)
-  (cursor:remove-at! c (cursor-position c)))
-
-(define (cursor:remove-at! c p)
-  (define count (cursor-count c))
-  (define v (cursor-vector c))
-  (vector-copy! v p v (add1 p))
-  (vector-set! v (sub1 count) #f)
-  (set-cursor-count! c (sub1 count)))
-
-(define (cursor:next c)
-  (define p (cursor-position c))
-  (define count (cursor-count c))
-  (and (< p count)
-       (vector-ref (cursor-vector c) p)))
-
-(define (cursor:prev c)
-  (define p (cursor-position c))
-  (define count (cursor-count c))
-  (and (< 0 p)
-       (vector-ref (cursor-vector c) (sub1 p))))
-
-
-(define (cursor:move-next c)
-  (define p (cursor-position c))
-  (define count (cursor-count c))
-  (when (< p count)
-    (set-cursor-position! c (add1 p))))
-
-(define (cursor:move-prev c)
-  (define p (cursor-position c))
-  (define count (cursor-count c))
-  (when (< 0 p)
-    (set-cursor-position! c (sub1 p))))
-
-(define (cursor:at-start? c)
-  (= (cursor-position c) 0))
-
-(define (cursor:at-end? c)
-  (= (cursor-position c) (cursor-count c)))
-
-(define (cursor:has-next? c)
-  (not (cursor:at-end? c)))
-
-(define (cursor:has-prev? c)
-  (not (cursor:at-start? c)))
-
-(define (cursor:move-to-start c)
-  (set-cursor-position! c 0))
-
-(define (cursor:move-to-end c)
-  (set-cursor-position! c (cursor-count c)))
-
-(define (cursor:skip-to c i)
-  (when (<= 0 i (cursor-count c))
-    (set-cursor-position! c i)))
-
-(define (cursor->list c)
-  (define count (cursor-count c))
-  (define v (cursor-vector c))
-  (let loop ([i 0])
-    (if (< i count)
-        (cons (vector-ref v i)
-              (loop (add1 i)))
-        null)))
-
-(define (cursor:prefix->list c)
-  (define position (cursor-position c))
-  (define v (cursor-vector c))
-  (let loop ([i 0])
-    (if (< i position)
-        (cons (vector-ref v i)
-              (loop (add1 i)))
-        null)))
-
-(define (cursor:suffix->list c)
-  (define position (cursor-position c))
-  (define count (cursor-count c))
-  (define v (cursor-vector c))
-  (let loop ([i position])
-    (if (< i count)
-        (cons (vector-ref v i)
-              (loop (add1 i)))
-        null)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/debug.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/debug.rkt
deleted file mode 100644
index 209c23a86e..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/debug.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-(require racket/pretty
-         racket/class
-         unstable/class-iop
-         "interfaces.rkt"
-         macro-debugger/view/debug-format
-         "view.rkt")
-(provide debug-file)
-
-(define (widget-mixin %)
-  (class %
-    (define/override (top-interaction-kw? x)
-      (eq? (syntax-e x) '#%top-interaction))
-    (super-new)))
-
-(define stepper-frame%
-  (class macro-stepper-frame%
-    (define/override (get-macro-stepper-widget%)
-      (widget-mixin (super get-macro-stepper-widget%)))
-    (super-new)))
-
-(define (make-stepper)
-  (define director (new macro-stepper-director%))
-  (send director new-stepper))
-
-(define (debug-file file)
-  (let-values ([(events msg ctx) (load-debug-file file)])
-    (pretty-print msg)
-    (pretty-print ctx)
-    (let* ([w (make-stepper)])
-      (send/i w widget<%> add-trace events)
-      w)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/extensions.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/extensions.rkt
deleted file mode 100644
index dd88116188..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/extensions.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         unstable/class-iop
-         "interfaces.rkt"
-         (prefix-in s: "../syntax-browser/widget.rkt")
-         (prefix-in s: "../syntax-browser/keymap.rkt"))
-(provide stepper-keymap%
-         stepper-syntax-widget%)
-
-;; Extensions
-
-(define stepper-keymap%
-  (class s:syntax-keymap%
-    (init-field/i (macro-stepper widget<%>))
-    (inherit-field config
-                   controller)
-    (inherit add-function
-             map-function
-             call-function)
-
-    (define show-macro #f)
-    (define hide-macro #f)
-
-    (super-new)
-
-    (define/public (get-hiding-panel)
-      (send/i macro-stepper widget<%> get-macro-hiding-prefs))
-
-    (map-function ":s" "hiding:show-macro")
-    (map-function ":h" "hiding:hide-macro")
-
-    (add-function "hiding:show-macro"
-                  (lambda (i e)
-                    (send*/i (get-hiding-panel) hiding-prefs<%>
-                      (add-show-identifier)
-                      (refresh))))
-
-    (add-function "hiding:hide-macro"
-                  (lambda (i e)
-                    (send*/i (get-hiding-panel) hiding-prefs<%>
-                      (add-hide-identifier)
-                      (refresh))))
-
-    ;; Menu
-
-    (define/override (add-context-menu-items menu)
-      (super add-context-menu-items menu)
-      (new separator-menu-item% (parent menu))
-      (new menu-item% (label "Show selected identifier") (parent menu)
-           (demand-callback
-            (lambda (i)
-              (send i enable (identifier? (send controller get-selected-syntax)))))
-           (callback
-            (lambda (i e)
-              (call-function "hiding:show-macro" i e))))
-      (new menu-item% (label "Hide selected identifier") (parent menu)
-           (demand-callback
-            (lambda (i)
-              (send i enable (identifier? (send controller get-selected-syntax)))))
-           (callback
-            (lambda (i e) (call-function "hiding:hide-macro" i e)))))))
-
-
-(define stepper-syntax-widget%
-  (class s:widget%
-    (init-field/i (macro-stepper widget<%>))
-    (inherit get-text)
-    (inherit-field controller)
-
-    (define/override (setup-keymap)
-      (new stepper-keymap%
-           (editor (get-text))
-           (config (send/i macro-stepper widget<%> get-config))
-           (controller controller)
-           (macro-stepper macro-stepper)))
-
-    (define/override (show-props show?)
-      (super show-props show?)
-      (when (send (send/i macro-stepper widget<%> get-config) get-refresh-on-resize?)
-        (send/i macro-stepper widget<%> update/preserve-view)))
-
-    (super-new
-     (config (send/i macro-stepper widget<%> get-config)))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/frame.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/frame.rkt
deleted file mode 100644
index 65eda3c29b..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/frame.rkt
+++ /dev/null
@@ -1,279 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/path
-         racket/gui/base
-         framework
-         unstable/class-iop
-         "interfaces.rkt"
-         "stepper.rkt"
-         (prefix-in sb: "../syntax-browser/embed.rkt")
-	 (prefix-in sb: macro-debugger/syntax-browser/interfaces)
-         unstable/gui/notify)
-(provide macro-stepper-frame-mixin)
-
-(define-syntax override/return-false
-  (syntax-rules ()
-    [(override/return-false m ...)
-     (begin (define/override (m) #f) ...)]))
-
-(define (macro-stepper-frame-mixin base-frame%)
-  (class* base-frame% (stepper-frame<%>)
-    (init-field config)
-    (init-field director)
-    (init-field (filename #f))
-
-    (define obsoleted? #f)
-
-    (inherit get-area-container
-             get-size
-             set-label
-             get-menu%
-             get-menu-item%
-             get-menu-bar
-             get-file-menu
-             get-edit-menu
-             get-help-menu)
-
-    (super-new (label (make-label))
-               (width (send/i config config<%> get-width))
-               (height (send/i config config<%> get-height)))
-
-    (define/private (make-label)
-      (if filename
-          (string-append (path->string
-                          (file-name-from-path filename))
-                         (if obsoleted? " (old)" "")
-                         " - Macro stepper")
-          "Macro stepper"))
-
-    ;; Grrr... we get a spurious on-size event sometime after the
-    ;; frame is created, probably when the window-manager gets around
-    ;; to doing something. Avoid unnecessary updates.
-    (define-values (w0 h0) (get-size))
-    (define/override (on-size w h)
-      (send/i config config<%> set-width w)
-      (send/i config config<%> set-height h)
-      (unless (and (= w0 w) (= h0 h))
-        (when (send/i config config<%> get-refresh-on-resize?)
-          (send/i widget widget<%> update/preserve-view)))
-      (set!-values (w0 h0) (values w h)))
-
-    (define warning-panel
-      (new horizontal-panel%
-           (parent (get-area-container))
-           (stretchable-height #f)
-           (style '(deleted))))
-
-    (define/public (get-macro-stepper-widget%)
-      macro-stepper-widget%)
-
-    (define/i widget widget<%>
-      (new (get-macro-stepper-widget%)
-           (parent (get-area-container))
-           (director director)
-           (config config)))
-    (define/i controller sb:controller<%>
-      (send/i widget widget<%> get-controller))
-
-    (define/public (get-widget) widget)
-    (define/public (get-controller) controller)
-
-    (define/public (add-obsoleted-warning)
-      (unless obsoleted?
-        (set! obsoleted? #t)
-        (new warning-canvas%
-             (warning
-              (string-append
-               "Warning: This macro stepper session is obsolete. "
-               "The program may have changed."))
-             (parent warning-panel))
-        (set-label (make-label))
-        (send (get-area-container) change-children
-              (lambda (children)
-                (cons warning-panel
-                      (remq warning-panel children))))))
-
-    ;; Set up menus
-
-    (override/return-false file-menu:create-new?
-                           file-menu:create-open?
-                           file-menu:create-open-recent?
-                           file-menu:create-revert?
-                           file-menu:create-save?
-                           file-menu:create-save-as?
-                           ;file-menu:create-print?
-                           edit-menu:create-undo?
-                           edit-menu:create-redo?
-                           ;edit-menu:create-cut?
-                           ;edit-menu:create-paste?
-                           edit-menu:create-clear?)
-
-    (define stepper-menu
-      (new (get-menu%) (parent (get-menu-bar)) (label "Stepper")))
-
-    (define/override (file-menu:between-save-as-and-print file-menu)
-      (super file-menu:between-save-as-and-print file-menu)
-      (new separator-menu-item% (parent file-menu))
-      (new (get-menu-item%)
-           (label "Duplicate stepper")
-           (parent file-menu)
-           (callback (lambda _ (send/i widget widget<%> duplicate-stepper))))
-      (new (get-menu-item%)
-           (label "Duplicate stepper (current term only)")
-           (parent file-menu)
-           (callback (lambda _ (send/i widget widget<%> show-in-new-frame))))
-      (new separator-menu-item% (parent file-menu)))
-
-    (menu-option/notify-box stepper-menu
-                            "View syntax properties"
-                            (get-field props-shown? config))
-
-    (let ([id-menu
-           (new (get-menu%)
-                (label "Identifier=?")
-                (parent stepper-menu))])
-      (for-each (lambda (p)
-                  (let ([this-choice
-                         (new checkable-menu-item%
-                              (label (car p)) 
-                              (parent id-menu)
-                              (callback
-                               (lambda _ 
-                                 (send/i controller sb:controller<%> set-identifier=? p))))])
-                    (send/i controller sb:controller<%> listen-identifier=?
-                           (lambda (name+func)
-                             (send this-choice check
-                                   (eq? (car name+func) (car p)))))))
-                (sb:identifier=-choices)))
-
-    (let ([identifier=? (send/i config config<%> get-identifier=?)])
-      (when identifier=?
-        (let ([p (assoc identifier=? (sb:identifier=-choices))])
-          (send/i controller sb:controller<%> set-identifier=? p))))
-
-    (new (get-menu-item%)
-         (label "Clear selection")
-         (parent stepper-menu)
-         (callback
-          (lambda _ (send/i controller sb:controller<%> 
-			   set-selected-syntax #f))))
-
-    (new separator-menu-item% (parent stepper-menu))
-
-    (menu-option/notify-box stepper-menu
-                            "Show macro hiding panel"
-                            (get-field show-hiding-panel? config))
-
-    (new (get-menu-item%)
-         (label "Remove selected term")
-         (parent stepper-menu)
-         (callback (lambda _ (send/i widget widget<%> remove-current-term))))
-    (new (get-menu-item%)
-         (label "Reset mark numbering")
-         (parent stepper-menu)
-         (callback (lambda _ (send/i widget widget<%> reset-primary-partition))))
-    (let ([extras-menu
-           (new (get-menu%)
-                (label "Extra options")
-                (parent stepper-menu))])
-      (new checkable-menu-item%
-           (label "Always suffix marked identifiers")
-           (parent extras-menu)
-           (callback
-            (lambda (i e)
-              (send/i config config<%> set-suffix-option
-                     (if (send i is-checked?)
-                         'always
-                         'over-limit))
-              (send/i widget widget<%> update/preserve-view))))
-      (menu-option/notify-box extras-menu
-                              "Factor out common context?"
-                              (get-field split-context? config))
-      (menu-option/notify-box extras-menu
-                              "Highlight redex/contractum"
-                              (get-field highlight-foci? config))
-      #|
-      (menu-option/notify-box extras-menu
-                              "Highlight frontier"
-                              (get-field highlight-frontier? config))
-      |#
-      (menu-option/notify-box extras-menu
-                              "Include renaming steps"
-                              (get-field show-rename-steps? config))
-      (menu-option/notify-box extras-menu
-                              "One term at a time"
-                              (get-field one-by-one? config))
-      (menu-option/notify-box extras-menu
-                              "Refresh on resize"
-                              (get-field refresh-on-resize? config))
-      (menu-option/notify-box extras-menu
-                              "Close old stepper on Run"
-                              (get-field close-on-reset-console? config))
-      (menu-option/notify-box extras-menu
-                              "Draw binding arrows"
-                              (get-field draw-arrows? config))
-      (menu-option/notify-box extras-menu
-                              "Enable reader abbreviations"
-                              (get-field pretty-abbrev? config))
-      (menu-option/notify-box extras-menu
-                              "Extra navigation"
-                              (get-field extra-navigation? config)))
-
-    ;; fixup-menu : menu -> void
-    ;; Delete separators at beginning/end and duplicates in middle
-    (define/private (fixup-menu menu)
-      (define items
-        (filter (lambda (i) (not (send i is-deleted?)))
-                (send menu get-items)))
-      (define (delete-seps-loop items)
-        (if (and (pair? items) (is-a? (car items) separator-menu-item%))
-            (begin (send (car items) delete)
-                   (delete-seps-loop (cdr items)))
-            items))
-      (define (middle-loop items)
-        (cond
-         [(and (pair? items) (is-a? (car items) separator-menu-item%))
-          (middle-loop (delete-seps-loop (cdr items)))]
-         [(pair? items)
-          (middle-loop (cdr items))]
-         [else null]))
-      (middle-loop (delete-seps-loop items))
-      (delete-seps-loop (reverse items))
-      (void))
-
-    (for ([menu (send (get-menu-bar) get-items)])
-      (fixup-menu menu))
-    (frame:remove-empty-menus this)
-    (frame:reorder-menus this)))
-
-;; Stolen from stepper
-
-(define warning-color "yellow")
-(define warning-font normal-control-font)
-
-(define warning-canvas%
-  (class canvas%
-    (init-field warning)
-    (inherit get-dc get-client-size)
-    (define/override (on-paint)
-      (let ([dc (get-dc)])
-        (send dc set-font warning-font) 
-        (let-values ([(cw ch) (get-client-size)]
-                     [(tw th dont-care dont-care2) 
-                      (send dc get-text-extent warning)])
-          (send dc set-pen 
-                (send the-pen-list find-or-create-pen warning-color 1 'solid))
-          (send dc set-brush
-                (send the-brush-list find-or-create-brush warning-color 'solid))
-          (send dc draw-rectangle 0 0 cw ch)
-          (send dc draw-text 
-                warning
-                (- (/ cw 2) (/ tw 2))
-                (- (/ ch 2) (/ th 2))))))
-    (super-new)
-    (inherit min-width min-height stretchable-height)
-    (let-values ([(tw th dc dc2)
-                  (send (get-dc) get-text-extent warning warning-font)])
-      (min-width (+ 2 (inexact->exact (ceiling tw))))
-      (min-height (+ 2 (inexact->exact (ceiling th)))))
-    (stretchable-height #f)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/gui-util.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/gui-util.rkt
deleted file mode 100644
index 096719469b..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/gui-util.rkt
+++ /dev/null
@@ -1,105 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base)
-(provide status-area%)
-
-(define FADE-DELAY 1000)
-(define NAP-TIME 0.01)
-
-(define status-area%
-  (class* object% (#| status-area<%> |#)
-    (init parent
-          stop-callback)
-
-    (define lock (make-semaphore 1))
-
-    (define-syntax-rule (with-lock . body)
-      (dynamic-wind (lambda () (yield lock))
-                    (lambda () . body)
-                    (lambda () (semaphore-post lock))))
-
-    (define timer (new timer% (notify-callback (lambda () (fade-out)))))
-
-    (define pane
-      (new horizontal-pane%
-           (parent parent)
-           (stretchable-height #f)))
-    (define message
-      (new message%
-           (parent pane)
-           (label "")
-           (auto-resize #t)
-           (stretchable-width #t)
-           (style '(deleted))))
-    (define stop-button
-      (new button%
-           (parent pane)
-           (label "Stop")
-           (enabled #f)
-           (callback stop-callback)
-           (style '(deleted))))
-
-    (define visible? #t)
-
-    (define/public (set-visible new-visible?)
-      (with-lock
-       (set! visible? new-visible?)
-       (show (memq state '(shown fade)))))
-
-    #|
-    Three states:
-      - 'none    = no message displayed
-      - 'shown   = message displayed
-      - 'fade    = message displayed, waiting to erase
-
-    Timer is only started during 'fade state.
-    |#
-    (define state 'none)
-
-    (define/private (show ?)
-      (send pane change-children
-            (lambda _
-              (if (and ? visible?)
-                  (list message stop-button)
-                  null))))
-
-    (define/public (set-status msg)
-      (with-lock
-       (cond [msg
-              (case state
-                ((none)
-                 (send message set-label msg)
-                 (send message enable #t)
-                 (show #t)
-                 (set! state 'shown))
-                ((shown)
-                 (send message set-label msg))
-                ((fade)
-                 (send timer stop) ;; but (update) may already be waiting
-                 (send message set-label msg)
-                 (send message enable #t)
-                 (set! state 'shown)))]
-             [(not msg)
-              (case state
-                ((shown)
-                 (send timer start FADE-DELAY #t)
-                 (send message enable #f)
-                 (set! state 'fade)))])))
-
-    (define/private (fade-out)
-      (with-lock (fade-out*)))
-
-    (define/private (fade-out*)
-      (case state
-        ((fade)
-         (show #f)
-         (send message set-label "")
-         (set! state 'none))
-        (else
-         ;; timer not stopped in time; do nothing
-         (void))))
-
-    (define/public (enable-stop ?)
-      (send stop-button enable ?))
-
-    (super-new)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/hiding-panel.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/hiding-panel.rkt
deleted file mode 100644
index ed54805bbf..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/hiding-panel.rkt
+++ /dev/null
@@ -1,339 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/match
-         unstable/class-iop
-         "interfaces.rkt"
-         macro-debugger/model/hiding-policies
-         macro-debugger/util/mpi
-         unstable/gui/notify)
-(provide macro-hiding-prefs-widget%)
-
-(define mode:disable "Disable")
-(define mode:standard "Standard")
-(define mode:custom "Custom ...")
-
-#|
-
-TODO
-
- - allow entry of more policies
- - visual feedback on rules applying to selected identifier
-   (need to switch from list to editor)
-
-|#
-
-;; macro-hiding-prefs-widget%
-(define macro-hiding-prefs-widget%
-  (class* object% (hiding-prefs<%>)
-    (init parent)
-    (init-field/i (stepper widget<%>))
-    (init-field config)
-
-    (define/public (get-policy)
-      (let ([mode (get-mode)])
-        (cond [(not (macro-hiding-enabled?)) #f]
-              [(equal? mode mode:standard) standard-policy]
-              [(equal? mode mode:custom) (get-custom-policy)])))
-
-    (define/private (get-custom-policy)
-      (let ([hide-racket? (send box:hide-racket get-value)]
-            [hide-libs? (send box:hide-libs get-value)]
-            [hide-contracts? (send box:hide-contracts get-value)]
-            [hide-transformers? (send box:hide-phase1 get-value)]
-            [specialized-policies (get-specialized-policies)])
-        (policy->predicate
-         `(custom ,hide-racket?
-                  ,hide-libs?
-                  ,hide-contracts?
-                  ,hide-transformers?
-                  ,specialized-policies))))
-
-    (define super-panel
-      (new vertical-panel%
-           (parent parent)
-           (stretchable-height #f)))
-    (define top-line-panel
-      (new horizontal-panel%
-           (parent super-panel)
-           (alignment '(left center))
-           (stretchable-height #f)))
-    (define customize-panel
-      (new horizontal-panel%
-           (parent super-panel)
-           (stretchable-height #f)
-           (alignment '(left top))
-           (style '(deleted))))
-    (define left-pane
-      (new vertical-pane%
-           (parent customize-panel)
-           (stretchable-width #f)
-           (alignment '(left top))))
-    (define right-pane
-      (new vertical-pane%
-           (parent customize-panel)))
-
-    (define mode-selector
-      (choice/notify-box
-       top-line-panel
-       "Macro hiding: "
-       (list mode:disable mode:standard mode:custom)
-       (get-field macro-hiding-mode config)))
-    (define top-line-inner-panel
-      (new horizontal-panel%
-           (parent top-line-panel)
-           (alignment '(right center))
-           (style '(deleted))))
-
-    (define/private (get-mode)
-      (send/i config config<%> get-macro-hiding-mode))
-
-    (define/private (macro-hiding-enabled?)
-      (let ([mode (get-mode)])
-        (or (equal? mode mode:standard)
-            (and (equal? mode mode:custom)
-                 (send box:hiding get-value)))))
-
-    (define/private (ensure-custom-mode)
-      (unless (equal? (get-mode) mode:custom)
-        (send/i config config<%> set-macro-hiding-mode mode:custom)))
-
-    (define/private (update-visibility)
-      (let ([customizing (equal? (get-mode) mode:custom)])
-        (send top-line-panel change-children
-              (lambda (children)
-                (append (remq top-line-inner-panel children)
-                        (if customizing (list top-line-inner-panel) null))))
-        (send super-panel change-children
-              (lambda (children)
-                (append (remq customize-panel children)
-                        (if (and customizing (send box:edit get-value))
-                            (list customize-panel)
-                            null))))))
-
-    (send/i config config<%> listen-macro-hiding-mode
-            (lambda (value)
-              (update-visibility)
-              (force-refresh)))
-
-    (define box:hiding
-      (new check-box%
-           (label "Enable macro hiding")
-           (value #t)
-           (parent top-line-inner-panel)
-           (callback (lambda (c e) (force-refresh)))))
-    (define box:edit
-      (new check-box%
-           (label "Show policy editor")
-           (parent top-line-inner-panel)
-           (value #t)
-           (callback (lambda (c e) (update-visibility)))))
-
-    (define box:hide-racket
-      (new check-box%
-           (label "Hide racket syntax")
-           (parent left-pane)
-           (value #t)
-           (callback (lambda (c e) (refresh)))))
-    (define box:hide-libs
-      (new check-box%
-           (label "Hide library syntax")
-           (parent left-pane)
-           (value #t)
-           (callback (lambda (c e) (refresh)))))
-    (define box:hide-contracts
-      (new check-box%
-           (label "Hide contracts (heuristic)")
-           (parent left-pane)
-           (value #t)
-           (callback (lambda (c e) (refresh)))))
-    (define box:hide-phase1
-      (new check-box%
-           (label "Hide phase>0")
-           (parent left-pane)
-           (value #t)
-           (callback (lambda (c e) (refresh)))))
-
-    (define look-ctl
-      (new list-box% (parent right-pane) (label "")
-           (choices null) (style '(extended))
-           (callback
-            (lambda (c e)
-              (send delete-ctl enable (pair? (send c get-selections)))))))
-
-    (define look-button-pane
-      (new horizontal-pane% (parent right-pane) (stretchable-width #f)))
-
-    (define delete-ctl
-      (new button% (parent look-button-pane) (label "Delete rule") (enabled #f)
-           (callback (lambda _ (delete-selected) (refresh)))))
-    (define add-hide-id-button
-      (new button% (parent look-button-pane) (label "Hide macro") (enabled #f)
-           (callback (lambda _ (add-hide-identifier) (refresh)))))
-    (define add-show-id-button
-      (new button% (parent look-button-pane) (label "Show macro") (enabled #f)
-           (callback (lambda _ (add-show-identifier) (refresh)))))
-    ;;(new grow-box-spacer-pane% (parent right-pane))
-
-    ;; Methods
-
-    (define stx #f)
-
-    ;; refresh : -> void
-    (define/public (refresh)
-      (when (macro-hiding-enabled?)
-        (send/i stepper widget<%> refresh/resynth)))
-
-    ;; force-refresh : -> void
-    (define/private (force-refresh)
-      (send/i stepper widget<%> refresh/resynth))
-
-    ;; set-syntax : syntax/#f -> void
-    (define/public (set-syntax lstx)
-      (set! stx (and (identifier? lstx) lstx))
-      (send add-show-id-button enable (identifier? lstx))
-      (send add-hide-id-button enable (identifier? lstx)))
-
-    ;; A PolicyLine is an Entry
-    ;; Entry is defined in ../model/hiding-policies
-
-    ;; identifier-policies : (listof Entry)
-    (define identifier-policies null)
-
-    ;; get-specialized-policies : -> (listof Entry)
-    (define/private (get-specialized-policies)
-      identifier-policies)
-
-    (define/public (add-hide-identifier)
-      (when (identifier? stx)
-        (add-policy-line 'hide-if `(free=? ,stx))))
-
-    (define/public (add-show-identifier)
-      (when (identifier? stx)
-        (add-policy-line 'show-if `(free=? ,stx))))
-
-    ;; add-policy-line : 'show-if/'hide-if Condition -> void
-    (define/private (add-policy-line action condition)
-      (set! identifier-policies
-            (cons `(,action ,condition)
-                  (remove-policy/condition condition identifier-policies)))
-      (update-list-view)
-      (ensure-custom-mode))
-
-    ;; update-list-view : -> void
-    (define/private (update-list-view)
-      (send look-ctl set null)
-      (for ([policy identifier-policies])
-        (send look-ctl append (policy->string policy) policy)))
-
-    ;; delete-selected : -> void
-    (define/private (delete-selected)
-      (define to-delete (sort (send look-ctl get-selections) <))
-      (set! identifier-policies
-            (let loop ([i 0] [policies identifier-policies] [to-delete to-delete])
-              (cond [(null? to-delete) policies]
-                    [(= i (car to-delete))
-                     (loop (add1 i) (cdr policies) (cdr to-delete))]
-                    [else
-                     (cons (car policies)
-                           (loop (add1 i) (cdr policies) to-delete))])))
-      (update-list-view))
-
-    (super-new)
-    (update-visibility)))
-
-
-(define (remove-policy/condition condition policies)
-  (filter (lambda (p) (not (same-condition? (cadr p) condition)))
-          policies))
-
-
-;; ----
-
-(define (policy->string policy)
-  (string-limit 200
-                (string-append 
-                 (case (car policy)
-                   ((show-if) "show ")
-                   ((hide-if) "hide "))
-                 (condition->string (cadr policy)))))
-
-(define (string-limit size s)
-  (cond [(> (string-length s) size)
-         (string-append (substring s 0 (- size 3)) "...")]
-        [else s]))
-
-(define (condition->string condition)
-  (match condition
-    [`(free=? ,id)
-     (let ([b (identifier-binding id)])
-       (or #| (identifier->string id) |#
-           (cond [(list? b)
-                  (let ([mod (caddr b)]
-                        [name (cadddr b)])
-                    (if (self-mpi? mod)
-                        (format "'~a' defined in this module" name)
-                        (format "'~s' imported from ~a" name (mpi->string mod))))]
-                 [else
-                  (symbol->string (syntax-e id))])))]
-    [_
-     "<condition>"]))
-
-#|
-(require scribble/xref
-         scribble/manual-struct
-         setup/xref)
-
-(define xref-p (delay (load-collections-xref)))
-
-(define (identifier->string id)
-  (define binding-info (identifier-binding id))
-  (define xref (force xref-p))
-  (define definition-tag
-    (and xref 
-         (xref-binding->definition-tag xref binding-info #f)))
-  (and definition-tag
-       (let-values ([(path tag) (xref-tag->path+anchor xref definition-tag)])
-         (define index-entry
-           (and path (xref-tag->index-entry xref definition-tag)))
-         (define desc
-           (and index-entry (entry-desc index-entry)))
-         (and desc
-              (let ([name (exported-index-desc-name desc)]
-                    [libs (exported-index-desc-from-libs desc)])
-                (format "'~a' from ~a"
-                        name
-                        (mpi->string (car libs))))))))
-|#
-
-
-
-#|
-(define (get-id-key id)
-  id
-  #; ;; FIXME
-  (let ([binding (identifier-binding id)])
-    (get-id-key/binding id binding)))
-
-(define (get-id-key/binding id binding)
-  (cond [(pair? binding)
-         (list (car binding) (cadr binding))]
-        [else id]))
-
-(define (key=? key1 key2)
-  (cond [(and (identifier? key1) (identifier? key2))
-         (free-identifier=? key1 key2)]
-        [(and (pair? key1) (pair? key2))
-         (and (equal? (car key1) (car key2))
-              (equal? (cadr key1) (cadr key2)))]
-        [else #f]))
-
-(define (key->text key)
-  (cond [(pair? key)
-         (let ([name (cadddr key)]
-               [mod (caddr key)])
-           (format "'~s' from ~a"
-                   name
-                   (mpi->string mod)))]
-        [else (symbol->string (syntax-e key))]))
-|#
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/interfaces.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/interfaces.rkt
deleted file mode 100644
index bc697ad4ce..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/interfaces.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang racket/base
-(require unstable/class-iop
-         (prefix-in sb: macro-debugger/syntax-browser/interfaces))
-(provide (all-defined-out))
-
-(define-interface config<%> (sb:config<%>)
-  ((sb:methods:notify draw-arrows?
-                      refresh-on-resize?
-                      macro-hiding-mode
-                      show-hiding-panel?
-                      identifier=?
-                      highlight-foci?
-                      highlight-frontier?
-                      show-rename-steps?
-                      suppress-warnings?
-                      one-by-one?
-                      extra-navigation?
-                      debug-catch-errors?
-                      split-context?)))
-
-(define-interface widget<%> ()
-  (get-config
-   get-controller
-   get-macro-hiding-prefs
-   get-step-displayer
-
-   add-trace
-   add-deriv
-
-   update/preserve-view
-   refresh/resynth
-
-   reset-primary-partition
-   remove-current-term
-   duplicate-stepper
-   show-in-new-frame
-
-   get-preprocess-deriv
-   get-show-macro?
-))
-
-(define-interface stepper-frame<%> ()
-  (get-widget
-   get-controller
-   add-obsoleted-warning))
-
-(define-interface hiding-prefs<%> ()
-  (add-show-identifier
-   add-hide-identifier
-   set-syntax
-   get-policy
-   refresh))
-
-
-(define-interface step-display<%> ()
-  (add-syntax
-   add-step
-   add-error
-   add-final
-   add-internal-error))
-
-
-(define-interface term-record<%> ()
-  (get-raw-deriv
-   get-deriv-hidden?
-   get-step-index
-   get-step-count
-   invalidate-synth!
-   invalidate-steps!
-
-   has-prev?
-   has-next?
-#|
-   at-start?
-   at-end?
-|#
-   navigate-to-start
-   navigate-to-end
-   navigate-previous
-   navigate-next
-   navigate-to
-
-   on-get-focus
-   on-lose-focus
-
-   display-initial-term
-   display-final-term
-   display-step
-   ))
-
-(define-interface director<%> ()
-  (add-deriv
-   new-stepper))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/prefs.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/prefs.rkt
deleted file mode 100644
index b5ca82f7aa..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/prefs.rkt
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang racket/base
-(require racket/class
-         framework/preferences
-         "interfaces.rkt"
-         "../syntax-browser/prefs.rkt"
-         unstable/gui/notify
-         unstable/gui/prefs)
-(provide pref:macro-step-limit
-         pref:close-on-reset-console?
-         macro-stepper-config-base%
-         macro-stepper-config/prefs%
-         macro-stepper-config/prefs/readonly%)
-
-(preferences:set-default 'MacroStepper:Frame:Width 700 number?)
-(preferences:set-default 'MacroStepper:Frame:Height 600 number?)
-(preferences:set-default 'MacroStepper:PropertiesShown? #f boolean?)
-(preferences:set-default 'MacroStepper:PropertiesPanelPercentage 1/3 number?)
-(preferences:set-default 'MacroStepper:DrawArrows? #t boolean?)
-
-(preferences:set-default 'MacroStepper:MacroHidingMode "Standard" string?)
-(preferences:set-default 'MacroStepper:ShowHidingPanel? #t boolean?)
-(preferences:set-default 'MacroStepper:IdentifierComparison "bound-identifier=?" string?)
-(preferences:set-default 'MacroStepper:HighlightFoci? #t boolean?)
-(preferences:set-default 'MacroStepper:HighlightFrontier? #t boolean?)
-(preferences:set-default 'MacroStepper:ShowRenameSteps? #f boolean?)
-(preferences:set-default 'MacroStepper:SuppressWarnings? #f boolean?)
-(preferences:set-default 'MacroStepper:OneByOne? #f boolean?)
-(preferences:set-default 'MacroStepper:ExtraNavigation? #f boolean?)
-(preferences:set-default 'MacroStepper:DebugCatchErrors? #t boolean?)
-(preferences:set-default 'MacroStepper:SplitContext? #f boolean?)
-(preferences:set-default 'MacroStepper:MacroStepLimit 40000
-                         (lambda (x) (or (eq? x #f) (exact-positive-integer? x))))
-(preferences:set-default 'MacroStepper:RefreshOnResize? #t boolean?)
-(preferences:set-default 'MacroStepper:CloseOnResetConsole? #t boolean?)
-
-(define pref:width (pref:get/set 'MacroStepper:Frame:Width))
-(define pref:height (pref:get/set 'MacroStepper:Frame:Height))
-(define pref:props-shown? (pref:get/set 'MacroStepper:PropertiesShown?))
-(define pref:props-percentage (pref:get/set 'MacroStepper:PropertiesPanelPercentage))
-(define pref:draw-arrows? (pref:get/set 'MacroStepper:DrawArrows?))
-
-(define pref:macro-hiding-mode (pref:get/set 'MacroStepper:MacroHidingMode))
-(define pref:show-hiding-panel? (pref:get/set 'MacroStepper:ShowHidingPanel?))
-(define pref:identifier=? (pref:get/set 'MacroStepper:IdentifierComparison))
-(define pref:highlight-foci? (pref:get/set 'MacroStepper:HighlightFoci?))
-(define pref:highlight-frontier? (pref:get/set 'MacroStepper:HighlightFrontier?))
-(define pref:show-rename-steps? (pref:get/set 'MacroStepper:ShowRenameSteps?))
-(define pref:suppress-warnings? (pref:get/set 'MacroStepper:SuppressWarnings?))
-(define pref:one-by-one? (pref:get/set 'MacroStepper:OneByOne?))
-(define pref:extra-navigation? (pref:get/set 'MacroStepper:ExtraNavigation?))
-(define pref:debug-catch-errors? (pref:get/set 'MacroStepper:DebugCatchErrors?))
-(define pref:split-context? (pref:get/set 'MacroStepper:SplitContext?))
-(define pref:macro-step-limit (pref:get/set 'MacroStepper:MacroStepLimit))
-(define pref:refresh-on-resize? (pref:get/set 'MacroStepper:RefreshOnResize?))
-(define pref:close-on-reset-console? (pref:get/set 'MacroStepper:CloseOnResetConsole?))
-
-(define macro-stepper-config-base%
-  (class* prefs-base% (config<%>)
-    (init-field readonly?)
-
-    (define-syntax-rule (define-pref-notify* (name pref) ...)
-      (begin (define-notify name (notify-box/pref pref #:readonly? readonly?)) ...))
-
-    (define-pref-notify*
-      (width pref:width)
-      (height pref:height)
-      (props-percentage pref:props-percentage)
-      (props-shown? pref:props-shown?)
-      (draw-arrows? pref:draw-arrows?)
-      (macro-hiding-mode pref:macro-hiding-mode)
-      (show-hiding-panel? pref:show-hiding-panel?)
-      (identifier=? pref:identifier=?)
-      (highlight-foci? pref:highlight-foci?)
-      (highlight-frontier? pref:highlight-frontier?)
-      (show-rename-steps? pref:show-rename-steps?)
-      (suppress-warnings? pref:suppress-warnings?)
-      (one-by-one? pref:one-by-one?)
-      (extra-navigation? pref:extra-navigation?)
-      (debug-catch-errors? pref:debug-catch-errors?)
-      (split-context? pref:split-context?)
-      (refresh-on-resize? pref:refresh-on-resize?)
-      (close-on-reset-console? pref:close-on-reset-console?))
-    (super-new)))
-
-(define macro-stepper-config/prefs%
-  (class macro-stepper-config-base%
-    (super-new (readonly? #f))))
-
-(define macro-stepper-config/prefs/readonly%
-  (class macro-stepper-config-base%
-    (super-new (readonly? #t))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/step-display.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/step-display.rkt
deleted file mode 100644
index 6b19f93022..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/step-display.rkt
+++ /dev/null
@@ -1,268 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/match
-         racket/gui/base
-         unstable/class-iop
-         "interfaces.rkt"
-         macro-debugger/model/steps
-	 (prefix-in sb: macro-debugger/syntax-browser/interfaces)
-         macro-debugger/view/debug-format)
-
-#;
-(provide step-display%
-         step-display<%>)
-(provide (all-defined-out))
-;; Struct for one-by-one stepping
-
-(define-struct (prestep protostep) ())
-(define-struct (poststep protostep) ())
-
-(define (prestep-term1 s) (state-term (protostep-s1 s)))
-(define (poststep-term2 s) (state-term (protostep-s1 s)))
-
-(define step-display%
-  (class* object% (step-display<%>)
-
-    (init-field/i (config config<%>))
-    (init-field ((sbview syntax-widget)))
-    (super-new)
-
-    (define/public (add-internal-error part exn stx events)
-      (send/i sbview sb:syntax-browser<%> add-text
-              (string-append
-               (if (exn:break? exn)
-                   "Macro stepper was interrupted"
-                   "Macro stepper error")
-               (if part
-                   (format " (~a)" part)
-                   "")))
-      (when (exn? exn)
-        (send/i sbview sb:syntax-browser<%> add-text " ")
-        (send/i sbview sb:syntax-browser<%> add-clickback "[details]"
-                (lambda _ (show-internal-error-details exn events))))
-      (send/i sbview sb:syntax-browser<%> add-text ".  ")
-      (when stx (send/i sbview sb:syntax-browser<%> add-text "Original syntax:"))
-      (send/i sbview sb:syntax-browser<%> add-text "\n")
-      (when stx (send/i sbview sb:syntax-browser<%> add-syntax stx)))
-
-    (define/private (show-internal-error-details exn events)
-      (case (message-box/custom (if (exn:break? exn)
-                                    "Macro stepper was interrupted"
-                                    "Macro stepper internal error")
-                                (format "Internal error:\n~a" (exn-message exn))
-                                "Show error"
-                                "Dump debugging file"
-                                "Cancel")
-        ((1) (queue-callback
-              (lambda ()
-                (raise exn))))
-        ((2) (queue-callback
-              (lambda ()
-                (let ([file (put-file)])
-                  (when file
-                    (write-debug-file file exn events))))))
-        ((3 #f) (void))))
-
-    (define/public (add-error exn)
-      (send*/i sbview sb:syntax-browser<%>
-        (add-error-text (exn-message exn))
-        (add-text "\n")))
-
-    (define/public (add-step step
-                             #:shift-table [shift-table #f])
-      (cond [(step? step)
-             (show-step step shift-table)]
-            [(misstep? step)
-             (show-misstep step shift-table)]
-            [(remarkstep? step)
-             (show-remarkstep step shift-table)]
-            [(prestep? step)
-             (show-prestep step shift-table)]
-            [(poststep? step)
-             (show-poststep step shift-table)]))
-
-    (define/public (add-syntax stx
-                               #:binders [binders '#hash()]
-                               #:definites [definites #f]
-                               #:shift-table [shift-table '#hash()])
-      (send/i sbview sb:syntax-browser<%> add-syntax stx
-              #:binders binders
-              #:definites definites
-              #:shift-table shift-table))
-
-    (define/public (add-final stx error
-                              #:binders binders
-                              #:definites definites
-                              #:shift-table [shift-table #f])
-      (when stx
-        (send*/i sbview sb:syntax-browser<%>
-          (add-text "Expansion finished\n")
-          (add-syntax stx
-                      #:binders binders
-                      #:definites definites
-                      #:shift-table shift-table)))
-      (when error
-        (add-error error)))
-
-    ;; show-lctx : Step -> void
-    (define/private (show-lctx step shift-table)
-      (define state (protostep-s1 step))
-      (define lctx (state-lctx state))
-      (for ([bf lctx])
-        (send/i sbview sb:syntax-browser<%> add-text 
-                "\nwhile executing macro transformer in:\n")
-        (insert-syntax/redex (bigframe-term bf)
-                             (bigframe-foci bf)
-                             (state-binders state)
-                             shift-table
-                             (state-uses state)
-                             (state-frontier state))))
-
-    ;; separator : Step [...] -> void
-    (define/private (separator step #:compact? [compact? #f])
-      (insert-step-separator (step-type->string (protostep-type step))
-                             #:compact? compact?))
-
-    ;; show-step : Step -> void
-    (define/private (show-step step shift-table)
-      (let-values ([(common-context state1 state2)
-                    (factor-common-context (protostep-s1 step)
-                                           (step-s2 step))])
-        (show-state/redex state1 shift-table)
-        (separator step)
-        (show-state/contractum state2 shift-table)
-        (show-common-context common-context state1 shift-table)
-        (show-lctx step shift-table)))
-
-    (define/private (factor-common-context state1 state2)
-      (if (send/i config config<%> get-split-context?)
-          (factor-common-context* state1 state2)
-          (values null state1 state2)))
-
-    (define/private (factor-common-context* state1 state2)
-      (match-define
-       (struct state (e1 foci1 ctx1 lctx1 binders1 uses1 frontier1 seq1)) state1)
-      (match-define
-       (struct state (e2 foci2 ctx2 lctx2 binders2 uses2 frontier2 seq2)) state2)
-      (define (common xs ys acc)
-        (if (and (pair? xs) (pair? ys) (eq? (car xs) (car ys)))
-            (common (cdr xs) (cdr ys) (cons (car xs) acc))
-            (values (reverse xs) (reverse ys) acc)))
-      (define-values (ctx1z ctx2z common-ctx)
-        (common (reverse ctx1) (reverse ctx2) null))
-      (define state1z
-        (make-state e1 foci1 ctx1z lctx1 binders1 uses1 frontier1 seq1))
-      (define state2z
-        (make-state e2 foci2 ctx2z lctx2 binders2 uses2 frontier2 seq2))
-      (values common-ctx state1z state2z))
-
-    (define/private (show-common-context ctx state1 shift-table)
-      (match-define
-       (struct state (_ _ _ _ _ uses1 frontier1 _)) state1)
-      (when (pair? ctx)
-        (let* ([hole-stx #'~~HOLE~~]
-               [the-syntax (context-fill ctx hole-stx)])
-          (send*/i sbview sb:syntax-browser<%>
-            (add-text "\nin context:\n")
-            (add-syntax the-syntax
-                        #:definites uses1
-                        #:binders (state-binders state1)
-                        #:shift-table shift-table
-                        #:substitutions (list (cons hole-stx "[ HOLE ]")))))))
-
-    (define/private (show-state/redex state shift-table)
-      (insert-syntax/redex (state-term state)
-                           (state-foci state)
-                           (state-binders state)
-                           shift-table
-                           (state-uses state)
-                           (state-frontier state)))
-
-    (define/private (show-state/contractum state shift-table)
-      (insert-syntax/contractum (state-term state)
-                                (state-foci state)
-                                (state-binders state)
-                                shift-table
-                                (state-uses state)
-                                (state-frontier state)))
-
-    ;; show-prestep : Step -> void
-    (define/private (show-prestep step shift-table)
-      (separator step #:compact? #t)
-      (show-state/redex (protostep-s1 step) shift-table)
-      (show-lctx step shift-table))
-
-    ;; show-poststep : Step -> void
-    (define/private (show-poststep step shift-table)
-      (separator step #:compact? #t)
-      (show-state/contractum (protostep-s1 step) shift-table)
-      (show-lctx step shift-table))
-
-    ;; show-misstep : Step -> void
-    (define/private (show-misstep step shift-table)
-      (define state (protostep-s1 step))
-      (separator step #:compact? #t)
-      (send*/i sbview sb:syntax-browser<%>
-        (add-error-text (exn-message (misstep-exn step)))
-        (add-text "\n"))
-      (when (exn:fail:syntax? (misstep-exn step))
-        (for ([e (exn:fail:syntax-exprs (misstep-exn step))])
-          (send/i sbview sb:syntax-browser<%> add-syntax e
-                  #:binders (state-binders state)
-                  #:definites (state-uses state)
-                  #:shift-table shift-table)))
-      (show-lctx step shift-table))
-
-    (define/private (show-remarkstep step shift-table)
-      (define state (protostep-s1 step))
-      (for ([content (in-list (remarkstep-contents step))])
-        (cond [(string? content)
-               (send*/i sbview sb:syntax-browser<%>
-                       (add-text content)
-                       (add-text "\n"))]
-              [(syntax? content)
-               (send*/i sbview sb:syntax-browser<%>
-                 (add-syntax content
-                             #:binders (state-binders state)
-                             #:definites (state-uses state)
-                             #:shift-table shift-table)
-                 (add-text "\n"))]))
-      (show-lctx step shift-table))
-
-    ;; insert-syntax/color
-    (define/private (insert-syntax/color stx foci binders shift-table
-                                         definites frontier hi-color)
-      (define highlight-foci? (send/i config config<%> get-highlight-foci?))
-      (define highlight-frontier? (send/i config config<%> get-highlight-frontier?))
-      (send/i sbview sb:syntax-browser<%> add-syntax stx
-              #:definites definites
-              #:binders binders
-              #:shift-table shift-table
-              #:hi-colors (list hi-color
-                                "WhiteSmoke")
-              #:hi-stxss (list (if highlight-foci? foci null)
-                               (if highlight-frontier? frontier null))))
-
-    ;; insert-syntax/redex
-    (define/private (insert-syntax/redex stx foci binders shift-table
-                                         definites frontier)
-      (insert-syntax/color stx foci binders shift-table
-                           definites frontier "MistyRose"))
-
-    ;; insert-syntax/contractum 
-    (define/private (insert-syntax/contractum stx foci binders shift-table
-                                              definites frontier)
-      (insert-syntax/color stx foci binders shift-table
-                           definites frontier "LightCyan"))
-
-    ;; insert-step-separator : string -> void
-    (define/private (insert-step-separator text #:compact? compact?)
-      (send*/i sbview sb:syntax-browser<%>
-        (add-text (if compact? "" "\n"))
-        (add-text
-         (make-object image-snip%
-                      (collection-file-path "red-arrow.bmp" "icons")))
-        (add-text "  [")
-        (add-text text)
-        (add-text "]\n\n")))
-    ))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/stepper.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/stepper.rkt
deleted file mode 100644
index de599924a9..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/stepper.rkt
+++ /dev/null
@@ -1,578 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/match
-         racket/gui/base
-         unstable/class-iop
-         "interfaces.rkt"
-         "extensions.rkt"
-         "hiding-panel.rkt"
-         "term-record.rkt"
-         "step-display.rkt"
-	 (prefix-in sb: macro-debugger/syntax-browser/interfaces)
-         macro-debugger/model/deriv
-         macro-debugger/model/deriv-util
-         "cursor.rkt"
-         "gui-util.rkt"
-         "../syntax-browser/util.rkt"
-         unstable/gui/notify
-         images/compile-time
-         images/gui
-         (for-syntax racket/base
-                     images/icons/arrow images/icons/control images/logos
-                     images/icons/style)
-         (only-in mzscheme [#%top-interaction mz-top-interaction]))
-(provide macro-stepper-widget%
-         macro-stepper-widget/process-mixin)
-
-;; Compiled-in assets (button icons)
-
-(define navigate-up-icon
-  (compiled-bitmap (up-arrow-icon #:color syntax-icon-color #:height (toolbar-icon-height))))
-(define navigate-to-start-icon
-  (compiled-bitmap (search-backward-icon #:color syntax-icon-color #:height (toolbar-icon-height))))
-(define navigate-previous-icon
-  (compiled-bitmap (step-back-icon #:color syntax-icon-color #:height (toolbar-icon-height))))
-(define navigate-next-icon
-  (compiled-bitmap (step-icon #:color syntax-icon-color #:height (toolbar-icon-height))))
-(define navigate-to-end-icon
-  (compiled-bitmap (search-forward-icon #:color syntax-icon-color #:height (toolbar-icon-height))))
-(define navigate-down-icon
-  (compiled-bitmap (down-arrow-icon #:color syntax-icon-color #:height (toolbar-icon-height))))
-
-(define small-logo (compiled-bitmap (macro-stepper-logo #:height 32)))
-(define large-logo (compiled-bitmap (macro-stepper-logo)))
-
-(define (show-about-dialog parent)
-  (define dlg
-    (new logo-about-dialog%
-         (label "About the Macro Stepper")
-         (parent parent)
-         (bitmap large-logo)
-         (messages '("The Macro Stepper is formalized and proved correct in\n"
-                     "\n"
-                     "    Ryan Culpepper and Matthias Felleisen\n"
-                     "    Debugging Hygienic Macros\n"
-                     "    Science of Computer Programming, July 2010\n"))))
-  (send dlg show #t))
-
-;; Macro Stepper
-
-;; macro-stepper-widget%
-(define macro-stepper-widget%
-  (class* object% (widget<%>)
-    (init-field parent)
-    (init-field config)
-    (init-field/i (director director<%>))
-
-    (define frame (send parent get-top-level-window))
-    (define eventspace (send frame get-eventspace))
-
-    (define-syntax-rule (with-eventspace . body)
-      (parameterize ((current-eventspace eventspace))
-        (queue-callback (lambda () . body))))
-
-    ;; Terms
-
-    ;; all-terms : (list-of TermRecord)
-    ;; (Reversed)
-    (define all-terms null)
-
-    ;; terms : (Cursor-of TermRecord)
-    ;; Contains visible terms of all-terms
-    (define terms (cursor:new null))
-
-    ;; focused-term : -> TermRecord or #f
-    (define (focused-term)
-      (cursor:next terms))
-
-    ;; current-step-index : notify of number/#f
-    (define-notify current-step-index (new notify-box% (value #f)))
-
-    ;; add-deriv : Deriv -> void
-    (define/public (add-deriv d)
-      (let ([trec (new term-record% (stepper this) (raw-deriv d))])
-        (add trec)))
-
-    ;; add-trace : (list-of event) -> void
-    (define/public (add-trace events)
-      (let ([trec (new term-record% (stepper this) (events events))])
-        (add trec)))
-
-    ;; add : TermRecord -> void
-    (define/private (add trec)
-      (with-eventspace
-       (set! all-terms (cons trec all-terms))
-       (let ([display-new-term? (cursor:at-end? terms)]
-             [invisible? (send/i trec term-record<%> get-deriv-hidden?)])
-         (unless invisible?
-           (cursor:add-to-end! terms (list trec))
-           (trim-navigator)
-           (if display-new-term?
-               (refresh)
-               (update))))))
-
-    ;; remove-current-term : -> void
-    (define/public (remove-current-term)
-      (when (cursor:has-next? terms)
-        (cursor:remove-current! terms)
-        (trim-navigator)
-        (refresh)))
-
-    ;; show-in-new-frame : -> void
-    (define/public (show-in-new-frame)
-      (let ([term (focused-term)])
-        (when term
-          (let ([new-stepper (send/i director director<%> new-stepper '(no-new-traces))])
-            (send/i new-stepper widget<%> add-deriv (send/i term term-record<%> get-raw-deriv))
-            (void)))))
-
-    ;; duplicate-stepper : -> void
-    (define/public (duplicate-stepper)
-      (let ([new-stepper (send/i director director<%> new-stepper)])
-        (for ([term (cursor->list terms)])
-          (send/i new-stepper widget<%> add-deriv
-                 (send/i term term-record<%> get-raw-deriv)))))
-
-    (define/public (get-config) config)
-    (define/public (get-controller) sbc)
-    (define/public (get-view) sbview)
-    (define/public (get-step-displayer) step-displayer)
-    (define/public (get-macro-hiding-prefs) macro-hiding-prefs)
-
-    (define/public (reset-primary-partition)
-      (send/i sbc sb:controller<%> reset-primary-partition)
-      (update/preserve-view))
-
-    (define superarea (new vertical-pane% (parent parent)))
-    (define area
-      (new vertical-panel%
-           (parent superarea)
-           (enabled #f)))
-    (define top-panel
-      (new horizontal-panel%
-           (parent area)
-           (horiz-margin 5)
-           (stretchable-height #f)))
-    (define supernavigator
-      (new horizontal-panel%
-           (parent top-panel)
-           (stretchable-height #f)
-           (alignment '(center center))))
-    (define navigator
-      (new horizontal-panel%
-           (parent supernavigator)
-           (stretchable-width #f)
-           (stretchable-height #f)
-           (alignment '(left center))))
-    (define extra-navigator
-      (new horizontal-panel%
-           (parent supernavigator)
-           (stretchable-width #f)
-           (stretchable-height #f)
-           (alignment '(left center))
-           (style '(deleted))))
-    
-    (define logo-canvas
-      (new (class bitmap-canvas%
-             (super-new (parent top-panel) (bitmap small-logo))
-             (define/override (on-event evt)
-               (when (eq? (send evt get-event-type) 'left-up)
-                 (show-about-dialog frame))))))
-    
-    (define/i sbview sb:syntax-browser<%>
-      (new stepper-syntax-widget% 
-           (parent area)
-           (macro-stepper this)))
-    (define/i step-displayer step-display<%>
-      (new step-display%
-           (config config)
-           (syntax-widget sbview)))
-    (define/i sbc sb:controller<%>
-      (send/i sbview sb:syntax-browser<%> get-controller))
-    (define control-pane
-      (new vertical-panel% (parent area) (stretchable-height #f)))
-
-    (define/i macro-hiding-prefs hiding-prefs<%>
-      (new macro-hiding-prefs-widget%
-           (parent control-pane)
-           (stepper this)
-           (config config)))
-
-    (define status-area
-      (new status-area%
-           (parent superarea)
-           (stop-callback (lambda _ (stop-processing)))))
-
-    (send/i sbc sb:controller<%>
-           listen-selected-syntax
-           (lambda (stx) (send/i macro-hiding-prefs hiding-prefs<%> set-syntax stx)))
-    (send config listen-pretty-abbrev?
-          (lambda (_) (update/preserve-view)))
-    (send*/i config config<%>
-      (listen-show-hiding-panel?
-       (lambda (show?) (show-macro-hiding-panel show?)))
-      (listen-split-context?
-       (lambda (_) (update/preserve-view)))
-      (listen-highlight-foci?
-       (lambda (_) (update/preserve-view)))
-      (listen-highlight-frontier?
-       (lambda (_) (update/preserve-view)))
-      (listen-show-rename-steps?
-       (lambda (_) (refresh/re-reduce)))
-      (listen-one-by-one?
-       (lambda (_) (refresh/re-reduce)))
-      (listen-extra-navigation?
-       (lambda (show?) (show-extra-navigation show?))))
-    (send config listen-pretty-styles
-          (lambda (_) (update/preserve-view)))
-
-    (define nav:up
-      (new button% (label (list navigate-up-icon "Previous term" 'left)) (parent navigator)
-           (callback (lambda (b e) (navigate-up)))))
-    (define nav:start
-      (new button% (label (list navigate-to-start-icon "Start" 'left)) (parent navigator)
-           (callback (lambda (b e) (navigate-to-start)))))
-    (define nav:previous
-      (new button% (label (list navigate-previous-icon "Step" 'left)) (parent navigator)
-           (callback (lambda (b e) (navigate-previous)))))
-    (define nav:next
-      (new button% (label (list navigate-next-icon "Step" 'right)) (parent navigator)
-           (callback (lambda (b e) (navigate-next)))))
-    (define nav:end
-      (new button% (label (list navigate-to-end-icon "End" 'right)) (parent navigator)
-           (callback (lambda (b e) (navigate-to-end)))))
-    (define nav:down
-      (new button% (label (list navigate-down-icon "Next term" 'right)) (parent navigator)
-           (callback (lambda (b e) (navigate-down)))))
-
-    (define nav:text
-      (new text-field%
-           (label "Step#")
-           (init-value "00000")
-           (parent extra-navigator)
-           (stretchable-width #f)
-           (stretchable-height #f)
-           (callback
-            (lambda (b e)
-              (when (eq? (send e get-event-type) 'text-field-enter)
-                (let* ([value (send b get-value)]
-                       [step (string->number value)])
-                  (cond [(exact-positive-integer? step)
-                         (navigate-to (sub1 step))]
-                        [(equal? value "end")
-                         (navigate-to-end)])))))))
-
-    (define nav:step-count
-      (new message%
-           (label "")
-           (parent extra-navigator)
-           (auto-resize #t)
-           (stretchable-width #f)
-           (stretchable-height #f)))
-    (send nav:text set-value "")
-
-    (listen-current-step-index
-     (lambda (n)
-       (send nav:text set-value
-             (if (number? n) (number->string (add1 n)) ""))))
-
-    (define/private (trim-navigator)
-      (if (> (length (cursor->list terms)) 1)
-          (send navigator change-children
-                (lambda _
-                  (list nav:up
-                        nav:start
-                        nav:previous
-                        nav:next
-                        nav:end
-                        nav:down)))
-          (send navigator change-children
-                (lambda _
-                  (list nav:start
-                        nav:previous
-                        nav:next
-                        nav:end)))))
-
-    (define/public (show-macro-hiding-panel show?)
-      (send area change-children
-            (lambda (children)
-              (if show?
-                  (append (remq control-pane children) (list control-pane))
-                  (remq control-pane children)))))
-
-    (define/private (show-extra-navigation show?)
-      (send supernavigator change-children
-            (lambda (children)
-              (if show?
-                  (list navigator extra-navigator)
-                  (list navigator)))))
-
-    (define/public (change-status msg)
-      (send status-area set-status msg))
-
-    ;; Navigation
-    (define/public-final (navigate-to-start)
-      (send/i (focused-term) term-record<%> navigate-to-start)
-      (update/preserve-lines-view))
-    (define/public-final (navigate-to-end)
-      (send/i (focused-term) term-record<%> navigate-to-end)
-      (update/preserve-lines-view))
-    (define/public-final (navigate-previous)
-      (send/i (focused-term) term-record<%> navigate-previous)
-      (update/preserve-lines-view))
-    (define/public-final (navigate-next)
-      (send/i (focused-term) term-record<%> navigate-next)
-      (update/preserve-lines-view))
-    (define/public-final (navigate-to n)
-      (send/i (focused-term) term-record<%> navigate-to n)
-      (update/preserve-lines-view))
-
-    (define/public-final (navigate-up)
-      (when (focused-term)
-        (send/i (focused-term) term-record<%> on-lose-focus))
-      (cursor:move-prev terms)
-      (refresh/move))
-    (define/public-final (navigate-down)
-      (when (focused-term)
-        (send/i (focused-term) term-record<%> on-lose-focus))
-      (cursor:move-next terms)
-      (refresh/move))
-
-    ;; enable/disable-buttons : -> void
-    (define/private (enable/disable-buttons [? #t])
-      (define term (and ? (focused-term)))
-      ;; (message-box "alert" (format "enable/disable: ~s" ?))
-      (send area enable ?)
-      (send (send frame get-menu-bar) enable ?)
-      (send nav:start enable (and ? term (send/i term term-record<%> has-prev?)))
-      (send nav:previous enable (and ? term (send/i term term-record<%> has-prev?)))
-      (send nav:next enable (and ? term (send/i term term-record<%> has-next?)))
-      (send nav:end enable (and ? term (send/i term term-record<%> has-next?)))
-      (send nav:text enable (and ? term #t))
-      (send nav:up enable (and ? (cursor:has-prev? terms)))
-      (send nav:down enable (and ? (cursor:has-next? terms)))
-      (send status-area enable-stop (not ?)))
-
-    ;; Async update & refresh
-
-    (define update-thread #f)
-
-    (define ASYNC-DELAY 500) ;; milliseconds
-
-    (define/private (call-with-update-thread thunk)
-      (send status-area set-visible #f)
-      (let* ([lock (make-semaphore 1)] ;; mutex for status variable
-             [status #f] ;; mutable: one of #f, 'done, 'async
-             [thd
-              (parameterize-break #f
-                (thread (lambda ()
-                          (with-handlers ([exn:break?
-                                           (lambda (e)
-                                             (change-status "Interrupted")
-                                             (void))])
-                            (parameterize-break #t
-                              (thunk)
-                              (change-status #f)))
-                          (semaphore-wait lock)
-                          (case status
-                            ((async)
-                             (set! update-thread #f)
-                             (with-eventspace
-                              (enable/disable-buttons #t)))
-                            (else
-                             (set! status 'done)))
-                          (semaphore-post lock))))])
-        (sync thd (alarm-evt (+ (current-inexact-milliseconds) ASYNC-DELAY)))
-        (semaphore-wait lock)
-        (case status
-          ((done)
-           ;; Thread finished; enable/disable skipped, so do it now to update.
-           (enable/disable-buttons #t))
-          (else
-           (set! update-thread thd)
-           (send status-area set-visible #t)
-           (enable/disable-buttons #f)
-           (set! status 'async)))
-        (semaphore-post lock)))
-
-    (define-syntax-rule (with-update-thread . body)
-      (call-with-update-thread (lambda () . body)))
-
-    (define/private (stop-processing)
-      (let ([t update-thread])
-        (when t (break-thread t))))
-
-    ;; Update
-
-    ;; update/preserve-lines-view : -> void
-    (define/public (update/preserve-lines-view)
-      (with-update-thread
-       (define text (send/i sbview sb:syntax-browser<%> get-text))
-       (define start-box (box 0))
-       (define end-box (box 0))
-       (send text get-visible-line-range start-box end-box)
-       (update*)
-       (send text scroll-to-position
-             (send text line-start-position (unbox start-box))
-             #f
-             (send text line-start-position (unbox end-box))
-             'start)))
-
-    ;; update/preserve-view : -> void
-    (define/public (update/preserve-view)
-      (with-update-thread
-       (define text (send/i sbview sb:syntax-browser<%> get-text))
-       (define start-box (box 0))
-       (define end-box (box 0))
-       (send text get-visible-position-range start-box end-box)
-       (update*)
-       (send text scroll-to-position (unbox start-box) #f (unbox end-box) 'start)))
-
-    ;; update : -> void
-    ;; Updates the terms in the syntax browser to the current step
-    (define/private (update)
-      (with-update-thread
-       (update*)))
-
-    (define/private (update*)
-      ;; update:show-prefix : -> void
-      (define (update:show-prefix)
-        ;; Show the final terms from the cached synth'd derivs
-        (for ([trec (in-list (cursor:prefix->list terms))])
-          (send/i trec term-record<%> display-final-term)))
-      ;; update:show-current-step : -> void
-      (define (update:show-current-step)
-        (when (focused-term)
-          (send/i (focused-term) term-record<%> display-step)))
-      ;; update:show-suffix : -> void
-      (define (update:show-suffix)
-        (let ([suffix0 (cursor:suffix->list terms)])
-          (when (pair? suffix0)
-            (for ([trec (in-list (cdr suffix0))])
-              (send/i trec term-record<%> display-initial-term)))))
-      ;; update-nav-index : -> void
-      (define (update-nav-index)
-        (define term (focused-term))
-        (set-current-step-index
-         (and term (send/i term term-record<%> get-step-index))))
-
-      (define text (send/i sbview sb:syntax-browser<%> get-text))
-      (define position-of-interest 0)
-      (define multiple-terms? (> (length (cursor->list terms)) 1))
-
-      (with-unlock text
-        (send/i sbview sb:syntax-browser<%> erase-all)
-        (update:show-prefix)
-        (when multiple-terms? (send/i sbview sb:syntax-browser<%> add-separator))
-        (set! position-of-interest (send text last-position))
-        (update:show-current-step)
-        (when multiple-terms? (send/i sbview sb:syntax-browser<%> add-separator))
-        (update:show-suffix))
-
-      (send text scroll-to-position
-            position-of-interest
-            #f
-            (send text last-position)
-            'start)
-      (update-nav-index)
-      (change-status #f))
-
-    ;; --
-
-    ;; refresh/resynth : -> void
-    ;; Macro hiding policy has changed; invalidate cached parts of trec
-    (define/public (refresh/resynth)
-      (for ([trec (in-list (cursor->list terms))])
-        (send/i trec term-record<%> invalidate-synth!))
-      (refresh))
-
-    ;; refresh/re-reduce : -> void
-    ;; Reduction config has changed; invalidate cached parts of trec
-    (define/private (refresh/re-reduce)
-      (for ([trec (in-list (cursor->list terms))])
-        (send/i trec term-record<%> invalidate-steps!))
-      (refresh))
-
-    ;; refresh/move : -> void
-    ;; Moving between terms; clear the saved position
-    (define/private (refresh/move)
-      (refresh))
-
-    ;; refresh : -> void
-    (define/public (refresh)
-      (with-update-thread
-       (when (focused-term)
-         (send/i (focused-term) term-record<%> on-get-focus))
-       (send nav:step-count set-label "")
-       (let ([term (focused-term)])
-         (when term
-           (let ([step-count (send/i term term-record<%> get-step-count)])
-             (when step-count
-               ;; +1 for end of expansion "step"
-               (send nav:step-count set-label (format "of ~s" (add1 step-count)))))))
-       (update*)))
-
-    ;; Hiding policy
-    
-    (define/public (get-show-macro?)
-      (send/i macro-hiding-prefs hiding-prefs<%> get-policy))
-
-    ;; Derivation pre-processing
-
-    (define/public (get-preprocess-deriv) (lambda (d) d))
-
-    ;; Initialization
-
-    (super-new)
-    (show-macro-hiding-panel (send/i config config<%> get-show-hiding-panel?))
-    (show-extra-navigation (send/i config config<%> get-extra-navigation?))
-    ))
-
-(define (macro-stepper-widget/process-mixin %)
-  (class %
-    (super-new)
-    (define/override (get-preprocess-deriv)
-      (lambda (d) (get-original-part d)))
-
-    ;; get-original-part : Deriv -> Deriv/#f
-    ;; Strip off mzscheme's #%top-interaction
-    ;; Careful: the #%top-interaction node may be inside of a lift-deriv
-    (define/private (get-original-part deriv)
-      (let ([deriv* (adjust-deriv/lift deriv)])
-        deriv*))
-
-    ;; adjust-deriv/lift : Deriv -> Deriv/#f
-    (define/private (adjust-deriv/lift deriv)
-      (match deriv
-        [(Wrap lift-deriv (e1 e2 first lifted-stx second))
-         (let ([first (adjust-deriv/lift first)])
-           (and first
-                (let ([e1 (wderiv-e1 first)])
-                  (make-lift-deriv e1 e2 first lifted-stx second))))]
-        [(Wrap ecte (e1 e2 '() first second locals2))
-         ;; Only adjust if no locals...
-         (let ([first (adjust-deriv/lift first)])
-           (and first
-                (let ([e1 (wderiv-e1 first)])
-                  (make ecte e1 e2 '() first second locals2))))]
-        [else (adjust-deriv/top deriv)]))
-
-    ;; adjust-deriv/top : Derivation -> Derivation
-    (define/private (adjust-deriv/top deriv)
-      (if (or (not (base? deriv))
-              (syntax-original? (wderiv-e1 deriv))
-              (p:module? deriv))
-          deriv
-          ;; It's not original...
-          ;; Strip out mzscheme's top-interactions
-          ;; Keep anything that is a non-mzscheme top-interaction
-          (cond [(for/or ([x (base-resolves deriv)]) (top-interaction-kw? x))
-                 ;; Just mzscheme's top-interaction; strip it out
-                 (adjust-deriv/top (mrule-next deriv))]
-                [else deriv])))
-
-    (define/public (top-interaction-kw? x)
-      (or (free-identifier=? x #'#%top-interaction)
-          (free-identifier=? x #'mz-top-interaction)))
-
-    ))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/term-record.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/term-record.rkt
deleted file mode 100644
index 5d2de34965..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/term-record.rkt
+++ /dev/null
@@ -1,352 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/match
-         syntax/stx
-         unstable/find
-         unstable/class-iop
-         "interfaces.rkt"
-         "step-display.rkt"
-         macro-debugger/model/deriv
-         macro-debugger/model/deriv-util
-         macro-debugger/model/deriv-parser
-         macro-debugger/model/trace
-         macro-debugger/model/reductions-config
-         macro-debugger/model/reductions
-         macro-debugger/model/steps
-         "cursor.rkt")
-
-(provide term-record%)
-
-;; TermRecords
-
-(define term-record%
-  (class* object% (term-record<%>)
-    (init-field/i (stepper widget<%>))
-
-    (define/i config config<%>
-      (send/i stepper widget<%> get-config))
-    (define/i displayer step-display<%>
-      (send/i stepper widget<%> get-step-displayer))
-
-    ;; Data
-
-    (init-field [events #f])
-
-    (init-field [raw-deriv #f])
-    (define raw-deriv-oops #f)
-
-    (define deriv #f)
-    (define deriv-hidden? #f)
-    (define shift-table #f)
-
-    (define raw-steps #f)
-    (define raw-steps-estx #f) ;; #f if raw-steps-exn is exn
-    (define raw-steps-exn #f) ;; #f if raw-steps-estx is syntax
-    (define raw-steps-binders #f)
-    (define raw-steps-definites #f)
-    (define raw-steps-oops #f)
-
-    (define steps #f)
-
-    ;; --
-
-    (define steps-position #f)
-
-    (define/private (status msg)
-      (send stepper change-status msg))
-    (define-syntax-rule (with-status msg . body)
-      (begin (send stepper change-status msg)
-             (begin0 (let () . body))))
-
-    (super-new)
-
-    (define-syntax define-guarded-getters
-      (syntax-rules ()
-        [(define-guarded-getters guard (method expr) ...)
-         (begin (define/public (method) guard expr) ...)]))
-
-    (define/public (get-events) events)
-    (define/public (get-raw-deriv) raw-deriv)
-
-    (define-guarded-getters (recache-deriv!)
-      [get-deriv deriv]
-      [get-deriv-hidden? deriv-hidden?]
-      [get-shift-table shift-table])
-    (define-guarded-getters (recache-raw-steps!)
-      [get-raw-steps-binders raw-steps-binders]
-      [get-raw-steps-definites raw-steps-definites]
-      [get-raw-steps-exn raw-steps-exn]
-      [get-raw-steps-oops raw-steps-oops])
-    (define-guarded-getters (recache-steps!)
-      [get-steps steps])
-
-    ;; invalidate-steps! : -> void
-    ;; Invalidates cached parts that depend on reductions config
-    (define/public (invalidate-steps!)
-      (set! steps #f))
-
-    ;; invalidate-raw-steps! : -> void
-    (define/public (invalidate-raw-steps!)
-      (invalidate-steps!)
-      (set! raw-steps #f)
-      (set! raw-steps-estx #f)
-      (set! raw-steps-exn #f)
-      (set! raw-steps-binders #f)
-      (set! raw-steps-definites #f)
-      (set! raw-steps-oops #f))
-
-    ;; invalidate-synth! : -> void
-    ;; Invalidates cached parts that depend on macro-hiding policy
-    (define/public (invalidate-synth!)
-      (invalidate-raw-steps!))
-
-    ;; invalidate-deriv! : -> void
-    (define/public (invalidate-deriv!)
-      (invalidate-synth!)
-      (set! deriv #f)
-      (set! deriv-hidden? #f)
-      (set! shift-table #f))
-
-    ;; recache! : -> void
-    (define/public (recache!)
-      (recache-steps!))
-
-    ;; recache-raw-deriv! : -> void
-    (define/private (recache-raw-deriv!)
-      (unless (or raw-deriv raw-deriv-oops)
-        (with-handlers ([(lambda (e) #t)
-                         (lambda (e)
-                           (set! raw-deriv-oops e))])
-          (with-status "Parsing expansion derivation"
-            (set! raw-deriv
-                  (parse-derivation
-                   (events->token-generator events)))))))
-
-    ;; recache-deriv! : -> void
-    (define/private (recache-deriv!)
-      (unless (or deriv deriv-hidden?)
-        (recache-raw-deriv!)
-        (when raw-deriv
-          (with-status "Processing expansion derivation"
-            (let ([process (send/i stepper widget<%> get-preprocess-deriv)])
-              (let ([d (process raw-deriv)])
-                (when (not d)
-                  (set! deriv-hidden? #t))
-                (when d
-                  (set! deriv d)
-                  (set! shift-table (compute-shift-table d)))))))))
-
-    ;; recache-synth! : -> void
-    (define/private (recache-synth!)
-      (recache-deriv!))
-
-    ;; recache-raw-steps! : -> void
-    (define/private (recache-raw-steps!)
-      (unless (or raw-steps raw-steps-oops)
-        (recache-synth!)
-        (when deriv
-          (with-status "Computing reduction steps"
-            (let ([show-macro? (or (send/i stepper widget<%> get-show-macro?)
-                                   (lambda (id) #t))])
-              (with-handlers ([(lambda (e) #t)
-                               (lambda (e)
-                                 (set! raw-steps-oops e))])
-                (let-values ([(raw-steps* binders* definites* estx* error*)
-                              (parameterize ((macro-policy show-macro?))
-                                (reductions+ deriv))])
-                  (set! raw-steps raw-steps*)
-                  (set! raw-steps-estx estx*)
-                  (set! raw-steps-exn error*)
-                  (set! raw-steps-binders binders*)
-                  (set! raw-steps-definites definites*))))))))
-
-    ;; recache-steps! : -> void
-    (define/private (recache-steps!)
-      (unless (or steps)
-        (recache-raw-steps!)
-        (when raw-steps
-          (with-status "Processing reduction steps"
-            (set! steps
-                  (and raw-steps
-                       (let* ([filtered-steps 
-                               (if (send/i config config<%> get-show-rename-steps?)
-                                   raw-steps
-                                   (filter (lambda (x) (not (rename-step? x)))
-                                           raw-steps))]
-                              [processed-steps
-                               (if (send/i config config<%> get-one-by-one?)
-                                   (reduce:one-by-one filtered-steps)
-                                   filtered-steps)])
-                         (cursor:new processed-steps))))
-            (restore-position)))))
-
-    ;; reduce:one-by-one : (list-of step) -> (list-of step)
-    (define/private (reduce:one-by-one rs)
-      (let loop ([rs rs])
-        (match rs
-          [(cons (struct step (type s1 s2)) rs)
-           (list* (make prestep type s1)
-                  (make poststep type s2)
-                  (loop rs))]
-          [(cons (struct misstep (type s1 exn)) rs)
-           (list* (make misstep type s1 exn)
-                  (loop rs))]
-          [(cons (and r (remarkstep type s1 contents)) rs)
-           (list* r (loop rs))]
-          ['()
-           null])))
-
-    ;; Navigation
-
-    (define/public-final (has-prev?)
-      (and (get-steps) (not (cursor:at-start? (get-steps)))))
-    (define/public-final (has-next?)
-      (and (get-steps) (not (cursor:at-end? (get-steps)))))
-
-    (define/public-final (get-step-index)
-      (let ([steps (get-steps)])
-        (and steps (cursor-position steps))))
-    (define/public-final (get-step-count)
-      (let ([steps (get-steps)])
-        (and steps (cursor-count steps))))
-
-    (define/public-final (navigate-to-start)
-      (cursor:move-to-start (get-steps))
-      (save-position))
-    (define/public-final (navigate-to-end)
-      (cursor:move-to-end (get-steps))
-      (save-position))
-    (define/public-final (navigate-previous)
-      (cursor:move-prev (get-steps))
-      (save-position))
-    (define/public-final (navigate-next)
-      (cursor:move-next (get-steps))
-      (save-position))
-    (define/public-final (navigate-to n)
-      (cursor:skip-to (get-steps) n)
-      (save-position))
-
-    ;; save-position : -> void
-    (define/private (save-position)
-      (when (cursor? steps)
-        (let ([step (cursor:next steps)])
-          (cond [(not step)
-                 ;; At end; go to the end when restored
-                 (set! steps-position +inf.0)]
-                [(protostep? step)
-                 (set! steps-position
-                       (extract-protostep-seq step))]))))
-
-    ;; restore-position : number -> void
-    (define/private (restore-position)
-      (define (seek)
-        (let ([step (cursor:next steps)])
-          (cond [(not step)
-                 ;; At end; stop
-                 (void)]
-                [(protostep? step)
-                 (let ([step-pos (extract-protostep-seq step)])
-                   (cond [(not step-pos)
-                          (cursor:move-next steps)
-                          (seek)]
-                         [(< step-pos steps-position)
-                          (cursor:move-next steps)
-                          (seek)]
-                         [else (void)]))])))
-      (when steps-position
-        (seek)))
-
-    ;; extract-protostep-seq : step -> number/#f
-    (define/private (extract-protostep-seq step)
-      ;; FIXME: add back step numbers
-      (state-seq (protostep-s1 step)))
-
-    ;; Warnings display
-
-    ;; on-get-focus : -> void
-    (define/public (on-get-focus)
-      (recache-synth!))
-
-    ;; on-lose-focus : -> void
-    (define/public (on-lose-focus)
-      (when steps (cursor:move-to-start steps))
-      (set! steps-position #f))
-
-    ;; Rendering
-
-    ;; display-initial-term : -> void
-    (define/public (display-initial-term)
-      (with-status "Rendering term"
-        (cond [raw-deriv-oops
-               (send/i displayer step-display<%> add-internal-error
-                       "derivation" raw-deriv-oops #f events)]
-              [else
-               (send/i displayer step-display<%> add-syntax (wderiv-e1 deriv))])))
-
-    ;; display-final-term : -> void
-    (define/public (display-final-term)
-      (recache-steps!)
-      (with-status "Rendering term"
-        (cond [(syntax? raw-steps-estx)
-               (send/i displayer step-display<%> add-syntax raw-steps-estx
-                       #:binders raw-steps-binders
-                       #:shift-table shift-table
-                       #:definites raw-steps-definites)]
-              [(exn? raw-steps-exn)
-               (send/i displayer step-display<%> add-error raw-steps-exn)]
-              [else (display-oops #f)])))
-
-    ;; display-step : -> void
-    (define/public (display-step)
-      (recache-steps!)
-      (with-status "Rendering step"
-        (cond [steps
-               (let ([step (cursor:next steps)])
-                 (if step
-                     (send/i displayer step-display<%> add-step step
-                             #:shift-table shift-table)
-                     (send/i displayer step-display<%> add-final raw-steps-estx raw-steps-exn
-                             #:binders raw-steps-binders
-                             #:shift-table shift-table
-                             #:definites raw-steps-definites)))]
-              [else (display-oops #t)])))
-
-    ;; display-oops : boolean -> void
-    (define/private (display-oops show-syntax?)
-      (cond [raw-steps-oops
-             (send/i displayer step-display<%> add-internal-error
-                     "steps" raw-steps-oops
-                     (and show-syntax? (wderiv-e1 deriv))
-                     events)]
-            [raw-deriv-oops
-             (send/i displayer step-display<%> add-internal-error
-                     "derivation" raw-deriv-oops #f events)]
-            [else
-             (error 'term-record::display-oops "internal error")]))
-    ))
-
-
-;; compute-shift-table : deriv -> hash[id => (listof id)]
-(define (compute-shift-table d)
-  (define ht (make-hasheq))
-  (define module-forms
-    (find p:module? d #:stop-on-found? #t))
-  (define module-shift-renamers
-    (for/list ([mf module-forms])
-      (let ([shift (p:module-shift mf)]
-            [body (p:module-body mf)])
-        (and shift body
-             (with-syntax ([(_module _name _lang shifted-body) shift])
-               (add-rename-mapping ht (wderiv-e2 body) #'shifted-body))))))
-  ht)
-
-(define (add-rename-mapping ht from to)
-  (define (loop from to)
-    (cond [(and (stx-pair? from) (stx-pair? to))
-           (loop (stx-car from) (stx-car to))
-           (loop (stx-cdr from) (stx-cdr to))]
-          [(and (identifier? from) (identifier? to))
-           (hash-set! ht from (cons to (hash-ref ht from null)))]
-          [else (void)]))
-  (loop from to)
-  (void))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/view.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/view.rkt
deleted file mode 100644
index 8f794aee0d..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/view.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         framework
-         unstable/class-iop
-         "interfaces.rkt"
-         "frame.rkt"
-         "prefs.rkt")
-(provide macro-stepper-director%
-         macro-stepper-frame%)
-
-(define macro-stepper-director%
-  (class* object% (director<%>)
-    (field [stepper-frames (make-hasheq)])
-
-    ;; Flags is a subset(list) of '(no-obsolete no-new-traces)
-
-    (define/private (add-stepper! s flags)
-      (hash-set! stepper-frames s flags))
-    (define/public (remove-stepper! s)
-      (hash-remove! stepper-frames s))
-
-    (define/public (add-obsoleted-warning)
-      (for ([(stepper-frame flags) (in-hash stepper-frames)])
-        (unless (memq 'no-obsolete flags)
-          (send/i stepper-frame stepper-frame<%> add-obsoleted-warning))))
-    (define/public (add-trace events)
-      (for ([(stepper-frame flags) (in-hash stepper-frames)])
-        (unless (memq 'no-new-traces flags)
-          (send/i (send/i stepper-frame stepper-frame<%> get-widget) widget<%>
-                  add-trace events))))
-    (define/public (add-deriv deriv)
-      (for ([(stepper-frame flags) (in-hash stepper-frames)])
-        (unless (memq 'no-new-traces flags)
-          (send/i (send/i stepper-frame stepper-frame<%> get-widget) widget<%>
-                  add-deriv deriv))))
-
-    ;; PRE: current thread = current eventspace's handler thread
-    (define/public (new-stepper [flags '()])
-      (unless (eq? (current-thread)
-                   (eventspace-handler-thread (current-eventspace)))
-        (error 'macro-stepper-director
-               "new-stepper method called from wrong thread"))
-      (define stepper-frame (new-stepper-frame))
-      (define stepper (send/i stepper-frame stepper-frame<%> get-widget))
-      (send stepper-frame show #t)
-      (add-stepper! stepper-frame flags)
-      stepper)
-
-    (define/public (new-stepper-frame)
-      (new macro-stepper-frame%
-           (config (new macro-stepper-config/prefs%))
-           (director this)))
-
-    (super-new)))
-
-(define macro-stepper-frame%
-  (macro-stepper-frame-mixin
-   (frame:standard-menus-mixin
-    (frame:basic-mixin frame%))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/all-tests.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/all-tests.rkt
deleted file mode 100644
index c14ae2da6a..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/all-tests.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket/base
-(require racket/cmdline
-         rackunit
-         rackunit/text-ui
-         macro-debugger/model/debug
-         "gentest-framework.rkt"
-         "gentests.rkt"
-         "test-setup.rkt"
-         "tests/syntax-basic.rkt"
-         "tests/syntax-macros.rkt"
-         "tests/syntax-modules.rkt"
-         "tests/syntax-errors.rkt"
-         "tests/hiding.rkt"
-         "tests/regression.rkt"
-         "tests/policy.rkt"
-         "tests/collects.rkt")
-(provide all-tests)
-
-(define protos
-  (list proto:kernel-forms
-        proto:kernel-contexts
-        proto:macros
-        proto:modules
-        proto:errors))
-
-(define deriv-test (mk-deriv-test protos))
-(define steps-test (mk-steps-test protos))
-(define hiding-deriv-test (mk-hidden-deriv-test protos))
-(define hiding-steps-test (mk-hidden-steps-test protos))
-
-(provide deriv-test
-         steps-test
-         hiding-deriv-test
-         hiding-steps-test)
-
-(define all-tests
-  (test-suite "All tests"
-    deriv-test
-    steps-test
-    hiding-deriv-test
-    hiding-steps-test
-    specialized-hiding-tests
-    regression-tests
-    policy-tests))
-
-(define-syntax-rule (with-namespace expr)
-  (parameterize ((current-namespace (make-base-namespace)))
-    expr))
-
-;; ----
-
-(define test-mode #f)
-(define collects-tests? #f)
-
-(command-line
- #:once-each
- [("--text") "Run tests in RackUnit text UI" (set! test-mode 'text)]
- [("--gui") "Run tests in RackUnit GUI" (set! test-mode 'gui)]
- [("--collects") "Include collects tests" (set! collects-tests? #t)]
- #:args ()
- (let* ([tests (cons all-tests (if collects-tests? (list collects-tests) null))])
-   (case test-mode
-     ((text)
-      (with-namespace
-       (for-each run-tests tests)))
-     ((gui)
-      (let ([test/gui (dynamic-require 'rackunit/gui 'test/gui)])
-        (with-namespace
-         (apply test/gui #:wait? #t tests)))))))
-
-;; Test mode:
-(module test racket/base
-  (require syntax/location)
-  (parameterize ([current-command-line-arguments (vector "--text")])
-    (dynamic-require (quote-module-path "..") #f)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-a.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-a.rkt
deleted file mode 100644
index 348b93accf..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-a.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(define a 1)
-(provide a)
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-b.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-b.rkt
deleted file mode 100644
index d4b5328784..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-b.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(define b 2)
-(provide b)
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-c.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-c.rkt
deleted file mode 100644
index e304b62dc8..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-c.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(module s racket/base
-  (define cs 30)
-  (provide cs))
-
-(define c 3)
-(provide c)
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-a.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-a.rkt
deleted file mode 100644
index d973a7fc54..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-a.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require "src-a.rkt"
-         "src-b.rkt"
-         "src-c.rkt"
-         (submod "src-c.rkt" s))
-
-(void a)
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-cs.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-cs.rkt
deleted file mode 100644
index 73a19f8bbb..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-cs.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require "src-a.rkt"
-         "src-b.rkt"
-         "src-c.rkt"
-         (submod "src-c.rkt" s))
-
-(void cs)
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentest-framework.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentest-framework.rkt
deleted file mode 100644
index 8e187afef7..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentest-framework.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-(provide (all-defined-out))
-
-(define-struct collection (label contents) #:transparent)
-(define-struct individual (label form attrs) #:transparent)
-
-(define-syntax define-tests
-  (syntax-rules ()
-    [(define-tests var label clause ...)
-     (define var (Test [#:suite label clause ...]))]))
-
-(define-syntax Test
-  (syntax-rules ()
-    [(Test [#:suite label clause ...])
-     (make-collection label (list (Test clause) ...))]
-    [(Test expr)
-     expr]))
-
-(define-syntax test
-  (syntax-rules ()
-    [(test label form clause ...)
-     (make-individual label 'form
-                      (cons (cons '#:ok-deriv? #t)
-                            (append (IClause form clause) ...)))]))
-
-(define-syntax testE
-  (syntax-rules ()
-    [(testE form clause ...)
-     (make-individual (format "~s" 'form) 'form
-                      (cons (cons '#:ok-deriv? #f)
-                            (append (IClause form clause) ...)))]))
-
-(define-syntax testK
-  (syntax-rules ()
-    [(testK label form clause ...)
-     (test label form #:kernel clause ...)]))
-
-(define-syntax testKE
-  (syntax-rules ()
-    [(testEK label form clause ...)
-     (testE label form #:kernel clause ...)]))
-
-(define-syntax IClause
-  (syntax-rules ()
-    [(IClause _form [#:steps spec ...])
-     (list (cons '#:steps '(spec ...)))]
-    [(IClause _form #:no-steps)
-     (list (cons '#:steps '())
-           (cons '#:hidden-steps '()))]
-    [(IClause _form #:error-step)
-     (list (cons '#:steps '(error)))]
-    [(IClause form [#:rename+error-step rename-type])
-     (list (cons '#:steps '((rename-type form) error)))]
-    [(IClause _form [#:hidden-steps spec ...])
-     (list (cons '#:hidden-steps '(spec ...)))]
-    [(IClause form #:same-hidden-steps)
-     (list (cons '#:same-hidden-steps #t))]
-    [(IClause form #:no-hidden-steps)
-     (list (cons '#:hidden-steps '()))]
-    [(Iclause form #:kernel)
-     (list (cons '#:kernel #t))]))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentests.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentests.rkt
deleted file mode 100644
index a55f6a0a0f..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentests.rkt
+++ /dev/null
@@ -1,181 +0,0 @@
-#lang racket/base
-(require rackunit)
-(require macro-debugger/model/debug
-         macro-debugger/model/stx-util
-         "gentest-framework.rkt"
-         "test-setup.rkt")
-(provide mk-deriv-test
-         mk-steps-test
-         mk-hidden-deriv-test
-         mk-hidden-steps-test)
-
-(define (mk-deriv-test protos)
-  (mk-test "Derivations" checker-for-deriv protos))
-
-(define (mk-steps-test protos)
-  (mk-test "Reductions" checker-for-steps protos))
-
-(define (mk-hidden-deriv-test protos)
-  (mk-test "Hiding: Completes for multiple policies"
-           checker-for-hidden-deriv protos))
-
-(define (mk-hidden-steps-test protos)
-  (mk-test "Hiding: Reductions" checker-for-hidden-steps protos))
-
-(define (mk-test label checker protos)
-  (make-test-suite label
-                   (filter values 
-                           (map (mk-gen-test checker) protos))))
-
-(define (mk-gen-test f)
-  (define (gen prototest)
-    (match prototest
-      [(struct collection (label contents))
-       (let ([tests (filter values (map gen contents))])
-         (and (pair? tests)
-              (make-test-suite label tests)))]
-      [(struct individual (label form attrs))
-       (f label form attrs)]))
-  gen)
-
-(define (checker-for-deriv label form attrs)
-  (cond [(assq '#:ok-deriv? attrs)
-         => (lambda (key+expect-ok?)
-              (delay-test
-               (test-case label
-                 (let ([d (trace/ns form (assq '#:kernel attrs))])
-                   (check-pred deriv? d)
-                   (if (cdr key+expect-ok?)
-                       (check-pred ok-node? d)
-                       (check-pred interrupted-node? d))))))]
-        [else #f]))
-
-(define (checker-for-hidden-deriv label form attrs)
-  (cond [(assq '#:ok-deriv? attrs)
-         => (lambda (key+expect-ok?)
-              (delay-test
-               (test-case label
-                 (let ([d (trace/ns form (assq '#:kernel attrs))]
-                       [expect-ok? (cdr key+expect-ok?)])
-                   (check-hide d hide-none-policy expect-ok?)
-                   (check-hide d hide-all-policy expect-ok?)
-                   (check-hide d T-policy expect-ok?)))))]
-        [else #f]))
-
-(define (check-hide d policy expect-ok?)
-  (let-values ([(steps binders uses stx2 exn)
-                (parameterize ((macro-policy policy))
-                  (reductions+ d))])
-    (check-pred list? steps)
-    (check-pred reduction-sequence? steps)
-    (check-true (not (and stx2 exn)) "Must not produce both estx and exn")
-    (if expect-ok?
-        (check-pred syntax? stx2 "Expected expanded syntax")
-        (check-pred exn? exn "Expected syntax error exn"))))
-
-(define (checker-for-steps label form attrs)
-  (cond [(assq '#:steps attrs)
-         => (lambda (key+expected)
-              (delay-test
-               (test-case label
-                 (let* ([d (trace/ns form (assq '#:kernel attrs))]
-                        [rs (reductions d)])
-                   (check-steps (cdr key+expected) rs)))))]
-        [else #f]))
-
-(define (checker-for-hidden-steps label form attrs)
-  (cond [(assq '#:same-hidden-steps attrs)
-         (unless (assq '#:steps attrs)
-           (error 'checker-for-hidden-steps "no steps given for ~s" label))
-         (delay-test
-          (test-case label
-            (let* ([d (trace/ns form (assq '#:kernel attrs))]
-                   [rs (parameterize ((macro-policy T-policy))
-                         (reductions d))])
-              (check-steps (cdr (assq '#:steps attrs)) rs))))]
-        [(assq '#:hidden-steps attrs)
-         => (lambda (key+expected)
-              (delay-test
-               (test-case label
-                 (let* ([d (trace/ns form (assq '#:kernel attrs))]
-                        [rs (parameterize ((macro-policy T-policy))
-                              (reductions d))])
-                   (check-steps (cdr (assq '#:hidden-steps attrs)) rs)))))]
-        [else #f]))
-
-(define (check-steps expected actual)
-  (check-pred list? actual)
-  (check-pred reduction-sequence? actual)
-  (with-check-info (;;['actual-sequence-raw actual]
-                    ['actual-sequence
-                     (for/list ([thing actual])
-                       (cond [(misstep? thing)
-                              'error]
-                             [(remarkstep? thing)
-                              (list* 'remark
-                                     (protostep-type thing)
-                                     (map syntax->datum (filter syntax? (remarkstep-contents thing))))]
-                             [else
-                              (list* (protostep-type thing)
-                                     (syntax->datum (step-term2 thing))
-                                     (map syntax->datum
-                                          (map bigframe-term (state-lctx (protostep-s1 thing)))))]))]
-                    ['expected-sequence expected])
-    (compare-step-sequences actual expected)))
-
-(define (reduction-sequence? rs)
-  (andmap protostep? rs))
-
-(define (compare-step-sequences actual expected)
-  (cond [(and (pair? expected) (pair? actual))
-         (begin (compare-steps (car actual) (car expected))
-                (compare-step-sequences (cdr actual) (cdr expected)))]
-        [(pair? expected)
-         (fail (format "missing expected steps:\n~s" expected))]
-        [(pair? actual)
-         (fail (format "too many steps:\n~a"
-                       (apply append
-                              (for/list ([step actual])
-                                (format "~s: ~s\n"
-                                        (protostep-type step)
-                                        (stx->datum (step-term2 step)))))))]
-        [else 'ok]))
-
-(define (compare-steps actual expected)
-  (match expected
-    ['error
-     (check-pred misstep? actual)]
-    [(list 'remark e-tag e-forms ...)
-     (check-pred remarkstep? actual)
-     (check-eq? (protostep-type actual) e-tag "Remark step type")
-     (let ([contents (filter syntax? (remarkstep-contents actual))])
-       (check-equal? (length contents) (length e-forms)
-                     "Wrong number of syntaxes in remark")
-       (for ([astx contents] [e-form e-forms])
-         (check-equal-syntax? (syntax->datum astx) e-form "Syntax in remark")))]
-    [(list e-tag e-form e-locals ...)
-     (let ([lctx-terms (map bigframe-term (state-lctx (protostep-s1 actual)))])
-       (check-pred step? actual)
-       (check-eq? (protostep-type actual) e-tag)
-       (check-equal-syntax? (syntax->datum (step-term2 actual))
-                            e-form)
-       (check-equal? (length lctx-terms) (length e-locals)
-                     "Wrong number of context frames")
-       (for ([lctx-term lctx-terms] [e-local e-locals])
-         (check-equal-syntax? (syntax->datum lctx-term)
-                              e-local
-                              "Context frame")))]))
-
-(define-binary-check (check-equal-syntax? a e)
-  (equal-syntax? a e))
-
-(define (equal-syntax? a e)
-  (cond [(and (pair? a) (pair? e))
-         (and (equal-syntax? (car a) (car e))
-              (equal-syntax? (cdr a) (cdr e)))]
-        [(and (symbol? a) (symbol? e))
-         (equal? (symbol->string a)
-                 (symbol->string e))]
-        [(and (symbol? a) (regexp? e))
-         (regexp-match? e (symbol->string a))]
-        [else (equal? a e)]))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gui-tests.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gui-tests.rkt
deleted file mode 100644
index ab95afb21b..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gui-tests.rkt
+++ /dev/null
@@ -1,274 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/list
-         racket/gui/base
-         framework
-         mzlib/etc)
-
-(require macro-debugger/model/trace
-         macro-debugger/view/view
-         macro-debugger/view/prefs)
-
-(provide test-stepper
-         test-stepper*)
-
-(define (wait) (sleep .1))
-(define (waitb) (sleep .025))
-
-(define (get-active-frame)
-  (let ([frame (get-top-level-focus-window)])
-    (unless frame
-      (error 'get-active-frame "no active frame"))
-    frame))
-
-(define (find-object base class pred)
-  (define (find-loop obj)
-    (cond [(and (is-a? obj class) (pred obj)) obj]
-          [(is-a? obj area-container<%>)
-           (ormap find-loop (send obj get-children))]
-          [else #f]))
-  (let ([obj (find-loop base)])
-    (unless obj
-      (error 'find-object "no such ~s object satisfying ~s" class pred))
-    obj))
-
-(define (find:next frame)
-  (find-object frame button% (has-label "Step ->")))
-(define (find:prev frame)
-  (find-object frame button% (has-label "<- Step")))
-(define (find:start frame)
-  (find-object frame button% (has-label "<-- Start")))
-(define (find:end frame)
-  (find-object frame button% (has-label "End -->")))
-(define (find:up frame)
-  (find-object frame button% (has-label "Previous term")))
-(define (find:down frame)
-  (find-object frame button% (has-label "Next term")))
-
-(define (has-label label)
-  (lambda (obj) (equal? label (send obj get-label))))
-
-(define (enabled? obj)
-  (send obj is-enabled?))
-
-(define (click button)
-  (waitb)
-  (unless (enabled? button)
-    (error 'click "button not enabled"))
-  (send button command (make-object control-event% 'button)))
-
-(define (click-until-disabled button)
-  (define (loop n)
-    (if (enabled? button)
-        (begin (click button)
-               (loop (add1 n)))
-        n))
-  (loop 0))
-
-(define (click-if-enabled button)
-  (when (enabled? button)
-    (click button)))
-
-(define (check check-box value)
-  (wait)
-  (unless (enabled? check-box)
-    (error 'check "check box not enabled"))
-  (send* check-box
-    (set-value value)
-    (command (make-object control-event% 'check-box))))
-
-(define (choose choice value)
-  (wait)
-  (unless (enabled? choice)
-    (error 'choice "choice not enabled"))
-  (send* choice
-    (set-string-selection value)
-    (command (make-object control-event% 'choice))))
-
-(define (menu-check menu-item value)
-  (wait)
-  (unless (enabled? menu-item)
-    (error 'menu-check "menu item not enabled"))
-  (send* menu-item
-    (check value)
-    (command (make-object control-event% 'menu))))
-
-(define (set-policy frame policy-symbol)
-  (let ([policy (find-object frame choice% (has-label "Macro hiding: "))])
-    (case policy-symbol
-      ((none)
-       (choose policy "Disable")
-       #;(check enable #f)
-       #;(check hide-mz #f)
-       #;(check hide-libs #f))
-      ((basic)
-       (choose policy "Custom ...")
-       (check (find-object frame check-box% (has-label "Enable macro hiding")) #t)
-       (check (find-object frame check-box% (has-label "Hide mzscheme syntax")) #f)
-       (check (find-object frame check-box% (has-label "Hide library syntax")) #f))
-      ((normal)
-       (choose policy "Standard")
-       #;(check enable #t)
-       #;(check hide-mz #t)
-       #;(check hide-libs #t)))))
-
-(define (get-menu-item frame menu-path)
-  (let ([menu (send frame get-menu-bar)])
-    (define (menu-loop path menus)
-      (cond [(string? path)
-             (let ([item
-                    (ormap (lambda (m)
-                             (and (is-a? m labelled-menu-item<%>)
-                                  (equal? path (send m get-label))
-                                  m))
-                           menus)])
-               (unless item
-                 (error 'get-menu-item "no such menu item: ~s" path))
-               item)]
-            [else
-             (let ([menu
-                    (ormap (lambda (m) 
-                             (and (is-a? m menu%)
-                                  (equal? (car path) (send m get-label))
-                                  m))
-                           menus)])
-               (unless menu
-                 (error 'get-menu-item "no such menu item: ~s" path))
-               (menu-loop (cdr path) (send menu get-items)))]))
-    (or (menu-loop menu-path (send menu get-items))
-        (error 'get-menu-item "no such menu item"))))
-
-(define (menu-item:one-by-one frame)
-  (get-menu-item frame '("Stepper" "Extra options" . "One term at a time")))
-(define (menu-item:show-renaming-steps frame)
-  (get-menu-item frame '("Stepper" "Extra options" . "Include renaming steps")))
-(define (menu-item:highlight-redex/contractum frame)
-  (get-menu-item frame '("Stepper" "Extra options" . "Highlight redex/contractum")))
-
-(define (set-mode frame . flags)
-  (menu-check (menu-item:one-by-one frame) 
-              (memq 'one-by-one flags))
-  (menu-check (menu-item:show-renaming-steps frame)
-              (memq 'renames flags))
-  (menu-check (menu-item:highlight-redex/contractum frame)
-              (not (memq 'no-highlight flags))))
-
-(define (run-through start prev next end)
-  (begin-with-definitions
-    (click-if-enabled start)
-    (begin (for-each assert-disabled (list start prev)))
-    (define next-clicks (click-until-disabled next))
-    (begin (for-each assert-disabled (list next end)))
-    (click-if-enabled start)
-    (begin (for-each assert-disabled (list start prev)))
-    (click-if-enabled end)
-    (begin (for-each assert-disabled (list next end)))
-    (define prev-clicks (click-until-disabled prev))
-    (unless (equal? next-clicks prev-clicks)
-      (error 'run-through 
-             "pressed next ~s times, pressed prev ~s times"
-             next-clicks prev-clicks))
-    (begin (for-each assert-disabled (list start prev)))))
-
-(define (assert-enabled obj)
-  (unless (enabled? obj) 
-    (error 'assert-enabled "assertion failed for ~s" (send obj get-label))))
-(define (assert-disabled obj)
-  (when (enabled? obj)
-    (error 'assert-disabled "assertion failed for ~s" (send obj get-label))))
-
-;; check-threads : (-> any) -> any
-;; Runs thunk; raises error if any subthreads created by thunk raise
-;; errors, or if a subthread outlives thunk's computation.
-(define (check-threads thunk)
-  (let* ([main-cust (current-custodian)]
-         [sub-cust (make-custodian main-cust)]
-         [sub-exns null]
-         [old-uncaught-exception-handler (uncaught-exception-handler)])
-    (parameterize ((current-custodian sub-cust)
-                   (uncaught-exception-handler
-                    (lambda (exn)
-                      (set! sub-exns (cons exn sub-exns))
-                      (old-uncaught-exception-handler exn))))
-      (let ([result (thunk)])
-        ;; Check that sub-custodian has no living threads.
-        (let ([threads-still-going?
-               (ormap thread-running?
-                      (filter thread?
-                              (custodian-managed-list sub-cust main-cust)))])
-          (when (pair? sub-exns)
-            (raise (car sub-exns))
-            #;(error 'nice-threads "child thread raised exception"))
-          (when threads-still-going?
-            (error 'nice-threads "child thread left still running"))
-          result)))))
-
-(define (new-uninitialized-stepper)
-  (sleep 1)
-  (parameterize ((current-eventspace (make-eventspace)))
-    (let ([frame (new macro-stepper-frame%
-                      (config (new macro-stepper-config/prefs/readonly%))
-                      (director (new macro-stepper-director%)))])
-      (send frame show #t)
-      frame)))
-
-(define (new-stepper)
-  (let ([frame (new-uninitialized-stepper)])
-    frame))
-
-(define (add-expansion frame stx)
-  (let ([widget (send frame get-widget)])
-    (send widget add-deriv (trace stx))))
-
-(define (test-stepper* stxs policies)
-  (check-threads
-   (lambda ()
-     (let ([frame (new-stepper)])
-       (let ([start (find:start frame)]
-             [prev (find:prev frame)]
-             [next (find:next frame)]
-             [end (find:end frame)]
-             [up (find:up frame)]
-             [down (find:down frame)])
-         (define (run)
-           (run-down)
-           (click-until-disabled up))
-         (define (run-down)
-           (when (enabled? down)
-             (run-through start prev next end)
-             (click down)
-             (run-down)))
-         (define (run/all-modes)
-           (set-mode frame) ;; normal by default
-           (run)
-           (set-mode frame 'no-highlight)
-           (run)
-           (set-mode frame 'renames)
-           (run)
-           ;;(set-mode frame 'no-highlight 'renames)
-           ;;(run)
-           ;;(set-mode frame 'one-by-one)
-           ;;(run)
-           ;;(set-mode frame 'one-by-one 'renames)
-           ;;(run)
-           (set-mode frame 'one-by-one 'renames 'no-highlight)
-           (run)
-           (set-mode frame))
-         (dynamic-wind
-          void
-          (lambda ()
-            (for-each (lambda (stx) (add-expansion frame stx)) stxs)
-            ;; Test different hiding policies
-            (for-each (lambda (policy)
-                        (set-policy frame policy)
-                        (run/all-modes))
-                      policies)
-            (wait))
-          (lambda ()
-            (test:close-top-level-window frame)
-            (kill-thread
-             (eventspace-handler-thread
-              (send frame get-eventspace))))))))))
-
-(define (test-stepper expr)
-  (test-stepper* (list expr) '(none basic normal)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/test-setup.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/test-setup.rkt
deleted file mode 100644
index 8d5917382a..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/test-setup.rkt
+++ /dev/null
@@ -1,165 +0,0 @@
-#lang racket/base
-(require macro-debugger/model/debug)
-;; Testing facilities for macro debugger
-
-(provide trace/ns
-         trace/t
-         trace/k
-
-         testing-namespace
-
-         hide-all-policy
-         hide-none-policy
-
-         T-policy
-         Tm-policy
-
-         stx/hide-none
-         stx/hide-all
-         stx/hide-standard
-         stx/hide-T
-         stx/hide-Tm)
-
-(define (trace/t expr)
-  (trace/ns expr #f))
-
-(define (trace/k expr)
-  (trace/ns expr #t))
-
-;; Use just 'expand', not 'expand/compile-time-evals',
-;; for test backward compatibility
-;; FIXME: add tests that use 'expand/compile-time-evals'
-(define (trace/ns expr kernel?)
-  (parameterize ((current-namespace (choose-namespace kernel?)))
-    (trace expr expand)))
-
-(define (choose-namespace kernel?)
-  (if kernel? kernel-namespace testing-namespace))
-
-(define helper-module
-  '(module helper scheme/base
-     (require (for-syntax scheme/base))
-     (provide Tid
-              Tlist
-              Tlet
-              Tleid
-              Tlift
-              myor
-              the-current-output-port
-              wrong
-              pre-id
-              id
-              leid
-              lift)
-     (define-syntax (id stx)
-       (syntax-case stx ()
-         [(id x) #'x]))
-     (define-syntax (pre-id stx)
-       (syntax-case stx ()
-         [(pre-id x) #'(id x)]))
-     (define-syntax (leid stx)
-       (syntax-case stx ()
-         [(leid e)
-          (with-syntax ([ee (local-expand #'e 'expression null)])
-            #`(#%expression ee))]))
-     (define-syntax (lift stx)
-       (syntax-case stx ()
-         [(lift e)
-          (with-syntax ([v (syntax-local-lift-expression #'e)])
-            #'(#%expression v))]))
-     (define-syntax wrong
-       (lambda (stx)
-         (raise-syntax-error #f "macro blows up here!" stx)))
-     (define-syntax Tid
-       (syntax-rules ()
-         [(Tid e) e]))
-     (define-syntax Tlist
-       (syntax-rules ()
-         [(Tlist e) (list e)]))
-     (define-syntax Tlet
-       (syntax-rules ()
-         [(Tlet x e b) ((lambda (x) b) e)]))
-     (define-syntax (Tleid stx)
-       (syntax-case stx ()
-         [(Tleid e)
-          (with-syntax ([ee (local-expand #'e 'expression null)])
-            #`(#%expression ee))]))
-     (define-syntax (Tlift stx)
-       (syntax-case stx ()
-         [(Tlift e)
-          (with-syntax ([v (syntax-local-lift-expression #'e)])
-            #'(#%expression v))]))
-     (define-syntax myor
-       (syntax-rules ()
-         [(myor x)
-          x]
-         [(myor x y ...)
-          (let ((t x))
-            (if t t (myor y ...)))]))
-     (define-syntax the-current-output-port
-       (make-set!-transformer 
-        (syntax-rules (set!)
-          [(set! the-current-output-port op)
-           (#%plain-app current-output-port op)])))))
-
-(define kernel-namespace (make-base-empty-namespace))
-(parameterize ((current-namespace kernel-namespace))
-  (namespace-require ''#%kernel)
-  (eval '(#%require (for-syntax '#%kernel)))
-  (eval helper-module)
-  (eval '(define-syntaxes (id)
-           (lambda (stx)
-             (cadr (syntax->list stx)))))
-  (eval '(define-syntaxes (Tid)
-           (lambda (stx)
-             (cadr (syntax->list stx)))))
-  (eval '(define-syntaxes (Tlist)
-           (lambda (stx)
-             (datum->syntax (quote-syntax here)
-                            (list (quote-syntax list)
-                                  (cadr (syntax->list stx)))))))
-  (eval '(define-syntaxes (wrong)
-           (lambda (stx)
-             (raise-syntax-error #f "wrong" stx)))))
-
-(define testing-namespace (make-base-namespace))
-(parameterize ((current-namespace testing-namespace))
-  (eval '(require scheme/base))
-  (eval '(require (for-syntax scheme/base)))
-  (eval helper-module)
-
-  (eval '(require 'helper)))
-
-;; Specialized macro hiding tests
-(define (stx/hide-policy d policy)
-  (define-values (_steps _binders _uses stx _exn)
-    (parameterize ((macro-policy policy))
-      (reductions+ d)))
-  stx)
-
-(define (stx/hide-none d)
-  (stx/hide-policy d hide-none-policy))
-(define (stx/hide-all d)
-  (stx/hide-policy d hide-all-policy))
-(define (stx/hide-standard d)
-  (stx/hide-policy d standard-policy))
-
-(define (stx/hide-T d)
-  (stx/hide-policy d T-policy))
-(define (stx/hide-Tm d)
-  (stx/hide-policy d Tm-policy))
-
-;; T hiding policy
-;; ALL macros & primitives are hidden
-;; EXCEPT those starting with T (Tlist and Tlet)
-(define (T-policy id)
-  (or (memq (syntax-e id) '())
-      (regexp-match #rx"^T" (symbol->string (syntax-e id)))))
-
-;; Tm hiding policy
-;; ALL MACROS & primitive tags are hidden
-;; EXCEPT those starting with T (Tlist and Tlet)
-;; EXCEPT module (=> #%module-begin gets tagged)
-(define (Tm-policy id)
-  (or (memq (syntax-e id) '(module))
-      (regexp-match #rx"^T" (symbol->string (syntax-e id)))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/collects.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/collects.rkt
deleted file mode 100644
index 312f5129c3..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/collects.rkt
+++ /dev/null
@@ -1,123 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/path
-         macro-debugger/model/debug
-         rackunit)
-(provide collects-tests
-         modules-for-test
-         trace-modules)
-
-;; loadlib : module-path symbol -> Deriv
-(define (loadlib mod)
-  (trace-module mod))
-
-(define (test-libs name mods)
-  (test-suite name
-    (test-suite "Trace & Parse"
-      (for ([m mods]) (test-lib/deriv m)))
-    #|
-    (test-suite "Reductions"
-      (for ([m mods]) (test-lib/hide m hide-none-policy)))
-    (test-suite "Standard hiding"
-      (for ([m mods]) (test-lib/hide m standard-policy)))
-    |#))
-
-(define (test-lib/deriv m)
-  (test-case (format "~s" m)
-    (let ([deriv (loadlib m)])
-      (check-pred deriv? deriv "Not a deriv")
-      (check-pred ok-node? deriv "Expansion error"))))
-
-(define (test-lib/hide m policy)
-  (test-case (format "~s" m)
-    (let ([deriv (loadlib m)])
-      (check-steps deriv policy))))
-
-(define (check-steps deriv policy)
-  (define-values (steps binders uses stx exn)
-    (parameterize ((macro-policy policy)) (reductions+ deriv)))
-  (check-pred syntax? stx)
-  (check-eq? exn #f)
-  (check-true (list? steps) "Expected list for steps")
-  #|(check-reduction-sequence steps)|#)
-
-(define (check-reduction-sequence steps)
-  ;; FIXME: add remarkstep
-  (cond [(null? steps) (void)]
-        [(and (pair? steps) (step? (car steps)))
-         (check-reduction-sequence (cdr steps))]
-        [(and (pair? steps) (misstep? (car steps)))
-         (check-eq? (cdr steps) '() "Stuff after misstep")]
-        [else (fail "Bad reduction sequence")]))
-
-;; ----
-
-(define (make-tracing-module-name-resolver omnr table)
-  (case-lambda
-    [(mod rel stx load?)
-     (when load?
-       (when (not rel)
-         (hash-set! table mod #t))
-       (when rel
-         (let ([abs (rel+mod->mod rel mod)])
-           (when abs (hash-set! table abs #t)))))
-     (omnr mod rel stx load?)]
-    [args
-     (apply omnr args)]))
-
-(define (rel+mod->mod rel mod)
-  (let* ([rel (resolved-module-path-name rel)]
-         [rel (if (pair? rel) (car rel) rel)])
-    (if (pair? mod)
-        #f  ;; give up on submodules for now; FIXME
-        (let-values ([(base file dir?) (split-path rel)])
-          (path->mod (simplify-path (build-path base mod)))))))
-
-(define (path->mod path)
-  (cond [(for/or ([c (current-library-collection-paths)]) (path->mod* path c))
-         => (lambda (l)
-              (string->symbol
-               (path->string
-                (path-replace-suffix (apply build-path l) #""))))]
-        [else #f]))
-
-(define (path->mod* path base)
-  (let loop ([path (explode-path path)] [base (explode-path base)])
-    (cond [(null? base) path]
-          [(and (pair? path) (pair? base) (equal? (car path) (car base)))
-           (loop (cdr path) (cdr base))]
-          [else #f])))
-
-(define (trace-modules mods)
-  (define table (make-hash))
-  (parameterize ((current-module-name-resolver
-                  (make-tracing-module-name-resolver
-                   (current-module-name-resolver)
-                   table))
-                 (current-namespace (make-base-namespace)))
-    (for ([mod mods])
-      (dynamic-require mod (void)))
-    (let* ([loaded
-            (hash-map table (lambda (k v) k))]
-           [syms
-            (for/list ([l loaded] #:when (symbol? l)) l)]
-           [libs
-            (for/list ([l loaded] #:when (and (pair? l) (eq? (car l) 'lib))) l)]
-           [conv-libs
-            (for/list ([l libs])
-                      (string->symbol
-                       (string-append
-                        (apply string-append
-                               (for/list ([d (cddr l)]) (string-append d "/")))
-                        (path->string (path-replace-suffix (cadr l) #"")))))])
-      (sort (remove-duplicates (append syms conv-libs))
-            string<?
-            #:key symbol->string))))
-
-;; ----
-
-(define modules-for-test
-  (trace-modules '(racket/main typed/racket framework)))
-
-(define collects-tests
-  (test-libs "Trace collections" modules-for-test))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/hiding.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/hiding.rkt
deleted file mode 100644
index 9738a81150..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/hiding.rkt
+++ /dev/null
@@ -1,215 +0,0 @@
-#lang racket/base
-(require rackunit
-         macro-debugger/model/debug
-         "../test-setup.rkt")
-(provide specialized-hiding-tests)
-
-;; == Macro hiding
-
-(define-syntax test-hiding/policy
-  (syntax-rules ()
-    [(th form hidden-e2 policy)
-     (test-case (format "~s" 'form)
-       (let-values ([(steps binders uses stx exn)
-                     (parameterize ((macro-policy policy))
-                       (reductions+ (trace/k 'form)))])
-         (check-pred syntax? stx)
-         (check-equal? (syntax->datum stx) 'hidden-e2)))]))
-
-(define-syntax test-trivial-hiding
-  (syntax-rules ()
-    [(tth form hidden-e2)
-     (test-hiding/policy form hidden-e2 (lambda (m) #t))]))
-(define-syntax test-trivial-hiding/id
-  (syntax-rules ()
-    [(tthi form)
-     (test-trivial-hiding form form)]))
-
-(define-syntax-rule (test-T-hiding form hidden-e2)
-  (test-hiding/policy form hidden-e2 T-policy))
-(define-syntax-rule (test-T-hiding/id form)
-  (test-T-hiding form form))
-
-(define-syntax-rule (test-Tm-hiding form hidden-e2)
-  (test-hiding/policy form hidden-e2 Tm-policy))
-(define-syntax-rule (test-Tm-hiding/id form)
-  (test-Tm-hiding form form))
-
-(define specialized-hiding-tests
-  (test-suite "Specialized macro hiding tests"
-
-    (test-suite "Result tests for trivial hiding"
-      (test-suite "Atomic expressions"
-        (test-trivial-hiding/id *)
-        (test-trivial-hiding 1 '1)
-        (test-trivial-hiding (#%datum . 1) '1)
-        (test-trivial-hiding unbound-var (#%top . unbound-var)))
-      (test-suite "Basic expressions"
-        (test-trivial-hiding/id (if * * *))
-        (test-trivial-hiding/id (with-continuation-mark * * *))
-        (test-trivial-hiding/id (define-values (x) *))
-        (test-trivial-hiding/id (define-syntaxes (x) *)))
-      (test-suite "Binding expressions"
-        (test-trivial-hiding/id (lambda (x) *))
-        (test-trivial-hiding/id (case-lambda [(x) *] [(x y) *]))
-        (test-trivial-hiding/id (let-values ([(x) *]) *))
-        (test-trivial-hiding/id (letrec-values ([(x) *]) *)))
-      (test-suite "Blocks"
-        ;; Internal definitions no longer expand into straightforward letrec exprs;
-        ;; now they can also produce multiple nested lets/letrec forms
-        (test-trivial-hiding/id (lambda (x y) x y))
-        (test-trivial-hiding (lambda (x y z) (begin x y) z)
-                             (lambda (x y z) x y z))
-        (test-trivial-hiding (lambda (x y z) x (begin y z))
-                             (lambda (x y z) x y z))
-        (test-trivial-hiding (lambda (x) (define-values (y) x) y)
-                             (lambda (x) (let-values ([(y) x]) y)))
-        (test-trivial-hiding (lambda (x) (begin (define-values (y) x)) y)
-                             (lambda (x) (let-values ([(y) x]) y)))
-        (test-trivial-hiding (lambda (x) (begin (define-values (y) x) y) x)
-                             (lambda (x) (let-values ([(y) x]) y x)))
-        (test-trivial-hiding (lambda (x) (id (define-values (y) x)) x)
-                             (lambda (x) (let-values ([(y) x]) x)))
-        (test-trivial-hiding (lambda (x) (id (begin (define-values (y) x) x)))
-                             (lambda (x) (let-values ([(y) x]) x)))
-        (test-trivial-hiding (lambda (x) (define-values (y) (id x)) y)
-                             (lambda (x) (let-values ([(y) x]) y)))
-        (test-trivial-hiding (lambda (x y) x (id y))
-                             (lambda (x y) x y))
-        (test-trivial-hiding (lambda (x) (define-values (y) (id x)) y)
-                             (lambda (x) (let-values ([(y) x]) y))))
-      #|
-      ;; Old hiding mechanism never did letrec transformation (unless forced)
-      (test-suite "Block normalization"
-        (test-trivial-hiding/id (lambda (x y) x y))
-        (test-trivial-hiding/id (lambda (x y z) (begin x y) z))
-        (test-trivial-hiding/id (lambda (x y z) x (begin y z)))
-        (test-trivial-hiding/id (lambda (x) (define-values (y) x) y))
-        (test-trivial-hiding/id (lambda (x) (begin (define-values (y) x)) y))
-        (test-trivial-hiding/id (lambda (x) (begin (define-values (y) x) y) x))
-        (test-trivial-hiding (lambda (x) (id x))
-                             (lambda (x) x))
-        (test-trivial-hiding (lambda (x) (id (begin (define-values (y) x) x)))
-                             (lambda (x) (begin (define-values (y) x) x)))
-        (test-trivial-hiding (lambda (x) (define-values (y) (id x)) y)
-                             (lambda (x) (define-values (y) x) y)))
-      |#
-      )
-
-    (test-suite "Result tests for T hiding"
-      (test-suite "Atomic expressions"
-        (test-T-hiding/id *)
-        (test-T-hiding/id 1)
-        (test-T-hiding/id unbound-var))
-      (test-suite "Basic expressions"
-        (test-T-hiding/id (if 1 2 3))
-        (test-T-hiding/id (with-continuation-mark 1 2 3))
-        (test-T-hiding/id (define-values (x) 1))
-        (test-T-hiding/id (define-syntaxes (x) 1)))
-      (test-suite "Opaque macros"
-        (test-T-hiding/id (id '1))
-        (test-T-hiding/id (id 1))
-        (test-T-hiding/id (id (id '1)))
-        ;; app is hidden:
-        (test-T-hiding/id (+ '1 '2)))
-      (test-suite "Transparent macros"
-        (test-T-hiding (Tlist x)
-                       (list x))
-        (test-T-hiding (Tid x) x)
-        (test-T-hiding (Tlist (id x))
-                       (list (id x)))
-        (test-T-hiding (Tid (id x))
-                       (id x))
-        (test-T-hiding (id (Tlist x))
-                       (id (list x)))
-        (test-T-hiding (id (Tid x))
-                       (id x)))
-      (test-suite "Blocks"
-        ;; See note about about internal definition expansion
-        (test-T-hiding/id (lambda (x y) x y))
-        (test-T-hiding (lambda (x y z) (begin x y) z)
-                       (lambda (x y z) x y z))
-        (test-T-hiding (lambda (x y z) x (begin y z))
-                       (lambda (x y z) x y z))
-        (test-T-hiding (lambda (x) (define-values (y) x) y)
-                       (lambda (x) (let-values ([(y) x]) y)))
-        (test-T-hiding (lambda (x) (begin (define-values (y) x)) y)
-                       (lambda (x) (let-values ([(y) x]) y)))
-        (test-T-hiding (lambda (x) (begin (define-values (y) x) y) x)
-                       (lambda (x) (let-values ([(y) x]) y x)))
-        (test-T-hiding (lambda (x) (id x))
-                       (lambda (x) (id x)))
-        (test-T-hiding (lambda (x) (Tid x))
-                       (lambda (x) x))
-        (test-T-hiding/id (lambda (x) (id (define-values (y) x)) x))
-        (test-T-hiding (lambda (x) (id (define-values (y) x)) (Tid x))
-                       (lambda (x) (id (define-values (y) x)) x))
-        (test-T-hiding/id (lambda (x) (id (begin (define-values (y) x) x))))
-        (test-T-hiding (lambda (x) (begin (id (define-values (y) x)) y))
-                       (lambda (x) (id (define-values (y) x)) y))
-        (test-T-hiding (lambda (x) (id (begin (Tid (define-values (y) x)))) (Tid y))
-                       (lambda (x) (id (begin (define-values (y) x))) y))
-        (test-T-hiding (lambda (x) (id (begin (Tid (define-values (y) x)))) x (Tid y))
-                       (lambda (x) (id (begin (define-values (y) x))) x y))
-        (test-T-hiding (lambda (x) (define-values (y) (id x)) y)
-                       (lambda (x) (letrec-values ([(y) (id x)]) y)))
-        (test-T-hiding (lambda (x y) x (id y))
-                       (lambda (x y) x (id y)))
-        (test-T-hiding (lambda (x y) x (Tid y))
-                       (lambda (x y) x y))
-        (test-T-hiding (lambda (x) (id (define-values (y) x)) x (Tid y))
-                       (lambda (x) (id (define-values (y) x)) x y))
-        (test-T-hiding/id (lambda (x) (id (define-values (y) (id x))) y))
-        #|
-        FIXME
-        (test-T-hiding (lambda (x) (id (define-values (y) (Tid x))) y)
-                       (lambda (x) (id (define-values (y) x)) y))
-        |#)
-      (test-suite "Binding expressions"
-        (test-T-hiding/id (lambda (x) x))
-        (test-T-hiding/id (lambda (x) (id x))))
-      (test-suite "Module declarations"
-        (test-T-hiding (module m mzscheme
-                         (require 'helper)
-                         (define x 1))
-                       (module m mzscheme
-                         (require 'helper)
-                         (define x 1)))
-        (test-Tm-hiding (module m mzscheme
-                          (require 'helper)
-                          (define x 1))
-                        (module m mzscheme
-                          (#%module-begin
-                           (require 'helper)
-                           (define x 1))))
-
-        (test-T-hiding (module m mzscheme
-                         (require 'helper)
-                         (define x (Tlist 1)))
-                       (module m mzscheme
-                         (require 'helper)
-                         (define x (list 1))))
-        (test-Tm-hiding (module m mzscheme
-                          (require 'helper)
-                          (define x (Tlist 1)))
-                        (module m mzscheme
-                          (#%module-begin
-                           (require 'helper)
-                           (define x (list 1)))))
-
-        (test-T-hiding (module m mzscheme
-                         (#%plain-module-begin
-                          (require 'helper)
-                          (define x (Tlist 1))))
-                       (module m mzscheme
-                         (#%plain-module-begin
-                          (require 'helper)
-                          (define x (list 1)))))
-        (test-Tm-hiding (module m mzscheme
-                          (#%plain-module-begin
-                           (require 'helper)
-                           (define x (Tlist 1))))
-                        (module m mzscheme
-                          (#%plain-module-begin
-                           (require 'helper)
-                           (define x (list 1)))))))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/policy.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/policy.rkt
deleted file mode 100644
index 39206808dc..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/policy.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang racket/base
-(require rackunit
-         macro-debugger/model/debug
-         "../test-setup.rkt")
-(provide policy-tests)
-
-(define ns (make-base-namespace))
-(eval '(require (prefix-in k: '#%kernel)) ns)
-(eval '(require (prefix-in base: racket/base)) ns)
-(eval '(require (prefix-in scheme: racket)) ns)
-
-(define (make-test-id sym)
-  (parameterize ((current-namespace ns))
-    (namespace-symbol->identifier sym)))
-
-(define-syntax-rule (test-policy policy name show?)
-  (test-case (format "~s" 'name)
-    (check-eq? (policy (make-test-id 'name))
-               show?)))
-(define-syntax-rule (test-standard name show?)
-  (test-policy standard-policy name show?))
-(define-syntax-rule (test-base name show?)
-  (test-policy base-policy name show?))
-
-(define policy-tests
-  (test-suite "Policy tests"
-    (test-suite "Base policy"
-      ;; Kernel forms
-      (test-base k:define-values #f)
-      (test-base k:lambda #f)
-      (test-base k:if #f)
-
-      ;; racket/base forms
-      (test-base base:define #f)
-      (test-base base:lambda #f)
-      (test-base base:#%app #f)
-      (test-base base:if #f)
-
-      ;; Other racket/* forms
-      (test-base scheme:match #f)
-      (test-base scheme:unit #f)
-      (test-base scheme:class #f)
-
-      ;; Unbound names
-      (test-base no-such-name #t)
-      )
-    (test-suite "Standard policy"
-      ;; Kernel forms
-      (test-standard k:define-values #f)
-      (test-standard k:lambda #f)
-      (test-standard k:if #f)
-
-      ;; racket/base forms
-      (test-standard base:define #f)
-      (test-standard base:lambda #f)
-      (test-standard base:#%app #f)
-      (test-standard base:if #f)
-
-      ;; Other racket/* forms
-      (test-standard scheme:match #f)
-      (test-standard scheme:unit #f)
-      (test-standard scheme:class #f)
-
-      ;; Unbound names
-      (test-standard no-such-name #t))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/regression.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/regression.rkt
deleted file mode 100644
index 178308f511..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/regression.rkt
+++ /dev/null
@@ -1,240 +0,0 @@
-#lang racket/base
-(require rackunit)
-(require macro-debugger/model/debug
-         macro-debugger/model/steps
-         "../test-setup.rkt")
-(provide regression-tests)
-
-(define regression-tests
-  (test-suite "Regression tests"
-    ;; Fixed 9/2006: mismatched binding+bound variables
-    (test-case "hiding on binding forms"
-      (let ([stx (stx/hide-all (trace #'(let ([x 1]) x)))])
-        (with-syntax ([(?let ([?x-def _]) ?x-use) stx])
-          (check-pred identifier? #'?x-def)
-          (check-pred identifier? #'?x-use)
-          (check bound-identifier=? #'?x-def #'?x-use))))
-    ;; Fixed 10/2/2006: bad handling of renames
-    (test-case "renames in lsv, etc"
-      (check-pred syntax? (stx/hide-none (trace #'(let () 1))))
-      (check-pred syntax? (stx/hide-none (trace #'(letrec () 1))))
-      (check-pred syntax? (stx/hide-none (trace #'(let-syntax () 1)))))
-    ;; Fixed 10/2/2006: error above manifests in classes, too
-    (test-case "renames in lsv, via class"
-      (check-pred syntax? (stx/hide-none (trace #'(class object% (super-new))))))
-    ;; Fixed 10/2/2006: PR 8305: Error in module (pass2)
-    (test-case "interrupted expr in module body"
-      (check-equal? (stx/hide-standard
-                     (trace '(module m mzscheme (define x (lambda)))))
-                    #f)
-      (check-equal? (stx/hide-standard
-                     (trace '(module m mzscheme (void) (define x (lambda)))))
-                    #f))
-    ;; Error in module (pass1)
-    (test-case "interrupted module-body element"
-      (check-equal? (stx/hide-standard (trace '(module m mzscheme (define x))))
-                    #f)
-      (check-equal? (stx/hide-standard (trace '(module m mzscheme (void) (define x))))
-                    #f))
-    ;; Fixed 11/13/2006: error in lsv rhs
-    (test-case "error in lsv rhs"
-      (check-pred interrupted-node? 
-                  (trace #'(letrec-syntaxes+values ([(x) (error 'gotcha)]) ()
-                                                   'never-reached))))
-    ;; Fixed 11/13/2006: lifting in module
-    (test-case "lift in module"
-      (check-pred syntax?
-                  (stx/hide-none
-                   (trace '(module m mzscheme
-                             (require mzlib/etc)
-                             (define x (begin-lifted 1)))))))
-
-    ;; Fixed 2/9/2007: defstx in brules misparsed & mishandled
-    (test-case "reductions & internal define-syntax"
-      (reductions
-       (trace '(let ([x 1])
-                 (define-syntax m
-                   (syntax-rules ()
-                     [(_ x) (begin (lambda (x) x) (lambda (x) x) x)]))
-                 (m x)))))
-
-    ;; Fixed 2/9/2007: Handled b:defstx in hiding code
-    (test-case "reductions & internal define-syntax"
-      (check-pred syntax?
-                  (stx/hide-none
-                   (trace/t '(lambda ()
-                               (define-syntaxes (m) (lambda _ (quote-syntax *)))
-                               (m))))))
-
-    ;; Fixed 2/9/2007: missing stx->list before length
-    (test-case "hiding error & stx pairs"
-      (check-pred syntax?
-               (stx/hide-none
-                (trace '(let-syntax ([m (syntax-rules () [(_ x) (begin x)])])
-                          (m *))))))
-    (test-case "hiding in block, splicing"
-      (stx/hide-none
-       (trace '(let-syntax ([m (syntax-rules () [(_ x) (begin x)])])
-                 *
-                 (m *)))))
-    (test-case "hiding in block, variable"
-      (stx/hide-none
-       (trace '(let-syntax ([m (syntax-rules () [(_ x) x])])
-                 (list (m *)) ;; FIXME
-                 *))))
-    (test-case "hiding in block, expression"
-      (check-pred syntax?
-               (stx/hide-none
-                (trace '(let-syntax ([m (syntax-rules () [(_ x) (list x)])])
-                          (m *))))))
-
-    ;; Reported by robby (2/8/2007), traced to bug in expander
-    (test-case "hiding & lambda in module"
-      (check-pred syntax?
-                  (stx/hide-none
-                   (trace '(module m '#%kernel
-                             (#%module-begin (lambda () 'a)))))))
-
-    ;; Discovered 5/7/2007
-    (test-case "hiding and error within lambda"
-      (let ([rs (parameterize ((macro-policy hide-all-policy))
-                  (reductions (trace '(with-handlers () (lambda)))))])
-        (check-pred list? rs)
-        (check-true (andmap misstep? rs))
-        (check-true (= 1 (length rs)))))
-
-    ;; Discovered 5/7/2007
-    (test-case "hiding and error within lambda 2"
-      (let ([rs (parameterize ((macro-policy hide-all-policy))
-                  (reductions (trace '(with-handlers ([void void]) (lambda)))))])
-        (check-pred list? rs)
-        (check-true (andmap misstep? rs))
-        (check-true (= 1 (length rs)))))
-
-    ;; Distilled from Robby bug report (5/12/2007)
-    ;; Fixed 5/17/2007
-    (test-case "hiding: keeping lifts in sync"
-      (let ([freshname (gensym)])
-        (eval `(module ,freshname racket/base
-                 (require racket/contract)
-                 (provide/contract
-                  [f (-> integer? integer?)]
-                  [c integer?])
-                 (define (f x) (add1 x))
-                 (define c 1)))
-        (let ([rs (parameterize ((macro-policy standard-policy))
-                    (reductions
-                     (trace `(module m mzscheme
-                               (require (quote ,freshname))
-                               (define (g y) c)
-                               (define h c)
-                               (add1 (g 2))))))])
-          (check-pred list? rs)
-          (for ([x (in-list rs)])
-            (check-true (not (misstep? x)))))))
-
-    ;; Bug from samth (6/5/2007)
-    ;; problem seems to come from define-syntax -> letrec-syntaxes+values
-    ;; transformation, undoes expansion of srhss (so rename fails)
-    (test-case "more rename/frontier troubles"
-      (let ([rs (reductions
-                 (trace '(module m (lib "htdp-advanced.ss" "lang")
-                           (local [(define x 1)] x))))])
-        (check-pred list? rs)))
-
-    ;; Distilled from Sam/typed-scheme (8/24/2007)
-    (test-case "transformer calls 'expand'"
-      (check-pred deriv?
-                  (trace '(let-syntax ([m (lambda (stx)
-                                            (syntax-case stx ()
-                                              [(m e)
-                                               (expand #'e)]))])
-                            (m 4)))))
-    (test-case "define-syntaxes rhs calls 'expand'"
-      (check-pred deriv?
-                  (trace '(define-syntax m (expand '(or 1 2))))))
-    (test-case "lsv rhs calls 'expand'"
-      (check-pred deriv?
-                  (trace '(let-syntax ([m (expand '(or 1 2))]) 'nothing))))
-
-    ;; Added 2/18/2008
-    (test-case "interrupted module-begin"
-      (let* ([freshname (gensym)]
-             [rs (parameterize ((macro-policy standard-policy))
-                   (reductions
-                    (trace `(module m mzscheme
-                              (require ,freshname)
-                              (define (g y) c)
-                              (define h c)
-                              (add1 (g 2))))))])
-        (check-pred list? rs)
-        (check-true (ormap misstep? rs))))
-
-    ;; Added 1/3/2008
-    ;; Based on PR 10000
-    (test-case "eval within module expansion"
-      (let ([freshname (gensym)])
-        (eval `(module ,freshname scheme
-                 (provide meval)
-                 (define-syntax (meval stx)
-                   (syntax-case stx ()
-                     [(meval e)
-                      (parameterize ((current-namespace (make-base-namespace)))
-                        (eval `(define one '1))
-                        (let ([v (eval `(+ 1 ,#'e))])
-                          #`(quote #,v)))]))))
-        (eval `(require ',freshname))
-        (check-pred deriv?
-                    (trace `(meval (+ 1 2))))
-        (check-pred deriv?
-                    (trace `(module m mzscheme
-                              (require ',freshname)
-                              (meval (+ 1 2)))))))
-
-    (test-case "macro def within begin"
-      (let ([rs (reductions
-                 (parameterize ((current-namespace testing-namespace))
-                   (trace '(begin
-                             (define-syntax-rule (m x e)
-                               (define x e))
-                             (m y 12)))))])
-        (check-pred list? rs)
-        (check-false (ormap misstep? rs))
-        (check-true (for/or ([step rs])
-                      (equal? (syntax->datum (state-e (protostep-s1 step)))
-                              '(m y 12))
-                      (equal? (syntax->datum (state-e (step-s2 step)))
-                              '(define y 12)))
-                    "looking for m => define")))
-
-    ;; Added 3/12/2012 based on bug from cce
-    (test-case "begin-for-syntax ends with phase1 eval"
-      (let ([d (trace '(module m '#%kernel
-                         (#%module-begin
-                          (#%require (for-syntax '#%kernel))
-                          (begin-for-syntax
-                           (syntax-local-value (quote-syntax lambda) void)))))])
-        (check-pred deriv? d)
-        (check-pred ok-node? d)))
-    (test-case "syntax-local-value in provide"
-      (let ([d (trace '(module m racket/base
-                         (#%plain-module-begin
-                          (provide (except-out (all-defined-out) x y))
-                          (define-values (x) 1)
-                          (define-values (y) 2))))])
-        (check-pred deriv? d)
-        (check-pred ok-node? d)))
-
-    ;; Added 10/11/2012 based on bug from mflatt,shriram
-    (test-case "recover from jump"
-      (let ([d (trace '(module m racket/base
-                         (require (for-syntax racket/base))
-                         (define-syntax (convert-error stx)
-                           (syntax-case stx ()
-                             [(convert-error expr)
-                              (with-handlers ([exn? (lambda (e) #'(quote error))])
-                                (local-expand #'expr 'expression null))]))
-                         (convert-error (lambda))))])
-        (check-pred deriv? d)
-        (check-pred ok-node? d)))
-    ))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-basic.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-basic.rkt
deleted file mode 100644
index d8c2ee7b9e..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-basic.rkt
+++ /dev/null
@@ -1,370 +0,0 @@
-#lang racket/base
-(require "../gentest-framework.rkt")
-(provide proto:kernel-forms
-         proto:kernel-contexts)
-
-(define-tests proto:kernel-forms "Kernel forms"
-  [#:suite
-   "Atomic expressions"
-   (testK "required variable"
-          null
-          #:no-steps)
-   (testK "datum (number)"
-          1
-          [#:steps (tag-datum (#%datum . 1))
-                   (macro '1)]
-          #:no-hidden-steps)
-   (testK "datum (boolean)"
-          #f
-          [#:steps (tag-datum (#%datum . #f))
-                   (macro '#f)]
-          #:no-hidden-steps)
-   (testK "datum (explicit)"
-          (#%datum . 5)
-          [#:steps (macro '5)]
-          #:no-hidden-steps)
-   (testK "#%top (implicit)"
-          unbound-variable
-          [#:steps (tag-top (#%top . unbound-variable))]
-          #:no-hidden-steps)
-   (testK "#%top (explicit)"
-          (#%top . unbound-variable)
-          #:no-steps)
-   (testK "quote"
-          (quote mumble)
-          #:no-steps)
-   (testK "#%require"
-          (#%require mzscheme)
-          #:no-steps)
-   (testK "require for-syntax"
-          (#%require (for-syntax mzscheme))
-          #:no-steps)
-   (testK "require for-template"
-          (#%require (for-template mzscheme))
-          #:no-steps)]
-
-  [#:suite
-   "Definitions"
-   (testK "define-values"
-          (define-values (x) 'a)
-          #:no-steps)
-   (testK "define-syntaxes"
-          (define-syntaxes (x) 'a)
-          #:no-steps)]
-
-  [#:suite
-   "Simple expressions"
-   (testK "if"
-          (if 'a 'b 'c)
-          #:no-steps)
-   (testK "wcm"
-          (with-continuation-mark 'a 'b 'c)
-          #:no-steps)
-   (testK "set!"
-          (set! x 'a)
-          #:no-steps)]
-
-  [#:suite
-   "Sequence-containing expressions"
-   (testK "begin"
-          (begin 'a 'b)
-          #:no-steps)
-   (testK "begin0 (single)"
-          (begin0 'a)
-          #:no-steps)
-   (testK "begin0 (multiple)"
-          (begin0 'a 'b 'c)
-          #:no-steps)
-   (testK "#%app (implicit)"
-          (+ '1 '2)
-          [#:steps (tag-app (#%app + '1 '2))]
-          #:no-hidden-steps)
-   (testK "#%app (implicit)"
-          (+ '1 '2)
-          [#:steps (tag-app (#%app + '1 '2))])
-   (testK "#%app (explicit)"
-          (#%app + '1 '2 '3)
-          #:no-steps)]
-
-  [#:suite
-   "Binding forms"
-   (testK "lambda (simple)"
-          (lambda (x) x)
-          [#:steps (rename-lambda (lambda (x) x))]
-          #:same-hidden-steps)
-   (testK "lambda (rest args)"
-          (lambda (x . y) y)
-          [#:steps (rename-lambda (lambda (x . y) y))]
-          #:same-hidden-steps)
-   (testK "lambda (multi)"
-          (lambda (x) 'a 'b)
-          [#:steps (rename-lambda (lambda (x) 'a 'b))]
-          #:same-hidden-steps)
-   (testK "letrec-values"
-          (letrec-values ([(x) 'a]) x)
-          [#:steps (rename-letrec-values (letrec-values ([(x) 'a]) x))]
-          #:same-hidden-steps)
-   (testK "letrec-values"
-          (letrec-values ([(x) 'a] [(y) 'b]) y)
-          [#:steps
-           (rename-letrec-values
-            (letrec-values ([(x) 'a] [(y) 'b]) y))]
-          #:same-hidden-steps)
-   (testK "case-lambda"
-          (case-lambda [(x) x] [(x y) y])
-          [#:steps
-           (rename-case-lambda (case-lambda [(x) x] [(x y) y]))
-           (rename-case-lambda (case-lambda [(x) x] [(x y) y]))]
-          #:same-hidden-steps)
-   (testK "let-values"
-          (let-values ([(x) 'a]) x)
-          [#:steps (rename-let-values (let-values ([(x) 'a]) x))]
-          #:same-hidden-steps)]
-
-  [#:suite
-   "Internal definitions within #%stratified-body"
-   (testK "internal begin (empty)"
-          (#%stratified-body (begin) 'a)
-          [#:steps (splice-block (#%stratified-body 'a))
-                   (macro 'a)]
-          [#:hidden-steps (splice-block (#%stratified-body 'a))])
-   (testK "internal begin (solo)"
-          (#%stratified-body (begin 'b))
-          [#:steps (splice-block (#%stratified-body 'b))
-                   (macro 'b)]
-          [#:hidden-steps (splice-block (#%stratified-body 'b))])
-   (testK "internal begin"
-          (#%stratified-body (begin 'a) 'b)
-          [#:steps (splice-block (#%stratified-body 'a 'b))
-                   (macro (begin 'a 'b))]
-          [#:hidden-steps (splice-block (#%stratified-body 'a 'b))])
-   (testK "internal define-values"
-          (#%stratified-body (define-values (x) 'a) 'b)
-          [#:steps (block->letrec (#%stratified-body (letrec-values ([(x) 'a]) (#%stratified-body 'b))))
-                   (rename-letrec-values (#%stratified-body (letrec-values ([(x) 'a]) (#%stratified-body 'b))))
-                   (macro (#%stratified-body (letrec-values ([(x) 'a]) 'b)))
-                   (macro (letrec-values ([(x) 'a]) 'b))]
-          [#:hidden-steps
-           (block->letrec (#%stratified-body (letrec-values ([(x) 'a]) (#%stratified-body 'b))))
-           (rename-letrec-values (#%stratified-body (letrec-values ([(x) 'a]) (#%stratified-body 'b))))])
-   (testK "internal define-values in begin"
-          (#%stratified-body (begin (define-values (x) 'a)) 'b)
-          [#:steps
-           (splice-block (#%stratified-body (define-values (x) 'a) 'b))
-           (block->letrec (#%stratified-body (letrec-values ([(x) 'a]) (#%stratified-body 'b))))
-           (rename-letrec-values (#%stratified-body (letrec-values ([(x) 'a]) (#%stratified-body 'b))))
-           (macro (#%stratified-body (letrec-values ([(x) 'a]) 'b)))
-           (macro (letrec-values ([(x) 'a]) 'b))]
-          [#:hidden-steps
-           (splice-block (#%stratified-body (define-values (x) 'a) 'b))
-           (block->letrec (#%stratified-body (letrec-values ([(x) 'a]) (#%stratified-body 'b))))
-           (rename-letrec-values (#%stratified-body (letrec-values ([(x) 'a]) (#%stratified-body 'b))))])
-   (testK "internal begin, then define-values"
-          (#%stratified-body (begin) (define-values (x) 'a) 'b)
-          [#:steps
-           (splice-block (#%stratified-body (define-values (x) 'a) 'b))
-           (block->letrec (#%stratified-body (letrec-values ([(x) 'a]) (#%stratified-body 'b))))
-           (rename-letrec-values (#%stratified-body (letrec-values ([(x) 'a]) (#%stratified-body 'b))))
-           (macro (#%stratified-body (letrec-values ([(x) 'a]) 'b)))
-           (macro (letrec-values ([(x) 'a]) 'b))])]
-
-  [#:suite
-   "Internal definitions (mixed defs and exprs)"
-   (testK "internal begin (empty)"
-          (lambda () (begin) 'a)
-          [#:steps (rename-lambda (lambda () (begin) 'a))
-                   (splice-block (lambda () 'a))]
-          #:same-hidden-steps)
-   (testK "internal begin (solo)"
-          (lambda () (begin 'b))
-          [#:steps (rename-lambda (lambda () (begin 'b)))
-                   (splice-block (lambda () 'b))]
-          #:same-hidden-steps)
-   (testK "internal begin"
-          (lambda () (begin 'a) 'b)
-          [#:steps (rename-lambda (lambda () (begin 'a) 'b))
-                   (splice-block (lambda () 'a 'b))]
-          #:same-hidden-steps)
-   (testK "internal begin"
-          (lambda () (begin 'a 'b) 'c) 
-          [#:steps (rename-lambda (lambda () (begin 'a 'b) 'c))
-                   (splice-block (lambda () 'a 'b 'c))]
-          #:same-hidden-steps)
-   (testK "internal define-values"
-          (lambda () (define-values (x) 'a) 'b)
-          [#:steps (rename-lambda (lambda () (define-values (x) 'a) 'b))
-                   (block->letrec (lambda () (letrec-values ([(x) 'a]) 'b)))
-                   (rename-letrec-values (lambda () (letrec-values ([(x) 'a]) 'b)))]
-          #:same-hidden-steps)
-   (testK "internal define-values in begin"
-          (lambda () (begin (define-values (x) 'a)) 'b)
-          [#:steps
-           (rename-lambda (lambda () (begin (define-values (x) 'a)) 'b))
-           (splice-block (lambda () (define-values (x) 'a) 'b))
-           (block->letrec (lambda () (letrec-values ([(x) 'a]) 'b)))
-           (rename-letrec-values (lambda () (letrec-values ([(x) 'a]) 'b)))]
-          #:same-hidden-steps)
-   (testK "internal begin, then define-values"
-          (lambda () (begin) (define-values (x) 'a) 'b)
-          [#:steps
-           (rename-lambda (lambda () (begin) (define-values (x) 'a) 'b))
-           (splice-block (lambda () (define-values (x) 'a) 'b))
-           (block->letrec (lambda () (letrec-values ([(x) 'a]) 'b)))
-           (rename-letrec-values (lambda () (letrec-values ([(x) 'a]) 'b)))]
-          #:same-hidden-steps)
-   (testK "define-values after expr"
-          (lambda () 'a (define-values (x) 'b) 'c)
-          [#:steps
-           (rename-lambda (lambda () 'a (define-values (x) 'b) 'c))
-           (block->letrec (lambda () (letrec-values ([() (begin 'a (values))] [(x) 'b]) 'c)))
-           (rename-letrec-values
-            (lambda () (letrec-values ([() (begin 'a (values))] [(x) 'b]) 'c)))
-           (tag-app (lambda () (letrec-values ([() (begin 'a (#%app values))] [(x) 'b]) 'c)))
-           ;; FIXME: should have TAG step for transform to nested let-values
-           ]
-          [#:hidden-steps
-           (rename-lambda (lambda () 'a (define-values (x) 'b) 'c))
-           (block->letrec (lambda () (letrec-values ([() (begin 'a (values))] [(x) 'b]) 'c)))
-           (rename-letrec-values
-            (lambda () (letrec-values ([() (begin 'a (values))] [(x) 'b]) 'c)))])]
-
-  [#:suite
-   "Top-level begin"
-   (testK "begin (top-level)"
-          (begin (define-values (x) 'a) 'b)
-          #:no-steps)
-   (testK "begin (empty)"
-          (begin)
-          #:no-steps)])
-
-(define-tests proto:kernel-contexts "Kernel contexts"
-  [#:suite 
-   "Definitions"
-   (testK "define-values"
-          (define-values (x) (id 'a))
-          [#:steps (macro (define-values (x) 'a))]
-          #:no-hidden-steps)
-   (testK "define-values"
-          (define-values (x) (Tid 'a))
-          [#:steps (macro (define-values (x) 'a))]
-          #:same-hidden-steps)]
-  [#:suite
-   "Simple expressions"
-   (testK "if (with else)"
-          (if (Tid 'a) (Tid 'b) (Tid 'c))
-          [#:steps (macro (if 'a (Tid 'b) (Tid 'c)))
-                   (macro (if 'a 'b (Tid 'c)))
-                   (macro (if 'a 'b 'c))]
-          #:same-hidden-steps)
-   (testK "wcm"
-          (with-continuation-mark (id 'a) (id 'b) (id 'c))
-          [#:steps (macro (with-continuation-mark 'a (id 'b) (id 'c)))
-                   (macro (with-continuation-mark 'a 'b (id 'c)))
-                   (macro (with-continuation-mark 'a 'b 'c))]
-          #:no-hidden-steps)]
-  [#:suite
-   "Sequence-containing forms"
-   (testK "begin"
-          (begin (id 'a) (id 'b))
-          [#:steps (macro (begin 'a (id 'b)))
-                   (macro (begin 'a 'b))]
-          #:no-hidden-steps)
-   (testK "begin"
-          (begin (Tid 'a) (Tid 'b))
-          [#:steps (macro (begin 'a (Tid 'b)))
-                   (macro (begin 'a 'b))]
-          #:same-hidden-steps)
-   (testK "begin0 (single)"
-          (begin0 (id 'a))
-          [#:steps (macro (begin0 'a))]
-          #:no-hidden-steps)
-   (testK "begin0 (multiple)"
-          (begin0 (id 'a) (id 'b))
-          [#:steps (macro (begin0 'a (id 'b)))
-                   (macro (begin0 'a 'b))]
-          #:no-hidden-steps)
-   (testK "#%app (implicit)"
-          ((id cons) (id 'a) (id 'b))
-          [#:steps (tag-app (#%app (id cons) (id 'a) (id 'b)))
-                   (macro (#%app cons (id 'a) (id 'b)))
-                   (macro (#%app cons 'a (id 'b)))
-                   (macro (#%app cons 'a 'b))]
-          #:no-hidden-steps)
-   (testK "#%app (implicit)"
-          ((Tid cons) (Tid 'a) (Tid 'b))
-          [#:steps (tag-app (#%app (Tid cons) (Tid 'a) (Tid 'b)))
-                   (macro (#%app cons (Tid 'a) (Tid 'b)))
-                   (macro (#%app cons 'a (Tid 'b)))
-                   (macro (#%app cons 'a 'b))]
-          [#:hidden-steps (macro (cons (Tid 'a) (Tid 'b)))
-                          (macro (cons 'a (Tid 'b)))
-                          (macro (cons 'a 'b))])
-   (testK "#%app (explicit)"
-          (#%app (id cons) (id 'a) (id 'b))
-          [#:steps (macro (#%app cons (id 'a) (id 'b)))
-                   (macro (#%app cons 'a (id 'b)))
-                   (macro (#%app cons 'a 'b))]
-          #:no-hidden-steps)
-   (testK "#%app (explicit)"
-          (#%app (Tid cons) (Tid 'a) (Tid 'b))
-          [#:steps (macro (#%app cons (Tid 'a) (Tid 'b)))
-                   (macro (#%app cons 'a (Tid 'b)))
-                   (macro (#%app cons 'a 'b))]
-          #:same-hidden-steps)]
-  
-  [#:suite
-   "Binding forms"
-   (testK "lambda (simple)"
-          (lambda (x) (id x))
-          [#:steps (rename-lambda (lambda (x) (id x)))
-                   (macro (lambda (x) x))]
-          [#:hidden-steps (rename-lambda (lambda (x) (id x)))])
-   (testK "lambda (rest args)"
-          (lambda (x . y) (id y))
-          [#:steps (rename-lambda (lambda (x . y) (id y)))
-                   (macro (lambda (x . y) y))]
-          [#:hidden-steps (rename-lambda (lambda (x . y) (id y)))])
-   (testK "lambda (multi)"
-          (lambda (x) (id 'a) (id 'b))
-          [#:steps (rename-lambda (lambda (x) (id 'a) (id 'b)))
-                   (macro (lambda (x) 'a (id 'b)))
-                   (macro (lambda (x) 'a 'b))]
-          [#:hidden-steps (rename-lambda (lambda (x) (id 'a) (id 'b)))])
-   (testK "lambda (splice)"
-          (lambda (x) (begin (id 'a) (id 'b)) (id 'c))
-          [#:steps (rename-lambda (lambda (x) (begin (id 'a) (id 'b)) (id 'c)))
-                   (splice-block (lambda (x) (id 'a) (id 'b) (id 'c)))
-                   (macro (lambda (x) 'a (id 'b) (id 'c)))
-                   (macro (lambda (x) 'a 'b (id 'c)))
-                   (macro (lambda (x) 'a 'b 'c))]
-          [#:hidden-steps
-           (rename-lambda (lambda (x) (begin (id 'a) (id 'b)) (id 'c)))
-           (splice-block (lambda (x) (id 'a) (id 'b) (id 'c)))])
-   (testK "lambda (splice 2)"
-          (lambda (x) (id (begin 'a 'b)) (id 'c))
-          [#:steps (rename-lambda (lambda (x) (id (begin 'a 'b)) (id 'c)))
-                   (macro (lambda (x) (begin 'a 'b) (id 'c)))
-                   (splice-block (lambda (x) 'a 'b (id 'c)))
-                   (macro (lambda (x) 'a 'b 'c))])
-   (testK "case-lambda"
-          (case-lambda [(x) (id x)] [(x y) (id y)])
-          [#:steps (rename-case-lambda (case-lambda [(x) (id x)] [(x y) (id y)]))
-                   (macro (case-lambda [(x) x] [(x y) (id y)]))
-                   (rename-case-lambda (case-lambda [(x) x] [(x y) (id y)]))
-                   (macro (case-lambda [(x) x] [(x y) y]))]
-          [#:hidden-steps
-           (rename-case-lambda (case-lambda [(x) (id x)] [(x y) (id y)]))
-           (rename-case-lambda (case-lambda [(x) (id x)] [(x y) (id y)]))])
-   (testK "let-values"
-          (let-values ([(x) (id 'a)]) (id (cons 'b x)))
-          [#:steps (rename-let-values (let-values ([(x) (id 'a)]) (id (cons 'b x))))
-                   (macro (let-values ([(x) 'a]) (id (cons 'b x))))
-                   (macro (let-values ([(x) 'a]) (cons 'b x)))
-                   (tag-app (let-values ([(x) 'a]) (#%app cons 'b x)))])
-   (testK "letrec-values"
-          (letrec-values ([(x) (id 'a)]) (id (cons 'b x)))
-          [#:steps
-           (rename-letrec-values (letrec-values ([(x) (id 'a)]) (id (cons 'b x))))
-           (macro (letrec-values ([(x) 'a]) (id (cons 'b x))))
-           (macro (letrec-values ([(x) 'a]) (cons 'b x)))
-           (tag-app (letrec-values ([(x) 'a]) (#%app cons 'b x)))])])
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-errors.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-errors.rkt
deleted file mode 100644
index 293e74cc58..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-errors.rkt
+++ /dev/null
@@ -1,320 +0,0 @@
-#lang racket/base
-(require "../gentest-framework.rkt")
-(provide proto:errors)
-
-(define-tests proto:errors "Bad syntax"
-  [#:suite
-   "Atomic expressions"
-   (testKE (#%top a b c)
-           #:error-step)
-   (testKE (#%top . 5)
-           #:error-step)
-   (testKE (quote)
-           #:error-step)
-   (testKE (quote a b)
-           #:error-step)
-   (testKE (#%require . x)
-           #:error-step)
-   (testKE (#%require 5)
-           #:error-step)
-   (testKE (#%require (prefix mzlib/list))
-           #:error-step)
-   (testKE (#%require (prefix 5 mzlib/list))
-           #:error-step)]
-  [#:suite
-   "Definitions"
-   (testKE (define-values x 'a)
-           #:error-step)
-   (testKE (define-values (x))
-           #:error-step)
-   (testKE (define-values (x) 'a 'b)
-           #:error-step)
-   (testKE (define-values (x) . 1)
-           #:error-step)
-   (testKE (define-values (x x) 1)
-           #:error-step)
-   (testKE (define-syntaxes x 1)
-           #:error-step)
-   (testKE (define-syntaxes (x))
-           #:error-step)
-   (testKE (define-syntaxes (x) 1 2)
-           #:error-step)
-   (testKE (define-syntaxes (x) . 3)
-           #:error-step)
-   (testKE (define-syntaxes (x x) 1)
-           #:error-step)]
-  
-  ;; "Simple expressions"
-  [#:suite
-   "if misapplied"
-   (testKE (if)
-           #:error-step)
-   (testKE (if 1)
-           #:error-step)
-   (testKE (if 'a 'b)
-           #:error-step)
-   (testKE (if 1 2 3 4)
-           #:error-step)
-   (testKE (if . x)
-           #:error-step)
-   (testKE (if 1 . x)
-           #:error-step)
-   (testKE (if 1 2 . x)
-           #:error-step)
-   (testKE (if 1 2 3 . x)
-           #:error-step)]
-  [#:suite
-   "wcm misapplied"
-   (testKE (with-continuation-mark)
-           #:error-step)
-   (testKE (with-continuation-mark 1)
-           #:error-step)
-   (testKE (with-continuation-mark 1 2 3 4)
-           #:error-step)
-   (testKE (with-continuation-mark . x)
-           #:error-step)
-   (testKE (with-continuation-mark 1 . x)
-           #:error-step)
-   (testKE (with-continuation-mark 1 2 . x)
-           #:error-step)
-   (testKE (with-continuation-mark 1 2 3 . x)
-           #:error-step)]
-  [#:suite
-   "set! misapplied"
-   (testKE (set!)
-           #:error-step)
-   (testKE (set! x)
-           #:error-step)
-   (testKE (set! x . 3)
-           #:error-step)
-   (testKE (set! x 1 2)
-           #:error-step)
-   (testKE (set! 1)
-           #:error-step)
-   (testKE (set! 1 2)
-           #:error-step)]
-  
-  ;; "Sequence-containing expressions"
-  [#:suite
-   "begin misapplied"
-   (testKE (#%expression (begin))
-           #:error-step)
-   (testKE (begin . 1)
-           #:error-step)
-   (testKE (begin 'a . 2)
-           #:error-step)]
-  [#:suite
-   "begin0 misapplied"
-   (testKE (begin0)
-           #:error-step)
-   (testKE (begin0 . 1)
-           #:error-step)
-   (testKE (begin0 'a . 2)
-           #:error-step)
-   (testKE (begin0 'a 'b . 3)
-           #:error-step)]
-  [#:suite 
-   "#%app (implicit) misapplied"
-   (testKE (+ . 1)
-           [#:steps (tag-app (#%app + . 1))
-                    error])
-   (testKE (+ 1 . 2)
-           [#:steps (tag-app (#%app + 1 . 2))
-                    error])
-   (testKE (+ 1 2 . 3)
-           [#:steps (tag-app (#%app + 1 2 . 3))
-                    error])]
-  [#:suite
-   "#%app (explicit) misapplied"
-   (testKE (#%app . +)
-           #:error-step)
-   (testKE (#%app + . 1)
-           #:error-step)
-   (testKE (#%app + 1 . 2)
-           #:error-step)
-   (testKE (#%app + 1 2 . 3)
-           #:error-step)]
-  
-  ;; "Binding forms"
-  [#:suite
-   "lambda misapplied"
-   (testKE (lambda)
-           #:error-step)
-   (testKE (lambda args)
-           #:error-step)
-   (testKE (lambda #(a b) 1)
-           #:error-step)
-   (testKE (lambda args . 1)
-           #:error-step)
-   (testKE (lambda 1 2)
-           #:error-step)
-   (testKE (lambda (1) 2)
-           #:error-step)
-   (testKE (lambda (x . 1) 2)
-           #:error-step)
-   (testKE (lambda (x x) 1)
-           #:error-step)
-   (testKE (lambda (x y x) 1)
-           #:error-step)]
-  [#:suite 
-   "letrec-values misapplied"
-   (testKE (letrec-values)
-           #:error-step)
-   (testKE (letrec-values x)
-           #:error-step)
-   (testKE (letrec-values x 1)
-           #:error-step)
-   (testKE (letrec-values (x) 2)
-           #:error-step)
-   (testKE (letrec-values (x 1) 2)
-           #:error-step)
-   (testKE (letrec-values ([x 1]) 2)
-           #:error-step)
-   (testKE (letrec-values ([(x . y) 1]) 2)
-           #:error-step)
-   (testKE (letrec-values ([(x) 1 2]) 2)
-           #:error-step)
-   (testKE (letrec-values ([(x) 1] x) 2)
-           #:error-step)
-   (testKE (letrec-values ([(x) 1] [y 2]) 3)
-           #:error-step)
-   (testKE (letrec-values ([(x x) 1]) 2)
-           #:error-step)
-   (testKE (letrec-values ([(x) 1] [(x) 2]) 3)
-           #:error-step)]
-
-  [#:suite
-   "Internal definitions"
-   [#:suite
-    "Basic internal definitions"
-    (testKE (lambda () . 1) ;; FIXME
-            #:error-step)
-    (testKE (lambda () (begin))
-            [#:steps (rename-lambda (lambda () (begin)))
-                     (splice-block (lambda ()))
-                     error])
-    (testKE (lambda () (define-values (x) 1))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (define-values (x) 1) . 2)
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (begin (define-values (x) 1) . 2))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (begin (define-values (x) 1) . 2) 3)
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda ()
-              (define-values (x) 1)
-              (define-values (x) 2)
-              3)
-            [#:rename+error-step rename-lambda])]
-   [#:suite
-    "#%stratified-body"
-    (testKE (#%stratified-body
-             (define-values (x) 'a)
-             'b
-             (define-values (y) 'c)
-             'd)
-            [#:steps (block->letrec (#%stratified-body
-                                     (letrec-values ([(x) 'a])
-                                       (#%stratified-body
-                                        'b
-                                        (define-values (y) 'c)
-                                        'd))))
-                     (rename-letrec-values (#%stratified-body
-                                            (letrec-values ([(x) 'a])
-                                              (#%stratified-body
-                                               'b
-                                               (define-values (y) 'c)
-                                               'd))))
-                     error])
-    (testKE (#%stratified-body (define-values (x) 'a))
-            [#:steps error])]
-   [#:suite
-    "bad internal begin"
-    (testKE (lambda () (begin . 1))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (begin 1 . 2))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (define-values (x) 1) (begin . 2))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (define-values (x) 1) (begin 1 . 2))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (define-values (x) 1) (begin . 2) 3)
-            [#:rename+error-step rename-lambda])]
-   [#:suite
-    "bad definition forms"
-    (testKE (lambda () (define-values))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (define-values x))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (define-values x 1))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (define-values (x . y) 1))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (define-values (x) . 1))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (define-values (x) 1 2))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (define-values (x x) 1))
-            [#:rename+error-step rename-lambda])]]
-  [#:suite
-   "Errors in primitive contexts"
-   [#:suite 
-    "Definitions"
-    (testKE (define-syntaxes (x) (lambda))
-            #:error-step)
-    (testKE (define-values (x) (wrong))
-            #:error-step)]
-   [#:suite
-    "Simple expressions"
-    (testKE (if (wrong) 'b 'c)
-            #:error-step)
-    (testKE (if 'a (wrong) 'c)
-            #:error-step)
-    (testKE (if 'a 'b (wrong))
-            #:error-step)
-    (testKE (if (wrong) 'b)
-            #:error-step)
-    (testKE (if 'a (wrong))
-            #:error-step)
-    (testKE (with-continuation-mark (wrong) 'b 'c)
-            #:error-step)
-    (testKE (with-continuation-mark 'a (wrong) 'c)
-            #:error-step)
-    (testKE (with-continuation-mark 'a 'b (wrong))
-            #:error-step)
-    (testKE (set! x (wrong))
-            #:error-step)]
-   [#:suite
-    "Sequence-containing expressions"
-    (testKE (begin (wrong))
-            #:error-step)
-    (testKE (begin 'a (wrong))
-            #:error-step)
-    (testKE (begin0 (wrong))
-            #:error-step)
-    (testKE (begin0 'a (wrong))
-            #:error-step)
-    (testKE (#%app (wrong))
-            #:error-step)
-    (testKE (#%app + (wrong))
-            #:error-step)]
-   [#:suite
-    "Binding forms"
-    (testKE (lambda (x) (begin0 (wrong)))
-            [#:rename+error-step rename-lambda])
-    (testKE (letrec-values ([(x) (wrong)]) 1)
-            [#:rename+error-step rename-letrec-values])
-    (testKE (letrec-values ([(x) 'a]) (begin0 (wrong)))
-            [#:rename+error-step rename-letrec-values])]
-   [#:suite
-    "Internal definitions"
-    (testKE (lambda () (wrong))
-            [#:rename+error-step rename-lambda])
-    (testKE (lambda () (define-values () (wrong)) 1)
-            [#:steps 
-             (rename-lambda (lambda () (define-values () (wrong)) 1))
-             (block->letrec (lambda () (letrec-values ([() (wrong)]) 1)))
-             (rename-letrec-values (lambda () (letrec-values ([() (wrong)]) 1)))
-             error])
-    (testKE (lambda () (define-values (x) 1) (wrong))
-            [#:rename+error-step rename-lambda])]])
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-macros.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-macros.rkt
deleted file mode 100644
index ba8d74f47f..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-macros.rkt
+++ /dev/null
@@ -1,129 +0,0 @@
-#lang racket/base
-(require "../gentest-framework.rkt")
-(provide proto:macros)
-
-(define-tests proto:macros "Macros"
-  [#:suite 
-   "Macros"
-   (test "id"
-         (id 'a)
-         [#:steps (macro 'a)]
-         #:no-hidden-steps)
-   (test "Tid"
-         (Tid 'a)
-         [#:steps (macro 'a)]
-         #:same-hidden-steps)
-   (test "pre-id"
-         (pre-id 'a)
-         [#:steps (macro (id 'a))
-                  (macro 'a)]
-         #:no-hidden-steps)
-   (test "myor (base)"
-         (myor 'a)
-         [#:steps (macro 'a)]
-         #:no-hidden-steps)
-   (test "myor (recursive 1)" 
-         (myor 'a 'b)
-         [#:steps (macro (let ((t 'a)) (if t t (myor 'b))))
-                  (macro (let-values (((t) 'a)) (if t t (myor 'b))))
-                  (rename-let-values (let-values (((t) 'a)) (if t t (myor 'b))))
-                  (macro (let-values (((t) 'a)) (if t t 'b)))]
-         #:no-hidden-steps)
-
-   (test "leid with id"
-         (leid (id 'a))
-         [#:steps (macro 'a (leid (id 'a)))
-                  (macro (#%expression 'a))]
-         #:no-hidden-steps)
-   (test "leid with Tid"
-         (leid (Tid 'a))
-         [#:steps (macro 'a (leid (Tid 'a)))
-                  (macro (#%expression 'a))]
-         [#:hidden-steps (macro (leid 'a))])]
-
-  (test "lift"
-        (lift 'a)
-        [#:steps (remark local-lift 'a (#rx"^lifted"))
-                 (macro (#%expression #rx"^lifted"))
-                 (tag-top (#%expression (#%top . #rx"^lifted")))
-                 (capture-lifts (begin (define-values (#rx"^lifted") 'a)
-                                       (#%expression
-                                        (#%top . #rx"^lifted"))))]
-        #:no-hidden-steps)
-  (test "lift with id"
-        (lift (id 'a))
-        [#:steps (remark local-lift (id 'a) (#rx"^lifted"))
-                 (macro (#%expression #rx"^lifted"))
-                 (tag-top (#%expression (#%top . #rx"^lifted")))
-                 (capture-lifts (begin (define-values (#rx"^lifted") (id 'a))
-                                       (#%expression (#%top . #rx"^lifted"))))
-                 (macro (begin (define-values (#rx"^lifted") 'a)
-                               (#%expression (#%top . #rx"^lifted"))))]
-        #:no-hidden-steps)
-
-  (test "lift with Tid"
-        (lift (Tid 'a))
-        [#:steps (remark local-lift (Tid 'a) (#rx"^lifted"))
-                 (macro (#%expression #rx"^lifted"))
-                 (tag-top (#%expression (#%top . #rx"^lifted")))
-                 (capture-lifts (begin (define-values (#rx"^lifted") (Tid 'a))
-                                       (#%expression (#%top . #rx"^lifted"))))
-                 (macro (begin (define-values (#rx"^lifted") 'a)
-                               (#%expression (#%top . #rx"^lifted"))))]
-        ;; FIXME:
-        ;;  maybe don't show lifts, but do find (Tid 'a), show in orig ctx
-        ;;  but maybe not a good idea
-        #| 
-        [#:hidden-steps (macro (lift 'a))]
-        |#)
-
-  (test "Tlift"
-        (Tlift 'a)
-        [#:steps (remark local-lift 'a (#rx"^lifted"))
-                 (macro (#%expression #rx"^lifted"))
-                 (tag-top (#%expression (#%top . #rx"^lifted")))
-                 (capture-lifts (begin (define-values (#rx"^lifted") 'a)
-                                       (#%expression (#%top . #rx"^lifted"))))]
-        [#:hidden-steps (remark local-lift 'a (#rx"^lifted"))
-                        (macro (#%expression #rx"^lifted"))
-                        (capture-lifts (begin (define-values (#rx"^lifted") 'a)
-                                              (#%expression #rx"^lifted")))])
-
-  (test "Tlift with id"
-        (Tlift (id 'a))
-        [#:steps (remark local-lift (id 'a) (#rx"^lifted"))
-                 (macro (#%expression #rx"^lifted"))
-                 (tag-top (#%expression (#%top . #rx"^lifted")))
-                 (capture-lifts (begin (define-values (#rx"^lifted") (id 'a))
-                                       (#%expression (#%top . #rx"^lifted"))))
-                 (macro (begin (define-values (#rx"^lifted") 'a)
-                               (#%expression (#%top . #rx"^lifted"))))]
-        [#:hidden-steps (remark local-lift (id 'a) (#rx"^lifted"))
-                        (macro (#%expression #rx"^lifted"))
-                        (capture-lifts (begin (define-values (#rx"^lifted") (id 'a))
-                                              (#%expression #rx"^lifted")))])
-
-  (test "Tlift with Tid"
-        (Tlift (Tid 'a))
-        [#:steps (remark local-lift (Tid 'a) (#rx"^lifted"))
-                 (macro (#%expression #rx"^lifted"))
-                 (tag-top (#%expression (#%top . #rx"^lifted")))
-                 (capture-lifts (begin (define-values (#rx"^lifted") (Tid 'a))
-                                       (#%expression (#%top . #rx"^lifted"))))
-                 (macro (begin (define-values (#rx"^lifted") 'a)
-                               (#%expression (#%top . #rx"^lifted"))))]
-        [#:steps (remark local-lift (Tid 'a) (#rx"^lifted"))
-                 (macro (#%expression #rx"^lifted"))
-                 (capture-lifts (begin (define-values (#rx"^lifted") (Tid 'a))
-                                       (#%expression #rx"^lifted")))
-                 (macro (begin (define-values (#rx"^lifted") 'a)
-                               (#%expression #rx"^lifted")))])
-
-  [#:suite "set! macros"
-           (test "set! (macro)"
-                 (set! the-current-output-port 'a)
-                 [#:steps
-                  (macro (#%plain-app current-output-port 'a))]
-                 #:no-hidden-steps)]
-  
-  )
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-modules.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-modules.rkt
deleted file mode 100644
index 14c5d4df0b..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-modules.rkt
+++ /dev/null
@@ -1,347 +0,0 @@
-#lang racket/base
-(require "../gentest-framework.rkt")
-(provide proto:modules)
-
-(define-syntax-rule (testM form . clauses)
-  (test (format "~s" 'form) form . clauses))
-
-(define-tests proto:modules "Modules"
-  ;; FIXME: Finish adding hidden steps for modules
-
-  (test "module, MB, def"
-        (module m '#%kernel (#%module-begin (define-values (x) 'a)))
-         #:no-steps
-         #:no-hidden-steps)
-  (test "module, def"
-        (module m '#%kernel (define-values (x) 'a))
-        [#:steps
-         (tag-module-begin
-          (module m '#%kernel (#%module-begin (define-values (x) 'a))))]
-        #:no-hidden-steps)
-  (test "module, MB, def, use"
-        (module m '#%kernel (#%module-begin (define-values (x) 'a) x))
-        #:no-steps
-        #:no-hidden-steps)
-  (test "module, def, use"
-        (module m '#%kernel (define-values (x) 'a) x)
-        [#:steps
-         (tag-module-begin
-          (module m '#%kernel (#%module-begin (define-values (x) 'a) x)))]
-        #:no-hidden-steps)
-  (test "module, MB, quote"
-        (module m '#%kernel (#%module-begin 'a))
-        #:no-steps
-        #:no-hidden-steps)
-  (test "module, quote"
-        (module m '#%kernel 'a)
-        [#:steps
-         (tag-module-begin (module m '#%kernel (#%module-begin 'a)))]
-        #:no-hidden-steps)
-  (test "module, 2 quotes"
-        (module m '#%kernel 'a 'b)
-        [#:steps
-         (tag-module-begin (module m '#%kernel (#%module-begin 'a 'b)))]
-        #:no-hidden-steps)
-  (test "module, MB, begin"
-        (module m '#%kernel (#%module-begin (begin 'a 'b)))
-        [#:steps
-         (splice-module (module m '#%kernel (#%module-begin 'a 'b)))]
-        #:same-hidden-steps)
-  (test "module, begin"
-        (module m '#%kernel (begin 'a 'b))
-        [#:steps
-         (tag-module-begin (module m '#%kernel (#%module-begin (begin 'a 'b))))
-         (splice-module (module m '#%kernel (#%module-begin 'a 'b)))]
-        #:no-hidden-steps)
-  (test "module, MB, def in begin"
-        (module m '#%kernel (#%module-begin (begin (define-values (x) 'a) x)))
-        [#:steps
-         (splice-module
-          (module m '#%kernel (#%module-begin (define-values (x) 'a) x)))]
-        #:same-hidden-steps)
-  (test "module, def in begin"
-        (module m '#%kernel (begin (define-values (x) 'a) x))
-        [#:steps
-         (tag-module-begin 
-          (module m '#%kernel (#%module-begin (begin (define-values (x) 'a) x))))
-         (splice-module
-          (module m '#%kernel (#%module-begin (define-values (x) 'a) x)))]
-        #:no-hidden-steps)
-
-  (test "module, MB, defstx, use"
-        (module m '#%kernel
-          (#%module-begin
-           (#%require (for-syntax '#%kernel))
-           (define-syntaxes (x) (lambda (_) (if '#t (quote-syntax *) '#f)))
-           (x)))
-        [#:steps
-         (rename-lambda
-          (module m '#%kernel
-            (#%module-begin
-             (#%require (for-syntax '#%kernel))
-             (define-syntaxes (x) (lambda (_) (if '#t (quote-syntax *) '#f)))
-             (x))))
-         (macro
-             (module m '#%kernel
-               (#%module-begin
-                (#%require (for-syntax '#%kernel))
-                (define-syntaxes (x) (lambda (_) (if '#t (quote-syntax *) '#f)))
-                *)))]
-        [#:hidden-steps
-         (rename-lambda
-          (module m '#%kernel
-            (#%module-begin
-             (#%require (for-syntax '#%kernel))
-             (define-syntaxes (x) (lambda (_) (if '#t (quote-syntax *) '#f)))
-             (x))))])
-
-  (test "module k+helper, macro use"
-        (module m '#%kernel (#%require 'helper) (Tid 'a))
-        [#:steps
-         (tag-module-begin
-          (module m '#%kernel (#%module-begin (#%require 'helper) (Tid 'a))))
-         (macro
-          (module m '#%kernel
-            (#%module-begin
-             (#%require 'helper)
-             'a)))]
-        [#:hidden-steps
-         (macro
-          (module m '#%kernel
-            (#%require 'helper)
-            'a))])
-
-  (test "module k+helper, defs and opaque macros"
-        (module m '#%kernel
-          (#%module-begin
-           (#%require 'helper)
-           (id (define-values (x) (id '1)))
-           (id (define-values (y) (id '2)))))
-        [#:steps
-         (macro
-          (module m '#%kernel
-            (#%module-begin
-             (#%require 'helper)
-             (define-values (x) (id '1))
-             (id (define-values (y) (id '2))))))
-         (macro
-          (module m '#%kernel
-            (#%module-begin
-             (#%require 'helper)
-             (define-values (x) (id '1))
-             (define-values (y) (id '2)))))
-         (macro
-          (module m '#%kernel
-            (#%module-begin
-             (#%require 'helper)
-             (define-values (x) '1)
-             (define-values (y) (id '2)))))
-         (macro
-          (module m '#%kernel
-            (#%module-begin
-             (#%require 'helper)
-             (define-values (x) '1)
-             (define-values (y) '2))))]
-        #:no-hidden-steps)
-
-  (test "module k+helper, defs and mixed macros"
-        (module m '#%kernel
-          (#%module-begin
-           (#%require 'helper)
-           (Tid (define-values (x) (id '1)))
-           (id (define-values (y) (Tid '2)))))
-        [#:steps
-         (macro
-          (module m '#%kernel
-            (#%module-begin
-             (#%require 'helper)
-             (define-values (x) (id '1))
-             (id (define-values (y) (Tid '2))))))
-         (macro
-          (module m '#%kernel
-            (#%module-begin
-             (#%require 'helper)
-             (define-values (x) (id '1))
-             (define-values (y) (Tid '2)))))
-         (macro
-          (module m '#%kernel
-            (#%module-begin
-             (#%require 'helper)
-             (define-values (x) '1)
-             (define-values (y) (Tid '2)))))
-         (macro
-          (module m '#%kernel
-            (#%module-begin
-             (#%require 'helper)
-             (define-values (x) '1)
-             (define-values (y) '2))))]
-        [#:hidden-steps
-         (macro
-          (module m '#%kernel
-            (#%module-begin
-             (#%require 'helper)
-             (define-values (x) (id '1))
-             (id (define-values (y) (Tid '2))))))
-         (macro
-          (module m '#%kernel
-            (#%module-begin
-             (#%require 'helper)
-             (define-values (x) (id '1))
-             (id (define-values (y) '2)))))])
-
-  ;; need to test:
-  ;;   begin-splicing
-  ;;   lifts
-
-  (test "module mz, def, use"
-        (module m mzscheme (define-values (x) 'a) x)
-        [#:steps
-         (tag-module-begin
-          (module m mzscheme (#%module-begin (define-values (x) 'a) x)))
-         (macro
-          (module m mzscheme 
-            (#%plain-module-begin
-             (#%require (for-syntax mzscheme))
-             (define-values (x) 'a)
-             x)))]
-        #:no-hidden-steps)
-  (test "module mz, def"
-        (module m mzscheme (define-values (x) 'a))
-        [#:steps
-         (tag-module-begin
-          (module m mzscheme (#%module-begin (define-values (x) 'a))))
-         (macro
-             (module m mzscheme
-               (#%plain-module-begin 
-                (#%require (for-syntax mzscheme))
-                (define-values (x) 'a))))]
-        #:no-hidden-steps)
-  (test "module mz, quote"
-        (module m mzscheme 'a)
-        [#:steps
-         (tag-module-begin
-          (module m mzscheme (#%module-begin 'a)))
-         (macro
-             (module m mzscheme
-               (#%plain-module-begin
-                (#%require (for-syntax mzscheme))
-                'a)))]
-        #:no-hidden-steps)
-
-  (test "module mz, begin with 2 quotes"
-        (module m mzscheme (begin 'a 'b))
-        [#:steps
-         (tag-module-begin
-          (module m mzscheme (#%module-begin (begin 'a 'b))))
-         (macro
-             (module m mzscheme 
-               (#%plain-module-begin
-                (#%require (for-syntax mzscheme))
-                (begin 'a 'b))))
-         (splice-module
-          (module m mzscheme
-            (#%plain-module-begin
-             (#%require (for-syntax mzscheme))
-             'a 'b)))]
-        #:no-hidden-steps)
-
-  (test "module mz, macro use, quote"
-        (module m mzscheme (or 'a 'b) 'c)
-        [#:steps
-         (tag-module-begin
-          (module m mzscheme (#%module-begin (or 'a 'b) 'c)))
-         (macro
-          (module m mzscheme 
-            (#%plain-module-begin
-             (#%require (for-syntax mzscheme))
-             (or 'a 'b)
-             'c)))
-         (macro
-           (module m mzscheme
-             (#%plain-module-begin
-              (#%require (for-syntax mzscheme))
-              (let ([or-part 'a])
-                (if or-part or-part (or 'b)))
-              'c)))
-         (macro
-           (module m mzscheme
-             (#%plain-module-begin
-              (#%require (for-syntax mzscheme))
-              (let-values ([(or-part) 'a])
-                (if or-part or-part (or 'b)))
-              'c)))
-         (rename-let-values
-           (module m mzscheme
-             (#%plain-module-begin
-              (#%require (for-syntax mzscheme))
-              (let-values ([(or-part) 'a])
-                (if or-part or-part (or 'b)))
-              'c)))
-         (macro
-           (module m mzscheme
-             (#%plain-module-begin
-              (#%require (for-syntax mzscheme))
-              (let-values ([(or-part) 'a])
-                (if or-part or-part (#%expression 'b)))
-              'c)))
-         (macro ;; FIXME: 'untag-expr
-           (module m mzscheme
-             (#%plain-module-begin
-              (#%require (for-syntax mzscheme))
-              (let-values ([(or-part) 'a])
-                (if or-part or-part 'b))
-              'c)))]
-        #:no-hidden-steps)
-
-  (test "module mz, macro use"
-        (module m mzscheme (or 'a 'b))
-        [#:steps
-         (macro
-          (module m mzscheme
-            (let ([or-part 'a]) (if or-part or-part (or 'b)))))
-         (macro
-          (module m mzscheme
-            (let-values ([(or-part) 'a]) (if or-part or-part (or 'b)))))
-         (tag-module-begin
-          (module m mzscheme
-            (#%module-begin
-             (let-values ([(or-part) 'a])
-               (if or-part or-part (or 'b))))))
-         (macro
-           (module m mzscheme
-             (#%plain-module-begin
-              (#%require (for-syntax mzscheme))
-              (let-values ([(or-part) 'a])
-                (if or-part or-part (or 'b))))))
-         (rename-let-values
-           (module m mzscheme
-             (#%plain-module-begin
-              (#%require (for-syntax mzscheme))
-              (let-values ([(or-part) 'a])
-                (if or-part or-part (or 'b))))))
-         (macro
-           (module m mzscheme
-             (#%plain-module-begin
-              (#%require (for-syntax mzscheme))
-              (let-values ([(or-part) 'a])
-                (if or-part or-part (#%expression 'b))))))
-         (macro ;; FIXME: 'untag-expr
-           (module m mzscheme
-             (#%plain-module-begin
-              (#%require (for-syntax mzscheme))
-              (let-values ([(or-part) 'a])
-                (if or-part or-part 'b)))))])
-  ;; FIXME: hidden steps for above, tricky
-
-  (test "module with define-struct"
-        (module m mzscheme
-          (define-struct P (x y))
-          (P? (make-P P-x P-y))))
-  (test "module with match"
-        (module m mzscheme
-          (require (lib "match.rkt"))
-          (match '4 [n (add1 n)])))
-  (test "module with match before require"
-        (module m mzscheme
-          (match '4 [n (add1 n)])
-          (require (lib "match.rkt")))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/unstable/find.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/unstable/find.rkt
deleted file mode 100644
index f7e401e896..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/unstable/find.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         unstable/struct)
-
-(provide/contract
- [find
-  (->* ((-> any/c any/c)
-        any/c)
-       (#:stop-on-found? any/c
-        #:stop (or/c #f (-> any/c any/c))
-        #:get-children (or/c #f (-> any/c (or/c #f list?))))
-       list?)]
- [find-first
-  (->* ((-> any/c any/c)
-        any/c)
-       (#:stop (or/c #f (-> any/c any/c))
-        #:get-children (or/c #f (-> any/c (or/c #f list?)))
-        #:default any/c)
-       any/c)])
-
-(define (find pred x
-              #:stop-on-found? [stop-on-found? #f]
-              #:stop [stop #f]
-              #:get-children [get-children #f])
-  (define (loop x acc)
-    (cond [(pred x)
-           (let ([acc (cons x acc)])
-             (if stop-on-found?
-                 acc
-                 (loop/nf x acc)))]
-          [else
-           (loop/nf x acc)]))
-  ;; loop/nt: x is "not found"; look in its children
-  (define (loop/nf x acc)
-    (cond [(and stop (stop x))
-           acc]
-          [(and get-children (get-children x))
-           => (lambda (children) (loop* children acc))]
-          [(pair? x)
-           (let ([acc (loop (car x) acc)])
-             (loop (cdr x) acc))]
-          [(vector? x)
-           (for/fold ([acc acc]) ([elem (in-vector x)])
-             (loop elem acc))]
-          [(box? x)
-           (loop (unbox x) acc)]
-          [(struct->list x #:on-opaque 'skip)
-           => (lambda (elems)
-                (loop* elems acc))]
-          ;; unreachable, since
-          ;; (struct->list X #:on-opaque 'skip) always returns a list
-          [else acc]))
-  (define (loop* xs acc)
-    (for/fold ([acc acc]) ([elem (in-list xs)])
-      (loop elem acc)))
-  (reverse (loop x null)))
-;; Eli: This looks borderline too generic to be useful, also in the fact that
-;;   the documentation tends to explain things in terms of the implementation
-;;   (eg, the description of #:stop).  In any case, you should definitely
-;;   rename it -- `find' is too common in different ways (see srfi-1 or cltl).
-
-(define (find-first pred x
-                    #:stop [stop #f]
-                    #:get-children [get-children #f]
-                    #:default [default #f])
-  (let/ec return
-    (define (pred* x)
-      (and (pred x) (return x)))
-    (find pred* x #:stop stop #:get-children get-children)
-    (if (procedure? default)
-        (default)
-        default)))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/unstable/info.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/unstable/info.rkt
deleted file mode 100644
index 2b2011421b..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/unstable/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define scribblings
-  '(("unstable-find.scrbl" (multi-page) (experimental))))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/unstable/unstable-find.scrbl b/pkgs/macro-debugger-pkgs/macro-debugger/unstable/unstable-find.scrbl
deleted file mode 100644
index be0c11c03a..0000000000
--- a/pkgs/macro-debugger-pkgs/macro-debugger/unstable/unstable-find.scrbl
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          unstable/scribblings/utils
-          (for-label unstable/find racket/contract racket/shared racket/base))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/find racket/shared))
-
-@unstable-title[#:tag "find"]{Find}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/find]
-
-@defproc[(find [pred (-> any/c any/c)]
-               [x any/c]
-               [#:stop-on-found? stop-on-found? any/c #f]
-               [#:stop stop (or/c #f (-> any/c any/c)) #f]
-               [#:get-children get-children (or/c #f (-> any/c (or/c #f list?))) #f])
-         list?]{
-
-Returns a list of all values satisfying @racket[pred] contained in
-@racket[x] (possibly including @racket[x] itself). 
-
-If @racket[stop-on-found?] is true, the children of values satisfying
-@racket[pred] are not examined. If @racket[stop] is a procedure, then
-the children of values for which @racket[stop] returns true are not
-examined (but the values themselves are; @racket[stop] is applied
-after @racket[pred]). Only the current branch of the search is
-stopped, not the whole search.
-
-The search recurs through pairs, vectors, boxes, and the accessible
-fields of structures. If @racket[get-children] is a procedure, it can
-override the default notion of a value's children by returning a list
-(if it returns false, the default notion of children is used).
-
-No cycle detection is done, so @racket[find] on a cyclic graph may
-diverge. To do cycle checking yourself, use @racket[stop] and a
-mutable table.
-
-@examples[#:eval the-eval
-(find symbol? '((all work) and (no play)))
-(find list? '#((all work) and (no play)) #:stop-on-found? #t)
-(find negative? 100 
-      #:stop-on-found? #t
-      #:get-children (lambda (n) (list (- n 12))))
-(find symbol? (shared ([x (cons 'a x)]) x)
-      #:stop (let ([table (make-hasheq)])
-               (lambda (x)
-                 (begin0 (hash-ref table x #f)
-                         (hash-set! table x #t)))))
-]
-}
-
-@defproc[(find-first [pred (-> any/c any/c)]
-                     [x any/c]
-                     [#:stop stop (or/c #f (-> any/c any/c)) #f]
-                     [#:get-children get-children (or/c #f (-> any/c (or/c #f list?))) #f]
-                     [#:default default any/c (lambda () (error ....))])
-         any/c]{
-
-Like @racket[find], but only returns the first match. If no
-matches are found, @racket[default] is applied as a thunk if it is a
-procedure or returned otherwise.
-
-@examples[#:eval the-eval
-(find-first symbol? '((all work) and (no play)))
-(find-first list? '#((all work) and (no play)))
-(find-first negative? 100 
-            #:get-children (lambda (n) (list (- n 12))))
-(find-first symbol? (shared ([x (cons 'a x)]) x))
-]
-}
-
-@close-eval[the-eval]
diff --git a/pkgs/main-distribution-test/LICENSE.txt b/pkgs/main-distribution-test/LICENSE.txt
deleted file mode 100644
index 8a8be259bc..0000000000
--- a/pkgs/main-distribution-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-main-distribution-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/main-distribution-test/info.rkt b/pkgs/main-distribution-test/info.rkt
deleted file mode 100644
index a7011d3ae5..0000000000
--- a/pkgs/main-distribution-test/info.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("racket-test"
-               "rackunit-test"
-               "gui-test"
-               "db-test"
-               "htdp-test"
-               "html-test"
-               "redex-test"
-               "drracket-test"
-               "profile-test"
-               "srfi-test"
-               "errortrace-test"
-               "r6rs-test"
-               "web-server-test"
-               "typed-racket-test"
-               "xrepl-test"
-               "scribble-test"
-               "unstable-test"
-               "compiler-test"
-               "compatibility-test"
-               "data-test"
-               "net-test"
-               "planet-test"
-               "syntax-color-test"
-               "images-test"
-               "plot-test"
-               "math-test"
-               "racket-benchmarks"
-               "drracket-tool-test"))
-
-(define pkg-desc "tests for \"main-distribution\"")
-
-(define pkg-authors '(eli jay matthias mflatt robby))
diff --git a/pkgs/main-distribution/LICENSE.txt b/pkgs/main-distribution/LICENSE.txt
deleted file mode 100644
index 8db745e87b..0000000000
--- a/pkgs/main-distribution/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-main-distribution
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/main-distribution/info.rkt b/pkgs/main-distribution/info.rkt
deleted file mode 100644
index e2d09de7e2..0000000000
--- a/pkgs/main-distribution/info.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("algol60"
-               "at-exp-lib"
-               "compatibility"
-               "contract-profile"
-               "compiler"
-               "data"
-               "datalog"
-               "db"
-               "deinprogramm"
-               "draw"
-               "draw-doc"
-               "draw-lib"
-               "drracket"
-               "drracket-tool"
-               "errortrace"
-               "future-visualizer"
-               "future-visualizer-typed"
-               "gui"
-               "htdp"
-               "html"
-               "icons"
-               "images"
-               "lazy"
-               "macro-debugger"
-               "macro-debugger-text-lib"
-               "math"
-               "mysterx"
-               "mzcom"
-               "mzscheme"
-               "net"
-               "parser-tools"
-               "pconvert-lib"
-               "pict"
-               "pict-snip"
-               "plai"
-               "planet"
-               "plot"
-               "profile"
-               "r5rs"
-               "r6rs"
-               "racket-doc"
-               "distributed-places"
-               "racket-index"
-               "racket-lib"
-               "racklog"
-               "rackunit"
-               "readline"
-               "realm"
-               "redex"
-               "sandbox-lib"
-               "schemeunit"
-               "scribble"
-               "serialize-cstruct-lib"
-               "sgl"
-               "shell-completion"
-               "slideshow"
-               "snip"
-               "srfi"
-               "string-constants"
-               "syntax-color"
-               "trace"
-               "typed-racket"
-               "typed-racket-more"
-               "unstable"
-               "unstable-contract-lib"
-               "unstable-latent-contract-lib"
-               "unstable-list-lib"
-               "unstable-options-lib"
-               "unstable-parameter-group-lib"
-               "unstable-flonum-doc"
-               "unstable-redex"
-               "unstable-2d"
-               "web-server"
-               "wxme"
-               "xrepl"
-               "ds-store"))
-
-(define pkg-desc "A package that combines all of the packages in the main Racket distribution")
-
-(define pkg-authors '(eli jay matthias mflatt robby))
diff --git a/pkgs/math-pkgs/math-doc/LICENSE.txt b/pkgs/math-pkgs/math-doc/LICENSE.txt
deleted file mode 100644
index 0d5401b315..0000000000
--- a/pkgs/math-pkgs/math-doc/LICENSE.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-The math collection is distributed under the GNU Lesser General Public
-License Version 3 (LGPLv3) just like the majority of Racket's libraries.
-The LGPLv3 license text is included in the file "COPYING_LESSER.txt".
-
-Some of the math library code is derived from the C++ project Boost,
-from source files released under the Boost Software License Version 1.0
-(BSLv1.0). This license is compatible with the LGPLv3, provided the
-BSLv1.0 license text is distributed along with any source code derived
-from BSLv1.0 works.
-
-Some of the math library is derived from ubiquitous C libraries released
-under a license with similar terms.
-
-To comply with the terms of the BSLv1.0, its text is duplicated here:
-
-============================================================================
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-============================================================================
-
-
-To comply with the terms of the other license, its text is duplicated here:
-
-============================================================================
-Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
-
-Developed at SunPro, a Sun Microsystems, Inc. business. Permission to use,
-copy, modify, and distribute this software is freely granted, provided that
-this notice is preserved.
-============================================================================
diff --git a/pkgs/math-pkgs/math-doc/info.rkt b/pkgs/math-pkgs/math-doc/info.rkt
deleted file mode 100644
index 33ef94199d..0000000000
--- a/pkgs/math-pkgs/math-doc/info.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define build-deps '("at-exp-lib"
-                     "math-lib"
-                     "plot-doc"
-                     "plot-gui-lib"
-                     "racket-doc"
-                     "sandbox-lib"
-                     "scribble-lib"
-                     "typed-racket-doc"
-                     "typed-racket-lib"
-                     "unstable-2d"))
-(define update-implies '("math-lib"))
-
-(define pkg-desc "Math library documentation")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/math-pkgs/math-doc/math/info.rkt b/pkgs/math-pkgs/math-doc/math/info.rkt
deleted file mode 100644
index 76b079e84c..0000000000
--- a/pkgs/math-pkgs/math-doc/math/info.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang info
-(define scribblings '(["scribblings/math.scrbl" (multi-page)]))
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/math-array.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-array.scrbl
deleted file mode 100644
index dabcae16c6..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/math-array.scrbl
+++ /dev/null
@@ -1,2054 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          racket/sandbox
-          (for-label racket/base racket/vector racket/match racket/unsafe/ops racket/string
-                     (except-in racket/list permutations) ; FIXME
-                     math plot
-                     (only-in typed/racket/base
-                              ann inst : λ: define: make-predicate ->
-                              Flonum Real Boolean Any Integer Index Natural Exact-Positive-Integer
-                              Nonnegative-Real Sequenceof Fixnum Values Number Float-Complex
-                              All U List Vector Listof Vectorof Struct FlVector
-                              Symbol Output-Port))
-          "utils.rkt")
-
-@(define typed-eval (make-math-eval))
-@interaction-eval[#:eval typed-eval
-                         (require racket/match
-                                  racket/vector
-                                  racket/string
-                                  racket/sequence
-                                  racket/list)]
-
-@title[#:tag "array" #:style 'toc]{Arrays}
-@(author-neil)
-
-@bold{Performance Warning:} Indexing the elements of arrays created in untyped Racket
-is currently 25-50 times slower than doing the same in Typed Racket, due to the overhead
-of checking higher-order contracts. We are working on it.
-
-For now, if you need speed, use the @racketmodname[typed/racket] language.
-
-@defmodule[math/array]
-
-One of the most common ways to structure data is with an array: a rectangular grid of
-homogeneous, independent elements. But an array data type
-is usually absent from functional languages' libraries. This is probably because arrays
-are perceived as requiring users to operate on them using destructive updates, write
-loops that micromanage array elements, and in general, stray far from the declarative
-ideal.
-
-Normally, they do. However, experience in Python, and more recently Data-Parallel Haskell,
-has shown that providing the right data types and a rich collection of whole-array operations
-allows working effectively with arrays in a functional, declarative style. As a bonus,
-doing so opens the possibility of parallelizing nearly every operation.
-
-@local-table-of-contents[]
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:quick"]{Quick Start}
-
-Arrays can be created from expressions denoting each element's value using the @racket[array]
-macro:
-@interaction[#:eval typed-eval
-                    (array #[0 1 2 3 4])
-                    (array #[#['first 'row 'data] #['second 'row 'data]])
-                    (array "This array has zero axes and one element")]
-They can also be created using @racket[build-array] to specify a @tech{shape} and @tech{procedure}:
-@interaction[#:eval typed-eval
-                    (define arr
-                      (build-array #(4 5) (λ: ([js : Indexes])
-                                            (match-define (vector j0 j1) js)
-                                            (+ j0 j1))))
-                    arr]
-Other ways to create arrays are to convert them from lists and vectors using
-@racket[list->array], @racket[list*->array], @racket[vector->array] and @racket[vector*->array],
-and to generate them in a loop using @racket[for/array:] and @racket[for*/array:].
-
-Arrays can be indexed using @racket[array-ref], and settable arrays can be mutated using
-@racket[array-set!]:
-@interaction[#:eval typed-eval
-                    (array-ref arr #(2 3))
-                    (define brr (array->mutable-array arr))
-                    (array-set! brr #(2 3) -1000)
-                    brr]
-However, both of these activities are discouraged in favor of functional, whole-array operations.
-
-Arrays can be mapped over and otherwise operated on @tech{pointwise}:
-@interaction[#:eval typed-eval
-                    (array-map (λ: ([n : Natural]) (* 2 n)) arr)
-                    (array+ arr arr)]
-When arrays have different shapes, they can often be @tech{broadcast}, or stretched, to be the same
-shape before applying the pointwise operation:
-@interaction[#:eval typed-eval
-                    (array* arr (array 2))
-                    (array* arr (array #[0 2 0 2 0]))]
-By default, zero-dimensional arrays like @racket[(array 2)] can be broadcast to any shape.
-See @secref{array:broadcasting} for details.
-
-Arrays can be @tech[#:key "slicing"]{sliced} to yield sub-arrays, using a list of slice specifications
-that correspond to array axes.
-For example, keeping every row of @racket[arr] and every even-numbered column:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list (::) (:: 0 5 2)))]
-Here, @racket[::] has semantics almost, but not quite, entirely unlike @racket[in-range].
-See @secref{array:slicing} for details.
-
-Functional code that uses whole-array operations often creates many short-lived, intermediate arrays
-whose elements are referred to only once.
-The overhead of allocating and filling storage for these arrays can be removed entirely by using
-@tech{nonstrict} arrays, sometimes at the cost of making the code's performance more difficult to
-reason about.
-Another bonus is that computations with nonstrict arrays have fewer synchronization points, meaning
-that they will be easier to parallelize as Racket's support for parallel computation improves.
-See @secref{array:nonstrict} for details.
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:defs"]{Definitions}
-
-An array's domain is determined by its @deftech{shape}, a vector of nonnegative integers such as
-@racket[#(4 5)], @racket[#(10 1 5 8)] or @racket[#()].
-The shape's length is the number of array dimensions, or @deftech{axes}.
-The shape's contents are the length of each axis.
-
-The product of the axis lengths is the array's size. In particular, an array with shape
-@racket[#()] has one element.
-
-@deftech{Indexes} are a vector of nonnegative integers that identify a particular element.
-Indexes are in-bounds when there are the same number of them as axes, and each is
-@italic{less than} its corresponding axis length.
-
-An array's contents are determined by its @deftech{procedure}, which returns an element when applied
-to in-bounds @tech{indexes}.
-By default, most arrays' procedures look up elements in memory.
-Others, such as those returned by @racket[make-array], return computed values.
-
-A @deftech{pointwise} operation is one that operates on each array element independently, on each
-corresponding pair of elements from two arrays independently, or on a corresponding collection
-of elements from many arrays independently. This is usually done using @racket[array-map].
-
-When a pointwise operation is performed on arrays with different shapes, the arrays are
-@deftech{broadcast} so that their shapes match. See @secref{array:broadcasting} for details.
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:broadcasting"]{Broadcasting}
-
-It is often useful to apply a @tech{pointwise} operation to two or more arrays in a many-to-one
-manner. Library support for this, which @racketmodname[math/array] provides, is called
-@tech[#:key "broadcast"]{broadcasting}.
-
-Creating a 6×6 identity matrix:
-@interaction[#:eval typed-eval
-                    (define diag (diagonal-array 2 6 1 0))
-                    (array-shape diag)
-                    diag]
-Multiplying each element by @racket[10]:
-@interaction[#:eval typed-eval
-                    (array-shape (array 10))
-                    (array* diag (array 10))]
-Adding @racket[(array #[0 1 2 3 4 5])] pointwise to every row:
-@interaction[#:eval typed-eval
-                    (array+ (array* diag (array 10))
-                            (array #[0 1 2 3 4 5]))]
-
-@subsection[#:tag "array:broadcasting:rules"]{Broadcasting Rules}
-
-Suppose we have two array shapes @racket[ds = (vector d0 d1 ...)] and
-@racket[es = (vector e0 e1 ...)]. Broadcasting proceeds as follows:
-@itemlist[#:style 'ordered
-  @item{The shorter shape is padded on the left with @racket[1] until it is the same length
-        as the longer shape.}
-  @item{For each axis @racket[k], @racket[dk] and @racket[ek] are compared. If @racket[dk = ek],
-        the result axis is @racket[dk]; if one axis is length @racket[1], the result axis
-        is the length of the other; otherwise fail.}
-  @item{Both arrays' axes are stretched by (conceptually) copying the rows of axes with length
-        @racket[1].}
-  ]
-
-Example: Suppose we have an array @racket[drr] with shape @racket[ds = #(4 1 3)] and another array
-@racket[err] with shape @racket[es = #(3 3)]. Following the rules:
-@itemlist[#:style 'ordered
-  @item{@racket[es] is padded to get @racket[#(1 3 3)].}
-  @item{The result axis is derived from @racket[#(4 1 3)] and @racket[#(1 3 3)] to get
-        @racket[#(4 3 3)].}
-  @item{@racket[drr]'s second axis is stretched to length @racket[3], and @racket[err]'s new first
-        axis (which is length @racket[1] by rule 1) is stretched to length @racket[4].}
-  ]
-
-The same example, but more concrete:
-@interaction[#:eval typed-eval
-                    (define drr
-                      (array #[#[#["00" "01" "02"]]
-                               #[#["10" "11" "12"]]
-                               #[#["20" "21" "22"]]
-                               #[#["30" "31" "32"]]]))
-                    (array-shape drr)
-                    (define err
-                      (array #[#["aa" "ab" "ac"]
-                               #["ba" "bb" "bc"]
-                               #["ca" "cb" "cc"]]))
-                    (array-shape err)
-                    (define drr+err (array-map string-append drr err))
-                    (array-shape drr+err)
-                    drr+err]
-Notice how the row @racket[#["00" "01" "02"]] in @racket[drr] is repeated in the result
-because @racket[drr]'s second axis was stretched during broadcasting. Also, the column
-@racket[#[#["aa"] #["ba"] #["ca"]]] in @racket[err] is repeated because @racket[err]'s first
-axis was stretched.
-
-For the above example, @racket[array-map] does this before operating on @racket[drr] and @racket[err]:
-@interaction[#:eval typed-eval
-                    (define ds (array-shape-broadcast (list (array-shape drr)
-                                                            (array-shape err))))
-                    ds
-                    (array-broadcast drr ds)
-                    (array-broadcast err ds)]
-
-@subsection[#:tag "array:broadcasting:control"]{Broadcasting Control}
-
-The parameter @racket[array-broadcasting] controls how pointwise operations @tech{broadcast}
-arrays. Its default value is @racket[#t], which means that broadcasting proceeds as described
-in @secref{array:broadcasting:rules}. Another possible value is @racket[#f], which allows pointwise
-operations to succeed only if array shapes match exactly:
-@interaction[#:eval typed-eval
-                    (parameterize ([array-broadcasting #f])
-                      (array* (index-array #(3 3)) (array 10)))]
-
-Another option is @hyperlink["http://www.r-project.org"]{R}-style permissive broadcasting,
-which allows pointwise operations to @italic{always} succeed, by repeating shorter axes' rows
-instead of repeating just singleton axes' rows:
-@interaction[#:eval typed-eval
-                    (define arr10 (array-map number->string (index-array #(10))))
-                    (define arr3 (array-map number->string (index-array #(3))))
-                    arr10
-                    arr3
-                    (array-map string-append arr10 (array #["+" "-"]) arr3)
-                    (parameterize ([array-broadcasting 'permissive])
-                      (array-map string-append arr10 (array #["+" "-"]) arr3))]
-Notice that @racket[(array #["+" "-"])] was repeated five times, and that
-@racket[arr3] was repeated three full times and once partially.
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:slicing"]{Slicing}
-
-One common array transformation is @deftech{slicing}: extracting sub-arrays by picking rows from
-each axis independently.
-
-Slicing is done by applying @racket[array-slice-ref] or @racket[array-slice-set!] to an array and a
-list of @deftech{slice specifications} corresponding to array @tech{axes}.
-There are five types of slice specification:
-@itemlist[@item{@racket[(Sequenceof Integer)]: pick rows from an axis by index.}
-          @item{@racket[Slice]: pick rows from an axis as with an @racket[in-range] sequence.}
-          @item{@racket[Slice-Dots]: preserve remaining adjacent axes}
-          @item{@racket[Integer]: remove an axis by replacing it with one of its rows.}
-          @item{@racket[Slice-New-Axis]: insert an axis of a given length.}]
-
-Create @racket[Slice] objects using @racket[::] and @racket[Slice-New-Axis] objects using
-@racket[::new]. There is only one @racket[Slice-Dots] object, namely @racket[::...].
-
-When slicing an array with @racket[n] axes, unless a list of slice specifications contains
-@racket[::...], it must contain exactly @racket[n] slice specifications.
-
-The remainder of this section uses the following example array:
-@interaction[#:eval typed-eval
-                    (define arr
-                      (build-array
-                       #(2 3 4)
-                       (λ: ([js : Indexes])
-                         (string-append* (map number->string (vector->list js))))))
-                    arr]
-
-@subsection{@racket[(Sequenceof Integer)]: pick rows}
-
-Using a sequence of integers as a slice specification picks rows from the corresponding axis. For
-example, we might use lists of integers to pick @italic{every} row from every axis:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list '(0 1) '(0 1 2) '(0 1 2 3)))]
-This simply copies the array.
-
-More usefully, we can use sequences to swap rows on the same axis:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list '(1 0) '(0 1 2) '(0 1 2 3)))]
-We can also remove rows:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list '(0 1) '(0 2) '(0 2)))
-                    (array-slice-ref arr (list '(0 1) '(0 1 2) '()))]
-Or duplicate rows:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list '(0 1) '(0 1 2) '(0 0 1 2 2 3)))]
-However, a sequence slice specification cannot alter the number of axes.
-
-Using sequence constructors like @racket[in-range], we can pick every even-indexed row in an axis:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list '(1 0) '(0 1 2) (in-range 0 4 2)))]
-We could also use @racket[in-range] to pick every row instead of enumerating their indexes in a
-list, but that would require another kind of tedium:
-@interaction[#:eval typed-eval
-                    (define ds (array-shape arr))
-                    (array-slice-ref arr (list (in-range (vector-ref ds 0))
-                                               (in-range (vector-ref ds 1))
-                                               (in-range (vector-ref ds 2))))]
-The situation calls for an @racket[in-range]-like slice specification that is aware of the lengths
-of the axes it is applied to.
-
-@subsection{@racket[Slice]: pick rows in a length-aware way}
-
-As a slice specification, a @racket[Slice] object acts like the sequence object returned
-by @racket[in-range], but either @racket[start] or @racket[end] may be @racket[#f].
-
-If @racket[start] is @racket[#f], it is interpreted as the first valid axis index in the direction
-of @racket[step]. If @racket[end] is @racket[#f], it is interpreted as the last valid axis index
-in the direction of @racket[step].
-
-Possibly the most common slice is @racket[(::)], equivalent to @racket[(:: #f #f 1)]. With a
-positive @racket[step = 1], @racket[start] is interpreted as @racket[0] and @racket[end] as
-the length of the axis. Thus, @racket[(::)] picks all rows from any axis:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list (::) (::) (::)))]
-The slice @racket[(:: #f #f -1)] reverses an axis:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list (::) (::) (:: #f #f -1)))]
-The slice @racket[(:: 2 #f 1)] picks every row starting from index @racket[2]:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list (::) (::) (:: 2 #f 1)))]
-The slice @racket[(:: 1 #f 2)] picks every odd-indexed row:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list (::) (::) (:: 1 #f 2)))]
-Notice that every example starts with two @racket[(::)]. In fact, slicing only one axis is so
-common that there is a slice specification object that represents any number of @racket[(::)].
-
-@subsection{@racket[Slice-Dots]: preserve remaining axes}
-
-As a slice specification, a @racket[Slice-Dots] object represents any number of leftover, adjacent
-axes, and preserves them all.
-
-For example, picking every odd-indexed row of the last axis can be done by
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list ::... (:: 1 #f 2)))]
-For @racket[arr] specifically, @racket[::...] represents two @racket[(::)].
-
-Slicing only the first axis while preserving the rest can be done by
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list '(0) ::...))]
-If more than one @racket[::...] appears in the list, only the first is expanded:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list ::... '(1) ::...))
-                    (array-slice-ref arr (list ::... '(1)))]
-If there are no leftover axes, @racket[::...] does nothing when placed in any position:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list ::... '(1) '(1) '(1)))
-                    (array-slice-ref arr (list '(1) ::... '(1) '(1)))
-                    (array-slice-ref arr (list '(1) '(1) ::... '(1)))
-                    (array-slice-ref arr (list '(1) '(1) '(1) ::...))]
-
-@subsection{@racket[Integer]: remove an axis}
-
-All of the slice specifications so far preserve the dimensions of the array. Removing an axis
-can be done by using an integer as a slice specification.
-
-This example removes the first axis by collapsing it to its first row:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list 0 ::...))]
-Removing the second axis by collapsing it to the row with index @racket[1]:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list (::) 1 ::...))]
-Removing the second-to-last axis (which for @racket[arr] is the same as the second):
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list ::... 1 (::)))]
-All of these examples can be done using @racket[array-axis-ref]. However, removing an axis
-relative to the dimension of the array (e.g. the second-to-last axis) is easier to do
-using @racket[array-slice-ref], and it is sometimes convenient to combine axis removal with
-other slice operations.
-
-@subsection{@racket[Slice-New-Axis]: add an axis}
-
-As a slice specification, @racket[(::new dk)] inserts @racket[dk] into the resulting array's
-shape, in the corresponding axis position. The new axis has length @racket[dk], which must be
-nonnegative.
-
-For example, we might conceptually wrap another @racket[#[]] around an array's data:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list (::new) ::...))]
-Or duplicate the array twice, within two new outer rows:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list (::new 2) ::...))]
-Of course, @racket[dk = 0] is a valid new axis length, but is usually not very useful:
-@interaction[#:eval typed-eval
-                    (array-slice-ref arr (list (::) (::new 0) ::...))]
-Inserting axes can also be done using @racket[array-axis-insert].
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:nonstrict"]{Nonstrict Arrays}
-
-With few exceptions, by default, the functions exported by @racketmodname[math/array] return
-@deftech{strict} arrays, which are arrays whose @tech{procedures} compute elements by looking them
-up in a vector.
-
-This conservative default often wastes time and space. In functional code that operates on arrays,
-the elements in most intermediate arrays are referred to exactly once, so allocating and filling
-storage for them should be unnecessary. For example, consider the following array:
-@interaction[#:eval typed-eval
-                    (define (make-hellos)
-                      (array-map string-append
-                                 (array-map string-append
-                                            (array #["Hello " "Hallo " "Jó napot "])
-                                            (array #["Ada" "Edsger" "John"]))
-                                 (make-array #(3) "!")))
-                    (define arr (make-hellos))
-                    (array-strict? arr)
-                    arr]
-By default, the result of the inner @racket[array-map] has storage allocated for it and filled with
-strings such as @racket["Hello Ada"], even though its storage will be thrown away at the next garbage
-collection cycle.
-
-An additional concern becomes even more important as Racket's support for parallel computation
-improves. Allocating storage for intermediate arrays is a synchronization point in long computations,
-which divides them into many short computations, making them difficult to parallelize.
-
-@(define array-pdf
-   "http://research.microsoft.com/en-us/um/people/simonpj/papers/ndp/RArrays.pdf")
-
-@margin-note*{* @bold{Regular, shape-polymorphic, parallel arrays in Haskell},
-               Gabriele Keller, Manuel Chakravarty, Roman Leshchinskiy, Simon Peyton Jones,
-               and Ben Lippmeier. ICFP 2010. @hyperlink[array-pdf]{(PDF)}}
-
-A solution is to construct @deftech{nonstrict} arrays*, which are arrays whose procedures can do more
-than simply look up elements. Setting the parameter @racket[array-strictness] to @racket[#f] causes
-almost all @racketmodname[math/array] functions to return nonstrict arrays:
-@interaction[#:eval typed-eval
-                    (define arr (parameterize ([array-strictness #f])
-                                  (make-hellos)))
-                    (array-strict? arr)
-                    arr]
-In @racket[arr], the first element is the @italic{computation}
-@racket[(string-append (string-append "Hello " "Ada") "!")], not the value @racket["Hello Ada!"].
-The value @racket["Hello Ada!"] is recomputed every time the first element is referred to.
-
-To use nonstrict arrays effectively, think of every array as if it were the array's
-@tech{procedure} itself. In other words,
-
-@nested[#:style 'inset]{@bold{An @italic{array} is just a function with a finite,
-                                 rectangular domain.}}
-
-Some arrays are mutable, some are lazy, some are strict, some are sparse, and most
-do not even allocate contiguous space to store their elements. All are functions that can be
-applied to indexes to retrieve elements.
-
-The two most common kinds of operations, mapping over and transforming arrays, are compositions.
-Mapping @racket[f] over array @racket[arr] is nothing more than composing @racket[f] with
-@racket[arr]'s procedure.
-Transforming @racket[arr] using @racket[g], a function from new indexes to old indexes, is nothing
-more than composing @racket[arr]'s procedure with @racket[g].
-
-@subsection{Caching Nonstrict Elements}
-
-@bold{Nonstrict arrays are not lazy.} Very few nonstrict arrays cache computed elements,
-but like functions, recompute them every time they are referred to. Unlike functions, they can have
-every element computed and cached at once, by making them @tech{strict}.
-
-To compute and store an array's elements, use @racket[array-strict!] or @racket[array-strict]:
-@interaction[#:eval typed-eval
-                    (array-strict? arr)
-                    (array-strict! arr)
-                    (array-strict? arr)
-                    (array-strict arr)]
-If the array is already strict, as in the last example above, @racket[array-strict!] and
-@racket[array-strict] do nothing.
-
-To make a strict @italic{copy} of an array without making the original array strict, use
-@racket[array->mutable-array].
-
-@subsection{Performance Considerations}
-
-One downside to nonstrict arrays is that it is more difficult to reason about the performance of
-operations on them. Another is that the user must decide which arrays to make strict. Fortunately,
-there is a simple rule of thumb:
-
-@nested[#:style 'inset]{@bold{Make arrays strict when you must refer to most of their elements
-                              more than once or twice.}}
-
-Having to name an array is a good indicator that it should be strict. In the
-following example, which computes @racket[(+ (expt x x) (expt x x))] for @racket[x] from @racket[0]
-to @racket[2499], each element in @racket[xrr] is computed twice whenever its corresponding element
-in @racket[res] is referred to:
-@racketblock[(define xrr (array-map expt
-                                    (index-array #(50 50))
-                                    (index-array #(50 50))))
-             (define res (array+ xrr xrr))]
-Having to name @racket[xrr] means we should make it strict:
-@racketblock[(define xrr (array-strict
-                          (array-map expt
-                                     (index-array #(50 50))
-                                     (index-array #(50 50)))))
-             (define res (array+ xrr xrr))]
-Doing so halves the time it takes to compute @racket[res]'s elements.
-
-When returning an array from a function, return nonstrict arrays as they are, to allow the caller to
-decide whether the result should be strict.
-
-When writing library functions that may be called with either @racket[(array-strictness #t)] or
-@racket[(array-strictness #f)], operate on nonstrict arrays and wrap the result with
-@racket[array-default-strict] to return what the user is expecting.
-For example, if @racket[make-hellos] is a library function, it should be written as
-@racketblock[(define (make-hellos)
-               (array-default-strict
-                (parameterize ([array-strictness #f])
-                  (array-map string-append
-                             (array-map string-append
-                                        (array #["Hello " "Hallo " "Jó napot "])
-                                        (array #["Ada" "Edsger" "John"]))
-                             (make-array #(3) "!")))))]
-
-If you cannot determine whether to make arrays strict, or are using arrays for so-called
-``dynamic programming,'' you can make them lazy using @racket[array-lazy].
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:types"]{Types, Predicates and Accessors}
-
-@defform[(Array A)]{
-The parent array type. Its type parameter is the type of the array's elements.
-
-The polymorphic @racket[Array] type is @italic{covariant}, meaning that @racket[(Array A)] is a
-subtype of @racket[(Array B)] if @racket[A] is a subtype of @racket[B]:
-@interaction[#:eval typed-eval
-                    (define arr (array #[1 2 3 4 5]))
-                    arr
-                    (ann arr (Array Real))
-                    (ann arr (Array Any))]
-Because subtyping is transitive, the @racket[(Array A)] in the preceeding subtyping rule can be
-replaced with any of @racket[(Array A)]'s subtypes, including descendant types of @racket[Array].
-For example, @racket[(Mutable-Array A)] is a subtype of @racket[(Array B)] if @racket[A] is a
-subtype of @racket[B]:
-@interaction[#:eval typed-eval
-                    (define arr (mutable-array #[1 2 3 4 5]))
-                    arr
-                    (ann arr (Array Real))
-                    (ann arr (Array Any))]
-}
-
-@defform[(Settable-Array A)]{
-The parent type of arrays whose elements can be mutated. Functions like @racket[array-set!] and
-@racket[array-slice-set!] accept arguments of this type. Examples of subtypes are
-@racket[Mutable-Array], @racket[FlArray] and @racket[FCArray].
-
-This type is @italic{invariant}, meaning that @racket[(Settable-Array A)] is @bold{not} a subtype
-of @racket[(Settable-Array B)] if @racket[A] and @racket[B] are different types, even if @racket[A]
-is a subtype of @racket[B]:
-@interaction[#:eval typed-eval
-                    (define arr (mutable-array #[1 2 3 4 5]))
-                    arr
-                    (ann arr (Settable-Array Integer))
-                    (ann arr (Settable-Array Real))]
-}
-
-@defform[(Mutable-Array A)]{
-The type of mutable arrays. Its type parameter is the type of the array's elements.
-
-Arrays of this type store their elements in a @racket[(Vectorof A)]:
-@interaction[#:eval typed-eval
-                    (define arr (mutable-array #[#[1 2] #[3 4]]))
-                    (vector-set! (mutable-array-data arr) 0 -10)
-                    arr]
-Mutable arrays are always @tech{strict}.
-}
-
-@defidform[Indexes]{
-The type of array shapes and array indexes @italic{produced} by @racketmodname[math/array] functions.
-Defined as @racket[(Vectorof Index)].
-@examples[#:eval typed-eval
-                 (array-shape (array #[#[#[0]]]))]
-}
-
-@defidform[In-Indexes]{
-The type of array shapes and array indexes @italic{accepted} by @racketmodname[math/array] functions.
-Defined as @racket[(U Indexes (Vectorof Integer))].
-
-@examples[#:eval typed-eval
-                 (define ds #(3 2))
-                 ds
-                 (make-array ds (void))]
-
-This makes indexes-accepting functions easier to use, because it is easier to convince Typed
-Racket that a vector contains @racket[Integer] elements than that a vector contains @racket[Index]
-elements.
-
-@racket[In-Indexes] is not defined as @racket[(Vectorof Integer)] because mutable container types
-like @racket[Vector] and @racket[Vectorof] are invariant.
-In particular, @racket[(Vectorof Index)] is not a subtype of @racket[(Vectorof Integer)]:
-@interaction[#:eval typed-eval
-                    (define js ((inst vector Index) 3 4 5))
-                    js
-                    (ann js (Vectorof Integer))
-                    (ann js In-Indexes)]
-}
-
-@deftogether[(@defproc[(array? [v Any]) Boolean]
-              @defproc[(settable-array? [v Any]) Boolean]
-              @defproc[(mutable-array? [v Any]) Boolean])]{
-Predicates for the types @racket[Array], @racket[Settable-Array], and @racket[Mutable-Array].
-
-Because @racket[Settable-Array] and its descendants are invariant, @racket[settable-array?] and
-its descendants' predicates are generally not useful in occurrence typing. For example, if
-we know we have an @racket[Array] but would like to treat it differently if it happens to be 
-a @racket[Mutable-Array], we are basically out of luck:
-@interaction[#:eval typed-eval
-                    (: maybe-array-data (All (A) ((Array A) -> (U #f (Vectorof A)))))
-                    (define (maybe-array-data arr)
-                      (cond [(mutable-array? arr)  (mutable-array-data arr)]
-                            [else  #f]))]
-In general, predicates with a @racket[Struct] filter do not give conditional branches access
-to a struct's accessors. Because @racket[Settable-Array] and its descendants are invariant,
-their predicates have @racket[Struct] filters:
-@interaction[#:eval typed-eval
-                    array?
-                    settable-array?
-                    mutable-array?]
-}
-
-@defproc[(array-shape [arr (Array A)]) Indexes]{
-Returns @racket[arr]'s @tech{shape}, a vector of indexes that contains the lengths
-of @racket[arr]'s axes.
-@examples[#:eval typed-eval
-                 (array-shape (array 0))
-                 (array-shape (array #[0 1]))
-                 (array-shape (array #[#[0 1]]))
-                 (array-shape (array #[]))]
-}
-
-@defproc[(array-size [arr (Array A)]) Index]{
-Returns the number of elements in @racket[arr], which is the product of its axis lengths.
-@examples[#:eval typed-eval
-                 (array-size (array 0))
-                 (array-size (array #[0 1]))
-                 (array-size (array #[#[0 1]]))
-                 (array-size (array #[]))]
-}
-
-@defproc[(array-dims [arr (Array A)]) Index]{
-Returns the number of @racket[arr]'s dimensions. Equivalent to
-@racket[(vector-length (array-shape arr))].
-}
-
-@defproc[(mutable-array-data [arr (Mutable-Array A)]) (Vectorof A)]{
-Returns the vector of data that @racket[arr] contains.
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:construct"]{Construction}
-
-@defform/subs[(array #[#[...] ...] maybe-type-ann)
-              [(maybe-type-ann (code:line) (code:line : type))]]{
-Creates an @racket[Array] from nested rows of expressions.
-
-The vector syntax @racket[#[...]] delimits rows. These may be nested to any depth, and must have a
-rectangular shape. Using square parentheses is not required, but is encouraged to help visually
-distinguish array contents from array indexes and other vectors.
-(See the examples for @racket[indexes-array] for an illustration.)
-
-@examples[#:eval typed-eval
-                 (array 0)
-                 (array #[0 1 2 3])
-                 (array #[#[1 2 3] #[4 5 6]])
-                 (array #[#[1 2 3] #[4 5]])]
-As with the @racket[list] constructor, the type chosen for the array is the narrowest type
-all the elements can have. Unlike @racket[list], because @racket[array] is syntax, instantiating
-@racket[array] with the desired element type is a syntax error:
-@interaction[#:eval typed-eval
-                    (list 1 2 3)
-                    (array #[1 2 3])
-                    ((inst list Real) 1 2 3)
-                    ((inst array Real) #[1 2 3])]
-There are two easy ways to annotate the element type:
-@interaction[#:eval typed-eval
-                    (array #[1 2 3] : Real)
-                    (ann (array #[1 2 3]) (Array Real))]
-Annotating should rarely be necessary because the @racket[Array] type is covariant.
-
-Normally, the datums within literal vectors are implicitly quoted. However, when used within the
-@racket[array] form, the datums must be explicitly quoted.
-@interaction[#:eval typed-eval
-                    #(this is okay)
-                    (array #[not okay])
-                    (array #['this 'is 'okay])
-                    (array #['#(an) '#(array) '#(of) '#(vectors)])]
-
-Arrays returned by @racket[array] are @tech{strict}.
-Another way to create immutable, strict arrays from literal data is to use @racket[list->array].
-}
-
-@defform/subs[(mutable-array #[#[...] ...] maybe-type-ann)
-              [(maybe-type-ann (code:line) (code:line : type))]]{
-Creates a @racket[Mutable-Array] from nested rows of expressions.
-
-The semantics are almost identical to @racket[array]'s, except the result is mutable:
-@interaction[#:eval typed-eval
-                    (define arr (mutable-array #[0 1 2 3]))
-                    arr
-                    (array-set! arr #(0) 10)
-                    arr]
-Because mutable arrays are invariant, this form additionally accepts a type annotation for
-the array's elements:
-@interaction[#:eval typed-eval
-                    (define arr (mutable-array #[0 1 2 3] : Real))
-                    arr
-                    (array-set! arr #(0) 10.0)
-                    arr]
-
-Another way to create mutable arrays from literal data is to use @racket[vector->array].
-}
-
-@defproc[(make-array [ds In-Indexes] [value A]) (Array A)]{
-Returns an array with @tech{shape} @racket[ds], with every element's value as @racket[value].
-Analogous to @racket[make-vector].
-@examples[#:eval typed-eval
-                 (make-array #() 5)
-                 (make-array #(1 2) 'sym)
-                 (make-array #(4 0 2) "Invisible")]
-The arrays returned by @racket[make-array] do not allocate storage for their elements and
-are @tech{strict}.
-}
-
-@defproc[(build-array [ds In-Indexes] [proc (Indexes -> A)]) (Array A)]{
-Returns an array with @tech{shape} @racket[ds] and @tech{procedure} @racket[proc].
-Analogous to @racket[build-vector].
-}
-
-@defproc[(array->mutable-array [arr (Array A)]) (Mutable-Array A)]{
-Returns a mutable array with the same elements as @racket[arr]. The result is a copy of
-@racket[arr], even when @racket[arr] is mutable.
-}
-
-@defproc[(mutable-array-copy [arr (Mutable-Array A)]) (Mutable-Array A)]{
-Like @racket[(array->mutable-array arr)], but restricted to mutable arrays. It is also faster.
-}
-
-@defproc[(indexes-array [ds In-Indexes]) (Array Indexes)]{
-Returns an array with @tech{shape} @racket[ds], with each element set to its position in the
-array.
-@examples[#:eval typed-eval
-                 (indexes-array #())
-                 (indexes-array #(4))
-                 (indexes-array #(2 3))
-                 (indexes-array #(4 0 2))]
-The resulting array does not allocate storage for its return value's elements, and is @tech{strict}.
-(It is essentially the identity function for the domain @racket[ds].)
-}
-
-@defproc[(index-array [ds In-Indexes]) (Array Index)]{
-Returns an array with @tech{shape} @racket[ds], with each element set to its row-major index in
-the array.
-@examples[#:eval typed-eval
-                 (index-array #(2 3))
-                 (array-flatten (index-array #(2 3)))]
-As with @racket[indexes-array], the result does not allocate storage for its elements, and is
-@tech{strict}.
-}
-
-@defproc[(axis-index-array [ds In-Indexes] [axis Integer]) (Array Index)]{
-Returns an array with @tech{shape} @racket[ds], with each element set to its position in axis
-@racket[axis]. The axis number @racket[axis] must be nonnegative and less than the number of axes
-(the length of @racket[ds]).
-@examples[#:eval typed-eval
-                 (axis-index-array #(3 3) 0)
-                 (axis-index-array #(3 3) 1)
-                 (axis-index-array #() 0)]
-As with @racket[indexes-array], the result does not allocate storage for its elements, and is
-@tech{strict}.
-}
-
-@defproc[(diagonal-array [dims Integer] [axes-length Integer] [on-value A] [off-value A])
-         (Array A)]{
-Returns an array with @racket[dims] axes, each with length @racket[axes-length].
-(For example, the returned array for @racket[dims = 2] is square.)
-The elements on the diagonal (i.e. at indexes of the form @racket[(vector j j ...)] for
-@racket[j < axes-length]) have the value @racket[on-value]; the rest have @racket[off-value].
-@examples[#:eval typed-eval
-                 (diagonal-array 2 7 1 0)]
-As with @racket[indexes-array], the result does not allocate storage for its elements, and is
-@tech{strict}.
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:convert"]{Conversion}
-
-@defform[(Listof* A)]{
-Equivalent to @racket[(U A (Listof A) (Listof (Listof A)) ...)] if infinite unions were allowed.
-This is used as an argument type to @racket[list*->array] and as the return type of
-@racket[array->list*].
-}
-
-@defform[(Vectorof* A)]{
-Like @racket[(Listof* A)], but for vectors. See @racket[vector*->array] and @racket[array->vector*].
-}
-
-@deftogether[(@defproc*[([(list->array [lst (Listof A)]) (Array A)]
-                         [(list->array [ds In-Indexes] [lst (Listof A)]) (Array A)])]
-              @defproc[(array->list [arr (Array A)]) (Listof A)])]{
-Convert lists to immutable arrays and back.
-
-The two-argument variant of @racket[list->array] assumes the elements in @racket[lst] are in
-row-major order.
-
-For @racket[array->list], if @racket[arr] has no axes or more than one axis, it is (conceptually)
-flattened before being converted to a list.
-
-@examples[#:eval typed-eval
-                 (list->array '(1 2 3))
-                 (list->array '((1 2 3) (4 5)))
-                 (list->array #(2 2) '(1 2 3 4))
-                 (array->list (array #[1 2 3]))
-                 (array->list (array 10))
-                 (array->list (array #[#[1 2 3] #[4 5 6]]))]
-For conversion between nested lists and multidimensional arrays, see @racket[list*->array] and
-@racket[array->list*].
-For conversion from flat values to mutable arrays, see @racket[vector->array].
-
-The arrays returned by @racket[list->array] are always @tech{strict}.
-}
-
-@deftogether[(@defproc*[([(vector->array [vec (Vectorof A)]) (Mutable-Array A)]
-                         [(vector->array [ds In-Indexes] [vec (Vectorof A)]) (Mutable-Array A)])]
-              @defproc[(array->vector [arr (Array A)]) (Vectorof A)])]{
-Like @racket[list->array] and @racket[array->list], but for vectors.
-@examples[#:eval typed-eval
-                 (vector->array #(1 2 3))
-                 (vector->array #((1 2 3) (4 5)))
-                 (vector->array #(2 2) #(1 2 3 4))
-                 (array->vector (array #[1 2 3]))
-                 (array->vector (array 10))
-                 (array->vector (array #[#[1 2 3] #[4 5 6]]))]
-For conversion between nested vectors and multidimensional arrays, see @racket[vector*->array] and
-@racket[array->vector*].
-}
-
-@defproc[(list*->array [lsts (Listof* A)] [pred? ((Listof* A) -> Any : A)]) (Array A)]{
-Converts a nested list of elements of type @racket[A] to an array.
-The predicate @racket[pred?] identifies elements of type @racket[A].
-The shape of @racket[lsts] must be rectangular.
-
-@examples[#:eval typed-eval
-                 (list*->array 'singleton symbol?)
-                 (list*->array '(0 1 2 3) byte?)
-                 (list*->array (list (list (list 5) (list 2 3))
-                                     (list (list 4.0) (list 1.4 0.2 9.3)))
-                               (make-predicate (Listof Nonnegative-Real)))]
-
-There is no well-typed Typed Racket function that behaves like @racket[list*->array] but does not
-require @racket[pred?].
-Without an element predicate, there is no way to prove to the type checker that
-@racket[list*->array]'s implementation correctly distinguishes elements from rows.
-
-The arrays returned by @racket[list*->array] are always @tech{strict}.
-}
-
-@defproc[(array->list* [arr (Array A)]) (Listof* A)]{
-The inverse of @racket[list*->array].
-}
-
-@defproc[(vector*->array [vecs (Vectorof* A)] [pred? ((Vectorof* A) -> Any : A)]) (Mutable-Array A)]{
-Like @racket[list*->array], but accepts nested vectors of elements.
-@examples[#:eval typed-eval
-                 (vector*->array 'singleton symbol?)
-                 ((inst vector*->array Byte) #(0 1 2 3) byte?)]
-As in the last example, Typed Racket often needs help inferring @racket[vector*->array]'s
-type parameters.
-}
-
-@defproc[(array->vector* [arr (Array A)]) (Vectorof* A)]{
-Like @racket[array->list*], but produces nested vectors of elements.
-}
-
-@defproc[(array-list->array [arrs (Listof (Array A))] [axis Integer 0]) (Array A)]{
-Concatenates @racket[arrs] along axis @racket[axis] to form a new array.
-If the arrays have different shapes, they are broadcast first.
-The axis number @racket[axis] must be nonnegative and @italic{no greater than} the number of axes in
-the highest dimensional array in @racket[arrs].
-@examples[#:eval typed-eval
-                 (array-list->array (list (array 0) (array 1) (array 2) (array 3)))
-                 (array-list->array (list (array 0) (array 1) (array 2) (array 3)) 1)
-                 (array-list->array (list (array #[0 1 2 3]) (array #['a 'b 'c 'd])))
-                 (array-list->array (list (array #[0 1 2 3]) (array '!)))
-                 (array-list->array (list (array #[0 1 2 3]) (array '!)) 1)
-                 ]
-This function is a left inverse of @racket[array->array-list]. (It cannot be a right inverse
-because broadcasting cannot be undone.)
-
-For a similar function that does not increase the dimension of the broadcast arrays, see
-@racket[array-append*].
-}
-
-@defproc[(array->array-list [arr (Array A)] [axis Integer 0]) (Listof (Array A))]{
-Turns one axis of @racket[arr] into a list of arrays. Each array in the result has the same shape.
-The axis number @racket[axis] must be nonnegative and less than the number of @racket[arr]'s axes.
-@examples[#:eval typed-eval
-                 (array->array-list (array #[0 1 2 3]))
-                 (array->array-list (array #[#[1 2] #[10 20]]))
-                 (array->array-list (array #[#[1 2] #[10 20]]) 1)
-                 (array->array-list (array 10))]
-}
-
-@subsection[#:tag "array:print"]{Printing}
-
-@defparam[array-custom-printer
-          print-array
-          (All (A) ((Array A)
-                    Symbol
-                    Output-Port
-                    (U Boolean 0 1) -> Any))]{
-A parameter whose value is used to print subtypes of @racket[Array].
-}
-
-@defproc[(print-array [arr (Array A)]
-                      [name Symbol]
-                      [port Output-Port]
-                      [mode (U Boolean 0 1)])
-         Any]{
-Prints an array using @racket[array] syntax, using @racket[name] instead of @racket['array]
-as the head form. This function is set as the value of @racket[array-custom-printer] when
-@racketmodname[math/array] is first required.
-
-Well-behaved @racket[Array] subtypes do not call this function directly to print themselves.
-They call the current @racket[array-custom-printer]:
-@interaction[#:eval typed-eval
-                    (eval:alts
-                     ((array-custom-printer)
-                      (array #[0 1 2 3])
-                      'my-cool-array
-                      (current-output-port)
-                      #t)
-                     (eval:result "" "(my-cool-array #[0 1 2 3])"))]
-See @racket[prop:custom-write] for the meaning of the @racket[port] and @racket[mode] arguments.
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:sequences"]{Comprehensions and Sequences}
-
-Sometimes sequential processing is unavoidable, so @racket[math/array] provides loops and sequences.
-
-@deftogether[(@defform[(for/array: maybe-shape maybe-fill (for:-clause ...) maybe-type-ann
-                         body ...+)]
-              @defform/subs[(for*/array: maybe-shape maybe-fill (for:-clause ...) maybe-type-ann
-                              body ...+)
-                            ([maybe-shape (code:line) (code:line #:shape ds)]
-                             [maybe-fill (code:line) (code:line #:fill fill)]
-                             [maybe-type-ann (code:line) (code:line : body-type)])
-                            #:contracts ([ds In-Indexes]
-                                         [fill body-type])])]{
-Creates arrays by generating elements in a @racket[for]-loop or @racket[for*]-loop.
-Unlike other Typed Racket loop macros, these accept a @italic{body annotation}, which declares
-the type of elements. They do not accept an annotation for the entire type of the result.
-@examples[#:eval typed-eval
-                 (for/array: ([x  (in-range 3)] [y  (in-range 3)]) : Integer
-                   (+ x y))
-                 (for*/array: ([x  (in-range 3)] [y  (in-range 3)]) : Integer
-                   (+ x y))]
-The shape of the result is independent of the loop clauses: note that the last example
-does not have shape @racket[#(3 3)], but shape @racket[#(9)]. To control the shape, use the
-@racket[#:shape] keyword:
-@interaction[#:eval typed-eval
-                    (for*/array: #:shape #(3 3) ([x  (in-range 3)]
-                                                 [y  (in-range 3)]) : Integer
-                      (+ x y))]
-
-If the loop does not generate enough elements, the rest are filled with the @italic{first}
-generated value:
-@interaction[#:eval typed-eval
-                    (for*/array: #:shape #(4) ([x  (in-range 1 3)]) x)]
-To change this behavior, use the @racket[#:fill] keyword:
-@interaction[#:eval typed-eval
-                    (for*/array: #:shape #(4) #:fill -1 ([x  (in-range 1 3)]) x)]
-In the last two examples, the array's type is @racket[(Mutable-Array Any)] because
-a body annotation was not given.
-}
-
-@deftogether[(@defform[(for/array maybe-shape maybe-fill (for-clause ...)
-                         body ...+)]
-              @defform[(for*/array maybe-shape maybe-fill (for-clause ...)
-                         body ...+)])]{
-Untyped versions of the loop macros.
-}
-
-@defproc[(in-array [arr (Array A)]) (Sequenceof A)]{
-Returns a sequence of @racket[arr]'s elements in row-major order.
-@examples[#:eval typed-eval
-                 (define arr (array #[#[1 2] #[10 20]]))
-                 (for/list: : (Listof Integer) ([x  (in-array arr)]) x)]
-}
-
-@defproc[(in-array-axis [arr (Array A)] [axis Integer 0]) (Sequenceof (Array A))]{
-Like @racket[array->array-list], but returns a sequence.
-@examples[#:eval typed-eval
-                 (define arr (array #[#[1 2] #[10 20]]))
-                 (sequence->list (in-array-axis arr))
-                 (sequence->list (in-array-axis arr 1))]
-}
-
-@defproc[(in-array-indexes [ds In-Indexes]) (Sequenceof Indexes)]{
-Returns a sequence of indexes for shape @racket[ds], in row-major order.
-@examples[#:eval typed-eval
-                 (for/array: #:shape #(3 3) ([js  (in-array-indexes #(3 3))]) : Indexes
-                   js)
-                 (for*/array: #:shape #(3 3) ([j0  (in-range 3)]
-                                              [j1  (in-range 3)]) : In-Indexes
-                   (vector j0 j1))
-                 (indexes-array #(3 3))]
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:pointwise"]{Pointwise Operations}
-
-Most of the operations documented in this section are simple macros that apply @racket[array-map]
-to a function and their array arguments.
-
-@defproc*[([(array-map [f (-> R)]) (Array R)]
-           [(array-map [f (A -> R)] [arr0 (Array A)]) (Array R)]
-           [(array-map [f (A B Ts ... -> R)] [arr0 (Array A)] [arr1 (Array B)] [arrs (Array Ts)] ...)
-            (Array R)])]{
-Composes @racket[f] with the given arrays' @tech{procedures}. When the arrays' shapes do not match,
-they are @tech{broadcast} to the same shape first. If broadcasting fails, @racket[array-map] raises
-an error.
-
-@examples[#:eval typed-eval
-                 (array-map (λ: ([x : String]) (string-append x "!"))
-                            (array #[#["Hello" "I"] #["Am" "Shouting"]]))
-                 (array-map string-append
-                            (array #[#["Hello" "I"] #["Am" "Shouting"]])
-                            (array "!"))
-                 (array-map + (index-array #(3 3 3)) (array 2))
-                 (array-map + (index-array #(2 2)) (index-array #(3 3)))]
-
-Typed Racket can often derive fairly precise element types for the resulting array:
-@interaction[#:eval typed-eval
-                    (array-map * (array #[-4.3 -1.2 -0.2]) (array -2.81))]
-How precise the result type is depends on the type of @racket[f]. Preserving precise result types
-for lifted arithmetic operators is the main reason most pointwise operations are macro wrappers for
-@racket[array-map].
-
-Unlike @racket[map], @racket[array-map] can map a zero-argument function:
-@interaction[#:eval typed-eval
-                    (array-map (λ () "Whoa, Nelly!"))]
-If the resulting zero-dimensional array is used in a pointwise operation with other arrays,
-it will be broadcast to their shape:
-@interaction[#:eval typed-eval
-                    (array-map + (array #[1 2 3]) (array-map (λ () -10)))]
-
-When explicitly instantiating @racket[array-map]'s types using @racket[inst], instantiate
-@racket[R] (the return type's element type) first, then the arguments' element types in order.
-}
-
-@defform[(inline-array-map f arrs ...)]{
-Like @racket[array-map], but possibly faster. Inlining a map operation can allow Typed Racket's
-optimizer to replace @racket[f] with something unchecked and type-specific (for example,
-replace @racket[*] with @racket[unsafe-fl*]), at the expense of code size.
-}
-
-@deftogether[(@defform[(array+ arrs ...)]
-              @defform[(array* arrs ...)]
-              @defform[(array- arr0 arrs ...)]
-              @defform[(array/ arr0 arrs ...)]
-              @defform[(array-min arr0 arrs ...)]
-              @defform[(array-max arr0 arrs ...)])]{
-Equivalent to mapping arithmetic operators over arrays. Note that because @racket[(array-map f)]
-returns sensible answers, so do @racket[(array+)] and @racket[(array*)].
-@examples[#:eval typed-eval
-                 (array+ (array #[#[0.0 1.0] #[2.0 3.0]]) (array 200))
-                 (array+)
-                 (array*)
-                 (array/ (array #[2 1/2]))]
-}
-
-@defform[(array-scale arr x)]{
-Equivalent to @racket[(array* arr (array x))], but faster.
-}
-
-@deftogether[(@defform[(array-abs arr)]
-              @defform[(array-sqr arr)]
-              @defform[(array-sqrt arr)]
-              @defform[(array-conjugate arr)])]{
-Equivalent to @racket[(array-map f arr)], where @racket[f] is respectively
-@racket[abs],
-@racket[sqr],
-@racket[sqrt],
-or @racket[conjugate].
-}
-
-@deftogether[(@defform[(array-real-part arr)]
-              @defform[(array-imag-part arr)]
-              @defform[(array-make-rectangular arr0 arr1)]
-              @defform[(array-magnitude arr)]
-              @defform[(array-angle arr)]
-              @defform[(array-make-polar arr0 arr1)])]{
-Conversions to and from complex numbers, lifted to operate on arrays.
-}
-
-@deftogether[(@defform[(array< arr0 arr1 arrs ...)]
-              @defform[(array<= arr0 arr1 arrs ...)]
-              @defform[(array> arr0 arr1 arrs ...)]
-              @defform[(array>= arr0 arr1 arrs ...)]
-              @defform[(array= arr0 arr1 arrs ...)])]{
-Equivalent to @racket[(array-map f arr0 arr1 arrs ...)], where @racket[f] is respectively
-@racket[<], @racket[<=], @racket[>], @racket[>=], or @racket[=].
-}
-
-@deftogether[(@defform[(array-not arr)]
-              @defform[(array-and arr ...)]
-              @defform[(array-or arr ...)]
-              @defform[(array-if cond-arr true-arr false-err)])]{
-Boolean operators lifted to operate on arrays.
-
-When given @tech{nonstrict} arrays, the short-cutting behavior of @racket[array-and],
-@racket[array-or] and @racket[array-if] can keep their elements from being referred to (and thus
-computed).
-However, these macros cannot be used to distinguish base and inductive cases in a recursive function,
-because the array arguments are eagerly evaluated. For example, this function never returns, even
-when @racket[array-strictness] is @racket[#f]:
-@racketblock[(: array-factorial ((Array Integer) -> (Array Integer)))
-             (define (array-factorial arr)
-               (array-if (array<= arr (array 0))
-                         (array 1)
-                         (array* arr (array-factorial (array- arr (array 1))))))]
-}
-
-@subsection{Broadcasting}
-
-@defparam[array-broadcasting broadcasting (U Boolean 'permissive)]{
-Determines the rules used when broadcasting arrays for pointwise operations. See
-@secref{array:broadcasting:control}.
-}
-
-@defproc[(array-shape-broadcast [dss (Listof Indexes)]
-                                [broadcasting (U Boolean 'permissive) (array-broadcasting)])
-         Indexes]{
-Determines the shape of the resulting array if some number of arrays with shapes @racket[dss]
-were broadcast for a pointwise operation using the given broadcasting rules. If broadcasting
-fails, @racket[array-shape-broadcast] raises an error.
-@examples[#:eval typed-eval
-                 (array-shape-broadcast '())
-                 (array-shape-broadcast (list (vector) ((inst vector Index) 10)))
-                 (array-shape-broadcast (list ((inst vector Index) 2)
-                                              ((inst vector Index) 10)))
-                 (array-shape-broadcast (list ((inst vector Index) 2)
-                                              ((inst vector Index) 10))
-                                        'permissive)]
-}
-
-@defproc[(array-broadcast [arr (Array A)] [ds Indexes]) (Array A)]{
-Returns an array with shape @racket[ds] made by inserting new axes and repeating rows.
-This is used for both @racket[(array-broadcasting #t)] and @racket[(array-broadcasting 'permissive)].
-@examples[#:eval typed-eval
-                 (array-broadcast (array 10) ((inst vector Index) 10))
-                 (array-broadcast (array #[0 1]) #())
-                 (array-broadcast (array #[0 1]) ((inst vector Index) 5))]
-
-When @racket[array-strictness] is @racket[#f], @racket[array-broadcast] always returns a
-@tech{nonstrict} array.
-
-When @racket[array-strictness] is @racket[#t], @racket[array-broadcast] returns a strict array
-when @racket[arr] is nonstrict and the result has more elements than @racket[arr].
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:indexing"]{Indexing and Slicing}
-
-@defproc[(array-ref [arr (Array A)] [js In-Indexes]) A]{
-Returns the element of @racket[arr] at position @racket[js]. If any index in @racket[js] is
-negative or not less than its corresponding axis length, @racket[array-ref] raises an error.
-}
-
-@defproc[(array-set! [arr (Settable-Array A)] [js In-Indexes] [value A]) Void]{
-Sets the element of @racket[arr] at position @racket[js] to @racket[value].
-If any index in @racket[js] is negative or not less than its corresponding axis length,
-@racket[array-set!] raises an error.
-}
-
-@defproc[(array-indexes-ref [arr (Array A)] [idxs (Array In-Indexes)]) (Array A)]{
-High-level explanation: Returns multiple elements from @racket[arr] in a new array.
-
-Lower-level explanation: Returns an array with same shape as @racket[idxs], whose elements are
-@racket[array-ref]'d from @racket[arr] using the indexes in @racket[idxs]. 
-@examples[#:eval typed-eval
-                 (define arr (array #[#[1 2] #[10 20]]))
-                 (define idxs (array #['#(0 0) '#(1 1)]))
-                 (array-indexes-ref arr idxs)]
-
-Implementation-level explanation: @racket[(array-indexes-ref arr idxs)] is equivalent to
-@interaction[#:eval typed-eval
-                    (build-array (array-shape idxs)
-                                 (λ: ([js : Indexes])
-                                   (array-ref arr (array-ref idxs js))))]
-but faster.
-}
-
-@defproc[(array-indexes-set! [arr (Settable-Array A)] [idxs (Array In-Indexes)] [vals (Array A)])
-         Void]{
-Indexes @racket[arr] in the same way that @racket[array-indexes-ref] does, but mutates elements.
-If @racket[idxs] and @racket[vals] do not have the same shape, they are @tech{broadcast} first.
-@examples[#:eval typed-eval
-                 (define arr (mutable-array #[#[1 2] #[10 20]]))
-                 (define idxs (array #['#(0 0) '#(1 1)]))
-                 (array-indexes-set! arr idxs (array -1))
-                 arr]
-When two indexes in @racket[idxs] are the same, the element at that index is mutated more
-than once in some unspecified order.
-}
-
-@defproc[(array-slice-ref [arr (Array A)] [specs (Listof Slice-Spec)]) (Array A)]{
-Returns a transformation of @racket[arr] according to the list of slice specifications
-@racket[specs]. See @secref{array:slicing} for a discussion and examples.
-}
-
-@defproc[(array-slice-set! [arr (Settable-Array A)] [specs (Listof Slice-Spec)] [vals (Array A)])
-         Void]{
-Like @racket[array-indexes-set!], but for slice specifications. Equivalent to
-@racketblock[(let ([idxs  (array-slice-ref (indexes-array (array-shape arr)) specs)])
-               (array-indexes-set! arr idxs vals))]
-@examples[#:eval typed-eval
-                 (define arr (array->mutable-array (axis-index-array #(5 5) 1)))
-                 (array-slice-set! arr (list (:: 1 #f 2) (::)) (array 1))
-                 arr
-                 (array-slice-set!
-                  arr (list (::) (:: 1 #f 2))
-                  (array-scale (array-slice-ref arr (list (::) (:: 1 #f 2))) -1))
-                 arr]
-When a slice specification refers to an element in @racket[arr] more than once, the element is
-mutated more than once in some unspecified order.
-}
-
-@defidform[Slice-Spec]{
-The type of a slice specification. Currently defined as
-@racketblock[(U (Sequenceof Integer) Slice Slice-Dots Integer Slice-New-Axis)]
-
-A @racket[(Sequenceof Integer)] slice specification causes @racket[array-slice-ref] to pick rows
-from an axis.
-An @racket[Integer] slice specification causes @racket[array-slice-ref] to remove an axis by
-replacing it with one of its rows.
-
-See @secref{array:slicing} for an extended example.
-}
-
-@deftogether[(@defidform[Slice]
-              @defproc*[([(:: [end (U #f Integer) #f]) Slice]
-                         [(:: [start (U #f Integer)] [end (U #f Integer)] [step Integer 1])
-                          Slice])]
-              @defproc[(slice? [v Any]) Boolean]
-              @defproc[(slice-start [s Slice]) (U #f Fixnum)]
-              @defproc[(slice-end [s Slice]) (U #f Fixnum)]
-              @defproc[(slice-step [s Slice]) Fixnum])]{
-The type of @racket[in-range]-like slice specifications, its constructor, predicate, and accessors.
-
-@racket[array-slice-ref] interprets a @racket[Slice] like an @racket[in-range] sequence object.
-When @racket[start] or @racket[end] is @racket[#f], it is interpreted as an axis-length-dependent
-endpoint.
-}
-
-@defproc[(slice->range-values [s Slice] [dk Index]) (Values Fixnum Fixnum Fixnum)]{
-Given a slice @racket[s] and an axis length @racket[dk], returns the arguments to @racket[in-range]
-that would produce an equivalent slice specification.
-
-This is used internally by @racket[array-slice-ref] to interpret a @racket[Slice] object as a
-sequence of indexes.
-}
-
-@deftogether[(@defidform[Slice-Dots]
-              @defthing[::... Slice-Dots]
-              @defproc[(slice-dots? [v Any]) Boolean])]{
-The type of greedy, multiple-axis-preserving slice specifications, its singleton value, and predicate.
-}
-
-@deftogether[(@defidform[Slice-New-Axis]
-              @defproc[(::new [dk Integer 1]) Slice-New-Axis]
-              @defproc[(slice-new-axis? [v Any]) Boolean]
-              @defproc[(slice-new-axis-length [s Slice-New-Axis]) Index])]{
-The type of slice specifications that indicate inserting a new axis, its constructor, predicate, and
-accessor. The axis length @racket[dk] must be nonnegative.
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:transform"]{Transformations}
-
-@defproc[(array-transform [arr (Array A)] [ds In-Indexes] [proc (Indexes -> In-Indexes)])
-         (Array A)]{
-Returns an array with shape @racket[ds] and elements taken from @racket[arr], by composing
-@racket[arr]'s procedure with @racket[proc].
-
-Possibly the most useless, but simplest example of @racket[proc] disregards its input
-indexes and returns constant indexes:
-@interaction[#:eval typed-eval
-                    (define arr (array #[#[0 1] #[2 'three]]))
-                    (array-transform arr #(3 3) (λ: ([js : Indexes]) #(1 1)))]
-Doubling an array in every dimension by duplicating elements:
-@interaction[#:eval typed-eval
-                    (define arr (index-array #(3 3)))
-                    arr
-                    (array-transform
-                     arr
-                     (vector-map (λ: ([d : Index]) (* d 2)) (array-shape arr))
-                     (λ: ([js : Indexes])
-                       (vector-map (λ: ([j : Index]) (quotient j 2)) js)))]
-When @racket[array-strictness] is @racket[#f], the above result takes little more space than the
-original array.
-
-Almost all array transformations, including @secref{array:slicing}, are implemented using
-@racket[array-transform] or its unsafe counterpart.
-}
-
-@defproc[(array-append* [arrs (Listof (Array A))] [k Integer 0]) (Array A)]{
-Appends the arrays in @racket[arrs] along axis @racket[k]. If the arrays' shapes are not
-the same, they are @tech{broadcast} first.
-@examples[#:eval typed-eval
-                 (define arr (array #[#[0 1] #[2 3]]))
-                 (define brr (array #[#['a 'b] #['c 'd]]))
-                 (array-append* (list arr brr))
-                 (array-append* (list arr brr) 1)
-                 (array-append* (list arr (array 'x)))]
-For an append-like operation that increases the dimension of the broadcast arrays, see
-@racket[array-list->array].
-}
-
-@defproc[(array-axis-insert [arr (Array A)] [k Integer] [dk Integer 1]) (Array A)]{
-Inserts an axis of length @racket[dk] before axis number @racket[k], which must be no greater
-than the dimension of @racket[arr].
-@examples[#:eval typed-eval
-                 (define arr (array #[#[0 1] #[2 3]]))
-                 (array-axis-insert arr 0)
-                 (array-axis-insert arr 1)
-                 (array-axis-insert arr 2)
-                 (array-axis-insert arr 1 2)]
-}
-
-@defproc[(array-axis-ref [arr (Array A)] [k Integer] [jk Integer]) (Array A)]{
-Removes an axis from @racket[arr] by keeping only row @racket[jk] in axis @racket[k], which
-must be less than the dimension of @racket[arr].
-@examples[#:eval typed-eval
-                 (define arr (array #[#[0 1] #[2 3]]))
-                 (array-axis-ref arr 0 0)
-                 (array-axis-ref arr 0 1)
-                 (array-axis-ref arr 1 0)]
-}
-
-@defproc[(array-axis-swap [arr (Array A)] [k0 Integer] [k1 Integer]) (Array A)]{
-Returns an array like @racket[arr], but with axes @racket[k0] and @racket[k1] swapped.
-In two dimensions, this is called a transpose.
-@examples[#:eval typed-eval
-                 (array-axis-swap (array #[#[0 1] #[2 3]]) 0 1)
-                 (define arr (indexes-array #(2 2 2)))
-                 arr
-                 (array-axis-swap arr 0 1)
-                 (array-axis-swap arr 1 2)]
-}
-
-@defproc[(array-axis-permute [arr (Array A)] [perm (Listof Integer)]) (Array A)]{
-Returns an array like @racket[arr], but with axes permuted according to @racket[perm].
-
-The list @racket[perm] represents a mapping from source axis numbers to destination
-axis numbers: the source is the list position, the destination is the list element.
-For example, the permutation @racket['(0 1 2)] is the identity permutation for three-dimensional
-arrays, @racket['(1 0)] swaps axes @racket[0] and @racket[1], and @racket['(3 1 2 0)] swaps
-axes @racket[0] and @racket[3].
-
-The permutation must contain each integer from @racket[0] to @racket[(- (array-dims arr) 1)]
-exactly once.
-
-@examples[#:eval typed-eval
-                 (array-axis-swap (array #[#[0 1] #[2 3]]) 0 1)
-                 (array-axis-permute (array #[#[0 1] #[2 3]]) '(1 0))]
-}
-
-@defproc[(array-reshape [arr (Array A)] [ds In-Indexes]) (Array A)]{
-Returns an array with elements in the same row-major order as @racket[arr], but with
-shape @racket[ds]. The product of the indexes in @racket[ds] must be @racket[(array-size arr)].
-@examples[#:eval typed-eval
-                 (define arr (indexes-array #(2 3)))
-                 arr
-                 (array-reshape arr #(3 2))
-                 (array-reshape (index-array #(3 3)) #(9))]
-}
-
-@defproc[(array-flatten [arr (Array A)]) (Array A)]{
-Returns an array with shape @racket[(vector (array-size arr))], with the elements of
-@racket[arr] in row-major order.
-@examples[#:eval typed-eval
-                 (array-flatten (array 10))
-                 (array-flatten (array #[#[0 1] #[2 3]]))]
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:fold"]{Folds, Reductions and Expansions}
-
-@subsection{Axis Folds}
-
-@defproc*[([(array-axis-fold [arr (Array A)] [k Integer] [f (A A -> A)]) (Array A)]
-           [(array-axis-fold [arr (Array A)] [k Integer] [f (A B -> B)] [init B]) (Array B)])]{
-Folds a binary function @racket[f] over axis @racket[k] of @racket[arr]. The result has the
-shape of @racket[arr] but with axis @racket[k] removed.
-
-The three-argument variant uses the first value of each row in axis @racket[k] as @racket[init].
-It therefore requires axis @racket[k] to have positive length.
-
-@examples[#:eval typed-eval
-                 (define arr (index-array #(3 4)))
-                 arr
-                 (array-axis-fold arr 0 +)
-                 (array-axis-fold arr 1 (inst cons Index (Listof Index)) empty)]
-Notice that the second example returns an array of reversed lists.
-This is therefore a left fold; see @racket[foldl].
-
-If you need control over the order of evaluation in axis @racket[k]'s rows, see
-@racket[array-axis-reduce].
-}
-
-@deftogether[(@defform*[((array-axis-sum arr k)
-                         (array-axis-sum arr k init))]
-              @defform*[((array-axis-prod arr k)
-                         (array-axis-prod arr k init))
-                        #:contracts ([arr   (Array Number)]
-                                     [k     Integer]
-                                     [init  Number])])]{
-}
-@deftogether[(@defform*[((array-axis-min arr k)
-                         (array-axis-min arr k init))]
-              @defform*[((array-axis-max arr k)
-                         (array-axis-max arr k init))
-                        #:contracts ([arr   (Array Real)]
-                                     [k     Integer]
-                                     [init  Real])])]{
-Some standard per-axis folds, defined in terms of @racket[array-axis-fold]. The two-argument
-variants require axis @racket[k] to have positive length.
-@examples[#:eval typed-eval
-                 (define arr (index-array #(3 4)))
-                 arr
-                 (array-axis-fold arr 1 +)
-                 (array-axis-sum arr 1)
-                 (array-axis-sum arr 0 0.0)]
-}
-
-@defproc[(array-axis-count [arr (Array A)] [k Integer] [pred? (A -> Any)]) (Array Index)]{
-Counts the elements @racket[x] in rows of axis @racket[k] for which @racket[(pred? x)] is true.
-@examples[#:eval typed-eval
-                 (define arr (index-array #(3 3)))
-                 arr
-                 (array-axis-count arr 1 odd?)]
-}
-
-@deftogether[(@defproc[(array-axis-and [arr (Array A)] [k Integer]) (Array (U A Boolean))]
-              @defproc[(array-axis-or [arr (Array A)] [k Integer]) (Array (U A #f))])]{
-Apply @racket[and] or @racket[or] to each row in axis @racket[k] of array @racket[arr].
-Evaluation is short-cut as with the @racket[and] and @racket[or] macros, which is only observable
-if @racket[arr] is @tech{nonstrict}.
-
-In the following example, computing the second array element sets @racket[second?] to @racket[#t]:
-@interaction[#:eval typed-eval
-                    (define second? (ann #f Boolean))
-                    (define arr
-                      (parameterize ([array-strictness #f])
-                        (build-array #(2) (λ: ([js : Indexes])
-                                            (cond [(zero? (vector-ref js 0))  #f]
-                                                  [else  (set! second? #t)
-                                                         #t])))))]
-Printing @racket[arr] causes @racket[(set! second? #t)] to be evaluated, but applying
-@racket[array-axis-and] does not:
-@interaction[#:eval typed-eval
-                    (array-axis-and arr 0)
-                    second?]
-However, if @racket[arr] were strict, @racket[(set! second? #t)] would be evaluated when @racket[arr]
-was created.
-}
-
-@subsection{Whole-Array Folds}
-
-@defproc[(array-fold [arr (Array A)] [g ((Array A) Index -> (Array A))]) (Array A)]{
-Folds @racket[g] over @italic{each axis} of @racket[arr], in reverse order. The arguments
-to @racket[g] are an array (initially @racket[arr]) and the current axis.
-It should return an array with one fewer dimension than the array given, but does not have to.
-@examples[#:eval typed-eval
-                 (define arr (index-array #(3 4)))
-                 arr
-                 (array-fold arr (λ: ([arr : (Array Integer)] [k : Index])
-                                   (array-axis-sum arr k)))
-                 (apply + (array->list arr))
-                 (array-ref (array-fold arr (inst array->list-array (Listof* Integer)))
-                            #())]
-}
-
-@defproc*[([(array-all-fold [arr (Array A)] [f (A A -> A)]) A]
-           [(array-all-fold [arr (Array A)] [f (A A -> A)] [init A]) A])]{
-Folds @racket[f] over every element of @racket[arr] by folding @racket[f] over each axis in
-reverse order. The two-argument variant is equivalent to
-@racketblock[(array-ref (array-fold arr (λ: ([arr : (Array A)] [k : Index])
-                                          (array-axis-fold arr k f)))
-                        #())]
-and the three-argument variant is similar. The two-argument variant requires every axis to have
-positive length.
-@examples[#:eval typed-eval
-                 (define arr (index-array #(3 4)))
-                 arr
-                 (array-all-fold arr +)
-                 (array-all-fold (array #[]) + 0.0)]
-Because @racket[f] is folded over the last axis first, it receives @racket[arr]'s elements (as its
-first argument) in row-major order.
-}
-
-@deftogether[(@defform*[((array-all-sum arr)
-                         (array-all-sum arr init))]
-              @defform*[((array-all-prod arr)
-                         (array-all-prod arr init))
-                        #:contracts ([arr   (Array Number)]
-                                     [init  Number])])]{
-}
-@deftogether[(@defform*[((array-all-min arr)
-                         (array-all-min arr init))]
-              @defform*[((array-all-max arr)
-                         (array-all-max arr init))
-                        #:contracts ([arr   (Array Real)]
-                                     [init  Real])])]{
-Some standard whole-array folds, defined in terms of @racket[array-all-fold]. The one-argument
-variants require each axis in @racket[arr] to have positive length.
-@examples[#:eval typed-eval
-                 (define arr (index-array #(3 4)))
-                 arr
-                 (array-all-fold arr +)
-                 (array-all-sum arr)
-                 (array-all-sum arr 0.0)]
-}
-
-@deftogether[(@defproc[(array-all-and [arr (Array A)]) (U A Boolean)]
-              @defproc[(array-all-or [arr (Array A)]) (U A #f)])]{
-Apply @racket[and] or @racket[or] to @racket[arr]'s elements using short-cut evaluation in row-major
-order.
-
-@examples[#:eval typed-eval
-                 (define arr (index-array #(3 3)))
-                 (array-all-and (array= arr arr))
-                 (define brr (array+ arr (array 1)))
-                 (array-all-and (array= arr brr))
-                 (array-all-or (array= arr (array 0)))]
-
-@racket[(array-all-and arr)] is defined as
-@racketblock[(parameterize ([array-strictness #f])
-               (array-ref (array-fold arr array-axis-and) #()))]
-and @racket[array-all-or] is defined similarly, using @racket[array-axis-or].
-}
-
-@defform[(array-count pred? arrs ...)
-         #:contracts ([arrs   (Array Ts)]
-                      [pred?  (Ts ... -> Any)])]{
-When given one array @racket[arr], returns the number of elements @racket[x] in @racket[arr] for
-which @racket[(pred? x)] is true.
-When given multiple arrays, @racket[array-count] does the same with the corresponding elements from
-any number of arrays.
-If the arrays' shapes are not the same, they are @tech{broadcast} first.
-
-@examples[#:eval typed-eval
-                 (array-count zero? (array #[#[0 1 0 2] #[0 3 -1 4]]))
-                 (array-count equal?
-                              (array #[#[0 1] #[2 3] #[0 1] #[2 3]])
-                              (array #[0 1]))]
-
-@racket[(array-count pred? arrs ...)] is like
-@racketblock[(array-all-sum (array-map (λ (x ...) (if (pred? x ...) 1 0)) arrs ...)
-                            0)]
-but does not create intermediate (strict) arrays, and always returns an @racket[Index].
-}
-
-@deftogether[(@defform[(array-andmap pred? arrs ...)]
-              @defform[(array-ormap pred? arrs ...)
-                       #:contracts ([arrs   (Array Ts)]
-                                    [pred?  (Ts ... -> Any)])])]{
-Like @racket[andmap] and @racket[ormap], but for arrays.
-Evaluation is short-cut, in row-major order.
-If the arrays' shapes are not the same, they are @tech{broadcast} first.
-
-Determining whether each row is equal to @racket[(array #[0 1])]:
-@interaction[#:eval typed-eval
-                    (array-andmap equal?
-                                  (array #[#[0 1] #[0 1] #[0 1] #[0 1]])
-                                  (array #[0 1]))]
-Determining whether any row has @racket[0] as its first element or @racket[1] as its second:
-@interaction[#:eval typed-eval
-                    (array-ormap equal?
-                                 (array #[#[0 2] #[2 3] #[1 1] #[2 3]])
-                                 (array #[0 1]))]
-Determining whether any row is equal to @racket[(array #[0 1])]:
-@interaction[#:eval typed-eval
-                    (array-ormap equal?
-                                 (array->list-array (array #[#[0 2] #[2 3] #[1 1] #[2 3]]))
-                                 (array->list-array (array #[0 1])))]
-
-@racket[(array-andmap pred? arrs ...)] is defined as
-@racketblock[(parameterize ([array-strictness #f])
-               (array-all-and (array-map pred? arrs ...)))]
-and @racket[array-ormap] is defined similarly, using @racket[array-all-or].
-}
-
-@subsection{General Reductions and Expansions}
-
-@defproc[(array-axis-reduce [arr (Array A)] [k Integer] [h (Index (Integer -> A) -> B)]) (Array B)]{
-Like @racket[array-axis-fold], but allows evaluation control (such as short-cutting @racket[and] and
-@racket[or]) by moving the loop into @racket[h]. The result has the shape of @racket[arr], but with
-axis @racket[k] removed.
-
-The arguments to @racket[h] are the length of axis @racket[k] and a procedure that retrieves
-elements from that axis's rows by their indexes in axis @racket[k]. It should return the elements
-of the resulting array.
-
-For example, summing the squares of the rows in axis @racket[1]:
-@interaction[#:eval typed-eval
-                    (define arr (index-array #(3 3)))
-                    arr
-                    (array-axis-reduce
-                     arr 1
-                     (λ: ([dk : Index] [proc : (Integer -> Real)])
-                       (for/fold: ([s : Real 0]) ([jk  (in-range dk)])
-                         (+ s (sqr (proc jk))))))
-                    (array-axis-sum (array-map sqr arr) 1)]
-Transforming an axis into a list using @racket[array-axis-fold] and @racket[array-axis-reduce]:
-@interaction[#:eval typed-eval
-                    (array-map (inst reverse Index)
-                               (array-axis-fold arr 1
-                                                (inst cons Index (Listof Index))
-                                                empty))
-                    (array-axis-reduce arr 1 (inst build-list Index))]
-The latter is essentially the definition of @racket[array->list-array].
-
-Every fold, including @racket[array-axis-fold], is ultimately defined using
-@racket[array-axis-reduce] or its unsafe counterpart.
-}
-
-@defproc[(array-axis-expand [arr (Array A)] [k Integer] [dk Integer] [g (A Index -> B)]) (Array B)]{
-Inserts a new axis number @racket[k] of length @racket[dk], using @racket[g] to generate values;
-@racket[k] must be @italic{no greater than} the dimension of @racket[arr], and @racket[dk] must be
-nonnegative.
-
-Conceptually, @racket[g] is applied @racket[dk] times to each element in each row of axis @racket[k],
-once for each nonnegative index @racket[jk < dk].
-
-Turning vector elements into rows of a new last axis using @racket[array-axis-expand] and
-@racket[vector-ref]:
-@interaction[#:eval typed-eval
-                    (define arr (array #['#(a b c) '#(d e f) '#(g h i)]))
-                    (array-axis-expand arr 1 3 vector-ref)]
-Creating a @racket[vandermonde-matrix]:
-@interaction[#:eval typed-eval
-                    (array-axis-expand (list->array '(1 2 3 4)) 1 5 expt)]
-
-This function is a dual of @racket[array-axis-reduce] in that it can be used to invert applications
-of @racket[array-axis-reduce].
-To do so, @racket[g] should be a destructuring function that is dual to the constructor passed to
-@racket[array-axis-reduce].
-Example dual pairs are @racket[vector-ref] and @racket[build-vector], and @racket[list-ref] and
-@racket[build-list].
-
-(Do not pass @racket[list-ref] to @racket[array-axis-expand] if you care about performance, though.
-See @racket[list-array->array] for a more efficient solution.)
-}
-
-@defproc[(array->list-array [arr (Array A)] [k Integer 0]) (Array (Listof A))]{
-Returns an array of lists, computed as if by applying @racket[list] to the elements in each row of
-axis @racket[k].
-@examples[#:eval typed-eval
-                 (define arr (index-array #(3 3)))
-                 arr
-                 (array->list-array arr 1)
-                 (array-ref (array->list-array (array->list-array arr 1) 0) #())]
-See @racket[mean] for more useful examples, and @racket[array-axis-reduce] for an example that shows
-how @racket[array->list-array] is implemented.
-}
-
-@defproc[(list-array->array [arr (Array (Listof A))] [k Integer 0]) (Array A)]{
-Returns an array in which the list elements of @racket[arr] comprise a new axis @racket[k].
-Equivalent to @racket[(array-axis-expand arr k n list-ref)] where @racket[n] is the
-length of the lists in @racket[arr], but with O(1) indexing.
-
-@examples[#:eval typed-eval
-                 (define arr (array->list-array (index-array #(3 3)) 1))
-                 arr
-                 (list-array->array arr 1)]
-
-For fixed @racket[k], this function and @racket[array->list-array] are mutual inverses with respect
-to their array arguments.
-}
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:other"]{Other Array Operations}
-
-@subsection{Fast Fourier Transform}
-
-@margin-note{Wikipedia: @hyperlink["http://wikipedia.org/wiki/Discrete_Fourier_transform"]{Discrete
-Fourier Transform}}
-@defproc[(array-axis-fft [arr (Array Number)] [k Integer]) (Array Float-Complex)]{
-Performs a discrete Fourier transform on axis @racket[k] of @racket[arr]. The length of @racket[k]
-must be an integer power of two. (See @racket[power-of-two?].) The scaling convention is
-determined by the parameter @racket[dft-convention], which defaults to the convention used in
-signal processing.
-
-The transform is done in parallel using @racket[max-math-threads] threads.
-}
-
-@defproc[(array-axis-inverse-fft [arr (Array Number)] [k Integer]) (Array Float-Complex)]{
-The inverse of @racket[array-axis-fft], performed by parameterizing the forward transform on
-@racket[(dft-inverse-convention)].
-}
-
-@defproc[(array-fft [arr (Array Number)]) FCArray]{
-Performs a discrete Fourier transform on each axis of @racket[arr] using @racket[array-axis-fft].
-}
-
-@defproc[(array-inverse-fft [arr (Array Number)]) FCArray]{
-The inverse of @racket[array-fft], performed by parameterizing the forward transform on
-@racket[(dft-inverse-convention)].
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:subtypes"]{Subtypes}
-
-@subsection[#:tag "flarray"]{Flonum Arrays}
-
-@defidform[FlArray]{
-The type of @deftech{flonum arrays}, a subtype of @racket[(Settable-Array Flonum)] that stores its
-elements in an @racket[FlVector]. A flonum array is always @tech{strict}.
-}
-
-@defform[(flarray #[#[...] ...])]{
-Like @racket[array], but creates @tech{flonum arrays}. The listed elements must be real numbers,
-and may be exact.
-
-@examples[#:eval typed-eval
-                 (flarray 0.0)
-                 (flarray #['x])
-                 (flarray #[#[1 2] #[3 4]])]
-}
-
-@defproc[(array->flarray [arr (Array Real)]) FlArray]{
-Returns a flonum array that has approximately the same elements as @racket[arr]. Exact
-elements will likely lose precision during conversion.
-}
-
-@defproc[(flarray-data [arr FlArray]) FlVector]{
-Returns the elements of @racket[arr] in a flonum vector, in row-major order.
-@examples[#:eval typed-eval
-                 (flarray-data (flarray #[#[1 2] #[3 4]]))]
-}
-
-@defproc[(flarray-map [f (Flonum ... -> Flonum)] [arrs FlArray] ...) FlArray]{
-Maps the function @racket[f] over the arrays @racket[arrs]. If the arrays do not have the same
-shape, they are @tech{broadcast} first. If the arrays do have the same shape, this operation can
-be quite fast.
-
-The function @racket[f] is meant to accept the same number of arguments as the number of its
-following flonum array arguments. However, a current limitation in Typed Racket requires @racket[f]
-to accept @italic{any} number of arguments. To map a single-arity function such as @racket[fl+],
-for now, use @racket[inline-flarray-map] or @racket[array-map].
-}
-
-@defform[(inline-flarray-map f arrs ...)
-         #:contracts ([f  (Flonum ... -> Flonum)]
-                      [arrs  FlArray])]{
-Like @racket[inline-array-map], but for flonum arrays.
-
-@bold{This is currently unavailable in untyped Racket.}
-}
-
-@deftogether[(@defproc[(flarray+ [arr0 FlArray] [arr1 FlArray]) FlArray]
-              @defproc[(flarray* [arr0 FlArray] [arr1 FlArray]) FlArray]
-              @defproc*[([(flarray- [arr FlArray]) FlArray]
-                         [(flarray- [arr0 FlArray] [arr1 FlArray]) FlArray])]
-              @defproc*[([(flarray/ [arr FlArray]) FlArray]
-                         [(flarray/ [arr0 FlArray] [arr1 FlArray]) FlArray])]
-              @defproc[(flarray-min [arr0 FlArray] [arr1 FlArray]) FlArray]
-              @defproc[(flarray-max [arr0 FlArray] [arr1 FlArray]) FlArray]
-              @defproc[(flarray-scale [arr FlArray] [x Flonum]) FlArray]
-              @defproc[(flarray-abs [arr FlArray]) FlArray]
-              @defproc[(flarray-sqr [arr FlArray]) FlArray]
-              @defproc[(flarray-sqrt [arr FlArray]) FlArray])]{
-Arithmetic lifted to flonum arrays.
-}
-
-@subsection[#:tag "fcarray"]{Float-Complex Arrays}
-
-@defidform[FCArray]{
-The type of @deftech{float-complex arrays}, a subtype of @racket[(Settable-Array Float-Complex)]
-that stores its elements in a pair of @racket[FlVector]s. A float-complex array is always
-@tech{strict}.
-}
-
-@defform[(fcarray #[#[...] ...])]{
-Like @racket[array], but creates @tech{float-complex arrays}. The listed elements must be numbers,
-and may be exact.
-
-@examples[#:eval typed-eval
-                 (fcarray 0.0)
-                 (fcarray #['x])
-                 (fcarray #[#[1 2+1i] #[3 4+3i]])]
-}
-
-@defproc[(array->fcarray [arr (Array Number)]) FCArray]{
-Returns a float-complex array that has approximately the same elements as @racket[arr]. Exact
-elements will likely lose precision during conversion.
-}
-
-@deftogether[(@defproc[(fcarray-real-data [arr FCArray]) FlVector]
-              @defproc[(fcarray-imag-data [arr FCArray]) FlVector])]{
-Return the real and imaginary parts of @racket[arr]'s elements in flonum vectors, in row-major order.
-@examples[#:eval typed-eval
-                 (define arr (fcarray #[#[1 2+1i] #[3 4+3i]]))
-                 (fcarray-real-data arr)
-                 (fcarray-imag-data arr)]
-}
-
-@defproc[(fcarray-map [f (Float-Complex ... -> Float-Complex)] [arrs FCArray] ...) FCArray]{
-Maps the function @racket[f] over the arrays @racket[arrs]. If the arrays do not have the same
-shape, they are @tech{broadcast} first. If the arrays do have the same shape, this operation can
-be quite fast.
-
-The function @racket[f] is meant to accept the same number of arguments as the number of its
-following float-complex array arguments. However, a current limitation in Typed Racket requires
-@racket[f] to accept @italic{any} number of arguments. To map a single-arity function, for now,
-use @racket[inline-fcarray-map] or @racket[array-map].
-}
-
-@defform[(inline-fcarray-map f arrs ...)
-         #:contracts ([f  (Float-Complex ... -> Float-Complex)]
-                      [arrs  FCArray])]{
-Like @racket[inline-array-map], but for float-complex arrays.
-
-@bold{This is currently unavailable in untyped Racket.}
-}
-
-@deftogether[(@defproc[(fcarray+ [arr0 FCArray] [arr1 FCArray]) FCArray]
-              @defproc[(fcarray* [arr0 FCArray] [arr1 FCArray]) FCArray]
-              @defproc*[([(fcarray- [arr FCArray]) FCArray]
-                         [(fcarray- [arr0 FCArray] [arr1 FCArray]) FCArray])]
-              @defproc*[([(fcarray/ [arr FCArray]) FCArray]
-                         [(fcarray/ [arr0 FCArray] [arr1 FCArray]) FCArray])]
-              @defproc[(fcarray-scale [arr FCArray] [z Float-Complex]) FCArray]
-              @defproc[(fcarray-sqr [arr FCArray]) FCArray]
-              @defproc[(fcarray-sqrt [arr FCArray]) FCArray]
-              @defproc[(fcarray-conjugate [arr FCArray]) FCArray])]{
-Arithmetic lifted to float-complex arrays.
-}
-
-@deftogether[(@defproc[(fcarray-real-part [arr FCArray]) FlArray]
-              @defproc[(fcarray-imag-part [arr FCArray]) FlArray]
-              @defproc[(fcarray-make-rectangular [arr0 FlArray] [arr1 FlArray]) FCArray]
-              @defproc[(fcarray-magnitude [arr FCArray]) FlArray]
-              @defproc[(fcarray-angle [arr FCArray]) FlArray]
-              @defproc[(fcarray-make-polar [arr0 FlArray] [arr1 FlArray]) FCArray])]{
-Conversions to and from complex numbers, lifted to flonum and float-complex arrays.
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "array:strict"]{Strictness}
-
-@defparam[array-strictness strictness Boolean]{
-Determines whether @racketmodname[math/array] functions return strict arrays.
-The default value is @racket[#t].
-
-See @secref{array:nonstrict} for a discussion on nonstrict arrays.
-}
-
-@defproc[(array-strict? [arr (Array A)]) Boolean]{
-Returns @racket[#t] when @racket[arr] is @tech{strict}.
-@examples[#:eval typed-eval
-                 (define arr
-                   (parameterize ([array-strictness #f])
-                     (array+ (array 10) (array #[0 1 2 3]))))
-                 (array-strict? arr)
-                 (array-strict! arr)
-                 (array-strict? arr)]
-}
-
-@defproc[(array-strict! [arr (Array A)]) Void]{
-Causes @racket[arr] to compute and store all of its elements. Thereafter, @racket[arr]
-computes its elements by retrieving them from the store.
-
-If @racket[arr] is already strict, @racket[(array-strict! arr)] does nothing.
-}
-
-@defform[(array-strict arr)
-         #:contracts ([arr (Array A)])]{
-An expression form of @racket[array-strict!], which is often more convenient. First evaluates
-@racket[(array-strict! arr)], then returns @racket[arr].
-
-This is a macro so that Typed Racket will preserve @racket[arr]'s type exactly. If it were a
-function, @racket[(array-strict arr)] would always have the type @racket[(Array A)], even if
-@racket[arr] were a subtype of @racket[(Array A)], such as @racket[(Mutable-Array A)].
-}
-
-@deftogether[(@defproc[(array-default-strict! [arr (Array A)]) Void]
-              @defform[(array-default-strict arr)
-                       #:contracts ([arr (Array A)])])]{
-Like @racket[array-strict!] and @racket[array-strict], but do nothing when @racket[array-strictness]
-is @racket[#f].
-
-Apply one of these to return values from library functions to ensure that users get strict arrays
-by default. See @secref{array:nonstrict} for details.
-}
-
-@defproc[(build-simple-array [ds In-Indexes] [proc (Indexes -> A)]) (Array A)]{
-Like @racket[build-array], but returns an array without storage that is nevertheless considered to be
-strict, regardless of the value of @racket[array-strictness].
-Such arrays will @italic{not} cache their elements when @racket[array-strict!] or
-@racket[array-strict] is applied to them.
-
-Use @racket[build-simple-array] to create arrays that represent simple functions of their indexes.
-For example, basic array constructors such as @racket[make-array] are defined in terms of this or its
-unsafe counterpart.
-
-@bold{Be careful with this function.} While it creates arrays that are always memory-efficient,
-it is easy to ruin your program's performance by using it to define arrays for which element lookup
-is permanently expensive. In the wrong circumstances, using it instead of @racket[build-array] can
-turn a linear algorithm into an exponential one!
-
-In general, use @racket[build-simple-array] when
-@itemlist[@item{Computing an element is never more expensive than computing a row-major index followed
-                by applying @racket[vector-ref]. An example is @racket[index-array], which only
-                computes row-major indexes.}
-          @item{Computing an element is independent of any other array's elements.
-                In this circumstance, it is impossible to compose some unbounded number of possibly
-                expensive array @tech{procedures}.}
-          @item{You can prove that each element will be computed at most once, throughout the
-                entire life of your program. This is true, for example, when the result is sent
-                only to a function that makes a copy of it, such as @racket[array-lazy] or
-                @racket[array->mutable-array].}]
-See @racket[array-lazy] for an example of the last circumstance.
-}
-
-@defproc[(array-lazy [arr (Array A)]) (Array A)]{
-Returns an immutable, @tech{nonstrict} array with the same elements as @racket[arr], but element
-computations are cached.
-
-Perhaps the most natural way to use @racket[array-lazy] is for so-called ``dynamic programming,''
-or memoizing a function that happens to have a rectangular domain.
-For example, this computes the first 10 Fibonacci numbers in linear time:
-@interaction[#:eval typed-eval
-                    (eval:alts
-                     (define: fibs : (Array Natural)
-                       (array-lazy
-                        (build-simple-array
-                         #(10) (λ: ([js : Indexes])
-                                 (define j (vector-ref js 0))
-                                 (cond [(j . < . 2)  j]
-                                       [else  (+ (array-ref fibs (vector (- j 1)))
-                                                 (array-ref fibs (vector (- j 2))))])))))
-                     (void))
-                    (eval:alts
-                     fibs
-                     (ann (array #[0 1 1 2 3 5 8 13 21 34]) (Array Natural)))]
-Because @racket[build-simple-array] never stores its elements, its procedure argument may refer to
-the array it returns.
-Wrapping its result with @racket[array-lazy] makes each @racket[array-ref] take no more than linear
-time; further, each takes constant time when the elements of @racket[fibs] are computed in order.
-Without @racket[array-lazy], computing the elements of @racket[fibs] would take exponential time.
-
-Printing a lazy array computes and caches all of its elements, as does applying
-@racket[array-strict!] or @racket[array-strict] to it.
-
-Except for arrays returned by @racket[build-simple-array], it is useless to apply @racket[array-lazy]
-to a @tech{strict} array.
-Using the lazy copy instead of the original only degrades performance.
-
-While it may seem that @racket[array-lazy] should just return @racket[arr] when @racket[arr] is
-strict, this would violate the invariant that @racket[array-lazy] returns immutable arrays.
-For example:
-@interaction[#:eval typed-eval
-                    (eval:alts
-                     (: array-maybe-lazy (All (A) ((Array A) -> (Array A))))
-                     (void))
-                    (eval:alts
-                     (define (array-maybe-lazy arr)
-                       (if (array-strict? arr) arr (array-lazy arr)))
-                     (void))
-                    (eval:alts
-                     (define arr (mutable-array #[0 1 2 3]))
-                     (void))
-                    (eval:alts
-                     (define brr (array-maybe-lazy arr))
-                     (void))
-                    (eval:alts
-                     (array-set! arr #(0) -1000)
-                     (void))
-                    (eval:alts
-                     brr
-                     (ann (array #[-1000 1 2 3]) (Array Integer)))]
-}
-
-
-@;{==================================================================================================}
-
-
-@;{
-@section[#:tag "array:unsafe"]{Unsafe Operations}
-
-unsafe-array-ref
-unsafe-array-set!
-unsafe-array-proc
-unsafe-settable-array-set-proc
-unsafe-fcarray 
-in-unsafe-array-indexes
-make-unsafe-array-set-proc
-make-unsafe-array-proc
-unsafe-build-array
-unsafe-build-simple-array
-unsafe-vector->array
-unsafe-flarray
-unsafe-array-transform
-unsafe-array-axis-reduce
-}
-
-@;{
-Don't know whether or how to document these yet:
-
-parallel-array-strict
-parallel-array->mutable-array
-array/syntax
-}
-
-@(close-eval typed-eval)
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/math-base.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-base.scrbl
deleted file mode 100644
index de3b450069..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/math-base.scrbl
+++ /dev/null
@@ -1,141 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          racket/sandbox
-          (for-label racket/base
-                     math
-                     (only-in typed/racket/base
-                              Real Boolean Integer Natural Number Listof
-                              Positive-Flonum Float-Complex Any))
-          "utils.rkt")
-
-@(define untyped-eval (make-untyped-math-eval))
-
-@title[#:tag "base"]{Constants and Elementary Functions}
-@(author-neil)
-
-@defmodule[math/base]
-
-For convenience, @racketmodname[math/base] re-exports @racketmodname[racket/math]
-as well as providing the values document below.
-
-In general, the functions provided by @racketmodname[math/base] are @deftech{elementary}
-functions, or those functions that can be defined in terms of a finite number of
-arithmetic operations, logarithms, exponentials, trigonometric functions, and constants.
-For others, see @racketmodname[math/special-functions] and @racketmodname[math/distributions].
-
-@section{Constants}
-
-If you need more accurate approximations than the following flonums, see, for example,
-@racket[phi.bf] and @racket[bigfloat->rational].
-
-@defthing[phi.0 Positive-Flonum]{
-An approximation of φ, the @hyperlink["http://en.wikipedia.org/wiki/Golden_ratio"]{golden ratio}.
-@interaction[#:eval untyped-eval phi.0]
-}
-
-@defthing[euler.0 Positive-Flonum]{
-An approximation of @italic{e}, or @hyperlink["http://en.wikipedia.org/wiki/E_(mathematical_constant)"]{Euler's number}.
-@interaction[#:eval untyped-eval euler.0 (exp 1)]
-}
-
-@defthing[gamma.0 Positive-Flonum]{
-An approximation of γ, the @hyperlink["http://en.wikipedia.org/wiki/Euler-Mascheroni_constant"]{Euler-Mascheroni constant}.
-@interaction[#:eval untyped-eval gamma.0]
-}
-
-@defthing[catalan.0 Positive-Flonum]{
-An approximation of @italic{G}, or @hyperlink["http://en.wikipedia.org/wiki/Catalan's_constant"]{Catalan's constant}.
-@interaction[#:eval untyped-eval catalan.0]
-}
-
-@section{Functions}
-
-@defproc[(float-complex? [v Any]) Boolean]{
-Returns @racket[#t] when @racket[v] is of type @racket[Float-Complex]. Analogous to @racket[flonum?].
-}
-
-@defproc[(number->float-complex [x Number]) Float-Complex]{
-Returns a new complex number with a flonum real part and a flonum imaginary part.
-Analogous to @racket[real->double-flonum].
-}
-
-@defproc[(power-of-two? [x Real]) Boolean]{
-Returns @racket[#t] when @racket[x] is an integer power of 2.
-@examples[#:eval untyped-eval
-                 (power-of-two? 1.0)
-                 (power-of-two? 1/2)
-                 (power-of-two? (flnext 2.0))]
-}
-
-@deftogether[(@defproc[(asinh [z Number]) Number]
-              @defproc[(acosh [z Number]) Number]
-              @defproc[(atanh [z Number]) Number])]{
-The inverses of @racket[sinh], @racket[cosh], and @racket[tanh], which are
-defined in @racketmodname[racket/math] (and re-exported by @racketmodname[math/base]).
-}
-
-@defproc[(sum [xs (Listof Real)]) Real]{
-Like @racket[(apply + xs)], but incurs rounding error only once when adding inexact numbers.
-(In fact, the inexact numbers in @racket[xs] are summed separately using @racket[flsum].)
-}
-
-@section{Random Number Generation}
-
-@defproc[(random-natural [k Integer]) Natural]{
-Returns a random natural number less than @racket[k], which must be positive.
-Use @racket[(random-natural k)] instead of @racket[(random k)] when @racket[k]
-could be larger than @racket[4294967087].
-}
-
-@defproc[(random-integer [a Integer] [b Integer]) Integer]{
-Returns a random integer @racket[n] such that @racket[(a . <= . n)] and @racket[(n . < . b)].
-}
-
-@defproc[(random-bits [num Integer]) Natural]{
-Returns a random natural smaller than @racket[(expt 2 num)]; @racket[num] must be positive.
-For powers of two, this is faster than using @racket[random-natural], which
-is implemented in terms of @racket[random-bits], using biased rejection sampling.
-
-As an example of use, the significands of the numbers returned by @racket[bfrandom]
-are chosen by @racket[(random-bits (bf-precision))].
-}
-
-
-@section{Measuring Error}
-
-@defproc[(absolute-error [x Real] [r Real]) Real]{
-Usually computes @racket[(abs (- x r))] using exact rationals, but handles non-rational
-reals such as @racket[+inf.0] specially.
-
-@examples[#:eval untyped-eval
-                 (absolute-error 1/2 1/2)
-                 (absolute-error #i1/7 1/7)
-                 (absolute-error +inf.0 +inf.0)
-                 (absolute-error +inf.0 +nan.0)
-                 (absolute-error 1e-20 0.0)
-                 (absolute-error (- 1.0 (fl 4999999/5000000)) 1/5000000)]
-}
-
-@defproc[(relative-error [x Real] [r Real]) Real]{
-Measures how close an approximation @racket[x] is to the correct value @racket[r],
-relative to the magnitude of @racket[r].
-
-This function usually computes @racket[(abs (/ (- x r) r))] using exact rationals,
-but handles non-rational reals such as @racket[+inf.0] specially, as well as
-@racket[r = 0].
-
-@examples[#:eval untyped-eval
-                 (relative-error 1/2 1/2)
-                 (relative-error #i1/7 1/7)
-                 (relative-error +inf.0 +inf.0)
-                 (relative-error +inf.0 +nan.0)
-                 (relative-error 1e-20 0.0)
-                 (relative-error (- 1.0 (fl 4999999/5000000)) 1/5000000)]
-In the last two examples, relative error is high because the result is near zero. (Compare
-the same examples with @racket[absolute-error].) Because flonums are particularly dense
-near zero, this makes relative error better than absolute error for measuring the error
-in a flonum approximation. An even better one is error in @tech{ulps}; see @racket[flulp-error].
-}
-
-@(close-eval untyped-eval)
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/math-bigfloat.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-bigfloat.scrbl
deleted file mode 100644
index 38434a561a..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/math-bigfloat.scrbl
+++ /dev/null
@@ -1,725 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          racket/sandbox
-          (for-label racket/base
-                     math
-                     (only-in typed/racket/base
-                              Flonum Real Boolean Integer Exact-Rational Exact-Positive-Integer
-                              Any U Listof String False Values Path-String))
-          "utils.rkt")
-
-@(define untyped-eval (make-untyped-math-eval))
-@interaction-eval[#:eval untyped-eval (require math/bigfloat)]
-
-@title[#:tag "bigfloat"]{Arbitrary-Precision Floating-Point Numbers (@deftech{Bigfloats})}
-@(author-neil)
-
-@defmodule[math/bigfloat]
-
-This library provides a Typed Racket interface to @hyperlink["http://www.mpfr.org/"]{MPFR},
-a C library that provides
-@itemlist[@item{A C type of arbitrary-precision floating-point numbers.}
-          @item{Elementary and special functions that are efficient and proved correct.}
-          @item{Well-defined semantics that correspond with the latest IEEE 754 standard.}
-]
-The arbitrary-precision floating-point numbers MPFR provides and operates on are represented by the
-Typed Racket type @racket[Bigfloat] and identified by the predicate @racket[bigfloat?].
-
-With a few noted exceptions, bigfloat functions regard their arguments as if they were exact,
-regardless of their precision.
-Conceptually, they compute exact results using infinitely many bits, and return results with
-@racket[(bf-precision)] bits by rounding them using @racket[(bf-rounding-mode)].
-In practice, they use finite algorithms that have been painstakingly proved to be
-equivalent to that conceptual, infinite process.
-
-MPFR is free and license-compatible with commercial software. It is distributed with Racket
-for Windows and Mac OS X, is installed on most Linux systems, and is
-@hyperlink["http://www.mpfr.org/ports.html"]{easy to install} on major Unix-like platforms.
-
-@local-table-of-contents[]
-
-@section[#:tag "quick"]{Quick Start}
-
-@itemlist[#:style 'ordered
-@item{Set the bigfloat function result precision using @racket[(bf-precision <some-number-of-bits>)].}
-@item{Use @racket[bf] to convert real values and well-formed strings to bigfloats.}
-@item{Operate on bigfloats using @racket[bf]-prefixed functions like @racket[bf+] and @racket[bfsin].}
-@item{Convert bigfloats to real values using @racket[bigfloat->real], @racket[bigfloat->flonum],
-      and @racket[bigfloat->integer]. Format them for display using @racket[bigfloat->string].}
-]
-
-For examples, continue through the FAQ.
-
-@section{Fictionally Asked Questions}
-
-@bold{Why use @racketmodname[math/bigfloat]}?
-
-There are a few reasons.
-
-@italic{Reason:} Flonums have either too much or too little precision for your application.
-
-@examples[#:eval
-          untyped-eval
-          (flsqrt 3.0)
-          pi
-          (bf-precision 16)
-          (eval:alts (bfsqrt (bf 3))
-                     (eval:result @racketresultfont{(bf #e1.73206)}))
-          (bf-precision 179)
-          (eval:alts
-           pi.bf
-           (eval:result
-            @racketresultfont{(bf #e3.141592653589793238462643383279502884197169399375105819)}))]
-
-A flonum has a 53-bit significand (we'll say it has 53 bits of
-@italic{precision}) and an 11-bit @italic{exponent}. A bigfloat
-has an arbitrary precision of at least 2 bits and a 31-bit exponent.
-
-@italic{Reason:} To compute ridiculously large or small numbers with confidence.
-
-@examples[#:eval
-          untyped-eval
-          (bf-precision 128)
-          (eval:alts
-           (bfexp (bfexp (bfexp (bf 3))))
-           (eval:result @racketresultfont{(bf "2.050986436051648895105860942072054674579e229520860")}))
-          (eval:alts
-           (bflog (bflog (bflog (bfexp (bfexp (bfexp (bf 3)))))))
-           (eval:result @racketresultfont{(bf 3)}))]
-
-@italic{Reason:} To verify your floating-point hardware.
-
-@hyperlink["http://en.wikipedia.org/wiki/IEEE_754-2008"]{IEEE 754-2008} stipulates
-that conforming implementations must correctly round the results of all operations.
-Roughly speaking, results can't be more than half a bit off, where the bit in
-question is the least significant in the significand.
-
-Of course, implementations don't always adhere to standards. For example, on my old
-laptop, evaluating @(racket (exp 400)) results in @(racket 5.221469689764346e+173).
-Note the last four decimal digits in the significand: @(racket 4346). But they should be @racket[4144]:
-@interaction[#:eval untyped-eval
-                    (bf-precision 53)
-                    (eval:alts
-                     (bigfloat->flonum (bfexp (bf 400)))
-                     (eval:result @racketresultfont{5.221469689764144e+173}))]
-My new laptop computes @(racket 5.221469689764144e+173) as it should.
-
-@italic{Reason:} To control rounding of the least significant bit.
-
-IEEE 754 provides for different rounding modes for the smallest bit of
-a flonum result, such as round to even and round toward zero. We might use
-this to implement interval arithmetic correctly, by rounding lower bounds
-downward and upper bounds upward. But there isn't a portable way to set the
-rounding mode!
-
-MPFR allows the rounding mode to be different for any operation, and
-@racketmodname[math/bigfloat] exposes this capability using the parameter
-@racket[bf-rounding-mode].
-
-@bold{When shouldn't I use @racketmodname[math/bigfloat]?}
-
-When you need raw speed. Bigfloat functions can be hundreds to thousands of times slower
-than flonum functions.
-
-That's not to say that they're @italic{inefficient}. For example, @(racket bflog)
-implements the algorithm with the best known asymptotic complexity. It just doesn't
-run directly on hardware, and it can't take fixed-precision-only shortcuts.
-
-@bold{Why are there junk digits on the end of @racket[(bf 1.1)]?}
-
-That's approximately the value of the flonum @racket[1.1]. Use @code{(bf #e1.1)} or
-@code{(bf "1.1")} to make the junk go away. In general, you should prefer to convert
-exact rationals and strings to bigfloats.
-
-@bold{Why is the last digit of @racket[pi.bf] not rounded correctly?}
-
-All the @italic{bits} but the last is exact, and the last bit is correctly rounded.
-This doesn't guarantee that the last digit will be.
-
-A decimal digit represents at most log(10)/log(2) ≈ 3.3 bits. This is an irrational
-number, so the decimal/bit boundary never lines up except at the decimal point.
-Thus, the last decimal digit of any bigfloat must represent fewer than 3.3 bits,
-so it's wrong more often than not. But it's the last @italic{bit} that counts.
-
-@section{Type and Constructors}
-
-@deftogether[(@defidform[Bigfloat]
-              @defproc[(bigfloat? [v Any]) Boolean])]{
-An opaque type that represents an arbitrary-precision floating-point number, or a @tech{bigfloat},
-and the opaque type's predicate.
-}
-
-@defproc*[([(bf [x (U String Real)]) Bigfloat]
-           [(bf [sig Integer] [exp Integer]) Bigfloat])]{
-The one-argument variant converts a string or real @racket[x] to a bigfloat.
-
-@interaction[#:eval untyped-eval
-                    (bf-precision 128)
-                    (eval:alts (bf 4) (eval:result @racketresultfont{(bf 4)}))
-                    (eval:alts
-                     (bf 1/7)
-                     (eval:result
-                      @racketresultfont{(bf #e0.1428571428571428571428571428571428571426)}))
-                    (eval:alts
-                     (bf #e4.1)
-                     (eval:result
-                      @racketresultfont{(bf #e4.099999999999999999999999999999999999995)}))
-                    (eval:alts
-                     (bf "not a number")
-                     (eval:result
-                      ""
-                      ""
-                      "bf: expected a well-formed decimal number; given \"not a number\""))
-                    (eval:alts
-                     (bf "15e200000000")
-                     (eval:result
-                      @racketresultfont{(bf "1.499999999999999999999999999999999999998e200000001")}))]
-
-In the last example, the result of @racket[(bf "15e200000000")] is displayed as a
-string conversion because the exact rational number would be very large.
-
-@margin-note{* It can be a good idea if you're testing a flonum implementation of a function
-             against a bigfloat implementation.}
-Converting from flonum literals is usually a bad idea* because flonums have only
-53 bits precision. Prefer to pass exact rationals and strings to @racket[bf].
-
-The two-argument variant converts a signed significand @racket[sig] and a power of
-2 @racket[exp] to a bigfloat. Generally, @racket[(bf sig exp) = (bf (* sig (expt 2 exp)))],
-but the two-argument variant is much faster, especially for large @racket[exp].
-@examples[#:eval untyped-eval
-                 (eval:alts
-                  (bf 200 56)
-                  (eval:result @racketresultfont{(bf 14411518807585587200)}))
-                 (eval:alts
-                  (bf (* 200 (expt 2 56)))
-                  (eval:result @racketresultfont{(bf 14411518807585587200)}))]
-
-The @racket[bfrandom] function generates random bigfloats between 0 and 1 using
-the two-argument variant in this way:
-@interaction[#:eval untyped-eval
-                    (require (only-in math/base random-bits))
-                    (bf-precision 64)
-                    (eval:alts
-                     (bf (random-bits 64) -64)
-                     (eval:result @racketresultfont{(bf #e0.416872969910248753552)}))]
-}
-
-@defproc[(bfrandom) Bigfloat]{
-Returns a uniformly distributed random bigfloat in the interval [0,1].
-}
-
-@defproc[(bfcopy [x Bigfloat]) Bigfloat]{
-Returns the @racket[(bf-precision)]-bit bigfloat closest to @racket[x],
-under the current @racket[bf-rounding-mode].
-
-A common pattern to compute bigfloats in higher precision is
-@interaction[#:eval untyped-eval
-                    (bf-precision 64)
-                    (eval:alts
-                     (bfcopy
-                      (parameterize ([bf-precision  (+ (bf-precision) 10)])
-                        (bf/ (bf+ 1.bf (bfsqrt 5.bf)) 2.bf)))
-                     (eval:result @racketresultfont{(bf #e1.61803398874989484821)}))]
-This example computes the golden ratio (@racket[phi.bf]) with 10 bits more than requested,
-to make up for triple rounding error.
-}
-
-@section{Accessors and Conversion Functions}
-
-@defproc[(bigfloat-precision [x Bigfloat]) Exact-Positive-Integer]{
-Returns the number of bits in the significand of @racket[x]. This is almost always
-the value of @racket[(bf-precision)] when @racket[x] was created.
-}
-
-@defproc[(bigfloat-signbit [x Bigfloat]) (U 0 1)]{
-Returns the sign bit of the significand of @racket[x].
-@examples[#:eval untyped-eval
-                 (eval:alts
-                  (bigfloat-signbit -1.bf)
-                  (eval:result @racketresultfont{1}))
-                 (eval:alts
-                  (bigfloat-signbit 0.bf)
-                  (eval:result @racketresultfont{0}))
-                 (eval:alts
-                  (bigfloat-signbit -0.bf)
-                  (eval:result @racketresultfont{1}))
-                 (eval:alts
-                  (bigfloat-signbit -inf.bf)
-                  (eval:result @racketresultfont{1}))]
-}
-
-@deftogether[(@defproc[(bigfloat-significand [x Bigfloat]) Integer]
-              @defproc[(bigfloat-exponent [x Bigfloat]) Integer])]{
-Return the @italic{signed} significand or exponent of @racket[x].
-
-To access the significand and exponent at the same time, use @racket[bigfloat->sig+exp].
-}
-
-@defproc[(bigfloat->sig+exp [x Bigfloat]) (Values Integer Integer)]{
-Returns the @italic{signed} significand and exponent of @racket[x].
-
-If @racket[(values sig exp) = (bigfloat->sig+exp x)], its value as an exact rational
-is @racket[(* sig (expt 2 exp))]. In fact, @racket[bigfloat->rational] converts
-bigfloats to rationals in exactly this way, after ensuring that @racket[(bfrational? x)]
-is @racket[#t].
-
-This function and the two-argument variant of @racket[bf] are mutual inverses.
-}
-
-@deftogether[(@defproc[(bigfloat->integer [x Bigfloat]) Integer]
-              @defproc[(bigfloat->rational [x Bigfloat]) Exact-Rational]
-              @defproc[(bigfloat->real [x Bigfloat]) (U Exact-Rational Flonum)]
-              @defproc[(bigfloat->flonum [x Bigfloat]) Flonum])]{
-Convert bigfloats to integer, exact rational, real and flonum values respectively.
-
-@racket[bigfloat->integer], @racket[bigfloat->rational] and @racket[bigfloat->real] return values
-that can be converted exactly back to @racket[x] using @racket[bf]. For the first two, this is done
-by raising an error if @racket[x] is not respectively integer or rational. On the other hand,
-@racket[bigfloat->real] returns @racket[+inf.0], @racket[-inf.0] or @racket[+nan.0] when @racket[x]
-is not a rational bigfloat.
-
-@racket[bigfloat->flonum] rounds @racket[x] to 53 bits precision to fit the value into a flonum,
-using the current value of @racket[bf-rounding-mode].
-
-@interaction[#:eval untyped-eval
-                    (bf-precision 64)
-                    (eval:alts
-                     (bigfloat->integer (bf 21/10))
-                     (eval:result
-                      ""
-                      ""
-                      "bigfloat->integer: contract violation
-  expected: bfinteger?
-  given: (bf #e2.09999999999999999991)"))
-                    (eval:alts
-                     (bigfloat->integer (bfround (bf 21/10)))
-                     (eval:result @racketresultfont{2}))
-                    (eval:alts (define x (bf 1/7)) (eval:result ""))
-                    (eval:alts
-                     (bigfloat->flonum x)
-                     (eval:result @racketresultfont{0.14285714285714285}))
-                    (eval:alts
-                     (bigfloat->rational x)
-                     (eval:result @racketresultfont{10540996613548315209/73786976294838206464}))
-                    (eval:alts
-                     (rationalize (bigfloat->rational x) (expt 2 (- (bf-precision))))
-                     (eval:result @racketresultfont{1/7}))
-                    (eval:alts
-                     (bf= x (bf (bigfloat->rational x)))
-                     (eval:result @racketresultfont{#t}))]
-
-@bold{Be careful with exact conversions.} Bigfloats with large exponents may not fit in memory as
-integers or exact rationals. Worse, they might fit, but have all your RAM and swap space for lunch.
-}
-
-@deftogether[(@defproc[(bigfloat->string [x Bigfloat]) String]
-              @defproc[(string->bigfloat [s String]) (U Bigfloat False)])]{
-Convert a bigfloat @racket[x] to a string @racket[s] and back.
-
-The string returned by @racket[bigfloat->string] includes enough digits that
-@racket[string->bigfloat] can reconstruct the bigfloat precisely. In other words,
-@racket[string->bigfloat] is a left inverse of @racket[bigfloat->string].
-
-If @racket[s] isn't a well-formed decimal number with an optional exponent part,
-@racket[string->bigfloat] returns @racket[#f]. (In contrast, @racket[(bf s)] raises an error.)
-
-@examples[#:eval untyped-eval
-                 (bf-precision 64)
-                 (eval:alts
-                  (bigfloat->string (bf 4))
-                  (eval:result @racketresultfont{"4"}))
-                 (eval:alts
-                  (bigfloat->string (bf #e0.0001))
-                  (eval:result @racketresultfont{"1.00000000000000000001e-4"}))
-                 (eval:alts
-                  (string->bigfloat "0.14285714285714285714")
-                  (eval:result @racketresultfont{(bf #e0.142857142857142857141)}))
-                 (eval:alts
-                  (string->bigfloat "square root of two")
-                  (eval:result @racketresultfont{#f}))
-                 (eval:alts
-                  (string->bigfloat (bigfloat->string pi.bf))
-                  (eval:result @racketresultfont{(bf #e3.14159265358979323851)}))
-                 (eval:alts
-                  pi.bf
-                  (eval:result @racketresultfont{(bf #e3.14159265358979323851)}))]
-}
-
-@section{Parameters}
-
-@defparam[bf-precision bits Integer]{
-A parameter that determines the precision of bigfloats returned from most bigfloat functions.
-Exceptions are noted in the documentation for functions that do not use @racket[bf-precision].
-
-For nonzero, rational bigfloats, the number of bits @racket[bits] includes the leading one bit.
-For example, to simulate 64-bit floating point, use @racket[(bf-precision 53)] even though
-flonums have a 52-bit significand, because the one bit is implicit in a flonum.
-
-This parameter has a guard that ensures @racket[(bf-precision)] is between
-@racket[bf-min-precision] and @racket[bf-max-precision].
-}
-
-@defparam[bf-rounding-mode mode (U 'nearest 'zero 'up 'down)]{
-A parameter that determines the mode used to round the results of most bigfloat functions.
-Conceptually, rounding is applied to infinite-precision results to fit them into
-@racket[(bf-precision)] bits.
-}
-
-@defthing[bf-min-precision Exact-Positive-Integer]{
-Equal to @racket[2], because single-bit bigfloats can't be correctly rounded.
-}
-
-@defthing[bf-max-precision Exact-Positive-Integer]{
-The largest value of @racket[(bf-precision)]. This is platform-dependent, and probably much
-larger than you'll ever need.
-}
-
-@section[#:tag "constants"]{Constants}
-
-Most bigfloat ``constants'' are actually identifier macros that expand to the application
-of a zero-argument function. This allows, for example, @racket[pi.bf] to depend on the
-current value of @racket[bf-precision], and allows all of them to be constructed lazily.
-Most constants are memoized, possibly at multiple precisions.
-
-@deftogether[(@defthing[pi.bf Bigfloat]
-              @defthing[phi.bf Bigfloat]
-              @defthing[gamma.bf Bigfloat]
-              @defthing[catalan.bf Bigfloat]
-              @defthing[log2.bf Bigfloat])]{
-Approximations of π, φ, γ, G and log(2).
-@examples[#:eval
-          untyped-eval
-          (bf-precision 10)
-          (eval:alts pi.bf (eval:result @racketresultfont{(bf #e3.1406)}))
-          (bf-precision 179)
-          (eval:alts
-           pi.bf
-           (eval:result
-            @racketresultfont{(bf #e3.141592653589793238462643383279502884197169399375105819)}))
-          (eval:alts
-           phi.bf
-           (eval:result
-            @racketresultfont{bf #e1.618033988749894848204586834365638117720309179805762863)}))
-          (eval:alts
-           gamma.bf
-           (eval:result
-            @racketresultfont{(bf #e0.5772156649015328606065120900824024310421593359399235988)}))
-          (eval:alts
-           catalan.bf
-           (eval:result
-            @racketresultfont{(bf #e0.9159655941772190150546035149323841107741493742816721343)}))
-          (eval:alts
-           log2.bf
-           (eval:result
-            @racketresultfont{(bf #e0.6931471805599453094172321214581765680755001343602552545)}))]
-}
-
-@deftogether[(@defthing[-inf.bf Bigfloat]
-              @defthing[-max.bf Bigfloat]
-              @defthing[-min.bf Bigfloat]
-              @defthing[-0.bf Bigfloat]
-              @defthing[0.bf Bigfloat]
-              @defthing[+min.bf Bigfloat]
-              @defthing[+max.bf Bigfloat]
-              @defthing[+inf.bf Bigfloat]
-              @defthing[+nan.bf Bigfloat]
-              @defthing[epsilon.bf Bigfloat])]{
-Bigfloat constants corresponding to
-@racket[-inf.0], @racket[-max.0] @racket[-min.0], @racket[-0.0],
-@racket[0.0], @racket[+min.0], @racket[+max.0], @racket[+inf.0],
-@racket[+nan.0] and @racket[epsilon.0].
-
-The constants @racket[-inf.bf], @racket[-0.bf], @racket[0.bf], @racket[+inf.bf],
-and @racket[+nan.bf] have fixed precision.
-}
-
-@deftogether[(@defthing[-10.bf Bigfloat]
-              @defthing[-9.bf Bigfloat]
-              @defthing[-8.bf Bigfloat]
-              @defthing[-7.bf Bigfloat]
-              @defthing[-6.bf Bigfloat]
-              @defthing[-5.bf Bigfloat]
-              @defthing[-4.bf Bigfloat]
-              @defthing[-3.bf Bigfloat]
-              @defthing[-2.bf Bigfloat]
-              @defthing[-1.bf Bigfloat]
-              @defthing[1.bf Bigfloat]
-              @defthing[2.bf Bigfloat]
-              @defthing[3.bf Bigfloat]
-              @defthing[4.bf Bigfloat]
-              @defthing[5.bf Bigfloat]
-              @defthing[6.bf Bigfloat]
-              @defthing[7.bf Bigfloat]
-              @defthing[8.bf Bigfloat]
-              @defthing[9.bf Bigfloat]
-              @defthing[10.bf Bigfloat])]{
-More fixed-precision bigfloat constants.
-}
-
-@section[#:tag "predicates"]{Predicates}
-
-@deftogether[(@defproc[(bfzero? [x Bigfloat]) Boolean]
-              @defproc[(bfpositive? [x Bigfloat]) Boolean]
-              @defproc[(bfnegative? [x Bigfloat]) Boolean]
-              @defproc[(bfinteger? [x Bigfloat]) Boolean]
-              @defproc[(bfeven? [x Bigfloat]) Boolean]
-              @defproc[(bfodd? [x Bigfloat]) Boolean]
-              @defproc[(bfrational? [x Bigfloat]) Boolean]
-              @defproc[(bfinfinite? [x Bigfloat]) Boolean]
-              @defproc[(bfnan? [x Bigfloat]) Boolean])]{
-Unary predicates corresponding to @racket[zero?], @racket[positive?],
-@racket[negative?], @racket[integer?], @racket[even?], @racket[odd?],
-@racket[rational?], @racket[infinite?] and @racket[nan?].
-}
-
-@deftogether[(@defproc[(bf= [x Bigfloat] [y Bigfloat]) Boolean]
-              @defproc[(bf> [x Bigfloat] [y Bigfloat]) Boolean]
-              @defproc[(bf< [x Bigfloat] [y Bigfloat]) Boolean]
-              @defproc[(bf>= [x Bigfloat] [y Bigfloat]) Boolean]
-              @defproc[(bf<= [x Bigfloat] [y Bigfloat]) Boolean])]{
-Standard comparison functions. As is usual, infinities are either greater or less
-than any other bigfloat, and every comparison returns @racket[#f] when either argument
-is @racket[+nan.bf].
-}
-
-@section[#:tag "rounding"]{Rounding}
-
-@deftogether[(@defproc[(bftruncate [x Bigfloat]) Bigfloat]
-              @defproc[(bffloor [x Bigfloat]) Bigfloat]
-              @defproc[(bfceiling [x Bigfloat]) Bigfloat]
-              @defproc[(bfround [x Bigfloat]) Bigfloat])]{
-Like @racket[truncate], @racket[floor], @racket[ceiling] and @racket[round], but
-for bigfloats.
-
-Rounding is to the nearest integer, with ties broken by rounding to even.
-@examples[#:eval untyped-eval
-                 (eval:alts (bfround (bf 1.5)) (eval:result @racketresultfont{(bf 2)}))
-                 (eval:alts (bfround (bf 2.5)) (eval:result @racketresultfont{(bf 2)}))
-                 (eval:alts (bfround (bf -1.5)) (eval:result @racketresultfont{(bf -2)}))
-                 (eval:alts (bfround (bf -2.5)) (eval:result @racketresultfont{(bf -2)}))]
-}
-
-@defproc[(bffrac [x Bigfloat]) Bigfloat]{
-Returns the fractional part of @racket[x], with the same sign as @racket[x].
-}
-
-@defproc[(bfrint [x Bigfloat]) Bigfloat]{
-Rounds @racket[x] to the nearest integer bigfloat, in the direction specified by
-@racket[(bf-rounding-mode)].
-}
-
-@section[#:tag "ops"]{Mathematical Operations}
-
-@deftogether[(@defproc[(bfmax [x Bigfloat] ...) Bigfloat]
-              @defproc[(bfmin [x Bigfloat] ...) Bigfloat])]{
-Return the maximum and minimum of their arguments, respectively.
-
-When given no arguments, @racket[bfmin] returns @racket[+inf.bf], and
-@racket[bfmax] returns @racket[-inf.bf].
-}
-
-@deftogether[(@defproc[(bf+ [x Bigfloat] ...) Bigfloat]
-              @defproc[(bf* [x Bigfloat] ...) Bigfloat]
-              @defproc[(bf- [x Bigfloat] [y Bigfloat] ...) Bigfloat]
-              @defproc[(bf/ [x Bigfloat] [y Bigfloat] ...) Bigfloat]
-              @defproc[(bfsqr [x Bigfloat]) Bigfloat]
-              @defproc[(bfabs [x Bigfloat]) Bigfloat]
-              @defproc[(bfsgn [x Bigfloat]) Bigfloat])]{
-Standard arithmetic functions, corresponding to @racket[+], @racket[*],
-@racket[-], @racket[/], @racket[sqr], @racket[abs] and @racket[sgn].
-
-When @racket[bf+] and @racket[bf-] are given more than two arguments, they compute
-the answers in a way that incurs rounding error only once.
-}
-
-@deftogether[(@defproc[(bfsqrt [x Bigfloat]) Bigfloat]
-              @defproc[(bf1/sqrt [x Bigfloat]) Bigfloat]
-              @defproc[(bfcbrt [x Bigfloat]) Bigfloat])]{
-Return the square root, @italic{reciprocal} square root, and cube root of @racket[x].
-}
-
-@defproc[(bfroot [x Bigfloat] [n Integer]) Bigfloat]{
-Returns the @racket[n]th root of @racket[x]. @racket[n] must be a nonnegative fixnum.
-}
-
-@defproc[(bfhypot [x Bigfloat] [y Bigfloat]) Bigfloat]{
-Computes @racket[(bfsqrt (bf+ (bfsqr x) (bfsqr y)))] without uncessary overflow,
-incurring rounding error only once. See @racket[flhypot] for an example using flonums.
-}
-
-@deftogether[(@defproc[(bflog [x Bigfloat]) Bigfloat]
-              @defproc[(bflog2 [x Bigfloat]) Bigfloat]
-              @defproc[(bflog10 [x Bigfloat]) Bigfloat])]{
-Return the log of @racket[x] in base @italic{e}, 2 and 10.
-}
-
-@deftogether[(@defproc[(bfexp [x Bigfloat]) Bigfloat]
-              @defproc[(bfexp2 [x Bigfloat]) Bigfloat]
-              @defproc[(bfexp10 [x Bigfloat]) Bigfloat])]{
-Return the exponential of @racket[x] in base @italic{e}, 2 and 10.
-}
-
-@deftogether[(@defproc[(bflog1p [x Bigfloat]) Bigfloat]
-              @defproc[(bfexpm1 [x Bigfloat]) Bigfloat])]{
-Like @racket[(bflog (bf+ 1.bf x))] and @racket[(bf- (bfexp x) 1.bf)], but correct
-when @racket[x] is near zero. See @racket[fllog1p] for motivation and examples.
-}
-
-@defproc[(bfexpt [x Bigfloat] [y Bigfloat]) Bigfloat]{
-Computes @racket[x]@superscript{@racket[y]}. See @racket[flexpt] and @racket[expt].
-}
-
-@deftogether[(@defproc[(bfsin [x Bigfloat]) Bigfloat]
-              @defproc[(bfcos [x Bigfloat]) Bigfloat]
-              @defproc[(bftan [x Bigfloat]) Bigfloat]
-              @defproc[(bfasin [x Bigfloat]) Bigfloat]
-              @defproc[(bfacos [x Bigfloat]) Bigfloat]
-              @defproc[(bfatan [x Bigfloat]) Bigfloat]
-              @defproc[(bfatan2 [x Bigfloat] [y Bigfloat]) Bigfloat])]{
-Standard trigonometric functions and their inverses.
-}
-
-@deftogether[(@defproc[(bfsinh [x Bigfloat]) Bigfloat]
-              @defproc[(bfcosh [x Bigfloat]) Bigfloat]
-              @defproc[(bftanh [x Bigfloat]) Bigfloat]
-              @defproc[(bfasinh [x Bigfloat]) Bigfloat]
-              @defproc[(bfacosh [x Bigfloat]) Bigfloat]
-              @defproc[(bfatanh [x Bigfloat]) Bigfloat])]{
-Standard hyperbolic functions and their inverses.
-}
-
-@deftogether[(@defproc[(bfsec [x Bigfloat]) Bigfloat]
-              @defproc[(bfcsc [x Bigfloat]) Bigfloat]
-              @defproc[(bfcot [x Bigfloat]) Bigfloat])]{
-Standard @italic{reciprocal} trigonometric functions. MPFR does not implement their inverses.
-}
-
-@deftogether[(@defproc[(bfsech [x Bigfloat]) Bigfloat]
-              @defproc[(bfcsch [x Bigfloat]) Bigfloat]
-              @defproc[(bfcoth [x Bigfloat]) Bigfloat])]{
-Standard @italic{reciprocal} hyperbolic functions. MPFR does not implement their inverses.
-}
-
-@defproc[(bfsin+cos [x Bigfloat]) (Values Bigfloat Bigfloat)]{
-Simultaneously computes the sine and cosine of @racket[x].
-}
-
-@defproc[(bfsinh+cosh [x Bigfloat]) (Values Bigfloat Bigfloat)]{
-Simultaneously computes the hyperbolic sine and cosine of @racket[x].
-}
-
-@defproc[(bffactorial [x Integer]) Bigfloat]{
-Returns the factorial of @racket[x].
-}
-
-@defproc[(bfgamma [x Bigfloat]) Bigfloat]{
-Computes the @hyperlink["http://en.wikipedia.org/wiki/Gamma_function"]{gamma function},
-a generalization of the factorial function.
-}
-
-@deftogether[(@defproc[(bflog-gamma [x Bigfloat]) Bigfloat]
-              @defproc[(bflog-gamma/sign [x Bigfloat]) (Values Bigfloat (U -1 1))])]{
-Computes the @hyperlink["http://mathworld.wolfram.com/LogGammaFunction.html"]{log-gamma function},
-or the log of the absolute value of the gamma function. @racket[bflog-gamma/sign] additionally
-returns the sign of @racket[(bfgamma x)].
-}
-
-@defproc[(bfpsi0 [x Bigfloat]) Bigfloat]{
-Computes the @hyperlink["http://en.wikipedia.org/wiki/Digamma_function"]{digamma function},
-the logarithmic derivative of the gamma function.
-}
-
-@defproc[(bfeint [x Bigfloat]) Bigfloat]{
-Returns the @hyperlink["http://en.wikipedia.org/wiki/Exponential_integral"]{exponential integral}
-of @racket[x].
-}
-
-@defproc[(bfli2 [x Bigfloat]) Bigfloat]{
-Returns the dilogarithm of @racket[x], or the
-@hyperlink["http://en.wikipedia.org/wiki/Polylogarithm"]{polylogarithm} of order 2.
-}
-
-@defproc[(bfzeta [x Bigfloat]) Bigfloat]{
-Computes the @hyperlink["http://en.wikipedia.org/wiki/Riemann_zeta_function"]{Riemann zeta function}.
-}
-
-@deftogether[(@defproc[(bferf [x Bigfloat]) Bigfloat]
-              @defproc[(bferfc [x Bigfloat]) Bigfloat])]{
-Compute the @hyperlink["http://en.wikipedia.org/wiki/Error_function"]{error function and
-complementary error function}, respectively.
-}
-
-@deftogether[(@defproc[(bfbesj0 [x Bigfloat]) Bigfloat]
-              @defproc[(bfbesj1 [x Bigfloat]) Bigfloat]
-              @defproc[(bfbesj [n Integer] [x Bigfloat]) Bigfloat]
-              @defproc[(bfbesy0 [x Bigfloat]) Bigfloat]
-              @defproc[(bfbesy1 [x Bigfloat]) Bigfloat]
-              @defproc[(bfbesy [n Integer] [x Bigfloat]) Bigfloat])]{
-These compute @hyperlink["http://en.wikipedia.org/wiki/Bessel_function"]{Bessel functions}.
-
-A ``@racket[j]'' in the name indicates that a function computes a Bessel function of the
-first kind. A ``@racket[y]'' indicates the second kind.
-
-The ``@racket[j]'' or ``@racket[y]'' is followed by the @italic{order}: zero, one, or
-@racket[n] (user-specified).
-}
-
-@defproc[(bfagm [x Bigfloat] [y Bigfloat]) bigfloat]{
-Returns the
-@hyperlink["http://en.wikipedia.org/wiki/Arithmetic-geometric_mean"]{arithmetic-geometric mean}
-of @racket[x] and @racket[y]. Typically, this isn't directly useful, but it's used in some
-asymptotically fast algorithms such as the one that computes @racket[bflog].
-}
-
-
-@section[#:tag "misc"]{Low-level Functions}
-
-@deftogether[(@defproc[(bigfloat->ordinal [x Bigfloat]) Integer]
-              @defproc[(ordinal->bigfloat [n Integer]) Bigfloat]
-              @defproc[(bigfloats-between [x Bigfloat] [y Bigfloat]) Integer]
-              @defproc[(bfstep [x Bigfloat] [n Integer]) Bigfloat]
-              @defproc[(bfnext [x Bigfloat]) Bigfloat]
-              @defproc[(bfprev [x Bigfloat]) Bigfloat])]{
-Like @racket[flonum->ordinal], @racket[ordinal->flonum], @racket[flonums-between],
-@racket[flstep], @racket[flnext] and @racket[flprev], but for bigfloats.
-
-The major difference is that these operate using @racket[(bf-precision)] bits.
-Additionally, unlike other bigfloat functions, all of these convert their bigfloat arguments
-to @racket[(bf-precision)] bits.
-}
-
-@defproc[(bfshift [x Bigfloat] [n Integer]) Bigfloat]{
-Like @racket[arithmetic-shift], but for bigfloats. More precisely, this returns
-@racket[(bf* x (bfexpt (bf 2) (bf n)))], but is much faster.
-}
-
-@defproc[(bfcanonicalize [x Bigfloat]) Bigfloat]{
-@margin-note*{Bigfloats are canonicalized before hashing, to ensure that equality
-              implies an equal hash.}
-If @racket[x] is nonzero and rational, returns a new bigfloat with no more bits of
-precision than are necessary to encode @racket[x] exactly, by removing all low-order
-zeros from the significand and adjusting the exponent.
-
-For zero or non-rational @racket[x], returns @racket[-inf.bf], @racket[-0.bf],
-@racket[0.bf], @racket[+inf.bf], or @racket[+nan.bf], depending on the value of @racket[x].
-
-Two nonzero, rational bigfloats are @racket[equal?] if and only if their canonicalized
-significands and exponents are equal. Two zero or non-rational bigfloats are @racket[equal?]
-if and only if their canonicalizations are @racket[eq?].
-
-Canonicalizing bigfloats won't change answers computed from them.
-
-@examples[#:eval untyped-eval
-                 (bf-precision 64)
-                 (eval:alts (define x (bf 1 -2)) (eval:result ""))
-                 (eval:alts x (eval:result @racketresultfont{(bf #e0.25)}))
-                 (eval:alts (bfcanonicalize x)
-                            (eval:result @racketresultfont{(bf #e0.25)}))
-                 (eval:alts (bigfloat-precision x)
-                            (eval:result @racketresultfont{64}))
-                 (eval:alts (bigfloat-precision (bfcanonicalize x))
-                            (eval:result @racketresultfont{2}))]
-}
-
-@(close-eval untyped-eval)
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/math-distributions.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-distributions.scrbl
deleted file mode 100644
index 42d447c579..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/math-distributions.scrbl
+++ /dev/null
@@ -1,905 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          racket/sandbox
-          (for-label racket/base racket/promise
-                     (except-in racket/list permutations) ; FIXME
-                     math plot
-                     (only-in typed/racket/base
-                              Flonum Real Boolean Any Listof Integer case-> -> Promise U
-                              Sequenceof Positive-Flonum Nonnegative-Flonum))
-          "utils.rkt")
-
-@(define untyped-eval (make-untyped-math-eval))
-@interaction-eval[#:eval untyped-eval (require racket/list)]
-
-@title[#:tag "dist" #:style 'toc]{Probability Distributions}
-@(author-neil)
-
-@defmodule[math/distributions]
-
-The @racketmodname[math/distributions] module exports the following:
-@itemlist[#:style 'ordered
-                  @item{@tech{Distribution objects}, which represent probability distributions}
-                  @item{Functions that operate on distribution objects}
-                  @item{The low-level flonum functions used to define distribution objects}]
-
-@bold{Performance Warning:} Using distribution objects in untyped Racket is currently 25-50 times
-slower than using them in Typed Racket, due to the overhead of checking higher-order contracts.
-We are working on it.
-
-For now, if you need speed, either use the @racketmodname[typed/racket] language, or use just the
-low-level flonum functions, which are documented in @secref{dist:flonum}.
-
-@local-table-of-contents[]
-
-@section[#:tag "dist:dist-objects"]{Distribution Objects}
-
-A @deftech{distribution object} represents a probability distribution over a common domain,
-such as the real numbers, integers, or a set of symbols. Their constructors correspond with
-distribution families, such as the family of normal distributions.
-
-A distribution object, or a value of type @racket[dist], has a density function (a @deftech{pdf})
-and a procedure to generate random samples. An @italic{ordered} distribution object, or a value
-of type @racket[ordered-dist], additionally has a cumulative distribution function (a @deftech{cdf}),
-and its generalized inverse (an @deftech{inverse cdf}).
-
-The following example creates an ordered distribution object representing a normal distribution
-with mean 2 and standard deviation 5, computes an approximation of the probability of the
-half-open interval (1/2,1], and computes another approximation from random samples:
-@interaction[#:eval untyped-eval
-                    (define d (normal-dist 2 5))
-                    (real-dist-prob d 0.5 1.0)
-                    (define xs (sample d 10000))
-                    (eval:alts
-                     (fl (/ (count (λ (x) (and (1/2 . < . x) (x . <= . 1))) xs)
-                            (length xs)))
-                     (eval:result @racketresultfont{0.0391}))]
-
-This plots the pdf and a kernel density estimate of the pdf from random samples:
-@interaction[#:eval untyped-eval
-                    (plot (list (function (distribution-pdf d) #:color 0 #:style 'dot)
-                                (density xs))
-                          #:x-label "x" #:y-label "density of N(2,5)")]
-
-There are also higher-order distributions, which take other distributions as constructor
-arguments. For example, the truncated distribution family returns a distribution like its
-distribution argument, but sets probability outside an interval to 0 and renormalizes
-the probabilities within the interval:
-@interaction[#:eval untyped-eval
-                    (define d-trunc (truncated-dist d -inf.0 5))
-                    (real-dist-prob d-trunc 5 6)
-                    (real-dist-prob d-trunc 0.5 1.0)
-                    (plot (list (function (distribution-pdf d-trunc) #:color 0 #:style 'dot)
-                                (density (sample d-trunc 1000)))
-                          #:x-label "x" #:y-label "density of T(N(2,5),-∞,5)")]
-
-Because real distributions' cdfs represent the probability P[@italic{X} ≤ @italic{x}], they are
-right-continuous (i.e. continuous @italic{from the right}):
-@interaction[#:eval untyped-eval
-                    (define d (geometric-dist 0.4))
-                    (plot (for/list ([i  (in-range -1 7)])
-                            (define i+1-ε (flprev (+ i 1.0)))
-                            (list (lines (list (vector i (cdf d i))
-                                               (vector i+1-ε (cdf d i+1-ε)))
-                                         #:width 2)
-                                  (points (list (vector i (cdf d i)))
-                                          #:sym 'fullcircle5 #:color 1)
-                                  (points (list (vector i+1-ε (cdf d i+1-ε)))
-                                          #:sym 'fullcircle5 #:color 1 #:fill-color 0)))
-                          #:x-min -0.5 #:x-max 6.5 #:y-min -0.05 #:y-max 1
-                          #:x-label "x" #:y-label "P[X ≤ x]")]
-For convenience, cdfs are defined over the extended reals regardless of their distribution's
-support, but their inverses return values only within the support:
-@interaction[#:eval untyped-eval
-                    (cdf d +inf.0)
-                    (cdf d 1.5)
-                    (cdf d -inf.0)
-                    (inv-cdf d (cdf d +inf.0))
-                    (inv-cdf d (cdf d 1.5))
-                    (inv-cdf d (cdf d -inf.0))]
-A distribution's inverse cdf is defined on the interval [0,1] and is always left-continuous,
-except possibly at 0 when its support is bounded on the left (as with @racket[geometric-dist]).
-
-Every pdf and cdf can return log densities and log probabilities, in case densities or probabilities
-are too small to represent as flonums (i.e. are less than @racket[+min.0]):
-@interaction[#:eval untyped-eval
-                    (define d (normal-dist))
-                    (pdf d 40.0)
-                    (cdf d -40.0)
-                    (pdf d 40.0 #t)
-                    (cdf d -40.0 #t)]
-Additionally, every cdf can return upper-tail probabilities, which are always more accurate when
-lower-tail probabilities are greater than @racket[0.5]:
-@interaction[#:eval untyped-eval
-                    (cdf d 20.0)
-                    (cdf d 20.0 #f #t)]
-Upper-tail probabilities can also be returned as log probabilities in case probabilities are too
-small:
-@interaction[#:eval untyped-eval
-                    (cdf d 40.0)
-                    (cdf d 40.0 #f #t)
-                    (cdf d 40.0 #t #t)]
-Inverse cdfs accept log probabilities and upper-tail probabilities.
-
-The functions @racket[lg+] and @racket[lgsum], as well as others in @racketmodname[math/flonum],
-perform arithmetic on log probabilities.
-
-When distribution object constructors receive parameters outside their domains, they return
-@deftech{undefined distributions}, or distributions whose functions all return @racket[+nan.0]:
-@interaction[#:eval untyped-eval
-                    (pdf (gamma-dist -1 2) 2)
-                    (sample (poisson-dist -2))
-                    (cdf (beta-dist 0 0) 1/2)
-                    (inv-cdf (geometric-dist 1.1) 0.2)]
-
-@section{Distribution Types and Operations}
-
-@defform[(PDF In)]{
-The type of probability density functions, or @tech{pdfs}, defined as
-@racketblock[(case-> (In -> Flonum)
-                     (In Any -> Flonum))]
-For any function of this type, the second argument should default to @racket[#f]. When not
-@racket[#f], the function should return a log density.
-}
-
-@defform[(Sample Out)]{
-The type of a distribution's sampling procedure, defined as
-@racketblock[(case-> (-> Out)
-                     (Integer -> (Listof Out)))]
-When given a nonnegative integer @racket[n] as an argument, a sampling procedure should return
-a length-@racket[n] list of independent, random samples.
-}
-
-@defform[(CDF In)]{
-The type of cumulative distribution functions, or @tech{cdfs}, defined as
-@racketblock[(case-> (In -> Flonum)
-                     (In Any -> Flonum)
-                     (In Any Any -> Flonum))]
-For any function of this type, both optional arguments should default to @racket[#f], and be
-interpreted as specified in the description of @racket[cdf].
-}
-
-@defform[(Inverse-CDF Out)]{
-The type of inverse cumulative distribution functions, or @tech{inverse cdfs}, defined as
-@racketblock[(case-> (Real -> Out)
-                     (Real Any -> Out)
-                     (Real Any Any -> Out))]
-For any function of this type, both optional arguments should default to @racket[#f], and be
-interpreted as specified in the description of @racket[inv-cdf].
-}
-
-@defstruct*[distribution ([pdf (PDF In)] [sample (Sample Out)])]{
-The parent type of @tech{distribution objects}. The @racket[In] type parameter is the data type a
-distribution accepts as arguments to its @tech{pdf}. The @racket[Out] type parameter is the data
-type a distribution returns as random samples.
-
-@examples[#:eval untyped-eval
-                 (distribution? (discrete-dist '(a b c)))
-                 (distribution? (normal-dist))
-                 ((distribution-pdf (normal-dist)) 0)
-                 ((distribution-sample (normal-dist)))]
-See @racket[pdf] and @racket[sample] for uncurried forms of @racket[distribution-pdf] and
-@racket[distribution-sample].
-}
-
-@defstruct*[(ordered-dist distribution) ([cdf (CDF In)]
-                                         [inv-cdf (Inverse-CDF Out)]
-                                         [min Out]
-                                         [max Out]
-                                         [median (Promise Out)])]{
-The parent type of @italic{ordered} @tech{distribution objects}.
-
-Similarly to @racket[distribution], the @racket[In] type parameter is the data type an ordered
-distribution accepts as arguments to its @tech{pdf}, and the @racket[Out] type parameter is the
-data type an ordered distribution returns as random samples. Additionally, its @tech{cdf}
-accepts values of type @racket[In], and its @tech{inverse cdf} returns values of type
-@racket[Out].
-
-@examples[#:eval untyped-eval
-                 (ordered-dist? (discrete-dist '(a b c)))
-                 (ordered-dist? (normal-dist))]
-
-The median is stored in an @racket[ordered-dist] to allow interval probabilities to be computed
-accurately. For example, for @racket[d = (normal-dist)], whose median is @racket[0.0],
-@racket[(real-dist-prob d -2.0 -1.0)] is computed using lower-tail probabilities, and
-@racket[(real-dist-prob d 1.0 2.0)] is computed using upper-tail probabilities.
-}
-
-@defidform[Real-Dist]{
-The parent type of real-valued distributions, such as any distribution returned by
-@racket[normal-dist]. Equivalent to the type @racket[(ordered-dist Real Flonum)].
-}
-
-@defproc[(pdf [d (dist In Out)] [v In] [log? Any #f]) Flonum]{
-An uncurried form of @racket[distribution-pdf]. When @racket[log?] is not @racket[#f], returns a
-log density.
-@examples[#:eval untyped-eval
-                 (pdf (discrete-dist '(a b c) '(1 2 3)) 'a)
-                 (pdf (discrete-dist '(a b c) '(1 2 3)) 'a #t)]
-}
-
-@defproc*[([(sample [d (dist In Out)]) Out]
-           [(sample [d (dist In Out)] [n Integer]) (Listof Out)])]{
-An uncurried form of @racket[distribution-sample].
-@examples[#:eval untyped-eval
-                 (sample (exponential-dist))
-                 (sample (exponential-dist) 3)]
-}
-
-@defproc[(cdf [d (ordered-dist In Out)] [v In] [log? Any #f] [1-p? Any #f]) Flonum]{
-An uncurried form of @racket[ordered-dist-cdf].
-
-When @racket[log?] is @racket[#f], @racket[cdf] returns a probability; otherwise, it returns a log
-probability.
-
-When @racket[1-p?] is @racket[#f], @racket[cdf] returns a lower-tail probability or log probability
-(depending on @racket[log?]); otherwise, it returns an upper-tail probability or log-probability.
-}
-
-@defproc[(inv-cdf [d (ordered-dist In Out)] [p Real] [log? Any #f] [1-p? Any #f]) Out]{
-An uncurried form of @racket[ordered-dist-inv-cdf].
-
-When @racket[log?] is @racket[#f], @racket[inv-cdf] interprets @racket[p] as a probability; otherwise,
-it interprets @racket[p] as a log probability.
-
-When @racket[1-p?] is @racket[#f], @racket[inv-cdf] interprets @racket[p] as a lower-tail probability
-or log probability (depending on @racket[log?]); otherwise, it interprets @racket[p] as an upper-tail
-probability or log probability.
-}
-
-@defproc[(real-dist-prob [d Real-Dist] [a Real] [b Real] [log? Any #f] [1-p? Any #f]) Flonum]{
-Computes the probability of the half-open interval (@racket[a], @racket[b]]. (If @racket[b < a],
-the two endpoints are swapped first.) The @racket[log?] and @racket[1-p?] arguments determine the
-meaning of the return value in the same way as the corresponding arguments to @racket[cdf].
-}
-
-@defproc[(real-dist-hpd-interval [d Real-Dist] [p Real]) (Values Flonum Flonum)]{
-Finds the smallest interval for which @racket[d] assigns probability @racket[p], if one exists.
-@examples[#:eval untyped-eval
-                 (define d (beta-dist 3 2))
-                 (define-values (x0 x1) (real-dist-hpd-interval d 0.8))
-                 (plot (list
-                        (function-interval (λ (x) 0) (distribution-pdf d) x0 x1
-                                           #:line1-style 'transparent
-                                           #:line2-style 'transparent
-                                           #:label "80% HPD region")
-                        (function (distribution-pdf d) 0 1
-                                  #:label "Beta(3,2)")))]
-}
-
-@section{Finite Distribution Families}
-
-@subsection{Unordered Discrete Distributions}
-
-@deftogether[(@defform[(Discrete-Dist A)]
-              @defproc*[([(discrete-dist [xs (Sequenceof A)]) (Discrete-Dist A)]
-                         [(discrete-dist [xs (Sequenceof A)] [ws (Sequenceof Real)])
-                          (Discrete-Dist A)])]
-              @defproc[(discrete-dist-values [d (Discrete-Dist A)]) (Listof A)]
-              @defproc[(discrete-dist-probs [d (Discrete-Dist A)]) (Listof Positive-Flonum)])]{
-Represents families of unordered, discrete distributions over values of type @racket[A], with equality
-decided by @racket[equal?].
-
-The weights in @racket[ws] must be nonnegative, and are treated as unnormalized probabilities.
-When @racket[ws] is not given, the values in @racket[xs] are assigned uniform probabilities.
-
-The type @racket[(Discrete-Dist A)] is a subtype of @racket[(dist A A)]. This means that discrete
-distribution objects are unordered, and thus have only a @tech{pdf} and a procedure to generate
-random samples.
-
-Note, however, that the @racket[discrete-dist-values] and @racket[discrete-dist-probs] functions
-produce lists that may be paired; that is, if the result of calling @racket[discrete-dist-values]
-on a given distribution produces a list whose third element is @racket['a], and the result of calling
-@racket[discrete-dist-probs] on the same distribution produces a list whose third element is @racket[0.25],
-then the given distribution associates the probability @racket[0.25] with the value @racket['a].
-
-@examples[#:eval untyped-eval
-                 (define xs '(a b c))
-                 (define d (discrete-dist xs '(2 5 3)))
-                 (define n 500)
-                 (define h (samples->hash (sample d n)))
-                 (plot (list (discrete-histogram
-                              (map vector xs (map (distribution-pdf d) xs))
-                              #:x-min 0 #:skip 2 #:label "P[x]")
-                             (discrete-histogram
-                              (map vector xs (map (λ (x) (/ (hash-ref h x) n)) xs))
-                              #:x-min 1 #:skip 2 #:line-style 'dot #:alpha 0.5
-                              #:label "est. P[x]")))]
-}
-
-@section{Integer Distribution Families}
-
-Mathematically, integer distributions are commonly defined in one of two ways: over extended reals,
-or over extended integers. The most common definitions use the extended reals, so the following
-@tech{distribution object} constructors return objects of type @racket[Real-Dist].
-
-(Another reason is that the extended integers correspond with the type
-@racket[(U Integer +inf.0 -inf.0)]. Values of this type have little support in Racket's library.)
-
-This leaves us with a quandary and two design decisions users should be aware of. The quandary is
-that, when an integer distribution is defined over the reals, it has a @tech{cdf}, but @italic{no
-well-defined @tech{pdf}}: the pdf would be zero except at integer points, where it would be
-undefined.
-
-Unfortunately, an integer distribution without a pdf is nearly useless.
-@margin-note*{In measure-theory parlance, the pdfs are defined with respect to counting measure,
-              while the cdfs are defined with respect to Lebesgue measure.}
-So the pdfs of these integer distributions are pdfs defined over integers, while their cdfs are
-defined over reals.
-
-Most implementations, such as @hyperlink["http://www.r-project.org"]{R}'s, make the same design
-choice. Unlike R's, this implementation's pdfs return @racket[+nan.0] when given non-integers,
-for three reasons:
-@itemlist[@item{Their domain of definition is the integers.}
-          @item{Applying an integer pdf to a non-integer almost certainly indicates a logic error,
-                which is harder to detect when a program returns an apparently sensible value.}
-          @item{If this design choice turns out to be wrong and we change pdfs to return
-                @racket[0.0], this should affect very few programs. A change from @racket[0.0] to
-                @racket[+nan.0] could break many programs.}]
-
-Integer distributions defined over the extended integers are not out of the question, and may
-show up in future versions of @racketmodname[math/distributions] if there is a clear need.
-
-@subsection{Bernoulli Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Bernoulli_distribution"]{Bernoulli Distribution}.}
-@deftogether[(@defidform[Bernoulli-Dist]
-              @defproc[(bernoulli-dist [prob Real]) Bernoulli-Dist]
-              @defproc[(bernoulli-dist-prob [d Bernoulli-Dist]) Flonum])]{
-Represents the Bernoulli distribution family parameterized by probability of success.
-
-@racket[(bernoulli-dist prob)] is equivalent to @racket[(binomial-dist 1 prob)], but operations
-on it are faster.
-
-@examples[#:eval untyped-eval
-                 (define d (bernoulli-dist 0.75))
-                 (map (distribution-pdf d) '(0 1))
-                 (map (ordered-dist-cdf d) '(0 1))
-                 (define d (binomial-dist 1 0.75))
-                 (map (distribution-pdf d) '(0 1))
-                 (map (ordered-dist-cdf d) '(0 1))]
-}
-
-@subsection{Binomial Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Binomial_distribution"]{Binomial Distribution}.}
-@deftogether[(@defidform[Binomial-Dist]
-              @defproc[(binomial-dist [count Real] [prob Real]) Binomial-Dist]
-              @defproc[(binomial-dist-count [d Binomial-Dist]) Flonum]
-              @defproc[(binomial-dist-prob [d Binomial-Dist]) Flonum])]{
-Represents the binomial distribution family parameterized by count (number of trials) and
-probability of success.
-
-@examples[#:eval untyped-eval
-                 (define d (binomial-dist 15 0.6))
-                 (plot (discrete-histogram
-                        (map vector (build-list 16 values) (build-list 16 (distribution-pdf d))))
-                       #:x-label "number of successes" #:y-label "probability")
-                 (plot (function-interval (λ (x) 0) (ordered-dist-cdf d) -0.5 15.5)
-                       #:x-label "at-most number of successes" #:y-label "probability")]
-}
-
-@subsection{Geometric Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Geometric_distribution"]{Geometric Distribution}.}
-@deftogether[(@defidform[Geometric-Dist]
-              @defproc[(geometric-dist [prob Real]) Geometric-Dist]
-              @defproc[(geometric-dist-prob [d Geometric-Dist]) Flonum])]{
-Represents the geometric distribution family parameterized by success probability. The random
-variable is the number of failures before the first success, or equivalently, the index of the
-first success starting from zero.
-
-@examples[#:eval untyped-eval
-                 (define d (geometric-dist 0.25))
-                 (plot (discrete-histogram
-                        (map vector (build-list 16 values) (build-list 16 (distribution-pdf d))))
-                       #:x-label "first success index" #:y-label "probability")
-                 (plot (function-interval (λ (x) 0) (ordered-dist-cdf d) -0.5 15.5)
-                       #:x-label "at-most first success index" #:y-label "probability"
-                       #:y-max 1)]
-}
-
-@subsection{Poisson Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Poisson_distribution"]{Poisson Distribution}.}
-@deftogether[(@defidform[Poisson-Dist]
-              @defproc[(poisson-dist [mean Real]) Poisson-Dist]
-              @defproc[(poisson-dist-mean [d Poisson-Dist]) Flonum])]{
-Represents the Poisson distribution family parameterized by the mean number of occurrences of
-independent events.
-
-@examples[#:eval untyped-eval
-                 (define d (poisson-dist 6.2))
-                 (plot (discrete-histogram
-                        (map vector (build-list 16 values) (build-list 16 (distribution-pdf d))))
-                       #:x-label "number of events" #:y-label "probability")
-                 (plot (function-interval (λ (x) 0) (ordered-dist-cdf d) -0.5 15.5)
-                       #:x-label "at-most number of events" #:y-label "probability"
-                       #:y-max 1)]
-}
-
-@section{Real Distribution Families}
-
-The @tech{distribution object} constructors documented in this section return uniquely defined
-distributions for the largest possible parameter domain. This usually means that they return
-distributions for a larger domain than their mathematical counterparts are defined on.
-
-For example, those that have a scale parameter, such as @racket[cauchy-dist],
-@racket[logistic-dist], @racket[exponential-dist] and @racket[normal-dist], are typically
-undefined for a zero scale. However, in floating-point math, it is often useful to simulate
-limits in finite time using special values like @racket[+inf.0]. Therefore, when a
-scale-parameterized family's constructor receives @racket[0], it returns a distribution object
-that behaves like a @racket[Delta-Dist]:
-@interaction[#:eval untyped-eval
-                    (pdf (normal-dist 1 0) 1)
-                    (pdf (normal-dist 1 0) 1.0000001)]
-Further, negative scales are accepted, even for @racket[exponential-dist], which results in a
-distribution with positive scale reflected about zero.
-
-Some parameters' boundary values give rise to non-unique limits. Sometimes the ambiguity
-can be resolved using necessary properties; see @racket[Gamma-Dist] for an example. When no
-resolution exists, as with @racket[(beta-dist 0 0)], which puts an indeterminate probability on
-the value @racket[0] and the rest on @racket[1], the constructor returns an
-@tech{undefined distribution}.
-
-Some distribution object constructors attempt to return sensible distributions when given
-special values such as @racket[+inf.0] as parameters. Do not count on these yet.
-
-Many distribution families, such as @racket[Gamma-Dist], can be parameterized on either scale
-or rate (which is the reciprocal of scale). In all such cases, the implementations provided by
-@racketmodname[math/distributions] are parameterized on scale.
-
-@subsection{Beta Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Beta_distribution"]{Beta Distribution}.}
-@deftogether[(@defidform[Beta-Dist]
-              @defproc[(beta-dist [alpha Real] [beta Real]) Beta-Dist]
-              @defproc[(beta-dist-alpha [d Beta-Dist]) Flonum]
-              @defproc[(beta-dist-beta [d Beta-Dist]) Flonum])]{
-Represents the beta distribution family parameterized by two shape parameters, or pseudocounts,
-which must both be nonnegative.
-
-@examples[#:eval untyped-eval
-                 (plot (for/list ([α  (in-list '(1 2 3 1/2))]
-                                  [β  (in-list '(1 3 1 1/2))]
-                                  [i  (in-naturals)])
-                         (function (distribution-pdf (beta-dist α β))
-                                   #:color i #:label (format "Beta(~a,~a)" α β)))
-                       #:x-min 0 #:x-max 1 #:y-max 4 #:y-label "density")
-                 
-                 (plot (for/list ([α  (in-list '(1 2 3 1/2))]
-                                  [β  (in-list '(1 3 1 1/2))]
-                                  [i  (in-naturals)])
-                         (function (ordered-dist-cdf (beta-dist α β))
-                                   #:color i #:label (format "Beta(~a,~a)" α β)))
-                       #:x-min 0 #:x-max 1 #:y-label "probability")]
-
-@racket[(beta-dist 0 0)] and @racket[(beta-dist +inf.0 +inf.0)] are @tech{undefined distributions}.
-
-When @racket[a = 0] or @racket[b = +inf.0], the returned distribution acts like
-@racket[(delta-dist 0)].
-
-When @racket[a = +inf.0] or @racket[b = 0], the returned distribution acts like
-@racket[(delta-dist 1)].
-}
-
-@subsection{Cauchy Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Cauchy_distribution"]{Cauchy Distribution}.}
-@deftogether[(@defidform[Cauchy-Dist]
-              @defproc[(cauchy-dist [mode Real 0] [scale Real 1]) Cauchy-Dist]
-              @defproc[(cauchy-dist-mode [d Cauchy-Dist]) Flonum]
-              @defproc[(cauchy-dist-scale [d Cauchy-Dist]) Flonum])]{
-Represents the Cauchy distribution family parameterized by mode and scale.
-
-@examples[#:eval untyped-eval
-                 (plot (for/list ([m  (in-list '(0 -1 0 2))]
-                                  [s  (in-list '(1 1/2 2.25 0.7))]
-                                  [i  (in-naturals)])
-                         (function (distribution-pdf (cauchy-dist m s))
-                                   #:color i #:label (format "Cauchy(~a,~a)" m s)))
-                       #:x-min -8 #:x-max 8 #:y-label "density"
-                       #:legend-anchor 'top-right)
-                 
-                 (plot (for/list ([m  (in-list '(0 -1 0 2))]
-                                  [s  (in-list '(1 1/2 2.25 0.7))]
-                                  [i  (in-naturals)])
-                         (function (ordered-dist-cdf (cauchy-dist m s))
-                                   #:color i #:label (format "Cauchy(~a,~a)" m s)))
-                       #:x-min -8 #:x-max 8 #:y-label "probability")]
-}
-
-@subsection{Delta Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Dirac_delta_function"]{Dirac Delta Function}.}
-@deftogether[(@defidform[Delta-Dist]
-              @defproc[(delta-dist [mean Real 0]) Delta-Dist]
-              @defproc[(delta-dist-mean [d Delta-Dist]) Flonum])]{
-Represents the family of distributions whose densities are Dirac delta functions.
-
-@examples[#:eval untyped-eval
-                 (pdf (delta-dist) 0)
-                 (pdf (delta-dist) 1)
-                 (plot (for/list ([μ  (in-list '(-1 0 1))]
-                                  [i  (in-naturals)])
-                         (function (ordered-dist-cdf (delta-dist μ))
-                                   #:color i #:style i #:label (format "δ(~a)" μ)))
-                       #:x-min -2 #:x-max 2 #:y-label "probability")]
-}
-
-@subsection{Exponential Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Exponential_distribution"]{Exponential
-                                                                              Distribution}.}
-@deftogether[(@defidform[Exponential-Dist]
-              @defproc[(exponential-dist [mean Real 1]) Exponential-Dist]
-              @defproc[(exponential-dist-mean [d Exponential-Dist]) Flonum])]{
-Represents the exponential distribution family parameterized by mean, or scale.
-
-@bold{Warning:} The exponential distribution family is often parameterized by @italic{rate}, which
-is the reciprocal of mean or scale. Construct exponential distributions from rates using
-@racketblock[(exponential-dist (/ 1.0 rate))]
-
-@examples[#:eval untyped-eval
-                 (plot (for/list ([μ  (in-list '(2/3 1 2))]
-                                  [i  (in-naturals)])
-                         (function (distribution-pdf (exponential-dist μ))
-                                   #:color i #:label (format "Exponential(~a)" μ)))
-                       #:x-min 0 #:x-max 5 #:y-label "density"
-                       #:legend-anchor 'top-right)
-                 
-                 (plot (for/list ([μ  (in-list '(2/3 1 2))]
-                                  [i  (in-naturals)])
-                         (function (ordered-dist-cdf (exponential-dist μ))
-                                   #:color i #:label (format "Exponential(~a)" μ)))
-                       #:x-min 0 #:x-max 5 #:y-label "probability"
-                       #:legend-anchor 'bottom-right)]
-}
-
-@subsection{Gamma Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Gamma_distribution"]{Gamma Distribution}.}
-@deftogether[(@defidform[Gamma-Dist]
-              @defproc[(gamma-dist [shape Real 1] [scale Real 1]) Gamma-Dist]
-              @defproc[(gamma-dist-shape [d Gamma-Dist]) Flonum]
-              @defproc[(gamma-dist-scale [d Gamma-Dist]) Flonum])]{
-Represents the gamma distribution family parameterized by shape and scale. The @racket[shape]
-parameter must be nonnegative.
-
-@bold{Warning:} The gamma distribution family is often parameterized by shape and @italic{rate},
-which is the reciprocal of scale. Construct gamma distributions from rates using
-@racketblock[(gamma-dist shape (/ 1.0 rate))]
-
-@examples[#:eval untyped-eval
-                 (plot (for/list ([k  (in-list '(1 2 3 9))]
-                                  [s  (in-list '(2 2 3 1/2))]
-                                  [i  (in-naturals)])
-                         (function (distribution-pdf (gamma-dist k s))
-                                   #:color i #:label (format "Gamma(~a,~a)" k s)))
-                       #:x-min 0 #:x-max 15 #:y-label "density"
-                       #:legend-anchor 'top-right)
-                 
-                 (plot (for/list ([k  (in-list '(1 2 3 9))]
-                                  [s  (in-list '(2 2 3 1/2))]
-                                  [i  (in-naturals)])
-                         (function (ordered-dist-cdf (gamma-dist k s))
-                                   #:color i #:label (format "Gamma(~a,~a)" k s)))
-                       #:x-min 0 #:x-max 15 #:y-label "probability"
-                       #:legend-anchor 'bottom-right)]
-
-The cdf of the gamma distribution with @racket[shape = 0] could return either @racket[0.0] or
-@racket[1.0] at @racket[x = 0], depending on whether a double limit is taken with respect to
-@racket[scale] or with respect to @racket[x] first. However the limits are taken, the cdf
-must return @racket[1.0] for @racket[x > 0]. Because cdfs are right-continuous, the only correct
-choice is
-@interaction[#:eval untyped-eval
-                    (cdf (gamma-dist 0 1) 0)]
-Therefore, a gamma distribution with @racket[shape = 0] behaves like @racket[(delta-dist 0)].
-}
-
-@subsection{Logistic Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Logistic_distribution"]{Logistic Distribution}.}
-@deftogether[(@defidform[Logistic-Dist]
-              @defproc[(logistic-dist [mean Real 0] [scale Real 1]) Logistic-Dist]
-              @defproc[(logistic-dist-mean [d Logistic-Dist]) Flonum]
-              @defproc[(logistic-dist-scale [d Logistic-Dist]) Flonum])]{
-Represents the logistic distribution family parameterized by mean (also called ``location'')
-and scale. In this parameterization, the variance is @racket[(* 1/3 (sqr (* pi scale)))].
-
-@examples[#:eval untyped-eval
-                 (plot (for/list ([μ  (in-list '(0 -1 0 2))]
-                                  [s  (in-list '(1 1/2 2.25 0.7))]
-                                  [i  (in-naturals)])
-                         (function (distribution-pdf (logistic-dist μ s))
-                                   #:color i #:label (format "Logistic(~a,~a)" μ s)))
-                       #:x-min -8 #:x-max 8 #:y-label "density"
-                       #:legend-anchor 'top-right)
-                 
-                 (plot (for/list ([μ  (in-list '(0 -1 0 2))]
-                                  [s  (in-list '(1 1/2 2.25 0.7))]
-                                  [i  (in-naturals)])
-                         (function (ordered-dist-cdf (logistic-dist μ s))
-                                   #:color i #:label (format "Logistic(~a,~a)" μ s)))
-                       #:x-min -8 #:x-max 8 #:y-label "probability")]
-}
-
-@subsection{Normal Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Normal_distribution"]{Normal Distribution}.}
-@deftogether[(@defidform[Normal-Dist]
-              @defproc[(normal-dist [mean Real 0] [stddev Real 1]) Normal-Dist]
-              @defproc[(normal-dist-mean [d Normal-Dist]) Flonum]
-              @defproc[(normal-dist-stddev [d Normal-Dist]) Flonum])]{
-Represents the normal distribution family parameterized by mean and standard deviation.
-
-@bold{Warning:} The normal distribution family is often parameterized by mean and @italic{variance},
-which is the square of standard deviation. Construct normal distributions from variances using
-@racketblock[(normal-dist mean (sqrt var))]
-
-@examples[#:eval untyped-eval
-                 (plot (for/list ([μ  (in-list '(0 -1 0 2))]
-                                  [σ  (in-list '(1 1/2 2.25 0.7))]
-                                  [i  (in-naturals)])
-                         (function (distribution-pdf (normal-dist μ σ))
-                                   #:color i #:label (format "N(~a,~a)" μ σ)))
-                       #:x-min -5 #:x-max 5 #:y-label "density")
-                 
-                 (plot (for/list ([μ  (in-list '(0 -1 0 2))]
-                                  [σ  (in-list '(1 1/2 2.25 0.7))]
-                                  [i  (in-naturals)])
-                         (function (ordered-dist-cdf (normal-dist μ σ))
-                                   #:color i #:label (format "N(~a,~a)" μ σ)))
-                       #:x-min -5 #:x-max 5 #:y-label "probability")]
-}
-
-@subsection{Triangular Distributions}
-
-@margin-note{Wikipedia:
-             @hyperlink["http://wikipedia.org/wiki/Triangular_distribution"]{Triangular
-                                                                             Distribution}.}
-@deftogether[(@defidform[Triangle-Dist]
-              @defproc[(triangle-dist [min Real 0] [max Real 1] [mode Real (* 0.5 (+ min max))])
-                       Triangle-Dist]
-              @defproc[(triangle-dist-min [d Triangle-Dist]) Flonum]
-              @defproc[(triangle-dist-max [d Triangle-Dist]) Flonum]
-              @defproc[(triangle-dist-mode [d Triangle-Dist]) Flonum])]{
-Represents the triangular distribution family parameterized by minimum, maximum and mode.
-
-If @racket[min], @racket[mode] and @racket[max] are not in ascending order, they are sorted
-before constructing the distribution object.
-
-@examples[#:eval untyped-eval
-                 (plot (for/list ([a  (in-list '(-3 -1 -2))]
-                                  [b  (in-list '(0 1 3))]
-                                  [m  (in-list '(-2 0 2))]
-                                  [i  (in-naturals)])
-                         (function (distribution-pdf (triangle-dist a b m)) #:color i
-                                   #:label (format "Triangle(~a,~a,~a)" a b m)))
-                       #:x-min -3.5 #:x-max 3.5 #:y-label "density")
-                 
-                 (plot (for/list ([a  (in-list '(-3 -1 -2))]
-                                  [b  (in-list '(0 1 3))]
-                                  [m  (in-list '(-2 0 2))]
-                                  [i  (in-naturals)])
-                         (function (ordered-dist-cdf (triangle-dist a b m)) #:color i
-                                   #:label (format "Triangle(~a,~a,~a)" a b m)))
-                       #:x-min -3.5 #:x-max 3.5 #:y-label "probability")]
-
-@racket[(triangle-dist c c c)] for any real @racket[c] behaves like a support-limited delta
-distribution centered at @racket[c].
-}
-
-@subsection{Truncated Distributions}
-
-@deftogether[(@defidform[Truncated-Dist]
-              @defproc*[([(truncated-dist [d Real-Dist]) Truncated-Dist]
-                         [(truncated-dist [d Real-Dist] [max Real]) Truncated-Dist]
-                         [(truncated-dist [d Real-Dist] [min Real] [max Real]) Truncated-Dist])]
-              @defproc[(truncated-dist-original [t Truncated-Dist]) Real-Dist]
-              @defproc[(truncated-dist-min [t Truncated-Dist]) Flonum]
-              @defproc[(truncated-dist-max [t Truncated-Dist]) Flonum])]{
-Represents distributions like @racket[d], but with zero density for @racket[x < min] and
-for @racket[x > max]. The probability of the interval [@racket[min], @racket[max]] is renormalized
-to one.
-
-@racket[(truncated-dist d)] is equivalent to @racket[(truncated-dist d -inf.0 +inf.0)].
-@racket[(truncated-dist d max)] is equivalent to @racket[(truncated-dist d -inf.0 max)].
-If @racket[min > max], they are swapped before constructing the distribution object.
-
-Samples are taken by applying the truncated distribution's @tech{inverse cdf} to uniform samples.
-
-@examples[#:eval untyped-eval
-                 (define d (normal-dist))
-                 (define t (truncated-dist d -2 1))
-                 t
-                 (plot (list (function (distribution-pdf d) #:label "N(0,1)" #:color 0)
-                             (function (distribution-pdf t) #:label "T(N(0,1),-2,1)"))
-                       #:x-min -3.5 #:x-max 3.5 #:y-label "density")
-                 (plot (list (function (ordered-dist-cdf d) #:label "N(0,1)" #:color 0)
-                             (function (ordered-dist-cdf t) #:label "T(N(0,1),-2,1)"))
-                       #:x-min -3.5 #:x-max 3.5 #:y-label "probability")]
-}
-
-@subsection{Uniform Distributions}
-
-@margin-note{
-Wikipedia:
-@hyperlink["http://wikipedia.org/wiki/Uniform_distribution_%28continuous%29"]{Uniform Distribution}.}
-
-@deftogether[(@defidform[Uniform-Dist]
-              @defproc*[([(uniform-dist) Uniform-Dist]
-                         [(uniform-dist [max Real]) Uniform-Dist]
-                         [(uniform-dist [min Real] [max Real]) Uniform-Dist])]
-              @defproc[(uniform-dist-min [d Uniform-Dist]) Flonum]
-              @defproc[(uniform-dist-max [d Uniform-Dist]) Flonum])]{
-Represents the uniform distribution family parameterized by minimum and maximum.
-
-@racket[(uniform-dist)] is equivalent to @racket[(uniform-dist 0 1)].
-@racket[(uniform-dist max)] is equivalent to @racket[(uniform-dist 0 max)]. If @racket[max < min],
-they are swapped before constructing the distribution object.
-
-@examples[#:eval untyped-eval
-                 (plot (for/list ([a  (in-list '(-3 -1 -2))]
-                                  [b  (in-list '(0 1 3))]
-                                  [i  (in-naturals)])
-                         (function (distribution-pdf (uniform-dist a b)) #:color i
-                                   #:label (format "Uniform(~a,~a)" a b)))
-                       #:x-min -3.5 #:x-max 3.5 #:y-label "density")
-                 
-                 (plot (for/list ([a  (in-list '(-3 -1 -2))]
-                                  [b  (in-list '(0 1 3))]
-                                  [i  (in-naturals)])
-                         (function (ordered-dist-cdf (uniform-dist a b)) #:color i
-                                   #:label (format "Uniform(~a,~a)" a b)))
-                       #:x-min -3.5 #:x-max 3.5 #:y-label "probability")]
-
-@racket[(uniform-dist x x)] for any real @racket[x] behaves like a support-limited delta
-distribution centered at @racket[x].
-}
-
-@section[#:tag "dist:flonum"]{Low-Level Distribution Functions}
-
-The following functions are provided for users who need lower overhead than that of
-@tech{distribution objects}, such as untyped Racket users (currently), and library writers who
-are implementing their own distribution abstractions.
-
-Because applying these functions is meant to be fast, none of them have optional arguments. In
-particular, the boolean flags @racket[log?] and @racket[1-p?] are always required.
-
-Every low-level function's argument list begins with the distribution family parameters. In the
-case of @tech{pdfs} and @tech{cdfs}, these arguments are followed by a domain value and boolean
-flags. In the case of @tech{inverse cdfs}, they are followed by a probability argument and boolean
-flags. For sampling procedures, the distribution family parameters are followed by the requested
-number of random samples.
-
-Generally, @racket[prob] is a probability parameter, @racket[k] is an integer domain value,
-@racket[x] is a real domain value, @racket[p] is the probability argument to an inverse cdf,
-and @racket[n] is the number of random samples.
-
-@subsection{Integer Distribution Functions}
-
-@deftogether[
-(@defproc[(flbernoulli-pdf [prob Flonum] [k Flonum] [log? Any]) Flonum]
- @defproc[(flbernoulli-cdf [prob Flonum] [k Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flbernoulli-inv-cdf [prob Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flbernoulli-sample [prob Flonum] [n Integer]) FlVector])]{
-Low-level flonum functions used to implement @racket[bernoulli-dist].
-}
-
-@deftogether[
-(@defproc[(flbinomial-pdf [count Flonum] [prob Flonum] [k Flonum] [log? Any]) Flonum]
- @defproc[(flbinomial-cdf [count Flonum] [prob Flonum] [k Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flbinomial-inv-cdf [count Flonum] [prob Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flbinomial-sample [count Flonum] [prob Flonum] [n Integer]) FlVector])]{
-Low-level flonum functions used to implement @racket[binomial-dist].
-}
-
-@deftogether[
-(@defproc[(flgeometric-pdf [prob Flonum] [k Flonum] [log? Any]) Flonum]
- @defproc[(flgeometric-cdf [prob Flonum] [k Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flgeometric-inv-cdf [prob Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flgeometric-sample [prob Flonum] [n Integer]) FlVector])]{
-Low-level flonum functions used to implement @racket[geometric-dist].
-}
-
-@deftogether[
-(@defproc[(flpoisson-pdf [mean Flonum] [k Flonum] [log? Any]) Flonum]
- @defproc[(flpoisson-cdf [mean Flonum] [k Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flpoisson-inv-cdf [mean Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flpoisson-sample [mean Flonum] [n Integer]) FlVector]
- @defproc[(flpoisson-median [mean Flonum]) Flonum])]{
-Low-level flonum functions used to implement @racket[poisson-dist].
-
-@racket[(flpoisson-median mean)] runs faster than
-@racket[(flpoisson-inv-cdf mean 0.5 #f #f)], significantly so when @racket[mean] is large.
-}
-
-@subsection{Real Distribution Functions}
-
-@deftogether[
-(@defproc[(flbeta-pdf [alpha Flonum] [beta Flonum] [x Flonum] [log? Any]) Flonum]
- @defproc[(flbeta-cdf [alpha Flonum] [beta Flonum] [x Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flbeta-inv-cdf [alpha Flonum] [beta Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flbeta-sample [alpha Flonum] [beta Flonum] [n Integer]) FlVector])]{
-Low-level flonum functions used to implement @racket[beta-dist].
-}
-
-@deftogether[
-(@defproc[(flcauchy-pdf [mode Flonum] [scale Flonum] [x Flonum] [log? Any]) Flonum]
- @defproc[(flcauchy-cdf [mode Flonum] [scale Flonum] [x Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flcauchy-inv-cdf [mode Flonum] [scale Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flcauchy-sample [mode Flonum] [scale Flonum] [n Integer]) FlVector])]{
-Low-level flonum functions used to implement @racket[cauchy-dist].
-}
-
-@deftogether[
-(@defproc[(fldelta-pdf [mean Flonum] [x Flonum] [log? Any]) Flonum]
- @defproc[(fldelta-cdf [mean Flonum] [x Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(fldelta-inv-cdf [mean Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum])]{
-Low-level flonum functions used to implement @racket[delta-dist].
-
-To get delta-distributed random samples, use @racket[(make-flvector n mean)].
-}
-
-@deftogether[
-(@defproc[(flexponential-pdf [mean Flonum] [x Flonum] [log? Any]) Flonum]
- @defproc[(flexponential-cdf [mean Flonum] [x Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flexponential-inv-cdf [mean Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flexponential-sample [mean Flonum] [n Integer]) FlVector])]{
-Low-level flonum functions used to implement @racket[exponential-dist].
-}
-
-@deftogether[
-(@defproc[(flgamma-pdf [shape Flonum] [scale Flonum] [x Flonum] [log? Any]) Flonum]
- @defproc[(flgamma-cdf [shape Flonum] [scale Flonum] [x Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flgamma-inv-cdf [shape Flonum] [scale Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flgamma-sample [shape Flonum] [scale Flonum] [n Integer]) FlVector])]{
-Low-level flonum functions used to implement @racket[gamma-dist].
-}
-
-@deftogether[
-(@defproc[(fllogistic-pdf [mean Flonum] [scale Flonum] [x Flonum] [log? Any]) Flonum]
- @defproc[(fllogistic-cdf [mean Flonum] [scale Flonum] [x Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(fllogistic-inv-cdf [mean Flonum] [scale Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(fllogistic-sample [mean Flonum] [scale Flonum] [n Integer]) FlVector])]{
-Low-level flonum functions used to implement @racket[logistic-dist].
-}
-
-@deftogether[
-(@defproc[(flnormal-pdf [mean Flonum] [stddev Flonum] [x Flonum] [log? Any]) Flonum]
- @defproc[(flnormal-cdf [mean Flonum] [stddev Flonum] [x Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flnormal-inv-cdf [mean Flonum] [stddev Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(flnormal-sample [mean Flonum] [stddev Flonum] [n Integer]) FlVector])]{
-Low-level flonum functions used to implement @racket[normal-dist].
-}
-
-@deftogether[
-(@defproc[(fltriangle-pdf [min Flonum] [max Flonum] [mode Flonum] [x Flonum] [log? Any]) Flonum]
- @defproc[(fltriangle-cdf [min Flonum] [max Flonum] [mode Flonum] [x Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(fltriangle-inv-cdf [min Flonum] [max Flonum] [mode Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(fltriangle-sample [min Flonum] [max Flonum] [mode Flonum] [n Integer]) FlVector])]{
-Low-level flonum functions used to implement @racket[triangle-dist].
-}
-
-@deftogether[
-(@defproc[(fluniform-pdf [min Flonum] [max Flonum] [x Flonum] [log? Any]) Flonum]
- @defproc[(fluniform-cdf [min Flonum] [max Flonum] [x Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(fluniform-inv-cdf [min Flonum] [max Flonum] [p Flonum] [log? Any] [1-p? Any]) Flonum]
- @defproc[(fluniform-sample [min Flonum] [max Flonum] [n Integer]) FlVector])]{
-Low-level flonum functions used to implement @racket[uniform-dist].
-}
-
-@(close-eval untyped-eval)
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/math-flonum.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-flonum.scrbl
deleted file mode 100644
index 13ea2b3a12..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/math-flonum.scrbl
+++ /dev/null
@@ -1,926 +0,0 @@
-#lang unstable/2d scribble/manual
-
-@(require scribble/eval
-          scribble/core
-          scribble/html-properties
-          racket/sandbox
-          unstable/2d/tabular
-          (for-label racket/base racket/vector
-                     (except-in racket/list permutations) ; FIXME
-                     math plot
-                     (only-in typed/racket/base
-                              ->
-                              Flonum Integer Index Real Boolean Any Listof Vectorof FlVector
-                              Nonnegative-Flonum Values))
-          "utils.rkt")
-
-@(define untyped-eval (make-untyped-math-eval))
-@interaction-eval[#:eval untyped-eval (require racket/list)]
-
-@title[#:tag "flonum"]{Flonums}
-@(author-neil)
-
-@defmodule[math/flonum]
-
-For convenience, @racketmodname[math/flonum] re-exports @racketmodname[racket/flonum]
-as well as providing the functions document below.
-
-@local-table-of-contents[]
-
-@section{Additional Flonum Functions}
-
-@defproc[(fl [x Real]) Flonum]{
-Equivalent to @racket[(real->double-flonum x)], but much easier to read and write.
-@examples[#:eval untyped-eval
-                 (fl 1/2)
-                 (fl 0.5)
-                 (fl 0.5f0)]
-Note that @racket[exact->inexact] does not always convert a @racket[Real] to a @racket[Flonum]:
-@interaction[#:eval untyped-eval
-                    (exact->inexact 0.5f0)
-                    (flabs (exact->inexact 0.5f0))]
-You should prefer @racket[fl] over @racket[exact->inexact], especially in Typed Racket code.
-}
-
-@deftogether[(@defproc[(flsgn [x Flonum]) Flonum]
-              @defproc[(fleven? [x Flonum]) Boolean]
-              @defproc[(flodd? [x Flonum]) Boolean])]{
-Like @racket[sgn], @racket[even?] and @racket[odd?], but restricted to flonum input.
-@examples[#:eval untyped-eval
-                 (map flsgn '(-2.0 -0.0 0.0 2.0))
-                 (map fleven? '(2.0 1.0 0.5))
-                 (map flodd? '(2.0 1.0 0.5))]
-}
-
-@deftogether[(@defproc[(flrational? [x Flonum]) Boolean]
-              @defproc[(flinfinite? [x Flonum]) Boolean]
-              @defproc[(flnan? [x Flonum]) Boolean]
-              @defproc[(flinteger? [x Flonum]) Boolean])]{
-Like @racket[rational?], @racket[infinite?], @racket[nan?] and @racket[integer?], but restricted
-to flonum input.
-In Typed Racket, these are 2-3 times faster as well.
-}
-
-@defproc[(flhypot [x Flonum] [y Flonum]) Flonum]{
-Computes @racket[(flsqrt (+ (* x x) (* y y)))] in way that overflows only when the
-answer is too large.
-@examples[#:eval untyped-eval
-                 (flsqrt (+ (* 1e200 1e200) (* 1e199 1e199)))
-                 (flhypot 1e200 1e199)]
-}
-
-@defproc[(flsum [xs (Listof Flonum)]) Flonum]{
-Like @racket[(apply + xs)], but incurs rounding error only once.
-@examples[#:eval untyped-eval
-                 (+ 1.0 1e-16)
-                 (+ (+ 1.0 1e-16) 1e-16)
-                 (flsum '(1.0 1e-16 1e-16))]
-The @racket[sum] function does the same for heterogenous lists of reals.
-
-Worst-case time complexity is O(@italic{n}@superscript{2}), though the pathological
-inputs needed to observe quadratic time are exponentially improbable and are hard
-to generate purposely. Expected time complexity is O(@italic{n} log(@italic{n})).
-
-See @racket[flvector-sums] for a variant that computes all the partial sums in @racket[xs].
-}
-
-@deftogether[(@defproc[(flsinh [x Flonum]) Flonum]
-              @defproc[(flcosh [x Flonum]) Flonum]
-              @defproc[(fltanh [x Flonum]) Flonum])]{
-Return the @hyperlink["http://en.wikipedia.org/wiki/Hyperbolic_function"]{hyperbolic sine, cosine and tangent}
-of @racket[x], respectively.
-
-@examples[#:eval untyped-eval
-                 (plot (list
-                        (function (compose flsinh fl) #:label "flsinh x")
-                        (function (compose flcosh fl) #:label "flcosh x" #:color 2)
-                        (function (compose fltanh fl) #:label "fltanh x" #:color 3))
-                       #:x-min -2 #:x-max 2 #:y-label #f #:legend-anchor 'bottom-right)]
-
-Maximum observed error is 2 @tech{ulps}, making these functions (currently) much more accurate than their
-@racketmodname[racket/math] counterparts. They also return sensible values on the largest possible domain.
-}
-
-@deftogether[(@defproc[(flasinh [y Flonum]) Flonum]
-              @defproc[(flacosh [y Flonum]) Flonum]
-              @defproc[(flatanh [y Flonum]) Flonum])]{
-Return the @hyperlink["http://en.wikipedia.org/wiki/Inverse_hyperbolic_function"]{inverse hyperbolic sine, cosine and tangent}
-of @racket[y], respectively.
-
-These functions are as robust and accurate as their corresponding inverses.
-}
-
-@deftogether[(@defproc[(flfactorial [n Flonum]) Flonum]
-              @defproc[(flbinomial [n Flonum] [k Flonum]) Flonum]
-              @defproc[(flpermutations [n Flonum] [k Flonum]) Flonum]
-              @defproc[(flmultinomial [n Flonum] [ks (Listof Flonum)]) Flonum])]{
-Like @racket[(fl (factorial (fl->exact-integer n)))] and so on, but computed in constant
-time. Also, these return @racket[+nan.0] instead of raising exceptions.
-
-For factorial-like functions that return sensible values for non-integers, see
-@racket[gamma] and @racket[beta].
-}
-
-@deftogether[(@defproc[(fllog-factorial [n Flonum]) Flonum]
-              @defproc[(fllog-binomial [n Flonum] [k Flonum]) Flonum]
-              @defproc[(fllog-permutations [n Flonum] [k Flonum]) Flonum]
-              @defproc[(fllog-multinomial [n Flonum] [ks (Listof Flonum)]) Flonum])]{
-Like @racket[(fllog (flfactorial n))] and so on, but more accurate and without unnecessary overflow.
-
-For log-factorial-like functions that return sensible values for non-integers, see
-@racket[log-gamma] and @racket[log-beta].
-}
-
-@deftogether[(@defproc[(fllog1p [x Flonum]) Flonum]
-              @defproc[(flexpm1 [x Flonum]) Flonum])]{
-Like @racket[(fllog (+ 1.0 x))] and @racket[(- (flexp x) 1.0)], but accurate when
-@racket[x] is small (within 1 @tech{ulp}).
-
-For example, one difficult input for @racket[(fllog (+ 1.0 x))] and @racket[(- (flexp x) 1.0)]
-is @racket[x] = @racket[1e-14], which @racket[fllog1p] and @racket[flexpm1] compute correctly:
-@interaction[#:eval untyped-eval
-                    (fllog (+ 1.0 1e-14))
-                    (fllog1p 1e-14)
-                    (- (flexp 1e-14) 1.0)
-                    (flexpm1 1e-14)]
-
-These functions are mutual inverses:
-@interaction[#:eval untyped-eval
-                    (plot (list
-                           (function (λ (x) x) #:color 0 #:style 'long-dash)
-                           (function (compose fllog1p fl) #:label "fllog1p x")
-                           (function (compose flexpm1 fl) #:label "flexpm1 x" #:color 2))
-                          #:x-min -4 #:x-max 4 #:y-min -4 #:y-max 4)]
-Notice that both graphs pass through the origin. Thus, inputs close to @racket[0.0],
-around which flonums are particularly dense, result in outputs that are also close
-to @racket[0.0]. Further, both functions are approximately the identity function
-near @racket[0.0], so the output density is approximately the same.
-
-Many flonum functions defined in terms of @racket[fllog] and @racket[flexp]
-become much more accurate when their defining expressions are put in terms of
-@racket[fllog1p] and @racket[flexpm1]. The functions exported by this module and
-by @racketmodname[math/special-functions] use them extensively.
-
-One notorious culprit is @racket[(flexpt (- 1.0 x) y)], when @racket[x] is near
-@racket[0.0]. Computing it directly too often results in the wrong answer:
-@interaction[#:eval untyped-eval (flexpt (- 1.0 1e-20) 1e20)]
-We should expect that multiplying a number just less than @racket[1.0] by itself
-that many times would result in something less than @racket[1.0]. The problem
-comes from subtracting such a small number from @racket[1.0] in the first place:
-@interaction[#:eval untyped-eval (- 1.0 1e-20)]
-Fortunately, we can compute this correctly by putting the expression in terms
-of @racket[fllog1p], which avoids the error-prone subtraction:
-@interaction[#:eval untyped-eval (flexp (* 1e20 (fllog1p (- 1e-20))))]
-But see @racket[flexpt1p], which is more accurate still.
-}
-
-@defproc[(flexpt1p [x Flonum] [y Flonum]) Flonum]{
-Like @racket[(flexpt (+ 1.0 x) y)], but accurate for any @racket[x] and @racket[y].
-}
-
-@defproc[(flexpt+ [x1 Flonum] [x2 Flonum] [y Flonum]) Flonum]{
-Like @racket[(flexpt (+ x1 x2) y)], but more accurate.
-}
-
-@defproc[(flexp2 [x Flonum]) Nonnegative-Flonum]{
-Equivalent to @racket[(flexpt 2.0 x)], but faster when @racket[x] is an integer.
-}
-
-@defproc[(fllog2 [x Flonum]) Flonum]{
-Computes the base-2 log of @racket[x] more accurately than @racket[(/ (fllog x) (fllog 2.0))].
-In particular, @racket[(fllog2 x)] is correct for any power of two @racket[x].
-@examples[#:eval untyped-eval
-                 (fllog2 4.5)
-                 (/ (fllog (flexp2 -1066.0)) (fllog 2.0))
-                 (fllog2 (flexp2 -1066.0))]
-Maximum observed error is 0.5006 @tech{ulps}, but is almost always no more than 0.5 (i.e. it is
-almost always @italic{correct}).
-}
-
-@defproc[(fllogb [b Flonum] [x Flonum]) Flonum]{
-Computes the base-@racket[b] log of @racket[x] more accurately than @racket[(/ (fllog x) (fllog b))],
-and handles limit values correctly.
-@examples[#:eval untyped-eval
-                 (plot3d (contour-intervals3d (λ (b x) (fllogb (fl b) (fl x))) 0 4 0 4)
-                         #:x-label "b" #:y-label "x")]
-
-Maximum observed error is 2.1 @tech{ulps}, but is usually less than 0.7 (i.e. near rounding error).
-
-Except possibly at limit values (such as @racket[0.0] and @racket[+inf.0], and @racket[b = 1.0])
-and except when the inner expression underflows or overflows, @racket[fllogb] approximately meets
-these identities for @racket[b > 0.0]:
-@itemlist[@item{Left inverse: @racket[(fllogb b (flexpt b y)) = y]}
-          @item{Right inverse: @racket[(flexpt b (fllogb b x)) = x] when @racket[x > 0.0]}]
-
-Unlike with @racket[flexpt], there is no standard for @racket[fllogb]'s behavior at limit values.
-Fortunately, deriving the following rules (applied in order) is not prohibitively difficult.
-@centered[
-  #2dtabular
-  ╔═════════════════════════════════╦══════════════════╦═════════════════╗
-  ║ @bold{Case}                     ║@bold{Condition}  ║ @bold{Value}    ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb b 1.0)]         ║                  ║ @racket[0.0]    ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb 1.0 x)]         ║                  ║ @racket[+nan.0] ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb b x)]           ║ @racket[b < 0.0] ║ @racket[+nan.0] ║
-  ║                                 ║      " or "      ║                 ║
-  ║                                 ║ @racket[x < 0.0] ║                 ║
-  ╠═════════════════════════════════╩══════════════════╩═════════════════╣
-  ║                                                                      ║
-  ║                        @italic{Double limits}                        ║
-  ║                                                                      ║
-  ╠═════════════════════════════════╦══════════════════╦═════════════════╣
-  ║ @racket[(fllogb 0.0 0.0)]       ║                  ║ @racket[+inf.0] ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb 0.0 +inf.0)]    ║                  ║ @racket[-inf.0] ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb +inf.0 0.0)]    ║                  ║ @racket[-inf.0] ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb +inf.0 +inf.0)] ║                  ║ @racket[+inf.0] ║
-  ╠═════════════════════════════════╩══════════════════╩═════════════════╣
-  ║                                                                      ║
-  ║              @italic{Limits with respect to @racket[b]}              ║
-  ║                                                                      ║
-  ╠═════════════════════════════════╦══════════════════╦═════════════════╣
-  ║ @racket[(fllogb 0.0 x)]         ║ @racket[x < 1.0] ║ @racket[0.0]    ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb 0.0 x)]         ║ @racket[x > 1.0] ║ @racket[-0.0]   ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb +inf.0 x)]      ║ @racket[x > 1.0] ║ @racket[0.0]    ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb +inf.0 x)]      ║ @racket[x < 1.0] ║ @racket[-0.0]   ║
-  ╠═════════════════════════════════╩══════════════════╩═════════════════╣
-  ║                                                                      ║
-  ║              @italic{Limits with respect to @racket[x]}              ║
-  ║                                                                      ║
-  ╠═════════════════════════════════╦══════════════════╦═════════════════╣
-  ║ @racket[(fllogb b 0.0)]         ║ @racket[b < 1.0] ║ @racket[+inf.0] ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb b 0.0)]         ║ @racket[b > 1.0] ║ @racket[-inf.0] ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb b +inf.0)]      ║ @racket[b > 1.0] ║ @racket[+inf.0] ║
-  ╠═════════════════════════════════╬══════════════════╬═════════════════╣
-  ║ @racket[(fllogb b +inf.0)]      ║ @racket[b < 1.0] ║ @racket[-inf.0] ║
-  ╠═════════════════════════════════╩══════════════════╩═════════════════╣
-  ║ #:style                                                              ║
-  ║ (style 'plain                                                        ║
-  ║        (list (table-columns (list (style 'plain (list 'left))        ║
-  ║                                   (style 'plain (list 'center))      ║
-  ║                                   (style 'plain (list 'right))))     ║
-  ║              (attributes '((width . "90%")))))                       ║
-  ╚══════════════════════════════════════════════════════════════════════╝]
-Most of these rules are derived by taking limits of the mathematical base-@racket[b] log function.
-Except for @racket[(fllogb 1.0 x)], when doing so gives rise to ambiguities, they are resolved using
-@racket[flexpt]'s behavior, which follows the IEEE 754 and C99 standards for @tt{pow}.
-
-For example, consider @racket[(fllogb 0.0 0.0)].
-Taking an interated limit, we get ∞ if the outer limit is with respect to @racket[x], or 0 if the
-outer limit is with respect to @racket[b].
-This would normally mean @racket[(fllogb 0.0 0.0) = +nan.0].
-
-However, choosing @racket[+inf.0] ensures that these additional left-inverse and right-inverse
-identities hold:
-@racketblock[(fllogb 0.0 (flexpt 0.0 +inf.0)) = +inf.0
-             (flexpt 0.0 (fllogb 0.0 0.0)) = 0.0]
-Further, choosing @racket[0.0] does not ensure that any additional identities hold.
-}
-
-@defproc[(flbracketed-root [f (Flonum -> Flonum)] [a Flonum] [b Flonum]) Flonum]{
-Uses the @hyperlink["http://en.wikipedia.org/wiki/Brent%27s_method"]{Brent-Dekker method} to
-find a floating-point root of @racket[f] (an @racket[x : Flonum] for which @racket[(f x)] is
-very near a zero crossing) between @racket[a] and @racket[b].
-The values @racket[(f a)] and @racket[(f b)] must have opposite signs, but @racket[a] and @racket[b]
-may be in any order.
-@examples[#:eval untyped-eval
-                 (define (f x) (+ 1.0 (* (+ x 3.0) (sqr (- x 1.0)))))
-                 (define x0 (flbracketed-root f -4.0 2.0))
-                 (plot (list (x-axis)
-                             (function f -4 2)
-                             (function-label f x0))
-                       #:y-min -10)
-                 (f (flprev x0))
-                 (f x0)
-                 (flbracketed-root f -1.0 2.0)]
-Caveats:
-@(itemlist
-  @item{There is no guarantee that @racket[flbracketed-root] will find any @emph{particular} root.
-        Moreover, future updates to its implementation could make it find different ones.}
-  @item{There is currently no guarantee that it will find the @emph{closest} @racket[x] to an exact root.}
-  @item{It currently runs for at most 5000 iterations.})
-It usually requires far fewer iterations, especially if the initial bounds @racket[a] and @racket[b] are tight.
-}
-
-@defproc[(make-flexpt [x Real]) (Flonum -> Flonum)]{
-Equivalent to @racket[(λ (y) (flexpt x y))] when @racket[x] is a flonum, but much more
-accurate for large @racket[y] when @racket[x] cannot be exactly represented
-by a flonum.
-
-Suppose we want to compute π@superscript{@racket[y]}, where @racket[y] is a flonum.
-If we use @racket[flexpt] with an @italic{approximation} of the irrational base π,
-the error is low near zero, but grows with distance from the origin:
-@interaction[#:eval untyped-eval
-                    (eval:alts (bf-precision 128)
-                               (eval:result ""))
-                    (eval:alts (define y 150.0)
-                               (eval:result ""))
-                    (eval:alts (define pi^y (bigfloat->rational (bfexpt pi.bf (bf y))))
-                               (eval:result ""))
-                    (eval:alts (flulp-error (flexpt pi y) pi^y)
-                               (eval:result @racketresultfont{43.12619934359266}))]
-Using @racket[make-flexpt], the error is near rounding error everywhere:
-@interaction[#:eval untyped-eval
-                    (eval:alts (define flexppi (make-flexpt (bigfloat->rational pi.bf)))
-                               (eval:result ""))
-                    (eval:alts (flulp-error (flexppi y) pi^y)
-                               (eval:result @racketresultfont{0.8738006564073412}))]
-This example is used in the implementations of @racket[zeta] and @racket[psi].
-}
-
-@defproc[(flsqrt1pm1 [x Flonum]) Flonum]{
-Like @racket[(- (flsqrt (+ 1.0 x)) 1.0)], but accurate when @racket[x] is small.
-}
-
-@defproc[(fllog1pmx [x Flonum]) Flonum]{
-Like @racket[(- (fllog1p x) x)], but accurate when @racket[x] is small.
-}
-
-@defproc[(flexpsqr [x Flonum]) Flonum]{
-Like @racket[(flexp (* x x))], but accurate when @racket[x] is large.
-}
-
-@defproc[(flgauss [x Flonum]) Flonum]{
-Like @racket[(flexp (- (* x x)))], but accurate when @racket[x] is large.
-}
-
-@defproc[(flexp1p [x Flonum]) Flonum]{
-Like @racket[(flexp (+ 1.0 x))], but accurate when @racket[x] is near a power of 2.
-}
-
-@deftogether[(@defproc[(flsinpix [x Flonum]) Flonum]
-              @defproc[(flcospix [x Flonum]) Flonum]
-              @defproc[(fltanpix [x Flonum]) Flonum])]{
-Like @racket[(flsin (* pi x))], @racket[(flcos (* pi x))] and @racket[(fltan (* pi x))], respectively,
-but accurate near roots and singularities. When @racket[x = (+ n 0.5)] for some integer @racket[n],
-@racket[(fltanpix x) = +nan.0].
-}
-
-@deftogether[(@defproc[(flcscpix [x Flonum]) Flonum]
-              @defproc[(flsecpix [x Flonum]) Flonum]
-              @defproc[(flcotpix [x Flonum]) Flonum])]{
-Like @racket[(/ 1.0 (flsinpix x))], @racket[(/ 1.0 (flcospix x))] and @racket[(/ 1.0 (fltanpix x))],
-respectively, but the first two return @racket[+nan.0] at singularities and @racket[flcotpix] avoids
-a double reciprocal.
-}
-
-@section{Log-Space Arithmetic}
-
-It is often useful, especially when working with probabilities and probability
-densities, to represent nonnegative numbers in @deftech{log space}, or as the
-natural logs of their true values. Generally, the reason is that the @italic{smallest}
-positive flonum is @italic{too large}.
-
-For example, say we want the probability density of the standard normal distribution
-(the bell curve) at 50 standard deviations from zero:
-@interaction[#:eval untyped-eval
-                    (require math/distributions)
-                    (pdf (normal-dist) 50.0)]
-Mathematically, the density is nonzero everywhere, but the density at 50 is less than
-@racket[+min.0]. However, its density in log space, or its log-density, is representable:
-@interaction[#:eval untyped-eval
-                    (pdf (normal-dist) 50.0 #t)]
-While this example may seem contrived, it is very common, when computing the density
-of a @italic{vector} of data, for the product of the densities to be too small to represent directly.
-
-In log space, exponentiation becomes multiplication, multiplication becomes addition, and
-addition becomes tricky. See @racket[lg+] and @racket[lgsum] for solutions.
-
-@deftogether[(@defproc[(lg* [logx Flonum] [logy Flonum]) Flonum]
-              @defproc[(lg/ [logx Flonum] [logy Flonum]) Flonum]
-              @defproc[(lgprod [logxs (Listof Flonum)]) Flonum])]{
-Equivalent to @racket[(fl+ logx logy)], @racket[(fl- logx logy)] and @racket[(flsum logxs)], respectively.
-}
-
-@deftogether[(@defproc[(lg+ [logx Flonum] [logy Flonum]) Flonum]
-              @defproc[(lg- [logx Flonum] [logy Flonum]) Flonum])]{
-Like @racket[(fllog (+ (flexp logx) (flexp logy)))] and @racket[(fllog (- (flexp logx) (flexp logy)))],
-respectively, but more accurate and less prone to overflow and underflow.
-     
-When @racket[logy > logx], @racket[lg-] returns @racket[+nan.0]. Both functions correctly treat
-@racket[-inf.0] as log-space @racket[0.0].
-
-To add more than two log-space numbers with the same guarantees, use @racket[lgsum].
-
-@examples[#:eval untyped-eval
-                 (lg+ (fllog 0.5) (fllog 0.2))
-                 (flexp (lg+ (fllog 0.5) (fllog 0.2)))
-                 (lg- (fllog 0.5) (fllog 0.2))
-                 (flexp (lg- (fllog 0.5) (fllog 0.2)))
-                 (lg- (fllog 0.2) (fllog 0.5))]
-
-Though more accurate than a naive implementation, both functions are prone to @tech{catastrophic
-cancellation} in regions where they output a value close to @racket[0.0] (or log-space @racket[1.0]).
-While these outputs have high relative error, their absolute error is very low, and when
-exponentiated, nearly have just rounding error. Further, catastrophic cancellation is unavoidable
-when @racket[logx] and @racket[logy] themselves have error, which is by far the common case.
-
-These are, of course, excuses---but for floating-point research generally. There are currently no
-reasonably fast algorithms for computing @racket[lg+] and @racket[lg-] with low relative error.
-For now, if you need that kind of accuracy, use @racketmodname[math/bigfloat].
-}
-
-@defproc[(lgsum [logxs (Listof Flonum)]) Flonum]{
-Like folding @racket[lg+] over @racket[logxs], but more accurate. Analogous to @racket[flsum].
-}
-
-@deftogether[(@defproc[(lg1+ [logx Flonum]) Flonum]
-              @defproc[(lg1- [logx Flonum]) Flonum])]{
-Equivalent to @racket[(lg+ (fllog 1.0) logx)] and @racket[(lg- (fllog 1.0) logx)],
-respectively, but faster.
-}
-
-@defproc[(flprobability? [x Flonum] [log? Any #f]) Boolean]{
-When @racket[log?] is @racket[#f], returns @racket[#t] when @racket[(<= 0.0 x 1.0)].
-When @racket[log?] is @racket[#t], returns @racket[#t] when @racket[(<= -inf.0 x 0.0)].
-@examples[#:eval untyped-eval
-                 (flprobability? -0.1)
-                 (flprobability? 0.5)
-                 (flprobability? +nan.0 #t)]
-}
-
-@section{Debugging Flonum Functions}
-
-The following functions and constants are useful in authoring and debugging flonum functions
-that must be accurate on the largest possible domain.
-
-Suppose we approximate @racket[flexp] using its Taylor series centered at @racket[1.0], truncated
-after three terms (a second-order polynomial):
-@racketblock+eval[#:eval untyped-eval
-(define (exp-taylor-1 x)
-  (let ([x  (- x 1.0)])
-    (* (flexp 1.0) (+ 1.0 x (* 0.5 x x)))))
-]
-
-We can use @racketmodname[plot] and @racket[flstep] (documented below) to compare its output
-to that of @racket[flexp] on very small intervals:
-@interaction[#:eval untyped-eval
-(plot (list (function exp-taylor-1 #:label "exp-taylor-1 x")
-            (function exp #:color 2 #:label "exp x"))
-      #:x-min (flstep 1.00002 -40)
-      #:x-max (flstep 1.00002 40)
-      #:width 480)
-]
-Such plots are especially useful when centered at a boundary between two different
-approximation methods.
-
-For larger intervals, assuming the approximated function is fairly smooth,
-we can get a better idea how close the approximation is using @racket[flulp-error]:
-@interaction[#:eval untyped-eval
-(plot (function (λ (x) (flulp-error (exp-taylor-1 x) (exp x))))
-      #:x-min 0.99998 #:x-max 1.00002 #:y-label "Error (ulps)")
-]
-We can infer from this plot that our Taylor series approximation has close to
-rounding error (no more than an @tech{ulp}) near @racket[1.0], but quickly becomes worse farther away.
-
-To get a ground-truth function such as @racket[exp] to test against, compute the
-outputs as accurately as possible using exact rationals or high-precision @tech{bigfloats}.
-
-@subsection{Measuring Floating-Point Error}
-
-@defproc[(flulp [x Flonum]) Flonum]{
-Returns @racket[x]'s @deftech{ulp}, or @bold{u}nit in @bold{l}ast @bold{p}lace:
-the magnitude of the least significant bit in @racket[x].
-@examples[#:eval untyped-eval
-                 (flulp 1.0)
-                 (flulp 1e-100)
-                 (flulp 1e200)]
-}
-
-@defproc[(flulp-error [x Flonum] [r Real]) Flonum]{
-Returns the absolute number of @tech{ulps} difference between @racket[x] and @racket[r].
-
-For non-rational arguments such as @racket[+nan.0], @racket[flulp-error] returns @racket[0.0]
-if @racket[(eqv? x r)]; otherwise it returns @racket[+inf.0].
-
-A flonum function with maximum error @racket[0.5] ulps exhibits only rounding error;
-it is @italic{correct}. A flonum function with maximum error no greater than a few ulps
-is @italic{accurate}. Most moderately complicated flonum functions, when implemented
-directly, seem to have over a hundred thousand ulps maximum error.
-
-@examples[#:eval untyped-eval
-                 (flulp-error 0.5 1/2)
-                 (flulp-error #i1/7 1/7)
-                 (flulp-error +inf.0 +inf.0)
-                 (flulp-error +inf.0 +nan.0)
-                 (flulp-error 1e-20 0.0)
-                 (flulp-error (- 1.0 (fl 4999999/5000000)) 1/5000000)]
-@margin-note*{* You can make an exception when the result is to be exponentiated.
-              If @racket[x] has small @racket[absolute-error], then @racket[(exp x)]
-              has small @racket[relative-error] and small @racket[flulp-error].}
-The last example subtracts two nearby flonums, the second of which had already been
-rounded, resulting in horrendous error. This is an example of @deftech{catastrophic
-cancellation}. Avoid subtracting nearby flonums whenever possible.*
-
-See @racket[relative-error] for a similar way to measure approximation error when the
-approximation is not necessarily represented by a flonum.
-}
-
-@subsection{Flonum Constants}
-
-@deftogether[(@defthing[-max.0 Flonum]
-              @defthing[-min.0 Flonum]
-              @defthing[+min.0 Flonum]
-              @defthing[+max.0 Flonum])]{
-The nonzero, rational flonums with maximum and minimum magnitude.
-@examples[#:eval untyped-eval (list -max.0 -min.0 +min.0 +max.0)]
-}
-
-@defthing[epsilon.0 Flonum]{
-The smallest flonum that can be added to @racket[1.0] to yield a larger number,
-or the magnitude of the least significant bit in @racket[1.0].
-@examples[#:eval untyped-eval
-                 epsilon.0
-                 (flulp 1.0)]
-
-Epsilon is often used in stopping conditions for iterative or additive approximation methods.
-For example, the following function uses it to stop Newton's method to compute square roots.
-(Please do not assume this example is robust.)
-@racketblock[(define (newton-sqrt x)
-               (let loop ([y  (* 0.5 x)])
-                 (define dy (/ (- x (sqr y)) (* 2.0 y)))
-                 (if ((abs dy) . <= . (abs (* 0.5 epsilon.0 y)))
-                     (+ y dy)
-                     (loop (+ y dy)))))]
-When @racket[((abs dy) . <= . (abs (* 0.5 epsilon.0 y)))], adding @racket[dy] to @racket[y]
-rarely results in a different flonum. The value @racket[0.5] can be changed to allow
-looser approximations. This is a good idea when the approximation does not have to be
-as close as possible (e.g. it is only a starting point for another approximation method),
-or when the computation of @racket[dy] is known to be inaccurate.
-
-Approximation error is often understood in terms of relative error in epsilons.
-Number of epsilons relative error roughly corresponds with error in ulps, except
-when the approximation is subnormal.
-}
-
-@subsection{Low-Level Flonum Operations}
-
-@defproc[(flonum->bit-field [x Flonum]) Natural]{
-Returns the bits comprising @racket[x] as an integer.
-A convenient shortcut for composing @racket[integer-bytes->integer] with
-@racket[real->floating-point-bytes].
-@examples[#:eval untyped-eval
-                 (number->string (flonum->bit-field -inf.0) 16)
-                 (number->string (flonum->bit-field +inf.0) 16)
-                 (number->string (flonum->bit-field -0.0) 16)
-                 (number->string (flonum->bit-field 0.0) 16)
-                 (number->string (flonum->bit-field -1.0) 16)
-                 (number->string (flonum->bit-field 1.0) 16)
-                 (number->string (flonum->bit-field +nan.0) 16)]
-}
-
-@defproc[(bit-field->flonum [i Integer]) Flonum]{
-The inverse of @racket[flonum->bit-field].
-}
-
-@defproc[(flonum->ordinal [x Flonum]) Integer]{
-Returns the signed ordinal index of @racket[x] in a total order over flonums.
-
-When inputs are not @racket[+nan.0], this function is monotone and symmetric;
-i.e. if @racket[(fl<= x y)] then @racket[(<= (flonum->ordinal x) (flonum->ordinal y))],
-and @racket[(= (flonum->ordinal (- x)) (- (flonum->ordinal x)))].
-@examples[#:eval untyped-eval
-                 (flonum->ordinal -inf.0)
-                 (flonum->ordinal +inf.0)
-                 (flonum->ordinal -0.0)
-                 (flonum->ordinal 0.0)
-                 (flonum->ordinal -1.0)
-                 (flonum->ordinal 1.0)
-                 (flonum->ordinal +nan.0)]
-These properties mean that @racket[flonum->ordinal] does not distinguish @racket[-0.0]
-and @racket[0.0].
-}
-
-@defproc[(ordinal->flonum [i Integer]) Flonum]{
-The inverse of @racket[flonum->ordinal].
-}
-
-@defproc[(flonums-between [x Flonum] [y Flonum]) Integer]{
-Returns the number of flonums between @racket[x] and @racket[y], excluding one endpoint.
-Equivalent to @racket[(- (flonum->ordinal y) (flonum->ordinal x))].
-@examples[#:eval untyped-eval
-                 (flonums-between 0.0 1.0)
-                 (flonums-between 1.0 2.0)
-                 (flonums-between 2.0 3.0)
-                 (flonums-between 1.0 +inf.0)]
-}
-
-@defproc[(flstep [x Flonum] [n Integer]) Flonum]{
-Returns the flonum @racket[n] flonums away from @racket[x], according to @racket[flonum->ordinal].
-If @racket[x] is @racket[+nan.0], returns @racket[+nan.0].
-@examples[#:eval untyped-eval
-                 (flstep 0.0 1)
-                 (flstep (flstep 0.0 1) -1)
-                 (flstep 0.0 -1)
-                 (flstep +inf.0 1)
-                 (flstep +inf.0 -1)
-                 (flstep -inf.0 -1)
-                 (flstep -inf.0 1)
-                 (flstep +nan.0 1000)]
-}
-
-@deftogether[(@defproc[(flnext [x Flonum]) Flonum]
-              @defproc[(flprev [x Flonum]) Flonum])]{
-Equivalent to @racket[(flstep x 1)] and @racket[(flstep x -1)], respectively.
-}
-
-@defproc[(flsubnormal? [x Flonum]) Boolean]{
-Returns @racket[#t] when @racket[x] is a
-@hyperlink["http://en.wikipedia.org/wiki/Denormal_number"]{subnormal number}.
-
-Though flonum operations on subnormal numbers are still often implemented
-by software exception handling, the situation is improving. Robust
-flonum functions should handle subnormal inputs correctly, and reduce error
-in outputs as close to zero @tech{ulps} as possible.
-}
-
-@deftogether[(@defthing[-max-subnormal.0 Flonum]
-              @defthing[+max-subnormal.0 Flonum])]{
-The maximum positive and negative subnormal flonums. A flonum @racket[x] is subnormal when
-it is not zero and @racket[((abs x) . <= . +max-subnormal.0)].
-@examples[#:eval untyped-eval +max-subnormal.0]
-}
-
-@section{Double-Double Operations}
-
-For extra precision, floating-point computations may use two nonoverlapping flonums to represent a single number.
-Such pairs are often called @deftech{double-double} numbers.
-The exact sum of the pair is the number it represents.
-(Because they are nonoverlapping, the floating-point sum is equal to the largest.)
-
-For speed, especially with arithmetic operations, there is no data type for double-double numbers.
-They are always unboxed: given as two arguments, and received as two values.
-In both cases, the number with higher magnitude is first.
-
-Inputs are never checked to ensure they are sorted and nonoverlapping, but outputs are guaranteed to be
-sorted and nonoverlapping if inputs are.
-
-@defproc*[([(fl2 [x Real]) (Values Flonum Flonum)]
-           [(fl2 [x Flonum] [y Flonum]) (Values Flonum Flonum)])]{
-Converts a real number or the sum of two flonums into a @tech{double-double}.
-@examples[#:eval untyped-eval
-                 (fl 1/7)
-                 (relative-error (fl 1/7) 1/7)
-                 (define-values (x2 x1) (fl2 1/7))
-                 (list x2 x1)
-                 (fl (relative-error (+ (inexact->exact x2)
-                                        (inexact->exact x1))
-                                     1/7))]
-Notice that the exact sum of @racket[x2] and @racket[x1] in the preceeding example has very low
-relative error.
-
-If @racket[x] is not rational, @racket[fl2] returns @racket[(values x 0.0)].
-}
-
-@defproc[(fl2->real [x2 Flonum] [x1 Flonum]) Real]{
-Returns the exact sum of @racket[x2] and @racket[x1] if @racket[x2] is rational, @racket[x2] otherwise.
-@examples[#:eval untyped-eval
-                 (define-values (x2 x1) (fl2 1/7))
-                 (fl2->real x2 x1)]
-}
-
-@defproc[(fl2? [x2 Flonum] [x1 Flonum]) Boolean]{
-When @racket[x2] is rational, returns @racket[#t] when @racket[(flabs x2) > (flabs x1)] and @racket[x2]
-and @racket[x1] are nonoverlapping.
-When @racket[x2] is not rational, returns @racket[(fl= x1 0.0)].
-
-@examples[#:eval untyped-eval
-                 (define-values (x2 x1) (fl2 1/7))
-                 (fl2? x2 x1)
-                 (fl2? #i1/7 #i1/13)
-                 (fl2? +inf.0 0.0001)]
-
-This function is quite slow, so it is used only for testing.
-}
-
-@deftogether[(@defproc[(fl+/error [x Flonum] [y Flonum]) (Values Flonum Flonum)]
-              @defproc[(fl-/error [x Flonum] [y Flonum]) (Values Flonum Flonum)]
-              @defproc[(fl*/error [x Flonum] [y Flonum]) (Values Flonum Flonum)]
-              @defproc[(fl//error [x Flonum] [y Flonum]) (Values Flonum Flonum)]
-              @defproc[(flsqr/error [x Flonum]) (Values Flonum Flonum)]
-              @defproc[(flsqrt/error [x Flonum]) (Values Flonum Flonum)]
-              @defproc[(flexp/error [x Flonum]) (Values Flonum Flonum)]
-              @defproc[(flexpm1/error [x Flonum]) (Values Flonum Flonum)])]{
-Compute the same values as @racket[(fl+ x y)], @racket[(fl- x y)], @racket[(fl* x y)], @racket[(fl/ x y)],
-@racket[(fl* x x)], @racket[(flsqrt x)], @racket[(flexp x)] and @racket[(flexpm1 x)], but return the normally
-rounded-off low-order bits as the second value.
-The result is an unboxed @tech{double-double}.
-
-Use these functions to generate double-double numbers directly from the results of floating-point operations.
-
-@examples[#:eval untyped-eval
-                 (define x1 (fl 1/7))
-                 (define x2 (fl 1/13))
-                 (define z* (bigfloat->real (bfexp (bf* (bf x1) (bf x2)))))
-                 (relative-error (flexp (fl* x1 x2)) z*)
-                 (let*-values ([(y2 y1)  (fl*/error x1 x2)]
-                               [(z2 z1)  (fl2exp y2 y1)])
-                   (fl (relative-error (fl2->real z2 z1) z*)))]
-
-For @racket[flexp/error] and @racket[flexpm1/error], the largest observed error is 3 ulps.
-(See @racket[fl2ulp].)
-For the rest, the largest observed error is 0.5 ulps.
-}
-
-@deftogether[(@defproc[(fl2zero? [x2 Flonum] [x1 Flonum]) Boolean]
-              @defproc[(fl2rational? [x2 Flonum] [x1 Flonum]) Boolean]
-              @defproc[(fl2positive? [x2 Flonum] [x1 Flonum]) Boolean]
-              @defproc[(fl2negative? [x2 Flonum] [x1 Flonum]) Boolean]
-              @defproc[(fl2infinite? [x2 Flonum] [x1 Flonum]) Boolean]
-              @defproc[(fl2nan? [x2 Flonum] [x1 Flonum]) Boolean])]{
-Like @racket[zero?], @racket[rational?], @racket[positive?], @racket[negative?], @racket[infinite?] and @racket[nan?],
-but for @tech{double-double} flonums.
-}
-
-@deftogether[(@defproc[(fl2+ [x2 Flonum] [x1 Flonum] [y2 Flonum] [y1 Flonum 0.0]) (Values Flonum Flonum)]
-              @defproc[(fl2- [x2 Flonum] [x1 Flonum] [y2 Flonum] [y1 Flonum 0.0]) (Values Flonum Flonum)]
-              @defproc[(fl2* [x2 Flonum] [x1 Flonum] [y2 Flonum] [y1 Flonum 0.0]) (Values Flonum Flonum)]
-              @defproc[(fl2/ [x2 Flonum] [x1 Flonum] [y2 Flonum] [y1 Flonum 0.0]) (Values Flonum Flonum)]
-              @defproc[(fl2abs [x2 Flonum] [x1 Flonum 0.0]) (Values Flonum Flonum)]
-              @defproc[(fl2sqr [x2 Flonum] [x1 Flonum 0.0]) (Values Flonum Flonum)]
-              @defproc[(fl2sqrt [x2 Flonum] [x1 Flonum 0.0]) (Values Flonum Flonum)])]{
-Arithmetic and square root for @tech{double-double} flonums.
-
-For arithmetic, error is less than 8 ulps. (See @racket[fl2ulp].)
-For @racket[fl2sqr] and @racket[fl2sqrt], error is less than 1 ulp, and @racket[fl2abs] is exact.
-}
-
-@deftogether[(@defproc[(fl2= [x2 Flonum] [x1 Flonum] [y2 Flonum] [y1 Flonum]) (Values Flonum Flonum)]
-              @defproc[(fl2> [x2 Flonum] [x1 Flonum] [y2 Flonum] [y1 Flonum]) (Values Flonum Flonum)]
-              @defproc[(fl2< [x2 Flonum] [x1 Flonum] [y2 Flonum] [y1 Flonum]) (Values Flonum Flonum)]
-              @defproc[(fl2>= [x2 Flonum] [x1 Flonum] [y2 Flonum] [y1 Flonum]) (Values Flonum Flonum)]
-              @defproc[(fl2<= [x2 Flonum] [x1 Flonum] [y2 Flonum] [y1 Flonum]) (Values Flonum Flonum)])]{
-Comparison functions for @tech{double-double} flonums.
-}
-
-@deftogether[(@defproc[(fl2exp [x2 Flonum] [x1 Flonum]) (Values Flonum Flonum)]
-              @defproc[(fl2log [x2 Flonum] [x1 Flonum]) (Values Flonum Flonum)]
-              @defproc[(fl2expm1 [x2 Flonum] [x1 Flonum]) (Values Flonum Flonum)]
-              @defproc[(fl2log1p [x2 Flonum] [x1 Flonum]) (Values Flonum Flonum)])]{
-Like @racket[flexp], @racket[fllog], @racket[flexpm1] and @racket[fllog1p], but for @tech{double-double} flonums.
-
-For @racket[fl2exp] and @racket[fl2expm1], error is less than 3 ulps. (See @racket[fl2ulp].)
-For @racket[fl2log] and @racket[fl2log1p], error is less than 2 ulps.
-}
-
-@subsection{Debugging Double-Double Functions}
-
-@deftogether[(@defproc[(fl2ulp [x2 Flonum] [x1 Flonum]) Flonum]
-              @defproc[(fl2ulp-error [x2 Flonum] [x1 Flonum] [r Real]) Flonum])]{
-Like @racket[flulp] and @racket[flulp-error], but for @tech{double-double} flonums.
-
-The unit in last place of a double-double is that of the higher-order of the pair, shifted 52 bits right.
-
-@examples[#:eval untyped-eval
-                 (fl2ulp 1.0 0.0)
-                 (let-values ([(x2 x1)  (fl2 1/7)])
-                   (fl2ulp-error x2 x1 1/7))]
-}
-
-@deftogether[(@defthing[+max.hi Flonum]
-              @defthing[+max.lo Flonum]
-              @defthing[-max.hi Flonum]
-              @defthing[-max.lo Flonum])]{
-The maximum-magnitude, unboxed @tech{double-double} flonums.
-}
-
-@deftogether[(@defthing[+max-subnormal.hi Flonum]
-              @defthing[-max-subnormal.hi Flonum])]{
-The high-order flonum of the maximum-magnitude, subnormal @tech{double-double} flonums.
-@interaction[#:eval untyped-eval
-                    +max-subnormal.0
-                    +max-subnormal.hi]
-Try to avoid computing with double-doubles in the subnormal range in intermediate computations.
-}
-
-@;{Document these when they are finished:
-   fl2step
-   fl2next
-   fl2prev}
-
-@subsection{Low-Level Double-Double Operations}
-
-The following syntactic forms are fast versions of functions like @racket[fl+/error].
-They are fast because they make assumptions about the magnitudes of and relationships between their arguments,
-and do not handle non-rational double-double flonums properly.
-
-@deftogether[(@defform[(fast-mono-fl+/error x y)]
-              @defform[(fast-mono-fl-/error x y)])]{
-Return two values: @racket[(fl+ x y)] or @racket[(fl- x y)], and its rounding error.
-Both assume @racket[(flabs x) > (flabs y)].
-The values are unspecified when @racket[x] or @racket[y] is not rational.
-}
-
-@deftogether[(@defform[(fast-fl+/error x y)]
-              @defform[(fast-fl-/error x y)])]{
-Like @racket[fast-mono-fl+/error] and @racket[fast-mono-fl-/error], but do not assume @racket[(flabs x) > (flabs y)].
-}
-
-@deftogether[(@defform[(fast-fl*/error x y)]
-              @defform[(fast-fl//error x y)]
-              @defform[(fast-flsqr/error x)])]{
-Like @racket[fl*/error], @racket[fl//error] and @racket[flsqr/error], but faster, and may return garbage when an argument is subnormal or nearly infinite.
-}
-
-@defform[(flsplit x)]{
-Returns nonoverlapping @racket[(values y2 y1)], each with 26 bits precision, with @racket[(flabs y2) > (flabs y1)],
-such that @racket[(fl+ y2 y1) = x].
-For @racket[(flabs x) > 1.3393857490036326e+300], returns @racket[(values +nan.0 +nan.0)].
-
-Used to implement double-double multiplication.
-}
-
-@section{Additional Flonum Vector Functions}
-
-@defproc[(build-flvector [n Integer] [proc (Index -> Flonum)]) FlVector]{
-Creates a length-@racket[n] flonum vector by applying @racket[proc] to the indexes
-from @racket[0] to @racket[(- n 1)]. Analogous to @racket[build-vector].
-@examples[#:eval untyped-eval
-                 (build-flvector 10 fl)]
-}
-
-@defform[(inline-build-flvector n proc)
-         #:contracts ([n Integer]
-                      [proc (Index -> Flonum)])]{
-Like @racket[build-flvector], but always inlined. This increases speed at the expense of code size.
-}
-
-@defproc[(flvector-map [proc (Flonum Flonum ... -> Flonum)] [xs FlVector] [xss FlVector] ...)
-         FlVector]{
-Applies @racket[proc] to the corresponding elements of @racket[xs] and @racket[xss]. Analogous to
-@racket[vector-map].
-
-The @racket[proc] is meant to accept the same number of arguments as the number of its following
-flonum vector arguments. However, a current limitation in Typed Racket requires @racket[proc]
-to accept @italic{any} number of arguments. To map a single-arity function such as @racket[fl+]
-over the corresponding number of flonum vectors, for now, use @racket[inline-flvector-map].
-}
-
-@defform[(inline-flvector-map proc xs xss ...)
-         #:contracts ([proc (Flonum Flonum ... -> Flonum)]
-                      [xs FlVector]
-                      [xss FlVector])]{
-Like @racket[flvector-map], but always inlined.
-}
-
-@defproc[(flvector-copy! [dest FlVector]
-                         [dest-start Integer]
-                         [src FlVector]
-                         [src-start Integer 0]
-                         [src-end Integer (flvector-length src)])
-         Void]{
-Like @racket[vector-copy!], but for flonum vectors.
-}
-
-@deftogether[(@defproc[(list->flvector [vs (Listof Real)]) FlVector]
-              @defproc[(flvector->list [xs FlVector]) (Listof Flonum)]
-              @defproc[(vector->flvector [vs (Vectorof Real)]) FlVector]
-              @defproc[(flvector->vector [xs FlVector]) (Vectorof Flonum)])]{
-Convert between lists and flonum vectors, and between vectors and flonum vectors.
-}
-
-@deftogether[(@defproc[(flvector+ [xs FlVector] [ys FlVector]) FlVector]
-              @defproc[(flvector* [xs FlVector] [ys FlVector]) FlVector]
-              @defproc*[([(flvector- [xs FlVector]) FlVector]
-                         [(flvector- [xs FlVector] [ys FlVector]) FlVector])]
-              @defproc*[([(flvector/ [xs FlVector]) FlVector]
-                         [(flvector/ [xs FlVector] [ys FlVector]) FlVector])]
-              @defproc[(flvector-scale [xs FlVector] [y Flonum]) FlVector]
-              @defproc[(flvector-abs [xs FlVector]) FlVector]
-              @defproc[(flvector-sqr [xs FlVector]) FlVector]
-              @defproc[(flvector-sqrt [xs FlVector]) FlVector]
-              @defproc[(flvector-min [xs FlVector] [ys FlVector]) FlVector]
-              @defproc[(flvector-max [xs FlVector] [ys FlVector]) FlVector])]{
-Arithmetic lifted to operate on flonum vectors.
-}
-
-@defproc[(flvector-sum [xs FlVector]) Flonum]{
-Like @racket[flsum], but operates on flonum vectors. In fact, @racket[flsum] is defined in terms
-of @racket[flvector-sum].
-}
-
-@defproc[(flvector-sums [xs FlVector]) FlVector]{
-Computes the partial sums of the elements in @racket[xs] in a way that incurs rounding error only
-once for each partial sum.
-@examples[#:eval untyped-eval
-                 (flvector-sums
-                  (flvector 1.0 1e-16 1e-16 1e-16 1e-16 1e100 -1e100))]
-Compare the same example computed by direct summation:
-@interaction[#:eval untyped-eval
-                    (rest
-                     (reverse
-                      (foldl (λ (x xs) (cons (+ x (first xs)) xs))
-                             (list 0.0)
-                             '(1.0 1e-16 1e-16 1e-16 1e-16 1e100 -1e100))))]
-}
-
-@(close-eval untyped-eval)
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/math-matrix.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-matrix.scrbl
deleted file mode 100644
index 8d0f7dfea7..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/math-matrix.scrbl
+++ /dev/null
@@ -1,1084 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          racket/sandbox
-          (for-label racket/base racket/vector racket/match racket/unsafe/ops racket/string
-                     (except-in racket/list permutations) ; FIXME
-                     math plot
-                     (only-in typed/racket/base
-                              ann inst : λ: define: make-predicate -> case-> Nothing
-                              Flonum Real Boolean Any Integer Index Natural Exact-Positive-Integer
-                              Nonnegative-Real Sequenceof Fixnum Values Number Float-Complex
-                              All U List Vector Listof Vectorof Struct FlVector
-                              Symbol Output-Port))
-          "utils.rkt")
-
-@(define untyped-eval (make-untyped-math-eval))
-@interaction-eval[#:eval untyped-eval
-                         (require racket/match
-                                  racket/vector
-                                  racket/string
-                                  racket/sequence
-                                  racket/list)]
-
-@(define typed-eval (make-math-eval))
-@interaction-eval[#:eval typed-eval
-                         (require racket/match
-                                  racket/vector
-                                  racket/string
-                                  racket/sequence
-                                  racket/list)]
-
-@title[#:tag "matrices" #:style 'toc]{Matrices and Linear Algebra}
-@(author-jens-axel)
-@(author-neil)
-
-@bold{Performance Warning:} Matrix values are arrays, as exported by @racketmodname[math/array].
-The same performance warning applies: operations are currently 25-50 times slower in untyped Racket
-than in Typed Racket, due to the overhead of checking higher-order contracts. We are working on it.
-
-For now, if you need speed, use the @racketmodname[typed/racket] language.
-
-@defmodule[math/matrix]
-
-Like all of @racketmodname[math], @racketmodname[math/matrix] is a work in progress.
-Most of the basic algorithms are implemented, but some are still in planning.
-Possibly the most useful unimplemented algorithms are
-@itemlist[@item{LUP decomposition (currently, LU decomposition is implemented, in @racket[matrix-lu])}
-          @item{@racket[matrix-solve] for triangular matrices}
-          @item{Singular value decomposition (SVD)}
-          @item{Eigendecomposition}
-          @item{Decomposition-based solvers}
-          @item{Pseudoinverse and least-squares solving}]
-All of these are planned for the next Racket release, as well as fast flonum-specific matrix
-operations and LAPACK integration.
-
-@local-table-of-contents[]
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "matrix:intro"]{Introduction}
-
-From the point of view of the functions in @racketmodname[math/matrix], a @deftech{matrix} is an
-@racket[Array] with two axes and at least one entry, or an array for which @racket[matrix?] returns
-@racket[#t].
-
-Technically, a matrix's entries may be any type, and some fully polymorphic matrix functions such as
-@racket[matrix-row] and @racket[matrix-map] operate on any kind of matrix.
-Other functions, such as @racket[matrix+], require their matrix arguments to contain numeric values.
-
-@subsection[#:tag "matrix:function-types"]{Function Types}
-
-The documentation for @racketmodname[math/matrix] functions use the type @racket[Matrix], a synonym
-of @racket[Array], when the function either requires that an argument is a @tech{matrix} or ensures
-that a return value is a matrix.
-
-Most functions that implement matrix algorithms are documented as accepting @racket[(Matrix Number)]
-values. This includes @racket[(Matrix Real)], which is a subtype. Most of these functions have a more
-precise type than is documented. For example, @racket[matrix-conjugate] has the type
-@racketblock[(case-> ((Matrix Flonum)        -> (Matrix Flonum))
-                     ((Matrix Real)          -> (Matrix Real))
-                     ((Matrix Float-Complex) -> (Matrix Float-Complex))
-                     ((Matrix Number)        -> (Matrix Number)))]
-but is documented as having the type @racket[((Matrix Number) -> (Matrix Number))].
-
-Precise function types allow Typed Racket to prove more facts about @racketmodname[math/matrix]
-client programs. In particular, it is usually easy for it to prove that operations on real
-matrices return real matrices:
-@interaction[#:eval typed-eval
-                    (matrix-conjugate (matrix [[1 2 3] [4 5 6]]))]
-and that operations on inexact matrices return inexact matrices:
-@interaction[#:eval typed-eval
-                    (matrix-conjugate (matrix [[1.0+2.0i 2.0+3.0i 3.0+4.0i]
-                                               [4.0+5.0i 5.0+6.0i 6.0+7.0i]]))]
-
-@subsection[#:tag "matrix:failure"]{Failure Arguments}
-
-In many matrix operations, such as inversion, failure is easy to detect during computation, but
-is just as expensive to detect ahead of time as the operation itself.
-In these cases, the functions implementing the operations accept an optional @deftech{failure thunk},
-or a zero-argument function that returns the result of the operation in case of failure.
-
-For example, the (simplified) type of @racket[matrix-inverse] is
-@racketblock[(All (F) (case-> ((Matrix Number)        -> (Matrix Number))
-                              ((Matrix Number) (-> F) -> (U F (Matrix Number)))))]
-Thus, if a failure thunk is given, the call site is required to check for return values of type
-@racket[F] explicitly.
-
-Default failure thunks usually raise an error, and have the type @racket[(-> Nothing)].
-For such failure thunks, @racket[(U F (Matrix Number))] is equivalent to @racket[(Matrix Number)],
-because @racket[Nothing] is part of every type. (In Racket, any expression may raise an error.)
-Thus, in this case, no explicit test for values of type @racket[F] is necessary (though of course they
-may be caught using @racket[with-handlers] or similar).
-
-@subsection[#:tag "matrix:broadcasting"]{Broadcasting}
-
-Unlike array operations, pointwise matrix operations @bold{do not} @tech{broadcast} their arguments
-when given matrices with different axis lengths:
-@interaction[#:eval typed-eval
-                    (matrix+ (identity-matrix 2) (matrix [[10]]))]
-If you need broadcasting, use array operations:
-@interaction[#:eval typed-eval
-                    (array+ (identity-matrix 2) (matrix [[10]]))]
-
-@subsection{Strictness}
-
-Functions exported by @racketmodname[math/matrix] return @tech{strict} or @tech{nonstrict} arrays
-based on the value of the @racket[array-strictness] parameter.
-See @secref{array:nonstrict} for details.
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "matrix:types"]{Types, Predicates and Accessors}
-
-@defform[(Matrix A)]{
-Equivalent to @racket[(Array A)], but used for values @racket[M] for which @racket[(matrix? M)] is
-@racket[#t].
-}
-
-@defproc[(matrix? [arr (Array A)]) Boolean]{
-Returns @racket[#t] when @racket[arr] is a @tech{matrix}: a nonempty array with exactly two axes.
-@examples[#:eval typed-eval
-                 (matrix? (array 10))
-                 (matrix? (array #[1 2 3]))
-                 (matrix? (make-array #(5 0) 0))
-                 (matrix? (array #[#[1 0] #[0 1]]))]
-}
-
-@defproc[(row-matrix? [arr (Array A)]) Boolean]{
-Returns @racket[#t] when @racket[arr] is a @deftech{row matrix}:
-a @tech{matrix} with exactly one row.
-}
-
-@defproc[(col-matrix? [arr (Array A)]) Boolean]{
-Returns @racket[#t] when @racket[arr] is a @deftech{column matrix}:
-a @tech{matrix} with exactly one column.
-}
-
-@defproc[(square-matrix? [arr (Array A)]) Boolean]{
-Returns @racket[#t] when @racket[arr] is a @tech{matrix} with the same number of rows and columns.
-}
-
-@defproc[(matrix-shape [M (Matrix A)]) (Values Index Index)]{
-Returns @racket[M]'s row and column count, respectively.
-Raises an error if @racket[(matrix? M)] is @racket[#f].
-@examples[#:eval typed-eval
-                 (matrix-shape (row-matrix [1 2 3]))
-                 (matrix-shape (col-matrix [1 2 3]))
-                 (matrix-shape (identity-matrix 3))]
-}
-
-@defproc[(matrix-num-rows [M (Matrix A)]) Index]{
-Returns the number of rows in @racket[M], or the first value of @racket[(matrix-shape M)].
-}
-
-@defproc[(matrix-num-cols [M (Matrix A)]) Index]{
-Returns the number of columns in @racket[M], or the second value of @racket[(matrix-shape M)].
-}
-
-@defproc[(square-matrix-size [M (Matrix A)]) Index]{
-Returns the number of rows/columns in @racket[M].
-Raises an error if @racket[(square-matrix? M)] is @racket[#f].
-@examples[#:eval typed-eval
-                 (square-matrix-size (identity-matrix 3))
-                 (square-matrix-size (row-matrix [1 2 3]))]
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "matrix:construction"]{Construction}
-
-@defform/subs[(matrix [[expr ...+] ...+] maybe-type-ann)
-              [(maybe-type-ann (code:line) (code:line : type))]]{
-Like the @racket[array] form for creating arrays, but does not require @racket[#[...]] to delimit
-nested rows, and the result is constrained to be a @racket[matrix?].
-@examples[#:eval typed-eval
-                 (matrix [[1 2 3] [4 5 6]])
-                 (matrix [[1 2 3] [4 5 6]] : Number)
-                 (matrix [[]])]
-}
-
-@defform/subs[(row-matrix [expr ...+] maybe-type-ann)
-              [(maybe-type-ann (code:line) (code:line : type))]]{
-Like @racket[matrix], but returns a @tech{row matrix}.
-@examples[#:eval typed-eval
-                 (row-matrix [1 2 3])
-                 (row-matrix [1 2 3] : Number)
-                 (row-matrix [])]
-}
-
-@defform/subs[(col-matrix [expr ...+] maybe-type-ann)
-              [(maybe-type-ann (code:line) (code:line : type))]]{
-Like @racket[matrix], but returns a @tech{column matrix}.
-@examples[#:eval typed-eval
-                 (col-matrix [1 2 3])
-                 (col-matrix [1 2 3] : Number)
-                 (col-matrix [])]
-}
-
-@defproc[(identity-matrix [n Integer] [one A 1] [zero A 0]) (Matrix A)]{
-Returns an @racket[n]×@racket[n] identity matrix, which has the value @racket[one] on the diagonal
-and @racket[zero] everywhere else. The height/width @racket[n] must be positive.
-@examples[#:eval typed-eval
-                 (identity-matrix 3)
-                 (identity-matrix 4 1.0+0.0i 0.0+0.0i)]
-}
-
-@defproc[(make-matrix [m Integer] [n Integer] [x A]) (Matrix A)]{
-Returns an @racket[m]×@racket[n] matrix filled with the value @racket[x];
-both @racket[m] and @racket[n] must be positive.
-Analogous to @racket[make-array] (and defined in terms of it).
-}
-
-@defproc[(build-matrix [m Integer] [n Integer] [proc (Index Index -> A)]) (Matrix A)]{
-Returns an @racket[m]×@racket[n] matrix with entries returned by @racket[proc];
-both @racket[m] and @racket[n] must be positive.
-Analogous to @racket[build-array] (and defined in terms of it).
-}
-
-@defproc[(diagonal-matrix [xs (Listof A)] [zero A 0]) (Matrix A)]{
-Returns a matrix with @racket[xs] along the diagonal and @racket[zero] everywhere else.
-The length of @racket[xs] must be positive.
-@examples[#:eval typed-eval
-                 (diagonal-matrix '(1 2 3 4 5 6))
-                 (diagonal-matrix '(1.0 2.0 3.0 4.0 5.0) 0.0)]
-}
-
-@define[block-diagonal-url]{http://en.wikipedia.org/wiki/Block_matrix#Block_diagonal_matrices}
-
-@defproc[(block-diagonal-matrix [Xs (Listof (Matrix A))] [zero A 0]) (Matrix A)]{
-@margin-note*{@hyperlink[block-diagonal-url]{Wikipedia: Block-diagonal matrices}}
-Returns a matrix with matrices @racket[Xs] along the diagonal and @racket[zero] everywhere else.
-The length of @racket[Xs] must be positive.
-@examples[#:eval typed-eval
-                 (block-diagonal-matrix (list (matrix [[6 7] [8 9]])
-                                              (diagonal-matrix '(7 5 7))
-                                              (col-matrix [1 2 3])
-                                              (row-matrix [4 5 6])))
-                 (block-diagonal-matrix (list (make-matrix 2 2 2.0+3.0i)
-                                              (make-matrix 2 2 5.0+7.0i))
-                                        0.0+0.0i)]
-}
-
-@define[vandermonde-url]{http://en.wikipedia.org/wiki/Vandermonde_matrix}
-
-@defproc[(vandermonde-matrix [xs (Listof Number)] [n Integer]) (Matrix Number)]{
-@margin-note*{@hyperlink[vandermonde-url]{Wikipedia: Vandermonde matrix}}
-Returns an @racket[m]×@racket[n] Vandermonde matrix, where @racket[m = (length xs)].
-@examples[#:eval typed-eval
-                 (vandermonde-matrix '(1 2 3 4) 5)
-                 (vandermonde-matrix '(5.2 3.4 2.0) 3)]
-Using a Vandermonde matrix to find a Lagrange polynomial (the polynomial of least degree that passes
-through a given set of points):
-@interaction[#:eval untyped-eval
-                    (define (lagrange-polynomial xs ys)
-                      (array->list (matrix-solve (vandermonde-matrix xs (length xs))
-                                                 (->col-matrix ys))))
-                    (define xs '(-3 0 3))
-                    (define ys '(13 3 6))
-                    (match-define (list c b a) (lagrange-polynomial xs ys))
-                    (plot (list (function (λ (x) (+ c (* b x) (* a x x))) -4 4)
-                                (points (map list xs ys))))]
-Note that the above example is in untyped Racket.
-
-This function is defined in terms of @racket[array-axis-expand].
-}
-
-@deftogether[(@defform[(for/matrix: m n maybe-fill (for:-clause ...) maybe-type-ann
-                         body ...+)]
-              @defform/subs[(for*/matrix: m n maybe-fill (for:-clause ...) maybe-type-ann
-                              body ...+)
-                            ([maybe-fill (code:line) (code:line #:fill fill)]
-                             [maybe-type-ann (code:line) (code:line : body-type)])
-                            #:contracts ([m Integer]
-                                         [n Integer]
-                                         [fill body-type])])]{
-Like @racket[for/array:] and @racket[for*/array:], but for matrices.
-The only material difference is that the shape @racket[m n] is required and must be positive.
-}
-
-@deftogether[(@defform[(for/matrix m n maybe-fill (for-clause ...)
-                         body ...+)]
-              @defform[(for*/matrix m n maybe-fill (for-clause ...)
-                         body ...+)])]{
-Untyped versions of the loop macros.
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "matrix:conversion"]{Conversion}
-
-@deftogether[(@defproc[(list->matrix [m Integer] [n Integer] [xs (Listof A)]) (Matrix A)]
-              @defproc[(matrix->list [M (Matrix A)]) (Listof A)])]{
-Convert a flat list to an @racket[m]×@racket[n] matrix and back;
-both @racket[m] and @racket[n] must be positive, and @racket[(* m n) = (length xs)].
-The entries in @racket[xs] are in row-major order.
-@examples[#:eval typed-eval
-                 (list->matrix 2 3 '(1 2 3 4 5 6))
-                 (matrix->list (matrix [[1 2] [3 4] [5 6]]))]
-}
-
-@deftogether[(@defproc[(vector->matrix [m Integer] [n Integer] [xs (Vectorof A)]) (Matrix A)]
-              @defproc[(matrix->vector [M (Matrix A)]) (Vectorof A)])]{
-Like @racket[list->matrix] and @racket[matrix->list], but for vectors.
-@examples[#:eval typed-eval
-                 (vector->matrix 2 3 #(1 2 3 4 5 6))
-                 (matrix->vector (matrix [[1 2] [3 4] [5 6]]))]
-}
-
-@deftogether[(@defproc[(->row-matrix [xs (U (Listof A) (Vectorof A) (Array A))]) (Matrix A)]
-              @defproc[(->col-matrix [xs (U (Listof A) (Vectorof A) (Array A))]) (Matrix A)])]{
-Convert a list, vector, or array into a row or column matrix.
-If @racket[xs] is an array, it must be nonempty and @bold{not} have more than one axis with length
-greater than @racket[1].
-@examples[#:eval typed-eval
-                 (->row-matrix '(1 2 3))
-                 (->row-matrix #(1 2 3))
-                 (->row-matrix (col-matrix [1 2 3]))
-                 (->col-matrix (array #[#[#[1]] #[#[2]] #[#[3]]]))
-                 (->col-matrix (matrix [[1 0] [0 1]]))]
-}
-
-@deftogether[(@defproc[(list*->matrix [xss (Listof (Listof A))]) (Matrix A)]
-              @defproc[(matrix->list* [M (Matrix A)]) (Listof (Listof A))])]{
-Convert a list of lists of entries into a matrix and back.
-@examples[#:eval typed-eval
-                 (list*->matrix '((1 2 3) (4 5 6)))
-                 (matrix->list* (matrix [[1 2 3] [4 5 6]]))]
-These functions are like @racket[list*->array] and @racket[array->list*], but use a fixed-depth
-(i.e. non-recursive) list type, and do not require a predicate to distinguish entries from rows.
-}
-
-@deftogether[(@defproc[(vector*->matrix [xss (Vectorof (Vectorof A))]) (Matrix A)]
-              @defproc[(matrix->vector* [M (Matrix A)]) (Vectorof (Vectorof A))])]{
-Like @racket[list*->matrix] and @racket[matrix*->list], but for vectors.
-@examples[#:eval typed-eval
-                 ((inst vector*->matrix Integer) #(#(1 2 3) #(4 5 6)))
-                 (matrix->vector* (matrix [[1 2 3] [4 5 6]]))]
-As in the first example, Typed Racket often needs help inferring the type @racket[A].
-}
-
-                                                                                  
-@;{==================================================================================================}
-
-
-@section[#:tag "matrix:arith"]{Entrywise Operations and Arithmetic}
-
-@deftogether[(@defproc[(matrix+ [M (Matrix Number)] [N (Matrix Number)] ...) (Matrix Number)]
-              @defproc[(matrix- [M (Matrix Number)] [N (Matrix Number)] ...) (Matrix Number)]
-              @defproc[(matrix* [M (Matrix Number)] [N (Matrix Number)] ...) (Matrix Number)])]{
-Matrix addition, subtraction and products respectively.
-
-For matrix addition and subtraction all matrices must have the same shape.
-
-For matrix product the number of columns of one matrix must equal the 
-number of rows in the following matrix.
-
-@examples[#:eval untyped-eval
-                 (define A (matrix ([1 2] 
-                                    [3 4])))
-                 (define B (matrix ([5 6] 
-                                    [7 8])))
-                 (define C (matrix ([ 9 10 11]
-                                    [12 13 14])))
-                 (matrix+ A B)
-                 (matrix- A B)
-                 (matrix* A C)]
-}
-
-@defproc[(matrix-expt [M (Matrix Number)] [n Integer]) (Matrix Number)]{
-Computes @racket[(matrix* M ...)] with @racket[n] arguments, but more efficiently.
-@racket[M] must be a @racket[square-matrix?] and @racket[n] must be nonnegative.
-@examples[#:eval untyped-eval
-                 ; The 100th (and 101th) Fibonacci number:
-                 (matrix* (matrix-expt (matrix [[1 1] [1 0]]) 100)
-                          (col-matrix [0 1]))
-                 (->col-matrix (list (fibonacci 100) (fibonacci 99)))]
-}
-
-@defproc[(matrix-scale [M (Matrix Number)] [z Number]) (Matrix Number)]{
-Computes the matrix @racket[zM], a matrix of the same shape as @racket[M] 
-where each entry in @racket[M] is multiplied with @racket[z].
-@examples[#:eval untyped-eval
-                 (matrix-scale (matrix [[1 2] [3 4]]) 2)]
-}
-
-@defproc*[([(matrix-map [f (A -> R)] [M (Matrix A)]) (Matrix R)]
-           [(matrix-map [f (A B Ts ... -> R)] [M0 (Matrix A)] [M1 (Matrix B)] [N (Matrix Ts)]
-                        ...)
-            (Matrix R)])]{
-Like @racket[array-map], but requires at least one matrix argument and never @tech{broadcasts}.
-@examples[#:eval untyped-eval
-                 (matrix-map sqr (matrix [[1 2] [3 4]]))
-                 (matrix-map  +  (matrix [[1 2] [3 4]])
-                                 (matrix [[5 6] [7 8]]))]
-}
-
-@defproc[(matrix-sum [Ms (Listof (Matrix Number))]) (Matrix Number)]{
-Like @racket[(apply matrix+ Ms)], but raises a runtime error when @racket[Ms] is empty.
-}
-
-@defproc[(matrix= [M0 (Matrix Number)] [M1 (Matrix Number)] [N (Matrix Number)] ...) Boolean]{
-Returns @racket[#t] when its arguments are the same size and are equal entrywise.
-
-See @racket[matrix-relative-error] and @racket[matrix-absolute-error] for equality testing that is
-tolerant to floating-point error.
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "matrix:poly"]{Polymorphic Operations}
-
-@defproc[(matrix-ref [M (Matrix A)] [i Integer] [j Integer]) A]{
-Returns the entry on row @racket[i] and column @racket[j].
-@examples[#:eval untyped-eval
-                 (define M (matrix ([1 2 3] [4 5 6])))
-                 (matrix-ref M 0 2)
-                 (matrix-ref M 1 2)]
-}
-
-@deftogether[(@defproc[(matrix-row [M (Matrix A)] [i Integer]) (Matrix A)]
-              @defproc[(matrix-col [M (Matrix A)] [j Integer]) (Matrix A)])]{
-Returns the @racket[i]th row or @racket[j]th column as a matrix.
-@examples[#:eval untyped-eval
-                 (define M (matrix ([1 2 3] [4 5 6])))
-                 (matrix-row M 1)
-                 (matrix-col M 0)]
-}
-
-@defproc[(submatrix [M (Matrix A)]
-                    [is (U Slice (Sequenceof Integer))]
-                    [js (U Slice (Sequenceof Integer))])
-         (Array A)]{
-Returns a submatrix or subarray of @racket[M], where @racket[is] and @racket[js] specify
-respectively the rows and columns to keep. Like @racket[array-slice-ref], but constrained so the
-result has exactly two axes.
-@examples[#:eval typed-eval
-                 (submatrix (identity-matrix 5) (:: 1 #f 2) (::))
-                 (submatrix (identity-matrix 5) '() '(1 2 4))]
-Note that @racket[submatrix] may return an empty array, which is not a @tech{matrix}.
-}
-
-@defproc[(matrix-diagonal [M (Matrix A)]) (Array A)]{
-Returns array of the entries on the diagonal of @racket[M].
-@examples[#:eval untyped-eval
-                 (matrix-diagonal
-                  (matrix ([1 2 3] [4 5 6] [7 8 9])))]
-}
-
-@deftogether[(@defproc[(matrix-upper-triangle [M (Matrix A)] [zero A 0]) (Matrix A)]
-              @defproc[(matrix-lower-triangle [M (Matrix A)] [zero A 0]) (Matrix A)])]{
-The function @racket[matrix-upper-triangle] returns an upper
-triangular matrix (entries below the diagonal have the value @racket[zero]) with
-entries from the given matrix. Likewise the function 
-@racket[matrix-lower-triangle] returns a lower triangular
-matrix.
-@examples[#:eval typed-eval
-                 (define M (array+ (array 1) (axis-index-array #(5 7) 1)))
-                 M
-                 (matrix-upper-triangle M)
-                 (matrix-lower-triangle M)
-                 (matrix-lower-triangle (array->flarray M) 0.0)]
-}
-
-@deftogether[(@defproc[(matrix-rows [M (Matrix A)]) (Listof (Matrix A))]
-              @defproc[(matrix-cols [M (Matrix A)]) (Listof (Matrix A))])]{
-The functions respectively returns a list of the rows or columns
-of the matrix.
-@examples[#:eval untyped-eval
-                 (define M (matrix ([1 2 3] [4 5 6])))
-                 (matrix-rows M)
-                 (matrix-cols M)]
-}
-
-@deftogether[(@defproc[(matrix-augment [Ms (Listof (Matrix A))]) (Matrix A)]
-              @defproc[(matrix-stack [Ms (Listof (Matrix A))]) (Matrix A)])]{
-The function @racket[matrix-augment] returns a matrix whose columns are
-the columns of the matrices in @racket[Ms]. The matrices 
-in list must have the same number of rows.
-
-The function @racket[matrix-stack] returns a matrix whose rows are
-the rows of the matrices in @racket[Ms]. The matrices 
-in list must have the same number of columns.
-@examples[#:eval untyped-eval
-                 (define M0 (matrix ([1 1] [1 1])))
-                 (define M1 (matrix ([2 2] [2 2])))
-                 (define M2 (matrix ([3 3] [3 3])))
-                 (matrix-augment (list M0 M1 M2))
-                 (matrix-stack (list M0 M1 M2))]
-}
-
-@deftogether[
-(@defproc*[([(matrix-map-rows 
-              [f ((Matrix A) -> (Matrix B))] [M (Matrix A)]) (Matrix B)]
-            [(matrix-map-rows
-              [f ((Matrix A) -> (U #f (Matrix B)))] [M (Matrix A)] [fail (-> F)])
-             (U F (Matrix B))])])]{
-The two-argument case applies the function @racket[f] to each row of @racket[M].
-If the rows are called @racket[r0], @racket[r1], ..., the result matrix has the rows
-@racket[(f r0)], @racket[(f r1)], ....
-
-@examples[#:eval untyped-eval
-                 (define M (matrix ([1 2 3] [4 5 6] [7 8 9] [10 11 12])))
-                 (define (double-row r) (matrix-scale r 2))
-                 (matrix-map-rows double-row M)]
-
-In the three argument case, if @racket[f] returns @racket[#f], the result of @racket[(fail)] is
-returned:
-@interaction[#:eval typed-eval
-                    (define Z (make-matrix 4 4 0))
-                    Z
-                    (matrix-map-rows (λ: ([r : (Matrix Real)])
-                                       (matrix-normalize r 2 (λ () #f)))
-                                     Z
-                                     (λ () 'FAILURE))]
-}
-
-@deftogether[
-(@defproc*[([(matrix-map-cols 
-              [f ((Matrix A) -> (Matrix B))] [M (Matrix A)]) (Matrix B)]
-            [(matrix-map-cols
-              [f ((Matrix A) -> (U #f (Matrix B)))] [M (Matrix A)] [fail (-> F)])
-             (U F (Matrix B))])])]{
-Like @racket[matrix-map-rows], but maps @racket[f] over columns.
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "matrix:basic"]{Basic Operations}
-
-@defproc[(matrix-conjugate [M (Matrix Number)]) (Matrix Number)]{
-Returns a matrix where each entry of the given matrix is conjugated.
-@examples[#:eval untyped-eval
-                 (matrix-conjugate (matrix ([1 +i] [-1 2+i])))]
-}
-
-@deftogether[(@defproc[(matrix-transpose [M (Matrix A)]) (Matrix A)]
-              @defproc[(matrix-hermitian [M (Matrix Number)]) (Matrix Number)])]{
-@margin-note*{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Transpose"]{Transpose},
-                         @hyperlink["http://en.wikipedia.org/wiki/Hermitian_matrix"]{Hermitian}}
-Returns the transpose or the hermitian of the matrix. 
-The hermitian of a matrix is the conjugate of the transposed matrix.
-For a real matrix these operations return the the same result.
-@examples[#:eval untyped-eval
-                 (matrix-transpose (matrix ([1 1] [2 2] [3 3])))
-                 (matrix-hermitian (matrix ([1 +i] [2 +2i] [3 +3i])))]
-}
-
-@defproc[(matrix-trace [M (Matrix Number)]) Number]{
-@margin-note*{@hyperlink["http://en.wikipedia.org/wiki/Trace_(linear_algebra)"]{Wikipedia: Trace}}
-Returns the trace of the square matrix. The trace of matrix is the 
-the sum of the diagonal entries. 
-@examples[#:eval untyped-eval
-                 (matrix-trace (matrix ([1 2] [3 4])))]
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "matrix:inner"]{Inner Product Space Operations}
-
-The following functions treat matrices as vectors in an inner product space.
-It often makes most sense to use these vector-space functions only for
-@tech[#:key "row matrix"]{row matrices} and @tech[#:key "column matrix"]{column matrices}, which are
-essentially vectors as we normally think of them.
-There are exceptions, however, such as the fact that the Frobenius or Euclidean norm (implemented by
-@racket[matrix-2norm]) can be used to measure error between matrices in a way that meets certain
-reasonable criteria (specifically, it is submultiplicative).
-
-See @secref{matrix:op-norm} for similar functions (e.g. norms and angles) defined by considering
-matrices as operators between inner product spaces consisting of column matrices.
-
-@deftogether[(@defproc[(matrix-1norm [M (Matrix Number)]) Nonnegative-Real]
-              @defproc[(matrix-2norm [M (Matrix Number)]) Nonnegative-Real]
-              @defproc[(matrix-inf-norm [M (Matrix Number)]) Nonnegative-Real]
-              @defproc[(matrix-norm [M (Matrix Number)] [p Real 2]) Nonnegative-Real])]{
-@margin-note*{@hyperlink["http://en.wikipedia.org/wiki/Norm_(mathematics)"]{Wikipedia: Norm}}
-Respectively compute the L@subscript{1} norm, L@subscript{2} norm, L@subscript{∞}, and
-L@subscript{p} norm.
-
-The L@subscript{1} norm is also known under the names Manhattan or taxicab norm.
-The L@subscript{1} norm of a matrix is the sum of magnitudes of the entries in the matrix.
-
-The L@subscript{2} norm is also known under the names Euclidean or Frobenius norm.
-The L@subscript{2} norm of a matrix is the square root of the sum of squares of 
-magnitudes of the entries in the matrix.
-
-The L@subscript{∞} norm is also known as the maximum or infinity norm.
-The L@subscript{∞} norm computes the maximum magnitude of the entries in the matrix.
-
-For @racket[p >= 1], @racket[matrix-norm] computes the L@subscript{@racket[p]} norm: 
-the @racket[p]th root of the sum of all entry magnitudes to the @racket[p]th power.
-@;{MathJax would be nice to have in Scribble...}
-@examples[#:eval untyped-eval
-                 (matrix-1norm    (col-matrix [1 2]))
-                 (matrix-2norm    (col-matrix [1 2]))
-                 (matrix-inf-norm (col-matrix [1 2]))
-                 (matrix-norm     (col-matrix [1 2]) 3)
-                 (matrix-norm     (col-matrix [1 2]) +inf.0)]
-}
-
-@defproc*[([(matrix-dot [M (Matrix Number)]) Nonnegative-Real]
-           [(matrix-dot [M (Matrix Number)] [N (Matrix Number)]) Number])]{
-
-The call @racket[(matrix-dot M N)] computes the Frobenius inner product of the 
-two matrices with the same shape.
-In other words the sum of @racket[(* a (conjugate b))] is computed where 
-@racket[a] runs over the entries in @racket[M] and @racket[b] runs over
-the corresponding entries in @racket[N].
-
-The call @racket[(matrix-dot M)] computes @racket[(matrix-dot M M)] efficiently.
-@examples[#:eval untyped-eval
-                 (matrix-dot (col-matrix [1 2]) (col-matrix [3 4]))
-                 (+ (* 1 3) (* 2 4))]
-}
-
-@defproc[(matrix-cos-angle [M (Matrix Number)] [N (Matrix Number)]) Number]{
-Returns the cosine of the angle between two matrices w.r.t. the inner produce space induced by
-the Frobenius inner product. That is it returns 
-
-@racket[(/ (matrix-dot M N) (* (matrix-2norm M) (matrix-2norm N)))]
-
-@examples[#:eval untyped-eval
-                 (define M (col-matrix [1 0]))
-                 (define N (col-matrix [0 1]))
-                 (matrix-cos-angle M N)
-                 (matrix-cos-angle M (matrix+ M N))]
-}
-
-@defproc[(matrix-angle [M (Matrix Number)] [N (Matrix Number)]) Number]{
-Equivalent to @racket[(acos (matrix-cos-angle M N))].
-@examples[#:eval untyped-eval
-                 (require (only-in math/base radians->degrees))
-                 (define M (col-matrix [1 0]))
-                 (define N (col-matrix [0 1]))
-                 (radians->degrees (matrix-angle M N))
-                 (radians->degrees (matrix-angle M (matrix+ M N)))]
-}
-
-@defproc[(matrix-normalize [M (Matrix Number)] [p Real 2] [fail (-> F) (λ () (error ...))])
-         (U F (Matrix Number))]{
-Normalizes @racket[M] with respect to the L@subscript{@racket[p]} norm.
-@examples[#:eval typed-eval
-                 (matrix-normalize (col-matrix [1 1]))
-                 (matrix-normalize (col-matrix [1 1]) 1)
-                 (matrix-normalize (col-matrix [1 1]) +inf.0)]
-The result of applying the @tech{failure thunk} @racket[fail] is returned if @racket[M]'s norm is
-zero.
-}
-
-@deftogether[(@defproc[(matrix-normalize-rows [M (Matrix Number)]
-                                              [p Real 2]
-                                              [fail (-> F) (λ () (error ...))]) (Matrix Number)]
-              @defproc[(matrix-normalize-cols [M (Matrix Number)]
-                                              [p Real 2]
-                                              [fail (-> F) (λ () (error ...))]) (Matrix Number)])]{
-As @racket[matrix-normalize] but each row or column is normalized separately.
-The result is a matrix with unit vectors as rows or columns.
-@examples[#:eval typed-eval
-                 (matrix-normalize-rows (matrix [[1 2] [2 4]]))
-                 (matrix-normalize-cols (matrix [[1 2] [2 4]]))]
-The result of applying the @tech{failure thunk} @racket[fail] is returned if the norm of any row
-or column in @racket[M] is zero.
-}
-
-@deftogether[(@defproc[(matrix-rows-orthogonal? [M (Matrix Number)]
-                                                [eps Real (* 10 epsilon.0)])
-                       Boolean]
-              @defproc[(matrix-cols-orthogonal? [M (Matrix Number)]
-                                                [eps Real (* 10 epsilon.0)])
-                       Boolean])]{
-Returns @racket[#t] if the rows or columns of @racket[M] 
-are very close of being orthogonal (by default a few epsilons). 
-@examples[#:eval untyped-eval
-                 (matrix-rows-orthogonal? (matrix [[1 1] [-1 1]]))
-                 (matrix-cols-orthogonal? (matrix [[1 1] [-1 1]]))]
-}
-
-
-@;{==================================================================================================}
-
-
-@section[#:tag "matrix:solve"]{Solving Systems of Equations}
-
-@defproc[(matrix-solve [M (Matrix Number)] [B (Matrix Number)] [fail (-> F) (λ () (error ...))])
-         (U F (Matrix Number))]{
-Returns the matrix @racket[X] for which @racket[(matrix* M X)] is @racket[B].
-@racket[M] and @racket[B] must have the same number of rows.
-
-It is typical for @racket[B] (and thus @racket[X]) to be a @tech{column matrix}, but not required.
-If @racket[B] is not a column matrix, @racket[matrix-solve] solves for all the columns in @racket[B]
-simultaneously.
-
-@examples[#:eval typed-eval
-                 (define M (matrix [[7 5] [3 -2]]))
-                 (define B0 (col-matrix [3 22]))
-                 (define B1 (col-matrix [19 4]))
-                 (matrix-solve M B0)
-                 (matrix* M (col-matrix [4 -5]))
-                 (matrix-solve M B1)
-                 (matrix-cols (matrix-solve M (matrix-augment (list B0 B1))))]
-
-@racket[matrix-solve] does not solve overconstrained or underconstrained systems, meaning that
-@racket[M] must be invertible.
-If @racket[M] is not invertible, the result of applying the @tech{failure thunk} @racket[fail] is
-returned.
-
-@racket[matrix-solve] is implemented using @racket[matrix-gauss-elim] to preserve exactness in its
-output, with partial pivoting for greater numerical stability when @racket[M] is not exact.
-
-See @racket[vandermonde-matrix] for an example that uses @racket[matrix-solve] to compute Legendre
-polynomials.
-}
-
-@define[inverse-url]{http://en.wikipedia.org/wiki/Invertible_matrix}
-@defproc[(matrix-inverse [M (Matrix Number)] [fail (-> F) (λ () (error ...))]) (U F (Matrix Number))]{
-@margin-note*{@hyperlink[inverse-url]{Wikipedia: Invertible Matrix}}
-Returns the inverse of @racket[M] if it exists; otherwise returns the result of applying the
-@tech{failure thunk} @racket[fail].
-@examples[#:eval typed-eval
-                 (matrix-inverse (identity-matrix 3))
-                 (matrix-inverse (matrix [[7 5] [3 -2]]))
-                 (matrix-inverse (matrix [[1 2] [10 20]]))
-                 (matrix-inverse (matrix [[1 2] [10 20]]) (λ () #f))]
-}
-
-@defproc[(matrix-invertible? [M (Matrix Number)]) Boolean]{
-Returns @racket[#t] when @racket[M] is a @racket[square-matrix?] and @racket[(matrix-determinant M)]
-is nonzero.
-}
-
-@defproc[(matrix-determinant [M (Matrix Number)]) Number]{
-@margin-note*{@hyperlink["http://en.wikipedia.org/wiki/Determinant"]{Wikipedia: Determinant}}
-Returns the determinant of @racket[M], which must be a @racket[square-matrix?].
-@examples[#:eval typed-eval
-                 (matrix-determinant (diagonal-matrix '(1 2 3 4)))
-                 (* 1 2 3 4)
-                 (matrix-determinant (matrix [[1 2] [10 20]]))
-                 (matrix-determinant (col-matrix [1 2]))]
-}
-
-                                                                                  
-@;{==================================================================================================}
-
-
-@section[#:tag "matrix:row-alg"]{Row-Based Algorithms}
-
-@define[gauss-url]{http://en.wikipedia.org/wiki/Gaussian_elimination}
-@define[gauss-jordan-url]{http://en.wikipedia.org/wiki/Gauss%E2%80%93Jordan_elimination}
-
-@defproc[(matrix-gauss-elim [M (Matrix Number)]
-                            [jordan? Any #f]
-                            [unitize-pivot? Any #f]
-                            [pivoting (U 'first 'partial) 'partial])
-         (Values (Matrix Number) (Listof Index))]{
-@margin-note*{Wikipedia: @hyperlink[gauss-url]{Gaussian elimination},
-                         @hyperlink[gauss-jordan-url]{Gauss-Jordan elimination}}
-Implements Gaussian elimination or Gauss-Jordan elimination.
-
-If @racket[jordan?] is true, row operations are done both above and below the pivot.
-If @racket[unitize-pivot?] is true, the pivot's row is scaled so that the pivot value is @racket[1].
-When both are true, the algorithm is called Gauss-Jordan elimination, and the result matrix is in
-@italic{reduced} row echelon form.
-
-If @racket[pivoting] is @racket['first], the first nonzero entry in the current column is used as the
-pivot. If @racket[pivoting] is @racket['partial], the largest-magnitude nonzero entry is used, which
-improves numerical stability on average when @racket[M] contains inexact entries.
-
-The first return value is the result of Gaussian elimination.
-
-The second return value is a list of indexes of columns that did not have a nonzero pivot.
-
-See @racket[matrix-row-echelon] for examples.
-}
-
-@define[row-echelon-url]{http://en.wikipedia.org/wiki/Row_echelon_form}
-
-@defproc[(matrix-row-echelon [M (Matrix Number)]
-                             [jordan? Any #f]
-                             [unitize-pivot? Any #f]
-                             [pivoting (U 'first 'partial) 'partial])
-         (Matrix Number)]{
-@margin-note*{@hyperlink[row-echelon-url]{Wikipedia: Row echelon form}}
-Like @racket[matrix-gauss-elim], but returns only the result of Gaussian elimination.
-@examples[#:eval typed-eval
-                 (define M (matrix [[2 1 -1] [-3 -1 2] [-2 1 2]]))
-                 (matrix-row-echelon M)
-                 (matrix-row-echelon M #t)
-                 (matrix-identity? (matrix-row-echelon M #t #t))]
-The last example shows that @racket[M] is invertible.
-
-Using @racket[matrix-row-echelon] to solve a system of linear equations (without checking for
-failure):
-@interaction[#:eval typed-eval
-                    (define B (col-matrix [8 -11 -3]))
-                    (define MB (matrix-augment (list M B)))
-                    (matrix-col (matrix-row-echelon MB #t #t) 3)
-                    (matrix-solve M B)]
-
-Using @racket[matrix-row-echelon] to invert a matrix (also without checking for failure):
-@interaction[#:eval typed-eval
-                    (define MI (matrix-augment (list M (identity-matrix 3))))
-                    (submatrix (matrix-row-echelon MI  #t #t) (::) (:: 3 #f))
-                    (matrix-inverse M)]
-}
-
-@define[lu-url]{http://en.wikipedia.org/wiki/LU_decomposition}
-@defproc[(matrix-lu [M (Matrix Number)] [fail (-> F) (λ () (error ...))])
-         (Values (U F (Matrix Number)) (Matrix Number))]{
-@margin-note*{@hyperlink[lu-url]{Wikipedia: LU decomposition}}
-Returns the LU decomposition of @racket[M] (which must be a @racket[square-matrix?]) if one exists.
-An LU decomposition exists if @racket[M] can be put in row-echelon form without swapping rows.
-
-Because @racket[matrix-lu] returns a @italic{unit} lower-triangular matrix (i.e. a lower-triangular
-matrix with only ones on the diagonal), the decomposition is unique if it exists.
-
-@examples[#:eval typed-eval
-                 (define-values (L U)
-                   (matrix-lu (matrix [[4 3] [6 3]])))
-                 (values L U)
-                 (matrix* L U)]
-
-If @racket[M] does not have an LU decomposition, the first result is the result of applying the
-@tech{failure thunk} @racket[fail], and the second result is the original argument @racket[M]:
-@interaction[#:eval typed-eval
-                    (matrix-lu (matrix [[0 1] [1 1]]))
-                    (matrix-lu (matrix [[0 1] [1 1]]) (λ () #f))]
-}
-
-                                                                                  
-@;{==================================================================================================}
-
-
-@section[#:tag "matrix:ortho-alg"]{Orthogonal Algorithms}
-
-@define[gram-schmidt-url]{http://en.wikipedia.org/wiki/Gram%E2%80%93Schmidt_process}
-@define[reortho-pdf]{http://www.cerfacs.fr/algor/reports/2002/TR_PA_02_33.pdf}
-
-@defproc[(matrix-gram-schmidt [M (Matrix Number)] [normalize? Any #f] [start-col Integer 0])
-         (Array Number)]{
-@margin-note*{@hyperlink[gram-schmidt-url]{Wikipedia: Gram-Schmidt process}}
-Returns an array whose columns are orthogonal and span the same subspace as @racket[M]'s columns.
-The number of columns in the result is the rank of @racket[M].
-If @racket[normalize?] is true, the columns are also normalized.
-
-@examples[#:eval typed-eval
-                 (define M 
-                   (matrix [[12 -51   4]
-                            [ 6 167 -68]
-                            [-4  24 -41]]))
-                 (matrix-gram-schmidt M)
-                 (matrix-gram-schmidt M #t)
-                 (matrix-cols-orthogonal? (matrix-gram-schmidt M))
-                 (matrix-orthonormal? (matrix-gram-schmidt M #t))]
-
-Examples with rank-deficient matrices:
-@interaction[#:eval typed-eval
-                    (matrix-gram-schmidt (matrix [[ 1 -2 1]
-                                                  [-2  4 9]
-                                                  [ 3 -6 7]]))
-                    (matrix-gram-schmidt (make-matrix 3 3 0))]
-
-When @racket[start-col] is positive, the Gram-Schmidt process is begun on column @racket[start-col]
-(but still using the previous columns to orthogonalize the remaining columns).
-This feature is generally not directly useful, but is used in the implementation of
-@racket[matrix-basis-extension].
-
-@margin-note*{* @bold{On the round-off error analysis of the Gram-Schmidt algorithm with
-                      reorthogonalization.},
-              Luc Giraud, Julien Langou and Miroslav Rozloznik. 2002. @hyperlink[reortho-pdf]{(PDF)}}
-While Gram-Schmidt with inexact matrices is known to be unstable, using it twice tends to remove
-instabilities:*
-@interaction[#:eval typed-eval
-                    (define M (matrix [[0.70000 0.70711]
-                                       [0.70001 0.70711]]))
-                    (matrix-orthonormal?
-                     (matrix-gram-schmidt M #t))
-                    (matrix-orthonormal?
-                     (matrix-gram-schmidt (matrix-gram-schmidt M) #t))]
-}
-
-@defproc[(matrix-basis-extension [M (Matrix Number)]) (Array Number)]{
-Returns additional orthogonal columns which, if augmented with @racket[M], would result in an
-orthogonal matrix of full rank. If @racket[M]'s columns are normalized, the result's columns are
-normalized.
-}
-
-@define[qr-url]{http://en.wikipedia.org/wiki/QR_decomposition}
-
-@defproc*[([(matrix-qr [M (Matrix Number)])  (Values (Matrix Number) (Matrix Number))]
-           [(matrix-qr [M (Matrix Number)] [full? Any]) (Values (Matrix Number) (Matrix Number))])]{
-@margin-note*{@hyperlink["http://en.wikipedia.org/wiki/QR_decomposition"]{Wikipedia: QR decomposition}}
-Computes a QR-decomposition of the matrix @racket[M]. The values returned are
-the matrices @racket[Q] and @racket[R]. If @racket[full?] is @racket[#f], then
-a reduced decomposition is returned, otherwise a full decomposition is returned.
-
-@margin-note*{An @italic{orthonormal} matrix has columns which are orthoginal, unit vectors.}
-The (full) decomposition of a square matrix consists of two matrices: 
-a orthogonal matrix @racket[Q] and an upper triangular matrix @racket[R], 
-such that @racket[QR = M]. 
-
-For tall non-square matrices @racket[R], the triangular part of the full decomposition,
-contains zeros below the diagonal. The reduced decomposition leaves the zeros out.
-See the Wikipedia entry on @hyperlink[qr-url]{QR decomposition}
-for more details.
-
-@examples[#:eval typed-eval
-                 (define M
-                   (matrix [[12 -51   4]
-                            [ 6 167 -68]
-                            [-4  24 -41]]))
-                 (define-values (Q R) (matrix-qr M))
-                 (values Q R)
-                 (matrix= M (matrix* Q R))]
-
-The difference between full and reduced decompositions:
-@interaction[#:eval typed-eval
-                    (define M
-                      (matrix [[12 -51]
-                               [ 6 167]
-                               [-4  24]]))
-                    (define-values (Q1 R1) (matrix-qr M #f))
-                    (define-values (Q2 R2) (matrix-qr M #t))
-                    (values Q1 R1)
-                    (values Q2 R2)
-                    (matrix= M (matrix* Q1 R1))
-                    (matrix= M (matrix* Q2 R2))]
-
-The decomposition @racket[M = QR] is useful for solving the equation @racket[Mx=v]. 
-Since the inverse of Q is simply the transpose of Q, 
-  @racket[Mx=v  <=>  QRx=v  <=>  Rx = Q^T v].
-And since @racket[R] is upper triangular, the system can be solved by back substitution.
-
-The algorithm used is Gram-Schmidt with reorthogonalization.
-}
-
-
-@;{==================================================================================================}
-
-
-@define[op-norm-url]{http://en.wikipedia.org/wiki/Matrix_norm#Induced_norm}
-
-@section[#:tag "matrix:op-norm"]{Operator Norms and Comparing Matrices}
-
-@secref{matrix:inner} describes functions that deal with matrices as vectors in
-an inner product space. This section describes functions that deal with matrices as
-@italic{linear operators}, or as functions from column matrices to column matrices.
-
-@margin-note*{@hyperlink[op-norm-url]{Wikipedia: Induced norm}}
-In this setting, a norm is the largest relative change in magnitude an operator (i.e. matrix) can
-effect on a column matrix, where ``magnitude'' is defined by a vector norm.
-(See the Wikipedia article linked to in the margin for a formal definition.)
-Matrix norms that are defined in terms of a vector norm are called @italic{induced norms}, or
-@deftech{operator norms}.
-
-@defproc[(matrix-op-1norm [M (Matrix Number)]) Nonnegative-Real]{
-The @tech{operator norm} induced by the vector norm @racket[matrix-1norm].
-
-When M is a column matrix, @racket[(matrix-op-1norm M)] is equivalent to @racket[(matrix-1norm M)].
-}
-
-@defproc[(matrix-op-2norm [M (Matrix Number)]) Nonnegative-Real]{
-The @tech{operator norm} induced by the vector norm @racket[matrix-2norm].
-                                             
-This function is currently undefined because a required algorithm (singular value decomposition or
-eigendecomposition) is not yet implemented in @racketmodname[math/matrix].
-
-When M is a column matrix, @racket[(matrix-op-2norm M)] is equivalent to @racket[(matrix-2norm M)].
-}
-
-@defproc[(matrix-op-inf-norm [M (Matrix Number)]) Nonnegative-Real]{
-The @tech{operator norm} induced by the vector norm @racket[matrix-inf-norm].
-
-When M is a column matrix, @racket[(matrix-op-inf-norm M)] is equivalent to
-@racket[(matrix-inf-norm M)].
-}
-
-@defproc[(matrix-basis-cos-angle [M0 (Matrix Number)] [M1 (Matrix Number)]) Number]{
-Returns the cosine of the angle between the two subspaces spanned by @racket[M0] and @racket[M1].
-
-This function is currently undefined because a required algorithm (singular value decomposition or
-eigendecomposition) is not yet implemented in @racketmodname[math/matrix].
-
-When @racket[M0] and @racket[M1] are column matrices, @racket[(matrix-basis-cos-angle M0 M1)] is
-equivalent to @racket[(matrix-cos-angle M0 M1)].
-}
-         
-@defproc[(matrix-basis-angle [M0 (Matrix Number)] [M1 (Matrix Number)]) Number]{
-Equivalent to @racket[(acos (matrix-basis-cos-angle M0 M1))].
-
-The function is currently undefined because @racket[matrix-basis-cos-angle] is currently undefined.
-}
-
-@defparam[matrix-error-norm norm ((Matrix Number) -> Nonnegative-Real)]{
-The norm used by @racket[matrix-relative-error] and @racket[matrix-absolute-error].
-The default value is @racket[matrix-op-inf-norm].
-
-Besides being a true norm, @racket[norm] should also be @deftech{submultiplicative}:
-@racketblock[(norm (matrix* M0 M1)) <= (* (norm M0) (norm M1))]
-This additional triangle-like inequality makes it possible to prove error bounds for formulas that
-involve matrix multiplication.
-
-All operator norms (@racket[matrix-op-1norm], @racket[matrix-op-2norm], @racket[matrix-op-inf-norm])
-are submultiplicative by definition, as is the Frobenius norm (@racket[matrix-2norm]).
-}
-
-@defproc[(matrix-absolute-error [M (Matrix Number)]
-                                [R (Matrix Number)]
-                                [norm ((Matrix Number) -> Nonnegative-Real) (matrix-error-norm)])
-         Nonnegative-Real]{
-Basically equivalent to @racket[(norm (matrix- M R))], but handles non-rational flonums like
-@racket[+inf.0] and @racket[+nan.0] specially.
-
-See @racket[absolute-error] for the scalar version of this function.
-}
-
-@defproc[(matrix-relative-error [M (Matrix Number)]
-                                [R (Matrix Number)]
-                                [norm ((Matrix Number) -> Nonnegative-Real) (matrix-error-norm)])
-         Nonnegative-Real]{
-Measures the error in @racket[M] relative to the true matrix @racket[R], under the norm @racket[norm].
-Basically equivalent to @racket[(/ (norm (matrix- M R)) (norm R))], but handles non-rational flonums
-like @racket[+inf.0] and @racket[+nan.0] specially, as well as the case @racket[(norm R) = 0].
-
-See @racket[relative-error] for the scalar version of this function.
-}
-
-@defproc[(matrix-zero? [M (Matrix Number)] [eps Real (* 10 epsilon.0)]) Boolean]{
-Returns @racket[#t] when @racket[M] is very close to a zero matrix (by default, within a few
-epsilons). Equivalent to
-@racketblock[(<= (matrix-absolute-error M (make-matrix m n 0)) eps)]
-where @racket[m n] is the shape of @racket[M].
-}
-                         
-@defproc[(matrix-identity? [M (Matrix Number)] [eps Real (* 10 epsilon.0)]) Boolean]{
-Returns @racket[#t] when @racket[M] is very close to the identity matrix (by default, within a few
-epsilons).
-Equivalent to
-@racketblock[(and (square-matrix? M)
-                  (<= (matrix-relative-error M (identity-matrix (square-matrix-size M)))
-                      eps))]
-}
-
-@defproc[(matrix-orthonormal? [M (Matrix Number)] [eps Real (* 10 epsilon.0)]) Boolean]{
-Returns @racket[#t] when @racket[M] is very close to being orthonormal; that is, when
-@racket[(matrix* M (matrix-hermitian M))] is very close to an identity matrix.
-Equivalent to
-@racketblock[(matrix-identity? (matrix* M (matrix-hermitian M)) eps)]
-}
-
-@(close-eval typed-eval)
-@(close-eval untyped-eval)
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/math-number-theory.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-number-theory.scrbl
deleted file mode 100644
index 2d48f06f12..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/math-number-theory.scrbl
+++ /dev/null
@@ -1,889 +0,0 @@
-#lang scribble/manual
-@(require (for-label racket/flonum
-                     racket/fixnum
-                     racket/unsafe/ops
-                     racket/require
-                     racket/base
-                     (only-in typed/racket/base
-                              Integer Exact-Rational Boolean Listof Natural U List
-                              Positive-Integer)
-                     math)
-          scribble/extract
-          scribble/eval
-          scribble/base
-          scribble/manual
-          racket/sandbox
-          racket/math
-          "utils.rkt")
-
-@(define untyped-eval (make-untyped-math-eval))
-@interaction-eval[#:eval untyped-eval (require (except-in racket/list permutations)
-                                               racket/function)]
-
-@(define math-style tt)
-
-@title[#:tag "number-theory"]{Number Theory}
-@(author-jens-axel)
-
-@defmodule[math/number-theory]
-
-@local-table-of-contents[]
-
-@; ----------------------------------------
-@section[#:tag "congruences"]{Congruences and Modular Arithmetic}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Divisor"]{Divisor}}
-@defproc[(divides? [m Integer] [n Integer]) Boolean]{
-   Returns @racket[#t] if @racket[m] divides @racket[n], @racket[#f] otherwise.
-           
-   Formally, an integer @racket[m] divides an integer @racket[n] when there
-   exists a unique integer @racket[k] such that @racket[(* m k) = n].
-
-   @examples[#:eval untyped-eval
-                    (divides? 2 9)
-                    (divides? 2 8)]
-   
-   Note that @racket[0] cannot divide anything:
-   @interaction[#:eval untyped-eval
-                       (divides? 0 5)
-                       (divides? 0 0)]
-   
-   Practically, if @racket[(divides? m n)] is @racket[#t], then @racket[(/ n m)] will return
-   an integer and will not raise @racket[exn:fail:contract:divide-by-zero].
-   
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/B%C3%A9zout's_identity"]{Bezout's Identity}}
-@defproc[(bezout [a Integer] [b Integer] [c Integer] ...) (Listof Integer)]{
-  Given integers @racket[a b c ...] returns a list of integers @racket[(list u v w ...)]
-  such that @racket[(gcd a b c ...) = (+ (* a u) (* b v) (* c w) ...)].
-
-  @examples[#:eval untyped-eval
-                   (bezout 6 15)
-                   (+ (* -2 6) (* 1 15))
-                   (gcd 6 15)]
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Coprime"]{Coprime}}
-@defproc[(coprime? [a Integer] [b Integer] ...) Boolean]{
-  Returns @racket[#t] if the integers @racket[a b ...] are coprime.
-  Formally, a set of integers is considered coprime (also called relatively prime)
-  if their greatest common divisor is 1.
-
-  @examples[#:eval untyped-eval
-                   (coprime? 2 6 15)]
-}
- 
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Pairwise_coprime"]{Pairwise Coprime}}
-@defproc[(pairwise-coprime? [a Integer] [b Integer] ...) Boolean]{
-  Returns @racket[#t] if the integers @racket[a b ...] are @italic{pairwise} coprime, meaning
-  that each pair of integers is coprime.
-
-The numbers 2, 6 and 15 are coprime, but not @italic{pairwise} coprime, because 2 and 6 share the
-factor 3:
-@interaction[#:eval untyped-eval
-                    (pairwise-coprime? 2 6 15)]
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Chinese_remainder_theorem"]{Chinese Remainder Theorem}}
-@defproc[(solve-chinese [as (Listof Integer)] [ns (Listof Integer)]) Natural]{
-  Given a length-@racket[k] list of integers @racket[as] and a length-@racket[k] list of coprime
-  moduli @racket[ns], @racket[(solve-chinese as ns)] returns the least natural number @racket[x]
-  that is a solution to the equations
-
-  @racketblock[x = #,(elem @racket[a] @subscript{1}) #,(elem "(mod " @racket[n] @subscript{1} ")")
-                ...
-               x = #,(elem @racket[a] @subscript{@racket[k]}) #,(elem "(mod " @racket[x] @subscript{@racket[k]} ")")]
-
-  The solution @racket[x] is less than
-  @racket[(* #,(elem @racket[n] @subscript{1}) ... #,(elem @racket[n] @subscript{@racket[k]}))].
-  
-  The moduli @racket[ns] must all be positive.
-  
-  What is the least number @racket[x] that when divided by 3 leaves 
-  a remainder of 2, when divided by 5 leaves a remainder of 3, and 
-  when divided by 7 leaves a remainder of 2? 
-  @interaction[#:eval untyped-eval
-                      (solve-chinese '(2 3 2) '(3 5 7))]  
-}
-
-
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Quadratic_residue"]{Quadratic Residue}}
-@defproc[(quadratic-residue? [a Integer] [n Integer]) Boolean]{
-Returns @racket[#t] if @racket[a] is a quadratic residue modulo @racket[n], otherwise @racket[#f].
-The modulus @racket[n] must be positive, and @racket[a] must be nonnegative.
-
-Formally, @racket[a] is a quadratic residue modulo @racket[n] if there
-exists a number @racket[x] such that @racket[(* x x) = a] (mod @racket[n]).
-In other words, @racket[(quadratic-residue? a n)] is @racket[#t] when
-@racket[a] is a perfect square modulo @racket[n].
-
-@examples[#:eval untyped-eval
-                 (quadratic-residue? 0 4)
-                 (quadratic-residue? 1 4)
-                 (quadratic-residue? 2 4)
-                 (quadratic-residue? 3 4)]
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Legendre_symbol"]{Legendre Symbol}}
-@defproc[(quadratic-character [a Integer] [p Integer]) (U -1 0 1)]{
-Returns the value of the quadratic character modulo the prime @racket[p].                                                              
-That is, for a non-zero @racket[a] the number @racket[1] is returned when 
-@racket[a] is a quadratic residue,
-and @racket[-1] is returned when @racket[a] is a non-residue. 
-If @racket[a] is zero, then @racket[0] is returned.
-
-If @racket[a] is negative or @racket[p] is not positive, @racket[quadratic-character] raises an error.
-If @racket[p] is not prime, @racket[(quadratic-character a p)] is indeterminate.
-        
-This function is also known as the @emph{Legendre symbol}.
-
-  @interaction[#:eval untyped-eval
-                      (quadratic-character 0 5)
-                      (quadratic-character 1 5)
-                      (quadratic-character 2 5)
-                      (quadratic-character 3 5)]
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Modular_multiplicative_inverse"]{Multiplicative Inverse}}
-@defproc[(modular-inverse [a Integer] [n Integer]) Natural]{
-  Returns the inverse of @racket[a] modulo @racket[n] if @racket[a] and @racket[n] are coprime,
-  otherwise raises an error. The modulus @racket[n] must be positive, and @racket[a] must be nonzero.
-  
-  Formally, if @racket[a] and @racket[n] are coprime, @racket[b = (modular-inverse a n)] is the
-  unique natural number less than @racket[n] such that @racket[(* a b) = 1] (mod @racket[n]).
-  
-  @interaction[#:eval untyped-eval
-                      (modular-inverse 2 5)
-                      (modulo (* 2 3) 5)]
-}
-
-@defproc[(modular-expt [a Integer] [b Integer] [n Integer]) Natural]{
-  Computes @racket[(modulo (expt a b) n)], but much more efficiently. The modulus @racket[n] must
-  be positive, and the exponent @racket[b] must be nonnegative.
-  
-  @examples[#:eval untyped-eval
-                   (modulo (expt -6 523) 19)
-                   (modular-expt -6 523 19)
-                   (modular-expt 9 158235208 19)
-                   (eval:alts (code:line (code:comment "don't try this at home!")
-                                         (modulo (expt 9 158235208) 19))
-                              (eval:result @racketresultfont{4}))
-                   ]
-}
-
-@subsection[#:tag "modular"]{Parameterized Modular Arithmetic}
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Modular_arithmetic"]{Modular Arithmetic}}
-
-The @racketmodname[math/number-theory] library supports modular arithmetic parameterized on a current
-modulus. For example, the code
-
-@racketblock[(with-modulus n
-               ((modexpt a b) . mod= . c))]
-
-corresponds with the mathematical statement
-@italic{a}@superscript{@italic{b}} = @italic{c} (mod @italic{n}).
-
-The current modulus is stored in a parameter that, for performance reasons, can only be
-set using @racket[with-modulus]. (The basic modular operators cache parameter reads, and this
-restriction guarantees that the cached values are current.)
-
-@defform[(with-modulus n body ...)
-         #:contracts ([n Integer])]{
-Alters the current modulus within the dynamic extent of @racket[body].
-The expression @racket[n] must evaluate to a positive integer.
-
-By default, the current modulus is @racket[1], meaning that every modular arithmetic expression
-that does not raise an error returns @racket[0].
-}
-
-@defproc[(current-modulus) Positive-Integer]{
-Returns the current modulus.
-@examples[#:eval untyped-eval
-                 (current-modulus)
-                 (with-modulus 5 (current-modulus))]
-}
-
-@defproc[(mod [x Exact-Rational]) Natural]{
-Converts a rational number @racket[x] to a natural number less than the current modulus.
-
-If @racket[x] is an integer, this is equivalent to @racket[(modulo x n)].
-If @racket[x] is a fraction, an integer input is generated by multiplying its numerator
-by its denominator's modular inverse.
-
-@examples[#:eval untyped-eval
-                 (with-modulus 7 (mod (* 218 7)))
-                 (with-modulus 7 (mod 3/2))
-                 (with-modulus 7 (mod/ 3 2))
-                 (with-modulus 7 (mod 3/7))]
-}
-
-@deftogether[(@defproc[(mod+ [a Integer] ...) Natural]
-              @defproc[(mod* [a Integer] ...) Natural])]{
-Equivalent to @racket[(modulo (+ a ...) (current-modulus))] and
-@racket[(modulo (* a ...) (current-modulus))], respectively, but generate smaller intermediate
-values.
-}
-
-@deftogether[(@defproc[(modsqr [a Integer]) Natural]
-              @defproc[(modexpt [a Integer] [b Integer]) Natural])]{
-Equivalent to @racket[(mod* a a)] and @racket[(modular-expt a b (current-modulus))], respectively.
-}
-
-@defproc[(mod- [a Integer] [b Integer] ...) Natural]{
-Equivalent to @racket[(modulo (- a b ...) (current-modulus))], but generates smaller intermediate
-values. Note that @racket[(mod- a) = (mod (- a))].
-}
-
-@defproc[(mod/ [a Integer] [b Integer] ...) Natural]{
-Divides @racket[a] by @racket[(* b ...)], by multiplying @racket[a] by the multiplicative inverse
-of @racket[(* b ...)]. The one-argument variant returns the modular inverse of @racket[a].
-
-Note that @racket[(mod/ a b ...)] is @bold{not} equivalent to
-@racket[(modulo (/ a b ...) (current-modulus))]; see @racket[mod=] for a demonstration.
-}
-
-@deftogether[(@defproc[(mod= [a Integer] [b Integer] ...) Boolean]
-              @defproc[(mod< [a Integer] [b Integer] ...) Boolean]
-              @defproc[(mod<= [a Integer] [b Integer] ...) Boolean]
-              @defproc[(mod> [a Integer] [b Integer] ...) Boolean]
-              @defproc[(mod>= [a Integer] [b Integer] ...) Boolean])]{
-Each of these is equivalent to @racket[(op (mod a) (mod b) ...)], where @racket[op] is the
-corresponding numeric comparison function. Additionally, when given one argument, the inequality
-tests always return @racket[#t].
-
-Suppose we wanted to know why 17/4 = 8 (mod 15), but 51/12 (mod 15) is undefined, even though
-normally 51/12 = 17/4. In code,
-@interaction[#:eval untyped-eval
-                    (with-modulus 15 (mod/ 17 4))
-                    (/ 51 12)
-                    (with-modulus 15 (mod/ 51 12))]
-We could try to divide by brute force: find, modulo 15, all the numbers @racket[a]
-for which @racket[(mod* a 4)] is @racket[17], then find all the numbers @racket[b] for which
-@racket[(mod* a 12)] is @racket[51].
-@interaction[#:eval untyped-eval
-                    (with-modulus 15
-                      (for/list ([a  (in-range 15)]
-                                 #:when (mod= (mod* a 4) 17))
-                        a))
-                    (with-modulus 15
-                      (for/list ([b  (in-range 15)]
-                                 #:when (mod= (mod* b 12) 51))
-                        b))]
-So the problem isn't that @racket[b] doesn't exist, it's that @racket[b] isn't @italic{unique}.
-}
-
-@; ----------------------------------------
-@section[#:tag "primes"]{Primes}
-
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Prime_number"]{Prime Number}}
-@defproc[(prime? [z Integer]) Boolean]{
-Returns @racket[#t] if @racket[z] is a prime, @racket[#f] otherwise.
-
-Formally, an integer @racket[z] is prime when the only positive divisors of @racket[z]
-are @racket[1] and @racket[(abs z)].
-
-The positive primes below 20 are:
-  @interaction[#:eval untyped-eval
-                      (filter prime? (range 1 21))]
-The corresponding negative primes are:
-  @interaction[#:eval untyped-eval
-                      (filter prime? (range 1 -21 -1))]
-}
-
-@defproc[(odd-prime? [z Integer]) Boolean]{
-Returns @racket[#t] if @racket[z] is a odd prime,
-@racket[#f] otherwise.
-
-@interaction[#:eval untyped-eval
-                    (odd-prime? 2)
-                    (odd-prime? 3)]
-}
-
-@defproc[(nth-prime [n Integer]) Natural]{
-Returns the @racket[n]th positive prime; @racket[n] must be nonnegative.
-@interaction[#:eval untyped-eval
-                    (nth-prime 0)
-                    (nth-prime 1)
-                    (nth-prime 2)]
-}
-
-@defproc[(random-prime [n Integer]) Natural]{
-Returns a random prime smaller than @racket[n], which must be greater than @racket[2].
-                                    
-The function @racket[random-prime] picks random numbers
-below @racket[n] until a prime is found.
-
-@interaction[#:eval untyped-eval
-                    (random-prime 10)
-                    (random-prime 10)
-                    (random-prime 10)]
-}
-
-@defproc[(next-prime [z Integer]) Integer]{
-Returns the first prime larger than @racket[z].
-
-@interaction[#:eval untyped-eval
-                    (next-prime 4)
-                    (next-prime 5)]
-}
-
-@defproc[(prev-prime [z Integer]) Integer]{
-Returns the first prime smaller than @racket[z].
-
-@interaction[#:eval untyped-eval
-                    (prev-prime 4)
-                    (prev-prime 5)]
-}
-
-@defproc[(next-primes [z Integer] [n Integer]) (Listof Integer)]{
-Returns list of the next @racket[n] primes larger than @racket[z]; @racket[n] must be nonnegative.
-
-@interaction[#:eval untyped-eval
-                    (next-primes 2 4)]
-}
-
-@defproc[(prev-primes [z Integer] [n Integer]) (Listof Integer)]{
-Returns list of the next @racket[n] primes smaller than @racket[z]; @racket[n] must be nonnegative.
-
-@interaction[#:eval untyped-eval
-                    (prev-primes 13 4)]
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Integer_factorization"]{Integer Factorization}}
-@defproc[(factorize [n Natural]) (Listof (List Natural Natural))]{
-Returns the factorization of a natural number @racket[n].
-The factorization consists of a list of corresponding 
-primes and exponents. The primes will be in ascending order.
-
-The prime factorization of 600 = 2^3 * 3^1 * 5^2:
-@interaction[#:eval untyped-eval
-                    (factorize 600)]
-}
-
-@defproc[(defactorize [f (Listof (List Natural Natural))]) Natural]{
-Returns the natural number, whose factorization is given 
-by @racket[f]. The factorization @racket[f] is represented
-as described in @racket[factorize].
-
-@interaction[#:eval untyped-eval
-                    (defactorize '((2 3) (3 1) (5 2)))]
-}
-
-@defproc[(divisors [z Integer]) (Listof Natural)]{
-Returns a list of all positive divisors of the integer @racket[z].
-The divisors appear in ascending order.                                                       
-                                                       
- @interaction[#:eval untyped-eval
-                     (divisors 120)
-                     (divisors -120)]
-}
-
-@defproc[(prime-divisors [z Natural]) (Listof Natural)]{
-Returns a list of all positive prime divisors of the integer 
-@racket[z]. The divisors appear in ascending order.                                                       
-                                                       
- @interaction[#:eval untyped-eval
-                     (prime-divisors 120)]
-}
-
-@defproc[(prime-exponents [z Natural]) (Listof Natural)]{
-Returns a list of the exponents of in a factorization of the integer
-@racket[z].                                                       
-
- @interaction[#:eval untyped-eval
-                     (define z (* 2 2 2 3 5 5))
-                     (prime-divisors z)
-                     (prime-exponents z)]
-}
-
-@; ----------------------------------------
-@section[#:tag "roots"]{Roots}
-
-@defproc[(integer-root [n Natural] [m Natural]) Natural]{
-Returns the @racket[m]th integer root of @racket[n].
-This is the largest integer @racket[r] such that 
-@racket[(expt r m) <= n].
-
- @interaction[#:eval untyped-eval
-                     (integer-root (expt 3 4) 4)
-                     (integer-root (+ (expt 3 4) 1) 4)]
-}
-
-@defproc[(integer-root/remainder [n Natural] [m Natural]) 
-         (values Natural Natural)]{
-Returns two values. The first, @racket[r], is the @racket[m]th 
-integer root of @racket[n]. The second is @racket[n-r^m].
-            
- @interaction[#:eval untyped-eval
-                     (integer-root/remainder (expt 3 4) 4)
-                     (integer-root/remainder (+ (expt 3 4) 1) 4)]
-}
-
- 
-@; ----------------------------------------
-@section[#:tag "powers"]{Powers}
-
-@defproc[(max-dividing-power [a Integer] [b Integer]) Natural]{
-Returns the largest exponent, @racket[n], of a power with 
-base @racket[a] that divides @racket[b].
-
-That is, @racket[(expt a n)] divides @racket[b] but @racket[(expt a (+ n 1))] does not divide
-@racket[b].
-
- @interaction[#:eval untyped-eval
-                     (max-dividing-power 3 (expt 3 4))
-                     (max-dividing-power 3 5)]
-}
-
-@defproc[(perfect-power [m Integer]) 
-         (U (List Natural Natural) #f)]{
-If @racket[m] is a perfect power, a list with two elements 
-@racket[b] and @racket[n] such that @racket[(expt b n) = m] 
-is returned, otherwise @racket[#f] is returned.
-
- @interaction[#:eval untyped-eval
-                     (perfect-power (expt 3 4))
-                     (perfect-power (+ (expt 3 4) 1))]
-}
-
- 
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Perfect_power"]{Perfect Power}}
-@defproc[(perfect-power? [m Integer]) Boolean]{
-Returns @racket[#t] if @racket[m] is a perfect power,
-otherwise @racket[#f].        
-
-  @interaction[#:eval untyped-eval
-                      (perfect-power? (expt 3 4))
-                      (perfect-power? (+ (expt 3 4) 1))]
-}
-
-
-@defproc[(prime-power [m Natural])
-         (U (List Natural Natural) #f)]{
-If @racket[m] is a power of the form @racket[(expt p n)]
-where @racket[p] is prime, then a list with the
-prime and the exponent is returned, otherwise
-@racket[#f] is returned.
-
-  @interaction[#:eval untyped-eval
-                      (prime-power (expt 3 4))
-                      (prime-power (expt 6 4))]
-}
-
-@defproc[(prime-power? [m Natural]) Boolean]{
-Returns @racket[#t] if @racket[m] is a prime power,
-otherwise @racket[#f].
-
-  @interaction[#:eval untyped-eval
-                      (prime-power? (expt 3 4))
-                      (prime-power? (expt 6 4))
-                      (prime-power? 1)
-                      (prime-power? 0)]
-}
-
-@defproc[(odd-prime-power? [m Natural]) Boolean]{
-Returns @racket[#t] if @racket[m] is a power of an odd prime,
-otherwise @racket[#f].
-
-  @interaction[#:eval untyped-eval
-                      (odd-prime-power? (expt 2 4))
-                      (odd-prime-power? (expt 3 4))
-                      (odd-prime-power? (expt 15 4))]
-}
-
-@defproc[(as-power [m Positive-Integer]) 
-         (values Natural Natural)]{
-Returns two values @racket[b] and @racket[n]
-such that @racket[m = (expt b n)] and @racket[n] is maximal.
-
-  @interaction[#:eval untyped-eval
-                      (as-power (* (expt 2 4) (expt 3 4)))
-                      (expt 6 4)
-                      (* (expt 2 4) (expt 3 4))
-                      (as-power (* (expt 2 4) (expt 3 5)))]
-}
-
-@defproc[(perfect-square [m Natural]) 
-         (U Natural #f)]{
-Returns @racket[(sqrt m)] if @racket[m] is perfect 
-square, otherwise @racket[#f].
-
-@interaction[#:eval untyped-eval
-                    (perfect-square 9)
-                    (perfect-square 10)]
-}
-
-@; ----------------------------------------
-@section[#:tag "multiplicative"]{Multiplicative and Arithmetic Functions}
-
-The functions in this section are @deftech{multiplicative} (with exception of the Von Mangoldt function).
-In number theory, a multiplicative function is a function @racket[f] such that
-@racket[(f (* a b)) = (* (f a) (f b))] for all coprime natural numbers @racket[a] and @racket[b].
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Euler%27s_totient_function"]{Euler's Totient}}
-@defproc[(totient [n Natural]) Natural]{
-Returns the number of integers from 1 to @racket[n]
-that are coprime with @racket[n].
-
-This function is known as Eulers totient or phi function.
-
-@interaction[#:eval untyped-eval
-                    (totient 9)
-                    (length (filter (curry coprime? 9) (range 10)))]
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/M%C3%B6bius_function"]{Moebius Function}}
-@defproc[(moebius-mu [n Natural]) (U -1 0 1)]{
-Returns:
-@itemlist[@item{@racket[1]  if @racket[n] is a square-free product of an even number of primes}
-          @item{@racket[-1] if @racket[n] is a square-free product of an odd number of primes}
-          @item{@racket[0]  if @racket[n] has a multiple prime factor}]
-
-@interaction[#:eval untyped-eval
-                    (moebius-mu (* 2 3 5))
-                    (moebius-mu (* 2 3 5 7))
-                    (moebius-mu (* 2 2 3 5 7))]
-}
-
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Divisor_function"]{Divisor Function}}
-@defproc[(divisor-sum [n Natural] [k Natural]) Natural]{
-Returns sum of the @racket[k]th powers of 
-all divisors of @racket[n].
-
-@interaction[#:eval untyped-eval         
-                    (divisor-sum 12 2)
-                    (apply + (map sqr (divisors 12)))]
-}
-
-@margin-note{OEIS: @hyperlink["http://oeis.org/A001222"]{Big Omega}}
-@defproc[(prime-omega [n Natural]) natural?]{
-Counting multiplicities the number of prime factors of @racket[n] is returned.
-
-@interaction[#:eval untyped-eval         
-                    (prime-omega (* 2 2 2 3 3 5))]
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Von_Mangoldt_function"]{Von Mangoldt Function}}
-@defproc[(mangoldt-lambda [n Natural]) Real]{
-The von Mangoldt function. 
-If @racket[n=p^k] for a prime @racket[p] and an integer @racket[k>=1] then @racket[(log n)] is returned.                                             
-Otherwise 0 is returned.
-
-Note: The Von Mangoldt function is not multiplicative.
-
-@interaction[#:eval untyped-eval         
-                    (mangoldt-lambda (* 3 3))
-                    (log 3)]
-}
-
-
-
-@; ----------------------------------------
-@section[#:tag "number-sequences"]{Number Sequences}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Bernoulli_number"]{Bernoulli Number}}
-@defproc[(bernoulli-number [n Integer]) Exact-Rational]{
-  Returns the @racket[n]th Bernoulli number; @racket[n] must be nonnegative.
-
-  @interaction[#:eval untyped-eval
-                      (map bernoulli-number (range 9))]
-  
-  Note that these are the @italic{first} Bernoulli numbers, since @racket[(bernoulli-number 1) = -1/2].
-}
-
-@margin-note{MathWorld: @hyperlink["http://mathworld.wolfram.com/EulerianNumber.html"]{Eulerian Number}}
-@defproc[(eulerian-number [n Integer] [k Integer]) Natural]{
-  Returns the Eulerian number @math-style{<n,k>}; both arguments must be nonnegative.
-
-  @interaction[#:eval untyped-eval
-                      (eulerian-number 5 2)]
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Fibonacci_number"]{Fibonacci Number}}
-@defproc[(fibonacci [n Integer]) Natural]{
-  Returns the @racket[n]th Fibonacci number; @racket[n] must be nonnegative.
-
-  The ten first Fibonacci numbers.
-  @interaction[#:eval untyped-eval
-                      (map fibonacci (range 10))]
-}
-
-@defproc[(make-fibonacci [a Integer] [b Integer]) (Integer -> Integer)]{
-Returns a function representing @italic{a} Fibonacci sequence with the first two numbers
-@racket[a] and @racket[b]. The @racket[fibonacci] function is defined as
-@racket[(make-fibonacci 0 1)].
-
-@margin-note{Wikipedia: @hyperlink["http://wikipedia.org/wiki/Lucas_number"]{Lucas Number}}
-The Lucas numbers are defined as a Fibonacci sequence starting with 2 and 1:
-@interaction[#:eval untyped-eval
-                    (map (make-fibonacci 2 1) (range 10))]
-}
-
-@defproc[(modular-fibonacci [n Integer] [m Integer]) Natural]{
-  Returns the @racket[n]th Fibonacci number modulo @racket[m]; @racket[n] must be nonnegative
-  and @racket[m] must be positive.
-
-  The ten first Fibonacci numbers modulo 5.
-  @interaction[#:eval untyped-eval
-                      (map (λ (n) (modular-fibonacci n 5)) (range 10))]
-}
-
-@defproc[(make-modular-fibonacci [a Integer] [b Integer]) (Integer Integer -> Integer)]{
-Like @racket[make-fibonacci], but makes a modular Fibonacci sequence.
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Farey_sequence"]{Farey Sequence}}
-@defproc[(farey-sequence [n Integer]) (Listof Exact-Rational)]{
-Returns a list of the numbers in the @racket[n]th Farey sequence; @racket[n] must be positive.
-
-The @racket[n]th Farey sequence is the sequence of all 
-completely reduced rational numbers from 0 to 1 which denominators
-are less than or equal to @racket[n].
-  @interaction[#:eval untyped-eval
-                      (farey-sequence 1)
-                      (farey-sequence 2)
-                      (farey-sequence 3)]
-}
-
-@margin-note{MathWorld: @hyperlink["http://mathworld.wolfram.com/TangentNumber.html"]{Tangent Number}}
-@defproc[(tangent-number [n Integer]) Integer]{
-Returns the @racket[n]th tangent number; @racket[n] must be nonnegative.
-            
-  @interaction[#:eval untyped-eval
-                      (tangent-number 1)
-                      (tangent-number 2)
-                      (tangent-number 3)]
-}
-
-
-@; ----------------------------------------
-@section[#:tag "combinatorics"]{Combinatorics}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Factorial"]{Factorial}}
-@defproc[(factorial [n Integer]) Natural]{
-  Returns the factorial of @racket[n], which must be nonnegative.
-  The factorial of @racket[n] is the number @racket[(* n (- n 1) (- n 2) ... 1)].
-  @interaction[#:eval untyped-eval
-                      (factorial 3)
-                      (factorial 0)]
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Binomial_coefficient"]{Binomial Coefficient}}
-@defproc[(binomial [n Integer] [k Integer]) Natural]{
-  Returns the number of ways to choose a @italic{set} of @racket[k] items from a set of
-  @racket[n] items; i.e. the order of the @racket[k] items is not significant.
-  Both arguments must be nonnegative.
-  
-  When @racket[k > n], @racket[(binomial n k) = 0]. Otherwise, @racket[(binomial n k)] is
-  equivalent to @racket[(/ (factorial n) (factorial k) (factorial (- n k)))], but computed more
-  quickly.
-  @interaction[#:eval untyped-eval
-                      (binomial 5 3)]
-}
-
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Permutation#Permutations_in_combinatorics"]{
-Permutations}}
-@defproc[(permutations [n Integer] [k Integer]) Natural]{
-  Returns the number of ways to choose a @italic{sequence} of @racket[k] items from a set of
-  @racket[n] items; i.e. the order of the @racket[k] items is significant.
-  Both arguments must be nonnegative.
-  
-  When @racket[k > n], @racket[(permutations n k) = 0]. Otherwise, @racket[(permutations n k)] is
-  equivalent to @racket[(/ (factorial n) (factorial (- n k)))].
-  @interaction[#:eval untyped-eval
-                      (permutations 5 3)]
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Multinomial_theorem#Multinomial_coefficients"]{Multinomial Coeffecient}}
-@defproc[(multinomial [n Integer] [ks (Listof Integer)]) Natural]{
-  A generalization of @racket[binomial] to multiple sets of choices; e.g.
-  @racket[(multinomial n (list k0 k1 k2))] is the number of ways to choose a set of @racket[k0] items,
-  a set of @racket[k1] items, and a set of @racket[k2] items from a set of @racket[n] items.
-  All arguments must be nonnegative.
-  
-  When @racket[(apply + ks) = n], this is equivalent to
-  @racket[(apply / (factorial n) (map factorial ks))]. Otherwise, @racket[multinomial] returns @racket[0].
-  @interaction[#:eval untyped-eval
-                      (multinomial 5 '(3 2))
-                      (= (multinomial 8 '(5 3))
-                         (binomial 8 5)
-                         (binomial 8 3))
-                      (multinomial 10 '(5 3 2))
-                      (multinomial 0 '())
-                      (multinomial 4 '(1 1))]
-}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Partition_(number_theory)"]{Partition}}
-@defproc[(partitions [n Integer]) Natural]{
-  Returns the number of partitions of @racket[n], which must be nonnegative.
-  A partition of a positive integer @racket[n] is a way 
-  of writing @racket[n] as a sum of positive integers.
-  The number 3 has the partitions @racket[(+ 1 1 1)], @racket[(+ 1 2)] and @racket[(+ 3)].
-  @interaction[#:eval untyped-eval
-                      (partitions 3)
-                      (partitions 4)]
-}
-
-
-@; ----------------------------------------
-@section[#:tag "special_numbers"]{Special Numbers}
-
-@subsection{Polygonal Numbers}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Polygonal_number"]{Polygonal Number}}
-@deftogether[
-(@defproc[(triangle-number? [n Natural]) Boolean]
-  @defproc[(square-number? [n Natural]) Boolean]
-  @defproc[(pentagonal-number? [n Natural]) Boolean]
-  @defproc[(hexagonal-number? [n Natural]) Boolean]
-  @defproc[(heptagonal-number? [n Natural]) Boolean]
-  @defproc[(octagonal-number? [n Natural]) Boolean])]{
-These functions check whether the input is a polygonal number of the types
-triangle, square, pentagonal, hexagonal, heptagonal and octogonal 
-respectively.
-}
-
-@deftogether[
-(@defproc[(triangle-number [n Natural]) Natural]
-@defproc[(sqr [n Natural]) Natural]
-@defproc[(pentagonal-number [n Natural]) Natural]
-@defproc[(hexagonal-number [n Natural]) Natural]
-@defproc[(heptagonal-number [n Natural]) Natural]
-@defproc[(octagonal-number [n Natural]) Natural])]{
-These functions return the @racket[n]th polygonal number 
-of the corresponding type of polygonal number.
-}
-
-
-@; ----------------------------------------
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Mediant_(mathematics)"]{Mediant}}
-@section[#:tag "fractions"]{Fractions}
-@defproc[(mediant [x Exact-Rational] [y Exact-Rational]) Exact-Rational]{
-Computes the @racket[mediant] of the numbers @racket[x] and @racket[y].
-The mediant of two fractions @math-style{p/q} and @math-style{r/s} in their
-lowest term is the number @math-style{(p+r)/(q+s)}.
-  @interaction[#:eval untyped-eval
-                      (mediant 1/2 5/6)]
-}
-
-
-
-@; ----------------------------------------
-@section[#:tag "quadratics"]{The Quadratic Equation}
-
-@defproc[(quadratic-solutions [a Real] [b Real] [c Real]) (Listof Real)]{
-Returns a list of all real solutions to the equation @math-style{a x^2 + b x +c = 0}.
-  @interaction[#:eval untyped-eval
-                      (quadratic-solutions 1 0 -1)
-                      (quadratic-solutions 1 2 1)
-                      (quadratic-solutions 1 0 1)]  
-}
-
-@defproc[(quadratic-integer-solutions [a Real] [b Real] [c Real]) (Listof Integer)]{
-Returns a list of all integer solutions to the equation @math-style{a x^2 + b x +c = 0}.
-  @interaction[#:eval untyped-eval
-                      (quadratic-integer-solutions 1 0 -1)
-                      (quadratic-integer-solutions 1 0 -2)]  
-}
-
-@defproc[(quadratic-natural-solutions [a Real] [b Real] [c Real]) (Listof Natural)]{
-Returns a list of all natural solutions to the equation @math-style{a x^2 + b x +c = 0}.
-  @interaction[#:eval untyped-eval
-                      (quadratic-natural-solutions 1 0 -1)
-                      (quadratic-natural-solutions 1 0 -2)]  
-}
-
-
-
-@; ----------------------------------------
-@section[#:tag "primitive_roots"]{The group Zn and Primitive Roots}
-
-@margin-note{Wikipedia: @hyperlink["http://en.wikipedia.org/wiki/Multiplicative_group_of_integers_modulo_n"]{
-The Group Zn}}
-The numbers @math-style{0, 1, ..., n-1} with addition and multiplication
-modulo @racket[n] is a ring called @math-style{Zn}. 
-
-The group of units in @math-style{Zn} with respect to multiplication 
-modulo @racket[n] is called @math-style{Un}.
-
-The order of an element @math-style{x} in @math-style{Un} 
-is the least @math-style{k>0} such that @math-style{x^k=1 mod n}.
-
-A generator the group @math-style{Un} is called a @emph{primitive root} modulo @racket[n].
-Note that @math-style{g} is a primitive root if and only if @math-style{order(g)=totient(n)}. 
-A group with a generator is called @emph{cyclic}.
-
-
-@defproc[(unit-group [n Integer]) (Listof Positive-Integer)]{
-Returns a list of all elements of @math-style{Un}, the unit group modulo @racket[n]. The
-modulus @racket[n] must be positive.
-  @interaction[#:eval untyped-eval
-                      (unit-group 5)
-                      (unit-group 6)]  
-}
-
-@defproc[(unit-group-order [x Integer] [n Integer]) Positive-Integer]{
-Returns the order of @racket[x] in the group @math-style{Un}; both arguments must be positive.
-If @racket[x] and @racket[n] are not coprime, @racket[(unit-group-order x n)] raises an error.
-  @interaction[#:eval untyped-eval
-                      (unit-group-order 2 5)
-                      (unit-group-order 2 6)]  
-}
-
-@defproc[(unit-group-orders [n Integer]) (Listof Positive-Integer)]{
-Returns a list @racket[(list (unit-group-order x0 n) (unit-group-order x1 n) ...)] where
-@racket[x0], @racket[x1], ... are the elements of @math-style{Un}.
-The modulus @racket[n] must be positive.
-  @interaction[#:eval untyped-eval
-                      (unit-group-orders 5)
-                      (map (curryr unit-group-order 5) (unit-group 5))]
-}
-
-@defproc[(primitive-root? [x Integer] [n Integer]) Boolean]{
-Returns @racket[#t] if the element @racket[x] in @math-style{Un} is a primitive root modulo @racket[n],
-otherwise @racket[#f] is returned. An error is signaled if @racket[x] is not a member of @math-style{Un}.
-Both arguments must be positive.
-  @interaction[#:eval untyped-eval
-                      (primitive-root? 1 5)
-                      (primitive-root? 2 5)
-                      (primitive-root? 5 5)]
-}
-
-@defproc[(exists-primitive-root? [n Integer]) Boolean]{
-Returns @racket[#t] if the group @math-style{Un} has a primitive root (i.e. it is cyclic),
-otherwise @racket[#f] is returned.
-In other words, @racket[#t] is returned if @racket[n] is one of 
-@math-style{1, 2, 4, p^e, 2*p^e} where @math-style{p} is an odd prime,
-and @racket[#f] otherwise.
-The modulus @racket[n] must be positive.
-  @interaction[#:eval untyped-eval
-                      (exists-primitive-root? 5)
-                      (exists-primitive-root? 6)
-                      (exists-primitive-root? 12)]  
-}
-
-@defproc[(primitive-root [n Integer]) (Union Natural #f)]{
-Returns a primitive root of @math-style{Un} if one exists,
-otherwise @racket[#f] is returned. The modulus @racket[n] must be positive.
-  @interaction[#:eval untyped-eval
-                      (primitive-root 5)
-                      (primitive-root 6)]
-}
-
-@defproc[(primitive-roots [n Integer]) (Listof Natural)]{
-Returns a list of all primitive roots of @math-style{Un}. The modulus @racket[n] must be positive.
-  @interaction[#:eval untyped-eval
-                      (primitive-roots 3)
-                      (primitive-roots 5)
-                      (primitive-roots 6)]
-}
-
-
-@(close-eval untyped-eval)
-
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/math-special-functions.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-special-functions.scrbl
deleted file mode 100644
index 1305e9766d..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/math-special-functions.scrbl
+++ /dev/null
@@ -1,416 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          racket/sandbox
-          (for-label racket/base racket/unsafe/ops
-                     math plot
-                     (only-in typed/racket/base
-                              Flonum Real Integer Natural Zero Positive-Integer Exact-Rational
-                              Boolean Any Listof U case-> -> :print-type))
-          "utils.rkt")
-
-@(define untyped-eval (make-untyped-math-eval))
-
-@title[#:tag "special"]{Special Functions}
-@(author-neil)
-
-@defmodule[math/special-functions]
-
-The term ``special function'' has no formal definition. However, for the purposes of the
-@racketmodname[math] library, a @deftech{special function} is one that is not @tech{elementary}.
-
-The special functions are split into two groups: @secref{real-functions} and
-@secref{flonum-functions}. Functions that accept real arguments are usually defined
-in terms of their flonum counterparts, but are different in two crucial ways:
-@itemlist[
- @item{Many return exact values for certain exact arguments.}
- @item{When applied to exact arguments outside their domains, they raise an
-       @racket[exn:fail:contract] instead of returning @racket[+nan.0].}
-]
-
-Currently, @racketmodname[math/special-functions] does not export any functions that accept
-or return complex numbers. Mathematically, some of them could return complex numbers given
-real numbers, such @racket[hurwitz-zeta] when given a negative second argument. In
-these cases, they raise an @racket[exn:fail:contract] (for an exact argument) or return
-@racket[+nan.0] (for an inexact argument).
-
-Most real functions have more than one type, but they are documented as having only
-one. The documented type is the most general type, which is used to generate a contract for
-uses in untyped code. Use @racket[:print-type] to see all of a function's types.
-
-A function's types state theorems about its behavior in a way that Typed Racket can understand
-and check. For example, @racket[lambert] has these types:
-@racketblock[(case-> (Zero -> Zero)
-                     (Flonum -> Flonum)
-                     (Real -> (U Zero Flonum)))]
-
-Because @racket[lambert : Zero -> Zero], Typed Racket proves during typechecking that one
-of its exact cases is @racket[(lambert 0) = 0].
-
-Because the theorem @racket[lambert : Flonum -> Flonum] is stated as a type and proved
-by typechecking, Typed Racket's optimizer can transform the expressions around its use
-into bare-metal floating-point operations. For example, @racket[(+ 2.0 (lambert 3.0))] is
-transformed into @racket[(unsafe-fl+ 2.0 (lambert 3.0))].
-
-The most general type @racket[Real -> (U Zero Flonum)] is used to generate
-@racket[lambert]'s contract when it is used in untyped code. Except for this discussion,
-this the only type documented for @racket[lambert].
-
-@section[#:tag "real-functions"]{Real Functions}
-
-@defproc[(gamma [x Real]) (U Positive-Integer Flonum)]{
-Computes the @hyperlink["http://en.wikipedia.org/wiki/Gamma_function"]{gamma function},
-a generalization of the factorial function to the entire real line, except nonpositive integers.
-When @racket[x] is an exact integer, @racket[(gamma x)] is exact.
-
-@examples[#:eval untyped-eval
-                 (plot (list (function (λ (x) (gamma (+ 1 x))) 0 4.5
-                                       #:label "gamma(x+1)")
-                             (function (λ (x) (factorial (truncate x))) #:color 2
-                                       #:label "factorial(floor(x))")))
-                 (plot (function gamma -2.5 5.5) #:y-min -50 #:y-max 50)
-                 (gamma 5)
-                 (gamma 5.0)
-                 (factorial 4)
-                 (gamma -1)
-                 (gamma -1.0)
-                 (gamma 0.0)
-                 (gamma -0.0)
-                 (gamma 172.0)
-                 (eval:alts
-                  (bf (gamma 172))
-                  (eval:result @racketresultfont{(bf "1.241018070217667823424840524103103992618e309")}))]
-
-Error is no more than 10 @tech{ulps} everywhere that has been tested, and is usually no more than 4
-ulps.
-}
-
-@defproc[(log-gamma [x Real]) (U Zero Flonum)]{
-Like @racket[(log (abs (gamma x)))], but more accurate and without unnecessary overflow.
-The only exact cases are @racket[(log-gamma 1) = 0] and @racket[(log-gamma 2) = 0].
-
-@examples[#:eval untyped-eval
-                 (plot (list (function log-gamma -5.5 10.5 #:label "log-gamma(x)")
-                             (function (λ (x) (log (abs (gamma x))))
-                                       #:color 2 #:style 'long-dash #:width 2
-                                       #:label "log(abs(gamma(x)))")))
-                 (log-gamma 5)
-                 (log (abs (gamma 5)))
-                 (log-gamma -1)
-                 (log-gamma -1.0)
-                 (log-gamma 0.0)
-                 (log (abs (gamma 172.0)))
-                 (log-gamma 172.0)]
-
-Error is no more than 11 @tech{ulps} everywhere that has been tested, and is usually no more than 2
-ulps. Error reaches its maximum near negative roots.
-}
-
-@defproc[(psi0 [x Real]) Flonum]{
-Computes the @hyperlink["http://en.wikipedia.org/wiki/Digamma_function"]{digamma function},
-the logarithmic derivative of the gamma function.
-
-@examples[#:eval untyped-eval
-                 (plot (function psi0 -2.5 4.5) #:y-min -5 #:y-max 5)
-                 (psi0 0)
-                 (psi0 1)
-                 (- gamma.0)]
-
-Except near negative roots, maximum observed error is 2 @tech{ulps}, but is usually no more
-than 1.
-
-Near negative roots, which occur singly between each pair of negative integers, @racket[psi0]
-exhibits @tech{catastrophic cancellation} from using the reflection formula, meaning that
-relative error is effectively unbounded. However, maximum observed @racket[absolute-error]
-is @racket[(* 5 epsilon.0)]. This is the best we can do for now, because there are currently
-no reasonably fast algorithms for computing @racket[psi0] near negative roots with low relative
-error.
-
-If you need low relative error near negative roots, use @racket[bfpsi0].
-}
-
-@defproc[(psi [m Integer] [x Real]) Flonum]{
-Computes a @hyperlink["http://en.wikipedia.org/wiki/Polygamma_function"]{polygamma function},
-or the @racket[m]th logarithmic derivative of the gamma function. The order @racket[m] must be
-a natural number, and @racket[x] may not be zero or a negative integer. Note that
-@racket[(psi 0 x) = (psi0 x)].
-
-@examples[#:eval untyped-eval
-                 (plot (for/list ([m  (in-range 4)])
-                         (function (λ (x) (psi m x)) -2.5 2.5
-                                   #:color m #:style m #:label (format "psi~a(x)" m)))
-                       #:y-min -300 #:y-max 300 #:legend-anchor 'top-right)
-                 (psi -1 2.3)
-                 (psi 0 -1.1)
-                 (psi0 -1.1)]
-
-From spot checks with @racket[m > 0], error appears to be as with @racket[psi0]: very low except
-near negative roots. Near negative roots, relative error is apparently unbounded, but absolute error
-is low.
-}
-
-@deftogether[(@defproc[(erf [x Real]) Real]
-              @defproc[(erfc [x Real]) Real])]{
-Compute the @hyperlink["http://en.wikipedia.org/wiki/Error_function"]{error function and
-complementary error function}, respectively. The only exact cases are @racket[(erf 0) = 0]
-and @racket[(erfc 0) = 1].
-
-@examples[#:eval untyped-eval
-                 (plot (list (function erf -2 2 #:label "erf(x)")
-                             (function erfc #:color 2 #:label "erfc(x)")))
-                 (erf 0)
-                 (erf 1)
-                 (- 1 (erfc 1))
-                 (erf -1)
-                 (- (erfc 1) 1)]
-
-Mathematically, erfc(@italic{x}) = 1 - erf(@italic{x}), but having separate implementations
-can help maintain accuracy. To compute an expression containing erf, use @racket[erf] for
-@racket[x] near @racket[0.0]. For positive @racket[x] away from @racket[0.0],
-manipulate @racket[(- 1.0 (erfc x))] and its surrounding expressions to avoid the subtraction:
-
-@interaction[#:eval untyped-eval
-                    (define x 5.2)
-                    (bf-precision 128)
-                    (eval:alts (define log-erf-x (bigfloat->rational (bflog (bferf (bf x)))))
-                               (define log-erf-x (/ -288077151382475259515535085154389899879
-                                                    1496577676626844588240573268701473812127674924007424)))
-                    (flulp-error (log (erf x)) log-erf-x)
-                    (flulp-error (log (- 1.0 (erfc x))) log-erf-x)
-                    (flulp-error (fllog1p (- (erfc x))) log-erf-x)]
-For negative @racket[x] away from @racket[0.0], do the same with @racket[(- (erfc (- x)) 1.0)].
-
-For @racket[erf], error is no greater than 2 @tech{ulps} everywhere that has been tested, and
-is almost always no greater than 1. For @racket[erfc], observed error is no greater than 4 ulps,
-and is usually no greater than 2.
-}
-
-@deftogether[(@defproc[(lambert [x Real]) (U Zero Flonum)]
-              @defproc[(lambert- [x Real]) Flonum])]{
-Compute the @hyperlink["http://en.wikipedia.org/wiki/Lambert_W_function"]{Lambert W function},
-or the inverse of @racket[x = (* y (exp y))].
-
-This function has two real branches. The @racket[lambert] variant computes the upper branch,
-and is defined for @racket[x >= (- (exp -1))]. The @racket[lambert-] variant computes the
-lower branch, and is defined for @italic{negative} @racket[x >= (- (exp -1))].
-The only exact case is @racket[(lambert 0) = 0].
-
-@examples[#:eval untyped-eval
-                 (plot (list (function lambert (- (exp -1)) 1)
-                             (function lambert- (- (exp -1)) -min.0 #:color 2))
-                       #:y-min -4)
-                 (lambert 0)
-                 (lambert (- (exp -1)))
-                 (lambert -1/2)
-                 (lambert- 0)
-                 (define y0 (lambert -0.1))
-                 (define y1 (lambert- -0.1))
-                 y0
-                 y1
-                 (* y0 (exp y0))
-                 (* y1 (exp y1))]
-
-The Lambert W function often appears in solutions to equations that contain
-@italic{n} log(@italic{n}), such as those that describe the running time of divide-and-conquer
-algorithms.
-
-For example, suppose we have a sort that takes @racket[t = (* c n (log n))] time, and we measure
-the time it takes to sort an @racket[n = 10000]-element list at @racket[t = 0.245] ms. Solving for
-@racket[c], we get
-@interaction[#:eval untyped-eval
-                    (define n 10000)
-                    (define t 0.245)
-                    (define c (/ t (* n (log n))))
-                    c]
-Now we would like to know how many elements we can sort in 100ms. We solve for @racket[n] and
-use the solution to define a function @racket[time->sort-size]:
-@interaction[#:eval untyped-eval
-                    (define (time->sort-size t)
-                      (exact-floor (exp (lambert (/ t c)))))
-                    (time->sort-size 100)]
-Testing the solution, we get
-@interaction[#:eval untyped-eval
-                    (eval:alts (define lst2 (build-list 2548516 values))
-                               (eval:result ""))
-                    (eval:alts (time (sort lst2 <))
-                               (eval:result "" "cpu time: 80 real time: 93 gc time: 0"))]
-
-For both branches, error is no more than 2 @tech{ulps} everywhere tested.
-}
-
-@defproc[(zeta [x Real]) Real]{
-Computes the @hyperlink["http://en.wikipedia.org/wiki/Riemann_zeta_function"]{Riemann zeta function}.
-If @racket[x] is a nonpositive exact integer, @racket[(zeta x)] is exact.
-
-@examples[#:eval untyped-eval
-                 (plot (function zeta -2 10) #:y-min -4 #:y-max 4)
-                 (plot (function zeta -14 -2))
-                 (zeta 0)
-                 (zeta 1)
-                 (zeta 1.0)
-                 (zeta -1)
-                 (eval:alts
-                  (define num 1000000)
-                  (eval:result ""))
-                 (eval:alts
-                  (define num-coprime
-                    (for/sum ([_  (in-range num)])
-                      (if (coprime? (random-bits 16) (random-bits 16)) 1 0)))
-                  (eval:result ""))
-                 (eval:alts (fl (/ num-coprime num))
-                            (eval:result @racketresultfont{0.607901}))
-                 (/ 1 (zeta 2))]
-
-When @racket[s] is an odd, negative exact integer, @racket[(zeta s)] computes
-@racket[(bernoulli (- 1 s))], which can be rather slow.
-
-Maximum observed error is 6 @tech{ulps}, but is usually 3 or less.
-}
-
-@defproc[(eta [x Real]) Real]{
-Computes the @hyperlink["http://en.wikipedia.org/wiki/Dirichlet_eta_function"]{Dirichlet eta function}.
-If @racket[x] is a nonpositive exact integer, @racket[(eta x)] is exact.
-
-@examples[#:eval untyped-eval
-                 (plot (function eta -10 6))
-                 (eta 0)
-                 (eta -1)
-                 (eta 1)
-                 (log 2)]
-
-When @racket[s] is an odd, negative exact integer, @racket[(eta s)] computes
-@racket[(bernoulli (- 1 s))], which can be rather slow.
-
-Maximum observed error is 11 @tech{ulps}, but is usually 4 or less.
-}
-
-@defproc[(hurwitz-zeta [s Real] [q Real]) Real]{
-Computes the @hyperlink["http://en.wikipedia.org/wiki/Hurwitz_zeta_function"]{Hurwitz
-zeta function} for @racket[s > 1] and @racket[q > 0]. When @racket[s = 1.0] or @racket[q = 0.0],
-@racket[(hurwitz-zeta s q) = +inf.0].
-
-@examples[#:eval untyped-eval
-                 (plot (list (function zeta 1.5 5)
-                             (function (λ (s) (hurwitz-zeta s 1))
-                                       #:color 2 #:style 'long-dash #:width 2)))
-                 (hurwitz-zeta 1 1)
-                 (hurwitz-zeta 1.0 1.0)
-                 (hurwitz-zeta 2 1/4)
-                 (+ (sqr pi) (* 8 catalan.0))]
-
-While @racket[hurwitz-zeta] currently raises an exception for @racket[s < 1], it may in the future
-return real values.
-
-Maximum observed error is 6 @tech{ulps}, but is usually 2 or less.
-}
-
-@defproc[(beta [x Real] [y Real]) (U Exact-Rational Flonum)]{
-Computes the @hyperlink["http://en.wikipedia.org/wiki/Beta_function"]{beta function} for positive
-real @racket[x] and @racket[y]. Like @racket[(/ (* (gamma x) (gamma y)) (gamma (+ x y)))],
-but more accurate.
-
-@examples[#:eval untyped-eval
-                 (plot3d (contour-intervals3d beta 0.25 2 0.25 2) #:angle 250)
-                 (beta 0 0)
-                 (beta 1 5)
-                 (beta 1.0 5.0)]
-}
-
-@defproc[(log-beta [x Real] [y Real]) (U Zero Flonum)]{
-Like @racket[(log (beta x y))], but more accurate and without unnecessary overflow.
-The only exact case is @racket[(log-beta 1 1) = 0].
-}
-
-@defproc[(gamma-inc [k Real] [x Real] [upper? Any #f] [regularized? Any #f]) Flonum]{
-Computes the @hyperlink["http://en.wikipedia.org/wiki/Incomplete_gamma_function"]{incomplete
-gamma integral} for @racket[k > 0] and @racket[x >= 0]. When @racket[upper? = #f], it integrates
-from zero to @racket[x]; otherwise it integrates from @racket[x] to infinity.
-
-If you are doing statistical work, you should probably use @racket[gamma-dist] instead, which
-is defined in terms of @racket[gamma-inc] and is more flexible (e.g. it allows negative @racket[x]).
-
-The following identities should hold:
-@itemlist[
-@item{@racket[(gamma-inc k 0) = 0]}
-@item{@racket[(gamma-inc k +inf.0) = (gamma k)]}
-@item{@racket[(+ (gamma-inc k x #f) (gamma-inc k x #t)) = (gamma k)] (approximately)}
-@item{@racket[(gamma-inc k x upper? #t) = (/ (gamma-inc k x upper? #f) (gamma k))] (approximately)}
-@item{@racket[(gamma-inc k +inf.0 #t #t) = 1.0]}
-@item{@racket[(+ (gamma-inc k x #f #t) (gamma-inc k x #t #t)) = 1.0] (approximately)}
-]
-@examples[#:eval untyped-eval
-                 (list
-                  (plot3d (contour-intervals3d gamma-inc 0.1 4.5 0 10)
-                          #:x-label "k" #:y-label "x" #:width 210 #:height 210)
-                  (plot3d (contour-intervals3d
-                           (λ (k x) (gamma-inc k x #t)) 0.1 4.5 0 10)
-                          #:x-label "k" #:y-label "x" #:width 210 #:height 210))
-                 (plot3d (contour-intervals3d
-                          (λ (k x) (gamma-inc k x #f #t)) 0.1 20 0 20)
-                         #:x-label "k" #:y-label "x")
-                 (gamma 4.0)
-                 (+ (gamma-inc 4.0 0.5 #f) (gamma-inc 4.0 0.5 #t))
-                 (gamma-inc 4.0 +inf.0)
-                 (/ (gamma-inc 200.0 50.0 #f) (gamma 200.0))
-                 (gamma-inc 200.0 50.0 #f #t)
-                 (gamma-inc 0 5.0)
-                 (gamma-inc 0.0 5.0)]
-}
-
-@defproc[(log-gamma-inc [k Real] [x Real] [upper? Any #f] [regularized? Any #f]) Flonum]{
-Like @racket[(log (gamma-inc k x upper? regularized?))], but more accurate and without unnecessary
-overflow.
-}
-
-@defproc[(beta-inc [a Real] [b Real] [x Real] [upper? Any #f] [regularized? Any #f]) Flonum]{
-Computes the @hyperlink["http://en.wikipedia.org/wiki/Beta_function#Incomplete_beta_function"]{
-incomplete beta integral} for @racket[a > 0], @racket[b > 0] and @racket[0 <= x <= 1].
-When @racket[upper? = #f], it integrates from zero to @racket[x]; otherwise, it integrates from
-@racket[x] to one.
-
-If you are doing statistical work, you should probably use @racket[beta-dist] instead, which
-is defined in terms of @racket[beta-inc] and is more flexible (e.g. it allows negative @racket[x]).
-
-Similar identities should hold as with @racket[gamma-inc].
-
-@examples[#:eval untyped-eval
-                 (plot3d (isosurfaces3d (λ (a b x) (beta-inc a b x #f #t))
-                                        0.1 2.5 0.1 2.5 0 1 #:label "beta(a,b,x)")
-                         #:x-label "a" #:y-label "b" #:z-label "x"
-                         #:angle 20 #:altitude 20 #:legend-anchor 'top)]
-}
-
-@defproc[(log-beta-inc [a Real] [b Real] [x Real] [upper? Any #f] [regularized? Any #f]) Flonum]{
-Like @racket[(log (beta-inc a b x upper? regularized?))], but more accurate and without unnecessary
-overflow.
-
-While most areas of this function have error less than @racket[5e-15], when @racket[a] and @racket[b]
-have very dissimilar magnitudes (e.g. @racket[1e-16] and @racket[1e16]), it exhibits
-@tech{catastrophic cancellation}. We are working on it.
-}
-
-@section[#:tag "flonum-functions"]{Flonum Functions}
-
-@defproc[(flgamma [x Flonum]) Flonum]{}
-@defproc[(fllog-gamma [x Flonum]) Flonum]{}
-@defproc[(flpsi0 [x Flonum]) Flonum]{}
-@defproc[(flpsi [m Integer] [x Flonum]) Flonum]{}
-@defproc[(flerf [x Flonum]) Flonum]{}
-@defproc[(flerfc [x Flonum]) Flonum]{}
-@defproc[(fllambert [x Flonum]) Flonum]{}
-@defproc[(fllambert- [x Flonum]) Flonum]{}
-@defproc[(flzeta [x Flonum]) Flonum]{}
-@defproc[(fleta [x Flonum]) Flonum]{}
-@defproc[(flhurwitz-zeta [s Flonum] [q Flonum]) Flonum]{}
-@defproc[(flbeta [x Flonum] [y Flonum]) Flonum]{}
-@defproc[(fllog-beta [x Flonum] [y Flonum]) Flonum]{}
-@defproc[(flgamma-inc [k Flonum] [x Flonum] [upper? Any] [regularized? Any]) Flonum]{}
-@defproc[(fllog-gamma-inc [k Flonum] [x Flonum] [upper? Any] [regularized? Any]) Flonum]{}
-@defproc[(flbeta-inc [a Flonum] [b Flonum] [x Flonum] [upper? Any] [regularized? Any]) Flonum]{}
-@defproc[(fllog-beta-inc [a Flonum] [b Flonum] [x Flonum] [upper? Any] [regularized? Any]) Flonum]{
-Flonum versions of the above functions. These return @racket[+nan.0] instead of raising errors and do
-not have optional arguments. They can be a little faster to apply because they check fewer special
-cases.
-}
-
-@(close-eval untyped-eval)
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/math-statistics.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-statistics.scrbl
deleted file mode 100644
index 091befe20d..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/math-statistics.scrbl
+++ /dev/null
@@ -1,519 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          racket/sandbox
-          (for-label racket/base
-                     racket/promise
-                     racket/sequence
-                     (except-in racket/list permutations) ; FIXME
-                     math plot
-                     (only-in typed/racket/base
-                              ann inst
-                              Flonum Real Boolean Any Listof Integer case-> -> U
-                              Sequenceof Positive-Flonum Nonnegative-Flonum Symbol
-                              HashTable Positive-Integer Nonnegative-Real Values
-                              String))
-          "utils.rkt")
-
-@(define typed-eval (make-math-eval))
-@interaction-eval[#:eval typed-eval (require)]
-
-@title[#:tag "stats"]{Statistics Functions}
-@(author-neil)
-
-@defmodule[math/statistics]
-
-This module exports functions that compute @deftech{statistics}, meaning summary values for
-collections of samples, and functions for managing sequences of weighted or unweighted samples.
-
-Most of the functions that compute statistics accept a sequence of nonnegative reals that
-correspond one-to-one with sample values.
-These are used as weights; equivalently counts, pseudocounts or unnormalized probabilities.
-While this makes it easy to work with weighted samples, it introduces some subtleties
-in bias correction.
-In particular, central moments must be computed without bias correction by default.
-See @secref{stats:expected-values} for a discussion.
-
-@local-table-of-contents[]
-
-@section[#:tag "stats:expected-values"]{Expected Values}
-
-Functions documented in this section that compute higher central moments, such as @racket[variance],
-@racket[stddev] and @racket[skewness], can optionally apply bias correction to their estimates.
-For example, when @racket[variance] is given the argument @racket[#:bias #t], it
-multiplies the result by @racket[(/ n (- n 1))], where @racket[n] is the number of samples.
-
-The meaning of ``bias correction'' becomes less clear with weighted samples, however. Often, the
-weights represent counts, so when moment-estimating functions receive @racket[#:bias #t], they
-interpret it as ``use the sum of @racket[ws] for @racket[n].''
-In the following example, the sample @racket[4] is first counted twice and then given weight
-@racket[2]; therefore @racket[n = 5] in both cases:
-@interaction[#:eval typed-eval
-                    (variance '(1 2 3 4 4) #:bias #t)
-                    (variance '(1 2 3 4) '(1 1 1 2) #:bias #t)]
-
-However, sample weights often do not represent counts. For these cases, the @racket[#:bias]
-keyword can be followed by a real-valued pseudocount, which is used for @racket[n]:
-@interaction[#:eval typed-eval
-                    (variance '(1 2 3 4) '(1/2 1/2 1/2 1) #:bias 5)]
-
-Because the magnitude of the bias correction for weighted samples cannot be known without user
-guidance, in all cases, the bias argument defaults to @racket[#f].
-
-@defproc[(mean [xs (Sequenceof Real)] [ws (U #f (Sequenceof Real)) #f]) Real]{
-When @racket[ws] is @racket[#f] (the default), returns the sample mean of the values in @racket[xs].
-Otherwise, returns the weighted sample mean of the values in @racket[xs] with corresponding weights
-@racket[ws].
-@examples[#:eval typed-eval
-                 (mean '(1 2 3 4 5))
-                 (mean '(1 2 3 4 5) '(1 1 1 1 10.0))
-                 (define d (normal-dist))
-                 (mean (sample d 10000))
-                 (define arr (array-strict (build-array #(5 1000) (λ (_) (sample d)))))
-                 (array-map mean (array->list-array arr 1))]
-}
-
-@deftogether[(@defproc[(variance [xs (Sequenceof Real)]
-                                 [ws (U #f (Sequenceof Real)) #f]
-                                 [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Real]
-              @defproc[(stddev [xs (Sequenceof Real)]
-                               [ws (U #f (Sequenceof Real)) #f]
-                               [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Real]
-              @defproc[(skewness [xs (Sequenceof Real)]
-                                 [ws (U #f (Sequenceof Real)) #f]
-                                 [#:bias bias (U #t #f Real) #f])
-                       Real]
-              @defproc[(kurtosis [xs (Sequenceof Real)]
-                                 [ws (U #f (Sequenceof Real)) #f]
-                                 [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Real])]{
-If @racket[ws] is @racket[#f], these compute the sample variance, standard deviation, skewness
-and excess kurtosis the samples in @racket[xs].
-If @racket[ws] is not @racket[#f], they compute weighted variations of the same.
-@examples[#:eval typed-eval
-                 (stddev '(1 2 3 4 5))
-                 (stddev '(1 2 3 4 5) '(1 1 1 1 10))]
-See @secref{stats:expected-values} for the meaning of the @racket[bias] keyword argument.
-}
-
-@deftogether[(@defproc[(variance/mean [m Real]
-                                      [xs (Sequenceof Real)]
-                                      [ws (U #f (Sequenceof Real)) #f]
-                                      [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Real]
-              @defproc[(stddev/mean [m Real]
-                                    [xs (Sequenceof Real)]
-                                    [ws (U #f (Sequenceof Real)) #f]
-                                    [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Real]
-              @defproc[(skewness/mean [m Real]
-                                      [xs (Sequenceof Real)]
-                                      [ws (U #f (Sequenceof Real)) #f]
-                                      [#:bias bias (U #t #f Real) #f])
-                       Real]
-              @defproc[(kurtosis/mean [m Real]
-                                      [xs (Sequenceof Real)]
-                                      [ws (U #f (Sequenceof Real)) #f]
-                                      [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Real])]{
-Like @racket[variance], @racket[stddev], @racket[skewness] and @racket[kurtosis], but computed
-using known mean @racket[m].
-}
-
-@section[#:tag "stats:running"]{Running Expected Values}
-
-The @racket[statistics] object allows computing the sample minimum, maximum, count, mean, variance,
-skewness, and excess kurtosis of a sequence of samples in O(1) space.
-
-To use it, start with @racket[empty-statistics], then use @racket[update-statistics] to obtain a
-new statistics object with updated values. Use @racket[statistics-min], @racket[statistics-mean],
-and similar functions to get the current estimates.
-@examples[#:eval typed-eval
-                 (let* ([s  empty-statistics]
-                        [s  (update-statistics s 1)]
-                        [s  (update-statistics s 2)]
-                        [s  (update-statistics s 3)]
-                        [s  (update-statistics s 4 2)])
-                   (values (statistics-mean s)
-                           (statistics-stddev s #:bias #t)))]
-
-@defstruct*[statistics ([min Flonum]
-                        [max Flonum]
-                        [count Nonnegative-Flonum])]{
-Represents running statistics.
-
-The @racket[min] and @racket[max] fields are the minimum and maximum
-value observed so far, and the @racket[count] field is the total weight of the samples (which is the
-number of samples if all samples are unweighted).
-The remaining, hidden fields are used to compute moments, and their number and meaning may change in
-future releases.
-}
-
-@defthing[empty-statistics statistics]{
-The empty statistics object.
-@examples[#:eval typed-eval
-                 (statistics-min empty-statistics)
-                 (statistics-max empty-statistics)
-                 (statistics-range empty-statistics)
-                 (statistics-count empty-statistics)
-                 (statistics-mean empty-statistics)
-                 (statistics-variance empty-statistics)
-                 (statistics-skewness empty-statistics)
-                 (statistics-kurtosis empty-statistics)]
-}
-
-@defproc[(update-statistics [s statistics] [x Real] [w Real 1.0]) statistics]{
-Returns a new statistics object that includes @racket[x] in the computed statistics. If @racket[w]
-is given, @racket[x] is weighted by @racket[w] in the moment computations.
-}
-
-@defproc[(update-statistics* [s statistics]
-                             [xs (Sequenceof Real)]
-                             [ws (U #f (Sequenceof Real)) #f])
-         statistics]{
-Like @racket[update-statistics], but includes all of @racket[xs], possibly weighted by corresponding
-elements in @racket[ws], in the returned statistics object.
-@examples[#:eval typed-eval
-                 (define s (update-statistics* empty-statistics '(1 2 3 4) '(1 1 1 2)))
-                 (statistics-mean s)
-                 (statistics-stddev s #:bias #t)]
-This function uses O(1) space regardless of the length of @racket[xs].
-}
-
-@deftogether[(@defproc[(statistics-range [s statistics]) Nonnegative-Flonum]
-              @defproc[(statistics-mean [s statistics]) Flonum]
-              @defproc[(statistics-variance [s statistics] [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Flonum]
-              @defproc[(statistics-stddev [s statistics] [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Flonum]
-              @defproc[(statistics-skewness [s statistics] [#:bias bias (U #t #f Real) #f])
-                       Flonum]
-              @defproc[(statistics-kurtosis [s statistics] [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Flonum])]{
-Compute the range, mean, variance, standard deviation, skewness, and excess kurtosis of the
-observations summarized in @racket[s].
-
-See @secref{stats:expected-values} for the meaning of the @racket[bias] keyword argument.
-}
-
-@section{Correlation}
-
-@deftogether[(@defproc[(covariance [xs (Sequenceof Real)]
-                                   [ys (Sequenceof Real)]
-                                   [ws (U #f (Sequenceof Real)) #f]
-                                   [#:bias bias (U #t #f Real) #f])
-                       Real]
-              @defproc[(correlation [xs (Sequenceof Real)]
-                                    [ys (Sequenceof Real)]
-                                    [ws (U #f (Sequenceof Real)) #f]
-                                    [#:bias bias (U #t #f Real) #f])
-                       Real])]{
-Compute the sample covariance and correlation of @racket[xs] and @racket[ys], optionally
-weighted by @racket[ws].
-
-@examples[#:eval typed-eval
-                 (define xs (sample (normal-dist) 10000))
-                 (define ys (map (λ: ([x : Real]) (sample (normal-dist x))) xs))
-                 (correlation xs ys)]
-Removing the correlation using importance weights:
-@interaction[#:eval typed-eval
-                    (define ws (map (λ: ([x : Real] [y : Real])
-                                      (/ (pdf (normal-dist) y)
-                                         (pdf (normal-dist x) y)))
-                                    xs ys))
-                    (correlation xs ys (ann ws (Sequenceof Real)))]
-
-See @secref{stats:expected-values} for the meaning of the @racket[bias] keyword argument.
-}
-
-@deftogether[(@defproc[(covariance/means [mx Real]
-                                         [my Real]
-                                         [xs (Sequenceof Real)]
-                                         [ys (Sequenceof Real)]
-                                         [ws (U #f (Sequenceof Real)) #f]
-                                         [#:bias bias (U #t #f Real) #f])
-                       Real]
-              @defproc[(correlation/means [mx Real]
-                                          [my Real]
-                                          [xs (Sequenceof Real)]
-                                          [ys (Sequenceof Real)]
-                                          [ws (U #f (Sequenceof Real)) #f]
-                                          [#:bias bias (U #t #f Real) #f])
-                       Real])]{
-Like @racket[covariance] and @racket[correlation], but computed using known means
-@racket[mx] and @racket[my].
-}
-
-@section{Counting and Binning}
-
-@defproc*[([(samples->hash [xs (Sequenceof A)]) (HashTable A Positive-Integer)]
-           [(samples->hash [xs (Sequenceof A)] [ws (U #f (Sequenceof Real))])
-            (HashTable A Nonnegative-Real)])]{
-Returns a hash table mapping each unique element in @racket[xs] (under @racket[equal?]) to its
-count, or, if @racket[ws] is not @racket[#f], to its total weight.
-@examples[#:eval typed-eval
-                 (samples->hash '(1 2 3 4 4))
-                 (samples->hash '(1 1 2 3 4) '(1/2 1/2 1 1 2))]
-}
-
-@defproc*[([(count-samples [xs (Sequenceof A)]) (Values (Listof A) (Listof Positive-Integer))]
-           [(count-samples [xs (Sequenceof A)] [ws (U #f (Sequenceof Real))])
-            (Values (Listof A) (Listof Nonnegative-Real))])]{
-Like @racket[samples->hash], but returns two lists.
-The elements in the returned @racket[(Listof A)] are in order of first appearance in @racket[xs].
-@examples[#:eval typed-eval
-                 (count-samples '(1 2 3 4 4))
-                 (count-samples '(1 1 2 3 4) '(1/2 1/2 1 1 2))]
-}
-
-@defstruct*[sample-bin ([min B]
-                        [max B]
-                        [values (Listof A)]
-                        [weights (U #f (Listof Nonnegative-Real))])]{
-Represents a @italic{bin}, or a group of samples within an interval in a total order.
-The values and bounds have a different type to allow @racket[bin-samples/key]
-to group elements based on a function of their values.
-}
-
-@defproc[(bin-samples [bounds (Sequenceof A)]
-                      [lte? (A A -> Any)]
-                      [xs (Sequenceof A)]
-                      [ws (U #f (Sequenceof Real))])
-         (Listof (sample-bin A A))]{
-Similar to @racket[(sort xs lte?)], but additionally groups samples into bins.
-The bins' @racket[bounds] are sorted before binning @racket[xs].
-
-If @racket[n = (length bounds)], then @racket[bin-samples] returns @italic{at least} @racket[(- n 1)]
-bins, one for each pair of adjacent (sorted) bounds.
-If some values in @racket[xs] are less than the smallest bound, they are grouped into a single bin in
-front.
-If some are greater than the largest bound, they are grouped into a single bin at the end.
-
-@examples[#:eval typed-eval
-                 (bin-samples '() <= '(0 1 2 3 4 5 6))
-                 (bin-samples '(3) <= '(0 1 2 3 4 5 6))
-                 (bin-samples '(2 4) <= '(0 1 2 3 4 5 6))
-                 (bin-samples '(2 4) <=
-                              '(0 1 2 3 4 5 6)
-                              '(10 20 30 40 50 60 70))]
-
-If @racket[lte?] is a less-than-or-equal relation, the bins represent half-open intervals
-(@racket[min], @racket[max]] (except possibly the first, which may be closed).
-If @racket[lte?] is a less-than relation, the bins represent half-open intervals
-[@racket[min], @racket[max]) (except possibly the last, which may be closed).
-In either case, the sorts applied to @racket[bounds] and @racket[xs] are stable.
-
-Because intervals used in probability measurements are normally open on the left, prefer to use
-less-than-or-equal relations for @racket[lte?].
-
-If @racket[ws] is @racket[#f], @racket[bin-samples] returns bins with @racket[#f] weights.
-}
-
-@defproc[(bin-samples/key [bounds (Sequenceof B)]
-                          [lte? (B B -> Any)]
-                          [key (A -> B)]
-                          [xs (Sequenceof A)]
-                          [ws (U #f (Sequenceof Real))])
-         (Listof (sample-bin A B))]{
-Similar to @racket[(sort xs lte? #:key key #:cache-keys? #t)], but additionally groups samples into
-bins.
-@examples[#:eval typed-eval
-                 (bin-samples/key '(2 4) <= (inst car Real String)
-                                  '((1 . "1") (2 . "2") (3 . "3") (4 . "4") (5 . "5")))]
-See @racket[bin-samples] for the simpler, one-type variant.
-}
-
-@defproc[(sample-bin-compact [bin (sample-bin A B)]) (sample-bin A B)]{
-Compacts @racket[bin] by applying @racket[count-samples] to its values and weights.
-@examples[#:eval typed-eval
-                 (sample-bin-compact (sample-bin 1 4 '(1 2 3 4 4) #f))]
-}
-
-@defproc[(sample-bin-total [bin (sample-bin A B)]) Nonnegative-Real]{
-If @racket[(sample-bin-weights bin)] is @racket[#f], returns the number of samples in @racket[bin];
-otherwise, returns the sum of their weights.
-@examples[#:eval typed-eval
-                 (sample-bin-total (sample-bin 1 4 '(1 2 3 4 4) #f))
-                 (sample-bin-total (sample-bin-compact (sample-bin 1 4 '(1 2 3 4 4) #f)))]
-}
-
-@section{Order Statistics}
-
-@defproc*[([(sort-samples [lt? (A A -> Any)] [xs (Sequenceof A)]) (Listof A)]
-           [(sort-samples [lt? (A A -> Any)]
-                          [xs (Sequenceof A)]
-                          [ws (U #f (Sequenceof Real))])
-            (Values (Listof A) (Listof Nonnegative-Real))])]{
-Sorts possibly weighted samples according to @racket[lt?], which is assumed to define a total
-order over the elements in @racket[xs].
-@examples[#:eval typed-eval
-                 (sort-samples < '(5 2 3 1))
-                 (sort-samples < '(5 2 3 1) '(50 20 30 10))
-                 (sort-samples < '(5 2 3 1) #f)]
-Because @racket[sort-samples] is defined in terms of @racket[sort], the sort is only guaranteed
-to be stable if @racket[lt?] is strictly a less-than relation.
-}
-
-@defproc[(median [lt? (A A -> Any)] [xs (Sequenceof A)] [ws (U #f (Sequenceof Real)) #f]) A]{
-Equivalent to @racket[(quantile 1/2 lt? xs ws)].
-}
-
-@defproc[(quantile [p Real]
-                   [lt? (A A -> Any)]
-                   [xs (Sequenceof A)]
-                   [ws (U #f (Sequenceof Real)) #f])
-         A]{
-Computes the inverse of the empirical @tech{cdf} represented by the samples @racket[xs],
-which are optionally weighted by @racket[ws].
-
-@examples[#:eval typed-eval
-                 (quantile 0 < '(1 3 5))
-                 (quantile 0.5 < '(1 2 3 4))
-                 (quantile 0.5 < '(1 2 3 4) '(0.25 0.20 0.20 0.35))]
-
-If @racket[p = 0], @racket[quantile] returns the smallest element of @racket[xs] under the
-ordering relation @racket[lt?]. If @racket[p = 1], it returns the largest element.
-
-For weighted samples, @racket[quantile] sorts @racket[xs] and @racket[ws] together
-(using @racket[sort-samples]), then finds the least @racket[x] for which the proportion of its
-cumulative weight is greater than or equal to @racket[p].
-
-For unweighted samples, @racket[quantile] uses the quickselect algorithm to find the element that
-would be at index @racket[(ceiling (- (* p n) 1))] if @racket[xs] were sorted, where @racket[n]
-is the length of @racket[xs].
-}
-
-@defproc[(absdev [xs (Sequenceof Real)] [ws (U #f (Sequenceof Real)) #f]) Nonnegative-Real]{
-Computes the average absolute difference between the elements in @racket[xs] and
-@racket[(median < xs ws)]. If @racket[ws] is not @racket[#f], it is a weighted average.
-}
-
-@defproc[(absdev/median [median Real] [xs (Sequenceof Real)] [ws (U #f (Sequenceof Real)) #f])
-         Nonnegative-Real]{
-Like @racket[(absdev xs ws)], but computed using known median @racket[median].
-}
-
-@deftogether[(@defproc[(hpd-interval [lt? (A A -> Any)]
-                                     [δ (A A -> Real)]
-                                     [p Real]
-                                     [xs (Sequenceof A)]
-                                     [ws (U #f (Sequenceof Real)) #f])
-                       (Values A A)]
-              @defproc[(hpd-interval/sorted [δ (A A -> Real)]
-                                            [p Real]
-                                            [xs (Sequenceof A)]
-                                            [ws (U #f (Sequenceof Real)) #f])
-                       (Values A A)])]{
-Estimates the smallest interval for which the distribution that produced @racket[xs] (optionally
-weighted by @racket[ws]) assigns probability @racket[p], which must be positive.
-The type @racket[A] represents an ordered metric space with order @racket[lt?] and metric @racket[δ].
-
-To compute an HPD interval from sorted samples, use @racket[hpd-interval/sorted].
-
-You almost certainly want to use @racket[real-hpd-interval] or @racket[real-hpd-interval/sorted]
-instead, which are defined in terms of these.
-}
-
-@deftogether[(@defproc[(real-hpd-interval [p Real]
-                                          [xs (Sequenceof Real)]
-                                          [ws (U #f (Sequenceof Real)) #f])
-                       (Values Real Real)]
-              @defproc[(real-hpd-interval/sorted [p Real]
-                                                 [xs (Sequenceof Real)]
-                                                 [ws (U #f (Sequenceof Real)) #f])
-                       (Values Real Real)])]{
-Equivalent to @racket[(hpd-interval < - p xs ws)] and @racket[(hpd-interval/sorted - p xs ws)].
-@examples[#:eval typed-eval
-                 (define beta32 (beta-dist 3 2))
-                 (real-dist-hpd-interval beta32 0.8)
-                 (real-hpd-interval 0.8 (sample beta32 10000))]
-}
-
-@section{Simulations}
-
-The functions in this section support Monte Carlo simulation; for example, quantifying uncertainty
-about statistics estimated from samples.
-
-@deftogether[(@defproc[(mc-variance [xs (Sequenceof Real)]
-                                    [ws (U #f (Sequenceof Real)) #f]
-                                    [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Real]
-              @defproc[(mc-stddev [xs (Sequenceof Real)]
-                                  [ws (U #f (Sequenceof Real)) #f]
-                                  [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Real])]{
-Estimate the variance and standard deviation of expected values computed from random samples.
-
-If @racket[xs] are random variable samples, then
-@racketblock[(define θ (mean xs ws))]
-is also a random variable sample.
-These two values:
-@racketblock[(mc-variance xs ws #:bias bias)
-             (mc-stddev xs ws #:bias bias)]
-estimate the variance and standard deviation of @racket[θ].
-The latter is simply the square root of the variance, and bias correction is applied as described in
-@secref{stats:expected-values}.
-
-
-Two different ways to estimate the standard deviation of a mean computed from 1000 samples are
-@interaction[#:eval typed-eval
-                    (mc-stddev (sample (normal-dist 0 1) 1000))
-                    (stddev (for/list : (Listof Real) ([_  (in-range 100)])
-                              (mean (sample (normal-dist 0 1) 1000))))]
-Using @racket[mc-stddev] is 100 times faster in this case, and in most statistical applications,
-replicating a sampling process 100 times is infeasible.
-}
-
-@deftogether[(@defproc[(mc-stddev/mean [m Real]
-                                       [xs (Sequenceof Real)]
-                                       [ws (U #f (Sequenceof Real)) #f]
-                                       [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Real]
-              @defproc[(mc-variance/mean [m Real]
-                                         [xs (Sequenceof Real)]
-                                         [ws (U #f (Sequenceof Real)) #f]
-                                         [#:bias bias (U #t #f Real) #f])
-                       Nonnegative-Real]
-              )]{
-Use these in the exceedingly rare cases in which you know the mean @racket[m] but are estimating
-uncertainty in an estimate of the mean anyway.
-}
-
-@defproc[(indicator [pred? (A -> Any)]) (A -> (U 0 1))]{
-Converts a predicate into an indicator function.
-@examples[#:eval typed-eval                 
-                 (fl (mean (map (indicator (λ ([x : Real]) (< -inf.0 x -1)))
-                                (sample (normal-dist 0 1) 5000))))
-                 (real-dist-prob (normal-dist 0 1) -inf.0 -1)]
-}
-
-@defproc[(mc-probability [pred? (A -> Any)]
-                         [xs (Sequenceof A)]
-                         [ws (U #f (Sequenceof Real)) #f])
-         Nonnegative-Real]{
-Estimates the probability of @racket[pred?] from possibly weighted samples.
-Equivalent to @racket[(mean (sequence-map (indicator pred?) xs) ws)].
-@examples[#:eval typed-eval
-                 (fl (mc-probability (λ ([x : Real]) (< -inf.0 x -1))
-                                     (sample (normal-dist 0 1) 5000)))]
-}
-
-@defproc[(mc-prob-dist [pred? (A -> Any)]
-                       [xs (Sequenceof A)]
-                       [ws (U #f (Sequenceof Real)) #f])
-         Beta-Dist]{
-Returns a beta distribution estimated from possibly weighted samples whose mean is
-@racket[(mc-probability pred? xs ws)].
-
-Computing a confidence interval for a probability whose endpoints are guaranteed to be
-between @racket[0] and @racket[1]:
-@interaction[#:eval typed-eval
-                    (real-dist-hpd-interval
-                     (mc-prob-dist (λ ([x : Real]) (< -inf.0 x -1))
-                                   (sample (normal-dist 0 1) 5000))
-                     0.95)]
-}
-
-@(close-eval typed-eval)
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/math-utils.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-utils.scrbl
deleted file mode 100644
index f911cbe43d..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/math-utils.scrbl
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          racket/sandbox
-          (for-label racket/base racket/future
-                     math
-                     (only-in typed/racket/base
-                              Real Boolean Integer Natural Number Listof
-                              Positive-Flonum Float-Complex Any List Positive-Integer))
-          "utils.rkt")
-
-@(define untyped-eval (make-untyped-math-eval))
-
-@title[#:tag "utils"]{Stuff That Doesn't Belong Anywhere Else}
-@(author-neil)
-
-@defmodule[math/utils]
-
-@section[#:tag "utils:parallel"]{Parallelization}
-
-@defparam[max-math-threads num Positive-Integer]{
-The maximum number of threads a parallelized @racketmodname[math] function
-will use. The default value is @racket[(max 1 (processor-count))].
-}
-
-@section[#:tag "utils:dft"]{Discrete Fourier Transform Conventions}
-
-@defparam[dft-convention lst (List Real Real)]{
-A parameter controlling the convention used for scaling discrete Fourier transforms, such as those
-performed by @racket[array-fft]. The default value is @racket['(1 -1)], which represents the convention
-used in signal processing.
-
-In general, if @racket[lst] is @racket[(list a b)] and @racket[n] is the length of a transformed
-array axis or vector, then
-@itemlist[@item{Each sum is scaled by @racket[(expt n (/ (- a 1) 2))].}
-          @item{Each exponential in the sum has its argument scaled by @racket[b].}]
-Conveniently, a Fourier transform with convention @racket[(list (- a) (- b))] is the inverse
-of a Fourier transform with convention @racket[(list a b)].
-
-See Mathematica's
-@hyperlink["http://reference.wolfram.com/mathematica/tutorial/FourierTransforms.html"]{documentation
-on @tt{Fourier}}, from which this excellent idea was stolen.
-}
-
-@defproc[(dft-inverse-convention) (List Real Real)]{
-Returns the convention used for inverse Fourier transforms, given the current convention.
-}
-
-@section[#:tag "utils:fpu-test"]{Floating-Point Compliance Testing}
-
-@defproc[(test-floating-point [n Natural]) (Listof (List Any Any))]{
-Runs a comprehensive test of the system's IEEE 754 (floating-point) compliance, and reports
-unexpected inaccuracies and errors.
-
-In each test, a function is applied to some carefully chosen values, as well as @racket[n] additional
-random values.
-Its corresponding @tech{bigfloat} function is applied to the same values, and the answers are
-compared.
-Each test returns a list of failures, which are appended and returned.
-
-Each failure in a failure list is formatted
-@racketblock[(list (list name args ...) reason)]
-where @racket[name] is the name of a function, such as @racket['fl+], @racket[args ...] are the
-arguments it was applied to, and @racket[reason] is the reason for the failure.
-
-If @racket[reason] is a flonum, the failure was due to inaccuracy. For example,
-@racketblock[(list (list 'fl+ 4.5 2.3) 0.76)]
-means the result of @racket[(fl+ 4.5 2.3)] was off by @racket[0.76] @tech{ulps}.
-
-The threshold for reporting unexpected inaccuracy depends on the function tested.
-All the arithmetic and irrational functions exported by @racketmodname[racket/flonum], for example,
-must have no more than @racket[0.5] ulps error in order to be compliant.
-
-Two other possible failure reasons are
-@racketblock[(list 'different-zero 0.0 -0.0)
-             (list 'different-zero -0.0 0.0)]
-The first zero is the answer returned by the function, and the second zero is the expected answer.
-
-Other possible failure reasons have the form
-@racketblock[(list 'not-fl2? x y)]
-meaning that the result @racket[(values x y)] is not a valid flonum expansion.
-Such reasons are only given for failures of functions whose names begin with @tt{fl2} or contain
-@tt{/error}.
-These functions are currently undocumented, but are used to implement many
-@racketmodname[math/flonum], @racketmodname[math/special-functions], and
-@racketmodname[math/distributions] functions.
-
-Tests of functions that operate on and return flonum expansions are the strictest tests, requiring
-hardware arithmetic to be perfectly IEEE 754 compliant.
-They reliably fail on seemingly innocuous noncompliant behavior, such as computing intermediate
-results with 80-bit precision.
-}
-
-@defparam[print-fp-test-progress? print? Boolean]{
-When @racket[(print-fp-test-progress?)] is @racket[#t], floating-point tests print and flush a
-representation of their progress as they run. The default value is @racket[#t].
-}
-
-@(close-eval untyped-eval)
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/math.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math.scrbl
deleted file mode 100644
index 02338bddf4..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/math.scrbl
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang scribble/manual
-
-@(require "utils.rkt")
-
-@title[#:tag "top"]{Math Library}
-@(author-neil)
-@(author-jens-axel)
-
-@defmodule[math]
-
-The @racketmodname[math] library provides functions and data structures useful
-for working with numbers and collections of numbers. These include
-@itemlist[
-  @item{@racketmodname[math/base]: Constants and elementary functions}
-  @item{@racketmodname[math/flonum]: Flonum functions, including high-accuracy support}
-  @item{@racketmodname[math/special-functions]: Special (i.e. non-elementary) functions}
-  @item{@racketmodname[math/bigfloat]: Arbitrary-precision floating-point functions}
-  @item{@racketmodname[math/number-theory]: Number-theoretic functions}
-  @item{@racketmodname[math/array]: Functional arrays for operating on large rectangular data sets}
-  @item{@racketmodname[math/matrix]: Linear algebra functions for arrays}
-  @item{@racketmodname[math/distributions]: Probability distributions}
-  @item{@racketmodname[math/statistics]: Statistical functions}
-]
-
-With this library, we hope to support a wide variety of applied mathematics in
-Racket, including simulation, statistical inference, signal processing, and
-combinatorics. If you find it lacking for your variety of mathematics, please
-@itemlist[@item{Visit the @hyperlink["https://github.com/plt/racket/wiki/Math-Library-Features"]{Math Library Features wiki page}
-                to see what is planned.}
-          @item{Contact us or post to one of the @hyperlink["http://racket-lang.org/community.html"]{mailing lists} to
-                make suggestions or submit patches.}]
-
-@bold{This is a Typed Racket library.} It is most efficient to use it in Typed
-Racket, so that contracts are checked statically. However, almost all of it can
-be used in untyped Racket. Exceptions and performance warnings are in @bold{bold text}.
-
-@local-table-of-contents[]
-
-@include-section["math-base.scrbl"]
-@include-section["math-flonum.scrbl"]
-@include-section["math-special-functions.scrbl"]
-@include-section["math-number-theory.scrbl"]
-@include-section["math-bigfloat.scrbl"]
-@include-section["math-array.scrbl"]
-@include-section["math-matrix.scrbl"]
-@include-section["math-statistics.scrbl"]
-@include-section["math-distributions.scrbl"]
-@include-section["math-utils.scrbl"]
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/rename-defines.rkt b/pkgs/math-pkgs/math-doc/math/scribblings/rename-defines.rkt
deleted file mode 100644
index 4e41035889..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/rename-defines.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         (only-in typed/racket/base define:))
-
-(provide rename-defines)
-
-(define-syntax (rename-defines stx)
-  (syntax-case stx ()
-    [(_ e)
-     (let ([expanded  (local-expand #'e (syntax-local-context) #f)])
-       (syntax-case expanded (define-values begin)
-         [(define-values (x ...) expr)
-          (with-syntax ([(y ...)  (generate-temporaries #'(x ...))])
-            (syntax/loc stx
-              (begin
-                (define-syntax x (make-rename-transformer #'y)) ...
-                (define-values (y ...) expr))))]
-         [(begin e ...)
-          #'(begin (rename-defines e) ...)]
-         [_  #'e]))]))
diff --git a/pkgs/math-pkgs/math-doc/math/scribblings/utils.rkt b/pkgs/math-pkgs/math-doc/math/scribblings/utils.rkt
deleted file mode 100644
index af967e3295..0000000000
--- a/pkgs/math-pkgs/math-doc/math/scribblings/utils.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang at-exp racket/base
-
-(require scribble/eval
-         scribble/manual)
-
-(provide author-neil
-         author-jens-axel
-         make-plain-math-eval
-         make-math-eval
-         make-untyped-math-eval)
-
-(define (author-neil)
-  @author{@(author+email "Neil Toronto" "ntoronto@racket-lang.org")})
-
-(define (author-jens-axel)
-  @author{@(author+email "Jens Axel Søgaard" "jensaxel@soegaard.net")})
-
-(define (make-plain-math-eval)
-  (define eval (make-base-eval))
-  (eval '(require typed/racket/base))
-  (eval '(require math))
-  eval)
-
-(define (make-math-eval)
-  (define eval (make-plain-math-eval))
-  (eval '(require math/scribblings/rename-defines))
-  (λ (v)
-    (cond [(syntax? v)  (eval #`(rename-defines #,v))]
-          [(list? v)  (eval `(rename-defines ,v))]
-          [else  (eval v)])))
-
-(define (make-untyped-math-eval)
-  (define eval (make-base-eval))
-  (eval '(require math))
-  (eval '(require plot/pict))
-  eval)
diff --git a/pkgs/math-pkgs/math-lib/LICENSE.txt b/pkgs/math-pkgs/math-lib/LICENSE.txt
deleted file mode 100644
index 0d5401b315..0000000000
--- a/pkgs/math-pkgs/math-lib/LICENSE.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-The math collection is distributed under the GNU Lesser General Public
-License Version 3 (LGPLv3) just like the majority of Racket's libraries.
-The LGPLv3 license text is included in the file "COPYING_LESSER.txt".
-
-Some of the math library code is derived from the C++ project Boost,
-from source files released under the Boost Software License Version 1.0
-(BSLv1.0). This license is compatible with the LGPLv3, provided the
-BSLv1.0 license text is distributed along with any source code derived
-from BSLv1.0 works.
-
-Some of the math library is derived from ubiquitous C libraries released
-under a license with similar terms.
-
-To comply with the terms of the BSLv1.0, its text is duplicated here:
-
-============================================================================
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-============================================================================
-
-
-To comply with the terms of the other license, its text is duplicated here:
-
-============================================================================
-Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
-
-Developed at SunPro, a Sun Microsystems, Inc. business. Permission to use,
-copy, modify, and distribute this software is freely granted, provided that
-this notice is preserved.
-============================================================================
diff --git a/pkgs/math-pkgs/math-lib/info.rkt b/pkgs/math-pkgs/math-lib/info.rkt
deleted file mode 100644
index e1e81f791a..0000000000
--- a/pkgs/math-pkgs/math-lib/info.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "typed-racket-lib"
-               "typed-racket-more"
-               ("math-i386-macosx" #:platform "i386-macosx")
-               ("math-x86_64-macosx" #:platform "x86_64-macosx")
-               ("math-ppc-macosx" #:platform "ppc-macosx")
-               ("math-win32-i386" #:platform "win32\\i386")
-               ("math-win32-x86_64" #:platform "win32\\x86_64")
-               ("math-x86_64-linux-natipkg" #:platform "x86_64-linux-natipkg")))
-
-(define build-deps '())
-
-(define pkg-desc "Math library")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/math-pkgs/math-lib/math/array.rkt b/pkgs/math-pkgs/math-lib/math/array.rkt
deleted file mode 100644
index 696064280d..0000000000
--- a/pkgs/math-pkgs/math-lib/math/array.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang racket/base
-
-(require "private/array/array-struct.rkt"
-         "private/array/array-constructors.rkt"
-         "private/array/array-pointwise.rkt"
-         "private/array/array-indexing.rkt"
-         "private/array/array-broadcast.rkt"
-         "private/array/array-transform.rkt"
-         "private/array/array-convert.rkt"
-         "private/array/array-fold.rkt"
-         "private/array/array-unfold.rkt"
-         "private/array/array-print.rkt"
-         "private/array/array-fft.rkt"
-         "private/array/array-syntax.rkt"
-         "private/array/utils.rkt"
-         "private/array/array-comprehension.rkt"
-         "private/array/array-sequence.rkt"
-         "private/array/mutable-array.rkt"
-         "private/array/flarray-struct.rkt"
-         "private/array/flarray-pointwise.rkt"
-         "private/array/fcarray-struct.rkt"
-         "private/array/fcarray-pointwise.rkt"
-         "private/array/array-parallel.rkt"
-         )
-
-;; Set the custom printer to a pretty one
-(array-custom-printer print-array)
-
-(provide (all-from-out
-          "private/array/array-struct.rkt"
-          "private/array/array-constructors.rkt"
-          "private/array/array-pointwise.rkt"
-          "private/array/array-indexing.rkt"
-          "private/array/array-broadcast.rkt"
-          "private/array/array-transform.rkt"
-          "private/array/array-convert.rkt"
-          "private/array/array-fold.rkt"
-          "private/array/array-unfold.rkt"
-          "private/array/array-print.rkt"
-          "private/array/array-syntax.rkt"
-          "private/array/array-fft.rkt"
-          "private/array/array-comprehension.rkt"
-          "private/array/array-sequence.rkt"
-          "private/array/mutable-array.rkt"
-          "private/array/flarray-struct.rkt"
-          "private/array/flarray-pointwise.rkt"
-          "private/array/fcarray-struct.rkt"
-          "private/array/fcarray-pointwise.rkt"
-          "private/array/array-parallel.rkt"
-          )
-         ;; from utils.rkt
-         Listof*
-         Vectorof*
-         Indexes
-         In-Indexes)
diff --git a/pkgs/math-pkgs/math-lib/math/base.rkt b/pkgs/math-pkgs/math-lib/math/base.rkt
deleted file mode 100644
index e85800d613..0000000000
--- a/pkgs/math-pkgs/math-lib/math/base.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         typed/untyped-utils
-         racket/math
-         (rename-in
-          (except-in "private/base/base-functions.rkt"
-                     asinh acosh atanh)
-          [number->float-complex  typed:number->float-complex])
-         "private/base/base-random.rkt"
-         "private/base/base-constants.rkt")
-
-(require/untyped-contract
- "private/base/base-functions.rkt"
- [asinh  (Number -> Number)]
- [acosh  (Number -> Number)]
- [atanh  (Number -> Number)])
-
-(define-syntax (number->float-complex stx)
-  (syntax-case stx ()
-    [(_ z-expr)  (syntax/loc stx (inline-number->float-complex z-expr))]
-    [(_ . args)  (syntax/loc stx (typed:number->float-complex . args))]
-    [_  (syntax/loc stx typed:number->float-complex)]))
-
-(provide (all-from-out
-          racket/math
-          "private/base/base-functions.rkt"
-          "private/base/base-random.rkt"
-          "private/base/base-constants.rkt")
-         asinh acosh atanh
-         number->float-complex)
diff --git a/pkgs/math-pkgs/math-lib/math/bigfloat.rkt b/pkgs/math-pkgs/math-lib/math/bigfloat.rkt
deleted file mode 100644
index a38f664700..0000000000
--- a/pkgs/math-pkgs/math-lib/math/bigfloat.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang typed/racket/base
-
-(require "private/bigfloat/bigfloat-struct.rkt"
-         ;; These should be better first:
-         ;"private/bigfloat/bigfloat-incomplete-gamma.rkt"
-         ;"private/bigfloat/bigfloat-beta.rkt"
-         ;"private/bigfloat/bigfloat-incomplete-beta.rkt"
-         ;; This needs some things to be renamed first to avoid confusion (e.g. bflog+ isn't
-         ;; at all like fllog+), and needs lower relative error near roots, especially bflog+
-         ;"private/bigfloat/bigfloat-log-arithmetic.rkt"
-         )
-
-(provide (all-from-out
-          "private/bigfloat/bigfloat-struct.rkt"
-          ;"private/bigfloat/bigfloat-incomplete-gamma.rkt"
-          ;"private/bigfloat/bigfloat-beta.rkt"
-          ;"private/bigfloat/bigfloat-incomplete-beta.rkt"
-          ;"private/bigfloat/bigfloat-log-arithmetic.rkt"
-          ))
diff --git a/pkgs/math-pkgs/math-lib/math/distributions.rkt b/pkgs/math-pkgs/math-lib/math/distributions.rkt
deleted file mode 100644
index d12118213d..0000000000
--- a/pkgs/math-pkgs/math-lib/math/distributions.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket/base
-
-(require "private/distributions/dist-struct.rkt"
-         "private/distributions/dist-functions.rkt"
-         "private/distributions/delta-dist.rkt"
-         "private/distributions/uniform-dist.rkt"
-         "private/distributions/triangle-dist.rkt"
-         "private/distributions/cauchy-dist.rkt"
-         "private/distributions/logistic-dist.rkt"
-         "private/distributions/normal-dist.rkt"
-         "private/distributions/exponential-dist.rkt"
-         "private/distributions/gamma-dist.rkt"
-         "private/distributions/beta-dist.rkt"
-         "private/distributions/truncated-dist.rkt"
-         "private/distributions/geometric-dist.rkt"
-         "private/distributions/binomial-dist.rkt"
-         "private/distributions/bernoulli-dist.rkt"
-         "private/distributions/poisson-dist.rkt"
-         "private/distributions/discrete-dist.rkt")
-
-(provide (all-from-out
-          "private/distributions/dist-struct.rkt"
-          "private/distributions/dist-functions.rkt"
-          "private/distributions/delta-dist.rkt"
-          "private/distributions/uniform-dist.rkt"
-          "private/distributions/triangle-dist.rkt"
-          "private/distributions/cauchy-dist.rkt"
-          "private/distributions/logistic-dist.rkt"
-          "private/distributions/normal-dist.rkt"
-          "private/distributions/exponential-dist.rkt"
-          "private/distributions/gamma-dist.rkt"
-          "private/distributions/beta-dist.rkt"
-          "private/distributions/truncated-dist.rkt"
-          "private/distributions/geometric-dist.rkt"
-          "private/distributions/binomial-dist.rkt"
-          "private/distributions/bernoulli-dist.rkt"
-          "private/distributions/poisson-dist.rkt"
-          "private/distributions/discrete-dist.rkt"))
diff --git a/pkgs/math-pkgs/math-lib/math/flonum.rkt b/pkgs/math-pkgs/math-lib/math/flonum.rkt
deleted file mode 100644
index 11c0559ac8..0000000000
--- a/pkgs/math-pkgs/math-lib/math/flonum.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         "private/flonum/flonum-bits.rkt"
-         "private/flonum/flonum-constants.rkt"
-         "private/flonum/flonum-functions.rkt"
-         "private/flonum/flonum-search.rkt"
-         "private/flonum/flonum-exp.rkt"
-         "private/flonum/flonum-log.rkt"
-         "private/flonum/flonum-more-functions.rkt"
-         "private/flonum/flonum-factorial.rkt"
-         "private/flonum/flonum-log1pmx.rkt"
-         "private/flonum/flonum-polyfun.rkt"
-         "private/flonum/flonum-error.rkt"
-         "private/flonum/flonum-brent-dekker.rkt"
-         "private/flonum/expansion/expansion-base.rkt"
-         "private/flonum/expansion/expansion-exp.rkt"
-         "private/flonum/expansion/expansion-log.rkt"
-         "private/flonum/flvector.rkt")
-
-(provide (all-from-out
-          "private/flonum/flonum-bits.rkt"
-          "private/flonum/flonum-constants.rkt"
-          "private/flonum/flonum-functions.rkt"
-          "private/flonum/flonum-search.rkt"
-          "private/flonum/flonum-exp.rkt"
-          "private/flonum/flonum-log.rkt"
-          "private/flonum/flonum-more-functions.rkt"
-          "private/flonum/flonum-factorial.rkt"
-          "private/flonum/flonum-log1pmx.rkt"
-          "private/flonum/flonum-polyfun.rkt"
-          "private/flonum/flonum-error.rkt"
-          "private/flonum/flonum-brent-dekker.rkt"
-          "private/flonum/expansion/expansion-base.rkt"
-          "private/flonum/expansion/expansion-exp.rkt"
-          "private/flonum/expansion/expansion-log.rkt"
-          "private/flonum/flvector.rkt")
-         lg* lg/ lgprod)
-
-(define-syntax lg* (make-rename-transformer #'fl+))
-(define-syntax lg/ (make-rename-transformer #'fl-))
-(define-syntax lgprod (make-rename-transformer #'flsum))
diff --git a/pkgs/math-pkgs/math-lib/math/info.rkt b/pkgs/math-pkgs/math-lib/math/info.rkt
deleted file mode 100644
index e0c94f2762..0000000000
--- a/pkgs/math-pkgs/math-lib/math/info.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang info
diff --git a/pkgs/math-pkgs/math-lib/math/main.rkt b/pkgs/math-pkgs/math-lib/math/main.rkt
deleted file mode 100644
index 5577fe694f..0000000000
--- a/pkgs/math-pkgs/math-lib/math/main.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang typed/racket/base
-
-(require "base.rkt"
-         "flonum.rkt"
-         "bigfloat.rkt"
-         "special-functions.rkt"
-         "distributions.rkt"
-         "statistics.rkt"
-         "number-theory.rkt"
-         "vector.rkt"
-         "array.rkt"
-         "matrix.rkt"
-         "utils.rkt")
-
-(provide (all-from-out
-          "base.rkt"
-          "flonum.rkt"
-          "bigfloat.rkt"
-          "special-functions.rkt"
-          "distributions.rkt"
-          "statistics.rkt"
-          "number-theory.rkt"
-          "vector.rkt"
-          "array.rkt"
-          "matrix.rkt"
-          "utils.rkt"))
diff --git a/pkgs/math-pkgs/math-lib/math/matrix.rkt b/pkgs/math-pkgs/math-lib/math/matrix.rkt
deleted file mode 100644
index 3cd7b7c73c..0000000000
--- a/pkgs/math-pkgs/math-lib/math/matrix.rkt
+++ /dev/null
@@ -1,213 +0,0 @@
-#lang racket/base
-
-(require typed/untyped-utils)
-
-(require "private/matrix/matrix-arithmetic.rkt"
-         "private/matrix/matrix-conversion.rkt"
-         "private/matrix/matrix-syntax.rkt"
-         "private/matrix/matrix-comprehension.rkt"
-         "private/matrix/matrix-types.rkt"
-         "private/matrix/matrix-2d.rkt"
-         ;;"private/matrix/matrix-expt.rkt"  ; all use require/untyped-contract
-         ;;"private/matrix/matrix-gauss-elim.rkt"  ; all use require/untyped-contract
-         (except-in "private/matrix/matrix-solve.rkt"
-                    matrix-determinant
-                    matrix-inverse
-                    matrix-solve)
-         (except-in "private/matrix/matrix-constructors.rkt"
-                    vandermonde-matrix)
-         (except-in "private/matrix/matrix-basic.rkt"
-                    matrix-1norm
-                    matrix-2norm
-                    matrix-inf-norm
-                    matrix-norm
-                    matrix-dot
-                    matrix-cos-angle
-                    matrix-angle
-                    matrix-normalize
-                    matrix-conjugate
-                    matrix-hermitian
-                    matrix-trace
-                    matrix-normalize-rows
-                    matrix-normalize-cols)
-         (except-in "private/matrix/matrix-subspace.rkt"
-                    matrix-col-space)
-         (except-in "private/matrix/matrix-operator-norm.rkt"
-                    matrix-op-1norm
-                    matrix-op-2norm
-                    matrix-op-inf-norm
-                    matrix-basis-cos-angle
-                    matrix-basis-angle)
-         ;;"private/matrix/matrix-qr.rkt"  ; all use require/untyped-contract
-         ;;"private/matrix/matrix-lu.rkt"  ; all use require/untyped-contract
-         ;;"private/matrix/matrix-gram-schmidt.rkt"  ; all use require/untyped-contract
-         )
-
-(require/untyped-contract
- (begin (require "private/matrix/matrix-types.rkt"))
- "private/matrix/matrix-expt.rkt"
- [matrix-expt  ((Matrix Number) Integer -> (Matrix Number))])
-
-(require/untyped-contract
- (begin (require "private/matrix/matrix-types.rkt"
-                 (only-in "private/matrix/matrix-gauss-elim.rkt" Pivoting)))
- "private/matrix/matrix-gauss-elim.rkt"
- [matrix-gauss-elim
-  (case-> ((Matrix Number) -> (Values (Matrix Number) (Listof Index)))
-          ((Matrix Number) Any -> (Values (Matrix Number) (Listof Index)))
-          ((Matrix Number) Any Any -> (Values (Matrix Number) (Listof Index)))
-          ((Matrix Number) Any Any Pivoting -> (Values (Matrix Number) (Listof Index))))]
- [matrix-row-echelon
-  (case-> ((Matrix Number) -> (Matrix Number))
-          ((Matrix Number) Any -> (Matrix Number))
-          ((Matrix Number) Any Any -> (Matrix Number))
-          ((Matrix Number) Any Any Pivoting -> (Matrix Number)))])
-
-(require/untyped-contract
- (begin (require "private/matrix/matrix-types.rkt"))
- "private/matrix/matrix-solve.rkt"
- [matrix-determinant
-  ((Matrix Number) -> Number)]
- [matrix-inverse
-  (All (A) (case-> ((Matrix Number)        -> (Matrix Number))
-                   ((Matrix Number) (-> A) -> (U A (Matrix Number)))))]
- [matrix-solve
-  (All (A) (case->
-            ((Matrix Number) (Matrix Number)        -> (Matrix Number))
-            ((Matrix Number) (Matrix Number) (-> A) -> (U A (Matrix Number)))))])
-
-(require/untyped-contract
- (begin (require "private/matrix/matrix-types.rkt"))
- "private/matrix/matrix-constructors.rkt"
- [vandermonde-matrix  ((Listof Number) Integer -> (Matrix Number))])
-
-(require/untyped-contract
- (begin (require "private/matrix/matrix-types.rkt"))
- "private/matrix/matrix-basic.rkt"
- [matrix-1norm  ((Matrix Number) -> Nonnegative-Real)]
- [matrix-2norm  ((Matrix Number) -> Nonnegative-Real)]
- [matrix-inf-norm  ((Matrix Number) -> Nonnegative-Real)]
- [matrix-norm  (case-> ((Matrix Number) -> Nonnegative-Real)
-                       ((Matrix Number) Real -> Nonnegative-Real))]
- [matrix-dot
-  (case-> ((Matrix Number) -> Nonnegative-Real)
-          ((Matrix Number) (Matrix Number) -> Number))]
- [matrix-cos-angle
-  ((Matrix Number) (Matrix Number) -> Number)]
- [matrix-angle
-  ((Matrix Number) (Matrix Number) -> Number)]
- [matrix-normalize
-  (All (A) (case-> ((Matrix Number)             -> (Matrix Number))
-                   ((Matrix Number) Real        -> (Matrix Number))
-                   ((Matrix Number) Real (-> A) -> (U A (Matrix Number)))))]
- [matrix-conjugate
-  ((Matrix Number) -> (Matrix Number))]
- [matrix-hermitian
-  ((Matrix Number) -> (Matrix Number))]
- [matrix-trace
-  ((Matrix Number) -> Number)]
- [matrix-normalize-rows
-  (All (A) (case-> ((Matrix Number)             -> (Matrix Number))
-                   ((Matrix Number) Real        -> (Matrix Number))
-                   ((Matrix Number) Real (-> A) -> (U A (Matrix Number)))))]
- [matrix-normalize-cols
-  (All (A) (case-> ((Matrix Number)             -> (Matrix Number))
-                   ((Matrix Number) Real        -> (Matrix Number))
-                   ((Matrix Number) Real (-> A) -> (U A (Matrix Number)))))])
-
-(require/untyped-contract
- (begin (require "private/matrix/matrix-types.rkt"))
- "private/matrix/matrix-subspace.rkt"
- [matrix-col-space
-  (All (A) (case-> ((Matrix Number)        -> (Matrix Number))
-                   ((Matrix Number) (-> A) -> (U A (Matrix Number)))))])
-
-(require/untyped-contract
- (begin (require "private/matrix/matrix-types.rkt"))
- "private/matrix/matrix-operator-norm.rkt"
- [matrix-op-1norm  ((Matrix Number) -> Nonnegative-Real)]
- [matrix-op-2norm  ((Matrix Number) -> Nonnegative-Real)]
- [matrix-op-inf-norm  ((Matrix Number) -> Nonnegative-Real)]
- [matrix-basis-cos-angle
-  ((Matrix Number) (Matrix Number) -> Number)]
- [matrix-basis-angle
-  ((Matrix Number) (Matrix Number) -> Number)])
-
-(require/untyped-contract
- (begin (require "private/matrix/matrix-types.rkt"))
- "private/matrix/matrix-qr.rkt"
- [matrix-qr
-  (case-> ((Matrix Number)     -> (Values (Matrix Number) (Matrix Number)))
-          ((Matrix Number) Any -> (Values (Matrix Number) (Matrix Number))))])
-
-(require/untyped-contract
- (begin (require "private/matrix/matrix-types.rkt"))
- "private/matrix/matrix-lu.rkt"
- [matrix-lu
-  (All (A) (case-> ((Matrix Number)        -> (Values (Matrix Number) (Matrix Number)))
-                   ((Matrix Number) (-> A) -> (Values (U A (Matrix Number)) (Matrix Number)))))])
-
-(require/untyped-contract
- (begin (require "private/matrix/matrix-types.rkt"
-                 "private/array/array-struct.rkt"))
- "private/matrix/matrix-gram-schmidt.rkt"
- [matrix-gram-schmidt
-  (case-> ((Matrix Number)             -> (Array Number))
-          ((Matrix Number) Any         -> (Array Number))
-          ((Matrix Number) Any Integer -> (Array Number)))]
- [matrix-basis-extension
-  ((Matrix Number) -> (Array Number))])
-
-(provide (all-from-out
-          "private/matrix/matrix-arithmetic.rkt"
-          "private/matrix/matrix-constructors.rkt"
-          "private/matrix/matrix-conversion.rkt"
-          "private/matrix/matrix-syntax.rkt"
-          "private/matrix/matrix-basic.rkt"
-          "private/matrix/matrix-subspace.rkt"
-          "private/matrix/matrix-solve.rkt"
-          "private/matrix/matrix-operator-norm.rkt"
-          "private/matrix/matrix-comprehension.rkt"
-          "private/matrix/matrix-types.rkt"
-          "private/matrix/matrix-2d.rkt")
-         ;; matrix/matrix-expt.rkt
-         matrix-expt
-         ;; matrix-gauss-elim.rkt
-         matrix-gauss-elim
-         matrix-row-echelon
-         ;; matrix-solve.rkt
-         matrix-determinant
-         matrix-inverse
-         matrix-solve
-         ;; matrix-constructors.rkt
-         vandermonde-matrix
-         ;; matrix-basic.rkt
-         matrix-1norm
-         matrix-2norm
-         matrix-inf-norm
-         matrix-norm
-         matrix-dot
-         matrix-cos-angle
-         matrix-angle
-         matrix-normalize
-         matrix-conjugate
-         matrix-hermitian
-         matrix-trace
-         matrix-normalize-rows
-         matrix-normalize-cols
-         ;; matrix-subspace.rkt
-         matrix-col-space
-         ;; matrix-operator-norm.rkt
-         matrix-op-1norm
-         matrix-op-2norm
-         matrix-op-inf-norm
-         matrix-basis-cos-angle
-         matrix-basis-angle
-         ;; matrix-qr.rkt
-         matrix-qr
-         ;; matrix-lu.rkt
-         matrix-lu
-         ;; matrix-gram-schmidt.rkt
-         matrix-gram-schmidt
-         matrix-basis-extension
-         )
diff --git a/pkgs/math-pkgs/math-lib/math/number-theory.rkt b/pkgs/math-pkgs/math-lib/math/number-theory.rkt
deleted file mode 100644
index 6b74ca8886..0000000000
--- a/pkgs/math-pkgs/math-lib/math/number-theory.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-
-(require typed/untyped-utils
-         "private/number-theory/divisibility.rkt"
-         "private/number-theory/modular-arithmetic.rkt"
-         (except-in "private/number-theory/number-theory.rkt" prev-prime next-prime)
-         (except-in "private/number-theory/factorial.rkt" factorial permutations)
-         "private/number-theory/bernoulli.rkt"
-         "private/number-theory/eulerian-number.rkt"
-         "private/number-theory/farey.rkt"
-         "private/number-theory/fibonacci.rkt"
-         "private/number-theory/partitions.rkt"
-         "private/number-theory/polygonal.rkt"
-         "private/number-theory/primitive-roots.rkt"
-         "private/number-theory/quadratic.rkt"
-         "private/number-theory/quadratic-residues.rkt"
-         "private/number-theory/tangent-number.rkt")
-
-(require/untyped-contract
- "private/number-theory/factorial.rkt"
- [factorial  (Integer -> Positive-Integer)]
- [permutations  (Integer Integer -> Natural)])
-
-(require/untyped-contract
- "private/number-theory/binomial.rkt"
- [binomial  (Integer Integer -> Natural)])
-
-(require/untyped-contract
- "private/number-theory/number-theory.rkt"
- [next-prime (Integer -> Integer)]
- [prev-prime (Integer -> Integer)])
-
-(provide (all-from-out
-          "private/number-theory/divisibility.rkt"
-          "private/number-theory/modular-arithmetic.rkt"
-          "private/number-theory/number-theory.rkt"
-          "private/number-theory/factorial.rkt"
-          "private/number-theory/bernoulli.rkt"
-          "private/number-theory/eulerian-number.rkt"
-          "private/number-theory/farey.rkt"
-          "private/number-theory/fibonacci.rkt"
-          "private/number-theory/partitions.rkt"
-          "private/number-theory/polygonal.rkt"
-          "private/number-theory/primitive-roots.rkt"
-          "private/number-theory/quadratic.rkt"
-          "private/number-theory/quadratic-residues.rkt"
-          "private/number-theory/tangent-number.rkt")
-         next-prime prev-prime
-         factorial permutations
-         binomial)
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-broadcast.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-broadcast.rkt
deleted file mode 100644
index 6a52fc2e9c..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-broadcast.rkt
+++ /dev/null
@@ -1,108 +0,0 @@
-#lang typed/racket
-
-(require racket/fixnum
-         "array-struct.rkt"
-         "../unsafe.rkt"
-         "utils.rkt")
-
-(provide array-broadcasting
-         array-broadcast
-         array-shape-broadcast)
-
-(: array-broadcasting (Parameterof (U #f #t 'permissive)))
-(define array-broadcasting (make-parameter #t))
-
-(: shift-stretch-axes (All (A) ((Array A) Indexes -> (Array A))))
-(define (shift-stretch-axes arr new-ds)
-  (define old-ds (array-shape arr))
-  (define old-dims (vector-length old-ds))
-  (define new-dims (vector-length new-ds))
-  (define shift
-    (let ([shift  (- new-dims old-dims)])
-      (cond [(index? shift)  shift]
-            [else  (error 'array-broadcast
-                          "cannot broadcast to a lower-dimensional shape; given ~e and ~e"
-                          arr new-ds)])))
-  (define old-js (make-thread-local-indexes old-dims))
-  (define old-f (unsafe-array-proc arr))
-  (unsafe-build-array
-   new-ds
-   (λ: ([new-js : Indexes])
-     (let ([old-js  (old-js)])
-       (let: loop : A ([k : Nonnegative-Fixnum  0])
-         (cond [(k . < . old-dims)
-                (define new-jk (unsafe-vector-ref new-js (+ k shift)))
-                (define old-dk (unsafe-vector-ref old-ds k))
-                (define old-jk (unsafe-fxmodulo new-jk old-dk))
-                (unsafe-vector-set! old-js k old-jk)
-                (loop (+ k 1))]
-               [else  (old-f old-js)]))))))
-
-(: array-broadcast (All (A) ((Array A) Indexes -> (Array A))))
-(define (array-broadcast arr ds)
-  (cond [(equal? ds (array-shape arr))  arr]
-        [else  (define new-arr (shift-stretch-axes arr ds))
-               (if (or (array-strict? arr) ((array-size new-arr) . fx<= . (array-size arr)))
-                   new-arr
-                   (array-default-strict new-arr))]))
-
-(: shape-insert-axes (Indexes Integer -> Indexes))
-(define (shape-insert-axes ds n)
-  (vector-append ((inst make-vector Index) n 1) ds))
-
-(: shape-permissive-broadcast (Indexes Indexes Index (-> Nothing) -> Indexes))
-(define (shape-permissive-broadcast ds1 ds2 dims fail)
-  (define: new-ds : Indexes (make-vector dims 0))
-  (let loop ([#{k : Nonnegative-Fixnum} 0])
-    (cond [(k . < . dims)
-           (define dk1 (unsafe-vector-ref ds1 k))
-           (define dk2 (unsafe-vector-ref ds2 k))
-           (unsafe-vector-set!
-            new-ds k
-            (cond [(or (= dk1 0) (= dk2 0))  (fail)]
-                  [else  (fxmax dk1 dk2)]))
-           (loop (+ k 1))]
-          [else  new-ds])))
-
-(: shape-normal-broadcast (Indexes Indexes Index (-> Nothing) -> Indexes))
-(define (shape-normal-broadcast ds1 ds2 dims fail)
-  (define: new-ds : Indexes (make-vector dims 0))
-  (let loop ([#{k : Nonnegative-Fixnum} 0])
-    (cond [(k . < . dims)
-           (define dk1 (unsafe-vector-ref ds1 k))
-           (define dk2 (unsafe-vector-ref ds2 k))
-           (unsafe-vector-set!
-            new-ds k
-            (cond [(= dk1 dk2)  dk1]
-                  [(and (= dk1 1) (dk2 . > . 0))  dk2]
-                  [(and (= dk2 1) (dk1 . > . 0))  dk1]
-                  [else  (fail)]))
-           (loop (+ k 1))]
-          [else  new-ds])))
-
-(: shape-broadcast2 (Indexes Indexes (-> Nothing) (U #f #t 'permissive) -> Indexes))
-(define (shape-broadcast2 ds1 ds2 fail broadcasting)
-  (cond [(equal? ds1 ds2)  ds1]
-        [(not broadcasting)  (fail)]
-        [else
-         (define dims1 (vector-length ds1))
-         (define dims2 (vector-length ds2))
-         (define n (- dims2 dims1))
-         (let-values ([(ds1 ds2 dims)
-                       (cond [(n . > . 0)  (values (shape-insert-axes ds1 n) ds2 dims2)]
-                             [(n . < . 0)  (values ds1 (shape-insert-axes ds2 (- n)) dims1)]
-                             [else         (values ds1 ds2 dims1)])])
-           (if (eq? broadcasting 'permissive)
-               (shape-permissive-broadcast ds1 ds2 dims fail)
-               (shape-normal-broadcast ds1 ds2 dims fail)))]))
-
-(: array-shape-broadcast (case-> ((Listof Indexes) -> Indexes)
-                                 ((Listof Indexes) (U #f #t 'permissive) -> Indexes)))
-(define (array-shape-broadcast dss [broadcasting (array-broadcasting)])
-  (define (fail) (error 'array-shape-broadcast
-                        "incompatible array shapes (array-broadcasting ~v): ~a"
-                        broadcasting
-                        (string-join (map (λ (ds) (format "~e" ds)) dss) ", ")))
-  (cond [(empty? dss)  #()]
-        [else  (for/fold ([new-ds  (first dss)]) ([ds  (in-list (rest dss))])
-                 (shape-broadcast2 new-ds ds fail broadcasting))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-comprehension.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-comprehension.rkt
deleted file mode 100644
index 46e040e2e9..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-comprehension.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     syntax/parse)
-         typed/racket/base
-         "mutable-array.rkt"
-         "utils.rkt")
-
-(provide for/array:
-         for*/array:
-         for/array
-         for*/array)
-
-(define-syntax (base-for/array: stx)
-  (syntax-parse stx #:literals (:)
-    [(_ name:id for/vector:id #:shape ds-expr:expr (~optional (~seq #:fill fill-expr:expr))
-        (clause ...) (~optional (~seq : A:expr)) body:expr ...+)
-     (with-syntax ([(maybe-fill ...)  (if (attribute fill-expr) #'(#:fill fill-expr) #'())]
-                   [(maybe-type ...)  (if (attribute A) #'(: A) #'())])
-       (syntax/loc stx
-         (let*: ([ds : In-Indexes  ds-expr]
-                 [ds : Indexes  (check-array-shape
-                                 ds (λ () (raise-argument-error 'name "Indexes" ds)))])
-           (define vs (for/vector #:length (array-shape-size ds) maybe-fill ...
-                        (clause ...) maybe-type ... body ...))
-           (unsafe-vector->array ds vs))))]
-    [(_ name:id for/vector:id (clause ...) (~optional (~seq : A:expr)) body:expr ...+)
-     (with-syntax ([(maybe-type ...)  (if (attribute A) #'(: A) #'())])
-       (syntax/loc stx
-         (let ()
-           (define vs (for/vector (clause ...) maybe-type ... body ...))
-           (define ds ((inst vector Index) (vector-length vs)))
-           (unsafe-vector->array ds vs))))]))
-
-(define-syntax-rule (for/array: e ...)
-  (base-for/array: for/array: for/vector: e ...))
-
-(define-syntax-rule (for*/array: e ...)
-  (base-for/array: for*/array: for*/vector: e ...))
-
-(define-syntax (base-for/array stx)
-  (syntax-parse stx
-    [(_ name:id for/vector:id #:shape ds-expr:expr (~optional (~seq #:fill fill-expr:expr))
-        (clause ...) body:expr ...+)
-     (with-syntax ([(maybe-fill ...)  (if (attribute fill-expr) #'(#:fill fill-expr) #'())])
-       (syntax/loc stx
-         (let* ([ds  ds-expr]
-                [ds  (check-array-shape
-                      ds (λ () (raise-argument-error 'name "Indexes" ds)))])
-           (define vs (for/vector #:length (array-shape-size ds) maybe-fill ...
-                        (clause ...) body ...))
-           (unsafe-vector->array ds vs))))]
-    [(_ name:id for/vector:id (clause ...) body:expr ...+)
-     (syntax/loc stx
-       (let ()
-         (define vs (for/vector (clause ...) body ...))
-         (define ds ((inst vector Index) (vector-length vs)))
-         (unsafe-vector->array ds vs)))]))
-
-(define-syntax-rule (for/array e ...)
-  (base-for/array for/array for/vector e ...))
-
-(define-syntax-rule (for*/array e ...)
-  (base-for/array for*/array for*/vector e ...))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-constructors.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-constructors.rkt
deleted file mode 100644
index a984920725..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-constructors.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require typed/untyped-utils)
-
-(require/untyped-contract
- (begin (require "array-struct.rkt")
-        (require "utils.rkt"))
- "typed-array-constructors.rkt"
- [make-array        (All (A) ((Vectorof Integer) A -> (Array A)))]
- [axis-index-array  ((Vectorof Integer) Integer -> (Array Index))]
- [index-array       ((Vectorof Integer) -> (Array Index))]
- [indexes-array     ((Vectorof Integer) -> (Array Indexes))])
-
-(require (except-in "typed-array-constructors.rkt"
-                    make-array
-                    axis-index-array
-                    index-array
-                    indexes-array))
-
-(provide make-array
-         axis-index-array
-         index-array
-         indexes-array
-         diagonal-array)
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-convert.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-convert.rkt
deleted file mode 100644
index aa4ce5d304..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-convert.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-(require typed/untyped-utils
-         (except-in "typed-array-convert.rkt"
-                    list*->array
-                    vector*->array)
-         (prefix-in typed: (only-in "typed-array-convert.rkt"
-                                    list*->array
-                                    vector*->array))
-         (prefix-in untyped: (only-in "untyped-array-convert.rkt"
-                                      list*->array
-                                      vector*->array)))
-
-(provide list*->array
-         vector*->array
-         array->list*
-         array->vector*
-         array->list
-         array->vector)
-
-(define-typed/untyped-identifier list*->array
-  typed:list*->array
-  untyped:list*->array)
-
-(define-typed/untyped-identifier vector*->array
-  typed:vector*->array
-  untyped:vector*->array)
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-fft.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-fft.rkt
deleted file mode 100644
index e1caa0d2c5..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-fft.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang typed/racket/base
-
-(require "../../base.rkt"
-         "../../flonum.rkt"
-         "../parameters.rkt"
-         "../unsafe.rkt"
-         "../vector/vector-fft.rkt"
-         "fcarray-struct.rkt"
-         "array-struct.rkt"
-         "array-transform.rkt"
-         "for-each.rkt"
-         "utils.rkt")
-
-(provide array-axis-fft
-         array-fft
-         array-axis-inverse-fft
-         array-inverse-fft)
-
-;; Fast Fourier Transform
-
-(: fcarray-last-axis-fft (FCArray -> FCArray))
-(define (fcarray-last-axis-fft arr)
-  (define ds (array-shape arr))
-  (define dims (vector-length ds))
-  (define k (- dims 1))
-  (cond
-    [(not (index? k))
-     (raise-argument-error 'fcarray-last-axis-fft "FCArray with at least one axis" arr)]
-    [else
-     (define xs (fcarray-real-data arr))
-     (define ys (fcarray-imag-data arr))
-     (define dk (unsafe-vector-ref ds k))
-     (define n (array-size arr))
-     (define new-xs (make-flvector n))
-     (define new-ys (make-flvector n))
-     (for-each-array+data-index
-      (unsafe-vector-remove ds k)
-      (λ (js j)
-        (define old-j (unsafe-fx* j dk))
-        (flvector-fft! xs ys old-j (unsafe-fx+ old-j dk) new-xs new-ys old-j)))
-     (unsafe-fcarray ds new-xs new-ys)]))
-
-(: array-axis-fft ((Array Number) Integer -> (Array Float-Complex)))
-(define (array-axis-fft arr k)
-  (define ds (array-shape arr))
-  (define dims (vector-length ds))
-  (cond [(= dims 0)
-         (raise-argument-error 'array-axis-fft "Array with at least one axis" 0 arr k)]
-        [(or (0 . > . k) (k . >= . dims))
-         (raise-argument-error 'array-axis-fft (format "Index less than ~a" dims) 1 arr k)]
-        [(= k (- dims 1))
-         (fcarray-last-axis-fft (array->fcarray arr))]
-        [else
-         (parameterize ([array-strictness #f])
-           (array-axis-swap (fcarray-last-axis-fft (array->fcarray (array-axis-swap arr k (- dims 1))))
-                            k (- dims 1)))]))
-
-(: fcarray-fft (FCArray -> FCArray))
-(define (fcarray-fft arr)
-  (define dims (array-dims arr))
-  (cond [(zero? dims)  (raise-argument-error 'fcarray-fft "FCArray with at least one axis" arr)]
-        [(not (andmap power-of-two? (vector->list (array-shape arr))))
-         (raise-argument-error 'fcarray-fft "FCArray with power-of-two shape" arr)]
-        [else
-         (define dims-1 (- dims 1))
-         (cond [(zero? dims-1)  (fcarray-last-axis-fft arr)]
-               [else
-                (let loop ([#{k : Positive-Fixnum} 1] [arr  (array-axis-fft arr 0)])
-                  (cond [(k . < . dims-1)  (loop (+ k 1) (array-axis-fft arr k))]
-                        [else  (fcarray-last-axis-fft (array->fcarray arr))]))])]))
-
-(: array-fft ((Array Number) -> FCArray))
-(define (array-fft arr)
-  (define dims (array-dims arr))
-  (cond [(= dims 0)  (raise-argument-error 'array-fft "Array with at least one axis" arr)]
-        [(not (andmap power-of-two? (vector->list (array-shape arr))))
-         (raise-argument-error 'array-fft "Array with power-of-two shape" arr)]
-        [else
-         (fcarray-fft (array->fcarray arr))]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Inverse Fast Fourier Transform
-
-(: array-axis-inverse-fft ((Array Number) Integer -> (Array Float-Complex)))
-(define (array-axis-inverse-fft arr k)
-  (parameterize ([dft-convention  (dft-inverse-convention)])
-    (array-axis-fft arr k)))
-
-(: array-inverse-fft ((Array Number) -> (Array Float-Complex)))
-(define (array-inverse-fft arr)
-  (parameterize ([dft-convention  (dft-inverse-convention)])
-    (array-fft arr)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-fold.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-fold.rkt
deleted file mode 100644
index d57256e704..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-fold.rkt
+++ /dev/null
@@ -1,71 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         (only-in typed/racket/base assert index?)
-         "array-struct.rkt"
-         "array-pointwise.rkt"
-         "typed-array-fold.rkt")
-
-;; ===================================================================================================
-;; Standard folds
-
-(define-syntax-rule (define-axis-fold name f)
-  (define-syntax (name stx)
-    (syntax-case stx ()
-      [(_ arr k)  (syntax/loc stx (array-axis-fold arr k f))]
-      [(_ arr k init)  (syntax/loc stx (array-axis-fold arr k f init))])))
-
-(define-syntax-rule (define-all-fold name f)
-  (define-syntax (name stx)
-    (syntax-case stx ()
-      [(_ arr)  (syntax/loc stx (array-all-fold arr f))]
-      [(_ arr init)  (syntax/loc stx (array-all-fold arr f init))])))
-
-(define-axis-fold array-axis-sum +)
-(define-axis-fold array-axis-prod *)
-(define-axis-fold array-axis-min min)
-(define-axis-fold array-axis-max max)
-
-(define-all-fold array-all-sum +)
-(define-all-fold array-all-prod *)
-(define-all-fold array-all-min min)
-(define-all-fold array-all-max max)
-
-(define-syntax-rule (array-count f arr ...)
-  (assert
-   (parameterize ([array-strictness #f])
-     (array-all-sum (inline-array-map (λ (b) (if b 1 0))
-                                      (array-map f arr ...))
-                    0))
-   index?))
-
-(define-syntax-rule (array-andmap pred? arr ...)
-  (parameterize ([array-strictness #f])
-    (array-all-and (array-map pred? arr ...))))
-
-(define-syntax-rule (array-ormap pred? arr ...)
-  (parameterize ([array-strictness #f])
-    (array-all-or (array-map pred? arr ...))))
-
-(provide array-axis-fold
-         array-axis-sum
-         array-axis-prod
-         array-axis-min
-         array-axis-max
-         array-axis-count
-         array-axis-and
-         array-axis-or
-         array-fold
-         array-all-fold
-         array-all-sum
-         array-all-prod
-         array-all-min
-         array-all-max
-         array-all-and
-         array-all-or
-         array-count
-         array-andmap
-         array-ormap
-         array-axis-reduce
-         unsafe-array-axis-reduce
-         array->list-array)
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-indexing.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-indexing.rkt
deleted file mode 100644
index 1aec9a00c0..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-indexing.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-
-(require typed/untyped-utils
-         (except-in "typed-array-indexing.rkt"
-                    array-ref
-                    array-set!
-                    array-indexes-ref
-                    array-indexes-set!))
-
-(require/untyped-contract
- (begin (require (only-in "array-struct.rkt" Array Settable-Array)))
- "typed-array-indexing.rkt"
- [array-ref   (All (A) ((Array A) (Vectorof Integer) -> A))]
- [array-set!  (All (A) ((Settable-Array A) (Vectorof Integer) A -> Void))]
- [array-indexes-ref   (All (A) ((Array A) (Array (Vectorof Integer)) -> (Array A)))]
- [array-indexes-set!  (All (A) ((Settable-Array A) (Array (Vectorof Integer)) (Array A) -> Void))])
-
-(provide
- array-ref
- array-set!
- unsafe-array-ref
- unsafe-array-set!
- ;; Indexing by array of indexes
- array-indexes-ref
- array-indexes-set!
- ;; Slicing
- (rename-out [-Slice Slice]
-             [-Slice-Dots Slice-Dots]
-             [-Slice-New-Axis Slice-New-Axis])
- Slice-Spec
- :: slice? slice-start slice-end slice-step slice->range-values
- ::... slice-dots?
- ::new slice-new-axis? slice-new-axis-length
- array-slice-ref
- array-slice-set!)
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-parallel.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-parallel.rkt
deleted file mode 100644
index 0fb3b4b592..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-parallel.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang typed/racket/base
-
-(require racket/future
-         racket/list
-         "../unsafe.rkt"
-         "../parameters.rkt"
-         "array-struct.rkt"
-         "mutable-array.rkt"
-         "utils.rkt")
-
-(provide parallel-array->mutable-array
-         parallel-array-strict)
-
-(: eval-array-proc! (All (A) (Indexes (Indexes -> A) Indexes (Vectorof A) Index Index -> Void)))
-(define (eval-array-proc! ds proc js vs start end)
-  (define dims (vector-length ds))
-  (unsafe-value-index->array-index! ds start js)
-  (let: k-loop : Nonnegative-Fixnum ([k : Nonnegative-Fixnum  0]
-                                     [j : Nonnegative-Fixnum  start])
-    (cond [(k . < . dims)
-           (define: dk : Index (unsafe-vector-ref ds k))
-           (let: jk-loop : Nonnegative-Fixnum ([jk : Nonnegative-Fixnum  (unsafe-vector-ref js k)]
-                                               [j : Nonnegative-Fixnum  j])
-             (cond [(jk . < . dk)
-                    (unsafe-vector-set! js k jk)
-                    (jk-loop (+ jk 1) (k-loop (+ k 1) j))]
-                   [else
-                    (unsafe-vector-set! js k 0)
-                    j]))]
-          [(j . >= . end)  j]
-          [else  (define v (proc js))
-                 (unsafe-vector-set! vs j v)
-                 (unsafe-fx+ j 1)]))
-  (void))
-
-(: parallel-array->mutable-array (All (A) ((Array A) -> (Mutable-Array A))))
-(define (parallel-array->mutable-array arr)
-  (define size (array-size arr))
-  (cond
-    [(zero? size)  (unsafe-vector->array (array-shape arr) (vector))]
-    [else
-     (define ds (array-shape arr))
-     (define dims (vector-length ds))
-     (define proc (unsafe-array-proc arr))
-     ;; Use all the available processors
-     (define num-futures (max-math-threads))
-     (parameterize ([max-math-threads  1])
-       (define jss
-         (for/list: : (Listof Indexes) ([i  (in-range num-futures)])
-           (ann (make-vector dims 0) Indexes)))
-       (define: vs : (Vectorof A) (make-vector size (proc (first jss))))
-       (define stops
-         (for/list: : (Listof Index) ([i  (in-range num-futures)])
-           (assert (quotient (* (+ i 1) size) num-futures) index?)))
-       (define futures
-         (for/list: : (Listof (Futureof Void)) ([start  (in-list stops)]
-                                                [end  (in-list (rest stops))]
-                                                [js  (in-list (rest jss))])
-           (future (λ () (eval-array-proc! ds proc js vs start end)))))
-       (eval-array-proc! ds proc (first jss) vs 1 (first stops))
-       (for: ([f  (in-list futures)])
-         (touch f))
-     
-       (unsafe-vector->array ds vs))]))
-
-(: parallel-array-strict (All (A) ((Array A) -> (Array A))))
-(define (parallel-array-strict arr)
-  (cond [(array-strict? arr)  arr]
-        [else  (parallel-array->mutable-array arr)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-pointwise.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-pointwise.rkt
deleted file mode 100644
index bd4b923863..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-pointwise.rkt
+++ /dev/null
@@ -1,94 +0,0 @@
-#lang racket/base
-
-(require typed/untyped-utils
-         racket/math
-         (rename-in "typed-array-pointwise.rkt"
-                    [array-map  typed:array-map])
-         (rename-in "untyped-array-pointwise.rkt"
-                    [array-map  untyped:array-map]))
-
-(define-typed/untyped-identifier array-map
-  typed:array-map untyped:array-map)
-
-(define-syntax-rule (define-array-op1 name op)
-  (define-syntax-rule (name arr) (array-map op arr)))
-
-(define-syntax-rule (define-array-op2 name op)
-  (define-syntax-rule (name arr0 arr1) (array-map op arr0 arr1)))
-
-(define-syntax-rule (define-array-op1+ name op)
-  (define-syntax-rule (name arr0 arrs (... ...)) (array-map op arr0 arrs (... ...))))
-
-(define-syntax-rule (define-array-op2+ name op)
-  (define-syntax-rule (name arr0 arr1 arrs (... ...)) (array-map op arr0 arr1 arrs (... ...))))
-
-(define-syntax-rule (define-array-op name op)
-  (define-syntax-rule (name arrs (... ...)) (array-map op arrs (... ...))))
-
-(define-syntax-rule (array-scale arr x-expr)
-  (let ([x x-expr])
-    (inline-array-map (λ (y) (* x y)) arr)))
-
-(define-array-op1 array-sqr sqr)
-(define-array-op1 array-sqrt sqrt)
-(define-array-op1 array-abs abs)
-(define-array-op1 array-magnitude magnitude)
-(define-array-op1 array-angle angle)
-(define-array-op1 array-conjugate conjugate)
-(define-array-op1 array-real-part real-part)
-(define-array-op1 array-imag-part imag-part)
-
-(define-array-op2 array-make-rectangular make-rectangular)
-(define-array-op2 array-make-polar make-polar)
-
-(define-array-op array+ +)
-(define-array-op array* *)
-(define-array-op1+ array- -)
-(define-array-op1+ array/ /)
-
-(define-array-op1+ array-min min)
-(define-array-op1+ array-max max)
-
-(define-array-op2+ array< <)
-(define-array-op2+ array<= <=)
-(define-array-op2+ array> >)
-(define-array-op2+ array>= >=)
-(define-array-op2+ array= =)
-
-(define-array-op2 array-not not)
-
-(define-syntax-rule (array-and arrs ...) (inline-array-map and arrs ...))
-(define-syntax-rule (array-or arrs ...) (inline-array-map or arrs ...))
-(define-syntax-rule (array-if arr0 arr1 arr2) (inline-array-map if arr0 arr1 arr2))
-
-(provide
- ;; Mapping
- inline-array-map
- array-map
- ;; Lifted operators
- array-scale
- array-sqr
- array-sqrt
- array-abs
- array-magnitude
- array-angle
- array-conjugate
- array-real-part
- array-imag-part
- array-make-rectangular
- array-make-polar
- array+
- array-
- array*
- array/
- array-min
- array-max     
- array=
- array<
- array<=
- array>
- array>=
- array-not
- array-and
- array-or
- array-if)
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-print.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-print.rkt
deleted file mode 100644
index 6bfd51de63..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-print.rkt
+++ /dev/null
@@ -1,115 +0,0 @@
-#lang typed/racket/base
-
-;; Defines the custom printer used for array values
-
-(require racket/pretty
-         racket/fixnum
-         "array-struct.rkt"
-         "utils.rkt")
-
-(provide print-array)
-
-;; An array is printed in one of three layouts:
-;;   1. one-line     on one line, with " " between elements
-;;   2. compact      on multiple lines, with "\n" between elements *except the innermost*
-;;   3. multi-line   on multiple lines, with "\n" between elements
-(define-type Array-Layout (U 'one-line 'compact 'multi-line))
-
-(: print-array (All (A) ((Array A) Symbol Output-Port (U #t #f 0 1) -> Any)))
-;; The logic in `print-array' causes the REPL printer to try printing an array in each layout, and
-;; keep the first successful one. An overflowing line means failure.
-(define (print-array arr name port mode)
-  ;; Called to print array elements; may recur (e.g. printing arrays of arrays)
-  ;; We never have to consider the `mode' argument again after defining `recur-print'
-  (define recur-print
-    (cond [(not mode) display]
-          [(integer? mode) (λ: ([p : Any] [port : Output-Port])
-                             (print p port mode))]  ; pass the quote depth through
-          [else write]))
-  
-  ;; Width of a line
-  (define cols (pretty-print-columns))
-  
-  ;; The following print procedures are parameterized on a port because they're called to print both
-  ;; to `port' and to a tentative pretty-printing port we set up further on
-  
-  (define: (print-prefix [port : Output-Port]) : Any
-    (write-string (format "(~a" name) port))
-  
-  (define: (print-suffix [port : Output-Port]) : Any
-    (write-string ")" port))
-  
-  (: print-all (Output-Port Array-Layout -> Any))
-  (define (print-all port layout)
-    ;; Get current column so we can indent new lines at least that far
-    (define col (port-next-column port))
-    
-    (: maybe-print-newline (Integer -> Any))
-    ;; Prints " " in one-line layout; a newline and some indentation otherwise
-    ;; If in compact layout, this *does not* use `pretty-print-newline'. We don't want to signal a line
-    ;; overflow in compact layout unless *an array element* overflows. Otherwise, compact layout would
-    ;; "overflow" whenever it printed an array with more than 1 axis.
-    (define (maybe-print-newline indent)
-      (case layout
-        [(one-line)  (write-string " " port)]
-        [else  (case layout
-                 [(compact)  (write-string "\n" port)]
-                 [else  (pretty-print-newline port (assert cols integer?))])
-               (write-string (make-string (+ col indent) #\space) port)]))
-    ;; Print the constructor name
-    (print-prefix port)
-    (maybe-print-newline 1)  ; +1 to indent past "("
-    ;; Print array elements in nested square brackets, with each level indented an extra space
-    (define ds (array-shape arr))
-    (define dims (vector-length ds))
-    (define proc (unsafe-array-proc arr))
-    ;; We mutate this in row-major order instead of creating a new index vector for every element
-    (define: js : Indexes (make-vector dims 0))
-    ;; For each shape axis
-    (let i-loop ([#{i : Nonnegative-Fixnum} 0])
-      (cond [(i . fx< . dims)  ; proves i : Index
-             (write-string "#[" port)
-             (define di (vector-ref ds i))  ; length of axis i
-             ;; For each index on this axis
-             (let ji-loop ([#{ji : Nonnegative-Fixnum} 0])
-               (when (ji . fx< . di)  ; proves ji : Index
-                 (vector-set! js i ji)
-                 ;; Print either nested elements or the element here
-                 (i-loop (fx+ i 1))
-                 ;; Print delimiter when not printing the last element on this axis
-                 (when (ji . fx< . (fx- di 1))
-                   (cond [(and (eq? layout 'compact) (fx= i (fx- dims 1)))
-                          ;; Keep elements on one line in compact layout
-                          (write-string " " port)]
-                         [else
-                          ;; +1 to indent past "(", +2 to indent past the first "#[", and `i' axes
-                          (maybe-print-newline (+ 3 (* i 2)))]))
-                 (ji-loop (fx+ ji 1))))
-             (write-string "]" port)]
-            [else
-             ;; Print an element
-             (recur-print (proc js) port)]))
-    ;; Print the closing delimiter
-    (print-suffix port))
-  
-  ;; See what the printer has in mind for us this time
-  (cond [(and (pretty-printing) (integer? cols))
-         ;; Line-width-constrained pretty-printing: woo woo!
-         (let/ec: return : Any  ; used as a return statement
-           ;; Wrap the port with a tentative one, in case compact layout overflows lines
-           (define: tport : Output-Port
-             (make-tentative-pretty-print-output-port
-              port
-              (max 0 (- cols 1))  ; width: make sure there's room for the closing delimiter
-              (λ ()  ; failure thunk
-                ;; Reset accumulated graph state
-                (tentative-pretty-print-port-cancel (assert tport output-port?))
-                ;; Compact layout failed, so print in multi-line layout
-                (return (print-all port 'multi-line)))))
-           ;; Try printing in compact layout
-           (print-all tport 'compact)
-           ;; If a line overflows, the failure thunk returns past this
-           (tentative-pretty-print-port-transfer tport port))]
-        [else
-         ;; No pretty printer, or printing to infinite-width lines, so print on one line
-         (print-all port 'one-line)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-sequence.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-sequence.rkt
deleted file mode 100644
index 6c1c7c1f85..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-sequence.rkt
+++ /dev/null
@@ -1,110 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         typed/untyped-utils
-         typed-racket/base-env/prims
-         racket/unsafe/ops
-         "array-struct.rkt"
-         "utils.rkt"
-         (except-in "typed-array-sequence.rkt" in-array-indexes))
-
-(require/untyped-contract
- "typed-array-sequence.rkt"
- [in-array-indexes  ((Vectorof Integer) -> (Sequenceof (Vectorof Index)))])
-
-(provide (rename-out [in-array-clause  in-array]
-                     [in-array-indexes-clause  in-array-indexes]
-                     [in-unsafe-array-indexes-clause  in-unsafe-array-indexes])
-         in-array-axis
-         array->array-list
-         array-list->array)
-
-(define-sequence-syntax in-array-clause
-  (λ () #'in-array)
-  (λ (stx)
-    (syntax-case stx ()
-      [[(x) (_ arr-expr)]
-       (syntax/loc stx
-         [(x)
-          (:do-in
-           ([(ds size dims js proc)
-             (plet: (A) ([arr : (Array A)  arr-expr])
-               (cond [(array? arr)
-                      (define ds (array-shape arr))
-                      (define dims (vector-length ds))
-                      (define size (array-size arr))
-                      (define proc (unsafe-array-proc arr))
-                      (define: js : Indexes (make-vector dims 0))
-                      (values ds size dims js proc)]
-                     [else
-                      (raise-argument-error 'in-array "Array" arr)]))])
-           (void)
-           ([j 0])
-           (unsafe-fx< j size)
-           ([(x)  (proc js)])
-           #true
-           #true
-           [(begin (next-indexes! ds dims js)
-                   (unsafe-fx+ j 1))])])]
-      [[_ clause] (raise-syntax-error 'in-array "expected (in-array <Array>)" #'clause #'clause)])))
-
-(define-sequence-syntax in-array-indexes-clause
-  (λ () #'in-array-indexes)
-  (λ (stx)
-    (syntax-case stx ()
-      [[(x) (_ ds-expr)]
-       (syntax/loc stx
-         [(x)
-          (:do-in
-           ([(ds size dims js)
-             (let*: ([ds : In-Indexes  ds-expr]
-                     [ds : Indexes  (check-array-shape
-                                     ds (λ () (raise-argument-error 'in-array-indexes "Indexes"
-                                                                         ds)))])
-               (define dims (vector-length ds))
-               (define size (array-shape-size ds))
-               (cond [(index? size)  (define: js : Indexes (make-vector dims 0))
-                                     (values ds size dims js)]
-                     [else  (error 'in-array-indexes
-                                   "array size ~e (for shape ~e) is too large (is not an Index)"
-                                   size ds)]))])
-           (void)
-           ([j 0])
-           (unsafe-fx< j size)
-           ([(x)  (vector-copy-all js)])
-           #true
-           #true
-           [(begin (next-indexes! ds dims js)
-                   (unsafe-fx+ j 1))])])]
-      [[_ clause]
-       (raise-syntax-error 'in-array-indexes "expected (in-array-indexes <Indexes>)"
-                           #'clause #'clause)])))
-
-(define-sequence-syntax in-unsafe-array-indexes-clause
-  (λ () #'in-array-indexes)
-  (λ (stx)
-    (syntax-case stx ()
-      [[(x) (_ ds-expr)]
-       (syntax/loc stx
-         [(x)
-          (:do-in
-           ([(ds size dims js)
-             (let: ([ds : Indexes  ds-expr])
-               (define dims (vector-length ds))
-               (define size (array-shape-size ds))
-               (cond [(index? size)  (define: js : Indexes (make-vector dims 0))
-                                     (values ds size dims js)]
-                     [else  (error 'in-array-indexes
-                                   "array size ~e (for shape ~e) is too large (is not an Index)"
-                                   size ds)]))])
-           (void)
-           ([j 0])
-           (unsafe-fx< j size)
-           ([(x)  js])
-           #true
-           #true
-           [(begin (next-indexes! ds dims js)
-                   (unsafe-fx+ j 1))])])]
-      [[_ clause]
-       (raise-syntax-error 'in-array-indexes "expected (in-unsafe-array-indexes <Indexes>)"
-                           #'clause #'clause)])))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-struct.rkt
deleted file mode 100644
index cba78232d8..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-struct.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket/base
-
-(require typed/untyped-utils
-         typed/racket/base
-         (for-syntax racket/base syntax/parse)
-         "array-syntax.rkt"
-         (except-in "typed-array-struct.rkt"
-                    build-array
-                    build-simple-array
-                    list->array))
-
-(require/untyped-contract
- (begin (require (only-in "typed-array-struct.rkt" Array)))
- "typed-array-struct.rkt"
- [build-array  (All (A) ((Vectorof Integer) ((Vectorof Index) -> A) -> (Array A)))]
- [build-simple-array  (All (A) ((Vectorof Integer) ((Vectorof Index) -> A) -> (Array A)))]
- [list->array (All (A) (case-> ((Listof A) -> (Array A))
-                               ((Vectorof Integer) (Listof A) -> (Array A))))])
-
-(define-syntax array? (make-rename-transformer #'Array?))
-(define-syntax array-shape (make-rename-transformer #'Array-shape))
-(define-syntax array-size (make-rename-transformer #'Array-size))
-(define-syntax unsafe-array-proc (make-rename-transformer #'Array-unsafe-proc))
-
-(provide
- ;; Array
- Array
- array?
- array-shape
- array-dims
- array-size
- array-strictness
- array-strict
- array-strict!
- array-default-strict
- array-default-strict!
- array-strict?
- build-array
- build-simple-array
- list->array
- make-unsafe-array-proc
- unsafe-build-array
- unsafe-build-simple-array
- unsafe-list->array
- unsafe-array-proc
- array-lazy
- array
- ;; Settable-Array
- Settable-Array
- settable-array?
- unsafe-settable-array-set-proc
- make-unsafe-array-set-proc
- ;; Printing
- print-array-fields
- array-custom-printer
- ;; Misc
- array-lift-comparison)
-
-(define-syntax (array stx)
-  (syntax-parse stx #:literals (:)
-    [(_ e:expr)
-     (syntax/loc stx (array/syntax array list unsafe-list->array e))]
-    [(_ e:expr : T:expr)
-     (syntax/loc stx (array/syntax array (inst list T) unsafe-list->array e))]
-    [_:id  (raise-syntax-error 'array "not allowed as an expression" stx)]))
-
-(define-syntax-rule (array-strict arr-expr)
-  (let ([arr arr-expr])
-    (array-strict! arr)
-    arr))
-
-(define-syntax-rule (array-default-strict arr-expr)
-  (let ([arr arr-expr])
-    (array-default-strict! arr)
-    arr))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-syntax.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-syntax.rkt
deleted file mode 100644
index f9fa8afe05..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-syntax.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         (only-in typed/racket/base inst Index))
-
-(provide array/syntax)
-
-(define-for-syntax (syntax-vector-shape e-stx)
-  (syntax-case e-stx ()
-    [#[]  (list 0)]
-    [#[e0 e ...]
-     (let ([lst  (syntax->list #'(e0 e ...))])
-       (define d (length lst))
-       (define ds (syntax-vector-shape (car lst)))
-       (if ds
-           (let loop ([lst  (cdr lst)])
-             (cond [(null? lst)  (cons d ds)]
-                   [(equal? ds (syntax-vector-shape (car lst)))
-                    (loop (cdr lst))]
-              [else  #f]))
-           #f))]
-    [_  null]))
-
-(define-for-syntax (syntax-vector-flatten e-stx)
-  (reverse
-   (let loop ([e-stx e-stx] [acc null])
-     (syntax-case e-stx ()
-       [#[e ...]
-        (let ([lst  (syntax->list #'(e ...))])
-          (for/fold ([acc acc]) ([lst  (in-list lst)])
-            (loop lst acc)))]
-       [else
-        (cons e-stx acc)]))))
-
-(define-syntax (array/syntax stx)
-  (syntax-case stx ()
-    [(_ orig-name constr ->array e)
-     (let ([ds  (syntax-vector-shape #'e)])
-       (unless ds
-         (raise-syntax-error (syntax->datum #'orig-name) "expected rectangular data" stx #'e))
-       (with-syntax ([(d ...)  ds]
-                     [(v ...)  (syntax-vector-flatten #'e)])
-         (syntax/loc stx
-           (->array ((inst vector Index) d ...) (constr v ...)))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-transform.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-transform.rkt
deleted file mode 100644
index fb55e2e603..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-transform.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require typed/untyped-utils
-         (except-in "typed-array-transform.rkt"
-                    array-transform
-                    array-reshape))
-
-(require/untyped-contract
- (begin (require "array-struct.rkt"
-                 "utils.rkt"))
- "typed-array-transform.rkt"
- [array-transform  (All (A) ((Array A) (Vectorof Integer) (Indexes -> (Vectorof Integer))
-                                       -> (Array A)))]
- [array-reshape    (All (A) ((Array A) (Vectorof Integer) -> (Array A)))])
-
-(provide array-transform
-         unsafe-array-transform
-         array-axis-permute
-         array-axis-swap
-         array-axis-insert
-         array-axis-ref
-         array-reshape
-         array-flatten
-         array-append*)
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/array-unfold.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-unfold.rkt
deleted file mode 100644
index 148cfb1f26..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/array-unfold.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         "array-struct.rkt"
-         "array-pointwise.rkt"
-         "array-fold.rkt"
-         "utils.rkt"
-         "../unsafe.rkt")
-
-(provide unsafe-array-axis-expand
-         array-axis-expand
-         list-array->array)
-
-(: check-array-axis (All (A) (Symbol (Array A) Integer -> Index)))
-(define (check-array-axis name arr k)
-  (define dims (array-dims arr))
-  (cond [(fx= dims 0)  (raise-argument-error name "Array with at least one axis" 0 arr k)]
-        [(or (k . < . 0) (k . > . dims))
-         (raise-argument-error name (format "Index <= ~a" dims) 1 arr k)]
-        [else  k]))
-
-(: unsafe-array-axis-expand (All (A B) ((Array A) Index Index (A Index -> B) -> (Array B))))
-(define (unsafe-array-axis-expand arr k dk f)
-  (define ds (array-shape arr))
-  (define new-ds (unsafe-vector-insert ds k dk))
-  (define proc (unsafe-array-proc arr))
-  (unsafe-build-array
-   new-ds (λ: ([js : Indexes])
-            (define jk (unsafe-vector-ref js k))
-            (f (proc (unsafe-vector-remove js k)) jk))))
-
-(: array-axis-expand (All (A B) ((Array A) Integer Integer (A Index -> B) -> (Array B))))
-(define (array-axis-expand arr k dk f)
-  (let ([k  (check-array-axis 'array-axis-expand arr k)])
-    (cond [(not (index? dk))  (raise-argument-error 'array-axis-expand "Index" 2 arr k dk f)]
-          [else  (array-default-strict
-                  (unsafe-array-axis-expand arr k dk f))])))
-
-;; ===================================================================================================
-;; Specific unfolds/expansions
-
-(: list-array->array (All (A) (case-> ((Array (Listof A)) -> (Array A))
-                                      ((Array (Listof A)) Integer -> (Array A)))))
-(define (list-array->array arr [k 0])
-  (define dims (array-dims arr))
-  (cond [(and (k . >= . 0) (k . <= . dims))
-         (let ([arr  (array-strict (array-map (inst list->vector A) arr))])
-           ;(define dks (remove-duplicates (array->list (array-map vector-length arr))))
-           (define dk (array-all-min (array-map vector-length arr)))
-           (array-default-strict
-            (unsafe-array-axis-expand arr k dk (inst unsafe-vector-ref A))))]
-        [else
-         (raise-argument-error 'list-array->array (format "Index <= ~a" dims) 1 arr k)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/fcarray-pointwise.rkt b/pkgs/math-pkgs/math-lib/math/private/array/fcarray-pointwise.rkt
deleted file mode 100644
index 76cd0fed31..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/fcarray-pointwise.rkt
+++ /dev/null
@@ -1,213 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         (only-in racket/math conjugate)
-         (for-syntax racket/base)
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "array-struct.rkt"
-         "array-broadcast.rkt"
-         "array-pointwise.rkt"
-         "flarray-struct.rkt"
-         "fcarray-struct.rkt"
-         "utils.rkt")
-
-(provide
- ;; Mapping
- inline-fcarray-map
- fcarray-map
- ;; Pointwise operations
- fcarray-scale
- fcarray-sqr
- fcarray-sqrt
- fcarray-magnitude
- fcarray-angle
- fcarray+
- fcarray*
- fcarray-
- fcarray/
- fcarray-conjugate
- fcarray-real-part
- fcarray-imag-part
- fcarray-make-rectangular
- fcarray-make-polar
- )
-
-;; ===================================================================================================
-;; Mapping
-
-(define-syntax (inline-fcarray-map stx)
-  (syntax-case stx ()
-    [(_ f)  (syntax/loc stx
-              (let ([z  (f)])
-                (unsafe-fcarray #() (flvector (real-part z)) (flvector (imag-part z)))))]
-    [(_ f arr-expr)
-     (syntax/loc stx
-       (let: ([arr : FCArray  arr-expr])
-         (define ds (array-shape arr))
-         (define xs (fcarray-real-data arr))
-         (define ys (fcarray-imag-data arr))
-         (define n (flvector-length xs))
-         (define new-xs (make-flvector n))
-         (define new-ys (make-flvector n))
-         (let: loop : FCArray ([j : Nonnegative-Fixnum  0])
-           (cond [(j . fx< . n)
-                  (define z (f (make-rectangular (unsafe-flvector-ref xs j)
-                                                 (unsafe-flvector-ref ys j))))
-                  (unsafe-flvector-set! new-xs j (real-part z))
-                  (unsafe-flvector-set! new-ys j (imag-part z))
-                  (loop (fx+ j 1))]
-                 [else
-                  (unsafe-fcarray ds new-xs new-ys)]))))]
-    [(_ f arr-expr arr-exprs ...)
-     (with-syntax ([(arrs ...)   (generate-temporaries #'(arr-exprs ...))]
-                   [(dss ...)    (generate-temporaries #'(arr-exprs ...))]
-                   [(xss ...)    (generate-temporaries #'(arr-exprs ...))]
-                   [(yss ...)    (generate-temporaries #'(arr-exprs ...))]
-                   [(procs ...)  (generate-temporaries #'(arr-exprs ...))])
-       (syntax/loc stx
-         (let: ([arr : FCArray  arr-expr]
-                [arrs : FCArray arr-exprs] ...)
-           (define ds (array-shape arr))
-           (define dss (array-shape arrs)) ...
-           (cond [(and (equal? ds dss) ...)
-                  (define xs (fcarray-real-data arr))
-                  (define ys (fcarray-imag-data arr))
-                  (define xss (fcarray-real-data arrs)) ...
-                  (define yss (fcarray-imag-data arrs)) ...
-                  (define n (flvector-length xs))
-                  (define new-xs (make-flvector n))
-                  (define new-ys (make-flvector n))
-                  (let: loop : FCArray ([j : Nonnegative-Fixnum  0])
-                    (cond [(j . fx< . n)
-                           (define z (f (make-rectangular (unsafe-flvector-ref xs j)
-                                                          (unsafe-flvector-ref ys j))
-                                        (make-rectangular (unsafe-flvector-ref xss j)
-                                                          (unsafe-flvector-ref yss j))
-                                        ...))
-                           (unsafe-flvector-set! new-xs j (real-part z))
-                           (unsafe-flvector-set! new-ys j (imag-part z))
-                           (loop (fx+ j 1))]
-                          [else
-                           (unsafe-fcarray ds new-xs new-ys)]))]
-                 [else
-                  (define new-ds (array-shape-broadcast (list ds dss ...)))
-                  (let: ([arr  : (Array Float-Complex)  (array-broadcast arr new-ds)]
-                         [arrs : (Array Float-Complex)  (array-broadcast arrs new-ds)] ...)
-                    (define proc  (unsafe-array-proc arr))
-                    (define procs (unsafe-array-proc arrs)) ...
-                    (array->fcarray
-                     (unsafe-build-array
-                      new-ds (λ: ([js : Indexes]) (f (proc js) (procs js) ...)))))]))))]))
-
-(: fcarray-map
-   (case-> ((-> Float-Complex) -> FCArray)
-           ((Float-Complex -> Float-Complex) FCArray -> FCArray)
-           ((Float-Complex Float-Complex Float-Complex * -> Float-Complex) FCArray FCArray FCArray *
-                                                                           -> FCArray)))
-(define fcarray-map
-  (case-lambda:
-    [([f : (-> Float-Complex)])
-     (inline-fcarray-map f)]
-    [([f : (Float-Complex -> Float-Complex)] [arr : FCArray])
-     (inline-fcarray-map f arr)]
-    [([f : (Float-Complex Float-Complex -> Float-Complex)] [arr0 : FCArray] [arr1 : FCArray])
-     (inline-fcarray-map f arr0 arr1)]
-    [([f : (Float-Complex Float-Complex Float-Complex * -> Float-Complex)]
-      [arr0 : FCArray] [arr1 : FCArray] . [arrs : FCArray *])
-     (define ds (array-shape arr0))
-     (define dss (map (λ: ([arr : FCArray]) (array-shape arr)) (cons arr1 arrs)))
-     (define new-ds (array-shape-broadcast (list* ds dss)))
-     (let: ([arr0 : (Array Float-Complex)  (array-broadcast arr0 new-ds)]
-            [arr1 : (Array Float-Complex)  (array-broadcast arr1 new-ds)]
-            [arrs : (Listof (Array Float-Complex))
-                  (map (λ: ([arr : FCArray]) (array-broadcast arr new-ds)) arrs)])
-       (define proc0 (unsafe-array-proc arr0))
-       (define proc1 (unsafe-array-proc arr1))
-       (define procs (map (λ: ([arr : (Array Float-Complex)]) (unsafe-array-proc arr)) arrs))
-       (array->fcarray
-        (unsafe-build-array
-         new-ds (λ: ([js : Indexes])
-                  (apply f (proc0 js) (proc1 js)
-                         (map (λ: ([proc : (Indexes -> Float-Complex)]) (proc js))
-                              procs))))))]))
-
-;; ===================================================================================================
-;; Pointwise operations
-
-(define-syntax-rule (lift1->fl f)
-  (λ (arr)
-    (define ds (array-shape arr))
-    (define xs (fcarray-real-data arr))
-    (define ys (fcarray-imag-data arr))
-    (define n (flvector-length xs))
-    (define new-xs (make-flvector n))
-    (let: loop : FlArray ([j : Nonnegative-Fixnum  0])
-      (cond [(j . fx< . n)
-             (define z (f (make-rectangular (unsafe-flvector-ref xs j)
-                                            (unsafe-flvector-ref ys j))))
-             (unsafe-flvector-set! new-xs j z)
-             (loop (fx+ j 1))]
-            [else
-             (unsafe-flarray ds new-xs)]))))
-
-(define-syntax-rule (lift1 f)
-  (λ: ([arr : FCArray]) (inline-fcarray-map f arr)))
-
-(define-syntax-rule (lift2 f)
-  (λ: ([arr1 : FCArray] [arr2 : FCArray]) (inline-fcarray-map f arr1 arr2)))
-
-(: fcarray-scale (FCArray (U Float Float-Complex) -> FCArray))
-(define (fcarray-scale arr y)
-  (if (flonum? y)
-      (inline-fcarray-map (λ (z) (* z y)) arr)
-      (inline-fcarray-map (λ (z) (* z y)) arr)))
-
-(: fcarray-sqr (FCArray -> FCArray))
-(define fcarray-sqr (lift1 (λ: ([z : Float-Complex]) (* z z))))
-
-(: fcarray-sqrt (FCArray -> FCArray))
-(define fcarray-sqrt (lift1 sqrt))
-
-(: fcarray-magnitude (FCArray -> FlArray))
-(define fcarray-magnitude (lift1->fl magnitude))
-
-(: fcarray-angle (FCArray -> FlArray))
-(define fcarray-angle (lift1->fl angle))
-
-(: fcarray-conjugate (FCArray -> FCArray))
-(define fcarray-conjugate (lift1 conjugate))
-
-(: fcarray+ (FCArray FCArray -> FCArray))
-(define fcarray+ (lift2 +))
-
-(: fcarray* (FCArray FCArray -> FCArray))
-(define fcarray* (lift2 *))
-
-(: fcarray- (case-> (FCArray -> FCArray)
-                    (FCArray FCArray -> FCArray)))
-(define fcarray-
-  (case-lambda
-    [(arr)  (inline-fcarray-map (λ (z) (- 0.0 z)) arr)]
-    [(arr1 arr2)  (inline-fcarray-map - arr1 arr2)]))
-
-(: fcarray/ (case-> (FCArray -> FCArray)
-                    (FCArray FCArray -> FCArray)))
-(define fcarray/
-  (case-lambda
-    [(arr)  (inline-fcarray-map (λ (z) (/ 1.0 z)) arr)]
-    [(arr1 arr2)  (inline-fcarray-map / arr1 arr2)]))
-
-(: fcarray-real-part (FCArray -> FlArray))
-(define fcarray-real-part (lift1->fl real-part))
-
-(: fcarray-imag-part (FCArray -> FlArray))
-(define fcarray-imag-part (lift1->fl imag-part))
-
-(: fcarray-make-rectangular (FlArray FlArray -> FCArray))
-(define (fcarray-make-rectangular arr1 arr2)
-  (array->fcarray (array-make-rectangular arr1 arr2)))
-
-(: fcarray-make-polar (FlArray FlArray -> FCArray))
-(define (fcarray-make-polar arr1 arr2)
-  (array->fcarray (array-make-polar arr1 arr2)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/fcarray-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/array/fcarray-struct.rkt
deleted file mode 100644
index af7e4084c7..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/fcarray-struct.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang racket/base
-
-(provide FCArray
-         unsafe-fcarray
-         (rename-out [fcarray/syntax fcarray])
-         array->fcarray
-         fcarray-real-data
-         fcarray-imag-data)
-
-(module defs typed/racket/base
-  
-  (require "../../flonum.rkt"
-           "../unsafe.rkt"
-           "array-struct.rkt"
-           "utils.rkt"
-           "for-each.rkt")
-  
-  (provide (all-defined-out))
-  
-  (struct: (A) fcarray Settable-Array ([real-data : FlVector] [imag-data : FlVector])
-    #:property prop:custom-write (λ (arr port mode) ((array-custom-printer) arr 'fcarray port mode)))
-  
-  (define-type FCArray (fcarray Float-Complex))
-  
-  (: unsafe-fcarray (Indexes FlVector FlVector -> FCArray))
-  (define (unsafe-fcarray ds xs ys)
-    (define proc
-      (make-unsafe-array-proc
-       ds (λ (j) (make-rectangular (unsafe-flvector-ref xs j) (unsafe-flvector-ref ys j)))))
-    (define set-proc
-      (make-unsafe-array-set-proc
-       Float-Complex ds (λ (j v)
-                          (unsafe-flvector-set! xs j (real-part v))
-                          (unsafe-flvector-set! ys j (imag-part v)))))
-    (fcarray ds (flvector-length xs) (box #t) void proc set-proc xs ys))
-  
-  (: unsafe-vector->fcarray (Indexes (Vectorof Number) -> FCArray))
-  (define (unsafe-vector->fcarray ds zs)
-    (define size (vector-length zs))
-    (define xs (build-flvector size (λ: ([j : Index]) (fl (real-part (unsafe-vector-ref zs j))))))
-    (define ys (build-flvector size (λ: ([j : Index]) (fl (imag-part (unsafe-vector-ref zs j))))))
-    (unsafe-fcarray ds xs ys))
-  
-  (: array->fcarray ((Array Number) -> FCArray))
-  (define (array->fcarray arr)
-    (define ds (array-shape arr))
-    (define size (array-size arr))
-    (define proc (unsafe-array-proc arr))
-    (define xs (make-flvector size))
-    (define ys (make-flvector size))
-    (for-each-array+data-index
-     ds (λ (js j)
-          (define z (proc js))
-          (unsafe-flvector-set! xs j (fl (real-part z)))
-          (unsafe-flvector-set! ys j (fl (imag-part z)))))
-    (unsafe-fcarray ds xs ys))
-  
-  )  ; module defs
-
-(require 'defs
-         typed/racket/base
-         (for-syntax racket/base
-                     syntax/parse)
-         "array-syntax.rkt")
-
-(define-syntax (fcarray/syntax stx)
-  (syntax-parse stx
-    [(_ e:expr)
-     (syntax/loc stx (array/syntax fcarray (inst vector Number) unsafe-vector->fcarray e))]
-    [_:id  (raise-syntax-error 'fcarray "not allowed as an expression" stx)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/flarray-pointwise.rkt b/pkgs/math-pkgs/math-lib/math/private/array/flarray-pointwise.rkt
deleted file mode 100644
index e0e0945dcc..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/flarray-pointwise.rkt
+++ /dev/null
@@ -1,138 +0,0 @@
-#lang typed/racket/base
-
-(require racket/flonum
-         (for-syntax racket/base)
-         "../../flonum.rkt"
-         "array-struct.rkt"
-         "array-broadcast.rkt"
-         "array-pointwise.rkt"
-         "mutable-array.rkt"
-         "flarray-struct.rkt"
-         "utils.rkt")
-
-(provide
- ;; Mapping
- inline-flarray-map
- flarray-map
- ;; Pointwise operations
- flarray-scale
- flarray-sqr
- flarray-sqrt
- flarray-abs
- flarray+
- flarray*
- flarray-
- flarray/
- flarray-min
- flarray-max)
-
-;; ===================================================================================================
-;; Mapping
-
-(define-syntax (inline-flarray-map stx)
-  (syntax-case stx ()
-    [(_ f)  (syntax/loc stx (unsafe-flarray #() (flvector (f))))]
-    [(_ f arr-expr)
-     (syntax/loc stx
-       (let: ([arr : FlArray  arr-expr])
-         (unsafe-flarray (array-shape arr) (inline-flvector-map f (flarray-data arr)))))]
-    [(_ f arr-expr arr-exprs ...)
-     (with-syntax ([(arrs ...)   (generate-temporaries #'(arr-exprs ...))]
-                   [(dss ...)    (generate-temporaries #'(arr-exprs ...))]
-                   [(procs ...)  (generate-temporaries #'(arr-exprs ...))])
-       (syntax/loc stx
-         (let: ([arr : FlArray  arr-expr]
-                [arrs : FlArray  arr-exprs] ...)
-           (define ds (array-shape arr))
-           (define dss (array-shape arrs)) ...
-           (cond [(and (equal? ds dss) ...)
-                  (unsafe-flarray
-                   ds (inline-flvector-map f (flarray-data arr) (flarray-data arrs) ...))]
-                 [else
-                  (define new-ds (array-shape-broadcast (list ds dss ...)))
-                  (define proc  (unsafe-array-proc (array-broadcast arr new-ds)))
-                  (define procs (unsafe-array-proc (array-broadcast arrs new-ds))) ...
-                  (array->flarray
-                   (unsafe-build-array new-ds (λ: ([js : Indexes])
-                                                (f (proc js) (procs js) ...))))]))))]))
-
-(: flarray-map (case-> ((-> Float) -> FlArray)
-                       ((Float -> Float) FlArray -> FlArray)
-                       ((Float Float Float * -> Float) FlArray FlArray FlArray * -> FlArray)))
-(define flarray-map
-  (case-lambda:
-    [([f : (-> Float)])
-     (inline-flarray-map f)]
-    [([f : (Float -> Float)] [arr : FlArray])
-     (inline-flarray-map f arr)]
-    [([f : (Float Float -> Float)] [arr0 : FlArray] [arr1 : FlArray])
-     (inline-flarray-map f arr0 arr1)]
-    [([f : (Float Float Float * -> Float)] [arr0 : FlArray] [arr1 : FlArray] . [arrs : FlArray *])
-     (define ds (array-shape arr0))
-     (define dss (map (λ: ([arr : FlArray]) (array-shape arr)) (cons arr1 arrs)))
-     (define new-ds (array-shape-broadcast (list* ds dss)))
-     (let: ([arr0 : (Array Float)  (array-broadcast arr0 new-ds)]
-            [arr1 : (Array Float)  (array-broadcast arr1 new-ds)]
-            [arrs : (Listof (Array Float))
-                  (map (λ: ([arr : FlArray]) (array-broadcast arr new-ds)) arrs)])
-       (define proc0 (unsafe-array-proc arr0))
-       (define proc1 (unsafe-array-proc arr1))
-       (define procs (map (λ: ([arr : (Array Float)]) (unsafe-array-proc arr)) arrs))
-       (array->flarray
-        (unsafe-build-array new-ds (λ: ([js : Indexes])
-                                     (apply f (proc0 js) (proc1 js)
-                                            (map (λ: ([proc : (Indexes -> Float)]) (proc js))
-                                                 procs))))))]))
-
-;; ===================================================================================================
-;; Pointwise operations
-
-(define-syntax-rule (lift-flvector1 f)
-  (λ (arr) (unsafe-flarray (array-shape arr) (f (flarray-data arr)))))
-
-(define-syntax-rule (lift-flvector2 f array-f)
-  (λ (arr1 arr2)
-    (define ds1 (array-shape arr1))
-    (define ds2 (array-shape arr2))
-    (cond [(equal? ds1 ds2)  (unsafe-flarray ds1 (f (flarray-data arr1) (flarray-data arr2)))]
-          [else  (array->flarray (array-f arr1 arr2))])))
-
-(: flarray-scale (FlArray Float -> FlArray))
-(define (flarray-scale arr y)
-  (define-syntax-rule (fun xs) (flvector-scale xs y))
-  ((lift-flvector1 fun) arr))
-
-(: flarray-sqr (FlArray -> FlArray))
-(define flarray-sqr (lift-flvector1 flvector-sqr))
-
-(: flarray-sqrt (FlArray -> FlArray))
-(define flarray-sqrt (lift-flvector1 flvector-sqrt))
-
-(: flarray-abs (FlArray -> FlArray))
-(define flarray-abs (lift-flvector1 flvector-abs))
-
-(: flarray+ (FlArray FlArray -> FlArray))
-(define flarray+ (lift-flvector2 flvector+ array+))
-
-(: flarray* (FlArray FlArray -> FlArray))
-(define flarray* (lift-flvector2 flvector* array*))
-
-(: flarray- (case-> (FlArray -> FlArray)
-                    (FlArray FlArray -> FlArray)))
-(define flarray-
-  (case-lambda
-    [(arr)  ((lift-flvector1 flvector-) arr)]
-    [(arr1 arr2)  ((lift-flvector2 flvector- array-) arr1 arr2)]))
-
-(: flarray/ (case-> (FlArray -> FlArray)
-                    (FlArray FlArray -> FlArray)))
-(define flarray/
-  (case-lambda
-    [(arr)  ((lift-flvector1 flvector/) arr)]
-    [(arr1 arr2)  ((lift-flvector2 flvector/ array/) arr1 arr2)]))
-
-(: flarray-min  (FlArray FlArray -> FlArray))
-(define flarray-min  (lift-flvector2 flvector-min array-min))
-
-(: flarray-max  (FlArray FlArray -> FlArray))
-(define flarray-max  (lift-flvector2 flvector-max array-max))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/flarray-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/array/flarray-struct.rkt
deleted file mode 100644
index d0f430473c..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/flarray-struct.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket/base
-
-(provide FlArray
-         unsafe-flarray
-         (rename-out [flarray/syntax flarray])
-         array->flarray
-         flarray-data)
-
-(module defs typed/racket/base
-  
-  (require "../../flonum.rkt"
-           "../unsafe.rkt"
-           "array-struct.rkt"
-           "utils.rkt"
-           "for-each.rkt")
-  
-  (provide (all-defined-out))
-  
-  (struct: (A) flarray Settable-Array ([data : FlVector])
-    #:property prop:custom-write (λ (arr port mode) ((array-custom-printer) arr 'flarray port mode)))
-  
-  (define-type FlArray (flarray Float))
-  
-  (: unsafe-flarray (Indexes FlVector -> FlArray))
-  (define (unsafe-flarray ds vs)
-    (define proc (make-unsafe-array-proc ds (λ (j) (unsafe-flvector-ref vs j))))
-    (define set-proc (make-unsafe-array-set-proc Float ds (λ (j v) (unsafe-flvector-set! vs j v))))
-    (flarray ds (flvector-length vs) (box #t) void proc set-proc vs))
-  
-  (: unsafe-vector->flarray (Indexes (Vectorof Real) -> FlArray))
-  (define (unsafe-vector->flarray ds vs)
-    (define size (vector-length vs))
-    (define xs
-      (build-flvector size (λ: ([j : Index]) (real->double-flonum (unsafe-vector-ref vs j)))))
-    (unsafe-flarray ds xs))
-  
-  (: array->flarray ((Array Real) -> FlArray))
-  (define (array->flarray arr)
-    (define ds (array-shape arr))
-    (define size (array-size arr))
-    (define proc (unsafe-array-proc arr))
-    (define vs (make-flvector size))
-    (for-each-array+data-index ds (λ (js j) (unsafe-flvector-set!
-                                             vs j (real->double-flonum (proc js)))))
-    (unsafe-flarray ds vs))
-  
-  )  ; module defs
-
-(require 'defs
-         typed/racket/base
-         (for-syntax racket/base
-                     syntax/parse)
-         "array-syntax.rkt")
-
-(define-syntax (flarray/syntax stx)
-  (syntax-parse stx
-    [(_ e:expr)
-     (syntax/loc stx (array/syntax flarray (inst vector Real) unsafe-vector->flarray e))]
-    [_:id  (raise-syntax-error 'flarray "not allowed as an expression" stx)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/for-each.rkt b/pkgs/math-pkgs/math-lib/math/private/array/for-each.rkt
deleted file mode 100644
index 91ab6f031e..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/for-each.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         "../unsafe.rkt"
-         "utils.rkt")
-
-(provide (all-defined-out))
-
-(define-syntax-rule (for-each-array+data-index ds-expr f-expr)
-  (let*: ([ds : Indexes  ds-expr]
-          [dims : Index  (vector-length ds)])
-    (define-syntax-rule (f js j)
-      ((ann f-expr (Indexes Nonnegative-Fixnum -> Void)) js j))
-    (cond
-      [(= dims 0)  (f ds 0)]
-      [else
-       (define: js : Indexes (make-vector dims 0))
-       (case dims
-         [(1)  (define: d0 : Index (unsafe-vector-ref ds 0))
-               (let: j0-loop : Void ([j0 : Nonnegative-Fixnum  0])
-                 (when (j0 . < . d0)
-                   (unsafe-vector-set! js 0 j0)
-                   (f js j0)
-                   (j0-loop (+ j0 1))))]
-         [(2)  (define: d0 : Index (unsafe-vector-ref ds 0))
-               (define: d1 : Index (unsafe-vector-ref ds 1))
-               (let: j0-loop : Void ([j0 : Nonnegative-Fixnum  0]
-                                     [j : Nonnegative-Fixnum  0])
-                 (when (j0 . < . d0)
-                   (unsafe-vector-set! js 0 j0)
-                   (let: j1-loop : Void ([j1 : Nonnegative-Fixnum  0]
-                                         [j : Nonnegative-Fixnum  j])
-                     (cond [(j1 . < . d1)
-                            (unsafe-vector-set! js 1 j1)
-                            (f js j)
-                            (j1-loop (+ j1 1) (unsafe-fx+ j 1))]
-                           [else
-                            (j0-loop (+ j0 1) j)]))))]
-         [else  (let: i-loop : Nonnegative-Fixnum ([i : Nonnegative-Fixnum  0]
-                                                   [j : Nonnegative-Fixnum  0])
-                  (cond [(i . < . dims)
-                         (define: di : Index (unsafe-vector-ref ds i))
-                         (let: ji-loop : Nonnegative-Fixnum ([ji : Nonnegative-Fixnum  0]
-                                                             [j : Nonnegative-Fixnum  j])
-                           (cond [(ji . < . di)
-                                  (unsafe-vector-set! js i ji)
-                                  (ji-loop (+ ji 1) (i-loop (+ i 1) j))]
-                                 [else  j]))]
-                        [else  (f js j)
-                               (unsafe-fx+ j 1)]))
-                (void)])])))
-
-(define-syntax-rule (for-each-array-index ds-expr f-expr)
-  (let*: ([ds : Indexes  ds-expr]
-          [dims : Index  (vector-length ds)])
-    (define-syntax-rule (f js)
-      ((ann f-expr (Indexes -> Void)) js))
-    (cond
-      [(= dims 0)  (f ds)]
-      [else
-       (define: js : Indexes (make-vector dims 0))
-       (case dims
-         [(1)  (define: d0 : Index (unsafe-vector-ref ds 0))
-               (let: j0-loop : Void ([j0 : Nonnegative-Fixnum  0])
-                 (when (j0 . < . d0)
-                   (unsafe-vector-set! js 0 j0)
-                   (f js)
-                   (j0-loop (+ j0 1))))]
-         [(2)  (define: d0 : Index (unsafe-vector-ref ds 0))
-               (define: d1 : Index (unsafe-vector-ref ds 1))
-               (let: j0-loop : Void ([j0 : Nonnegative-Fixnum  0])
-                 (when (j0 . < . d0)
-                   (unsafe-vector-set! js 0 j0)
-                   (let: j1-loop : Void ([j1 : Nonnegative-Fixnum  0])
-                     (cond [(j1 . < . d1)
-                            (unsafe-vector-set! js 1 j1)
-                            (f js)
-                            (j1-loop (+ j1 1))]
-                           [else
-                            (j0-loop (+ j0 1))]))))]
-         [else  (let: i-loop : Void ([i : Nonnegative-Fixnum  0])
-                  (cond [(i . < . dims)
-                         (define: di : Index (unsafe-vector-ref ds i))
-                         (let: ji-loop : Void ([ji : Nonnegative-Fixnum  0])
-                           (when (ji . < . di)
-                             (unsafe-vector-set! js i ji)
-                             (i-loop (+ i 1))
-                             (ji-loop (+ ji 1))))]
-                        [else  (f js)]))])])))
-
-(define-syntax-rule (for-each-data-index ds-expr f-expr)
-  (let*: ([ds : Indexes  ds-expr]
-          [dims : Index  (vector-length ds)])
-    (define-syntax-rule (f j)
-      ((ann f-expr (Nonnegative-Fixnum -> Void)) j))
-    (cond
-      [(= dims 0)  (f 0)]
-      [else
-       (case dims
-         [(1)  (define: d0 : Index (unsafe-vector-ref ds 0))
-               (let: j0-loop : Void ([j0 : Nonnegative-Fixnum  0])
-                 (when (j0 . < . d0)
-                   (f j0)
-                   (j0-loop (+ j0 1))))]
-         [(2)  (define: d0 : Index (unsafe-vector-ref ds 0))
-               (define: d1 : Index (unsafe-vector-ref ds 1))
-               (let: j0-loop : Void ([j0 : Nonnegative-Fixnum  0]
-                                     [j : Nonnegative-Fixnum  0])
-                 (when (j0 . < . d0)
-                   (let: j1-loop : Void ([j1 : Nonnegative-Fixnum  0]
-                                         [j : Nonnegative-Fixnum  j])
-                     (cond [(j1 . < . d1)
-                            (f j)
-                            (j1-loop (+ j1 1) (unsafe-fx+ j 1))]
-                           [else
-                            (j0-loop (+ j0 1) j)]))))]
-         [else  (let: i-loop : Nonnegative-Fixnum ([i : Nonnegative-Fixnum  0]
-                                                   [j : Nonnegative-Fixnum  0])
-                  (cond [(i . < . dims)
-                         (define: di : Index (unsafe-vector-ref ds i))
-                         (let: ji-loop : Nonnegative-Fixnum ([ji : Nonnegative-Fixnum  0]
-                                                             [j : Nonnegative-Fixnum  j])
-                           (cond [(ji . < . di)
-                                  (ji-loop (+ ji 1) (i-loop (+ i 1) j))]
-                                 [else  j]))]
-                        [else  (f j)
-                               (unsafe-fx+ j 1)]))
-                (void)])])))
-
-(define-syntax-rule (inline-build-array-data ds-expr g-expr A)
-  (let*: ([ds : Indexes  ds-expr]
-          [dims : Index  (vector-length ds)])
-    (define-syntax-rule (g js j)
-      ((ann g-expr (Indexes Nonnegative-Fixnum -> A)) js j))
-    (define: size : Nonnegative-Fixnum
-      (let: loop : Nonnegative-Fixnum ([k : Nonnegative-Fixnum  0] [size : Nonnegative-Fixnum  1])
-        (cond [(k . < . dims)  (loop (+ k 1) (unsafe-fx* size (unsafe-vector-ref ds k)))]
-              [else  size])))
-    (cond [(= size 0)  (ann (vector) (Vectorof A))]
-          [else
-           (define: js0 : Indexes (make-vector dims 0))
-           (define: vs : (Vectorof A) (make-vector size (g js0 0)))
-           (for-each-array+data-index ds (λ (js j) (unsafe-vector-set! vs j (g js j))))
-           vs])))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/mutable-array.rkt b/pkgs/math-pkgs/math-lib/math/private/array/mutable-array.rkt
deleted file mode 100644
index a8a4a5b2bc..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/mutable-array.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-
-(require typed/untyped-utils
-         typed/racket/base
-         (for-syntax racket/base syntax/parse)
-         "array-syntax.rkt"
-         (except-in "typed-mutable-array.rkt"
-                    vector->array))
-
-(require/untyped-contract
- (begin (require (only-in "typed-mutable-array.rkt" Mutable-Array)))
- "typed-mutable-array.rkt"
- [vector->array  (All (A) (case-> ((Vectorof A) -> (Mutable-Array A))
-                                  ((Vectorof Integer) (Vectorof A) -> (Mutable-Array A))))])
-
-(provide
- ;; Mutable-Array
- Mutable-Array
- mutable-array?
- mutable-array-data
- vector->array
- unsafe-vector->array
- mutable-array-copy
- mutable-array
- ;; Conversion
- array->mutable-array)
-
-(define-syntax (mutable-array stx)
-  (syntax-parse stx #:literals (:)
-    [(_ e:expr)
-     (syntax/loc stx (array/syntax mutable-array vector unsafe-vector->array e))]
-    [(_ e:expr : T:expr)
-     (syntax/loc stx (array/syntax mutable-array (inst vector T) unsafe-vector->array e))]
-    [_:id  (raise-syntax-error 'mutable-array "not allowed as an expression" stx)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-constructors.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-constructors.rkt
deleted file mode 100644
index 73b6501ad6..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-constructors.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang typed/racket/base
-
-(require "../unsafe.rkt"
-         "array-struct.rkt"
-         "utils.rkt")
-
-(provide (all-defined-out))
-
-(: make-array (All (A) (In-Indexes A -> (Array A))))
-(define (make-array ds v)
-  (let ([ds  (check-array-shape
-              ds (λ () (raise-argument-error 'make-array "(Vectorof Index)" 0 ds v)))])
-    (unsafe-build-simple-array ds (λ (js) v))))
-
-(: axis-index-array (In-Indexes Integer -> (Array Index)))
-(define (axis-index-array ds k)
-  (let* ([ds  (check-array-shape
-               ds (λ () (raise-argument-error 'axis-index-array "(Vectorof Index)" 0 ds k)))]
-         [dims  (vector-length ds)])
-    (cond [(and (0 . <= . k) (k . < . dims))
-           (unsafe-build-simple-array ds (λ: ([js : Indexes]) (unsafe-vector-ref js k)))]
-          [else  (raise-argument-error 'axis-index-array (format "Index < ~a" dims) 1 ds k)])))
-
-(: index-array (In-Indexes -> (Array Index)))
-(define (index-array ds)
-  (let ([ds  (check-array-shape
-              ds (λ () (raise-argument-error 'index-array "(Vectorof Index)" ds)))])
-    (unsafe-build-simple-array ds (λ: ([js : Indexes])
-                                    (assert (unsafe-array-index->value-index ds js) index?)))))
-
-(: indexes-array (In-Indexes -> (Array Indexes)))
-(define (indexes-array ds)
-  (let ([ds  (check-array-shape
-              ds (λ () (raise-argument-error 'indexes-array "(Vectorof Index)" ds)))])
-    (unsafe-build-simple-array ds (λ: ([js : Indexes]) (vector-copy-all js)))))
-
-(: diagonal-array (All (A) (Integer Integer A A -> (Array A))))
-(define (diagonal-array dims size on-value off-value)
-  (cond [(not (index? dims))  (raise-argument-error 'diagonal-array "Index" 0 dims size)]
-        [(not (index? size))  (raise-argument-error 'diagonal-array "Index" 1 dims size)]
-        [else
-         (define: ds : Indexes (make-vector dims size))
-         ;; specialize for various cases
-         (cond [(or (dims . <= . 1) (size . <= . 1))
-                (unsafe-build-simple-array ds (λ: ([js : Indexes]) on-value))]
-               [(= dims 2)
-                (unsafe-build-simple-array
-                 ds (λ: ([js : Indexes])
-                      (define j0 (unsafe-vector-ref js 0))
-                      (define j1 (unsafe-vector-ref js 1))
-                      (if (= j0 j1) on-value off-value)))]
-               [else
-                (unsafe-build-simple-array
-                 ds (λ: ([js : Indexes])
-                      (define j0 (unsafe-vector-ref js 0))
-                      (let: loop : A ([i : Nonnegative-Fixnum  1])
-                        (cond [(i . >= . dims)  on-value]
-                              [(= (unsafe-vector-ref js i) j0)  (loop (+ i 1))]
-                              [else  off-value]))))])]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-convert.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-convert.rkt
deleted file mode 100644
index 371a095364..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-convert.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang typed/racket/base
-
-(require "../unsafe.rkt"
-         "array-struct.rkt"
-         "mutable-array.rkt"
-         "utils.rkt"
-         (only-in "untyped-array-convert.rkt" make-to-array-functions))
-
-(provide (all-defined-out))
-
-;; Conversion to arrays
-(make-to-array-functions list*->array vector*->array)
-
-(: array->list (All (A) ((Array A) -> (Listof A))))
-(define (array->list arr)
-  (vector->list (array->vector arr)))
-
-(: array->vector (All (A) ((Array A) -> (Vectorof A))))
-(define (array->vector arr)
-  (mutable-array-data ((inst array->mutable-array A) arr)))
-
-;; ===================================================================================================
-;; Conversion from arrays
-
-(: array->list* (All (A) ((Array A) -> (Listof* A))))
-(define (array->list* arr)
-  (define ds (array-shape arr))
-  (define proc (unsafe-array-proc arr))
-  (define dims (vector-length ds))
-  (define: js : Indexes (make-vector dims 0))
-  (let: i-loop : (Listof* A) ([i : Nonnegative-Fixnum  0])
-    (cond [(i . < . dims)
-           (define di (unsafe-vector-ref ds i))
-           (cond [(= di 0)  (list)]
-                 [else
-                  (define lsti null)
-                  (let: j-loop : (Listof (Listof* A)) ([ji : Nonnegative-Fixnum  0]
-                                                       [lsti : (Listof (Listof* A))  null])
-                    (cond [(ji . < . di)
-                           (unsafe-vector-set! js i ji)
-                           (j-loop (+ ji 1) (cons (i-loop (+ i 1)) lsti))]
-                          [else  (reverse lsti)]))])]
-          [else  (proc js)])))
-
-(: array->vector* (All (A) ((Array A) -> (Vectorof* A))))
-(define (array->vector* arr)
-  (define ds (array-shape arr))
-  (define proc (unsafe-array-proc arr))
-  (define dims (vector-length ds))
-  (define: js : Indexes (make-vector dims 0))
-  (let: i-loop : (Vectorof* A) ([i : Nonnegative-Fixnum  0])
-    (cond [(i . < . dims)
-           (define di (unsafe-vector-ref ds i))
-           (cond [(= di 0)  (vector)]
-                 [else
-                  (define veci+1 (i-loop (+ i 1)))
-                  (define veci (make-vector di veci+1))
-                  (let: j-loop : (Vectorof* A) ([ji : Nonnegative-Fixnum  0])
-                    (cond [(ji . < . di)
-                           (unsafe-vector-set! js i ji)
-                           (unsafe-vector-set! veci ji (i-loop (+ i 1)))
-                           (j-loop (+ ji 1))]
-                          [else  veci]))])]
-          [else  (proc js)])))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-fold.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-fold.rkt
deleted file mode 100644
index a6463f10b2..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-fold.rkt
+++ /dev/null
@@ -1,175 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/fixnum
-         "../unsafe.rkt"
-         "array-struct.rkt"
-         "array-indexing.rkt"
-         "utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Per-axis folds
-
-(: check-array-axis (All (A) (Symbol (Array A) Integer -> Index)))
-(define (check-array-axis name arr k)
-  (define dims (array-dims arr))
-  (cond
-    [(fx= dims 0)  (raise-argument-error name "Array with at least one axis" 0 arr k)]
-    [(or (0 . > . k) (k . >= . dims))
-     (raise-argument-error name (format "Index < ~a" dims) 1 arr k)]
-    [else  k]))
-
-(: unsafe-array-axis-reduce (All (A B) ((Array A) Index (Index (Index -> A) -> B) -> (Array B))))
-(begin-encourage-inline
-  (define (unsafe-array-axis-reduce arr k f)
-    (define ds (array-shape arr))
-    (define dk (unsafe-vector-ref ds k))
-    (define new-ds (unsafe-vector-remove ds k))
-    (define proc (unsafe-array-proc arr))
-    (unsafe-build-array
-     new-ds (λ: ([js : Indexes])
-              (define old-js (unsafe-vector-insert js k 0))
-              (f dk (λ: ([jk : Index])
-                      (unsafe-vector-set! old-js k jk)
-                      (proc old-js)))))))
-
-(: array-axis-reduce (All (A B) ((Array A) Integer (Index (Integer -> A) -> B) -> (Array B))))
-(define (array-axis-reduce arr k f)
-  (let ([k  (check-array-axis 'array-axis-reduce arr k)])
-    (array-default-strict
-     (unsafe-array-axis-reduce
-      arr k
-      (λ: ([dk : Index] [proc : (Index -> A)])
-        (: safe-proc (Integer -> A))
-        (define (safe-proc jk)
-          (cond [(or (jk . < . 0) (jk . >= . dk))
-                 (raise-argument-error 'array-axis-reduce (format "Index < ~a" dk) jk)]
-                [else  (proc jk)]))
-        (f dk safe-proc))))))
-
-(: array-axis-fold/init (All (A B) ((Array A) Integer (A B -> B) B -> (Array B))))
-(define (array-axis-fold/init arr k f init)
-  (let ([k  (check-array-axis 'array-axis-fold arr k)])
-    (unsafe-array-axis-reduce
-     arr k (λ: ([dk : Index] [proc : (Index -> A)])
-             (let: loop : B ([jk : Nonnegative-Fixnum  0] [acc : B  init])
-               (cond [(jk . fx< . dk)  (loop (fx+ jk 1) (f (proc jk) acc))]
-                     [else  acc]))))))
-
-(: array-axis-fold/no-init (All (A) ((Array A) Integer (A A -> A) -> (Array A))))
-(define (array-axis-fold/no-init arr k f)
-  (let ([k  (check-array-axis 'array-axis-fold arr k)])
-    (when (fx= (unsafe-vector-ref (array-shape arr) k) 0)
-      (raise-argument-error 'array-axis-fold "nonzero axis" 0 arr k))
-    (unsafe-array-axis-reduce
-     arr k (λ: ([dk : Index] [proc : (Index -> A)])
-             (let: loop : A ([jk : Nonnegative-Fixnum  1] [acc : A  (proc 0)])
-               (cond [(jk . fx< . dk)  (loop (fx+ jk 1) (f (proc jk) acc))]
-                     [else  acc]))))))
-
-(: array-axis-fold (All (A B) (case-> ((Array A) Integer (A A -> A) -> (Array A))
-                                      ((Array A) Integer (A B -> B) B -> (Array B)))))
-(define array-axis-fold
-  (case-lambda
-    [(arr k f)  (array-default-strict (array-axis-fold/no-init arr k f))]
-    [(arr k f init)  (array-default-strict (array-axis-fold/init arr k f init))]))
-
-;; ===================================================================================================
-;; Whole-array folds
-
-(begin-encourage-inline
-  
-  (: array-fold (All (A) ((Array A) ((Array A) Index -> (Array A)) -> (Array A))))
-  (define (array-fold arr f)
-    (define dims (array-dims arr))
-    (let loop ([#{k : Index} dims] [arr arr])
-      (cond [(fx= k 0)  arr]
-            [else  (let ([k  (fx- k 1)])
-                     (loop k (f arr k)))])))
-  
-  (: array-all-fold (All (A) (case-> ((Array A) (A A -> A) -> A)
-                                     ((Array A) (A A -> A) A -> A))))
-  (define array-all-fold
-    (case-lambda
-      [(arr f)
-       ;; Though `f' is folded over multiple axes, each element of `arr' is referred to only once, so
-       ;; turning strictness off can't hurt performance
-       (parameterize ([array-strictness #f])
-         (array-ref (array-fold arr (λ: ([arr : (Array A)] [k : Index])
-                                      (array-axis-fold arr k f)))
-                    #()))]
-      [(arr f init)
-       ;; See above for why non-strictness is okay
-       (parameterize ([array-strictness #f])
-         (array-ref (array-fold arr (λ: ([arr : (Array A)] [k : Index])
-                                      (array-axis-fold arr k f init)))
-                    #()))]))
-  
-  )  ; begin-encourage-inline
-
-;; ===================================================================================================
-;; Count
-
-(: array-axis-count (All (A) ((Array A) Integer (A -> Any) -> (Array Index))))
-(define (array-axis-count arr k pred?)
-  (let ([k  (check-array-axis 'array-axis-count arr k)])
-    (array-default-strict
-     (unsafe-array-axis-reduce
-      arr k (λ: ([dk : Index] [proc : (Index -> A)])
-              (let: loop : Index ([jk : Nonnegative-Fixnum  0] [acc : Nonnegative-Fixnum  0])
-                (if (jk . fx< . dk)
-                    (cond [(pred? (proc jk))  (loop (fx+ jk 1) (unsafe-fx+ acc 1))]
-                          [else  (loop (fx+ jk 1) acc)])
-                    (assert acc index?))))))))
-
-;; ===================================================================================================
-;; Short-cutting axis folds
-
-(: array-axis-and (All (A) ((Array A) Integer -> (Array (U A Boolean)))))
-(define (array-axis-and arr k)
-  (let ([k  (check-array-axis 'array-axis-and arr k)])
-    (array-default-strict
-     (unsafe-array-axis-reduce
-      arr k (λ: ([dk : Index] [proc : (Index -> A)])
-              (let: loop : (U A Boolean) ([jk : Nonnegative-Fixnum  0] [acc : (U A Boolean)  #t])
-                (cond [(jk . fx< . dk)  (define v (and acc (proc jk)))
-                                        (if v (loop (fx+ jk 1) v) v)]
-                      [else  acc])))))))
-
-(: array-axis-or (All (A) ((Array A) Integer -> (Array (U A #f)))))
-(define (array-axis-or arr k)
-  (let ([k  (check-array-axis 'array-axis-or arr k)])
-    (array-default-strict
-     (unsafe-array-axis-reduce
-      arr k (λ: ([dk : Index] [proc : (Index -> A)])
-              (let: loop : (U A #f) ([jk : Nonnegative-Fixnum  0] [acc : (U A #f)  #f])
-                (cond [(jk . fx< . dk)  (define v (or acc (proc jk)))
-                                        (if v v (loop (fx+ jk 1) v))]
-                      [else  acc])))))))
-
-(: array-all-and (All (A B) ((Array A) -> (U A Boolean))))
-(define (array-all-and arr)
-  ;; See `array-all-fold' for why non-strictness is okay
-  (parameterize ([array-strictness #f])
-    (array-ref ((inst array-fold (U A Boolean)) arr array-axis-and) #())))
-
-(: array-all-or (All (A B) ((Array A) -> (U A #f))))
-(define (array-all-or arr)
-  ;; See `array-all-fold' for why non-strictness is okay
-  (parameterize ([array-strictness #f])
-    (array-ref ((inst array-fold (U A #f)) arr array-axis-or) #())))
-
-;; ===================================================================================================
-;; Other folds
-
-(: array->list-array (All (A) (case-> ((Array A) -> (Array (Listof A)))
-                                      ((Array A) Integer -> (Array (Listof A))))))
-(define (array->list-array arr [k 0])
-  (define dims (array-dims arr))
-  (cond [(and (k . >= . 0) (k . < . dims))
-         (array-default-strict
-          (unsafe-array-axis-reduce arr k (inst build-list A)))]
-        [else
-         (raise-argument-error 'array->list-array (format "Index < ~a" dims) 1 arr k)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-indexing.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-indexing.rkt
deleted file mode 100644
index fdf91b822e..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-indexing.rkt
+++ /dev/null
@@ -1,292 +0,0 @@
-#lang typed/racket/base
-
-(require racket/list
-         racket/match
-         racket/vector
-         racket/performance-hint
-         "../unsafe.rkt"
-         "array-struct.rkt"
-         "array-transform.rkt"
-         "array-constructors.rkt"
-         "array-broadcast.rkt"
-         "for-each.rkt"
-         "utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Array ref/set!
-
-(begin-encourage-inline
-
-  (: unsafe-array-ref (All (A) ((Array A) Indexes -> A)))
-  (define (unsafe-array-ref arr js)
-    ((unsafe-array-proc arr) js))
-
-  (: unsafe-array-set! (All (A) ((Settable-Array A) Indexes A -> Void)))
-  (define (unsafe-array-set! arr js v)
-    ((unsafe-settable-array-set-proc arr) js v))
-  
-  (: array-ref (All (A) ((Array A) In-Indexes -> A)))
-  (define (array-ref arr js)
-    ((unsafe-array-proc arr) (check-array-indexes 'array-ref (array-shape arr) js)))
-
-  (: array-set! (All (A) ((Settable-Array A) In-Indexes A -> Void)))
-  (define (array-set! arr js v)
-    (define ds (array-shape arr))
-    (define set-proc (unsafe-settable-array-set-proc arr))
-    (set-proc (check-array-indexes 'array-set! ds js) v))
-  
-  )  ; begin-encourage-inline
-
-;; ===================================================================================================
-;; Indexing using array of indexes
-
-(: array-indexes-ref (All (A) ((Array A) (Array In-Indexes) -> (Array A))))
-(define (array-indexes-ref arr idxs)
-  (define ds (array-shape idxs))
-  (define idxs-proc (unsafe-array-proc idxs))
-  (array-default-strict
-   (unsafe-build-array ds (λ: ([js : Indexes]) (array-ref arr (idxs-proc js))))))
-
-(: array-indexes-set! (All (A) ((Settable-Array A) (Array In-Indexes) (Array A) -> Void)))
-(define (array-indexes-set! arr idxs vals)
-  (define ds (array-shape-broadcast (list (array-shape idxs) (array-shape vals))))
-  (let ([idxs  (array-broadcast idxs ds)]
-        [vals  (array-broadcast vals ds)])
-    (define idxs-proc (unsafe-array-proc idxs))
-    (define vals-proc (unsafe-array-proc vals))
-    (for-each-array-index ds (λ (js) (array-set! arr (idxs-proc js) (vals-proc js))))))
-
-;; ===================================================================================================
-;; Slicing
-
-(struct: Slice ([start : (U Fixnum #f)]
-                [end : (U Fixnum #f)]
-                [step : Fixnum])
-  #:property prop:custom-write
-  (λ (s port _)
-    (write-string (format "(:: ~a ~a ~a)" (slice-start s) (slice-end s) (slice-step s)) port)))
-
-(struct: Slice-Dots () #:property prop:custom-write (λ (s port _) (write-string "::..." port)))
-
-(struct: Slice-New-Axis ([length : Index])
-  #:property prop:custom-write
-  (λ (s port _) (write-string (format "(::new ~a)" (slice-new-axis-length s)) port)))
-
-(define-type -Slice Slice)
-(define-type -Slice-Dots Slice-Dots)
-(define-type -Slice-New-Axis Slice-New-Axis)
-(define-type Slice-Spec-- (U Integer Slice (Sequenceof Integer)))
-(define-type Slice-Spec- (U Slice-Spec-- Slice-New-Axis))
-(define-type Slice-Spec (U Slice-Spec- Slice-Dots))
-
-(define slice? Slice?)
-(define slice-start Slice-start)
-(define slice-end Slice-end)
-(define slice-step Slice-step)
-
-(define ::... (Slice-Dots))
-
-(define slice-dots? Slice-Dots?)
-
-(: ::new (case-> (-> Slice-New-Axis)
-                 (Integer -> Slice-New-Axis)))
-(define (::new [dk 1])
-  (cond [(index? dk)  (Slice-New-Axis dk)]
-        [else  (raise-argument-error '::new "Index" dk)]))
-
-(define slice-new-axis? Slice-New-Axis?)
-(define slice-new-axis-length Slice-New-Axis-length)
-
-(: :: (case-> (-> Slice)
-              ((U Integer #f) -> Slice)
-              ((U Integer #f) (U Integer #f) -> Slice)
-              ((U Integer #f) (U Integer #f) Integer -> Slice)))
-(define ::
-  (case-lambda
-    [()  (Slice 0 #f 1)]
-    [(end)  (cond [(and end (fixnum? end))  (Slice 0 end 1)]
-                  [end  (raise-argument-error 'Slice "Fixnum or #f" end)]
-                  [else  (Slice 0 #f 1)])]
-    [(start end)  (:: start end 1)]
-    [(start end step)
-     (cond
-       [(fixnum? step)
-        (cond
-          [(and start (fixnum? start))
-           (cond
-             [(and end (fixnum? end))  (Slice start end step)]
-             [end  (raise-argument-error 'Slice "Fixnum or #f" 1 start end step)]
-             [else  (Slice start #f step)])]
-          [start  (raise-argument-error 'Slice "Fixnum or #f" 0 start end step)]
-          [else
-           (cond [(and end (fixnum? end))  (Slice #f end step)]
-                 [end  (raise-argument-error 'Slice "Fixnum or #f" 1 start end)]
-                 [else  (Slice #f #f step)])])]
-       [else
-        (raise-argument-error 'Slice "Fixnum" 2 start end step)])]))
-
-(: slice->range-values (Slice Index -> (Values Fixnum Fixnum Fixnum)))
-(define (slice->range-values s dk)
-  (define start (Slice-start s))
-  (define end (Slice-end s))
-  (define step (Slice-step s))
-  (if (zero? dk)
-      (cond [(< step 0)  (values (or start -1) (or end -1) step)]
-            [else        (values (or start 0) (or end 0) step)])
-      (cond [(< step 0)  (values (or start (- dk 1)) (or end -1) step)]
-            [else        (values (or start 0) (or end dk) step)])))
-
-(: slice->sequence (Slice Index -> (Sequenceof Integer)))
-(define (slice->sequence s dk)
-  (define-values (start end step) (slice->range-values s dk))
-  (in-range start end step))
-
-(require racket/sequence)
-
-(: slice->list (Slice Index -> (Listof Integer)))
-(define (slice->list s dk)
-  (sequence->list (slice->sequence s dk)))
-
-(: slice->vector (Slice Integer Index -> (Vectorof Index)))
-(define (slice->vector s k dk)
-  (define-values (start end step) (slice->range-values s dk))
-  (define size
-    (cond [(step . < . 0)  (quotient (+ (- end start) (+ step 1)) step)]
-          [else  (quotient (+ (- end start) (- step 1)) step)]))
-  (cond [(size . <= . 0)  (vector)]
-        [(index? size)
-         (define: jks : (Vectorof Index) (make-vector size 0))
-         (let loop ([#{i : Nonnegative-Fixnum} 0] [#{jk : Fixnum} start])
-           (cond [(i . >= . size)  jks]
-                 [(or (jk . < . 0) (jk . >= . dk))
-                  (error 'slice->vector
-                         "expected Index < ~e in slice ~e (axis ~e); given ~e"
-                         dk s k jk)]
-                 [else
-                  (unsafe-vector-set! jks i jk)
-                  (loop (+ i 1) (unsafe-fx+ jk step))]))]
-        [else
-         (error 'array-slice-ref "axis for slice ~e (axis ~e) is too large" s k)]))
-
-(: slices->array-axis-transform
-   (All (A) (Symbol (Array A) (Listof Slice-Spec--)
-                    -> (Values (Array A) (Vectorof (Vectorof Index))))))
-(define (slices->array-axis-transform name arr slices)
-  (define n (length slices))
-  (define ds (array-shape arr))
-  (define dims (vector-length ds))
-  (define-values (new-arr old-jss)
-    (for/fold: ([arr : (Array A)  arr]
-                [jss : (Listof (Vectorof Index))  null]
-                ) ([s  (in-list (reverse slices))]
-                   [k  (in-range (- dims 1) -1 -1)])
-      (define dk (unsafe-vector-ref ds k))
-      (cond [(integer? s)
-             (when (or (s . < . 0) (s . >= . dk))
-               (error name "expected Index < ~e in slice ~e (axis ~e)" dk s k))
-             (values (array-axis-ref arr k s) jss)]
-            [(slice? s)
-             (values arr (cons (slice->vector s k dk) jss))]
-            [else
-             (define js
-               (for/fold: ([js : (Listof Index)  null]) ([jk s])
-                 (cond [(or (jk . < . 0) (jk . >= . dk))
-                        (error name "expected Index < ~e in slice ~e (axis ~e); given ~e"
-                               dk s k jk)]
-                       [else  (cons jk js)])))
-             (values arr (cons ((inst list->vector Index) (reverse js)) jss))])))
-  (values new-arr (list->vector old-jss)))
-
-(: expand-dots (Index (Listof Slice-Spec) -> (Listof Slice-Spec-)))
-(define (expand-dots dims slices)
-  (define n (count (λ (s) (and (not (slice-dots? s)) (not (slice-new-axis? s)))) slices))
-  (let loop ([slices slices] [n n])
-    (cond [(null? slices)  null]
-          [(slice-dots? (car slices))
-           (append (make-list (max 0 (- dims n)) (Slice #f #f 1))
-                   (loop (cdr slices) dims))]
-          [else  (cons (car slices) (loop (cdr slices) n))])))
-
-(: extract-new-axes ((Listof Slice-Spec-) -> (Values (Listof Slice-Spec--)
-                                                     (Listof (Pair Integer Index)))))
-(define (extract-new-axes slices)
-  (define-values (new-slices new-axes _)
-    (for/fold: ([new-slices : (Listof Slice-Spec--)  null]
-                [new-axes : (Listof (Pair Integer Index))  null]
-                [k : Integer  0]
-                ) ([s  (in-list slices)])
-      (cond [(slice-new-axis? s)
-             (values new-slices (cons (cons k (slice-new-axis-length s)) new-axes) k)]
-            [else
-             (values (cons s new-slices) new-axes (+ k 1))])))
-  (values (reverse new-slices) (reverse new-axes)))
-
-(: array-slice-ref (All (A) ((Array A) (Listof Slice-Spec) -> (Array A))))
-(define (array-slice-ref arr orig-slices)
-  (define dims (array-dims arr))
-  (let*-values ([(slices)  (expand-dots dims orig-slices)]
-                [(slices new-axes)  (extract-new-axes slices)])
-    ;; number of indexes should match
-    (define num-specs (length slices))
-    (unless (= dims num-specs)
-      (error 'array-slice-ref "expected list with ~e slice specifications; given ~e in ~e"
-             dims num-specs orig-slices))
-    (array-default-strict
-     (parameterize ([array-strictness #f])
-       (let-values ([(arr jss)  (slices->array-axis-transform 'array-slice-ref arr slices)])
-         (for/fold: : (Array A) ([arr : (Array A)  (unsafe-array-axis-transform arr jss)]
-                                 ) ([na  (in-list new-axes)])
-           (match-define (cons k dk) na)
-           (array-axis-insert arr k dk)))))))
-
-(: array-slice-set! (All (A) ((Settable-Array A) (Listof Slice-Spec) (Array A) -> Void)))
-(define (array-slice-set! arr slices vals)
-  ;; No reason to make `idxs' strict, since we build it ourselves and don't return it
-  (let ([idxs  (parameterize ([array-strictness #f])
-                 (array-slice-ref (indexes-array (array-shape arr)) slices))])
-    (array-indexes-set! arr idxs vals)))
-
-;; ---------------------------------------------------------------------------------------------------
-
-(: unsafe-array-axis-transform (All (A) ((Array A) (Vectorof (Vectorof Index)) -> (Array A))))
-(define (unsafe-array-axis-transform arr old-jss)
-  (define: new-ds : Indexes (vector-map vector-length old-jss))
-  (define dims (vector-length new-ds))
-  (case dims
-    [(0)  arr]
-    [(1)  (define g (unsafe-array-proc arr))
-          (unsafe-build-array
-           new-ds
-           (λ: ([js : Indexes])
-             (define j0 (unsafe-vector-ref js 0))
-             (unsafe-vector-set! js 0 (unsafe-vector-ref (unsafe-vector-ref old-jss 0) j0))
-             (define v (g js))
-             (unsafe-vector-set! js 0 j0)
-             v))]
-    [(2)  (define g (unsafe-array-proc arr))
-          (unsafe-build-array
-           new-ds
-           (λ: ([js : Indexes])
-             (define j0 (unsafe-vector-ref js 0))
-             (define j1 (unsafe-vector-ref js 1))
-             (unsafe-vector-set! js 0 (unsafe-vector-ref (unsafe-vector-ref old-jss 0) j0))
-             (unsafe-vector-set! js 1 (unsafe-vector-ref (unsafe-vector-ref old-jss 1) j1))
-             (define v (g js))
-             (unsafe-vector-set! js 0 j0)
-             (unsafe-vector-set! js 1 j1)
-             v))]
-    [else
-     (define old-js (make-thread-local-indexes dims))
-     (unsafe-array-transform
-      arr new-ds
-      (λ: ([new-js : Indexes])
-        (let ([old-js  (old-js)])
-          (let: loop : Indexes ([i : Nonnegative-Fixnum  0])
-            (cond [(i . < . dims)
-                   (define new-ji (unsafe-vector-ref new-js i))
-                   (define old-ji (unsafe-vector-ref (unsafe-vector-ref old-jss i) new-ji))
-                   (unsafe-vector-set! old-js i old-ji)
-                   (loop (+ i 1))]
-                  [else  old-js])))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-pointwise.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-pointwise.rkt
deleted file mode 100644
index 513f197a9d..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-pointwise.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang typed/racket/base
-
-(require "array-struct.rkt"
-         "array-broadcast.rkt"
-         "utils.rkt"
-         (only-in "untyped-array-pointwise.rkt" inline-array-map))
-
-(provide array-map)
-
-(: array-map (All (R A B T ...)
-                  (case-> ((-> R) -> (Array R))
-                          ((A -> R) (Array A) -> (Array R))
-                          ((A B T ... T -> R) (Array A) (Array B) (Array T) ... T -> (Array R)))))
-(define array-map
-  (case-lambda:
-    [([f : (-> R)])
-     (inline-array-map f)]
-    [([f : (A -> R)] [arr : (Array A)])
-     (inline-array-map f arr)]
-    [([f : (A B -> R)] [arr0 : (Array A)] [arr1 : (Array B)])
-     (inline-array-map f arr0 arr1)]
-    [([f : (A B T ... T -> R)] [arr0 : (Array A)] [arr1 : (Array B)] . [arrs : (Array T) ... T])
-     (define ds (array-shape-broadcast (list* (array-shape arr0)
-                                              (array-shape arr1)
-                                              (map array-shape arrs))))
-     (let ([arr0  (array-broadcast arr0 ds)]
-           [arr1  (array-broadcast arr1 ds)]
-           [arrs  (map (plambda: (S) ([arr : (Array S)]) (array-broadcast arr ds)) arrs)])
-       (define g0 (unsafe-array-proc arr0))
-       (define g1 (unsafe-array-proc arr1))
-       (define gs (map unsafe-array-proc arrs))
-       (array-default-strict
-        (unsafe-build-array
-         ds (λ: ([js : Indexes]) (apply f (g0 js) (g1 js)
-                                        (map (plambda: (S) ([g : (Indexes -> S)]) (g js)) gs))))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-sequence.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-sequence.rkt
deleted file mode 100644
index 97ad094f3d..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-sequence.rkt
+++ /dev/null
@@ -1,110 +0,0 @@
-#lang typed/racket/base
-
-(require racket/vector
-         "../unsafe.rkt"
-         "array-struct.rkt"
-         "array-transform.rkt"
-         "array-broadcast.rkt"
-         "utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Sequence of array elements
-
-(: in-array (All (A) ((Array A) -> (Sequenceof A))))
-(define (in-array arr)
-  (define ds (array-shape arr))
-  (define dims (vector-length ds))
-  (define size (array-size arr))
-  (define proc (unsafe-array-proc arr))
-  (define: js : Indexes (make-vector dims 0))
-  (make-do-sequence
-   (λ () (values (λ: ([jjs : (Pair Fixnum Indexes)]) (proc (cdr jjs)))
-                 (λ: ([jjs : (Pair Fixnum Indexes)])
-                   (define js (vector-copy-all (cdr jjs)))
-                   (next-indexes! ds dims js)
-                   (cons (unsafe-fx+ (car jjs) 1) js))
-                 (cons 0 js)
-                 (λ: ([jjs : (Pair Fixnum Indexes)]) ((car jjs) . < . size))
-                 #f
-                 #f))))
-
-;; ===================================================================================================
-;; Sequence of indexes
-
-(: in-array-indexes (In-Indexes -> (Sequenceof Indexes)))
-(define (in-array-indexes ds)
-  (let: ([ds : Indexes  (check-array-shape
-                         ds (λ () (raise-argument-error 'in-array-indexes "Indexes" ds)))])
-    (define dims (vector-length ds))
-    (define size (array-shape-size ds))
-    (cond [(index? size)
-           (define: js : Indexes (make-vector dims 0))
-           (make-do-sequence
-            (λ () (values (λ: ([jjs : (Pair Fixnum Indexes)]) (cdr jjs))
-                          (λ: ([jjs : (Pair Fixnum Indexes)])
-                            (define js (vector-copy (cdr jjs)))
-                            (next-indexes! ds dims js)
-                            (cons (unsafe-fx+ (car jjs) 1) js))
-                          (cons 0 js)
-                          (λ: ([jjs : (Pair Fixnum Indexes)]) ((car jjs) . < . size))
-                          #f
-                          #f)))]
-          [else  (error 'in-array-indexes
-                        "array size ~e (for shape ~e) is too large (is not an Index)"
-                        size ds)])))
-
-(: in-unsafe-array-indexes (Indexes -> (Sequenceof Indexes)))
-(define (in-unsafe-array-indexes ds)
-  (in-array-indexes ds))
-
-;; ===================================================================================================
-;; Sequence of axes
-
-(: in-array-axis (All (A) (case-> ((Array A) -> (Sequenceof (Array A)))
-                                  ((Array A) Integer -> (Sequenceof (Array A))))))
-(define (in-array-axis arr [k 0])
-  (define ds (array-shape arr))
-  (define dims (vector-length ds))
-  (cond [(and (0 . <= . k) (k . < . dims))
-         (define dk (unsafe-vector-ref ds k))
-         (make-do-sequence
-          (λ ()
-            (values (λ: ([jk : Integer]) (array-axis-ref arr k jk))
-                    add1
-                    0
-                    (λ: ([jk : Integer]) (jk . < . dk))
-                    #f
-                    #f)))]
-        [else
-         (error 'in-array-axis (format "expected axis Index < ~e; given ~e" dims k))]))
-
-(: array->array-list (All (A) (case-> ((Array A) -> (Listof (Array A)))
-                                      ((Array A) Integer -> (Listof (Array A))))))
-(define (array->array-list arr [k 0])
-  (define ds (array-shape arr))
-  (define dims (vector-length ds))
-  (cond [(and (0 . <= . k) (k . < . dims))
-         (define dk (unsafe-vector-ref ds k))
-         (build-list dk (λ: ([jk : Index]) (array-axis-ref arr k jk)))]
-        [else
-         (error 'array->array-list (format "expected axis Index < ~e; given ~e" dims k))]))
-
-(: array-list->array (All (A) (case-> ((Listof (Array A)) -> (Array A))
-                                      ((Listof (Array A)) Integer -> (Array A)))))
-(define (array-list->array arrs [k 0])
-  (define ds (array-shape-broadcast ((inst map Indexes (Array A)) array-shape arrs)))
-  (define dims (vector-length ds))
-  (cond [(and (0 . <= . k) (k . <= . dims))
-         (let ([arrs  (list->vector (map (λ: ([arr : (Array A)]) (array-broadcast arr ds)) arrs))])
-           (define dk (vector-length arrs))
-           (define new-ds (unsafe-vector-insert ds k dk))
-           (array-default-strict
-            (unsafe-build-array
-             new-ds (λ: ([js : Indexes])
-                      (define jk (unsafe-vector-ref js k))
-                      (let ([old-js  (unsafe-vector-remove js k)])
-                        ((unsafe-array-proc (unsafe-vector-ref arrs jk)) old-js))))))]
-        [else
-         (error 'array-list->array (format "expected axis Index <= ~e; given ~e" dims k))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-struct.rkt
deleted file mode 100644
index 83e44cd459..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-struct.rkt
+++ /dev/null
@@ -1,228 +0,0 @@
-#lang typed/racket/base
-
-(require racket/promise
-         racket/performance-hint
-         "../unsafe.rkt"
-         "for-each.rkt"
-         "utils.rkt")
-
-(provide (all-defined-out))
-
-(: array-strictness (Parameterof (U #f #t)))
-(define array-strictness (make-parameter #t))
-
-;; ===================================================================================================
-;; Equality and hashing
-
-(: array-lift-comparison (All (A) ((A A -> Boolean) -> ((Array A) (Array A) -> Boolean))))
-(define ((array-lift-comparison comp) arr brr)
-  (define ds (Array-shape arr))
-  (and (equal? ds (Array-shape brr))
-       (let/ec: return : Boolean
-         (define f (Array-unsafe-proc arr))
-         (define g (Array-unsafe-proc brr))
-         (for-each-array-index ds (λ (js) (unless (comp (f js) (g js))
-                                            (return #f))))
-         #t)))
-
-(: array-recur-equal? ((Array Any) (Array Any) (Any Any -> Boolean) -> Boolean))
-(define (array-recur-equal? arr brr recur-equal?)
-  ((array-lift-comparison recur-equal?) arr brr))
-
-(: array-hash-code (All (A) ((Array A) (Any -> Integer) -> Integer)))
-(define (array-hash-code arr recur-hash-code)
-  (define ds (Array-shape arr))
-  (define f (Array-unsafe-proc arr))
-  (define h 0)
-  (for-each-array-index ds (λ (js) (set! h (bitwise-xor h (recur-hash-code (f js))))))
-  (bitwise-xor h (recur-hash-code ds)))
-
-;; ===================================================================================================
-;; Array data type: a function whose domain has a rectangular shape
-
-#|
-(: array-procedure (All (A) ((Array A) In-Indexes -> A)))
-(define (array-procedure arr js)
-  ((Array-unsafe-proc arr) (check-array-indexes 'array-ref (Array-shape arr) js)))
-|#
-
-(struct: (A) Array ([shape : Indexes]
-                    [size : Index]
-                    [strict? : (Boxof Boolean)]
-                    [strict! : (-> Void)]
-                    [unsafe-proc : (Indexes -> A)])
-  #:property prop:custom-print-quotable 'never
-  #:property prop:custom-write (λ (arr port mode) ((array-custom-printer) arr 'array port mode))
-  #:property prop:equal+hash (list array-recur-equal? array-hash-code array-hash-code)
-  ;; It would be really nice to do this, but TR can't right now:
-  ;#:property prop:procedure array-procedure
-  )
-
-(define-syntax-rule (make-unsafe-array-proc ds ref)
-  (λ: ([js : Indexes])
-    (ref (unsafe-array-index->value-index ds js))))
-
-(: array-dims (All (A) ((Array A) -> Index)))
-(define (array-dims arr)
-  (vector-length (Array-shape arr)))
-
-(: array-strict? (All (A) ((Array A) -> Boolean)))
-(define (array-strict? arr)
-  (unbox (Array-strict? arr)))
-
-(: array-strict! (All (A) ((Array A) -> Void)))
-(define (array-strict! arr)
-  (define strict? (Array-strict? arr))
-  (unless (unbox strict?)
-    ((Array-strict! arr))
-    (set-box! strict? #t)))
-
-(: array-default-strict! (All (A) ((Array A) -> Void)))
-(define (array-default-strict! arr)
-  (define strict? (Array-strict? arr))
-  (when (and (not (unbox strict?)) (array-strictness))
-    ((Array-strict! arr))
-    (set-box! strict? #t)))
-
-(: unsafe-build-array (All (A) (Indexes (Indexes -> A) -> (Array A))))
-(define (unsafe-build-array ds f)
-  ;; This box's contents get replaced when the array we're constructing is made strict, so that
-  ;; the array stops referencing f. If we didn't do this, long chains of array computations would
-  ;; keep hold of references to all the intermediate procs, which is a memory leak.
-  (let ([f  (box f)])
-    (define size (check-array-shape-size 'unsafe-build-array ds))
-    ;; Sharp readers might notice that strict! doesn't check to see whether the array is already
-    ;; strict; that's okay - array-strict! does it instead, which makes the "once strict, always
-    ;; strict" invariant easier to ensure in subtypes, which we don't always have control over
-    (define (strict!)
-      (let* ([old-f  (unbox f)]
-             [vs     (inline-build-array-data ds (λ (js j) (old-f js)) A)])
-        ;; Make a new f that just indexes into vs
-        (set-box! f (λ: ([js : Indexes])
-                      (unsafe-vector-ref vs (unsafe-array-index->value-index ds js))))))
-    (define unsafe-proc
-      (λ: ([js : Indexes]) ((unbox f) js)))
-    (Array ds size ((inst box Boolean) #f) strict! unsafe-proc)))
-
-(: unsafe-build-simple-array (All (A) (Indexes (Indexes -> A) -> (Array A))))
-(define (unsafe-build-simple-array ds f)
-  (define size (check-array-shape-size 'unsafe-build-simple-array ds))
-  (Array ds size (box #t) void f))
-
-(: build-array (All (A) (In-Indexes (Indexes -> A) -> (Array A))))
-(define (build-array ds proc)
-  (let ([ds  (check-array-shape
-              ds (λ () (raise-argument-error 'build-array "(Vectorof Index)" 0 ds proc)))])
-    (define arr
-      (unsafe-build-array ds (λ: ([js : Indexes])
-                               (proc (vector->immutable-vector js)))))
-    (array-default-strict! arr)
-    arr))
-
-(: build-simple-array (All (A) (In-Indexes (Indexes -> A) -> (Array A))))
-(define (build-simple-array ds proc)
-  (let ([ds  (check-array-shape
-              ds (λ () (raise-argument-error 'build-simple-array "(Vectorof Index)" 0 ds proc)))])
-    (unsafe-build-simple-array ds (λ: ([js : Indexes])
-                                    (proc (vector->immutable-vector js))))))
-
-(: unsafe-list->array (All (A) (Indexes (Listof A) -> (Array A))))
-(define (unsafe-list->array ds xs)
-  (define vs (list->vector xs))
-  (unsafe-build-simple-array
-   ds (λ: ([js : Indexes]) (unsafe-vector-ref vs (unsafe-array-index->value-index ds js)))))
-
-(: list->array (All (A) (case-> ((Listof A) -> (Array A))
-                                (In-Indexes (Listof A) -> (Array A)))))
-(define list->array
-  (case-lambda
-    [(xs)  (unsafe-list->array ((inst vector Index) (length xs)) xs)]
-    [(ds xs)
-     (let* ([ds  (check-array-shape
-                  ds (λ () (raise-argument-error 'list->array "(Vectorof Index)" 0 ds xs)))]
-            [size  (array-shape-size ds)]
-            [n  (length xs)])
-       (if (= size n)
-           (unsafe-list->array ds xs)
-           (raise-argument-error 'list->array (format "List of length ~e" size) 1 ds xs)))]))
-
-(: array-lazy (All (A) ((Array A) -> (Array A))))
-(define (array-lazy arr)
-  (define ds (Array-shape arr))
-  (define size (Array-size arr))
-  (define proc (Array-unsafe-proc arr))
-  (define: vs : (Vectorof (Promise A))
-    (inline-build-array-data
-     ds (λ (js j)
-          ;; Because `delay' captures js in its closure, if we don't make this copy, `js' will have
-          ;; been mutated by the time the promise is forced
-          ;; Using vector->immutable-vector to copy won't work: `proc' might need to mutate `js'
-          (let ([js  (vector-copy-all js)])
-            (delay (proc js))))
-     (Promise A)))
-  (define (strict!) (for: ([v  (in-vector vs)]) (force v)))
-  (define unsafe-proc
-    (λ: ([js : Indexes])
-      (force (unsafe-vector-ref vs (unsafe-array-index->value-index ds js)))))
-  (Array ds size ((inst box Boolean) #f) strict! unsafe-proc))
-
-;; ===================================================================================================
-;; Abstract settable array data type
-
-(struct: (A) Settable-Array Array ([set-proc : (Indexes A -> Void)]))
-
-(define settable-array? Settable-Array?)
-(define unsafe-settable-array-set-proc Settable-Array-set-proc)
-
-(define-syntax-rule (make-unsafe-array-set-proc A ds set!)
-  (λ: ([js : Indexes] [v : A])
-    (set! (unsafe-array-index->value-index ds js) v)))
-
-;; ===================================================================================================
-;; Printing
-
-(require racket/pretty)
-
-(: print-array-fields (All (A) ((Array A) Symbol Output-Port (U #t #f 0 1) -> Any)))
-;; Mimicks the default custom printer for transparent struct values
-(define (print-array-fields arr name port mode)
-  (define ds (Array-shape arr))
-  (define proc (Array-unsafe-proc arr))
-  
-  (define col (port-next-column port))
-  (define cols (pretty-print-columns))
-  (define pp? (pretty-printing))
-  
-  (define recur-print
-    (cond [(not mode) display]
-          [(integer? mode) (λ: ([p : Any] [port : Output-Port])
-                             (print p port mode))]
-          [else write]))
-  
-  (define: (maybe-print-newline [indent : Integer]) : Any
-    (cond [(and pp? (integer? cols))
-           (pretty-print-newline port cols)
-           (write-string (make-string (+ col indent) #\space) port)]
-          [else
-           (write-string " " port)]))
-  
-  (write-string (format "#<~a" name) port)
-  (maybe-print-newline 2)
-  (recur-print ds port)
-  (maybe-print-newline 2)
-  
-  (define lst null)
-  (for-each-array-index ds (λ (js) (set! lst (cons (proc js) lst))))
-  
-  (write-string "#[" port)
-  (unless (null? lst)
-    (let ([lst  (reverse lst)])
-      (recur-print (car lst) port)
-      (for ([x  (in-list (cdr lst))])
-        (maybe-print-newline 3)
-        (recur-print x port))))
-  (write-string "]>" port))
-
-;; In math/array, this is set to `print-array' from "array-print.rkt"
-(: array-custom-printer (Parameterof (All (A) ((Array A) Symbol Output-Port (U #t #f 0 1) -> Any))))
-(define array-custom-printer (make-parameter print-array-fields))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-transform.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-transform.rkt
deleted file mode 100644
index 1c99f383b5..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/typed-array-transform.rkt
+++ /dev/null
@@ -1,212 +0,0 @@
-#lang typed/racket/base
-
-(require racket/vector
-         "../unsafe.rkt"
-         "array-struct.rkt"
-         "array-broadcast.rkt"
-         "utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Arbitrary transforms
-
-(: array-transform (All (A) ((Array A) In-Indexes (Indexes -> In-Indexes) -> (Array A))))
-(define (array-transform arr new-ds idx-fun)
-  (define old-ds (array-shape arr))
-  (define old-f (unsafe-array-proc arr))
-  (build-array
-   new-ds (λ: ([js : Indexes])
-            (old-f (check-array-indexes 'array-transform old-ds (idx-fun js))))))
-
-(: unsafe-array-transform (All (A) ((Array A) Indexes (Indexes -> Indexes) -> (Array A))))
-(define (unsafe-array-transform arr new-ds idx-fun)
-  (define old-f (unsafe-array-proc arr))
-  (unsafe-build-array new-ds (λ: ([js : Indexes]) (old-f (idx-fun js)))))
-
-;; ===================================================================================================
-;; Back permutation and swap
-
-(: array-axis-permute (All (A) ((Array A) (Listof Integer) -> (Array A))))
-(define (array-axis-permute arr perm)
-  (define ds (array-shape arr))
-  (let-values ([(ds perm) (apply-permutation
-                           perm ds (λ () (raise-argument-error 'array-axis-permute "permutation"
-                                                               1 arr perm)))])
-    (define dims (vector-length ds))
-    (define old-js (make-thread-local-indexes dims))
-    (array-default-strict
-     (unsafe-array-transform
-      arr ds
-      (λ: ([js : Indexes])
-        (let ([old-js  (old-js)])
-          (let: loop : Indexes ([i : Nonnegative-Fixnum  0])
-            (cond [(i . < . dims)  (unsafe-vector-set! old-js
-                                                       (unsafe-vector-ref perm i)
-                                                       (unsafe-vector-ref js i))
-                                   (loop (+ i 1))]
-                  [else  old-js]))))))))
-
-(: array-axis-swap (All (A) ((Array A) Integer Integer -> (Array A))))
-(define (array-axis-swap arr i0 i1)
-  (define ds (array-shape arr))
-  (define dims (vector-length ds))
-  (cond [(or (i0 . < . 0) (i0 . >= . dims))
-         (raise-argument-error 'array-transpose (format "Index < ~a" dims) 1 arr i0 i1)]
-        [(or (i1 . < . 0) (i1 . >= . dims))
-         (raise-argument-error 'array-transpose (format "Index < ~a" dims) 2 arr i0 i1)]
-        [(= i0 i1)  arr]
-        [else
-         (define new-ds (vector-copy-all ds))
-         (define j0 (unsafe-vector-ref new-ds i0))
-         (define j1 (unsafe-vector-ref new-ds i1))
-         (unsafe-vector-set! new-ds i0 j1)
-         (unsafe-vector-set! new-ds i1 j0)
-         (define proc (unsafe-array-proc arr))
-         (array-default-strict
-          (unsafe-build-array
-           new-ds (λ: ([js : Indexes])
-                    (define j0 (unsafe-vector-ref js i0))
-                    (define j1 (unsafe-vector-ref js i1))
-                    (unsafe-vector-set! js i0 j1)
-                    (unsafe-vector-set! js i1 j0)
-                    (define v (proc js))
-                    (unsafe-vector-set! js i0 j0)
-                    (unsafe-vector-set! js i1 j1)
-                    v)))]))
-
-;; ===================================================================================================
-;; Adding/removing axes
-
-(: array-axis-insert (All (A) (case-> ((Array A) Integer -> (Array A))
-                                      ((Array A) Integer Integer -> (Array A)))))
-(define (array-axis-insert arr k [dk 1])
-  (define ds (array-shape arr))
-  (define dims (vector-length ds))
-  (cond [(or (k . < . 0) (k . > . dims))
-         (raise-argument-error 'array-axis-insert (format "Index <= ~a" dims) 1 arr k dk)]
-        [(not (index? dk))
-         (raise-argument-error 'array-axis-insert "Index" 2 arr k dk)]
-        [else
-         (define new-ds (unsafe-vector-insert ds k dk))
-         (define proc (unsafe-array-proc arr))
-         (array-default-strict
-          (unsafe-build-array new-ds (λ: ([js : Indexes]) (proc (unsafe-vector-remove js k)))))]))
-
-(: array-axis-ref (All (A) ((Array A) Integer Integer -> (Array A))))
-(define (array-axis-ref arr k jk)
-  (define ds (array-shape arr))
-  (define dims (vector-length ds))
-  (cond [(or (k . < . 0) (k . >= . dims))
-         (raise-argument-error 'array-axis-ref (format "Index < ~a" dims) 1 arr k jk)]
-        [(or (jk . < . 0) (jk . >= . (unsafe-vector-ref ds k)))
-         (raise-argument-error 'array-axis-ref (format "Index < ~a" (unsafe-vector-ref ds k))
-                           2 arr k jk)]
-        [else
-         (define new-ds (unsafe-vector-remove ds k))
-         (define proc (unsafe-array-proc arr))
-         (array-default-strict
-          (unsafe-build-array new-ds (λ: ([js : Indexes]) (proc (unsafe-vector-insert js k jk)))))]))
-
-;; ===================================================================================================
-;; Reshape
-
-(: array-reshape (All (A) ((Array A) In-Indexes -> (Array A))))
-(define (array-reshape arr ds)
-  (let ([ds  (check-array-shape
-              ds (λ () (raise-argument-error 'array-reshape "(Vectorof Index)" 1 arr ds)))])
-    (define size (array-size arr))
-    (unless (= size (array-shape-size ds))
-      (raise-argument-error 'array-reshape (format "(Vectorof Index) with product ~a" size) 1 arr ds))
-    (define old-ds (array-shape arr))
-    (cond [(equal? ds old-ds)  arr]
-          [else
-           (define old-dims (vector-length old-ds))
-           (define g (unsafe-array-proc arr))
-           (define old-js (make-thread-local-indexes old-dims))
-           (array-default-strict
-            (unsafe-build-array
-             ds (λ: ([js : Indexes])
-                  (let ([old-js  (old-js)])
-                    (define j (unsafe-array-index->value-index ds js))
-                    (unsafe-value-index->array-index! old-ds j old-js)
-                    (g old-js)))))])))
-
-(: array-flatten (All (A) ((Array A) -> (Array A))))
-(define (array-flatten arr)
-  (define size (array-size arr))
-  (define: ds : Indexes (vector size))
-  (define old-ds (array-shape arr))
-  (cond [(equal? ds old-ds)  arr]
-        [else
-         (define old-dims (vector-length old-ds))
-         (define g (unsafe-array-proc arr))
-         (define old-js (make-thread-local-indexes old-dims))
-         (array-default-strict
-          (unsafe-build-array
-           ds (λ: ([js : Indexes])
-                (let ([old-js  (old-js)])
-                  (define j (unsafe-vector-ref js 0))
-                  (unsafe-value-index->array-index! old-ds j old-js)
-                  (g old-js)))))]))
-
-;; ===================================================================================================
-;; Append
-
-(: array-broadcast-for-append (All (A) ((Listof (Array A))
-                                        Integer -> (Values (Listof (Array A))
-                                                           (Listof Index)))))
-(define (array-broadcast-for-append arrs k)
-  (define dss (map (λ: ([arr : (Array A)]) (array-shape arr)) arrs))
-  (define dims (apply max (map vector-length dss)))
-  (cond [(not (index? dims))  (error 'array-broadcast-for-append "can't happen")]
-        [(or (k . < . 0) (k . >= . dims))
-         (raise-argument-error 'array-append* (format "Index < ~a" dims) k)]
-        [else
-         (let* ([dss  (map (λ: ([ds : Indexes])
-                             (define dms (vector-length ds))
-                             (vector-append ((inst make-vector Index) (- dims dms) 1) ds))
-                           dss)]
-                [dks  (map (λ: ([ds : Indexes]) (unsafe-vector-ref ds k)) dss)]
-                [dss  (map (λ: ([ds : Indexes]) (unsafe-vector-remove ds k)) dss)]
-                [ds   (array-shape-broadcast dss)]
-                [dss  (map (λ: ([dk : Index]) (unsafe-vector-insert ds k dk)) dks)])
-           (define new-arrs
-             (map (λ: ([arr : (Array A)] [ds : Indexes]) (array-broadcast arr ds)) arrs dss))
-           (values new-arrs dks))]))
-
-(: array-append* (All (A) (case-> ((Listof (Array A)) -> (Array A))
-                                  ((Listof (Array A)) Integer -> (Array A)))))
-(define (array-append* arrs [k 0])
-  (when (null? arrs) (raise-argument-error 'array-append* "nonempty (Listof (Array A))" arrs))
-  (let-values ([(arrs dks)  (array-broadcast-for-append arrs k)])
-    (define new-dk (apply + dks))
-    (cond
-      [(not (index? new-dk))  (error 'array-append* "resulting axis is too large (not an Index)")]
-      [else
-       (define dss (map (λ: ([arr : (Array A)]) (array-shape arr)) arrs))
-       (define new-ds (vector-copy-all (car dss)))
-       (unsafe-vector-set! new-ds k new-dk)
-       ;; Make two mappings:
-       ;; 1. old-procs : new array index -> old array procedure
-       ;; 2. old-jks :   new array index -> old array index
-       (define old-procs (make-vector new-dk (unsafe-array-proc (car arrs))))
-       (define: old-jks : Indexes (make-vector new-dk 0))
-       (let arrs-loop ([arrs arrs] [dks dks] [#{jk : Nonnegative-Fixnum} 0])
-         (unless (null? arrs)
-           (define arr (car arrs))
-           (define proc (unsafe-array-proc arr))
-           (define dk (car dks))
-           (let i-loop ([#{i : Nonnegative-Fixnum} 0] [#{jk : Nonnegative-Fixnum} jk])
-             (cond [(i . < . dk)  (unsafe-vector-set! old-procs jk proc)
-                                  (unsafe-vector-set! old-jks jk i)
-                                  (i-loop (+ i 1) (unsafe-fx+ jk 1))]
-                   [else  (arrs-loop (cdr arrs) (cdr dks) jk)]))))
-       (array-default-strict
-        (unsafe-build-array
-         new-ds (λ: ([js : Indexes])
-                  (define jk (unsafe-vector-ref js k))
-                  (unsafe-vector-set! js k (unsafe-vector-ref old-jks jk))
-                  (define v ((unsafe-vector-ref old-procs jk) js))
-                  (unsafe-vector-set! js k jk)
-                  v)))])))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/typed-mutable-array.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-mutable-array.rkt
deleted file mode 100644
index 4be8d74dd5..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/typed-mutable-array.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang typed/racket/base
-
-(require "../unsafe.rkt"
-         "array-struct.rkt"
-         "utils.rkt"
-         "for-each.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Mutable array data type
-
-(struct: (A) Mutable-Array Settable-Array ([data : (Vectorof A)])
-  #:property prop:custom-write (λ (arr port mode)
-                                 ((array-custom-printer) arr 'mutable-array port mode)))
-
-(define mutable-array? Mutable-Array?)
-(define mutable-array-data Mutable-Array-data)
-
-(: unsafe-vector->array (All (A) (Indexes (Vectorof A) -> (Mutable-Array A))))
-(define (unsafe-vector->array ds vs)
-  (define proc (make-unsafe-array-proc ds (λ (j) (unsafe-vector-ref vs j))))
-  (define set-proc (make-unsafe-array-set-proc A ds (λ (j v) (unsafe-vector-set! vs j v))))
-  (Mutable-Array ds (vector-length vs) (box #t) void proc set-proc vs))
-
-(: vector->array (All (A) (case-> ((Vectorof A) -> (Mutable-Array A))
-                                  (In-Indexes (Vectorof A) -> (Mutable-Array A)))))
-(define vector->array
-  (case-lambda
-    [(vs)  (unsafe-vector->array ((inst vector Index) (vector-length vs)) vs)]
-    [(ds vs)
-     (let* ([ds  (check-array-shape
-                  ds (λ () (raise-argument-error 'vector->array "(Vectorof Index)" 0 ds vs)))]
-            [size  (array-shape-size ds)]
-            [n  (vector-length vs)])
-       (if (= size n)
-           (unsafe-vector->array ds vs)
-           (raise-argument-error 'vector->array (format "Vector of length ~e" size) 1 ds vs)))]))
-
-(: mutable-array-copy (All (A) ((Mutable-Array A) -> (Mutable-Array A))))
-(define (mutable-array-copy arr)
-  (unsafe-vector->array (array-shape arr) (vector-copy-all (mutable-array-data arr))))
-
-;; ===================================================================================================
-;; Conversions
-
-(: array->mutable-array (All (A) ((Array A) -> (Mutable-Array A))))
-(define (array->mutable-array arr)
-  (define ds (array-shape arr))
-  (define g (unsafe-array-proc arr))
-  (unsafe-vector->array ds (inline-build-array-data ds (λ (js j) (g js)) A)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/typed-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-utils.rkt
deleted file mode 100644
index 7007149dc7..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/typed-utils.rkt
+++ /dev/null
@@ -1,209 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         racket/list
-         racket/performance-hint
-         (for-syntax racket/base)
-         "../unsafe.rkt")
-
-(provide (all-defined-out))
-
-(define-type (Listof* A) (Rec T (U A (Listof T))))
-(define-type (Vectorof* A) (Rec T (U A (Vectorof T))))
-
-(define-type Indexes (Vectorof Index))
-(define-type In-Indexes (U (Vectorof Integer) Indexes))
-
-(begin-encourage-inline
-  
-  (: vector->supertype-vector (All (A B) ((Vectorof A) -> (Vectorof (U A B)))))
-  (define (vector->supertype-vector js)
-    (define dims (vector-length js))
-    (cond [(= dims 0)  (vector)]
-          [else  (define: new-js : (Vectorof (U A B)) (make-vector dims (unsafe-vector-ref js 0)))
-                 (let loop ([#{i : Nonnegative-Fixnum} 1])
-                   (cond [(i . < . dims)  (unsafe-vector-set! new-js i (unsafe-vector-ref js i))
-                                          (loop (+ i 1))]
-                         [else  new-js]))]))
-  
-  (: vector-copy-all (All (A) ((Vectorof A) -> (Vectorof A))))
-  (define (vector-copy-all js) ((inst vector->supertype-vector A A) js))
-  
-  (: array-shape-size (Indexes -> Natural))
-  (define (array-shape-size ds)
-    (define dims (vector-length ds))
-    (let loop ([#{i : Nonnegative-Fixnum} 0] [#{n : Natural} 1])
-      (cond [(i . < . dims)  (define d (unsafe-vector-ref ds i))
-                             (loop (+ i 1) (* n d))]
-            [else  n])))
-  
-  (: check-array-shape-size (Symbol Indexes -> Index))
-  (define (check-array-shape-size name ds)
-    (define size (array-shape-size ds))
-    (cond [(index? size)  size]
-          [else  (error name "array size ~e (for shape ~e) is too large (is not an Index)" size ds)]))
-  
-  (: check-array-shape (In-Indexes (-> Nothing) -> Indexes))
-  (define (check-array-shape ds fail)
-    (define dims (vector-length ds))
-    (define: new-ds : Indexes (make-vector dims 0))
-    (let loop ([#{i : Nonnegative-Fixnum} 0])
-      (cond [(i . < . dims)
-             (define di (unsafe-vector-ref ds i))
-             (cond [(index? di)  (unsafe-vector-set! new-ds i di)
-                                 (loop (+ i 1))]
-                   [else  (fail)])]
-            [else  new-ds])))
-  
-  (: unsafe-array-index->value-index (Indexes Indexes -> Nonnegative-Fixnum))
-  (define (unsafe-array-index->value-index ds js)
-    (define dims (vector-length ds))
-    (let loop ([#{i : Nonnegative-Fixnum} 0] [#{j : Nonnegative-Fixnum} 0])
-      (cond [(i . < . dims)
-             (define di (unsafe-vector-ref ds i))
-             (define ji (unsafe-vector-ref js i))
-             (loop (+ i 1) (unsafe-fx+ ji (unsafe-fx* di j)))]
-            [else  j])))
-  
-  (: unsafe-value-index->array-index! (Indexes Nonnegative-Fixnum Indexes -> Void))
-  (define (unsafe-value-index->array-index! ds j js)
-    (with-asserts ([j index?])
-      (define dims (vector-length ds))
-      (let: loop : Index ([i : Nonnegative-Fixnum  dims] [s : Nonnegative-Fixnum  1])
-        (cond [(zero? i)  j]
-              [else  (let* ([i  (- i 1)]
-                            [j  (loop i (unsafe-fx* s (unsafe-vector-ref ds i)))])
-                       (unsafe-vector-set! js i (fxquotient j s))
-                       (unsafe-fxmodulo j s))]))
-      (void)))
-  
-  )  ; begin-encourage-inline
-
-;; Using this instead of literal #() is currently slightly faster (about 18% on my machine)
-(define: empty-vectorof-index : Indexes
-  #())
-
-(: raise-array-index-error (Symbol Indexes In-Indexes -> Nothing))
-(define (raise-array-index-error name ds js)
-  (error name "expected indexes for shape ~e; given ~e"
-         (vector->list ds) js))
-
-(: array-index->value-index (Symbol Indexes In-Indexes -> Nonnegative-Fixnum))
-(define (array-index->value-index name ds js)
-  (define (raise-index-error) (raise-array-index-error name ds js))
-  (define dims (vector-length ds))
-  (unless (= dims (vector-length js)) (raise-index-error))
-  (let loop ([#{i : Nonnegative-Fixnum} 0] [#{j : Nonnegative-Fixnum}  0])
-    (cond [(i . < . dims)
-           (define di (unsafe-vector-ref ds i))
-           (define ji (unsafe-vector-ref js i))
-           (cond [(and (exact-integer? ji) (0 . <= . ji) (ji . < . di))
-                  (loop (+ i 1) (unsafe-fx+ ji (unsafe-fx* di j)))]
-                 [else  (raise-index-error)])]
-          [else  j])))
-
-(: check-array-indexes (Symbol Indexes In-Indexes -> Indexes))
-(define (check-array-indexes name ds js)
-  (define (raise-index-error) (raise-array-index-error name ds js))
-  (define dims (vector-length ds))
-  (unless (= dims (vector-length js)) (raise-index-error))
-  (define: new-js : Indexes (make-vector dims 0))
-  (let loop ([#{i : Nonnegative-Fixnum} 0])
-    (cond [(i . < . dims)
-           (define di (unsafe-vector-ref ds i))
-           (define ji (unsafe-vector-ref js i))
-           (cond [(and (exact-integer? ji) (0 . <= . ji) (ji . < . di))
-                  (unsafe-vector-set! new-js i ji)
-                  (loop (+ i 1))]
-                 [else  (raise-index-error)])]
-          [else  new-js])))
-
-(: unsafe-vector-remove (All (I) ((Vectorof I) Index -> (Vectorof I))))
-(define (unsafe-vector-remove vec k)
-  (define n (vector-length vec))
-  (define n-1 (sub1 n))
-  (cond
-    [(not (index? n-1)) (error 'unsafe-vector-remove "internal error")]
-    [else
-     (define: new-vec : (Vectorof I) (make-vector n-1 (unsafe-vector-ref vec 0)))
-     (let loop ([#{i : Nonnegative-Fixnum} 0])
-       (when (i . < . k)
-         (unsafe-vector-set! new-vec i (unsafe-vector-ref vec i))
-         (loop (+ i 1))))
-     (let loop ([#{i : Nonnegative-Fixnum} k])
-       (cond [(i . < . n-1)
-              (unsafe-vector-set! new-vec i (unsafe-vector-ref vec (+ i 1)))
-              (loop (+ i 1))]
-             [else  new-vec]))]))
-
-(: unsafe-vector-insert (All (I) ((Vectorof I) Index I -> (Vectorof I))))
-(define (unsafe-vector-insert vec k v)
-  (define n (vector-length vec))
-  (define: dst-vec : (Vectorof I) (make-vector (+ n 1) v))
-  (let loop ([#{i : Nonnegative-Fixnum} 0])
-    (when (i . < . k)
-      (unsafe-vector-set! dst-vec i (unsafe-vector-ref vec i))
-      (loop (+ i 1))))
-  (let loop ([#{i : Nonnegative-Fixnum} k])
-    (when (i . < . n)
-      (let ([i+1  (+ i 1)])
-        (unsafe-vector-set! dst-vec i+1 (unsafe-vector-ref vec i))
-        (loop i+1))))
-  dst-vec)
-
-(: port-next-column (Output-Port -> Natural))
-;; Helper to avoid the annoying #f column value
-(define (port-next-column port)
-  (define-values (_line col _pos) (port-next-location port))
-  (if col col 0))
-
-(: apply-permutation (All (A) ((Listof Integer) Indexes (-> Nothing) -> (Values Indexes Indexes))))
-(define (apply-permutation perm ds fail)
-  (define dims (vector-length ds))
-  (unless (= dims (length perm)) (fail))
-  (define: visited  : (Vectorof Boolean) (make-vector dims #f))
-  (define: new-perm : (Vectorof Index) (make-vector dims 0))
-  (define: new-ds   : Indexes (make-vector dims 0))
-  ;; This loop fails if it writes to a `visited' element twice, or an element of perm is not an
-  ;; Index < dims
-  (let loop ([perm perm] [#{i : Nonnegative-Fixnum} 0])
-    (cond [(i . < . dims)
-           (define k (unsafe-car perm))
-           (cond [(and (0 . <= . k) (k . < . dims))
-                  (cond [(unsafe-vector-ref visited k)  (fail)]
-                        [else  (unsafe-vector-set! visited k #t)])
-                  (unsafe-vector-set! new-ds i (unsafe-vector-ref ds k))
-                  (unsafe-vector-set! new-perm i k)]
-                 [else  (fail)])
-           (loop (unsafe-cdr perm) (+ i 1))]
-          [else  (values new-ds new-perm)])))
-
-(: make-thread-local-indexes (Integer -> (-> Indexes)))
-(define (make-thread-local-indexes dims)
-  (let: ([val : (Thread-Cellof (U #f Indexes)) (make-thread-cell #f)])
-    (λ () (or (thread-cell-ref val)
-              (let: ([v : Indexes  (make-vector dims 0)])
-                (thread-cell-set! val v)
-                v)))))
-
-(: all-equal? (Any Any * -> Boolean))
-(define (all-equal? x . xs)
-  (cond [(empty? xs)  #t]
-        [else  (define first-xs (first xs))
-               (cond [(equal? x first-xs)  (all-equal? first-xs (rest xs))]
-                     [else  #f])]))
-
-(: next-indexes! (Indexes Index Indexes -> Void))
-;; Sets js to the next vector of indexes, in row-major order
-(define (next-indexes! ds dims js)
-  (let loop ([#{k : Nonnegative-Fixnum}  dims])
-    (unless (zero? k)
-      (let ([k  (- k 1)])
-        (define jk (unsafe-vector-ref js k))
-        (define dk (unsafe-vector-ref ds k))
-        (let ([jk  (+ jk 1)])
-          (cond [(jk . >= . dk)
-                 (unsafe-vector-set! js k 0)
-                 (loop k)]
-                [else
-                 (unsafe-vector-set! js k jk)]))))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/untyped-array-convert.rkt b/pkgs/math-pkgs/math-lib/math/private/array/untyped-array-convert.rkt
deleted file mode 100644
index da33c319d7..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/untyped-array-convert.rkt
+++ /dev/null
@@ -1,116 +0,0 @@
-#lang racket/base
-
-(require racket/unsafe/ops
-         typed/racket/base
-         "array-struct.rkt"
-         "mutable-array.rkt"
-         "utils.rkt")
-
-(provide make-to-array-functions list*->array vector*->array)
-
-(define-syntax-rule (make-to-array-functions list*->array vector*->array)
-  (begin
-    ;; ===============================================================================================
-    ;; Helpers
-
-    (: maybe-list->vector (All (A) ((U #f (Listof A)) -> (U #f (Vectorof A)))))
-    (define (maybe-list->vector vs)
-      (and vs (list->vector vs)))
-    
-    (: vector-shape (All (A) ((Vectorof* A) ((Vectorof* A) -> Any : A)
-                                            -> (U #f (Vectorof Integer)))))
-    (define (vector-shape vec pred?)
-      (maybe-list->vector
-       (let: vector-shape : (U #f (Listof Integer)) ([vec : (Vectorof* A)  vec])
-         (cond [(pred? vec)  (list)]
-               [else
-                (define d (vector-length vec))
-                (cond [(= d 0)  (list 0)]
-                      [else
-                       (define ds (vector-shape (vector-ref vec 0)))
-                       (if ds
-                           (let: loop : (U #f (Listof Integer)) ([i : Nonnegative-Fixnum 1])
-                             (cond [(i . >= . d)  (cons d ds)]
-                                   [(equal? ds (vector-shape (vector-ref vec i)))
-                                    (loop (+ i 1))]
-                                   [else  #f]))
-                           #f)])]))))
-    
-    (: list-shape (All (A) ((Listof* A) ((Listof* A) -> Any : A) -> (U #f (Vectorof Integer)))))
-    (define (list-shape lst pred?)
-      (maybe-list->vector
-       (let: list-shape : (U #f (Listof Integer)) ([lst : (Listof* A)  lst])
-         (cond [(pred? lst)  (list)]
-               [(null? lst)  (list 0)]
-               [else
-                (define d (length lst))
-                (define ds (list-shape (car lst)))
-                (if ds
-                    (let loop ([lst  (cdr lst)])
-                      (cond [(null? lst)  (cons d ds)]
-                            [(equal? ds (list-shape (car lst)))
-                             (loop (cdr lst))]
-                            [else  #f]))
-                    #f)]))))
-    
-    ;; ===============================================================================================
-    ;; Conversion to arrays
-    
-    (: first* (All (A) ((Listof* A) ((Listof* A) -> Any : A) -> A)))
-    (define (first* lst pred?)
-      (let/ec: return : A
-        (let: loop : A ([lst : (Listof* A)  lst])
-          (cond [(pred? lst)  (return lst)]
-                [else  (for ([lst  (in-list lst)])
-                         (loop lst))
-                       (error 'first* "no first* element")]))))
-    
-    (: list*->flat-vector (All (A) ((Listof* A) Integer ((Listof* A) -> Any : A) -> (Vectorof A))))
-    (define (list*->flat-vector lst size pred?)
-      (cond [(zero? size)  (vector)]
-            [else
-             (define vec (make-vector size (first* lst pred?)))
-             (let: loop : Fixnum ([lst : (Listof* A)  lst] [i : Fixnum  0])
-               (cond [(pred? lst)  (unsafe-vector-set! vec i lst)
-                                   (unsafe-fx+ i 1)]
-                     [else  (for/fold: ([i : Fixnum  i]) ([lst  (in-list lst)])
-                              (loop lst i))]))
-             vec]))
-    
-    (: list*->array (All (A) ((Listof* A) ((Listof* A) -> Any : A) -> (Array A))))
-    (define (list*->array lst pred?)
-      (define (raise-shape-error)
-        ;; don't have to worry about non-Index size - can't fit in memory anyway
-        (raise-argument-error 'list*->array "rectangular (Listof* A)" lst))
-      
-      (define ds (list-shape lst pred?))
-      (cond [(pred? lst)  (unsafe-build-simple-array #() (λ (js) lst))]
-            [ds  (let ([ds  (check-array-shape ds raise-shape-error)])
-                   (define size (array-shape-size ds))
-                   (unsafe-vector->array ds (list*->flat-vector lst size pred?)))]
-            [else  (raise-shape-error)]))
-    
-    (: vector*->array (All (A) ((Vectorof* A) ((Vectorof* A) -> Any : A) -> (Mutable-Array A))))
-    (define (vector*->array vec pred?)
-      (define (raise-shape-error)
-        ;; don't have to worry about non-Index size - can't fit in memory anyway
-        (raise-argument-error 'vector*->array "rectangular (Vectorof* A)" vec))
-      
-      (define ds (vector-shape vec pred?))
-      (cond [(pred? vec)  (array->mutable-array (unsafe-build-simple-array #() (λ (js) vec)))]
-            [ds  (let ([ds  (check-array-shape ds raise-shape-error)])
-                   (define dims (vector-length ds))
-                   (array->mutable-array
-                    (unsafe-build-array
-                     ds (λ: ([js : Indexes])
-                          (let: loop : A ([i : Nonnegative-Fixnum  0] [vec : (Vectorof* A)  vec])
-                            (cond [(pred? vec)  vec]
-                                  [(i . < . dims)
-                                   (define j_i (unsafe-vector-ref js i))
-                                   (loop (+ i 1) (vector-ref vec j_i))]
-                                  [else  (error 'vector*->array "internal error")]))))))]
-            [else  (raise-shape-error)]))
-    )  ; begin
-  )  ; make-conversion-functions
-
-(make-to-array-functions list*->array vector*->array)
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/untyped-array-pointwise.rkt b/pkgs/math-pkgs/math-lib/math/private/array/untyped-array-pointwise.rkt
deleted file mode 100644
index bd1fd4abc7..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/untyped-array-pointwise.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-
-(provide inline-array-map array-map)
-
-(module syntax-defs racket/base
-  (require (for-syntax racket/base)
-           typed/racket/base
-           "array-struct.rkt"
-           "array-broadcast.rkt"
-           "utils.rkt")
-  
-  (provide inline-array-map)
-  
-  (define-syntax-rule (ensure-array name arr-expr)
-    (plet: (A) ([arr : (Array A)  arr-expr])
-      (if (array? arr) arr (raise-argument-error name "Array" arr))))
-  
-  (define-syntax (inline-array-map stx)
-    (syntax-case stx ()
-      [(_ f)
-       (syntax/loc stx
-         (array-default-strict
-          (unsafe-build-array #() (λ (js) (f)))))]
-      [(_ f arr-expr)
-       (syntax/loc stx
-         (let ([arr  (ensure-array 'array-map arr-expr)])
-           (define ds (array-shape arr))
-           (define proc (unsafe-array-proc arr))
-           (array-default-strict
-            (unsafe-build-array ds (λ: ([js : Indexes]) (f (proc js)))))))]
-      [(_ f arr-expr arr-exprs ...)
-       (with-syntax ([(arrs ...)   (generate-temporaries #'(arr-exprs ...))]
-                     [(procs ...)  (generate-temporaries #'(arr-exprs ...))])
-         (syntax/loc stx
-           (let ([arr   (ensure-array 'array-map arr-expr)]
-                 [arrs  (ensure-array 'array-map arr-exprs)] ...)
-             (define ds (array-shape-broadcast (list (array-shape arr) (array-shape arrs) ...)))
-             (let ([arr   (array-broadcast arr ds)]
-                   [arrs  (array-broadcast arrs ds)] ...)
-               (define proc  (unsafe-array-proc arr))
-               (define procs (unsafe-array-proc arrs)) ...
-               (array-default-strict
-                (unsafe-build-array ds (λ: ([js : Indexes]) (f (proc js) (procs js) ...))))))))])))
-
-(require 'syntax-defs)
-
-(module untyped-defs racket/base
-  (require racket/contract
-           "array-struct.rkt"
-           "array-broadcast.rkt"
-           "utils.rkt"
-           (submod ".." syntax-defs))
-  
-  (provide (contract-out
-            [array-map  (->i ([f (unconstrained-domain-> any/c)])
-                             #:rest [xs (listof array?)]
-                             #:pre/name (f xs)
-                             "function has the wrong arity"
-                             (procedure-arity-includes? f (length xs))
-                             [_ array?])]))
-  
-  (define array-map
-    (case-lambda
-      [(f)  (inline-array-map f)]
-      [(f arr)  (inline-array-map f arr)]
-      [(f arr0 arr1)  (inline-array-map f arr0 arr1)]
-      [(f arr0 arr1 . arrs)
-       (define ds (array-shape-broadcast (list* (array-shape arr0)
-                                                (array-shape arr1)
-                                                (map array-shape arrs))))
-       (let ([arr0  (array-broadcast arr0 ds)]
-             [arr1  (array-broadcast arr1 ds)]
-             [arrs  (map (λ (arr) (array-broadcast arr ds)) arrs)])
-         (define g0 (unsafe-array-proc arr0))
-         (define g1 (unsafe-array-proc arr1))
-         (define gs (map unsafe-array-proc arrs))
-         (array-default-strict
-          (unsafe-build-array
-           ds (λ (js) (apply f (g0 js) (g1 js) (map (λ (g) (g js)) gs))))))]))
-  )
-
-(require 'untyped-defs)
diff --git a/pkgs/math-pkgs/math-lib/math/private/array/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/array/utils.rkt
deleted file mode 100644
index 4773964108..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/array/utils.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-
-(require typed/untyped-utils
-         typed/racket/base
-         (except-in "typed-utils.rkt"
-                    check-array-shape))
-
-(require/untyped-contract
- "typed-utils.rkt"
- [check-array-shape  ((Vectorof Integer) (-> Nothing) -> (Vectorof Index))])
-
-(provide (all-from-out "typed-utils.rkt")
-         check-array-shape)
diff --git a/pkgs/math-pkgs/math-lib/math/private/base/base-constants.rkt b/pkgs/math-pkgs/math-lib/math/private/base/base-constants.rkt
deleted file mode 100644
index 9665351abc..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/base/base-constants.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/racket/base
-
-(provide phi.0
-         euler.0
-         gamma.0
-         catalan.0)
-
-(define phi.0 1.61803398874989484820458683436563811772)
-(define euler.0 2.718281828459045235360287471352662497759)
-(define gamma.0 0.5772156649015328606065120900824024310432)
-(define catalan.0 0.9159655941772190150546035149323841107734)
diff --git a/pkgs/math-pkgs/math-lib/math/private/base/base-functions.rkt b/pkgs/math-pkgs/math-lib/math/private/base/base-functions.rkt
deleted file mode 100644
index 55d53ed2f6..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/base/base-functions.rkt
+++ /dev/null
@@ -1,137 +0,0 @@
-#lang typed/racket/base
-
-(require racket/flonum
-         "../flonum/flvector.rkt"
-         "../flonum/flonum-functions.rkt"
-         "../flonum/flonum-more-functions.rkt")
-
-(provide power-of-two?
-         absolute-error
-         relative-error
-         sum
-         asinh acosh atanh
-         float-complex?
-         inline-number->float-complex
-         number->float-complex)
-
-;; Returns #t if x is an integer power of 2
-(: power-of-two? (Real -> Boolean))
-(define (power-of-two? x)
-  (cond [(not (positive? x))  #f]
-        [(flonum? x)  (fl= x (flexpt 2.0 (flround (fl/ (fllog x) (fllog 2.0)))))]
-        [(single-flonum? x)  (power-of-two? (fl x))]
-        [(integer? x)  (= x (expt 2 (- (integer-length x) 1)))]
-        [else  (and (= 1 (numerator x))
-                    (power-of-two? (denominator x)))]))
-
-(: fix-exact-return (Real Real Real -> Real))
-(define (fix-exact-return x r e)
-  (cond [(or (single-flonum? x) (single-flonum? r))  (real->single-flonum e)]
-        [(or (flonum? x) (flonum? r))  (fl e)]
-        [else  e]))
-
-(: absolute-error (Real Real -> Real))
-(define (absolute-error x r)
-  (fix-exact-return
-   x r (cond [(eqv? x r)  0]
-             [(and (rational? x) (rational? r))
-              (abs (- (inexact->exact x) (inexact->exact r)))]
-             [else  +inf.0])))
-
-(: relative-error (Real Real -> Real))
-(define (relative-error x r)
-  (fix-exact-return
-   x r (cond [(eqv? x r)  0]
-             [(and (zero? x) (zero? r))  0]
-             [(zero? r)  +inf.0]
-             [(and (rational? x) (rational? r))
-              (define exact-r (inexact->exact r))
-              (abs (/ (- (inexact->exact x) exact-r) exact-r))]
-             [else  +inf.0])))
-
-(: sum ((Listof Real) -> Real))
-(define (sum xs)
-  (let loop ([xs xs]
-             [#{r : Exact-Rational}  0]
-             [#{fs : (Listof Flonum)}  null])
-    (cond [(null? xs)
-           (cond [(null? fs)  r]
-                 [(zero? r)  (flsum fs)]
-                 [else  (fl (+ r (inexact->exact (flsum fs))))])]
-          [else
-           (let ([x  (car xs)]
-                 [xs  (cdr xs)])
-             (cond [(double-flonum? x)  (loop xs r (cons x fs))]
-                   [(single-flonum? x)  (loop xs r (cons (fl x) fs))]
-                   [else  (loop xs (+ x r) fs)]))])))
-
-;; ===================================================================================================
-;; Inverse hyperbolic
-
-(: asinh (case-> (Zero -> Zero)
-                 (Float -> Float)
-                 (Real -> Real)
-                 (Float-Complex -> Float-Complex)
-                 (Number -> Number)))
-(define (asinh x)
-  (cond [(flonum? x)  (flasinh x)]
-        [(eqv? x 0)  0]
-        [(real? x)  (flasinh (fl x))]
-        [(float-complex? x)  (log (+ x (sqrt (+ (* x x) 1.0))))]
-        [else  (log (+ x (sqrt (+ (* x x) 1))))]))
-
-(: acosh (case-> (One -> Zero)
-                 (Float -> Float)
-                 (Real -> Number)
-                 (Float-Complex -> Float-Complex)
-                 (Number -> Number)))
-(define (acosh x)
-  (cond [(flonum? x)  (flacosh x)]
-        [(eqv? x 1)  0]
-        [(and (real? x) (x . >= . 1))  (flacosh (fl x))]
-        [(float-complex? x)  (log (+ x (* (sqrt (+ x 1.0)) (sqrt (- x 1.0)))))]
-        [else  (log (+ x (* (sqrt (+ x 1)) (sqrt (- x 1)))))]))
-
-(: atanh (case-> (Zero -> Zero)
-                 (Float -> Float)
-                 (Real -> Real)
-                 (Float-Complex -> Float-Complex)
-                 (Number -> Number)))
-(define (atanh x)
-  (cond [(flonum? x)  (flatanh x)]
-        [(eqv? x 0)  0]
-        [(real? x)  (flatanh (fl x))]
-        [(float-complex? x)  (* 0.5 (- (log (+ 1.0 x)) (log (- 1.0 x))))]
-        [else  (* 1/2 (- (log (+ 1 x)) (log (- 1 x))))]))
-
-;; ===================================================================================================
-;; Float-Complex functions
-
-(define-predicate float-complex? Float-Complex)
-
-(module syntax-defs racket/base
-  (require (for-syntax racket/base
-                       typed/untyped-utils)
-           (only-in typed/racket/base : Number let:)
-           racket/flonum)
-  
-  (provide inline-number->float-complex)
-  
-  (define-syntax (inline-number->float-complex stx)
-    (syntax-case stx ()
-      [(_ z-expr)
-       (syntax/loc stx
-         (let: ([z : Number  z-expr])
-           (if (number? z)
-               (make-rectangular (real->double-flonum (real-part z))
-                                 (real->double-flonum (imag-part z)))
-               (raise-argument-error 'number->float-complex "number?" z))))]))
-  
-  )  ; module
-
-(require 'syntax-defs)
-
-(: number->float-complex (Number -> Float-Complex))
-(define (number->float-complex z)
-  (make-rectangular (fl (real-part z))
-                    (fl (imag-part z))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/base/base-random.rkt b/pkgs/math-pkgs/math-lib/math/private/base/base-random.rkt
deleted file mode 100644
index a03c9ab89d..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/base/base-random.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum)
-
-(provide random-bits random-natural random-integer)
-
-;; Random bits are taken in blocks of this size:
-(define block-bits 30)
-(define block-size (arithmetic-shift 1 block-bits))
-
-(: random-bits (Integer -> Natural))
-(define (random-bits bits)
-  (cond [(bits . <= . 0)  (raise-argument-error 'random-bits "Positive-Integer" bits)]
-        [else
-         (define max-blocks (assert (quotient bits block-bits) index?))
-         (define rem-bits (remainder bits block-bits))
-         (let: loop : Natural ([blocks : Nonnegative-Fixnum  0]
-                               [r : Natural  (random (fxlshift 1 rem-bits))])
-           (cond [(blocks . fx< . max-blocks)
-                  (loop (fx+ blocks 1)
-                        (bitwise-ior (arithmetic-shift r block-bits)
-                                     (random block-size)))]
-                 [else  r]))]))
-
-(define random-max 4294967087)
-(define bias-bits (* 2 block-bits))
-
-(: random-natural (Integer -> Natural))
-;; Returns a random integer in the interval [0..n)
-(define (random-natural n)
-  (cond
-    [(n . <= . 0)  (raise-argument-error 'random-natural "Positive-Integer" n)]
-    [(n . <= . random-max)  (random n)]
-    [else
-     ;; Rejection sampling has rejection probability approaching 1/2 in the worst cases; that is,
-     ;; when n = 1+2^i for some large-ish integer i
-     ;; Adding extra bits shrinks the rejection probability to near zero (it approaches
-     ;; (* 1/2 (expt 2 (- bias-bits)))), at the cost of some bias
-     ;; The bias starts become detectable after taking (expt 2 bias-bits) samples, which is plenty
-     (define bits (+ bias-bits (integer-length (- n 1))))
-     (define m (arithmetic-shift 1 bits))
-     (let loop ()
-       (define r (quotient (* (+ (random-bits bits) 1) n) m))
-       (if (r . >= . n) (loop) r))]))
-
-(: random-integer (Integer Integer -> Integer))
-(define (random-integer a b)
-  (let ([a  (min a b)] [b  (max a b)])
-    (+ a (random-natural (- b a)))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-beta.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-beta.rkt
deleted file mode 100644
index 819f47e48a..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-beta.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang typed/racket/base
-
-(require "bigfloat-struct.rkt")
-
-(provide bfbeta bflog-beta)
-
-(: bflog-beta (Bigfloat Bigfloat -> Bigfloat))
-(define (bflog-beta a b)
-  (bf+ (bflog-gamma a)
-       (bflog-gamma b)
-       (bf- (bflog-gamma (bf+ a b)))))
-
-(: bfbeta (Bigfloat Bigfloat -> Bigfloat))
-(define (bfbeta a b)
-  (bfexp (bflog-beta a b)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-constants.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-constants.rkt
deleted file mode 100644
index 717d8c7d30..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-constants.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket/base
-
-(require (only-in "mpfr.rkt" consts 0ary-funs)
-         "bigfloat-mpfr.rkt"
-         "utils.rkt")
-
-(req/prov-uniform-collection "mpfr.rkt" consts (Promise Bigfloat))
-(req/prov-uniform-collection "mpfr.rkt" 0ary-funs (-> Bigfloat))
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-continued-fraction.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-continued-fraction.rkt
deleted file mode 100644
index 41dab02623..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-continued-fraction.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang typed/racket/base
-
-(require "bigfloat-struct.rkt")
-
-(provide bfcontinued-fraction)
-
-(define-syntax-rule (bfcontinued-fraction a-init a-fun b-init b-fun eps-expr)
-  (bfcopy
-   (parameterize ([bf-precision  (+ (bf-precision) 20)])
-     (let: ([eps : Bigfloat  eps-expr])
-       (let: loop : Bigfloat ([i : Bigfloat 0.bf]
-                              [a : Bigfloat a-init]
-                              [b : Bigfloat b-init]
-                              [last-n : Bigfloat 1.bf]
-                              [last-d : Bigfloat 0.bf]
-                              [n : Bigfloat 0.bf]
-                              [d : Bigfloat 1.bf]
-                              [x : Bigfloat 0.bf])
-         ;(printf "a = ~v  b = ~v~n" a b)
-         (define next-n (bf+ (bf* a last-n) (bf* b n)))
-         (define next-d (bf+ (bf* a last-d) (bf* b d)))
-         (define next-x (bf/ next-n next-d))
-         ;(printf "n = ~v  d = ~v  x = ~v~n" next-n next-d next-x)
-         (cond [((bfabs (bf- x next-x)) . bf<= . (bf* eps (bfabs next-x)))
-                ;(printf "i = ~v~n" i)
-                ;i
-                next-x]
-               [else
-                (let ([i  (bf+ i 1.bf)])
-                  (loop i (a-fun i a) (b-fun i b) n d next-n next-d next-x))]))))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-hurwitz-zeta.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-hurwitz-zeta.rkt
deleted file mode 100644
index f279602bd3..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-hurwitz-zeta.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         "../../flonum.rkt"
-         "../../base.rkt"
-         "../number-theory/bernoulli.rkt"
-         "../number-theory/factorial.rkt"
-         "bigfloat-struct.rkt")
-
-(provide bfhurwitz-zeta)
-
-(define 0.5b0 (parameterize ([bf-precision 2]) (bf 0.5)))
-
-(: bfhurwitz-zeta-series (Bigfloat Bigfloat -> Bigfloat))
-(define (bfhurwitz-zeta-series s q)
-  (define eps (bf* 0.5b0 epsilon.bf))
-  (let loop ([i 0] [y 0.bf])
-    (define dy (bfexpt (bf+ q (bf i)) (bf- s)))
-    (define new-y (bf+ y dy))
-    (cond [(or ((bfabs dy) . bf<= . (bf* eps new-y))
-               (not (bfrational? new-y)))
-           new-y]
-          [else
-           (loop (+ i 1) new-y)])))
-
-(: bfhurwitz-zeta-euler-maclaurin (Bigfloat Bigfloat -> Bigfloat))
-(define (bfhurwitz-zeta-euler-maclaurin s q)
-  (define n (exact-ceiling (+ (* 0.5 (bf-precision) (/ (log 2) (log 10))) 10)))
-  (: f (Integer -> Bigfloat))
-  (define (f k) (bfexpt (bf+ (bf k) q) (bf- s)))
-  (define fn (f n))
-  (define n+q (bf+ (bf n) q))
-  (define sqr-n+q (bf* n+q n+q))
-  (define eps epsilon.bf)
-  (define y0
-    (for/fold: ([y0 : Bigfloat  (bf* fn (bf+ (bf/ n+q (bf- s 1.bf)) 0.5b0))]
-                ) ([k  (in-range n)])
-      (bf+ y0 (f k))))
-  (define max-k 100)
-  (let: loop : Bigfloat ([y : Bigfloat  y0]
-                         [numer : Bigfloat  s]
-                         [denom : Bigfloat  (bf/ fn n+q)]
-                         [k : Nonnegative-Fixnum  0])
-    (define ck (bf (/ (bernoulli-number (* 2 (fx+ k 1))) (factorial (* 2 (fx+ k 1))))))
-    (define dy (bf* (bf* numer denom) ck))
-    (define new-y (bf+ y dy))
-    (cond [((bfabs dy) . bf<= . (bf* eps (bfabs new-y)))
-           new-y]
-          [else
-           (define k.bf (bf k))
-           (loop new-y
-                 (bf* (bf* numer (bf+ s (bf+ (bf* 2.bf k.bf) 1.bf)))
-                      (bf+ s (bf+ (bf* 2.bf k.bf) 2.bf)))
-                 (bf/ denom sqr-n+q)
-                 (fx+ k 1))])))
-
-(: bfhurwitz-zeta (Bigfloat Bigfloat -> Bigfloat))
-(define (bfhurwitz-zeta s q)
-  (cond [(s . bf<= . 1.bf)  (if (bf= s 1.bf) +inf.bf +nan.bf)]
-        [(q . bf<= . 0.bf)  (if (bf= q 0.bf) +inf.bf +nan.bf)]
-        [(s . bf> . (bf/ (bflog (bf* 0.5b0 epsilon.bf)) (bf- (bflog q) (bflog1p q))))
-         ;; At this point, only the first term in the series is necessary; the condition can had by
-         ;; solving for s in (q+1)^-s < 0.5 * epsilon.0 * q^-s
-         (bfexpt q (bf- s))]
-        [(s . bf> . (bf+ (bf* 2.bf q) (bf 15)))
-         ;; Determined experimentally that the series computes fewer total iterations here
-         (bfhurwitz-zeta-series s q)]
-        [else
-         (bfhurwitz-zeta-euler-maclaurin s q)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-incomplete-beta.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-incomplete-beta.rkt
deleted file mode 100644
index 2021fbe9ad..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-incomplete-beta.rkt
+++ /dev/null
@@ -1,158 +0,0 @@
-#lang typed/racket/base
-
-(require "../flonum/flonum-functions.rkt"
-         "../flonum/flonum-constants.rkt"
-         "bigfloat-struct.rkt"
-         "bigfloat-continued-fraction.rkt"
-         "bigfloat-log-arithmetic.rkt"
-         "bigfloat-beta.rkt")
-
-(provide bfbeta-lower-regularized bflog-beta-lower-regularized
-         bfbeta-upper-regularized bflog-beta-upper-regularized)
-
-(: in-bounds? (Bigfloat Bigfloat Bigfloat -> Boolean))
-(define (in-bounds? a b x)
-  (and (bfpositive? x) (x . bf< . 1.bf)
-       (bfpositive? a) (a . bf< . +inf.bf)
-       (bfpositive? b) (b . bf< . +inf.bf)))
-
-(: hypergeom-fac (Bigfloat Bigfloat Bigfloat -> Bigfloat))
-(define (hypergeom-fac a b x)
-  (define a+b (bf+ a b))
-  (define a+1 (bf+ a 1.bf))
-  (bf* (bf/ (bf+ a+b (bf 20)) (bf+ a+1 (bf 20))) x))
-
-(: bfbeta-regularized-const (Bigfloat Bigfloat Bigfloat Bigfloat Boolean -> Bigfloat))
-(define (bfbeta-regularized-const a b log-x log-y log?)
-  (define log-c
-    (bf+ (bf* a log-x)
-         (bf* b log-y)
-         (bf- (bflog-beta a b))))
-  (if log? log-c (bfexp log-c)))
-
-(: bfbeta-regularized-frac
-   (Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Boolean -> Bigfloat))
-(define (bfbeta-regularized-frac a b x y log-x log-y l log?)
-  (define z
-    (bfcontinued-fraction
-     1.bf
-     (λ: ([n : Bigfloat] [s : Bigfloat])
-       (let ([a+n-1  (bf+ a (bf- n 1.bf))]
-             [a+2n-1  (bf+ a (bf- (bf* 2.bf n) 1.bf))])
-         (bf/ (bf* a+n-1 (bf+ a+n-1 b) n (bf- b n) x x)
-              (bf* a+2n-1 a+2n-1))))
-     (bf* (bf/ a (bf+ a 1.bf)) (bf+ l 1.bf))
-     (λ: ([n : Bigfloat] [t : Bigfloat])
-       (let ([a+2n  (bf+ a (bf* 2.bf n))])
-         (bf+ (bf/ (bf* n (bf- b n) x) (bf+ a+2n -1.bf))
-              (bf* (bf/ (bf+ a n) (bf+ a+2n 1.bf))
-                   (bf+ l 1.bf (bf* n (bf+ 1.bf y))))
-              n)))
-     (bf (* (flexpt 2.0 -10.0) epsilon.0))))
-  (cond [log?  (bf+ (bflog z) (bfbeta-regularized-const a b log-x log-y #t))]
-        [else  (bf* z (bfbeta-regularized-const a b log-x log-y #f))]))
-
-(: bfbeta-regularized-hypergeom
-   (Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Boolean -> Bigfloat))
-(define (bfbeta-regularized-hypergeom a b x y log-x log-y log?)
-  (define eps (bf (* (flexpt 2.0 -10.0) epsilon.0)))
-  (define a+b (bf+ a b))
-  (define a+1 (bf+ a 1.bf))
-  (define: dzs : (Listof Bigfloat)
-    (let loop ([z 0.bf] [dz 1.bf] [dzs  (list 1.bf)] [n 0.0] [i -1])
-      ;(printf "dz = ~v  i = ~v~n" (bigfloat->flonum dz) (abs i))
-      (define bf-n (bf n))
-      (define new-dz (bf* dz (bf/ (bf+ a+b bf-n) (bf+ a+1 bf-n)) x))
-      (cond [(zero? i)  (cons new-dz dzs)]
-            [else
-             (let ([i  (if (and (i . < . 0.0)
-                                ((bfabs new-dz) . bf<= . (bfabs dz))
-                                ((bfabs new-dz) . bf<= . (bf* eps (bfabs z))))
-                           200
-                           (- i 1))])
-               (loop (bf+ z new-dz) new-dz (cons new-dz dzs) (+ n 1.0) i))])))
-  (define z (apply bf+ dzs))
-  (cond [log?  (bf+ (bf- (bflog z) (bflog a))
-                    (bfbeta-regularized-const a b log-x log-y #t))]
-        [else  (bf* (bf/ z a)
-                    (bfbeta-regularized-const a b log-x log-y #f))]))
-
-(: bfbeta-regularized-limits (Bigfloat Bigfloat Bigfloat -> Bigfloat))
-(define (bfbeta-regularized-limits a b x)
-  (cond [(or (bfnegative? x) (x . bf> . 1.bf) (bfnegative? a) (bfnegative? b))  +nan.bf]
-        [(bf= x 1.bf)  x]
-        [(and (bfzero? a) (bfzero? b))  (bf 0.5)]
-        [(and (bf= a +inf.bf) (bf= b +inf.bf))  (if (x . bf< . (bf 0.5)) 0.bf 1.bf)]
-        [(bf= a +inf.bf)  0.bf]
-        [(bf= b +inf.bf)  1.bf]
-        [(bfzero? a)  1.bf]
-        [(bfzero? b)  0.bf]
-        [(bfzero? x)  0.bf]
-        [else  +nan.bf]))
-
-(: maybe1- (Bigfloat Boolean Boolean -> Bigfloat))
-(define (maybe1- z log? 1-?)
-  (cond [1-?  (if log? (bflog1- z) (bf- 1.bf z))]
-        [else  z]))
-
-(: get-large-params
-   (Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Boolean
-           -> (Values Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Boolean)))
-(define (get-large-params a b x y log-x log-y 1-?)
-  (define l
-    (cond [(a . bf> . b)  (bf- (bf* (bf+ a b) y) b)]
-          [else  (bf- a (bf* (bf+ a b) x))]))
-  (if (bfnegative? l)
-      (values b a y x log-y log-x (bf- l) (not 1-?))
-      (values a b x y log-x log-y l 1-?)))
-
-(: get-hypergeom-params
-   (Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Boolean
-           -> (Values Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Bigfloat Boolean)))
-(define (get-hypergeom-params a b x y log-x log-y 1-?)
-  (if ((hypergeom-fac b a y) . bf< . (hypergeom-fac a b x))
-      (values b a y x log-y log-x (not 1-?))
-      (values a b x y log-x log-y 1-?)))
-
-(: bfbeta-regularized (Bigfloat Bigfloat Bigfloat Boolean Boolean -> Bigfloat))
-(define (bfbeta-regularized a b x log? 1-?)
-  (define y (bf- 1.bf x))
-  (define log-x (bflog x))
-  (define log-y (bflog1p (bf- x)))
-  (cond [(not (in-bounds? a b x))
-         (maybe1- (bfbeta-regularized-limits a b x)
-                  log? 1-?)]
-        [(and (a . bf< . 1.bf) (b . bf< . 1.bf))
-         (let-values ([(a b x y log-x log-y 1-?)  (get-hypergeom-params a b x y log-x log-y 1-?)])
-           (maybe1- (bfbeta-regularized-hypergeom a b x y log-x log-y log?)
-                    log? 1-?))]
-        [else
-         (define f1 (hypergeom-fac a b x))
-         (define f2 (hypergeom-fac b a y))
-         (cond
-           [(f1 . bf< . (bf 0.75))
-            (maybe1- (bfbeta-regularized-hypergeom a b x y log-x log-y log?)
-                     log? 1-?)]
-           [(f2 . bf< . (bf 0.75))
-            (maybe1- (bfbeta-regularized-hypergeom b a y x log-y log-x log?)
-                     log? (not 1-?))]
-           [else
-            (let-values ([(a b x y log-x log-y l 1-?)  (get-large-params a b x y log-x log-y 1-?)])
-              (maybe1- (bfbeta-regularized-frac a b x y log-x log-y l log?)
-                       log? 1-?))])]))
-
-(: bfbeta-lower-regularized (Bigfloat Bigfloat Bigfloat -> Bigfloat))
-(define (bfbeta-lower-regularized a b x)
-  (bfbeta-regularized a b x #f #f))
-
-(: bfbeta-upper-regularized (Bigfloat Bigfloat Bigfloat -> Bigfloat))
-(define (bfbeta-upper-regularized a b x)
-  (bfbeta-regularized a b x #f #t))
-
-(: bflog-beta-lower-regularized (Bigfloat Bigfloat Bigfloat -> Bigfloat))
-(define (bflog-beta-lower-regularized a b x)
-  (bfbeta-regularized a b x #t #f))
-
-(: bflog-beta-upper-regularized (Bigfloat Bigfloat Bigfloat -> Bigfloat))
-(define (bflog-beta-upper-regularized a b x)
-  (bfbeta-regularized a b x #t #t))
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-incomplete-gamma.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-incomplete-gamma.rkt
deleted file mode 100644
index 030981eca9..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-incomplete-gamma.rkt
+++ /dev/null
@@ -1,147 +0,0 @@
-#lang typed/racket/base
-
-(require "bigfloat-struct.rkt"
-         "bigfloat-continued-fraction.rkt"
-         "bigfloat-log-arithmetic.rkt")
-
-(provide bfgamma-lower
-         bfgamma-upper
-         bfgamma-lower-regularized
-         bfgamma-upper-regularized
-         bflog-gamma-lower
-         bflog-gamma-upper
-         bflog-gamma-lower-regularized
-         bflog-gamma-upper-regularized)
-
-(: bfgamma-lower-iter (Bigfloat Bigfloat Bigfloat -> Bigfloat))
-(define (bfgamma-lower-iter k x eps)
-  (let: loop : Bigfloat ([y  : Bigfloat  0.bf]
-                         [dy : Bigfloat  (bf/ x (bf+ k 1.bf))]
-                         [i  : Bigfloat  0.bf])
-    (define new-y (bf+ y dy))
-    (cond [(or (bf= new-y +inf.bf) ((bfabs dy) . bf<= . (bf* eps new-y)))  new-y]
-          [else  (loop new-y (bf/ (bf* dy x) (bf+ 2.bf i k)) (bf+ i 1.bf))])))
-
-(: bfgamma-lower-series (Bigfloat Bigfloat -> Bigfloat))
-;; Computes the lower gamma function from its series
-(define (bfgamma-lower-series k x)
-  (define eps epsilon.bf)
-  (bfcopy
-   (parameterize ([bf-precision  (+ (bf-precision) 10)])
-     (define y (bfgamma-lower-iter k x epsilon.bf))
-     (define log-z (bf- (bf* k (bflog x)) (bf+ x (bflog k))))
-     (let ([z  (cond [((bfabs log-z) . bf< . 1.bf)  (bfexp log-z)]
-                     [else  (bf/ (bf* (bfexpt x k) (bfexp (bf- x))) k)])])
-       (bf+ z (bf* z y))))))
-
-(: bflog-gamma-lower-series (Bigfloat Bigfloat -> Bigfloat))
-;; Computes the log of the lower gamma function from its series
-(define (bflog-gamma-lower-series k x)
-  (bfcopy
-   (parameterize ([bf-precision  (+ (bf-precision) 10)])
-     (bflog (bfgamma-lower-series k x)))))
-
-;; ===================================================================================================
-
-(: bfgamma-upper-iter (Bigfloat Bigfloat Bigfloat -> Bigfloat))
-(define (bfgamma-upper-iter k x eps)
-  (bfcontinued-fraction 1.bf
-                        (λ (i a) (bf* i (bf- k i)))
-                        (bf+ 1.bf (bf- x k))
-                        (λ (i b) (bf+ (bf- x k) (bf+ (bf* 2.bf i) 1.bf)))
-                        eps))
-
-(: bfgamma-upper-frac (Bigfloat Bigfloat -> Bigfloat))
-;; Computes the upper gamma function using Legendre's continued fraction
-(define (bfgamma-upper-frac k x)
-  (define eps epsilon.bf)
-  (bfcopy
-   (parameterize ([bf-precision  (+ (bf-precision) 10)])
-     (define y (bfgamma-upper-iter k x eps))
-     (define log-z (bf- (bf* k (bflog x)) x))
-     (let ([z  (cond [((bfabs log-z) . bf< . 1.bf)  (bfexp log-z)]
-                     [else  (bf* (bfexpt x k) (bfexp (bf- x)))])])
-       (bf* y z)))))
-
-(: bflog-gamma-upper-frac (Bigfloat Bigfloat -> Bigfloat))
-;; Computes the log of the upper gamma function using Legendre's continued fraction
-(define (bflog-gamma-upper-frac k x)
-  (bfcopy
-   (parameterize ([bf-precision  (+ (bf-precision) 10)])
-     (bflog (bfgamma-upper-frac k x)))))
-
-;; ===================================================================================================
-
-(: use-lower? (Bigfloat Bigfloat -> Boolean))
-;; Determines whether to compute an incomplete gamma function using the lower's series or upper's
-;; continued fraction
-(define (use-lower? k x)
-  (or (x . bf< . k) (and (x . bf< . 4.bf) (k . bf< . 3.bf))))
-
-(: bfgamma-lower (Bigfloat Bigfloat -> Bigfloat))
-(define (bfgamma-lower k x)
-  (cond [(k . bf<= . 0.bf)  +nan.bf]
-        [(x . bf<  . 0.bf)  +nan.bf]
-        [(use-lower? k x)  (bfgamma-lower-series k x)]
-        [else  (bf- (bfgamma k) (bfgamma-upper-frac k x))]))
-
-(: bflog-gamma-lower (Bigfloat Bigfloat -> Bigfloat))
-(define (bflog-gamma-lower k x)
-  (cond [(k . bf<= . 0.bf)  +nan.bf]
-        [(x . bf<  . 0.bf)  +nan.bf]
-        [(use-lower? k x)  (bflog-gamma-lower-series k x)]
-        [else  (bflog- (bflog-gamma k) (bflog-gamma-upper-frac k x))]))
-
-(: bfgamma-upper (Bigfloat Bigfloat -> Bigfloat))
-(define (bfgamma-upper k x)
-  (cond [(k . bf<= . 0.bf)  +nan.bf]
-        [(x . bf<  . 0.bf)  +nan.bf]
-        [(use-lower? k x)  (bf- (bfgamma k) (bfgamma-lower-series k x))]
-        [else  (bfgamma-upper-frac k x)]))
-
-(: bflog-gamma-upper (Bigfloat Bigfloat -> Bigfloat))
-(define (bflog-gamma-upper k x)
-  (cond [(k . bf<= . 0.bf)  +nan.bf]
-        [(x . bf<  . 0.bf)  +nan.bf]
-        [(use-lower? k x)  (bflog- (bflog-gamma k) (bflog-gamma-lower-series k x))]
-        [else  (bflog-gamma-upper-frac k x)]))
-
-;; ===================================================================================================
-
-(: bflog-gamma-lower-regularized (Bigfloat Bigfloat -> Bigfloat))
-(define (bflog-gamma-lower-regularized k x)
-  (bfcopy
-   (parameterize ([bf-precision  (+ (bf-precision) 10)])
-     (cond [(use-lower? k x)
-            (bf- (bflog-gamma-lower-series k x) (bflog-gamma k))]
-           [else
-            (bflog1p (bf- (bfexp (bf- (bflog-gamma-upper-frac k x) (bflog-gamma k)))))]))))
-
-(: bflog-gamma-upper-regularized (Bigfloat Bigfloat -> Bigfloat))
-(define (bflog-gamma-upper-regularized k x)
-  (bfcopy
-   (parameterize ([bf-precision  (+ (bf-precision) 10)])
-     (cond [(use-lower? k x)
-            (bflog1p (bf- (bfexp (bf- (bflog-gamma-lower-series k x) (bflog-gamma k)))))]
-           [else
-            (bf- (bflog-gamma-upper-frac k x) (bflog-gamma k))]))))
-
-(: bfgamma-lower-regularized (Bigfloat Bigfloat -> Bigfloat))
-(define (bfgamma-lower-regularized k x)
-  (bfcopy
-   (parameterize ([bf-precision  (+ (bf-precision) 10)])
-     (cond [(use-lower? k x)
-            (bf/ (bfgamma-lower-series k x) (bfgamma k))]
-           [else
-            (define gam-k (bfgamma k))
-            (bf/ (bf- gam-k (bfgamma-upper-frac k x)) gam-k)]))))
-
-(: bfgamma-upper-regularized (Bigfloat Bigfloat -> Bigfloat))
-(define (bfgamma-upper-regularized k x)
-  (bfcopy
-   (parameterize ([bf-precision  (+ (bf-precision) 10)])
-     (cond [(use-lower? k x)
-            (define gam-k (bfgamma k))
-            (bf/ (bf- gam-k (bfgamma-lower-series k x)) gam-k)]
-           [else
-            (bf/ (bfgamma-upper-frac k x) (bfgamma k))]))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-log-arithmetic.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-log-arithmetic.rkt
deleted file mode 100644
index 5479f6b671..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-log-arithmetic.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang typed/racket/base
-
-(require "bigfloat-struct.rkt")
-
-(provide bflog* bflog/ bflog+ bflog- bflog1- bflogb)
-
-(: bflog* (Bigfloat Bigfloat -> Bigfloat))
-(define (bflog* log-x log-y) (bf+ log-x log-y))
-
-(: bflog/ (Bigfloat Bigfloat -> Bigfloat))
-(define (bflog/ log-x log-y) (bf- log-x log-y))
-
-(: bflog+ (Bigfloat Bigfloat -> Bigfloat))
-(define (bflog+ log-x log-y)
-  (let-values ([(log-x log-y)  (if (log-x . bf> . log-y)
-                                   (values log-x log-y)
-                                   (values log-y log-x))])
-    (bf+ log-x (bflog1p (bfexp (bf- log-y log-x))))))
-
-(: bflog- (Bigfloat Bigfloat -> Bigfloat))
-(define (bflog- log-x log-y)
-  (cond [(log-y . bf> . log-x)  +nan.bf]
-        [else  (bf+ log-x (bflog1p (bf- (bfexp (bf- log-y log-x)))))]))
-
-(: bflog1- (Bigfloat -> Bigfloat))
-(define (bflog1- log-x)
-  (cond [(log-x . bf> . (bflog (bf 0.5)))  (bflog (bf- (bfexpm1 log-x)))]
-        [else  (bflog1p (bf- (bfexp log-x)))]))
-
-(: bflogb (Bigfloat Bigfloat -> Bigfloat))
-(define (bflogb b x)
-  (cond [(bf= x 1.bf)  0.bf]
-        [(bf= b 1.bf)  +nan.bf]
-        [(not (and (bf<= 0.bf b) (bf<= b +inf.bf) (bf<= 0.bf x) (bf<= x +inf.bf)))  +nan.bf]
-        [(bf= b 0.bf)
-         (cond [(bf= x 0.bf)  +inf.bf]
-               [(bf= x +inf.bf)  -inf.bf]
-               [(bf<= x 1.bf)  0.bf]
-               [else  -0.bf])]
-        [(bf= b +inf.bf)
-         (cond [(bf= x 0.bf)  -inf.bf]
-               [(bf= x +inf.bf)  +inf.bf]
-               [(bf<= 1.bf x)  0.bf]
-               [else  -0.bf])]
-        [(bf= x 0.bf)  (if (bf< b 1.bf) +inf.bf -inf.bf)]
-        [(bf= x +inf.bf)  (if (bf< b 1.bf) -inf.bf +inf.bf)]
-        [else
-         (bf/ (bflog x) (bflog b))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-mpfr.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-mpfr.rkt
deleted file mode 100644
index 560b7d2dc9..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-mpfr.rkt
+++ /dev/null
@@ -1,213 +0,0 @@
-#lang typed/racket/base
-
-(require racket/flonum
-         (only-in "mpfr.rkt" 1ary-funs 1ary-preds 1ary2-funs 2ary-funs)
-         "../base/base-random.rkt"
-         "utils.rkt")
-
-(define-type Rounding-Mode (U 'nearest 'zero 'up 'down))
-
-(require/typed
- "mpfr.rkt"
- ;; Parameters
- [bf-rounding-mode  (Parameterof Rounding-Mode)]
- [bf-min-precision  Exact-Positive-Integer]
- [bf-max-precision  Exact-Positive-Integer]
- [bf-precision  (Parameterof Integer)]
- ;; Type and predicate
- [opaque Bigfloat bigfloat?]
- [bfcanonicalize  (Bigfloat -> Bigfloat)]
- ;; Accessors
- [bigfloat-precision    (Bigfloat -> Exact-Positive-Integer)]
- [bigfloat-signbit      (Bigfloat -> (U 0 1))]
- [bigfloat-exponent     (Bigfloat -> Integer)]
- [bigfloat-significand  (Bigfloat -> Integer)]
- ;; Conversions from Bigfloat
- [bigfloat->sig+exp   (Bigfloat -> (Values Integer Integer))]
- [bigfloat->flonum    (Bigfloat -> Flonum)]
- [bigfloat->integer   (Bigfloat -> Integer)]
- [bigfloat->rational  (Bigfloat -> Exact-Rational)]
- [bigfloat->real      (Bigfloat -> (U Exact-Rational Flonum))]
- [bigfloat->string    (Bigfloat -> String)]
- ;; Conversions to Bigfloat
- [sig+exp->bigfloat   (Integer Integer -> Bigfloat)]
- [flonum->bigfloat    (Flonum -> Bigfloat)]
- [integer->bigfloat   (Integer -> Bigfloat)]
- [rational->bigfloat  (Exact-Rational -> Bigfloat)]
- [real->bigfloat      (Real -> Bigfloat)]
- [string->bigfloat    (String -> (U #f Bigfloat))]
- ;; Main constructor
- [bf  (case-> ((U String Real) -> Bigfloat)
-              (Integer Integer -> Bigfloat))]
- ;; Functions that will only be provided wrapped
- [bfadd  (Bigfloat Bigfloat -> Bigfloat)]
- [bfsub  (Bigfloat Bigfloat -> Bigfloat)]
- [bfmul  (Bigfloat Bigfloat -> Bigfloat)]
- [bfdiv  (Bigfloat Bigfloat -> Bigfloat)]
- [bfneg  (Bigfloat -> Bigfloat)]
- [bfsum  ((Listof Bigfloat) -> Bigfloat)]
- [bfmax2  (Bigfloat Bigfloat -> Bigfloat)]
- [bfmin2  (Bigfloat Bigfloat -> Bigfloat)]
- [bf=?    (Bigfloat Bigfloat -> Boolean)]
- [bflt?   (Bigfloat Bigfloat -> Boolean)]
- [bflte?  (Bigfloat Bigfloat -> Boolean)]
- [bfgt?   (Bigfloat Bigfloat -> Boolean)]
- [bfgte?  (Bigfloat Bigfloat -> Boolean)]
- ;; Functions with non-uniform types
- [bffactorial  (Integer -> Bigfloat)]
- [bfbesj  (Integer Bigfloat -> Bigfloat)]
- [bfbesy  (Integer Bigfloat -> Bigfloat)]
- [bfroot  (Bigfloat Integer -> Bigfloat)]
- [bfshift  (Bigfloat Integer -> Bigfloat)]
- [bigfloat->ordinal  (Bigfloat -> Integer)]
- [ordinal->bigfloat  (Integer -> Bigfloat)]
- [bigfloats-between  (Bigfloat Bigfloat -> Integer)]
- [bfstep  (Bigfloat Integer -> Bigfloat)]
- [bfnext  (Bigfloat -> Bigfloat)]
- [bfprev  (Bigfloat -> Bigfloat)]
- [bflog-gamma/sign  (Bigfloat -> (Values Bigfloat (U -1 1)))])
-
-(req/prov-uniform-collection "mpfr.rkt" 1ary-funs (Bigfloat -> Bigfloat))
-(req/prov-uniform-collection "mpfr.rkt" 1ary-preds (Bigfloat -> Boolean))
-(req/prov-uniform-collection "mpfr.rkt" 1ary2-funs (Bigfloat -> (Values Bigfloat Bigfloat)))
-(req/prov-uniform-collection "mpfr.rkt" 2ary-funs (Bigfloat Bigfloat -> Bigfloat))
-
-;; Rackety wrappers
-
-(: bf+ (Bigfloat * -> Bigfloat))
-(define (bf+ . xs)
-  (cond [(null? xs)  (bf 0)]
-        [else
-         (define xs1 (cdr xs))
-         (cond [(null? xs1)  (car xs)]
-               [else
-                (define xs2 (cdr xs1))
-                (cond [(null? xs2)  (bfadd (car xs) (car xs1))]
-                      [else  (bfsum xs)])])]))
-
-(: bf- (Bigfloat Bigfloat * -> Bigfloat))
-(define (bf- x . xs)
-  (cond [(null? xs)  (bfneg x)]
-        [(null? (cdr xs))  (bfsub x (car xs))]
-        [else  (bfneg (apply bf+ (bfneg x) xs))]))
-
-(: bf* (Bigfloat * -> Bigfloat))
-(define (bf* . xs)
-  (cond [(null? xs)  (bf 1)]
-        [else  (let loop ([x  (car xs)] [xs  (cdr xs)])
-                 (cond [(null? xs)  x]
-                       [else  (loop (bfmul x (car xs)) (cdr xs))]))]))
-
-(: bf/ (Bigfloat Bigfloat * -> Bigfloat))
-(define (bf/ x . xs)
-  (cond [(null? xs)  (bfdiv (bf 1) x)]
-        [else  (bfdiv x (apply bf* xs))]))
-
-(: bfmin (Bigfloat * -> Bigfloat))
-(define (bfmin . xs)
-  (cond [(null? xs)  (bf +inf.0)]
-        [else  (foldl bfmin2 (car xs) (cdr xs))]))
-
-(: bfmax (Bigfloat * -> Bigfloat))
-(define (bfmax . xs)
-  (cond [(null? xs)  (bf -inf.0)]
-        [else  (foldl bfmax2 (car xs) (cdr xs))]))
-
-(: fold-binary-pred (All (A) ((A A -> Boolean) A (Listof A) -> Boolean)))
-(define (fold-binary-pred pred? x xs)
-  (let loop ([x x] [xs xs])
-    (cond [(null? xs)  #t]
-          [else  (define fst-xs (car xs))
-                 (cond [(pred? x fst-xs)  (loop fst-xs (cdr xs))]
-                       [else  #f])])))
-
-(define-syntax-rule (define-nary-pred bfpred? bfpred2?)
-  (begin
-    (: bfpred? (Bigfloat Bigfloat * -> Boolean))
-    (define (bfpred? x . xs) (fold-binary-pred bfpred2? x xs))))
-
-(define-nary-pred bf=  bf=?)
-(define-nary-pred bf<  bflt?)
-(define-nary-pred bf<= bflte?)
-(define-nary-pred bf>  bfgt?)
-(define-nary-pred bf>= bfgte?)
-
-(: bfrandom (-> Bigfloat))
-(define (bfrandom)
-  (define bits (bf-precision))
-  (bf (random-bits bits) (- bits)))
-
-(: bigfloat->fl2 (Bigfloat -> (Values Flonum Flonum)))
-(define (bigfloat->fl2 x)
-  (define x2 (bigfloat->flonum x))
-  (cond [(rational? x2)
-         (let ([x2  (+ x2 (bigfloat->flonum (bf- x (flonum->bigfloat x2))))])
-           (cond [(rational? x2)
-                  (values x2 (bigfloat->flonum (bf- x (flonum->bigfloat x2))))]
-                 [else
-                  (values x2 0.0)]))]
-        [else  (values x2 0.0)]))
-
-(: fl2->bigfloat (Flonum Flonum -> Bigfloat))
-(define (fl2->bigfloat x2 x1)
-  (cond [(fl= x1 0.0)  (bf x2)]
-        [else  (bf+ (flonum->bigfloat x1) (flonum->bigfloat x2))]))
-
-(provide
- ;; Parameters
- bf-rounding-mode
- bf-min-precision
- bf-max-precision
- bf-precision
- ;; Type and predicate
- Bigfloat bigfloat?
- bfcanonicalize
- ;; Accessors
- bigfloat-precision
- bigfloat-signbit
- bigfloat-exponent
- bigfloat->sig+exp
- bigfloat-significand
- ;; Conversions
- sig+exp->bigfloat
- flonum->bigfloat
- integer->bigfloat
- rational->bigfloat
- real->bigfloat
- fl2->bigfloat
- string->bigfloat
- bigfloat->flonum
- bigfloat->integer
- bigfloat->rational
- bigfloat->real
- bigfloat->fl2
- bigfloat->string
- bigfloat->sig+exp
- ;; Main constructor
- bf
- ;; Functions with non-uniform types
- bffactorial
- bfbesj
- bfbesy
- bfshift
- bflog-gamma/sign
- bfrandom
- bfroot
- bigfloat->ordinal
- ordinal->bigfloat
- bigfloats-between
- bfstep
- bfnext
- bfprev
- ;; Function wrappers with Rackety APIs
- bf+
- bf-
- bf*
- bf/
- bfmin
- bfmax
- bf=
- bf<
- bf<=
- bf>
- bf>=)
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-struct.rkt
deleted file mode 100644
index 7db9870ecc..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-struct.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket/base
-
-(require "bigfloat-mpfr.rkt"
-         "bigfloat-syntax.rkt")
-
-(provide (all-from-out
-          "bigfloat-mpfr.rkt"
-          "bigfloat-syntax.rkt"))
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-syntax.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-syntax.rkt
deleted file mode 100644
index 08c14fb15f..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-syntax.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-
-(require (only-in "mpfr.rkt" consts 0ary-funs)
-         "bigfloat-constants.rkt"
-         racket/promise
-         (for-syntax racket/base racket/syntax syntax/strip-context))
-
-(define-syntax (req/prov-constants stx)
-  (syntax-case stx ()
-    [(_ module collection force)
-     (with-syntax ([require-it-name  (datum->syntax stx (gensym 'require-it))])
-       (syntax/loc stx
-         (begin
-           (define-syntax (require-it-name stx1)
-             (syntax-case stx1 ()
-               [(require-it-name)
-                (with-syntax* ([(name (... ...))  (replace-context #'require-it-name collection)]
-                               [(stx-name (... ...))  (map (λ (name) (format-id name "stx:~a" name))
-                                                           (syntax->list #'(name (... ...))))])
-                  #'(begin (require (only-in module name (... ...)))
-                           (define-syntax (stx-name stx)
-                             (syntax-case stx ()
-                               [(_ . args)  (syntax/loc stx ((force name) . args))]
-                               [_  (syntax/loc stx (force name))]))
-                           (... ...)
-                           (provide (rename-out [stx-name name] (... ...)))))]))
-           (require-it-name))))]))
-
-(define-syntax-rule (apply0 x) (x))
-
-(req/prov-constants "bigfloat-constants.rkt" consts force)
-(req/prov-constants "bigfloat-constants.rkt" 0ary-funs apply0)
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/gmp.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/gmp.rkt
deleted file mode 100644
index 080471aae5..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/gmp.rkt
+++ /dev/null
@@ -1,173 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         ffi/unsafe
-         ffi/unsafe/define
-         racket/runtime-path)
-
-(provide
- _mp_size_t
- _mp_limb_t
- _mp_bitcnt_t
- sizeof-mp_limb_t
- gmp-limb-bits
- _mpz
- _mpz-pointer
- (struct-out mpz)
- new-mpz
- integer->mpz
- mpz->integer
- ;; Low-level
- gmp-lib)
-
-;; ===================================================================================================
-;; Setup
-
-(define-runtime-path libgmp-so 
-  (case (system-type)
-    [(macosx) '(so "libgmp.10.dylib")]
-    [(windows) '(so "libgmp-10.dll")]
-    [else '(so "libgmp")]))
-
-(define gmp-lib (ffi-lib libgmp-so '("10" "3" "") #:fail (λ () #f)))
-
-(define (get-gmp-fun name type)
-  (get-ffi-obj name gmp-lib type (make-not-available name)))
-
-;; ===================================================================================================
-;; Types
-
-(define 64-bit? (= 8 (ctype-sizeof _intptr)))
-(define win64? (and 64-bit? (eq? (system-type) 'windows)))
-
-;; The Win64 build of libgmp is compiled using mingw64, for which GMP's configure script defines
-;; LONG_LONG_LIMB
-(define _mp_limb_t (if win64? _ullong _ulong))
-(define _mp_size_t _long)  ; used for limb counts
-(define _mp_bitcnt_t _ulong)
-
-(define sizeof-mp_limb_t (ctype-sizeof _mp_limb_t))
-
-;; Number of bits in a limb
-(define gmp-limb-bits (* 8 sizeof-mp_limb_t))
-;; We don't support "nail" builds, which haven't worked since before GMP 4.3 anyway (a "nail" takes
-;; two bits from each limb, and is supposed to speed up carries between limbs on certain systems)
-
-;; GMP's big integers
-(define-cstruct _mpz ([alloc _int] [size _int] [limbs _pointer]))
-
-;; ALWAYS let GMP manage the memory pointed at by the limbs field in an _mpz. It likes to reallocate
-;; limbs, particularly when the _mpz is an output argument.
-
-;; This means that _mpz instances take up memory that Racket can't account for, so they should only
-;; be used as temporary values. Possibly permanent values should be either instances of _mpfr or
-;; Racket's own exact integers.
-
-(define mpz-init (get-gmp-fun '__gmpz_init (_fun _mpz-pointer -> _void)))
-(define mpz-init2 (get-gmp-fun '__gmpz_init2 (_fun _mpz-pointer _mp_bitcnt_t -> _void)))
-(define mpz-clear (get-gmp-fun '__gmpz_clear (_fun _mpz-pointer -> _void)))
-
-;; new-mpz : [_mp_bitcnt_t] -> _mpz-pointer
-;; Creates an _mpz that is managed by the garbage collector, but whose limbs are not, and which is
-;; not relocatable. These are always safe to pass to mpz_* functions.
-(define (new-mpz [bits 0])
-  (define z (make-mpz 0 0 #f))
-  (if (= bits 0) (mpz-init z) (mpz-init2 z bits))
-  (register-finalizer z (λ (z) (mpz-clear z)))
-  z)
-
-;; ===================================================================================================
-;; Conversions
-
-(define mpz-get-si (get-gmp-fun '__gmpz_get_si (_fun _mpz-pointer -> _long)))
-(define mpz-fits-long? (get-gmp-fun '__gmpz_fits_slong_p (_fun _mpz-pointer -> _int)))
-
-;; integer->mpz : integer -> _mpz
-;; Converts a Racket integer to an _mpz.
-(define (integer->mpz n)
-  (define abs-n (abs n))
-  (define z (new-mpz (integer-length abs-n)))
-  (define len (mpz-alloc z))
-  (define limbs (mpz-limbs z))
-  (let loop ([i 0])
-    (when (i . < . len)
-      (define bit (* i gmp-limb-bits))
-      (ptr-set! limbs _mp_limb_t i (bitwise-bit-field abs-n bit (+ bit gmp-limb-bits)))
-      (loop (+ i 1))))
-  (define size (ceiling (/ (integer-length abs-n) gmp-limb-bits)))
-  (set-mpz-size! z (if (< n 0) (- size) size))
-  z)
-
-;; size+limbs->integer : integer (listof integer) -> integer
-;; Converts a size (which may be negative) and a limb list into an integer.
-(define (size+limbs->integer size limbs)
-  (define len (abs size))
-  (define num
-    (let loop ([i 0] [res  0])
-      (cond [(i . < . len)
-             (define v (ptr-ref limbs _mp_limb_t i))
-             (loop (+ i 1) (bitwise-ior res (arithmetic-shift v (* i gmp-limb-bits))))]
-            [else  res])))
-  (if (negative? size) (- num) num))
-
-;; mpz->integer : _mpz -> integer
-;; Converts an mpz_t to a Racket integer.
-(define (mpz->integer z)
-  (if (zero? (mpz-fits-long? z))
-      (size+limbs->integer (mpz-size z) (mpz-limbs z))
-      (mpz-get-si z)))
-
-;; ===================================================================================================
-;; Number Theoretic Functions
-;; http://gmplib.org/manual/Number-Theoretic-Functions.html#Number-Theoretic-Functions
-
-(define mpz-probab-prime-p 
-  (get-gmp-fun '__gmpz_probab_prime_p  (_fun _mpz-pointer _int -> _int)))
-
-(define (probably-prime n [repetitions 10])
-  (case (mpz-probab-prime-p (integer->mpz n) repetitions)
-    [(0) 'composite]
-    [(1) 'probably-prime]
-    [(2) 'prime]))
-
-(define (prime? n)
-  (case (probably-prime n)
-    [(probably-prime prime) #t]
-    [else #f]))
-
-(define mpz-nextprime
-  (get-gmp-fun '__gmpz_nextprime  (_fun _mpz-pointer _mpz-pointer -> _void)))
-
-(define (next-prime op)
-  (define result (new-mpz))
-  (mpz-nextprime result (integer->mpz op))
-  (mpz->integer result))
-
-(define mpz-invert
-  (get-gmp-fun '__gmpz_invert  (_fun _mpz-pointer _mpz-pointer _mpz-pointer -> _void)))
-
-(define (mod-inverse n modulus)
-  (define result (new-mpz))
-  (mpz-invert result (integer->mpz n) (integer->mpz modulus))
-  (mpz->integer result))
-
-(define mpz-jacobi
-  (get-gmp-fun '__gmpz_jacobi  (_fun _mpz-pointer _mpz-pointer -> _int)))
-
-(define (jacobi a b)
-  (mpz-jacobi (integer->mpz a) (integer->mpz b)))
-
-(define mpz-legendre
-  (get-gmp-fun '__gmpz_legendre  (_fun _mpz-pointer _mpz-pointer -> _int)))
-
-(define (legendre a b)
-  (mpz-legendre (integer->mpz a) (integer->mpz b)))
-
-(define mpz-remove
-  (get-gmp-fun '__gmpz_remove  (_fun _mpz-pointer _mpz-pointer _mpz-pointer -> _int)))
-
-(define (remove-factor z f)
-  (define result (new-mpz))
-  (define n (mpz-remove result (integer->mpz z) (integer->mpz f)))
-  (define z/f (mpz->integer result))
-  (values z/f n))
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/mpfr.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/mpfr.rkt
deleted file mode 100644
index 95b39074fc..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/mpfr.rkt
+++ /dev/null
@@ -1,1025 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         ffi/unsafe
-         ffi/unsafe/cvector
-         ffi/unsafe/custodian
-         ffi/unsafe/define
-         racket/math
-         racket/runtime-path
-         racket/promise
-         racket/serialize
-         "gmp.rkt"
-         "utils.rkt")
-
-(provide
- ;; Parameters
- bf-rounding-mode
- bf-min-precision
- bf-max-precision
- bf-precision
- ;; Type predicate
- (rename-out [mpfr? bigfloat?])
- bfcanonicalize
- ;; Accessors
- bigfloat-precision
- bigfloat-signbit
- bigfloat-exponent
- bigfloat-significand
- ;; Conversion to and from Real
- sig+exp->bigfloat
- flonum->bigfloat
- integer->bigfloat
- rational->bigfloat
- real->bigfloat
- bigfloat->sig+exp
- bigfloat->flonum
- bigfloat->integer
- bigfloat->rational
- bigfloat->real
- ;; String conversion
- bigfloat->string
- string->bigfloat
- ;; Main constructor
- bf
- bigfloat-deserialize-info
- ;; Low-level stuff
- mpfr-lib
- get-mpfr-fun
- _rnd_t
- _prec_t
- _sign_t
- _exp_t
- _mpfr_size_limb_t
- _mpfr
- _mpfr-pointer
- (struct-out mpfr))
-
-;; Arithmetic, comparison, and other functions are provided by the macros that create them
-
-;; ===================================================================================================
-;; Setup/takedown
-
-(define-runtime-path libmpfr-so
-  (case (system-type)
-    [(macosx) '(so "libmpfr.4.dylib")]
-    [(windows) '(so "libmpfr-4.dll")]
-    [else '(so "libmpfr")]))
-
-(define mpfr-lib (ffi-lib libmpfr-so '("4" "1" "") #:fail (λ () #f)))
-
-(define-syntax get-mpfr-fun
-  (syntax-rules ()
-    [(_ name type) (get-mpfr-fun name type (make-not-available name))]
-    [(_ name type fail-thunk) (get-ffi-obj name mpfr-lib type fail-thunk)]))
-
-(define mpfr-free-cache (get-mpfr-fun 'mpfr_free_cache (_fun -> _void)))
-
-(define mpfr-shutdown
-  (register-custodian-shutdown 
-   mpfr-free-cache ; acts as a "random" object for a shutdown handle
-   (λ (free) 
-     (when mpfr-lib
-       ;; The direct reference here is important, since custodian holds only
-       ;; a weak reference to shutdown handle:
-       (mpfr-free-cache)))))
-
-;; ===================================================================================================
-;; MPFR types
-
-;; Rounding modes (not all of them, just the useful/well-supported ones)
-(define _rnd_t (_enum '(nearest zero up down)))
-
-(define _prec_t _long)
-(define _sign_t _int)
-(define _exp_t _long)
-
-;; In mpfr-impl.h, this is a union of mp_size_t and mp_limb_t
-(define _mpfr_size_limb_t
-  (if (sizeof-mp_limb_t . > . (ctype-sizeof _mp_size_t)) _mp_limb_t _mp_size_t))
-
-(define sizeof-mpfr_size_limb_t (ctype-sizeof _mpfr_size_limb_t))
-
-(define sizeof-exp_t (ctype-sizeof _exp_t))
-
-;; ===================================================================================================
-;; Parameters: rounding mode, precision
-
-;; One of 'nearest 'zero 'up 'down
-(define bf-rounding-mode (make-parameter 'nearest))
-
-;; minimum precision (1 bit can't be rounded correctly)
-(define bf-min-precision 2)
-;; maximum precision (the number when longs are 64 bits is ridiculously large)
-(define bf-max-precision _long-max)
-
-(define bf-precision
-  (make-parameter 128 (λ (p) (cond [(p . < . bf-min-precision)  bf-min-precision]
-                                   [(p . > . bf-max-precision)  bf-max-precision]
-                                   [else  p]))))
-
-;; ===================================================================================================
-;; _mpfr type (bigfloat)
-
-(define (bigfloat-equal? x1 x2 _)
-  (or (and (bfnan? x1) (bfnan? x2))
-      (bf=? x1 x2)))
-
-(define (bitwise-first-bit-set b)
-  (if (zero? b)
-      -1
-      (let loop ([b b][pos 0])
-        (if (zero? (bitwise-and b 1))
-            (loop (arithmetic-shift b -1) (add1 pos))
-            pos))))
-
-(define (canonicalize-sig+exp sig exp)
-  (cond [(zero? sig)  (values 0 0)]
-        [else
-         (let-values ([(sgn sig)  (cond [(sig . < . 0)  (values -1 (- sig))]
-                                        [else           (values 1 sig)])])
-           (define shift (bitwise-first-bit-set sig))
-           (cond [(shift . > . 0)  (values (* sgn (arithmetic-shift sig (- shift)))
-                                           (+ exp shift))]
-                 [else  (values (* sgn sig) exp)]))]))
-
-(define (bfcanonicalize x)
-  (cond [(bfzero? x)  (if (zero? (bigfloat-signbit x)) (force 0.bf) (force -0.bf))]
-        [(bfnan? x)  (force +nan.bf)]
-        [(bfinfinite? x)  (if (zero? (bigfloat-signbit x)) (force +inf.bf) (force -inf.bf))]
-        [else
-         (let*-values ([(sig exp)  (bigfloat->sig+exp x)]
-                       [(sig exp)  (canonicalize-sig+exp sig exp)])
-           (parameterize ([bf-precision (integer-length sig)])
-             (sig+exp->bigfloat sig exp)))]))
-
-(define (bigfloat-hash x recur-hash)
-  (let*-values ([(x)  (bfcanonicalize x)]
-                [(sig exp)  (bigfloat->sig+exp x)])
-    (recur-hash (vector (bigfloat-signbit x) sig exp))))
-
-(define bigfloat-deserialize
-  (case-lambda
-    [(p x)
-     (unless (exact-integer? p)
-       (raise-argument-error 'bigfloat-deserialize "Integer" 0 p x))
-     (unless (or (string? x) (real? x))
-       (raise-argument-error 'bigfloat-deserialize "(U String Real)" 1 p x))
-     (parameterize ([bf-precision p])
-       (bf x))]
-    [(p sig exp)
-     (unless (exact-integer? p)
-       (raise-argument-error 'bigfloat-deserialize "Integer" 0 p sig exp))
-     (unless (exact-integer? sig)
-       (raise-argument-error 'bigfloat-deserialize "Integer" 1 p sig exp))
-     (unless (exact-integer? exp)
-       (raise-argument-error 'bigfloat-deserialize "Integer" 2 p sig exp))
-     (parameterize ([bf-precision p])
-       (sig+exp->bigfloat sig exp))]))
-
-(define bigfloat-deserialize-info
-  (make-deserialize-info
-   bigfloat-deserialize
-   #f))
-
-(define bigfloat-serialize-info
-  (make-serialize-info
-   (λ (x)
-     (cond [(bfzero? x)      (vector (bigfloat-precision x)
-                                     (if (zero? (bigfloat-signbit x)) 0.0 -0.0))]
-           [(bfnan? x)       (vector (bigfloat-precision x)
-                                     +nan.0)]
-           [(bfinfinite? x)  (vector (bigfloat-precision x)
-                                     (if (zero? (bigfloat-signbit x)) +inf.0 -inf.0))]
-           [else  (define-values (sig exp) (bigfloat->sig+exp (bfcanonicalize x)))
-                  (vector (bigfloat-precision x) sig exp)]))
-   #'bigfloat-deserialize-info
-   #f
-   (or (current-load-relative-directory) 
-       (current-directory))))
-
-;; _mpfr: a multi-precision float with rounding (the main data type)
-(define-cstruct _mpfr ([prec _prec_t] [sign _sign_t] [exp _exp_t] [d _gcpointer])
-  #:property prop:custom-print-quotable 'never
-  #:property prop:custom-write (λ (b port mode) (bigfloat-custom-write b port mode))
-  #:property prop:equal+hash (list bigfloat-equal? bigfloat-hash bigfloat-hash)
-  #:property prop:serializable bigfloat-serialize-info)
-
-;; ===================================================================================================
-;; Foreign functions
-
-(define mpfr-get-emin (get-mpfr-fun 'mpfr_get_emin (_fun -> _exp_t)))
-(define mpfr-get-emax (get-mpfr-fun 'mpfr_get_emax (_fun -> _exp_t)))
-
-;; Allocation/initialization
-(define mpfr-set-nan (get-mpfr-fun 'mpfr_set_nan (_fun _mpfr-pointer -> _void)))
-(define mpfr-init2 (get-mpfr-fun 'mpfr_init2 (_fun _mpfr-pointer _prec_t -> _void)))
-(define mpfr-clear (get-mpfr-fun 'mpfr_clear (_fun _mpfr-pointer -> _void)))
-;; A "special free" for strings allocated and returned by mpfr_get_str:
-(define mpfr-free-str (get-mpfr-fun 'mpfr_free_str (_fun _pointer -> _void)))
-
-;; Conversions from _mpfr to other types
-(define mpfr-get-d (get-mpfr-fun 'mpfr_get_d (_fun _mpfr-pointer _rnd_t -> _double)))
-(define mpfr-get-si (get-mpfr-fun 'mpfr_get_si (_fun _mpfr-pointer _rnd_t -> _long)))
-(define mpfr-get-z (get-mpfr-fun 'mpfr_get_z (_fun _mpz-pointer _mpfr-pointer _rnd_t -> _int)))
-(define mpfr-get-z-2exp
-  (get-mpfr-fun 'mpfr_get_z_2exp (_fun _mpz-pointer _mpfr-pointer -> _exp_t)
-                (λ () (get-mpfr-fun 'mpfr_get_z_exp
-                                    (_fun _mpz-pointer _mpfr-pointer -> _exp_t)))))
-(define mpfr-get-str
-  (get-mpfr-fun 'mpfr_get_str (_fun _pointer (_cpointer _exp_t) _int _ulong _mpfr-pointer _rnd_t
-                                    -> _bytes)))
-
-;; Conversions from other types to _mpfr
-(define mpfr-set (get-mpfr-fun 'mpfr_set (_fun _mpfr-pointer _mpfr-pointer _rnd_t -> _int)))
-(define mpfr-set-d (get-mpfr-fun 'mpfr_set_d  (_fun _mpfr-pointer _double _rnd_t -> _void)))
-(define mpfr-set-si (get-mpfr-fun 'mpfr_set_si (_fun _mpfr-pointer _long _rnd_t -> _void)))
-(define mpfr-set-z (get-mpfr-fun 'mpfr_set_z  (_fun _mpfr-pointer _mpz-pointer _rnd_t -> _void)))
-(define mpfr-set-str (get-mpfr-fun 'mpfr_set_str (_fun _mpfr-pointer _string _int _rnd_t -> _int)))
-
-;; Functions without simple or uniformly typed wrappers
-(define mpfr-nextabove (get-mpfr-fun 'mpfr_nextabove (_fun _mpfr-pointer -> _void)))
-(define mpfr-nextbelow (get-mpfr-fun 'mpfr_nextbelow (_fun _mpfr-pointer -> _void)))
-(define mpfr-jn (get-mpfr-fun 'mpfr_jn (_fun _mpfr-pointer _long _mpfr-pointer _rnd_t -> _int)))
-(define mpfr-yn (get-mpfr-fun 'mpfr_yn (_fun _mpfr-pointer _long _mpfr-pointer _rnd_t -> _int)))
-(define mpfr-root (get-mpfr-fun 'mpfr_root (_fun _mpfr-pointer _mpfr-pointer _ulong _rnd_t -> _int)))
-
-;; mpfr-set-z-exp : _mpfr _mpz integer _rnd_t -> _int
-;; Reimplementation of mpfr_set_z_2exp in Racket, used for older versions of MPFR that don't have it
-(define (mpfr-set-z-exp x z e rnd)
-  (define inex (mpfr-set-z x z rnd))
-  (cond
-    [(or (bfzero? x) (not (bfrational? x)))
-     ;; Zeros and non-rational numbers have exponents outside the range [emin..emax], which MPFR
-     ;; nevertheless recognizes as valid. Adding `e' to the exponent of one of those would result in
-     ;; an invalid exponent, for which MPFR would raise an assertion failure that would crash Racket.
-     inex]
-    [else
-     ;; Fix up the exponent
-     (let ([e  (+ (mpfr-exp x) e)])
-       ;; Check the exponent against its valid range; return sensible stuff if it's out of range
-       (cond [(e . > . (mpfr-get-emax))
-              (if ((mpfr-sign x) . >= . 0)
-                  (mpfr-set-d x +inf.0 'zero)
-                  (mpfr-set-d x -inf.0 'zero))
-              0]
-             [(e . < . (mpfr-get-emin))
-              (if ((mpfr-sign x) . >= . 0)
-                  (mpfr-set-d x +0.0 'zero)
-                  (mpfr-set-d x -0.0 'zero))
-              0]
-             [else
-              (set-mpfr-exp! x e)
-              inex]))]))
-
-(define mpfr-set-z-2exp
-  (get-mpfr-fun 'mpfr_set_z_2exp (_fun _mpfr-pointer _mpz-pointer _exp_t _rnd_t -> _int)
-                (λ () mpfr-set-z-exp)))
-
-;; ===================================================================================================
-;; Construction
-
-#|
-We always create _mpfr instances using new-mpfr, which uses Racket's memory management for the limbs.
-In doing so, we assume that no mpfr_* function will ever try to reallocate limbs. This is a good
-assumption because an _mpfr's precision is fixed from when it's allocated to when it's deallocated.
-There's no reason to allocate new limbs for an _mpfr without changing its precision.
-|#
-
-;; raw-mpfr : integer -> bigfloat
-;; Creates and initializes an _mpfr instance using MPFR's memory management. This function exists
-;; mostly for documentation purposes. It's a simpler version of `new-mpfr'.
-;; It's a bad idea to use `raw-mpfr' for long-lived _mpfr objects. Racket can't track the memory used
-;; by the limbs of an _mpfr object constructed using `mpfr-init2', meaning that it would think it
-;; uses less memory than it actually does.
-(define (raw-mpfr prec)
-  (define x (make-mpfr 0 0 0 #f))
-  (mpfr-init2 x prec)
-  (register-finalizer x (λ (x) (mpfr-clear x)))
-  x)
-
-;; Reimplementation of `mpfr-init2' starts here
-
-;; mpfr-prec->limbs : integer -> integer
-;; Reimplementation of MPFR_PREC2LIMBS
-(define (mpfr-prec->limbs prec)
-  (+ 1 (quotient (- prec 1) gmp-limb-bits)))
-
-;; mpfr-malloc-size : integer -> integer
-;; Reimplementation of MPFR_MALLOC_SIZE
-(define (mpfr-malloc-size n)
-  (+ sizeof-mpfr_size_limb_t (* sizeof-mp_limb_t n)))
-
-;; Reimplementation of MPFR_EXP_INVALID
-(define mpfr-exp-invalid
-  (arithmetic-shift 1 (- (quotient (* gmp-limb-bits sizeof-exp_t) sizeof-mp_limb_t) 2)))
-
-;; mpfr-set-alloc-size! : pointer integer -> void
-;; Reimplementation of MPFR_SET_ALLOC_SIZE
-(define (mpfr-set-alloc-size! d n)
-  (ptr-set! d _mp_size_t -1 n))
-
-;; new-mpfr : integer -> bigfloat
-;; Creates a new _mpfr instance and initializes it, mimicking `mpfr-init2'.
-(define (new-mpfr prec)
-  (define n (mpfr-prec->limbs prec))
-  ;; Allocate d so it won't be traced (atomic) or moved (interior)
-  (define orig-d (malloc (mpfr-malloc-size n) 'atomic-interior))
-  ;; An _mpfr object points at the second element of its limbs array, and uses the first element
-  ;; to store its size, so shift the pointer
-  (define d (ptr-add orig-d 1 _mpfr_size_limb_t))
-  ;; Setting the size after shifting the pointer because that's what `mpfr-init2' does...
-  (mpfr-set-alloc-size! d n)
-  ;; Make an _mpfr object managed by Racket
-  (define x (make-mpfr prec 0 mpfr-exp-invalid d))
-  ;; Use a finalizer to keep a reference to orig-d as long as x is alive (equiv. to tracing x, if
-  ;; the value of d pointed at a Racket object)
-  (register-finalizer x (λ (x) orig-d))
-  ;; Set +nan.bf because that's what `mpfr-init2' does...
-  (mpfr-set-nan x)
-  x)
-
-;; ===================================================================================================
-;; Accessors
-
-;; bigfloat-precision : bigfloat -> integer
-;; Returns the maximum number of nonzero bits in the significand.
-(define bigfloat-precision mpfr-prec)
-
-;; bigfloat-signbit : bigfloat -> fixnum
-;; Returns the sign bit of a bigfloat.
-(define (bigfloat-signbit x)
-  (if ((mpfr-sign x) . < . 0) 1 0))
-
-;; bigfloat-exponent : bigfloat -> integer
-;; Returns the exponent part of a bigfloat.
-(define (bigfloat-exponent x)
-  (- (mpfr-exp x) (bigfloat-precision x)))
-
-;; bigfloat->sig+exp : bigfloat -> integer integer
-;; Returns the signed significand and exponent of a bigfloat.
-(define (bigfloat->sig+exp x)
-  (define z (new-mpz))
-  (define exp (mpfr-get-z-2exp z x))
-  (values (mpz->integer z) exp))
-
-;; bigfloat-significand : bigfloat -> integer
-;; Returns just the signed significand of a bigfloat.
-(define (bigfloat-significand x)
-  (define-values (sig exp) (bigfloat->sig+exp x))
-  sig)
-
-;; ===================================================================================================
-;; Conversion from Racket data types to bigfloat
-
-;; sig+exp->bigfloat : integer integer -> bigfloat
-(define (sig+exp->bigfloat n e)
-  (define y (new-mpfr (bf-precision)))
-  (mpfr-set-z-2exp y (integer->mpz n) e (bf-rounding-mode))
-  y)
-
-;; flonum->bigfloat : float -> bigfloat
-;; Converts a Racket inexact real to a bigfloat; rounds if bf-precision < 53.
-(define (flonum->bigfloat value)
-  (define x (new-mpfr (bf-precision)))
-  (mpfr-set-d x value (bf-rounding-mode))
-  x)
-
-;; integer->bigfloat : integer -> bigfloat
-;; Converts a Racket integer to a bigfloat; rounds if necessary.
-(define (integer->bigfloat value)
-  (define x (new-mpfr (bf-precision)))
-  (if (_long? value)
-      (mpfr-set-si x value (bf-rounding-mode))
-      (mpfr-set-z x (integer->mpz value) (bf-rounding-mode)))
-  x)
-
-(define (round/mode q)
-  (case (bf-rounding-mode)
-    [(up)    (ceiling q)]
-    [(down)  (floor q)]
-    [(zero)  (truncate q)]
-    [else    (round q)]))
-
-(define (floor-log2 n) (max 0 (sub1 (integer-length n))))
-(define (ceiling-log2 n) (max 0 (integer-length (sub1 n))))
-
-(define (log2-lower-bound q)
-  (- (floor-log2 (numerator q))
-     (ceiling-log2 (denominator q))))
-
-(define (log2-upper-bound q)
-  (- (ceiling-log2 (numerator q))
-     (floor-log2 (denominator q))))
-
-;; rational->bigfloat : rational -> bigfloat
-;; Converts a Racket rational to a bigfloat; rounds if necessary.
-(define (rational->bigfloat q)
-  (define prec (bf-precision))
-  (define sgn-q (sgn q))
-  (define abs-q (abs q))
-  (define ipart (floor abs-q))
-  (cond [(zero? sgn-q)  (sig+exp->bigfloat 0 0)]
-        [(zero? ipart)
-         (define e-ub (- (log2-upper-bound abs-q) prec))
-         (define e-lb (- (log2-lower-bound abs-q) prec))
-         (let loop ([e  e-ub])
-           (define 2^-e (arithmetic-shift 1 (- e)))
-           (define sig (round/mode (* sgn-q abs-q 2^-e)))
-           (cond [(or (= e e-lb) (= prec (integer-length (abs sig))))
-                  (sig+exp->bigfloat sig e)]
-                 [else
-                  (loop (- e 1))]))]
-        [else
-         (define e (- (integer-length ipart) prec))
-         (define 2^-e (cond [(e . < . 0)  (arithmetic-shift 1 (- e))]
-                            [else  (/ 1 (arithmetic-shift 1 e))]))
-         (define sig (round/mode (* sgn-q abs-q 2^-e)))
-         (sig+exp->bigfloat sig e)]))
-
-;; real->bigfloat : real -> bigfloat
-;; Converts any real Racket value to a bigfloat; rounds if necessary.
-(define (real->bigfloat value)
-  (cond [(inexact? value)  (flonum->bigfloat value)]
-        [(integer? value)  (integer->bigfloat value)]
-        [else  (rational->bigfloat value)]))
-
-;; ===================================================================================================
-;; Conversion from mpfr_t to Racket data types
-
-;; bigfloat->flonum : bigfloat -> float
-;; Converts a bigfloat to a Racket float; rounds if necessary.
-(define (bigfloat->flonum x)
-  (mpfr-get-d x (bf-rounding-mode)))
-
-;; bigfloat->integer : bigfloat -> integer
-;; Converts a bigfloat to a Racket integer; rounds if necessary.
-(define (bigfloat->integer x)
-  (unless (bfinteger? x) (raise-argument-error 'bigfloat->integer "bfinteger?" x))
-  (define z (new-mpz))
-  (mpfr-get-z z x (bf-rounding-mode))
-  (define res (mpz->integer z))
-  res)
-
-;; bigfloat->rational : bigfloat -> rational
-;; Converts a bigfloat to a Racket rational; does not round.
-(define (bigfloat->rational x)
-  (unless (bfrational? x) (raise-argument-error 'bigfloat->rational "bfrational?" x))
-  (define-values (sig exp) (bigfloat->sig+exp x))
-  (cond [(zero? sig)  0]  ; without this, (bigfloat->rational 0.bf) chews up half a gigabyte
-        [else  (* sig (expt 2 exp))]))
-
-; bigfloat->real : bigfloat -> (or exact-rational flonum)
-(define (bigfloat->real x)
-  (cond [(bfrational? x)  (bigfloat->rational x)]
-        [else  (bigfloat->flonum x)]))
-
-;; ===================================================================================================
-;; String conversions
-
-(define (mpfr-get-string x base rnd)
-  (define exp-ptr (cast (malloc _exp_t 'atomic-interior) _pointer (_cpointer _exp_t)))
-  (define bs (mpfr-get-str #f exp-ptr base 0 x rnd))
-  (define exp (ptr-ref exp-ptr _exp_t))
-  (define str (bytes->string/utf-8 bs))
-  (mpfr-free-str bs)
-  (values exp str))
-
-(define (remove-trailing-zeros str)
-  (let loop ([i  (string-length str)])
-    (cond [(zero? i)  "0"]
-          [(char=? #\0 (string-ref str (sub1 i)))  (loop (sub1 i))]
-          [(char=? #\. (string-ref str (sub1 i)))  (substring str 0 (sub1 i))]
-          [else  (substring str 0 i)])))
-
-(define (scientific-string exp str)
-  (define n (string-length str))
-  (cond [(= n 0)  "0"]
-        [else
-         (define sig (remove-trailing-zeros (format "~a.~a" (substring str 0 1) (substring str 1))))
-         (if (= exp 1) sig (format "~ae~a" sig (number->string (- exp 1))))]))
-
-(define (decimal-string-length exp digs)
-  (cond [(exp . > . (string-length digs))
-         (+ (string-length digs) (- exp (string-length digs)))]
-        [(exp . <= . 0)
-         (let ([digs  (remove-trailing-zeros digs)])
-           (cond [(equal? digs "0")  1]
-                 [else  (+ 2 (- exp) (string-length digs))]))]
-        [else
-         (string-length
-          (remove-trailing-zeros
-           (string-append (substring digs 0 exp) "." (substring digs exp))))]))
-
-(define (decimal-string exp digs)
-  (cond [(exp . > . (string-length digs))
-         (string-append digs (make-string (- exp (string-length digs)) #\0))]
-        [(exp . <= . 0)
-         (remove-trailing-zeros
-          (string-append "0." (make-string (- exp) #\0) digs))]
-        [else
-         (remove-trailing-zeros
-          (string-append (substring digs 0 exp) "." (substring digs exp)))]))
-
-;; Converts a bigfloat to a Racket string of digits, with a decimal point.
-;; Outputs enough digits to exactly recreate the bigfloat using string->bigfloat.
-(define (bigfloat->string x)
-  (cond
-    [(bfzero? x)  (if (= 0 (bigfloat-signbit x)) "0.0" "-0.0")]
-    [(bfinfinite? x)  (if (= 0 (bigfloat-signbit x)) "+inf.bf" "-inf.bf")]
-    [(bfnan? x)   "+nan.bf"]
-    [else
-     (define-values (exp str) (mpfr-get-string x 10 'nearest))
-     (cond
-       [(not str)  (error 'bigfloat->string "string conversion failed for ~e"
-                          (number->string (bigfloat->rational x)))]
-       [else
-        (define-values (sign digs)
-          (if (char=? (string-ref str 0) #\-)
-              (values "-" (substring str 1))
-              (values "" str)))
-        (define sstr (scientific-string exp digs))
-        (define dlen (decimal-string-length exp digs))
-        (cond [((string-length sstr) . < . dlen)  (string-append sign sstr)]
-              [else  (string-append sign (decimal-string exp digs))])])]))
-
-;; string->bigfloat : string [integer] -> bigfloat
-;; Converts a Racket string to a bigfloat.
-(define (string->bigfloat str)
-  (case str
-    [("-inf.bf" "-inf.0" "-inf.f")  (force -inf.bf)]
-    [("-1.bf")  (force -1.bf)]
-    [("-0.bf")  (force -0.bf)]
-    [( "0.bf")  (force  0.bf)]
-    [( "1.bf")  (force  1.bf)]
-    [("+inf.bf" "+inf.0" "+inf.f")  (force +inf.bf)]
-    [("+nan.bf" "+nan.0" "+nan.f")  (force +nan.bf)]
-    [else
-     (define y (new-mpfr (bf-precision)))
-     (define bs (string->bytes/utf-8 str))
-     (if (zero? (mpfr-set-str y bs 10 'nearest)) y #f)]))
-
-(define (bigfloat-custom-write x port mode)
-  (cond
-    [(and mpfr-lib gmp-lib)
-     ;; Only try to print if libmpfr was loaded; otherwise, we get an infinite loop when the
-     ;; `make-not-available' handler tries to print any _mpfr arguments
-     (write-string
-      (cond [(bfzero? x)  (if (= 0 (bigfloat-signbit x)) "0.bf" "-0.bf")]
-            [(bfrational? x)
-             (define str (bigfloat->string x))
-             (cond [(regexp-match #rx"\\.|e" str)
-                    (define exp (bigfloat-exponent x))
-                    (define prec (bigfloat-precision x))
-                    (if ((abs exp) . > . (* prec 2))
-                        (format "(bf \"~a\")" str)
-                        (format "(bf #e~a)" str))]
-                   [else  (format "(bf ~a)" str)])]
-            [(bfinfinite? x)  (if (= 0 (bigfloat-signbit x)) "+inf.bf" "-inf.bf")]
-            [else  "+nan.bf"])
-      port)]
-    [else
-     (write-string "#<_mpfr>" port)]))
-
-;; ===================================================================================================
-;; Main bigfloat constructor
-
-;; bf : (or real string) -> bigfloat
-;;    : integer integer -> bigfloat
-(define bf
-  (case-lambda
-    [(v)  (cond [(string? v)
-                 (define x (string->bigfloat v))
-                 (if x x (error 'bf "expected well-formed decimal number; given ~e" v))]
-                [else
-                 (real->bigfloat v)])]
-    [(n e)  (sig+exp->bigfloat n e)]))
-
-;; ===================================================================================================
-;; Unary functions
-
-(define-for-syntax 1ary-funs (list))
-(provide (for-syntax 1ary-funs))
-
-(define-syntax-rule (provide-1ary-fun name c-name)
-  (begin
-    (define cfun (get-mpfr-fun c-name (_fun _mpfr-pointer _mpfr-pointer _rnd_t -> _int)))
-    (define (name x)
-      (define y (new-mpfr (bf-precision)))
-      (cfun y x (bf-rounding-mode))
-      y)
-    (provide name)
-    (begin-for-syntax (set! 1ary-funs (cons #'name 1ary-funs)))))
-
-(define-syntax-rule (provide-1ary-funs [name c-name] ...)
-  (begin (provide-1ary-fun name c-name) ...))
-
-(provide-1ary-funs
- [bfsqr 'mpfr_sqr]
- [bfsqrt 'mpfr_sqrt]
- [bf1/sqrt 'mpfr_rec_sqrt]
- [bfcbrt 'mpfr_cbrt]
- [bfneg 'mpfr_neg]
- [bfabs 'mpfr_abs]
- [bflog 'mpfr_log]
- [bflog2 'mpfr_log2]
- [bflog10 'mpfr_log10]
- [bflog1p 'mpfr_log1p]
- [bfexp 'mpfr_exp]
- [bfexp2 'mpfr_exp2]
- [bfexp10 'mpfr_exp10]
- [bfexpm1 'mpfr_expm1]
- [bfcos 'mpfr_cos]
- [bfsin 'mpfr_sin]
- [bftan 'mpfr_tan]
- [bfsec 'mpfr_sec]
- [bfcsc 'mpfr_csc]
- [bfcot 'mpfr_cot]
- [bfacos 'mpfr_acos]
- [bfasin 'mpfr_asin]
- [bfatan 'mpfr_atan]
- [bfcosh 'mpfr_cosh]
- [bfsinh 'mpfr_sinh]
- [bftanh 'mpfr_tanh]
- [bfsech 'mpfr_sech]
- [bfcsch 'mpfr_csch]
- [bfcoth 'mpfr_coth]
- [bfacosh 'mpfr_acosh]
- [bfasinh 'mpfr_asinh]
- [bfatanh 'mpfr_atanh]
- [bfeint 'mpfr_eint]
- [bfli2 'mpfr_li2]
- [bfgamma 'mpfr_gamma]
- [bfpsi0 'mpfr_digamma]
- [bfzeta 'mpfr_zeta]
- [bferf 'mpfr_erf]
- [bferfc 'mpfr_erfc]
- [bfbesj0 'mpfr_j0]
- [bfbesj1 'mpfr_j1]
- [bfbesy0 'mpfr_y0]
- [bfbesy1 'mpfr_y1]
- [bfrint 'mpfr_rint]
- [bffrac 'mpfr_frac]
- [bfcopy 'mpfr_set])
-
-(begin-for-syntax
-  (set! 1ary-funs (remove* (list #'bfneg) 1ary-funs free-identifier=?)))
-
-(define (bfsgn x)
-  (cond [(bfzero? x)  x]
-        [(= 0 (bigfloat-signbit x))  (force 1.bf)]
-        [else  (force -1.bf)]))
-
-(define (bfround x)
-  (parameterize ([bf-rounding-mode  'nearest])
-    (bfrint x)))
-
-(provide bfsgn bfround)
-(begin-for-syntax
-  (set! 1ary-funs (list* #'bfsgn #'bfround 1ary-funs)))
-
-(define mpfr-fac-ui (get-mpfr-fun 'mpfr_fac_ui (_fun _mpfr-pointer _ulong _rnd_t -> _int)))
-
-(define (bffactorial n)
-  (cond [(n . < . 0)  (raise-argument-error 'bffactorial "Natural" n)]
-        [(n . > . 100000000)  (force +inf.bf)]
-        [else  (define y (new-mpfr (bf-precision)))
-               (mpfr-fac-ui y n (bf-rounding-mode))
-               y]))
-
-(provide bffactorial)
-
-(define mpfr-sum (get-mpfr-fun 'mpfr_sum (_fun _mpfr-pointer (_list i _mpfr-pointer) _ulong
-                                               _rnd_t -> _int)))
-
-(define (bfsum xs)
-  (define y (new-mpfr (bf-precision)))
-  (mpfr-sum y xs (length xs) (bf-rounding-mode))
-  y)
-
-(provide bfsum)
-
-(define-syntax-rule (provide-1ary-fun/noround name c-name)
-  (begin
-    (define cfun (get-mpfr-fun c-name (_fun _mpfr-pointer _mpfr-pointer _rnd_t -> _int)))
-    (define (name x)
-      (define y (new-mpfr (bf-precision)))
-      (cfun y x (bf-rounding-mode))
-      y)
-    (provide name)
-    (begin-for-syntax (set! 1ary-funs (cons #'name 1ary-funs)))))
-
-(define-syntax-rule (provide-1ary-funs/noround [name c-name] ...)
-  (begin (provide-1ary-fun/noround name c-name) ...))
-
-(provide-1ary-funs/noround
- [bfceiling 'mpfr_ceil]
- [bffloor 'mpfr_floor]
- [bftruncate 'mpfr_trunc])
-
-(define-for-syntax 1ary2-funs (list))
-(provide (for-syntax 1ary2-funs))
-
-(define-syntax-rule (provide-1ary2-fun name c-name)
-  (begin
-    (define cfun
-      (get-mpfr-fun c-name (_fun _mpfr-pointer _mpfr-pointer _mpfr-pointer _rnd_t -> _int)))
-    (define (name x)
-      (define y (new-mpfr (bf-precision)))
-      (define z (new-mpfr (bf-precision)))
-      (cfun y z x (bf-rounding-mode))
-      (values y z))
-    (provide name)
-    (begin-for-syntax (set! 1ary2-funs (cons #'name 1ary2-funs)))))
-
-(define-syntax-rule (provide-1ary2-funs [name c-name] ...)
-  (begin (provide-1ary2-fun name c-name) ...))
-
-(provide-1ary2-funs
- [bfsin+cos 'mpfr_sin_cos]
- [bfsinh+cosh 'mpfr_sinh_cosh]
- [bfmodf 'mpfr_modf])
-
-(define mpfr-lgamma
-  (get-mpfr-fun 'mpfr_lgamma (_fun _mpfr-pointer _pointer _mpfr-pointer _rnd_t -> _int)))
-
-(define (bflog-gamma/sign x)
-  (define y (new-mpfr (bf-precision)))
-  (define s (malloc _int 'atomic-interior))
-  (mpfr-lgamma y s x (bf-rounding-mode))
-  (values y (ptr-ref s _int)))
-
-(define (bflog-gamma x)
-  (define-values (y _) (bflog-gamma/sign x))
-  y)
-
-(provide bflog-gamma/sign bflog-gamma)
-(begin-for-syntax
-  (set! 1ary-funs (list* #'bflog-gamma 1ary-funs)))
-
-;; ===================================================================================================
-;; Unary predicates
-
-(define-for-syntax 1ary-preds (list))
-(provide (for-syntax 1ary-preds))
-
-(define-syntax-rule (provide-1ary-pred name c-name)
-  (begin
-    (define cfun (get-mpfr-fun c-name (_fun _mpfr-pointer -> _int)))
-    (define (name x) (not (zero? (cfun x))))
-    (provide name)
-    (begin-for-syntax (set! 1ary-preds (cons #'name 1ary-preds)))))
-
-(define-syntax-rule (provide-1ary-preds [name c-name] ...)
-  (begin (provide-1ary-pred name c-name) ...))
-
-(provide-1ary-preds
- [bfnan?  'mpfr_nan_p]
- [bfinfinite?  'mpfr_inf_p]
- [bfrational? 'mpfr_number_p]
- [bfinteger? 'mpfr_integer_p]
- [bfzero? 'mpfr_zero_p])
-
-(define (bfpositive? x)
-  (bfgt? x (force 0.bf)))
-
-(define (bfnegative? x)
-  (bflt? x (force 0.bf)))
-
-(define (bfeven? x)
-  (and (bfinteger? x) (even? (bigfloat->integer x))))
-
-(define (bfodd? x)
-  (and (bfinteger? x) (odd? (bigfloat->integer x))))
-
-(provide bfpositive? bfnegative? bfeven? bfodd?)
-(begin-for-syntax
-  (set! 1ary-preds (append (list #'bfpositive? #'bfnegative? #'bfeven? #'bfodd?)
-                           1ary-preds)))
-
-;; ===================================================================================================
-;; Binary functions
-
-(define-for-syntax 2ary-funs (list))
-(provide (for-syntax 2ary-funs))
-
-(define-syntax-rule (provide-2ary-fun name c-name)
-  (begin
-    (define cfun
-      (get-mpfr-fun c-name (_fun _mpfr-pointer _mpfr-pointer _mpfr-pointer _rnd_t -> _int)))
-    (define (name x1 x2)
-      (define y (new-mpfr (bf-precision)))
-      (cfun y x1 x2 (bf-rounding-mode))
-      y)
-    (provide name)
-    (begin-for-syntax (set! 2ary-funs (cons #'name 2ary-funs)))))
-
-(define-syntax-rule (provide-2ary-funs [name c-name] ...)
-  (begin (provide-2ary-fun name c-name) ...))
-
-(provide-2ary-funs
- [bfadd 'mpfr_add]
- [bfsub 'mpfr_sub]
- [bfmul 'mpfr_mul]
- [bfdiv 'mpfr_div]
- [bfremainder 'mpfr_fmod]  ; this may not be right
- [bfexpt 'mpfr_pow]
- [bfmax2 'mpfr_max]
- [bfmin2 'mpfr_min]
- [bfatan2 'mpfr_atan2]
- [bfhypot 'mpfr_hypot]
- [bfagm 'mpfr_agm])
-
-(begin-for-syntax
-  (set! 2ary-funs (remove* (list #'bfadd #'bfsub #'bfmul #'bfdiv #'bfmax2 #'bfmin2)
-                           2ary-funs
-                           free-identifier=?)))
-
-(define (bfbesj n x)
-  (unless (_long? n) (raise-argument-error 'bfbesj "_long?" 0 n x))
-  (define y (new-mpfr (bf-precision)))
-  (mpfr-jn y n x (bf-rounding-mode))
-  y)
-
-(define (bfbesy n x)
-  (unless (_long? n) (raise-argument-error 'bfbesy "_long?" 0 n x))
-  (define y (new-mpfr (bf-precision)))
-  (mpfr-yn y n x (bf-rounding-mode))
-  y)
-
-(define (bfroot x n)
-  (unless (and (_ulong? n) (n . >= . 0)) (raise-argument-error 'bfroot "_ulong?" 1 x n))
-  (define y (new-mpfr (bf-precision)))
-  (mpfr-root y x n (bf-rounding-mode))
-  y)
-
-(define (bfnext x)
-  (define y (bfcopy x))
-  (mpfr-nextabove y)
-  y)
-
-(define (bfprev x)
-  (define y (bfcopy x))
-  (mpfr-nextbelow y)
-  y)
-
-(define (bfshift x n)
-  (unless (fixnum? n) (raise-argument-error 'bfshift "Fixnum" 1 x n))
-  (cond [(bfzero? x)  x]
-        [(not (bfrational? x))  x]
-        [else  (define-values (sig exp) (bigfloat->sig+exp x))
-               (bf sig (+ n exp))]))
-
-(define (infinite-ordinal p)
-  (+ 1 (arithmetic-shift #b1111111111111111111111111111111 (- p 1))))
-
-(define (bigfloat->ordinal x)
-  (cond [(bfzero? x)  0]
-        [else
-         (define p (bf-precision))
-         (let loop ([x  (bfcopy x)])
-           (cond [(bfnegative? x)  (- (loop (bfneg x)))]
-                 [(bfinfinite? x)  (infinite-ordinal p)]
-                 [(bfnan? x)  (+ 1 (infinite-ordinal p))]
-                 [else
-                  (define-values (sig exp) (bigfloat->sig+exp x))
-                  (+ 1 (bitwise-ior (arithmetic-shift (+ exp (- p (mpfr-get-emin))) (- p 1))
-                                    (bitwise-xor (arithmetic-shift 1 (- p 1)) sig)))]))]))
-
-(define (ordinal->bigfloat n)
-  (define p (bf-precision))
-  (cond [(zero? n)  (bf 0)]
-        [(negative? n)  (bfneg (ordinal->bigfloat (- n)))]
-        [(n . > . (infinite-ordinal p))  (force +nan.bf)]
-        [else
-         (let ([n  (- n 1)])
-           (define exp (- (arithmetic-shift n (- 1 p)) (- p (mpfr-get-emin))))
-           (define high-bit (arithmetic-shift 1 (- p 1)))
-           (define sig (bitwise-ior high-bit (bitwise-and n (- high-bit 1))))
-           (bf sig exp))]))
-
-(define (bigfloats-between x y)
-  (- (bigfloat->ordinal y) (bigfloat->ordinal x)))
-  
-(define (bfstep x n)
-  (cond [(or (bfnan? x) (= n 0))  x]
-        [else
-         (let loop ([x  (bfcopy x)] [n n])
-           (cond [(negative? n)  (bfneg (loop (bfneg x) (- n)))]
-                 [(bfinfinite? x)
-                  (cond [(bfpositive? x)  x]
-                        [else  (loop (bfnext x) (- n 1))])]
-                 [else
-                  (define p (bf-precision))
-                  (define i (+ n (bigfloat->ordinal x)))
-                  (cond [(and (i . > . 0) (i . > . (infinite-ordinal p)))  (force +inf.bf)]
-                        [else  (ordinal->bigfloat i)])]))]))
-
-(provide bfbesj bfbesy bfroot
-         bigfloat->ordinal ordinal->bigfloat bigfloats-between bfshift bfstep bfprev bfnext)
-
-;; ===================================================================================================
-;; Binary predicates
-
-(define-syntax-rule (provide-2ary-pred name c-name)
-  (begin (define cfun (get-mpfr-fun c-name (_fun _mpfr-pointer _mpfr-pointer -> _int)))
-         (define (name x1 x2)
-           (not (zero? (cfun x1 x2))))
-         (provide name)))
-
-(define-syntax-rule (provide-2ary-preds [name c-name] ...)
-  (begin (provide-2ary-pred name c-name) ...))
-
-(provide-2ary-preds
- [bf=? 'mpfr_equal_p]
- [bflt?  'mpfr_less_p]
- [bflte? 'mpfr_lessequal_p]
- [bfgt?  'mpfr_greater_p]
- [bfgte? 'mpfr_greaterequal_p])
-
-;; ===================================================================================================
-;; Constants and variable-precision constants (i.e. 0-ary functions)
-
-(define-for-syntax consts (list))
-(provide (for-syntax consts))
-
-(define-syntax-rule (define-bf-constant name prec expr)
-  (begin
-    (define name (lazy (parameterize ([bf-precision  prec]) expr)))
-    (provide name)
-    (begin-for-syntax
-      (set! consts (cons #'name consts)))))
-
-(define-bf-constant -inf.bf 2 (flonum->bigfloat -inf.0))
-(define-bf-constant -0.bf   2 (flonum->bigfloat -0.0))
-(define-bf-constant  0.bf   2 (flonum->bigfloat  0.0))
-(define-bf-constant +inf.bf 2 (flonum->bigfloat +inf.0))
-(define-bf-constant +nan.bf 2 (flonum->bigfloat +nan.0))
-
-(define-bf-constant 1.bf 4 (flonum->bigfloat 1.0))
-(define-bf-constant 2.bf 4 (flonum->bigfloat 2.0))
-(define-bf-constant 3.bf 4 (flonum->bigfloat 3.0))
-(define-bf-constant 4.bf 4 (flonum->bigfloat 4.0))
-(define-bf-constant 5.bf 4 (flonum->bigfloat 5.0))
-(define-bf-constant 6.bf 4 (flonum->bigfloat 6.0))
-(define-bf-constant 7.bf 4 (flonum->bigfloat 7.0))
-(define-bf-constant 8.bf 4 (flonum->bigfloat 8.0))
-(define-bf-constant 9.bf 4 (flonum->bigfloat 9.0))
-(define-bf-constant 10.bf 4 (flonum->bigfloat 10.0))
-
-(define-bf-constant -1.bf 4 (flonum->bigfloat -1.0))
-(define-bf-constant -2.bf 4 (flonum->bigfloat -2.0))
-(define-bf-constant -3.bf 4 (flonum->bigfloat -3.0))
-(define-bf-constant -4.bf 4 (flonum->bigfloat -4.0))
-(define-bf-constant -5.bf 4 (flonum->bigfloat -5.0))
-(define-bf-constant -6.bf 4 (flonum->bigfloat -6.0))
-(define-bf-constant -7.bf 4 (flonum->bigfloat -7.0))
-(define-bf-constant -8.bf 4 (flonum->bigfloat -8.0))
-(define-bf-constant -9.bf 4 (flonum->bigfloat -9.0))
-(define-bf-constant -10.bf 4 (flonum->bigfloat -10.0))
-
-(define-for-syntax 0ary-funs (list))
-(provide (for-syntax 0ary-funs))
-
-(define-syntax-rule (provide-0ary-fun name c-name)
-  (begin
-    (define cfun (get-mpfr-fun c-name (_fun _mpfr-pointer _rnd_t -> _int)))
-    (define (name)
-      (let ([y  (new-mpfr (bf-precision))])
-        (cfun y (bf-rounding-mode))
-        y))
-    (provide name)
-    (begin-for-syntax (set! 0ary-funs (cons #'name 0ary-funs)))))
-
-(define-syntax-rule (provide-0ary-funs [name c-name] ...)
-  (begin (provide-0ary-fun name c-name) ...))
-
-(provide-0ary-funs
- [log2.bf 'mpfr_const_log2]
- [pi.bf 'mpfr_const_pi]
- [gamma.bf 'mpfr_const_euler]
- [catalan.bf 'mpfr_const_catalan])
-
-(define constant-hash (make-hash))
-
-(define (phi.bf)
-  (define p (bf-precision))
-  (hash-ref!
-   constant-hash (cons 'phi.bf p)
-   (λ () (bfcopy
-          (parameterize ([bf-precision (+ p 10)])
-            (bfdiv (bfadd (force 1.bf) (bfsqrt (force 5.bf))) (force 2.bf)))))))
-
-(define (epsilon.bf)
-  (define p (bf-precision))
-  (hash-ref! constant-hash (cons 'epsilon.bf p) (λ () (bfexpt (force 2.bf) (bf (- 1 p))))))
-
-(define (-max.bf) (bfnext (bf -inf.0)))
-(define (-min.bf) (bfprev (bf -0.0)))
-(define (+min.bf) (bfnext (bf 0.0)))
-(define (+max.bf) (bfprev (bf +inf.0)))
-
-(provide phi.bf epsilon.bf -max.bf -min.bf +min.bf +max.bf)
-(begin-for-syntax
-  (set! 0ary-funs (list* #'phi.bf #'epsilon.bf #'-max.bf #'-min.bf #'+min.bf #'+max.bf
-                         0ary-funs)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/bigfloat/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/utils.rkt
deleted file mode 100644
index 88d043ffa7..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/bigfloat/utils.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base racket/syntax syntax/strip-context)
-         typed/racket/base
-         (only-in ffi/unsafe
-                  ctype-sizeof
-                  _long
-                  _ulong))
-
-(provide (all-defined-out))
-
-(define (unsigned-max type) (- (expt 2 (* 8 (ctype-sizeof type))) 1))
-(define (signed-min type) (- (expt 2 (- (* 8 (ctype-sizeof type)) 1))))
-(define (signed-max type) (- (expt 2 (- (* 8 (ctype-sizeof type)) 1)) 1))
-
-(define _long-min (signed-min _long))
-(define _long-max (signed-max _long))
-(define _ulong-max (unsigned-max _ulong))
-
-(define (_ulong? n) (and (exact-integer? n) (<= 0 n _ulong-max)))
-(define (_long? n) (and (exact-integer? n) (<= _long-min n _long-max)))
-
-(define-syntax (req/prov-uniform-collection stx)
-  (syntax-case stx ()
-    [(_ module collection type)
-     (with-syntax ([require-it-name  (datum->syntax stx (gensym 'require-it))])
-       (syntax/loc stx
-         (begin
-           (define-syntax (require-it-name stx1)
-             (syntax-case stx1 ()
-               [(require-it-name)
-                (with-syntax ([(obj (... ...))  (replace-context #'require-it-name collection)])
-                  #'(begin (require/typed module [obj  type] (... ...))
-                           (provide obj (... ...))))]))
-           (require-it-name))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/bernoulli-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/bernoulli-dist.rkt
deleted file mode 100644
index e331fc19e4..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/bernoulli-dist.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide flbernoulli-pdf
-         flbernoulli-cdf
-         flbernoulli-inv-cdf
-         flbernoulli-sample
-         Bernoulli-Dist bernoulli-dist bernoulli-dist-prob)
-
-(: flbernoulli-pdf (Flonum Flonum Any -> Flonum))
-(define (flbernoulli-pdf q k log?)
-  (cond [(not (flprobability? q))  +nan.0]
-        [log?  (cond [(fl= k 0.0)  (fllog1p (- q))]
-                     [(fl= k 1.0)  (fllog q)]
-                     [else  +nan.0])]
-        [else  (cond [(fl= k 0.0)  (fl- 1.0 q)]
-                     [(fl= k 1.0)  q]
-                     [else  +nan.0])]))
-
-(: flbernoulli-cdf (Flonum Flonum Any Any -> Flonum))
-(define (flbernoulli-cdf q k log? 1-p?)
-  (cond [(not (flprobability? q))  +nan.0]
-        [1-p?  (cond [log?  (cond [(k . fl< . 0.0)  0.0]
-                                  [(k . fl< . 1.0)  (fllog q)]
-                                  [else  -inf.0])]
-                     [else  (cond [(k . fl< . 0.0)  1.0]
-                                  [(k . fl< . 1.0)  q]
-                                  [else  0.0])])]
-        [else  (cond [log?  (cond [(k . fl< . 0.0)  -inf.0]
-                                  [(k . fl< . 1.0)  (fllog1p (- q))]
-                                  [else  0.0])]
-                     [else  (cond [(k . fl< . 0.0)  0.0]
-                                  [(k . fl< . 1.0)  (- 1.0 q)]
-                                  [else  1.0])])]))
-
-(: flbernoulli-inv-cdf (Flonum Flonum Any Any -> Flonum))
-(define (flbernoulli-inv-cdf q p log? 1-p?)
-  (cond [(not (flprobability? q))  +nan.0]
-        [1-p?  (cond [log?  (if (p . fl< . (fllog q)) 0.0 1.0)]
-                     [else  (if (p . fl< . q) 0.0 1.0)])]
-        [else  (cond [log?  (if (p . fl<= . (fllog1p (- q))) 0.0 1.0)]
-                     [else  (if (p . fl<= . (fl- 1.0 q)) 0.0 1.0)])]))
-
-(: flbernoulli-sample (Flonum Integer -> FlVector))
-(define (flbernoulli-sample q n)
-  (cond [(n . < . 0)  (raise-argument-error 'flbernoulli-sample "Natural" 1 q n)]
-        [(not (flprobability? q))  (build-flvector n (λ (_) +nan.0))]
-        [else  (build-flvector n (λ (_) (if ((random) . > . q) 0.0 1.0)))]))
-
-(define-real-dist: bernoulli-dist Bernoulli-Dist
-  bernoulli-dist-struct ([prob : Flonum]))
-
-(begin-encourage-inline
-  
-  (: bernoulli-dist (case-> (-> Bernoulli-Dist)
-                            (Real -> Bernoulli-Dist)))
-  (define (bernoulli-dist [q 0.5])
-    (let ([q  (fl q)])
-      (define pdf (opt-lambda: ([k : Real] [log? : Any #f])
-                    (flbernoulli-pdf q (fl k) log?)))
-      (define cdf (opt-lambda: ([k : Real] [log? : Any #f] [1-p? : Any #f])
-                    (flbernoulli-cdf q (fl k) log? 1-p?)))
-      (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                        (flbernoulli-inv-cdf q (fl p) log? 1-p?)))
-      (define sample (case-lambda:
-                       [()  (unsafe-flvector-ref (flbernoulli-sample q 1) 0)]
-                       [([n : Integer])  (flvector->list (flbernoulli-sample q n))]))
-      (bernoulli-dist-struct
-       pdf sample cdf inv-cdf
-       0.0 1.0 (delay (if (q . fl<= . 0.5) 0.0 1.0))
-       q)))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/beta-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/beta-dist.rkt
deleted file mode 100644
index ef35926287..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/beta-dist.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "../functions/beta.rkt"
-         "../functions/incomplete-beta.rkt"
-         "impl/beta-pdf.rkt"
-         "impl/beta-inv-cdf.rkt"
-         "impl/gamma-random.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide flbeta-pdf
-         flbeta-cdf
-         flbeta-inv-cdf
-         flbeta-sample
-         Beta-Dist beta-dist beta-dist-alpha beta-dist-beta)
-
-(: flbeta-pdf (Flonum Flonum Flonum Any -> Flonum))
-(define (flbeta-pdf a b x log?)
-  (define d (flbeta-log-pdf a b x))
-  (if log? d (flexp d)))
-
-(: flbeta-cdf (Flonum Flonum Flonum Any Any -> Flonum))
-(define (flbeta-cdf a b x log? 1-p?)
-  (cond [(or (a . fl< . 0.0) (b . fl< . 0.0))  +nan.0]
-        [(x . fl< . 0.0)  (cond [1-p?  (if log? 0.0 1.0)]
-                                [else  (if log? -inf.0 0.0)])]
-        [(x . fl> . 1.0)  (cond [1-p?  (if log? -inf.0 0.0)]
-                                [else  (if log? 0.0 1.0)])]
-        [log?  (fllog-beta-inc a b x 1-p? #t)]
-        [else  (flbeta-inc a b x 1-p? #t)]))
-
-(: flbeta-sample (Flonum Flonum Integer -> FlVector))
-(define (flbeta-sample a b n)
-  (cond [(n . < . 0)  (raise-argument-error 'flbeta-sample "Natural" 2 a b n)]
-        [(or (a . fl< . 0.0) (b . fl< . 0.0)
-             (and (fl= a 0.0) (fl= b 0.0))
-             (and (fl= a +inf.0) (fl= b +inf.0)))
-         (build-flvector n (λ (_) +nan.0))]
-        [else
-         (define xs (flgamma-sample a 1.0 n))
-         (define ys (flgamma-sample b 1.0 n))
-         (for ([i  (in-range n)])
-           (define x (unsafe-flvector-ref xs i))
-           (define y (unsafe-flvector-ref ys i))
-           (unsafe-flvector-set! xs i (fl/ x (fl+ x y))))
-         xs]))
-
-(define-real-dist: beta-dist Beta-Dist
-  beta-dist-struct ([alpha : Flonum] [beta : Flonum]))
-
-(begin-encourage-inline
-  
-  (: beta-dist (Real Real -> Beta-Dist))
-  (define (beta-dist a b)
-    (let ([a  (fl a)] [b  (fl b)])
-      (define pdf (opt-lambda: ([x : Real] [log? : Any #f])
-                    (flbeta-pdf a b (fl x) log?)))
-      (define cdf (opt-lambda: ([x : Real] [log? : Any #f] [1-p? : Any #f])
-                    (flbeta-cdf a b (fl x) log? 1-p?)))
-      (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                        (flbeta-inv-cdf a b (fl p) log? 1-p?)))
-      (define sample (case-lambda:
-                       [()  (unsafe-flvector-ref (flbeta-sample a b 1) 0)]
-                       [([n : Integer])  (flvector->list (flbeta-sample a b n))]))
-      (beta-dist-struct
-       pdf sample cdf inv-cdf
-       0.0 1.0 (delay (flbeta-inv-cdf a b 0.5 #f #f))
-       a b)))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/binomial-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/binomial-dist.rkt
deleted file mode 100644
index a41b72493e..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/binomial-dist.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "../functions/incomplete-beta.rkt"
-         (prefix-in impl: "impl/binomial-pdf.rkt")
-         "impl/binomial-random.rkt"
-         "normal-dist.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide flbinomial-pdf
-         flbinomial-cdf
-         flbinomial-inv-cdf
-         flbinomial-sample
-         Binomial-Dist binomial-dist binomial-dist-count binomial-dist-prob)
-
-(: flbinomial-pdf (Flonum Flonum Flonum Any -> Flonum))
-(define (flbinomial-pdf n q k log?)
-  (cond [log?  (impl:flbinomial-log-pdf n q k)]
-        [else  (impl:flbinomial-pdf n q k)]))
-
-(: flbinomial-cdf (Flonum Flonum Flonum Any Any -> Flonum))
-(define (flbinomial-cdf n q k log? 1-p?)
-  (cond [(or (not (flinteger? n)) (n . fl< . 0.0)
-             (q . fl< . 0.0) (q . fl> . 1.0))
-         +nan.0]
-        [else
-         (let ([k  (flfloor k)])
-           (cond [log?  (fllog-beta-inc (fl+ k 1.0) (fl- n k) q (not 1-p?) #t)]
-                 [else  (flbeta-inc (fl+ k 1.0) (fl- n k) q (not 1-p?) #t)]))]))
-
-(: flbinomial-inv-cdf (Flonum Flonum Flonum Any Any -> Flonum))
-(define (flbinomial-inv-cdf n q p log? 1-p?)
-  (cond [(or (not (flinteger? n)) (n . fl< . 0.0)
-             (q . fl< . 0.0) (q . fl> . 1.0)
-             (not (flprobability? p log?)))
-         +nan.0]
-        [(flprobability-one? p log? 1-p?)  n]
-        [(flprobability-zero? p log? 1-p?)  0.0]
-        [1-p?
-         (define z (flnormal-inv-cdf (fl* n q) (flsqrt (* n q (fl- 1.0 q))) p log? #t))
-         (flfind-least-integer
-          (λ: ([k : Flonum]) ((flbinomial-cdf n q k log? 1-p?) . fl< . p))
-          0.0 n
-          (flmax 0.0 (flmin n z)))]
-        [else
-         (define z (flnormal-inv-cdf (fl* n q) (flsqrt (* n q (fl- 1.0 q))) p log? #f))
-         (flfind-least-integer
-          (λ: ([k : Flonum]) ((flbinomial-cdf n q k log? 1-p?) . fl>= . p))
-          0.0 n
-          (flmax 0.0 (flmin n z)))]))
-
-(define-real-dist: binomial-dist Binomial-Dist
-  binomial-dist-struct ([count : Flonum] [prob : Flonum]))
-
-(begin-encourage-inline
-  
-  (: binomial-dist (case-> (-> Binomial-Dist)
-                           (Real -> Binomial-Dist)
-                           (Real Real -> Binomial-Dist)))
-  (define (binomial-dist [n 1.0] [q 0.5])
-    (let ([n  (fl n)] [q  (fl q)])
-      (define pdf (opt-lambda: ([k : Real] [log? : Any #f])
-                    (flbinomial-pdf n q (fl k) log?)))
-      (define cdf (opt-lambda: ([k : Real] [log? : Any #f] [1-p? : Any #f])
-                    (flbinomial-cdf n q (fl k) log? 1-p?)))
-      (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                        (flbinomial-inv-cdf n q (fl p) log? 1-p?)))
-      (define sample (case-lambda:
-                       [()  (unsafe-flvector-ref (flbinomial-sample n q 1) 0)]
-                       [([m : Integer])  (flvector->list (flbinomial-sample n q m))]))
-      (binomial-dist-struct
-       pdf sample cdf inv-cdf
-       0.0 +inf.0 (delay (flfloor (fl* n q)))
-       n q)))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/cauchy-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/cauchy-dist.rkt
deleted file mode 100644
index e410ee0696..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/cauchy-dist.rkt
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../../base.rkt"
-         "../unsafe.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide flcauchy-pdf
-         flcauchy-cdf
-         flcauchy-inv-cdf
-         flcauchy-sample
-         Cauchy-Dist cauchy-dist cauchy-dist-mode cauchy-dist-scale)
-
-(: flcauchy-pdf (Float Float Float Any -> Float))
-(define flcauchy-pdf
-  (make-symmetric-location-scale-flpdf
-   (λ: ([x : Float] [log? : Any])
-     (cond [(x . fl> . 1e100)
-            ;; Avoid overflow in (* x x) by using 1/x
-            (define 1/x (fl/ 1.0 x))
-            (define 1/x^2 (fl* 1/x 1/x))
-            (cond [log?  (fl- (fl- (fllog 1/x^2) (fllog1p 1/x^2)) (fllog pi))]
-                  [else  (fl/ 1/x^2 (fl* pi (fl+ 1.0 1/x^2)))])]
-           [else
-            (cond [log?  (fl- (- (fllog1p (fl* x x))) (fllog pi))]
-                  [else  (fl/ 1.0 (fl* pi (fl+ 1.0 (fl* x x))))])]))))
-
-(: flcauchy-cdf (Float Float Float Any Any -> Float))
-(define flcauchy-cdf
-  (make-symmetric-location-scale-flcdf
-   (λ: ([x : Float] [log? : Any])
-     ;; Preserve precision by making the argument to `flatan' smaller than 1
-     (cond [log?  (cond [(x . fl< . -1.0)  (fl- (fllog (flatan (fl/ -1.0 x))) (fllog pi))]
-                        [(x . fl> . +1.0)  (fllog1p (fl/ (flatan (fl/ -1.0 x)) pi))]
-                        [else  (fllog (fl+ 0.5 (fl/ (flatan x) pi)))])]
-           [else  (cond [(x . fl< . -1.0)  (- (fl/ (flatan (fl/ 1.0 x)) pi))]
-                        [(x . fl> . +1.0)  (fl- 1.0 (fl/ (flatan (fl/ 1.0 x)) pi))]
-                        [else  (fl+ 0.5 (fl/ (flatan x) pi))])]))))
-
-(: standard-flcauchy-inv-cdf (Float Any -> Float))
-(define (standard-flcauchy-inv-cdf q log?)
-  ;; Preserve precision by getting the argument to `fltan' close to 0.0
-  (cond [log?
-         (cond [(q . fl> . (fllog 0.75))  (fl/ +1.0 (fltan (fl* pi (- (flexpm1 q)))))]
-               [(q . fl< . (fllog 0.25))  (fl/ -1.0 (fltan (fl* pi (flexp q))))]
-               [else  (fltan (fl* pi (fl- (flexp q) 0.5)))])]
-        [else
-         (cond [(q . fl> . 0.75)  (fl/ +1.0 (fltan (fl* pi (fl- 1.0 q))))]
-               [(q . fl< . 0.25)  (fl/ -1.0 (fltan (fl* pi q)))]
-               [else  (fltan (fl* pi (fl- q 0.5)))])]))
-
-(: flcauchy-inv-cdf (Float Float Float Any Any -> Float))
-(define flcauchy-inv-cdf (make-symmetric-location-scale-flinv-cdf standard-flcauchy-inv-cdf))
-
-(: flcauchy-sample-single (Flonum Flonum -> Flonum))
-(define flcauchy-sample-single
-  (make-symmetric-location-scale-flrandom standard-flcauchy-inv-cdf))
-
-(: flcauchy-sample (Float Float Integer -> FlVector))
-(define (flcauchy-sample c s n)
-  (cond [(n . < . 0)  (raise-argument-error 'flcauchy-sample "Natural" 2 c s n)]
-        [else  (build-flvector n (λ (_) (flcauchy-sample-single c s)))]))
-
-;; ===================================================================================================
-;; Distribution object
-
-(define-real-dist: cauchy-dist Cauchy-Dist
-  cauchy-dist-struct ([mode : Float] [scale : Float]))
-
-(begin-encourage-inline
-  
-  (: cauchy-dist (case-> (-> Cauchy-Dist)
-                         (Real -> Cauchy-Dist)
-                         (Real Real -> Cauchy-Dist)))
-  (define (cauchy-dist [c 0.0] [s 1.0])
-    (let ([c  (fl c)] [s  (fl s)])
-      (define pdf (opt-lambda: ([x : Real] [log? : Any #f])
-                    (flcauchy-pdf c s (fl x) log?)))
-      (define cdf (opt-lambda: ([x : Real] [log? : Any #f] [complement? : Any #f])
-                    (flcauchy-cdf c s (fl x) log? complement?)))
-      (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [complement? : Any #f])
-                        (flcauchy-inv-cdf c s (fl p) log? complement?)))
-      (define sample (case-lambda:
-                       [()  (unsafe-flvector-ref (flcauchy-sample c s 1) 0)]
-                       [([n : Integer])  (flvector->list (flcauchy-sample c s n))]))
-      (cauchy-dist-struct pdf sample cdf inv-cdf -inf.0 +inf.0 (delay c) c s)))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/delta-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/delta-dist.rkt
deleted file mode 100644
index f675835224..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/delta-dist.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "impl/delta-dist.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide fldelta-pdf
-         fldelta-cdf
-         fldelta-inv-cdf
-         Delta-Dist delta-dist delta-dist-mean)
-
-(define-real-dist: delta-dist Delta-Dist
-  delta-dist-struct ([mean : Flonum]))
-
-(begin-encourage-inline
-  
-  (: delta-dist (case-> (-> Delta-Dist)
-                        (Real -> Delta-Dist)))
-  (define (delta-dist [c 0.0])
-    (let ([c  (fl c)])
-      (define pdf (opt-lambda: ([x : Real] [log? : Any #f])
-                    (fldelta-pdf c (fl x) log?)))
-      (define cdf (opt-lambda: ([x : Real] [log? : Any #f] [1-p? : Any #f])
-                    (fldelta-cdf c (fl x) log? 1-p?)))
-      (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                        (fldelta-inv-cdf c (fl p) log? 1-p?)))
-      (define sample (case-lambda:
-                       [()  c]
-                       [([n : Integer])  (build-list n (λ (_) c))]))
-      (delta-dist-struct pdf sample cdf inv-cdf c c (delay c) c)))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/discrete-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/discrete-dist.rkt
deleted file mode 100644
index 4b3f6d0c2c..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/discrete-dist.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../statistics/statistics-utils.rkt"
-         "../utils.rkt"
-         "impl/walker-table.rkt"
-         "dist-struct.rkt")
-
-(provide Discrete-Dist
-         discrete-dist
-         discrete-dist-values
-         discrete-dist-probs)
-
-(begin-encourage-inline
-  (struct: (In Out) discrete-dist-struct distribution ([values : (Listof Out)]
-                                                       [probs : (Listof Positive-Flonum)])
-    #:property prop:custom-print-quotable 'never
-    #:property prop:custom-write
-    (λ (v port mode)
-      (pretty-print-constructor
-       'discrete-dist (list (discrete-dist-struct-values v) (discrete-dist-struct-probs v))
-       port mode)))
-  
-  (define-type (Discrete-Dist A) (discrete-dist-struct A A))
-
-  (: discrete-dist-values (All (A) ((Discrete-Dist A) -> (Listof A))))
-  (define (discrete-dist-values d) (discrete-dist-struct-values d))
-  
-  (: discrete-dist-probs (All (A) ((Discrete-Dist A) -> (Listof Positive-Flonum))))
-  (define (discrete-dist-probs d) (discrete-dist-struct-probs d))
-  
-  )
-
-(: discrete-dist
-   (All (A) (case-> ((Sequenceof A) -> (Discrete-Dist A))
-                    ((Sequenceof A) (Option (Sequenceof Real)) -> (Discrete-Dist A)))))
-(define (discrete-dist xs [ws #f])
-  (let-values ([(xs ws)  (cond [ws  (sequences->normalized-weighted-samples 'discrete-dist xs ws)]
-                               [else  (sequence->normalized-weighted-samples 'discrete-dist xs)])])
-    (define hash
-      (delay (make-hash ((inst map (Pair A Positive-Flonum) A Positive-Flonum) cons xs ws))))
-    
-    (define table
-      (delay (make-walker-table xs ws)))
-    
-    (define pdf (opt-lambda: ([x : A] [log? : Any #f])
-                  (define p (hash-ref (force hash) x (λ () 0.0)))
-                  (if log? (fllog p) p)))
-    (define sample (case-lambda:
-                     [()  (walker-table-sample (force table))]
-                     [([n : Integer])
-                      (cond [(n . < . 0)  (raise-argument-error 'discrete-dist-sample "Natural" n)]
-                            [else  (let ([table  (force table)])
-                                     (build-list n (λ (_) (walker-table-sample table))))])]))
-    (discrete-dist-struct pdf sample xs ws)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/dist-functions.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/dist-functions.rkt
deleted file mode 100644
index 35a849a385..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/dist-functions.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang typed/racket/base
-
-(require racket/promise
-         "../../flonum.rkt"
-         "dist-struct.rkt")
-
-(provide real-dist-prob
-         real-dist-hpd-interval)
-
-;; ===================================================================================================
-;; Computing probabilities
-
-(: real-dist-prob* (Real-Dist Flonum Flonum Any -> Flonum))
-;; Assumes a <= b
-(define (real-dist-prob* d a b 1-p?)
-  (define c (force (ordered-dist-median d)))
-  (define cdf (ordered-dist-cdf d))
-  (define p
-    (cond [(a . fl= . b)  (if 1-p? 1.0 0.0)]
-          [1-p?  (fl+ (cdf a #f #f) (cdf b #f #t))]
-          [(b . fl<= . c)
-           ;; Both less than the median; use lower tail only
-           (fl- (cdf b #f #f) (cdf a #f #f))]
-          [(a . fl>= . c)
-           ;; Both greater than the median; use upper tail only
-           (fl- (cdf a #f #t) (cdf b #f #t))]
-          [else
-           ;; Median between a and b; use lower for (a,c] and upper for (c,b]
-           (define P_x<=a (cdf a #f #f))
-           (define P_x>b (cdf b #f #t))
-           (fl+ (fl- 0.5 P_x<=a) (fl- 0.5 P_x>b))]))
-  (max 0.0 (min 1.0 p)))
-
-(: real-dist-log-prob* (Real-Dist Flonum Flonum Any -> Flonum))
-;; Assumes a <= b
-(define (real-dist-log-prob* d a b 1-p?)
-  (define c (force (ordered-dist-median d)))
-  (define cdf (ordered-dist-cdf d))
-  (define log-p
-    (cond [(a . fl= . b)  (if 1-p? 0.0 -inf.0)]
-          [1-p?  (lg+ (cdf a #t #f) (cdf b #t #t))]
-          [(b . fl<= . c)
-           ;; Both less than the median; use lower tail only
-           (define log-P_x<=a (cdf a #t #f))
-           (define log-P_x<=b (cdf b #t #f))
-           (cond [(log-P_x<=b . fl< . log-P_x<=a)  -inf.0]
-                 [else  (lg- log-P_x<=b log-P_x<=a)])]
-          [(a . fl>= . c)
-           ;; Both greater than the median; use upper tail only
-           (define log-P_x>a (cdf a #t #t))
-           (define log-P_x>b (cdf b #t #t))
-           (cond [(log-P_x>a . fl< . log-P_x>b)  -inf.0]
-                 [else  (lg- log-P_x>a log-P_x>b)])]
-          [else
-           ;; Median between a and b; try 1-upper first
-           (define log-P_x<=a (cdf a #t #f))
-           (define log-P_x>b (cdf b #t #t))
-           (define log-p (lg1- (lg+ log-P_x<=a log-P_x>b)))
-           (cond [(log-p . fl> . (log 0.1))  log-p]
-                 [else
-                  ;; Subtracting from 1.0 (in log space) lost bits; split and add instead
-                  (define log-P_a<x<=c
-                    (cond [((fllog 0.5) . fl< . log-P_x<=a)  -inf.0]
-                          [else  (lg- (fllog 0.5) log-P_x<=a)]))
-                  (define log-P_c<x<=b
-                    (cond [((fllog 0.5) . fl< . log-P_x>b)  -inf.0]
-                          [else  (lg- (fllog 0.5) log-P_x>b)]))
-                  (lg+ log-P_a<x<=c log-P_c<x<=b)])]))
-  (min 0.0 log-p))
-
-(: real-dist-prob (case-> (Real-Dist Real Real -> Flonum)
-                          (Real-Dist Real Real Any -> Flonum)
-                          (Real-Dist Real Real Any Any -> Flonum)))
-(define (real-dist-prob d a b [log? #f] [1-p? #f])
-  (let ([a  (fl a)] [b  (fl b)])
-    (let ([a  (flmin a b)] [b  (flmax a b)])
-      (cond [log?  (define p (real-dist-prob* d a b 1-p?))
-                   (cond [(and (p . fl> . +max-subnormal.0) (p . fl< . 0.9))  (fllog p)]
-                         [else  (real-dist-log-prob* d a b 1-p?)])]
-            [else  (real-dist-prob* d a b 1-p?)]))))
-
-;; ===================================================================================================
-;; Highest probability density (HPD) regions
-
-(: real-dist-hpd-interval (-> Real-Dist Real (Values Flonum Flonum)))
-(define (real-dist-hpd-interval d α)
-  (when (or (α . <= . 0) (α . > . 1))
-    (raise-argument-error 'real-dist-hpd-interval "Real in (0,1]" 1 d α))
-  
-  (let ([α  (max (* 128.0 epsilon.0) (fl α))])
-    (cond
-      [(α . >= . 1.0)  (values (ordered-dist-min d) (ordered-dist-max d))]
-      [else
-       (define pdf (distribution-pdf d))
-       (define cdf (ordered-dist-cdf d))
-       (define inv-cdf (ordered-dist-inv-cdf d))
-       
-       (: high-endpoint (-> Real Flonum))
-       (define (high-endpoint a)
-         (inv-cdf (min 1.0 (+ (cdf a) α))))
-       
-       (: objective (-> Flonum Flonum))
-       (define (objective p)
-         (define a (inv-cdf p))
-         (define b (high-endpoint a))
-         (- (pdf a) (pdf b)))
-       
-       (define p (flbracketed-root objective +min.0 (- 1.0 α)))
-       
-       (define a
-         (cond [(<= 0.0 p 1.0)  (inv-cdf p)]
-               [else
-                (if ((abs (objective 0.0)) . < . (abs (objective (- 1.0 α))))
-                    (inv-cdf 0.0)
-                    (inv-cdf (- 1.0 α)))]))
-       
-       (values a (high-endpoint a))])))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/dist-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/dist-struct.rkt
deleted file mode 100644
index ab1f04730b..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/dist-struct.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint)
-
-(provide
- PDF Sample CDF Inverse-CDF
- (struct-out distribution)
- (struct-out ordered-dist)
- Real-Dist
- pdf sample cdf inv-cdf)
-
-(define-type (PDF In)
-  (case-> (In -> Flonum)
-          (In Any -> Flonum)))
-
-(define-type (Sample Out)
-  (case-> (-> Out)
-          (Integer -> (Listof Out))))
-
-(define-type (CDF In)
-  (case-> (In -> Flonum)
-          (In Any -> Flonum)
-          (In Any Any -> Flonum)))
-
-(define-type (Inverse-CDF Out)
-  (case-> (Real -> Out)
-          (Real Any -> Out)
-          (Real Any Any -> Out))) 
-
-(struct: (In Out) distribution ([pdf : (PDF In)]
-                                [sample : (Sample Out)])
-  #:transparent)
-
-(struct: (In Out) ordered-dist distribution
-  ([cdf : (CDF In)]
-   [inv-cdf : (Inverse-CDF Out)]
-   [min : Out]
-   [max : Out]
-   [median : (Promise Out)])
-  #:transparent)
-
-(define-type Real-Dist (ordered-dist Real Flonum))
-
-;; =================================================================================================
-
-(begin-encourage-inline
-  
-  (: pdf (All (In Out) (case-> ((distribution In Out) In -> Flonum)
-                               ((distribution In Out) In Any -> Flonum))))
-  (define (pdf d v [log? #f])
-    ((distribution-pdf d) v log?))
-  
-  (: sample (All (In Out) (case-> ((distribution In Out) -> Out)
-                                  ((distribution In Out) Integer -> (Listof Out)))))
-  (define sample
-    (case-lambda
-      [(d)  ((distribution-sample d))]
-      [(d n)  ((distribution-sample d) n)]))
-  
-  (: cdf (All (In Out) (case-> ((ordered-dist In Out) In -> Flonum)
-                               ((ordered-dist In Out) In Any -> Flonum)
-                               ((ordered-dist In Out) In Any Any -> Flonum))))
-  (define (cdf d v [log? #f] [1-p? #f])
-    ((ordered-dist-cdf d) v log? 1-p?))
-  
-  (: inv-cdf (All (In Out) (case-> ((ordered-dist In Out) Real -> Out)
-                                   ((ordered-dist In Out) Real Any -> Out)
-                                   ((ordered-dist In Out) Real Any Any -> Out))))
-  (define (inv-cdf d p [log? #f] [1-p? #f])
-    ((ordered-dist-inv-cdf d) p log? 1-p?))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/exponential-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/exponential-dist.rkt
deleted file mode 100644
index c66f5503a6..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/exponential-dist.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide flexponential-pdf
-         flexponential-cdf
-         flexponential-inv-cdf
-         flexponential-sample
-         Exponential-Dist exponential-dist exponential-dist-mean)
-
-(: flexponential-pdf (Float Float Any -> Float))
-(define flexponential-pdf
-  (make-one-sided-scale-flpdf
-   (λ: ([x : Float] [log? : Any])
-     (if log? (- x) (flexp (- x))))))
-
-(: flexponential-cdf (Float Float Any Any -> Float))
-(define flexponential-cdf
-  (make-one-sided-scale-flcdf
-   (λ: ([x : Float] [log? : Any] [1-p? : Any])
-     (cond [1-p?  (if log? (- x) (flexp (- x)))]
-           [else  (if log? (lg1- (- x)) (- (flexpm1 (- x))))]))))
-
-(: standard-flexponential-inv-cdf (Float Any Any -> Float))
-(define (standard-flexponential-inv-cdf q log? 1-p?)
-  (cond [1-p?  (if log? (- q) (- (fllog q)))]
-        [else  (if log? (- (lg1- q)) (- (fllog1p (- q))))]))
-
-(: flexponential-inv-cdf (Float Float Any Any -> Float))
-(define flexponential-inv-cdf (make-one-sided-scale-flinv-cdf standard-flexponential-inv-cdf))
-
-(: flexponential-sample (Flonum Integer -> FlVector))
-(define (flexponential-sample s n)
-  (cond [(n . < . 0)  (raise-argument-error 'flexponential-sample "Natural" 1 s n)]
-        [else  (build-flvector n (λ (_) (fl* s (- (fllog (random))))))]))
-
-;; ===================================================================================================
-;; Distribution object
-
-(define-real-dist: exponential-dist Exponential-Dist
-  exponential-dist-struct ([mean : Flonum]))
-
-(begin-encourage-inline
-  
-  (: exponential-dist (case-> (-> Exponential-Dist)
-                              (Real -> Exponential-Dist)))
-  (define (exponential-dist [s 1.0])
-    (let ([s  (fl s)])
-      (define pdf (opt-lambda: ([x : Real] [log? : Any #f])
-                    (flexponential-pdf s (fl x) log?)))
-      (define cdf (opt-lambda: ([x : Real] [log? : Any #f] [1-p? : Any #f])
-                    (flexponential-cdf s (fl x) log? 1-p?)))
-      (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                        (flexponential-inv-cdf s (fl p) log? 1-p?)))
-      (define sample (case-lambda:
-                       [()  (unsafe-flvector-ref (flexponential-sample s 1) 0)]
-                       [([n : Integer])  (flvector->list (flexponential-sample s n))]))
-      (exponential-dist-struct pdf sample cdf inv-cdf 0.0 +inf.0 (delay (fl* s (fllog 2.0))) s)))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/gamma-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/gamma-dist.rkt
deleted file mode 100644
index 147953c06e..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/gamma-dist.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "../functions/incomplete-gamma.rkt"
-         "impl/gamma-pdf.rkt"
-         "impl/gamma-inv-cdf.rkt"
-         "impl/gamma-random.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide flgamma-pdf
-         flgamma-cdf
-         flgamma-inv-cdf
-         flgamma-sample
-         Gamma-Dist gamma-dist gamma-dist-shape gamma-dist-scale)
-
-(: flgamma-pdf (Float Float Float Any -> Float))
-(define (flgamma-pdf k s x log?)
-  (cond [(k . fl< . 0.0)  +nan.0]
-        [else
-         ((make-one-sided-scale-flpdf
-           (λ: ([x : Float] [log? : Any])
-             (cond [log?  (standard-flgamma-log-pdf k x)]
-                   [else  (standard-flgamma-pdf k x)])))
-          s x log?)]))
-
-(: flgamma-cdf (Float Float Float Any Any -> Float))
-(define (flgamma-cdf k s x log? 1-p?)
-  (cond [(k . fl< . 0.0)  +nan.0]
-        [else
-         ((make-one-sided-scale-flcdf
-           (λ: ([x : Float] [log? : Any] [1-p? : Any])
-             (cond [log?  (fllog-gamma-inc k x 1-p? #t)]
-                   [else  (flgamma-inc k x 1-p? #t)])))
-          s x log? 1-p?)]))
-
-(: flgamma-inv-cdf (Float Float Float Any Any -> Float))
-(define (flgamma-inv-cdf k s p log? 1-p?)
-  (cond [(k . fl< . 0.0)  +nan.0]
-        [else
-         ((make-one-sided-scale-flinv-cdf
-           (λ: ([p : Float] [log? : Any] [1-p? : Any])
-             (standard-flgamma-inv-cdf k p log? 1-p?)))
-          s p log? 1-p?)]))
-
-(define-real-dist: gamma-dist Gamma-Dist
-  gamma-dist-struct ([shape : Flonum] [scale : Flonum]))
-
-(begin-encourage-inline
-  
-  (: gamma-dist (case-> (-> Gamma-Dist)
-                        (Real -> Gamma-Dist)
-                        (Real Real -> Gamma-Dist)))
-  (define (gamma-dist [k 1.0] [s 1.0])
-    (let ([k  (fl k)] [s  (fl s)])
-      (define pdf (opt-lambda: ([x : Real] [log? : Any #f])
-                    (flgamma-pdf k s (fl x) log?)))
-      (define cdf (opt-lambda: ([x : Real] [log? : Any #f] [1-p? : Any #f])
-                    (flgamma-cdf k s (fl x) log? 1-p?)))
-      (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                        (flgamma-inv-cdf k s (fl p) log? 1-p?)))
-      (define sample (case-lambda:
-                       [()  (unsafe-flvector-ref (flgamma-sample k s 1) 0)]
-                       [([n : Integer])  (flvector->list (flgamma-sample k s n))]))
-      (gamma-dist-struct
-       pdf sample cdf inv-cdf
-       0.0 +inf.0 (delay (flgamma-inv-cdf k s 0.5 #f #f))
-       k s)))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/geometric-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/geometric-dist.rkt
deleted file mode 100644
index 573bb07704..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/geometric-dist.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide flgeometric-pdf
-         flgeometric-cdf
-         flgeometric-inv-cdf
-         flgeometric-sample
-         Geometric-Dist geometric-dist geometric-dist-prob)
-
-(: flgeometric-pdf (Flonum Flonum Any -> Flonum))
-(define (flgeometric-pdf q k log?)
-  (cond [(not (flinteger? k))  +nan.0]
-        [(or (q . fl<= . 0.0) (q . fl>= . 1.0))
-         (cond [(fl= q 1.0)  (cond [(fl= k 0.0)  (if log? 0.0 1.0)]
-                                   [else  (if log? -inf.0 0.0)])]
-               [(fl= q 0.0)  (if log? -inf.0 0.0)]
-               [else  +nan.0])]
-        [(k . fl< . 0.0)  (if log? -inf.0 0.0)]
-        [log?  (fl+ (fllog q) (fl* k (fllog1p (- q))))]
-        [else  (fl* q (flexp (fl* k (fllog1p (- q)))))]))
-
-(: flgeometric-cdf (Flonum Flonum Any Any -> Flonum))
-(define (flgeometric-cdf q k log? 1-p?)
-  (cond [(or (q . fl<= . 0.0) (q . fl>= . 1.0))
-         (cond [(fl= q 1.0)  (flprobability (if (k . fl>= . 0.0) 1.0 0.0) log? 1-p?)]
-               [(fl= q 0.0)  (flprobability (if (k . fl= . +inf.0) 1.0 0.0) log? 1-p?)]
-               [else  +nan.0])]
-        [(k . fl< . 0.0)  (flprobability 0.0 log? 1-p?)]
-        [else
-         (let ([k  (flfloor k)])
-           (define log-1-p (fl* (fl+ k 1.0) (fllog1p (- q))))
-           (cond [1-p?  (if log? log-1-p (exp log-1-p))]
-                 [else  (if log? (lg1- log-1-p) (- (flexpm1 log-1-p)))]))]))
-
-(: flgeometric-inv-cdf (Flonum Flonum Any Any -> Flonum))
-(define (flgeometric-inv-cdf q p log? 1-p?)
-  (cond [(not (flprobability? p log?))  +nan.0]
-        [(or (q . fl<= . 0.0) (q . fl>= . 1.0))
-         (cond [(fl= q 1.0)  0.0]
-               [(fl= q 0.0)  (if (flprobability-zero? p log? 1-p?) 0.0 +inf.0)]
-               [else  +nan.0])]
-        [else
-         (define log-1-p
-           (cond [1-p?  (if log? p (fllog p))]
-                 [else  (if log? (lg1- p) (fllog1p (- p)))]))
-         (flmax 0.0 (fl- (flceiling (fl/ log-1-p (fllog1p (- q)))) 1.0))]))
-
-(: flgeometric-sample (Flonum Integer -> FlVector))
-(define (flgeometric-sample q n)
-  (cond [(n . < . 0)  (raise-argument-error 'flgeometric-sample "Natural" 1 q n)]
-        [(or (q . fl<= . 0.0) (q . fl>= . 1.0))
-         (define v
-           (cond [(fl= q 1.0)  0.0]
-                 [(fl= q 0.0)  +inf.0]
-                 [else  +nan.0]))
-         (build-flvector n (λ (_) v))]
-        [else
-         (build-flvector
-          n (λ (_)
-              (define p (fl* 0.5 (random)))
-              (define log-1-p (if ((random) . fl> . 0.5) (fllog p) (fllog1p (- p))))
-              (flmax 0.0 (fl- (flceiling (fl/ log-1-p (fllog1p (- q)))) 1.0))))]))
-
-(define-real-dist: geometric-dist Geometric-Dist
-  geometric-dist-struct ([prob : Flonum]))
-
-(begin-encourage-inline
-  
-  (: geometric-dist (case-> (-> Geometric-Dist)
-                            (Real -> Geometric-Dist)))
-  (define (geometric-dist [q 0.5])
-    (let ([q  (fl q)])
-      (define pdf (opt-lambda: ([k : Real] [log? : Any #f])
-                    (flgeometric-pdf q (fl k) log?)))
-      (define cdf (opt-lambda: ([k : Real] [log? : Any #f] [1-p? : Any #f])
-                    (flgeometric-cdf q (fl k) log? 1-p?)))
-      (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                        (flgeometric-inv-cdf q (fl p) log? 1-p?)))
-      (define sample (case-lambda:
-                       [()  (unsafe-flvector-ref (flgeometric-sample q 1) 0)]
-                       [([n : Integer])  (flvector->list (flgeometric-sample q n))]))
-      (geometric-dist-struct
-       pdf sample cdf inv-cdf
-       0.0 +inf.0 (delay (flgeometric-inv-cdf q 0.5 #f #f))
-       q)))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-inv-cdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-inv-cdf.rkt
deleted file mode 100644
index 9ac4fef278..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-inv-cdf.rkt
+++ /dev/null
@@ -1,209 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         "../../../flonum.rkt"
-         "../../functions/beta.rkt"
-         "../../functions/incomplete-beta.rkt"
-         "beta-pdf.rkt"
-         "beta-utils.rkt"
-         "normal-inv-cdf.rkt")
-
-(provide flbeta-inv-cdf)
-
-;; =================================================================================================
-;; Initial approximation
-
-(define 1-eps (fl- 1.0 (fl* 0.5 epsilon.0)))
-
-(: bound-estimate (Flonum -> Flonum))
-(define (bound-estimate x)
-  (flmax +min.0 (flmin 1-eps x)))
-
-(: log-const-numer (Flonum Flonum Flonum -> Flonum))
-(define (log-const-numer a b x)
-  (fl+ (fl* a (fllog x)) (fl* b (fllog1p (- x)))))
-
-(: recip-log-const-numer-diff (Flonum Flonum Flonum -> Flonum))
-(define (recip-log-const-numer-diff a b x)
-  (fl/ (fl- (fl* x x) x)
-       (fl- (fl* (fl+ a b) x) a)))
-
-(: flbeta-inv-log-cdf-appx-asym-0 (Flonum Flonum Flonum -> Flonum))
-;; Approximates by inverting the multiplicative term in front of the hypergeometric series (see
-;; flbeta-regularized-hypergeom in math/private/functions/incomplete-beta)
-;; This is a *really good* approximation in the tails; for the middle, we'll interpolate between
-;; two reasonable points near the tails, or use a normal approximation (whichever is better)
-(define (flbeta-inv-log-cdf-appx-asym-0 a b log-p)
-  (define y (fl+ (fl+ log-p (fllog a)) (fllog-beta a b)))
-  ;; ^^^ the easy part; now we need to invert log(p) = a*log(x) + b*log(1-x)
-  (define x0 (flexp (fl/ log-p a)))  ; initial guess
-  (define x (flmax +min.0 (flmin (fl* 0.9 (fl/ a (fl+ a b))) x0)))  ; bound the guess
-  ;(printf "x = ~v~n" x)
-  (define fx (log-const-numer a b x))
-  (let loop ([x x] [fx fx] [fac 1.0] [i 0])
-    ;; Newton says this is the change:
-    (define dx (fl* (fl- fx y) (recip-log-const-numer-diff a b x)))
-    ;; Halve it until we get something that doesn't obviously overshoot, and adjust `fac'
-    (define-values (new-x new-dx new-fac)
-      (let: dx-loop : (Values Flonum Flonum Flonum)
-        ([dx : Flonum  (fl* fac (flmax -0.1 (flmin 0.1 dx)))]
-         [fac : Flonum  fac]
-         [j : Nonnegative-Fixnum  0])
-        (define new-x (- x dx))
-        ;(printf "dx: new-x = ~v  dx = ~v~n" new-x dx)
-        (cond [(and (new-x . fl> . 0.0) (new-x . fl<= . 1.0))  (values new-x dx fac)]
-              [(not (rational? new-x))  (values x dx fac)]
-              [(j . fx< . 1000)  (dx-loop (fl* 0.5 dx) (fl* 0.5 fac) (fx+ j 1))]
-              [else  (values x dx fac)])))
-    ;(printf "x = ~v  dx = ~v  fac = ~v~n" new-x (- new-x x) new-fac)
-    (define new-fx (log-const-numer a b new-x))
-    (cond [(or ((flabs (fl- fx new-fx)) . fl<= . (flabs (fl* (fl* 1000.0 epsilon.0) new-fx)))
-               (fl<= (flabs new-dx) (fl* (fl* 0.5 epsilon.0) new-x))
-               (not (rational? new-x)))
-           new-x]
-          [(i . fx< . 1000)
-           (loop new-x new-fx (flmin 1.0 (fl* new-fac 2.0)) (fx+ i 1))]
-          [else
-           new-x])))
-
-(: flbeta-inv-log-cdf-appx-asym (Flonum Flonum Flonum Flonum -> Flonum))
-(define (flbeta-inv-log-cdf-appx-asym a b log-p log-1-p)
-  (define σ (flbeta-stddev a b))
-  (define log-p0
-    (fl- (fl- (log-const-numer a b (bound-estimate (fl- (fl/ a (fl+ a b)) (fl* 0.85 σ))))
-              (fllog a))
-         (fllog-beta a b)))
-  (define log-1-p1
-    (fl- (fl- (log-const-numer b a (bound-estimate (fl- (fl/ b (fl+ a b)) (fl* 0.85 σ))))
-              (fllog b))
-         (fllog-beta a b)))
-  (cond [(log-p . fl< . log-p0)
-         (flbeta-inv-log-cdf-appx-asym-0 a b log-p)]
-        [(log-1-p . fl< . log-1-p1)
-         (fl- 1.0 (flbeta-inv-log-cdf-appx-asym-0 b a log-1-p))]
-        [else
-         (define x0 (flbeta-inv-log-cdf-appx-asym-0 a b log-p0))
-         (define x1 (fl- 1.0 (flbeta-inv-log-cdf-appx-asym-0 b a log-1-p1)))
-         (define s (fl/ (fl- x1 x0) (fl- (lg1- log-1-p1) log-p0)))
-         (define c (fl- x0 (fl* s log-p0)))
-         (fl+ (fl* s log-p) c)]))
-
-(: flbeta-inv-log-cdf-appx-normal (Flonum Flonum Flonum Flonum -> Flonum))
-(define (flbeta-inv-log-cdf-appx-normal a b log-p log-1-p)
-  (define m (flbeta-appx-median a b))
-  (define σ (flbeta-stddev a b))
-  (fl+ m (fl* σ (standard-flnormal-inv-log-cdf log-p))))
-
-(: flbeta-inv-log-cdf-appx (Flonum Flonum Flonum Flonum -> (Values Flonum Flonum)))
-(define (flbeta-inv-log-cdf-appx a b log-p log-1-p)
-  (cond [(or (a . fl< . 10.0) (b . fl< . 10.0))
-         (define x (bound-estimate (flbeta-inv-log-cdf-appx-asym a b log-p log-1-p)))
-         (values x (fllog-beta-inc a b x #f #t))]
-        [else
-         (define x0 (bound-estimate (flbeta-inv-log-cdf-appx-asym a b log-p log-1-p)))
-         (define x1 (bound-estimate (flbeta-inv-log-cdf-appx-normal a b log-p log-1-p)))
-         (define real-log-p0 (fllog-beta-inc a b x0 #f #t))
-         (define real-log-p1 (fllog-beta-inc a b x1 #f #t))
-         (if ((flabs (fl- log-p real-log-p0)) . fl< . (flabs (fl- log-p real-log-p1)))
-             (values x0 real-log-p0)
-             (values x1 real-log-p1))]))
-
-;; =================================================================================================
-;; Newton's method
-
-(: newton-lower-log-iter (Flonum Flonum Flonum Flonum Flonum Flonum -> (Values Flonum Flonum)))
-(define (newton-lower-log-iter a b log-p x real-log-p fac)
-  (define pdf-log-p (flbeta-log-pdf a b x))
-  (cond [(fl<= (flabs (fl- log-p real-log-p))
-               (flabs (fl* (fl* 100.0 epsilon.0) log-p)))
-         (values 0.0 fac)]
-        [else
-         (define new-dx (fl* (flexp (fl- real-log-p pdf-log-p)) (fl- log-p real-log-p)))
-         ;; Limit dx, then halve until the x+dx is in bounds
-         (let loop ([new-dx  (fl* fac (flmin 0.1 (flmax -0.1 new-dx)))]
-                    [fac fac]
-                    [#{j : Nonnegative-Fixnum} 0])
-           (define new-x (fl+ x new-dx))
-           (cond [(and (new-x . fl>= . 0.0) (new-x . fl<= . 1.0))
-                  (values new-dx fac)]
-                 [(not (rational? new-x))
-                  (values 0.0 fac)]
-                 [(j . fx< . 1000)
-                  (loop (fl* 0.5 new-dx) (fl* 0.5 fac) (fx+ j 1))]
-                 [else
-                  (values 0.0 fac)]))]))
-
-(: flbeta-inv-log-cdf-newton (Flonum Flonum Flonum Flonum Flonum -> Flonum))
-(define (flbeta-inv-log-cdf-newton a b log-p x real-log-p)
-  (let loop ([dx 0.0] [x x] [real-log-p real-log-p] [fac 1.0] [#{c : Nonnegative-Fixnum} 1])
-    (define-values (new-dx new-fac) (newton-lower-log-iter a b log-p x real-log-p fac))
-    (define new-x (fl+ x new-dx))
-    (define new-real-log-p (fllog-beta-inc a b new-x #f #t))
-    ;(printf "~v ~v ~v~n" new-x new-dx new-fac)
-    (cond [(or (fl<= (flabs (fl- real-log-p new-real-log-p))
-                     (flabs (fl* (fl* 1000.0 epsilon.0) new-real-log-p)))
-               (fl<= (flabs new-dx) (fl* (fl* 0.5 epsilon.0) new-x))
-               (not (rational? new-x)))
-           new-x]
-          [(c . fx< . 1000)
-           (let ([new-fac  (if (fl= (flsgn dx) (flsgn new-dx))
-                               (flmin 1.0 (fl* new-fac 2.0))
-                               (fl* (flmin new-fac 1.0) 0.5))])
-             (loop new-dx new-x (fllog-beta-inc a b new-x #f #t) new-fac (fx+ c 1)))]
-          [else
-           new-x])))
-
-;; =================================================================================================
-
-(: in-bounds? (Flonum Flonum Flonum -> Boolean))
-(define (in-bounds? a b log-p)
-  (and (log-p . fl> . -inf.0) (log-p . fl< . 0.0)
-       (a . fl> . 0.0) (a . fl< . +inf.0)
-       (b . fl> . 0.0) (b . fl< . +inf.0)))
-
-(: flbeta-inv-log-cdf-limits (Flonum Flonum Flonum -> Flonum))
-(define (flbeta-inv-log-cdf-limits a b log-p)
-  (cond [(not (and (log-p . fl<= . 0.0) (a . fl>= . 0.0) (b . fl>= . 0.0)))  +nan.0]
-        [(or (and (fl= a 0.0) (fl= b 0.0))
-             (and (fl= a +inf.0) (fl= b +inf.0)))
-         +nan.0]
-        [(fl= log-p -inf.0)  0.0]
-        [(fl= a +inf.0)  1.0]
-        [(fl= b +inf.0)  0.0]
-        [(fl= a 0.0)  0.0]
-        [(fl= b 0.0)  1.0]
-        [(fl= log-p 0.0)  1.0]
-        [else  +nan.0]))
-
-(: flbeta-inv-log-cdf* (Flonum Flonum Flonum Flonum -> Flonum))
-(define (flbeta-inv-log-cdf* a b log-p log-1-p)
-  (cond [(not (in-bounds? a b log-p))
-         (flbeta-inv-log-cdf-limits a b log-p)]
-        [else
-         (define mid-log-p
-           (if (a . fl> . b)
-               (lg1- (fllog-beta-inc b a (fl/ b (fl+ a b)) #f #t))
-               (fllog-beta-inc a b (fl/ a (fl+ a b)) #f #t)))
-         (let-values ([(a b log-p log-1-p 1-?)  (if (log-p . fl< . mid-log-p)
-                                                    (values a b log-p log-1-p #f)
-                                                    (values b a log-1-p log-p #t))])
-           (define-values (x0 real-log-p) (flbeta-inv-log-cdf-appx a b log-p log-1-p))
-           (define x (flbeta-inv-log-cdf-newton a b log-p x0 real-log-p))
-           (if 1-? (fl- 1.0 x) x))]))
-
-(: flbeta-inv-cdf (Flonum Flonum Flonum Any Any -> Flonum))
-(define (flbeta-inv-cdf a b p log? 1-p?)
-  (cond [log?
-         (cond [(p . fl<= . 0.0)
-                (let-values ([(log-p log-1-p)  (cond [1-p?  (values (lg1- p) p)]
-                                                     [else  (values p (lg1- p))])])
-                  (flbeta-inv-log-cdf* a b log-p log-1-p))]
-               [else
-                +nan.0])]
-        [else
-         (cond [(and (p . fl>= . 0.0) (p . fl<= . 1.0))
-                (let-values ([(log-p log-1-p)  (cond [1-p?  (values (fllog1p (- p)) (fllog p))]
-                                                     [else  (values (fllog p) (fllog1p (- p)))])])
-                  (flbeta-inv-log-cdf* a b log-p log-1-p))]
-               [else
-                +nan.0])]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-pdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-pdf.rkt
deleted file mode 100644
index 67cf8c5060..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-pdf.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang typed/racket/base
-
-(require "../../../flonum.rkt"
-         "../../functions/beta.rkt")
-
-(provide flbeta-log-pdf)
-
-(: flbeta-log-pdf (Flonum Flonum Flonum -> Flonum))
-(define (flbeta-log-pdf a b x)
-  (cond [(or (a . fl< . 0.0) (b . fl< . 0.0)
-             (and (fl= a 0.0) (fl= b 0.0))
-             (and (fl= a +inf.0) (fl= b +inf.0)))
-         +nan.0]
-        [(or (fl= a 0.0) (fl= b +inf.0))
-         (if (fl= x 0.0) +inf.0 -inf.0)]
-        [(or (fl= b 0.0) (fl= a +inf.0))
-         (if (fl= x 1.0) +inf.0 -inf.0)]
-        [(or (x . fl< . 0.0) (x . fl> . 1.0))
-         -inf.0]
-        ;; Avoid (* 0.0 -inf.0) by taking a limit from the right
-        [(and (fl= a 1.0) (fl= x 0.0))
-         (- (fllog-beta 1.0 b))]
-        ;; Avoid (* 0.0 -inf.0) by taking a limit from the left
-        [(and (fl= b 1.0) (fl= x 1.0))
-         (- (fllog-beta a 1.0))]
-        [else
-         (flsum (list (fl* (fl- a 1.0) (fllog x))
-                      (fl* (fl- b 1.0) (fllog1p (- x)))
-                      (- (fllog-beta a b))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-utils.rkt
deleted file mode 100644
index 4ad6a5fd5b..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-utils.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang typed/racket/base
-
-(require "../../../flonum.rkt")
-
-(provide flbeta-appx-median flbeta-stddev)
-
-(: flbeta-appx-median (Flonum Flonum -> Flonum))
-;; Computes (a-1/3)/(a+b-2/3) in a way that avoids floating-point error
-(define (flbeta-appx-median a b)
-  (cond [(and (a . fl< . 1e20) (b . fl< . 1e20))
-         (fl/ (fl+ (fl* 3.0 a) -1.0)
-              (fl+ (fl+ (fl* 3.0 b) (fl* 3.0 a)) -2.0))]
-        [else
-         (fl/ a (fl+ a b))]))
-
-(: flbeta-stddev (Flonum Flonum -> Flonum))
-;; Computes a*b/((a+b)^2*(a+b+1)) in a way that avoids overflow
-(define (flbeta-stddev a b)
-  (define n (fl+ a b))
-  (cond [(n . fl> . 1e40)
-         (let ([a  (fl* 0.5 a)] [b  (fl* 0.5 b)])
-           (define n (fl+ a b))
-           (fl/ (fl* (flsqrt (fl/ a n)) (flsqrt (fl/ b n)))
-                (fl* (flsqrt 2.0) (flsqrt n))))]
-        [else
-         (fl/ (fl* (flsqrt (fl/ a n)) (flsqrt (fl/ b n)))
-              (flsqrt (fl+ n 1.0)))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/binomial-pdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/binomial-pdf.rkt
deleted file mode 100644
index 02c09d383a..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/binomial-pdf.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang typed/racket/base
-
-(require "../../../flonum.rkt"
-         "../../../base.rkt"
-         "../../functions/stirling-error.rkt"
-         "../../functions/log-gamma.rkt"
-         "../normal-dist.rkt")
-
-(provide flbinomial-pdf flbinomial-log-pdf)
-
-(: flbinomial-pdf-normal (Flonum Flonum Flonum -> Flonum))
-;; Normal approximation with "continuity correction" (i.e. adding 0.5)
-(define (flbinomial-pdf-normal n p k)
-  (flnormal-pdf (* n p) (flsqrt (* n p (- 1.0 p))) (+ k 0.5) #f))
-
-(: near-pow2 (Flonum -> Flonum))
-(define (near-pow2 d)
-  (max 1.0 (flexpt 2.0 (flfloor (/ (fllog d) (fllog 2.0))))))
-
-(: flbinomial-pdf (Flonum Flonum Flonum -> Flonum))
-;; Maximum error grows without bound in the size of `n' (todo: figure out what it's reasonable for)
-(define (flbinomial-pdf n p k)
-  (cond [(or (not (integer? n)) (n . fl< . 0.0)
-             (p . fl< . 0.0) (p . fl> . 1.0)
-             (not (integer? k)))
-         +nan.0]
-        [(or (k . fl< . 0.0) (k . fl> . n))  0.0]
-        [(fl= p 0.0)  (if (fl= k 0.0) 1.0 0.0)]
-        [(fl= p 1.0)  (if (fl= k n) 1.0 0.0)]
-        [(fl= k 0.0)  (flexpt1p (- p) n)]
-        [(fl= k n)    (flexpt p n)]
-        [(n . fl> . 2e13)
-         ;; About here, the normal approximation does better than the algorithms used below
-         ;; The error is NOT GREAT: it's somewhere around 7e10 ulps max
-         (flbinomial-pdf-normal n p k)]
-        [else
-         (define n-k (fl- n k))
-         (define binom-n-k (flbinomial n k))
-         (cond
-           [(rational? binom-n-k)
-            ;; Figure out how much to reduce exponents so flexpt doesn't underflow
-            (define d (near-pow2 (fl/ (flmin (fl* n-k (fllog1p (- p))) (fl* k (fllog p)))
-                                      (fllog (flsqrt +max-subnormal.0)))))
-            ;; Standard definition, with argument reduction
-            (flexpt (* (flexpt binom-n-k (/ d))
-                       (flexpt p (fl/ k d))
-                       (flexpt1p (- p) (fl/ n-k d)))
-                    d)]
-           [else
-            (define-values (n/n-k n/n-k-lo) (fast-fl//error n n-k))
-            (define-values (n/k n/k-lo) (fast-fl//error n k))
-            ;; Figure out how much to reduce exponents so flexpt doesn't underflow OR overflow
-            (define d (near-pow2 (flmax (fl/ (flmax (fl* n-k (fllog n/n-k)) (fl* k (fllog n/k)))
-                                             (fllog (flexpt +max.0 #i1/3)))
-                                        (fl/ (flmin (fl* n-k (fllog1p (- p))) (fl* k (fllog p)))
-                                             (fllog (flexpt +max-subnormal.0 #i1/3))))))
-            ;; Following arrived at by expanding `flgamma' in terms of `flstirling' and
-            ;; recombining terms; note that exponentiation is by `n-k' and `k', which are both
-            ;; smaller than `n'
-            (* (flexpt (* (flexpt1p (- p) (fl/ n-k d))
-                          (flexpt+ n/n-k n/n-k-lo (fl/ n-k d))
-                          (flexpt p (fl/ k d))
-                          (flexpt+ n/k n/k-lo (fl/ k d)))
-                       d)
-               (flexp (- (flstirling n) (flstirling k) (flstirling n-k)))
-               (flsqrt (fl/ (fl/ n/k n-k) (fl* 2.0 pi))))])]))
-
-(: flbinomial-log-pdf (Flonum Flonum Flonum -> Flonum))
-;; Maximum error grows without bound in `n', but is <= 4 ulps for n <= 1e4
-(define (flbinomial-log-pdf n p k)
-  (cond [(or (not (flinteger? n)) (n . fl< . 0.0)
-             (p . fl< . 0.0) (p . fl> . 1.0)
-             (not (flinteger? k)))
-         +nan.0]
-        [(or (k . fl< . 0.0) (k . fl> . n))  -inf.0]
-        [(fl= p 0.0)  (if (fl= k 0.0) 0.0 -inf.0)]
-        [(fl= p 1.0)  (if (fl= k n) 0.0 -inf.0)]
-        [(fl= k 0.0)  (fl* n (fllog1p (- p)))]
-        [(fl= k n)    (fl* n (fllog p))]
-        [(n . fl> . 1e300)
-         (define n-k (fl- n k))
-         (define n/k (fl/ n k))
-         ;; Dividing by 64 is an exact argument reduction that keeps this working when n = +max.0
-         (+ (- (flstirling n) (flstirling k) (flstirling n-k))
-            (fllog (flsqrt (fl/ (fl/ n/k n-k) (fl* 2.0 pi))))
-            (fl* 64.0 (+ (* #i1/64 n-k (fllog1p (- p)))
-                         (* #i1/64 n-k (fllog (fl/ n n-k)))
-                         (* #i1/64 k (fllog p))
-                         (* #i1/64 k (fllog n/k)))))]
-        [else
-         ;; A direct port of the last algorithm in `flbinomial-pdf' to log space
-         (define n-k (fl- n k))
-         (define-values (n/n-k n/n-k-lo) (fast-fl//error n n-k))
-         (define-values (n/k n/k-lo) (fast-fl//error n k))
-         ;; Figure out how much to reduce exponents so flexpt doesn't underflow or overflow
-         (define d (near-pow2 (flmax (fl/ (flmax (fl* n-k (fllog n/n-k)) (fl* k (fllog n/k)))
-                                          (fllog (flexpt +max.0 #i1/3)))
-                                     (fl/ (flmin (fl* n-k (fllog1p (- p))) (fl* k (fllog p)))
-                                          (fllog (flexpt +max-subnormal.0 #i1/3))))))
-         ;; More accurate here to use d*log(x) = log(x^d)
-         (+ (fl* d (fllog (* (flexpt1p (- p) (fl/ n-k d))
-                             (flexpt+ n/n-k n/n-k-lo (fl/ n-k d))
-                             (flexpt p (fl/ k d))
-                             (flexpt+ n/k n/k-lo (fl/ k d)))))
-            (- (flstirling n) (flstirling k) (flstirling n-k))
-            (fllog (flsqrt (fl/ (fl/ n/k n-k) (fl* 2.0 pi)))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/binomial-random.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/binomial-random.rkt
deleted file mode 100644
index e64d9fac80..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/binomial-random.rkt
+++ /dev/null
@@ -1,102 +0,0 @@
-#lang typed/racket/base
-
-#|
-Wolfgang Hormann. The Generation of Binomial Random Variates.
-|#
-
-(require "../../../base.rkt"
-         "../../../flonum.rkt"
-         "../../unsafe.rkt"
-         "normal-random.rkt")
-
-(provide flbinomial-sample)
-
-(: flbinomial-sample-small (Flonum Flonum Natural -> FlVector))
-;; For n*min(p,1-p) <= 30
-(define (flbinomial-sample-small n p m)
-  (let-values ([(p q s?)  (cond [(p . fl< . 0.5)  (values p (fl- 1.0 p) #f)]
-                                [else             (values (fl- 1.0 p) p #t)])])
-    (define q^n (flexpt q n))
-    (define r (fl/ p q))
-    (define g (fl* r (fl+ n 1.0)))
-    (build-flvector
-     m (λ (_)
-         (define k
-           (let: reject : Flonum ()
-             (let loop ([k 0.0] [f q^n] [u  (random)])
-               (cond [(u . fl< . f)  k]
-                     [(k . fl> . 110.0)  (reject)]
-                     [else  (let ([k  (fl+ k 1.0)])
-                              (loop k (fl* f (fl- (fl/ g k) r)) (fl- u f)))]))))
-         (if s? (fl- n k) k)))))
-
-(: flbinomial-sample-hormann (Flonum Flonum Natural -> FlVector))
-;; For n*min(p,1-p) >= 10
-(define (flbinomial-sample-hormann n p j)
-  (let-values ([(p q s?)  (cond [(p . fl< . 0.5)  (values p (fl- 1.0 p) #f)]
-                                [else             (values (fl- 1.0 p) p #t)])])
-    (define σ (flsqrt (* n p q)))
-    (define m (flfloor (fl* (fl+ n 1.0) p)))
-    
-    (define b (fl+ 1.15 (fl* 2.53 σ)))
-    (define a (+ -0.0873 (fl* 0.0248 b) (fl* 0.01 p)))
-    (define c (fl+ 0.5 (fl* n p)))
-    (define α (fl* σ (fl+ 2.83 (fl/ 5.1 b))))
-    (define vr (fl- 0.92 (fl/ 4.2 b)))
-    (build-flvector
-     j (λ (_)
-         (define k
-           (let: loop : Flonum ()
-             (define v (random))
-             (define u (fl- (random) 0.5))
-             (define us (fl- 0.5 (flabs u)))
-             (define k (flfloor (fl+ c (fl* u (fl+ b (fl/ (fl* 2.0 a) us))))))
-             (cond [(or (k . fl< . 0.0) (k . fl> . n))  (loop)]
-                   [(and (us . fl>= . 0.07) (v . fl<= . vr))  k]
-                   [else
-                    (let ([v  (fl* v (fl/ α (fl+ b (fl/ a (fl* us us)))))])
-                      (define h (+ (fllog-factorial m)
-                                   (fllog-factorial (fl- n m))
-                                   (- (fllog-factorial k))
-                                   (- (fllog-factorial (fl- n k)))
-                                   (fl* (fl- k m) (fllog (fl/ p q)))))
-                      (cond [((fllog v) . fl<= . h)  k]
-                            [else  (loop)]))])))
-         (if s? (fl- n k) k)))))
-
-(: flbinomial-sample-normal (Flonum Flonum Natural -> FlVector))
-(define (flbinomial-sample-normal n p m)
-  (define q (fl- 1.0 p))
-  (define μ (fl- (fl* (fl+ n 1.0) p) 0.5))
-  (define σ (flsqrt (* (+ 1.0 n) p q)))
-  (define γ (fl/ (fl- q p) σ))
-  (build-flvector
-   m (λ (_)
-       (let loop ()
-         (define z (unsafe-flvector-ref (flnormal-sample 0.0 1.0 1) 0))
-         (define k (flround (fl+ μ (fl* σ (fl+ z (fl/ (fl* γ (fl- (fl* z z) 1.0)) 6.0))))))
-         (if (and (k . fl>= . 0.0) (k . fl<= . n)) k (loop))))))
-
-(: flbinomial-normal-appx-error-bound (Flonum Flonum -> Flonum))
-;; Returns a bound on the integrated difference between the normal and binomial cdfs
-;; See the Berry-Esséen theorem
-(define (flbinomial-normal-appx-error-bound n p)
-  (define q (fl- 1.0 p))
-  (fl/ (fl* 0.4784 (fl+ (fl* p p) (fl* q q))) (flsqrt (* n p q))))
-
-(: flbinomial-sample (Flonum Flonum Integer -> FlVector))
-(define (flbinomial-sample n p m)
-  (cond [(m . < . 0)  (raise-argument-error 'flbinomial-sample "Natural" 2 n p m)]
-        [(or (not (integer? n)) (n . fl< . 0.0) (p . fl< . 0.0) (p . fl> . 1.0))
-         (build-flvector m (λ (_) +nan.0))]
-        [(or (fl= n 0.0) (fl= p 0.0))
-         (build-flvector m (λ (_) 0.0))]
-        [(fl= p 1.0)
-         (build-flvector m (λ (_) n))]
-        [(and (n . fl> . 1e8)
-              ((flbinomial-normal-appx-error-bound n p) . fl< . (flexp -10.0)))
-         (flbinomial-sample-normal n p m)]
-        [((fl* n (flmin p (fl- 1.0 p))) . fl>= . 10.0)
-         (flbinomial-sample-hormann n p m)]
-        [else 
-         (flbinomial-sample-small n p m)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/delta-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/delta-dist.rkt
deleted file mode 100644
index 7cf20bfe5f..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/delta-dist.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang typed/racket/base
-
-(require "../../../flonum.rkt")
-
-(provide fldelta-pdf
-         fldelta-cdf
-         fldelta-inv-cdf)
-
-(: fldelta-pdf (Float Float Any -> Float))
-(define (fldelta-pdf c x log?)
-  (cond [(fl= x c)  +inf.0]
-        [else  (if log? -inf.0 0.0)]))
-
-(: fldelta-cdf (Float Float Any Any -> Float))
-(define (fldelta-cdf c x log? 1-p?)
-  (cond [(x . fl< . c)
-         (cond [1-p?  (if log? 0.0 1.0)]
-               [else  (if log? -inf.0 0.0)])]
-        [else
-         (cond [1-p?  (if log? -inf.0 0.0)]
-               [else  (if log? 0.0 1.0)])]))
-
-(: fldelta-inv-cdf (Float Float Any Any -> Float))
-(define (fldelta-inv-cdf c q log? 1-p?)
-  (cond [(not (flprobability? q log?))  +nan.0]
-        [1-p?  (cond [log?  (if (q . fl> . -inf.0) c +inf.0)]
-                     [else  (if (q . fl> . 0.0) c +inf.0)])]
-        [else  (cond [log?  (if (q . fl< . 0.0) c +inf.0)]
-                     [else  (if (q . fl< . 1.0) c +inf.0)])]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-inv-cdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-inv-cdf.rkt
deleted file mode 100644
index da50683068..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-inv-cdf.rkt
+++ /dev/null
@@ -1,132 +0,0 @@
-#lang typed/racket/base
-
-#|
-D. J. Best and D. E. Roberts
-Algorithm AS 91: The Percentage Points of the Chi^2 Distribution
-
-Used for starting points in Newton's method
-|#
-
-(require racket/fixnum
-         "../../../flonum.rkt"
-         "../../functions/gamma.rkt"
-         "../../functions/log-gamma.rkt"
-         "../../functions/incomplete-gamma.rkt"
-         "gamma-pdf.rkt"
-         "normal-inv-cdf.rkt")
-
-(provide standard-flgamma-inv-cdf)
-
-(: log-z01 (Float Float Float Any -> Float))
-;; Normal approximation
-(define (log-z01 k log-p log-1-p 1-p?)
-  (define norm-x (cond [1-p?  (- (standard-flnormal-inv-log-cdf log-1-p))]
-                       [else  (standard-flnormal-inv-log-cdf log-p)]))
-  (fl+ (fllog k)
-       (fl* 3.0 (fllog1p (fl+ (fl/ norm-x (fl* 3.0 (flsqrt k))) (fl/ #i-1/9 k))))))
-
-(: z02 (Float Float -> Float))
-;; Derived from z02 in Best-Roberts, or from asymptotic behavior of lower gamma
-(define (z02 k log-p)
-  (flexp (fl/ (fl+ (fl+ log-p (fllog k)) (fllog-gamma k)) k)))
-
-(: z03 (Float Float Float -> Float))
-;; Derived from z03 in Best-Roberts
-(define (z03 k log-1-p log-x)
-  (- (fl+ (fl- log-1-p (fl* (fl- k 1.0) (fl+ (fllog 0.5) log-x)))
-          (fllog-gamma k))))
-
-(: z04 (Float Float -> Float))
-;; Derived from z04 in Best-Roberts
-(define (z04 k log-1-p)
-  (define a (fl+ (fl+ log-1-p (fllog-gamma k)) (fl* (fl- k 1.0) (fllog 2.0))))
-  (let loop ([ch  0.4] [#{n : Fixnum} 99])
-    (define p1 (fl/ 1.0 (fl+ 1.0 (fl* ch (fl+ 4.67 ch)))))
-    (define p2 (fl* ch (fl+ 6.73 (fl* ch (fl+ 6.66 ch)))))
-    (define t (fl- (fl+ -0.5 (fl* (fl+ 4.67 (fl* 2.0 ch)) p1))
-                   (fl/ (fl+ 6.73 (fl* ch (fl+ 13.32 (fl* 3.0 ch))))
-                        p2)))
-    (define new-ch (fl- ch (fl/ (fl- 1.0 (fl* (fl* (flexp (fl+ a (fl* 0.5 ch))) p2) p1)) t)))
-    (cond [(n . fx<= . 0)
-           (* 0.5 new-ch)]
-          [((flabs (fl- ch new-ch)) . fl<= . (flabs (fl* (fl* 4.0 epsilon.0) new-ch)))
-           (* 0.5 new-ch)]
-          [((flabs (fl- ch new-ch)) . fl<= . (flabs (fl* (fl* 1000.0 epsilon.0) new-ch)))
-           (loop new-ch (fxmin 1 (- n 1)))]
-          [else
-           (loop new-ch (- n 1))])))
-
-;; For testing: tells which approximation `flgamma-inv-log-cdf-appx' chooses
-#;;(: flgamma-inv-log-cdf-which-appx (Float Float Float Any -> Float))
-(define (flgamma-inv-log-cdf-which-appx k log-p log-1-p 1-p?)
-  (cond [(k . < . (* -0.62 log-p))  2.0]
-        [(k . > . 0.16)
-         (define log-x (log-z01 k log-p log-1-p 1-p?))
-         (define x (exp log-x))
-         (if (x . > . (+ (* 4.4 k) 6.0)) 3.0 1.0)]
-        [else  4.0]))
-
-(: flgamma-inv-log-cdf-appx (Float Float Float Any -> Float))
-(define (flgamma-inv-log-cdf-appx k log-p log-1-p 1-p?)
-  (cond [(k . fl< . (fl* -0.62 log-p))  (z02 k log-p)]
-        [(k . fl> . 0.16)
-         (define log-x (log-z01 k log-p log-1-p 1-p?))
-         (define x (flexp log-x))
-         (if (x . fl> . (fl+ (fl* 4.4 k) 6.0)) (z03 k log-1-p log-x) x)]
-        [else  (z04 k log-1-p)]))
-
-(: newton-lower-log-iter (Float Float Float -> Float))
-(define (newton-lower-log-iter k log-p x)
-  (define real-log-p (fllog-gamma-inc k x #f #t))
-  (define pdf-log-p (standard-flgamma-log-pdf k x))
-  (define dx (fl/ (fl- log-p real-log-p) (flexp (fl- pdf-log-p real-log-p))))
-  (define new-x (fl+ x dx))
-  (if (and (new-x . fl>= . 0.0) (new-x . fl< . +inf.0)) new-x x))
-
-(: newton-upper-log-iter (Float Float Float -> Float))
-(define (newton-upper-log-iter k log-1-p x)
-  (define real-log-1-p (fllog-gamma-inc k x #t #t))
-  (define pdf-log-p (standard-flgamma-log-pdf k x))
-  (define dx (fl/ (fl- real-log-1-p log-1-p) (flexp (fl- pdf-log-p real-log-1-p))))
-  (define new-x (fl+ x dx))
-  (if (and (new-x . fl>= . 0.0) (new-x . fl< . +inf.0)) new-x x))
-
-(: flgamma-inv-log-cdf-newton (Float Float Float Any Float -> Float))
-(define (flgamma-inv-log-cdf-newton k log-p log-1-p 1-p? x)
-  (define-values (new-x c)
-    (let: loop : (Values Float Fixnum) ([dx : Float  0.0]
-                                        [x : Float  x]
-                                        [c : Fixnum  1])
-      (define new-x (cond [1-p?  (newton-upper-log-iter k log-1-p x)]
-                          [else  (newton-lower-log-iter k log-p x)]))
-      (define new-dx (fl- new-x x))
-      (cond [(or ((flabs (fl- x new-x)) . fl<= . (flabs (fl* (fl* 4.0 epsilon.0) new-x)))
-                 (c . fx>= . 100)
-                 (not (rational? new-x)))
-             (values new-x c)]
-            [(and (c . fx> . 3) (not (fl= (flsgn new-dx) (flsgn dx))))
-             ;; If we detect oscillation, the true value is between new-x and x
-             (values (fl* 0.5 (fl+ new-x x)) c)]
-            [else
-             (loop new-dx new-x (fx+ c 1))])))
-  new-x)
-
-(: standard-flgamma-inv-log-cdf (Float Float Any -> Float))
-(define (standard-flgamma-inv-log-cdf k log-p 1-p?)
-  (let-values ([(log-p log-1-p)  (cond [1-p?  (values (lg1- log-p) log-p)]
-                                       [else  (values log-p (lg1- log-p))])])
-    (cond [(k . fl< . 0.0)  +nan.0]
-          [(k . fl= . 0.0)  (if (fl= log-p -inf.0) 0.0 +inf.0)]
-          [(k . fl> . 1e32)  (exp (log-z01 k log-p log-1-p 1-p?))]
-          [(or (and (not 1-p?) (log-p . fl> . -inf.0) (log-p . fl< . 0.0))
-               (and 1-p? (log-1-p . fl> . -inf.0) (log-1-p . fl< . 0.0)))
-           (define x (flgamma-inv-log-cdf-appx k log-p log-1-p 1-p?))
-           (flgamma-inv-log-cdf-newton k log-p log-1-p 1-p? x)]
-          [(fl= log-p -inf.0)  0.0]
-          [(fl= log-p 0.0)  +inf.0]
-          [else  +nan.0])))
-
-(: standard-flgamma-inv-cdf (Float Float Any Any -> Float))
-(define (standard-flgamma-inv-cdf k p log? 1-p?)
-  (cond [log?  (standard-flgamma-inv-log-cdf k p 1-p?)]
-        [else  (standard-flgamma-inv-log-cdf k (fllog p) 1-p?)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-pdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-pdf.rkt
deleted file mode 100644
index fc31dbf4c8..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-pdf.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang typed/racket/base
-
-(require "../../../flonum.rkt"
-         "../../functions/gamma.rkt"
-         "../../functions/log-gamma.rkt"
-         "../../functions/lambert.rkt"
-         "poisson-pdf.rkt")
-
-(provide standard-flgamma-log-pdf
-         standard-flgamma-pdf)
-
-(: standard-flgamma-pdf (Float Float -> Float))
-;; Error <= 3 ulps for k < 1
-(define (standard-flgamma-pdf k x)
-  (cond [(k . fl< . 0.0)  +nan.0]
-        [(k . fl>= . 1.0)  (flpoisson-pdf x (fl- k 1.0))]
-        [(x . fl<= . 0.0)  (if (fl= x 0.0) +inf.0 0.0)]
-        [(k . fl= . 0.0)  (if (fl= k 0.0) 0.0 +nan.0)]
-        [(x . fl> . 750.0)  0.0]
-        [(k . fl<= . 1e-16)
-         ;; Asymptotic expansion had by replacing gamma(k) with 1/k
-         ;; Switch on x to avoid underflow
-         (cond [(x . fl> . 1e-16)
-                (fl* (fl/ (fl* (flexpt x k) (flexp (- x))) x) k)]
-               [else
-                (fl/ (fl* (fl* (flexpt x k) (flexp (- x))) k) x)])]
-        [else
-         (cond [(or (x . fl> . 1e-300) (k . fl< . 0.1))
-                (fl/ (fl/ (fl* (flexpt x k) (flexp (- x))) (flgamma k)) x)]
-               [else
-                ;; Deal with subnormal x by normalizing first
-                (define d (flexpt 2.0 (flround (fl/ (fllog (flsqrt x)) (fllog 2.0)))))
-                (fl* (fl/ (flexpt (fl/ x d) k) (flgamma k))
-                     (fl/ (flexpt d k) x))])]))
-
-(: flgamma-pdf-invert (Flonum Flonum -> Flonum))
-(define (flgamma-pdf-invert k p)
-  (fl* (fl- 1.0 k)
-       (fllambert (fl/ 1.0 (fl* (flexpt (fl/ p (flgamma k)) (fl/ 1.0 (fl- k 1.0)))
-                                (fl- 1.0 k))))))
-
-(: standard-flgamma-log-pdf (Float Float -> Float))
-(define (standard-flgamma-log-pdf k x)
-  (cond [(k . fl< . 0.0)  +nan.0]
-        [(k . fl>= . 1.0)  (flpoisson-log-pdf x (fl- k 1.0))]
-        [(x . fl<= . 0.0)  (if (fl= x 0.0) +inf.0 -inf.0)]
-        [(k . fl= . 0.0)  (if (fl= k 0.0) -inf.0 +nan.0)]
-        ;; When k is small, log(gamma(k)) ~ -log(k), so -log(x)-log(gamma(k)) ~ -log(x/k)
-        [(k . fl< . 1e-20)
-         (define y (fllog1p (fl/ (fl- x k) k)))
-         (cond [(rational? y)  (fl- (fl- (fl* k (fllog x)) x) y)]
-               [else  (fl- (fl- (fl- (fl* k (fllog x)) (fllog x)) x) (fllog-gamma k))])]
-        [(x . fl< . 0.4)
-         (cond #;[((flabs (fl- x (flgamma-pdf-invert k 1.0))) . fl< . 0.05)
-                  ;; This spot exhibits catastrophic cancellation; I can detect it, but I don't
-                  ;; know what to do about it (besides compute very slowly in higher precision)
-                  +nan.0]
-               [(k . fl< . 0.5)
-                (fl- (fl- (fl- (fl* k (fllog x)) (fllog x)) x)
-                     (fllog-gamma k))]
-               [else
-                (fl- (fl- (fl* (fl- k 1.0) (fllog x)) x) (fllog-gamma k))])]
-        [else
-         (fl- (fl- (fl* (fl- k 1.0) (fllog x)) x) (fllog-gamma k))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-random.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-random.rkt
deleted file mode 100644
index adfda9b161..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-random.rkt
+++ /dev/null
@@ -1,113 +0,0 @@
-#lang typed/racket/base
-
-#|
-Generate Gamma samples using various algorithms
-
-For 0 <= k < 1:
-
-J H Ahrens and U Dieter.
-Computer Methods for Sampling from Gamma, Beta, Poisson and Binomial Distributions.
-Computing, 1974, vol 12, pp 223--246.
-
-For 3 <= k < 1e10:
-
-Pandu R Tadikamalla.
-Computer Generation of Gamma Random Variables--II.
-Communications of the ACM, May 1978, vol 21, issue 5, pp 419--422.
-
-For others: sum of Gamma and Exponential variables, Normal approximation.
-|#
-
-(require "../../../flonum.rkt"
-         "../../unsafe.rkt"
-         "normal-random.rkt")
-
-(provide flgamma-sample)
-
-(: flgamma-sample-small (Flonum Flonum Natural -> FlVector))
-;; Ahrens and Dieter's rejection method
-;; Good for 0.0 <= k < 1.0
-(define (flgamma-sample-small k s n)
-  (cond
-    [(fl= k 0.0)  (make-flvector n 0.0)]
-    [else
-     (define e (fl+ 1.0 (fl* k (flexp -1.0))))
-     (define k-1 (fl- k 1.0))
-     (define 1/k (fl/ 1.0 k))
-     (build-flvector
-      n (λ (_)
-          (let loop ()
-            (define p (fl* e (random)))
-            (define q (fllog (random)))
-            (cond [(p . fl>= . 1.0)
-                   (define x (- (fllog (fl/ (fl- e p) k))))
-                   (cond [(q . fl<= . (fl* k-1 (fllog x)))  (fl* s x)]
-                         [else  (loop)])]
-                  [else
-                   (define x (flexpt p 1/k))
-                   (cond [(q . fl<= . (- x))  (fl* s x)]
-                         [else  (loop)])]))))]))
-
-(: flgamma-sample-1-2 (Flonum Flonum Natural -> FlVector))
-;; Sum of Gamma and Exponential rvs
-;; Good for 1.0 <= k < 2.0
-(define (flgamma-sample-1-2 k s n)
-  (define xs (flgamma-sample-small (fl- k 1.0) s n))
-  (for ([i  (in-range n)])
-    (define x (unsafe-flvector-ref xs i))
-    (unsafe-flvector-set! xs i (fl- x (fl* s (fllog (random))))))
-  xs)
-
-(: flgamma-sample-2-3 (Flonum Flonum Natural -> FlVector))
-;; Sum of Gamma and two Exponential rvs
-;; Good for 2.0 <= k < 3.0
-(define (flgamma-sample-2-3 k s n)
-  (define xs (flgamma-sample-small (fl- k 2.0) s n))
-  (for ([i  (in-range n)])
-    (define x (unsafe-flvector-ref xs i))
-    (unsafe-flvector-set! xs i (fl- x (fl* s (fl+ (fllog (random)) (fllog (random)))))))
-  xs)
-
-(: flgamma-sample-large (Flonum Flonum Natural -> FlVector))
-;; Tadikamalla's rejection method (Laplacian candidate)
-;; Good for 1.0 <= k < huge (where "huge" causes the floating-point ops to behave badly)
-;; Faster than the other methods for large k when k >= 3 or so (Laplacian left tail generates too
-;; many negative candidates, which are rejected, when k < 3)
-(define (flgamma-sample-large k s n)
-  (define A (fl- k 1.0))
-  (define B (fl+ 0.5 (fl* 0.5 (flsqrt (fl- (fl* 4.0 k) 3.0)))))
-  (define C (fl/ (fl* A (fl+ 1.0 B)) B))
-  (define D (fl/ (fl- B 1.0) (fl* A B)))
-  (build-flvector
-   n (λ (_)
-       (let loop ()
-         (define lx (flmax -max.0 (fllog (random))))
-         (define x (fl+ A (fl* B (if ((random) . fl< . 0.5) (- lx) lx))))
-         (cond [(x . fl< . 0.0)
-                (loop)]
-               [((fllog (random)) . fl<= . (fl+ (fl- (fl- (fl* A (fllog (fl* D x))) x) lx) C))
-                (fl* s x)]
-               [else
-                (loop)])))))
-
-(: flgamma-sample-huge (Flonum Flonum Natural -> FlVector))
-;; Normal approximation
-;; Good for 1e10 <= k <= +inf.0
-(define (flgamma-sample-huge k s n)
-  (cond [(fl= k +inf.0)  (build-flvector n (λ (_) +inf.0))]
-        [else
-         (define xs (flnormal-sample k (flsqrt k) n))
-         (for ([i  (in-range n)])
-           (define x (unsafe-flvector-ref xs i))
-           (unsafe-flvector-set! xs i (flmax 0.0 (fl* s x))))
-         xs]))
-
-(: flgamma-sample (Flonum Flonum Integer -> FlVector))
-(define (flgamma-sample k s n)
-  (cond [(n . < . 0)  (raise-argument-error 'flgamma-sample "Natural" 2 k s n)]
-        [(k . fl>= . 1e10)  (flgamma-sample-huge k s n)]
-        [(k . fl>= . 3.0)   (flgamma-sample-large k s n)]
-        [(k . fl>= . 2.0)   (flgamma-sample-2-3 k s n)]
-        [(k . fl>= . 1.0)   (flgamma-sample-1-2 k s n)]
-        [(k . fl>= . 0.0)   (flgamma-sample-small k s n)]
-        [else  (build-flvector n (λ (_) +nan.0))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-cdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-cdf.rkt
deleted file mode 100644
index 5d8066dd38..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-cdf.rkt
+++ /dev/null
@@ -1,123 +0,0 @@
-#lang typed/racket/base
-
-#|
-Rational Chebyshev Approximations for the Inverse of the Error Function
-J. M. Blair, C. A. Edwards and J. H. Johnson
-Mathematics of Computation, Vol. 30, No. 136 (Oct., 1976), pp. 827-830
-
-Cribbed from LGPL Fortran implementation in:
-
-ALGORITHM 715: SPECFUN - A Portable FORTRAN Package of Special Function Routines and Test Drivers
-W. J. Cody
-ACM Transactions on Mathematical Software, Vol. 19 (1993), pp. 22-32
-
-Error is <= 3 ulps for both log and non-log functions
-|#
-
-(require "../../../flonum.rkt"
-         "../../../base.rkt"
-         "normal-utils.rkt")
-
-(provide standard-flnormal-log-cdf
-         standard-flnormal-cdf)
-
-(: R0 (Float Any -> Float))
-(define (R0 x log?)
-  (cond [log?  (if (x . >= . 0.0)
-                   (lg+ (fllog 0.5) (lg/ (fllog x) logsqrt2pi.0))
-                   (lg- (fllog 0.5) (lg/ (fllog (- x)) logsqrt2pi.0)))]
-        [else  (+ 0.5 (/ x sqrt2pi.0))]))
-
-(: R1 (Float Any -> Float))
-(define (R1 x log?)
-  (define x^2 (fl* x x))
-  (let* ([r  6.5682337918207449113e-2]
-         [r  (fl+ (fl* r x^2) 2.2352520354606839287e0)]
-         [r  (fl+ (fl* r x^2) 1.6102823106855587881e2)]
-         [r  (fl+ (fl* r x^2) 1.0676894854603709582e3)]
-         [r  (fl+ (fl* r x^2) 1.8154981253343561249e4)]
-         [s  1.0]
-         [s  (fl+ (fl* s x^2) 4.7202581904688241870e1)]
-         [s  (fl+ (fl* s x^2) 9.7609855173777669322e2)]
-         [s  (fl+ (fl* s x^2) 1.0260932208618978205e4)]
-         [s  (fl+ (fl* s x^2) 4.5507789335026729956e4)])
-    (cond [log?  (if (x . fl>= . 0.0)
-                     (lg+ (fllog 0.5) (lg* (fllog x) (lg/ (fllog r) (fllog s))))
-                     (lg- (fllog 0.5) (lg* (fllog (- x)) (lg/ (fllog r) (fllog s)))))]
-          [else  (fl+ 0.5 (fl* x (fl/ r s)))])))
-
-(: R2-post (Flonum Flonum Any -> Flonum))
-(define (R2-post x q log?)
-  (cond [log?
-         (cond [(x . fl> . 0.0)  (fllog1p (- (fl* (flexp-1/2*x^2 x) q)))]
-               [else  (fl+ (fl* (fl* -0.5 x) x) (fllog q))])]
-        [else
-         (define z (fl* (flexp-1/2*x^2 x) q))
-         (if (x . fl> . 0.0) (fl- 1.0 z) z)]))
-
-(: R2 (Float Any -> Float))
-(define (R2 x log?)
-  (define y (flabs x))
-  (let* ([r  1.0765576773720192317e-8]
-         [r  (fl+ (fl* r y) 3.9894151208813466764e-1)]
-         [r  (fl+ (fl* r y) 8.8831497943883759412e0)]
-         [r  (fl+ (fl* r y) 9.3506656132177855979e1)]
-         [r  (fl+ (fl* r y) 5.9727027639480026226e2)]
-         [r  (fl+ (fl* r y) 2.4945375852903726711e3)]
-         [r  (fl+ (fl* r y) 6.8481904505362823326e3)]
-         [r  (fl+ (fl* r y) 1.1602651437647350124e4)]
-         [r  (fl+ (fl* r y) 9.8427148383839780218e3)]
-         [s  1.0]
-         [s  (fl+ (fl* s y) 2.2266688044328115691e1)]
-         [s  (fl+ (fl* s y) 2.3538790178262499861e2)]
-         [s  (fl+ (fl* s y) 1.5193775994075548050e3)]
-         [s  (fl+ (fl* s y) 6.4855582982667607550e3)]
-         [s  (fl+ (fl* s y) 1.8615571640885098091e4)]
-         [s  (fl+ (fl* s y) 3.4900952721145977266e4)]
-         [s  (fl+ (fl* s y) 3.8912003286093271411e4)]
-         [s  (fl+ (fl* s y) 1.9685429676859990727e4)])
-    (R2-post x (fl/ r s) log?)))
-
-(: R3 (Float Any -> Float))
-(define (R3 x log?)
-  (define x^2 (fl/ (fl/ 1.0 x) x))
-  (let* ([r  2.307344176494017303e-2]
-         [r  (fl+ (fl* r x^2) 2.158985340579569900e-1)]
-         [r  (fl+ (fl* r x^2) 1.274011611602473639e-1)]
-         [r  (fl+ (fl* r x^2) 2.223527787064980700e-2)]
-         [r  (fl+ (fl* r x^2) 1.421619193227893466e-3)]
-         [r  (fl+ (fl* r x^2) 2.9112874951168792e-5)]
-         [s  1.0]
-         [s  (fl+ (fl* s x^2) 1.28426009614491121e0)]
-         [s  (fl+ (fl* s x^2) 4.68238212480865118e-1)]
-         [s  (fl+ (fl* s x^2) 6.59881378689285515e-2)]
-         [s  (fl+ (fl* s x^2) 3.78239633202758244e-3)]
-         [s  (fl+ (fl* s x^2) 7.29751555083966205e-5)])
-    (R2-post x (fl/ (fl- 1/sqrt2pi.0 (fl* x^2 (fl/ r s)))
-                    (flabs x))
-             log?)))
-
-(: standard-flnormal-log-cdf (Float -> Float))
-(define (standard-flnormal-log-cdf x)
-  (define y (flabs x))
-  (cond [(y . fl<= . 1e-5)  (R0 x #t)]
-        [(y . fl<= . 0.6744897501960817)  (R1 x #t)]
-        [(y . fl<= . (flsqrt 32.0))  (R2 x #t)]
-        [(x . fl< . -standard-normal-log-cdf-max.0)  -inf.0]
-        [(x . fl> . +standard-normal-log-cdf-max.0)  0.0]
-        [else  (R3 x #t)]))
-
-(: standard-flnormal-cdf (Float -> Float))
-(define (standard-flnormal-cdf x)
-  (define y (flabs x))
-  (cond [(y . fl<= . 1e-16)  0.5]
-        [(y . fl<= . 1e-6)  (R0 x #f)]
-        [(y . fl<= . 0.6744897501960817)  (R1 x #f)]
-        [(y . fl<= . (flsqrt 32.0))  (R2 x #f)]
-        [(x . fl< . -38.456870800437045)
-         (cond [(x . fl< . -standard-normal-cdf-max.0)  0.0]
-               [else  +min.0])]
-        [(x . fl> . 8.160707840858583)
-         (cond [(x . fl> . +standard-normal-cdf-max.0)  1.0]
-               [else  0.9999999999999999])]
-        [else  (R3 x #f)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-inv-cdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-inv-cdf.rkt
deleted file mode 100644
index 6dce887242..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-inv-cdf.rkt
+++ /dev/null
@@ -1,162 +0,0 @@
-#lang typed/racket/base
-
-#|
-Algorithm AS 241: The Percentage Points of the Normal Distribution
-M. J. Wichura
-Applied Statistics, Vol. 37 (1988), pp. 477-484
-
-Added asymptotic expansions to increase range when given log probabilities, and a Newton iteration to
-fix up answers in the tricky spot between -20000 and -744
-|#
-
-(require "../../../flonum.rkt"
-         "normal-pdf.rkt"
-         "normal-cdf.rkt")
-
-(provide standard-flnormal-inv-cdf
-         standard-flnormal-inv-log-cdf)
-
-(: R1 (Float -> Float))
-;; Returns the degree-7 minimax rational approximation for probit(0.5+q) for |q| <= 0.425
-(define (R1 q)
-  (let* ([r  (fl- 0.180625 (fl* q q))]
-         [x  2.5090809287301226727e3]
-         [x  (fl+ (fl* x r) 3.3430575583588128105e4)]
-         [x  (fl+ (fl* x r) 6.7265770927008700853e4)]
-         [x  (fl+ (fl* x r) 4.5921953931549871457e4)]
-         [x  (fl+ (fl* x r) 1.3731693765509461125e4)]
-         [x  (fl+ (fl* x r) 1.9715909503065514427e3)]
-         [x  (fl+ (fl* x r) 1.3314166789178437745e2)]
-         [x  (fl+ (fl* x r) 3.3871328727963666080e0)]
-         [y  5.2264952788528545610e3]
-         [y  (fl+ (fl* y r) 2.8729085735721942674e4)]
-         [y  (fl+ (fl* y r) 3.9307895800092710610e4)]
-         [y  (fl+ (fl* y r) 2.1213794301586595867e4)]
-         [y  (fl+ (fl* y r) 5.3941960214247511077e3)]
-         [y  (fl+ (fl* y r) 6.8718700749205790830e2)]
-         [y  (fl+ (fl* y r) 4.2313330701600911252e1)]
-         [y  (fl+ (fl* y r) 1.0)])
-    (fl/ x y)))
-
-(: R2 (Float -> Float))
-;; Returns the degree-7 minimax rational approximation for r <= 5
-(define (R2 r)
-  (let* ([r  (fl- r 1.6)]
-         [x  7.7454501427834140764e-4]
-         [x  (fl+ (fl* x r) 2.27238449892691845833e-2)]
-         [x  (fl+ (fl* x r) 2.41780725177450611770e-1)]
-         [x  (fl+ (fl* x r) 1.27045825245236838258e0)]
-         [x  (fl+ (fl* x r) 3.64784832476320460504e0)]
-         [x  (fl+ (fl* x r) 5.76949722146069140550e0)]
-         [x  (fl+ (fl* x r) 4.63033784615654529590e0)]
-         [x  (fl+ (fl* x r) 1.42343711074968357734e0)]
-         [y  1.05075007164441684324e-9]
-         [y  (fl+ (fl* y r) 5.47593808499534494600e-4)]
-         [y  (fl+ (fl* y r) 1.51986665636164571966e-2)]
-         [y  (fl+ (fl* y r) 1.48103976427480074590e-1)]
-         [y  (fl+ (fl* y r) 6.89767334985100004550e-1)]
-         [y  (fl+ (fl* y r) 1.67638483018380384940e0)]
-         [y  (fl+ (fl* y r) 2.05319162663775882187e0)]
-         [y  (fl+ (fl* y r) 1.0)])
-    (fl/ x y)))
-
-(: R3 (Float -> Float))
-;; Returns the degree-7 minimax rational approximation for r > 5
-(define (R3 r)
-  (let* ([r  (fl- r 5.0)]
-         [x  2.01033439929228813265e-7]
-         [x  (fl+ (fl* x r) 2.71155556874348757815e-5)]
-         [x  (fl+ (fl* x r) 1.24266094738807843860e-3)]
-         [x  (fl+ (fl* x r) 2.65321895265761230930e-2)]
-         [x  (fl+ (fl* x r) 2.96560571828504891230e-1)]
-         [x  (fl+ (fl* x r) 1.78482653991729133580e0)]
-         [x  (fl+ (fl* x r) 5.46378491116411436990e0)]
-         [x  (fl+ (fl* x r) 6.65790464350110377720e0)]
-         [y  2.04426310338993978564e-15]
-         [y  (fl+ (fl* y r) 1.42151175831644588870e-7)]
-         [y  (fl+ (fl* y r) 1.84631831751005468180e-5)]
-         [y  (fl+ (fl* y r) 7.86869131145613259100e-4)]
-         [y  (fl+ (fl* y r) 1.48753612908506148525e-2)]
-         [y  (fl+ (fl* y r) 1.36929880922735805310e-1)]
-         [y  (fl+ (fl* y r) 5.99832206555887937690e-1)]
-         [y  (fl+ (fl* y r) 1.0)])
-    (fl/ x y)))
-
-(: standard-flnormal-inv-cdf (Float -> Float))
-;; Assumes 0.0 <= p <= 1.0
-(define (standard-flnormal-inv-cdf p)
-  (cond [(fl= p 0.0)  -inf.0]
-        [(fl= p 1.0)  +inf.0]
-        [else
-         (define q (fl- p 0.5))
-         (cond [((flabs q) . fl<= . 0.425)  (fl* q (R1 q))]
-               [else
-                (define r (flsqrt (- (fllog (flmin p (fl- 1.0 p))))))
-                (cond [(r . <= . 5.0)  (fl* (flsgn q) (R2 r))]
-                      [else  (fl* (flsgn q) (R3 r))])])]))
-
-;; ===================================================================================================
-;; Inverse log cdf
-
-(: inv-log-cdf-huge (Float -> Float))
-;; Computes the simplest asymptotic expansion; good for log-p < -1e18 (and probably nearer zero)
-(define (inv-log-cdf-huge log-p)
-  (fl* (- (flsqrt 2.0)) (flsqrt (- log-p))))
-
-;; More correct than what the FPU comes up with:
-(define logsqrt4pi 1.2655121234846454)
-(define logsqrtpi-1 -0.4276350570752999)
-
-(: inv-log-cdf-big (Float -> Float))
-;; Computes an asymptotic expansion; good for log-p <= -2000 (and probably a bit nearer zero)
-;; It's *better* than R3 around log-p <= -925.0, though not as accurate as we'd like
-(define (inv-log-cdf-big log-p)
-  (let ([log-p  (- log-p)])
-    (define t (fl* 0.5 (fllog (fl- log-p (fllog 2.0)))))
-    (define u (fl- (fl- log-p t) logsqrt4pi))
-    (define v (fl+ t logsqrtpi-1))
-    (define a2 (fl* #i1/4 v))
-    (define a3 (fl+ #i3/16 (fl* v (fl+ #i-3/8 (fl* #i-1/8 v)))))
-    (define a4 (fl+ #i-25/32 (fl* v (fl+ #i9/16 (fl* v (fl+ #i9/32 (fl* #i1/12 v)))))))
-    (fl* (- (flsqrt 2.0))
-         (fl+ (fl+ (fl+ (flsqrt u)
-                        (* a2 (flexpt u -1.5)))
-                   (* a3 (flexpt u -2.5)))
-              (* a4 (flexpt u -3.5))))))
-
-(: newton-log-iter (Float Float -> Float))
-(define (newton-log-iter log-p x)
-  (define real-log-p (standard-flnormal-log-cdf x))
-  (cond [(log-p . fl< . real-log-p)
-         (define dx (flexp (lg/ (lg- real-log-p log-p)
-                                (standard-flnormal-log-pdf x))))
-         (fl- x dx)]
-        [else
-         (define dx (flexp (lg/ (lg- log-p real-log-p)
-                                (standard-flnormal-log-pdf x))))
-         (fl+ x dx)]))
-
-(: standard-flnormal-inv-log-cdf (Float -> Float))
-;; Assumes -inf.0 <= log-p <= 0.0
-(define (standard-flnormal-inv-log-cdf log-p)
-  (cond [(fl= log-p -inf.0)  -inf.0]
-        [(fl= log-p 0.0)     +inf.0]
-        [else
-         (cond [(and (fl<= (fllog 0.075) log-p)
-                     (fl<= log-p (fllog 0.925)))
-                (define q (fl- (flexp log-p) 0.5))
-                (fl* q (R1 q))]
-               [(log-p . fl>= . (fllog 0.5))
-                (define r (flsqrt (- (lg1- log-p))))
-                (if (r . fl<= . 5.0) (R2 r) (R3 r))]
-               [(log-p . fl< . -1e18)
-                (inv-log-cdf-huge log-p)]
-               [(log-p . fl< . -20000.0)
-                (inv-log-cdf-big log-p)]
-               [(log-p . fl< . -925.0)
-                (newton-log-iter log-p (inv-log-cdf-big log-p))]
-               [else
-                (define r (flsqrt (- log-p)))
-                (define x (if (r . fl<= . 5.0) (- (R2 r)) (- (R3 r))))
-                (cond [(log-p . fl< . -744.0)  (newton-log-iter log-p x)]
-                      [else  x])])]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-pdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-pdf.rkt
deleted file mode 100644
index c684c15db2..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-pdf.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         "../../../flonum.rkt"
-         "normal-utils.rkt")
-
-(provide standard-flnormal-log-pdf
-         standard-flnormal-pdf)
-
-(begin-encourage-inline
-  
-  (: standard-flnormal-log-pdf (Float -> Float))
-  ;; For x small, relative error is less than epsilon.0; stays under (* 2 epsilon.0)
-  (define (standard-flnormal-log-pdf x)
-    (fl- (fl* (fl* -0.5 x) x) logsqrt2pi.0))
-  
-  (: standard-flnormal-pdf (Float -> Float))
-  (define (standard-flnormal-pdf x)
-    (cond [(x . fl> . 37.8)
-           ;; We're in the badlands... do *stuff* to reduce relative error
-           (cond [(x . fl> . +standard-normal-pdf-max.0)  0.0]
-                 [(x . fl> . 38.555)  +min.0]
-                 [else
-                  ;; Using the log pdf seems to be more stable here
-                  (flexp (standard-flnormal-log-pdf x))])]
-          [else
-           (fl/ (flexp-1/2*x^2 x) sqrt2pi.0)]))
-  
-  )  ; begin-encourage-inline
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-random.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-random.rkt
deleted file mode 100644
index f7eea0d91d..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-random.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang typed/racket/base
-
-;; Return random samples from a normal distribution using the Box-Muller transform
-
-(require racket/fixnum
-         "../../../flonum.rkt"
-         "../../../base.rkt"
-         "../../unsafe.rkt")
-
-(provide flnormal-sample)
-
-;; Leaving these in, in case we discover in the future that it's actually important for them
-;; to be accurate
-#|
-(: flsin2pix (Flonum -> Flonum))
-;; Computes sin(2*pi*x) accurately in the range [0,1]
-(define (flsin2pix x)
-  (let*-values ([(x s)  (if (x . fl> . 0.5) (values (fl- x 0.5) -1.0) (values x 1.0))]
-                [(x)    (if (x . fl> . 0.25) (fl- 0.5 x) x)])
-    (fl* s (flsin (fl* (fl* 2.0 pi) x)))))
-
-(: flcos2pix (Flonum -> Flonum))
-;; Computes cos(2*pi*x) accurately in the range [0,1]
-(define (flcos2pix x)
-  (let*-values ([(x)  (if (x . fl> . 0.5) (fl- 1.0 x) x)]
-                [(x s)  (if (x . fl> . 0.25) (values (fl- 0.5 x) 1.0) (values x -1.0))])
-    (fl* s (flsin (fl* (fl* 2.0 pi) (fl- x 0.25))))))
-|#
-
-(: nonzero-random (-> Flonum))
-(define (nonzero-random)
-  (let ([u  (random)])
-    (if (fl= u 0.0) (nonzero-random) u)))
-
-(: flnormal-sample (Flonum Flonum Integer -> FlVector))
-;; The Box-Muller method has an bad reputation, but undeservedly:
-;;  1. There's nothing unstable about the floating-point implementation of the transform
-;;  2. It has good tail behavior (i.e. it can return very unlikely numbers)
-;;  3. With today's FPUs, there's no need to worry about computing `log' and `sin' (sheesh)
-;; Points in favor: it's simple and fast
-(define (flnormal-sample c s n)
-  (cond [(not (index? n))  (raise-argument-error 'flnormal-sample "Natural" 2 c s n)]
-        [else
-         (define xs (make-flvector n))
-         (cond
-           [(fx= n 0)  xs]
-           [else
-            (define n-1 (fx- n 1))
-            (let loop ([#{i : Nonnegative-Fixnum} 0])
-              (cond [(i . fx< . n-1)
-                     (define u1 (nonzero-random))
-                     (define u2 (random))
-                     (define t (flsqrt (fl* -2.0 (fllog u1))))
-                     (define z (fl* (fl* 2.0 pi) u2))
-                     (define x (fl* t (flcos z)))
-                     (define y (fl* t (flsin z)))
-                     (unsafe-flvector-set! xs i (fl+ c (fl* s x)))
-                     (unsafe-flvector-set! xs (fx+ i 1) (fl+ c (fl* s y)))
-                     (loop (fx+ i 2))]
-                    [(i . fx= . n-1)
-                     (define u1 (nonzero-random))
-                     (define u2 (random))
-                     (define x (fl* (flsqrt (fl* -2.0 (fllog u1)))
-                                    (flsin (fl* (fl* 2.0 pi) u2))))
-                     (unsafe-flvector-set! xs i (fl+ c (fl* s x)))
-                     xs]
-                    [else
-                     xs]))])]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-utils.rkt
deleted file mode 100644
index 4cf29b380d..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-utils.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         "../../../flonum.rkt")
-
-(provide (all-defined-out))
-
-;; More correct than what the FPU comes up with:
-(define sqrt2pi.0 2.5066282746310007)
-(define 1/sqrt2pi.0 0.3989422804014327)
-(define logsqrt2pi.0 0.9189385332046728)
-(define -logsqrt2pi.0 (- logsqrt2pi.0))
-
-;; The largest input that returns a nonzero density:
-(define +standard-normal-pdf-max.0 38.58015760902841)
-;; The largest input that returns a nonzero log density:
-(define +standard-normal-log-pdf-max.0 1.8961503816218352e+154)
-
-;; The smallest input that returns a nonzero probability:
-(define -standard-normal-cdf-max.0 -38.485408335567335)
-;; The largest input that returns a non-one probability:
-(define +standard-normal-cdf-max.0 8.292361075813595)
-
-;; The smallest input that returns a finite log probability:
-(define -standard-normal-log-cdf-max.0 -1.8961503816218352e+154)
-;; The largest input that returns a nonzero log probability:
-(define +standard-normal-log-cdf-max.0 38.48540833595427)
-
-(begin-encourage-inline
-  
-  (: flexp-1/2*x^2 (Float -> Float))
-  (define (flexp-1/2*x^2 x)
-    (define trunc-x (fl/ (fltruncate (fl* (flexpt 2.0 21.0) x)) (flexpt 2.0 21.0)))
-    (fl* (flexp (fl* (fl* -0.5 trunc-x) trunc-x))
-         (flexp (fl* (fl* -0.5 (fl- x trunc-x)) (fl+ x trunc-x)))))
-  
-  )  ; begin-encourage-inline
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/poisson-pdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/poisson-pdf.rkt
deleted file mode 100644
index 9fa1e6afc7..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/poisson-pdf.rkt
+++ /dev/null
@@ -1,131 +0,0 @@
-#lang typed/racket/base
-
-;; These functions accept non-integral `k' because they're used for the gamma distribution as well
-;; as the Poisson distribution
-
-(require "../../../flonum.rkt"
-         "../../../base.rkt"
-         "../../functions/gamma.rkt"
-         "../../functions/log-gamma.rkt"
-         "../../functions/stirling-error.rkt"
-         "../normal-dist.rkt")
-
-(provide flpoisson-pdf flpoisson-log-pdf)
-
-(: flpoisson-pdf-limits (Flonum Flonum Any -> Flonum))
-(define (flpoisson-pdf-limits l k log?)
-  (cond [(l . fl<= . 0.0)
-         (cond [(fl= l 0.0)  (cond [(fl= k 0.0)  (if log? 0.0 1.0)]
-                                   [else  (if log? -inf.0 0.0)])]
-               [else  +nan.0])]
-        [(k . fl<= . 0.0)
-         (cond [(fl= k 0.0)  (if log? (- l) (flexp (- l)))]
-               [else  (if log? -inf.0 0.0)])]
-        [else  +nan.0]))
-
-(: flpoisson-in-bounds? (Flonum Flonum -> Boolean))
-(define (flpoisson-in-bounds? l k)
-  (and (l . fl> . 0.0) (k . fl> . 0.0) (l . fl< . +inf.0) (k . fl< . +inf.0)))
-
-(define log-c (fllog (flsqrt +max-subnormal.0)))
-
-(: get-div (Flonum Flonum -> Flonum))
-;; Returns a divisor d that ensures l^(k/d)/k^(k/d)*exp((k-l)/d) won't underflow; assumes l and
-;; k are positive
-(define (get-div l k)
-  (define d0 (fl/ (fl* k (fllog (fl/ l k))) log-c))
-  (define d1 (fl/ (fl- k l) log-c))
-  (define d (max d0 d1))
-  (flmax 1.0 (flexpt 2.0 (flfloor (fl/ (fllog d) (fllog 2.0))))))
-
-(: flpoisson-pdf (Flonum Flonum -> Flonum))
-;; Maximum relative error depends on l and k:
-;;   l,k < 4000    5 ulps
-;;   l,k < 1e4    18 ulps
-;;   l,k < 1e5    65 ulps
-;;   l,k < 1e6   170 ulps
-;;   l,k < 1e7   600 ulps
-;; This is due to the argument reduction used in these areas to keep exponentials from underflowing
-;; (search for `get-div' below)
-(define (flpoisson-pdf l k)
-  (cond [(not (flpoisson-in-bounds? l k))
-         (flpoisson-pdf-limits l k #f)]
-        ;; When l is large enough, there's no density > +min.0/2 within 48 stddevs
-        [(and (l . fl> . 500.0) ((flabs (fl- k l)) . fl> . (fl* 48.0 (flsqrt l))))  0.0]
-        ;; Use the direct definition when it won't over/underflow
-        [(and (l . fl< . 700.0) (k . fl> . 1.0) (k . fl< . 100.0))
-         (fl/ (fl/ (fl* (flexpt l k) (flexp (- l))) (flgamma k)) k)]
-        [(k . fl<= . 1.0)
-         ;; Using Stirling error works great here
-         (define-values (l-k l-k-lo) (fast-fl-/error l k))
-         (fl/ (* (flexp (- l-k))
-                 (flexpt l k)
-                 (flexpt k (- k))
-                 (flexp (- l-k-lo))
-                 (/ 1.0 (flsqrt (fl* 2.0 pi))))
-              (fl* (flexp-stirling k) (flsqrt k)))]
-        ;; When l > 1e21, the normal approximation has *lower* relative error than the algorithm
-        ;; below. It *does not* have *low* relative error! It's about 2e9...
-        ;; The normal approximation is perfect starting around 4.2e34, which is incidentally the
-        ;; same time that 48 standard deviations from `l' becomes its floating-point neighbor.
-        [(l . fl>= . 1e21)  (flnormal-pdf l (flsqrt l) k #f)]
-        [else
-         (define-values (l-k l-k-lo) (fast-fl-/error l k))
-         (define-values (l/k l/k-lo) (fast-fl//error l k))
-         (define div (get-div l k))
-         (define y
-           (fl* (flexpt (fl* (flexpt+ l/k l/k-lo (fl/ k div))
-                             (flexp (fl/ (- l-k) div)))
-                        div)
-                (flexp (- l-k-lo))))
-         (fl/ (fl* y (fl/ 1.0 (flsqrt (fl* 2.0 pi))))
-              (fl* (flexp-stirling k) (flsqrt k)))]))
-
-(: fllog-gamma1p-taylor-0 (Flonum -> Flonum))
-;; Good for k < 0.005
-(define fllog-gamma1p-taylor-0
-  (make-flpolyfun
-   (0.0
-    -5.772156649015328606065120900824024310422e-1
-    8.224670334241132182362075833230125946095e-1
-    -4.00685634386531428466579387170483330255e-1
-    2.705808084277845478790009241352919756937e-1
-    -2.073855510286739852662730972914068336114e-1
-    1.69557176997408189952419654965153421317e-1)))
-
-(: flpoisson-log-pdf (Flonum Flonum -> Flonum))
-(define (flpoisson-log-pdf l k)
-  (cond [(not (flpoisson-in-bounds? l k))
-         (flpoisson-pdf-limits l k #t)]
-        [(k . fl<= . 0.005)
-         ;; Don't subtract log(k)+log(gamma(k)) (which suffers from cancellation here), subtract
-         ;; terms from its Taylor series
-         (fl- (fl+ (fl* k (fllog l)) (- l))
-              (fllog-gamma1p-taylor-0 k))]
-        [(and (k . fl< . 1.0) (l . fl< . 1.0))
-         (cond [(or (k . fl<= . 0.96) (l . fl> . 1e-300))
-                (fl- (fllog (fl* (flexpt l k) (flexp (- l))))
-                     (fl+ (fllog k) (fllog-gamma k)))]
-               [else
-                (- (fl* k (fllog l)) (fllog k) (fllog-gamma k) l)])]
-        [(or (k . fl< . 2.0) (l . fl< . 2.0))
-         (- (fl* k (fllog l)) (fllog k) (fllog-gamma k) l)]
-        [(and (k . fl> . 2.0) (l . fl> . 2.0)
-              ((fl- k l) . fl< . (fl* 40.0 (flsqrt l)))
-              ((fl- l k) . fl< . (fl* 29.0 (flsqrt l))))
-         ;; Error <= 1 ulp when flpoisson-pdf error is just a few ulps
-         (fllog (flpoisson-pdf l k))]
-        [(and (or (l . fl> . 1e18) (k . fl> . 1e18))
-              (or ((fl- k l) . fl> . (fl* 0.5 k))
-                  ((fl- l k) . fl> . (fl* 0.5 l))))
-         ;; Asymptotic expansion had by replacing log(gamma(k)) with k*log(k)-k
-         (- (fl* k (fl+ 1.0 (fllog (fl/ l k)))) (fllog k) l)]
-        [else
-         ;; Log version of the above; relative error here also climbs with distance from 0
-         (define-values (l-k l-k-lo) (fast-fl-/error l k))
-         (define-values (l/k l/k-lo) (fast-fl//error l k))
-         (define div (get-div l k))
-         (- (fl* div (fllog (fl* (flexpt+ l/k l/k-lo (fl/ k div))
-                                 (flexp (fl/ (- l-k) div)))))
-            (flstirling k)
-            (fllog (* (flsqrt k) (flsqrt (fl* 2.0 pi)) (flexp l-k-lo))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/poisson-random.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/poisson-random.rkt
deleted file mode 100644
index bc2ebe317b..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/poisson-random.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         "../../../flonum.rkt"
-         "../../../base.rkt"
-         "../../functions/log-gamma.rkt")
-
-(provide flpoisson-sample)
-
-(: flpoisson-sample-small (Flonum Natural -> FlVector))
-;; Good for l < -log(+min.0); suffers from underflow otherwise
-;; O(l) in time and the number of uniform random variates used
-(define (flpoisson-sample-small l n)
-  (define exp-l (flexp (- l)))
-  (build-flvector
-   n (λ (_)
-       (let loop ([k 0.0] [p 1.0])
-         (define u (random))
-         (let ([p  (fl* p u)])
-           (cond [(p . fl<= . exp-l)  k]
-                 [else  (loop (fl+ k 1.0) p)]))))))
-
-(: flpoisson-sample-atkinson (Flonum Natural -> FlVector))
-;; For l < 5, converges so slowly it's not even worth considering; fast for l > 30 or so,
-;; just as fast as flpoisson-random-small for l > 9
-;; For l > 9, uses 5 random variates on average, which converges to 1 as l grows
-(define (flpoisson-sample-atkinson l n)
-  (define c (fl- 0.767 (fl/ 3.36 l)))
-  (define beta (fl/ pi (flsqrt (fl* 3.0 l))))
-  (define alpha (fl* beta l))
-  (define k (fl- (fl- (fllog c) l) (fllog beta)))
-  (define log-l (fllog l))
-  (build-flvector
-   n (λ (_)
-       (let loop ()
-         (define u (random))
-         (define x (fl/ (fl- alpha (fllog (fl/ (fl- 1.0 u) u))) beta))
-         (define n (flfloor (fl+ x 0.5)))
-         (cond [(n . fl< . 0.0)  (loop)]
-               [else
-                (define v (random))
-                (define y (fl- alpha (fl* beta x)))
-                (define 1+exp-y (fl+ 1.0 (flexp y)))
-                (define lhs (fl+ y (fllog (fl/ (fl/ v 1+exp-y) 1+exp-y))))
-                (define rhs (fl- (fl+ k (fl* n log-l)) (fllog-gamma (fl+ n 1.0))))
-                (cond [(lhs . fl<= . rhs)  n]
-                      [else  (loop)])])))))
-
-(: flpoisson-sample (Flonum Integer -> FlVector))
-(define (flpoisson-sample l n)
-  (cond [(n . < . 0)  (raise-argument-error 'flpoisson-sample "Natural" 1 l n)]
-        [(l . fl< . 0.0)  (build-flvector n (λ (_) +nan.0))]
-        [(l . fl= . 0.0)  (build-flvector n (λ (_) 0.0))]
-        [(l . fl<= . 9.0)  (flpoisson-sample-small l n)]
-        [(l . fl<= . 1e35)  (flpoisson-sample-atkinson l n)]
-        [else
-         ;; At this point, the flonums are so sparse that:
-         ;;  1. The mean `l' must be an integer; it is therefore also the mode
-         ;;  2. The only flonum integer with probability >= +min.0 is `l'
-         (build-flvector n (λ (_) l))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/walker-table.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/walker-table.rkt
deleted file mode 100644
index cafb7de662..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/impl/walker-table.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang typed/racket/base
-
-(require racket/list
-         "../../../flonum.rkt")
-
-(provide Walker-Table make-walker-table walker-table-sample)
-
-(define-type (Walker-Entry A) (Pair (Pair A Float) (U Null (List (Pair A Float)))))
-(define-type (Walker-Table A) (Vectorof (Walker-Entry A)))
-
-(: make-walker-table (All (A) ((Listof A) (Listof Float) -> (Walker-Table A))))
-(define (make-walker-table xs ws)
-  (define n (length xs))
-  (define m (length ws))
-  (unless (= n m)
-    (error 'make-walker-table "values and weights aren't the same length; given lengths ~e and ~e"
-           n m))
-  (when (zero? n)
-    (raise-argument-error 'make-walker-table "nonempty (Listof A)" 0 xs ws))
-  (define xws ((inst map (Pair A Flonum) A Flonum) cons xs ws))
-  (define total-weight (flsum ws))
-  (define bin-weight (/ total-weight n))
-  (define small-xws (filter (λ: ([xw : (Pair A Float)]) ((cdr xw) . fl< . bin-weight)) xws))
-  (define large-xws (filter (λ: ([xw : (Pair A Float)]) ((cdr xw) . fl>= . bin-weight)) xws))
-  (list->vector
-   (let: loop : (Listof (Walker-Entry A))
-     ([small-xws : (Listof (Pair A Float))  small-xws]
-      [large-xws : (Listof (Pair A Float))  large-xws])
-     (cond [(null? small-xws)  (map (λ: ([xws : (Pair A Float)]) (list xws)) large-xws)]
-           [(null? large-xws)  (map (λ: ([xws : (Pair A Float)]) (list xws)) small-xws)]
-           [else
-            (define small-x (car (first small-xws)))
-            (define small-w (cdr (first small-xws)))
-            (define large-x (car (first large-xws)))
-            (define large-w (cdr (first large-xws)))
-            (define underweight (fl- bin-weight small-w))
-            (define new-large-w (fl- large-w underweight))
-            (cons (list (cons small-x small-w) (cons large-x underweight))
-                  (if (new-large-w . fl< . bin-weight)
-                      (loop (cons (cons large-x new-large-w) (rest small-xws))
-                            (rest large-xws))
-                      (loop (rest small-xws)
-                            (cons (cons large-x new-large-w)
-                                  (rest large-xws)))))]))))
-
-(: walker-table-sample (All (A) ((Walker-Table A) -> A)))
-(define (walker-table-sample vec)
-  (define len (vector-length vec))
-  (cond [(zero? len)  (raise-argument-error 'walker-table-sample "nonempty Walker-Table" vec)]
-        [else
-         (define i (random len))
-         (define xws (vector-ref vec i))
-         (define rest-xws (rest xws))
-         (cond [(empty? rest-xws)  (car (first xws))]
-               [else
-                (define xw1 (car xws))
-                (define x1 (car xw1))
-                (define w1 (cdr xw1))
-                (define xw2 (car rest-xws))
-                (define x2 (car xw2))
-                (define w2 (cdr xw2))
-                (define r (fl* (random) (fl+ w1 w2)))
-                (if (r . fl< . w1) x1 x2)])]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/logistic-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/logistic-dist.rkt
deleted file mode 100644
index 8ad7a14f83..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/logistic-dist.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide fllogistic-pdf
-         fllogistic-cdf
-         fllogistic-inv-cdf
-         fllogistic-sample
-         Logistic-Dist logistic-dist logistic-dist-mean logistic-dist-scale)
-
-(: fllogistic-pdf (Float Float Float Any -> Float))
-(define fllogistic-pdf
-  (make-symmetric-location-scale-flpdf
-   (λ: ([x : Float] [log? : Any])
-     (cond [log?
-            (cond [(x . fl> . 40.0)  (- x)]
-                  [else  (fl- x (fl* 2.0 (fllog1p (exp x))))])]
-           [else
-            (cond [(x . fl> . 40.0)  (flexp (- x))]
-                  [else  (define exp-x (flexp x))
-                         (define 1+exp-x (fl+ 1.0 exp-x))
-                         (fl/ (fl/ exp-x 1+exp-x) 1+exp-x)])]))))
-
-(: fllogistic-cdf (Float Float Float Any Any -> Float))
-(define fllogistic-cdf
-  (make-symmetric-location-scale-flcdf
-   (λ: ([x : Float] [log? : Any])
-     (cond [log?
-            (cond [(x . fl> . 750.0)  0.0]
-                  [(x . fl< . -40.0)  x]
-                  [else  (- (fllog1p (flexp (- x))))])]
-           [else
-            (cond [(x . fl> .  40.0)  1.0]
-                  [(x . fl< . -40.0)  (flexp x)]
-                  [else  (fl/ 1.0 (fl+ 1.0 (flexp (- x))))])]))))
-
-(: standard-fllogistic-inv-cdf (Float Any -> Float))
-(define (standard-fllogistic-inv-cdf q log?)
-  (cond [log?
-         (cond [(q . fl= . (fllog 1.0))  +inf.0]
-               [(q . fl> . (fllog 0.0))  (fl- q (lg1- q))]
-               [else  -inf.0])]
-        [else
-         (cond [(q . fl= . 1.0)  +inf.0]
-               [(q . fl> . 0.0)  (fl- (fllog q) (fllog1p (- q)))]
-               [else  -inf.0])]))
-
-(: fllogistic-inv-cdf (Float Float Float Any Any -> Float))
-(define fllogistic-inv-cdf (make-symmetric-location-scale-flinv-cdf standard-fllogistic-inv-cdf))
-
-(: fllogistic-sample-single (Float Float -> Float))
-(define fllogistic-sample-single
-  (make-symmetric-location-scale-flrandom standard-fllogistic-inv-cdf))
-
-(: fllogistic-sample (Flonum Flonum Integer -> FlVector))
-(define (fllogistic-sample c s n)
-  (cond [(n . < . 0)  (raise-argument-error 'fllogistic-sample "Natural" 2 c s n)]
-        [else  (build-flvector n (λ (_) (fllogistic-sample-single c s)))]))
-
-;; ===================================================================================================
-;; Distribution object
-
-(define-real-dist: logistic-dist Logistic-Dist
-  logistic-dist-struct ([mean : Flonum] [scale : Flonum]))
-
-(begin-encourage-inline
-  
-  (: logistic-dist (case-> (-> Logistic-Dist)
-                           (Real -> Logistic-Dist)
-                           (Real Real -> Logistic-Dist)))
-  (define (logistic-dist [c 0.0] [s 1.0])
-    (let ([c  (fl c)] [s   (fl s)])
-      (define pdf (opt-lambda: ([x : Real] [log? : Any #f])
-                    (fllogistic-pdf c s (fl x) log?)))
-      (define cdf (opt-lambda: ([x : Real] [log? : Any #f] [1-p? : Any #f])
-                    (fllogistic-cdf c s (fl x) log? 1-p?)))
-      (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                        (fllogistic-inv-cdf c s (fl p) log? 1-p?)))
-      (define sample (case-lambda:
-                       [()  (unsafe-flvector-ref (fllogistic-sample c s 1) 0)]
-                       [([n : Integer])  (flvector->list (fllogistic-sample c s n))]))
-      (logistic-dist-struct pdf sample cdf inv-cdf -inf.0 +inf.0 (delay c) c s)))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/normal-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/normal-dist.rkt
deleted file mode 100644
index 919c431139..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/normal-dist.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "impl/normal-pdf.rkt"
-         "impl/normal-cdf.rkt"
-         "impl/normal-inv-cdf.rkt"
-         "impl/normal-random.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide flnormal-pdf
-         flnormal-cdf
-         flnormal-inv-cdf
-         flnormal-sample
-         Normal-Dist normal-dist normal-dist-mean normal-dist-stddev)
-
-(: flnormal-pdf (Float Float Float Any -> Float))
-(define flnormal-pdf
-  (make-symmetric-location-scale-flpdf
-   (λ: ([x : Float] [log? : Any])
-     (cond [log?  (standard-flnormal-log-pdf x)]
-           [else  (standard-flnormal-pdf x)]))))
-
-(: flnormal-cdf (Float Float Float Any Any -> Float))
-(define flnormal-cdf
-  (make-symmetric-location-scale-flcdf
-   (λ: ([x : Float] [log? : Any])
-     (cond [log?  (standard-flnormal-log-cdf x)]
-           [else  (standard-flnormal-cdf x)]))))
-
-(: flnormal-inv-cdf (Float Float Float Any Any -> Float))
-(define flnormal-inv-cdf
-  (make-symmetric-location-scale-flinv-cdf
-   (λ: ([q : Float] [log? : Any])
-     (cond [log?  (standard-flnormal-inv-log-cdf q)]
-           [else  (standard-flnormal-inv-cdf q)]))))
-
-;; ===================================================================================================
-;; Distribution object
-
-(define-real-dist: normal-dist Normal-Dist
-  normal-dist-struct ([mean : Flonum] [stddev : Flonum]))
-
-(begin-encourage-inline
-  (: normal-dist (case-> (-> Normal-Dist)
-                         (Real -> Normal-Dist)
-                         (Real Real -> Normal-Dist)))
-  (define (normal-dist [c 0.0] [s 1.0])
-    (let ([c  (fl c)] [s   (fl s)])
-      (define pdf (opt-lambda: ([x : Real] [log? : Any #f])
-                    (flnormal-pdf c s (fl x) log?)))
-      (define cdf (opt-lambda: ([x : Real] [log? : Any #f] [1-p? : Any #f])
-                    (flnormal-cdf c s (fl x) log? 1-p?)))
-      (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                        (flnormal-inv-cdf c s (fl p) log? 1-p?)))
-      (define sample (case-lambda:
-                       [()  (unsafe-flvector-ref (flnormal-sample c s 1) 0)]
-                       [([n : Integer])  (flvector->list (flnormal-sample c s n))]))
-      (normal-dist-struct pdf sample cdf inv-cdf -inf.0 +inf.0 (delay c) c s)))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/poisson-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/poisson-dist.rkt
deleted file mode 100644
index 6b2ea84408..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/poisson-dist.rkt
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../../vector.rkt"
-         "../unsafe.rkt"
-         "../functions/incomplete-gamma.rkt"
-         (prefix-in impl: "impl/poisson-pdf.rkt")
-         "impl/poisson-random.rkt"
-         "normal-dist.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide flpoisson-pdf
-         flpoisson-cdf
-         flpoisson-inv-cdf
-         flpoisson-sample
-         flpoisson-median
-         Poisson-Dist poisson-dist poisson-dist-mean)
-
-(: flpoisson-pdf (Flonum Flonum Any -> Flonum))
-(define (flpoisson-pdf l k log?)
-  (cond [(or (l . fl< . 0.0) (not (integer? k)))  +nan.0]
-        [log?  (impl:flpoisson-log-pdf l k)]
-        [else  (impl:flpoisson-pdf l k)]))
-
-(: flpoisson-cdf (Flonum Flonum Any Any -> Flonum))
-(define (flpoisson-cdf l k log? 1-p?)
-  (cond [(l . fl< . 0.0)  +nan.0]
-        [log?  (fllog-gamma-inc (flfloor (fl+ k 1.0)) l (not 1-p?) #t)]
-        [else  (flgamma-inc (flfloor (fl+ k 1.0)) l (not 1-p?) #t)]))
-
-(: flpoisson-inv-cdf (Flonum Flonum Any Any -> Flonum))
-(define (flpoisson-inv-cdf l p log? 1-p?)
-  (cond [(l . fl< . 0.0)  +nan.0]
-        [(not (flprobability? p log?))  +nan.0]
-        [(flprobability-one? p log? 1-p?)  +inf.0]
-        [(flprobability-zero? p log? 1-p?)  0.0]
-        [1-p?  (flfind-least-integer
-                (λ: ([k : Flonum]) ((flpoisson-cdf l k log? 1-p?) . fl< . p))
-                0.0 +inf.0
-                (flmax 0.0 (flnormal-inv-cdf l (flsqrt l) p log? 1-p?)))]
-        [else  (flfind-least-integer
-                (λ: ([k : Flonum]) ((flpoisson-cdf l k log? 1-p?) . fl>= . p))
-                0.0 +inf.0
-                (flmax 0.0 (flnormal-inv-cdf l (flsqrt l) p log? 1-p?)))]))
-
-(: flpoisson-median (Flonum -> Flonum))
-(define (flpoisson-median l)
-  (cond [(l . fl< . 0.0)  +nan.0]
-        [else
-         (define k (flfloor (fl+ l #i1/3)))
-         (cond [(fl= k 0.0)  k]
-               [else  (if ((flpoisson-cdf l (- k 1.0) #f #f) . fl< . 0.5) k (- k 1.0))])]))
-
-(define-real-dist: poisson-dist Poisson-Dist
-  poisson-dist-struct ([mean : Flonum]))
-
-(begin-encourage-inline
-  
-  (: poisson-dist (case-> (-> Poisson-Dist)
-                          (Real -> Poisson-Dist)))
-  (define (poisson-dist [l 0.5])
-    (let ([l  (fl l)])
-      (define pdf (opt-lambda: ([k : Real] [log? : Any #f])
-                    (flpoisson-pdf l (fl k) log?)))
-      (define cdf (opt-lambda: ([k : Real] [log? : Any #f] [1-p? : Any #f])
-                    (flpoisson-cdf l (fl k) log? 1-p?)))
-      (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                        (flpoisson-inv-cdf l (fl p) log? 1-p?)))
-      (define sample (case-lambda:
-                       [()  (unsafe-flvector-ref (flpoisson-sample l 1) 0)]
-                       [([n : Integer])  (flvector->list (flpoisson-sample l n))]))
-      (poisson-dist-struct pdf sample cdf inv-cdf 0.0 +inf.0 (delay (flpoisson-median l)) l)))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/triangle-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/triangle-dist.rkt
deleted file mode 100644
index a9aa0f6f0a..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/triangle-dist.rkt
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "../inline-sort.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide fltriangle-pdf
-         fltriangle-cdf
-         fltriangle-inv-cdf
-         fltriangle-sample
-         Triangle-Dist triangle-dist triangle-dist-min triangle-dist-max triangle-dist-mode)
-
-(: flsort3 (Flonum Flonum Flonum -> (Values Flonum Flonum Flonum)))
-(begin-encourage-inline
-  (define (flsort3 a b c) (inline-sort fl< a b c)))
-
-(: unsafe-fltriangle-pdf (Float Float Float Float Any -> Float))
-(define (unsafe-fltriangle-pdf a b c x log?)
-  (define p
-    (cond [(x . fl< . a)  0.0]
-          [(x . fl< . c)  (fl/ (fl* 2.0 (fl- x a))
-                               (fl* (fl- b a) (fl- c a)))]
-          [(x . fl< . b)  (fl/ (fl* 2.0 (fl- b x))
-                               (fl* (fl- b a) (fl- b c)))]
-          [(= x a b)  +inf.0]
-          [else  0.0]))
-  (if log? (fllog p) p))
-
-(: unsafe-fltriangle-cdf (Float Float Float Float Any Any -> Float))
-(define (unsafe-fltriangle-cdf a b c x log? 1-p?)
-  (define q
-    (cond [(x . fl< . a)  0.0]
-          [(x . fl< . c)  (define x-a (fl- x a))
-                          (fl/ (fl* x-a x-a)
-                               (fl* (fl- b a) (fl- c a)))]
-          [(x . fl< . b)  (define b-x (fl- b x))
-                          (fl- 1.0 (fl/ (fl* b-x b-x)
-                                        (fl* (fl- b a) (fl- b c))))]
-          [else  1.0]))
-  (cond [1-p?  (if log? (fllog1p (- q)) (fl- 1.0 q))]
-        [else  (if log? (fllog q) q)]))
-
-(: unsafe-fltriangle-inv-cdf (Float Float Float Float Any Any -> Float))
-(define (unsafe-fltriangle-inv-cdf a b c q log? 1-p?)
-  (let ([q  (cond [1-p?  (if log? (- (flexpm1 q)) (fl- 1.0 q))]
-                  [else  (if log? (flexp q) q)])])
-    (cond [(q . fl< . 0.0)  +nan.0]
-          [(q . fl= . 0.0)  a]
-          [(q . fl< . (fl/ (fl- c a) (fl- b a)))
-           ;; a < x < c
-           (fl+ a (flsqrt (fl* (fl* (fl- c a) (fl- b a)) q)))]
-          [(q . fl< . 1.0)
-           ;; c < x < b
-           (fl- b (flsqrt (fl* (fl* (fl- b c) (fl- b a)) (fl- 1.0 q))))]
-          [(q . fl= . 1.0)  b]
-          [else  +nan.0])))
-
-(: unsafe-fltriangle-sample-single (Float Float Float -> Float))
-(define (unsafe-fltriangle-sample-single a b c)
-  (unsafe-fltriangle-inv-cdf a b c (fl* 0.5 (random)) #f ((random) . fl> . 0.5)))
-
-(begin-encourage-inline
-  
-  (: fltriangle-pdf (Float Float Float Float Any -> Float))
-  (define (fltriangle-pdf a b c x log?)
-    (let-values ([(a c b)  (flsort3 a b c)])
-      (unsafe-fltriangle-pdf a b c x log?)))
-  
-  (: fltriangle-cdf (Float Float Float Float Any Any -> Float))
-  (define (fltriangle-cdf a b c x log? 1-p?)
-    (let-values ([(a c b)  (flsort3 a b c)])
-      (unsafe-fltriangle-cdf a b c x log? 1-p?)))
-  
-  (: fltriangle-inv-cdf (Float Float Float Float Any Any -> Float))
-  (define (fltriangle-inv-cdf a b c x log? 1-p?)
-    (let-values ([(a c b)  (flsort3 a b c)])
-      (unsafe-fltriangle-inv-cdf a b c x log? 1-p?)))
-  
-  (: fltriangle-sample (Flonum Flonum Flonum Integer -> FlVector))
-  (define (fltriangle-sample a b c n)
-    (cond [(n . < . 0)  (raise-argument-error 'fltriangle-sample "Natural" 3 a b c n)]
-          [else
-           (let-values ([(a c b)  (flsort3 a b c)])
-             (build-flvector n (λ (_) (unsafe-fltriangle-sample-single a b c))))]))
-  
-  )
-
-;; ===================================================================================================
-;; Distribution object
-
-(define-real-dist: triangle-dist Triangle-Dist
-  triangle-dist-struct ([min : Float] [max : Float] [mode : Float]))
-
-(begin-encourage-inline
-  
-  (: triangle-dist (case-> (-> Triangle-Dist)
-                           (Real -> Triangle-Dist)
-                           (Real Real -> Triangle-Dist)
-                           (Real Real Real -> Triangle-Dist)))
-  (define (triangle-dist [a 0.0] [b 1.0] [c (* 0.5 (+ a b))])
-    (let ([a  (fl a)] [b  (fl b)] [c  (fl c)])
-      (let-values ([(a c b)  (flsort3 a b c)])
-        (define pdf (opt-lambda: ([x : Real] [log? : Any #f])
-                      (unsafe-fltriangle-pdf a b c (fl x) log?)))
-        (define cdf (opt-lambda: ([x : Real] [log? : Any #f] [1-p? : Any #f])
-                      (unsafe-fltriangle-cdf a b c (fl x) log? 1-p?)))
-        (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                          (unsafe-fltriangle-inv-cdf a b c (fl p) log? 1-p?)))
-        (define sample (case-lambda:
-                         [()  (unsafe-flvector-ref (fltriangle-sample a b c 1) 0)]
-                         [([n : Integer])  (flvector->list (fltriangle-sample a b c n))]))
-        (triangle-dist-struct
-         pdf sample cdf inv-cdf
-         a b (delay (unsafe-fltriangle-inv-cdf a b c 0.5 #f #f))
-         a b c))))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/truncated-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/truncated-dist.rkt
deleted file mode 100644
index a507bb6b0f..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/truncated-dist.rkt
+++ /dev/null
@@ -1,104 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "dist-struct.rkt"
-         "dist-functions.rkt"
-         "utils.rkt")
-
-(provide Truncated-Dist
-         truncated-dist
-         truncated-dist-min
-         truncated-dist-max
-         truncated-dist-original)
-
-(define-real-dist: truncated-dist Truncated-Dist
-  truncated-dist-struct ([original : Real-Dist] [min : Flonum] [max : Flonum]))
-
-(: truncated-dist (case-> (Real-Dist -> Truncated-Dist)
-                          (Real-Dist Real -> Truncated-Dist)
-                          (Real-Dist Real Real -> Truncated-Dist)))
-(define truncated-dist
-  (case-lambda
-    [(d)    (truncated-dist d -inf.0 +inf.0)]
-    [(d a)  (truncated-dist d -inf.0 a)]
-    [(d a b)
-     (let*-values ([(a b)  (values (fl a) (fl b))]
-                   [(a b)  (values (max (ordered-dist-min d) (min a b))
-                                   (min (ordered-dist-max d) (max a b)))])
-       (unsafe-truncated-dist d a b))]))
-
-(: unsafe-truncated-dist (Real-Dist Float Float -> Truncated-Dist))
-(define (unsafe-truncated-dist d a b)
-  (define orig-pdf (distribution-pdf d))
-  (define orig-cdf (ordered-dist-cdf d))
-  (define orig-inv-cdf (ordered-dist-inv-cdf d))
-  (define orig-sample (distribution-sample d))
-  (define log-P_a<x<=b (real-dist-prob d a b #t #f))
-  (define log-P_x<=a (delay (orig-cdf a #t #f)))
-  (define log-P_x>b (delay (orig-cdf b #t #t)))
-  
-  (: pdf (case-> (Real -> Flonum)
-                 (Real Any -> Flonum)))
-  (define (pdf x [log? #f])
-    (let ([x  (fl x)])
-      (define log-d
-        (cond [(x . fl< . a)  -inf.0]
-              [(x . fl> . b)  -inf.0]
-              [else  (fl- (orig-pdf x #t) log-P_a<x<=b)]))
-      (if log? log-d (flexp log-d))))
-  
-  (: cdf (case-> (Real -> Flonum)
-                 (Real Any -> Flonum)
-                 (Real Any Any -> Flonum)))
-  (define (cdf x [log? #f] [1-p? #f])
-    (let ([x  (fl x)])
-      (define log-p
-        (cond [1-p?  (cond [(x . fl< . a)  0.0]
-                           [(x . fl> . b)  -inf.0]
-                           [else  (flmin 0.0 (fl- (lg- (orig-cdf x #t #t)
-                                                       (force log-P_x>b))
-                                                  log-P_a<x<=b))])]
-              [else  (cond [(x . fl< . a)  -inf.0]
-                           [(x . fl> . b)  0.0]
-                           [else  (flmin 0.0 (fl- (lg- (orig-cdf x #t #f)
-                                                       (force log-P_x<=a))
-                                                  log-P_a<x<=b))])]))
-      (if log? log-p (flexp log-p))))
-  
-  (: inv-cdf (case-> (Real -> Flonum)
-                     (Real Any -> Flonum)
-                     (Real Any Any -> Flonum)))
-  (define (inv-cdf p [log? #f] [1-p? #f])
-    (let ([log-p  (if log? (fl p) (fllog (fl p)))])
-      (cond
-        [(not (flprobability? log-p #t))  +nan.0]
-        [else
-         (define x
-           (cond [1-p?  (cond [(fl= log-p 0.0)  a]
-                              [(fl= log-p -inf.0)  b]
-                              [else  (orig-inv-cdf (lg+ (fl+ log-p log-P_a<x<=b)
-                                                        (force log-P_x>b))
-                                                   #t #t)])]
-                 [else  (cond [(fl= log-p 0.0)  b]
-                              [(fl= log-p -inf.0)  a]
-                              [else  (orig-inv-cdf (lg+ (fl+ log-p log-P_a<x<=b)
-                                                        (force log-P_x<=a))
-                                                   #t #f)])]))
-         (min b (max a x))])))
-  
-  (: sample-single (-> Flonum))
-  (define (sample-single)
-    (inv-cdf (fl* 0.5 (random)) #f ((random) . fl> . 0.5)))
-  
-  (: sample (Sample Flonum))
-  (define sample
-    (case-lambda:
-      [()  (sample-single)]
-      [([n : Integer])
-       (cond [(n . < . 0)  (raise-argument-error 'truncated-dist-sample "Natural" n)]
-             [else  (build-list n (λ (_) (sample-single)))])]))
-  
-  ;; Finally put it together
-  (truncated-dist-struct pdf sample cdf inv-cdf a b (delay (inv-cdf 0.5)) d a b))
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/uniform-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/uniform-dist.rkt
deleted file mode 100644
index aa797545fa..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/uniform-dist.rkt
+++ /dev/null
@@ -1,113 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/promise
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "dist-struct.rkt"
-         "utils.rkt")
-
-(provide fluniform-pdf
-         fluniform-cdf
-         fluniform-inv-cdf
-         fluniform-sample
-         Uniform-Dist uniform-dist uniform-dist-min uniform-dist-max)
-
-(: unsafe-fluniform-pdf (Float Float Float Any -> Float))
-(define (unsafe-fluniform-pdf a b x log?)
-  (cond [log?  (cond [(and (x . fl>= . a) (x . fl<= . b))  (- (fllog (fl- b a)))]
-                     [else  -inf.0])]
-        [else  (cond [(and (x . fl>= . a) (x . fl<= . b))  (fl/ 1.0 (fl- b a))]
-                     [else  0.0])]))
-
-(: unsafe-fluniform-cdf (Float Float Float Any Any -> Float))
-(define (unsafe-fluniform-cdf a b x log? 1-p?)
-  (cond [1-p?  (define q
-                 (cond [(x . fl< . a)  1.0]
-                       [(x . fl>= . b)  0.0]
-                       [else  (fl/ (fl- b x) (fl- b a))]))
-               (if log? (fllog q) q)]
-        [else  (define q
-                 (cond [(x . fl< . a)  0.0]
-                       [(x . fl>= . b)  1.0]
-                       [else  (fl/ (fl- x a) (fl- b a))]))
-               (if log? (fllog q) q)]))
-
-(: unsafe-fluniform-inv-cdf (Float Float Float Any Any -> Float))
-(define (unsafe-fluniform-inv-cdf a b q log? 1-p?)
-  (cond [(not (flprobability? q log?))  +nan.0]
-        [1-p?  (let ([q  (if log? (flexp q) q)])
-                 (cond [(fl= q 1.0)  a]
-                       [(fl= q 0.0)  b]
-                       [else  (fl+ (fl* (fl- a b) q) b)]))]
-        [else  (let ([q  (if log? (flexp q) q)])
-                 (cond [(fl= q 1.0)  b]
-                       [(fl= q 0.0)  a]
-                       [else  (fl+ (fl* (fl- b a) q) a)]))]))
-
-(: unsafe-fluniform-sample (Float Float Natural -> FlVector))
-;; Chooses a random flonum in [a,b] in a way that preserves the precision of the random flonum
-;; returned by (random)
-(define (unsafe-fluniform-sample a b n)
-  (define d (fl- b a))
-  (cond
-    ;; Both positive, `a' smaller in magnitude
-    [(a . fl>= . 0.0)  (build-flvector n (λ (_) (fl+ a (fl* d (random)))))]
-    ;; Both negative, `b' smaller in magnitude
-    [(b . fl<= . 0.0)  (build-flvector n (λ (_) (fl- b (fl* d (random)))))]
-    ;; Straddle 0 case
-    [else
-     (build-flvector
-      n (λ (_) (if ((fl* d (random)) . fl> . b) (fl* a (random)) (fl* b (random)))))]))
-
-(begin-encourage-inline
-  
-  (: fluniform-pdf (Float Float Float Any -> Float))
-  (define (fluniform-pdf a b x log?)
-    (unsafe-fluniform-pdf (flmin a b) (flmax a b) x log?))
-  
-  (: fluniform-cdf (Float Float Float Any Any -> Float))
-  (define (fluniform-cdf a b x log? 1-p?)
-    (unsafe-fluniform-cdf (flmin a b) (flmax a b) x log? 1-p?))
-  
-  (: fluniform-inv-cdf (Float Float Float Any Any -> Float))
-  (define (fluniform-inv-cdf a b q log? 1-p?)
-    (unsafe-fluniform-inv-cdf (flmin a b) (flmax a b) q log? 1-p?))
-  
-  (: fluniform-sample (Float Float Integer -> FlVector))
-  (define (fluniform-sample a b n)
-    (cond [(n . < . 0)  (raise-argument-error 'fluniform-sample "Natural" 2 a b n)]
-          [else  (unsafe-fluniform-sample (flmin a b) (flmax a b) n)]))
-  
-  )
-
-;; ===================================================================================================
-;; Distribution object
-
-(define-real-dist: uniform-dist Uniform-Dist
-  uniform-dist-struct ([min : Float] [max : Float]))
-
-(begin-encourage-inline
-  
-  (: uniform-dist (case-> (-> Uniform-Dist)
-                          (Real -> Uniform-Dist)
-                          (Real Real -> Uniform-Dist)))
-  (define uniform-dist
-    (case-lambda
-      [()   (uniform-dist 0.0 1.0)]
-      [(b)  (uniform-dist 0.0 b)]
-      [(a b)
-       (let ([a  (fl a)] [b  (fl b)])
-         (let ([a  (flmin a b)] [b  (flmax a b)])
-           (define pdf (opt-lambda: ([x : Real] [log? : Any #f])
-                         (unsafe-fluniform-pdf a b (fl x) log?)))
-           (define cdf (opt-lambda: ([x : Real] [log? : Any #f] [1-p? : Any #f])
-                         (unsafe-fluniform-cdf a b (fl x) log? 1-p?)))
-           (define inv-cdf (opt-lambda: ([p : Real] [log? : Any #f] [1-p? : Any #f])
-                             (unsafe-fluniform-inv-cdf a b (fl p) log? 1-p?)))
-           (define sample (case-lambda:
-                            [()  (unsafe-flvector-ref (fluniform-sample a b 1) 0)]
-                            [([n : Integer])  (flvector->list (fluniform-sample a b n))]))
-           (uniform-dist-struct pdf sample cdf inv-cdf a b (delay (fl* 0.5 (fl+ a b))) a b)))]))
-  
-  )
diff --git a/pkgs/math-pkgs/math-lib/math/private/distributions/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/utils.rkt
deleted file mode 100644
index 247e7ea428..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/distributions/utils.rkt
+++ /dev/null
@@ -1,115 +0,0 @@
-#lang typed/racket/base
-
-(require (for-syntax racket/base
-                     racket/syntax
-                     racket/string)
-         racket/performance-hint
-         "../../flonum.rkt"
-         "../utils.rkt"
-         "impl/delta-dist.rkt"
-         "dist-struct.rkt")
-
-(provide (all-defined-out))
-
-(begin-encourage-inline
-  
-  (: flprobability (Flonum Any Any -> Flonum))
-  (define (flprobability p log? 1-p?)
-    (cond [1-p?  (if log? (fllog1p (- p)) (- 1.0 p))]
-          [else  (if log? (fllog p) p)]))
-  
-  (: flprobability-zero? (Flonum Any Any -> Boolean))
-  (define (flprobability-zero? p log? 1-p?)
-    (cond [1-p?  (if log? (fl= p 0.0) (fl= p 1.0))]
-          [else  (if log? (fl= p -inf.0) (fl= p 0.0))]))
-  
-  (: flprobability-one? (Flonum Any Any -> Boolean))
-  (define (flprobability-one? p log? 1-p?)
-    (cond [1-p?  (if log? (fl= p -inf.0) (fl= p 0.0))]
-          [else  (if log? (fl= p 0.0) (fl= p 1.0))]))
-  
-  )
-
-;; ===================================================================================================
-
-(define-syntax (define-real-dist: stx)
-  (syntax-case stx (:)
-    [(_ name type-name struct-name ([arg-names : arg-types] ...) struct-opts ...)
-     (let ([arg-name-lst  (syntax->list #'(arg-names ...))])
-       (with-syntax* ([(struct-proc-names ...)
-                       (map (λ (arg-name) (format-id #'struct-name "~a-~a" #'struct-name arg-name))
-                            arg-name-lst)]
-                      [(proc-names ...)
-                       (map (λ (arg-name) (format-id #'name "~a-~a" #'name arg-name))
-                            arg-name-lst)])
-         (syntax/loc stx
-           (begin-encourage-inline
-             (struct: (In Out) struct-name ordered-dist ([arg-names : arg-types] ...) struct-opts ...
-               #:property prop:custom-print-quotable 'never
-               #:property prop:custom-write
-               (λ (v port mode)
-                 (pretty-print-constructor 'name (list (struct-proc-names v) ...) port mode)))
-             (define-type type-name (struct-name Real Flonum))
-             (: proc-names (type-name -> arg-types)) ...
-             (define (proc-names v) (struct-proc-names v)) ...))))]))
-
-;; ===================================================================================================
-;; One-sided scale family distributions (e.g. exponential)
-
-(define-syntax-rule (make-one-sided-scale-flpdf standard-flpdf)
-  (λ: ([s : Float] [x : Float] [log? : Any])
-    (cond [(fl= s 0.0)  (fldelta-pdf 0.0 x log?)]
-          [(and (s . fl> . 0.0) (x . fl< . 0.0))  (if log? -inf.0 0.0)]
-          [(and (s . fl< . 0.0) (x . fl> . 0.0))  (if log? -inf.0 0.0)]
-          [else  (let ([q  (standard-flpdf (fl/ x s) log?)])
-                   (if log? (fl- q (fllog (flabs s))) (fl/ q (flabs s))))])))
-
-(define-syntax-rule (make-one-sided-scale-flcdf standard-flcdf)
-  (λ: ([s : Float] [x : Float] [log? : Any] [1-p? : Any])
-    (cond [(fl= s 0.0)  (fldelta-cdf 0.0 x log? 1-p?)]
-          [(and (s . fl> . 0.0) (x . fl< . 0.0))
-           (cond [1-p?  (if log? 0.0 1.0)]
-                 [else  (if log? -inf.0 0.0)])]
-          [(and (s . fl< . 0.0) (x . fl> . 0.0))
-           (cond [1-p?  (if log? -inf.0 0.0)]
-                 [else  (if log? 0.0 1.0)])]
-          [else
-           (standard-flcdf (fl/ x s) log? (if (s . fl> . 0.0) 1-p? (not 1-p?)))])))
-
-(define-syntax-rule (make-one-sided-scale-flinv-cdf standard-flinv-cdf)
-  (λ: ([s : Float] [q : Float] [log? : Any] [1-p? : Any])
-    (cond [(fl= s 0.0)  (fldelta-inv-cdf 0.0 q log? 1-p?)]
-          [(not (flprobability? q log?))  +nan.0]
-          [else  (fl* s (standard-flinv-cdf q log? 1-p?))])))
-
-(define-syntax-rule (make-one-sided-scale-flrandom standard-flinv-cdf)
-  (λ: ([s : Float])
-    (fl* s (standard-flinv-cdf (fl* 0.5 (random)) #f ((random) . fl> . 0.5)))))
-
-;; ===================================================================================================
-;; Location-scale family distributions (e.g. Cauchy, logistic, normal)
-
-(define-syntax-rule (make-symmetric-location-scale-flpdf standard-flpdf)
-  (λ: ([c : Float] [s : Float] [x : Float] [log? : Any])
-    (cond [(fl= s 0.0)  (fldelta-pdf c x log?)]
-          [else  (let ([q  (standard-flpdf (flabs (fl/ (fl- x c) s)) log?)])
-                   (if log? (fl- q (fllog (flabs s))) (fl/ q (flabs s))))])))
-
-(define-syntax-rule (make-symmetric-location-scale-flcdf standard-flcdf)
-  (λ: ([c : Float] [s : Float] [x : Float] [log? : Any] [1-p? : Any])
-    (cond [(fl= s 0.0)  (fldelta-cdf c x log? 1-p?)]
-          [else  (let ([x  (fl/ (fl- x c) s)])
-                   (standard-flcdf (if 1-p? (- x) x) log?))])))
-
-(define-syntax-rule (make-symmetric-location-scale-flinv-cdf standard-flinv-cdf)
-  (λ: ([c : Float] [s : Float] [q : Float] [log? : Any] [1-p? : Any])
-    (cond [(fl= s 0.0)  (fldelta-inv-cdf c q log? 1-p?)]
-          [(not (flprobability? q log?))  +nan.0]
-          [else  (let* ([x  (standard-flinv-cdf q log?)]
-                        [x  (if 1-p? (- x) x)])
-                   (fl+ (fl* x s) c))])))
-
-(define-syntax-rule (make-symmetric-location-scale-flrandom standard-flinv-cdf)
-  (λ: ([c : Float] [s : Float])
-    (define x (standard-flinv-cdf (fl* 0.5 (random)) #f))
-    (fl+ c (fl* s (if ((random) . fl> . 0.5) x (- x))))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/exception.rkt b/pkgs/math-pkgs/math-lib/math/private/exception.rkt
deleted file mode 100644
index 6ab51070da..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/exception.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-
-(provide raise-length-error)
-
-(: raise-length-error (Symbol String Any Index -> Nothing))
-(define (raise-length-error name type-name xs n)
-  (raise-argument-error name (format "~a of length ~a" type-name n) xs))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-base.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-base.rkt
deleted file mode 100644
index 44af901f75..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-base.rkt
+++ /dev/null
@@ -1,346 +0,0 @@
-#lang typed/racket/base
-
-#|
-Arithmetic based on:
-
-Jonathan Richard Shewchuk
-Adaptive Precision Floating-Point Arithmetic and Fast Robust Geometric Predicates
-Discrete & Computational Geometry 18(3):305–363, October 1997
-
-Other parts shamelessly stolen from crlibm (which is LGPL)
-|#
-
-(require racket/math
-         "../flonum-functions.rkt"
-         "../flonum-bits.rkt"
-         "../flonum-error.rkt"
-         "../flonum-constants.rkt"
-         "../utils.rkt")
-
-(provide fl2? fl2zero? fl2rational? fl2positive? fl2negative? fl2infinite? fl2nan?
-         fl2 fl2->real
-         fl2ulp fl2ulp-error fl2step fl2next fl2prev
-         +max.hi +max.lo -max.hi -max.lo
-         +max-subnormal.hi -max-subnormal.hi
-         fl2abs fl2+ fl2- fl2= fl2> fl2< fl2>= fl2<=
-         fl2*split-fl fl2* fl2sqr fl2/
-         fl2sqrt flsqrt/error)
-
-(: floverlapping? (Flonum Flonum -> Boolean))
-(define (floverlapping? x2 x1)
-  (define-values (s2 e2) (flonum->sig+exp (flabs x2)))
-  (define-values (s1 e1) (flonum->sig+exp (flabs x1)))
-  (define-values (n1 n2)
-    (if (e2 . > . e1)
-        (values s1 (arithmetic-shift s2 (- e2 e1)))
-        (values (arithmetic-shift s1 (- e1 e2)) s2)))
-  (not (= (bitwise-ior n1 n2)
-          (bitwise-xor n1 n2))))
-
-(: fl2? (Flonum Flonum -> Boolean))
-(define (fl2? x2 x1)
-  (cond [(flrational? x2)
-         (cond [(flrational? x1)
-                (cond [((flabs x2) . < . (flabs x1))  #f]
-                      [else (not (floverlapping? x2 x1))])]
-               [else  #f])]
-        [else
-         (fl= x1 0.0)]))
-
-(define-syntax-rule (define-simple-fl2-predicate fl2pred? flpred?)
-  (begin
-    (: fl2pred? (Flonum Flonum -> Boolean))
-    (define (fl2pred? x2 x1)
-      (flpred? (fl+ x2 x1)))))
-
-(define-simple-fl2-predicate fl2zero? (λ (x) (fl= x 0.0)))
-(define-simple-fl2-predicate fl2positive? (λ (x) (fl> x 0.0)))
-(define-simple-fl2-predicate fl2negative? (λ (x) (fl< x 0.0)))
-(define-simple-fl2-predicate fl2rational? flrational?)
-(define-simple-fl2-predicate fl2nan? flnan?)
-(define-simple-fl2-predicate fl2infinite? flinfinite?)
-
-;; ===================================================================================================
-;; Conversion
-
-(: fl2 (case-> (Real -> (Values Flonum Flonum))
-               (Flonum Flonum -> (Values Flonum Flonum))))
-(define fl2
-  (case-lambda
-    [(x)
-     (cond [(flonum? x)  (values x 0.0)]
-           [(single-flonum? x)  (values (fl x) 0.0)]
-           [else
-            (define x2 (fl x))
-            (if (flinfinite? x2)
-                (values x2 0.0)
-                (let* ([x  (- x (inexact->exact x2))]
-                       [x1  (fl x)]
-                       [x  (- x (inexact->exact x1))])
-                  (let-values ([(x2 x1)  (fl+/error x2 x1)])
-                    (values x2 (fl+ x1 (fl x))))))])]
-    [(x2 x1)
-     (if (and (fl= x2 0.0) (fl= x1 0.0))
-         (values x2 0.0)
-         (fl+/error x2 x1))]))
-
-(: fl2eqv? (case-> (Flonum Flonum Flonum -> Boolean)
-                   (Flonum Flonum Flonum Flonum -> Boolean)))
-(define (fl2eqv? x2 x1 y2 [y1 0.0])
-  (and (eqv? x2 y2) (fl= x1 y1)))
-
-(: fl2->real (Flonum Flonum -> Real))
-(define (fl2->real x2 x1)
-  (if (flrational? x2)
-      (+ (inexact->exact x2) (inexact->exact x1))
-      x2))
-
-(: fl4->fl2 (Flonum Flonum Flonum Flonum -> (Values Flonum Flonum)))
-(define (fl4->fl2 e4 e3 e2 e1)
-  (values e4 (fl+ e3 (fl+ e2 e1))))
-
-;; ===================================================================================================
-;; Error
-
-(: fl2ulp (Flonum Flonum -> Flonum))
-(define (fl2ulp x2 x1)
-  (cond [(fl= x2 0.0)  0.0]
-        [else  (flmax +min.0 (fl* (flulp x2) epsilon.0))]))
-
-(: fl2ulp-error (Flonum Flonum Real -> Flonum))
-(define (fl2ulp-error x2 x1 r)
-  (define x (fl2->real x2 x1))
-  (define-values (r2 r1) (fl2 r))
-  (cond [(eqv? x r)  0.0]
-        [(and (fl= x2 0.0) (fl= r2 0.0))  0.0]
-        [(and (fl= x2 +inf.0) (fl= r2 +inf.0))  0.0]
-        [(and (fl= x2 -inf.0) (fl= r2 -inf.0))  0.0]
-        [(zero? r)  +inf.0]
-        [(and (rational? x) (flrational? r2))
-         (flabs (fl (/ (- (inexact->exact x) (inexact->exact r))
-                       (inexact->exact (flmax +min.0 (fl2ulp r2 r1))))))]
-        [else  +inf.0]))
-
-(define-values (+max.hi +max.lo)
-  (values +max.0 (flprev (* 0.5 (flulp +max.0)))))
-
-(define-values (-max.hi -max.lo)
-  (values (- +max.hi) (- +max.lo)))
-
-(: fl2step (Flonum Flonum Integer -> (Values Flonum Flonum)))
-(define (fl2step x2 x1 n)
-  (let-values ([(x2 x1)  (fast-fl+/error x2 x1)])
-    (cond [(flnan? x2)  (values +nan.0 0.0)]
-          [(fl= x2 +inf.0)  (fl+/error +max.hi (flstep +max.lo (+ n 1)))]
-          [(fl= x2 -inf.0)  (fl+/error -max.hi (flstep -max.lo (- n 1)))]
-          [else  (fl+/error x2 (flstep x1 n))])))
-
-(: fl2next (Flonum Flonum -> (Values Flonum Flonum)))
-(define (fl2next x2 x1) (fl2step x2 x1 1))
-
-(: fl2prev (Flonum Flonum -> (Values Flonum Flonum)))
-(define (fl2prev x2 x1) (fl2step x2 x1 -1))
-
-(define +min-normal.hi (fl/ (flnext +max-subnormal.0) epsilon.0))
-
-(define-values (+max-subnormal.hi +max-subnormal.lo)
-  (fl2prev +min-normal.hi 0.0))
-
-(define-values (-max-subnormal.hi -max-subnormal.lo)
-  (values (- +max-subnormal.hi) (- +max-subnormal.lo)))
-
-;; ===================================================================================================
-;; Absolute value
-
-(: fl2abs (case-> (Flonum -> (Values Flonum Flonum))
-                  (Flonum Flonum -> (Values Flonum Flonum))))
-(define fl2abs
-  (case-lambda
-    [(x)  (values (flabs x) 0.0)]
-    [(x2 x1)
-     (cond [(flnan? x2)  (values +nan.0 0.0)]
-           [(fl= x2 0.0)  (values 0.0 0.0)]
-           [(fl> x2 0.0)  (values x2 x1)]
-           [else  (values (- x2) (- x1))])]))
-
-;; ===================================================================================================
-;; Addition and subtraction
-
-(: fl2+ (case-> (Flonum Flonum Flonum -> (Values Flonum Flonum))
-                (Flonum Flonum Flonum Flonum -> (Values Flonum Flonum))))
-(define (fl2+ x2 x1 y2 [y1 0.0])
-  (define r (fl+ x2 y2))
-  (cond [(not (flrational? r))  (values r 0.0)]
-        [(and (fl= x2 0.0) (fl= y2 0.0))  (values r 0.0)]
-        [else
-         (define s (if ((flabs x2) . fl> . (flabs y2))
-                       (fl+ (fl+ (fl+ (fl- x2 r) y2) y1) x1)
-                       (fl+ (fl+ (fl+ (fl- y2 r) x2) x1) y1)))
-         (define z2 (fl+ r s))
-         (values z2 (fl+ (fl- r z2) s))]))
-
-(: fl2- (case-> (Flonum Flonum Flonum -> (Values Flonum Flonum))
-                (Flonum Flonum Flonum Flonum -> (Values Flonum Flonum))))
-(define (fl2- x2 x1 y2 [y1 0.0])
-  (fl2+ x2 x1 (- y2) (- y1)))
-
-;; ===================================================================================================
-;; Comparison
-
-(define-syntax-rule (define-fl2-comparison name flcomp)
-  (begin
-    (: name (Flonum Flonum Flonum Flonum -> Boolean))
-    (define (name x2 x1 y2 y1)
-      (let-values ([(z2 z1)  (fl2- x2 x1 y2 y1)])
-        ((fl+ z2 z1) . flcomp . 0.0)))))
-
-(define-fl2-comparison fl2= fl=)
-(define-fl2-comparison fl2> fl>)
-(define-fl2-comparison fl2< fl<)
-(define-fl2-comparison fl2>= fl>=)
-(define-fl2-comparison fl2<= fl<=)
-
-;; ===================================================================================================
-;; Multiplication and division
-
-(: raw-split-fl2*split-fl (Flonum Flonum Flonum Flonum Flonum Flonum
-                                  -> (Values Flonum Flonum Flonum Flonum)))
-(define (raw-split-fl2*split-fl e2-hi e2-lo e1-hi e1-lo b-hi b-lo)
-  (let*-values ([(b)   (fl+ b-lo b-hi)]
-                [(Q1)  (fl* (fl+ e1-lo e1-hi) b)]
-                [(h1)  (- (- Q1
-                             (fl* e1-hi b-hi)
-                             (fl* e1-lo b-hi)
-                             (fl* e1-hi b-lo)
-                             (fl* e1-lo b-lo)))]
-                [(T)  (fl* (fl+ e2-lo e2-hi) b)]
-                [(t)  (- (- T
-                            (fl* e2-hi b-hi)
-                            (fl* e2-lo b-hi)
-                            (fl* e2-hi b-lo)
-                            (fl* e2-lo b-lo)))]
-                [(Q2 h2)  (fast-fl+/error Q1 t)]
-                [(h4 h3)  (fast-mono-fl+/error T Q2)])
-    (values h4 h3 h2 h1)))
-
-(: split-fl2*split-fl (Flonum Flonum Flonum Flonum Flonum Flonum -> (Values Flonum Flonum)))
-(define (split-fl2*split-fl e2-hi e2-lo e1-hi e1-lo b-hi b-lo)
-  (let-values ([(h4 h3 h2 h1)  (raw-split-fl2*split-fl e2-hi e2-lo e1-hi e1-lo b-hi b-lo)])
-    (fl4->fl2 h4 h3 h2 h1)))
-
-(: fl2*split-fl (Flonum Flonum Flonum Flonum -> (Values Flonum Flonum)))
-(define (fl2*split-fl e2 e1 b-hi b-lo)
-  (let*-values ([(e2-hi e2-lo)  (flsplit e2)]
-                [(e1-hi e1-lo)  (flsplit e1)]
-                [(h4 h3 h2 h1)  (raw-split-fl2*split-fl e2-hi e2-lo e1-hi e1-lo b-hi b-lo)])
-    (fl4->fl2 h4 h3 h2 h1)))
-
-(: fl2* (case-> (Flonum Flonum Flonum -> (Values Flonum Flonum))
-                (Flonum Flonum Flonum Flonum -> (Values Flonum Flonum))))
-(define (fl2* x2 x1 y2 [y1 0.0])
-  (define z (fl* x2 y2))
-  (cond [(fl= z 0.0)  (values z 0.0)]
-        [(flsubnormal? z)  (values z 0.0)]
-        [(and (flrational? x2) (flrational? y2) (z . fl>= . -inf.0) (z . fl<= . +inf.0))
-         (define dx (near-pow2 x2))
-         (define dy (near-pow2 y2))
-         (define d (fl* dx dy))
-         (define d? (and (d . fl> . 0.0) (d . fl< . +inf.0)))
-         (let* ([x2  (fl/ x2 dx)]
-                [x1  (fl/ x1 dx)]
-                [y2  (fl/ y2 dy)]
-                [y1  (fl/ y1 dy)]
-                [up  (fl* x2 (fl+ 1.0 (flexpt 2.0 27.0)))]
-                [vp  (fl* y2 (fl+ 1.0 (flexpt 2.0 27.0)))]
-                [u1  (fl+ (fl- x2 up) up)]
-                [v1  (fl+ (fl- y2 vp) vp)]
-                [u2  (fl- x2 u1)]
-                [v2  (fl- y2 v1)]
-                [m2  (fl* x2 y2)]
-                [m1  (fl+ (fl+ (fl+ (fl+ (fl+ (fl- (fl* u1 v1) m2)
-                                              (fl* u1 v2))
-                                         (fl* u2 v1))
-                                    (fl* u2 v2))
-                               (fl* x2 y1))
-                          (fl* x1 y2))]
-                [z2  (fl+ m2 m1)]
-                [z1  (fl+ (fl- m2 z2) m1)]
-                [z2  (if d? (fl* z2 d) (fl* (fl* z2 dx) dy))])
-           (values z2 (if (flrational? z2) (if d? (fl* z1 d) (fl* (fl* z1 dx) dy)) 0.0)))]
-        [else
-         (values z 0.0)]))
-
-(: fl2sqr (case-> (Flonum -> (Values Flonum Flonum))
-                  (Flonum Flonum -> (Values Flonum Flonum))))
-;; Derived from fl2*
-(define fl2sqr
-  (case-lambda
-    [(x)  (flsqr/error x)]
-    [(x2 x1)
-     (define z (fl* x2 x2))
-     (cond [(fl= z 0.0)  (values z 0.0)]
-           [(flsubnormal? z)  (values z 0.0)]
-           [(and (flrational? x2) (z . fl>= . -inf.0) (z . fl<= . +inf.0))
-            (define dx (near-pow2 x2))
-            (define d (fl* dx dx))
-            (define d? (and (d . fl> . 0.0) (d . fl< . +inf.0)))
-            (let* ([x2  (fl/ x2 dx)]
-                   [x1  (fl/ x1 dx)]
-                   [up  (fl* x2 (fl+ 1.0 (flexpt 2.0 27.0)))]
-                   [u1  (fl+ (fl- x2 up) up)]
-                   [u2  (fl- x2 u1)]
-                   [m2  (fl* x2 x2)]
-                   [m1  (fl+ (fl+ (fl+ (fl- (fl* u1 u1) m2)
-                                       (fl* 2.0 (fl* u1 u2)))
-                                  (fl* u2 u2))
-                             (fl* 2.0 (fl* x2 x1)))]
-                   [z2  (fl+ m2 m1)]
-                   [z1  (fl+ (fl- m2 z2) m1)]
-                   [z2  (if d? (fl* z2 d) (fl* (fl* z2 dx) dx))])
-              (values z2 (if (flrational? z2) (if d? (fl* z1 d) (fl* (fl* z1 dx) dx)) 0.0)))]
-           [else
-            (values z 0.0)])]))
-
-(: fl2/ (case-> (Flonum Flonum Flonum -> (Values Flonum Flonum))
-                (Flonum Flonum Flonum Flonum -> (Values Flonum Flonum))))
-(define (fl2/ x2 x1 y2 [y1 0.0])
-  (define z (fl/ x2 y2))
-  (cond [(and (flrational? z) (not (fl= z 0.0)) (flrational? y2))
-         (define d (near-pow2/div x2 y2))
-         (let*-values ([(x2 x1)  (values (fl/ x2 d) (fl/ x1 d))]
-                       [(y2 y1)  (values (fl/ y2 d) (fl/ y1 d))]
-                       [(c2)  (fl/ x2 y2)]
-                       [(u2 u1)  (fl*/error c2 y2)]
-                       [(c1)  (fl/ (fl- (fl+ (fl- (fl- x2 u2) u1) x1) (fl* c2 y1)) y2)]
-                       [(z2)  (fl+ c2 c1)])
-           (values z2 (if (flrational? z2) (fl+ (fl- c2 z2) c1) 0.0)))]
-        [else
-         (values z 0.0)]))
-
-;; ===================================================================================================
-;; Square roots
-
-(: fl2sqrt (case-> (Flonum -> (Values Flonum Flonum))
-                   (Flonum Flonum -> (Values Flonum Flonum))))
-;; One-flonum estimate followed by one Newton's method iteration
-(define (fl2sqrt x2 [x1 0.0])
-  (cond [(and (flrational? x2) (not (fl= x2 0.0)))
-         (define-values (d^2 d)
-           (cond [(x2 . fl<= . +max-subnormal.hi)  (values (flexpt 2.0 -104.0)
-                                                           (flexpt 2.0 -52.0))]
-                 [(x2 . fl> . 1e300)  (values (flexpt 2.0 104.0)
-                                              (flexpt 2.0 52.0))]
-                 [else  (values 1.0 1.0)]))
-         (let*-values ([(x2 x1)  (values (fl/ x2 d^2) (fl/ x1 d^2))]
-                       [(y)  (flsqrt (fl+ x2 x1))]
-                       [(z2 z1)  (fast-flsqr/error y)]
-                       [(dy2 dy1)  (fl2- x2 x1 z2 z1)]
-                       [(dy2 dy1)  (fl2/ dy2 dy1 y)]
-                       [(y2 y1)  (fl2+ (fl* 0.5 dy2) (fl* 0.5 dy1) y)]
-                       [(y2)  (fl* y2 d)])
-           (values y2 (if (flrational? y2) (fl* y1 d) 0.0)))]
-        [else
-         (values (flsqrt x2) 0.0)]))
-
-(: flsqrt/error (Flonum -> (Values Flonum Flonum)))
-(define (flsqrt/error x) (fl2sqrt x 0.0))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-exp-reduction.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-exp-reduction.rkt
deleted file mode 100644
index 5650f6b51f..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-exp-reduction.rkt
+++ /dev/null
@@ -1,1497 +0,0 @@
-#lang typed/racket/base
-
-#|
-The constants used for argument reduction in flexp/error and flexpm1/error
-|#
-
-(require "../../../base.rkt"
-         "../flonum-constants.rkt"
-         "../flonum-functions.rkt")
-
-(provide expm1-min expm1-max exp-min flexpm1-reduction)
-
-;; Exponent base used for argument reduction
-(define base (fl+ 1.0 #i1/32))
-;; Bounds for which flexpm1-small/error is accurate
-(define expm1-min 0.0005)
-(define expm1-max (- (fllog +min.0)))
-(define exp-min 0.00118)
-;; Least and greatest integer exponents used in argument reduction
-(define kmin (exact-floor (fl/ (fllog expm1-min) (fllog base))))
-(define kmax (exact-floor (fl/ (fllog expm1-max) (fllog base))))
-
-#|
-Argument reduction for exponential:
-
-  exp(x) = exp(base^k) * exp(x - base^k)
-
-where base = 1 + ε is chosen to minimize *both* of the following:
-
- 1. The number of reductions necessary to get arguments near zero
- 2. The size of the table of exp(base^k)
-
-These two goals are at odds: the closer `base' is to 1, the larger the table is, but fewer
-reductions are necessary. Currently, the table has 462 entries, and it takes <= 4 reductions to get
-`x' to where (+ 1 (flexpm1-small/error x)) is accurate.
-
-The natural number `k' is chosen to reduce positive `x' as close to zero as possible without going
-negative.
-|#
-
-;; Generated by (parameterize ([bf-precision 1070]) (bigfloat->fl2 (bfexpm1 (bf -650.0))))
-(define-values (expm1-neg-650-hi expm1-neg-650-lo)
-  (values -1.0 5.111951948651156e-283))
-
-(: flexpm1-reduction (Flonum -> (Values Flonum Flonum Flonum)))
-(define (flexpm1-reduction x)
-  (cond [(x . fl> . expm1-max)  (values x 0.0 0.0)]
-        [(x . fl>= . expm1-min)
-         (define k (flfloor (fl/ (fllog x) (fllog base))))
-         (define i (- (fl->exact-integer k) kmin))
-         (define expm1-b^k (vector-ref positive-ds i))
-         (define b^k (vector-ref base^ks i))
-         (let*-values ([(d2 d1)  (values (car expm1-b^k) (cdr expm1-b^k))])
-           (values (fl- x b^k) d2 d1))]
-        [(x . fl> . (- expm1-min))  (values x 0.0 0.0)]
-        [(x . fl> . -650.0)
-         (define k (flfloor (fl/ (fllog (- x)) (fllog base))))
-         (define i (- (fl->exact-integer k) kmin))
-         (define expm1-b^k (vector-ref negative-ds i))
-         (define b^k (vector-ref base^ks i))
-         (let*-values ([(d2 d1)  (values (car expm1-b^k) (cdr expm1-b^k))])
-           (values (fl+ x b^k) d2 d1))]
-        [(x . fl> . (fllog +min.0))
-         ;; This special case keeps flexpm1-reduction from returning subnormals
-         (values (fl+ x 650.0) expm1-neg-650-hi expm1-neg-650-lo)]
-        [else
-         (values x 0.0 0.0)]))
-
-;; The tables below were generated by the following code:
-#|
-(require "../../../bigfloat.rkt"
-         "expansion-base.rkt")
-
-(: base^ks (Vectorof Flonum))
-;; base^k for each kmin <= k <= kmax
-(define base^ks
-  (build-vector (- (+ kmax 1) kmin) (λ: ([k : Index]) (flexpt base (fl (+ k kmin))))))
-
-(: positive-ds (Vectorof (Pair Flonum Flonum)))
-;; exp(base^k) - 1 for each kmin <= k <= kmax
-(define positive-ds
-  (build-vector (- (+ kmax 1) kmin)
-                (λ: ([k : Index])
-                  (parameterize ([bf-precision 256])
-                    (define x (flexpt base (fl (+ k kmin))))
-                    (define-values (y2 y1) (bigfloat->fl2 (bfexpm1 (bf x))))
-                    (cons y2 y1)))))
-
-(: negative-ds (Vectorof (Pair Flonum Flonum)))
-;; exp(-base^k) - 1 for each kmin <= k <= kmax
-(define negative-ds
-  (build-vector (- (+ kmax 1) kmin)
-                (λ: ([k : Index])
-                  (parameterize ([bf-precision 1070])
-                    (define x (flexpt base (fl (+ k kmin))))
-                    (define-values (y2 y1) (bigfloat->fl2 (bfexpm1 (bf (- x)))))
-                    (cons y2 y1)))))
-|#
-
-(: base^ks (Vectorof Flonum))
-(define base^ks
-  #(0.0004849953040935936
-    0.0005001514073465185
-    0.0005157811388260972
-    0.0005318992994144127
-    0.0005485211525211131
-    0.0005656624385373979
-    0.0005833393897416915
-    0.0006015687456711194
-    0.0006203677689733418
-    0.0006397542617537588
-    0.0006597465824335637
-    0.0006803636631346127
-    0.0007016250276075693
-    0.0007235508097203059
-    0.0007461617725240654
-    0.0007694793279154424
-    0.0007935255569128001
-    0.000818323230566325
-    0.0008438958315215226
-    0.0008702675762565702
-    0.0008974634380145881
-    0.0009255091704525439
-    0.000954431332029186
-    0.000984257311155098
-    0.0010150153521286949
-    0.0010467345818827166
-    0.0010794450375665515
-    0.0011131776949905063
-    0.0011479644979589595
-    0.001183838388520177
-    0.0012208333381614324
-    0.0012589843799789772
-    0.0012983276418533202
-    0.0013389003806612365
-    0.0013807410175569002
-    0.0014238891743555532
-    0.0014683857110541643
-    0.001514272764524607
-    0.001561593788416001
-    0.001610393594304001
-    0.001660718394126001
-    0.0017126158439424385
-    0.0017661350890656397
-    0.0018213268105989411
-    0.001878243273430158
-    0.0019369383757248503
-    0.001997467699966252
-    0.0020598885655901972
-    0.002124260083264891
-    0.002190643210866919
-    0.00225910081120651
-    0.0023296977115567137
-    0.0024025007650428608
-    0.0024775789139504503
-    0.002555003255011402
-    0.002634847106730508
-    0.0027171860788158366
-    0.002802098143778831
-    0.00288966371077192
-    0.002979965701733542
-    0.0030730896299127155
-    0.003169123680847488
-    0.003268158795873972
-    0.0033702887582450335
-    0.003475610281940191
-    0.0035842231032508216
-    0.00369623007522741
-    0.0038117372650782666
-    0.003930854054611963
-    0.004053693243818586
-    0.004180371157687917
-    0.004311007756365664
-    0.004445726748752091
-    0.004584655709650594
-    0.004727926200577175
-    0.004875673894345212
-    0.0050280387035435
-    0.005185164913029235
-    0.005347201316561398
-    0.005514301357703941
-    0.00568662327513219
-    0.005864330252480071
-    0.006047590572870073
-    0.006236577778272263
-    0.00643147083384327
-    0.006632454297400873
-    0.00683971849419465
-    0.007053459697138233
-    0.007273880312673803
-    0.007501189072444859
-    0.007735601230958761
-    0.007977338769426223
-    0.008226630605970791
-    0.008483712812407378
-    0.00874882883779511
-    0.009022229738976206
-    0.009304174418319213
-    0.009594929868891688
-    0.009894771427294554
-    0.010203983034397509
-    0.010522857504222431
-    0.010851696801229382
-    0.0111908123262678
-    0.011540525211463669
-    0.011901166624321908
-    0.012273078081331969
-    0.012656611771373592
-    0.013052130889229017
-    0.013460009979517424
-    0.013880635291377343
-    0.014314405144232885
-    0.014761730304990162
-    0.015223034377021105
-    0.015698754201303015
-    0.016189340270093736
-    0.016695257153534163
-    0.017216983939582105
-    0.017755014687694047
-    0.018309858896684485
-    0.018882041987205875
-    0.01947210579930606
-    0.020080609105534372
-    0.020708128140082323
-    0.021355257144459894
-    0.022022608930224268
-    0.022710815459293775
-    0.023420528442396706
-    0.024152419956221603
-    0.02490718307985353
-    0.02568553255109895
-    0.026488205443320794
-    0.027315961863424568
-    0.028169585671656585
-    0.029049885223895854
-    0.0299576941371426
-    0.030893872078928304
-    0.03185930558139482
-    0.032854908880813403
-    0.03388162478333882
-    0.03494042555781816
-    0.03603231385649998
-    0.0371583236645156
-    0.03831952127903172
-    0.03951700631900146
-    0.04075191276647025
-    0.04202541004042245
-    0.043338704104185645
-    0.04469303860744145
-    0.046089696063924
-    0.04752999906592162
-    0.04901531153673167
-    0.05054704002225453
-    0.05212663502294999
-    0.05375559236741718
-    0.05543545462889896
-    0.05716781258605205
-    0.058954306729366183
-    0.060796628814658873
-    0.06269652346511696
-    0.06465578982340187
-    0.06667628325538318
-    0.0687599171071139
-    0.07090866451671121
-    0.07312456028285844
-    0.07540970279169776
-    0.07776625600393831
-    0.08019645150406139
-    0.0827025906135633
-    0.08528704657023717
-    0.08795226677555708
-    0.09070077511229323
-    0.0935351743345524
-    0.09645814853250716
-    0.09947246567414801
-    0.10258098022646514
-    0.10578663585854217
-    0.10909246822912161
-    0.11250160786128166
-    0.11601728310694671
-    0.1196428232040388
-    0.12338166142916501
-    0.12723733834882642
-    0.13121350517222724
-    0.13531392720885935
-    0.1395424874341362
-    0.14390319016645295
-    0.1484001648591546
-    0.15303767001100319
-    0.15782009719884704
-    0.16275197523631102
-    0.16783797446244572
-    0.17308291116439717
-    0.17849175213828458
-    0.18406961939260597
-    0.1898217949986249
-    0.19575372609233194
-    0.2018710300327173
-    0.20817949972123972
-    0.21468510908752847
-    0.22139401874651374
-    0.22831258183234227
-    0.23544735001460299
-    0.24280507970255932
-    0.2503927384432643
-    0.2582175115196163
-    0.2662868087546043
-    0.2746082715281857
-    0.2831897800134415
-    0.29203946063886155
-    0.30116569378382596
-    0.3105771217145705
-    0.3202826567681509
-    0.33029148979215556
-    0.34061309884816043
-    0.35125725818716547
-    0.36223404750551436
-    0.3735538614900617
-    0.3852274196616261
-    0.39726577652605194
-    0.40968033204249105
-    0.4224828424188189
-    0.435685431244407
-    0.4493006009707947
-    0.46334124475113203
-    0.47782065864960493
-    0.4927525542324051
-    0.5081510715521678
-    0.524030792538173
-    0.5404067548049909
-    0.5572944658926469
-    0.574709917951792
-    0.5926696028877856
-    0.6111905279780289
-    0.6302902319773422
-    0.6499868017266343
-    0.6702988892805916
-    0.69124572957061
-    0.7128471586196916
-    0.735123632326557
-    0.7580962458367618
-    0.7817867535191607
-    0.8062175895666345
-    0.8314118892405917
-    0.8573935107793602
-    0.8841870579912152
-    0.9118179035534407
-    0.9403122130394858
-    0.9696969696969697
-    1.0
-    1.03125
-    1.0634765625
-    1.096710205078125
-    1.1309823989868164
-    1.1663255989551544
-    1.202773273922503
-    1.2403599387325812
-    1.2791211868179744
-    1.319093723906036
-    1.3603154027780997
-    1.4028252591149153
-    1.4466635484622565
-    1.491871784351702
-    1.5384927776126927
-    1.5865706769130892
-    1.6361510105666233
-    1.6872807296468302
-    1.7400082524482938
-    1.794383510337303
-    1.8504579950353437
-    1.9082848073801981
-    1.9679187076108293
-    2.0294161672236677
-    2.0928354224494075
-    2.158236529400951
-    2.225681420944731
-    2.295233965349254
-    2.366960026766418
-    2.440927527602869
-    2.5172065128404584
-    2.5958692163667227
-    2.676990129378183
-    2.760646070921251
-    2.8469162606375398
-    2.935882393782463
-    3.027628718588165
-    3.1222421160440454
-    3.2198121821704215
-    3.3204313128632474
-    3.424194791390224
-    3.5312008786211684
-    3.6415509060780797
-    3.7553493718930198
-    3.8727040397646766
-    3.993726041007323
-    4.118529979788802
-    4.247234041657202
-    4.37996010545899
-    4.516833858754583
-    4.657984916840664
-    4.803546945491934
-    4.953657787538557
-    5.108459593399137
-    5.26809895569286
-    5.432727048058262
-    5.602499768310082
-    5.777577886069773
-    5.958127195009453
-    6.144318669853498
-    6.33632862828642
-    6.534338897920371
-    6.738536988480383
-    6.9491162693703945
-    7.166276152788219
-    7.390222282562851
-    7.62116672889294
-    7.859328189170845
-    8.104932195082434
-    8.35821132617876
-    8.619405430121846
-    8.888761849813154
-    9.166535657619814
-    9.452989896920434
-    9.748395831199197
-    10.053033200924173
-    10.367190488453053
-    10.69116519121721
-    11.025264103442748
-    11.369803606675335
-    11.725109969383938
-    12.091519655927186
-    12.46937964517491
-    12.859047759086627
-    13.260893001558085
-    13.675295907856775
-    14.102648904977299
-    14.543356683257839
-    14.997836579609647
-    15.466518972722447
-    15.949847690620023
-    16.4482804309519
-    16.962289194419146
-    17.492360731744746
-    18.03899700461177
-    18.602715661005888
-    19.18405052541232
-    19.783552104331456
-    20.401788107591813
-    21.03934398595406
-    21.69682348551512
-    22.37484921943747
-    23.07406325754489
-    23.79512773434317
-    24.538725476041392
-    25.305560647167685
-    26.096359417391675
-    26.911870649185165
-    27.7528666069722
-    28.620143688440084
-    29.514523178703836
-    30.43685202803833
-    31.388003653914527
-    32.36887876809936
-    33.380406229602464
-    34.42354392427754
-    35.49927967191121
-    36.60863216165844
-    37.75265191671026
-    38.93242228910746
-    40.14906048564207
-    41.403718625818385
-    42.69758483287521
-    44.03188435890256
-    45.40788074511826
-    46.82687701840321
-    48.29021692522831
-    49.799286204141694
-    51.35551389802112
-    52.960373707334284
-    54.61538538568848
-    56.322116178991244
-    58.08218230958472
-    59.89725050675924
-    61.76903958509547
-    63.6993220721297
-    65.68992588688376
-    67.74273607084888
-    69.8596965730629
-    72.04281209097111
-    74.29414996881395
-    76.6158421553394
-    79.01008722269376
-    81.47915244840293
-    84.02537596241552
-    86.65116896124101
-    89.35901799127979
-    92.15148730350728
-    95.03122128174189
-    98.00094694679632
-    101.0634765388837
-    104.22171018072382
-    107.47863862387145
-    110.83734608086742
-    114.30101314589453
-    117.87291980670373
-    121.55644855066323
-    125.35508756787145
-    129.27243405436744
-    133.31219761856642
-    137.47820379414662
-    141.7743976627137
-    146.2048475896735
-    150.7737490768508
-    155.48542873550238
-    160.34434838348685
-    165.3551092704708
-    170.522456435173
-    175.85128319877217
-    181.34663579873381
-    187.01371816744424
-    192.85789686017688
-    198.8847061370574
-    205.09985320384044
-    211.50922361646045
-    218.11888685447485
-    224.93510206867717
-    231.96432400832333
-    239.21320913358343
-    246.68862191900791
-    254.39764135397692
-    262.3475676462887
-    270.5459291352352
-    279.00048942071135
-    287.71925471510855
-    296.7104814249557
-    305.98268396948555
-    315.54464284353196
-    325.4054129323924
-    335.57433208652964
-    346.0610299642337
-    356.875437150616
-    368.0277945615727
-    379.52866314162185
-    391.38893386479754
-    403.6198380480725
-    416.23295798707477
-    429.24023792417086
-    442.6539953593012
-    456.4869327142793
-    470.7521493616006
-    485.4631540291506
-    500.63387759256153
-    516.2786862673291
-    532.4123952131831
-    549.050282563595
-    566.2081038937074
-    583.9021071403857
-    602.1490479885229
-    620.9662057381641
-    640.3713996674818
-    660.3830059070906
-    681.0199748416873
-    702.3018490554899
-    724.248781838474))
-
-(: positive-ds (Vectorof (Pair Flonum Flonum)))
-(define positive-ds
-  #((0.00048511293333186416 . 7.287053259455084e-21)
-    (0.0005002765039165264 . 5.174812552711603e-20)
-    (0.0005159141767895225 . 2.1220112778569672e-20)
-    (0.0005320407829306539 . 2.7353612783220783e-20)
-    (0.0005486716177583588 . 1.436172748406251e-20)
-    (0.000565822455705062 . 2.1992133061039514e-20)
-    (0.0005835095652519211 . -2.010504872218286e-21)
-    (0.000601749724437574 . 4.982650386129834e-20)
-    (0.000620560236855965 . -7.430039714114664e-21)
-    (0.0006399589481588143 . 3.8122182693055644e-20)
-    (0.000659964263078802 . 2.138888295545083e-20)
-    (0.0006805951629900561 . -5.314495618174954e-20)
-    (0.0007018712240230741 . 4.6179617103884916e-20)
-    (0.0007238126357517673 . -4.1596964367213793e-20)
-    (0.0007464402204708848 . -1.8880161157866444e-21)
-    (0.0007697754530826812 . 4.73133055222851e-20)
-    (0.0007938404816122941 . 2.04622269272477e-20)
-    (0.0008186581483719438 . -4.693486485344378e-20)
-    (0.0008442520117947219 . -1.5493768351251446e-20)
-    (0.0008706463689594116 . 2.853861232957886e-22)
-    (0.0008978662788284951 . -5.4068667279405054e-20)
-    (0.0009259375862222202 . -4.194952457490763e-20)
-    (0.0009548869465523614 . -3.386529900189101e-20)
-    (0.0009847418513400793 . -5.669583993860675e-20)
-    (0.0010155306545430959 . -4.166473178227564e-20)
-    (0.001047282599718231 . 9.521065082803394e-20)
-    (0.00108002784804621 . 6.154424315085578e-20)
-    (0.0011137975072465416 . 8.454888707177185e-20)
-    (0.0011486236614111957 . 8.953086830150095e-20)
-    (0.0011845394017867567 . 7.217159457790775e-20)
-    (0.0012215788585357235 . 7.477344191447046e-20)
-    (0.0012597772335086511 . 6.566772750951499e-21)
-    (0.0012991708340598853 . 4.3179037768796526e-20)
-    (0.0013397971079407453 . -1.0797335953851804e-19)
-    (0.0013816946793051388 . 1.0047591559543256e-19)
-    (0.0014249033858637816 . -2.5695478448084455e-20)
-    (0.0014694643172244001 . 8.06630571658122e-20)
-    (0.0015154198544565735 . 8.668353541071613e-20)
-    (0.0015628137109211689 . -5.774014185861802e-20)
-    (0.0016116909744056864 . 7.387283203139758e-20)
-    (0.0016620981506082358 . 3.6190462953392175e-20)
-    (0.0017140832080143208 . -1.1589495995584767e-20)
-    (0.0017676956242121183 . 7.435250652996099e-20)
-    (0.0018229864336935118 . 1.6584560557414573e-20)
-    (0.0018800082771897484 . -5.314279891721045e-20)
-    (0.00193881545259229 . 7.057409849045952e-20)
-    (0.001999463967511161 . -9.116330016191191e-20)
-    (0.0020620115935249127 . -2.0864709589013526e-19)
-    (0.002126517922178207 . -4.876090730004397e-20)
-    (0.00219304442278497 . 2.137019248779804e-20)
-    (0.0022616545020970828 . 5.096078611740868e-20)
-    (0.0023324135659006976 . 2.917296418544145e-20)
-    (0.002405389082604425 . 1.2440609575139753e-19)
-    (0.002480650648885927 . 2.726808826095052e-20)
-    (0.002558270057465778 . 7.769966232307108e-20)
-    (0.0026383213670799297 . 8.849414494444815e-20)
-    (0.002720880974724625 . -1.8166863250830977e-19)
-    (0.0028060276902502623 . 4.170398395508256e-20)
-    (0.002893842813383458 . 1.3342105820505055e-19)
-    (0.0029844102132593774 . 9.195101569892898e-20)
-    (0.0030778164105494097 . -1.6343723184574783e-19)
-    (0.003174150662272302 . -1.2879846095787289e-20)
-    (0.003273505049380108 . -1.9626022851944244e-19)
-    (0.0033759745672136167 . 1.0910988961422856e-20)
-    (0.0034816572189254108 . 5.0829634028060636e-20)
-    (0.003590654111972309 . -1.9843487184941522e-19)
-    (0.003703069557782712 . 1.873310694823313e-19)
-    (0.0038190111747082828 . 1.3562826460964407e-19)
-    (0.0039385899943734605 . 3.46645056046899e-19)
-    (0.004061920571540579 . 2.210205307217469e-19)
-    (0.004189121097612757 . 6.473176348368055e-20)
-    (0.004320313517901348 . 3.9553759423126633e-19)
-    (0.004455623652789569 . 1.3778848742222007e-19)
-    (0.004595181322928888 . -1.0442938740181728e-19)
-    (0.004739120478610037 . -3.316247561247527e-19)
-    (0.004887579333455926 . -2.7453099482491593e-19)
-    (0.00504070050258943 . 3.7024133899284865e-19)
-    (0.005198631145435001 . -2.1647643968448829e-19)
-    (0.005361523113319176 . 1.888029366421676e-19)
-    (0.005529533102041619 . -1.372189645824532e-19)
-    (0.005702822809595014 . 2.8864400392230173e-19)
-    (0.005881559099219254 . -8.575078874790418e-20)
-    (0.006065914167982702 . -3.382932389054231e-19)
-    (0.0062560657210910635 . -1.4881102497593667e-20)
-    (0.006452197152132442 . 3.798115355624615e-19)
-    (0.006654497729475611 . 2.7200995607274075e-19)
-    (0.006863162789047346 . -2.7878483350076027e-19)
-    (0.0070783939337239355 . 3.7048964867346634e-20)
-    (0.007300399239581616 . -9.480859418132428e-20)
-    (0.0075293934692608295 . 1.6517761136833034e-19)
-    (0.007765598292709817 . -3.9745416880549755e-19)
-    (0.008009242515584148 . -2.4044687013794144e-19)
-    (0.008260562315590457 . -6.587400191683076e-19)
-    (0.008519801487074855 . 8.387020028532755e-19)
-    (0.008787211694169282 . -8.196097050138885e-19)
-    (0.009063052732822494 . -3.2301461454261893e-19)
-    (0.009347592802056508 . -7.025623380613278e-19)
-    (0.00964110878480403 . 8.655823851246648e-19)
-    (0.009943886538698017 . -2.5356392849550307e-19)
-    (0.010256221197200734 . -8.086026309433652e-19)
-    (0.010578417481476882 . 5.640352871418658e-19)
-    (0.01091079002343331 . 5.970706595372109e-19)
-    (0.011253663700366743 . -3.695457946677901e-19)
-    (0.01160737398168092 . 3.289555843193904e-19)
-    (0.011972267288155378 . -8.730097316112283e-20)
-    (0.012348701364270177 . 3.8872528489959077e-19)
-    (0.012737045664114032 . -4.7729496603624285e-19)
-    (0.013137681751427724 . 6.478204344064299e-19)
-    (0.013551003714360316 . 1.3298832303228675e-20)
-    (0.013977418595542815 . 2.0257438569694155e-19)
-    (0.014417346838112431 . -7.13005949816736e-19)
-    (0.014871222748350642 . 5.681340686254808e-19)
-    (0.015339494975630027 . -6.612062080438212e-19)
-    (0.015822627010398216 . 8.296530982748908e-19)
-    (0.016321097700962718 . -1.659895381856688e-18)
-    (0.016835401789877486 . -1.3733254647069333e-18)
-    (0.01736605047077166 . -9.783029760164461e-19)
-    (0.017913571966502208 . -1.6404265725425483e-18)
-    (0.01847851212955637 . 7.250935299760642e-19)
-    (0.019061435065676088 . -1.4091769087450886e-18)
-    (0.019662923781725627 . -6.952696577288123e-20)
-    (0.02028358085887576 . -7.566567727966786e-19)
-    (0.020924029152232494 . -9.59612072439542e-19)
-    (0.021584912518096692 . -6.41488169822601e-20)
-    (0.02226689657010246 . -7.336613651912944e-19)
-    (0.022970669465547214 . -3.657425923384842e-19)
-    (0.023696942723295693 . 1.7301455690443072e-18)
-    (0.02444645207471311 . 1.242011812585554e-18)
-    (0.025219958349160486 . -1.8439819571806356e-19)
-    (0.02601824839566741 . 7.648227504707697e-19)
-    (0.02684213604248493 . -3.024364317498657e-20)
-    (0.027692463096313864 . -1.4810746531228193e-18)
-    (0.028570100383102384 . -5.174668144972875e-19)
-    (0.029475948832411267 . 4.448286316523317e-20)
-    (0.030410940607456194 . -5.81533876508634e-19)
-    (0.031376040283054726 . -1.4158564427160428e-18)
-    (0.032372246073831004 . 2.2334054291587723e-18)
-    (0.033400591115164815 . -2.5221828976912458e-18)
-    (0.0344621447995138 . -8.510898707950959e-20)
-    (0.035558014170888795 . -2.2354500799952555e-18)
-    (0.03668934538042334 . 1.1684089702155055e-18)
-    (0.037857325206150046 . -1.0125447739512992e-18)
-    (0.039063182640279324 . -2.0920943476429972e-18)
-    (0.040308190547470785 . -7.985899169864652e-19)
-    (0.041593667397795686 . 2.07644114717057e-18)
-    (0.04292097907831042 . -2.9718456774634723e-18)
-    (0.04429154078739765 . -6.340767355681303e-19)
-    (0.04570681901628487 . 2.1704004890048954e-18)
-    (0.04716833362241929 . 2.9906195295324253e-18)
-    (0.04867765999966722 . 1.9020569655558005e-19)
-    (0.050236431350613966 . 2.9557106476059737e-18)
-    (0.05184634106656999 . -1.515543925210912e-18)
-    (0.053509145221242116 . -2.31880578111979e-18)
-    (0.05522666518440587 . -1.4087074223799722e-18)
-    (0.05700079036231938 . 3.193530579389267e-18)
-    (0.05883348107205249 . -2.145260640991126e-18)
-    (0.06072677155736839 . 3.0535299407780733e-18)
-    (0.06268277315429321 . -1.9158317755446028e-18)
-    (0.06470367761504209 . -6.452572296512067e-18)
-    (0.06679176059954327 . 5.706584124310573e-18)
-    (0.06894938534441653 . -4.893311618639166e-18)
-    (0.07117900651992193 . 1.3836556609129577e-18)
-    (0.07348317428610542 . 1.0150560143811903e-18)
-    (0.0758645385601292 . -1.2725691451908302e-19)
-    (0.07832585350759605 . 1.5354906427541542e-18)
-    (0.08086998227155874 . 4.412576875593593e-18)
-    (0.08349990195385616 . -9.270840538531389e-19)
-    (0.08621870886444084 . 2.4601285608902732e-18)
-    (0.0890296240554657 . -3.6117807566340314e-18)
-    (0.09193599915808591 . -6.5483276811005975e-19)
-    (0.0949413225412153 . -1.2057826985840237e-18)
-    (0.09804922581285948 . 3.613052734932594e-18)
-    (0.10126349068614282 . 3.63332655592265e-18)
-    (0.10458805623376095 . -5.446963683297344e-18)
-    (0.10802702655633457 . 2.4068800861136225e-19)
-    (0.11158467889202853 . 5.547091525555895e-18)
-    (0.11526547219684118 . -6.242140070908552e-18)
-    (0.11907405622718036 . 1.9047348542199263e-18)
-    (0.12301528115873718 . 4.260716267093159e-18)
-    (0.12709420777826422 . -6.998082090230668e-19)
-    (0.13131611828768022 . -2.022280195305526e-18)
-    (0.135686527762978 . 1.3778664949460334e-17)
-    (0.1402111963137291 . -7.957031399343018e-18)
-    (0.14489614199258216 . 6.079724335094065e-18)
-    (0.1497476545080694 . -1.0403594901115149e-19)
-    (0.15477230979829656 . 9.750626447544526e-18)
-    (0.15997698552772965 . -7.415235340924643e-18)
-    (0.1653688775743427 . 1.233525816475006e-17)
-    (0.17095551757989683 . 5.162148117868752e-18)
-    (0.17674479164212215 . -5.735071010010956e-18)
-    (0.18274496023412792 . -7.236699239167251e-18)
-    (0.18896467944351802 . 1.2126334623173915e-18)
-    (0.1954130236315065 . 3.6454880826080164e-18)
-    (0.2020995096208769 . 1.1709803074569361e-18)
-    (0.20903412253098091 . 9.629903048444698e-18)
-    (0.2162273433882158 . -1.3746556035664427e-17)
-    (0.2236901786516419 . -1.1161430087256522e-17)
-    (0.23143419180571173 . -1.1783422723682643e-17)
-    (0.2394715371855868 . 1.3681347180525074e-17)
-    (0.24781499621535416 . -5.629683257071119e-19)
-    (0.25647801625575717 . 1.7799283665847043e-17)
-    (0.26547475227599016 . 2.3746497285091563e-17)
-    (0.27482011158384456 . -2.3576750418849283e-17)
-    (0.28452980187024574 . 2.294261508454993e-17)
-    (0.2946203828481961 . 7.704460403433695e-18)
-    (0.30510932179260053 . -3.1810717609493604e-18)
-    (0.31601505331667373 . -2.7504732121747857e-17)
-    (0.32735704375292773 . -2.295387335596396e-18)
-    (0.3391558605424717 . -1.0542633246007705e-17)
-    (0.35143324707592166 . 6.046403646719416e-18)
-    (0.36421220347306293 . 1.6616431797725433e-17)
-    (0.37751707383704586 . -2.288733632106875e-17)
-    (0.39137364057289015 . -7.223380329827373e-18)
-    (0.40580922642007966 . -1.4242771949989002e-17)
-    (0.42085280491576815 . 2.1928227014922294e-17)
-    (0.4365351200794305 . 2.746723466096044e-17)
-    (0.4528888161926027 . 3.333036921193442e-20)
-    (0.46994857863973616 . 2.2313748280730584e-17)
-    (0.4877512868793533 . 2.510850553983312e-17)
-    (0.5063361807299942 . 5.034323929063707e-17)
-    (0.5257450412844764 . 3.549939469031809e-17)
-    (0.5460223879105075 . -2.600409107758072e-17)
-    (0.5672156929577491 . 2.6931694472926522e-17)
-    (0.5893756159733434 . 3.4958600071342e-17)
-    (0.6125562594323366 . 5.5315848730447774e-17)
-    (0.6368154482194206 . -1.0700031297321404e-17)
-    (0.6622150353574432 . -5.2025197336558966e-17)
-    (0.6888212367702189 . 3.554366060808207e-17)
-    (0.7167049981969127 . 1.2570720319880541e-17)
-    (0.745942397747961 . 3.5141078190499194e-17)
-    (0.7766150880142586 . -4.2199351454803637e-17)
-    (0.8088107821192024 . -4.7545049409632634e-17)
-    (0.8426237886453156 . 4.009422968651717e-18)
-    (0.8781556009829815 . -3.617235787577101e-17)
-    (0.915515547349229 . 8.295737913212842e-18)
-    (0.954821508522209 . 1.1311450967949616e-17)
-    (0.9962007112467078 . -3.341340557703004e-17)
-    (1.0397906063049112 . 5.075753532140173e-18)
-    (1.085739841434657 . -7.880618461116728e-17)
-    (1.1342093406379186 . -6.691136763078832e-17)
-    (1.1853735029825458 . -1.3540227196001537e-17)
-    (1.23942153579231 . -1.122688801019997e-17)
-    (1.2965589391815442 . 1.589418190470739e-17)
-    (1.3570091612651922 . -9.570749163265672e-17)
-    (1.4210154461147195 . 4.658582253165645e-17)
-    (1.488842899696241 . 7.129474621289647e-17)
-    (1.5607808026915324 . -1.0459889566319876e-17)
-    (1.637145203350768 . -8.586169319418946e-17)
-    (1.7182818284590453 . -7.747991575210629e-17)
-    (1.8045693562372267 . -8.399216598536489e-17)
-    (1.8964231016843132 . -9.78065845802123e-17)
-    (1.9942991726738615 . -8.553441869169175e-17)
-    (2.098699164244332 . -2.1290728624508516e-16)
-    (2.210175469216157 . 8.01759282156125e-17)
-    (2.3293372958186187 . -2.4867346652824196e-17)
-    (2.4568574977678734 . 2.363531379168368e-17)
-    (2.5934803396257973 . 1.3530965334869875e-16)
-    (2.7400303407967566 . 2.84271535920292e-17)
-    (2.8974223658015266 . -1.3520108699441425e-16)
-    (3.066673157250024 . -2.0856498340728085e-16)
-    (3.24891454212279 . 8.01857337785979e-17)
-    (3.4454085826672616 . -5.781818869290501e-19)
-    (3.657564991763094 . 1.1214605127608465e-16)
-    (3.886961190654824 . 1.1863185200788392e-16)
-    (4.135365456504734 . -1.6111676390969494e-16)
-    (4.404763690759263 . -1.826064832365271e-16)
-    (4.697390439898002 . 1.379838386618194e-16)
-    (5.015764921510652 . -2.1246597826089647e-16)
-    (5.3627329554868375 . -3.3775191059186603e-16)
-    (5.741515878194139 . -3.717431673583332e-16)
-    (6.155767734066404 . 5.959787843501827e-17)
-    (6.609642303020833 . 3.7622363738566276e-16)
-    (7.107871844826896 . -3.836032048686347e-16)
-    (7.655859837096132 . -3.9321989985822915e-16)
-    (8.259790469744917 . -3.1964018652469046e-16)
-    (8.926758258075042 . 6.9905306889558135e-16)
-    (9.664921877487837 . 3.480231208392409e-16)
-    (10.48368724147004 . -5.058240114382486e-16)
-    (11.393925986977917 . -6.675676784501677e-17)
-    (12.408236956676573 . 8.310887616559652e-17)
-    (13.541260051342169 . -8.73018890312213e-16)
-    (14.810054065547394 . 3.629323995570106e-16)
-    (16.23455294142346 . 1.7266347574671478e-15)
-    (17.8381184420714 . -2.528705665223229e-16)
-    (19.64821177052238 . 1.427525560659987e-16)
-    (21.69721241950954 . 1.3639691024425497e-15)
-    (24.023419895539476 . 1.059263125823483e-15)
-    (26.67228339672289 . 5.677986535423153e-16)
-    (29.697916670361636 . 8.797766564780851e-16)
-    (33.16497097303293 . 2.2643393731648284e-15)
-    (37.15095942152534 . 3.2992302512248215e-15)
-    (41.749152554212905 . -7.432852127721744e-16)
-    (47.07219963059767 . 1.2565598221538282e-15)
-    (53.25667579654665 . -2.989602113304488e-15)
-    (60.46881541504593 . 4.2658376888972845e-16)
-    (68.91177162107691 . 6.5639980171300165e-15)
-    (78.83484836691989 . 3.283618366631356e-15)
-    (90.54529331889034 . 5.365925866805094e-16)
-    (104.42343099333327 . -4.924303049844688e-15)
-    (120.9421736013677 . -6.027389047485177e-15)
-    (140.6922975166525 . 2.194549790000635e-15)
-    (164.41535162028603 . -1.283154535426018e-14)
-    (193.0467201709333 . 7.39192747490866e-15)
-    (227.77226850156077 . 4.041651467709608e-15)
-    (270.1032564200185 . 1.5109735837066455e-14)
-    (321.97595769445013 . -2.4305227779521264e-15)
-    (385.8848853901661 . -9.673369616452878e-16)
-    (465.06199877311366 . 2.589243254189485e-14)
-    (563.7192066814514 . 2.7978709586136315e-15)
-    (687.3785453728616 . 2.6211396926545634e-14)
-    (843.3245752330527 . -2.749513333300684e-15)
-    (1041.2282720337255 . 1.0726990009004963e-13)
-    (1294.013181424767 . 3.902520136312285e-14)
-    (1619.066185376973 . 2.1522648714933098e-14)
-    (2039.9419672006518 . 1.7004799414141945e-14)
-    (2588.779948644629 . -1.1152610240152095e-13)
-    (3309.757172003916 . -5.473819345344809e-14)
-    (4264.059139978984 . -4.1250862575658904e-13)
-    (5537.092631527714 . -4.1770682564106657e-13)
-    (7249.0369893365005 . -6.983673906909162e-15)
-    (9570.408550911743 . 8.406510611058146e-13)
-    (12745.21822672292 . -7.065701374874163e-15)
-    (17125.732590817657 . 3.7713879548521975e-13)
-    (23225.129627419305 . -1.340299096808553e-12)
-    (31798.011661335175 . 6.747331571251255e-13)
-    (43964.705617713975 . 1.798201787821037e-12)
-    (61405.07824431698 . 2.3192412808684584e-12)
-    (86663.8454157708 . -2.3526174091132417e-12)
-    (123636.59808609908 . -3.0399042496665012e-12)
-    (178351.93658192107 . -6.339856905865759e-14)
-    (260244.22671984948 . -5.410202944966889e-12)
-    (384248.6532859191 . 5.73990477091046e-12)
-    (574290.8534432624 . 6.293454072918912e-12)
-    (869170.6475863855 . 2.5628917849990087e-11)
-    (1332607.5631375103 . 5.752777064120257e-11)
-    (2070614.9539178647 . -3.1249221708431105e-11)
-    (3261951.7582527394 . 1.9615216664993022e-10)
-    (5212232.270862971 . 2.331221928415278e-10)
-    (8451441.464476893 . -7.598267899257087e-10)
-    (13912250.75293453 . -7.275005102634024e-11)
-    (23261010.584611285 . 4.1496939448420006e-10)
-    (39521710.28864972 . -3.095599924876826e-09)
-    (68271092.3676407 . 4.954815266536196e-09)
-    (119965607.16041763 . -5.0301550654932666e-09)
-    (214549388.82292324 . -1.122660075850228e-08)
-    (390739674.37478554 . -2.5660991429857667e-09)
-    (725076776.775437 . 9.076770263427603e-10)
-    (1371737450.3579445 . 1.6447268313752807e-08)
-    (2647346051.5503793 . 1.0246451628127077e-07)
-    (5215230997.525738 . -2.2934934972615406e-07)
-    (10493934467.679167 . -6.352421890093103e-07)
-    (21582048848.945744 . -5.84894932458084e-07)
-    (45397618107.24928 . -1.7327545064306486e-06)
-    (97738428194.02795 . -3.865763973784669e-06)
-    (215528592474.9177 . -9.286963901441946e-06)
-    (487165943884.08777 . -1.2737444427048404e-05)
-    (1129579558136.7493 . 0.00010483243681732672)
-    (2688874144903.8423 . 2.5247520705553776e-05)
-    (6576495882115.553 . 0.00025003085283704853)
-    (16540814160421.832 . 0.00039813022933945206)
-    (42819026062657.85 . -0.00045919653514175875)
-    (114189306235880.12 . -0.0011724802860866989)
-    (313997528128146.56 . 0.013936075444993389)
-    (891158951538994.4 . -0.03848075420868936)
-    (2613011211001386.0 . -0.17105080091174218)
-    (7923680177264742.0 . -0.28291272396024725)
-    (2.487530444089166e+16 . 1.4203043682557206)
-    (8.093496202618488e+16 . 0.709099724309675)
-    (2.7322184677454848e+17 . -1.2668239140658226)
-    (9.580904901869568e+17 . -40.61664863422302)
-    (3.494020779824991e+18 . -139.5623508973493)
-    (1.326796767819535e+19 . 617.2907294451816)
-    (5.252814237556169e+19 . -1774.6728954278933)
-    (2.170972358192325e+20 . 1042.9639641826302)
-    (9.379393155479388e+20 . -29506.92230986667)
-    (4.241848966805818e+21 . 251611.61569680815)
-    (2.011019589973599e+22 . -268237.093288903)
-    (1.0009169886484786e+23 . -3548470.624775735)
-    (5.237939767221943e+23 . -3307357.444456701)
-    (2.886584436022493e+24 . 171249912.60047522)
-    (1.6779200899862084e+25 . 695418037.9432284)
-    (1.030493783595181e+26 . -4372769307.022909)
-    (6.69812185700711e+26 . 45952129210.82991)
-    (4.615981684139182e+27 . 41155653435.27635)
-    (3.378876585354472e+28 . -1744261341683.3298)
-    (2.632064117770894e+29 . 17316783105981.531)
-    (2.1861538855792003e+30 . -5136456416769.427)
-    (1.939973296239877e+31 . -695689534862793.2)
-    (1.8430595562481285e+32 . 5470877559248909.0)
-    (1.8786136536347794e+33 . 4.394420226189102e+16)
-    (2.0589457107550113e+34 . 1.0912841158473578e+18)
-    (2.43190328008533e+35 . 4.6849202048064115e+17)
-    (3.10282384509504e+36 . -7.468629217962736e+19)
-    (4.286714207435176e+37 . -3.2260863393585525e+21)
-    (6.428777896972236e+38 . -1.4334692317849637e+22)
-    (1.049258352602445e+40 . -3.386043891431298e+23)
-    (1.8686803171612082e+41 . 2.3827454147506918e+24)
-    (3.6414175441569734e+42 . -1.5352351717107655e+26)
-    (7.785924405715174e+43 . -4.847798189948165e+26)
-    (1.83195004156455e+45 . -1.181343290649753e+28)
-    (4.757509638501038e+46 . 2.3174658337892313e+30)
-    (1.3678793449206142e+48 . -6.402735276766394e+31)
-    (4.3681675192606486e+49 . 2.484103073726363e+33)
-    (1.554385147664416e+51 . -7.15823207740273e+34)
-    (6.184361178951956e+52 . 2.2564932541358492e+36)
-    (2.7607228460808756e+54 . -1.2066931474805295e+37)
-    (1.387729345039176e+56 . -1.0512565090219215e+40)
-    (7.884094045764237e+57 . 5.814378629016813e+41)
-    (5.081890344836013e+59 . 1.3610757266697308e+42)
-    (3.731114527928971e+61 . 2.1822352604466645e+45)
-    (3.1329865879018768e+63 . -6.292921774847357e+46)
-    (3.0213931478059766e+65 . -1.5061242076069467e+49)
-    (3.360962881853185e+67 . -1.626360949945326e+51)
-    (4.331773172710414e+69 . -2.7993324957165646e+53)
-    (6.498475870165788e+71 . 3.733949158560767e+55)
-    (1.1401496818019767e+74 . 1.3656955888023106e+57)
-    (2.3509420759921335e+76 . -4.791685622166505e+59)
-    (5.725893145375883e+78 . 7.446926832904932e+61)
-    (1.6558684839861452e+81 . 1.0296317776844197e+65)
-    (5.716370875276776e+83 . -1.0021500957970777e+67)
-    (2.3688109954366353e+86 . -3.7581882450375625e+69)
-    (1.1850440268660405e+89 . 4.778157332560249e+72)
-    (7.199273758087368e+91 . 1.837747429137931e+75)
-    (5.343538708730692e+94 . -7.365706356630585e+77)
-    (4.876111352707183e+97 . 1.3148108653599204e+81)
-    (5.505869521450131e+100 . 1.944404306955852e+84)
-    (7.744202935901645e+103 . 6.17849039544379e+87)
-    (1.3661778750202e+107 . 5.006695302453677e+90)
-    (3.044330854000249e+110 . 1.539474389406713e+94)
-    (8.631792057674117e+113 . -5.041548497925841e+97)
-    (3.137647310570189e+117 . 4.245702082430937e+100)
-    (1.473577574797504e+121 . 1.0029465158093984e+105)
-    (9.013317301694191e+124 . -5.43643842366429e+108)
-    (7.239770606552406e+128 . -1.687650686719372e+110)
-    (7.7017817197777e+132 . -2.0151109448204943e+116)
-    (1.094705200077448e+137 . 6.712298179422747e+120)
-    (2.0978537960154526e+141 . 7.391845166298471e+124)
-    (5.471176099614323e+145 . 4.715571837807654e+129)
-    (1.9606303234256925e+150 . 1.1974880544002449e+134)
-    (9.750639080045098e+154 . 5.375534992176601e+138)
-    (6.798926795391929e+159 . 2.5659008792304313e+143)
-    (6.717445112142007e+164 . -4.9777237030042644e+148)
-    (9.50723558093052e+169 . -4.241955675103341e+153)
-    (1.9492540757045903e+175 . 2.457155476948572e+158)
-    (5.857021794165392e+180 . -3.3143415128822057e+164)
-    (2.6101576642750866e+186 . -1.3194322779996063e+170)
-    (1.7465763572163952e+192 . 3.986263435107535e+175)
-    (1.7772803479239517e+198 . -1.0878848502109484e+182)
-    (2.7865113209812e+204 . -1.4593352360634193e+188)
-    (6.822899310782423e+210 . 3.2812165844793366e+194)
-    (2.6456384412921967e+217 . 3.8066766815192514e+200)
-    (1.6481038358004873e+224 . -6.769938218924482e+207)
-    (1.6740380998219687e+231 . 8.466685826074968e+214)
-    (2.8151919034596256e+238 . -2.123973250628041e+222)
-    (7.962604223977985e+245 . 3.9217709122676487e+229)
-    (3.850021038738558e+253 . -7.1045613508698715e+236)
-    (3.236002323062726e+261 . -2.104819443379521e+245)
-    (4.810570685749818e+269 . -1.4167319742866789e+253)
-    (1.2875533828926397e+278 . 7.626059974847463e+260)
-    (6.319684656519154e+286 . -3.83875210857012e+270)
-    (5.797184730644923e+295 . -4.1974821203145185e+278)
-    (1.0134858165681662e+305 . -1.1960732643227e+288)
-    (+inf.0 . -inf.0)))
-
-(: negative-ds (Vectorof (Pair Flonum Flonum)))
-(define negative-ds
-  #((-0.0004848777128822606 . -2.106959040416988e-20)
-    (-0.0005000263524810411 . 1.7625505823099235e-20)
-    (-0.0005156481466004561 . 2.027643368070832e-20)
-    (-0.0005317578660592662 . -4.8512463234164716e-20)
-    (-0.000548370742296052 . 3.579583327230676e-20)
-    (-0.000565502481702158 . 2.6250708424808036e-20)
-    (-0.0005831692803986474 . -2.1161599078553446e-20)
-    (-0.0006013878394708923 . -1.9981896427908373e-20)
-    (-0.0006201753806748412 . 2.227288708361765e-20)
-    (-0.0006395496626294227 . -1.1302604898028686e-20)
-    (-0.0006595289975099812 . 3.7183329388334764e-21)
-    (-0.0006801322682580862 . 1.4343382871702033e-20)
-    (-0.0007013789463235141 . 4.19236554910797e-20)
-    (-0.0007232891099546805 . 3.428062753271238e-20)
-    (-0.000745883463054277 . 1.1283170331370492e-20)
-    (-0.000769183354617377 . 4.255757126500432e-20)
-    (-0.0007932107987697786 . 2.814972083732834e-20)
-    (-0.0008179884954248897 . -4.979052687052559e-20)
-    (-0.0008435398515779981 . 4.1020418015530164e-20)
-    (-0.0008698890032573279 . -2.0284963214805618e-20)
-    (-0.0008970608381518608 . -4.288020202961567e-20)
-    (-0.0009250810189364862 . 3.73119220198268e-20)
-    (-0.0009539760073156515 . -1.8634585995285095e-20)
-    (-0.0009837730888073086 . 1.2199363570121225e-21)
-    (-0.0010145003982895866 . 4.495559977190981e-20)
-    (-0.001046186946333284 . 4.3474490341103084e-20)
-    (-0.0010788626463439418 . 3.604379947920555e-20)
-    (-0.0011125583425379566 . 5.56391640355605e-20)
-    (-0.0011473058387779002 . -7.037849041712792e-20)
-    (-0.0011831379282929455 . 9.69524773821592e-21)
-    (-0.001220088424311041 . -5.470493004640914e-20)
-    (-0.001258192191630257 . 3.5437812670146733e-20)
-    (-0.0012974851791574989 . -6.765506925362685e-20)
-    (-0.0013380044534436095 . -7.414679426638717e-20)
-    (-0.0013797882332446968 . 1.0149191885812544e-20)
-    (-0.001422875925140385 . -2.7262070498829763e-20)
-    (-0.0014673081602405546 . 6.623304433785929e-20)
-    (-0.0015131268320130301 . 1.0106498893687096e-19)
-    (-0.0015603751352655953 . 4.0820161827105014e-20)
-    (-0.001609097606316648 . -1.0669093726536096e-19)
-    (-0.0016593401643897737 . 9.218550532039208e-20)
-    (-0.001711150154268498 . -2.3236047013700504e-20)
-    (-0.0017645763902484882 . 4.4785808041305754e-20)
-    (-0.0018196692014255033 . 7.644737360967079e-20)
-    (-0.0018764804783584495 . -6.641327861281367e-20)
-    (-0.0019350637211479776 . -5.812752395640082e-20)
-    (-0.0019954740889721588 . -1.2997916755622335e-19)
-    (-0.002057768451121909 . -1.924260643119962e-19)
-    (-0.0021220054395799806 . 3.1240315322899305e-20)
-    (-0.0021882455031885183 . 4.2440809687249976e-20)
-    (-0.0022565509634513816 . 9.101604562571392e-20)
-    (-0.0023269860720186593 . 1.6128931642996482e-20)
-    (-0.0023996170699020513 . -1.935399175287333e-19)
-    (-0.002474512248471081 . -2.855759081333477e-20)
-    (-0.002551742012281381 . -1.743237522189642e-19)
-    (-0.0026313789437876507 . 2.2491723561939065e-20)
-    (-0.002713497869995199 . 1.304494983910357e-19)
-    (-0.002798175931105389 . 9.895003953358041e-20)
-    (-0.0028854926512116782 . -1.9814715270209227e-19)
-    (-0.002975530011104378 . 9.235275936603056e-20)
-    (-0.003068372523243691 . -2.5554744043043932e-20)
-    (-0.0031641073089620593 . 1.2133904469057152e-20)
-    (-0.003262824177958322 . 7.791026035643279e-20)
-    (-0.0033646157101477107 . 8.069325092220694e-21)
-    (-0.0034695773399332124 . 6.066527208813204e-20)
-    (-0.00357780744296538 . 1.726578866486843e-19)
-    (-0.003689407425459237 . 8.755195129513237e-20)
-    (-0.0038044818161384756 . -3.1544240795769355e-20)
-    (-0.003923138360878761 . 3.7520119240160075e-19)
-    (-0.0040454881201235264 . 1.278316467235735e-19)
-    (-0.0041716455691472795 . 1.6981916830393132e-19)
-    (-0.004301728701243024 . 3.1010114127382133e-19)
-    (-0.0044358591339120675 . 2.000684148507886e-20)
-    (-0.004574162218136062 . -1.4209647258652529e-19)
-    (-0.004716767150812785 . 1.724297340303725e-19)
-    (-0.00486380709043878 . -2.4665487524436087e-19)
-    (-0.005015419276123577 . 5.1615663988880967e-20)
-    (-0.005171745150021845 . -1.5285919966070898e-19)
-    (-0.005332930483271392 . -1.5172228554575442e-19)
-    (-0.005499125505526528 . -2.598313022886681e-20)
-    (-0.005670485038177827 . 6.549990421578792e-20)
-    (-0.005847168631350863 . -4.778854559887401e-20)
-    (-0.006029340704777994 . 6.799527292234638e-20)
-    (-0.006217170692638675 . 2.0085641109616846e-19)
-    (-0.006410833192465222 . 4.5600645000456827e-20)
-    (-0.006610508118212287 . 1.8791009186949312e-19)
-    (-0.006816380857589562 . 2.1325222339957728e-19)
-    (-0.007028642433758505 . -2.205966102543369e-20)
-    (-0.007247489671494958 . -3.6357095189256593e-19)
-    (-0.007473125367920641 . 1.533065983050011e-19)
-    (-0.0077057584679074 . -5.2859089248663636e-20)
-    (-0.007945604244259023 . 3.52418730915407e-19)
-    (-0.008192884482776051 . -2.5245826598779236e-20)
-    (-0.00844782767230976 . 8.110388823566882e-19)
-    (-0.008710669199911777 . 4.247218097579681e-19)
-    (-0.008981651551186255 . -7.726214439377394e-19)
-    (-0.00926102451595153 . -5.843325417155317e-19)
-    (-0.009549045399318171 . -3.0763492576095402e-19)
-    (-0.009845979238290085 . 7.67519079563552e-19)
-    (-0.010152099023994757 . -5.144489171785002e-19)
-    (-0.010467685929648083 . -6.743894052511647e-19)
-    (-0.010793029544358106 . -6.769368153187454e-20)
-    (-0.011128428112870787 . -8.623795245782583e-19)
-    (-0.011474188781359276 . 5.262395896247483e-19)
-    (-0.011830627849356191 . 3.0303240849562576e-19)
-    (-0.012198071027926161 . 2.1854305731782524e-19)
-    (-0.012576853704173097 . 3.8112097413428696e-19)
-    (-0.012967321212173649 . -2.87469018122663e-19)
-    (-0.01336982911042459 . -7.489622800860591e-19)
-    (-0.013784743465887926 . -3.9765310768588313e-20)
-    (-0.014212441144712845 . -5.600773306602792e-19)
-    (-0.014653310109708509 . 1.5943725405796341e-19)
-    (-0.015107749724635898 . 4.540939127519002e-19)
-    (-0.015576171065380543 . -5.589530927446483e-19)
-    (-0.016058997238060837 . 1.7270579802793842e-18)
-    (-0.016556663704118763 . -1.632993027352529e-18)
-    (-0.01706961861243135 . -1.2270936729807808e-18)
-    (-0.017598323138471438 . 1.1357749040933149e-18)
-    (-0.018143251830536212 . -1.2030943817637002e-18)
-    (-0.018704892963050477 . -1.0961186225376268e-18)
-    (-0.019283748896939176 . -1.1780304229996325e-18)
-    (-0.01988033644705036 . 8.827053506821462e-19)
-    (-0.020495187256595035 . 8.515770379828979e-20)
-    (-0.021128848178554448 . 3.425551953877502e-19)
-    (-0.02178188166398822 . -3.7596333494025924e-19)
-    (-0.022454866157158034 . -1.01288558297386e-18)
-    (-0.023148396497361577 . -1.3459627647431748e-18)
-    (-0.02386308432734972 . 4.8074020104275425e-20)
-    (-0.024599558508176536 . -8.89541304505486e-19)
-    (-0.025358465540306737 . 2.6362752413192174e-22)
-    (-0.026140469990777973 . -1.0267799766765561e-18)
-    (-0.026946254926186575 . -1.1581997036308915e-19)
-    (-0.027776522351234137 . -4.0126581987619013e-19)
-    (-0.0286319936525391 . 4.718771000396679e-19)
-    (-0.029513410047381766 . -2.8335007352392444e-20)
-    (-0.030421533037013122 . 1.2213826654497336e-18)
-    (-0.031357144864117045 . 1.9330185531580772e-18)
-    (-0.03232104897397196 . -1.6854710165805219e-18)
-    (-0.03331407047881178 . 4.257378252205867e-19)
-    (-0.03433705662483626 . 2.4723651429168603e-18)
-    (-0.03539087726126849 . -5.421228227777854e-19)
-    (-0.036476425310801204 . 3.179254059731123e-18)
-    (-0.03759461724071392 . -2.7686588607727445e-18)
-    (-0.03874639353387986 . -3.459622515126237e-18)
-    (-0.03993271915881438 . -2.5034136530020386e-18)
-    (-0.041154584037845485 . 2.7385810715378915e-18)
-    (-0.04241300351241163 . 5.802644828900916e-19)
-    (-0.04370901880441221 . -1.5561608482265385e-19)
-    (-0.045043697472451384 . 3.0516396314831922e-18)
-    (-0.04641813386172703 . -3.3547129864823247e-18)
-    (-0.04783344954622212 . -1.5380904291870428e-18)
-    (-0.049290793761756026 . 6.828028060603044e-19)
-    (-0.05079134382834895 . -2.5745954131680757e-18)
-    (-0.052336305560241644 . 3.187064224530237e-18)
-    (-0.05392691366179642 . -3.358661718928209e-18)
-    (-0.0555644321073834 . -2.3447499649171016e-18)
-    (-0.05725015450322689 . -3.1214574459971403e-18)
-    (-0.05898540442905266 . -2.521278275006181e-18)
-    (-0.06077153575723495 . 9.13095461328589e-19)
-    (-0.06260993294699418 . 3.2420863062163555e-18)
-    (-0.0645020113110416 . -6.5708930371043775e-18)
-    (-0.06644921725190488 . -6.103049538012378e-18)
-    (-0.06845302846500008 . -1.2328510524166196e-18)
-    (-0.07051495410533898 . 5.769458369011139e-18)
-    (-0.07263653491457747 . 1.7691740313590935e-18)
-    (-0.07481934330492018 . 3.039080270477699e-19)
-    (-0.07706498339619806 . -5.340222251701746e-18)
-    (-0.07937509100223099 . -5.619617147959712e-18)
-    (-0.08175133356237452 . -3.076181991297649e-18)
-    (-0.0841954100139305 . -3.119012840229868e-18)
-    (-0.08670905060087507 . 3.601870935128459e-18)
-    (-0.089294016614124 . -4.739740012930359e-18)
-    (-0.09195210005831625 . 5.206792300023025e-18)
-    (-0.09468512323985084 . 8.42204215564623e-19)
-    (-0.09749493827066161 . -4.671350698143233e-18)
-    (-0.10038342648195772 . -4.744879802072286e-18)
-    (-0.10335249774189831 . 6.800862460492163e-18)
-    (-0.10640408967090506 . -5.749718563746328e-18)
-    (-0.10954016674805077 . 2.7476876652079134e-18)
-    (-0.1127627193016928 . 4.33716548465386e-18)
-    (-0.11607376237725281 . 4.312212954115727e-18)
-    (-0.11947533447477532 . 1.2605340450492377e-18)
-    (-0.1229694961486328 . 4.7683414012950735e-18)
-    (-0.12655832846148324 . -8.274642425290404e-19)
-    (-0.1302439312843307 . -7.544462567212541e-18)
-    (-0.13402842143429172 . -4.835633997741849e-19)
-    (-0.13791393064143284 . 6.015289387262617e-18)
-    (-0.14190260333582086 . 1.2163795292001367e-17)
-    (-0.14599659424571793 . -8.969875857035464e-18)
-    (-0.15019806579766423 . 7.294989543591792e-18)
-    (-0.154509185309023 . -1.0739013545956815e-17)
-    (-0.1589321219634219 . 1.1063200181016539e-17)
-    (-0.16346904355941147 . 1.3950176656595435e-18)
-    (-0.1681221130225865 . -8.647084263078306e-18)
-    (-0.1728934846713762 . -8.855706197072986e-18)
-    (-0.17778530022671651 . -8.50118134351519e-18)
-    (-0.18279968455587453 . 1.0790546879106912e-18)
-    (-0.18793874114080633 . -9.100130552281101e-18)
-    (-0.19320454726160494 . 6.2853817379441374e-18)
-    (-0.19859914888583774 . 1.3007838561458206e-17)
-    (-0.20412455525489343 . 4.043712127012572e-19)
-    (-0.2097827331588613 . -7.782733745473872e-18)
-    (-0.21557560089196137 . -4.5961349288957284e-18)
-    (-0.22150502188114043 . 1.2231543329352422e-17)
-    (-0.22757279798115346 . -1.1787015047465016e-17)
-    (-0.23378066243027457 . -1.118495064497693e-18)
-    (-0.24013027246173207 . 1.1240192085279803e-17)
-    (-0.2466232015670544 . -2.4173623167463854e-18)
-    (-0.2532609314087494 . -7.788664599260712e-18)
-    (-0.26004484338113865 . 2.1732695352126535e-17)
-    (-0.2669762098197317 . 4.529222286361873e-18)
-    (-0.2740561848612734 . 2.0575847649803967e-17)
-    (-0.2812857949585305 . -2.562961006182989e-17)
-    (-0.28866592905602184 . 7.6895092526933e-18)
-    (-0.29619732843524027 . -1.2336564511105047e-17)
-    (-0.3038805762404842 . -1.6172286700388382e-17)
-    (-0.31171608669920775 . -2.1874975777510195e-17)
-    (-0.3197040940538329 . -8.199761174223195e-18)
-    (-0.32784464122524176 . -1.0258586762660572e-17)
-    (-0.33613756823169166 . 1.1065872227439662e-17)
-    (-0.3445825003906736 . -3.509750290406745e-18)
-    (-0.35317883633526936 . -1.9495584200750616e-17)
-    (-0.3619257358808497 . 1.3385237077918724e-17)
-    (-0.37082210778249936 . 7.503495774649699e-18)
-    (-0.3798665974283421 . -1.6155435473600083e-17)
-    (-0.38905757451896517 . 3.581996412453827e-18)
-    (-0.3983931207883944 . -2.186742617697992e-17)
-    (-0.407871017827531 . -1.620643325584559e-17)
-    (-0.41748873507660395 . 2.1990083596590378e-17)
-    (-0.42724341805899774 . -7.30038018146262e-18)
-    (-0.43713187693474415 . -2.744142914670074e-17)
-    (-0.4471505754579812 . 1.032221696621471e-17)
-    (-0.4572956204287403 . -9.401746630272272e-18)
-    (-0.4675627517354664 . 1.568464578260928e-18)
-    (-0.4779473330906439 . 1.3777543920072e-17)
-    (-0.4884443435677295 . 2.2433236991789505e-17)
-    (-0.49904837005319985 . -1.1756227866063207e-17)
-    (-0.5097536007328203 . -3.979700667545985e-17)
-    (-0.5205538197361378 . 2.992316493227244e-17)
-    (-0.5314424030675929 . -2.5953365570114604e-17)
-    (-0.5424123159564149 . 4.263923762167425e-17)
-    (-0.5534561117604869 . 6.792197915735056e-18)
-    (-0.564565932561529 . 8.85792762861878e-18)
-    (-0.5757335115900775 . 5.2638232186759144e-17)
-    (-0.5869501776187284 . -1.3263688854694558e-17)
-    (-0.5982068614607824 . 4.431643083882866e-17)
-    (-0.6094941047086339 . -3.889357793196616e-17)
-    (-0.6208020708418347 . 1.7874991379533952e-17)
-    (-0.6321205588285577 . -1.2428753672788363e-17)
-    (-0.643439019336053 . -5.1389049528919193e-17)
-    (-0.6547465736554562 . -3.9092853614269235e-17)
-    (-0.6660320354338488 . 1.4405811497785132e-17)
-    (-0.6772839352916448 . 4.667728400652459e-18)
-    (-0.6884905483860748 . -1.921487972240059e-17)
-    (-0.6996399249616673 . -2.4088184148953082e-17)
-    (-0.7107199239061172 . 3.6526794545109734e-17)
-    (-0.7217182493047579 . 1.4129801662985832e-18)
-    (-0.7326224899590079 . 4.5901053136667967e-17)
-    (-0.7434201618036991 . -1.4159755448943397e-18)
-    (-0.7540987531252149 . 4.455822229604516e-17)
-    (-0.7646457724470043 . 5.427256105217267e-17)
-    (-0.7750487989115286 . 4.0213058679437405e-18)
-    (-0.7852955349483044 . -4.039666687131752e-17)
-    (-0.795373860976783 . -4.07751871965384e-17)
-    (-0.8052718918507843 . -4.8301054248702166e-17)
-    (-0.8149780347085777 . -1.0406009309415639e-17)
-    (-0.824481047850057 . 2.3814638364661886e-17)
-    (-0.8337701002204579 . -4.6086942307388796e-17)
-    (-0.8428348310394419 . 6.987367940997186e-18)
-    (-0.8516654090759375 . 2.82580324784011e-17)
-    (-0.8602525910337603 . -3.7602668586884535e-17)
-    (-0.8685877784816475 . -7.355679499376496e-18)
-    (-0.8766630727349206 . 2.01084833539142e-17)
-    (-0.8844713270755226 . 4.731238866507822e-17)
-    (-0.8920061956836538 . -1.3025370452067454e-18)
-    (-0.8992621786486502 . 1.6298635484044654e-17)
-    (-0.9062346624300305 . -1.504289551609632e-17)
-    (-0.9129199551526632 . -2.0989088200491108e-17)
-    (-0.9193153161435139 . -4.2147809532680856e-17)
-    (-0.9254189791520612 . 4.686671952331961e-17)
-    (-0.9312301687426531 . -5.419294796925712e-17)
-    (-0.9367491094050615 . -4.808539975754049e-17)
-    (-0.9419770269992622 . 4.0991793084493095e-17)
-    (-0.9469161422317695 . 4.915666149603816e-17)
-    (-0.951569655953083 . -4.3806599310472934e-17)
-    (-0.9559417261680803 . -3.923738462103911e-17)
-    (-0.9600374367622607 . 1.679229255061313e-17)
-    (-0.9638627580650455 . 2.6144817761556684e-17)
-    (-0.9674244994949288 . 4.2640486031288585e-17)
-    (-0.9707302546579267 . 2.3475832444048937e-17)
-    (-0.9737883393979396 . 3.6833816984937015e-18)
-    (-0.9766077234225442 . 2.0979771513422152e-17)
-    (-0.9791979562473878 . -4.974085983287543e-18)
-    (-0.9815690883136698 . 3.6232375134888925e-17)
-    (-0.9837315882330274 . 2.119845953945831e-17)
-    (-0.985696257199431 . -5.186377179270369e-17)
-    (-0.9874741416755248 . 4.5042414260721607e-17)
-    (-0.9890764455086011 . 3.8290555638111146e-17)
-    (-0.9905144426568394 . 3.831724791843613e-17)
-    (-0.991799391707835 . 4.409184517378617e-17)
-    (-0.9929424533476672 . 1.7878546358495637e-17)
-    (-0.9939546118893758 . 4.7119386774000124e-17)
-    (-0.9948466018950534 . 8.814048062835117e-18)
-    (-0.9956288408269502 . 5.1654135731138195e-18)
-    (-0.9963113685419894 . 4.8641606507366167e-17)
-    (-0.9969037943036427 . -1.6791831975825047e-18)
-    (-0.9974152518287409 . -3.5544029307038557e-17)
-    (-0.9978543627186245 . 4.106505067185739e-17)
-    (-0.9982292084487856 . -2.3699092478631005e-17)
-    (-0.9985473109138543 . -2.122461256205012e-17)
-    (-0.9988156213506826 . -3.139208227148587e-17)
-    (-0.9990405172966104 . -2.667851776257334e-17)
-    (-0.9992278070877242 . 3.114294486006144e-17)
-    (-0.9993827412675937 . -1.8003741649909573e-17)
-    (-0.9995100301644678 . -1.1351588621731435e-17)
-    (-0.9996138668072848 . 2.86709228121328e-17)
-    (-0.999697954290198 . 3.655284977454683e-17)
-    (-0.9997655366626393 . -1.1274704894998538e-17)
-    (-0.9998194324171634 . -3.2318508196837294e-18)
-    (-0.9998620696692346 . -4.625633465510879e-17)
-    (-0.9998955221695238 . -4.3085570938583103e-17)
-    (-0.9999215453570454 . 4.1926814388898224e-17)
-    (-0.9999416117467417 . -1.42988109080781e-17)
-    (-0.9999569450435333 . 3.994008776201599e-17)
-    (-0.9999685524817359 . -2.1315811752046272e-17)
-    (-0.9999772549994149 . 3.9091222055449664e-17)
-    (-0.9999837149671728 . -1.8233879155653072e-17)
-    (-0.9999884612959822 . -3.2841618774310393e-17)
-    (-0.9999919118454622 . -1.1104512988790167e-17)
-    (-0.9999943931396973 . 4.0361849614562793e-17)
-    (-0.9999961574703498 . -2.134042792321693e-17)
-    (-0.999997397525303 . 1.3533076109041662e-17)
-    (-0.999998258725082 . -5.407110478742794e-17)
-    (-0.9999988494792682 . -4.3390217644143825e-17)
-    (-0.9999992495920951 . 3.730548029465148e-17)
-    (-0.9999995170519197 . 3.3188757935647772e-18)
-    (-0.9999996934351678 . 2.0224874192213467e-17)
-    (-0.9999998081436597 . 1.438749764251143e-17)
-    (-0.9999998816770032 . -6.987630739479885e-18)
-    (-0.9999999281209097 . -4.8283410460647105e-17)
-    (-0.9999999570096083 . 3.6506793474258766e-17)
-    (-0.9999999746974519 . 2.107938803420783e-17)
-    (-0.9999999853525123 . 2.7390032102353362e-17)
-    (-0.9999999916642777 . 5.605733083081871e-18)
-    (-0.9999999953390686 . 3.790820747547506e-17)
-    (-0.9999999974407513 . -1.7823127048251318e-17)
-    (-0.9999999986208357 . -4.748354681027246e-17)
-    (-0.9999999992709975 . -4.7891545352614994e-17)
-    (-0.9999999996222632 . -5.177147691724898e-17)
-    (-0.9999999998082539 . -2.6963028933845586e-18)
-    (-0.9999999999047069 . 3.645589784367344e-17)
-    (-0.9999999999536652 . -2.102246580402669e-17)
-    (-0.9999999999779724 . -1.4578586000249962e-17)
-    (-0.9999999999897686 . 1.8931117745502415e-17)
-    (-0.9999999999953603 . 2.2586090325480838e-17)
-    (-0.9999999999979473 . -2.707782230578898e-18)
-    (-0.9999999999991147 . -6.697416717863371e-18)
-    (-0.9999999999996281 . -2.1847548217979098e-17)
-    (-0.9999999999998479 . -4.389412098860936e-17)
-    (-0.9999999999999395 . -5.063859677654805e-17)
-    (-0.9999999999999767 . 3.942076671643759e-17)
-    (-0.9999999999999912 . -1.337442136942254e-17)
-    (-0.9999999999999968 . -3.490832470810129e-17)
-    (-0.9999999999999989 . 1.1911245891949965e-17)
-    (-0.9999999999999997 . 4.963332588729193e-17)
-    (-0.9999999999999999 . 1.5181680740804442e-17)
-    (-1.0 . 4.0200513017888305e-17)
-    (-1.0 . 1.2355599792293348e-17)
-    (-1.0 . 3.660029429583496e-18)
-    (-1.0 . 1.0437427468932139e-18)
-    (-1.0 . 2.8620322059163255e-19)
-    (-1.0 . 7.536949322264369e-20)
-    (-1.0 . 1.9037414132224144e-20)
-    (-1.0 . 4.606230918723704e-21)
-    (-1.0 . 1.0661670573173551e-21)
-    (-1.0 . 2.357462530668593e-22)
-    (-1.0 . 4.972601982525333e-23)
-    (-1.0 . 9.990838514493427e-24)
-    (-1.0 . 1.909147574124114e-24)
-    (-1.0 . 3.464301918629924e-25)
-    (-1.0 . 5.959759382869178e-26)
-    (-1.0 . 9.704085710359217e-27)
-    (-1.0 . 1.4929558185834875e-27)
-    (-1.0 . 2.16638641231196e-28)
-    (-1.0 . 2.9595635553379995e-29)
-    (-1.0 . 3.7992995430783965e-30)
-    (-1.0 . 4.574243408007208e-31)
-    (-1.0 . 5.154710128939581e-32)
-    (-1.0 . 5.425760641374366e-33)
-    (-1.0 . 5.323074268438217e-34)
-    (-1.0 . 4.856854626017807e-35)
-    (-1.0 . 4.112005638501019e-36)
-    (-1.0 . 3.2228706814304173e-37)
-    (-1.0 . 2.3327890584950366e-38)
-    (-1.0 . 1.5555055969050827e-39)
-    (-1.0 . 9.530541239149814e-41)
-    (-1.0 . 5.351370112995799e-42)
-    (-1.0 . 2.7461832867933594e-43)
-    (-1.0 . 1.284369007315253e-44)
-    (-1.0 . 5.4586641410044394e-46)
-    (-1.0 . 2.1019400400312647e-47)
-    (-1.0 . 7.310586300709408e-49)
-    (-1.0 . 2.2892894917392245e-50)
-    (-1.0 . 6.4334119603663054e-52)
-    (-1.0 . 1.6169818855396586e-53)
-    (-1.0 . 3.6222397384786406e-55)
-    (-1.0 . 7.206016097986095e-57)
-    (-1.0 . 1.2683765492843837e-58)
-    (-1.0 . 1.9677716993955896e-60)
-    (-1.0 . 2.680164311533663e-62)
-    (-1.0 . 3.191842581968051e-64)
-    (-1.0 . 3.3097314751182344e-66)
-    (-1.0 . 2.9753378277376716e-68)
-    (-1.0 . 2.3085234617081637e-70)
-    (-1.0 . 1.5388223638575858e-72)
-    (-1.0 . 8.770778222904261e-75)
-    (-1.0 . 4.253613945711465e-77)
-    (-1.0 . 1.746452430408311e-79)
-    (-1.0 . 6.039126957671881e-82)
-    (-1.0 . 1.749361652381559e-84)
-    (-1.0 . 4.221527179358914e-87)
-    (-1.0 . 8.438505045627658e-90)
-    (-1.0 . 1.3890289959826033e-92)
-    (-1.0 . 1.8714190249358942e-95)
-    (-1.0 . 2.0508145275329015e-98)
-    (-1.0 . 1.8162435490055362e-101)
-    (-1.0 . 1.2912884751044706e-104)
-    (-1.0 . 7.319691075989751e-108)
-    (-1.0 . 3.2847940909116385e-111)
-    (-1.0 . 1.1585079822572272e-114)
-    (-1.0 . 3.187101356583876e-118)
-    (-1.0 . 6.786205335253e-122)
-    (-1.0 . 1.109469428988187e-125)
-    (-1.0 . 1.3812592336764689e-129)
-    (-1.0 . 1.298400858897444e-133)
-    (-1.0 . 9.134879417118437e-138)
-    (-1.0 . 4.766776416446869e-142)
-    (-1.0 . 1.827760579796531e-146)
-    (-1.0 . 5.1004005602277926e-151)
-    (-1.0 . 1.0255738026920948e-155)
-    (-1.0 . 1.4708203663521784e-160)
-    (-1.0 . 1.4886612146520806e-165)
-    (-1.0 . 1.0518304626907384e-170)
-    (-1.0 . 5.130167546980931e-176)
-    (-1.0 . 1.707352362929865e-181)
-    (-1.0 . 3.831186191113585e-187)
-    (-1.0 . 5.725486869602135e-193)
-    (-1.0 . 5.626574339653866e-199)
-    (-1.0 . 3.588716803231487e-205)
-    (-1.0 . 1.465652583234918e-211)
-    (-1.0 . 3.7798059795032864e-218)
-    (-1.0 . 6.067578864133267e-225)
-    (-1.0 . 5.973579693952893e-232)
-    (-1.0 . 3.5521557119111035e-239)
-    (-1.0 . 1.2558705316392284e-246)
-    (-1.0 . 2.59738840369466e-254)
-    (-1.0 . 3.0902326394300804e-262)
-    (-1.0 . 2.0787554436363743e-270)
-    (-1.0 . 7.766668266238272e-279)
-    (-1.0 . 1.582357434509706e-287)
-    (-1.0 . 1.7249752189434757e-296)
-    (-1.0 . 9.866936306875695e-306)
-    (-1.0 . 2.90235496098e-315)))
-
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-exp.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-exp.rkt
deleted file mode 100644
index 45aa069377..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-exp.rkt
+++ /dev/null
@@ -1,176 +0,0 @@
-#lang typed/racket/base
-
-#|
-Compute exp and expm1 with 105-bit accuracy
-
-In case anybody cares, the argument reduction scheme used here is about a 3x improvement in speed
-over current state-of-the-art for computing exponentials using a Taylor series. The main discovery
-that enables it is that it's perfectly okay-and-accuracy-preserving to subtract powers of a base
-other than 2, such as 1.25. See "expansion-exp-reduction.rkt" for details.
-
-I may turn this into a paper someday...
-
-Note to self: exp(x+y)-1 = (exp(x)-1) * (exp(y)-1) + (exp(x)-1) + (exp(y)-1)
-|#
-
-(require racket/fixnum
-         "../../../base.rkt"
-         "../../../bigfloat.rkt"
-         "../flonum-functions.rkt"
-         "../flonum-error.rkt"
-         "../flonum-exp.rkt"
-         "../flonum-constants.rkt"
-         "expansion-base.rkt"
-         "expansion-exp-reduction.rkt")
-
-(provide flexp/error fl2exp
-         flexpm1/error fl2expm1)
-
-;; ===================================================================================================
-;; Helper functions
-
-(define-values (c3-hi c3-lo) (fl2 1/6))
-(define-values (c4-hi c4-lo) (fl2 1/24))
-(define-values (c5-hi c5-lo) (fl2 1/120))
-(define-values (c6-hi c6-lo) (fl2 1/720))
-(define-values (c7-hi c7-lo) (fl2 1/5040))
-(define-values (c8-hi c8-lo) (fl2 1/40320))
-
-(: flexpm1-small/error (Flonum -> (Values Flonum Flonum)))
-;; Computes exp(x)-1 when x is small, using 8 terms from its Taylor series using Horner's method
-;; Relative error is <= 1e-32 when (abs x) < 0.0005
-;; Relative error for (+ 1 (flexpm1-small/error x)) is <= 1e-32 when (abs x) < 0.00118
-(define (flexpm1-small/error x)
-  (let*-values ([(x-hi x-lo)  (flsplit x)]
-                [(y2 y1)  (fl2*split-fl c8-hi c8-lo x-hi x-lo)]
-                [(y2 y1)  (fl2+ y2 y1 c7-hi c7-lo)]
-                [(y2 y1)  (fl2*split-fl y2 y1 x-hi x-lo)]
-                [(y2 y1)  (fl2+ y2 y1 c6-hi c6-lo)]
-                [(y2 y1)  (fl2*split-fl y2 y1 x-hi x-lo)]
-                [(y2 y1)  (fl2+ y2 y1 c5-hi c5-lo)]
-                [(y2 y1)  (fl2*split-fl y2 y1 x-hi x-lo)]
-                [(y2 y1)  (fl2+ y2 y1 c4-hi c4-lo)]
-                [(y2 y1)  (fl2*split-fl y2 y1 x-hi x-lo)]
-                [(y2 y1)  (fl2+ y2 y1 c3-hi c3-lo)]
-                [(y2 y1)  (fl2*split-fl y2 y1 x-hi x-lo)]
-                [(y2 y1)  (fl2+ y2 y1 0.5)]
-                [(y2 y1)  (fl2*split-fl y2 y1 x-hi x-lo)]
-                [(y2 y1)  (fl2+ y2 y1 1.0)])
-    (fl2*split-fl y2 y1 x-hi x-lo)))
-
-(: flexpm1-tiny/error (Flonum -> (Values Flonum Flonum)))
-;; Computes exp(x)-1 when x is friggin' tiny, like 1e-18 or something, using 2 terms from its Taylor
-;; series at 0
-;; I haven't bothered quantifying the error because this is only used for the low-order flonum in
-;; fl2exp and fl2expm1, and those are accurate
-(define (flexpm1-tiny/error x)
-  (let-values ([(y2 y1)  (fast-fl+/error (* 0.5 x) 1.0)])
-    (fl2* y2 y1 x)))
-
-;; ===================================================================================================
-;; exp
-
-;; See "expansion-exp-reduction.rkt" for details on the argument reduction here
-
-(: flexp/positive/error (Flonum -> (Values Flonum Flonum)))
-(define (flexp/positive/error x)
-  (let: loop ([x x] [n : Nonnegative-Fixnum  0])
-    (cond
-      [(or ((flabs x) . fl< . exp-min) (n . fx> . 15))  ; even n > 5 should never happen
-       (let-values ([(y2 y1)  (flexpm1-small/error x)])
-         (fl2+ y2 y1 1.0))]
-      [(x . fl> . (fllog +max.0))  (values +inf.0 0.0)]
-      [(rational? x)
-       (let*-values ([(x d2 d1)  (flexpm1-reduction x)]
-                     [(d2 d1)  (fl2+ d2 d1 1.0)]
-                     [(y2 y1)  (loop x (fx+ n 1))])
-         (fl2* d2 d1 y2 y1))]
-      [else
-       (values +nan.0 0.0)])))
-
-(: flexp/error (Flonum -> (Values Flonum Flonum)))
-(define (flexp/error x)
-  (cond [(x . fl> . 0.0)  (flexp/positive/error x)]
-        [(x . fl= . 0.0)  (values 1.0 0.0)]
-        [(x . fl> . (- (fllog +max.0)))
-         (let*-values ([(y2 y1)  (flexp/positive/error (- x))])
-           (fl2/ 1.0 0.0 y2 y1))]
-        [(x . fl>= . -inf.0)  (values (flexp x) 0.0)]
-        [else  (values +nan.0 0.0)]))
-
-(: fl2exp (Flonum Flonum -> (Values Flonum Flonum)))
-(define (fl2exp x2 x1)
-  (cond [(x2 . fl> . -746.0)
-         (let*-values ([(a2 a1)  (flexp/error x2)]
-                       [(b2 b1)  (flexpm1-tiny/error x1)]
-                       [(b2 b1)  (fl2+ b2 b1 1.0)])
-           (fl2* a2 a1 b2 b1))]
-        [(x2 . fl>= . -inf.0)
-         (values 0.0 0.0)]
-        [else
-         (values +nan.0 0.0)]))
-
-;; ===================================================================================================
-;; expm1
-
-#|
-Argument reduction for expm1
-
-Let `y' be chosen using exp's argument reduction, D = exp(y)-1, and R = exp(x-y)-1. Then
-
-  exp(x)-1 = D * R + D + R
-
-using the identity noted at the beginning of this file. Calculating this straightforwardly suffers
-from severe cancellation (generally invalidating all but two bits in the low-order flonum), but
-calculating this doesn't:
-
-  exp(x)-1 = D * (R + 1) + R
-
-The computation of R+1 definitely loses precision, but it doesn't seem to matter.
-|#
-
-(: flexpm1/error (Flonum -> (Values Flonum Flonum)))
-(define (flexpm1/error x)
-  (cond
-    [(x . fl> . -1.0)
-     (let: loop ([x x] [n : Nonnegative-Fixnum  0])
-       (cond [(or ((flabs x) . fl< . expm1-min) (n . fx> . 15))  ; even n > 5 should never happen
-              (flexpm1-small/error x)]
-             [(x . fl< . (- (fllog +max.0)))  (values -1.0 0.0)]
-             [(x . fl> . (fllog +max.0))  (values +inf.0 0.0)]
-             [(rational? x)
-              (let*-values ([(x d2 d1)  (flexpm1-reduction x)]
-                            [(r2 r1)  (loop x (fx+ n 1))]
-                            [(w2 w1)  (fl2+ r2 r1 1.0)]
-                            [(y2 y1)  (fl2* d2 d1 w2 w1)])
-                (fl2+ y2 y1 r2 r1))]
-             [else
-              (values +nan.0 0.0)]))]
-    [(x . fl> . (fllog (* 0.25 epsilon.0)))
-     ;; exp(x) is near zero here, so this is more accurate
-     (let-values ([(y2 y1)  (flexp/error x)])
-       (fl2+ y2 y1 -1.0))]
-    [else
-     ;; The high-order flonum is -1 here, so return -1 + exp(x) directly
-     (values -1.0 (flexp x))]))
-
-(define-values (expm1-max-hi expm1-max-lo)
-  (values 709.782712893384 2.3691528222554853e-14))
-
-(: fl2expm1 (Flonum Flonum -> (Values Flonum Flonum)))
-(define (fl2expm1 x2 x1)
-  (define x (fl+ x2 x1))
-  (cond
-    [(x . fl< . -1.0)
-     (let-values ([(y2 y1)  (fl2exp x2 x1)])
-       (fl2+ y2 y1 -1.0))]
-    [(x2 x1 . fl2>= . expm1-max-hi expm1-max-lo)
-     (values +inf.0 0.0)]
-    [(x . fl= . 0.0)
-     (values x2 0.0)]
-    [else
-     (let*-values ([(a2 a1)  (flexpm1/error x2)]
-                   [(b2 b1)  (flexpm1-tiny/error x1)]
-                   [(w2 w1)  (fl2+ a2 a1 1.0)]
-                   [(y2 y1)  (fl2* b2 b1 w2 w1)])
-       (fl2+ y2 y1 a2 a1))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-log.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-log.rkt
deleted file mode 100644
index e91af5413e..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-log.rkt
+++ /dev/null
@@ -1,110 +0,0 @@
-#lang typed/racket/base
-
-#|
-Compute log and log1p with 105-bit accuracy
-
-Both implementations do some argument reduction, find excellent 53-bit initial estimates, and then
-perform one Newton step.
-|#
-
-(require "../flonum-functions.rkt"
-         "../flonum-error.rkt"
-         "../flonum-log.rkt"
-         "expansion-base.rkt"
-         "expansion-exp.rkt")
-
-(provide fl2log fl2log1p)
-
-;; ===================================================================================================
-;; log
-
-#|
-Argument reduction for log:
-
-  log(x) = log(x*2^k) - k*log(2)
-
-A value of k that reduces any x to [0.5, 1.0] is
-  
-  k = -truncate(log(x)/log(2))
-|#
-
-(define-values (log2-hi log2-lo) (values 0.6931471805599453 2.3190468138462996e-17))
-
-(: fl2log-reduction (Flonum Flonum -> (Values Flonum Flonum Flonum)))
-(define (fl2log-reduction x2 x1)
-  (define k (- (fltruncate (fl/ (fllog+ x1 x2) (fllog 2.0)))))
-  (cond [(k . fl> . 1023.0)
-         ;; This can happen if x is subnormal; just multiply in pieces
-         (define k0 1023.0)
-         (define k1 (fl- k k0))
-         (define 2^k0 (flexpt 2.0 k0))
-         (define 2^k1 (flexpt 2.0 k1))
-         (let*-values ([(x2 x1)  (values (* x2 2^k0 2^k1) (* x1 2^k0 2^k1))])
-           (values k x2 x1))]
-        [else
-         (define 2^k (flexpt 2.0 k))
-         (let*-values ([(x2 x1)  (values (fl* x2 2^k) (fl* x1 2^k))])
-           (values k x2 x1))]))
-
-(: fl2log (Flonum Flonum -> (Values Flonum Flonum)))
-(define (fl2log x2 x1)
-  (define x (fl+ x1 x2))
-  (cond [(x . fl<= . 0.0)  (cond [(fl= x 0.0)  (values -inf.0 0.0)]
-                                 [else  (values +nan.0 0.0)])]
-        [(x . fl= . +inf.0)  (values +inf.0 0.0)]
-        [(or (x . fl< . 0.5) (x . fl> . 2.5))
-         ;; Reduce arguments
-         (let*-values ([(k x2 x1)  (fl2log-reduction x2 x1)]
-                       [(y2 y1)  (fl2log x2 x1)]
-                       [(z2 z1)  (fl2* log2-hi log2-lo k)])
-           (fl2- y2 y1 z2 z1))]
-        [else
-         ;; Estimate log(x) and do a Newton iteration using expm1
-         (let*-values ([(y)  (fllog+ x2 x1)]
-                       [(x2 x1)  (fl2+ x2 x1 -1.0)]
-                       [(z2 z1)  (flexpm1/error y)]
-                       [(w2 w1)  (fl2+ z2 z1 1.0)]
-                       [(dy2 dy1)  (fl2- x2 x1 z2 z1)]
-                       [(dy2 dy1)  (fl2/ dy2 dy1 w2 w1)])
-           (fl2+ dy2 dy1 y))]))
-
-;; ===================================================================================================
-;; log1p
-
-#|
-Argument reduction for log1p:
-
-  log1p(x) = k*log(2) + log1p(x/2^k + (1/2^k - 1))
-
-A `k'  that reduces any argument `x' to (-1/2,1/2) is
-
-  k = round(log1p(x)/log(2))
-|#
-
-(: fl2log1p-reduction (Flonum Flonum Flonum Flonum Flonum -> (Values Flonum Flonum Flonum)))
-(define (fl2log1p-reduction x2 x1 a2 a1 y)
-  (define k (flround (fl/ y (fllog 2.0))))
-  (define 2^k (flexpt 2.0 k))
-  (define-values (j2 j1) (fast-fl-/error (/ 1.0 2^k) 1.0))
-  (let*-values ([(x2 x1)  (values (/ x2 2^k) (/ x1 2^k))]
-                [(x2 x1)  (fl2+ x2 x1 j2 j1)])
-    (values k x2 x1)))
-
-(: fl2log1p (Flonum Flonum -> (Values Flonum Flonum)))
-(define (fl2log1p x2 x1)
-  (define-values (a2 a1) (fl2+ x2 x1 1.0))
-  (define y (fllog+ a2 a1))
-  (cond
-    [(or (y . fl< . -0.5) (a2 . fl> . 2.0))  (fl2log a2 a1)]
-    [(fl= (fl+ x2 x1) 0.0)  (values x2 0.0)]
-    [(y . fl> . 0.5)
-     (let*-values ([(k x2 x1)  (fl2log1p-reduction x2 x1 a2 a1 y)]
-                   [(y2 y1)  (fl2log1p x2 x1)]
-                   [(z2 z1)  (fl2* log2-hi log2-lo k)])
-       (fl2+ y2 y1 z2 z1))]
-    [else
-     (let*-values ([(z2 z1)  (flexpm1/error y)]
-                   [(w2 w1)  (fl2+ z2 z1 1.0)]
-                   [(dy2 dy1)  (fl2- x2 x1 z2 z1)]
-                   [(dy2 dy1)  (fl2/ dy2 dy1 w2 w1)])
-       (fl2+ dy2 dy1 y))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-bits.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-bits.rkt
deleted file mode 100644
index 691ed4b7c1..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-bits.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang typed/racket/base
-
-(require racket/flonum
-         racket/performance-hint)
-
-(provide flonum->bit-field bit-field->flonum
-         flonum->fields fields->flonum
-         flonum->sig+exp sig+exp->flonum
-         flonum->ordinal ordinal->flonum
-         flstep flnext flprev flonums-between
-         flulp)
-
-(: flonum->bit-field (Flonum -> Natural))
-(define (flonum->bit-field x)
-  (assert (integer-bytes->integer (real->floating-point-bytes x (ann 8 8)) #f)
-          exact-nonnegative-integer?))
-
-(: bit-field->flonum (Integer -> Flonum))
-(define (bit-field->flonum i)
-  (cond [(and (i . >= . 0) (i . <= . #xffffffffffffffff))
-         (floating-point-bytes->real (integer->integer-bytes i 8 #f))]
-        [else
-         (raise-argument-error 'bit-field->flonum "Integer in [0 .. #xffffffffffffffff]" i)]))
-
-(define implicit-leading-one (arithmetic-shift 1 52))
-(define max-significand (- implicit-leading-one 1))
-(define max-exponent 2047)
-(define max-signed-exponent 1023)
-(define min-signed-exponent -1074)
-
-(: flonum->fields (Flonum -> (Values (U 0 1) Index Natural)))
-(define (flonum->fields x)
-  (define n (flonum->bit-field x))
-  (values (if (zero? (bitwise-bit-field n 63 64)) 0 1)
-          (assert (bitwise-bit-field n 52 63) index?)
-          (bitwise-bit-field n 0 52)))
-
-(: fields->flonum (Integer Integer Integer -> Flonum))
-(define (fields->flonum s e m)
-  (cond [(not (or (= s 0) (= s 1)))
-         (raise-argument-error 'fields->flonum "(U 0 1)" 0 s e m)]
-        [(or (e . < . 0) (e . > . max-exponent))
-         (raise-argument-error 'fields->flonum (format "Natural <= ~e" max-exponent) 1 s e m)]
-        [(or (m . < . 0) (m . > . max-significand))
-         (raise-argument-error 'fields->flonum (format "Natural <= ~a" max-significand) 2 s e m)]
-        [else
-         (bit-field->flonum (bitwise-ior (arithmetic-shift s 63)
-                                         (arithmetic-shift e 52)
-                                         m))]))
-
-(: flonum->sig+exp (Flonum -> (Values Integer Fixnum)))
-(define (flonum->sig+exp x)
-  (define-values (s e m) (flonum->fields x))
-  (let-values ([(sig exp)  (if (= e 0)
-                               (values m -1074)
-                               (values (bitwise-ior m implicit-leading-one)
-                                       (assert (- e 1075) fixnum?)))])
-    (values (if (zero? s) sig (- sig)) exp)))
-
-(: sig+exp->flonum (Integer Integer -> Flonum))
-(define (sig+exp->flonum sig exp)
-  (cond [(= sig 0)  0.0]
-        [(exp . > . max-signed-exponent)  (if (sig . < . 0) -inf.0 +inf.0)]
-        [(exp . < . min-signed-exponent)  (if (sig . < . 0) -0.0 0.0)]
-        [else  (real->double-flonum (* sig (expt 2 exp)))]))
-
-(: flonum->ordinal (Flonum -> Integer))
-(define (flonum->ordinal x)
-  (cond [(x . fl< . 0.0)  (- (flonum->bit-field (fl- 0.0 x)))]
-        [else             (flonum->bit-field (flabs x))])) ; abs for -0.0
-
-(: ordinal->flonum (Integer -> Flonum))
-(define (ordinal->flonum i)
-  (cond [(and (i . >= . #x-7fffffffffffffff) (i . <= . #x7fffffffffffffff))
-         (cond [(i . < . 0)  (fl- 0.0 (bit-field->flonum (- i)))]
-               [else         (bit-field->flonum i)])]
-        [else
-         (raise-argument-error
-          'ordinal->flonum "Integer in [#x-7fffffffffffffff .. #x7fffffffffffffff]" i)]))
-
-(define +inf-ordinal (flonum->ordinal +inf.0))
-(define -inf-ordinal (flonum->ordinal -inf.0))
-
-(: flstep (Flonum Integer -> Flonum))
-(define (flstep x n)
-  (cond [(not (and (x . fl>= . -inf.0) (x . fl<= . +inf.0)))  +nan.0]
-        [(and (fl= x +inf.0) (n . >= . 0))  +inf.0]
-        [(and (fl= x -inf.0) (n . <= . 0))  -inf.0]
-        [else  (define i (+ n (flonum->ordinal x)))
-               (cond [(i . < . -inf-ordinal)  -inf.0]
-                     [(i . > . +inf-ordinal)  +inf.0]
-                     [else  (ordinal->flonum i)])]))
-
-(begin-encourage-inline
-  
-  (: flnext (Flonum -> Flonum))
-  (define (flnext x) (flstep x 1))
-  
-  (: flprev (Flonum -> Flonum))
-  (define (flprev x) (flstep x -1))
-  
-  (: flonums-between (Flonum Flonum -> Integer))
-  (define (flonums-between x y)
-    (- (flonum->ordinal y) (flonum->ordinal x)))
-  
-  )  ; begin-encourage-inline
-  
-(: flulp (Flonum -> (U Flonum-Nan Nonnegative-Flonum)))
-(define (flulp x)
-  (let ([x  (flabs x)])
-    (cond [(fl= x +inf.0)  +nan.0]
-          [(eqv? x +nan.0)  +nan.0]
-          [(fl= x 0.0)  0.0]
-          [else
-           (define ulp (flabs (fl- (flnext x) x)))
-           (cond [(fl= ulp +inf.0)  (flabs (fl- x (flprev x)))]
-                 [else  ulp])])))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-brent-dekker.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-brent-dekker.rkt
deleted file mode 100644
index ec3fc463f0..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-brent-dekker.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang typed/racket/base
-
-(require "flonum-constants.rkt"
-         "flonum-functions.rkt")
-
-(provide flbracketed-root)
-
-(define debug-printf? #f)
-
-(define-syntax-rule (debugf e ...)
-  (when debug-printf? (printf e ...)))
-
-(: flbracketed-root* (-> (-> Flonum Flonum) Flonum Flonum Flonum Flonum Flonum))
-(define (flbracketed-root* f a fa b fb)
-  (let loop ([bisected? #t] [a a] [fa fa] [b b] [fb fb] [c a] [fc fa] [d 0.0] [n 0])
-    (debugf "~v: ~v ~v~n" n a b)
-    (debugf "~v ~v~n~n" fa fb)
-    (define min-abs-ab (min (abs a) (abs b)))
-    (define ε (if (min-abs-ab . <= . +max-subnormal.0) +min.0 (* min-abs-ab epsilon.0)))
-    (cond
-      ;; If we got it right, return it
-      [(= fb 0.0)  b]
-      ;; If a and b are too close, return b
-      [((abs (- a b)) . <= . ε)
-       (debugf "(abs (- a b)) <= ~v; bailing~n" ε)
-       b]
-      [(n . < . 5000)
-       (let*-values
-           ([(bisect? s)
-             (cond
-               ;; Weird rules for forcing bisection to make progress
-               [(or (and bisected?       ((abs (- b c)) . < . (* 128.0 ε))
-                         (debugf "reason 1~n"))
-                    (and (not bisected?) ((abs (- c d)) . < . (* 128.0 ε))
-                         (debugf "reason 2:~n")))
-                (values #t 0.0)]
-               ;; Get an interpolated point
-               [else
-                (define fa-fb (- fa fb))
-                (define fb-fc (- fb fc))
-                (define fc-fa (- fc fa))
-                (define da (* fa-fb (- fc-fa)))
-                (define db (* fb-fc (- fa-fb)))
-                (define dc (* fc-fa (- fb-fc)))
-                (cond [(or (= da 0.0) (= db 0.0) (= dc 0.0))
-                       ;; Secant method because quadratic method will fail
-                       (values #f (- b (* fb (/ (- b a) (- fa-fb)))))]
-                      [else
-                       ;; Inverse quadratic interpolation method
-                       (values #f (+ (/ (* a fb fc) da)
-                                     (/ (* b fc fa) db)
-                                     (/ (* c fa fb) dc)))])])]
-            ;; Run tests to determine whether it's a bad point
-            [(bisected? s)
-             (cond
-               [(or bisect?
-                    (and (not (let ([s0  (/ (+ (* 3.0 a) b) 4.0)])
-                                (if (<= s0 b) (<= s0 s b) (<= b s s0))))
-                         (debugf "reason 3~n"))
-                    (and bisected?       ((abs (- s b)) . >= . (* 0.5 (abs (- b c))))
-                         (debugf "reason 4~n"))
-                    (and (not bisected?) ((abs (- s b)) . >= . (* 0.5 (abs (- c d))))
-                         (debugf "reason 5~n")))
-                ;; Bisect this time
-                (values #t (* 0.5 (+ a b)))]
-               [else
-                (values #f s)])]
-            [(d)  c]
-            [(c fc)  (values b fb)]
-            [(fs)  (f s)]
-            ;; Replace the endpoint with the same sign as s
-            [(a fa b fb)  (if ((* fa fs) . < . 0.0)
-                              (values a fa s fs)
-                              (values s fs b fb))]
-            ;; Make sure b is closer
-            [(a fa b fb)  (if ((abs fa) . < . (abs fb))
-                              (values b fb a fa)
-                              (values a fa b fb))])
-         (loop bisected? a fa b fb c fc d (+ n 1)))]
-      [else  b])))
-
-(: flbracketed-root (-> (-> Flonum Flonum) Flonum Flonum Flonum))
-;; Find a root between a and b if f(a) and f(b) have opposite signs
-(define (flbracketed-root f a b)
-  (define fa (f a))
-  (define fb (f b))
-  (cond [(= fa 0.0)  a]
-        [(= fb 0.0)  b]
-        [(or (flnan? a) (flnan? fa) (flnan? b) (flnan? fb))  +nan.0]
-        ;; Check signs
-        [((* fa fb) . >= . 0.0)
-         (debugf "(f ~v) = ~v and (f ~v) = ~v do not bracket a root~n" a fa b fb)
-         +nan.0]
-        [else
-         (let*-values
-             ([(a fa)  (cond [(= a -inf.0)  (values -max.0 (f -max.0))]
-                             [(= a +inf.0)  (values +max.0 (f +max.0))]
-                             [else  (values a fa)])]
-              [(b fb)  (cond [(= b -inf.0)  (values -max.0 (f -max.0))]
-                             [(= b +inf.0)  (values +max.0 (f +max.0))]
-                             [else  (values b fb)])]
-              ;; Make sure b is closer
-              [(a fa b fb)  (if ((abs fa) . < . (abs fb))
-                                (values b fb a fa)
-                                (values a fa b fb))])
-           (flbracketed-root* f a fa b fb))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-constants.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-constants.rkt
deleted file mode 100644
index 3b198c8073..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-constants.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed/racket/base
-
-(require racket/flonum
-         "flonum-bits.rkt")
-
-(provide -max.0 -max-subnormal.0 -min.0 +min.0 +max-subnormal.0 +max.0
-         epsilon.0)
-
-(define -max.0 (assert (flnext -inf.0) negative?))
-(define -min.0 (assert (flprev 0.0) negative?))
-(define +min.0 (assert (flnext 0.0) positive?))
-(define +max.0 (assert (flprev +inf.0) positive?))
-
-(define +max-subnormal.0 (assert (ordinal->flonum #xfffffffffffff) positive?))
-(define -max-subnormal.0 (- +max-subnormal.0))
-
-;; The smallest flonum that can be added to 1.0 to get a result != 1.0
-(define epsilon.0 (assert (flulp 1.0) positive?))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-error.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-error.rkt
deleted file mode 100644
index 2c42c62a01..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-error.rkt
+++ /dev/null
@@ -1,224 +0,0 @@
-#lang racket/base
-
-(provide flsplit
-         fast-mono-fl+/error
-         fast-mono-fl-/error
-         fast-fl+/error
-         fast-fl-/error
-         fast-fl*/error
-         fast-flsqr/error
-         fast-fl//error
-         fast-flfma/error
-         fast-flfsa/error
-         fl+/error
-         fl-/error
-         fl*/error
-         flsqr/error
-         fl//error
-         flfma/error
-         flfsa/error)
-
-(module untyped-defs racket/base
-  (require (for-syntax racket/base)
-           "flonum-functions.rkt")
-  
-  (provide (all-defined-out))
-  
-  ;(: flsplit (Flonum -> (Values Flonum Flonum)))
-  ;; Splits a flonum into a two flonums `hi' and `lo' with 26 bits precision each, such that
-  ;; |hi| >= |lo| and hi + lo = a. (The extra sign bit accounts for the missing bit.)
-  ;; This function returns (values +nan.0 +nan.0) for |a| >= 1.3393857490036326e+300.
-  (define-syntax-rule (flsplit a-expr)
-    (let ([a a-expr])
-      (let* ([c   (fl* a (fl+ 1.0 (flexpt 2.0 27.0)))]
-             [x2  (fl- c (fl- c a))])
-        (values x2 (fl- a x2)))))
-  
-  ;; =================================================================================================
-  ;; Fast monotone addition and subtraction
-  
-  ;(: fast-mono-fl+/error (Flonum Flonum -> (Values Flonum Flonum)))
-  ;; Returns a+b and its rounding error
-  ;; Assumes |a| >= |b|
-  (define-syntax-rule (fast-mono-fl+/error a-expr b-expr)
-    (let ([a a-expr] [b b-expr])
-      (let ([x2  (+ a b)])
-        (values x2 (- b (- x2 a))))))
-  
-  ;(: fast-mono-fl-/error (Flonum Flonum -> (Values Flonum Flonum)))
-  ;; Returns a+b and its rounding error
-  ;; Assumes |a| >= |b|
-  (define-syntax-rule (fast-mono-fl-/error a-expr b-expr)
-    (let ([a a-expr] [b b-expr])
-      (let ([x2  (- a b)])
-        (values x2 (- (- a x2) b)))))
-  
-  ;; =================================================================================================
-  ;; Fast arithmetic that returns rounding error
-  
-  ;(: fast-fl+/error (Flonum Flonum -> (Values Flonum Flonum)))
-  ;; Returns a+b and its rounding error
-  (define-syntax-rule (fast-fl+/error a-expr b-expr)
-    (let ([a a-expr] [b b-expr])
-      (let* ([x2  (fl+ a b)]
-             [v   (fl- x2 a)])
-        (values x2 (fl+ (fl- a (fl- x2 v)) (fl- b v))))))
-  
-  ;(: fast-fl-/error (Flonum Flonum -> (Values Flonum Flonum)))
-  ;; Returns a-b and its rounding error
-  (define-syntax-rule (fast-fl-/error a-expr b-expr)
-    (let ([a a-expr] [b b-expr])
-      (let* ([x2  (fl- a b)]
-             [v   (fl- x2 a)])
-        (values x2 (fl- (fl- a (fl- x2 v)) (fl+ b v))))))
-  
-  ;(: fast-fl*/error (Flonum Flonum -> (Values Flonum Flonum)))
-  ;; Returns a*b and its rounding error
-  (define-syntax-rule (fast-fl*/error a-expr b-expr)
-    (let ([a a-expr] [b b-expr])
-      (let*-values ([(x2)  (fl* a b)]
-                    [(a2 a1)  (flsplit a)]
-                    [(b2 b1)  (flsplit b)])
-        (values x2 (- (fl- (fl- (fl- (fl- x2 (fl* a2 b2))
-                                     (fl* a1 b2))
-                                (fl* a2 b1))
-                           (fl* a1 b1)))))))
-  
-  ;(: fast-flfma/error (Flonum Flonum Flonum -> (Values Flonum Flonum)))
-  ;; Returns a*b+c and its rounding error
-  (define-syntax-rule (fast-flfma/error a-expr b-expr c-expr)
-    (let*-values ([(y2 y1)  (fast-fl*/error a-expr b-expr)]
-                  [(h0 h1)  (fast-fl+/error c-expr y1)]
-                  [(h3 h2)  (fast-fl+/error h0 y2)])
-      (values h3 (fl+ h2 h1))))
-  
-  ;(: fast-flfsa/error (Flonum Flonum Flonum -> (Values Flonum Flonum)))
-  ;; Returns a*a+b and its rounding error
-  (define-syntax-rule (fast-flfsa/error a-expr b-expr)
-    (let*-values ([(y2 y1)  (fast-flsqr/error a-expr)]
-                  [(h0 h1)  (fast-fl+/error b-expr y1)]
-                  [(h3 h2)  (fast-fl+/error h0 y2)])
-      (values h3 (fl+ h2 h1))))
-  
-  #;; If we had hardware fused multiply-add:
-  (define-syntax-rule (fast-fl*/error a-expr b-expr)
-    (let ([a a-expr] [b b-expr])
-      (let ([x2  (fl* a b)])
-        (values x2 (flfma a b (- x2))))))
-
-  ;(: fast-flsqr/error (Flonum -> (Values Flonum Flonum)))
-  ;; Returns a*a and its rounding error
-  (define-syntax-rule (fast-flsqr/error a-expr)
-    (let ([a a-expr])
-      (let*-values ([(x2)  (fl* a a)]
-                    [(a2 a1)  (flsplit a)])
-        (values x2 (- (fl- (fl- (fl- x2 (fl* a2 a2))
-                                (fl* 2.0 (fl* a2 a1)))
-                           (fl* a1 a1)))))))
-  
-  ;(: fast-fl//error (Flonum Flonum -> (Values Flonum Flonum)))
-  ;; Returns a/b and its rounding error
-  (define-syntax-rule (fast-fl//error a-expr b-expr)
-    (let ([a a-expr] [b b-expr])
-      (let*-values ([(x2)  (fl/ a b)]
-                    [(w2 w1)  (fast-fl*/error x2 b)])
-        (fast-mono-fl+/error x2 (fl/ (fl- (fl- a w2) w1) b)))))
-  
-  )  ; module
-
-(require (submod "." untyped-defs))
-
-(module typed-defs typed/racket/base
-  (require racket/performance-hint
-           (submod ".." untyped-defs)
-           "flonum-functions.rkt"
-           "utils.rkt")
-  
-  (provide (all-defined-out))
-  
-  ;; =================================================================================================
-  ;; Function versions of the above that are well-defined for the largest domain, and return 0.0 as
-  ;; the second argument whenever the first isn't rational
-  
-  (begin-encourage-inline
-    
-    (: fl+/error (Flonum Flonum -> (Values Flonum Flonum)))
-    (define (fl+/error a b)
-      (let-values ([(x2 x1)  (fast-fl+/error a b)])
-        (values x2 (if (flrational? x2) x1 0.0))))
-    
-    (: fl-/error (Flonum Flonum -> (Values Flonum Flonum)))
-    (define (fl-/error a b)
-      (let-values ([(x2 x1)  (fast-fl-/error a b)])
-        (values x2 (if (flrational? x2) x1 0.0))))
-    
-    (: fl*/error (Flonum Flonum -> (Values Flonum Flonum)))
-    (define (fl*/error a b)
-      (let ([x2  (fl* a b)])
-        (values x2 (if (and (flrational? x2) (not (flsubnormal? x2)))
-                       (let*-values ([(da db)  (values (near-pow2 a) (near-pow2 b))]
-                                     [(d)  (fl* da db)]
-                                     [(d?)  (and (d . fl> . 0.0) (d . fl< . +inf.0))]
-                                     [(a2 a1)  (flsplit (fl/ a da))]
-                                     [(b2 b1)  (flsplit (fl/ b db))]
-                                     [(x2)  (if d? (fl/ x2 d) (fl/ (fl/ x2 da) db))]
-                                     [(x1)  (- (fl- (fl- (fl- (fl- x2 (fl* a2 b2))
-                                                              (fl* a1 b2))
-                                                         (fl* a2 b1))
-                                                    (fl* a1 b1)))])
-                         (if d? (fl* x1 d) (fl* (fl* x1 da) db)))
-                       0.0))))
-    
-    (: flsqr/error (Flonum -> (Values Flonum Flonum)))
-    (define (flsqr/error a)
-      (let ([x2  (fl* a a)])
-        (values x2 (if (and (flrational? x2) (not (flsubnormal? x2)))
-                       (let*-values ([(d)  (near-pow2 a)]
-                                     [(d^2)  (fl* d d)]
-                                     [(d^2?)  (and (d^2 . fl> . 0.0) (d^2 . fl< . +inf.0))]
-                                     [(a2 a1)  (flsplit (fl/ a d))]
-                                     [(x2)  (if d^2? (fl/ x2 d^2) (fl/ (fl/ x2 d) d))]
-                                     [(x1)  (- (fl- (fl- (fl- x2 (fl* a2 a2))
-                                                         (fl* 2.0 (fl* a1 a2)))
-                                                    (fl* a1 a1)))])
-                         (if d^2? (fl* x1 d^2) (fl* (fl* x1 d) d)))
-                       0.0))))
-    
-    (: fl//error (Flonum Flonum -> (Values Flonum Flonum)))
-    (define (fl//error a b)
-      (let ([x2  (fl/ a b)])
-        (values x2 (if (and (flrational? x2) (flrational? b))
-                       (let* ([d  (near-pow2/div a b)]
-                              [a  (fl/ a d)]
-                              [b  (fl/ b d)])
-                         (let-values ([(w2 w1)  (fl*/error x2 b)])
-                           (fl/ (fl- (fl- a w2) w1) b)))
-                       0.0))))
-    
-    (: flfma/error (-> Flonum Flonum Flonum (Values Flonum Flonum)))
-    (define (flfma/error a b c)
-      (define-values (x2 x1) (fast-flfma/error a b c))
-      (cond [(flrational? (+ x2 x1))  (values x2 x1)]
-            [else
-             (define n (near-pow2 (max (flsqrt (abs a)) (flsqrt (abs b)))))
-             (define 1/n (/ 1.0 n))
-             (define n^2 (* n n))
-             (let-values ([(x2 x1)  (fast-flfma/error (* a 1/n) (* b 1/n) (* c 1/n 1/n))])
-               (values (* n^2 x2) (* n^2 x1)))]))
-    
-    (: flfsa/error (-> Flonum Flonum (Values Flonum Flonum)))
-    (define (flfsa/error a b)
-      (define-values (x2 x1) (fast-flfsa/error a b))
-      (cond [(flrational? (+ x2 x1))  (values x2 x1)]
-            [else
-             (define n (near-pow2 (flsqrt (abs a))))
-             (define 1/n (/ 1.0 n))
-             (define n^2 (* n n))
-             (let-values ([(x2 x1)  (fast-flfsa/error (* a 1/n) (* b 1/n 1/n))])
-               (values (* n^2 x2) (* n^2 x1)))]))
-    
-    )  ; begin-encourage-inline
-  
-  )  ; module
-
-(require (submod "." typed-defs))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-exp.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-exp.rkt
deleted file mode 100644
index 2642c98878..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-exp.rkt
+++ /dev/null
@@ -1,112 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         "flonum-functions.rkt"
-         "flonum-constants.rkt"
-         "flonum-polyfun.rkt"
-         "../unsafe.rkt")
-
-(provide flexpm1 flexpsqr flgauss flexp1p flexp2 flpow2near)
-
-(define expm1-poly-numer
-  (make-flpolyfun
-   (-0.28127670288085937e-1
-     0.51278186299064534e0
-    -0.6310029069350198e-1
-     0.11638457975729296e-1
-    -0.52143390687521003e-3
-     0.21491399776965688e-4)))
-
-(define expm1-poly-denom
-  (make-flpolyfun
-   ( 1.0
-    -0.45442309511354755e0
-     0.90850389570911714e-1
-    -0.10088963629815502e-1
-     0.63003407478692265e-3
-    -0.17976570003654402e-4)))
-
-(: flexpm1/poly (Float -> Float))
-(define (flexpm1/poly x)
-  ;; Define negative in terms of positive to avoid cancellation error
-  (cond [(x . fl< . 0.0)  (define y (flexpm1/poly (- x)))
-                          (fl/ (- y) (fl+ y 1.0))]
-        [else  (fl+ (fl* x 0.10281276702880859e1)
-                    (fl* x (fl/ (expm1-poly-numer x) (expm1-poly-denom x))))]))
-
-;; Integer arguments for flexp2
-(: flexp2s (U #f (Vectorof Nonnegative-Flonum)))
-(define flexp2s #f)
-
-(define (build-flexp2s)
-  (: new-flexp2s (Vectorof Nonnegative-Flonum))
-  (define new-flexp2s (build-vector (- 1024 -1074) (λ: ([n : Index]) (fl (expt 2 (- n 1074))))))
-  (set! flexp2s new-flexp2s)
-  new-flexp2s)
-
-(begin-encourage-inline
-  
-  (: flexpm1 (Float -> Float))
-  ;; Computes exp(x)-1 in a way that is accurate for small x
-  (define (flexpm1 x)
-    (define ax (flabs x))
-    (cond [(ax . fl>= . 0.5)  (fl- (flexp x) 1.0)]
-          [(ax . fl> . (fl* 0.5 epsilon.0))  (flexpm1/poly x)]
-          [else  x]))
-  
-  (: flgauss (Flonum -> Flonum))
-  ;; Computes exp(-x^2) in a way that is accurate for large x
-  (define (flgauss x)
-    (let ([x  (flabs x)])
-      (cond [(x . fl> . 28.0)  0.0]
-            [(x . fl> . 1.0)
-             ;; Split x into a flonum with 21 high-order fractional bits and a part with the rest
-             ;; Sometime after p > 26.1, (exp (- (* p p))) outputs subnormals, so we don't go there
-             (define p (flmin 26.0 (fl/ (fltruncate (fl* (flexpt 2.0 21.0) x)) (flexpt 2.0 21.0))))
-             (define q (fl- x p))
-             (fl* (fl* (flexp (- (fl* 2.0 (fl* p q))))
-                       (flexp (- (fl* q q))))
-                  (flexp (- (fl* p p))))]
-            [else
-             (flexp (- (fl* x x)))])))
-  
-  (: flexpsqr (Flonum -> Flonum))
-  ;; Computes exp(x^2) in a way that is accurate for large x
-  (define (flexpsqr x)
-    (let ([x  (flabs x)])
-      (cond [(x . fl> . 27.0)  +inf.0]
-            [(x . fl> . 1.0)
-             (define p (fl/ (fltruncate (fl* (flexpt 2.0 21.0) x)) (flexpt 2.0 21.0)))
-             (define q (fl- x p))
-             (fl* (fl* (flexp (fl* 2.0 (fl* p q)))
-                       (flexp (fl* q q)))
-                  (flexp (fl* p p)))]
-            [else
-             (flexp (fl* x x))])))
-  
-  (: flexp1p (Flonum -> Flonum))
-  ;; Computes exp(1+x) in a way that is accurate near powers of 2
-  (define (flexp1p x)
-    (cond [(x . fl< . -0.5)  (flexp (fl+ 1.0 x))]
-          [else
-           (define lg2x (flfloor (fl/ (fllog x) (fllog 2.0))))
-           (define lg2x+1 (flfloor (fl/ (fllog (fl+ 1.0 x)) (fllog 2.0))))
-           (cond [(fl= lg2x lg2x+1)  (flexp (fl+ 1.0 x))]
-                 [else  (fl* (flexp x) (flexp 1.0))])]))
-  
-  (: flexp2 (Flonum -> Nonnegative-Flonum))
-  ;; Computes 2^x
-  (define (flexp2 x)
-    (cond [(fl<= x -1075.0)  0.0]
-          [(fl>= x 1024.0)  +inf.0]
-          [(fl= x (flround x))
-           (let* ([flexp2s  flexp2s]
-                  [flexp2s  (if flexp2s flexp2s (build-flexp2s))])
-             (unsafe-vector-ref flexp2s (fl->exact-integer (fl+ x 1074.0))))]
-          [else  (flexpt 2.0 x)]))
-  
-  (: flpow2near (-> Flonum Flonum))
-  (define (flpow2near a)
-    (flexp2 (flmax -1074.0 (flmin 1023.0 (flround (fl/ (fllog (flabs a)) (fllog 2.0)))))))
-  
-  )  ; begin-encourage-inline
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-factorial.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-factorial.rkt
deleted file mode 100644
index f33fbf5911..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-factorial.rkt
+++ /dev/null
@@ -1,152 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         racket/performance-hint
-         (only-in racket/math pi)
-         "../number-theory/factorial.rkt"
-         "../functions/stirling-error.rkt"
-         "flonum-functions.rkt"
-         "flonum-log.rkt"
-         "flonum-more-functions.rkt"
-         "flonum-error.rkt")
-
-(provide flfactorial
-         flbinomial
-         flpermutations
-         flmultinomial
-         fllog-factorial
-         fllog-permutations
-         fllog-binomial
-         fllog-multinomial)
-
-;; ===================================================================================================
-;; Factorial
-
-(begin-encourage-inline
-
-  (: flfactorial (Flonum -> Flonum))
-  ;; Error = 0 ulps
-  (define (flfactorial n)
-    (cond [(not (integer? n))  +nan.0]
-          [(n . fl< . 0.0)  +nan.0]
-          [(n . fl< . 171.0)  (fl (factorial (fl->fx n)))]
-          [else  +inf.0]))
-  
-  (: fllog-factorial (Flonum -> Flonum))
-  ;; Error <= 1 ulp
-  (define (fllog-factorial n)
-    (cond [(not (integer? n))  +nan.0]
-          [(n . fl< . 0.0)  +nan.0]
-          [(n . fl< . 171.0)  (fllog (fl (factorial (fl->fx n))))]
-          [else  (+ (flstirling n)
-                    (* 0.5 (fllog (* 2.0 pi n)))
-                    (* n (- (fllog n) 1.0)))]))
-
-  )  ; begin-encourage-inline
-
-;; ===================================================================================================
-;; Binomial
-
-(: flbinomial (Flonum Flonum -> Flonum))
-;; Error <= 4 ulps
-(define (flbinomial n k)
-  (cond [(not (integer? n))  +nan.0]
-        [(not (integer? k))  +nan.0]
-        [(n . fl< . 0.0)   +nan.0]
-        [(k . fl<= . 0.0)  (if (fl= k 0.0) 1.0 +nan.0)]
-        [(k . fl>= . n)    (if (fl= k n) 1.0 0.0)]
-        [(k . fl> . (fl/ n 2.0))  (flbinomial n (fl- n k))]
-        [(n . fl< . 171.0)  (flround (/ (flfactorial n) (flfactorial k) (flfactorial (- n k))))]
-        [else
-         (define n-k (- n k))
-         (define-values (a-hi a-lo) (fast-fl//error n-k k))
-         (define-values (b-hi b-lo) (fast-fl//error n n-k))
-         (flround
-          (* (flexp (- (flstirling n) (flstirling k) (flstirling n-k)))
-             (flsqrt (/ (/ (/ n k) n-k) (fl* 2.0 pi)))
-             (flexpt+ a-hi a-lo k)
-             (flexpt+ b-hi b-lo n)))]))
-
-(: fllog-binomial (Flonum Flonum -> Flonum))
-;; Error <= 2 ulps
-(define (fllog-binomial n k)
-  (cond [(not (integer? n))  +nan.0]
-        [(not (integer? k))  +nan.0]
-        [(n . fl< . 0.0)   +nan.0]
-        [(k . fl<= . 0.0)  (if (fl= k 0.0) 0.0 +nan.0)]
-        [(k . fl>= . n)    (if (fl= k n) 0.0 -inf.0)]
-        [(k . fl> . (fl/ n 2.0))  (fllog-binomial n (fl- n k))]
-        [else
-         (define n-k (- n k))
-         (define a (* k (fllog (/ n-k k))))
-         (define b (* n (fllog1p (/ k n-k))))
-         (cond [((+ a b) . < . (fllog 1e300))  (fllog (flbinomial n k))]
-               [else
-                (+ (- (flstirling n) (flstirling k) (flstirling n-k))
-                   (* 0.5 (fllog (/ (/ (/ n k) n-k) (fl* 2.0 pi))))
-                   a b)])]))
-
-;; ===================================================================================================
-;; Permutations
-
-(: flpermutations-stirling (Flonum Flonum -> Flonum))
-(define (flpermutations-stirling n k)
-  (define-values (a-hi a-lo) (fast-fl//error (+ n 1.0) (+ n (- 1.0 k))))
-  (* (flexp (- k))
-     (flexpt+ n (- 1.0 k) k)
-     (flexpt+ a-hi a-lo n)
-     (flexpt+ a-hi a-lo 0.5)
-     (flexp (- (flstirling (+ n 1.0))
-               (flstirling (+ n (- 1.0 k)))))))
-
-(: flpermutations (Flonum Flonum -> Flonum))
-;; Error <= 3 ulps
-(define (flpermutations n k)
-  (cond [(not (integer? n))  +nan.0]
-        [(not (integer? k))  +nan.0]
-        [(n . fl< . 0.0)   +nan.0]
-        [(k . fl<= . 0.0)  (if (fl= k 0.0) 1.0 +nan.0)]
-        [(k . fl> . n)  0.0]  ; also handles n = 0 case
-        [(k . fl> . 171.0)  +inf.0]
-        [(n . fl< . 171.0)  (flround (/ (flfactorial n) (flfactorial (- n k))))]
-        [(n . fl< . 9e15)  (flround (flpermutations-stirling n k))]
-        [(k . fl> . 19.0)  +inf.0]
-        [else
-         ;; Adding 1.0 to `n' no longer changes it; switch to exact for this
-         ;; There's probably a faster way...
-         (let loop ([z 1] [n  (fl->exact-integer n)] [k  (fl->exact-integer k)])
-           (cond [(k . > . 0)  (loop (* z n) (- n 1) (- k 1))]
-                 [else  (fl z)]))]))
-
-(: fllog-permutations (Flonum Flonum -> Flonum))
-;; Error <= 2 ulps
-(define (fllog-permutations n k)
-  (cond [(not (integer? n))  +nan.0]
-        [(not (integer? k))  +nan.0]
-        [(n . fl< . 0.0)  +nan.0]
-        [(k . fl<= . 0.0)  (if (fl= k 0.0) 0.0 +nan.0)]
-        [(k . fl> . n)  -inf.0]  ; also handles n = 0 case
-        [(n . fl< . 171.0)  (fllog (flround (fl/ (fl (factorial (fl->fx n)))
-                                                 (fl (factorial (fl->fx (- n k)))))))]
-        [else
-         (define n-k (fl- n k))
-         (define a (fl* (fl+ n 0.5) (fllog1p (fl/ k (fl+ n (fl- 1.0 k))))))
-         (define b (fl* k (fl- (fllog1p n-k) 1.0)))
-         (cond [((fl+ a b) . fl<= . (fllog 1e300))  (fllog (flpermutations n k))]
-               [else  (+ (fl- (flstirling (fl+ n 1.0)) (flstirling (fl+ n (fl- 1.0 k))))
-                         a b)])]))
-
-;; ===================================================================================================
-;; Multinomial
-
-(: fllog-multinomial (Flonum (Listof Flonum) -> Flonum))
-(define (fllog-multinomial n ks)
-  (cond [(n . < . 0)  +nan.0]
-        [(ormap negative? ks)  +nan.0]
-        [(not (= n (apply + ks)))  -inf.0]
-        [(ormap (λ: ([k : Flonum]) (= n k)) ks)  0.0]
-        [else  (apply - (fllog-factorial n) (map fllog-factorial ks))]))
-
-(: flmultinomial (Flonum (Listof Flonum) -> Flonum))
-(define (flmultinomial n ks)
-  (flexp (fllog-multinomial n ks)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-functions.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-functions.rkt
deleted file mode 100644
index 3d179535a4..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-functions.rkt
+++ /dev/null
@@ -1,215 +0,0 @@
-#lang typed/racket/base
-
-(require racket/flonum
-         (only-in racket/math pi)
-         racket/performance-hint
-         (for-syntax racket/base)
-         "flonum-constants.rkt"
-         "flonum-bits.rkt")
-
-(provide (all-from-out racket/flonum)
-         fl
-         flsubnormal? flrational? flinfinite? flnan? flinteger?
-         flnext* flprev*
-         flulp-error
-         fleven? flodd? flsgn flhypot fllog/base
-         flprobability?
-         flsinpix flcospix fltanpix flcscpix flsecpix flcotpix)
-
-(module syntax-defs racket/base
-  (require (for-syntax racket/base)
-           racket/flonum)
-  (provide fl)
-  (define-syntax (fl stx)
-    ;; can't use a rename transformer: get error:
-    ;; "unsealed local-definition or module context found in syntax object"
-    (syntax-case stx ()
-      [(_ . args)  (syntax/loc stx (real->double-flonum . args))]
-      [_  (syntax/loc stx real->double-flonum)])))
-
-(require 'syntax-defs)
-
-(begin-encourage-inline
-  
-  (: flsubnormal? (Flonum -> Boolean))
-  (define (flsubnormal? x)
-    (and ((flabs x) . fl<= . +max-subnormal.0)
-         (not (fl= x 0.0))))
-  
-  (define flrational?
-    (λ: ([x : Flonum])
-      (fl< (flabs x) +inf.0)))
-  
-  (define flinfinite?
-    (λ: ([x : Flonum])
-      (fl= (flabs x) +inf.0)))
-  
-  (define flnan?
-    (λ: ([x : Flonum])
-      (not (fl<= (flabs x) +inf.0))))
-  
-  (define flinteger?
-    (λ: ([x : Flonum])
-      (fl= x (fltruncate x))))
-  
-  (: flsubnormal-next* (Flonum -> Flonum))
-  (define (flsubnormal-next* x)
-    (fl/ (fl+ (fl* x (flexpt 2.0 1022.0)) epsilon.0)
-         (flexpt 2.0 1022.0)))
-  
-  (: flsubnormal-prev* (Flonum -> Flonum))
-  (define (flsubnormal-prev* x)
-    (fl/ (fl- (fl* x (flexpt 2.0 1022.0)) epsilon.0)
-         (flexpt 2.0 1022.0)))
-
-)  ; begin-encourage-inline
-
-(: flnext* (Flonum -> Flonum))
-(define (flnext* x)
-  (cond [(x . fl< . 0.0)  (fl- 0.0 (flprev* (fl- 0.0 x)))]
-        [(fl= x 0.0)  +min.0]
-        [(fl= x +inf.0)  +inf.0]
-        [else  (define next-x (fl+ x (fl* x (fl* 0.5 epsilon.0))))
-               (cond [(fl= next-x x)  (fl+ x (fl* x epsilon.0))]
-                     [else  next-x])]))
-
-(: flprev* (Flonum -> Flonum))
-(define (flprev* x)
-  (cond [(x . fl< . 0.0)  (fl- 0.0 (flnext* (fl- 0.0 x)))]
-        [(fl= x 0.0)  -min.0]
-        [(fl= x +inf.0)  +max.0]
-        [else  (define prev-x (fl- x (fl* x (fl* 0.5 epsilon.0))))
-               (cond [(fl= prev-x x)  (fl- x (fl* x epsilon.0))]
-                     [else  prev-x])]))
-
-;; ===================================================================================================
-;; Error measurement
-
-(: flulp-error (Flonum Real -> Flonum))
-(define (flulp-error x r)
-  (define r.0 (fl r))
-  (cond [(eqv? x r)  0.0]
-        [(and (fl= x 0.0) (fl= r.0 0.0))  0.0]
-        [(and (fl= x +inf.0) (fl= r.0 +inf.0))  0.0]
-        [(and (fl= x -inf.0) (fl= r.0 -inf.0))  0.0]
-        [(zero? r)  +inf.0]
-        [(and (flrational? x) (flrational? r.0))
-         (flabs (fl (/ (- (inexact->exact x) (inexact->exact r))
-                       (inexact->exact (flmax +min.0 (flulp r.0))))))]
-        [else  +inf.0]))
-
-;; ===================================================================================================
-;; More floating-point functions
-
-(begin-encourage-inline
-  
-  (: flsgn (Flonum -> Flonum))
-  (define (flsgn x)
-    (cond [(fl< x 0.0) -1.0]
-          [(fl< 0.0 x)  1.0]
-          [else  0.0]))
-  
-  (: fleven? (Flonum -> Boolean))
-  (define (fleven? x)
-    (let ([x  (flabs x)])
-      (or (fl= x 0.0)
-          (and (x . fl>= . 2.0)
-               (let ([0.5x  (fl* 0.5 x)])
-                 (fl= (truncate 0.5x) 0.5x))))))
-  
-  (define last-odd (fl- (flexpt 2.0 53.0) 1.0))
-  
-  (: flodd? (Flonum -> Boolean))
-  (define (flodd? x)
-    (let ([x  (flabs x)])
-      (and (x . fl>= . 1.0) (x . fl<= . last-odd)
-           (let ([0.5x  (fl* 0.5 (fl+ 1.0 x))])
-             (fl= (truncate 0.5x) 0.5x)))))
-  
-  (: flhypot (Flonum Flonum -> Flonum))
-  (define (flhypot x y)
-    (define xa (flabs x))
-    (define ya (flabs y))
-    (let ([xa  (flmin xa ya)]
-          [ya  (flmax xa ya)])
-      (cond [(fl= xa 0.0)  ya]
-            [else  (define u (fl/ xa ya))
-                   (fl* ya (flsqrt (fl+ 1.0 (fl* u u))))])))
-  
-  ;; todo: overflow not likely; underflow likely
-  (: fllog/base (Flonum Flonum -> Flonum))
-  (define (fllog/base b x)
-    (fl/ (fllog x) (fllog b)))
-  
-  (: flprobability? (case-> (Flonum -> Boolean)
-                            (Flonum Any -> Boolean)))
-  (define (flprobability? p [log? #f])
-    (cond [log?  (and (p . fl>= . -inf.0) (p . fl<= . 0.0))]
-          [else  (and (p . fl>= . 0.0) (p . fl<= . 1.0))]))
-  
-  )  ; begin-encourage-inline
-
-(: flsinpix (Flonum -> Flonum))
-;; Computes sin(pi*x) accurately; i.e. error <= 2 ulps but almost always <= 1 ulp
-(define (flsinpix x)
-  (cond [(fl= x 0.0)  x]
-        [(and (x . fl> . -inf.0) (x . fl< . +inf.0))
-         (let*-values
-             ([(x s)  (if (x . fl< . 0.0) (values (- x) -1.0) (values x 1.0))]
-              [(x)    (fl- x (fl* 2.0 (fltruncate (fl* 0.5 x))))]
-              [(x s)  (if (x . fl> . 1.0) (values (fl- x 1.0) (fl* s -1.0)) (values x s))]
-              [(x)    (if (x . fl> . 0.5) (fl- 1.0 x) x)])
-           (fl* s (flsin (fl* pi x))))]
-        [else  +nan.0]))
-
-(: flcospix (Flonum -> Flonum))
-;; Computes cos(pi*x) accurately; i.e. error <= 1 ulps
-(define (flcospix x)
-  (cond [(and (x . fl> . -inf.0) (x . fl< . +inf.0))
-         (let*-values
-             ([(x)  (flabs x)]
-              [(x)  (fl- x (fl* 2.0 (fltruncate (fl* 0.5 x))))]
-              [(x)  (if (x . fl> . 1.0) (fl- 2.0 x) x)]
-              [(x s)  (if (x . fl> . 0.5) (values (fl- 1.0 x) -1.0) (values x 1.0))])
-           (cond [(x . fl> . 0.25)  (fl* (fl* s -1.0) (flsin (fl* pi (fl- x 0.5))))]
-                 [else  (fl* s (flcos (fl* pi x)))]))]
-        [else  +nan.0]))
-
-(: fltanpix (Flonum -> Flonum))
-;; Computes tan(pi*x) accurately; i.e. error <= 2 ulps but almost always <= 1 ulp
-(define (fltanpix x)
-  (cond [(fl= x 0.0)  x]
-        [(and (x . fl> . -inf.0) (x . fl< . +inf.0))
-         (let*-values 
-             ([(x s)  (if (x . fl< . 0.0) (values (- x) -1.0) (values x 1.0))]
-              [(x)    (fl- x (fltruncate x))]
-              [(x s)  (if (x . fl> . 0.5) (values (fl- 1.0 x) (fl* s -1.0)) (values x s))])
-           (cond [(x . fl= . 0.5)  +nan.0]
-                 [(x . fl> . 0.25)  (fl/ s (fltan (fl* pi (fl- 0.5 x))))]
-                 [else  (fl* s (fltan (fl* pi x)))]))]
-        [else  +nan.0]))
-
-(: flcscpix (Flonum -> Flonum))
-(define (flcscpix x)
-  (cond [(and (not (zero? x)) (flinteger? x))  +nan.0]
-        [else  (/ 1.0 (flsinpix x))]))
-
-(: flsecpix (Flonum -> Flonum))
-(define (flsecpix x)
-  (cond [(and (x . fl> . 0.0) (flinteger? (fl- x 0.5)))  +nan.0]
-        [(and (x . fl< . 0.0) (flinteger? (fl+ x 0.5)))  +nan.0]
-        [else  (/ 1.0 (flcospix x))]))
-
-(: flcotpix (Flonum -> Flonum))
-;; Computes 1/tan(pi*x) accurately; i.e. error <= 2 ulps but almost always <= 1 ulp
-(define (flcotpix x)
-  (cond [(fl= x 0.0)  (fl/ 1.0 x)]
-        [(and (x . fl> . -inf.0) (x . fl< . +inf.0))
-         (let*-values 
-             ([(x s)  (if (x . fl< . 0.0) (values (- x) -1.0) (values x 1.0))]
-              [(x)    (fl- x (fltruncate x))]
-              [(x s)  (if (x . fl> . 0.5) (values (fl- 1.0 x) (fl* s -1.0)) (values x s))])
-           (cond [(x . fl= . 0.0)  +nan.0]
-                 [(x . fl< . 0.25)  (fl/ s (fltan (fl* pi x)))]
-                 [else  (fl* s (fltan (fl* pi (fl- 0.5 x))))]))]
-        [else  +nan.0]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-log.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-log.rkt
deleted file mode 100644
index aec8ec8053..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-log.rkt
+++ /dev/null
@@ -1,195 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         (only-in racket/math pi)
-         "flonum-functions.rkt"
-         "flonum-constants.rkt"
-         "flonum-exp.rkt"
-         "flonum-error.rkt"
-         "flvector.rkt")
-
-(provide fllog1p fllog+
-         lg1+ lg+ lg1- lg- lgsum
-         fllog-quotient
-         fllog2
-         fllogb)
-
-(begin-encourage-inline
-  
-  (: fllog1p (Float -> Float))
-  ;; Computes the value of log(1+x) in a way that is accurate for small x
-  (define (fllog1p x)
-    (define ax (flabs x))
-    (cond [(ax . fl>= . 1.0)  (fllog (fl+ 1.0 x))]
-          [(ax . fl>= . (fl* 0.5 epsilon.0))
-           (define y (fl+ 1.0 x))
-           (fl- (fllog y) (fl/ (fl- (fl- y 1.0) x) y))]
-          [else  x]))
-  
-  (: fllog+ (Flonum Flonum -> Flonum))
-  ;; Computes log(a+b) in a way that is accurate for a+b near 1.0
-  (define (fllog+ a b)
-    (define a+b (+ a b))
-    (cond [((flabs (- a+b 1.0)) . < . (fllog 2.0))
-           ;; a+b is too close to 1.0, so compute in higher precision
-           (define-values (a+b a+b-lo) (fast-fl+/error a b))
-           (- (fllog a+b) (fllog1p (- (/ a+b-lo a+b))))]
-          [(a+b . = . +inf.0)
-           ;; a+b overflowed, so reduce the arguments
-           (+ (fllog 2.0) (fllog (+ (* 0.5 a) (* 0.5 b))))]
-          [else
-           (fllog a+b)]))
-  
-  (: lg1+ (Float -> Float))
-  (define (lg1+ log-x)
-    (cond [(log-x . fl>= . 0.0)  (fl+ log-x (fllog1p (flexp (- log-x))))]
-          [else  (fllog1p (flexp log-x))]))
-  
-  (: lg+ (Float Float -> Float))
-  (define (lg+ log-x log-y)
-    (let ([log-x  (flmax log-x log-y)]
-          [log-y  (flmin log-x log-y)])
-      (cond [(fl= log-x -inf.0)  -inf.0]
-            [else  (fl+ log-x (fllog1p (flexp (fl- log-y log-x))))])))
-  
-  (: lg1- (Float -> Float))
-  (define (lg1- log-x)
-    (cond [(log-x . fl> . (fllog 0.5))  (fllog (- (flexpm1 log-x)))]
-          [else  (fllog1p (- (flexp log-x)))]))
-  
-  (: lg- (Float Float -> Float))
-  (define (lg- log-x log-y)
-    (cond [(log-x . fl< . log-y)  +nan.0]
-          [(fl= log-x -inf.0)  -inf.0]
-          [else  (fl+ log-x (lg1- (fl- log-y log-x)))]))
-  
-  )  ; begin-encourage-inline
-
-(: flmax* ((Listof Flonum) -> Flonum))
-(define (flmax* xs)
-  (let loop ([xs xs] [mx -inf.0])
-    (if (null? xs) mx (loop (cdr xs) (flmax mx (car xs))))))
-
-(: lgsum ((Listof Flonum) -> Flonum))
-(define (lgsum log-xs)
-  (if (null? log-xs)
-      0.0
-      (let ([log-x0  (car log-xs)]
-            [log-xs  (cdr log-xs)])
-        (if (null? log-xs)
-            log-x0
-            (let ([log-x1  (car log-xs)]
-                  [log-xs  (cdr log-xs)])
-              (if (null? log-xs)
-                  (lg+ log-x0 log-x1)
-                  (let ([max-log-x  (flmax (flmax log-x0 log-x1) (flmax* log-xs))])
-                    (if (fl= max-log-x -inf.0)
-                        -inf.0
-                        (let ([s  (flsum
-                                   (list* -1.0  ; for the max element; faster than removing it
-                                          (flexp (- log-x0 max-log-x))
-                                          (flexp (- log-x1 max-log-x))
-                                          (map (λ: ([log-x : Flonum]) (flexp (- log-x max-log-x)))
-                                               log-xs)))])
-                          ;; Yes, we subtract 1.0 and then add 1.0 before taking the log; this
-                          ;; helps with precision a bit when s is near zero
-                          (+ max-log-x (fllog1p s)))))))))))
-
-(: fllog-quotient (Flonum Flonum -> Flonum))
-;; Computes (fllog (/ x y)) in a way that reduces error and avoids under-/overflow
-(define (fllog-quotient x y)
-  (let ([x  (flabs x)]
-        [y  (flabs y)]
-        [s  (fl/ (flsgn x) (flsgn y))])
-    (cond [(s . fl> . 0.0)
-           (define z (fl/ x y))
-           (cond [(and (z . fl> . +max-subnormal.0) (z . fl< . +inf.0))  (fllog (fl* s z))]
-                 [else  (fl+ (fllog x) (- (fllog y)))])]
-          [(s . fl= . 0.0)  -inf.0]
-          [else  +nan.0])))
-
-(define log-max.0 (fllog +max.0))
-(define log2.0 (fllog 2.0))
-
-(: fllog2* (Flonum -> Flonum))
-;; Computes log2(x) with a least 8 extra bits precision, which reduces the probability of rounding
-;; error significantly. Assumes 0.0 < x < +inf.0 and x != 1.0.
-(define (fllog2* x)
-  (let* ([log-x  (fllog x)]
-         ;; Solve for x^(2^k) = +max.0 (k is basically the number of extra bits precision)
-         [k  (fl/ (fllog (fl/ log-max.0 (flabs log-x))) log2.0)]
-         ;; We'll be operating on x^adj, which is huge
-         [adj  (flexp2 (flceiling (- k 1.0)))]
-         [adj  (if (fl>= x 1.0) adj (- adj))]
-         ;; Compute floor(log2(x^adj))
-         [y2  (fltruncate (fl/ (fl* adj log-x) log2.0))]
-         ;; Compute "remainder" log2(x^adj/2^y2) (note: dividing by 2^y2 is exact)
-         [y1  (fl/ (fllog (fl/ (flexpt x adj) (flexp2 y2))) log2.0)])
-    (fl+ (fl/ y2 adj) (fl/ y1 adj))))
-
-(: fllog2 (Flonum -> Flonum))
-;; Largest observed error is 0.5006 ulps
-(define (fllog2 x)
-  (cond [(fl<= x 0.0)  (if (fl< x 0.0) +nan.0 -inf.0)]
-        [(fl< x +inf.0)  (if (fl= x 1.0) 0.0 (fllog2* x))]
-        [(fl= x +inf.0)  +inf.0]
-        [else  +nan.0]))
-
-(: fllogb (Flonum Flonum -> Flonum))
-;; Largest observed error is 2.1 ulps, but is usually < 0.7 ulps
-(define (fllogb b x)
-  (cond [(fl= x 1.0)  0.0]
-        [(fl= b 1.0)
-         ;; For x != 1, first limit wrt x: +inf.0 or -inf.0
-         +nan.0]
-        [(fl= b 2.0)
-         ;; Using the more accurate `fllog2' ensures that exact cases have zero error
-         (fllog2 x)]
-        [(not (and (fl<= 0.0 b) (fl<= b +inf.0) (fl<= 0.0 x) (fl<= x +inf.0)))
-         ;; One or both is out of bounds or is +nan.0
-         +nan.0]
-        [(fl= b 0.0)
-         (cond [(fl= x 0.0)
-                ;; First limit wrt x: +inf.0
-                ;; First limit wrt b: 0.0
-                ;; +inf.0 corrects left-inverse case (fllogb 0.0 (flexpt 0.0 +inf.0))
-                ;; +inf.0 corrects right-inverse case (flexpt 0.0 (fllogb 0.0 0.0))
-                +inf.0]
-               [(fl= x +inf.0)
-                ;; First limit wrt x: -inf.0
-                ;; First limit wrt b: 0.0
-                ;; -inf.0 corrects left-inverse case (fllogb 0.0 (flexpt 0.0 -inf.0))
-                ;; -inf.0 corrects right-inverse case (flexpt 0.0 (fllogb 0.0 +inf.0))
-                -inf.0]
-               [(fl<= x 1.0)  0.0]
-               [else  -0.0])]
-        [(fl= b +inf.0)
-         (cond [(fl= x 0.0)
-                ;; First limit wrt x: -inf.0
-                ;; First limit wrt b: -0.0
-                ;; -inf.0 corrects left-inverse case (fllogb +inf.0 (flexpt +inf.0 -inf.0))
-                ;; -inf.0 corrects right-inverse case (flexpt +inf.0 (fllogb +inf.0 0.0))
-                -inf.0]
-               [(fl= x +inf.0)
-                ;; First limit wrt x: +inf.0
-                ;; First limit wrt b: 0.0
-                ;; +inf.0 corrects left-inverse case (fllogb +inf.0 (flexpt +inf.0 +inf.0))
-                ;; +inf.0 corrects right-inverse case (flexpt +inf.0 (fllogb +inf.0 +inf.0))
-                +inf.0]
-               [(fl<= 1.0 x)  0.0]
-               [else  -0.0])]
-        [(fl= x 0.0)  (if (fl< b 1.0) +inf.0 -inf.0)]
-        [(fl= x +inf.0)  (if (fl< b 1.0) -inf.0 +inf.0)]
-        [else
-         (define log-b (fllog b))
-         (define y (fl/ (fllog x) log-b))
-         ;; One Newton iteration reduces error to <= 1 ulp (instead of <= 2 ulps)
-         (define numer (fl- x (flexpt b y)))
-         (define denom (fl* x log-b))
-         (cond [(and (numer . fl> . -inf.0) (numer . fl< . +inf.0)
-                     (denom . fl> . 0.0) (denom . fl< . +inf.0))
-                (fl+ y (fl/ numer denom))]
-               [else
-                ;; Oh noes! We had overflows or underflows!
-                ;; Not a lot we can do without introducing more error, so just return y
-                y])]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-log1pmx.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-log1pmx.rkt
deleted file mode 100644
index b4f11f0564..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-log1pmx.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang typed/racket/base
-
-(require "flonum-functions.rkt"
-         "flonum-polyfun.rkt"
-         "flonum-log.rkt"
-         "../polynomial/chebyshev.rkt")
-
-(provide fllog1pmx)
-
-(define fllog1pmx-neg-0.25-0.5
-  (inline-chebyshev-flpoly-fun
-   -0.5 -0.25
-   (-0.2103141053572070997362823489693816811996
-    0.07704102886728760721086370117643443131217
-    -0.01020514433643803605431850588217215237178
-    6.872859538243712918354721556695090979546e-4
-    -5.207248546376666160678822643500842976255e-5
-    4.208311415510517753022518076392447733423e-6
-    -3.542714867432068706621663292676355004748e-7
-    3.067601814854621065962689625154653762101e-8
-    -2.711543742374190275109136442040373034036e-9
-    2.434858166790830434687283890247233106842e-10
-    -2.21373562123951709989617540939460847654e-11
-    2.033024647979063139529426446529956536822e-12
-    -1.882624294787569740261613339485357785274e-13
-    1.755541612919310465016807409127750031632e-14
-    -1.646781645171118497659636869130525525145e-15
-    1.552680302240995074747799623556383281355e-16
-    -1.470371377726707214575139072206825846451e-17
-    1.385352010971336691234958236784925394612e-18)))
-
-(: fllog1pmx-taylor-0 (Float -> Float))
-(define (fllog1pmx-taylor-0 x)
-  (fl* (fl* x x)
-       ((make-flpolyfun
-         (#i-1/2 #i1/3 #i-1/4 #i1/5 #i-1/6 #i1/7 #i-1/8 #i1/9 #i-1/10 #i1/11
-                 #i-1/12 #i1/13 #i-1/14 #i1/15 #i-1/16 #i1/17 #i-1/18 #i1/19 #i-1/20 #i1/21
-                 #i-1/22 #i1/23 #i-1/24 #i1/25 #i-1/26))
-        x)))
-
-(define fllog1pmx-0.25-0.5
-  (inline-chebyshev-flpoly-fun
-   0.25 0.5
-   (-0.1172376347903564395048972641928223555326
-    -0.03390230020664453827879131203208535815299
-    -0.002074697726910078933295567647061059776673
-    6.300006356267044793209616759065448160092e-5
-    -2.15218532902292423180294171512095168131e-6
-    7.842365320119772047407362890838076306055e-8
-    -2.976756006675387489388663469498613703626e-9
-    1.16218125023220889846755872728148163628e-10
-    -4.631901690461512483973214435928711719421e-12
-    1.875358176311070533829034898220631704307e-13
-    -7.687836726698030051212239319592396588335e-15
-    3.183382900679105044910163409271165546662e-16
-    -1.329157157589045915049329706194501559878e-17
-    5.578423096000352584032742755315719988568e-19)))
-
-(: fllog1pmx-big (Float -> Float))
-(define (fllog1pmx-big x)
-  (cond [((flabs x) . fl< . 1.0)  
-         (define y (fl+ x 1.0))
-         (fl- (fl- (fllog y) x) (fl/ (fl- (fl- y 1.0) x) y))]
-        [else
-         (fl- (fllog1p x) x)]))
-
-(: fllog1pmx (Float -> Float))
-(define (fllog1pmx x)
-  (cond [(x . fl< . 0.0)
-         (cond [(x . fl> . -0.25)  (fllog1pmx-taylor-0 x)]
-               [(x . fl> . -0.50)  (fllog1pmx-neg-0.25-0.5 x)]
-               [(x . fl> . -1.00)  (fllog1pmx-big x)]
-               [(x . fl= . -1.00)  -inf.0]
-               [else  +nan.0])]
-        [(x . fl> . 0.0)
-         (cond [(x . fl< . 0.25)  (fllog1pmx-taylor-0 x)]
-               [(x . fl< . 0.50)  (fllog1pmx-0.25-0.5 x)]
-               [else  (fllog1pmx-big x)])]
-        [else  0.0]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-more-functions.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-more-functions.rkt
deleted file mode 100644
index 88a42f1dd5..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-more-functions.rkt
+++ /dev/null
@@ -1,215 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         "flonum-functions.rkt"
-         "flonum-constants.rkt"
-         "flonum-exp.rkt"
-         "flonum-log.rkt"
-         "flonum-error.rkt"
-         "flvector.rkt"
-         "utils.rkt")
-
-(provide flsqrt1pm1
-         flsinh flcosh fltanh
-         flasinh flacosh flatanh
-         make-flexpt flexpt+ flexpt1p
-         flfma)
-
-;; ---------------------------------------------------------------------------------------------------
-;; sqrt(1+x)-1
-
-(: flsqrt1pm1 (Float -> Float))
-(define (flsqrt1pm1 x)
-  (cond [((flabs x) . fl> . 0.75)
-         (fl- (flsqrt (fl+ 1.0 x)) 1.0)]
-        [else
-         (flexpm1 (fl* 0.5 (fllog1p x)))]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Hyperbolic sine
-
-(: flsinh (Float -> Float))
-(define (flsinh x)
-  (cond [(x . fl< . 0.0)
-         ;; Odd function
-         (- (flsinh (- x)))]
-        [(x . fl< . (flexpt 2.0 -26.0))
-         ;; sinh(x) ~ x
-         x]
-        [(x . fl< . 18.5)
-         ;; sinh(x) = (exp(2*x) - 1) / (2*exp(x))
-         (define y (flexpm1 x))
-         (fl* 0.5 (fl+ y (fl/ y (fl+ y 1.0))))]
-        [(x . fl< . (fllog +max.0))
-         ;; sinh(x) ~ exp(x) / 2
-         (fl* 0.5 (flexp x))]
-        [else
-         ;; sinh(x) ~ exp(x) / 2 = (exp(x/2) / 2) * exp(x/2)
-         (define y (flexp (fl* 0.5 x)))
-         (fl* (fl* 0.5 y) y)]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Hyperbolic cosine
-
-(: flcosh (Float -> Float))
-(define (flcosh x)
-  ;; cosh(x) = cosh(-x)
-  (let ([x  (flabs x)])
-    (cond [(x . fl< . (flexpt 2.0 -26.0))
-           ;; cosh(x) ~ 1
-           1.0]
-          [(x . fl< . (fl* 0.5 (fllog 2.0)))
-           ;; cosh(x) = 1 + (exp(x) - 1)^2 / (2*exp(x))
-           (define y (flexpm1 x))
-           (fl+ 1.0 (fl/ (fl* y y) (fl* 2.0 (fl+ 1.0 y))))]
-          [(x . fl< . 18.5)
-           ;; cosh(x) = (exp(x) + 1/exp(x)) / 2
-           (define y (flexp x))
-           (fl+ (fl* 0.5 y) (fl/ 0.5 y))]
-          [(x . fl< . (fllog +max.0))
-           ;; cosh(x) ~ exp(x) / 2
-           (fl* 0.5 (flexp x))]
-          [else
-           ;; cosh(x) ~ exp(x) / 2 = (exp(x/2) / 2) * exp(x/2)
-           (define y (flexp (fl* 0.5 x)))
-           (fl* (fl* 0.5 y) y)])))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Hyperbolic tangent
-
-(: fltanh (Float -> Float))
-(define (fltanh x)
-  (cond [(x . fl< . 0.0)
-         ;; tanh(x) = -tanh(-x)
-         (- (fltanh (- x)))]
-        [(x . fl< . 1e-16)
-         ;; tanh(x) ~ x + x^2
-         (fl* x (fl+ 1.0 x))]
-        [(x . fl< . 0.5)
-         ;; tanh(x) = (exp(2*x) - 1) / (exp(2*x) + 1)
-         (define y (flexpm1 (fl* -2.0 x)))
-         (- (fl/ y (fl+ 2.0 y)))]
-        [(x . fl< . 19.5)
-         ;; tanh(x) = (exp(2*x) - 1) / (exp(2*x) + 1)
-         (define y (flexp (fl* 2.0 x)))
-         (fl/ (fl- y 1.0) (fl+ y 1.0))]
-        [(x . fl<= . +inf.0)
-         ;; tanh(x) ~ 1
-         1.0]
-        [else  +nan.0]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Inverse hyperbolic sine
-
-(: flasinh (Float -> Float))
-(define (flasinh x)
-  (cond [(x . fl< . 0.0)  (- (flasinh (- x)))]
-        [(x . fl< . 2e-8)  x]
-        [(x . fl< . 0.00018)
-         ;; Taylor series order 3
-         (fl* x (fl+ 1.0 (fl* (fl* #i-1/6 x) x)))]
-        [(x . fl< . 1.0)
-         ;; Standard definition, rearranged to preserve digits
-         (fllog1p (fl+ x (flsqrt1pm1 (fl* x x))))]
-        [(x . fl< . 3e3)
-         ;; Standard definition
-         (fllog (fl+ x (flsqrt (fl+ (fl* x x) 1.0))))]
-        [(x . fl< . 1e307)
-         ;; Laurent series in 1/x at 0+ order from -1 to 1
-         (fl+ (fllog (fl* x 2.0)) (fl/ 1.0 (fl* (fl* 4.0 x) x)))]
-        [else
-         ;; Laurent series, rearranged to not overflow
-         (fl+ (fllog x) (fllog 2.0))]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Inverse hyperbolic cosine
-
-(: flacosh (Float -> Float))
-(define (flacosh x)
-  (cond [(x . fl< . 1.0)  +nan.0]
-        [(x . fl< . 1.5)
-         ;; Standard definition, rearranged to preserve digits when x is near 1.0
-         (define y (fl- x 1.0))
-         (fllog1p (fl+ y (flsqrt (fl+ (fl* y y) (fl* 2.0 y)))))]
-        [(x . fl< . 1e8)
-         ;; Standard definition
-         (fllog (fl+ x (flsqrt (fl- (fl* x x) 1.0))))]
-        [(x . fl< . 1e307)
-         ;; Laurent series in 1/x at 0+ order from -1 to 0
-         (fllog (fl* x 2.0))]
-        [else
-         ;; Laurent series, rearranged to avoid overflow
-         (fl+ (fllog x) (fllog 2.0))]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Inverse hyperbolic tangent
-
-(: flatanh (Float -> Float))
-(define (flatanh x)
-  (cond [(x . fl< . 0.0)  (- (flatanh (- x)))]
-        [(x . fl< . 1e-8)  x]
-        [(x . fl< . 0.00015)
-         ;; Taylor series order 2
-         (fl+ x (fl* (fl* (fl* #i1/3 x) x) x))]
-        [(x . fl< . 0.5)
-         ;; Standard definition, rearranged to preserve digits when x is near 0.0
-         (fl* 0.5 (fl- (fllog1p x) (fllog1p (- x))))]
-        [(x . fl< . 1.0)
-         ;; Standard definition
-         (fl* 0.5 (fllog (fl/ (fl+ 1.0 x) (fl- 1.0 x))))]
-        [(x . fl= . 1.0)  +inf.0]
-        [else  +nan.0]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Exponential with high-precision bases
-
-(begin-encourage-inline
-  
-  (: make-flexpt (Positive-Exact-Rational -> (Flonum -> Flonum)))
-  (define (make-flexpt b)
-    (define b-hi (fl b))
-    (define b-lo (fl (- (/ (inexact->exact b-hi) b) 1)))
-    (cond [(fl= b-lo 0.0)  (λ: ([x : Flonum]) (flexpt b-hi x))]
-          [else
-           (λ: ([x : Flonum])
-             (fl/ (flexpt b-hi x)
-                  (flexp (fl* x (fllog1p b-lo)))))]))
-
-  (: flexpt+ (Flonum Flonum Flonum -> Flonum))
-  (define (flexpt+ a b y)
-    (define-values (x-hi x-lo) (fast-fl+/error a b))
-    (fl/ (flexpt x-hi y)
-         (flexp (fl* y (fllog1p (- (/ x-lo x-hi)))))))
-  
-  (: flexpt1p (Flonum Flonum -> Flonum))
-  (define (flexpt1p x y)
-    (cond [(and (x . > . -0.5) (x . < . +inf.0))
-           (define-values (a-hi a-lo) (fast-fl+/error 1.0 x))
-           (fl/ (flexpt a-hi y)
-                (flexp (fl* y (fllog1p (- (/ a-lo a-hi))))))]
-          [else  (flexpt (+ 1.0 x) y)]))
-  
-  )  ; begin-encourage-inline
-
-;; ---------------------------------------------------------------------------------------------------
-;; Fused multiply-add
-
-(: slow-flfma (-> Flonum Flonum Flonum Flonum))
-(define (slow-flfma a b c)
-  (define n (near-pow2 (max (flsqrt (abs a)) (flsqrt (abs b)))))
-  (define 1/n (/ 1.0 n))
-  (* n n (fast-flfma (* a 1/n) (* b 1/n) (* c 1/n 1/n))))
-
-(begin-encourage-inline
-  
-  (: fast-flfma (-> Flonum Flonum Flonum Flonum))
-  (define (fast-flfma a b c)
-    (let-values ([(d-hi d-lo)  (fast-flfma/error a b c)])
-      (+ d-hi d-lo)))
-
-  (: flfma (-> Flonum Flonum Flonum Flonum))
-  (define (flfma a b c)
-    (let ([d  (fast-flfma a b c)])
-      (if (flrational? d) d (slow-flfma a b c))))
-  
-  )  ; begin-encourage-inline
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-polyfun.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-polyfun.rkt
deleted file mode 100644
index 9731edf1cf..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-polyfun.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang typed/racket/base
-
-(require (for-syntax racket/base syntax/parse)
-         "flonum-functions.rkt")
-
-(provide make-flpolyfun
-         make-even-flpolyfun
-         make-odd-flpolyfun
-         make-quotient-flpolyfun)
-
-(define-for-syntax (syntax-list-reverse stx-lst)
-  (datum->syntax stx-lst (reverse (syntax->list stx-lst)) stx-lst))
-
-(define-syntax (horner-iter stx)
-  (syntax-case stx ()
-    [(_ y z ())  (syntax/loc stx y)]
-    [(_ y z (c0 c ...))
-     (syntax/loc stx
-       (horner-iter (fl+ (fl* y z) c0) z (c ...)))]))
-
-(define-syntax (make-flpolyfun stx)
-  (syntax-parse stx
-    [(_ (c0:expr c:expr ...))
-     (with-syntax ([(c0 c ...)  (syntax-list-reverse #'(c0 c ...))])
-       (syntax/loc stx
-         (λ: ([z : Float])
-           (horner-iter c0 z (c ...)))))]))
-
-(define-syntax (make-even-flpolyfun stx)
-  (syntax-parse stx
-    [(_ (c0:expr c:expr ...))
-     (syntax/loc stx
-       (λ: ([z : Float])
-         ((make-flpolyfun (c0 c ...)) (fl* z z))))]))
-
-(define-syntax (make-odd-flpolyfun stx)
-  (syntax-parse stx
-    [(_ (c0:expr c:expr ...))
-     (syntax/loc stx
-       (λ: ([z : Float])
-         (fl+ c0 (fl* z ((make-polyfun (c ...)) (fl* z z))))))]))
-
-(define-syntax (make-quotient-flpolyfun stx)
-  (syntax-parse stx
-    [(_ (a:expr ...) (b:expr ...))
-     (with-syntax ([(a-rev ...)  (syntax-list-reverse #'(a ...))]
-                   [(b-rev ...)  (syntax-list-reverse #'(b ...))])
-       (syntax/loc stx
-         (λ: ([z : Float])
-           (cond [((flabs z) . fl<= . 1.0)
-                  (fl/ ((make-flpolyfun (a ...)) z)
-                       ((make-flpolyfun (b ...)) z))]
-                 [else
-                  (let ([z  (fl/ 1.0 z)])
-                    (fl/ ((make-flpolyfun (a-rev ...)) z)
-                         ((make-flpolyfun (b-rev ...)) z)))]))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-search.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-search.rkt
deleted file mode 100644
index 4d0ac72190..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-search.rkt
+++ /dev/null
@@ -1,112 +0,0 @@
-#lang typed/racket/base
-
-(require "flonum-constants.rkt"
-         "flonum-functions.rkt"
-         "flonum-bits.rkt")
-
-(provide find-least-flonum flfind-least-integer)
-
-(define +inf-ordinal (flonum->ordinal +inf.0))
-
-(: find-least-flonum (case-> ((Flonum -> Any) Flonum -> (U Flonum #f))
-                             ((Flonum -> Any) Flonum Flonum -> (U Flonum #f))))
-
-(define find-least-flonum
-  (case-lambda
-    [(pred? x-start)
-     (when (eqv? +nan.0 x-start)
-       (raise-argument-error 'find-least-flonum "non-NaN Flonum" 1 pred? x-start))
-     (let loop ([n-end  (flonum->ordinal x-start)] [step 1])
-       (define x-end (ordinal->flonum n-end))
-       (cond [(pred? x-end)  (find-least-flonum pred? x-start x-end)]
-             [(fl= x-end +inf.0)  #f]
-             [else  (loop (min +inf-ordinal (+ n-end step)) (* step 2))]))]
-    [(pred? x-start x-end)
-     (when (eqv? x-start +nan.0)
-       (raise-argument-error 'find-least-flonum "non-NaN Flonum" 1 pred? x-start x-end))
-     (when (eqv? x-end +nan.0)
-       (raise-argument-error 'find-least-flonum "non-NaN Flonum" 2 pred? x-start x-end))
-     (cond [(pred? x-start)  x-start]
-           [(not (pred? x-end))  #f]
-           [else
-            (let loop ([n-start  (flonum->ordinal x-start)] [n-end  (flonum->ordinal x-end)])
-              (cond [(= n-start n-end)  (define x (ordinal->flonum n-end))
-                                        (if (pred? x) x #f)]
-                    [else
-                     (define n-mid (quotient (+ n-start n-end) 2))
-                     (cond [(pred? (ordinal->flonum n-mid))
-                            (loop n-start n-mid)]
-                           [else
-                            (loop (+ n-mid 1) n-end)])]))])]))
-
-(: sub-or-prev (Flonum Flonum -> Flonum))
-(define (sub-or-prev k i)
-  (define prev-k (fl- k i))
-  (if (fl= prev-k k) (flprev* k) prev-k))
-
-(: add-or-next (Flonum Flonum -> Flonum))
-(define (add-or-next k i)
-  (define next-k (fl+ k i))
-  (if (fl= next-k k) (flnext* k) next-k))
-
-(: flmidpoint (Flonum Flonum -> Flonum))
-(define (flmidpoint x y)
-  (let ([x  (flmin x y)]
-        [y  (flmax x y)])
-    (cond [(fl= x -inf.0)  (cond [(fl= y +inf.0)  0.0]
-                                 [(fl= y -inf.0)  -inf.0]
-                                 [else  (+ (* 0.5 -max.0) (* 0.5 y))])]
-          [(fl= y +inf.0)  (cond [(fl= x +inf.0)  +inf.0]
-                                 [else  (+ (* 0.5 x) (* 0.5 +max.0))])]
-          [else  (+ (* 0.5 x) (* 0.5 y))])))
-
-(: flfind-least-integer (case-> ((Flonum -> Any) -> Flonum)
-                                ((Flonum -> Any) Flonum -> Flonum)
-                                ((Flonum -> Any) Flonum Flonum -> Flonum)
-                                ((Flonum -> Any) Flonum Flonum Flonum -> Flonum)))
-;; Finds the least integer k such that (pred? k) is #t, given optional bounds and an optional
-;; initial estimate. If the predicate is not monotone in the bounds, the result of this function is
-;; indeterminate, and depends in an unspecified way on the initial estimate.
-;; Formally, to get a unique answer, one of the following cases must be true.
-;;  1. Exists k, forall mn <= i < k, (pred? i) is #f /\ forall k <= j <= mx, (pred? j) is #t
-;;  2. Forall k, (pred? k) is #f
-;;  3. Forall k, (pred? k) is #t
-;; where mn0 <= k <= mx0. For case #1, this function returns k. For case #2, it returns +nan.0. For
-;; case #3, it returns mn0.
-(define (flfind-least-integer pred? [mn0 -inf.0] [mx0 +inf.0] [k0 +nan.0])
-  (let ([mn  (flceiling (flmin mn0 mx0))]
-        [mx  (flfloor (flmax mn0 mx0))])
-    ;; Make sure the initial estimate is in-bounds
-    (define k (cond [(and (k0 . >= . mn) (k0 . <= . mx))  (flfloor k0)]
-                    [else  (flfloor (flmidpoint mn mx))]))
-    (define k? (pred? k))
-    ;; Find an integer k-min <= k for which (pred? k-min) is #f; increment exponentially
-    (define-values (k-min k-min?)
-      (let: loop : (Values Flonum Any) ([k-min : Flonum  k] [k-min? : Any  k?] [i : Flonum  1.0])
-        ;(printf "min: ~v~n" k-min)
-        (cond [(k-min . fl<= . mn)  (cond [(fl= k-min mn)  (values k-min k-min?)]
-                                          [else  (values mn (pred? mn))])]
-              [k-min?  (define prev-k-min (sub-or-prev k-min i))
-                       (loop prev-k-min (pred? prev-k-min) (* 2.0 (- k-min prev-k-min)))]
-              [else  (values k-min #f)])))
-    ;; Find an integer k-max >= k0 for which (pred? k-max) is #t; increment exponentially
-    (define-values (k-max k-max?)
-      (let: loop : (Values Flonum Any) ([k-max : Flonum  k] [k-max? : Any  k?] [i : Flonum  1.0])
-        ;(printf "max: ~v~n" k-max)
-        (cond [(k-max . fl>= . mx)  (cond [(fl= k-max mx)  (values k-max k-max?)]
-                                          [else  (values mx (pred? mx))])]
-              [k-max?  (values k-max #t)]
-              [else  (define next-k-max (add-or-next k-max i))
-                     (loop next-k-max (pred? next-k-max) (* 2.0 (- next-k-max k-max)))])))
-    ;; Quickly check cases #2 and #3; if case #1, do a binary search
-    (cond [(not k-max?)  +nan.0]
-          [k-min?  mn]
-          [else
-           ;; Loop invariant: (pred? k-max) is #t and (pred? k-min) is #f
-           (let loop ([k-min k-min] [k-max k-max])
-             ;(printf "~v ~v~n" k-min k-max)
-             (define k (flfloor (flmidpoint k-min k-max)))
-             ;; Check whether k-min + 1 = k-max or (flnext k-min) = k-max
-             (cond [(or (= k k-min) (= k k-max))  k-max]
-                   [(pred? k)  (loop k-min k)]
-                   [else  (loop k k-max)]))])))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flvector-syntax.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flvector-syntax.rkt
deleted file mode 100644
index f7d2b1a544..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flvector-syntax.rkt
+++ /dev/null
@@ -1,140 +0,0 @@
-#lang racket/base
-
-(provide inline-build-flvector
-         build-flvector
-         inline-flvector-map
-         flvector-map)
-
-(module syntax-defs racket/base
-  
-  (require (for-syntax racket/base
-                       syntax/parse
-                       typed/untyped-utils)
-           typed/racket/base
-           racket/unsafe/ops
-           racket/flonum
-           racket/fixnum
-           "../syntax-utils.rkt"
-           "../exception.rkt"
-           "../utils.rkt")
-  
-  (provide (all-defined-out))
-  
-  (define-syntax (unsafe-flvector-fill! stx)
-    (syntax-parse stx
-      [(_ xs:id n:id f-expr:expr)
-       (syntax/loc stx
-         (let: loop : FlVector ([i : Nonnegative-Fixnum  0])
-           (if (i . unsafe-fx< . n)
-               (begin (unsafe-flvector-set! xs i (f-expr i))
-                      (loop (unsafe-fx+ i 1)))
-               xs)))]))
-  
-  (define-syntax (inline-build-flvector stx)
-    (syntax-case stx ()
-      [(_ n-expr f-expr)
-       (cond
-         [(syntax-local-typed-context?)
-          (syntax/loc stx
-            (let*: ([xs : FlVector  (make-flvector (ann n-expr Integer))]
-                    [n  : Index     (flvector-length xs)])
-              (unsafe-flvector-fill! xs n (ann f-expr (Index -> Flonum)))))]
-         [else
-          (syntax/loc stx
-            (let* ([xs  (make-flvector n-expr)]
-                   [n   (flvector-length xs)])
-              (define-syntax-rule (new-f i)
-                (let ([x  (f-expr i)])
-                  (if (flonum? x) x (raise-result-error 'build-flvector "Flonum" x))))
-              (unsafe-flvector-fill! xs n new-f)))])]))
-  
-  (define-syntax (inline-flvector-map stx)
-    (syntax-case stx ()
-      [(_ f-expr xs-expr)
-       (cond
-         [(syntax-local-typed-context?)
-          (syntax/loc stx
-            (let*: ([xs : FlVector  xs-expr]
-                    [n  : Index     (flvector-length xs)])
-              (define-syntax-rule (new-f i)
-                ((ann f-expr (Flonum -> Flonum)) (unsafe-flvector-ref xs i)))
-              (define ys (make-flvector n))
-              (unsafe-flvector-fill! ys n new-f)))]
-         [else
-          (syntax/loc stx
-            (let* ([xs  (ensure-flvector 'flvector-map xs-expr)]
-                   [n   (flvector-length xs)])
-              (define-syntax-rule (new-f i)
-                (let ([y  (f-expr (unsafe-flvector-ref xs i))])
-                  (if (flonum? y) y (raise-result-error 'flvector-map "Flonum" y))))
-              (define ys (make-flvector n))
-              (unsafe-flvector-fill! ys n new-f)))])]
-      [(_ f-expr xs-expr xss-expr ...)
-       (with-syntax ([(f)  (generate-temporaries #'(f-expr))]
-                     [(xs xss ...)  (generate-temporaries #'(xs-expr xss-expr ...))]
-                     [(n ns ...)    (generate-temporaries #'(xs-expr xss-expr ...))]
-                     [(Flonums ...)  (build-list (length (syntax->list #'(xs-expr xss-expr ...)))
-                                                 (λ _ #'Flonum))])
-         (cond
-           [(syntax-local-typed-context?)
-            (syntax/loc stx
-              (let*: ([xs : FlVector   xs-expr]
-                      [n  : Index      (flvector-length xs)]
-                      [xss : FlVector  xss-expr] ...)
-                (check-flvector-lengths! 'flvector-map n xss ...)
-                (define-syntax-rule (new-f i)
-                  ((ann f-expr (Flonums ... -> Flonum)) (unsafe-flvector-ref xs i)
-                                                        (unsafe-flvector-ref xss i) ...))
-                (define ys (make-flvector n))
-                (unsafe-flvector-fill! ys n new-f)))]
-           [else
-            (syntax/loc stx
-              (let* ([xs  (ensure-flvector 'flvector-map xs-expr)]
-                     [n  (unsafe-flvector-length xs)]
-                     [xss  (ensure-flvector 'flvector-map xss-expr)] ...)
-                (check-flvector-lengths! 'flvector-map n xss ...)
-                (define-syntax-rule (new-f i)
-                  (let ([y  (f-expr (unsafe-flvector-ref xs i) (unsafe-flvector-ref xss i) ...)])
-                    (cond [(flonum? y)  y]
-                          [else  (raise-result-error 'flvector-map "Flonum" y)])))
-                (define ys (make-flvector n))
-                (unsafe-flvector-fill! ys n new-f)))]))]))
-  
-  )  ; module
-
-(module defs typed/racket/base
-  (require racket/flonum
-           racket/fixnum
-           racket/unsafe/ops
-           (submod ".." syntax-defs)
-           "../utils.rkt"
-           "../exception.rkt")
-  
-  (provide (all-defined-out))
-  
-  (: build-flvector (Integer (Index -> Flonum) -> FlVector))
-  (define (build-flvector n f) (inline-build-flvector n f))
-  
-  (: flvector-map (case-> ((Flonum -> Flonum) FlVector -> FlVector)
-                          ((Flonum Flonum Flonum * -> Flonum) FlVector FlVector FlVector *
-                                                              -> FlVector)))
-  (define flvector-map
-    (case-lambda:
-      [([f : (Flonum -> Flonum)] [xs : FlVector])
-       (inline-flvector-map f xs)]
-      [([f : (Flonum Flonum -> Flonum)] [xs : FlVector] [ys : FlVector])
-       (inline-flvector-map f xs ys)]
-      [([f : (Flonum Flonum Flonum * -> Flonum)] [xs : FlVector] [ys : FlVector] . [yss : FlVector *])
-       (define n (flvector-length xs))
-       (apply check-flvector-lengths! 'flvector-map n ys yss)
-       (inline-build-flvector
-        n (λ: ([i : Index])
-            (apply f
-                   (unsafe-flvector-ref xs i)
-                   (unsafe-flvector-ref ys i)
-                   (map (λ: ([ys : FlVector]) (unsafe-flvector-ref ys i)) yss))))]))
-  
-  )  ; module
-
-(require 'syntax-defs 'defs)
-
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/flvector.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flvector.rkt
deleted file mode 100644
index dcf5f47720..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/flvector.rkt
+++ /dev/null
@@ -1,238 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         "../unsafe.rkt"
-         "flonum-functions.rkt"
-         "flvector-syntax.rkt")
-
-(provide
- (all-from-out "flvector-syntax.rkt")
- ;; Construction
- unsafe-flvector-copy!
- flvector-copy!
- ;; Conversion
- list->flvector
- flvector->list
- vector->flvector
- flvector->vector
- ;; Pointwise operations
- flvector-scale
- flvector-sqr
- flvector-sqrt
- flvector-abs
- flvector+
- flvector*
- flvector-
- flvector/
- flvector-min
- flvector-max
- ;; Sum
- flvector-sum
- flvector-sums
- flsum)
-
-;; ===================================================================================================
-;; flvector-copy!
-
-(: unsafe-flvector-copy! (FlVector Integer FlVector Integer Integer -> Void))
-(define (unsafe-flvector-copy! dest dest-start src src-start src-end)
-  (let loop ([i dest-start] [j src-start])
-    (when (j . unsafe-fx< . src-end)
-      (unsafe-flvector-set! dest i (unsafe-flvector-ref src j))
-      (loop (unsafe-fx+ i 1) (unsafe-fx+ j 1)))))
-
-(: flvector-copy! (case-> (FlVector Integer FlVector -> Void)
-                          (FlVector Integer FlVector Integer -> Void)
-                          (FlVector Integer FlVector Integer Integer -> Void)))
-(define flvector-copy!
-  (case-lambda
-    [(dest dest-start src)
-     (flvector-copy! dest dest-start src 0 (flvector-length src))]
-    [(dest dest-start src src-start)
-     (flvector-copy! dest dest-start src src-start (flvector-length src))]
-    [(dest dest-start src src-start src-end)
-     (define dest-len (flvector-length dest))
-     (define src-len (flvector-length src))
-     (cond [(or (dest-start . < . 0) (dest-start . > . dest-len))
-            (raise-argument-error 'flvector-copy! (format "Index <= ~e" dest-len) 1
-                                  dest dest-start src src-start src-end)]
-           [(or (src-start . < . 0) (src-start . > . src-len))
-            (raise-argument-error 'flvector-copy! (format "Index <= ~e" src-len) 3
-                                  dest dest-start src src-start src-end)]
-           [(or (src-end . < . 0) (src-end . > . src-len))
-            (raise-argument-error 'flvector-copy! (format "Index <= ~e" src-len) 4
-                                  dest dest-start src src-start src-end)]
-           [(src-end . < . src-start)
-            (error 'flvector-copy! "ending index is smaller than starting index")]
-           [((- dest-len dest-start) . < . (- src-end src-start))
-            (error 'flvector-copy! "not enough room in target vector")]
-           [else
-            (unsafe-flvector-copy! dest dest-start src src-start src-end)])]))
-
-;; ===================================================================================================
-;; Conversion
-
-(: list->flvector ((Listof Real) -> FlVector))
-(define (list->flvector vs)
-  (for/flvector: #:length (length vs) ([v  (in-list vs)])
-    (fl v)))
-
-(: flvector->list (FlVector -> (Listof Float)))
-(define (flvector->list xs)
-  (for/list: : (Listof Float) ([x  (in-flvector xs)]) x))
-
-(: vector->flvector ((Vectorof Real) -> FlVector))
-(define (vector->flvector vs)
-  (for/flvector: #:length (vector-length vs) ([v  (in-vector vs)])
-    (fl v)))
-
-(: flvector->vector (FlVector -> (Vectorof Float)))
-(define (flvector->vector xs)
-  (for/vector: #:length (flvector-length xs) ([x  (in-flvector xs)]) : Flonum
-    x))
-
-;; ===================================================================================================
-;; Pointwise operations
-
-(define-syntax-rule (lift1 f)
-  (λ: ([arr : FlVector])
-    (inline-flvector-map f arr)))
-
-(define-syntax-rule (lift2 f)
-  (λ: ([arr0 : FlVector] [arr1 : FlVector])
-    (inline-flvector-map f arr0 arr1)))
-
-(: flvector-scale (FlVector Float -> FlVector))
-(define (flvector-scale arr y) (inline-flvector-map (λ: ([x : Flonum]) (fl* x y)) arr))
-
-(: flvector-sqr (FlVector -> FlVector))
-(define flvector-sqr (lift1 (λ: ([x : Flonum]) (fl* x x))))
-
-(: flvector-sqrt (FlVector -> FlVector))
-(define flvector-sqrt (lift1 flsqrt))
-
-(: flvector-abs (FlVector -> FlVector))
-(define flvector-abs (lift1 flabs))
-
-(: flvector+ (FlVector FlVector -> FlVector))
-(define flvector+ (lift2 fl+))
-
-(: flvector* (FlVector FlVector -> FlVector))
-(define flvector* (lift2 fl*))
-
-(: flvector- (case-> (FlVector -> FlVector)
-                     (FlVector FlVector -> FlVector)))
-(define flvector-
-  (case-lambda:
-    [([arr0 : FlVector])
-     (inline-flvector-map (λ: ([x : Float]) (fl- 0.0 x)) arr0)]
-    [([arr0 : FlVector] [arr1 : FlVector])
-     (inline-flvector-map fl- arr0 arr1)]))
-
-(: flvector/ (case-> (FlVector -> FlVector)
-                     (FlVector FlVector -> FlVector)))
-(define flvector/
-  (case-lambda:
-    [([arr0 : FlVector])
-     (inline-flvector-map (λ: ([x : Float]) (fl/ 1.0 x)) arr0)]
-    [([arr0 : FlVector] [arr1 : FlVector])
-     (inline-flvector-map fl/ arr0 arr1)]))
-
-(: flvector-min  (FlVector FlVector -> FlVector))
-(define flvector-min (lift2 flmin))
-
-(: flvector-max  (FlVector FlVector -> FlVector))
-(define flvector-max (lift2 flmax))
-
-;; ===================================================================================================
-;; Summation
-
-#|
-Algorithm adapted from:
-
-J R Shewchuk. Adaptive Precision Floating-Point Arithmetic and Fast Geometric Predicates.
-Discrete & Computational Geometry, 1996, vol 18, pp 305--363.
-|#
-
-(: flvector-sum (FlVector -> Flonum))
-;; Returns the sum of the elements in xs in a way that incurs rounding error only once
-(define (flvector-sum xs)
-  (define n (flvector-length xs))
-  ;; Vector of remainders
-  (define rs (make-flvector n))
-  ;; Loop over `xs'
-  (let i-loop ([#{i : Nonnegative-Fixnum} 0]
-               ;; p = Number of valid remainders in `rs'
-               [#{p : Nonnegative-Fixnum} 0])
-    (cond
-      [(i . fx< . n)
-       ;; Add x consecutively to each remainder, storing the remainder of *those* additions in `rs'
-       (let j-loop ([#{j : Nonnegative-Fixnum} 0]
-                    ;; q = Number of remainders generated by this j-loop:
-                    [#{q : Nonnegative-Fixnum} 0]
-                    [x  (unsafe-flvector-ref xs i)])
-         (cond
-           [(j . fx< . p)
-            (define r (unsafe-flvector-ref rs j))
-            ;; Get the largest of x and r, or x if it's not rational
-            (let-values ([(x r)  (if ((flabs x) . fl< . (flabs r)) (values r x) (values x r))])
-              ;; Add with remainder
-              (define z (fl+ x r))
-              (define-values (hi lo)
-                (cond [(flrational? z)  (values z (fl- r (fl- z x)))]
-                      [else  (values x r)]))
-              (cond [(fl= lo 0.0)
-                     ;; No remainder: don't store (makes average case O(n*log(n)))
-                     (j-loop (unsafe-fx+ j 1) q hi)]
-                    [else
-                     ;; Store the remainder, increment the counter
-                     (unsafe-flvector-set! rs q lo)
-                     (j-loop (unsafe-fx+ j 1) (unsafe-fx+ q 1) hi)]))]
-           [else
-            ;; Store the sum so far as the last remainder
-            (unsafe-flvector-set! rs q x)
-            (i-loop (fx+ i 1) (unsafe-fx+ q 1))]))]
-      [else
-       ;; Add all the remainders
-       (let j-loop ([#{j : Nonnegative-Fixnum} 0] [acc  0.0])
-         (cond [(j . fx< . p)  (j-loop (unsafe-fx+ j 1) (fl+ acc (unsafe-flvector-ref rs j)))]
-               [else  acc]))])))
-
-(: flvector-sums (FlVector -> FlVector))
-;; Returns the partial sums of the elements in xs in a way that incurs rounding error only once
-;; for each
-;; This function works just like `flvector-sum', but keeps track of partial sums instead of
-;; summing all the remainders at the end
-(define (flvector-sums xs)
-  (define n (flvector-length xs))
-  (define rs (make-flvector n))
-  (define ss (make-flvector n))
-  (let i-loop ([#{i : Nonnegative-Fixnum} 0]
-               [#{p : Nonnegative-Fixnum} 0])
-    (cond
-      [(i . fx< . n)
-       (let j-loop ([#{j : Nonnegative-Fixnum} 0]
-                    [#{q : Nonnegative-Fixnum} 0]
-                    [x (unsafe-flvector-ref xs i)]
-                    [s 0.0])
-         (cond
-           [(j . fx< . p)
-            (define r (unsafe-flvector-ref rs j))
-            (let-values ([(x r)  (if ((flabs x) . fl< . (flabs r)) (values r x) (values x r))])
-              (define z (fl+ x r))
-              (define-values (hi lo)
-                (cond [(flrational? z)  (values z (fl- r (fl- z x)))]
-                      [else  (values x r)]))
-              (cond [(fl= lo 0.0)
-                     (j-loop (unsafe-fx+ j 1) q hi s)]
-                    [else
-                     (unsafe-flvector-set! rs q lo)
-                     (j-loop (unsafe-fx+ j 1) (unsafe-fx+ q 1) hi (fl+ s lo))]))]
-           [else
-            (unsafe-flvector-set! rs q x)
-            (unsafe-flvector-set! ss i (fl+ s x))
-            (i-loop (fx+ i 1) (unsafe-fx+ q 1))]))]
-      [else  ss])))
-
-(: flsum ((Listof Flonum) -> Flonum))
-(define (flsum xs) (flvector-sum (list->flvector xs)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/flonum/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/utils.rkt
deleted file mode 100644
index 480df81fe7..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/flonum/utils.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-
-(provide near-pow2
-         near-pow2/div)
-
-(module untyped-defs racket/base
-  (require racket/flonum)
-  
-  (provide (all-defined-out))
-  
-  (define-syntax-rule (near-pow2 a)
-    (flexpt 2.0 (flmax -1023.0 (flmin 1023.0 (flround (fl/ (fllog (flabs a)) (fllog 2.0)))))))
-  
-  (define-syntax-rule (near-pow2/div a b)
-    ;; Clamping both values makes this work properly when a or b is infinite or zero
-    (let ([ea  (flmax -511.0 (flmin 511.0 (fl/ (fllog (flabs a)) (fllog 2.0))))]
-          [eb  (flmax -511.0 (flmin 511.0 (fl/ (fllog (flabs b)) (fllog 2.0))))])
-      (flexpt 2.0 (flround (fl* 0.5 (fl+ ea eb))))))
-  
-  )  ; module
-
-(require (submod "." untyped-defs))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/beta.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/beta.rkt
deleted file mode 100644
index 219e6719b0..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/beta.rkt
+++ /dev/null
@@ -1,151 +0,0 @@
-#lang typed/racket/base
-
-(require "../../flonum.rkt"
-         "../../base.rkt"
-         "gamma.rkt"
-         "log-gamma.rkt"
-         "stirling-error.rkt"
-         "lanczos.rkt")
-
-(provide flbeta fllog-beta beta log-beta)
-
-(define: flbeta-hash : (HashTable (Pair Flonum Flonum) Flonum) (make-weak-hash))
-(define: fllog-beta-hash : (HashTable (Pair Flonum Flonum) Flonum) (make-weak-hash))
-
-(: flbeta-limits (Flonum Flonum -> Flonum))
-;; Assumes a >= b (or one is +nan.0)
-(define (flbeta-limits a b)
-  (cond [(or (a . < . 0.0) (b . < . 0.0))  +nan.0]
-        [(and (= a +inf.0) (= b 0.0))  +nan.0]
-        [(or (= a 0.0) (= b 0.0))  +inf.0]
-        [(or (= a +inf.0) (= b +inf.0))  0.0]
-        [else  +nan.0]))
-
-(: flbeta (Flonum Flonum -> Flonum))
-(define (flbeta a b)
-  (let ([a  (flmax a b)]
-        [b  (flmin a b)])
-    (cond [(not (and (b . fl> . 0.0) (a . fl< . +inf.0)))
-           (flbeta-limits a b)]
-          [(fl= a 1.0)  (fl/ 1.0 b)]
-          [(fl= b 1.0)  (fl/ 1.0 a)]
-          [(b . fl> . 540.0)  0.0]
-          ;; Asymptotic expansion for small `b' and large `a', derived from Stirling's approximation
-          ;; Domain where this has low error (<= 3 ulps) was found by experimentation (for the first
-          ;; condition), and by solving for a^-b = small (for the second)
-          [(or (and (b . fl< . 1.0) (a . fl> . (fl* 1e16 b)))
-               (and (a . fl> . 1e17) (b . fl< . (fl/ 700.0 (fllog a)))))
-           (fl* (flgamma b) (flexpt a (- b)))]
-          ;; Use direct implementation when it doesn't under-/overflow
-          [(and (b . fl>= . 1.0) (a . fl<= . 99.0) ((fl+ a b) . fl<= . 171.0))
-           (fl/ (fl* (flgamma a) (flgamma b)) (flgamma (fl+ a b)))]
-          [else
-           (hash-ref!
-            flbeta-hash (cons a b)
-            (λ ()
-              (define-values (a/b a/b-lo) (fast-fl//error a b))
-              (define-values (b/a b/a-lo) (fast-fl//error b a))
-              (cond
-                ;; Use extended-precision implementation based on Stirling's series when it
-                ;; won't under-/overflow
-                [(and (a/b . fl> . +max-subnormal.0) (a/b . fl< . +inf.0)
-                      (b/a . fl> . +max-subnormal.0) (b/a . fl< . +inf.0))
-                 (define-values (1+a/b 1+a/b-lo) (fast-fl+/error 1.0 a/b))
-                 (define-values (1+b/a 1+b/a-lo) (fast-fl+/error 1.0 b/a))
-                 (* (fl/ (fl* (flexp-stirling a) (flexp-stirling b))
-                         (flexp-stirling (fl+ a b)))
-                    (flsqrt (fl/ (* 2.0 pi (fl+ a b)) (fl* a b)))
-                    (flexpt+ 1+a/b (fl+ 1+a/b-lo a/b-lo) (- b))
-                    (flexpt+ 1+b/a (fl+ 1+b/a-lo b/a-lo) (- a)))]
-                [else
-                 (* (fl/ (fl* (flexp-stirling a) (flexp-stirling b))
-                         (flexp-stirling (fl+ a b)))
-                    (flsqrt (fl/ (fl/ (* 2.0 pi (fl+ a b)) a) b))
-                    (flexpt (fl/ (fl+ a b) b) (- b))
-                    (flexpt (fl/ (fl+ b a) a) (- a)))])))])))
-
-(: fllog-beta-stirling (Flonum Flonum -> Flonum))
-(define (fllog-beta-stirling a b)
-  (define t
-    (let ([t  (flstirling (fl+ a b))])
-      (cond [(t . < . +inf.0)  t]
-            [else  (/ #i1/24 (+ (* 0.5 a) (* 0.5 b)))])))
-  (+ (fl- (fl+ (flstirling a) (flstirling b)) t)
-     (* 0.5 (- (+ (fllog (* 2.0 pi)) (fllog+ a b)) (fllog a) (fllog b)))
-     (* a (- (fllog a) (fllog+ a b)))
-     (* b (- (fllog b) (fllog+ a b)))))
-
-(: fllog-beta (Flonum Flonum -> Flonum))
-(define (fllog-beta a b)
-  (let ([a  (flmax a b)]
-        [b  (flmin a b)])
-    (cond [(not (and (b . fl> . 0.0) (a . fl< . +inf.0)))
-           (fllog (flbeta-limits a b))]
-          [(fl= a 1.0)  (- (fllog b))]
-          [(fl= b 1.0)  (- (fllog a))]
-          [else
-           (define y-est (fl+ (fllog-gamma b) (fl* (- b) (fllog a))))
-           (cond
-             ;; If an overestimate of (fllog-beta a b) is small enough but not too small, or large
-             ;; enough and rational, then (fllog (flbeta a b)) has low error
-             ;; The "too small" value log(1e-220) was determined experimentally
-             [(or (and (y-est . > . (fllog 1e-220)) (y-est . < . (fllog #i1/8)))
-                  (and (y-est . > . (fllog 8.0)) (y-est . < . (fllog +max.0))))
-              (fllog (flbeta a b))]
-             [(y-est . > . (flexp 1.0))  (fllog-beta-stirling a b)]
-             [else
-              (hash-ref!
-               fllog-beta-hash (cons a b)
-               (λ ()
-                 (define-values (a/b a/b-lo) (fast-fl//error a b))
-                 (define-values (b/a b/a-lo) (fast-fl//error b a))
-                 (cond
-                   ;; Use extended-precision implementation based on Stirling's series when it won't
-                   ;; under-/overflow
-                   [(and (a/b . fl> . +max-subnormal.0) (a/b . fl< . +inf.0)
-                         (b/a . fl> . +max-subnormal.0) (b/a . fl< . +inf.0)
-                         (a/b-lo . fl> . +max-subnormal.0) (a/b-lo . fl< . +inf.0)
-                         (b/a-lo . fl> . +max-subnormal.0) (b/a-lo . fl< . +inf.0))
-                    (define-values (1+a/b 1+a/b-lo) (fast-fl+/error 1.0 a/b))
-                    (define-values (1+b/a 1+b/a-lo) (fast-fl+/error 1.0 b/a))
-                    (define t
-                      (let ([t  (* 0.5 (fllog (fl/ (* 2.0 pi (fl+ a b)) (fl* a b))))])
-                        (cond [(and (t . > . -inf.0) (t . < . +inf.0))  t]
-                              [else  (* 0.5 (- (+ (fllog (* 2.0 pi)) (fllog+ a b))
-                                               (+ (fllog a) (fllog b))))])))
-                    (+ t (fl- (fl+ (flstirling a) (flstirling b))
-                            (flstirling (fl+ a b)))
-                       (* (- b) (fllog+ 1+a/b (fl+ 1+a/b-lo a/b-lo)))
-                       (* (- a) (fllog+ 1+b/a (fl+ 1+b/a-lo b/a-lo))))]
-                   [else
-                    (fllog-beta-stirling a b)])))])])))
-
-;; ===================================================================================================
-
-(: log-beta (case-> (One One -> Zero)
-                    (Flonum Flonum -> Flonum)
-                    (Real Real -> (U Zero Flonum))))
-(define (log-beta a b)
-  (cond [(and (exact? a) (a . <= . 0))
-         (raise-argument-error 'log-beta "positive Real" 0 a b)]
-        [(and (exact? b) (b . <= . 0))
-         (raise-argument-error 'log-beta "positive Real" 1 a b)]
-        [(eqv? a 1)
-         (if (eqv? b 1) 0 (fllog-beta (fl a) (fl b)))]
-        [else
-         (fllog-beta (fl a) (fl b))]))
-
-(: beta (case-> (Positive-Integer Positive-Integer -> Exact-Rational)
-                (Flonum Flonum -> Flonum)
-                (Real Real -> (U Exact-Rational Flonum))))
-(define (beta a b)
-  (cond [(and (exact? a) (a . <= . 0))
-         (raise-argument-error 'beta "positive Real" 0 a b)]
-        [(and (exact? b) (b . <= . 0))
-         (raise-argument-error 'beta "positive Real" 1 a b)]
-        [(exact-integer? a)
-         (if (exact-integer? b)
-             (/ (* (gamma a) (gamma b)) (gamma (+ a b)))
-             (flbeta (fl a) (fl b)))]
-        [else
-         (flbeta (fl a) (fl b))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/continued-fraction.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/continued-fraction.rkt
deleted file mode 100644
index f386784d1f..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/continued-fraction.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang typed/racket
-
-(require "../../flonum.rkt")
-
-(provide continued-fraction continued-fraction-parts)
-
-;; overflow = a power of 2 near sqrt(+max.0)
-(define overflow (flexpt 2.0 (flfloor (fl/ (fllog (flsqrt +max.0)) (fllog 2.0)))))
-
-(define-syntax-rule (continued-fraction a-init a-fun b-init b-fun eps-expr)
-  (let-values ([(n d)  (continued-fraction-parts a-init a-fun b-init b-fun eps-expr)])
-    (fl/ n d)))
-
-(define-syntax-rule (continued-fraction-parts a-init a-fun b-init b-fun eps-expr)
-  (let: ([eps : Flonum  eps-expr])
-    (let: loop : (Values Flonum Flonum) ([i : Flonum 0.0]
-                                         [a : Flonum a-init]
-                                         [b : Flonum b-init]
-                                         [last-n : Flonum 1.0]
-                                         [last-d : Flonum 0.0]
-                                         [n : Flonum 0.0]
-                                         [d : Flonum 1.0]
-                                         [x : Flonum 0.0])
-      ;(printf "a = ~v  b = ~v~n" a b)
-      (define next-n (fl+ (fl* a last-n) (fl* b n)))
-      (define next-d (fl+ (fl* a last-d) (fl* b d)))
-      (let-values ([(n d next-n next-d)
-                    (cond [(or (next-n . fl> . overflow)
-                               (next-d . fl> . overflow))
-                           (values (fl/ n overflow) (fl/ d overflow)
-                                   (fl/ next-n overflow) (fl/ next-d overflow))]
-                          [(or (next-n . < . (fl/ 1.0 overflow))
-                               (next-d . < . (fl/ 1.0 overflow)))
-                           (values (fl* n overflow) (fl* d overflow)
-                                   (fl* next-n overflow) (fl* next-d overflow))]
-                          [else
-                           (values n d next-n next-d)])])
-        (define next-x (fl/ next-n next-d))
-        ;(printf "n = ~v  d = ~v  x = ~v~n" next-n next-d next-x)
-        (cond [(or ((flabs (fl- x next-x)) . fl<= . (flabs (fl* eps next-x)))
-                   (not (rational? next-x)))
-               ;(printf "i = ~v~n" i)
-               ;i
-               (values next-n next-d)]
-              [else
-               (let ([i  (fl+ i 1.0)])
-                 (loop i (a-fun i a) (b-fun i b) n d next-n next-d next-x))])))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/erf.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/erf.rkt
deleted file mode 100644
index 5ff597a7ce..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/erf.rkt
+++ /dev/null
@@ -1,215 +0,0 @@
-#lang typed/racket/base
-
-#|
-erfc for large x implementation from:
-
-C Tellambura and A Annamalai. Efficient Computation of erfc(x) for Large Arguments.
-IEEE Transactions on Communications, 2000, vol 48, pp 529--532
-|#
-
-(require "../../flonum.rkt"
-         "../../base.rkt"
-         "../distributions/impl/normal-cdf.rkt"
-         "../polynomial/chebyshev.rkt"
-         "continued-fraction.rkt")
-
-(provide flerf flerfc*expsqr flerfc
-         erf erfc)
-
-;; ===================================================================================================
-;; erf
-
-(: flerf-normal (Flonum -> Flonum))
-(define (flerf-normal x)
-  (fl- (fl* 2.0 (standard-flnormal-cdf (fl* x (flsqrt 2.0)))) 1.0))
-
-(: flerf-taylor-0 (Flonum -> Flonum))
-;; Good for -0.5 <= x <= 0.5
-(define (flerf-taylor-0 x)
-  (fl* x ((make-flpolyfun
-           (+1.1283791670955125738961589031215451716881e0
-            -3.7612638903183752463205296770718172389603e-1
-            +1.1283791670955125738961589031215451716881e-1
-            -2.6866170645131251759432354836227265992574e-2
-            +5.2239776254421878421118467737108572763338e-3
-            -8.5483270234508528325466583569814028158189e-4
-            +1.2055332981789664251027338708563516791540e-4
-            -1.4925650358406250977462419353459592218097e-5
-            +1.6462114365889247401612962522198079652312e-6
-            -1.6365844691234924317393003677039026554930e-7
-            +1.4807192815879217239546050945892452597318e-8
-            -1.2290555301717927352982888136906778835719e-9))
-          (fl* x x))))
-
-(: flerf (Flonum -> Flonum))
-(define (flerf x)
-  (let ([ax  (flabs x)])
-    (cond [(ax . fl> . 0.5)  (flerf-normal x)]
-          [(ax . fl< . 1e-13)  (fl* x (fl/ 2.0 (flsqrt pi)))]
-          [else  (flerf-taylor-0 x)])))
-
-;; ===================================================================================================
-;; erfc(x)*exp(x^2)
-
-(define sqrtpi 1.772453850905516027298167483341145182798)
-
-(: flerfc*expsqr-huge (Flonum -> Flonum))
-;; Computed using erfc's asymptotic expansion
-;; Error < epsilon.0 for x > 1e8
-(define (flerfc*expsqr-huge x)
-  (fl/ 1.0 (fl* x sqrtpi)))
-
-(: flerfc*expsqr-asym (Flonum -> Flonum))
-;; Computed using erfc's asymptotic expansion
-;; Error < epsilon.0 for x > 24
-(define (flerfc*expsqr-asym x)
-  (define 1/2x^2 (fl/ 1.0 (fl* 2.0 (fl* x x))))
-  (fl* (fl/ 1.0 (fl* x sqrtpi))
-       ((make-flpolyfun
-         (1.0 -1.0 3.0 -15.0 105.0 -945.0 10395.0))
-        1/2x^2)))
-
-(: foo (Flonum -> Flonum))
-(define (foo x)
-  (define 2x^2 (fl* 2.0 (fl* x x)))
-  (fl* (fl/ x sqrtpi)
-       ((make-flpolyfun
-         (1.0 -1.0 3.0 -15.0 105.0 -945.0 10395.0))
-        2x^2)))
-
-(: flerfc*expsqr-series (Flonum -> Flonum))
-;; Good for x > 5.0
-(define (flerfc*expsqr-series x)
-  (define h (cond [(x . fl< . 5.4)  0.25]
-                  [(x . fl< . 8.0)  0.4]
-                  [(x . fl< . 16.0)  0.5]
-                  [else  0.51]))
-  (define h^2 (* h h))
-  (define z
-    (fl+ (fl/ (fl/ 1.0 x) x)
-         (let: loop : Flonum ([y : Flonum  0.0] [n : Flonum  1.0])
-           (define n^2*h^2 (fl* (fl* n n) h^2))
-           (define dy (fl/ (fl* 2.0 (flexp (- n^2*h^2))) (fl+ n^2*h^2 (fl* x x))))
-           ;(printf "~v~n" dy)
-           (cond [(dy . fl< . (fl* (fl* 0.5 epsilon.0) y))  (fl+ dy y)]
-                 [else  (loop (fl+ y dy) (fl+ n 1.0))]))))
-  (fl* (fl/ (fl* x h) pi) z))
-
-(: flerfc*expsqr-3-5 (Flonum -> Flonum))
-(define (flerfc*expsqr-3-5 x)
-  (fl/ ((inline-chebyshev-flpoly-fun
-         3.0 5.0
-         (76.91661738312371165176665510251236326338
-          27.20465693840961735563948053921797067271
-          3.386442685567191365542568636267208877102
-          0.140993936422267459775165813598040765649
-          -5.153134548269842201105342673544377759352e-6
-          1.7508864589759466867096925622177881862e-6
-          -3.043007141646851587889970096343295638291e-7
-          4.243425771190431100938117624380917251699e-8
-          -5.203867155244060760117564922569126026438e-9
-          5.794849132093509459568321930026301391629e-10
-          -5.921422840095836545874122164110445535066e-11
-          5.533766942834863591670434965523217803471e-12
-          -4.631550718317617310162582984555616243437e-13
-          3.262025831452441605191178585599762596143e-14
-          -1.513328953213075725641119234827526370187e-15
-          -4.522283605960468274138123625976905984843e-17))
-        x)
-       (flexpt x 4.0)))
-
-(: flerfc*expsqr-1-3 (Flonum -> Flonum))
-(define (flerfc*expsqr-1-3 x)
-  (fl/ ((inline-chebyshev-flpoly-fun
-         1.0 3.0
-         (0.9945093280638061048517513432019848175032
-          0.05120904381630891334631711380945424146303
-          -0.01422342070434339336273995600351825586225
-          0.003357268323337835041126774361327403324835
-          -7.114985025457904001609950417739639868647e-4
-          1.390876463234288554054665709920181526987e-4
-          -2.548042834519374090944060859469479045399e-5
-          4.420149801027904714368125294893695251516e-6
-          -7.314182887789212376555477464037660326951e-7
-          1.160833279816164682586230015667162482652e-7
-          -1.77457488690957160865337806653632235146e-8
-          2.621904502367314860299110485351868396918e-9
-          -3.754481078582135875876211640532994079565e-10
-          5.222857161436770247649169925242741865874e-11
-          -7.07220022924025262089289170578922817775e-12
-          9.337553246718007012188722480344684913175e-13
-          -1.203905834239132741551983752552150752983e-13
-          1.517763413855051802253894051250284281458e-14
-          -1.873156638647946872401895465528599118158e-15
-          2.265073220841686859543609057755087846036e-16
-          -2.651790674204626906157253423748608352303e-17))
-        x)
-       x))
-
-(define flerfc*expsqr-0.5-1
-  (inline-chebyshev-flpoly-fun
-   0.5 1.0
-   (1.028508060089628120924659381992051204702
-    -0.09353436157631646884296478224639544611431
-    0.00734954356796596066014584525500838968569
-    -5.170287683170954502817549118454885607861e-4
-    3.327489181039831922712166420908522822156e-5
-    -1.987760941931570403969164257181219771567e-6
-    1.113719839925198075577451421375109070733e-7
-    -5.898649609389129304942457516804088201602e-9
-    2.971299014285280439436981007380165475227e-10
-    -1.430488185776241939959484837699287692925e-11
-    6.608616284222898801100004753695010173929e-13
-    -2.939555278237892581547471127716213388842e-14
-    1.262499691092374606344446613363361460578e-15
-    -5.240060859272093179585053345170003668439e-17)))
-
-(: flerfc*expsqr-normal (Flonum -> Flonum))
-(define (flerfc*expsqr-normal x)
-  (fl* (flexpsqr x) (fl* 2.0 (standard-flnormal-cdf (- (fl* x (flsqrt 2.0)))))))
-
-(: flerfc*expsqr (Flonum -> Flonum))
-(define (flerfc*expsqr x)
-  (cond [(x . fl> . 1e8)    (flerfc*expsqr-huge x)]
-        [(x . fl> . 24.0)   (flerfc*expsqr-asym x)]
-        [(x . fl> . 5.0)    (flerfc*expsqr-series x)]
-        [(x . fl> . 3.0)    (flerfc*expsqr-3-5 x)]
-        [(x . fl> . 1.0)    (flerfc*expsqr-1-3 x)]
-        [(x . fl> . 0.5)    (flerfc*expsqr-0.5-1 x)]
-        [(x . fl> . -27.0)  (flerfc*expsqr-normal x)]
-        [else  +inf.0]))
-
-;; ===================================================================================================
-;; erfc
-
-(define -erfc-max.0 -5.8635847487551676)
-(define +erfc-max.0 27.226017111108362)
-
-(: flerfc (Flonum -> Flonum))
-(define (flerfc x)
-  (cond [(x . fl< . 0.0)
-         (cond [(x . fl< . -erfc-max.0)  2.0]
-               [else  (- 2.0 (flerfc (- x)))])]
-        [(x . fl> . 0.0)
-         (cond [(x . fl> . +erfc-max.0)  0.0]
-               [else  (fl* (flerfc*expsqr x) (flgauss x))])]
-        [(x . fl= . 0.0)  1.0]
-        [else  +nan.0]))
-
-;; ===================================================================================================
-
-(: erf (case-> (Zero -> Zero)
-               (Flonum -> Flonum)
-               (Real -> (U Zero Flonum))))
-(define (erf x)
-  (cond [(flonum? x)  (flerf x)]
-        [(eqv? x 0)  x]
-        [else  (flerf (fl x))]))
-
-(: erfc (case-> (Zero -> One)
-                (Flonum -> Flonum)
-                (Real -> (U One Flonum))))
-(define (erfc x)
-  (cond [(flonum? x)  (flerfc x)]
-        [(eqv? x 0)  1]
-        [else  (flerfc (fl x))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/gamma.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/gamma.rkt
deleted file mode 100644
index 864d259a98..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/gamma.rkt
+++ /dev/null
@@ -1,284 +0,0 @@
-#lang typed/racket/base
-
-#|
-Compute Gamma(x) for +flgamma-min.0 <= x <= +flgamma-max.0 and non-integer x <= -flgamma-min.0
-
-Identities:
- * Gamma(x) = x * Gamma(x-1)         [definition]
- * Gamma(x) = (x-1)!, integer x > 0  [definition]
- * Gamma(x) = Gamma(x/2) * Gamma(x/2 + 1/2) * 2^(x-1) / sqrt(pi)  [doubling formula]
-
-Floating-point design choices:
- * Gamma(x) = +inf.0, x = +0.0
- * Gamma(x) = -inf.0, x = -0.0
- * Gamma(x) = +nan.0, integer x < 0.0 or x = -inf.0
-
-Approximations:
- * A Lanczos polynomial approximation cribbed from the Boost library
- * Laurent expansion at 0
- * Taylor expansion at 1
- * Gamma(x) ~ 0.0, non-integer x < 184
-|#
-
-(require racket/fixnum
-         (only-in racket/math exact-truncate)
-         "../../flonum.rkt"
-         "../../base.rkt"
-         "../number-theory/factorial.rkt"
-         "lanczos.rkt")
-
-(provide gamma flgamma)
-
-(define +flgamma-max.0 171.6243769563027)
-(define +flgamma-min.0 5.56268464626801e-309)
-;; Gamma(x) ~ 1/x around very small numbers
-(define -flgamma-min.0 (- +flgamma-min.0))
-
-(define flonum-fact-table-size 171.0)
-(define flonum-fact-table
-  (build-flvector (fl->fx flonum-fact-table-size)
-                  (compose fl factorial)))
-
-(: laurent-sum-0.00 (Float -> Float))
-;; Laurent expansion for -0.001 <= x <= 0.01
-(define (laurent-sum-0.00 x)
-  (fl+ (fl+ (fl/ 1.0 x)
-            (- gamma.0))
-       (fl* x ((make-flpolyfun
-                (+0.989055995327972555395395651500634707939184
-                 -0.907479076080886289016560167356275114928611
-                 +0.981728086834400187336380294021850850360574
-                 -0.981995068903145202104701413791374675517427
-                 +0.993149114621276193153867253328658498037491
-                 -0.996001760442431533970078419664566686735299))
-               x))))
-
-(: taylor-sum-0.50 (Float -> Float))
-;; Taylor expansion for 0.4 <= x <= 0.6
-(define (taylor-sum-0.50 x)
-  ((make-flpolyfun
-    (+1.7724538509055160272981674833411451827976e0
-     -3.4802309069132620269385951981443497500324e0
-     +7.7900887212031263903372656425114121857627e0
-     -1.5794767051535797204049615197802243695634e1
-     +3.1878824821160837494175894816112256439409e1
-     -6.3912695746921383395241144275057530819766e1
-     +1.2794261210147711936949066602575334975374e2
-     -2.5596122807406396899948543419353676781796e2
-     +5.1197413136103945040675826840454682812852e2
-     -1.0239827076083058300636481981776144171184e3
-     +2.0479884602473964585839918538211131834179e3
-     -4.0959923009175214003253088852154617518402e3
-     +8.1919948651220466254256995848376321606002e3
-     -1.6383996575849087970263593129045274051309e4
-     +3.2767997716877703521062014120251608738987e4
-     -6.5535998477775549290980669866329155027290e4
-     +1.3107199898512658288491710421482620707257e5
-     -2.6214399932339484788985894301333677175822e5
-     +5.2428799954892074657103698368248495340879e5
-     -1.0485759996992768355432014911781756798133e6
-     +2.0971519997995164251845178211583153825802e6
-     -4.1943039998663436972876236332679314277175e6
-     +8.3886079999108955636973605473367056799677e6
-     -1.6777215999940596948659351797275861694373e7
-     +3.3554431999960397928248461161824067545415e7
-     -6.7108863999973598603821896375158511265925e7))
-   (fl- x 0.5)))
-
-(: taylor-sum-0.75 (Float -> Float))
-;; Taylor expansion for 0.6 <= x <= 0.9
-(define (taylor-sum-0.75 x)
-  ((make-flpolyfun
-    (+1.2254167024651776451290983033628905268512e0
-     -1.3306320586438753973158461714125306931800e0
-     +2.2798715368921053860231453979712247015479e0
-     -3.0356325054764770273358473132729245991211e0
-     +4.1639356827972145971295506590931882302017e0
-     -5.5828354599031279709094914618820777254957e0
-     +7.4725560147638094113271595546749768089882e0
-     -9.9773913436472698249761366263115873834879e0
-     +1.3311875532717127406341612389831215273413e1
-     -1.7754030284164089293469539018644025571507e1
-     +2.3674855647597215599782047621734873185439e1
-     -3.1568082210708622762952116316633632133940e1
-     +4.2091697406490991625454319348036323661887e1
-     -5.6122789967429137505629713694791499592973e1
-     +7.4830687842248860777520911986043344973951e1
-     -9.9774422649289317880735163267681771600803e1
-     +1.3303266195453161667765264326398808665282e2
-     -1.7737693885659633699219673616639872019028e2
-     +2.3650261728872409183156067714435259160505e2
-     -3.1533684142235722118226966734052049763571e2
-     +4.2044913239448573163503097252418185989689e2
-     -5.6059884919167464502416194940242251803045e2
-     +7.4746513568364145256740278829357382166450e2
-     -9.9662018287044384491125019062792037807204e2
-     +1.3288269116133169880999542840071640880826e3
-     -1.7717692161240780212684141496992227705508e3))
-   (fl- x 0.75)))
-
-(: taylor-sum-1.00 (Float -> Float))
-;; Taylor expansion for 0.8 <= x <= 1.2
-(define (taylor-sum-1.00 x)
-  ((make-flpolyfun
-    (+1.0
-     -0.57721566490153286060651209008240243104216
-     +0.98905599532797255539539565150063470793918
-     -0.90747907608088628901656016735627511492861
-     +0.98172808683440018733638029402185085036057
-     -0.98199506890314520210470141379137467551742
-     +0.99314911462127619315386725332865849803748
-     -0.99600176044243153397007841966456668673529
-     +0.99810569378312892197857540308836723752396
-     -0.99902526762195486779467805964888808853230
-     +0.99951565607277744106705087759437019443449
-     -0.99975659750860128702584244914060923599695
-     +0.99987827131513327572617164259000321938762
-     -0.99993906420644431683585223136895513185793
-     +0.99996951776348210449861140509195350726552
-     -0.99998475269937704874370963172444753832607
-     +0.99999237447907321585539509450510782583380
-     -0.99999618658947331202896495779561431380200
-     +0.99999809308113089205186619151459489773168
-     -0.99999904646891115771748687947054372632469
-     +0.99999952321060573957523929299106456816808
-     -0.99999976159734438057092470106258744748608
-     +0.99999988079601916841665041840424924052652
-     -0.99999994039712498374586288797675081784805
-     +0.99999997019826758235557449619251141981337))
-   (fl- x 1.0)))
-
-(: taylor-sum-1.50 (Float -> Float))
-;; Taylor expansion for 1.15 <= x <= 1.85
-(define (taylor-sum-1.50 x)
-  ((make-flpolyfun
-    (+8.8622692545275801364908374167057259139877e-1
-     +3.2338397448885013828869884268970307781332e-2
-     +4.1481345368830116823003762311135634284890e-1
-     -1.0729480456477221168754195638970966205456e-1
-     +1.4464535904462154303833221025388452407000e-1
-     -7.7523052299854203444677321416508970474227e-2
-     +5.8610303817176289504188737819144057105466e-2
-     -3.8001935554865130252051071015034155238048e-2
-     +2.5837606455756203893700008736646246296106e-2
-     -1.7222443113464625065830684260380430697612e-2
-     +1.1522515392399228347728732942174590531578e-2
-     -7.6902113642415786625887866176925021602843e-3
-     +5.1316435019123875409072033543284598876153e-3
-     -3.4228024973597060969796850048650543050513e-3
-     +2.2825897637902674139310805303181845131811e-3
-     -1.5220100711244283208129129687746583315715e-3
-     +1.0147877421514778822410839485089945635144e-3
-     -6.7657084106001236729184217880653696383285e-4
-     +4.5106552539565954882790570494617826137956e-4
-     -3.0071767120056376190660288649784379792333e-4
-     +2.0048137704905741940098201147684156999930e-4
-     -1.3365542345929399547565033127852991401613e-4
-     +8.9104084561056640400421412266385236552344e-5
-     -5.9402910632315351301225167218583393338649e-5
-     +3.9602015464878783636172078334875896543825e-5
-     -2.6401373662487025755188087547866875906025e-5))
-   (fl- x 1.5)))
-
-(: flgamma-integer (Float -> Float))
-;; Computes Gamma(x) using factorial
-(define (flgamma-integer x)
-  (cond [(x . fl>= . 1.0)
-         (cond [(x . fl<= . flonum-fact-table-size)
-                (flvector-ref flonum-fact-table (fx- (fl->fx x) 1))]
-               ;; 171! won't fit in a Float
-               [else  +inf.0])]
-        ;; Gamma(x) undefined for integer x <= 0; just need to determine which special to return
-        [(equal? x -0.0)  -inf.0]
-        [(equal? x +0.0)  +inf.0]
-        [else  +nan.0]))
-
-(: flgamma-large-negative (Float -> Float))
-;; Computes Gamma(x) for non-integer x < -170
-(define (flgamma-large-negative x)
-  (cond [(x . fl< . -184.0)
-         ;; Gamma(x) ~ 0.0 for non-integer x < -184; determine sign
-         (if (even? (exact-truncate x)) -0.0 0.0)]
-        [else
-         ;; The standard argument reduction is horrible with -184 < x < -170
-         ;; Fortunately, the doubling formula is great in this subdomain
-         (fl* (fl* (fl* (flgamma (fl* 0.5 x))
-                        (flgamma (fl+ (fl* 0.5 x) 0.5)))
-                   (flexpt 2.0 (fl- x 1.0)))
-              (fl/ 1.0 (flsqrt pi)))]))
-
-(: flgamma-taylor (Float -> Float))
-;; Computes Gamma(x) using Taylor expansion
-;; Error is ~ 0.0 when 0.5 <= x <= 1.5
-(define (flgamma-taylor x)
-  (let loop ([x x] [y 1.0])
-    (cond [(x . fl> . 1.5)  (loop (fl- x 1.0) (fl* y (fl- x 1.0)))]
-          [(x . fl< . 0.5)  (loop (fl+ x 1.0) (fl/ y x))]
-          [(x . fl< . 0.6)  (fl* y (taylor-sum-0.50 x))]
-          [(x . fl< . 0.85)  (fl* y (taylor-sum-0.75 x))]
-          [(x . fl< . 1.175)  (fl* y (taylor-sum-1.00 x))]
-          [else  (fl* y (taylor-sum-1.50 x))])))
-
-(: flgamma-reduce-negative (Float Float -> (Values Float Float)))
-;; Argument reduction with Gamma(x-1) = Gamma(x) / x; used when x is a small negative number
-(define (flgamma-reduce-negative x mx)
-  (let loop ([x x] [y 1.0])
-    (cond [(x . fl<= . mx)  (loop (fl+ x 1.0) (fl/ y x))]
-          [else  (values x y)])))
-
-(: flgamma-laurent (Float -> Float))
-;; Calculates Gamma(x) using Laurent expansion
-;; Error is ~ 0.0 when -0.001 < x < 0.01
-(define (flgamma-laurent x)
-  ;(printf "laurent ~v~n" x)
-  (let-values ([(x y)  (flgamma-reduce-negative x -0.5)])
-    (fl* y (laurent-sum-0.00 x))))
-
-(: flgamma-lanczos (Float -> Float))
-;; Computes Gamma(x) using a Lanczos approximation
-(define (flgamma-lanczos x)
-  ;(printf "lanczos ~v~n" x)
-  (let*-values ([(x y)  (flgamma-reduce-negative x 0.0)]
-                [(y)    (fl* y (lanczos-sum x))])
-    (cond [(x . fl> . 140.0)
-           (define xgh (fl+ x (fl- lanczos-g 0.5)))
-           (define hp (flexpt xgh (fl- (fl* x 0.5) 0.25)))
-           (fl* (fl* y (fl/ hp (flexp xgh))) hp)]
-          [else
-           (define xgh (fl+ x (fl- lanczos-g 0.5)))
-           (fl* y (fl/ (flexpt xgh (fl- x 0.5)) (flexp xgh)))])))
-
-(define: flgamma-hash : (HashTable Float Float) (make-weak-hash))
-
-(: flgamma (Float -> Float))
-(define (flgamma x)
-  (cond [(integer? x)  (flgamma-integer x)]
-        ;; Lanczos produces +nan.0 for huge inputs; avoid
-        [(x . fl> . +flgamma-max.0)  +inf.0]
-        ;; Limit as x -> -inf doesn't exist
-        [(x . fl= . -inf.0)  +nan.0]
-        [(eqv? x +nan.0)   +nan.0]
-        [else
-         (hash-ref!
-          flgamma-hash x
-          (λ ()
-            (cond [(x . fl< . -170.0)  (flgamma-large-negative x)]
-                  ;; If near a pole, use Laurent
-                  [(and (x . fl< . 0.5)
-                        (let ([dx  (fl- x (flround x))])
-                          (and (dx . fl> . -0.001) (dx . fl< . 0.01))))
-                   (flgamma-laurent x)]
-                  ;; If small, use Taylor
-                  [(and (x . fl> . -4.5) (x . fl< . 4.5))  (flgamma-taylor x)]
-                  [else  (flgamma-lanczos x)])))]))
-
-(: gamma (case-> (One -> One)
-                 (Integer -> Positive-Integer)
-                 (Float -> Float)
-                 (Real -> (U Positive-Integer Flonum))))
-(define (gamma x)
-  (cond [(double-flonum? x)  (flgamma x)]
-        [(exact-integer? x)
-         (cond [(x . > . 0)  (factorial (- x 1))]
-               [else  (raise-argument-error 'gamma "Real, not Zero or Negative-Integer" x)])]
-        [else  (flgamma (fl x))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/hurwitz-zeta.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/hurwitz-zeta.rkt
deleted file mode 100644
index 62d2b95f41..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/hurwitz-zeta.rkt
+++ /dev/null
@@ -1,152 +0,0 @@
-#lang typed/racket/base
-
-;; Computes the Hurwitz zeta function for s >= 1, q >= 0
-;; Maximum observed error is 6 ulps, but is usually <= 2 ulps
-
-(require racket/fixnum
-         "../../flonum.rkt")
-
-(provide hurwitz-zeta flhurwitz-zeta)
-
-(: series-multiplier (Flonum Flonum -> Flonum))
-;; To avoid adding subnormals and to correctly output zero when (hurwitz-zeta s q) is very small,
-;; we compute every series multiplied by a^-s, then multiply the sum by a^s, where a = 
-;; (series-multiplier s q)
-;; a = 1.0 in the majority of the domain, but a < 1.0 near the upper-right curve where
-;; hzeta(s, q) ~ 0.0
-(define (series-multiplier s q)
-  (cond [(q . < . 10.0)  1.0]
-        [else
-         ;; Initial estimate: solve (a*q)^-s = 1e-300 for `a'
-         (define a (flmin 1.0 (fl/ (flexpt 1e-300 (fl/ -1.0 s)) q)))
-         ;; Round to nearest power of 2 so multiplying by `a' will be exact
-         (define pow2 (flmax -1022.0 (flfloor (fl/ (fllog a) (fllog 2.0)))))
-         (flexpt 2.0 pow2)]))
-
-(: flhurwitz-zeta-series (Flonum Flonum Flonum -> Flonum))
-;; Series is accurate when computing no more than about 100 terms
-;; Can be *extremely* slow, so we limit to 50 terms and make sure it doesn't happen
-;; Measured error is <= 2 ulps when i > 50 doesn't happen
-(define (flhurwitz-zeta-series s q a)
-  (* (flexpt a s)
-     (let: loop : Flonum ([i : Flonum  0.0] [y : Flonum  0.0])
-       (define dy (flexpt (* a (fl+ q i)) (- s)))
-       (define new-y (fl+ y dy))
-       (cond [(or (i . > . 50.0)
-                  ((flabs dy) . fl<= . (fl* (fl* 0.5 epsilon.0) new-y))
-                  (not (rational? new-y)))
-              new-y]
-             [else
-              (loop (fl+ i 1.0) new-y)]))))
-
-;; Generated using math/number-theory and math/bigfloat, so that
-;; (flvector-ref B2k/2k!s k) = (fl (/ (bernoulli (* 2 k)) (factorial (* 2 k))))
-(define B2k/2k!s
-  (flvector
-   1.0
-   +0.08333333333333333333333333333333333333346
-   -0.001388888888888888888888888888888888888889
-   +3.306878306878306878306878306878306878300e-5
-   -8.267195767195767195767195767195767195779e-7
-   +2.087675698786809897921009032120143231254e-8
-   -5.284190138687493184847682202179556676918e-10
-   +1.338253653068467883282698097512912327728e-11
-   -3.389680296322582866830195391249442499571e-13
-   +8.586062056277844564135905450425627133953e-15
-   -2.174868698558061873041516423865917899850e-16
-   +5.509002828360229515202652608902254877855e-18
-   -1.395446468581252334070768626406354976390e-19
-   +3.534707039629467471693229977803799214733e-21
-   -8.953517427037546850402611318112741051624e-23
-   +2.267952452337683060310950738868166063219e-24
-   -5.744790668872202445263881987607018399621e-26
-   +1.455172475614864901866264867271329335720e-27
-   -3.685994940665310178181782479908660374450e-29
-   +9.336734257095044672032555152785623295444e-31
-   -2.365022415700629934559635196369838240069e-32
-   +5.990671762482134304659912396819657826456e-34
-   -1.517454884468290261710813135864718931538e-35
-   +3.843758125454188232229445290990232105899e-37
-   -9.736353072646691035267621279250454180943e-39))
-
-(define n 6)
-(define max-k (assert (- (flvector-length B2k/2k!s) 1) index?))
-
-(: flhurwitz-zeta-asym (Flonum Flonum Flonum -> Flonum))
-;; Derived from Euler-MacLaurin with n = 0 and max-k = 1
-;; Measured error is <= 2 ulp for q > 1e5
-(define (flhurwitz-zeta-asym s q a)
-  (define fn (flexpt (* a q) (- s)))
-  (define c0 (flvector-ref B2k/2k!s 1))
-  (define y
-    (cond [(q . fl> . 1e300)
-           (fl+ (fl+ (fl* fn 0.5)
-                     (fl/ (fl* fn q) (fl- s 1.0)))
-                (fl* (fl* fn (fl/ s q)) c0))]
-          [else
-           (fl* fn (fl+ (fl+ 0.5 (fl/ q (fl- s 1.0)))
-                        (fl* (fl/ s q) c0)))]))
-  (fl* (flexpt a s) y))
-
-(: flhurwitz-zeta-euler-maclaurin (Flonum Flonum Flonum -> Flonum))
-(define (flhurwitz-zeta-euler-maclaurin s q a)
-  (define fn (flexpt (* a (fl+ (fl n) q)) (- s)))
-  (define n+q (fl+ (fl n) q))
-  (define sqr-n+q (fl* n+q n+q))
-  ;; Sum finite series part, plus misc terms
-  (define y0
-    (let: loop : Flonum ([y : Flonum  (fl* fn (fl+ (fl/ n+q (fl- s 1.0)) 0.5))]
-                         [k : Nonnegative-Fixnum  0])
-      (cond [(k . fx< . n)
-             (define dy (flexpt (* a (fl+ (fl k) q)) (- s)))
-             (define new-y (fl+ y dy))
-             (cond [((flabs dy) . fl<= . (fl* (fl* 0.5 epsilon.0) (flabs new-y)))  new-y]
-                   [else  (loop new-y (fx+ k 1))])]
-            [else  y])))
-  ;; Sum part of the asymptotic series
-  (define y1
-    (let: loop : Flonum ([y : Flonum  y0]
-                         [t : Flonum  (fl/ (fl* s fn) n+q)]
-                         [k : Nonnegative-Fixnum  0])
-      (cond [(k . fx< . max-k)
-             (define dy (fl* t (flvector-ref B2k/2k!s (fx+ k 1))))
-             (define new-y (fl+ y dy))
-             (cond [((flabs dy) . fl<= . (fl* (fl* 0.5 epsilon.0) (flabs new-y)))
-                    new-y]
-                   [else
-                    (define 2k (fl* 2.0 (fl k)))
-                    (define z (fl* (fl+ s (fl+ 2k 1.0)) (fl+ s (fl+ 2k 2.0))))
-                    (loop new-y
-                          (fl/ (fl* t z) sqr-n+q)
-                          (fx+ k 1))])]
-            [else  y])))
-  (fl* (flexpt a s) y1))
-
-(: flhurwitz-zeta (Flonum Flonum -> Flonum))
-(define (flhurwitz-zeta s q)
-  (cond [(s . fl<= . 1.0)  (if (fl= s 1.0) +inf.0 +nan.0)]
-        [(q . fl<= . 0.0)  (if (fl= q 0.0) +inf.0 +nan.0)]
-        [else
-         (define a (series-multiplier s q))
-         (cond
-           [(fl= 0.0 (flexpt (* a q) (- s)))
-            ;; The scaled leading series term is zero, so all further terms will be zero
-            ;; Therefore, using either method is going to fail to produce anything but 0.0
-            0.0]
-           [(q . fl> . 1e5)
-            ;; Experimentally found threshold
-            (flhurwitz-zeta-asym s q a)]
-           [(s . fl> . (fl+ (fl* 2.0 q) 15.0))
-            ;; Determined experimentally that the series computes fewer total iterations here
-            (flhurwitz-zeta-series s q a)]
-           [else
-            (flhurwitz-zeta-euler-maclaurin s q a)])]))
-
-(: hurwitz-zeta (case-> (Flonum Flonum -> Flonum)
-                        (Real Real -> Real)))
-(define (hurwitz-zeta s q)
-  (cond [(and (exact? s) (s . <= . 1))
-         (raise-argument-error 'hurwitz-zeta "Real > 1" 0 s q)]
-        [(and (exact? q) (q . <= . 0))
-         (raise-argument-error 'hurwitz-zeta "Positive-Real" 1 s q)]
-        [else  (flhurwitz-zeta (fl s) (fl q))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-beta-asym.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-beta-asym.rkt
deleted file mode 100644
index 75ecdd14d9..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-beta-asym.rkt
+++ /dev/null
@@ -1,168 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         "../../flonum.rkt"
-         "../unsafe.rkt"
-         "erf.rkt"
-         "beta.rkt")
-
-(provide fllog-del-ratio flbeta-lower-regularized-asym)
-
-;; This must be even:
-(define num-asym-iters 20)
-
-(define e0 1.12837916709551)  ; 2/sqrt(pi)
-(define e1 .353553390593274)  ; 2^(-3/2)
-(define log-e0 0.120782237635245)
-
-(define c0 .0833333333333333)
-(define c1 -.00277777777760991)
-(define c2 7.9365066682539e-4)
-(define c3 -5.9520293135187e-4)
-(define c4 8.37308034031215e-4)
-(define c5 -.00165322962780713)
-
-(: fllog-del-ratio (Flonum Flonum -> Flonum))
-;; Computes del(a) + del(b) - del(a+b) where del(x) is the polynomial part of Stirling's series for x
-(define (fllog-del-ratio a b)
-  (let ([a  (flmin a b)]
-        [b  (flmax a b)])
-    (define h (fl/ a b))
-    (define c (fl/ h (fl+ h 1.0)))
-    (define x (fl/ 1.0 (fl+ h 1.0)))
-    (define x2 (fl* x x))
-    
-    ;; sn = (1-x^n)/(1-x)
-    (define s3 (fl+ (fl+ x x2) 1.0))
-    (define s5 (fl+ (fl+ x (fl* x2 s3)) 1.0))
-    (define s7 (fl+ (fl+ x (fl* x2 s5)) 1.0))
-    (define s9 (fl+ (fl+ x (fl* x2 s7)) 1.0))
-    (define s11 (fl+ (fl+ x (fl* x2 s9)) 1.0))
-    
-    ;; w = del(b) - del(a+b)
-    (define 1/b (fl/ 1.0 b))
-    (define w
-      (fl* ((make-flpolyfun
-             (c0 (fl* c1 s3) (fl* c2 s5) (fl* c3 s7) (fl* c4 s9) (fl* c5 s11)))
-            (fl* 1/b 1/b))
-           (fl/ c b)))
-    
-    ;; del(a) + w
-    (define 1/a (fl/ 1.0 a))
-    (fl+ w (fl/ ((make-flpolyfun (c0 c1 c2 c3 c4 c5))
-                 (fl* 1/a 1/a))
-                a))))
-
-(: make-thread-local-flvector (Integer -> (-> FlVector)))
-(define (make-thread-local-flvector dims)
-  (let: ([val : (Thread-Cellof (U #f FlVector)) (make-thread-cell #f)])
-    (λ () (or (thread-cell-ref val)
-              (let: ([v : FlVector  (make-flvector dims)])
-                (thread-cell-set! val v)
-                v)))))
-
-(define thread-local-as (make-thread-local-flvector (+ num-asym-iters 1)))
-(define thread-local-bs (make-thread-local-flvector (+ num-asym-iters 1)))
-(define thread-local-cs (make-thread-local-flvector (+ num-asym-iters 1)))
-(define thread-local-ds (make-thread-local-flvector (+ num-asym-iters 1)))
-
-(: flbeta-lower-regularized-asym (Flonum Flonum Flonum Any -> Flonum))
-(define (flbeta-lower-regularized-asym a b l log?)
-  (define f (fl+ (fl* a (- (fllog1pmx (- (fl/ l a)))))
-                 (fl* b (- (fllog1pmx (fl/ l b))))))
-  (cond [(and (not log?) (fl= 0.0 (flexp (- f))))  0.0]
-        [else  (flbeta-lower-regularized-asym/f a b f log?)]))
-
-(: flbeta-lower-regularized-asym/f (Flonum Flonum Flonum Any -> Flonum))
-(define (flbeta-lower-regularized-asym/f a b f log?)
-  (define as (thread-local-as))
-  (define bs (thread-local-bs))
-  (define cs (thread-local-cs))
-  (define ds (thread-local-ds))
-  
-  (define z0 (flsqrt f))
-  (define z (fl* 0.5 (fl/ z0 e1)))
-  (define z2 (fl* 2.0 f))
-  
-  (define-values (h r0 r1 w0)
-    (cond [(a . fl< . b)
-           (let* ([h   (fl/ a b)]
-                  [r0  (fl/ 1.0 (fl+ h 1.0))]
-                  [r1  (fl/ (fl- b a) b)]
-                  [w0  (fl/ 1.0 (flsqrt (fl* a (fl+ h 1.0))))])
-             (values h r0 r1 w0))]
-          [else
-           (let* ([h   (fl/ b a)]
-                  [r0  (fl/ 1.0 (fl+ h 1.0))]
-                  [r1  (fl/ (fl- b a) a)]
-                  [w0  (fl/ 1.0 (flsqrt (fl* b (fl+ h 1.0))))])
-             (values h r0 r1 w0))]))
-  
-  (define a0 (fl* r1 #i2/3))
-  (define c0 (fl* -0.5 a0))
-  (define d0 (- c0))
-  
-  (unsafe-flvector-set! as 0 a0)
-  (unsafe-flvector-set! bs 0 0.0)
-  (unsafe-flvector-set! cs 0 c0)
-  (unsafe-flvector-set! ds 0 d0)
-  
-  (define j0 (fl* (fl/ 0.5 e0) (flerfc*expsqr z0)))
-  (define h^2 (fl* h h))
-  
-  (define: sum : Flonum
-    (let: loop : Flonum ([sum : Flonum  (fl+ j0 (fl* (fl* d0 w0) e1))]
-                         [s : Flonum  1.0]
-                         [hn : Flonum  1.0]
-                         [j0 : Flonum  j0]
-                         [j1 : Flonum  e1]
-                         [znm1 : Flonum  z]
-                         [zn : Flonum  z2]
-                         [w : Flonum  w0]
-                         [n : Positive-Fixnum  1])
-      (cond [(n . fx< . num-asym-iters)
-             (define new-hn (fl* h^2 hn))
-             (define new-s (fl+ s new-hn))
-             (unsafe-flvector-set! as n (fl/ (fl* (fl* r0 2.0) (fl+ (fl* h new-hn) 1.0))
-                                             (+ n 3.0)))
-             (unsafe-flvector-set! as (fx+ n 1) (fl/ (fl* (fl* r1 2.0) new-s) (+ n 4.0)))
-             
-             (for ([i  (in-range n (fx+ n 2))])
-               (define r (fl* -0.5 (+ i 2.0)))
-               (unsafe-flvector-set! bs 0 (fl* r a0))
-               (for ([m  (in-range 1 (fx+ i 1))])
-                 (define bsum
-                   (for/fold: ([bsum : Flonum  0.0]) ([j  (in-range 0 m)])
-                     (define mmj (- m j))
-                     (fl+ bsum (fl* (fl* (- (fl* (+ j 1.0) r) mmj)
-                                         (unsafe-flvector-ref as j))
-                                    (unsafe-flvector-ref bs (fx- mmj 1))))))
-                 (unsafe-flvector-set! bs m (fl+ (fl* r (unsafe-flvector-ref as m))
-                                                 (fl/ bsum (+ m 1.0)))))
-               (unsafe-flvector-set! cs i (fl/ (unsafe-flvector-ref bs i)
-                                               (+ i 2.0)))
-               
-               (define dsum
-                 (for/fold: ([dsum : Flonum  0.0]) ([j  (in-range 0 i)])
-                   (fl+ dsum (fl* (unsafe-flvector-ref ds (fx- (fx- i j) 1))
-                                  (unsafe-flvector-ref cs j)))))
-               (unsafe-flvector-set! ds i (- (fl+ dsum (unsafe-flvector-ref cs i)))))
-             
-             (let* ([j0  (fl+ (fl* e1 znm1) (* n j0))]
-                    [j1  (fl+ (fl* e1 zn) (fl* (+ n 1.0) j1))]
-                    [znm1  (fl* z2 znm1)]
-                    [zn  (fl* z2 zn)]
-                    [w  (fl* w0 w)]
-                    [t0  (fl* (fl* (unsafe-flvector-ref ds n) w) j0)]
-                    [w  (fl* w0 w)]
-                    [t1  (fl* (fl* (unsafe-flvector-ref ds (+ n 1)) w) j1)]
-                    [sum  (fl+ sum (fl+ t0 t1))])
-               (cond [((fl+ (flabs t0) (flabs t1)) . fl<= . (* epsilon.0 sum))  sum]
-                     [else
-                      (loop sum new-s new-hn j0 j1 znm1 zn w (fx+ n 2))]))]
-            [else  sum])))
-  
-  (cond [log?  (flsum (list log-e0 (- f) (- (fllog-del-ratio a b)) (fllog sum)))]
-        [else  (fl* (fl* (fl* e0 (flexp (- f)))
-                         (flexp (- (fllog-del-ratio a b))))
-                    sum)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-beta.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-beta.rkt
deleted file mode 100644
index edd73866ee..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-beta.rkt
+++ /dev/null
@@ -1,259 +0,0 @@
-#lang typed/racket/base
-
-#|
-Limited-domain hypergeometric implementations from:
-
-John Pearson.
-Computation of Hypergeometric Functions.
-
-
-Continued fraction and asymptotic expansion from:
-
-Armido R Didonato and Alfred H Morris Jr.
-Algorithm 708: Significant Digit Computation of the Incomplete Beta Function Ratios.
-ACM Transactions on Mathematical Software, 1992, vol 18, no 3, pp 360--373.
-|#
-
-(require (only-in racket/math exact-ceiling)
-         "../../flonum.rkt"
-         "incomplete-beta-asym.rkt"
-         "beta.rkt"
-         "continued-fraction.rkt"
-         "lanczos.rkt")
-
-(provide fllog-beta-inc
-         flbeta-inc
-         log-beta-inc
-         beta-inc)
-
-(: hypergeom-fac (Flonum Flonum Flonum -> Flonum))
-;; Returns the adjustment to the hypergeometric series coefficient at n = 20
-;; If this is < 0.5, the series would converge in < 50 iterations or so
-(define (hypergeom-fac a b x)
-  (define a+b (fl+ a b))
-  (define a+1 (fl+ a 1.0))
-  (fl* (fl/ (fl+ a+b 20.0) (fl+ a+1 20.0)) x))
-
-;; ===================================================================================================
-
-(: use-asym? (Flonum Flonum Flonum Flonum -> Boolean))
-(define (use-asym? a b x y)
-  (define p (fl/ a (fl+ a b)))
-  (define q (fl/ b (fl+ a b)))
-  (or (and (100.0 . fl< . a) (a . fl<= . b) (x . fl>= . (fl* 0.97 p)))
-      (and (100.0 . fl< . b) (b . fl< . a) (y . fl<= . (fl* 1.03 q)))))
-
-(: in-bounds? (Flonum Flonum Flonum -> Boolean))
-(define (in-bounds? a b x)
-  (and (x . fl> . 0.0) (x . fl< . 1.0) 
-       (a . fl> . 0.0) (a . fl< . +inf.0)
-       (b . fl> . 0.0) (b . fl< . +inf.0)))
-
-(: get-large-params
-   (Flonum Flonum Flonum Flonum Flonum Flonum Any
-           -> (Values Flonum Flonum Flonum Flonum Flonum Flonum Flonum Any)))
-(define (get-large-params a b x y log-x log-y 1-?)
-  (define l
-    (let ([a  (inexact->exact a)]
-          [b  (inexact->exact b)]
-          [x  (inexact->exact x)])
-      (exact->inexact (- a (* (+ a b) x)))))
-  (if (l . fl< . 0.0)
-      (values b a y x log-y log-x (- l) (not 1-?))
-      (values a b x y log-x log-y l 1-?)))
-
-(: get-hypergeom-params
-   (Flonum Flonum Flonum Flonum Flonum Flonum Any
-           -> (Values Flonum Flonum Flonum Flonum Flonum Flonum Any)))
-(define (get-hypergeom-params a b x y log-x log-y 1-?)
-  (if ((hypergeom-fac b a y) . fl< . (hypergeom-fac a b x))
-      (values b a y x log-y log-x (not 1-?))
-      (values a b x y log-x log-y 1-?)))
-
-(: maybe1- (Flonum Any Any -> Flonum))
-(define (maybe1- z log? 1-?)
-  (cond [1-?  (if log? (lg1- z) (fl- 1.0 z))]
-        [else  z]))
-
-;; ===================================================================================================
-
-(: flbeta-regularized-const-beta (Flonum Flonum Flonum Flonum Any -> Flonum))
-(define (flbeta-regularized-const-beta a b log-x log-y log?)
-  (define log-t (flsum (list (* a log-x) (* b log-y) (- (fllog-beta a b)))))
-  (if log? log-t (flexp log-t)))
-
-(: flbeta-regularized-const-lanczos (Flonum Flonum Flonum Flonum Flonum Flonum Any
-                                                  -> Flonum))
-(define (flbeta-regularized-const-lanczos a b x y log-x log-y log?)
-  (define g (fl- lanczos-g 0.5))
-  (define a+g (fl+ a g))
-  (define b+g (fl+ b g))
-  (define c+g (fl+ (fl+ a b) g))
-  (define log-t0  ;; = (log (/ (* x c+g) a+g))
-    (let ([t0  (fl/ (fl* x c+g) a+g)])
-      (cond [(t0 . fl<= . +max-subnormal.0)  (flsum (list log-x (fllog c+g) (- (fllog a+g))))]
-            [(t0 . fl<= . 0.75)  (fllog t0)]
-            [else  (define x-rem (fl- (fl- 1.0 x) y))
-                   (define-values (c0 c1) (fl*/error c+g x))
-                   (fllog1p (fl/ (fl+ (- c0 a+g) (fl+ (fl* c+g x-rem) c1)) a+g))])))
-  (define log-t1  ;; = (log (/ (* y c+g) b+g))
-    (let ([t1  (fl/ (fl* y c+g) b+g)])
-      (cond [(t1 . fl<= . +max-subnormal.0)  (flsum (list log-y (fllog c+g) (- (fllog b+g))))]
-            [(t1 . fl<= . 0.75)  (fllog t1)]
-            [else  (define y-rem (fl- (fl- 1.0 y) x))
-                   (define-values (c0 c1) (fl*/error c+g y))
-                   (fllog1p (fl/ (fl+ (fl- c0 b+g) (fl+ (fl* c+g y-rem) c1)) b+g))])))
-  (define log-t2
-    (let ([t2  (fl/ (fl* a+g b+g) c+g)])
-      (cond [(and (t2 . fl> . +max-subnormal.0) (t2 . fl< . +inf.0))  (fl* 0.5 (fllog t2))]
-            [else  (fl* 0.5 (flsum (list (fllog a+g) (fllog b+g) (- (fllog c+g)))))])))
-  (define t4 (fl/ (fl/ (lanczos-sum (fl+ a b)) (lanczos-sum a)) (lanczos-sum b)))
-  (define log-t (flsum (list (fl* a log-t0) (fl* b log-t1) log-t2 g (fllog t4))))
-  (if log? log-t (flexp log-t)))
-
-(: flbeta-regularized-const (Flonum Flonum Flonum Flonum Flonum Flonum Any -> Flonum))
-(define (flbeta-regularized-const a b x y log-x log-y log?)
-  (cond [(and (a . fl> . 1.0) (b . fl> . 1.0)
-              ((fl/ (flmax a b) (flmin a b)) . fl< . 100.0))
-         (flbeta-regularized-const-lanczos a b x y log-x log-y log?)]
-        [else
-         (flbeta-regularized-const-beta a b log-x log-y log?)]))
-
-(: flbeta-regularized-frac (Flonum Flonum Flonum Flonum Flonum Flonum Flonum Any -> Flonum))
-;; Didonato and Morris's continued fraction
-(define (flbeta-regularized-frac a b x y log-x log-y l log?)
-  (define-values (s t)
-    (continued-fraction-parts
-     1.0
-     (λ: ([n : Flonum] [s : Flonum])
-       (let ([a+n-1  (fl+ a (fl- n 1.0))]
-             [a+2n-1  (fl+ a (fl- (fl* 2.0 n) 1.0))]
-             [a+b+n-1  (fl+ (fl+ a b) (fl- n 1.0))])
-         (fl/ (fl* (fl* (fl* (fl* (fl* a+n-1 a+b+n-1) n) (fl- b n)) x) x)
-              (fl* a+2n-1 a+2n-1))))
-     (fl* (fl/ a (fl+ a 1.0)) (fl+ l 1.0))
-     (λ: ([n : Flonum] [t : Flonum])
-       (let ([a+2n  (fl+ a (fl* 2.0 n))])
-         (fl+ (fl+ (fl/ (fl* (fl* n (fl- b n)) x)
-                        (fl+ a+2n -1.0))
-                   (fl* (fl/ (fl+ a n) (fl+ a+2n 1.0))
-                        (fl+ (fl+ l 1.0) (fl* n (fl+ 1.0 y)))))
-              n)))
-     (fl* 0.5 epsilon.0)))
-  (cond [log?  (fl+ (flbeta-regularized-const a b x y log-x log-y #t)
-                    (fllog-quotient s t))]
-        [else  (fl* (flbeta-regularized-const a b x y log-x log-y #f)
-                    (fl/ s t))]))
-
-(: flbeta-regularized-hypergeom (Flonum Flonum Flonum Flonum Flonum Flonum Any -> Flonum))
-;; Computes lower incomplete beta using the hypergeometric series
-(define (flbeta-regularized-hypergeom a b x y log-x log-y log?)
-  (define a+b (fl+ a b))
-  (define a+1 (fl+ a 1.0))
-  (define: z : Flonum
-    (let loop ([z 0.0] [dz 1.0] [n 0.0] [i -1.0])
-      ;(printf "dz = ~v  i = ~v~n" dz i)
-      (define new-dz (fl* (fl* dz (fl/ (fl+ a+b n) (fl+ a+1 n))) x))
-      (cond [(zero? i)  (fl+ z new-dz)]
-            [else
-             (let ([i  (if (and (i . fl< . 0.0)
-                                ((flabs new-dz) . fl<= . (flabs dz))
-                                ((flabs new-dz) . fl<= . (fl* (fl* 0.5 epsilon.0) (flabs z))))
-                           3.0
-                           (fl- i 1.0))])
-               (loop (fl+ z new-dz) new-dz (fl+ n 1.0) i))])))
-  (cond [log?  (flsum (list (flbeta-regularized-const a b x y log-x log-y #t)
-                            (- (fllog a))
-                            (fllog1p z)))]
-        [else  (define c (flbeta-regularized-const a b x y log-x log-y #f))
-               (fl/ (fl+ c (fl* z c)) a)]))
-
-(: flbeta-regularized-limits (Flonum Flonum Flonum -> Flonum))
-(define (flbeta-regularized-limits a b x)
-  (cond [(or (x . fl< . 0.0) (x . fl> . 1.0)
-             (a . fl< . 0.0) (b . fl< . 0.0)
-             (and (fl= a 0.0) (fl= b 0.0))
-             (and (fl= a +inf.0) (fl= b +inf.0)))
-         +nan.0]
-        [(fl= x 1.0)  1.0]
-        [(fl= a +inf.0)  0.0]
-        [(fl= b +inf.0)  1.0]
-        [(fl= a 0.0)  1.0]
-        [(fl= b 0.0)  0.0]
-        [(fl= x 0.0)  0.0]
-        [else  +nan.0]))
-
-;; ===================================================================================================
-;; Main driver
-
-(define: alg : Integer  0)
-(define (get-alg) alg)
-
-(: flbeta-regularized (Flonum Flonum Flonum Any Any -> Flonum))
-(define (flbeta-regularized a b x log? 1-?)
-  (define y (fl- 1.0 x))
-  (define log-x (fllog x))
-  (define log-y (fllog1p (- x)))
-  (cond
-    [(not (in-bounds? a b x))
-     (set! alg 0)
-     (define z (flbeta-regularized-limits a b x))
-     (maybe1- (if log? (fllog z) z)
-              log? 1-?)]
-    [(and (a . fl< . 1.0) (b . fl< . 1.0))
-     (let-values ([(a b x y log-x log-y 1-?)
-                   (get-hypergeom-params a b x y log-x log-y 1-?)])
-       (set! alg 2)
-       (maybe1- (flbeta-regularized-hypergeom a b x y log-x log-y log?)
-                log? 1-?))]
-    [((hypergeom-fac a b x) . fl< . 0.75)
-     (set! alg 2)
-     (maybe1- (flbeta-regularized-hypergeom a b x y log-x log-y log?)
-              log? 1-?)]
-    [((hypergeom-fac b a y) . fl< . 0.75)
-     (set! alg 2)
-     (maybe1- (flbeta-regularized-hypergeom b a y x log-y log-x log?)
-              log? (not 1-?))]
-    [else
-     (let-values ([(a b x y log-x log-y l 1-?)
-                   (get-large-params a b x y log-x log-y 1-?)])
-       (define z
-         (cond [(use-asym? a b x y)
-                (set! alg 4)
-                (flbeta-lower-regularized-asym a b l log?)]
-               [else
-                (set! alg 3)
-                (flbeta-regularized-frac a b x y log-x log-y l log?)]))
-       (maybe1- z log? 1-?))]))
-
-;; ===================================================================================================
-;; User-facing functions
-
-(: fllog-beta-inc (Flonum Flonum Flonum Any Any -> Flonum))
-(define (fllog-beta-inc a b x upper? regularized?)
-  (define z (flbeta-regularized a b x #t upper?))
-  (cond [regularized?  z]
-        [else  (fl+ z (fllog-beta a b))]))
-
-(: flbeta-inc (Flonum Flonum Flonum Any Any -> Flonum))
-(define (flbeta-inc a b x upper? regularized?)
-  (define z (flbeta-regularized a b x #f upper?))
-  (cond [regularized?  z]
-        [else  (fl* z (flbeta a b))]))
-
-(define-syntax-rule (define-incomplete-beta-wrapper name flname)
-  (begin
-    (: name (case-> (Real Real Real -> Float)
-                    (Real Real Real Any -> Float)
-                    (Real Real Real Any Any -> Float)))
-    (define (name a b x [upper? #f] [regularized? #f])
-      (cond [(and (exact? a) (a . <= . 0))
-             (raise-argument-error 'name "Positive-Real" 0 a b x)]
-            [(and (exact? b) (b . <= . 0))
-             (raise-argument-error 'name "Positive-Real" 1 a b x)]
-            [(and (exact? x) (or (x . < . 0) (x . > . 1)))
-             (raise-argument-error 'name "Nonnegative-Real <= 1" 2 a b x)]
-            [else  (flname (fl a) (fl b) (fl x) upper? regularized?)]))))
-
-(define-incomplete-beta-wrapper beta-inc flbeta-inc)
-(define-incomplete-beta-wrapper log-beta-inc fllog-beta-inc)
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma.rkt
deleted file mode 100644
index 350a3bfe31..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma.rkt
+++ /dev/null
@@ -1,279 +0,0 @@
-#lang typed/racket/base
-
-#|
-Algorithms taken from:
-
-N M Temme. A Set of Algorithms for the Incomplete Gamma Functions.
-Probability in the Engineering and Informational Sciences, 1994, vol. 8, pp. 291--307.
-
-For certain algorithms for a few subdomains of RxR, the above paper references this one:
-
-W Gautschi. A Computational Procedure for Incomplete Gamma Functions.
-ACM Transactions on Mathematical Software, 1979, vol. 5, pp. 466--481.
-
-This implementation extends those in the papers in three ways:
-
- * Results are much more accurate, usually with relative error less than 100 ulps
-
- * Log-space results.
- 
- * The functions return sensible rational answers on the largest domain possible.
-|#
-
-(require "../../flonum.rkt"
-         "gamma.rkt"
-         "log-gamma.rkt"
-         "incomplete-gamma/gamma-lower-series.rkt"
-         "incomplete-gamma/gamma-upper-frac.rkt"
-         "incomplete-gamma/gamma-normal.rkt"
-         "incomplete-gamma/gamma-gautschi.rkt"
-         "incomplete-gamma/gamma-temme.rkt"
-         "incomplete-gamma/gamma-utils.rkt")
-
-(provide fllog-gamma-inc
-         flgamma-inc
-         log-gamma-inc
-         gamma-inc)
-
-(define: alg : (U 'normal 'temme 'gautschi 'series 'frac #f) #f)
-(define (get-alg) alg)
-
-(define temme-upper-thresh (make-parameter 2.0))
-(define temme-lower-thresh (make-parameter 6.0))
-
-(: use-log-normal? (Float Float Any -> Boolean))
-;; Determines whether to use the normal cdf approximation
-(define (use-log-normal? k x upper?)
-  (and (k . fl> . 1e10)
-       (or (if upper? (x . fl< . k) (x . fl> . k))
-           (k . fl> . 1e32))))
-
-(: use-temme? (Float Float -> Boolean))
-;; Determines whether to use Temme's series; i.e. returns #t when k and x are close
-(define (use-temme? k x)
-  (and (k . fl> . 10.0)
-       (or (and (x . fl>= . k)
-                ((fl/ (flabs (fl- x k)) k) . fl< . (temme-upper-thresh)))
-           (and (x . fl< . k)
-                ((fl/ (flabs (fl- x k)) x) . fl< . (temme-lower-thresh))))))
-
-;; ===================================================================================================
-;; Argument reductions
-
-(: flgamma-lower-reduction-sum (Float Float Float -> Float))
-(define (flgamma-lower-reduction-sum k x n)
-  (let loop ([y  0.0] [dy  1.0] [i  0.0])
-    ;(printf "dy = ~v~n" dy) 
-    (define new-y (fl+ y dy))
-    (cond [(or (i . >= . n)
-               (not (rational? new-y))
-               ((flabs dy) . fl<= . (flabs (fl* epsilon.0 new-y))))
-           y]
-          [else
-           (loop new-y (fl* dy (fl/ x (fl+ k (fl+ 1.0 i)))) (+ i 1.0))])))
-
-(: flgamma-upper-reduction-sum (Float Float Float -> Float))
-(define (flgamma-upper-reduction-sum k x n)
-  (let loop ([y  0.0] [dy  1.0] [i  0.0])
-    ;(printf "dy = ~v~n" dy) 
-    (define new-y (fl+ y dy))
-    (cond [(or (i . >= . n)
-               (not (rational? new-y))
-               ((flabs dy) . fl<= . (flabs (fl* epsilon.0 new-y))))
-           y]
-          [else
-           (loop new-y (fl* dy (fl/ (fl- k (fl+ 1.0 i)) x)) (+ i 1.0))])))
-
-;; ===================================================================================================
-;; Regularized incomplete gamma functions
-
-(: flgamma-in-bounds? (Flonum Flonum -> Boolean))
-(define (flgamma-in-bounds? k x)
-  (and (k . fl> . 0.0) (k . fl< . +inf.0) (x . fl> . 0.0) (x . fl< . +inf.0)))
-
-(: flgamma-lower-limits (Flonum Flonum -> Flonum))
-(define (flgamma-lower-limits k x)
-  (cond [(or (k . fl< . 0.0) (x . fl< . 0.0))  +nan.0]
-        ;; k = +inf.0: a step function with the step "at infinity"
-        [(fl= k +inf.0)  (if (fl= x +inf.0) 1.0 0.0)]
-        ;; k = 0.0: a step function with the step at 0.0
-        [(fl= k 0.0)  1.0]
-        [(fl= x 0.0)  0.0]
-        [(fl= x +inf.0)  1.0]
-        ;; k is +nan.0 and x is +nan.0
-        [else  +nan.0]))
-
-(: flgamma-lower-regularized* (Flonum Flonum -> Flonum))
-(define (flgamma-lower-regularized* k x)
-  (cond [(k . fl< . 1e-20)  1.0]
-        [(or (k . < . 150.0) (x . < . 150.0))
-         ;; When k and x are small enough, use reliable and accurate series and continued fraction
-         ;; Could do this on a larger domain, but the number of iterations for both would be very
-         ;; large when k ~ x
-         (cond [(or (x . < . 2.0)
-                    (and (k . < . 4.0) (k . >= . (- x (flsqrt k))))
-                    (and (k . >= . 4.0) (k . >= . x)))
-                (set! alg 'series)
-                (flgamma-lower-series k x)]
-               [else
-                (set! alg 'frac)
-                (- 1.0 (flgamma-upper-frac k x))])]
-        [(k . fl> . (* 1.75 x))
-         (set! alg 'series)
-         (flgamma-lower-series k x)]
-        [(and (k . fl< . 1e17) ((- x k) . > . (* 5.0 (flsqrt k))))
-         (set! alg 'frac)
-         (- 1.0 (flgamma-upper-frac k x))]
-        [(or (and (k . < . x) (k . fl> . 1e26))
-             (and (k . >= . x) (k . fl> . 1e29)))
-         (set! alg 'normal)
-         (flgamma-normal k x #f #f)]
-        [else
-         (set! alg 'temme)
-         (flgamma-temme k x #f)]))
-
-(: flgamma-lower-regularized (Float Float -> Float))
-(define (flgamma-lower-regularized k x)
-  (set! alg #f)
-  (cond [(not (flgamma-in-bounds? k x))  (flgamma-lower-limits k x)]
-        [(and (k . > . 15.0)
-              (k . > . x)
-              (k . <= . (* 1.75 x)))
-         ;; Argument "reduction"; cap at 100 extra iterations `n' because it would be effectively
-         ;; unbounded otherwise (we lose accuracy for bounding this)
-         ;; For some reason, even when k+n,x is in a bad spot, this still helps a lot
-         (define n (flmin 100.0 (flfloor (flsqrt (max 0.0 (fl- (fl* 2.0 x) k))))))
-         (fl+ (flgamma-lower-regularized* (fl+ k n) x)
-              (fl* (flgamma-series-const k x)
-                   (flgamma-lower-reduction-sum k x n)))]
-        [else
-         (flgamma-lower-regularized* k x)]))
-
-(: flgamma-upper-regularized* (Flonum Flonum -> Flonum))
-(define (flgamma-upper-regularized* k x)
-  (cond [(and (k . < . 1.0) (x . < . 1.75))
-         (set! alg 'gautschi)
-         (flgamma-upper-gautschi k x #f)]
-        [(or (k . < . 150.0) (x . < . 150.0))
-         (cond [(k . >= . x)
-                (set! alg 'series)
-                (- 1.0 (flgamma-lower-series k x))]
-               [else
-                (set! alg 'frac)
-                (flgamma-upper-frac k x)])]
-        [(k . fl> . (* 1.75 x))
-         (set! alg 'series)
-         (fl- 1.0 (flgamma-lower-series k x))]
-        [(and (k . fl< . 1e17) ((- x k) . > . (* 2.0 (flsqrt k))))
-         (set! alg 'frac)
-         (flgamma-upper-frac k x)]
-        [(or (and (k . < . x) (k . fl> . 1e29))
-             (and (k . >= . x) (k . fl> . 1e26)))
-         (set! alg 'normal)
-         (flgamma-normal k x #f #t)]
-        [else
-         (set! alg 'temme)
-         (flgamma-temme k x #t)]))
-
-(: flgamma-upper-regularized (Float Float -> Float))
-(define (flgamma-upper-regularized k x)
-  (set! alg #f)
-  (cond [(not (flgamma-in-bounds? k x))  (- 1.0 (flgamma-lower-limits k x))]
-        [(and (k . > . 15.0)
-              (k . < . x)
-              (k . > . (* 0.5 x)))
-         (define n (flmin 100.0 (flfloor (flsqrt (max 0.0 (fl- (fl* 2.0 k) x))))))
-         (fl+ (flgamma-upper-regularized* (fl- k n) x)
-              (fl* (/ (flgamma-upper-const k x) x)
-                   (flgamma-upper-reduction-sum k x n)))]
-        [else
-         (flgamma-upper-regularized* k x)]))
-
-(: fllog-gamma-lower-regularized (Float Float -> Float))
-(define (fllog-gamma-lower-regularized k x)
-  (set! alg #f)
-  (cond [(not (flgamma-in-bounds? k x))  (fllog (flgamma-lower-limits k x))]
-        [(and (k . < . 1.0) (x . < . 1.75))
-         (set! alg 'gautschi)
-         (flgamma-lower-gautschi k x #t)]
-        [(and (k . >= . x) (> (fl+ (fl* k (fl- (fllog x) (fllog k))) (fl- k x))
-                              (fllog +max-subnormal.0)))
-         (fllog (flgamma-lower-regularized k x))]
-        [(and (k . < . x) (> (fl+ (fl* k (fl- (fllog x) (fllog k))) (fl- k x))
-                             (fllog +max-subnormal.0)))
-         (fllog1p (- (flgamma-upper-regularized k x)))]
-        [(k . fl> . (* 1.75 x))
-         (set! alg 'series)
-         (fllog-gamma-lower-series k x)]
-        [(and (k . fl< . 1e17) (k . < . x))
-         (set! alg 'frac)
-         (fllog1p (- (flgamma-upper-frac k x)))]
-        [(use-log-normal? k x #f)
-         (set! alg 'normal)
-         (flgamma-normal k x #t #f)]
-        [else
-         (set! alg 'temme)
-         (fllog-gamma-temme k x #f)]))
-
-(: fllog-gamma-upper-regularized (Float Float -> Float))
-(define (fllog-gamma-upper-regularized k x)
-  (set! alg #f)
-  (cond [(not (flgamma-in-bounds? k x))  (fllog (- 1.0 (flgamma-lower-limits k x)))]
-        [(or (and (k . fl>= . 1.0) ((fl/ x k) . fl> . 1e19))
-             (and (k . fl< . 1.0) (x . fl> . 1e19)))
-         (- x)]
-        [(and (k . < . 1.0) (x . < . 1.75))
-         (set! alg 'gautschi)
-         (flgamma-upper-gautschi k x #t)]
-        [(and (k . < . x) (> (fl+ (fl* k (fl- (fllog x) (fllog k))) (fl- k x))
-                             (fllog +max-subnormal.0)))
-         (fllog (flgamma-upper-regularized k x))]
-        [(and (k . >= . x) (> (fl+ (fl* k (fl- (fllog x) (fllog k))) (fl- k x))
-                              (fllog +max-subnormal.0)))
-         (fllog1p (- (flgamma-lower-regularized k x)))]
-        [(k . fl> . (* 1.75 x))
-         (set! alg 'series)
-         (fllog1p (- (flgamma-lower-series k x)))]
-        [(and (k . fl< . 1e17) (k . < . x))
-         (set! alg 'frac)
-         (fllog-gamma-upper-frac k x)]
-        [(use-log-normal? k x #t)
-         (set! alg 'normal)
-         (flgamma-normal k x #t #t)]
-        [else
-         (set! alg 'temme)
-         (fllog-gamma-temme k x #t)]))
-
-;; ===================================================================================================
-;; User-facing gamma functions
-
-(: fllog-gamma-inc (Float Float Any Any -> Float))
-(define (fllog-gamma-inc k x upper? regularized?)
-  (define z
-    (cond [upper?  (fllog-gamma-upper-regularized k x)]
-          [else    (fllog-gamma-lower-regularized k x)]))
-  (cond [regularized?  z]
-        [else  (fl+ z (fllog-gamma k))]))
-
-(: flgamma-inc (Float Float Any Any -> Float))
-(define (flgamma-inc k x upper? regularized?)
-  (define z
-    (cond [upper?  (flgamma-upper-regularized k x)]
-          [else    (flgamma-lower-regularized k x)]))
-  (cond [regularized?  z]
-        [else  (fl* z (flgamma k))]))
-
-(define-syntax-rule (define-incomplete-gamma-wrapper name flname)
-  (begin
-    (: name (case-> (Real Real -> Float)
-                    (Real Real Any -> Float)
-                    (Real Real Any Any -> Float)))
-    (define (name k x [upper? #f] [regularized? #f])
-      (cond [(and (exact? k) (k . <= . 0))
-             (raise-argument-error 'name "Positive-Real" 0 k x)]
-            [(and (exact? x) (x . < . 0))
-             (raise-argument-error 'name "Nonnegative-Real" 1 k x)]
-            [else  (flname (fl k) (fl x) upper? regularized?)]))))
-
-(define-incomplete-gamma-wrapper gamma-inc flgamma-inc)
-(define-incomplete-gamma-wrapper log-gamma-inc fllog-gamma-inc)
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-gautschi.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-gautschi.rkt
deleted file mode 100644
index 09317ce158..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-gautschi.rkt
+++ /dev/null
@@ -1,157 +0,0 @@
-#lang typed/racket/base
-
-;; Gautschi's algorithm (as presented by Temme) for the regularized upper gamma for x < 1
-
-(require "../../../flonum.rkt"
-         "../../../base.rkt"
-         "../../polynomial/chebyshev.rkt"
-         "../gamma.rkt"
-         "../log-gamma.rkt"
-         "../stirling-error.rkt"
-         "gamma-utils.rkt")
-
-(provide flgamma-upper-gautschi flgamma-lower-gautschi)
-
-(: fl1-1/gamma1p-taylor-0 (Float -> Float))
-(define (fl1-1/gamma1p-taylor-0 x)
-  (fl* x ((make-flpolyfun
-           (-5.7721566490153286060651209008240243104215933593992e-1
-            +6.5587807152025388107701951514539048127976638047858e-1
-            +4.2002635034095235529003934875429818711394500401104e-2
-            -1.6653861138229148950170079510210523571778150224717e-1
-            +4.219773455554433674820830128918739130165268418982e-2
-            +9.6219715278769735621149216723481989753629422521117e-3
-            -7.2189432466630995423950103404465727099048008802391e-3
-            +1.1651675918590651121139710840183886668093337953828e-3
-            +2.1524167411495097281572996305364780647824192337778e-4
-            -1.2805028238811618615319862632816432339489209969465e-4
-            +2.0134854780788238655689391421021818382294833296229e-5
-            +1.2504934821426706573453594738330922423226556201567e-6
-            -1.1330272319816958823741296203307449433240048389228e-6
-            +2.0563384169776071034501541300205728365125790182239e-7
-            -6.1160951044814158178624986828553428672758673305935e-9))
-          x)))
-
-(: fl1-1/gamma1p-taylor-1 (Float -> Float))
-(define (fl1-1/gamma1p-taylor-1 x)
-  (fl* (fl- x 1.0)
-       ((make-flpolyfun
-         (+4.2278433509846713939348790991759756895784066406008e-1
-          +2.3309373642178674168353160522779291232192571641851e-1
-          -1.910911013876915061545276703523630936105312160174e-1
-          +2.4552490005400016652826875250257857892749713770226e-2
-          +1.7645244550144320095381426038929533408902970419595e-2
-          -8.0232730222673465332665043665813344335400281674833e-3
-          +8.0432977560424699087149402613476172363522728724358e-4
-          +3.6083781625481812124247705788362694317410650813711e-4
-          -1.4559614213986714842674709482997913669586458476042e-4
-          +1.7545859751750962273548468501814813300972485066968e-5
-          +2.5889950290372763821409229192070050813223482271545e-6
-          -1.3385015468946057247955634453739128389996926090334e-6
-          +2.0547431491290984242143382504316789567568776464973e-7
-          +1.5952678485086792358158795888938797557013266594503e-10
-          -6.2756218893322837414440866417447308428460020476605e-9))
-        (fl- x 1.0))))
-
-(define fl1-1/gamma1p-0.3-0.7
-  (inline-chebyshev-flpoly-fun
-   0.3 0.7
-   (-0.2357535799644732185145165985112978133459
-    0.007192709283280881736611459461064511206541
-    0.01049211807832747501559721918849629071077
-    -3.459974677274507288096516749252814460585e-4
-    -1.027210542517651843057394564412174832553e-5
-    8.401234394534847347740864823467611880071e-7
-    -1.304830795670152306426264416729164660901e-8
-    -4.268734425630906391429002996659143191633e-10
-    2.216361071246008579047775791962841508693e-11
-    -3.016588637335897973295510846778736973194e-13
-    -5.122627533431577404793896156393660398889e-15
-    2.777819095314707020162876992918284024147e-16
-    -4.289212074552049664300497789553082042299e-18)))
-
-(: fl1-1/gamma1p (Float -> Float))
-;; Computes 1-1/gamma(x+1); relative error <= 2*eps
-(define (fl1-1/gamma1p x)
-  (cond [(x . fl< . 0.3)  (fl1-1/gamma1p-taylor-0 x)]
-        [(x . fl< . 0.7)  (fl1-1/gamma1p-0.3-0.7 x)]
-        [else  (fl1-1/gamma1p-taylor-1 x)]))
-
-(: flgamma-gautschi-iter (Float Float -> Float))
-;; Calculates the series part of Gautschi's algorithm
-(define (flgamma-gautschi-iter k x)
-  (let loop ([p  (fl* k x)] [q  (fl+ k 1.0)] [r  (fl+ k 3.0)] [t  1.0] [v  1.0])
-    (cond [((flabs t) . fl<= . (flabs (fl* (fl* 0.5 epsilon.0) v)))  v]
-          [else  (let* ([p  (fl+ p x)]
-                        [q  (fl+ q r)]
-                        [r  (fl+ r 2.0)]
-                        [t  (fl/ (fl* (- p) t) q)]
-                        [v  (fl+ v t)])
-                   (loop p q r t v))])))
-
-(: lg1-prod (Float Float -> Float))
-;; Calculates (lg1- (* k A)) in a way that maintains precision when k or A is very small
-(define (lg1-prod k A)
-  (define kA (fl* k A))
-  (cond [((flabs kA) . fl< . 1e-300)
-         (let-values ([(k A)  (if ((flabs k) . fl< . (flabs A)) (values k A) (values A k))])
-           (fl- (lg1- (fl* (fl* (flexpt 2.0 80.0) k) A))
-                ;; Approximates sum_i=1^80 (fllog1p (exp (* (flexpt 2.0 i) k A)))
-                ;; (hint: (exp (* (flexpt 2.0 i) k A)) ~= 1 here)
-                (fllog (flexpt 2.0 80.0))))]
-        [else
-         (lg1- kA)]))
-
-(: flgamma-upper-gautschi (Float Float Any -> Float))
-;; Temme's implementation of Gautschi's series for upper gamma, extended to compute logs
-(define (flgamma-upper-gautschi k x log?)
-  (cond [log?
-         (define p (flgamma-upper-gautschi k x #f))
-         (cond
-           [(and (p . > . +max-subnormal.0) (p . < . 0.8))  (fllog p)]
-           [(k . < . 1e-32)
-            (define y (flgamma-gautschi-iter k x))
-            (+ (fllog k) (fllog (- (* x y) (+ (fllog x) gamma.0))))]
-           [(k . < . 1e-16)
-            (define y (flgamma-gautschi-iter k x))
-            (lg1- (+ (fllog1p (* k (- 1.0 (* x y))))
-                     (* k (+ (fllog x) gamma.0 -1.0))))]
-           [else
-            (fllog1p (- (flgamma-lower-gautschi k x #f)))])]
-        [(k . < . 1e-16)
-         (define y (flgamma-gautschi-iter k x))
-         ;; Here, log(gamma(k)) ~ -log(k)-gamma*k, and log1p(k) ~ k
-         (- (flexpm1 (+ (fllog1p (* k (- 1.0 (* x y))))
-                        (* k (+ (fllog x) gamma.0 -1.0)))))]
-        [else
-         (define y (flgamma-gautschi-iter k x))
-         (define s (fl1-1/gamma1p k))
-         (define u (fl- s (fl* (flexpm1 (fl* k (fllog x))) (fl- 1.0 s))))
-         (define v (fl/ (fl* (fl* (fl* k (fl- 1.0 s))
-                                  (flexp (fl* (fl+ k 1.0) (fllog x))))
-                             y)
-                        (fl+ k 1.0)))
-         (fl+ u v)]))
-
-(: flgamma-lower-gautschi (Float Float Any -> Float))
-;; Gautschi's series for upper gamma, altered to compute lower
-(define (flgamma-lower-gautschi k x log?)
-  (cond [log?
-         (define p (flgamma-lower-gautschi k x #f))
-         (cond
-           [(and (p . > . +max-subnormal.0) (p . < . 0.8))  (fllog p)]
-           [else  (fllog1p (- (flgamma-upper-gautschi k x #f)))])]
-        [(k . < . 1e-16)
-         (define y (flgamma-gautschi-iter k x))
-         ;; Here, log(gamma(k)) ~ -log(k)-gamma*k, and log1p(k) ~ k
-         (flexp (+ (fllog1p (* k (- 1.0 (* x y))))
-                   (* k (+ (fllog x) gamma.0 -1.0))))]
-        [else
-         (define y (flgamma-gautschi-iter k x))
-         (define 1-s (fl/ 1.0 (fl* k (flgamma k))))
-         (define 1-u (fl* 1-s (flexpt x k)))
-         (define v (fl/ (fl* (fl* (fl* k 1-s)
-                                  (flexp (fl* (fl+ k 1.0) (fllog x))))
-                             y)
-                        (fl+ k 1.0)))
-         (fl- 1-u v)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-lower-series.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-lower-series.rkt
deleted file mode 100644
index 8d8deff4d7..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-lower-series.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang typed/racket/base
-
-;; Computes the lower gamma series (found by unfolding its recursive characterization infinitely)
-
-(require "../../../flonum.rkt"
-         "../log-gamma.rkt"
-         "gamma-utils.rkt")
-
-(provide flgamma-lower-series fllog-gamma-lower-series get-series-iters)
-
-(define: series-iters : Flonum  0.0)
-(define (get-series-iters) series-iters)
-
-(: flgamma-lower-iter (Float Float -> Float))
-(define (flgamma-lower-iter k x)
-  (let: loop : Float ([y  : Float  0.0]
-                      [dy : Float  (fl/ x (fl+ k 1.0))]
-                      [i  : Float  0.0])
-    (define new-y (fl+ y dy))
-    (cond [(or (not (rational? new-y))
-               ((flabs dy) . fl<= . (flabs (fl* epsilon.0 new-y))))
-           (set! series-iters i)
-           new-y]
-          [else
-           (loop new-y (fl/ (fl* dy x) (fl+ (fl+ 2.0 i) k)) (fl+ i 1.0))])))
-
-(: flgamma-lower-series (Float Float -> Float))
-(define (flgamma-lower-series k x)
-  (set! series-iters 0.0)
-  (define z (flgamma-series-const k x))
-  (cond [(fl= z 0.0)  0.0]
-        [else
-         (define y (flgamma-lower-iter k x))
-         ;; Avoid adding 1.0 if y is near zero
-         (if (y . fl< . 1.0) (fl+ z (fl* z y)) (fl* z (fl+ y 1.0)))]))
-
-(: fllog-gamma-lower-series (Float Float -> Float))
-(define (fllog-gamma-lower-series k x)
-  (define y (flgamma-lower-iter k x))
-  (define log-z (fllog-gamma-series-const k x))
-  (fl+ log-z (fllog1p (fl y))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-normal.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-normal.rkt
deleted file mode 100644
index bf6ed4afe7..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-normal.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang typed/racket/base
-
-(require "../../../flonum.rkt"
-         "../../distributions/impl/normal-cdf.rkt")
-
-(provide flgamma-normal)
-
-;; Temme's normal approximation for regularized incomplete gamma functions
-;; This is much better than moment-matching or Wilson-Hilferty
-
-(: flgamma-normal (Float Float Any Any -> Float))
-(define (flgamma-normal k x log? upper?)
-  (define l (fl/ x k))
-  (define norm-x
-    (cond [(or (l . fl< . epsilon.0) (l . fl> . (fl/ 1.0 epsilon.0)))
-           ;; Avoid under-/overflow in calculating norm-x by doing it in log space
-           (define log-l (fl- (fllog x) (fllog k)))
-           (define l-1 (flexpm1 log-l))
-           (define l-1-sign (flsgn l-1))
-           (define log-n (fl* 0.5 (fl+ (fllog 2.0) (fllog (fl- l-1 log-l)))))
-           (fl* l-1-sign (flexp (fl+ log-n (fl* 0.5 (fllog k)))))]
-          [else
-           (define n (fl* (flsgn (fl- l 1.0)) (flsqrt (fl* 2.0 (fl- (fl- l 1.0) (fllog l))))))
-           (fl* n (flsqrt k))]))
-  (let ([norm-x  (if upper? (- norm-x) norm-x)])
-    (cond [log?  (standard-flnormal-log-cdf norm-x)]
-          [else  (standard-flnormal-cdf norm-x)])))
-
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-temme.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-temme.rkt
deleted file mode 100644
index 63288268f4..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-temme.rkt
+++ /dev/null
@@ -1,102 +0,0 @@
-#lang typed/racket/base
-
-(require "../../../flonum.rkt"
-         "../../../base.rkt"
-         "../../unsafe.rkt"
-         "../../distributions/impl/normal-cdf.rkt"
-         "../stirling-error.rkt"
-         "gamma-utils.rkt")
-
-(provide flgamma-temme fllog-gamma-temme)
-
-;; ===================================================================================================
-;; Temme's series for the incomplete gamma functions (used when k ~ x and k is not small)
-
-(define temme-iters (make-parameter 32))
-
-(define num-fs 100)
-(define: fs : (U #f FlVector)  #f)
-
-(: build-fs (-> FlVector))
-(define (build-fs)
-  (define: start-fs : (Vectorof Real)  (vector 1 -1/3 1/12 -2/135))
-  (define: vec-fs : (Vectorof Real)  (make-vector num-fs 0))
-  (vector-copy! vec-fs 0 start-fs)
-  ;; DP algorithm to compute f coefficients
-  (for ([m  (in-range 4 num-fs)])
-    (vector-set!
-     vec-fs m
-     (* (- (/ (+ m 1) (+ m 2)))
-        (+ (* (/ (- m 1) (* 3 m)) (vector-ref vec-fs (- m 1)))
-           (for/fold: ([sum : Real  0]) ([j  (in-range 3 m)])
-             (+ sum (/ (* (vector-ref vec-fs (- j 1))
-                          (vector-ref vec-fs (+ m 1 (- j))))
-                       (+ m 2 (- j)))))))))
-  (define new-fs (vector->flvector vec-fs))
-  (set! fs new-fs)
-  new-fs)
-
-(: R-sum (Float Flonum -> Flonum))
-(define (R-sum k n)
-  (define num-fs (temme-iters))
-  (let* ([fs  fs]
-         [fs  (if fs fs (build-fs))])
-    ;; This originally filled a vector of bs, because imperative programmers don't know how to do
-    ;; anything else besides bang an array full of values (sheesh)
-    (define-values (sum b2 b1)
-      (for/fold: ([sum : Flonum  0.0]
-                  [b2 : Flonum  (unsafe-flvector-ref fs (- num-fs 1))]
-                  [b1 : Flonum  (unsafe-flvector-ref fs (- num-fs 2))]
-                  ) ([m  (in-range (- num-fs 3) 0 -1)])
-        (define c (unsafe-flvector-ref fs m))
-        (define b0 (fl+ c (fl/ (fl* (fl+ (fl m) 1.0) b2) k)))
-        (values (fl+ (fl* n sum) b0) b1 b0)))
-    sum))
-
-(: R-log (Float Float -> (Values Float Float)))
-;; Log-space version of `R' above
-(define (R-log k n)
-  (define sum (R-sum k n))
-  (values
-   (fl- (fl- (fl- (fl+ (fllog (abs sum)) (fl* (fl* (fl* -0.5 k) n) n))
-                  (fl* 0.5 (fllog k)))
-             (fl* 0.5 (fllog (fl* 2.0 pi))))
-        (flstirling k))
-   (flsgn sum)))
-
-(: flgamma-temme (Float Float Any -> Float))
-;; Computes a regularized incomplete gamma using Temme's series
-(define (flgamma-temme k x upper?)
-  (define n
-    (let ([l  (fl/ x k)])
-      (fl* (flsgn (fl- l 1.0)) (flsqrt (fl* 2.0 (fl- (fl- l 1.0) (fllog l)))))))
-  (define z (let ([z  (fl* n (flsqrt k))])
-              (if upper? (- z) z)))
-  (define r (let ([r  (fl* (R-sum k n) (flgamma-series-const k x))])
-              (if upper? (- r) r)))
-  (cond [(z . fl<= . 0.0)  (fl- (standard-flnormal-cdf z) r)]
-        [else  (fl- 1.0 (fl+ (standard-flnormal-cdf (- z)) r))]))
-
-(: fllog-gamma-temme (Float Float Any -> Float))
-(define (fllog-gamma-temme k x upper?)
-  (define n (let ([l  (fl/ x k)])
-              (fl* (flsgn (fl- l 1.0)) (flsqrt (fl* 2.0 (fl- (fl- l 1.0) (fllog l)))))))
-  (define z (let ([z  (fl* n (flsqrt k))])
-              (if upper? (- z) z)))
-  (define-values (log-r r-sgn) (let-values ([(log-r r-sgn)  (R-log k n)])
-                                 (if upper? (values log-r (- r-sgn)) (values log-r r-sgn))))
-  (cond [(z . fl<= . 0.0)
-         (define norm-log-p (standard-flnormal-log-cdf z))
-         (define log-p (if (r-sgn . fl< . 0.0)
-                           (lg+ norm-log-p log-r)
-                           (lg- norm-log-p log-r)))
-         ;; When norm-log-p ~ log-r, the above log-space arithmetic can go bad
-         ;; Fortunately, this means we don't need any correctional terms - a normal approximation is
-         ;; good enough
-         (if (rational? log-p) log-p norm-log-p)]
-        [else
-         (define norm-log-p (standard-flnormal-log-cdf (- z)))
-         (define log-p (if (r-sgn . fl< . 0.0)
-                           (lg1- (lg- norm-log-p log-r))
-                           (lg1- (lg+ norm-log-p log-r))))
-         (if (rational? log-p) log-p (lg1- norm-log-p))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-upper-frac.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-upper-frac.rkt
deleted file mode 100644
index cbe5452c6e..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-upper-frac.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang typed/racket/base
-
-;; Computes Legendre's continued fraction for the upper gamma function
-
-(require "../../../flonum.rkt"
-         "../log-gamma.rkt"
-         "../continued-fraction.rkt"
-         "gamma-utils.rkt")
-
-(provide flgamma-upper-frac fllog-gamma-upper-frac get-frac-iters)
-
-(define: frac-iters : Flonum  0.0)
-(define (get-frac-iters) frac-iters)
-
-(: flgamma-upper-iter (Float Float -> Float))
-(define (flgamma-upper-iter k x)
-  (continued-fraction 1.0
-                      (λ (i a) (set! frac-iters i) (fl* i (fl- k i)))
-                      (fl- (fl+ x 1.0) k)
-                      (λ (i b) (fl+ b 2.0))
-                      epsilon.0))
-
-(: flgamma-upper-frac (Float Float -> Float))
-(define (flgamma-upper-frac k x)
-  (set! frac-iters 0.0)
-  (define z (flgamma-upper-const k x))
-  (cond [(fl= z 0.0)  0.0]
-        [else  (fl* z (flgamma-upper-iter k x))]))
-
-(: fllog-gamma-upper-frac (Float Float -> Float))
-(define (fllog-gamma-upper-frac k x)
-  (define y (flgamma-upper-iter k x))
-  (define log-z (fllog-gamma-upper-const k x))
-  (fl+ log-z (fllog y)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-utils.rkt
deleted file mode 100644
index 24bfbc7a38..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-utils.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang typed/racket/base
-
-(require "../../../flonum.rkt"
-         "../../../base.rkt"
-         "../stirling-error.rkt")
-
-(provide flsharkfin fllog-sharkfin
-         flgamma-series-const fllog-gamma-series-const
-         flgamma-upper-const fllog-gamma-upper-const)
-
-(: flsharkfin-high-precision (Flonum Flonum -> Flonum))
-(define (flsharkfin-high-precision k x)
-  ;; q2+q1 = k * (log1p((x-k)/k) - (x-k)/k)
-  (let*-values ([(y2 y1)  (fast-fl-/error x k)]
-                [(y2 y1)  (fl2/ y2 y1 k)]
-                [(q2 q1)  (fl2log1p y2 y1)]
-                [(q2 q1)  (fl2- q2 q1 y2 y1)]
-                [(q2 q1)  (fl2* q2 q1 k)])
-    (* (flexp q2) (flexp q1))))
-
-(: flsharkfin (Flonum Flonum -> Flonum))
-(define (flsharkfin k x)
-  (define logy (fl+ (fl* k (fl- (fllog x) (fllog k)))
-                    (fl- k x)))
-  (cond
-    [(or (k . fl< . 0.0) (x . fl< . 0.0))  +nan.0]
-    [(fl= k 0.0)  (flexp (- x))]
-    [(fl= x 0.0)  0.0]
-    [(k . fl>= . 1e35)  (if (fl= x k) 1.0 0.0)]
-    ;; Cut out a bunch of zeros immediately
-    [(logy . < . -750.0)  0.0]
-    ;; Argument reduction to make calculations cleaner if x is subnormal
-    [(x . fl<= . +max-subnormal.0)
-     (define c (flexpt 2.0 52.0))
-     (fl/ (flsharkfin k (fl* x c))
-          (fl* (flexpt c k) (flexp (* c x))))]
-    [else
-     (define-values (x/k x/k-lo) (fast-fl//error x k))
-     (cond
-       [(and (x/k . fl> . +max-subnormal.0) (x/k . fl<= . +max.0))
-        (define-values (k-x k-x-lo) (fast-fl-/error k x))
-        (define log-x/k^k (fl* k (fllog x/k)))
-        (cond
-          ;; First try a straightfoward-ish calculation with just a few flonum tricks
-          [(and (k-x . fl> . (fllog +max-subnormal.0))
-                (k-x . fl<= . (fllog +max.0))
-                (log-x/k^k . fl> . (fllog +max-subnormal.0)))
-           (* (flexpt+ x/k x/k-lo k)
-              (flexp k-x)
-              (flexp k-x-lo))]
-          ;; Didn't work... try a similar calculation with argument reductions
-          [else
-           (define d0 (flmax (fl/ log-x/k^k (fllog (flsqrt +max-subnormal.0)))
-                             (fl/ log-x/k^k (fllog (flsqrt +max.0)))))
-           (define d1 (flmax (fl/ k-x (fllog (flsqrt +max-subnormal.0)))
-                             (fl/ k-x (fllog (flsqrt +max.0)))))
-           ;; Reduce exponents by `d' to keep intermediate computations from
-           ;; under-/overflowing
-           (define log2d (flmax 0.0 (flfloor (fl/ (fllog (flmax d0 d1)) (fllog 2.0)))))
-           (define d (flexpt 2.0 log2d))
-           (cond
-             ;; Do it only if it wouldn't create too much error
-             [(d . fl<= . 8.0)
-              (define-values (y2 y1) (fast-fl*/error (flexpt+ x/k x/k-lo (fl/ k d))
-                                                     (flexp (fl/ k-x d))))
-              (fl* (flexpt+ y2 y1 d)
-                   (flexp k-x-lo))]
-             ;; Otherwise bring out the big guns
-             [else
-              (flsharkfin-high-precision k x)])])]
-       [else
-        ;; Plan z: just do it in log space, to heck with accuracy
-        (flexp logy)])]))
-
-(: fllog-sharkfin (Flonum Flonum -> Flonum))
-(define (fllog-sharkfin k x)
-  (define y (flsharkfin k x))
-  (cond [(or (and (y . > . +max-subnormal.0) (y . < . 0.15))
-             (y . > . 0.55))
-         (fllog y)]
-        [else
-         (define-values (x/k x/k-lo) (fast-fl//error x k))
-         (cond
-           [(and (x/k . fl> . +max-subnormal.0) (x/k . fl<= . +max.0))
-            (define-values (k-x k-x-lo) (fast-fl-/error k x))
-            (define log-x/k^k (fl* k (fllog x/k)))
-            (define d0 (flmax (fl/ log-x/k^k (fllog (flsqrt +max-subnormal.0)))
-                              (fl/ log-x/k^k (fllog (flsqrt +max.0)))))
-            (define d1 (flmax (fl/ k-x (fllog (flsqrt +max-subnormal.0)))
-                              (fl/ k-x (fllog (flsqrt +max.0)))))
-            ;; Reduce exponents by `d' to keep intermediate computations from
-            ;; under-/overflowing
-            (define log2d (flmax 0.0 (flfloor (fl/ (fllog (flmax d0 d1)) (fllog 2.0)))))
-            (define d (flexpt 2.0 log2d))
-            (define-values (y2 y1) (fast-fl*/error (flexpt+ x/k x/k-lo (fl/ k d))
-                                                   (flexp (fl/ k-x d))))
-            (+ (* d (fllog+ y2 y1)) k-x-lo)]
-           [else
-            (fl+ (fl* k (fl- (fllog x) (fllog k)))
-                 (fl- k x))])]))
-
-(: flgamma-series-const (Flonum Flonum -> Flonum))
-;; Computes the series' leading constant
-(define (flgamma-series-const k x)
-  (cond [(or (k . fl< . 0.0) (x . fl< . 0.0))  +nan.0]
-        [(fl= k 0.0)  (flexp (- x))]
-        [(fl= x 0.0)  0.0]
-        [else
-         (fl/ (flsharkfin k x)
-              (* (flexp-stirling k)
-                 (flsqrt k)
-                 (flsqrt (fl* 2.0 pi))))]))
-
-(: fllog-gamma-series-const (Flonum Flonum -> Flonum))
-;; Computes the series' leading constant
-(define (fllog-gamma-series-const k x)
-  (cond [(or (k . fl< . 0.0) (x . fl< . 0.0))  +nan.0]
-        [(fl= k 0.0)  (- x)]
-        [(fl= x 0.0)  -inf.0]
-        [else
-         (- (fllog-sharkfin k x)
-            (+ (flstirling k)
-               (* 0.5 (fllog k))
-               (fllog (flsqrt (fl* 2.0 pi)))))]))
-
-(: flgamma-upper-const (Flonum Flonum -> Flonum))
-;; Computes the continued fraction's leading constant
-(define (flgamma-upper-const k x)
-  (cond [(or (k . fl< . 0.0) (x . fl< . 0.0))  +nan.0]
-        [(or (fl= k 0.0) (fl= x 0.0))  0.0]
-        [else
-         (/ (* (flsharkfin k x) (flsqrt k))
-            (* (flexp-stirling k)
-               (flsqrt (* 2.0 pi))))]))
-
-(: fllog-gamma-upper-const (Flonum Flonum -> Flonum))
-;; Computes the continued fraction's leading constant
-(define (fllog-gamma-upper-const k x)
-  (cond [(or (k . fl< . 0.0) (x . fl< . 0.0))  +nan.0]
-        [(or (fl= k 0.0) (fl= x 0.0))  -inf.0]
-        [else
-         (- (+ (fllog-sharkfin k x) (fllog (flsqrt k)))
-            (+ (flstirling k)
-               (fllog (flsqrt (* 2.0 pi)))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/lambert.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/lambert.rkt
deleted file mode 100644
index 110db38885..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/lambert.rkt
+++ /dev/null
@@ -1,124 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         "../../flonum.rkt"
-         "../polynomial/chebyshev.rkt")
-
-(provide fllambert lambert fllambert- lambert-)
-
-(define -lambert-max.0 (- (flexp -1.0)))
-
-(: lambert-upper-appx+ (Flonum -> Flonum))
-(define (lambert-upper-appx+ x)
-  (cond [(x . fl<= . 3.0)  (define z (fl+ x 1.04))
-                           (define z^2 (fl* z z))
-                           (fl* (fl* 0.607 (flsqrt x)) (fl- 1.0 (fl/ 1.0 (fl* z^2 z^2))))]
-        [else  (define L1 (fllog x))
-               (define L2 (fllog L1))
-               (fl+ (fl+ (fl- L1 L2) (fl/ L2 L1))
-                    (fl/ (fl* L2 (fl+ -2.0 L2))
-                         (fl* (fl* 2.0 L1) L1)))]))
-
-(: lambert-upper-appx- (Float -> Float))
-(define (lambert-upper-appx- x)
-  (fl- (flexpt (fl+ 2.0 (fl/ (fl+ x -lambert-max.0)
-                             (- -lambert-max.0)))
-             0.4)
-       1.0))
-
-(: lambert-upper-newton (Float Float -> Float))
-(define (lambert-upper-newton x y)
-  (let loop ([y y] [#{n : Nonnegative-Fixnum} 0])
-    (cond [(n . fx< . 6)
-           (define exp-y (flexp y))
-           (define denom (fl* (fl+ y 1.0) exp-y))
-           (define new-y (fl/ (fl+ (fl* y denom) (fl- x (fl* y exp-y)))
-                              denom))
-           (cond [((flabs (fl- new-y y)) . fl<= . (flabs (fl* epsilon.0 new-y)))  y]
-                 [else  (loop new-y (fx+ n 1))])]
-          [else  y])))
-
-(: fllambert (Flonum -> Flonum))
-(define (fllambert x)
-  (cond [(x . fl> . 0.0)
-         (cond [(x . fl> . 1e308)  (lambert-upper-appx+ x)]
-               [else  (lambert-upper-newton x (lambert-upper-appx+ x))])]
-        [(x . fl< . 0.0)
-         (cond [(x . fl> . -lambert-max.0)  (lambert-upper-newton x (lambert-upper-appx- x))]
-               [(x . fl< . -lambert-max.0)  +nan.0]
-               [else  -1.0])]
-        [else  x]))
-
-;; ===================================================================================================
-
-(: lambert-lower-appx (Float -> Float))
-(define (lambert-lower-appx x)
-  (cond [(x . fl> . -0.3678793)
-         (define L1 (fllog (- x)))
-         (define L2 (fllog (- L1)))
-         (fl+ (fl+ (- L1 L2) (/ L2 L1))
-              (fl/ (fl* L2 (fl+ -2.0 L2))
-                   (fl* (fl* 2.0 L1) L1)))]
-        [(x . fl> . -0.3678794)
-         ((inline-chebyshev-flpoly-fun
-           -0.3678794 -0.367879
-           (-2.002168474311089
-            -0.0005183728424209184
-            6.618450077030176e-05
-            -1.718303045243156e-05
-            5.513014540399948e-06
-            -1.7451631748784575e-06))
-          x)]
-        [else
-         ((inline-chebyshev-flpoly-fun
-           -0.36787944 -0.3678794
-           (-2.000625593512204
-            -0.0001831934682653043
-            2.9969169663135453e-05
-            -1.002911105281908e-05
-            4.0654407009362474e-06
-            -1.5323076251738676e-06))
-          x)]))
-
-(: lambert-lower-newton (Float Float -> Float))
-(define (lambert-lower-newton x y)
-  (let loop ([dy 0.0] [y y] [#{n : Nonnegative-Fixnum} 0])
-    (cond [(n . fx< . 13)
-           (define exp-y (flexp y))
-           (define denom (- (flexp (fl+ (fllog (flabs (fl+ y 1.0))) y))))
-           (define new-dy (fl/ (fl+ (fl- x denom) exp-y) denom))
-           (define new-y (fl+ y new-dy))
-           (cond [((flabs (fl- new-y y)) . fl<= . (flabs (fl* epsilon.0 new-y)))  y]
-                 [(and (n . fx> . 3) (not (fl= (flsgn new-dy) (flsgn dy))))
-                  ;; If we detect oscillation, the true value is between new-y and y
-                  (fl* 0.5 (fl+ new-y y))]
-                 [else
-                  (loop new-dy new-y (fx+ n 1))])]
-          [else  y])))
-
-(: fllambert- (Float -> Float))
-(define (fllambert- x)
-  (cond [(x . fl<= . -lambert-max.0)  (if (fl= x -lambert-max.0) -1.0 +nan.0)]
-        [(x . fl>= . 0.0)  (if (fl= x 0.0) -inf.0 +nan.0)]
-        [else  (lambert-lower-newton x (lambert-lower-appx x))]))
-
-;; ===================================================================================================
-
-(: lambert (case-> (Zero -> Zero)
-                   (Flonum -> Flonum)
-                   (Real -> (U Zero Flonum))))
-(define (lambert x)
-  (cond [(flonum? x)  (fllambert x)]
-        [(single-flonum? x)  (fllambert (fl x))]
-        [(zero? x)  x]
-        [(x . < . -lambert-max.0)
-         (raise-argument-error 'lambert "Real >= (- (exp -1))" x)]
-        [else  (fllambert (fl x))]))
-
-(: lambert- (Real -> Flonum))
-(define (lambert- x)
-  (cond [(flonum? x)  (fllambert- x)]
-        [(single-flonum? x)  (fllambert- (fl x))]
-        [(or (x . < . -lambert-max.0) (x . >= . 0))
-         (raise-argument-error 'lambert- "Negative-Real >= (- (exp -1))" x)]
-        [else  (fllambert- (fl x))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/lanczos.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/lanczos.rkt
deleted file mode 100644
index b822185c71..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/lanczos.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang typed/racket/base
-
-(require "../../flonum.rkt")
-
-(provide lanczos-sum lanczos-g)
-
-;; Lanczos polynomial for N=13 G=6.024680040776729583740234375
-;; Max experimental error (with arbitary precision arithmetic) is 1.196214e-17
-(define lanczos-sum
-  (make-quotient-flpolyfun
-   (23531376880.41075968857200767445163675473
-    42919803642.64909876895789904700198885093
-    35711959237.35566804944018545154716670596
-    17921034426.03720969991975575445893111267
-    6039542586.35202800506429164430729792107
-    1439720407.311721673663223072794912393972
-    248874557.8620541565114603864132294232163
-    31426415.58540019438061423162831820536287
-    2876370.628935372441225409051620849613599
-    186056.2653952234950402949897160456992822
-    8071.672002365816210638002902272250613822
-    210.8242777515793458725097339207133627117
-    2.506628274631000270164908177133837338626)
-   (0.0
-    39916800.0
-    120543840.0
-    150917976.0
-    105258076.0
-    45995730.0
-    13339535.0
-    2637558.0
-    357423.0
-    32670.0
-    1925.0
-    66.0
-    1.0)))
-
-(define lanczos-g 6.024680040776729583740234375)
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/log-gamma-zeros.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/log-gamma-zeros.rkt
deleted file mode 100644
index 9e3c244bb1..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/log-gamma-zeros.rkt
+++ /dev/null
@@ -1,1091 +0,0 @@
-#lang typed/racket/base
-
-#|
-Compute f(x) = log(abs(gamma(x))) near the roots of `f', accurately. This is done more or less by
-brute force: a huge, nested `cond' determines whether `x' is near a root (or a tricky spot, as around
--2.625), and applies one of these many Taylor series expansions.
-
-The Taylor series coefficients were computed by Maxima using
-  
-  fpprec:45;
-  terms(x0) := cons(log(abs(gamma(x0))),map(lambda([n],psi[n](x0)/(n+1)!),[0,1,2,3,4,5,6,7,8,9,...]));
-  terms(bfloat(x0))
-
-where x0 = -16.000000000000046, etc.
-
-The last few digits in each are always wrong, but are fine after rounding to 53 bits, and are
-probably fine for larger flonum precisions as well (though we'd need more terms to be more correct).
-|#
-
-(require "../../flonum.rkt")
-
-(provide fllog-gamma-special-negative)
-
-(: fllog-gamma-taylor-neg-16-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-16-eps x)
-  ((make-flpolyfun
-    (3.42552033350358311733334120197391285997329364e-2
-     2.16519212854378804364052503881457935471686475e13 
-     2.34402847675338276903976186040675803105186722e26 
-     3.38351467129883525133298714499292391230168593e39 
-     5.49446949983078390448145147509511783209827688e52 
-     9.51726568924479766428829792505066627072141892e65 
-     1.71722572963416977329253566951727611382059435e79 
-     3.18696311377395951980006026131098541415051276e92 
-     6.03783901691414892971142619565256231858278562e105
-     1.16205169002981209467014755360005441193795642e119 
-     2.26445865499190633858041606972575513957782768e132 
-     4.45726186836426745991677397375017774085015343e145 
-     8.84659261955282023171874967614556357794891805e158 
-     1.76811440347263289710978356338608287606666092e172 
-     3.55485686099453407775024429998387503068981764e185 
-     7.18381822062263098616415005664454304133158426e198 
-     1.45821999976683265621312998703694106904655702e212 
-     2.97160137899281100204818274837937667034221446e225 
-     6.07663858635514120494896403934157760213721947e238 
-     1.24646116122756945135868661223357906051452277e252 
-     2.56388650008387675084781633626915713290845764e265 
-     5.28695892234340315776889816230237875306469639e278 
-     1.09269508497457661879972605257434704162622542e292 
-     2.26302980571621375226727382723173851714553023e305))
-   (fl+ x 16.000000000000046)))
-
-(: fllog-gamma-taylor-neg-16+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-16+eps x)
-  ((make-flpolyfun
-    (+3.42552033352947932572398727165416329469955525e-2
-     -2.16519212854322734097485954674089084927480270e13
-     +2.34402847675338276903976186040675803105186553e26
-     -3.38351467129883525133298714499292391230168716e39
-     +5.49446949983078390448145147509511783209827688e52
-     -9.51726568924479766428829792505066627072141892e65
-     +1.71722572963416977329253566951727611382059435e79
-     -3.18696311377395951980006026131098541415051276e92
-     +6.03783901691414892971142619565256231858278562e105
-     -1.16205169002981209467014755360005441193795642e119
-     +2.26445865499190633858041606972575513957782768e132
-     -4.45726186836426745991677397375017774085015343e145
-     +8.84659261955282023171874967614556357794891805e158
-     -1.76811440347263289710978356338608287606666092e172
-     +3.55485686099453407775024429998387503068981764e185
-     -7.18381822062263098616415005664454304133158426e198
-     +1.45821999976683265621312998703694106904655702e212
-     -2.97160137899281100204818274837937667034221446e225
-     +6.07663858635514120494896403934157760213721947e238
-     -1.24646116122756945135868661223357906051452277e252
-     +2.56388650008387675084781633626915713290845764e265
-     -5.28695892234340315776889816230237875306469639e278
-     +1.09269508497457661879972605257434704162622542e292
-     -2.26302980571621375226727382723173851714553023e305))
-   (fl+ x 15.999999999999954)))
-
-(: fllog-gamma-taylor-neg-15-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-15-eps x)
-  ((make-flpolyfun
-    (1.15525490672681022185711739708783012180346524e-3
-     1.30918593819183868774692964788238733025798397e12
-     8.56983910376033938275220112806158380788981778e23
-     7.47967523145739725777963978774141027614667188e35
-     7.34421422643398169572992335407374271401272603e47
-     7.69195359383655244163976623081075588379362466e59
-     8.39183123521159038610388997065510730021596055e71
-     9.41697209896719459325296135717142749205948794e83
-     1.07874965207510576326789906427969304722014057e96
-     1.25536344473165336499588602372903828497531979e108
-     1.47915375224337636920269163322857941330755097e120
-     1.76044299350606257350766868342715948489863137e132
-     2.11268494440818660541928314338955356827359956e144
-     2.55313608096278164214923128293506360284438946e156
-     3.10377772294543137103271301928750979038863189e168
-     3.79252734013508678551325226736139002262904078e180
-     4.65480324740864694393008748960697082816914839e192
-     5.73553219439468045888102489477691980653676664e204
-     7.09171820265835310726774563051367548937070073e216
-     8.79572628807155765623735540489237622206442855e228
-     1.09394791138782982168391460633220354706621609e241
-     1.36398211685740940272776847469329107382146839e253
-     1.70453774336152266979708967262322846846670140e265
-     2.13453263408141799832562100864983139919557550e277
-     2.67806260459741351643411574808075407119390293e289
-     3.36583862738784320386893917339053511137912179e301))
-   (fl+ x 15.000000000000764)))
-
-(: fllog-gamma-taylor-neg-15+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-15+eps x)
-  ((make-flpolyfun
-    (+1.15525491091416550634620392019108538425965918e-3
-     -1.30918593818635666109027472714561810093410983e12
-     +8.56983910376033938275220112806158380785805751e23
-     -7.47967523145739725777963978774141027616053193e35
-     +7.34421422643398169572992335407374271401272603e47
-     -7.69195359383655244163976623081075588379362466e59
-     +8.39183123521159038610388997065510730021596055e71
-     -9.41697209896719459325296135717142749205948794e83
-     +1.07874965207510576326789906427969304722014057e96
-     -1.25536344473165336499588602372903828497531979e108
-     +1.47915375224337636920269163322857941330755097e120
-     -1.76044299350606257350766868342715948489863137e132
-     +2.11268494440818660541928314338955356827359956e144
-     -2.55313608096278164214923128293506360284438946e156
-     +3.10377772294543137103271301928750979038863189e168
-     -3.79252734013508678551325226736139002262904078e180
-     +4.65480324740864694393008748960697082816914839e192
-     -5.73553219439468045888102489477691980653676664e204
-     +7.09171820265835310726774563051367548937070073e216
-     -8.79572628807155765623735540489237622206442855e228
-     +1.09394791138782982168391460633220354706621609e241
-     -1.36398211685740940272776847469329107382146839e253
-     +1.70453774336152266979708967262322846846670140e265
-     -2.13453263408141799832562100864983139919557550e277
-     +2.67806260459741351643411574808075407119390293e289
-     -3.36583862738784320386893917339053511137912179e301))
-   (fl+ x 14.999999999999236)))
-
-(: fllog-gamma-taylor-neg-14-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-14-eps x)
-  ((make-flpolyfun
-    (7.05720414970836382974343795932367836228204258e-5
-     8.71844437724299607238818643993229044314817323e10
-     3.80056361772083925440439547664641650199223408e21
-     2.20900016681707654152682369867627068687209827e32
-     1.44442838123433135774968727885183741983569213e43
-     1.00745347986530949975061019345278118790493350e54
-     7.31952260549680798260379944355600071336462531e64
-     5.46984434588907051495462936676216116146823788e75
-     4.17274669703046177687747276824264410147395985e86
-     3.23376533131276231243373110151708319509140853e97
-     2.53740628523180393404941068473096530601602486e108
-     2.01111232359833350081224410957694968261608159e119
-     1.60726233517136341629818195230703984100819403e130
-     1.29349174785225078248774509860609135667443638e141
-     1.04717190088891217889982283945450481764946424e152
-     8.52106263962962986047317245298885003374543513e162
-     6.96472599903145134668055154185376490901542828e173
-     5.71497187985235353695785444163409490053443581e184
-     4.70575719810015273300645000279164929924814153e195
-     3.88675727840733627688644182717269723570884573e206
-     3.21921532816693137167156670390289667070550200e217
-     2.67300474058385899419220218361791442066160170e228
-     2.22451502797099844556885973986663205320032769e239
-     1.85510796441934987891353225082737600968833191e250
-     1.54997532843630249255321082937107619733383802e261
-     1.29728387391900772334015429402303245587856606e272
-     1.08752858614521596590096294535581746089179482e283))
-   (fl+ x 14.00000000001147)))
-
-(: fllog-gamma-taylor-neg-14+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-14+eps x)
-  ((make-flpolyfun
-    (+7.05721028462543395166741252987437638446269345e-5
-     -8.71844437670812674005602769958828165617820307e10
-     +3.80056361772083925440439547664641644750312443e21
-     -2.20900016681707654152682369867627070270744066e32
-     +1.44442838123433135774968727885183741983569213e43
-     -1.00745347986530949975061019345278118790493350e54
-     +7.31952260549680798260379944355600071336462531e64
-     -5.46984434588907051495462936676216116146823788e75
-     +4.17274669703046177687747276824264410147395985e86
-     -3.23376533131276231243373110151708319509140853e97
-     +2.53740628523180393404941068473096530601602486e108
-     -2.01111232359833350081224410957694968261608159e119
-     +1.60726233517136341629818195230703984100819403e130
-     -1.29349174785225078248774509860609135667443638e141
-     +1.04717190088891217889982283945450481764946424e152
-     -8.52106263962962986047317245298885003374543513e162
-     +6.96472599903145134668055154185376490901542828e173
-     -5.71497187985235353695785444163409490053443581e184
-     +4.70575719810015273300645000279164929924814153e195
-     -3.88675727840733627688644182717269723570884573e206
-     +3.21921532816693137167156670390289667070550200e217
-     -2.67300474058385899419220218361791442066160170e228
-     +2.22451502797099844556885973986663205320032769e239
-     -1.85510796441934987891353225082737600968833191e250
-     +1.54997532843630249255321082937107619733383802e261
-     -1.29728387391900772334015429402303245587856606e272
-     +1.08752858614521596590096294535581746089179482e283))
-   (fl+ x 13.99999999998853)))
-
-(: fllog-gamma-taylor-neg-13-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-13-eps x)
-  ((make-flpolyfun
-    (4.20070692126859694083520385628430681145952866e-6
-     6.22704696315015051305989305476581988406584914e9
-     1.93880569244302627999559554043966627136075792e19
-     8.04868939614601273767623947637595966084723446e28
-     3.75896751304948261029487848517086715088665702e38
-     1.87258137815444559355579202413716800486894348e48
-     9.71721014934499007442790146433391077060891507e57
-     5.18653062218378047648854673573809085536221324e67
-     2.82596735283228244362324473616029571252961981e77
-     1.56421612578310868828508606287502751413734642e87
-     8.76640254452700692209329834562293888490992251e96
-     4.96261821089367480005194792833420777195398124e106
-     2.83272519259599852918567471322345942565749047e116
-     1.62826272005727565118236773772165623741858943e126
-     9.41503496319752555773534041626705004304107636e135
-     5.47193405276234040824249545461113755887770115e145
-     3.19443659170955917253473379654127143885350501e155
-     1.87217945120619961652450055643490432162160360e165
-     1.10104743967196314558478384285610834792427926e175
-     6.49541758038405192149141424551847761237213585e184
-     3.84249067863447907906831685703870486213896574e194
-     2.27879713345922908440402121716008913743249147e204
-     1.35451687289014457756507563651717649104370105e214
-     8.06791669041266820186883279414411645394575841e223
-     4.81459921006082217623617815487345538030488875e233
-     2.87815059621718549831528798396536979929342541e243
-     1.72330566559340670986129762640372053529825002e253))
-   (fl+ x 13.00000000016059)))
-
-(: fllog-gamma-taylor-neg-13+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-13+eps x)
-  ((make-flpolyfun
-    (+4.20154292527072621914889857511622485654985997e-6
-     -6.22704695794431433259544850846871775302229610e9
-     +1.93880569244302627999559554043957827675071196e19
-     -8.04868939614601273767623947637614230970357822e28
-     +3.75896751304948261029487848517086715088665702e38
-     -1.87258137815444559355579202413716800486894348e48
-     +9.71721014934499007442790146433391077060891507e57
-     -5.18653062218378047648854673573809085536221324e67
-     +2.82596735283228244362324473616029571252961981e77
-     -1.56421612578310868828508606287502751413734642e87
-     +8.76640254452700692209329834562293888490992251e96
-     -4.96261821089367480005194792833420777195398124e106
-     +2.83272519259599852918567471322345942565749047e116
-     -1.62826272005727565118236773772165623741858943e126
-     +9.41503496319752555773534041626705004304107636e135
-     -5.47193405276234040824249545461113755887770115e145
-     +3.19443659170955917253473379654127143885350501e155
-     -1.87217945120619961652450055643490432162160360e165
-     +1.10104743967196314558478384285610834792427926e175
-     -6.49541758038405192149141424551847761237213585e184
-     +3.84249067863447907906831685703870486213896574e194
-     -2.27879713345922908440402121716008913743249147e204
-     +1.35451687289014457756507563651717649104370105e214
-     -8.06791669041266820186883279414411645394575841e223
-     +4.81459921006082217623617815487345538030488875e233
-     -2.87815059621718549831528798396536979929342541e243
-     +1.72330566559340670986129762640372053529825002e253))
-   (fl+ x 12.99999999983941)))
-
-(: fllog-gamma-taylor-neg-12-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-12-eps x)
-  ((make-flpolyfun
-    (7.92331889477662838176704627169679553918772480e-7
-     4.79001984580383156934295092578649219589398137e8
-     1.14721449406016195410092484708147166014958633e17
-     3.66345344330893113284755742851916848671782064e25
-     1.31610109538171333064294605008518749624155058e34
-     5.04332026617433628923319069504402651198760215e42
-     2.01313366969380958404839816353804766505096440e51
-     8.26538586791793206180756921553598759148456961e59
-     3.46424418652989138003252353575322225544849778e68
-     1.47500429481618622832411424312125875871473290e77
-     6.35876982680119455930209240151498201553943053e85
-     2.76896668224128240282212673231364014487122016e94
-     1.21581215161645932855804092279695053285167943e103
-     5.37578243473933196559200253766562886942293722e111
-     2.39108112409521134748162268919338033426509823e120
-     1.06897709118147796032098934601791965876435654e129
-     4.80039511356245954450366286956611957635723875e137
-     2.16414002262646382463492539807218520945450358e146
-     9.79036951376787668833331620803049384838472992e154
-     4.44278501255337092574540257286295318903639058e163
-     2.02169768551186469267664691423449813562994708e172
-     9.22283046166621209468650365753657254785284645e180
-     4.21694706804926224603612832242519303537955950e189
-     1.93210313408299233443396459331600576138416068e198
-     8.86919512810946571537814217489880825607931245e206
-     4.07842756376789482418778552477199675182815872e215
-     1.87843739106737609633367311897011914701215515e224))
-   (fl+ x 12.000000002087674)))
-
-(: fllog-gamma-taylor-neg-12+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-12+eps x)
-  ((make-flpolyfun
-    (+8.02878797874473321229715558287816009952298183e-7
-     -4.79001979528393130316004392463101229275295420e8
-     +1.14721449406016195410092484694807350730298753e17
-     -3.66345344330893113284755742873216175210420413e25
-     +1.31610109538171333064294605008518749624155058e34
-     -5.04332026617433628923319069504402651198760215e42
-     +2.01313366969380958404839816353804766505096440e51
-     -8.26538586791793206180756921553598759148456961e59
-     +3.46424418652989138003252353575322225544849778e68
-     -1.47500429481618622832411424312125875871473290e77
-     +6.35876982680119455930209240151498201553943053e85
-     -2.76896668224128240282212673231364014487122016e94
-     +1.21581215161645932855804092279695053285167943e103
-     -5.37578243473933196559200253766562886942293722e111
-     +2.39108112409521134748162268919338033426509823e120
-     -1.06897709118147796032098934601791965876435654e129
-     +4.80039511356245954450366286956611957635723875e137
-     -2.16414002262646382463492539807218520945450358e146
-     +9.79036951376787668833331620803049384838472992e154
-     -4.44278501255337092574540257286295318903639058e163
-     +2.02169768551186469267664691423449813562994708e172
-     -9.22283046166621209468650365753657254785284645e180
-     +4.21694706804926224603612832242519303537955950e189
-     -1.93210313408299233443396459331600576138416068e198
-     +8.86919512810946571537814217489880825607931245e206
-     -4.07842756376789482418778552477199675182815872e215
-     +1.87843739106737609633367311897011914701215515e224))
-   (fl+ x 11.999999997912326)))
-
-(: fllog-gamma-taylor-neg-11-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-11-eps x)
-  ((make-flpolyfun
-    (2.73464038994808618853990996713900546500363245e-8
-     3.99168059769041149523568978415501579131928981e7
-     7.96675602195659478355932730588437298457319315e14
-     2.12004956622456136373539147270355509119210030e22
-     6.34692015133814117725645182781078049260408379e29
-     2.02679011782791482635892447400196186445606399e37
-     6.74191524487342619925839700081682702106088296e44
-     2.30670605377823204002172584808694044342738686e52
-     8.05667908149243458094760269141474835194991556e59
-     2.85863889808333292404959945241460300717711546e67
-     1.02696954543122321631238034925453188849766691e75
-     3.72666741642077092523775278109077602761444219e82
-     1.36360263507170131054023629385517986334747809e90
-     5.02436847534761479437446945468643428751502305e97
-     1.86231248648800037351163307354282477952748617e105
-     6.93817241996743010308160148208151319569151205e112
-     2.59640311288631117341622381354216175006694215e120
-     9.75436357202621873441244105109792101963099867e127
-     3.67731735733579134615816317769649110144961188e135
-     1.39061135828683574763248386608711524913705288e143
-     5.27333223621606622842738556284264689587972908e150
-     2.00471016041737579551608260847917280484435997e158
-     7.63842751793674500724945237092880255345519039e165
-     2.91645018781248713953023068931212782470625220e173
-     1.11564728782469245018582802734818152422134002e181
-     4.27517506575444098042953315198093408442090338e188
-     1.64087810744434949149168426042942529202007384e196))
-   (fl+ x 11.000000025052106)))
-
-(: fllog-gamma-taylor-neg-11+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-11+eps x)
-  ((make-flpolyfun
-    (+7.92108817813104976338185676938186326377669157e-9
-     -3.99167954308609387899529490984926221844918726e7
-     +7.96675376237834734151704486675254042966165671e14
-     -2.12004866427321558401046925783755161819242013e22
-     +6.34691655103692976844553017728587709050044410e29
-     -2.02678868070285552882543026813904999725868034e37
-     +6.74190950832996834570809466930634504334668633e44
-     -2.30670376393361267698492163809552552947300333e52
-     +8.05666994116530318362888597122002967632381485e59
-     -2.85863524955716820122896866897527331390101936e67
-     +1.02696808905630541487289935539691440983932245e75
-     -3.72666160303803652380271345450756622764891911e82
-     +1.36360031455530106555937243988871390508116396e90
-     -5.02435921258854692720513068976400735845784268e97
-     +1.86230878909092357208500698651798409488295265e105
-     -6.93815766114120632269202387172502572591998986e112
-     +2.59639722163506119449664891799231414302804036e120
-     -9.75434005603601454303869335757998663598800980e127
-     +3.67730797050484799427924584335172213978792387e135
-     -1.39060761136423567937255934204138572903642527e143
-     +5.27331727969979824813958778773305685936184817e150
-     -2.00470419025458486185381910054896628118088328e158
-     +7.63840368695691546299468028336596467987131921e165
-     -2.91644067524776279755223104858712947907833526e173
-     +1.11564349071318960661856937765706035633976974e181
-     -4.27515990890013003716033146535924707095784523e188
-     +1.64087205731302121418417611988033067328540294e196))
-   (fl+ x 10.99999997494789)))
-
-(: fllog-gamma-taylor-neg-10-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-10-eps x)
-  ((make-flpolyfun
-    (1.26680513875652366050062659798555748836557448e-9
-     3.62880470810007800254459685298884367724025843e6
-     6.58410327072133608976010077379791026736696158e12
-     1.59282729754858621739197785943978568482028327e19
-     4.33504158795023612686636032483709817064018640e25
-     1.25848073033775948098011226489583728293213049e32
-     3.80564819972389861941189673309097808504256595e38
-     1.18370958467922967670391102325402180458143347e45
-     3.75851711385162096495478164533275796515982118e51
-     1.21234806747737194697431625227112203768112890e58
-     3.95943437157865124122656766052022043628615746e64
-     1.30618225249012131647321416064683238106758288e71
-     4.34488746601852516679129150823293370559068272e77
-     1.45539118843906333947353570381417641608669330e84
-     4.90408933301516044397622239756677554793394680e90
-     1.66095728655624292159781305892609910043079695e97
-     5.65058035804620748434779937530937928416307129e103
-     1.92986722993071906383516065435167362039046618e110
-     6.61404526522253281591452715469943479530100677e116
-     2.27378491990430232583217799728811483480130071e123
-     7.83856027141921443400170282290734423438418616e129
-     2.70900818888616748861088994297863316679286423e136
-     9.38361642196091868726726724708956328592144715e142
-     3.25707985403383821127106141913575458300804628e149
-     1.13268282554189284115966562035709984608248417e156
-     3.94587082206887966633395263207824801882064758e162
-     1.37680628240094496354203214974016406530882430e169))
-   (fl+ x 10.000000275573013)))
-
-(: fllog-gamma-taylor-neg-10+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-10+eps x)
-  ((make-flpolyfun
-    (+1.77195439588259352534680065934485472482130717e-9
-     -3.62879530292280735910715329248732327546191066e6
-     +6.58408620929362087648818675232137910051457097e12
-     -1.59282110629768751512482236172364227133645553e19
-     +4.33501912113894078161722440069397118596511042e25
-     -1.25847257758126423824236671781135806425817561e32
-     +3.80561861500108372538274017835347112468902220e38
-     -1.18369884897499829239437269713787403220880276e45
-     +3.75847815612804690620280204631632142745125439e51
-     -1.21233393049861990393492066947282644615217999e58
-     +3.95938307131007784243873625636415505263472321e64
-     -1.30616363664863309971765989200245939579148067e71
-     +4.34481991285283001479406276580844541578499284e77
-     -1.45536667474625860750715747873145948010476603e84
-     +4.90400037772657535589147870859508009105310077e90
-     -1.66092500646107207109975037317568159706562566e97
-     +5.65046322003667333433184832173283915514569311e103
-     -1.92982472288975465202547012222555503529161663e110
-     +6.61389101567204650054160169384231724920491877e116
-     -2.27372894582733669125740551080176860211820673e123
-     +7.83835715268841248059221182226788240029783775e129
-     -2.70893448116102191423806141451948887115494664e136
-     +9.38334895136750337784284833671366500472886100e142
-     -3.25698279430475194021685214932308042953682239e149
-     +1.13264760450734840426305896015949764939171829e156
-     -3.94574301197853025276755197047628891407891290e162
-     +1.37675990267528835957901841535135801525088333e169))
-   (fl+ x 9.99999972442663)))
-
-(: fllog-gamma-taylor-neg-9-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-9-eps x)
-  ((make-flpolyfun
-    (3.44426332839150908016964631288898671467297262e-11
-     3.62884503497526248849171273798030585155825256e5
-     6.58417643205150350091693244126939847445604555e10
-     1.59285384636586398381399114273935377829076317e16
-     4.33513792862856030255974363976361743274012555e21
-     1.25851569056292837773342167745950796476172579e27
-     3.80577506382379113627666588338929419238118679e32
-     1.18375562128157942007882679381420739030312789e38
-     3.75868417204678487994283942978690056504502681e43
-     1.21240868976300344095453444730782134597876236e49
-     3.95965435848271122941100998848857882203084585e54
-     1.30626208161146490626829498676570842825079611e60
-     4.34517715092689444904089136353389740181780492e65
-     1.45549630965889482118320478663843966519680255e71
-     4.90447079820508329271112475618258161571787672e76
-     1.66109571311879282678623022864996620010812047e82
-     5.65108268207800990378493219357852914908486471e87
-     1.93004951390012408175087355952942867414993847e93
-     6.61470673955779226107136828988040612386835018e98
-     2.27402495653376361378728330312251897555961576e104
-     7.83943131932556570530934853960007532314000750e109
-     2.70932427583375698078031816909880748505620829e115
-     9.38476344220754571768181381486618051607588406e120
-     3.25749608616749922641758390851141820070524336e126
-     1.13283386837622981970366646739494916230346492e132
-     3.94641892818466520527929989856415386232041462e137
-     1.37700517982992993725897300416472670257692228e143))
-   (fl+ x 9.000002755714823)))
-
-(: fllog-gamma-taylor-neg-9+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-9+eps x)
-  ((make-flpolyfun
-    (+5.64090189601985554680682097784018867907670734e-10
-     -3.62875496679368153944184754133409853882919443e5
-     +6.58401301583004682272280455950037839439354423e10
-     -1.59279454588740513697244106046241980273670396e16
-     +4.33492273905226566045020044289934117963772572e21
-     -1.25843760256945865003678562494637299374750375e27
-     +3.80549169811299772192812168424181981155527489e32
-     -1.18365279353241255772678524980019211222218158e38
-     +3.75831103071047946418137890075594568351805075e43
-     -1.21227328423483648919948531417540545823921189e49
-     +3.95916299890191690076295645348221776277255504e54
-     -1.30608377704671789364044842432919687821102207e60
-     +4.34453011932208409681805831881788942103628916e65
-     -1.45526151483004518742812595490882771735564618e71
-     +4.90361877472979424936320260354852162497927007e76
-     -1.66078653083994551814322808521680173590850409e82
-     +5.64996072142402660565900542226566050612257751e87
-     -1.92964237681781916467130434877438291278101621e93
-     +6.61322932051282496993218213129464466379177035e98
-     -2.27348883071046527400646257811471807542243270e104
-     +7.83748582593701002317826220765303313699816913e109
-     -2.70861829519255659885436495915569346459484308e115
-     +9.38220157965541382228541682696143903308915602e120
-     -3.25656643748408198086308251966072278642266846e126
-     +1.13249651746180573680346026142972526977559758e132
-     -3.94519474918571375789557929523084018794181615e137
-     +1.37656094975453458883642260488249654746293086e143))
-   (fl+ x 8.999997244250979)))
-
-(: fllog-gamma-taylor-neg-8-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-8-eps x)
-  ((make-flpolyfun
-    (1.75595561986039004670754217836682458096818294e-11
-     4.03242811088323551704009365369178172715764118e4
-     8.12937510693064158715017081704767855649826588e8
-     2.18529203315647635471555257729626032343249241e13
-     6.6086739371290823870140997909983100301785661e17
-     2.13180703452641813904222756674375930517880698e22
-     7.16325190526575076978227354054622864556151838e26
-     2.47575128649206217994857552477475876552461931e31
-     8.73491424145784134221578357402078942389932035e35
-     3.13075946401403942724197387949046574992807783e40
-     1.13615030811408023488698439557270185507766119e45
-     4.16472840047189860030185080087660141591495787e49
-     1.53936533574880225322600394516463438385409716e54
-     5.72958511566917473460716808668509800351815546e58
-     2.1452705513984853310444983046579742329344217e63
-     8.07351073038984550014037705417280543114023001e67
-     3.05194907222492063206752094264072370160708407e72
-     1.15822230051367698912467390023051867513568234e77
-     4.41074466968106394593634292461279123515132827e81
-     1.68490105089661117260686046397644316674926057e86
-     6.45418761313859726010066816217053814833309179e90
-     2.47853961949922330841354774036414813781846341e95
-     9.53972945733347045297958182220264476100227504e99
-     3.67937863604060660505188687357526850154343885e104
-     1.42178738214301361299962576117341916756694372e109
-     5.50363302233685355532541957273539197222287724e113
-     2.13382946385035377749021639708399303746666443e118))
-   (fl+ x 8.000024800270682)))
-
-(: fllog-gamma-taylor-neg-8+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-8+eps x)
-  ((make-flpolyfun
-    (+3.36862440532578048192178695865761670703028502e-11
-     -4.03157185435460182531674643103516701459589637e4
-     +8.12764889390244843573678049475628009879133800e8
-     -2.18459602406449894115960848402883573355750660e13
-     +6.60586762847157542794164811192607499775649392e17
-     -2.13067553087519165884280930132032897449909007e22
-     +7.15868968253762378377140863376159796660903207e26
-     -2.47391179828377991703980507205741954451491512e31
-     +8.72749742497773520398866157186857418285340923e35
-     -3.12776900359664828915446087881115386441329558e40
-     +1.13494455446756995096973106168430195047603979e45
-     -4.15986680173952967240784319130458379603509249e49
-     +1.53740513912611874374960210051662718040768558e54
-     -5.72168160282347819780640318082936113875273834e58
-     +2.14208385499069002078835036682845477702444095e63
-     -8.06066197034699160137863809357603591304015435e67
-     +3.04676845211971994901145131666001174825250184e72
-     -1.15613347446274974536712901225073621871500266e77
-     +4.40232252293698652626946856575742521461284998e81
-     -1.68150524128317151014581150044800262715047306e86
-     +6.44049570857795427576454116828154920479724211e90
-     -2.47301904349484581391700690657951303035314196e95
-     +9.51747049451806490671496916087842154040751852e99
-     -3.67040382207753008155004667954943602632015024e104
-     +1.41816873708684031832737844076233529786494910e109
-     -5.48904264518949055831628569939857570065655799e113
-     +2.12794662366576202332888936112799382426183472e118))
-   (fl+ x 7.9999751970958215)))
-
-(: fllog-gamma-taylor-neg-7-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-7-eps x)
-  ((make-flpolyfun
-    (3.21679479852632759745367246513718980001635171e-12
-     5.04402994112704184663363113670311009599091759e3
-     1.27109588340331385101120105639416555466909227e7
-     4.27258908022913507559604232033349315815168982e10
-     1.61568434355360945943281198598054725594658597e14
-     6.51704366037850112328249122862144378132933165e17
-     2.73825261727442009104395249038917105694434166e21
-     1.18339804857683193718808233344172104509872992e25
-     5.22087179600848088036826889784761504704247785e28
-     2.33988564629529232925154915680180765765285024e32
-     1.06179645178199030729449917518216123215693221e36
-     4.86690323452448117072549165516644604170335840e39
-     2.24940821880306352619712347055263942397326750e43
-     1.04691229045618429129108351747714342578718893e47
-     4.90150829481408858461161948929810753980258873e50
-     2.30659127823273559467878821641159615034308609e54
-     1.09030009241427283176959849157211798338464498e58
-     5.17393820186604758100969262963284482134212880e61
-     2.46377917698243204656988411760922010406851181e65
-     1.17686002585829238416238718500232471902547531e69
-     5.63705852508412233807453056382118699556756662e72
-     2.70686983054420215675911784186745327670050266e76
-     1.30277109018236713325248958831916182321469469e80
-     6.28300035623188169471632557335605421793373425e83
-     3.03590240089126254927158800341104055505805124e87
-     1.46947826096328253735160422033263210654528334e91
-     7.12416473540339088510115562375712909673904392e94))
-   (fl+ x 7.000198333407324)))
-
-(: fllog-gamma-taylor-neg-7+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-7+eps x)
-  ((make-flpolyfun
-    (+5.31301106573590200897337106433467557164151869e-14
-     -5.03596737376839319033525480958087182844986601e3
-     +1.26906411660485282940047764431761330962540069e7
-     -4.26234897647649129521641689329891672052035096e10
-     +1.61052333144508032407479397436457390656912554e14
-     -6.49103215888755446261074330125753000135307780e17
-     +2.72514281959020665462626702046286032474881585e21
-     -1.17679070972160310124859616823702810887510836e25
-     +5.18757080225788525722758914222250520804782104e28
-     -2.32310194156637801114545923844840993838349165e32
-     +1.05333746219281065206009120880147302639211980e36
-     -4.82426991259678266759054292661418820803932093e39
-     +2.22792101614921848435241950907062703630531062e43
-     -1.03608273550652442552036018281974271437287285e47
-     +4.84692731070476016126702851590916393164116867e50
-     -2.27908244708484583471179841061427804773346514e54
-     +1.07643563313754077061546826446905160613202497e58
-     -5.10406128115977026425966817266068851772181710e61
-     +2.42856118390926383792291521433738334610659660e65
-     -1.15911014378434091950170457728800186180055890e69
-     +5.54759904629395404906129519141374436420742647e72
-     -2.66178221396886203009894511168298544991620888e76
-     +1.28004691042726129933820514080552438749211119e80
-     -6.16847037831432940796431424756445185876829920e83
-     +2.97817923251961975033066678329168308250404735e87
-     -1.44038575256431930975064080992353469234753888e91
-     +6.97753832629543722195438695192947848095269032e94))
-   (fl+ x 6.999801507890638)))
-
-(: fllog-gamma-taylor-neg-6-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-6-eps x)
-  ((make-flpolyfun
-    (5.96373419303467500413792265481786840068918471e-13
-     7.23736629925709518153113039087848917130246729e2
-     2.60548410303403933758252826421735218541543110e5
-     1.25386984941127419905133271364532710453052978e8
-     6.78846569389324815646189948077493720661377202e10
-     3.92030195653034258327699392283536055154819091e13
-     2.35828439915423448508952653715714843386001618e16
-     1.45917470704069516669512400406851985503810018e19
-     9.21665329528624029220037775084067740031616086e21
-     5.91396340919928318917705315549706443020703352e24
-     3.84219185759390857523956199815669468967426722e27
-     2.52141462110708982986693669907718860598317088e30
-     1.66845159218827458030659413493976770775046283e33
-     1.11175581372838399194969164249804721425253752e36
-     7.45216788983554497707935428135827871164530098e38
-     5.02085075223011742997849667660296336748325148e41
-     3.39786791862042848358472219461791491184338177e44
-     2.30852966161124419756843153557542240458089730e47
-     1.57387334424066037164075966856835758499992029e50
-     1.07633283427581150041381904802190294929609939e53
-     7.38121913528046491626428063066656081632724397e55
-     5.07454028548546652282923260996205238775728209e58
-     3.49664243034293515162189387270168949733615312e61
-     2.41437081551384922759964267834853643796077387e64
-     1.67023842928535310631607098959951607194524987e67
-     1.15746431270476848578187718611073050993194347e70
-     8.03400643083259808484932459059707879728773282e72))
-   (fl+ x 6.001385294453154)))
-
-(: fllog-gamma-taylor-neg-6+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-6+eps x)
-  ((make-flpolyfun
-    (+3.98943097843441932465652026666091000412175563e-13
-     -7.16245430427834534714673409720501524934493419e2
-     +2.57851589639768891326867318498133764598929190e5
-     -1.23445282157985016580945759579913384375292671e8
-     +6.64866335820997155004760461801734186213432062e10
-     -3.81964423882096250884715503265367483472767970e13
-     +2.28581065302601343849063472135311113229589014e16
-     -1.40699335579708310084132549548594488557761312e19
-     +8.84094489001693642835942147140025472914301438e21
-     -5.64345082040892431617497604635292443260529529e24
-     +3.64742052778954305530816853872536028608224385e27
-     -2.38117731596356223311008014087648517813605274e30
-     +1.56747910244616295308347662889941379734448921e33
-     -1.03905428353497913012761193552317328229344863e36
-     +6.92870606139998047359222823627264086936374153e38
-     -4.64394960184288117953293901427853908990631646e41
-     +3.12649226193266320638056018879596813548202725e44
-     -2.11313383169320236892244849825165874991284698e47
-     +1.43318417230683724207672956565653826555288418e50
-     -9.75033396470380191538409915247952968713605747e52
-     +6.65183825327027441169299935628486491306778882e55
-     -4.54936691657501621666687834880905567118335622e58
-     +3.11850297553268885844035989960765352437005977e61
-     -2.14209926096916557565934538015232402947359683e64
-     +1.47419444196325716857338412118878929175682948e67
-     -1.01630622646690800002319571389560738233771459e70
-     +7.01761972686052721453154108904317582064920521e72))
-   (fl+ x 5.998607480080876)))
-
-(: fllog-gamma-taylor-neg-5-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-5-eps x)
-  ((make-flpolyfun
-    (5.41885092655381025719595516331601539815956969e-15
-     1.23362184563354043865731028461414057744606020e2
-     7.40476243222876130900574826280080918143125990e3
-     6.00556168452820552068729377561100555529370641e5
-     5.48074863566570265324417981653566617471824549e7
-     5.33525074338452723153487397127655583797976263e9
-     5.41001609074791125558485600315244634161655653e11
-     5.64256713562444548684611921421374417220809909e13
-     6.00772100286369220122905461643344677542613570e15
-     6.49803732093028846484598058316207969435715638e17
-     7.11622512374105590783954671230253655863195756e19
-     7.87194337362483304708962106716775948612245357e21
-     8.78048223063437069160511062733533974970161719e23
-     9.86236859897728368260206634391870540840187331e25
-     1.11434973580101773101371794731069019794053142e28
-     1.26556151272168476205402111916756928204819325e30
-     1.44370846592998098137993770587584944505535249e32
-     1.65339085935578868895584777638475475524988199e34
-     1.90010200608912963279940507532952645389745432e36
-     2.19038667338894880563303719195863734661098943e38
-     2.53203300058817032335469415689374134458741212e40
-     2.93430349185055042449367970919755908893213651e42
-     3.40821208626557548218602650412971833405190776e44
-     3.96685590281426661708411918644940947372395895e46
-     4.62581209214915604420872188953110757048353555e48
-     5.40361237948187342779585787258489671029005435e50
-     6.32231043483605471166429476809359358293138224e52))
-   (fl+ x 5.0082181683225935)))
-
-(: fllog-gamma-taylor-neg-5+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-5+eps x)
-  ((make-flpolyfun
-    (+1.76836193508496134514687044485233022507412166e-14
-     -1.16535781616245753768503617985375944578579193e2
-     +6.99523595489431486546890813466674970256552674e3
-     -5.51419997851318044632166207860447589187985901e5
-     +4.89115827090625556320989173735148990068192623e7
-     -4.62774717173966484754236449207884450962286344e9
-     +4.56096042262246697956773952789936663634595578e11
-     -4.62357002765258798875348281864575148589999927e13
-     +4.78468574036034408626909392503392949786418539e15
-     -5.03000968987250701086043900444438734899839871e17
-     +5.35401097142582048519214039246283264279679805e19
-     -5.75644682625551268823564997647690621683299800e21
-     +6.24070799300926007561084330972156813164729147e23
-     -6.81302027775316489238836963643326917419501011e25
-     +7.48208993021257914055045142198078739956243209e27
-     -8.25900304352361522965771494862295861316385777e29
-     +9.15728705360304464559850646551668374267131592e31
-     -1.01930889756736968113544397731888110415266705e34
-     +1.13854488660950913720734782365262882725974297e36
-     -1.27566601891368590344217106037433472891809611e38
-     +1.43327167410740289698783159819255907081451586e40
-     -1.61438511479149974470063382576325819998775478e42
-     +1.82251740349289405753525333412414171829955385e44
-     -2.06174264827513679839882304004797713214906927e46
-     +2.33678617524058001428564879357591130591224694e48
-     -2.65312757448388074721204114962473788958612848e50
-     +3.01712094482992778631151481754365566073619428e52))
-   (fl+ x 4.991544640560048)))
-
-(: fllog-gamma-taylor-neg-4-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-4-eps x)
-  ((make-flpolyfun
-    (1.81301489023985618481731357730667339196237550e-14
-     2.67904808861410321327214397331379787908541540e1
-     3.24255322937858253736006013570778920615832578e2
-     5.46569182077741616725319810542178832035822966e3
-     1.04145555201462573673149727720949548371162345e5
-     2.11666941757771701328409351874486396871812932e6
-     4.48122159501603318236465855420526550067324334e7
-     9.75830163538331950363973953929618675079580747e8
-     2.16923649607162932956165726741988370482884479e10
-     4.89867910498275971952758694178019464785226189e11
-     1.12007244162039286479579040474081852339397694e13
-     2.58689045256111345612494171926626369243546123e14
-     6.02440400096176701173680787572491817237764037e15
-     1.41278668508301263198302773720333978605091028e17
-     3.33285577879941677496169133681524910584979240e18
-     7.90274391149113501309340654162886498293963454e19
-     1.88223479030962949513233495444370666816866525e21
-     4.50059018694097294452319570025381466521375657e22
-     1.07986756381211853649283994199009213197263987e24
-     2.59904627328961985271105601748597429270721239e25
-     6.27281137238709819146504016485952916588925394e26
-     1.51774055997381403059397905691577190791272758e28
-     3.68060121745351564615021740987651034473640274e29
-     8.94413244088949726258433997879455026504805354e30
-     2.17760661400824862848456267793034288891939313e32
-     5.31098740106663851246556066853754013568800558e33
-     1.29737804140610088127865888231535370941492990e35))
-   (fl+ x 4.039361839740536)))
-
-(: fllog-gamma-taylor-neg-4+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-4+eps x)
-  ((make-flpolyfun
-    (+8.78939314434977824362286615570184975741305041e-15
-     -2.07250608458039191801398354912074701126554797e1
-     +2.51714682586894146537732187837038486323386563e2
-     -3.73060471568071868389371231096324364995674596e3
-     +6.25880819187684354729315259842094937424442594e4
-     -1.11999150166557525866438224883417960801815493e6
-     +2.08771147265045175361955519775825227765181884e7
-     -4.00276998187490238282584216189014567996179702e8
-     +7.83439818373891296219323306813420731726214027e9
-     -1.55772242416585467557455053761730286461842180e11
-     +3.13595292529358977965704401186423364249660428e12
-     -6.37696161822735582434913575368842994406753210e13
-     +1.30756171365397339075006701778228546488926118e15
-     -2.69983387930444407360331692215175599784681891e16
-     +5.60775863730578162721388295019809496365914994e17
-     -1.17074697159654892886605119268916507675086169e19
-     +2.45511179588604297371791674939611648546057739e20
-     -5.16867574457309810939753320374439139711959337e21
-     +1.09192461783841750528498906123439438876072262e23
-     -2.31392093346042541326971161202647385124381260e24
-     +4.91710037482801295013628404667352873797929314e25
-     -1.04750650406095202238738008578691313752209369e27
-     +2.23661017141897372233705223490312596918865879e28
-     -4.78544240743225380874419144451265275847103823e29
-     +1.02583058100822899833668001151690176951567802e31
-     -2.20284443421392884416725580252156642000839635e32
-     +4.73791693429605430177700526875053064928423719e33))
-   (fl+ x 3.9552942848585984)))
-
-(: fllog-gamma-taylor-neg-3-eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-3-eps x)
-  ((make-flpolyfun
-    (1.69786559061210843022272847964297037675859473e-15
-     7.78188465813136214399528129997442792941073176e0
-     2.58313383723880324208953213398090230714514980e1
-     1.12268986297176516519245402454125678034401274e2
-     5.88890742238004921853852404638860526426305979e2
-     3.27719378549536664789687328052979137659712232e3
-     1.90230619843565318084065380848899905923057322e4
-     1.13559664237136370180852663772361533676044070e5
-     6.92049602289783024945417378060367661802816637e5
-     4.28437744364603821541980538763698670942244785e6
-     2.68555250555762961389414458921497932348535306e7
-     1.70037345821745965876919924552878737697863407e8
-     1.08557322157002487766499595339125057568363179e9
-     6.97911539667148383495178196114992142539256805e9
-     4.51355833575162388564796789592490869277550350e10
-     2.93399385882337138148673434081036371240625868e11
-     1.91572797345398693597903943399980424905205048e12
-     1.25576468663909262494300353917876036735521610e13
-     8.26015213762303044035070558862351046563406452e13
-     5.45017333309697979666936223400225945240521114e14
-     3.60609599644037084765420160822868349591590907e15
-     2.39194587729231083416912378422842318565585423e16
-     1.59019845254247279515221145045196949680406309e17
-     1.05937454968300158726334055013820581387376515e18
-     7.07081530914871512696425122433809109739803684e18
-     4.72763664773893258007091476870784841957917544e19
-     3.16602336231497561963030757035805419348902704e20))
-   (fl+ x 3.14358088834998)))
-
-(: fllog-gamma-taylor-neg-3+eps (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-3+eps x)
-  ((make-flpolyfun
-    (+1.73350924402450086109664880252280930803796840e-16
-     -1.91435018561160055062671998360109773008757615e0
-     +9.57518947570967212969871531897887298425867401e0
-     -2.00951349168426252669134955591785433284090043e1
-     +6.26272827135138013766227814092855203458008016e1
-     -1.94766155303446568125118695588276590924110440e2
-     +6.46905999712929665878051101089935247949317056e2
-     -2.19311277648062925608544541675088274405618955e3
-     +7.61039798665835057465104404450865651687943724e3
-     -2.68045784206181952947864995136383095044210192e4
-     +9.56174516433500463141401730092716465102711170e4
-     -3.44497593434834251677126191694547877536433278e5
-     +1.25156744652510559191680924102071419509151639e6
-     -4.57871659458173884379082476598177277475632514e6
-     +1.68504842706974508404657029185505612957061835e7
-     -6.23306848324077503176646009404048417739453040e7
-     +2.31593359803530705843535585519480903266158016e8
-     -8.63873252929326222756433185277849724061407159e8
-     +3.23354812607607746932238396579196197173278373e9
-     -1.21409064008644206975493902628524125704746969e10
-     +4.57117235417958792595283855057138618743523254e10
-     -1.72540549493287770025997384282337316967575029e11
-     +6.52740666207530857195855094792769006968850608e11
-     -2.47450533666850553797231795437602547002229320e12
-     +9.39848534763072962083260627797430059451185761e12
-     -3.57587213746677906598735906878666200860291196e13
-     +1.36270397145886520070135314755598407978744695e14))
-   (fl+ x 2.7476826467274127)))
-
-(: fllog-gamma-taylor-neg-2.5 (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-2.5 x)
-  ((make-flpolyfun
-    (5.61919235895009645091256851695098111749959486e-17
-     1.51560344802165768188749164398339627893778105e0
-     4.85832095163399627746734377392871693605230490e0
-     1.41129114307798124401510783653592177347873738e0
-     8.72178258381534729322013445636550188290755750e0
-     5.80041456659987799413315121154253330844366082e0
-     2.48249421218940773331265335049735451396738220e1
-     2.40388230622929786781070091918937520366699213e1
-     8.22291568270425660106801850355547569796638822e1
-     1.00648123545511701102453344855177421851423816e2
-     2.96436413507613369083757276470488051933710099e2
-     4.25179845684382619948469561167761367915934946e2
-     1.13045785817751386159338509375334334152608605e3
-     1.81120541880187359111104929471617512361784951e3
-     4.48721845318900263604051887722090475536449478e3
-     7.77615810234425735666130539513148262342615631e3
-     1.83471706999770464528633009895266966505869873e4
-     3.36304570557943903790064207274422028127017659e4
-     7.67210360239843918816147110553574167448750938e4
-     1.46431998292134176729885025076314444052562342e5
-     3.26433702221563796981145197985984661873939623e5
-     6.41568327741749042873610986617199799626504025e5
-     1.40797959337829879108442601929312734834777980e6
-     2.82702369687106235551822865228378508072204174e6
-     6.13938581529136603068173225483911055935198571e6
-     1.25222596563403475911690432815529823250889260e7
-     2.70076153104356837368592373996661893611674396e7))
-   (fl+ x 2.4570247382208006)))
-
-(: fllog-gamma-taylor-neg-2.625 (Flonum -> Flonum))
-(define (fllog-gamma-taylor-neg-2.625 x)
-  ((make-flpolyfun
-    (-1.17511100308904859994666567899607070603472748e-1
-     -1.57662052808143238767682222467571768255158395e-1
-     +5.62280028708343342127100665301732994258009008e0
-     -5.03224286025454307606105505974515135386153910e0
-     +1.44026056764382911633999836745275241447715481e1
-     -2.48971464377258885456665463953421569146427274e1
-     +6.27638301132273807125391353825831515701418911e1
-     -1.33164187794833814803033486866170142306775977e2
-     +3.25020330318424079519181342335613727175845720e2
-     -7.50032453555325748153334099067598984903044042e2
-     +1.82939126670926077976630411313170194810520239e3
-     -4.39223051811670135063825899001404441576172064e3
-     +1.07991099207708003425000890908369348850196235e4
-     -2.64900388706763510403708190506232237093229157e4
-     +6.57316327437471829125602547425833118008518082e4
-     -1.63393764818489768773926609932691194453735854e5
-     +4.08791856900606820819408084967296134162542699e5
-     -1.02552442766763569800382316377975918319805950e6
-     +2.58350187169077781879301640113211587992619404e6))
-   (fl+ x 2.625)))
-
-(: fllog-gamma-special-negative (Flonum -> Flonum))
-;; For x < 0, either computes log(abs(gamma(x))) to good precision (so far, largest observed error is
-;; 11 ulps; usually <= 5) or returns 0.0. Having 0.0 as the "I won't compute this" value works fine,
-;; since log(abs(gamma(x))) has no zeros at any negative, rational x.
-(define (fllog-gamma-special-negative x)
-  (cond
-    [(x . fl>= . -10.0)
-     (cond
-       [(x . fl>= . -6.0)
-        (cond
-          [(x . fl>= . -4.0)
-           (cond
-             [(and (x . fl>= . -2.5775) (x . fl<= . -2.3359))
-              (fllog-gamma-taylor-neg-2.5 x)]
-             [(and (x . fl>= . (fl- -2.7476826467274127 6.9e-2))
-                   (x . fl<= . (fl+ -2.7476826467274127 6.9e-2)))
-              (fllog-gamma-taylor-neg-3+eps x)]
-             [(and (x . fl>= . -2.7) (x . fl<= . -2.575))
-              (fllog-gamma-taylor-neg-2.625 x)]
-             [(and (x . fl>= . (fl- -3.14358088834998 4.1e-2))
-                   (x . fl<= . (fl+ -3.14358088834998 4.1e-2)))
-              (fllog-gamma-taylor-neg-3-eps x)]
-             [(and (x . fl>= . (fl- -3.9552942848585984 1.25e-2))
-                   (x . fl<= . (fl+ -3.9552942848585984 1.25e-2)))
-              (fllog-gamma-taylor-neg-4+eps x)]
-             [else
-              0.0])]
-          [(and (x . fl>= . (fl- -4.039361839740536 1.1e-2))
-                (x . fl<= . (fl+ -4.039361839740536 1.1e-2)))
-           (fllog-gamma-taylor-neg-4-eps x)]
-          [(and (x . fl>= . (fl- -4.991544640560048 2.3e-3))
-                (x . fl<= . (fl+ -4.991544640560048 2.4e-3)))
-           (fllog-gamma-taylor-neg-5+eps x)]
-          [(and (x . fl>= . (fl- -5.0082181683225935 2.3e-3))
-                (x . fl<= . (fl+ -5.0082181683225935 2.3e-3)))
-           (fllog-gamma-taylor-neg-5-eps x)]
-          [(and (x . fl>= . (fl- -5.998607480080876 4.0e-4))
-                (x . fl<= . (fl+ -5.998607480080876 4.0e-4)))
-           (fllog-gamma-taylor-neg-6+eps x)]
-          [else
-           0.0])]
-       [(x . fl>= . -8.0)
-        (cond
-          [(and (x . fl>= . (fl- -6.001385294453154 4.0e-4))
-                (x . fl<= . (fl+ -6.001385294453154 4.0e-4)))
-           (fllog-gamma-taylor-neg-6-eps x)]
-          [(and (x . fl>= . (fl- -6.999801507890638 5.5e-5))
-                (x . fl<= . (fl+ -6.999801507890638 5.5e-5)))
-           (fllog-gamma-taylor-neg-7+eps x)]
-          [(and (x . fl>= . (fl- -7.000198333407324 5.5e-5))
-                (x . fl<= . (fl+ -7.000198333407324 5.5e-5)))
-           (fllog-gamma-taylor-neg-7-eps x)]
-          [(and (x . fl>= . (fl- -7.9999751970958215 7.1e-6))
-                (x . fl<= . (fl+ -7.9999751970958215 7.1e-6)))
-           (fllog-gamma-taylor-neg-8+eps x)]
-          [else
-           0.0])]
-       [(and (x . fl>= . (fl- -8.000024800270682 7.1e-6))
-             (x . fl<= . (fl+ -8.000024800270682 7.1e-6)))
-        (fllog-gamma-taylor-neg-8-eps x)]
-       [(and (x . fl>= . (fl- -8.999997244250979 7.8e-7))
-             (x . fl<= . (fl+ -8.999997244250979 7.8e-7)))
-        (fllog-gamma-taylor-neg-9+eps x)]
-       [(and (x . fl>= . (fl- -9.000002755714823 7.8e-7))
-             (x . fl<= . (fl+ -9.000002755714823 7.8e-7)))
-        (fllog-gamma-taylor-neg-9-eps x)]
-       [(and (x . fl>= . (fl- -9.99999972442663 8.0e-8))
-             (x . fl<= . (fl+ -9.99999972442663 8.0e-8)))
-        (fllog-gamma-taylor-neg-10+eps x)]
-       [else
-        0.0])]
-    [(x . fl>= . -13.0)
-     (cond
-       [(x . fl>= . -11.5)
-        (cond
-          [(and (x . fl>= . (fl- -10.000000275573013 8.0e-8))
-                (x . fl<= . (fl+ -10.000000275573013 8.0e-8)))
-           (fllog-gamma-taylor-neg-10-eps x)]
-          [(and (x . fl>= . (fl- -10.99999997494789 7.2e-9))
-                (x . fl<= . (fl+ -10.99999997494789 7.2e-9)))
-           (fllog-gamma-taylor-neg-11+eps x)]
-          [(and (x . fl>= . (fl- -11.000000025052106 7.2e-9))
-                (x . fl<= . (fl+ -11.000000025052106 7.2e-9)))
-           (fllog-gamma-taylor-neg-11-eps x)]
-          [else
-           0.0])]
-       [(and (x . fl>= . (fl- -11.999999997912326 6.0e-10))
-             (x . fl<= . (fl+ -11.999999997912326 6.0e-10)))
-        (fllog-gamma-taylor-neg-12+eps x)]
-       [(and (x . fl>= . (fl- -12.000000002087674 6.0e-10))
-             (x . fl<= . (fl+ -12.000000002087674 6.0e-10)))
-        (fllog-gamma-taylor-neg-12-eps x)]
-       [(and (x . fl>= . (fl- -12.99999999983941 4.5e-11))
-             (x . fl<= . (fl+ -12.99999999983941 4.5e-11)))
-        (fllog-gamma-taylor-neg-13+eps x)]
-       [else
-        0.0])]
-    [(x . fl>= . -15.0)
-     (cond
-       [(and (x . fl>= . (fl- -13.00000000016059 4.5e-11))
-             (x . fl<= . (fl+ -13.00000000016059 4.5e-11)))
-        (fllog-gamma-taylor-neg-13-eps x)]
-       [(and (x . fl>= . (fl- -13.99999999998853 3.4e-12))
-             (x . fl<= . (fl+ -13.99999999998853 3.4e-12)))
-        (fllog-gamma-taylor-neg-14+eps x)]
-       [(and (x . fl>= . (fl- -14.00000000001147 3.4e-12))
-             (x . fl<= . (fl+ -14.00000000001147 3.4e-12)))
-        (fllog-gamma-taylor-neg-14-eps x)]
-       [(and (x . fl>= . (fl- -14.999999999999236 2.1e-13))
-             (x . fl<= . (fl+ -14.999999999999236 2.1e-13)))
-        (fllog-gamma-taylor-neg-15+eps x)]
-       [else
-        0.0])]
-    [(and (x . fl>= . (fl- -15.000000000000764 2.1e-13))
-          (x . fl<= . (fl+ -15.000000000000764 2.1e-13)))
-     (fllog-gamma-taylor-neg-15-eps x)]
-    [(and (x . fl>= . (fl- -15.999999999999954 1e-14))
-          (x . fl<= . (fl+ -15.999999999999954 1e-14)))
-     (fllog-gamma-taylor-neg-16+eps x)]
-    [(and (x . fl>= . (fl- -16.000000000000046 1e-14))
-          (x . fl<= . (fl+ -16.000000000000046 1e-14)))
-     (fllog-gamma-taylor-neg-16-eps x)]
-    [else
-     0.0]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/log-gamma.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/log-gamma.rkt
deleted file mode 100644
index 37b2d8e4f2..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/log-gamma.rkt
+++ /dev/null
@@ -1,412 +0,0 @@
-#lang typed/racket/base
-
-(require (only-in racket/math exact-truncate)
-         "../../flonum.rkt"
-         "../../base.rkt"
-         "log-gamma-zeros.rkt"
-         "gamma.rkt")
-
-(provide fllog-gamma log-gamma)
-
-(define +fllog-gamma-max.0 2.5563481638716906e+305)
-
-(: fllog-gamma-stirling (Float -> Float))
-;; Computes log(Gamma(x)) using 5 terms from Stirling's series
-;; For x >= 143, relative error ε <= epsilon.0
-(define (fllog-gamma-stirling x)
-  (let* ([x  (fl- x 1.0)]
-         [log-x  (fllog x)])
-    (fl+ (fl+ (fl- (fl* x log-x) x)
-              (fl* 0.5 (fl+ (fllog (fl* 2.0 pi)) log-x)))
-         (let ([1/x  (fl/ 1.0 x)])
-           (fl* 1/x (fl+ (fl* #i-1/360 (fl* 1/x 1/x)) #i1/12))))))
-
-(: fllog-gamma-taylor-0.00 (Float -> Float))
-;; Good for -0.25 <= x <= 0.25
-(define (fllog-gamma-taylor-0.00 x)
-  (fl- (fl* x ((make-flpolyfun
-                (-5.7721566490153286060651209008240243104216e-1
-                 +8.2246703342411321823620758332301259460947e-1
-                 -4.0068563438653142846657938717048333025499e-1
-                 +2.7058080842778454787900092413529197569369e-1
-                 -2.0738555102867398526627309729140683361142e-1
-                 +1.6955717699740818995241965496515342131697e-1
-                 -1.4404989676884611811997107854997096565712e-1
-                 +1.2550966952474304242233565481358155815737e-1
-                 -1.1133426586956469049087252991471245116507e-1
-                 +1.000994575127818085337145958900319017006e-1
-                 -9.0954017145829042232609298411497266951692e-2
-                 +8.3353840546109004024886499837311639246699e-2
-                 -7.6932516411352191472827064348181338131867e-2
-                 +7.1432946295361336059232753221795380981961e-2
-                 -6.6668705882420468032903448567376337505842e-2
-                 +6.250095514121304074198328571797729512645e-2
-                 -5.882397865868458233895727060550370760077e-2
-                 +5.5555767627403611102214247869145663318357e-2
-                 -5.2631679379616660733627666155673426387014e-2
-                 +5.0000047698101693639805657601934172467295e-2
-                 -4.7619070330142227990783957939028779668856e-2
-                 +4.5454556293204669442408636529463034227041e-2
-                 -4.3478266053040259361351002947335603579408e-2
-                 +4.1666669150341210469144983851675330658383e-2
-                 -4.000000119214014058609120744254820277464e-2))
-               x))
-       (fllog (flabs x))))
-
-(: fllog-gamma-taylor-0.25 (Float -> Float))
-;; Good for 0.2 <= x <= 0.3
-(define (fllog-gamma-taylor-0.25 x)
-  ((make-flpolyfun
-    (+1.2880225246980774573706104402197172959254e0
-     -4.2274535333762654080895301460966835773672e0
-     +8.5986645772535553696356595596676120107535e0
-     -2.1554623322922820055556327863140664981215e1
-     +6.4115922667049516500949635159543127365351e1
-     -2.0486979490531611444631855960434965829803e2
-     +6.8271182467733512784147775999936646633190e2
-     -2.3406019221713673821639922031360341786831e3
-     +8.1920211733386271770257584477642417071823e3
-     -2.9127126102413786952705664233364266579143e4
-     +1.0485761076831147539267450999973685838075e5
-     -3.8130037145777091303332298313162618015895e5
-     +1.3981013390649692882433574562368969426983e6
-     -5.1622203119232470494907885079964686151354e6
-     +1.9173961145999447781172798758783596423575e7
-     -7.1582788269012640570224029670280449249173e7
-     +2.6843545600175936387731944917825625449913e8
-     -1.0105805402366187664874395906083166992963e9
-     +3.8177487075565563809425864802719934216549e9
-     -1.4467258260211284827499035133145761712036e10
-     +5.4975581388800576465277096191993634564536e10
-     -2.0943078624304805825772615550814087377792e11
-     +7.9964482020072760812343178266260768051649e11
-     -3.0595106164201741696941758669213590210283e12
-     +1.1728124029610666863432083838677809746289e13
-     -4.503599627370496015111579019136059236865e13))
-   (fl- x 0.25)))
-
-(: fllog-gamma-taylor-0.35 (Float -> Float))
-;; Good for 0.3 <= x <= 0.4
-(define (fllog-gamma-taylor-0.35 x)
-  ((make-flpolyfun
-    (+9.3458122714623255657034665561114707129281e-1
-     -2.9710708698259454387463064442084878587473e0
-     +4.6202295211029058483300084111499864142794e0
-     -7.9556316522059548941376774196765046265487e0
-     +1.6746588107729381853722502005240049590574e1
-     -3.8127454700915928345673649988447464150541e1
-     +9.0693847100977686331535034003589466561002e1
-     -2.2205503134099860114590905607713594917160e2
-     +5.5510435554655568572023613074757278601120e2
-     -1.4097672131852369301046404032575154781671e3
-     +3.6251013644124743041583769635697422453608e3
-     -9.4158380862889149009699386717380613087566e3
-     +2.4660521806577226426593494121580423161875e4
-     -6.5038734381109325447389888110993862111771e4
-     +1.7255174121793485037024340821203990106480e5
-     -4.6013797446743480714344276040988335634682e5
-     +1.2325124301416449829627359292354595578751e6
-     -3.3143191388536834678869738614710180597041e6
-     +8.9434008501593831003677839979897453897692e6
-     -2.4207701548801412719812272885598523140688e7
-     +6.5706618489250456194219732829388693984488e7
-     -1.7879351969839140350109553939332746596063e8
-     +4.8761869008634574265006998747622410016702e8
-     -1.3326225070681491886298992486407039142238e9
-     +3.6488473407817484073734090581475464119248e9
-     -1.0008266991858446872669247506273021213142e10))
-   (fl- x 0.35)))
-
-(: fllog-gamma-taylor-0.50 (Float -> Float))
-;; Good for 0.4 <= x <= 0.6
-(define (fllog-gamma-taylor-0.50 x)
-  ((make-flpolyfun
-    (+5.7236494292470008707171367567652935582365e-1
-     -1.9635100260214234794409763329987555671932e0
-     +2.4674011002723396547086227499690377838284e0
-     -2.8047994407057199992660557101933833117850e0
-     +4.0587121264167682181850138620293796354053e0
-     -6.4289520818888935432544660160336118419539e0
-     +1.0682102150836715967002438262804665542969e1
-     -1.8294336889643457001236326975846312638455e1
-     +3.2004965728809475817695591977463297330129e1
-     -5.6891809859347556840835862786418062545350e1
-     +1.0240174503557579012999003159550263543971e2
-     -1.8618287309751204945015123384833490545011e2
-     +3.4133397703631637148191021683379116271523e2
-     -6.3015424192538580035392648407595334063812e2
-     +1.1702859591569047686584101960326737266275e3
-     -2.1845334856492714760341472992072204510539e3
-     +4.0960000951793966250258746295276420361119e3
-     -7.7101177067724468917494684155339764589405e3
-     +1.4563555593150464825167749579161451619264e4
-     -2.7594105286901080206051448205759553700168e4
-     +5.2428800015036983408359217419948124894894e4
-     -9.9864380961928103573100568175792144311320e4
-     +1.9065018182425722465630287142143639284758e5
-     -3.6472208696039589096044455278104007553545e5    
-     +6.9905066666914181140109626025108513265177e5
-     -1.3421772800015840896262969798376701341757e6))
-   (fl- x 0.5)))
-
-(: fllog-gamma-taylor-0.75 (Float -> Float))
-;; Good for 0.55 <= x <= 0.95
-(define (fllog-gamma-taylor-0.75 x)
-  ((make-flpolyfun
-    (+2.0328095143129537148143297186242969975967e-1
-     -1.0858608797864721696268867628171806931701e0
-     +1.2709398238358032491988314402085391245601e0
-     -8.8377220272293993857211781840640151306496e-1
-     +8.2347135561877499001058663292694680113391e-1
-     -8.5667171512847893782435290872592064449950e-1
-     +9.4271297621469404667828882013212841811724e-1
-     -1.0731997029951139942576497722938390391533e0
-     +1.2500532365986323043130984663624093306882e0
-     -1.4805455721621498022975132817814440767646e0
-     +1.7761481181337004352823540578403095184479e0
-     -2.1526459337642405867437897637062028968286e0
-     +2.6308757825693465467919143116597833317597e0
-     -3.2379295134270085772495537411513722635691e0
-     +4.0088272799485265938930157299134890960034e0
-     -4.9887426871564629090301417504909640897591e0
-     +6.2359175733403762705424672939794981911256e0
-     -7.8254593925079467335525526631300376066016e0
-     +9.8542790701861880654077061516254611016851e0
-     -1.2447508711571266543755503178318247050213e1
-     +1.5766843449126578573345890445253001140810e1
-     -2.0021388006808847242857973248859918171351e1
-     +2.5481766281397976151808667749688257328831e1
-     -3.2498484383736992094096004929199618085860e1
-     +4.1525841075370756346859758598306419016717e1
-     -5.3153076531697230407881186981792953854319e1))
-   (fl- x 0.75)))
-
-(: fllog-gamma-taylor-1.00 (Float -> Float))
-;; Good for 0.75 <= x <= 1.25
-(define (fllog-gamma-taylor-1.00 x)
-  (fl* (fl- x 1.0)
-       ((make-flpolyfun
-         (-5.7721566490153286060651209008240243104216e-1
-          +8.2246703342411321823620758332301259460947e-1
-          -4.0068563438653142846657938717048333025499e-1
-          +2.7058080842778454787900092413529197569369e-1
-          -2.0738555102867398526627309729140683361142e-1
-          +1.6955717699740818995241965496515342131697e-1
-          -1.4404989676884611811997107854997096565712e-1
-          +1.2550966952474304242233565481358155815737e-1
-          -1.1133426586956469049087252991471245116507e-1
-          +1.0009945751278180853371459589003190170060e-1
-          -9.0954017145829042232609298411497266951692e-2
-          +8.3353840546109004024886499837311639246699e-2
-          -7.6932516411352191472827064348181338131867e-2
-          +7.1432946295361336059232753221795380981961e-2
-          -6.6668705882420468032903448567376337505842e-2
-          +6.2500955141213040741983285717977295126450e-2
-          -5.8823978658684582338957270605503707600770e-2
-          +5.5555767627403611102214247869145663318357e-2
-          -5.2631679379616660733627666155673426387014e-2
-          +5.0000047698101693639805657601934172467295e-2
-          -4.7619070330142227990783957939028779668856e-2
-          +4.5454556293204669442408636529463034227041e-2
-          -4.3478266053040259361351002947335603579408e-2
-          +4.1666669150341210469144983851675330658383e-2
-          -4.0000001192140140586091207442548202774640e-2))
-        (fl- x 1.0))))
-
-(: fllog-gamma-taylor-1.50 (Float -> Float))
-;; Good for 1.15 <= x <= 1.9
-(define (fllog-gamma-taylor-1.50 x)
-  ((make-flpolyfun
-    (-1.2078223763524522234551844578164721225185e-1
-     +3.6489973978576520559023667001244432806837e-2
-     +4.6740110027233965470862274996903778382841e-1
-     -1.3813277403905333259938904352671664511829e-1
-     +5.8712126416768218185013862029379635405284e-2
-     -2.8952081888893543254466016033611841953893e-2
-     +1.5435484170049300335771596137998876302295e-2
-     -8.6226039291712869506126901320269241689428e-3
-     +4.9657288094758176955919774632973301288730e-3
-     -2.9209704586679519469738975291736564606011e-3
-     +1.7450355757901299900315955026354397136770e-3
-     -1.0549156938676319694156665167236319325019e-3
-     +6.4370298303814857688350045782938190040240e-4
-     -3.9577153964650777263792210718679196822994e-4
-     +2.4487119048294412448174695944091318291752e-4
-     -1.5231593814270081396587388711772058669604e-4
-     +9.5179396625025874629527642036111920748339e-5
-     -5.9713623362337703709651623517764060417344e-5
-     +3.7594909269612194023605896063708381243259e-5
-     -2.3743185469209342942601658963326064219265e-5
-     +1.5036983408359217419948124894894133810908e-5
-     -9.5471511921481872234111919303675575211366e-6
-     +6.0754064744846896032545746657610345645862e-6
-     -3.8741518300097701723444233615366600085264e-6
-     +2.4751447344295935844184659851074357373265e-6
-     -1.5840896262969798376701341756813850557999e-6))
-   (fl- x 1.5)))
-
-(: fllog-gamma-taylor-2.00 (Float -> Float))
-;; Good for 1.6 <= x <= 2.55
-(define (fllog-gamma-taylor-2.00 x)
-  (fl* (fl- x 2.0)
-       ((make-flpolyfun
-         (+4.2278433509846713939348790991759756895784e-1
-          +3.2246703342411321823620758332301259460947e-1
-          -6.7352301053198095133246053837149996921661e-2
-          +2.0580808427784547879000924135291975693686e-2
-          -7.3855510286739852662730972914068336114162e-3
-          +2.8905103307415232857529882984867546503010e-3
-          -1.1927539117032609771139356928281085142662e-3
-          +5.0966952474304242233565481358155815736809e-4
-          -2.2315475845357937976141880360134005395629e-4
-          +9.9457512781808533714595890031901700599964e-5
-          -4.4926236738133141700207502406357860783221e-5
-          +2.0507212775670691553166503978305913365992e-5
-          -9.4394882752683959039874251044150549438348e-6
-          +4.3748667899074878041817932239524105325324e-6
-          -2.0392157538013662367819007096708391751769e-6
-          +9.5514121304074198328571797729512645039176e-7
-          -4.4924691987645660432942903311936547590378e-7
-          +2.1207184805554665869231359010776280096232e-7
-          -1.0043224823968099608720830500533438202816e-7
-          +4.7698101693639805657601934172467295268577e-8
-          -2.2711094608943164910319981160621236400060e-8
-          +1.0838659214896954091074917579681586085324e-8
-          -5.1834750419700466551212486470576691703107e-9
-          +2.4836745438024783171850086639917157755945e-9
-          -1.1921401405860912074425482027746404023922e-9))
-        (fl- x 2.0))))
-
-(: fllog-gamma-taylor-3.00 (Float -> Float))
-;; Good for 2.2 <= x <= 3.85
-(define (fllog-gamma-taylor-3.00 x)
-  ((make-flpolyfun
-    (+6.9314718055994530941723212145817656807550e-1
-     +9.2278433509846713939348790991759756895784e-1
-     +1.9746703342411321823620758332301259460947e-1
-     -2.5685634386531428466579387170483330254994e-2
-     +4.9558084277845478790009241352919756936856e-3
-     -1.1355510286739852662730972914068336114162e-3
-     +2.8634366407485661908632163182008798363431e-4
-     -7.6682483131832405685364264256679942837650e-5
-     +2.1388274743042422335654813581558157368093e-5
-     -6.1408695646904908725299147124511650673996e-6
-     +1.8012627818085337145958900319017005999641e-6
-     -5.3703219267859624566204786090331532867543e-7
-     +1.6216069233735821983317064497258003265830e-7
-     -4.9464236806857442448963565953516482296279e-8
-     +1.5212772050344947038936081095267675389550e-8
-     -4.7105454680329034485673763375058418435462e-9
-     +1.4668966344919832857179772951264503917565e-9
-     -4.5900627351542785884079782524782884495948e-10
-     +1.4422218749110313675803455220724540676060e-10
-     -4.5478091654680297734620794808066238685290e-11
-     +1.4385873327305657601934172467295268576888e-11
-     -4.5632659372125293676002082402840191072311e-12
-     +1.4510739168404547112812160452224489605314e-12
-     -4.6245280564448120820516879679960509329496e-13
-     +1.4767816120227551834199732504910892780276e-13
-     -4.7245078278707442548202774640402392180051e-14))
-   (fl- x 3.0)))
-
-(: fllog-gamma-taylor-4.00 (Float -> Float))
-;; Good for 2.95 <= x <= 5.2
-(define (fllog-gamma-taylor-4.00 x)
-  ((make-flpolyfun
-    (+1.7917594692280550008124773583807022727230e0
-     +1.2561176684318004727268212432509309022912e0
-     +1.4191147786855766268065202776745703905392e-1
-     -1.3339955374185749454233708158137651242649e-2
-     +1.8693886746981281259145043822055559405991e-3
-     -3.1250576118427333211671869058378834392645e-4
-     +5.7719978661047748487327576035908742665064e-5
-     -1.1361430156458442657080248318343016846479e-5
-     +2.3363009585583497857386422662098872873405e-6
-     -4.9584029521372863551771580419982578412385e-7
-     +1.0775400096550504349223035942629881510428e-7
-     -2.3847713635254224115484323789557212087699e-8
-     +5.3543237407814910272762308544872747942770e-9
-     -1.2161233925261412779191308402571721339304e-9
-     +2.7883218400430620027947022687788898118330e-10
-     -6.4430842949148520985319622895686038139193e-11
-     +1.4985814153309870848584571810776705153549e-11
-     -3.5048396836871796660863826389900181909766e-12
-     +8.2358795148107109192169064520359062021452e-13
-     -1.9432337901017173479568063057928609389652e-13
-     +4.6013373343451035322886311091085999887070e-14
-     -1.0929443891193949628371365298531818267889e-14
-     +2.6032144200298055629043122724648881160952e-15
-     -6.2156719159210783121433122139932582601310e-16
-     +1.4873780760261127809520410055697145662790e-16
-     -3.5662792412112287754095936864694572751781e-17))
-   (fl- x 4.0)))
-
-(: fllog-gamma-integer (Float -> Float))
-(define (fllog-gamma-integer x)
-  (cond [(x . fl<= . 0.0)  +inf.0]
-        [else  (fllog-factorial (fl- x 1.0))]))
-
-(: fllog-gamma-large-negative (Float -> Float))
-(define (fllog-gamma-large-negative x)
-  (cond [(x . fl< . -170.0)  (fl- (fl- (fllog pi) (fllog (flabs (fl* x (flsinpix x)))))
-                                  (fllog-gamma (- x)))]
-        [else  (fllog (flabs (flgamma x)))]))
-
-(: fllog-gamma-small-positive (Float -> Float))
-;; Good for 0 <= x <= 5
-(define (fllog-gamma-small-positive x)
-  (cond [(x . fl< . 0.85)
-         (cond [(x . fl< . 0.2)   (fllog-gamma-taylor-0.00 x)]
-               [(x . fl< . 0.3)   (fllog-gamma-taylor-0.25 x)]
-               [(x . fl< . 0.4)   (fllog-gamma-taylor-0.35 x)]
-               [(x . fl< . 0.6)   (fllog-gamma-taylor-0.50 x)]
-               [else              (fllog-gamma-taylor-0.75 x)])]
-        [else
-         (cond [(x . fl< . 1.20)  (fllog-gamma-taylor-1.00 x)]
-               [(x . fl< . 1.75)  (fllog-gamma-taylor-1.50 x)]
-               [(x . fl< . 2.35)  (fllog-gamma-taylor-2.00 x)]
-               [(x . fl< . 3.4)   (fllog-gamma-taylor-3.00 x)]
-               [else              (fllog-gamma-taylor-4.00 x)])]))
-
-(: fllog-gamma-small-negative (Float -> Float))
-(define (fllog-gamma-small-negative x)
-  (cond [(x . fl> . -0.25)  (fllog-gamma-taylor-0.00 x)]
-        [else  (fllog (flabs (flgamma x)))]))
-
-(: fllog-gamma-large-positive (Float -> Float))
-(define (fllog-gamma-large-positive x)
-  (cond [(x . fl< . 150.0)  (fllog (flgamma x))]
-        [else  (fllog-gamma-stirling x)]))
-
-(define: fllog-gamma-hash : (HashTable Float Float) (make-weak-hash))
-
-(: fllog-gamma (Float -> Float))
-(define (fllog-gamma x)
-  (cond [(integer? x)  (fllog-gamma-integer x)]
-        [(x . fl> . +fllog-gamma-max.0)  +inf.0]
-        [(x . fl= . -inf.0)  +inf.0]
-        [(eqv? x +nan.0)     +nan.0]
-        [else
-         (hash-ref!
-          fllog-gamma-hash x
-          (λ ()
-            (cond [(x . fl< . 0.0)
-                   (define y (fllog-gamma-special-negative x))
-                   (cond [(not (fl= y 0.0))  y]
-                         [(x . fl< . -5.5)  (fllog-gamma-large-negative x)]
-                         [else  (fllog-gamma-small-negative x)])]
-                  [(x . fl< . 4.5)  (fllog-gamma-small-positive x)]
-                  [else  (fllog-gamma-large-positive x)])))]))
-
-(: log-gamma (case-> (One -> Zero)
-                     (Flonum -> Flonum)
-                     (Real -> (U Zero Flonum))))
-(define (log-gamma x)
-  (cond [(flonum? x)  (fllog-gamma x)]
-        [(single-flonum? x)  (fllog-gamma (fl x))]
-        [(integer? x)
-         (cond [(x . <= . 0)
-                (raise-argument-error 'log-gamma "Real, not Zero or Negative-Integer" x)]
-               [(eqv? x 1)  0]
-               [else  (fllog-factorial (fl (- x 1)))])]
-        [else  (fllog-gamma (fl x))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/psi.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/psi.rkt
deleted file mode 100644
index d57d2c5e81..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/psi.rkt
+++ /dev/null
@@ -1,250 +0,0 @@
-#lang typed/racket/base
-
-(require "../../flonum.rkt"
-         "../../base.rkt"
-         "../polynomial/chebyshev.rkt"
-         "../number-theory/bernoulli.rkt"
-         "gamma.rkt"
-         "hurwitz-zeta.rkt"
-         "tan-diff.rkt")
-
-(provide flpsi0 flpsi psi0 psi)
-
-(: flpsi0-huge (Flonum -> Flonum))
-;; Compute using first two terms from asymptotic expansion
-;; Error <= 1 ulp for x >= 1e7
-(define (flpsi0-huge x)
-  (fl- (fllog x) (fl/ 0.5 x)))
-
-(: flpsi0-large (Flonum -> Flonum))
-;; Compute using more terms from asymptotic expansion
-;; Error <= 1 ulp for x >= 44
-(define (flpsi0-large x)
-  (define 1/x (/ 1.0 x))
-  (define 1/x^2 (* 1/x 1/x))
-  (+ (fllog x)
-     (let* ([y  (* 1/x^2 #i-1/252)]
-            [y  (* 1/x^2 (+ #i1/120 y))]
-            [y  (* 1/x (+ #i-1/12 y))])
-       (* 1/x (+ -0.5 y)))))
-
-(: flpsi0-15-44 (Flonum -> Flonum))
-;; Compute using Chebyshev fit of transformed function
-;; Error <= 1 ulp for 15 <= x <= 44
-(define (flpsi0-15-44 x)
-  (define y
-    ((inline-chebyshev-flpoly-fun
-      15.0 44.0
-      (-2.651473128433205899236218386166733001125e6
-       -1.762146136898477454946670140604454842406e6
-       -5.717880156460911821842439315667552305722e5
-       -8.999795051532912396661010381758994001778e4
-       -5.525632813934147220013901752731996650924e3
-       +3.730714289863418037571565563246348880127e-7
-       -9.689086103062769553596723282091729538813e-8
-       +2.512217593011105663102858605710866764550e-8
-       -6.502769240064928944990050767511278012820e-9
-       +1.679934847962426417907078746025458161173e-9
-       -4.316007423661544654578361918157615904084e-10
-       +1.042642491290735190419839693626327816406e-10))
-     x))
-  (+ (/ y (flexpt x 5.0)) (fllog x) (/ 0.5 x)))
-
-(: flpsi0-6-15 (Flonum -> Flonum))
-;; Error <= 1 ulp for 6 <= x <= 15
-(define (flpsi0-6-15 x)
-  (define y
-    ((inline-chebyshev-flpoly-fun
-      6.0 15.0
-      (-1.925244301146350628816428684716550045429e4
-       -1.198353263149330621624048804034028776287e4
-       -3.477937539308286982692458873651726693812e3
-       -4.803046790639916261784265178273773686249e2
-       -2.562890803820053728218998699641891321552e1
-       +3.740788808963323665370593041281819399850e-7
-       -7.713638977946100306711746793694236435924e-8
-       +1.565178892640717100414675722794707618947e-8
-       -3.117542465640122863625790111806482043942e-9
-       +6.073503129025465167965511518460566324779e-10
-       -1.150949496047179890084998241564162255119e-10
-       +2.102858491281106124889246275868833089257e-11
-       -3.647260410862808863678434035974178985902e-12
-       +5.827390822374468084948661977003242859188e-13
-       -7.999114123557451949902041477681255993810e-14))
-     x))
-  (+ (/ y (flexpt x 5.0)) (fllog x)))
-
-(: flpsi0-1.9-3 (Flonum -> Flonum))
-(define (flpsi0-1.9-3 x)
-  (define y
-    ((inline-chebyshev-flpoly-fun
-      1.9 3.0
-      (-1.068595135558250365970154135318779762977
-       0.007555110290613685894455357538792217876164
-       -8.211196131506054788097165956947618267216e-4
-       8.819898077656088066728485086945404403996e-5
-       -9.377207860942770361265708932757532015772e-6
-       9.882656181596999489012188167296378462293e-7
-       -1.033878691914051272793824247210082411098e-7
-       1.075053486743124253187897895133480499813e-8
-       -1.112459077942683078328275732383680238168e-9
-       1.146881360570377686259482136117612783879e-10
-       -1.179172668817595317199544685547649548159e-11
-       1.210211518974043571256683371091400286333e-12
-       -1.240872724505738918165638170689453141739e-13
-       1.272005760582855661944481497028186095588e-14
-       -1.304284165442490577500377306573196471693e-15
-       1.324746805869742319628788142120853886066e-16))
-     x))
-  (+ (/ y (flexpt x 1.0)) (fllog x)))
-
-(: flpsi0-pos-zero (Flonum -> Flonum))
-;; Error <= 2 ulp for 1.01 <= x <= 1.9
-(define (flpsi0-pos-zero x)
-  ((make-flpolyfun
-    (1.0585432012233855e-08
-     +9.6767223576078877096707761813142672147231142e-1
-     -4.42763160500353127553797599467585510491966309e-1
-     +2.58499753782129775648776735361540543429029315e-1
-     -1.63942699544933748044376456834206467101233261e-1
-     +1.07824045952487191135128855124325739325915008e-1
-     -7.21995575193409626696893908469264780134510431e-2
-     +4.8804285262128765080401907661996397609430272e-2
-     -3.31611242500726233186197345853966159593666507e-2
-     +2.25976465448926011125449117808694365399392534e-2
-     -1.54247646368189203846188963269378209631264895e-2
-     +1.0538790670881555307791836736009529596710663e-2
-     -7.20453368572977191622981741327584775896463279e-3
-     +4.92678087965504785805744172756649359819423221e-3
-     -3.36980127720035923906475716305572919765314786e-3
-     +2.30512605073145773629820036982065731913189791e-3
-     -1.57693657080739955525227889461909068304999766e-3
-     +1.07882505658776450345367614926996141127935916e-3
-     -7.3807083404537248486922908431997361289422551e-4
-     +5.04953190252646215739884819303074593735197609e-4
-     -3.45467970810508971431806463930371137534420811e-4
-     +2.36355976724137594774864968876273185881939724e-4
-     -1.61706193084464479583646631218793971111171482e-4
-     +1.10633707815531817492134312083342362402565131e-4
-     -7.56917816597543344357441178188820822372883337e-5
-     +5.1785747875351335968463825889133484772977912e-5
-     -3.54300637882398506423667399737040919259208752e-5
-     +2.42400610389497340053120082460952804952267374e-5
-     -1.65842386724073585234799128562703946147149189e-5
-     +1.13463820371245229094354235118485703293845643e-5
-     -7.76281586742261875732585414254027665196056168e-6
-     ))
-   (- x 1.46163215590743)))
-
-(: flpsi0-taylor-1 (Flonum -> Flonum))
-;; Error <= 1 ulp for 0.75 <= x <= 1.23
-(define (flpsi0-taylor-1 x)
-  ((make-flpolyfun
-    (-5.77215664901532860606512090082402431042159336e-1
-     +1.6449340668482264364724151666460251892189499
-     -1.20205690315959428539973816151144999076498629
-     +1.08232323371113819151600369654116790277475095
-     -1.03692775514336992633136548645703416805708092
-     +1.01734306198444913971451792979092052790181749
-     -1.00834927738192282683979754984979675959986356
-     +1.00407735619794433937868523850865246525896079
-     -1.00200839282608221441785276923241206048560585
-     +1.00099457512781808533714595890031901700601953
-     -1.00049418860411946455870228252646993646860644
-     +1.00024608655330804829863799804773967096041609
-     -1.00012271334757848914675183652635739571427511
-     +1.0000612481350587048292585451051353337474817
-     -1.00003058823630702049355172851064506258762795
-     +1.00001528225940865187173257148763672202323739
-     -1.00000763719763789976227360029356302921308825
-     +1.0000038172932649998398564616446219397304547
-     -1.00000190821271655393892565695779510135325857
-     +1.00000095396203387279611315203868344934594379
-     -1.00000047693298678780646311671960437304596645
-     +1.00000023845050272773299000364818675299493504
-     -1.00000011921992596531107306778871888232638726
-     +1.0000000596081890512594796124402079358012275
-     -1.00000002980350351465228018606370506936601184
-     +1.00000001490155482836504123465850663069862886
-     -1.00000000745071178983542949198100417060411946))
-   (fl- x 1.0)))
-
-(define pi^2/6 1.644934066848226436472415166646025189221)
-(define -zeta3.0 -1.202056903159594285399738161511449990768)
-(define pi^4/90 1.082323233711138191516003696541167902776)
-
-(: flpsi0-tiny (Flonum -> Flonum))
-(define (flpsi0-tiny x)
-  (+ (/ -1.0 x)
-     (- gamma.0)
-     (* x (+ pi^2/6 (* x (+ -zeta3.0 (* x pi^4/90)))))))
-
-(: flpsi0-negative (Flonum -> Flonum))
-(define (flpsi0-negative x)
-  (cond [(and (x . > . -inf.0) (not (integer? x)))
-         (- (flpsi0 (- 1.0 x)) (* pi (flcotpix x)))]
-        [else  +nan.0]))
-
-(: flpsi0 (Flonum -> Flonum))
-(define (flpsi0 x)
-  (cond [(x . < . 3.0)
-         (cond [(x . < . 0.75)
-                (cond [(x . < . -0.0007)  (flpsi0-negative x)]
-                      [(x . < . 0.0007)  (flpsi0-tiny x)]
-                      [else  (+ (/ -1.0 x) (flpsi0-pos-zero (+ x 1.0)))])]
-               [(x . < . 1.125)  (flpsi0-taylor-1 x)]
-               [(x . < . 1.9)  (flpsi0-pos-zero x)]
-               [else  (flpsi0-1.9-3 x)])]
-        [(x . < . 6.0)
-         (cond [(x . < . 4.0)
-                (+ (/ -1.0 (+ x 2.0)) (/ -1.0 (+ x 1.0)) (/ -1.0 x) (flpsi0-6-15 (+ x 3.0)))]
-               [(x . < . 5.0)
-                (+ (/ -1.0 (+ x 1.0)) (/ -1.0 x) (flpsi0-6-15 (+ x 2.0)))]
-               [else  (+ (/ -1.0 x) (flpsi0-6-15 (+ x 1.0)))])]
-        [(x . < . 15.0)  (flpsi0-6-15 x)]
-        [(x . < . 44.0)  (flpsi0-15-44 x)]
-        [(x . < . 1e7)   (flpsi0-large x)]
-        [(x . < . +inf.0)  (flpsi0-huge x)]
-        [(x . = . +inf.0)  +inf.0]
-        [else  +nan.0]))
-
-(define pi.128 267257146016241686964920093290467695825/85070591730234615865843651857942052864)
-
-(: flexppi (Flonum -> Flonum))
-(define flexppi (make-flexpt pi.128))
-
-(: flpsi (Integer Flonum -> Flonum))
-(define (flpsi m x)
-  (cond [(m . < . 0)  +nan.0]
-        [(m . = . 0)  (flpsi0 x)]
-        [(x . fl> . 0.0)
-         (define sgn (if (even? m) -1.0 1.0))
-         (define m+1 (fl+ (fl m) 1.0))
-         (fl* (fl* sgn (flgamma m+1)) (flhurwitz-zeta m+1 x))]
-        [(integer? x)
-         (cond [(even? m)  (if (fl= 0.0 x) (/ -1.0 x) +nan.0)]
-               [else  +inf.0])]
-        [(and (x . fl> . -inf.0) (x . fl< . 0.0))
-         (define sgn (if (even? m) 1.0 -1.0))
-         (define t
-           (fl* (flexppi (fl+ (fl m) 1.0))
-                (flcot-diff/y m (flcotpix x))))
-         (fl- (fl* sgn (flpsi m (fl- 1.0 x))) t)]
-        [else  +nan.0]))
-
-(: psi0 (Real -> Flonum))
-(define (psi0 x)
-  (cond [(flonum? x)  (flpsi0 x)]
-        [(single-flonum? x)  (flpsi0 (fl x))]
-        [(and (integer? x) (x . <= . 0))
-         (raise-argument-error 'psi0 "Real, not Zero or Negative-Integer" x)]
-        [else  (flpsi0 (fl x))]))
-
-(: psi (Integer Real -> Flonum))
-(define (psi m x)
-  (cond [(m . < . 0)  (raise-argument-error 'psi "Natural" 0 m x)]
-        [(flonum? x)  (flpsi m x)]
-        [(single-flonum? x)  (flpsi m (fl x))]
-        [(and (integer? x) (x . <= . 0))
-         (raise-argument-error 'psi "Real, not Zero or Negative-Integer" 1 m x)]
-        [else  (flpsi m (fl x))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/stirling-error.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/stirling-error.rkt
deleted file mode 100644
index 87e8bd503f..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/stirling-error.rkt
+++ /dev/null
@@ -1,253 +0,0 @@
-#lang typed/racket/base
-
-#|
-Compute the polynomial part of Stirling's approximation
-|#
-
-#|
-(fllog-gamma x) = (+ (flstirling x)
-                     (* x (fllog x))
-                     (- x)
-                     (* 0.5 (fllog (/ (* 2.0 pi) x))))
-
-(flgamma x) = (* (flexp-stirling x)
-                 (flexpt x x)
-                 (flexp (- x))
-                 (flsqrt (/ (* 2.0 pi) x)))
-|#
-
-(require "../../base.rkt"
-         "../flonum/flonum-functions.rkt"
-         "../flonum/flonum-polyfun.rkt"
-         "../polynomial/chebyshev.rkt")
-
-(provide flstirling flexp-stirling)
-
-(: flstirling-15-27 (Flonum -> Flonum))
-(define (flstirling-15-27 x)
-  (fl/ x ((inline-chebyshev-flpoly-fun
-           15.0 27.0
-           (11016.79948099981773627209876968885362204
-            3024.00014800260474631678762744430635965
-            215.9999679230867472929981033536003535621
-            6.197575655013797795140267332559371048751e-6
-            -1.123482005324992955884916740741637685148e-6
-            1.955324929224623311339400035192381837496e-7
-            -3.307831282170910797335684021141647395959e-8
-            5.479661724561398559219886067154634410417e-9
-            -8.931610760513212080760137735821652297713e-10
-            1.437126105618637970121702240104527823475e-10
-            -2.288053816318008707333061098567897054395e-11
-            3.610695995893100197394046453166382200035e-12
-            -5.652126896275849502824249809697970828599e-13
-            8.590674950213391909741768525418882339807e-14))
-          x)))
-
-(: flstirling-8-15 (Flonum -> Flonum))
-(define (flstirling-8-15 x)
-  (fl/ x ((inline-chebyshev-flpoly-fun
-           8.0 15.0
-           (3321.798247797932459144974149656409495232
-            966.0005298901628397215169376532205709987
-            73.49987816788887093424892777593993146966
-            2.494733140666379193517223900773536294113e-5
-            -4.787074309492002066556664123607488277298e-6
-            8.807687744072022638350005765442426267097e-7
-            -1.573092394772476574574240114018318793612e-7
-            2.747656271318921269727872382117004258265e-8
-            -4.715970675936475871998141501178029715698e-9
-            7.980147231866560869562868608196647541232e-10
-            -1.334466185130166386044851438572428687415e-10
-            2.209136885186544813721858028010037067248e-11
-            -3.625194612470337046498524409054506251461e-12
-            5.89961828339772115897107672853833190289e-13
-            -9.302513801056728846652906602460974539922e-14))
-          x)))
-
-(: flstirling-4.5-8 (Flonum -> Flonum))
-(define (flstirling-4.5-8 x)
-  (fl/ x ((inline-chebyshev-flpoly-fun
-           4.5 8.0
-           (975.0443031907733133389158279812611499587
-            262.5015627132377516143395761208780936736
-            18.3746764141027136751383456417283990405
-            5.938082786318118011724703482868275638379e-5
-            -1.016730602988921204230885968680626948872e-5
-            1.662515635381875817794816512099954740469e-6
-            -2.628928792442607777063166011284861608561e-7
-            4.050822127038092335113827822346792254026e-8
-            -6.112487132453923578260625403517465865551e-9
-            9.06364081362638907112852405510257653843e-10
-            -1.323998679460683118169932740761715566757e-10
-            1.908950450244905822866094061486038536357e-11
-            -2.720586588977906872800608377555774608691e-12
-            3.837044294086912170963236288848111628104e-13
-            -5.358780479116698179655468776097177855545e-14
-            7.28528236204856563656658475438575529055e-15))
-          x)))
-
-(: flstirling-2.75-4.5 (Flonum -> Flonum))
-(define (flstirling-2.75-4.5 x)
-  (fl/ x ((inline-chebyshev-flpoly-fun
-           2.75 4.5
-           (325.3467595768007572161779845085023817787
-            76.12859544638192139459089603623245542144
-            4.593138374223773581286859767098963154362
-            9.131333736750069011356870865537489178965e-5
-            -1.261380743745780228407758034482080830216e-5
-            1.651593135371361224051430190039696407515e-6
-            -2.077106380119501929519954989431521108645e-7
-            2.529653473668130040283553911283657922475e-8
-            -2.999709265632592433769951001453104388127e-9
-            3.476863330588570351919415335411696337828e-10
-            -3.950193609609407291091876605408976762817e-11
-            4.408617684109024142013268467557430326734e-12
-            -4.841203680484443364188480509836354990709e-13
-            5.237422339007086632193845068503408696153e-14
-            -5.586740617646839083565522161226600650702e-15
-            5.819151022309982950144818176644406281669e-16))
-          x)))
-
-(: flstirling-1.75-2.75 (Flonum -> Flonum))
-(define (flstirling-1.75-2.75 x)
-  (fl/ x ((inline-chebyshev-flpoly-fun
-           1.75 2.75
-           (125.2629230772482028509095781215440101143
-            27.0072859608297381233699496757487406466
-            1.498952409460891689508422629474544515631
-            1.303994200168118662091579592936614198868e-4
-            -1.484656128624609178802098025636180332568e-5
-            1.586277471840025118149864944019821162874e-6
-            -1.613450944444201653180199914617430303249e-7
-            1.576196350202965718756195765505628839837e-8
-            -1.487529043170189643984145466700307624064e-9
-            1.361396867785753372873967352158707789021e-10
-            -1.211139487543343017696681192325640474208e-11
-            1.048488661663920779172817513037101780685e-12
-            -8.830149928864984808376749130424857464651e-14
-            7.17803116949183817976881871715031957752e-15))
-          x)))
-
-(: flstirling-1-1.75 (Flonum -> Flonum))
-(define (flstirling-1-1.75 x)
-  (fl/ x ((inline-chebyshev-flpoly-fun
-           1.0 1.75
-           (47.777314237104471778486946812101904408
-            12.39297816793955917929120829286561089801
-            0.8410330212103364337410690481702160644618
-            3.491490532470952098652713628408706066953e-4
-            -4.041038030805226839115326915532433949952e-5
-            4.326596765075402520137649667194718278897e-6
-            -4.345154866576609604930256428231288658095e-7
-            4.119728067409649315207082217960099828835e-8
-            -3.688214630251487303562262057578976086001e-9
-            3.093381138554054580872113820898196059744e-10
-            -2.375075896907996495765945952278720383373e-11
-            1.564882039047195989899222646804037705211e-12
-            -6.828937818750811464962353946511915270149e-14
-            -2.634943298133669306444329836343107130006e-15
-            1.246448725672418721361338401869402106648e-15))
-          x)))
-
-(: flstirling-0.5-1 (Flonum -> Flonum))
-(define (flstirling-0.5-1 x)
-  (fl/ (fl/ ((inline-chebyshev-flpoly-fun
-              0.5 1.0
-              (0.1194805870082255169722538097612297787364
-               0.02135330110301585139295937835983603110036
-               -3.196025725983946277932392443714902585582e-5
-               -7.124517413424091772083413675848741107899e-7
-               6.740176044636219727019993384779194346055e-7
-               -1.521613091258975783466558010817018177872e-7
-               2.670498821139674650221603532664569395499e-8
-               -4.213924812826837370071299439461672434822e-9
-               6.29854364241318961398679285759803936539e-10
-               -9.147744510967378381527882109301861271705e-11
-               1.30962582774325190596052614795108510579e-11
-               -1.864252676220728470927650730310462587513e-12
-               2.652845480456961816308338061503354760458e-13
-               -3.786115147736501189751766017357422211683e-14
-               5.429913212512962097859788722473828366346e-15
-               -7.833776841686429592284675227535973006279e-16
-               1.137470065654636255090782592536038800769e-16
-               -1.661731102056490017849945642459553975973e-17
-               2.391847876948248930795972764225994129252e-18))
-             x) x) x))
-
-(: fllog-gamma1p-taylor-0.25 (Flonum -> Flonum))
-(define (fllog-gamma1p-taylor-0.25 x)
-  (fl* x ((make-flpolyfun
-           (-3.930873456872526458554152107865433609025e-1
-            6.625352492439489510635402587594391341412e-1
-            -2.554826879615743257115227963673084935423e-1
-            1.367707934883504139541130662399073826264e-1
-            -8.33925057553356520179116267871200690717e-2
-            5.439040175688482279740808974984708405172e-2
-            -3.692956435369459194525902820018967491214e-2
-            2.57438576595354260979378543783296811343e-2
-            -1.828207612943360135796036054648999203789e-2
-            1.316309381436802721935242956408783247211e-2
-            -9.579129355901410837410770822828309502828e-3
-            7.030888316926896871662033116131894701662e-3
-            -5.19700944806749099503387802706683780591e-3
-            3.864280363537579178918868416954592735695e-3
-            -2.88790175803055025196965940208247852597e-3
-            2.167711417892748993423507278259085698205e-3
-            -1.63339016229319926066901111641248008815e-3
-            1.234965287649728727056306104178162094552e-3
-            -9.365596024752160424737600167029560750915e-4
-            7.121915716550684289534550746747099228174e-4
-            -5.429051782355057412755621566583833039375e-4
-            4.147802845104665920833274078635131825501e-4
-            -3.175365018203068467021525584288060261718e-4))
-          (fl- x 0.25))))
-
-(: flstirling (Float -> Float))
-(define (flstirling x)
-  (cond [(x . fl<= . 0.0)  (if (fl= x 0.0) +inf.0 +nan.0)]
-        [(x . fl< . 1.0)
-         (cond [(x . fl< . 1e-300)
-                (fl- (fl* -0.5 (fllog (fl* 2.0 pi)))
-                     (fl* 0.5 (fllog x)))]
-               [(x . fl< . 0.5)
-                (+ (fllog-gamma1p-taylor-0.25 x)
-                   (fl* -0.5 (fllog (* 2.0 pi x)))
-                   (- (fl* x (fllog x)))
-                   x)]
-               [else  (flstirling-0.5-1 x)])]
-        [(x . fl< . 8.0)
-         (cond [(x . fl< . 2.75)
-                (cond [(x . fl< . 1.75)  (flstirling-1-1.75 x)]
-                      [else  (flstirling-1.75-2.75 x)])]
-               [(x . fl< . 4.5)   (flstirling-2.75-4.5 x)]
-               [else  (flstirling-4.5-8 x)])]
-        [(x . fl< . 27.0)
-         (cond [(x . fl< . 15.0)  (flstirling-8-15 x)]
-               [else  (flstirling-15-27 x)])]
-        [(x . fl< . 4000.0)
-         (fl/ ((make-flpolyfun (#i1/12 #i-1/360 #i1/1260 #i-1/1680 #i1/1188))
-               (fl/ (fl/ 1.0 x) x))
-              x)]
-        [(x . fl< . 2e7)
-         (fl/ ((make-flpolyfun (#i1/12 #i-1/360)) (fl/ (fl/ 1.0 x) x)) x)]
-        [else
-         (fl/ #i1/12 x)]))
-
-(: flexp-stirling (Float -> Float))
-(define (flexp-stirling x)
-  (cond [(x . fl<= . 0.0)  (if (fl= x 0.0) +inf.0 +nan.0)]
-        [(x . fl< . 1e-300)
-         (fl/ (fl/ 1.0 (flsqrt (fl* 2.0 pi)))
-              (flsqrt x))]
-        [(x . fl< . 1e-17)
-         ;; Using Gamma(x) ~ 1/x near 0
-         (fl/ (fl* (flexp x) (flexpt x (- x)))
-              (flsqrt (* 2.0 pi x)))]
-        [(x . fl< . 0.03)
-         (fl/ (* (flexp (fllog-gamma1p-taylor-0.25 x))
-                 (flexpt x (- x))
-                 (flexp x))
-              (flsqrt (* 2.0 pi x)))]
-        [else
-         ;; Error is <= 1 ulp
-         (flexp (flstirling x))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/tan-diff.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/tan-diff.rkt
deleted file mode 100644
index 51c9fc23cb..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/tan-diff.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         "../../flonum.rkt"
-         "../vector/vector.rkt")
-
-(provide fltan-diff/y flcot-diff/y)
-
-(define coef-hash-length 164)
-
-(: coef-hash (Vectorof (Option FlVector)))
-(define coef-hash (make-vector coef-hash-length #f))
-
-(: tan-diff-coefs (Natural -> FlVector))
-(define (tan-diff-coefs n)
-  (vector-ref!
-   coef-hash n
-   (λ ()
-     (cond [(zero? n)  (flvector 0.0 1.0)]
-           [else
-            (define cs (tan-diff-coefs (- n 1)))
-            (build-flvector
-             (+ n 2)
-             (λ (k) (fl+ (cond [(k . > . 0)  (define k-1 (- k 1))
-                                             (fl* (fl k-1) (flvector-ref cs k-1))]
-                               [else  0.0])
-                         (cond [(k . < . n)  (define k+1 (+ k 1))
-                                             (fl* (fl k+1) (flvector-ref cs k+1))]
-                               [else  0.0]))))]))))
-
-(: fltan-diff/y (Natural Flonum -> Flonum))
-(define (fltan-diff/y n y)
-  (cond [(zero? n)  y]
-        [(n . < . coef-hash-length)
-         (define cs (tan-diff-coefs n))
-         (let: loop : Flonum ([i : Nonnegative-Fixnum  (flvector-length cs)]
-                              [z : Flonum  0.0])
-           (cond [(zero? i)  z]
-                 [else  (let ([i  (fx- i 1)])
-                          (loop i (fl+ (fl* y z) (flvector-ref cs i))))]))]
-        [(even? n)
-         (cond [(y . fl< . 0.0)  -inf.0]
-               [(y . fl> . 0.0)  +inf.0]
-               [else  y])]
-        [else  +inf.0]))
-
-(: flcot-diff/y (Natural Flonum -> Flonum))
-(define (flcot-diff/y n y)
-  (define z (fltan-diff/y n y))
-  (if (even? n) z (- z)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/functions/zeta.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/zeta.rkt
deleted file mode 100644
index fc91d296bb..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/functions/zeta.rkt
+++ /dev/null
@@ -1,205 +0,0 @@
-#lang typed/racket/base
-
-#|
-Algorithm for the majority of eta's domain from
-
-P. Borwein. An Efficient Algorithm for the Riemann Zeta Function.
-|#
-
-(require racket/fixnum
-         "../../flonum.rkt"
-         "../../base.rkt"
-         "../number-theory/factorial.rkt"
-         "../number-theory/bernoulli.rkt"
-         "../polynomial/chebyshev.rkt"
-         "gamma.rkt"
-         "stirling-error.rkt")
-
-(provide fleta flzeta
-         eta zeta)
-
-(define +eta-max.0 53.99999999955306)
-(define +zeta-max.0 53.000000000670404)
-
-;; Error <= 1 ulp for 0 <= x <= 0.04
-(define fleta-taylor-0
-  (make-flpolyfun
-   (0.5
-    +2.25791352644727432363097614947441071785897339e-1
-    -3.05145718840280522586220206685108673985433522e-2
-    -3.91244691530275106760124536428014526534772501e-3
-    +2.08483152359513300940797999527700394516178740e-3
-    -3.12274485703922093874348990729689586909277588e-4
-    +4.77866286231754699184106581473688337626826621e-6
-    +6.81492916627787647157234076681326635240242752e-6)))
-
-(define fleta-cheby-0-1
-  (inline-chebyshev-flpoly-fun
-   0.0 1.0
-   (1.201451085000215786341948016934590750096
-    0.09659235221993630986901377398183709103273
-    -0.004162536123697811956855631042802249558704
-    -1.823459118570897951644789418281880496971e-5
-    1.057437661524516894212763161453537729375e-5
-    -5.276357969271112185781725261857608168314e-7
-    9.552883431770909233660820857569776676994e-9
-    2.861275947684961245106758674027061705788e-10
-    -2.592164434350750739588078107978177224236e-11
-    8.915497281646523022154515860475428889141e-13
-    -1.447759589742495761488938114822542491701e-14
-    -1.629339340198539399979819526388023402444e-16
-    1.846901346319333008905200116299163652954e-17)))
-
-(define fleta-cheby-neg-1.5-0
-  (inline-chebyshev-flpoly-fun
-   -1.5 0.0
-   (0.6249707175603271538769600167574752420857
-    0.1919290294856821784120025035346336182627
-    -0.003267513343418322858117903176882496211178
-    -0.001266607295556663909608241164197267248528
-    1.229333530745096620548304292135771666374e-4
-    -2.895947350460977592953532943362896903995e-6
-    -3.416581692876350748659539557978633940172e-7
-    3.837933497475585903016599027301413075615e-8
-    -1.775011660163000411058608111537020096243e-9
-    1.823510907947069149164464718906140458455e-11
-    3.270513023690372128256583347736563273382e-12
-    -2.650468446042741339295818711051485655948e-13
-    1.078303611477515364506213006324611739967e-14
-    -1.971960766890138166024311496731213878603e-16
-    -5.923220277992641912614957330192473539923e-18)))
-
-
-(: make-ds (Positive-Index -> FlVector))
-(define (make-ds n)
-  (define ds
-    (cdr
-     (reverse
-      (for/fold: ([lst : (Listof Real)  (list 0)]) ([i  (in-range (+ n 1))])
-        (cons (+ (car lst)
-                 (/ (* n (factorial (+ n i -1)) (expt 4 i))
-                    (* (factorial (- n i)) (factorial (* 2 i)))))
-              lst)))))
-  (apply flvector (map fl ds)))
-
-(define n 22)  ; 21 is enough to get about 16 digits; one more plays it safe
-(define ds (make-ds n))
-(define dn (flvector-ref ds n))
-
-(: fleta-borwein (Flonum -> Flonum))
-;; Error <= 4 ulp for s > 0
-(define (fleta-borwein s)
-  (let: loop : Flonum ([y : Flonum  0.0]
-                       [sgn : Flonum  1.0]
-                       [k : Nonnegative-Fixnum 0])
-    (cond [(k . fx< . n)
-           (define dy (fl/ (fl* sgn (fl- dn (flvector-ref ds k)))
-                           (fl* dn (flexp (fl* s (fllog (+ (fl k) 1.0)))))))
-           (define new-y (fl+ y dy))
-           (cond [((flabs dy) . fl<= . (fl* (fl* 0.5 epsilon.0) (flabs new-y)))
-                  new-y]
-                 [else
-                  (loop new-y (fl* sgn -1.0) (fx+ k 1))])]
-          [else  y])))
-
-(define pi.64 14488038916154245685/4611686018427387904)
-(define euler.64 12535862302449814171/4611686018427387904)
-(define pi.128 267257146016241686964920093290467695825/85070591730234615865843651857942052864)
-
-(: flexppi (Flonum -> Flonum))
-(define flexppi (make-flexpt pi.128))
-
-(require math/bigfloat)
-(: fleta (Flonum -> Flonum))
-(define (fleta s)
-  (cond [(s . fl> . 0.0)
-         (cond [(s . fl> . +eta-max.0)  1.0]
-               [(s . fl> . 1.0)  (fleta-borwein s)]
-               [(s . fl> . 0.04)  (fleta-cheby-0-1 s)]
-               [else  (fleta-taylor-0 s)])]
-        [(s . fl< . 0.0)
-         (cond [(s . fl= . -inf.0)  +nan.0]
-               [(s . fl< . -224.5)
-                (cond [(fleven? s)  0.0]
-                      [(fleven? (fltruncate (* 0.5 s)))  +inf.0]
-                      [else  -inf.0])]
-               [(s . fl< . -171.0)
-                (define f (make-flexpt (/ (* euler.64 pi.64) (inexact->exact (- s)))))
-                (* (/ 4.0 pi)
-                   (flexp-stirling (- s))
-                   (flsqrt (/ pi (* -0.5 s)))
-                   (f (* 0.5 s))
-                   (* s 0.5 (flsinpix (* s 0.5)))
-                   (f (* 0.5 s)))]
-               [(s . fl< . -54.0)
-                (* (/ 4.0 pi)
-                   (flexppi s)
-                   (* s 0.5 (flsinpix (* s 0.5)))
-                   (flgamma (- s)))]
-               [(s . fl< . -1.5)
-                (define 2^s-1 (- (flexpt 2.0 s) 1.0))
-                (* (/ 4.0 pi)
-                   (flexppi s)
-                   (* s 0.5 (flsinpix (* s 0.5)))
-                   (flgamma (- s))
-                   (fleta-borwein (- 1.0 s))
-                   (/ (* 0.5 (- 2^s-1 1.0)) 2^s-1))]
-               [(s . fl< . -0.05)
-                (fleta-cheby-neg-1.5-0 s)]
-               [else
-                (fleta-taylor-0 s)])]
-        [(s . fl= . 0.0)  0.5]
-        [else  +nan.0]))
-
-(: flzeta (Flonum -> Flonum))
-(define (flzeta s)
-  (cond [(s . fl> . +zeta-max.0)  1.0]
-        [(s . fl> . -171.0)
-         (define c
-           (cond [(s . fl< . -1.0)  (- (- (fl/ 2.0 (flexpt 2.0 s)) 1.0))]
-                 [else  (- (flexpm1 (fl* (fl- 1.0 s) (fllog 2.0))))]))
-         (fl/ (fleta s) c)]
-        [(and (s . fl> . -266.5) (s . fl< . 0.0))  ; s < 0 keeps TR happy
-         (define f (make-flexpt (/ (* euler.64 pi.64) (inexact->exact (- s)))))
-         (* (/ 4.0 pi)
-            (flexp-stirling (- s))
-            (flsqrt (/ pi (* -0.5 s)))
-            (f (* 0.5 s))
-            (* s 0.5 (flsinpix (* s 0.5)))
-            (* (flexpt 2.0 (- s 1.0))
-               (- (flexpt 2.0 s) 1.0))
-            (f (* 0.5 s)))]
-        [(s . fl> . -inf.0)
-         (cond [(fleven? s)  0.0]
-               [(fleven? (fltruncate (* 0.5 s)))  -inf.0]
-               [else  +inf.0])]
-        [else  +nan.0]))
-
-(: eta (case-> (Nonpositive-Integer -> Exact-Rational)
-               (Flonum -> Flonum)
-               (Real -> Real)))
-(define (eta s)
-  (cond [(flonum? s)  (fleta s)]
-        [(single-flonum? s)  (fleta (fl s))]
-        [(integer? s)
-         (cond [(zero? s)  1/2]
-               [(negative? s)  (define k (- 1 s))
-                               (* (/ (bernoulli-number k) k) (- (expt 2 k) 1))]
-               [else  (fleta (fl s))])]
-        [else
-         (fleta (fl s))]))
-
-(: zeta (case-> (Nonpositive-Integer -> Exact-Rational)
-                (Flonum -> Flonum)
-                (Real -> Real)))
-(define (zeta s)
-  (cond [(flonum? s)  (flzeta s)]
-        [(single-flonum? s)  (flzeta (fl s))]
-        [(integer? s)
-         (cond [(zero? s)  -1/2]
-               [(negative? s)  (define k (- 1 s))
-                               (- (/ (bernoulli-number k) k))]
-               [(eqv? s 1)  (raise-argument-error 'zeta "Real, not One" s)]
-               [else  (flzeta (fl s))])]
-        [else
-         (flzeta (fl s))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/inline-sort.rkt b/pkgs/math-pkgs/math-lib/math/private/inline-sort.rkt
deleted file mode 100644
index 55e1d40c3f..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/inline-sort.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     racket/list))
-
-(provide inline-sort)
-
-(define-syntax (inline-sort stx)
-  (syntax-case stx ()
-    [(_ lt-expr v-exprs ...)
-     (with-syntax ([(< vs ...)  (generate-temporaries #'(lt-expr v-exprs ...))])
-       (quasisyntax/loc stx
-         (let ([< lt-expr] [vs v-exprs] ...)
-           #,(inline-sort/k #'(vs ...) #'< (λ (lst) #`(values #,@lst))))))]))
-
-(define-for-syntax (inline-sort/k vs < k)
-  (syntax-case vs ()
-    [()  (k #'())]
-    [(a)  (k #'(a))]
-    [_  (let ([vs  (if (list? vs) vs (syntax->list vs))])
-          (define-values (lvs rvs) (split-at vs (quotient (length vs) 2)))
-          (inline-sort/k 
-           lvs <
-           (λ (lvs) (inline-sort/k
-                     rvs <
-                     (λ (rvs) (inline-merge/k lvs rvs < k))))))]))
-
-(define-for-syntax (inline-merge/k as bs < k)
-  (syntax-case #`(#,as #,bs) ()
-    [(() bs)  (k #'bs)]
-    [(as ())  (k #'as)]
-    [((a . as) (b . bs))
-     #`(if (#,< a b)
-           #,(inline-merge/k #'as #'(b . bs) < (λ (vs) (k (cons #'a vs))))
-           #,(inline-merge/k #'(a . as) #'bs < (λ (vs) (k (cons #'b vs)))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-2d.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-2d.rkt
deleted file mode 100644
index da16959d37..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-2d.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang typed/racket/base
-
-(require "matrix-types.rkt"
-         "matrix-syntax.rkt")
-
-(provide matrix-2d-rotation
-         matrix-2d-scaling
-         matrix-2d-shear-x
-         matrix-2d-shear-y
-         matrix-2d-reflection
-         matrix-2d-orthogonal-projection)
-
-; Transformations from:
-;     http://en.wikipedia.org/wiki/Transformation_matrix
-
-(: matrix-2d-rotation : Real -> (Matrix Real))
-; matrix representing rotation θ radians counter clockwise
-(define (matrix-2d-rotation θ)
-  (define cosθ (cos θ))
-  (define sinθ (sin θ))
-  (matrix [[cosθ (- sinθ)]
-           [sinθ cosθ]]))
-
-(: matrix-2d-scaling : Real Real -> (Matrix Real))
-(define (matrix-2d-scaling sx sy)
-  (matrix [[sx 0]
-           [0 sy]]))
-
-(: matrix-2d-shear-x : Real -> (Matrix Real))
-(define (matrix-2d-shear-x k)
-  (matrix [[1 k]
-           [0 1]]))
-
-(: matrix-2d-shear-y : Real -> (Matrix Real))
-(define (matrix-2d-shear-y k)
-  (matrix [[1 0]
-           [k 1]]))
-
-(: matrix-2d-reflection : Real Real -> (Matrix Real))
-(define (matrix-2d-reflection a b)
-  ; reflection about the line through (0,0) and (a,b)
-  (define a2 (* a a))
-  (define b2 (* b b))
-  (define 2ab (* 2 a b))
-  (define norm2 (+ a2 b2))
-  (define 2ab/norm2 (/ 2ab norm2))
-  (matrix [[(/ (- a2 b2) norm2) 2ab/norm2]
-           [2ab/norm2           (/ (- b2 a2) norm2)]]))
-
-(: matrix-2d-orthogonal-projection : Real Real -> (Matrix Real))
-; orthogonal projection onto the line through (0,0) and (a,b)
-(define (matrix-2d-orthogonal-projection a b)
-  (define a2 (* a a))
-  (define b2 (* b b))
-  (define ab (* a b))
-  (define norm2 (+ a2 b2))
-  (define ab/norm2 (/ ab norm2))
-  (matrix [[(/ a2 norm2) ab/norm2]
-           [ab/norm2     (/ b2 norm2)]]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-arithmetic.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-arithmetic.rkt
deleted file mode 100644
index fb4027bfe1..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-arithmetic.rkt
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang racket/base
-
-(module untyped-arithmetic-defs typed/racket/base
-  (require "matrix-types.rkt"
-           (prefix-in typed: "typed-matrix-arithmetic.rkt"))
-  
-  (provide (all-defined-out))
-  
-  (: matrix* ((Matrix Number) (Matrix Number) * -> (Matrix Number)))
-  (define matrix* typed:matrix*)
-  
-  (: matrix+ ((Matrix Number) (Matrix Number) * -> (Matrix Number)))
-  (define matrix+ typed:matrix+)
-  
-  (: matrix- ((Matrix Number) (Matrix Number) * -> (Matrix Number)))
-  (define matrix- typed:matrix-)
-  
-  (: matrix-scale ((Matrix Number) Number -> (Matrix Number)))
-  (define matrix-scale typed:matrix-scale)
-  
-  (: matrix-sum ((Listof (Matrix Number)) -> (Matrix Number)))
-  (define matrix-sum typed:matrix-sum)
-  
-  )  ; module untyped-arithmetic-defs
-
-(module arithmetic-defs racket/base
-  (require typed/untyped-utils
-           (prefix-in typed: "typed-matrix-arithmetic.rkt")
-           (prefix-in untyped: (submod ".." untyped-arithmetic-defs))
-           (rename-in "untyped-matrix-arithmetic.rkt"
-                      [matrix-map  untyped:matrix-map]))
-  
-  (provide (all-defined-out))
-  
-  (define-typed/untyped-identifier matrix-map typed:matrix-map untyped:matrix-map)
-  (define-typed/untyped-identifier matrix* typed:matrix* untyped:matrix*)
-  (define-typed/untyped-identifier matrix+ typed:matrix+ untyped:matrix+)
-  (define-typed/untyped-identifier matrix- typed:matrix- untyped:matrix-)
-  (define-typed/untyped-identifier matrix-scale typed:matrix-scale untyped:matrix-scale)
-  (define-typed/untyped-identifier matrix-sum typed:matrix-sum untyped:matrix-sum)
-  
-  )  ; module arithmetic-defs
-
-(require (for-syntax racket/base)
-         typed/untyped-utils
-         (prefix-in typed: "typed-matrix-arithmetic.rkt")
-         (prefix-in fun: (submod "." arithmetic-defs))
-         (except-in "untyped-matrix-arithmetic.rkt" matrix-map)
-         )
-
-(define-syntax (define/inline-macro stx)
-  (syntax-case stx ()
-    [(_ name pat inline-fun typed:fun)
-     (syntax/loc stx
-       (define-syntax (name inner-stx)
-         (syntax-case inner-stx ()
-           [(_ . pat)  (syntax/loc inner-stx (inline-fun . pat))]
-           [(_ . es)   (syntax/loc inner-stx (typed:fun . es))]
-           [_          (syntax/loc inner-stx typed:fun)])))]))
-
-(define/inline-macro matrix-map (f a as ...) inline-matrix-map fun:matrix-map)
-(define/inline-macro matrix* (a as ...) inline-matrix* fun:matrix*)
-(define/inline-macro matrix+ (a as ...) inline-matrix+ fun:matrix+)
-(define/inline-macro matrix- (a as ...) inline-matrix- fun:matrix-)
-(define/inline-macro matrix-scale (a x) inline-matrix-scale fun:matrix-scale)
-
-(provide
- (rename-out [typed:matrix=  matrix=]
-             [fun:matrix-sum  matrix-sum])
- matrix-map
- matrix*
- matrix+
- matrix-
- matrix-scale)
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-basic.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-basic.rkt
deleted file mode 100644
index f524590f5f..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-basic.rkt
+++ /dev/null
@@ -1,479 +0,0 @@
-#lang typed/racket/base
-
-(require racket/list
-         racket/fixnum
-         math/flonum
-         math/base
-         "matrix-types.rkt"
-         "matrix-arithmetic.rkt"
-         "matrix-constructors.rkt"
-         "matrix-conversion.rkt"
-         "utils.rkt"
-         "../unsafe.rkt"
-         "../array/array-struct.rkt"
-         "../array/array-indexing.rkt"
-         "../array/array-sequence.rkt"
-         "../array/array-transform.rkt"
-         "../array/array-fold.rkt"
-         "../array/array-pointwise.rkt"
-         "../array/array-convert.rkt"
-         "../array/utils.rkt"
-         "../vector/vector-mutate.rkt")
-
-(provide
- ;; Extraction
- matrix-ref
- submatrix
- matrix-row
- matrix-col
- matrix-rows
- matrix-cols
- matrix-diagonal
- matrix-upper-triangle
- matrix-lower-triangle
- ;; Embiggenment
- matrix-augment
- matrix-stack
- ;; Inner product space
- matrix-1norm
- matrix-2norm
- matrix-inf-norm
- matrix-norm
- matrix-dot
- matrix-cos-angle
- matrix-angle
- matrix-normalize
- ;; Simple operators
- matrix-transpose
- matrix-conjugate
- matrix-hermitian
- matrix-trace
- ;; Row/column operators
- matrix-map-rows
- matrix-map-cols
- matrix-normalize-rows
- matrix-normalize-cols
- ;; Predicates
- matrix-rows-orthogonal?
- matrix-cols-orthogonal?)
-
-;; ===================================================================================================
-;; Extraction
-
-(: matrix-ref (All (A) (Matrix A) Integer Integer -> A))
-(define (matrix-ref a i j)
-  (define-values (m n) (matrix-shape a))
-  (cond [(or (i . < . 0) (i . >= . m))
-         (raise-argument-error 'matrix-ref (format "Index < ~a" m) 1 a i j)]
-        [(or (j . < . 0) (j . >= . n))
-         (raise-argument-error 'matrix-ref (format "Index < ~a" n) 2 a i j)]
-        [else
-         (unsafe-array-ref a ((inst vector Index) i j))]))
-
-(: submatrix (All (A) (Matrix A) (U Slice (Sequenceof Integer)) (U Slice (Sequenceof Integer))
-                  -> (Array A)))
-(define (submatrix a row-range col-range)
-  (array-slice-ref (ensure-matrix 'submatrix a) (list row-range col-range)))
-
-(: matrix-row (All (A) (Matrix A) Integer -> (Matrix A)))
-(define (matrix-row a i)
-  (define-values (m n) (matrix-shape a))
-  (cond [(or (i . < . 0) (i . >= . m))
-         (raise-argument-error 'matrix-row (format "Index < ~a" m) 1 a i)]
-        [else
-         (define proc (unsafe-array-proc a))
-         (array-default-strict
-          (unsafe-build-array
-           ((inst vector Index) 1 n)
-           (λ: ([ij : Indexes])
-             (unsafe-vector-set! ij 0 i)
-             (define res (proc ij))
-             (unsafe-vector-set! ij 0 0)
-             res)))]))
-
-(: matrix-col (All (A) (Matrix A) Integer -> (Matrix A)))
-(define (matrix-col a j)
-  (define-values (m n) (matrix-shape a))
-  (cond [(or (j . < . 0) (j . >= . n))
-         (raise-argument-error 'matrix-row (format "Index < ~a" n) 1 a j)]
-        [else
-         (define proc (unsafe-array-proc a))
-         (array-default-strict
-          (unsafe-build-array
-           ((inst vector Index) m 1)
-           (λ: ([ij : Indexes])
-             (unsafe-vector-set! ij 1 j)
-             (define res (proc ij))
-             (unsafe-vector-set! ij 1 0)
-             res)))]))
-
-(: matrix-rows (All (A) (Matrix A) -> (Listof (Matrix A))))
-(define (matrix-rows a)
-  (map (λ: ([a : (Matrix A)]) (array-default-strict a))
-       (parameterize ([array-strictness #f])
-         (array->array-list (array-axis-insert (ensure-matrix 'matrix-rows a) 1) 0))))
-
-(: matrix-cols (All (A) (Matrix A) -> (Listof (Matrix A))))
-(define (matrix-cols a)
-  (map (λ: ([a : (Matrix A)]) (array-default-strict a))
-       (parameterize ([array-strictness #f])
-         (array->array-list (array-axis-insert (ensure-matrix 'matrix-cols a) 2) 1))))
-
-(: matrix-diagonal (All (A) ((Matrix A) -> (Array A))))
-(define (matrix-diagonal a)
-  (define-values (m n) (matrix-shape a))
-  (define proc (unsafe-array-proc a))
-  (array-default-strict
-   (unsafe-build-array
-    ((inst vector Index) (fxmin m n))
-    (λ: ([js : Indexes])
-      (define i (unsafe-vector-ref js 0))
-      (proc ((inst vector Index) i i))))))
-
-(: matrix-upper-triangle (All (A) (case-> ((Matrix A) -> (Matrix (U A 0)))
-                                          ((Matrix A) A -> (Matrix A)))))
-(define matrix-upper-triangle
-  (case-lambda
-    [(M)  (matrix-upper-triangle M 0)]
-    [(M zero)
-     (define-values (m n) (matrix-shape M))
-     (define proc (unsafe-array-proc M))
-     (array-default-strict
-      (unsafe-build-array
-       ((inst vector Index) m n)
-       (λ: ([ij : Indexes])
-         (define i (unsafe-vector-ref ij 0))
-         (define j (unsafe-vector-ref ij 1))
-         (if (i . fx<= . j) (proc ij) zero))))]))
-
-(: matrix-lower-triangle (All (A) (case-> ((Matrix A) -> (Matrix (U A 0)))
-                                          ((Matrix A) A -> (Matrix A)))))
-(define matrix-lower-triangle
-  (case-lambda
-    [(M)  (matrix-lower-triangle M 0)]
-    [(M zero)
-     (define-values (m n) (matrix-shape M))
-     (define proc (unsafe-array-proc M))
-     (array-default-strict
-      (unsafe-build-array
-       ((inst vector Index) m n)
-       (λ: ([ij : Indexes])
-         (define i (unsafe-vector-ref ij 0))
-         (define j (unsafe-vector-ref ij 1))
-         (if (i . fx>= . j) (proc ij) zero))))]))
-
-;; ===================================================================================================
-;; Embiggenment (this is a perfectly cromulent word)
-
-(: matrix-augment (All (A) (Listof (Matrix A)) -> (Matrix A)))
-(define (matrix-augment as)
-  (cond [(empty? as)  (raise-argument-error 'matrix-augment "nonempty List" as)]
-        [else
-         (define m (matrix-num-rows (first as)))
-         (cond [(andmap (λ: ([a : (Matrix A)]) (= m (matrix-num-rows a))) (rest as))
-                (array-append* as 1)]
-               [else
-                (error 'matrix-augment
-                       "matrices must have the same number of rows; given ~a"
-                       (format-matrices/error as))])]))
-
-(: matrix-stack (All (A) (Listof (Matrix A)) -> (Matrix A)))
-(define (matrix-stack as)
-  (cond [(empty? as)  (raise-argument-error 'matrix-stack "nonempty List" as)]
-        [else
-         (define n (matrix-num-cols (first as)))
-         (cond [(andmap (λ: ([a : (Matrix A)]) (= n (matrix-num-cols a))) (rest as))
-                (array-append* as 0)]
-               [else
-                (error 'matrix-stack
-                       "matrices must have the same number of columns; given ~a"
-                       (format-matrices/error as))])]))
-
-;; ===================================================================================================
-;; Inner product space (entrywise norm)
-
-(: nonstupid-magnitude (case-> (Flonum -> Nonnegative-Flonum)
-                               (Real -> Nonnegative-Real)
-                               (Float-Complex -> Nonnegative-Flonum)
-                               (Number -> Nonnegative-Real)))
-(define (nonstupid-magnitude x)
-  (if (real? x) (abs x) (magnitude x)))
-
-(: matrix-1norm (case-> ((Matrix Flonum) -> Nonnegative-Flonum)
-                        ((Matrix Real) -> Nonnegative-Real)
-                        ((Matrix Float-Complex) -> Nonnegative-Flonum)
-                        ((Matrix Number) -> Nonnegative-Real)))
-(define (matrix-1norm M)
-  (parameterize ([array-strictness #f])
-    (array-all-sum (inline-array-map nonstupid-magnitude M))))
-
-(: matrix-2norm (case-> ((Matrix Flonum) -> Nonnegative-Flonum)
-                        ((Matrix Real) -> Nonnegative-Real)
-                        ((Matrix Float-Complex) -> Nonnegative-Flonum)
-                        ((Matrix Number) -> Nonnegative-Real)))
-(define (matrix-2norm M)
-  (parameterize ([array-strictness #f])
-    (let ([M  (array-strict (inline-array-map nonstupid-magnitude M))])
-      ;; Compute this divided by the maximum to avoid underflow and overflow
-      (define mx (array-all-max M))
-      (cond [(and (rational? mx) (positive? mx))
-             (* mx (sqrt (array-all-sum (inline-array-map (λ (x) (sqr (/ x mx))) M))))]
-            [else  mx]))))
-
-(: matrix-inf-norm (case-> ((Matrix Flonum) -> Nonnegative-Flonum)
-                           ((Matrix Real) -> Nonnegative-Real)
-                           ((Matrix Float-Complex) -> Nonnegative-Flonum)
-                           ((Matrix Number) -> Nonnegative-Real)))
-(define (matrix-inf-norm M)
-  (parameterize ([array-strictness #f])
-    (array-all-max (inline-array-map nonstupid-magnitude M))))
-
-(: matrix-p-norm (case-> ((Matrix Flonum) Positive-Real -> Nonnegative-Flonum)
-                         ((Matrix Real) Positive-Real -> Nonnegative-Real)
-                         ((Matrix Float-Complex) Positive-Real -> Nonnegative-Flonum)
-                         ((Matrix Number) Positive-Real -> Nonnegative-Real)))
-(define (matrix-p-norm M p)
-  (parameterize ([array-strictness #f])
-    (let ([M  (array-strict (inline-array-map nonstupid-magnitude M))])
-      ;; Compute this divided by the maximum to avoid underflow and overflow
-      (define mx (array-all-max M))
-      (cond [(and (rational? mx) (positive? mx))
-             (fl (* mx (expt (array-all-sum (inline-array-map (λ (x) (expt (abs (/ x mx)) p)) M))
-                             (/ p))))]
-            [else  mx]))))
-
-(: matrix-norm (case-> ((Matrix Flonum)      -> Nonnegative-Flonum)
-                       ((Matrix Flonum) Real -> Nonnegative-Flonum)
-                       ((Matrix Real)      -> Nonnegative-Real)
-                       ((Matrix Real) Real -> Nonnegative-Real)
-                       ((Matrix Float-Complex)      -> Nonnegative-Flonum)
-                       ((Matrix Float-Complex) Real -> Nonnegative-Flonum)
-                       ((Matrix Number)      -> Nonnegative-Real)
-                       ((Matrix Number) Real -> Nonnegative-Real)))
-;; Computes the p norm of a matrix
-(define (matrix-norm a [p 2])
-  (cond [(not (matrix? a))  (raise-argument-error 'matrix-norm "matrix?" 0 a p)]
-        [(p . = . 1)       (matrix-1norm a)]
-        [(p . = . 2)       (matrix-2norm a)]
-        [(p . = . +inf.0)  (matrix-inf-norm a)]
-        [(p . > . 1)       (matrix-p-norm a p)]
-        [else  (raise-argument-error 'matrix-norm "Real >= 1" 1 a p)]))
-
-(: matrix-dot (case-> ((Matrix Flonum) -> Nonnegative-Flonum)
-                      ((Matrix Flonum) (Matrix Flonum) -> Flonum)
-                      ((Matrix Real) -> Nonnegative-Real)
-                      ((Matrix Real) (Matrix Real) -> Real)
-                      ((Matrix Float-Complex) -> Nonnegative-Flonum)
-                      ((Matrix Float-Complex) (Matrix Float-Complex) -> Float-Complex)
-                      ((Matrix Number) -> Nonnegative-Real)
-                      ((Matrix Number) (Matrix Number) -> Number)))
-;; Computes the Frobenius inner product of a matrix with itself or of two matrices
-(define matrix-dot
-  (case-lambda
-    [(a)
-     (parameterize ([array-strictness #f])
-       (assert
-        (array-all-sum
-         (inline-array-map
-          (λ (x) (* x (conjugate x)))
-          (ensure-matrix 'matrix-dot a)))
-        (make-predicate Nonnegative-Real)))]
-    [(a b)
-     (define-values (m n) (matrix-shapes 'matrix-dot a b))
-     (define aproc (unsafe-array-proc a))
-     (define bproc (unsafe-array-proc b))
-     (parameterize ([array-strictness #f])
-       (array-all-sum
-        (unsafe-build-array
-         ((inst vector Index) m n)
-         (λ: ([js : Indexes])
-           (* (aproc js) (conjugate (bproc js)))))))]))
-
-(: matrix-cos-angle (case-> ((Matrix Flonum) (Matrix Flonum) -> Flonum)
-                            ((Matrix Real) (Matrix Real) -> Real)
-                            ((Matrix Float-Complex) (Matrix Float-Complex) -> Float-Complex)
-                            ((Matrix Number) (Matrix Number) -> Number)))
-(define (matrix-cos-angle M N)
-  (/ (matrix-dot M N) (* (matrix-2norm M) (matrix-2norm N))))
-
-(: matrix-angle (case-> ((Matrix Flonum) (Matrix Flonum) -> Flonum)
-                        ((Matrix Real) (Matrix Real) -> Real)
-                        ((Matrix Float-Complex) (Matrix Float-Complex) -> Float-Complex)
-                        ((Matrix Number) (Matrix Number) -> Number)))
-(define (matrix-angle M N)
-  (acos (matrix-cos-angle M N)))
-
-(: matrix-normalize
-   (All (A) (case-> ((Matrix Flonum)             -> (Matrix Flonum))
-                    ((Matrix Flonum) Real        -> (Matrix Flonum))
-                    ((Matrix Flonum) Real (-> A) -> (U A (Matrix Flonum)))
-                    ((Matrix Real)             -> (Matrix Real))
-                    ((Matrix Real) Real        -> (Matrix Real))
-                    ((Matrix Real) Real (-> A) -> (U A (Matrix Real)))
-                    ((Matrix Float-Complex)             -> (Matrix Float-Complex))
-                    ((Matrix Float-Complex) Real        -> (Matrix Float-Complex))
-                    ((Matrix Float-Complex) Real (-> A) -> (U A (Matrix Float-Complex)))
-                    ((Matrix Number)             -> (Matrix Number))
-                    ((Matrix Number) Real        -> (Matrix Number))
-                    ((Matrix Number) Real (-> A) -> (U A (Matrix Number))))))
-(define matrix-normalize
-  (case-lambda
-    [(M)  (matrix-normalize M 2)]
-    [(M p)  (matrix-normalize M p (λ () (raise-argument-error
-                                         'matrix-normalize "nonzero matrix?" 0 M p)))]
-    [(M p fail)
-     (array-strict! M)
-     (define x (matrix-norm M p))
-     (cond [(and (zero? x) (exact? x))  (fail)]
-           [else  (matrix-scale M (/ x))])]))  
-
-;; ===================================================================================================
-;; Operators
-
-(: matrix-transpose (All (A) (Matrix A) -> (Matrix A)))
-(define (matrix-transpose a)
-  (array-axis-swap (ensure-matrix 'matrix-transpose a) 0 1))
-
-(: matrix-conjugate (case-> ((Matrix Flonum) -> (Matrix Flonum))
-                            ((Matrix Real) -> (Matrix Real))
-                            ((Matrix Float-Complex) -> (Matrix Float-Complex))
-                            ((Matrix Number) -> (Matrix Number))))
-(define (matrix-conjugate a)
-  (array-conjugate (ensure-matrix 'matrix-conjugate a)))
-
-(: matrix-hermitian (case-> ((Matrix Flonum) -> (Matrix Flonum))
-                            ((Matrix Real) -> (Matrix Real))
-                            ((Matrix Float-Complex) -> (Matrix Float-Complex))
-                            ((Matrix Number) -> (Matrix Number))))
-(define (matrix-hermitian a)
-  (array-default-strict
-   (parameterize ([array-strictness #f])
-     (array-axis-swap (array-conjugate (ensure-matrix 'matrix-hermitian a)) 0 1))))
-
-(: matrix-trace (case-> ((Matrix Flonum) -> Flonum)
-                        ((Matrix Real) -> Real)
-                        ((Matrix Float-Complex) -> Float-Complex)
-                        ((Matrix Number) -> Number)))
-(define (matrix-trace a)
-  (cond [(square-matrix? a)
-         (parameterize ([array-strictness #f])
-           (array-all-sum (matrix-diagonal a)))]
-        [else
-         (raise-argument-error 'matrix-trace "square-matrix?" a)]))
-
-;; ===================================================================================================
-;; Row/column operations
-
-(: matrix-map-rows
-   (All (A B F) (case-> (((Matrix A) -> (Matrix B)) (Matrix A)        -> (Matrix B))
-                        (((Matrix A) -> (U #f (Matrix B))) (Matrix A) (-> F)
-                                                           -> (U F (Matrix B))))))
-(define matrix-map-rows
-  (case-lambda
-    [(f M)  (matrix-stack (map f (matrix-rows M)))]
-    [(f M fail)
-     (define ms (matrix-rows M))
-     (define n (f (first ms)))
-     (cond [n  (let loop ([ms  (rest ms)] [ns (list n)])
-                 (cond [(empty? ms)  (matrix-stack (reverse ns))]
-                       [else  (define n (f (first ms)))
-                              (cond [n  (loop (rest ms) (cons n ns))]
-                                    [else  (fail)])]))]
-           [else  (fail)])]))
-
-(: matrix-map-cols
-   (All (A B F) (case-> (((Matrix A) -> (Matrix B)) (Matrix A)        -> (Matrix B))
-                        (((Matrix A) -> (U #f (Matrix B))) (Matrix A) (-> F)
-                                                           -> (U F (Matrix B))))))
-(define matrix-map-cols
-  (case-lambda
-    [(f M)  (matrix-augment (map f (matrix-cols M)))]
-    [(f M fail)
-     (define ms (matrix-cols M))
-     (define n (f (first ms)))
-     (cond [n  (let loop ([ms  (rest ms)] [ns (list n)])
-                 (cond [(empty? ms)  (matrix-augment (reverse ns))]
-                       [else  (define n (f (first ms)))
-                              (cond [n  (loop (rest ms) (cons n ns))]
-                                    [else  (fail)])]))]
-           [else  (fail)])]))
-
-(: make-matrix-normalize (Real -> (case-> ((Matrix Flonum) -> (U #f (Matrix Flonum)))
-                                          ((Matrix Real) -> (U #f (Matrix Real)))
-                                          ((Matrix Float-Complex) -> (U #f (Matrix Float-Complex)))
-                                          ((Matrix Number) -> (U #f (Matrix Number))))))
-(define ((make-matrix-normalize p) M)
-  (matrix-normalize M p (λ () #f)))
-
-(: matrix-normalize-rows
-   (All (A) (case-> ((Matrix Flonum)             -> (Matrix Flonum))
-                    ((Matrix Flonum) Real        -> (Matrix Flonum))
-                    ((Matrix Flonum) Real (-> A) -> (U A (Matrix Flonum)))
-                    ((Matrix Real)             -> (Matrix Real))
-                    ((Matrix Real) Real        -> (Matrix Real))
-                    ((Matrix Real) Real (-> A) -> (U A (Matrix Real)))
-                    ((Matrix Float-Complex)             -> (Matrix Float-Complex))
-                    ((Matrix Float-Complex) Real        -> (Matrix Float-Complex))
-                    ((Matrix Float-Complex) Real (-> A) -> (U A (Matrix Float-Complex)))
-                    ((Matrix Number)             -> (Matrix Number))
-                    ((Matrix Number) Real        -> (Matrix Number))
-                    ((Matrix Number) Real (-> A) -> (U A (Matrix Number))))))
-(define matrix-normalize-rows
-  (case-lambda
-    [(M)  (matrix-normalize-rows M 2)]
-    [(M p)
-     (define (fail) (raise-argument-error 'matrix-normalize-rows "matrix? with nonzero rows" 0 M p))
-     (matrix-normalize-rows M p fail)]
-    [(M p fail)
-     (matrix-map-rows (make-matrix-normalize p) M fail)]))
-
-(: matrix-normalize-cols
-   (All (A) (case-> ((Matrix Flonum)             -> (Matrix Flonum))
-                    ((Matrix Flonum) Real        -> (Matrix Flonum))
-                    ((Matrix Flonum) Real (-> A) -> (U A (Matrix Flonum)))
-                    ((Matrix Real)             -> (Matrix Real))
-                    ((Matrix Real) Real        -> (Matrix Real))
-                    ((Matrix Real) Real (-> A) -> (U A (Matrix Real)))
-                    ((Matrix Float-Complex)             -> (Matrix Float-Complex))
-                    ((Matrix Float-Complex) Real        -> (Matrix Float-Complex))
-                    ((Matrix Float-Complex) Real (-> A) -> (U A (Matrix Float-Complex)))
-                    ((Matrix Number)             -> (Matrix Number))
-                    ((Matrix Number) Real        -> (Matrix Number))
-                    ((Matrix Number) Real (-> A) -> (U A (Matrix Number))))))
-(define matrix-normalize-cols
-  (case-lambda
-    [(M)  (matrix-normalize-cols M 2)]
-    [(M p)
-     (define (fail)
-       (raise-argument-error 'matrix-normalize-cols "matrix? with nonzero columns" 0 M p))
-     (matrix-normalize-cols M p fail)]
-    [(M p fail)
-     (matrix-map-cols (make-matrix-normalize p) M fail)]))
-
-;; ===================================================================================================
-
-(: pairwise-orthogonal? ((Listof (Matrix Number)) Nonnegative-Real -> Boolean))
-(define (pairwise-orthogonal? Ms eps)
-  (define rows (list->vector Ms))
-  (define m (vector-length rows))
-  (let/ec: return : Boolean
-    (for*: ([i0  (in-range m)] [i1  (in-range (fx+ i0 1) m)])
-      (define r0 (unsafe-vector-ref rows i0))
-      (define r1 (unsafe-vector-ref rows i1))
-      (when ((magnitude (matrix-cos-angle r0 r1)) . >= . eps) (return #f)))
-    #t))
-
-(: matrix-rows-orthogonal? (case-> ((Matrix Number) -> Boolean)
-                                   ((Matrix Number) Real -> Boolean)))
-(define (matrix-rows-orthogonal? M [eps (* 10 epsilon.0)])
-  (cond [(negative? eps)  (raise-argument-error 'matrix-rows-orthogonal? "Nonnegative-Real" 1 M eps)]
-        [else  (parameterize ([array-strictness #f])
-                 (pairwise-orthogonal? (matrix-rows M) eps))]))
-         
-
-(: matrix-cols-orthogonal? (case-> ((Matrix Number) -> Boolean)
-                                   ((Matrix Number) Real -> Boolean)))
-(define (matrix-cols-orthogonal? M [eps (* 10 epsilon.0)])
-  (cond [(negative? eps)  (raise-argument-error 'matrix-cols-orthogonal? "Nonnegative-Real" 1 M eps)]
-        [else  (parameterize ([array-strictness #f])
-                 (pairwise-orthogonal? (matrix-cols M) eps))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-comprehension.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-comprehension.rkt
deleted file mode 100644
index f2a61ee90e..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-comprehension.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     syntax/parse)
-         "../array/array-comprehension.rkt")
-
-(provide for/matrix:
-         for*/matrix:
-         for/matrix
-         for*/matrix)
-
-(module typed-defs typed/racket/base
-  (require (for-syntax racket/base
-                       syntax/parse)
-           "../array/array-comprehension.rkt")
-  
-  (provide (all-defined-out))
-  
-  (: ensure-matrix-dims (Symbol Any Any -> (Values Positive-Index Positive-Index)))
-  (define (ensure-matrix-dims name m n)
-    (cond [(or (not (index? m)) (zero? m))  (raise-argument-error name "Positive-Index" 0 m n)]
-          [(or (not (index? n)) (zero? n))  (raise-argument-error name "Positive-Index" 1 m n)]
-          [else  (values m n)]))
-  
-  (define-syntax (base-for/matrix: stx)
-    (syntax-parse stx #:literals (:)
-      [(_ name:id for/array:id
-          m-expr:expr n-expr:expr
-          (~optional (~seq #:fill fill-expr:expr))
-          (clause ...)
-          (~optional (~seq : A:expr))
-          body:expr ...+)
-       (with-syntax ([(maybe-fill ...)  (if (attribute fill-expr) #'(#:fill fill-expr) #'())]
-                     [(maybe-type ...)  (if (attribute A) #'(: A) #'())])
-         (syntax/loc stx
-           (let-values ([(m n)  (ensure-matrix-dims 'name
-                                                    (ann m-expr Integer)
-                                                    (ann n-expr Integer))])
-             (for/array #:shape (vector m-expr n-expr) maybe-fill ... (clause ...) maybe-type ...
-               body ...))))]))
-  
-  (define-syntax-rule (for/matrix:  e ...) (base-for/matrix: for/matrix:  for/array:  e ...))
-  (define-syntax-rule (for*/matrix: e ...) (base-for/matrix: for*/matrix: for*/array: e ...))
-  
-  )
-
-(require (submod "." typed-defs))
-
-(define-syntax (base-for/matrix stx)
-  (syntax-parse stx
-    [(_ name:id for/array:id
-        m-expr:expr n-expr:expr
-        (~optional (~seq #:fill fill-expr:expr))
-        (clause ...)
-        body:expr ...+)
-     (with-syntax ([(maybe-fill ...)  (if (attribute fill-expr) #'(#:fill fill-expr) #'())])
-       (syntax/loc stx
-         (let-values ([(m n)  (ensure-matrix-dims 'name m-expr n-expr)])
-           (for/array #:shape (vector m-expr n-expr) maybe-fill ... (clause ...)
-             body ...))))]))
-
-(define-syntax-rule (for/matrix  e ...) (base-for/matrix for/matrix  for/array  e ...))
-(define-syntax-rule (for*/matrix e ...) (base-for/matrix for*/matrix for*/array e ...))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-constructors.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-constructors.rkt
deleted file mode 100644
index 2eac16b1b6..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-constructors.rkt
+++ /dev/null
@@ -1,173 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         racket/flonum
-         racket/list
-         racket/vector
-         math/base
-         "matrix-types.rkt"
-         "../unsafe.rkt"
-         "../array/array-struct.rkt"
-         "../array/array-constructors.rkt"
-         "../array/array-unfold.rkt"
-         "../array/utils.rkt")
-
-(provide identity-matrix
-         make-matrix
-         build-matrix
-         diagonal-matrix/zero
-         diagonal-matrix
-         block-diagonal-matrix/zero
-         block-diagonal-matrix
-         vandermonde-matrix)
-
-;; ===================================================================================================
-;; Basic constructors
-
-(: identity-matrix (All (A) (case-> (Integer -> (Matrix (U 1 0)))
-                                    (Integer A -> (Matrix (U A 0)))
-                                    (Integer A A -> (Matrix A)))))
-(define identity-matrix
-  (case-lambda
-    [(m)  (diagonal-array 2 m 1 0)]
-    [(m one)  (diagonal-array 2 m one 0)]
-    [(m one zero)  (diagonal-array 2 m one zero)]))
-
-(: make-matrix (All (A) (Integer Integer A -> (Matrix A))))
-(define (make-matrix m n x)
-  (make-array (vector m n) x))
-
-(: build-matrix (All (A) (Integer Integer (Index Index -> A) -> (Matrix A))))
-(define (build-matrix m n proc)
-  (cond [(or (not (index? m)) (= m 0))
-         (raise-argument-error 'build-matrix "Positive-Index" 0 m n proc)]
-        [(or (not (index? n)) (= n 0))
-         (raise-argument-error 'build-matrix "Positive-Index" 1 m n proc)]
-        [else
-         (array-default-strict
-          (unsafe-build-array
-           ((inst vector Index) m n)
-           (λ: ([js : Indexes])
-             (proc (unsafe-vector-ref js 0)
-                   (unsafe-vector-ref js 1)))))]))
-
-;; ===================================================================================================
-;; Diagonal matrices
-
-(: diagonal-matrix/zero (All (A) ((Listof A) A -> (Matrix A))))
-(define (diagonal-matrix/zero xs zero)
-  (cond [(empty? xs)
-         (raise-argument-error 'diagonal-matrix "nonempty List" xs)]
-        [else
-         (define vs (list->vector xs))
-         (define m (vector-length vs))
-         (unsafe-build-simple-array
-          ((inst vector Index) m m)
-          (λ: ([js : Indexes])
-            (define i (unsafe-vector-ref js 0))
-            (cond [(= i (unsafe-vector-ref js 1))  (unsafe-vector-ref vs i)]
-                  [else  zero])))]))
-
-(: diagonal-matrix (All (A) (case-> ((Listof A) -> (Matrix (U A 0)))
-                                    ((Listof A) A -> (Matrix A)))))
-(define diagonal-matrix
-  (case-lambda
-    [(xs)  (diagonal-matrix/zero xs 0)]
-    [(xs zero)  (diagonal-matrix/zero xs zero)]))
-
-;; ===================================================================================================
-;; Block diagonal matrices
-
-(: block-diagonal-matrix/zero* (All (A) (Vectorof (Matrix A)) A -> (Matrix A)))
-(define (block-diagonal-matrix/zero* as zero)
-  (define num (vector-length as))
-  (define-values (ms ns)
-    (let-values ([(ms ns)  (for/fold: ([ms : (Listof Index)  empty]
-                                       [ns : (Listof Index)  empty]
-                                       ) ([a  (in-vector as)])
-                             (define-values (m n) (matrix-shape a))
-                             (values (cons m ms) (cons n ns)))])
-      (values (reverse ms) (reverse ns))))
-  (define res-m (assert (apply + ms) index?))
-  (define res-n (assert (apply + ns) index?))
-  (define vs ((inst make-vector Index) res-m 0))
-  (define hs ((inst make-vector Index) res-n 0))
-  (define is ((inst make-vector Index) res-m 0))
-  (define js ((inst make-vector Index) res-n 0))
-  (define-values (_res-i _res-j)
-    (for/fold: ([res-i : Nonnegative-Fixnum 0]
-                [res-j : Nonnegative-Fixnum 0]
-                ) ([m  (in-list ms)]
-                   [n  (in-list ns)]
-                   [k : Nonnegative-Fixnum  (in-range num)])
-      (let ([k  (assert k index?)])
-        (for: ([i : Nonnegative-Fixnum  (in-range m)])
-          (vector-set! vs (unsafe-fx+ res-i i) k)
-          (vector-set! is (unsafe-fx+ res-i i) (assert i index?)))
-        (for: ([j : Nonnegative-Fixnum  (in-range n)])
-          (vector-set! hs (unsafe-fx+ res-j j) k)
-          (vector-set! js (unsafe-fx+ res-j j) (assert j index?))))
-      (values (unsafe-fx+ res-i m) (unsafe-fx+ res-j n))))
-  (define procs (vector-map (λ: ([a : (Matrix A)]) (unsafe-array-proc a)) as))
-  (array-default-strict
-   (unsafe-build-array
-    ((inst vector Index) res-m res-n)
-    (λ: ([ij : Indexes])
-      (define i (unsafe-vector-ref ij 0))
-      (define j (unsafe-vector-ref ij 1))
-      (define v (unsafe-vector-ref vs i))
-      (cond [(fx= v (vector-ref hs j))
-             (define proc (unsafe-vector-ref procs v))
-             (define iv (unsafe-vector-ref is i))
-             (define jv (unsafe-vector-ref js j))
-             (unsafe-vector-set! ij 0 iv)
-             (unsafe-vector-set! ij 1 jv)
-             (define res (proc ij))
-             (unsafe-vector-set! ij 0 i)
-             (unsafe-vector-set! ij 1 j)
-             res]
-            [else
-             zero])))))
-
-(: block-diagonal-matrix/zero (All (A) ((Listof (Matrix A)) A -> (Matrix A))))
-(define (block-diagonal-matrix/zero as zero)
-  (let ([as  (list->vector as)])
-    (define num (vector-length as))
-    (cond [(= num 0)
-           (raise-argument-error 'block-diagonal-matrix/zero "nonempty List" as)]
-          [(= num 1)
-           (unsafe-vector-ref as 0)]
-          [else
-           (block-diagonal-matrix/zero* as zero)])))
-
-(: block-diagonal-matrix (All (A) (case-> ((Listof (Matrix A)) -> (Matrix (U A 0)))
-                                          ((Listof (Matrix A)) A -> (Matrix A)))))
-(define block-diagonal-matrix
-  (case-lambda
-    [(as)  (block-diagonal-matrix/zero as 0)]
-    [(as zero)  (block-diagonal-matrix/zero as zero)]))
-
-;; ===================================================================================================
-;; Special matrices
-
-(: sane-expt (case-> (Flonum Index -> Flonum)
-                     (Real Index -> Real)
-                     (Float-Complex Index -> Float-Complex)
-                     (Number Index -> Number)))
-(define (sane-expt x n)
-  (cond [(flonum? x)  (flexpt x (real->double-flonum n))]
-        [(real? x)  (real-part (expt x n))]  ; remove `real-part' when expt : Real Index -> Real
-        [(float-complex? x)  (number->float-complex (expt x n))]
-        [else  (expt x n)]))
-
-(: vandermonde-matrix (case-> ((Listof Flonum) Integer -> (Matrix Flonum))
-                              ((Listof Real) Integer -> (Matrix Real))
-                              ((Listof Float-Complex) Integer -> (Matrix Float-Complex))
-                              ((Listof Number) Integer -> (Matrix Number))))
-(define (vandermonde-matrix xs n)
-  (cond [(empty? xs)
-         (raise-argument-error 'vandermonde-matrix "nonempty List" 0 xs n)]
-        [(or (not (index? n)) (zero? n))
-         (raise-argument-error 'vandermonde-matrix "Positive-Index" 1 xs n)]
-        [else
-         (array-axis-expand (list->array xs) 1 n sane-expt)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-conversion.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-conversion.rkt
deleted file mode 100644
index 283a8b0ff8..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-conversion.rkt
+++ /dev/null
@@ -1,179 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         racket/list
-         racket/vector
-         "matrix-types.rkt"
-         "utils.rkt"
-         "../array/array-struct.rkt"
-         "../array/array-convert.rkt"
-         "../array/array-transform.rkt"
-         "../array/mutable-array.rkt"
-         "../array/array-fold.rkt"
-         "../array/utils.rkt"
-         "../unsafe.rkt")
-
-(provide
- ;; Flat conversion
- list->matrix
- matrix->list
- vector->matrix
- matrix->vector
- ->row-matrix
- ->col-matrix
- ;; Nested conversion
- list*->matrix
- matrix->list*
- vector*->matrix
- matrix->vector*)
-
-;; ===================================================================================================
-;; Flat conversion to rectangular matrices
-
-(: list->matrix (All (A) (Integer Integer (Listof A) -> (Matrix A))))
-(define (list->matrix m n xs)
-  (cond [(or (not (index? m)) (= m 0))
-         (raise-argument-error 'list->matrix "Positive-Index" 0 m n xs)]
-        [(or (not (index? n)) (= n 0))
-         (raise-argument-error 'list->matrix "Positive-Index" 1 m n xs)]
-        [else  (list->array (vector m n) xs)]))
-
-(: matrix->list (All (A) ((Matrix A) -> (Listof A))))
-(define (matrix->list a)
-  (array->list (ensure-matrix 'matrix->list a)))
-
-(: vector->matrix (All (A) (Integer Integer (Vectorof A) -> (Mutable-Array A))))
-(define (vector->matrix m n v)
-  (cond [(or (not (index? m)) (= m 0))
-         (raise-argument-error 'vector->matrix "Positive-Index" 0 m n v)]
-        [(or (not (index? n)) (= n 0))
-         (raise-argument-error 'vector->matrix "Positive-Index" 1 m n v)]
-        [else  (vector->array (vector m n) v)]))
-
-(: matrix->vector (All (A) ((Matrix A) -> (Vectorof A))))
-(define (matrix->vector a)
-  (array->vector (ensure-matrix 'matrix->vector a)))
-
-;; ===================================================================================================
-;; Flat conversion to column and row matrices
-
-(: list->col-matrix (All (A) ((Listof A) -> (Matrix A))))
-(define (list->col-matrix xs)
-  (cond [(empty? xs)  (raise-argument-error 'list->col-matrix "nonempty List" xs)]
-        [else  (list->array ((inst vector Index) (length xs) 1) xs)]))
-
-(: vector->col-matrix (All (A) ((Vectorof A) -> (Mutable-Array A))))
-(define (vector->col-matrix xs)
-  (define n (vector-length xs))
-  (cond [(zero? n)  (raise-argument-error 'vector->col-matrix "nonempty Vector" xs)]
-        [else  (vector->array ((inst vector Index) n 1) xs)]))
-
-(: find-nontrivial-axis ((Vectorof Index) -> (Values Index Index)))
-(define (find-nontrivial-axis ds)
-  (define dims (vector-length ds))
-  (let: loop : (Values Index Index) ([k : Nonnegative-Fixnum  0])
-    (cond [(k . < . dims)  (define dk (unsafe-vector-ref ds k))
-                           (if (dk . > . 1) (values k dk) (loop (fx+ k 1)))]
-          [else  (values 0 0)])))
-
-(: array->col-matrix (All (A) ((Array A) -> (Matrix A))))
-(define (array->col-matrix arr)
-  (define (fail)
-    (raise-argument-error 'array->col-matrix
-                          "nonempty Array with exactly one axis of length >= 1" arr))
-  (define ds (array-shape arr))
-  (define dims (vector-length ds))
-  (define num-ones (vector-count (λ: ([d : Index]) (= d 1)) ds))
-  (cond [(zero? (array-size arr))  (fail)]
-        [(= num-ones dims)
-         (define: js : (Vectorof Index) (make-vector dims 0))
-         (define proc (unsafe-array-proc arr))
-         (array-default-strict
-          (unsafe-build-array ((inst vector Index) 1 1)
-                              (λ: ([ij : Indexes]) (proc js))))]
-        [(= num-ones (- dims 1))
-         (define-values (k m) (find-nontrivial-axis ds))
-         (define js (make-thread-local-indexes dims))
-         (define proc (unsafe-array-proc arr))
-         (array-default-strict
-          (unsafe-build-array ((inst vector Index) m 1)
-                              (λ: ([ij : Indexes])
-                                (let ([js  (js)])
-                                  (unsafe-vector-set! js k (unsafe-vector-ref ij 0))
-                                  (proc js)))))]
-        [else  (fail)]))
-
-(: ->col-matrix (All (A) ((U (Listof A) (Vectorof A) (Array A)) -> (Matrix A))))
-(define (->col-matrix xs)
-  (cond [(list? xs)  (list->col-matrix xs)]
-        [(vector? xs)  (vector->col-matrix xs)]
-        [(col-matrix? xs)  xs]
-        [else  (array->col-matrix xs)]))
-
-(: ->row-matrix (All (A) ((U (Listof A) (Vectorof A) (Array A)) -> (Matrix A))))
-(define (->row-matrix xs)
-  (cond [(list? xs)  (array-axis-swap (list->col-matrix xs) 0 1)]
-        [(vector? xs)  (array-axis-swap (vector->col-matrix xs) 0 1)]
-        [(row-matrix? xs)  xs]
-        [else  (array-axis-swap (array->col-matrix xs) 0 1)]))
-
-;; ===================================================================================================
-;; Nested conversion
-
-(: list*-shape (All (A) (Listof (Listof A)) (-> Nothing) -> (Values Positive-Index Positive-Index)))
-(define (list*-shape xss fail)
-  (define m (length xss))
-  (cond [(m . > . 0)
-         (define n (length (first xss)))
-         (cond [(and (n . > . 0) (andmap (λ: ([xs : (Listof A)]) (= n (length xs))) (rest xss)))
-                (values m n)]
-               [else  (fail)])]
-        [else  (fail)]))
-
-(: vector*-shape (All (A) (Vectorof (Vectorof A)) (-> Nothing)
-                      -> (Values Positive-Index Positive-Index)))
-(define (vector*-shape xss fail)
-  (define m (vector-length xss))
-  (cond [(m . > . 0)
-         (define ns ((inst vector-map Index (Vectorof A)) vector-length xss))
-         (define n (vector-length (unsafe-vector-ref xss 0)))
-         (cond [(and (n . > . 0)
-                     (let: loop : Boolean ([i : Nonnegative-Fixnum  1])
-                       (cond [(i . fx< . m)
-                              (if (= n (vector-length (unsafe-vector-ref xss i)))
-                                  (loop (fx+ i 1))
-                                  #f)]
-                             [else  #t])))
-                (values m n)]
-               [else  (fail)])]
-        [else  (fail)]))
-
-(: list*->matrix (All (A) (Listof (Listof A)) -> (Matrix A)))
-(define (list*->matrix xss)
-  (define (fail)
-    (raise-argument-error 'list*->matrix
-                          "nested lists with rectangular shape and at least one matrix element"
-                          xss))
-  (define-values (m n) (list*-shape xss fail))
-  (list->array ((inst vector Index) m n) (apply append xss)))
-
-(: matrix->list* (All (A) (Matrix A) -> (Listof (Listof A))))
-(define (matrix->list* a)
-  (cond [(matrix? a)  (parameterize ([array-strictness #f])
-                        (array->list (array->list-array a 1)))]
-        [else  (raise-argument-error 'matrix->list* "matrix?" a)]))
-
-(: vector*->matrix (All (A) (Vectorof (Vectorof A)) -> (Mutable-Array A)))
-(define (vector*->matrix xss)
-  (define (fail)
-    (raise-argument-error 'vector*->matrix
-                          "nested vectors with rectangular shape and at least one matrix element"
-                          xss))
-  (define-values (m n) (vector*-shape xss fail))
-  (vector->matrix m n (apply vector-append (vector->list xss))))
-
-(: matrix->vector* : (All (A) (Matrix A) -> (Vectorof (Vectorof A))))
-(define (matrix->vector* a)
-  (cond [(matrix? a)  (parameterize ([array-strictness #f])
-                        (array->vector ((inst array-axis-reduce A (Vectorof A)) a 1 build-vector)))]
-        [else  (raise-argument-error 'matrix->vector* "matrix?" a)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-expt.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-expt.rkt
deleted file mode 100644
index bdff8e6af7..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-expt.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang typed/racket/base
-
-(require "matrix-types.rkt"
-         "matrix-constructors.rkt"
-         "matrix-arithmetic.rkt"
-         "utils.rkt"
-         "../array/array-struct.rkt"
-         "../array/utils.rkt"
-         "../unsafe.rkt")
-
-(provide matrix-expt)
-
-(: matrix-expt/ns (case-> ((Matrix Flonum) Positive-Integer -> (Matrix Flonum))
-                          ((Matrix Real) Positive-Integer -> (Matrix Real))
-                          ((Matrix Float-Complex) Positive-Integer -> (Matrix Float-Complex))
-                          ((Matrix Number) Positive-Integer -> (Matrix Number))))
-(define (matrix-expt/ns a n)
-  (define n/2 (quotient n 2))
-  (if (zero? n/2)
-      ;; n = 1
-      a
-      (let ([m  (* n/2 2)])
-        (if (= n m)
-            ;; n is even
-            (let ([a^n/2  (matrix-expt/ns a n/2)])
-              (matrix* a^n/2 a^n/2))
-            ;; m = n - 1
-            (matrix* a (matrix-expt/ns a m))))))
-
-(: matrix-expt (case-> ((Matrix Flonum) Integer -> (Matrix Flonum))
-                       ((Matrix Real) Integer -> (Matrix Real))
-                       ((Matrix Float-Complex) Integer -> (Matrix Float-Complex))
-                       ((Matrix Number) Integer -> (Matrix Number))))
-(define (matrix-expt a n)
-  (cond [(not (square-matrix? a))  (raise-argument-error 'matrix-expt "square-matrix?" 0 a n)]
-        [(negative? n)  (raise-argument-error 'matrix-expt "Natural" 1 a n)]
-        [(zero? n)
-         (define proc (unsafe-array-proc a))
-         (array-default-strict
-          (unsafe-build-array
-           (array-shape a)
-           (λ: ([ij : Indexes])
-             (define x (proc ij))
-             (if (= (unsafe-vector-ref ij 0) (unsafe-vector-ref ij 1)) (one* x) (zero* x)))))]
-        [else  (call/ns (λ () (matrix-expt/ns a n)))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-gauss-elim.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-gauss-elim.rkt
deleted file mode 100644
index f334f8647b..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-gauss-elim.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         racket/list
-         "matrix-types.rkt"
-         "matrix-conversion.rkt"
-         "utils.rkt"
-         "../unsafe.rkt"
-         "../vector/vector-mutate.rkt")
-
-(provide
- Pivoting
- matrix-gauss-elim
- matrix-row-echelon)
-
-(define-type Pivoting (U 'first 'partial))
-
-(: matrix-gauss-elim
-   (case-> ((Matrix Flonum) -> (Values (Matrix Flonum) (Listof Index)))
-           ((Matrix Flonum) Any -> (Values (Matrix Flonum) (Listof Index)))
-           ((Matrix Flonum) Any Any -> (Values (Matrix Flonum) (Listof Index)))
-           ((Matrix Flonum) Any Any Pivoting -> (Values (Matrix Flonum) (Listof Index)))
-           ((Matrix Real) -> (Values (Matrix Real) (Listof Index)))
-           ((Matrix Real) Any -> (Values (Matrix Real) (Listof Index)))
-           ((Matrix Real) Any Any -> (Values (Matrix Real) (Listof Index)))
-           ((Matrix Real) Any Any Pivoting -> (Values (Matrix Real) (Listof Index)))
-           ((Matrix Float-Complex) -> (Values (Matrix Float-Complex) (Listof Index)))
-           ((Matrix Float-Complex) Any -> (Values (Matrix Float-Complex) (Listof Index)))
-           ((Matrix Float-Complex) Any Any -> (Values (Matrix Float-Complex) (Listof Index)))
-           ((Matrix Float-Complex) Any Any Pivoting -> (Values (Matrix Float-Complex) (Listof Index)))
-           ((Matrix Number) -> (Values (Matrix Number) (Listof Index)))
-           ((Matrix Number) Any -> (Values (Matrix Number) (Listof Index)))
-           ((Matrix Number) Any Any -> (Values (Matrix Number) (Listof Index)))
-           ((Matrix Number) Any Any Pivoting -> (Values (Matrix Number) (Listof Index)))))
-(define (matrix-gauss-elim M [jordan? #f] [unitize-pivot? #f] [pivoting 'partial])
-  (define-values (m n) (matrix-shape M))
-  (define rows (matrix->vector* M))
-  (let loop ([#{i : Nonnegative-Fixnum} 0]
-             [#{j : Nonnegative-Fixnum} 0]
-             [#{without-pivot : (Listof Index)} empty])
-    (cond
-      [(j . fx>= . n)
-       (values (vector*->matrix rows)
-               (reverse without-pivot))]
-      [(i . fx>= . m)
-       (values (vector*->matrix rows)
-               ;; None of the rest of the columns can have pivots
-               (let loop ([#{j : Nonnegative-Fixnum} j] [without-pivot without-pivot])
-                 (cond [(j . fx< . n)  (loop (fx+ j 1) (cons j without-pivot))]
-                       [else  (reverse without-pivot)])))]
-      [else
-       (define-values (p pivot)
-         (case pivoting
-           [(partial)  (find-partial-pivot rows m i j)]
-           [(first)    (find-first-pivot rows m i j)]))
-       (cond
-         [(zero? pivot)  (loop i (fx+ j 1) (cons j without-pivot))]
-         [else
-          ;; Swap pivot row with current
-          (vector-swap! rows i p)
-          ;; Possibly unitize the new current row
-          (let ([pivot  (if unitize-pivot?
-                            (begin (vector-scale! (unsafe-vector-ref rows i) (/ 1 pivot))
-                                   (/ pivot pivot))
-                            pivot)])
-            (elim-rows! rows m i j pivot (if jordan? 0 (fx+ i 1)))
-            (loop (fx+ i 1) (fx+ j 1) without-pivot))])])))
-
-(: matrix-row-echelon
-   (case-> ((Matrix Flonum) -> (Matrix Flonum))
-           ((Matrix Flonum) Any -> (Matrix Flonum))
-           ((Matrix Flonum) Any Any -> (Matrix Flonum))
-           ((Matrix Flonum) Any Any Pivoting -> (Matrix Flonum))
-           ((Matrix Real) -> (Matrix Real))
-           ((Matrix Real) Any -> (Matrix Real))
-           ((Matrix Real) Any Any -> (Matrix Real))
-           ((Matrix Real) Any Any Pivoting -> (Matrix Real))
-           ((Matrix Float-Complex) -> (Matrix Float-Complex))
-           ((Matrix Float-Complex) Any -> (Matrix Float-Complex))
-           ((Matrix Float-Complex) Any Any -> (Matrix Float-Complex))
-           ((Matrix Float-Complex) Any Any Pivoting -> (Matrix Float-Complex))
-           ((Matrix Number) -> (Matrix Number))
-           ((Matrix Number) Any -> (Matrix Number))
-           ((Matrix Number) Any Any -> (Matrix Number))
-           ((Matrix Number) Any Any Pivoting -> (Matrix Number))))
-(define (matrix-row-echelon M [jordan? #f] [unitize-pivot? #f] [pivoting 'partial])
-  (let-values ([(M _) (matrix-gauss-elim M jordan? unitize-pivot? pivoting)])
-    M))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-gram-schmidt.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-gram-schmidt.rkt
deleted file mode 100644
index f8f0886b8c..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-gram-schmidt.rkt
+++ /dev/null
@@ -1,112 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         racket/list
-         "matrix-types.rkt"
-         "matrix-basic.rkt"
-         "matrix-conversion.rkt"
-         "matrix-constructors.rkt"
-         "utils.rkt"
-         "../unsafe.rkt"
-         "../vector/vector-mutate.rkt"
-         "../array/array-struct.rkt"
-         "../array/array-constructors.rkt"
-         "../array/array-indexing.rkt")
-
-(provide matrix-gram-schmidt
-         matrix-basis-extension)
-
-(: find-nonzero-vector (case-> ((Vectorof (Vectorof Flonum)) -> (U #f Index))
-                               ((Vectorof (Vectorof Real)) -> (U #f Index))
-                               ((Vectorof (Vectorof Float-Complex)) -> (U #f Index))
-                               ((Vectorof (Vectorof Number)) -> (U #f Index))))
-(define (find-nonzero-vector vss)
-  (define n (vector-length vss))
-  (cond [(= n 0)  #f]
-        [else  (let loop ([#{i : Nonnegative-Fixnum} 0])
-                 (cond [(i . fx< . n)
-                        (define vs (unsafe-vector-ref vss i))
-                        (if (vector-zero? vs) (loop (fx+ i 1)) i)]
-                       [else  #f]))]))
-
-(: subtract-projections!
-   (case-> ((Vectorof (Vectorof Flonum)) Nonnegative-Fixnum Index (Vectorof Flonum) -> Void)
-           ((Vectorof (Vectorof Real)) Nonnegative-Fixnum Index (Vectorof Real) -> Void)
-           ((Vectorof (Vectorof Float-Complex)) Nonnegative-Fixnum Index (Vectorof Float-Complex)
-                                                -> Void)
-           ((Vectorof (Vectorof Number)) Nonnegative-Fixnum Index (Vectorof Number) -> Void)))
-(define (subtract-projections! rows i m row)
-  (let loop ([#{i : Nonnegative-Fixnum} i])
-    (when (i . fx< . m)
-      (vector-sub-proj! (unsafe-vector-ref rows i) row #f)
-      (loop (fx+ i 1)))))
-
-(: matrix-gram-schmidt/ns (case-> ((Matrix Flonum) Any Integer -> (Array Flonum))
-                                  ((Matrix Real) Any Integer -> (Array Real))
-                                  ((Matrix Float-Complex) Any Integer -> (Array Float-Complex))
-                                  ((Matrix Number) Any Integer -> (Array Number))))
-;; Performs Gram-Schmidt orthogonalization on M, assuming the rows before `start' are already
-;; orthogonal
-(define (matrix-gram-schmidt/ns M normalize? start)
-  (define rows (matrix->vector* (matrix-transpose M)))
-  (define m (vector-length rows))
-  (define i (find-nonzero-vector rows))
-  (cond [(not (index? start))
-         (raise-argument-error 'matrix-gram-schmidt "Index" 2 M normalize? start)]
-        [i
-         (define rowi (unsafe-vector-ref rows i))
-         (subtract-projections! rows (fxmax start (fx+ i 1)) m rowi)
-         (when normalize? (vector-normalize! rowi))
-         (let loop ([#{i : Nonnegative-Fixnum} (fx+ i 1)] [bs (list rowi)])
-           (cond [(i . fx< . m)
-                  (define rowi (unsafe-vector-ref rows i))
-                  (cond [(vector-zero? rowi)  (loop (fx+ i 1) bs)]
-                        [else  (subtract-projections! rows (fxmax start (fx+ i 1)) m rowi)
-                               (when normalize? (vector-normalize! rowi))
-                               (loop (fx+ i 1) (cons rowi bs))])]
-                 [else
-                  (matrix-transpose (vector*->matrix (list->vector (reverse bs))))]))]
-        [else
-         (make-array (vector (matrix-num-rows M) 0)
-                     ;; Value won't be in the matrix, but this satisfies TR:
-                     (zero* (unsafe-vector2d-ref rows 0 0)))]))
-
-(: matrix-gram-schmidt (case-> ((Matrix Flonum)             -> (Array Flonum))
-                               ((Matrix Flonum) Any         -> (Array Flonum))
-                               ((Matrix Flonum) Any Integer -> (Array Flonum))
-                               ((Matrix Real)             -> (Array Real))
-                               ((Matrix Real) Any         -> (Array Real))
-                               ((Matrix Real) Any Integer -> (Array Real))
-                               ((Matrix Float-Complex)             -> (Array Float-Complex))
-                               ((Matrix Float-Complex) Any         -> (Array Float-Complex))
-                               ((Matrix Float-Complex) Any Integer -> (Array Float-Complex))
-                               ((Matrix Number)             -> (Array Number))
-                               ((Matrix Number) Any         -> (Array Number))
-                               ((Matrix Number) Any Integer -> (Array Number))))
-(define (matrix-gram-schmidt M [normalize? #f] [start 0])
-  (call/ns (λ () (matrix-gram-schmidt/ns M normalize? start))))
-
-(: matrix-basis-extension/ns (case-> ((Matrix Flonum)   -> (Array Flonum))
-                                     ((Matrix Real)   -> (Array Real))
-                                     ((Matrix Float-Complex) -> (Array Float-Complex))
-                                     ((Matrix Number) -> (Array Number))))
-(define (matrix-basis-extension/ns B)
-  (define-values (m n) (matrix-shape B))
-  (define x00 (matrix-ref B 0 0))
-  (define zero (zero* x00))
-  (define one (one* x00))
-  (cond [(n . < . m)
-         (define S (matrix-gram-schmidt (matrix-augment (list B (identity-matrix m one zero))) #f n))
-         (define R (submatrix S (::) (:: n #f)))
-         (matrix-augment (take (sort/key (matrix-cols R) > matrix-norm) (- m n)))]
-        [(n . = . m)
-         (make-array (vector m 0) zero)]
-        [else
-         (raise-argument-error 'matrix-extend-row-basis "matrix? with width < height" B)]))
-
-(: matrix-basis-extension (case-> ((Matrix Flonum) -> (Array Flonum))
-                                  ((Matrix Real) -> (Array Real))
-                                  ((Matrix Float-Complex) -> (Array Float-Complex))
-                                  ((Matrix Number) -> (Array Number))))
-(define (matrix-basis-extension B)
-  (call/ns (λ () (matrix-basis-extension/ns B))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-lu.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-lu.rkt
deleted file mode 100644
index ef90a61942..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-lu.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         "matrix-types.rkt"
-         "matrix-conversion.rkt"
-         "matrix-arithmetic.rkt"
-         "utils.rkt"
-         "../unsafe.rkt"
-         "../vector/vector-mutate.rkt"
-         "../array/mutable-array.rkt"
-         "../array/array-struct.rkt"
-         "../array/array-pointwise.rkt")
-
-(provide matrix-lu)
-
-;; An LU factorization exists iff Gaussian elimination can be done without row swaps.
-
-(: matrix-lu
-   (All (A) (case-> ((Matrix Flonum)        -> (Values (Matrix Flonum) (Matrix Flonum)))
-                    ((Matrix Flonum) (-> A) -> (Values (U A (Matrix Flonum)) (Matrix Flonum)))
-                    ((Matrix Real)        -> (Values (Matrix Real) (Matrix Real)))
-                    ((Matrix Real) (-> A) -> (Values (U A (Matrix Real)) (Matrix Real)))
-                    ((Matrix Float-Complex)        -> (Values (Matrix Float-Complex)
-                                                              (Matrix Float-Complex)))
-                    ((Matrix Float-Complex) (-> A) -> (Values (U A (Matrix Float-Complex))
-                                                              (Matrix Float-Complex)))
-                    ((Matrix Number)        -> (Values (Matrix Number) (Matrix Number)))
-                    ((Matrix Number) (-> A) -> (Values (U A (Matrix Number)) (Matrix Number))))))
-(define matrix-lu
-  (case-lambda
-    [(M)  (matrix-lu M (λ () (raise-argument-error 'matrix-lu "LU-decomposable matrix" M)))]
-    [(M fail)
-     (define m (square-matrix-size M))
-     (define rows (matrix->vector* M))
-     (define L
-       (parameterize ([array-strictness #f])
-         ;; Construct L in a weird way to prove to TR that it has the right type
-         (array->mutable-array (inline-array-map zero* M))))
-     ;; Going to fill in the lower triangle by banging values into `ys'
-     (define ys (mutable-array-data L))
-     (let loop ([#{i : Nonnegative-Fixnum} 0])
-       (cond
-         [(i . fx< . m)
-          ;; Pivot must be on the diagonal
-          (define pivot (unsafe-vector2d-ref rows i i))
-          (cond
-            [(zero? pivot)  (values (fail) M)]
-            [else
-             ;; Zero out everything below the pivot
-             (let l-loop ([#{l : Nonnegative-Fixnum} (fx+ i 1)])
-               (cond
-                 [(l . fx< . m)
-                  (define x_li (unsafe-vector2d-ref rows l i))
-                  (define y_li (/ x_li pivot))
-                  (unless (zero? x_li)
-                    ;; Fill in lower triangle of L
-                    (unsafe-vector-set! ys (+ (* l m) i) y_li)
-                    ;; Add row i, scaled
-                    (vector-scaled-add! (unsafe-vector-ref rows l)
-                                        (unsafe-vector-ref rows i)
-                                        (* -1 y_li)))
-                  (l-loop (fx+ l 1))]
-                 [else
-                  (loop (fx+ i 1))]))])]
-         [else
-          ;; L's lower triangle has been filled; now fill the diagonal with 1s
-          (for: ([i : Integer (in-range 0 m)])
-            (define j (+ (* i m) i))
-            (vector-set! ys j (one* (vector-ref ys j))))
-          (values L (vector*->matrix rows))]))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-operator-norm.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-operator-norm.rkt
deleted file mode 100644
index e6a5c8aa6c..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-operator-norm.rkt
+++ /dev/null
@@ -1,154 +0,0 @@
-#lang typed/racket/base
-
-#|
-Two of the functions defined here currently just raise an error: `matrix-op-2norm' and
-`matrix-op-angle'. They need to compute, respectively, the maximum and minimum singular values of
-their matrix argument.
-
-See "How to Measure Errors" in the LAPACK manual for more details:
-
-  http://www.netlib.org/lapack/lug/node75.html
-  http://www.netlib.org/lapack/lug/node76.html
-|#
-
-(require racket/list
-         racket/fixnum
-         math/flonum
-         "matrix-types.rkt"
-         "matrix-arithmetic.rkt"
-         "matrix-constructors.rkt"
-         "matrix-basic.rkt"
-         "utils.rkt"
-         "../array/array-struct.rkt"
-         "../array/array-pointwise.rkt"
-         "../array/array-fold.rkt"
-         )
-
-
-(provide
- ;; Operator norms
- matrix-op-1norm
- matrix-op-2norm
- matrix-op-inf-norm
- matrix-basis-cos-angle
- matrix-basis-angle
- ;; Error measurement
- matrix-error-norm
- matrix-absolute-error
- matrix-relative-error
- ;; Approximate predicates
- matrix-zero?
- matrix-identity?
- matrix-orthonormal?
- )
-
-(: matrix-op-1norm (case-> ((Matrix Flonum) -> Nonnegative-Flonum)
-                           ((Matrix Real) -> Nonnegative-Real)
-                           ((Matrix Float-Complex) -> Nonnegative-Flonum)
-                           ((Matrix Number) -> Nonnegative-Real)))
-;; When M is a column matrix, this is equivalent to matrix-1norm
-(define (matrix-op-1norm M)
-  (parameterize ([array-strictness #f])
-    (assert (apply max (map matrix-1norm (matrix-cols M))) nonnegative?)))
-
-(: matrix-op-2norm (case-> ((Matrix Flonum) -> Nonnegative-Flonum)
-                           ((Matrix Real) -> Nonnegative-Real)
-                           ((Matrix Float-Complex) -> Nonnegative-Flonum)
-                           ((Matrix Number) -> Nonnegative-Real)))
-;; When M is a column matrix, this is equivalent to matrix-2norm
-(define (matrix-op-2norm M)
-  ;(matrix-max-singular-value M)
-  ;(sqrt (matrix-max-eigenvalue M))
-  (error 'unimplemented))
-
-(: matrix-op-inf-norm (case-> ((Matrix Flonum) -> Nonnegative-Flonum)
-                              ((Matrix Real) -> Nonnegative-Real)
-                              ((Matrix Float-Complex) -> Nonnegative-Flonum)
-                              ((Matrix Number) -> Nonnegative-Real)))
-;; When M is a column matrix, this is equivalent to matrix-inf-norm
-(define (matrix-op-inf-norm M)
-  (parameterize ([array-strictness #f])
-    (assert (apply max (map matrix-1norm (matrix-rows M))) nonnegative?)))
-
-(: matrix-basis-cos-angle (case-> ((Matrix Flonum) (Matrix Flonum) -> Flonum)
-                                  ((Matrix Real) (Matrix Real) -> Real)
-                                  ((Matrix Float-Complex) (Matrix Float-Complex) -> Float-Complex)
-                                  ((Matrix Number) (Matrix Number) -> Number)))
-;; Returns the angle between the two subspaces spanned by the two given sets of column vectors
-(define (matrix-basis-cos-angle M R)
-  ;(matrix-min-singular-value (matrix* (matrix-hermitian M) R))
-  (error 'unimplemented))
-
-(: matrix-basis-angle (case-> ((Matrix Flonum) (Matrix Flonum) -> Flonum)
-                              ((Matrix Real) (Matrix Real) -> Real)
-                              ((Matrix Float-Complex) (Matrix Float-Complex) -> Float-Complex)
-                              ((Matrix Number) (Matrix Number) -> Number)))
-;; Returns the angle between the two subspaces spanned by the two given sets of column vectors
-(define (matrix-basis-angle M R)
-  (acos (matrix-basis-cos-angle M R)))
-
-;; ===================================================================================================
-;; Error measurement
-
-(: matrix-error-norm (Parameterof ((Matrix Number) -> Nonnegative-Real)))
-(define matrix-error-norm (make-parameter matrix-op-inf-norm))
-
-(: matrix-absolute-error
-   (case-> ((Matrix Number) (Matrix Number) -> Nonnegative-Real)
-           ((Matrix Number) (Matrix Number) ((Matrix Number) -> Nonnegative-Real)
-                            -> Nonnegative-Real)))
-(define (matrix-absolute-error M R [norm (matrix-error-norm)])
-  (parameterize ([array-strictness #f])
-    (define-values (m n) (matrix-shapes 'matrix-absolute-error M R))
-    (array-strict! M)
-    (array-strict! R)
-    (cond [(array-all-and (inline-array-map eqv? M R))  0]
-          [(and (array-all-and (inline-array-map number-rational? M))
-                (array-all-and (inline-array-map number-rational? R)))
-           (norm (matrix- (inline-array-map inexact->exact M)
-                          (inline-array-map inexact->exact R)))]
-          [else  +inf.0])))
-
-(: matrix-relative-error
-   (case-> ((Matrix Number) (Matrix Number) -> Nonnegative-Real)
-           ((Matrix Number) (Matrix Number) ((Matrix Number) -> Nonnegative-Real)
-                            -> Nonnegative-Real)))
-(define (matrix-relative-error M R [norm (matrix-error-norm)])
-  (parameterize ([array-strictness #f])
-    (define-values (m n) (matrix-shapes 'matrix-relative-error M R))
-    (array-strict! M)
-    (array-strict! R)
-    (cond [(array-all-and (inline-array-map eqv? M R))  0]
-          [(and (array-all-and (inline-array-map number-rational? M))
-                (array-all-and (inline-array-map number-rational? R)))
-           (define num (norm (matrix- M R)))
-           (define den (norm R))
-           (cond [(and (zero? num) (zero? den))  0]
-                 [(zero? den)  +inf.0]
-                 [else  (assert (/ num den) nonnegative?)])]
-          [else  +inf.0])))
-
-;; ===================================================================================================
-;; Approximate predicates
-
-(: matrix-zero? (case-> ((Matrix Number) -> Boolean)
-                        ((Matrix Number) Real -> Boolean)))
-(define (matrix-zero? M [eps (* 10 epsilon.0)])
-  (cond [(eps . < . 0)  (raise-argument-error 'matrix-identity? "Nonnegative-Real" 1 M eps)]
-        [else
-         (define-values (m n) (matrix-shape M))
-         (<= (matrix-absolute-error M (make-matrix m n 0)) eps)]))
-
-(: matrix-identity? (case-> ((Matrix Number) -> Boolean)
-                            ((Matrix Number) Real -> Boolean)))
-(define (matrix-identity? M [eps (* 10 epsilon.0)])
-  (cond [(eps . < . 0)  (raise-argument-error 'matrix-identity? "Nonnegative-Real" 1 M eps)]
-        [else  (and (square-matrix? M)
-                    (<= (matrix-relative-error M (identity-matrix (square-matrix-size M))) eps))]))
-
-(: matrix-orthonormal? (case-> ((Matrix Number) -> Boolean)
-                               ((Matrix Number) Real -> Boolean)))
-(define (matrix-orthonormal? M [eps (* 10 epsilon.0)])
-  (cond [(eps . < . 0)  (raise-argument-error 'matrix-orthonormal? "Nonnegative-Real" 1 M eps)]
-        [else  (and (square-matrix? M)
-                    (matrix-identity? (matrix* M (matrix-hermitian M)) eps))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-qr.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-qr.rkt
deleted file mode 100644
index 6c09e87423..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-qr.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang typed/racket/base
-
-(require "matrix-types.rkt"
-         "matrix-basic.rkt"
-         "matrix-arithmetic.rkt"
-         "matrix-constructors.rkt"
-         "matrix-gram-schmidt.rkt"
-         "utils.rkt"
-         "../array/array-transform.rkt"
-         "../array/array-struct.rkt")
-
-(provide matrix-qr)
-
-#|
-QR decomposition currently does Gram-Schmidt twice, as suggested by
-
-  Luc Giraud, Julien Langou, Miroslav Rozloznik.
-  On the round-off error analysis of the Gram-Schmidt algorithm with reorthogonalization.
-  Technical Report, 2002.
-
-It normalizes only the second time.
-
-I've verified experimentally that, with random, square matrices (elements in [0,1]), doing so
-produces matrices for which `matrix-orthogonal?' returns #t with eps <= 10*epsilon.0, apparently
-independently of the matrix size.
-|#
-
-(: matrix-qr/ns (case-> ((Matrix Flonum) Any -> (Values (Matrix Flonum) (Matrix Flonum)))
-                        ((Matrix Real) Any -> (Values (Matrix Real) (Matrix Real)))
-                        ((Matrix Float-Complex) Any -> (Values (Matrix Float-Complex)
-                                                               (Matrix Float-Complex)))
-                        ((Matrix Number) Any -> (Values (Matrix Number) (Matrix Number)))))
-(define (matrix-qr/ns M full?)
-  (define x00 (matrix-ref M 0 0))
-  (define zero (zero* x00))
-  (define one (one* x00))
-  (define B (matrix-gram-schmidt M #f))
-  (define Q
-    (matrix-gram-schmidt
-     (cond [(or (square-matrix? B) (and (matrix? B) (not full?)))  B]
-           [(matrix? B)  (array-append* (list B (matrix-basis-extension B)) 1)]
-           [full?  (identity-matrix (matrix-num-rows M) one zero)]
-           [else  (matrix-col (identity-matrix (matrix-num-rows M) one zero) 0)])
-     #t))
-  (values Q (matrix-upper-triangle (matrix* (matrix-hermitian Q) M) zero)))
-
-(: matrix-qr (case-> ((Matrix Flonum)     -> (Values (Matrix Flonum) (Matrix Flonum)))
-                     ((Matrix Flonum) Any -> (Values (Matrix Flonum) (Matrix Flonum)))
-                     ((Matrix Real)     -> (Values (Matrix Real) (Matrix Real)))
-                     ((Matrix Real) Any -> (Values (Matrix Real) (Matrix Real)))
-                     ((Matrix Float-Complex)     -> (Values (Matrix Float-Complex)
-                                                            (Matrix Float-Complex)))
-                     ((Matrix Float-Complex) Any -> (Values (Matrix Float-Complex)
-                                                            (Matrix Float-Complex)))
-                     ((Matrix Number)     -> (Values (Matrix Number) (Matrix Number)))
-                     ((Matrix Number) Any -> (Values (Matrix Number) (Matrix Number)))))
-(define (matrix-qr M [full? #t])
-  (define-values (Q R) (parameterize ([array-strictness #f])
-                         (matrix-qr/ns M full?)))
-  (values (array-default-strict Q)
-          (array-default-strict R)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-solve.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-solve.rkt
deleted file mode 100644
index 913d254546..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-solve.rkt
+++ /dev/null
@@ -1,128 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         racket/match
-         racket/list
-         "matrix-types.rkt"
-         "matrix-constructors.rkt"
-         "matrix-conversion.rkt"
-         "matrix-basic.rkt"
-         "matrix-gauss-elim.rkt"
-         "utils.rkt"
-         "../vector/vector-mutate.rkt"
-         "../array/array-indexing.rkt"
-         "../array/mutable-array.rkt"
-         "../array/array-struct.rkt")
-
-(provide 
- matrix-determinant
- matrix-determinant/row-reduction  ; for testing
- matrix-invertible?
- matrix-inverse
- matrix-solve)
-
-;; ===================================================================================================
-;; Determinant
-
-(: matrix-determinant (case-> ((Matrix Flonum) -> Flonum)
-                              ((Matrix Real) -> Real)
-                              ((Matrix Float-Complex) -> Float-Complex)
-                              ((Matrix Number) -> Number)))
-(define (matrix-determinant M)
-  (define m (square-matrix-size M))
-  (cond
-    [(= m 1)  (matrix-ref M 0 0)]
-    [(= m 2)  (match-define (vector a b c d)
-                (mutable-array-data (array->mutable-array M)))
-              (- (* a d) (* b c))]
-    [(= m 3)  (match-define (vector a b c d e f g h i)
-                (mutable-array-data (array->mutable-array M)))
-              (+ (*    a  (- (* e i) (* f h)))
-                 (* (- b) (- (* d i) (* f g)))
-                 (*    c  (- (* d h) (* e g))))]
-    [else
-     (matrix-determinant/row-reduction M)]))
-
-(: matrix-determinant/row-reduction (case-> ((Matrix Flonum) -> Flonum)
-                                            ((Matrix Real) -> Real)
-                                            ((Matrix Float-Complex) -> Float-Complex)
-                                            ((Matrix Number) -> Number)))
-(define (matrix-determinant/row-reduction M)
-  (define m (square-matrix-size M))
-  (define rows (matrix->vector* M))
-  (let loop ([#{i : Nonnegative-Fixnum} 0] [#{sign : (U Positive-Fixnum Negative-Fixnum)} 1])
-    (cond
-      [(i . fx< . m)
-       (define-values (p pivot) (find-partial-pivot rows m i i))
-       (cond
-         [(zero? pivot)  pivot]  ; no pivot means non-invertible matrix
-         [else
-          (let ([sign  (if (= i p) sign (begin (vector-swap! rows i p)  ; swapping negates sign
-                                               (if (= sign 1) -1 1)))])
-            (elim-rows! rows m i i pivot (fx+ i 1))  ; adding scaled rows doesn't change it
-            (loop (fx+ i 1) sign))])]
-      [else
-       (define prod (unsafe-vector2d-ref rows 0 0))
-       (let loop ([#{i : Nonnegative-Fixnum} 1] [prod prod])
-         (cond [(i . fx< . m)
-                (loop (fx+ i 1) (* prod (unsafe-vector2d-ref rows i i)))]
-               [else  (* prod sign)]))])))
-
-;; ===================================================================================================
-;; Inversion
-
-(: matrix-invertible? ((Matrix Number) -> Boolean))
-(define (matrix-invertible? M)
-  (and (square-matrix? M)
-       (not (zero? (matrix-determinant M)))))
-
-(: matrix-inverse (All (A) (case-> ((Matrix Flonum)        -> (Matrix Flonum))
-                                   ((Matrix Flonum) (-> A) -> (U A (Matrix Flonum)))
-                                   ((Matrix Real)        -> (Matrix Real))
-                                   ((Matrix Real) (-> A) -> (U A (Matrix Real)))
-                                   ((Matrix Float-Complex)        -> (Matrix Float-Complex))
-                                   ((Matrix Float-Complex) (-> A) -> (U A (Matrix Float-Complex)))
-                                   ((Matrix Number)        -> (Matrix Number))
-                                   ((Matrix Number) (-> A) -> (U A (Matrix Number))))))
-(define matrix-inverse
-  (case-lambda
-    [(M)  (matrix-inverse M (λ () (raise-argument-error 'matrix-inverse "matrix-invertible?" M)))]
-    [(M fail)
-     (define m (square-matrix-size M))
-     (define x00 (matrix-ref M 0 0))
-     (define I (identity-matrix m (one* x00) (zero* x00)))
-     (define-values (IM^-1 wps) (parameterize ([array-strictness #f])
-                                  (matrix-gauss-elim (matrix-augment (list M I)) #t #t)))
-     (cond [(and (not (empty? wps)) (= (first wps) m))
-            (submatrix IM^-1 (::) (:: m #f))]
-           [else  (fail)])]))
-
-;; ===================================================================================================
-;; Solving linear systems
-
-(: matrix-solve
-   (All (A) (case->
-             ((Matrix Flonum) (Matrix Flonum)        -> (Matrix Flonum))
-             ((Matrix Flonum) (Matrix Flonum) (-> A) -> (U A (Matrix Flonum)))
-             ((Matrix Real) (Matrix Real)        -> (Matrix Real))
-             ((Matrix Real) (Matrix Real) (-> A) -> (U A (Matrix Real)))
-             ((Matrix Float-Complex) (Matrix Float-Complex)        -> (Matrix Float-Complex))
-             ((Matrix Float-Complex) (Matrix Float-Complex) (-> A) -> (U A (Matrix Float-Complex)))
-             ((Matrix Number) (Matrix Number)        -> (Matrix Number))
-             ((Matrix Number) (Matrix Number) (-> A) -> (U A (Matrix Number))))))
-(define matrix-solve
-  (case-lambda
-    [(M B)  (matrix-solve M B (λ () (raise-argument-error 'matrix-solve "matrix-invertible?" 0 M B)))]
-    [(M B fail)
-     (define m (square-matrix-size M))
-     (define-values (s t) (matrix-shape B))
-     (cond [(= m s)
-            (define-values (IX wps) (parameterize ([array-strictness #f])
-                                      (matrix-gauss-elim (matrix-augment (list M B)) #t #t)))
-            (cond [(and (not (empty? wps)) (= (first wps) m))
-                   (submatrix IX (::) (:: m #f))]
-                  [else  (fail)])]
-           [else
-            (error 'matrix-solve
-                   "matrices must have the same number of rows; given ~e and ~e"
-                   M B)])]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-subspace.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-subspace.rkt
deleted file mode 100644
index 8202935b88..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-subspace.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         racket/list
-         "matrix-types.rkt"
-         "matrix-basic.rkt"
-         "matrix-gauss-elim.rkt"
-         "utils.rkt"
-         "../array/array-indexing.rkt"
-         "../array/array-constructors.rkt"
-         "../array/array-struct.rkt")
-
-(provide 
- matrix-rank
- matrix-nullity
- matrix-col-space)
-
-(: matrix-rank : (Matrix Number) -> Index)
-;; Returns the dimension of the column space (equiv. row space) of M
-(define (matrix-rank M)
-  (define n (matrix-num-cols M))
-  (define-values (_ cols-without-pivot) (matrix-gauss-elim M))
-  (assert (- n (length cols-without-pivot)) index?))
-
-(: matrix-nullity : (Matrix Number) -> Index)
-;; Returns the dimension of the null space of M
-(define (matrix-nullity M)
-  (define-values (_ cols-without-pivot)
-    (matrix-gauss-elim (ensure-matrix 'matrix-nullity M)))
-  (length cols-without-pivot))
-
-(: maybe-cons-submatrix (All (A) ((Matrix A) Nonnegative-Fixnum Nonnegative-Fixnum (Listof (Matrix A))
-                                             -> (Listof (Matrix A)))))
-(define (maybe-cons-submatrix M j0 j1 Bs)
-  (cond [(= j0 j1)  Bs]
-        [else  (cons (submatrix M (::) (:: j0 j1)) Bs)]))
-
-(: matrix-col-space/ns (All (A) (case-> ((Matrix Flonum) -> (U #f (Matrix Flonum)))
-                                        ((Matrix Real) -> (U #f (Matrix Real)))
-                                        ((Matrix Float-Complex) -> (U #f (Matrix Float-Complex)))
-                                        ((Matrix Number) -> (U #f (Matrix Number))))))
-(define (matrix-col-space/ns M)
-  (define n (matrix-num-cols M))
-  (define-values (_ wps) (matrix-gauss-elim M))
-  (cond [(empty? wps)  M]
-        [(= (length wps) n)  #f]
-        [else
-         (define next-j (first wps))
-         (define Bs (maybe-cons-submatrix M 0 next-j empty))
-         (let loop ([#{j : Index} next-j] [wps (rest wps)] [Bs Bs])
-           (cond [(empty? wps)
-                  (matrix-augment (reverse (maybe-cons-submatrix M (fx+ j 1) n Bs)))]
-                 [else
-                  (define next-j (first wps))
-                  (loop next-j (rest wps) (maybe-cons-submatrix M (fx+ j 1) next-j Bs))]))]))
-
-(: matrix-col-space (All (A) (case-> ((Matrix Flonum)        -> (Array Flonum))
-                                     ((Matrix Flonum) (-> A) -> (U A (Matrix Flonum)))
-                                     ((Matrix Real)        -> (Array Real))
-                                     ((Matrix Real) (-> A) -> (U A (Matrix Real)))
-                                     ((Matrix Float-Complex)        -> (Array Float-Complex))
-                                     ((Matrix Float-Complex) (-> A) -> (U A (Matrix Float-Complex)))
-                                     ((Matrix Number)        -> (Array Number))
-                                     ((Matrix Number) (-> A) -> (U A (Matrix Number))))))
-(define matrix-col-space 
-  (case-lambda
-    [(M)  (matrix-col-space M (λ ()
-                                (define x00 (matrix-ref M 0 0))
-                                (make-array (vector 0 (matrix-num-cols M)) (zero* x00))))]
-    [(M fail)
-     (define S (parameterize ([array-strictness #f])
-                 (matrix-col-space/ns M)))
-     (if S (array-default-strict S) (fail))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-syntax.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-syntax.rkt
deleted file mode 100644
index 3c186f7026..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-syntax.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     syntax/parse)
-         (only-in typed/racket/base :)
-         "../array/array-struct.rkt")
-
-(provide matrix row-matrix col-matrix)
-
-(define-syntax (matrix stx)
-  (syntax-parse stx #:literals (:)
-    [(_ [[x0 xs0 ...] [x xs ...] ...])
-     (syntax/loc stx (array #[#[x0 xs0 ...] #[x xs ...] ...]))]
-    [(_ [[x0 xs0 ...] [x xs ...] ...] : T)
-     (syntax/loc stx (array #[#[x0 xs0 ...] #[x xs ...] ...] : T))]
-    [(_ [xs ... (~and [] r) ys ...] (~optional (~seq : T)))
-     (raise-syntax-error 'matrix "given empty row" stx #'r)]
-    [(_ (~and [] c) (~optional (~seq : T)))
-     (raise-syntax-error 'matrix "given empty matrix" stx #'c)]
-    [(_ x (~optional (~seq : T)))
-     (raise-syntax-error 'matrix "expected two-dimensional data" stx)]))
-
-(define-syntax (row-matrix stx)
-  (syntax-parse stx #:literals (:)
-    [(_ [x xs ...])      (syntax/loc stx (array #[#[x xs ...]]))]
-    [(_ [x xs ...] : T)  (syntax/loc stx (array #[#[x xs ...]] : T))]
-    [(_ (~and [] r) (~optional (~seq : T)))
-     (raise-syntax-error 'row-matrix "given empty row" stx #'r)]))
-
-(define-syntax (col-matrix stx)
-  (syntax-parse stx #:literals (:)
-    [(_ [x xs ...])      (syntax/loc stx (array #[#[x] #[xs] ...]))]
-    [(_ [x xs ...] : T)  (syntax/loc stx (array #[#[x] #[xs] ...] : T))]
-    [(_ (~and [] c) (~optional (~seq : T)))
-     (raise-syntax-error 'col-matrix "given empty column" stx #'c)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-types.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-types.rkt
deleted file mode 100644
index 532305da2c..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-types.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang typed/racket/base
-
-(require "../array/array-struct.rkt"
-         "../array/array-fold.rkt"
-         "../array/array-pointwise.rkt"
-         "../unsafe.rkt")
-
-(provide Matrix
-         matrix?
-         square-matrix?
-         row-matrix?
-         col-matrix?
-         matrix-shape
-         square-matrix-size
-         matrix-num-rows
-         matrix-num-cols)
-
-;; Matrices are represented as arrays, but additionally must be nonempty and have exactly two axes
-(define-type (Matrix A) (Array A))
-
-(: matrix? (All (A) ((Array A) -> Boolean)))
-(define (matrix? arr)
-  (and (> (array-size arr) 0)
-       (= (array-dims arr) 2)))
-
-(: square-matrix? (All (A) ((Array A) -> Boolean)))
-(define (square-matrix? arr)
-  (define ds (array-shape arr))
-  (and (= (vector-length ds) 2)
-       (let ([d0  (unsafe-vector-ref ds 0)]
-             [d1  (unsafe-vector-ref ds 1)])
-         (and (> d0 0) (> d1 0) (= d0 d1)))))
-
-(: row-matrix? (All (A) ((Array A) -> Boolean)))
-(define (row-matrix? arr)
-  (define ds (array-shape arr))
-  (and (= (vector-length ds) 2)
-       (= (unsafe-vector-ref ds 0) 1)
-       (> (unsafe-vector-ref ds 1) 0)))
-
-(: col-matrix? (All (A) ((Array A) -> Boolean)))
-(define (col-matrix? arr)
-  (define ds (array-shape arr))
-  (and (= (vector-length ds) 2)
-       (> (unsafe-vector-ref ds 0) 0)
-       (= (unsafe-vector-ref ds 1) 1)))
-
-(: matrix-shape (All (A) ((Array A) -> (Values Index Index))))
-(define (matrix-shape a)
-  (define ds (array-shape a))
-  (if (and (> (array-size a) 0)
-           (= (vector-length ds) 2))
-      (values (unsafe-vector-ref ds 0)
-              (unsafe-vector-ref ds 1))
-      (raise-argument-error 'matrix-shape "matrix?" a)))
-
-(: square-matrix-size (All (A) ((Array A) -> Index)))
-(define (square-matrix-size arr)
-  (cond [(square-matrix? arr)  (unsafe-vector-ref (array-shape arr) 0)]
-        [else  (raise-argument-error 'square-matrix-size "square-matrix?" arr)]))
-
-(: matrix-num-rows (All (A) ((Array A) -> Index)))
-(define (matrix-num-rows a)
-  (cond [(matrix? a)  (vector-ref (array-shape a) 0)]
-        [else  (raise-argument-error 'matrix-num-rows "matrix?" a)]))
-
-(: matrix-num-cols (All (A) ((Array A) -> Index)))
-(define (matrix-num-cols a)
-  (cond [(matrix? a)  (vector-ref (array-shape a) 1)]
-        [else  (raise-argument-error 'matrix-num-cols "matrix?" a)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/typed-matrix-arithmetic.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/typed-matrix-arithmetic.rkt
deleted file mode 100644
index c511bc2912..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/typed-matrix-arithmetic.rkt
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang typed/racket/base
-
-(require racket/list
-         "matrix-types.rkt"
-         "utils.rkt"
-         (except-in "untyped-matrix-arithmetic.rkt" matrix-map)
-         "../array/array-struct.rkt"
-         "../array/array-fold.rkt"
-         "../array/utils.rkt")
-
-(provide matrix-map
-         matrix=
-         matrix*
-         matrix+
-         matrix-
-         matrix-scale
-         matrix-sum)
-
-(: matrix-map
-   (All (R A B T ...)
-        (case-> ((A -> R) (Matrix A) -> (Matrix R))
-                ((A B T ... T -> R) (Matrix A) (Matrix B) (Matrix T) ... T -> (Matrix R)))))
-(define matrix-map
-  (case-lambda:
-    [([f : (A -> R)] [arr : (Matrix A)])
-     (inline-matrix-map f arr)]
-    [([f : (A B -> R)] [arr0 : (Matrix A)] [arr1 : (Matrix B)])
-     (inline-matrix-map f arr0 arr1)]
-    [([f : (A B T ... T -> R)] [arr0 : (Matrix A)] [arr1 : (Matrix B)] . [arrs : (Matrix T) ... T])
-     (define-values (m n) (apply matrix-shapes 'matrix-map arr0 arr1 arrs))
-     (define g0 (unsafe-array-proc arr0))
-     (define g1 (unsafe-array-proc arr1))
-     (define gs (map unsafe-array-proc arrs))
-     (array-default-strict
-      (unsafe-build-array
-       ((inst vector Index) m n)
-       (λ: ([js : Indexes]) (apply f (g0 js) (g1 js)
-                                   (map (plambda: (S) ([g : (Indexes -> S)]) (g js)) gs)))))]))
-
-(: matrix=? ((Matrix Number) (Matrix Number) -> Boolean))
-(define (matrix=? arr0 arr1)
-  (define-values (m0 n0) (matrix-shape arr0))
-  (define-values (m1 n1) (matrix-shape arr1))
-  (and (= m0 m1)
-       (= n0 n1)
-       (let ([proc0  (unsafe-array-proc arr0)]
-             [proc1  (unsafe-array-proc arr1)])
-         (parameterize ([array-strictness #f])
-           (array-all-and (unsafe-build-array
-                           ((inst vector Index) m0 n0)
-                           (λ: ([js : Indexes])
-                             (= (proc0 js) (proc1 js)))))))))
-
-(: matrix= (case-> ((Matrix Number) (Matrix Number) -> Boolean)
-                   ((Matrix Number) (Matrix Number) (Matrix Number) (Matrix Number) * -> Boolean)))
-(define matrix=
-  (case-lambda:
-    [([arr0 : (Matrix Number)] [arr1 : (Matrix Number)])  (matrix=? arr0 arr1)]
-    [([arr0 : (Matrix Number)] [arr1 : (Matrix Number)] . [arrs : (Matrix Number) *])
-     (and (matrix=? arr0 arr1)
-          (let: loop : Boolean ([arr1 : (Matrix Number)  arr1]
-                                [arrs : (Listof (Matrix Number))  arrs])
-            (cond [(empty? arrs)  #t]
-                  [else  (and (matrix=? arr1 (first arrs))
-                              (loop (first arrs) (rest arrs)))])))]))
-
-
-(: matrix*/ns
-   (case-> ((Matrix Flonum) (Listof (Matrix Flonum)) -> (Matrix Flonum))
-           ((Matrix Real) (Listof (Matrix Real)) -> (Matrix Real))
-           ((Matrix Float-Complex) (Listof (Matrix Float-Complex)) -> (Matrix Float-Complex))
-           ((Matrix Number) (Listof (Matrix Number)) -> (Matrix Number))))
-(define (matrix*/ns a as)
-  (cond [(empty? as)  a]
-        [else  (matrix*/ns (inline-matrix-multiply a (first as)) (rest as))]))
-
-(: matrix* (case-> ((Matrix Flonum) (Matrix Flonum) * -> (Matrix Flonum))
-                   ((Matrix Real) (Matrix Real) * -> (Matrix Real))
-                   ((Matrix Float-Complex) (Matrix Float-Complex) * -> (Matrix Float-Complex))
-                   ((Matrix Number) (Matrix Number) * -> (Matrix Number))))
-(define (matrix* a . as) (call/ns (λ () (matrix*/ns a as))))
-
-
-(: matrix+/ns
-   (case-> ((Matrix Flonum) (Listof (Matrix Flonum)) -> (Matrix Flonum))
-           ((Matrix Real) (Listof (Matrix Real)) -> (Matrix Real))
-           ((Matrix Float-Complex) (Listof (Matrix Float-Complex)) -> (Matrix Float-Complex))
-           ((Matrix Number) (Listof (Matrix Number)) -> (Matrix Number))))
-(define (matrix+/ns a as)
-  (cond [(empty? as)  a]
-        [else  (matrix+/ns (inline-matrix+ a (first as)) (rest as))]))
-
-(: matrix+ (case-> ((Matrix Flonum) (Matrix Flonum) * -> (Matrix Flonum))
-                   ((Matrix Real) (Matrix Real) * -> (Matrix Real))
-                   ((Matrix Float-Complex) (Matrix Float-Complex) * -> (Matrix Float-Complex))
-                   ((Matrix Number) (Matrix Number) * -> (Matrix Number))))
-(define (matrix+ a . as) (call/ns (λ () (matrix+/ns a as))))
-
-
-(: matrix-/ns
-   (case-> ((Matrix Flonum) (Listof (Matrix Flonum)) -> (Matrix Flonum))
-           ((Matrix Real) (Listof (Matrix Real)) -> (Matrix Real))
-           ((Matrix Float-Complex) (Listof (Matrix Float-Complex)) -> (Matrix Float-Complex))
-           ((Matrix Number) (Listof (Matrix Number)) -> (Matrix Number))))
-(define (matrix-/ns a as)
-  (cond [(empty? as)  a]
-        [else  (matrix-/ns (inline-matrix- a (first as)) (rest as))]))
-
-(: matrix- (case-> ((Matrix Flonum) (Matrix Flonum) * -> (Matrix Flonum))
-                   ((Matrix Real) (Matrix Real) * -> (Matrix Real))
-                   ((Matrix Float-Complex) (Matrix Float-Complex) * -> (Matrix Float-Complex))
-                   ((Matrix Number) (Matrix Number) * -> (Matrix Number))))
-(define (matrix- a . as)
-  (call/ns (λ () (cond [(empty? as)  (inline-matrix-scale a -1)]
-                       [else  (matrix-/ns a as)]))))
-
-
-(: matrix-scale (case-> ((Matrix Flonum) Flonum -> (Matrix Flonum))
-                        ((Matrix Real) Real -> (Matrix Real))
-                        ((Matrix Float-Complex) Float-Complex -> (Matrix Float-Complex))
-                        ((Matrix Number) Number -> (Matrix Number))))
-(define (matrix-scale a x) (inline-matrix-scale a x))
-
-(: matrix-sum (case-> ((Listof (Matrix Flonum)) -> (Matrix Flonum))
-                      ((Listof (Matrix Real)) -> (Matrix Real))
-                      ((Listof (Matrix Float-Complex)) -> (Matrix Float-Complex))
-                      ((Listof (Matrix Number)) -> (Matrix Number))))
-(define (matrix-sum lst)
-  (cond [(empty? lst)  (raise-argument-error 'matrix-sum "nonempty List" lst)]
-        [else  (apply matrix+ lst)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/untyped-matrix-arithmetic.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/untyped-matrix-arithmetic.rkt
deleted file mode 100644
index 370b2a4a38..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/untyped-matrix-arithmetic.rkt
+++ /dev/null
@@ -1,163 +0,0 @@
-#lang racket/base
-
-(provide inline-matrix-multiply
-         inline-matrix*
-         inline-matrix+
-         inline-matrix-
-         inline-matrix-scale
-         inline-matrix-map
-         matrix-map)
-
-(module typed-multiply-defs typed/racket/base
-  (require racket/fixnum
-           "matrix-types.rkt"
-           "utils.rkt"
-           "../unsafe.rkt"
-           "../array/array-struct.rkt"
-           "../array/array-transform.rkt"
-           "../array/mutable-array.rkt"
-           "../array/utils.rkt")
-  
-  (provide (all-defined-out))
-  
-  (: matrix-multiply-data (All (A) ((Matrix A) (Matrix A) -> (Values Index Index Index
-                                                                     (Vectorof A) (Vectorof A)
-                                                                     (-> (Boxof A))))))
-  (define (matrix-multiply-data arr brr)
-    (let-values ([(m p n)  (matrix-multiply-shape arr brr)])
-      (define arr-data (mutable-array-data (array->mutable-array arr)))
-      (define brr-data (mutable-array-data (array->mutable-array (parameterize ([array-strictness #f])
-                                                                   (array-axis-swap brr 0 1)))))
-      (define bx (make-thread-local-box (unsafe-vector-ref arr-data 0)))
-      (values m p n arr-data brr-data bx)))
-  
-  (: make-matrix-multiply (All (A) (Index Index Index (Index Index -> A) -> (Matrix A))))
-  (define (make-matrix-multiply m p n sum-loop)
-    (array-default-strict
-     (unsafe-build-array
-      ((inst vector Index) m n)
-      (λ: ([ij : Indexes])
-        (sum-loop (assert (fx* (unsafe-vector-ref ij 0) p) index?)
-                  (assert (fx* (unsafe-vector-ref ij 1) p) index?))))))
-  )  ; module
-
-(module untyped-multiply-defs racket/base
-  (require (for-syntax racket/base)
-           racket/fixnum
-           racket/unsafe/ops
-           (only-in typed/racket/base λ: : Index let: Nonnegative-Fixnum)
-           (submod ".." typed-multiply-defs)
-           "matrix-types.rkt"
-           "utils.rkt"
-           "../array/array-struct.rkt")
-  
-  (provide (all-defined-out))
-  
-  ;; This is a macro so the result can have as precise a type as possible
-  (define-syntax-rule (inline-matrix-multiply arr brr)
-    (let-values ([(m p n arr-data brr-data bx)  (matrix-multiply-data arr brr)])
-      (make-matrix-multiply
-       m p n
-       (λ: ([i : Index] [j : Index])
-         (let ([bx  (bx)]
-               [v  (* (unsafe-vector-ref arr-data i)
-                      (unsafe-vector-ref brr-data j))])
-           (let: loop ([k : Nonnegative-Fixnum  1] [v v])
-             (cond [(k . fx< . p)
-                    (loop (fx+ k 1)
-                          (+ v (* (unsafe-vector-ref arr-data (fx+ i k))
-                                  (unsafe-vector-ref brr-data (fx+ j k)))))]
-                   [else  (set-box! bx v)]))
-           (unbox bx))))))
-  
-  (define-syntax (do-inline-matrix* stx)
-    (syntax-case stx ()
-      [(_ arr)
-       (syntax/loc stx arr)]
-      [(_ arr brr crrs ...)
-       (syntax/loc stx (do-inline-matrix* (inline-matrix-multiply arr brr) crrs ...))]))
-  
-  (define-syntax-rule (inline-matrix* arr brrs ...)
-    (array-default-strict
-     (parameterize ([array-strictness #f])
-       (do-inline-matrix* arr brrs ...))))
-  
-  )  ; module
-
-(module syntax-defs racket/base
-  (require (for-syntax racket/base)
-           (only-in typed/racket/base λ: : inst Index)
-           (submod ".." typed-multiply-defs)
-           "matrix-types.rkt"
-           "utils.rkt"
-           "../array/array-struct.rkt"
-           "../array/utils.rkt")
-  
-  (provide (all-defined-out))
-    
-  (define-syntax (inline-matrix-map stx)
-    (syntax-case stx ()
-      [(_ f arr-expr)
-       (syntax/loc stx
-         (let*-values ([(arr)  arr-expr]
-                       [(m n)  (matrix-shape arr)]
-                       [(proc)  (unsafe-array-proc arr)])
-           (array-default-strict
-            (unsafe-build-array ((inst vector Index) m n) (λ: ([js : Indexes]) (f (proc js)))))))]
-      [(_ f arr-expr brr-exprs ...)
-       (with-syntax ([(brrs ...)  (generate-temporaries #'(brr-exprs ...))]
-                     [(procs ...)  (generate-temporaries #'(brr-exprs ...))])
-         (syntax/loc stx
-           (let ([arr arr-expr]
-                 [brrs brr-exprs] ...)
-             (let-values ([(m n)  (matrix-shapes 'matrix-map arr brrs ...)]
-                          [(proc)  (unsafe-array-proc arr)]
-                          [(procs)  (unsafe-array-proc brrs)] ...)
-               (array-default-strict
-                (unsafe-build-array
-                 ((inst vector Index) m n)
-                 (λ: ([js : Indexes])
-                   (f (proc js) (procs js) ...))))))))]))
-  
-  (define-syntax-rule (inline-matrix+ arr0 arrs ...) (inline-matrix-map + arr0 arrs ...))
-  (define-syntax-rule (inline-matrix- arr0 arrs ...) (inline-matrix-map - arr0 arrs ...))
-  (define-syntax-rule (inline-matrix-scale arr x-expr)
-    (let ([x x-expr])
-      (inline-matrix-map (λ (y) (* x y)) arr)))
-  
-  )  ; module
-
-(module untyped-defs typed/racket/base
-  (require (submod ".." syntax-defs)
-           "matrix-types.rkt"
-           "utils.rkt"
-           "../array/array-struct.rkt"
-           "../array/utils.rkt")
-  
-  (provide matrix-map)
-  
-  (: matrix-map
-     (All (R A) (case-> ((A -> R) (Matrix A) -> (Matrix R))
-                        ((A A A * -> R) (Matrix A) (Matrix A) (Matrix A) * -> (Matrix R)))))
-  (define matrix-map
-    (case-lambda:
-      [([f : (A -> R)] [arr : (Matrix A)])
-       (inline-matrix-map f arr)]
-      [([f : (A A -> R)] [arr0 : (Matrix A)] [arr1 : (Matrix A)])
-       (inline-matrix-map f arr0 arr1)]
-      [([f : (A A A * -> R)] [arr0 : (Matrix A)] [arr1 : (Matrix A)] . [arrs : (Matrix A) *])
-       (define-values (m n) (apply matrix-shapes 'matrix-map arr0 arr1 arrs))
-       (define g0 (unsafe-array-proc arr0))
-       (define g1 (unsafe-array-proc arr1))
-       (define gs (map (inst unsafe-array-proc A) arrs))
-       (array-default-strict
-        (unsafe-build-array
-         ((inst vector Index) m n)
-         (λ: ([js : Indexes]) (apply f (g0 js) (g1 js)
-                                     (map (λ: ([g : (Indexes -> A)]) (g js)) gs)))))]))
-  
-  )  ; module
-
-(require 'untyped-multiply-defs
-         'syntax-defs
-         'untyped-defs)
diff --git a/pkgs/math-pkgs/math-lib/math/private/matrix/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/utils.rkt
deleted file mode 100644
index 032d291c65..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/matrix/utils.rkt
+++ /dev/null
@@ -1,182 +0,0 @@
-#lang typed/racket/base
-
-(require racket/performance-hint
-         racket/string
-         racket/fixnum
-         math/base
-         "matrix-types.rkt"
-         "../unsafe.rkt"
-         "../array/array-struct.rkt"
-         "../vector/vector-mutate.rkt")
-
-(provide (all-defined-out))
-
-(: format-matrices/error ((Listof (Array Any)) -> String))
-(define (format-matrices/error as)
-  (string-join (map (λ: ([a : (Array Any)]) (format "~e" a)) as)))
-
-(: matrix-shapes (Symbol (Matrix Any) (Matrix Any) * -> (Values Index Index)))
-(define (matrix-shapes name arr . brrs)
-  (define-values (m n) (matrix-shape arr))
-  (unless (andmap (λ: ([brr : (Matrix Any)])
-                    (define-values (bm bn) (matrix-shape brr))
-                    (and (= bm m) (= bn n)))
-                  brrs)
-    (error name
-           "matrices must have the same shape; given ~a"
-           (format-matrices/error (cons arr brrs))))
-  (values m n))
-
-(: matrix-multiply-shape ((Matrix Any) (Matrix Any) -> (Values Index Index Index)))
-(define (matrix-multiply-shape arr brr)
-  (define-values (ad0 ad1) (matrix-shape arr))
-  (define-values (bd0 bd1) (matrix-shape brr))
-  (unless (= ad1 bd0)
-    (error 'matrix-multiply
-           "1st argument column size and 2nd argument row size are not equal; given ~e and ~e"
-           arr brr))
-  (values ad0 ad1 bd1))
-
-(: ensure-matrix (All (A) Symbol (Array A) -> (Array A)))
-(define (ensure-matrix name a)
-  (if (matrix? a) a (raise-argument-error name "matrix?" a)))
-
-(: ensure-row-matrix (All (A) Symbol (Array A) -> (Array A)))
-(define (ensure-row-matrix name a)
-  (if (row-matrix? a) a (raise-argument-error name "row-matrix?" a)))
-
-(: ensure-col-matrix (All (A) Symbol (Array A) -> (Array A)))
-(define (ensure-col-matrix name a)
-  (if (col-matrix? a) a (raise-argument-error name "col-matrix?" a)))
-
-(: sort/key (All (A B) (case-> ((Listof A) (B B -> Boolean) (A -> B) -> (Listof A))
-                               ((Listof A) (B B -> Boolean) (A -> B) Boolean -> (Listof A)))))
-;; Sometimes necessary because TR can't do inference with keyword arguments yet
-(define (sort/key lst lt? key [cache-keys? #f])
-  ((inst sort A B) lst lt? #:key key #:cache-keys? cache-keys?))
-
-(: unsafe-vector2d-ref (All (A) ((Vectorof (Vectorof A)) Index Index -> A)))
-(define (unsafe-vector2d-ref vss i j)
-  (unsafe-vector-ref (unsafe-vector-ref vss i) j))
-
-;; Note: this accepts +nan.0
-(define nonnegative?
-  (λ: ([x : Real]) (not (x . < . 0))))
-
-(define number-rational?
-  (λ: ([z : Number])
-    (cond [(real? z)  (rational? z)]
-          [else  (and (rational? (real-part z))
-                      (rational? (imag-part z)))])))
-
-(: find-partial-pivot
-   (case-> ((Vectorof (Vectorof Flonum)) Index Index Index -> (Values Index Flonum))
-           ((Vectorof (Vectorof Real)) Index Index Index -> (Values Index Real))
-           ((Vectorof (Vectorof Float-Complex)) Index Index Index -> (Values Index Float-Complex))
-           ((Vectorof (Vectorof Number)) Index Index Index -> (Values Index Number))))
-;; Find the element with maximum magnitude in a column
-(define (find-partial-pivot rows m i j)
-  (define l (fx+ i 1))
-  (define pivot (unsafe-vector2d-ref rows i j))
-  (define mag-pivot (magnitude pivot))
-  (let loop ([#{l : Nonnegative-Fixnum} l] [#{p : Index} i] [pivot pivot] [mag-pivot mag-pivot])
-    (cond [(l . fx< . m)
-           (define new-pivot (unsafe-vector2d-ref rows l j))
-           (define mag-new-pivot (magnitude new-pivot))
-           (cond [(mag-new-pivot . > . mag-pivot)  (loop (fx+ l 1) l new-pivot mag-new-pivot)]
-                 [else  (loop (fx+ l 1) p pivot mag-pivot)])]
-          [else  (values p pivot)])))
-
-(: find-first-pivot
-   (case-> ((Vectorof (Vectorof Flonum)) Index Index Index -> (Values Index Flonum))
-           ((Vectorof (Vectorof Real)) Index Index Index -> (Values Index Real))
-           ((Vectorof (Vectorof Float-Complex)) Index Index Index -> (Values Index Float-Complex))
-           ((Vectorof (Vectorof Number)) Index Index Index -> (Values Index Number))))
-;; Find the first nonzero element in a column
-(define (find-first-pivot rows m i j)
-  (define pivot (unsafe-vector2d-ref rows i j))
-  (if ((magnitude pivot) . > . 0)
-      (values i pivot)
-      (let loop ([#{l : Nonnegative-Fixnum} (fx+ i 1)])
-        (cond [(l . fx< . m)
-               (define pivot (unsafe-vector2d-ref rows l j))
-               (if ((magnitude pivot) . > . 0) (values l pivot) (loop (fx+ l 1)))]
-              [else
-               (values i pivot)]))))
-
-(: elim-rows!
-   (case-> ((Vectorof (Vectorof Flonum)) Index Index Index Flonum Nonnegative-Fixnum -> Void)
-           ((Vectorof (Vectorof Real)) Index Index Index Real Nonnegative-Fixnum -> Void)
-           ((Vectorof (Vectorof Float-Complex)) Index Index Index Float-Complex Nonnegative-Fixnum 
-                                                -> Void)
-           ((Vectorof (Vectorof Number)) Index Index Index Number Nonnegative-Fixnum -> Void)))
-(define (elim-rows! rows m i j pivot start)
-  (define row_i (unsafe-vector-ref rows i))
-  (let loop ([#{l : Nonnegative-Fixnum} start])
-    (when (l . fx< . m)
-      (unless (l . fx= . i)
-        (define row_l (unsafe-vector-ref rows l))
-        (define x_lj (unsafe-vector-ref row_l j))
-        (unless (= x_lj 0)
-          (vector-scaled-add! row_l row_i (* -1 (/ x_lj pivot)) j)
-          ;; Make sure the element below the pivot is zero
-          (unsafe-vector-set! row_l j (- x_lj x_lj))))
-      (loop (fx+ l 1)))))
-
-(begin-encourage-inline
-  
-  (: call/ns (All (A) ((-> (Matrix A)) -> (Matrix A))))
-  (define (call/ns thnk)
-    (array-default-strict
-     (parameterize ([array-strictness #f])
-       (thnk))))
-  
-  )  ; begin-encourage-inline
-
-(: make-thread-local-box (All (A) (A -> (-> (Boxof A)))))
-(define (make-thread-local-box contents)
-  (let: ([val : (Thread-Cellof (U #f (Boxof A))) (make-thread-cell #f)])
-    (λ () (or (thread-cell-ref val)
-              (let: ([v : (Boxof A)  (box contents)])
-                (thread-cell-set! val v)
-                v)))))
-
-(: one (case-> (Flonum -> Nonnegative-Flonum)
-               (Real -> (U 1 Nonnegative-Flonum))
-               (Float-Complex -> Nonnegative-Flonum)
-               (Number -> (U 1 Nonnegative-Flonum))))
-(define (one x)
-  (cond [(flonum? x)  1.0]
-        [(real? x)  1]
-        [(float-complex? x)  1.0]
-        [else  1]))
-
-(: zero (case-> (Flonum -> Flonum-Positive-Zero)
-                (Real -> (U 0 Flonum-Positive-Zero))
-                (Float-Complex -> Flonum-Positive-Zero)
-                (Number -> (U 0 Flonum-Positive-Zero))))
-(define (zero x)
-  (cond [(flonum? x)  0.0]
-        [(real? x)  0]
-        [(float-complex? x)  0.0]
-        [else  0]))
-
-(: one* (case-> (Flonum -> Nonnegative-Flonum)
-                (Real -> (U 1 Nonnegative-Flonum))
-                (Float-Complex -> Float-Complex)
-                (Number -> (U 1 Nonnegative-Flonum Float-Complex))))
-(define (one* x)
-  (cond [(flonum? x)  1.0]
-        [(real? x)  1]
-        [(float-complex? x)  1.0+0.0i]
-        [else  1]))
-
-(: zero* (case-> (Flonum -> Flonum-Positive-Zero)
-                 (Real -> (U 0 Flonum-Positive-Zero))
-                 (Float-Complex -> Float-Complex)
-                 (Number -> (U 0 Flonum-Positive-Zero Float-Complex))))
-(define (zero* x)
-  (cond [(flonum? x)  0.0]
-        [(real? x)  0]
-        [(float-complex? x)  0.0+0.0i]
-        [else  0]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/bernoulli.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/bernoulli.rkt
deleted file mode 100644
index 0925699259..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/bernoulli.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang typed/racket/base
-
-(require "../vector/vector.rkt"
-         "types.rkt"
-         "factorial.rkt"
-         "binomial.rkt")
-
-(provide bernoulli-number)
-
-;; Number of globally memoized Bernoulli numbers
-(define num-global-bs 200)
-;; Globally memoized numbers
-(: global-bs (Vectorof Exact-Rational))
-(define global-bs (make-vector num-global-bs 0))
-(vector-set! global-bs 0 1)
-(vector-set! global-bs 1 -1/2)
-
-(: bernoulli* : Natural -> Exact-Rational)
-;   compute the n'th Bernoulli number
-;   <http://mathworld.wolfram.com/BernoulliNumber.html>
-;   <http://en.wikipedia.org/wiki/Bernoulli_number>
-(define (bernoulli* n)
-  ; Implementation note:
-  ;   - uses Ramanujan's improvement of the standard recurrence relation
-  ;     of the Bernoulli numbers:
-  ;     <http://en.wikipedia.org/wiki/Bernoulli_number#Ramanujan.27s_congruences>
-  ;   - memoizes previous computations
-  ;   - avoids an explicit call to compute the binomials
-  (define: local-bs : (Vectorof Exact-Rational)
-    (make-vector (max 0 (- (+ n 1) num-global-bs)) 0))
-  
-  (: bs-ref! (Integer (-> Exact-Rational) -> Exact-Rational))
-  (define (bs-ref! n thnk)
-    (cond [(n . < . num-global-bs)
-           (vector-ref! global-bs n thnk exact-zero?)]
-          [else
-           (vector-ref! local-bs (- n num-global-bs) thnk exact-zero?)]))
-  
-  (: next-binom : Integer Integer Integer -> Integer)
-  (define (next-binom old x k)
-    ; calculate binom(x,k-6) from the old binom(x,k)
-    (let ([k-1 (- k 1)] [k-2 (- k 2)] [k-3 (- k 3)] [k-4 (- k 4)] [k-5 (- k 5)])
-      (assert 
-       (* old
-          (/ (* k k-1 k-2 k-3 k-4 k-5 )
-             (* (- x k-1) (- x k-2) (- x k-3) (- x k-4) (- x k-5) (- x (- k 6)))))
-       integer?)))
-  
-  (: A : Natural Integer -> Exact-Rational)
-  (define (A m M)
-    (cond 
-      [(< M 1) 0]
-      [else
-       (define: m-6 : Natural (assert (- m 6) natural?))
-       (define-values (sum bin)
-         (for/fold: ([sum : Exact-Rational  0]
-                     [bin : Integer  (binomial (+ m 3) m-6)]
-                     ) ([j  (in-range 1 (+ M 1))])
-           (values (+ sum (* bin (bern (assert (- m (* 6 j)) natural?))))
-                   (next-binom bin (+ m 3) (- m (* 6 j))))))
-       sum]))
-  
-  (: bern : Natural -> Exact-Rational)
-  (define (bern n)
-    (bs-ref!
-     n (λ ()
-         (cond
-           [(odd? n)  0]
-           [else
-            (define r (remainder n 6))
-            (cond           
-              [(= r 0) (/  (- (/ (+ n 3)  3) (A n (quotient    n    6)))  (binomial (+ n 3) n))]
-              [(= r 2) (/  (- (/ (+ n 3)  3) (A n (quotient (- n 2) 6)))  (binomial (+ n 3) n))]
-              [(= r 4) (/  (- (/ (+ n 3) -6) (A n (quotient (- n 4) 6)))  (binomial (+ n 3) n))]
-              ;; n is even, so r can only be 0, 2 or 4
-              [else  (error 'unreachable-code)])]))))
-  (bern n))
-
-(: bernoulli-number (Integer -> Exact-Rational))
-(define (bernoulli-number n)
-  (cond [(n . < . 0)  (raise-argument-error 'bernoulli-number "Natural" n)]
-        [else  (bernoulli* n)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/binomial.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/binomial.rkt
deleted file mode 100644
index ff90b732b8..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/binomial.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang typed/racket/base
-
-(require "types.rkt")
-
-(provide binomial)
-
-(: binomial* : Natural Natural -> Natural)
-(define (binomial* n k)
-  ;  compute the binomial coeffecient n choose k
-  ;  http://www.gnu.org/software/gmp/manual/html_node/Binomial-Coefficients-Algorithm.html
-  (assert
-   (let: loop : Exact-Rational ([n : Exact-Rational  n] [k : Exact-Rational  k])
-     (cond
-       [(= k 0)       1]    
-       [(= k 1)       n]
-       [(> k n)       0]
-       [(= k 2)       (/ (* n (- n 1)) 2)]
-       [(> k (/ n 2)) (loop n (- n k))]
-       [else          (* (+ n (- k) 1)
-                         (for/fold: ([prod : Exact-Rational  1]) ([i  (in-range 2 (+ k 1))])
-                           (* prod (/ (+ n (- k) i) i))))]))
-   natural?))
-
-(: binomial (case-> (Integer Zero -> One)
-                    (One One -> One)
-                    (Integer Integer -> Natural)))
-(define (binomial n k)
-  (cond [(n . < . 0)  (raise-argument-error 'binomial "Natural" 0 n k)]
-        [(k . < . 0)  (raise-argument-error 'binomial "Natural" 1 n k)]
-        [(zero? k)  1]
-        [(eqv? n 1)  (if (eqv? k 1) 1 (binomial* n k))]
-        [else  (binomial* n k)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/divisibility.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/divisibility.rkt
deleted file mode 100644
index 9454ba3c1c..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/divisibility.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang typed/racket/base
-
-(provide divides? coprime? pairwise-coprime? bezout)
-
-;;;
-;;; DIVISIBILITY
-;;;
-
-(: divides? : Integer Integer -> Boolean)
-; a divides b <=> exists unique k s.t. a*k=b
-(define (divides? a b)
-  (cond [(zero? a)  #f]
-        [else  (= (remainder b a) 0)]))
-
-; DEF (Coprime, relatively prime)
-;  Two or more integers are called coprime, if their greatest common divisor is 1.
-;     a, b and c coprime <=> gcd(a,b,c)=1
-
-(: coprime? : Integer Integer * -> Boolean)
-(define (coprime? a . bs)
-  (= 1 (apply gcd (cons a bs))))
-
-(: pairwise-coprime? : Integer Integer * -> Boolean)
-(define (pairwise-coprime? a . bs)
-  (or (null? bs)
-      (and (andmap (λ: ([b : Integer]) (coprime? a b)) bs)
-           (apply pairwise-coprime? bs))))
-
-; THEOREM (Bezout's identity)
-;  If a and b are integers (not both zero), then
-;  there exists integers u and v such that
-;    gcd(a,b) = au + bv
-;  Note: u and v are not unique
-
-; (bezout-binary a b) = (list u v)   <=>   gcd(a,b) = au + bv
-(: bezout-binary : Integer Integer -> (List Integer Integer))
-(define (bezout-binary a b)
-  (: loop : Integer Integer Integer Integer Integer Integer -> (List Integer Integer))
-  (define (loop a b ua va ub vb)  ; a>=b>0 , a = ua*a+ub*b,  b = ub*a+ub*b
-    (let-values ([(q r) (quotient/remainder a b)])
-      (if (= r 0)
-          (list ub vb)
-          (loop b r ub vb (- ua (* q ub)) (- va (* q vb))))))
-  (: start : Integer Integer -> (List Integer Integer))
-  (define (start a b)
-    (if (> a b)
-        (loop a b 1 0 0 1)
-        (loop b a 0 1 1 0)))
-  (cond [(and (positive? a) (positive? b))
-         (start a b)]
-        [(and (negative? a) (negative? b))
-         (define uv (start (- a) (- b)))
-         (list (- (car uv)) (- (cadr uv)))]
-        [(and (negative? a) (positive? b))
-         ; choose k s.t. a+kb>0
-         (define k (+ (quotient (- a) b) 1))
-         (define uv (start (+ a (* k b)) b))
-         (define u (car uv)) (define v (cadr uv))
-         (list u (+ (* u k) v))]
-        [(and (positive? a) (negative? b))
-         ; choose k s.t. ak+b>0
-         (define k (+ (quotient (- b) a) 1))
-         (define uv (start a (+ (* k a) b)))
-         (define u (car uv)) (define v (cadr uv))
-         (list (+ u (* k v)) v)]
-        [else (error "Internal error in bezout-binary")]))
-
-; (bezout a b c ...) -> (list u v w ...)    <=>  gcd(a,b,c,...) = au + bv + cw + ...
-(: bezout : Integer Integer * -> (Listof Integer))
-(define (bezout a . bs)
-  (cond
-    [(null? bs)        (list 1)]
-    [(null? (cdr bs))  (bezout-binary a (car bs))]
-    [else    
-     (let ([uvs (apply bezout bs)]
-           [st  (bezout-binary (apply gcd bs) a)])
-       (let ([s (car st)]
-             [t (cadr st)])
-         (cons t (map (lambda: ([u : Integer]) (* s u))
-                      uvs))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/eulerian-number.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/eulerian-number.rkt
deleted file mode 100644
index 45bae4412a..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/eulerian-number.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang typed/racket/base
-
-(require "types.rkt")
-
-(provide eulerian-number)
-
-(: eulerian-number* : Natural Natural -> Natural)
-;   computes the Eulerian number <n,k>
-;   http://mathworld.wolfram.com/EulerianNumber.html
-(define (eulerian-number* n k)
-  ; Implementation note:        
-  ;   Uses standard recurrence : <n,k> = (k+1) <n-1,k> + (n-k) <n-1,k-1>
-  ;   Time: O(n^2)
-  (cond
-    [(= k 0) 1]
-    [else
-     (define: E : (Vectorof Integer)
-       (make-vector (max (+ k 1) (+ n 1)) 0))
-     (vector-set! E 0 1) ; <0,0> = 1
-     (for: ([i : Positive-Integer (in-range 1 (+ n 1))])
-       (for: ([j : Integer (in-range (- i 1) 0 -1)])
-         (vector-set! E j (+ (* (+ j 1) (vector-ref E j))
-                             (* (- i j) (vector-ref E (- j 1)))))))
-     (assert (vector-ref E k) natural?)]))
-
-(: eulerian-number (Integer Integer -> Natural))
-(define (eulerian-number n k)
-  (cond [(n . < . 0)  (raise-argument-error 'eulerian-number "Natural" 0 n k)]
-        [(k . < . 0)  (raise-argument-error 'eulerian-number "Natural" 1 n k)]
-        [else  (eulerian-number* n k)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/factorial.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/factorial.rkt
deleted file mode 100644
index 5d47e48d7d..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/factorial.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang typed/racket/base
-
-(require "../unsafe.rkt")
-
-(provide factorial permutations multinomial)
-
-(define-predicate nonnegative-fixnum? Nonnegative-Fixnum)
-
-;; The number of factorials whose flonum representation is finite
-;; Makes generating the flonum table in gamma.rkt fast
-(: fact-table-size Positive-Fixnum)
-(define fact-table-size 171)
-
-(: fact-table (Vectorof Positive-Integer))
-(define fact-table
-  (list->vector
-   (reverse
-    (foldl (λ: ([n  : Positive-Integer]
-                [ns : (Listof Positive-Integer)])
-             (cons (* n (car ns)) ns))
-           '(1)
-           (build-list (- fact-table-size 1) add1)))))
-
-(: simple-cutoff Positive-Fixnum)
-;; The point at which it seems to be faster to use a more complicated recurrence
-(define simple-cutoff 244)
-
-(: factorial-simple (Nonnegative-Fixnum -> Positive-Integer))
-(define (factorial-simple n)
-  (cond [(n . < . fact-table-size)  (vector-ref fact-table n)]
-        [else  (* n (factorial-simple (- n 1)))]))
-
-(: factorial (case-> (Zero -> One)
-                     (One -> One)
-                     (Integer -> Positive-Integer)))
-(define (factorial n)
-  (cond [(negative? n)  (raise-argument-error 'factorial "Natural" n)]
-        [(not (fixnum? n))  (raise-argument-error 'factorial "Nonnegative-Fixnum" n)]
-        [(eqv? n 0)  1]
-        [(eqv? n 1)  1]
-        [(n . < . simple-cutoff)  (factorial-simple n)]
-        [else
-         (let: loop : Positive-Integer ([n : Positive-Fixnum  n]
-                                        [m : Positive-Fixnum  1])
-           (define n-m (- n m))
-           (cond [(n-m . <= . 0)  n]
-                 [else  (define 2m (unsafe-fx* m 2))
-                        (* (loop n 2m) (loop n-m 2m))]))]))
-
-(: permutations (case-> (Integer Zero -> One)
-                        (One One -> One)
-                        (Integer Integer -> Natural)))
-(define (permutations n k)
-  (cond [(negative? n)  (raise-argument-error 'permutations "Natural" 0 n k)]
-        [(negative? k)  (raise-argument-error 'permutations "Natural" 1 n k)]
-        [(zero? k)  1]
-        [(k . > . n)  0]
-        [else  (assert (/ (factorial n) (factorial (- n k)))
-                       exact-nonnegative-integer?)]))
-
-(: multinomial (Integer (Listof Integer) -> Natural))
-(define (multinomial n ks)
-  (cond [(negative? n)  (raise-argument-error 'multinomial "Natural" 0 n ks)]
-        [(ormap negative? ks)  (raise-argument-error 'multinomial "(Listof Natural)" 1 n ks)]
-        [(not (= n (apply + ks)))  0]
-        [else  (assert (apply / (factorial n) (map factorial ks))
-                       exact-nonnegative-integer?)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/farey.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/farey.rkt
deleted file mode 100644
index 833f652b05..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/farey.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang typed/racket/base
-
-(require "types.rkt")
-
-(provide farey-sequence mediant)
-
-(: mediant : Exact-Rational Exact-Rational -> Exact-Rational)
-(define (mediant x y)
-  (/ (+ (numerator x) (numerator y))
-     (+ (denominator x) (denominator y))))
-
-(: farey-sequence : Integer -> (Listof Exact-Rational))
-(define (farey-sequence n)
-  (cond [(n . <= . 0)  (raise-argument-error 'farey-sequence "Positive-Integer" n)]
-        [else
-         (let loop ([a 1] [b 1] [c (sub1 n)] [d n] [#{fs : (Listof Exact-Rational)} '()])
-           (let ([fs  (cons (/ a b) fs)])
-             (cond [(positive? a)
-                    (define k (quotient (+ n b) d))
-                    (loop c d (- (* k c) a) (- (* k d) b) fs)]
-                   [else
-                    fs])))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/fibonacci.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/fibonacci.rkt
deleted file mode 100644
index 4dcb40c06a..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/fibonacci.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang typed/racket/base
-
-(provide make-fibonacci
-         fibonacci
-         make-modular-fibonacci
-         modular-fibonacci)
-
-(: generator : Integer Integer Natural Natural Natural -> Integer)
-(define (generator a b p q count)
-  ; SICP ex. 1.19
-  (cond 
-    [(zero? count) b]
-    [(even? count)
-     (generator a b
-                (+ (* p p) (* q q))
-                (+ (* 2 p q) (* q q))
-                (quotient count 2))]
-    [else
-     (generator (+ (* b q) (* a q) (* a p))
-                (+ (* b p) (* a q))
-                p
-                q
-                (- count 1))]))
-
-(: make-fibonacci (Integer Integer -> (Integer -> Integer)))
-(define ((make-fibonacci a b) n)
-  (cond [(n . < . 0)  (raise-argument-error 'fibonacci "Natural" n)]
-        [else  (generator b a 0 1 n)]))
-
-(define fibonacci (make-fibonacci 0 1))
-
-(: modular-generator : Integer Integer Natural Natural Natural Positive-Integer -> Integer)
-(define (modular-generator a b p q count mod)
-  (cond 
-    [(zero? count) (modulo b mod)]
-    [(even? count)
-     (modular-generator
-      a b
-      (modulo (+ (* p p) (* q q)) mod)
-      (modulo (+ (* 2 p q) (* q q)) mod)
-      (quotient count 2)
-      mod)]
-    [else
-     (modular-generator
-      (modulo (+ (* b q) (* a q) (* a p)) mod)
-      (modulo (+ (* b p) (* a q)) mod)
-      p
-      q
-      (- count 1)
-      mod)]))
-
-(: make-modular-fibonacci (Integer Integer -> (Integer Integer -> Integer)))
-(define ((make-modular-fibonacci a b) n mod)
-  (cond [(n . < . 0)  (raise-argument-error 'modular-fibonacci "Natural" 0 n mod)]
-        [(mod . <= . 0)  (raise-argument-error 'modular-fibonacci "Positive-Integer" 1 n mod)]
-        [else  (modular-generator b a 0 1 n mod)]))
-
-(define modular-fibonacci (make-modular-fibonacci 0 1))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/modular-arithmetic-base.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/modular-arithmetic-base.rkt
deleted file mode 100644
index 182945606b..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/modular-arithmetic-base.rkt
+++ /dev/null
@@ -1,182 +0,0 @@
-#lang racket/base
-
-(provide with-modulus
-         current-modulus
-         modular-inverse
-         modular-expt
-         inline-mod+
-         inline-mod*
-         inline-mod-
-         inline-mod/
-         inline-modsqr
-         inline-modexpt
-         inline-mod
-         inline-mod=
-         inline-mod<
-         inline-mod<=
-         inline-mod>
-         inline-mod>=)
-
-(module typed-defs typed/racket/base
-  (require racket/performance-hint
-           "divisibility.rkt")
-  
-  (provide (all-defined-out))
-  
-  (: current-modulus-param (Parameterof Integer Positive-Integer))
-  (define current-modulus-param
-    (make-parameter
-     1 (λ: ([n : Integer])
-         (cond [(n . <= . 0)  (raise-argument-error 'with-modulus "Positive-Integer" n)]
-               [else  n]))))
-  
-  (: current-modulus (-> Positive-Integer))
-  (begin-encourage-inline
-    (define (current-modulus) (current-modulus-param)))
-  
-  ; THEOREM
-  ;  If gcd(a,n)=1 then there exist b such that
-  ;    ab=1 mod n
-  ;  The number b is called an inverse of a modulo n.
-  (: modular-inverse* (Positive-Integer Integer -> Natural))
-  (define (modular-inverse* n a)
-    (cond [(zero? a)  (raise-argument-error 'modular-inverse "nonzero Integer" 0 a n)]
-          [(coprime? n a)  (modulo (car (bezout a n)) n)]
-          [else  (error 'modular-inverse "expected argument that is coprime to modulus ~e; given ~e"
-                        n a)]))
-  
-  (: modular-expt* (Positive-Integer Integer Integer -> Natural))
-  ;; Exponentiate by repeated modular multiplication and squaring
-  (define (modular-expt* n a b)
-    (cond [(b . < . 0)  (raise-argument-error 'modular-expt "Natural" 1 a b n)]
-          [else
-           (let loop ([a a] [b b])
-             (cond [(b . <= . 1)  (if (zero? b) (modulo 1 n) (modulo a n))]
-                   [(even? b)  (define c (loop a (quotient b 2)))
-                               (modulo (* c c) n)]
-                   [else  (modulo (* a (loop a (sub1 b))) n)]))]))
-  
-  (: modular-const* (Positive-Integer Exact-Rational -> Natural))
-  (define (modular-const* n a)
-    (cond [(integer? a)  (modulo a n)]
-          [else  (modulo (* (numerator a) (modular-inverse* n (denominator a))) n)]))
-  
-  (: modular-inverse (Integer Integer -> Natural))
-  ;; Return b, where a*b=1 mod n and b in {0,...,n-1}
-  (define (modular-inverse a n)
-    (cond [(n . <= . 0)  (raise-argument-error 'modular-inverse "Positive-Integer" 1 a n)]
-          [else  (modular-inverse* n a)]))
-  
-  (: modular-expt (Integer Integer Integer -> Natural))
-  (define (modular-expt a b n)
-    (cond [(n . <= . 0)  (raise-argument-error 'modular-expt "Positive-Integer" 2 a b n)]
-          [else  (modular-expt* n a b)]))
-  )
-
-(module untyped-defs racket/base
-  (require (for-syntax racket/base)
-           racket/stxparam
-           (submod ".." typed-defs))
-  
-  (provide (all-defined-out))
-  
-  (define-syntax-parameter current-modulus-id #f)
-  
-  ;; Sets the `current-modulus-param' and `current-modulus-id'
-  (define-syntax (with-modulus stx)
-    (syntax-case stx ()
-      [(_ modulus . body)
-       (syntax/loc stx
-         (let ([n modulus])
-           (syntax-parameterize ([current-modulus-id #'n])
-             (parameterize ([current-modulus-param n])
-               . body))))]))
-  
-  ;; Checks for `current-modulus-id'; if an identifier, uses the identifier's bound value for the
-  ;; modulus; otherwise, gets the current modulus and sets `current-modulus-id' for inner expressions
-  (define-syntax (inline-mod-op stx)
-    (syntax-case stx ()
-      [(_ op-macro a ...)
-       (with-syntax ([n  (syntax-parameter-value #'current-modulus-id)])
-         (cond [(identifier? #'n)  (syntax/loc stx (op-macro n a ...))]
-               [else
-                (syntax/loc stx
-                  (let ([m  (current-modulus-param)])
-                    (syntax-parameterize ([current-modulus-id #'m])
-                      (op-macro m a ...))))]))]))
-  
-  (define-syntax (fold-mod-op stx)
-    (syntax-case stx ()
-      [(_ op n a b)
-       (syntax/loc stx (modulo (op a b) n))]
-      [(_ op n a b cs ...)
-       (syntax/loc stx
-         (fold-mod-op op n (modulo (op a b) n) cs ...))]))
-  
-  (define-syntax (modular-compare stx)
-    (syntax-case stx ()
-      [(_ op n a)  (syntax/loc stx #t)]
-      [(_ op n a b)  (syntax/loc stx (op (modulo a n) (modulo b n)))]
-      [(_ op n a b-expr bs ...)
-       (syntax/loc stx
-         (let ([b  (modulo b-expr n)])
-           (and (op (modulo a n) b)
-                (fold-mod-compare-op op n b bs ...))))]))
-  
-  (define-syntax (fold-mod-compare-op stx)
-    (syntax-case stx ()
-      [(_ op n a b)
-       (syntax/loc stx (op a (modulo b n)))]
-      [(_ op n a b-expr bs ...)
-       (syntax/loc stx
-         (let ([b  (modulo b-expr n)])
-           (and (op a b)
-                (fold-mod-compare-op op n b bs ...))))]))
-  
-  (define-syntax (modular+ stx)
-    (syntax-case stx ()
-      [(_ n)  (syntax/loc stx 0)]
-      [(_ n a)  (syntax/loc stx (modulo a n))]
-      [(_ n a ...)  (syntax/loc stx (fold-mod-op + n a ...))]))
-  
-  (define-syntax (modular* stx)
-    (syntax-case stx ()
-      [(_ n)  (syntax/loc stx 1)]
-      [(_ n a)  (syntax/loc stx (modulo a n))]
-      [(_ n a ...)  (syntax/loc stx (fold-mod-op * n a ...))]))
-  
-  (define-syntax (modular- stx)
-    (syntax-case stx ()
-      [(_ n a)  (syntax/loc stx (modulo (- a) n))]
-      [(_ n a b ...)  (syntax/loc stx (fold-mod-op - n a b ...))]))
-  
-  (define-syntax (modular/ stx)
-    (syntax-case stx ()
-      [(_ n a)  (syntax/loc stx (modular-inverse n a))]
-      [(_ n a b ...)  (syntax/loc stx
-                        (modular* n a (modular-inverse* n (modular* n b ...))))]))
-  
-  (define-syntax-rule (modular-sqr n a) (modulo (* a a) n))
-  
-  (define-syntax-rule (modular= n a b ...) (modular-compare = n a b ...))
-  (define-syntax-rule (modular< n a b ...) (modular-compare < n a b ...))
-  (define-syntax-rule (modular<= n a b ...) (modular-compare <= n a b ...))
-  (define-syntax-rule (modular> n a b ...) (modular-compare > n a b ...))
-  (define-syntax-rule (modular>= n a b ...) (modular-compare <= n a b ...))
-  
-  (define-syntax-rule (inline-mod+ a ...) (inline-mod-op modular+ a ...))
-  (define-syntax-rule (inline-mod* a ...) (inline-mod-op modular* a ...))
-  (define-syntax-rule (inline-mod- a b ...) (inline-mod-op modular- a b ...))
-  (define-syntax-rule (inline-mod/ a b ...) (inline-mod-op modular/ a b ...))
-  (define-syntax-rule (inline-modsqr a) (inline-mod-op modular-sqr a))
-  (define-syntax-rule (inline-modexpt a b) (inline-mod-op modular-expt* a b))
-  (define-syntax-rule (inline-mod a) (inline-mod-op modular-const* a))
-  (define-syntax-rule (inline-mod= a b ...) (inline-mod-op modular= a b ...))
-  (define-syntax-rule (inline-mod< a b ...) (inline-mod-op modular< a b ...))
-  (define-syntax-rule (inline-mod<= a b ...) (inline-mod-op modular<= a b ...))
-  (define-syntax-rule (inline-mod> a b ...) (inline-mod-op modular> a b ...))
-  (define-syntax-rule (inline-mod>= a b ...) (inline-mod-op modular>= a b ...))
-  )
-
-(require (submod "." typed-defs)
-         (submod "." untyped-defs))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/modular-arithmetic.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/modular-arithmetic.rkt
deleted file mode 100644
index a2bf9f8033..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/modular-arithmetic.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang racket/base
-
-(require "modular-arithmetic-base.rkt")
-
-(provide with-modulus
-         current-modulus
-         modular-inverse
-         modular-expt
-         mod+
-         mod-
-         mod*
-         mod/
-         modsqr
-         modexpt
-         mod
-         mod=
-         mod<
-         mod<=
-         mod>
-         mod>=)
-
-(module typed-defs typed/racket/base
-  (require racket/performance-hint
-           racket/flonum
-           "divisibility.rkt"
-           "modular-arithmetic-base.rkt")
-  
-  (provide (all-defined-out))
-  
-  (define-syntax-rule (define-comparison-op name op)
-    (begin
-      (: name (case-> (Integer -> Boolean)
-                      (Integer Integer Integer * -> Boolean)))
-      (define name
-        (case-lambda:
-          [([a : Integer])  #t]
-          [([a : Integer] [b : Integer])
-           (define n (current-modulus))
-           (op (modulo a n) (modulo b n))]
-          [([a : Integer] [b : Integer] . [cs : Integer *])
-           (define n (current-modulus))
-           (let ([a  (modulo a n)] [b  (modulo b n)])
-             (and (op a b)
-                  (let loop ([b b] [cs cs])
-                    (or (null? cs)
-                        (let ([c  (modulo (car cs) n)])
-                          (and (op b c) (loop c (cdr cs))))))))]))))
-  
-  (begin-encourage-inline
-    
-    (: mod+ (case-> (-> Natural)
-                    (Integer -> Natural)
-                    (Integer Integer Integer * -> Natural)))
-    (define mod+
-      (case-lambda:
-        [()  0]
-        [([a : Integer])  (modulo a (current-modulus))]
-        [([a : Integer] [b : Integer])  (modulo (+ a b) (current-modulus))]
-        [([a : Integer] [b : Integer] . [cs : Integer *])
-         (define n (current-modulus))
-         (for/fold: ([a : Natural  (modulo (+ a b) n)]) ([c  (in-list cs)])
-           (modulo (+ a c) n))]))
-    
-    (: mod- (case-> (Integer -> Natural)
-                    (Integer Integer Integer * -> Natural)))
-    (define mod-
-      (case-lambda:
-        [([a : Integer])  (modulo (- a) (current-modulus))]
-        [([a : Integer] [b : Integer])  (modulo (- a b) (current-modulus))]
-        [([a : Integer] [b : Integer] . [cs : Integer *])
-         (define n (current-modulus))
-         (for/fold: ([a : Natural  (modulo (- a b) n)]) ([c  (in-list cs)])
-           (modulo (- a c) n))]))
-    
-    (: mod* (case-> (-> Natural)
-                    (Integer -> Natural)
-                    (Integer Integer Integer * -> Natural)))
-    (define mod*
-      (case-lambda:
-        [()  (modulo 1 (current-modulus))]
-        [([a : Integer])  (modulo a (current-modulus))]
-        [([a : Integer] [b : Integer])  (modulo (* a b) (current-modulus))]
-        [([a : Integer] [b : Integer] . [cs : Integer *])
-         (define n (current-modulus))
-         (for/fold: ([a : Natural  (modulo (* a b) n)]) ([c  (in-list cs)])
-           (modulo (* a c) n))]))
-    
-    (: mod/ (case-> (Integer -> Natural)
-                    (Integer Integer Integer * -> Natural)))
-    (define mod/
-      (case-lambda:
-        [([a : Integer])  (modular-inverse a (current-modulus))]
-        [([a : Integer] [b : Integer])  (define n (current-modulus))
-                                        (modulo (* a (modular-inverse b n)) n)]
-        [([a : Integer] [b : Integer] . [cs : Integer *])
-         ;; It's ridiculous that `cs' has to be split here
-         (mod/ a (apply mod* b (car cs) (cdr cs)))]))
-    
-    (: modsqr (Integer -> Natural))
-    (define (modsqr a) (modulo (* a a) (current-modulus)))
-    
-    (: modexpt (Integer Integer -> Natural))
-    (define (modexpt a b)
-      (define n (current-modulus))
-      (cond [(b . < . 0)  (modular-expt (modular-inverse a n) (- b) n)]
-            [else  (modular-expt a b n)]))
-    
-    (: mod (Exact-Rational -> Natural))
-    (define (mod a)
-      (cond [(integer? a)  (modulo a (current-modulus))]
-            [else  (mod/ (numerator a) (denominator a))]))
-    
-    (define-comparison-op mod= =)
-    (define-comparison-op mod< <)
-    (define-comparison-op mod<= <=)
-    (define-comparison-op mod> >)
-    (define-comparison-op mod>= >=)
-    
-    )  ; begin-encourage-inline
-  )
-
-(module untyped-defs racket/base
-  (require (for-syntax racket/base)
-           "../syntax-utils.rkt"
-           "modular-arithmetic-base.rkt"
-           (prefix-in typed- (submod ".." typed-defs)))
-  
-  (provide (all-defined-out))
-  
-  (define-inline-op mod+ inline-mod+ typed-mod+ (a ...))
-  (define-inline-op mod* inline-mod* typed-mod* (a ...))
-  (define-inline-op mod- inline-mod- typed-mod- (a b ...))
-  (define-inline-op mod/ inline-mod/ typed-mod/ (a b ...))
-  (define-inline-op modsqr inline-modsqr typed-modsqr (a))
-  (define-inline-op modexpt inline-modexpt typed-modexpt (a b))
-  (define-inline-op mod inline-mod typed-mod (a))
-  (define-inline-op mod= inline-mod= typed-mod= (a b ...))
-  (define-inline-op mod< inline-mod< typed-mod< (a b ...))
-  (define-inline-op mod<= inline-mod<= typed-mod<= (a b ...))
-  (define-inline-op mod> inline-mod> typed-mod> (a b ...))
-  (define-inline-op mod>= inline-mod>= typed-mod>= (a b ...))
-  )
-
-(require (submod "." untyped-defs))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/number-theory.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/number-theory.rkt
deleted file mode 100644
index 4e0e301f42..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/number-theory.rkt
+++ /dev/null
@@ -1,739 +0,0 @@
-#lang typed/racket
-
-(require "../base/base-random.rkt"
-         "divisibility.rkt"
-         "modular-arithmetic.rkt"
-         "types.rkt"
-         "small-primes.rkt")
-
-(require/typed typed/racket
-               [integer-sqrt/remainder (Natural -> (Values Natural Natural))])
-
-(provide solve-chinese
-         
-         ; primes
-         nth-prime
-         random-prime
-         next-prime untyped-next-prime
-         next-primes
-         prev-prime untyped-prev-prime
-         prev-primes
-         prime?
-         odd-prime?
-         factorize
-         defactorize
-         divisors
-         prime-divisors
-         prime-exponents
-         prime-omega
-         
-         ; roots
-         integer-root
-         integer-root/remainder         
-         
-         ; Powers
-         max-dividing-power
-         perfect-power
-         perfect-power?
-         prime-power
-         prime-power?
-         odd-prime-power?
-         as-power
-         perfect-square
-
-         ; number theoretic functions
-         totient
-         moebius-mu
-         divisor-sum
-         mangoldt-lambda
-         )
-
-;;;
-;;; Configuration
-;;;
-
-(define prime-strong-pseudo-certainty 1/10000000)
-(define prime-strong-pseudo-trials
-  (integer-length (assert (/ 1 prime-strong-pseudo-certainty) integer?)))
-
-(define *VERY-SMALL-PRIME-LIMIT* 1000)
-; Determines the size of the pre-built table of very small primes
-(define *SMALL-FACORIZATION-LIMIT* *VERY-SMALL-PRIME-LIMIT*)
-; Determines whether to use naive factorization or Pollards rho method.
-
-
-;;;
-;;; Powers
-;;;
-
-(: max-dividing-power : Integer Integer -> Natural)
-; (max-dividing-power p n) = m  <=> p^m | n  and  p^(m+1) doesn't divide n
-;   In Mathematica this one is called IntegerExponent
-(define (max-dividing-power p n)
-  (: find-start : Integer Integer -> Integer)
-  (define (find-start p-to-e e)
-    ;(display (list 'fs 'p-to-e p-to-e  'e e)) (newline)
-    ; p-to-e divides n  and  p-to-e = p^e
-    (let ([p-to-e2 (sqr p-to-e)])
-      (cond [(= p-to-e2 n) (* 2 e)]
-            [(> p-to-e2 n) (find-power p-to-e e)]
-            [(divides? p-to-e2 n) (if (divides? p (quotient n p-to-e2))
-                                      (find-start p-to-e2 (* 2 e))
-                                      (* 2 e))]
-            [else (find-power p-to-e e)])))
-  (: find-power : Integer Integer -> Integer)
-  (define (find-power p-to-e e)
-    ;(display (list 'fp 'p-to-e p-to-e  'e e)) (newline)
-    ; p-to-e <= n < (square p-to-e)
-    (+ e (max-dividing-power-naive p (quotient n p-to-e))))
-  (cond [(= p 1)              1]
-        [(not (divides? p n)) 0]
-        [else                 (assert (find-start p 1) natural?)]))
-
-(: max-dividing-power-naive : Integer Integer -> Natural)
-(define (max-dividing-power-naive p n)
-  ; sames as max-dividing-power but using naive algorithm
-  (: loop : Integer Integer -> Integer)
-  (define (loop p-to-e e)
-    (if (divides? p-to-e n)
-        (loop (* p p-to-e) (+ e 1))
-        (- e 1)))
-  (if (= p 1)
-      (error 'max-dividing-power "No maximal power of 1 exists")
-      (assert (loop 1 0) natural?)))
-
-; THEOREM (The Chinese Remainder Theorem)
-;   Let n1,...,nk be positive integers with gcd(ni,nj)=1 whenever i<>j,
-;   and let a1,...,ak be any integers. Then the solutions to
-;     x=a1  mod n1,  ...,  x=ak  mod nk
-;   has a single solution in {0,...,n-1}, where n=n1*...nk.
-
-; Example : (solve-chinese '(2 3 2) '(3 5 7)) = 23
-
-(: solve-chinese : (Listof Integer) (Listof Integer) -> Natural)
-(define (solve-chinese as ns)
-  (unless (andmap positive? ns)
-    (raise-argument-error 'solve-chinese "(Listof Positive-Integer)" 1 as ns))
-  ; the ns should be coprime
-  (let* ([n  (apply * ns)]
-         [cs (map (λ: ([ni : Integer]) (quotient n ni)) ns)]
-         [ds (map modular-inverse cs ns)]
-         [es (cast ds (make-predicate (Listof Integer)))])
-    (cast (modulo (apply + (map * as cs es)) n) natural?)))
-
-;;;
-;;; PRIMES
-;;;
-
-(: odd-prime? : Natural -> Boolean)
-(define (odd-prime? n)
-  (and (odd? n) (prime? n)))
-
-;;; PRIMALITY TESTS
-
-; Strong pseudoprimality test
-; The strong test returns one of:
-;   'probably-prime                                        if n is a prime
-;   'composite            (with at least probability 1/2)  if n is a composite non-Carmichael number
-;   a proper divisor of n (with at least probability 1/2)  if n is a Carmichael number
-; [MCA, p.509 - Algorithm 18.5]
-(: prime-strong-pseudo-single? : Integer -> (U 'probably-prime 'composite Natural))
-(define (prime-strong-pseudo-single? n)
-  (cond
-    [(n . <= . 0)  (raise-argument-error 'prime-strong-pseudo-single? "Positive-Integer" n)]
-    [(n . >= . 4)
-     (define a (random-integer 2 (- n 1)))
-     (define g (gcd a n))
-     (cond
-       [(> g 1) g] ; factor found
-       [else
-        ; 3. write n-1 = 2^ν * m , m odd
-        (let loop ([ν 0] [m (- n 1)])
-          (cond 
-            [(even? m) (loop (add1 ν) (quotient m 2))]
-            [else ; 4. for i=1,...,ν do bi <- b_{i-1}^2 rem N
-             (define b (modular-expt a m n))
-             (cond 
-               [(= b 1) 'probably-prime]
-               [else    
-                (let loop ([i 0] [b b] [b-old b])
-                  (if (and (< i ν) (not (= b 1)))
-                      (loop (add1 i)
-                            (modulo (* b b) n)
-                            b)
-                      (if (= b 1)
-                          (let ([g (gcd (+ b-old 1) n)])
-                            (if (or (= g 1) (= g n))
-                                'probably-prime
-                                g))
-                          'composite)))])]))])]
-    [(= n 1)  'composite]
-    [else  'probably-prime]))
-
-(define-type Strong-Test-Result         (U 'very-probably-prime 'composite Natural))
-
-(: prime-strong-pseudo/explanation : Natural -> Strong-Test-Result)
-(define (prime-strong-pseudo/explanation n)
-  ; run the strong test several times to improve probability
-  (: loop : Integer (U Strong-Test-Result 'probably-prime) -> Strong-Test-Result)
-  (define (loop trials result)
-    (cond [(= trials 0)                 'very-probably-prime]
-          [(eq? result 'probably-prime) (loop (sub1 trials) (prime-strong-pseudo-single? n))]
-          [else                         result]))
-  (loop prime-strong-pseudo-trials (prime-strong-pseudo-single? n)))
-
-(: prime-strong-pseudo? : Natural -> Boolean)
-(define (prime-strong-pseudo? n)
-  (let ([explanation (prime-strong-pseudo/explanation n)])
-    (or (eq? explanation 'very-probably-prime)
-        (eq? explanation #t))))
-
-
-(: prime? : Integer -> Boolean)
-(define prime?
-  (let ()
-    ; TODO: Only store odd integers in this table
-    (define N *VERY-SMALL-PRIME-LIMIT*)
-    (define ps (make-vector (+ N 1) #t))
-    (define ! vector-set!)
-    (! ps 0 #f)
-    (! ps 1 #f)
-    (for ([n (in-range 2 (+ N 1))])
-      (when (vector-ref ps n)
-        (for ([m (in-range (+ n n) (+ N 1) n)])
-          (! ps m #f))))
-    (lambda (n)
-      (let ([n (abs n)])
-        (cond 
-          [(< n N)
-           (vector-ref ps n)]
-          [(< n *SMALL-PRIME-LIMIT*)
-           (small-prime? n)]
-          [else
-           (prime-strong-pseudo? n)])))))
-
-(: next-prime : (case-> (Natural -> Natural)
-                        (Integer -> Integer)))
-(define (next-prime n)
-  (cond
-    [(negative? n) (- (prev-prime (abs n)))]
-    [(= n 0) 2]
-    [(= n 1) 2]
-    [(= n 2) 3]
-    [(even? n) (let ([n+1 (add1 n)])
-                 (if (prime? n+1)
-                     n+1
-                     (next-prime n+1)))]
-    [else      (let ([n+2 (+ n 2)])
-                 (if (prime? n+2)
-                     n+2
-                     (next-prime n+2)))]))
-
-(: untyped-next-prime : Integer -> Integer)
-(define (untyped-next-prime z)
-  (next-prime z))
-
-(: untyped-prev-prime : Integer -> Integer)
-(define (untyped-prev-prime z)
-  (prev-prime z))
-
-
-(: prev-prime : Integer -> Integer)
-(define (prev-prime n)
-  (cond
-    [(negative? n) (- (next-prime (abs n)))]
-    [(= n 3)   2]
-    [(< n 3)   -2]
-    [(even? n) (let ([n-1 (sub1 n)])
-                 (if (prime? n-1)
-                     n-1
-                     (prev-prime n-1)))]
-    [else      (let ([n-2 (- n 2)])
-                 (if (prime? n-2)
-                     n-2
-                     (prev-prime n-2)))]))
-
-
-(: next-primes : Integer Integer -> (Listof Integer))
-(define (next-primes m primes-wanted)
-  (cond
-    [(primes-wanted . < . 0)  (raise-argument-error 'next-primes "Natural" 1 m primes-wanted)]
-    [else
-     (: loop : Integer Integer -> (Listof Integer))
-     (define (loop n primes-wanted)
-       (if (= primes-wanted 0)
-           '()
-           (let ([next (next-prime n)])
-             (if next
-                 (cons next (loop next (sub1 primes-wanted)))
-                 '()))))
-     (loop m primes-wanted)]))
-
-(: prev-primes : Integer Integer -> (Listof Integer))
-(define (prev-primes m primes-wanted)
-  (cond
-    [(primes-wanted . < . 0)  (raise-argument-error 'prev-primes "Natural" 1 m primes-wanted)]
-    [else
-     (: loop : Integer Integer -> (Listof Integer))
-     (define (loop n primes-wanted)
-       (if (= primes-wanted 0)
-           '()
-           (let ([prev (prev-prime n)])
-             (if prev
-                 (cons prev (loop prev (sub1 primes-wanted)))
-                 '()))))
-     (loop m primes-wanted)]))
-
-
-(: nth-prime : Integer -> Natural)
-(define (nth-prime n)
-  (cond [(n . < . 0)  (raise-argument-error 'nth-prime "Natural" n)]
-        [else
-         (for/fold: ([p : Natural  2]) ([m (in-range n)])
-           (next-prime p))]))
-
-(: random-prime : Integer -> Natural)
-(define (random-prime n)
-  (when (<= n 2)
-    (raise-argument-error 'random-prime "Natural > 2" n))
-  (define p (random-natural n))
-  (if (prime? p)
-      p
-      (random-prime n)))
-
-;;;
-;;; FACTORIZATION
-;;;
-
-(: factorize : Natural -> (Listof (List Natural Natural)))
-(define (factorize n)
-  (if (< n *SMALL-FACORIZATION-LIMIT*)  ; NOTE: Do measurement of best cut
-      (factorize-small n)
-      (factorize-large n)))
-
-(: defactorize : (Listof (List Natural Natural)) -> Natural)
-(define (defactorize bes)
-  (cond [(empty? bes) 1]
-        [else (define be (first bes))
-              (* (expt (first be) (second be))
-                 (defactorize (rest bes)))]))
-
-(: factorize-small : Natural -> (Listof (List Natural Natural)))
-(define (factorize-small n)
-  ; fast for small n, but works correctly for large n too
-  (small-prime-factors-over n 2))
-
-(: small-prime-factors-over : Natural Natural -> (Listof (List Natural Natural)))
-; Factor a number n without prime factors below the prime p.
-(define (small-prime-factors-over n p) ; p prime
-  (cond
-    [(<= p 0)        (raise-argument-error 'small-prime-factors-over "Natural" p)]
-    [(< n p)         '()]
-    [(= n p)         (list (list p 1))]
-    [(prime? n)      (list (list n 1))]
-    [(divides? p n)  (let ([m (max-dividing-power p n)])
-                       (cons (list p m)
-                             (small-prime-factors-over 
-                              (quotient n (expt p m))
-                              (next-prime p))))]
-    [else            (small-prime-factors-over n (next-prime p))]))
-
-
-;;; ALGORITHM 19.8  Pollard's rho method
-; INPUT   n>=3 neither a prime nor a perfect power
-; OUTPUT  Either a proper divisor of n or #f
-(: pollard : Natural -> (U Natural False))
-(define (pollard n)
-  (let ([x0 (random-natural n)])
-    (do ([xi x0 (remainder (+ (* xi xi) 1) n)]
-         [yi x0 (remainder (+ (sqr (+ (* yi yi) 1)) 1) n)]
-         [i  0  (add1 i)]
-         [g  1  (gcd (- xi yi) n)])
-      [(or (< 1 g n) (> i (sqrt n)))
-       (if (< 1 g n)
-           (cast g natural?)
-           #f)])))
-
-(: pollard-factorize : Natural -> (Listof (List Natural Natural)))
-(define (pollard-factorize n)
-  (if (< n *SMALL-FACORIZATION-LIMIT*)
-      (factorize-small n)
-      (cond
-        [(= n 1)        '()]
-        [(prime? n)     `((, n 1))]
-        [(even? n)      `((2 1) ,@(pollard-factorize (quotient n 2)))]
-        [(divides? 3 n) `((3 1) ,@(pollard-factorize (quotient n 3)))]
-        [(simple-perfect-power n)
-         => (λ: ([base-and-exp : (List Natural Natural)]) 
-              (cond
-                [(prime? (car base-and-exp)) (list base-and-exp)]
-                [else (map (λ: ([b-and-e : (List Natural Natural)])
-                             (list (car b-and-e) 
-                                   (* (cadr base-and-exp) (cadr b-and-e))))
-                           (pollard-factorize (car base-and-exp)))]))]
-        [else                 
-         (let loop ([divisor (pollard n)])
-           (if divisor
-               (append (pollard-factorize divisor)
-                       (pollard-factorize (quotient n divisor)))
-               (loop (pollard n))))])))
-
-(: factorize-large : Natural -> (Listof (List Natural Natural)))
-(define (factorize-large n)
-  (combine-same-base
-   (sort (pollard-factorize n) base-and-exponent<?)))
-
-(: base-and-exponent<? ((U Natural (List Natural Natural)) (U Natural (List Natural Natural))
-                                                           -> Boolean))
-(define (base-and-exponent<? x y)
-  (let ([id-or-first 
-         (λ: ([x : (U Integer (List Integer Integer))])
-           (if (number? x) x (first x)))])
-    (<= (id-or-first x) (id-or-first y))))
-
-(: combine-same-base : (Listof (List Natural Natural)) -> (Listof (List Natural Natural)))
-(define (combine-same-base list-of-base-and-exponents)
-  ; list-of-base-and-exponents must be sorted
-  (let ([l list-of-base-and-exponents])
-    (cond
-      [(null? l)        '()]
-      [(null? (cdr l))  l]
-      [else             
-       (define b1 (first  (first l)))
-       (define e1 (second (first l)))
-       (define b2 (first  (second l)))
-       (define e2 (second (second l)))
-       (define more (cddr l))
-       (if (= b1 b2)
-           (combine-same-base (cons (list b1 (+ e1 e2))
-                                    (cdr (cdr list-of-base-and-exponents))))
-           (cons (car list-of-base-and-exponents)
-                 (combine-same-base (cdr list-of-base-and-exponents))))])))
-
-
-; find-tail pred clist -> pair or false
-; Return the first pair of clist whose car satisfies pred. If no pair does, return false.
-(: find-tail : (Integer -> Boolean) (Listof Integer) -> (U False (Listof Integer)))
-(define (find-tail pred xs)
-  (cond [(empty? xs) #f]
-        [(pred (car xs)) xs]
-        [else (find-tail pred (cdr xs))]))
-
-
-;;;
-;;; Powers
-;;;
-
-(: as-power : Exact-Positive-Integer -> (Values Natural Natural))
-;   Write a>0 as b^r with r maximal. Return b and r.
-(define (as-power a)    
-  (let ([r (apply gcd ((inst map Natural (List Natural Natural)) second (factorize a)))])
-    (values (integer-root a r) r)))
-
-
-(: prime-power : Natural -> (U (List Natural Natural) False))
-;   if n is a prime power, return list of prime and exponent in question,
-;   otherwise return #f
-(define (prime-power n)
-  (let ([factorization (prime-divisors/exponents n)])
-    (if (= (length factorization) 1)
-        (first (prime-divisors/exponents n))
-        #f)))
-
-(: prime-power? : Natural -> Boolean)
-;   Is n of the form p^m, with p is prime?
-(define (prime-power? n)
-  (and (prime-power n) #t))
-
-(: odd-prime-power? : Natural -> Boolean)
-(define (odd-prime-power? n)
-  (let ([p/e (prime-power n)])
-    (and p/e
-         (odd? (first p/e)))))
-
-(: perfect-power? : Natural -> Boolean)
-(define (perfect-power? a)
-  (and (not (zero? a))
-       (let-values ([(base n) (as-power a)])
-         (and (> n 1) (> a 1)))))
-
-(: simple-perfect-power : Natural -> (U (List Natural Natural) False))
-(define (simple-perfect-power a)
-  ; simple-perfect-power is used by pollard-fatorize
-  (and (not (zero? a))
-       (let-values ([(base n) (simple-as-power a)])
-         (if (and (> n 1) (> a 1))
-             (list base n)
-             #f))))
-
-(: perfect-power : Natural -> (U (List Natural Natural) False))
-;   if a = b^n with b>1 and n>1
-(define (perfect-power a)
-  (and (not (zero? a))
-       (let-values ([(base n) (as-power a)])
-         (if (and (> n 1) (> a 1))
-             (list base n)
-             #f))))
-
-(: perfect-square : Natural -> (U Natural False))
-(define (perfect-square n)
-  (let ([sqrt-n (integer-sqrt n)])
-    (if (= (* sqrt-n sqrt-n) n)
-        sqrt-n
-        #f)))
-
-(: powers-of : Natural Natural -> (Listof Natural))
-;   returns a list of numbers: a^0, ..., a^n
-(define (powers-of a n)
-  (let: loop : (Listof Natural)
-    ([i   : Natural 0] 
-     [a^i : Natural 1])
-    (if (<= i n)
-        (cons a^i (loop (+ i 1) (* a^i a)))
-        '())))
-
-(define prime-divisors/exponents factorize)
-
-(: prime-divisors : Natural -> (Listof Natural))
-;   return list of primes in a factorization of n
-(define (prime-divisors n)
-  (map (inst car Natural (Listof Natural))
-       (prime-divisors/exponents n)))
-
-(: prime-exponents : Natural -> (Listof Natural))
-;   return list of exponents in a factorization of n
-(define (prime-exponents n)
-  (map (inst cadr Natural Natural (Listof Natural)) 
-       (prime-divisors/exponents n)))
-
-(: prime-omega : Natural -> Natural)
-; http://reference.wolfram.com/mathematica/ref/PrimeOmega.html
-(define (prime-omega n)
-  (for/fold: ([sum : Natural 0]) ([e (in-list (prime-exponents n))])
-    (+ sum e)))
-
-
-(: integer-root/remainder : Natural Natural -> (Values Natural Natural))
-(define (integer-root/remainder a n)
-  (let ([i (integer-root a n)])
-    (values i (assert (- a (expt i n)) natural?))))
-
-(: integer-root : Natural Natural -> Natural)
-(define (integer-root x y)
-    ; y'th root of x
-    (cond 
-      [(eq? x 0) 0]
-      [(eq? x 1) 1]
-      [(eq? y 1) x]
-      [(eq? y 2) (integer-sqrt x)]
-      [(not (integer? y))
-       (error 'integer-root "internal error (used to return 1 here - why?) remove after testing")]
-      [else
-       (define length (integer-length x))
-       ;; (expt 2 (- length l 1)) <= x < (expt 2 length)
-       (assert
-        (cond [(<= length y) 1]
-              ;; result is >= 2
-              [(<= length (* 2 y))
-               ;; result is < 4
-               (if (< x (expt 3 y)) 2 3)]
-              [(even? y) (integer-root (integer-sqrt x) (quotient y 2))]
-              [else
-               (let* ([length/y/2 ;; length/y/2 >= 1 because (< (* 2 y) length)
-                       (quotient (quotient (- length 1) y) 2)])
-                 (let ([init-g
-                        (let* ([top-bits          (arithmetic-shift x (- (* length/y/2 y)))]
-                               [nth-root-top-bits (integer-root top-bits y)])
-                          (arithmetic-shift (+ nth-root-top-bits 1) length/y/2))])
-                   (let: loop : Integer ([g : Integer init-g])
-                     (let* ([a (expt g (assert (- y 1) natural?))]
-                            [b (* a y)]
-                            [c (* a (- y 1))]
-                            [d (quotient (+ x (* g c)) b)])
-                       (let ([diff (- d g)])
-                         (cond [(not (negative? diff))
-                                g]
-                               [(< diff -1)
-                                (loop d)]
-                               [else
-                                ;; once the difference is one, it's more
-                                ;; efficient to just decrement until g^y <= x
-                                (let loop ((g d))
-                                  (if (not (< x (expt g y)))
-                                      g
-                                      (loop (- g 1))))]))))))])
-        natural?)]))
-
-
-(: simple-as-power : Exact-Positive-Integer -> (Values Natural Natural))
-;    For a>0 write it as a = b^r where r maximal
-;    return (values b r)
-(define (simple-as-power a)
-  ; (displayln (list 'simple-as-power a))
-  ; Note: The simple version is used by pollard-factorize
-  (let: loop : (Values Natural Natural)
-    ([n : Natural (integer-length a)])
-    (let-values ([(root rem) (integer-root/remainder a (add1 n))])
-      (if (zero? rem)
-          (values root (assert (add1 n) natural?))
-          (if (positive? n)
-              (loop (sub1 n))
-              (error 'simple-as-power "internal error"))))))
-
-(: prime-power? : Natural -> Boolean)
-
-;;;
-;;; DIVISORS
-;;;
-
-(: divisors : Integer -> (Listof Natural))
-;   return the positive divisorts of n
-(define (divisors n)
-  (cond [(zero? n) '()]
-        [else (define n+ (if (positive? n) n (- n)))
-              (sort (factorization->divisors (factorize n+)) <)]))
-
-(: factorization->divisors : (Listof (List Natural Natural)) -> (Listof Natural))
-(define (factorization->divisors f)
-  (cond
-    [(null? f) '(1)]
-    [else (let ([p (first (first f))]
-                [n (second (first f))]
-                [g (rest f)])
-            ; f = p^n * g
-            (let ([divisors-of-g (factorization->divisors g)])
-              (apply append
-                     ((inst map (Listof Natural) Natural)
-                      (λ: ([p^i : Natural]) (map (λ: ([d : Natural]) (* p^i d)) divisors-of-g))
-                      (powers-of p n)))))]))
-
-;;;
-;;; Number theoretic functions
-;;;
-
-; DEFINITION (Euler's phi function  aka  totient)
-;  phi(n) is the number of integers a=1,2,... such that gcd(a,n)=1
-
-; THEOREM
-;   If m and n are coprime then
-;     phi(mn) = phi(m) phi(n) 
-
-; THEOREM (Euler's phi function)
-;  If the prime power factorization of p is
-;           e1     ek
-;     n = p1 ... pk     , where pi is prime and ei>0
-;  then
-;                   k          1
-;   phi(n) = n * product (1 - ---- )
-;                  i=1         pi
-
-(: totient : Natural -> Natural)
-(define (totient n)
-  (let ((ps (prime-divisors n)))
-    (assert (* (quotient n (apply * ps))
-               (apply * (map (λ: ([p : Natural]) (sub1 p)) ps)))
-            natural?)))
-
-(: every : (All (A) (A -> Boolean) (Listof A) -> Boolean))
-(define (every pred xs)
-  (or (empty? xs)
-      (and (pred (car xs))
-           (every pred (cdr xs)))))
-
-
-; moebius-mu : natural -> {-1,0-1}
-;   mu(n) =  1  if n is a product of an even number of primes
-;         = -1  if n is a product of an odd number of primes
-;         =  0  if n has a multiple prime factor
-(: moebius-mu : Natural -> (U -1 0 1))
-(define (moebius-mu n)
-  (: one? : Integer -> Boolean)
-  (define (one? x) (= x 1))
-  (define f         (factorize n))
-  (define exponents ((inst map Natural (List Natural Natural)) second f))
-  (cond 
-    [(every one? exponents)
-     (define primes ((inst map Natural (List Natural Natural)) first f))
-     (if (even? (length primes))
-         1 -1)]
-    [else 0]))
-
-
-(: divisor-sum : (case-> (Natural -> Natural) (Natural Natural -> Natural)))                   
-(define divisor-sum 
-  ; returns the sum of the kth power of all divisors of n
-  (let ()
-    (case-lambda 
-      [(n)   (divisor-sum n 1)]
-      [(n k) (let* ([f  (factorize n)]
-                    [ps ((inst map Natural (List Natural Natural)) first f)]
-                    [es ((inst map Natural (List Natural Natural)) second f)])
-               (: divisor-sum0 : Any Natural -> Natural)
-               (define (divisor-sum0 p e) (+ e 1))
-               (: divisor-sum1 : Natural Natural -> Natural)
-               (define (divisor-sum1 p e)
-                 (let: loop : Natural 
-                   ([sum    : Natural 1]
-                    [n      : Natural 0]
-                    [p-to-n : Natural 1])
-                   (cond [(= n e) sum]
-                         [else (let ([t (* p p-to-n)])
-                                 (loop (+ t sum) (+ n 1) t))])))
-               (: divisor-sumk : Natural Natural -> Natural)
-               (define (divisor-sumk p e)
-                 (let ([p-to-k (expt p k)])
-                   (let: loop : Natural
-                     ([sum     : Natural 1]
-                      [n       : Natural 0]
-                      [p-to-kn : Natural 1])
-                     (cond [(= n e) sum]
-                           [else (let ([t (* p-to-k p-to-kn)])
-                                   (loop (+ t sum) (+ n 1) t))]))))
-               (cast
-                (apply * (map (cond [(= k 0) divisor-sum0]
-                                    [(= k 1) divisor-sum1]
-                                    [else    divisor-sumk])
-                              ps es))
-                natural?))])))
-
-(: mangoldt-lambda : Integer -> Real)                   
-(define (mangoldt-lambda n)
-  (cond 
-    [(<= n 0) (raise-argument-error 'mangoldt-lambda "Natural" n)]
-    [else (define am (prime-power n))
-          (cond
-            [(cons? am) (log (car am))]
-            [else 0])]))
-
-; These tests are for un-exported functions.
-#;(begin
-    (require typed/rackunit)
-    
-    (check-equal? (max-dividing-power-naive 3 27) 3)
-    (check-equal? (max-dividing-power-naive 3 (* 27 2)) 3)
-    
-    (check-true   (<= 4 (random-integer 4 5) 4))
-    
-    (check-false (prime-fermat? 0))
-    (check-false (prime-fermat? 1))
-    (check-false (prime-fermat? 4))
-    (check-false (prime-fermat? 6))
-    (check-false (prime-fermat? 8))
-    
-    (check-equal? (prime-fermat? 2)   #t)
-    (check-equal? (prime-fermat? 3)   #t)
-    (check-equal? (prime-fermat? 5)   'possibly-prime)
-    (check-equal? (prime-fermat? 7)   'possibly-prime)
-    (check-equal? (prime-fermat? 11)  'possibly-prime)
-    (check-true   (member? (prime-fermat? 561) '(#f possibly-prime))) ; Carmichael number
-    
-    (check-equal? (prime-strong-pseudo-single? 4) 2)
-    (check-true  (member? (prime-strong-pseudo-single? 6) '(2 3)))
-    (check-true  (member? (prime-strong-pseudo-single? 8) '(2 4 composite)))
-    
-    (check-equal? (prime-strong-pseudo-single? 5)   'probably-prime)
-    (check-equal? (prime-strong-pseudo-single? 7)   'probably-prime)
-    (check-equal? (prime-strong-pseudo-single? 11)  'probably-prime)
-    ;; Carmichael number:
-    (check-true   (member? (prime-strong-pseudo-single? 561) (cons 'probably-prime (divisors 561))))
-    )
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/partitions.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/partitions.rkt
deleted file mode 100644
index 55bb06c024..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/partitions.rkt
+++ /dev/null
@@ -1,96 +0,0 @@
-#lang typed/racket/base
-(provide partitions set-partitions-cache)
-(require math/private/number-theory/types
-         (only-in racket/vector vector-copy))
-
-;; The number of partitions of 4 is 5, since the number 4 can 
-;; be written as a sum of natural numbers in 5 ways:
-;;    4 = 3+1 = 2+2 = 2+1+1 = 1+1+1
-
-;; http://en.wikipedia.org/wiki/Partition_(number_theory)
-
-;;; Partitions are computed using Euler's algorithm:
-
-;;                k            k(3k+1)              k(3k-1)
-;; p(n) = sum (-1)   [ p( n - --------- ) + p( n - --------- ) ]
-;;        k>=1                    2                    2
-
-;; The formula is a recurence relation, so we use a cache to
-;; avoid unnecessary computations.
-
-; partitions store previously computed values in cache.
-(: cache-size : Nonnegative-Integer)
-(define cache-size 128)
-(: cache (Vectorof Integer))
-(define cache (make-vector cache-size 0))
-(vector-set! cache 0 1)  ; p(0) = 1
-
-
-(: set-partitions-cache : Index -> Void)
-; Set the cache of partitions to size n.
-; There are room for the values p(0),...,p(n-1).
-(define (set-partitions-cache n)
-  (cond [(< n 1)           (void)]
-        [(< n cache-size)  (shrink-cache n)]
-        [(= n cache-size)  (void)]
-        [else              (grow-cache n)]))
-
-(: shrink-cache : Natural -> Void)
-; if cache-size is larger than n, shrink the cache
-(define (shrink-cache n)
-  (cond [(< cache-size n) (void)]
-        [else (define new-cache (vector-copy cache 0 n))
-              (set! cache-size n)
-              (set! cache new-cache)]))
-
-(: grow-cache : Natural -> Void)
-; if cache-size is smaller than n, grow the cache to size n
-(define (grow-cache n)
-  (cond [(> cache-size n) (void)]
-        [else (define new-cache (make-vector n 0))
-              (vector-copy! new-cache 0 cache)
-              (set! cache-size n)
-              (set! cache new-cache)]))
-
-(: double-cache : Natural -> Void)
-; if cache-size is smaller than n, double the cache size (repeatedly if needed)
-(define (double-cache n)
-  (: new-cache-size : Nonnegative-Integer -> Nonnegative-Integer)
-  (define (new-cache-size size)
-    (cond [(<= n size) size]
-          [else       (new-cache-size (* 2 size))]))
-  (when (< cache-size n) 
-    (grow-cache (new-cache-size cache-size))))
-
-
-(: partitions : Integer -> Integer)
-; double cache, if necessary, then call p
-(define (partitions n)
-  (cond [(< n 0) 0]
-        [else (double-cache (+ n 1))
-              (p n)]))
-
-(: p : Natural -> Integer)
-; compute the number of partitions of n using Euler's algorithm
-(define (p n)
-  (define cached (vector-ref cache n))
-  (cond [(zero? cached)
-         (define pn (+ (loop1  1 (- n 1) 0)
-                       (loop2 -1 (- n 2) 0)))
-         (vector-set! cache n pn)
-         pn]
-        [else cached]))
-
-(: loop1 : Integer Integer Integer -> Integer)
-(define (loop1 k m s)
-  (cond [(< m 0) s]
-        [else (loop1 (+ k 1) 
-                     (- m (+ (* 3 k) 1)) 
-                     (if (odd? k) (+ s (p m)) (- s (p m))))]))
-
-(: loop2 : Integer Integer Integer -> Integer)
-(define (loop2 k m s)
-  (cond [(< m 0) s]
-        [else   (loop2 (- k 1)
-                       (+ m (* 3 k) -2) 
-                       (if (odd? k) (+ s (p m)) (- s (p m))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/polygonal.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/polygonal.rkt
deleted file mode 100644
index 324dead4ba..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/polygonal.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang typed/racket/base
-
-(require "quadratic.rkt"
-         (only-in "number-theory.rkt" perfect-square)
-         "types.rkt")
-
-(provide triangle-number triangle-number?
-         square-number?
-         pentagonal-number pentagonal-number?
-         hexagonal-number hexagonal-number?
-         heptagonal-number heptagonal-number?
-         octagonal-number octagonal-number?)
-
-(: triangle-number : Natural -> Natural)
-(define (triangle-number n)
-  (quotient (* n (+ n 1)) 2))
-
-(: triangle-number? : Natural -> Boolean)
-(define (triangle-number? n)
-  (not (null? (quadratic-natural-solutions 1/2 1/2 (- n)))))
-
-(: square-number? : Natural -> Boolean)
-(define (square-number? n)
-  (and (perfect-square n) #t))
-
-(: pentagonal-number : Natural -> Natural)
-(define (pentagonal-number n)
-  (assert (quotient (* n (- (* 3 n) 1)) 2) natural?))
-
-(: pentagonal-number? : Natural -> Boolean)
-(define (pentagonal-number? n)
-  (not (null? (quadratic-natural-solutions 3/2 -1/2 (- n)))))
-
-(: hexagonal-number : Natural -> Natural)
-(define (hexagonal-number n)
-  (assert (* n (- (* 2 n) 1)) natural?))
-
-(: hexagonal-number? : Natural -> Boolean)
-(define (hexagonal-number? n)
-  (not (null? (quadratic-natural-solutions 2 -1 (- n)))))
-
-(: heptagonal-number : Natural -> Natural)
-(define (heptagonal-number n)
-  (assert (quotient (* n (- (* 5 n) 3)) 2) natural?))
-
-(: heptagonal-number? : Natural -> Boolean)
-(define (heptagonal-number? n)
-  (not (null? (quadratic-natural-solutions 5/2 -3/2 (- n)))))
-
-(: octagonal-number : Natural -> Natural)
-(define (octagonal-number n)
-  (assert (* n (- (* 3 n) 2)) natural?))
-
-(: octagonal-number? : Natural -> Boolean)
-(define (octagonal-number? n)
-  (not (null? (quadratic-natural-solutions 3 -2 (- n)))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/primitive-roots.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/primitive-roots.rkt
deleted file mode 100644
index 4306da3f55..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/primitive-roots.rkt
+++ /dev/null
@@ -1,180 +0,0 @@
-#lang typed/racket/base
-
-(require racket/list
-         "divisibility.rkt"
-         "modular-arithmetic.rkt"
-         (only-in "number-theory.rkt" 
-                  odd-prime-power?
-                  totient
-                  prime-divisors
-                  prime?
-                  odd-prime?
-                  prime-power))
-
-(provide unit-group
-         unit-group-order
-         unit-group-orders
-         exists-primitive-root?
-         primitive-root?
-         primitive-root
-         primitive-roots)
-
-; DEFINITION (Order)
-;  If G is a finite group with identity element e,
-;  then the order of g in G is the least k>0 such that
-;  g^k=e
-
-; DEFINITION (Un)
-;  The group of units in Zn with respect to multiplication
-;  modulo n is called Un.
-
-(: unit-group : Integer -> (Listof Positive-Integer))
-(define (unit-group n)
-  (cond [(n . <= . 0)  (raise-argument-error 'unit-group "Positive-Integer" n)]
-        [else  (filter (λ: ([m : Natural]) (coprime? m n))
-                       (build-list (- n 1) add1))]))
-
-(: unit-group-order : Integer Integer -> Positive-Integer)
-(define (unit-group-order g n)
-  (cond [(g . <= . 0)  (raise-argument-error 'unit-group-order "Positive-Integer" 0 g n)]
-        [(n . <= . 0)  (raise-argument-error 'unit-group-order "Positive-Integer" 1 g n)]
-        [(not (coprime? g n))
-         (error 'unit-group-order "expected coprime arguments; given ~e and ~e" g n)]
-        [else
-         (with-modulus n
-           (let: loop : Positive-Integer ([k : Positive-Integer 1] 
-                                          [a : Natural g])
-             (cond [(mod= a 1)  k]
-                   [else  (loop (+ k 1) (mod* a g))])))]))
-
-(: unit-group-orders : Integer -> (Listof Positive-Integer))
-(define (unit-group-orders n)
-  (cond [(n . <= . 0)  (raise-argument-error 'unit-group-orders "Positive-Integer" n)]
-        [else  (map (λ: ([m : Positive-Integer]) (unit-group-order m n))
-                    (unit-group n))]))
-
-; DEFINITION (Primitive Root)
-;  A generator g of Un is called a primitive root mod n.
-;  I.e.  order(g)=phi(n)  <=>  g is primitive
-
-#;
-(define (primitive-root? g n)
-  (if (not (coprime? g n))
-      (error 'primitive-root? "expected coprime arguments; given ~e and ~e" g n)
-      (= (unit-group-order g n) (phi n))))
-
-; THEOREM (Existence of primitive roots)
-;      Un is cyclic   (i.e. have a primitive root)
-;  <=> n = 1, 2, 4, p^e, 2*p^e  where p is an odd prime
-
-(: exists-primitive-root? : Integer -> Boolean)
-(define (exists-primitive-root? n)
-  (cond [(n . <= . 0)  (raise-argument-error 'exists-primitive-root? "Positive-Integer" n)]
-        [(or (= n 1) (= n 2) (= n 4))  #t]
-        [(odd? n)  (odd-prime-power? n)]
-        [else      (odd-prime-power? (quotient n 2))]))
-
-; LEMMA
-;       a in Un is a primitive root
-;  <=>   phi(n)/q
-;       a         <> 1  in Un for all primes q dividing phi(n)
-
-(: primitive-root? : Integer Integer -> Boolean)
-(define (primitive-root? g n)
-  (cond [(g . <= . 0)  (raise-argument-error 'primitive-root? "Positive-Integer" 0 g n)]
-        [(n . <= . 0)  (raise-argument-error 'primitive-root? "Positive-Integer" 1 g n)]
-        [(not (coprime? g n))
-         (error 'primitive-root? "expected coprime arguments; given ~e and ~e" g n)]
-        [else
-         (define phi-n (totient n))
-         (with-modulus n
-           (andmap (λ: ([x : Boolean]) x)
-                   (map (λ: ([q : Natural]) (not (mod= (modexpt g (quotient phi-n q)) 1)))
-                        (prime-divisors phi-n))))]))
-
-; primitive-root : N -> Un
-;  return primitive root of n if one exists,
-;  otherwise return #f
-#;
-(define (primitive-root n)
-  (and (exists-primitive-root? n)
-       (let* ([phi-n (phi n)]
-              [qs    (prime-divisors phi-n)])
-         (define (primitive-root? g)
-           (with-modulus n (andmap (lambda (x) x)
-                                   (map (lambda (q)
-                                          (not (= (expt g (/ phi-n q)) 1)))
-                                        qs))))
-         (let loop ([g 1])
-           (cond
-             [(= g n)                #f]
-             [(not (coprime? g n))   (loop (+ g 1))]
-             [(primitive-root? g)    g]
-             [else                   (loop (+ g 1))])))))
-
-; LEMMA
-;  If Un has a primitive root, then it has phi(phi(n)) primitive roots
-
-; primitive-roots : integer -> list
-;  return list of all primitive roots of Un
-(: primitive-roots : Integer -> (Listof Natural))
-(define (primitive-roots n)
-  (cond [(n . <= . 0)  (raise-argument-error 'primitive-roots "Positive-Integer" n)]
-        [(not (exists-primitive-root? n))  empty]
-        [else
-         (let* ([phi-n (totient n)]
-                [qs    (prime-divisors phi-n)])
-           (: primitive-root? : Natural -> Boolean)
-           (define (primitive-root? g)
-             (with-modulus n
-               (andmap (λ: ([x : Boolean]) x)
-                       (map (λ: ([q : Natural])
-                              (not (mod= (modexpt g (quotient phi-n q)) 1)))
-                            qs))))
-           (let: loop : (Listof Natural)
-             ([g     : Natural          1] 
-              [roots : (Listof Natural) empty])
-             (cond
-               [(= g n)                (reverse roots)]
-               [(not (coprime? g n))   (loop (+ g 1)  roots)]
-               [(primitive-root? g)    (loop (+ g 1) (cons g roots))]
-               [else                   (loop (+ g 1)  roots)])))]))
-
-(: primitive-root : Integer -> (U Natural False))
-(define (primitive-root n)
-  (cond [(n . <= . 0)  (raise-argument-error 'primitive-root "Positive-Integer" n)]
-        [(not (exists-primitive-root? n))  #f]
-        ; U_p^e , p odd
-        [(and (odd-prime-power? n) (not (prime? n)))
-         (define pp (prime-power n))
-         (define p (if pp (first pp) (error 'primitive-root "internal error")))
-         (define gg (primitive-root p))
-         (define g (or gg (error 'primitive-root "internal error")))
-         (if (= (unit-group-order g (* p p)) (totient (* p p)))
-             g
-             (modulo (+ g p) n))]
-        ; U_2p^e , p odd
-        [(and (even? n) (odd-prime? (quotient n 2)))
-         (define gg (primitive-root (quotient n 2)))
-         (define g (or gg (error 'primitive-root "internal error")))
-         (if (odd? g)
-             g
-             (modulo (+ g (quotient n 2)) n))]
-        ; General case
-        [else                                
-         (define phi-n (totient n))
-         (define qs    (prime-divisors phi-n))
-         (: primitive-root? : Natural -> Boolean)
-         (define (primitive-root? g)
-           (with-modulus n
-             (andmap (λ: ([x : Boolean]) x)
-                     (map (λ: ([q : Natural])
-                            (not (mod= (modexpt g (quotient phi-n q)) 1)))
-                          qs))))
-         (let: loop : (U Natural False)
-           ([g : Natural 1])
-           (cond
-             [(= g n)                #f]
-             [(not (coprime? g n))   (loop (+ g 1))]
-             [(primitive-root? g)    g]
-             [else                   (loop (+ g 1))]))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/quadratic-residues.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/quadratic-residues.rkt
deleted file mode 100644
index 06eab941f3..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/quadratic-residues.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang typed/racket/base
-
-(require racket/list
-         "divisibility.rkt"
-         "modular-arithmetic.rkt"
-         "number-theory.rkt")
-
-(provide quadratic-character quadratic-residue?)
-
-; DEFINITION (Quadratic residue)
-;   a in Un is a quadratic residue,
-;   if there exists an s such that a=s^2 (mod n)
-;   The number s is called a squre root of a modulo n.
-
-; p is prime
-(: quadratic-character : Integer Integer -> (U -1 0 1))
-(define (quadratic-character a p)
-  (cond [(a . < . 0)  (raise-argument-error 'quadratic-character "Natural" 0 a p)]
-        [(p . <= . 0)  (raise-argument-error 'quadratic-character "Positive-Integer" 1 a p)]
-        [else  (let ([l  (modular-expt a (quotient (- p 1) 2) p)])
-                 (cond [(or (eqv? l 0) (eqv? l 1))  l]
-                       [else  -1]))]))
-
-(: quadratic-residue? : Integer Integer -> Boolean)
-(define (quadratic-residue? a n)
-  (cond [(a . < . 0)  (raise-argument-error 'quadratic-residue? "Natural" 0 a n)]
-        [(n . <= . 0)  (raise-argument-error 'quadratic-residue? "Positive-Integer" 1 a n)]
-        [else
-         (let* ([ps     (prime-divisors n)]
-                [odd-ps (if (= (first ps) 2)
-                            (rest ps)
-                            ps)])
-           (and (andmap (λ: ([p : Natural]) 
-                          (= (quadratic-character a p) 1))
-                        odd-ps)
-                (cond 
-                  [(divides? 8 n)  (= (modulo a 8) 1)]
-                  [(divides? 4 n)  (= (modulo a 4) 1)]
-                  [else            #t])))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/quadratic.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/quadratic.rkt
deleted file mode 100644
index 1bbc98f9fd..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/quadratic.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang typed/racket/base
-
-(require racket/list
-         "types.rkt")
-
-(provide quadratic-solutions
-         quadratic-integer-solutions
-         quadratic-natural-solutions)
-
-(: quadratic-solutions : Real Real Real -> (Listof Real))
-(define (quadratic-solutions a b c)
-  ; return list of solutions to a a x^2 + b x + c = 0
-  (let ([d (- (* b b) (* 4 a c))])
-    (cond
-      [(< d 0) '()]
-      [(= d 0) (list (/ b (* -2 a)))]
-      [else
-       (let ([sqrt-d (sqrt d)])
-         (list (/ (- (- b) sqrt-d) (* 2 a))
-               (/ (+ (- b) sqrt-d) (* 2 a))))])))
-
-(: quadratic-integer-solutions : Real Real Real -> (Listof Integer))
-(define (quadratic-integer-solutions a b c)
-  ; return list of integer solutions to a x^2 + b x + c = 0
-  (filter exact-integer? (quadratic-solutions a b c)))
-
-(: quadratic-natural-solutions : Real Real Real -> (Listof Natural))
-(define (quadratic-natural-solutions a b c)
-  ; return list of nonnegative-integer solutions to a x^2 + b x + c = 0
-  (filter natural? (quadratic-solutions a b c)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/small-primes.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/small-primes.rkt
deleted file mode 100644
index 99de3f317f..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/small-primes.rkt
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang typed/racket
-(require/typed 
- data/bit-vector               
- [#:opaque BitVector bit-vector?]
- [make-bit-vector (Integer Boolean -> BitVector)]
- [bit-vector-set! (BitVector Integer Boolean -> Void)]
- [bit-vector-ref  (BitVector Integer -> Boolean)])
-
-(provide small-prime?
-         *SMALL-PRIME-LIMIT*)
-
-; The moduli mod 60 that 2, 3 and 5 do not divide are:
-(: non-235 (Listof Positive-Byte))
-(define non-235 '(1 7 11 13 17 19 23 29 31 37 41 43 47 49 53 59))
-; Note that there are exactly 16 of these moduli, so they fit in a u16.
-; That is, a single u16 can represent a block of 60 numbers.
-
-(: mod60->bits (Vectorof (U #f Byte)))
-(define mod60->bits (make-vector 60 #f))
-(for ([x : Positive-Byte (in-list non-235)]
-      [b (in-naturals)])
-  (vector-set! mod60->bits x (assert b byte?)))
-
-(: mod60->bit (Byte -> (U #f Byte)))
-(define (mod60->bit m) (vector-ref mod60->bits m))
-
-(: *number-of-groups* Positive-Fixnum)
-(define *number-of-groups* 17000) ; each group contain 16 numbers
-(: *SMALL-PRIME-LIMIT* Nonnegative-Fixnum)
-(define *SMALL-PRIME-LIMIT* (assert (- (* 60 *number-of-groups*) 1) fixnum?))
-
-; primes holds (* 16 *number-of-groups*) bits
-; each representing a number not congruent to 2, 3, 5
-(define primes (make-bit-vector (* (length non-235) *number-of-groups*) #t))
-
-(define: (clear-bit! [x : Nonnegative-Fixnum]) : Void
-  (define q (quotient x 60))
-  (define b (mod60->bit (remainder x 60)))
-  (when b (bit-vector-set! primes (+ (* q 16) b) #f)))
-
-(define: (inner-bit [q : Nonnegative-Fixnum] [r : Byte]) : Boolean
-  (define b (mod60->bit r))
-  (if b 
-      (bit-vector-ref primes (+ (* q 16) b))
-      #f))
-
-(define: (bit [x : Nonnegative-Fixnum]) : Boolean
-  (define q (quotient x 60))
-  (define r (remainder x 60))
-  (inner-bit q r))
-
-
-(define: (mark-composites [x : Nonnegative-Fixnum]) : Void
-  ; x is prime => mark n*x as prime for all n
-  ; Well 2*x, 3*x, 4*x, 5*x, 6*x are not in our table,
-  ; so only mark the multiples that are not divisible by 2, 3, or 5.
-  (let/ec: exit : Void
-    (let: loop : Void ([a : Nonnegative-Fixnum 0])
-      (define y-base (* a 60 x))
-      (for: ([d : Positive-Byte (in-list non-235)])
-        (define y (assert (+ y-base (* d x)) fixnum?))
-        (when (not (= y x))
-          (if (<= y *SMALL-PRIME-LIMIT*)
-              (clear-bit! y)
-              (exit (void)))))
-      (loop (assert (add1 a) fixnum?)))))
-
-(define: sieve-done? : Boolean  #f)
-
-(define: (sieve) : Void
-  (clear-bit! 1) ; 1 is not prime
-  (let/ec: exit : Void
-    (let: loop : Void ([q : Nonnegative-Fixnum 0])
-      (for: ([r : Positive-Byte (in-list non-235)])
-        (define x (assert (+ (* q 60) r) fixnum?))
-        (when (> (* x x) *SMALL-PRIME-LIMIT*)
-          (exit (void)))
-        (when (inner-bit q r) ; x is prime
-          (mark-composites x)))
-      (loop (assert (add1 q) fixnum?)))))
-
-(define: (small-prime? [x : Nonnegative-Fixnum]) : Boolean
-  (unless sieve-done?
-    (sieve)
-    (set! sieve-done? #t))
-  (or (= x 2) (= x 3) (= x 5) (bit x)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/tangent-number.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/tangent-number.rkt
deleted file mode 100644
index b38867e5be..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/tangent-number.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang typed/racket/base
-
-(provide tangent-number)
-
-(: tangent-number : Integer -> Natural)
-;  The n'th tangent number:
-;  <http://mathworld.wolfram.com/TangentNumber.html>
-(define (tangent-number n)
-  (cond [(n . < . 0)  (raise-argument-error 'tangent-number "Natural" n)]
-        [else
-         ; Implementation note:
-         ;   See "Concrete Mathematics" p 287 for the method
-         (define: T : (Vectorof Natural) (make-vector (+ n 2) 0))
-         ; T[x]=x
-         (vector-set! T 1 1)
-         (for: ([k : Natural (in-range (+ n 1))])
-           ; differentiate T[x]
-           (for: ([i : Natural (in-range (+ k 1))])
-             (vector-set! T i (* (add1 i) (vector-ref T (add1 i)))))
-           (vector-set! T k 0)
-           ; multiply T[x] with 1+x^2
-           (for: ([i : Integer (in-range (+ k 1) 1 -1)])
-             (vector-set! T i (+ (vector-ref T i) (vector-ref T (- i 2))))))
-         (vector-ref T 0)]))
-
diff --git a/pkgs/math-pkgs/math-lib/math/private/number-theory/types.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/types.rkt
deleted file mode 100644
index ac1217f62f..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/number-theory/types.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed/racket
-
-(provide cast natural? exact-zero?)
-
-(define-syntax (cast stx) (syntax-case stx () [(_ . more) #'(assert . more)]))
-; Note: (cast val predicate) is used in the code, where
-; the math says predicate must be true, but the type system
-; can prove it. Replace assert with a "proper" cast when
-; it appears in Typed Racket.
-
-(define natural? exact-nonnegative-integer?)
-(define-predicate exact-zero? Zero)
diff --git a/pkgs/math-pkgs/math-lib/math/private/parameters.rkt b/pkgs/math-pkgs/math-lib/math/private/parameters.rkt
deleted file mode 100644
index 6d001d519c..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/parameters.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang typed/racket/base
-
-(require racket/future)
-
-(provide max-math-threads
-         dft-convention
-         dft-inverse-convention)
-
-(: max-math-threads (Parameterof Positive-Integer))
-(define max-math-threads (make-parameter (max 1 (processor-count))))
-
-(: dft-convention (Parameterof (List Real Real)))
-(define dft-convention (make-parameter (list 1 -1)))
-
-(: dft-inverse-convention (-> (List Real Real)))
-(define (dft-inverse-convention)
-  (define c (dft-convention))
-  (define a (car c))
-  (define b (cadr c))
-  (list (- a) (- b)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/polynomial/chebyshev.rkt b/pkgs/math-pkgs/math-lib/math/private/polynomial/chebyshev.rkt
deleted file mode 100644
index e9b61653e5..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/polynomial/chebyshev.rkt
+++ /dev/null
@@ -1,127 +0,0 @@
-#lang typed/racket/base
-
-(require (for-syntax racket/base syntax/parse)
-         racket/vector
-         "../../base.rkt"
-         "../../bigfloat.rkt"
-         "../flonum/flonum-functions.rkt"
-         "../unsafe.rkt")
-
-(provide chebyshev-poly chebyshev-poly? chebyshev-poly-min chebyshev-poly-max chebyshev-poly-coefs
-         chebyshev-poly-order chebyshev-poly-convert
-         build-chebyshev-poly build-chebyshev-flpoly build-chebyshev-bfpoly
-         chebyshev-poly-fun chebyshev-flpoly-fun chebyshev-bfpoly-fun
-         inline-chebyshev-flpoly-fun)
-
-(struct: (A) chebyshev-poly ([min : A] [max : A] [coefs : (Vectorof A)]) #:transparent)
-
-(: chebyshev-poly-order (All (A) ((chebyshev-poly A) -> Index)))
-(define (chebyshev-poly-order p)
-  (define n (vector-length (chebyshev-poly-coefs p)))
-  (if (zero? n) 0 (- n 1)))
-
-(: chebyshev-poly-convert (All (A B) ((chebyshev-poly A) (A -> B) -> (chebyshev-poly B))))
-(define (chebyshev-poly-convert p conv)
-  (define mn (chebyshev-poly-min p))
-  (define mx (chebyshev-poly-max p))
-  (define cs (chebyshev-poly-coefs p))
-  (chebyshev-poly (conv mn) (conv mx) (vector-map conv cs)))
-
-#;
-(: make-build-chebyshev-poly
-   (All (A) ((A A -> A) (A A -> A) (A A -> A) (A A -> A) (A -> A) (Integer -> A) (-> A)
-                        -> (A A Integer (A -> A) -> (chebyshev-poly A)))))
-(define-syntax-rule (make-build-chebyshev-poly A num+ num- num* num/ numcos int->num pi-thnk)
-  (λ: ([mn : A] [mx : A] [n : Integer] [f : (A -> A)])
-    (define 0.num (int->num 0))
-    (define 1.num (int->num 1))
-    (define 2.num (int->num 2))
-    (define 1/2.num (num/ 1.num 2.num))
-    (define pi.num (pi-thnk))
-    (define mx-mn (num- mx mn))
-    (define mn+mx (num+ mn mx))
-    (let ([n.num  (int->num n)])
-      (define norm (num/ 2.num n.num))
-      (define cs
-        (for/vector: #:length n ([j  (in-range n)]) : A
-          (let ([j  (int->num j)])
-            (num* (for/fold: ([cj : A  0.num]) ([k  (in-range n)])
-                    (define θ (num/ (num* pi.num (num+ (int->num k) 1/2.num)) n.num))
-                    (define x (num* 1/2.num (num+ (num* mx-mn (numcos θ)) mn+mx)))
-                    (num+ cj (num* (f x) (numcos (num* θ j)))))
-                  norm))))
-      (chebyshev-poly mn mx cs))))
-
-#;
-(: make-chebyshev-poly-fun
-   (All (A) ((A A -> A) (A A -> A) (A A -> A) (A A -> A) (Integer -> A)
-                        -> ((chebyshev-poly A) -> (A -> A)))))
-(define-syntax-rule (make-chebyshev-poly-fun A num+ num- num* num/ int->num)
-  (λ: ([p : (chebyshev-poly A)])
-    (define cs (chebyshev-poly-coefs p))
-    (define n (vector-length cs))
-    (define 0.num (int->num 0))
-    (define 2.num (int->num 2))
-    (cond
-      [(zero? n)  (λ: ([x : A]) 0.num)]
-      [else
-       (define mn (chebyshev-poly-min p))
-       (define mx (chebyshev-poly-max p))
-       (λ: ([x : A])
-         (define i (- n 1))
-         (define c (unsafe-vector-ref cs i))
-         (define y (num/ (num- (num* x 2.num) (num+ mn mx))
-                         (num- mx mn)))
-         (define y2 (num* y 2.num))
-         (let: loop : A ([i : Nonnegative-Fixnum  i]
-                         [c : A  c]
-                         [d : A  0.num]
-                         [dd : A  0.num])
-           (cond [(zero? i)  (num+ (num* y d) (num- (num/ c 2.num) dd))]
-                 [else
-                  (let ([d   (num+ (num* y2 d) (num- c dd))]
-                        [dd  d])
-                    (loop (- i 1) (unsafe-vector-ref cs (- i 1)) d dd))])))])))
-
-(define build-chebyshev-poly
-  (make-build-chebyshev-poly Real + - * / cos (λ (x) x) (λ () pi)))
-
-(define build-chebyshev-flpoly
-  (make-build-chebyshev-poly Float fl+ fl- fl* fl/ flcos ->fl (λ () pi)))
-
-(define build-chebyshev-bfpoly
-  (make-build-chebyshev-poly Bigfloat bf+ bf- bf* bf/ bfcos bf (λ () pi.bf)))
-
-(define chebyshev-poly-fun
-  (make-chebyshev-poly-fun Real + - * / (λ (x) x)))
-
-(define chebyshev-flpoly-fun
-  (make-chebyshev-poly-fun Float fl+ fl- fl* fl/ ->fl))
-
-(define chebyshev-bfpoly-fun
-  (make-chebyshev-poly-fun Bigfloat bf+ bf- bf* bf/ bf))
-
-(define-syntax (chebyshev-iter stx)
-  (syntax-case stx ()
-    [(_ y y2 d dd ())  (syntax/loc stx d)]
-    [(_ y y2 d dd (c0))
-     (syntax/loc stx
-       (fl+ (fl* y d) (fl- (fl/ c0 2.0) dd)))]
-    [(_ y y2 d dd (c0 c ...))
-     (syntax/loc stx
-       (let ([d   (fl+ (fl* y2 d) (fl- c0 dd))]
-             [dd  d])
-         (chebyshev-iter y y2 d dd (c ...))))]))
-
-(define-syntax (inline-chebyshev-flpoly-fun stx)
-  (syntax-parse stx
-    [(_ lower:expr upper:expr (c0:expr c:expr ...))
-     (with-syntax ([(c0 c ...)  (reverse (syntax->list #'(c0 c ...)))])
-       (syntax/loc stx
-         (λ: ([z : Float])
-           (define y (fl/ (fl- (fl+ z z) (fl+ lower upper))
-                          (fl- upper lower)))
-           (define y2 (fl+ y y))
-           (let ([d   0.0]
-                 [dd  0.0])
-             (chebyshev-iter y y2 d dd (c ...))))))]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/statistics/correlation.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/correlation.rkt
deleted file mode 100644
index 1a11fe818a..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/statistics/correlation.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang typed/racket/base
-
-(require racket/sequence
-         racket/list
-         "../../base.rkt"
-         "../../flonum.rkt"
-         "expected-values.rkt"
-         "statistics-utils.rkt")
-
-(provide covariance/means
-         correlation/means
-         covariance
-         correlation)
-
-(: covariance* (Symbol Real Real (Sequenceof Real) (Sequenceof Real) (Option (Sequenceof Real))
-                       (U #t #f Real) -> Real))
-(define (covariance* name mx my xs ys ws bias)
-  (define-values (zs n)
-    (cond [ws  (let-values ([(xs ws)  (sequences->weighted-samples name xs ws)]
-                            [(ys)  (sequence->list ys)])
-                 (check-lengths! name "value sequences" xs ys (length xs) (length ys))
-                 (values (map (λ: ([x : Real] [y : Real] [w : Real]) (* w (- x mx) (- y my)))
-                              xs ys ws)
-                         (max 0 (sum ws))))]
-          [else  (let ([xs  (sequence->list xs)]
-                       [ys  (sequence->list ys)])
-                   (check-lengths! name "value sequences" xs ys (length xs) (length ys))
-                   (values (map (λ: ([x : Real] [y : Real]) (* (- x mx) (- y my))) xs ys)
-                           (length xs)))]))
-  (define m2 (/ (sum zs) n))
-  (adjust-covariance m2 n bias))
-
-(: covariance/means (case-> (Real Real (Sequenceof Real) (Sequenceof Real)
-                                  [#:bias (U #t #f Real)] -> Real)
-                            (Real Real (Sequenceof Real) (Sequenceof Real) (Option (Sequenceof Real))
-                                  [#:bias (U #t #f Real)] -> Real)))
-(define (covariance/means mx my xs ys [ws #f] #:bias [bias #f])
-  (covariance* 'covariance/means mx my xs ys ws bias))
-
-(: covariance (case-> ((Sequenceof Real) (Sequenceof Real) [#:bias (U #t #f Real)] -> Real)
-                      ((Sequenceof Real) (Sequenceof Real) (Option (Sequenceof Real))
-                                         [#:bias (U #t #f Real)] -> Real)))
-(define (covariance xs ys [ws #f] #:bias [bias #f])
-  (covariance* 'covariance (mean xs ws) (mean ys ws) xs ys ws bias))
-
-(: correlation/means (case-> (Real Real (Sequenceof Real) (Sequenceof Real)
-                                   [#:bias (U #t #f Real)] -> Real)
-                             (Real Real (Sequenceof Real) (Sequenceof Real) (Option (Sequenceof Real))
-                                   [#:bias (U #t #f Real)] -> Real)))
-(define (correlation/means mx my xs ys [ws #f] #:bias [bias #f])
-  (define g (covariance/means mx my xs ys ws #:bias bias))
-  (define sx (stddev/mean mx xs ws #:bias bias))
-  (define sy (stddev/mean my ys ws #:bias bias))
-  (cond [(zero? sx)  +nan.0]
-        [(zero? sy)  +nan.0]
-        [else  (/ g sx sy)]))
-
-(: correlation (case-> ((Sequenceof Real) (Sequenceof Real) [#:bias (U #t #f Real)] -> Real)
-                       ((Sequenceof Real) (Sequenceof Real) (Option (Sequenceof Real))
-                                          [#:bias (U #t #f Real)] -> Real)))
-(define (correlation xs ys [ws #f] #:bias [bias #f])
-  (correlation/means (mean xs ws) (mean ys ws) xs ys ws #:bias bias))
diff --git a/pkgs/math-pkgs/math-lib/math/private/statistics/counting.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/counting.rkt
deleted file mode 100644
index 00cc3fe433..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/statistics/counting.rkt
+++ /dev/null
@@ -1,170 +0,0 @@
-#lang typed/racket/base
-
-(require racket/list
-         racket/sequence
-         "../../base.rkt"
-         "../unsafe.rkt"
-         "statistics-utils.rkt")
-
-(provide samples->hash
-         count-samples
-         (struct-out sample-bin)
-         sample-bin-compact
-         sample-bin-total
-         bin-samples
-         bin-samples/key)
-
-;; ===================================================================================================
-;; Hashing
-
-(: unweighted-samples->hash (All (A) ((Sequenceof A) -> (HashTable A Positive-Integer))))
-(define (unweighted-samples->hash xs)
-  (define: h : (HashTable A Positive-Integer)  (make-hash))
-  (for: ([x : A  xs])
-    (hash-set! h x (unsafe-fx+ 1 (hash-ref h x (λ () 0)))))
-  h)
-
-(: weighted-samples->hash (All (A) ((Sequenceof A) (Sequenceof Real)
-                                                   -> (HashTable A Nonnegative-Real))))
-(define (weighted-samples->hash xs ws)
-  (let-values ([(xs ws)  (sequences->weighted-samples 'samples->hash xs ws)])
-    (define: h : (HashTable A Nonnegative-Real)  (make-hash))
-    (for: ([x : A  xs] [w : Nonnegative-Real  ws])
-      (hash-set! h x (+ w (hash-ref h x (λ () 0)))))
-    h))
-
-(: samples->hash
-   (All (A) (case-> ((Sequenceof A) -> (HashTable A Positive-Integer))
-                    ((Sequenceof A) (U #f (Sequenceof Real)) -> (HashTable A Nonnegative-Real)))))
-(define samples->hash
-  (case-lambda
-    [(xs)  (unweighted-samples->hash xs)]
-    [(xs ws)  (cond [ws    (weighted-samples->hash xs ws)]
-                    [else  (weighted-samples->hash xs (sequence-map (λ (_) 1) xs))])]))
-
-;; ===================================================================================================
-;; Counting
-
-(: count-unweighted-samples
-   (All (A) ((Sequenceof A) -> (Values (Listof A) (Listof Positive-Integer)))))
-(define (count-unweighted-samples xs)
-  (let ([xs  (sequence->list xs)])
-    (define h (samples->hash xs))
-    (let ([xs  (remove-duplicates xs)])
-      (values xs (map (λ: ([x : A]) (hash-ref h x)) xs)))))
-
-(: count-weighted-samples
-   (All (A) ((Sequenceof A) (Sequenceof Real) -> (Values (Listof A) (Listof Nonnegative-Real)))))
-(define (count-weighted-samples xs ws)
-  (let-values ([(xs ws)  (sequences->weighted-samples 'count-samples xs ws)])
-    (define h (weighted-samples->hash xs ws))
-    (let ([xs  (remove-duplicates xs)])
-      (values xs (map (λ: ([x : A]) (hash-ref h x)) xs)))))
-
-(: count-samples
-   (All (A) (case-> ((Sequenceof A) -> (Values (Listof A) (Listof Positive-Integer)))
-                    ((Sequenceof A) (U #f (Sequenceof Real))
-                                    -> (Values (Listof A) (Listof Nonnegative-Real))))))
-(define count-samples
-  (case-lambda
-    [(xs)  (count-unweighted-samples xs)]
-    [(xs ws)  (if ws (count-weighted-samples xs ws) (count-unweighted-samples xs))]))
-
-;; ===================================================================================================
-;; Bins
-
-(struct: (A B) sample-bin
-  ([min : B] [max : B] [values : (Listof A)] [weights : (U #f (Listof Nonnegative-Real))])
-  #:transparent)
-
-(: sample-bin-compact (All (A B) ((sample-bin A B) -> (sample-bin A B))))
-(define (sample-bin-compact bin)
-  (let-values ([(xs ws)  (count-samples (sample-bin-values bin) (sample-bin-weights bin))])
-    (sample-bin (sample-bin-min bin) (sample-bin-max bin) xs ws)))
-
-(: sample-bin-total (All (A B) ((sample-bin A B) -> Nonnegative-Real)))
-(define (sample-bin-total bin)
-  (define ws (sample-bin-weights bin))
-  (if ws (assert (sum ws) nonnegative?) (length (sample-bin-values bin))))
-
-;; ===================================================================================================
-;; Binning
-
-(: list-split-after (All (A) ((Listof A) (A -> Any) -> (Values (Listof A) (Listof A)))))
-(define (list-split-after xs pred?)
-  (let: loop : (Values (Listof A) (Listof A)) ([xs : (Listof A)  xs]
-                                               [ys : (Listof A)  empty])
-    (cond [(empty? xs)  (values (reverse ys) xs)]
-          [else
-           (define x (first xs))
-           (cond [(pred? x)  (loop (rest xs) (cons x ys))]
-                 [else  (values (reverse ys) xs)])])))
-
-(: bin-unweighted-samples/key
-   (All (A B) ((Sequenceof B) (B B -> Any) (A -> B) (Sequenceof A) -> (Listof (sample-bin A B)))))
-(define (bin-unweighted-samples/key bnds lte? key xs)
-  (: lt? (B B -> Boolean))
-  (define (lt? x1 x2)
-    (and (lte? x1 x2) (not (lte? x2 x1))))
-  (let* ([bnds  (sort (sequence->list bnds) lt?)]
-         [xs    (sequence->list xs)]
-         [xks   (map (λ: ([x : A]) (cons x (key x))) xs)]
-         [xks   (sort xks (λ: ([xk1 : (Pair A B)] [xk2 : (Pair A B)])
-                            (lt? (cdr xk1) (cdr xk2))))])
-    (cond
-      [(empty? bnds)
-       (cond [(empty? xks)  empty]
-             [else  (define min (cdr (first xks)))
-                    (define max (cdr (last xks)))
-                    (list (sample-bin min max (map (inst car A B) xks) #f))])]
-      [else
-       (let: loop : (Listof (sample-bin A B)) ([min : (U #f B)  #f]
-                                               [max : B  (first bnds)]
-                                               [bnds : (Listof B)  (rest bnds)]
-                                               [xks : (Listof (Pair A B))  xks]
-                                               [bins : (Listof (sample-bin A B))  empty])
-         (let-values ([(yks xks)  (list-split-after xks (λ: ([xk : (Pair A B)])
-                                                          (lte? (cdr xk) max)))])
-           (define maybe-bin
-             (cond [min  (list (sample-bin min max (map (inst car A B) yks) #f))]
-                   [(empty? yks)  empty]
-                   [else  (list (sample-bin (cdr (first yks)) max (map (inst car A B) yks) #f))]))
-           (cond [(empty? bnds)
-                  (cond [(empty? xks)  (reverse (append maybe-bin bins))]
-                        [else
-                         (define bin2
-                           (sample-bin max (cdr (last xks)) (map (inst car A B) xks) #f))
-                         (reverse (append (cons bin2 maybe-bin) bins))])]
-                 [else
-                  (loop max (first bnds) (rest bnds) xks (append maybe-bin bins))])))])))
-
-(: bin-weighted-samples/key
-   (All (A B) ((Sequenceof B) (B B -> Any) (A -> B) (Sequenceof A) (Sequenceof Real)
-                              -> (Listof (sample-bin A B)))))
-(define (bin-weighted-samples/key bnds lte? key xs ws)
-  (let-values ([(xs ws)  (sequences->weighted-samples 'bin-samples/key xs ws)])
-    (define xws (map (inst cons A Nonnegative-Real) xs ws))
-    (define xw-key (λ: ([xw : (Pair A Nonnegative-Real)]) (key (car xw))))
-    (map (λ: ([bin : (sample-bin (Pair A Nonnegative-Real) B)])
-           (define xws (sample-bin-values bin))
-           (sample-bin (sample-bin-min bin)
-                       (sample-bin-max bin)
-                       (map (inst car A Nonnegative-Real) xws)
-                       (map (inst cdr A Nonnegative-Real) xws)))
-         (bin-unweighted-samples/key bnds lte? xw-key xws))))
-
-(: bin-samples/key
-   (All (A B)
-        (case-> ((Sequenceof B) (B B -> Any) (A -> B) (Sequenceof A) -> (Listof (sample-bin A B)))
-                ((Sequenceof B) (B B -> Any) (A -> B) (Sequenceof A) (U #f (Sequenceof Real))
-                                -> (Listof (sample-bin A B))))))
-(define (bin-samples/key bnds lte? key xs [ws #f])
-  (cond [ws    (bin-weighted-samples/key bnds lte? key xs ws)]
-        [else  (bin-unweighted-samples/key bnds lte? key xs)]))
-
-(: bin-samples
-   (All (A) (case-> ((Sequenceof A) (A A -> Any) (Sequenceof A) -> (Listof (sample-bin A A)))
-                    ((Sequenceof A) (A A -> Any) (Sequenceof A) (Sequenceof Real)
-                                    -> (Listof (sample-bin A A))))))
-(define (bin-samples bnds lte? xs [ws #f])
-  (bin-samples/key bnds lte? (λ: ([x : A]) x) xs ws))
diff --git a/pkgs/math-pkgs/math-lib/math/private/statistics/expected-values.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/expected-values.rkt
deleted file mode 100644
index 39f3780a44..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/statistics/expected-values.rkt
+++ /dev/null
@@ -1,131 +0,0 @@
-#lang typed/racket/base
-
-(require racket/sequence
-         "../../base.rkt"
-         "statistics-utils.rkt")
-
-(provide mean
-         variance/mean
-         stddev/mean
-         skewness/mean
-         kurtosis/mean
-         variance
-         stddev
-         skewness
-         kurtosis)
-
-(: mean (case-> ((Sequenceof Real) -> Real)
-                ((Sequenceof Real) (Option (Sequenceof Real)) -> Real)))
-(define (mean xs [ws #f])
-  (cond [ws  (let-values ([(xs ws)  (sequences->weighted-samples 'mean xs ws)])
-               (define n (sum ws))
-               (cond [(zero? n)  +nan.0]
-                     [else  (/ (sum (map * xs ws)) n)]))]
-        [else  (let ([xs  (sequence->list xs)])
-                 (define n (length xs))
-                 (cond [(zero? n)  +nan.0]
-                       [else  (/ (sum xs) n)]))]))
-
-(: variance* (Symbol Real (Sequenceof Real) (Option (Sequenceof Real)) (U #t #f Real)
-                     -> Nonnegative-Real))
-(define (variance* name m xs ws bias)
-  (define-values (xs^2 n)
-    (cond [ws  (let-values ([(xs ws)  (sequences->weighted-samples name xs ws)])
-                 (values (map (λ: ([x : Real] [w : Real]) (* w (sqr (- x m)))) xs ws)
-                         (max 0 (sum ws))))]
-          [else  (let ([xs  (sequence->list xs)])
-                   (values (map (λ: ([x : Real]) (sqr (- x m))) xs)
-                           (length xs)))]))
-  (cond [(zero? n)  +nan.0]
-        [else
-         (define m2 (max 0 (/ (sum xs^2) n)))
-         (adjust-variance m2 n bias)]))
-
-(: skewness* (Symbol Real (Sequenceof Real) (Option (Sequenceof Real)) (U #t #f Real) -> Real))
-(define (skewness* name m xs ws bias)
-  (define-values (xs^2 xs^3 n)
-    (cond [ws  (let-values ([(xs ws)  (sequences->weighted-samples name xs ws)])
-                 (values (map (λ: ([x : Real] [w : Real]) (* w (sqr (- x m)))) xs ws)
-                         (map (λ: ([x : Real] [w : Real]) (* w (expt (- x m) 3))) xs ws)
-                         (max 0 (sum ws))))]
-          [else  (let ([xs  (sequence->list xs)])
-                   (values (map (λ: ([x : Real]) (sqr (- x m))) xs)
-                           (map (λ: ([x : Real]) (expt (- x m) 3)) xs)
-                           (length xs)))]))
-  (cond [(zero? n)  +nan.0]
-        [else
-         (define m2 (expt (max 0 (sum xs^2)) 3/2))
-         (cond [(zero? m2)  +nan.0]
-               [else
-                (define m3 (sum xs^3))
-                (adjust-skewness (/ (* m3 (sqrt n)) m2) n bias)])]))
-
-(: kurtosis* (Symbol Real (Sequenceof Real) (Option (Sequenceof Real)) (U #t #f Real)
-                     -> Nonnegative-Real))
-(define (kurtosis* name m xs ws bias)
-  (define-values (xs^2 xs^4 n)
-    (cond [ws  (let-values ([(xs ws)  (sequences->weighted-samples name xs ws)])
-                 (values (map (λ: ([x : Real] [w : Real]) (* w (sqr (- x m)))) xs ws)
-                         (map (λ: ([x : Real] [w : Real]) (* w (expt (- x m) 4))) xs ws)
-                         (max 0 (sum ws))))]
-          [else  (let ([xs  (sequence->list xs)])
-                   (values (map (λ: ([x : Real]) (sqr (- x m))) xs)
-                           (map (λ: ([x : Real]) (expt (- x m) 4)) xs)
-                           (length xs)))]))
-  (cond [(zero? n)  +nan.0]
-        [else
-         (define m2 (sum xs^2))
-         (cond [(zero? m2)  +nan.0]
-               [else
-                (define m4 (sum xs^4))
-                (adjust-kurtosis (max 0 (/ (* (/ m4 m2) n) m2)) n bias)])]))
-
-;; ===================================================================================================
-;; User-facing functions
-
-(: variance/mean (case-> (Real (Sequenceof Real) [#:bias (U #t #f Real)] -> Nonnegative-Real)
-                         (Real (Sequenceof Real) (Option (Sequenceof Real)) [#:bias (U #t #f Real)]
-                               -> Nonnegative-Real)))
-(define (variance/mean m xs [ws #f] #:bias [bias #f])
-  (variance* 'variance/mean m xs ws bias))
-
-(: variance (case-> ((Sequenceof Real) [#:bias (U #t #f Real)] -> Nonnegative-Real)
-                    ((Sequenceof Real) (Option (Sequenceof Real)) [#:bias (U #t #f Real)]
-                                       -> Nonnegative-Real)))
-(define (variance xs [ws #f] #:bias [bias #f])
-  (variance* 'variance (mean xs ws) xs ws bias))
-
-(: stddev/mean (case-> (Real (Sequenceof Real) [#:bias (U #t #f Real)] -> Nonnegative-Real)
-                       (Real (Sequenceof Real) (Option (Sequenceof Real)) [#:bias (U #t #f Real)]
-                             -> Nonnegative-Real)))
-(define (stddev/mean m xs [ws #f] #:bias [bias #f])
-  (sqrt (variance* 'stddev/mean (mean xs ws) xs ws bias)))
-
-(: stddev (case-> ((Sequenceof Real) [#:bias (U #t #f Real)] -> Nonnegative-Real)
-                  ((Sequenceof Real) (Option (Sequenceof Real)) [#:bias (U #t #f Real)]
-                                     -> Nonnegative-Real)))
-(define (stddev xs [ws #f] #:bias [bias #f])
-  (sqrt (variance* 'stddev (mean xs ws) xs ws bias)))
-
-(: skewness/mean (case-> (Real (Sequenceof Real) [#:bias (U #t #f Real)] -> Real)
-                         (Real (Sequenceof Real) (Option (Sequenceof Real)) [#:bias (U #t #f Real)]
-                               -> Real)))
-(define (skewness/mean m xs [ws #f] #:bias [bias #f])
-  (skewness* 'skewness/mean m xs ws bias))
-
-(: skewness (case-> ((Sequenceof Real) [#:bias (U #t #f Real)] -> Real)
-                    ((Sequenceof Real) (Option (Sequenceof Real)) [#:bias (U #t #f Real)] -> Real)))
-(define (skewness xs [ws #f] #:bias [bias #f])
-  (skewness* 'skewness (mean xs ws) xs ws bias))
-
-(: kurtosis/mean (case-> (Real (Sequenceof Real) [#:bias (U #t #f Real)] -> Nonnegative-Real)
-                         (Real (Sequenceof Real) (Option (Sequenceof Real)) [#:bias (U #t #f Real)]
-                               -> Nonnegative-Real)))
-(define (kurtosis/mean m xs [ws #f] #:bias [bias #f])
-  (kurtosis* 'kurtosis/mean m xs ws bias))
-
-(: kurtosis (case-> ((Sequenceof Real) [#:bias (U #t #f Real)] -> Nonnegative-Real)
-                    ((Sequenceof Real) (Option (Sequenceof Real)) [#:bias (U #t #f Real)]
-                                       -> Nonnegative-Real)))
-(define (kurtosis xs [ws #f] #:bias [bias #f])
-  (kurtosis* 'kurtosis (mean xs ws) xs ws bias))
diff --git a/pkgs/math-pkgs/math-lib/math/private/statistics/hpd-interval.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/hpd-interval.rkt
deleted file mode 100644
index 0c574d511d..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/statistics/hpd-interval.rkt
+++ /dev/null
@@ -1,103 +0,0 @@
-#lang typed/racket
-
-(require "../../flonum.rkt"
-         "order-statistics.rkt"
-         "statistics-utils.rkt")
-
-(provide hpd-interval
-         hpd-interval/sorted
-         real-hpd-interval
-         real-hpd-interval/sorted)
-
-(: unweighted-hpd-interval (All (A) (-> Symbol (-> A A Real) Real (Listof A) (Values A A))))
-(define (unweighted-hpd-interval name metric α xs)
-  (define n (length xs))
-  (define m (exact-ceiling (* n α)))
-  (define as (take xs m))
-  (define bs (drop xs m))
-  (cond
-    [(empty? as)  (error name "interval is empty; given ~e ~e" α xs)]
-    [(empty? bs)  (values (first as) (last as))]
-    [else
-     (define a* (first as))
-     (define b* (first bs))
-     (define d* (abs (metric b* a*)))
-     (define-values (a b _)
-       (for/fold: ([a* : A  a*] [b* : A  b*] [d* : Real  d*]) ([a  (in-list as)]
-                                                               [b  (in-list bs)])
-         (define d (abs (metric b a)))
-         (if (d . < . d*) (values a b d) (values a* b* d*))))
-     (values a b)]))
-
-(: weighted-hpd-interval (All (A) (-> Symbol (-> A A Real) Real (Listof A) (Listof Nonnegative-Real)
-                                      (Values A A))))
-(define (weighted-hpd-interval name metric α xs ws)
-  (let* ([xs  (list->vector xs)]
-         [ws  (weights->normalized-weights name ws)]
-         [ws  (flvector-sums (list->flvector ws))])
-    (define n (vector-length xs))
-    
-    (: find-new-endpoint (Index Index -> (Option Index)))
-    ;; Returns the next index after i1 for which the sum of weights >= α
-    (define (find-new-endpoint i0 i1)
-      (define w0 (flvector-ref ws i0))
-      (let loop ([i1 : Nonnegative-Fixnum  i1])
-        (cond [(i1 . < . n)
-               (cond [((- (flvector-ref ws i1) w0) . >= . α)  i1]
-                     [else  (loop (+ i1 1))])]
-              [else  #f])))
-    
-    (define i1 (find-new-endpoint 0 0))
-    (cond
-      [(not i1)  (values (vector-ref xs 0) (vector-ref xs (- n 1)))]
-      [else
-       (define a* (vector-ref xs 0))
-       (define b* (vector-ref xs i1))
-       (define d* (abs (metric b* a*)))
-       (let loop ([i0 : Nonnegative-Fixnum  1] [i1 : Index  i1] [a* a*] [b* b*] [d* d*])
-         ;(printf "i0 = ~v  i1 = ~v~na* = ~v  b* = ~v~nd* = ~v~n" i0 i1 a* b* d*)
-         (cond [(i0 . >= . n)  (values a* b*)]
-               [else
-                (let ([i1  (find-new-endpoint i0 i1)])
-                  (cond [(not i1)  (values a* b*)]
-                        [else
-                         ;(printf "α = ~v~n~n" (- (flvector-ref ws i1) (flvector-ref ws i0)))
-                         (define a (vector-ref xs i0))
-                         (define b (vector-ref xs i1))
-                         (define d (abs (metric b a)))
-                         (cond [(d . < . d*)  (loop (+ i0 1) i1 a b d)]
-                               [else          (loop (+ i0 1) i1 a* b* d*)])]))]))])))
-
-
-(: hpd-interval/sorted (All (A) (->* [(-> A A Real) Real (Sequenceof A)]
-                                     [(Option (Sequenceof Real))]
-                                     (Values A A))))
-(define (hpd-interval/sorted metric α xs [ws #f])
-  (cond [(or (α . <= . 0) (α . > . 1))
-         (raise-argument-error 'hpd-interval/sorted "Real in (0,1]" 1 metric α xs ws)]
-        [ws    (let-values ([(xs ws)  (sequences->weighted-samples 'sorted-hpd-interval xs ws)])
-                 (weighted-hpd-interval 'hpd-interval/sorted metric α xs ws))]
-        [else  (unweighted-hpd-interval 'hpd-interval/sorted metric α (sequence->list xs))]))
-
-(: hpd-interval (All (A) (->* [(-> A A Any) (-> A A Real) Real (Sequenceof A)]
-                              [(Option (Sequenceof Real))]
-                              (Values A A))))
-(define (hpd-interval lt? metric α xs [ws #f])
-  (cond [(or (α . <= . 0) (α . > . 1))
-         (raise-argument-error 'hpd-interval "Real in (0,1]" 2 lt? metric α xs ws)]
-        [ws    (let-values ([(xs ws)  (sort-samples lt? xs ws)])
-                 (weighted-hpd-interval 'hpd-interval metric α xs ws))]
-        [else  (let ([xs  (sort-samples lt? xs)])
-                 (unweighted-hpd-interval 'hpd-interval metric α xs))]))
-
-(: real-hpd-interval/sorted (->* [Real (Sequenceof Real)]
-                                 [(Option (Sequenceof Real))]
-                                 (Values Real Real)))
-(define (real-hpd-interval/sorted α xs [ws #f])
-  (hpd-interval/sorted - α xs ws))
-
-(: real-hpd-interval (->* [Real (Sequenceof Real)]
-                          [(Option (Sequenceof Real))]
-                          (Values Real Real)))
-(define (real-hpd-interval α xs [ws #f])
-  (hpd-interval < - α xs ws))
diff --git a/pkgs/math-pkgs/math-lib/math/private/statistics/monte-carlo.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/monte-carlo.rkt
deleted file mode 100644
index 7c9fcf421b..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/statistics/monte-carlo.rkt
+++ /dev/null
@@ -1,85 +0,0 @@
-#lang typed/racket
-
-(require "../../base.rkt"
-         "../distributions/beta-dist.rkt"
-         "expected-values.rkt"
-         "statistics-utils.rkt")
-
-(provide mc-variance
-         mc-variance/mean
-         mc-stddev
-         mc-stddev/mean
-         indicator
-         mc-probability
-         mc-prob-dist)
-
-;; ---------------------------------------------------------------------------------------------------
-;; Monte Carlo variance and standard deviation
-
-;; Correct MC variance for ratio importance method computation is from notes on a lecture series
-;; Petri Koistinen. Monte Carlo Methods, with an emphasis on Bayesian computation. Summer 2010
-
-(: mc-variance* (-> Symbol Real (Sequenceof Real) (Option (Sequenceof Real)) (U Boolean Real)
-                    Nonnegative-Real))
-(define (mc-variance* name m xs ws bias)
-  (define-values (xs^2 n)
-    (cond [ws  (let-values ([(xs ws)  (sequences->weighted-samples 'mc-variance xs ws)])
-                 (values (map (λ: ([x : Real] [w : Real]) (sqr (* w (- x m)))) xs ws)
-                         (max 0 (sum ws))))]
-          [else  (let ([xs  (sequence->list xs)])
-                   (values (map (λ: ([x : Real]) (sqr (- x m))) xs)
-                           (length xs)))]))
-  (cond [(zero? n)  +nan.0]
-        [else
-         (define m2 (max 0 (/ (sum xs^2) (sqr n))))
-         (adjust-variance m2 n bias)]))
-
-(: mc-variance/mean (->* [Real (Sequenceof Real)]
-                         [(Option (Sequenceof Real)) #:bias (U Boolean Real)]
-                         Nonnegative-Real))
-(define (mc-variance/mean m xs [ws #f] #:bias [bias #f])
-  (mc-variance* 'mc-variance/mean m xs ws bias))
-
-(: mc-variance (->* [(Sequenceof Real)]
-                    [(Option (Sequenceof Real)) #:bias (U Boolean Real)]
-                    Nonnegative-Real))
-(define (mc-variance xs [ws #f] #:bias [bias #f])
-  (mc-variance* 'mc-variance (mean xs ws) xs ws bias))
-
-(: mc-stddev/mean (->* [Real (Sequenceof Real)]
-                       [(Option (Sequenceof Real)) #:bias (U Boolean Real)]
-                       Nonnegative-Real))
-(define (mc-stddev/mean m xs [ws #f] #:bias [bias #f])
-  (sqrt (mc-variance* 'mc-stddev/mean m xs ws bias)))
-
-(: mc-stddev (->* [(Sequenceof Real)]
-                  [(Option (Sequenceof Real)) #:bias (U Boolean Real)]
-                  Nonnegative-Real))
-(define (mc-stddev xs [ws #f] #:bias [bias #f])
-  (sqrt (mc-variance* 'mc-stddev (mean xs ws) xs ws bias)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Monte Carlo probabilities
-
-(: indicator (All (A) ((A -> Any) -> (A -> (U 0 1)))))
-(define ((indicator f) x) (if (f x) 1 0))
-
-(: mc-probability (All (A) (->* [(A -> Any) (Sequenceof A)]
-                                [(Option (Sequenceof Real))]
-                                Nonnegative-Real)))
-(define (mc-probability p? xs [ws #f])
-  (let-values ([(xs ws)  (cond [ws    (sequences->weighted-samples 'mc-prob xs ws)]
-                               [else  (values (sequence->list xs) #f)])])
-    (max 0 (mean (map ((inst indicator A) p?) xs) ws))))
-
-(: mc-prob-dist (All (A) (->* [(A -> Any) (Sequenceof A)]
-                              [(Option (Sequenceof Real))]
-                              Beta-Dist)))
-(define (mc-prob-dist p? xs [ws #f])
-  (let-values ([(xs ws)  (cond [ws    (sequences->weighted-samples 'mc-prob-dist xs ws)]
-                               [else  (values (sequence->list xs) #f)])])
-    (define n (length xs))
-    (define α
-      (cond [ws    (* n (mean (map ((inst indicator A) p?) xs) ws))]
-            [else  (count p? xs)]))
-    (beta-dist α (- n α))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/statistics/order-statistics.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/order-statistics.rkt
deleted file mode 100644
index 10e9e4e431..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/statistics/order-statistics.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang typed/racket/base
-
-(require racket/sequence
-         racket/list
-         racket/fixnum
-         "../../base.rkt"
-         "quickselect.rkt"
-         "statistics-utils.rkt")
-
-(provide sort-samples
-         quantile
-         median
-         absdev/median
-         absdev)
-
-(: sort-weighted-samples
-   (All (A) (Symbol (A A -> Any) (Sequenceof A) (Sequenceof Real)
-                    -> (Values (Listof A) (Listof Nonnegative-Real)))))
-(define (sort-weighted-samples name lt? xs ws)
-  (let-values ([(xs ws)  (sequences->weighted-samples name xs ws)])
-    (define xws ((inst sort (Pair A Nonnegative-Real) Real)
-                 (map (inst cons A Nonnegative-Real) xs ws)
-                 (λ: ([xw1 : (Pair A Nonnegative-Real)]
-                      [xw2 : (Pair A Nonnegative-Real)])
-                   (and (lt? (car xw1) (car xw2)) #t))))
-    (values (map (inst car A Nonnegative-Real) xws)
-            (map (inst cdr A Nonnegative-Real) xws))))
-
-(: sort-samples (All (A) (case-> ((A A -> Any) (Sequenceof A) -> (Listof A))
-                                 ((A A -> Any) (Sequenceof A) (U #f (Sequenceof Real))
-                                               -> (Values (Listof A) (Listof Nonnegative-Real))))))
-(define sort-samples
-  (case-lambda
-    [(lt? xs)
-     (sort (sequence->list xs)
-           (λ: ([x1 : A] [x2 : A])
-             (and (lt? x1 x2) #t)))]
-    [(lt? xs ws)
-     (cond [ws  (sort-weighted-samples 'sort-samples lt? xs ws)]
-           [else  (define ys (sort (sequence->list xs)
-                                   (λ: ([x1 : A] [x2 : A])
-                                     (and (lt? x1 x2) #t))))
-                  (values ys (make-list (length ys) 1))])]))
-
-(: quantile (All (A) (case-> (Real (A A -> Any) (Sequenceof A) -> A)
-                             (Real (A A -> Any) (Sequenceof A) (U #f (Sequenceof Real)) -> A))))
-(define (quantile p lt? xs [ws #f])
-  (cond [(or (p . < . 0) (p . > . 1))
-         (raise-argument-error 'quantile "Real in [0,1]" 0 p lt? xs ws)]
-        [ws
-         (let-values ([(xs ws)  (sort-weighted-samples 'quantile lt? xs ws)])
-           (define total-w (sum ws))
-           (cond [(zero? total-w)
-                  (raise-argument-error 'quantile "weights with positive sum" 3 p lt? xs ws)]
-                 [else
-                  (let loop ([xs (cdr xs)] [ws (cdr ws)] [x (car xs)] [s (car ws)])
-                    (cond [((/ s total-w) . >= . p)  x]
-                          [(null? xs)  x]
-                          [else  (loop (cdr xs) (cdr ws) (car xs) (+ s (car ws)))]))]))]
-        [else
-         (let ([xs  (sequence->vector xs)])
-           (define n (vector-length xs))
-           (cond [(n . fx<= . 0)  (raise-argument-error 'quantile "nonempty Sequence" 2 p lt? xs)]
-                 [else
-                  (define i (max 0 (- (exact-ceiling (* p n)) 1)))
-                  (kth-value! xs i lt?)]))]))
-
-(: median (All (A) (case-> ((A A -> Any) (Sequenceof A) -> A)
-                           ((A A -> Any) (Sequenceof A) (U #f (Sequenceof Real)) -> A))))
-(define (median lt? xs [ws #f])
-  (quantile 1/2 lt? xs ws))
-
-;; ===================================================================================================
-;; Absolute deviation
-
-(: absdev* (Symbol Real (Sequenceof Real) (Option (Sequenceof Real)) -> Nonnegative-Real))
-(define (absdev* name m xs ws)
-  (define-values (axs n)
-    (cond [ws  (let-values ([(xs ws)  (sequences->weighted-samples name xs ws)])
-                 (values (map (λ: ([x : Real] [w : Real]) (* w (abs (- x m)))) xs ws)
-                         (max 0 (sum ws))))]
-          [else  (let ([xs  (sequence->list xs)])
-                   (values (map (λ: ([x : Real]) (abs (- x m))) xs)
-                           (length xs)))]))
-  (cond [(zero? n)  +nan.0]
-        [else
-         (max 0 (/ (sum axs) n))]))
-
-(: absdev/median
-   (case-> (Real (Sequenceof Real) -> Nonnegative-Real)
-           (Real (Sequenceof Real) (Option (Sequenceof Real)) -> Nonnegative-Real)))
-(define (absdev/median m xs [ws #f])
-  (absdev* 'absdev/median m xs ws))
-
-(: absdev
-   (case-> ((Sequenceof Real) -> Nonnegative-Real)
-           ((Sequenceof Real) (Option (Sequenceof Real)) -> Nonnegative-Real)))
-(define (absdev xs [ws #f])
-  (absdev* 'absdev (median < xs ws) xs ws))
diff --git a/pkgs/math-pkgs/math-lib/math/private/statistics/quickselect.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/quickselect.rkt
deleted file mode 100644
index 40a69e4a97..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/statistics/quickselect.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang typed/racket/base
-
-#|
-Quickselect to find the kth order statistic, using random pivot to reduce probability of worst case
-
-Technically O(n^2), but astronomically unlikely; expected running time is O(n)
-
-Seems to be faster than sort-and-direct-ref on sequences with length > 350 or so, not much slower
-otherwise
-|#
-
-(require racket/fixnum
-         "../unsafe.rkt"
-         "statistics-utils.rkt")
-
-(provide kth-value! kth-value)
-
-(: partition! (All (A) ((Vectorof A) Fixnum Fixnum (A A -> Any) -> Fixnum)))
-(define (partition! vs start end lt?)
-  (define p (+ start (random (unsafe-fx- (unsafe-fx+ end 1) start))))
-  (define pivot (unsafe-vector-ref vs p))
-  (unsafe-vector-set! vs p (unsafe-vector-ref vs end))
-  (unsafe-vector-set! vs end pivot)
-  (let loop ([#{start : Fixnum} start] [#{end : Fixnum} end])
-    (cond [(start . fx< . end)
-           (define v1 (unsafe-vector-ref vs start))
-           (cond [(lt? v1 pivot)  (loop (unsafe-fx+ start 1) end)]
-                 [else
-                  (unsafe-vector-set! vs end v1)
-                  (let ([end  (unsafe-fx- end 1)])
-                    (unsafe-vector-set! vs start (unsafe-vector-ref vs end))
-                    (loop start end))])]
-          [else
-           (unsafe-vector-set! vs start pivot)
-           start])))
-
-(: kth-value!* (All (A) ((Vectorof A) Nonnegative-Fixnum (A A -> Any) -> A)))
-(define (kth-value!* vs k lt?)
-  (define n (vector-length vs))
-  (let loop ([#{start : Fixnum} 0] [#{end : Fixnum} (fx- n 1)] [k k])
-    (cond [(start . fx< . end)
-           (let ([c  (partition! vs start end lt?)])
-             (define start+k (unsafe-fx+ start k))
-             (cond [(c . fx> . start+k)
-                    (loop start (unsafe-fx- c 1) k)]
-                   [(c . fx< . start+k)
-                    (define c+1 (unsafe-fx+ c 1))
-                    (loop c+1 end (unsafe-fx- start+k c+1))]
-                   [else
-                    (unsafe-vector-ref vs start+k)]))]
-          [else
-           (unsafe-vector-ref vs start)])))
-
-(: kth-value! (All (A) ((Vectorof A) Integer (A A -> Any) -> A)))
-(define (kth-value! vs k lt?)
-  (define n (vector-length vs))
-  (cond [(n . fx<= . 0)  (raise-argument-error 'kth-value! "nonempty Vector" 0 vs k lt?)]
-        [(k . < . 0)  (raise-argument-error 'kth-value! "Natural" 1 vs k lt?)]
-        [(k . >= . n)  (raise-argument-error 'kth-value! (format "Natural < ~a" n) 1 vs k lt?)]
-        [else  (kth-value!* vs k lt?)]))
-
-(: kth-value (All (A) ((Sequenceof A) Integer (A A -> Any) -> A)))
-(define (kth-value seq k lt?)
-  (define vs (sequence->vector seq))
-  (define n (vector-length vs))
-  (cond [(n . fx<= . 0)  (raise-argument-error 'kth-value "nonempty Sequence" 0 seq k lt?)]
-        [(k . < . 0)  (raise-argument-error 'kth-value "Natural" 1 seq k lt?)]
-        [(k . >= . n)  (raise-argument-error 'kth-value (format "Natural < ~a" n) 1 seq k lt?)]
-        [else  (kth-value!* vs k lt?)]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/statistics/statistics-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/statistics-struct.rkt
deleted file mode 100644
index 6fbdfb0c22..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/statistics/statistics-struct.rkt
+++ /dev/null
@@ -1,115 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match
-         "../../flonum.rkt"
-         "statistics-utils.rkt")
-
-(provide statistics
-         statistics?
-         empty-statistics
-         update-statistics
-         update-statistics*
-         statistics-min
-         statistics-max
-         statistics-count
-         statistics-range
-         statistics-mean
-         statistics-variance
-         statistics-stddev
-         statistics-skewness
-         statistics-kurtosis)
-
-(struct: base-statistics
-  ([min : Flonum]
-   [max : Flonum]
-   [count : Nonnegative-Flonum])
-  #:transparent)
-
-(struct: statistics base-statistics
-  ([m1 : Flonum]
-   [m2 : Nonnegative-Flonum]
-   [m3 : Flonum]
-   [m4 : Nonnegative-Flonum]))
-
-(define empty-statistics (statistics +inf.0 -inf.0 0.0 0.0 0.0 0.0 0.0))
-
-(: update-statistics (case-> (statistics Real -> statistics)
-                             (statistics Real Real -> statistics)))
-(define (update-statistics e x [w 1.0])
-  (match-define (statistics mn mx n m1 m2 m3 m4) e)
-  (cond
-    [(w . < . 0)  (raise-argument-error 'update-statistics "Nonnegative-Real" 2 e x w)]
-    [else
-     (let* ([x  (fl x)]
-            [w  (fl w)]
-            [w+n  (fl+ w n)]
-            [d  (fl- m1 x)]
-            [dm1  (fl/ (fl* d w) w+n)]
-            [new-m1  (fl- m1 dm1)]
-            [new-m2  (flmax (fl+ m2 (fl* dm1 (fl* n d))) 0.0)]
-            [new-m3  (fl+ m3 (fl* dm1 (fl+ (fl* 3.0 m2) (fl* d (fl* n (fl- (fl* 2.0 dm1) d))))))]
-            [new-m4  (flmax
-                      (fl+ m4 (fl* dm1 (fl+ (fl+ (fl* 4.0 m3) (fl* dm1 (fl* 6.0 m2)))
-                                            (fl* d (fl+ (fl* dm1 (fl* dm1 (fl+ (fl* 6.0 n)
-                                                                               (fl* 3.0 w))))
-                                                        (fl* d (fl* d (fl+ n (fl* -3.0 w)))))))))
-                      0.0)])
-       (statistics (flmin x mn) (flmax x mx) w+n new-m1 new-m2 new-m3 new-m4))]))
-
-(: update-statistics*
-   (case-> (statistics (Sequenceof Real) -> statistics)
-           (statistics (Sequenceof Real) (Option (Sequenceof Real)) -> statistics)))
-(define (update-statistics* e xs [ws #f])
-  (cond [ws
-         (for/fold: ([e : statistics  e]) ([x xs] [w ws])
-           (update-statistics e x w))]
-        [else
-         (for/fold: ([e : statistics  e]) ([x xs])
-           (update-statistics e x 1.0))]))
-
-;; ===================================================================================================
-
-(: statistics-min (statistics -> Flonum))
-(define (statistics-min e) (base-statistics-min e))
-
-(: statistics-max (statistics -> Flonum))
-(define (statistics-max e) (base-statistics-max e))
-
-(: statistics-count (statistics -> Nonnegative-Flonum))
-(define (statistics-count e) (base-statistics-count e))
-
-(: statistics-range (statistics -> Nonnegative-Flonum))
-(define (statistics-range e)
-  (define mn (statistics-min e))
-  (define mx (statistics-max e))
-  (define rng (fl- mx mn))
-  (cond [(rng . fl>= . 0.0)  rng]
-        [else  +nan.0]))
-
-(: statistics-mean (statistics -> Flonum))
-(define (statistics-mean e)
-  (define n (statistics-count e))
-  (if (fl= n 0.0) +nan.0 (statistics-m1 e)))
-
-(: statistics-variance (statistics [#:bias (U #t #f Real)] -> Nonnegative-Flonum))
-(define (statistics-variance e #:bias [bias #f])
-  (define n (statistics-count e))
-  (fl (adjust-variance (flmax 0.0 (fl/ (statistics-m2 e) n)) n bias)))
-
-(: statistics-stddev (statistics [#:bias (U #t #f Real)] -> Nonnegative-Flonum))
-(define (statistics-stddev e #:bias [bias #f])
-  (flsqrt (flmax 0.0 (statistics-variance e #:bias bias))))
-
-(: statistics-skewness (statistics [#:bias (U #t #f Real)] -> Flonum))
-(define (statistics-skewness e #:bias [bias #f])
-  (define n (statistics-count e))
-  (define m2 (statistics-m2 e))
-  (define m3 (statistics-m3 e))
-  (fl (adjust-skewness (fl/ (fl* m3 (flsqrt n)) (flexpt m2 #i3/2)) n bias)))
-
-(: statistics-kurtosis (statistics [#:bias (U #t #f Real)] -> Nonnegative-Flonum))
-(define (statistics-kurtosis e #:bias [bias #f])
-  (define n (statistics-count e))
-  (define m2 (statistics-m2 e))
-  (define m4 (statistics-m4 e))
-  (fl (adjust-kurtosis (flmax 0.0 (fl/ (fl* (fl/ m4 m2) n) m2)) n bias)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/statistics/statistics-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/statistics-utils.rkt
deleted file mode 100644
index 1feecb7054..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/statistics/statistics-utils.rkt
+++ /dev/null
@@ -1,141 +0,0 @@
-#lang typed/racket/base
-
-(require racket/sequence
-         racket/list
-         "../../flonum.rkt"
-         "../../base.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-
-(: lte?->lt? (All (A) ((A A -> Any) -> (A A -> Boolean))))
-(define ((lte?->lt? lte?) x1 x2)
-  (and (lte? x1 x2) (not (lte? x2 x1))))
-
-(: find-near-pow2 (Real -> Nonnegative-Exact-Rational))
-(define (find-near-pow2 x)
-  (expt 2 (max -1073 (min 1023 (exact-round (/ (log (abs x)) (fllog 2.0)))))))
-
-(: weights->list (Symbol (Sequenceof Real) -> (Listof Nonnegative-Real)))
-(define (weights->list name w-seq)
-  (for/list: : (Listof Nonnegative-Real) ([w w-seq])
-    (cond [(w . >= . 0)  w]
-          [else  (raise-argument-error name "(Sequenceof Nonnegative-Real)" w-seq)])))
-
-(: weights->normalized-weights (Symbol (Sequenceof Real) -> (Listof Nonnegative-Flonum)))
-(define (weights->normalized-weights name ws)
-  (let ([ws  (weights->list name ws)])
-    (when (empty? ws) (raise-argument-error name "nonempty (Sequenceof Real)" ws))
-    (define max-w (find-near-pow2 (apply max ws)))
-    (let ([ws  (map (λ: ([w : Real]) (/ w max-w)) ws)])
-      (define total-w (sum ws))
-      (map (λ: ([w : Real]) (assert (fl (/ w total-w)) nonnegative?)) ws))))
-
-;; ===================================================================================================
-
-(: check-lengths! (All (A B) (Symbol String A B Index Index -> Void)))
-(define (check-lengths! name what xs ys m n)
-  (unless (= m n) (error name "~a must be the same length; given ~e (length ~a) and ~e (length ~a)"
-                         what xs m ys n)))
-
-(: sequences->weighted-samples
-   (All (A) (Symbol (Sequenceof A) (Sequenceof Real)
-                    -> (Values (Listof A) (Listof Nonnegative-Real)))))
-(define (sequences->weighted-samples name x-seq w-seq)
-  (define xs (sequence->list x-seq))
-  (define ws
-    (for/list: : (Listof Nonnegative-Real) ([w w-seq])
-      (cond [(w . >= . 0)  w]
-            [else  (raise-argument-error name "(Sequenceof Nonnegative-Real)" 1 x-seq w-seq)])))
-  (check-lengths! name "values and weights" xs ws (length xs) (length ws))
-  (values xs ws))
-
-(define nonnegative? (λ: ([x : Real]) (not (negative? x))))
-
-(: sequences->normalized-weighted-samples
-   (All (A) (Symbol (Sequenceof A) (Sequenceof Real)
-                    -> (Values (Listof A) (Listof Positive-Flonum)))))
-(define (sequences->normalized-weighted-samples name xs ws)
-  (let-values ([(xs ws)  (sequences->weighted-samples name xs ws)])
-    (when (empty? xs) (raise-argument-error name "nonempty (Sequenceof A)" 0 xs ws))
-    (define max-w (find-near-pow2 (assert (apply max ws) nonnegative?)))
-    (let ([ws  (map (λ: ([w : Nonnegative-Real]) (/ w max-w)) ws)])
-      (define total-w (sum ws))
-      (let loop ([xs  xs]
-                 [ws  ws]
-                 [#{new-xs : (Listof A)}  empty]
-                 [#{new-ws : (Listof Positive-Flonum)}  empty])
-        (cond [(or (empty? xs) (empty? ws))  (values (reverse new-xs) (reverse new-ws))]
-              [else
-               (define w (fl (/ (first ws) total-w)))
-               (cond [(w . > . 0.0)
-                      (loop (rest xs) (rest ws) (cons (first xs) new-xs) (cons w new-ws))]
-                     [else
-                      (loop (rest xs) (rest ws) new-xs new-ws)])])))))
-
-(: sequence->normalized-weighted-samples
-   (All (A) (Symbol (Sequenceof A) -> (Values (Listof A) (Listof Positive-Flonum)))))
-(define (sequence->normalized-weighted-samples name xs)
-  (let ([xs  (sequence->list xs)])
-    (when (empty? xs) (raise-argument-error name "nonempty (Sequenceof A)" xs))
-    (define n (length xs))
-    (define w (assert (fl/ 1.0 (fl n)) positive?))
-    (values xs (build-list n (λ (i) w)))))
-
-(: sequence->vector (All (A) ((Sequenceof A) -> (Vectorof A))))
-(define (sequence->vector vs)
-  (for/vector: ([v vs]) : A v))
-
-(: sequences->weighted-sample-vectors
-   (All (A) (Symbol (Sequenceof A) (Sequenceof Real)
-                    -> (Values (Vectorof A) (Vectorof Nonnegative-Real)))))
-(define (sequences->weighted-sample-vectors name x-seq w-seq)
-  (define xs (sequence->vector x-seq))
-  (define ws
-    (for/vector: ([w w-seq]) : Nonnegative-Real
-      (cond [(w . >= . 0)  w]
-            [else  (raise-argument-error name "(Sequenceof Nonnegative-Real)" 1 x-seq w-seq)])))
-  (check-lengths! name "values and weights" xs ws (vector-length xs) (vector-length ws))
-  (values xs ws))
-
-;; ===================================================================================================
-
-;; bias = #f   Return the central moment
-;; bias = #t   Assume sum of weights is the count and correct for bias normally
-;; bias = n    Assume n actual samples; correct for bias
-
-(: get-bias-adjustment (Nonnegative-Real (U #t Real) Nonnegative-Real -> Positive-Real))
-(define (get-bias-adjustment c bias mn)
-  (define n (if (real? bias) bias c))
-  (if (n . > . mn) n +nan.0))
-
-(: adjust-variance (Nonnegative-Real Nonnegative-Real (U #t #f Real) -> Nonnegative-Real))
-(define (adjust-variance m2 n bias)
-  (cond [bias
-         (let ([n  (get-bias-adjustment n bias 1)])
-           (define c (max 0 (/ n (- n 1))))  ; max proves c >= 0
-           (* m2 c))]
-        [else  m2]))
-
-(: adjust-covariance (Real Nonnegative-Real (U #t #f Real) -> Real))
-(define (adjust-covariance m2 n bias)
-  (cond [bias
-         (let ([n  (get-bias-adjustment n bias 1)])
-           (* m2 (/ n (- n 1))))]
-        [else  m2]))
-
-(: adjust-skewness (Real Nonnegative-Real (U #t #f Real) -> Real))
-(define (adjust-skewness g n bias)
-  (cond [bias
-         (let ([n  (get-bias-adjustment n bias 2)])
-           (fl (* g (/ (sqrt (max 0 (* n (- n 1)))) (- n 2)))))]
-        [else  (fl g)]))
-
-(: adjust-kurtosis (Nonnegative-Real Nonnegative-Real (U #t #f Real) -> Nonnegative-Real))
-(define (adjust-kurtosis g n bias)
-  (cond [bias
-         (let ([n  (get-bias-adjustment n bias 3)])
-           (define c (max 0 (/ (- n 1) (* (- n 2) (- n 3)))))  ; max proves c >= 0
-           (* (+ (* (+ n 1) g) 6) c))]
-        [else  g]))
diff --git a/pkgs/math-pkgs/math-lib/math/private/syntax-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/syntax-utils.rkt
deleted file mode 100644
index f536ac1df9..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/syntax-utils.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         (for-template racket)
-         racket/syntax)
-
-(provide (all-defined-out)
-         (all-from-out (submod "." ensures)))
-
-(define-syntax-rule (define-inline-op name inline-op typed-op inline-pats ...)
-  (define-syntax (name stx)
-    (syntax-case stx ()
-      [(_ . inline-pats)  (syntax/loc stx (inline-op . inline-pats))] ...
-      [(_ . args)  (syntax/loc stx (typed-op . args))]
-      [_  (syntax/loc stx typed-op)])))
-
-(module ensures racket/base
-  (require racket/flonum
-           typed/racket/base)
-  
-  (provide (all-defined-out))
-
-  (define-syntax-rule (ensure-index name n-expr)
-    (let: ([n : Integer  n-expr])
-      (if (index? n) n (raise-argument-error name "Index" n))))
-  
-  (define-syntax-rule (ensure-flvector name xs-expr)
-    (let: ([xs : FlVector  xs-expr])
-      (if (flvector? xs) xs (raise-argument-error name "FlVector" xs))))
-  
-  (define-syntax-rule (ensure-procedure name f-expr T)
-    (let: ([f : T  f-expr])
-      (if (procedure? f) f (raise-argument-error name "Procedure" f))))
-  
-  )
-
-(require 'ensures)
diff --git a/pkgs/math-pkgs/math-lib/math/private/unsafe.rkt b/pkgs/math-pkgs/math-lib/math/private/unsafe.rkt
deleted file mode 100644
index f66feeca7c..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/unsafe.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang typed/racket/base
-
-(require (prefix-in : racket/unsafe/ops)
-         racket/flonum
-         racket/fixnum)
-
-(provide (all-defined-out))
-
-(define unsafe-vector-ref vector-ref)
-(define unsafe-vector-set! vector-set!)
-(define unsafe-vector-length vector-length)
-
-(define unsafe-flvector-ref flvector-ref)
-(define unsafe-flvector-set! flvector-set!)
-
-(define unsafe-fx* fx*)
-(define unsafe-fx+ fx+)
-(define unsafe-fx- fx-)
-(define unsafe-fxmodulo fxmodulo)
-(define unsafe-fxquotient fxquotient)
-(define unsafe-fx>= fx>=)
-(define unsafe-fx= fx=)
-(define unsafe-fx< fx<)
-
-(define unsafe-car car)
-(define unsafe-cdr cdr)
-#|
-(define unsafe-vector-ref :unsafe-vector-ref)
-(define unsafe-vector-set! :unsafe-vector-set!)
-(define unsafe-vector-length :unsafe-vector-length)
-
-(define unsafe-flvector-ref :unsafe-flvector-ref)
-(define unsafe-flvector-set! :unsafe-flvector-set!)
-
-(define unsafe-fx* :unsafe-fx*)
-(define unsafe-fx+ :unsafe-fx+)
-(define unsafe-fxmodulo :unsafe-fxmodulo)
-(define unsafe-fx>= unsafe-fx>=)
-
-(define unsafe-car :unsafe-car)
-(define unsafe-cdr :unsafe-cdr)
-|#
diff --git a/pkgs/math-pkgs/math-lib/math/private/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/utils.rkt
deleted file mode 100644
index 12ce6fb503..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/utils.rkt
+++ /dev/null
@@ -1,71 +0,0 @@
-#lang typed/racket/base
-
-(require racket/pretty
-         racket/fixnum
-         racket/flonum
-         "exception.rkt")
-
-(provide pretty-print-constructor
-         check-flvector-lengths!)
-
-(: port-next-column (Output-Port -> Natural))
-;; Helper to avoid the annoying #f column value
-(define (port-next-column port)
-  (define-values (_line col _pos) (port-next-location port))
-  (if col col 0))
-
-(define-type Constructor-Layout (U 'one-line 'multi-line))
-
-(: pretty-print-constructor (Symbol (Listof Any) Output-Port (U #t #f 0 1) -> Any))
-(define (pretty-print-constructor name args port mode)
-  ;; Called to print arguments; may recur (e.g. printing constructed arguments)
-  ;; We never have to consider the `mode' argument again after defining `recur-print'
-  (define recur-print
-    (cond [(not mode) display]
-          [(integer? mode) (λ: ([p : Any] [port : Output-Port])
-                             (print p port mode))]  ; pass the quote depth through
-          [else write]))
-  
-  (define cols (pretty-print-columns))
-  
-  (: print-all (Output-Port Constructor-Layout -> Any))
-  (define (print-all port layout)
-    ;; Get current column so we can indent new lines at least that far
-    (define col (port-next-column port))
-    ;; Print the constructor name
-    (write-string (format "(~a" name) port)
-    (for ([arg  (in-list args)])
-      (case layout
-        [(one-line)  (write-string " " port)]
-        [else  (pretty-print-newline port (assert cols integer?))
-               (write-string (make-string (+ col 1) #\space) port)])
-      (recur-print arg port))
-    (write-string ")" port))
-  
-  ;; See what the printer has in mind for us this time
-  (cond [(and (pretty-printing) (integer? cols))
-         ;; Line-width-constrained pretty-printing: woo woo!
-         (let/ec: return : Any  ; used as a return statement
-           ;; Wrap the port with a tentative one, in case compact layout overflows lines
-           (define: tport : Output-Port
-             (make-tentative-pretty-print-output-port
-              port
-              (max 0 (- cols 1))  ; width: make sure there's room for the closing delimiter
-              (λ ()  ; failure thunk
-                ;; Reset accumulated graph state
-                (tentative-pretty-print-port-cancel (assert tport output-port?))
-                ;; Compact layout failed, so print in multi-line layout
-                (return (print-all port 'multi-line)))))
-           ;; Try printing on one line
-           (print-all tport 'one-line)
-           ;; If a line overflows, the failure thunk returns past this
-           (tentative-pretty-print-port-transfer tport port))]
-        [else
-         ;; No pretty printer, or printing to infinite-width lines, so print on one line
-         (print-all port 'one-line)]))
-
-(: check-flvector-lengths! (Symbol Index FlVector * -> Void))
-(define (check-flvector-lengths! name n . xss)
-  (for: ([xs  (in-list xss)])
-    (unless (fx= n (flvector-length xs))
-      (raise-length-error name "FlVector" xs n))))
diff --git a/pkgs/math-pkgs/math-lib/math/private/utils/flonum-tests.rkt b/pkgs/math-pkgs/math-lib/math/private/utils/flonum-tests.rkt
deleted file mode 100644
index 127aebc014..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/utils/flonum-tests.rkt
+++ /dev/null
@@ -1,535 +0,0 @@
-#lang typed/racket/base
-
-(require racket/math
-         racket/list
-         "../base/base-random.rkt"
-         "../flonum/expansion/expansion-base.rkt"
-         "../flonum/expansion/expansion-exp.rkt"
-         "../flonum/expansion/expansion-log.rkt"
-         "../flonum/flonum-functions.rkt"
-         "../flonum/flonum-constants.rkt"
-         "../flonum/flonum-bits.rkt"
-         "../flonum/flonum-error.rkt"
-         "../flonum/flonum-log.rkt"
-         "../bigfloat/bigfloat-log-arithmetic.rkt"
-         "../distributions/dist-struct.rkt"
-         "../distributions/geometric-dist.rkt"
-         "../../bigfloat.rkt")
-
-(provide
- print-fp-test-progress?
- ;; Unary flonum tests
- test-flabs
- test-flsqrt
- test-fllog
- test-flexp
- test-flsin
- test-flcos
- test-fltan
- test-flasin
- test-flacos
- test-flatan
- test-fllog2
- ;; Binary flonum tests
- test-fl+
- test-fl*
- test-fl-
- test-fl/
- test-flexpt
- test-fllogb
- ;; Unary flop/error tests
- test-flsqr/error
- test-flsqrt/error
- test-flexp/error
- ;; Binary flop/error tests
- test-fl+/error
- test-fl-/error
- test-fl*/error
- test-fl//error
- ;; fl2 conversion test
- test-fl2
- ;; Unary fl2 tests
- test-fl2abs
- test-fl2sqr
- test-fl2sqrt
- test-fl2exp
- test-fl2expm1
- test-fl2log
- test-fl2log1p
- ;; Binary fl2 tests
- test-fl2+
- test-fl2-
- test-fl2*
- test-fl2/
- ;; Comprehensive test
- test-floating-point)
-
-;; Allowable error for different kinds of functions, in ulps
-(define flonum-fun-ulps 0.5)
-(define fllog2-ulps 1.0)
-(define fllogb-ulps 2.5)
-(define flonum/error-fun-ulps 0.5)
-(define flexp/error-fun-ulps 3.0)
-(define fl2-conversion-ulps 0.5)
-(define unary-fl2-fun-ulps 1.0)
-(define binary-fl2-fun-ulps 8.0)
-(define fl2exp-fun-ulps 3.0)
-(define fl2log-fun-ulps 2.0)
-
-(: current-max-ulp-error (Parameterof Nonnegative-Flonum))
-(define current-max-ulp-error (make-parameter 0.0))
-
-;; ===================================================================================================
-;; Helpers
-
-(: different-zero? (Real Real -> Boolean))
-(define (different-zero? x y)
-  (or (and (eqv? x -0.0) (eqv? y 0.0))
-      (and (eqv? x 0.0) (eqv? y -0.0))))
-
-(: fl2->real* (Flonum Flonum -> Real))
-;; Like `fl2->real', but returns signed flonum zeros
-(define (fl2->real* x2 x1)
-  (define x.0 (fl+ x2 x1))
-  (cond [(zero? x.0)  x2]
-        [else  (fl2->real x2 x1)]))
-
-(: bigfloat->real* (Bigfloat -> Real))
-;; Like `bigfloat->real*', but returns a signed infinity or a signed flonum zero if conversion would
-;; overflow or underflow a flonum
-(define (bigfloat->real* x)
-  (define x.0 (bigfloat->flonum x))
-  (cond [(fl= x.0 0.0)  x.0]
-        [(flrational? x.0)  (bigfloat->real x)]
-        [else  x.0]))
-
-(: filter/ulp-error (All (A B) ((Listof (List A (U B Flonum)))
-                                Flonum -> (Listof (List A (U B Flonum))))))
-(define (filter/ulp-error xes ulps)
-  (filter (λ: ([xe : (List A (U B Flonum))])
-            (define e (second xe))
-            (or (not (flonum? e)) (e . fl> . ulps)))
-          xes))
-
-(: print-fp-test-progress? (Parameterof Boolean))
-(define print-fp-test-progress? (make-parameter #t))
-
-(define progress-chunk-size 200)
-(define progress-superchunk-chunks 5)
-
-(: maybe-print-progress (Symbol Integer Natural -> Void))
-(define (maybe-print-progress name i m)
-  (when (and (print-fp-test-progress?) (i . > . 0) (i . <= . m))
-    (let* ([flush?  (cond [(= i 1)  (printf "~a: " name)]
-                          [else  #f])]
-           [flush?  (cond [(= 0 (modulo i progress-chunk-size))
-                           (cond [(= 0 (modulo i (* progress-superchunk-chunks
-                                                    progress-chunk-size)))
-                                  (printf "* ~a " i)]
-                                 [else  (printf "*")])]
-                          [else  flush?])]
-           [flush?  (cond [(= i m)  (printf "* ~a~n" m)]
-                          [else  flush?])])
-      (when flush? (flush-output)))))
-
-;; ===================================================================================================
-;; Test case generation
-
-;; Deteriministic test cases
-
-(define standard-xs
-  (list
-   ;; Test the sign of the return value of `flexpt'
-   -1001.0 -10.0 -0.1 +0.1 +10.0 +1001.0
-   ;; Test squaring
-   (- (flsqrt +min.0)) (flsqrt +min.0)
-   (- (flsqrt +max-subnormal.0)) (flsqrt +max-subnormal.0)
-   (- (flsqrt +max-subnormal.hi)) (flsqrt +max-subnormal.hi)
-   (- (flsqrt +max.0)) (flsqrt +max.0)
-   ;; Test exp limits
-   (fllog +min.0) (fllog +max-subnormal.0) (fllog +max-subnormal.hi) (fllog +max.0)
-   ;; Standard special values
-   -inf.0 -max.0 -1.0 -max-subnormal.hi -max-subnormal.0 -min.0 -0.0
-   +inf.0 +max.0 +1.0 +max-subnormal.hi +max-subnormal.0 +min.0 +0.0
-   +nan.0))
-
-(define standard-rs
-  (append standard-xs
-          (list +10 +1 +1/7 +1/10 +1/13
-                -10 -1 -1/7 -1/10 -1/13
-                0)))
-
-(: product (All (A B) ((Listof A) (Listof B) -> (Values (Listof A) (Listof B)))))
-(define (product as bs)
-  (define abs
-    (append*
-     (for/list: : (Listof (Listof (Pair A B))) ([a  (in-list as)])
-       (for/list: : (Listof (Pair A B)) ([b  (in-list bs)])
-         (cons a b)))))
-  (values (map (inst car A B) abs) (map (inst cdr A B) abs)))
-
-;; Random test cases
-
-(define min-subnormal-ord (flonum->ordinal -max-subnormal.0))
-(define max-subnormal-ord (+ 1 (flonum->ordinal +max-subnormal.0)))
-
-(define min-fl2-subnormal-ord (flonum->ordinal -max-subnormal.hi))
-(define max-fl2-subnormal-ord (+ 1 (flonum->ordinal +max-subnormal.hi)))
-
-(: sample-flonum (case-> (Integer -> (Listof Flonum))
-                         (Integer Flonum Flonum -> (Listof Flonum))))
-(define (sample-flonum n [mn -inf.0] [mx +inf.0])
-  (define min-ord (flonum->ordinal mn))
-  (define max-ord (+ 1 (flonum->ordinal mx)))
-  (let ([min-subnormal-ord  (max min-ord min-subnormal-ord)]
-        [max-subnormal-ord  (min max-ord max-subnormal-ord)]
-        [min-fl2-subnormal-ord  (max min-ord min-fl2-subnormal-ord)]
-        [max-fl2-subnormal-ord  (min max-ord max-fl2-subnormal-ord)])
-    (build-list
-     n (λ (_)
-         (define r (random))
-         (ordinal->flonum
-          (cond [(and (min-subnormal-ord . < . max-subnormal-ord) (r . < . 0.1))
-                 (random-integer min-subnormal-ord max-subnormal-ord)]
-                [(and (min-fl2-subnormal-ord . < . max-fl2-subnormal-ord) (r . < . 0.2))
-                 (random-integer min-subnormal-ord max-subnormal-ord)]
-                [else
-                 (random-integer min-ord max-ord)]))))))
-
-(define denom-dist (geometric-dist 1e-32))
-
-(: sample-rational (Integer -> (Listof Exact-Rational)))
-(define (sample-rational n)
-  (map (λ: ([f1 : Flonum] [d : Integer])
-         (+ (inexact->exact f1)
-            (* (if ((random) . > . 0.5) -1 1)
-               (/ (random-natural (+ 1 d)) d)
-               (expt 2 (- (exact-round (/ (fllog (flabs f1)) (fllog 2.0))) 52)))))
-       (sample-flonum n)
-       (map (λ: ([x : Flonum]) (+ 1 (exact-floor x))) (sample denom-dist n))))
-
-;; ===================================================================================================
-;; Flonum functions
-
-(define-type Flonum-Error (U Flonum (List Symbol Flonum Real)))
-(define-type Unary-Flonum-Failure (List (List Symbol Flonum) Flonum-Error))
-(define-type Binary-Flonum-Failure (List (List Symbol Flonum Flonum) Flonum-Error))
-
-(: flonum-error (Flonum Bigfloat -> Flonum-Error))
-(define (flonum-error z z0.bf)
-  (define z0 (bigfloat->real* z0.bf))
-  (cond [(different-zero? z z0)  (list 'different-zero? z z0)]
-        [else  (flulp-error z z0)]))
-
-(: unary-flonum-fun-error ((Flonum -> Flonum) (Bigfloat -> Bigfloat) Flonum -> Flonum-Error))
-(define (unary-flonum-fun-error f g x)
-  (flonum-error (f x) (parameterize ([bf-precision 53])
-                        (g (bf x)))))
-
-(: test-unary-flonum-fun
-   (Symbol (Flonum -> Flonum) (Bigfloat -> Bigfloat) Integer Flonum Flonum
-           -> (Listof Unary-Flonum-Failure)))
-(define (test-unary-flonum-fun name f g n mn mx)
-  (define xs (append standard-xs (sample-flonum n mn mx)))
-  (define m (length xs))
-  (filter/ulp-error
-   (for/list: : (Listof Unary-Flonum-Failure) ([x  (in-list xs)]
-                                               [i  (in-naturals 1)])
-     (maybe-print-progress name i m)
-     (list (list name x) (unary-flonum-fun-error f g x)))
-   (current-max-ulp-error)))
-
-(: binary-flonum-fun-error
-   ((Flonum Flonum -> Flonum) (Bigfloat Bigfloat -> Bigfloat) Flonum Flonum -> Flonum-Error))
-(define (binary-flonum-fun-error f g x y)
-  (flonum-error (f x y) (parameterize ([bf-precision 53])
-                          (g (bf x) (bf y)))))
-
-(: test-binary-flonum-fun
-   (Symbol (Flonum Flonum -> Flonum) (Bigfloat Bigfloat -> Bigfloat) Integer
-           -> (Listof Binary-Flonum-Failure)))
-(define (test-binary-flonum-fun name f g n)
-  (define-values (pre-xs pre-ys) (product standard-xs standard-xs))
-  (define xs (append pre-xs (sample-flonum n)))
-  (define ys (append pre-ys (sample-flonum n)))
-  (define m (length xs))
-  (filter/ulp-error
-   (for/list: : (Listof Binary-Flonum-Failure) ([x  (in-list xs)]
-                                                [y  (in-list ys)]
-                                                [i  (in-naturals 1)])
-     (maybe-print-progress name i m)
-     (list (list name x y) (binary-flonum-fun-error f g x y)))
-   (current-max-ulp-error)))
-
-;; ===================================================================================================
-;; fl2 conversion
-
-(define-type Fl2-Error (U Flonum (List Symbol Flonum Real)))
-(define-type Fl2-Failure (List (List 'fl2 Real) Fl2-Error))
-
-(: fl2-error (Flonum Flonum Real -> Fl2-Error))
-(define (fl2-error x2 x1 x)
-  (cond [(not (fl2? x2 x1))  (list 'not-fl2? x2 x1)]
-        [(different-zero? x2 x)  (list 'different-zero? x2 x)]
-        [else  (fl2ulp-error x2 x1 x)]))
-
-(: fl2-conversion-error (Real -> Fl2-Error))
-(define (fl2-conversion-error x)
-  (define-values (x2 x1) (fl2 x))
-  (fl2-error x2 x1 x))
-
-(: test-fl2-conversion (Integer -> (Listof Fl2-Failure)))
-(define (test-fl2-conversion n)
-  (define xs (append standard-rs (sample-rational n)))
-  (define m (length xs))
-  (filter/ulp-error
-   (for/list: : (Listof Fl2-Failure) ([x  (in-list xs)]
-                                      [i  (in-naturals 1)])
-     (maybe-print-progress 'fl2 i m)
-     (list (list 'fl2 x) (fl2-conversion-error x)))
-   (current-max-ulp-error)))
-
-;; ===================================================================================================
-;; Flonum arithmetic with error
-
-(define-type Unary-Fl/Error-Failure (List (List Symbol Flonum) Fl2-Error))
-(define-type Binary-Fl/Error-Failure (List (List Symbol Flonum Flonum) Fl2-Error))
-
-(: unary-flonum/error-fun-error ((Flonum -> (Values Flonum Flonum)) (Bigfloat -> Bigfloat) Flonum
-                                                                    -> Fl2-Error))
-(define (unary-flonum/error-fun-error f g x)
-  (define-values (z2 z1) (f x))
-  (fl2-error z2 z1 (parameterize ([bf-precision 256])
-                     (bigfloat->real* (g (bf x))))))
-
-(: binary-flonum/error-fun-error ((Flonum Flonum -> (Values Flonum Flonum))
-                                  (Bigfloat Bigfloat -> Bigfloat)
-                                  Flonum Flonum
-                                  -> Fl2-Error))
-(define (binary-flonum/error-fun-error f g x y)
-  (define-values (z2 z1) (f x y))
-  (fl2-error z2 z1 (parameterize ([bf-precision 256])
-                     (bigfloat->real* (g (bf x) (bf y))))))
-
-(: test-unary-flonum/error-fun
-   (Symbol (Flonum -> (Values Flonum Flonum)) (Bigfloat -> Bigfloat) Integer
-           -> (Listof Unary-Fl/Error-Failure)))
-(define (test-unary-flonum/error-fun name f g n)
-  (define xs (append standard-xs (sample-flonum n)))
-  (define m (length xs))
-  (filter/ulp-error
-   (for/list: : (Listof Unary-Fl/Error-Failure) ([x  (in-list xs)]
-                                                 [i  (in-naturals 1)])
-     (maybe-print-progress name i m)
-     (list (list name x) (unary-flonum/error-fun-error f g x)))
-   (current-max-ulp-error)))
-
-(: test-binary-flonum/error-fun
-   (Symbol (Flonum Flonum -> (Values Flonum Flonum)) (Bigfloat Bigfloat -> Bigfloat) Integer
-           -> (Listof Binary-Fl/Error-Failure)))
-(define (test-binary-flonum/error-fun name f g n)
-  (define-values (pre-xs pre-ys) (product standard-xs standard-xs))
-  (define xs (append pre-xs (sample-flonum n)))
-  (define ys (append pre-ys (sample-flonum n)))
-  (define m (length xs))
-  (filter/ulp-error
-   (for/list: : (Listof Binary-Fl/Error-Failure) ([x  (in-list xs)]
-                                                  [y  (in-list ys)]
-                                                  [i  (in-naturals 1)])
-     (maybe-print-progress name i m)
-     (list (list name x y) (binary-flonum/error-fun-error f g x y)))
-   (current-max-ulp-error)))
-
-;; ===================================================================================================
-;; Flonum expansions
-
-(define-type Unary-Fl2-Failure (List (List Symbol Flonum Flonum) Fl2-Error))
-(define-type Binary-Fl2-Failure (List (List Symbol Flonum Flonum Flonum Flonum) Fl2-Error))
-
-(: unary-fl2-fun-error ((Flonum Flonum -> (Values Flonum Flonum)) (Bigfloat -> Bigfloat)
-                                                                  Flonum Flonum -> Fl2-Error))
-(define (unary-fl2-fun-error f g x2 x1)
-  (define-values (z2 z1) (f x2 x1))
-  (fl2-error z2 z1 (parameterize ([bf-precision 256])
-                     (bigfloat->real* (g (bf (fl2->real* x2 x1)))))))
-
-(: test-unary-fl2-fun
-   (Symbol (Flonum Flonum -> (Values Flonum Flonum)) (Bigfloat -> Bigfloat) Integer
-           -> (Listof Unary-Fl2-Failure)))
-(define (test-unary-fl2-fun name f g n)
-  (define xs (append standard-rs (sample-rational n)))
-  (define m (length xs))
-  (filter/ulp-error
-   (for/list: : (Listof Unary-Fl2-Failure) ([x  (in-list xs)]
-                                            [i  (in-naturals 1)])
-     (maybe-print-progress name i m)
-     (define-values (x2 x1) (fl2 x))
-     (list (list name x2 x1) (unary-fl2-fun-error f g x2 x1)))
-   (current-max-ulp-error)))
-
-(: binary-fl2-fun-error ((Flonum Flonum Flonum Flonum -> (Values Flonum Flonum))
-                         (Bigfloat Bigfloat -> Bigfloat)
-                         Flonum Flonum Flonum Flonum
-                         -> Fl2-Error))
-(define (binary-fl2-fun-error f g x2 x1 y2 y1)
-  (define-values (z2 z1) (f x2 x1 y2 y1))
-  (fl2-error z2 z1 (parameterize ([bf-precision 256])
-                     (bigfloat->real* (g (bf (fl2->real* x2 x1)) (bf (fl2->real* y2 y1)))))))
-
-(: test-binary-fl2-fun
-   (Symbol (Flonum Flonum Flonum Flonum -> (Values Flonum Flonum)) (Bigfloat Bigfloat -> Bigfloat)
-           Integer -> (Listof Binary-Fl2-Failure)))
-(define (test-binary-fl2-fun name f g n)
-  (define-values (pre-xs pre-ys) (product standard-rs standard-rs))
-  (define xs (append pre-xs (sample-rational n)))
-  (define ys (append pre-ys (sample-rational n)))
-  (define m (length xs))
-  (filter/ulp-error
-   (for/list: : (Listof Binary-Fl2-Failure) ([x  (in-list xs)]
-                                             [y  (in-list ys)]
-                                             [i  (in-naturals 1)])
-     (maybe-print-progress name i m)
-     (define-values (x2 x1) (fl2 x))
-     (define-values (y2 y1) (fl2 y))
-     (list (list name x2 x1 y2 y1) (binary-fl2-fun-error f g x2 x1 y2 y1)))
-   (current-max-ulp-error)))
-
-;; ===================================================================================================
-;; Flonum tests
-
-(define-syntax-rule (define-unary-flonum-test test-name flop bfop mn mx ulps)
-  (begin (: test-name (Natural -> (Listof Unary-Flonum-Failure)))
-         (define (test-name n)
-           (parameterize ([current-max-ulp-error  ulps])
-             (test-unary-flonum-fun 'flop flop bfop n mn mx)))))
-
-(define-syntax-rule (define-binary-flonum-test test-name flop bfop ulps)
-  (begin (: test-name (Natural -> (Listof Binary-Flonum-Failure)))
-         (define (test-name n)
-           (parameterize ([current-max-ulp-error  ulps])
-             (test-binary-flonum-fun 'flop flop bfop n)))))
-
-(define-unary-flonum-test test-flabs flabs bfabs -inf.0 +inf.0 flonum-fun-ulps)
-(define-unary-flonum-test test-flsqrt flsqrt bfsqrt 0.0 +inf.0 flonum-fun-ulps)
-(define-unary-flonum-test test-fllog fllog bflog 0.0 +inf.0 flonum-fun-ulps)
-(define-unary-flonum-test test-flexp flexp bfexp -746.0 710.0 flonum-fun-ulps)
-(define-unary-flonum-test test-flsin flsin bfsin -inf.0 +inf.0 flonum-fun-ulps)
-(define-unary-flonum-test test-flcos flcos bfcos -inf.0 +inf.0 flonum-fun-ulps)
-(define-unary-flonum-test test-fltan fltan bftan -inf.0 +inf.0 flonum-fun-ulps)
-(define-unary-flonum-test test-flasin flasin bfasin -1.0 1.0 flonum-fun-ulps)
-(define-unary-flonum-test test-flacos flacos bfacos -1.0 1.0 flonum-fun-ulps)
-(define-unary-flonum-test test-flatan flatan bfatan -inf.0 +inf.0 flonum-fun-ulps)
-(define-unary-flonum-test test-fllog2 fllog2 bflog2 0.0 +inf.0 fllog2-ulps)
-(define-binary-flonum-test test-fl+ fl+ bf+ flonum-fun-ulps)
-(define-binary-flonum-test test-fl- fl- bf- flonum-fun-ulps)
-(define-binary-flonum-test test-fl* fl* bf* flonum-fun-ulps)
-(define-binary-flonum-test test-fl/ fl/ bf/ flonum-fun-ulps)
-(define-binary-flonum-test test-flexpt flexpt bfexpt flonum-fun-ulps)
-(define-binary-flonum-test test-fllogb fllogb bflogb fllogb-ulps)
-
-;; ===================================================================================================
-;; Flonum/error tests
-
-(define-syntax-rule (define-unary-flop/error-test test-name flop bfop ulps)
-  (begin (: test-name (Natural -> (Listof Unary-Fl/Error-Failure)))
-         (define (test-name n)
-           (parameterize ([current-max-ulp-error  ulps])
-             (test-unary-flonum/error-fun 'flop flop bfop n)))))
-
-(define-syntax-rule (define-binary-flop/error-test test-name flop bfop ulps)
-  (begin (: test-name (Natural -> (Listof Binary-Fl/Error-Failure)))
-         (define (test-name n)
-           (parameterize ([current-max-ulp-error  ulps])
-             (test-binary-flonum/error-fun 'flop flop bfop n)))))
-
-(define-unary-flop/error-test test-flsqr/error flsqr/error bfsqr flonum/error-fun-ulps)
-(define-unary-flop/error-test test-flsqrt/error flsqrt/error bfsqrt flonum/error-fun-ulps)
-(define-unary-flop/error-test test-flexp/error flexp/error bfexp flexp/error-fun-ulps)
-(define-binary-flop/error-test test-fl+/error fl+/error bf+ flonum/error-fun-ulps)
-(define-binary-flop/error-test test-fl-/error fl-/error bf- flonum/error-fun-ulps)
-(define-binary-flop/error-test test-fl*/error fl*/error bf* flonum/error-fun-ulps)
-(define-binary-flop/error-test test-fl//error fl//error bf/ flonum/error-fun-ulps)
-
-;; ===================================================================================================
-;; fl2 tests
-
-(: test-fl2 (Natural -> (Listof Fl2-Failure)))
-(define (test-fl2 n)
-  (parameterize ([current-max-ulp-error  fl2-conversion-ulps])
-    (test-fl2-conversion n)))
-
-(define-syntax-rule (define-unary-fl2-test test-name fl2op bfop ulps)
-  (begin (: test-name (Natural -> (Listof Unary-Fl2-Failure)))
-         (define (test-name n)
-           (parameterize ([current-max-ulp-error  ulps])
-             (test-unary-fl2-fun 'fl2op fl2op bfop n)))))
-
-(define-syntax-rule (define-binary-fl2-test test-name fl2op bfop ulps)
-  (begin (: test-name (Natural -> (Listof Binary-Fl2-Failure)))
-         (define (test-name n)
-           (parameterize ([current-max-ulp-error  ulps])
-             (test-binary-fl2-fun 'fl2op fl2op bfop n)))))
-
-(define-unary-fl2-test test-fl2abs fl2abs bfabs unary-fl2-fun-ulps)
-(define-unary-fl2-test test-fl2sqr fl2sqr bfsqr unary-fl2-fun-ulps)
-(define-unary-fl2-test test-fl2sqrt fl2sqrt bfsqrt unary-fl2-fun-ulps)
-(define-unary-fl2-test test-fl2exp fl2exp bfexp fl2exp-fun-ulps)
-(define-unary-fl2-test test-fl2expm1 fl2expm1 bfexpm1 fl2exp-fun-ulps)
-(define-unary-fl2-test test-fl2log fl2log bflog fl2log-fun-ulps)
-(define-unary-fl2-test test-fl2log1p fl2log1p bflog1p fl2log-fun-ulps)
-(define-binary-fl2-test test-fl2+ fl2+ bf+ binary-fl2-fun-ulps)
-(define-binary-fl2-test test-fl2- fl2- bf- binary-fl2-fun-ulps)
-(define-binary-fl2-test test-fl2* fl2* bf* binary-fl2-fun-ulps)
-(define-binary-fl2-test test-fl2/ fl2/ bf/ binary-fl2-fun-ulps)
-
-;; ===================================================================================================
-;; Comprehensive test
-
-(: test-floating-point (Natural -> (Listof (U Unary-Flonum-Failure
-                                              Binary-Flonum-Failure
-                                              Unary-Fl/Error-Failure
-                                              Binary-Fl/Error-Failure
-                                              Fl2-Failure
-                                              Unary-Fl2-Failure
-                                              Binary-Fl2-Failure))))
-(define (test-floating-point n)
-  (append
-   ;; Hardware implementation tests
-   (test-flabs n)
-   (test-fl+ n)
-   (test-fl* n)
-   (test-fl- n)
-   (test-fl/ n)
-   (test-flsqrt n)
-   (test-fllog n)
-   (test-flexp n)
-   (test-flexpt n)
-   (test-flsin n)
-   (test-flcos n)
-   (test-fltan n)
-   (test-flasin n)
-   (test-flacos n)
-   (test-flatan n)
-   (test-fllog2 n)
-   (test-fllogb n)
-   ;; Derived tests
-   (test-fl+/error n)
-   (test-fl-/error n)
-   (test-fl*/error n)
-   (test-flsqr/error n)
-   (test-fl//error n)
-   (test-fl2 n)
-   (test-fl2abs n)
-   (test-fl2+ n)
-   (test-fl2- n)
-   (test-fl2* n)
-   (test-fl2sqr n)
-   (test-fl2/ n)
-   (test-flsqrt/error n)
-   (test-fl2sqrt n)
-   (test-flexp/error n)
-   (test-fl2exp n)
-   (test-fl2expm1 n)
-   (test-fl2log n)
-   (test-fl2log1p n)
-   ))
diff --git a/pkgs/math-pkgs/math-lib/math/private/vector/vector-fft.rkt b/pkgs/math-pkgs/math-lib/math/private/vector/vector-fft.rkt
deleted file mode 100644
index bbb38b299c..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/vector/vector-fft.rkt
+++ /dev/null
@@ -1,143 +0,0 @@
-#lang typed/racket/base
-
-(require racket/flonum
-         racket/fixnum
-         racket/list
-         racket/future
-         "../../base.rkt"
-         "../../flonum.rkt"
-         "../parameters.rkt"
-         "../unsafe.rkt")
-
-(provide vector-fft flvector-fft!
-         vector-inverse-fft flvector-inverse-fft!)
-
-;; Fast Fourier Transform
-
-(: init-d (-> Integer))
-(define (init-d)
-  (define t (max 1 (max-math-threads)))
-  (exact-ceiling (/ (log t) (log 2))))
-
-(: vector-fft (case-> ((Vectorof Float-Complex) -> (Vectorof Float-Complex))
-                      ((Vectorof Float-Complex) Integer -> (Vectorof Float-Complex))
-                      ((Vectorof Float-Complex) Integer Integer -> (Vectorof Float-Complex))))
-(define vector-fft
-  (case-lambda
-    [(as)    (vector-fft as 0 (vector-length as))]
-    [(as n)  (vector-fft as 0 n)]
-    [(as start end)
-     (define n (vector-length as))
-     (define as-r (for/flvector: #:length n ([a  (in-vector as)]) (real-part a)))
-     (define as-i (for/flvector: #:length n ([a  (in-vector as)]) (imag-part a)))
-     (define bs-r (make-flvector n))
-     (define bs-i (make-flvector n))
-     (flvector-fft! as-r as-i start end bs-r bs-i 0)
-     (for/vector: #:length n ([x  (in-flvector bs-r)]
-                              [y  (in-flvector bs-i)]) : Float-Complex
-       (make-rectangular x y))]))
-
-(: flvector-fft! (FlVector FlVector Integer Integer FlVector FlVector Integer -> Void))
-(define (flvector-fft! as-r as-i start end bs-r bs-i b-start)
-  (define len (min (flvector-length as-r) (flvector-length as-i)))
-  (cond
-    [(not (power-of-two? (- end start)))
-     (error 'vector-fft "expected power-of-two length; given length ~e" (- end start))]
-    [else
-     (let ([as-r  (flvector-copy as-r start end)]
-           [as-i  (flvector-copy as-i start end)])
-       (define n (flvector-length as-r))
-       (define xs-r (make-flvector n 0.0))
-       (define xs-i (make-flvector n 0.0))
-       (define a (real->double-flonum (first (dft-convention))))
-       (define b (real->double-flonum (second (dft-convention))))
-       (vector-fft/depth as-r as-i xs-r xs-i b n 0 (init-d))
-       (define c (flexpt (->fl n) (* 0.5 (- 1.0 a))))
-       (let loop ([#{j : Nonnegative-Fixnum} 0])
-         (when (j . < . n)
-           (define r (/ (unsafe-flvector-ref as-r j) c))
-           (define i (/ (unsafe-flvector-ref as-i j) c))
-           (let ([j  (+ j b-start)])
-             (unsafe-flvector-set! bs-r j r)
-             (unsafe-flvector-set! bs-i j i))
-           (loop (+ j 1)))))]))
-
-(: decimate-in-time! (FlVector FlVector FlVector FlVector Index Index -> Void))
-(define (decimate-in-time! as-r as-i xs-r xs-i n/2 start)
-  (let loop ([#{i : Nonnegative-Fixnum} 0])
-    (when (i . < . n/2)
-      (define si (+ start i))
-      (define si2 (unsafe-fx+ si i))
-      (define si21 (unsafe-fx+ si2 1))
-      (define sin2 (unsafe-fx+ si n/2))
-      (unsafe-flvector-set! xs-r si (unsafe-flvector-ref as-r si2))
-      (unsafe-flvector-set! xs-i si (unsafe-flvector-ref as-i si2))
-      (unsafe-flvector-set! xs-r sin2 (unsafe-flvector-ref as-r si21))
-      (unsafe-flvector-set! xs-i sin2 (unsafe-flvector-ref as-i si21))
-      (loop (+ i 1)))))
-
-(: twiddle-factor! (FlVector FlVector Float Index Index -> Void))
-(define (twiddle-factor! xs-r xs-i b n/2 start)
-  (define c (/ (* b pi 0.0+1.0i) (->fl n/2)))
-  (let loop ([#{k : Nonnegative-Fixnum} 0])
-    (when (k . < . n/2)
-      (define k-start (+ k start))
-      (define res (* (make-rectangular (unsafe-flvector-ref xs-r k-start)
-                                       (unsafe-flvector-ref xs-i k-start))
-                     (exp (* c (->fl k)))))
-      (unsafe-flvector-set! xs-r k-start (real-part res))
-      (unsafe-flvector-set! xs-i k-start (imag-part res))
-      (loop (+ k 1)))))
-
-(: combine! (FlVector FlVector FlVector FlVector Index Index -> Void))
-(define (combine! as-r as-i xs-r xs-i n/2 start)
-  (let loop ([#{k : Nonnegative-Fixnum} 0])
-    (when (k . < . n/2)
-      (define sk (+ start k))
-      (define sk2 (unsafe-fx+ sk n/2))
-      (define br (unsafe-flvector-ref xs-r sk))
-      (define bi (unsafe-flvector-ref xs-i sk))
-      (define cr (unsafe-flvector-ref xs-r sk2))
-      (define ci (unsafe-flvector-ref xs-i sk2))
-      (unsafe-flvector-set! as-r sk2 (- br cr))
-      (unsafe-flvector-set! as-i sk2 (- bi ci))
-      (unsafe-flvector-set! as-r sk (+ br cr))
-      (unsafe-flvector-set! as-i sk (+ bi ci))
-      (loop (+ k 1)))))
-
-(: vector-fft/depth (FlVector FlVector FlVector FlVector Float Index Index Integer -> Void))
-(define (vector-fft/depth as-r as-i xs-r xs-i b n start d)
-  (unless (= n 1)
-    (define n/2 (quotient n 2))
-    (decimate-in-time! as-r as-i xs-r xs-i n/2 start)
-    (cond [(= d 0)  (define start+n/2 (assert (+ start n/2) index?))
-                    (vector-fft/depth xs-r xs-i as-r as-i b n/2 start 0)
-                    (vector-fft/depth xs-r xs-i as-r as-i b n/2 start+n/2 0)
-                    (twiddle-factor! xs-r xs-i b n/2 start+n/2)]
-          [else
-           (define bs (future (λ () (vector-fft/depth xs-r xs-i as-r as-i b n/2 start (- d 1)))))
-           (define cs (future (λ ()
-                                (define start+n/2 (assert (+ start n/2) index?))
-                                (vector-fft/depth xs-r xs-i as-r as-i b n/2 start+n/2 (- d 1))
-                                (twiddle-factor! xs-r xs-i b n/2 start+n/2))))
-           (touch bs)
-           (touch cs)])
-    (combine! as-r as-i xs-r xs-i n/2 start)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Inverse Fast Fourier Transform
-
-(: vector-inverse-fft (case-> ((Vectorof Float-Complex) -> (Vectorof Float-Complex))
-                              ((Vectorof Float-Complex) Integer -> (Vectorof Float-Complex))
-                              ((Vectorof Float-Complex) Integer Integer -> (Vectorof Float-Complex))))
-(define vector-inverse-fft
-  (case-lambda
-    [(as)    (vector-fft as 0 (vector-length as))]
-    [(as n)  (vector-fft as 0 n)]
-    [(as start end)  (parameterize ([dft-convention  (dft-inverse-convention)])
-                       (vector-fft as start end))]))
-
-(: flvector-inverse-fft! (FlVector FlVector Integer Integer FlVector FlVector Integer -> Void))
-(define (flvector-inverse-fft! as-r as-i start end bs-r bs-i b-start)
-  (parameterize ([dft-convention  (dft-inverse-convention)])
-    (flvector-fft! as-r as-i start end bs-r bs-i b-start)))
diff --git a/pkgs/math-pkgs/math-lib/math/private/vector/vector-mutate.rkt b/pkgs/math-pkgs/math-lib/math/private/vector/vector-mutate.rkt
deleted file mode 100644
index 59cb2d8b14..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/vector/vector-mutate.rkt
+++ /dev/null
@@ -1,168 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         math/base
-         math/private/unsafe)
-
-(provide vector-swap!
-         vector-scale!
-         vector-scaled-add!
-         vector-mag^2
-         vector-dot
-         vector-normalize!
-         vector-sub-proj!
-         vector-zero!
-         vector-zero?)
-
-(: mag^2 (case-> (Flonum -> Nonnegative-Flonum)
-                 (Float-Complex -> Nonnegative-Flonum)
-                 (Number -> Nonnegative-Real)))
-(define (mag^2 x)
-  (cond [(real? x)  (sqr x)]
-        [else  (abs (real-part (* x (conjugate x))))]))
-
-(: vector-swap! (All (A) ((Vectorof A) Integer Integer -> Void)))
-(define (vector-swap! vs i0 i1)
-  (unless (= i0 i1)
-    (define tmp (unsafe-vector-ref vs i0))
-    (unsafe-vector-set! vs i0 (unsafe-vector-ref vs i1))
-    (unsafe-vector-set! vs i1 tmp)))
-
-(define-syntax-rule (vector-generic-scale! vs-expr v-expr *)
-  (let* ([vs  vs-expr]
-         [v   v-expr]
-         [n   (vector-length vs)])
-    (let loop ([#{i : Nonnegative-Fixnum} 0])
-      (if (i . fx< . n)
-          (begin (unsafe-vector-set! vs i (* v (unsafe-vector-ref vs i)))
-                 (loop (fx+ i 1)))
-          (void)))))
-
-(: vector-scale! (case-> ((Vectorof Flonum) Flonum -> Void)
-                         ((Vectorof Real) Real -> Void)
-                         ((Vectorof Float-Complex) Float-Complex -> Void)
-                         ((Vectorof Number) Number -> Void)))
-(define (vector-scale! vs v)
-  (vector-generic-scale! vs v *))
-
-(define-syntax-rule (vector-generic-scaled-add! vs0-expr vs1-expr v-expr start-expr + *)
-  (let* ([vs0  vs0-expr]
-         [vs1  vs1-expr]
-         [v    v-expr]
-         [n    (fxmin (vector-length vs0) (vector-length vs1))])
-    (let loop ([#{i : Nonnegative-Fixnum} (fxmin start-expr n)])
-      (if (i . fx< . n)
-          (begin (unsafe-vector-set! vs0 i (+ (unsafe-vector-ref vs0 i)
-                                              (* (unsafe-vector-ref vs1 i) v)))
-                 (loop (fx+ i 1)))
-          (void)))))
-
-(: vector-scaled-add!
-   (case-> ((Vectorof Flonum) (Vectorof Flonum) Flonum -> Void)
-           ((Vectorof Flonum) (Vectorof Flonum) Flonum Index -> Void)
-           ((Vectorof Real) (Vectorof Real) Real -> Void)
-           ((Vectorof Real) (Vectorof Real) Real Index -> Void)
-           ((Vectorof Float-Complex) (Vectorof Float-Complex) Float-Complex -> Void)
-           ((Vectorof Float-Complex) (Vectorof Float-Complex) Float-Complex Index -> Void)
-           ((Vectorof Number) (Vectorof Number) Number -> Void)
-           ((Vectorof Number) (Vectorof Number) Number Index -> Void)))
-(define (vector-scaled-add! vs0 vs1 s [start 0])
-  (vector-generic-scaled-add! vs0 vs1 s start + *))
-
-(: vector-mag^2 (case-> ((Vectorof Flonum) -> Nonnegative-Flonum)
-                        ((Vectorof Real) -> Nonnegative-Real)
-                        ((Vectorof Float-Complex) -> Nonnegative-Flonum)
-                        ((Vectorof Number) -> Nonnegative-Real)))
-(define (vector-mag^2 vs)
-  (define n (vector-length vs))
-  (cond [(fx= n 0)  (raise-argument-error 'vector-mag^2 "nonempty Vector" vs)]
-        [else
-         (define s (mag^2 (unsafe-vector-ref vs 0)))
-         (let: loop ([i : Nonnegative-Fixnum  1] [s s])
-           (cond [(i . fx< . n)  (loop (fx+ i 1) (+ s (mag^2 (unsafe-vector-ref vs i))))]
-                 [else  (abs s)]))]))
-
-(: vector-dot (case-> ((Vectorof Flonum) (Vectorof Flonum) -> Flonum)
-                      ((Vectorof Real) (Vectorof Real) -> Real)
-                      ((Vectorof Float-Complex) (Vectorof Float-Complex) -> Float-Complex)
-                      ((Vectorof Number) (Vectorof Number) -> Number)))
-(define (vector-dot vs0 vs1)
-  (define n (min (vector-length vs0) (vector-length vs1)))
-  (cond [(fx= n 0)  (raise-argument-error 'vector-dot "nonempty Vector" 0 vs0 vs1)]
-        [else
-         (define v0 (unsafe-vector-ref vs0 0))
-         (define v1 (unsafe-vector-ref vs1 0))
-         (let loop ([#{i : Nonnegative-Fixnum} 1] [s (* v0 (conjugate v1))])
-           (cond [(i . fx< . n)
-                  (define v0 (unsafe-vector-ref vs0 i))
-                  (define v1 (unsafe-vector-ref vs1 i))
-                  (loop (fx+ i 1) (+ s (* v0 (conjugate v1))))]
-                 [else  s]))]))
-
-(: vector-normalize! (case-> ((Vectorof Flonum) -> Nonnegative-Flonum)
-                             ((Vectorof Real) -> Nonnegative-Real)
-                             ((Vectorof Float-Complex) -> Nonnegative-Flonum)
-                             ((Vectorof Number) -> Nonnegative-Real)))
-(define (vector-normalize! vs)
-  (define n (vector-length vs))
-  (define s (sqrt (vector-mag^2 vs)))
-  (unless (and (zero? s) (exact? s))
-    (let loop ([#{i : Nonnegative-Fixnum} 0])
-      (when (i . fx< . n)
-        (unsafe-vector-set! vs i (/ (unsafe-vector-ref vs i) s))
-        (loop (fx+ i 1)))))
-  s)
-
-(: one (case-> (Flonum -> Nonnegative-Flonum)
-               (Real -> Nonnegative-Real)
-               (Float-Complex -> Nonnegative-Flonum)
-               (Number -> Nonnegative-Real)))
-(define (one x)
-  (cond [(flonum? x)  1.0]
-        [(real? x)  1]
-        [(float-complex? x)  1.0]
-        [else  1]))
-
-(: vector-sub-proj!
-   (case-> ((Vectorof Flonum) (Vectorof Flonum) Any -> Nonnegative-Flonum)
-           ((Vectorof Real) (Vectorof Real) Any -> Nonnegative-Real)
-           ((Vectorof Float-Complex) (Vectorof Float-Complex) Any -> Nonnegative-Flonum)
-           ((Vectorof Number) (Vectorof Number) Any -> Nonnegative-Real)))
-(define (vector-sub-proj! vs0 vs1 unit?)
-  (define n (min (vector-length vs0) (vector-length vs1)))
-  (cond [(fx= n 0)  (raise-argument-error 'vector-sub-proj! "nonempty Vector" 0 vs0 vs1)]
-        [else
-         (define t (if unit? (one (unsafe-vector-ref vs0 0)) (vector-mag^2 vs1)))
-         (unless (and (zero? t) (exact? t))
-           (define s (/ (vector-dot vs0 vs1) t))
-           (let loop ([#{i : Nonnegative-Fixnum} 0])
-             (when (i . fx< . n)
-               (define v0 (unsafe-vector-ref vs0 i))
-               (define v1 (unsafe-vector-ref vs1 i))
-               (unsafe-vector-set! vs0 i (- v0 (* v1 s)))
-               (loop (fx+ i 1)))))
-         t]))
-
-(: vector-zero! (case-> ((Vectorof Flonum) -> Void)
-                        ((Vectorof Real) -> Void)
-                        ((Vectorof Float-Complex) -> Void)
-                        ((Vectorof Number) -> Void)))
-(define (vector-zero! vs)
-  (define n (vector-length vs))
-  (let loop ([#{i : Nonnegative-Fixnum} 0])
-    (when (i . fx< . n)
-      (define x (unsafe-vector-ref vs i))
-      (unsafe-vector-set! vs i (- x x))
-      (loop (fx+ i 1)))))
-
-(: vector-zero? (case-> ((Vectorof Flonum) -> Boolean)
-                        ((Vectorof Real) -> Boolean)
-                        ((Vectorof Float-Complex) -> Boolean)
-                        ((Vectorof Number) -> Boolean)))
-(define (vector-zero? vs)
-  (define n (vector-length vs))
-  (let loop ([#{i : Nonnegative-Fixnum} 0])
-    (cond [(i . fx>= . n)  #t]
-          [(zero? (unsafe-vector-ref vs i))
-           (loop (fx+ i 1))]
-          [else  #f])))
diff --git a/pkgs/math-pkgs/math-lib/math/private/vector/vector.rkt b/pkgs/math-pkgs/math-lib/math/private/vector/vector.rkt
deleted file mode 100644
index 60c8e4835e..0000000000
--- a/pkgs/math-pkgs/math-lib/math/private/vector/vector.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang typed/racket/base
-
-(require racket/fixnum
-         racket/performance-hint
-         "../unsafe.rkt")
-
-(provide for/vector: for*/vector: vector-ref!)
-
-(begin-encourage-inline
-  
-  (: vector-ref!
-     (All (A B) (case-> ((Vectorof (U A False)) Integer (-> A) -> A)
-                        ((Vectorof (U A B)) Integer (-> A) (Any -> Boolean : B) -> A))))
-  (define vector-ref!
-    (case-lambda
-      [(vs i thnk)  (vector-ref! vs i thnk not)]
-      [(vs i thnk nothing?)
-       (define n (vector-length vs))
-       (cond [(and (fixnum? i) (i . fx>= . 0) (i . fx< . n))
-              (define v (unsafe-vector-ref vs i))
-              (if (nothing? v)
-                  (let ([v  (thnk)])
-                    (unsafe-vector-set! vs i v)
-                    v)
-                  v)]
-             [else
-              (raise-range-error 'vector-ref! "Vector" "" i vs 0 n #f)])]))
-  
-  )  ; begin-encourage-inline
diff --git a/pkgs/math-pkgs/math-lib/math/special-functions.rkt b/pkgs/math-pkgs/math-lib/math/special-functions.rkt
deleted file mode 100644
index 062b686b10..0000000000
--- a/pkgs/math-pkgs/math-lib/math/special-functions.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket/base
-
-(require typed/untyped-utils)
-
-(require (except-in "private/functions/gamma.rkt" gamma)
-         (except-in "private/functions/log-gamma.rkt" log-gamma)
-         (except-in "private/functions/beta.rkt" beta log-beta)
-         (except-in "private/functions/erf.rkt" erf erfc)
-         (except-in "private/functions/lambert.rkt" lambert)
-         (except-in "private/functions/zeta.rkt" eta zeta)
-         (except-in "private/functions/hurwitz-zeta.rkt" hurwitz-zeta)
-         "private/functions/psi.rkt"
-         "private/functions/incomplete-gamma.rkt"
-         "private/functions/incomplete-beta.rkt"
-         "private/functions/stirling-error.rkt")
-
-(require/untyped-contract
- "private/functions/gamma.rkt"
- [gamma  (Real -> Real)])
-
-(require/untyped-contract
- "private/functions/log-gamma.rkt"
- [log-gamma  (Real -> Real)])
-
-(require/untyped-contract
- "private/functions/beta.rkt"
- [beta  (Real Real -> Real)]
- [log-beta  (Real Real -> Real)])
-
-(require/untyped-contract
- "private/functions/erf.rkt"
- [erf   (Real -> Real)]
- [erfc  (Real -> Real)])
-
-(require/untyped-contract
- "private/functions/lambert.rkt"
- [lambert  (Real -> Real)])
-
-(require/untyped-contract
- "private/functions/zeta.rkt"
- [eta   (Real -> Real)]
- [zeta  (Real -> Real)])
-
-(require/untyped-contract
- "private/functions/hurwitz-zeta.rkt"
- [hurwitz-zeta  (Real Real -> Real)])
-
-(provide (all-from-out
-          "private/functions/gamma.rkt"
-          "private/functions/log-gamma.rkt"
-          "private/functions/beta.rkt"
-          "private/functions/erf.rkt"
-          "private/functions/lambert.rkt"
-          "private/functions/zeta.rkt"
-          "private/functions/hurwitz-zeta.rkt"
-          "private/functions/psi.rkt"
-          "private/functions/incomplete-gamma.rkt"
-          "private/functions/incomplete-beta.rkt"
-          "private/functions/stirling-error.rkt")
-         gamma
-         log-gamma
-         beta log-beta
-         erf erfc
-         lambert
-         eta zeta
-         hurwitz-zeta
-         )
diff --git a/pkgs/math-pkgs/math-lib/math/statistics.rkt b/pkgs/math-pkgs/math-lib/math/statistics.rkt
deleted file mode 100644
index 741d1a7651..0000000000
--- a/pkgs/math-pkgs/math-lib/math/statistics.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/base
-
-(require "private/statistics/statistics-struct.rkt"
-         "private/statistics/expected-values.rkt"
-         "private/statistics/correlation.rkt"
-         "private/statistics/order-statistics.rkt"
-         "private/statistics/counting.rkt"
-         "private/statistics/monte-carlo.rkt"
-         "private/statistics/hpd-interval.rkt")
-
-(provide (all-from-out
-          "private/statistics/statistics-struct.rkt"
-          "private/statistics/expected-values.rkt"
-          "private/statistics/correlation.rkt"
-          "private/statistics/order-statistics.rkt"
-          "private/statistics/counting.rkt"
-          "private/statistics/monte-carlo.rkt"
-          "private/statistics/hpd-interval.rkt"))
diff --git a/pkgs/math-pkgs/math-lib/math/utils.rkt b/pkgs/math-pkgs/math-lib/math/utils.rkt
deleted file mode 100644
index 9581168c70..0000000000
--- a/pkgs/math-pkgs/math-lib/math/utils.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket
-
-(require "private/parameters.rkt"
-         "private/utils/flonum-tests.rkt")
-
-(provide (all-from-out
-          "private/parameters.rkt"
-          "private/utils/flonum-tests.rkt"))
diff --git a/pkgs/math-pkgs/math-lib/math/vector.rkt b/pkgs/math-pkgs/math-lib/math/vector.rkt
deleted file mode 100644
index 00daa8e72a..0000000000
--- a/pkgs/math-pkgs/math-lib/math/vector.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket/base
-
-(require "private/vector/vector.rkt"
-         "private/vector/vector-fft.rkt")
-
-(provide (all-from-out
-          "private/vector/vector.rkt"
-          "private/vector/vector-fft.rkt"))
diff --git a/pkgs/math-pkgs/math-test/LICENSE.txt b/pkgs/math-pkgs/math-test/LICENSE.txt
deleted file mode 100644
index 0d5401b315..0000000000
--- a/pkgs/math-pkgs/math-test/LICENSE.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-The math collection is distributed under the GNU Lesser General Public
-License Version 3 (LGPLv3) just like the majority of Racket's libraries.
-The LGPLv3 license text is included in the file "COPYING_LESSER.txt".
-
-Some of the math library code is derived from the C++ project Boost,
-from source files released under the Boost Software License Version 1.0
-(BSLv1.0). This license is compatible with the LGPLv3, provided the
-BSLv1.0 license text is distributed along with any source code derived
-from BSLv1.0 works.
-
-Some of the math library is derived from ubiquitous C libraries released
-under a license with similar terms.
-
-To comply with the terms of the BSLv1.0, its text is duplicated here:
-
-============================================================================
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-============================================================================
-
-
-To comply with the terms of the other license, its text is duplicated here:
-
-============================================================================
-Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
-
-Developed at SunPro, a Sun Microsystems, Inc. business. Permission to use,
-copy, modify, and distribute this software is freely granted, provided that
-this notice is preserved.
-============================================================================
diff --git a/pkgs/math-pkgs/math-test/info.rkt b/pkgs/math-pkgs/math-test/info.rkt
deleted file mode 100644
index 938de6cddc..0000000000
--- a/pkgs/math-pkgs/math-test/info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "math-lib"
-               "racket-test"
-               "rackunit-lib"
-               "typed-racket-lib"
-               "typed-racket-more"))
-
-(define build-deps '())
-(define update-implies '("math-lib"))
-
-(define pkg-desc "Math library tests")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/math-pkgs/math-test/math/info.rkt b/pkgs/math-pkgs/math-test/math/info.rkt
deleted file mode 100644
index 38d2700d4e..0000000000
--- a/pkgs/math-pkgs/math-test/math/info.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang info
-(define compile-omit-paths '("tests"))
diff --git a/pkgs/math-pkgs/math-test/math/tests/array-strictness-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/array-strictness-tests.rkt
deleted file mode 100644
index 0981d5695f..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/array-strictness-tests.rkt
+++ /dev/null
@@ -1,187 +0,0 @@
-#lang typed/racket
-
-(require math/array
-         typed/rackunit)
-
-(define (check-always)
-  (printf "(array-strictness) = ~v~n" (array-strictness))
-  (check-true (array-strict? (make-array #(4 4) 0)))
-  (check-true (array-strict? (indexes-array #(4 4))))
-  (check-true (array-strict? (index-array #(4 4))))
-  (check-true (array-strict? (axis-index-array #(4 4) 0)))
-  (check-true (array-strict? (diagonal-array 2 6 1 0)))
-  (check-true (array-strict? (list->array '(1 2 3 4))))
-  (check-true (array-strict? (list->array #(2 2) '(1 2 3 4))))
-  (check-true (array-strict? (list*->array 0 exact-integer?)))
-  (check-true (array-strict? (list*->array '(1 2 3 4) exact-integer?)))
-  (check-true (array-strict? (list*->array '((1 2) (3 4)) exact-integer?)))
-  (check-true (array-strict? (vector->array #(1 2 3 4))))
-  (check-true (array-strict? (vector->array #(2 2) #(1 2 3 4))))
-  (check-true (array-strict? (vector*->array 0 exact-integer?)))
-  (check-true (array-strict? ((inst vector*->array Integer) #(1 2 3 4) exact-integer?)))
-  (check-true (array-strict? ((inst vector*->array Integer) #(#(1 2) #(3 4)) exact-integer?)))
-  (check-true (array-strict? (build-simple-array #(4 4) (λ (_) 0))))
-  (check-false (array-strict? (array-lazy (build-simple-array #(4 4) (λ (_) 0)))))
-  )
-
-(define nonstrict-2x2-arr
-  (parameterize ([array-strictness #f])
-    (build-array #(2 2) (λ (_) 0))))
-
-(define strict-2x2-arr
-  (parameterize ([array-strictness #t])
-    (build-array #(2 2) (λ (_) 0))))
-
-(define 2x2-indexes-arr
-  (array #['#(0 0) '#(1 1)]))
-
-(check-false (array-strict? nonstrict-2x2-arr))
-(check-true (array-strict? strict-2x2-arr))
-
-(parameterize ([array-strictness #t])
-  (check-always)
-  (check-true (array-strict? (array-list->array (list))))
-  (check-true (array-strict? (array-list->array (list (array #[0 1])))))
-  (check-true (array-strict? (array-list->array (list (array #[0 1]) (array #[2 3])))))
-  (check-true (andmap (inst array-strict? Integer) (sequence->list (in-array-axis (array #[0 1])))))
-  (check-false (array-strict? (array-broadcast nonstrict-2x2-arr ((inst vector Index) 2 2))))
-  (check-true (array-strict? (array-broadcast nonstrict-2x2-arr ((inst vector Index) 2 4))))
-  (check-true (array-strict? (array-broadcast strict-2x2-arr ((inst vector Index) 2 2))))
-  (check-false (array-strict? (array-broadcast strict-2x2-arr ((inst vector Index) 2 4))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (array-indexes-ref arr 2x2-indexes-arr))))
-  
-  (for*: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-          [spec  (list '(0) 0)])
-    (check-true (array-strict? (array-slice-ref arr (list (::) spec))))
-    (check-true (array-strict? (array-slice-ref arr (list (::) (::new 2) spec)))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (array-transform arr #(2 2)
-                                                (λ: ([js : Indexes])
-                                                  (vector (vector-ref js 1) (vector-ref js 0)))))))
-  
-  (for: ([k  (list 0 1)])
-    (check-true (array-strict? (array-append* (list nonstrict-2x2-arr strict-2x2-arr) k))))
-  
-  (for*: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-          [k  (list 0 1)]
-          [dk  (list 0 1 2)])
-    (check-true (array-strict? (array-axis-insert arr k dk))))
-  
-  (for*: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-          [k  (list 0 1)]
-          [jk  (list 0 1)])
-    (check-true (array-strict? (array-axis-ref arr k jk))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (array-axis-swap arr 0 1))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (array-axis-permute arr '(1 0)))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (array-reshape arr #(4)))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (array-flatten arr))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-         [k  (list 0 1)])
-    (check-true (array-strict? (array-axis-sum arr k))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-         [k  (list 0 1)])
-    (check-true (array-strict? (array-axis-count arr k even?))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-         [k  (list 0 1)])
-    (check-true (array-strict? (array-axis-and (array-map even? arr) k))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-         [k  (list 0 1)])
-    (check-true (array-strict? (array-axis-or (array-map even? arr) k))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (array->list-array arr))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (list-array->array (array->list-array arr)))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (array-fold arr (inst array->list-array (Listof* Integer))))))
-  )
-
-(parameterize ([array-strictness #f])
-  (check-always)
-  (check-false (array-strict? (array-list->array (list))))
-  (check-false (array-strict? (array-list->array (list (array #[0 1])))))
-  (check-false (array-strict? (array-list->array (list (array #[0 1]) (array #[2 3])))))
-  (check-false (ormap (inst array-strict? Integer) (sequence->list (in-array-axis (array #[0 1])))))
-  (check-false (array-strict? (array-broadcast nonstrict-2x2-arr ((inst vector Index) 2 2))))
-  (check-false (array-strict? (array-broadcast nonstrict-2x2-arr ((inst vector Index) 2 4))))
-  (check-true (array-strict? (array-broadcast strict-2x2-arr ((inst vector Index) 2 2))))
-  (check-false (array-strict? (array-broadcast strict-2x2-arr ((inst vector Index) 2 4))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-false (array-strict? (array-indexes-ref arr 2x2-indexes-arr))))
-  
-  (for*: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-          [spec  (list '(0) 0)])
-    (check-false (array-strict? (array-slice-ref arr (list (::) spec))))
-    (check-false (array-strict? (array-slice-ref arr (list (::) (::new 2) spec)))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-false (array-strict? (array-transform arr #(2 2)
-                                                 (λ: ([js : Indexes])
-                                                   (vector (vector-ref js 1) (vector-ref js 0)))))))
-  
-  (for: ([k  (list 0 1)])
-    (check-false (array-strict? (array-append* (list nonstrict-2x2-arr strict-2x2-arr) k))))
-  
-  (for*: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)] [k  (list 0 1)] [dk  (list 0 1 2)])
-    (check-false (array-strict? (array-axis-insert arr k dk))))
-  
-  (for*: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-          [k  (list 0 1)]
-          [jk  (list 0 1)])
-    (check-false (array-strict? (array-axis-ref arr k jk))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-false (array-strict? (array-axis-swap arr 0 1))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-false (array-strict? (array-axis-permute arr '(1 0)))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-false (array-strict? (array-reshape arr #(4)))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-false (array-strict? (array-flatten arr))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-         [k  (list 0 1)])
-    (check-false (array-strict? (array-axis-sum arr k))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-         [k  (list 0 1)])
-    (check-false (array-strict? (array-axis-count arr k even?))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-         [k  (list 0 1)])
-    (check-false (array-strict? (array-axis-and (array-map even? arr) k))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)]
-         [k  (list 0 1)])
-    (check-false (array-strict? (array-axis-or (array-map even? arr) k))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-false (array-strict? (array->list-array arr))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-false (array-strict? (list-array->array (array->list-array arr)))))
-  
-  (for: ([arr  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-false (array-strict? (array-fold arr (inst array->list-array (Listof* Integer))))))
-  )
diff --git a/pkgs/math-pkgs/math-test/math/tests/array-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/array-tests.rkt
deleted file mode 100644
index 4772c2db83..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/array-tests.rkt
+++ /dev/null
@@ -1,1009 +0,0 @@
-#lang typed/racket
-
-(require racket/flonum
-         math/array
-         (rename-in
-          (except-in typed/rackunit check-eq?)
-          [check-equal?  old:check-equal?])
-         math/private/array/utils)
-
-(define-predicate listof-index? (Listof Index))
-(define-predicate listof-flonum? (Listof Float))
-(define-predicate undefined? Undefined)
-
-;; This gets around the fact that typed/rackunit can no longer test higher-order values for equality,
-;; since TR has firmed up its rules on passing `Any' types in and out of untyped code
-(define-syntax-rule (check-equal? a b . message)
-  (check-true (equal? a b) . message))
-
-(define-syntax-rule (check-eq? a b . message)
-  (check-equal? (eq-hash-code a) (eq-hash-code b) . message))
-
-(define-syntax-rule (array-axis-andmap arr k pred?)
-  (array-axis-and (array-map pred? arr) k))
-
-(define-syntax-rule (array-axis-ormap arr k pred?)
-  (array-axis-or (array-map pred? arr) k))
-
-;; ---------------------------------------------------------------------------------------------------
-;; array-mutable
-
-(: make-indexes-vector (Integer Integer -> (Vectorof (Vectorof Integer))))
-(define (make-indexes-vector n dims)
-  (list->vector
-   ((inst map (Vectorof Integer) (Listof Integer))
-    list->vector
-    (let: loop : (Listof (Listof Integer)) ([n : Integer  n])
-      (cond [(= n 0)  (list null)]
-            [else  (define lsts (loop (- n 1)))
-                   (append* (for/list: : (Listof (Listof (Listof Integer))) ([k  (in-range dims)])
-                              (map (λ: ([lst : (Listof Integer)]) (cons k lst)) lsts)))])))))
-
-(check-equal? (make-indexes-vector 2 3)
-              #(#(0 0) #(0 1) #(0 2) #(1 0) #(1 1) #(1 2) #(2 0) #(2 1) #(2 2)))
-
-(let ([arr  (vector->array #(4) #(a b c d))])
-  (check-eq? arr (array-strict arr)))
-
-(let ([arr  (build-array #() (λ (js) 'foo))])
-  (check-equal? (mutable-array-data (array->mutable-array arr))
-                #(foo)))
-
-(let ([arr  ((inst build-array Float) #(4) (λ (js) (exact->inexact (vector-ref js 0))))])
-  (check-equal? (mutable-array-data (array->mutable-array arr))
-                #(0.0 1.0 2.0 3.0)))
-
-(let ([arr  ((inst build-array Float) #(0) (λ (js) (exact->inexact (vector-ref js 0))))])
-  (check-equal? (mutable-array-data (array->mutable-array arr))
-                #()))
-
-(let ([arr  (build-array #(3 3) (λ (js) js))])
-  (check-equal? (mutable-array-data (array->mutable-array arr))
-                (make-indexes-vector 2 3)))
-
-(let ([arr  (build-array #(2 2 2) (λ (js) js))])
-  (check-equal? (mutable-array-data (array->mutable-array arr))
-                (make-indexes-vector 3 2)))
-
-(let ([arr  (build-array #(2 2 2 2) (λ (js) js))])
-  (check-equal? (mutable-array-data (array->mutable-array arr))
-                (make-indexes-vector 4 2)))
-
-(let ([arr  (build-array #(2 2 2 2 2) (λ (js) js))])
-  (check-equal? (mutable-array-data (array->mutable-array arr))
-                (make-indexes-vector 5 2)))
-
-(let ([arr  (build-array #(2 2 2 2 2 2) (λ (js) js))])
-  (check-equal? (mutable-array-data (array->mutable-array arr))
-                (make-indexes-vector 6 2)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; list*->array
-
-(check-equal? (list*->array 1.0 flonum?)
-              (vector->array #() #(1.0)))
-
-(check-equal? (list*->array '[] flonum?)
-              (vector->array #(0) #()))
-
-(check-equal? (list*->array '[[]] flonum?)
-              (vector->array #(1 0) #()))
-
-(check-equal? (list*->array '[1.0] flonum?)
-              (vector->array #(1) #(1.0)))
-
-(check-equal? (list*->array '[[1.0]] flonum?)
-              (vector->array #(1 1) #(1.0)))
-
-(check-equal? (list*->array '[[[1.0]]] flonum?)
-              (vector->array #(1 1 1) #(1.0)))
-
-(check-equal? (list*->array '() listof-flonum?)
-              (vector->array #() #(())))
-
-(check-equal? (list*->array '[()] listof-flonum?)
-              (vector->array #(1) #(())))
-
-(check-equal? (list*->array '[(1.0) (2.0)] listof-flonum?)
-              (vector->array #(2) #((1.0) (2.0))))
-
-(check-equal? (list*->array '[((1.0)) ((2.0))] listof-flonum?)
-              (vector->array #(2 1) #((1.0) (2.0))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; array->list*
-
-(let ([arr  (build-array #() (λ (js) 'foo))])
-  (check-equal? (array->list* arr) 'foo)
-  (check-equal? arr (list*->array (array->list* arr) symbol?)))
-
-(let ([arr  ((inst build-array Float) #(4) (λ (js) (exact->inexact (vector-ref js 0))))])
-  (check-equal? (array->list* arr) '[0.0 1.0 2.0 3.0])
-  (check-equal? arr (list*->array (array->list* arr) flonum?)))
-
-(let ([arr  (build-array #(3 3) (inst vector->list Index))])
-  (check-equal? (array->list* arr) '[[(0 0) (0 1) (0 2)]
-                                     [(1 0) (1 1) (1 2)]
-                                     [(2 0) (2 1) (2 2)]])
-  (check-equal? arr (list*->array (array->list* arr) listof-index?)))
-
-(let ([arr  (build-array #(2 2 2) (inst vector->list Index))])
-  (check-equal? (array->list* arr)
-                '[[[(0 0 0) (0 0 1)] [(0 1 0) (0 1 1)]]
-                  [[(1 0 0) (1 0 1)] [(1 1 0) (1 1 1)]]])
-  (check-equal? arr (list*->array (array->list* arr) listof-index?)))
-
-(let ([arr  (build-array #(2 2 2 2) (inst vector->list Index))])
-  (check-equal? (array->list* arr)
-                '[[[[(0 0 0 0) (0 0 0 1)] [(0 0 1 0) (0 0 1 1)]]
-                   [[(0 1 0 0) (0 1 0 1)] [(0 1 1 0) (0 1 1 1)]]]
-                  [[[(1 0 0 0) (1 0 0 1)] [(1 0 1 0) (1 0 1 1)]]
-                   [[(1 1 0 0) (1 1 0 1)] [(1 1 1 0) (1 1 1 1)]]]])
-  (check-equal? arr (list*->array (array->list* arr) listof-index?)))
-
-(check-equal? (array->list* (list*->array '[1.0 2.0] flonum?))
-              '[1.0 2.0])
-(check-equal? (array->list* (list*->array '[[1.0 2.0] [3.0 4.0]] flonum?))
-              '[[1.0 2.0] [3.0 4.0]])
-
-;; ---------------------------------------------------------------------------------------------------
-;; vector*->array
-
-(check-equal? (vector*->array 1.0 flonum?)
-              (vector->array #() #(1.0)))
-
-(check-equal? ((inst vector*->array Float) #() flonum?)
-              (vector->array #(0) #()))
-
-(check-equal? ((inst vector*->array Float) #(#()) flonum?)
-              (vector->array #(1 0) #()))
-
-(check-equal? ((inst vector*->array Float) #(1.0) flonum?)
-              (vector->array #(1) #(1.0)))
-
-(check-equal? ((inst vector*->array Float) #(#(1.0)) flonum?)
-              (vector->array #(1 1) #(1.0)))
-
-(check-equal? ((inst vector*->array Float) #(#(#(1.0))) flonum?)
-              (vector->array #(1 1 1) #(1.0)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; array->vector
-
-(let ([arr : (Array Symbol) (build-array #() (λ (js) 'foo))])
-  (check-equal? (array->vector* arr) 'foo)
-  (check-equal? arr (vector*->array (array->vector* arr) symbol?)))
-
-(let ([arr  ((inst build-array Float) #(4) (λ (js) (exact->inexact (vector-ref js 0))))])
-  (check-equal? (array->vector* arr) #(0.0 1.0 2.0 3.0))
-  (check-equal? arr (vector*->array (array->vector* arr) flonum?)))
-
-(let ([arr  (build-array #(3 3) (inst vector->list Index))])
-  (check-equal? (array->vector* arr) #[#[(0 0) (0 1) (0 2)]
-                                       #[(1 0) (1 1) (1 2)]
-                                       #[(2 0) (2 1) (2 2)]])
-  (check-equal? arr (vector*->array (array->vector* arr) listof-index?)))
-
-(let ([arr  (build-array #(2 2 2) (inst vector->list Index))])
-  (check-equal? (array->vector* arr)
-                #[#[#[(0 0 0) (0 0 1)] #[(0 1 0) (0 1 1)]]
-                  #[#[(1 0 0) (1 0 1)] #[(1 1 0) (1 1 1)]]])
-  (check-equal? arr (vector*->array (array->vector* arr) listof-index?)))
-
-(let ([arr  (build-array #(2 2 2 2) (inst vector->list Index))])
-  (check-equal? (array->vector* arr)
-                #[#[#[#[(0 0 0 0) (0 0 0 1)] #[(0 0 1 0) (0 0 1 1)]]
-                    #[#[(0 1 0 0) (0 1 0 1)] #[(0 1 1 0) (0 1 1 1)]]]
-                  #[#[#[(1 0 0 0) (1 0 0 1)] #[(1 0 1 0) (1 0 1 1)]]
-                    #[#[(1 1 0 0) (1 1 0 1)] #[(1 1 1 0) (1 1 1 1)]]]])
-  (check-equal? arr (vector*->array (array->vector* arr) listof-index?)))
-
-(check-equal? (array->vector* ((inst vector*->array Flonum) #[1.0 2.0] flonum?))
-              #[1.0 2.0])
-(check-equal? (array->vector* ((inst vector*->array Flonum) #[#[1.0 2.0] #[3.0 4.0]] flonum?))
-              #[#[1.0 2.0] #[3.0 4.0]])
-
-;; ---------------------------------------------------------------------------------------------------
-;; Array syntax
-
-(check-equal? (array 1.0)
-              (list*->array 1.0 flonum?))
-
-(check-equal? (array #[])
-              (list*->array '[] flonum?))
-
-(check-equal? (array #[#[]])
-              (list*->array '[[]] flonum?))
-
-(check-equal? (array #[1.0])
-              (list*->array '[1.0] flonum?))
-
-(check-equal? (array #[#[1.0]])
-              (list*->array '[[1.0]] flonum?))
-
-(check-equal? (array #[#[#[1.0]]])
-              (list*->array '[[[1.0]]] flonum?))
-
-(check-equal? (mutable-array 1.0)
-              (list*->array 1.0 flonum?))
-
-(check-equal? (mutable-array #[])
-              (list*->array '[] flonum?))
-
-(check-equal? (mutable-array #[#[]])
-              (list*->array '[[]] flonum?))
-
-(check-equal? (mutable-array #[1.0])
-              (list*->array '[1.0] flonum?))
-
-(check-equal? (mutable-array #[#[1.0]])
-              (list*->array '[[1.0]] flonum?))
-
-(check-equal? (mutable-array #[#[#[1.0]]])
-              (list*->array '[[[1.0]]] flonum?))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Other constructors
-
-(check-equal? (make-array #(3 3) 0)
-              (build-array #(3 3) (λ (js) 0)))
-
-(check-equal? (axis-index-array #(3 3) 0)
-              (build-array #(3 3) (λ: ([js : Indexes]) (vector-ref js 0))))
-
-(check-exn exn? (λ () (axis-index-array #(3 3) -1)))
-(check-exn exn? (λ () (axis-index-array #() 0)))
-
-(check-equal? (index-array #()) (array 0))
-(check-equal? (index-array #(4)) (array #[0 1 2 3]))
-(check-equal? (index-array #(2 2)) (array #[#[0 1] #[2 3]]))
-
-(check-equal? (indexes-array #(3 3))
-              (build-array #(3 3) (λ: ([js : Indexes]) (vector-copy js))))
-
-(check-equal? (diagonal-array 0 0 1.0 0.0)
-              (array 1.0))
-
-(check-equal? (diagonal-array 1 0 1.0 0.0)
-              (array #[]))
-
-(check-equal? (diagonal-array 1 1 1.0 0.0)
-              (array #[1.0]))
-
-(check-equal? (diagonal-array 2 1 1.0 0.0)
-              (array #[#[1.0]]))
-
-(check-equal? (diagonal-array 2 2 1.0 0.0)
-              (array #[#[1.0 0.0] #[0.0 1.0]]))
-
-(check-equal? (diagonal-array 3 2 1.0 0.0)
-              (array #[#[#[1.0 0.0] #[0.0 0.0]]
-                       #[#[0.0 0.0] #[0.0 1.0]]]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Pointwise
-;; Not much to test here because most pointwise ops are defined by the same two lifts
-
-(check-equal? (array-sqrt (array #[1.0 4.0 9.0 16.0]))
-              (array #[1.0 2.0 3.0 4.0]))
-
-(check-equal? (array+ (array #[1.0 2.0])
-                      (array #[10.0 20.0]))
-              (array #[11.0 22.0]))
-
-(check-equal? (array-map inexact->exact (array #[1.0 2.0]))
-              (array #[1 2]))
-
-(check-equal? (array-map (inst cons Float Float)
-                         (array #[1.0 2.0])
-                         (array #[10.0 20.0]))
-              (vector->array #(2) #[(1.0 . 10.0) (2.0 . 20.0)]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Fold
-
-(let ([arr  (array #[#[ 1.0  4.0  9.0  16.0]
-                     #[-1.0 -4.0 -9.0 -16.0]])])
-  (check-equal? (array-axis-sum arr 0) (array #[0.0 0.0 0.0 0.0]))
-  (check-equal? (array-axis-prod arr 0) (array #[-1.0 -16.0 -81.0 -256.0]))
-  (check-equal? (array-axis-min arr 0) (array #[-1.0 -4.0 -9.0 -16.0]))
-  (check-equal? (array-axis-max arr 0) (array #[ 1.0  4.0  9.0  16.0]))
-  (check-equal? (array-axis-fold arr 0 (inst cons Float (Listof Float)) null)
-                (list*->array '[[-1.0 1.0] [-4.0 4.0] [-9.0 9.0] [-16.0 16.0]]
-                             listof-flonum?))
-  (check-equal? (array-axis-sum arr 1) (array #[30.0 -30.0]))
-  (check-equal? (array-axis-prod arr 1) (array #[576.0 576.0]))
-  (check-equal? (array-axis-min arr 1) (array #[1.0 -16.0]))
-  (check-equal? (array-axis-max arr 1) (array #[16.0 -1.0]))
-  (check-equal? (array-axis-fold arr 1 (inst cons Float (Listof Float)) null)
-                (list*->array '[[ 16.0  9.0  4.0  1.0]
-                               [-16.0 -9.0 -4.0 -1.0]]
-                             listof-flonum?))
-  (check-equal? (array-all-sum arr) 0.0)
-  (check-equal? (array-all-prod arr) (* 576.0 576.0))
-  (check-equal? (array-all-min arr) -16.0)
-  (check-equal? (array-all-max arr)  16.0))
-
-(let ([arr  (make-array #(3 0) 0)])
-  (check-equal? (array-axis-sum arr 0) (array #[]))
-  (check-equal? (array-axis-prod arr 0) (array #[]))
-  (check-equal? (array-axis-min arr 0) (array #[]))
-  (check-equal? (array-axis-max arr 0) (array #[]))
-  (check-exn exn? (λ () (array-axis-sum arr 1)))
-  (check-exn exn? (λ () (array-axis-prod arr 1)))
-  (check-exn exn? (λ () (array-axis-min arr 1)))
-  (check-exn exn? (λ () (array-axis-max arr 1)))
-  (check-equal? (array-axis-sum arr 1 0) (array #[0 0 0]))
-  (check-equal? (array-axis-min arr 1 +inf.0) (array #[+inf.0 +inf.0 +inf.0]))
-  (check-equal? (array-axis-max arr 1 -inf.0) (array #[-inf.0 -inf.0 -inf.0]))
-  (check-equal? (array-axis-prod arr 1 1) (array #[1 1 1]))
-  (check-exn exn? (λ () (array-all-sum arr)))
-  (check-exn exn? (λ () (array-all-prod arr)))
-  (check-exn exn? (λ () (array-all-min arr)))
-  (check-exn exn? (λ () (array-all-max arr)))
-  (check-equal? (array-all-sum arr 0) 0)
-  (check-equal? (array-all-prod arr 1) 1)
-  (check-equal? (array-all-min arr +inf.0) +inf.0)
-  (check-equal? (array-all-max arr -inf.0) -inf.0))
-
-(let ([arr  (make-array #() 0)])
-  (check-exn exn? (λ () (array-axis-sum arr 0)))
-  (check-exn exn? (λ () (array-axis-prod arr 0)))
-  (check-exn exn? (λ () (array-axis-min arr 0)))
-  (check-exn exn? (λ () (array-axis-max arr 0)))
-  (check-equal? (array-all-sum arr) 0)
-  (check-equal? (array-all-prod arr) 0)
-  (check-equal? (array-all-min arr) 0)
-  (check-equal? (array-all-max arr) 0))
-
-(let ([arr  (array #[#[1.0 1.0 2.0 3.0] #[0.0 -1.0 2.0 3.0]])])
-  (check-equal? (array-axis-count arr 0 positive?) (array #[1 1 2 2]))
-  (check-equal? (array-axis-count arr 1 positive?) (array #[4 2]))
-  (check-equal? (array-count positive? arr) 6))
-
-(let ([arr  (array #[#[1.0 1.0 2.0 3.0] #[0.0 -1.0 2.0 3.0]])])
-  (check-equal? (array-axis-andmap arr 0 positive?) (array #[#f #f #t #t]))
-  (check-equal? (array-axis-andmap arr 1 positive?) (array #[#t #f]))
-  (check-equal? (array-andmap positive? arr) #f))
-
-(let ([arr  (array #[#[1.0 1.0 2.0 3.0] #[2.0 3.0 2.0 3.0]])])
-  (check-equal? (array-axis-andmap arr 0 positive?) (array #[#t #t #t #t]))
-  (check-equal? (array-axis-andmap arr 1 positive?) (array #[#t #t]))
-  (check-equal? (array-andmap positive? arr) #t))
-
-(let ([arr  (array #[#[-1.0 -1.0 -2.0 -3.0] #[0.0 -1.0 2.0 3.0]])])
-  (check-equal? (array-axis-ormap arr 0 positive?) (array #[#f #f #t #t]))
-  (check-equal? (array-axis-ormap arr 1 positive?) (array #[#f #t]))
-  (check-equal? (array-ormap positive? arr) #t))
-
-(let ([arr  (array #[#[-1.0 -1.0 -2.0 -3.0] #[-2.0 -3.0 -2.0 -3.0]])])
-  (check-equal? (array-axis-ormap arr 0 positive?) (array #[#f #f #f #f]))
-  (check-equal? (array-axis-ormap arr 1 positive?) (array #[#f #f]))
-  (check-equal? (array-ormap positive? arr) #f))
-
-(let ([arr  (make-array #() 0.0)])
-  (check-equal? (array-count positive? arr) 0)
-  (check-equal? (array-andmap positive? arr) #f)
-  (check-equal? (array-ormap positive? arr) #f))
-
-(let ([arr  (make-array #() 1.0)])
-  (check-equal? (array-count positive? arr) 1)
-  (check-equal? (array-andmap positive? arr) #t)
-  (check-equal? (array-ormap positive? arr) #t))
-
-(let ([arr  (make-array #(4 0) 0.0)])
-  (check-equal? (array-axis-count arr 0 positive?)  (array #[]))
-  (check-equal? (array-axis-andmap arr 0 positive?) (array #[]))
-  (check-equal? (array-axis-ormap arr 0 positive?)  (array #[]))
-  (check-equal? (array-axis-count arr 1 positive?)  (array #[0 0 0 0]))
-  (check-equal? (array-axis-andmap arr 1 positive?) (array #[#t #t #t #t]))
-  (check-equal? (array-axis-ormap arr 1 positive?)  (array #[#f #f #f #f]))
-  (check-equal? (array-count positive? arr) 0)
-  (check-equal? (array-andmap positive? arr) #t)
-  (check-equal? (array-ormap positive? arr) #f))
-
-;; ---------------------------------------------------------------------------------------------------
-;; FFT
-
-(check-exn exn? (λ () (array-fft (make-array #() 1))))
-(check-exn exn? (λ () (array-fft (make-array #(0) 1))))
-(check-exn exn? (λ () (array-fft (make-array #(3) 1))))
-
-(let ([arr  (make-array #(4) 1)])
-  (check-true (array-all-and (array= (array-fft arr) (array #[4 0 0 0]))))
-  (check-true (array-all-and (array= (array-inverse-fft (array-fft arr)) arr))))
-
-(let ([arr  (make-array #(2 2) 1)])
-  (check-true (array-all-and (array= (array-fft arr) (array #[#[4 0] #[0 0]]))))
-  (check-true (array-all-and (array= (array-inverse-fft (array-fft arr)) arr))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Unsafe ref
-
-(check-equal? (unsafe-array-ref (make-array #() 0) (vector)) 0)
-
-(let* ([arr  (indexes-array #(2))])
-  (check-equal? (unsafe-array-ref arr ((inst vector Index) 0)) #(0))
-  (check-equal? (unsafe-array-ref arr ((inst vector Index) 1)) #(1)))
-
-(let* ([arr  (indexes-array #(2 2))])
-  (check-equal? (unsafe-array-ref arr ((inst vector Index) 0 0)) #(0 0))
-  (check-equal? (unsafe-array-ref arr ((inst vector Index) 1 1)) #(1 1)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Unsafe set!
-
-(let* ([arr  ((inst array->mutable-array Byte) (make-array #() 0))]
-       [idxs  (vector)])
-  (unsafe-array-set! arr (vector) 1)
-  (check-equal? (unsafe-array-ref arr #()) 1)
-  (unsafe-array-set! arr #() 2)
-  (check-equal? (unsafe-array-ref arr #()) 2)
-  (unsafe-array-set! arr idxs 3)
-  (check-equal? (unsafe-array-ref arr #()) 3))
-
-(let* ([arr  (array->mutable-array (indexes-array #(2)))]
-       [idxs0  ((inst vector Index) 0)]
-       [idxs1  ((inst vector Index) 1)])
-  (unsafe-array-set! arr idxs0 ((inst vector Index) 6))
-  (unsafe-array-set! arr idxs1 ((inst vector Index) 7))
-  (check-equal? (unsafe-array-ref arr idxs0) #(6))
-  (check-equal? (unsafe-array-ref arr idxs1) #(7)))
-
-(let* ([arr  (array->mutable-array (indexes-array #(2 2)))]
-       [idxs0  ((inst vector Index) 0 0)]
-       [idxs1  ((inst vector Index) 1 1)])
-  (unsafe-array-set! arr idxs0 ((inst vector Index) 6 6))
-  (unsafe-array-set! arr idxs1 ((inst vector Index) 7 7))
-  (check-equal? (unsafe-array-ref arr idxs0) #(6 6))
-  (check-equal? (unsafe-array-ref arr idxs1) #(7 7)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Safe ref
-
-(let* ([l-arr  (make-array #() 0)]
-       [s-arr  (array->mutable-array l-arr)]
-       [idxs  #()]
-       [bad-idxs  #(1)])
-  (check-equal? (array-ref l-arr (vector)) 0)
-  (check-equal? (array-ref s-arr (vector)) 0)
-  (check-equal? (array-ref l-arr #()) 0)
-  (check-equal? (array-ref s-arr #()) 0)
-  (check-equal? (array-ref l-arr idxs) 0)
-  (check-equal? (array-ref s-arr idxs) 0)
-  (check-exn exn? (λ () (array-ref l-arr (vector 1))))
-  (check-exn exn? (λ () (array-ref s-arr (vector 1))))
-  (check-exn exn? (λ () (array-ref l-arr #(1))))
-  (check-exn exn? (λ () (array-ref s-arr #(1))))
-  (check-exn exn? (λ () (array-ref l-arr bad-idxs)))
-  (check-exn exn? (λ () (array-ref s-arr bad-idxs))))
-
-(let* ([l-arr  (indexes-array #(2))]
-       [s-arr  (array->mutable-array l-arr)]
-       [idxs0  #(0)]
-       [idxs1  #(1)]
-       [bad-idxs0  #(0 0)]
-       [bad-idxs1  #(-1)]
-       [bad-idxs2  #( 2)])
-  (check-equal? (array-ref l-arr (vector 0)) #(0))
-  (check-equal? (array-ref s-arr (vector 0)) #(0))
-  (check-equal? (array-ref l-arr (vector 1)) #(1))
-  (check-equal? (array-ref s-arr (vector 1)) #(1))
-  (check-equal? (array-ref l-arr #(0)) #(0))
-  (check-equal? (array-ref s-arr #(0)) #(0))
-  (check-equal? (array-ref l-arr #(1)) #(1))
-  (check-equal? (array-ref s-arr #(1)) #(1))
-  (check-equal? (array-ref l-arr idxs0) #(0))
-  (check-equal? (array-ref s-arr idxs0) #(0))
-  (check-equal? (array-ref l-arr idxs1) #(1))
-  (check-equal? (array-ref s-arr idxs1) #(1))
-  (check-exn exn? (λ () (array-ref l-arr (vector 0 0))))
-  (check-exn exn? (λ () (array-ref s-arr (vector 0 0))))
-  (check-exn exn? (λ () (array-ref l-arr (vector -1))))
-  (check-exn exn? (λ () (array-ref s-arr (vector -1))))
-  (check-exn exn? (λ () (array-ref l-arr (vector 2))))
-  (check-exn exn? (λ () (array-ref s-arr (vector 2))))
-  (check-exn exn? (λ () (array-ref l-arr #(0 0))))
-  (check-exn exn? (λ () (array-ref s-arr #(0 0))))
-  (check-exn exn? (λ () (array-ref l-arr #(-1))))
-  (check-exn exn? (λ () (array-ref s-arr #(-1))))
-  (check-exn exn? (λ () (array-ref l-arr #(2))))
-  (check-exn exn? (λ () (array-ref s-arr #(2))))
-  (check-exn exn? (λ () (array-ref l-arr bad-idxs0)))
-  (check-exn exn? (λ () (array-ref s-arr bad-idxs0)))
-  (check-exn exn? (λ () (array-ref l-arr bad-idxs1)))
-  (check-exn exn? (λ () (array-ref s-arr bad-idxs1)))
-  (check-exn exn? (λ () (array-ref l-arr bad-idxs2)))
-  (check-exn exn? (λ () (array-ref s-arr bad-idxs2))))
-
-(let* ([l-arr  (indexes-array #(2 2))]
-       [s-arr  (array->mutable-array l-arr)]
-       [idxs0  #(0 0)]
-       [idxs1  #(1 1)])
-  (check-equal? (array-ref l-arr (vector 0 0)) #(0 0))
-  (check-equal? (array-ref s-arr (vector 0 0)) #(0 0))
-  (check-equal? (array-ref l-arr (vector 1 1)) #(1 1))
-  (check-equal? (array-ref s-arr (vector 1 1)) #(1 1))
-  (check-equal? (array-ref l-arr #(0 0)) #(0 0))
-  (check-equal? (array-ref s-arr #(0 0)) #(0 0))
-  (check-equal? (array-ref l-arr #(1 1)) #(1 1))
-  (check-equal? (array-ref s-arr #(1 1)) #(1 1))
-  (check-equal? (array-ref l-arr idxs0) #(0 0))
-  (check-equal? (array-ref s-arr idxs0) #(0 0))
-  (check-equal? (array-ref l-arr idxs1) #(1 1))
-  (check-equal? (array-ref s-arr idxs1) #(1 1)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Safe set!
-
-(let* ([arr  ((inst array->mutable-array Byte) (make-array #() 0))]
-       [idxs  #()]
-       [bad-idxs #(1)])
-  (array-set! arr (vector) 1)
-  (check-equal? (array-ref arr #()) 1)
-  (array-set! arr #() 2)
-  (check-equal? (array-ref arr #()) 2)
-  (array-set! arr idxs 3)
-  (check-equal? (array-ref arr #()) 3)
-  (check-exn exn? (λ () (array-set! arr (vector 1) 2)))
-  (check-exn exn? (λ () (array-set! arr #(1) 2)))
-  (check-exn exn? (λ () (array-set! arr bad-idxs 2))))
-
-(let* ([arr  (array->mutable-array (indexes-array #(2)))]
-       [idxs0  #(0)]
-       [idxs1  #(1)]
-       [bad-idxs0  #(0 0)]
-       [bad-idxs1  #(-1)]
-       [bad-idxs2  #(2)]
-       [one  ((inst vector Index) 1)])
-  (array-set! arr (vector 0) ((inst vector Index) 2))
-  (array-set! arr (vector 1) ((inst vector Index) 3))
-  (check-equal? (array-ref arr #(0)) #(2))
-  (check-equal? (array-ref arr #(1)) #(3))
-  (array-set! arr #(0) ((inst vector Index) 4))
-  (array-set! arr #(1) ((inst vector Index) 5))
-  (check-equal? (array-ref arr #(0)) #(4))
-  (check-equal? (array-ref arr #(1)) #(5))
-  (array-set! arr idxs0 ((inst vector Index) 6))
-  (array-set! arr idxs1 ((inst vector Index) 7))
-  (check-equal? (array-ref arr #(0)) #(6))
-  (check-equal? (array-ref arr #(1)) #(7))
-  (check-exn exn? (λ () (array-set! arr (vector 0 0) one)))
-  (check-exn exn? (λ () (array-set! arr (vector -1) one)))
-  (check-exn exn? (λ () (array-set! arr (vector 2) one)))
-  (check-exn exn? (λ () (array-set! arr #(0 0) one)))
-  (check-exn exn? (λ () (array-set! arr #(-1) one)))
-  (check-exn exn? (λ () (array-set! arr #(2) one)))
-  (check-exn exn? (λ () (array-set! arr bad-idxs0 one)))
-  (check-exn exn? (λ () (array-set! arr bad-idxs1 one)))
-  (check-exn exn? (λ () (array-set! arr bad-idxs2 one))))
-
-(let* ([arr  (array->mutable-array (indexes-array #(2 2)))]
-       [idxs0  #(0 0)]
-       [idxs1  #(1 1)])
-  (array-set! arr (vector 0 0) ((inst vector Index) 2 2))
-  (array-set! arr (vector 1 1) ((inst vector Index) 3 3))
-  (check-equal? (array-ref arr #(0 0)) #(2 2))
-  (check-equal? (array-ref arr #(1 1)) #(3 3))
-  (array-set! arr #(0 0) ((inst vector Index) 4 4))
-  (array-set! arr #(1 1) ((inst vector Index) 5 5))
-  (check-equal? (array-ref arr #(0 0)) #(4 4))
-  (check-equal? (array-ref arr #(1 1)) #(5 5))
-  (array-set! arr idxs0 ((inst vector Index) 6 6))
-  (array-set! arr idxs1 ((inst vector Index) 7 7))
-  (check-equal? (array-ref arr #(0 0)) #(6 6))
-  (check-equal? (array-ref arr #(1 1)) #(7 7)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Indexing
-
-(let ([arr  (mutable-array #[#[0 1 2 3 4 5]
-                             #[1 2 3 4 5 6]
-                             #[2 3 4 5 6 7]
-                             #[3 4 5 6 7 8]]
-                           : (U Integer Symbol))]
-      [idxs  (array #['#(0 0) '#(1 1) '#(1 2) '#(2 3) '#(3 4) '#(3 5)])]
-      [vals  (array #['a 'b 'c 'd 'e 'f])]
-      [slices  (list (:: 0 4 2) (:: 2 -1 -2))])
-  (check-equal? (array-indexes-ref arr idxs)
-                (array #[0 2 3 5 7 8]))
-  (check-equal? (array-indexes-ref arr (array-slice-ref (indexes-array (array-shape arr)) slices))
-                (array-slice-ref arr slices))
-  (array-indexes-set! arr idxs vals)
-  (check-equal? arr (array #[#['a 1 2 3 4 5]
-                             #[1 'b 'c 4 5 6]
-                             #[2 3 4 'd 6 7]
-                             #[3 4 5 6 'e 'f]])))
-
-(check-equal? (array-slice-ref (indexes-array #()) (list (::new 2)))
-              (make-array #(2) #()))
-
-(let ([arr  (indexes-array #(2))])
-  (check-equal? (array-slice-ref arr (list (::) (::new 2)))
-                (array #[#['#(0) '#(0)] #['#(1) '#(1)]]))
-  (check-equal? (array-slice-ref arr (list (::new 2) (::)))
-                (array #[#['#(0) '#(1)] #['#(0) '#(1)]]))
-  (check-equal? (array-slice-ref arr (list (::)))
-                arr)
-  (check-equal? (array-slice-ref arr (list ::...))
-                arr))
-
-(let ([arr  (index-array #(10))])
-  (check-equal? (array-slice-ref arr (list (:: 0 10 2)))
-                (array #[0 2 4 6 8]))
-  (check-equal? (array-slice-ref arr (list (:: #f 10 2)))
-                (array #[0 2 4 6 8]))
-  (check-equal? (array-slice-ref arr (list (:: 0 #f 2)))
-                (array #[0 2 4 6 8]))
-  (check-equal? (array-slice-ref arr (list (:: #f #f 2)))
-                (array #[0 2 4 6 8]))
-  (check-equal? (array-slice-ref arr (list (:: 9 -1 -2)))
-                (array #[9 7 5 3 1]))
-  (check-equal? (array-slice-ref arr (list (:: 9 #f -2)))
-                (array #[9 7 5 3 1]))
-  (check-equal? (array-slice-ref arr (list (:: #f -1 -2)))
-                (array #[9 7 5 3 1]))
-  (check-equal? (array-slice-ref arr (list (:: #f #f -2)))
-                (array #[9 7 5 3 1]))
-  (check-equal? (array-slice-ref arr (list 4))
-                (array 4))
-  (check-exn exn? (λ () (array-slice-ref arr (list -1))))
-  (check-exn exn? (λ () (array-slice-ref arr (list 10))))
-  (check-exn exn? (λ () (array-slice-ref arr (list (:: 0 11 2)))))
-  (check-exn exn? (λ () (array-slice-ref arr (list (:: -1 10 2)))))
-  (check-exn exn? (λ () (array-slice-ref arr (list (:: 10 -1 -2)))))
-  (check-exn exn? (λ () (array-slice-ref arr (list (:: 9 -2 -2))))))
-
-(let ([arr  (index-array #(4 4))])
-  (check-equal? (array-slice-ref arr (list ::...))
-                arr)
-  (check-equal? (array-slice-ref arr (list (:: 0 4 2) (:: 0 4 2)))
-                (array #[#[0 2] #[8 10]]))
-  (check-equal? (array-slice-ref arr (list (:: 0 4 2) ::...))
-                (array #[#[0 1 2 3] #[8 9 10 11]]))
-  (check-equal? (array-slice-ref arr (list ::... (:: 0 4 2)))
-                (array #[#[0 2] #[4 6] #[8 10] #[12 14]]))
-  (check-equal? (array-slice-ref arr (list (:: 0 4 2) 0))
-                (array #[0 8]))
-  (check-equal? (array-slice-ref arr (list 0 (:: 0 4 2)))
-                (array #[0 2]))
-  (check-equal? (array-slice-ref arr (list (::new 0) ::...))
-                (make-array #(0 4 4) 0))
-  (check-equal? (array-slice-ref arr (list (::new 1) ::...))
-                (array-axis-insert arr 0 1))
-  (check-equal? (array-slice-ref arr (list (::) (::new 1) (::)))
-                (array-axis-insert arr 1 1))
-  (check-equal? (array-slice-ref arr (list (::) (::) (::new 1)))
-                (array-axis-insert arr 2 1)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Transforms
-
-(check-equal? (array-transform (indexes-array #(4 2))
-                               #(2 4) (λ: ([js : (Vectorof Index)])
-                                        (match-define (vector j0 j1) js)
-                                        (vector j1 j0)))
-              (array #[#['#(0 0) '#(1 0) '#(2 0) '#(3 0)]
-                       #['#(0 1) '#(1 1) '#(2 1) '#(3 1)]]))
-
-(check-exn exn? (λ () (array-strict (array-transform (indexes-array #(2 2)) #(3 3) identity))))
-(check-exn exn? (λ () (array-strict (array-transform (indexes-array #(2 2)) #(2) identity))))
-
-(check-equal? (unsafe-array-transform (indexes-array #(4 2))
-                                      ((inst vector Index) 2 4)
-                                      (λ: ([js : (Vectorof Index)])
-                                        (match-define (vector j0 j1) js)
-                                        ((inst vector Index) j1 j0)))
-              (array #[#['#(0 0) '#(1 0) '#(2 0) '#(3 0)]
-                       #['#(0 1) '#(1 1) '#(2 1) '#(3 1)]]))
-
-;; Permutation
-
-(let ([arr  (make-array #() 0)])
-  (check-equal? (array-axis-permute arr '())
-                (array 0))
-  (check-exn exn? (λ () (array-axis-permute arr '(0)))))
-
-(let ([arr  (indexes-array #(4))])
-  (check-exn exn? (λ () (array-axis-permute arr '())))
-  (check-equal? (array-axis-permute arr '(0)) arr)
-  (check-exn exn? (λ () (array-axis-permute arr '(1)))))
-
-(let ([arr  (indexes-array #(2 2))])
-  (check-exn exn? (λ () (array-axis-permute arr '())))
-  (check-equal? (array-axis-permute arr '(0 1)) arr)
-  (check-equal? (array-axis-permute arr '(1 0))
-                (array #[#['#(0 0) '#(1 0)]
-                         #['#(0 1) '#(1 1)]])))
-
-;; Transposition
-
-(let ([arr  (indexes-array #(4))])
-  (check-exn exn? (λ () (array-axis-swap arr 0 1)))
-  (check-equal? (array-axis-swap arr 0 0) arr))
-
-(let ([arr  (indexes-array #(2 2))])
-  (check-exn exn? (λ () (array-axis-swap arr 0 2)))
-  (check-equal? (array-axis-swap arr 0 0) arr)
-  (check-equal? (array-axis-swap arr 1 0)
-                (array #[#['#(0 0) '#(1 0)]
-                         #['#(0 1) '#(1 1)]])))
-
-(check-equal? (array-axis-swap (indexes-array #(2 2 2)) 1 2)
-              (array #[#[#['#(0 0 0) '#(0 1 0)]
-                         #['#(0 0 1) '#(0 1 1)]]
-                       #[#['#(1 0 0) '#(1 1 0)]
-                         #['#(1 0 1) '#(1 1 1)]]]))
-
-;; Adding axes
-
-(let ([arr  (indexes-array #())])
-  (check-exn exn? (λ () (array-axis-insert arr 1 1)))
-  (check-equal? (array-axis-insert arr 0 2)
-                (array #['#() '#()])))
-
-(let ([arr  (indexes-array #(4))])
-  (check-equal? (array-axis-insert arr 0 2)
-                (array #[#['#(0) '#(1) '#(2) '#(3)]
-                         #['#(0) '#(1) '#(2) '#(3)]]))
-  (check-equal? (array-axis-insert arr 1 2)
-                (array #[#['#(0) '#(0)]
-                         #['#(1) '#(1)]
-                         #['#(2) '#(2)]
-                         #['#(3) '#(3)]])))
-
-;; Removing axes
-
-(let ([arr  (indexes-array #())])
-  (check-exn exn? (λ () (array-axis-ref arr 0 0))))
-
-(let ([arr  (indexes-array #(4))])
-  (check-exn exn? (λ () (array-axis-ref arr 1 0)))
-  (check-equal? (array-axis-ref arr 0 2)
-                (array '#(2))))
-
-(let ([arr  (indexes-array #(2 2))])
-  (check-equal? (array-axis-ref arr 0 0)
-                (array #['#(0 0) '#(0 1)]))
-  (check-equal? (array-axis-ref arr 1 0)
-                (array #['#(0 0) '#(1 0)])))
-
-;; Reshape, flatten
-
-(let ([arr  (indexes-array #())])
-  (check-exn exn? (λ () (array-reshape arr #(0))))
-  (check-equal? (array-reshape arr #(1))
-                (array #['#()]))
-  (check-equal? (array-flatten arr)
-                (array #['#()])))
-
-(let ([arr  (array-map (λ: ([js : Indexes]) (vector-ref js 0))
-                       (indexes-array #(4)))])
-  (check-exn exn? (λ () (array-reshape arr #())))
-  (check-equal? (array-reshape arr #(2 2))
-                (array #[#[0 1] #[2 3]]))
-  (check-equal? (array-flatten arr)
-                (array #[0 1 2 3])))
-
-;; Append
-
-(check-exn exn? (λ () (array-append* (list))))
-(check-exn exn? (λ () (array-append* (list (array 0) (array 1)))))
-
-(check-equal? (array-append* (list (array #[0])))
-              (array #[0]))
-(check-equal? (array-append* (list (array #[0]) (array #[1])))
-              (array #[0 1]))
-(check-equal? (array-append* (list (array #[0]) (array 1)))
-              (array #[0 1]))
-(check-equal? (array-append* (list (array 0) (array #[1])))
-              (array #[0 1]))
-(check-equal? (array-append* (list (array #[0 1 2]) (array #[3 4 5])))
-              (array #[0 1 2 3 4 5]))
-(check-exn exn? (λ () (array-append* (list (array #[0]) (array #[1])) 1)))
-
-(check-equal? (array-append* (list (array #[#[0 1] #[2 3]]) (array #[#[4 5] #[6 7]])))
-              (array #[#[0 1] #[2 3] #[4 5] #[6 7]]))
-(check-equal? (array-append* (list (array #[#[0 1] #[2 3]]) (array #[#[4 5] #[6 7]])) 1)
-              (array #[#[0 1 4 5] #[2 3 6 7]]))
-(check-equal? (array-append* (list (array #[#[0 1] #[2 3]]) (array 0)) 0)
-              (array #[#[0 1] #[2 3] #[0 0]]))
-(check-equal? (array-append* (list (array #[#[0 1] #[2 3]]) (array 0)) 1)
-              (array #[#[0 1 0] #[2 3 0]]))
-(check-equal? (array-append* (list (array #[#[0 1 2] #[3 4 5]]) (array #[0 1])) 1)
-              (array #[#[0 1 2 0 1] #[3 4 5 0 1]]))
-(check-exn exn? (λ () (array-append* (list (array #[#[0 1 2] #[3 4 5]]) (array #[0 1])) 0)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Comprehensions
-
-(check-equal? (for/array: #:shape #() () : Integer 3)
-              (mutable-array 3))
-(check-equal? (for/array: #:shape #() () : Symbol 'foo) 
-              (mutable-array 'foo))
-(check-equal? (for/array: #:shape #(2) ([x (in-naturals)]) : Integer x) 
-              (mutable-array #[0 1]))
-(check-equal? (for/array: #:shape #(2 3) ([i (in-range 0 6)]) : (Vectorof Integer)
-                (vector (quotient i 3) (remainder i 3)))
-              (indexes-array #(2 3)))
-
-(check-equal? (for*/array: #:shape #() () : Integer 3)
-              (mutable-array 3))
-(check-equal? (for*/array: #:shape #() () : Symbol 'foo)
-              (mutable-array 'foo))
-(check-equal? (for*/array: #:shape #(2) ([x (in-naturals)]) : Integer x)
-              (mutable-array #[0 1]))
-(check-equal? (for*/array: #:shape #(2 3) ([i (in-range 0 2)]
-                                           [j (in-range 0 3)]
-                                           ) : (Vectorof Integer)
-                (vector i j))
-              (indexes-array #(2 3)))
-
-(check-equal? (for*/array: #:shape #() () : Integer 3)
-              (for*/array: #:shape #() () : Integer 3))
-(check-equal? (for*/array: #:shape #() () : Symbol 'foo)
-              (for*/array: #:shape #() () : Symbol 'foo))
-(check-equal? (for*/array: #:shape #(2) ([x (in-naturals)]) : Integer x)
-              (for*/array: #:shape #(2) ([x (in-naturals)]) : Integer x))
-(check-equal? (for*/array: #:shape #(2 3) ([i (in-range 0 2)]
-                                           [j (in-range 0 3)]
-                                           ) : (Listof Integer)
-                (list i j))
-              (for*/array: #:shape #(2 3) ([i (in-range 0 2)]
-                                           [j (in-range 0 3)]
-                                           ) : (Listof Integer)
-                (list i j)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Sequences
-
-(check-equal? (for/list: : (Listof Number) ([x  (in-array (array #[#[1 2 3] #[4 5 6]]))]) x)
-              '(1 2 3 4 5 6))
-
-(check-equal? (for/list: : (Listof Indexes) ([js  (in-array (indexes-array #()))]) js)
-              '(#()))
-(check-equal? (for/list: : (Listof Indexes) ([js  (in-array (indexes-array #(0)))]) js)
-              '())
-(check-equal? (for/list: : (Listof Indexes) ([js  (in-array (indexes-array #(2 2)))]) js)
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-
-(check-equal? (sequence->list (in-array (indexes-array #())))
-              '(#()))
-(check-equal? (sequence->list (in-array (indexes-array #(0))))
-              '())
-(check-equal? (sequence->list (in-array (indexes-array #(2 2))))
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-
-(check-equal? (for/list: : (Listof Indexes) ([js  (in-array-indexes #())]) js)
-              '(#()))
-(check-equal? (for/list: : (Listof Indexes) ([js  (in-array-indexes #(0))]) js)
-              '())
-(check-equal? (for/list: : (Listof Indexes) ([js  (in-array-indexes #(2 2))]) js)
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-(check-equal? (sequence->list (in-array-indexes #()))
-              '(#()))
-(check-equal? (sequence->list (in-array-indexes #(0)))
-              '())
-(check-equal? (sequence->list (in-array-indexes #(2 2)))
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-
-(check-equal? (for/list: : (Listof Indexes) ([js  (in-unsafe-array-indexes #(2 2))]) js)
-              '(#(0 0) #(0 0) #(0 0) #(0 0)))
-(check-equal? (for/list: : (Listof Indexes) ([js  (in-unsafe-array-indexes #())]) (vector-copy js))
-              '(#()))
-(check-equal? (for/list: : (Listof Indexes) ([js  (in-unsafe-array-indexes #(0))]) (vector-copy js))
-              '())
-(check-equal? (for/list: : (Listof Indexes) ([js  (in-unsafe-array-indexes #(2 2))]) (vector-copy js))
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-(check-equal? (sequence->list (in-unsafe-array-indexes #()))
-              '(#()))
-(check-equal? (sequence->list (in-unsafe-array-indexes #(0)))
-              '())
-(check-equal? (sequence->list (in-unsafe-array-indexes #(2 2)))
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-
-(let ([arr  (indexes-array #(4 5))])
-  (check-equal? (for/list: : (Listof (Listof Indexes)) ([brr  (in-array-axis arr 0)])
-                  (for/list: : (Listof Indexes) ([js  (in-array brr)])
-                    js))
-                (array->list* arr))
-  (check-equal? (for/list: : (Listof (Listof Indexes)) ([brr  (in-array-axis arr 1)])
-                  (for/list: : (Listof Indexes) ([js  (in-array brr)])
-                    js))
-                (array->list* (array-axis-swap arr 0 1))))
-
-(check-equal? (array-list->array empty 0)
-              (array #[]))
-(check-exn exn? (λ () (array-list->array empty 1)))
-
-(check-equal? (array-list->array (list (array 0) (array 1) (array 2)) 0)
-              (array #[0 1 2]))
-(check-exn exn? (λ () (array-list->array (list (array 0) (array 1) (array 2)) 1)))
-
-(check-equal? (array-list->array (list (array #[0 1]) (array #[2 3])) 0)
-              (array #[#[0 1] #[2 3]]))
-(check-equal? (array-list->array (list (array #[0 1]) (array #[2 3])) 1)
-              (array #[#[0 2] #[1 3]]))
-
-(check-equal? (array-list->array (list (array #[0 1 2]) (array 0)) 0)
-              (array #[#[0 1 2] #[0 0 0]]))
-(check-equal? (array-list->array (list (array #[0 1 2]) (array 0)) 1)
-              (array #[#[0 0] #[1 0] #[2 0]]))
-(check-exn exn? (λ () (array-list->array (list (array #[0 1 2]) (array 0)) 2)))
-
-(check-equal? (array-list->array (list (array #[#[0 1] #[2 3]]) (array 0)) 0)
-              (array #[#[#[0 1] #[2 3]] #[#[0 0] #[0 0]]]))
-
-(check-equal? (array->array-list (array-list->array empty 0) 0)
-              empty)
-(check-exn exn? (λ () (array->array-list (array-list->array empty 0) 1)))
-
-(check-equal? (array->array-list (array-list->array (list (array 0) (array 1) (array 2)) 0) 0)
-              (list (array 0) (array 1) (array 2)))
-
-(check-equal? (array->array-list (array-list->array (list (array #[0 1]) (array #[2 3])) 0) 0)
-              (list (array #[0 1]) (array #[2 3])))
-(check-equal? (array->array-list (array-list->array (list (array #[0 1]) (array #[2 3])) 1) 1)
-              (list (array #[0 1]) (array #[2 3])))
-
-(check-equal? (array->array-list (array-list->array (list (array #[0 1 2]) (array 0)) 0) 0)
-              (list (array #[0 1 2]) (array #[0 0 0])))
-(check-equal? (array->array-list (array-list->array (list (array #[0 1 2]) (array 0)) 1) 1)
-              (list (array #[0 1 2]) (array #[0 0 0])))
-
-(check-equal? (array->array-list (array-list->array (list (array #[#[0 1] #[2 3]]) (array 0)) 0) 0)
-              (list (array #[#[0 1] #[2 3]]) (array #[#[0 0] #[0 0]])))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Conditionals
-
-(let ([arr  (build-array #(10 10) (λ: ([js : Indexes]) (apply + (vector->list js))))])
-  (check-equal? (array-if (array< arr (array 5))
-                          (array 0)
-                          (array 1))
-                (array-map (λ: ([v : Integer]) (if (v . < . 5) 0 1)) arr))
-  (check-equal? (array-or (array< arr (make-array #(10 10) 9))
-                          (array> arr (make-array #(10 10) 9)))
-                (array-map (λ: ([v : Integer]) (or (< v 9) (> v 9))) arr))
-  (check-equal? (array-and (array< arr (make-array #(10 10) 10))
-                           (array> arr (make-array #(10 10) 8)))
-                (array-map (λ: ([v : Integer]) (= v 9)) arr)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Lazy arrays
-
-(define (make-lazy-arr)
-  (: arr (Array Integer))
-  (define arr
-    (array-lazy
-     (build-simple-array
-      #(12 12)
-      (λ: ([js : Indexes])
-        (match-define (vector j0 j1) js)
-        (cond [(or (= j0 0) (= j1 0))  1]
-              [(undefined? arr)  (error 'undefined)]
-              [else  (+ (array-ref arr (vector (- j0 1) j1))
-                        (array-ref arr (vector j0 (- j1 1))))])))))
-  arr)
-
-(define (make-mutable-arr)
-  (define: arr : (Mutable-Array Integer)
-    (array->mutable-array
-     (build-array
-      #(12 12)
-      (λ: ([js : Indexes])
-        (match-define (vector j0 j1) js)
-        (cond [(or (= j0 0) (= j1 0))  1]
-              [else  0])))))
-  (for*: ([j0  (in-range 1 12)]
-          [j1  (in-range 1 12)])
-    (array-set! arr (vector j0 j1)
-                (+ (array-ref arr (vector (- j0 1) j1))
-                   (array-ref arr (vector j0 (- j1 1))))))
-  arr)
-
-(check-equal? (make-lazy-arr)
-              (make-mutable-arr))
-
-(check-equal? (array-lazy (array-axis-swap (indexes-array #(4 4)) 0 1))
-              (array-axis-swap (indexes-array #(4 4)) 0 1))
diff --git a/pkgs/math-pkgs/math-test/math/tests/array-untyped-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/array-untyped-tests.rkt
deleted file mode 100644
index ff0543594c..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/array-untyped-tests.rkt
+++ /dev/null
@@ -1,292 +0,0 @@
-#lang racket
-
-(require (for-syntax racket/match)
-         rackunit
-         math/array)
-
-;; ===================================================================================================
-;; Contract tests
-
-(begin-for-syntax
-  (define exceptions '(array
-                       mutable-array
-                       flarray
-                       fcarray
-                       inline-array-map
-                       array+
-                       array*
-                       array-
-                       array/
-                       array-min
-                       array-max
-                       array-scale
-                       array-abs
-                       array-sqr
-                       array-sqrt
-                       array-conjugate
-                       array-real-part
-                       array-imag-part
-                       array-make-rectangular
-                       array-magnitude
-                       array-angle
-                       array-make-polar
-                       array<
-                       array<=
-                       array>
-                       array>=
-                       array=
-                       array-not
-                       array-and
-                       array-or
-                       array-if
-                       array-axis-sum
-                       array-axis-prod
-                       array-axis-min
-                       array-axis-max
-                       array-all-sum
-                       array-all-prod
-                       array-all-min
-                       array-all-max
-                       array-count
-                       array-andmap
-                       array-ormap
-                       inline-flarray-map
-                       inline-fcarray-map
-                       array-strict
-                       array-default-strict
-                       make-unsafe-array-proc
-                       make-unsafe-array-set-proc
-                       array/syntax))
-  
-  (define (looks-like-value? sym)
-    (define str (symbol->string sym))
-    (and (not (char-upper-case? (string-ref str 0)))
-         (not (regexp-match #rx"for/" str))
-         (not (regexp-match #rx"for\\*/" str))
-         (not (member sym exceptions))))
-  
-  (define array-exports
-    (let ()
-      (match-define (list (list #f _ ...)
-                          (list 1 _ ...)
-                          (list 0 array-exports ...))
-        (syntax-local-module-exports #'math/array))
-      (filter looks-like-value? array-exports)))
-  )
-
-(define-syntax (all-exports stx)
-  (with-syntax ([(array-exports ...)  array-exports])
-    (syntax/loc stx
-      (begin (void array-exports) ...))))
-
-(all-exports)
-
-;; ---------------------------------------------------------------------------------------------------
-;; Comprehensions
-
-(check-equal? (for/array #:shape #() () 3)
-              (mutable-array 3))
-(check-equal? (for/array #:shape #() () 'foo) 
-              (mutable-array 'foo))
-(check-equal? (for/array #:shape #(2) ([x (in-naturals)]) x) 
-              (mutable-array #[0 1]))
-(check-equal? (for/array #:shape #(2 3) ([i (in-range 0 6)])
-                (vector (quotient i 3) (remainder i 3)))
-              (indexes-array #(2 3)))
-
-(check-equal? (for*/array #:shape #() () 3)
-              (mutable-array 3))
-(check-equal? (for*/array #:shape #() () 'foo)
-              (mutable-array 'foo))
-(check-equal? (for*/array #:shape #(2) ([x (in-naturals)]) x)
-              (mutable-array #[0 1]))
-(check-equal? (for*/array #:shape #(2 3) ([i (in-range 0 2)]
-                                          [j (in-range 0 3)])
-                (vector i j))
-              (indexes-array #(2 3)))
-
-(check-equal? (for*/array #:shape #() () 3)
-              (for*/array #:shape #() () 3))
-(check-equal? (for*/array #:shape #() () 'foo)
-              (for*/array #:shape #() () 'foo))
-(check-equal? (for*/array #:shape #(2) ([x (in-naturals)]) x)
-              (for*/array #:shape #(2) ([x (in-naturals)]) x))
-(check-equal? (for*/array #:shape #(2 3) ([i (in-range 0 2)]
-                                          [j (in-range 0 3)])
-                (list i j))
-              (for*/array #:shape #(2 3) ([i (in-range 0 2)]
-                                          [j (in-range 0 3)])
-                (list i j)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Sequences
-
-(check-equal? (for/list ([x  (in-array (array #[#[1 2 3] #[4 5 6]]))]) x)
-              '(1 2 3 4 5 6))
-
-(check-equal? (for/list ([js  (in-array (indexes-array #()))]) js)
-              '(#()))
-(check-equal? (for/list ([js  (in-array (indexes-array #(0)))]) js)
-              '())
-(check-equal? (for/list ([js  (in-array (indexes-array #(2 2)))]) js)
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-
-(check-equal? (sequence->list (in-array (indexes-array #())))
-              '(#()))
-(check-equal? (sequence->list (in-array (indexes-array #(0))))
-              '())
-(check-equal? (sequence->list (in-array (indexes-array #(2 2))))
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-
-(check-equal? (for/list ([js  (in-array-indexes #())]) js)
-              '(#()))
-(check-equal? (for/list ([js  (in-array-indexes #(0))]) js)
-              '())
-(check-equal? (for/list ([js  (in-array-indexes #(2 2))]) js)
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-(check-equal? (sequence->list (in-array-indexes #()))
-              '(#()))
-(check-equal? (sequence->list (in-array-indexes #(0)))
-              '())
-(check-equal? (sequence->list (in-array-indexes #(2 2)))
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-
-(check-equal? (for/list ([js  (in-unsafe-array-indexes #(2 2))]) js)
-              '(#(0 0) #(0 0) #(0 0) #(0 0)))
-(check-equal? (for/list ([js  (in-unsafe-array-indexes #())]) (vector-copy js))
-              '(#()))
-(check-equal? (for/list ([js  (in-unsafe-array-indexes #(0))]) (vector-copy js))
-              '())
-(check-equal? (for/list ([js  (in-unsafe-array-indexes #(2 2))]) (vector-copy js))
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-(check-equal? (sequence->list (in-unsafe-array-indexes #()))
-              '(#()))
-(check-equal? (sequence->list (in-unsafe-array-indexes #(0)))
-              '())
-(check-equal? (sequence->list (in-unsafe-array-indexes #(2 2)))
-              '(#(0 0) #(0 1) #(1 0) #(1 1)))
-
-(let ([arr  (indexes-array #(4 5))])
-  (check-equal? (for/list ([brr  (in-array-axis arr 0)])
-                  (for/list ([js  (in-array brr)])
-                    js))
-                (array->list* arr))
-  (check-equal? (for/list ([brr  (in-array-axis arr 1)])
-                  (for/list ([js  (in-array brr)])
-                    js))
-                (array->list* (array-axis-swap arr 0 1))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Construction macros
-
-(check-equal? (array #[1 2 3])
-              (list->array '(1 2 3)))
-
-(check-equal? (array #[#[0 1] #[2 3]])
-              (index-array #(2 2)))
-
-(check-equal? (mutable-array #[1 2 3])
-              (list->array '(1 2 3)))
-
-(check-equal? (mutable-array #[#[0 1] #[2 3]])
-              (index-array #(2 2)))
-
-(check-equal? (flarray #[1 2 3])
-              (array->flarray (list->array '(1 2 3))))
-
-(check-equal? (flarray #[#[0 1] #[2 3]])
-              (array->flarray (index-array #(2 2))))
-
-(check-equal? (fcarray #[1 2 3])
-              (array->fcarray (list->array '(1 2 3))))
-
-(check-equal? (fcarray #[#[0 1] #[2 3]])
-              (array->fcarray (index-array #(2 2))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Mapping
-
-(check-equal? (array-map +) (array 0))
-
-(check-equal? (array-map + (array #[1 2 3]))
-              (array #[1 2 3]))
-
-(check-equal? (array-map + (array #[1 2 3]) (array #[10 20 30]))
-              (array #[11 22 33]))
-
-(check-equal? (array-map make-rectangular (array #[1 2 3]) (array #[10 20 30]))
-              (array #[1+10i 2+20i 3+30i]))
-
-(check-exn exn:fail:contract? (λ () (array-map)))
-(check-exn exn:fail:contract? (λ () (array-map 5)))
-(check-exn exn:fail:contract? (λ () (array-map + 5)))
-(check-exn exn:fail:contract? (λ () (array-map -)))
-(check-exn exn:fail:contract? (λ () (array-map make-rectangular (array #[1 2 3]))))
-(check-exn exn:fail:contract? (λ () (array-map values (array #[1 2 3]) (array #[10 20 30]))))
-
-(check-equal? (array+ (array #[1 2 3]) (array #[10 20 30]))
-              (array-map + (array #[1 2 3]) (array #[10 20 30])))
-
-(check-exn exn:fail:contract? (λ () (array+ (array #[1 2 3]) (array 'x))))
-
-(check-equal? (array-scale (array #[1 2 3]) 2)
-              (array-map (λ (x) (* x 2)) (array #[1 2 3])))
-
-(check-exn exn:fail:contract? (λ () (array-scale (array #[1 2 3]) 'x)))
-
-(check-equal? (inline-array-map +) (array 0))
-
-(check-equal? (inline-array-map + (array #[1 2 3]))
-              (array #[1 2 3]))
-
-(check-equal? (inline-array-map + (array #[1 2 3]) (array #[10 20 30]))
-              (array #[11 22 33]))
-
-(check-equal? (inline-array-map make-rectangular (array #[1 2 3]) (array #[10 20 30]))
-              (array #[1+10i 2+20i 3+30i]))
-
-(check-exn exn:fail:contract? (λ () (inline-array-map 5)))
-(check-exn exn:fail:contract? (λ () (inline-array-map + 5)))
-(check-exn exn:fail:contract? (λ () (inline-array-map -)))
-(check-exn exn:fail:contract? (λ () (inline-array-map make-rectangular (array #[1 2 3]))))
-(check-exn exn:fail:contract? (λ () (inline-array-map values (array #[1 2 3]) (array #[10 20 30]))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Folding
-
-(check-equal? (array-axis-sum (array #[1 2 3]) 0)
-              (array 6))
-
-
-(check-equal? (array-axis-sum (array #[]) 0 0.0)
-              (array 0.0))
-
-(check-equal? (array-all-sum (array #[1 2 3]))
-              6)
-
-(check-equal? (array-all-sum (array #[]) 0.0)
-              0.0)
-
-(check-equal? (array-count even? (array #[1 2 3]))
-              1)
-
-(check-equal? (array-count equal? (array #[1 2 3]) (array #[2 1 3]))
-              1)
-
-(check-false (array-andmap equal? (array #[1 2 3]) (array #[2 1 3])))
-(check-true (array-ormap equal? (array #[1 2 3]) (array #[2 1 3])))
-
-(let ([arr  (parameterize ([array-strictness #f])
-              (array-strict
-               (build-array #(3 3) (λ (js) (apply + (vector->list js))))))])
-  (check-true (array-strict? arr))
-  (check-equal? arr (array #[#[0 1 2] #[1 2 3] #[2 3 4]])))
-
-(let ([arr  (parameterize ([array-strictness #f])
-              (array-default-strict
-               (build-array #(3 3) (λ (js) (apply + (vector->list js))))))])
-  (check-false (array-strict? arr))
-  (check-equal? arr (array #[#[0 1 2] #[1 2 3] #[2 3 4]]))
-  (array-strict! arr)
-  (check-true (array-strict? arr))
-  (check-equal? arr (array #[#[0 1 2] #[1 2 3] #[2 3 4]])))
diff --git a/pkgs/math-pkgs/math-test/math/tests/bigfloat-custodian.rkt b/pkgs/math-pkgs/math-test/math/tests/bigfloat-custodian.rkt
deleted file mode 100644
index 4e04e244e4..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/bigfloat-custodian.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-
-;; Not crashing means success for this stress test:
-
-(let loop ([i 0] [l null])
-  (unless (= i 100)
-    (displayln "next")
-    (let ([l (if (zero? (random 5))
-                 (begin
-                   (printf "shutdown\n")
-                   (for-each custodian-shutdown-all l)
-                   null)
-                 l)])
-      (let ([c (make-custodian)])
-        (parameterize ([current-custodian c])
-          (for ([i (random 10)]) (thread (lambda () (sleep 10))))
-          (parameterize ([current-namespace (make-base-namespace)])
-            (dynamic-require `math/bigfloat #f)))
-        (loop (add1 i) (cons c l))))))
-
-(module+ test
-  (module config info
-    (define random? #t)))
diff --git a/pkgs/math-pkgs/math-test/math/tests/bigfloat-stress-test.rkt b/pkgs/math-pkgs/math-test/math/tests/bigfloat-stress-test.rkt
deleted file mode 100644
index 701f7f4f12..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/bigfloat-stress-test.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket
-
-(require math/bigfloat
-         math/flonum
-         math/special-functions
-         math/private/bigfloat/bigfloat-hurwitz-zeta)
-
-(collect-garbage)
-(collect-garbage)
-(collect-garbage)
-(define start-mem (current-memory-use))
-
-(define num 60)
-
-(for ([x  (in-range 1 num)])
-  (let ([x  (* 0.25 x)])
-    (printf "x = ~v~n" x)
-    (for ([y  (in-range 1 num)])
-      (let ([y  (* 0.25 y)])
-        (define z (bigfloat->flonum (bfhurwitz-zeta (bf x) (bf y))))
-        (define err (flulp-error (flhurwitz-zeta x y) z))
-        (unless (err . <= . 5.0)
-          (printf "hurwitz-zeta ~v ~v; error = ~v ulps~n" x y err))))))
-
-(collect-garbage)
-(collect-garbage)
-(collect-garbage)
-(define end-mem (current-memory-use))
-
-(define diff-mem (- end-mem start-mem))
-(when (diff-mem . > . (* 2 1024 1024))
-  (printf "Significant higher memory use (more than 2MB):~n")
-  (printf "   start-mem = ~v~n" start-mem)
-  (printf "     end-mem = ~v~n" end-mem)
-  (printf "  difference = ~v~n" diff-mem))
diff --git a/pkgs/math-pkgs/math-test/math/tests/bigfloat-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/bigfloat-tests.rkt
deleted file mode 100644
index 78982b430f..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/bigfloat-tests.rkt
+++ /dev/null
@@ -1,473 +0,0 @@
-#lang racket
-
-(require math/bigfloat
-         math/flonum
-         math/base
-         rackunit)
-
-;; Exact tests
-
-(check-= (bigfloat->integer (bf (expt 2 64)))
-         (expt 2 64)  0)
-
-(check-= (bigfloat->flonum (bf 123.456))
-         123.456  0)
-
-(check-= (bigfloat->rational (bf 123456/65536))
-         123456/65536  0)
-
-(check-= (bigfloat->rational (bf 123456/65536))
-         123456/65536  0)
-
-(check-equal? (bigfloat->string (bf "123456.25"))
-              "123456.25")
-
-(check-= (bigfloat->rational (bf+ (bf 23) (bf 1/16)))
-         (+ 23 1/16)  0)
-
-(check-= (bigfloat->rational (bf- (bf 23) (bf 1/16)))
-         (- 23 1/16)  0)
-
-(check-= (bigfloat->rational (bf* (bf 23) (bf 1/16)))
-         (* 23 1/16)  0)
-
-(check-= (bigfloat->rational (bf/ (bf 23) (bf 1/16)))
-         (/ 23 1/16)  0)
-
-(check bf= (bf 1) (bf 1.0))
-
-;; exp(1) truncated to 600 digits
-(parameterize ([bf-precision 2000])
-  (define e-truncated600
-    (string-append
-     "2.718281828459045235360287471352662497757247093699959574966"
-     "967627724076630353547594571382178525166427427466391932003059"
-     "921817413596629043572900334295260595630738132328627943490763"
-     "233829880753195251019011573834187930702154089149934884167509"
-     "244761460668082264800168477411853742345442437107539077744992"
-     "069551702761838606261331384583000752044933826560297606737113"
-     "200709328709127443747047230696977209310141692836819025515108"
-     "657463772111252389784425056953696770785449969967946864454905"
-     "987931636889230098793127736178215424999229576351482208269895"
-     "1936680331825288693984964651058209392398294887933203625094431"))
-  
-  ;; truncates to 600 digits (with other numbers of digits, correct rounding makes it look wrong)
-  (check-equal? (substring (bigfloat->string (bfexp 1.bf)) 0 600)
-                e-truncated600))
-
-;; Inexact tests
-
-(check-= (bigfloat->rational (bfsqr (bf 22/7)))
-         (/ (sqr 22) (sqr 7))
-         epsilon.0)
-
-(check-= (bigfloat->flonum (bfsqrt (bf 2)))
-         (sqrt 2)
-         epsilon.0)
-
-(check-= (bigfloat->flonum (bf1/sqrt (bf 2)))
-         (/ 1 (sqrt 2))
-         epsilon.0)
-
-(check-= (bigfloat->flonum (bfcbrt (bf 2)))
-         (flexpt 2.0 #i1/3)
-         epsilon.0)
-
-;; Constants
-
-(check-equal? pi.bf (bf #e3.141592653589793238462643383279502884195))
-(check-equal? gamma.bf (bf #e0.5772156649015328606065120900824024310432))
-(check-equal? catalan.bf (bf #e0.9159655941772190150546035149323841107734))
-(check-equal? log2.bf (bf #e0.6931471805599453094172321214581765680748))
-(check-equal? phi.bf (bf #e1.61803398874989484820458683436563811772))
-
-;; Special values
-
-(check-eqv? (bigfloat->flonum +nan.bf) +nan.0)
-(check-eqv? (bigfloat->flonum +inf.bf) +inf.0)
-(check-eqv? (bigfloat->flonum -inf.bf) -inf.0)
-(check-eqv? (bigfloat->flonum -0.bf) -0.0)
-(check-eqv? (bigfloat->flonum 0.bf) 0.0)
-(check-equal? (bf- +inf.bf) -inf.bf)
-(check-equal? (bf- -inf.bf) +inf.bf)
-(check-equal? (bf- +nan.bf) +nan.bf)
-(check-equal? (bf- 0.bf) -0.bf)
-(check-equal? (bf- -0.bf) 0.bf)
-
-(for ([bits  '(2 4 8 16 32 64 128 3 5 7 11 13 129)])
-  (parameterize ([bf-precision bits])
-    ;; Epsilon
-    (check-not-equal? (bf+ 1.bf epsilon.bf) 1.bf)
-    (check-equal? (bf+ 1.bf (bf* (bf 0.5) epsilon.bf)) 1.bf)
-    ;; +max.bf/-max.bf
-    (check-equal? (bf- +max.bf) -max.bf)
-    (check-equal? (bf+ +max.bf (bf* epsilon.bf +max.bf)) +inf.bf)
-    (check-equal? (bf- -max.bf (bf* epsilon.bf +max.bf)) -inf.bf)
-    (check-equal? (- (bigfloat->ordinal +inf.bf) 1) (bigfloat->ordinal +max.bf))
-    (check-equal? (+ (bigfloat->ordinal -inf.bf) 1) (bigfloat->ordinal -max.bf))
-    (check-equal? (bfnext +max.bf) +inf.bf)
-    (check-equal? (bfprev +inf.bf) +max.bf)
-    (check-equal? (bfprev -max.bf) -inf.bf)
-    (check-equal? (bfnext -inf.bf) -max.bf)
-    ;; +min.bf/-min.bf
-    (check-equal? (bf- +min.bf) -min.bf)
-    (check-equal? (bf* (bf 0.5) +min.bf)  0.bf)
-    (check-equal? (bf* (bf 0.5) -min.bf) -0.bf)
-    (check-equal? (bigfloat->ordinal +min.bf)  1)
-    (check-equal? (bigfloat->ordinal -min.bf) -1)
-    (check-equal? (bfprev +min.bf) 0.bf)
-    (check-equal? (bfnext 0.bf) +min.bf)
-    (check-equal? (bfnext -min.bf) -0.bf)
-    (check-equal? (bfprev 0.bf) -min.bf)
-    ))
-
-;; Integer conversion
-
-(check-equal? (bigfloat->integer (integer->bigfloat 0)) 0)
-
-(for ([mode  (in-list '(nearest up down zero))])
-  (define eps (if (eq? mode 'nearest) (bf* (bf 0.5) epsilon.bf) epsilon.bf))
-  (parameterize ([bf-rounding-mode mode])
-    (for* ([s  (in-list '(-1 1))]
-           [i  (in-range 1000)])
-      (define n (* s (expt 10 i)))
-      (define n0 (bigfloat->integer (integer->bigfloat n)))
-      (define err (bf (relative-error n0 n)))
-      (unless (err . bf<= . eps)
-        (printf "bad integer conversion: mode = ~v  n = ~v~n" mode n))
-      (check-true (err . bf<= . eps)))))
-
-;; Rational conversion
-
-(for ([mode  (in-list '(nearest up down zero))])
-  (parameterize ([bf-rounding-mode mode])
-    (for* ([i  (in-range -37 37)]
-           [j  (in-range 1 37)])
-      (define q0 (bigfloat->rational (rational->bigfloat (/ i j))))
-      (define q1 (bigfloat->rational (bf/ (bf i) (bf j))))
-      (unless (equal? q0 q1)
-        (printf "bad rational conversion: mode = ~v  q = ~v/~v~n" mode i j))
-      (check-equal? q0 q1))))
-
-;; Flonum conversion
-
-(for ([mode  (in-list '(nearest up down zero))])
-  (parameterize ([bf-rounding-mode mode])
-    (for* ([i  (in-range -37 37)]
-           [j  (in-range 1 37)])
-      (define x (fl (/ i j)))
-      (define x0 (bigfloat->flonum (flonum->bigfloat x)))
-      (unless (equal? x x0)
-        (printf "bad flonum conversion: mode = ~v  x = ~v~n" mode x))
-      (check-equal? x x0))))
-
-;; String conversion
-
-(for ([mode  (in-list '(nearest up down zero))])
-  (parameterize ([bf-rounding-mode mode])
-    (for* ([i  (in-range -37 37)]
-           [j  (in-range 1 37)])
-      (define q (rational->bigfloat (/ i j)))
-      (define q0 (string->bigfloat (bigfloat->string q)))
-      (unless (equal? q q0)
-        (printf "bad string conversion: mode = ~v  q = ~v/~v~n" mode i j))
-      (check-equal? q q0))))
-
-(parameterize ([bf-precision 53])
-  (for ([f+xs+ys
-         (list
-          (list
-           bfsqr
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list +inf.bf +inf.bf 1.bf 0.bf 0.bf 0.bf 0.bf 1.bf +inf.bf +inf.bf +nan.bf))
-          (list
-           bfsqrt
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf
-                 +min.bf 1.bf +max.bf
-                 +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf +nan.bf +nan.bf -0.bf 0.bf
-                 (bf "4.8811524304081624e-161614249") 1.bf (bf "1.4486472022088012e161614248")
-                 +inf.bf +nan.bf))
-          (list
-           bfcbrt
-           (list -inf.bf
-                 -max.bf -1.bf -min.bf
-                 -0.bf 0.bf
-                 +min.bf 1.bf +max.bf
-                 +inf.bf +nan.bf)
-           (list -inf.bf
-                 (bf "-1.2802902004094324e107742832") -1.bf (bf "-6.1993798416193228e-107742833")
-                 -0.bf 0.bf
-                 (bf "6.1993798416193228e-107742833") 1.bf (bf "1.2802902004094324e107742832")
-                 +inf.bf +nan.bf))
-          (list
-           bf-
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list +inf.bf +max.bf 1.bf +min.bf 0.bf -0.bf -min.bf -1.bf -max.bf -inf.bf +nan.bf))
-          (list
-           bf/
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list -0.bf (bf "-4.7651298097759032e-323228497") -1.bf -inf.bf -inf.bf
-                 +inf.bf +inf.bf 1.bf (bf "4.7651298097759032e-323228497") 0.bf +nan.bf))
-          (list
-           bfabs
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list +inf.bf +max.bf 1.bf +min.bf 0.bf 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf))
-          (list
-           bflog
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf
-                 +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf +nan.bf +nan.bf -inf.bf -inf.bf
-                 (bf #e-744261117.95489299) 0.bf (bf #e744261117.26174581) +inf.bf +nan.bf))
-          (list
-           bflog2
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf
-                 +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf +nan.bf +nan.bf -inf.bf -inf.bf
-                 (bf -1073741824) 0.bf (bf 1073741823) +inf.bf +nan.bf))
-          (list
-           bflog10
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf
-                 +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf +nan.bf +nan.bf -inf.bf -inf.bf
-                 (bf #e-323228496.62295526) 0.bf (bf #e323228496.32192528) +inf.bf +nan.bf))
-          (list
-           bflog1p
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf
-                 1.bf +max.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf -inf.bf -min.bf -0.bf 0.bf +min.bf
-                 (bf #e0.69314718055994529) (bf #e744261117.26174581) +inf.bf +nan.bf))
-          (list
-           bfexp
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list 0.bf 0.bf (bf #e0.36787944117144233) 1.bf 1.bf
-                 1.bf 1.bf (bf #e2.7182818284590451) +inf.bf +inf.bf +nan.bf))
-          (list
-           bfexp2
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list 0.bf 0.bf (bf #e0.5) 1.bf 1.bf 1.bf 1.bf 2.bf +inf.bf +inf.bf +nan.bf))
-          (list
-           bfexp10
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list 0.bf 0.bf (bf #e0.1) 1.bf 1.bf 1.bf 1.bf 10.bf +inf.bf +inf.bf +nan.bf))
-          (list
-           bfexpm1
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list -1.bf -1.bf (bf #e-0.63212055882855767) -min.bf -0.bf
-                 0.bf +min.bf (bf #e1.7182818284590453) +inf.bf +inf.bf +nan.bf))
-          (list
-           bfsin
-           (list -inf.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +inf.bf +nan.bf)
-           (list +nan.bf (bf #e-0.8414709848078965) -min.bf -0.bf
-                 0.bf +min.bf (bf #e0.8414709848078965) +nan.bf +nan.bf))
-          (list
-           bfcos
-           (list -inf.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +inf.bf +nan.bf)
-           (list +nan.bf (bf #e0.54030230586813977) 1.bf 1.bf
-                 1.bf 1.bf (bf #e0.54030230586813977) +nan.bf +nan.bf))
-          (list
-           bftan
-           (list -inf.bf -1.bf -min.bf -0.bf 0.bf +min.bf 1.bf +inf.bf +nan.bf)
-           (list +nan.bf (bf #e-1.5574077246549023) -min.bf -0.bf
-                 0.bf +min.bf (bf #e1.5574077246549023) +nan.bf +nan.bf))
-          (list
-           bfcsc
-           (list -inf.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +inf.bf +nan.bf)
-           (list +nan.bf (bf #e-1.1883951057781212) -inf.bf -inf.bf
-                 +inf.bf +inf.bf (bf #e1.1883951057781212) +nan.bf +nan.bf))
-          (list
-           bfsec
-           (list -inf.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +inf.bf +nan.bf)
-           (list +nan.bf (bf #e1.8508157176809257) 1.bf 1.bf
-                 1.bf 1.bf (bf #e1.8508157176809257) +nan.bf +nan.bf))
-          (list
-           bfcot
-           (list -inf.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +inf.bf +nan.bf)
-           (list +nan.bf (bf #e-0.64209261593433076) -inf.bf -inf.bf
-                 +inf.bf +inf.bf (bf #e0.64209261593433076) +nan.bf +nan.bf))
-          (list
-           bfasin
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf (bf #e-1.5707963267948966) -min.bf -0.bf
-                 0.bf +min.bf (bf #e1.5707963267948966) +nan.bf +nan.bf +nan.bf))
-          (list
-           bfacos
-           (list -inf.bf -max.bf
-                 -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf
-                 +max.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf
-                 (bf #e3.1415926535897931) (bf #e1.5707963267948966) (bf #e1.5707963267948966)
-                 (bf #e1.5707963267948966) (bf #e1.5707963267948966) 0.bf
-                 +nan.bf +nan.bf +nan.bf))
-          (list
-           bfatan
-           (list -inf.bf -max.bf
-                 -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf
-                 +max.bf +inf.bf +nan.bf)
-           (list (bf #e-1.5707963267948966) (bf #e-1.5707963267948966)
-                 (bf #e-0.78539816339744828) -min.bf -0.bf
-                 0.bf +min.bf (bf #e0.78539816339744828)
-                 (bf #e1.5707963267948966) (bf #e1.5707963267948966) +nan.bf))
-          (list
-           bfsinh
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list -inf.bf -inf.bf (bf #e-1.1752011936438014) -min.bf -0.bf
-                 0.bf +min.bf (bf #e1.1752011936438014) +inf.bf +inf.bf +nan.bf))
-          (list
-           bfcosh
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list +inf.bf +inf.bf (bf #e1.5430806348152437) 1.bf 1.bf
-                 1.bf 1.bf (bf #e1.5430806348152437) +inf.bf +inf.bf +nan.bf))
-          (list
-           bftanh
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list -1.bf -1.bf (bf #e-0.76159415595576485) -min.bf -0.bf
-                 0.bf +min.bf (bf #e0.76159415595576485) 1.bf 1.bf +nan.bf))
-          (list
-           bfcsch
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list -0.bf -0.bf (bf #e-0.85091812823932156) -inf.bf -inf.bf
-                 +inf.bf +inf.bf (bf #e0.85091812823932156) 0.bf 0.bf +nan.bf))
-          (list
-           bfsech
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list 0.bf 0.bf (bf #e0.64805427366388535) 1.bf 1.bf
-                 1.bf 1.bf (bf #e0.64805427366388535) 0.bf 0.bf +nan.bf))
-          (list
-           bfcoth
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list -1.bf -1.bf (bf #e-1.3130352854993312) -inf.bf -inf.bf
-                 +inf.bf +inf.bf (bf #e1.3130352854993312) 1.bf 1.bf +nan.bf))
-          (list
-           bfasinh
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list -inf.bf (bf #e-744261117.95489299) (bf #e-0.88137358701954305) -min.bf -0.bf
-                 0.bf +min.bf (bf #e0.88137358701954305) (bf #e744261117.95489299) +inf.bf +nan.bf))
-          (list
-           bfacosh
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf 1.bf
-                 +max.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf +nan.bf +nan.bf +nan.bf +nan.bf +nan.bf 0.bf
-                 (bf #e744261117.95489299) +inf.bf +nan.bf))
-          (list
-           bfatanh
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf -inf.bf -min.bf -0.bf 0.bf +min.bf +inf.bf +nan.bf +nan.bf +nan.bf))
-          (list
-           bfeint
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf
-                 1.bf +max.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf +nan.bf +nan.bf -inf.bf -inf.bf (bf #e-744261117.37767732)
-                 (bf #e1.8951178163559368) +inf.bf +inf.bf +nan.bf))
-          (list
-           bfli2
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list -inf.bf (bf -276962305333851100) (bf #e-0.8224670334241132) -min.bf -0.bf
-                 0.bf +min.bf (bf #e1.6449340668482264) (bf -276962305333851100) -inf.bf +nan.bf))
-          (list
-           bfgamma
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf 1.bf +max.bf +inf.bf
-                 +nan.bf)
-           (list +nan.bf +nan.bf +nan.bf -inf.bf -inf.bf +inf.bf +inf.bf 1.bf +inf.bf +inf.bf
-                 +nan.bf))
-          #;
-          (list
-           bfpsi0
-           (list -inf.bf -1.bf -min.bf -0.bf 0.bf +min.bf
-                 1.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf +inf.bf +inf.bf -inf.bf -inf.bf
-                 (bf #e-0.57721566490153287) +inf.bf +nan.bf))
-          (list
-           bfzeta
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list +nan.bf 0.bf (bf #e-0.083333333333333329) (bf #e-0.5) (bf #e-0.5)
-                 (bf #e-0.5) (bf #e-0.5) +inf.bf 1.bf 1.bf +nan.bf))
-          (list
-           bferf
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +max.bf +inf.bf
-                 +nan.bf)
-           (list -1.bf -1.bf (bf #e-0.84270079294971489) (bf "-2.6884366029284653e-323228497") -0.bf
-                 0.bf (bf "2.6884366029284653e-323228497") (bf #e0.84270079294971489) 1.bf 1.bf
-                 +nan.bf))
-          (list
-           bferfc
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 
-                 0.bf +min.bf 1.bf +max.bf +inf.bf +nan.bf)
-           (list 2.bf 2.bf (bf #e1.8427007929497148) 1.bf 1.bf
-                 1.bf 1.bf (bf #e0.15729920705028513) 0.bf 0.bf +nan.bf))
-          (list
-           bfbesj0
-           (list -inf.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +inf.bf +nan.bf)
-           (list 0.bf (bf #e0.76519768655796661) 1.bf 1.bf
-                 1.bf 1.bf (bf #e0.76519768655796661) 0.bf +nan.bf))
-          (list
-           bfbesj1
-           (list -inf.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +inf.bf +nan.bf)
-           (list 0.bf (bf #e-0.4400505857449335) -0.bf -0.bf
-                 0.bf 0.bf (bf #e0.4400505857449335) 0.bf +nan.bf))
-          (list
-           (λ (x) (bfbesj 0 x))
-           (list -inf.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +inf.bf +nan.bf)
-           (list 0.bf (bf #e0.76519768655796661) 1.bf 1.bf
-                 1.bf 1.bf (bf #e0.76519768655796661) 0.bf +nan.bf))
-          (list
-           (λ (x) (bfbesj 1 x))
-           (list -inf.bf -1.bf -min.bf -0.bf
-                 0.bf +min.bf 1.bf +inf.bf +nan.bf)
-           (list 0.bf (bf #e-0.4400505857449335) -0.bf -0.bf
-                 0.bf 0.bf (bf #e0.4400505857449335) 0.bf +nan.bf))
-          (list
-           bfbesy0
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf
-                 +min.bf 1.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf +nan.bf +nan.bf -inf.bf -inf.bf
-                 (bf #e-473811343.56828988) (bf #e0.088256964215676956) 0.bf +nan.bf))
-          (list
-           bfbesy1
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf
-                 1.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf +nan.bf +nan.bf -inf.bf -inf.bf -inf.bf
-                 (bf #e-0.78121282130028868) 0.bf +nan.bf))
-          (list
-           (λ (x) (bfbesy 0 x))
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf
-                 +min.bf 1.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf +nan.bf +nan.bf -inf.bf -inf.bf
-                 (bf #e-473811343.56828988) (bf #e0.088256964215676956) 0.bf +nan.bf))
-          (list
-           (λ (x) (bfbesy 1 x))
-           (list -inf.bf -max.bf -1.bf -min.bf -0.bf 0.bf +min.bf
-                 1.bf +inf.bf +nan.bf)
-           (list +nan.bf +nan.bf +nan.bf +nan.bf -inf.bf -inf.bf -inf.bf
-                 (bf #e-0.78121282130028868) 0.bf +nan.bf)))])
-    (match-define (list f xs ys) f+xs+ys)
-    (for ([x  (in-list xs)]
-          [y  (in-list ys)])
-      (define y0 (f x))
-      (unless (equal? y y0)
-        (printf "f = ~a  x = ~v  y = ~v~n" f x y))
-      (check-equal? y0 y))))
diff --git a/pkgs/math-pkgs/math-test/math/tests/flonum-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/flonum-tests.rkt
deleted file mode 100644
index d9b9745b91..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/flonum-tests.rkt
+++ /dev/null
@@ -1,199 +0,0 @@
-#lang racket
-
-(require math/flonum
-         math/base
-         math/utils
-         rackunit)
-
-;; ===================================================================================================
-;; Test `flulp-error' heavily; it MUST be correct, or all the FPU tests are suspect
-
-;; Both arguments eqv?
-(check-equal? (flulp-error -inf.0 -inf.0) 0.0)
-(check-equal? (flulp-error -max.0 -max.0) 0.0)
-(check-equal? (flulp-error -1.0 -1.0) 0.0)
-(check-equal? (flulp-error -min.0 -min.0) 0.0)
-(check-equal? (flulp-error -0.0 -0.0) 0.0)
-(check-equal? (flulp-error +0.0 +0.0) 0.0)
-(check-equal? (flulp-error +min.0 +min.0) 0.0)
-(check-equal? (flulp-error +1.0 +1.0) 0.0)
-(check-equal? (flulp-error +max.0 +max.0) 0.0)
-(check-equal? (flulp-error +inf.0 +inf.0) 0.0)
-
-;; Both arguments zero
-(check-equal? (flulp-error -0.0 +0.0) 0.0)
-(check-equal? (flulp-error +0.0 -0.0) 0.0)
-
-;; LHS argument +inf.0
-(check-equal? (flulp-error +inf.0 -inf.0) +inf.0)
-(check-equal? (flulp-error +inf.0 -max.0) +inf.0)
-(check-equal? (flulp-error +inf.0 -1.0) +inf.0)
-(check-equal? (flulp-error +inf.0 -min.0) +inf.0)
-(check-equal? (flulp-error +inf.0 -0.0) +inf.0)
-(check-equal? (flulp-error +inf.0 +0.0) +inf.0)
-(check-equal? (flulp-error +inf.0 +min.0) +inf.0)
-(check-equal? (flulp-error +inf.0 +1.0) +inf.0)
-(check-equal? (flulp-error +inf.0 +max.0) +inf.0)
-
-;; LHS argument -inf.0
-(check-equal? (flulp-error -inf.0 -max.0) +inf.0)
-(check-equal? (flulp-error -inf.0 -1.0) +inf.0)
-(check-equal? (flulp-error -inf.0 -min.0) +inf.0)
-(check-equal? (flulp-error -inf.0 -0.0) +inf.0)
-(check-equal? (flulp-error -inf.0 +0.0) +inf.0)
-(check-equal? (flulp-error -inf.0 +min.0) +inf.0)
-(check-equal? (flulp-error -inf.0 +1.0) +inf.0)
-(check-equal? (flulp-error -inf.0 +max.0) +inf.0)
-(check-equal? (flulp-error -inf.0 +inf.0) +inf.0)
-
-;; RHS argument +inf.0
-(check-equal? (flulp-error -max.0 +inf.0) +inf.0)
-(check-equal? (flulp-error -1.0 +inf.0) +inf.0)
-(check-equal? (flulp-error -min.0 +inf.0) +inf.0)
-(check-equal? (flulp-error -0.0 +inf.0) +inf.0)
-(check-equal? (flulp-error +0.0 +inf.0) +inf.0)
-(check-equal? (flulp-error +min.0 +inf.0) +inf.0)
-(check-equal? (flulp-error +1.0 +inf.0) +inf.0)
-(check-equal? (flulp-error +max.0 +inf.0) +inf.0)
-
-;; RHS argument -inf.0
-(check-equal? (flulp-error -max.0 -inf.0) +inf.0)
-(check-equal? (flulp-error -1.0 -inf.0) +inf.0)
-(check-equal? (flulp-error -min.0 -inf.0) +inf.0)
-(check-equal? (flulp-error -0.0 -inf.0) +inf.0)
-(check-equal? (flulp-error +0.0 -inf.0) +inf.0)
-(check-equal? (flulp-error +min.0 -inf.0) +inf.0)
-(check-equal? (flulp-error +1.0 -inf.0) +inf.0)
-(check-equal? (flulp-error +max.0 -inf.0) +inf.0)
-
-;; RHS argument 0.0
-(check-equal? (flulp-error -max.0 +0.0) +inf.0)
-(check-equal? (flulp-error -1.0 +0.0) +inf.0)
-(check-equal? (flulp-error -min.0 +0.0) +inf.0)
-(check-equal? (flulp-error +min.0 +0.0) +inf.0)
-(check-equal? (flulp-error +1.0 +0.0) +inf.0)
-(check-equal? (flulp-error +max.0 +0.0) +inf.0)
-
-;; RHS argument -0.0
-(check-equal? (flulp-error -max.0 -0.0) +inf.0)
-(check-equal? (flulp-error -1.0 -0.0) +inf.0)
-(check-equal? (flulp-error -min.0 -0.0) +inf.0)
-(check-equal? (flulp-error +min.0 -0.0) +inf.0)
-(check-equal? (flulp-error +1.0 -0.0) +inf.0)
-(check-equal? (flulp-error +max.0 -0.0) +inf.0)
-
-;; Small errors
-(check-equal? (flulp-error +0.0 -min.0) 1.0)
-(check-equal? (flulp-error +0.0 +min.0) 1.0)
-(check-equal? (flulp-error -0.0 -min.0) 1.0)
-(check-equal? (flulp-error -0.0 +min.0) 1.0)
-(check-equal? (flulp-error -min.0 +min.0) 2.0)
-(check-equal? (flulp-error +min.0 -min.0) 2.0)
-
-(define large-flulp-error-xys
-  (list (list -1.0 -max.0)
-        (list -1.0 +max.0)
-        (list -min.0 -max.0)
-        (list -min.0 +max.0)
-        (list -1.0 +1.0)
-        (list -max.0 +max.0)
-        (list -max.0 -1.0)
-        (list -max.0 -min.0)
-        (list -max.0 +min.0)
-        (list -max.0 +1.0)
-        (list -1.0 -min.0)
-        (list -1.0 +min.0)
-        (list -min.0 -1.0)
-        (list -min.0 +1.0)
-        (list -0.0 -max.0)
-        (list -0.0 -1.0)
-        (list -0.0 +1.0)
-        (list -0.0 +max.0)
-        (list +0.0 -max.0)
-        (list +0.0 -1.0)
-        (list +0.0 +1.0)
-        (list +0.0 +max.0)
-        (list +min.0 -max.0)
-        (list +min.0 -1.0)
-        (list +min.0 +1.0)
-        (list +min.0 +max.0)
-        (list +1.0 -max.0)
-        (list +1.0 -1.0)
-        (list +1.0 -min.0)
-        (list +1.0 +min.0)
-        (list +1.0 +max.0)
-        (list +max.0 -max.0)
-        (list +max.0 -1.0)
-        (list +max.0 -min.0)
-        (list +max.0 +min.0)
-        (list +max.0 +1.0)))
-
-;; Large errors
-(for ([xy  (in-list large-flulp-error-xys)])
-  (match-define (list x y) xy)
-  (check-true ((flulp-error x y) . >= . (expt 2 52))
-              (format "x = ~a  y = ~a" x y)))
-
-(check-equal? (flulp-error 1.0 (flnext 1.0)) 1.0)
-(check-equal? (flulp-error +max.0 (flprev +max.0)) 1.0)
-
-(for ([_  (in-range 1000)])
-  (define s (random))
-  (define e (fl (random-integer -1074 1024)))
-  (define x (* s (flexpt 2.0 e)))
-  (check-equal? (flulp-error x (flnext x)) 1.0
-                (format "x = ~a" x)))
-
-;; ===================================================================================================
-;; fllog2
-
-;; Make sure it's exact for exact powers of two
-(for ([x  (in-range -1074.0 1024.0)])
-  (define y (flexp2 x))
-  (define x0 (fllog2 y))
-  (check-equal? x0 x))
-
-;; ===================================================================================================
-;; fl2 tests
-
-(for* ([x2  (list -inf.0 -max.0 -1.0 -min.0 -0.0 0.0 +min.0 +1.0 +max.0 +inf.0 +nan.0)]
-       [x1  (list -inf.0 -max.0 -1.0 -min.0 -0.0 0.0 +min.0 +1.0 +max.0 +inf.0 +nan.0)])
-  (define n
-    (count (λ (b) b)
-           (map (λ (f) (f x2 x1))
-                (list fl2rational? fl2infinite? fl2nan?))))
-  (unless (= n 1) (printf "x2 = ~v  x1 = ~v~n" x2 x1)))
-
-#|
-Tests to add
-
-(for*: ([x2  (list -inf.0 -max.0 -1.0 -min.0 -0.0 0.0 +min.0 +1.0 +max.0 +inf.0 +nan.0)]
-        [x1  (list -inf.0 -max.0 -1.0 -min.0 -0.0 0.0 +min.0 +1.0 +max.0 +inf.0 +nan.0)])
-  (define n
-    (count (λ: ([b : Boolean]) b)
-           (map (λ: ([f : (Flonum Flonum -> Boolean)])
-                  (f x2 x1))
-                (list fl2rational? fl2infinite? fl2nan?))))
-  (unless (= n 1) (printf "x2 = ~v  x1 = ~v~n" x2 x1)))
-
-fl2=
-fl2>
-fl2<
-fl2>=
-fl2<=
-
-(fl2step x2 x1 n/2) twice = (fl2step x2 x1 n)
-|#
-
-(check-true (let-values ([(y2 y1)  (fl+/error +max.hi +max.lo)])
-              (fl2= y2 y1 +max.hi +max.lo)))
-
-(check-true (let*-values ([(y2 y1)  (fl2next +max.hi +max.lo)])
-              (fl2infinite? y2 y1)))
-
-;; ===================================================================================================
-;; FPU testing
-
-(check-equal? (parameterize ([print-fp-test-progress? #f])
-                (test-floating-point 1000))
-              empty)
diff --git a/pkgs/math-pkgs/math-test/math/tests/function-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/function-tests.rkt
deleted file mode 100644
index 549c4127f6..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/function-tests.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang typed/racket
-
-(require math/base
-         math/special-functions
-         math/flonum
-         typed/rackunit)
-
-(: ε (Parameterof Float))
-(define ε (make-parameter epsilon.0))
-
-(: relative-error<= : Float Float Float -> Boolean)
-(define (relative-error<= x correct epsilon)
-  (<= (relative-error x correct) epsilon))
-
-;; ---------------------------------------------------------------------------------------------------
-;; expm1
-
-(ε (* 2 epsilon.0))
-
-(check-= (flexpm1 1.)      1.71828182845904523536028747135 (ε))
-(check-= (flexpm1 1e-5)    0.000010000050000166667083 (ε))
-(check-= (flexpm1 1e-10)   1.00000000005000000000166666667e-10 (ε))
-(check-= (flexpm1 1e-15)   1.00000000000000050000000000000e-15 (ε))
-(check-= (flexpm1 1e-15)   1.00000000000000050000000000000e-15 (ε))
-(check-= (flexpm1 -1.)    -0.632120558828557678404476229839 (ε))
-(check-= (flexpm1 -1e-10) -9.99999999950000000001666666667e-11 (ε))
-(check-= (flexpm1 0.0)     0.0 (ε))
-
-;; ---------------------------------------------------------------------------------------------------
-;; gamma
-
-(ε epsilon.0)
-
-(check-equal? (flgamma -0.0) -inf.0)
-(check-equal? (flgamma 0.0) +inf.0)
-(check-equal? (flgamma 1.0) 1.0)
-(check-equal? (flgamma 2.0) 1.0)
-(check-equal? (flgamma 3.0) 2.0)
-(check-equal? (flgamma 4.0) 6.0)
-(check-= (flgamma -21.5) 1.31844491832155110297694106059e-20 (ε))
-(check-true (relative-error<= (flgamma 1e-15) 9.9999999999999942278433509847e14 (ε)))
-(check-true (relative-error<= (flgamma 142.5) 2.25990910998653224305124991671e244 (ε)))
-(check-equal? (flgamma 172.0) 1.24101807021766782342484052410e309) ; = +inf.0
-(check-true (relative-error<= (flgamma -1e-5) -100000.577225555552235029678062 (ε)))
-
-(check-exn exn:fail:contract? (λ () (gamma 0)))
-(check-equal? (gamma 4) 6)
-(check-equal? (gamma 4.0) (flgamma 4.0))
-
-;; ---------------------------------------------------------------------------------------------------
-;; hypot
-
-(ε (* 2 epsilon.0))
-  
-(check-equal? (flhypot 0. 0.) 0.)
-(check-equal? (flhypot 3. 0.) 3.)
-(check-equal? (flhypot 3. 4.) 5.)
-(check-equal? (flhypot -3. -4.) 5.)
-(check-equal? (flhypot 4. 3.) 5.)
-(check-= (flhypot 2. 3.) 3.6055512754639892931 (ε))
-(check-= (flhypot 3. 2.) 3.6055512754639892931 (ε))
-  
-;; ---------------------------------------------------------------------------------------------------
-;; logs, exponents, bases, etc.
-
-(check-equal? (fllog/base 2.0 (expt 2.0 5.0)) 5.0)
-
-(check-false (power-of-two? 3))
-(check-true (power-of-two? 2))
-(check-true (power-of-two? 1))
-(check-true (power-of-two? 1/2))
-(check-false (power-of-two? 0))
-(check-false (power-of-two? -1))
diff --git a/pkgs/math-pkgs/math-test/math/tests/mandelbrot-test.rkt b/pkgs/math-pkgs/math-test/math/tests/mandelbrot-test.rkt
deleted file mode 100644
index c64b687d2e..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/mandelbrot-test.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang typed/racket
-
-(require typed/racket/base
-         math/array
-         typed/rackunit)
-
-(: mandelbrot (Float Integer -> (Array Integer)))
-(define (mandelbrot step max-iters)
-  (define x (list->array (sequence->list (in-range -2.0 0.800001 step))))
-  (define y (array-slice-ref (list->array (sequence->list (in-range -1.4 1.400001 step)))
-                             (list ::... (::new 1))))
-  (define c (array->fcarray (array-make-rectangular x y)))
-  (define-values (z divtime)
-    (for/fold: ([z : FCArray c]
-                [divtime : (Array Integer)  (array max-iters)]
-                ) ([i  (in-range max-iters)])
-      (let ([z  (fcarray+ (fcarray-sqr z) c)])
-        (values z (array-strict (array-if (array-and (array> (fcarray-magnitude z) (array 4.0))
-                                                     (array= divtime (array max-iters)))
-                                          (array i)
-                                          divtime))))))
-  divtime)
-
-(define truth
-  (array #[#[0 1 1 1 1 1 1 1 1 1 1 1 1 1 1]
-           #[1 1 1 1 1 1 2 2 2 3 2 2 1 1 1]
-           #[1 1 1 1 1 2 2 2 3 6 20 3 2 1 1]
-           #[1 1 1 2 2 2 3 4 5 20 17 4 3 2 1]
-           #[1 1 2 2 3 3 4 11 20 20 20 10 14 2 2]
-           #[1 2 3 4 6 6 6 20 20 20 20 20 9 3 2]
-           #[2 3 4 6 18 20 14 20 20 20 20 20 20 3 2]
-           #[20 20 20 20 20 20 20 20 20 20 20 20 5 3 2]
-           #[2 3 4 6 18 20 14 20 20 20 20 20 20 3 2]
-           #[1 2 3 4 6 6 6 20 20 20 20 20 9 3 2]
-           #[1 1 2 2 3 3 4 11 20 20 20 10 14 2 2]
-           #[1 1 1 2 2 2 3 4 5 20 17 4 3 2 1]
-           #[1 1 1 1 1 2 2 2 3 6 20 3 2 1 1]
-           #[1 1 1 1 1 1 2 2 2 3 2 2 1 1 1]
-           #[0 1 1 1 1 1 1 1 1 1 1 1 1 1 1]]))
-
-(check-true
- (equal? (mandelbrot 0.2 20)
-         truth))
-
-(check-true
- (equal? (parameterize ([array-strictness #f])
-           (mandelbrot 0.2 20))
-         truth))
-
-#;
-(begin
-  (require images/flomap)
-  
-  (: array->flomap ((Array Real) -> flomap))
-  (define (array->flomap arr)
-    (let ([arr (array->flarray arr)])
-      (define ds (array-shape arr))
-      (match ds
-        [(vector h w)  (flomap (flarray-data arr) 1 w h)]
-        [(vector h w c)  (flomap (flarray-data arr) c w h)]
-        [_  (error 'array->flomap "expected array with 2 or 3 dimensions; given shape ~e" ds)])))
-  
-  (define fm
-    (array->flomap
-     (time (mandelbrot 0.007 20))))
-  
-  (flomap-size fm)
-  
-  (flomap->bitmap (flomap-normalize fm)))
diff --git a/pkgs/math-pkgs/math-test/math/tests/matrix-strictness-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/matrix-strictness-tests.rkt
deleted file mode 100644
index abc7c48130..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/matrix-strictness-tests.rkt
+++ /dev/null
@@ -1,163 +0,0 @@
-#lang typed/racket
-
-(require math/matrix
-         math/array
-         typed/rackunit)
-
-(: matrix-double ((Matrix Real) -> (Matrix Real)))
-(define (matrix-double M) (matrix-scale M 2))
-
-(define nonstrict-2x2-arr
-  (parameterize ([array-strictness #f])
-    (build-matrix 2 2 (λ: ([i : Index] [j : Index]) (if (= i j) 1 0)))))
-
-(define strict-2x2-arr
-  (parameterize ([array-strictness #t])
-    (build-matrix 2 2 (λ: ([i : Index] [j : Index]) (if (= i j) 1 0)))))
-
-(check-false (array-strict? nonstrict-2x2-arr))
-(check-true (array-strict? strict-2x2-arr))
-
-(define (check-always)
-  (printf "(array-strictness) = ~v~n" (array-strictness))
-  (check-true (array-strict? (matrix [[1 2] [3 4]])))
-  (check-true (array-strict? (row-matrix [1 2 3 4])))
-  (check-true (array-strict? (col-matrix [1 2 3 4])))
-  (check-true (array-strict? (make-matrix 4 4 0)))
-  (check-true (array-strict? (identity-matrix 6)))
-  (check-true (array-strict? (diagonal-matrix '(1 2 3 4))))
-  (check-true (array-strict? (list->matrix 2 2 '(1 2 3 4))))
-  (check-true (array-strict? (vector->matrix 2 2 #(1 2 3 4))))
-  (check-true (array-strict? (list*->matrix '((1 2) (3 4)))))
-  (check-true (array-strict? ((inst vector*->matrix Integer) #(#(1 2) #(3 4)))))
-  
-  (for*: ([M  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (matrix-row-echelon M)))
-    (let-values ([(L U)  (matrix-lu M)])
-      (check-true (array-strict? L))
-      (check-true (array-strict? U))))
-  )
-
-(parameterize ([array-strictness #t])
-  (check-always)
-  
-  (check-true (array-strict? (block-diagonal-matrix (list nonstrict-2x2-arr strict-2x2-arr))))
-  (check-true (array-strict? (vandermonde-matrix '(1 2 3 4) 10)))
-  
-  (check-true (array-strict? (->col-matrix '(1 2 3 4))))
-  (check-true (array-strict? (->col-matrix #(1 2 3 4))))
-  (check-true (array-strict? (->col-matrix (array #[1 2 3 4]))))
-  (check-true (array-strict? (->col-matrix (array #[#[1 2 3 4]]))))
-  (check-true (array-strict? (->col-matrix (array #[#[1] #[2] #[3] #[4]]))))
-  
-  (check-true (array-strict? (->row-matrix '(1 2 3 4))))
-  (check-true (array-strict? (->row-matrix #(1 2 3 4))))
-  (check-true (array-strict? (->row-matrix (array #[1 2 3 4]))))
-  (check-true (array-strict? (->row-matrix (array #[#[1 2 3 4]]))))
-  (check-true (array-strict? (->row-matrix (array #[#[1] #[2] #[3] #[4]]))))
-  
-  (for*: ([M1  (list nonstrict-2x2-arr strict-2x2-arr)]
-          [M2  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (matrix* M1 M2)))
-    (check-true (array-strict? (matrix+ M1 M2)))
-    (check-true (array-strict? (matrix- M1 M2)))
-    (check-true (array-strict? (matrix-map * M1 M2)))
-    (check-true (array-strict? (matrix-sum (list M1 M2))))
-    (check-true (array-strict? (matrix-augment (list M1 M2))))
-    (check-true (array-strict? (matrix-stack (list M1 M2))))
-    (check-true (array-strict? (matrix-solve M1 M2))))
-  
-  (for*: ([M  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-true (array-strict? (matrix-scale M -1)))
-    (check-true (array-strict? (matrix-expt M 0)))
-    (check-true (equal? (array-strict? (matrix-expt M 1)) (array-strict? M)))
-    (check-true (array-strict? (matrix-expt M 2)))
-    (check-true (array-strict? (matrix-expt M 3)))
-    (check-true (array-strict? (matrix-diagonal M)))
-    (check-true (andmap (λ: ([M : (Matrix Real)]) (array-strict? M)) (matrix-rows M)))
-    (check-true (andmap (λ: ([M : (Matrix Real)]) (array-strict? M)) (matrix-cols M)))
-    (check-true (array-strict? (matrix-map-rows matrix-double M)))
-    (check-true (array-strict? (matrix-map-cols matrix-double M)))
-    (check-true (array-strict? (matrix-conjugate M)))
-    (check-true (array-strict? (matrix-transpose M)))
-    (check-true (array-strict? (matrix-hermitian M)))
-    (check-true (array-strict? (matrix-normalize M)))
-    (check-true (array-strict? (matrix-normalize-rows M)))
-    (check-true (array-strict? (matrix-normalize-cols M)))
-    (check-true (array-strict? (matrix-inverse M)))
-    (check-true (array-strict? (matrix-gram-schmidt M)))
-    (let-values ([(Q R)  (matrix-qr M)])
-      (check-true (array-strict? Q))
-      (check-true (array-strict? R))))
-  
-  (for*: ([M  (list nonstrict-2x2-arr strict-2x2-arr)]
-          [i  (list 0 1)])
-    (check-true (array-strict? (matrix-row M i)))
-    (check-true (array-strict? (matrix-col M i))))
-  
-  (for*: ([M  (list nonstrict-2x2-arr strict-2x2-arr)]
-          [spec  (list '(0) (:: #f #f 2))])
-    (check-true (array-strict? (submatrix M (::) spec))))
-  )
-
-(parameterize ([array-strictness #f])
-  (check-always)
-  
-  (check-false (array-strict? (block-diagonal-matrix (list nonstrict-2x2-arr strict-2x2-arr))))
-  (check-false (array-strict? (vandermonde-matrix '(1 2 3 4) 10)))
-  
-  (check-true (array-strict? (->col-matrix '(1 2 3 4))))
-  (check-true (array-strict? (->col-matrix #(1 2 3 4))))
-  (check-false (array-strict? (->col-matrix (array #[1 2 3 4]))))
-  (check-false (array-strict? (->col-matrix (array #[#[1 2 3 4]]))))
-  (check-true (array-strict? (->col-matrix (array #[#[1] #[2] #[3] #[4]]))))
-  
-  (check-false (array-strict? (->row-matrix '(1 2 3 4))))
-  (check-false (array-strict? (->row-matrix #(1 2 3 4))))
-  (check-false (array-strict? (->row-matrix (array #[1 2 3 4]))))
-  (check-true (array-strict? (->row-matrix (array #[#[1 2 3 4]]))))
-  (check-false (array-strict? (->row-matrix (array #[#[1] #[2] #[3] #[4]]))))
-  
-  (for*: ([M1  (list nonstrict-2x2-arr strict-2x2-arr)]
-          [M2  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-false (array-strict? (matrix* M1 M2)))
-    (check-false (array-strict? (matrix+ M1 M2)))
-    (check-false (array-strict? (matrix- M1 M2)))
-    (check-false (array-strict? (matrix-map * M1 M2)))
-    (check-false (array-strict? (matrix-sum (list M1 M2))))
-    (check-false (array-strict? (matrix-augment (list M1 M2))))
-    (check-false (array-strict? (matrix-stack (list M1 M2))))
-    (check-false (array-strict? (matrix-solve M1 M2))))
-  
-  (for*: ([M  (list nonstrict-2x2-arr strict-2x2-arr)])
-    (check-false (array-strict? (matrix-scale M -1)))
-    (check-false (array-strict? (matrix-expt M 0)))
-    (check-false (array-strict? (matrix-expt (array-lazy M) 1)))
-    (check-false (array-strict? (matrix-expt M 2)))
-    (check-false (array-strict? (matrix-expt M 3)))
-    (check-false (array-strict? (matrix-diagonal M)))
-    (check-false (ormap (λ: ([M : (Matrix Real)]) (array-strict? M)) (matrix-rows M)))
-    (check-false (ormap (λ: ([M : (Matrix Real)]) (array-strict? M)) (matrix-cols M)))
-    (check-false (array-strict? (matrix-map-rows matrix-double M)))
-    (check-false (array-strict? (matrix-map-cols matrix-double M)))
-    (check-false (array-strict? (matrix-conjugate M)))
-    (check-false (array-strict? (matrix-transpose M)))
-    (check-false (array-strict? (matrix-hermitian M)))
-    (check-false (array-strict? (matrix-normalize M)))
-    (check-false (array-strict? (matrix-normalize-rows M)))
-    (check-false (array-strict? (matrix-normalize-cols M)))
-    (check-false (array-strict? (matrix-inverse M)))
-    (check-false (array-strict? (matrix-gram-schmidt M)))
-    (let-values ([(Q R)  (matrix-qr M)])
-      (check-false (array-strict? Q))
-      (check-false (array-strict? R))))
-  
-  (for*: ([M  (list nonstrict-2x2-arr strict-2x2-arr)]
-          [spec  (list '(0) (:: #f #f 2))])
-    (check-false (array-strict? (submatrix M (::) spec))))
-  
-  (for*: ([M  (list nonstrict-2x2-arr strict-2x2-arr)]
-          [i  (list 0 1)])
-    (check-false (array-strict? (matrix-row M i)))
-    (check-false (array-strict? (matrix-col M i))))
-  )
diff --git a/pkgs/math-pkgs/math-test/math/tests/matrix-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/matrix-tests.rkt
deleted file mode 100644
index 5ec65dbbbe..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/matrix-tests.rkt
+++ /dev/null
@@ -1,1077 +0,0 @@
-#lang typed/racket
-
-(require math/array
-         math/base
-         math/flonum
-         math/matrix
-         "test-utils.rkt")
-
-(define-syntax (check-matrix=? stx)
-  (syntax-case stx ()
-    [(_ a b)
-     (syntax/loc stx (check-true (matrix=? a b) (format "(matrix=? ~v ~v)" a b)))]
-    [(_ a b eps)
-     (syntax/loc stx (check-true (matrix=? a b eps) (format "(matrix=? ~v ~v ~v)" a b eps)))]))
-
-(: random-matrix (case-> (Integer Integer -> (Matrix Integer))
-                         (Integer Integer Integer -> (Matrix Integer))
-                         (Integer Integer Integer Integer -> (Matrix Integer))))
-;; Generates a random matrix with Natural elements < k. Useful to test properties.
-(define random-matrix
-  (case-lambda
-    [(m n)  (random-matrix m n 100)]
-    [(m n k)  (array-strict (build-matrix m n (λ (i j) (random-natural k))))]
-    [(m n k0 k1)  (array-strict (build-matrix m n (λ (i j) (random-integer k0 k1))))]))
-
-(define nonmatrices
-  (list (make-array #() 0)
-        (make-array #(1) 0)
-        (make-array #(1 0) 0)
-        (make-array #(0 1) 0)
-        (make-array #(0 0) 0)
-        (make-array #(1 1 1) 0)))
-
-(: matrix-l ((Matrix Number) -> (Matrix Number)))
-(define (matrix-l M)
-  (define-values (L U) (matrix-lu M))
-  L)
-
-(: matrix-q ((Matrix Number) -> (Matrix Number)))
-(define (matrix-q M)
-  (define-values (Q R) (matrix-qr M))
-  Q)
-
-;; ===================================================================================================
-;; Literal syntax
-
-(check-equal? (matrix [[1]])
-              (array #[#[1]]))
-
-(check-equal? (matrix [[1 2 3 4]])
-              (array #[#[1 2 3 4]]))
-
-(check-equal? (matrix [[1 2] [3 4]])
-              (array #[#[1 2] #[3 4]]))
-
-(check-equal? (matrix [[1] [2] [3] [4]])
-              (array #[#[1] #[2] #[3] #[4]]))
-
-(check-equal? (row-matrix [1 2 3 4])
-              (matrix [[1 2 3 4]]))
-
-(check-equal? (col-matrix [1 2 3 4])
-              (matrix [[1] [2] [3] [4]]))
-
-;; ===================================================================================================
-;; Predicates
-
-(check-true (matrix? (array #[#[1]])))
-(check-false (matrix? (array #[1])))
-(check-false (matrix? (array 1)))
-(check-false (matrix? (array #[])))
-(for: ([a  (in-list nonmatrices)])
-  (check-false (matrix? a)))
-
-(check-true (square-matrix? (matrix [[1]])))
-(check-true (square-matrix? (matrix [[1 1] [1 1]])))
-(check-false (square-matrix? (matrix [[1 2]])))
-(check-false (square-matrix? (matrix [[1] [2]])))
-(for: ([a  (in-list nonmatrices)])
-  (check-false (square-matrix? a)))
-
-(check-true (row-matrix? (matrix [[1 2 3 4]])))
-(check-true (row-matrix? (matrix [[1]])))
-(check-false (row-matrix? (matrix [[1] [2] [3] [4]])))
-(for: ([a  (in-list nonmatrices)])
-  (check-false (row-matrix? a)))
-
-(check-true (col-matrix? (matrix [[1] [2] [3] [4]])))
-(check-true (col-matrix? (matrix [[1]])))
-(check-false (col-matrix? (matrix [[1 2 3 4]])))
-(check-false (col-matrix? (array #[1])))
-(check-false (col-matrix? (array 1)))
-(check-false (col-matrix? (array #[])))
-(for: ([a  (in-list nonmatrices)])
-  (check-false (col-matrix? a)))
-
-;; ===================================================================================================
-;; Accessors
-
-;; matrix-shape
-
-(check-equal? (let-values ([(m n)  (matrix-shape (matrix [[1 2 3] [4 5 6]]))])
-                (list m n))
-              (list 2 3))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (let-values ([(m n)  (matrix-shape a)])
-                                        (void)))))
-
-;; square-matrix-size
-
-(check-equal? (square-matrix-size (matrix [[1 2] [3 4]]))
-              2)
-
-(check-exn exn:fail:contract? (λ () (square-matrix-size (matrix [[1 2]]))))
-(check-exn exn:fail:contract? (λ () (square-matrix-size (matrix [[1] [2]]))))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (square-matrix-size a))))
-
-;; matrix-num-rows
-
-(check-equal? (matrix-num-rows (matrix [[1 2 3] [4 5 6]]))
-              2)
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-num-rows a))))
-
-;; matrix-num-cols
-
-(check-equal? (matrix-num-cols (matrix [[1 2 3] [4 5 6]]))
-              3)
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-num-cols a))))
-
-;; ===================================================================================================
-;; Constructors
-
-;; identity-matrix
-
-(check-equal? (identity-matrix 1) (matrix [[1]]))
-(check-equal? (identity-matrix 2) (matrix [[1 0] [0 1]]))
-(check-equal? (identity-matrix 3) (matrix [[1 0 0] [0 1 0] [0 0 1]]))
-(check-exn exn:fail:contract? (λ () (identity-matrix 0)))
-
-;; make-matrix
-
-(check-equal? (make-matrix 1 1 4) (matrix [[4]]))
-(check-equal? (make-matrix 2 2 3) (matrix [[3 3] [3 3]]))
-(check-exn exn:fail:contract? (λ () (make-matrix 1 0 4)))
-(check-exn exn:fail:contract? (λ () (make-matrix 0 1 4)))
-
-;; build-matrix
-
-(check-equal? (build-matrix 4 4 (λ: ([i : Index] [j : Index])
-                                  (+ i j)))
-              (build-array #(4 4) (λ: ([js : Indexes])
-                                    (+ (vector-ref js 0) (vector-ref js 1)))))
-(check-exn exn:fail:contract? (λ () (build-matrix 1 0 (λ: ([i : Index] [j : Index]) (+ i j)))))
-(check-exn exn:fail:contract? (λ () (build-matrix 0 1 (λ: ([i : Index] [j : Index]) (+ i j)))))
-
-;; diagonal-matrix
-
-(check-equal? (diagonal-matrix '(1 2 3 4))
-              (matrix [[1 0 0 0]
-                       [0 2 0 0]
-                       [0 0 3 0]
-                       [0 0 0 4]]))
-
-(check-exn exn:fail:contract? (λ () (diagonal-matrix '())))
-
-;; block-diagonal-matrix
-
-(let ([m  (random-matrix 4 4 100)])
-  (check-equal? (block-diagonal-matrix (list m))
-                m))
-
-(check-equal?
- (block-diagonal-matrix
-  (list (matrix [[1 2] [3 4]])
-        (matrix [[1 2 3] [4 5 6]])
-        (matrix [[1] [3] [5]])
-        (matrix [[2 4 6]])))
- (matrix [[1 2 0 0 0 0 0 0 0]
-          [3 4 0 0 0 0 0 0 0]
-          [0 0 1 2 3 0 0 0 0]
-          [0 0 4 5 6 0 0 0 0]
-          [0 0 0 0 0 1 0 0 0]
-          [0 0 0 0 0 3 0 0 0]
-          [0 0 0 0 0 5 0 0 0]
-          [0 0 0 0 0 0 2 4 6]]))
-
-(check-equal?
- (block-diagonal-matrix (map (λ: ([i : Integer]) (matrix [[i]])) '(1 2 3 4)))
- (diagonal-matrix '(1 2 3 4)))
-
-(check-exn exn:fail:contract? (λ () (block-diagonal-matrix '())))
-
-;; Vandermonde matrix
-
-(check-equal? (vandermonde-matrix '(10) 1)
-              (matrix [[1]]))
-(check-equal? (vandermonde-matrix '(10) 4)
-              (matrix [[1 10 100 1000]]))
-(check-equal? (vandermonde-matrix '(1 2 3 4) 3)
-              (matrix [[1 1 1] [1 2 4] [1 3 9] [1 4 16]]))
-(check-exn exn:fail:contract? (λ () (vandermonde-matrix '() 1)))
-(check-exn exn:fail:contract? (λ () (vandermonde-matrix '(1) 0)))
-
-;; ===================================================================================================
-;; Flat conversion
-
-(check-equal? (list->matrix 1 3 '(1 2 3)) (row-matrix [1 2 3]))
-(check-equal? (list->matrix 3 1 '(1 2 3)) (col-matrix [1 2 3]))
-(check-exn exn:fail:contract? (λ () (list->matrix 0 1 '())))
-(check-exn exn:fail:contract? (λ () (list->matrix 1 0 '())))
-(check-exn exn:fail:contract? (λ () (list->matrix 1 1 '(1 2))))
-
-(check-equal? (vector->matrix 1 3 #(1 2 3)) (row-matrix [1 2 3]))
-(check-equal? (vector->matrix 3 1 #(1 2 3)) (col-matrix [1 2 3]))
-(check-exn exn:fail:contract? (λ () (vector->matrix 0 1 #())))
-(check-exn exn:fail:contract? (λ () (vector->matrix 1 0 #())))
-(check-exn exn:fail:contract? (λ () (vector->matrix 1 1 #(1 2))))
-
-(check-equal? (->row-matrix '(1 2 3)) (row-matrix [1 2 3]))
-(check-equal? (->row-matrix #(1 2 3)) (row-matrix [1 2 3]))
-(check-equal? (->row-matrix (row-matrix [1 2 3])) (row-matrix [1 2 3]))
-(check-equal? (->row-matrix (col-matrix [1 2 3])) (row-matrix [1 2 3]))
-(check-equal? (->row-matrix (make-array #() 1)) (row-matrix [1]))
-(check-equal? (->row-matrix (make-array #(3) 1)) (row-matrix [1 1 1]))
-(check-equal? (->row-matrix (make-array #(1 3 1) 1)) (row-matrix [1 1 1]))
-(check-exn exn:fail:contract? (λ () (->row-matrix (make-array #(2 3 1) 1))))
-(check-exn exn:fail:contract? (λ () (->row-matrix (make-array #(1 3 2) 1))))
-(check-exn exn:fail:contract? (λ () (->row-matrix (make-array #(0 3) 1))))
-(check-exn exn:fail:contract? (λ () (->row-matrix (make-array #(3 0) 1))))
-
-(check-equal? (->col-matrix '(1 2 3)) (col-matrix [1 2 3]))
-(check-equal? (->col-matrix #(1 2 3)) (col-matrix [1 2 3]))
-(check-equal? (->col-matrix (col-matrix [1 2 3])) (col-matrix [1 2 3]))
-(check-equal? (->col-matrix (row-matrix [1 2 3])) (col-matrix [1 2 3]))
-(check-equal? (->col-matrix (make-array #() 1)) (col-matrix [1]))
-(check-equal? (->col-matrix (make-array #(3) 1)) (col-matrix [1 1 1]))
-(check-equal? (->col-matrix (make-array #(1 3 1) 1)) (col-matrix [1 1 1]))
-(check-exn exn:fail:contract? (λ () (->col-matrix (make-array #(2 3 1) 1))))
-(check-exn exn:fail:contract? (λ () (->col-matrix (make-array #(1 3 2) 1))))
-(check-exn exn:fail:contract? (λ () (->col-matrix (make-array #(0 3) 1))))
-(check-exn exn:fail:contract? (λ () (->col-matrix (make-array #(3 0) 1))))
-
-(check-equal? (matrix->list (matrix [[1 2 3] [4 5 6]])) '(1 2 3 4 5 6))
-(check-equal? (matrix->list (row-matrix [1 2 3])) '(1 2 3))
-(check-equal? (matrix->list (col-matrix [1 2 3])) '(1 2 3))
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix->list a))))
-
-(check-equal? (matrix->vector (matrix [[1 2 3] [4 5 6]])) #(1 2 3 4 5 6))
-(check-equal? (matrix->vector (row-matrix [1 2 3])) #(1 2 3))
-(check-equal? (matrix->vector (col-matrix [1 2 3])) #(1 2 3))
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix->vector a))))
-
-;; ===================================================================================================
-;; Nested conversion
-
-(check-equal? (list*->matrix '((1 2 3) (4 5 6))) (matrix [[1 2 3] [4 5 6]]))
-(check-exn exn:fail:contract? (λ () (list*->matrix '((1 2 3) (4 5)))))
-(check-exn exn:fail:contract? (λ () (list*->matrix '(() () ()))))
-(check-exn exn:fail:contract? (λ () (list*->matrix '())))
-
-(check-equal? ((inst vector*->matrix Integer) #(#(1 2 3) #(4 5 6))) (matrix [[1 2 3] [4 5 6]]))
-(check-exn exn:fail:contract? (λ () ((inst vector*->matrix Integer) #(#(1 2 3) #(4 5)))))
-(check-exn exn:fail:contract? (λ () ((inst vector*->matrix Integer) #(#() #() #()))))
-(check-exn exn:fail:contract? (λ () ((inst vector*->matrix Integer) #())))
-
-(check-equal? (matrix->list* (matrix [[1 2 3] [4 5 6]])) '((1 2 3) (4 5 6)))
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix->list* a))))
-
-(check-equal? (matrix->vector* (matrix [[1 2 3] [4 5 6]])) #(#(1 2 3) #(4 5 6)))
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix->vector* a))))
-
-;; ===================================================================================================
-;; Equality
-
-(check-true (matrix= (matrix [[1 2 3]
-                              [4 5 6]])
-                     (matrix [[1.0 2.0 3.0]
-                              [4.0 5.0 6.0]])))
-
-(check-true (matrix= (matrix [[1 2 3]
-                              [4 5 6]])
-                     (matrix [[1.0 2.0 3.0]
-                              [4.0 5.0 6.0]])
-                     (matrix [[1.0+0.0i 2.0+0.0i 3.0+0.0i]
-                              [4.0+0.0i 5.0+0.0i 6.0+0.0i]])))
-
-(check-false (matrix= (matrix [[1 2 3] [4 5 6]])
-                      (matrix [[1 2 3] [4 5 7]])))
-
-(check-false (matrix= (matrix [[0 2 3] [4 5 6]])
-                      (matrix [[1 2 3] [4 5 7]])))
-
-(check-false (matrix= (matrix [[1 2 3] [4 5 6]])
-                      (matrix [[1 4] [2 5] [3 6]])))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix= a (matrix [[1]]))))
-  (check-exn exn:fail:contract? (λ () (matrix= (matrix [[1]]) a)))
-  (check-exn exn:fail:contract? (λ () (matrix= (matrix [[1]]) (matrix [[1]]) a))))
-
-;; ===================================================================================================
-;; Pointwise operations
-
-(define-syntax-rule (test-matrix-map (matrix-map ...) (array-map ...))
-  (begin
-    (for: ([a  (in-list nonmatrices)])
-      (check-exn exn:fail:contract? (λ () (matrix-map ... a)))
-      (check-exn exn:fail:contract? (λ () (matrix-map ... (matrix [[1]]) a))))
-    
-    (for*: ([m  '(2 3 4)]
-            [n  '(2 3 4)])
-      (define a0 (random-matrix m n))
-      (define a1 (random-matrix m n))
-      (define a2 (random-matrix m n))
-      (check-equal? (matrix-map ... a0)
-                    (array-map ... a0))
-      (check-equal? (matrix-map ... a0 a1)
-                    (array-map ... a0 a1))
-      (check-equal? (matrix-map ... a0 a1 a2)
-                    (array-map ... a0 a1 a2))
-      ;; Don't know why this (void) is necessary, but TR complains without it
-      (void))))
-
-(test-matrix-map (matrix-map -) (array-map -))
-(test-matrix-map ((values matrix-map) -) (array-map -))
-
-(test-matrix-map (matrix+) (array+))
-(test-matrix-map ((values matrix+)) (array+))
-
-(test-matrix-map (matrix-) (array-))
-(test-matrix-map ((values matrix-)) (array-))
-
-(check-equal? (matrix-sum (list (matrix [[1 2 3] [4 5 6]])))
-              (matrix [[1 2 3] [4 5 6]]))
-(check-equal? (matrix-sum (list (matrix [[1 2 3] [4 5 6]])
-                                (matrix [[0 1 2] [3 4 5]])))
-              (matrix+ (matrix [[1 2 3] [4 5 6]])
-                       (matrix [[0 1 2] [3 4 5]])))
-(check-exn exn:fail:contract? (λ () (matrix-sum '())))
-
-(check-equal? (matrix-scale (matrix [[1 2 3] [4 5 6]]) 10)
-              (matrix [[10 20 30] [40 50 60]]))
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-scale a 0))))
-
-;; ===================================================================================================
-;; Multiplication
-
-(define-syntax-rule (test-matrix* matrix*)
-  (begin
-    (for: ([a  (in-list nonmatrices)])
-      (check-exn exn:fail:contract? (λ () (matrix* a (matrix [[1]])))))
-    
-    (check-equal? (matrix* (matrix [[1 2 3] [4 5 6] [7 8 9]])
-                           (matrix [[1 2 3] [4 5 6] [7 8 9]]))
-                  (matrix [[30 36 42] [66 81 96] [102 126 150]]))
-    
-    (check-equal? (matrix* (row-matrix [1 2 3 4])
-                           (col-matrix [1 2 3 4]))
-                  (matrix [[30]]))
-    
-    (check-equal? (matrix* (col-matrix [1 2 3 4])
-                           (row-matrix [1 2 3 4]))
-                  (matrix [[1  2  3  4]
-                           [2  4  6  8]
-                           [3  6  9 12]
-                           [4  8 12 16]]))
-    
-    (check-equal? (matrix* (matrix [[3]]) (matrix [[7]]))
-                  (matrix [[21]]))
-    
-    ;; Left/right identity
-    (let ([m  (random-matrix 2 2)])
-      (check-equal? (matrix* (identity-matrix 2) m)
-                    m)
-      (check-equal? (matrix* m (identity-matrix 2))
-                    m))
-    
-    ;; Shape
-    (let ([m0  (random-matrix 4 5)]
-          [m1  (random-matrix 5 2)]
-          [m2  (random-matrix 2 10)])
-      (check-equal? (let-values ([(m n)  (matrix-shape (matrix* m0 m1))])
-                      (list m n))
-                    (list 4 2))
-      (check-equal? (let-values ([(m n)  (matrix-shape (matrix* m1 m2))])
-                      (list m n))
-                    (list 5 10))
-      (check-equal? (let-values ([(m n)  (matrix-shape (matrix* m0 m1 m2))])
-                      (list m n))
-                    (list 4 10)))
-    
-    (check-exn exn:fail? (λ () (matrix* (random-matrix 1 2) (random-matrix 3 2))))
-    
-    ;; Associativity
-    (let ([m0  (random-matrix 4 5)]
-          [m1  (random-matrix 5 2)]
-          [m2  (random-matrix 2 10)])
-      (check-equal? (matrix* m0 m1 m2)
-                    (matrix* (matrix* m0 m1) m2))
-      (check-equal? (matrix* (matrix* m0 m1) m2)
-                    (matrix* m0 (matrix* m1 m2))))
-    ))
-
-(test-matrix* matrix*)
-;; `matrix*' is an inlining macro, so we need to check the function version as well
-(test-matrix* (values matrix*))
-
-;; ===================================================================================================
-;; Exponentiation
-
-(let ([A  (matrix [[1 2] [3 4]])])
-  (check-equal? (matrix-expt A 0) (identity-matrix 2))
-  (check-equal? (matrix-expt A 1) A)
-  (check-equal? (matrix-expt A 2) (matrix [[7 10] [15 22]]))
-  (check-equal? (matrix-expt A 3) (matrix [[37 54] [81 118]]))
-  (check-equal? (matrix-expt A 8) (matrix [[165751 241570] [362355 528106]])))
-
-(check-equal? (matrix-expt (matrix [[2]]) 10) (matrix [[(expt 2 10)]]))
-
-(check-exn exn:fail:contract? (λ () (matrix-expt (row-matrix [1 2 3]) 0)))
-(check-exn exn:fail:contract? (λ () (matrix-expt (col-matrix [1 2 3]) 0)))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-expt a 0))))
-
-;; ===================================================================================================
-;; Comprehensions
-
-;; for:/matrix and friends are defined in terms of for:/array and friends, so we only need to test
-;; that it works for one case each, and that they properly raise exceptions when given zero-length
-;; axes
-
-(check-equal?
- (for/matrix: 2 2 ([i  (in-range 4)]) i)
- (matrix [[0 1] [2 3]]))
-
-(check-equal?
- (for*/matrix: 2 2 ([i  (in-range 2)] [j  (in-range 2)]) (+ i j))
- (matrix [[0 1] [1 2]]))
-
-(check-exn exn:fail:contract? (λ () (for/matrix: 2 0 () 0)))
-(check-exn exn:fail:contract? (λ () (for/matrix: 0 2 () 0)))
-(check-exn exn:fail:contract? (λ () (for*/matrix: 2 0 () 0)))
-(check-exn exn:fail:contract? (λ () (for*/matrix: 0 2 () 0)))
-
-;; ===================================================================================================
-;; Extraction
-
-;; matrix-ref
-
-(let ([a  (matrix [[10 11] [12 13]])])
-  (check-equal? (matrix-ref a 0 0) 10)
-  (check-equal? (matrix-ref a 0 1) 11)
-  (check-equal? (matrix-ref a 1 0) 12)
-  (check-equal? (matrix-ref a 1 1) 13)
-  (check-exn exn:fail? (λ () (matrix-ref a 2 0)))
-  (check-exn exn:fail? (λ () (matrix-ref a 0 2)))
-  (check-exn exn:fail? (λ () (matrix-ref a -1 0)))
-  (check-exn exn:fail? (λ () (matrix-ref a 0 -1))))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-ref a 0 0))))
-
-;; matrix-diagonal
-
-(check-equal? (matrix-diagonal (diagonal-matrix '(1 2 3 4)))
-              (array #[1 2 3 4]))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-diagonal a))))
-
-;; submatrix
-
-(check-equal? (submatrix (identity-matrix 8) (:: 2 4) (:: 2 4))
-              (identity-matrix 2))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (submatrix a '(0) '(0)))))
-
-;; matrix-row
-
-(let ([a  (matrix [[1 2 3] [4 5 6]])])
-  (check-equal? (matrix-row a 0) (row-matrix [1 2 3]))
-  (check-equal? (matrix-row a 1) (row-matrix [4 5 6]))
-  (check-exn exn:fail? (λ () (matrix-row a -1)))
-  (check-exn exn:fail? (λ () (matrix-row a 2))))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-row a 0))))
-
-;; matrix-col
-
-(let ([a  (matrix [[1 2 3] [4 5 6]])])
-  (check-equal? (matrix-col a 0) (col-matrix [1 4]))
-  (check-equal? (matrix-col a 1) (col-matrix [2 5]))
-  (check-equal? (matrix-col a 2) (col-matrix [3 6]))
-  (check-exn exn:fail? (λ () (matrix-col a -1)))
-  (check-exn exn:fail? (λ () (matrix-col a 3))))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-col a 0))))
-
-;; matrix-rows
-
-(check-equal? (matrix-rows (matrix [[1 2 3] [4 5 6]]))
-              (list (row-matrix [1 2 3])
-                    (row-matrix [4 5 6])))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-rows a))))
-
-;; matrix-cols
-
-(check-equal? (matrix-cols (matrix [[1 2 3] [4 5 6]]))
-              (list (col-matrix [1 4])
-                    (col-matrix [2 5])
-                    (col-matrix [3 6])))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-cols a))))
-
-;; TODO: matrix-upper-triangle
-
-;; TODO: matrix-lower-triangle
-
-;; ===================================================================================================
-;; Embiggenment (it's a perfectly cromulent word)
-
-;; matrix-augment
-
-(let ([a  (random-matrix 3 5)])
-  (check-equal? (matrix-augment (list a)) a)
-  (check-equal? (matrix-augment (matrix-cols a)) a))
-
-(check-equal? (matrix-augment (list (col-matrix [1 2 3]) (col-matrix [4 5 6])))
-              (matrix [[1 4] [2 5] [3 6]]))
-
-(check-equal? (matrix-augment (list (matrix [[1 2] [4 5]]) (col-matrix [3 6])))
-              (matrix [[1 2 3] [4 5 6]]))
-
-(check-exn exn:fail? (λ () (matrix-augment (list (matrix [[1 2] [4 5]]) (col-matrix [3])))))
-(check-exn exn:fail:contract? (λ () (matrix-augment '())))
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-augment (list a))))
-  (check-exn exn:fail:contract? (λ () (matrix-augment (list (matrix [[1]]) a)))))
-
-;; matrix-stack
-
-(let ([a  (random-matrix 5 3)])
-  (check-equal? (matrix-stack (list a)) a)
-  (check-equal? (matrix-stack (matrix-rows a)) a))
-
-(check-equal? (matrix-stack (list (row-matrix [1 2 3]) (row-matrix [4 5 6])))
-              (matrix [[1 2 3] [4 5 6]]))
-
-(check-equal? (matrix-stack (list (matrix [[1 2 3] [4 5 6]]) (row-matrix [7 8 9])))
-              (matrix [[1 2 3] [4 5 6] [7 8 9]]))
-
-(check-exn exn:fail? (λ () (matrix-stack (list (matrix [[1 2 3] [4 5 6]]) (row-matrix [7 8])))))
-(check-exn exn:fail:contract? (λ () (matrix-stack '())))
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-stack (list a))))
-  (check-exn exn:fail:contract? (λ () (matrix-stack (list (matrix [[1]]) a)))))
-
-;; ===================================================================================================
-;; Inner product space
-
-;; matrix-norm
-
-(check-equal? (matrix-norm (matrix [[1 2 3] [4 5 6]]))
-              (sqrt (+ (* 1 1) (* 2 2) (* 3 3) (* 4 4) (* 5 5) (* 6 6))))
-
-;; Default norm is Frobenius norm
-(check-equal? (matrix-norm (matrix [[1 2 3] [4 5 6]]))
-              (matrix-norm (matrix [[1 2 3] [4 5 6]]) 2))
-
-;; This shouldn't overflow (so we check against `flhypot', which also shouldn't overflow)
-(check-equal? (matrix-norm (matrix [[1e200 1e199]]))
-              (flhypot 1e200 1e199))
-
-;; Taxicab (Manhattan) norm
-(check-equal? (matrix-norm (matrix [[1 2 3] [4 5 6]]) 1)
-              (+ 1 2 3 4 5 6))
-
-;; Infinity (maximum) norm
-(check-equal? (matrix-norm (matrix [[1 2 3] [4 5 6]]) +inf.0)
-              (max 1 2 3 4 5 6))
-
-;; The actual norm is indistinguishable from floating-point 6
-(check-equal? (matrix-norm (matrix [[1 2 3] [4 5 6]]) 1000)
-              6.0)
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-norm a 1)))
-  (check-exn exn:fail:contract? (λ () (matrix-norm a)))
-  (check-exn exn:fail:contract? (λ () (matrix-norm a 5)))
-  (check-exn exn:fail:contract? (λ () (matrix-norm a +inf.0))))
-
-(check-equal? (matrix-norm (row-matrix [1+1i]))
-              (sqrt 2))
-
-(check-equal? (matrix-norm (row-matrix [1+1i 2+2i 3+3i]))
-              (matrix-norm (row-matrix [(magnitude 1+1i) (magnitude 2+2i) (magnitude 3+3i)])))
-
-;; matrix-dot (induces the Frobenius norm)
-
-(check-equal? (matrix-dot (matrix [[1 -2 3] [-4 5 -6]])
-                          (matrix [[-1 2 -3] [4 -5 6]]))
-              (+ (* 1 -1) (* -2 2) (* 3 -3) (* -4 4) (* 5 -5) (* -6 6)))
-
-(check-equal? (matrix-dot (row-matrix [1 2 3])
-                          (row-matrix [0+4i 0-5i 0+6i]))
-              (+ (* 1 0-4i) (* 2 0+5i) (* 3 0-6i)))
-
-(check-exn exn:fail? (λ () (matrix-dot (random-matrix 1 3) (random-matrix 3 1))))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-dot a (matrix [[1]]))))
-  (check-exn exn:fail:contract? (λ () (matrix-dot (matrix [[1]]) a))))
-
-;; TODO: matrix-angle
-
-;; TODO: matrix-normalize
-
-;; ===================================================================================================
-;; Simple operators
-
-;; matrix-transpose
-
-(check-equal? (matrix-transpose (matrix [[1 2 3] [4 5 6]]))
-              (matrix [[1 4] [2 5] [3 6]]))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-transpose a))))
-
-;; matrix-conjugate
-
-(check-equal? (matrix-conjugate (matrix [[1+i 2-i] [3+i 4-i]]))
-              (matrix [[1-i 2+i] [3-i 4+i]]))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-conjugate a))))
-
-;; matrix-hermitian
-
-(let ([a  (array-make-rectangular (random-matrix 5 6 -100 100)
-                                  (random-matrix 5 6 -100 100))])
-  (check-equal? (matrix-hermitian a)
-                (matrix-conjugate (matrix-transpose a)))
-  (check-equal? (matrix-hermitian a)
-                (matrix-transpose (matrix-conjugate a))))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-hermitian a))))
-
-;; matrix-trace
-
-(check-equal? (matrix-trace (matrix [[1 2 3] [4 5 6] [7 8 9]]))
-              (+ 1 5 9))
-
-(check-exn exn:fail:contract? (λ () (matrix-trace (row-matrix [1 2 3]))))
-(check-exn exn:fail:contract? (λ () (matrix-trace (col-matrix [1 2 3]))))
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-trace a))))
-
-;; ===================================================================================================
-;; Row/column operators
-
-;; TODO: matrix-map-rows
-
-;; TODO: matrix-map-cols
-
-;; TODO: matrix-normalize-rows
-
-;; TODO: matrix-normalize-cols
-
-;; ===================================================================================================
-;; Operator norms
-
-;; TODO: matrix-op-1norm
-
-;; TODO: matrix-op-2norm (after it's implemented)
-
-;; TODO: matrix-op-inf-norm
-
-;; ===================================================================================================
-;; Error
-
-(for*: ([x  (in-list '(-inf.0 -10.0 -1.0 -0.25 -0.0 0.0 0.25 1.0 10.0 +inf.0 +nan.0))]
-        [y  (in-list '(-inf.0 -10.0 -1.0 -0.25 -0.0 0.0 0.25 1.0 10.0 +inf.0 +nan.0))])
-  (check-eqv? (fl (matrix-absolute-error (row-matrix [x])
-                                         (row-matrix [y])))
-              (fl (absolute-error x y))
-              (format "x = ~v  y = ~v" x y))
-  (check-eqv? (fl (matrix-relative-error (row-matrix [x])
-                                         (row-matrix [y])))
-              (fl (relative-error x y))
-              (format "x = ~v  y = ~v" x y)))
-
-(check-equal? (matrix-absolute-error (row-matrix [1 2])
-                                     (row-matrix [1 2]))
-              0)
-
-(check-equal? (matrix-absolute-error (row-matrix [1 2])
-                                     (row-matrix [2 2]))
-              1)
-
-(check-equal? (matrix-absolute-error (row-matrix [1 2])
-                                     (row-matrix [2 +nan.0]))
-              +inf.0)
-
-(check-equal? (matrix-relative-error (row-matrix [1 2])
-                                     (row-matrix [1 2]))
-              0)
-
-(check-equal? (matrix-relative-error (row-matrix [1 2])
-                                     (row-matrix [2 2]))
-              (/ 1 (matrix-op-inf-norm (row-matrix [2 2]))))
-
-(check-equal? (matrix-relative-error (row-matrix [1 2])
-                                     (row-matrix [2 +nan.0]))
-              +inf.0)
-
-;; TODO: matrix-basis-angle
-
-;; ===================================================================================================
-;; Approximate predicates
-
-;; matrix-zero? (TODO: approximations)
-
-(check-true (matrix-zero? (make-matrix 4 3 0)))
-(check-true (matrix-zero? (make-matrix 4 3 0.0)))
-(check-true (matrix-zero? (make-matrix 4 3 0+0.0i)))
-(check-false (matrix-zero? (row-matrix [0 0 0 0 1])))
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-zero? a))))
-
-;; TODO: matrix-rows-orthogonal?
-
-;; TODO: matrix-cols-orthogonal?
-
-;; TODO: matrix-identity?
-
-;; TODO: matrix-orthonormal?
-
-;; ===================================================================================================
-;; Gaussian elimination
-
-(check-equal? (matrix-row-echelon (matrix [[2 4] [3 4]]) #f #f)
-              (matrix [[3 4] [0 4/3]]))
-
-(check-equal? (matrix-row-echelon (matrix [[2 4] [3 4]]) #f #t)
-              (matrix [[1 4/3] [0 1]]))
-
-(check-equal? (matrix-row-echelon (matrix [[1 2] [2 4]]) #f #f)
-              (matrix [[2 4] [0 0]]))
-
-(check-equal? (matrix-row-echelon (matrix [[1 4] [2 4]]) #f #t)
-              (matrix [[1 2] [0 1]]))
-
-(check-equal? (matrix-row-echelon (matrix [[ 2  1 -1   8]
-                                           [-3 -1  2 -11]
-                                           [-2  1  2  -3]])
-                                  #f #t)
-              (matrix [[1 1/3 -2/3 11/3]
-                       [0  1   2/5 13/5]
-                       [0  0    1   -1]]))
-
-(check-equal? (matrix-row-echelon (matrix [[ 2  1 -1   8]
-                                           [-3 -1  2 -11]
-                                           [-2  1  2  -3]])
-                                  #t #t 'partial)
-              (matrix [[1 0 0  2]
-                       [0 1 0  3]
-                       [0 0 1 -1]]))
-
-(check-equal? (matrix-row-echelon (matrix [[ 2  1 -1   8]
-                                           [-3 -1  2 -11]
-                                           [-2  1  2  -3]])
-                                  #t #t 'first)
-              (matrix [[1 0 0  2]
-                       [0 1 0  3]
-                       [0 0 1 -1]]))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-row-echelon a))))
-
-(check-equal? (matrix-rank (matrix [[0 0] [0 0]])) 0)
-(check-equal? (matrix-rank (matrix [[1 0] [0 0]])) 1)
-(check-equal? (matrix-rank (matrix [[1 0] [0 3]])) 2)
-(check-equal? (matrix-rank (matrix [[1 2] [2 4]])) 1)
-(check-equal? (matrix-rank (matrix [[1 2] [3 4]])) 2)
-(check-equal? (matrix-rank (matrix [[1 2 3]])) 1)
-(check-equal? (matrix-rank (matrix [[1 2 3] [2 3 5]])) 2)
-(check-equal? (matrix-rank (matrix [[1 2 3] [2 3 5] [3 4 7]])) 2)
-(check-equal? (matrix-rank (matrix [[1 2 3] [2 3 5] [3 4 7] [4 5 9]])) 2)
-(check-equal? (matrix-rank (matrix [[1 2 3 5] [2 3 5 8]])) 2)
-(check-equal? (matrix-rank (matrix [[1 5 2 3] [2 8 3 5]])) 2)
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-rank a))))
-
-(check-equal? (matrix-nullity (matrix [[0 0] [0 0]])) 2)
-(check-equal? (matrix-nullity (matrix [[1 0] [0 0]])) 1)
-(check-equal? (matrix-nullity (matrix [[1 0] [0 3]])) 0)
-(check-equal? (matrix-nullity (matrix [[1 2] [2 4]])) 1)
-(check-equal? (matrix-nullity (matrix [[1 2] [3 4]])) 0)
-(check-equal? (matrix-nullity (matrix [[1 2 3]])) 2)
-(check-equal? (matrix-nullity (matrix [[1 2 3] [2 3 5]])) 1)
-(check-equal? (matrix-nullity (matrix [[1 2 3] [2 3 5] [3 4 7]])) 1)
-(check-equal? (matrix-nullity (matrix [[1 2 3] [2 3 5] [3 4 7] [4 5 9]])) 1)
-(check-equal? (matrix-nullity (matrix [[1 2 3 5] [2 3 5 8]])) 2)
-(check-equal? (matrix-nullity (matrix [[1 5 2 3] [2 8 3 5]])) 2)
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-nullity a))))
-
-;; ===================================================================================================
-;; Determinant
-
-(check-equal? (matrix-determinant (matrix [[3]])) 3)
-(check-equal? (matrix-determinant (matrix [[1 2] [3 4]])) (- (* 1 4) (* 2 3)))
-(check-equal? (matrix-determinant (matrix [[1 2 3] [4  5 6] [7 8 9]])) 0)
-(check-equal? (matrix-determinant (matrix [[1 2 3] [4 -5 6] [7 8 9]])) 120)
-(check-equal? (matrix-determinant (matrix [[1 2 3 4]
-                                           [-5 6 7 8]
-                                           [9 10 -11 12]
-                                           [13 14 15 16]]))
-              5280)
-
-(for: ([_  (in-range 100)])
-  (define a (random-matrix 3 3 -3 4))
-  (check-equal? (matrix-determinant/row-reduction a)
-                (matrix-determinant a)))
-
-(check-exn exn:fail:contract? (λ () (matrix-determinant (matrix [[1 2 3] [4 5 6]]))))
-(check-exn exn:fail:contract? (λ () (matrix-determinant (matrix [[1 4] [2 5] [3 6]]))))
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-determinant a))))
-
-;; ===================================================================================================
-;; Solving linear systems
-
-(for: ([_  (in-range 100)])
-  (define M (random-matrix 3 3 -3 4))
-  (define B (random-matrix 3 (+ 1 (random 10)) -3 4))
-  (cond [(matrix-invertible? M)
-         (define X (matrix-solve M B))
-         (check-equal? (matrix* M X) B (format "M = ~a  B = ~a" M B))]
-        [else
-         (check-false (matrix-solve M B (λ () #f))
-                      (format "M = ~a  B = ~a" M B))]))
-
-(check-exn exn:fail? (λ () (matrix-solve (random-matrix 3 4) (random-matrix 3 1))))
-(check-exn exn:fail? (λ () (matrix-solve (random-matrix 4 3) (random-matrix 4 1))))
-
-(check-exn exn:fail:contract? (λ () (matrix-solve (random-matrix 3 4) (random-matrix 4 1))))
-(check-exn exn:fail:contract? (λ () (matrix-solve (random-matrix 4 3) (random-matrix 3 1))))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-solve a (matrix [[1]]))))
-  (check-exn exn:fail:contract? (λ () (matrix-solve (matrix [[1]]) a))))
-
-;; ===================================================================================================
-;; Inversion
-
-(for: ([_  (in-range 100)])
-  (define a (random-matrix 3 3 -3 4))
-  (cond [(matrix-invertible? a)
-         (check-equal? (matrix* a (matrix-inverse a))
-                       (identity-matrix 3)
-                       (format "~a" a))
-         (check-equal? (matrix* (matrix-inverse a) a)
-                       (identity-matrix 3)
-                       (format "~a" a))]
-        [else
-         (check-false (matrix-inverse a (λ () #f))
-                      (format "~a" a))]))
-
-(check-exn exn:fail:contract? (λ () (matrix-inverse (random-matrix 3 4))))
-(check-exn exn:fail:contract? (λ () (matrix-inverse (random-matrix 4 3))))
-
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-inverse a))))
-
-;; ===================================================================================================
-;; LU decomposition
-
-(let ([M  (matrix [[ 1  1  0  3]
-                   [ 2  1 -1  1]
-                   [ 3 -1 -1  2]
-                   [-1  2  3 -1]])])
-  (define-values (L V) (matrix-lu M))
-  (check-equal? L (matrix [[ 1  0 0 0]
-                           [ 2  1 0 0]
-                           [ 3  4 1 0]
-                           [-1 -3 0 1]]))
-  (check-equal? V (matrix [[1  1  0   3]
-                           [0 -1 -1  -5]
-                           [0  0  3  13]
-                           [0  0  0 -13]]))
-  (check-equal? (matrix* L V) M))
-
-(check-exn exn:fail? (λ () (matrix-l (matrix [[1 1 0 2]
-                                              [0 2 0 1]
-                                              [1 0 0 0]
-                                              [1 1 2 1]]))))
-
-(check-exn exn:fail:contract? (λ () (matrix-l (random-matrix 3 4))))
-(check-exn exn:fail:contract? (λ () (matrix-l (random-matrix 4 3))))
-(for: ([a  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-l a))))
-
-;; ===================================================================================================
-;; Gram-Schmidt
-
-(check-equal? (matrix-gram-schmidt (matrix [[3 2] [1 2]]))
-              (matrix [[3 -2/5] [1 6/5]]))
-
-(check-equal? (matrix-gram-schmidt (matrix [[3 2] [1 2]]) #t)
-              (matrix-scale (matrix [[3 -1] [1 3]]) (sqrt 1/10)))
-
-(check-equal? (matrix-gram-schmidt (matrix [[12 -51   4]
-                                            [ 6 167 -68]
-                                            [-4  24 -41]])
-                                   #t)
-              (matrix [[ 6/7 -69/175 -58/175]
-                       [ 3/7 158/175   6/175]
-                       [-2/7   6/35  -33/35 ]]))
-
-(check-equal? (matrix-gram-schmidt (matrix [[12 -51]
-                                            [ 6 167]
-                                            [-4  24]])
-                                   #t)
-              (matrix [[ 6/7  -69/175]
-                       [ 3/7  158/175]
-                       [-2/7    6/35 ]]))
-
-(check-equal? (matrix-gram-schmidt (col-matrix [12 6 -4]) #t)
-              (col-matrix [6/7 3/7 -2/7]))
-
-(check-equal? (matrix-gram-schmidt (col-matrix [12 6 -4]) #f)
-              (col-matrix [12 6 -4]))
-
-;; ===================================================================================================
-;; QR decomposition
-
-(check-true (matrix-orthonormal? (matrix-q (index-array #(50 1)))))
-
-(let-values ([(Q R)  (matrix-qr (matrix [[12 -51   4]
-                                         [ 6 167 -68]
-                                         [-4  24 -41]]))])
-  (check-equal? Q (matrix [[ 6/7 -69/175 -58/175]
-                           [ 3/7 158/175   6/175]
-                           [-2/7   6/35  -33/35 ]]))
-  (check-equal? R (matrix [[14  21 -14]
-                           [ 0 175 -70]
-                           [ 0   0  35]])))
-
-;; A particularly tricky test case used to demonstrate loss of orthogonality
-;; QR has to generate a better Q than Gram-Schmidt alone (which fails this test)
-(check-true (matrix-orthonormal?
-             (matrix-q (matrix [[0.70000 0.70711]
-                                [0.70001 0.70711]]))))
-
-;; Fuzz test the heck out of it: 100 matrices, random shape, random entries, sometimes rank-deficient
-(for: ([i  (in-range 100)])
-  (define m (+ 1 (random 10)))
-  (define n (+ 1 (random 10)))
-  (define M (random-matrix m n -3 4))
-  ;; Full QR, real matrix
-  (let-values ([(Q R)  (matrix-qr M #t)])
-    (check-true (matrix-orthonormal? Q)
-                (format "M = ~a  Q = ~a" M Q))
-    (check-true (<= (matrix-relative-error (matrix* Q R) M)
-                    (* 10 epsilon.0))))
-  ;; Reduced QR, real matrix
-  (let-values ([(Q R)  (matrix-qr M #f)])
-    (check-true (matrix-cols-orthogonal? Q)
-                (format "M = ~a  Q = ~a" M Q))
-    (check-true (<= (matrix-relative-error (matrix* Q R) M)
-                    (* 10 epsilon.0))))
-  (define N (random-matrix m n -3 4))
-  (define M+N (array-make-rectangular M N))
-  ;; Full QR, complex matrix
-  (let-values ([(Q R)  (matrix-qr M+N #t)])
-    (check-true (matrix-orthonormal? Q)
-                (format "M+N = ~a  Q = ~a" M+N Q))
-    (check-true (<= (matrix-relative-error (matrix* Q R) M+N)
-                    (* 10 epsilon.0))))
-  ;; Reduced QR, complex matrix
-  (let-values ([(Q R)  (matrix-qr M+N #f)])
-    (check-true (matrix-cols-orthogonal? Q)
-                (format "M+N = ~a  Q = ~a" M+N Q))
-    (check-true (<= (matrix-relative-error (matrix* Q R) M+N)
-                    (* 10 epsilon.0)))))
-
-(for: ([M  (in-list nonmatrices)])
-  (check-exn exn:fail:contract? (λ () (matrix-q M))))
-
-#|
-;; ===================================================================================================
-;; Tests not yet converted to rackunit
-
-(begin
-  
-  (begin
-    "matrix-operations.rkt"
-    (list 'column-project
-          (equal? (column-project #(1 2 3) #(4 5 6)) (col-matrix [128/77 160/77 192/77]))
-          (equal? (column-project (col-matrix [1 2 3]) (col-matrix [2 4 3]))
-                  (matrix-scale (col-matrix [2 4 3]) 19/29)))
-    (list 'projection-on-orthogonal-basis
-          (equal? (projection-on-orthogonal-basis #(3 -2 2) (list #(-1 0 2) #( 2 5 1)))
-                  (col-matrix [-1/3 -1/3 1/3]))
-          (equal? (projection-on-orthogonal-basis 
-                   (col-matrix [3 -2 2]) (list #(-1 0 2) (col-matrix [2 5 1])))
-                  (col-matrix [-1/3 -1/3 1/3])))
-    (list 'projection-on-orthonormal-basis
-          (equal? (projection-on-orthonormal-basis 
-                   #(1 2 3 4) 
-                   (list (matrix-scale (col-matrix [ 1  1  1  1]) 1/2)
-                         (matrix-scale (col-matrix [-1  1 -1  1]) 1/2)
-                         (matrix-scale (col-matrix [ 1 -1 -1  1]) 1/2)))
-                  (col-matrix [2 3 2 3])))
-    (list 'projection-on-subspace
-          (equal? (projection-on-subspace #(1 2 3) '(#(2 4 3)))
-                  (matrix-scale (col-matrix [2 4 3]) 19/29)))
-  #;
-  (begin
-    "matrix-2d.rkt"
-    (let ()
-      (define  e1  (matrix-transpose (vector->matrix #(#( 1  0)))))
-      (define  e2  (matrix-transpose (vector->matrix #(#( 0  1)))))
-      (define -e1  (matrix-transpose (vector->matrix #(#(-1  0)))))
-      (define -e2  (matrix-transpose (vector->matrix #(#( 0 -1)))))
-      (define   O  (matrix-transpose (vector->matrix #(#( 0  0)))))
-      (define 2*e1 (matrix-scale e1 2))
-      (define 4*e1 (matrix-scale e1 4))
-      (define 3*e2 (matrix-scale e2 3))
-      (define 4*e2 (matrix-scale e2 4))
-      (begin
-        (list 'matrix-2d-rotation
-              (<= (matrix-norm (matrix- (matrix* (matrix-2d-rotation (/ pi 2)) e1) e2 )) epsilon.0) 
-              (<= (matrix-norm (matrix- (matrix* (matrix-2d-rotation (/ pi 2)) e2) -e1)) epsilon.0))
-        (list
-         'matrix-2d-scaling
-         (equal? (matrix* (matrix-2d-scaling 2 3) (matrix+ e1 e2)) (matrix+ 2*e1 3*e2)))
-        (list
-         'matrix-2d-shear-x
-         (equal? (matrix* (matrix-2d-shear-x 3) (matrix+ e1 e2))   (matrix+ 4*e1   e2)))
-        (list
-         'matrix-2d-shear-y
-         (equal? (matrix* (matrix-2d-shear-y 3) (matrix+ e1 e2))   (matrix+   e1 4*e2)))
-        (list
-         'matrix-2d-reflection
-         (equal? (matrix* (matrix-2d-reflection 0 1) e1)           -e1)
-         (equal? (matrix* (matrix-2d-reflection 0 1) e2)            e2)
-         (equal? (matrix* (matrix-2d-reflection 1 0) e1)            e1)
-         (equal? (matrix* (matrix-2d-reflection 1 0) e2)           -e2))
-        (list
-         'matrix-2d-orthogonal-projection
-         (equal? (matrix* (matrix-2d-orthogonal-projection 1 0) e1) e1)
-         (equal? (matrix* (matrix-2d-orthogonal-projection 1 0) e2) O)
-         (equal? (matrix* (matrix-2d-orthogonal-projection 0 1) e1) O)
-         (equal? (matrix* (matrix-2d-orthogonal-projection 0 1) e2) e2))))))
-|#
diff --git a/pkgs/math-pkgs/math-test/math/tests/matrix-untyped-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/matrix-untyped-tests.rkt
deleted file mode 100644
index 2d0fcd86fd..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/matrix-untyped-tests.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang racket
-
-(require (for-syntax racket/match)
-         rackunit
-         math/matrix)
-
-;; ===================================================================================================
-;; Contract tests
-
-(begin-for-syntax
-  (define exceptions (list 'matrix 'col-matrix 'row-matrix
-                           'matrix-determinant/row-reduction))
-  
-  (define (looks-like-value? sym)
-    (define str (symbol->string sym))
-    (and (not (char-upper-case? (string-ref str 0)))
-         (not (regexp-match #rx"for/" str))
-         (not (regexp-match #rx"for\\*/" str))
-         (not (member sym exceptions))))
-  
-  (define matrix-exports
-    (let ()
-      (match-define (list (list #f _ ...)
-                          (list 1 _ ...)
-                          (list 0 matrix-exports ...))
-        (syntax-local-module-exports #'math/matrix))
-      (filter looks-like-value? matrix-exports)))
-  )
-
-(define-syntax (all-exports stx)
-  (with-syntax ([(matrix-exports ...)  matrix-exports])
-    (syntax/loc stx
-      (begin (void matrix-exports) ...))))
-
-(all-exports)
-
-;; ===================================================================================================
-;; Comprehensions
-
-(check-equal?
- (for/matrix 2 2 ([i  (in-range 4)]) i)
- (matrix [[0 1] [2 3]]))
-
-(check-equal?
- (for*/matrix 2 2 ([i  (in-range 2)] [j  (in-range 2)]) (+ i j))
- (matrix [[0 1] [1 2]]))
-
-(check-exn exn:fail:contract? (λ () (for/matrix 2 0 () 0)))
-(check-exn exn:fail:contract? (λ () (for/matrix 0 2 () 0)))
-(check-exn exn:fail:contract? (λ () (for*/matrix 2 0 () 0)))
-(check-exn exn:fail:contract? (λ () (for*/matrix 0 2 () 0)))
-
-;; ===================================================================================================
-;; Arithmetic and mapping macros
-
-(check-equal? (matrix* (identity-matrix 4) (identity-matrix 4))
-              (identity-matrix 4))
-
-(check-equal? (matrix+ (identity-matrix 4) (identity-matrix 4))
-              (matrix-scale (identity-matrix 4) 2))
-
-(check-equal? (matrix- (identity-matrix 4) (identity-matrix 4))
-              (make-matrix 4 4 0))
-
-(check-equal? (matrix-map (λ (x) (* x -1)) (identity-matrix 4))
-              (matrix-scale (identity-matrix 4) -1))
diff --git a/pkgs/math-pkgs/math-test/math/tests/number-theory-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/number-theory-tests.rkt
deleted file mode 100644
index 6f04314428..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/number-theory-tests.rkt
+++ /dev/null
@@ -1,271 +0,0 @@
-#lang typed/racket
-(require math/number-theory)
-(require typed/rackunit)
-
-; "quadratic.rkt"
-(check-equal? (quadratic-solutions 1 0 -4) '(-2 2))
-(check-equal? (quadratic-solutions 1 0 +4) '())
-(check-equal? (quadratic-solutions 1 0 0)  '(0))
-(check-equal? (quadratic-integer-solutions 1 0 -4) '(-2 2))
-(check-equal? (quadratic-integer-solutions 1 0 +4) '())
-(check-equal? (quadratic-integer-solutions 1 0 0)  '(0))
-(check-equal? (quadratic-natural-solutions 1 0 -4) '(2))
-(check-equal? (quadratic-natural-solutions 1 0 +4) '())
-(check-equal? (quadratic-natural-solutions 1 0 0)  '(0))
-
-; "eulerian-number.rkt"
-(check-equal? (map (λ: ([x : Natural]) (eulerian-number 5 x)) '(0 1 2 3 4))
-              '(1 26 66 26 1))
-
-; "primitive-roots.rkt"
-(check-equal? (unit-group 20) '(1 3 7 9 11 13 17 19))  ; 19 !!!!
-(check-equal? (unit-group-order 19 20) 2)
-(check-equal? (unit-group-order  3 20) 4)
-(check-equal? (unit-group-orders 20) '(1 4 4 2 2 4 4 2)) ; (unit-group-order 3 20)=4, ...
-(check-true   (andmap exists-primitive-root? '(1 2 4 3 9 6 18)))
-(check-false  (ormap  exists-primitive-root? '(8 16 12)))
-(check-equal? (primitive-root 20) #f)
-(check-equal? (primitive-root 10) 7) ; (length (unit-group 10)) = (unit-group-order 7 10)
-(check-true   (primitive-root? 7 10))
-(check-false  (primitive-root? 7 20))
-(check-equal? (primitive-roots 10) '(3 7))
-(: find-and-check-root : Positive-Integer -> Boolean)
-(define (find-and-check-root n)
-  (define r (primitive-root n))
-  (cond [(not r) #t]
-        [else (= (length (unit-group n)) (unit-group-order r n))]))
-(check-true   (andmap find-and-check-root '(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 78125)))
-
-;"polygonal.rkt"
-(check-equal? (map triangle-number    '(0 1 2 3 4 5)) '(0 1 3  6 10 15))
-(check-equal? (map pentagonal-number  '(0 1 2 3 4 5)) '(0 1 5 12 22 35))
-(check-equal? (map hexagonal-number   '(0 1 2 3 4 5)) '(0 1 6 15 28 45))
-(check-equal? (map heptagonal-number  '(0 1 2 3 4 5)) '(0 1 7 18 34 55))
-(check-equal? (map octagonal-number   '(0 1 2 3 4 5)) '(0 1 8 21 40 65))
-(check-true   (andmap triangle-number?    '(0 1 3  6 10 15)))
-(check-true   (andmap square-number?      '(0 1 4  9 16 25)))
-(check-true   (andmap pentagonal-number?  '(0 1 5 12 22 35)))
-(check-true   (andmap hexagonal-number?   '(0 1 6 15 28 45)))
-(check-true   (andmap heptagonal-number?  '(0 1 7 18 34 55)))
-(check-true   (andmap octagonal-number?   '(0 1 8 21 40 65)))
-
-; "farey.rkt"
-(check-equal? (farey-sequence 5) '(0 1/5 1/4 1/3 2/5 1/2 3/5 2/3 3/4 4/5 1))
-(check-equal? (mediant 1/1 1/2) 2/3)
-
-; "fibonacci.rkt"
-(check-equal? (build-list 8 fibonacci) '(0 1 1 2 3 5 8 13))
-(check-equal? (build-list 8 (make-fibonacci 2 1)) '(2 1 3 4 7 11 18 29))
-(for*: ([a  (in-range -5 6)]
-        [b  (in-range -5 6)]
-        [mod  (in-range 1 8)])
-  (check-equal? (build-list 20 (λ: ([n : Integer]) ((make-modular-fibonacci a b) n mod)))
-                (build-list 20 (λ: ([n : Integer]) (modulo ((make-fibonacci a b) n) mod)))))
-
-; "partitions.rkt"
-(check-equal? (map partitions '(0 1 2 3 4 5 6 7 8 9 10))
-              '(1 1 2 3 5 7 11 15 22 30 42))
-
-
-; "bernoulli.rkt"
-(check-equal? (map bernoulli-number '(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18))
-              '(1 -1/2 1/6 0 -1/30 0 1/42 0 -1/30 0 5/66 0 -691/2730 0 7/6 0 -3617/510 0 43867/798))
-
-; "tangent-number.rkt"
-(require typed/rackunit)
-(check-equal? (map tangent-number '(1 3 5 7 9 11 13)) '(1 2 16 272 7936 353792 22368256))
-(check-equal? (map tangent-number '(0 2 4 6 8 10)) '(0 0 0 0 0 0))
-
-; "factorial.rkt"
-(define fact-table-size 171)
-(define simple-cutoff 244)
-
-(: test-factorial : Integer -> Integer)
-(define (test-factorial n)
-  (if (= n 0) 1 (* n (test-factorial (- n 1)))))
-
-(check-equal? (map factorial (list 0 1 2 3 4 5)) '(1 1 2 6 24 120))
-(check-equal? (factorial (+ fact-table-size 1)) (test-factorial (+ fact-table-size 1)))
-(check-equal? (factorial (+ simple-cutoff 1)) (test-factorial (+ simple-cutoff 1)))
-
-(check-equal? (binomial 10 3) 120)
-(check-equal? (binomial 10 11) 0)
-(check-equal? (binomial 10 0) 1)
-(check-equal? (binomial 10 10) 1)
-(check-equal? (binomial 10 1) 10)
-(check-equal? (binomial 10 9) 10)
-
-(check-equal? (permutations 10 3) 720)
-(check-equal? (permutations 10 0) 1)
-(check-equal? (permutations 10 10) 3628800)
-(check-equal? (permutations 0 0) 1)
-
-(check-equal? (multinomial 20 '(3 4 5 8)) 3491888400)
-(check-equal? (multinomial 0 '()) 1)
-(check-equal? (multinomial 4 '(1 1)) 0)
-
-; "binomial.rkt"
-(check-equal? (binomial 10 3) 120)
-(check-equal? (binomial 10 11) 0)
-(check-equal? (binomial 10 0) 1)
-(check-equal? (binomial 10 10) 1)
-(check-equal? (binomial 10 1) 10)
-(check-equal? (binomial 10 9) 10)
-
-
-; "number-theory.rkt"
-(check-true  (divides? 2 12))
-(check-false (divides? 2 13))
-(check-true  (divides? 2 0))
-; (check-exn   (divides? 0 2)) ?
-
-(check-equal? (max-dividing-power 3 27) 3)
-(check-equal? (max-dividing-power 3 (* 27 2)) 3)
-
-(: list-dot : (Listof Integer) (Listof Integer) -> Integer)
-(define (list-dot as bs)
-  (if (empty? as) 
-      0
-      (+ (* (car as) (car bs)) (list-dot (cdr as) (cdr bs)))))
-
-(: member? : (All (a) (a (Listof a) -> Boolean)))
-(define (member? x xs)
-  (not (not (member x xs))))
-
-(check-equal? ; 2*12-1*20 = 4 = gcd(12,20)
- (list-dot '(12 20) (bezout 12 20)) (gcd 12 20))
-(check-equal? (list-dot '(12 20) (bezout 12 20)) (gcd 12 20))
-(check-equal? (list-dot '(20 16) (bezout 20 16)) (gcd 20 16))
-(check-equal? (list-dot '(12 20 16) (bezout 12 20 16)) (gcd 12 20 16))
-
-(check-true (coprime? (* 3 7) (* 5 19)))
-(check-false (coprime? (* 3 7 5) (* 5 19 2)))
-
-(check-true  (pairwise-coprime? 10 7 33 13))
-(check-false (pairwise-coprime? 10 7 33 14))
-(check-false (pairwise-coprime? 6 10 15))
-(check-true  (coprime? 6 10 15))
-(: check-inverse : Natural -> Boolean)
-(define (check-inverse n)
-  (define m (and (coprime? n 20) (modular-inverse n 20)))
-  (cond [m  (= (remainder (* n m) 20) 1)]
-        [else  #t]))
-(check-true (andmap check-inverse (build-list 20 (λ: ([x : Natural]) (+ x 1)))))
-
-(check-equal? (solve-chinese '(2 3 2) '(3 5 7)) 23)
-
-
-(check-equal? (divisors 12)  '(1 2 3 4 6 12))
-(check-equal? (divisors -12) '(1 2 3 4 6 12))
-(check-equal? (divisors 0)   '())
-
-(check-equal? (next-primes -5 10) '(-3 -2 2 3 5 7 11 13 17 19))
-(check-equal? (prev-primes  5 10) '(3 2 -2 -3 -5 -7 -11 -13 -17 -19))
-(check-equal? (next-prime 0) 2)
-(check-equal? (next-prime 1) 2)
-(check-equal? (prev-prime 10) 7)
-(check-equal? (prev-prime 8) 7)
-(check-equal? (prev-prime 17) 13)
-(check-equal? (nth-prime 0) 2)
-(check-equal? (nth-prime 1) 3)
-(check-equal? (nth-prime 2) 5)
-                              
-
-(let ()
-  (: prime-sum : Integer Integer -> Integer)
-  (define (prime-sum start delta)
-    (define: s : Integer 0)
-    (for: ([i (in-range start (+ start delta 1))])
-      (set! s (+ s (next-prime i))))
-    s)
-  (check-equal? (prime-sum (expt 10 6) 1000) 1001511919)    ; Sum[NextPrime[n], {n, 10^6, 10^6 + 1000}]
-  (check-equal? (prime-sum (expt 10 7) 1000) 10010514423)   ; Sum[NextPrime[n], {n, 10^7, 10^7 + 1000}]
-  (check-equal? (prime-sum (expt 10 8) 1000) 100100519271)  ; Sum[NextPrime[n], {n, 10^8, 10^8 + 1000}]
-  (check-equal? (prime-sum (expt 10 9) 1000) 1001000516807) ; Sum[NextPrime[n], {n, 10^9, 10^9 + 1000}]
-  )
-
-#;(check-equal? 7472966967499
-                (let ()
-                  ; sum of the first million primes
-                  (define: s : Integer 0)
-                  (define: p : Integer 1)
-                  (for: ([i (in-range 0 (expt 10 6))])
-                    (when (zero? (remainder i 10000))
-                      (newline)
-                      (display i))
-                    (when (zero? (remainder i 1000))
-                      (display "."))
-                    (set! p (next-prime p))
-                    (set! s (+ s p)))
-                  s))
-
-(check-equal? (next-prime (expt 10 7)) 10000019)
-(check-equal? (next-prime (expt 10 8)) 100000007)
-(check-equal? (factorize (* 10000019 100000007)) '((10000019 1) (100000007 1)))
-(: check-factorize : Natural -> Boolean)
-(define (check-factorize n)
-  (= (defactorize (factorize n)) n))
-(check-true (for/and: : Boolean ([n : Natural (in-range (expt 10 9) (+ (expt 10 9) 10000))])
-              (check-factorize n)))
-
-(: check-as-power : Positive-Integer Natural Natural -> Boolean) 
-(define (check-as-power a r n)
-  (define-values (b e) (as-power a))
-  (and (= b r) (= e n)))
-(check-true (check-as-power 27 3 3))
-(check-true (check-as-power 28 28 1))
-(check-true (check-as-power (* 5 5 7 7 7) (* 5 5 7 7 7) 1))
-(check-true (check-as-power (* 5 5 7 7 7 7) 245 2))
-
-(check-true (prime-power? (expt 3 7)))
-(check-false (prime-power? (expt 12 7)))
-
-(check-false (perfect-power? 3))
-(check-true (perfect-power? 9))
-(check-true (perfect-power? (expt 12 7)))
-(check-false (perfect-power? (- (expt 12 7) 1)))
-
-
-(check-equal? (moebius-mu (* 3 5 7 11)) 1)
-(check-equal? (moebius-mu (* 3 5 7))    -1)
-(check-equal? (moebius-mu (* 3 5 5 7))  0)
- 
-(check-equal? (divisor-sum 1000)   2340)
-(check-equal? (divisor-sum 1000 0) 16)
-(check-equal? (divisor-sum 1000 1) 2340)
-(check-equal? (divisor-sum 1000 2) 1383460)
-
-(: check-integer-root : Natural Natural -> Boolean)
-(define (check-integer-root a n)
-  (define r (integer-root a n))
-  (unless (and (<= (expt r n) a) (> (expt (+ r 1) n) a))
-    (displayln (list 'check-integer-root 'a a 'n n)))
-  (and (<= (expt r n) a) (> (expt (+ r 1) n) a)))
-  
-(for:([a : Natural (in-range (expt 10 9) (+ (expt 10 9) 10000))]
-      [n : Natural (in-range 2 5)])
-  (check-true (check-integer-root a n)))
-
-; "quadratic-residues.rkt"
-(check-equal? (quadratic-character  2 5) -1)
-(check-equal? (quadratic-character  3 5) -1)
-(check-equal? (quadratic-character  5 5)  0)
-(check-equal? (quadratic-character  7 5) -1)
-(check-equal? (quadratic-character 11 5)  1)
-
-(check-true  (quadratic-residue? 1 17))
-(check-true  (quadratic-residue? 2 17))
-(check-true  (quadratic-residue? 4 17))
-(check-true  (quadratic-residue? 8 17))
-(check-true  (quadratic-residue? 9 17))
-(check-true  (quadratic-residue? 13 17))
-(check-true  (quadratic-residue? 15 17))
-(check-true  (quadratic-residue? 16 17))
-(check-false (quadratic-residue?  3 17))
-(check-false (quadratic-residue?  5 17))
-(check-false (quadratic-residue?  6 17))
-(check-false (quadratic-residue?  7 17))
-(check-false (quadratic-residue? 10 17))
-(check-false (quadratic-residue? 11 17))
-(check-false (quadratic-residue? 12 17))
-(check-false (quadratic-residue? 14 17))
diff --git a/pkgs/math-pkgs/math-test/math/tests/statistics-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/statistics-tests.rkt
deleted file mode 100644
index 0454031199..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/statistics-tests.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang typed/racket
-
-(require math/statistics
-         typed/rackunit)
-
-(check-equal?
- (bin-samples '(5) <= '())
- empty)
-
-(check-equal?
- (bin-samples '(5) <= '(4))
- (list (sample-bin 4 5 '(4) #f)))
-
-(check-equal?
- (bin-samples '(5) <= '(5))
- (list (sample-bin 5 5 '(5) #f)))
-
-(check-equal?
- (bin-samples '(5) <= '(6))
- (list (sample-bin 5 6 '(6) #f)))
-
-(check-equal?
- (bin-samples '(5) <= '(4 5))
- (list (sample-bin 4 5 '(4 5) #f)))
-
-(check-equal?
- (bin-samples '(5) <= '(5 6))
- (list (sample-bin 5 5 '(5) #f)
-       (sample-bin 5 6 '(6) #f)))
-
-(check-equal?
- (bin-samples '(5) <= '(4 6))
- (list (sample-bin 4 5 '(4) #f)
-       (sample-bin 5 6 '(6) #f)))
-
-(check-equal?
- (bin-samples '(5) <= '(4 5 6))
- (list (sample-bin 4 5 '(4 5) #f)
-       (sample-bin 5 6 '(6) #f)))
-
-(check-equal?
- (bin-samples '(4 8) <= '())
- (list (sample-bin 4 8 '() #f)))
-
-(check-equal?
- (bin-samples '(4 8) <= '(2))
- (list (sample-bin 2 4 '(2) #f)
-       (sample-bin 4 8 '() #f)))
-
-(check-equal?
- (bin-samples '(4 8) <= '(4))
- (list (sample-bin 4 4 '(4) #f)
-       (sample-bin 4 8 '() #f)))
-
-(check-equal?
- (bin-samples '(4 8) <= '(6))
- (list (sample-bin 4 8 '(6) #f)))
-
-(check-equal?
- (bin-samples '(4 8) <= '(8))
- (list (sample-bin 4 8 '(8) #f)))
-
-(check-equal?
- (bin-samples '(4 8) <= '(10))
- (list (sample-bin 4 8 '() #f)
-       (sample-bin 8 10 '(10) #f)))
-
-(check-equal?
- (bin-samples '(4 8) <= '(4 8))
- (list (sample-bin 4 4 '(4) #f)
-       (sample-bin 4 8 '(8) #f)))
-
-(check-equal?
- (bin-samples '(4 8) <= '(4 10))
- (list (sample-bin 4 4 '(4) #f)
-       (sample-bin 4 8 '() #f)
-       (sample-bin 8 10 '(10) #f)))
-
-(check-equal?
- (bin-samples '(4 8) <= '(8 10))
- (list (sample-bin 4 8 '(8) #f)
-       (sample-bin 8 10 '(10) #f)))
-
-(check-equal?
- (bin-samples '(4 8) <= '(4 8 10))
- (list (sample-bin 4 4 '(4) #f)
-       (sample-bin 4 8 '(8) #f)
-       (sample-bin 8 10 '(10) #f)))
-
-(check-equal?
- (bin-samples '(3 8) <= '(1 1 2 2 2 3 4 5 5 5 5 6 7 8 9 9))
- (list (sample-bin 1 3 '(1 1 2 2 2 3) #f)
-       (sample-bin 3 8 '(4 5 5 5 5 6 7 8) #f)
-       (sample-bin 8 9 '(9 9) #f)))
-
-(check-equal?
- (bin-samples '(3 8) <=
-              '(1 1 2 2 2 3 4 5 5 5 5 6 7 8 9 9)
-              '(1 1.1 2 2.1 2.2 3 4 5 5.1 5.2 5.3 6 7 8 9 9.1))
- (list (sample-bin 1 3 '(1 1 2 2 2 3) '(1 1.1 2 2.1 2.2 3))
-       (sample-bin 3 8 '(4 5 5 5 5 6 7 8) '(4 5 5.1 5.2 5.3 6 7 8))
-       (sample-bin 8 9 '(9 9) '(9 9.1))))
-
-(check-equal?
- (bin-samples/key '(2 4) <= (inst car Real Symbol)
-                  '((1 . a) (2 . b) (3 . c) (4 . d) (5 . e)))
- (list (sample-bin 1 2 '((1 . a) (2 . b)) #f)
-       (sample-bin 2 4 '((3 . c) (4 . d)) #f)
-       (sample-bin 4 5 '((5 . e)) #f)))
-
-(for: ([p  '(0 1/6 2/6 3/6 4/6 5/6 6/6)])
-  (check-equal? (quantile p < '(1 2 3) '(1 1 1))
-                (quantile p < '(1 2 3))))
-
-(for: ([p  '(0 1/8 2/8 3/8 4/8 5/8 6/8 7/8 8/8)])
-  (check-equal? (quantile p < '(1 2 3 4) '(1 1 1 1))
-                (quantile p < '(1 2 3 4))))
diff --git a/pkgs/math-pkgs/math-test/math/tests/stress/beta-test.rkt b/pkgs/math-pkgs/math-test/math/tests/stress/beta-test.rkt
deleted file mode 100644
index 1ded34aa6c..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/stress/beta-test.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket
-
-;; This is a stress test for Racket, not for math.
-;; (Producing a smaller test for Racket is difficult.)
-
-(require math/special-functions
-         math/statistics)
-
-(define (f x)
-  (flbeta-inc 2.0 3.0 x #f #t))
-
-(define-values (l r)
-  (count-samples
-   (for/list ([_  (in-range 100000)])
-     (f #i40/499))))
-
-(unless (= 1 (length l))
-  (error "failed: ~s ~s\n" l r))
diff --git a/pkgs/math-pkgs/math-test/math/tests/stress/mpfr-ffi-call-vs-racket.rkt b/pkgs/math-pkgs/math-test/math/tests/stress/mpfr-ffi-call-vs-racket.rkt
deleted file mode 100644
index 0e9c704ccd..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/stress/mpfr-ffi-call-vs-racket.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-
-(require ffi/unsafe
-         tests/stress
-         math/private/bigfloat/mpfr)
-
-(define mpfr-get-exp (get-mpfr-fun 'mpfr_get_exp (_fun _mpfr-pointer -> _exp_t)))
-(define mpfr-get-prec (get-mpfr-fun 'mpfr_get_prec (_fun _mpfr-pointer -> _prec_t)))
-(define mpfr-get-signbit (get-mpfr-fun 'mpfr_signbit (_fun _mpfr-pointer -> _int)))
-
-(define (mpfr-signbit x)
-  (if ((mpfr-sign x) . < . 0) 1 0))
-
-(define n 1000000)
-
-(let ([x  (bf 2)])
-  (stress
-   20
-   ["mpfr-get-prec (FFI accessor)"
-    (for ([_  (in-range n)])
-      (mpfr-get-prec x))]
-   ["mpfr-prec (Racket accessor)"
-    (for ([_  (in-range n)])
-      (mpfr-prec x))]))
-
-(let ([x  (bf 2)])
-  (stress
-   20
-   ["mpfr-get-exp (FFI accessor)"
-    (for ([_  (in-range n)])
-      (mpfr-get-exp x))]
-   ["mpfr-exp (Racket accessor)"
-    (for ([_  (in-range n)])
-      (mpfr-exp x))]))
-
-(let ([x  (bf 2)])
-  (stress
-   20
-   ["mpfr-get-signbit (FFI accessor)"
-    (for ([_  (in-range n)])
-      (mpfr-get-signbit x))]
-   ["mpfr-signbit (Racket accessor)"
-    (for ([_  (in-range n)])
-      (mpfr-signbit x))]))
diff --git a/pkgs/math-pkgs/math-test/math/tests/strictness-memory-leak-test.rkt b/pkgs/math-pkgs/math-test/math/tests/strictness-memory-leak-test.rkt
deleted file mode 100644
index 7130861e21..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/strictness-memory-leak-test.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket
-
-(require math/array
-         rackunit)
-
-;; Make a procedure that returns a random value to keep the optimizer from converting it to a
-;; top-level, non-closure; if that happens, the module keeps a reference to it, which makes this
-;; test always fail
-(define bx (make-weak-box (let ([v  (random)]) (λ (js) v))))
-
-(define arr (build-array #() (weak-box-value bx)))
-
-;; Making `arr' strict should release the only remaining reference to the contents of `bx'
-(array-strict! arr)
-(collect-garbage)
-(check-false (weak-box-value bx))
diff --git a/pkgs/math-pkgs/math-test/math/tests/test-utils.rkt b/pkgs/math-pkgs/math-test/math/tests/test-utils.rkt
deleted file mode 100644
index 3e51d4013e..0000000000
--- a/pkgs/math-pkgs/math-test/math/tests/test-utils.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/racket
-
-(require (except-in typed/rackunit check-equal?))
-
-(provide (all-from-out typed/rackunit)
-         check-equal?)
-
-;; This gets around the fact that typed/rackunit can no longer test higher-order values for equality,
-;; since TR has firmed up its rules on passing `Any' types in and out of untyped code
-(define-syntax-rule (check-equal? a b . message)
-  (check-true (equal? a b) . message))
diff --git a/pkgs/math-pkgs/math/info.rkt b/pkgs/math-pkgs/math/info.rkt
deleted file mode 100644
index 7c570b6327..0000000000
--- a/pkgs/math-pkgs/math/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("math-lib" "math-doc"))
-(define implies '("math-lib" "math-doc"))
-
-(define pkg-desc "Functions and data structures useful for working with numbers and collections of numbers, along with docs and tests")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/mysterx/LICENSE.txt b/pkgs/mysterx/LICENSE.txt
deleted file mode 100644
index bc8f1e76f7..0000000000
--- a/pkgs/mysterx/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-mysterx
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/mysterx/info.rkt b/pkgs/mysterx/info.rkt
deleted file mode 100644
index d27944a939..0000000000
--- a/pkgs/mysterx/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection "mysterx")
-
-(define scribblings '(("scribblings/mysterx.scrbl" (multi-page) (legacy))))
-(define deps '("scheme-lib"
-               "base"))
-(define build-deps '("racket-doc"
-                     "at-exp-lib"
-                     "scribble-lib"))
-
-(define pkg-desc "Legacy library for working with COM on Windows")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/mysterx/main.rkt b/pkgs/mysterx/main.rkt
deleted file mode 100644
index 23186775b4..0000000000
--- a/pkgs/mysterx/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scheme/base
-
-(require "mysterx.rkt")
-(provide (all-from-out "mysterx.rkt"))
diff --git a/pkgs/mysterx/mysterx.rkt b/pkgs/mysterx/mysterx.rkt
deleted file mode 100644
index 03a4b0c920..0000000000
--- a/pkgs/mysterx/mysterx.rkt
+++ /dev/null
@@ -1,160 +0,0 @@
-#lang racket/base
-(require ffi/com
-         ffi/com-registry)
-
-;; Methods and Properties:
-(provide com-all-coclasses
-         com-all-controls
-
-         cocreate-instance-from-coclass
-         cci/coclass
-
-         cocreate-instance-from-progid
-         cci/progid
-
-	 com-get-active-object-from-coclass
-         gao/coclass
-         
-         coclass
-         progid
-         
-         set-coclass!
-         set-coclass-from-progid!
-
-         com-methods
-         (rename-out [mx:com-method-type com-method-type])
-         com-invoke
-
-         com-get-properties
-         (rename-out [mx:com-get-property-type com-get-property-type])
-         com-get-property
-
-         com-set-properties
-         (rename-out [mx:com-set-property-type com-set-property-type])
-         com-set-property!
-
-         com-help
-
-         mx-version)
-
-;; COM types:
-(provide com-object?
-         com-object-type
-         com-is-a?
-         com-object-eq?
-         
-         com-currency?
-         com-currency->number
-         number->com-currency
-
-         com-date?
-         com-date->date
-         date->com-date
-
-         com-scode?
-         com-scode->number
-         number->com-scode
-
-         com-iunknown?
-         
-         com-omit)
-
-;; Events:
-(provide com-events
-         (rename-out [mx:com-event-type com-event-type])
-         com-register-event-handler
-         com-unregister-event-handler)
-
-(define (coclass->clsid* who coclass)
-  (or (coclass->clsid coclass)
-      (error who "coclass not found: ~e" coclass)))
-
-(define (cocreate-instance-from-coclass coclass [where 'local])
-  (com-create-instance (coclass->clsid* 'cocreate-instance-from-coclass coclass) where))
-
-(define (cci/coclass coclass [where 'local])
-  (cocreate-instance-from-coclass coclass where))
-         
-(define (cocreate-instance-from-progid progid [where 'local])
-  (com-create-instance progid where))
-
-(define (cci/progid progid [where 'local])
-  (cocreate-instance-from-progid progid where))
-
-(define (com-get-active-object-from-coclass coclass)
-  (com-get-active-object (coclass->clsid* 'com-get-active-object-from-coclass coclass)))
-(define (gao/coclass coclass)
-  (com-get-active-object-from-coclass coclass))
-
-(define (coclass obj)
-  (clsid->coclass (com-object-clsid obj)))
-
-(define (progid obj)
-  (clsid->progid (com-object-clsid obj)))
-
-(define (set-coclass! obj coclass)
-  (com-object-set-clsid! obj (coclass->clsid* 'set-coclass! coclass)))
-
-(define (set-coclass-from-progid! obj progid)
-  (com-object-set-clsid! obj (progid->clsid progid)))
-
-(define (com-help obj [topic ""])
-  (void))
-
-
-(define (com-is-a? obj type)
-  (com-type=? (com-object-type obj) type))
-
-(define (com-currency? obj)
-  (and (number? obj)
-       (exact? obj)
-       (integer? (* 10000 obj))))
-
-(define (com-currency->number c) c)
-
-(define (number->com-currency n)
-  (define nn (if (real? n)
-                 (* (round (* 10000 (inexact->exact n))) 1/10000)
-                 n))
-  (if (com-currency? nn)
-      nn
-      (error 'number->com-currency "cannot convert: ~e" nn)))
-
-(define (com-date? d) (date? d))
-(define (com-date->date d) d)
-(define (date->com-date d) d)
-
-(define (com-scode? v) (exact-integer? v))
-(define (com-scode->number sc) sc)
-(define (number->com-scode n) n)
-
-(define (com-register-event-handler obj ev f)
-  (define exec (com-make-event-executor))
-  (thread (lambda () ((sync exec))))
-  (com-register-event-callback obj
-                               ev
-                               f
-                               exec))
-
-(define (com-unregister-event-handler obj ev)
-  (com-unregister-event-callback obj ev))
-
-(define (mx-version) (version))
-
-(define (reorder t)
-  (if (and (pair? t)
-           (eq? (car t) '->))
-      (append (cadr t) (list '-> (caddr t)))
-      t))
-
-(define (mx:com-method-type obj name)
-  (reorder (com-method-type obj name)))
-
-(define (mx:com-get-property-type obj name)
-  (reorder (com-get-property-type obj name)))
-
-(define (mx:com-set-property-type obj name)
-  (reorder (com-set-property-type obj name)))
-
-(define (mx:com-event-type obj name)
-  (reorder (com-event-type obj name)))
diff --git a/pkgs/mysterx/scribblings/com-events.scrbl b/pkgs/mysterx/scribblings/com-events.scrbl
deleted file mode 100644
index ca2bf24752..0000000000
--- a/pkgs/mysterx/scribblings/com-events.scrbl
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "com-events"]{COM Events}
-
-  COM events are generated by COM objects.  Unlike
-  HTML events, there is no fixed set of COM
-  events, though there are ``stock'' events that
-  many COM objects support.  MysterX allows the
-  programmer to write handlers for both stock and
-  custom events.
-
-@defproc[(com-events [obj/type (or/c com-object? com-type?)])
-         (listof string?)]{
-
-  Returns a list of strings naming the events supported by
-  @racket[obj/type].
-
-  If calling this procedure results in an error indicating that the
-  COM object's coclass is ambiguous, try using either
-  @racket[set-coclass!] or @racket[set-coclass-from-progid!], then
-  retry @racket[com-events].}
-
-
-@defproc[(com-event-type [obj/type (or/c com-object? com-type?)]
-                         [ev string?])
-         (listof string?)]{
-
-  Returns the type of an event handler for the
-  event @racket[ev] generated by the particular
-  COM object/type @racket[obj/type].  The return type of
-  all COM event handlers is void.
-
-  See also @racket[com-events] for dealing with a COM
-  object that has an ambiguous class.}
-
-@defproc[(com-register-event-handler 
-          [obj com-object?]
-          [ev string?]
-          [f (any/c . -> . any)])
-         void?]{
-
-  Registers @racket[f] as event handler for the event @racket[ev] when
-  generated by @racket[obj].  The type of argument supplied to
-  @racket[f] depends on the event; the result of @racket[f] is always
-  discarded.
-
-  See also @racket[com-events] for dealing with a COM
-  object that has an ambiguous class.}
-
-@defproc[(com-unregister-event-handler [obj com-object?] 
-                                       [ev string?])
-         void?]{
-
-  Unregisters any event handler for the event @racket[ev] that is
-  generated by the COM object @racket[obj].}
diff --git a/pkgs/mysterx/scribblings/com-types.scrbl b/pkgs/mysterx/scribblings/com-types.scrbl
deleted file mode 100644
index 09e03e0797..0000000000
--- a/pkgs/mysterx/scribblings/com-types.scrbl
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "com-types"]{COM Types}
-
-In the result of a function like @racket[com-method-type], a type
-@indexed-racket['mx-any] standards for a character, real number,
-string, boolean, COM currency (as in @racket[com-currency?]), COM date
-(as in @racket[com-date?]), COM scode value (as in
-@racket[com-scode?]), COM IUnknown value (as in
-@racket[com-iunknown?], or COM object (as in @racket[com-object?]).}
-
-@defproc[(com-object-type [obj com-object?]) com-type?]{
-
-  Returns a type for a COM object.}
-
-@defproc[(com-is-a? [obj com-object?] [type com-type?]) boolean?]{
-
-  Return @racket[#t] if @racket[obj] is of the
-  type @racket[type].}
-
-@defproc[(com-currency? [v any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[v] is a COM currency value,
-  @racket[#f] otherwise.}
-
-@defproc[(com-currency->number [curr com-currency?]) real?]{
-
-  Returns a number for @racket[curr].}
-
-@defproc[(number->com-currency [n real?]) com-currency?]{
-
-  Converts a number to a COM currency value. A currency value is
-  repsented with a 64-bit two's-complement integer, though @racket[n]
-  may contain decimal digits.  If @racket[n] is too large, an
-  exception is raised.}
-  
-@defproc[(com-date? [v any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[v] is a COM date value, @racket[#f]
-  otherwise.}
-
-@defproc[(com-date->date [d com-date?]) date?]{
-
-  Converts a COM date to an instance of the @racket[date] structure
-  type. In the result, the @racket[dst?] field is always @racket[#f],
-  and the @racket[time-zone-offset] field is @racket[0].}
-
-@defproc[(date->com-date [d date?]) com-date?]{
-
-  Converts a @racket[date] instance to a COM date value.}
-  
-@defproc[(com-scode? [v any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[v] is a COM scode value, @racket[#f]
-  otherwise.}
-
-@defproc[(com-scode->number [sc com-scode?]) integer?]{
-
-  Converts a COM scode value to an integer.}
-
-@defproc[(number->com-scode [n integer?]) com-scode?]{
-
-  Converts a number to a COM scode value.  The number must be
-  representable as a 32-bit two's-complement number, otherwise an
-  exception is raised.}
-
-@defproc[(com-iunknown? [v any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[v] is a COM IUnknown value,
-  @racket[#f] otherwise.}
-
-@defthing[com-omit any/c]{
-
-Used with @racket[com-invoke] to represent an argument that is not
-provided.}
diff --git a/pkgs/mysterx/scribblings/com.scrbl b/pkgs/mysterx/scribblings/com.scrbl
deleted file mode 100644
index f47fdec8ae..0000000000
--- a/pkgs/mysterx/scribblings/com.scrbl
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "com" #:style 'toc]{COM}
-
-MysterX allows scripting of most COM components from Racket.  A COM
-component can be scripted in MysterX if it supports OLE Automation via
-the @tt{IDispatch} interface, and if it publishes type information
-using the @tt{ITypeInfo} interface.
-
-@local-table-of-contents[]
-
-@include-section["methprop.scrbl"]
-@include-section["com-types.scrbl"]
-@include-section["com-events.scrbl"]
diff --git a/pkgs/mysterx/scribblings/common.rkt b/pkgs/mysterx/scribblings/common.rkt
deleted file mode 100644
index a104b57280..0000000000
--- a/pkgs/mysterx/scribblings/common.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang at-exp scheme/base
-
-(require scribble/manual
-         scribble/core
-         (for-label mysterx
-                    scheme/class
-                    scheme/base
-                    scheme/contract))
-
-(provide deprecated yellow
-         (all-from-out scribble/manual)
-         (for-label (all-from-out mysterx
-                                  scheme/class
-                                  scheme/base
-                                  scheme/contract)))
-
-(define (yellow . content)
-  (make-element (make-style
-                 #f
-                 (list (make-background-color-property "yellow")))
-                content))
-
-(define (deprecated2)
-  @para{@yellow{@bold{WARNING:}}
-         All bindings in this section are scheduled for removal after version 5.2.1.})
-
-
diff --git a/pkgs/mysterx/scribblings/dcom.scrbl b/pkgs/mysterx/scribblings/dcom.scrbl
deleted file mode 100644
index 33646c4f8c..0000000000
--- a/pkgs/mysterx/scribblings/dcom.scrbl
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/bnf)
-
-@title[#:tag "remote"]{Remote COM servers (DCOM)}
-
-For the MysterX procedures @racket[cocreate-instance-from-coclass] and
-@racket[cocreate-instance-from-progid], the optional @racket[_where]
-argument can be @racket['remote].  In that case, the server instance
-is run at the location given by the Registry key
-
-@centerline{@tt{HKEY_CLASSES_ROOT\AppID\@nonterm{CLSID}\RemoteServerName}}
-
-where @nonterm{CLSID} is the CLSID of the application.  This key may
-be set using the @exec{dcomcnfg} utility.  From @exec{dcomcnfg}, pick
-the application to be run on the @onscreen{Applications} tab, then
-click on the @onscreen{Properties} button.  On the @onscreen{Location}
-tab, choose @onscreen{Run application on the following computer}, and
-enter the machine name.
-
-In order to run a COM remote server, the registry on the client
-machine must contain an entry at
-
-@centerline{@tt{HKEY_CLASSES_ROOT\CLSID\@nonterm{CLSID}}}
-
-where @nonterm{CLSID} is the CLSID for the server.  The server
-application itself need not be installed on the client machine.
-
-There are a number of configuration issues relating to DCOM, which
-MysterX uses to invoke remote COM servers.  The Web page
-
-@centerline{@link["http://www.distribucon.com/dcom95.aspx"]{http://www.distribucon.com/dcom95.html}}
-
-discusses how to setup client and server machines for DCOM.
diff --git a/pkgs/mysterx/scribblings/methprop.scrbl b/pkgs/mysterx/scribblings/methprop.scrbl
deleted file mode 100644
index defab1f8be..0000000000
--- a/pkgs/mysterx/scribblings/methprop.scrbl
+++ /dev/null
@@ -1,177 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "methprop"]{COM Methods and Properties}
-
-  MysterX allows scripting of most COM components from Racket.  A COM
-  component can be scripted in MysterX if it supports OLE Automation
-  via the @tt{IDispatch} interface, and if it publishes type
-  information using the @tt{ITypeInfo} interface.
-
-@defproc[(com-all-coclasses) (listof string?)]{
-
-  Returns a list of strings for all COM classes
-  registered on a system.}
-
-@defproc[(com-all-controls) (listof string?)]{
-
-  Returns a list of strings for all COM classes
-  registered on a system that have the @racket["Control"]
-  subkey.}
-
-@deftogether[(
-@defproc[(cocreate-instance-from-coclass [coclass string?]
-                                         [where (or/c (one-of/c 'local 'remote) string?) 'local])
-         com-object?]
-@defproc[(cci/coclass [coclass string?]
-                      [where (or/c (one-of/c 'local 'remote) string?) 'local])
-         com-object?]
-)]{
-
-  Returns an instance of @racket[coclass]. This is useful for COM
-  classes without a visual representation, or when a visual
-  representation is not needed.
-
-  The optional argument @racket[where] indicates a for running the
-  instance, and may be @racket['local], @racket['remote], or a string
-  indicating a machine name.  See @secref[#:doc '(lib
-  "scribblings/foreign/foreign.scrbl") "remote"] for more
-  information.}
-
-@deftogether[(
-@defproc[(cocreate-instance-from-progid [progid string?]
-                                         [where (or/c (one-of/c 'local 'remote) string?) 'local])
-         com-object?]
-@defproc[(cci/progid [progid string?]
-                      [where (or/c (one-of/c 'local 'remote) string?) 'local])
-         com-object?]
-)]{
-
-Like @racket[cocreate-instance-from-coclass], but using a ProgID.}
-
-
-@deftogether[(
-@defproc[(com-get-active-object-from-coclass [coclass string?])
-         com-object?]
-@defproc[(gao/coclass [coclass string?])
-         com-object?]
-)]{
-
-  Like @racket[cocreate-instance-from-coclass], but gets an existing
-  active object (always local) instead of creating a new one.}
-
-
-@defproc[(coclass [obj com-object?]) string?]{
-
-  Returns a string that is the name of the COM class instantiated by
-  @racket[obj], or raises an error if the COM class is not known.}
-
-@defproc[(progid [obj com-object?]) string?]{
-
-  Returns a string that is the name of the ProgID instantiated by
-  @racket[obj], or raises an error if the COM class is not known.}
-
-@defproc[(set-coclass! [obj com-object?] [coclass string?]) void?]{
-
-  Sets the COM class for @racket[obj] to @racket[coclass]. This is
-  useful when MysterX COM event-handling procedures can obtain only
-  ambiguous information about the object's COM class.}
-
-@defproc[(set-coclass-from-progid! [obj com-object?] [progid string?]) void?]{
-
-  Like @racket[set-coclass!], but using a ProgID.}
-
-@defproc[(com-methods [obj/type (or/c com-object? com-type?)]) 
-         (listof string?)]{
-
-   Returns a list of strings indicating the names of methods on
-   @racket[obj/type].}
-
-@defproc[(com-method-type [obj/type (or/c com-object? com-type?)]
-                          [method-name string?])
-         (listof symbol?)]{
-
-  Returns a list of symbols indicating the type of the specified
-  method in @racket[obj/type]. See @secref["com-types"] for
-  information on the symbols.}
-
-@defproc[(com-invoke [obj com-object?] [method-name string?] [v any/c] ...)
-         any/c]{
-
-  Invokes @racket[method-name] on @racket[obj] with @racket[v]s as the
-  arguments. The special value @racket[com-omit] may be used for
-  optional arguments, which useful when values are supplied for
-  arguments after the omitted argument(s).}
-
-@defproc[(com-get-properties [obj/type (or/c com-object? com-type?)])
-         (listof string?)]{
-
-  Returns a list of strings indicating the names of readable
-  properties in @racket[obj/type].}
-
-@defproc[(com-get-property-type [obj/type (or/c com-object? com-type?)]
-                                [property-name string?])
-         (listof symbol?)]{
-
-  Returns a list of symbols indicating the type of the specified
-  property in @racket[obj/type]. See @secref["com-types"] for
-  information on the symbols.}
-
-@defproc[(com-get-property [obj com-object?] 
-                           [property (or/c string?
-                                           (cons/c string? list?))]
-                           ...+)
-         any/c]{
-
-  Returns the value of the final property by following the indicated
-  path of @racket[property]s, where each intermediate property must be a
-  COM object.
-
-  Each @racket[property] is either a property-name string or a list
-  that starts with a property-name string and continues with arguments
-  for a parameterized property.}
-
-@defproc[(com-set-properties [obj/type (or/c com-object? com-type?)]) 
-         (listof string?)]{
-
-  Returns a list of strings indicating the names of writeable
-  properties in @racket[obj/type].}
-
-@defproc[(com-set-property-type [obj/type (or/c com-object? com-type?)]
-                                [property-name string?])
-          (listof symbol?)]{
-
-  Returns a list of symbols indicating the type of the specified
-  property in @racket[obj/type]. See @secref["com-types"] for
-  information on the symbols.}
-
-@defproc[(com-set-property! [obj com-object?] 
-                            [property (or/c string?
-                                            (cons/c string? list?))] ...+
-                            [v any/c])
-         void?]{
-
-   Sets the value of the final property in @racket[obj] to @racket[v]
-   by following the @racket[property]s, where the value of each
-   intermediate property is a COM object. A @racket[property]
-   can be a list instead of a string to represent a parameterized property
-   and its arguments.}
-
-@defproc[(com-help [obj/type (or/c com-object? com-type?)] 
-                   [topic string? ""])
-         void?]{
-
-  Starts the Window Help system with help about the COM object or COM
-  type. The optional @racket[topic] is typically a method or property
-  name.}
-
-@defproc[(com-object-eq? [obj1 com-object?] [obj2 com-object?])
-         boolean?]{
-
-  Returns @racket[#t] if the two COM objects are the same,
-  @racket[#f] otherwise.}
-
-@defproc[(com-object? [obj com-object?]) boolean?]{
-
-  Returns @racket[#t] if the argument is a COM object, @racket[#f]
-  otherwise.}
diff --git a/pkgs/mysterx/scribblings/mysterx.scrbl b/pkgs/mysterx/scribblings/mysterx.scrbl
deleted file mode 100644
index 32a531b5bd..0000000000
--- a/pkgs/mysterx/scribblings/mysterx.scrbl
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{MysterX: Legacy Support for Windows COM}
-
-@author["Paul Steckler"]
-
-@bold{MysterX} allows scripting of most COM components from Racket.  A COM
-component can be scripted in MysterX if it supports OLE Automation via
-the @tt{IDispatch} interface, and if it publishes type information
-using the @tt{ITypeInfo} interface.
-
-@deprecated[(list @racketmodname[ffi/com] " or " @racketmodname[ffi/unsafe/com])]{
- MysterX formerly provided @as-index{ActiveX} support; we no longer support
- that ActiveX functionality, but see 
- @secref[#:doc '(lib "scribblings/foreign/foreign.scrbl") "active-x"].}
-
-@;MysterX is supported but deprecated; MysterX formerly provided @as-index{ActiveX} support, but ActiveX support has been discontinued.
-
-@defmodule[mysterx]
-
-@table-of-contents[]
-
-@include-section["methprop.scrbl"]
-@include-section["com-types.scrbl"]
-@include-section["com-events.scrbl"]
-@include-section["version.scrbl"]
-
-@index-section[]
diff --git a/pkgs/mysterx/scribblings/overview.scrbl b/pkgs/mysterx/scribblings/overview.scrbl
deleted file mode 100644
index 6427116268..0000000000
--- a/pkgs/mysterx/scribblings/overview.scrbl
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "overview"]{Overview}
-
-@section{Installation}
-
-MysterX requires Internet Explorer (IE) 4 or later to be installed.
-Distributed COM (DCOM) for your version of Windows is also required.
-Recent versions of Windows come with DCOM; DCOM packages for Windows
-95 and 98 are made available separately.
-
-Two Windows DLLs support low-level operations in MysterX:
-@filepath{myspage.dll} and @filepath{myssink.dll}.  Both are installed
-in the registry (using @exec{regsvr32.exe}) when @exec{raco setup} runs the
-MysterX post-installer. If you move the location of your Racket
-installation, you may need to re-run @exec{raco setup} to make MysterX
-work. Neither of these DLLs is specific to a Racket version, so
-it's ok for one version of Racket to use the DLLs registered by
-another.
-
-@margin-note{Prior to version 369.4, @filepath{myssink.dll} was
-version-specific. Its GUID was changed when it was made
-version-independent.}
-
-If you build a stand-alone executable that uses MysterX, you need to
-specifically include @filepath{myspage.dll} and @filepath{myssink.dll}
-with your distribution, and the DLLs will need to be registered on the
-end user's machine. One way to do that is to include the following
-little setup program (as an executable) in your distribution:
-
-@racketblock[
-  (module setup scheme/base
-    (require mzlib/runtime-path
-             mzlib/process)
-
-    (code:comment @#,t{Ensure that DLLs are included with the distribution:})
-    (define-runtime-path myspage-dll '(so "myspage"))
-    (define-runtime-path myssink-dll '(so "myssink"))
-
-    (code:comment @#,t{Register the DLLs:})
-    (define regsvr32 
-      (path->string (find-executable-path "regsvr32.exe" #f)))
-    (system* regsvr32 (path->string myspage-dll))
-    (system* regsvr32 (path->string myssink-dll)))
-]
-
-@; ----------------------------------------------------------------------
-
-@section{Running a Demo}
-
-Try 
-
-@racketblock[
-  (require mysterx/mxdemo)
-]
-
-The demo requires the MSCal Calendar control.  The calendar control is
-normally installed with Microsoft Office, but it can also be
-downloaded from elsewhere; look for @filepath{mscal.ocx}.
-
-@; ----------------------------------------------------------------------
-
-@section{Loading}
-
-Load the MysterX module with 
-
-@racketblock[
-  (require mysterx)
-]
-
-Because some MysterX code relies on the @racketmodname[scheme/class]
-class system, you may also need
-
-@racketblock[
-  (require mzlib/class)
-]
-
-Several MysterX procedures take HTML strings as input.  The
-@racketmodname[xml] library provides procedures that convert Racket
-syntax into XML strings.  You may find using these procedures useful
-in creating HTML strings for use by MysterX.
-
-@; ----------------------------------------------------------------------
-
-@include-section["dcom.scrbl"]
diff --git a/pkgs/mysterx/scribblings/version.scrbl b/pkgs/mysterx/scribblings/version.scrbl
deleted file mode 100644
index a490533cc1..0000000000
--- a/pkgs/mysterx/scribblings/version.scrbl
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "version"]{Version}
-
-@defproc[(mx-version) string?]{
-
- Returns a string indicating the version of MysterX.}
diff --git a/pkgs/mysterx/tests/tests.rkt b/pkgs/mysterx/tests/tests.rkt
deleted file mode 100644
index 2803331dd8..0000000000
--- a/pkgs/mysterx/tests/tests.rkt
+++ /dev/null
@@ -1,113 +0,0 @@
-#lang racket/base
-(require mysterx
-         racket/system
-         setup/dirs
-         (only-in ffi/unsafe/com com-object-get-iunknown))
-
-(define-syntax-rule (test expect expr)
-  (let ([val expr]
-        [ex expect])
-    (printf "~s\n" 'expr)
-    (unless (equal? ex val)
-      (error 'test "~s failed: ~e" 'expr val))
-    (set! count (add1 count))))
-
-(define count 0)
-
-(when (eq? 'windows (system-type))
-  (system* (build-path (find-console-bin-dir) "MzCom.exe")
-           "/RegServer")
-  (define mzcom-progid (string-append "MzCOM.MzObj." (version)))
-
-  (define mzcom (cocreate-instance-from-progid mzcom-progid))
-  (test #t (com-object? mzcom))
-  (test #t (com-is-a? mzcom (com-object-type mzcom)))
-  (test (void) (set-coclass-from-progid! mzcom mzcom-progid))
-  (test #t (com-object-eq? mzcom mzcom))
-  (test '("About" "Eval" "Reset") (com-methods mzcom))
-  (test '("About" "Eval" "Reset") (com-methods (com-object-type mzcom)))
-  (test '(-> void) (com-method-type mzcom "About"))
-  (test '(-> void) (com-method-type (com-object-type mzcom) "About"))
-  (test '(-> void) (com-method-type mzcom "Reset"))
-  (test '(string -> string) (com-method-type mzcom "Eval"))
-  (test "3" (com-invoke mzcom "Eval" "(+ 1 2)"))
-
-  (test '() (com-get-properties mzcom))
-  (test '() (com-get-properties (com-object-type mzcom)))
-  (test '() (com-set-properties mzcom))
-  (test '() (com-set-properties (com-object-type mzcom)))
-
-  (test '("SchemeError") (com-events mzcom))
-  (test '("SchemeError") (com-events (com-object-type mzcom)))
-  (test #f (com-event-type mzcom "SchemeError"))
-  (test #f (com-event-type (com-object-type mzcom) "SchemeError"))
-  (define recved #f)
-  (test (void) (com-register-event-handler mzcom "SchemeError" 
-                                           (lambda (msg) (set! recved msg))))
-  (test #t (with-handlers ([exn:fail? (lambda (exn) 
-                                        (regexp-match? #rx"COM object exception"
-                                                       (exn-message exn)))])
-             (com-invoke mzcom "Eval" "bad")))
-  (sync (system-idle-evt))
-  (test #t (regexp-match? #rx"bad" recved))
-  (test (void) (com-unregister-event-handler mzcom "SchemeError"))
-
-  (test #f (com-iunknown? mzcom))
-  (test #t (com-iunknown? (com-object-get-iunknown mzcom)))
-
-  (test com-omit com-omit)
-
-  (define ie (cocreate-instance-from-progid "InternetExplorer.Application.1"))
-  (test #t (and (member "Visible" (com-set-properties ie)) #t))
-  (test #f (com-get-property ie "Visible"))
-  (test (void) (com-set-property! ie "Visible" #t))
-  (test #t (com-get-property ie "Visible"))
-  (test (void) (com-set-property! ie "Visible" #f))
-  (test #f (com-get-property ie "Container"))
-
-  ;; For IE 7 (or 8?), this needs to be a web page; opening
-  ;; a local document disconnects the object for some reason:
-  (test (void) (com-invoke ie "Navigate" "http://racket-lang.org"))
-  (sleep 3) ; give the document time to load
-
-  (define doc (com-get-property ie "Document"))
-  (test #t (com-object? doc))
-  (test "The Racket Language" (com-get-property ie "Document" "title"))
-  (test (void) (com-set-property! ie "Document" "title" "The Racket Documentation"))
-  (test "The Racket Documentation" (com-get-property ie "Document" "title"))
-  (test '(-> string) (com-get-property-type doc "title"))
-  (test '(string ->  void) (com-set-property-type doc "title"))
-
-  (void))
-
-(define (test-currency n)
-  (= (/ (round (* (inexact->exact n) 10000)) 10000)
-     (com-currency->number (number->com-currency n))))
-
-(define (test-scode n)
-  (= n (com-scode->number (number->com-scode n))))
-
-(define (test-date date)
-  (equal? date (com-date->date (date->com-date date))))
-
-(for-each
- (lambda (n)
-   (unless (test-scode n)
-     (eprintf "Error in test-scode for value ~a\n" n)))
- '(25 -22 -1 -233344433 177000000 859489222))
-
-
-(print-struct #t)
-
-(let ([date (seconds->date (current-seconds))])
-  (unless (test-date date)
-    (eprintf "Error in test-date\n")))
-
-(for-each
- (lambda (n)
-   (unless (test-currency n)
-     (eprintf "Error in test-currency for value ~a\n" n)))
- '(0 1 3.14 25.00 -22.34 11.7832 91000000000 25034343434.9933))
-
-
-(printf "~a passed\n" count)
diff --git a/pkgs/mzcom/LICENSE.txt b/pkgs/mzcom/LICENSE.txt
deleted file mode 100644
index 1996a02d55..0000000000
--- a/pkgs/mzcom/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-mzcom
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/mzcom/info.rkt b/pkgs/mzcom/info.rkt
deleted file mode 100644
index d17f5b4d9b..0000000000
--- a/pkgs/mzcom/info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang info
-
-(define collection "mzcom")
-
-(define post-install-collection "installer.rkt")
-
-(define scribblings '(("mzcom.scrbl" () (interop))))
-(define deps '("base"
-               "compatibility-lib"))
-(define build-deps '("scheme-lib"
-                     "racket-doc"
-                     "mysterx"
-                     "scribble-lib"))
-
-(define pkg-desc "COM control to instantate a Racket instance")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/mzcom/installer.rkt b/pkgs/mzcom/installer.rkt
deleted file mode 100644
index 8df2b8f4ba..0000000000
--- a/pkgs/mzcom/installer.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-(module installer mzscheme
-  (require mzlib/process
-	   setup/dirs)
-  (provide post-installer)
-  (define (post-installer plt-home)
-    (let ([exe "MzCOM.exe"])
-      (cond [(not (eq? (system-type) 'windows))
-             ;(printf "Warning: can't install MzCOM on non-Windows machine\n")
-             (void)]
-            [(not (file-exists? (build-path (find-lib-dir) exe)))
-             (printf "Warning: MzCOM binary not installed\n")]
-            [else (parameterize ([current-directory (find-lib-dir)])
-                    (system* exe "/RegServer"))]))))
diff --git a/pkgs/mzcom/mzcom.scrbl b/pkgs/mzcom/mzcom.scrbl
deleted file mode 100644
index bceb1ae1da..0000000000
--- a/pkgs/mzcom/mzcom.scrbl
+++ /dev/null
@@ -1,172 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/bnf
-          (for-label scheme/base
-                     mysterx))
-
-@(define (com-index name what . proto)
-   (index* (list (format "~a COM ~a" name what))
-           (list @elem{@(tt name) COM @|what|})
-           (apply tt proto)))
-
-@title{MzCOM: Racket as a Windows COM Object}
-
-@author["Paul Steckler"]
-
-@exec{MzCOM.exe} is a Windows COM (i.e., Component Object Model) class
-wrapper for Racket.
-
-During normal installation of MzCOM, the executable is registered as a
-COM object automatically.  If that registration fails or if you move
-the Racket installation, re-register @exec{MzCOM.exe} with
-
-@commandline{@nonterm{installation}\lib\MzCOM.exe /RegServer /v}
-
-The @exec{MzCOM.exe} executable will find DLLs and library collections
-relative to its own path.
-
-@; ----------------------------------------------------------------------
-
-@section{Loading MzCOM}
-
-To load a COM object, COM hosts require a COM class name or a ProgID.
-MzCOM has the class name @tt{"MzObj Class"} and the ProgID
-@tt{"MzCOM.MzObj.@nonterm{version}"}, where @nonterm{version} is
-@(version).
-
-In the Visual BASIC 6 environment, from the @menuitem["Project"
-"References (VB6)"], check @onscreen{MzCOM 1.0 Type Library}.  In
-Visual BASIC .NET, choose @menuitem["Project" "Add Reference"], and
-from the @onscreen{COM} tab, select @onscreen{MzCOM 1.0 Type Library}.
-In your code, declare a variable, then assign to it:
-
-@verbatim[#:indent 2]{
-  DIM schemeObject AS MzObj
-  SET schemeObject = NEW MzObj
-}
-
-From Visual C++:
-
-@verbatim[#:indent 2]{
- #include "mzcom.h" 
-     
- CLSID clsid;
- IMzObj *pIMzObj;
-
- CoInitialize(NULL);
- CLSIDFromProgID(L"MzCOM.MzObj.<version>",&clsid);
- CoCreateInstance(clsid,NULL,CLSCTX_SERVER,IID_IMzObj, (void **)&pIMzObj);
-}
-
-where @tt{<version>} is the version number.  You'll need the
-definition of @tt{IID_IMzObj} (see @secref["guids"]).  The header file
-@filepath{mzcom.h} is generated as @filepath{src\worksp\mzcom\} when
-building from the Racket source distribution. The above C/C++ code
-is for illustration; your actual code should check return values, of
-course.
-
-Using @racketmodname[mysterx] to manipulate COM objects within Racket,
-you can load MzCOM with either
-
-@racketblock[
-  (cci/coclass "MzObj Class")
-]
-
-or
-
-@racketblock[
-  (cci/progid "MzCOM.MzObj.<version>")
-]
-
-Consult your documentation for loading MzCOM into other COM
-environments.  MzCOM is compiled as a ``dual-mode'' class, meaning its
-methods may be called directly or by using OLE Automation.
-
-@section[#:tag "guids"]{GUIDs}
-
-When compiled from the Racket source distibrution, the directory
-@filepath{src\worksp\mzcom\} contains the file @filepath{MzCOM_i.c}
-that contains GUIDs for MzCOM.  Those GUIDs are as follows:
-
-@verbatim[#:indent 2]{
-  const IID IID_IMzObj = 
-    {0xA604CBA8,0x2AB5,0x11D4,{0xB6,0xD3,0x00,0x60,0x08,0x90,0x02,0xFE}};
-
-  const IID LIBID_MZCOMLib = 
-    {0xA604CB9C,0x2AB5,0x11D4,{0xB6,0xD3,0x00,0x60,0x08,0x90,0x02,0xFE}};
-
-  const IID DIID__IMzObjEvents = 
-    {0xA604CBA9,0x2AB5,0x11D4,{0xB6,0xD3,0x00,0x60,0x08,0x90,0x02,0xFE}};
-
-  const CLSID CLSID_MzObj = 
-    {0xA3B0AF9E,0x2AB0,0x11D4,{0xB6,0xD2,0x00,0x60,0x08,0x90,0x02,0xFE}};
-}
-
-which represent the @tt{IMzObj} interface, the MzCOM type library, the
-@tt{IMzObjEvents} interface, and the @tt{MzObj} class, respectively.
-
-
-@section{Methods}
-
-MzCOM support three COM methods:
-
-@itemize[
-
- @item{@com-index["About" "method"]{void About()}
-
-      Takes no arguments and displays an informational 
-      dialog.}
-
- @item{@com-index["Eval" "method"]{BSTR Eval(BSTR input)}
-
-      Takes and returns strings (specifically, @tt{BSTR}s).  The returned
-       value is the result of evaluating the input expression,
-       formatted as a string.  The input string may contain several
-       S-expressions.  The embedded Racket updates its environment
-       with each evaluation.  Therefore, it is possible to define
-       procedures in a call to @tt{Eval}, and use the procedures in
-       subsequent calls.}
-
- @item{@com-index["Reset" "method"]{void Reset()}
-
-       Resets the Racket environment to the initial environment.
-       Also, the custodian for the primary Racket thread is invoked,
-       shutting all its managed values.}
-]
-
-@section{Events}
-
-MzCOM supports a single event.
-
-@itemize[
-
- @item{@com-index["SchemeError" "event"]{SchemeError()}
-
-        Passed a string (specifically, a @tt{BSTR}) that explains the error.}
-
-]
-
-@section{Errors}
-
-When an error occurs in MzCOM, it creates a COM error object.  C and
-C++ clients can use @tt{GetErrorInfo} to retrieve error information.
-Clients implemented in other languages typically have some equivalent
-means to obtain COM error information.
-
-@section{Evaluation thread}
-
-The Racket evaluator runs in a Win32 thread created when MzCOM is
-loaded.  If an expression kills the primary Racket thread, as in
-
-@racketblock[
-  (kill-thread (current-thread))
-]
-
-then the evaluator Win32 thread is also killed.  
-When that happens, subsequent calls to @tt{Eval} will fail.
-
-@section{Acknowledgments}
-
-MzCOM was developed in response to a query by 
-Andre Van Meulebrouck.  Andre also did extensive 
-testing with Visual BASIC.
diff --git a/pkgs/mzcom/tests/README b/pkgs/mzcom/tests/README
deleted file mode 100644
index 762b652441..0000000000
--- a/pkgs/mzcom/tests/README
+++ /dev/null
@@ -1,17 +0,0 @@
-Run the MzCOM tests with
-
- mzscheme -mvqf test.ss
-
-The tests exercise the three COM methods of MzCOM, namely
-
- About
- Reset
- Eval
-
-Note that some of the tests deliberately cause COM exceptions,
-which are handled in the Scheme code.  The details of those
-exceptions are displayed to make sure they're the ones we 
-expected -- these are not errors.
-
-If the number of detected errors is greater than 0, an 
-error count is printed.
diff --git a/pkgs/mzcom/tests/test.rktl b/pkgs/mzcom/tests/test.rktl
deleted file mode 100644
index dd9c1f77f2..0000000000
--- a/pkgs/mzcom/tests/test.rktl
+++ /dev/null
@@ -1,59 +0,0 @@
-; test.rkt for MzCOM
-; requires MysterX to be installed
-
-(require mysterx)
-(define mzcom (cci/progid "MzCOM.MzObj"))
-
-(define num-errors 0)
-(define (add-error!)
-  (set! num-errors (add1 num-errors)))
-
-(define (run . s)
-  (apply com-invoke mzcom s))
-
-(define (mzeval s)
-  (run "Eval" s))
-
-(print-struct #t)
-
-; should show an About box
-(printf "You should see the About box\n")
-(run "About")
-
-; tests whether Eval returns sensible result
-(if (string=? (mzeval "(+ 20 22)")
-		  "42")
-    (printf "1st Eval test ok\n")
-    (begin
-      (add-error!)
-      (fprintf (current-error-port) "1st Eval test failed\n")))
-
-(mzeval "(define x 42)")
-; tests whether preceding definition really holds
-(if (string=? "42" (mzeval "x"))
-    (printf "define test ok\n")
-    (begin
-      (add-error!)
-      (fprintf (current-error-port) "define test failed\n")))
-
-(printf "Resetting environment\n")
-(run "Reset") ; removes binding for x
-
-; tests for removal of binding
-(with-handlers
- ([void (lambda (exn) (printf "2nd Eval test looks ok\nexn was: ~a\n" exn))])
- (mzeval "x") ; binding for x missing
- (add-error!)
- (fprintf (current-error-port) "2nd Eval test failed\n"))
-
-; tests if a Scheme error results in a COM error
-(with-handlers
- ([void (lambda (exn) (printf "3rd Eval test looks ok\nexn was: ~a\n" exn))])
- (mzeval "(+ 'foo 42)") ; should raise Scheme error
- (add-error!)
- (fprintf (current-error-port) "3rd Eval test failed\n"))
-
-(when (> num-errors 0)
-      (fprintf (current-error-port) "There were ~a errors.\n" num-errors))
-
-(printf "End of MzCOM tests.\n")
diff --git a/pkgs/mzscheme-pkgs/mzscheme-doc/LICENSE.txt b/pkgs/mzscheme-pkgs/mzscheme-doc/LICENSE.txt
deleted file mode 100644
index 4bbeb90c50..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-mzscheme-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/mzscheme-pkgs/mzscheme-doc/info.rkt b/pkgs/mzscheme-pkgs/mzscheme-doc/info.rkt
deleted file mode 100644
index 6394ddc37b..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-doc/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "documentation part of \"mzscheme\"")
-
-(define pkg-authors '(mflatt))
-(define build-deps '("compatibility-lib"
-                     "r5rs-doc"
-                     "r5rs-lib"
-                     "racket-doc"
-                     "scheme-lib"
-                     "scribble-lib"))
diff --git a/pkgs/mzscheme-pkgs/mzscheme-doc/mzscheme/info.rkt b/pkgs/mzscheme-pkgs/mzscheme-doc/mzscheme/info.rkt
deleted file mode 100644
index 55498d0a4f..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-doc/mzscheme/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("mzscheme.scrbl" (multi-page) (legacy))))
diff --git a/pkgs/mzscheme-pkgs/mzscheme-doc/mzscheme/mzscheme.scrbl b/pkgs/mzscheme-pkgs/mzscheme-doc/mzscheme/mzscheme.scrbl
deleted file mode 100644
index 2edeb7b510..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-doc/mzscheme/mzscheme.scrbl
+++ /dev/null
@@ -1,478 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          (for-label mzscheme
-                     (only-in r5rs set-car! set-cdr!)
-                     (only-in scheme/base
-                              for-syntax #%plain-module-begin
-                              exact-nonnegative-integer?
-                              exact-positive-integer?
-                              syntax?
-                              #%plain-lambda #%plain-app
-                              syntax->datum datum->syntax
-                              make-base-empty-namespace
-                              make-hash make-hasheq make-weak-hash make-weak-hasheq
-                              make-immutable-hash
-                              make-immutable-hasheq
-                              hash-ref hash-set! hash-remove!
-                              hash-count hash-copy hash-map hash-for-each
-                              hash-iterate-first hash-iterate-next 
-                              hash-iterate-value hash-iterate-key
-                              cleanse-path
-			      exn:fail exn:fail:contract)))
-
-@(define-syntax-rule (def-base base-define base-define-syntax base-define-for-syntax
-                               base-define-struct
-                               base-if base-cond base-case base-top-interaction
-                               base-open-input-file base-apply base-prop:procedure
-                               base-free-identifier=? base-free-template-identifier=?
-                               base-free-transformer-identifier=? base-free-label-identifier=?
-                               base-collection-file-path base-collection-path)
-   (begin
-     (require (for-label scheme/base))
-     (define base-define (racket define))
-     (define base-define-syntax (racket define-syntax))
-     (define base-define-for-syntax (racket define-for-syntax))
-     (define base-define-struct (racket define-struct))
-     (define base-if (racket if))
-     (define base-cond (racket cond))
-     (define base-case (racket case))
-     (define base-top-interaction (racket #%top-interaction))
-     (define base-open-input-file (racket open-input-file))
-     (define base-apply (racket apply))
-     (define base-prop:procedure (racket prop:procedure))
-     (define base-free-identifier=? (racket free-identifier=?))
-     (define base-free-template-identifier=? (racket free-template-identifier=?))
-     (define base-free-transformer-identifier=? (racket free-transformer-identifier=?))
-     (define base-free-label-identifier=? (racket free-label-identifier=?))
-     (define base-collection-file-path (racket collection-file-path))
-     (define base-collection-path (racket collection-path))))
-@(def-base base-define base-define-syntax base-define-for-syntax base-define-struct
-           base-if base-cond base-case base-top-interaction
-           base-open-input-file base-apply base-prop:procedure
-           base-free-identifier=? base-free-template-identifier=?
-           base-free-transformer-identifier=? base-free-label-identifier=?
-           base-collection-file-path base-collection-path)
-
-@(define-syntax-rule (additionals racket/base id ...)
-   (begin
-     (require (for-label (only-in racket/base id ...)))
-     (racketblock id ...)))
-
-@(define old-vers @elem{version 372})
-
-@title{MzScheme: Legacy Language}
-
-@defmodule[mzscheme]{
-
-The @racketmodname[mzscheme] language provides nearly the same
-bindings as the @racketmodname[mzscheme] module of PLT Scheme
-@|old-vers| and earlier.}
-
-Unlike @|old-vers|, the @racketmodname[mzscheme] language does not
-include @racket[set-car!]  or @racket[set-cdr!], and @racket[cons]
-makes immutable pairs, as in @racket[scheme/base]; those changes make
-modules built on @racketmodname[mzscheme] reasonably compatible with
-modules built on @racketmodname[scheme/base].
-
-Otherwise, the @racketmodname[mzscheme] language shares many bindings
-with @racketmodname[scheme/base]. It renames a few bindings, such as
-@racket[syntax-object->datum] instead of @racket[syntax->datum], and
-it provides old versions of some syntactic forms, such as
-@racket[lambda] without support for keyword and optional arguments.
-In addition, @racketmodname[mzscheme] includes all of the exports of
-@racketmodname[racket/tcp] and @racketmodname[racket/udp].
-
-@table-of-contents[]
-
-@; ----------------------------------------
-
-@section[#:tag "Old_Syntactic_Forms"]{Old Syntactic Forms}
-
-@defform[(#%module-begin form ...)]{
-
-Like @racket[#%plain-module-begin] from @racketmodname[scheme/base],
-but @racket[(require-for-syntax mzscheme)] is added to the beginning
-of the @racket[form] sequence, thus importing @racketmodname[mzscheme]
-into the transformer environment for the module body. (In contrast,
-@racketmodname[scheme/base] exports @racket[for-syntax] minimal
-transformer support, while @racketmodname[scheme] exports all of
-@racketmodname[scheme/base] @racket[for-syntax].)}
-
-
-@defform[(#%plain-module-begin form ...)]{
-
-The same binding as @racket[#%plain-module-begin] from
-@racketmodname[scheme/base].}
-
-
-@defform[(#%plain-lambda formals body ...+)]{
-
-The same binding as @racket[#%plain-lambda] in
-@racketmodname[scheme/base].  (This binding was not present in
-@|old-vers| and earlier.)}
-
-
-@deftogether[(
-@defform[(lambda formals body ...+)]
-@defform[(λ formals body ...+)]
-)]{
-
-The same bindings as @racket[#%plain-lambda].}
-
-
-@defform*[[(#%app proc-expr arg-expr ...)
-           (#%app)]]{
-
-The same binding as @racket[#%plain-app] from
-@racketmodname[scheme/base].}
-
-@defform*[[(#%plain-app proc-expr arg-expr ...)
-           (#%plain-app)]]{
-
-The same binding as @racket[#%app].  (This binding was not present in
-@|old-vers| and earlier.)}
-
-@defform*/subs[[(define id expr)
-                (define (head args) body ...+)]
-                ([head id
-                       (head args)]
-                 [args (code:line arg-id ...)
-                       (code:line arg-id ... @#,racketparenfont{.} rest-id)])]{
-
-Like @|base-define| in @racketmodname[scheme/base], but without
-support for keyword arguments or optional arguments.}
-
-@deftogether[(
-@defform*[[(define-syntax id expr)
-           (define-syntax (head args) body ...+)]]
-@defform*[[(define-for-syntax id expr)
-           (define-for-syntax (head args) body ...+)]]
-)]{
-
-Like @|base-define-syntax| and @|base-define-for-syntax| in
-@racketmodname[scheme/base], but without support for keyword arguments
-or optional arguments (i.e., @racket[head] is as for @racket[define]).}
-
-@defform*[[(if test-expr then-expr else-expr)
-           (if test-expr then-expr)]]{
-
-Like @|base-if| in @racketmodname[scheme/base], but @racket[else-expr]
-defaults to @racket[(void)].}
-
-@deftogether[(
-@defform[(cond cond-clause ...)]
-@defform[(case val-expr case-clause ...)]
-)]{
-
-Like @|base-cond| and @|base-case| in @racketmodname[scheme/base], but
-@racket[else] and @racket[=>] are recognized as unbound identifiers,
-instead of as the @racketmodname[scheme/base] bindings. }
-
-@defform[(fluid-let ([id expr] ...) body ...+)]{
-
-Provides a kind of dynamic binding via mutation of the @racket[id]s.
-
-The @racket[fluid-let] form first evaluates each @racket[expr] to
-obtain an @defterm{entry value} for each @racket[id]. As evaluation
-moves into @racket[body], either though normal evaluation or a
-continuation jump, the current value of each @racket[id] is swapped
-with the entry value. On exit from @racket[body], then the current
-value and entry value are swapped again.}
-
-@defform/subs[(define-struct id-maybe-super (field-id ...) maybe-inspector-expr)
-              ([maybe-inspector-expr code:blank
-                                     expr])]{
-
-Like @base-define-struct from @racket[scheme/base], but with fewer
-options. Each field is implicitly mutable, and the optional
-@racket[expr] is analogous to supplying an @racket[#:inspector]
-expression.}
-
-@defform[(let-struct id-maybe-super (field-id ...) body ...+)]{
-
-Expands to 
-
-@racketblock[
-(let ()
-  (define-struct id-maybe-super (field-id ...))
-  body ...+)
-]}
-
-@deftogether[(
-@defform[(require raw-require-spec)]
-@defform[(require-for-syntax raw-require-spec)]
-@defform[(require-for-template raw-require-spec)]
-@defform[(require-for-label raw-require-spec)]
-@defform[(provide raw-provide-spec)]
-@defform[(provide-for-syntax raw-provide-spec)]
-@defform[(provide-for-label raw-provide-spec)]
-)]{
-
-Like @racket[#%require] and @racket[#%provide]. The
-@racketidfont{-for-syntax}, @racketidfont{-for-template}, and
-@racketidfont{-for-label} forms are translated to @racket[#%require]
-and @racket[#%provide] using @racketidfont{for-syntax},
-@racketidfont{for-template}, and @racketidfont{for-label} sub-forms,
-respectively.}
-
-@defform[(#%datum . datum)]{
-
-Expands to @racket[(quote datum)], even if @racket[datum] is a
-keyword.}
-
-@defform[(#%top-interaction . form)]{
-
-The same as @|base-top-interaction| in @racketmodname[scheme/base].}
-
-@; ----------------------------------------
-
-@section[#:tag "Old_Functions"]{Old Functions}
-
-@defproc[(apply [proc procedure?] [v any/c] ... [lst list?]) any]{
-
-Like @base-apply from @racketmodname[scheme/base], but without support
-for keyword arguments.}
-
-@defthing[prop:procedure struct-type-property?]{
-
-Like @base-prop:procedure from @racketmodname[scheme/base], but even
-if the property's value for a structure type is a procedure that
-accepts keyword arguments, then instances of the structure type still
-do not accept keyword arguments. (In contrast, if the property's value
-is an integer for a field index, then a keyword-accepting procedure in
-the field for an instance causes the instance to accept keyword
-arguments.)}
-
-@deftogether[(
-@defproc[(open-input-file [file path-string?]
-                          [mode (one-of/c 'text 'binary) 'binary]
-                          [module-mode (or-of/c 'module 'none) 'none])
-         input-port?]
-@defproc[(open-output-file [file path-string?]
-                           [mode (one-of/c 'text 'binary) 'binary]
-                           [exists (one-of/c 'error 'append 'update
-                                             'replace 'truncate 'truncate/replace) 'error])
-         input-port?]
-@defproc[(open-input-output-file [file path-string?]
-                           [mode (one-of/c 'text 'binary) 'binary]
-                           [exists (one-of/c 'error 'append 'update
-                                             'replace 'truncate 'truncate/replace) 'error])
-         (values input-port? output-port?)]
-@defproc[(with-input-from-file [file path-string?] 
-                               [thunk (-> any)]
-                               [mode (one-of/c 'text 'binary) 'binary])
-         any]
-@defproc[(with-output-to-file [file path-string?] 
-                              [thunk (-> any)]
-                              [mode (one-of/c 'text 'binary) 'binary]
-                              [exists (one-of/c 'error 'append 'update
-                                                'replace 'truncate 'truncate/replace) 'error])
-         any]
-@defproc[(call-with-input-file [file path-string?] 
-                               [proc (input-port? -> any)]
-                               [mode (one-of/c 'text 'binary) 'binary])
-         any]
-@defproc[(call-with-output-file [file path-string?] 
-                                [proc (output-port? -> any)]
-                                [mode (one-of/c 'text 'binary) 'binary]
-                                [exists (one-of/c 'error 'append 'update
-                                                  'replace 'truncate 'truncate/replace) 'error])
-         any]
-)]{
-
-Like @base-open-input-file, etc. from @racketmodname[scheme/base], but
-the @racket[mode], @racket[exists], and @racket[module-mode]
-(corresponds to @racket[#:for-module?]) arguments are not keyword
-arguments. When both @racket[mode] and @racket[exists] or
-@racket[module-mode] are accepted, they are accepted in either order.
-
-@history[#:changed "6.0.1.6" 
-         @elem{Added the @scheme[module-mode] argument to @racket[open-input-file].}]}
-
-@deftogether[(
-@defproc[(syntax-object->datum [stx syntax?]) any]
-@defproc[(datum->syntax-object [ctxt (or/c syntax? false/c)]
-                        [v any/c]
-                        [srcloc (or/c syntax? false/c
-                                      (list/c any/c
-                                              (or/c exact-positive-integer? false/c)
-                                              (or/c exact-nonnegative-integer? false/c)
-                                              (or/c exact-nonnegative-integer? false/c)
-                                              (or/c exact-positive-integer? false/c))
-                                      (vector/c any/c
-                                                (or/c exact-positive-integer? false/c)
-                                                (or/c exact-nonnegative-integer? false/c)
-                                                (or/c exact-nonnegative-integer? false/c)
-                                                (or/c exact-positive-integer? false/c)))]
-                        [prop (or/c syntax? false/c) #f]
-                        [cert (or/c syntax? false/c) #f])
-          syntax?]
-)]{
-
-The same as @racket[syntax->datum] and @racket[datum->syntax].}
-
-@deftogether[(
-@defproc[(module-identifier=? [a-id syntax?][b-id syntax?]) boolean?]
-@defproc[(module-transformer-identifier=? [a-id syntax?][b-id syntax?]) boolean?]
-@defproc[(module-template-identifier=? [a-id syntax?][b-id syntax?]) boolean?]
-@defproc[(module-label-identifier=? [a-id syntax?][b-id syntax?]) boolean?]
-@defproc[(free-identifier=? [a-id syntax?][b-id syntax?]) boolean?]
-)]{
-
-The @racket[module-identifier=?], @|etc| functions are the same as
-@base-free-identifier=?, @|etc| in @racketmodname[scheme/base].
-
-The @racket[free-identifier=?] procedure returns
-
-@racketblock[
-(and (eq? (syntax-e a) (syntax-e b)) 
-     (module-identifier=? a b))
-]}
-
-
-@defproc[(make-namespace [mode (one-of/c 'initial 'empty) 'initial]) namespace?]{
-
-Creates a namespace with @racketmodname[mzscheme] attached. If the
-@racket[mode] is empty, the namespace's top-level environment is left
-empty. If @racket[mode] is @racket['initial], then the namespace's
-top-level environment is initialized with
-@racket[(namespace-require/copy 'mzscheme)]. See also
-@racket[make-base-empty-namespace].}
-
-
-@defproc[(namespace-transformer-require [req any/c]) void?]{
-
-Equivalent to @racket[(namespace-require `(for-syntax ,req))].}
-
-@deftogether[(
-@defproc[(transcript-on [filename any/c]) any]
-@defproc[(transcript-off) any]
-)]{
-
-Raises @racket[exn:fail], because the operations are not supported.}
-
-
-@defproc*[([(hash-table? [v any/c])
-            hash-table?]
-           [(hash-table? [v any/c] [flag (one-of/c 'weak 'equal 'eqv)]) 
-            hash-table?]
-           [(hash-table? [v any/c]
-                         [flag (one-of/c 'weak 'equal 'eqv)]
-                         [flag2 (one-of/c 'weak 'equal 'eqv)]) 
-            hash-table?])]{
-
-Returns @racket[#t] if @racket[v] is a hash table created by
-@racket[make-hash-table] or @racket[make-immutable-hash-table] with the
-given @racket[flag]s (or more), @racket[#f] otherwise. If @racket[flag2]
-is provided, it must be distinct from @racket[flag] and @racket['equal]
-cannot be used with @racket['eqv], otherwise the
-@racket[exn:fail:contract] exception is raised.}
-
-
-@defproc*[([(make-hash-table) 
-            hash-table?]
-           [(make-hash-table [flag (one-of/c 'weak 'equal 'eqv)]) 
-            hash-table?]
-           [(make-hash-table [flag (one-of/c 'weak 'equal 'eqv)]
-                             [flag2 (one-of/c 'weak 'equal 'eqv)]) 
-            hash-table?])]{
-
-Creates and returns a new hash table. If provided, each @racket[flag]
-must one of the following:
-
- @itemize[
-
-  @item{@indexed-racket['weak] --- creates a hash table with
-   weakly-held keys via @racket[make-weak-hash],
-   @racket[make-weak-hasheq], or @racket[make-weak-hasheqv].}
-
-  @item{@indexed-racket['equal] --- creates a hash table that compares
-   keys using @racket[equal?] instead of @racket[eq?] using
-   @racket[make-hash] or @racket[make-weak-hash].}
-
-  @item{@indexed-racket['eqv] --- creates a hash table that compares
-   keys using @racket[eqv?] instead of @racket[eq?] using
-   @racket[make-hasheqv] or @racket[make-weak-hasheqv].}
-
- ]
-
-By default, key comparisons use @racket[eq?] (i.e., the hash table is
-created with @racket[make-hasheq]). If @racket[flag2] is
-redundant or @racket['equal] is provided with @racket['eqv], the
-@racket[exn:fail:contract] exception is raised.}
-
-
-@defproc*[([(make-immutable-hash-table [assocs (listof pair?)])
-            (and/c hash-table? immutable?)]
-           [(make-immutable-hash-table [assocs (listof pair?)]
-                                       [flag (one-of/c 'equal 'eqv)])
-            (and/c hash-table? immutable?)])]{
-
-Like @racket[make-immutable-hash], @racket[make-immutable-hasheq], or
-@racket[make-immutable-hasheqv], depending on whether an
-@racket['equal] or @racket['eqv] @racket[flag] is provided.}
-
-@deftogether[(
-@defthing[hash-table-get procedure?]
-@defthing[hash-table-put! procedure?]
-@defthing[hash-table-remove! procedure?]
-@defthing[hash-table-count procedure?]
-@defthing[hash-table-copy procedure?]
-@defthing[hash-table-map procedure?]
-@defthing[hash-table-for-each procedure?]
-@defthing[hash-table-iterate-first procedure?]
-@defthing[hash-table-iterate-next procedure?]
-@defthing[hash-table-iterate-value procedure?]
-@defthing[hash-table-iterate-key procedure?]
-)]{
-
-The same as @racket[hash-ref], @racket[hash-set!], @racket[hash-remove!],
-@racket[hash-count],@racket[hash-copy], @racket[hash-map], @racket[hash-for-each],
-@racket[hash-iterate-first], @racket[hash-iterate-next], @racket[hash-iterate-value],
-and @racket[hash-iterate-key], respectively.}
-
-@defthing[expand-path procedure?]{
-
-The same as @racket[cleanse-path].}
-
-@defthing[list-immutable procedure?]{
-
-The same as @racket[list].}
-
-@deftogether[(
-@defproc[(collection-file-path [file path-string?] [collection path-string?] ...+) path?]
-@defproc[(collection-path [collection path-string?] ...+) path?]
-)]{
-
-Like @base-collection-file-path and @base-collection-path, but without
-the @racket[#:fail] option.}
-
-@; ----------------------------------------
-
-@section{Extra Libraries}
-
-The @racketmodname[mzscheme] library re-exports
-@racketmodname[racket/promise], @racketmodname[racket/tcp], and
-@racketmodname[racket/udp].
-
-@; ----------------------------------------
-
-@section{Omitted Forms and Functions}
-
-In addition to forms and functions that have replacements listed in
-@secref["Old_Syntactic_Forms"] and @secref["Old_Functions"], the
-following forms and functions are exported by
-@racketmodname[racket/base] but not @racketmodname[mzscheme]:
-
-@additionals[ racket/base
-compose filter sort foldl foldr
-remv remq remove remv* remq* remove* memf assf findf 
-build-vector build-string build-list
-hash-keys hash-values hash->list hash-set* hash-set*!
-hash-update hash-update!
-vector-copy! 
-thread-send thread-receive thread-try-receive thread-receive-evt
-log-fatal log-error log-warning log-info log-debug
-log-message log-level? make-logger logger? 
-current-logger logger-name make-log-receiver log-receiver?
-]
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/LICENSE.txt b/pkgs/mzscheme-pkgs/mzscheme-lib/LICENSE.txt
deleted file mode 100644
index 2dbb5bae6c..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-mzscheme-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/compiler/info.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/compiler/info.rkt
deleted file mode 100644
index 467799eab4..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/compiler/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define mzscheme-launcher-libraries (list "main.rkt"))
-(define mzscheme-launcher-names (list "mzc"))
-(define copy-man-pages '("mzc.1"))
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/compiler/main.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/compiler/main.rkt
deleted file mode 100644
index 8d3112ddbf..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/compiler/main.rkt
+++ /dev/null
@@ -1,639 +0,0 @@
-;; Starts up the compiler according to command-line flags.
-;; (c) 1997-2001 PLT
-
-;; Scheme->C compilation is the only mode really handled
-;;  by the code in this collection. Other modes are handled
-;;  by other collections, such as MzLib and dynext.
-;; If you are interested Scheme->C part of mzc, look in
-;;  "private/driver.rkt", which is the `main' file for the compiler.
-
-;; Different compilation modes are driven by dynamically
-;;  linking in appropriate libraries. This is handled
-;;  by "compiler.rkt".
-
-;; See manual for information about the Scheme-level interface
-;;  provided by this collection.
-
-#lang scheme/base
-
-;; On error, exit with 1 status code
-(error-escape-handler (lambda () (exit 1)))
-
-(error-print-width 512)
-
-(require (prefix-in compiler:option: compiler/option)
-         compiler/compiler)
-
-;; Read argv array for arguments and input file name
-(require racket/cmdline
-         dynext/file
-         scheme/pretty
-         setup/pack
-         setup/getinfo
-         setup/dirs
-	 racket/lazy-require)
-
-(lazy-require [dynext/compile (use-standard-compiler get-standard-compilers current-extension-compiler
-                               current-extension-compiler-flags current-extension-preprocess-flags
-			       compile-variant compile-extension)]
-	      [dynext/link (use-standard-linker expand-for-link-variant current-extension-linker
-			    current-extension-linker-flags current-standard-link-libraries
-			    link-variant link-extension)]
-	      [compiler/cm (managed-compile-zo)]
-	      [compiler/xform (xform)]
-	      [compiler/distribute (assemble-distribution)]
-	      [compiler/zo-parse (zo-parse)]
-	      [compiler/private/embed (mzc:embedding-executable-add-suffix write-module-bundle
-				       mzc:create-embedding-executable)]
-	      [compiler/decompile (decompile)])
-
-(define dest-dir (make-parameter #f))
-(define auto-dest-dir (make-parameter #f))
-
-(define ld-output (make-parameter #f))
-
-(define exe-output (make-parameter #f))
-(define exe-embedded-flags (make-parameter '("-U" "--")))
-(define exe-embedded-libraries (make-parameter null))
-(define exe-aux (make-parameter null))
-(define exe-embedded-config-path (make-parameter "etc"))
-(define exe-embedded-collects-path (make-parameter #f))
-(define exe-embedded-collects-dest (make-parameter #f))
-(define exe-dir-add-collects-dirs (make-parameter null))
-
-(define exe-dir-output (make-parameter #f))
-
-(define mods-output (make-parameter #f))
-
-(define module-mode (make-parameter #f))
-
-(define default-plt-name "archive")
-
-(define disable-inlining (make-parameter #f))
-(define assume-primitives (make-parameter #t))
-
-(define plt-output (make-parameter #f))
-(define plt-name (make-parameter default-plt-name))
-(define plt-files-replace (make-parameter #f))
-(define plt-files-plt-relative? (make-parameter #f))
-(define plt-files-plt-home-relative? (make-parameter #f))
-(define plt-force-install-dir? (make-parameter #f))
-(define plt-setup-collections (make-parameter null))
-(define plt-include-compiled (make-parameter #f))
-
-(define stop-at-source (make-parameter #f))
-
-(define (extract-suffix appender)
-  (bytes->string/latin-1
-   (subbytes (path->bytes (appender (bytes->path #"x"))) 1)))
-
-;; Returns (values mode files prefixes)
-;;  where mode is 'compile, 'make-zo, etc.
-(define (parse-options argv)
-  (define ((add-to-param param) f v) (param (append (param) (list v))))
-  (parse-command-line
-   "mzc"
-   argv
-   `([help-labels
-      "-------------------------------- mode flags ---------------------------------"]
-     [once-any
-      [("-k" "--make")
-       ,(lambda (f) 'make-zo)
-       ("Recursively compile Scheme source(s); uses/generates .dep files")]
-      [("--make-collection")
-       ,(lambda (f) 'collection-zos)
-       ((,(format "Makes all Scheme sources in specified collection(s)") ""))]
-      [("--exe")
-       ,(lambda (f name) (exe-output name) 'exe)
-       (,(format "Embed module in Racket to create <exe>")
-        "exe")]
-      [("--gui-exe")
-       ,(lambda (f name) (exe-output name) 'gui-exe)
-       (,(format "Embed module in GRacket to create <exe>")
-        "exe")]
-      [("--exe-dir")
-       ,(lambda (f name) (exe-dir-output name) 'exe-dir)
-       ((,(format "Combine executables with support files in <dir>") "")
-        "dir")]
-      [("--collection-plt")
-       ,(lambda (f name) (plt-output name) 'plt-collect)
-       (,(format "Create .plt <archive> containing collections")
-        "archive")]
-      [("--plt")
-       ,(lambda (f name) (plt-output name) 'plt)
-       ((,(format "Create .plt <archive> containing relative files/dirs") "")
-        "archive")]
-      [("--cc")
-       ,(lambda (f) 'cc)
-       (,(format "Compile arbitrary file(s) for an extension: ~a -> ~a"
-                 (extract-suffix append-c-suffix)
-                 (extract-suffix append-object-suffix)))]
-      [("--ld")
-       ,(lambda (f name) (ld-output name) 'ld)
-       (,(format "Link arbitrary file(s) to create <extension>: ~a -> ~a"
-                 (extract-suffix append-object-suffix)
-                 (extract-suffix append-extension-suffix))
-        "extension")]
-      [("-x" "--xform")
-       ,(lambda (f) 'xform)
-       ((,(format "Convert for 3m compilation: ~a -> ~a"
-                  (extract-suffix append-c-suffix)
-                  (extract-suffix append-c-suffix))
-         ""))]
-      [("--c-mods")
-       ,(lambda (f name) (mods-output name) 'c-mods)
-       ((,(format "Write C-embeddable module bytecode to <file>") "")
-        "file")]
-      [("--expand")
-       ,(lambda (f) 'expand)
-       ((,(format "Write macro-expanded Scheme source(s) to stdout") ""))]
-      [("-r" "--decompile")
-       ,(lambda (f) 'decompile)
-       ((,(format "Write quasi-Scheme for ~a file(s) to stdout" (extract-suffix append-zo-suffix)) ""))]
-      [("-z" "--zo")
-       ,(lambda (f) 'zo)
-       ((,(format "Output ~a file(s) from Scheme source(s)" (extract-suffix append-zo-suffix)) ""))]]
-     [help-labels ""]
-     [once-any
-      [("--3m")
-       ,(lambda (f) (compiler:option:3m #t))
-       (,(format "Compile/link for 3m, with --exe/etc.~a"
-                 (if (eq? '3m (system-type 'gc)) " [current default]" "")))]
-      [("--cgc")
-       ,(lambda (f) (compiler:option:3m #f))
-       (,(format "Compile/link for CGC, with --exe/etc.~a"
-                 (if (eq? 'cgc (system-type 'gc)) " [current default]" "")))]]
-     [once-each
-      [("-m" "--module")
-       ,(lambda (f) (module-mode #t))
-       ("Skip eval of top-level syntax, etc. for -z")]
-      [("-p" "--prefix")
-       ,(lambda (f v) v)
-       ("Add elaboration-time prefix file for -z" "file")]
-      [("-n" "--name")
-       ,(lambda (f name) (compiler:option:setup-prefix name))
-       ("Use <name> as extra part of public low-level names" "name")]]
-     [once-any
-      [("-d" "--destination")
-       ,(lambda (f d)
-          (unless (directory-exists? d)
-            (error 'mzc "the destination directory does not exist: ~s" d))
-          (dest-dir d))
-       ("Output -z/-x file(s) to <dir>" "dir")]
-      [("--auto-dir")
-       ,(lambda (f) (auto-dest-dir #t))
-       (,(format "Output -z to \"compiled\", -e to ~s"
-                 (path->string (build-path "compiled" "native"
-                                           (system-library-subpath #f)))))]]
-     [help-labels
-      "----------------------- bytecode compilation flags --------------------------"]
-     [once-each
-      [("--no-prim")
-       ,(lambda (f) (assume-primitives #f))
-       ("Do not assume `scheme' bindings at top level")]
-      [("--disable-inline")
-       ,(lambda (f) (disable-inlining #t))
-       ("Disable procedure inlining during compilation")]]
-     [help-labels
-      "--------------------- executable configuration flags ------------------------"]
-     [once-each
-      [("--config-path")
-       ,(lambda (f i)
-          (exe-embedded-config-path i))
-       ("Set <path> configuration directory path in --[gui-]exe" "path")]
-      [("--collects-path")
-       ,(lambda (f i)
-          (exe-embedded-collects-path i))
-       ("Set <path> main collects in --[gui-]exe/--exe-dir" "path")]
-      [("--collects-dest")
-       ,(lambda (f i) (exe-embedded-collects-dest i))
-       ("Add --[gui-]exe collection code to <dir>" "dir")]
-      [("--ico")
-       ,(lambda (f i) (exe-aux (cons (cons 'ico i) (exe-aux))))
-       ("Windows icon for --[gui-]exe executable" ".ico-file")]
-      [("--icns")
-       ,(lambda (f i) (exe-aux (cons (cons 'icns i) (exe-aux))))
-       ("Mac OS X icon for --[gui-]exe executable" ".icns-file")]
-      [("--orig-exe")
-       ,(lambda (f) (exe-aux (cons (cons 'original-exe? #t) (exe-aux))))
-       ("Use original executable for --[gui-]exe instead of stub")]]
-     [multi
-      [("++lib")
-       ,(lambda (f l)
-          (exe-embedded-libraries (append (exe-embedded-libraries) (list l))))
-       ("Embed <lib> in --[gui-]exe executable or --c-mods output" "lib")]
-      [("++collects-copy")
-       ,(lambda (f d)
-          (exe-dir-add-collects-dirs (append (exe-dir-add-collects-dirs) (list d))))
-       ("Add collects in <dir> to --exe-dir" "dir")]
-      [("++exf")
-       ,(add-to-param exe-embedded-flags)
-       ("Add flag to embed in --[gui-]exe executable" "flag")]
-      [("--exf")
-       ,(lambda (f v) (exe-embedded-flags (remove v (exe-embedded-flags))))
-       ("Remove flag to embed in --[gui-]exe executable" "flag")]
-      [("--exf-clear")
-       ,(lambda (f) (exe-embedded-flags null))
-       ("Clear flags to embed in --[gui-]exe executable")]
-      [("--exf-show")
-       ,(lambda (f) (printf "Flags to embed: ~s\n" (exe-embedded-flags)))
-       ("Show flag to embed in --[gui-]exe executable")]]
-     [help-labels
-      "----------------------------- .plt archive flags ----------------------------"]
-     [once-each
-      [("--plt-name")
-       ,(lambda (f n) (plt-name n))
-       ("Set the printed <name> describing the archive" "name")]
-      [("--replace")
-       ,(lambda (f) (plt-files-replace #t))
-       ("Files in archive replace existing files when unpacked")]
-      [("--at-plt")
-       ,(lambda (f) (plt-files-plt-relative? #t))
-       ("Files/dirs in archive are relative to user's add-ons directory")]]
-     [once-any
-      [("--all-users")
-       ,(lambda (f) (plt-files-plt-home-relative? #t))
-       ("Files/dirs in archive go to PLT installation if writable")]
-      [("--force-all-users")
-       ,(lambda (f) (plt-files-plt-home-relative? #t) (plt-force-install-dir? #t))
-       ("Files/dirs forced to PLT installation")]]
-     [once-each
-      [("--include-compiled")
-       ,(lambda (f) (plt-include-compiled #t))
-       ("Include \"compiled\" subdirectories in the archive")]]
-     [multi
-      [("++setup")
-       ,(lambda (f c)
-          (plt-setup-collections (append (plt-setup-collections) (list c))))
-       ("Setup <collect> after the archive is unpacked" "collect")]]
-     [help-labels
-      "------------------- compiler/linker configuration flags ---------------------"]
-     [once-each
-      [("--tool")
-       ,(lambda (f v)
-          (let ([v (string->symbol v)])
-            (use-standard-compiler v)
-            (use-standard-linker v)))
-       (,(format "Use pre-defined <tool> as C compiler/linker:~a"
-                 (apply string-append
-                        (apply append (map (lambda (t)
-                                             (list " " (symbol->string t)))
-                                           (get-standard-compilers)))))
-        "tool")]
-      [("--compiler")
-       ,(lambda (f v) (current-extension-compiler v))
-       ("Use <compiler-path> as C compiler" "compiler-path")]]
-     [multi
-      [("++ccf")
-       ,(add-to-param current-extension-compiler-flags)
-       ("Add C compiler flag" "flag")]
-      [("--ccf")
-       ,(lambda (f v)
-          (current-extension-compiler-flags
-           (remove v (current-extension-compiler-flags))))
-       ("Remove C compiler flag" "flag")]
-      [("--ccf-clear")
-       ,(lambda (f) (current-extension-compiler-flags null))
-       ("Clear C compiler flags")]
-      [("--ccf-show")
-       ,(lambda (f)
-          (printf "C compiler flags: ~s\n"
-                  (expand-for-link-variant (current-extension-compiler-flags))))
-       ("Show C compiler flags")]]
-     [once-each
-      [("--linker")
-       ,(lambda (f v) (current-extension-linker v))
-       ("Use <linker-path> as C linker" "linker-path")]]
-     [multi
-      [("++ldf")
-       ,(add-to-param current-extension-linker-flags)
-       ("Add C linker flag" "flag")]
-      [("--ldf")
-       ,(lambda (f v)
-          (current-extension-linker-flags
-           (remove v (current-extension-linker-flags))))
-       ("Remove C linker flag" "flag")]
-      [("--ldf-clear")
-       ,(lambda (f) (current-extension-linker-flags null))
-       ("Clear C linker flags")]
-      [("--ldf-show")
-       ,(lambda (f)
-          (printf "C linker flags: ~s\n"
-                  (expand-for-link-variant (current-extension-linker-flags))))
-       ("Show C linker flags")]
-      [("++ldl")
-       ,(add-to-param current-standard-link-libraries)
-       ("Add C linker library" "lib")]
-      [("--ldl-show")
-       ,(lambda (f)
-          (printf "C linker libraries: ~s\n"
-                  (expand-for-link-variant (current-standard-link-libraries))))
-       ("Show C linker libraries")]]
-     [multi
-      [("++cppf")
-       ,(add-to-param current-extension-preprocess-flags)
-       ("Add C preprocess (xform) flag" "flag")]
-      [("--cppf")
-       ,(lambda (f v)
-          (current-extension-preprocess-flags
-           (remove v (current-extension-preprocess-flags))))
-       ("Remove C preprocess (xform) flag" "flag")]
-      [("--cppf-clear")
-       ,(lambda (f) (current-extension-preprocess-flags null))
-       ("Clear C preprocess (xform) flags")]
-      [("--cppf-show")
-       ,(lambda (f)
-          (printf "C compiler flags: ~s\n"
-                  (expand-for-link-variant (current-extension-preprocess-flags))))
-       ("Show C preprocess (xform) flags")]]
-     [help-labels
-      "-------------------------- miscellaneous flags ------------------------------"]
-     [once-each
-      [("-v")
-       ,(lambda (f) (compiler:option:somewhat-verbose #t))
-       ("Slightly verbose mode, including version banner and output files")]
-      [("--vv")
-       ,(lambda (f) (compiler:option:somewhat-verbose #t) (compiler:option:verbose #t))
-       ("Very verbose mode")]])
-   (lambda (accum . files)
-     (let ([mode (let ([l (filter symbol? accum)])
-                   (if (null? l) 'make-zo (car l)))])
-       (values
-        mode
-        files
-        (let ([prefixes (filter string? accum)])
-          (unless (or (memq mode '(zo)) (null? prefixes))
-            (error 'mzc "prefix files are not useful in ~a mode" mode))
-          (if (module-mode)
-            (begin
-              (unless (null? prefixes)
-                (error 'mzc "prefix files not allowed with -m or --module"))
-              #f)
-            `(begin
-               (require scheme)
-               ,(if (assume-primitives)
-                    '(void)
-                    '(namespace-require/copy 'scheme))
-               ,@(map (lambda (s) `(load ,s)) prefixes)
-               (void)))))))
-   (list "file/directory/collection")))
-
-(define-values (mode source-files prefix)
-  (parse-options (current-command-line-arguments)))
-
-(define (compiler-warning)
-  (eprintf "Warning: ~a\n         ~a\n"
-           "compilation to C is usually less effective for performance"
-           "than relying on the bytecode just-in-time compiler."))
-
-(when (compiler:option:somewhat-verbose)
-  (printf "mzc v~a [~a], Copyright (c) 2004-2014 PLT Design Inc.\n"
-          (version)
-          (system-type 'gc)))
-
-(when (and (auto-dest-dir) (not (memq mode '(zo compile))))
-  (error 'mzc "--auto-dir works only with -z, --zo, -e, or --extension (or default mode)"))
-
-(if (compiler:option:3m)
-  (begin (link-variant '3m)  (compile-variant '3m))
-  (begin (link-variant 'cgc) (compile-variant 'cgc)))
-
-(case mode
-  [(zo)
-   ((compile-zos prefix #:verbose? (compiler:option:somewhat-verbose))
-    source-files
-    (if (auto-dest-dir) 'auto (dest-dir)))]
-  [(expand)
-   (for ([src-file source-files])
-     (let ([src-file (path->complete-path src-file)])
-       (let-values ([(base name dir?) (split-path src-file)])
-         (parameterize ([current-load-relative-directory base]
-                        [current-namespace (make-base-namespace)]
-                        [read-accept-reader #t])
-           (call-with-input-file*
-            src-file
-            (lambda (in)
-              (port-count-lines! in)
-              (let loop ()
-                (let ([e (read-syntax src-file in)])
-                  (unless (eof-object? e)
-                    (pretty-print (syntax->datum (expand e)))
-                    (loop))))))))))]
-  [(decompile)
-   (for ([zo-file source-files])
-     (let ([zo-file (path->complete-path zo-file)])
-       (let-values ([(base name dir?) (split-path zo-file)])
-         (let ([alt-file (build-path base "compiled" (path-add-suffix name #".zo"))])
-           (parameterize ([current-load-relative-directory base]
-                          [print-graph #t])
-             (pretty-print
-              (decompile
-               (call-with-input-file*
-                (if (file-exists? alt-file) alt-file zo-file)
-                (lambda (in)
-                  (zo-parse in))))))))))]
-  [(make-zo)
-   (let ([n (make-base-empty-namespace)]
-         [did-one? #f])
-     (define manager-trace-handler
-       (dynamic-require 'compiler/cm 'manager-trace-handler))
-     (define manager-compile-notify-handler
-       (dynamic-require 'compiler/cm 'manager-compile-notify-handler))
-     (parameterize ([current-namespace n]
-                    [manager-trace-handler
-                     (lambda (p)
-                       (when (compiler:option:verbose)
-                         (printf "  ~a\n" p)))]
-                    [manager-compile-notify-handler
-                     (lambda (p)
-                       (set! did-one? #t)
-                       (when (compiler:option:somewhat-verbose)
-                         (printf "  making ~s\n" (path->string p))))])
-       (for ([file source-files])
-         (unless (file-exists? file)
-           (error 'mzc "file does not exist: ~a" file))
-         (set! did-one? #f)
-         (let ([name (extract-base-filename/ss file 'mzc)])
-           (when (compiler:option:somewhat-verbose)
-             (printf "\"~a\":\n" file))
-           (parameterize ([compile-context-preservation-enabled
-                           (disable-inlining)])
-             (managed-compile-zo file))
-           (let ([dest (append-zo-suffix
-                        (let-values ([(base name dir?) (split-path file)])
-                          (build-path (if (symbol? base) 'same base)
-                                      "compiled" name)))])
-             (when (compiler:option:somewhat-verbose)
-               (printf " [~a \"~a\"]\n"
-                       (if did-one? "output to" "already up-to-date at")
-                       dest)))))))]
-  [(collection-zos)
-   (parameterize ([compile-notify-handler 
-                   (lambda (path)
-                     (when (compiler:option:somewhat-verbose)
-                       (printf "  making ~s\n" path)))])
-     (apply compile-collection-zos source-files))]
-  [(cc)
-   (for ([file source-files])
-     (let* ([base (extract-base-filename/c file 'mzc)]
-            [dest (append-object-suffix
-                   (let-values ([(base name dir?) (split-path base)])
-                     (build-path (or (dest-dir) 'same) name)))])
-       (when (compiler:option:somewhat-verbose)
-         (printf "\"~a\":\n" file))
-       (compile-extension (not (compiler:option:verbose)) file dest null)
-       (when (compiler:option:somewhat-verbose)
-         (printf " [output to \"~a\"]\n" dest))))]
-  [(ld)
-   (extract-base-filename/ext (ld-output) 'mzc)
-   ;; (for ([file source-files]) (extract-base-filename/o file 'mzc))
-   (let ([dest (if (dest-dir)
-                 (build-path (dest-dir) (ld-output))
-                 (ld-output))])
-     (when (compiler:option:somewhat-verbose)
-       (printf "~a:\n" (let ([s (apply string-append
-                                       (map (lambda (n) (format " \"~a\"" n))
-                                            source-files))])
-                         (substring s 1 (string-length s)))))
-     (link-extension (not (compiler:option:verbose))
-                     source-files
-                     dest)
-     (when (compiler:option:somewhat-verbose)
-       (printf " [output to \"~a\"]\n" dest)))]
-  [(xform)
-   (for ([file source-files])
-     (let* ([out-file (path-replace-suffix file ".3m.c")]
-            [out-file  (if (dest-dir)
-                         (build-path (dest-dir) out-file)
-                         out-file)])
-       (xform
-        (not (compiler:option:verbose))
-        file
-        out-file
-        (list (find-include-dir)))
-       (when (compiler:option:somewhat-verbose)
-         (printf " [output to \"~a\"]\n" out-file))))]
-  [(exe gui-exe)
-   (unless (= 1 (length source-files))
-     (error 'mzc "expected a single module source file to embed; given: ~e"
-            source-files))
-   (let ([dest (mzc:embedding-executable-add-suffix
-                (exe-output)
-                (eq? mode 'gui-exe))])
-     (mzc:create-embedding-executable
-      dest
-      #:mred? (eq? mode 'gui-exe)
-      #:variant (if (compiler:option:3m) '3m 'cgc)
-      #:verbose? (compiler:option:verbose)
-      #:modules (cons `(#%mzc: (file ,(car source-files)))
-                      (map (lambda (l) `(#t (lib ,l)))
-                           (exe-embedded-libraries)))
-      #:configure-via-first-module? #t
-      #:literal-expression
-      (parameterize ([current-namespace (make-base-namespace)])
-        (compile
-         `(namespace-require
-           '',(string->symbol
-               (format "#%mzc:~a"
-                       (let-values ([(base name dir?)
-                                     (split-path (car source-files))])
-                         (path->bytes (path-replace-suffix name #""))))))))
-      #:cmdline (exe-embedded-flags)
-      #:collects-path (exe-embedded-collects-path)
-      #:collects-dest (exe-embedded-collects-dest)
-      #:aux (cons `(config-dir . ,(exe-embedded-config-path))
-                  (exe-aux)))
-     (when (compiler:option:somewhat-verbose)
-       (printf " [output to \"~a\"]\n" dest)))]
-  [(c-mods)
-   (let ([dest (mods-output)])
-     (let-values ([(in out) (make-pipe)])
-       (parameterize ([current-output-port out])
-         (write-module-bundle
-          #:modules
-          (append (map (lambda (l) `(#f (file ,l))) source-files)
-             (map (lambda (l) `(#t (lib ,l))) (exe-embedded-libraries)))))
-       (close-output-port out)
-       (let ([out (open-output-file dest #:exists 'truncate/replace)])
-         (fprintf out "#ifdef MZ_XFORM\n")
-         (fprintf out "XFORM_START_SKIP;\n")
-         (fprintf out "#endif\n")
-         (fprintf out "static void declare_modules(Scheme_Env *env) {\n")
-         (fprintf out "  static unsigned char data[] = {")
-         (let loop ([pos 0])
-           (let ([b (read-byte in)])
-             (when (zero? (modulo pos 20)) (fprintf out "\n    "))
-             (unless (eof-object? b) (fprintf out "~a," b) (loop (add1 pos)))))
-         (fprintf out "0\n  };\n")
-         (fprintf out "  Scheme_Object *eload = NULL, *a[3] = {NULL, NULL, NULL};\n")
-         (fprintf out "  MZ_GC_DECL_REG(4);\n")
-         (fprintf out "  MZ_GC_VAR_IN_REG(0, eload);\n")
-         (fprintf out "  MZ_GC_ARRAY_VAR_IN_REG(1, a, 3);\n")
-         (fprintf out "  MZ_GC_REG();\n")
-         (fprintf out "  eload = scheme_builtin_value(\"embedded-load\");\n")
-         (fprintf out "  a[0] = scheme_false;\n")
-         (fprintf out "  a[1] = scheme_false;\n")
-         (fprintf out "  a[2] = scheme_make_sized_byte_string((char *)data, ~a, 0);\n"
-                  (file-position in))
-         (fprintf out "  scheme_apply(eload, 3, a);\n")
-         (fprintf out "  MZ_GC_UNREG();\n")
-         (fprintf out "}\n")
-         (fprintf out "#ifdef MZ_XFORM\n")
-         (fprintf out "XFORM_END_SKIP;\n")
-         (fprintf out "#endif\n")
-         (close-output-port out)))
-     (when (compiler:option:somewhat-verbose)
-       (printf " [output to \"~a\"]\n" dest)))]
-  [(exe-dir)
-   (assemble-distribution
-    (exe-dir-output)
-    source-files
-    #:collects-path (exe-embedded-collects-path)
-    #:copy-collects (exe-dir-add-collects-dirs))
-   (when (compiler:option:somewhat-verbose)
-     (printf " [output to \"~a\"]\n" (exe-dir-output)))]
-  [(plt)
-   (for ([fd source-files])
-     (unless (relative-path? fd)
-       (error 'mzc
-              "file/directory is not relative to the current directory: \"~a\""
-              fd)))
-   (pack-plt (plt-output) (plt-name)
-             source-files
-             #:collections (map list (plt-setup-collections))
-             #:file-mode (if (plt-files-replace) 'file-replace 'file)
-             #:plt-relative? (or (plt-files-plt-relative?)
-                                 (plt-files-plt-home-relative?))
-             #:at-plt-home? (plt-files-plt-home-relative?)
-             #:test-plt-dirs (if (or (plt-force-install-dir?)
-                                     (not (plt-files-plt-home-relative?)))
-                               #f
-                               '("collects" "doc" "include" "lib"))
-             #:requires
-             ;; Get current version of mzscheme for require:
-             (let* ([i (get-info '("mzscheme"))]
-                    [v (and i (i 'version (lambda () #f)))])
-               (list (list '("mzscheme") v))))
-   (when (compiler:option:somewhat-verbose)
-     (printf " [output to \"~a\"]\n" (plt-output)))]
-  [(plt-collect)
-   (pack-collections-plt
-    (plt-output)
-    (if (eq? default-plt-name (plt-name)) #f (plt-name))
-    (map (lambda (sf)
-           (let loop ([sf sf])
-             (let ([m (regexp-match "^([^/]*)/(.*)$" sf)])
-               (if m (cons (cadr m) (loop (caddr m))) (list sf)))))
-         source-files)
-    #:replace? (plt-files-replace)
-    #:extra-setup-collections (map list (plt-setup-collections))
-    #:file-filter (if (plt-include-compiled)
-                    (lambda (path)
-                      (or (regexp-match #rx#"compiled$" (path->bytes path))
-                          (std-filter path)))
-                    std-filter)
-    #:at-plt-home? (plt-files-plt-home-relative?)
-    #:test-plt-collects? (not (plt-force-install-dir?)))
-   (when (compiler:option:somewhat-verbose)
-     (printf " [output to \"~a\"]\n" (plt-output)))]
-  [else (printf "bad mode: ~a\n" mode)])
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/compiler/mzc.1 b/pkgs/mzscheme-pkgs/mzscheme-lib/compiler/mzc.1
deleted file mode 100644
index ec2a4d824d..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/compiler/mzc.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\" dummy line
-.TH MZC 1 "May 2010"
-.UC 4
-.SH NAME
-mzc \- compatibility Racket compiler tool
-.SH SYNOPSIS
-.B mzc
-[
-.I option ...
-] [
-.I argument ...
-]
-.SH DESCRIPTION
-.B mzc
-provides an old interface to some Racket tools that are now
-normally provided via
-.BR raco .
-
-.PP
-Run
-.PP
-   mzc --help
-.PP
-for a list of command-line options.
-
-.SH MORE INFORMATION
-For further information, run
-.PP
-   raco docs
-.PP
-to open installed documentation in your web browser.
-
-.PP
-Alternately, consult the on-line
-documentation and other information available at
-.PP
-.ce 1
-http://racket-lang.org/
-
-.SH SEE ALSO
-.BR raco(1),
-.BR racket(1)
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/info.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/info.rkt
deleted file mode 100644
index fb3c0cc9b0..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("scheme-lib"
-               "base"))
-
-(define pkg-desc "implementation (no documentation) part of \"mzscheme\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/README b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/README
deleted file mode 100644
index a90d33a2da..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/README
+++ /dev/null
@@ -1,61 +0,0 @@
-This directory contains a few example Racket extensions. Most
-examples are implemented directly in C. A few examples listed at the
-end use the mzc `c-lambda', etc. forms.
-
- * hello.c - returns the string "Hello, World!". Demonstrates creating
-   a Scheme value.
-
- * fmod.c - defines the `fmod' procedure, which calculates modulo on
-   floating-point numbers. Demonstrates creating Scheme procedures
-   from C and adding top-level definitions. (Manually instrumented for
-   3m, so do not use `mzc --xform'.)
-
- * curses.c - links Racket to the curses library. Demonstrates more
-   procedures and definitions, a little more type dispatching, and
-   returning multiple values. (Manually instrumented for 3m, so do not
-   use `mzc --xform'.)
-
- * makeadder.c - defines `make-adder', which takes a number and
-   returns a procedure that takes another number to add to
-   it. Demonstrates closure creation in C, getting Scheme global
-   values, and calling Scheme procedures from C.
-
-   makeadder3m.c - the same, but manually instrumented 3m (so do not
-   use `mzc --xform'). Making the code work with 3m requires several
-   changes, but `mzc --xform' works on "makeadder.c" without changes.
-
- * catch.c - defined `eval-string/catch-error', which catches
-   exceptions while evaluating a string. Demonstrates how to catch
-   exceptions from C code.
-
- * bitmatrix.c - implements two-dimensional bit matrixes with some
-   operations. Demonstrates defining a new Scheme data type, data
-   allocation, fancy integer type checking, general exception raising,
-   and registering static variables. Also demonstrates supplying
-   traversal functions for 3m (but still needs `mzc --xform'
-   preprocessing to build for 3m).
-
- * idmodule.c - Declares the module named `idmodule' that provides an
-   `identity' function. Demonstrates implementing a primitive module
-   in C.
-
- * helloprint.c - prints "Hello, World!" directly to the current
-   output port rather than relying on the read-eval-print-loop.
-   Demonstrates using built-in Scheme parameter values from C.
-
- * tree.cxx, tree-finish.ss - shows how to inject a C++ class into
-   MzLib's class.ss world. (Does not work with 3m.)
-
-
- * fmod-ez.ss - same as fmod.c, but with 10% of the code. Demonstrates
-   `c-lambda'.
-
- * cfile.ss - simple (and unsafe) glue to the fopen(), fread(),
-   fwrite(), and fclose() C library functions. Demonstrates the use of
-   `(pointer ...)' types. Technically, this example is broken for 3m,
-   because fclose() frees the FILE* pointer, and it's possible that
-   the GC will later try to use the same memory.
-
- * msgbox.ss - a Windows-only example, provides a `message-box'
-   procedure. Demonstrates some of the limitations of `c-lambda' and
-   how to work around them.
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/bitmatrix.c b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/bitmatrix.c
deleted file mode 100644
index ff906c8462..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/bitmatrix.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/* 
-
-   This extension Defines a new type of Scheme data: a two-dimensional
-   matrix of bits.
-   
-   A client using this extension would look something like this:
-
-      (load-extension "bitmatrix.so")
-      (define bm (make-bit-matrix 1000 1000))
-      ...
-      (bit-matrix-set! bm 500 500 #t)
-      ...
-      (if (bit-matrix-get bm 500 500) ...)
-      ...
-
-*/
-
-#include "escheme.h"
-
-/* Instances of this Bitmatrix structure will be the Scheme bit matirx
-   values: */
-typedef struct {
-  Scheme_Object so; /* Every Scheme value starts with a Scheme_Object,
-                       which stars with a type tag.  The
-		       format for the rest of the structure is
-		       anything we want it to be. */
-  unsigned long w, h, l; /* l = w rounded to multiple of LONG_SIZE */
-  unsigned long *matrix;
-} Bitmatrix;
-
-#ifdef MZ_PRECISE_GC
-START_XFORM_SKIP;
-/* Traversal procedures for precise GC: */
-static int bm_size(void *p) { 
-  return gcBYTES_TO_WORDS(sizeof(Bitmatrix)); 
-}
-static int bm_mark(void *p) { 
-  gcMARK(((Bitmatrix *)p)->matrix);
-  return gcBYTES_TO_WORDS(sizeof(Bitmatrix));
-}
-static int bm_fixup(void *p) { 
-  gcFIXUP(((Bitmatrix *)p)->matrix);
-  return gcBYTES_TO_WORDS(sizeof(Bitmatrix));
-}
-END_XFORM_SKIP;
-#endif
-
-/* We'll get some Scheme primitives so we can calculate with numbers
-   that are potentially bignums: */
-static Scheme_Object *mult, *add, *sub, *modulo, *neg;
-
-/* The type tag for bit matrixes, initialized with scheme_make_type */
-static Scheme_Type bitmatrix_type;
-
-#define LONG_SIZE 32
-#define LOG_LONG_SIZE 5
-#define LONG_SIZE_PER_BYTE 4
-
-# define FIND_BIT(p) (1 << (p & (LONG_SIZE - 1)))
-
-/* Helper function to check whether an integer (fixnum or bignum) is
-   negative: */
-static int negative(Scheme_Object *o)
-{
-  return SCHEME_TRUEP(_scheme_apply(neg, 1, &o));
-}
-
-/* Scheme procedure to make a bit matrix: */
-Scheme_Object *make_bit_matrix(int argc, Scheme_Object **argv)
-{
-  Scheme_Object *size, *rowlength, *a[2];
-  unsigned long w, h, s, l, *lp;
-  Bitmatrix *bm;
-
-  /* Really fancy: we allow any kind of positive integer for
-     specifying the size of a bit matrix. If we get a bignum (or the
-     resulting matrix size is a bignum), we'll signal an out-of-memory
-     exception. */
-  if ((!SCHEME_INTP(argv[0])  && !SCHEME_BIGNUMP(argv[0]))
-      || negative(argv[0]))
-    scheme_wrong_type("make-bit-matrix", "positive integer", 0, argc, argv);
-  if ((!SCHEME_INTP(argv[1])  && !SCHEME_BIGNUMP(argv[1]))
-      || (negative(argv[1])))
-    scheme_wrong_type("make-bit-matrix", "positive integer", 1, argc, argv);
-
-  a[0] = argv[0];
-  a[1] = scheme_make_integer(LONG_SIZE - 1);
-  /* Apply the Scheme `add' procedure to argv[0] and argv[1]. Note the
-     "_" in "_scheme_apply"; that's a lot faster than "scheme_apply",
-     and we know that no continuation jumps will occur (although it
-     would be fine if one did. */
-  a[0] = _scheme_apply(add, 2, a);
-  a[1] = scheme_make_integer(LONG_SIZE);
-  a[1] = _scheme_apply(modulo, 2, a);
-  a[0] = _scheme_apply(sub, 2, a);
-  rowlength = a[0];
-  a[1] = argv[1];
-  size = _scheme_apply(mult, 2, a);
-  if (SCHEME_BIGNUMP(size))
-    /* Use scheme_raise_exn to raise exceptions. The first argument
-       describes the type of the exception. After an exception-specific
-       number of Scheme values (none in this case), the rest of the
-       arguments are like printf. */
-    scheme_raise_exn(MZEXN_FAIL, "make-bit-matrix: out of memory");
-  
-  s = SCHEME_INT_VAL(size);
-  w = SCHEME_INT_VAL(argv[0]);
-  h = SCHEME_INT_VAL(argv[1]);
-  l = SCHEME_INT_VAL(rowlength);
-
-  /* Malloc the bit matrix structure. Since we use scheme_malloc, the
-     bit matrix value is GC-able. */
-  bm = (Bitmatrix *)scheme_malloc_tagged(sizeof(Bitmatrix));
-  bm->so.type = bitmatrix_type;
-
-  /* Try to allocate the bit matrix. Handle failure gracefully. Note
-     that we use scheme_malloc_atomic since the allocated memory will
-     never contain pointers to GC-allocated memory. */
-  s = ((s + LONG_SIZE - 1) >> LOG_LONG_SIZE);
-  lp = (unsigned long *)scheme_malloc_fail_ok(scheme_malloc_atomic, 
-					      sizeof(long) * s);
-  if (!lp)
-    scheme_raise_exn(MZEXN_FAIL, "make-bit-matrix: out of memory");
-  bm->matrix = lp;
-
-  bm->w = w;
-  bm->h = h;
-  bm->l = l;
-
-  /* Init matirx to all 0s: */
-  while (s--) {
-    bm->matrix[s] = 0;
-  }
-
-  return (Scheme_Object *)bm;
-}
-
-/* Internal utility function for error-checking with a fancy error
-   message: */
-static void range_check_one(char *name, char *which, 
-			    int l, int h, int startpos, 
-			    int argc, Scheme_Object **argv)
-{
-  int bad1;
-
-  if (SCHEME_BIGNUMP(argv[startpos])) {
-    bad1 = 1;
-  } else {
-    int v = SCHEME_INT_VAL(argv[startpos]);
-    bad1 = ((v < l) || (v > h));
-  }
-
-  if (bad1) {
-    /* A mismatch exception requires one Scheme value, so we provide
-       it before the printf string: */
-    char *args;
-    long argslen;
-
-    args = scheme_make_args_string("other ", startpos, argc, argv, &argslen);
-    scheme_raise_exn(MZEXN_FAIL_CONTRACT,
-		     "%s: %s index %s is not in the range [%d,%d]%t",
-		     name, which,
-		     scheme_make_provided_string(argv[startpos], 1, NULL),
-		     l, h,
-		     args,
-		     argslen);
-  }
-}
-
-/* Internal utility function that implements most of the work of the
-   get- and set- Scheme procedures: */
-static Scheme_Object *do_bit_matrix(char *name, int get, int argc, Scheme_Object **argv)
-{
-  Bitmatrix *bm;
-  unsigned long x, y, p, v, m;
-
-  if (SCHEME_TYPE(argv[0]) != bitmatrix_type)
-    scheme_wrong_type(name, "bit-matrix", 0, argc, argv);
-  if (!SCHEME_INTP(argv[1])  && !SCHEME_BIGNUMP(argv[1]))
-    scheme_wrong_type(name, "integer", 1, argc, argv);
-  if (!SCHEME_INTP(argv[2])  && !SCHEME_BIGNUMP(argv[2]))
-    scheme_wrong_type(name, "integer", 2, argc, argv);
-
-  /* After checking that argv[0] has te bitmatrix_type tag, we can safely perform
-     a cast to Bitmatrix*: */
-  bm = (Bitmatrix *)argv[0];
-
-  range_check_one(name, "first", 0, bm->w - 1, 1, argc, argv);
-  range_check_one(name, "second", 0, bm->h - 1, 2, argc, argv);
-
-  x = SCHEME_INT_VAL(argv[1]);
-  y = SCHEME_INT_VAL(argv[2]);
-
-  p = y * bm->l + x;
-  m = FIND_BIT(p);
-  v = bm->matrix[p >> LOG_LONG_SIZE];
-  if (get) {
-    return (v & m) ? scheme_true : scheme_false;
-  } else {
-    if (SCHEME_TRUEP(argv[3]))
-      bm->matrix[p >> LOG_LONG_SIZE] = (v | m);
-    else
-      bm->matrix[p >> LOG_LONG_SIZE] = (v - (v & m));
-    return scheme_void;
-  }
-}
-
-/* Scheme procedure: get a bit from the matrix */
-Scheme_Object *bit_matrix_get(int argc, Scheme_Object **argv)
-{
-  return do_bit_matrix("bit-matrix-get", 1, argc, argv);
-}
-
-/* Scheme procedure: set a bit in the matrix */
-Scheme_Object *bit_matrix_set(int argc, Scheme_Object **argv)
-{
-  return do_bit_matrix("bit-matrix-set!", 0, argc, argv);
-}
-
-/* Scheme procedure: invert the whole matrix */
-Scheme_Object *bit_matrix_invert(int argc, Scheme_Object **argv)
-{
-  Bitmatrix *bm;
-  unsigned long i;
-
-  if (SCHEME_TYPE(argv[0]) != bitmatrix_type)
-    scheme_wrong_type("bit-matrix-invert!", "bit-matrix", 0, argc, argv);
-
-  bm = (Bitmatrix *)argv[0];
-  
-  i = (bm->l * bm->h) >> LOG_LONG_SIZE;
-  while (i--) {
-    bm->matrix[i] = ~bm->matrix[i];
-  }
-
-  return scheme_void;
-}
-
-/* Scheme procedure: clear the whole matrix */
-Scheme_Object *bit_matrix_clear(int argc, Scheme_Object **argv)
-{
-  char *name = "bit-matrix-clear!";
-  Bitmatrix *bm;
-  unsigned long i;
-
-  if (SCHEME_TYPE(argv[0]) != bitmatrix_type)
-    scheme_wrong_type(name, "bit-matrix", 0, argc, argv);
-
-  bm = (Bitmatrix *)argv[0];
-
-  i = (bm->l * bm->h) >> LOG_LONG_SIZE;
-  while (i--) {
-    bm->matrix[i] = 0;
-  }
-
-  return scheme_void;
-}
-
-Scheme_Object *scheme_reload(Scheme_Env *env)
-{
-  /* Define our new primitives: */
-
-  scheme_add_global("make-bit-matrix",
-		    scheme_make_prim_w_arity(make_bit_matrix,
-					     "make-bit-matrix",
-					     2, 2),
-		    env);
-
-  scheme_add_global("bit-matrix-get",
-		    scheme_make_prim_w_arity(bit_matrix_get,
-					     "bit-matrix-get",
-					     3, 3),
-		    env);
-
-  scheme_add_global("bit-matrix-set!",
-		    scheme_make_prim_w_arity(bit_matrix_set,
-					     "bit-matrix-set!",
-					     4, 4),
-		    env);
-
-  scheme_add_global("bit-matrix-invert!",
-		    scheme_make_prim_w_arity(bit_matrix_invert,
-					     "bit-matrix-invert!",
-					     1, 1),
-		    env);
-
-  scheme_add_global("bit-matrix-clear!",
-		    scheme_make_prim_w_arity(bit_matrix_clear,
-					     "bit-matrix-clear!",
-					     1, 1),
-		    env);
-
-  return scheme_void;
-}
-
-Scheme_Object *scheme_initialize(Scheme_Env *env)
-{
-  bitmatrix_type = scheme_make_type("<bit-matrix>");
-
-#ifdef MZ_PRECISE_GC
-  /* Register traversal procedures: */
-  GC_register_traversers(bitmatrix_type, bm_size, bm_mark, bm_fixup, 1, 0);
-#endif
-
-  /* Get some Scheme primitives. Conservative garbage collection sees
-     any local variables we use within a function, but we have to register
-     static variables: */
-
-  scheme_register_extension_global(&mult, sizeof(Scheme_Object*));
-  mult = scheme_builtin_value("*");
-
-  scheme_register_extension_global(&add, sizeof(Scheme_Object*));
-  add = scheme_builtin_value("+");
-
-  scheme_register_extension_global(&sub, sizeof(Scheme_Object*));
-  sub = scheme_builtin_value("-");
-
-  scheme_register_extension_global(&modulo, sizeof(Scheme_Object*));
-  modulo = scheme_builtin_value("modulo");
-
-  scheme_register_extension_global(&neg, sizeof(Scheme_Object*));
-  neg = scheme_builtin_value("negative?");
-
-  return scheme_reload(env);
-}
-
-
-Scheme_Object *scheme_module_name()
-{
-  /* This extension doesn't define a module: */
-  return scheme_false;
-}
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/catch.c b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/catch.c
deleted file mode 100644
index 15ada50b25..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/catch.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* 
-   Racket extension example that catches exceptions and extracts
-   error messages.
-
-   The defined function is `eval-string/catch-error', which takes a
-   string and evaluates it, returning either the value, a string for
-   the error message, and a non-exn value raised by the expression.
-
-  > (eval-string/catch-error "10")
-  10
-
-  > (eval-string/catch-error "(+ 'a)")
-  "+: expects argument of type <number>; given a"
-
-  > (eval-string/catch-error "(raise 'ack)")
-  ack
-
-*/
-
-#include "escheme.h"
-
-/*********************************************************************/
-/* Exception-catching code                                           */
-/*********************************************************************/
-
-/* These must be registered with the memory manager: */
-static Scheme_Object *exn_catching_apply, *exn_p, *exn_message;
-
-static void init_exn_catching_apply()
-{
-  if (!exn_catching_apply) {
-    Scheme_Env *env;
-    char *e = 
-      "(lambda (thunk) "
-	"(with-handlers ([void (lambda (exn) (cons #f exn))]) "
-	  "(cons #t (thunk))))";
-
-    /* make sure we have a namespace with the standard bindings: */
-    env = (Scheme_Env *)scheme_make_namespace(0, NULL);
-
-    scheme_register_extension_global(&exn_catching_apply, sizeof(Scheme_Object *));
-    scheme_register_extension_global(&exn_p, sizeof(Scheme_Object *));
-    scheme_register_extension_global(&exn_message, sizeof(Scheme_Object *));
-    
-    exn_catching_apply = scheme_eval_string(e, env);
-    exn_p = scheme_lookup_global(scheme_intern_symbol("exn?"), env);
-    exn_message = scheme_lookup_global(scheme_intern_symbol("exn-message"), env);
-  }
-}
-
-/* This function applies a thunk, returning the Scheme value if there's no exception, 
-   otherwise returning NULL and setting *exn to the raised value (usually an exn 
-   structure). */
-Scheme_Object *_apply_thunk_catch_exceptions(Scheme_Object *f, Scheme_Object **exn)
-{
-  Scheme_Object *v;
-
-  init_exn_catching_apply();
-  
-  v = _scheme_apply(exn_catching_apply, 1, &f);
-  /* v is a pair: (cons #t value) or (cons #f exn) */
-
-  if (SCHEME_TRUEP(SCHEME_CAR(v)))
-    return SCHEME_CDR(v);
-  else {
-    *exn = SCHEME_CDR(v);
-    return NULL;
-  }
-}
-
-Scheme_Object *extract_exn_message(Scheme_Object *v)
-{
-  init_exn_catching_apply();
-
-  if (SCHEME_TRUEP(_scheme_apply(exn_p, 1, &v)))
-    return _scheme_apply(exn_message, 1, &v);
-  else
-    return NULL; /* Not an exn structure */
-}
-
-/*********************************************************************/
-/* Use of example exception-catching code                            */
-/*********************************************************************/
-
-static Scheme_Object *do_eval(void *s, int noargc, Scheme_Object **noargv)
-{
-  return scheme_eval_string((char *)s, scheme_get_env(NULL));
-}
-
-static Scheme_Object *eval_string_or_get_exn_message(char *s)
-{
-  Scheme_Object *v, *exn;
-
-  v = _apply_thunk_catch_exceptions(scheme_make_closed_prim(do_eval, s), &exn);
-  /* Got a value? */
-  if (v)
-    return v;
-
-  v = extract_exn_message(exn);
-  /* Got an exn? */
-  if (v)
-    return v;
-
-  /* `raise' was called on some arbitrary value */
-  return exn;
-}
-
-static Scheme_Object *catch_eval_error(int argc, Scheme_Object **argv)
-{
-  Scheme_Object *bs;
-
-  if (!SCHEME_CHAR_STRINGP(argv[0]))
-    scheme_wrong_type("eval-string/catch-error", "string", 0, argc, argv);
-
-  bs = scheme_char_string_to_byte_string(argv[0]);
-  
-  return eval_string_or_get_exn_message(SCHEME_BYTE_STR_VAL(bs));
-}
-
-/*********************************************************************/
-/* Initialization                                                    */
-/*********************************************************************/
-
-Scheme_Object *scheme_reload(Scheme_Env *env)
-{
-  scheme_add_global("eval-string/catch-error",
-		    scheme_make_prim_w_arity(catch_eval_error,
-					     "eval-string/catch-error", 
-					     1, 1),
-		    env);
-
-  return scheme_void;
-}
-
-Scheme_Object *scheme_initialize(Scheme_Env *env)
-{
-  /* First load is same as every load: */
-  return scheme_reload(env);
-}
-
-Scheme_Object *scheme_module_name()
-{
-  /* This extension doesn't define a module: */
-  return scheme_false;
-}
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/cfile.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/cfile.rkt
deleted file mode 100644
index 0156b2008c..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/cfile.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-;; Direct access to fopen, fread, fwrite, and fclose. The interface is
-;;  not remotely safe, since #f is accepted (and converted to NULL)
-;;  for `(pointer "FILE")' arguments. Also, blocking reads or writes
-;;  will block all Racket threads.
-
-(c-declare "#include <stdio.h>")
-
-(define fopen
-  (c-lambda (char-string char-string) (pointer "FILE") "fopen"))
-(define fread
-  (c-lambda (char-string long long (pointer "FILE")) long "fread"))
-(define fwrite
-  (c-lambda (char-string long long (pointer "FILE")) long "fwrite"))
-(define fclose
-  (c-lambda ((pointer "FILE")) int "fclose"))
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/curses-demo.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/curses-demo.rkt
deleted file mode 100644
index 671108abcf..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/curses-demo.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-; Uses the curses.so extension. Run with
-;    racket -r curses-demo.rkt
-
-; To get append-extension-suffix, which adds .so or .dll as
-; approrpiate for the current platform:
-(require dynext/file)
-
-; Load the curses extension
-(load-extension (append-extension-suffix "curses"))
-
-; Screen is initialize. Let's go!
-(move 8 10)
-(put "Hello, World!")
-(put #\newline)
-(put "Hit any key to continue.")
-(refresh)
-
-(get)
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/curses.c b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/curses.c
deleted file mode 100644
index eed92a3a3c..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/curses.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-  Extension that uses the curses library.
-
-  Link the extension to the curses library like this:
-     mzc --xform curses.c
-     mzc --3m --cc curses.3m.c
-     mzc --3m --ld curses.so curses_3m.o -lcurses
-
-  For obvious reasons, this library doesn't interact well
-  with Racket's read-eval-print loop. The example file
-  curses-demo.ss demos this extension.
-*/
-
-#include "escheme.h"
-#include <curses.h>
-
-/**************************************************/
-
-static Scheme_Object *sch_clear(int argc, Scheme_Object **argv)
-{
-  clear();
-}
-
-static Scheme_Object *sch_put(int argc, Scheme_Object **argv)
-{
-  /* Puts a char or string on the screen */
-  if (SCHEME_CHARP(argv[0]))
-    addch(SCHEME_CHAR_VAL(argv[0]));
-  else if (SCHEME_BYTE_STRINGP(argv[0]))
-    addstr(SCHEME_BYTE_STR_VAL(argv[0]));
-  else if (SCHEME_CHAR_STRINGP(argv[0])) {
-    Scheme_Object *bs;
-    bs = scheme_char_string_to_byte_string(argv[0]);
-    addstr(SCHEME_BYTE_STR_VAL(bs));
-  } else
-    scheme_wrong_type("put", "character, string, or byte string", 0, argc, argv);
-
-  return scheme_void;
-}
-
-static Scheme_Object *sch_get(int argc, Scheme_Object **argv)
-{
-  /* Gets keyboard input */
-  int c;
-  c = getch();
-  return scheme_make_character(c);
-}
-
-static Scheme_Object *sch_move(int argc, Scheme_Object **argv)
-{
-  /* Move the output cursor */
-  if (!SCHEME_INTP(argv[0]))
-    scheme_wrong_type("move", "exact integer", 0, argc, argv);
-  if (!SCHEME_INTP(argv[1]))
-    scheme_wrong_type("move", "exact integer", 1, argc, argv);
-
-  move(SCHEME_INT_VAL(argv[0]), SCHEME_INT_VAL(argv[1]));
-
-  return scheme_void;
-}
-
-static Scheme_Object *sch_get_size(int argc, Scheme_Object **argv)
-{
-  /* Returns two values */
-  int w, h;
-  Scheme_Object *a[2];
-
-  w = getmaxx(stdscr);
-  h = getmaxy(stdscr);
-
-  a[0] = scheme_make_integer(w);
-  a[1] = scheme_make_integer(h);
-  return scheme_values(1, a);
-}
-
-static Scheme_Object *sch_refresh(int argc, Scheme_Object **argv)
-{
-  refresh();
-  return scheme_void;
-}
-
-/**************************************************/
-
-Scheme_Object *scheme_reload(Scheme_Env *env)
-{
-  /* The MZ_GC... lines are for for 3m, because env is live across an
-     allocating call. They're not needed for plain old (conservatively
-     collected) Mzscheme. See makeadder3m.c for more info. */
-  Scheme_Object *v;
-  /* Old annotations, are they needed?
-  MZ_GC_DECL_REG(1);
-  MZ_GC_VAR_IN_REG(0, env);
-  MZ_GC_REG();
-  */
-
-  v = scheme_make_prim_w_arity(sch_clear, "clear", 0, 0),
-  scheme_add_global("clear", v, env);
-
-  v = scheme_make_prim_w_arity(sch_put, "put", 1, 1);
-  scheme_add_global("put", v, env);
-
-  v = scheme_make_prim_w_arity(sch_get, "get", 0, 0);
-  scheme_add_global("get", v, env);
-
-  v = scheme_make_prim_w_arity(sch_move, "move", 2, 2);
-  scheme_add_global("move", v, env);
-
-  v = scheme_make_prim_w_arity(sch_get_size, "get-size", 0, 0);
-  scheme_add_global("get-size", v, env);
-
-  v = scheme_make_prim_w_arity(sch_refresh, "refresh", 0, 0);
-  scheme_add_global("refresh", v, env);
-
-  MZ_GC_UNREG();
-
-  return scheme_void;
-}
-
-Scheme_Object *scheme_initialize(Scheme_Env *env)
-{
-  /* The first time we're loaded, initialize the screen: */
-  initscr();
-  cbreak();
-  noecho();
-  atexit(endwin);
-
-  /* Then do the usual stuff: */
-  return scheme_reload(env);
-}
-
-Scheme_Object *scheme_module_name()
-{
-  /* This extension doesn't define a module: */
-  return scheme_false;
-}
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/fmod-ez.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/fmod-ez.rkt
deleted file mode 100644
index 823a276233..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/fmod-ez.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-(c-declare "#include <math.h>")
-
-(define fmod (c-lambda (double double) double "fmod"))
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/fmod.c b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/fmod.c
deleted file mode 100644
index 5666073401..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/fmod.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-  Extension that defines fmod, modulo on floating-point numbers.
-  The extension is equivalent to Scheme source of them form:
-    (define (fmod a b) ...)
-*/
-
-#include "escheme.h"
-#include <math.h>
-
-/**************************************************/
-
-/* Every C implementation of a Scheme function takes argc and an array
-   of Scheme_Object* values for argv, and returns a Scheme_Object*: */
-static Scheme_Object *sch_fmod(int argc, Scheme_Object **argv)
-{
-  /* Because we'll use scheme_make_prim_w_arity, Racket will
-     have already checked that we're getting the right number of
-     arguments. */
-  Scheme_Object *a = argv[0], *b = argv[1];
-  double v;
-
-  /* Make sure we got real numbers, and complain if not: */
-  if (!SCHEME_REALP(a))
-    scheme_wrong_type("fmod", "real number", 0, argc, argv);
-  /*                       1st arg wrong ----^ */
-  if (!SCHEME_REALP(b))
-    scheme_wrong_type("fmod", "real number", 1, argc, argv);
-  /*                       2nd arg wrong ----^ */
-
-  /* Convert the Scheme numbers to double-precision floating point
-     numbers, and compute fmod: */
-  v = fmod(scheme_real_to_double(a),
-	   scheme_real_to_double(b));
-
-  /* Return the result, packaging it as a Scheme value: */
-  return scheme_make_double(v);
-}
-
-/**************************************************/
-
-Scheme_Object *scheme_reload(Scheme_Env *env)
-{
-  Scheme_Object *proc;
-
-  /* The MZ_GC... lines are for for 3m, because env is live across an
-     allocating call. They're not needed for plain old (conservatively
-     collected) Mzscheme. See makeadder3m.c for more info. */
-  MZ_GC_DECL_REG(1);
-  MZ_GC_VAR_IN_REG(0, env);
-  MZ_GC_REG();
-
-  /* Package the C implementation of fmod into a Scheme procedure
-     value: */
-  proc = scheme_make_prim_w_arity(sch_fmod, "fmod", 2, 2);
-  /*               Requires at least two args ------^  ^ */
-  /*                  Accepts no more than two args ---| */
-
-  /* Define `fmod' as a global :*/
-  scheme_add_global("fmod", proc, env);
-
-  MZ_GC_UNREG();
-
-  return scheme_void;
-}
-
-Scheme_Object *scheme_initialize(Scheme_Env *env)
-{
-  /* First load is same as every load: */
-  return scheme_reload(env);
-}
-
-Scheme_Object *scheme_module_name()
-{
-  /* This extension doesn't define a module: */
-  return scheme_false;
-}
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/hello.c b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/hello.c
deleted file mode 100644
index 97d898db1e..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/hello.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 
-   Racket extension example that returns the string "Hello, world!"
-   when loaded.
-
-   For the 3m GC (the default), compile with:
-     mzc --xform hello.c
-     mzc --3m --cc hello.3m.c
-     mzc --3m --ld hello.so hello_3m.o
-   And load with
-     (load-extension "hello.so") ; or "hello.dylib" for Mac OS X
-                                 ; or "hello.dll" for Windows
-
-   For CGC, compile with:
-     mzc --cgc --cc hello.c
-     mzc --cgc --ld hello.so hello.o
-   And load with
-     (load-extension "hello.so") ; or "hello.dylib" for Mac OS X
-                                 ; or "hello.dll" for Windows
-
-*/
-
-#include "escheme.h"
-
-Scheme_Object *scheme_reload(Scheme_Env *env)
-{
-  /* When the extension is loaded, return a Scheme string: */
-  return scheme_make_utf8_string("Hello, world!");
-}
-
-Scheme_Object *scheme_initialize(Scheme_Env *env)
-{
-  /* First load is same as every load: */
-  return scheme_reload(env);
-}
-
-Scheme_Object *scheme_module_name()
-{
-  /* This extension doesn't define a module: */
-  return scheme_false;
-}
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/helloprint.c b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/helloprint.c
deleted file mode 100644
index 0bbaf68074..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/helloprint.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Like hello.c, but prints to the current output port and returns
-   (void). */
-
-#include "escheme.h"
-
-Scheme_Object *scheme_reload(Scheme_Env *env)
-{
-  /* Make the string: */
-  Scheme_Object *hw;
-  hw = scheme_make_utf8_string("Hello, World!\n");
-
-  /* Display it: */
-  scheme_display(hw, scheme_get_param(scheme_current_config(), 
-				      MZCONFIG_OUTPUT_PORT));
-
-  /* Why not just
-        printf("Hello, World!\n");
-     ? That would write to stdout, which may or may not be the same as
-     the current output port. But sometimes printf() is what you
-     want. */
-
-  return scheme_void;
-}
-
-Scheme_Object *scheme_initialize(Scheme_Env *env)
-{
-  /* First load is same as every load: */
-  return scheme_reload(env);
-}
-
-Scheme_Object *scheme_module_name()
-{
-  /* This extension doesn't define a module: */
-  return scheme_false;
-}
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/idmodule.c b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/idmodule.c
deleted file mode 100644
index 6c8c13b567..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/idmodule.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-  Extension that declares a module.
-  The extension is equivalent to Scheme source of them form:
-    (module idmodule mzscheme
-      (define (identity x) x)
-      (provide identity))
-*/
-
-#include "escheme.h"
-
-static Scheme_Object *id(int argc, Scheme_Object **argv)
-{
-  return argv[0];
-}
-
-Scheme_Object *scheme_reload(Scheme_Env *env)
-{
-  Scheme_Env *menv;
-  Scheme_Object *proc;
-
-  menv = scheme_primitive_module(scheme_intern_symbol("idmodule"),
-				 env);
-
-  proc = scheme_make_prim_w_arity(id, "identity", 1, 1);
-
-  /* All added names are automatically exported by the module: */
-  scheme_add_global("identity", proc, menv);
-
-  scheme_finish_primitive_module(menv);
-
-  return scheme_void;
-}
-
-Scheme_Object *scheme_initialize(Scheme_Env *env)
-{
-  /* First load is same as every load: */
-  return scheme_reload(env);
-}
-
-Scheme_Object *scheme_module_name()
-{
-  /* This extension defines a module named `idmodule': */
-  return scheme_intern_symbol("idmodule");
-}
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/info.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/info.rkt
deleted file mode 100644
index a5b71b1dd7..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-omit-paths 'all)
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/makeadder.c b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/makeadder.c
deleted file mode 100644
index f841795b8d..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/makeadder.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* 
-   Defines make-adder:
-     (define (make-adder n)
-       (lambda (m) (+ m n)))
-   which illustrates closure-creation, looking up Scheme
-   definitions, and calling Scheme procedures from C.
-*/
-
-#include "escheme.h"
-
-/* The inner lambda, which must close over `n'. A closure function is
-   like a regular Scheme-procedure function, except that it takes an
-   extra argument containing the closure data. The closre data can be
-   any format that we want. */
-static Scheme_Object *sch_inner(void *closure_data, int argc, Scheme_Object **argv)
-{
-  /* We only close over one value, so our closure data reprsentation
-     is just thaht value: */
-  Scheme_Object *n = (Scheme_Object *)closure_data;
-  Scheme_Object *plus;
-  Scheme_Object *a[2];
-
-  plus = scheme_lookup_global(scheme_intern_symbol("+"), 
-			      scheme_get_env(NULL));
-
-  /* return the result of summing m and n: */
-  a[0] = n;
-  a[1] = argv[0]; /* m */
-  return _scheme_apply(plus, 2, a); 
-
-  /* Actually, that's not quite right. In the Scheme code, (+ m n) is
-     a tail call. The following would be better:
-     return _scheme_tail_apply(plus, 2, a); */
-}
-
-static Scheme_Object *sch_make_adder(int argc, Scheme_Object **argv)
-{
-  return scheme_make_closed_prim_w_arity(sch_inner,
-					 argv[0],
-					 "adder",
-					 1, 1);
-}
-
-Scheme_Object *scheme_reload(Scheme_Env *env)
-{
-  scheme_add_global("make-adder",
-		    scheme_make_prim_w_arity(sch_make_adder,
-					     "make-adder", 
-					     1, 1),
-		    env);
-
-  return scheme_void;
-}
-
-Scheme_Object *scheme_initialize(Scheme_Env *env)
-{
-  /* First load is same as every load: */
-  return scheme_reload(env);
-}
-
-Scheme_Object *scheme_module_name()
-{
-  /* This extension doesn't define a module: */
-  return scheme_false;
-}
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/makeadder3m.c b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/makeadder3m.c
deleted file mode 100644
index 69549d9aa7..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/makeadder3m.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* 
-   The same as makeaddr.c, but revised and annotated so that it works
-   with 3m without using --xform. All non-3m comments have been
-   deleted (to better highlight the 3m parts).
-*/
-
-#include "escheme.h"
-
-static Scheme_Object *sch_inner(void *closure_data, int argc, Scheme_Object **argv)
-{
-  Scheme_Object *n = (Scheme_Object *)closure_data;
-  Scheme_Object *plus, *plus_sym, *result;
-  Scheme_Env *env;
-  Scheme_Object *a[2];
-  /* Declare registration space. The number 6 comes from the
-     MZ_GC_VAR... declarations (i.e., if we add or remove
-     some, the number changes */
-  MZ_GC_DECL_REG(6);
-
-  MZ_GC_ARRAY_VAR_IN_REG(0, a, 2); /* takes 3 slots */
-  MZ_GC_VAR_IN_REG(3, argv);
-  MZ_GC_VAR_IN_REG(4, n);
-  MZ_GC_VAR_IN_REG(5, plus_sym);
-  MZ_GC_REG();
-
-  /* Note that we've pulled out nested calls and assigned
-     the results to explicitly declared variables. Even though
-     `env' is not help across an allocating function call,
-     we need to lift out the call to scheme_get_env(), otherwise
-     plus_sym's value might get pushed on the stack in anticipation
-     of the function call, and the corresponding object might
-     move. As written, plus_sym's value is not set up for the
-     call until after scheme_get_env() returns. */
-  plus_sym = scheme_intern_symbol("+");
-  env = scheme_get_env(NULL);
-  plus = scheme_lookup_global(plus_sym, env);
-
-  a[0] = n;
-  a[1] = argv[0]; /* m */
-  result = _scheme_apply(plus, 2, a); 
-  
-  /* The following unregister can't go before _scheme_apply,
-     because `a' is passed in as a stack-allocated array.
-     If `a' were heap-allocated, instead, MZ_GC_UNREG()
-     could go before the call to _scheme_apply. */
-  MZ_GC_UNREG();
-
-  return result;
-
-}
-
-static Scheme_Object *sch_make_adder(int argc, Scheme_Object **argv)
-{
-  return scheme_make_closed_prim_w_arity(sch_inner,
-					 argv[0],
-					 "adder",
-					 1, 1);
-}
-
-Scheme_Object *scheme_reload(Scheme_Env *env)
-{
-  Scheme_Object *p;
-  MZ_GC_DECL_REG(1);
-  MZ_GC_VAR_IN_REG(0, env);
-  
-  MZ_GC_REG();
-
-  p = scheme_make_prim_w_arity(sch_make_adder,
-			       "make-adder", 
-			       1, 1);
-
-  scheme_add_global("make-adder", p, env);
-
-  MZ_GC_UNREG();
-
-  return scheme_void;
-}
-
-Scheme_Object *scheme_initialize(Scheme_Env *env)
-{
-  /* First load is same as every load: */
-  return scheme_reload(env);
-}
-
-Scheme_Object *scheme_module_name()
-{
-  /* This extension doesn't define a module: */
-  return scheme_false;
-}
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/msgbox.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/msgbox.rkt
deleted file mode 100644
index 84a88cb55c..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/msgbox.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-;; Build with
-;;   mzc ++ldf user32.lib msgbox.rkt
-;; so that MessageBox() is linked in.
-
-(module msgbox mzscheme
-  (require compiler/cffi)
-  
-  ;; c-declare is really file-specific, and
-  ;;  not module-specific
-  (c-declare "#include <windows.h>")
-
-  ;; A direct hook to the MessageBox() function.
-  ;; We never have a parent window, but NULL is ok,
-  ;;  and we can pretend that a window is a string
-  ;;  for the purposes of providing a NULL:
-  (define unsafe-message-box
-    (c-lambda ((pointer "void") ; always use #f
-	       nonnull-char-string ; title
-	       nonnull-char-string ; message
-	       int)   ; style
-	      int
-	      "MessageBox"))
-
-  ;; Functions that really just access constants:
-  (define get-mb-okcancel
-    (c-lambda () int "___result = MB_OKCANCEL;"))
-  (define get-mb-yesno
-    (c-lambda () int "___result = MB_YESNO;"))
-
-  ;; Nice function for clients to use:
-  (define (message-box title message style)
-    (unsafe-message-box
-     #f
-     title
-     message
-     (case style
-       [(ok-cancel) (get-mb-okcancel)]
-       [(yes-no) (get-mb-yesno)]
-       [else (raise-type-error 'message-box "'ok-cancel or 'yes-no" style)])))
-
-  (provide message-box))
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/tree-finish.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/tree-finish.rkt
deleted file mode 100644
index 0e6021edf4..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/tree-finish.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-;; Assumes that tree.so has been loaded
-
-(require mzlib/class)
-
-(define tree%
-  (let ([method-names '(get-leaves 
-			get-left get-right
-			grow
-			graft)])
-    (make-primitive-class
-     (lambda (class prop:object preparer dispatcher)
-       (primitive-class-prepare-struct-type! 
-	tree-primitive-class
-	prop:object
-	class
-	preparer
-	dispatcher))
-     initialize-primitive-object
-     'tree%
-     object%
-     null
-     '(leaves)
-     null
-     method-names
-     null
-     (map
-      (lambda (name)
-	(primitive-class-find-method tree-primitive-class name))
-      method-names))))
-
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/tree.cxx b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/tree.cxx
deleted file mode 100644
index 6fe506571f..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/examples/tree.cxx
+++ /dev/null
@@ -1,911 +0,0 @@
-/* Example demonstrating how to inject a C++ class into the class
-   world of MzLib's class.ss library.
-
-   Since it uses C++, this example can be slightly tricky to compile.
-   Specifying a C++ linker (e.g., g++) ensures that the right C++
-   libraries get included:
-     mzc --cc tree.cxx
-     mzc --linker /usr/bin/g++ --ld tree.so tree.o
-
-  The C++ class Tree defines the following:
-
-    Tree(int init_leaves);                       constructor
-
-    int leaves;                                  \ fields
-    Tree *left_branch, *right_branch;            /
-
-    void Graft(Tree *left, Tree *right);         method
-
-    virtual void Grow(int n);                    \ overloaded and
-    virtual void Grow(char *cmd, char *&result); / with ref param
-
-  The Scheme version of the class has the following methods:
-
-    "get-leaves", "get-left", "get-rght" -- gets field values
-    "grow" -- override to replace C++ methods
-    "graft" -- takes Scheme tree% objects
-
-  Example use in Scheme:
-
-    (load-extension "tree.so") ; defines tree-primitive-class and
-                               ; other things not to be used directly
-    (load "tree-finish.ss") ; defines tree%
-
-    (define o (make-object tree% 10))
-    (send o get-leaves) ; => 10
-    (send o get-left) ; => #f
-
-    (send o grow 2) ; grows new branches on the frontier
-    (send o get-left) ; => #<object:tree%>
-    (send (send o get-left) get-leaves) ; => 2
-    
-    (define b (box "sunshine"))
-    (send o grow "sunshine" b)
-    (unbox b) ; => "sprouted left"
-
-    (define apple-tree%
-      (class tree%
-        (inherit graft)
-        (override grow)
-        
-        (define grow
-          ;; This `grow' drops branches and grows new ones.
-          ;; For the command-string form, it does nothing.
-          (case-lambda 
-           [(n)
-            (let ([l (make-object apple-tree%)]
-                  [r (make-object apple-tree%)])
-              (graft l r))]
-           [(cmd result)
-            (set-box! result (format "ignoring ~a" cmd))]))
-
-        (super-instantiate () (leaves 1))))
-
-    (define a (make-object apple-tree%))
-    (send a get-leaves) ; => 1
-    (send a grow 1)
-    (send a get-left) ; => #<struct:object:apple-tree%>
-
-    (define o (make-object tree% 10))
-    (define a (make-object apple-tree%))
-    (send o graft a #f)
-    (send o grow 1)   ; C++ calls apple-tree%'s `grow' for `a'
-    (send a get-left) ; -> #<struct:object:apple-tree>
-
-    (send a grow "sunshine" b)
-    (unbox b) ; => "ignoring sunshine"
-
- How it Works
-
-   The class.ss library cooperates with primitive classes through a
-   `make-primitive-class' function. The glue code in this file
-   essentially builds up the necessary arguments to
-   `make-primitive-class', and tree-finish.ss actually makes the
-   call. In fact, tree.cxx knows nothing about the class
-   implementation, and the class implementation knows nothing about
-   the glue; they "just happen" to be compatible, but this glue could
-   work with a variety of class implementation.
-
-   The glue, furthermore, is split into two parts. The first part is
-   specific to the Tree class. The second part is more generic,
-   providing a fairly simple objscheme_ interface to class-specific
-   glue, such the Tree glue. The second part can be shared for any
-   number of C++ classes, and it is similar to code used by GRacket.
-*/
-
-#include "escheme.h"
-
-/**********************************************************/
-/* The original C++ class: Tree                           */
-/**********************************************************/
-
-/* This kind of tree never grows or loses leaves. It only changes when
-   it grows subtrees, or when subtrees are grafted onto it. We can
-   derive new classes (in Scheme) for trees that can grow leaves and
-   fruit. */
-
-class Tree {
-private:
-
-  int refcount; /* Suppose the C++ class uses reference counting. */
-
-public:
-
-  /* Public fields: */
-  Tree *left_branch, *right_branch;
-  int leaves;
-
-  void *user_data; /* Field that we use for pointing back to the
-		      Scheme view of the objects. The original class
-		      might not be this friendly, but for simplicity
-		      we assume that it is. The alternative is to use
-		      a hash table. */
-
-  Tree(int init_leaves) {
-    left_branch = right_branch = NULL;
-    leaves = init_leaves;
-    refcount = 1;
-    user_data = NULL;
-  }
-
-  /* The Grow method is overloaded... */
-
-  virtual void Grow(int n) {
-    if (left_branch)
-      left_branch->Grow(n);
-    else
-      left_branch = new Tree(n);
-    if (right_branch)
-      right_branch->Grow(n);
-    else
-      right_branch = new Tree(n);
-  }
-
-  virtual void Grow(char *command, char *&result) {
-    if (!strcmp(command, "sunshine")) {
-      if (left_branch)
-	left_branch->Grow(command, result);
-      else {
-	left_branch = new Tree(1);
-	result = "sprouted left";
-      }
-    } else if (!strcmp(command, "water")) {
-      if (right_branch)
-	right_branch->Grow(command, result);
-      else {
-	right_branch = new Tree(1);
-	result = "sprouted left";
-      }
-    } else {
-      result = "unrecognized command for growing";
-    }
-  }
-
-  void Graft(Tree *left, Tree *right) {
-    Drop(left_branch);
-    Drop(right_branch);
-
-    left_branch = left;
-    right_branch = right;
-
-    Add(left_branch);
-    Add(right_branch);
-  }
-
-  /* Note that Graft is not overrideable in C++.
-     In Scheme, we might override this method, but
-     the C++ code never has to know since it never
-     calls the Graft method itself. */
-
-  /* Reference counting utils: */
-
-  static void Add(Tree *t) {
-    if (t)
-      t->refcount++;
-  }
-  static void Drop(Tree *t) {
-    if (t) {
-      t->refcount--;
-      if (!t->refcount)
-	delete t;
-    }
-  }
-};
-
-/**********************************************************/
-/* The glue class: mzTree (C++ calls to Scheme)           */
-/**********************************************************/
-
-/* Forward declarations (documented further below) */
-void objscheme_init();
-void objscheme_add_procedures(Scheme_Env *);
-Scheme_Object *objscheme_make_class(const char *name, Scheme_Object *sup, 
-				    Scheme_Prim *initf, int num_methods);
-Scheme_Object *objscheme_add_method_w_arity(Scheme_Object *c, const char *name, 
-					    Scheme_Prim *f, int mina, int maxa);
-Scheme_Object *objscheme_make_uninited_object(Scheme_Object *sclass);
-Scheme_Object *objscheme_find_method(Scheme_Object *obj, char *name, void **cache);
-int objscheme_is_a(Scheme_Object *o, Scheme_Object *c);
-
-
-/* The #<primitive-class> value: */
-static Scheme_Object *tree_class;
-/* Cache for lookup of overrideable method: */
-static void *grow_method_cache= NULL;
-/* To recognize original overrideable method: */
-Scheme_Object *grow_prim;
-
-/* We keep a pointer to the Scheme object, and override the
-   Grow method to (potentially) dispatch to Scheme. */
-
-class mzTree : public Tree {
-public:
-  mzTree(int c) : Tree(c) { }
-
-  virtual void Grow(int n) {
-    /* Check whether the Scheme class for user_data is 
-       actually a derived class that overrides `grow': */
-    Scheme_Object *scmobj;
-    Scheme_Object *overriding;
-
-    /* Pointer to Scheme instance kept in user_data: */
-    scmobj = (Scheme_Object *)user_data;
-
-    /* Look for an overriding `grow' method in scmobj: */
-    overriding = objscheme_find_method(scmobj,
-				       "grow",
-				       &grow_method_cache);
-
-    if (overriding != grow_prim) {
-      /* Call Scheme-based overriding implementation: */
-      Scheme_Object *argv[2];
-
-      argv[0] = scmobj;
-      argv[1] = scheme_make_integer(n);
-      _scheme_apply(overriding, 2, argv);
-    } else {
-      /* Grow is not overridden in Scheme: */
-      Tree::Grow(n);
-    }
-  }
-
-  /* Same strategy for other form of Grow, but we have to
-     deal with the "result" parameter: */
-  virtual void Grow(char *cmd, char *&result) {
-    Scheme_Object *scmobj;
-    Scheme_Object *overriding;
-
-    scmobj = (Scheme_Object *)user_data;
-
-    /* Look for an overriding `grow' method in scmobj: */
-    overriding = objscheme_find_method(scmobj,
-				       "grow",
-				       &grow_method_cache);
-
-    if (overriding != grow_prim) {
-      /* When calling the Scheme-based overriding implementation,
-	 we implement the `result' parameter as a boxed string.
-	 The Scheme code mutates the box content to return a 
-	 result. */
-      Scheme_Object *argv[2], *res;
-
-      argv[0] = scmobj;
-      argv[1] = scheme_make_utf8_string(cmd);
-      argv[2] = scheme_box(scheme_make_utf8_string(""));
-
-      _scheme_apply(overriding, 3, argv);
-
-      res = scheme_unbox(argv[2]);
-      if (!SCHEME_CHAR_STRINGP(res)) {
-	scheme_wrong_type("result for tree%'s grow method",
-			  "string", -1, 0, &res);
-      } else
-	result = scheme_utf8_encode_to_buffer(SCHEME_CHAR_STR_VAL(argv[2]), -1, NULL, 0);
-    } else {
-      Tree::Grow(cmd, result);
-    }
-  }
-};
-
-/**********************************************************/
-/* The glue functions (Scheme calls to C++)               */
-/**********************************************************/
-
-/* Macro for accessing C++ object pointer from a Scheme object: */
-#define OBJSCHEME_GET_CPP_OBJ(obj) scheme_struct_ref(obj, 0)
-#define OBJSCHEME_SET_CPP_OBJ(obj, v) scheme_struct_set(obj, 0, v)
-
-/* Used for finalizing: */
-void FreeTree(void *scmobj, void *t)
-{
-  Tree::Drop((Tree *)t);
-}
-
-Scheme_Object *Make_Tree(int argc, Scheme_Object **argv)
-{
-  Scheme_Object *obj;
-
-  /* Unfortunately, init arity is not automatically checked: */
-  if (argc != 2)
-    scheme_wrong_count("tree% initialization", 2, 2, argc, argv);
-
-  /* Assuming the initializer is only called through
-     the class interface, argv[0] is always ok: */
-  obj = argv[0];
-
-  if (!SCHEME_INTP(argv[1]))
-    scheme_wrong_type("tree% initialization", 
-		      "fixnum", 
-		      1, argc, argv);
-
-  /* Create C++ instance, and remember pointer back to Scheme instance: */
-  Tree *t = new mzTree(SCHEME_INT_VAL(argv[1]));
-  t->user_data = obj;
-
-  /* Store C++ pointer in Scheme object: */
-  OBJSCHEME_SET_CPP_OBJ(obj, (Scheme_Object *)t);
-
-  /* Free C++ instance when the Scheme object is no longer referenced: */
-  scheme_add_finalizer(obj, FreeTree, t);
-
-  return obj;
-}
-
-Scheme_Object *Grow(int argc, Scheme_Object **argv)
-{
-  Scheme_Object *obj = argv[0];
-
-  if (argc == 2) {
-    Tree *t;
-    int n;
-
-    if (!SCHEME_INTP(argv[1]))
-      scheme_wrong_type("tree%'s grow", 
-			"fixnum", 
-			1, argc, argv);
-    n = SCHEME_INT_VAL(argv[1]);
-    
-    /* Extract the C++ pointer: */
-    t = (Tree *)OBJSCHEME_GET_CPP_OBJ(obj);
-    
-    /* Call method (without override check): */
-    t->Tree::Grow(n);
-  } else {
-    Tree *t;
-    char *cmd, *result;
-
-    if (!SCHEME_CHAR_STRINGP(argv[1]))
-      scheme_wrong_type("tree%'s grow", 
-			"string", 
-			1, argc, argv);
-    if (!SCHEME_BOXP(argv[2])
-	|| !SCHEME_CHAR_STRINGP(SCHEME_BOX_VAL(argv[2])))
-      scheme_wrong_type("tree%'s grow", 
-			"boxed string", 
-			2, argc, argv);
-
-    cmd = scheme_utf8_encode_to_buffer(SCHEME_CHAR_STR_VAL(argv[1]), -1, NULL, 0);
-    result = scheme_utf8_encode_to_buffer(SCHEME_CHAR_STR_VAL(SCHEME_BOX_VAL(argv[2])), 1, NULL, 0);
-
-    /* Extract the C++ pointer: */
-    t = (Tree *)OBJSCHEME_GET_CPP_OBJ(obj);
-    
-    /* Call method (without override check): */
-    t->Tree::Grow(cmd, result);
-
-    /* Put result back in box: */
-    SCHEME_BOX_VAL(argv[2]) = scheme_make_utf8_string(result);
-  }
-  
-  return scheme_void;
-}
-
-Scheme_Object *Graft(int argc, Scheme_Object **argv)
-{
-  Scheme_Object *obj = argv[0];
-  Tree *t, *l, *r;
-
-  if (!SCHEME_FALSEP(argv[1]) && !objscheme_is_a(argv[1], tree_class))
-    scheme_wrong_type("tree%'s graft", 
-		      "tree% object or #f", 
-		      1, argc, argv);
-  if (!SCHEME_FALSEP(argv[2]) && !objscheme_is_a(argv[2], tree_class))
-    scheme_wrong_type("tree%'s graft", 
-		      "tree% object or #f", 
-		      2, argc, argv);
-
-  /* Extract the C++ pointer for `this': */
-  t = (Tree *)OBJSCHEME_GET_CPP_OBJ(obj);
-
-  /* Extract the C++ pointers for the args: */
-  l = (SCHEME_FALSEP(argv[1])
-       ? (Tree *)NULL
-       : (Tree *)OBJSCHEME_GET_CPP_OBJ(argv[1]));
-  r = (SCHEME_FALSEP(argv[2])
-       ? (Tree *)NULL
-       : (Tree *)OBJSCHEME_GET_CPP_OBJ(argv[2]));
-  
-  /* Call method: */
-  t->Graft(l, r);
-  
-  return scheme_void;
-}
-
-Scheme_Object *MarshalTree(Tree *t)
-{
-  if (!t)
-    return scheme_false;
-  else if (!t->user_data) {
-    /* Object created in C++, not seen by Scheme, yet.
-       Create a Scheme version of this object. */
-    Scheme_Object *scmobj;
-
-    /* Make Scheme object: */
-    scmobj = objscheme_make_uninited_object(tree_class);
-
-    /* Link C++ and Scheme objects: */
-    t->user_data = scmobj;
-    OBJSCHEME_SET_CPP_OBJ(scmobj, (Scheme_Object *)t);
-    
-    return scmobj;
-  } else
-    /* Get pointer back to Scheme: */
-    return (Scheme_Object *)t->user_data;
-}
-
-Scheme_Object *Get_Left(int argc, Scheme_Object **argv)
-{
-  Tree *t = (Tree *)OBJSCHEME_GET_CPP_OBJ(argv[0]);
-  
-  return MarshalTree(t->left_branch);
-}
-
-Scheme_Object *Get_Right(int argc, Scheme_Object **argv)
-{ 
-  Tree *t = (Tree *)OBJSCHEME_GET_CPP_OBJ(argv[0]);
- 
-  return MarshalTree(t->right_branch);
-}
-
-Scheme_Object *Get_Leaves(int argc, Scheme_Object **argv)
-{
-  Tree *t = (Tree *)OBJSCHEME_GET_CPP_OBJ(argv[0]);
- 
-  return scheme_make_integer(t->leaves);
-}
-
-/**********************************************************/
-/* Extension initialization: create the Scheme class      */
-/**********************************************************/
-
-Scheme_Object *scheme_reload(Scheme_Env *env)
-{
-  scheme_add_global("tree-primitive-class", tree_class, env);
-
-  objscheme_add_procedures(env);
-
-  return scheme_void;
-}
-
-Scheme_Object *scheme_initialize(Scheme_Env *env)
-{
-  objscheme_init();
-
-  scheme_register_extension_global(&tree_class, sizeof(tree_class));
-
-  tree_class = objscheme_make_class("tree%",    /* name */
-				    NULL,       /* superclass */
-				    Make_Tree,  /* init func */
-				    5);         /* num methods */
-
-  scheme_register_extension_global(&grow_prim, sizeof(grow_prim));
-
-  grow_prim = objscheme_add_method_w_arity(tree_class, "grow",
-					   Grow, 1, 2);
-  (void)objscheme_add_method_w_arity(tree_class, "graft", 
-				     Graft, 2, 2);
-  
-  (void)objscheme_add_method_w_arity(tree_class, "get-left",
-				     Get_Left, 0, 0);
-  (void)objscheme_add_method_w_arity(tree_class, "get-right",
-				     Get_Right, 0, 0);
-  (void)objscheme_add_method_w_arity(tree_class, "get-leaves",
-				     Get_Leaves, 0, 0);
-
-  return scheme_reload(env);
-}
-
-
-Scheme_Object *scheme_module_name()
-{
-  /* This extension doesn't define a module: */
-  return scheme_false;
-}
-
-/**********************************************************/
-/* The generic (class-independent) C++--Scheme glue       */
-/**********************************************************/
-
-/* 
-   (This code is mostly the same as code used by GRacket, and duplicating
-   it is certainly a bad idea in principle, but putting the code in a
-   shareable place seems like more work than is worthwhile for now.)
-
-   Scheme side:
-   ------------
-
-   This glue provides a new type, #<primitive-class>, and several
-   procedures:
-
-      (initialize-primitive-object prim-obj v ...) -
-        initializes the primitive object, given initialization
-        arguments v ...
-
-      (primitive-class-prepare-struct-type! prim-class gen-property
-        gen-value preparer dispatcher) - prepares a class's struct-type for
-        objects generated C-side; returns a constructor, predicate,
-        and a struct:type for derived classes. The constructor and
-        struct:type map the given dispatcher to the class.
-
-        The preparer takes a symbol naming the method. It returns a
-        value to be used in future calls to the dispatcher.
-
-        The dispatcher takes two arguments: an object and a
-        method-specific value produced by the prepaper. It returns a
-        method procedure.
-
-      (primitive-class-find-method prim-class sym) - gets the method
-        procedure for the given symbol from the class. The procedure
-        consumes "self" and then the rest of the arguments.
-
-   C side:
-   -------
-
-     void objscheme_init() - initializes the glue; call this first.
-
-     void objscheme_add_procedures(Scheme_Env *) - installs the
-        Scheme-side procedure listed above into the environment.
-
-     Scheme_Object *objscheme_make_class(const char *name,
-        Scheme_Object *sup, Scheme_Prim *initf, int num_methods) -
-        creates a #<primitive-class> representing a C++ class. The
-        initf function is called to create and initialize the C++-side
-        when the class is instantiated from Scheme; the first argument
-        is the Scheme-side `self' object. The Scheme-side object is a
-        struct, and the first field should be set to point to the C++
-        object.
-
-        The sup argument is a #<primitive-class> for a superclass, or
-        scheme_false. The num_methods argument specifies the number of
-        methods that will be added to the class.
-
-     void objscheme_add_method_w_arity(Scheme_Object *c, const char
-	*name, Scheme_Prim *f, int mina, int maxa) - adds a method to
-	a #<primitive-class>, specifying the method's arity as with
-	scheme_make_prim_w_arity().
-
-     Scheme_Object *objscheme_make_uninited_object(Scheme_Object *sclass)
-        - creates a Scheme-side object for an existing C++ obj. The
-        Scheme-side object is a struct, and the first field should be
-        set to point to the C++ object.
-
-     Scheme_Object *objscheme_find_method(Scheme_Object *obj, char
-        *name, void **cache) - finds a method by name in a Scheme-side
-        object. It is a Scheme procedure for the method (which takes
-        the Scheme-side `self' as its first argument). The cache
-        pointer should point to static, class-specific space for
-        caching lookup information.
-
-     int objscheme_is_a(Scheme_Object *o, Scheme_Object *c) - returns 1
-        if the given Scheme-side object is an instance of the given
-        #<primitive-class>, 0 otherwise.
-
-*/
-
-typedef struct Objscheme_Class {
-  Scheme_Type type;
-  const char *name;
-  Scheme_Object *sup;
-  Scheme_Object *initf;
-  int num_methods, num_installed;
-  Scheme_Object **names;
-  Scheme_Object **methods;
-  Scheme_Object *base_struct_type;
-  Scheme_Object *struct_type;
-} Objscheme_Class;
-
-Scheme_Type objscheme_class_type;
-
-static Scheme_Object *object_struct;
-static Scheme_Object *object_property;
-static Scheme_Object *preparer_property;
-static Scheme_Object *dispatcher_property;
-
-#define CONS(a, b) scheme_make_pair(a, b)
-
-/***************************************************************************/
-/* Scheme-side implementation: */
-
-static Scheme_Object *init_prim_obj(int argc, Scheme_Object **argv)
-{
-  Objscheme_Class *c;
-  Scheme_Object *obj = argv[0];
-
-  if (!SCHEME_STRUCTP(argv[0])
-      || !scheme_is_struct_instance(object_struct, argv[0]))
-    scheme_wrong_type("initialize-primitive-object", "primitive-object", 0, argc, argv);
-  
-  c = (Objscheme_Class *)scheme_struct_type_property_ref(object_property, obj);
-
-  return _scheme_apply(c->initf, argc, argv);
-}
-
-static Scheme_Object *class_prepare_struct_type(int argc, Scheme_Object **argv)
-{
-  Scheme_Object *name, *base_stype, *stype, *derive_stype;
-  Scheme_Object **names, **vals, *a[3], *props;
-  Objscheme_Class *c;
-  int flags, count;
-
-  if (SCHEME_TYPE(argv[0]) != objscheme_class_type)
-    scheme_wrong_type("primitive-class-prepare-struct-type!", "primitive-class", 0, argc, argv);
-  if (SCHEME_TYPE(argv[1]) != scheme_struct_property_type)
-    scheme_wrong_type("primitive-class-prepare-struct-type!", "struct-type-property", 1, argc, argv);
-  scheme_check_proc_arity("primitive-class-prepare-struct-type!", 1, 3, argc, argv);
-  scheme_check_proc_arity("primitive-class-prepare-struct-type!", 2, 4, argc, argv);
-
-  c = ((Objscheme_Class *)argv[0]);
-  
-  stype = c->struct_type;
-
-  name = scheme_intern_symbol(c->name);
-
-  if (stype) {
-    scheme_arg_mismatch("primitive-class-prepare-struct-type!",
-			"struct-type already prepared for primitive-class: ",
-			name);
-    return NULL;
-  }
-
-  if (SCHEME_TRUEP(c->sup) && !((Objscheme_Class *)c->sup)->base_struct_type) {
-    scheme_arg_mismatch("primitive-class-prepare-struct-type!",
-			"super struct-type not yet prepared for primitive-class: ",
-			name);
-    return NULL;
-  }
-
-  /* Root for this class.  */
-
-  base_stype = scheme_make_struct_type(name, 
-				       (SCHEME_TRUEP(c->sup) 
-					? ((Objscheme_Class *)c->sup)->base_struct_type 
-					: object_struct),
-				       NULL,
-				       0, 0, NULL,
-				       NULL, NULL);
-  c->base_struct_type = base_stype;
-
-  /* Type to use when instantiating from C: */
-
-  props = CONS(CONS(object_property, 
-		    argv[0]),
-	       scheme_null);
-
-  stype = scheme_make_struct_type(name,
-				  base_stype, 
-				  NULL,
-				  0, 0, NULL,
-				  CONS(CONS(argv[1], argv[2]),
-				       props),
-				  NULL);
-  
-  c->struct_type = stype;
-  
-  /* Type to derive from Scheme: */
-  
-  props = CONS(CONS(preparer_property, argv[3]),
-	       CONS(CONS(dispatcher_property, argv[4]),
-		    props));
-
-  derive_stype = scheme_make_struct_type(name,
-					 base_stype, 
-					 NULL,
-					 0, 0, NULL,
-					 props, 
-					 NULL);
-  
-  /* Type to instantiate from Scheme: */
-  
-  stype = scheme_make_struct_type(name,
-				  base_stype, 
-				  NULL,
-				  0, 0, NULL,
-				  CONS(CONS(argv[1], argv[2]), props),
-				  NULL);
-  
-  /* Need constructor from instantiate type: */
-  flags = (SCHEME_STRUCT_NO_TYPE
-	   | SCHEME_STRUCT_NO_PRED
-	   | SCHEME_STRUCT_NO_GET
-	   | SCHEME_STRUCT_NO_SET);
-  names = scheme_make_struct_names(name, NULL, flags, &count);
-  vals = scheme_make_struct_values(stype, names, count, flags);
-  a[0] = vals[0];
-
-  /* Need predicate from base type: */
-  flags = (SCHEME_STRUCT_NO_TYPE
-	   | SCHEME_STRUCT_NO_CONSTR
-	   | SCHEME_STRUCT_NO_GET
-	   | SCHEME_STRUCT_NO_SET);
-  names = scheme_make_struct_names(name, NULL, flags, &count);
-  vals = scheme_make_struct_values(base_stype, names, count, flags);
-  a[1] = vals[0];
-
-  /* Need derive type: */
-  a[2] = derive_stype;
-
-  return scheme_values(3, a);
-}
-
-static Scheme_Object *class_find_meth(int argc, Scheme_Object **argv)
-{
-  Objscheme_Class *sclass = (Objscheme_Class *)argv[0];
-  Scheme_Object *s;
-  int i;
-
-  if (SCHEME_TYPE(argv[0]) != objscheme_class_type)
-    scheme_wrong_type("primitive-class-find-method", "primitive-class", 0, argc, argv);
-  if (!SCHEME_SYMBOLP(argv[1]))
-    scheme_wrong_type("primitive-class-find-method", "symbol", 1, argc, argv);
-
-  s = argv[1];
-
-  for (i = sclass->num_installed; i--; ) {
-    if (SAME_OBJ(sclass->names[i], s))
-      return sclass->methods[i];
-  }
-
-  return scheme_false;
-}
-
-Scheme_Object *objscheme_make_uninited_object(Scheme_Object *sclass)
-{
-  Scheme_Object *obj;
-  Scheme_Object *stype;
-
-  stype = ((Objscheme_Class *)sclass)->struct_type;
-  if (!stype) {
-    scheme_arg_mismatch("make-primitive-object",
-			"struct-type not yet prepared: ",
-			sclass);
-    return NULL;
-  }
-
-  obj = scheme_make_struct_instance(stype, 0, NULL);
-
-  return obj;  
-}
-
-/***************************************************************************/
-/* C-side implementation: */
-
-Scheme_Object *objscheme_make_class(const char *name, Scheme_Object *sup, 
-				    Scheme_Prim *initf, int num_methods)
-{
-  Objscheme_Class *sclass;
-  Scheme_Object *f, **methods, **names;
-
-  sclass = (Objscheme_Class *)scheme_malloc_tagged(sizeof(Objscheme_Class));
-  sclass->type = objscheme_class_type;
-
-  if (!sup)
-    sup = scheme_false;
-
-  sclass->name = name;
-  sclass->sup = sup;
-
-  f = scheme_make_prim(initf);
-  sclass->initf = f;
-
-  sclass->num_methods = num_methods;
-  sclass->num_installed = 0;
-
-  methods = (Scheme_Object **)scheme_malloc(sizeof(Scheme_Object *) * num_methods);
-  names = (Scheme_Object **)scheme_malloc(sizeof(Scheme_Object *) * num_methods);
-
-  sclass->methods = methods;
-  sclass->names = names;
-
-  return (Scheme_Object *)sclass;
-}
-
-Scheme_Object *objscheme_add_method_w_arity(Scheme_Object *c, const char *name,
-					    Scheme_Prim *f, int mina, int maxa)
-{
-  Scheme_Object *s;
-  Objscheme_Class *sclass;
-
-  sclass = (Objscheme_Class *)c;
-
-  s = scheme_make_prim_w_arity(f, name, mina + 1, (maxa < 0) ? -1 : (maxa + 1));
-
-  sclass->methods[sclass->num_installed] = s;
-
-  s = scheme_intern_symbol(name);
-
-  sclass->names[sclass->num_installed] = s;
-
-  sclass->num_installed++;
-
-  return s;
-}
-
-int objscheme_is_a(Scheme_Object *o, Scheme_Object *c)
-{
-  Scheme_Object *a;
-
-  if (!SCHEME_STRUCTP(o) || !scheme_is_struct_instance(object_struct, o))
-    return 0;
-
-  a = scheme_struct_type_property_ref(object_property, o);
-  
-  while (a && (a != c)) {
-    a = ((Objscheme_Class *)a)->sup;
-  }
-
-  return !!a;
-}
-
-void objscheme_init()
-{
-  objscheme_class_type = scheme_make_type("<primitive-class>");
-
-  /* Attaches a primitive class to an object: */
-  scheme_register_extension_global(&object_property, sizeof(object_property));
-  object_property = scheme_make_struct_type_property(scheme_intern_symbol("primitive-object"));
-  
-  /* Attaches a preparer function to a derived class: */
-  scheme_register_extension_global(&preparer_property, sizeof(preparer_property));
-  preparer_property = scheme_make_struct_type_property(scheme_intern_symbol("primitive-preparer"));
-
-  /* Attaches a dispatcher function to a derived class: */
-  scheme_register_extension_global(&dispatcher_property, sizeof(dispatcher_property));
-  dispatcher_property = scheme_make_struct_type_property(scheme_intern_symbol("primitive-dispatcher"));
-
-  /* The base struct type for the Scheme view of a primitive object: */
-  scheme_register_extension_global(&object_struct, sizeof(object_struct));
-  object_struct = scheme_make_struct_type(scheme_intern_symbol("primitive-object"), 
-					  NULL, NULL,
-					  0, 2, NULL,
-					  NULL, NULL);
-}
-
-void objscheme_add_procedures(Scheme_Env *env)
-{
-  scheme_add_global("initialize-primitive-object",
-		    scheme_make_prim_w_arity(init_prim_obj,
-					     "initialize-primitive-object",
-					     1, -1),
-		    env);
-
-  scheme_add_global("primitive-class-prepare-struct-type!",
-		    scheme_make_prim_w_arity(class_prepare_struct_type,
-					     "primitive-class-prepare-struct-type!",
-					     5, 5),
-		    env);
-  
-  scheme_add_global("primitive-class-find-method",
-		    scheme_make_prim_w_arity(class_find_meth,
-					     "primitive-class-find-method",
-					     2, 2),
-		    env);
-}
-
-Scheme_Object *objscheme_find_method(Scheme_Object *obj, char *name, void **cache)
-{
-  Scheme_Object *s, *p[2], *dispatcher;
-
-  if (!obj)
-    return NULL;
-
-  dispatcher = scheme_struct_type_property_ref(dispatcher_property, (Scheme_Object *)obj);
-  if (!dispatcher)
-    return NULL;
-
-  if (*cache)
-    s = (Scheme_Object *)*cache;
-  else {
-    s = scheme_intern_symbol(name);
-    p[0] = s;
-    s = scheme_struct_type_property_ref(preparer_property, (Scheme_Object *)obj);
-    if (!s)
-      return NULL;
-    s = scheme_apply(s, 1, p);
-    scheme_register_extension_global((void *)cache, sizeof(Scheme_Object*));
-    *cache = s;
-  }
-
-  p[0] = obj;
-  p[1] = s;
-  return _scheme_apply(dispatcher, 2, p);
-}
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/info.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/info.rkt
deleted file mode 100644
index 4b662e8cb3..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define version '(400))
-
-(define post-install-collection "installer.rkt")
-(define copy-man-pages '("mzscheme.1"))
-
-(define compile-omit-paths '("examples"))
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/installer.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/installer.rkt
deleted file mode 100644
index 4d9934c32a..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/installer.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scheme/base
-
-(require launcher compiler/embed)
-(provide post-installer)
-
-(define (post-installer path)
-  (define variants (available-mzscheme-variants))
-  (for ([v (in-list variants)])
-    (parameterize ([current-launcher-variant v])
-      (create-embedding-executable
-       (mzscheme-program-launcher-path "MzScheme")
-       #:variant v
-       #:cmdline '("-I" "scheme/init")
-       #:launcher? #t
-       #:aux '((framework-root . #f)
-               (dll-dir . #f)
-               (relative? . #t))))))
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/mzscheme.1 b/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/mzscheme.1
deleted file mode 100644
index 32224a7358..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/mzscheme/mzscheme.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\" dummy line
-.TH MZSCHEME 1 "May 2010"
-.UC 4
-.SH NAME
-mzscheme \- compatibility executable for Racket
-.SH SYNOPSIS
-.B mzscheme
-[
-.I option ...
-] [
-.I argument ...
-]
-.SH DESCRIPTION
-MzScheme is the old name for the core Racket implementation.
-
-.PP
-For most cases, running
-.B mzscheme
-is the same as running
-.BR racket ,
-except that the default interaction language is slightly
-different for backward compatibility.
-
-.SH MORE INFORMATION
-For further information, run
-.PP
-   raco docs
-.PP
-to open installed documentation in your web browser.
-
-.PP
-Alternately, consult the on-line
-documentation and other information available at
-.PP
-.ce 1
-http://racket-lang.org/
-
-.SH SEE ALSO
-.BR racket(1)
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/setup/info.rkt b/pkgs/mzscheme-pkgs/mzscheme-lib/setup/info.rkt
deleted file mode 100644
index 6f09a01e9a..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/setup/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define mzscheme-launcher-libraries '("main.rkt"))
-(define mzscheme-launcher-names '("Setup PLT"))
-(define copy-man-pages '("setup-plt.1"))
diff --git a/pkgs/mzscheme-pkgs/mzscheme-lib/setup/setup-plt.1 b/pkgs/mzscheme-pkgs/mzscheme-lib/setup/setup-plt.1
deleted file mode 100644
index 519395a07a..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme-lib/setup/setup-plt.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\" dummy line
-.TH SETUP-PLT 1 "May 2010"
-.UC 4
-.SH NAME
-setup-plt \- compatibility Racket setup tool
-.SH SYNOPSIS
-.B setup-plt
-[
-.I option ...
-] [
-.I argument ...
-]
-.SH DESCRIPTION
-.B setup-plt
-provides an old interface to some Racket tools that are now
-normally provided via
-.BR raco .
-
-.PP
-Run
-.PP
-   setup-plt --help
-.PP
-for a list of command-line options.
-
-.SH MORE INFORMATION
-For further information, run
-.PP
-   raco help
-.PP
-to open installed documentation in your web browser.
-
-.PP
-Alternately, consult the on-line
-documentation and other information available at
-.PP
-.ce 1
-http://racket-lang.org/
-
-.SH SEE ALSO
-.BR raco(1),
-.BR racket(1)
diff --git a/pkgs/mzscheme-pkgs/mzscheme/LICENSE.txt b/pkgs/mzscheme-pkgs/mzscheme/LICENSE.txt
deleted file mode 100644
index 28c05203da..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-mzscheme
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/mzscheme-pkgs/mzscheme/info.rkt b/pkgs/mzscheme-pkgs/mzscheme/info.rkt
deleted file mode 100644
index 0be62388c2..0000000000
--- a/pkgs/mzscheme-pkgs/mzscheme/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("mzscheme-lib" "mzscheme-doc"))
-(define implies '("mzscheme-lib" "mzscheme-doc"))
-
-(define pkg-desc "The legacy MzScheme language")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/net-pkgs/net-doc/LICENSE.txt b/pkgs/net-pkgs/net-doc/LICENSE.txt
deleted file mode 100644
index 1356a32d1e..0000000000
--- a/pkgs/net-pkgs/net-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-net-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/net-pkgs/net-doc/info.rkt b/pkgs/net-pkgs/net-doc/info.rkt
deleted file mode 100644
index 4fc8a1c85d..0000000000
--- a/pkgs/net-pkgs/net-doc/info.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "documentation part of \"net\"")
-
-(define pkg-authors '(mflatt))
-(define build-deps '("compatibility-lib"
-                     "net-lib"
-                     "racket-doc"
-                     "scribble-lib"
-                     "unstable-contract-lib"
-                     "unstable-doc"
-                     "web-server-doc"
-                     "web-server-lib"))
-(define update-implies '("net-lib"))
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/base64.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/base64.scrbl
deleted file mode 100644
index a3a8920558..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/base64.scrbl
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label net/base64 net/base64-unit net/base64-sig))
-
-@title[#:tag "base64"]{Base 64: Encoding and Decoding}
-
-@defmodule[net/base64]{The @racketmodname[net/base64] library provides
-utilities for Base 64 (MIME-standard) encoding and decoding.}
-
-@section[#:tag "base64-procs"]{Functions}
-
-@defproc[(base64-encode [bstr bytes?] [newline-bstr bytes? #"\r\n"]) bytes?]{
-
-Consumes a byte string and returns its Base 64 encoding as a new byte
-string.  The returned string is broken into 72-byte lines separated by
-@racket[newline-bstr], which defaults to a CRLF combination, and the
-result always ends with a @racket[newline-bstr] unless the
-input is empty.}
-
-
-@defproc[(base64-decode [bstr bytes?]) bytes?]{
-
-Consumes a byte string and returns its Base 64 decoding as a new byte
-string.}
-
-
-@defproc[(base64-encode-stream [in input-port?]
-                               [out output-port?]
-                               [newline-bstr bytes? #"\n"])
-         void?]{
-
-Reads bytes from @racket[in] and writes the encoded result to
-@racket[out], breaking the output into 72-character lines separated by
-@racket[newline-bstr], and ending with @racket[newline-bstr] unless
-the input stream is empty. Note that the default @racket[newline-bstr]
-is just @racket[#"\n"], not @racket[#"\r\n"]. The procedure returns when
-it encounters an end-of-file from @racket[in].}
-
-@defproc[(base64-decode-stream [in input-port?]
-                               [out output-port?])
-         void?]{
-
-Reads a Base 64 encoding from @racket[in] and writes the decoded
-result to @racket[out]. The procedure returns when it encounters an
-end-of-file or Base 64 terminator @litchar{=} from @racket[in].}
-
-@; ----------------------------------------
-
-@section{Base64 Unit}
-
-@margin-note{@racket[base64@] and @racket[base64^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/base64] module.}
-
-@defmodule[net/base64-unit]
-
-@defthing[base64@ unit?]{
-
-Imports nothing, exports @racket[base64^].}
-
-@; ----------------------------------------
-
-@section{Base64 Signature}
-
-@defmodule[net/base64-sig]
-
-@defsignature[base64^ ()]{}
-
-Includes everything exported by the @racketmodname[net/base64] module.
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/cgi.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/cgi.scrbl
deleted file mode 100644
index 28ce337b03..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/cgi.scrbl
+++ /dev/null
@@ -1,141 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label net/cgi net/uri-codec net/cgi-unit net/cgi-sig))
-
-@title[#:tag "cgi"]{CGI Scripts}
-
-@defmodule[net/cgi]{The @racketmodname[net/cgi] module provides tools
-for scripts that follow the Common Gateway Interface @cite["CGI"].}
-
-The @racketmodname[net/cgi] library expects to be run in a certain
-context as defined by the CGI standard.  This means, for instance,
-that certain environment variables will be bound.
-
-Unfortunately, not all CGI environments provide this.  For instance,
-the FastCGI library, despite its name, does not bind the environment
-variables required of the standard.  Users of FastCGI will need to
-bind @envvar{REQUEST_METHOD} and possibly also @envvar{QUERY_STRING}
-to successfully employ the CGI library.  The FastCGI library ought to
-provide a way to extract the values bound to these variables; the user
-can then put these into the CGI program's environment using the
-@racket[putenv] function.
-
-A CGI @deftech{binding} is an association of a form item with its
-value.  Some form items, such as checkboxes, may correspond to
-multiple bindings.  A binding is a tag-string pair, where a tag is a
-symbol or a string.
-
-@; ----------------------------------------
-
-@section{CGI Functions}
-
-@deftogether[(
-@defproc[(get-bindings) (listof (cons/c (or/c symbol? string?) string?))]
-@defproc[(get-bindings/post) (listof (cons/c (or/c symbol? string?) string?))]
-@defproc[(get-bindings/get) (listof (cons/c (or/c symbol? string?) string?))]
-)]{
-
-Returns the bindings that corresponding to the options specified by
-the user.  The @racket[get-bindings/post] and
-@racket[get-bindings/get] variants work only when POST and GET forms
-are used, respectively, while @racket[get-bindings] determines the
-kind of form that was used and invokes the appropriate function.
-
-These functions respect @racket[current-alist-separator-mode].
-}
-
-
-@defproc[(extract-bindings [key? (or/c symbol? string?)]
-                           [bindings (listof (cons/c (or/c symbol? string?) string?))])
-         (listof string?)]{
-
-Given a key and a set of bindings, determines which ones correspond to
-a given key.  There may be zero, one, or many associations for a given
-key.}
-
-
-@defproc[(extract-binding/single [key? (or/c symbol? string?)]
-                                 [bindings (listof (cons/c (or/c symbol? string?) string?))])
-         string?]{
-
-Like @racket[extract-bindings], but for a key that has exactly one
-association.}
-
-
-@defproc[(output-http-headers) void?]{
-
-Outputs all the HTTP headers needed for a normal response.  Only
-call this function if you are not using @racket[generate-html-output] or
-@racket[generate-error-output].}
-
-
-@defproc[(generate-html-output [title string?]
-                               [body (listof string?)]
-                               [text-color string? "#000000"]
-                               [bg-color string? "#ffffff"]
-                               [link-color string? "#cc2200"]
-                               [vlink-color string? "#882200"]
-                               [alink-color string? "#444444"])
-         void?]{
-
-Outputs an response: a title and a list of strings for the body.
-
-The last five arguments are each strings representing a HTML color; in
-order, they represent the color of the text, the background,
-un-visited links, visited links, and a link being selected.}
-
-
-@defproc[(string->html [str string?]) string?]{
-
-Converts a string into an HTML string by applying the appropriate HTML
-quoting conventions.}
-
-
-@defproc[(generate-link-text [str string?] [html-str string?]) string?]{
-
-Takes a string representing a URL, a HTML string for the anchor
-text, and generates HTML corresponding to an anchor.}
-
-
-@defproc[(generate-error-output [strs (listof string?)]) any]{
-
-The procedure takes a list of HTML strings representing the body,
-prints them with the subject line "Internal error", and exits via
-@racket[exit].}
-
-
-@defproc[(get-cgi-method) (one-of/c "GET" "POST")]{
-
-Returns either @racket["GET"] or @racket["POST"] when invoked inside a
-CGI script, unpredictable otherwise.}
-
-
-@defproc[(bindings-as-html (listof (cons/c (or/c symbol? string?) string?)))
-         (listof string?)]{
-
-Converts a set of bindings into a list of HTML strings, which is
-useful for debugging.}
-
-@; ----------------------------------------
-
-@section{CGI Unit}
-
-@margin-note{@racket[cgi@] and @racket[cgi^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/cgi] module.}
-
-@defmodule[net/cgi-unit]
-
-@defthing[cgi@ unit?]{
-
-Imports nothing, exports @racket[cgi^].}
-
-@; ----------------------------------------
-
-@section{CGI Signature}
-
-@defmodule[net/cgi-sig]
-
-@defsignature[cgi^ ()]{}
-
-Includes everything exported by the @racketmodname[net/cgi] module.
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/common.rkt b/pkgs/net-pkgs/net-doc/net/scribblings/common.rkt
deleted file mode 100644
index 7f86e9a856..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/common.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-(require scribble/manual
-         (for-label racket/base racket/contract))
-
-(provide (all-from-out scribble/manual)
-         (for-label (all-from-out racket/base racket/contract)))
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/cookie.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/cookie.scrbl
deleted file mode 100644
index 0916c487cc..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/cookie.scrbl
+++ /dev/null
@@ -1,202 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/eval
-          (for-label net/cookie net/cookie-unit net/cookie-sig))
-
-@(define cookie-eval (make-base-eval))
-@interaction-eval[#:eval cookie-eval (require net/cookie)]
-
-
-@title[#:tag "cookie"]{Cookie: HTTP Client Storage}
-
-@defmodule[net/cookie]{The @racketmodname[net/cookie] library provides
-utilities for using cookies as specified in RFC 2109 @cite["RFC2109"].}
-
-@section[#:tag "cookie-procs"]{Functions}
-
-@defproc[(cookie? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] represents a cookie, @racket[#f]
- otherwise.
-}
-
-@defproc[(valid-domain? [v any/c]) boolean?]{
- Returns @racket[#t] if @racket[v] represents a valid domain,
- @racket[#f] otherwise.
-}
-
-@defproc[(cookie-name? [v any/c]) boolean?]{
- Returns @racket[#t] if @racket[v] is a valid cookie name string,
- @racket[#f] otherwise.
-}
-
-@defproc[(cookie-value? [v any/c]) boolean?]{
- Returns @racket[#t] if @racket[v] is a valid cookie value string,
- @racket[#f] otherwise.
-}
-
-@defproc[(set-cookie [name cookie-name?] [value cookie-value?]) cookie?]{
-
-Creates a new cookie, with default values for required fields.}
-
-@defproc[(cookie:add-comment [cookie cookie?] [comment string?])
-         cookie?]{
-
-Modifies @racket[cookie] with a comment, and also returns
-@racket[cookie].}
-
-@defproc[(cookie:add-domain [cookie cookie?] [domain valid-domain?])
-         cookie?]{
-
-Modifies @racket[cookie] with a domain, and also returns
-@racket[cookie]. The @racket[domain] must match a prefix of the
-request URI.}
-
-@defproc[(cookie:add-max-age [cookie cookie?] [seconds exact-nonnegative-integer?])
-         cookie?]{
-
-Modifies @racket[cookie] with a maximum age, and also returns
-@racket[cookie]. The @racket[seconds] argument is number of seconds
-that a client should retain the cookie.}
-
-@defproc[(cookie:add-path [cookie cookie?] [path valid-path?])
-         cookie?]{
-
-Modifies @racket[cookie] with a path, and also returns
-@racket[cookie].}
-
-@defproc[(cookie:add-expires [cookie cookie?] [path string])
-         cookie?]{
-
-Modifies @racket[cookie] with an expiration, and also returns
-@racket[cookie].}
-
-@defproc[(cookie:secure [cookie cookie?] [secure boolean?])
-         cookie?]{
-
-Modifies @racket[cookie] with a security flag, and also returns
-@racket[cookie].}
-
-@defproc[(cookie:version [cookie cookie?] [version exact-nonnegative-integer?])
-         cookie?]{
-
-Modifies @racket[cookie] with a version, and also returns
-@racket[cookie]. The default is the only known incarnation of HTTP
-cookies: @racket[1].}
-
-@defproc[(print-cookie [cookie cookie?]) string?]{
-
-Prints @racket[cookie] to a string. Empty fields do not appear in the
-output except when there is a required default.}
-
-
-@defproc[(get-cookie [name cookie-name?] [cookies string?]) (listof cookie-value?)]{
-
-Returns a list with all the values (strings) associated with @racket[name].
-
-The method used to obtain the @racket["Cookie"] header depends on the
-web server.  It may be an environment variable (CGI), or you may have
-to read it from the input port (FastCGI), or maybe it comes in an
-initial-request structure, etc.  The @racket[get-cookie] and
-@racket[get-cookie/single] procedure can be used to extract fields
-from a @racket["Cookie"] field value.}
-
-
-@defproc[(get-cookie/single [name cookie-name?] [cookies string?]) (or/c cookie-value? false/c)]{
-
-Like @racket[get-cookie], but returns the just first value string
-associated to @racket[name], or #f if no association is found.}
-
-
-@defstruct[(cookie-error exn:fail) ()]{
-
-Raised for errors when handling cookies.}
-
-@section[#:tag "cookie-examples"]{Examples}
-
-@subsection{Creating a cookie}
-
-@racketblock[
-(let ([c (cookie:add-max-age
-          (cookie:add-path
-           (set-cookie "foo" "bar")
-           "/servlets")
-          3600)])
-  (print-cookie c))
-]
-
-Produces
-
-@racketblock[
-@#,racketresultfont{"foo=bar; Max-Age=3600; Path=/servlets; Version=1"}
-]
-
-To use this output in a ``regular'' CGI, instead of the last line use:
-
-@racketblock[
-  (display (format "Set-Cookie: ~a" (print-cookie c)))
-]
-
-and to use with the PLT Web Server, use:
-
-@racketblock[
-  (make-response/full code message (current-seconds) mime
-                      (list (make-header #"Set-Cookie" (string->bytes/utf-8 (print-cookie c))))
-                      body)
-]
-
-@subsection{Parsing a cookie}
-
-Imagine your Cookie header looks like this:
-
-@interaction[
-#:eval cookie-eval
-(define cookies 
-  "test2=2; test3=3; xfcTheme=theme6; xfcTheme=theme2")
-]
-
-Then, to get the values of the xfcTheme cookie, use
-
-@interaction[
-#:eval cookie-eval
-(get-cookie "xfcTheme" cookies)
-(get-cookie/single "xfcTheme" cookies)
-]
-
-If you try to get a cookie that simply is not there:
-
-@interaction[
-#:eval cookie-eval
-(get-cookie/single "foo" cookies)
-(get-cookie "foo" cookies)
-]
-
-Note that not having a cookie is normally not an error.  Most clients
-won't have a cookie set then first arrive at your site.
-
-
-@; ----------------------------------------
-
-@section{Cookie Unit}
-
-@margin-note{@racket[cookie@] and @racket[cookie^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/cookie] module.}
-
-@defmodule[net/cookie-unit]
-
-@defthing[cookie@ unit?]{
-
-Imports nothing, exports @racket[cookie^].}
-
-@; ----------------------------------------
-
-@section{Cookie Signature}
-
-@defmodule[net/cookie-sig]
-
-@defsignature[cookie^ ()]{}
-
-Includes everything exported by the @racketmodname[net/cookie] module.
-
-
-@close-eval[cookie-eval]
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/dns.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/dns.scrbl
deleted file mode 100644
index bdc5a72f94..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/dns.scrbl
+++ /dev/null
@@ -1,83 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label net/dns net/dns-unit net/dns-sig))
-
-@title[#:tag "dns"]{DNS: Domain Name Service Queries}
-
-@defmodule[net/dns]{The @racketmodname[net/dns] library provides
-utilities for looking up hostnames.
-
-Thanks to Eduardo Cavazos and Jason Crowe for repairs and
-improvements.}
-
-@; ----------------------------------------
-
-@section[#:tag "dns-proc"]{Functions}
-
-@defproc[(dns-get-address [nameserver string?]
-                          [address string?]
-                          [#:ipv6? ipv6? any/c #f])
-         string?]{
-
-Consults the specified nameserver (normally a numerical address like
-@racket["128.42.1.30"]) to obtain a numerical address for the given
-Internet address.
-
-The query record sent to the DNS server includes the "recursive" bit,
-but @racket[dns-get-address] also implements a recursive search itself
-in case the server does not provide this optional feature.
-
-If @racket[ipv6?] is a true value, then the numerical address
-that is returned will be an IPv6 address. If no AAAA record exists,
-an error will be raised.
-}
-
-
-@defproc[(dns-get-name [nameserver string?]
-                       [address string?])
-         string?]{
-
-Consults the specified nameserver (normally a numerical address like
-@racket["128.42.1.30"]) to obtain a name for the given numerical
-address.}
-
-
-@defproc[(dns-get-mail-exchanger [nameserver string?]
-                                 [address string?])
-         string?]{
-
-Consults the specified nameserver to obtain the address for a mail
-exchanger the given mail host address. For example, the mail exchanger
-for @racket["ollie.cs.rice.edu"] might be @racket["cs.rice.edu"].}
-
-
-
-@defproc[(dns-find-nameserver) (or/c string? false/c)]{
-
-Attempts to find the address of a nameserver on the present system.
-On Unix and Mac OS X, this procedure parses @filepath{/etc/resolv.conf} to
-extract the first nameserver address. On Windows, it runs
-@exec{nslookup.exe}.}
-
-@; ----------------------------------------
-
-@section{DNS Unit}
-
-@margin-note{@racket[dns@] and @racket[dns^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/dns] module.}
-
-@defmodule[net/dns-unit]
-
-@defthing[dns@ unit?]{
-
-Imports nothing, exports @racket[dns^].}
-
-@; ----------------------------------------
-
-@section{DNS Signature}
-
-@defmodule[net/dns-sig]
-
-@defsignature[dns^ ()]{}
-
-Includes everything exported by the @racketmodname[net/dns] module.
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/ftp.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/ftp.scrbl
deleted file mode 100644
index e7c317396c..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/ftp.scrbl
+++ /dev/null
@@ -1,175 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label net/ftp net/ftp-unit net/ftp-sig))
-
-@title[#:tag "ftp"]{FTP: Client}
-
-@author["Micah Flatt"
-        (author+email "Chen Xiao" "chenxiao770117@gmail.com")]
-
-@defmodule[net/ftp]{The @racketmodname[net/ftp] library provides
-utilities for FTP client operations.}
-
-
-@section[#:tag "ftp-procs"]{Functions}
-
-@defproc[(ftp-connection? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] represents an FTP connection as
-returned by @racket[ftp-establish-connection], @racket[#f] otherwise.}
-
-
-@defproc[(ftp-establish-connection [server string?]
-                                   [port-no (integer-in 0 65535)]
-                                   [user string?]
-                                   [passwd string?])
-          ftp-connection?]{
-
-Establishes an FTP connection with the given server using the supplied
-username and password. The @racket[port-np] argument usually should be
-@racket[21].}
-
-
-@defproc[(ftp-close-connection [ftp-conn ftp-connection?]) void?]{
-
-Closes an FTP connection.}
-
-
-@defproc[(ftp-cd [ftp-conn ftp-connection?] [new-dir string?]) void?]{
-
-Changes the current directory on the FTP server to @racket[new-dir].
-The @racket[new-dir] argument is not interpreted at all, but simply
-passed on to the server; it must not contain a newline.}
-
-@defproc[(ftp-directory-list [ftp-conn ftp-connection?]
-                             [path (or/c false/c string?) #f])
-         (listof (list/c (one-of/c "-" "d" "l")
-                         string?
-                         string?))]{
-
-Returns a list of files and directories in the current directory of the
-server, assuming that the server provides directory information in the
-quasi-standard Unix format.  If a @racket[path] argument is given, use
-it instead of the current directory.
-
-Each file or directory is represented by a list of three or four
-strings.  The first string is either @racket["-"], @racket["d"], or
-@racket["l"], depending on whether the items is a file, directory, or
-link, respectively.  The second item is the file's date; to convert this
-value to seconds consistent with @racket[file-seconds], pass the date
-string to @racket[ftp-make-file-seconds].  The third string is the name
-of the file or directory.  If the item is a file (the first string is
-@racket["-"]), and if the line that the server replied with has a size
-in the expected place, then a fourth string containing this size is
-included.
-
-Warning: the FTP protocol has no specification for the reply format, so
-this information can be unreliable.}
-
-
-@defproc[(ftp-make-file-seconds [ftp-date string?]) exact-integer?]{
-
-Takes a date string produced by @racket[ftp-directory-list] and
-converts it to seconds (which can be used with
-@racket[seconds->date]).
-
-Warning: the FTP protocol has no specification for the reply format, so
-this information can be unreliable.}
-
-
-@defproc[(ftp-download-file [ftp-conn ftp-connection?]
-                            [local-dir path-string?]
-                            [file string?]
-                            [#:progress progress-proc
-                                        (or/c #f 
-                                              (-> (-> (values exact-nonnegative-integer? 
-                                                              evt?)) 
-                                                  any)) 
-                                        #f]) 
-         void?]{
-
-Downloads @racket[file] from the server's current directory and puts
-it in @racket[local-dir] using the same name. If the file already
-exists in the local directory, it is replaced, but only after the
-transfer succeeds (i.e., the file is first downloaded to a temporary
-file in @racket[local-dir], then moved into place on success).
-
-If @racket[progress-proc] is not @racket[#f], then it is called with a
-function @racket[_get-count] that returns two values: the number of bytes
-transferred so far, and an event that becomes ready when the
-transferred-bye count changes. The @racket[_get-count] function can be
-called in any thread and any number of times. The @racket[progress-proc] function should
-return immediately, perhaps starting a thread that periodically polls
-@racket[_get-count]. Do not poll too frequently, or else polling
-will slow the transfer; the second argument from @racket[_get-count]
-is intended to limit polling.
-
-@racketblock[
-(ftp-download-file
- ftp-conn "." "testfile"
- #:progress
- (lambda (get-count)
-   (thread
-    (lambda ()
-      (let loop ()
-        (define-values (count changed-evt) (get-count))
-        (printf "~a bytes downloaded\n" count)
-        (sync changed-evt)
-        (loop))))))
-]}
-
-@defproc[(ftp-upload-file [ftp-conn ftp-connection?]
-                          [file-path path-string?]
-                          [#:progress progress-proc
-                                      (or/c #f 
-                                            (-> (-> (values exact-nonnegative-integer? 
-                                                            evt?)) 
-                                                any)) 
-                                      #f])
-         void?]{
-
-Upload @racket[file-path] to the server's current directory using the same name. 
-If the file already exists in the local directory, it is replaced.
-The @racket[progress-proc] argument is used in the same way as in @racket[ftp-download-file],
-but to report uploaded bytes instead of downloaded bytes.}
-
-@defproc[(ftp-delete-file [ftp-conn ftp-connection?]
-                          [file-path path-string?]) void?]{
-Delete the remote file use the @racket[file-path] on the server.}
-
-@defproc[(ftp-make-directory [ftp-conn ftp-connection?]
-                             [dir-name string?]) void?]{
-Make remote directory use the @racket[dir-name].}
-
-@defproc[(ftp-delete-directory [ftp-conn ftp-connection?]
-                               [dir-name string?]) void?]{
-Delete remote directory use the @racket[dir-name].}
-
-@defproc[(ftp-rename-file [ftp-conn ftp-connection?]
-                          [origin string?]
-                          [dest string?]) void?]{
-Rename remote file name from @racket[origin] to @racket[dest].}
-
-
-@; ----------------------------------------
-
-@section{FTP Unit}
-
-@margin-note{@racket[ftp@] and @racket[ftp^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/ftp] module.}
-
-@defmodule[net/ftp-unit]
-
-@defthing[ftp@ unit?]{
-
-Imports nothing, exports @racket[ftp^].}
-
-@; ----------------------------------------
-
-@section{FTP Signature}
-
-@defmodule[net/ftp-sig]
-
-@defsignature[ftp^ ()]{}
-
-Includes everything exported by the @racketmodname[net/ftp] module.
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/git-checkout.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/git-checkout.scrbl
deleted file mode 100644
index da6b92ce65..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/git-checkout.scrbl
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label net/git-checkout))
-
-@title[#:tag "git-checkout"]{Git Repository Checkout}
-
-@defmodule[net/git-checkout]{The @racketmodname[net/git-checkout]
-library provides support for extracting a directory tree from a Git
-repository that is hosted by a server that implements the @tt{git://}
-protocol or its layering over HTTP(S). The
-@racketmodname[net/git-checkout] library does not rely on external
-binaries (such as a @exec{git} client) or Git-specific native
-libraries (such as @filepath{libgit}).}
-
-When run as a program, @racket[net/git-checkout] accepts command-line
-arguments to drive the checkout. Use
-@;
-@commandline{racket -l- net/git-checkout -h}
-@;
-for information on command-line arguments and flags.
-
-@defproc[(git-checkout [hostname string?]
-                       [repository string?]
-                       [#:dest-dir dest-dir (or/c path-string? #f)]
-                       [#:ref ref string? "master"]
-                       [#:transport transport (or/c 'git 'http 'https) 'git]
-                       [#:depth depth (or/c #f exact-positive-integer?) 1]
-                       [#:status-printf status-printf (string? any/c ... . -> . void?) (lambda args
-                                                                                         (apply printf args)
-                                                                                         (flush-output))]
-                       [#:tmp-dir given-tmp-dir (or/c #f path-string?) #f]
-                       [#:clean-tmp-dir? clean-tmp-dir? any/c (not given-tmp-dir)]
-                       [#:verify-server? verify-server? any/c #t]
-                       [#:port port (or/c #f (integer-in 1 65535)) (case transport
-                                                                     [(git) 9418]
-                                                                     [(http) 80]
-                                                                     [(https) 443])])
-         string?]{
-
-Contacts the server at @racket[hostname] and @racket[port]
-(where @racket[#f] is replaced by the default)
-to download the repository whose name on the server is
-@racket[repository] (normally ending in @filepath{.git}).  The tree
-within the repository that is identified by @racket[ref] (which can be
-a branch, tag, commit ID, or tree ID) is extracted to
-@racket[dest-dir], and the result id an ID corresponding to @racket[ref].
-
-If @racket[transport] is @racket['git], then the server is contacted
-using Git's native transport. If @racket[transport] is
-@racket['http] or @racket['https], then the server is contacted using
-HTTP(S).  In the case of @racket['https],
-the server's identity is verified unless @racket[verify-server?] is
-false or the @indexed-envvar{GIT_SSL_NO_VERIFY} environment variable
-is set.
-
-If @racket[dest-dir] is @racket[#f], then the result is an ID
-determined for @racket[ref] from just the server's report of the
-available branches and tags, or @racket[ref] itself if it does not
-match a branch or tag name and looks like an ID.
-
-A local clone of the repository is @emph{not} preserved, but is
-instead discarded after the tree is extracted to @racket[dest-dir].
-If @racket[dest-dir] does not exist, it is created. If
-@racket[dest-dir] does exist, its existing content is left in place
-except as replaced by content from the Git repository.
-
-If @racket[ref] identifies a branch or tag by either name or by
-commit ID, then the @tt{git://} protocol allows @racket[git-checkout]
-to download only the commits and objects relevant to the branch or
-tag. Furthermore, the default @racket[depth] argument allows
-@racket[git-checkout] to obtain only the latest commit and its
-objects, instead of the entire history of the branch or commit.  If
-@racket[ref] is any other commit ID or tree ID, then the entire
-repository is downloaded, including all branches.
-
-Status information is reported via @racket[status-printf]. The same
-information is always logged with the name @racket['git-checkout] at
-the @racket['info] level.
-
-If @racket[tmp-dir] is not @racket[#f], then it is used to store a
-temporary clone of the repository, and the files are preserved unless
-@racket[clean-tmp-dir?] is true. The clone does not currently match
-the shape that is recognized by other tools, such as @exec{git}, and
-so a preserved temporary directory is useful mainly for debugging.
-
-@history[#:added "6.1.1.1"]}
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/head.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/head.scrbl
deleted file mode 100644
index 66e1700edd..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/head.scrbl
+++ /dev/null
@@ -1,246 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/eval scribble/struct
-          (for-label net/head net/head-unit net/head-sig))
-
-@(define head-eval (make-base-eval))
-@interaction-eval[#:eval head-eval (require net/head)]
-
-@title[#:tag "head"]{Headers: Parsing and Constructing}
-
-@defmodule[net/head]{The @racketmodname[net/head] module provides
-utilities for parsing and constructing RFC 822 headers
-@cite["RFC822"], which are used in protocols such as HTTP, SMTP, and
-NNTP.}
-
-A @deftech{header} is represented as a string or byte string
-containing CRLF-delimited lines. Each field within the header spans
-one or more lines. In addition, the header ends with two CRLFs
-(because the first one terminates the last field, and the second
-terminates the header).
-
-@; ----------------------------------------
-
-@section{Functions}
-
-@defthing[empty-header string?]{
-
-The string @racket["\r\n\r\n"], which corresponds to the empty header.
-This value is useful for building up headers with
-@racket[insert-field] and @racket[append-headers].}
-
-
-@defproc[(validate-header [candidate (or string? bytes?)]) void?]{
-
-Checks that @racket[candidate] matches RFC 822. If it does not, an
-exception is raised.}
-
-
-@defproc[(extract-field [field (or/c string? bytes?)] [header (or/c string? bytes?)])
-         (or/c string? bytes? false/c)]{
-
-Returns the header content for the specified field, or @racket[#f] if
-the field is not in the header. The @racket[field] string should not
-end with @racket[":"], and it is used case-insensitively. The returned
-string will not contain the field name, color separator, or CRLF
-terminator for the field; however, if the field spans multiple lines,
-the CRLFs separating the lines will be intact.
-
-The @racket[field] and @racket[header] arguments must be both strings
-or both byte strings, and the result (if not @racket[#f]) is of the
-same type.
-
-@examples[
-#:eval head-eval
-(extract-field "TO" (insert-field "to" "me@localhost" 
-                                  empty-header))
-]}
-
-@defproc[(extract-all-fields [header (or/c string? bytes?)])
-         (listof (cons/c (or/c string? bytes?)
-                         (or/c string? bytes?)))]{
-
-Returns an association-list version of the header; the case of the
-field names is preserved, as well as the order and duplicate uses of a
-field name.
-
-The result provides strings if @racket[header] is a string, byte
-strings if @racket[header] is a byte string.}
-
-
-@defproc[(remove-field [field (or/c string? bytes?)]
-                       [header (or/c string? bytes?)])
-          (or/c string? bytes?)]{
-
-Creates a new header by removing the specified field from
-@racket[header] (or the first instance of the field, if it occurs
-multiple times). If the field is not in @racket[header], then the
-return value is @racket[header].
-
-The @racket[field] and @racket[header] arguments must be both strings
-or both byte strings, and the result is of the same type.}
-
-
-@defproc[(insert-field [field (or/c string? bytes?)]
-                       [value (or/c string? bytes?)]
-                       [header (or/c string? bytes?)])
-          (or/c string? bytes?)]{
-
-Creates a new header by prefixing the given @racket[header] with the
-given @racket[field]-@racket[value] pair. The @racket[value] string
-should not contain a terminating CRLF, but a multi-line value (perhaps
-created with @racket[data-lines->data]) may contain separator CRLFs.
-
-The @racket[field], @racket[value], and @racket[header] arguments must
-be all strings or all byte strings, and the result is of the same
-type.}
-
-
-@defproc[(replace-field [field (or/c string? bytes?)]
-                        [value (or/c string? bytes? false/c)]
-                        [header (or/c string? bytes?)])
-          (or/c string? bytes?)]{
-
-Composes @racket[remove-field] and (if @racket[value] is not
-@racket[#f]) @racket[insert-field].}
-
-@defproc[(append-headers [header1 (or/c string? bytes?)]
-                         [header2 (or/c string? bytes?)])
-          (or/c string? bytes?)]{
-
-Appends two headers.
-
-The @racket[header1] and @racket[header2] arguments must be both
-strings or both byte strings, and the result is of the same type.}
-
-
-@defproc[(standard-message-header [from string?]
-                                  [to (listof string?)]
-                                  [cc (listof string?)]
-                                  [bcc (listof string?)]
-                                  [subject string?])
-          string?]{
-
-Creates a standard mail header given the sender, various lists of
-recipients, a subject. A @racket["Date"] field is added to the header
-automatically, using the current time.
-
-The BCC recipients do not actually appear in the header, but they're
-accepted anyway to complete the abstraction.}
-
-
-@defproc[(data-lines->data (listof string?)) string?]{
-
-Merges multiple lines for a single field value into one string,
-adding CRLF-TAB separators.}
-
-
-@defproc[(extract-addresses [line string?]
-                            [kind (one-of/c 'name 'address
-                                            'full 'all)])
-          (or/c (listof string?)
-                (listof (list/c string? string? string?)))]{
-
-Parses @racket[string] as a list of comma-delimited mail addresses,
-raising an exception if the list is ill-formed. This procedure can be
-used for single-address strings, in which case the returned list
-contains only one address.
-
-The @racket[kind] argument specifies which portion of an address
-should be returned:
-
-@itemize[
-
- @item{@racket['name] --- the free-form name in the address, or the
-       address itself if no name is available.
-
-       @examples[
-       #:eval head-eval
-       (extract-addresses "John Doe <doe@localhost>" 'name)
-       (extract-addresses "doe@localhost (Johnny Doe)" 'name)
-       (extract-addresses "doe@localhost" 'name)
-       (extract-addresses " \"Doe, John\" <doe@localhost>, jane"
-                          'name)
-       ]}
-
- @item{@racket['address] --- just the mailing address, without any free-form
-               names.
-
-       @examples[
-       #:eval head-eval
-       (extract-addresses "John Doe <doe@localhost>" 'address)
-       (extract-addresses "doe@localhost (Johnny Doe)" 'address)
-       (extract-addresses "doe@localhost" 'address)
-       (extract-addresses " \"Doe, John\" <doe@localhost>, jane"
-                          'address)
-       ]}
-
- @item{@racket['full] --- the full address, essentially as it appears in the
-       input, but normalized.
-
-       @examples[
-       #:eval head-eval
-       (extract-addresses "John Doe   < doe@localhost >" 'full)
-       (extract-addresses "  doe@localhost  (Johnny Doe)" 'full)
-       (extract-addresses "doe@localhost" 'full)
-       (extract-addresses " \"Doe, John\" <doe@localhost>, jane"
-                          'full)
-       ]}
-
- @item{@racket['all] --- a list containing each of the three possibilities:
-              free-form name, address, and full address (in that
-              order).
-
-       @examples[
-       #:eval head-eval
-       (extract-addresses "John Doe <doe@localhost>" 'all)
-       (extract-addresses "doe@localhost (Johnny Doe)" 'all)
-       (extract-addresses "doe@localhost" 'all)
-       (define r
-         (extract-addresses " \"John\" <doe@localhost>, jane"
-                            'all))
-       (length r)
-       (car r)
-       (cadr r)
-       ]}
-
-]}
-
-
-@defproc[(assemble-address-field (addrs (listof string?))) string?]{
-
-Creates a header field value from a list of addresses. The addresses
-are comma-separated, and possibly broken into multiple lines.
-
-@examples[
-#:eval head-eval
-(assemble-address-field '("doe@localhost" 
-                          "Jane <jane@elsewhere>"))
-]}
-
-
-@; ----------------------------------------
-
-@section{Header Unit}
-
-@margin-note{@racket[head@] and @racket[head^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/head] module.}
-
-@defmodule[net/head-unit]
-
-@defthing[head@ unit?]{
-
-Imports nothing, exports @racket[head^].}
-
-@; ----------------------------------------
-
-@section{Header Signature}
-
-@defmodule[net/head-sig]
-
-@defsignature[head^ ()]{}
-
-Includes everything exported by the @racketmodname[net/head] module.
-
-
-@close-eval[head-eval]
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/http-client.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/http-client.scrbl
deleted file mode 100644
index 9b8d2bccd8..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/http-client.scrbl
+++ /dev/null
@@ -1,181 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/bnf
-          (for-label net/http-client
-                     racket/list
-                     openssl))
-
-@title[#:tag "http-client"]{HTTP Client}
-
-@defmodule[net/http-client]{The @racketmodname[net/http-client] library provides
-utilities to use the HTTP protocol.}
-
-@defproc[(http-conn? [x any/c])
-         boolean?]{
-
-Identifies an HTTP connection.
-                   
-}
-
-@defproc[(http-conn-live? [x any/c])
-         boolean?]{
-
-Identifies an HTTP connection that is "live", i.e. one for which
-@racket[http-conn-send!] is valid.
-
-}
-
-@defproc[(http-conn)
-         http-conn?]{
-
-Returns a fresh HTTP connection.
-
-}
-
-@defproc[(http-conn-open! [hc http-conn?] [host (or/c bytes? string?)]
-                          [#:ssl? ssl? (or/c boolean? ssl-client-context? symbol?) #f]
-                          [#:port port (between/c 1 65535) (if ssl? 443 80)])
-         void?]{
-
-Uses @racket[hc] to connect to @racket[host] on port @racket[port]
-using SSL if @racket[ssl?] is not @racket[#f] (using @racket[ssl?] as
-an argument to @racket[ssl-connect] to, for example, check
-certificates.)
-
-If @racket[hc] is live, the connection is closed.
-
-}
-
-@defproc[(http-conn-open [host (or/c bytes? string?)]
-                         [#:ssl? ssl? (or/c boolean? ssl-client-context? symbol?) #f]
-                         [#:port port (between/c 1 65535) (if ssl? 443 80)])
-         http-conn?]{
-
-Calls @racket[http-conn-open!] with a fresh connection, which is returned.
-
-}
-
-@defproc[(http-conn-close! [hc http-conn?])
-         void?]{
-
-Closes @racket[hc] if it is live.
-
-}
-
-@defproc[(http-conn-abandon! [hc http-conn?])
-         void?]{
-
-Closes the output side of @racket[hc], if it is live.
-
-}
-
-@defproc[(http-conn-send! [hc http-conn-live?] [uri (or/c bytes? string?)]
-                          [#:version version (or/c bytes? string?) #"1.1"]
-                          [#:method method (or/c bytes? string? symbol?) #"GET"]
-                          [#:close? close? boolean? #f]
-                          [#:headers headers (listof (or/c bytes? string?)) empty]
-                          [#:content-decode decodes (listof symbol?) '(gzip)]
-                          [#:data data (or/c false/c bytes? string? data-procedure/c) #f])
-         void?]{
-
-Sends an HTTP request to @racket[hc] to the URI @racket[uri] using
-HTTP version @racket[version] the method @racket[method] and the
-additional headers given in @racket[headers] and the additional data
-@racket[data].
-
-If @racket[data] is a procedure, it will be called once with a
-procedure of one argument, which is a string or
-byte string to be written to the request body using
-chunked transfer encoding.
-
-If @racket[headers] does not contain an @litchar{Accept-Encoding}
-header, then a header indicating that encodings from @racket[decodes]
-are accepted is automatically added.
-
-If @racket[close?] is @racket[#t] and @racket[headers] does not
-contain a @litchar{Connection} header, then a @litchar{Connection:
-close} header will be added.
-
-This function does not support requests that expect
-@litchar{100 (Continue)} responses.
-
-}
-
-@defproc[(http-conn-recv! [hc http-conn-live?]
-                          [#:content-decode decodes (listof symbol?) '(gzip)]
-                          [#:close? close? boolean? #f])
-         (values bytes? (listof bytes?) input-port?)]{
-
-Parses an HTTP response from @racket[hc], while decoding the encodings
-listed in @racket[decodes].
-
-Returns the status line, a list of headers, and an port which contains
-the contents of the response.
-
-If @racket[close?] is @racket[#t], then the connection will be closed
-following the response parsing. If @racket[close?] is @racket[#f],
-then the connection is only closed if the server instructs the client
-to do so.
-
-}
-
-@defproc[(http-conn-sendrecv! [hc http-conn-live?] [uri (or/c bytes? string?)]
-                              [#:version version (or/c bytes? string?) #"1.1"]
-                              [#:method method (or/c bytes? string? symbol?) #"GET"]
-                              [#:headers headers (listof (or/c bytes? string?)) empty]
-                              [#:data data (or/c false/c bytes? string? data-procedure/c) #f]
-                              [#:content-decode decodes (listof symbol?) '(gzip)]
-                              [#:close? close? boolean? #f])
-         (values bytes? (listof bytes?) input-port?)]{
-
-Calls @racket[http-conn-send!] and @racket[http-conn-recv!] in sequence.
-
-}
-
-@defproc[(http-sendrecv [host (or/c bytes? string?)] [uri (or/c bytes? string?)]
-                        [#:ssl? ssl? (or/c boolean? ssl-client-context? symbol?) #f]
-                        [#:port port (between/c 1 65535) (if ssl? 443 80)]
-                        [#:version version (or/c bytes? string?) #"1.1"]                          
-                        [#:method method (or/c bytes? string? symbol?) #"GET"]
-                        [#:headers headers (listof (or/c bytes? string?)) empty]
-                        [#:data data (or/c false/c bytes? string? data-procedure/c) #f]
-                        [#:content-decode decodes (listof symbol?) '(gzip)])
-         (values bytes? (listof bytes?) input-port?)]{
-
-Calls @racket[http-conn-send!] and @racket[http-conn-recv!] in
-sequence on a fresh HTTP connection produced by
-@racket[http-conn-open].
-
-The HTTP connection is not returned, so it is always closed after one
-response, which is why there is no @racket[#:closed?] argument like
-@racket[http-conn-recv!].
-
-}
-
-@defthing[data-procedure/c chaperone-contract?]{
-
-Contract for a procedure that accepts a procedure of one
-argument, which is a string or byte string:
-@racket[(-> (-> (or/c bytes? string?) void?) any)].
-
-}
-
-@section[#:tag "faq"]{Troubleshooting and Tips}
-
-@subsection{How do I send properly formatted POST form requests?}
-
-You should send a @litchar{Content-Type} header with the value
-@litchar{application/x-www-form-urlencoded} and send the data
-formatted by @racketmodname[net/uri-codec]'s
-@racket[form-urlencoded-encode] function. For example,
-
-@(require (for-label net/uri-codec))
-@racketblock[
-(http-send!
-   hc "/login"
-   #:method "POST"
-   #:data
-   (alist->form-urlencoded
-    (list (cons 'username "Ryu")
-          (cons 'password "Sheng Long")))
-   #:headers (list "Content-Type: application/x-www-form-urlencoded"))             
-]
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/imap.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/imap.scrbl
deleted file mode 100644
index e1e47044d2..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/imap.scrbl
+++ /dev/null
@@ -1,530 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/eval scribble/struct
-          (for-label net/imap net/imap-unit net/imap-sig))
-
-@(define (just-report)
-  @elem{This operation does not communicate with the server. It merely reports
-        the result of previous communication.})
-
-@(define-syntax-rule (flag-table (section [sym0 flag0] [sym flag] ...) ...)
-  (let ([spacer (hspace 1)]
-        [to-flow (lambda (e)
-                  (make-flow (list (make-paragraph (list e)))))])
-   (make-table
-    #f
-    (append
-     (list
-      (list (to-flow spacer)
-            (to-flow spacer)
-            (to-flow spacer)
-            (to-flow (italic "symbol"))
-            (to-flow spacer)
-            (to-flow (italic "IMAP flag"))))
-     (let ([sec section])
-       (list
-         (list (to-flow spacer)
-               (to-flow sec)
-               (to-flow spacer)
-               (to-flow (racket sym0))
-               (to-flow spacer)
-               (to-flow (racket flag0)))
-         (list (to-flow spacer)
-               (to-flow spacer)
-               (to-flow spacer)
-               (to-flow (racket sym))
-               (to-flow spacer)
-               (to-flow (racket flag)))
-         ...))
-     ...))))
-
-@title[#:tag "imap"]{IMAP: Reading Mail}
-
-@defmodule[net/imap]{The @racketmodname[net/imap] module provides
-utilities for the client side of Internet Message Access Protocol
-version 4rev1 @cite["RFC2060"].}
-
-@; ----------------------------------------
-
-@section{Connecting and Selecting Mailboxes}
-
-@defproc[(imap-connection? [v any/c]) boolean?]{
-
-Return @racket[#t] if @racket[v] is a IMAP-connection value (which is
-opaque), @racket[#f] otherwise.}
-
-@defproc[(imap-connect [server string?]
-                       [username (or/c string? bytes?)]
-                       [password (or/c string? bytes?)]
-                       [mailbox (or/c string? bytes?)]
-                       [#:tls? tls? any/c #f]
-                       [#:try-tls? try-tls? any/c #t])
-         (values imap-connection? exact-nonnegative-integer? exact-nonnegative-integer?)]{
-
-Establishes an IMAP connection to the given server using the given
-username and password, and selects the specified mailbox. If
-@racket[tls?]  is true, a TLS connection is made to the server before
-communicating using the IMAP protocol. If @racket[tls?] is @racket[#f]
-but @racket[try-tls?] is true, then after the IMAP connection is
-initially established, the connection is switched to a TLS connection
-if the server supports it.
-
-The first result value represents the connection.
-The second and third return values indicate the total number of
-messages in the mailbox and the number of recent messages (i.e.,
-messages received since the mailbox was last selected), respectively.
-
-See also @racket[imap-port-number].
-
-A user's primary mailbox is always called
-@racket["INBOX"]. (Capitalization doesn't matter for that mailbox
-name.)
-
-Updated message-count and recent-count values are available through
-@racket[imap-messages] and @racket[imap-recent]. See also @racket[imap-new?] and
-@racket[imap-reset-new!].}
-
-
-@defparam[imap-port-number k (integer-in 0 65535)]{
-
-A parameter that determines the server port number. The initial value
-is @racket[143].}
-
-
-@defproc[(imap-connect* [in input-port?]
-                        [out output-port?]
-                        [username (or/c string? bytes?)]
-                        [password (or/c string? bytes?)]
-                        [mailbox (or/c string? bytes?)]
-                        [#:tls? tls? any/c #f]
-                        [#:try-tls? try-tls? any/c #t])
-         (values imap-connection? exact-nonnegative-integer? exact-nonnegative-integer?)]{
-
-Like @racket[imap-connect], but given input and output ports (e.g.,
-ports for an SSL session) instead of a server address.}
-
-
-@defproc[(imap-disconnect [imap imap-connection?]) void?]{
-
-Closes an IMAP connection. The close may fail due to a communication
-error.}
-
-
-@defproc[(imap-force-disconnect [imap imap-connection?]) void?]{
-
-Closes an IMAP connection forcefully (i.e., without send a close
-message to the server). A forced disconnect never fails.}
-
-
-@defproc[(imap-reselect [imap imap-connection?]
-                        [mailbox (or/c string? bytes?)])
-         (values exact-nonnegative-integer? exact-nonnegative-integer?)]{
-
-De-selects the mailbox currently selected by the connection and
-selects the specified mailbox, returning the total and recent message
-counts for the new mailbox. Expunge and message-state information is
-removed.
-
-Do not use this procedure to poll a mailbox to see whether there are
-any new messages. Use @racket[imap-noop], @racket[imap-new?], and
-@racket[imap-reset-new!]  instead.}
-
-
-@defproc[(imap-examine [imap imap-connection?]
-                       [mailbox (or/c string? bytes?)])
-         (values exact-nonnegative-integer? exact-nonnegative-integer?)]{
-
-Like @racket[imap-reselect], but the mailbox is selected as read-only.}
-
-@; ----------------------------------------
-
-@section{Selected Mailbox State}
-
-@defproc[(imap-noop [imap imap-connection?])
-         (values exact-nonnegative-integer? exact-nonnegative-integer?)]{
-
-Sends a ``no-op'' message to the server, typically to keep the session
-alive. As for many commands, the server may report message-state
-updates or expunges, which are recorded in @racket[imap].
-
-The return information is the same as for @racket[imap-reselect].}
-
-
-@defproc[(imap-poll [imap imap-connection?]) void?]{
-
-Does not send a request to the server, but checks for asynchronous
-messages from the server that update the message count, to report
-expunges, etc.}
-
-
-@defproc[(imap-messages [imap imap-connection?]) exact-nonnegative-integer?]{
-
-Returns the number of messages in the selected mailbox. The server can
-update this count during most any interaction.
-
-@just-report[]}
-
-
-@defproc[(imap-recent [imap imap-connection?]) exact-nonnegative-integer?]{
-
-Returns the number of ``recent'' messages in the currently selected
-mailbox, as most recently reported by the server. The server can
-update this count during most any interaction.
-
-@just-report[]}
-
-
-@defproc[(imap-unseen [imap imap-connection?]) (or/c exact-nonnegative-integer? #f)]{
-
-Returns the number of ``unseen'' messages in the currently selected
-mailbox, as most recently reported by the server. The server can
-update this count during most any interaction. Old IMAP servers might
-not report this value, in which case the result is @racket[#f].
-
-@just-report[]}
-
-
-@defproc[(imap-uidnext [imap imap-connection?]) (or/c exact-nonnegative-integer? #f)]{
-
-Returns the predicted next uid for a message in the currently selected
-mailbox, as most recently reported by the server. The server can
-update this count during most any interaction. Old IMAP servers might
-not report this value, in which case the result is @racket[#f].
-
-@just-report[]}
-
-
-@defproc[(imap-uidvalidity [imap imap-connection?]) (or/c exact-nonnegative-integer? #f)]{
-
-Returns an id number that changes when all uids become invalid. The
-server @emph{cannot} update this number during a session. Old IMAP
-servers might not report this value, in which case the result is
-@racket[#f].
-
-@just-report[]}
-
-
-@defproc[(imap-new? [imap imap-connection?]) boolean?]{
-
-Returns @racket[#t] if the server has reported an increase in the
-message count for the currently mailbox since the last call to
-@racket[imap-reset-new!]. Selecting a mailbox implicitly calls
-@racket[imap-reset-new!].
-
-@just-report[]}
-
-
-@defproc[(imap-reset-new! [imap imap-connection?]) void?]{
-
-Resets the new flag for the session; see @racket[imap-new?].
-This operation does not communicate with the server.}
-
-
-@defproc[(imap-get-expunges [imap imap-connection?]) (listof exact-nonnegative-integer?)]{
-
-Returns pending expunge notifications from the server for the selected
-mailbox in terms of message positions (not uids), and clears the
-pending notifications. The result list is sorted, ascending.
-
-@just-report[]
-
-The server can notify the client of newly deleted messages during most
-other commands, but not asynchronously between commands. Furthermore,
-the server cannot report new deletions during @racket[imap-get-messages] or
-@racket[imap-store] operations.
-
-Before calling any IMAP operation that works in terms of message
-numbers, pending expunge notifications must be handled by calling
-@racket[imap-get-expunges].}
-
-
-@defproc[(imap-pending-expunges? [imap imap-connection?]) boolean?]{
-
-Returns @racket[#f] if @racket[imap-get-expunges] would return an
-empty list, @racket[#t] otherwise.}
-
-
-@defproc[(imap-get-updates [imap imap-connection?])
-         (listof (cons/c exact-nonnegative-integer?
-                         (listof pair?)))]{
-
-Returns information must like @racket[imap-get-messages], but includes
-information reported asynchronously by the server (e.g., to notify a
-client with some other client changes a message attribute).  Instead
-of reporting specific requested information for specific messages, the
-result is associates message positions to field-value association
-lists. The result list is sorted by message position, ascending.
-
-@just-report[] It also clears the update information from the
-connection after reporting it.
-
-When a server reports information that supersedes old reported
-information for a message, or if the server reports that a message has
-been deleted, then old information for the message is
-dropped. Similarly, if @racket[imap-get-messages] is used to
-explicitly obtain information, any redundant (or out-of-date)
-information is dropped.
-
-A client need not use @racket[imap-get-updates] ever, but accumulated
-information for the connection consumes space.}
-
-
-@defproc[(imap-pending-updates? [imap imap-connection?]) boolean?]{
-
-Returns @racket[#f] if @racket[imap-get-updates] would return an 
-list, @racket[#t] otherwise.}
-
-
-@; ----------------------------------------
-
-@section{Manipulating Messages}
-
-@defproc[(imap-get-messages [imap imap-connection?]
-                            [msg-nums (listof exact-nonnegative-integer?)]
-                            [fields (listof (or/c 'uid
-                                                  'header
-                                                  'body
-                                                  'flags))])
-         (listof list?)]{
-
-Downloads information for a set of messages. The @racket[msg-nums]
-argument specifies a set of messages by their message positions (not
-their uids). The @racket[fields] argument specifies the type of
-information to download for each message. The available fields are:
-
-@itemize[
-
-  @item{@racket['uid] --- the value is an integer}
-
-  @item{@racket['header] --- the value is a header (a string, but see
-        @racketmodname[net/head])}
-
- @item{@racket['body] --- the value is a byte string, with
-       CRLF-separated lines}
-
- @item{@racket['flags] --- the value is a list of symbols that
-       correspond to IMAP flags; see @racket[imap-flag->symbol]}
-
-]
-
-The return value is a list of entry items in parallel to
-@racket[msg-nums]. Each entry is itself a list containing value items
-in parallel to @racket[fields].
-
-Pending expunges must be handled before calling this function; see
-@racket[imap-get-expunges].
-
-@examples[
-(eval:alts (imap-get-message imap '(1 3 5) '(uid header))
-           '((107 #"From: larry@stooges.com ...")
-             (110 #"From: moe@stooges.com ...")
-             (112 #"From: curly@stooges.com ...")))
-]}
-
-@deftogether[(
-@defproc[(imap-flag->symbol [flag symbol?]) symbol?]
-@defproc[(symbol->imap-flag [sym symbol?]) symbol?]
-)]{
-
-An IMAP flag is a symbol, but it is generally not a convenient one to
-use within a Racket program, because it usually starts with a
-backslash. The @racket[imap-flag->symbol] and
-@racket[symbol->imap-flag] procedures convert IMAP flags to convenient
-symbols and vice-versa:
-
-@flag-table[
-("message flags:"
-     ['seen         '|\Seen|]
-     ['answered     '|\Answered|]
-     ['flagged      '|\Flagged|]
-     ['deleted      '|\Deleted|]
-     ['draft        '|\Draft|]
-     ['recent       '|\Recent|]
-)
-("mailbox flags:"
-     ['noinferiors   '|\Noinferiors|]
-     ['noselect      '|\Noselect|]
-     ['marked        '|\Marked|]
-     ['unmarked      '|\Unmarked|]
-     ['hasnochildren '|\HasNoChildren|]
-     ['haschildren   '|\HasChildren|]
-)
-]
-
-The @racket[imap-flag->symbol] and @racket[symbol->imap-flag]
-functions act like the identity function when any other symbol is
-provided.}
-
-
-@defproc[(imap-store [imap imap-connection?]
-                     [mode (or/c '+ '- '!)]
-                     [msg-nums (listof exact-nonnegative-integer?)]
-                     [imap-flags (listof symbol?)])
-         void?]{
-
-Sets flags for a set of messages. The mode argument specifies how
-flags are set:
-
-@itemize[
-
- @item{@racket['+] --- add the given flags to each message}
-
- @item{@racket['-] --- remove the given flags from each message}
-
- @item{@racket['!] --- set each message's flags to the given set}
-
-]
-
-The @racket[msg-nums] argument specifies a set of messages by their
-message positions (not their uids). The @racket[flags] argument
-specifies the imap flags to add/remove/install.
-
-Pending expunges must be handled before calling this function; see
-@racket[imap-get-expunges]. The server will not report back
-message-state changes (so they will not show up through
-@racket[imap-get-updates]).
-
-@examples[
-(eval:alts (imap-store imap '+ '(1 2 3) (list (symbol->imap-flag 'deleted)))
-           (void))
-(code:comment @#,t{marks the first three messages to be deleted})
-(eval:alts (imap-expunge imap) (void))
-(code:comment @#,t{permanently removes the first three messages (and possibly})
-(code:comment @#,t{others) from the currently-selected mailbox})
-]}
-
-
-@defproc[(imap-expunge [imap imap-connection?]) void?]{
-
-Purges every message currently marked with the @racket['|\Deleted|]
-flag from the mailbox.}
-
-@; ----------------------------------------
-
-@section{Querying and Changing (Other) Mailboxes}
-
-@defproc[(imap-copy [imap imap-connection?]
-                    [msg-nums (listof exact-nonnegative-integer?)]
-                    [dest-mailbox (or/c string? bytes?)])
-          void?]{
-
-Copies the specified messages from the currently selected mailbox to
-the specified mailbox.
-
-Pending expunges must be handled before calling this function; see
-@racket[imap-get-expunges].}
-
-
-@defproc[(imap-append [imap imap-connection?]
-                      [mailbox string?]
-                      [message (or/c string? bytes?)]
-                      [flags (listof (or/c 'seen 'answered 'flagged 
-                                           'deleted 'draft 'recent)) 
-                             '(seen)])
-         void?]{
-
-Adds a new message (containing @racket[message]) to the given
-mailbox.}
-
-
-@defproc[(imap-status [imap imap-connection?]
-                      [mailbox (or/c string? bytes?)]
-                      [statuses (listof symbol?)])
-         list?]{
-
-Requests information about a mailbox from the server, typically
-@emph{not} the currently selected mailbox.
-
-The @racket[statuses] list specifies the request, and the return value
-includes one value for each symbol in @racket[statuses]. The allowed
-status symbols are:
-
-@itemize[
-
-   @item{@racket['messages] --- number of messages}
-   @item{@racket['recent] --- number of recent messages}
-   @item{@racket['unseen] --- number of unseen messages}
-   @item{@racket['uidnext] --- uid for next received message}
-   @item{@racket['uidvalidity] --- id that changes when all uids are changed}
-
-]
-
-Use @racket[imap-messages] to get the message count for the currently
-selected mailbox, etc. Use @racket[imap-new?] and
-@racket[imap-reset-new!] to detect when new messages are available in
-the currently selected mailbox.}
-
-
-@defproc[(imap-mailbox-exists? [imap imap-connection?]
-                               [mailbox (or/c string? bytes?)])
-         boolean?]{
-
-Returns @racket[#t] if @racket[mailbox] exists, @racket[#f]
-otherwise.}
-
-
-@defproc[(imap-create-mailbox [imap imap-connection?]
-                              [mailbox (or/c string? bytes?)])
-         void?]{
-
-Creates @racket[mailbox]. (It must not exist already.)}
-
-
-@defproc[(imap-list-child-mailboxes [imap imap-connection?]
-                                    [mailbox (or/c string? bytes? #f)]
-                                    [delimiter (or/c string? bytes?)
-                                               (imap-get-hierarchy-delimiter)])
-         (listof (list/c (listof symbol?) bytes?))]{
-
-Returns information about sub-mailboxes of @racket[mailbox]; if
-@racket[mailbox] is @racket[#f], information about all top-level
-mailboxes is returned. The @racket[delimiter] is used to parse mailbox
-names from the server to detect hierarchy.
-
-The return value is a list of mailbox-information lists. Each
-mailbox-information list contains two items:
-
-@itemize[
-
- @item{a list of imap flags for the mailbox}
- 
- @item{the mailbox's name}
-
-]}
-
-
-@defproc[(imap-get-hierarchy-delimiter [imap imap-connection?]) bytes?]{
-
-Returns the server-specific string that is used as a separator in
-mailbox path names.}
-
-
-@defproc[(imap-mailbox-flags [imap imap-connection?]
-                             [mailbox (or/c string? bytes?)])
-         (listof symbol?)]{
-
-Returns a list of IMAP flags for the given mailbox. See also
-@racket[imap-flag->symbol].}
-
-@; ----------------------------------------
-
-@section{IMAP Unit}
-
-@margin-note{@racket[imap@] and @racket[imap^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/imap] module.}
-
-@defmodule[net/imap-unit]
-
-@defthing[imap@ unit?]{
-
-Imports nothing, exports @racket[imap^].}
-
-@; ----------------------------------------
-
-@section{IMAP Signature}
-
-@defmodule[net/imap-sig]
-
-@defsignature[imap^ ()]{}
-
-Includes everything exported by the @racketmodname[net/imap] module.
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/info.rkt b/pkgs/net-pkgs/net-doc/net/scribblings/info.rkt
deleted file mode 100644
index 456253bc84..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define scribblings '(("net.scrbl" (multi-page) (net-library))
-                      ("win32-ssl.scrbl" (multi-page) (net-library))))
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/mime.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/mime.scrbl
deleted file mode 100644
index a68b66370c..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/mime.scrbl
+++ /dev/null
@@ -1,261 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/struct
-          (for-label net/mime net/mime-unit net/mime-sig))
-
-@(define-syntax-rule (mime-table (type (sub-type0 ref0) (sub-type ref) ...) ...)
-  (let ([spacer (hspace 1)]
-        [to-flow (lambda (e)
-                  (make-flow (list (make-paragraph (list e)))))])
-   (make-table
-    #f
-    (append
-     (list
-      (list (to-flow (racket 'type))
-            (to-flow spacer)
-            (to-flow (racket 'sub-type0))
-            (to-flow spacer)
-            (to-flow ref0))
-      (list (to-flow spacer)
-            (to-flow spacer)
-            (to-flow (racket 'sub-type))
-            (to-flow spacer)
-            (to-flow ref))
-      ...)
-     ...))))
-
-@title[#:tag "mime"]{MIME: Decoding Internet Data}
-
-@defmodule[net/mime]{The @racketmodname[net/mime] library provides
-utilities for parsing and creating MIME encodings as described in RFC
-2045 through RFC 2049.
-
-The library was written by Francisco Solsona.}
-
-@; ----------------------------------------
-
-@section{Message Decoding}
-
-@defproc[(mime-analyze [message-in (or/c bytes? input-port)]
-                       [part? any/c #f])
-         message?]{
-
-Parses @racket[message-in] and returns the parsed result as a
-@racket[message] instance.
-
-If @racket[part?] is @racket[#f], then @racket[message-in] should
-start with the header for a full message; otherwise,
-@racket[message-in] should start with the header for a part within a
-message.}
-
-@defstruct[message ([version real?]
-                    [entity entity]
-                    [fields (listof string?)])]{
-
-A decoded MIME message. The version is @racket[1.0] by default. The
-@racket[entity] field represents the message data. The @racket[fields]
-field contains one string for each field in the message header.}
-
-@defstruct[entity ([type symbol?]
-                   [subtype symbol?]
-                   [charset symbol?]
-                   [encoding symbol?]
-                   [disposition disposition?]
-                   [params (listof (cons/c symbol? string?))]
-                   [id string?]
-                   [description string?]
-                   [other (listof string?)]
-                   [fields (listof string?)]
-                   [parts (listof message?)]
-                   [body (or/c (output-port? . -> . void?) null?)])]{
-
-Represents the content of a message or a sub-part. The
-@racket[mime-analyze] function chooses default values for fields
-when they are not specified in input.
-
-Standard values for the @racket[type] field include @racket['text],
-@racket['image], @racket['audio], @racket['video],
-@racket['application], @racket['message], and @racket['multipart].
-
-Standard values for the @racket[subtype] field depend on the
-@racket[type] field, and include the following, but any
-@racket[subtype] is allowed as a downcased version of the
-specification from the header.
-
-@mime-table[
-(
- text            (plain                                   "[RFC1521, NSB]")
-                 (richtext                                "[RFC1521, NSB]")
-                 (tab-separated-values                    "[Lindner]")
-)(
- multipart       (mixed                                   "[RFC1521, NSB]")
-                 (alternative                             "[RFC1521, NSB]")
-                 (digest                                  "[RFC1521, NSB]")
-                 (parallel                                "[RFC1521, NSB]")
-                 (appledouble                "[MacMime, Faltstrom]")
-                 (header-set                             "[Crocker]")
-)(
- message         (rfc822                                  "[RFC1521, NSB]")
-                 (partial                                 "[RFC1521, NSB]")
-                 (external-body                           "[RFC1521, NSB]")
-                 (news                        "[RFC 1036, Spencer]")
-)(
- application     (octet-stream                            "[RFC1521, NSB]")
-                 (postscript                              "[RFC1521, NSB]")
-                 (oda                                     "[RFC1521, NSB]")
-                 (atomicmail                           "[atomicmail, NSB]")
-                 (andrew-inset                       "[andrew-inset, NSB]")
-                 (slate                           "[slate, Crowley]")
-                 (wita              "[Wang Info Transfer, Campbell]")
-                 (dec-dx            "[Digital Doc Trans, Campbell]")
-                 (dca-rft        "[IBM Doc Content Arch, Campbell]")
-                 (activemessage                          "[Shapiro]")
-                 (rtf                                    "[Lindner]")
-                 (applefile                  "[MacMime, Faltstrom]")
-                 (mac-binhex40               "[MacMime, Faltstrom]")
-                 (news-message-id              "[RFC1036, Spencer]")
-                 (news-transmission            "[RFC1036, Spencer]")
-                 (wordperfect5.1                         "[Lindner]")
-                 (pdf                                    "[Lindner]")
-                 (zip                                    "[Lindner]")
-                 (macwriteii                             "[Lindner]")
-                 (msword                                 "[Lindner]")
-                 (remote-printing                         "[RFC1486,MTR]")
-)(
- image           (jpeg                                    "[RFC1521, NSB]")
-                 (gif                                     "[RFC1521, NSB]")
-                 (ief                                         "[RFC1314]")
-                 (tiff                                            "[MTR]")
-)(
- audio           (basic                                   "[RFC1521, NSB]")
-)(
- video           (mpeg                                    "[RFC1521, NSB]")
-                 (quicktime                              "[Lindner]")
-)]
-
-Standard values for the @racket[charset] field include
-@racket['us-ascii], which is the default.
-
-Standard values for the @racket[encoding] field are @racket['7bit],
-@racket['8bit], @racket['binary], @racket['quoted-printable], and
-@racket['base64]. The default is @racket['7bit].
-
-The @racket[params] field contains a list of parameters from other
-MIME headers.
-
-The @racket[id] field is taken from the @racket["Content-Id"] header
-field.
-
-The @racket[description] field is taken from the
-@racket["Content-description"] header field.
-
-The @racket[other] field contains additional (non-standard) field
-headers whose field names start with @racket["Content-"].
-
-The @racket[fields] field contains additional field headers whose
-field names @emph{do not} start with @racket["Content-"].
-
-The @racket[parts] contains sub-parts from multipart MIME
-messages. This list is non-empty only when @racket[type] is
-@racket['multipart] or @racket['message].
-
-The @racket[body] field represents the body as a function that
-consumes an output out and writes the decoded message to the port. If
-@racket[type] is @racket['multipart] or @racket['message]., then
-@racket[body] is @racket['()]. All of the standard values of
-@racket[encoding] are supported. The procedure only works once (since
-the encoded body is pulled from a stream).}
-
-@defstruct[disposition ([type symbol?]
-                        [filename (or/c string? false/c)]
-                        [creation (or/c string? false/c)]
-                        [modification (or/c string? false/c)]
-                        [read (or/c string? false/c)]
-                        [size (or/c exact-nonnegative-integer? false/c)]
-                        [params (listof (cons/c symbol? string?))])]{
-
-Represents a @racket["Content-Disposition"] header as defined in RFC
-2183.
-
-Standard values for the @racket[type] field include @racket['inline]
-and @racket['attachment].
-
-The @racket[filename] field is drawn from the @racket["filename"]
-parameter of the @racket["Content-Disposition"] header, if included in
-the message.
-
-The @racket[creation], @racket[modification], and @racket[read] fields
-represent file timestamps as drawn from the @racket["creation-date"],
-@racket["modification-date"], and @racket["read-date"] attributes of
-the @racket["Content-Disposition"] header, if included in the message.
-
-The @racket[size] field is drawn from the @racket["size"] parameter of
-the @racket["Content-Disposition"] header, if included in the message.
-
-The @racket[params] field stores any additional attribute bindings of
-the @racket["Content-Disposition"] header, if included in the message.}
-
-@; ----------------------------------------
-
-@section[#:tag "mime-exns"]{Exceptions}
-
-@defstruct[(mime-error exn:fail) ()]{
-
-The supertype of all MIME exceptions. Only the subtype
-@racket[missing-multipart-boundary-parameter] is ever actually
-raised.}
-
-@defstruct[(unexpected-termination mime-error) ([msg string?])]{
-
-Originally raised when an end-of-file is reached while parsing the
-headers of a MIME entity, but currently a mere warning is logged.}
-
-@defstruct[(missing-multipart-boundary-parameter mime-error) ()]{
-
-Raised when a multipart type is specified, but no @racket["Boundary"]
-parameter is given.}
-
-@defstruct[(malformed-multipart-entity mime-error) ([msg string?])]{
-
-Never actually raised.}
-
-@defstruct[(empty-mechanism mime-error) ()]{
-
-Never actually raised.}
-
-@defstruct[(empty-type mime-error) ()]{
-
-Never actually raised.}
-
-
-@defstruct[(empty-subtype mime-error) ()]{
-
-Never actually raised.}
-
-
-@defstruct[(empty-disposition-type mime-error) ()]{
-
-Never actually raised.}
-
-@; ----------------------------------------
-
-@section{MIME Unit}
-
-@margin-note{@racket[mime@] and @racket[mime^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/mime] module.}
-
-@defmodule[net/mime-unit]
-
-@defthing[mime@ unit?]{
-
-Imports nothing, exports @racket[mime^].}
-
-@; ----------------------------------------
-
-@section{MIME Signature}
-
-@defmodule[net/mime-sig]
-
-@defsignature[mime^ ()]{}
-
-Includes everything exported by the @racketmodname[net/mime] module.
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/net.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/net.scrbl
deleted file mode 100644
index 6c7ecd2e7f..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/net.scrbl
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{Net: Networking Libraries}
-
-@table-of-contents[]
-
-@include-section["http-client.scrbl"]
-@include-section["url.scrbl"]
-@include-section["uri-codec.scrbl"]
-@include-section["websocket.scrbl"]
-@include-section["ftp.scrbl"]
-@include-section["sendurl.scrbl"]
-@include-section["smtp.scrbl"]
-@include-section["sendmail.scrbl"]
-@include-section["head.scrbl"]
-@include-section["imap.scrbl"]
-@include-section["pop3.scrbl"]
-@include-section["mime.scrbl"]
-@include-section["base64.scrbl"]
-@include-section["qp.scrbl"]
-@include-section["dns.scrbl"]
-@include-section["nntp.scrbl"]
-@include-section["tcp.scrbl"]
-@include-section["tcp-redirect.scrbl"]
-@include-section["ssl-tcp-unit.scrbl"]
-@include-section["cgi.scrbl"]
-@include-section["cookie.scrbl"]
-@include-section["git-checkout.scrbl"]
-
-@(bibliography
-
- (bib-entry #:key "CGI"
-            #:title "Common Gateway Interface (CGI/1.1)"
-            #:url "http://hoohoo.ncsa.uiuc.edu/cgi/")
-
- (bib-entry #:key "RFC822"
-            #:title "Standard for the Format of ARPA Internet Text Messages"
-            #:author "David Crocker"
-            #:location "RFC"
-            #:url "http://www.ietf.org/rfc/rfc0822.txt"
-            #:date "1982")
-
- (bib-entry #:key "RFC977"
-            #:title "Network News Transfer Protocol"
-            #:author "Brian Kantor and Phil Lapsley"
-            #:location "RFC"
-            #:url "http://www.ietf.org/rfc/rfc0977.txt"
-            #:date "1986")
-
- (bib-entry #:key "RFC1738"
-            #:title "Uniform Resource Locators (URL)"
-            #:author "T. Berners-Lee, L. Masinter, and M. McCahill"
-            #:location "RFC"
-            #:url "http://www.ietf.org/rfc/rfc1738.txt"
-            #:date "1994")
-
- (bib-entry #:key "RFC1939"
-            #:title "Post Office Protocol - Version 3"
-            #:author "J. Myers and M. Rose"
-            #:location "RFC"
-            #:url "http://www.ietf.org/rfc/rfc1939.txt"
-            #:date "1996")
-
- (bib-entry #:key "RFC2060"
-            #:title "Internet Message Access Protocol - Version 4rev1"
-            #:author "M. Crispin"
-            #:location "RFC"
-            #:url "http://www.ietf.org/rfc/rfc2060.txt"
-            #:date "1996")
-
- (bib-entry #:key "RFC2109"
-            #:title "HTTP State Management Mechanism"
-            #:author "D. Kristol and L. Montulli"
-            #:location "RFC"
-            #:url "http://www.ietf.org/rfc/rfc2109.txt"
-            #:date "1997")
-
- (bib-entry #:key "RFC2396"
-            #:title "Uniform Resource Identifiers (URI): Generic Syntax"
-            #:author "T. Berners-Lee, R. Fielding, and L. Masinter"
-            #:location "RFC"
-            #:url "http://www.ietf.org/rfc/rfc2396.txt"
-            #:date "1998")
-
- (bib-entry #:key "RFC3986"
-            #:title "Uniform Resource Identifier (URI): Generic Syntax"
-            #:author "T. Berners-Lee, R. Fielding, and L. Masinter"
-            #:location "RFC"
-            #:url "http://www.ietf.org/rfc/rfc3986.txt"
-            #:date "2005")
-
-)
-
-@index-section[]
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/nntp.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/nntp.scrbl
deleted file mode 100644
index dbace6999d..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/nntp.scrbl
+++ /dev/null
@@ -1,156 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label net/nntp net/nntp-unit net/nntp-sig))
-
-@title[#:tag "nntp"]{NNTP: Newsgroup Protocol}
-
-@defmodule[net/nntp]{The @racketmodname[net/nntp] module provides
-tools to access Usenet group via NNTP @cite["RFC977"].}
-
-@section{Connection and Operations}
-
-@defstruct[communicator ([sender output-port?]
-                         [receiver input-port?]
-                         [server string?]
-                         [port (integer-in 0 65535)])]{
-
-Once a connection to a Usenet server has been established, its state
-is stored in a @racket[communicator], and other procedures take
-communicators as an argument.}
-
-@defproc[(connect-to-server [server string?] [port-number (integer-in 0 65535) 119])
-         communicator?]{
-
-Connects to @racket[server] at @racket[port-number].}
-
-@defproc[(disconnect-from-server [communicator communicator?]) void?]{
-
-Disconnects an NNTP communicator.}
-
-@defproc[(open-news-group [communicator communicator?]
-                          [newsgroup string?])
-         (values exact-nonnegative-integer?
-                 exact-nonnegative-integer?
-                 exact-nonnegative-integer?)]{
-
-Selects the newsgroup of an NNTP connection. The returned values are
-the total number of articles in the group, the first available
-article, and the last available article.}
-
-@defproc[(authenticate-user [communicator communicator?]
-                            [username string?]
-                            [password string?])
-          void?]{
-
-Tries to authenticate a user with the original authinfo command (uses
-cleartext). The @racket[password] argument is ignored if the server
-does not ask for it.}
-
-@defproc[(head-of-message [communicator communicator?]
-                          [message-index exact-nonnegative-integer?])
-         (listof string?)]{
-
-Given a message number, returns its header lines.}
-
-@defproc[(body-of-message [communicator communicator?]
-                          [message-index exact-nonnegative-integer?])
-         (listof string?)]{
-
-Given a message number, returns the body of the message.}
-
-@defproc[(newnews-since [communicator communicator?]
-                        [message-index exact-nonnegative-integer?])
-         (listof string?)]{
-
-Implements the @tt{NEWNEWS} command (often disabled on servers).}
-
-@defproc[((generic-message-command [command string?] 
-                                   [ok-code exact-integer?])
-          [communicator communicator?]
-          [message-index exact-nonnegative-integer?])
-         (listof string?)]{
-
-Useful primitive for implementing @racket[head-of-message],
-@racket[body-of-message] and other similar commands.}
-
-@defproc[(make-desired-header [tag-string string?])
-         regexp?]{
-
-Takes a header field's tag and returns a regexp to match the field}
-
-@defproc[(extract-desired-headers [header (listof string?)]
-                                  [desireds (listof regexp?)])
-         (listof string?)]{
-
-Given a list of header lines and of desired regexps, returns the
-header lines that match any of the @racket[desireds].}
-
-
-@section{Exceptions}
-
-@defstruct[(nntp exn) ()]{
-
-The supertype of all NNTP exceptions.}
-
-@defstruct[(unexpected-response nntp) ([code exact-integer?]
-                                       [text string?])]{
-
-Raised whenever an unexpected response code is received.  The
-@racket[text] field holds the response text sent by the server.}
-
-@defstruct[(bad-status-line nntp) ([line string?])]{
-
-Raised for mal-formed status lines.}
-
-@defstruct[(premature-close nntp) ([communicator communicator?])]{
-
-Raised when a remote server closes its connection unexpectedly.}
-
-@defstruct[(bad-newsgroup-line nntp) ([line string?])]{
-
-Raised when the newsgroup line is improperly formatted.}
-
-@defstruct[(non-existent-group nntp) ([group string?])]{
-
-Raised when the server does not recognize the name of the requested
-group.}
-
-@defstruct[(article-not-in-group nntp) ([article exact-integer?])]{
-
-Raised when an article is outside the server's range for that group.}
-
-@defstruct[(no-group-selected nntp) ()]{
-
-Raised when an article operation is used before a group has been
-selected.}
-
-@defstruct[(article-not-found nntp) ([article exact-integer?])]{
-
-Raised when the server is unable to locate the article.}
-
-@defstruct[(authentication-rejected nntp) ()]{
-
-Raised when the server reject an authentication attempt.}
-
-@; ----------------------------------------
-
-@section{NNTP Unit}
-
-@margin-note{@racket[nntp@] and @racket[nntp^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/nntp] module.}
-
-@defmodule[net/nntp-unit]
-
-@defthing[nntp@ unit?]{
-
-Imports nothing, exports @racket[nntp^].}
-
-@; ----------------------------------------
-
-@section{NNTP Signature}
-
-@defmodule[net/nntp-sig]
-
-@defsignature[nntp^ ()]{}
-
-Includes everything exported by the @racketmodname[net/nntp] module.
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/pop3.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/pop3.scrbl
deleted file mode 100644
index 9a78f86769..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/pop3.scrbl
+++ /dev/null
@@ -1,205 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label net/pop3 net/pop3-unit net/pop3-sig))
-
-@(define pt (tt ">"))
-
-@title[#:tag "pop3"]{POP3: Reading Mail}
-
-@defmodule[net/pop3]{The @racketmodname[net/pop3] module provides
-tools for the Post Office Protocol version 3 @cite["RFC977"].}
-
-@defstruct[communicator ([sender output-port?]
-                         [receiver input-port?]
-                         [server string?]
-                         [port (integer-in 0 65535)]
-                         [state (one-of/c 'disconnected 'authorization 'transaction)])]{
-
-Once a connection to a POP-3 server has been established, its state is
-stored in a @racket[communicator] instance, and other procedures take
-@racket[communicator] instances as an argument.}
-
-
-@defproc[(connect-to-server [server string?]
-                            [port-number (integer-in 0 65535) 110])
-         communicator?]{
-
-Connects to @racket[server] at @racket[port-number].}
-
-
-@defproc[(disconnect-from-server [communicator communicator?])
-         void?]{
-
-Disconnects @racket[communicator] from the server, and sets
-@racket[communicator]'s state to @racket['disconnected].}
-
-
-@defproc[(authenticate/plain-text [user string?] [passwd string?]       
-                                  [communicator communicator?])
-          void?]{
-
-Authenticates using @racket[user] and @racket[passwd]. If
-authentication is successful, @racket[communicator]'s state is set to
-@racket['transaction].}
-
-@defproc[(get-mailbox-status [communicator communicator?])
-         (values  exact-nonnegative-integer? exact-nonnegative-integer?)]{
-
-Returns the number of messages and the number of octets in the
-mailbox.}
-
-@defproc[(get-message/complete [communicator communicator?]
-                               [message-number exact-integer?])
-         (values (listof string?) (listof string?))]{
-
-Given a message number, returns a list of message-header lines and
-list of message-body lines.}
-
-@defproc[(get-message/headers [communicator communicator?]
-                              [message-number exact-integer?])
-         (values (listof string?) (listof string?))]{
-
-Given a message number, returns a list of message-header lines.}
-
-@defproc[(get-message/body [communicator communicator?]
-                           [message-number exact-integer?])
-         (values (listof string?) (listof string?))]{
-
-Given a message number, returns a list of message-body lines.}
-
-@defproc[(delete-message [communicator communicator?]
-                         [message-number exact-integer?])
-         void?]{
-
-Deletes the specified message.}
-
-@defproc[(get-unique-id/single [communicator communicator?]
-                               [message-number exact-integer?])
-         string?]{
-
-Gets the server's unique id for a particular message.}
-
-
-@defproc[(get-unique-id/all [communicator communicator?])
-         (listof (cons/c exact-integer? string?))]{
-
-Gets a list of unique id's from the server for all the messages in the
-mailbox. The @racket[car] of each item in the result list is the
-message number, and the @racket[cdr] of each item is the message's
-id.}
-
-@defproc[(make-desired-header [tag-string string?])
-         regexp?]{
-
-Takes a header field's tag and returns a regexp to match the field}
-
-@defproc[(extract-desired-headers [header (listof string?)]
-                                  [desireds (listof regexp?)])
-         (listof string?)]{
-
-Given a list of header lines and of desired regexps, returns the
-header lines that match any of the @racket[desireds].}
-
-@; ----------------------------------------
-
-@section[#:tag "pop3-exns"]{Exceptions}
-
-@defstruct[(pop3 exn) ()]{
-
-The supertype of all POP3 exceptions.}
-
-@defstruct[(cannot-connect pop3) ()]{
-
-Raised when a connection to a server cannot be established.}
-
-@defstruct[(username-rejected pop3) ()]{
-
-Raised if the username is rejected.}
-
-@defstruct[(password-rejected pop3) ()]{
-
-Raised if the password is rejected.}
-
-@defstruct[(not-ready-for-transaction pop3) ([communicator communicator?])]{
-
-Raised when the communicator is not in transaction mode.}
-
-@defstruct[(not-given-headers pop3) ([communicator communicator?] 
-                                     [message exact-integer?])]{
-
-Raised when the server does not respond with headers for a message as
-requested.}
-
-@defstruct[(illegal-message-number pop3) ([communicator communicator?]
-                                          [message exact-integer?])]{
-
-Raised when the client specifies an illegal message number.}
-
-
-@defstruct[(cannot-delete-message exn) ([communicator communicator?]
-                                        [message exact-integer?])]{
-
-Raised when the server is unable to delete a message.}
-
-@defstruct[(disconnect-not-quiet pop3) ([communicator communicator?])]{
-
-Raised when the server does not gracefully disconnect.}
-
-
-@defstruct[(malformed-server-response pop3) ([communicator communicator?])]{
-
-Raised when the server produces a malformed response.}
-
-@section{Example Session}
-
-@racketblock[
- #,pt (require net/pop3)
- #,pt (define c (connect-to-server "foo.bar.com"))
- #,pt (authenticate/plain-text "bob" "********" c)
- #,pt (get-mailbox-status c)
- 196
- 816400
- #,pt (get-message/headers c 100)
- ("Date: Thu, 6 Nov 1997 12:34:18 -0600 (CST)"
-  "Message-Id: <199711061834.MAA11961@foo.bar.com>"
-  "From: Alice <alice@foo.bar.com>"
-  ....
-  "Status: RO")
- #,pt (get-message/complete  c 100)
- ("Date: Thu, 6 Nov 1997 12:34:18 -0600 (CST)"
-  "Message-Id: <199711061834.MAA11961@foo.bar.com>"
-  "From: Alice <alice@foo.bar.com>"
-  ....
-  "Status: RO")
- ("some body" "text" "goes" "." "here" "." "")
- #,pt (get-unique-id/single c 205)
- @#,racketerror{no message numbered 205 available for unique id}
- #,pt (list-tail (get-unique-id/all c) 194)
- ((195 . "e24d13c7ef050000") (196 . "3ad2767070050000"))
- #,pt (get-unique-id/single c 196)
- "3ad2767070050000"
- #,pt (disconnect-from-server c)
-]
-
-@; ----------------------------------------
-
-@section{POP3 Unit}
-
-@margin-note{@racket[pop3@] and @racket[pop3^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/pop3] module.}
-
-@defmodule[net/pop3-unit]
-
-@defthing[pop3@ unit?]{
-
-Imports nothing, exports @racket[pop3^].}
-
-@; ----------------------------------------
-
-@section{POP3 Signature}
-
-@defmodule[net/pop3-sig]
-
-@defsignature[pop3^ ()]{}
-
-Includes everything exported by the @racketmodname[net/pop3] module.
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/qp.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/qp.scrbl
deleted file mode 100644
index 18ef49e957..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/qp.scrbl
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label net/qp net/qp-unit net/qp-sig))
-
-@title[#:tag "qp"]{Quoted-Printable: Encoding and Decoding}
-
-@defmodule[net/qp]{The @racketmodname[net/qp] library provides
-utilities for quoted-printable (mime-standard) encoding and decoding
-from RFC 2045 section 6.7.
-
-The library was written by Francisco Solsona.}
-
-@section[#:tag "qp-procs"]{Functions}
-
-@defproc[(qp-encode [bstr bytes?]) bytes?]{
-
-Consumes a byte string and returns its quoted printable representation
-as a new string. The encoded string uses @racket[#"\r\n"] where
-necessary to create shorter lines.}
-
-
-@defproc[(qp-decode [bstr bytes?]) bytes?]{
-
-Consumes a byte string and returns its un-quoted printable
-representation as a new string. Non-soft line breaks are preserved in
-whatever form they exist (CR, LR, or CRLF) in the input string.}
-
-
-@defproc[(qp-encode-stream [in input-port?]
-                           [out output-port?]
-                           [newline-bstr bytes? #"\n"])
-         void?]{
-
-Reads characters from @racket[in] and writes the quoted printable
-encoded result to @racket[out].
-
-The @racket[newline-bstr] argument is used for soft line-breaks (after
-@litchar{=}). Note that the default @racket[newline-bstr] is just
-@racket[#"\n"], not @racket[#"\r\n"].
-
-Other line breaks are preserved in whatever form they exist (CR, LR,
-or CRLF) in the input stream.}
-
-
-@defproc[(qp-decode-stream [in input-port?]
-                               [out output-port?])
-         void?]{
-
-Reads characters from @racket[in] and writes de-quoted-printable
-result to @racket[out].  Non-soft line breaks are preserved in
-whatever form they exist (CR, LR, or CRLF) in the input stream.}
-
-@; ----------------------------------------
-
-@section[#:tag "qp-exn"]{Exceptions}
-
-@deftogether[(
-@defstruct[qp-error ()]
-@defstruct[(qp-wrong-input qp-error) ()]
-@defstruct[(qp-wrong-line-size qp-error) ()]
-)]{
-
-None of these are used anymore, but the bindings are preserved for
-backward compatibility.}
-
-@; ----------------------------------------
-
-@section{Quoted-Printable Unit}
-
-@margin-note{@racket[qp@] and @racket[qp^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/qp] module.}
-
-@defmodule[net/qp-unit]
-
-@defthing[qp@ unit?]{
-
-Imports nothing, exports @racket[qp^].}
-
-@; ----------------------------------------
-
-@section{-Printable Signature}
-
-@defmodule[net/qp-sig]
-
-@defsignature[qp^ ()]{}
-
-Includes everything exported by the @racketmodname[net/qp] module.
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/sendmail.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/sendmail.scrbl
deleted file mode 100644
index 1b73f31d8b..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/sendmail.scrbl
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label net/sendmail net/sendmail-unit net/sendmail-sig))
-
-@title[#:tag "sendmail"]{@exec{sendmail}: Sending E-Mail}
-
-@defmodule[net/sendmail]{The @racketmodname[net/sendmail] module
-provides tools for sending electronic mail messages using a
-@exec{sendmail} program on the local system. See also the
-@racketmodname[net/smtp] package, which sends mail via SMTP.}
-
-All strings used in mail messages are assumed to conform to their
-corresponding SMTP specifications, except as noted otherwise.
-
-@section{Sendmail Functions}
-
-@defproc[(send-mail-message/port [from (or/c string? false/c)]
-                                 [subject string?]
-                                 [to (listof string?)]
-                                 [cc (listof string?)]
-                                 [bcc (listof string?)]
-                                 [extra-header string?] ...)
-         output-port?]{
-
-The first argument is the header for the sender, the second is the
-subject line, the third a list of ``To:'' recipients, the fourth a list
-of ``CC:'' recipients, and the fifth a list of ``BCC:'' recipients.  All
-of these are quoted if they contain non-ASCII characters.
-@margin-note{Note that passing already-quoted strings would be fine,
-  since then there are no non-ASCII characters.}
-Additional arguments argument supply other mail headers, which must be
-provided as lines (not terminated by a linefeed or carriage return) to
-include verbatim in the header.
-
-The return value is an output port into which the client must write
-the message.  Clients are urged to use @racket[close-output-port] on
-the return value as soon as the necessary text has been written, so
-that the sendmail process can complete.
-
-The @racket[from] argument can be any value; of course, spoofing should
-be used with care.  If it is @racket[#f], no ``From:'' header is
-generated, which usually means that your sendmail program will fill in
-the right value based on the user.}
-
-@defproc[(send-mail-message [from string?]
-                            [subject string?]
-                            [to (listof string?)]
-                            [cc (listof string?)]
-                            [bcc (listof string?)]
-                            [body (listof string?)]
-                            [extra-header string?] ...)
-         void?]{
-
-Like @racket[send-mail-message/port], but with @racket[body] as a list
-of strings, each providing a line of the message body.
-
-Lines that contain a single period do not need to be quoted.}
-
-
-@; ----------------------------------------
-
-@section{Sendmail Unit}
-
-@margin-note{@racket[sendmail@] and @racket[sendmail^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/sendmail] module.}
-
-@defmodule[net/sendmail-unit]
-
-@defthing[sendmail@ unit?]{
-
-Imports nothing, exports @racket[sendmail^].}
-
-@; ----------------------------------------
-
-@section{Sendmail Signature}
-
-@defmodule[net/sendmail-sig]
-
-@defsignature[sendmail^ ()]{}
-
-Includes everything exported by the @racketmodname[net/sendmail] module.
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/sendurl.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/sendurl.scrbl
deleted file mode 100644
index d5dae63651..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/sendurl.scrbl
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label net/sendurl racket/file))
-
-@title[#:tag "sendurl"]{Send URL: Opening a Web Browser}
-
-@defmodule[net/sendurl]{Provides @racket[send-url] for opening a URL
-in the user's chosen web browser.}
-
-See also @racketmodname[browser/external #:indirect], which requires
-@racket[racket/gui], but can prompt the user for a browser if no
-browser preference is set.
-
-
-@defproc[(send-url [str string?] [separate-window? any/c #t]
-                   [#:escape? escape? any/c #t])
-         void?]{
-
-Opens @racket[str], which represents a URL, in a platform-specific
-manner. For some platforms and configurations, the
-@racket[separate-window?] parameter determines if the browser creates
-a new window to display the URL or not.
-
-On Windows, @racket[send-url] normally uses @racket[shell-execute]
-to launch a browser. (If the URL appears to contain a fragment, it may
-use an intermediate redirecting file due to a bug in IE7.)
-
-On Mac OS X, @racket[send-url] runs @exec{osascript} to start the
-user's chosen browser.
-
-On Unix, @racket[send-url] uses a user-preference, or when none is
-set, it will look for a known browser.  See the description of
-@racket[external-browser] for details.
-
-If @racket[escape?] is true, then @racket[str] is escaped (by UTF-8
-encoding followed by ``%'' encoding) to avoid dangerous shell
-characters: single quotes, double quotes, backquotes, dollar signs,
-backslashes, non-ASCII characters, and non-graphic characters. Note
-that escaping does not affect already-encoded characters in
-@racket[str].
-
-On all platforms, @racket[external-browser] parameter can be set to a
-procedure to override the above behavior --- the procedure will be
-called with the @racket[url] string.}
-
-@defproc[(send-url/file [path path-string?] [separate-window? any/c #t]
-                        [#:fragment fragment (or/c string? false/c) #f]
-                        [#:query query (or/c string? false/c) #f])
-         void?]{
-
-Similar to @racket[send-url] (with @racket[#:escape? #t]), but accepts
-a path to a file to be displayed by the browser, along with optional
-@racket[fragment] (with no leading @litchar{#}) and @racket[query]
-(with no leading @litchar{?}) strings.  Use @racket[send-url/file] to
-display a local file, since it takes care of the peculiarities of
-constructing the correct @litchar{file://} URL.
-
-The @racket[path], @racket[fragment], and @racket[query] arguments are
-all encoded in the same way as a path provided to @racket[send-url],
-which means that already-encoded characters are used as-is.}
-
-@defproc[(send-url/contents [contents string?] [separate-window? any/c #t]
-                            [#:fragment fragment (or/c string? false/c) #f]
-                            [#:query query (or/c string? false/c) #f]
-                            [#:delete-at seconds (or/c number? false/c) #f])
-         void?]{
-
-Similar to @racket[send-url/file], but it consumes the contents of a
-page to show and displays it from a temporary file.
-
-When @racket[send-url/content] is called, it scans old generated files
-(this happens randomly, not on every call) and removes them to avoid
-cluttering the temporary directory.  If the @racket[#:delete-at]
-argument is a number, then the temporary file is more eagerly removed
-after the specified number of seconds; the deletion happens in a
-thread, so if Racket exits earlier, the deletion will not happen.  If
-the @racket[#:delete-at] argument is @racket[#f], no eager deletion
-happens, but old temporary files are still deleted as described
-above.}
-
-@defparam[external-browser cmd browser-preference?]{
-
-A parameter that can hold a procedure to override how a browser is
-started, or @racket[#f] to use the default platform-dependent command.
-
-On Unix, the command that is used depends on the
-@racket['external-browser] preference.  If the preference is unset,
-@racket[send-url] uses the first of the browsers from
-@racket[unix-browser-list] for which the executable is found.
-Otherwise, the preference should hold a symbol indicating a known
-browser (from the @racket[unix-browser-list]), or it a pair of a prefix
-and a suffix string that are concatenated around the @racket[url] string
-to make up a shell command to run.  In addition, the
-@racket[external-browser] paremeter can be set to one of these values,
-and @racket[send-url] will use it instead of the preference value.
-
-Note that the URL is encoded to make it work inside shell double-quotes:
-URLs can still hold characters like @litchar{#}, @litchar{?}, and
-@litchar{&}, so if the @racket[external-browser] is set to a pair of
-prefix/suffix strings, they should use double quotes around the url.
-
-If the preferred or default browser can't be launched,
-@racket[send-url] fails. See @racket[get-preference] and
-@racket[put-preferences] for details on setting preferences.}
-
-@defproc[(browser-preference? [a any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a valid browser preference,
-@racket[#f] otherwise. See @racket[external-browser] for more
-information.}
-
-@defthing[unix-browser-list (listof symbol?)]{
-
-A list of symbols representing Unix executable names that may be tried
-in order by @racket[send-url]. The @racket[send-url] function
-internally includes information on how to launch each executable with
-a URL.}
-
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/smtp.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/smtp.scrbl
deleted file mode 100644
index a6f768f300..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/smtp.scrbl
+++ /dev/null
@@ -1,123 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label net/smtp net/smtp-unit net/smtp-sig racket/tcp openssl))
-
-@title[#:tag "smtp"]{SMTP: Sending E-Mail}
-
-@defmodule[net/smtp]{The @racketmodname[net/smtp] module provides
-tools for sending electronic mail messages using SMTP. The client must
-provide the address of an SMTP server; in contrast, the
-@racketmodname[net/sendmail] module uses a pre-configured
-@exec{sendmail} on the local system.}
-
-The @racketmodname[net/head] library defines the format of a
-@tech{header} string, which is used by @racket[send-smtp-message]. The
-@racketmodname[net/head] module also provides utilities to verify the
-formatting of a mail address. The procedures of the @racket[net/smtp]
-module assume that the given string arguments are well-formed.
-
-
-@section{SMTP Functions}
-
-@defproc[(smtp-send-message [server-address string?]
-                            [from string?]
-                            [to (listof string?)]
-                            [header string?]
-                            [message (listof (or/c string? bytes?))]
-                            [#:port-no port-no/k (integer-in 0 65535) 25]
-                            [#:auth-user user (or/c string? false/c) #f]
-                            [#:auth-passwd pw (or/c string? false/c) #f]
-                            [#:tcp-connect connect
-                                           ((string? (integer-in 0 65535))
-                                            . ->* . (input-port? output-port?))
-                                           tcp-connect]
-                            [#:tls-encode encode
-                                          (or/c false/c
-                                                ((input-port? output-port?
-                                                  #:mode (one-of/c 'connect)
-                                                  #:encrypt (one-of/c 'tls)
-                                                  #:close-original? (one-of/c #t))
-                                                 . ->* . (input-port? output-port?)))
-                                          #f]
-                            [port-no (integer-in 0 65535) port-no/k])
-         void?]{
-
-Connects to the server at @racket[server-address] and @racket[port-no]
-to send a message. The @racket[from] argument specifies the mail
-address of the sender, and @racket[to] is a list of recipient
-addresses (including ``To:'', ``CC'', and ``BCC'' recipients).
-
-The @racket[header] argument is the complete message header, which
-should already include ``From:'', ``To:'', and ``CC:'' fields
-consistent with the given sender and recipients. See also the
-@racketmodname[net/head] library for header-creating utilities.
-
-The @racket[message] argument is the body of the message, where each
-string or byte string in the list corresponds to a single line of
-message text. No string in @racket[message] should contain a carriage
-return or linefeed character.
-
-The optional @racket[port-no] argument---which can be specified either
-with the @racket[#:port-no] keyword or, for backward compatibility, as
-an extra argument after keywords---specifies the IP port to use in
-contacting the SMTP server.
-
-The optional @racket[#:auth-user] and @racket[#:auth-passwd] keyword
-argument supply a username and password for authenticated SMTP (using
-the AUTH PLAIN protocol).
-
-The optional @racket[#:tcp-connect] keyword argument supplies a
-connection procedure to be used in place of @racket[tcp-connect]. For
-example, use @racket[ssl-connect] to connect to the server via SSL.
-
-If the optional @racket[#:tls-encode] keyword argument supplies a
-procedure instead of #f, then the ESMTP STARTTLS protocol is used to
-initiate SSL communication with the server. The procedure given as the
-#:tls-encode argument should be like @racket[ports->ssl-ports]; it
-will be called as
-
-@racketblock[
-(encode r w #:mode 'connect #:encrypt 'tls #:close-original? #t)
-]
-
-and it should return two values: an input port and an export port.
-All further SMTP communication uses the returned ports.
-
-For encrypted communication, normally either @racket[ssl-connect]
-should be supplied for @racket[#:tcp-connect], or
-@racket[ports->ssl-ports] should be supplied for
-@racket[#:tls-encode]---one or the other (depending on what the server
-expects), rather than both.}
-
-@defparam[smtp-sending-end-of-message proc (-> any)]{
-
-A parameter that determines a send-done procedure to be called after
-@racket[smtp-send-message] has completely sent the message. Before the
-send-done procedure is called, breaking the thread that is executing
-@racket[smtp-send-message] cancels the send. After the send-done
-procedure is called, breaking may or may not cancel the send (and
-probably will not).}
-
-@; ----------------------------------------
-
-@section{SMTP Unit}
-
-@margin-note{@racket[smtp@] and @racket[smtp^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/smtp] module.}
-
-@defmodule[net/smtp-unit]
-
-@defthing[smtp@ unit?]{
-
-Imports nothing, exports @racket[smtp^].}
-
-@; ----------------------------------------
-
-@section{SMTP Signature}
-
-@defmodule[net/smtp-sig]
-
-@defsignature[smtp^ ()]{}
-
-Includes everything exported by the @racketmodname[net/smtp] module.
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/ssl-tcp-unit.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/ssl-tcp-unit.scrbl
deleted file mode 100644
index f1cef7febc..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/ssl-tcp-unit.scrbl
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label net/ssl-tcp-unit net/tcp-sig))
-
-@title[#:tag "ssl-tcp-unit"]{SSL Unit: @racket[tcp^] via SSL}
-
-@defmodule[net/ssl-tcp-unit]{The @racketmodname[net/ssl-tcp-unit]
-library provides a function for creating a @racket[tcp^]
-implementation with @racketmodname[openssl] functionality.}
-
-@defproc[(make-ssl-tcp@ [server-cert-file (or/c path-string? false/c)]
-                        [server-key-file (or/c path-string? false/c)]
-                        [server-root-cert-files (or/c (listof path-string?) false/c)]
-                        [server-suggest-auth-file path-string?]
-                        [client-cert-file (or/c path-string? false/c)]
-                        [client-key-file (or/c path-string? false/c)]
-                        [client-root-cert-files (listof path-string?)])
-         unit?]{
-
-Returns a unit that implements @racket[tcp^] using the SSL functions
-from @racketmodname[openssl]. The arguments to @racket[make-ssl-tcp@]
-control the certificates and keys uses by server and client
-connections:
-
-@itemize[
-
-    @item{@racket[server-cert-file] --- a PEM file for a server's
-     certificate; @racket[#f] means no certificate (which is unlikely
-     to work with any SSL client)}
-
-    @item{@racket[server-key-file] --- a private key PEM to go with
-    @racket[server-cert-file]; @racket[#f] means no key (which is likely
-    renders a certificate useless)}
-
-    @item{@racket[server-root-cert-files] --- a list of PEM files for
-     trusted root certificates; @racket[#f] disables verification of
-     peer client certificates}
-
-    @item{@racket[server-suggest-auth-file] --- PEM file for root
-     certificates to be suggested to peer clients that must supply
-     certificates}
-
-    @item{@racket[client-cert-file] --- a PEM file for a client's
-     certificate; @racket[#f] means no certificate (which is usually
-     fine)}
-
-    @item{@racket[client-key-file] --- a private key PEM to go with
-     @racket[client-cert-file]; @racket[#f] means no key (which is likely
-     renders a certificate useless)}
-
-    @item{@racket[client-root-cert-files] --- a list of PEM files for
-     trusted root certificates; @racket[#f] disables verification of
-     peer server certificates}
-
-]}
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/tcp-redirect.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/tcp-redirect.scrbl
deleted file mode 100644
index 5595b02c14..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/tcp-redirect.scrbl
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label net/tcp-redirect net/tcp-sig))
-
-@title[#:tag "tcp-redirect"]{TCP Redirect: @racket[tcp^] via Channels}
-
-@defmodule[net/tcp-redirect]{The @racketmodname[net/tcp-redirect]
-library provides a function for directing some TCP port numbers to use
-buffered channels instead of the TCP support from
-@racketmodname[racket/tcp].}
-
-@defproc[(tcp-redirect [port-numbers (listof (integer-in 0 65535))])
-         unit?]{
-
-Returns a unit that implements @racket[tcp^]. For port numbers not
-listed in @racket[port-numbers], the unit's implementations are the
-@racketmodname[racket/tcp] implementations.
-
-For the port numbers listed in @racket[port-numbers] and for
-connections to @racket["127.0.0.1"], the unit's implementation does
-not use TCP connections, but instead uses internal buffered
-channels. Such channels behave exactly as TCP listeners and ports.}
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/tcp.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/tcp.scrbl
deleted file mode 100644
index ea5e8b37a0..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/tcp.scrbl
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label net/tcp-sig net/tcp-unit net/url-unit net/tcp-redirect
-                     net/ssl-tcp-unit racket/tcp))
-
-@title[#:tag "tcp"]{TCP: Unit and Signature}
-
-The @racketmodname[net/tcp-sig] and @racketmodname[net/tcp-unit]
-libraries define a @racket[tcp^] signature and @racket[tcp@]
-implementation, where the implementation uses
-@racketmodname[racket/tcp].
-
-Some units in the @filepath{net} collection import @racket[tcp^], so
-that they can be used with transports other than plain TCP. For
-example, @racket[url@] imports @racket[tcp^].
-
-See also @racket[tcp-redirect] and @racket[make-ssl-tcp@].
-
-@section{TCP Signature}
-
-@defmodule[net/tcp-sig]
-
-@defsignature[tcp^ ()]{
-
-@defproc[(tcp-listen [port-no (and/c exact-nonnegative-integer?
-                                     (integer-in 1 65535))]
-                     [max-allow-wait exact-nonnegative-integer? 4]
-                     [reuse? any/c #f]
-                     [hostname (or/c string? false/c) #f])
-         @#,sigelem[tcp^ tcp-listener?]]{
-
-Like @racket[tcp-listen] from @racketmodname[racket/tcp].}
-
-@defproc[(tcp-connect [hostname string?]
-                      [port-no (and/c exact-nonnegative-integer?
-                                     (integer-in 1 65535))]
-                      [local-hostname (or/c string? false/c) #f]
-                      [local-port-no (or/c (and/c exact-nonnegative-integer?
-                                                  (integer-in 1 65535))
-                                           false/c)
-                                     #f])
-          (values input-port? output-port?)]{
-
-Like @racket[tcp-connect] from @racketmodname[racket/tcp].}
-
-@defproc[(tcp-connect/enable-break [hostname string?]
-                      [port-no (and/c exact-nonnegative-integer?
-                                     (integer-in 1 65535))]
-                      [local-hostname (or/c string? false/c) #f]
-                      [local-port-no (or/c (and/c exact-nonnegative-integer?
-                                                  (integer-in 1 65535))
-                                           false/c)])
-          (values input-port? output-port?)]{
-
-Like @racket[tcp-connect/enable-break] from @racketmodname[racket/tcp].}
-
-@defproc[(tcp-accept [listener @#,sigelem[tcp^ tcp-listener?]])
-         (values input-port? output-port?)]{
-
-Like @racket[tcp-accept] from @racketmodname[racket/tcp].}
-
-@defproc[(tcp-accept/enable-break [listener @#,sigelem[tcp^ tcp-listener?]])
-         (values input-port? output-port?)]{
-
-Like @racket[tcp-accept/enable-break] from @racketmodname[racket/tcp].}
-
-@defproc[(tcp-accept-ready? [listener @#,sigelem[tcp^ tcp-listener?]]) boolean?]{
-
-Like @racket[tcp-accept-ready?] from @racketmodname[racket/tcp].}
-
-@defproc[(tcp-close [listener @#,sigelem[tcp^ tcp-listener?]]) void?]{
-
-Like @racket[tcp-close] from @racketmodname[racket/tcp].}
-
-@defproc[(tcp-listener? [v any/c]) boolean?]{
-
-Like @racket[tcp-listener?] from @racketmodname[racket/tcp].}
-
-@defproc[(tcp-abandon-port [tcp-port port?]) void?]{
-
-Like @racket[tcp-abandon-port] from @racketmodname[racket/tcp].}
-
-@defproc[(tcp-addresses [tcp-port port?]
-                        [port-numbers? any/c #f])
-         (or/c (values string? string?)
-               (values string? (integer-in 1 65535)
-                       string? (integer-in 1 65535)))]{
-
-Like @racket[tcp-addresses] from @racketmodname[racket/tcp].}
-
-}
-
-@section{TCP Unit}
-
-@defmodule[net/tcp-unit]
-
-@defthing[tcp@ unit?]{
-
-Imports nothing and exports @racket[tcp^], implemented using
-@racketmodname[racket/tcp].}
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/uri-codec.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/uri-codec.scrbl
deleted file mode 100644
index b67109497a..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/uri-codec.scrbl
+++ /dev/null
@@ -1,206 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/bnf scribble/eval
-          (for-label net/url
-                     net/uri-codec net/uri-codec-unit net/uri-codec-sig))
-
-@(define uri-codec-eval (make-base-eval))
-@interaction-eval[#:eval uri-codec-eval (require net/uri-codec)]
-
-@title[#:tag "uri-codec"]{URI Codec: Encoding and Decoding URIs}
-
-@defmodule[net/uri-codec]{The @racketmodname[net/uri-codec] module
-provides utilities for encoding and decoding strings using the URI
-encoding rules given in RFC 2396 @cite["RFC2396"], and to encode and
-decode name/value pairs using the
-@tt{application/x-www-form-urlencoded} mimetype given the in HTML 4.0
-specification.  There are minor differences between the two encodings.}
-
-The URI encoding uses allows a few characters to be represented as-is:
-@litchar{a} through @litchar{z}, @litchar{A} through @litchar{Z},
-@litchar{0}-@litchar{9}, @litchar{-}, @litchar{_}, @litchar{.},
-@litchar{!}, @litchar{~}, @litchar{*}, @litchar{'}, @litchar{(} and
-@litchar{)}.  The remaining characters are encoded as
-@litchar{%}@nonterm{xx}, where @nonterm{xx} is the two-character hex
-representation of the integer value of the character (where the
-mapping character--integer is determined by US-ASCII if the integer is
-less than 128).
-
-The encoding, in line with RFC 2396's recommendation, represents a
-character as-is, if possible.  The decoding allows any characters
-to be represented by their hex values, and allows characters to be
-incorrectly represented as-is. The library provides ``unreserved''
-encoders that encode @litchar{!}, @litchar{*}, @litchar{'},
-@litchar{(}, and @litchar{)} using their hex representation,
-which is not recommended by RFC 2396 but avoids problems with some
-contexts.
-
-The rules for the @tt{application/x-www-form-urlencoded} mimetype
-given in the HTML 4.0 spec are:
-
-@itemize[
-
-  @item{Control names and values are escaped. Space characters are
-  replaced by @litchar{+}, and then reserved characters are escaped as
-  described in RFC 1738, section 2.2: Non-alphanumeric characters are
-  replaced by @litchar{%}@nonterm{xx} representing the ASCII code of
-  the character. Line breaks are represented as CRLF pairs:
-  @litchar{%0D%0A}. Note that RFC 2396 supersedes RFC 1738
-  @cite["RFC1738"].}
-
-  @item{The control names/values are listed in the order they appear
-  in the document. The name is separated from the value by @litchar{=}
-  and name/value pairs are separated from each other by either
-  @litchar{;} or @litchar{&}.  When encoding, @litchar{;} is used as
-  the separator by default. When decoding, both @litchar{;} and
-  @litchar{&} are parsed as separators by default.}
-
-]
-
-These @tt{application/x-www-form-urlencoded} rules differs slightly from the straight encoding in RFC 2396 in
-that @litchar{+} is allowed, and it represents a space.  The
-@racketmodname[net/uri-codec] library follows this convention,
-encoding a space as @litchar{+} and decoding @litchar{+} as a space.
-In addition, since there appear to be some broken decoders on the
-web, the library also encodes @litchar{!}, @litchar{~}, @litchar{'},
-@litchar{(}, and @litchar{)} using their hex representation, which is
-the same choice as made by the Java's @tt{URLEncoder}.
-
-
-
-@; ----------------------------------------
-
-@section[#:tag "uri-codec-proc"]{Functions}
-
-@defproc[(uri-encode [str string?]) string?]{
-
-Encode a string using the URI encoding rules.}
-
-
-@defproc[(uri-decode [str string?]) string?]{
-
-Decode a string using the URI decoding rules.}
-
-@defproc[(uri-path-segment-encode [str string?]) string?]{
-Encodes a string according to the rules in @cite["RFC3986"] for path segments.
-}
-@defproc[(uri-path-segment-decode [str string?]) string?]{
-Decodes a string according to the rules in @cite["RFC3986"] for path segments.
-}
-@defproc[(uri-userinfo-encode [str string?]) string?]{
-Encodes a string according to the rules in @cite["RFC3986"] for the userinfo field.
-}
-@defproc[(uri-userinfo-decode [str string?]) string?]{
-Decodes a string according to the rules in @cite["RFC3986"] for the userinfo field.
-}
-@defproc[(uri-unreserved-encode [str string?]) string?]{
-Encodes a string according to the rules in @cite["RFC3986"](section 2.3) for the unreserved characters.
-}
-@defproc[(uri-unreserved-decode [str string?]) string?]{
-Decodes a string according to the rules in @cite["RFC3986"](section 2.3) for the unreserved characters.
-}
-@defproc[(uri-path-segment-unreserved-encode [str string?]) string?]{
-Encodes a string according to the rules in @cite["RFC3986"] for path segments,
-but also encodes characters that @racket[uri-unreserved-encode] encodes
-and that @racket[uri-encode] does not.
-}
-@defproc[(uri-path-segment-unreserved-decode [str string?]) string?]{
-Decodes a string according to the rules in @cite["RFC3986"] for path segments.
-}
-
-
-@defproc[(form-urlencoded-encode [str string?]) string?]{
-
-Encode a string using the @tt{application/x-www-form-urlencoded}
-encoding rules. The result string contains no non-ASCII characters.}
-
-
-@defproc[(form-urlencoded-decode [str string?]) string?]{
-
-Decode a string encoded using the
-@tt{application/x-www-form-urlencoded} encoding rules.}
-
-
-@defproc[(alist->form-urlencoded [alist (listof (cons/c symbol? string?))])
-         string?]{
-
-Encode an association list using the
-@tt{application/x-www-form-urlencoded} encoding rules.
-
-The @racket[current-alist-separator-mode] parameter determines the
-separator used in the result.}
-
-
-@defproc[(form-urlencoded->alist [str string])
-         (listof (cons/c symbol? string?))]{
-
-Decode a string encoded using the
-@tt{application/x-www-form-urlencoded} encoding rules into an
-association list. All keys are case-folded for conversion to symbols.
-
-The @racket[current-alist-separator-mode] parameter determines the way
-that separators are parsed in the input.}
-
-
-@defparam[current-alist-separator-mode mode 
-          (one-of/c 'amp 'semi 'amp-or-semi 'semi-or-amp)]{
-
-A parameter that determines the separator used/recognized between
-associations in @racket[form-urlencoded->alist],
-@racket[alist->form-urlencoded], @racket[url->string], and
-@racket[string->url].
-
-The default value is @racket['amp-or-semi], which means that both
-@litchar{&} and @litchar{;} are treated as separators when parsing,
-and @litchar{&} is used as a separator when encoding. The @racket['semi-or-amp]
-mode is similar, but @litchar{;} is used when encoding. The other modes
-use/recognize only one of the separators.
-
-@examples[
-#:eval uri-codec-eval
-(define ex '((x . "foo") (y . "bar") (z . "baz")))
-(code:line (current-alist-separator-mode 'amp) (code:comment @#,t{try @racket['amp]...}))
-(form-urlencoded->alist "x=foo&y=bar&z=baz")
-(form-urlencoded->alist "x=foo;y=bar;z=baz")
-(alist->form-urlencoded ex)
-(code:line (current-alist-separator-mode 'semi) (code:comment @#,t{try @racket['semi]...}))
-(form-urlencoded->alist "x=foo;y=bar;z=baz")
-(form-urlencoded->alist "x=foo&y=bar&z=baz")
-(alist->form-urlencoded ex)
-(code:line (current-alist-separator-mode 'amp-or-semi) (code:comment @#,t{try @racket['amp-or-semi]...}))
-(form-urlencoded->alist "x=foo&y=bar&z=baz")
-(form-urlencoded->alist "x=foo;y=bar;z=baz")
-(alist->form-urlencoded ex)
-(code:line (current-alist-separator-mode 'semi-or-amp) (code:comment @#,t{try @racket['semi-or-amp]...}))
-(form-urlencoded->alist "x=foo&y=bar&z=baz")
-(form-urlencoded->alist "x=foo;y=bar;z=baz")
-(alist->form-urlencoded ex)
-]}
-
-@; ----------------------------------------
-
-@section{URI Codec Unit}
-
-@margin-note{@racket[uri-codec@] and @racket[uri-codec^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/uri-codec] module.}
-
-@defmodule[net/uri-codec-unit]
-
-@defthing[uri-codec@ unit?]{
-
-Imports nothing, exports @racket[uri-codec^].}
-
-@; ----------------------------------------
-
-@section{URI Codec Signature}
-
-@defmodule[net/uri-codec-sig]
-
-@defsignature[uri-codec^ ()]{}
-
-Includes everything exported by the @racketmodname[net/uri-codec]
-module except @racket[uri-path-segment-unreserved-encode] and
-@racket[uri-path-segment-unreserved-decode].
-
-
-@close-eval[uri-codec-eval]
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/url.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/url.scrbl
deleted file mode 100644
index fbeb0740ca..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/url.scrbl
+++ /dev/null
@@ -1,514 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/bnf
-          (for-label net/url net/url-unit net/url-sig 
-                     racket/list
-                     net/head net/uri-codec net/tcp-sig
-                     net/http-client
-                     (only-in net/url-connect current-https-protocol)
-                     openssl))
-
-@title[#:tag "url"]{URLs and HTTP}
-
-@defmodule[net/url]{The @racketmodname[net/url] library provides
-utilities to parse and manipulate URIs, as specified in RFC 2396
-@cite["RFC2396"], and to use the HTTP protocol.}
-
-To access the text of a document from the web, first obtain its URL as
-a string. Convert the address into a @racket[url] structure using
-@racket[string->url]. Then, open the document using
-@racket[get-pure-port] or @racket[get-impure-port], depending on
-whether or not you wish to examine its MIME headers.  At this point,
-you have a regular input port with which to process the document, as with
-any other file.
-
-Currently the only supported protocols are @racket["http"],
-@racket["https"], and sometimes @racket["file"].
-
-The @racketmodname[net/url] logs information and background-thread
-errors to a logger named @racket['net/url].
-
-@section{URL Structure}
-
-@declare-exporting[net/url-structs net/url]
-
-@defmodule*/no-declare[(net/url-structs)]{The URL structure types are
-provided by the @racketmodname[net/url-structs] library, and
-re-exported by @racketmodname[net/url].}
-
-@; ----------------------------------------
-
-
-@defstruct[url ([scheme (or/c false/c string?)]
-                [user (or/c false/c string?)]
-                [host (or/c false/c string?)]
-                [port (or/c false/c exact-nonnegative-integer?)]
-                [path-absolute? boolean?]
-                [path (listof path/param?)]
-                [query (listof (cons/c symbol? (or/c false/c string?)))]
-                [fragment (or/c false/c string?)])]{
-
-The basic structure for all URLs, which is explained in RFC 3986
-@cite["RFC3986"]. The following diagram illustrates the parts:
-
-@verbatim[#:indent 2]|{
-  http://sky@www:801/cgi-bin/finger;xyz?name=shriram;host=nw#top
-  {-1}   {2} {3} {4}{---5---------} {6} {----7-------------} {8}
-
-  1 = scheme, 2 = user, 3 = host, 4 = port,
-  5 = path (two elements),  6 = param (of second path element),
-  7 = query, 8 = fragment
-}|
-
-The strings inside the @racket[user], @racket[path], @racket[query],
-and @racket[fragment] fields are represented directly as Racket
-strings, without URL-syntax-specific quoting. The procedures
-@racket[string->url] and @racket[url->string] translate encodings such
-as @litchar{%20} into spaces and back again.
-
-By default, query associations are parsed with either @litchar{;} or
-@litchar{&} as a separator, and they are generated with @litchar{&} as
-a separator. The @racket[current-alist-separator-mode] parameter
-adjusts the behavior.
-
-An empty string at the end of the @racket[path] list corresponds to a
-URL that ends in a slash. For example, the result of
-@racket[(string->url "http://racket-lang.org/a/")] has a
-@racket[path] field with strings @racket["a"] and @racket[""], while
-the result of @racket[(string->url "http://racket-lang.org/a")] has a
-@racket[path] field with only the string @racket["a"].
-
-When a @racket["file"] URL is represented by a @racket[url] structure,
-the @racket[path] field is mostly a list of path elements. For Unix
-paths, the root directory is not included in @racket[path]; its
-presence or absence is implicit in the @racket[path-absolute?] flag.
-For Windows paths, the first element typically represents a drive, but
-a UNC path is represented by a first element that is @racket[""] and
-then successive elements complete the drive components that are
-separated by @litchar{/} or @litchar{\}.}
-
-@defstruct[path/param ([path (or/c string? (or/c 'up 'same))]
-                       [param (listof string?)])]{
-
-A pair that joins a path segment with its params in a URL.}
-
-@; ----------------------------------------
-
-@section{URL Functions}
-
-An HTTP connection is created as a @deftech{pure port} or a
-@deftech{impure port}.  A pure port is one from which the MIME headers
-have been removed, so that what remains is purely the first content
-fragment. An impure port is one that still has its MIME headers.
-
-@defproc[(string->url [str (or/c (not/c #rx"^([^:/?#]*):")
-                                 #rx"^[a-zA-Z][a-zA-Z0-9+.-]*:")])
-         url?]{
-
-Parses the URL specified by @racket[str] into a @racket[url]
-struct. The @racket[string->url] procedure uses
-@racket[form-urlencoded->alist] when parsing the query, so it is
-sensitive to the @racket[current-alist-separator-mode] parameter for
-determining the association separator.
-
-The contract on @racket[str] insists that, if the url has a scheme,
-then the scheme begins with a letter and consists only of letters,
-numbers, @litchar{+}, @litchar{-}, and @litchar{.} characters.
-
-If @racket[str] starts with @racket["file:"], then the path is always
-parsed as an absolute path, and the parsing details depend on
-@racket[file-url-path-convention-type]:
-
-@itemize[
-
- @item{@racket['unix] : If @racket["file:"] is followed by
-       @litchar{//} and a non-@litchar{/}, then the first element
-       after the @litchar{//} is parsed as a host (and maybe port);
-       otherwise, the first element starts the path, and the host is
-       @racket[""].}
-
- @item{@racket['windows] : If @racket["file:"] is followed by
-       @litchar{//}, then the @litchar{//} is stripped; the remainder
-       parsed as a Windows path. The host is always @racket[""] and
-       the port is always @racket[#f].}
-
-]}
-
-@defproc[(combine-url/relative [base url?] [relative string?]) url?]{
-
-Given a base URL and a relative path, combines the two and returns a
-new URL as per the URL combination specification.  They are combined
-according to the rules in RFC 3986 @cite["RFC3986"].
-
-This function does not raise any exceptions.}
-
-
-@defproc[(netscape/string->url [str string?]) url?]{
-
-Turns a string into a URL, applying (what appear to be) Netscape's
-conventions on automatically specifying the scheme: a string starting
-with a slash gets the scheme @racket["file"], while all others get the
-scheme @racket["http"].}
-
-
-@defproc[(url->string [URL url?]) string?]{
-
-Generates a string corresponding to the contents of a @racket[url]
-struct.  For a @racket["file:"] URL, the URL must not be relative, the
-result always starts @litchar{file://}, and the interpretation of the
-path depends on the value of @racket[file-url-path-convention-type]:
-
-@itemize[
-
- @item{@racket['unix] : Elements in @racket[URL] are treated as path
-       elements. Empty strings in the path list are treated like
-       @racket['same].}
-
- @item{@racket['windows] : If the first element is @racket[""] then
-       the next two elements define the UNC root, and the rest of the
-       elements are treated as path elements. Empty strings in the
-       path list are treated like @racket['same].}
-
-]
-
-The @racket[url->string] procedure uses
-@racket[alist->form-urlencoded] when formatting the query, so it is
-sensitive to the @racket[current-alist-separator-mode] parameter for
-determining the association separator. The default is to separate
-associations with a @litchar{&}.
-
-The encoding of path segments and fragment is sensitive to the
-@racket[current-url-encode-mode] parameter.}
-
-
-@defproc[(path->url [path (or/c path-string? path-for-some-system?)])
-         url?]{
-
-Converts a path to a @racket[url].}
-
-
-@defproc[(url->path [URL url?]
-                    [kind (or/c 'unix 'windows) (system-path-convention-type)])
-         path-for-some-system?]{
-
-Converts @racket[URL], which is assumed to be a @racket["file"] URL,
-to a path.}
-
-
-@defproc[(relative-path->relative-url-string [path (and/c (or/c path-string? path-for-some-system?)
-                                                          relative-path?)])
-         string?]{
-
-Converts @racket[path] to a string that parses as a relative URL (with
-forward slashes). Each element of @racket[path] is an element of the
-resulting URL path, and the string form of each element is encoded as
-needed. If @racket[path] is syntactically a directory, then the resulting
-URL ends with @litchar{/}.}
-
-
-@defparam[file-url-path-convention-type kind (or/c 'unix 'windows)]{
-
-Determines the default conversion to and from strings for
-@racket["file"] URLs. See @racket[string->url] and @racket[url->string].}
-
-
-@defparam[current-url-encode-mode mode (or/c 'recommended 'unreserved)]{
-
-Determines how @racket[url->string] encodes @litchar{!}, @litchar{*}, @litchar{'}, @litchar{(},
-and @litchar{)} in path segments and fragments:
-@racket['recommended] leave them as-is, while @racket['unreserved]
-encodes them using @litchar{%}. The @racket['recommended] mode corresponds
-to the recommendations of RFC 2396 @cite["RFC2396"], but @racket['unreserved]
-avoids characters that are in some contexts mistaken for delimiters around
-URLs.
-
-Internally, @racket['recommended] mode uses
-@racket[uri-path-segment-encode] and @racket[uri-encode], while
-@racket['unreserved] mode uses
-@racket[uri-path-segment-unreserved-encode] and
-@racket[uri-unreserved-encode].}
-
-
-@deftogether[(
-@defproc[(get-pure-port [URL url?]
-                        [header (listof string?) null]
-                        [#:redirections redirections exact-nonnegative-integer? 0])
-         input-port?]
-@defproc[(head-pure-port [URL url?]
-                         [header (listof string?) null])
-         input-port?]
-@defproc[(delete-pure-port [URL url?]
-                           [header (listof string?) null])
-         input-port?]
-)]{
-
-Initiates a GET/HEAD/DELETE request for @racket[URL] and returns a
-@tech{pure port} corresponding to the body of the response. The
-optional list of strings can be used to send header lines to the
-server.
-
-The GET method is used to retrieve whatever information is identified
-by @racket[URL]. If @racket[redirections] is not @racket[0], then 
-@racket[get-pure-port] will follow redirections from the server, 
-up to the limit given by @racket[redirections].
-
-The HEAD method is identical to GET, except the server must not return
-a message body. The meta-information returned in a response to a HEAD
-request should be identical to the information in a response to a GET
-request.
-
-The DELETE method is used to delete the entity identified by
-@racket[URL].
-
-@bold{Beware:} By default, @racket["https"] scheme handling does not
-verify a server's certificate (i.e., it's equivalent of clicking
-through a browser's warnings), so communication is safe, but the
-identity of the server is not verified. To validate the server's
-certificate, set @racket[current-https-protocol] to a context created
-with @racket[ssl-make-client-context], and enable certificate validation
-in the context with @racket[ssl-set-verify!].
-
-The @racket["file"] scheme for URLs is handled only by
-@racket[get-pure-port], which uses @racket[open-input-file], does not
-handle exceptions, and ignores the optional strings.}
-
-@deftogether[(
-@defproc[(get-impure-port [URL url?]
-                          [header (listof string?) null])
-         input-port?]
-@defproc[(head-impure-port [URL url?]
-                           [header (listof string?) null])
-         input-port?]
-@defproc[(delete-impure-port [URL url?]
-                             [header (listof string?) null])
-         input-port?]
-)]{
-
-Like @racket[get-pure-port], etc., but the resulting @tech{impure
-port} contains both the returned headers and the body. The
-@racket["file"] URL scheme is not handled by these functions.}
-
-@deftogether[(
-@defproc[(post-pure-port [URL url?]
-                         [post bytes?]
-                         [header (listof string?) null])
-         input-port?]
-@defproc[(put-pure-port [URL url?]
-                        [post bytes?]
-                        [header (listof string?) null])
-         input-port?]
-)]{
-
-Initiates a POST/PUT request for @racket[URL] and sends the
-@racket[post] byte string.  The result is a @tech{pure port}, which
-contains the body of the response is returned.  The optional list of
-strings can be used to send header lines to the server.
-
-@bold{Beware:} See @racket[get-pure-port] for warnings about
-@racket["https"] certificate validation.}
-
-
-@deftogether[(
-@defproc[(post-impure-port [URL url?]
-                           [post bytes?]
-                           [header (listof string?) null])
-         input-port?]
-@defproc[(put-impure-port [URL url?]
-                          [post bytes?]
-                          [header (listof string?) null])
-         input-port?]
-)]{
-
-Like @racket[post-pure-port] and @racket[put-pure-port], but the
-resulting @tech{impure port} contains both the returned headers and
-body.}
-
-
-@defproc[(display-pure-port [in input-port?]) void?]{
-
-Writes the output of a pure port, which is useful for debugging purposes.}
-
-
-@defproc[(purify-port [in input-port?]) string?]{
-
-Purifies a port, returning the MIME headers, plus a leading line for
-the form @litchar{HTTP/}@nonterm{vers}@litchar{
-}@nonterm{code}@litchar{ }@nonterm{message}, where @nonterm{vers} is
-something like @litchar{1.0} or @litchar{1.1}, @nonterm{code} is an
-exact integer for the response code, and @nonterm{message} is
-arbitrary text without a return or newline.
-
-The @racketmodname[net/head] library provides procedures, such as
-@racket[extract-field] for manipulating the header.
-
-Since web servers sometimes return mis-formatted replies,
-@racket[purify-port] is liberal in what it accepts as a header. as a
-result, the result string may be ill formed, but it will either be the
-empty string, or it will be a string matching the following regexp:
-
-@racketblock[
-#rx"^HTTP/.*?(\r\n\r\n|\n\n|\r\r)"
-]}
-
-@defproc[(get-pure-port/headers
-          [url url?]
-          [headers (listof string?) '()]
-          [#:redirections redirections exact-nonnegative-integer? 0]
-          [#:status? status? boolean? #f]
-          [#:connection connection (or/c #f http-connection?)])
-         (values input-port? string?)]{
-  This function is an alternative to calling @racket[get-impure-port] and
-  @racket[purify-port] when needing to follow redirections. It also
-  supports HTTP/1.1 connections, which are used when the @racket[connection]
-  argument is not @racket[#f].
-  
-  The @racket[get-pure-port/headers] function performs a GET request
-  on @racket[url], follows up to @racket[redirections] redirections
-  and returns a port containing the data as well as the headers for
-  the final connection. If @racket[status?] is true, then the status
-  line is included in the result string.
-
-  A given @racket[connection] should be used for communication
-  with a particular HTTP/1.1 server, unless @racket[connection] is closed
-  (via @racket[http-connection-close]) between uses for different servers.
-  If @racket[connection] is provided, read all data from the result port
-  before making a new request with the same @racket[connection]. (Reusing
-  a @racket[connection] without reading all data may or may not work.)
-}
-
-@deftogether[(
-@defproc[(http-connection? [v any/c]) boolean?]
-@defproc[(make-http-connection) http-connection?]
-@defproc[(http-connection-close [connection http-connection?]) void?]
-)]{
-
-A HTTP connection value represents a potentially persistent connection
-with a HTTP/1.1 server for use with @racket[get-pure-port/headers].
-
-The @racket[make-http-connection] creates a ``connection'' that is
-initially unconnected. Each call to @racket[get-pure-port/headers]
-leaves a connection either connected or unconnected, depending on
-whether the server allows the connection to continue. The
-@racket[http-connection-close] function unconnects, but it does not
-prevent further use of the connection value.}
-
-
-@defproc*[([(call/input-url [URL url?]
-                            [connect (url? . -> . input-port?)]
-                            [handle (input-port? . -> . any)])
-            any]
-           [(call/input-url [URL url?]
-                            [connect (url? (listof string?) . -> . input-port?)]
-                            [handle (input-port? . -> . any)]
-                            [header (listof string?)])
-            any])]{
-
-Given a URL and a @racket[connect] procedure like
-@racket[get-pure-port] to convert the URL to an input port (either a
-@tech{pure port} or @tech{impure port}), calls the @racket[handle]
-procedure on the port and closes the port on return. The result of the
-@racket[handle] procedure is the result of @racket[call/input-url].
-
-When a @racket[header] argument is supplied, it is passed along to the
-@racket[connect] procedure.
-
-The connection is made in such a way that the port is closed before
-@racket[call/input-url] returns, no matter how it returns. In
-particular, it is closed if @racket[handle] raises an exception, or if
-the connection process is interruped by an asynchronous break
-exception.}
-
-
-@defparam[current-proxy-servers mapping (listof (list/c string? string? (integer-in 0 65535)))]{
-
-A parameter that determines a mapping of proxy servers used for
-connections. Each mapping is a list of three elements:
-
-@itemize[
-
- @item{the URL scheme, such as @racket["http"];}
-
- @item{the proxy server address; and}
-
- @item{the proxy server port number.}
-
-]
-
-Currently, the only proxiable scheme is @racket["http"]. The default
-mapping is the empty list (i.e., no proxies).}
-
-@defproc[(url-exception? [x any/c])
-         boolean?]{
- Identifies an error thrown by URL functions.         
-}
-
-@defproc[(http-sendrecv/url [u url?]
-                            [#:method method (or/c bytes? string? symbol?) #"GET"]
-                            [#:headers headers (listof (or/c bytes? string?)) empty]
-                            [#:data data (or/c false/c bytes? string? data-procedure/c) #f]
-                            [#:content-decode decodes (listof symbol?) '(gzip)])
-         (values bytes? (listof bytes?) input-port?)]{
-
-Calls @racket[http-sendrecv] using @racket[u] to populate the host, URI, port, and SSL parameters.
-
-This function does not support proxies.
-                                                      
-}
-
-@section{URL HTTPS mode}
-
-@defmodule[net/url-connect]
-
-These bindings are provided by the @racketmodname[net/url-connect] library, and
-used by @racketmodname[net/url].
-
-@defparam[current-https-protocol protocol (or/c ssl-client-context? symbol?)]{
-
-A parameter that determines the connection mode for @racket["https"]
-connections; the parameter value is passed as the third argument to
-@racket[ssl-connect] when creating an @racket["https"] connection.
-Set this parameter to validate a server's certificates, for example,
-as described with @racket[get-pure-port].}
-
-@; ----------------------------------------
-
-@section{URL Unit}
-
-@margin-note{@racket[url@], @racket[url^], and @racket[url+scheme^] are deprecated.
-They exist for backward-compatibility and will likely be removed in
-the future. New code should use the @racketmodname[net/url] module.}
-
-@defmodule[net/url-unit]
-
-@defthing[url@ unit?]{
-
-Imports @racket[tcp^], exports @racket[url+scheme^].
-
-The @racket[url+scheme^] signature contains
-@racket[current-connect-scheme], which @racket[url@] binds to a
-parameter.  The parameter is set to the scheme of a URL when
-@racket[tcp-connect] is called to create a connection.  A
-@racket[tcp-connect] variant linked to @racket[url@] can check this
-parameter to choose the connection mode; in particular, @racket[net/url]
-supplies a @racket[tcp-connect] that actually uses @racket[ssl-connect]
-when @racket[(current-connect-scheme)] produces @racket["https"].
-
-Note that @racket[net/url] does not provide the
-@racket[current-connect-scheme] parameter.}
-
-@; ----------------------------------------
-
-@section{URL Signature}
-
-@defmodule[net/url-sig]
-
-@defsignature[url^ ()]{
-
-Includes everything exported by the @racketmodname[net/url] module
-except @racket[current-https-protocol] and @racket[current-url-encode-mode].
-Note that the exports of
-@racketmodname[net/url] and the @racket[url^] signature do not include
-@racket[current-connect-scheme].}
-
-@defsignature[url+scheme^ (url^)]{
-
-Adds @racket[current-connect-scheme] to @racket[url^].}
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/websocket.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/websocket.scrbl
deleted file mode 100644
index d9d1304f1e..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/websocket.scrbl
+++ /dev/null
@@ -1,120 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          scribble/bnf
-          (for-label net/url unstable/contract web-server/http racket/list
-                     racket/async-channel
-                     (prefix-in raw: (for-label net/tcp-unit))
-                     net/websocket
-                     net/websocket/client
-                     net/websocket/server
-                     net/websocket/conn))
-
-@title[#:tag "websocket"]{WebSocket}
-
-@defmodule[net/websocket]
-
-The @racketmodname[net/websocket] library provides
-utilities to run and communicate with WebSocket servers,
-as specified in @link["http://www.whatwg.org/specs/web-socket-protocol/"]{the WebSocket protocol} IETF draft
-as of August 16th, 2010.
-
-This module provides the exports from @racketmodname[net/websocket/client] and @racketmodname[net/websocket/server].
- 
-@section{Client API}
-
-@defmodule[net/websocket/client]
-
-@defproc[(ws-url? [x any/c]) boolean?]{ Returns true if @racket[x] is a @racket[url?] and has a @racket[url-scheme] equal to @litchar["ws"] or @litchar["wss"]. }
-
-@defproc[(wss-url? [x any/c]) boolean?]{ Returns true if @racket[x] is a @racket[url?] and has a @racket[url-scheme] equal to @litchar["wss"]. }
-
-@defproc[(ws-connect [u ws-url?]
-                     [#:headers headers (listof header?) empty])
-         open-ws-conn?]{
- Connects to the WebSocket server specified by @racket[u], providing @racket[headers] as additional headers.
- Returns the connection handle.
-}
-
-This module also provides the exports from @racketmodname[net/websocket/conn].
-
-@section{Server API}
-
-@defmodule[net/websocket/server]
-
-@defproc[(ws-serve [conn-handle (open-ws-conn? any/c . -> . void)]
-                   [#:conn-headers 
-                    conn-headers
-                    (bytes? (listof header?) . -> . (values (listof header?) any/c))
-                    (λ (b hs) (values empty (void)))]
-                   [#:tcp@ tcp@ (unit/c (import) (export tcp^)) raw:tcp@]
-                   [#:port port tcp-listen-port? 80]
-                   [#:listen-ip listen-ip (or/c string? false/c) #f]
-                   [#:max-waiting max-waiting integer? 4]
-                   [#:timeout timeout integer? (* 60 60)]
-                   [#:confirmation-channel
-                    confirm-ch
-                    (or/c false/c async-channel?)
-                    #f])
-         (-> void)]{
- 
- Starts a WebSocket server where each new connection uses @racket[conn-headers] to compute
- what headers the client receives based on the client's request line and headers. @racket[conn-headers]
- also returns a piece of state that will be passed to @racket[conn-handle] as its second argument.
- After the connection handshake is finished, @racket[conn-handle] receives the connection and is in
- sole control until the WebSocket connection completes.
- 
- All other arguments are used as in a @secref["dispatch-server-unit" #:doc '(lib "web-server/scribblings/web-server-internal.scrbl")]. Similarly, the return result is a function that shuts down the server, just like a dispatch server.
-
- The @racket[#:tcp@] keyword is provided for building an SSL server.
-}
-       
-This module also provides the exports from @racketmodname[net/websocket/conn].
-
-@section{Connections}
-
-@defmodule[net/websocket/conn]
-
-WebSocket connection are synchronizable events.
-
-@defparam[framing-mode mode (symbols 'old 'new)]{ Controls whether framing is as before August 16th, 2010 or after. (Most Web browsers currently support only @racket['old] and they are incompatible, so you must choose the correct one.) Defaults to @racket['old].}
-
-@defproc[(ws-conn? [x any/c]) boolean?]{ Returns true if @racket[x] is a WebSocket connection. }
-
-@defproc[(open-ws-conn? [x any/c]) boolean?]{ Returns true if @racket[x] is an open WebSocket connection. }
-
-@defproc[(ws-conn-line [ws ws-conn?]) bytes?]{ Returns the request/response line of the WebSocket connection. }
-@defproc[(ws-conn-closed? [ws ws-conn?]) boolean?]{ Returns true if the WebSocket connection has been closed. }
-@defproc[(ws-conn-headers [ws ws-conn?]) (listof header?)]{ Returns the headers of the WebSocket connection. }
-
-WebSocket connection support only blocking calls:
-
-@defproc[(ws-send! [ws open-ws-conn?] [s string?]) void]{ Sends @racket[s] over @racket[ws]. }
-@defproc[(ws-recv [ws open-ws-conn?]) (or/c string? eof-object?)]{ Receives a string from @racket[ws]. Returns @racket[eof] if the other end closes the connection. }
-
-@defproc[(ws-close! [ws open-ws-conn?]) void]{ Closes @racket[ws]. }
-
-@section{Example}
-
-This is a WebSocket echo server compatible with the browser origin security model:
-
-@racketblock[
-(ws-serve 
- #:port 8080
- (λ (wsc _)
-   (let loop ()
-     (define m (ws-recv wsc))
-     (printf "~a\n" m)
-     (unless (eof-object? m)
-       (ws-send! wsc m)
-       (loop))))
- #:conn-headers 
- (λ (_ hs)
-   (define origin 
-     (header-value (headers-assq* #"Origin" hs)))
-   (values 
-    (list
-     (make-header #"Sec-WebSocket-Origin" origin)
-     (make-header #"Sec-WebSocket-Location"
-                  #"ws://localhost:8080/"))
-    #f)))
-]
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/win32-ssl.scrbl b/pkgs/net-pkgs/net-doc/net/scribblings/win32-ssl.scrbl
deleted file mode 100644
index 9bf1201d0f..0000000000
--- a/pkgs/net-pkgs/net-doc/net/scribblings/win32-ssl.scrbl
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt"
-          (for-label net/win32-ssl
-                     openssl))
-
-@title[#:tag "win32-ssl"]{Windows Native SSL: Secure Communication}
-
-@defmodule[net/win32-ssl]{The @racketmodname[net/win32-ssl] module
-offers a fraction of the functionality of @racketmodname[openssl] and
-works only on Windows, but it has the advantage that it works before
-OpenSSL libraries are installed.}
-
-@defproc[(win32-ssl-connect [hostname string?]
-                            [port-no (integer-in 1 65535)]
-                            [client-protocol
-                             (or/c 'sslv2-or-v3
-                                   'sslv2
-                                   'sslv3
-                                   'tls)
-                            'sslv2-or-v3])
-         (values (and/c input-port? win32-ssl-port?)
-                 (and/c output-port? win32-ssl-port?))]{
-
-Like @racket[ssl-connect], but without support for client contexts
-(which could enable certificate checking, for example).}
-
-
-@defproc[(win32-ssl-abandon-port [in (and/c win32-ssl-port? output-port?)]) void?]{
-
-Analogous to @racket[ssl-abandon-port].}
-
-
-@defproc[(ports->win32-ssl-ports
-           [input-port input-port?]
-	   [output-port output-port?]
-	   [#:encrypt protocol (or/c 'sslv2-or-v3 'sslv2 'sslv3 'tls) 'sslv2-or-v3])
-         (values (and/c input-port? win32-ssl-port?)
-                 (and/c output-port? win32-ssl-port?))]{
-
-Analogous to @racket[ports->ssl-ports].}
-
-
-@defproc[(win32-ssl-port? [v any/c]) boolean?]{
-
-Returns @racket[#t] of @racket[v] is an SSL port produced by
-@racket[win32-ssl-connect] or
-@racket[ports->win32-ssl-ports].}
-
-
-@defthing[win32-ssl-available? boolean?]{
-
-A boolean value that reports whether the Windows native SSL library was
-successfully loaded. Calling @racket[win32-ssl-connect], @|etc| when this
-value is @racket[#f] will raise an exception.}
diff --git a/pkgs/net-pkgs/net-lib/LICENSE.txt b/pkgs/net-pkgs/net-lib/LICENSE.txt
deleted file mode 100644
index bfaa1831f1..0000000000
--- a/pkgs/net-pkgs/net-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-net-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/net-pkgs/net-lib/info.rkt b/pkgs/net-pkgs/net-lib/info.rkt
deleted file mode 100644
index abb44453ac..0000000000
--- a/pkgs/net-pkgs/net-lib/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("srfi-lite-lib"
-               "base"))
-
-(define pkg-desc "implementation (no documentation) part of \"net\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/net-pkgs/net-lib/net/cgi.rkt b/pkgs/net-pkgs/net-lib/net/cgi.rkt
deleted file mode 100644
index 2b38c8839f..0000000000
--- a/pkgs/net-pkgs/net-lib/net/cgi.rkt
+++ /dev/null
@@ -1,197 +0,0 @@
-#lang racket/base
-
-(require net/uri-codec)
-
-(provide
-
- ;; -- cgi methods --
- get-bindings
- get-bindings/post
- get-bindings/get
- output-http-headers
- generate-html-output
- generate-error-output
- bindings-as-html
- extract-bindings
- extract-binding/single
- get-cgi-method
-
- ;; -- general HTML utilities --
- string->html
- generate-link-text)
-
-;; type bindings = list ((symbol . string))
-
-;; --------------------------------------------------------------------
-
-;; string->html : string -> string
-;; -- the input is raw text, the output is HTML appropriately quoted
-
-(define (string->html s)
-  (apply string-append
-         (map (lambda (c)
-                (case c
-                  [(#\<) "&lt;"]
-                  [(#\>) "&gt;"]
-                  [(#\&) "&amp;"]
-                  [else (string c)]))
-              (string->list s))))
-
-(define default-text-color  "#000000")
-(define default-bg-color    "#ffffff")
-(define default-link-color  "#cc2200")
-(define default-vlink-color "#882200")
-(define default-alink-color "#444444")
-
-;; generate-html-output :
-;; html-string x list (html-string) x ... -> ()
-
-(define (generate-html-output title body-lines
-                              [text-color default-text-color]
-                              [bg-color default-bg-color]
-                              [link-color default-link-color]
-                              [vlink-color default-vlink-color]
-                              [alink-color default-alink-color])
-  (let ([sa string-append])
-    (for ([l `("Content-type: text/html"
-               ""
-               "<html>"
-               "<!-- The form was processed, and this document was generated,"
-               "     using the CGI utilities for Racket.  For more information"
-               "     on Racket, see"
-               "       http://racket-lang.org/"
-               "     and for the CGI utilities, contact"
-               "     (sk@cs.brown.edu). -->"
-               "<head>"
-               ,(sa "<title>" title "</title>")
-               "</head>"
-               ""
-               ,(sa "<body bgcolor=\"" bg-color "\" text=\"" text-color "\"")
-               ,(sa "      link=\"" link-color "\"")
-               ,(sa "      vlink=\"" vlink-color "\" alink=\"" alink-color "\">")
-               ""
-               ,@body-lines
-               ""
-               "</body>"
-               "</html>")])
-      (display l)
-      (newline))))
-
-;; output-http-headers : -> void
-(define (output-http-headers)
-  (printf "Content-type: text/html\r\n\r\n"))
-
-;; delimiter->predicate : symbol -> regexp
-;; returns a regexp to read a chunk of text up to a delimiter (excluding it)
-(define (delimiter->rx delimiter)
-  (case delimiter
-    [(amp)         #rx#"^[^&]*"]
-    [(semi)        #rx#"^[^;]*"]
-    [(amp-or-semi) #rx#"^[^&;]*"]
-    [else (error 'delimiter->rx
-                 "internal-error, unknown delimiter: ~e" delimiter)]))
-
-;; get-bindings* : iport -> (listof (cons symbol string))
-;; Reads all bindings from the input port.  The strings are processed to
-;; remove the CGI spec "escape"s.
-;; This code is _slightly_ lax: it allows an input to end in
-;; (current-alist-separator-mode).  It's not clear this is legal by the
-;; CGI spec, which suggests that the last value binding must end in an
-;; EOF.  It doesn't look like this matters.
-;; ELI: * Keeping this behavior for now, maybe better to remove it?
-;;      * Looks like `form-urlencoded->alist' is doing almost exactly
-;;        the same job this code does.
-(define (get-bindings* method ip)
-  (define (err fmt . xs)
-    (generate-error-output
-     (list (format "Server generated malformed input for ~a method:" method)
-           (apply format fmt xs))))
-  (define value-rx (delimiter->rx (current-alist-separator-mode)))
-  (define (process str) (form-urlencoded-decode (bytes->string/utf-8 str)))
-  (let loop ([bindings '()])
-    (if (eof-object? (peek-char ip))
-      (reverse bindings)
-      (let ()
-        (define name (car (or (regexp-match #rx"^[^=]+" ip)
-                              (err "Missing field name before `='"))))
-        (unless (eq? #\= (read-char ip))
-          (err "No binding for `~a' field." name))
-        (define value (car (regexp-match value-rx ip)))
-        (read-char ip) ; consume the delimiter, possibly eof (retested above)
-        (loop (cons (cons (string->symbol (process name)) (process value))
-                    bindings))))))
-
-;; get-bindings/post : () -> bindings
-(define (get-bindings/post)
-  (get-bindings* "POST" (current-input-port)))
-
-;; get-bindings/get : () -> bindings
-(define (get-bindings/get)
-  (get-bindings* "GET" (open-input-string (getenv "QUERY_STRING"))))
-
-;; get-bindings : () -> bindings
-(define (get-bindings)
-  (if (string=? (get-cgi-method) "POST")
-    (get-bindings/post)
-    (get-bindings/get)))
-
-;; generate-error-output : list (html-string) -> <exit>
-(define (generate-error-output error-message-lines)
-  (generate-html-output "Internal Error" error-message-lines)
-  (exit))
-
-;; bindings-as-html : bindings -> list (html-string)
-;; -- formats name-value bindings as HTML appropriate for displaying
-(define (bindings-as-html bindings)
-  `("<code>"
-    ,@(map (lambda (bind)
-             (string-append (symbol->string (car bind))
-                            "&nbsp;--&gt;&nbsp;"
-                            (cdr bind)
-                            "<br>"))
-           bindings)
-    "</code>"))
-
-;; extract-bindings : (string + symbol) x bindings -> list (string)
-;; -- Extracts the bindings associated with a given name.  The semantics of
-;; forms states that a CHECKBOX may use the same NAME field multiple times.
-;; Hence, a list of strings is returned.  Note that the result may be the
-;; empty list.
-(define (extract-bindings field-name bindings)
-  (let ([field-name (if (symbol? field-name)
-                      field-name (string->symbol field-name))])
-    (let loop ([found null] [bindings bindings])
-      (if (null? bindings)
-        found
-        (if (equal? field-name (caar bindings))
-          (loop (cons (cdar bindings) found) (cdr bindings))
-          (loop found (cdr bindings)))))))
-
-;; extract-binding/single : (string + symbol) x bindings -> string
-;; -- used in cases where only one binding is supposed to occur
-(define (extract-binding/single field-name bindings)
-  (let* ([field-name (if (symbol? field-name)
-                       field-name (string->symbol field-name))]
-         [result (extract-bindings field-name bindings)])
-    (cond
-      [(null? result)
-       (generate-error-output
-        (cons (format "No binding for field `~a':<br>" field-name)
-              (bindings-as-html bindings)))]
-      [(null? (cdr result))
-       (car result)]
-      [else
-       (generate-error-output
-        (cons (format "Multiple bindings for field `~a' where one expected:<br>"
-                      field-name)
-              (bindings-as-html bindings)))])))
-
-;; get-cgi-method : () -> string
-;; -- string is either GET or POST (though future extension is possible)
-(define (get-cgi-method)
-  (or (getenv "REQUEST_METHOD")
-      (error 'get-cgi-method "no REQUEST_METHOD environment variable")))
-
-;; generate-link-text : string x html-string -> html-string
-(define (generate-link-text url anchor-text)
-  (string-append "<a href=\"" url "\">" anchor-text "</a>"))
diff --git a/pkgs/net-pkgs/net-lib/net/cookie.rkt b/pkgs/net-pkgs/net-lib/net/cookie.rkt
deleted file mode 100644
index 1050f84777..0000000000
--- a/pkgs/net-pkgs/net-lib/net/cookie.rkt
+++ /dev/null
@@ -1,353 +0,0 @@
-;;;
-;;; <cookie.rkt> ---- HTTP cookies library
-;;; Time-stamp: <03/04/25 10:50:05 noel>
-;;;
-;;; Copyright (C) 2002 by Francisco Solsona.
-;;;
-;;; This file is part of net.
-
-;;; net is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; net is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with net; if not, write to the Free Software
-;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;;; 02110-1301 USA.
-
-;;; Author: Francisco Solsona <solsona@acm.org>
-;;
-;;
-;; Commentary:
-;;
-;; The PLT Web server offers functionality to keep state beyond the
-;; capacity of HTTP cookies.  Believe or not, sometimes you may want
-;; to keep stuff on the client end, like the theme the (anonymous)
-;; user likes, a session id, etc., so I wrote this wanna be library.
-;;
-;; It uses some of the surfies you see on the require section below.
-;; It doesn't actually "send" the Set-Cookie header to the browser, it
-;; doesn't even add the string "Set-Cookie: " to the will-be cookie it
-;; generates.  Why? well because you may want to use this code with
-;; very different Web browsers, and the way to send them may vary
-;; drastically.  For instance, if you are writing a CGI to be executed
-;; from a non-cooperative (from the PLT Scheme point of view) web
-;; server, like Apache, then you will `display' de cookie right to the
-;; standard output.  If you use FastCGI, you will `display' it trhough
-;; the `output' communication stream between your CGI, and the Web
-;; browser, but if you are using PLT Scheme Web browser, you will use
-;; `make-response/full', or similar, chances are you will add cookies
-;; to the `extras' parameter (extra headers), as cons pairs... as in
-;; `(("Set-Cookie" . "cookie=\"as_returned_by_this_library";etc"))'.
-;;
-;; You should think of this procedures as a `format' for cookies.
-#lang racket/base
-
-(require srfi/13/string
-         srfi/14/char-set
-         racket/serialize)
-(provide
- cookie-name?
- cookie-value?
- cookie?
- valid-domain?
- set-cookie
- cookie:add-comment
- cookie:add-domain
- cookie:add-max-age
- cookie:add-expires
- cookie:add-path
- cookie:secure
- cookie:version
- ;; To actually return a cookie (string formated as a cookie):
- print-cookie
- ;; To parse the Cookies header:
- get-cookie
- get-cookie/single
- ;; exceptions
- (struct-out cookie-error))
-
-(define-serializable-struct cookie
-  (name value comment domain max-age path secure version expires) #:mutable)
-(define-struct (cookie-error exn:fail) ())
-
-;; error* : string args ... -> raises a cookie-error exception
-;; constructs a cookie-error struct from the given error message
-;; (added to fix exceptions-must-take-immutable-strings bug)
-(define (error* fmt . args)
-  (raise (make-cookie-error (apply format fmt args)
-                            (current-continuation-marks))))
-
-;; The syntax for the Set-Cookie response header is
-;; set-cookie      =       "Set-Cookie:" cookies
-;; cookies         =       1#cookie
-;; cookie          =       NAME "=" VALUE *(";" cookie-av)
-;; NAME            =       attr
-;; VALUE           =       value
-;; cookie-av       =       "Comment" "=" value
-;;                  |       "Domain" "=" value
-;;                  |       "Max-Age" "=" value
-;;                  |       "Expires" "=" value
-;;                  |       "Path" "=" value
-;;                  |       "Secure"
-;;                  |       "Version" "=" 1*DIGIT
-(define (set-cookie name pre-value)
-  (let ([value (to-rfc2109:value pre-value)])
-    (unless (rfc2068:token? name)
-      (error* "invalid cookie name: ~a / ~a" name value))
-    (make-cookie name value
-                 #f ; comment
-                 #f ; current domain
-                 #f ; at the end of session
-                 #f ; current path
-                 #f ; normal (non SSL)
-                 #f ; default version
-                 #f ; doesn't expire
-                 )))
-
-;;!
-;;
-;; (function (print-cookie cookie))
-;;
-;; (param cookie Cookie-structure "The cookie to return as a string")
-;;
-;; Formats the cookie contents in a string ready to be appended to a
-;; "Set-Cookie: " header, and sent to a client (browser).
-(define (print-cookie cookie)
-  (define (format-if fmt val) (and val (format fmt val)))
-  (unless (cookie? cookie) (error* "cookie expected, received: ~a" cookie))
-  (string-join
-   (filter values
-           (list (format "~a=~a" (cookie-name cookie) (cookie-value cookie))
-                 (format-if "Comment=~a" (cookie-comment cookie))
-                 (format-if "Domain=~a" (cookie-domain cookie))
-                 (format-if "Max-Age=~a" (cookie-max-age cookie))
-                 (format-if "Path=~a" (cookie-path cookie))
-                 (and (cookie-secure cookie) "Secure")
-                 (format-if "Version=~a" (cookie-version cookie))
-                 (format-if "expires=~a" (cookie-expires cookie))))
-   "; "))
-
-(define (cookie:add-comment cookie pre-comment)
-  (let ([comment (to-rfc2109:value pre-comment)])
-    (unless (cookie? cookie)
-      (error* "cookie expected, received: ~a" cookie))
-    (set-cookie-comment! cookie comment)
-    cookie))
-
-(define (cookie:add-domain cookie domain)
-  (unless (valid-domain? domain)
-    (error* "invalid domain: ~a" domain))
-  (unless (cookie? cookie)
-    (error* "cookie expected, received: ~a" cookie))
-  (set-cookie-domain! cookie domain)
-  cookie)
-
-(define (cookie:add-expires cookie expires)
-  (unless (string? expires)
-    (error* "invalid expires: ~a" expires))
-  (unless (cookie? cookie)
-    (error* "cookie expected, received: ~a" cookie))
-  (set-cookie-expires! cookie expires)
-  cookie)
-
-(define (cookie:add-max-age cookie seconds)
-  (unless (and (integer? seconds) (not (negative? seconds)))
-    (error* "invalid Max-Age for cookie: ~a" seconds))
-  (unless (cookie? cookie)
-    (error* "cookie expected, received: ~a" cookie))
-  (set-cookie-max-age! cookie seconds)
-  cookie)
-
-(define (cookie:add-path cookie pre-path)
-  (let ([path pre-path])
-    (unless (cookie? cookie)
-      (error* "cookie expected, received: ~a" cookie))
-    (set-cookie-path! cookie path)
-    cookie))
-
-(define (cookie:secure cookie secure?)
-  (unless (boolean? secure?)
-    (error* "invalid argument (boolean expected), received: ~a" secure?))
-  (unless (cookie? cookie)
-    (error* "cookie expected, received: ~a" cookie))
-  (set-cookie-secure! cookie secure?)
-  cookie)
-
-(define (cookie:version cookie version)
-  (unless (integer? version)
-    (error* "unsupported version: ~a" version))
-  (unless (cookie? cookie)
-    (error* "cookie expected, received: ~a" cookie))
-  (set-cookie-version! cookie version)
-  cookie)
-
-
-;; Parsing the Cookie header:
-
-(define char-set:all-but=
-  (char-set-difference char-set:full (string->char-set "=")))
-
-(define char-set:all-but-semicolon
-  (char-set-difference char-set:full (string->char-set ";")))
-
-;;!
-;;
-;; (function (get-all-results name cookies))
-;;
-;; Auxiliar procedure that returns all values associated with
-;; `name' in the association list (cookies).
-(define (get-all-results name cookies)
-  (let loop ([c cookies])
-    (if (null? c)
-        '()
-        (let ([pair (car c)])
-          (if (string=? name (car pair))
-              ;; found an instance of cookie named `name'
-              (cons (cadr pair) (loop (cdr c)))
-              (loop (cdr c)))))))
-
-;; which typically looks like:
-;;   (cookie . "test5=\"5\"; test1=\"1\"; test0=\"0\"; test1=\"20\"")
-;; note that it can be multi-valued: `test1' has values: "1", and "20".  Of
-;; course, in the same spirit, we only receive the "string content".
-(define (get-cookie name cookies)
-  (let ([cookies (map (lambda (p)
-                        (map string-trim-both
-                             (string-tokenize p char-set:all-but=)))
-                      (string-tokenize cookies char-set:all-but-semicolon))])
-    (get-all-results name cookies)))
-
-;;!
-;;
-;; (function (get-cookie/single name cookies))
-;;
-;; (param name String "The name of the cookie we are looking for")
-;; (param cookies String "The string (from the environment) with the content of the cookie header.")
-;;
-;; Returns the first name associated with the cookie named `name', if any, or #f.
-(define (get-cookie/single name cookies)
-  (let ([cookies (get-cookie name cookies)])
-    (and (not (null? cookies)) (car cookies))))
-
-
-;;;;;
-;; Auxiliary procedures
-;;;;;
-
-;; token          = 1*<any CHAR except CTLs or tspecials>
-;;
-;; tspecials      = "(" | ")" | "<" | ">" | "@"
-;;                | "," | ";" | ":" | "\" | <">
-;;                | "/" | "[" | "]" | "?" | "="
-;;                | "{" | "}" | SP | HT
-(define char-set:tspecials
-  (char-set-union (string->char-set "()<>@,;:\\\"/[]?={}")
-                  char-set:whitespace
-                  (char-set #\tab)))
-
-(define char-set:control
-  (char-set-union char-set:iso-control
-                  (char-set (integer->char 127))));; DEL
-(define char-set:token
-  (char-set-difference char-set:ascii char-set:tspecials char-set:control))
-
-;; token? : string -> boolean
-;;
-;; returns #t if s is an RFC 2068 token (see definition above), #f otherwise.
-(define (rfc2068:token? s)
-  (string-every char-set:token s))
-
-;;!
-;;
-;; (function (quoted-string? s))
-;;
-;; (param s String "The string to check")
-;;
-;; Returns s if the string is an RFC 2068 quoted-string, #f otherwise. As in:
-;; quoted-string  = ( <"> *(qdtext) <"> )
-;; qdtext         = <any TEXT except <">>
-;;
-;; The backslash character ("\") may be used as a single-character quoting
-;; mechanism only within quoted-string and comment constructs.
-;;
-;; quoted-pair    = "\" CHAR
-;;
-;; implementation note: I have chosen to use a regular expression rather than
-;; a character set for this definition because of two dependencies: CRLF must
-;; appear as a block to be legal, and " may only appear as \"
-(define (rfc2068:quoted-string? s)
-  (and (regexp-match?
-        #rx"^\"([^\"\u0000-\u001F]| |\r\n|\t|\\\\\")*\"$"
-        s)
-       s))
-
-;; value: token | quoted-string
-(define (rfc2109:value? s)
-  (or (rfc2068:token? s) (rfc2068:quoted-string? s)
-      (rfc2068:quoted-string? (convert-to-quoted s))))
-
-;; convert-to-quoted : string -> quoted-string?
-;; takes the given string as a particular message, and converts the given
-;; string to that representatation
-(define (convert-to-quoted str)
-  (string-append "\"" (regexp-replace* #rx"\"" str "\\\\\"") "\""))
-
-;; string -> rfc2109:value?
-(define (to-rfc2109:value s)
-  (cond
-    [(not (string? s))
-     (error* "expected string, given: ~e" s)]
-    
-    ;; for backwards compatibility, just use the given string if it will work
-    [(rfc2068:token? s) s]
-    [(rfc2068:quoted-string? s) s]
-    
-    ;; ... but if it doesn't work (i.e., it's just a normal message) then try
-    ;; to convert it into a representation that will work
-    [(rfc2068:quoted-string? (convert-to-quoted s))
-     => (λ (x) x)]
-    [else
-     (error* "could not convert the given string to an acceptable RFC 2109 value: ~s" s)]))
-
-;;!
-;;
-;; (function (cookie-string? s))
-;;
-;; (param s String "String to check")
-;;
-;; Returns whether this is a valid string to use as the value or the
-;; name (depending on value?) of an HTTP cookie.
-(define (cookie-value? s)
-  (and (string? s)
-       (rfc2109:value? s)))
-
-(define (cookie-name? s)
-  (and (string? s) 
-       ;; name:  token
-       (rfc2068:token? s)))
-
-;; Host names as per RFC 1123 and RFC952, more or less, anyway. :-)
-(define char-set:hostname
-  (let ([a-z-lowercase (ucs-range->char-set #x61 #x7B)]
-        [a-z-uppercase (ucs-range->char-set #x41 #x5B)])
-    (char-set-adjoin!
-     (char-set-union char-set:digit a-z-lowercase a-z-uppercase)
-     #\.)))
-
-(define (valid-domain? dom)
-  (and (string? dom)
-       ;; Domain must start with a dot (.)
-       (string=? (string-take dom 1) ".")
-       ;; The rest are tokens-like strings separated by dots
-       (string-every char-set:hostname dom)
-       (<= (string-length dom) 76)))
-
-(define (valid-path? v)
-  (and (string? v) (rfc2109:value? v)))
diff --git a/pkgs/net-pkgs/net-lib/net/dns.rkt b/pkgs/net-pkgs/net-lib/net/dns.rkt
deleted file mode 100644
index 729a1d0623..0000000000
--- a/pkgs/net-pkgs/net-lib/net/dns.rkt
+++ /dev/null
@@ -1,432 +0,0 @@
-#lang racket/base
-
-;; DNS query library for Racket
-
-(require "private/ip.rkt"
-         racket/contract
-         racket/format
-         racket/string
-         racket/system
-         racket/udp)
-
-(provide (contract-out
-          [dns-get-address
-           (->* ((or/c ip-address? ip-address-string?) string?)
-                (#:ipv6? any/c)
-                ip-address-string?)]
-          [dns-get-name
-           (-> (or/c ip-address? ip-address-string?)
-               (or/c ip-address? ip-address-string?)
-               string?)]
-          [dns-get-mail-exchanger
-           (-> (or/c ip-address? ip-address-string?)
-               string?
-               string?)]
-          [dns-find-nameserver
-           (-> (or/c ip-address-string? #f))]))
-
-;; UDP retry timeout:
-(define INIT-TIMEOUT 50)
-
-;; Data Definitions
-;; An LB is a (Listof Bytes)
-
-;; A Type is one of the following
-(define types
-  '((a      1)
-    (ns     2)
-    (md     3)
-    (mf     4)
-    (cname  5)
-    (soa    6)
-    (mb     7)
-    (mg     8)
-    (mr     9)
-    (null  10)
-    (wks   11)
-    (ptr   12)
-    (hinfo 13)
-    (minfo 14)
-    (mx    15)
-    (txt   16)
-    (aaaa  28)))
-
-;; A Class is one of the following
-(define classes
-  '((in 1)
-    (cs 2)
-    (ch 3)
-    (hs 4)))
-
-;;;
-
-(define (cossa i l)
-  (cond [(null? l)            #f]
-        [(equal? (cadar l) i) (car l)]
-        [else                 (cossa i (cdr l))]))
-
-(define (number->octet-pair n)
-  (list (arithmetic-shift n -8)
-        (modulo n 256)))
-
-(define (octet-pair->number a b)
-  (+ (arithmetic-shift a 8) b))
-
-(define (octet-quad->number a b c d)
-  (+ (arithmetic-shift a 24)
-     (arithmetic-shift b 16)
-     (arithmetic-shift c 8)
-     d))
-
-;; Bytes -> LB
-;; Convert the domain name into a sequence of labels, where each
-;; label is a length octet and then that many octets
-(define (name->octets s)
-  (define (do-one s) (cons (bytes-length s) (bytes->list s)))
-  (let loop ([s s])
-    (define m (regexp-match #rx#"^([^.]*)[.](.*)" s))
-    (if m
-        (append (do-one (cadr m)) (loop (caddr m)))
-        ;; terminate with zero length octet
-        (append (do-one s) (list 0)))))
-
-;; The query header. See RFC1035 4.1.1 for details
-;;
-;; The opcode & flags are set as:
-;; QR | OPCODE  | AA | TC | RD | RA | Z     | RCODE   |
-;; 0  | 0 0 0 0 | 0  | 0  | 1  | 0  | 0 0 0 | 0 0 0 0 |
-;;
-(define (make-std-query-header id question-count)
-  (append (number->octet-pair id)             ; 16-bit random identifier
-          (list 1 0)                          ; Opcode & flags
-          (number->octet-pair question-count) ; QDCOUNT
-          (number->octet-pair 0)              ; ANCOUNT
-          (number->octet-pair 0)              ; NSCOUNT
-          (number->octet-pair 0)))            ; ARCOUNT
-
-;; Int16 Bytes Type Class -> LB
-;; Construct a DNS query message
-(define (make-query id name type class)
-  (append (make-std-query-header id 1)
-          ;; Question section. See RF1035 4.1.2
-          (name->octets name)                 ; QNAME
-          (number->octet-pair                 ; QTYPE
-           (cadr (assoc type types)))
-          (number->octet-pair                 ; QCLASS
-           (cadr (assoc class classes)))))
-
-(define (add-size-tag m)
-  (append (number->octet-pair (length m)) m))
-
-(define (rr-data rr)
-  (cadddr (cdr rr)))
-
-(define (rr-type rr)
-  (cadr rr))
-
-(define (rr-name rr)
-  (car rr))
-
-(define (parse-name start reply)
-  (define v (car start))
-  (cond
-    [(zero? v)
-     ;; End of name
-     (values #f (cdr start))]
-    [(zero? (bitwise-and #xc0 v))
-     ;; Normal label
-     (let loop ([len v] [start (cdr start)] [accum null])
-       (if (zero? len)
-         (let-values ([(s start) (parse-name start reply)])
-           (define s0 (list->bytes (reverse accum)))
-           (values (if s (bytes-append s0 #"." s) s0)
-                   start))
-         (loop (sub1 len) (cdr start) (cons (car start) accum))))]
-    [else
-     ;; Compression offset
-     (define offset (+ (arithmetic-shift (bitwise-and #x3f v) 8)
-                       (cadr start)))
-     (define-values [s ignore-start] (parse-name (list-tail reply offset) reply))
-     (values s (cddr start))]))
-
-(define (parse-rr start reply)
-  (let-values ([(name start) (parse-name start reply)])
-    (let* ([type (car (cossa (octet-pair->number (car start) (cadr start))
-                             types))]
-           [start (cddr start)]
-           ;;
-           [class (car (cossa (octet-pair->number (car start) (cadr start))
-                              classes))]
-           [start (cddr start)]
-           ;;
-           [ttl (octet-quad->number (car start) (cadr start)
-                                    (caddr start) (cadddr start))]
-           [start (cddddr start)]
-           ;;
-           [len (octet-pair->number (car start) (cadr start))]
-           [start (cddr start)])
-      ;; Extract next len bytes for data:
-      (let loop ([len len] [start start] [accum null])
-        (if (zero? len)
-          (values (list name type class ttl (reverse accum))
-                  start)
-          (loop (sub1 len) (cdr start) (cons (car start) accum)))))))
-
-(define (parse-ques start reply)
-  (let-values ([(name start) (parse-name start reply)])
-    (let* ([type (car (cossa (octet-pair->number (car start) (cadr start))
-                             types))]
-           [start (cddr start)]
-           ;;
-           [class (car (cossa (octet-pair->number (car start) (cadr start))
-                              classes))]
-           [start (cddr start)])
-      (values (list name type class) start))))
-
-(define (parse-n parse start reply n)
-  (let loop ([n n] [start start] [accum null])
-    (if (zero? n)
-      (values (reverse accum) start)
-      (let-values ([(rr start) (parse start reply)])
-        (loop (sub1 n) start (cons rr accum))))))
-
-;; NameServer String Type Class -> (Values Boolean LB LB LB LB LB)
-(define (dns-query nameserver-ip addr type class)
-  (unless (assoc type types)
-    (raise-type-error 'dns-query "DNS query type" type))
-  (unless (assoc class classes)
-    (raise-type-error 'dns-query "DNS query class" class))
-
-  (define nameserver (ip-address->string nameserver-ip))
-  (define query (make-query (random 256) (string->bytes/latin-1 addr)
-                            type class))
-  (define udp (udp-open-socket nameserver 53))
-  (define reply
-    (dynamic-wind
-      void
-      (lambda ()
-        (define s (make-bytes 512))
-        (let retry ([timeout INIT-TIMEOUT])
-          (udp-send-to udp nameserver 53 (list->bytes query))
-          (sync (handle-evt (udp-receive!-evt udp s)
-                            (lambda (r) (bytes->list (subbytes s 0 (car r)))))
-                (handle-evt (alarm-evt (+ (current-inexact-milliseconds)
-                                          timeout))
-                            (lambda (v) (retry (* timeout 2)))))))
-      (lambda () (udp-close udp))))
-
-  (parse-reply query reply))
-
-;; Parse a DNS query reply
-(define (parse-reply query reply)
-  ;; First two bytes must match sent message id:
-  (unless (and (= (car reply)  (car query))
-               (= (cadr reply) (cadr query)))
-    (error 'dns-query "bad reply id from server"))
-  (define v0 (caddr reply))
-  (define v1 (cadddr reply))
-  ;; Check for error code:
-  (let ([rcode (bitwise-and #xf v1)])
-    (unless (zero? rcode)
-      (error 'dns-query "error from server: ~a"
-             (case rcode
-               [(1) "format error"]
-               [(2) "server failure"]
-               [(3) "name error"]
-               [(4) "not implemented"]
-               [(5) "refused"]))))
-  (define qd-count (octet-pair->number (list-ref reply 4) (list-ref reply 5)))
-  (define an-count (octet-pair->number (list-ref reply 6) (list-ref reply 7)))
-  (define ns-count (octet-pair->number (list-ref reply 8) (list-ref reply 9)))
-  (define ar-count (octet-pair->number (list-ref reply 10) (list-ref reply 11)))
-  (define start (list-tail reply 12))
-  (let*-values ([(qds start) (parse-n parse-ques start reply qd-count)]
-                [(ans start) (parse-n parse-rr start reply an-count)]
-                [(nss start) (parse-n parse-rr start reply ns-count)]
-                [(ars start) (parse-n parse-rr start reply ar-count)])
-    (unless (null? start)
-      (error 'dns-query "error parsing server reply"))
-    (values (positive? (bitwise-and #x4 v0))
-            qds ans nss ars reply)))
-
-;; A cache for DNS query data
-;; Stores a (List Boolean LB LB LB LB LB)
-(define cache (make-hasheq))
-
-;; NameServer Address Type Class -> (Values Boolean LB LB LB LB LB)
-;; Execute a DNS query and cache it
-(define (dns-query/cache nameserver addr type class)
-  (define key (string->symbol (format "~a;~a;~a;~a" nameserver addr type class)))
-  (define v (hash-ref cache key (lambda () #f)))
-  (if v
-      (apply values v)
-      (let-values ([(auth? qds ans nss ars reply)
-                    (dns-query nameserver addr type class)])
-        (hash-set! cache key (list auth? qds ans nss ars reply))
-        (values auth? qds ans nss ars reply))))
-
-;; Convert a list of bytes representing an IPv4 address to a string
-(define (ip->string lob)
-  (ip-address->string (ipv4 (list->bytes lob))))
-
-;; Convert a list of bytes representing an IPv6 address to a string
-(define (ipv6->string lob)
-  (ip-address->string (ipv6 (list->bytes lob))))
-
-;; (NameServer -> (Values Any LB Boolean)) NameServer -> Any
-;; Run the given query function, trying until an answer is found
-(define (try-forwarding k nameserver)
-  (let loop ([nameserver nameserver] [tried (list nameserver)])
-    ;; Normally the recusion is done for us, but it's technically optional
-    (let-values ([(v ars auth?) (k nameserver)])
-      (or v
-          (and (not auth?)
-               (let ([ns (ormap (lambda (ar)
-                                  (and (eq? (rr-type ar) 'a)
-                                       (ip->string (rr-data ar))))
-                                ars)])
-                 (and ns
-                      (not (member ns tried))
-                      (loop ns (cons ns tried)))))))))
-
-;; IPAddress -> String
-;; Convert an IP address to a suitable format for a reverse lookup
-(define (ip->query-domain ip)
-  (if (ipv4? ip)
-      (ip->in-addr.arpa ip)
-      (ip->ip6.arpa ip)))
-
-;; Convert an IPv4 address for reverse lookup
-(define (ip->in-addr.arpa ip)
-  (apply format "~a.~a.~a.~a.in-addr.arpa"
-         (reverse (bytes->list (ipv4-bytes ip)))))
-
-;; Convert an IPv6 address for reverse lookup
-(define (ip->ip6.arpa ip)
-  (string-join
-   (for/fold ([nibbles '()])
-             ([byte (in-bytes (ipv6-bytes ip))])
-     (define nib1 (arithmetic-shift (bitwise-and #xf0 byte) -4))
-     (define nib2 (bitwise-and #x0f byte))
-     (append (list (~r nib2 #:base 16) (~r nib1 #:base 16)) nibbles))
-   "." #:after-last ".ip6.arpa"))
-
-(define (get-ptr-list-from-ans ans)
-  (filter (λ (ans-entry) (eq? (list-ref ans-entry 1) 'ptr)) ans))
-
-(define (dns-get-name nameserver-ip-or-string ip-or-string)
-  (define nameserver (if (ip-address? nameserver-ip-or-string)
-                         nameserver-ip-or-string
-                         (make-ip-address nameserver-ip-or-string)))
-  (define ip (if (ip-address? ip-or-string)
-                 ip-or-string
-                 (make-ip-address ip-or-string)))
-
-  (or (try-forwarding
-       (lambda (nameserver)
-         (let-values ([(auth? qds ans nss ars reply)
-                       (dns-query/cache nameserver (ip->query-domain ip) 'ptr 'in)])
-           (values (and (positive? (length (get-ptr-list-from-ans ans)))
-                        (let ([s (rr-data (car (get-ptr-list-from-ans ans)))])
-                          (let-values ([(name null) (parse-name s reply)])
-                            (bytes->string/latin-1 name))))
-                   ars auth?)))
-       nameserver)
-      (error 'dns-get-name "bad ip address")))
-
-;; Get resource records corresponding to the given type
-(define (get-records-from-ans ans type)
-  (for/list ([ans-entry (in-list ans)]
-             #:when (eq? (list-ref ans-entry 1) type))
-    ans-entry))
-
-(define (dns-get-address nameserver-ip-or-string addr #:ipv6? [ipv6? #f])
-  (define nameserver (if (ip-address? nameserver-ip-or-string)
-                         nameserver-ip-or-string
-                         (make-ip-address nameserver-ip-or-string)))
-  (define type (if ipv6? 'aaaa 'a))
-  (define (get-address nameserver)
-    (define-values (auth? qds ans nss ars reply)
-      (dns-query/cache nameserver addr type 'in))
-    (define answer-records (get-records-from-ans ans type))
-    (define address
-      (and (positive? (length answer-records))
-           (let ([data (rr-data (car answer-records))])
-             (if ipv6?
-                 (ipv6->string data)
-                 (ip->string data)))))
-    (values address ars auth?))
-  (or (try-forwarding get-address nameserver)
-      (error 'dns-get-address "bad address")))
-
-(define (dns-get-mail-exchanger nameserver-ip-or-string addr)
-  (define nameserver (if (ip-address? nameserver-ip-or-string)
-                         nameserver-ip-or-string
-                         (make-ip-address nameserver-ip-or-string)))
-  (or (try-forwarding
-       (lambda (nameserver)
-         (let-values ([(auth? qds ans nss ars reply) (dns-query/cache nameserver addr 'mx 'in)])
-           (values (parse-mx-response ans nss reply addr) ars auth?)))
-       nameserver)
-      (error 'dns-get-mail-exchanger "bad address")))
-
-;; helper that parses a response for MX queries
-(define (parse-mx-response ans nss reply addr)
-  (let loop ([ans ans] [best-pref +inf.0] [exchanger #f])
-    (cond
-     [(null? ans)
-      (or (and exchanger (bytes->string/latin-1 exchanger))
-          ;; FIXME: Does 'soa mean that the input address is fine?
-          (and (ormap (lambda (ns) (eq? (rr-type ns) 'soa))
-                      nss)
-               addr))]
-     [else
-      (define type (rr-type (car ans)))
-      (define d (rr-data (car ans)))
-      (cond [(not (eq? type 'mx)) ; not MX record, keep going
-             (loop (cdr ans) best-pref exchanger)]
-            [else
-             (define pref (octet-pair->number (car d) (cadr d)))
-             (if (< pref best-pref)
-                 (let-values ([(name start) (parse-name (cddr d) reply)])
-                   (loop (cdr ans) pref name))
-                 (loop (cdr ans) best-pref exchanger))])])))
-
-(define (dns-find-nameserver)
-  (case (system-type)
-    [(unix macosx)
-     (with-handlers ([void (lambda (x) #f)])
-       (with-input-from-file "/etc/resolv.conf"
-         (lambda ()
-           (let loop ()
-             (define line (read-line))
-             (or (and (string? line)
-                      (let ([m (regexp-match
-                                #rx"nameserver[ \t]+([0-9]+[.][0-9]+[.][0-9]+[.][0-9]+)"
-                                line)])
-                        (and m (cadr m))))
-                 (and (not (eof-object? line))
-                      (loop)))))))]
-    [(windows)
-     (define nslookup (find-executable-path "nslookup.exe" #f))
-     (and nslookup
-          (let-values ([(pin pout pid perr proc)
-                        (apply
-                         values
-                         (process/ports
-                          #f (open-input-file "NUL") (current-error-port)
-                          nslookup))])
-            (let loop ([name #f] [ip #f] [try-ip? #f])
-              (define line (read-line pin 'any))
-              (cond [(eof-object? line)
-                     (close-input-port pin)
-                     (proc 'wait)
-                     (or ip name)]
-                    [(and (not name)
-                          (regexp-match #rx"^Default Server: +(.*)$" line))
-                     => (lambda (m) (loop (cadr m) #f #t))]
-                    [(and try-ip?
-                          (regexp-match #rx"^Address: +(.*)$" line))
-                     => (lambda (m) (loop name (cadr m) #f))]
-                    [else (loop name ip #f)]))))]
-    [else #f]))
diff --git a/pkgs/net-pkgs/net-lib/net/ftp.rkt b/pkgs/net-pkgs/net-lib/net/ftp.rkt
deleted file mode 100644
index 0c6db57cc8..0000000000
--- a/pkgs/net-pkgs/net-lib/net/ftp.rkt
+++ /dev/null
@@ -1,296 +0,0 @@
-#lang racket/base
-
-(require racket/date racket/file racket/port racket/tcp racket/list)
-
-(provide ftp-connection?
-         ftp-cd
-         ftp-establish-connection ftp-establish-connection*
-         ftp-close-connection
-         ftp-directory-list
-         ftp-download-file
-         ftp-make-file-seconds
-         ftp-upload-file
-         ftp-delete-file
-         ftp-make-directory
-         ftp-delete-directory
-         ftp-rename-file)
-
-;; opqaue record to represent an FTP connection:
-(define-struct ftp-connection (in out))
-
-(define re:multi-response-start #rx#"^[0-9][0-9][0-9]-")
-(define re:response-end #rx#"^[0-9][0-9][0-9] ")
-
-(define (check-expected-result line expected)
-  (when expected
-    (unless (ormap (lambda (expected)
-                     (bytes=? expected (subbytes line 0 3)))
-                   (if (bytes? expected)
-                       (list expected)
-                       expected))
-      (error 'ftp "expected result code ~a, got ~a" expected line))))
-
-;; ftp-check-response : input-port output-port bytes-or-byteslist-or-#f (bytes any -> any) any -> any
-;;
-;;  Checks a standard-format response, checking for the given
-;;  expected 3-digit result code if expected is not #f.
-;;
-;;  While checking, the function sends response lines to
-;;  diagnostic-accum. This function -accum functions can return a
-;;  value that accumulates over multiple calls to the function, and
-;;  accum-start is used as the initial value. Use `void' and
-;;  `(void)' to ignore the response info.
-;;
-;; If an unexpected result is found, an exception is raised, and the
-;; stream is left in an undefined state.
-(define (ftp-check-response tcpin tcpout expected diagnostic-accum accum-start)
-  (flush-output tcpout)
-  (let ([line (read-bytes-line tcpin 'any)])
-    (cond
-     [(eof-object? line)
-      (error 'ftp "unexpected EOF")]
-     [(regexp-match re:multi-response-start line)
-      (check-expected-result line expected)
-      (let ([re:done (regexp (format "^~a " (subbytes line 0 3)))])
-        (let loop ([accum (diagnostic-accum line accum-start)])
-          (let ([line (read-bytes-line tcpin 'any)])
-            (cond [(eof-object? line)
-                   (error 'ftp "unexpected EOF")]
-                  [(regexp-match re:done line)
-                   (diagnostic-accum line accum)]
-                  [else
-                   (loop (diagnostic-accum line accum))]))))]
-     [(regexp-match re:response-end line)
-      (check-expected-result line expected)
-      (diagnostic-accum line accum-start)]
-     [else
-      (error 'ftp "unexpected result: ~e" line)])))
-
-(define (bytes->number bytes)
-  (string->number (bytes->string/latin-1 bytes)))
-
-(define (get-month month-bytes)
-  (cond [(assoc month-bytes
-                '((#"Jan" 1) (#"Feb" 2) (#"Mar" 3) (#"Apr" 4) (#"May" 5)
-                  (#"Jun" 6) (#"Jul" 7) (#"Aug" 8) (#"Sep" 9) (#"Oct" 10)
-                  (#"Nov" 11) (#"Dec" 12)))
-         => cadr]
-        [else (error 'get-month "bad month: ~s" month-bytes)]))
-
-(define re:date #rx#"(...) *(.*) (..):(..)|(...) *([0-9]*) +(....)")
-
-(define (ftp-make-file-seconds ftp-date-str)
-  (define date-list (regexp-match re:date (string->bytes/utf-8 ftp-date-str)))
-  (if (not (list-ref date-list 4))
-      (find-seconds 0 0 0
-                    (bytes->number (list-ref date-list 6))
-                    (get-month (list-ref date-list 5))
-                    (bytes->number (list-ref date-list 7)))
-      (let* ([cur-secs (current-seconds)]
-             [cur-date (seconds->date cur-secs)]
-             [cur-year (date-year cur-date)]
-             [tzofs    (date-time-zone-offset cur-date)]
-             [minute (bytes->number (list-ref date-list 4))]
-             [hour   (bytes->number (list-ref date-list 3))]
-             [day    (bytes->number (list-ref date-list 2))]
-             [month  (get-month (list-ref date-list 1))]
-             [guess  (+ (find-seconds 0 minute hour day month cur-year) tzofs)])
-        (if (guess . <= . cur-secs)
-          guess
-          (+ (find-seconds 0 minute hour day month (sub1 cur-year)) tzofs)))))
-
-(define re:passive #rx#"\\((.*),(.*),(.*),(.*),(.*),(.*)\\)")
-
-(define (establish-data-connection ftp-ports in-or-out)
-  (fprintf (ftp-connection-out ftp-ports) "PASV\r\n")
-  (let ([response (ftp-check-response
-                   (ftp-connection-in ftp-ports)
-                   (ftp-connection-out ftp-ports)
-                   #"227" (lambda (s ignore) s) (void))])
-    (let* ([reg-list (regexp-match re:passive response)]
-           [pn1 (and reg-list
-                     (bytes->number (list-ref reg-list 5)))]
-           [pn2 (bytes->number (list-ref reg-list 6))])
-      (unless (and reg-list pn1 pn2)
-        (error 'ftp "can't understand PASV response: ~e" response))
-      (let-values ([(tcp-data-in tcp-data-out)
-                    (tcp-connect (format "~a.~a.~a.~a"
-                                         (list-ref reg-list 1)
-                                         (list-ref reg-list 2)
-                                         (list-ref reg-list 3)
-                                         (list-ref reg-list 4))
-                                 (+ (* 256 pn1) pn2))])
-        (fprintf (ftp-connection-out ftp-ports) "TYPE I\r\n")
-        (ftp-check-response (ftp-connection-in ftp-ports)
-                            (ftp-connection-out ftp-ports)
-                            #"200" void (void))
-        (if (eq? in-or-out 'in)
-            (begin
-              (tcp-abandon-port tcp-data-out)
-              tcp-data-in)
-            (begin
-              (tcp-abandon-port tcp-data-in)
-              tcp-data-out))))))
-
-;; 230? is var. It always keep last line's action result. The lambda in this
-;; ftp-check-response means:
-;; "if one line's head is 230, then this ftp server do not
-;; need PASS command. "or 230? (rege..." means if 230? is true already
-;; , then do not check the line anymore, it's just true.
-(define (ftp-establish-connection* in out username password)
-  (ftp-check-response in out #"220" void (void))
-  (fprintf out "USER ~a\r\n" username)
-  (let ([no-password? (ftp-check-response
-                       in out (list #"331" #"230")
-                       (lambda (line 230?)
-                         (or 230? (regexp-match #rx#"^230" line)))
-                       #f)])
-    (unless no-password?
-      (fprintf out "PASS ~a\r\n" password)
-      (ftp-check-response in out #"230" void (void))))
-  (make-ftp-connection in out))
-
-(define (ftp-establish-connection server-address server-port username password)
-  (let-values ([(tcpin tcpout) (tcp-connect server-address server-port)])
-    (ftp-establish-connection* tcpin tcpout username password)))
-
-(define (ftp-close-connection ftp-ports)
-  (fprintf (ftp-connection-out ftp-ports) "QUIT\r\n")
-  (ftp-check-response (ftp-connection-in ftp-ports)
-                      (ftp-connection-out ftp-ports)
-                      #"221" void (void))
-  (close-input-port (ftp-connection-in ftp-ports))
-  (close-output-port (ftp-connection-out ftp-ports)))
-
-(define (ftp-cd ftp-ports new-dir)
-  (fprintf (ftp-connection-out ftp-ports) "CWD ~a\r\n" new-dir)
-  (ftp-check-response (ftp-connection-in ftp-ports)
-                      (ftp-connection-out ftp-ports)
-                      #"250" void (void)))
-
-(define re:dir-line
-  (regexp (string-append
-           "^(.)(.*) ((?i:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)"
-           " .* [0-9][0-9]:?[0-9][0-9]) (.*)$")))
-
-(define (ftp-directory-list ftp-ports [path #f])
-  (define tcp-data (establish-data-connection ftp-ports 'in))
-  (if path
-    (fprintf (ftp-connection-out ftp-ports) "LIST ~a\r\n" path)
-    (fprintf (ftp-connection-out ftp-ports) "LIST\r\n"))
-  (ftp-check-response (ftp-connection-in ftp-ports)
-                      (ftp-connection-out ftp-ports)
-                      (list #"150" #"125") void (void))
-  (define lines (port->lines tcp-data))
-  (close-input-port tcp-data)
-  (ftp-check-response (ftp-connection-in ftp-ports)
-                      (ftp-connection-out ftp-ports)
-                      #"226" void (void))
-  (for*/list ([l (in-list lines)]
-              [m (in-value (cond [(regexp-match re:dir-line l) => cdr]
-                                 [else #f]))]
-              #:when m)
-    (define size (cond [(and (equal? "-" (car m))
-                             (regexp-match #rx"([0-9]+) *$" (cadr m)))
-                        => cadr]
-                       [else #f]))
-    (define r `(,(car m) ,@(cddr m)))
-    (if size `(,@r ,size) r)))
-
-(define (ftp-download-file ftp-ports folder filename
-                           #:progress [progress-proc #f])
-  ;; Save the file under a temporary name, rename it once download is
-  ;; complete this assures we don't over write any existing file without
-  ;; having a good file down
-  (let* ([tmpfile (make-temporary-file "~a.download" #f folder)]
-         [new-file (open-output-file tmpfile #:exists 'truncate)]
-         [tcp-data (establish-data-connection ftp-ports 'in)])
-
-    (transfer-data ftp-ports 'download tcp-data new-file filename progress-proc)
-
-    (rename-file-or-directory tmpfile (build-path folder filename) #t)))
-
-(define (ftp-upload-file ftp-ports filepath
-                         #:progress [progress-proc #f])
-  (let ([upload-file (open-input-file filepath)]
-        [tcp-data (establish-data-connection ftp-ports 'out)])
-
-    (let ([system-type (system-path-convention-type)]
-          [splitter ""])
-      (if (eq? system-type 'unix)
-          (set! splitter "/")
-          (set! splitter "\\\\"))
-
-      (transfer-data ftp-ports 'upload upload-file tcp-data
-                     (last (regexp-split (regexp splitter) filepath))
-                     progress-proc))))
-
-;; download and upload's share part
-(define (transfer-data ftp-ports command from to filename progress-proc)
-  (let ([inner-command ""])
-    (cond
-     [(eq? command 'upload)
-      (set! inner-command "STOR")]
-     [(eq? command 'download)
-      (set! inner-command "RETR")])
-
-    (fprintf (ftp-connection-out ftp-ports) "~a ~a\r\n" inner-command filename))
-
-  (ftp-check-response (ftp-connection-in ftp-ports)
-                      (ftp-connection-out ftp-ports)
-                      (list #"125" #"150") void (void))
-
-  (let ([rcv-ch (make-channel)]
-        [ctrl-ch (make-channel)]
-        [transfer-pair (cons 0 (make-semaphore))])
-
-    (when progress-proc
-      (progress-proc (lambda () 
-                       (define p transfer-pair)
-                       (values (car p) (semaphore-peek-evt (cdr p))))))
-
-    (define bstr (make-bytes 40960))
-    (let loop ()
-      (let ([n (read-bytes! bstr from)])
-        (unless (eof-object? n)
-          (define sent (write-bytes bstr to 0 n))
-          (when progress-proc
-            (define old-pair transfer-pair)
-            (set! transfer-pair (cons (+ sent (car old-pair))
-                                      (make-semaphore)))
-            (semaphore-post (cdr old-pair)))
-          (loop)))))
-
-  (close-input-port from)
-  (close-output-port to)
-  (ftp-check-response (ftp-connection-in ftp-ports)
-                      (ftp-connection-out ftp-ports)
-                      #"226" void (void)))
-
-(define (ftp-delete-file ftp-ports filepath)
-  (fprintf (ftp-connection-out ftp-ports) "DELE ~a\r\n" filepath)
-  (ftp-check-response (ftp-connection-in ftp-ports)
-                      (ftp-connection-out ftp-ports)
-                      #"250" void (void)))
-
-(define (ftp-make-directory ftp-ports dirname)
-  (fprintf (ftp-connection-out ftp-ports) "MKD ~a\r\n" dirname)
-  (ftp-check-response (ftp-connection-in ftp-ports)
-                      (ftp-connection-out ftp-ports)
-                      #"257" void (void)))
-
-(define (ftp-delete-directory ftp-ports dirname)
-  (fprintf (ftp-connection-out ftp-ports) "RMD ~a\r\n" dirname)
-  (ftp-check-response (ftp-connection-in ftp-ports)
-                      (ftp-connection-out ftp-ports)
-                      #"250" void (void)))
-
-(define (ftp-rename-file ftp-ports origin dest)
-  (fprintf (ftp-connection-out ftp-ports) "RNFR ~a\r\n" origin)
-  (ftp-check-response (ftp-connection-in ftp-ports)
-                      (ftp-connection-out ftp-ports)
-                      #"350" void (void))
-  (fprintf (ftp-connection-out ftp-ports) "RNTO ~a\r\n" dest)
-  (ftp-check-response (ftp-connection-in ftp-ports)
-                      (ftp-connection-out ftp-ports)
-                      #"250" void (void)))
diff --git a/pkgs/net-pkgs/net-lib/net/imap.rkt b/pkgs/net-pkgs/net-lib/net/imap.rkt
deleted file mode 100644
index 2fe0392c54..0000000000
--- a/pkgs/net-pkgs/net-lib/net/imap.rkt
+++ /dev/null
@@ -1,638 +0,0 @@
-#lang racket/base
-
-(require racket/contract/base
-         racket/tcp
-         openssl
-         racket/format
-         "private/rbtree.rkt")
-
-;; define the imap struct and its predicate here, for use in the contract, below
-(define-struct imap (r w exists recent unseen uidnext uidvalidity
-                     expunges fetches new?)
-  #:mutable)
-(define (imap-connection? v) (imap? v))
-
-(provide/contract
- [imap-get-hierarchy-delimiter (imap-connection? . -> . bytes?)]
- [imap-list-child-mailboxes
-  (->* (imap-connection? (or/c string? bytes? #f))
-       ((or/c string? bytes?))
-       (listof (list/c (listof symbol?) bytes?)))]
- [imap-append ((imap? string? (or/c string? bytes?))
-               ((listof
-                 (or/c 'seen 'answered 'flagged 'deleted 'draft 'recent)))
-              . ->* .
-              void?)])
-
-(provide
- imap-connection?
- imap-connect imap-connect*
- imap-disconnect
- imap-force-disconnect
- imap-reselect
- imap-examine
- imap-noop
- imap-poll
- imap-status
-
- imap-port-number ; a parameter
-
- imap-new?
- imap-messages
- imap-recent
- imap-uidnext
- imap-uidvalidity
- imap-unseen
- imap-reset-new!
-
- imap-get-expunges
- imap-pending-expunges?
- imap-get-updates
- imap-pending-updates?
-
- imap-get-messages
- imap-copy
- imap-store imap-flag->symbol symbol->imap-flag
- imap-expunge
-
- imap-mailbox-exists?
- imap-create-mailbox
-
- imap-mailbox-flags)
-
-(define debug-via-stdio? #f)
-
-(define eol (if debug-via-stdio? 'linefeed 'return-linefeed))
-
-(define (tag-eq? a b)
-  (or (eq? a b)
-      (and (symbol? a)
-           (symbol? b)
-           (string-ci=? (symbol->string a) (symbol->string b)))))
-
-(define field-names
-  (list (list 'uid (string->symbol "UID"))
-        (list 'header (string->symbol "RFC822.HEADER"))
-        (list 'body (string->symbol "RFC822.TEXT"))
-        (list 'size (string->symbol "RFC822.SIZE"))
-        (list 'flags (string->symbol "FLAGS"))))
-
-(define flag-names
-  (list (list 'seen (string->symbol "\\Seen"))
-        (list 'answered (string->symbol "\\Answered"))
-        (list 'flagged (string->symbol "\\Flagged"))
-        (list 'deleted (string->symbol "\\Deleted"))
-        (list 'draft (string->symbol "\\Draft"))
-        (list 'recent (string->symbol "\\Recent"))
-
-        (list 'noinferiors (string->symbol "\\Noinferiors"))
-        (list 'noselect (string->symbol "\\Noselect"))
-        (list 'marked (string->symbol "\\Marked"))
-        (list 'unmarked (string->symbol "\\Unmarked"))
-
-        (list 'hasnochildren (string->symbol "\\HasNoChildren"))
-        (list 'haschildren (string->symbol "\\HasChildren"))))
-
-(define (imap-flag->symbol f)
-  (or (ormap (lambda (a) (and (tag-eq? f (cadr a)) (car a))) flag-names)
-      f))
-
-(define (symbol->imap-flag s)
-  (cond [(assoc s flag-names) => cadr] [else s]))
-
-(define-logger imap)
-
-(define make-msg-id
-  (let ([id 0])
-    (lambda ()
-      (begin0 (string->bytes/latin-1 (format "a~a " id))
-        (set! id (add1 id))))))
-
-(define (starts-with? l n)
-  (and (>= (bytes-length l) (bytes-length n))
-       (bytes=? n (subbytes l 0 (bytes-length n)))))
-
-(define (skip s n)
-  (subbytes s (if (number? n) n (bytes-length n))))
-
-(define (splice l sep)
-  (if (null? l)
-    ""
-    (format "~a~a"
-            (car l)
-            (apply string-append
-                   (map (lambda (n) (format "~a~a" sep n)) (cdr l))))))
-
-(define (imap-read s r)
-  (let loop ([s s]
-             [r r]
-             [accum null]
-             [eol-k (lambda (accum) (reverse accum))]
-             [eop-k (lambda (s accum) (error 'imap-read "unxpected close parenthesis"))])
-    (cond
-      [(bytes=? #"" s)
-       (eol-k accum)]
-      [(char-whitespace? (integer->char (bytes-ref s 0)))
-       (loop (skip s 1) r accum eol-k eop-k)]
-      [else
-       (case (integer->char (bytes-ref s 0))
-         [(#\")
-          (let ([m (regexp-match #rx#"\"([^\"]*)\"(.*)" s)])
-            (if m
-              (loop (caddr m) r (cons (cadr m) accum) eol-k eop-k)
-              (error 'imap-read "didn't find end of quoted string in: ~a" s)))]
-         [(#\))
-          (eop-k (skip s 1) accum)]
-         [(#\() (letrec ([next-line
-                          (lambda (accum)
-                            (loop (read-bytes-line r eol) r
-                                  accum
-                                  next-line
-                                  finish-parens))]
-                         [finish-parens
-                          (lambda (s laccum)
-                            (loop s r
-                                  (cons (reverse laccum) accum)
-                                  eol-k eop-k))])
-                  (loop (skip s 1) r null next-line finish-parens))]
-         [(#\{) (let ([m (regexp-match #rx#"{([0-9]+)}(.*)" s)])
-                  (cond
-                    [(not m) (error 'imap-read "couldn't read {} number: ~a" s)]
-                    [(not (bytes=? (caddr m) #"")) (error 'imap-read "{} not at end-of-line: ~a" s)]
-                    [else
-                     (loop #"" r
-                           (cons (read-bytes (string->number
-                                              (bytes->string/latin-1 (cadr m)))
-                                             r)
-                                 accum)
-                           eol-k eop-k)]))]
-         [else (let ([m (regexp-match #rx#"([^ (){}]+)(.*)" s)])
-                 (if m
-                   (loop (caddr m) r
-                         (cons (let ([v (cadr m)])
-                                 (if (regexp-match #rx#"^[0-9]*$" v)
-                                   (string->number (bytes->string/latin-1 v))
-                                   (string->symbol (bytes->string/latin-1 v))))
-                               accum)
-                         eol-k eop-k)
-                   (error 'imap-read "failure reading atom: ~a" s)))])])))
-
-(define (get-response r id info-handler continuation-handler)
-  (let loop ()
-    (let ([l (read-bytes-line r eol)])
-      (log-imap-debug "raw-reply: ~s" l)
-      (cond [(eof-object? l)
-             (error 'imap-send "unexpected end-of-file from server")]
-            [(and id (starts-with? l id))
-             (let ([reply (imap-read (skip l id) r)])
-               (log-imap-debug "response: ~a" reply)
-               reply)]
-            [(starts-with? l #"* ")
-             (let ([info (imap-read (skip l 2) r)])
-               (log-imap-debug "info: ~s" info)
-               (info-handler info))
-             (when id (loop))]
-            [(starts-with? l #"+ ")
-             (if (null? continuation-handler)
-               (error 'imap-send "unexpected continuation request: ~a" l)
-               ((car continuation-handler) loop (imap-read (skip l 2) r)))]
-            [else
-             (log-imap-warning "warning: unexpected response for ~a: ~a" id l)
-             (when id (loop))]))))
-
-;; A cmd is
-;;  * (box v) - send v literally via ~a
-;;  * string or bytes - protect as necessary
-;;  * (cons cmd null) - same as cmd
-;;  * (cons cmd cmd) - send cmd, space, cmd
-
-(define (imap-send imap cmd info-handler . continuation-handler)
-  (let ([r (imap-r imap)]
-        [w (imap-w imap)]
-        [id (make-msg-id)])
-    (log-imap-debug "sending ~a~a" id cmd)
-    (fprintf w "~a" id)
-    (let loop ([cmd cmd])
-      (cond
-        [(box? cmd) (fprintf w "~a" (unbox cmd))]
-        [(string? cmd) (loop (string->bytes/utf-8 cmd))]
-        [(bytes? cmd)
-         (if (or (regexp-match #rx#"[ *\"\r\n]" cmd)
-                 (equal? cmd #""))
-           (if (regexp-match #rx#"[\"\r\n]" cmd)
-             (begin
-               ;; Have to send size, then continue if the
-               ;;  server consents
-               (fprintf w "{~a}\r\n" (bytes-length cmd))
-               (flush-output w)
-               (get-response r #f void (list (lambda (gloop data) (void))))
-               ;; Continue by writing the data
-               (write-bytes cmd w))
-             (fprintf w "\"~a\"" cmd))
-           (fprintf w "~a" cmd))]
-        [(and (pair? cmd) (null? (cdr cmd))) (loop (car cmd))]
-        [(pair? cmd) (begin (loop (car cmd))
-                            (fprintf w " ")
-                            (loop (cdr cmd)))]))
-    (fprintf w "\r\n")
-    (flush-output w)
-    (get-response r id (wrap-info-handler imap info-handler)
-                  continuation-handler)))
-
-(define (check-ok reply)
-  (unless (and (pair? reply) (tag-eq? (car reply) 'OK))
-    (error 'check-ok "server error: ~s" reply)))
-
-(define (ok-tag-eq? i t)
-  (and (tag-eq? (car i) 'OK)
-       ((length i) . >= . 3)
-       (tag-eq? (cadr i) (string->symbol (format "[~a" t)))))
-
-(define (ok-tag-val i)
-  (let ([v (caddr i)])
-    (and (symbol? v)
-         (let ([v (symbol->string v)])
-           (regexp-match #rx"[]]$" v)
-           (string->number (substring v 0 (sub1 (string-length v))))))))
-
-(define (wrap-info-handler imap info-handler)
-  (lambda (i)
-    (when (and (list? i) ((length i) . >= . 2))
-      (cond
-        [(tag-eq? (cadr i) 'EXISTS)
-         (when (> (car i) (or (imap-exists imap) 0))
-           (set-imap-new?! imap #t))
-         (set-imap-exists! imap (car i))]
-        [(tag-eq? (cadr i) 'RECENT)
-         (set-imap-recent! imap (car i))]
-        [(tag-eq? (cadr i) 'EXPUNGE)
-         (let ([n (car i)])
-           (log-imap-debug "Recording expunge: ~s" n)
-           ;; add it to the tree of expunges
-           (expunge-insert! (imap-expunges imap) n)
-           ;; decrement exists count:
-           (set-imap-exists! imap (sub1 (imap-exists imap)))
-           ;; adjust ids for any remembered fetches:
-           (fetch-shift! (imap-fetches imap) n))]
-        [(tag-eq? (cadr i) 'FETCH)
-         (fetch-insert!
-          (imap-fetches imap)
-          ;; Convert result to assoc list:
-          (cons (car i)
-                (let ([new
-                       (let loop ([l (caddr i)])
-                         (if (null? l)
-                           null
-                           (cons (cons (car l) (cadr l))
-                                 (loop (cddr l)))))])
-                  ;; Keep anything not overridden:
-                  (let ([old (cdr (or (fetch-find (imap-fetches imap) (car i))
-                                      '(0)))])
-                    (let loop ([old old][new new])
-                      (cond
-                        [(null? old) new]
-                        [(assq (caar old) new)
-                         (loop (cdr old) new)]
-                        [else (loop (cdr old) (cons (car old) new))]))))))]
-        [(ok-tag-eq? i 'UIDNEXT)
-         (set-imap-uidnext! imap (ok-tag-val i))]
-        [(ok-tag-eq? i 'UIDVALIDITY)
-         (set-imap-uidvalidity! imap (ok-tag-val i))]
-        [(ok-tag-eq? i 'UNSEEN)
-         (set-imap-uidvalidity! imap (ok-tag-val i))]))
-    (info-handler i)))
-
-(define imap-port-number
-  (make-parameter 143
-                  (lambda (v)
-                    (unless (and (number? v)
-                                 (exact? v)
-                                 (integer? v)
-                                 (<= 1 v 65535))
-                      (raise-type-error 'imap-port-number
-                                        "exact integer in [1,65535]"
-                                        v))
-                    v)))
-
-(define (has-starttls? imap)
-  (let ([has? #f])
-    (check-ok (imap-send imap
-                         "CAPABILITY"
-                         (lambda (caps) 
-                           (when (member 'STARTTLS caps)
-                             (set! has? #t)))))
-    has?))
-
-(define (imap-login imap username password inbox)
-  (let ([reply (imap-send imap (list "LOGIN" username password) void)])
-    (if (and (pair? reply) (tag-eq? 'NO (car reply)))
-      (error 'imap-connect
-        "username or password rejected by server: ~s" reply)
-      (check-ok reply)))
-  (let-values ([(init-count init-recent) (imap-reselect imap inbox)])
-    (values imap init-count init-recent)))
-
-(define (ports->tls-ports r w)  
-  (ports->ssl-ports r w #:close-original? #t #:encrypt 'tls))
-
-(define (imap-connect* r w username password inbox
-                       #:tls? [tls? #f]
-                       #:try-tls? [try-tls? #t])
-  (with-handlers ([void
-                   (lambda (x)
-                     (close-input-port r)
-                     (close-output-port w)
-                     (raise x))])
-    (let-values ([(r w)
-                  (if tls?
-                      (ports->tls-ports r w)
-                      (values r w))])
-      (let ([imap (make-imap r w #f #f #f #f #f
-                             (new-tree) (new-tree) #f)])
-        (check-ok (imap-send imap "NOOP" void))
-        (define imap-maybe-tls
-          (if (and (not tls?) try-tls? (has-starttls? imap))
-              (begin
-                (check-ok (imap-send imap "STARTTLS" void))
-                (let-values ([(ssl-in ssl-out) (ports->tls-ports r w)])
-                  (make-imap ssl-in ssl-out #f #f #f #f #f (new-tree) (new-tree) #f)))
-              imap))
-        (imap-login imap-maybe-tls username password inbox)))))
-
-(define (imap-connect server username password inbox 
-                       #:tls? [tls? #f]
-                       #:try-tls? [try-tls? #t])
-  ;; => imap count-k recent-k
-  (let-values ([(r w)
-                (if debug-via-stdio?
-                    (begin
-                      (printf "stdin == ~a\n" server)
-                      (values  (current-input-port) (current-output-port)))
-                    (tcp-connect server (imap-port-number)))])
-    (imap-connect* r w username password inbox #:tls? tls? #:try-tls? try-tls?)))
-
-(define (imap-reselect imap inbox)
-  (imap-selectish-command imap (list "SELECT" inbox) #t))
-
-(define (imap-examine imap inbox)
-  (imap-selectish-command imap (list "EXAMINE" inbox) #t))
-
-;; Used to return (values #f #f) if no change since last check?
-(define (imap-noop imap)
-  (imap-selectish-command imap "NOOP" #f))
-
-(define (imap-selectish-command imap cmd reset?)
-  (let ([init-count #f]
-        [init-recent #f])
-    (check-ok (imap-send imap cmd void))
-    (when reset?
-      (set-imap-expunges! imap (new-tree))
-      (set-imap-fetches! imap (new-tree))
-      (set-imap-new?! imap #f))
-    (values (imap-exists imap) (imap-recent imap))))
-
-(define (imap-status imap inbox flags)
-  (unless (and (list? flags)
-               (andmap (lambda (s)
-                         (memq s '(messages recent uidnext uidvalidity unseen)))
-                       flags))
-    (raise-type-error 'imap-status "list of status flag symbols" flags))
-  (let ([results null])
-    (check-ok (imap-send imap (list "STATUS" inbox (box (format "~a" flags)))
-                         (lambda (i)
-                           (when (and (list? i) (= 3 (length i))
-                                      (tag-eq? (car i) 'STATUS))
-                             (set! results (caddr i))))))
-    (map (lambda (f)
-           (let loop ([l results])
-             (cond
-               [(or (null? l) (null? (cdr l))) #f]
-               [(tag-eq? f (car l)) (cadr l)]
-               [else (loop (cdr l))])))
-         flags)))
-
-(define (imap-poll imap)
-  (when (and ;; Check for async messages from the server
-             (char-ready? (imap-r imap))
-             ;; It has better start with "*"...
-             (= (peek-byte (imap-r imap)) (char->integer #\*)))
-    ;; May set fields in `imap':
-    (get-response (imap-r imap) #f (wrap-info-handler imap void) null)
-    (void)))
-
-(define (imap-get-updates imap)
-  (no-expunges 'imap-updates imap)
-  (let ([l (fetch-tree->list (imap-fetches imap))])
-    (set-imap-fetches! imap (new-tree))
-    l))
-
-(define (imap-pending-updates? imap)
-  (not (tree-empty? (imap-fetches imap))))
-
-(define (imap-get-expunges imap)
-  (let ([l (expunge-tree->list (imap-expunges imap))])
-    (set-imap-expunges! imap (new-tree))
-    l))
-
-(define (imap-pending-expunges? imap)
-  (not (tree-empty? (imap-expunges imap))))
-
-(define (imap-reset-new! imap)
-  (set-imap-new?! imap #f))
-
-(define (imap-messages imap)
-  (imap-exists imap))
-
-(define (imap-disconnect imap)
-  (let ([r (imap-r imap)]
-        [w (imap-w imap)])
-    (check-ok (imap-send imap "LOGOUT" void))
-    (close-input-port r)
-    (close-output-port w)))
-
-(define (imap-force-disconnect imap)
-  (let ([r (imap-r imap)]
-        [w (imap-w imap)])
-    (close-input-port r)
-    (close-output-port w)))
-
-(define (no-expunges who imap)
-  (unless (tree-empty? (imap-expunges imap))
-    (raise-mismatch-error who "session has pending expunge reports: " imap)))
-
-(define (msg-set msgs)
-  (apply
-   string-append
-   (let loop ([prev #f][msgs msgs])
-     (cond
-       [(null? msgs) null]
-       [(and prev
-             (pair? (cdr msgs))
-             (= (add1 prev) (car msgs)))
-        (loop (car msgs) (cdr msgs))]
-       [prev (cons (format ":~a," prev)
-                   (loop #f msgs))]
-       [(null? (cdr msgs)) (list (format "~a" (car msgs)))]
-       [(= (add1 (car msgs)) (cadr msgs))
-        (cons (format "~a" (car msgs))
-              (loop (car msgs) (cdr msgs)))]
-       [else (cons (format "~a," (car msgs))
-                   (loop #f (cdr msgs)))]))))
-
-(define (imap-get-messages imap msgs field-list)
-  (no-expunges 'imap-get-messages imap)
-  (when (or (not (list? msgs))
-            (not (andmap integer? msgs)))
-    (raise-type-error 'imap-get-messages "non-empty message list" msgs))
-  (when (or (null? field-list)
-            (not (list? field-list))
-            (not (andmap (lambda (f) (assoc f field-names)) field-list)))
-    (raise-type-error 'imap-get-messages "non-empty field list" field-list))
-
-  (if (null? msgs)
-    null
-    (begin
-      ;; FETCH request adds info to `(imap-fectches imap)':
-      (imap-send imap
-                 (list "FETCH"
-                       (box (msg-set msgs))
-                       (box
-                        (format "(~a)"
-                                (splice (map (lambda (f)
-                                               (cadr (assoc f field-names)))
-                                             field-list)
-                                        " "))))
-                 void)
-      ;; Sort out the collected info:
-      (let ([flds (map (lambda (f) (cadr (assoc f field-names)))
-                       field-list)])
-        (begin0
-            ;; For each msg, try to get each field value:
-            (map
-             (lambda (msg)
-               (let ([m (or (fetch-find (imap-fetches imap) msg)
-                            (error 'imap-get-messages "no result for message ~a" msg))])
-                 (let loop ([flds flds][m (cdr m)])
-                   (cond
-                     [(null? flds)
-                      (if (null? m)
-                        (fetch-delete! (imap-fetches imap) msg)
-                        (fetch-insert! (imap-fetches imap) (cons msg m)))
-                      null]
-                     [else
-                      (let ([a (assoc (car flds) m)])
-                        (cons (and a (cdr a))
-                              (loop (cdr flds) (if a (remq a m) m))))]))))
-             msgs))))))
-
-(define (imap-store imap mode msgs flags)
-  (no-expunges 'imap-store imap)
-  (check-ok
-   (imap-send imap
-              (list "STORE"
-                    (box (msg-set msgs))
-                    (case mode
-                      [(+) "+FLAGS.SILENT"]
-                      [(-) "-FLAGS.SILENT"]
-                      [(!) "FLAGS.SILENT"]
-                      [else (raise-type-error 'imap-store
-                                              "mode: '!, '+, or '-" mode)])
-                    (box (format "~a" flags)))
-              void)))
-
-(define (imap-copy imap msgs dest-mailbox)
-  (no-expunges 'imap-copy imap)
-  (check-ok
-   (imap-send imap (list "COPY" (box (msg-set msgs)) dest-mailbox) void)))
-
-(define (imap-append imap dest-mailbox msg [flags '(seen)])
-  (no-expunges 'imap-append imap)
-  (let ([msg (if (bytes? msg) msg (string->bytes/utf-8 msg))])
-    (check-ok
-     (imap-send imap (list "APPEND"
-                           dest-mailbox
-                           (box (~a (map symbol->imap-flag flags)))
-                           (box (format "{~a}" (bytes-length msg))))
-                void
-                (lambda (loop contin)
-                  (fprintf (imap-w imap) "~a\r\n" msg)
-                  (loop))))))
-
-(define (imap-expunge imap)
-  (check-ok (imap-send imap "EXPUNGE" void)))
-
-(define (imap-mailbox-exists? imap mailbox)
-  (let ([exists? #f])
-    (check-ok (imap-send imap
-                         (list "LIST" "" mailbox)
-                         (lambda (i)
-                           (when (and (pair? i) (tag-eq? (car i) 'LIST))
-                             (set! exists? #t)))))
-    exists?))
-
-(define (imap-create-mailbox imap mailbox)
-  (check-ok (imap-send imap (list "CREATE" mailbox) void)))
-
-(define (imap-get-hierarchy-delimiter imap)
-  (let ([result #f])
-    (check-ok
-     (imap-send imap (list "LIST" "" "")
-                (lambda (i)
-                  (when (and (pair? i) (tag-eq? (car i) 'LIST))
-                    (set! result (caddr i))))))
-    result))
-
-(define imap-list-child-mailboxes
-  (case-lambda
-    [(imap mailbox)
-     (imap-list-child-mailboxes imap mailbox #f)]
-    [(imap mailbox raw-delimiter)
-     (let* ([delimiter (or (and raw-delimiter
-                                (if (bytes? raw-delimiter)
-                                    raw-delimiter
-                                    (string->bytes/utf-8 raw-delimiter)))
-                           (imap-get-hierarchy-delimiter imap))]
-            [mailbox (and mailbox
-                          (if (bytes? mailbox)
-                              mailbox
-                              (string->bytes/utf-8 mailbox)))]
-            [mailbox-name (and mailbox (bytes-append mailbox delimiter))]
-            [pattern (if mailbox
-                       (bytes-append mailbox-name #"%")
-                       #"%")])
-       (map (lambda (p)
-              (list (car p)
-                    (cond
-                      [(symbol? (cadr p))
-                       (string->bytes/utf-8 (symbol->string (cadr p)))]
-                      [(string? (cadr p))
-                       (string->bytes/utf-8 (symbol->string (cadr p)))]
-                      [(bytes? (cadr p))
-                       (cadr p)])))
-            (imap-list-mailboxes imap pattern mailbox-name)))]))
-
-(define (imap-mailbox-flags imap mailbox)
-  (let ([r (imap-list-mailboxes imap mailbox #f)])
-    (if (= (length r) 1)
-      (caar r)
-      (error 'imap-mailbox-flags "could not get flags for ~s (~a)"
-             mailbox
-             (if (null? r) "no matches" "multiple matches")))))
-
-(define (imap-list-mailboxes imap pattern except)
-  (let* ([sub-folders null])
-    (check-ok
-     (imap-send imap (list "LIST" "" pattern)
-                (lambda (x)
-                  (when (and (pair? x)
-                             (tag-eq? (car x) 'LIST))
-                    (let* ([flags (cadr x)]
-                           [name (cadddr x)]
-                           [bytes-name (if (symbol? name)
-                                         (string->bytes/utf-8 (symbol->string name))
-                                         name)])
-                      (unless (and except
-                                   (bytes=? bytes-name except))
-                        (set! sub-folders
-                              (cons (list flags name) sub-folders))))))))
-    (reverse sub-folders)))
diff --git a/pkgs/net-pkgs/net-lib/net/mime-util.rkt b/pkgs/net-pkgs/net-lib/net/mime-util.rkt
deleted file mode 100644
index fff30fcfe0..0000000000
--- a/pkgs/net-pkgs/net-lib/net/mime-util.rkt
+++ /dev/null
@@ -1,115 +0,0 @@
-;;;
-;;; <mime-util.rkt> ---- Extra utilities
-;;; Time-stamp: <01/05/07 17:41:12 solsona>
-;;;
-;;; Copyright (C) 2001 by Francisco Solsona.
-;;;
-;;; This file is part of mime-plt.
-
-;;; mime-plt is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; mime-plt is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with mime-plt; if not, write to the Free Software
-;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;;; 02110-1301 USA.
-
-;;; Author: Francisco Solsona <solsona@acm.org>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(provide string-tokenizer
-         trim-all-spaces
-         trim-spaces
-         trim-comments
-         lowercase
-         warning
-         cat)
-
-;; string-index returns the leftmost index in string s
-;; that has character c
-(define (string-index s c)
-  (let ([n (string-length s)])
-    (let loop ([i 0])
-      (cond [(>= i n) #f]
-            [(char=? (string-ref s i) c) i]
-            [else (loop (+ i 1))]))))
-
-;; string-tokenizer breaks string s into substrings separated by character c
-(define (string-tokenizer c s)
-  (let loop ([s s])
-    (if (string=? s "") '()
-        (let ([i (string-index s c)])
-          (if i (cons (substring s 0 i)
-                      (loop (substring s (+ i 1) (string-length s))))
-              (list s))))))
-
-;; Trim all spaces, except those in quoted strings.
-(define (trim-all-spaces str)
-  ;; Break out alternate quoted and unquoted parts.
-  ;; Initial and final string are unquoted.
-  (let-values ([(unquoted quoted)
-                (let loop ([str str] [unquoted null] [quoted null])
-                  (let ([m (regexp-match-positions #rx"\"" str)])
-                    (if m
-                      (let ([prefix (substring str 0 (caar m))]
-                            [rest (substring str (add1 (caar m)) (string-length str))])
-                        ;; Find closing quote
-                        (let ([m (regexp-match-positions #rx"\"" rest)])
-                          (if m
-                            (let ([inside (substring rest 0 (caar m))]
-                                  [rest (substring rest (add1 (caar m)) (string-length rest))])
-                              (loop rest (cons prefix unquoted) (cons (format "\"~a\"" inside) quoted)))
-                            ;; No closing quote!
-                            (loop "" (cons prefix unquoted) (cons (format "\"~a" rest) quoted)))))
-                      (values (reverse (cons str unquoted)) (reverse quoted)))))])
-    ;; Put the pieces back together, stripping spaces for unquoted parts:
-    (apply
-     string-append
-     (let loop ([unquoted unquoted] [quoted quoted])
-       (let ([clean (regexp-replace* #rx"[ \t\n\r\v]" (car unquoted) "")])
-         (if (null? quoted)
-           (list clean)
-           (list* clean
-                  (car quoted)
-                  (loop (cdr unquoted) (cdr quoted)))))))))
-
-;; Only trims left and right spaces:
-(define (trim-spaces str)
-  (regexp-replace #rx"[ \t\r\n\v]+$"
-                  (regexp-replace #rx"^[ \t\r\n\v]+" str "")
-                  ""))
-
-(define (trim-comments str)
-  (define positions
-    (regexp-match-positions #rx"^[^\"]*(\"[^\"]*\")*[^\"]*(\\(.*\\))" str))
-  (if positions
-    (string-append (substring str 0 (caaddr positions))
-                   (substring str (cdaddr positions) (string-length str)))
-    str))
-
-(define lowercase string-downcase)
-
-(define warning
-  (lambda (msg . args)
-    (log-warning (apply format (cons msg args)))))
-
-;; Copies its input `in' to its ouput port if given, it uses
-;; current-output-port if out is not provided.
-(define (cat in [out (current-output-port)])
-  (let loop ([ln (read-line in)])
-    (unless (eof-object? ln)
-      (fprintf out "~a\n" ln)
-      (loop (read-line in)))))
-
-;;; mime-util.rkt ends here
diff --git a/pkgs/net-pkgs/net-lib/net/mime.rkt b/pkgs/net-pkgs/net-lib/net/mime.rkt
deleted file mode 100644
index cd63732dea..0000000000
--- a/pkgs/net-pkgs/net-lib/net/mime.rkt
+++ /dev/null
@@ -1,754 +0,0 @@
-;;;
-;;; <mime.rkt> ---- MIME support
-;;;
-;;; Copyright (C) 2002 by PLT.
-;;; Copyright (C) 2001 by Wish Computing.
-;;;
-;;; This file is part of mime
-
-;;; mime is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-
-;;; mime is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
-
-;;; You should have received a copy of the GNU General Public License
-;;; along with mime; see the file COPYING.  If not, write to the Free
-;;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-;;; MA 02110-1301 USA.
-
-;;; Author: Francisco Solsona <solsona@acm.org>
-;;
-;; Commentary: MIME support for PLT Scheme: an implementation of
-;; rfc2045, rfc2046, rfc2047, rfc2048, and rfc2049.
-
-#lang racket/base
-
-(require racket/port "mime-util.rkt" "qp.rkt" net/base64 net/head)
-
-(provide
- ;; -- exceptions raised --
- (struct-out mime-error)
- (struct-out unexpected-termination)
- (struct-out missing-multipart-boundary-parameter) ; this is the only one actually raised
- (struct-out malformed-multipart-entity)
- (struct-out empty-mechanism)
- (struct-out empty-type)
- (struct-out empty-subtype)
- (struct-out empty-disposition-type)
-
- ;; -- basic mime structures --
- (struct-out message)
- (struct-out entity)
- (struct-out disposition)
-
- ;; -- mime methods --
- mime-analyze)
-
-;; Constants:
-(define discrete-alist
-  '(("text" . text)
-    ("image" . image)
-    ("audio" . audio)
-    ("video" . video)
-    ("application" . application)))
-
-(define disposition-alist
-  '(("inline" . inline)
-    ("attachment" . attachment)
-    ("file" . attachment) ;; This is used (don't know why) by
-                          ;; multipart/form-data
-    ("messagetext" . inline)
-    ("form-data" . form-data)))
-
-(define composite-alist
-  '(("message" . message)
-    ("multipart" . multipart)))
-
-(define mechanism-alist
-  '(("7bit" . 7bit)
-    ("8bit" . 8bit)
-    ("binary" . binary)
-    ("quoted-printable" . quoted-printable)
-    ("base64" . base64)))
-
-(define ietf-extensions '())
-
-;; We don't try to keep up with IANA substypes
-#;
-(define iana-extensions
-  '(;; text
-    ("plain" . plain)
-    ("html" . html)
-    ("enriched"  . enriched) ; added 5/2005 - probably not iana
-    ("richtext"  . richtext)
-    ("tab-separated-values" . tab-separated-values)
-    ;; Multipart
-    ("mixed" . mixed)
-    ("alternative" . alternative)
-    ("digest" . digest)
-    ("parallel" . parallel)
-    ("appledouble" . appledouble)
-    ("header-set" . header-set)
-    ("form-data" . form-data)
-    ;; Message
-    ("rfc822" . rfc822)
-    ("partial" . partial)
-    ("external-body" . external-body)
-    ("news" . news)
-    ;; Application
-    ("octet-stream" . octet-stream)
-    ("postscript" . postscript)
-    ("oda" . oda)
-    ("atomicmail" . atomicmail)
-    ("andrew-inset" . andrew-inset)
-    ("slate" . slate)
-    ("wita" . wita)
-    ("dec-dx" . dec-dx)
-    ("dca-rf" . dca-rf)
-    ("activemessage" . activemessage)
-    ("rtf" . rtf)
-    ("applefile" . applefile)
-    ("mac-binhex40" . mac-binhex40)
-    ("news-message-id" . news-message-id)
-    ("news-transmissio" . news-transmissio)
-    ("wordperfect5.1" . wordperfect5.1)
-    ("pdf" . pdf)
-    ("zip" . zip)
-    ("macwritei" . macwritei)
-    ;; "image"
-    ("jpeg" . jpeg)
-    ("gif" . gif)
-    ("ief" . ief)
-    ("tiff" . tiff)
-    ;; "audio"
-    ("basic" . basic)
-    ;; "video" .
-    ("mpeg" . mpeg)
-    ("quicktime" . quicktime)))
-
-;; Basic structures
-(define-struct message (version entity fields)
-  #:mutable)
-(define-struct entity
-  (type subtype charset encoding disposition params id description other
-   fields parts body)
-  #:mutable)
-(define-struct disposition
-  (type filename creation modification read size params)
-  #:mutable)
-
-;; Exceptions
-(define-struct (mime-error exn:fail) ())
-(define-struct (unexpected-termination mime-error) (msg))
-(define-struct (missing-multipart-boundary-parameter mime-error) ())
-
-(define-struct (malformed-multipart-entity mime-error) (msg))
-(define-struct (empty-mechanism mime-error) ())
-(define-struct (empty-type mime-error) ())
-(define-struct (empty-subtype mime-error) ())
-(define-struct (empty-disposition-type mime-error) ())
-
-;; *************************************
-;; Practical stuff, aka MIME in action:
-;; *************************************
-(define CRLF (format "~a~a" #\return #\newline))
-(define CRLF-binary "=0D=0A") ;; quoted printable representation
-
-;; get-headers : input-port -> string
-;; returns the header part of a message/part conforming to rfc822, and
-;; rfc2045.
-(define (get-headers in)
-  (let loop ([headers ""] [ln (read-line in 'any)])
-    (cond [(eof-object? ln)
-           ;; (raise (make-unexpected-termination "eof reached! while parsing headers"))
-           (warning "premature eof while parsing headers")
-           headers]
-          [(string=? ln "") headers]
-          [else
-           ;; Quoting rfc822:
-           ;; " Headers occur before the message body and are
-           ;; terminated by a null line (i.e., two contiguous
-           ;; CRLFs)."
-           ;; That is: Two empty lines.  But most MUAs seem to count
-           ;; the CRLF ending the last field (header) as the first
-           ;; CRLF of the null line.
-           (loop (string-append headers ln CRLF)
-                 (read-line in 'any))])))
-
-(define (make-default-disposition)
-  (make-disposition
-   'inline ;; type
-   "" ;; filename
-   #f ;; creation
-   #f ;; modification
-   #f ;; read
-   #f ;; size
-   null ;; params
-   ))
-
-(define (make-default-entity)
-  (make-entity
-   'text  ;; type
-   'plain ;; subtype
-   'us-ascii ;; charset
-   '7bit  ;; encoding
-   (make-default-disposition) ;; disposition
-   null   ;; params
-   ""     ;; id
-   ""     ;; description
-   null   ;; other MIME fields (MIME-extension-fields)
-   null   ;; fields
-   null   ;; parts
-   null   ;; body
-   ))
-
-(define (make-default-message)
-  (make-message 1.0 (make-default-entity) null))
-
-(define (mime-decode entity input)
-  (set-entity-body!
-   entity
-   (case (entity-encoding entity)
-     [(quoted-printable)
-      (lambda (output)
-        (qp-decode-stream input output))]
-     [(base64)
-      (lambda (output)
-        (base64-decode-stream input output))]
-     [else ;; 7bit, 8bit, binary
-      (lambda (output)
-        (copy-port input output))])))
-
-(define (mime-analyze input [part #f])
-  (let* ([iport (if (bytes? input)
-                  (open-input-bytes input)
-                  input)]
-         [headers (get-headers iport)]
-         [msg (if part
-                (MIME-part-headers headers)
-                (MIME-message-headers headers))]
-         [entity (message-entity msg)])
-    ;; OK we have in msg a MIME-message structure, lets see what we have:
-    (case (entity-type entity)
-      [(text image audio video application)
-       ;; decode part, and save port and thunk
-       (mime-decode entity iport)]
-      [(message multipart)
-       (let ([boundary (entity-boundary entity)])
-         (when (not boundary)
-           (when (eq? 'multipart (entity-type entity))
-             (raise (make-missing-multipart-boundary-parameter
-                     "missing multipart \"boundary\" parameter"
-                     (current-continuation-marks)))))
-         (set-entity-parts! entity
-                            (map (lambda (part)
-                                   (mime-analyze part #t))
-                                 (if boundary
-                                   (multipart-body iport boundary)
-                                   (list iport)))))]
-      [else
-       ;; Unrecognized type, you're on your own! (sorry)
-       (mime-decode entity iport)])
-    ;; return mime structure
-    msg))
-
-(define (entity-boundary entity)
-  (let* ([params (entity-params entity)]
-         [ans (assoc "boundary" params)])
-    (and ans (cdr ans))))
-
-;; *************************************************
-;; MIME Specific: rfc2045-2049, and rfc0822, rfc2183
-;; *************************************************
-
-;;multipart-body := [preamble CRLF]
-;;                  dash-boundary transport-padding CRLF
-;;                  body-part *encapsulation
-;;                  close-delimiter transport-padding
-;;                  [CRLF epilogue]
-;; Returns a list of input ports, each one containing the correspongind part.
-(define (multipart-body input boundary)
-  (let* ([make-re (lambda (prefix)
-                    (regexp (string-append prefix "--" (regexp-quote boundary) "(--)?\r\n")))]
-         [re (make-re "\r\n")])
-    (letrec ([eat-part (lambda ()
-                         (let-values ([(pin pout) (make-pipe)])
-                           (let ([m (regexp-match re input 0 #f pout)])
-                             (cond
-                               [(not m)
-                                (close-output-port pout)
-                                (values pin ;; part
-                                        #f  ;; close-delimiter?
-                                        #t  ;; eof reached?
-                                        )]
-                               [(cadr m)
-                                (close-output-port pout)
-                                (values pin #t #f)]
-                               [else
-                                (close-output-port pout)
-                                (values pin #f #f)]))))])
-      ;; pre-amble is allowed to be completely empty:
-      (if (regexp-match-peek (make-re "^") input)
-        ;; No \r\f before first separator:
-        (read-line input)
-        ;; non-empty preamble:
-        (eat-part))
-      (let loop ()
-        (let-values ([(part close? eof?) (eat-part)])
-          (cond [close? (list part)]
-                [eof? (list part)]
-                [else (cons part (loop))]))))))
-
-;; MIME-message-headers := entity-headers
-;;                        fields
-;;                        version CRLF
-;;                        ; The ordering of the header
-;;                        ; fields implied by this BNF
-;;                        ; definition should be ignored.
-(define (MIME-message-headers headers)
-  (let ([message (make-default-message)])
-    (entity-headers headers message #t)
-    message))
-
-;; MIME-part-headers := entity-headers
-;;                     [ fields ]
-;;                     ; Any field not beginning with
-;;                     ; "content-" can have no defined
-;;                     ; meaning and may be ignored.
-;;                     ; The ordering of the header
-;;                     ; fields implied by this BNF
-;;                     ; definition should be ignored.
-(define (MIME-part-headers headers)
-  (let ([message (make-default-message)])
-    (entity-headers headers message #f)
-    message))
-
-;; entity-headers := [ content CRLF ]
-;;                  [ encoding CRLF ]
-;;                  [ id CRLF ]
-;;                  [ description CRLF ]
-;;                  *( MIME-extension-field CRLF )
-(define (entity-headers headers message version?)
-  (let ([entity (message-entity message)])
-    (let-values ([(mime non-mime) (get-fields headers)])
-      (let loop ([fields mime])
-        (unless (null? fields)
-          ;; Process MIME field
-          (let ([trimmed-h (trim-comments (car fields))])
-            (or (and version? (version trimmed-h message))
-                (content trimmed-h entity)
-                (encoding trimmed-h entity)
-                (dispositione trimmed-h entity)
-                (id trimmed-h entity)
-                (description trimmed-h entity)
-                (MIME-extension-field trimmed-h entity))
-            ;; keep going
-            (loop (cdr fields)))))
-      ;; NON-mime headers (or semantically incorrect). In order to make
-      ;; this implementation of rfc2045 robuts, we will save the header in
-      ;; the fields field of the message struct:
-      (set-message-fields! message non-mime)
-      ;; Return message
-      message)))
-
-(define (get-fields headers)
-  (let ([mime null] [non-mime null])
-    (letrec ([store-field
-              (lambda (f)
-                (unless (string=? f "")
-                  (if (mime-header? f)
-                    (set! mime (append mime (list (trim-spaces f))))
-                    (set! non-mime (append non-mime (list (trim-spaces f)))))))])
-      (let ([fields (extract-all-fields headers)])
-        (for-each (lambda (p)
-                    (store-field (format "~a: ~a" (car p) (cdr p))))
-                  fields))
-      (values mime non-mime))))
-
-(define re:content #rx"^(?i:content-)")
-(define re:mime #rx"^(?i:mime-version):")
-
-(define (mime-header? h)
-  (or (regexp-match? re:content h)
-      (regexp-match? re:mime h)))
-
-;;; Headers
-;;; Content-type follows this BNF syntax:
-;; content := "Content-Type" ":" type "/" subtype
-;;           *(";" parameter)
-;;           ; Matching of media type and subtype
-;;           ; is ALWAYS case-insensitive.
-(define re:content-type #rx"^(?i:content-type):([^/]+)/([^/]+)$")
-(define (content header entity)
-  (let* ([params (string-tokenizer #\; header)]
-         [one re:content-type]
-         [h (trim-all-spaces (car params))]
-         [target (regexp-match one h)]
-         [old-param (entity-params entity)])
-    (and target
-         (set-entity-type! entity
-                           (type (regexp-replace one h "\\1")))   ;; type
-         (set-entity-subtype! entity
-                              (subtype (regexp-replace one h "\\2"))) ;; subtype
-         (set-entity-params!
-          entity
-          (append old-param
-                  (let loop ([p (cdr params)] ;; parameters
-                             [ans null])
-                    (cond [(null? p) ans]
-                          [else
-                           (let ([par-pair (parameter (trim-all-spaces (car p)))])
-                             (cond [par-pair
-                                    (when (string=? (car par-pair) "charset")
-                                      (set-entity-charset! entity (cdr par-pair)))
-                                    (loop (cdr p) (append ans (list par-pair)))]
-                                   [else
-                                    (warning "Invalid parameter for Content-Type: `~a'" (car p))
-                                    ;; go on...
-                                    (loop (cdr p) ans)]))])))))))
-
-;; From rfc2183 Content-Disposition
-;; disposition := "Content-Disposition" ":"
-;;                  disposition-type
-;;                  *(";" disposition-parm)
-(define re:content-disposition #rx"^(?i:content-disposition):(.+)$")
-(define (dispositione header entity)
-  (let* ([params (string-tokenizer #\; header)]
-         [reg re:content-disposition]
-         [h (trim-all-spaces (car params))]
-         [target (regexp-match reg h)]
-         [disp-struct (entity-disposition entity)])
-    (and target
-         (set-disposition-type!
-          disp-struct
-          (disp-type (regexp-replace reg h "\\1")))
-         (disp-params (cdr params) disp-struct))))
-
-;; version := "MIME-Version" ":" 1*DIGIT "." 1*DIGIT
-(define re:mime-version #rx"^(?i:MIME-Version):([0-9]+)\\.([0-9]+)$")
-(define (version header message)
-  (let* ([reg re:mime-version]
-         [h (trim-all-spaces header)]
-         [target (regexp-match reg h)])
-    (and target
-         (set-message-version!
-          message
-          (string->number (regexp-replace reg h "\\1.\\2"))))))
-
-;;   description := "Content-Description" ":" *text
-(define re:content-description #rx"^(?i:content-description):[ \t\r\n]*(.*)$")
-(define (description header entity)
-  (let* ([reg re:content-description]
-         [target (regexp-match reg header)])
-    (and target
-         (set-entity-description!
-          entity
-          (trim-spaces (regexp-replace reg header "\\1"))))))
-
-;;   encoding := "Content-Transfer-Encoding" ":" mechanism
-(define re:content-transfer-encoding #rx"^(?i:content-transfer-encoding):(.+)$")
-(define (encoding header entity)
-  (let* ([reg re:content-transfer-encoding]
-         [h (trim-all-spaces header)]
-         [target (regexp-match reg h)])
-    (and target
-         (set-entity-encoding!
-          entity
-          (mechanism (regexp-replace reg h "\\1"))))))
-
-;;   id := "Content-ID" ":" msg-id
-(define re:content-id #rx"^(?i:content-id):(.+)$")
-(define (id header entity)
-  (let* ([reg re:content-id]
-         [h (trim-all-spaces header)]
-         [target (regexp-match reg h)])
-    (and target
-         (set-entity-id!
-          entity
-          (msg-id (regexp-replace reg h "\\1"))))))
-
-;; From rfc822:
-;; msg-id      =  "<" addr-spec ">"            ; Unique message id
-;; addr-spec   =  local-part "@" domain        ; global address
-;; local-part  =  word *("." word)             ; uninterpreted
-;;                                             ; case-preserved
-;; domain      =  sub-domain *("." sub-domain)
-;; sub-domain  =  domain-ref / domain-literal
-;; domain-literal =  "[" *(dtext / quoted-pair) "]"
-;; domain-ref  =  atom                         ; symbolic reference
-(define (msg-id str)
-  (let* ([r (regexp "^<[^@>]+@[^.]+(\\.[^.]+)*>$")]
-         [ans (regexp-match r str)])
-    (if ans
-      str
-      (begin (warning "Invalid msg-id: ~a" str) str))))
-
-;;  mechanism := "7bit" / "8bit" / "binary" /
-;;                 "quoted-printable" / "base64" /
-;;                 ietf-token / x-token
-(define (mechanism mech)
-  (if (not mech)
-    (raise (make-empty-mechanism))
-    (let ([val (assoc (lowercase mech) mechanism-alist)])
-      (or (and val (cdr val))
-          (ietf-token mech)
-          (x-token mech)))))
-
-;;  MIME-extension-field := <Any RFC 822 header field which
-;;                              begins with the string
-;;                              "Content-">
-;;
-(define (MIME-extension-field header entity)
-  (let* ([reg (regexp "^[Cc]ontent-(.+):[ \t]*(.+)$")]
-         [target (regexp-match reg header)])
-    (and target
-         (set-entity-other!
-          entity
-          (append (entity-other entity)
-                  (list (cons (regexp-replace reg header "\\1")
-                              (trim-spaces (regexp-replace reg header "\\2")))))))))
-
-;; type := discrete-type / composite-type
-(define (type value)
-  (if (not value)
-    (raise (make-empty-type))
-    (or (discrete-type value)
-        (composite-type value))))
-
-;; disposition-type := "inline" / "attachment"  / extension-token
-(define (disp-type value)
-  (if (not value)
-    (raise (make-empty-disposition-type))
-    (let ([val (assoc (lowercase (trim-spaces value)) disposition-alist)])
-      (if val (cdr val) (extension-token value)))))
-
-;; discrete-type := "text" / "image" / "audio" / "video" /
-;;                  "application" / extension-token
-(define (discrete-type value)
-  (let ([val (assoc (lowercase (trim-spaces value)) discrete-alist)])
-    (if val (cdr val) (extension-token value))))
-
-;; composite-type := "message" / "multipart" / extension-token
-(define (composite-type value)
-  (let ([val (assoc (lowercase (trim-spaces value)) composite-alist)])
-    (if val (cdr val) (extension-token value))))
-
-;; extension-token := ietf-token / x-token
-(define (extension-token value)
-  (or (ietf-token value)
-      (x-token value)))
-
-;; ietf-token := <An extension token defined by a
-;;               standards-track RFC and registered
-;;               with IANA.>
-(define (ietf-token value)
-  (let ([ans (assoc (lowercase (trim-spaces value)) ietf-extensions)])
-    (and ans (cdr ans))))
-
-;;  Directly from RFC 1700:
-;; Type            Subtype         Description                 Reference
-;; ----            -------         -----------                 ---------
-;; text            plain                                   [RFC1521,NSB]
-;;                 richtext                                [RFC1521,NSB]
-;;                 tab-separated-values                   [Paul Lindner]
-;;
-;; multipart       mixed                                   [RFC1521,NSB]
-;;                 alternative                             [RFC1521,NSB]
-;;                 digest                                  [RFC1521,NSB]
-;;                 parallel                                [RFC1521,NSB]
-;;                 appledouble                [MacMime,Patrik Faltstrom]
-;;                 header-set                             [Dave Crocker]
-;;
-;; message         rfc822                                  [RFC1521,NSB]
-;;                 partial                                 [RFC1521,NSB]
-;;                 external-body                           [RFC1521,NSB]
-;;                 news                        [RFC 1036, Henry Spencer]
-;;
-;; application     octet-stream                            [RFC1521,NSB]
-;;                   postscript                              [RFC1521,NSB]
-;;                   oda                                     [RFC1521,NSB]
-;;                   atomicmail                           [atomicmail,NSB]
-;;                   andrew-inset                       [andrew-inset,NSB]
-;;                   slate                           [slate,terry crowley]
-;;                   wita              [Wang Info Transfer,Larry Campbell]
-;;                   dec-dx            [Digital Doc Trans, Larry Campbell]
-;;                   dca-rft        [IBM Doc Content Arch, Larry Campbell]
-;;                   activemessage                          [Ehud Shapiro]
-;;                   rtf                                    [Paul Lindner]
-;;                   applefile                  [MacMime,Patrik Faltstrom]
-;;                   mac-binhex40               [MacMime,Patrik Faltstrom]
-;;                   news-message-id              [RFC1036, Henry Spencer]
-;;                   news-transmission            [RFC1036, Henry Spencer]
-;;                   wordperfect5.1                         [Paul Lindner]
-;;                   pdf                                    [Paul Lindner]
-;;                   zip                                    [Paul Lindner]
-;;                   macwriteii                             [Paul Lindner]
-;;                   msword                                 [Paul Lindner]
-;;                   remote-printing                         [RFC1486,MTR]
-;;
-;; image           jpeg                                    [RFC1521,NSB]
-;;                 gif                                     [RFC1521,NSB]
-;;                 ief             Image Exchange Format       [RFC1314]
-;;                 tiff            Tag Image File Format           [MTR]
-;;
-;; audio           basic                                   [RFC1521,NSB]
-;;
-;; video           mpeg                                    [RFC1521,NSB]
-;;                 quicktime                              [Paul Lindner]
-
-;; x-token := <The two characters "X-" or "x-" followed, with
-;;            no intervening white space, by any token>
-(define (x-token value)
-  (let* ([r  #rx"^[xX]-(.*)"]
-         [h (trim-spaces value)]
-         [ans (regexp-match r h)])
-    (and ans
-         (token (regexp-replace r h "\\1"))
-         h)))
-
-;; subtype := extension-token / iana-token
-(define (subtype value)
-  (if (not value)
-    (raise (make-empty-subtype))
-    (or (extension-token value)
-        (iana-token value))))
-
-;; iana-token := <A publicly-defined extension token. Tokens
-;;               of this form must be registered with IANA
-;;               as specified in RFC 2048.>
-;;              Instead of trying to list all registered types
-;;              here, we just convert to a symbol.
-(define (iana-token value)
-  (string->symbol (lowercase (trim-spaces value))))
-
-;; parameter := attribute "=" value
-(define re:parameter (regexp "([^=]+)=(.+)"))
-(define (parameter par)
-  (let* ([r re:parameter]
-         [att (attribute (regexp-replace r par "\\1"))]
-         [val (value (regexp-replace r par "\\2"))])
-    (if (regexp-match r par)
-      (cons (if att (lowercase att) "???") val)
-      (cons "???" par))))
-
-;; value := token / quoted-string
-(define (value val)
-  (or (token val)
-      (quoted-string val)
-      val))
-
-;; token := 1*<any (US-ASCII) CHAR except SPACE, CTLs,
-;;            or tspecials>
-;; tspecials :=  "(" / ")" / "<" / ">" / "@" /
-;;              "," / ";" / ":" / "\" / <">
-;;              "/" / "[" / "]" / "?" / "="
-;;              ; Must be in quoted-string,
-;;              ; to use within parameter values
-(define (token value)
-  (let* ([tspecials (regexp "[^][()<>@,;:\\\"/?= ]+")]
-         [ans (regexp-match tspecials value)])
-    (and ans
-         (string=? value (car ans))
-         (car ans))))
-
-;; attribute := token
-;;             ; Matching of attributes
-;;             ; is ALWAYS case-insensitive.
-(define attribute token)
-
-(define re:quotes (regexp "\"(.+)\""))
-(define (quoted-string str)
-  (let* ([quotes re:quotes]
-         [ans (regexp-match quotes str)])
-    (and ans (regexp-replace quotes str "\\1"))))
-
-;; disposition-parm := filename-parm
-;;                     / creation-date-parm
-;;                     / modification-date-parm
-;;                     / read-date-parm
-;;                     / size-parm
-;;                     / parameter
-;;
-;; filename-parm := "filename" "=" value
-;;
-;; creation-date-parm := "creation-date" "=" quoted-date-time
-;;
-;; modification-date-parm := "modification-date" "=" quoted-date-time
-;;
-;; read-date-parm := "read-date" "=" quoted-date-time
-;;
-;; size-parm := "size" "=" 1*DIGIT
-(define (disp-params lst disp)
-  (let loop ([lst lst])
-    (unless (null? lst)
-      (let* ([p (parameter (trim-all-spaces (car lst)))]
-             [parm (car p)]
-             [value (cdr p)])
-        (cond [(string=? parm "filename")
-               (set-disposition-filename! disp value)]
-              [(string=? parm "creation-date")
-               (set-disposition-creation!
-                disp
-                (disp-quoted-data-time value))]
-              [(string=? parm "modification-date")
-               (set-disposition-modification!
-                disp
-                (disp-quoted-data-time value))]
-              [(string=? parm "read-date")
-               (set-disposition-read!
-                disp
-                (disp-quoted-data-time value))]
-              [(string=? parm "size")
-               (set-disposition-size!
-                disp
-                (string->number value))]
-              [else
-               (set-disposition-params!
-                disp
-                (append (disposition-params disp) (list p)))])
-        (loop (cdr lst))))))
-
-;; date-time   =  [ day "," ] date time        ; dd mm yy
-;;                                             ;  hh:mm:ss zzz
-;;
-;; day         =  "Mon"  / "Tue" /  "Wed"  / "Thu"
-;;            /  "Fri"  / "Sat" /  "Sun"
-;;
-;; date        =  1*2DIGIT month 2DIGIT        ; day month year
-;;                                   ;  e.g. 20 Jun 82
-;;
-;; month       =  "Jan"  /  "Feb" /  "Mar"  /  "Apr"
-;;            /  "May"  /  "Jun" /  "Jul"  /  "Aug"
-;;            /  "Sep"  /  "Oct" /  "Nov"  /  "Dec"
-;;
-;; time        =  hour zone                    ; ANSI and Military
-;;
-;; hour        =  2DIGIT ":" 2DIGIT [":" 2DIGIT]
-;;                                   ; 00:00:00 - 23:59:59
-;;
-;; zone        =  "UT"  / "GMT"                ; Universal Time
-;;                                   ; North American : UT
-;;            /  "EST" / "EDT"                ;  Eastern:  - 5/ - 4
-;;            /  "CST" / "CDT"                ;  Central:  - 6/ - 5
-;;            /  "MST" / "MDT"                ;  Mountain: - 7/ - 6
-;;            /  "PST" / "PDT"                ;  Pacific:  - 8/ - 7
-;;            /  1ALPHA                       ; Military: Z = UT;
-;;                                   ;  A:-1; (J not used)
-;;                                   ;  M:-12; N:+1; Y:+12
-;;            / ( ("+" / "-") 4DIGIT )        ; Local differential
-;;                                   ;  hours+min. (HHMM)
-(define date-time
-  (lambda (str)
-    ;; Fix Me: I have to return a date structure, or time in seconds.
-    str))
-
-;; quoted-date-time := quoted-string
-;;                ; contents MUST be an RFC 822 `date-time'
-;;                ; numeric timezones (+HHMM or -HHMM) MUST be used
-
-(define disp-quoted-data-time date-time)
diff --git a/pkgs/net-pkgs/net-lib/net/nntp.rkt b/pkgs/net-pkgs/net-lib/net/nntp.rkt
deleted file mode 100644
index da8ae8dfdb..0000000000
--- a/pkgs/net-pkgs/net-lib/net/nntp.rkt
+++ /dev/null
@@ -1,325 +0,0 @@
-#lang racket/base
-
-(require racket/tcp)
-
-(provide (struct-out communicator)
-         connect-to-server connect-to-server* disconnect-from-server
-         authenticate-user open-news-group
-         head-of-message body-of-message
-         newnews-since generic-message-command
-         make-desired-header extract-desired-headers
-
-         (struct-out nntp)
-         (struct-out unexpected-response)
-         (struct-out bad-status-line)
-         (struct-out premature-close)
-         (struct-out bad-newsgroup-line)
-         (struct-out non-existent-group)
-         (struct-out article-not-in-group)
-         (struct-out no-group-selected)
-         (struct-out article-not-found)
-         (struct-out authentication-rejected))
-
-;; sender : oport
-;; receiver : iport
-;; server : string
-;; port : number
-
-(define-struct communicator (sender receiver server port))
-
-;; code : number
-;; text : string
-;; line : string
-;; communicator : communicator
-;; group : string
-;; article : number
-
-(define-struct (nntp exn) ())
-(define-struct (unexpected-response nntp) (code text))
-(define-struct (bad-status-line nntp) (line))
-(define-struct (premature-close nntp) (communicator))
-(define-struct (bad-newsgroup-line nntp) (line))
-(define-struct (non-existent-group nntp) (group))
-(define-struct (article-not-in-group nntp) (article))
-(define-struct (no-group-selected nntp) ())
-(define-struct (article-not-found nntp) (article))
-(define-struct (authentication-rejected nntp) ())
-
-;; signal-error :
-;; (exn-args ... -> exn) x format-string x values ... ->
-;;   exn-args -> ()
-
-;; - throws an exception
-
-(define (signal-error constructor format-string . args)
-  (lambda exn-args
-    (raise (apply constructor
-                  (apply format format-string args)
-                  (current-continuation-marks)
-                  exn-args))))
-
-;; default-nntpd-port-number :
-;; number
-
-(define default-nntpd-port-number 119)
-
-;; connect-to-server*:
-;; input-port output-port -> communicator
-
-(define connect-to-server*
-  (case-lambda
-   [(receiver sender)
-    (connect-to-server* receiver sender "unspecified" "unspecified")]
-   [(receiver sender server-name port-number)
-    (file-stream-buffer-mode sender 'line)
-    (let ([communicator (make-communicator sender receiver server-name
-                                           port-number)])
-      (let-values ([(code response)
-                    (get-single-line-response communicator)])
-        (case code
-          [(200 201) communicator]
-          [else ((signal-error make-unexpected-response
-                               "unexpected connection response: ~s ~s"
-                               code response)
-                 code response)])))]))
-
-;; connect-to-server :
-;; string [x number] -> commnicator
-
-(define connect-to-server
-  (lambda (server-name (port-number default-nntpd-port-number))
-    (let-values ([(receiver sender)
-                  (tcp-connect server-name port-number)])
-      (connect-to-server* receiver sender server-name port-number))))
-
-;; close-communicator :
-;; communicator -> ()
-
-(define (close-communicator communicator)
-  (close-input-port (communicator-receiver communicator))
-  (close-output-port (communicator-sender communicator)))
-
-;; disconnect-from-server :
-;; communicator -> ()
-
-(define (disconnect-from-server communicator)
-  (send-to-server communicator "QUIT")
-  (let-values ([(code response)
-                (get-single-line-response communicator)])
-    (case code
-      [(205)
-       (close-communicator communicator)]
-      [else
-       ((signal-error make-unexpected-response
-                      "unexpected dis-connect response: ~s ~s"
-                      code response)
-        code response)])))
-
-;; authenticate-user :
-;; communicator x user-name x password -> ()
-;; the password is not used if the server does not ask for it.
-
-(define (authenticate-user communicator user password)
-  (define (reject code response)
-    ((signal-error make-authentication-rejected
-                   "authentication rejected (~s ~s)"
-                   code response)))
-  (define (unexpected code response)
-    ((signal-error make-unexpected-response
-                   "unexpected response for authentication: ~s ~s"
-                   code response)
-     code response))
-  (send-to-server communicator "AUTHINFO USER ~a" user)
-  (let-values ([(code response) (get-single-line-response communicator)])
-    (case code
-      [(281) (void)] ; server doesn't ask for a password
-      [(381)
-       (send-to-server communicator "AUTHINFO PASS ~a" password)
-       (let-values ([(code response)
-                     (get-single-line-response communicator)])
-         (case code
-           [(281) (void)] ; done
-           [(502) (reject code response)]
-           [else (unexpected code response)]))]
-      [(502) (reject code response)]
-      [else (reject code response)
-            (unexpected code response)])))
-
-;; send-to-server :
-;; communicator x format-string x list (values) -> ()
-
-(define (send-to-server communicator message-template . rest)
-  (let ([sender (communicator-sender communicator)])
-    (apply fprintf sender
-           (string-append message-template "\r\n")
-           rest)
-    (flush-output sender)))
-
-;; parse-status-line :
-;; string -> number x string
-
-(define (parse-status-line line)
-  (if (eof-object? line)
-      ((signal-error make-bad-status-line "eof instead of a status line")
-       line)
-      (let ([match (cdr (or (regexp-match #rx"([0-9]+) (.*)" line)
-                            ((signal-error make-bad-status-line
-                                           "malformed status line: ~s" line)
-                             line)))])
-        (values (string->number (car match))
-                (cadr match)))))
-
-;; get-one-line-from-server :
-;; iport -> string
-
-(define (get-one-line-from-server server->client-port)
-  (read-line server->client-port 'return-linefeed))
-
-;; get-single-line-response :
-;; communicator -> number x string
-
-(define (get-single-line-response communicator)
-  (let* ([receiver (communicator-receiver communicator)]
-         [status-line (get-one-line-from-server receiver)])
-    (parse-status-line status-line)))
-
-;; get-rest-of-multi-line-response :
-;; communicator -> list (string)
-
-(define (get-rest-of-multi-line-response communicator)
-  (let ([receiver (communicator-receiver communicator)])
-    (let loop ([r '()])
-      (let ([l (get-one-line-from-server receiver)])
-        (cond
-          [(eof-object? l)
-           ((signal-error make-premature-close
-                          "port prematurely closed during multi-line response")
-            communicator)]
-          [(string=? l ".")  (reverse r)]
-          [(string=? l "..") (loop (cons "." r))]
-          [else              (loop (cons l r))])))))
-
-;; get-multi-line-response :
-;; communicator -> number x string x list (string)
-
-;; -- The returned values are the status code, the rest of the status
-;; response line, and the remaining lines.
-
-(define (get-multi-line-response communicator)
-  (let* ([receiver (communicator-receiver communicator)]
-         [status-line (get-one-line-from-server receiver)])
-    (let-values ([(code rest-of-line)
-                  (parse-status-line status-line)])
-      (values code rest-of-line (get-rest-of-multi-line-response communicator)))))
-
-;; open-news-group :
-;; communicator x string -> number x number x number
-
-;; -- The returned values are the number of articles, the first
-;; article number, and the last article number for that group.
-
-(define (open-news-group communicator group-name)
-  (send-to-server communicator "GROUP ~a" group-name)
-  (let-values ([(code rest-of-line)
-                (get-single-line-response communicator)])
-    (case code
-      [(211)
-       (let ([match (map string->number
-                         (cdr
-                          (or (regexp-match #rx"([0-9]+) ([0-9]+) ([0-9]+)" rest-of-line)
-                              ((signal-error make-bad-newsgroup-line
-                                             "malformed newsgroup open response: ~s"
-                                             rest-of-line)
-                               rest-of-line))))])
-         (let ([number-of-articles (car match)]
-               [first-article-number (cadr match)]
-               [last-article-number (caddr match)])
-           (values number-of-articles
-                   first-article-number
-                   last-article-number)))]
-      [(411)
-       ((signal-error make-non-existent-group
-                      "group ~s does not exist on server ~s"
-                      group-name (communicator-server communicator))
-        group-name)]
-      [else
-       ((signal-error make-unexpected-response
-                      "unexpected group opening response: ~s" code)
-        code rest-of-line)])))
-
-;; generic-message-command :
-;; string x number -> communicator x (number U string) -> list (string)
-
-(define (generic-message-command command ok-code)
-  (lambda (communicator message-index)
-    (send-to-server communicator (string-append command " ~a")
-                    (if (number? message-index)
-                        (number->string message-index)
-                        message-index))
-    (let-values ([(code response)
-                  (get-single-line-response communicator)])
-      (if (= code ok-code)
-          (get-rest-of-multi-line-response communicator)
-          (case code
-            [(423)
-             ((signal-error make-article-not-in-group
-                            "article id ~s not in group" message-index)
-              message-index)]
-            [(412)
-             ((signal-error make-no-group-selected
-                            "no group selected"))]
-            [(430)
-             ((signal-error make-article-not-found
-                            "no article id ~s found" message-index)
-              message-index)]
-            [else
-             ((signal-error make-unexpected-response
-                            "unexpected message access response: ~s" code)
-              code response)])))))
-
-;; head-of-message :
-;; communicator x (number U string) -> list (string)
-
-(define head-of-message
-  (generic-message-command "HEAD" 221))
-
-;; body-of-message :
-;; communicator x (number U string) -> list (string)
-
-(define body-of-message
-  (generic-message-command "BODY" 222))
-
-;; newnews-since :
-;; communicator x (number U string) -> list (string)
-
-(define newnews-since
-  (generic-message-command "NEWNEWS" 230))
-
-;; make-desired-header :
-;; string -> desired
-
-(define (make-desired-header raw-header)
-  (regexp
-   (string-append
-    "^"
-    (list->string
-     (apply append
-            (map (lambda (c)
-                   (cond
-                    [(char-lower-case? c)
-                     (list #\[ (char-upcase c) c #\])]
-                    [(char-upper-case? c)
-                     (list #\[ c (char-downcase c) #\])]
-                    [else
-                     (list c)]))
-                 (string->list raw-header))))
-    ":")))
-
-;; extract-desired-headers :
-;; list (string) x list (desired) -> list (string)
-
-(define (extract-desired-headers headers desireds)
-  (filter (lambda (header)
-            (ormap (lambda (matcher) (regexp-match matcher header))
-                   desireds))
-          headers))
diff --git a/pkgs/net-pkgs/net-lib/net/pop3.rkt b/pkgs/net-pkgs/net-lib/net/pop3.rkt
deleted file mode 100644
index 2142b8cd8d..0000000000
--- a/pkgs/net-pkgs/net-lib/net/pop3.rkt
+++ /dev/null
@@ -1,431 +0,0 @@
-#lang racket/base
-
-;; Implements RFC 1939, Post Office Protocol - Version 3, Myers & Rose
-
-#|
-> (require net/pop3)
-> (define c (connect-to-server "cs.rice.edu"))
-> (authenticate/plain-text "scheme" "********" c)
-> (get-mailbox-status c)
-100
-177824
-> (get-message/headers c 100)
-("Date: Thu, 6 Nov 1997 12:34:18 -0600 (CST)"
- "Message-Id: <199711061834.MAA11961@new-world.cs.rice.edu>"
- "From: Shriram Krishnamurthi <shriram@cs.rice.edu>"
- ...
- "Status: RO")
-> (get-message/complete  c 100)
-("Date: Thu, 6 Nov 1997 12:34:18 -0600 (CST)"
- "Message-Id: <199711061834.MAA11961@new-world.cs.rice.edu>"
- "From: Shriram Krishnamurthi <shriram@cs.rice.edu>"
- ...
- "Status: RO")
-("some body" "text" "goes" "." "here" "." "")
-> (disconnect-from-server c)
-|#
-
-(require racket/tcp)
-
-(provide (struct-out communicator)
-         connect-to-server connect-to-server* disconnect-from-server
-         authenticate/plain-text
-         get-mailbox-status
-         get-message/complete get-message/headers get-message/body
-         delete-message
-         get-unique-id/single get-unique-id/all
-
-         make-desired-header extract-desired-headers
-
-         (struct-out pop3)
-         (struct-out cannot-connect)
-         (struct-out username-rejected)
-         (struct-out password-rejected)
-         (struct-out not-ready-for-transaction)
-         (struct-out not-given-headers)
-         (struct-out illegal-message-number)
-         (struct-out cannot-delete-message)
-         (struct-out disconnect-not-quiet)
-         (struct-out malformed-server-response))
-
-;; sender : oport
-;; receiver : iport
-;; server : string
-;; port : number
-;; state : symbol = (disconnected, authorization, transaction)
-
-(define-struct communicator (sender receiver server port [state #:mutable]))
-
-(define-struct (pop3 exn) ())
-(define-struct (cannot-connect pop3) ())
-(define-struct (username-rejected pop3) ())
-(define-struct (password-rejected pop3) ())
-(define-struct (not-ready-for-transaction pop3) (communicator))
-(define-struct (not-given-headers pop3) (communicator message))
-(define-struct (illegal-message-number pop3) (communicator message))
-(define-struct (cannot-delete-message exn) (communicator message))
-(define-struct (disconnect-not-quiet pop3) (communicator))
-(define-struct (malformed-server-response pop3) (communicator))
-
-;; signal-error :
-;; (exn-args ... -> exn) x format-string x values ... ->
-;;   exn-args -> ()
-
-(define (signal-error constructor format-string . args)
-  (lambda exn-args
-    (raise (apply constructor
-                  (apply format format-string args)
-                  (current-continuation-marks)
-                  exn-args))))
-
-;; signal-malformed-response-error :
-;; exn-args -> ()
-
-;; -- in practice, it takes only one argument: a communicator.
-
-(define signal-malformed-response-error
-  (signal-error make-malformed-server-response
-                "malformed response from server"))
-
-;; confirm-transaction-mode :
-;; communicator x string -> ()
-
-;; -- signals an error otherwise.
-
-(define (confirm-transaction-mode communicator error-message)
-  (unless (eq? (communicator-state communicator) 'transaction)
-    ((signal-error make-not-ready-for-transaction error-message)
-     communicator)))
-
-;; default-pop-port-number :
-;; number
-
-(define default-pop-port-number 110)
-
-(define-struct server-responses ())
-(define-struct (+ok server-responses) ())
-(define-struct (-err server-responses) ())
-
-;; connect-to-server*:
-;; input-port output-port -> communicator
-
-(define connect-to-server*
-  (case-lambda
-   [(receiver sender) (connect-to-server* receiver sender "unspecified" "unspecified")]
-   [(receiver sender server-name port-number)
-    (let ([communicator (make-communicator sender receiver server-name port-number
-                                           'authorization)])
-      (let ([response (get-status-response/basic communicator)])
-        (cond
-         [(+ok? response) communicator]
-         [(-err? response)
-          ((signal-error make-cannot-connect
-                         "cannot connect to ~a on port ~a"
-                         server-name port-number))])))]))
-
-;; connect-to-server :
-;; string [x number] -> communicator
-
-(define connect-to-server
-  (lambda (server-name (port-number default-pop-port-number))
-    (let-values ([(receiver sender) (tcp-connect server-name port-number)])
-      (connect-to-server* receiver sender server-name port-number))))
-
-;; authenticate/plain-text :
-;; string x string x communicator -> ()
-
-;; -- if authentication succeeds, sets the communicator's state to
-;; transaction.
-
-(define (authenticate/plain-text username password communicator)
-  (let ([sender (communicator-sender communicator)])
-    (send-to-server communicator "USER ~a" username)
-    (let ([status (get-status-response/basic communicator)])
-      (cond
-       [(+ok? status)
-        (send-to-server communicator "PASS ~a" password)
-        (let ([status (get-status-response/basic communicator)])
-          (cond
-           [(+ok? status)
-            (set-communicator-state! communicator 'transaction)]
-           [(-err? status)
-            ((signal-error make-password-rejected
-                           "password was rejected"))]))]
-       [(-err? status)
-        ((signal-error make-username-rejected
-                       "username was rejected"))]))))
-
-;; get-mailbox-status :
-;; communicator -> number x number
-
-;; -- returns number of messages and number of octets.
-
-(define (get-mailbox-status communicator)
-  (confirm-transaction-mode
-   communicator
-   "cannot get mailbox status unless in transaction mode")
-  (send-to-server communicator "STAT")
-  (apply values
-         (map string->number
-              (let-values ([(status result)
-                            (get-status-response/match
-                             communicator
-                             #rx"([0-9]+) ([0-9]+)"
-                             #f)])
-                result))))
-
-;; get-message/complete :
-;; communicator x number -> list (string) x list (string)
-
-(define (get-message/complete communicator message)
-  (confirm-transaction-mode
-   communicator
-   "cannot get message headers unless in transaction state")
-  (send-to-server communicator "RETR ~a" message)
-  (let ([status (get-status-response/basic communicator)])
-    (cond
-     [(+ok? status)
-      (split-header/body (get-multi-line-response communicator))]
-     [(-err? status)
-      ((signal-error make-illegal-message-number
-                     "not given message ~a" message)
-       communicator message)])))
-
-;; get-message/headers :
-;; communicator x number -> list (string)
-
-(define (get-message/headers communicator message)
-  (confirm-transaction-mode
-   communicator
-   "cannot get message headers unless in transaction state")
-  (send-to-server communicator "TOP ~a 0" message)
-  (let ([status (get-status-response/basic communicator)])
-    (cond
-     [(+ok? status)
-      (let-values ([(headers body)
-                    (split-header/body
-                     (get-multi-line-response communicator))])
-        headers)]
-     [(-err? status)
-      ((signal-error make-not-given-headers
-                     "not given headers to message ~a" message)
-       communicator message)])))
-
-;; get-message/body :
-;; communicator x number -> list (string)
-
-(define (get-message/body communicator message)
-  (let-values ([(headers body) (get-message/complete communicator message)])
-    body))
-
-;; split-header/body :
-;; list (string) -> list (string) x list (string)
-
-;; -- returns list of headers and list of body lines.
-
-(define (split-header/body lines)
-  (let loop ([lines lines] [header null])
-    (if (null? lines)
-        (values (reverse header) null)
-        (let ([first (car lines)]
-              [rest (cdr lines)])
-          (if (string=? first "")
-              (values (reverse header) rest)
-              (loop rest (cons first header)))))))
-
-;; delete-message :
-;; communicator x number -> ()
-
-(define (delete-message communicator message)
-  (confirm-transaction-mode
-   communicator
-   "cannot delete message unless in transaction state")
-  (send-to-server communicator "DELE ~a" message)
-  (let ([status (get-status-response/basic communicator)])
-    (cond
-     [(-err? status)
-      ((signal-error make-cannot-delete-message
-                     "no message numbered ~a available to be deleted" message)
-       communicator message)]
-     [(+ok? status)
-      'deleted])))
-
-;; regexp for UIDL responses
-
-(define uidl-regexp #rx"([0-9]+) (.*)")
-
-;; get-unique-id/single :
-;; communicator x number -> string
-
-(define (get-unique-id/single communicator message)
-  (confirm-transaction-mode
-   communicator
-   "cannot get unique message id unless in transaction state")
-  (send-to-server communicator "UIDL ~a" message)
-  (let-values ([(status result)
-                (get-status-response/match communicator uidl-regexp ".*")])
-    ;; The server response is of the form
-    ;; +OK 2 QhdPYR:00WBw1Ph7x7
-    (cond
-     [(-err? status)
-      ((signal-error make-illegal-message-number
-                     "no message numbered ~a available for unique id" message)
-       communicator message)]
-     [(+ok? status)
-      (cadr result)])))
-
-;; get-unique-id/all :
-;; communicator -> list(number x string)
-
-(define (get-unique-id/all communicator)
-  (confirm-transaction-mode communicator
-                            "cannot get unique message ids unless in transaction state")
-  (send-to-server communicator "UIDL")
-  (let ([status (get-status-response/basic communicator)])
-    ;; The server response is of the form
-    ;; +OK
-    ;; 1 whqtswO00WBw418f9t5JxYwZ
-    ;; 2 QhdPYR:00WBw1Ph7x7
-    ;; .
-    (map (lambda (l)
-           (let ([m (regexp-match uidl-regexp l)])
-             (cons (string->number (cadr m)) (caddr m))))
-         (get-multi-line-response communicator))))
-
-;; close-communicator :
-;; communicator -> ()
-
-(define (close-communicator communicator)
-  (close-input-port (communicator-receiver communicator))
-  (close-output-port (communicator-sender communicator)))
-
-;; disconnect-from-server :
-;; communicator -> ()
-
-(define (disconnect-from-server communicator)
-  (send-to-server communicator "QUIT")
-  (set-communicator-state! communicator 'disconnected)
-  (let ([response (get-status-response/basic communicator)])
-    (close-communicator communicator)
-    (cond
-     [(+ok? response) (void)]
-     [(-err? response)
-      ((signal-error make-disconnect-not-quiet
-                     "got error status upon disconnect")
-       communicator)])))
-
-;; send-to-server :
-;; communicator x format-string x list (values) -> ()
-
-(define (send-to-server communicator message-template . rest)
-  (apply fprintf (communicator-sender communicator)
-         (string-append message-template "\r\n")
-         rest)
-  (flush-output (communicator-sender communicator)))
-
-;; get-one-line-from-server :
-;; iport -> string
-
-(define (get-one-line-from-server server->client-port)
-  (read-line server->client-port 'return-linefeed))
-
-;; get-server-status-response :
-;; communicator -> server-responses x string
-
-;; -- provides the low-level functionality of checking for +OK
-;; and -ERR, returning an appropriate structure, and returning the
-;; rest of the status response as a string to be used for further
-;; parsing, if necessary.
-
-(define (get-server-status-response communicator)
-  (let* ([receiver (communicator-receiver communicator)]
-         [status-line (get-one-line-from-server receiver)]
-         [r (regexp-match #rx"^\\+OK(.*)" status-line)])
-    (if r
-        (values (make-+ok) (cadr r))
-        (let ([r (regexp-match #rx"^\\-ERR(.*)" status-line)])
-          (if r
-              (values (make--err) (cadr r))
-              (signal-malformed-response-error communicator))))))
-
-;; get-status-response/basic :
-;; communicator -> server-responses
-
-;; -- when the only thing to determine is whether the response
-;; was +OK or -ERR.
-
-(define (get-status-response/basic communicator)
-  (let-values ([(response rest)
-                (get-server-status-response communicator)])
-    response))
-
-;; get-status-response/match :
-;; communicator x regexp x regexp -> (status x list (string))
-
-;; -- when further parsing of the status response is necessary.
-;; Strips off the car of response from regexp-match.
-
-(define (get-status-response/match communicator +regexp -regexp)
-  (let-values ([(response rest)
-                (get-server-status-response communicator)])
-    (if (and +regexp (+ok? response))
-        (let ([r (regexp-match +regexp rest)])
-          (if r (values response (cdr r))
-              (signal-malformed-response-error communicator)))
-        (if (and -regexp (-err? response))
-            (let ([r (regexp-match -regexp rest)])
-              (if r (values response (cdr r))
-                  (signal-malformed-response-error communicator)))
-            (signal-malformed-response-error communicator)))))
-
-;; get-multi-line-response :
-;; communicator -> list (string)
-
-(define (get-multi-line-response communicator)
-  (let ([receiver (communicator-receiver communicator)])
-    (let loop ()
-      (let ([l (get-one-line-from-server receiver)])
-        (cond
-         [(eof-object? l)
-          (signal-malformed-response-error communicator)]
-         [(string=? l ".")
-          '()]
-         [(and (> (string-length l) 1)
-               (char=? (string-ref l 0) #\.))
-          (cons (substring l 1 (string-length l)) (loop))]
-         [else
-          (cons l (loop))])))))
-
-;; make-desired-header :
-;; string -> desired
-
-(define (make-desired-header raw-header)
-  (regexp
-   (string-append
-    "^"
-    (list->string
-     (apply append
-            (map (lambda (c)
-                   (cond
-                    [(char-lower-case? c)
-                     (list #\[ (char-upcase c) c #\])]
-                    [(char-upper-case? c)
-                     (list #\[ c (char-downcase c) #\])]
-                    [else
-                     (list c)]))
-                 (string->list raw-header))))
-    ":")))
-
-;; extract-desired-headers :
-;; list (string) x list (desired) -> list (string)
-
-(define (extract-desired-headers headers desireds)
-  (let loop ([headers headers])
-    (if (null? headers) null
-        (let ([first (car headers)]
-              [rest (cdr headers)])
-          (if (ormap (lambda (matcher)
-                       (regexp-match matcher first))
-                     desireds)
-              (cons first (loop rest))
-              (loop rest))))))
diff --git a/pkgs/net-pkgs/net-lib/net/private/ip.rkt b/pkgs/net-pkgs/net-lib/net/private/ip.rkt
deleted file mode 100644
index 2aee90a576..0000000000
--- a/pkgs/net-pkgs/net-lib/net/private/ip.rkt
+++ /dev/null
@@ -1,219 +0,0 @@
-#lang racket/base
-
-;; A library for manipulating IP Addresses
-
-(require racket/bool
-         racket/contract
-         racket/format
-         racket/list
-         racket/match
-         racket/string
-         unstable/sequence)
-
-(provide
-  (contract-out
-    ;; check if a given value is an IP address
-    [ip-address? (-> any/c boolean?)]
-
-    ;; check if a given string is a valid representation of an IP address
-    [ip-address-string? (-> any/c boolean?)]
-
-    ;; construct an IP address from various inputs
-    [make-ip-address
-     (-> (or/c ip-address-string?
-               (bytes-of-length 4)
-               (bytes-of-length 16))
-         ip-address?)]
-
-    ;; construct a string representation of the address
-    [ip-address->string (-> ip-address? string?)]
-
-    ;; return a byte string representation of the address
-    [ip-address->bytes (-> ip-address? bytes?)]
-
-    (struct ipv4 ([bytes (bytes-of-length 4)]))
-    (struct ipv6 ([bytes (bytes-of-length 16)]))))
-
-;; data definitions
-
-;; An IPAddress is one of
-;;   (ipv4 4Bytes)
-;;   (ipv6 16Bytes)
-;;
-;; interp. an IPv4 address represented as four bytes
-;;         an IPv6 address represented as sixteen bytes
-
-(define (ip-address? x) (or (ipv4? x) (ipv6? x)))
-
-(struct ipv4 (bytes)
-        #:transparent
-        #:guard (λ (bytes _) (bytes->immutable-bytes bytes))
-        #:methods gen:equal+hash
-        [(define (equal-proc addr1 addr2 rec)
-           (equal? (ipv4-bytes addr1) (ipv4-bytes addr2)))
-         (define (hash-proc addr rec) (rec (ipv4-bytes addr)))
-         (define (hash2-proc addr rec) (rec (ipv4-bytes addr)))])
-
-(struct ipv6 (bytes)
-        #:transparent
-        #:guard (λ (bytes _) (bytes->immutable-bytes bytes))
-        #:methods gen:equal+hash
-        [(define (equal-proc addr1 addr2 rec)
-           (equal? (ipv6-bytes addr1) (ipv6-bytes addr2)))
-         (define (hash-proc addr rec) (rec (ipv6-bytes addr)))
-         (define (hash2-proc addr rec) (rec (ipv6-bytes addr)))])
-
-(define (make-ip-address input)
-  (match input
-    ;; TODO: make more efficient by not double checking
-    [(? ipv4-string?) (ipv4 (ipv4-string->bytes input))]
-    [(? ipv6-string?) (ipv6 (ipv6-string->bytes input))]
-    [(? (bytes-of-length 4)) (ipv4 input)]
-    [(? (bytes-of-length 16)) (ipv6 input)]))
-
-(define (ip-address-string? val)
-  (and (string? val)
-       (or (ipv4-string? val)
-           (ipv6-string? val))))
-
-;; String -> Boolean
-;; Check if the input string represents an IPv4 address
-(define (ipv4-string? str)
-  ;; String -> Boolean
-  ;; check if the given string has leading zeroes
-  (define (has-leading-zeroes? str)
-    (and (> (string-length str) 1)
-         (char=? (string-ref str 0) #\0)))
-  (define matches
-    (regexp-match #px"^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$"
-                  str))
-  (and matches
-       (= (length matches) 5)
-       ;; check that each octet field is an octet
-       (andmap byte? (map string->number (cdr matches)))
-       ;; leading zeroes lead to query errors
-       (not (ormap has-leading-zeroes? (cdr matches)))))
-
-;; String -> Boolean
-;; Check if the input string represents an IPv6 address
-;; TODO: support dotted quad notation
-(define (ipv6-string? str)
-  (define re-::/: #px"^([0-9a-fA-F]{1,4})(::|:)")
-  (define re-:: #px"^()(::)")
-  (define re-: #px"^([0-9a-fA-F]{1,4})(:)")
-  (define re-end #px"^[0-9a-fA-F]{1,4}$")
-  (or (regexp-match? #px"^::$" str) ; special case
-      (let loop ([octet-pairs '()]  ; keep octet-pairs to count
-                 [::? #f]           ; seen a :: in the string yet?
-                 [str str])
-        ;; match digit groups and a separator
-        (define matches
-          (if ::?
-              (regexp-match re-: str)
-              (or (regexp-match re-:: str)
-                  (regexp-match re-::/: str))))
-        (cond [matches
-               (match-define (list match digits sep) matches)
-               (define rest (substring str (string-length match)))
-               ;; we need to make sure there is only one :: at most
-               (if (or ::? (string=? sep "::"))
-                   (loop (cons digits octet-pairs) #t rest)
-                   (loop (cons digits octet-pairs) #f rest))]
-              [else
-               (and ;; if there isn't a ::, we need 7+1 octet-pairs
-                    (implies (not ::?) (= (length octet-pairs) 7))
-                    ;; this is the +1 octet pair
-                    (regexp-match? re-end str))]))))
-
-;; String -> Bytes
-;; converts a string representating an IPv4 address to bytes
-(define (ipv4-string->bytes ip)
-  (let ([result (regexp-match #rx"^([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+)$"
-                              ip)])
-    (bytes (string->number (list-ref result 1))
-           (string->number (list-ref result 2))
-           (string->number (list-ref result 3))
-           (string->number (list-ref result 4)))))
-
-;; String -> Bytes
-;; converts a string representing an IPv6 address to bytes
-(define (ipv6-string->bytes ip)
-  ;; String -> Bytes of length 2
-  ;; turn a string of two octets and write two bytes
-  (define (octet-pair-string->bytes two-octs)
-    (define n (string->number two-octs 16))
-    (define byte1 (arithmetic-shift (bitwise-and #xff00 n) -8))
-    (define byte2 (bitwise-and #x00ff n))
-    (bytes byte1 byte2))
-
-  (define has-::? (regexp-match? #rx"::" ip))
-  (define splitted (regexp-split #rx":" ip))
-  (define not-empty-str (filter (λ (s) (not (string=? "" s))) splitted))
-  (define pad-amount (* 2 (- 8 (length not-empty-str))))
-  (let loop ([result #""] [splitted splitted])
-    (cond [(empty? splitted) result]
-          [(string=? (car splitted) "")
-           (loop (bytes-append result (make-bytes pad-amount 0))
-                 (remove* '("") (cdr splitted)))]
-          [else
-           (loop (bytes-append result (octet-pair-string->bytes (car splitted)))
-                 (cdr splitted))])))
-
-;; IPAddress -> Bytestring
-;; Turn an ip struct into a byte string
-(define (ip-address->bytes ip)
-  (match ip
-    [(? ipv4?) (ipv4-bytes ip)]
-    [(? ipv6?) (ipv6-bytes ip)]))
-
-;; IPAddress -> String
-;; Convert an IP address to a string
-(define (ip-address->string ip)
-  (match ip
-    [(? ipv4?) (ipv4->string (ipv4-bytes ip))]
-    [(? ipv6?) (ipv6->string (ipv6-bytes ip))]))
-
-;; Bytes -> String
-;; Convert a bytestring for an IPv4 address to a string
-(define (ipv4->string bytes)
-  (string-join (for/list ([b (in-bytes bytes)]) (~r b)) "."))
-
-;; Bytes -> String
-;; Convert a bytestring representing an IPv6 address to a string
-(define (ipv6->string bytes)
-  (define two-octets
-    (for/list ([oct-pair (in-slice 2 (in-bytes bytes))])
-      (define oct1 (car oct-pair))
-      (define oct2 (cadr oct-pair))
-      (+ (arithmetic-shift oct1 8) oct2)))
-  (define compressed (compress two-octets))
-  ;; add an extra "" if :: is at the start
-  (define compressed-strs
-    (for/list ([elem (in-list compressed)])
-      (if (eq? elem '::)
-          "" ; string-join will turn this into ::
-          (~r elem #:base 16))))
-  (define compressed-strs*
-    (if (string=? (car compressed-strs) "")
-        (cons "" compressed-strs)
-        compressed-strs))
-  (string-join compressed-strs* ":"))
-
-;; (Listof Number) -> (Listof (U Number '::))
-;; Compress an IPv6 address to its shortest representation
-(define (compress lon)
-  (let loop ([acc '()] [lon lon])
-    (cond [(empty? lon) (reverse acc)]
-          [else
-           (define zeroes
-             (for/list ([n (in-list lon)] #:break (not (zero? n))) n))
-           (define num-zs (length zeroes))
-           (if (<= num-zs 1)
-               (loop (cons (car lon) acc) (cdr lon))
-               (append (reverse acc) '(::) (drop lon num-zs)))])))
-
-;; contract helper
-(define (bytes-of-length n)
-  (flat-named-contract
-    `(bytes-of-length ,n)
-    (λ (bs) (and (bytes? bs) (= (bytes-length bs) n)))))
diff --git a/pkgs/net-pkgs/net-lib/net/private/rbtree.rkt b/pkgs/net-pkgs/net-lib/net/private/rbtree.rkt
deleted file mode 100644
index e7621670cb..0000000000
--- a/pkgs/net-pkgs/net-lib/net/private/rbtree.rkt
+++ /dev/null
@@ -1,378 +0,0 @@
-#lang racket/base
-
-;; Two variants of red-black trees.
-
-;; In the expunge variant, each node stores the count of nodes in its
-;; left branch. A nodes' value corresponds to a pre-delete index, and
-;; subtracting the right-branch count produces a post-delete index
-;; (i.e., as if all deleteions for earlier pre-delete indices happened
-;; first).  Inserting into the tree provides a post-delete index, so
-;; the insert must use the left-branch count to compare the node's
-;; pre-delete index to the given post-delete index. Rotations to
-;; maintain the red-black property can locally update the left-branch
-;; count stored in the rotated nodes. It's not possible to insert the
-;; same pre-delete index twice, since insertion uses the post-delete
-;; index.
-
-;; In the fetch variant, each node's value is a list, where the first
-;; number in the list is the key. But for a right branch, all keys are
-;; decremented by the node's key (recursively). This allows a ln-time
-;; shift operation when a message is expunged.
-
-(provide new-tree tree-empty?
-         expunge-insert! expunge-tree->list
-         fetch-insert! fetch-find fetch-delete! fetch-shift! fetch-tree->list)
-
-(define-struct tree (v red? left-count left right parent)
-  #:mutable #:transparent)
-
-(define (new-tree)
-  (make-tree 'pre-root #f 0 #f #f #f))
-
-(define (tree-empty? t)
-  (not (tree-left t)))
-
-(define (k+ a b)
-  (cons (+ (car a) (if (number? b) b (car b)))
-        (cdr a)))
-(define (k- a b)
-  (cons (- (car a) (if (number? b) b (car b)))
-        (cdr a)))
-(define kv car)
-
-(define (mk-insert sort-to-left? sort=? right+
-                   left-insert-adjust!
-                   left-rotate-adjust! right-rotate-adjust!)
-  (define-values (rotate-left! rotate-right!)
-    (let ([mk
-           (lambda (tree-west tree-east set-tree-west! set-tree-east! adj-count!)
-             (lambda (t)
-               (let ([old-east (tree-east t)])
-                 (let ([r (tree-west old-east)])
-                   (set-tree-east! t r)
-                   (when r (set-tree-parent! r t)))
-                 (let ([p (tree-parent t)])
-                   (set-tree-parent! old-east p)
-                   (if (eq? t (tree-left p))
-                     (set-tree-left! p old-east)
-                     (set-tree-right! p old-east)))
-                 (set-tree-west! old-east t)
-                 (set-tree-parent! t old-east)
-                 (adj-count! t old-east))))])
-      (values (mk tree-left tree-right set-tree-left! set-tree-right!
-                  left-rotate-adjust!)
-              (mk tree-right tree-left set-tree-right! set-tree-left!
-                  right-rotate-adjust!))))
-
-  (values
-   ;; insert
-   (lambda (pre-root n)
-     (let ([new
-            ;; Insert:
-            (let loop ([t (tree-left pre-root)]
-                       [n n]
-                       [parent pre-root]
-                       [set-child! (lambda (t v)
-                                     (set-tree-left! pre-root v))])
-              (cond
-                [(not t) (let ([new (make-tree n #t 0 #f #f parent)])
-                           (set-child! parent new)
-                           new)]
-                [(sort=? n t)
-                 (set-tree-v! t n)
-                 pre-root]
-                [(sort-to-left? n t)
-                 (left-insert-adjust! t)
-                 (loop (tree-left t) n t set-tree-left!)]
-                [else
-                 (loop (tree-right t) (right+ n t) t set-tree-right!)]))])
-       ;; Restore red-black property:
-       (let loop ([v new])
-         (let ([p (tree-parent v)])
-           (when (and p (tree-red? p))
-             (let ([gp (tree-parent p)])
-               (let-values ([(tree-west tree-east rotate-west! rotate-east!)
-                             (if (eq? p (tree-left gp))
-                               (values tree-left tree-right rotate-left! rotate-right!)
-                               (values tree-right tree-left rotate-right! rotate-left!))])
-                 (let ([uncle (tree-east (tree-parent p))])
-                   (if (and uncle (tree-red? uncle))
-                     (begin
-                       (set-tree-red?! p #f)
-                       (set-tree-red?! uncle #f)
-                       (set-tree-red?! gp #t)
-                       (loop gp))
-                     (let ([finish (lambda (v)
-                                     (let* ([p (tree-parent v)]
-                                            [gp (tree-parent p)])
-                                       (set-tree-red?! p #f)
-                                       (set-tree-red?! gp #t)
-                                       (rotate-east! gp)
-                                       (loop gp)))])
-                       (if (eq? v (tree-east p))
-                         (begin (rotate-west! p) (finish p))
-                         (finish v))))))))))
-       (set-tree-red?! (tree-left pre-root) #f)))
-
-   ;; delete (fetch only)
-   (lambda (pre-root n)
-     (let ([orig-t (fetch-find-node pre-root n)])
-       (when orig-t
-         ;; Delete note t if it has at most one child.
-         ;; Otherwise, move a leaf's data to here, and
-         ;; delete the leaf.
-         (let ([t (if (and (tree-left orig-t)
-                           (tree-right orig-t))
-                    (let loop ([t (tree-right orig-t)])
-                      (if (tree-left t)
-                        (loop (tree-left t))
-                        t))
-                    orig-t)])
-           (unless (eq? t orig-t)
-             ;; Swap out:
-             (let ([delta (kv (tree-v t))])
-               (set-tree-v! orig-t (k+ (tree-v t) (tree-v orig-t)))
-               (let loop ([c (tree-right orig-t)])
-                 (when c
-                   (set-tree-v! c (k- (tree-v c) delta))
-                   (loop (tree-left c))))))
-           ;; Now we can delete t:
-           (let ([child-t (or (tree-left t) (tree-right t))]
-                 [p (tree-parent t)])
-             (when child-t
-               (set-tree-parent! child-t p)
-               ;; Adjust relative index of left spine of the
-               ;;  right branch (in the case that there was only
-               ;;  a right branch)
-               (let loop ([c (tree-right t)])
-                 (when c
-                   (set-tree-v! c (k+ (tree-v c) (tree-v t)))
-                   (loop (tree-left c)))))
-             (if (eq? (tree-left p) t)
-               (set-tree-left! p child-t)
-               (set-tree-right! p child-t))
-             ;; Restore red-black property:
-             (when (not (tree-red? t))
-               (let loop ([c child-t] [p p])
-                 (cond
-                   [(and c (tree-red? c)) (set-tree-red?! c #f)]
-                   [(tree-parent p)
-                    (let-values ([(tree-west tree-east rotate-west! rotate-east!)
-                                  (if (eq? c (tree-left p))
-                                    (values tree-left tree-right rotate-left! rotate-right!)
-                                    (values tree-right tree-left rotate-right! rotate-left!))])
-                      (let ([sibling (tree-east p)])
-                        (let ([z (if (tree-red? sibling)
-                                   (begin
-                                     (set-tree-red?! sibling #f)
-                                     (set-tree-red?! p #t)
-                                     (rotate-west! p)
-                                     (tree-east p))
-                                   sibling)])
-                          (if (not (or (and (tree-west z)
-                                            (tree-red? (tree-west z)))
-                                       (and (tree-east z)
-                                            (tree-red? (tree-east z)))))
-                            (begin
-                              (set-tree-red?! z #t)
-                              (loop p (tree-parent p)))
-                            (let ([w (if (not (and (tree-east z)
-                                                   (tree-red? (tree-east z))))
-                                       (begin
-                                         (set-tree-red?! (tree-west z) #f)
-                                         (set-tree-red?! z #t)
-                                         (rotate-east! z)
-                                         (tree-east p))
-                                       z)])
-                              (set-tree-red?! w (tree-red? p))
-                              (set-tree-red?! p #f)
-                              (set-tree-red?! (tree-east w) #f)
-                              (rotate-west! p))))))]))))))))))
-
-(define-values (expunge-insert! ---)
-  (mk-insert
-   ;; sort-to-left?
-   (lambda (n t)
-     ((+ n (tree-left-count t)) . < . (tree-v t)))
-   ;; sort=?
-   (lambda (n t) #f)
-   ;; right+
-   (lambda (n t)
-     (+ n 1 (tree-left-count t)))
-   ;; left-insert-adjust!
-   (lambda (t)
-     (set-tree-left-count! t (add1 (tree-left-count t))))
-   ;; left-rotate-adjust!
-   (lambda (t old-right)
-     (set-tree-left-count! old-right (+ 1
-                                        (tree-left-count old-right)
-                                        (tree-left-count t))))
-   ;; right-rotate-adjust!
-   (lambda (t old-left)
-     (set-tree-left-count! t (- (tree-left-count t)
-                                (tree-left-count old-left)
-                                1)))))
-
-(define-values (fetch-insert! fetch-delete!)
-  (mk-insert
-   ;; sort-to-left?
-   (lambda (n t)
-     ((kv n) . < . (kv (tree-v t))))
-   ;; sort=?
-   (lambda (n t)
-     (= (kv n) (kv (tree-v t))))
-   ;; right+
-   (lambda (n t)
-     (k- n (tree-v t)))
-   ;; left-insert-adjust!
-   void
-   ;; left-rotate-adjust!
-   (lambda (t old-right)
-     (set-tree-v! old-right (k+ (tree-v old-right)
-                                (tree-v t))))
-   ;; right-rotate-adjust!
-   (lambda (t old-left)
-     (set-tree-v! t (k- (tree-v t)
-                        (tree-v old-left))))))
-
-(define (expunge-tree->list pre-root)
-  (let loop ([t (tree-left pre-root)])
-    (if t
-      (append (loop (tree-left t))
-              (list (tree-v t))
-              (loop (tree-right t)))
-      null)))
-
-(define (fetch-find-node pre-root n)
-  (let loop ([t (tree-left pre-root)] [n n])
-    (and t
-         (cond
-           [(= n (kv (tree-v t))) t]
-           [(< n (kv (tree-v t))) (loop (tree-left t) n)]
-           [else (loop (tree-right t) (- n (kv (tree-v t))))]))))
-
-(define (fetch-find pre-root n)
-  (let ([t (fetch-find-node pre-root n)])
-    (and t (tree-v t))))
-
-(define (fetch-shift! pre-root n)
-  (fetch-delete! pre-root n)
-  (let loop ([t (tree-left pre-root)] [n n])
-    (when t
-      (if (n . < . (kv (tree-v t)))
-        (begin (set-tree-v! t (k- (tree-v t) 1))
-               (loop (tree-left t) n))
-        (loop (tree-right t)
-              (- n (kv (tree-v t))))))))
-
-(define (fetch-tree->list pre-root)
-  (let loop ([t (tree-left pre-root)][d 0])
-    (if t
-      (append (loop (tree-left t) d)
-              (list (k+ (tree-v t) d))
-              (loop (tree-right t) (+ d (kv (tree-v t)))))
-      null)))
-
-
-(module+ test
-  (require racket/pretty)
-  (print-struct #t)
-
-  (define t (new-tree))
-
-  (define (test n v)
-    (expunge-insert! t n)
-    (unless (equal? (expunge-tree->list t) v)
-      (error 'bad "~s != ~s" (expunge-tree->list t) v)))
-
-  (test 12 '(12))
-  (test 8 '(8 12))
-  (test 1 '(1 8 12))
-
-  (set! t (new-tree))
-
-  (test 10 '(10))
-  (test 8 '(8 10))
-  (test 10 '(8 10 12))
-  (test 8 '(8 9 10 12))
-  (test 8 '(8 9 10 11 12))
-  (test 100 '(8 9 10 11 12 105))
-  (test 1 '(1 8 9 10 11 12 105))
-  (test 105 '(1 8 9 10 11 12 105 112))
-  (test 99 '(1 8 9 10 11 12 105 106 112))
-  (test 2 '(1 3 8 9 10 11 12 105 106 112))
-  (test 6 '(1 3 8 9 10 11 12 13 105 106 112))
-  (test 5 '(1 3 7 8 9 10 11 12 13 105 106 112))
-  (test 15 '(1 3 7 8 9 10 11 12 13 24 105 106 112))
-  (test 15 '(1 3 7 8 9 10 11 12 13 24 25 105 106 112))
-  (test 15 '(1 3 7 8 9 10 11 12 13 24 25 26 105 106 112))
-
-  (set! t (new-tree))
-
-  (define (test2 n v)
-    (cond
-     [(< n 0) (fetch-delete! t (- n))]
-     [(inexact? n) (fetch-shift! t (inexact->exact n))]
-     [else (fetch-insert! t (list n))])
-    ;; (printf "Check ~a\n" v)
-    (let ([v (map list v)])
-      (unless (equal? (fetch-tree->list t) v)
-        (error 'bad "~s != ~s" (fetch-tree->list t) v))))
-
-  (test2 10 '(10))
-  (test2 12 '(10 12))
-  (test2 8 '(8 10 12))
-  (test2 10 '(8 10 12))
-  (test2 -10 '(8 12))
-  (test2 -10 '(8 12))
-  (test2 10.0 '(8 11))
-  (test2 100.0 '(8 11))
-  (test2 5.0 '(7 10))
-  (test2 1 '(1 7 10))
-  (test2 2 '(1 2 7 10))
-  (test2 3 '(1 2 3 7 10))
-  (test2 4 '(1 2 3 4 7 10))
-  (test2 5 '(1 2 3 4 5 7 10))
-  (test2 6 '(1 2 3 4 5 6 7 10))
-  (test2 -6 '(1 2 3 4 5 7 10))
-  (test2 -5 '(1 2 3 4 7 10))
-  (test2 -4 '(1 2 3 7 10))
-  (test2 -3 '(1 2 7 10))
-  (test2 -2 '(1 7 10))
-  (test2 -7 '(1 10))
-  (test2 -1 '(10))
-  (test2 -10 '())
-
-  (define (in-all-positions n l)
-    (if (null? l)
-        (list (list n))
-        (cons
-         (cons n l)
-         (map (lambda (r) (cons (car l) r))
-              (in-all-positions n (cdr l))))))
-
-  (define (permutations l)
-    (if (or (null? l)
-            (null? (cdr l)))
-        (list l)
-        (apply
-         append
-         (map (lambda (lol)
-                (in-all-positions (car l) lol))
-              (permutations (cdr l))))))
-
-  (define perms (permutations '(1 2 3 4 5 6 7 8)))
-
-  (for-each (lambda (l)
-              (let ([t (new-tree)])
-                (for-each (lambda (i)
-                            (fetch-insert! t (list i)))
-                          l)
-                (unless (equal? (fetch-tree->list t) '((1) (2) (3) (4) (5) (6) (7) (8)))
-                  (error 'perms "bad: ~a" l))
-                (for-each (lambda (i)
-                            (fetch-delete! t i))
-                          l)
-                (unless (equal? (fetch-tree->list t) '())
-                  (error 'perms "remove bad: ~a" l))))
-            perms))
diff --git a/pkgs/net-pkgs/net-lib/net/qp.rkt b/pkgs/net-pkgs/net-lib/net/qp.rkt
deleted file mode 100644
index 779f6831c4..0000000000
--- a/pkgs/net-pkgs/net-lib/net/qp.rkt
+++ /dev/null
@@ -1,168 +0,0 @@
-;;;
-;;; <qp.rkt> ---- Quoted Printable Encoding/Decoding
-;;;
-;;; Copyright (C) 2002 by PLT.
-;;; Copyright (C) 2001 by Francisco Solsona.
-;;;
-;;; This file is part of mime-plt.
-
-;;; qp is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; qp is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with qp; if not, write to the Free Software
-;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-;;; 02110-1301 USA.
-
-;;; Author: Francisco Solsona <solsona@acm.org>
-;;
-;; Commentary:
-
-#lang racket/base
-
-(provide
- ;; -- exceptions raised --
- (struct-out qp-error)
- (struct-out qp-wrong-input)
- (struct-out qp-wrong-line-size)
-
- ;; -- qp methods --
- qp-encode
- qp-decode
- qp-encode-stream
- qp-decode-stream)
-
-;; Exceptions:
-;; String or input-port expected:
-(define-struct qp-error ())
-(define-struct (qp-wrong-input qp-error) ())
-(define-struct (qp-wrong-line-size qp-error) (size))
-
-;; qp-encode : bytes -> bytes
-;; returns the quoted printable representation of STR.
-(define (qp-encode str)
-  (let ([out (open-output-bytes)])
-    (qp-encode-stream (open-input-bytes str) out #"\r\n")
-    (get-output-bytes out)))
-
-;; qp-decode : string -> string
-;; returns STR unqp.
-(define (qp-decode str)
-  (let ([out (open-output-bytes)])
-    (qp-decode-stream (open-input-bytes str) out)
-    (get-output-bytes out)))
-
-(define (qp-decode-stream in out)
-  (let loop ([ch (read-byte in)])
-    (unless (eof-object? ch)
-      (case ch
-        [(61) ;; A "=", which is quoted-printable stuff
-         (let ([next (read-byte in)])
-           (cond
-             [(eq? next 10)
-              ;; Soft-newline -- drop it
-              (void)]
-             [(eq? next 13)
-              ;; Expect a newline for a soft CRLF...
-              (let ([next-next (read-byte in)])
-                (if (eq? next-next 10)
-                  ;; Good.
-                  (loop (read-byte in))
-                  ;; Not a LF? Well, ok.
-                  (loop next-next)))]
-             [(hex-digit? next)
-              (let ([next-next (read-byte in)])
-                (cond [(eof-object? next-next)
-                       (warning "Illegal qp sequence: `=~a'" next)
-                       (display "=" out)
-                       (display next out)]
-                      [(hex-digit? next-next)
-                       ;; qp-encoded
-                       (write-byte (hex-bytes->byte next next-next)
-                                   out)]
-                      [else
-                       (warning "Illegal qp sequence: `=~a~a'" next next-next)
-                       (write-byte 61 out)
-                       (write-byte next out)
-                       (write-byte next-next out)]))]
-             [else
-              ;; Warning: invalid
-              (warning "Illegal qp sequence: `=~a'" next)
-              (write-byte 61 out)
-              (write-byte next out)])
-           (loop (read-byte in)))]
-        [else
-         (write-byte ch out)
-         (loop (read-byte in))]))))
-
-(define (warning msg . args)
-  (when #f (eprintf "~a\n" (apply format msg args))))
-
-(define (hex-digit? i)
-  (vector-ref hex-values i))
-
-(define (hex-bytes->byte b1 b2)
-  (+ (* 16 (vector-ref hex-values b1))
-     (vector-ref hex-values b2)))
-
-(define (write-hex-bytes byte p)
-  (write-byte 61 p)
-  (write-byte (vector-ref hex-bytes (arithmetic-shift byte -4)) p)
-  (write-byte (vector-ref hex-bytes (bitwise-and byte 15)) p))
-
-(define (qp-encode-stream in out [newline-string #"\n"])
-  (let loop ([col 0])
-    (if (= col 75)
-      (begin
-        ;; Soft newline:
-        (write-byte 61 out)
-        (display newline-string out)
-        (loop 0))
-      (let ([i (read-byte in)])
-        (cond
-          [(eof-object? i) (void)]
-          [(or (= i 10) (= i 13))
-           (write-byte i out)
-           (loop 0)]
-          [(or (<= 33 i 60) (<= 62 i 126)
-               (and (or (= i 32) (= i 9))
-                    (not (let ([next (peek-byte in)])
-                           (or (eof-object? next) (= next 10) (= next 13))))))
-           ;; single-byte mode:
-           (write-byte i out)
-           (loop (add1 col))]
-          [(>= col 73)
-           ;; need a soft newline first
-           (write-byte 61 out)
-           (display newline-string out)
-           ;; now the octect
-           (write-hex-bytes i out)
-           (loop 3)]
-          [else
-           ;; an octect
-           (write-hex-bytes i out)
-           (loop (+ col 3))])))))
-
-;; Tables
-(define hex-values (make-vector 256 #f))
-(define hex-bytes (make-vector 16))
-(let loop ([i 0])
-  (unless (= i 10)
-    (vector-set! hex-values (+ i 48) i)
-    (vector-set! hex-bytes i (+ i 48))
-    (loop (add1 i))))
-(let loop ([i 0])
-  (unless (= i 6)
-    (vector-set! hex-values (+ i 65) (+ 10 i))
-    (vector-set! hex-values (+ i 97) (+ 10 i))
-    (vector-set! hex-bytes (+ 10 i) (+ i 65))
-    (loop (add1 i))))
-
-;;; qp.rkt ends here
diff --git a/pkgs/net-pkgs/net-lib/net/sendmail.rkt b/pkgs/net-pkgs/net-lib/net/sendmail.rkt
deleted file mode 100644
index 0cf3e6e02f..0000000000
--- a/pkgs/net-pkgs/net-lib/net/sendmail.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang racket/base
-
-(provide send-mail-message/port send-mail-message)
-
-(require net/unihead)
-
-(define sendmail-search-path
-  '("/usr/sbin" "/sbin" "/usr/local/sbin" "/usr/lib"))
-
-(define sendmail-program-file
-  (let ([exe (case (system-type)
-               [(windows) "sendmail.exe"]
-               [else "sendmail"])])
-    (or (for/or ([path (in-list sendmail-search-path)])
-          (define p (build-path path exe))
-          (and (file-exists? p)
-               (memq 'execute (file-or-directory-permissions p))
-               p))
-        (raise (make-exn:fail:unsupported
-                (format "unable to find a sendmail executable in ~s"
-                        sendmail-search-path)
-                (current-continuation-marks))))))
-
-;; Main implementation, returns a port
-(define (send-mail-core who sender subject TOs CCs BCCs headers)
-  (define qTOs  (map encode-for-header TOs))
-  (define qCCs  (map encode-for-header CCs))
-  (define qBCCs (map encode-for-header BCCs))
-  (define all-recipients (append qTOs qCCs qBCCs))
-  (when (null? all-recipients)
-    (error who "no mail recipients were specified"))
-  (define-values [p pout pin perr]
-    ;; use -i, so "." lines are not a problem
-    (apply subprocess #f #f #f sendmail-program-file "-i" all-recipients))
-  (close-input-port pout)
-  (close-input-port perr)
-  (port-count-lines! pin)
-  (fprintf pin "X-Mailer: Racket (racket-lang.org)\n")
-  (when sender (fprintf pin "From: ~a\n" (encode-for-header sender)))
-  (for ([header (in-list '("To" "CC"))]
-        [recipients (in-list (list qTOs qCCs))]
-        #:unless (null? recipients))
-    (fprintf pin "~a: ~a" header (car recipients))
-    (for ([recipient (in-list (cdr recipients))])
-      (define col (let-values ([(line col pos) (port-next-location pin)]) col))
-      (fprintf pin ",~a~a"
-               (if ((+ col 2 (string-length recipient)) . > . 78)
-                 "\n    " " ")
-               recipient))
-    (newline pin))
-  (fprintf pin "Subject: ~a\n" (encode-for-header subject))
-  (for ([h (in-list headers)]) (fprintf pin "~a\n" h))
-  (newline pin)
-  pin)
-
-;; send-mail-message/port:
-;;  String String (Listof String) (Listof String) (Listof String) String ...
-;;  -> Output-Port
-
-;; -- sender can be anything, though spoofing is not recommended.
-;; The recipients must all be valid email addresses, they're passed to
-;; sendmail as arguments -- and seems that it handles various name+email
-;; formats correctly.  Note that everything is expected to follow RFC
-;; conventions.  If any other headers are specified, they are expected
-;; to be completely formatted already.  Clients are urged to use
-;; close-output-port on the port returned by this procedure as soon as
-;; the necessary text has been written, so that the sendmail process can
-;; complete.
-(define (send-mail-message/port sender subject TOs CCs BCCs . headers)
-  (send-mail-core 'send-mail-message/port sender subject TOs CCs BCCs headers))
-
-;; send-mail-message :
-;; string x string x list (string) x list (string) x list (string) x
-;;   list (string) [x list (string)] -> ()
-(define (send-mail-message sender subject TOs CCs BCCs text . headers)
-  (define pin
-    (send-mail-core 'send-mail-message sender subject TOs CCs BCCs headers))
-  (for ([t (in-list text)]) (fprintf pin "~a\n" t))
-  (close-output-port pin))
diff --git a/pkgs/net-pkgs/net-lib/net/sendurl.rkt b/pkgs/net-pkgs/net-lib/net/sendurl.rkt
deleted file mode 100644
index cee936887a..0000000000
--- a/pkgs/net-pkgs/net-lib/net/sendurl.rkt
+++ /dev/null
@@ -1,255 +0,0 @@
-;; The main client of this module is browser/external.rkt
-;;   (others just use the (send-url url [new?]) interface.)
-
-#lang racket/base
-
-(require racket/system racket/file racket/promise racket/port)
-
-(provide send-url send-url/file send-url/contents
-         unix-browser-list browser-preference? external-browser)
-
-(define separate-by-default?
-  ;; internal configuration, 'browser-default lets some browsers decide
-  (get-preference 'new-browser-for-urls 
-                  (lambda () 'browser-default)
-                  #:timeout-lock-there (lambda (path) 'browser-default)))
-
-;; all possible unix browsers, filtered later to just existing executables
-;; order matters: the default will be the first of these that is found
-(define all-unix-browsers
-  '(;; common browsers
-    ;; xdg-open
-    firefox google-chrome galeon opera mozilla konqueror seamonkey epiphany
-    ;; known browsers
-    camino skipstone
-    ;; broken browsers (broken in that they won't work with plt-help)
-    ;; this is a configurable thing that is deprecated, but better
-    ;; than gnome-open (because it works)
-    htmlview
-    ;; gnome-open could be high, but the problem is that it doesn't
-    ;; handle file:// URLs with a query string.
-    gnome-open
-    ;; dillo does not have javascript
-    dillo
-    ;; ancient browsers
-    netscape mosaic
-    ))
-
-;; : any -> bool
-(define (custom-browser? x)
-  (and (pair? x) (string? (car x)) (string? (cdr x))))
-
-(define external-browser
-  (make-parameter
-   #f ; #f means "consult the preferences file"
-   (lambda (x)
-     (if (browser-preference? x)
-       x
-       (error 'external-browser "~e is not a valid browser preference" x)))))
-
-;; by-need filtering of found unix executables
-(define existing-unix-browsers->exes
-  (delay/sync
-    (filter values
-            (map (lambda (b)
-                   (let ([exe (find-executable-path (symbol->string b) #f)])
-                     (and exe (cons b exe))))
-                 all-unix-browsers))))
-(define existing-unix-browsers
-  (delay/sync (map car (force existing-unix-browsers->exes))))
-(define-syntax unix-browser-list
-  (syntax-id-rules (set!)
-    [(_ . xs) ((force existing-unix-browsers) . xs)]
-    [(set! _ . xs) (error 'unix-browser-list "cannot be mutated")]
-    [_ (force existing-unix-browsers)]))
-
-;; : any -> bool
-(define (browser-preference? x)
-  (or (not x) (memq x unix-browser-list) (custom-browser? x) (procedure? x)))
-
-;; like (system-type), but return the real OS for OSX with XonX
-;;  (could do the same for Cygwin, but it doesn't have shell-execute)
-(define systype
-  (delay/sync (let ([t (system-type)])
-                (cond [(not (eq? t 'unix)) t]
-                      [(regexp-match? #rx"-darwin($|/)"
-                                      (path->string (system-library-subpath)))
-                       'macosx]
-                      [else t]))))
-
-(define (%escape str)
-  (apply string-append
-         (map (lambda (b)
-                (string-append "%" (if (< b 16) "0" "") (number->string b 16)))
-              (bytes->list (string->bytes/utf-8 str)))))
-
-;; Used for quoting characters that will not work well in shell quotes, and
-;; only these characters.  This is only for protection when passing arguments
-;; to subprocesses, it's best to pass properly escaped urls to `send-url'.
-(define (escape-url url)
-  (regexp-replace* #px"(?:[^[:graph:]]|[$\"'`\\\\])" url %escape))
-
-;; send-url : str [bool] -> void
-(define (send-url url-str [separate-window? separate-by-default?]
-                  #:escape? [escape? #t])
-  (define stype (force systype))
-  (unless (string? url-str)
-    (error 'send-url "expected a string, got ~e" url-str))
-  (let ([url-str (if escape? (escape-url url-str) url-str)])
-    (if (procedure? (external-browser))
-      ((external-browser) url-str)
-      (case stype
-        [(macosx)  (send-url/mac url-str)]
-        [(windows) (send-url/win url-str)]
-        [(unix)    (send-url/unix url-str separate-window?)]
-        [else (error 'send-url
-                     "don't know how to open URL on platform: ~s" stype)])))
-  (void))
-
-(define (send-url/file path [separate-window? separate-by-default?]
-                       #:fragment [fragment #f] #:query [query #f])
-  (let* ([path (path->string (path->complete-path path))]
-         [path (if (eq? 'windows (force systype))
-                 ;; see http://msdn2.microsoft.com/en-us/library/ms775098.aspx
-                 (let* ([path (regexp-replace* #rx"\\\\" path "/")]
-                        [slashes (cdar (regexp-match-positions #rx"^/*" path))])
-                   (case slashes
-                     [(0) (string-append "/" path)]
-                     [(1) (error 'send-url/file
-                                 "unexpected path, please submit a bug: ~s"
-                                 path)]
-                     [else (substring path 2)]))
-                 path)]
-         [path (regexp-replace* #rx"[^A-Za-z0-9_./:-]" path %escape)]
-         [path (string-append "file://" path)]
-         [path (if query (string-append path "?" (escape-url query)) path)]
-         [path (if fragment (string-append path "#" (escape-url fragment))
-                   path)])
-    (send-url path separate-window? #:escape? #f)))
-
-;; See the documentation for the `delete-at' argument
-(define (send-url/contents contents [separate-window? separate-by-default?]
-                           #:fragment [fragment #f] #:query [query #f]
-                           #:delete-at [delete-at #f])
-  (define tmp-tmpl "plt-sendurl-contents-file-~a.html")
-  (define tmp-rx   #rx"^plt-sendurl-contents-file-.*\\.html$")
-  ;; The code below will often leave leftovers (for example, plt-help will quit
-  ;; before deletion happens), so every once in a while, do a cleanup.  This
-  ;; can also remove files that were created with no intention for deletion
-  ;; (when delete-at is #f), so don't remove files that are less than 15
-  ;; minutes old.
-  (when (zero? (random 5))
-    (parameterize ([current-directory (find-system-path 'temp-dir)])
-      (let ([now (current-seconds)])
-        (for ([file (directory-list)]
-              #:when (and (file-exists? file)
-                          (regexp-match tmp-rx (path-element->string file))
-                          (> (- now (file-or-directory-modify-seconds file))
-                             (* 15 60))))
-          ;; The temp directory may be shared with other users, so silently
-          ;; ignore failures to remove files.
-          (with-handlers ([void void]) (delete-file file))))))
-  (let ([temp (make-temporary-file tmp-tmpl)])
-    (with-output-to-file temp #:exists 'truncate
-      (lambda () (display contents)))
-    (when delete-at (thread (lambda () (sleep delete-at) (delete-file temp))))
-    (send-url/file temp)))
-
-(define osascript (delay/sync (find-executable-path "osascript" #f)))
-(define (send-url/mac url)
-  (browser-run (force osascript) "-e" (format "open location \"~a\"" url)))
-
-(define (send-url/unix url separate-window?)
-  ;; in cases where a browser was uninstalled, we might get a preference that
-  ;; is no longer valid, this will turn it back to #f
-  (define (try pref)
-    (if (symbol? pref)
-      (if (memq pref unix-browser-list) pref #f)
-      pref))
-  (define browser
-    (or (try (external-browser))
-        (try (get-preference 'external-browser))
-        ;; no preference -- chose the first one from the filtered list
-        (and (pair? unix-browser-list) (car unix-browser-list))))
-  (define exe
-    (cond [(assq browser (force existing-unix-browsers->exes)) => cdr]
-          [else #f]))
-  (define (simple) (browser-run exe url))
-  (define (w/arg a) (browser-run exe a url))
-  (define (try-remote)
-    (or (system* exe "-remote" (format "openURL(~a~a)" url
-                                       (if separate-window? ",new-window" "")))
-        (simple)))
-  (cond
-    [(not browser)
-     (error 'send-url "Couldn't find a browser to open URL: ~e" url)]
-    [(custom-browser? browser)
-     (browser-run #:shell #t (string-append (car browser) url (cdr browser)))]
-    ;; if it's a known browser, then it must be an existing one at this point
-    [(not exe) (error 'send-url "internal error")]
-    ;; if it's gone throw an error (refiltering will break assumptions of
-    ;; browser/external.rkt, and we really mimic the Win/Mac case where there
-    ;; should be some builtin facility that doesn't change)
-    [(not (file-exists? exe)) (error 'send-url "executable vanished: ~a" exe)]
-    ;; finally, deal with the actual browser process
-    [else
-     (case browser
-       [(xdg-open gnome-open firefox konqueror dillo htmlview google-chrome)
-        (simple)]
-       ;; don't really know how to run these
-       [(camino skipstone mosaic) (simple)]
-       [(galeon) (if (eq? 'browser-default separate-window?)
-                   (simple) (w/arg (if separate-window? "-w" "-x")))]
-       [(epiphany) (if separate-window? (w/arg "--new-window") (simple))]
-       [(mozilla seamonkey netscape) (try-remote)]
-       [(opera)
-        ;; opera starts a new browser automatically
-        (browser-run exe "-remote"
-                     (format "openURL(~a~a)"
-                             url (if separate-window? ",new-window" "")))]
-       [else (error 'send-url "internal error")])]))
-
-;; Windows has a bug when using `shell-execute' or when running `iexplore.exe'
-;; directly -- it silently drops the fragment and query from URLs that have
-;; them.  This is described at
-;;   http://support.microsoft.com/default.aspx/kb/942172
-;; It seems that the IE7 problem happens either way (`shell-execute' or running
-;; directly) -- but it also happens with firefox when using `shell-execute'.
-;; One possible solution is to run `ftype http' to find the default browser
-;; command, and if it uses `iexplore.exe' then change it to `explorer.exe', and
-;; run the resulting command directly.  This is described at
-;;   http://www.tutorials-win.com/IE/Lauching-HTML/
-;; But this still fails on Vista, since the problem there is that launching a
-;; browser with a file:// URL makes it start a more priviliged process, and
-;; doing that drops the fragment again.  So the solution that the code below
-;; implements is to write and use (via `send-url/contents') a trampoline html
-;; that redirects to the actual file and fragment.
-
-(define (send-url/win url)
-  (if (not (regexp-match? #rx"[#?]" url))
-    (shell-execute #f url "" (current-directory) 'SW_SHOWNORMAL)
-    (send-url/contents
-     (string-append
-      "<html><head><meta http-equiv=\"refresh\" content=\"0;URL="url"\"></head>"
-      "<body>Please go <a href=\""url"\">here</a>.</body></html>")
-     ;; starting the browser may take a while, don't remove the file
-     ;; immediately (this means that when used via plt-help, these files are
-     ;; never removed by a timer)
-     #:delete-at 15)))
-
-;; Process helper
-(define (browser-run #:shell [shell? #f] . args)
-  (define-values (stdout stdin pid stderr control)
-    (apply values (apply (if shell? process/ports process*/ports)
-                         (open-output-nowhere) #f (current-error-port)
-                         args)))
-  (close-output-port stdin)
-  ;; this is called from plt-help which will immediately exit when we
-  ;; return, so wait just a little bit in case we'll catch an error
-  ;; starting the browser
-  (sync/timeout 0.25
-    (thread (lambda ()
-              (control 'wait)
-              (when (eq? 'done-error (control 'status))
-                (error 'browser-run "process execute failed: ~e" args)))))
-  (void))
diff --git a/pkgs/net-pkgs/net-lib/net/smtp.rkt b/pkgs/net-pkgs/net-lib/net/smtp.rkt
deleted file mode 100644
index 4ac7ea388b..0000000000
--- a/pkgs/net-pkgs/net-lib/net/smtp.rkt
+++ /dev/null
@@ -1,166 +0,0 @@
-#lang racket/base
-
-(require racket/tcp net/base64)
-
-(provide smtp-sending-server
-         smtp-send-message
-         smtp-send-message*
-         smtp-sending-end-of-message)
-
-(define smtp-sending-server (make-parameter "localhost"))
-
-(define debug-via-stdio? #f)
-
-;; (define log printf)
-(define log void)
-
-(define (starts-with? l n)
-  (and (>= (string-length l) (string-length n))
-       (string=? n (substring l 0 (string-length n)))))
-
-(define (check-reply/accum r v w a)
-  (flush-output w)
-  (let ([l (read-line r (if debug-via-stdio? 'linefeed 'return-linefeed))])
-    (log "server: ~a\n" l)
-    (if (eof-object? l)
-        (error 'check-reply "got EOF")
-        (let ([n (number->string v)])
-          (unless (starts-with? l n)
-            (error 'check-reply "expected reply ~a; got: ~a" v l))
-          (let ([n- (string-append n "-")])
-            (if (starts-with? l n-)
-                ;; Multi-line reply. Go again.
-                (check-reply/accum r v w (if a (cons (substring l 4) a) #f))
-                ;; We're finished, so add the last and reverse the result
-                (when a
-                  (reverse (cons (substring l 4) a)))))))))
-
-(define (check-reply/commands r v w . commands)
-  ;; drop the first response, which is just the flavor text -- we expect the rest to
-  ;; be a list of supported ESMTP commands.
-  (let ([cmdlist (cdr (check-reply/accum r v w '()))])
-    (for-each (lambda (c1)
-                (unless (findf (lambda (c2) (string=? c1 c2)) cmdlist)
-                  (error "expected advertisement of ESMTP command ~a" c1)))
-              commands)))
-
-(define (check-reply r v w)
-  (check-reply/accum r v w #f))
-
-(define (protect-line l)
-  ;; If begins with a dot, add one more
-  (if (or (equal? l #"")
-          (equal? l "")
-          (and (string? l)
-               (not (char=? #\. (string-ref l 0))))
-          (and (bytes? l)
-               (not (= (char->integer #\.) (bytes-ref l 0)))))
-      l
-      (if (bytes? l)
-          (bytes-append #"." l)
-          (string-append "." l))))
-
-(define smtp-sending-end-of-message
-  (make-parameter void
-                  (lambda (f)
-                    (unless (and (procedure? f)
-                                 (procedure-arity-includes? f 0))
-                      (raise-type-error 'smtp-sending-end-of-message "thunk" f))
-                    f)))
-
-(define (smtp-send-message* r w sender recipients header message-lines
-                            auth-user auth-passwd tls-encode)
-  (with-handlers ([void (lambda (x)
-                          (close-input-port r)
-                          (close-output-port w)
-                          (raise x))])
-    (check-reply r 220 w)
-    (log "hello\n")
-    (fprintf w "EHLO ~a\r\n" (smtp-sending-server))
-    (when tls-encode
-      (check-reply/commands r 250 w "STARTTLS")
-      (log "starttls\n")
-      (fprintf w "STARTTLS\r\n")
-      (check-reply r 220 w)
-      (let-values ([(ssl-r ssl-w)
-                    (tls-encode r w
-                                #:mode 'connect
-                                #:encrypt 'tls
-                                #:close-original? #t)])
-        (set! r ssl-r)
-        (set! w ssl-w))
-      ;; According to RFC 3207 Sec 4.2, we must start anew with the EHLO.
-      (log "tls hello\n")
-      (fprintf w "EHLO ~a\r\n" (smtp-sending-server)))
-    (check-reply r 250 w)
-
-    (when auth-user
-      (log "auth\n")
-      (fprintf w "AUTH PLAIN ~a\r\n"
-               (base64-encode
-                (string->bytes/latin-1
-                 (format "~a\0~a\0~a" auth-user auth-user auth-passwd))
-                #""))
-      (check-reply r 235 w))
-
-    (log "from\n")
-    (fprintf w "MAIL FROM:<~a>\r\n" sender)
-    (check-reply r 250 w)
-
-    (log "to\n")
-    (for-each
-     (lambda (dest)
-       (fprintf w "RCPT TO:<~a>\r\n" dest)
-       (check-reply r 250 w))
-     recipients)
-
-    (log "header\n")
-    (fprintf w "DATA\r\n")
-    (check-reply r 354 w)
-    (fprintf w "~a" header)
-    (for-each
-     (lambda (l)
-       (log "body: ~a\n" l)
-       (fprintf w "~a\r\n" (protect-line l)))
-     message-lines)
-
-    ;; After we send the ".", then only break in an emergency
-    ((smtp-sending-end-of-message))
-
-    (log "dot\n")
-    (fprintf w ".\r\n")
-    (flush-output w)
-    (check-reply r 250 w)
-
-    ;; Once a 250 has been received in response to the . at the end of
-    ;; the DATA block, the email has been sent successfully and out of our
-    ;; hands.  This function should thus indicate success at this point
-    ;; no matter what else happens.
-    ;;
-    ;; Some servers (like smtp.gmail.com) will just close the connection
-    ;; on a QUIT, so instead of causing any QUIT errors to look like the
-    ;; email failed, we'll just log them.
-    (with-handlers ([void (lambda (x)
-                            (log "error after send: ~a\n" (exn-message x)))])
-      (log "quit\n")
-      (fprintf w "QUIT\r\n")
-      (check-reply r 221 w))
-
-    (close-output-port w)
-    (close-input-port r)))
-
-(define smtp-send-message
-  (lambda (server sender recipients header message-lines
-                  #:port-no [port-no 25]
-                  #:auth-user [auth-user #f]
-                  #:auth-passwd [auth-passwd #f]
-                  #:tcp-connect [tcp-connect tcp-connect]
-                  #:tls-encode [tls-encode #f]
-                  [opt-port-no port-no])
-    (when (null? recipients)
-      (error 'send-smtp-message "no receivers"))
-    (let-values ([(r w) (if debug-via-stdio?
-                            (values (current-input-port) (current-output-port))
-                            (tcp-connect server opt-port-no))])
-      (smtp-send-message* r w sender recipients header message-lines
-                          auth-user auth-passwd tls-encode))))
diff --git a/pkgs/net-pkgs/net-lib/net/ssl-tcp-unit.rkt b/pkgs/net-pkgs/net-lib/net/ssl-tcp-unit.rkt
deleted file mode 100644
index 0568509095..0000000000
--- a/pkgs/net-pkgs/net-lib/net/ssl-tcp-unit.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-(provide make-ssl-tcp@)
-(require racket/unit net/tcp-sig openssl/mzssl)
-
-(define (make-ssl-tcp@
-         server-cert-file server-key-file server-root-cert-files
-         server-suggest-auth-file
-         client-cert-file client-key-file client-root-cert-files)
-  (unit
-   (import)
-   (export tcp^)
-
-   (define ctx (ssl-make-client-context))
-   (when client-cert-file
-     (ssl-load-certificate-chain! ctx client-cert-file))
-   (when client-key-file
-     (ssl-load-private-key! ctx client-key-file))
-   (when client-root-cert-files
-     (ssl-set-verify! ctx #t)
-     (map (lambda (f)
-            (ssl-load-verify-root-certificates! ctx f))
-          client-root-cert-files))
-
-   (define (tcp-abandon-port p)
-     (if (input-port? p)
-       (close-input-port p)
-       (close-output-port p)))
-
-   (define tcp-accept ssl-accept)
-   (define tcp-accept/enable-break ssl-accept/enable-break)
-
-   ;; accept-ready? doesn't really work for SSL:
-   (define (tcp-accept-ready? p)
-     #f)
-
-   (define tcp-addresses ssl-addresses)
-   (define tcp-close ssl-close)
-   (define (tcp-connect hostname port-k)
-     (ssl-connect hostname port-k ctx))
-   (define (tcp-connect/enable-break hostname port-k)
-     (ssl-connect/enable-break hostname port-k ctx))
-
-   (define (tcp-listen port [allow-k 4] [reuse? #f] [hostname #f])
-     (let ([l (ssl-listen port allow-k reuse? hostname)])
-       (when server-cert-file
-         (ssl-load-certificate-chain! l server-cert-file))
-       (when server-key-file
-         (ssl-load-private-key! l server-key-file))
-       (when server-root-cert-files
-         (ssl-set-verify! l #t)
-         (map (lambda (f)
-                (ssl-load-verify-root-certificates! l f))
-              server-root-cert-files))
-       (when server-suggest-auth-file
-         (ssl-load-suggested-certificate-authorities! l server-suggest-auth-file))
-       l))
-
-   (define tcp-listener? ssl-listener?)))
diff --git a/pkgs/net-pkgs/net-lib/net/tcp-redirect.rkt b/pkgs/net-pkgs/net-lib/net/tcp-redirect.rkt
deleted file mode 100644
index 8884f0d9b5..0000000000
--- a/pkgs/net-pkgs/net-lib/net/tcp-redirect.rkt
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang racket/base
-(provide tcp-redirect)
-
-(require racket/unit racket/tcp racket/async-channel "tcp-sig.rkt")
-
-(define raw:tcp-abandon-port tcp-abandon-port)
-(define raw:tcp-accept tcp-accept)
-(define raw:tcp-accept/enable-break tcp-accept/enable-break)
-(define raw:tcp-accept-ready? tcp-accept-ready?)
-(define raw:tcp-addresses tcp-addresses)
-(define raw:tcp-close tcp-close)
-(define raw:tcp-connect tcp-connect)
-(define raw:tcp-connect/enable-break tcp-connect/enable-break)
-(define raw:tcp-listen tcp-listen)
-(define raw:tcp-listener? tcp-listener?)
-
-;; For tcp-listeners, we use an else branch in the conds since
-;; (instead of a contract) I want the same error message as the raw
-;; primitive for bad inputs.
-
-;; : (listof nat) -> (unit/sig () -> net:tcp^)
-(define (tcp-redirect redirected-ports [redirected-address "127.0.0.1"])
-  (unit
-   (import)
-   (export tcp^)
-   ;; : (make-pipe-listener nat (channel (cons iport oport)))
-   (define-struct pipe-listener (port channel))
-
-   ;; : port -> void
-   (define (tcp-abandon-port tcp-port)
-     (when (tcp-port? tcp-port)
-       (raw:tcp-abandon-port tcp-port)))
-
-   ;; : listener -> iport oport
-   (define (tcp-accept tcp-listener)
-     (cond
-       [(pipe-listener? tcp-listener)
-        (let ([in-out (async-channel-get (pipe-listener-channel tcp-listener))])
-          (values (car in-out) (cdr in-out)))]
-       [else (raw:tcp-accept tcp-listener)]))
-
-   ;; : listener -> iport oport
-   (define (tcp-accept/enable-break tcp-listener)
-     (cond
-       [(pipe-listener? tcp-listener)
-        ;; XXX put this into async-channel.rkt as async-channel-get/enable-break
-        (sync/enable-break
-         (handle-evt
-          (pipe-listener-channel tcp-listener)
-          (lambda (in-out)
-            (values (car in-out) (cdr in-out)))))]
-       #;(let ([in-out (async-channel-get (pipe-listener-channel tcp-listener))])
-           (values (car in-out) (cdr in-out)))
-       [else (raw:tcp-accept/enable-break tcp-listener)]))
-
-   ;; : tcp-listener -> iport oport
-   ;; FIX - check channel queue size
-   (define (tcp-accept-ready? tcp-listener)
-     (cond
-       [(pipe-listener? tcp-listener) #t]
-       [else (raw:tcp-accept-ready? tcp-listener)]))
-
-   ;; : tcp-port -> str str
-   (define (tcp-addresses tcp-port)
-     (if (tcp-port? tcp-port)
-       (raw:tcp-addresses tcp-port)
-       (values redirected-address redirected-address)))
-
-   ;; : port -> void
-   (define (tcp-close tcp-listener)
-     (if (tcp-listener? tcp-listener)
-       (raw:tcp-close tcp-listener)
-       (hash-remove! port-table (pipe-listener-port tcp-listener))))
-
-   ;; : (str nat -> iport oport) -> str nat -> iport oport
-   (define (gen-tcp-connect raw)
-     (lambda (hostname-string port)
-       (if (and (string=? redirected-address hostname-string)
-                (redirect? port))
-         (let-values ([(to-in from-out) (make-pipe)]
-                      [(from-in to-out) (make-pipe)])
-           (async-channel-put
-            (pipe-listener-channel
-             (hash-ref port-table port
-                       (lambda ()
-                         (raise (make-exn:fail:network
-                                 (format "tcp-connect: connection to ~a, port ~a failed (nobody is listening)"
-                                         hostname-string port)
-                                 (current-continuation-marks))))))
-            (cons to-in to-out))
-           (values from-in from-out))
-         (raw hostname-string port))))
-
-   ;; : str nat -> iport oport
-   (define tcp-connect (gen-tcp-connect raw:tcp-connect))
-
-   ;; : str nat -> iport oport
-   (define tcp-connect/enable-break
-     (gen-tcp-connect raw:tcp-connect/enable-break))
-
-   ;; FIX - support the reuse? flag.
-   (define (tcp-listen port [max-allow-wait 4] [reuse? #f] [hostname-string #f])
-     (hash-ref port-table port
-       (lambda ()
-         (if (redirect? port)
-           (let ([listener (make-pipe-listener port (make-async-channel))])
-             (hash-set! port-table port listener)
-             listener)
-           (raw:tcp-listen port max-allow-wait reuse? hostname-string)))))
-
-   ;; : tst -> bool
-   (define (tcp-listener? x)
-     (or (pipe-listener? x) (raw:tcp-listener? x)))
-
-   ;; ---------- private ----------
-
-   ;; : (hash nat[port] -> tcp-listener)
-   (define port-table (make-hasheq))
-
-   (define redirect-table
-     (let ([table (make-hasheq)])
-       (for-each (lambda (x) (hash-set! table x #t))
-                 redirected-ports)
-       table))
-
-   ;; : nat -> bool
-   (define (redirect? port)
-     (hash-ref redirect-table port #f))
-
-   ))
diff --git a/pkgs/net-pkgs/net-lib/net/tcp-sig.rkt b/pkgs/net-pkgs/net-lib/net/tcp-sig.rkt
deleted file mode 100644
index 036b256153..0000000000
--- a/pkgs/net-pkgs/net-lib/net/tcp-sig.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/signature
-
-tcp-abandon-port
-tcp-accept
-tcp-accept/enable-break
-tcp-accept-ready?
-tcp-addresses
-tcp-close
-tcp-connect
-tcp-connect/enable-break
-tcp-listen
-tcp-listener?
diff --git a/pkgs/net-pkgs/net-lib/net/tcp-unit.rkt b/pkgs/net-pkgs/net-lib/net/tcp-unit.rkt
deleted file mode 100644
index 8aea3db0c8..0000000000
--- a/pkgs/net-pkgs/net-lib/net/tcp-unit.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-(provide tcp@)
-
-(require racket/unit racket/tcp "tcp-sig.rkt")
-
-(define-unit-from-context tcp@ tcp^)
diff --git a/pkgs/net-pkgs/net-lib/net/unihead.rkt b/pkgs/net-pkgs/net-lib/net/unihead.rkt
deleted file mode 100644
index 43d6107c5e..0000000000
--- a/pkgs/net-pkgs/net-lib/net/unihead.rkt
+++ /dev/null
@@ -1,135 +0,0 @@
-#lang racket/base
-(require net/base64 net/qp)
-
-(provide encode-for-header decode-for-header generalize-encoding)
-
-(define re:non-ascii #rx"[^\u0-\u7F]")
-
-(define (encode-for-header s)
-  (cond [(not (regexp-match? re:non-ascii s)) s]
-        [(not (regexp-match? #rx"[\r\n]" s)) (encode-line-for-header s)] ; speed
-        [else (regexp-replace* #rx"[^\r\n]+" s encode-line-for-header)]))
-
-;; Note: the following two encoder wrappers remove newlines from the
-;; encoded strings.  This avoids producing invalid strings, but it's not
-;; complete: rfc2047 (section 2) specifies that encoded words should not
-;; be longer than 75 characters, and longer words should be split for
-;; encoding with a separator of CRLF SPACE between them.  The problem is
-;; that doing this properly requires changing the encoders to get a
-;; length limit and have them return also the leftover unencoded string.
-;; Instead of doing all of that, do something simpler: if the string to
-;; be encoded is longer than 70 characters, then split it.  (This is
-;; done in `encode-line-for-header' below.)  It's possible to get longer
-;; encodings with this, but it seems that sendmail's limit on line
-;; lengths is sufficiently larger that it works fine in practice.  (BTW,
-;; when sendmail gets lines that are too long it splits them with the
-;; dreaded "!\n ", and it looks like there is no sane way to avoid that
-;; behavior -- so splitting the input is needed.)
-
-(define (base64-encode-header s)
-  (regexp-replace* #rx#"[\r\n]+" (base64-encode s) #""))
-
-(define (qp-encode-header s)
-  ;; rfc2047 (section 4.2) calls this "Q encoding", which is different
-  ;; from the usual QP encoding: encode underlines and question marks,
-  ;; and replace spaces by underlines; also remove soft-newlines.
-  (regexp-replace* #rx#"[ ?_]"
-                   (regexp-replace* #rx#"=\r?\n" (qp-encode s) #"")
-                   (λ (b)
-                     (case (bytes-ref b 0)
-                       [(32) #"_"]   ; " "
-                       [(63) #"=3F"] ; "?"
-                       [(95) #"=5F"] ; "_"
-                       [else (error 'qp-encode-header "internal error")]))))
-
-(define (encode-line-for-header s)
-  (define (do-encode s string->bytes charset encode encoding)
-    (let loop ([s s])
-      (cond
-        ;; Find ASCII (and no "=") prefix before a space
-        [(regexp-match #rx"^([\u0-\u3c\u3e-\u7F]* )(.*)$" s)
-         => (λ (m) (string-append (cadr m) (loop (caddr m))))]
-        ;; Find ASCII (and no "=") suffix after a space
-        [(regexp-match #rx"^(.*?)( [\u0-\u3c\u3e-\u7F]*)$" s)
-         => (λ (m) (string-append (loop (cadr m)) (caddr m)))]
-        [else
-         ;; Split lines longer than 70 chars and re-assemble (see above
-         ;; comment).  Note that the proper separator should use CRLF,
-         ;; but we're sending this to a sendmail process that will take
-         ;; care of that level.
-         (let loop ([bytes (string->bytes s)])
-           (if ((bytes-length bytes) . > . 70)
-             (string-append (loop (subbytes bytes 0 70))
-                            "\n "
-                            (loop (subbytes bytes 70)))
-             (format "=?~a?~a?~a?=" charset encoding (encode bytes))))])))
-  (cond
-    ;; ASCII - do nothing
-    [(not (regexp-match? re:non-ascii s)) s]
-    ;; Not Latin-1, so use UTF-8
-    [(regexp-match? #rx"[^\u0-\uFF]" s)
-     (do-encode s string->bytes/utf-8 "UTF-8" base64-encode-header "B")]
-    ;; use Latin-1
-    [else
-     (do-encode s string->bytes/latin-1 "ISO-8859-1" qp-encode-header "Q")]))
-
-;; ----------------------------------------
-
-(define re:encoded #rx#"^(.*?)=[?]([^?]+)[?]([qQbB])[?](.*?)[?]=(.*)$")
-
-(define (generalize-encoding encoding)
-  ;; Treat Latin-1 as Windows-1252 and also threat GB and GB2312
-  ;; as GBK, because some mailers are broken.
-  (cond [(or (regexp-match? #rx#"^(?i:iso-8859-1)$" encoding)
-             (regexp-match? #rx#"^(?i:us-ascii)$" encoding))
-         (if (bytes? encoding) #"WINDOWS-1252" "WINDOWS-1252")]
-        [(regexp-match? #rx#"^(?i:gb(?:2312)?)$" encoding)
-         (if (bytes? encoding) #"GBK" "GBK")]
-        [(regexp-match? #rx#"^(?i:ks_c_5601-1987)$" encoding)
-         (if (bytes? encoding) #"CP949" "CP949")]
-        [else encoding]))
-
-(define (decode-for-header s)
-  (and s
-       (let ([m (regexp-match re:encoded
-                              (string->bytes/latin-1 s (char->integer #\?)))])
-         (if m
-           (let ([s ((if (member (cadddr m) '(#"q" #"Q"))
-                       ;; quoted-printable, with special _ handling
-                       (λ (x) (qp-decode (regexp-replace* #rx#"_" x #" ")))
-                       ;; base64:
-                       base64-decode)
-                     (cadddr (cdr m)))]
-                 [encoding (caddr m)])
-             (string-append
-              (decode-for-header (bytes->string/latin-1 (cadr m)))
-              (let ([encoding (generalize-encoding encoding)])
-                (cond
-                  [(regexp-match? #rx#"^(?i:utf-8)$" encoding)
-                   (bytes->string/utf-8 s #\?)]
-                  [else (let ([c (bytes-open-converter
-                                  (bytes->string/latin-1 encoding)
-                                  "UTF-8")])
-                          (if c
-                            (let-values ([(r got status)
-                                          (bytes-convert c s)])
-                              (bytes-close-converter c)
-                              (if (eq? status 'complete)
-                                (bytes->string/utf-8 r #\?)
-                                (bytes->string/latin-1 s)))
-                            (bytes->string/latin-1 s)))]))
-              (let ([rest (cadddr (cddr m))])
-                (let ([rest
-                       ;; A CR-LF-space-encoding sequence means that we
-                       ;; should drop the space.
-                       (if (and (> (bytes-length rest) 4)
-                                (= 13 (bytes-ref rest 0))
-                                (= 10 (bytes-ref rest 1))
-                                (= 32 (bytes-ref rest 2))
-                                (let ([m (regexp-match-positions
-                                          re:encoded rest)])
-                                  (and m (= (caaddr m) 5))))
-                         (subbytes rest 3)
-                         rest)])
-                  (decode-for-header (bytes->string/latin-1 rest))))))
-           s))))
diff --git a/pkgs/net-pkgs/net-test/LICENSE.txt b/pkgs/net-pkgs/net-test/LICENSE.txt
deleted file mode 100644
index 2701057fd4..0000000000
--- a/pkgs/net-pkgs/net-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-net-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/net-pkgs/net-test/info.rkt b/pkgs/net-pkgs/net-test/info.rkt
deleted file mode 100644
index 16f66b23bf..0000000000
--- a/pkgs/net-pkgs/net-test/info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "tests for \"net-lib\"")
-
-(define pkg-authors '(mflatt))
-(define build-deps '("at-exp-lib"
-                     "compatibility-lib"
-                     "eli-tester"
-                     "net-lib"
-                     "racket-test"
-                     "rackunit-lib"
-                     "web-server-lib"))
-(define update-implies '("net-lib"))
diff --git a/pkgs/net-pkgs/net-test/tests/net/available.rkt b/pkgs/net-pkgs/net-test/tests/net/available.rkt
deleted file mode 100644
index d7f5c2d8ac..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/available.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-(require racket/tcp
-         racket/list
-         racket/match
-         racket/port
-         racket/contract)
-
-(define (tcp-localhost-available?)
-  (with-handlers
-      ([exn? (λ (x) #f)])
-    (define the-listener
-      (tcp-listen 0 5 #t))
-    (define-values (local-host port end-host end-port)
-      (tcp-addresses the-listener #t))
-    (thread
-     (λ ()
-       (tcp-accept the-listener)
-       (tcp-close the-listener)))
-    (tcp-connect "localhost" port)
-    #t))
-
-(provide
- (contract-out
-  [tcp-localhost-available? (-> boolean?)]))
-
-(module+ main
-  (tcp-localhost-available?))
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/base64.rkt b/pkgs/net-pkgs/net-test/tests/net/base64.rkt
deleted file mode 100644
index a2a9a78506..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/base64.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require net/base64)
-
-(define (test expect f . args)
-  (unless (equal? expect (apply f args))
-    (error "fail")))
-
-(test #"" base64-encode #"")
-(test #"" base64-encode #"" #"<>")
-(test #"V2h5IGRvIGF4ZSBtdXJkZXJlcnMgb25seSBhdHRhY2sKV2hlbiB5b3UncmUgcGFydGlhbGx5\r\nIG51ZGUKT3IgeW91J3JlIHRha2luZyBhIGJhdGg=\r\n"
-      base64-encode #"Why do axe murderers only attack\nWhen you're partially nude\nOr you're taking a bath")
-(test #"V2h5IGRvIGF4ZSBtdXJkZXJlcnMgb25seSBhdHRhY2sKV2hlbiB5b3UncmUgcGFydGlhbGx5<>IG51ZGUKT3IgeW91J3JlIHRha2luZyBhIGJhdGg=<>"
-      base64-encode #"Why do axe murderers only attack\nWhen you're partially nude\nOr you're taking a bath" #"<>")
diff --git a/pkgs/net-pkgs/net-test/tests/net/cgi.rkt b/pkgs/net-pkgs/net-test/tests/net/cgi.rkt
deleted file mode 100644
index 31992193cc..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/cgi.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket
-(require net/cgi (only-in net/uri-codec current-alist-separator-mode)
-         tests/eli-tester)
-
-(define (test-bindings mode query-string)
-  (parameterize ([current-alist-separator-mode mode])
-    (putenv "QUERY_STRING" query-string)
-    (get-bindings)))
-
-(provide tests)
-(module+ main (tests))
-(define (tests)
-  (putenv "REQUEST_METHOD" "GET")
-  (test (test-bindings 'amp-or-semi "key1=value1&key2=value2;key3=value3")
-        => '([key1 . "value1"] [key2 . "value2"] [key3 . "value3"])
-        (test-bindings 'amp "key1=value1&key2=value2")
-        => '([key1 . "value1"] [key2 . "value2"])
-        (test-bindings 'amp "key1=value1;key2=value2")
-        => '([key1 . "value1;key2=value2"])
-        (test-bindings 'semi "key1=value1;key2=value2")
-        => '([key1 . "value1"] [key2 . "value2"])
-        (test-bindings 'semi "key1=value1&key2=value2")
-        => '([key1 . "value1&key2=value2"])))
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/cookie.rkt b/pkgs/net-pkgs/net-test/tests/net/cookie.rkt
deleted file mode 100644
index f19eb57c99..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/cookie.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang racket
-(require net/cookie tests/eli-tester)
-
-;; cookie tests --- JBM, 2006-12-01
-
-(provide tests)
-(module+ main (tests))
-(define (tests)
-  ;; cookie-test : (cookie -> cookie) string -> test
-  (define (cookie-test fn expected)
-    (test (print-cookie (fn (set-cookie "a" "b"))) => expected))
-  ;; RC = "reverse curry"
-  (define (RC f arg2) (λ (arg1) (f arg1 arg2)))
-  ;; o = compose
-  (define-syntax o
-    (syntax-rules ()
-      [(o f) f]
-      [(o f g h ...) (λ (x) (o/* x f g h ...))]))
-  (define-syntax o/*
-    (syntax-rules ()
-      [(o/* x) x]
-      [(o/* x f g ...) (f (o/* x g ...))]))
-  
-  (define (tests)
-    
-    ;; test the most basic functionality
-    (cookie-test (λ (x) x) "a=b")
-    
-    ;; test each modifier individually
-    (cookie-test (RC cookie:add-comment "set+a+to+b")
-                 "a=b; Comment=set+a+to+b")
-    (cookie-test (RC cookie:add-comment "a comment with spaces")
-                 "a=b; Comment=\"a comment with spaces\"")
-    (cookie-test (RC cookie:add-comment "the \"risks\" involved in waking")
-                 "a=b; Comment=\"the \\\"risks\\\" involved in waking\"")
-    (cookie-test (RC cookie:add-comment "\"already formatted\"")
-                 "a=b; Comment=\"already formatted\"")
-    (cookie-test (RC cookie:add-comment "\"problematic \" internal quote\"")
-                 "a=b; Comment=\"\\\"problematic \\\" internal quote\\\"\"")
-    (cookie-test (RC cookie:add-comment "contains;semicolon")
-                 "a=b; Comment=\"contains;semicolon\"")
-    (cookie-test (RC cookie:add-domain ".example.net")
-                 "a=b; Domain=.example.net")
-    (cookie-test (RC cookie:add-max-age 100)
-                 "a=b; Max-Age=100")
-    (cookie-test (RC cookie:add-path "/whatever/wherever/")
-                 "a=b; Path=/whatever/wherever/")
-    (cookie-test (RC cookie:add-path "a+path")
-                 "a=b; Path=a+path")
-    (cookie-test (RC cookie:add-path "\"/already/quoted/\"")
-                 "a=b; Path=\"/already/quoted/\"")
-    (cookie-test (RC cookie:secure #t)
-                 "a=b; Secure")
-    (cookie-test (RC cookie:secure #f)
-                 "a=b")
-    (cookie-test (RC cookie:version 12)
-                 "a=b; Version=12")
-    
-    ;; test combinations
-    (cookie-test (o (RC cookie:add-comment "set+a+to+b")
-                    (RC cookie:add-domain ".example.net"))
-                 "a=b; Comment=set+a+to+b; Domain=.example.net")
-    (cookie-test (o (RC cookie:add-max-age 300)
-                    (RC cookie:secure #t))
-                 "a=b; Max-Age=300; Secure")
-    (cookie-test (o (RC cookie:add-path "/whatever/wherever/")
-                    (RC cookie:version 10)
-                    (RC cookie:add-max-age 20))
-                 "a=b; Max-Age=20; Path=/whatever/wherever/; Version=10")
-    
-    ;; test error cases
-    (let ()
-      (define-syntax cookie-error-test
-        (syntax-rules ()
-          [(cookie-error-test e)
-           (test (e (set-cookie "a" "b")) =error> cookie-error?)]))
-      (cookie-error-test (RC cookie:add-comment "illegal character #\000"))
-      (cookie-error-test (RC cookie:add-max-age -10))
-      (cookie-error-test (RC cookie:add-domain "doesntstartwithadot.example.com"))
-      (cookie-error-test (RC cookie:add-domain "bad domain.com"))
-      (cookie-error-test (RC cookie:add-domain ".bad-domain;com")))
-    
-    ; cookie value
-    (test
-     (cookie-value? "value")
-     (cookie-value? "(")
-     (cookie-value? "!")
-     (cookie-value? ")")
-     (cookie-value? ")!")
-     (cookie-value? "(!")
-     (cookie-value? "(!)")
-     (cookie-value? "!)"))
-
-    
-    
-    )
-  
-  (test do (tests)))
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/dns.rkt b/pkgs/net-pkgs/net-test/tests/net/dns.rkt
deleted file mode 100644
index d7e463bfed..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/dns.rkt
+++ /dev/null
@@ -1,109 +0,0 @@
-#lang racket/base
-
-(require net/dns rackunit)
-
-;; internal tests
-
-(define mx-response-with-cname
-  '(;; random ID
-    0 187
-    ;; QR Opcode  AA TC RD RA Z     RCODE
-    ;; 1  0 0 0 0 0  0  1  1  0 0 0 0 0 0 0
-    129 128
-    ;; QDCOUNT
-    0 1
-    ;; ANSCOUNT
-    0 1
-    ;; NSCOUNT
-    0 1
-    ;; ARCOUNT
-    0 0
-    ;; QNAME (stat.ethz.ch)
-    4 115 116 97 116
-    4 101 116 104 122
-    2 99 104 0
-    ;; QTYPE (MX)
-    0 15
-    ;; QCLASS (IN)
-    0 1
-    ;; NAME (pointer)
-    ;; 1100000000001100
-    192 12
-    ;; TYPE: CNAME
-    0 5
-    ;; CLASS
-    0 1
-    ;; TTL
-    0 0
-    4 79
-    ;; RDLENGTH
-    0 19
-    ;; RDATA
-    11 109 97 103 101 108 108 97 110 45 48 54
-    4 109 97 116 104
-    192 17
-    ;; NAME (pointer)
-    192 17
-    ;; TYPE: SOA
-    0 6
-    ;; CLASS
-    0 1
-    ;; TTL
-    0 0 1 90
-    ;; RDLENGTH & DATA
-    0 44 8 100 117 109 109 121 45
-    110 115 192 17 10 104 111 115 116 109
-    97 115 116 101 114 192 17 119 168 176
-    33 0 0 42 48 0 0 14 16 0 27 175 128 0 0 2 88))
-
-(require (only-in rackunit require/expose) net/private/ip)
-(require/expose net/dns (ip->in-addr.arpa ip->ip6.arpa
-                         parse-reply parse-mx-response))
-
-(define-values (_1 _2 mx-ans mx-nss _3 _4)
-  (parse-reply '(0 187 129 128) mx-response-with-cname))
-
-(define (internal-tests)
-  (check-equal? (ip->in-addr.arpa (ipv4 (bytes 8 8 8 8)))
-                "8.8.8.8.in-addr.arpa")
-  (check-equal? (ip->in-addr.arpa (ipv4 (bytes 127 0 0 1)))
-                "1.0.0.127.in-addr.arpa")
-  (check-equal? (ip->ip6.arpa (make-ip-address "4321:0:1:2:3:4:567:89ab"))
-                (string-append "b.a.9.8.7.6.5.0.4.0.0.0.3.0.0.0"
-                               ".2.0.0.0.1.0.0.0.0.0.0.0.1.2.3.4.ip6.arpa"))
-  (check-equal? (ip->ip6.arpa (make-ip-address "2001:db8::567:89ab"))
-                (string-append "b.a.9.8.7.6.5.0.0.0.0.0.0.0.0.0"
-                               ".0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa"))
-        ;; FIXME: may need to change if SOA handling in net/dns
-        ;;        changes (see FIXME there)
-  (check-equal? (parse-mx-response mx-ans mx-nss mx-response-with-cname "stat.ethz.ch")
-                "stat.ethz.ch"))
-
-;; Constants for testing. These can go out of sync
-;; when server setups change, so keep them up-to-date.
-(define *google-dns*   "8.8.8.8")
-(define *google-dns-2* "8.8.4.4")
-(define *nwu-url*      "eecs.northwestern.edu")
-(define *nwu-ip*       "129.105.8.227")
-(define *racket-host*  "winooski.ccs.neu.edu")
-(define *racket-ip*    "129.10.115.117")
-(define *nwu-mx*       '("cuda.eecs.northwestern.edu" "barra.eecs.northwestern.edu"))
-(define *kame-url*     "www.kame.net")
-(define *kame-ip*      "2001:200:dff:fff1:216:3eff:feb1:44d7")
-
-(define (nameserver-tests nameserver)
-  (check-equal? (dns-get-address nameserver *nwu-url*) *nwu-ip*)
-  (check-equal? (dns-get-address nameserver *racket-host*) *racket-ip*)
-  (check-equal? (dns-get-address nameserver *kame-url* #:ipv6? #t) *kame-ip*)
-  (check-equal? (dns-get-name nameserver *racket-ip*) *racket-host*)
-  (check-not-false (member (dns-get-mail-exchanger nameserver *nwu-url*) *nwu-mx*)))
-
-(provide tests)
-(module+ main (tests))
-(define (tests)
-  (internal-tests)
-  (nameserver-tests *google-dns*)
-  (nameserver-tests *google-dns-2*)
-  (let ([ns (dns-find-nameserver)]) (when ns (nameserver-tests ns))))
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/encoders.rkt b/pkgs/net-pkgs/net-test/tests/net/encoders.rkt
deleted file mode 100644
index 292ae94baa..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/encoders.rkt
+++ /dev/null
@@ -1,112 +0,0 @@
-#lang racket
-(require net/base64 net/qp tests/eli-tester)
-
-(define tricky-strings
-  (let ([net.rktl (collection-file-path "base64.rkt" "tests" "net")])
-    (list (make-bytes 200 32)
-          (make-bytes 200 9)
-          (make-bytes 200 (char->integer #\x))
-          (make-bytes 201 (char->integer #\x))
-          (make-bytes 202 (char->integer #\x))
-          (make-bytes 203 (char->integer #\x))
-          (make-bytes 204 (char->integer #\x))
-          (list->bytes (for/list ([i (in-range 256)]) i))
-          ;; Something that doesn't end with a LF:
-          (bytes-append (with-input-from-file net.rktl
-                          (lambda () (read-bytes 500)))
-           #"xxx")
-          ;; CRLF:
-          (regexp-replace #rx#"\r?\n"
-                          (with-input-from-file net.rktl
-                            (lambda () (read-bytes 500)))
-           #"\r\n"))))
-
-(define (check-same encode decode port line-rx max-w)
-  (let ([p (open-output-bytes)])
-    (copy-port port p)
-    (let ([bytes (get-output-bytes p)]
-          [r (open-output-bytes)])
-      (encode (open-input-bytes bytes) r)
-      (let ([p (open-input-bytes (get-output-bytes r))])
-        (let loop ()
-          (let ([l (read-bytes-line p 'any)])
-            (unless (eof-object? l)
-              (test ; #:failure-message (format "line too long; ~s" encode)
-                    (<= (bytes-length l) max-w))
-              (let ([m (regexp-match-positions line-rx l)])
-                (test ; #:failure-message (format "bad line; ~s" encode)
-                      (and m (= (bytes-length l) (cdar m)))))
-              (loop))))
-        (let ([q (open-output-bytes)])
-          (decode (open-input-bytes (get-output-bytes r)) q)
-          (unless (equal? (get-output-bytes q) bytes)
-            (with-output-to-file "/tmp/x0" (lambda () (display (get-output-bytes r))) 'truncate)
-            (with-output-to-file "/tmp/x1" (lambda () (display (get-output-bytes q))) 'truncate)
-            (with-output-to-file "/tmp/x2" (lambda () (display bytes)) 'truncate)
-            (error 'decode "failed")))))))
-
-(define ((check-same-file encode decode line-rx max-w) file)
-  (call-with-input-file file
-    (lambda (p) (check-same encode decode p line-rx max-w))))
-
-(define (check-same-all encode decode line-rx max-w)
-  (for-each (lambda (tricky-string)
-              (check-same encode decode
-                          (open-input-bytes tricky-string)
-                          line-rx max-w))
-            tricky-strings)
-  (let* ([dir (collection-path "tests" "racket")]
-         [files (filter-map
-                 (lambda (f)
-                   ;; check 1/4 of the files, randomly
-                   (let ([p (build-path dir f)])
-                     (and (zero? (random 4))
-                          (not (regexp-match #rx"^flat.*\\.rktl$"
-                                             (path-element->string f)))
-                          (file-exists? p)
-                          p)))
-                 (directory-list dir))])
-    (for-each (check-same-file encode decode line-rx max-w) files)))
-
-(provide tests)
-(module+ main (tests))
-(define (tests)
-  (test
-   do (check-same-all (lambda (i o) (qp-encode-stream i o))
-                      qp-decode-stream
-                      #rx#"^(|[\t \41-\176]*[\41-\176]+)$"
-                      76)
-   do (check-same-all base64-encode-stream
-                      base64-decode-stream
-                      #rx#"^[0-9a-zA-Z+=/]*$"
-                      72)))
-
-#|
-Use this to compare base64 encode/decode against the unix utilities
-(require net/base64 racket/system)
-(define (base64-encode* bstr)
-  (let ([o (open-output-bytes)])
-     (parameterize ([current-output-port o]
-                    [current-input-port (open-input-bytes bstr)])
-       (system "base64-encode"))
-     (let* ([o (get-output-bytes o)]
-            [o (regexp-replace #rx#"(.)(?:\r?\n)?$" o #"\\1\r\n")]
-            [o (regexp-replace* #rx#"\r?\n" o #"\r\n")])
-       o)))
-(define (base64-decode* bstr)
-  (let ([o (open-output-bytes)])
-     (parameterize ([current-output-port o]
-                    [current-input-port (open-input-bytes bstr)])
-       (system "base64-decode"))
-     (get-output-bytes o)))
-(define (check-base64-encode bstr)
-  (equal? (base64-encode bstr) (base64-encode* bstr)))
-(define (check-base64-decode bstr)
-  (equal? (base64-decode bstr) (base64-decode* bstr)))
-(define (check-base64-both bstr)
-  (let ([en (base64-encode bstr)])
-    (and (equal? en (base64-encode* bstr))
-         (equal? (base64-decode en) (base64-decode* en)))))
-|#
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/ftp.rkt b/pkgs/net-pkgs/net-test/tests/net/ftp.rkt
deleted file mode 100644
index 864f14562e..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/ftp.rkt
+++ /dev/null
@@ -1,283 +0,0 @@
-#lang at-exp racket/base
-
-(require net/ftp tests/eli-tester
-         racket/tcp racket/port racket/file racket/match)
-
-(define (tcp-serve dest text)
-  (define listener (tcp-listen 0))
-  (define the-port (let-values ([(_1 p _2 _3) (tcp-addresses listener #t)]) p))
-  (define (feed in out)
-    (if (input-port? in) (copy-port in out) (display in out))
-    (flush-output out))
-  (define (feeder)
-    (define-values [ip op] (tcp-accept listener))
-    (for-each thread-wait
-              (list (thread (λ () (feed text op) (close-output-port op)))
-                    (thread (λ () (feed ip dest) (close-input-port ip))))))
-  (values (thread feeder) the-port))
-
-(define (port->splitstr n)
-  (let-values ([(q r) (quotient/remainder n 256)]) (format "~a,~a" q r)))
-(define (tcp-serve* dest text)
-  (define-values [thd port] (tcp-serve dest text))
-  (values thd (port->splitstr port)))
-
-(define ((progress-proc output dir) get-count)
-  (thread
-   (lambda ()
-     (let loop ()
-       (define-values [count changed-evt] (get-count))
-       (fprintf output "~a bytes ~aloaded\n" count dir)
-       (sync changed-evt)
-       (loop)))))
-
-(provide tests)
-(module+ main (tests))
-(define (tests)
-  (define cop (open-output-string))
-  (define-values [pasv1-thd pasv1-port] (tcp-serve* (current-output-port) DIRLIST))
-  (define-values [pasv2-thd pasv2-port] (tcp-serve* (current-output-port) TEXT-FILE))
-  (define-values [pasv3-thd pasv3-port] (tcp-serve* (open-output-nowhere) TEXT-FILE))
-  (define-values [main-thd main-port] (tcp-serve cop (SERVER-OUTPUT pasv1-port pasv2-port pasv3-port)))
-  (define server "127.0.0.1")
-  (define port main-port)
-  (define user "anonymous")
-  (define passwd "nonny")
-  (define conn #f)
-  (define pth "=README-about-.diff-files")
-  (define tmp-dir (make-temporary-file "racket-ftp-test-~a" 'directory))
-  (test (port->splitstr 18291) => "71,115"
-        (ftp-connection? 1) => #f
-        (set! conn (ftp-establish-connection server port user passwd))
-        (ftp-connection? conn)
-        (when (ftp-connection? conn)
-          (define output (open-output-bytes))
-          (test (ftp-cd conn "gnu")
-                (for ([f (in-list (ftp-directory-list conn))])
-                  (match-define (list* type ftp-date name ?size) f)
-                  (test (ftp-make-file-seconds ftp-date)))
-                (ftp-download-file conn tmp-dir pth
-                                   #:progress (progress-proc output "down"))
-                ;; Note: It would be nice to test the output but there is no
-                ;; easy way that I see to wait for the progress thread to
-                ;; finish (it stays alive after the transfer), and it's
-                ;; probably a bad idea to make a test that expects a specific
-                ;; output
-                ;; (get-output-bytes output #t) => #"0 bytes downloaded\n"
-                ;; (get-output-bytes output #t) => #"744 bytes uploaded\n"
-                (ftp-upload-file conn (path->string (build-path tmp-dir pth))
-                                 #:progress (progress-proc output "up"))
-                ;; (get-output-bytes output #t) => #"744 bytes uploaded\n"
-                (ftp-delete-file conn "3dldf/test.file")
-                (ftp-make-directory conn "test")
-                (ftp-delete-directory conn "test")
-                (ftp-rename-file conn "test1" "test2")
-                (ftp-close-connection conn)
-                (delete-file (build-path tmp-dir pth))
-                (delete-directory/files tmp-dir)
-                (thread-wait pasv1-thd)
-                (thread-wait pasv2-thd)
-                (thread-wait pasv3-thd)
-                (thread-wait main-thd)
-                (get-output-string cop) => EXPECTED-USER-OUTPUT
-                ))))
-
-(define S string-append)
-
-(define DIRLIST @S{
-  drwxr-xr-x    2 1003     1003         4096 Jan 16  2004 3dldf
-  -rw-r--r--    1 1003     65534        1492 Jan 25  2001 =README
-  -rw-r--r--    1 1003     65534         745 Mar 20  1997 =README-about-.diff-files
-  -rw-r--r--    1 1003     65534        1042 Jan 08  2000 =README-about-.gz-files
-  drwxrwxr-x    3 0        1003         4096 Feb 08  2005 GNUinfo
-  drwxrwsr-x    3 0        1003         4096 Aug 14  2003 GNUsBulletins
-  drwxrwxr-x    2 0        1003         4096 Mar 25 18:42 Licenses
-  drwxrwxr-x    2 0        1003         4096 Aug 02  2003 MailingListArchives
-  drwxrwxr-x    2 0        1003         4096 Aug 02  2003 MicrosPorts
-  -rw-r--r--    1 1003     65534       29107 May 03  1998 ProgramIndex
-  -rw-r--r--    1 1003     65534         257 Jun 12  2000 README.DESCRIPTIONS
-  drwxrwxr-x    2 0        1003         4096 Dec 29  2007 a2ps
-  drwxrwxr-x    2 0        1003         4096 Feb 12 16:45 acct
-  drwxrwxr-x    2 0        1003         4096 Jun 09  2006 adns
-  drwxr-xr-x    2 1003     1003         4096 Jul 14  2008 aeneas
-  drwxrwxr-x    2 0        1003         4096 Dec 20  2008 anubis
-  drwxr-xr-x    2 1003     1003         4096 Feb 24 00:20 archimedes
-  drwxrwxr-x    4 0        1003         4096 Apr 16  2008 aspell
-  lrwxr-xr-x    1 0        0              15 Mar 11  2005 aspell-dict-csb -> aspell/dict/csb
-  lrwxrwxrwx    1 0        0              14 Nov 24  2003 aspell-dict-ga -> aspell/dict/ga
-  lrwxrwxrwx    1 0        0              14 Mar 22  2004 aspell-dict-hr -> aspell/dict/hr
-  lrwxrwxrwx    1 0        0              14 Mar 12  2004 aspell-dict-is -> aspell/dict/is
-  lrwxrwxrwx    1 0        0              14 Nov 24  2003 aspell-dict-it -> aspell/dict/it
-  lrwxrwxrwx    1 0        0              14 Apr 26  2004 aspell-dict-sk -> aspell/dict/sk
-  drwxrwxr-x   13 0        1003         8192 Jul 03 14:05 auctex
-  drwxrwxr-x    2 0        1003         4096 Aug 02 18:10 autoconf
-  drwxr-xr-x    2 1003     1003         4096 Jul 06 14:30 autoconf-archive
-  drwxrwxr-x   32 0        1003         4096 Jul 25 18:10 autogen
-  drwxrwxr-x    2 0        1003         8192 Dec 08  2009 automake
-  drwxrwxr-x    2 0        1003         4096 Aug 26  2007 avl
-  drwxr-xr-x    2 1003     1003         4096 Jul 15  2009 ballandpaddle
-  drwxrwxr-x    2 0        1003         4096 Aug 02  2003 barcode
-  drwxrwxr-x    8 0        1003         4096 Jan 18  2010 bash
-  drwxrwxr-x    3 0        1003         8192 Jan 18  2007 bayonne
-  drwxrwxr-x    2 0        1003         4096 Aug 02  2003 bc
-  drwxrwxr-x    2 0        1003         4096 Mar 03 15:25 binutils
-  drwxrwxr-x    2 0        1003         4096 Aug 06 02:25 bison
-  drwxrwxr-x    2 0        1003         4096 Aug 02  2003 bool
-  drwxr-xr-x   10 1003     1003         4096 Jul 30  2007 bpel2owfn
-  -rw-r--r--    1 1003     65534         420 Nov 15  2000 brl.README
-  drwxrwxr-x    2 0        1003         4096 Aug 02  2003 calc
-  drwxrwxr-x    2 0        1003         4096 Dec 16  2008 ccaudio
-  drwxrwxr-x    2 0        1003         4096 Oct 25  2009 ccrtp
-  drwxrwxr-x    2 0        1003         8192 May 19 00:50 ccscript
-  drwxrwxr-x    2 0        1003         4096 Aug 02  2003 cfengine
-  drwxr-xr-x    2 1003     1003         4096 Jul 11  2009 cflow
-  drwxrwxr-x    2 0        1003         4096 Nov 14  2009 cgicc
-  drwxrwxr-x    2 0        1003         4096 Jan 12  2004 chess
-  drwxrwxr-x    2 0        1003         4096 Aug 02  2003 cim
-  drwxrwxr-x    2 0        1003         4096 Mar 25 17:25 classpath
-  drwxrwxr-x    2 0        1003         4096 Apr 28  2007 classpathx
-  drwxrwxr-x    6 0        1003         4096 Jul 07 17:30 clisp
-  drwxrwxr-x    2 0        1003         4096 Aug 02  2003 clx
-  drwxr-xr-x    2 1003     1003         4096 Jun 05  2004 combine
-  lrwxrwxrwx    1 0        0               9 Nov 18  2003 commonc++ -> commoncpp
-  drwxrwxr-x    2 0        1003         8192 Aug 11 06:30 commoncpp
-  drwxrwxr-x    2 0        1003         4096 Feb 13  2008 config
-  drwxrwxr-x    2 0        1003         8192 Apr 23 16:45 coreutils
-  drwxrwxr-x    2 0        1003         4096 Mar 10 13:20 cpio
-  drwxrwxr-x    2 0        1003         4096 Aug 02  2003 cpp2html
-  drwxr-xr-x    2 1003     1003         4096 Mar 18 06:45 cppi
-  drwxr-xr-x    2 1003     1003         4096 Apr 11  2009 cssc
-  drwxrwxr-x    2 0        1003         4096 Feb 21  2008 dap
-  -rw-r--r--    1 1003     65534         110 Jun 06  1999 dc.README
-  drwxrwxr-x    2 0        1003         4096 Feb 11  2009 ddd
-  drwxr-xr-x    2 1003     1003         4096 Apr 06 18:50 ddrescue
-  drwxrwxr-x    2 0        1003         4096 Jan 30  2004 dejagnu
-  drwxr-xr-x    2 1003     1003         4096 Jul 07 20:50 denemo
-  -rw-r--r--    1 1003     65534         145 May 22  2001 dia.README
-  drwxr-xr-x    2 1003     1003         4096 Jul 07 19:35 dico
-  drwxrwxr-x    2 0        1003         4096 Sep 17  2007 diction
-  -rw-r--r--    1 1003     65534         134 Apr 15  2002 dictionary.README
-  drwxrwxr-x    2 0        1003         4096 May 03 17:00 diffutils
-  drwxr-xr-x    2 1003     1003         4096 Apr 11 11:55 dionysus
-  drwxrwxr-x    2 0        0            4096 Apr 03  2007 dismal
-  -rw-r--r--    1 1003     65534         492 Apr 03  2007 djgpp.README
-  drwxr-xr-x    2 1003     1003         4096 Feb 18  2005 dominion
-  drwxrwxr-x    5 0        1003         4096 Dec 10  2008 dotgnu
-  -rw-r--r--    1 1003     65534          96 Feb 09  1999 dumb.README
-  drwxrwxr-x    2 0        1003         4096 Jul 10  2009 ed
-  drwxrwxr-x    2 0        1003         4096 Apr 08 18:05 edma
-  drwxrwxr-x    2 0        1003         4096 Feb 17 00:20 electric
-  -rw-r--r--    1 1003     65534         835 Jan 24  1999 elisp-archive.README
-  drwxrwxr-x    3 0        1003         4096 May 08 04:01 emacs
-  drwxr-xr-x    2 1003     1003         4096 Sep 16  2008 emms
-  drwxrwxr-x    2 0        1003         4096 Jun 01 23:25 enscript
-  drwxr-xr-x    2 1003     1003         4096 Jan 26  2008 erc
-  drwxr-xr-x    2 1003     1003         4096 Jan 10  2010 fdisk
-  drwxr-xr-x    2 1003     1003         4096 Nov 16  2008 ferret
-  drwxrwxr-x    2 0        1003         4096 Jun 06  2009 findutils
-  drwxrwxr-x    2 0        0            4096 Mar 20  2007 flex
-  drwxrwxr-x    2 0        1003         4096 Aug 02  2003 fontutils
-  drwxr-xr-x    2 1003     1003         4096 Apr 20 21:05 freedink
-  drwxrwxr-x    2 0        1003         4096 Jan 04  2009 freefont
-  @||})
-
-(define TEXT-FILE @S{
-  1. Sometimes diffs between two versions were either too large to be
-  worth making, or too difficult.  In those cases where a .diff file is
-  missing, please just FTP the latest version.
-
-  2. The .diff file suffix signifies a patch file produced by the GNU
-  'diff' program.
-
-  A diff file like this has all of the changes from one version of a
-  program to the next (i.e. gcc-2.6.2-2.6.3.diff will take gcc-2.6.2 and
-  produce gcc 2.6.3).
-
-  You can use the "patch" program to apply the diff to your sources.
-  (The "patch" program is available on prep.ai.mit.edu in directory
-  /pub/gnu/ if it isn't already installed on your system.)
-
-  (You might also want to take a look at the diff file, the format is
-  pretty obvious and could be educational. :-)
-
-  Thank You!
-  @||})
-
-(define (SERVER-OUTPUT pasv1-port pasv2-port pasv3-port)
-  @S{220 GNU FTP server ready.
-     230-Due to U.S. Export Regulations, all cryptographic software on this
-     230-site is subject to the following legal notice:
-     230-
-     230-    This site includes publicly available encryption source code
-     230-    which, together with object code resulting from the compiling of
-     230-    publicly available source code, may be exported from the United
-     230-    States under License Exception "TSU" pursuant to 15 C.F.R. Section
-     230-    740.13(e).
-     230-
-     230-This legal notice applies to cryptographic software only. Please see
-     230-the Bureau of Industry and Security (www.bxa.doc.gov) for more
-     230-information about current U.S. regulations.
-     230 Login successful.
-     250-If you have problems downloading and are seeing "Access denied" or
-     250-"Permission denied", please make sure that you started your FTP client
-     250-in a directory to which you have write permission.
-     250-
-     250-Please note that all files ending in `.gz' are compressed with `gzip',
-     250-not with the unix `compress' program.  Get the file below for more
-     250-info.
-     250-
-     250-For a list of mirrors and other ways of getting GNU software, FTP the
-     250-file /pub/gnu/GNUinfo/FTP from ftp.gnu.org or one of its mirror sites.
-     250-
-     250-Programs that are directly in this directory are actually GNU
-     250-programs, developed under the auspices of GNU.
-     250-
-     250-We do, however, distribute some non-GNU programs through our FTP
-     250-server, or provide pointers to where they are.  We put these
-     250-programs/pointers in the subdirectory non-gnu since they are not
-     250-developed by the GNU project.  They are, of course, part of the GNU
-     250-system. See:
-     250-http://www.gnu.org/philosophy/categories.html#TheGNUsystem
-     250 Directory successfully changed.
-     227 Entering Passive Mode (127,0,0,1,@pasv1-port)
-     200 Switching to Binary mode.
-     150 Here comes the directory listing.
-     226 Directory send OK.
-     227 Entering Passive Mode (127,0,0,1,@pasv2-port)
-     200 Switching to Binary mode.
-     150 Opening BINARY mode data connection for =README-about-.diff-files (745 bytes).
-     226 File send OK.
-     227 Entering Passive Mode (127,0,0,1,@pasv3-port)
-     200 Switching to Binary mode.
-     150 Opening BINARY mode data connection for =README-about-.diff-files (745 bytes).
-     226 File send OK.
-     250 Delete operation successful.
-     257 test created
-     250 Remove directory operation successful.
-     350 Ready for RNTO.
-     250 Rename successful.
-     221 Goodbye.
-     @||})
-
-(define EXPECTED-USER-OUTPUT
-  @(lambda xs (regexp-replace* #rx"\n" (apply S xs) "\r\n")){
-     USER anonymous
-     CWD gnu
-     PASV
-     TYPE I
-     LIST
-     PASV
-     TYPE I
-     RETR =README-about-.diff-files
-     PASV
-     TYPE I
-     STOR =README-about-.diff-files
-     DELE 3dldf/test.file
-     MKD test
-     RMD test
-     RNFR test1
-     RNTO test2
-     QUIT
-     @||})
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/head.rkt b/pkgs/net-pkgs/net-test/tests/net/head.rkt
deleted file mode 100644
index 4334c8dbe2..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/head.rkt
+++ /dev/null
@@ -1,122 +0,0 @@
-#lang racket
-(require net/head tests/eli-tester)
-
-;; a few tests of head.rkt -- JBC, 2006-07-31
-
-(provide tests)
-(module+ main (tests))
-(define (tests)
-  (define test-header
-    (string-append "From: abc\r\nTo: field is\r\n continued\r\n"
-                   "Another: zoo\r\n continued\r\n\r\n"))
-  (define test-header/bytes
-    (bytes-append #"From: abc\r\nTo: field is\r\n continued\r\n"
-                  #"Another: zoo\r\n continued\r\n\r\n"))
-  (test
-
-   (validate-header "From: me@here.net\r\n\r\n")
-   (validate-header #"From: me@here.net\r\n\r\n")
-   (validate-header "From: a\r\nTo: b\r\nResent-to: qrv@erocg\r\n\r\n")
-   (validate-header #"From: a\r\nTo: b\r\nResent-to: qrv@erocg\r\n\r\n")
-
-   (validate-header "From: a\r\nTo: b\r\nMissingTrailingrn: qrv@erocg\r\n")
-   =error> "missing ending CRLF"
-   (validate-header #"From: a\r\nTo: b\r\nMissingTrailingrn: qrv@erocg\r\n")
-   =error> "missing ending CRLF"
-   (validate-header "From: a\r\nnocolon inthisline\r\n\r\n")
-   =error> "ill-formed header"
-   (validate-header #"From: a\r\nnocolon inthisline\r\n\r\n")
-   =error> "ill-formed header"
-   (validate-header "From: a\r\nMissingReturn: och\n\r\n")
-   =error> "missing ending CRLF"
-   (validate-header #"From: a\r\nMissingReturn: och\n\r\n")
-   =error> "missing ending CRLF"
-   (validate-header "From: a\r\nSpacein Fieldname: och\r\n\r\n")
-   =error> "ill-formed header"
-   (validate-header #"From: a\r\nSpacein Fieldname: och\r\n\r\n")
-   =error> "ill-formed header"
-
-   (extract-field "From" test-header)
-   => "abc"
-   (extract-field #"From" test-header/bytes)
-   => #"abc"
-   (extract-field "To" test-header)
-   => "field is\r\n continued"
-   (extract-field #"To" test-header/bytes)
-   => #"field is\r\n continued"
-   (extract-field "Another" test-header)
-   => "zoo\r\n continued"
-   (extract-field #"Another" test-header/bytes)
-   => #"zoo\r\n continued"
-
-   (replace-field "From" "def" test-header)
-   => "From: def\r\nTo: field is\r\n continued\r\nAnother: zoo\r\n continued\r\n\r\n"
-   (replace-field #"From" #"def" test-header/bytes)
-   => #"From: def\r\nTo: field is\r\n continued\r\nAnother: zoo\r\n continued\r\n\r\n"
-   (replace-field "From" #f test-header)
-   => "To: field is\r\n continued\r\nAnother: zoo\r\n continued\r\n\r\n"
-   (replace-field #"From" #f test-header/bytes)
-   => #"To: field is\r\n continued\r\nAnother: zoo\r\n continued\r\n\r\n"
-
-   (replace-field "To" "qrs" test-header)
-   => "From: abc\r\nTo: qrs\r\nAnother: zoo\r\n continued\r\n\r\n"
-   (replace-field #"To" #"qrs" test-header/bytes)
-   => #"From: abc\r\nTo: qrs\r\nAnother: zoo\r\n continued\r\n\r\n"
-   (replace-field "To" #f test-header)
-   => "From: abc\r\nAnother: zoo\r\n continued\r\n\r\n"
-   (replace-field #"To" #f test-header/bytes)
-   => #"From: abc\r\nAnother: zoo\r\n continued\r\n\r\n"
-
-   (replace-field "Another" "abc\r\n def" test-header)
-   => "From: abc\r\nTo: field is\r\n continued\r\nAnother: abc\r\n def\r\n\r\n"
-   (replace-field #"Another" #"abc\r\n def" test-header/bytes)
-   => #"From: abc\r\nTo: field is\r\n continued\r\nAnother: abc\r\n def\r\n\r\n"
-   (replace-field "Another" #f test-header)
-   => "From: abc\r\nTo: field is\r\n continued\r\n\r\n"
-   (replace-field #"Another" #f test-header/bytes)
-   => #"From: abc\r\nTo: field is\r\n continued\r\n\r\n"
-
-   (remove-field "To" test-header)
-   => "From: abc\r\nAnother: zoo\r\n continued\r\n\r\n"
-   (remove-field #"To" test-header/bytes)
-   => #"From: abc\r\nAnother: zoo\r\n continued\r\n\r\n"
-
-   (extract-all-fields test-header)
-   => `(("From" . "abc") ("To" . "field is\r\n continued") ("Another" . "zoo\r\n continued"))
-   (extract-all-fields test-header/bytes)
-   => `((#"From" . #"abc") (#"To" . #"field is\r\n continued") (#"Another" . #"zoo\r\n continued"))
-
-   (append-headers test-header "Athird: data\r\n\r\n")
-   => "From: abc\r\nTo: field is\r\n continued\r\nAnother: zoo\r\n continued\r\nAthird: data\r\n\r\n"
-   (append-headers test-header/bytes #"Athird: data\r\n\r\n")
-   => #"From: abc\r\nTo: field is\r\n continued\r\nAnother: zoo\r\n continued\r\nAthird: data\r\n\r\n"
-
-   )
-
-  (let ([test (lambda (expect f . args)
-                (unless (equal? expect (apply f args))
-                  (error "failed")))])
-    (for-each 
-     (lambda (addr)
-       (test '("o.gu@racket-lang.com") extract-addresses (car addr) 'address)
-       (test '("o.gu@racket-lang.com" "o.gu@racket-lang.com") extract-addresses 
-             (format "~a, ~a" (car addr) (car addr))
-             'address)
-       (test (list (cdr addr)) extract-addresses (car addr) 'name)
-       (for-each 
-        (lambda (addr2)
-          (let ([two (format " ~a, \n\t~a" (car addr) (car addr2))])
-            (test '("o.gu@racket-lang.com" "s.gu@racket-lang.org") extract-addresses two 'address)
-            (test (list (cdr addr) (cdr addr2)) extract-addresses two 'name)))
-        '(("s.gu@racket-lang.org" . "s.gu@racket-lang.org")
-          ("<s.gu@racket-lang.org>" . "s.gu@racket-lang.org")
-          ("s.gu@racket-lang.org (Gu, Sophia)" . "Gu, Sophia")
-          ("s.gu@racket-lang.org (Sophia Gu)" . "Sophia Gu")
-          ("s.gu@racket-lang.org (Sophia \"Sophie\" Gu)" . "Sophia \"Sophie\" Gu")
-          ("Sophia Gu <s.gu@racket-lang.org>" . "Sophia Gu")
-          ("\"Gu, Sophia\" <s.gu@racket-lang.org>" . "\"Gu, Sophia\"")
-          ("\"Gu, Sophia (Sophie)\" <s.gu@racket-lang.org>" . "\"Gu, Sophia (Sophie)\""))))
-     '(("o.gu@racket-lang.com" . "o.gu@racket-lang.com")))
-    (printf "more tests passed\n")))
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/http-client.rkt b/pkgs/net-pkgs/net-test/tests/net/http-client.rkt
deleted file mode 100644
index b41bd1e78d..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/http-client.rkt
+++ /dev/null
@@ -1,259 +0,0 @@
-#lang racket/base
-(module+ test
-  (require rackunit
-           racket/tcp
-           racket/port
-           (for-syntax racket/base)
-           racket/list
-           (prefix-in hc: net/http-client)
-           (prefix-in u: net/url))
-
-  (define-syntax regexp-replace**
-    (syntax-rules ()
-      [(_ () s)
-       s]
-      [(_ ([from to] . more) s)
-       (regexp-replace* from (regexp-replace** more s) to)]))
-
-  (define (port->bytes* in)
-    (define ob (open-output-bytes))
-    (let loop ()
-      (sleep)
-      (when (byte-ready? in)
-        (define b (read-byte in))
-        (unless (eof-object? b)
-          (write-byte b ob)
-          (loop))))
-    (get-output-bytes ob))
-
-  (define-syntax (tests stx)
-    (syntax-case stx ()
-      [(_ t ...)
-       (with-syntax
-           ([(t.test ...)
-             (for/list ([t (in-list (syntax->list #'(t ...)))])
-               (quasisyntax/loc t
-                 (test . #,t)))])
-         (syntax/loc stx
-           (begin t.test ...)))]))
-
-  (define-syntax (test-e stx)
-    (syntax-case stx ()
-      [(_ the-port e raw ereq estatus eheaders econtent)
-       (quasisyntax/loc stx
-         (let ()
-           (define l (tcp-listen 0 40 #t "127.0.0.1"))
-           (define-values (_1 the-port _2 _3)
-             (tcp-addresses l #t))
-           (define req #f)
-           (define lt
-             (thread
-              (λ ()
-                (define-values (in out) (tcp-accept l))
-                (tcp-close l)
-                (display raw out)
-                (flush-output out)
-                (tcp-abandon-port out)
-                (close-output-port out)
-                (set! req (port->bytes* in))
-                (tcp-abandon-port in)
-                (close-input-port in))))
-           (define-values (status headers content-port)
-             e)
-           (thread-wait lt)
-           #,(syntax/loc stx
-               (check-equal?
-                (regexp-replace** ([(number->string the-port) "REDACTED"]
-                                   [(regexp-quote (version)) "REDACTED"])
-                                  req)
-                ereq))
-           #,(syntax/loc stx
-               (check-equal? status estatus))
-           #,(syntax/loc stx
-               (check-equal? headers eheaders))
-           #,(syntax/loc stx
-               (check-equal? (port->bytes content-port) econtent))))]))
-
-  (define-syntax (test stx)
-    (syntax-case stx ()
-      [(_ method body raw ereq estatus eheaders econtent)
-       (quasisyntax/loc stx
-         (begin
-           #,(syntax/loc stx
-               (test-e the-port
-                       (hc:http-sendrecv "localhost" "/"
-                                         #:ssl? #f
-                                         #:port the-port
-                                         #:method method
-                                         #:headers empty
-                                         #:data body)
-                       raw ereq estatus eheaders econtent))
-           #,(syntax/loc stx
-               (test-e the-port
-                       (let ([c (hc:http-conn-open "localhost"
-                                                   #:port the-port
-                                                   #:ssl? #f)])
-                         (check-equal? #t (hc:http-conn-live? c))
-                         (hc:http-conn-send! c
-                                             "/"
-                                             #:method method
-                                             #:headers empty
-                                             #:close? #t
-                                             #:data body)
-                         (begin0
-                          (hc:http-conn-recv! c
-                                              #:close? #t)
-                          (check-equal? #f (hc:http-conn-live? c))))
-                       raw ereq estatus eheaders econtent))
-           #,(syntax/loc stx
-               (test-e the-port
-                       (u:http-sendrecv/url
-                        (u:make-url "http" #f "localhost" the-port #t
-                                    (list (u:path/param "" empty)) empty #f)
-                        #:method method
-                        #:headers empty
-                        #:data body)
-                       raw ereq estatus eheaders econtent))))]))
-
-  (tests
-   ["GET" #f "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n24\r\nThis is the data in the first chunk \r\n1A\r\nand this is the second one\r\n0\r\n"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '(#"Content-Type: text/plain" #"Transfer-Encoding: chunked")
-    #"This is the data in the first chunk and this is the second one"]
-
-   ["GET" #f "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.0 200 OK"
-    '(#"Content-Type: text/plain")
-    #"This is the data in the first chunk and this is the second one"]
-
-   ["GET" #f "HTTP/1.0 200 OK\nContent-Type: text/plain\n\nThis is the data in the first chunk and this is the second one"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.0 200 OK"
-    '(#"Content-Type: text/plain")
-    #"This is the data in the first chunk and this is the second one"]
-
-   ["GET" #f "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 62\r\n\r\nThis is the data in the first chunk and this is the second one"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.0 200 OK"
-    '(#"Content-Type: text/plain" #"Content-Length: 62")
-    #"This is the data in the first chunk and this is the second one"]
-
-   ["GET" #f "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.0 200 OK"
-    '(#"Content-Type: text/plain")
-    #"This is the data in the first chunk and this is the second one"]
-
-   ["GET" #f "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\ncontent-length: 62\r\n\r\nThis is the data in the first chunk and this is the second one"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.0 200 OK"
-    '(#"Content-Type: text/plain" #"content-length: 62")
-    #"This is the data in the first chunk and this is the second one"]
-
-   ["GET" #f "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n20\r\nThis is the data in the first ch\r\n21\r\nand this is the second oneXXXXXXX\r\n0\r\n"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '(#"Content-Type: text/plain" #"Transfer-Encoding: chunked")
-    #"This is the data in the first chand this is the second oneXXXXXXX"]
-
-   ["GET" #f "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n24\r\nThis is the data in the first chunk \r\n1A\r\nand this is the second one\r\n0\r\n"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '(#"Content-Type: text/plain" #"Transfer-Encoding: chunked")
-    #"This is the data in the first chunk and this is the second one"]
-
-   ["GET" #f "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.0 200 OK"
-    '(#"Content-Type: text/plain")
-    #"This is the data in the first chunk and this is the second one"]
-
-   ["GET" #f "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n20\r\nThis is the data in the first ch\r\n21\r\nand this is the second oneXXXXXXX\r\n0\r\n"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '(#"Content-Type: text/plain" #"Transfer-Encoding: chunked")
-    #"This is the data in the first chand this is the second oneXXXXXXX"]
-
-   ["GET" #f "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one\r\n"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.0 200 OK"
-    '(#"Content-Type: text/plain")
-    #"This is the data in the first chunk and this is the second one\r\n"]
-
-   ["GET" #f "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n24\r\nThis is the data in the first chunk \r\n1A\r\nand this is the second one\r\n0\r\n"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '(#"Content-Type: text/plain" #"Transfer-Encoding: chunked")
-    #"This is the data in the first chunk and this is the second one"]
-
-   ["GET" #f "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.0 200 OK"
-    '(#"Content-Type: text/plain")
-    #"This is the data in the first chunk and this is the second one"]
-
-   ["GET" #f "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n20\r\nThis is the data in the first ch\r\n21\r\nand this is the second oneXXXXXXX\r\n0\r\n"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '(#"Content-Type: text/plain" #"Transfer-Encoding: chunked")
-    #"This is the data in the first chand this is the second oneXXXXXXX"]
-
-   ["GET" #f "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\nAnother-Header: ta-daa\r\n\r\n20\r\nThis is the data in the first ch\r\n21\r\nand this is the second oneXXXXXXX\r\n0\r\n"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '(#"Content-Type: text/plain" #"Transfer-Encoding: chunked" #"Another-Header: ta-daa")
-    #"This is the data in the first chand this is the second oneXXXXXXX"]
-
-   ["GET" #f "HTTP/1.1 301 Moved Permanently\r\nLocation: http://localhost:9002/whatever\r\n\r\nstuff"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.1 301 Moved Permanently"
-    '(#"Location: http://localhost:9002/whatever")
-    #"stuff"]
-
-   ["GET" #f "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\nAnother-Header: ta-daa\r\n\r\n20\r\nThis is the data in the first ch\r\n21\r\nand this is the second oneXXXXXXX\r\n0\r\n"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '(#"Content-Type: text/plain" #"Transfer-Encoding: chunked" #"Another-Header: ta-daa")
-    #"This is the data in the first chand this is the second oneXXXXXXX"]
-
-   ["GET" #f "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\nAnother-Header: ta-daa\r\n\r\nbb \r\n<HTML>\n\t\t\t\t\t  <HEAD>\n\t\t\t\t\t  <TITLE>ABCNANOTECH Co., LTD.</TITLE>\n\t\t\t\t\t  </HEAD>\n\t\t\t\t\t  <FRAMESET ROWS=\"100%,*\" border=0>\n\t\t\t\t\t  <FRAME src=http://nanotech.co.kr></FRAMESET>\n\t\t\t\t\t  </HTML>\r\n0\r\n\r\n"
-    #"GET / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '(#"Content-Type: text/plain" #"Transfer-Encoding: chunked" #"Another-Header: ta-daa")
-    #"<HTML>\n\t\t\t\t\t  <HEAD>\n\t\t\t\t\t  <TITLE>ABCNANOTECH Co., LTD.</TITLE>\n\t\t\t\t\t  </HEAD>\n\t\t\t\t\t  <FRAMESET ROWS=\"100%,*\" border=0>\n\t\t\t\t\t  <FRAME src=http://nanotech.co.kr></FRAMESET>\n\t\t\t\t\t  </HTML>"]
-
-   ["PUT" #f "HTTP/1.1 200 OK\r\n\r\n"
-    #"PUT / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nConnection: close\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '()
-    #""]
-
-   ["PUT" #"frob" "HTTP/1.1 200 OK\r\n\r\n"
-    #"PUT / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nContent-Length: 4\r\nConnection: close\r\n\r\nfrob"
-    #"HTTP/1.1 200 OK"
-    '()
-    #""]
-
-   ["PUT" "frob" "HTTP/1.1 200 OK\r\n\r\n"
-    #"PUT / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nContent-Length: 4\r\nConnection: close\r\n\r\nfrob"
-    #"HTTP/1.1 200 OK"
-    '()
-    #""]
-
-   ["PUT"
-    (λ (w) (w "fr") (w "ob"))
-    "HTTP/1.1 200 OK\r\n\r\n"
-    #"PUT / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nTransfer-Encoding: chunked\r\nConnection: close\r\n\r\n2\r\nfr\r\n2\r\nob\r\n0\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '()
-    #""]
-
-   ["PUT"
-    (λ (w) (void))
-    "HTTP/1.1 200 OK\r\n\r\n"
-    #"PUT / HTTP/1.1\r\nHost: localhost:REDACTED\r\nUser-Agent: Racket/REDACTED (net/http-client)\r\nAccept-Encoding: gzip\r\nTransfer-Encoding: chunked\r\nConnection: close\r\n\r\n0\r\n\r\n"
-    #"HTTP/1.1 200 OK"
-    '()
-    #""]))
diff --git a/pkgs/net-pkgs/net-test/tests/net/imap.rkt b/pkgs/net-pkgs/net-test/tests/net/imap.rkt
deleted file mode 100644
index d9745535f0..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/imap.rkt
+++ /dev/null
@@ -1,182 +0,0 @@
-#lang racket/base
-(require openssl/mzssl
-	 net/imap
-	 mzlib/etc)
-
-(define (test expect f . args)
-  (define got (if (procedure? f)
-                  (apply f args)
-                  (car args)))
-  (unless (equal? expect got)
-    (error 'test "failed: ~s vs. ~s" expect got)))
-
-(define imap-config-file
-  (build-path (find-system-path 'home-dir) ".imap-test-config"))
-
-(when (file-exists? imap-config-file)
-  (define config (with-input-from-file imap-config-file
-                   read))
-
-  (define imap-server (hash-ref config 'imap-server))
-  (define imap-port-no (hash-ref config 'imap-port-no))
-  (define username (hash-ref config 'username))
-  (define pw (hash-ref config 'pw))
-  (define mailbox-name (hash-ref config 'mailbox-name "INBOX.tmp")) ;; !!! ALL CONTENT WILL BE DELETED !!!
-
-  (define (test-connect)
-    (if (zero? (random 2))
-        (parameterize ([imap-port-number 993])
-          (imap-connect #:tls? #t imap-server username pw mailbox-name))
-        (let ([c (ssl-make-client-context)])
-          (let-values ([(in out) (ssl-connect imap-server imap-port-no c)])
-            (imap-connect* in out username pw mailbox-name)))))
-
-  (define-values (imap cnt recent) (test-connect))
-
-  (printf "Msgs: ~a; Validity: ~a\n" cnt (imap-uidvalidity imap))
-
-  (test cnt imap-messages imap)
-  (test recent imap-recent imap)
-  (test #t number? (imap-uidvalidity imap))
-  (test #f imap-pending-expunges? imap)
-  (test #f imap-pending-updates? imap)
-  (test #f imap-new? imap)
-
-  (define (delete-all)
-    (let ([cnt (imap-messages imap)])
-      (unless (zero? cnt)
-        (let ([all (build-list cnt add1)])
-          (test (void) imap-store imap '+ all '|\Deleted|)
-          (test (void) imap-expunge imap)
-          (test #t imap-pending-expunges? imap)
-          (test all imap-get-expunges imap)
-          (test null imap-get-expunges imap)
-          (test #f imap-pending-expunges? imap)))))
-
-  (delete-all)
-  (test #f imap-new? imap)
-  (test 0 imap-messages imap)
-  (test '(0 0) 'noop (let-values ([(a b) (imap-noop imap)])
-                       (list a b)))
-  (test (void) imap-poll imap)
-  (test 0 imap-messages imap)
-  (test 0 imap-recent imap)
-
-  (test #f imap-new? imap)
-
-  (define (add-one content total)
-    (test (void) imap-append imap mailbox-name content)
-    (imap-noop imap)
-    (test total imap-messages imap)
-    (test #t imap-new? imap)
-    (let ([uids (imap-get-messages imap (build-list total add1) '(uid))])
-      (test #t list? uids)
-      (test total length uids)
-      (let ([l (list-ref uids (sub1 total))])
-        (test #t list? l)
-        (test 1 length l)
-        (test #t number? (car l))
-        (car l))))
-
-  (define sample-head #"Subject: Hello\r\n\r\n")
-  (define sample-body #"Hi there.\r\n")
-
-  (let ([uid (add-one (bytes-append sample-head sample-body) 1)])
-    (test (list (list uid 
-                      sample-head
-                      sample-body
-                      '(|\Seen| |\Recent|)))
-          imap-get-messages imap '(1) '(uid header body flags)))
-  (test (void) imap-store imap '+ '(1) (list (symbol->imap-flag 'answered)))
-  (test (list '((|\Answered| |\Seen| |\Recent|))) imap-get-messages imap '(1) '(flags))
-  (test (void) imap-store imap '- '(1) (list (symbol->imap-flag 'answered)))
-  (test (list '((|\Seen| |\Recent|))) imap-get-messages imap '(1) '(flags))
-  (test (void) imap-store imap '+ '(1) (list (symbol->imap-flag 'deleted)))
-  (test (list '((|\Deleted| |\Seen| |\Recent|))) imap-get-messages imap '(1) '(flags))
-  (test (void) imap-store imap '! '(1) (list (symbol->imap-flag 'answered)))
-  (test (list '((|\Answered| |\Recent|))) imap-get-messages imap '(1) '(flags))
-
-  (test #f imap-pending-updates? imap)
-  (test null imap-get-updates imap)
-
-  ;; Test multiple-client access:
-  (let ()
-    (define-values (imap2 cnt2 recent2) (test-connect))
-    (test '(1 0) list cnt2 recent2)
-    
-    (let ([uid (add-one (bytes-append sample-head sample-body) 2)])
-      (let loop ([n 5])
-        (when (zero? n)
-          (imap-noop imap2))
-        (imap-poll imap2)
-        (unless (imap-new? imap2)
-          (sleep 0.2)
-          (loop (sub1 n))))
-      (test #t imap-new? imap2)
-      (test 2 imap-messages imap2)
-      (let ([uids (imap-get-messages imap2 '(2) '(uid))])
-        (test uid caar uids)))
-
-    ;; Delete message on imap2, check notifcation to imap
-    (test (void) imap-store imap2 '+ '(2) (list (symbol->imap-flag 'deleted)))
-    (test (void) imap-expunge imap2)
-    (test '(2) imap-get-expunges imap2)
-    (imap-noop imap)
-    (test 'exn values (with-handlers ([exn:fail:contract? (lambda (x) 'exn)])
-                        (imap-store imap '+ '(2) (list (symbol->imap-flag 'answered)))))
-    (test #t imap-pending-expunges? imap)
-    (test '(2) imap-get-expunges imap)
-
-    ;; Adjust flags on imap2, check notifcation to imap
-    (test #f imap-pending-updates? imap)
-    (test (void) imap-store imap2 '+ '(1) (list (symbol->imap-flag 'deleted)))
-    (imap-noop imap)
-    (test #t imap-pending-updates? imap)
-    (test #t list? (imap-get-updates imap))
-    (test #f imap-pending-updates? imap)
-
-    ;; Check that multiple updates are collapsed:
-    (test (void) imap-store imap2 '- '(1) (list (symbol->imap-flag 'deleted)))  
-    (imap-noop imap)
-    (test #t imap-pending-updates? imap)
-    (test (void) imap-store imap2 '+ '(1) (list (symbol->imap-flag 'deleted)))
-    (test (void) imap-store imap2 '- '(1) (list (symbol->imap-flag 'deleted)))
-    (imap-noop imap)
-    (test #t imap-pending-updates? imap)
-    (test 1 length (imap-get-updates imap))
-    
-    (test (void) imap-reset-new! imap2)
-    (add-one (bytes-append sample-head sample-body) 2)
-    (add-one (bytes-append sample-head sample-body) 3)
-    (add-one (bytes-append sample-head sample-body) 4)
-    (add-one (bytes-append sample-head sample-body) 5)
-    (imap-noop imap2)
-    (test #t imap-new? imap2)
-    (test 5 imap-messages imap)
-    (test 5 imap-messages imap2)
-
-    (test #t list? (imap-get-messages imap '(1 2 3 4 5) '(uid)))
-    (test #t list? (imap-get-messages imap2 '(1 2 3 4 5) '(uid)))
-    
-    ;; Test deleteing multiple messages, and shifts in flag updates
-    (test (void) imap-store imap2 '+ '(2 4) (list (symbol->imap-flag 'deleted)))
-    (test (void) imap-store imap2 '+ '(3 5) (list (symbol->imap-flag 'answered)))
-    (test (void) imap-expunge imap2)
-    (imap-noop imap)
-    (imap-noop imap2)
-    (test #t imap-pending-expunges? imap)
-    (test #t imap-pending-expunges? imap2)
-    (test '(2 4) imap-get-expunges imap)
-    (test '(2 4) imap-get-expunges imap2)
-    (test #t imap-pending-updates? imap)
-    (test '(2 3) map car (imap-get-updates imap))
-
-    (imap-disconnect imap2))
-
-  (imap-disconnect imap)
-  
-  (printf "tests passed\n"))
-
-
-
-
diff --git a/pkgs/net-pkgs/net-test/tests/net/info.rkt b/pkgs/net-pkgs/net-test/tests/net/info.rkt
deleted file mode 100644
index 5550a5749e..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define test-responsibles '(("websocket.rkt" jay)
-                            ("url-port.rkt" jay)))
diff --git a/pkgs/net-pkgs/net-test/tests/net/ip.rkt b/pkgs/net-pkgs/net-test/tests/net/ip.rkt
deleted file mode 100644
index dd8154fee4..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/ip.rkt
+++ /dev/null
@@ -1,127 +0,0 @@
-#lang racket/base
-
-(require net/private/ip tests/eli-tester)
-
-(require (only-in rackunit require/expose))
-(require/expose net/private/ip
-  (ipv4-string->bytes ipv6-string->bytes ipv4->string ipv6->string
-   compress bytes-of-length))
-
-(provide tests)
-(module+ main (tests))
-(define (tests)
-  (test
-   ;; ----------------------------------------
-   (make-ip-address "127.0.0.1")
-   => (ipv4 (bytes 127 0 0 1))
-   (make-ip-address (bytes 127 0 0 1))
-   => (ipv4 (bytes 127 0 0 1))
-   (make-ip-address "2607:f8b0:4009:800::100e")
-   => (ipv6 (bytes 38 7 248 176 64 9 8 0 0 0 0 0 0 0 16 14))
-   (make-ip-address (bytes 38 7 248 176 64 9 8 0 0 0 0 0 0 0 16 14))
-   => (ipv6 (bytes 38 7 248 176 64 9 8 0 0 0 0 0 0 0 16 14))
-   (make-ip-address "0.0.0.1")
-   => (ipv4 (bytes 0 0 0 1))
-   (not (equal? (make-ip-address "128.0.0.1")
-                (make-ip-address "255.3.255.0")))
-   do (let ([ip-bytes (bytes 127 0 0 1)])
-        (define ip (make-ip-address ip-bytes))
-        (bytes-set! ip-bytes 0 255)
-        (test #:failure-message "IP addresses should be immutable"
-              ip => (make-ip-address "127.0.0.1")))
-   ;; ----------------------------------------
-   (ip-address-string? "0.0.0.0")
-   (ip-address-string? "0.1.0.2")
-   (ip-address-string? "8.8.8.8")
-   (ip-address-string? "12.81.255.109")
-   (ip-address-string? "192.168.0.1")
-   (ip-address-string? "2001:0db8:85a3:0000:0000:8a2e:0370:7334")
-   (ip-address-string? "2001:200:dff:fff1:216:3eff:feb1:44d7")
-   (ip-address-string? "2001:db8:85a3:0:0:8a2e:370:7334")
-   (ip-address-string? "2001:db8:85a3::8a2e:370:7334")
-   (ip-address-string? "0:0:0:0:0:0:0:1")
-   (ip-address-string? "0:0:0:0:0:0:0:0")
-   (ip-address-string? "::")
-   (ip-address-string? "::0")
-   (ip-address-string? "::ffff:c000:0280")
-   (ip-address-string? "2001:db8::2:1")
-   (ip-address-string? "2001:db8:0:0:1::1")
-   (not (ip-address-string? ""))
-   (not (ip-address-string? ":::"))
-   (not (ip-address-string? "::0::"))
-   (not (ip-address-string? "2001::db8::2:1"))
-   (not (ip-address-string? "2001:::db8:2:1"))
-   (not (ip-address-string? "52001:db8::2:1"))
-   (not (ip-address-string? "80.8.800.8"))
-   (not (ip-address-string? "80.8.800.0"))
-   (not (ip-address-string? "080.8.800.8"))
-   (not (ip-address-string? "vas8.8.800.8"))
-   (not (ip-address-string? "80.8.128.8dd"))
-   (not (ip-address-string? "0.8.800.008"))
-   (not (ip-address-string? "0.8.800.a8"))
-   (not (ip-address-string? "potatoes"))
-   (not (ip-address-string? "127.0.0"))
-   ;; ----------------------------------------
-   (ipv4-string->bytes "0.8.255.0")
-   => (bytes 0 8 255 0)
-   (ipv4-string->bytes "8.8.8.8")
-   => (bytes 8 8 8 8)
-   (ipv4-string->bytes "12.81.255.109")
-   => (bytes 12 81 255 109)
-   (ipv4-string->bytes "192.168.0.1")
-   => (bytes 192 168 0 1)
-   ;; ----------------------------------------
-   (ipv6-string->bytes "2001:0db8:85a3:0000:0000:8a2e:0370:7334")
-   => (bytes 32 1 13 184 133 163 0 0 0 0 138 46 3 112 115 52)
-   (ipv6-string->bytes "2001:200:dff:fff1:216:3eff:feb1:44d7")
-   => (bytes 32 1 2 0 13 255 255 241 2 22 62 255 254 177 68 215)
-   (ipv6-string->bytes "2001:db8:85a3:0:0:8a2e:370:7334")
-   => (bytes 32 1 13 184 133 163 0 0 0 0 138 46 3 112 115 52)
-   (ipv6-string->bytes "2001:db8:85a3::8a2e:370:7334")
-   => (bytes 32 1 13 184 133 163 0 0 0 0 138 46 3 112 115 52)
-   (ipv6-string->bytes "2607:f8b0:4009:800::100e")
-   => (bytes 38 7 248 176 64 9 8 0 0 0 0 0 0 0 16 14)
-   (ipv6-string->bytes "::1")
-   => (bytes 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1)
-   (ipv6-string->bytes "::ffff")
-   => (bytes 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255)
-   ;; ----------------------------------------
-   (ip-address->bytes (make-ip-address "8.8.8.8"))
-   => (bytes 8 8 8 8)
-   (ip-address->bytes (make-ip-address "::1"))
-   => (bytes 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1)
-   ;; ----------------------------------------
-   (ip-address->string (make-ip-address "8.8.8.8"))
-   => "8.8.8.8"
-   (ip-address->string (make-ip-address "::1"))
-   => "::1"
-   ;; ----------------------------------------
-   (ipv4->string (bytes 0 0 0 0))
-   => "0.0.0.0"
-   (ipv4->string (bytes 255 255 0 1))
-   => "255.255.0.1"
-   (ipv4->string (bytes 127 0 0 1))
-   => "127.0.0.1"
-   (ipv4->string (bytes 8 8 8 8))
-   => "8.8.8.8"
-   ;; ----------------------------------------
-   (ipv6->string (bytes 32 1 13 184 133 163 0 0 0 0 138 46 3 112 115 52))
-   => "2001:db8:85a3::8a2e:370:7334"
-   (ipv6->string (bytes 38 7 248 176 64 9 8 0 0 0 0 0 0 0 16 14))
-   => "2607:f8b0:4009:800::100e"
-   (ipv6->string (bytes 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255))
-   => "::ffff"
-   (ipv6->string (bytes 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255))
-   => "ffff::ffff"
-   ;; ----------------------------------------
-   (compress '(0 0 0 5 5))   => '(:: 5 5)
-   (compress '(0 5 5))       => '(0 5 5)
-   (compress '(0 0 5 0 0 5)) => '(:: 5 0 0 5)
-   (compress '(0 5 0 0 0 5)) => '(0 5 :: 5)
-   ;; ----------------------------------------
-   ((bytes-of-length 5) (bytes 1 2 3 4 5))
-   (not ((bytes-of-length 5) "moogle"))
-   ;; ----------------------------------------
-   ))
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/main.rkt b/pkgs/net-pkgs/net-test/tests/net/main.rkt
deleted file mode 100644
index ec19dfc969..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/main.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-
-(module test racket/base
-  (displayln "run as program for tests"))
-
-(require tests/eli-tester
-         (prefix-in ip:        "ip.rkt")
-         (prefix-in dns:       "dns.rkt")
-         (prefix-in ucodec:    "uri-codec.rkt")
-         (prefix-in url:       "url.rkt")
-         (prefix-in cgi:       "cgi.rkt")
-         (prefix-in ftp:       "ftp.rkt")
-         (prefix-in head:      "head.rkt")
-         (prefix-in cookie:    "cookie.rkt")
-         (prefix-in encoders:  "encoders.rkt")
-         (prefix-in mime:      "mime.rkt")
-         (prefix-in url-port:  "url-port.rkt")
-         (prefix-in websocket: "websocket.rkt"))
-
-(define (tests)
-  (test do (ip:tests)
-        do (dns:tests)
-        do (url:tests)
-        do (ucodec:tests)
-        do (cgi:tests)
-        do (ftp:tests)
-        do (head:tests)
-        do (cookie:tests)
-        do (encoders:tests)
-        do (mime:tests)
-        do (url-port:tests)
-        do (websocket:tests)))
-
-(tests)
diff --git a/pkgs/net-pkgs/net-test/tests/net/mime.rkt b/pkgs/net-pkgs/net-test/tests/net/mime.rkt
deleted file mode 100644
index 09d151a89c..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/mime.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester net/mime)
-
-;; This test is based on an example from Jordan Schatz
-
-(define ip
-  (open-input-string
-   (regexp-replace* #rx"(\r\n|\n)"
-#<<EOS
-Server: MochiWeb/1.1 WebMachine/1.9.0 (blah blah)
-Expires: Fri, 06 Jan 2012 02:01:12 GMT
-Date: Fri, 06 Jan 2012 01:51:12 GMT
-Content-Type: multipart/mixed; boundary=9nbsYRvJBLRyuL4VOuuejw9LcAy
-Content-Length: 817
-
-
---9nbsYRvJBLRyuL4VOuuejw9LcAy
-Content-Type: multipart/mixed; boundary=NdzDrpIQMsJKtfv9VrXmp4YwCPh
-
---NdzDrpIQMsJKtfv9VrXmp4YwCPh
-X-Riak-Vclock: a85hYGBgzGDKBVIcypz/fvp9087NYEpkzGNlaGCpPMGXBQA=
-Location: /buckets/invoices/keys/RAQpCw8SssXlXVhiGAGYXsVmwvk
-Content-Type: application/json
-Link: </buckets/invoices>; rel="up"
-Etag: 1qS8Wrr2vkTBxkITOjo33K
-Last-Modified: Wed, 04 Jan 2012 17:12:32 GMT
-
-{"date": "11/02/2011"}
---NdzDrpIQMsJKtfv9VrXmp4YwCPh--
-
---9nbsYRvJBLRyuL4VOuuejw9LcAy--
-EOS
-"\r\n")))
-
-(provide tests)
-(module+ main (tests))
-(define (tests)
-  (define analyzed      (mime-analyze ip))
-  (define our-entity    (message-entity analyzed))
-  (define parts         (entity-parts our-entity))
-  (define inner-message (car parts))
-  (define inner-entity  (message-entity inner-message))
-  (define body-proc     (entity-body inner-entity))
-  (define tmp           (open-output-string))
-  (define sub           (message-entity (car (entity-parts inner-entity))))
-  (test (message-fields analyzed)
-        => '("Server: MochiWeb/1.1 WebMachine/1.9.0 (blah blah)"
-             "Expires: Fri, 06 Jan 2012 02:01:12 GMT"
-             "Date: Fri, 06 Jan 2012 01:51:12 GMT")
-        (length parts) => 1
-        body-proc => '()
-        (length (entity-parts inner-entity)) => 1
-        (entity-type sub) => 'application
-        (entity-subtype sub) => 'json
-        ((entity-body sub) tmp)
-        (get-output-string tmp) => "{\"date\": \"11/02/2011\"}"
-        (mime-analyze
-         (open-input-string "Content-Type: multipart/mixed\r\n\r\n"))
-        =error> missing-multipart-boundary-parameter?
-        ))
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/stress/info.rkt b/pkgs/net-pkgs/net-test/tests/net/stress/info.rkt
deleted file mode 100644
index 84ad0ac2d5..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/stress/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/net-pkgs/net-test/tests/net/stress/websocket.rkt b/pkgs/net-pkgs/net-test/tests/net/stress/websocket.rkt
deleted file mode 100644
index c4c9a31919..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/stress/websocket.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket/base
-(require tests/stress
-         net/websocket
-         net/url
-         racket/async-channel)
-
-(fit "websocket echo server"
-     500
-     (λ (n)
-       (define confirm (make-async-channel))
-       (define shutdown!
-         (ws-serve #:port 0
-                   #:confirmation-channel confirm
-                   (λ (wsc _)
-                     (let loop ()
-                       (define m (ws-recv wsc))
-                       (unless (eof-object? m)
-                         (ws-send! wsc m)
-                         (loop))))))
-       (define port (async-channel-get confirm))
-       
-       (define THREADS 10)
-       (define REQS n)
-       
-       (for-each thread-wait
-                 (for/list ([t (in-range THREADS)])
-                   (thread
-                    (λ ()
-                      (define conn (ws-connect (string->url (format "ws://localhost:~a" port))))
-                      (for ([r (in-range REQS)])
-                        (ws-send! conn "ping")
-                        (ws-recv conn))))))
-       
-       (shutdown!)))
-
-(module+ test
-  (module config info
-    (define random? #t)))
diff --git a/pkgs/net-pkgs/net-test/tests/net/uri-codec.rkt b/pkgs/net-pkgs/net-test/tests/net/uri-codec.rkt
deleted file mode 100644
index a5b0825b7b..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/uri-codec.rkt
+++ /dev/null
@@ -1,161 +0,0 @@
-#lang racket
-(require net/uri-codec tests/eli-tester)
-
-(provide tests)
-(module+ main (tests))
-(define (tests)
-  (define sepmode current-alist-separator-mode)
-  (test (uri-decode "%Pq") => "%Pq"
-        (uri-decode "%P")  => "%P"
-        (uri-decode "λ")   => "λ"
-
-        (uri-decode (string-append
-                     "\u631\u633\u627\u646\u647\u200c\u647\u627\u6cc\u2d\u62e\u648\u62f"
-                     "\u645\u627\u646\u6cc\u2f\u62d\u642\u648\u642\u2d\u628\u634\u631\u2d"
-                     "\u645\u6cc\u62f\u6cc\u627\u2f\u31\u32\u35\u34\u36\u2d"))
-        => (string-append
-            "\u631\u633\u627\u646\u647\u200c\u647\u627\u6cc\u2d\u62e\u648\u62f"
-            "\u645\u627\u646\u6cc\u2f\u62d\u642\u648\u642\u2d\u628\u634\u631\u2d"
-            "\u645\u6cc\u62f\u6cc\u627\u2f\u31\u32\u35\u34\u36\u2d")
-
-        (alist->form-urlencoded '([a . "hel+lo \u7238"]))
-        => "a=hel%2Blo+%E7%88%B8"
-        (form-urlencoded->alist
-         (alist->form-urlencoded '([a . "hel+lo \u7238"])))
-        => '([a . "hel+lo \u7238"])
-        (alist->form-urlencoded '([a . "hel+lo"] [b . "good-bye"]))
-        => "a=hel%2Blo&b=good-bye"
-
-        do (let ([alist   '([a . "hel+lo"] [b . "good-bye"])]
-                 [ampstr  "a=hel%2Blo&b=good-bye"]
-                 [semistr "a=hel%2Blo;b=good-bye"])
-             (define (alist<->str mode str)
-               (parameterize ([sepmode (or mode (sepmode))])
-                 (test (alist->form-urlencoded alist) => str
-                       (form-urlencoded->alist str) => alist)))
-             (alist<->str #f           ampstr) ; test the default
-             (alist<->str 'amp         ampstr)
-             (alist<->str 'amp-or-semi ampstr)
-             (alist<->str 'semi        semistr)
-             (alist<->str 'semi-or-amp semistr))
-
-        (form-urlencoded->alist "x=foo&y=bar;z=baz")
-        => '([x . "foo"] [y . "bar"] [z . "baz"])
-        (parameterize ([sepmode 'semi])
-          (form-urlencoded->alist
-           (parameterize ([sepmode 'amp])
-             (alist->form-urlencoded '([a . "hel+lo"] [b . "good-bye"])))))
-        => '([a . "hel+lo&b=good-bye"])
-        (parameterize ([sepmode 'amp])
-          (form-urlencoded->alist
-           (parameterize ([sepmode 'semi])
-             (alist->form-urlencoded '([a . "hel+lo"] [b . "good-bye"])))))
-        => '([a . "hel+lo;b=good-bye"])
-
-        (alist->form-urlencoded '([aNt . "Hi"]))
-        => "aNt=Hi"
-        (form-urlencoded->alist (alist->form-urlencoded '([aNt . "Hi"])))
-        => '([aNt . "Hi"])
-        (alist->form-urlencoded (form-urlencoded->alist "aNt=Hi"))
-        => "aNt=Hi"
-
-        (current-alist-separator-mode) => 'amp-or-semi
-        (current-alist-separator-mode 'bad) =error> "expected argument of type"
-
-        ;; Test all ASCII chars
-        do
-        (let ([p (for/list ([n (in-range 128)])
-                   (let ([s (string (char-downcase (integer->char n)))])
-                     (cons (string->symbol s) s)))])
-          (test (form-urlencoded->alist (alist->form-urlencoded p)) => p)
-          (let ([l (apply string-append (map cdr p))])
-            (test (uri-decode (uri-encode l)) => l)))
-
-        do (noels-tests)
-
-        (uri-userinfo-encode "hello")         => "hello"
-        (uri-userinfo-encode "hello there")   => "hello%20there"
-        (uri-userinfo-encode "hello:there")   => "hello:there"
-        (uri-userinfo-decode "hello")         => "hello"
-        (uri-userinfo-decode "hello%20there") => "hello there"
-        (uri-userinfo-decode "hello:there")   => "hello:there"
-
-        ;; tried to choose characters from each subset:
-        (uri-encode "M~(@; ")              =>  "M~(%40%3B%20"
-        (uri-path-segment-encode "M~(@; ") =>  "M~(@%3B%20"
-        (uri-userinfo-encode "M~(@; ")     =>  "M~(%40;%20"
-        (uri-unreserved-encode "M~(@; ")   =>  "M~%28%40%3B%20"
-        (uri-path-segment-unreserved-encode "M~(@; ") =>  "M~%28@%3B%20"
-        ;; matching decodes:
-        (uri-decode "M~(%40%3B%20")              =>  "M~(@; "
-        (uri-path-segment-decode "M~(@%3B%20")   =>  "M~(@; "
-        (uri-userinfo-decode "M~(%40;%20")       =>  "M~(@; "
-        (uri-unreserved-decode "M~%28%40%3B%20") =>  "M~(@; "
-        (uri-path-segment-unreserved-decode "M~%28@%3B%20")   =>  "M~(@; "
-
-        (uri-path-segment-decode "M~%28@%3B%20")   =>  "M~(@; "
-        (uri-path-segment-unreserved-decode "M~(@%3B%20")   =>  "M~(@; "
-        (uri-encode "æçè") => "%C3%A6%C3%A7%C3%A8"
-        (uri-encode "Kidô senkan Nadeshiko") => "Kid%C3%B4%20senkan%20Nadeshiko"
-        ))
-
-;; tests adapted from Noel Welsh's original test suite
-(define (noels-tests)
-  (define (pad2 str)
-    (if (= (string-length str) 1) (string-append "0" str) str))
-  (define (%hex n)
-    (string-append "%" (pad2 (string-downcase (number->string n 16)))))
-  (define (%HEX n)
-    (string-append "%" (pad2 (string-upcase (number->string n 16)))))
-  (test
-
-   (uri-encode "hello") => "hello"
-   (uri-encode "hello there") => "hello%20there"
-
-   do
-   (for ([code (in-range 128)])
-     (if (or (member code '(33 39 40 41 42 45 46 95 126))
-             (<= 48 code 57)   ; 0-9
-             (<= 65 code 90)   ; A-Z
-             (<= 97 code 122)) ; a-z
-       (test (uri-encode (string (integer->char code)))
-             => (string (integer->char code)))
-       (test (uri-encode (string (integer->char code)))
-             => (%HEX code))))
-
-   (alist->form-urlencoded '()) => ""
-   (alist->form-urlencoded '([key . "hello there"]))
-   => "key=hello+there"
-   (alist->form-urlencoded '([key1 . "hi"] [key2 . "hello"]))
-   => "key1=hi&key2=hello"
-   (alist->form-urlencoded '([key1 . "hello there"]))
-   => "key1=hello+there"
-   (uri-decode "hello")
-   => "hello"
-   (uri-decode "hello%20there")
-   => "hello there"
-
-   ;; these were going from 0 to 255 in Noel's original test suite.
-   ;; Those fail here, however.
-   do (for ([code (in-range 128)])
-        (test (uri-decode (%HEX code)) => (string (integer->char code))
-              (uri-decode (%hex code)) => (string (integer->char code))
-              (uri-decode (string (integer->char code)))
-              => (string (integer->char code))))
-
-   ;; form-urlencoded->alist
-   (form-urlencoded->alist "") => '()
-   (form-urlencoded->alist "key=value")
-   => '([key . "value"])
-   (form-urlencoded->alist "key=hello+there")
-   => '([key . "hello there"])
-   (form-urlencoded->alist "key=a%20value")
-   => '([key . "a value"])
-   (form-urlencoded->alist "key")
-   => '([key . #f])
-   (form-urlencoded->alist "key1=value+1&key2=value+2")
-   => '([key1 . "value 1"] [key2 . "value 2"])
-
-   ))
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/url-port.rkt b/pkgs/net-pkgs/net-test/tests/net/url-port.rkt
deleted file mode 100644
index 7b9e3143f1..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/url-port.rkt
+++ /dev/null
@@ -1,164 +0,0 @@
-#lang racket
-(require net/url
-         mzlib/thread
-         openssl
-         tests/eli-tester)
-
-(define (run-tests scheme wrap-ports skip-actual-redirect?)
-  (define ((make-tester url->port) response . responses)
-    (define first-port-no 9001)
-    (define server-cust
-      (make-custodian))
-    (define wait-sema
-      (make-semaphore))
-    (define my-accept
-      (λ (l)
-        (semaphore-post wait-sema)
-        (tcp-accept l)))
-    (parameterize ([current-custodian server-cust])
-      (for ([response (in-list (cons response responses))]
-            [port-no (in-naturals first-port-no)])
-        (thread
-         (λ ()
-           (run-server port-no
-                       (lambda (ip op)
-                         (let-values ([(ip op) (wrap-ports ip op)])
-                           (regexp-match #rx"(\r\n|^)\r\n" ip)
-                           (display response op)
-                           (close-output-port op)
-                           (close-input-port ip)))
-                       +inf.0
-                       void
-                       tcp-listen
-                       tcp-close
-                       my-accept
-                       my-accept)))))
-    (for ([response (in-list (cons response responses))])
-      (semaphore-wait wait-sema))
-    (dynamic-wind
-        void
-        (λ ()
-          (call-with-values
-              (λ ()
-                (url->port
-                 (url scheme #f "localhost" first-port-no
-                      #t empty empty #f)))
-            (λ vals (apply values (cons (port->string (car vals)) (cdr vals))))))
-        (λ ()
-          (custodian-shutdown-all server-cust))))
-
-  (define get-pure
-    (make-tester get-pure-port))
-  (define get-impure
-    (make-tester get-impure-port))
-  (define get-pure/redirect
-    (make-tester (λ (x) (get-pure-port x #:redirections 1))))
-  (define get-pure/headers
-    (make-tester get-pure-port/headers))
-  (define get-pure/headers/redirect
-    (make-tester (λ (x) (get-pure-port/headers x #:redirections 1))))
-  (define put-pure
-    (make-tester (lambda (url) (put-pure-port url #"data"))))
-  (define put-impure
-    (make-tester (lambda (url) (put-impure-port url #"data"))))
-
-  (test
-   (get-pure
-    "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n24\r\nThis is the data in the first chunk \r\n1A\r\nand this is the second one\r\n0\r\n")
-   =>
-   "This is the data in the first chunk and this is the second one"
-
-   (get-pure
-    "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one")
-   =>
-   "This is the data in the first chunk and this is the second one"
-
-   (get-pure
-    "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n20\r\nThis is the data in the first ch\r\n21\r\nand this is the second oneXXXXXXX\r\n0\r\n")
-   =>
-   "This is the data in the first chand this is the second oneXXXXXXX"
-
-   (get-pure/redirect
-    "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n24\r\nThis is the data in the first chunk \r\n1A\r\nand this is the second one\r\n0\r\n")
-   =>
-   "This is the data in the first chunk and this is the second one"
-
-   (get-pure/redirect
-    "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one")
-   =>
-   "This is the data in the first chunk and this is the second one"
-
-   (get-pure/redirect
-    "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n20\r\nThis is the data in the first ch\r\n21\r\nand this is the second oneXXXXXXX\r\n0\r\n")
-   =>
-   "This is the data in the first chand this is the second oneXXXXXXX"
-
-   (get-impure
-    "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one\r\n")
-   =>
-   "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one\r\n"
-
-   (get-pure/headers
-    "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n24\r\nThis is the data in the first chunk \r\n1A\r\nand this is the second one\r\n0\r\n")
-   =>
-   (values "This is the data in the first chunk and this is the second one"
-           "Content-Type: text/plain\r\nTransfer-Encoding: chunked\r\n")
-
-   (get-pure/headers
-    "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one")
-   =>
-   (values "This is the data in the first chunk and this is the second one"
-           "Content-Type: text/plain\r\n")
-
-   (get-pure/headers
-    "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n20\r\nThis is the data in the first ch\r\n21\r\nand this is the second oneXXXXXXX\r\n0\r\n")
-   =>
-   (values "This is the data in the first chand this is the second oneXXXXXXX"
-           "Content-Type: text/plain\r\nTransfer-Encoding: chunked\r\n")
-
-   (get-pure/headers
-    "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\nAnother-Header: ta-daa\r\n\r\n20\r\nThis is the data in the first ch\r\n21\r\nand this is the second oneXXXXXXX\r\n0\r\n")
-   =>
-   (values "This is the data in the first chand this is the second oneXXXXXXX"
-           "Content-Type: text/plain\r\nTransfer-Encoding: chunked\r\nAnother-Header: ta-daa\r\n")
-   )
-
-  (unless skip-actual-redirect?
-    (test
-     (get-pure/redirect
-      "HTTP/1.1 301 Moved Permanently\r\nLocation: http://localhost:9002/whatever\r\n\r\nstuff"
-      (string-append
-       "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n"
-       "24\r\nThis is the data in the first chunk \r\n1A\r\nand this is the second one\r\n0\r\n"))
-
-     (get-pure/headers/redirect
-      "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\nAnother-Header: ta-daa\r\n\r\n20\r\nThis is the data in the first ch\r\n21\r\nand this is the second oneXXXXXXX\r\n0\r\n")
-     =>
-     (values "This is the data in the first chand this is the second oneXXXXXXX"
-             "Content-Type: text/plain\r\nTransfer-Encoding: chunked\r\nAnother-Header: ta-daa\r\n")))
-
-  (test
-   (put-pure
-    "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nTransfer-Encoding: chunked\r\n\r\n24\r\nThis is the data in the first chunk \r\n1A\r\nand this is the second one\r\n0\r\n")
-   =>
-   "This is the data in the first chunk and this is the second one"
-   (put-impure
-    "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one\r\n")
-   =>
-   "HTTP/1.0 200 OK\r\nContent-Type: text/plain\r\n\r\nThis is the data in the first chunk and this is the second one\r\n"))
-
-(provide tests)
-(module+ main (tests))
-(define (tests)
-  (test
-   (for ([i 100]) ; repeat to catch port leaks
-     (run-tests "http" values #f))
-   (for ([i 100])
-     (run-tests "https" (let ([ctx (ssl-make-server-context)])
-                          (ssl-load-certificate-chain! ctx (collection-file-path "test.pem" "openssl"))
-                          (ssl-load-private-key! ctx (collection-file-path "test.pem" "openssl"))
-                          (lambda (in out)
-                            (ports->ssl-ports in out #:mode 'accept #:context ctx)))
-                #t))))
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/url.rkt b/pkgs/net-pkgs/net-test/tests/net/url.rkt
deleted file mode 100644
index 5b2dd51026..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/url.rkt
+++ /dev/null
@@ -1,397 +0,0 @@
-#lang racket
-(require net/url tests/eli-tester
-         (only-in net/uri-codec current-alist-separator-mode))
-
-(define (url->vec url)
-  (vector
-   (url-scheme url)
-   (url-user url)
-   (url-host url)
-   (url-port url)
-   (url-path-absolute? url)
-   (map (lambda (x)
-          (list->vector (cons (path/param-path x) (path/param-param x))))
-        (url-path url))
-   (url-query url)
-   (url-fragment url)))
-
-(define (vec->url vec)
-  (make-url
-   (vector-ref vec 0)
-   (vector-ref vec 1)
-   (vector-ref vec 2)
-   (vector-ref vec 3)
-   (vector-ref vec 4)
-   (map (lambda (x)
-          (let ([lst (vector->list x)])
-            (make-path/param (car lst) (cdr lst))))
-        (vector-ref vec 5))
-   (vector-ref vec 6)
-   (vector-ref vec 7)))
-
-(define (string->url/vec str) (url->vec (string->url str)))
-(define (url/vec->string vec) (url->string (vec->url vec)))
-
-(define (test-s->u vec str)
-  (test (string->url/vec str) => vec
-        (url/vec->string vec) => str))
-
-(define (test-c-u/r expected base relative)
-  (define (combine-url/relative-vec x y)
-    (url->vec (combine-url/relative (vec->url x) y)))
-  (define (->vec x) (url->vec (if (string? x) (string->url x) x)))
-  (test (combine-url/relative-vec (->vec base) relative)
-        => (->vec expected)))
-
-(provide tests)
-(module+ main (test do (tests)))
-(define (tests)
-  (test
-   ;; Test the current-proxy-servers parameter can be set
-   (parameterize ([current-proxy-servers '(("http" "proxy.com" 3128))])
-     (current-proxy-servers))
-   => '(("http" "proxy.com" 3128)))
-
-  (test-s->u #(#f #f #f #f #t (#("")) () #f)
-             "/")
-  (test-s->u #(#f #f #f #f #f () () #f)
-             "")
-
-  (test-s->u #("http" #f #f #f #t (#("")) () #f)
-             "http:/")
-
-  (test-s->u #("http" #f "" #f #t (#("")) () #f)
-             "http:///")
-
-  (test-s->u #("http" #f "www.drscheme.org" #f #f () () #f)
-             "http://www.drscheme.org")
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("")) () #f)
-             "http://www.drscheme.org/")
-
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a") #("b") #("c")) () #f)
-             "http://www.drscheme.org/a/b/c")
-  (test-s->u #("http" "robby" "www.drscheme.org" #f #t (#("a") #("b") #("c")) () #f)
-             "http://robby@www.drscheme.org/a/b/c")
-  (test-s->u #("http" #f "www.drscheme.org" 8080 #t (#("a") #("b") #("c")) () #f)
-             "http://www.drscheme.org:8080/a/b/c")
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a") #("b") #("c")) () "joe")
-             "http://www.drscheme.org/a/b/c#joe")
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a") #("b") #("c")) ((tim . "")) #f)
-             "http://www.drscheme.org/a/b/c?tim=")
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a") #("b") #("c")) ((tim . "")) "joe")
-             "http://www.drscheme.org/a/b/c?tim=#joe")
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a") #("b") #("c")) ((tim . "tim")) "joe")
-             "http://www.drscheme.org/a/b/c?tim=tim#joe")
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a") #("b") #("c")) ((tam . "tom")) "joe")
-             "http://www.drscheme.org/a/b/c?tam=tom#joe")
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a") #("b") #("c")) ((tam . "tom") (pam . "pom")) "joe")
-             "http://www.drscheme.org/a/b/c?tam=tom&pam=pom#joe")
-  (parameterize ([current-alist-separator-mode 'semi])
-    (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a") #("b") #("c")) ((tam . "tom") (pam . "pom")) "joe")
-               "http://www.drscheme.org/a/b/c?tam=tom;pam=pom#joe"))
-  (parameterize ([current-alist-separator-mode 'amp])
-    (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a") #("b") #("c")) ((tam . "tom") (pam . "pom")) "joe")
-               "http://www.drscheme.org/a/b/c?tam=tom&pam=pom#joe"))
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a") #("b") #("c" "b")) () #f)
-             "http://www.drscheme.org/a/b/c;b")
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a" "x") #("b") #("c" "b")) () #f)
-             "http://www.drscheme.org/a;x/b/c;b")
-
-  ;; test unquoting for %
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a") #("b") #("c")) ((ti#m . "")) "jo e")
-             "http://www.drscheme.org/a/b/c?ti%23m=#jo%20e")
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a " " a") #(" b ") #(" c ")) () #f)
-             "http://www.drscheme.org/a%20;%20a/%20b%20/%20c%20")
-  (test-s->u #("http" "robb y" "www.drscheme.org" #f #t (#("")) () #f)
-             "http://robb%20y@www.drscheme.org/")
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("%a") #("b/") #("c")) () #f)
-             "http://www.drscheme.org/%25a/b%2F/c")
-  (test-s->u #("http" "robby:password" "www.drscheme.org" #f #t (#("")) () #f)
-             "http://robby:password@www.drscheme.org/")
-  (test "robby:password" (lambda (x) (url-user (string->url x))) "http://robby%3apassword@www.drscheme.org/")
-
-  ;; test the characters that need to be encoded in paths vs those that do not need to
-  ;; be encoded in paths
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a:@!$&'()*+,=z") #("/?#[];") #("")) () "@!$&'()*+,=z")
-             "http://www.drscheme.org/a:@!$&'()*+,=z/%2F%3F%23%5B%5D%3B/#%40!%24%26'()*%2B%2C%3Dz")
-  (parameterize ([current-url-encode-mode 'unreserved])
-    (test-s->u #("http" #f "www.drscheme.org" #f #t (#("a:@!$&'()*+,=z") #("/?#[];") #("")) () "@!$&'()*+,=z")
-               "http://www.drscheme.org/a:@%21$&%27%28%29%2A+,=z/%2F%3F%23%5B%5D%3B/#%40%21%24%26%27%28%29%2A%2B%2C%3Dz"))
-
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#(".") #("..") #(same) #(up) #("...") #("abc.def")) () #f)
-             "http://www.drscheme.org/%2e/%2e%2e/./../.../abc.def")
-  (test-s->u #("http" #f "www.drscheme.org" #f #t (#("." "") #(".." "") #(same "") #(up "") #("..." "") #("abc.def" "")) () #f)
-             "http://www.drscheme.org/%2e;/%2e%2e;/.;/..;/...;/abc.def;")
-
-  ;; test other scheme identifiers
-  (test-s->u #("blah" #f "www.foo.com" #f #t (#("")) () #f)
-             "blah://www.foo.com/")
-  (test-s->u #("blah99" #f "www.foo.com" #f #t (#("")) () #f)
-             "blah99://www.foo.com/")
-  (test-s->u #("blah+" #f "www.foo.com" #f #t (#("")) () #f)
-             "blah+://www.foo.com/")
-  (test-s->u #("a+b-c456.d" #f "www.foo.com" #f #t (#("")) () #f)
-             "a+b-c456.d://www.foo.com/")
-
-  ;; a colon and other junk (`sub-delims') can appear in usernames
-  (test #("http" "x:!$&'()*+,;=y" "www.drscheme.org" #f #t (#("a")) () #f)
-        string->url/vec
-        "http://x:!$&'()*+,;=y@www.drscheme.org/a")
-  ;; a colon and atsign can appear in absolute paths
-  (test-s->u #(#f #f #f #f #t (#("x:@y") #("z")) () #f)
-             "/x:@y/z")
-  ;; and in relative paths as long as it's not in the first element
-  (test-s->u #(#f #f #f #f #f (#("x") #("y:@z")) () #f)
-             "x/y:@z")
-
-  ;; test bad schemes
-  (test
-   (string->url "://www.foo.com/")    =error> url-exception?
-   (string->url "9://www.foo.com/")   =error> url-exception?
-   (string->url "9a://www.foo.com/")  =error> url-exception?
-   (string->url "a*b://www.foo.com/") =error> url-exception?
-   (string->url "a b://www.foo.com/") =error> url-exception?)
-
-  ;; test file: urls
-  (test-s->u #("file" #f "" #f #t (#("abc") #("def.html")) () #f)
-             "file:///abc/def.html")
-  (test (url->string (string->url "file:///abc/def.html"))
-        => "file:///abc/def.html")
-  (parameterize ([file-url-path-convention-type 'unix])
-    (test (url->string (string->url "file://a/b"))
-          => "file://a/b")
-    (test-s->u #("file" #f "localhost" #f #t (#("abc") #("def.html")) () #f)
-               "file://localhost/abc/def.html"))
-
-  ;; test files: urls with colons, and the different parsing on Windows
-  (test-s->u #("file" #f "localhost" 123 #t (#("abc") #("def.html")) () #f)
-             "file://localhost:123/abc/def.html")
-  (parameterize ([file-url-path-convention-type 'unix])
-    ;; different parse for file://foo:/...
-    (test (string->url/vec "file://foo:/abc/def.html")
-          => #("file" #f "foo" #f #t (#("abc") #("def.html")) () #f)))
-  (parameterize ([file-url-path-convention-type 'windows])
-    (test (string->url/vec "file://foo:/abc/def.html")
-          => #("file" #f "" #f #t (#("foo:") #("abc") #("def.html")) () #f)
-          (string->url/vec "file://c:/abc/def.html")
-          => #("file" #f "" #f #t (#("c:") #("abc") #("def.html")) () #f)
-          (string->url/vec "file:\\\\d\\c\\abc\\def.html")
-          => #("file" #f "" #f #t (#("") #("d") #("c") #("abc") #("def.html")) () #f)))
-
-  (parameterize ([file-url-path-convention-type 'unix])
-    ;; but no effect on http://foo:/...
-    (test (string->url/vec "http://foo:/abc/def.html")
-          => #("http" #f "foo" #f #t (#("abc") #("def.html")) () #f)))
-  (parameterize ([file-url-path-convention-type 'windows])
-    (test (string->url/vec "http://foo:/abc/def.html")
-          => #("http" #f "foo" #f #t (#("abc") #("def.html")) () #f)))
-
-  (test (url->string (path->url (bytes->path #"/a/b" 'unix)))
-        => "file:///a/b"
-        (url->string (path->url (bytes->path #"/a/b/" 'unix)))
-        => "file:///a/b/"
-        (url->string (path->url (bytes->path #"c:\\a\\b" 'windows)))
-        => "file:///c:/a/b"
-        (url->string (path->url (bytes->path #"c:\\a\\b\\" 'windows)))
-        => "file:///c:/a/b/"
-        (url->string (path->url (bytes->path #"\\\\?\\c:\\a\\b" 'windows)))
-        => "file:///c:/a/b"
-        (url->string (path->url (bytes->path #"\\\\?\\c:\\a\\b\\" 'windows)))
-        => "file:///c:/a/b/")
-
-  (test
-   (path->bytes (url->path (path->url (bytes->path #"/a/b/c" 'unix)) 'unix))
-   => #"/a/b/c"
-   (path->bytes (url->path (path->url (bytes->path #"/a/b/c/" 'unix)) 'unix))
-   => #"/a/b/c/."
-   (path->bytes (url->path (path->url (bytes->path #"a/b/c" 'unix)) 'unix))
-   => #"a/b/c"
-   (path->bytes (url->path (path->url (bytes->path #"a/b/c/" 'unix)) 'unix))
-   => #"a/b/c/."
-   (path->bytes (url->path (path->url (bytes->path #"c:/a/b" 'windows)) 'windows))
-   => #"c:\\a\\b"
-   (path->bytes (url->path (path->url (bytes->path #"c:/a/b/" 'windows)) 'windows))
-   => #"c:\\a\\b\\."
-   (path->bytes (url->path (path->url (bytes->path #"a/b" 'windows)) 'windows))
-   => #"a\\b"
-   (path->bytes (url->path (path->url (bytes->path #"a/b/" 'windows)) 'windows))
-   => #"a\\b\\."
-   (path->bytes (url->path (path->url (bytes->path #"//d/c/a" 'windows)) 'windows))
-   => #"\\\\d\\c\\a"
-   (path->bytes (url->path (path->url (bytes->path #"//d/c/a/" 'windows)) 'windows))
-   => #"\\\\d\\c\\a\\."
-   (path->bytes (url->path (path->url (bytes->path #"\\\\?\\c:\\a\\b" 'windows)) 'windows))
-   => #"c:\\a\\b"
-   (path->bytes (url->path (path->url (bytes->path #"\\\\?\\UNC\\d\\c\\a\\b" 'windows)) 'windows))
-   => #"\\\\d\\c\\a\\b"
-   (path->bytes (url->path (path->url (bytes->path #"\\\\?\\c:\\a/x\\b" 'windows)) 'windows))
-   => #"\\\\?\\c:\\a/x\\b"
-   (path->bytes (url->path (path->url (bytes->path #"\\\\?\\UNC\\d\\\\c\\a/x\\b" 'windows)) 'windows))
-   => #"\\\\?\\UNC\\d\\c\\a/x\\b")
-
-  ;; see PR8809 (value-less keys in the query part)
-  (test-s->u #("http" #f "foo.bar" #f #t (#("baz")) ((ugh . #f)) #f)
-             "http://foo.bar/baz?ugh")
-  (test-s->u #("http" #f "foo.bar" #f #t (#("baz")) ((ugh . "")) #f)
-             "http://foo.bar/baz?ugh=")
-  (test-s->u #("http" #f "foo.bar" #f #t (#("baz")) ((ugh . #f) (x . "y") (|1| . "2")) #f)
-             "http://foo.bar/baz?ugh&x=y&1=2")
-  (test-s->u #("http" #f "foo.bar" #f #t (#("baz")) ((ugh . "") (x . "y") (|1| . "2")) #f)
-             "http://foo.bar/baz?ugh=&x=y&1=2")
-
-  (parameterize ([current-alist-separator-mode 'amp])
-    (test-s->u #("http" #f "foo.bar" #f #t (#("baz")) ((ugh . #f) (x . "y") (|1| . "2")) #f)
-               "http://foo.bar/baz?ugh&x=y&1=2"))
-  (parameterize ([current-alist-separator-mode 'semi])
-    (test-s->u #("http" #f "foo.bar" #f #t (#("baz")) ((ugh . #f) (x . "y") (|1| . "2")) #f)
-               "http://foo.bar/baz?ugh;x=y;1=2"))
-
-  ;; test case sensitivity
-  (test (string->url/vec
-         "HTTP://ROBBY@WWW.DRSCHEME.ORG:80/INDEX.HTML;XXX?T=P#YYY")
-        => #("http" "ROBBY" "www.drscheme.org" 80 #t (#("INDEX.HTML" "XXX")) ((T . "P")) "YYY"))
-
-  (test-s->u #("mailto" #f #f #f #f (#("robby@racket-lang.org")) () #f)
-             "mailto:robby@racket-lang.org")
-
-  ;; The following two tests are not really correct: they rely on the URL
-  ;; decoding silently passing un-encoded text as is instead of barfing.  (Eg,
-  ;; using these URLs in a browser and then copy-pasting it from the address
-  ;; should get you a properly encoded string instead.)
-  (test (string->url/vec "http://www.drscheme.org?bar=馨慧")
-        #("http" #f "www.drscheme.org" #f #f () ((bar . "馨慧")) #f))
-  (test (string->url/vec "http://www.drscheme.org?bár=é")
-        => #("http" #f "www.drscheme.org" #f #f () ((bár . "é")) #f))
-
-  (test-c-u/r "http://www.drscheme.org"
-              (make-url #f #f #f #f #f '() '() #f)
-              "http://www.drscheme.org")
-
-  (test-c-u/r "http://www.drscheme.org"
-              "http://www.drscheme.org"
-              "")
-
-  (test-c-u/r "http://www.mzscheme.org"
-              "http://www.drscheme.org/"
-              "http://www.mzscheme.org")
-
-  (test-c-u/r "http://www.drscheme.org/index.html"
-              "http://www.drscheme.org/"
-              "index.html")
-  (test-c-u/r "http://www.drscheme.org/index.html"
-              "http://www.drscheme.org/"
-              "/index.html")
-  (test-c-u/r "http://www.drscheme.org/index.html"
-              "http://www.drscheme.org/a/b/c/"
-              "/index.html")
-  (test-c-u/r "http://www.drscheme.org/a/b/index.html"
-              "http://www.drscheme.org/a/b/c"
-              "index.html")
-  (test-c-u/r "http://www.drscheme.org/a/b/c/index.html"
-              "http://www.drscheme.org/a/b/c/"
-              "index.html")
-  (test-c-u/r "http://www.drscheme.org/a/b/d/index.html"
-              "http://www.drscheme.org/a/b/c"
-              "d/index.html")
-  (test-c-u/r "http://www.drscheme.org/a/b/c/d/index.html"
-              "http://www.drscheme.org/a/b/c/"
-              "d/index.html")
-  (test-c-u/r "http://www.drscheme.org/a/b/index.html"
-              "http://www.drscheme.org/a/b/c/"
-              "../index.html")
-  (test-c-u/r "http://www.drscheme.org/a/b/c/index.html"
-              "http://www.drscheme.org/a/b/c/"
-              "./index.html")
-  (test-c-u/r "http://www.drscheme.org/a/b/c/%2e%2e/index.html"
-              "http://www.drscheme.org/a/b/c/"
-              "%2e%2e/index.html")
-  (test-c-u/r "http://www.drscheme.org/a/index.html"
-              "http://www.drscheme.org/a/b/../c/"
-              "../index.html")
-
-  (test-c-u/r "http://www.drscheme.org/a/b/c/d/index.html"
-              "http://www.drscheme.org/a/b/c/d/index.html#ghijkl"
-              "index.html")
-  (test-c-u/r "http://www.drscheme.org/a/b/c/d/index.html#abcdef"
-              "http://www.drscheme.org/a/b/c/d/index.html#ghijkl"
-              "#abcdef")
-
-  (test-c-u/r "file:///a/b/c/d/index.html"
-              "file:///a/b/c/"
-              "d/index.html")
-  (test-c-u/r "file:///a/b/d/index.html"
-              "file:///a/b/c"
-              "d/index.html")
-
-  ;; tests from rfc 3986
-  (for-each
-   (λ (line) (test-c-u/r (caddr line) "http://a/b/c/d;p?q" (car line)))
-   '(("g:h"           =  "g:h")
-     ("g"             =  "http://a/b/c/g")
-     ("./g"           =  "http://a/b/c/g")
-     ("g/"            =  "http://a/b/c/g/")
-     ("/g"            =  "http://a/g")
-     ("//g"           =  "http://g")
-     ("?y"            =  "http://a/b/c/d;p?y")
-     ("g?y"           =  "http://a/b/c/g?y")
-     ("#s"            =  "http://a/b/c/d;p?q#s")
-     ("g#s"           =  "http://a/b/c/g#s")
-     ("g?y#s"         =  "http://a/b/c/g?y#s")
-     (";x"            =  "http://a/b/c/;x")
-     ("g;x"           =  "http://a/b/c/g;x")
-     ("g;x?y#s"       =  "http://a/b/c/g;x?y#s")
-     (""              =  "http://a/b/c/d;p?q")
-     ("."             =  "http://a/b/c/")
-     ("./"            =  "http://a/b/c/")
-     (".."            =  "http://a/b/")
-     ("../"           =  "http://a/b/")
-     ("../g"          =  "http://a/b/g")
-     ("../.."         =  "http://a/")
-     ("../../"        =  "http://a/")
-     ("../../g"       =  "http://a/g")
-
-     ;; abnormal examples follow
-
-     ("../../../g"    =  "http://a/g")
-     ("../../../../g" =  "http://a/g")
-
-     ("/./g"          =  "http://a/g")
-     ("/../g"         =  "http://a/g")
-     ("g."            =  "http://a/b/c/g.")
-     (".g"            =  "http://a/b/c/.g")
-     ("g.."           =  "http://a/b/c/g..")
-     ("..g"           =  "http://a/b/c/..g")
-
-     ("./../g"        =  "http://a/b/g")
-     ("./g/."         =  "http://a/b/c/g/")
-     ("g/./h"         =  "http://a/b/c/g/h")
-     ("g/../h"        =  "http://a/b/c/h")
-     ("g;x=1/./y"     =  "http://a/b/c/g;x=1/y")
-     ("g;x=1/../y"    =  "http://a/b/c/y")
-
-     ("g?y/./x"       =  "http://a/b/c/g?y/./x")
-     ("g?y/../x"      =  "http://a/b/c/g?y/../x")
-     ("g#s/./x"       =  "http://a/b/c/g#s/./x")
-     ("g#s/../x"      =  "http://a/b/c/g#s/../x")
-     ("http:g"        =  "http:g")         ; for strict parsers
-
-     ))
-
-  (test (relative-path->relative-url-string "a")
-        => "a")
-  (test (relative-path->relative-url-string "a/")
-        => "a/")
-  (test (relative-path->relative-url-string "a/b")
-        => "a/b")
-  (test (relative-path->relative-url-string (build-path "a" 'up "b"))
-        => "a/../b")
-  (test (relative-path->relative-url-string (build-path "a" 'same "b" 'up))
-        => "a/./b/../")
-  (test (relative-path->relative-url-string (build-path "a&c;" 'same "b"))
-        => "a%26c%3B/./b")
-  (test (relative-path->relative-url-string (bytes->path '#"\\\\?\\REL\\a\\b/c\\d" 'windows))
-        => "a/b%2Fc/d")
-
-  )
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket.rkt b/pkgs/net-pkgs/net-test/tests/net/websocket.rkt
deleted file mode 100644
index 9da949228d..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/websocket.rkt
+++ /dev/null
@@ -1,97 +0,0 @@
-#lang racket
-(require net/websocket/client
-         net/websocket/server
-         net/websocket/conn
-         net/websocket/handshake
-         racket/async-channel
-         net/url
-         rackunit
-         tests/net/available
-         tests/eli-tester)
-
-(define RANDOM-K 100)
-
-(provide tests)
-(module+ main (tests))
-(define (tests)
-  (test
-   (for ([i (in-range RANDOM-K)])
-     (define o (random 256))
-     (define t (random 256))
-     (define bot (if (o . < . t) o t))
-     (define top (if (o . < . t) t o))
-     (define botc (integer->char bot))
-     (define topc (integer->char top))
-     (test #:failure-prefix (format "~a / ~a" botc topc)
-           (<= bot (char->integer (random-char-between botc topc)) top)))
-
-   (for ([i (in-range RANDOM-K)])
-     (test (char-alphabetic? (random-alpha-char))))
-
-   (count-spaces "") => 0
-   (count-spaces "   ") => 3
-   (count-spaces (make-string RANDOM-K #\space)) => RANDOM-K
-
-   (count-spaces "18x 6]8vM;54 *(5:  {   U1]8  z [  8") => 12
-   (count-spaces "1_ tx7X d  <  nw  334J702) 7]o}` 0") => 10
-
-   (for ([i (in-range RANDOM-K)])
-     (define len (add1 i))
-     (define s (make-string len #\0))
-     (define how-many (random len))
-     (test (count-spaces (add-spaces how-many s)) => how-many))
-
-   (remove-alphas "A0A") => "0"
-   (remove-alphas "0") => "0"
-   (remove-alphas (make-string RANDOM-K #\A)) => ""
-
-   (remove-alphas "18x 6]8vM;54 *(5:  {   U1]8  z [  8") => "1868545188"
-   (remove-alphas "1_ tx7X d  <  nw  334J702) 7]o}` 0") => "1733470270"
-
-   (for ([i (in-range RANDOM-K)])
-     (define s (number->string i))
-     (test (remove-alphas (add-alphas s)) => s))
-
-   (key->number "18x 6]8vM;54 *(5:  {   U1]8  z [  8") => 155712099
-   (key->number "1_ tx7X d  <  nw  334J702) 7]o}` 0") => 173347027
-
-   (for ([i (in-range RANDOM-K)])
-     (test (key->number (number->key i)) => i))
-
-   (for ([i (in-range RANDOM-K)])
-     (define-values (k1 k2 k3 ans) (generate-key))
-     (test (handshake-solution k1 k2 k3) => ans))
-
-   (handshake-solution "18x 6]8vM;54 *(5:  {   U1]8  z [  8"
-                       "1_ tx7X d  <  nw  334J702) 7]o}` 0"
-                       #"Tm[K T2u")
-   => #"fQJ,fN/4F4!~K~MH"
-
-   (local [(define (test-echo-server)
-             (define r (number->string (random 1000)))
-             (define confirm (make-async-channel))
-             (define shutdown!
-               (ws-serve #:port 0
-                         #:confirmation-channel confirm
-                         (λ (wsc _)
-                           (let loop ()
-                             (define m (ws-recv wsc))
-                             (unless (eof-object? m)
-                               (ws-send! wsc m)
-                               (loop))))))             
-             (define p (async-channel-get confirm))
-             (define conn
-               (ws-connect (string->url (format "ws://localhost:~a" p))))
-             (test (ws-send! conn r)
-                   (ws-recv conn) => r
-                   (ws-send! conn "a")
-                   (ws-recv conn) => "a"
-                   (ws-close! conn))
-             (test (shutdown!)))]
-          (when (tcp-localhost-available?)
-            (test #:failure-prefix "old"
-                  (parameterize ([framing-mode 'old]) (test-echo-server))
-                  #:failure-prefix "new"
-                  (parameterize ([framing-mode 'new]) (test-echo-server)))))))
-
-(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket/example.rkt b/pkgs/net-pkgs/net-test/tests/net/websocket/example.rkt
deleted file mode 100644
index 48f20a9b48..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/websocket/example.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket
-(require net/websocket
-         web-server/http
-         racket/runtime-path
-         web-server/templates
-         web-server/servlet-env)
-
-(module test racket/base)
-
-(framing-mode 'old)
-
-(define stop-ws!
-  (ws-serve (λ (wsc _)
-              (let loop ()
-                (define m (ws-recv wsc))
-                (printf "~a\n" m)
-                (unless (eof-object? m)
-                  (ws-send! wsc m)
-                  (loop))))
-            #:conn-headers 
-            (λ (_ hs)
-              (define origin (header-value (headers-assq* #"Origin" hs)))
-              (values (list (make-header #"Sec-WebSocket-Origin" origin)
-                            (make-header #"Sec-WebSocket-Location" #"ws://localhost:8080/"))
-                      #f))
-            #:port 8080))
-
-(define-runtime-path example-pth ".")
-
-(serve/servlet (λ (req)
-                 (response/full
-                  200 #"Okay"
-                  (current-seconds) TEXT/HTML-MIME-TYPE
-                  empty
-                  (list (string->bytes/utf-8 (include-template "index.html")))))
-               #:servlet-path "/"
-               #:port 8081
-               #:extra-files-paths (list example-pth))
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket/index.html b/pkgs/net-pkgs/net-test/tests/net/websocket/index.html
deleted file mode 100644
index 11da6ed2b8..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/websocket/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
-    <title>Websocket Test</title>
-    <link rel="stylesheet" href="style.css" type="text/css"/>
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.min.js"></script>
-    <script src="script.js"></script>
-  </head>
-  <body>
-    <div id="body">
-      <div id="inbox">
-      </div>
-      <div id="input">
-        <form action="#" method="post" id="commandForm" onSubmit="return newCommand()">
-          <fieldset>
-            <legend>Command</legend>
-            <input id="commandInput" type="text" style="width:500px" />
-            <input id="submit" type="submit" value="Send" />
-          </fieldset>
-        </form>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket/info.rkt b/pkgs/net-pkgs/net-test/tests/net/websocket/info.rkt
deleted file mode 100644
index 84ad0ac2d5..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/websocket/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket/script.js b/pkgs/net-pkgs/net-test/tests/net/websocket/script.js
deleted file mode 100644
index 245509c0ea..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/websocket/script.js
+++ /dev/null
@@ -1,72 +0,0 @@
-var ws;
-
-$(document).ready(function() {
-    if (!window.console) window.console = {};
-    if (!window.console.log) window.console.log = function() {};
-
-    ws = new WebSocket("ws://localhost:8080/");
-
-    ws.onopen = function() {
-        console.log("websocket connected");
-        ws.onmessage = function(event) {
-            showCommand(eval("\"" + event.data + "\""));
-        };
-
-        $(window).bind('beforeunload', function() {
-            ws.close();
-        });
-    };
-
-    ws.onclose = function() {
-        console.log("websocket disconnected");
-    };
-
-    $("#commandForm").bind("submit", function(e) {
-        e.preventDefault();
-        e.stopPropagation();
-
-        newCommand($(this));
-        return false;
-    });
-
-    $("#commandForm").bind("keypress", function(e) {
-        if (e.keyCode == 13) {
-            e.preventDefault();
-            e.stopPropagation();
-
-            newCommand($(this));
-        }
-    });
-
-    $("#commandInput").select();
-});
-
-function newCommand(form) {
-    var submit = form.find("#commandSubmit");
-    var text = form.find("#commandInput");
-    submit.disable();
-    ws.send(text.val());
-    text.val("").select();
-    submit.enable();
-}
-
-function showCommand(message) {
-    var node = $("<p>" + message + "</p>");
-    node.hide();
-    $("#inbox").append(node);
-    node.show();
-}
-
-jQuery.fn.enable = function(opt_enable) {
-    if (arguments.length && !opt_enable) {
-        this.attr("disabled", "disabled");
-    } else {
-        this.removeAttr("disabled");
-    }
-    return this;
-};
-
-jQuery.fn.disable = function() {
-    this.enable(false);
-    return this;
-};
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket/style.css b/pkgs/net-pkgs/net-test/tests/net/websocket/style.css
deleted file mode 100644
index 1c40ba43b0..0000000000
--- a/pkgs/net-pkgs/net-test/tests/net/websocket/style.css
+++ /dev/null
@@ -1,48 +0,0 @@
-body {
-  background: white;
-  margin: 10px;
-}
-
-body,
-input {
-  font-family: sans-serif;
-  font-size: 10pt;
-  color: black;
-}
-
-table {
-  border-collapse: collapse;
-  border: 0;
-}
-
-td {
-  border: 0;
-  padding: 0;
-}
-
-#body {
-  position: absolute;
-  bottom: 10px;
-  left: 10px;
-}
-
-#input {
-  margin-top: 0.5em;
-}
-
-#inbox div {
-  padding-top: 0.25em;
-}
-
-#nav {
-  float: right;
-  z-index: 99;
-}
-
-legend {
-    display: none;
-}
-
-fieldset {
-    border: none;
-}
diff --git a/pkgs/net-pkgs/net/LICENSE.txt b/pkgs/net-pkgs/net/LICENSE.txt
deleted file mode 100644
index 22e1fe08dc..0000000000
--- a/pkgs/net-pkgs/net/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-net
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/net-pkgs/net/info.rkt b/pkgs/net-pkgs/net/info.rkt
deleted file mode 100644
index 714e51b715..0000000000
--- a/pkgs/net-pkgs/net/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("net-lib" "net-doc"))
-(define implies '("net-lib" "net-doc"))
-
-(define pkg-desc "Networking libraries")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-doc/LICENSE.txt b/pkgs/parser-tools-pkgs/parser-tools-doc/LICENSE.txt
deleted file mode 100644
index c424668829..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-parser-tools-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/parser-tools-pkgs/parser-tools-doc/info.rkt b/pkgs/parser-tools-pkgs/parser-tools-doc/info.rkt
deleted file mode 100644
index a9c125493f..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-doc/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-(define build-deps '("scheme-lib"
-                     "racket-doc"
-                     "syntax-color-doc"
-                     "parser-tools-lib"
-                     "scribble-lib"))
-(define update-implies '("parser-tools-lib"))
-
-(define pkg-desc "documentation part of \"parser-tools\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-doc/parser-tools/info.rkt b/pkgs/parser-tools-pkgs/parser-tools-doc/parser-tools/info.rkt
deleted file mode 100644
index ffc8c17784..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-doc/parser-tools/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("parser-tools.scrbl" (multi-page) (parsing-library))))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-doc/parser-tools/parser-tools.scrbl b/pkgs/parser-tools-pkgs/parser-tools-doc/parser-tools/parser-tools.scrbl
deleted file mode 100644
index 9bc5ef56ea..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-doc/parser-tools/parser-tools.scrbl
+++ /dev/null
@@ -1,751 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/struct scribble/xref scribble/bnf
-          (for-label scheme/base
-                     scheme/contract
-                     parser-tools/lex
-                     (prefix-in : parser-tools/lex-sre)
-                     parser-tools/yacc
-                     parser-tools/cfg-parser))
-
-@title{Parser Tools: @exec{lex} and @exec{yacc}-style Parsing}
-
-@author["Scott Owens"]
-
-This documentation assumes familiarity with @exec{lex} and @exec{yacc}
-style lexer and parser generators.
-
-@table-of-contents[]
-
-@; ----------------------------------------------------------------------
-
-@section{Lexers}
-
-@section-index["lex"]
-@section-index["scanning"]
-@section-index["scanner"]
-
-@defmodule[parser-tools/lex]
-
-@; ----------------------------------------
-
-@subsection{Creating a Lexer}
-
-@defform/subs[#:literals (repetition union intersection complement concatenation
-                          char-range char-complement
-                          eof special special-comment)
-              (lexer [trigger action-expr] ...)
-              ([trigger re
-                        (eof)
-                        (special)
-                        (special-comment)]
-               [re id
-                   string
-                   character
-                   (repetition lo hi re)
-                   (union re ...)
-                   (intersection re ...)
-                   (complement re)
-                   (concatenation re ...)
-                   (char-range char char)
-                   (char-complement re)
-                   (id datum ...)])]{
-
-     Produces a function that takes an input-port, matches the
-     @racket[re] patterns against the buffer, and returns the result of
-     executing the corresponding @racket[action-expr]. When multiple
-     patterns match, a lexer will choose the longest match, breaking
-     ties in favor of the rule appearing first.
-
-     @margin-note{The implementation of @racketmodname[syntax-color/racket-lexer]
-                 contains a lexer for the @racketmodname[racket] language.
-                 In addition, files in the @filepath{examples} sub-directory
-                 of the @filepath{parser-tools} collection contain
-                 simpler example lexers.}
-
-     An @racket[re] is matched as follows:
-
-   @itemize[
-    @item{@racket[id] --- expands to the named @deftech{lexer abbreviation};
-          abbreviations are defined via @racket[define-lex-abbrev] or supplied by modules
-          like @racketmodname[parser-tools/lex-sre].}
-    @item{@racket[string] --- matches the sequence of characters in @racket[string].}
-    @item{@racket[character] --- matches a literal @racket[character].}
-    @item{@racket[(repetition lo hi re)] --- matches @racket[re] repeated between @racket[lo]
-          and @racket[hi] times, inclusive; @racket[hi] can be @racket[+inf.0] for unbounded repetitions.}
-    @item{@racket[(union re ...)] --- matches if any of the sub-expressions match}
-    @item{@racket[(intersection re ...)] --- matches if all of the @racket[re]s match.}
-    @item{@racket[(complement re)] --- matches anything that @racket[re] does not.}
-    @item{@racket[(concatenation re ...)] --- matches each @racket[re] in succession.}
-    @item{@racket[(char-range char char)] --- matches any character between the two (inclusive); 
-         a single character string can be used as a @racket[char].}
-    @item{@racket[(char-complement re)] --- matches any character not matched by @racket[re].
-          The sub-expression must be a set of characters @racket[re].}
-    @item{@racket[(id datum ...)] --- expands the @deftech{lexer macro} named @racket[id]; macros
-          are defined via @racket[define-lex-trans].}
-   ]
-
-Note that both @racket[(concatenation)] and @racket[""] match the
-empty string, @racket[(union)] matches nothing,
-@racket[(intersection)] matches any string, and
-@racket[(char-complement (union))] matches any single character.
-
-The regular expression language is not designed to be used directly,
-but rather as a basis for a user-friendly notation written with
-regular expression macros.  For example,
-@racketmodname[parser-tools/lex-sre] supplies operators from Olin
-Shivers's SREs, and @racketmodname[parser-tools/lex-plt-v200] supplies
-(deprecated) operators from the previous version of this library.
-Since those libraries provide operators whose names match other Racket
-bindings, such as @racket[*] and @racket[+], they normally must be
-imported using a prefix:
-
-@racketblock[
-(require (prefix-in : parser-tools/lex-sre))
-]
-
-The suggested prefix is @racket[:], so that @racket[:*] and
-@racket[:+] are imported.  Of course, a prefix other than @racket[:]
-(such as @racket[re-]) will work too.
-
-Since negation is not a common operator on regular expressions, here
-are a few examples, using @racket[:] prefixed SRE syntax:
-
-@itemize[
-
-@item{@racketblock0[(complement "1")]
-
- Matches all strings except the string @racket["1"], including
- @racket["11"], @racket["111"], @racket["0"], @racket["01"],
- @racket[""], and so on.}
-
-@item{@racketblock0[(complement (:* "1"))]
-
- Matches all strings that are not sequences of @racket["1"],
- including @racket["0"], @racket["00"], @racket["11110"],
- @racket["0111"], @racket["11001010"] and so on.}
-
-@item{@racketblock0[(:& (:: any-string "111" any-string)
-                        (complement (:or (:: any-string "01") (:+ "1"))))]
-
- Matches all strings that have 3 consecutive ones, but not those that
- end in @racket["01"] and not those that are ones only.  These
- include @racket["1110"], @racket["0001000111"] and @racket["0111"]
- but not @racket[""], @racket["11"], @racket["11101"], @racket["111"]
- and @racket["11111"].}
-
-@item{@racketblock0[(:: "/*" (complement (:: any-string "*/" any-string)) "*/")]
-
- Matches Java/C block comments.  @racket["/**/"],
- @racket["/******/"], @racket["/*////*/"], @racket["/*asg4*/"] and so
- on.  It does not match @racket["/**/*/"], @racket["/* */ */"] and so
- on.  @racket[(:: any-string "*/" any-string)] matches any string
- that has a @racket["*/"] in is, so @racket[(complement (:: any-string "*/"
- any-string))] matches any string without a @racket["*/"] in it.}
-
-@item{@racketblock0[(:: "/*" (:* (complement "*/")) "*/")]
-
- Matches any string that starts with @racket["/*"] and ends with
- @racket["*/"], including @racket["/* */ */ */"].
- @racket[(complement "*/")] matches any string except @racket["*/"].
- This includes @racket["*"] and @racket["/"] separately.  Thus
- @racket[(:* (complement "*/"))] matches @racket["*/"] by first
- matching @racket["*"] and then matching @racket["/"].  Any other
- string is matched directly by @racket[(complement "*/")].  In other
- words, @racket[(:* (complement "xx"))] = @racket[any-string].  It is
- usually not correct to place a @racket[:*] around a
- @racket[complement].}
-]
-
-
-     The following binding have special meaning inside of a lexer
-     action:
-
-     @itemize[
-       @item{@racket[start-pos] --- a @racket[position] struct for the first character matched.}
-       @item{@racket[end-pos] --- a @racket[position] struct for the character after the last character in the match.}
-       @item{@racket[lexeme] --- the matched string.}
-       @item{@racket[input-port] --- the input-port being
-            processed (this is useful for matching input with multiple
-            lexers).}
-       @item{@racket[(return-without-pos x)] is a function (continuation) that
-	immediately returns the value of @racket[x] from the lexer.  This useful
-	in a src-pos lexer to prevent the lexer from adding source
-	information.  For example:
-
-	@racketblock[
-	(define get-token
-	  (lexer-src-pos
-	  ...
-	  ((comment) (get-token input-port))
-	  ...))
-	]
-
-	would wrap the source location information for the comment around
-	the value of the recursive call.  Using
-	@racket[((comment) (return-without-pos (get-token input-port)))] 
-	will cause the value of the recursive call to be returned without
-	wrapping position around it.}
-     ]
-
-     The lexer raises an exception @racket[(exn:read)] if none of the
-     regular expressions match the input.  Hint: If @racket[(any-char
-     _custom-error-behavior)] is the last rule, then there will always
-     be a match, and @racket[_custom-error-behavior] is executed to
-     handle the error situation as desired, only consuming the first
-     character from the input buffer.
-
-     In addition to returning characters, input
-     ports can return @racket[eof-object]s.  Custom input ports can
-     also return a @racket[special-comment] value to indicate a
-     non-textual comment, or return another arbitrary value (a
-     special). The non-@racket[re] @racket[trigger] forms handle these
-     cases:
-
-     @itemize[
-
-       @item{The @racket[(eof)] rule is matched when the input port
-       returns an @racket[eof-object] value.  If no @racket[(eof)]
-       rule is present, the lexer returns the symbol @racket['eof]
-       when the port returns an @racket[eof-object] value.}
-
-       @item{The @racket[(special-comment)] rule is matched when the
-       input port returns a @racket[special-comment] structure.  If no
-       @racket[special-comment] rule is present, the lexer
-       automatically tries to return the next token from the input
-       port.}
-
-       @item{The @racket[(special)] rule is matched when the input
-       port returns a value other than a character,
-       @racket[eof-object], or @racket[special-comment] structure.  If
-       no @racket[(special)] rule is present, the lexer returns
-       @racket[(void)].}]
-
-    End-of-files, specials, special-comments and special-errors cannot
-    be parsed via a rule using an ordinary regular expression
-    (but dropping down and manipulating the port to handle them
-     is possible in some situations).
-
-    Since the lexer gets its source information from the port, use
-    @racket[port-count-lines!] to enable the tracking of line and
-    column information.  Otherwise, the line and column information
-    will return @racket[#f].
-
-    When peeking from the input port raises an exception (such as by
-    an embedded XML editor with malformed syntax), the exception can
-    be raised before all tokens preceding the exception have been
-    returned.
-
-    Each time the racket code for a lexer is compiled (e.g. when a
-    @filepath{.rkt} file containing a @racket[lexer] form is loaded),
-    the lexer generator is run.  To avoid this overhead place the
-    lexer into a module and compile the module to a @filepath{.zo}
-    bytecode file.}
-
-@defform[(lexer-src-pos (trigger action-expr) ...)]{
-
-Like @racket[lexer], but for each @racket[_action-result] produced by
-an @racket[action-expr], returns @racket[(make-position-token
-_action-result start-pos end-pos)] instead of simply
-@racket[_action-result].}
-
-@deftogether[(
-@defidform[start-pos]
-@defidform[end-pos]
-@defidform[lexeme]
-@defidform[input-port]
-@defidform[return-without-pos]
-)]{
-
-Use of these names outside of a @racket[lexer] action is a syntax
-error.}
-
-@defstruct[position ([offset exact-positive-integer?]
-                     [line exact-positive-integer?]
-                     [col exact-nonnegative-integer?])]{
-
-   Instances of @racket[position] are bound to @racket[start-pos] and
-   @racket[end-pos]. The @racket[offset] field contains the offset of
-   the character in the input.  The @racket[line] field contains the
-   line number of the character.  The @racket[col] field contains the
-   offset in the current line.}
-
-@defstruct[position-token ([token any/c]
-                           [start-pos position?]
-                           [end-pos position?])]{
-
-   Lexers created with @racket[src-pos-lexers] return instances of @racket[position-token].}
-
-
-@defparam[file-path source any/c]{
-
- A parameter that the lexer uses as the source location if it
- raises a @racket[exn:fail:rad] error.  Setting this parameter allows
- DrRacket, for example, to open the file containing the error.}
-
-
-@; ----------------------------------------
-
-@subsection{Lexer Abbreviations and Macros}
-
-@defform[(char-set string)]{
-
-A @tech{lexer macro} that matches any character in @racket[string].}
-
-@defidform[any-char]{A @tech{lexer abbreviation} that matches any character.}
-
-@defidform[any-string]{A @tech{lexer abbreviation} that matches any string.}
-
-@defidform[nothing]{A @tech{lexer abbreviation} that matches no string.}
-
-@deftogether[(
-@defidform[alphabetic]
-@defidform[lower-case]
-@defidform[upper-case]
-@defidform[title-case]
-@defidform[numeric]
-@defidform[symbolic]
-@defidform[punctuation]
-@defidform[graphic]
-@defidform[whitespace]
-@defidform[blank]
-@defidform[iso-control]
-)]{
-
-@tech{Lexer abbreviations} that match @racket[char-alphabetic?]
-characters, @racket[char-lower-case?] characters, etc.}
-
-@defform[(define-lex-abbrev id re)]{
-
-     Defines a @tech{lexer abbreviation} by associating a regular
-     expression to be used in place of the @racket[id] in other
-     regular expression.  The definition of name has the same scoping
-     properties as a other syntactic binding (e.g., it can be exported
-     from a module).}
-
-@defform[(define-lex-abbrevs (id re) ...)]{
-
-  Like @racket[define-lex-abbrev], but defines several @tech{lexer
-  abbreviations}.}
-
-
-@defform[(define-lex-trans id trans-expr)]{
-
-     Defines a @tech{lexer macro}, where @racket[trans-expr] produces a
-     transformer procedure that takes one argument.  When @racket[(id
-     _datum ...)] appears as a regular expression, it is replaced with
-     the result of applying the transformer to the expression.}
-
-
-@; ----------------------------------------
-
-@subsection{Lexer SRE Operators}
-
-@defmodule[parser-tools/lex-sre]
-
-@; Put the docs in a macro, so that we can bound the scope of
-@; the import of `*', etc.:
-@(define-syntax-rule (lex-sre-doc)
-   (...
-    (begin
-      (require (for-label parser-tools/lex-sre))
-
-@defform[(* re ...)]{
-
-Repetition of @racket[re] sequence 0 or more times.}
-
-@defform[(+ re ...)]{
-
-Repetition of @racket[re] sequence 1 or more times.}
-
-@defform[(? re ...)]{
-
-Zero or one occurrence of @racket[re] sequence.}
-
-@defform[(= n re ...)]{
-
-Exactly @racket[n] occurrences of @racket[re] sequence, where
-@racket[n] must be a literal exact, non-negative number.}
-
-@defform[(>= n re ...)]{
-
-At least @racket[n] occurrences of @racket[re] sequence, where
-@racket[n] must be a literal exact, non-negative number.}
-
-@defform[(** n m re ...)]{
-
-Between @racket[n] and @racket[m] (inclusive) occurrences of
-@racket[re] sequence, where @racket[n] must be a literal exact,
-non-negative number, and @racket[m] must be literally either
-@racket[#f], @racket[+inf.0], or an exact, non-negative number; a
-@racket[#f] value for @racket[m] is the same as @racket[+inf.0].}
-
-@defform[(or re ...)]{
-
-Same as @racket[(union re ...)].}
-
-@deftogether[(
-@defform[(: re ...)]
-@defform[(seq re ...)]
-)]{
-
-Both forms concatenate the @racket[re]s.}
-
-@defform[(& re ...)]{
-
-Intersects the @racket[re]s.}
-
-@defform[(- re ...)]{
-
-The set difference of the @racket[re]s.}
-
-@defform[(~ re ...)]{
-
-Character-set complement, which each @racket[re] must match exactly
-one character.}
-
-@defform[(/ char-or-string ...)]{
-
-Character ranges, matching characters between successive pairs of
-characters.}
-
-)))
-
-@(lex-sre-doc)
-
-@; ----------------------------------------
-
-@subsection{Lexer Legacy Operators}
-
-@defmodule[parser-tools/lex-plt-v200]
-
-@(define-syntax-rule (lex-v200-doc)
-   (...
-    (begin
-      (require (for-label parser-tools/lex-plt-v200))
-
-@t{The @racketmodname[parser-tools/lex-plt-v200] module re-exports
-   @racket[*], @racket[+], @racket[?], and @racket[&] from
-   @racketmodname[parser-tools/lex-sre]. It also re-exports
-   @racket[:or] as @racket[:], @racket[::] as @racket[|@|], @racket[:~]
-   as @racket[^], and @racket[:/] as @racket[-].}
-
-@defform[(epsilon)]{
-
-A @tech{lexer macro} that matches an empty sequence.}
-
-@defform[(~ re ...)]{
-
-The same as @racket[(complement re ...)].})))
-
-@(lex-v200-doc)
-
-@; ----------------------------------------
-
-@subsection{Tokens}
-
-Each @racket[_action-expr] in a @racket[lexer] form can produce any
-kind of value, but for many purposes, producing a @deftech{token}
-value is useful. Tokens are usually necessary for inter-operating with
-a parser generated by @racket[parser-tools/parser], but tokens not be
-the right choice when using @racket[lexer] in other situations.
-
-@defform[(define-tokens group-id (token-id ...))]{
-
-   Binds @racket[group-id] to the group of tokens being defined.  For
-   each @racket[token-id], a function
-   @racketidfont{token-}@racket[token-id] is created that takes any
-   value and puts it in a token record specific to @racket[token-id].
-   The token value is inspected using @racket[token-id] and
-   @racket[token-value].
-
-   A token cannot be named @racketidfont{error}, since
-   @racketidfont{error} it has special use in the parser.}
-
-@defform[(define-empty-tokens group-id (token-id ...) )]{
-
-
-   Like @racket[define-tokens], except a each token constructor
-   @racketidfont{token-}@racket[token-id] takes no arguments and returns
-   @racket[(@#,racket[quote] token-id)].}
-
-
-@defproc[(token-name [t (or/c token? symbol?)]) symbol?]{
-
-   Returns the name of a token that is represented either by a symbol
-   or a token structure.}
-
-
-@defproc[(token-value [t (or/c token? symbol?)]) any/c]{
-
-   Returns the value of a token that is represented either by a symbol
-   or a token structure, returning @racket[#f] for a symbol token.}
-
-
-@defproc[(token? [v any/c]) boolean?]{
-
-  Returns @racket[#t] if @racket[val] is a
-  token structure, @racket[#f] otherwise.}
-
-@; ----------------------------------------------------------------------
-
-@section{LALR(1) Parsers}
-
-@section-index["yacc"]
-
-@defmodule[parser-tools/yacc]
-
-@defform/subs[#:literals (grammar tokens start end precs src-pos
-                          suppress debug yacc-output prec)
-              (parser clause ...)
-              ([clause (grammar (non-terminal-id 
-                                 ((grammar-id ...) maybe-prec expr)
-                                 ...)
-                                ...)
-                       (tokens group-id ...)
-                       (start non-terminal-id ...)
-                       (end token-id ...)
-                       (@#,racketidfont{error} expr)
-                       (precs (assoc token-id ...) ...)
-                       (src-pos)
-                       (suppress)
-                       (debug filename)
-                       (yacc-output filename)]
-               [maybe-prec code:blank
-                           (prec token-id)]
-               [assoc left right nonassoc])]{
-
-    Creates a parser. The clauses may be in any order, as long as there
-    are no duplicates and all non-@italic{OPTIONAL} declarations are
-    present:
-
-    @itemize[
-
-      @item{@racketblock0[(grammar (non-terminal-id
-                                    ((grammar-id ...) maybe-prec expr)
-                                    ...)
-                                   ...)]
-
-      Declares the grammar to be parsed.  Each @racket[grammar-id] can
-      be a @racket[token-id] from a @racket[group-id] named in a
-      @racket[tokens] declaration, or it can be a
-      @racket[non-terminal-id] declared in the @racket[grammar]
-      declaration. The optional @racket[prec] declaration works with
-      the @racket[precs] declaration. The @racket[expr] is a
-      ``semantic action,'' which is evaluated when the input is found
-      to match its corresponding production.
-
-      Each action is Racket code that has the same scope as its
-      parser's definition, except that the variables @racket[$1], ...,
-      @racketidfont{$}@math{i} are bound, where @math{i} is the number
-      of @racket[grammar-id]s in the corresponding production. Each
-      @racketidfont{$}@math{k} is bound to the result of the action
-      for the @math{k}@superscript{th} grammar symbol on the right of
-      the production, if that grammar symbol is a non-terminal, or the
-      value stored in the token if the grammar symbol is a terminal.
-      If the @racket[src-pos] option is present in the parser, then
-      variables @racket[$1-start-pos], ...,
-      @racketidfont{$}@math{i}@racketidfont{-start-pos} and
-      @racket[$1-end-pos], ...,
-      @racketidfont{$}@math{i}@racketidfont{-end-pos} and are also
-      available, and they refer to the position structures
-      corresponding to the start and end of the corresponding
-      @racket[grammar-symbol]. Grammar symbols defined as empty-tokens
-      have no @racketidfont{$}@math{k} associated, but do have
-      @racketidfont{$}@math{k}@racketidfont{-start-pos} and
-      @racketidfont{$}@math{k}@racketidfont{-end-pos}.
-      Also @racketidfont{$n-start-pos} and @racketidfont{$n-end-pos}
-      are bound to the largest start and end positions, (i.e.,
-      @racketidfont{$}@math{i}@racketidfont{-start-pos} and
-      @racketidfont{$}@math{i}@racketidfont{-end-pos}).
-
-      An @deftech{error production} can be defined by providing
-      a production of the form @racket[(error α)], where α is a
-      string of grammar symbols, possibly empty.
-      
-      All of the productions for a given non-terminal must be grouped
-      with it. That is, no @racket[non-terminal-id] may appear twice
-      on the left hand side in a parser.}
-
-
-      @item{@racket[(tokens group-id ...)]
-
-      Declares that all of the tokens defined in each
-      @racket[group-id]---as bound by @racket[define-tokens] or
-      @racket[define-empty-tokens]---can be used by the parser in the
-      @racket[grammar] declaration.}
-
-
-      @item{@racket[(start non-terminal-id ...)]
-
-      Declares a list of starting non-terminals for the grammar.}
-
-
-      @item{@racket[(end token-id ...)]
-
-      Specifies a set of tokens from which some member must follow any
-      valid parse.  For example, an EOF token would be specified for a
-      parser that parses entire files and a newline token for a parser
-      that parses entire lines individually.}
-
-
-      @item{@racket[(@#,racketidfont{error} expr)]
-
-      The @racket[expr] should evaluate to a function which will be
-      executed for its side-effect whenever the parser encounters an
-      error.
-
-      If the @racket[src-pos] declaration is present, the function
-      should accept 5 arguments,:
-
-      @racketblock[(lambda (tok-ok? tok-name tok-value _start-pos _end-pos) 
-                     ....)]
-
-      Otherwise it should accept 3:
-
-      @racketblock[(lambda (tok-ok? tok-name tok-value) 
-                     ....)]
-
-      The first argument will be @racket[#f] if and only if the error
-      is that an invalid token was received.  The second and third
-      arguments will be the name and the value of the token at which
-      the error was detected.  The fourth and fifth arguments, if
-      present, provide the source positions of that token.}
-
-
-      @item{@racket[(precs (assoc token-id ...) ...)]
-      @italic{OPTIONAL}
-
-      Precedence declarations to resolve shift/reduce and
-      reduce/reduce conflicts as in @exec{yacc}/@exec{bison}. An
-      @racket[assoc] must be one of @racket[left], @racket[right] or
-      @racket[nonassoc].  States with multiple shift/reduce or
-      reduce/reduce conflicts (or some combination thereof) are not
-      resolved with precedence.}
-
-      @item{@racket[(src-pos)] @italic{OPTIONAL}
-
-      Causes the generated parser to expect input in the form
-      @racket[(make-position-token _token _start-pos _end-pos)] instead
-      of simply @racket[_token].  Include this option when using the
-      parser with a lexer generated with @racket[lexer-src-pos].}
-
-
-      @item{@racket[(debug filename)] @italic{OPTIONAL}
-
-      Causes the parser generator to write the LALR table to the file
-      named @racket[filename] (unless the file exists), where
-      @racket[filename] is a literal string.  Additionally, if a debug
-      file is specified, when a running generated parser encounters a
-      parse error on some input file, after the user specified error
-      expression returns, the complete parse stack is printed to
-      assist in debugging the grammar of that particular parser.  The
-      numbers in the stack printout correspond to the state numbers in
-      the LALR table file.}
-
-
-      @item{@racket[(yacc-output filename)] @italic{OPTIONAL}
-
-      Causes the parser generator to write a grammar file in
-      approximately the syntax of @exec{yacc}/@exec{bison}.  The file
-      might not be a valid @exec{yacc} file, because the Racket
-      grammar can use symbols that are invalid in C.}
-
-
-      @item{@racket[(suppress)] @italic{OPTIONAL}
-
-      Causes the parser generator not to report shift/reduce or
-      reduce/reduce conflicts.}
-
-    ]
-
-    The result of a @racket[parser] expression with one @racket[start]
-    non-terminal is a function, @racket[_parse], that takes one
-    argument.  This argument must be a zero argument function,
-    @racket[_gen], that produces successive tokens of the input each
-    time it is called.  If desired, the @racket[_gen] may return
-    symbols instead of tokens, and the parser will treat symbols as
-    tokens of the corresponding name (with @racket[#f] as a value, so
-    it is usual to return symbols only in the case of empty tokens).
-    The @racket[_parse] function returns the value associated with the
-    parse tree by the semantic actions.  If the parser encounters an
-    error, after invoking the supplied error function, it will try to
-    use @tech{error production}s to continue parsing.  If it cannot, it
-    raises @racket[exn:fail:read].
-
-    If multiple non-terminals are provided in @racket[start], the
-    @racket[parser] expression produces a list of parsing functions,
-    one for each non-terminal in the same order. Each parsing function
-    is like the result of a parser expression with only one
-    @racket[start] non-terminal,
-
-    Each time the Racket code for a @racket[parser] is compiled
-    (e.g. when a @filepath{.rkt} file containing a @racket[parser] form
-    is loaded), the parser generator is run.  To avoid this overhead
-    place the parser into a module and compile the module to a
-    @filepath{.zo} bytecode file.}
-
-                                            
-                                            
-                                            
-@section{Context-Free Parsers}
-
-@section-index["cfg-parser"]
-
-@defmodule[parser-tools/cfg-parser]{The @racketmodname[parser-tools/cfg-parser]
-library provides a parser generator that is an alternative to that of 
-@racketmodname[parser-tools/yacc].}
-
-@defform/subs[#:literals (grammar tokens start end precs src-pos
-                          suppress debug yacc-output prec)
-              (cfg-parser clause ...)
-              ([clause (grammar (non-terminal-id 
-                                 ((grammar-id ...) maybe-prec expr)
-                                 ...)
-                                ...)
-                       (tokens group-id ...)
-                       (start non-terminal-id ...)
-                       (end token-id ...)
-                       (@#,racketidfont{error} expr)
-                       (src-pos)])]{
-
-    Creates a parser similar to that of @racket[parser].  Unlike @racket[parser],
-    @racket[cfg-parser], can consume arbitrary and potentially ambiguous context-free
-    grammars. Its interface is a subset of @racketmodname[parser-tools/yacc], with
-    the following differences:
-                                        
-    @itemize[
-
-      @item{@racket[(start non-terminal-id)]
-      
-      Unlike @racket[parser], @racket[cfg-parser] only allows for
-      a single non-terminal-id.}
-                       
-      @item{The @racket[cfg-parser] form does not support the @racket[precs], 
-             @racket[suppress], @racket[debug], or @racket[yacc-output]
-             options of @racket[parser].}
-   ]
-}                                            
-                                            
-@; ----------------------------------------------------------------------
-
-@section{Converting @exec{yacc} or @exec{bison} Grammars}
-
-@defmodule[parser-tools/yacc-to-scheme]
-
-@defproc[(trans [file path-string?]) any/c]{
-
-Reads a C @exec{yacc}/@exec{bison} grammar from @racket[file] and
-produces an s-expression that represents a Racket parser for use with
-@racket[parser].
-
-This function is intended to assist in the manual conversion of
-grammars for use with @racket[parser], and not as a fully automatic
-conversion tool.  It is not entirely robust.  For example, if the C
-actions in the original grammar have nested blocks, the tool will fail.
-
-Annotated examples are in the @filepath{examples} subdirectory of the
-@filepath{parser-tools} collection.}
-
-@; ----------------------------------------------------------------------
-
-@index-section[]
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/LICENSE.txt b/pkgs/parser-tools-pkgs/parser-tools-lib/LICENSE.txt
deleted file mode 100644
index f6889f1c54..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-parser-tools-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/info.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/info.rkt
deleted file mode 100644
index 1b20d3c6e9..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("scheme-lib"
-               "base"
-               "compatibility-lib"))
-(define build-deps '("rackunit-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"parser-tools\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/cfg-parser.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/cfg-parser.rkt
deleted file mode 100644
index 07da911d56..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/cfg-parser.rkt
+++ /dev/null
@@ -1,982 +0,0 @@
-#lang racket/base
-;; This module implements a parser form like the parser-tools's
-;; `parser', except that it works on an arbitrary CFG (returning
-;; the first sucecssful parse).
-
-;; I'm pretty sure that this is an implementation of Earley's
-;; algorithm.
-
-;; To a first approximation, it's a backtracking parser. Alternative
-;; for a non-terminal are computed in parallel, and multiple attempts
-;; to compute the same result block until the first one completes.  If
-;; you get into deadlock, such as when trying to match
-;;    <foo> := <foo>
-;; then it means that there's no successful parse, so everything
-;; that's blocked fails.
-
-;; A cache holds the series of results for a particular non-terminal
-;; at a particular starting location. (A series is used, instead of a
-;; sinlge result, for backtracking.) Otherwise, the parser uses
-;; backtracking search. Backtracking is implemented through explicit
-;; success and failure continuations. Multiple results for a
-;; particular nonterminal and location are kept only when they have
-;; different lengths. (Otherwise, in the spirit of finding one
-;; successful parse, only the first result is kept.)
-
-;; The parser-tools's `parse' is used to transform tokens in the
-;; grammar to tokens specific to this parser. In other words, this
-;; parser uses `parser' so that it doesn't have to know anything about
-;; tokens.
-;;
-
-
-
-(require parser-tools/yacc
-         parser-tools/lex)
-
-(require (for-syntax racket/base
-                     syntax/boundmap
-                     parser-tools/private-lex/token-syntax))
-
-(provide cfg-parser)
-
-;; A raw token, wrapped so that we can recognize it:
-(define-struct tok (name orig-name val start end))
-
-;; Represents the thread scheduler:
-(define-struct tasks (active active-back waits multi-waits cache progress?))
-
-(define-for-syntax make-token-identifier-mapping make-hasheq)
-(define-for-syntax token-identifier-mapping-get
-  (case-lambda 
-    [(t tok)
-     (hash-ref t (syntax-e tok))]
-    [(t tok fail)
-     (hash-ref t (syntax-e tok) fail)]))
-(define-for-syntax token-identifier-mapping-put!
-  (lambda (t tok v)
-    (hash-set! t (syntax-e tok) v)))
-(define-for-syntax token-identifier-mapping-map
-  (lambda (t f)
-    (hash-map t f)))
-
-;; Used to calculate information on the grammar, such as whether
-;; a particular non-terminal is "simple" instead of recursively defined.
-(define-for-syntax (nt-fixpoint nts proc nt-ids patss)
-  (define (ormap-all val f as bs)
-    (cond
-      [(null? as) val]
-      [else (ormap-all (or (f (car as) (car bs)) val)
-                       f
-                       (cdr as) (cdr bs))]))
-  (let loop ()
-    (when (ormap-all #f
-                     (lambda (nt pats)
-                       (let ([old (bound-identifier-mapping-get nts nt)])
-                         (let ([new (proc nt pats old)])
-                           (if (equal? old new)
-                               #f
-                               (begin
-                                 (bound-identifier-mapping-put! nts nt new)
-                                 #t)))))
-                     nt-ids patss)
-      (loop))))
-
-;; Tries parse-a followed by parse-b. If parse-a is not simple,
-;; then after parse-a succeeds once, we parallelize parse-b
-;; and trying a second result for parse-a.
-(define (parse-and simple-a? parse-a parse-b
-                   stream last-consumed-token depth end success-k fail-k 
-                   max-depth tasks)
-  (letrec ([mk-got-k
-            (lambda (success-k fail-k)
-              (lambda (val stream last-consumed-token depth max-depth tasks next1-k)
-                (if simple-a?
-                    (parse-b val stream last-consumed-token depth end
-                             (mk-got2-k success-k fail-k next1-k)
-                             (mk-fail2-k success-k fail-k next1-k)
-                             max-depth tasks)
-                    (parallel-or
-                     (lambda (success-k fail-k max-depth tasks)
-                       (parse-b val stream last-consumed-token depth end
-                                success-k fail-k
-                                max-depth tasks))
-                     (lambda (success-k fail-k max-depth tasks)
-                       (next1-k (mk-got-k success-k fail-k)
-                                fail-k max-depth tasks))
-                     success-k fail-k max-depth tasks))))]
-           [mk-got2-k
-            (lambda (success-k fail-k next1-k)
-              (lambda (val stream last-consumed-token depth max-depth tasks next-k)
-                (success-k val stream last-consumed-token depth max-depth tasks
-                           (lambda (success-k fail-k max-depth tasks)
-                             (next-k (mk-got2-k success-k fail-k next1-k)
-                                     (mk-fail2-k success-k fail-k next1-k)
-                                     max-depth tasks)))))]
-           [mk-fail2-k
-            (lambda (success-k fail-k next1-k)
-              (lambda (max-depth tasks)
-                (next1-k (mk-got-k success-k fail-k)
-                         fail-k
-                         max-depth
-                         tasks)))])
-    (parse-a stream last-consumed-token depth end
-             (mk-got-k success-k fail-k)
-             fail-k
-             max-depth tasks)))
-
-;; Parallel or for non-terminal alternatives
-(define (parse-parallel-or parse-a parse-b stream last-consumed-token depth end success-k fail-k max-depth tasks)
-  (parallel-or (lambda (success-k fail-k max-depth tasks)
-                 (parse-a stream last-consumed-token depth end success-k fail-k max-depth tasks))
-               (lambda (success-k fail-k max-depth tasks)
-                 (parse-b stream last-consumed-token depth end success-k fail-k max-depth tasks))
-               success-k fail-k max-depth tasks))
-
-;; Generic parallel-or
-(define (parallel-or parse-a parse-b success-k fail-k max-depth tasks)
-  (define answer-key (gensym))
-  (letrec ([gota-k
-            (lambda (val stream last-consumed-token depth max-depth tasks next-k)
-              (report-answer answer-key
-                             max-depth
-                             tasks
-                             (list val stream last-consumed-token depth next-k)))]
-           [faila-k
-            (lambda (max-depth tasks)
-              (report-answer answer-key
-                             max-depth
-                             tasks
-                             null))])
-    (let* ([tasks (queue-task
-                   tasks
-                   (lambda (max-depth tasks)
-                     (parse-a gota-k
-                              faila-k
-                              max-depth tasks)))]
-           [tasks (queue-task
-                   tasks
-                   (lambda (max-depth tasks)
-                     (parse-b gota-k
-                              faila-k
-                              max-depth tasks)))]
-           [queue-next (lambda (next-k tasks)
-                         (queue-task tasks
-                                     (lambda (max-depth tasks)
-                                       (next-k gota-k
-                                               faila-k
-                                               max-depth tasks))))])
-      (letrec ([mk-got-one
-                (lambda (immediate-next? get-nth success-k)
-                  (lambda (val stream last-consumed-token depth max-depth tasks next-k)
-                    (let ([tasks (if immediate-next?
-                                     (queue-next next-k tasks)
-                                     tasks)])
-                      (success-k val stream last-consumed-token depth max-depth 
-                                 tasks
-                                 (lambda (success-k fail-k max-depth tasks)                                     
-                                   (let ([tasks (if immediate-next?
-                                                    tasks
-                                                    (queue-next next-k tasks))])
-                                     (get-nth max-depth tasks success-k fail-k)))))))]
-               [get-first
-                (lambda (max-depth tasks success-k fail-k)
-                  (wait-for-answer #f max-depth tasks answer-key
-                                   (mk-got-one #t get-first success-k)
-                                   (lambda (max-depth tasks)
-                                     (get-second max-depth tasks success-k fail-k))
-                                   #f))]
-               [get-second
-                (lambda (max-depth tasks success-k fail-k)
-                  (wait-for-answer #f max-depth tasks answer-key
-                                   (mk-got-one #f get-second success-k)
-                                   fail-k #f))])
-        (get-first max-depth tasks success-k fail-k)))))
-
-;; Non-terminal alternatives where the first is "simple" can be done
-;; sequentially, which is simpler
-(define (parse-or parse-a parse-b
-                  stream last-consumed-token depth end success-k fail-k max-depth tasks)
-  (letrec ([mk-got-k
-            (lambda (success-k fail-k)
-              (lambda (val stream last-consumed-token depth max-depth tasks next-k)
-                (success-k val stream last-consumed-token depth
-                           max-depth tasks
-                           (lambda (success-k fail-k max-depth tasks)
-                             (next-k (mk-got-k success-k fail-k)
-                                     (mk-fail-k success-k fail-k)
-                                     max-depth tasks)))))]
-           [mk-fail-k
-            (lambda (success-k fail-k)
-              (lambda (max-depth tasks)
-                (parse-b stream last-consumed-token depth end success-k fail-k max-depth tasks)))])
-    (parse-a stream last-consumed-token depth end
-             (mk-got-k success-k fail-k)
-             (mk-fail-k success-k fail-k)
-             max-depth tasks)))
-
-;; Starts a thread
-(define queue-task
-  (lambda (tasks t [progress? #t])
-    (make-tasks (tasks-active tasks)
-                (cons t (tasks-active-back tasks))
-                (tasks-waits tasks)
-                (tasks-multi-waits tasks)
-                (tasks-cache tasks)
-                (or progress? (tasks-progress? tasks)))))
-
-;; Reports an answer to a waiting thread:
-(define (report-answer answer-key max-depth tasks val)
-  (let ([v (hash-ref (tasks-waits tasks) answer-key (lambda () #f))])
-    (if v
-        (let ([tasks (make-tasks (cons (v val)
-                                       (tasks-active tasks))
-                                 (tasks-active-back tasks)
-                                 (tasks-waits tasks)
-                                 (tasks-multi-waits tasks)
-                                 (tasks-cache tasks)
-                                 #t)])
-          (hash-remove! (tasks-waits tasks) answer-key)
-          (swap-task max-depth tasks))
-        ;; We have an answer ready too fast; wait
-        (swap-task max-depth
-                   (queue-task tasks
-                               (lambda (max-depth tasks)
-                                 (report-answer answer-key max-depth tasks val))
-                               #f)))))
-
-;; Reports an answer to multiple waiting threads:
-(define (report-answer-all answer-key max-depth tasks val k)
-  (let ([v (hash-ref (tasks-multi-waits tasks) answer-key (lambda () null))])
-    (hash-remove! (tasks-multi-waits tasks) answer-key)
-    (let ([tasks (make-tasks (append (map (lambda (a) (a val)) v)
-                                     (tasks-active tasks))
-                             (tasks-active-back tasks)
-                             (tasks-waits tasks)
-                             (tasks-multi-waits tasks)
-                             (tasks-cache tasks)
-                             #t)])
-      (k max-depth tasks))))
-
-;; Waits for an answer; if `multi?' is #f, this is sole waiter, otherwise
-;;  there might be many. Use wither #t or #f (and `report-answer' or 
-;;  `report-answer-all', resptively) consistently for a particular answer key.
-(define (wait-for-answer multi? max-depth tasks answer-key success-k fail-k deadlock-k)
-  (let ([wait (lambda (val)
-                (lambda (max-depth tasks)
-                  (if val
-                      (if (null? val)
-                          (fail-k max-depth tasks)
-                          (let-values ([(val stream last-consumed-token depth next-k) (apply values val)])
-                            (success-k val stream last-consumed-token depth max-depth tasks next-k)))
-                      (deadlock-k max-depth tasks))))])
-    (if multi?
-        (hash-set! (tasks-multi-waits tasks) answer-key
-                   (cons wait (hash-ref (tasks-multi-waits tasks) answer-key
-                                        (lambda () null))))
-        (hash-set! (tasks-waits tasks) answer-key wait))
-    (let ([tasks (make-tasks (tasks-active tasks)
-                             (tasks-active-back tasks)
-                             (tasks-waits tasks)
-                             (tasks-multi-waits tasks)
-                             (tasks-cache tasks)
-                             #t)])
-      (swap-task max-depth tasks))))
-
-;; Swap thread
-(define (swap-task max-depth tasks)
-  ;; Swap in first active:
-  (if (null? (tasks-active tasks))
-      (if (tasks-progress? tasks)
-          (swap-task max-depth
-                     (make-tasks (reverse (tasks-active-back tasks))
-                                 null
-                                 (tasks-waits tasks)
-                                 (tasks-multi-waits tasks)
-                                 (tasks-cache tasks)
-                                 #f))
-          ;; No progress, so issue failure for all multi-waits
-          (if (zero? (hash-count (tasks-multi-waits tasks)))
-              (error 'swap-task "Deadlock")
-              (swap-task max-depth
-                         (make-tasks (apply
-                                      append
-                                      (hash-map (tasks-multi-waits tasks)
-                                                (lambda (k l)
-                                                  (map (lambda (v) (v #f)) l))))
-                                     (tasks-active-back tasks)
-                                     (tasks-waits tasks)
-                                     (make-hasheq)
-                                     (tasks-cache tasks)
-                                     #t))))
-      (let ([t (car (tasks-active tasks))]
-            [tasks (make-tasks (cdr (tasks-active tasks))
-                               (tasks-active-back tasks)
-                               (tasks-waits tasks)
-                               (tasks-multi-waits tasks)
-                               (tasks-cache tasks)
-                               (tasks-progress? tasks))])
-        (t max-depth tasks))))
-
-;; Finds the symbolic representative of a token class
-(define-for-syntax (map-token toks tok)
-  (car (token-identifier-mapping-get toks tok)))
-
-(define no-pos-val (make-position #f #f #f))
-(define-for-syntax no-pos 
-  (let ([npv ((syntax-local-certifier) #'no-pos-val)])
-    (lambda (stx) npv)))
-(define-for-syntax at-tok-pos
-  (lambda (sel expr)
-    (lambda (stx)
-      #`(let ([v #,expr]) (if v (#,sel v) no-pos-val)))))
-
-;; Builds a matcher for a particular alternative
-(define-for-syntax (build-match nts toks pat handle $ctx)
-  (let loop ([pat pat]
-             [pos 1])
-    (if (null? pat)
-        #`(success-k #,handle stream last-consumed-token depth max-depth tasks 
-                     (lambda (success-k fail-k max-depth tasks)
-                       (fail-k max-depth tasks)))
-        (let ([id (datum->syntax (car pat)
-                                 (string->symbol (format "$~a" pos)))]
-              [id-start-pos (datum->syntax (car pat)
-                                           (string->symbol (format "$~a-start-pos" pos)))]
-              [id-end-pos (datum->syntax (car pat)
-                                         (string->symbol (format "$~a-end-pos" pos)))]
-              [n-end-pos (and (null? (cdr pat))
-                              (datum->syntax (car pat) '$n-end-pos))])
-          (cond
-            [(bound-identifier-mapping-get nts (car pat) (lambda () #f))
-             ;; Match non-termimal
-             #`(parse-and
-                ;; First part is simple? (If so, we don't have to parallelize the `and'.)
-                #,(let ([l (bound-identifier-mapping-get nts (car pat) (lambda () #f))])
-                    (or (not l)
-                        (andmap values (caddr l))))
-                #,(car pat)
-                (let ([original-stream stream])
-                  (lambda (#,id stream last-consumed-token depth end success-k fail-k max-depth tasks)
-                    (let-syntax ([#,id-start-pos (at-tok-pos #'(if (eq? original-stream stream)
-                                                                   tok-end
-                                                                   tok-start)
-                                                             #'(if (eq? original-stream stream)
-                                                                   last-consumed-token
-                                                                   (and (pair? original-stream) 
-                                                                        (car original-stream))))]
-                                 [#,id-end-pos (at-tok-pos #'tok-end #'last-consumed-token)]
-                                 #,@(if n-end-pos
-                                        #`([#,n-end-pos (at-tok-pos #'tok-end #'last-consumed-token)])
-                                        null))
-                      #,(loop (cdr pat) (add1 pos)))))
-                stream last-consumed-token depth 
-                #,(let ([cnt (apply +
-                                    (map (lambda (item)
-                                           (cond
-                                             [(bound-identifier-mapping-get nts item (lambda () #f))
-                                              => (lambda (l) (car l))]
-                                             [else 1]))
-                                         (cdr pat)))])
-                    #`(- end #,cnt))
-                success-k fail-k max-depth tasks)]
-            [else
-             ;; Match token
-             (let ([tok-id (map-token toks (car pat))])
-               #`(if (and (pair? stream)
-                          (eq? '#,tok-id (tok-name (car stream))))
-                     (let* ([stream-a (car stream)]
-                            [#,id (tok-val stream-a)]
-                            [last-consumed-token (car stream)]
-                            [stream (cdr stream)]
-                            [depth (add1 depth)])
-                       (let ([max-depth (max max-depth depth)])
-                         (let-syntax ([#,id-start-pos (at-tok-pos #'tok-start #'stream-a)]
-                                      [#,id-end-pos (at-tok-pos #'tok-end #'stream-a)]
-                                      #,@(if n-end-pos
-                                             #`([#,n-end-pos (at-tok-pos #'tok-end #'stream-a)])
-                                             null))
-                           #,(loop (cdr pat) (add1 pos)))))
-                     (fail-k max-depth tasks)))])))))
-
-;; Starts parsing to match a non-terminal. There's a minor
-;; optimization that checks for known starting tokens. Otherwise,
-;; use the cache, block if someone else is already trying the match,
-;; and cache the result if it's computed.
-;; The cache maps nontermial+startingpos+iteration to a result, where
-;; the iteration is 0 for the first match attempt, 1 for the second,
-;; etc.
-(define (parse-nt/share key min-cnt init-tokens stream last-consumed-token depth end max-depth tasks success-k fail-k k)
-  (if (and (positive? min-cnt)
-           (pair? stream)
-           (not (memq (tok-name (car stream)) init-tokens)))
-      ;; No such leading token; give up
-      (fail-k max-depth tasks)
-      ;; Run pattern
-      (let loop ([n 0]
-                 [success-k success-k]
-                 [fail-k fail-k]
-                 [max-depth max-depth]
-                 [tasks tasks]
-                 [k k])
-        (let ([answer-key (gensym)]
-              [table-key (vector key depth n)]
-              [old-depth depth]
-              [old-stream stream])
-          #;(printf "Loop ~a\n" table-key)
-          (cond
-            [(hash-ref (tasks-cache tasks) table-key (lambda () #f))
-             => (lambda (result)
-                  #;(printf "Reuse ~a\n" table-key)
-                  (result success-k fail-k max-depth tasks))]
-            [else
-             #;(printf "Try ~a ~a\n" table-key (map tok-name stream))
-             (hash-set! (tasks-cache tasks) table-key
-                        (lambda (success-k fail-k max-depth tasks)
-                          #;(printf "Wait ~a ~a\n" table-key answer-key)
-                          (wait-for-answer #t max-depth tasks answer-key success-k fail-k
-                                           (lambda (max-depth tasks)
-                                             #;(printf "Deadlock ~a ~a\n" table-key answer-key)
-                                             (fail-k max-depth tasks)))))
-             (let result-loop ([max-depth max-depth][tasks tasks][k k])
-               (letrec ([orig-stream stream]
-                        [new-got-k
-                         (lambda (val stream last-consumed-token depth max-depth tasks next-k)
-                           ;; Check whether we already have a result that consumed the same amount:
-                           (let ([result-key (vector #f key old-depth depth)])
-                             (cond
-                               [(hash-ref (tasks-cache tasks) result-key (lambda () #f))
-                                ;; Go for the next-result
-                                (result-loop max-depth
-                                             tasks
-                                             (lambda (end max-depth tasks success-k fail-k)
-                                               (next-k success-k fail-k max-depth tasks)))]
-                               [else
-                                #;(printf "Success ~a ~a\n" table-key 
-                                          (map tok-name (let loop ([d old-depth][s old-stream])
-                                                          (if (= d depth)
-                                                              null
-                                                              (cons (car s) (loop (add1 d) (cdr s)))))))
-                                (let ([next-k (lambda (success-k fail-k max-depth tasks)
-                                                (loop (add1 n)
-                                                      success-k
-                                                      fail-k
-                                                      max-depth
-                                                      tasks
-                                                      (lambda (end max-depth tasks success-k fail-k)
-                                                        (next-k success-k fail-k max-depth tasks))))])
-                                  (hash-set! (tasks-cache tasks) result-key #t)
-                                  (hash-set! (tasks-cache tasks) table-key
-                                             (lambda (success-k fail-k max-depth tasks)
-                                               (success-k val stream last-consumed-token depth max-depth tasks next-k)))
-                                  (report-answer-all answer-key
-                                                     max-depth
-                                                     tasks
-                                                     (list val stream last-consumed-token depth next-k)
-                                                     (lambda (max-depth tasks)
-                                                       (success-k val stream last-consumed-token depth max-depth tasks next-k))))])))]
-                        [new-fail-k
-                         (lambda (max-depth tasks)
-                           #;(printf "Failure ~a\n" table-key)
-                           (hash-set! (tasks-cache tasks) table-key
-                                      (lambda (success-k fail-k max-depth tasks)
-                                        (fail-k max-depth tasks)))
-                           (report-answer-all answer-key
-                                              max-depth
-                                              tasks
-                                              null
-                                              (lambda (max-depth tasks)
-                                                (fail-k max-depth tasks))))])
-                 (k end max-depth tasks new-got-k new-fail-k)))])))))
-
-(define-syntax (cfg-parser stx)
-  (syntax-case stx ()
-    [(_ clause ...)
-     (let ([clauses (syntax->list #'(clause ...))])
-       (let-values ([(start grammar cfg-error parser-clauses src-pos?)
-                     (let ([all-toks (apply
-                                      append
-                                      (map (lambda (clause)
-                                             (syntax-case clause (tokens)
-                                               [(tokens t ...)
-                                                (apply
-                                                 append
-                                                 (map (lambda (t)
-                                                        (let ([v (syntax-local-value t (lambda () #f))])
-                                                          (cond
-                                                            [(terminals-def? v)
-                                                             (map (lambda (v)
-                                                                    (cons v #f))
-                                                                  (syntax->list (terminals-def-t v)))]
-                                                            [(e-terminals-def? v)
-                                                             (map (lambda (v)
-                                                                    (cons v #t))
-                                                                  (syntax->list (e-terminals-def-t v)))]
-                                                            [else null])))
-                                                      (syntax->list #'(t ...))))]
-                                               [_else null]))
-                                           clauses))]
-                           [all-end-toks (apply
-                                          append
-                                          (map (lambda (clause)
-                                                 (syntax-case clause (end)
-                                                   [(end t ...)
-                                                    (syntax->list #'(t ...))]
-                                                   [_else null]))
-                                               clauses))])
-                       (let loop ([clauses clauses]
-                                  [cfg-start #f]
-                                  [cfg-grammar #f]
-                                  [cfg-error #f]
-                                  [src-pos? #f]
-                                  [parser-clauses null])
-                         (if (null? clauses)
-                             (values cfg-start
-                                     cfg-grammar
-                                     cfg-error
-                                     (reverse parser-clauses)
-                                     src-pos?)
-                             (syntax-case (car clauses) (start error grammar src-pos)
-                               [(start tok)
-                                (loop (cdr clauses) #'tok cfg-grammar cfg-error src-pos? parser-clauses)]
-                               [(error expr)
-                                (loop (cdr clauses) cfg-start cfg-grammar #'expr src-pos? parser-clauses)]
-                               [(grammar [nt [pat handle0 handle ...] ...] ...)
-                                (let ([nts (make-bound-identifier-mapping)]
-                                      [toks (make-token-identifier-mapping)]
-                                      [end-toks (make-token-identifier-mapping)]
-                                      [nt-ids (syntax->list #'(nt ...))]
-                                      [patss (map (lambda (stx)
-                                                    (map syntax->list (syntax->list stx)))
-                                                  (syntax->list #'((pat ...) ...)))])
-                                  (for-each (lambda (nt)
-                                              (bound-identifier-mapping-put! nts nt (list 0)))
-                                            nt-ids)
-                                  (for-each (lambda (t)
-                                              (token-identifier-mapping-put! end-toks t #t))
-                                            all-end-toks)
-                                  (for-each (lambda (t)
-                                              (unless (token-identifier-mapping-get end-toks (car t) (lambda () #f))
-                                                (let ([id (gensym (syntax-e (car t)))])
-                                                  (token-identifier-mapping-put! toks (car t)
-                                                                                 (cons id (cdr t))))))
-                                            all-toks)
-                                  ;; Compute min max size for each non-term:
-                                  (nt-fixpoint
-                                   nts
-                                   (lambda (nt pats old-list)
-                                     (let ([new-cnt
-                                            (apply
-                                             min
-                                             (map (lambda (pat)
-                                                    (apply
-                                                     +
-                                                     (map (lambda (elem)
-                                                            (car
-                                                             (bound-identifier-mapping-get nts
-                                                                                           elem
-                                                                                           (lambda () (list 1)))))
-                                                          pat)))
-                                                  pats))])
-                                       (if (new-cnt . > . (car old-list))
-                                           (cons new-cnt (cdr old-list))
-                                           old-list)))
-                                   nt-ids patss)
-                                  ;; Compute set of toks that must appear at the beginning
-                                  ;;  for a non-terminal
-                                  (nt-fixpoint
-                                   nts
-                                   (lambda (nt pats old-list)
-                                     (let ([new-list
-                                            (apply
-                                             append
-                                             (map (lambda (pat)
-                                                    (let loop ([pat pat])
-                                                      (if (pair? pat)
-                                                          (let ([l (bound-identifier-mapping-get 
-                                                                    nts
-                                                                    (car pat)
-                                                                    (lambda ()
-                                                                      (list 1 (map-token toks (car pat)))))])
-                                                            ;; If the non-terminal can match 0 things,
-                                                            ;;  then it might match something from the
-                                                            ;;  next pattern element. Otherwise, it must
-                                                            ;;  match the first element:
-                                                            (if (zero? (car l))
-                                                                (append (cdr l) (loop (cdr pat)))
-                                                                (cdr l)))
-                                                          null)))
-                                                  pats))])
-                                       (let ([new (filter (lambda (id)
-                                                            (andmap (lambda (id2)
-                                                                      (not (eq? id id2)))
-                                                                    (cdr old-list)))
-                                                          new-list)])
-                                         (if (pair? new)
-                                             ;; Drop dups in new list:
-                                             (let ([new (let loop ([new new])
-                                                          (if (null? (cdr new))
-                                                              new
-                                                              (if (ormap (lambda (id)
-                                                                           (eq? (car new) id))
-                                                                         (cdr new))
-                                                                  (loop (cdr new))
-                                                                  (cons (car new) (loop (cdr new))))))])
-                                               (cons (car old-list) (append new (cdr old-list))))
-                                             old-list))))
-                                   nt-ids patss)
-                                  ;; Determine left-recursive clauses:
-                                  (for-each (lambda (nt pats)
-                                              (let ([l (bound-identifier-mapping-get nts nt)])
-                                                (bound-identifier-mapping-put! nts nt (list (car l)
-                                                                                            (cdr l)
-                                                                                            (map (lambda (x) #f) pats)))))
-                                            nt-ids patss)
-                                  (nt-fixpoint
-                                   nts
-                                   (lambda (nt pats old-list)
-                                     (list (car old-list)
-                                           (cadr old-list)
-                                           (map (lambda (pat simple?)
-                                                  (or simple?
-                                                      (let ([l (map (lambda (elem)
-                                                                      (bound-identifier-mapping-get 
-                                                                       nts
-                                                                       elem
-                                                                       (lambda () #f)))
-                                                                    pat)])
-                                                        (andmap (lambda (i)
-                                                                  (or (not i)
-                                                                      (andmap values (caddr i))))
-                                                                l))))
-                                                pats (caddr old-list))))
-                                   nt-ids patss)
-                                  ;; Build a definition for each non-term:
-                                  (loop (cdr clauses)
-                                        cfg-start
-                                        (map (lambda (nt pats handles $ctxs)
-                                               (define info (bound-identifier-mapping-get nts nt))
-                                               (list nt
-                                                     #`(let ([key (gensym '#,nt)])
-                                                         (lambda (stream last-consumed-token depth end success-k fail-k max-depth tasks)
-                                                           (parse-nt/share
-                                                            key #,(car info) '#,(cadr info) stream last-consumed-token depth end
-                                                            max-depth tasks
-                                                            success-k fail-k
-                                                            (lambda (end max-depth tasks success-k fail-k)
-                                                              #,(let loop ([pats pats]
-                                                                           [handles (syntax->list handles)]
-                                                                           [$ctxs (syntax->list $ctxs)]
-                                                                           [simple?s (caddr info)])
-                                                                  (if (null? pats)
-                                                                      #'(fail-k max-depth tasks)
-                                                                      #`(#,(if (or (null? (cdr pats))
-                                                                                   (car simple?s))
-                                                                               #'parse-or
-                                                                               #'parse-parallel-or)
-                                                                         (lambda (stream last-consumed-token depth end success-k fail-k max-depth tasks)
-                                                                           #,(build-match nts
-                                                                                          toks 
-                                                                                          (car pats)
-                                                                                          (car handles)
-                                                                                          (car $ctxs)))
-                                                                         (lambda (stream last-consumed-token depth end success-k fail-k max-depth tasks)
-                                                                           #,(loop (cdr pats)
-                                                                                   (cdr handles)
-                                                                                   (cdr $ctxs)
-                                                                                   (cdr simple?s)))
-                                                                         stream last-consumed-token depth end success-k fail-k max-depth tasks)))))))))
-                                             nt-ids
-                                             patss
-                                             (syntax->list #'(((begin handle0 handle ...) ...) ...))
-                                             (syntax->list #'((handle0 ...) ...)))
-                                        cfg-error
-                                        src-pos?
-                                        (list*
-                                         (with-syntax ([((tok tok-id . $e) ...)
-                                                        (token-identifier-mapping-map toks
-                                                                                      (lambda (k v)
-                                                                                        (list* k
-                                                                                               (car v)
-                                                                                               (if (cdr v)
-                                                                                                   #f
-                                                                                                   '$1))))]
-                                                       [(pos ...) 
-                                                        (if src-pos?
-                                                            #'($1-start-pos $1-end-pos)
-                                                            #'(#f #f))])
-                                           #`(grammar (start [() null]
-                                                             [(atok start) (cons $1 $2)])
-                                                      (atok [(tok) (make-tok 'tok-id 'tok $e pos ...)] ...)))
-                                         #`(start start)
-                                         parser-clauses)))]
-                               [(grammar . _)
-                                (raise-syntax-error
-                                 #f
-                                 "bad grammar clause"
-                                 stx
-                                 (car clauses))]
-                               [(src-pos)
-                                (loop (cdr clauses)
-                                      cfg-start
-                                      cfg-grammar
-                                      cfg-error
-                                      #t
-                                      (cons (car clauses) parser-clauses))]
-                               [_else
-                                (loop (cdr clauses)
-                                      cfg-start
-                                      cfg-grammar
-                                      cfg-error
-                                      src-pos?
-                                      (cons (car clauses) parser-clauses))]))))])
-         #`(let ([orig-parse (parser 
-                              [error (lambda (a b c)
-                                       (error 'cfg-parser "unexpected ~a token: ~a" b c))]
-                              . #,parser-clauses)]
-                 [error-proc #,cfg-error])
-             (letrec #,grammar 
-               (lambda (get-tok)
-                 (let ([tok-list (orig-parse get-tok)])
-                   (letrec ([success-k
-                             (lambda (val stream last-consumed-token depth max-depth tasks next) 
-                               (if (null? stream)
-                                   val
-                                   (next success-k fail-k max-depth tasks)))]
-                            [fail-k (lambda (max-depth tasks)
-                                      (define (call-error-proc tok-ok? tok-name tok-value start-pos end-pos)
-                                        (cond
-                                         [(procedure-arity-includes? error-proc 5)
-                                          (error-proc tok-ok? tok-name tok-value start-pos end-pos)]
-                                         [else
-                                          (error-proc tok-ok? tok-name tok-value)]))
-                                      (cond
-                                       [(null? tok-list)
-                                        (if error-proc
-                                            (call-error-proc #t
-                                                             'no-tokens
-                                                             #f
-                                                             (make-position #f #f #f)
-                                                             (make-position #f #f #f))
-                                            (error
-                                             'cfg-parse
-                                             "no tokens"))]
-                                       [else
-                                        (let ([bad-tok (list-ref tok-list 
-                                                                 (min (sub1 (length tok-list))
-                                                                      max-depth))])
-                                          (if error-proc
-                                              (call-error-proc #t
-                                                               (tok-orig-name bad-tok)
-                                                               (tok-val bad-tok)
-                                                               (tok-start bad-tok)
-                                                               (tok-end bad-tok))
-                                              (error
-                                               'cfg-parse
-                                               "failed at ~a" 
-                                               (tok-val bad-tok))))]))])
-                     (#,start tok-list
-                              ;; we simulate a token at the very beginning with zero width
-                              ;; for use with the position-generating code (*-start-pos, *-end-pos).
-                              (if (null? tok-list)
-                                  (tok #f #f #f
-                                       (position 1
-                                                 #,(if src-pos? #'1 #'#f) 
-                                                 #,(if src-pos? #'0 #'#f))
-                                       (position 1 
-                                                 #,(if src-pos? #'1 #'#f)
-                                                 #,(if src-pos? #'0 #'#f)))
-                                  (tok (tok-name (car tok-list))
-                                       (tok-orig-name (car tok-list))
-                                       (tok-val (car tok-list))
-                                       (tok-start (car tok-list))
-                                       (tok-start (car tok-list))))
-                              0 
-                              (length tok-list)
-                              success-k
-                              fail-k
-                              0 
-                              (make-tasks null null 
-                                          (make-hasheq) (make-hasheq)
-                                          (make-hash) #t)))))))))]))
-
-
-(module* test racket/base
-  (require (submod "..")
-           parser-tools/lex
-           racket/block
-           racket/generator
-           rackunit)
-
-  ;; Test: parsing regular expressions.
-  ;; Here is a test case on locations:
-  (block
-   (define-tokens regexp-tokens (ANCHOR STAR OR LIT LPAREN RPAREN EOF))
-   (define lex (lexer-src-pos ["|" (token-OR lexeme)]
-                              ["^" (token-ANCHOR lexeme)]
-                              ["*" (token-STAR lexeme)]
-                              [(repetition 1 +inf.0 alphabetic) (token-LIT lexeme)]
-                              ["(" (token-LPAREN lexeme)]
-                              [")" (token-RPAREN lexeme)]
-                              [whitespace (return-without-pos (lex input-port))]
-                              [(eof) (token-EOF 'eof)]))
-   (define -parse (cfg-parser
-                   (tokens regexp-tokens)
-                   (start top)
-                   (end EOF)
-                   (src-pos)
-                   (grammar [top [(maybe-anchor regexp)
-                                  (cond [$1 
-                                         `(anchored ,$2 ,(pos->sexp $1-start-pos) ,(pos->sexp $2-end-pos))]
-                                        [else
-                                         `(unanchored ,$2 ,(pos->sexp $1-start-pos) ,(pos->sexp $2-end-pos))])]]
-                            [maybe-anchor [(ANCHOR) #t]
-                                          [() #f]]
-                            [regexp [(regexp STAR) `(star ,$1 ,(pos->sexp $1-start-pos) ,(pos->sexp $2-end-pos))]
-                                    [(regexp OR regexp) `(or ,$1 ,$3 ,(pos->sexp $1-start-pos) ,(pos->sexp $3-end-pos))]
-                                    [(LPAREN regexp RPAREN) `(group ,$2 ,(pos->sexp $1-start-pos) ,(pos->sexp $3-end-pos))]
-                                    [(LIT) `(lit ,$1 ,(pos->sexp $1-start-pos) ,(pos->sexp $1-end-pos))]])))
-   (define (pos->sexp pos)
-     (position-offset pos))
-   
-   (define (parse s)
-     (define ip (open-input-string s))
-     (port-count-lines! ip)
-     (-parse (lambda () (lex ip))))
-   
-   (check-equal? (parse "abc")
-                 '(unanchored (lit "abc" 1 4) 1 4))
-   (check-equal? (parse "a | (b*) | c")
-                 '(unanchored (or (or (lit "a" 1 2)
-                                      (group (star (lit "b" 6 7) 6 8) 5 9)
-                                      1 9)
-                                  (lit "c" 12 13)
-                                  1 13)
-                              1 13)))
-  
-
-  ;; Check that cfg-parser can accept error functions of 3 arguments:
-  (block
-   (define-tokens non-terminals (ONE ZERO EOF))
-   (define parse
-     (cfg-parser (tokens non-terminals)
-                 (start ones)
-                 (end EOF)
-                 (error (lambda (tok-ok tok-name tok-val)
-                          (error (format "~a ~a ~a" tok-ok tok-name tok-val))))
-                 (grammar [ones [() null]
-                                [(ONE ones) (cons $1 $2)]])))
-   (define (sequence->tokenizer s)
-     (define-values (more? next) (sequence-generate s))
-     (lambda ()
-       (cond [(more?) (next)]
-             [else (token-EOF 'eof)])))
-   (check-exn #rx"#t ZERO zero" 
-              (lambda () (parse (sequence->tokenizer (list (token-ZERO "zero")))))))
-
-
-
-
-  ;; Check that cfg-parser can accept error functions of 5 arguments:
-  (block
-   (define-tokens non-terminals (ONE ZERO EOF))
-   (define parse
-     (cfg-parser (tokens non-terminals)
-                 (start ones)
-                 (src-pos)
-                 (end EOF)
-                 (error (lambda (tok-ok tok-name tok-val start-pos end-pos)
-                          (error (format "~a ~a ~a ~a ~a" 
-                                         tok-ok tok-name tok-val
-                                         (position-offset start-pos)
-                                         (position-offset end-pos)))))
-                 (grammar [ones [() null]
-                                [(ONE ones) (cons $1 $2)]])))
-   (define (sequence->tokenizer s)
-     (define-values (more? next) (sequence-generate s))
-     (lambda ()
-       (cond [(more?) (next)]
-             [else (position-token (token-EOF 'eof)
-                                   (position #f #f #f)
-                                   (position #f #f #f))])))
-   (check-exn #rx"#t ZERO zero 2 3"
-              (lambda () 
-                (parse 
-                 (sequence->tokenizer 
-                  (list (position-token 
-                         (token-ZERO "zero")
-                         (position 2 2 5) 
-                         (position 3 2 6))))))))
-
-   
-  
-  
-  
-  ;; Tests used during development
-  (define-tokens non-terminals (PLUS MINUS STAR BAR COLON EOF))
-  
-  (define lex
-    (lexer
-     ["+" (token-PLUS '+)]
-     ["-" (token-MINUS '-)]
-     ["*" (token-STAR '*)]
-     ["|" (token-BAR '||)]
-     [":" (token-COLON '|:|)]
-     [whitespace (lex input-port)]
-     [(eof) (token-EOF 'eof)]))
-  
-  (define parse
-    (cfg-parser
-     (tokens non-terminals)
-     (start <program>)
-     (end EOF)
-     (error (lambda (a b stx) 
-              (error 'parse "failed at ~s" stx)))
-     (grammar [<program> [(PLUS) "plus"]
-                         [(<minus-program> BAR <minus-program>) (list $1 $2 $3)]
-                         [(<program> COLON) (list $1)]]
-              [<minus-program> [(MINUS) "minus"]
-                               [(<program> STAR) (cons $1 $2)]]
-              [<simple> [(<alts> <alts> <alts> MINUS) "yes"]]
-              [<alts> [(PLUS) 'plus]
-                      [(MINUS) 'minus]]
-              [<random> [() '0]
-                        [(<random> PLUS) (add1 $1)]
-                        [(<random> PLUS) (add1 $1)]])))
-  
-  (let ([p (open-input-string #;"+*|-|-*|+**" #;"-|+*|+**" 
-                              #;"+*|+**|-" #;"-|-*|-|-*"
-                              #;"-|-*|-|-**|-|-*|-|-**"
-                              "-|-*|-|-**|-|-*|-|-***|-|-*|-|-**|-|-*|-|-****|-|-*|-|-**|-|-*|-|-***
-               |-|-*|-|-**|-|-*|-|-*****|-|-*|-|-**|-|-*|-|-***|-|-*|-|-**|-|-*|-|-****|
-               -|-*|-|-**|-|-*|-|-***|-|-*|-|-**|-|-*|-|-*****"
-                              ;; This one fails:
-                              #;"+*")])
-    (check-equal? (parse (lambda () (lex p)))
-                  '((((((((((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *) || (((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *)) . *)
-                        ||
-                        (((((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *) || (((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *)) . *))
-                       .
-                       *)
-                      ||
-                      (((((((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *) || (((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *)) . *)
-                        ||
-                        (((((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *) || (((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *)) . *))
-                       .
-                       *))
-                     .
-                     *)
-                    ||
-                    (((((((((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *) || (((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *)) . *)
-                        ||
-                        (((((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *) || (((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *)) . *))
-                       .
-                       *)
-                      ||
-                      (((((((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *) || (((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *)) . *)
-                        ||
-                        (((((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *) || (((("minus" || "minus") . *) || (("minus" || "minus") . *)) . *)) . *))
-                       .
-                       *))
-                     .
-                     *)))))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/examples/calc.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/examples/calc.rkt
deleted file mode 100644
index 71b9f7f031..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/examples/calc.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang scheme
-
-;; An interactive calculator inspired by the calculator example in the bison manual.
-
-
-;; Import the parser and lexer generators.
-(require parser-tools/yacc
-         parser-tools/lex
-         (prefix-in : parser-tools/lex-sre))
-
-(define-tokens value-tokens (NUM VAR FNCT))
-(define-empty-tokens op-tokens (newline = OP CP + - * / ^ EOF NEG))
-
-;; A hash table to store variable values in for the calculator
-(define vars (make-hash))
-
-(define-lex-abbrevs
- (lower-letter (:/ "a" "z"))
-
- (upper-letter (:/ #\A #\Z))
-
- ;; (:/ 0 9) would not work because the lexer does not understand numbers.  (:/ #\0 #\9) is ok too.
- (digit (:/ "0" "9")))
- 
-(define calcl
-  (lexer
-   [(eof) 'EOF]
-   ;; recursively call the lexer on the remaining input after a tab or space.  Returning the
-   ;; result of that operation.  This effectively skips all whitespace.
-   [(:or #\tab #\space) (calcl input-port)]
-   ;; (token-newline) returns 'newline
-   [#\newline (token-newline)]
-   ;; Since (token-=) returns '=, just return the symbol directly
-   [(:or "=" "+" "-" "*" "/" "^") (string->symbol lexeme)]
-   ["(" 'OP]
-   [")" 'CP]
-   ["sin" (token-FNCT sin)]
-   [(:+ (:or lower-letter upper-letter)) (token-VAR (string->symbol lexeme))]
-   [(:+ digit) (token-NUM (string->number lexeme))]
-   [(:: (:+ digit) #\. (:* digit)) (token-NUM (string->number lexeme))]))
-   
-
-(define calcp
-  (parser
-
-   (start start)
-   (end newline EOF)
-   (tokens value-tokens op-tokens)
-   (error (lambda (a b c) (void)))
-
-   (precs (right =)
-          (left - +)
-          (left * /)
-          (left NEG)
-          (right ^))
-   
-   (grammar
-    
-    (start [() #f]
-           ;; If there is an error, ignore everything before the error
-           ;; and try to start over right after the error
-           [(error start) $2]
-           [(exp) $1])
-    
-    (exp [(NUM) $1]
-         [(VAR) (hash-ref vars $1 (lambda () 0))]
-         [(VAR = exp) (begin (hash-set! vars $1 $3)
-                             $3)]
-         [(FNCT OP exp CP) ($1 $3)]
-         [(exp + exp) (+ $1 $3)]
-         [(exp - exp) (- $1 $3)]
-         [(exp * exp) (* $1 $3)]
-         [(exp / exp) (/ $1 $3)]
-         [(- exp) (prec NEG) (- $2)]
-         [(exp ^ exp) (expt $1 $3)]
-         [(OP exp CP) $2]))))
-           
-;; run the calculator on the given input-port       
-(define (calc ip)
-  (port-count-lines! ip)
-  (letrec ((one-line
-	    (lambda ()
-	      (let ((result (calcp (lambda () (calcl ip)))))
-		(when result
-                  (printf "~a\n" result)
-                  (one-line))))))
-    (one-line)))
-
-(calc (open-input-string "x=1\n(x + 2 * 3) - (1+2)*3"))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/examples/read.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/examples/read.rkt
deleted file mode 100644
index 2dc9475aaf..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/examples/read.rkt
+++ /dev/null
@@ -1,242 +0,0 @@
-;; This implements the equivalent of racket's read-syntax for R5RS scheme.
-;; It has not been thoroughly tested.  Also it will read an entire file into a 
-;; list of syntax objects, instead of returning one syntax object at a time
-
-(module read mzscheme
-  
-  (require parser-tools/lex
-           (prefix : parser-tools/lex-sre)
-           parser-tools/yacc
-           syntax/readerr)
-  
-  (define-tokens data (DATUM))
-  (define-empty-tokens delim (OP CP HASHOP QUOTE QUASIQUOTE UNQUOTE UNQUOTE-SPLICING DOT EOF))
-  
-  (define scheme-lexer
-    (lexer-src-pos
-     
-     ;; Skip comments, without accumulating extra position information
-     [(:or scheme-whitespace comment) (return-without-pos (scheme-lexer input-port))]
-     
-     ["#t" (token-DATUM #t)]
-     ["#f" (token-DATUM #f)]
-     [(:: "#\\" any-char) (token-DATUM (caddr (string->list lexeme)))]
-     ["#\\space" (token-DATUM #\space)]
-     ["#\\newline" (token-DATUM #\newline)]
-     [(:or (:: initial (:* subsequent)) "+" "-" "...") (token-DATUM (string->symbol lexeme))]
-     [#\" (token-DATUM (list->string (get-string-token input-port)))]
-     [#\( 'OP]
-     [#\) 'CP]
-     [#\[ 'OP]
-     [#\] 'CP]
-     ["#(" 'HASHOP]
-     [num2 (token-DATUM (string->number lexeme 2))]
-     [num8 (token-DATUM (string->number lexeme 8))]
-     [num10 (token-DATUM (string->number lexeme 10))]
-     [num16 (token-DATUM (string->number lexeme 16))]
-     ["'" 'QUOTE]
-     ["`" 'QUASIQUOTE]
-     ["," 'UNQUOTE]
-     [",@" 'UNQUOTE-SPLICING]
-     ["." 'DOT]
-     [(eof) 'EOF]))
-  
-  (define get-string-token
-    (lexer
-     [(:~ #\" #\\) (cons (car (string->list lexeme))
-                         (get-string-token input-port))]
-     [(:: #\\ #\\) (cons #\\ (get-string-token input-port))]
-     [(:: #\\ #\") (cons #\" (get-string-token input-port))]
-     [#\" null]))
-  
-  
-  (define-lex-abbrevs
-   [letter (:or (:/ "a" "z") (:/ #\A #\Z))]
-   [digit (:/ #\0 #\9)]
-   [scheme-whitespace (:or #\newline #\return #\tab #\space #\vtab)]
-   [initial (:or letter (char-set "!$%&*/:<=>?^_~@"))]
-   [subsequent (:or initial digit (char-set "+-.@"))]
-   [comment (:: #\; (:* (:~ #\newline)) #\newline)]
-   
-   
-   ;; See ${PLTHOME}/collects/syntax-color/racket-lexer.rkt for an example of
-   ;; using regexp macros to avoid the cut and paste.
-   ;   [numR (:: prefixR complexR)]
-   ;   [complexR (:or realR
-   ;                (:: realR "@" realR)
-   ;                (:: realR "+" urealR "i")
-   ;                (:: realR "-" urealR "i")
-   ;                (:: realR "+i")
-   ;                (:: realR "-i")
-   ;                (:: "+" urealR "i")
-   ;                (:: "-" urealR "i")
-   ;                (:: "+i")
-   ;                (:: "-i"))]
-   ;   [realR (:: sign urealR)]
-   ;   [urealR (:or uintegerR (:: uintegerR "/" uintegerR) decimalR)]
-   ;   [uintegerR (:: (:+ digitR) (:* #\#))]
-   ;   [prefixR (:or (:: radixR exactness)
-   ;               (:: exactness radixR))]
-   
-   [num2 (:: prefix2 complex2)]
-   [complex2 (:or real2
-                  (:: real2 "@" real2)
-                  (:: real2 "+" ureal2 "i")
-                  (:: real2 "-" ureal2 "i")
-                  (:: real2 "+i")
-                  (:: real2 "-i")
-                  (:: "+" ureal2 "i")
-                  (:: "-" ureal2 "i")
-                  (:: "+i")
-                  (:: "-i"))]
-   [real2 (:: sign ureal2)]
-   [ureal2 (:or uinteger2 (:: uinteger2 "/" uinteger2))]
-   [uinteger2 (:: (:+ digit2) (:* #\#))]
-   [prefix2 (:or (:: radix2 exactness)
-                 (:: exactness radix2))]
-   [radix2 "#b"]
-   [digit2 (:or "0" "1")]
-   [num8 (:: prefix8 complex8)]
-   [complex8 (:or real8
-                  (:: real8 "@" real8)
-                  (:: real8 "+" ureal8 "i")
-                  (:: real8 "-" ureal8 "i")
-                  (:: real8 "+i")
-                  (:: real8 "-i")
-                  (:: "+" ureal8 "i")
-                  (:: "-" ureal8 "i")
-                  (:: "+i")
-                  (:: "-i"))]
-   [real8 (:: sign ureal8)]
-   [ureal8 (:or uinteger8 (:: uinteger8 "/" uinteger8))]
-   [uinteger8 (:: (:+ digit8) (:* #\#))]
-   [prefix8 (:or (:: radix8 exactness)
-                 (:: exactness radix8))]
-   [radix8 "#o"]
-   [digit8 (:/ "0" "7")]
-   
-   [num10 (:: prefix10 complex10)]
-   [complex10 (:or real10
-                   (:: real10 "@" real10)
-                   (:: real10 "+" ureal10 "i")
-                   (:: real10 "-" ureal10 "i")
-                   (:: real10 "+i")
-                   (:: real10 "-i")
-                   (:: "+" ureal10 "i")
-                   (:: "-" ureal10 "i")
-                   (:: "+i")
-                   (:: "-i"))]
-   [real10 (:: sign ureal10)]
-   [ureal10 (:or uinteger10 (:: uinteger10 "/" uinteger10) decimal10)]
-   [uinteger10 (:: (:+ digit10) (:* #\#))]
-   [prefix10 (:or (:: radix10 exactness)
-                  (:: exactness radix10))]
-   [radix10 (:? "#d")]
-   [digit10 digit]
-   [decimal10 (:or (:: uinteger10 suffix)
-                   (:: #\. (:+ digit10) (:* #\#) suffix)
-                   (:: (:+ digit10) #\. (:* digit10) (:* #\#) suffix)
-                   (:: (:+ digit10) (:+ #\#) #\. (:* #\#) suffix))]
-   
-   [num16 (:: prefix16 complex16)]
-   [complex16 (:or real16
-                   (:: real16 "@" real16)
-                   (:: real16 "+" ureal16 "i")
-                   (:: real16 "-" ureal16 "i")
-                   (:: real16 "+i")
-                   (:: real16 "-i")
-                   (:: "+" ureal16 "i")
-                   (:: "-" ureal16 "i")
-                   "+i"
-                   "-i")]
-   [real16 (:: sign ureal16)]
-   [ureal16 (:or uinteger16 (:: uinteger16 "/" uinteger16))]
-   [uinteger16 (:: (:+ digit16) (:* #\#))]
-   [prefix16 (:or (:: radix16 exactness)
-                  (:: exactness radix16))]
-   [radix16 "#x"]
-   [digit16 (:or digit (:/ #\a #\f) (:/ #\A #\F))]
-   
-   
-   [suffix (:or "" (:: exponent-marker sign (:+ digit10)))]
-   [exponent-marker (:or "e" "s" "f" "d" "l")]
-   [sign (:or "" "+" "-")]
-   [exactness (:or "" "#i" "#e")])
-  
-  
-  (define stx-for-original-property (read-syntax #f (open-input-string "original")))
-  
-  ;; A macro to build the syntax object
-  (define-syntax (build-so stx)
-    (syntax-case stx ()
-      ((_ value start end)
-       (with-syntax ((start-pos (datum->syntax-object 
-                                 (syntax end)
-                                 (string->symbol 
-                                  (format "$~a-start-pos"
-                                          (syntax-object->datum (syntax start))))))
-                     (end-pos (datum->syntax-object 
-                               (syntax end)
-                               (string->symbol 
-                                (format "$~a-end-pos"
-                                        (syntax-object->datum (syntax end))))))
-                     (source (datum->syntax-object
-                              (syntax end)
-                              'source-name)))
-         (syntax
-          (datum->syntax-object 
-           #f
-           value
-           (list source 
-                 (position-line start-pos)
-                 (position-col start-pos)
-                 (position-offset start-pos)
-                 (- (position-offset end-pos)
-                    (position-offset start-pos)))
-           stx-for-original-property))))))
-  
-  (define (scheme-parser source-name)
-    (parser
-     (src-pos)
-     
-     (start s)
-     (end EOF)
-     (error (lambda (a name val start end)
-              (raise-read-error 
-               "read-error"
-               source-name
-               (position-line start)
-               (position-col start)
-               (position-offset start)
-               (- (position-offset end)
-                  (position-offset start)))))
-     (tokens data delim)
-     
-     
-     (grammar
-      
-      (s [(sexp-list) (reverse $1)])
-      
-      (sexp [(DATUM) (build-so $1 1 1)]
-            [(OP sexp-list CP) (build-so (reverse $2) 1 3)]
-            [(HASHOP sexp-list CP) (build-so (list->vector (reverse $2)) 1 3)]
-            [(QUOTE sexp) (build-so (list 'quote $2) 1 2)]
-            [(QUASIQUOTE sexp) (build-so (list 'quasiquote $2) 1 2)]
-            [(UNQUOTE sexp) (build-so (list 'unquote $2) 1 2)]
-            [(UNQUOTE-SPLICING sexp) (build-so (list 'unquote-splicing $2) 1 2)]
-            [(OP sexp-list DOT sexp CP) (build-so (append (reverse $2) $4) 1 5)])
-      
-      (sexp-list [() null]
-                 [(sexp-list sexp) (cons $2 $1)]))))
-  
-  (define (rs sn ip)
-    (port-count-lines! ip)
-    ((scheme-parser sn) (lambda () (scheme-lexer ip))))
-  
-  (define readsyntax
-    (case-lambda ((sn) (rs sn (current-input-port)))
-                 ((sn ip) (rs sn ip))))
-  
-  (provide (rename readsyntax read-syntax))
-  
-  )
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/info.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/info.rkt
deleted file mode 100644
index ae666095ec..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("private-lex/error-tests.rkt"))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex-plt-v200.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex-plt-v200.rkt
deleted file mode 100644
index 34b8d165d3..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex-plt-v200.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-(module lex-plt-v200 mzscheme
-  (require parser-tools/lex
-           (prefix : parser-tools/lex-sre))
-  
-  (provide epsilon
-           ~
-           (rename :* *)
-           (rename :+ +)
-           (rename :? ?)
-           (rename :or :)
-           (rename :& &)
-           (rename :: @)
-           (rename :~ ^)
-           (rename :/ -))
-           
-  (define-lex-trans epsilon
-    (syntax-rules ()
-      ((_) "")))
-  
-  (define-lex-trans ~
-    (syntax-rules ()
-      ((_ re) (complement re)))))
-  
-  
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex-sre.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex-sre.rkt
deleted file mode 100644
index 28be898791..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex-sre.rkt
+++ /dev/null
@@ -1,119 +0,0 @@
-(module lex-sre mzscheme
-  (require parser-tools/lex)
-    
-  (provide (rename sre-* *)
-           (rename sre-+ +)
-           ?
-           (rename sre-= =)
-           (rename sre->= >=)
-           **
-           (rename sre-or or)
-           :
-           seq
-           &
-           ~
-           (rename sre-- -)
-           (rename sre-/ /)
-           /-only-chars)
-           
-  (define-lex-trans sre-*
-    (syntax-rules ()
-      ((_ re ...)
-       (repetition 0 +inf.0 (union re ...)))))
-
-  (define-lex-trans sre-+
-    (syntax-rules ()
-      ((_ re ...)
-       (repetition 1 +inf.0 (union re ...)))))
-
-  (define-lex-trans ?
-    (syntax-rules ()
-      ((_ re ...)
-       (repetition 0 1 (union re ...)))))
-  
-  (define-lex-trans sre-=
-    (syntax-rules ()
-      ((_ n re ...)
-       (repetition n n (union re ...)))))
-  
-  (define-lex-trans sre->=
-    (syntax-rules ()
-      ((_ n re ...)
-       (repetition n +inf.0 (union re ...)))))
-
-  (define-lex-trans **
-    (syntax-rules ()
-      ((_ low #f re ...)
-       (** low +inf.0 re ...))
-      ((_ low high re ...)
-       (repetition low high (union re ...)))))
-  
-  (define-lex-trans sre-or
-    (syntax-rules ()
-      ((_ re ...)
-       (union re ...))))
-  
-  (define-lex-trans :
-    (syntax-rules ()
-      ((_ re ...)
-       (concatenation re ...))))
-
-  (define-lex-trans seq
-    (syntax-rules ()
-      ((_ re ...)
-       (concatenation re ...))))
-
-  (define-lex-trans &
-    (syntax-rules ()
-      ((_ re ...)
-       (intersection re ...))))
-
-  (define-lex-trans ~
-    (syntax-rules ()
-      ((_ re ...)
-       (char-complement (union re ...)))))
-  
-  ;; set difference
-  (define-lex-trans (sre-- stx)
-    (syntax-case stx ()
-      ((_)
-       (raise-syntax-error #f
-                           "must have at least one argument"
-                           stx))
-      ((_ big-re re ...)
-       (syntax (& big-re (complement (union re ...)))))))
-  
-  (define-lex-trans (sre-/ stx)
-    (syntax-case stx ()
-      ((_ range ...)
-       (let ((chars
-              (apply append (map (lambda (r)
-                                   (let ((x (syntax-e r)))
-                                     (cond
-                                       ((char? x) (list x))
-                                       ((string? x) (string->list x))
-                                       (else
-                                        (raise-syntax-error 
-                                         #f
-                                         "not a char or string"
-                                         stx
-                                         r)))))
-                                 (syntax->list (syntax (range ...)))))))
-         (unless (even? (length chars))
-           (raise-syntax-error
-            #f
-            "not given an even number of characters"
-            stx))
-         #`(/-only-chars #,@chars)))))
-  
-  (define-lex-trans /-only-chars
-    (syntax-rules ()
-      ((_ c1 c2)
-       (char-range c1 c2))
-      ((_ c1 c2 c ...)
-       (union (char-range c1 c2)
-              (/-only-chars c ...)))))
-  
-  )
-                           
-   
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex.rkt
deleted file mode 100644
index cc4f393991..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex.rkt
+++ /dev/null
@@ -1,393 +0,0 @@
-(module lex mzscheme
-
-  ;; Provides the syntax used to create lexers and the functions needed to
-  ;; create and use the buffer that the lexer reads from.  See docs.
-
-  (require-for-syntax mzlib/list
-                      syntax/stx
-                      syntax/define
-                      syntax/boundmap
-                      "private-lex/util.rkt"
-                      "private-lex/actions.rkt"
-                      "private-lex/front.rkt"
-                      "private-lex/unicode-chars.rkt")
-
-  (require mzlib/stxparam
-           syntax/readerr
-           "private-lex/token.rkt")
-
-  (provide lexer lexer-src-pos define-lex-abbrev define-lex-abbrevs define-lex-trans
-           
-           ;; Dealing with tokens and related structures 
-           define-tokens define-empty-tokens token-name token-value token?
-           (struct position (offset line col))
-           (struct position-token (token start-pos end-pos))
-           
-           ;; File path for highlighting errors while lexing
-           file-path
-           
-           ;; Lex abbrevs for unicode char sets.  See mzscheme manual section 3.4.
-           any-char any-string nothing alphabetic lower-case upper-case title-case
-           numeric symbolic punctuation graphic whitespace blank iso-control
-
-           ;; A regular expression operator
-           char-set)
-  
-  ;; wrap-action: syntax-object src-pos? -> syntax-object
-  (define-for-syntax (wrap-action action src-pos?)
-    (with-syntax ((action-stx 
-                   (if src-pos?
-                       #`(let/ec ret
-                           (syntax-parameterize 
-                            ((return-without-pos (make-rename-transformer #'ret)))
-                            (make-position-token #,action start-pos end-pos)))
-                        action)))
-      (syntax/loc action
-        (lambda (start-pos-p end-pos-p lexeme-p input-port-p)
-          (syntax-parameterize 
-           ((start-pos (make-rename-transformer #'start-pos-p))
-            (end-pos (make-rename-transformer #'end-pos-p))
-            (lexeme (make-rename-transformer #'lexeme-p))
-            (input-port (make-rename-transformer #'input-port-p)))
-           action-stx)))))
-        
-  (define-for-syntax (make-lexer-trans src-pos?)
-    (lambda (stx)
-      (syntax-case stx ()
-        ((_ re-act ...)
-         (begin
-           (for-each
-            (lambda (x)
-              (syntax-case x ()
-                ((re act) (void))
-                (_ (raise-syntax-error #f
-                                       "not a regular expression / action pair"
-                                       stx
-                                       x))))
-            (syntax->list (syntax (re-act ...))))
-           (let* ((spec/re-act-lst
-                   (syntax->list (syntax (re-act ...))))
-                  (eof-act
-                   (get-special-action spec/re-act-lst #'eof #''eof))
-                  (spec-act 
-                   (get-special-action spec/re-act-lst #'special #'(void)))
-                  (spec-comment-act 
-                   (get-special-action spec/re-act-lst #'special-comment #'#f))
-                  (ids (list #'special #'special-comment #'eof))
-                  (re-act-lst
-                   (filter
-                    (lambda (spec/re-act)
-                      (syntax-case spec/re-act ()
-                        (((special) act)
-                           (not (ormap
-                                 (lambda (x)
-                                   (and (identifier? #'special)
-                                        (module-or-top-identifier=? (syntax special) x)))
-                                 ids)))
-                        (_ #t)))
-                    spec/re-act-lst))
-		  (name-lst (map (lambda (x) (datum->syntax-object #f (gensym))) re-act-lst))
-		  (act-lst (map (lambda (x) (stx-car (stx-cdr x))) re-act-lst))
-		  (re-actname-lst (map (lambda (re-act name)
-					 (list (stx-car re-act)
-					       name))
-				       re-act-lst
-				       name-lst)))
-             (when (null? spec/re-act-lst)
-               (raise-syntax-error (if src-pos? 'lexer/src-pos 'lexer) "expected at least one action" stx))
-             (let-values (((trans start action-names no-look disappeared-uses)
-                           (build-lexer re-actname-lst)))
-               (when (vector-ref action-names start) ;; Start state is final
-                 (unless (and 
-                          ;; All the successor states are final
-                          (andmap (lambda (x) (vector-ref action-names (vector-ref x 2)))
-                                      (vector->list (vector-ref trans start)))
-                          ;; Each character has a successor state
-                          (let loop ((check 0)
-                                     (nexts (vector->list (vector-ref trans start))))
-                            (cond
-                              ((null? nexts) #f)
-                              (else
-                               (let ((next (car nexts)))
-                                 (and (= (vector-ref next 0) check)
-                                      (let ((next-check (vector-ref next 1)))
-                                        (or (>= next-check max-char-num)
-                                            (loop (add1 next-check) (cdr nexts))))))))))
-                   (eprintf "Warning: lexer at ~a can accept the empty string.\n" stx)))
-               (with-syntax ((start-state-stx start)
-                             (trans-table-stx trans)
-                             (no-lookahead-stx no-look)
-			     ((name ...) name-lst)
-			     ((act ...) (map (lambda (a)
-					       (wrap-action a src-pos?))
-					     act-lst))
-			     ((act-name ...) (vector->list action-names))
-			     (spec-act-stx
-                              (wrap-action spec-act src-pos?))
-                             (has-comment-act?-stx 
-                              (if (syntax-e spec-comment-act) #t #f))
-                             (spec-comment-act-stx
-                              (wrap-action spec-comment-act src-pos?))
-                             (eof-act-stx (wrap-action eof-act src-pos?)))
-                 (syntax-property
-                  (syntax/loc stx
-		    (let ([name act] ...)
-                      (let ([proc
-                             (lexer-body start-state-stx 
-                                         trans-table-stx
-                                         (vector act-name ...)
-                                         no-lookahead-stx
-                                         spec-act-stx
-                                         has-comment-act?-stx
-                                         spec-comment-act-stx
-                                         eof-act-stx)])
-                        ;; reverse eta to get named procedures:
-                        (lambda (port) (proc port)))))
-                  'disappeared-use
-                  disappeared-uses)))))))))
-
-  (define-syntax lexer (make-lexer-trans #f))
-  (define-syntax lexer-src-pos (make-lexer-trans #t))
-    
-  (define-syntax (define-lex-abbrev stx)
-    (syntax-case stx ()
-      ((_ name re)
-       (identifier? (syntax name))
-       (syntax/loc stx
-        (define-syntax name
-          (make-lex-abbrev (lambda () (quote-syntax re))))))
-      (_ 
-       (raise-syntax-error
-        #f
-        "form should be (define-lex-abbrev name re)"
-        stx))))
-
-  (define-syntax (define-lex-abbrevs stx)
-    (syntax-case stx ()
-      ((_ x ...)
-       (with-syntax (((abbrev ...)
-                      (map 
-                       (lambda (a)
-                         (syntax-case a ()
-                           ((name re)
-                            (identifier? (syntax name))
-                            (syntax/loc a (define-lex-abbrev name re)))
-                           (_ (raise-syntax-error
-                               #f
-                               "form should be (define-lex-abbrevs (name re) ...)"
-                               stx
-                               a))))
-                       (syntax->list (syntax (x ...))))))
-         (syntax/loc stx (begin abbrev ...))))
-      (_
-       (raise-syntax-error
-        #f
-        "form should be (define-lex-abbrevs (name re) ...)"
-        stx))))
-
-  (define-syntax (define-lex-trans stx)
-    (syntax-case stx ()
-      ((_ name-form body-form)
-       (let-values (((name body)
-                     (normalize-definition (syntax (define-syntax name-form body-form)) #'lambda)))
-         
-         #`(define-syntax #,name 
-             (let ((func #,body))
-               (unless (procedure? func)
-                 (raise-syntax-error 'define-lex-trans "expected a procedure as the transformer, got ~e" func))
-               (unless (procedure-arity-includes? func 1)
-                 (raise-syntax-error 'define-lex-trans "expected a procedure that accepts 1 argument as the transformer, got ~e" func))
-               (make-lex-trans func)))))
-      (_
-       (raise-syntax-error
-        #f
-        "form should be (define-lex-trans name transformer)"
-        stx))))
-       
-
-  (define (get-next-state-helper char min max table)
-    (if (>= min max)
-        #f
-        (let* ((try (quotient (+ min max) 2))
-               (el (vector-ref table try))
-               (r1 (vector-ref el 0))
-               (r2 (vector-ref el 1)))
-          (cond
-            ((and (>= char r1) (<= char r2)) (vector-ref el 2))
-            ((< char r1) (get-next-state-helper char min try table))
-            (else (get-next-state-helper char (add1 try) max table))))))
-               
-          
-          
-  
-  (define (get-next-state char table)
-    (if table
-        (get-next-state-helper char 0 (vector-length table) table)
-        #f))
-  
-  (define (lexer-body start-state trans-table actions no-lookahead special-action
-                      has-special-comment-action? special-comment-action eof-action)
-    (letrec ((lexer
-              (lambda (ip)
-                (let ((first-pos (get-position ip))
-                      (first-char (peek-char-or-special ip 0)))
-                  ;(printf "(peek-char-or-special port 0) = ~e\n" first-char)
-                  (cond
-                    ((eof-object? first-char)
-                     (do-match ip first-pos eof-action (read-char-or-special ip)))
-                    ((special-comment? first-char)
-                     (read-char-or-special ip)
-                     (cond
-                       (has-special-comment-action?
-                        (do-match ip first-pos special-comment-action #f))
-                       (else (lexer ip))))
-                    ((not (char? first-char))
-                     (do-match ip first-pos special-action (read-char-or-special ip)))
-                    (else
-                     (let lexer-loop (
-                                      ;; current-state
-                                      (state start-state)
-                                      ;; the character to transition on
-                                      (char first-char)
-                                      ;; action for the longest match seen thus far
-                                      ;; including a match at the current state
-                                      (longest-match-action 
-                                       (vector-ref actions start-state))
-                                      ;; how many bytes precede char
-                                      (length-bytes 0)
-                                      ;; how many characters have been read
-                                      ;; including the one just read
-                                      (length-chars 1)
-                                      ;; how many characters are in the longest match
-                                      (longest-match-length 0))
-                       (let ((next-state 
-                              (cond
-                                ((not (char? char)) #f)
-                                (else (get-next-state (char->integer char)
-                                                      (vector-ref trans-table state))))))
-                         (cond
-                           ((not next-state)
-                            (check-match ip first-pos longest-match-length
-                                         length-chars longest-match-action))
-                           ((vector-ref no-lookahead next-state)
-                            (let ((act (vector-ref actions next-state)))
-                              (check-match ip 
-                                           first-pos 
-                                           (if act length-chars longest-match-length)
-                                           length-chars
-                                           (if act act longest-match-action))))
-                           (else
-                            (let* ((act (vector-ref actions next-state))
-                                   (next-length-bytes (+ (char-utf-8-length char) length-bytes))
-                                   (next-char (peek-char-or-special ip next-length-bytes)))
-                              #;(printf "(peek-char-or-special port ~e) = ~e\n"
-                                      next-length-bytes next-char)
-                              (lexer-loop next-state 
-                                          next-char
-                                          (if act
-                                              act
-                                              longest-match-action)
-                                          next-length-bytes
-                                          (add1 length-chars)
-                                          (if act
-                                              length-chars
-                                              longest-match-length)))))))))))))
-      (lambda (ip)
-        (unless (input-port? ip)
-          (raise-argument-error 
-           'lexer 
-           "input-port?"
-           0
-           ip))
-        (lexer ip))))
-      
-  (define (check-match lb first-pos longest-match-length length longest-match-action)
-    (unless longest-match-action
-      (let* ((match (read-string length lb))
-	     (end-pos (get-position lb)))
-	(raise-read-error
-	 (format "lexer: No match found in input starting with: ~a" match)
-	 (file-path)
-	 (position-line first-pos)
-	 (position-col first-pos)
-	 (position-offset first-pos)
-	 (- (position-offset end-pos) (position-offset first-pos)))))
-    (let ((match (read-string longest-match-length lb)))
-      ;(printf "(read-string ~e port) = ~e\n" longest-match-length match)
-      (do-match lb first-pos longest-match-action match)))
-
-  (define file-path (make-parameter #f))
-
-  (define (do-match ip first-pos action value)
-    #;(printf "(action ~a ~a ~a ~a)\n" 
-            (position-offset first-pos) (position-offset (get-position ip)) value ip)
-    (action first-pos (get-position ip) value ip))
-  
-  (define (get-position ip)
-    (let-values (((line col off) (port-next-location ip)))
-      (make-position off line col)))
-
-  (define-syntax (create-unicode-abbrevs stx)
-    (syntax-case stx ()
-      ((_ ctxt)
-       (with-syntax (((ranges ...) (map (lambda (range)
-                                          `(union ,@(map (lambda (x)
-                                                           `(char-range ,(integer->char (car x))
-                                                                        ,(integer->char (cdr x))))
-                                                         range)))
-                                        (list (force alphabetic-ranges)
-                                              (force lower-case-ranges)
-                                              (force upper-case-ranges)
-                                              (force title-case-ranges)
-                                              (force numeric-ranges)
-                                              (force symbolic-ranges)
-                                              (force punctuation-ranges)
-                                              (force graphic-ranges)
-                                              (force whitespace-ranges)
-                                              (force blank-ranges)
-                                              (force iso-control-ranges))))
-                     ((names ...) (map (lambda (sym)
-                                         (datum->syntax-object (syntax ctxt) sym #f))
-                                       '(alphabetic
-                                         lower-case
-                                         upper-case
-                                         title-case
-                                         numeric
-                                         symbolic
-                                         punctuation
-                                         graphic
-                                         whitespace
-                                         blank
-                                         iso-control))))
-         (syntax (define-lex-abbrevs (names ranges) ...))))))
-                                             
-  (define-lex-abbrev any-char (char-complement (union)))
-  (define-lex-abbrev any-string (intersection))
-  (define-lex-abbrev nothing (union))
-  (create-unicode-abbrevs #'here)
-  
-  (define-lex-trans (char-set stx)
-    (syntax-case stx ()
-      ((_ str)
-       (string? (syntax-e (syntax str)))
-       (with-syntax (((char ...) (string->list (syntax-e (syntax str)))))
-         (syntax (union char ...))))))
-
-  (define-syntax provide-lex-keyword
-    (syntax-rules ()
-      [(_ id ...)
-       (begin
-	 (define-syntax-parameter id
-           (make-set!-transformer
-            (lambda (stx)
-              (raise-syntax-error
-               #f
-               (format "use of a lexer keyword (~a) is not in an appropriate lexer action"
-                       'id)
-               stx))))
-	 ...
-	 (provide id ...))]))
-  
-  (provide-lex-keyword start-pos end-pos lexeme input-port return-without-pos)
-
-)
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/actions.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/actions.rkt
deleted file mode 100644
index 6ec0c7f491..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/actions.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang scheme/base
-
-(provide (all-defined-out))
-(require syntax/stx)
-
-;; get-special-action: (syntax-object list) syntax-object syntax-object  -> syntax-object
-;; Returns the first action from a rule of the form ((which-special) action)
-(define (get-special-action rules which-special none)
-  (cond
-    ((null? rules) none)
-    (else
-     (syntax-case (car rules) ()
-       (((special) act)
-        (and (identifier? #'special) (module-or-top-identifier=? (syntax special) which-special))
-        (syntax act))
-       (_ (get-special-action (cdr rules) which-special none))))))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/deriv.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/deriv.rkt
deleted file mode 100644
index 28919a3261..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/deriv.rkt
+++ /dev/null
@@ -1,339 +0,0 @@
-(module deriv mzscheme
-  
-  (require mzlib/list
-           (prefix is: mzlib/integer-set)
-           "re.rkt"
-           "util.rkt")
-
-  (provide build-dfa print-dfa (struct dfa (num-states start-state final-states/actions transitions)))
-
-  (define e (build-epsilon))
-  (define z (build-zero))
-  
-  
-  ;; Don't do anything with this one but extract the chars
-  (define all-chars (->re `(char-complement (union)) (make-cache)))
-  
-  ;; get-char-groups : re bool -> (list-of char-setR?)
-  ;; Collects the char-setRs in r that could be used in
-  ;; taking the derivative of r.
-  (define (get-char-groups r found-negation)
-    (cond
-      ((or (eq? r e) (eq? r z)) null)
-      ((char-setR? r) (list r))
-      ((concatR? r)
-       (if (re-nullable? (concatR-re1 r))
-           (append (get-char-groups (concatR-re1 r) found-negation)
-                   (get-char-groups (concatR-re2 r) found-negation))
-           (get-char-groups (concatR-re1 r) found-negation)))
-      ((repeatR? r)
-       (get-char-groups (repeatR-re r) found-negation))
-      ((orR? r)
-       (apply append (map (lambda (x) (get-char-groups x found-negation)) (orR-res r))))
-      ((andR? r)
-       (apply append (map (lambda (x) (get-char-groups x found-negation)) (andR-res r))))
-      ((negR? r)
-       (if found-negation
-           (get-char-groups (negR-re r) #t)
-           (cons all-chars (get-char-groups (negR-re r) #t))))))
-
-  (test-block ((c (make-cache))
-               (r1 (->re #\1 c))
-               (r2 (->re #\2 c)))
-              ((get-char-groups e #f) null)
-              ((get-char-groups z #f) null)
-              ((get-char-groups r1 #f) (list r1))
-              ((get-char-groups (->re `(concatenation ,r1 ,r2) c) #f)
-               (list r1))
-              ((get-char-groups (->re `(concatenation ,e ,r2) c) #f) 
-               (list r2))
-              ((get-char-groups (->re `(concatenation (repetition 0 +inf.0 ,r1) ,r2) c) #f) 
-               (list r1 r2))
-              ((get-char-groups (->re `(repetition 0 +inf.0 ,r1) c) #f) 
-               (list r1))
-              ((get-char-groups
-                (->re `(union (repetition 0 +inf.0 ,r1) 
-                              (concatenation (repetition 0 +inf.0 ,r2) "3") "4") c) #f)
-               (list r1 r2 (->re "3" c) (->re "4" c)))
-              ((get-char-groups (->re `(complement ,r1) c) #f) 
-               (list all-chars r1))
-              ((get-char-groups 
-                (->re `(intersection (repetition 0 +inf.0 ,r1)
-                                     (concatenation (repetition 0 +inf.0 ,r2) "3") "4") c) #f)
-               (list r1 r2 (->re "3" c) (->re "4" c)))
-              )
-  (define loc:member? is:member?)
-  
-  ;; deriveR : re char cache -> re
-  (define (deriveR r c cache)
-    (cond
-      ((or (eq? r e) (eq? r z)) z)
-      ((char-setR? r)
-       (if (loc:member? c (char-setR-chars r)) e z))
-      ((concatR? r)
-       (let* ((r1 (concatR-re1 r))
-              (r2 (concatR-re2 r))
-              (d (build-concat (deriveR r1 c cache) r2 cache)))
-         (if (re-nullable? r1)
-             (build-or (list d (deriveR r2 c cache)) cache)
-             d)))
-      ((repeatR? r)
-       (build-concat (deriveR (repeatR-re r) c cache)
-                     (build-repeat (sub1 (repeatR-low r))
-                                   (sub1 (repeatR-high r))
-                                   (repeatR-re r) cache)
-                     cache))
-      ((orR? r)
-       (build-or (map (lambda (x) (deriveR x c cache))
-                      (orR-res r))
-                 cache))
-      ((andR? r)
-       (build-and (map (lambda (x) (deriveR x c cache))
-                       (andR-res r))
-                  cache))
-      ((negR? r)
-       (build-neg (deriveR (negR-re r) c cache) cache))))
-
-  (test-block ((c (make-cache))
-               (a (char->integer #\a))
-               (b (char->integer #\b))
-               (r1 (->re #\a c))
-               (r2 (->re `(repetition 0 +inf.0 #\a) c))
-               (r3 (->re `(repetition 0 +inf.0 ,r2) c))
-               (r4 (->re `(concatenation #\a ,r2) c))
-               (r5 (->re `(repetition 0 +inf.0 ,r4) c))
-               (r6 (->re `(union ,r5 #\a) c))
-               (r7 (->re `(concatenation ,r2 ,r2) c))
-               (r8 (->re `(complement ,r4) c))
-               (r9 (->re `(intersection ,r2 ,r4) c)))
-              ((deriveR e a c) z)
-              ((deriveR z a c) z)
-              ((deriveR r1 b c) z)
-              ((deriveR r1 a c) e)
-              ((deriveR r2 a c) r2)
-              ((deriveR r2 b c) z)
-              ((deriveR r3 a c) r2)
-              ((deriveR r3 b c) z)
-              ((deriveR r4 a c) r2)
-              ((deriveR r4 b c) z)
-              ((deriveR r5 a c) (->re `(concatenation ,r2 ,r5) c))
-              ((deriveR r5 b c) z)
-              ((deriveR r6 a c) (->re `(union (concatenation ,r2 ,r5) "") c))
-              ((deriveR r6 b c) z)
-              ((deriveR r7 a c) (->re `(union (concatenation ,r2 ,r2) ,r2) c))
-              ((deriveR r7 b c) z)
-              ((deriveR r8 a c) (->re `(complement, r2) c))
-              ((deriveR r8 b c) (->re `(complement ,z) c))
-              ((deriveR r9 a c) r2)
-              ((deriveR r9 b c) z)
-              ((deriveR (->re `(repetition 1 2 "ab") c) a c)
-               (->re `(concatenation "b" (repetition 0 1 "ab")) c)))
-  
-  ;; An re-action is (cons re action)
-
-  ;; derive : (list-of re-action) char cache -> (union (list-of re-action) #f)
-  ;; applies deriveR to all the re-actions's re parts.
-  ;; Returns #f if the derived state is equivalent to z.
-  (define (derive r c cache)
-    (let ((new-r (map (lambda (ra)
-                        (cons (deriveR (car ra) c cache) (cdr ra)))
-                      r)))
-      (if (andmap (lambda (x) (eq? z (car x)))
-                  new-r)
-          #f
-          new-r)))
-
-  (test-block ((c (make-cache))
-               (r1 (->re #\1 c))
-               (r2 (->re #\2 c)))
-              ((derive null (char->integer #\1) c) #f)
-              ((derive (list (cons r1 1) (cons r2 2)) (char->integer #\1) c)
-               (list (cons e 1) (cons z 2)))
-              ((derive (list (cons r1 1) (cons r2 2)) (char->integer #\3) c) #f))
-  
-
-  ;; get-final : (list-of re-action) -> (union #f syntax-object)
-  ;; An re that accepts e represents a final state.  Return the
-  ;; action from the first final state or #f if there is none.
-  (define (get-final res)
-    (cond
-      ((null? res) #f)
-      ((re-nullable? (caar res)) (cdar res))
-      (else (get-final (cdr res)))))
-
-  (test-block ((c->i char->integer)
-               (c (make-cache))
-               (r1 (->re #\a c))
-               (r2 (->re #\b c))
-               (b (list (cons z 1) (cons z 2) (cons z 3) (cons e 4) (cons z 5)))
-               (a (list (cons r1 1) (cons r2 2))))
-              ((derive null (c->i #\a) c) #f)
-              ((derive a (c->i #\a) c) (list (cons e 1) (cons z 2)))
-              ((derive a (c->i #\b) c) (list (cons z 1) (cons e 2)))
-              ((derive a (c->i #\c) c) #f)
-              ((derive (list (cons (->re `(union " " "\n" ",") c) 1)
-                             (cons (->re `(concatenation (repetition 0 1 "-")
-                                                         (repetition 1 +inf.0 (char-range "0" "9"))) c) 2)
-                             (cons (->re `(concatenation "-" (repetition 1 +inf.0 "-")) c) 3)
-                             (cons (->re "[" c) 4)
-                             (cons (->re "]" c) 5)) (c->i #\[) c)
-               b)
-              ((get-final a) #f)
-              ((get-final (list (cons e 1) (cons e 2))) 1)
-              ((get-final b) 4))
-  
-  
-  ;; A state is (make-state (list-of re-action) nat)
-  (define-struct state (spec index))
-        
-  ;; get->key : re-action -> (list-of nat)
-  ;; states are indexed by the list of indexes of their res
-  (define (get-key s)
-    (map (lambda (x) (re-index (car x))) s))  
-          
-  (define loc:partition is:partition)
-  
-  ;; compute-chars : (list-of state) -> (list-of char-set)
-  ;; Computed the sets of equivalent characters for taking the
-  ;; derivative of the car of st.  Only one derivative per set need to be taken.
-  (define (compute-chars st)
-    (cond
-      ((null? st) null)
-      (else
-       (loc:partition (map char-setR-chars
-                          (apply append (map (lambda (x) (get-char-groups (car x) #f))
-                                             (state-spec (car st)))))))))
-  
-  (test-block ((c (make-cache))
-               (c->i char->integer)
-               (r1 (->re `(char-range #\1 #\4) c))
-               (r2 (->re `(char-range #\2 #\3) c)))
-              ((compute-chars null) null)
-              ((compute-chars (list (make-state null 1))) null)
-              ((map is:integer-set-contents
-                    (compute-chars (list (make-state (list (cons r1 1) (cons r2 2)) 2))))
-               (list (is:integer-set-contents (is:make-range (c->i #\2) (c->i #\3)))
-                     (is:integer-set-contents (is:union (is:make-range (c->i #\1))
-                                                        (is:make-range (c->i #\4)))))))
-  
-  
-  ;; A dfa is (make-dfa int int
-  ;;                    (list-of (cons int syntax-object))
-  ;;                    (list-of (cons int (list-of (cons char-set int)))))
-  ;; Each transitions is a state and a list of chars with the state to transition to.
-  ;; The finals and transitions are sorted by state number, and duplicate free.
-  (define-struct dfa (num-states start-state final-states/actions transitions) (make-inspector))
-  
-  (define loc:get-integer is:get-integer)
-  
-  ;; build-dfa : (list-of re-action) cache -> dfa
-  (define (build-dfa rs cache)
-    (let* ((transitions (make-hash-table))
-           (get-state-number (make-counter))
-           (start (make-state rs (get-state-number))))
-      (cache (cons 'state (get-key rs)) (lambda () start))
-      (let loop ((old-states (list start))
-                 (new-states null)
-		 (all-states (list start))
-                 (cs (compute-chars (list start))))
-        (cond
-          ((and (null? old-states) (null? new-states))
-           (make-dfa (get-state-number) (state-index start)
-                     (sort (filter (lambda (x) (cdr x))
-                                   (map (lambda (state)
-                                          (cons (state-index state) (get-final (state-spec state))))
-                                        all-states))
-                           (lambda (a b) (< (car a) (car b))))
-                     (sort (hash-table-map transitions
-                                           (lambda (state trans)
-                                             (cons (state-index state)
-                                                   (map (lambda (t)
-                                                          (cons (car t)
-                                                                (state-index (cdr t))))
-                                                        trans))))
-                           (lambda (a b) (< (car a) (car b))))))
-          ((null? old-states)
-           (loop new-states null all-states (compute-chars new-states)))
-          ((null? cs)
-           (loop (cdr old-states) new-states all-states (compute-chars (cdr old-states))))
-          (else
-           (let* ((state (car old-states))
-                  (c (car cs))
-                  (new-re (derive (state-spec state) (loc:get-integer c) cache)))
-             (cond
-               (new-re
-                (let* ((new-state? #f)
-                       (new-state (cache (cons 'state (get-key new-re))
-                                         (lambda ()
-                                           (set! new-state? #t)
-                                           (make-state new-re (get-state-number)))))
-		       (new-all-states (if new-state? (cons new-state all-states) all-states)))
-                  (hash-table-put! transitions 
-                                   state
-                                   (cons (cons c new-state)
-                                         (hash-table-get transitions state
-                                                         (lambda () null))))
-                  (cond
-                    (new-state?
-                     (loop old-states (cons new-state new-states) new-all-states (cdr cs)))
-                    (else
-                     (loop old-states new-states new-all-states (cdr cs))))))
-               (else (loop old-states new-states all-states (cdr cs))))))))))
-  
-  (define (print-dfa x)
-    (printf "number of states: ~a\n" (dfa-num-states x))
-    (printf "start state: ~a\n" (dfa-start-state x))
-    (printf "final states: ~a\n" (map car (dfa-final-states/actions x)))
-    (for-each (lambda (trans)
-                (printf "state: ~a\n" (car trans))
-                (for-each (lambda (rule)
-                            (printf "  -~a-> ~a\n"
-                                    (is:integer-set-contents (car rule))
-                                    (cdr rule)))
-                          (cdr trans)))
-              (dfa-transitions x)))
- 
-  (define (build-test-dfa rs)
-    (let ((c (make-cache)))
-      (build-dfa (map (lambda (x) (cons (->re x c) 'action))
-                      rs)
-                 c)))
-
-  
-#|
-  (define t1 (build-test-dfa null))
-  (define t2 (build-test-dfa `(#\a)))
-  (define t3 (build-test-dfa `(#\a #\b)))
-  (define t4 (build-test-dfa `((repetition 0 +inf.0 #\a)
-                               (repetition 0 +inf.0 (concatenation #\a #\b)))))
-  (define t5 (build-test-dfa `((concatenation (repetition 0 +inf.0 (union #\0 #\1)) #\1))))
-  (define t6 (build-test-dfa `((repetition 0 +inf.0 (repetition 0 +inf.0 #\a))
-                               (repetition 0 +inf.0 (concatenation #\b (repetition 1 +inf.0 #\b))))))
-  (define t7 (build-test-dfa `((concatenation (repetition 0 +inf.0 #\a) (repetition 0 +inf.0 #\b)
-                                              (repetition 0 +inf.0 #\c) (repetition 0 +inf.0 #\d)
-                                              (repetition 0 +inf.0 #\e)))))
-  (define t8
-    (build-test-dfa `((concatenation (repetition 0 +inf.0 (union #\a #\b)) #\a (union #\a #\b)
-                                     (union #\a #\b) (union #\a #\b) (union #\a #\b)))))
-  (define t9 (build-test-dfa `((concatenation "/*"
-                                  (complement (concatenation (intersection) "*/" (intersection)))
-                                  "*/"))))
-  (define t11 (build-test-dfa `((complement "1"))))
-  (define t12 (build-test-dfa `((concatenation (intersection (concatenation (repetition 0 +inf.0 "a") "b")
-                                                             (concatenation "a" (repetition 0 +inf.0 "b")))
-                                               "ab"))))
-  (define x (build-test-dfa `((union " " "\n" ",")
-                              (concatenation (repetition 0 1 "-") (repetition 1 +inf.0 (char-range "0" "9")))
-                              (concatenation "-" (repetition 1 +inf.0 "-"))
-                              "["
-                              "]")))
-  (define y (build-test-dfa
-             `((repetition 1 +inf.0
-                       (union (concatenation "|" (repetition 0 +inf.0 (char-complement "|")) "|")
-                              (concatenation "|" (repetition 0 +inf.0 (char-complement "|"))))))))
-  (define t13 (build-test-dfa `((intersection (concatenation (intersection) "111" (intersection))
-                                              (complement (union (concatenation (intersection) "01")
-                                       (repetition 1 +inf.0 "1")))))))
-  (define t14 (build-test-dfa `((complement "1"))))
-|#
-  )
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/error-tests.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/error-tests.rkt
deleted file mode 100644
index bbccbe0752..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/error-tests.rkt
+++ /dev/null
@@ -1,81 +0,0 @@
-#lang scheme/base
-(require (for-syntax scheme/base)
-         "../lex.rkt"
-         rackunit)
-
-(define-syntax (catch-syn-error stx)
-  (syntax-case stx ()
-    [(_ arg)
-     (datum->syntax
-      #'here
-      (with-handlers ((exn:fail:syntax? exn-message))
-        (syntax-local-expand-expression  #'arg)
-        "not-an-error"))]))
-
-(check-regexp-match #rx"lex-abbrev" (catch-syn-error (define-lex-abbrev)))
-(check-regexp-match #rx"lex-abbrev" (catch-syn-error (define-lex-abbrev a)))
-(check-regexp-match #rx"lex-abbrev" (catch-syn-error (define-lex-abbrev (a b) v)))
-(check-regexp-match #rx"lex-abbrev" (catch-syn-error (define-lex-abbrev 1 1)))
-(check-regexp-match #rx"lex-abbrevs" (catch-syn-error (define-lex-abbrevs ())))
-
-(check-regexp-match #rx"lex-trans" (catch-syn-error (define-lex-trans)))
-
-(check-regexp-match #rx"lexer" (catch-syn-error (lexer)))
-(check-regexp-match #rx"lexer" (catch-syn-error (lexer ("a" "b" "c"))))
-(check-regexp-match #rx"lexer" (catch-syn-error (lexer ())))
-(check-regexp-match #rx"lexer" (catch-syn-error (lexer (""))))
-
-(check-regexp-match #rx"regular-expression" (catch-syn-error (lexer (a 1))))
-(check-regexp-match #rx"regular-expression" (catch-syn-error (lexer ((a) 1))))
-(check-regexp-match #rx"regular-expression" (catch-syn-error (let ((a 1)) (lexer ((a) 1)))))
-
-(check-regexp-match #rx"regular-expression"
-                    (catch-syn-error (let-syntax ((a 1))
-                                       (lexer ((a) 1)))))
-
-(check-regexp-match #rx"define-lex-trans"
-                    (catch-syn-error 
-                     (let ()
-                       (define-lex-trans a 1)
-                       (let ()
-                         (lexer ((a) 1))))))
-
-;; Detecting mutual recursion cycle:
-(check-regexp-match #rx"regular-expression"
-                    (catch-syn-error 
-                     (let ()
-                       (define-lex-abbrev a b)
-                       (define-lex-abbrev b a)
-                       (let ()
-                         (lexer (a 1))))))
-
-(check-regexp-match #rx"regular-expression"
-                    (catch-syn-error 
-                     (let ()
-                       (define-lex-abbrev a (repetition 0 1 b))
-                       (define-lex-abbrev b (repetition 0 1 a))
-                       (let ()
-                         (lexer (a 1))))))
-
-;; Detecting cycle within same abbreviation:
-(check-regexp-match #rx"regular-expression"
-                    (catch-syn-error 
-                     (let ()
-                       (define-lex-abbrev balanced 
-                         (union (concatenation "(" balanced ")" balanced)
-                                any-char))
-                       (lexer
-                        [balanced (string-append lexeme (balanced input-port))]
-                        [(eof) ""]))))
-
-
-(check-regexp-match #rx"regular-expression" (catch-syn-error (lexer (1 1))))
-(check-regexp-match #rx"repetition" (catch-syn-error (lexer ((repetition) 1))))
-(check-regexp-match #rx"repetition" (catch-syn-error (lexer ((repetition #\1 #\1 "3") 1))))
-(check-regexp-match #rx"repetition" (catch-syn-error (lexer ((repetition 1 #\1 "3") 1))))
-(check-regexp-match #rx"repetition" (catch-syn-error (lexer ((repetition 1 0 "3") 1))))
-(check-regexp-match #rx"complement" (catch-syn-error (lexer ((complement) 1))))
-(check-regexp-match #rx"char-range" (catch-syn-error (lexer ((char-range) 1))))
-(check-regexp-match #rx"char-range" (catch-syn-error (lexer ((char-range #\9 #\0) 1))))
-(check-regexp-match #rx"char-complement" (catch-syn-error (lexer ((char-complement) 1))))
-(check-regexp-match #rx"char-complement" (catch-syn-error (lexer ((char-complement (concatenation "1" "2")) 1))))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/front.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/front.rkt
deleted file mode 100644
index f74c0030ff..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/front.rkt
+++ /dev/null
@@ -1,179 +0,0 @@
-(module front mzscheme
-  (require (prefix is: mzlib/integer-set)
-           mzlib/list
-           syntax/stx
-           "util.rkt"
-           "stx.rkt"
-           "re.rkt"
-           "deriv.rkt")
-  
-  (provide build-lexer)
-  
-  (define-syntax time-label
-    (syntax-rules ()
-      ((_ l e ...)
-       (begin
-         (printf "~a: " l)
-         (time (begin e ...))))))
-  
-  ;; A table is either
-  ;; - (vector-of (union #f nat))
-  ;; - (vector-of (vector-of (vector nat nat nat)))
-  
-  (define loc:integer-set-contents is:integer-set-contents)
-  
-  ;; dfa->1d-table : dfa -> (same as build-lexer)
- (define (dfa->1d-table dfa)
-   (let ((state-table (make-vector (dfa-num-states dfa) #f))
-         (transition-cache (make-hash-table 'equal)))
-     (for-each
-      (lambda (trans)
-        (let* ((from-state (car trans))
-               (all-chars/to (cdr trans))
-               (flat-all-chars/to
-                (sort
-                 (apply append
-                   (map (lambda (chars/to)
-                          (let ((char-ranges (loc:integer-set-contents (car chars/to)))
-                                (to (cdr chars/to)))
-                            (map (lambda (char-range)
-                                   (let ((entry (vector (car char-range) (cdr char-range) to)))
-                                     (hash-table-get transition-cache entry
-                                                     (lambda ()
-                                                       (hash-table-put! transition-cache
-                                                                        entry
-                                                                        entry)
-                                                       entry))))
-                                 char-ranges)))
-                        all-chars/to))
-                 (lambda (a b)
-                   (< (vector-ref a 0) (vector-ref b 0))))))
-          (vector-set! state-table from-state (list->vector flat-all-chars/to))))
-      (dfa-transitions dfa))
-     state-table))
-  
-         
-  (define loc:foldr is:foldr)
-  
-  ;; dfa->2d-table : dfa -> (same as build-lexer)
-  (define (dfa->2d-table dfa)
-    (let (
-          ;; char-table : (vector-of (union #f nat))
-          ;; The lexer table, one entry per state per char.
-          ;; Each entry specifies a state to transition to.
-          ;; #f indicates no transition
-          (char-table (make-vector (* 256 (dfa-num-states dfa)) #f)))
-      
-      ;; Fill the char-table vector
-      (for-each 
-       (lambda (trans)
-         (let ((from-state (car trans)))
-           (for-each (lambda (chars/to)
-                       (let ((to-state (cdr chars/to)))
-                         (loc:foldr (lambda (char _)
-                                     (vector-set! char-table
-                                                  (bitwise-ior 
-                                                   char
-                                                   (arithmetic-shift from-state 8))
-                                                  to-state))
-                                   (void)
-                                   (car chars/to))))
-                     (cdr trans))))
-       (dfa-transitions dfa))
-      char-table))
-      
-
-  ;; dfa->actions : dfa -> (vector-of (union #f syntax-object))
-  ;; The action for each final state, #f if the state isn't final
-  (define (dfa->actions dfa)
-    (let ((actions (make-vector (dfa-num-states dfa) #f)))
-      (for-each (lambda (state/action)
-                  (vector-set! actions (car state/action) (cdr state/action)))
-                (dfa-final-states/actions dfa))
-      actions))
-      
-  ;; dfa->no-look : dfa -> (vector-of bool)
-  ;; For each state whether the lexer can ignore the next input.
-  ;; It can do this only if there are no transitions out of the
-  ;; current state.
-  (define (dfa->no-look dfa)
-    (let ((no-look (make-vector (dfa-num-states dfa) #t)))
-      (for-each (lambda (trans)
-                  (vector-set! no-look (car trans) #f))
-                (dfa-transitions dfa))
-      no-look))
-      
-  (test-block ((d1 (make-dfa 1 1 (list) (list)))
-               (d2 (make-dfa 4 1 (list (cons 2 2) (cons 3 3))
-                             (list (cons 1 (list (cons (is:make-range 49 50) 1)
-                                                 (cons (is:make-range 51) 2)))
-                                   (cons 2 (list (cons (is:make-range 49) 3))))))
-               (d3 (make-dfa 4 1 (list (cons 2 2) (cons 3 3))
-                             (list (cons 1 (list (cons (is:make-range 100 200) 0)
-                                                 (cons (is:make-range 49 50) 1)
-                                                 (cons (is:make-range 51) 2)))
-                                   (cons 2 (list (cons (is:make-range 49) 3)))))))
-              ((dfa->2d-table d1) (make-vector 256 #f))
-              ((dfa->2d-table d2) (let ((v (make-vector 1024 #f)))
-                                    (vector-set! v 305 1)
-                                    (vector-set! v 306 1)
-                                    (vector-set! v 307 2)
-                                    (vector-set! v 561 3)
-                                    v))
-              ((dfa->1d-table d1) (make-vector 1 #f))
-              ((dfa->1d-table d2) #(#f
-                                  #(#(49 50 1) #(51 51 2))
-                                  #(#(49 49 3))
-                                  #f))
-              ((dfa->1d-table d3) #(#f
-                                  #(#(49 50 1) #(51 51 2) #(100 200 0))
-                                  #(#(49 49 3))
-                                  #f))
-              ((dfa->actions d1) (vector #f))
-              ((dfa->actions d2) (vector #f #f 2 3))
-              ((dfa->no-look d1) (vector #t))
-              ((dfa->no-look d2) (vector #t #f #f #t)))
-
-  ;; build-lexer : syntax-object list ->
-  ;;   (values table nat (vector-of (union #f syntax-object)) (vector-of bool) (list-of syntax-object))
-  ;; each syntax object has the form (re action)
-  (define (build-lexer sos)
-    (let* ((disappeared-uses (box null))
-           (s-re-acts (map (lambda (so)
-                             (cons (parse (stx-car so) disappeared-uses)
-				   (stx-car (stx-cdr so))))
-                           sos))
-
-           (cache (make-cache))
-           
-           (re-acts (map (lambda (s-re-act)
-			   (cons (->re (car s-re-act) cache)
-				 (cdr s-re-act)))
-			 s-re-acts))
-           
-           (dfa (build-dfa re-acts cache))
-           (table (dfa->1d-table dfa)))
-      ;(print-dfa dfa)
-      #;(let ((num-states (vector-length table))
-            (num-vectors (length (filter values (vector->list table))))
-            (num-entries (apply + (map
-                                   (lambda (x) (if x (vector-length x) 0))
-                                   (vector->list table))))
-            (num-different-entries
-             (let ((ht (make-hash-table)))
-               (for-each
-                (lambda (x)
-                  (when x
-                    (for-each
-                     (lambda (y)
-                       (hash-table-put! ht y #t))
-                     (vector->list x))))
-                (vector->list table))
-               (length (hash-table-map ht cons)))))
-        (printf "~a states, ~aKB\n"
-                num-states
-                (/ (* 4.0 (+ 2 num-states (* 2 num-vectors) num-entries
-                             (* 5 num-different-entries))) 1024)))
-      (values table (dfa-start-state dfa) (dfa->actions dfa) (dfa->no-look dfa)
-              (unbox disappeared-uses))))
-  )
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/re.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/re.rkt
deleted file mode 100644
index 9da62de83a..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/re.rkt
+++ /dev/null
@@ -1,385 +0,0 @@
-(module re mzscheme
-  (require mzlib/list
-           scheme/match
-           (prefix is: mzlib/integer-set)
-           "util.rkt")
-  
-  (provide ->re build-epsilon build-zero build-char-set build-concat
-           build-repeat build-or build-and build-neg
-           epsilonR? zeroR? char-setR? concatR? repeatR? orR? andR? negR?
-           char-setR-chars concatR-re1 concatR-re2 repeatR-re repeatR-low repeatR-high
-           orR-res andR-res negR-re
-           re-nullable? re-index)
-  
-  ;; get-index : -> nat
-  (define get-index (make-counter))
-
-  ;; An re is either
-  ;; - (make-epsilonR bool nat)
-  ;; - (make-zeroR bool nat)
-  ;; - (make-char-setR bool nat char-set)
-  ;; - (make-concatR bool nat re re)
-  ;; - (make-repeatR bool nat nat nat-or-+inf.0 re)
-  ;; - (make-orR bool nat (list-of re))    Must not directly contain any orRs
-  ;; - (make-andR bool nat (list-of re))   Must not directly contain any andRs
-  ;; - (make-negR bool nat re)
-  ;;
-  ;; Every re must have an index field globally different from all
-  ;; other re index fields.
-  (define-struct re (nullable? index) (make-inspector))
-  (define-struct (epsilonR re) () (make-inspector))
-  (define-struct (zeroR re) () (make-inspector))
-  (define-struct (char-setR re) (chars) (make-inspector))
-  (define-struct (concatR re) (re1 re2) (make-inspector))
-  (define-struct (repeatR re) (low high re) (make-inspector))
-  (define-struct (orR re) (res) (make-inspector))
-  (define-struct (andR re) (res) (make-inspector))
-  (define-struct (negR re) (re) (make-inspector))
-
-  ;; e : re
-  ;; The unique epsilon re
-  (define e (make-epsilonR #t (get-index)))
-
-  ;; z : re
-  ;; The unique zero re
-  (define z (make-zeroR #f (get-index)))
-
-
-  ;; s-re = char                       constant
-  ;;      | string                     constant (sequence of characters)
-  ;;      | re                         a precompiled re
-  ;;      | (repetition low high s-re) repetition between low and high times (inclusive)
-  ;;      | (union s-re ...)           
-  ;;      | (intersection s-re ...)    
-  ;;      | (complement s-re)          
-  ;;      | (concatenation s-re ...)   
-  ;;      | (char-range rng rng)       match any character between two (inclusive)
-  ;;      | (char-complement char-set) match any character not listed
-  ;; low = natural-number
-  ;; high = natural-number or +inf.0
-  ;; rng = char or string with length 1
-  ;; (concatenation) (repetition 0 0 x), and "" match the empty string.
-  ;; (union) matches no strings.
-  ;; (intersection) matches any string.
-  
-  (define loc:make-range is:make-range)
-  (define loc:union is:union)
-  (define loc:split is:split)
-  (define loc:complement is:complement)
-  
-  ;; ->re : s-re cache -> re
-  (define (->re exp cache)
-    (match exp
-      ((? char?) (build-char-set (loc:make-range (char->integer exp)) cache))
-      ((? string?) (->re `(concatenation ,@(string->list exp)) cache))
-      ((? re?) exp)
-      (`(repetition ,low ,high ,r)
-        (build-repeat low high (->re r cache) cache))
-      (`(union ,rs ...)
-        (build-or (flatten-res (map (lambda (r) (->re r cache)) rs)
-                               orR? orR-res loc:union cache)
-                  cache))
-      (`(intersection ,rs ...)
-        (build-and (flatten-res (map (lambda (r) (->re r cache)) rs)
-                                andR? andR-res (lambda (a b)
-                                                 (let-values (((i _ __) (loc:split a b))) i))
-                                cache)
-                   cache))
-      (`(complement ,r)
-        (build-neg (->re r cache) cache))
-      (`(concatenation ,rs ...)
-        (foldr (lambda (x y)
-                 (build-concat (->re x cache) y cache))
-               e
-               rs))
-      (`(char-range ,c1 ,c2)
-        (let ((i1 (char->integer (if (string? c1) (string-ref c1 0) c1)))
-              (i2 (char->integer (if (string? c2) (string-ref c2 0) c2))))
-          (if (<= i1 i2)
-              (build-char-set (loc:make-range i1 i2) cache)
-              z)))
-      (`(char-complement ,crs ...)
-        (let ((cs (->re `(union ,@crs) cache)))
-          (cond
-            ((zeroR? cs) (build-char-set (loc:make-range 0 max-char-num) cache))
-            ((char-setR? cs)
-             (build-char-set (loc:complement (char-setR-chars cs) 0 max-char-num) cache))
-            (else z))))))
-              
-
-        
-
-  ;; flatten-res: (list-of re) (re -> bool) (re -> (list-of re))
-  ;;              (char-set char-set -> char-set) cache -> (list-of re)
-  ;; Takes all the char-sets in l and combines them into one char-set using the combine function.
-  ;; Flattens out the values of type?.  get-res only needs to function on things type? returns
-  ;; true for.
-  (define (flatten-res l type? get-res combine cache)
-    (let loop ((res l)
-               ;; chars : (union #f char-set)
-               (chars #f)
-               (no-chars null))
-      (cond
-        ((null? res) 
-         (if chars
-             (cons (build-char-set chars cache) no-chars)
-             no-chars))
-        ((char-setR? (car res))
-         (if chars
-             (loop (cdr res) (combine (char-setR-chars (car res)) chars) no-chars)
-             (loop (cdr res) (char-setR-chars (car res)) no-chars)))
-        ((type? (car res))
-         (loop (append (get-res (car res)) (cdr res)) chars no-chars))
-        (else (loop (cdr res) chars (cons (car res) no-chars))))))
-    
-  ;; build-epsilon : -> re
-  (define (build-epsilon) e)
-  
-  (define (build-zero) z)
-    
-  (define loc:integer-set-contents is:integer-set-contents)
-  
-  ;; build-char-set : char-set cache -> re
-  (define (build-char-set cs cache)
-    (let ((l (loc:integer-set-contents cs)))
-      (cond
-        ((null? l) z)
-        (else
-         (cache l
-                (lambda ()
-                  (make-char-setR #f (get-index) cs)))))))
-  
-  
-  
-  ;; build-concat : re re cache -> re
-  (define (build-concat r1 r2 cache)
-      (cond
-        ((eq? e r1) r2)
-        ((eq? e r2) r1)
-        ((or (eq? z r1) (eq? z r2)) z)
-        (else
-           (cache (cons 'concat (cons (re-index r1) (re-index r2)))
-                  (lambda ()
-                    (make-concatR (and (re-nullable? r1) (re-nullable? r2))
-                                  (get-index)
-                                  r1 r2))))))
-  
-  ;; build-repeat : nat nat-or-+inf.0 re cache -> re
-  (define (build-repeat low high r cache)
-    (let ((low (if (< low 0) 0 low)))
-      (cond
-        ((eq? r e) e)
-        ((and (= 0 low) (or (= 0 high) (eq? z r))) e)
-        ((and (= 1 low) (= 1 high)) r)
-        ((and (repeatR? r)
-              (eq? (repeatR-high r) +inf.0)
-              (or (= 0 (repeatR-low r))
-                  (= 1 (repeatR-low r))))
-         (build-repeat (* low (repeatR-low r))
-                       +inf.0
-                       (repeatR-re r)
-                       cache))
-        (else
-         (cache (cons 'repeat (cons low (cons high (re-index r))))
-                (lambda ()
-                  (make-repeatR (or (re-nullable? r) (= 0 low)) (get-index) low high r)))))))
-  
-  
-  ;; build-or : (list-of re) cache -> re
-  (define (build-or rs cache)
-    (let ((rs 
-           (filter
-            (lambda (x) (not (eq? x z)))
-            (do-simple-equiv (replace rs orR? orR-res null) re-index))))
-      (cond
-        ((null? rs) z)
-        ((null? (cdr rs)) (car rs))
-        ((memq (build-neg z cache) rs) (build-neg z cache))
-        (else
-         (cache (cons 'or (map re-index rs))
-                (lambda ()
-                  (make-orR (ormap re-nullable? rs) (get-index) rs)))))))
-  
-  ;; build-and : (list-of re) cache -> re
-  (define (build-and rs cache)
-    (let ((rs (do-simple-equiv (replace rs andR? andR-res null) re-index)))
-      (cond
-        ((null? rs) (build-neg z cache))
-        ((null? (cdr rs)) (car rs))
-        ((memq z rs) z)
-        (else
-         (cache (cons 'and (map re-index rs))
-                (lambda ()
-                  (make-andR (andmap re-nullable? rs) (get-index) rs)))))))
-      
-  ;; build-neg : re cache -> re
-  (define (build-neg r cache)
-    (cond
-      ((negR? r) (negR-re r))
-      (else
-       (cache (cons 'neg (re-index r))
-              (lambda ()
-                (make-negR (not (re-nullable? r)) (get-index) r))))))
-  
-  ;; Tests for the build-functions
-  (test-block ((c (make-cache))
-               (isc is:integer-set-contents)
-               (r1 (build-char-set (is:make-range (char->integer #\1)) c))
-               (r2 (build-char-set (is:make-range (char->integer #\2)) c))
-               (r3 (build-char-set (is:make-range (char->integer #\3)) c))
-               (rc (build-concat r1 r2 c))
-               (rc2 (build-concat r2 r1 c))
-               (rr (build-repeat 0 +inf.0 rc c))
-               (ro (build-or `(,rr ,rc ,rr) c))
-               (ro2 (build-or `(,rc ,rr ,z) c))
-               (ro3 (build-or `(,rr ,rc) c))
-               (ro4 (build-or `(,(build-or `(,r1 ,r2) c)
-                                 ,(build-or `(,r2 ,r3) c)) c))
-               (ra (build-and `(,rr ,rc ,rr) c))
-               (ra2 (build-and `(,rc ,rr) c))
-               (ra3 (build-and `(,rr ,rc) c))
-               (ra4 (build-and `(,(build-and `(,r3 ,r2) c)
-                                  ,(build-and `(,r2 ,r1) c)) c))
-               (rn (build-neg z c))
-               (rn2 (build-neg r1 c)))
-               
-              ((isc (char-setR-chars r1)) (isc (is:make-range (char->integer #\1))))
-              ((isc (char-setR-chars r2)) (isc (is:make-range (char->integer #\2))))
-              ((isc (char-setR-chars r3)) (isc (is:make-range (char->integer #\3))))
-              ((build-char-set (is:make-range) c) z)
-              ((build-concat r1 e c) r1)
-              ((build-concat e r1 c) r1)
-              ((build-concat r1 z c) z)
-              ((build-concat z r1 c) z)
-              ((build-concat r1 r2 c) rc)
-              ((concatR-re1 rc) r1)
-              ((concatR-re2 rc) r2)
-              ((concatR-re1 rc2) r2)
-              ((concatR-re2 rc2) r1)
-              (ro ro2)
-              (ro ro3)
-              (ro4 (build-or `(,r1 ,r2 ,r3) c))
-              ((orR-res ro) (list rc rr))
-              ((orR-res ro4) (list r1 r2 r3))
-              ((build-or null c) z)
-              ((build-or `(,r1 ,z) c) r1)
-              ((build-repeat 0 +inf.0 rc c) rr)
-              ((build-repeat 0 1 z c) e)
-              ((build-repeat 0 0 rc c) e)
-              ((build-repeat 0 +inf.0 z c) e)
-              ((build-repeat -1 +inf.0 z c) e)
-              ((build-repeat 0 +inf.0 (build-repeat 0 +inf.0 rc c) c)
-               (build-repeat 0 +inf.0 rc c))
-              ((build-repeat 20 20 (build-repeat 0 +inf.0 rc c) c)
-               (build-repeat 0 +inf.0 rc c))
-              ((build-repeat 20 20 (build-repeat 1 +inf.0 rc c) c)
-               (build-repeat 20 +inf.0 rc c))
-              ((build-repeat 1 1 rc c) rc)
-              ((repeatR-re rr) rc)
-              (ra ra2)
-              (ra ra3)
-              (ra4 (build-and `(,r1 ,r2 ,r3) c))
-              ((andR-res ra) (list rc rr))
-              ((andR-res ra4) (list r1 r2 r3))
-              ((build-and null c) (build-neg z c))
-              ((build-and `(,r1 ,z) c) z)
-              ((build-and `(,r1) c) r1)
-              ((build-neg r1 c) (build-neg r1 c))
-              ((build-neg (build-neg r1 c) c) r1)
-              ((negR-re (build-neg r2 c)) r2)
-              ((re-nullable? r1) #f)
-              ((re-nullable? rc) #f)
-              ((re-nullable? (build-concat rr rr c)) #t)
-              ((re-nullable? rr) #t)
-              ((re-nullable? (build-repeat 0 1 rc c)) #t)
-              ((re-nullable? (build-repeat 1 2 rc c)) #f)
-              ((re-nullable? (build-repeat 1 2 (build-or (list e r1) c) c)) #t)
-              ((re-nullable? ro) #t)
-              ((re-nullable? (build-or `(,r1 ,r2) c)) #f)
-              ((re-nullable? (build-and `(,r1 ,e) c)) #f)
-              ((re-nullable? (build-and `(,rr ,e) c)) #t)
-              ((re-nullable? (build-neg r1 c)) #t)
-              ((re-nullable? (build-neg rr c)) #f))
-              
-  (test-block ((c (make-cache))
-               (isc is:integer-set-contents)
-               (r1 (->re #\1 c))
-               (r2 (->re #\2 c))
-               (r3-5 (->re '(char-range #\3 #\5) c))
-               (r4 (build-or `(,r1 ,r2) c))
-               (r5 (->re `(union ,r3-5 #\7) c))
-               (r6 (->re #\6 c)))
-              ((flatten-res null orR? orR-res is:union c) null)
-              ((isc (char-setR-chars (car (flatten-res `(,r1) orR? orR-res is:union c))))
-               (isc (is:make-range (char->integer #\1))))
-              ((isc (char-setR-chars (car (flatten-res `(,r4) orR? orR-res is:union c))))
-               (isc (is:make-range (char->integer #\1) (char->integer #\2))))
-              ((isc (char-setR-chars (car (flatten-res `(,r6 ,r5 ,r4 ,r3-5 ,r2 ,r1)
-                                                       orR? orR-res is:union c))))
-               (isc (is:make-range (char->integer #\1) (char->integer #\7))))
-              ((flatten-res `(,r1 ,r2) andR? andR-res (lambda (x y)
-                                                        (let-values (((i _ __)
-                                                                      (is:split x y)))
-                                                          i))
-                            c)
-               (list z)))
-  
-  ;; ->re
-  (test-block ((c (make-cache))
-               (isc is:integer-set-contents)
-               (r (->re #\a c))
-               (rr (->re `(concatenation ,r ,r) c))
-               (rrr (->re `(concatenation ,r ,rr) c))
-               (rrr* (->re `(repetition 0 +inf.0 ,rrr) c)))
-              ((isc (char-setR-chars r)) (isc (is:make-range (char->integer #\a))))
-              ((->re "" c) e)
-              ((->re "asdf" c) (->re `(concatenation #\a #\s #\d #\f) c))
-              ((->re r c) r)
-              ((->re `(repetition 0 +inf.0 ,r) c) (build-repeat 0 +inf.0 r c))
-              ((->re `(repetition 1 +inf.0 ,r) c) (build-repeat 1 +inf.0 r c))
-              ((->re `(repetition 0 1 ,r) c) (build-repeat 0 1 r c))
-              ((->re `(repetition 0 1 ,rrr*) c) rrr*)
-              ((->re `(union (union (char-range #\a #\c)
-                                    (char-complement (char-range #\000 #\110)
-                                                     (char-range #\112 ,(integer->char max-char-num))))
-                         (union (repetition 0 +inf.0 #\2))) c)
-               (build-or (list (build-char-set (is:union (is:make-range 73)
-                                                         (is:make-range 97 99))
-                                               c)
-                               (build-repeat 0 +inf.0 (build-char-set (is:make-range 50) c) c))
-                         c))
-              ((->re `(union ,rr ,rrr) c) (build-or (list rr rrr) c))
-              ((->re `(union ,r) c) r)
-              ((->re `(union) c) z)
-              ((->re `(intersection (intersection #\111 
-                                                  (char-complement (char-range #\000 #\110)
-                                                                   (char-range #\112 ,(integer->char max-char-num))))
-                         (intersection (repetition 0 +inf.0 #\2))) c)
-               (build-and (list (build-char-set (is:make-range 73) c)
-                                (build-repeat 0 +inf.0 (build-char-set (is:make-range 50) c) c))
-                          c))
-              ((->re `(intersection (intersection #\000 (char-complement (char-range #\000 #\110)
-                                                                         (char-range #\112 ,(integer->char max-char-num))))
-                                    (intersection (repetition 0 +inf.0 #\2))) c)
-               z)
-              ((->re `(intersection ,rr ,rrr) c) (build-and (list rr rrr) c))
-              ((->re `(intersection ,r) c) r)
-              ((->re `(intersection) c) (build-neg z c))
-              ((->re `(complement ,r) c) (build-neg r c))
-              ((->re `(concatenation) c) e)
-              ((->re `(concatenation ,rrr*) c) rrr*)
-              (rr (build-concat r r c))
-              ((->re `(concatenation ,r ,rr ,rrr) c)
-               (build-concat r (build-concat rr rrr c) c))
-              ((isc (char-setR-chars (->re `(char-range #\1 #\1) c))) (isc (is:make-range 49)))
-              ((isc (char-setR-chars (->re `(char-range #\1 #\9) c))) (isc (is:make-range 49 57)))
-              ((isc (char-setR-chars (->re `(char-range "1" "1") c))) (isc (is:make-range 49)))
-              ((isc (char-setR-chars (->re `(char-range "1" "9") c))) (isc (is:make-range 49 57)))
-              ((->re `(char-range "9" "1") c) z)
-              ((isc (char-setR-chars (->re `(char-complement) c)))
-               (isc (char-setR-chars (->re `(char-range #\000 ,(integer->char max-char-num)) c))))
-              ((isc (char-setR-chars (->re `(char-complement #\001 (char-range #\002 ,(integer->char max-char-num))) c)))
-               (isc (is:make-range 0)))
-              )
-  
-  )
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/stx.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/stx.rkt
deleted file mode 100644
index 1104a87ba0..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/stx.rkt
+++ /dev/null
@@ -1,220 +0,0 @@
-#lang racket
-
-(require "util.rkt"
-         syntax/id-table)
-
-(provide parse)
-  
-(define (bad-args stx num)
-  (raise-syntax-error
-   #f
-   (format "incorrect number of arguments (should have ~a)" num)
-   stx))
-
-;; char-range-arg: syntax-object syntax-object -> nat
-;; If c contains is a character or length 1 string, returns the integer
-;; for the character.  Otherwise raises a syntax error.
-(define (char-range-arg stx containing-stx)
-  (let ((c (syntax-e stx)))
-    (cond
-      ((char? c) (char->integer c))
-      ((and (string? c) (= (string-length c) 1))
-       (char->integer (string-ref c 0)))
-      (else
-       (raise-syntax-error
-        #f
-        "not a char or single-char string"
-        containing-stx stx)))))
-(module+ test
-  (check-equal? (char-range-arg #'#\1 #'here) (char->integer #\1))
-  (check-equal? (char-range-arg #'"1" #'here) (char->integer #\1)))
-
-(define orig-insp (variable-reference->module-declaration-inspector
-                   (#%variable-reference)))
-(define (disarm stx)
-  (syntax-disarm stx orig-insp))
-
-  ;; parse : syntax-object (box (list-of syntax-object)) -> s-re (see re.rkt)
-  ;; checks for errors and generates the plain s-exp form for s
-  ;; Expands lex-abbrevs and applies lex-trans.
-  (define (parse stx disappeared-uses)
-    (let loop ([stx stx]
-               [disappeared-uses disappeared-uses]
-               ;; seen-lex-abbrevs: id-table
-               [seen-lex-abbrevs (make-immutable-free-id-table)])
-      (let ([recur (lambda (s)
-                     (loop (syntax-rearm s stx)
-                           disappeared-uses
-                           seen-lex-abbrevs))]
-            [recur/abbrev (lambda (s id)
-                            (loop (syntax-rearm s stx)
-                                  disappeared-uses
-                                  (free-id-table-set seen-lex-abbrevs id id)))])
-        (syntax-case (disarm stx) (repetition union intersection complement concatenation
-                                              char-range char-complement)
-          (_
-           (identifier? stx)
-           (let ((expansion (syntax-local-value stx (lambda () #f))))
-             (unless (lex-abbrev? expansion)
-               (raise-syntax-error 'regular-expression
-                                   "undefined abbreviation"
-                                   stx))
-             ;; Check for cycles.
-             (when (free-id-table-ref seen-lex-abbrevs stx (lambda () #f))
-               (raise-syntax-error 'regular-expression
-                                   "illegal lex-abbrev cycle detected"
-                                   stx
-                                   #f
-                                   (list (free-id-table-ref seen-lex-abbrevs stx))))
-             (set-box! disappeared-uses (cons stx (unbox disappeared-uses)))
-             (recur/abbrev ((lex-abbrev-get-abbrev expansion)) stx)))
-          (_
-           (or (char? (syntax-e stx)) (string? (syntax-e stx)))
-           (syntax-e stx))
-          ((repetition arg ...)
-           (let ((arg-list (syntax->list (syntax (arg ...)))))
-             (unless (= 3 (length arg-list))
-               (bad-args stx 2))
-             (let ((low (syntax-e (car arg-list)))
-                   (high (syntax-e (cadr arg-list)))
-                   (re (caddr arg-list)))
-               (unless (and (number? low) (exact? low) (integer? low) (>= low 0))
-                 (raise-syntax-error #f
-                                     "not a non-negative exact integer"
-                                     stx
-                                     (car arg-list)))
-               (unless (or (and (number? high) (exact? high) (integer? high) (>= high 0))
-                           (eq? high +inf.0))
-                 (raise-syntax-error #f
-                                     "not a non-negative exact integer or +inf.0"
-                                     stx
-                                     (cadr arg-list)))
-               (unless (<= low high)
-                 (raise-syntax-error
-                  #f
-                  "the first argument is not less than or equal to the second argument"
-                  stx))
-               `(repetition ,low ,high ,(recur re)))))
-          ((union re ...)
-           `(union ,@(map recur (syntax->list (syntax (re ...))))))
-          ((intersection re ...)
-           `(intersection ,@(map recur (syntax->list (syntax (re ...))))))
-          ((complement re ...)
-           (let ((re-list (syntax->list (syntax (re ...)))))
-             (unless (= 1 (length re-list))
-               (bad-args stx 1))
-             `(complement ,(recur (car re-list)))))
-          ((concatenation re ...)
-           `(concatenation ,@(map recur (syntax->list (syntax (re ...))))))
-          ((char-range arg ...)
-           (let ((arg-list (syntax->list (syntax (arg ...)))))
-             (unless (= 2 (length arg-list))
-               (bad-args stx 2))
-             (let ((i1 (char-range-arg (car arg-list) stx))
-                   (i2 (char-range-arg (cadr arg-list) stx)))
-               (if (<= i1 i2)
-                   `(char-range ,(integer->char i1) ,(integer->char i2))
-                   (raise-syntax-error
-                    #f
-                    "the first argument does not precede or equal second argument" 
-                    stx)))))
-          ((char-complement arg ...)
-           (let ((arg-list (syntax->list (syntax (arg ...)))))
-             (unless (= 1 (length arg-list))
-               (bad-args stx 1))
-             (let ((parsed (recur (car arg-list))))
-               (unless (char-set? parsed)
-                 (raise-syntax-error #f
-                                     "not a character set"
-                                     stx
-                                     (car arg-list)))
-               `(char-complement ,parsed))))
-          ((op form ...)
-           (identifier? (syntax op))
-           (let* ((o (syntax op))
-                  (expansion (syntax-local-value o (lambda () #f))))
-             (set-box! disappeared-uses (cons o (unbox disappeared-uses)))
-             (cond
-               ((lex-trans? expansion)
-                (recur ((lex-trans-f expansion) (disarm stx))))
-               (expansion
-                (raise-syntax-error 'regular-expression
-                                    "not a lex-trans"
-                                    stx))
-               (else
-                (raise-syntax-error 'regular-expression
-                                    "undefined operator"
-                                    stx)))))
-          (_ 
-           (raise-syntax-error
-            'regular-expression
-            "not a char, string, identifier, or (op args ...)"
-            stx))))))
-       
-
-  
-  ;; char-set? : s-re -> bool
-  ;; A char-set is an re that matches only strings of length 1.
-  ;; char-set? is conservative.
-  (define (char-set? s-re)
-    (cond
-      ((char? s-re) #t)
-      ((string? s-re) (= (string-length s-re) 1))
-      ((list? s-re) 
-       (let ((op (car s-re)))
-         (case op
-           ((union intersection) (andmap char-set? (cdr s-re)))
-           ((char-range char-complement) #t)
-           ((repetition)
-            (and (= (cadr s-re) (caddr s-re)) (char-set? (cadddr s-re))))
-           ((concatenation)
-            (and (= 2 (length s-re)) (char-set? (cadr s-re))))
-           (else #f))))
-      (else #f)))
-  
-  (module+ test
-    (require rackunit))
-  (module+ test
-    (check-equal? (char-set? #\a) #t)
-    (check-equal? (char-set? "12") #f)
-    (check-equal? (char-set? "1") #t)
-    (check-equal? (char-set? '(repetition 1 2 #\1)) #f)
-    (check-equal? (char-set? '(repetition 1 1 "12")) #f)
-    (check-equal? (char-set? '(repetition 1 1 "1")) #t)
-    (check-equal? (char-set? '(union "1" "2" "3")) #t)
-    (check-equal? (char-set? '(union "1" "" "3")) #f)
-    (check-equal? (char-set? '(intersection "1" "2" (union "3" "4"))) #t)
-    (check-equal? (char-set? '(intersection "1" "")) #f)
-    (check-equal? (char-set? '(complement "1")) #f)
-    (check-equal? (char-set? '(concatenation "1" "2")) #f)
-    (check-equal? (char-set? '(concatenation "" "2")) #f)
-    (check-equal? (char-set? '(concatenation "1")) #t)
-    (check-equal? (char-set? '(concatenation "12")) #f)
-    (check-equal? (char-set? '(char-range #\1 #\2)) #t)
-    (check-equal? (char-set? '(char-complement #\1)) #t))
-
-  ;; yikes... these test cases all have the wrong arity, now.
-  ;; and by "now", I mean it's been broken since before we 
-  ;; moved to git. 
-  (module+ test
-    (check-equal? (parse #'#\a null) #\a)
-    (check-equal? (parse #'"1" null) "1")
-    (check-equal? (parse #'(repetition 1 1 #\1) null)
-     '(repetition 1 1 #\1))
-    (check-equal? (parse #'(repetition 0 +inf.0 #\1) null) '(repetition 0 +inf.0 #\1))
-    (check-equal? (parse #'(union #\1 (union "2") (union)) null)
-     '(union #\1 (union "2") (union)))
-    (check-equal? (parse #'(intersection #\1 (intersection "2") (intersection))
-            null)
-     '(intersection #\1 (intersection "2") (intersection)))
-    (check-equal? (parse #'(complement (union #\1 #\2))
-            null)
-     '(complement (union #\1 #\2)))
-    (check-equal? (parse #'(concatenation "1" "2" (concatenation)) null)
-     '(concatenation "1" "2" (concatenation)))
-    (check-equal? (parse #'(char-range "1" #\1) null) '(char-range #\1 #\1))
-    (check-equal? (parse #'(char-range #\1 "1") null) '(char-range #\1 #\1))
-    (check-equal? (parse #'(char-range "1" "3") null) '(char-range #\1 #\3))
-    (check-equal? (parse #'(char-complement (union "1" "2")) null)
-                  '(char-complement (union "1" "2"))))
-;  )
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/token-syntax.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/token-syntax.rkt
deleted file mode 100644
index c1f14927f7..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/token-syntax.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-(module token-syntax mzscheme
-
-  ;; The things needed at compile time to handle definition of tokens
-  
-  (provide make-terminals-def terminals-def-t terminals-def?
-           make-e-terminals-def e-terminals-def-t e-terminals-def?)
-  (define-struct terminals-def (t))
-  (define-struct e-terminals-def (t))
-  )
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/token.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/token.rkt
deleted file mode 100644
index 6618a57e81..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/token.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-(module token mzscheme
-
-  (require-for-syntax "token-syntax.rkt")
-  
-  ;; Defining tokens
-  
-  (provide define-tokens define-empty-tokens make-token token?
-           (protect (rename token-name real-token-name))
-           (protect (rename token-value real-token-value))
-           (rename token-name* token-name)
-           (rename token-value* token-value)
-           (struct position (offset line col))
-           (struct position-token (token start-pos end-pos)))
-
-  
-  ;; A token is either
-  ;; - symbol
-  ;; - (make-token symbol any)
-  (define-struct token (name value) (make-inspector))
-
-  ;; token-name*: token -> symbol
-  (define (token-name* t)
-    (cond
-      ((symbol? t) t)
-      ((token? t) (token-name t))
-      (else (raise-type-error 
-             'token-name 
-             "symbol or struct:token"
-             0
-             t))))
-  
-  ;; token-value*: token -> any
-  (define (token-value* t)
-    (cond
-      ((symbol? t) #f)
-      ((token? t) (token-value t))
-      (else (raise-type-error 
-             'token-value
-             "symbol or struct:token"
-             0
-             t))))
-  
-  (define-for-syntax (make-ctor-name n)
-    (datum->syntax-object n
-                          (string->symbol  (format "token-~a" (syntax-e n)))
-                          n
-                          n))
-  
-  (define-for-syntax (make-define-tokens empty?)
-    (lambda (stx)
-      (syntax-case stx ()
-        ((_ name (token ...))
-         (andmap identifier? (syntax->list (syntax (token ...))))
-         (with-syntax (((marked-token ...)
-                        (map values #;(make-syntax-introducer)
-                             (syntax->list (syntax (token ...))))))
-           (quasisyntax/loc stx
-             (begin
-               (define-syntax name
-                 #,(if empty?
-                       #'(make-e-terminals-def (quote-syntax (marked-token ...)))
-                       #'(make-terminals-def (quote-syntax (marked-token ...)))))
-               #,@(map
-                   (lambda (n)
-                     (when (eq? (syntax-e n) 'error)
-                       (raise-syntax-error
-                        #f
-                        "Cannot define a token named error."
-                        stx))
-                     (if empty?
-                         #`(define (#,(make-ctor-name n))
-                             '#,n)
-                         #`(define (#,(make-ctor-name n) x)
-                             (make-token '#,n x))))
-                   (syntax->list (syntax (token ...))))
-               #;(define marked-token #f) #;...))))
-        ((_ ...)
-         (raise-syntax-error 
-          #f
-          "must have the form (define-tokens name (identifier ...)) or (define-empty-tokens name (identifier ...))"
-          stx)))))
-  
-  (define-syntax define-tokens (make-define-tokens #f))
-  (define-syntax define-empty-tokens (make-define-tokens #t))
-
-  (define-struct position (offset line col) #f)
-  (define-struct position-token (token start-pos end-pos) #f)
-  )
-
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/unicode-chars.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/unicode-chars.rkt
deleted file mode 100644
index c21e88cfab..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/unicode-chars.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang racket
-
-(require "util.rkt")
-
-(provide (all-defined-out))
-
-;; mapped-chars : (listof (list nat nat bool))
-(define mapped-chars (make-known-char-range-list))
-
-;; get-chars-for-x : (nat -> bool) (listof (list nat nat bool)) -> (listof (cons nat nat))
-(define (get-chars-for char-x? mapped-chars)
-  (cond
-    ((null? mapped-chars) null)
-    (else
-     (let* ((range (car mapped-chars))
-            (low (car range))
-            (high (cadr range))
-            (x (char-x? low)))
-       (cond
-         ((caddr range)
-          (if x
-              (cons (cons low high)
-                    (get-chars-for char-x? (cdr mapped-chars)))
-              (get-chars-for char-x? (cdr mapped-chars))))
-         (else
-          (let loop ((range-start low)
-                     (i (car range))
-                     (parity x))
-            (cond
-              ((> i high)
-               (if parity
-                   (cons (cons range-start high) (get-chars-for char-x? (cdr mapped-chars)))
-                   (get-chars-for char-x? (cdr mapped-chars))))
-              ((eq? parity (char-x? i))
-               (loop range-start (add1 i) parity))
-              (parity
-               (cons (cons range-start (sub1 i)) (loop i (add1 i) #f)))
-              (else
-               (loop i (add1 i) #t))))))))))
-
-(define (compute-ranges x?)
-  (delay (get-chars-for (lambda (x) (x? (integer->char x))) mapped-chars)))
-
-(define alphabetic-ranges   (compute-ranges char-alphabetic?))  ;; 325
-(define lower-case-ranges   (compute-ranges char-lower-case?))  ;; 405
-(define upper-case-ranges   (compute-ranges char-upper-case?))  ;; 380
-(define title-case-ranges   (compute-ranges char-title-case?))  ;; 10
-(define numeric-ranges      (compute-ranges char-numeric?))     ;; 47
-(define symbolic-ranges     (compute-ranges char-symbolic?))    ;; 153
-(define punctuation-ranges  (compute-ranges char-punctuation?)) ;; 86
-(define graphic-ranges      (compute-ranges char-graphic?))     ;; 401
-(define whitespace-ranges   (compute-ranges char-whitespace?))  ;; 10
-(define blank-ranges        (compute-ranges char-blank?))       ;; 9
-#;(define hexadecimal-ranges  (compute-ranges char-hexadecimal?))
-(define iso-control-ranges  (compute-ranges char-iso-control?)) ;; 2
-
-
-
-(module+ test
-  (require rackunit)
-  (check-equal? (get-chars-for odd? '()) '())
-  (check-equal? (get-chars-for odd? '((1 4 #f) (8 13 #f)))
-                '((1 . 1) (3 . 3) (9 . 9) (11 . 11) (13 . 13)))
-  (check-equal? (get-chars-for (lambda (x)
-                                 (odd? (quotient x 10)))
-                               '((1 5 #t) (17 19 #t) (21 51 #f)))
-                '((17 . 19) (30 . 39) (50 . 51))))
-  
-
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/util.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/util.rkt
deleted file mode 100644
index a7afc54f7e..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/util.rkt
+++ /dev/null
@@ -1,127 +0,0 @@
-#lang racket
-
-(provide (all-defined-out))
-
-(define max-char-num #x10FFFF)
-
-(define-struct lex-abbrev (get-abbrev))
-(define-struct lex-trans (f))
-
-(module+ test 
-  (require rackunit))
-
-#;(define-syntax test-block
-    (syntax-rules ()
-      ((_ defs (code right-ans) ...)
-       (let* defs
-         (let ((real-ans code))
-           (unless (equal? real-ans right-ans)
-             (printf "Test failed: ~e gave ~e.  Expected ~e\n"
-                     'code real-ans 'right-ans))) ...))))
-
-(define-syntax test-block
-  (syntax-rules ()
-    ((_ x ...) (void))))
-
-
-;; A cache is (X ( -> Y) -> Y)
-;; make-cache : -> cache
-;; table map Xs to Ys.  If key is mapped, its value is returned.
-;; Otherwise, build is invoked and its result is placed in the table and
-;; returned.
-;; Xs are compared with equal?
-(define (make-cache)
-  (let ((table (make-hash)))
-    (lambda (key build)
-      (hash-ref table key
-                (lambda ()
-                  (let ((new (build)))
-                    (hash-set! table key new)
-                    new))))))
-
-(module+ test
-  (define cache (make-cache))
-  (check-equal? (cache '(s 1 2) (lambda () 9)) 9)
-  (check-equal? (cache '(s 2 1) (lambda () 8)) 8)
-  (check-equal? (cache '(s 1 2) (lambda () 1)) 9)
-  (check-equal? (cache (cons 's (cons 0 (cons +inf.0 10)))
-                       (lambda () 22)) 22)
-  (check-equal? (cache (cons 's (cons 0 (cons +inf.0 10)))
-                       (lambda () 1)) 22))
-
-
-
-;; make-counter : -> -> nat
-;; makes a function that returns a higher number by 1, each time
-;; it is called.
-(define (make-counter)
-  (let ((counter 0))
-    (lambda ()
-      (begin0
-        counter
-        (set! counter (add1 counter))))))
-
-(module+ test 
-  (define c (make-counter))
-  (define d (make-counter))
-  (check-equal? (c) 0)
-  (check-equal? (d) 0)
-  (check-equal? (c) 1)
-  (check-equal? (d) 1)
-  (check-equal? (c) 2))
-
-
-;; remove-dups : (list-of X) (X -> number) -> (list-of X)
-;; removes the entries from l that have the same index as a
-;; previous entry.  l must be grouped by indexes.
-(define (remove-dups l index acc)
-  (cond
-    ((null? l) (reverse acc))
-    ((null? acc) (remove-dups (cdr l) index (cons (car l) acc)))
-    ((= (index (car acc)) (index (car l)))
-     (remove-dups (cdr l) index acc))
-    (else 
-     (remove-dups (cdr l) index (cons (car l) acc)))))
-
-
-(module+ test
-  (check-equal? (remove-dups '((1 2) (2 2) (1 3) (1 4)
-                                     (100 4) (0 5)) cadr null)
-   '((1 2) (1 3) (1 4) (0 5)))
-  (check-equal? (remove-dups null error null) null))
-
-;; do-simple-equiv : (list-of X) (X -> nat) -> (list-of X)
-;; Sorts l according to index and removes the entries with duplicate
-;; indexes.
-(define (do-simple-equiv l index)
-  (let ((ordered (sort l (lambda (a b) (< (index a) (index b))))))
-    (remove-dups ordered index null)))
-
-(module+ test
- (check-equal? (do-simple-equiv '((2 2) (1 4) (1 2)
-                                        (100 4) (1 3)  (0 5)) 
-                                cadr)
-  '((2 2) (1 3) (1 4) (0 5)))
- (check-equal? (do-simple-equiv null error) null))
-
-;; replace : (list-of X) (X -> bool) (X -> (list-of X)) (list-of X) ->
-;;           (list-of X)
-;; If (pred? r) for some r in l, splice (get r) in place of r in the resulting
-;; list.
-(define (replace l pred? get acc)
-  (cond
-    ((null? l) acc)
-    ((pred? (car l)) (replace (cdr l) pred? get (append (get (car l)) acc)))
-    (else (replace (cdr l) pred? get (cons (car l) acc)))))       
-
-
-(module+ test
-  (check-equal? (replace null void (lambda () (list 1)) null) null)
-  (check-equal? (replace '(1 2 3 4 3 5)
-                         (lambda (x) (= x 3))
-                         (lambda (x) (list 1 2 3))
-                         null)
-                '(5 1 2 3 4 1 2 3 2 1)))
-  
-  
-    
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/grammar.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/grammar.rkt
deleted file mode 100644
index 5b27699093..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/grammar.rkt
+++ /dev/null
@@ -1,280 +0,0 @@
-;; Constructs to create and access grammars, the internal
-;; representation of the input to the parser generator.
-
-(module grammar mzscheme
-  
-  (require mzlib/class
-           mzlib/list
-           "yacc-helper.rkt"
-           mzlib/contract)
-  
-  ;; Each production has a unique index 0 <= index <= number of productions
-  (define-struct prod (lhs rhs index prec action) (make-inspector))
-
-  ;; The dot-pos field is the index of the element in the rhs
-  ;; of prod that the dot immediately precedes.
-  ;; Thus 0 <= dot-pos <= (vector-length rhs).
-  (define-struct item (prod dot-pos) (make-inspector))
-  
-  ;; gram-sym = (union term? non-term?)
-  ;; Each term has a unique index 0 <= index < number of terms
-  ;; Each non-term has a unique index 0 <= index < number of non-terms  
-  (define-struct term (sym index prec) (make-inspector))
-  (define-struct non-term (sym index) (make-inspector))
-
-  ;; a precedence declaration.
-  (define-struct prec (num assoc) (make-inspector))
-  
-  (provide/contract
-   (make-item (prod? (union false/c natural-number/c) . -> . item?))
-   (make-term (symbol? (union false/c natural-number/c) (union prec? false/c) . -> . term?))
-   (make-non-term (symbol? (union false/c natural-number/c) . -> . non-term?))
-   (make-prec (natural-number/c (symbols 'left 'right 'nonassoc) . -> . prec?))
-   (make-prod (non-term? (vectorof (union non-term? term?))
-               (union false/c natural-number/c) (union false/c prec?) syntax? . -> . prod?)))
-  
-  (provide 
-     
-   
-   ;; Things that work on items
-   start-item? item-prod item->string 
-   sym-at-dot move-dot-right item<? item-dot-pos
-   
-   ;; Things that operate on grammar symbols
-   gram-sym-symbol gram-sym-index term-prec gram-sym->string
-   non-term? term? non-term<? term<?
-   term-list->bit-vector term-index non-term-index
-   
-   ;; Things that work on precs
-   prec-num prec-assoc
-
-   grammar%
-   
-   ;; Things that work on productions
-   prod-index prod-prec prod-rhs prod-lhs prod-action)
-
-
-  ;;---------------------- LR items --------------------------
-  
-  ;; item<?: LR-item * LR-item -> bool
-  ;; Lexicographic comparison on two items.
-  (define (item<? i1 i2)
-    (let ((p1 (prod-index (item-prod i1)))
-	  (p2 (prod-index (item-prod i2))))
-      (or (< p1 p2)
-	  (and (= p1 p2)
-	       (let ((d1 (item-dot-pos i1))
-		     (d2 (item-dot-pos i2)))
-		 (< d1 d2))))))
-
-  ;; start-item?: LR-item -> bool
-  ;; The start production always has index 0
-  (define (start-item? i)
-    (= 0 (non-term-index (prod-lhs (item-prod i)))))
-
-  
-  ;; move-dot-right: LR-item -> LR-item | #f
-  ;; moves the dot to the right in the item, unless it is at its 
-  ;; rightmost, then it returns false
-  (define (move-dot-right i)
-    (cond
-     ((= (item-dot-pos i) (vector-length (prod-rhs (item-prod i)))) #f)
-     (else (make-item (item-prod i)
-		      (add1 (item-dot-pos i))))))
-
-  ;; sym-at-dot: LR-item -> gram-sym | #f
-  ;; returns the symbol after the dot in the item or #f if there is none  
-  (define (sym-at-dot i)
-    (let ((dp (item-dot-pos i))
-          (rhs (prod-rhs (item-prod i))))
-      (cond
-       ((= dp (vector-length rhs)) #f)
-       (else (vector-ref rhs dp)))))
-  
- 
-  ;; print-item: LR-item ->
-  (define (item->string it)
-    (let ((print-sym (lambda (i)
-		       (let ((gs (vector-ref (prod-rhs (item-prod it)) i)))
-			 (cond
-			  ((term? gs) (format "~a " (term-sym gs)))
-			  (else (format "~a " (non-term-sym gs))))))))
-      (string-append
-       (format "~a -> " (non-term-sym (prod-lhs (item-prod it))))
-       (let loop ((i 0))
-	 (cond
-	  ((= i (vector-length (prod-rhs (item-prod it)))) 
-	   (if (= i (item-dot-pos it))
-	       ". "
-	       ""))
-	  ((= i (item-dot-pos it)) 
-	   (string-append ". " (print-sym i) (loop (add1 i))))
-	  (else (string-append (print-sym i) (loop (add1 i)))))))))
-
-  ;; --------------------- Grammar Symbols --------------------------
-
-  (define (non-term<? nt1 nt2)
-    (< (non-term-index nt1) (non-term-index nt2)))
-  
-  (define (term<? nt1 nt2)
-    (< (term-index nt1) (term-index nt2)))
-
-  (define (gram-sym-index gs)
-    (cond
-     ((term? gs) (term-index gs))
-     (else (non-term-index gs))))
-
-  (define (gram-sym-symbol gs)
-    (cond
-     ((term? gs) (term-sym gs))
-     (else (non-term-sym gs))))
-
-  (define (gram-sym->string gs)
-    (symbol->string (gram-sym-symbol gs)))
-
-  ;; term-list->bit-vector: term list -> int
-  ;; Creates a number where the nth bit is 1 if the term with index n is in 
-  ;; the list, and whose nth bit is 0 otherwise
-  (define (term-list->bit-vector terms)
-    (cond
-      ((null? terms) 0)
-      (else 
-       (bitwise-ior (arithmetic-shift 1 (term-index (car terms))) (term-list->bit-vector (cdr terms))))))
-  
-
-  ;; ------------------------- Grammar ------------------------------
-
-  (define grammar%
-    (class object%
-      (super-instantiate ())
-      ;; prods: production list list
-      ;; where there is one production list per non-term
-      (init prods)
-      ;; init-prods: production list
-      ;; The productions parsing can start from
-      ;; nullable-non-terms is indexed by the non-term-index and is true iff non-term is nullable
-      (init-field init-prods terms non-terms end-terms)
-  
-      ;; list of all productions
-      (define all-prods (apply append prods))
-      (define num-prods (length all-prods))
-      (define num-terms (length terms))
-      (define num-non-terms (length non-terms))
-      
-      (let ((count 0))
-        (for-each
-         (lambda (nt)
-           (set-non-term-index! nt count)
-           (set! count (add1 count)))
-         non-terms))
-      
-      (let ((count 0))
-        (for-each
-         (lambda (t)
-           (set-term-index! t count)
-           (set! count (add1 count)))
-         terms))
-
-      (let ((count 0))
-        (for-each
-         (lambda (prod)
-           (set-prod-index! prod count)
-           (set! count (add1 count)))
-         all-prods))
-      
-      ;; indexed by the index of the non-term - contains the list of productions for that non-term
-      (define nt->prods
-        (let ((v (make-vector (length prods) #f)))
-          (for-each (lambda (prods)
-                      (vector-set! v (non-term-index (prod-lhs (car prods))) prods))
-                    prods)
-          v))
-      
-      (define nullable-non-terms
-        (nullable all-prods num-non-terms))
-            
-      (define/public (get-num-terms) num-terms)
-      (define/public (get-num-non-terms) num-non-terms)
-      
-      (define/public (get-prods-for-non-term nt)
-        (vector-ref nt->prods (non-term-index nt)))
-      (define/public (get-prods) all-prods)
-      (define/public (get-init-prods) init-prods)
-      
-      (define/public (get-terms) terms)
-      (define/public (get-non-terms) non-terms)
-      
-      (define/public (get-num-prods) num-prods)
-      (define/public (get-end-terms) end-terms)
-      
-      (define/public (nullable-non-term? nt)
-        (vector-ref nullable-non-terms (non-term-index nt)))
-
-      (define/public (nullable-after-dot? item)
-        (let* ((rhs (prod-rhs (item-prod item)))
-               (prod-length (vector-length rhs)))
-          (let loop ((i (item-dot-pos item)))
-            (cond
-              ((< i prod-length)
-               (if (and (non-term? (vector-ref rhs i)) (nullable-non-term? (vector-ref rhs i)))
-                   (loop (add1 i))
-                   #f))
-              ((= i prod-length) #t)))))
-      
-      (define/public (nullable-non-term-thunk)
-        (lambda (nt)
-          (nullable-non-term? nt)))
-      (define/public (nullable-after-dot?-thunk)
-        (lambda (item)
-          (nullable-after-dot? item)))))
-  
-  
-  ;; nullable: production list * int -> non-term set
-  ;; determines which non-terminals can derive epsilon
-  (define (nullable prods num-nts)
-    (letrec ((nullable (make-vector num-nts #f))
-	     (added #f)
-	     
-	     ;; possible-nullable: producion list -> production list
-	     ;; Removes all productions that have a terminal
-	     (possible-nullable
-	      (lambda (prods)
-		(filter (lambda (prod)
-			  (vector-andmap non-term? (prod-rhs prod)))
-			prods)))
-	     
-	     ;; set-nullables: production list -> production list
-	     ;; makes one pass through the productions, adding the ones
-	     ;; known to be nullable now to nullable and returning a list
-	     ;; of productions that we don't know about yet. 
-	     (set-nullables
-	      (lambda (prods)
-		(cond
-                  ((null? prods) null)
-                  ((vector-ref  nullable 
-                                (gram-sym-index (prod-lhs (car prods))))
-                   (set-nullables (cdr prods)))
-                  ((vector-andmap (lambda (nt) 
-                                    (vector-ref nullable (gram-sym-index nt)))
-                                  (prod-rhs (car prods)))
-                   (vector-set! nullable 
-                                (gram-sym-index (prod-lhs (car prods)))
-                                #t)
-                   (set! added #t)
-                   (set-nullables (cdr prods)))
-                  (else
-                   (cons (car prods) 
-                         (set-nullables (cdr prods))))))))
-      
-      (let loop ((P (possible-nullable prods)))
-	(cond
-          ((null? P) nullable)
-          (else
-           (set! added #f)
-           (let ((new-P (set-nullables P)))
-             (if added
-                 (loop new-P)
-                 nullable)))))))
-
-  
-)
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/graph.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/graph.rkt
deleted file mode 100644
index 958acc10ad..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/graph.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-(module graph mzscheme
-
-  (provide digraph)
-
-  (define (zero-thunk) 0)
-  
-  ;; digraph: 
-  ;;   ('a list) * ('a -> 'a list) * ('a -> 'b) * ('b * 'b -> 'b) * (-> 'b)
-  ;;     -> ('a -> 'b)
-  ;; DeRemer and Pennello 1982
-  ;; Computes (f x) = (f- x) union Union{(f y) | y in (edges x)}
-  ;; We use a hash-table to represent the result function 'a -> 'b set, so
-  ;; the values of type 'a must be comparable with eq?.
-  (define (digraph nodes edges f- union fail)
-    (letrec [
-             ;; Will map elements of 'a to 'b sets
-             (results (make-hash-table))
-             (f (lambda (x) (hash-table-get results x fail)))
-             
-             ;; Maps elements of 'a to integers.
-             (N (make-hash-table))
-             (get-N (lambda (x) (hash-table-get N x zero-thunk)))
-             (set-N (lambda (x d) (hash-table-put! N x d)))
-             
-             (stack null)
-             (push (lambda (x)
-                     (set! stack (cons x stack))))
-             (pop (lambda () 
-                    (begin0 
-                     (car stack)
-                     (set! stack (cdr stack)))))
-             (depth (lambda () (length stack)))
-
-             ;; traverse: 'a -> 
-             (traverse
-              (lambda (x)
-                (push x)
-                (let ((d (depth)))
-                  (set-N x d)
-                  (hash-table-put! results x (f- x))
-                  (for-each (lambda (y)
-                              (if (= 0 (get-N y))
-                                  (traverse y))
-                              (hash-table-put! results
-                                               x
-                                               (union (f x) (f y)))
-                              (set-N x (min (get-N x) (get-N y))))
-                            (edges x))
-                  (if (= d (get-N x))
-                      (let loop ((p (pop)))
-                        (set-N p +inf.0)
-                        (hash-table-put! results p (f x))
-                        (if (not (eq? x p))
-                            (loop (pop))))))))]
-      (for-each (lambda (x)
-                  (if (= 0 (get-N x))
-                      (traverse x)))
-                nodes)
-      f))
-
-)
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/input-file-parser.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/input-file-parser.rkt
deleted file mode 100644
index ea5446aba4..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/input-file-parser.rkt
+++ /dev/null
@@ -1,374 +0,0 @@
-(module input-file-parser mzscheme
-
-  ;; routines for parsing the input to the parser generator and producing a
-  ;; grammar (See grammar.rkt)
-  
-  (require "yacc-helper.rkt"
-           "../private-lex/token-syntax.rkt"
-           "grammar.rkt"
-           mzlib/class
-           mzlib/contract)
-  (require-for-template mzscheme)
-  
-
-  (provide/contract 
-   (parse-input ((listof identifier?) (listof identifier?) (listof identifier?)
-                 (union false/c syntax?) syntax? any/c . -> . (is-a?/c grammar%)))
-   (get-term-list ((listof identifier?) . -> . (listof identifier?))))
-
-  (define stx-for-original-property (read-syntax #f (open-input-string "original")))
-
-  ;; get-args: ??? -> (values (listof syntax) (or/c #f (cons integer? stx)))
-  (define (get-args i rhs src-pos term-defs)
-    (let ((empty-table (make-hash-table))
-          (biggest-pos #f))
-      (hash-table-put! empty-table 'error #t)
-      (for-each (lambda (td)
-                  (let ((v (syntax-local-value td)))
-                    (if (e-terminals-def? v)
-                        (for-each (lambda (s)
-                                    (hash-table-put! empty-table (syntax-object->datum s) #t))
-                                  (syntax->list (e-terminals-def-t v))))))
-                term-defs)
-      (let ([args
-             (let get-args ((i i) 
-                            (rhs rhs))
-               (cond
-                 ((null? rhs) null)
-                 (else
-                  (let ((b (car rhs))
-                        (name (if (hash-table-get empty-table (syntax-object->datum (car rhs)) (lambda () #f))
-                                  (gensym)
-                                  (string->symbol (format "$~a" i)))))
-                    (cond
-                      (src-pos
-                       (let ([start-pos-id
-                              (datum->syntax-object b (string->symbol (format "$~a-start-pos" i)) b stx-for-original-property)]
-                             [end-pos-id
-                              (datum->syntax-object b (string->symbol (format "$~a-end-pos" i)) b stx-for-original-property)])
-                         (set! biggest-pos (cons start-pos-id end-pos-id))
-                         `(,(datum->syntax-object b name b stx-for-original-property)
-                           ,start-pos-id
-                           ,end-pos-id
-                           ,@(get-args (add1 i) (cdr rhs)))))
-                      (else
-                       `(,(datum->syntax-object b name b stx-for-original-property)
-                         ,@(get-args (add1 i) (cdr rhs)))))))))])
-        (values args biggest-pos))))
-    
-  ;; Given the list of terminal symbols and the precedence/associativity definitions,
-  ;; builds terminal structures (See grammar.rkt)
-  ;; build-terms: symbol list * symbol list list -> term list
-  (define (build-terms term-list precs)
-    (let ((counter 0)
-
-	  ;;(term-list (cons (gensym) term-list))
-          
-          ;; Will map a terminal symbol to its precedence/associativity
-          (prec-table (make-hash-table)))
-      
-      ;; Fill the prec table
-      (for-each
-       (lambda (p-decl)
-	 (begin0
-	  (let ((assoc (car p-decl)))
-	    (for-each
-	     (lambda (term-sym)
-	       (hash-table-put! prec-table term-sym (make-prec counter assoc)))
-	     (cdr p-decl)))
-	  (set! counter (add1 counter))))
-       precs)
-      
-      ;; Build the terminal structures
-      (map 
-       (lambda (term-sym)
-         (make-term term-sym 
-                    #f
-                    (hash-table-get prec-table term-sym (lambda () #f))))
-       term-list)))
-  
-  ;; Retrieves the terminal symbols from a terminals-def (See terminal-syntax.rkt)
-  ;; get-terms-from-def: identifier? -> (listof identifier?)
-  (define (get-terms-from-def term-syn)
-    (let ((t (syntax-local-value term-syn (lambda () #f))))
-      (cond
-       ((terminals-def? t) (syntax->list (terminals-def-t t)))
-       ((e-terminals-def? t) (syntax->list (e-terminals-def-t t)))
-       (else
-	(raise-syntax-error 
-         'parser-tokens
-         "undefined token group"
-         term-syn)))))
-
-  (define (get-term-list term-group-names)
-    (remove-duplicates
-     (cons (datum->syntax-object #f 'error)
-           (apply append
-                  (map get-terms-from-def term-group-names)))))
-  
-  (define (parse-input term-defs start ends prec-decls prods src-pos)
-    (let* ((start-syms (map syntax-e start))
-           
-           (list-of-terms (map syntax-e (get-term-list term-defs)))
-
-           (end-terms
-            (map
-             (lambda (end)
-               (unless (memq (syntax-e end) list-of-terms)
-                 (raise-syntax-error
-                  'parser-end-tokens
-                  (format "End token ~a not defined as a token"
-                          (syntax-e end))
-                  end))
-               (syntax-e end))
-             ends))
-           
-           ;; Get the list of terminals out of input-terms
-           
-           (list-of-non-terms
-            (syntax-case prods ()
-              (((non-term production ...) ...)
-               (begin
-                 (for-each
-                  (lambda (nts)
-                    (if (memq (syntax-object->datum nts) list-of-terms)
-                        (raise-syntax-error
-                         'parser-non-terminals
-                         (format "~a used as both token and non-terminal"
-                                 (syntax-object->datum nts))
-                         nts)))
-                  (syntax->list (syntax (non-term ...))))
-                 
-                 (let ((dup (duplicate-list? (syntax-object->datum 
-                                              (syntax (non-term ...))))))
-                   (if dup
-                       (raise-syntax-error
-                        'parser-non-terminals
-                        (format "non-terminal ~a defined multiple times"
-                                dup)
-                        prods)))
-                 
-                 (syntax-object->datum (syntax (non-term ...)))))
-              (_
-               (raise-syntax-error
-                'parser-grammar
-                "Grammar must be of the form (grammar (non-terminal productions ...) ...)"
-                prods))))
-           
-           ;; Check the precedence declarations for errors and turn them into data
-           (precs
-            (syntax-case prec-decls ()
-              (((type term ...) ...)
-               (let ((p-terms 
-                      (syntax-object->datum (syntax (term ... ...)))))
-                 (cond
-                   ((duplicate-list? p-terms) =>
-                    (lambda (d)
-                      (raise-syntax-error
-                       'parser-precedences
-                       (format "duplicate precedence declaration for token ~a"
-                               d)
-                       prec-decls)))
-                   (else
-                    (for-each
-                     (lambda (a)
-                       (for-each
-                        (lambda (t)
-                          (if (not (memq (syntax-object->datum t) 
-                                         list-of-terms))
-                              (raise-syntax-error
-                               'parser-precedences
-                               (format
-                                "Precedence declared for non-token ~a"
-                                (syntax-object->datum t))
-                               t)))
-                        (syntax->list a)))
-                     (syntax->list (syntax ((term ...) ...))))
-                    (for-each
-                     (lambda (type)
-                       (if (not (memq (syntax-object->datum type)
-                                      `(left right nonassoc)))
-                           (raise-syntax-error
-                            'parser-precedences
-                            "Associativity must be left, right or nonassoc"
-                            type)))
-                     (syntax->list (syntax (type ...))))
-                    (syntax-object->datum prec-decls)))))
-              (#f null)
-              (_
-               (raise-syntax-error
-                'parser-precedences
-                "Precedence declaration must be of the form (precs (assoc term ...) ...) where assoc is left, right or nonassoc"
-                prec-decls))))
-           
-           (terms (build-terms list-of-terms precs))
-           
-           (non-terms (map (lambda (non-term) (make-non-term non-term #f))
-                           list-of-non-terms))
-           (term-table (make-hash-table))
-           (non-term-table (make-hash-table)))
-      
-      (for-each (lambda (t)
-		  (hash-table-put! term-table (gram-sym-symbol t) t))
-		terms)
-      
-      (for-each (lambda (nt)
-		  (hash-table-put! non-term-table (gram-sym-symbol nt) nt))
-		non-terms)
-      
-      (let* (
-	     ;; parse-prod: syntax-object -> gram-sym vector
-	     (parse-prod
-	      (lambda (prod-so)
-                (syntax-case prod-so ()
-                  ((prod-rhs-sym ...)
-                   (andmap identifier? (syntax->list prod-so))
-                   (begin
-                     (for-each (lambda (t)
-                                 (if (memq (syntax-object->datum t) end-terms)
-                                     (raise-syntax-error
-                                      'parser-production-rhs
-                                      (format "~a is an end token and cannot be used in a production"
-                                              (syntax-object->datum t))
-                                      t)))
-                               (syntax->list prod-so))
-                     (list->vector
-                      (map (lambda (s)
-                             (hash-table-get 
-                              term-table 
-                              (syntax-object->datum s)
-                              (lambda ()
-                                (hash-table-get 
-                                 non-term-table
-                                 (syntax-object->datum s)
-                                 (lambda ()
-                                   (raise-syntax-error
-                                    'parser-production-rhs
-                                    (format 
-                                     "~a is not declared as a terminal or non-terminal"
-                                     (syntax-object->datum s))
-                                    s))))))
-                           (syntax->list prod-so)))))
-                  (_
-                   (raise-syntax-error
-                    'parser-production-rhs
-                    "production right-hand-side must have form (symbol ...)"
-                    prod-so)))))
-	     
-             ;; parse-action: syntax-object * syntax-object -> syntax-object
-             (parse-action 
-              (lambda (rhs act)
-                (let-values ([(args biggest) (get-args 1 (syntax->list rhs) src-pos term-defs)])
-                  (let ([act 
-                         (if biggest
-                             (with-syntax ([$n-start-pos (datum->syntax-object (car biggest) '$n-start-pos)]
-                                           [$n-end-pos (datum->syntax-object (cdr biggest) '$n-end-pos)])
-                               #`(let ([$n-start-pos #,(car biggest)]
-                                       [$n-end-pos #,(cdr biggest)])
-                                   #,act))
-                             act)])
-                    (quasisyntax/loc act
-                      (lambda #,args
-                        #,act))))))
-             
-	     ;; parse-prod+action: non-term * syntax-object -> production
-	     (parse-prod+action
-	      (lambda (nt prod-so)
-                (syntax-case prod-so ()
-                  ((prod-rhs action)
-                   (let ((p (parse-prod (syntax prod-rhs))))
-                     (make-prod 
-                      nt
-                      p
-                      #f
-                      (let loop ((i (sub1 (vector-length p))))
-                        (if (>= i 0)
-                            (let ((gs (vector-ref p i)))
-                              (if (term? gs)
-                                  (term-prec gs)
-                                  (loop (sub1 i))))
-                            #f))
-                      (parse-action (syntax prod-rhs) (syntax action)))))
-                  ((prod-rhs (prec term) action)
-                   (identifier? (syntax term))
-                   (let ((p (parse-prod (syntax prod-rhs))))
-                     (make-prod 
-                      nt 
-                      p
-                      #f
-                      (term-prec
-                       (hash-table-get 
-                        term-table 
-                        (syntax-object->datum (syntax term))
-                        (lambda ()
-                          (raise-syntax-error
-                           'parser-production-rhs
-                           (format
-                            "unrecognized terminal ~a in precedence declaration"
-                            (syntax-object->datum (syntax term)))
-                           (syntax term)))))
-                      (parse-action (syntax prod-rhs) (syntax action)))))
-                  (_
-                   (raise-syntax-error
-                    'parser-production-rhs
-                    "production must have form [(symbol ...) expression] or [(symbol ...) (prec symbol) expression]"
-                    prod-so)))))
-             
-	     ;; parse-prod-for-nt: syntax-object -> production list
-	     (parse-prods-for-nt
-	      (lambda (prods-so)
-                (syntax-case prods-so ()
-                  ((nt productions ...)
-                   (> (length (syntax->list (syntax (productions ...)))) 0)
-                   (let ((nt (hash-table-get non-term-table 
-                                             (syntax-object->datum (syntax nt)))))
-                     (map (lambda (p) (parse-prod+action nt p)) 
-                          (syntax->list (syntax (productions ...))))))
-		  (_
-                   (raise-syntax-error
-                    'parser-productions
-                    "A production for a non-terminal must be (non-term right-hand-side ...) with at least 1 right hand side"
-                    prods-so))))))
-		 
-        (for-each
-         (lambda (sstx ssym)
-           (unless (memq ssym list-of-non-terms)
-             (raise-syntax-error
-              'parser-start
-              (format "Start symbol ~a not defined as a non-terminal" ssym)
-              sstx)))
-         start start-syms)
-                 
-        (let* ((starts (map (lambda (x) (make-non-term (gensym) #f)) start-syms))
-               (end-non-terms (map (lambda (x) (make-non-term (gensym) #f)) start-syms))
-               (parsed-prods (map parse-prods-for-nt (syntax->list prods)))
-               (start-prods
-                (map (lambda (start end-non-term)
-                       (list (make-prod start (vector end-non-term) #f #f 
-                                        (syntax (lambda (x) x)))))
-                     starts end-non-terms))
-               (prods 
-                `(,@start-prods
-                  ,@(map
-                     (lambda (end-nt start-sym)
-                       (map
-                        (lambda (end)
-                          (make-prod end-nt
-                                     (vector
-                                      (hash-table-get non-term-table start-sym)
-                                      (hash-table-get term-table end))
-                                     #f
-                                     #f
-                                     (syntax (lambda (x) x))))
-                        end-terms))
-                     end-non-terms start-syms)
-                  ,@parsed-prods)))
-          
-          (make-object grammar%
-            prods
-            (map car start-prods)
-            terms
-            (append starts (append end-non-terms non-terms))
-            (map (lambda (term-name)
-                   (hash-table-get term-table term-name))
-                 end-terms)))))))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/lalr.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/lalr.rkt
deleted file mode 100644
index e9b4d3b738..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/lalr.rkt
+++ /dev/null
@@ -1,277 +0,0 @@
-(module lalr mzscheme
-
-  ;; Compute LALR lookaheads from DeRemer and Pennello 1982
-
-  (require "lr0.rkt"
-           "grammar.rkt"
-           mzlib/list
-           mzlib/class)
-
-  (provide compute-LA)
-  
-  ;; compute-DR: LR0-automaton * grammar -> (trans-key -> term set)
-  ;; computes for each state, non-term transition pair, the terminals
-  ;; which can transition out of the resulting state
-  ;; output term set is represented in bit-vector form
-  (define (compute-DR a g)
-    (lambda (tk)
-      (let ((r (send a run-automaton (trans-key-st tk) (trans-key-gs tk))))
-        (term-list->bit-vector
-         (filter
-          (lambda (term)
-            (send a run-automaton r term))
-          (send g get-terms))))))
-  
-  ;; compute-reads: 
-  ;;   LR0-automaton * grammar -> (trans-key -> trans-key list)
-  (define (compute-reads a g)
-    (let ((nullable-non-terms 
-           (filter (lambda (nt) (send g nullable-non-term? nt))
-                   (send g get-non-terms))))
-      (lambda (tk)
-        (let ((r (send a run-automaton (trans-key-st tk) (trans-key-gs tk))))
-          (map (lambda (x) (make-trans-key r x))
-               (filter (lambda (non-term) (send a run-automaton r non-term))
-                       nullable-non-terms))))))
-  
-  ;; compute-read: LR0-automaton * grammar -> (trans-key -> term set)
-  ;; output term set is represented in bit-vector form
-  (define (compute-read a g)
-    (let* ((dr (compute-DR a g))
-           (reads (compute-reads a g)))
-      (digraph-tk->terml (send a get-mapped-non-term-keys)
-                         reads
-                         dr
-                         (send a get-num-states))))
-  ;; returns the list of all k such that state k transitions to state start on the
-  ;; transitions in rhs (in order)
-  (define (run-lr0-backward a rhs dot-pos start num-states)
-    (let loop ((states (list start))
-               (i (sub1 dot-pos)))
-      (cond
-        ((< i 0) states)
-        (else (loop (send a run-automaton-back states (vector-ref rhs i))
-                    (sub1 i))))))
-
-  ;; prod->items-for-include: grammar * prod * non-term -> lr0-item list
-  ;; returns the list of all (B -> beta . nt gamma) such that prod = (B -> beta nt gamma)
-  ;; and gamma =>* epsilon
-  (define (prod->items-for-include g prod nt)
-    (let* ((rhs (prod-rhs prod))
-           (rhs-l (vector-length rhs)))
-      (append (if (and (> rhs-l 0) (eq? nt (vector-ref rhs (sub1 rhs-l))))
-                  (list (make-item prod (sub1 rhs-l)))
-                  null)
-              (let loop ((i (sub1 rhs-l)))
-                (cond
-                  ((and (> i 0) 
-                        (non-term? (vector-ref rhs i)) 
-                        (send g nullable-non-term? (vector-ref rhs i)))
-                   (if (eq? nt (vector-ref rhs (sub1 i)))
-                       (cons (make-item prod (sub1 i))
-                             (loop (sub1 i)))
-                       (loop (sub1 i))))
-                  (else null))))))
-
-  ;; prod-list->items-for-include: grammar * prod list * non-term -> lr0-item list
-  ;; return the list of all (B -> beta . nt gamma) such that  (B -> beta nt gamma) in prod-list
-  ;; and gamma =>* epsilon
-  (define (prod-list->items-for-include g prod-list nt)
-    (apply append (map (lambda (prod) (prod->items-for-include g prod nt)) prod-list)))
-
-  ;; comput-includes: lr0-automaton * grammar -> (trans-key -> trans-key list)
-  (define (compute-includes a g)
-    (let ((num-states (send a get-num-states))
-          (items-for-input-nt (make-vector (send g get-num-non-terms) null)))
-      (for-each
-       (lambda (input-nt)
-         (vector-set! items-for-input-nt (non-term-index input-nt)
-                      (prod-list->items-for-include g (send g get-prods) input-nt)))
-       (send g get-non-terms))
-      (lambda (tk)
-        (let* ((goal-state (trans-key-st tk))
-               (non-term (trans-key-gs tk))
-               (items (vector-ref items-for-input-nt (non-term-index non-term))))
-          (trans-key-list-remove-dups
-           (apply append
-                  (map (lambda (item)
-                         (let* ((prod (item-prod item))
-                                (rhs (prod-rhs prod))
-                                (lhs (prod-lhs prod)))
-                           (map (lambda (state)
-                                  (make-trans-key state lhs))
-                                (run-lr0-backward a 
-                                                  rhs
-                                                  (item-dot-pos item)
-                                                  goal-state 
-                                                  num-states))))
-                       items)))))))
-  
-  ;; compute-lookback: lr0-automaton * grammar -> (kernel * proc -> trans-key list)
-  (define (compute-lookback a g)
-    (let ((num-states (send a get-num-states)))
-      (lambda (state prod)
-        (map (lambda (k) (make-trans-key k (prod-lhs prod)))
-             (run-lr0-backward a (prod-rhs prod) (vector-length (prod-rhs prod)) state num-states)))))
-  
-  ;; compute-follow:  LR0-automaton * grammar -> (trans-key -> term set)
-  ;; output term set is represented in bit-vector form
-  (define (compute-follow a g includes)
-    (let ((read (compute-read a g)))
-      (digraph-tk->terml (send a get-mapped-non-term-keys)
-                         includes
-                         read
-                         (send a get-num-states))))
-    
-  ;; compute-LA: LR0-automaton * grammar -> kernel * prod -> term set
-  ;; output term set is represented in bit-vector form
-  (define (compute-LA a g)
-    (let* ((includes (compute-includes a g))
-           (lookback (compute-lookback a g))
-           (follow  (compute-follow a g includes)))
-      (lambda (k p)
-        (let* ((l (lookback k p))
-               (f (map follow l)))
-          (apply bitwise-ior (cons 0 f))))))
-
-  (define (print-DR dr a g)
-    (print-input-st-sym dr "DR" a g print-output-terms))
-  (define (print-Read Read a g)
-    (print-input-st-sym Read "Read" a g print-output-terms))
-  (define (print-includes i a g)
-    (print-input-st-sym i "includes" a g print-output-st-nt))
-  (define (print-lookback l a g)
-    (print-input-st-prod l "lookback" a g print-output-st-nt))
-  (define (print-follow f a g)
-    (print-input-st-sym f "follow" a g print-output-terms))
-  (define (print-LA l a g)
-    (print-input-st-prod l "LA" a g print-output-terms))
-
-  (define (print-input-st-sym f name a g print-output)
-    (printf "~a:\n" name)
-    (send a for-each-state
-     (lambda (state)
-       (for-each
-        (lambda (non-term)
-          (let ((res (f (make-trans-key state non-term))))
-            (if (not (null? res))
-                (printf "~a(~a, ~a) = ~a\n"
-                        name
-                        state
-                        (gram-sym-symbol non-term)
-                        (print-output res)))))
-        (send g get-non-terms))))
-    (newline))
-
-  (define (print-input-st-prod f name a g print-output)
-    (printf "~a:\n" name)
-    (send a for-each-state
-     (lambda (state)
-       (for-each
-        (lambda (non-term)
-          (for-each
-           (lambda (prod)
-             (let ((res (f state prod)))
-               (if (not (null? res))
-                   (printf "~a(~a, ~a) = ~a\n"
-                           name
-                           (kernel-index state)
-                           (prod-index prod)
-                           (print-output res)))))
-           (send g get-prods-for-non-term non-term)))
-        (send g get-non-terms)))))
-  
-  (define (print-output-terms r)
-    (map 
-     (lambda (p)
-       (gram-sym-symbol p))
-     r))
-  
-  (define (print-output-st-nt r)
-    (map
-     (lambda (p)
-       (list
-        (kernel-index (trans-key-st p))
-        (gram-sym-symbol (trans-key-gs p))))
-     r))
-
-  ;; init-tk-map : int -> (vectorof hashtable?)
-  (define (init-tk-map n)
-    (let ((v (make-vector n #f)))
-      (let loop ((i (sub1 (vector-length v))))
-        (when (>= i 0)
-          (vector-set! v i (make-hash-table))
-          (loop (sub1 i))))
-      v))
-  
-  ;; lookup-tk-map : (vectorof (symbol? int hashtable)) -> trans-key? -> int
-  (define (lookup-tk-map map)
-    (lambda (tk)
-      (let ((st (trans-key-st tk))
-            (gs (trans-key-gs tk)))
-        (hash-table-get (vector-ref map (kernel-index st))
-                        (gram-sym-symbol gs)
-                        (lambda () 0)))))
-
-  ;; add-tk-map : (vectorof (symbol? int hashtable)) -> trans-key int -> 
-  (define (add-tk-map map)
-    (lambda (tk v)
-      (let ((st (trans-key-st tk))
-            (gs (trans-key-gs tk)))
-        (hash-table-put! (vector-ref map (kernel-index st))
-                         (gram-sym-symbol gs)
-                         v))))
-             
-  ;; digraph-tk->terml: 
-  ;;   (trans-key list) * (trans-key -> trans-key list) * (trans-key -> term list) * int * int * int
-  ;;     -> (trans-key -> term list)
-  ;; DeRemer and Pennello 1982
-  ;; Computes (f x) = (f- x) union Union{(f y) | y in (edges x)}
-  ;; A specialization of digraph in the file graph.rkt
-  (define (digraph-tk->terml nodes edges f- num-states)
-    (letrec [
-             ;; Will map elements of trans-key to term sets represented as bit vectors
-             (results (init-tk-map num-states))
-             
-             ;; Maps elements of trans-keys to integers.
-             (N (init-tk-map num-states))
-             
-             (get-N (lookup-tk-map N))
-             (set-N (add-tk-map N))
-             (get-f (lookup-tk-map results))
-             (set-f (add-tk-map results))
-             
-             (stack null)
-             (push (lambda (x)
-                     (set! stack (cons x stack))))
-             (pop (lambda () 
-                    (begin0 
-                     (car stack)
-                     (set! stack (cdr stack)))))
-             (depth (lambda () (length stack)))
-
-             ;; traverse: 'a -> 
-             (traverse
-              (lambda (x)
-                (push x)
-                (let ((d (depth)))
-                  (set-N x d)
-                  (set-f x (f- x))
-                  (for-each (lambda (y)
-                              (when (= 0 (get-N y))
-                                (traverse y))
-                              (set-f x (bitwise-ior (get-f x) (get-f y)))
-                              (set-N x (min (get-N x) (get-N y))))
-                            (edges x))
-                  (when (= d (get-N x))
-                    (let loop ((p (pop)))
-                      (set-N p +inf.0)
-                      (set-f p (get-f x))
-                      (unless (equal? x p)
-                        (loop (pop))))))))]
-      (for-each (lambda (x)
-                  (when (= 0 (get-N x))
-                    (traverse x)))
-                nodes)
-      get-f))
-)
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/lr0.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/lr0.rkt
deleted file mode 100644
index f23773546d..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/lr0.rkt
+++ /dev/null
@@ -1,372 +0,0 @@
-(module lr0 mzscheme
-
-  ;; Handle the LR0 automaton
-  
-  (require "grammar.rkt"
-           "graph.rkt"
-           mzlib/list
-           mzlib/class)
-  
-  (provide build-lr0-automaton lr0%
-           (struct trans-key (st gs)) trans-key-list-remove-dups
-           kernel-items kernel-index)
-
-  ;; kernel = (make-kernel (LR1-item list) index)
-  ;;   the list must be kept sorted according to item<? so that equal? can
-  ;;   be used to compare kernels
-  ;;   Each kernel is assigned a unique index, 0 <= index < number of states
-  ;; trans-key = (make-trans-key kernel gram-sym)
-  (define-struct kernel (items index) (make-inspector))
-  (define-struct trans-key (st gs) (make-inspector))
-
-  (define (trans-key<? a b)
-    (let ((kia (kernel-index (trans-key-st a)))
-          (kib (kernel-index (trans-key-st b))))
-      (or (< kia kib)
-          (and (= kia kib)
-               (< (non-term-index (trans-key-gs a))
-                  (non-term-index (trans-key-gs b)))))))
-  
-  (define (trans-key-list-remove-dups tkl)
-    (let loop ((sorted (sort tkl trans-key<?)))
-      (cond
-        ((null? sorted) null)
-        ((null? (cdr sorted)) sorted)
-        (else
-         (if (and (= (non-term-index (trans-key-gs (car sorted)))
-                     (non-term-index (trans-key-gs (cadr sorted))))
-                  (= (kernel-index (trans-key-st (car sorted)))
-                     (kernel-index (trans-key-st (cadr sorted)))))
-             (loop (cdr sorted))
-             (cons (car sorted) (loop (cdr sorted))))))))
-
-
-  ;; build-transition-table : int (listof (cons/c trans-key X) ->
-  ;;                          (vectorof (symbol X hashtable))
-  (define (build-transition-table num-states assoc)
-    (let ((transitions (make-vector num-states #f)))
-      (let loop ((i (sub1 (vector-length transitions))))
-        (when (>= i 0)
-          (vector-set! transitions i (make-hash-table))
-          (loop (sub1 i))))
-      (for-each
-       (lambda (trans-key/kernel)
-         (let ((tk (car trans-key/kernel)))
-           (hash-table-put! (vector-ref transitions (kernel-index (trans-key-st tk)))
-                            (gram-sym-symbol (trans-key-gs tk))
-                            (cdr trans-key/kernel))))
-       assoc)
-      transitions))
-  
-  ;; reverse-assoc : (listof (cons/c trans-key? kernel?)) ->
-  ;;                 (listof (cons/c trans-key? (listof kernel?)))
-  (define (reverse-assoc assoc)
-    (let ((reverse-hash (make-hash-table 'equal))
-          (hash-table-add!
-           (lambda (ht k v)
-             (hash-table-put! ht k (cons v (hash-table-get ht k (lambda () null)))))))
-      (for-each
-       (lambda (trans-key/kernel)
-         (let ((tk (car trans-key/kernel)))
-           (hash-table-add! reverse-hash 
-                            (make-trans-key (cdr trans-key/kernel)
-                                            (trans-key-gs tk))
-                            (trans-key-st tk))))
-       assoc)
-      (hash-table-map reverse-hash cons)))
-
-
-  ;; kernel-list-remove-duplicates
-  ;; LR0-automaton = object of class lr0%
-  (define lr0%
-    (class object%
-      (super-instantiate ())
-      ;; term-assoc : (listof (cons/c trans-key? kernel?))
-      ;; non-term-assoc : (listof (cons/c trans-key? kernel?))
-      ;; states : (vectorof kernel?)
-      ;; epsilons : ???
-      (init-field term-assoc non-term-assoc states epsilons)
-            
-      (define transitions (build-transition-table (vector-length states)
-                                                  (append term-assoc non-term-assoc)))
-      
-      (define reverse-term-assoc (reverse-assoc term-assoc))
-      (define reverse-non-term-assoc (reverse-assoc non-term-assoc))
-      (define reverse-transitions
-        (build-transition-table (vector-length states)
-                                (append reverse-term-assoc reverse-non-term-assoc)))
-      
-      (define mapped-non-terms (map car non-term-assoc))
-      
-      (define/public (get-mapped-non-term-keys)
-        mapped-non-terms)
-
-      (define/public (get-num-states)
-        (vector-length states))
-      
-      (define/public (get-epsilon-trans)
-        epsilons)
-
-      (define/public (get-transitions)
-        (append term-assoc non-term-assoc))
-      
-      ;; for-each-state : (state ->) ->
-      ;; Iteration over the states in an automaton
-      (define/public (for-each-state f)
-        (let ((num-states (vector-length states)))
-          (let loop ((i 0))
-            (if (< i num-states)
-                (begin
-                  (f (vector-ref states i))
-                  (loop (add1 i)))))))
-      
-      ;; run-automaton: kernel? gram-sym? -> (union kernel #f)
-      ;; returns the state reached from state k on input s, or #f when k
-      ;; has no transition on s
-      (define/public (run-automaton k s)
-        (hash-table-get (vector-ref transitions (kernel-index k))
-                        (gram-sym-symbol s)
-                        (lambda () #f)))
-
-      ;; run-automaton-back : (listof kernel?) gram-sym? -> (listof kernel)
-      ;; returns the list of states that can reach k by transitioning on s.
-      (define/public (run-automaton-back k s)
-        (apply append
-               (map 
-                (lambda (k)
-                  (hash-table-get (vector-ref reverse-transitions (kernel-index k))
-                                  (gram-sym-symbol s)
-                                  (lambda () null)))
-                k)))))
-
-  (define (union comp<?)
-    (letrec ((union
-              (lambda (l1 l2)
-                (cond
-                 ((null? l1) l2)
-                 ((null? l2) l1)
-                 (else (let ((c1 (car l1))
-                             (c2 (car l2)))
-                         (cond
-                          ((comp<? c1 c2)
-                           (cons c1 (union (cdr l1) l2)))
-                          ((comp<? c2 c1)
-                           (cons c2 (union l1 (cdr l2))))
-                          (else (union (cdr l1) l2)))))))))
-      union))
-  
-
-  ;; The kernels in the automaton are represented cannonically.
-  ;; That is (equal? a b) <=> (eq? a b)
-  (define (kernel->string k)
-    (apply string-append 
-           `("{" ,@(map (lambda (i) (string-append (item->string i) ", ")) 
-                        (kernel-items k)) 
-             "}")))
-
-  ;; build-LR0-automaton: grammar -> LR0-automaton
-  ;; Constructs the kernels of the sets of LR(0) items of g
-  (define (build-lr0-automaton grammar)
-;    (printf "LR(0) automaton:\n")
-    (letrec (
-             (epsilons (make-hash-table 'equal))
-             (grammar-symbols (append (send grammar get-non-terms)
-                                      (send grammar get-terms)))
-             ;; first-non-term: non-term -> non-term list
-             ;; given a non-terminal symbol C, return those non-terminal 
-             ;; symbols A s.t. C -> An for some string of terminals and
-             ;; non-terminals n where -> means a rightmost derivation in many 
-             ;; steps.  Assumes that each non-term can be reduced to a string 
-             ;; of terms.
-             (first-non-term 
-              (digraph (send grammar get-non-terms)
-                       (lambda (nt)
-                         (filter non-term?
-                                 (map (lambda (prod)
-                                        (sym-at-dot (make-item prod 0)))
-                                      (send grammar get-prods-for-non-term nt))))
-                       (lambda (nt) (list nt))
-                       (union non-term<?)
-                       (lambda () null)))
-             
-             ;; closure: LR1-item list -> LR1-item list
-             ;; Creates a set of items containing i s.t. if A -> n.Xm is in it,
-             ;; X -> .o is in it too.
-             (LR0-closure
-              (lambda (i)
-                (cond
-                 ((null? i) null)
-                 (else
-                  (let ((next-gsym (sym-at-dot (car i))))
-                    (cond
-                     ((non-term? next-gsym)
-                      (cons (car i)
-                            (append 
-                             (apply append
-                                    (map (lambda (non-term) 
-                                           (map (lambda (x) 
-                                                  (make-item x 0))
-                                                (send grammar 
-                                                      get-prods-for-non-term
-                                                      non-term)))
-                                         (first-non-term next-gsym)))
-                             (LR0-closure (cdr i)))))
-                     (else
-                      (cons (car i) (LR0-closure (cdr i))))))))))
-
-
-             ;; maps trans-keys to kernels
-             (automaton-term null)
-             (automaton-non-term null)
-             
-             ;; keeps the kernels we have seen, so we can have a unique
-             ;; list for each kernel
-             (kernels (make-hash-table 'equal))
-
-             (counter 0)
-             
-             ;; goto: LR1-item list -> LR1-item list list
-             ;; creates new kernels by moving the dot in each item in the
-             ;; LR0-closure of kernel to the right, and grouping them by 
-             ;; the term/non-term moved over.  Returns the kernels not
-             ;; yet seen, and places the trans-keys into automaton
-             (goto
-              (lambda (kernel)
-                (let (
-                      ;; maps a gram-syms to a list of items
-                      (table (make-hash-table))
-
-                      ;; add-item!: 
-                      ;;   (symbol (listof item) hashtable) item? ->
-                      ;; adds i into the table grouped with the grammar
-                      ;; symbol following its dot
-                      (add-item!
-                       (lambda (table i)
-                         (let ((gs (sym-at-dot i)))
-                           (cond
-                            (gs
-                             (let ((already 
-                                    (hash-table-get table
-                                                    (gram-sym-symbol gs)
-                                                    (lambda () null))))
-                               (unless (member i already)
-                                 (hash-table-put! table 
-                                                  (gram-sym-symbol gs)
-                                                  (cons i already)))))
-                            ((= 0 (vector-length (prod-rhs (item-prod i))))
-                             (let ((current (hash-table-get epsilons
-                                                            kernel
-                                                            (lambda () null))))
-                               (hash-table-put! epsilons
-                                                kernel
-                                                (cons i current)))))))))
-                  
-                  ;; Group the items of the LR0 closure of the kernel
-                  ;; by the character after the dot
-                  (for-each (lambda (item)
-                              (add-item! table item))
-                            (LR0-closure (kernel-items kernel)))
-                  
-                  ;; each group is a new kernel, with the dot advanced.
-                  ;; sorts the items in a kernel so kernels can be compared
-                  ;; with equal? for using the table kernels to make sure
-                  ;; only one representitive of each kernel is created
-                  (filter 
-                   (lambda (x) x)
-                   (map
-                    (lambda (i)
-                      (let* ((gs (car i))
-                             (items (cadr i))
-                             (new #f)
-                             (new-kernel (sort
-                                          (filter (lambda (x) x)
-                                                  (map move-dot-right items))
-                                          item<?))
-                             (unique-kernel (hash-table-get
-                                             kernels
-                                             new-kernel
-                                             (lambda () 
-                                               (let ((k (make-kernel
-                                                         new-kernel
-                                                         counter)))
-                                                 (set! new #t)
-                                                 (set! counter (add1 counter))
-                                                 (hash-table-put! kernels
-                                                                  new-kernel
-                                                                  k)
-                                                 k)))))
-                        (cond
-                          ((term? gs)
-                           (set! automaton-term (cons (cons (make-trans-key kernel gs)
-                                                            unique-kernel)
-                                                      automaton-term)))
-                          (else
-                           (set! automaton-non-term (cons (cons (make-trans-key kernel gs)
-                                                                unique-kernel)
-                                                          automaton-non-term))))
-                        #;(printf "~a -> ~a on ~a\n" 
-                                  (kernel->string kernel)
-                                  (kernel->string unique-kernel)
-                                  (gram-sym-symbol gs))
-                        (if new
-                            unique-kernel
-                            #f)))
-                    (let loop ((gsyms grammar-symbols))
-                      (cond
-                        ((null? gsyms) null)
-                        (else
-                         (let ((items (hash-table-get table
-                                                      (gram-sym-symbol (car gsyms))
-                                                      (lambda () null))))
-                           (cond
-                             ((null? items) (loop (cdr gsyms)))
-                             (else
-                              (cons (list (car gsyms) items)
-                                    (loop (cdr gsyms))))))))))))))
-
-             (starts 
-              (map (lambda (init-prod) (list (make-item init-prod 0)))
-                   (send grammar get-init-prods)))
-             (startk
-              (map (lambda (start)
-                     (let ((k (make-kernel start counter)))
-                       (hash-table-put! kernels start k)
-                       (set! counter (add1 counter))
-                       k))
-                   starts))
-             (new-kernels (make-queue)))
-
-      (let loop ((old-kernels startk)
-                 (seen-kernels null))
-        (cond
-         ((and (empty-queue? new-kernels) (null? old-kernels))
-          (make-object lr0% 
-                       automaton-term
-                       automaton-non-term
-                       (list->vector (reverse seen-kernels))
-                       epsilons))
-         ((null? old-kernels)
-          (loop (deq! new-kernels) seen-kernels))
-         (else 
-          (enq! new-kernels (goto (car old-kernels)))
-          (loop (cdr old-kernels) (cons (car old-kernels) seen-kernels)))))))
-
-  (define-struct q (f l) (make-inspector))
-  (define (empty-queue? q)
-    (null? (q-f q)))
-  (define (make-queue)
-    (make-q null null))
-  (define (enq! q i)
-    (if (empty-queue? q)
-        (let ((i (mcons i null)))
-          (set-q-l! q i)
-          (set-q-f! q i))
-        (begin
-          (set-mcdr! (q-l q) (mcons i null))
-          (set-q-l! q (mcdr (q-l q))))))
-  (define (deq! q)
-    (begin0
-     (mcar (q-f q))
-     (set-q-f! q (mcdr (q-f q)))))
-
-)
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/parser-actions.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/parser-actions.rkt
deleted file mode 100644
index 2a39b3617d..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/parser-actions.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-(module parser-actions mzscheme
-  (require "grammar.rkt")
-  (provide (all-defined-except make-reduce make-reduce*)
-           (rename make-reduce* make-reduce))
-
-  ;; An action is 
-  ;;  - (make-shift int)
-  ;;  - (make-reduce prod runtime-action)
-  ;;  - (make-accept)
-  ;;  - (make-goto int)
-  ;;  - (no-action)
-  ;; A reduce contains a runtime-reduce so that sharing of the reduces can
-  ;; be easily transferred to sharing of runtime-reduces.
-  
-  (define-struct action () (make-inspector))
-  (define-struct (shift action) (state) (make-inspector))
-  (define-struct (reduce action) (prod runtime-reduce) (make-inspector))
-  (define-struct (accept action) () (make-inspector))
-  (define-struct (goto action) (state) (make-inspector))
-  (define-struct (no-action action) () (make-inspector))
-  
-  (define (make-reduce* p)
-    (make-reduce p
-                 (vector (prod-index p)
-                         (gram-sym-symbol (prod-lhs p))
-                         (vector-length (prod-rhs p)))))
-
-  ;; A runtime-action is
-  ;; non-negative-int        (shift)
-  ;; (vector int symbol int) (reduce)
-  ;; 'accept                 (accept)
-  ;; negative-int            (goto)
-  ;; #f                      (no-action)
-  
-  (define (action->runtime-action a)
-    (cond
-      ((shift? a) (shift-state a))
-      ((reduce? a) (reduce-runtime-reduce a))
-      ((accept? a) 'accept)
-      ((goto? a) (- (+ (goto-state a) 1)))
-      ((no-action? a) #f)))
-  
-  (define (runtime-shift? x) (and (integer? x) (>= x 0)))
-  (define runtime-reduce? vector?)
-  (define (runtime-accept? x) (eq? x 'accept))
-  (define (runtime-goto? x) (and (integer? x) (< x 0)))
-
-  (define runtime-shift-state values) 
-  (define (runtime-reduce-prod-num x) (vector-ref x 0))
-  (define (runtime-reduce-lhs x) (vector-ref x 1))
-  (define (runtime-reduce-rhs-length x) (vector-ref x 2))
-  (define (runtime-goto-state x) (- (+ x 1)))
-
-  )
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/parser-builder.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/parser-builder.rkt
deleted file mode 100644
index 20351be118..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/parser-builder.rkt
+++ /dev/null
@@ -1,110 +0,0 @@
-(module parser-builder mzscheme
-  
-  (require "input-file-parser.rkt"
-           "grammar.rkt"
-           "table.rkt"
-           mzlib/class
-           mzlib/contract)
-  (require-for-template mzscheme)
-  
-  (provide/contract
-   (build-parser ((string? any/c any/c (listof identifier?) (listof identifier?)
-                   (listof identifier?) (union syntax? false/c) syntax?)
-                  . ->* .
-                  (any/c any/c any/c any/c))))
-  
-  ;; fix-check-syntax : (listof identifier?) (listof identifier?) (listof identifier?)
-  ;;                    (union syntax? false/c) syntax?) -> syntax?
-  (define (fix-check-syntax input-terms start ends assocs prods)
-    (let* ((term-binders (get-term-list input-terms))
-           (get-term-binder
-            (let ((t (make-hash-table)))
-              (for-each 
-               (lambda (term)
-                 (hash-table-put! t (syntax-e term) term))
-               term-binders)
-              (lambda (x)
-                (let ((r (hash-table-get t (syntax-e x) (lambda () #f))))
-                  (if r
-                      (syntax-local-introduce (datum->syntax-object r (syntax-e x) x x))
-                      x)))))
-           (rhs-list
-            (syntax-case prods ()
-              (((_ rhs ...) ...)
-               (syntax->list (syntax (rhs ... ...)))))))
-      (with-syntax (((tmp ...) (map syntax-local-introduce term-binders))
-                    ((term-group ...)
-                     (map (lambda (tg)
-                            (syntax-property
-                             (datum->syntax-object tg #f)
-                             'disappeared-use
-                             tg))
-                          input-terms))
-                    ((end ...)
-                     (map get-term-binder ends))
-                    ((start ...)
-                     (map get-term-binder start))
-                    ((bind ...)
-                     (syntax-case prods ()
-                       (((bind _ ...) ...)
-                        (syntax->list (syntax (bind ...))))))
-                    (((bound ...) ...)
-                     (map
-                      (lambda (rhs)
-                        (syntax-case rhs ()
-                          (((bound ...) (_ pbound) __)
-                           (map get-term-binder
-                                (cons (syntax pbound)
-                                      (syntax->list (syntax (bound ...))))))
-                          (((bound ...) _)
-                           (map get-term-binder
-                                (syntax->list (syntax (bound ...)))))))
-                      rhs-list))
-                    ((prec ...)
-                     (if assocs
-                         (map get-term-binder
-                              (syntax-case assocs ()
-                                (((__ term ...) ...)
-                                 (syntax->list (syntax (term ... ...))))))
-                         null)))
-        #`(when #f
-            (let ((bind void) ... (tmp void) ...)
-              (void bound ... ... term-group ... start ... end ... prec ...))))))
-  (require mzlib/list "parser-actions.rkt")
-  (define (build-parser filename src-pos suppress input-terms start end assocs prods)
-    (let* ((grammar (parse-input input-terms start end assocs prods src-pos))
-           (table (build-table grammar filename suppress))
-           (all-tokens (make-hash-table))
-           (actions-code
-            `(vector ,@(map prod-action (send grammar get-prods)))))
-      (for-each (lambda (term)
-                  (hash-table-put! all-tokens (gram-sym-symbol term) #t))
-                (send grammar get-terms))
-      #;(let ((num-states (vector-length table))
-            (num-gram-syms (+ (send grammar get-num-terms)
-                              (send grammar get-num-non-terms)))
-            (num-ht-entries (apply + (map length (vector->list table))))
-            (num-reduces
-             (let ((ht (make-hash-table)))
-               (for-each
-                (lambda (x)
-                  (when (reduce? x)
-                    (hash-table-put! ht x #t)))
-                (map cdr (apply append (vector->list table))))
-               (length (hash-table-map ht void)))))
-        (printf "~a states, ~a grammar symbols, ~a hash-table entries, ~a reduces\n"
-                num-states num-gram-syms num-ht-entries num-reduces)
-        (printf "~a -- ~aKB, previously ~aKB\n"
-                (/ (+ 2 num-states
-                      (* 4 num-states) (* 2 1.5 num-ht-entries)
-                      (* 5 num-reduces)) 256.0)
-                (/ (+ 2 num-states
-                      (* 4 num-states) (* 2 2.3 num-ht-entries)
-                      (* 5 num-reduces)) 256.0)
-                (/ (+ 2 (* num-states num-gram-syms) (* 5 num-reduces)) 256.0)))
-      (values table
-              all-tokens
-              actions-code
-              (fix-check-syntax input-terms start end assocs prods))))
-      
-  )
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/table.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/table.rkt
deleted file mode 100644
index 7eef2e2d3d..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/table.rkt
+++ /dev/null
@@ -1,289 +0,0 @@
-#lang scheme/base
-
-  ;; Routine to build the LALR table
-
-  (require "grammar.rkt"
-           "lr0.rkt"
-           "lalr.rkt"
-           "parser-actions.rkt"
-           mzlib/contract
-           mzlib/list
-           mzlib/class)
-
-  (provide/contract 
-   (build-table ((is-a?/c grammar%) string? any/c . -> .
-                 (vectorof (listof (cons/c (union term? non-term?) action?))))))
-
-  ;; A parse-table is (vectorof (listof (cons/c gram-sym? action)))
-  ;; A grouped-parse-table is (vectorof (listof (cons/c gram-sym? (listof action))))
-  
-  ;; make-parse-table : int -> parse-table
-  (define (make-parse-table num-states)
-    (make-vector num-states null))
-  
-  ;; table-add!: parse-table nat symbol action ->
-  (define (table-add! table state-index symbol val)
-    (vector-set! table state-index (cons (cons symbol val)
-                                         (vector-ref table state-index))))
-  
-  ;; group-table : parse-table -> grouped-parse-table
-  (define (group-table table)
-    (list->vector
-     (map
-      (lambda (state-entry)
-        (let ((ht (make-hash)))
-          (for-each
-           (lambda (gs/actions)
-             (let ((group (hash-ref ht (car gs/actions) (lambda () null))))
-               (unless (member (cdr gs/actions) group)
-                 (hash-set! ht (car gs/actions) (cons (cdr gs/actions) group)))))
-           state-entry)
-          (hash-map ht cons)))
-      (vector->list table))))
-  
-  ;; table-map : (vectorof (listof (cons/c gram-sym? X))) (gram-sym? X -> Y) ->
-  ;;             (vectorof (listof (cons/c gram-sym? Y)))
-  (define (table-map f table)
-    (list->vector
-     (map
-      (lambda (state-entry)
-        (map
-         (lambda (gs/X)
-           (cons (car gs/X) (f (car gs/X) (cdr gs/X))))
-         state-entry))
-      (vector->list table))))
-  
-  
-  (define (bit-vector-for-each f bv)
-    (letrec ((for-each
-              (lambda (bv number)
-                (cond
-                  ((= 0 bv) (void))
-                  ((= 1 (bitwise-and 1 bv))
-                   (f number)
-                   (for-each (arithmetic-shift bv -1) (add1 number)))
-                  (else (for-each (arithmetic-shift bv -1) (add1 number)))))))
-      (for-each bv 0)))
-                   
-  
-  ;; print-entry: symbol action output-port ->
-  ;; prints the action a for lookahead sym to the given port
-  (define (print-entry sym a port)
-    (let ((s "\t~a\t\t\t\t\t~a\t~a\n"))
-      (cond
-       ((shift? a)
-	(fprintf port s sym "shift" (shift-state a)))
-       ((reduce? a)
-	(fprintf port s sym "reduce" (prod-index (reduce-prod a))))
-       ((accept? a)
-	(fprintf port s sym "accept" ""))
-       ((goto? a)
-	(fprintf port s sym "goto" (goto-state a))))))
-
-
-  ;; count: ('a -> bool) * 'a list -> num
-  ;; counts the number of elements in list that satisfy pred
-  (define (count pred list)
-    (cond
-     ((null? list) 0)
-     ((pred (car list)) (+ 1 (count pred (cdr list))))
-     (else (count pred (cdr list)))))
-
-  ;; display-parser: LR0-automaton grouped-parse-table (listof prod?) output-port ->
-  ;; Prints out the parser given by table.
-  (define (display-parser a grouped-table prods port)
-    (let* ((SR-conflicts 0)
-	   (RR-conflicts 0))
-      (for-each
-       (lambda (prod)
-         (fprintf port 
-                  "~a\t~a\t=\t~a\n" 
-                  (prod-index prod)
-                  (gram-sym-symbol (prod-lhs prod))
-                  (map gram-sym-symbol (vector->list (prod-rhs prod)))))
-       prods)
-      (send a for-each-state
-        (lambda (state)
-          (fprintf port "State ~a\n" (kernel-index state))
-          (for-each (lambda (item)
-                      (fprintf port "\t~a\n" (item->string item)))
-                    (kernel-items state))
-          (newline port)
-          (for-each
-           (lambda (gs/action)
-             (let ((sym (gram-sym-symbol (car gs/action)))
-                   (act (cdr gs/action)))
-              (cond
-                ((null? act) (void))
-                ((null? (cdr act))
-                 (print-entry sym (car act) port))
-                (else
-                 (fprintf port "begin conflict:\n")
-                 (when (> (count reduce? act) 1)
-                   (set! RR-conflicts (add1 RR-conflicts)))
-                 (when (> (count shift? act) 0)
-                   (set! SR-conflicts (add1 SR-conflicts)))
-                 (map (lambda (x) (print-entry sym x port)) act)
-                 (fprintf port "end conflict\n")))))
-           (vector-ref grouped-table (kernel-index state)))
-          (newline port)))
-      
-      (when (> SR-conflicts 0)
-        (fprintf port "~a shift/reduce conflict~a\n" 
-                 SR-conflicts
-                 (if (= SR-conflicts 1) "" "s")))
-      (when (> RR-conflicts 0)
-        (fprintf port "~a reduce/reduce conflict~a\n"
-                 RR-conflicts
-                 (if (= RR-conflicts 1) "" "s")))))
-  
-  ;; resolve-conflict : (listof action?) -> action? bool bool
-  (define (resolve-conflict actions)
-    (cond
-      ((null? actions) (values (make-no-action) #f #f))
-      ((null? (cdr actions))
-       (values (car actions) #f #f))
-      (else
-       (let ((SR-conflict? (> (count shift? actions) 0))
-             (RR-conflict? (> (count reduce? actions) 1)))
-         (let loop ((current-guess #f)
-                    (rest actions))
-           (cond
-             ((null? rest) (values current-guess SR-conflict? RR-conflict?))
-             ((shift? (car rest)) (values (car rest) SR-conflict? RR-conflict?))
-             ((not current-guess)
-              (loop (car rest) (cdr rest)))
-             ((and (reduce? (car rest))
-                   (< (prod-index (reduce-prod (car rest)))
-                      (prod-index (reduce-prod current-guess))))
-              (loop (car rest) (cdr rest)))
-             ((accept? (car rest))
-              (eprintf "accept/reduce or accept/shift conflicts.  Check the grammar for useless cycles of productions\n")
-              (loop current-guess (cdr rest)))
-             (else (loop current-guess (cdr rest)))))))))
-  
-  ;; resolve-conflicts : grouped-parse-table bool -> parse-table
-  (define (resolve-conflicts grouped-table suppress)
-    (let* ((SR-conflicts 0)
-           (RR-conflicts 0)
-           (table (table-map
-                   (lambda (gs actions)
-                     (let-values (((action SR? RR?)
-                                   (resolve-conflict actions)))
-                       (when SR?
-                         (set! SR-conflicts (add1 SR-conflicts)))
-                       (when RR?
-                         (set! RR-conflicts (add1 RR-conflicts)))
-                       action))
-                   grouped-table)))
-      (unless suppress
-        (when (> SR-conflicts 0)
-          (eprintf "~a shift/reduce conflict~a\n"
-                   SR-conflicts
-                   (if (= SR-conflicts 1) "" "s")))
-        (when (> RR-conflicts 0)
-          (eprintf "~a reduce/reduce conflict~a\n"
-                   RR-conflicts
-                   (if (= RR-conflicts 1) "" "s"))))
-      table))
-  
-
-  ;; resolve-sr-conflict : (listof action) (union int #f) -> (listof action)
-  ;; Resolves a single shift-reduce conflict, if precedences are in place.
-  (define (resolve-sr-conflict/prec actions shift-prec)
-    (let* ((shift (if (shift? (car actions))
-                     (car actions)
-                     (cadr actions)))
-           (reduce (if (shift? (car actions))
-                       (cadr actions)
-                       (car actions)))
-           (reduce-prec (prod-prec (reduce-prod reduce))))
-      (cond
-        ((and shift-prec reduce-prec)
-         (cond
-           ((< (prec-num shift-prec) (prec-num reduce-prec))
-            (list reduce))
-           ((> (prec-num shift-prec) (prec-num reduce-prec))
-            (list shift))
-           ((eq? 'left (prec-assoc shift-prec))
-            (list reduce))
-           ((eq? 'right (prec-assoc shift-prec))
-            (list shift))
-           (else null)))
-        (else actions))))
-    
-  
-  ;; resolve-prec-conflicts : parse-table -> grouped-parse-table
-  (define (resolve-prec-conflicts table)
-    (table-map
-     (lambda (gs actions)
-       (cond
-         ((and (term? gs)
-               (= 2 (length actions))
-               (or (shift? (car actions))
-                   (shift? (cadr actions))))
-          (resolve-sr-conflict/prec actions (term-prec gs)))
-         (else actions)))
-     (group-table table)))
-                        
-  ;; build-table: grammar string bool -> parse-table
-  (define (build-table g file suppress)
-    (let* ((a (build-lr0-automaton g))
-           (term-vector (list->vector (send g get-terms)))
-           (end-terms (send g get-end-terms))
-           (table (make-parse-table (send a get-num-states)))
-           (get-lookahead (compute-LA a g))
-           (reduce-cache (make-hash)))
-
-      (for-each
-       (lambda (trans-key/state)
-         (let ((from-state-index (kernel-index (trans-key-st (car trans-key/state))))
-               (gs (trans-key-gs (car trans-key/state)))
-               (to-state (cdr trans-key/state)))
-           (table-add! table from-state-index gs
-                       (cond
-                         ((non-term? gs)
-                          (make-goto (kernel-index to-state)))
-                         ((member gs end-terms)
-                          (make-accept))
-                         (else
-                          (make-shift 
-                           (kernel-index to-state)))))))
-       (send a get-transitions))
-
-      (send a for-each-state
-        (lambda (state)
-          (for-each
-           (lambda (item)
-             (let ((item-prod (item-prod item)))
-               (bit-vector-for-each 
-                (lambda (term-index)
-                  (unless (start-item? item)
-                    (let ((r (hash-ref reduce-cache item-prod
-                                             (lambda ()
-                                               (let ((r (make-reduce item-prod)))
-                                                 (hash-set! reduce-cache item-prod r)
-                                                 r)))))
-                      (table-add! table
-                                  (kernel-index state)
-                                  (vector-ref term-vector term-index)
-                                  r))))
-                (get-lookahead state item-prod))))
-           (append (hash-ref (send a get-epsilon-trans) state (lambda () null))
-                   (filter (lambda (item)
-                             (not (move-dot-right item)))
-                           (kernel-items state))))))
-      
-      (let ((grouped-table (resolve-prec-conflicts table)))
-        (unless (string=? file "")
-          (with-handlers [(exn:fail:filesystem?
-                           (lambda (e)
-                             (eprintf
-                              "Cannot write debug output to file \"~a\": ~a\n"
-                              file
-                              (exn-message e))))]
-            (call-with-output-file file
-              (lambda (port)
-                (display-parser a grouped-table (send g get-prods) port))
-              #:exists 'truncate)))
-        (resolve-conflicts grouped-table suppress))))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/yacc-helper.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/yacc-helper.rkt
deleted file mode 100644
index 31b3cc62ea..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/yacc-helper.rkt
+++ /dev/null
@@ -1,118 +0,0 @@
-(module yacc-helper mzscheme
-
-  (require mzlib/list
-           "../private-lex/token-syntax.rkt")
-
-  ;; General helper routines
-  
-  (provide duplicate-list? remove-duplicates overlap? vector-andmap display-yacc)
-  
-  (define (vector-andmap f v)
-    (let loop ((i 0))
-      (cond
-       ((= i (vector-length v)) #t)
-       (else (if (f (vector-ref v i))
-		 (loop (add1 i))
-		 #f)))))
-
-  ;; duplicate-list?: symbol list -> #f | symbol
-  ;; returns a symbol that exists twice in l, or false if no such symbol 
-  ;; exists
-  (define (duplicate-list? l)
-    (letrec ((t (make-hash-table))
-	     (dl? (lambda (l)
-		    (cond
-		     ((null? l) #f)
-		     ((hash-table-get t (car l) (lambda () #f)) => 
-		      (lambda (x) x))
-		     (else
-		      (hash-table-put! t (car l) (car l))
-		      (dl? (cdr l)))))))
-      (dl? l)))
-
-  ;; remove-duplicates: syntax-object list -> syntax-object list
-  ;; removes the duplicates from the lists
-  (define (remove-duplicates sl)
-    (let ((t (make-hash-table)))
-      (letrec ((x
-		(lambda (sl)
-		  (cond
-		   ((null? sl) sl)
-		   ((hash-table-get t (syntax-object->datum (car sl)) (lambda () #f))
-		    (x (cdr sl)))
-		   (else 
-		    (hash-table-put! t (syntax-object->datum (car sl)) #t)
-		    (cons (car sl) (x (cdr sl))))))))
-	(x sl))))
-
-  ;; overlap?: symbol list * symbol list -> #f | symbol
-  ;; Returns an symbol in l1 intersect l2, or #f is no such symbol exists
-  (define (overlap? l1 l2)
-    (let/ec ret
-      (let ((t (make-hash-table)))
-	(for-each (lambda (s1)
-		    (hash-table-put! t s1 s1))
-		  l1)
-	(for-each (lambda (s2)
-		    (cond 
-		     ((hash-table-get t s2 (lambda () #f)) =>
-		      (lambda (o) (ret o)))))
-		  l2)
-	#f)))
-
-  
-  (define (display-yacc grammar tokens start precs port)
-    (let-syntax ((p (syntax-rules ()
-                      ((_ args ...) (fprintf port args ...)))))
-      (let* ((tokens (map syntax-local-value tokens))
-             (eterms (filter e-terminals-def? tokens))
-             (terms (filter terminals-def? tokens))
-             (term-table (make-hash-table))
-             (display-rhs
-              (lambda (rhs)
-                (for-each (lambda (sym) (p "~a " (hash-table-get term-table sym (lambda () sym))))
-                          (car rhs))
-                (if (= 3 (length rhs))
-                    (p "%prec ~a" (cadadr rhs)))
-                (p "\n"))))
-        (for-each
-         (lambda (t)
-           (for-each
-            (lambda (t)
-              (hash-table-put! term-table t (format "'~a'" t)))
-            (syntax-object->datum (e-terminals-def-t t))))
-         eterms)
-        (for-each
-         (lambda (t)
-           (for-each
-            (lambda (t)
-              (p "%token ~a\n" t)
-              (hash-table-put! term-table t (format "~a" t)))
-            (syntax-object->datum (terminals-def-t t))))
-         terms)
-        (if precs
-            (for-each (lambda (prec)
-                        (p "%~a " (car prec))
-                        (for-each (lambda (tok)
-                                    (p " ~a" (hash-table-get term-table tok)))
-                                  (cdr prec))
-                        (p "\n"))
-                      precs))
-        (p "%start ~a\n" start)
-        (p "%%\n")
-
-        (for-each (lambda (prod)
-                    (let ((nt (car prod)))
-                      (p "~a: " nt)
-                      (display-rhs (cadr prod))
-                      (for-each (lambda (rhs)
-                                  (p "| ")
-                                  (display-rhs rhs))
-                                (cddr prod))
-                      (p ";\n")))
-          grammar)
-        (p "%%\n"))))
-  
-
-)  
-  
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/yacc-to-scheme.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/yacc-to-scheme.rkt
deleted file mode 100644
index 4fb9620f89..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/yacc-to-scheme.rkt
+++ /dev/null
@@ -1,135 +0,0 @@
-(module yacc-to-scheme mzscheme
-  (require parser-tools/lex
-           (prefix : parser-tools/lex-sre)
-           parser-tools/yacc
-           syntax/readerr
-           mzlib/list)
-  (provide trans)
-  
-  (define match-double-string
-    (lexer
-     ((:+ (:~ #\" #\\)) (append (string->list lexeme)
-                                (match-double-string input-port)))
-     ((:: #\\ any-char) (cons (string-ref lexeme 1) (match-double-string input-port)))
-     (#\" null)))
-
-   (define match-single-string
-    (lexer
-     ((:+ (:~ #\' #\\)) (append (string->list lexeme)
-                                (match-single-string input-port)))
-     ((:: #\\ any-char) (cons (string-ref lexeme 1) (match-single-string input-port)))
-     (#\' null)))
-  
-  (define-lex-abbrevs
-   (letter (:or (:/ "a" "z") (:/ "A" "Z")))
-   (digit (:/ "0" "9"))
-   (initial (:or letter (char-set "!$%&*/<=>?^_~@")))
-   (subsequent (:or initial digit (char-set "+-.@")))
-   (comment (:: "/*" (complement (:: any-string "*/" any-string)) "*/")))
-
-  (define-empty-tokens x
-    (EOF PIPE |:| SEMI |%%| %prec))
-  (define-tokens y
-    (SYM STRING))
-  
-  (define get-token-grammar
-    (lexer-src-pos
-     ("%%" '|%%|)
-     (":" (string->symbol lexeme))
-     ("%prec" (string->symbol lexeme))
-     (#\| 'PIPE)
-     ((:+ (:or #\newline #\tab " " comment (:: "{" (:* (:~ "}")) "}")))
-      (return-without-pos (get-token-grammar input-port)))
-     (#\; 'SEMI)
-     (#\' (token-STRING (string->symbol (list->string (match-single-string input-port)))))
-     (#\" (token-STRING (string->symbol (list->string (match-double-string input-port)))))
-     ((:: initial (:* subsequent)) (token-SYM (string->symbol lexeme)))))
-
-  (define (parse-grammar enter-term enter-empty-term enter-non-term)
-    (parser
-     (tokens x y)
-     (src-pos)
-     (error (lambda (tok-ok tok-name tok-value start-pos end-pos)
-	      (raise-read-error
-	       (format "Error Parsing YACC grammar at token: ~a with value: ~a" tok-name tok-value)
-	       (file-path)
-	       (position-line start-pos)
-	       (position-col start-pos)
-	       (position-offset start-pos)
-	       (- (position-offset end-pos) (position-offset start-pos)))))
-	       
-     (end |%%|)
-     (start gram)
-     (grammar
-      (gram 
-       ((production) (list $1))
-       ((production gram) (cons $1 $2)))
-      (production
-       ((SYM |:| prods SEMI) 
-        (begin
-          (enter-non-term $1)
-          (cons $1 $3))))
-      (prods
-       ((rhs) (list `(,$1 #f)))
-       ((rhs prec) (list `(,$1 ,$2 #f)))
-       ((rhs PIPE prods) (cons `(,$1 #f) $3))
-       ((rhs prec PIPE prods) (cons `(,$1 ,$2 #f) $4)))
-      (prec
-       ((%prec SYM)
-        (begin
-          (enter-term $2)
-          (list 'prec $2)))
-       ((%prec STRING)
-        (begin
-          (enter-empty-term $2)
-          (list 'prec $2))))
-      (rhs
-       (() null)
-       ((SYM rhs) 
-	(begin
-	  (enter-term $1)
-	  (cons $1 $2)))
-       ((STRING rhs) 
-	(begin
-	  (enter-empty-term $1)
-	  (cons $1 $2)))))))
-  
-  (define (symbol<? a b)
-    (string<? (symbol->string a) (symbol->string b)))
-  
-  (define (trans filename)
-    (let* ((i (open-input-file filename))
-           (terms (make-hash-table))
-           (eterms (make-hash-table))
-           (nterms (make-hash-table))
-           (enter-term
-            (lambda (s)
-              (if (not (hash-table-get nterms s (lambda () #f)))
-                  (hash-table-put! terms s #t))))
-           (enter-empty-term
-            (lambda (s)
-              (if (not (hash-table-get nterms s (lambda () #f)))
-                  (hash-table-put! eterms s #t))))
-           (enter-non-term
-            (lambda (s)
-	     (hash-table-remove! terms s)
-              (hash-table-remove! eterms s)
-              (hash-table-put! nterms s #t))))
-      (port-count-lines! i)
-      (file-path filename)
-      (regexp-match "%%" i)
-      (begin0
-       (let ((gram ((parse-grammar enter-term enter-empty-term enter-non-term)
-		    (lambda () 
-		      (let ((t (get-token-grammar i)))
-			t)))))
-          `(begin
-             (define-tokens t ,(sort (hash-table-map terms (lambda (k v) k)) symbol<?))
-             (define-empty-tokens et ,(sort (hash-table-map eterms (lambda (k v) k)) symbol<?))
-             (parser
-              (start ___)
-              (end ___)
-              (error ___)
-              (tokens t et)
-              (grammar ,@gram))))
-            (close-input-port i)))))
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/yacc.rkt b/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/yacc.rkt
deleted file mode 100644
index 6584fd3684..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/yacc.rkt
+++ /dev/null
@@ -1,396 +0,0 @@
-#lang scheme/base
-
-(require (for-syntax scheme/base
-                     "private-yacc/parser-builder.rkt"
-                     "private-yacc/grammar.rkt"
-                     "private-yacc/yacc-helper.rkt"
-                     "private-yacc/parser-actions.rkt"))
-(require "private-lex/token.rkt"
-         "private-yacc/parser-actions.rkt"
-         mzlib/etc
-         mzlib/pretty
-         syntax/readerr)
-
-(provide parser)
-
-
-  ;; convert-parse-table : (vectorof (listof (cons/c gram-sym? action?))) ->
-  ;;                       (vectorof (symbol runtime-action hashtable))
-  (define-for-syntax (convert-parse-table table)
-    (list->vector
-     (map
-      (lambda (state-entry)
-        (let ((ht (make-hasheq)))
-          (for-each
-           (lambda (gs/action)
-             (hash-set! ht
-                        (gram-sym-symbol (car gs/action))
-                        (action->runtime-action (cdr gs/action))))
-           state-entry)
-          ht))
-      (vector->list table))))
-  
-  (define-syntax (parser stx)
-    (syntax-case stx ()
-      ((_ args ...)
-       (let ((arg-list (syntax->list (syntax (args ...))))
-             (src-pos #f)
-             (debug #f)
-             (error #f)
-             (tokens #f)
-             (start #f)
-             (end #f)
-             (precs #f)
-             (suppress #f)
-             (grammar #f)
-             (yacc-output #f))
-         (for-each
-          (lambda (arg)
-            (syntax-case* arg (debug error tokens start end precs grammar
-                               suppress src-pos yacc-output)
-              (lambda (a b)
-                (eq? (syntax-e a) (syntax-e b)))
-              ((debug filename)
-               (cond
-                 ((not (string? (syntax-e (syntax filename))))
-                  (raise-syntax-error 
-                   #f
-                   "Debugging filename must be a string"
-                   stx
-                   (syntax filename)))
-                 (debug
-                  (raise-syntax-error #f "Multiple debug declarations" stx))
-                 (else
-                  (set! debug (syntax-e (syntax filename))))))
-              ((suppress)
-               (set! suppress #t))
-              ((src-pos)
-               (set! src-pos #t))
-              ((error expression)
-               (if error
-                   (raise-syntax-error #f "Multiple error declarations" stx)
-                   (set! error (syntax expression))))
-              ((tokens def ...)
-               (begin
-                 (when tokens
-                   (raise-syntax-error  #f "Multiple tokens declarations" stx))
-                 (let ((defs (syntax->list (syntax (def ...)))))
-                   (for-each 
-                    (lambda (d)
-                      (unless (identifier? d)
-                        (raise-syntax-error 
-                         #f 
-                         "Token-group name must be an identifier"
-                         stx
-                         d)))
-                    defs)
-                   (set! tokens defs))))
-              ((start symbol ...)
-               (let ((symbols (syntax->list (syntax (symbol ...)))))
-                 (for-each
-                  (lambda (sym)
-                    (unless (identifier? sym)
-                      (raise-syntax-error #f
-                                          "Start symbol must be a symbol"
-                                          stx
-                                          sym)))
-                  symbols)
-                 (when start
-                   (raise-syntax-error #f "Multiple start declarations" stx))
-                 (when (null? symbols)
-                   (raise-syntax-error #f
-                                       "Missing start symbol"
-                                       stx
-                                       arg))
-                 (set! start symbols)))
-              ((end symbols ...)
-               (let ((symbols (syntax->list (syntax (symbols ...)))))
-                 (for-each
-                  (lambda (sym)
-                    (unless (identifier? sym)
-                      (raise-syntax-error #f
-                                          "End token must be a symbol"
-                                          stx
-                                          sym)))
-                  symbols)
-                 (let ((d (duplicate-list? (map syntax-e symbols))))
-                   (when d
-                     (raise-syntax-error
-                      #f
-                      (format "Duplicate end token definition for ~a" d)
-                      stx
-                      arg))
-                   (when (null? symbols)
-                     (raise-syntax-error
-                      #f
-                      "end declaration must contain at least 1 token"
-                      stx
-                      arg))
-                   (when end
-                     (raise-syntax-error #f "Multiple end declarations" stx))
-                   (set! end symbols))))
-              ((precs decls ...)
-               (if precs
-                   (raise-syntax-error #f "Multiple precs declarations" stx)
-                   (set! precs (syntax/loc arg (decls ...)))))
-              ((grammar prods ...)
-               (if grammar
-                   (raise-syntax-error #f "Multiple grammar declarations" stx)
-                   (set! grammar (syntax/loc arg (prods ...)))))
-              ((yacc-output filename)
-               (cond
-                 ((not (string? (syntax-e (syntax filename))))
-                  (raise-syntax-error #f
-                                      "Yacc-output filename must be a string"
-                                      stx
-                                      (syntax filename)))
-                 (yacc-output
-                  (raise-syntax-error #f "Multiple yacc-output declarations" stx))
-                 (else
-                  (set! yacc-output (syntax-e (syntax filename))))))
-              (_ (raise-syntax-error #f "argument must match (debug filename), (error expression), (tokens def ...), (start non-term), (end tokens ...), (precs decls ...), or  (grammar prods ...)" stx arg))))
-          (syntax->list (syntax (args ...))))
-         (unless tokens
-           (raise-syntax-error #f "missing tokens declaration" stx))
-         (unless error
-           (raise-syntax-error #f "missing error declaration" stx))
-         (unless grammar
-           (raise-syntax-error #f "missing grammar declaration" stx))
-         (unless end
-           (raise-syntax-error #f "missing end declaration" stx))
-         (unless start
-           (raise-syntax-error #f "missing start declaration" stx))
-         (let-values (((table all-term-syms actions check-syntax-fix)
-                       (build-parser (if debug debug "")
-                                     src-pos
-                                     suppress
-                                     tokens
-                                     start
-                                     end
-                                     precs
-                                     grammar)))
-           (when (and yacc-output (not (string=? yacc-output "")))
-             (with-handlers [(exn:fail:filesystem?
-                              (lambda (e)
-                                (eprintf
-                                 "Cannot write yacc-output to file \"~a\"\n"
-                                 yacc-output)))]
-               (call-with-output-file yacc-output
-                 (lambda (port)
-                   (display-yacc (syntax->datum grammar) 
-                                 tokens 
-                                 (map syntax->datum start)
-                                 (if precs
-                                     (syntax->datum precs)
-                                     #f)
-                                 port))
-                 #:exists 'truncate)))
-           (with-syntax ((check-syntax-fix check-syntax-fix)
-                         (err error)
-                         (ends end)
-                         (starts start)
-                         (debug debug)
-                         (table (convert-parse-table table))
-                         (all-term-syms all-term-syms)
-                         (actions actions)
-                         (src-pos src-pos))
-             (syntax
-              (begin
-                check-syntax-fix
-                (parser-body debug err (quote starts) (quote ends) table all-term-syms actions src-pos)))))))
-      (_
-       (raise-syntax-error #f
-                           "parser must have the form (parser args ...)"
-                           stx))))
-  
-  (define (reduce-stack stack num ret-vals src-pos)
-    (cond
-      ((> num 0)
-       (let* ((top-frame (car stack))
-              (ret-vals
-               (if src-pos
-                   (cons (stack-frame-value top-frame)
-                         (cons (stack-frame-start-pos top-frame)
-                               (cons (stack-frame-end-pos top-frame)
-                                     ret-vals)))
-                   (cons (stack-frame-value top-frame) ret-vals))))
-         (reduce-stack (cdr stack) (sub1 num) ret-vals src-pos)))
-      (else (values stack ret-vals))))
-  
-  ;; extract-helper : (symbol or make-token) any any -> symbol any any any
-  (define (extract-helper tok v1 v2)
-    (cond
-      ((symbol? tok)
-       (values tok #f v1 v2))
-      ((token? tok)
-       (values (real-token-name tok) (real-token-value tok) v1 v2))
-      (else (raise-argument-error 'parser 
-                                  "(or/c symbol? token?)"
-                                  0 
-                                  tok))))
-
-  ;; well-formed-position-token?: any -> boolean
-  ;; Returns true if pt is a position token whose position-token-token
-  ;; is itself a token or a symbol.
-  ;; This is meant to help raise more precise error messages when
-  ;; a tokenizer produces an erroneous position-token wrapped twice.
-  ;; (as often happens when omitting return-without-pos).
-  (define (well-formed-position-token? pt)
-    (and (position-token? pt) 
-         (let ([t (position-token-token pt)])
-           (or (symbol? t)
-               (token? t)))))
-  
-  ;; extract-src-pos : position-token -> symbol any any any
-  (define (extract-src-pos ip)
-    (cond
-      ((well-formed-position-token? ip)
-       (extract-helper (position-token-token ip)
-                       (position-token-start-pos ip)
-                       (position-token-end-pos ip)))
-      (else
-       (raise-argument-error 'parser 
-                             "well-formed-position-token?"
-                             0
-                             ip))))
-  
-  ;; extract-no-src-pos : (symbol or make-token) -> symbol any any any
-  (define (extract-no-src-pos ip)
-    (extract-helper ip #f #f))
-  
-  (define-struct stack-frame (state value start-pos end-pos) #:inspector (make-inspector))
-  
-  (define (make-empty-stack i) (list (make-stack-frame i #f #f #f)))
-  
-  
-  ;; The table is a vector that maps each state to a hash-table that maps a
-  ;; terminal symbol to either an accept, shift, reduce, or goto structure.
-  ;  We encode the structures according to the runtime-action data definition in
-  ;; parser-actions.rkt
-  (define (parser-body debug? err starts ends table all-term-syms actions src-pos)
-    (local ((define extract
-              (if src-pos
-                  extract-src-pos
-                  extract-no-src-pos))
-            
-            (define (fix-error stack tok val start-pos end-pos get-token)
-              (when debug? (pretty-print stack))
-              (local ((define (remove-input tok val start-pos end-pos)
-                        (if (memq tok ends)
-                            (raise-read-error "parser: Cannot continue after error"
-                                              #f #f #f #f #f)
-                            (let ((a (find-action stack tok val start-pos end-pos)))
-                              (cond
-                                ((runtime-shift? a)
-                                 ;; (printf "shift:~a\n" (runtime-shift-state a))
-                                 (cons (make-stack-frame (runtime-shift-state a)
-                                                         val
-                                                         start-pos
-                                                         end-pos)
-                                       stack))
-                                (else
-                                 ;; (printf "discard input:~a\n" tok)
-                                 (let-values (((tok val start-pos end-pos)
-                                               (extract (get-token))))
-                                   (remove-input tok val start-pos end-pos))))))))
-                (let remove-states ()
-                  (let ((a (find-action stack 'error #f start-pos end-pos)))
-                    (cond
-                      ((runtime-shift? a)
-                       ;; (printf "shift:~a\n" (runtime-shift-state a))
-                       (set! stack 
-                             (cons
-                              (make-stack-frame (runtime-shift-state a) 
-                                                #f 
-                                                start-pos
-                                                end-pos)
-                              stack))
-                       (remove-input tok val start-pos end-pos))
-                      (else
-                       ;; (printf "discard state:~a\n" (car stack))
-                       (cond
-                         ((< (length stack) 2)
-                          (raise-read-error "parser: Cannot continue after error"
-                                            #f #f #f #f #f))
-                         (else
-                          (set! stack (cdr stack))
-                          (remove-states)))))))))
-            
-            (define (find-action stack tok val start-pos end-pos)
-              (unless (hash-ref all-term-syms
-                                tok
-                                #f)
-                (if src-pos
-                    (err #f tok val start-pos end-pos)
-                    (err #f tok val))
-                (raise-read-error (format "parser: got token of unknown type ~a" tok)
-                                  #f #f #f #f #f))
-              (hash-ref (vector-ref table (stack-frame-state (car stack)))
-                        tok
-                        #f))
-
-            (define (make-parser start-number)
-              (lambda (get-token)
-                (unless (and (procedure? get-token)
-                             (procedure-arity-includes? get-token 0))
-                  (error 'get-token "expected a nullary procedure, got ~e" get-token))
-                (let parsing-loop ((stack (make-empty-stack start-number))
-                                   (ip (get-token)))
-                  (let-values (((tok val start-pos end-pos)
-                                (extract ip)))
-                    (let ((action (find-action stack tok val start-pos end-pos)))
-                      (cond
-                        ((runtime-shift? action)
-                         ;; (printf "shift:~a\n" (runtime-shift-state action))
-                         (parsing-loop (cons (make-stack-frame (runtime-shift-state action)
-                                                               val
-                                                               start-pos
-                                                               end-pos)
-                                             stack)
-                                       (get-token)))
-                        ((runtime-reduce? action)
-                         ;; (printf "reduce:~a\n" (runtime-reduce-prod-num action))
-                         (let-values (((new-stack args)
-                                       (reduce-stack stack 
-                                                     (runtime-reduce-rhs-length action)
-                                                     null
-                                                     src-pos)))
-                           (let ((goto 
-                                  (runtime-goto-state
-                                   (hash-ref 
-                                    (vector-ref table (stack-frame-state (car new-stack)))
-                                    (runtime-reduce-lhs action)))))
-                             (parsing-loop 
-                              (cons
-                               (if src-pos
-                                   (make-stack-frame
-                                    goto 
-                                    (apply (vector-ref actions (runtime-reduce-prod-num action)) args)
-                                    (if (null? args) start-pos (cadr args))
-                                    (if (null? args) 
-                                        end-pos
-                                        (list-ref args (- (* (runtime-reduce-rhs-length action) 3) 1))))
-                                   (make-stack-frame
-                                    goto 
-                                    (apply (vector-ref actions (runtime-reduce-prod-num action)) args)
-                                    #f
-                                    #f))
-                               new-stack)
-                              ip))))
-                        ((runtime-accept? action)
-                         ;; (printf "accept\n")
-                         (stack-frame-value (car stack)))
-                        (else 
-                         (if src-pos
-                             (err #t tok val start-pos end-pos)
-                             (err #t tok val))
-                         (parsing-loop (fix-error stack tok val start-pos end-pos get-token)
-                                       (get-token))))))))))
-      (cond
-        ((null? (cdr starts)) (make-parser 0))
-        (else
-         (let loop ((l starts)
-                    (i 0))
-           (cond
-             ((null? l) null)
-             (else (cons (make-parser i) (loop (cdr l) (add1 i))))))))))
diff --git a/pkgs/parser-tools-pkgs/parser-tools/LICENSE.txt b/pkgs/parser-tools-pkgs/parser-tools/LICENSE.txt
deleted file mode 100644
index d012f58d6e..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-parser-tools
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/parser-tools-pkgs/parser-tools/info.rkt b/pkgs/parser-tools-pkgs/parser-tools/info.rkt
deleted file mode 100644
index db01829a66..0000000000
--- a/pkgs/parser-tools-pkgs/parser-tools/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("parser-tools-lib"
-               "parser-tools-doc"))
-(define implies '("parser-tools-lib"
-                  "parser-tools-doc"))
-
-(define pkg-desc "Lex- and Yacc-style parsing tools")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/pconvert-lib/LICENSE.txt b/pkgs/pconvert-lib/LICENSE.txt
deleted file mode 100644
index 20c476cc41..0000000000
--- a/pkgs/pconvert-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-pconvert-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/pconvert-lib/info.rkt b/pkgs/pconvert-lib/info.rkt
deleted file mode 100644
index 320fb655b9..0000000000
--- a/pkgs/pconvert-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-(define deps '("base"
-               "compatibility-lib")) ;; for mlist
-(define collection 'multi)
-
-(define pkg-desc "Legacy library for printing Racket values")
-
-(define pkg-authors '(robby))
diff --git a/pkgs/pconvert-lib/mzlib/pconvert-prop.rkt b/pkgs/pconvert-lib/mzlib/pconvert-prop.rkt
deleted file mode 100644
index 7d58556ad0..0000000000
--- a/pkgs/pconvert-lib/mzlib/pconvert-prop.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-
-(module pconvert-prop '#%kernel
-
-  (#%provide prop:print-convert-constructor-name
-             print-convert-named-constructor?
-             print-convert-constructor-name
-             prop:print-converter
-             print-converter?
-             print-converter-proc)
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; property recognized by print convert to set a value's constructor name:
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-  (define-values (prop:print-convert-constructor-name
-		  print-convert-named-constructor?
-		  print-convert-constructor-name)
-    (make-struct-type-property 'print-convert-constructor-name
-			       (lambda (s info)
-				 (if (symbol? s)
-                                     (void)
-                                     (raise-argument-error '|prop:print-convert-constructor-name guard|
-                                                           "symbol?"
-                                                           s))
-				 s)))
-
-  (define-values (prop:print-converter
-		  print-converter?
-		  print-converter-proc)
-    (make-struct-type-property 'print-converter
-			       (lambda (p info)
-                                 (if (if (procedure? p)
-                                         (procedure-arity-includes? p 2)
-                                         #f)
-                                     (void)
-                                     (raise-argument-error '|prop:print-converter|
-                                                           "(procedure-arity-includes/c 2)"
-                                                           p))
-				 p))))
diff --git a/pkgs/pconvert-lib/mzlib/pconvert.rkt b/pkgs/pconvert-lib/mzlib/pconvert.rkt
deleted file mode 100644
index 36340486f7..0000000000
--- a/pkgs/pconvert-lib/mzlib/pconvert.rkt
+++ /dev/null
@@ -1,589 +0,0 @@
-
-(module pconvert mzscheme
-  
-  (require (only racket/base sort)
-           compatibility/mlist
-	   "pconvert-prop.rkt"
-           racket/class
-           racket/undefined)
-  
-  (provide show-sharing
-           constructor-style-printing
-           quasi-read-style-printing
-           abbreviate-cons-as-list
-           whole/fractional-exact-numbers
-           booleans-as-true/false
-           named/undefined-handler
-           use-named/undefined-handler
-           add-make-prefix-to-constructor
-           
-           print-convert
-           print-convert-expr
-           build-share
-           get-shared
-           current-read-eval-convert-print-prompt 
-           install-converting-printer
-           
-           current-build-share-name-hook
-           current-build-share-hook
-           current-print-convert-hook)
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; the value stored in the hash table.  Contains the name
-  ;; <which is a number unless we are in donkey and it already has a name>
-  ;; and whether or not it is shared in the expr.
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  (define-struct share-info (name shared?))
-  
-  (define boolean-filter (lambda (x) (and x #t)))
-  
-  (define show-sharing (make-parameter #t boolean-filter))
-  (define constructor-style-printing (make-parameter #f boolean-filter))
-  (define quasi-read-style-printing (make-parameter #t boolean-filter))
-  (define abbreviate-cons-as-list (make-parameter #t boolean-filter))
-  (define whole/fractional-exact-numbers (make-parameter #f boolean-filter))
-  (define booleans-as-true/false (make-parameter #t boolean-filter))
-  (define use-named/undefined-handler (make-parameter (lambda (x) #f)))
-  (define named/undefined-handler (make-parameter (lambda (x) #f)))
-  (define add-make-prefix-to-constructor (make-parameter #f))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; share-hash is the hash-table containing info on what cons cells
-  ;; of the expression are shared.
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; sometimes you want to go ahead and start displaying a shared
-  ;; expression rather than just showing its name.  For instance, in
-  ;; the shared list, you want (shared ((-1- (list 1 2))... not
-  ;; (shared ((-1- -1-) ...
-  ;; expand-shared? controls this
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  (define-struct convert-share-info (share-hash expand-shared?))
-  
-  (define current-build-share-name-hook 
-    (make-parameter (let ([original-build-share-name-hook (lambda (e) #f)]) original-build-share-name-hook)
-                    (lambda (f)
-                      (unless (procedure-arity-includes? f 1)
-                        (raise-argument-error 'current-build-share-name-hook "(procedure-arity-includes/c 1)" f))
-                      f)))
-  (define current-build-share-hook 
-    (make-parameter (lambda (e base sub) (base e))
-                    (lambda (f)
-                      (unless (procedure-arity-includes? f 3)
-                        (raise-argument-error 'current-build-share-hook "(procedure-arity-includes/c 3)" f))
-                      f)))
-  (define current-print-convert-hook 
-    (make-parameter (lambda (e base sub) (base e))
-                    (lambda (f)
-                      (unless (procedure-arity-includes? f 3)
-                        (raise-argument-error 'current--hook "(procedure-arity-includes/c 3)" f))
-                      f)))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; builds the hash table
-  ;; --------- THIS PROCEDURE IS EXPORTED ----------
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  (define build-share
-    (lambda (expr)
-      (letrec
-          ([share-cnt 0]
-           [share-hash (make-hash-table)]
-           [csi (make-convert-share-info share-hash #f)]
-           [hash
-            (lambda (obj)
-              (let ([name ((current-build-share-name-hook) obj)])
-                (hash-table-put! share-hash obj
-                                 (make-share-info (if name (car name) share-cnt) #f)))
-              (set! share-cnt (add1 share-cnt)))]
-           [build-sub
-            (lambda (expr)
-              (let/ec k
-                (if (or (equal? expr "")
-                        (equal? expr #()))
-                    (k #f)
-                    (let ([val (hash-table-get share-hash expr 
-                                               (lambda ()
-                                                 (hash expr)
-                                                 (k #f)))])
-                      (when val
-                        (set-share-info-shared?! val #t))
-                      val))))]
-           [build
-            (lambda (expr)
-              ((current-build-share-hook)
-               expr
-               (lambda (expr)
-                 (cond
-                   [(print-converter? expr)
-                    (unless (build-sub expr)
-                      ((print-converter-proc expr) expr build))]
-                   [(or (number? expr)
-                        (symbol? expr)
-                        (boolean? expr)
-                        (char? expr) (void? expr)
-                        (null? expr)
-                        ;; #<undefined> test - yuck, and maybe not worth checking
-                        ;; anymore, since undefined generally shouldn't escape
-                        (eq? undefined expr) 
-                        )
-                    'atomic]
-                   [(and (not (struct? expr))  ;; struct names are the wrong thing, here
-                         (not (regexp? expr))
-                         (not (byte-regexp? expr))
-                         (not (procedure? expr))
-                         (not (promise? expr))
-                         (not (object? expr))
-                         (not (port? expr))
-                         (not (class? expr))
-                         (object-name expr))
-                    'atomic]
-                   [(box? expr) 
-                    (unless (build-sub expr)
-                      (build (unbox expr)))]
-                   [(hash-table? expr) 
-                    (unless (build-sub expr)
-                      (hash-table-for-each 
-                       expr
-                       (lambda (key value)
-                         (build key)
-                         (build value))))]
-                   [(pair? expr)  
-                    (unless (build-sub expr)
-                      (build (car expr))
-                      (build (cdr expr)))]
-                   [(mpair? expr)  
-                    (unless (build-sub expr)
-                      (build (mcar expr))
-                      (build (mcdr expr)))]
-                   [(vector? expr) 
-                    (unless (build-sub expr)
-                      (for-each build (vector->list expr)))]
-                   [(struct? expr)
-                    (unless (build-sub expr)
-                      (for-each build (vector->list (struct->vector expr))))]
-                   [else (build-sub expr)]))
-               build-sub))])
-        (build expr)
-        csi)))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; creates a distinctive symbol out of a name (usually just a number)
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  (define map-share-name
-    (lambda (name)
-      (string->symbol (format "-~s-" name))))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; prints an expression given that it has already been hashed. This
-  ;; does not include the list of shared items.
-  ;; --------- THIS PROCEDURE IS EXPORTED ----------
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  (define print-convert-expr
-    (lambda (csi expr unroll-once?)
-      (letrec
-          ([mpair-mode? (is-mpair-mode?)]
-           [share-hash (convert-share-info-share-hash csi)]
-           [find-hash
-            (lambda (expr)
-              (hash-table-get share-hash expr (lambda () #f)))]
-           [shared?
-            (lambda (expr)
-              (let* ([info (find-hash expr)]
-                     [ans (and info
-                               (share-info-shared? info))])
-                ans))]
-           
-           [make-list
-            (lambda (f n)
-              (letrec ([helper
-                        (lambda (n l)
-                          (cond [(zero? n) l]
-                                [else (helper (sub1 n) (cons (f n) l))]))])
-                (helper n null)))]
-           [make-lambda-helper
-            (lambda (arity)
-              (cond
-                [(arity-at-least? arity)
-                 (let ([v (arity-at-least-value arity)])
-                   (if (zero? v)
-                       'args
-                       (append (make-lambda-helper v) 'args)))]
-                [(list? arity)
-                 (map (lambda (x)
-                        (list (make-lambda-helper x) '...))
-                      arity)]
-                [else (make-list
-                       (lambda (x)
-                         (string->symbol
-                          (string-append "a" (number->string x))))
-                       arity)]))]
-           [use-quasi-quote? (not (constructor-style-printing))]
-           [use-read-syntax (quasi-read-style-printing)]
-           [doesnt-contain-shared-conses
-            (lambda (expr)
-              (cond
-               [(and (pair? expr)
-                     (shared? expr))
-                #f]
-               [(pair? expr)
-                (doesnt-contain-shared-conses (cdr expr))]
-               [else #t]))]
-           [doesnt-contain-shared-mconses
-            (lambda (expr)
-              (cond
-               [(and (mpair? expr)
-                     (shared? expr))
-                #f]
-               [(mpair? expr)
-                (doesnt-contain-shared-mconses (mcdr expr))]
-               [else #t]))]
-           [get-whole/frac
-            (lambda (exact-num)
-              (let ([split 
-                     (lambda (real)
-                       (let* ([num (numerator (abs real))]
-                              [den (denominator (abs real))]
-                              [sign (if (< real 0) - +)])
-                         (values (sign (quotient num den))
-                                 (sign (* (if (negative? num) -1 1)
-                                          (/ (modulo num den) den))))))])
-                (let-values ([(whole frac) (split (real-part exact-num))]
-                             [(whole-i frac-i) (split (imag-part exact-num))])
-                  (values whole frac whole-i frac-i))))]
-           [print
-            (lambda (in-quasiquote? first-time)
-              (lambda (expr)
-                (letrec
-                    ([lookup (find-hash expr)]
-                     [recur (print in-quasiquote? #f)]
-                     [self-quoting?
-                      (lambda (expr)
-                        (or (and (number? expr)
-                                 (or (inexact? expr)
-                                     (not (whole/fractional-exact-numbers))
-                                     (and (real? expr)
-                                          (or (let-values ([(whole frac whole-i frac-i) 
-                                                            (get-whole/frac expr)])
-                                                (and (or (zero? whole)
-                                                         (zero? frac))))))))
-                            (and (symbol? expr)
-                                 (not (eq? expr 'quasiquote))
-                                 (not (eq? expr 'unquote))
-                                 (not (eq? expr 'unquote-splicing)))
-                            (char? expr)
-                            (string? expr)
-                            (not expr)
-                            (eq? #t expr)))]
-                     [quasi-read-style
-                      (lambda ()
-                        (cond
-                          [(box? expr) (box (recur (unbox expr)))]
-                          [(vector? expr) (apply vector (map recur (vector->list expr)))]
-                          [else (quasi-style)]))]
-                     [quasi-style
-                      (lambda ()
-                        (cond
-                          [(null? expr) '()]
-                          [(pair? expr) 
-                           (cons (recur (car expr)) (recur (cdr expr)))]
-                          [(and mpair-mode?
-                                (mpair? expr))
-                           ;; generate pairs, which will be converted back to mpairs later
-                           (cons (recur (mcar expr)) (recur (mcdr expr)))]
-                          [(self-quoting? expr) expr]
-                          [else `(,'unquote ,((print #f first-time) expr))]))]
-                     
-                     [guard/quasiquote
-                      (lambda (f)
-                        (cond
-                          [use-quasi-quote?
-                           `(,'quasiquote ,(if use-read-syntax
-                                               ((print #t first-time) expr)
-                                               ((print #t first-time) expr)))]
-                          [else
-                           (f)]))]
-                     [constructor-style
-                      (let ([build-named
-                              (lambda (expr build-unnamed)
-                                (let ([answer (and (not (struct? expr))
-                                                   (object-name expr))])
-                                  (cond
-                                    [(not answer)
-                                     (build-unnamed)]
-                                    [(let/ec k
-				       (eq?
-					(namespace-variable-value
-					 answer
-					 #t
-                                         (lambda () (k #f)))
-					expr))
-                                     answer]
-                                    [((use-named/undefined-handler) expr)
-                                     ((named/undefined-handler) expr)]
-                                    [else
-                                     (build-unnamed)])))])
-                        (lambda ()
-                          ((current-print-convert-hook)
-                           expr
-                           (lambda (expr)
-                             (cond
-                               [(print-converter? expr)
-                                ((print-converter-proc expr) expr recur)]
-                               [(null? expr) (guard/quasiquote (lambda () 'empty))]
-                               [(and (abbreviate-cons-as-list)
-                                     (list? expr)
-                                     (or (and first-time
-                                              (doesnt-contain-shared-conses (cdr expr)))
-                                         (doesnt-contain-shared-conses expr)))
-                                (guard/quasiquote
-                                 (lambda ()
-                                   `(list ,@(map recur expr))))]
-                               [(pair? expr)
-                                (guard/quasiquote
-                                 (lambda ()
-                                   `(cons ,(recur (car expr)) ,(recur (cdr expr)))))]
-                               [(and mpair-mode?
-                                     (abbreviate-cons-as-list)
-                                     (mlist? expr)
-                                     (or (and first-time
-                                              (doesnt-contain-shared-mconses (mcdr expr)))
-                                         (doesnt-contain-shared-mconses expr)))
-                                (guard/quasiquote
-                                 (lambda ()
-                                   `(list ,@(map recur (mlist->list expr)))))]
-                               [(mpair? expr)
-                                (if mpair-mode?
-                                    (guard/quasiquote
-                                     (lambda ()
-                                       `(cons ,(recur (mcar expr)) ,(recur (mcdr expr)))))
-                                    `(mcons ,(recur (mcar expr)) ,(recur (mcdr expr))))]
-                               [(weak-box? expr) `(make-weak-box ,(recur (weak-box-value expr)))]
-                               [(box? expr)
-                                `(,(if (immutable? expr)
-                                       'box-immutable
-                                       'box)
-                                  ,(recur (unbox expr)))]
-                               [(hash-table? expr) 
-                                (let ([contents
-                                       (hash-table-map
-                                        expr
-                                        (lambda (k v)
-                                          `(cons ,(recur k) ,(recur v))))]
-                                      [constructor
-                                       (cond
-                                         [(hash-table? expr 'weak 'equal) 'make-weak-hash]
-                                         [(hash-table? expr 'equal) 'make-hash]
-                                         [(hash-table? expr 'weak 'eqv) 'make-weak-hasheqv]
-                                         [(hash-table? expr 'eqv) 'make-hasheqv]
-                                         [(hash-table? expr 'weak) 'make-weak-hasheq]
-                                         [(hash-table? expr) 'make-hasheq])])
-                                  (if (null? contents)
-                                      `(,constructor)
-                                      `(,constructor (list ,@contents))))]
-                               [(vector? expr) 
-                                `(,(if (immutable? expr)
-                                       'vector-immutable
-                                       'vector)
-                                  ,@(map recur (vector->list expr)))]
-                               [(symbol? expr) `',expr]
-                               [(keyword? expr) `',expr]
-                               [(string? expr) expr]
-                               [(primitive? expr) (object-name expr)]
-                               [(procedure? expr)
-                                (build-named
-                                 expr
-                                 (lambda ()
-                                   (let ([arity (procedure-arity expr)])
-                                     (if (list? arity)
-                                         `(case-lambda . ,(make-lambda-helper arity))
-                                         `(lambda ,(make-lambda-helper arity) ...)))))]
-                               [(regexp? expr) `(,(if (pregexp? expr) 'pregexp 'regexp)
-						 ,(or (object-name expr)
-						      '...))]
-                               [(byte-regexp? expr) `(,(if (byte-pregexp? expr) 'byte-pregexp 'byte-regexp)
-						      ,(or (object-name expr)
-							   '...))]
-                               [(module-path-index? expr) 
-                                (let-values ([(left right) (module-path-index-split expr)])
-                                  `(module-path-index-join ,(recur left) ,(recur right)))]
-                               [(interface? expr) `(interface ...)]
-                               [(class? expr) 
-                                (build-named 
-                                 expr
-                                 (lambda () '(class ...)))]
-                               [(object? expr) `(instantiate
-                                                    ,(build-named 
-                                                      (object-interface expr)
-                                                      (lambda () '(class ...)))
-                                                  ...)]
-                               [(void? expr) '(void)]
-                               [(promise? expr) '(delay ...)]
-                               [(and (number? expr) (exact? expr))
-                                (let-values ([(whole frac whole-i frac-i) (get-whole/frac expr)])
-                                  (cond
-                                    [(not (whole/fractional-exact-numbers)) expr]
-                                    [(and (or (zero? whole)
-                                              (zero? frac))
-                                          (zero? whole-i)
-                                          (zero? frac-i))
-                                     expr]
-                                    [(real? expr) `(+ ,whole ,frac)]
-                                    [(and (or (zero? whole) (zero? frac))
-                                          (or (zero? whole-i) (zero? frac-i)))
-                                     `(+ ,(real-part expr) (* +1i ,(imag-part expr)))]
-                                    [(or (zero? whole-i) (zero? frac-i))
-                                     `(+ (+ ,whole ,frac) (* +1i ,(imag-part expr)))]
-                                    [(or (zero? whole) (zero? frac))
-                                     `(+ ,(real-part expr) (* +1i (+ ,whole-i ,frac-i)))]
-                                    [else `(+ (+ ,whole ,frac) (* +1i (+ ,whole-i ,frac-i)))]))]
-                               [(eq? expr #f) (if (booleans-as-true/false) 'false #f)]
-                               [(eq? expr #t) (if (booleans-as-true/false) 'true #t)]
-                               
-                               [(and (input-port? expr)
-                                     (file-stream-port? expr)
-                                     (object-name expr))
-                                `(open-input-file ,(object-name expr))]
-                               [(and (output-port? expr)
-                                     (file-stream-port? expr)
-                                     (object-name expr))
-                                `(open-output-file ,(object-name expr))]
-                               [(port? expr) expr]
-                               
-                               ;; this case must be next to last, so that all of the
-                               ;; things with object-name's fall into the cases above first
-                               [(or (print-convert-named-constructor? expr)
-				    (object-name expr))
-                                (let ([constructor
-				       (if (print-convert-named-constructor? expr)
-					   (print-convert-constructor-name expr)
-					   (let ([name (object-name expr)])
-                                             (if (and (symbol? name)
-                                                      (not (add-make-prefix-to-constructor)))
-                                                 name
-                                                 (let ([str-name (if (string? name)
-                                                                     name
-                                                                     (symbol->string name))])
-                                                   (string->symbol (string-append "make-" str-name))))))])
-                                  `(,constructor
-                                    ,@(map (lambda (x) 
-                                             (if (eq? uniq x)
-                                                 '...
-                                                 (recur x)))
-                                           (cdr (vector->list (struct->vector expr uniq))))))]
-                               
-                               [else expr]))
-                           recur)))])
-                  (let ([es (convert-share-info-expand-shared? csi)])
-                    (set-convert-share-info-expand-shared?! csi #f)
-                    (if (and lookup
-                             (not es)
-                             (not first-time)
-                             (share-info-shared? lookup))
-                        (let ([name (map-share-name (share-info-name lookup))])
-                          (if in-quasiquote?
-                              `(,'unquote ,name)
-                              name))
-                        (if in-quasiquote?
-                            (if use-read-syntax
-                                (quasi-read-style)
-                                (quasi-style))
-                            (constructor-style)))))))])
-        ((print #f unroll-once?) expr))))
-
-  (define (is-mpair-mode?)
-    (not (print-mpair-curly-braces)))
-  
-  ;; type (improper-list a) = (union (cons (improper-list a) (improper-list a)) null a)
-  ;; improper-map : (a -> b) -> (improper-list a) -> (improper-list b)
-  (define (improper-map f x)
-    (cond
-      [(pair? x) (cons (f (car x)) (improper-map f (cdr x)))]
-      [(null? x) null]
-      [else (f x)]))
-  
-  (define uniq (gensym))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; these functions get the list of shared items.  If just-circular is
-  ;; true, then it will modify the hash table so that the only shared
-  ;; items are those that are circular.
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  (define get-shared-helper
-    (lambda (csi)
-      (let ([shared '()]
-            [share-hash (convert-share-info-share-hash csi)])
-        (hash-table-for-each share-hash
-                             (lambda (key val)
-                               (when (share-info-shared? val)
-                                 (set! shared (cons (list key val) shared)))))
-        (map (lambda (s)
-               (set-convert-share-info-expand-shared?! csi #t)
-               (let* ([info (cadr s)]
-                      [name (share-info-name info)])
-                 (list info
-                       (map-share-name name)
-                       (print-convert-expr csi (car s) #t))))
-             shared))))
-  
-  ;; --------- THIS PROCEDURE IS EXPORTED ----------
-  (define get-shared
-    (case-lambda
-      [(csi) (get-shared csi #f)]
-      [(csi just-circular)
-       (let ([shared-listss
-              (if just-circular
-                  (let ([shared (get-shared-helper csi)])
-                    (for-each (lambda (x)
-                                (unless (member* (cadr x) (caddr x))
-                                  (set-share-info-shared?! (car x) #f)))
-                              shared)
-                    (get-shared-helper csi))
-                  (get-shared-helper csi))]
-             [cmp (lambda (x y)
-                    (string<? (format "~s" (share-info-name (car x)))
-                              (format "~s" (share-info-name (car y)))))])
-         (map cdr (sort shared-listss cmp)))]))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; helper function for determining if an item is circular.  In the
-  ;; shared list: (shared ((-1- (list 1 2)) (-2- (list -2- 2 3)))), you
-  ;; can tell by doing a member* of the first item on the second. In this
-  ;; case, the second item in the shared list is circular because -2- appears
-  ;; in the value
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  (define member*
-    (lambda (a l)
-      (cond [(or (not (pair? l)) (null? l)) #f]
-            [(eq? a (car l)) #t]
-            [else (or (member* a (car l)) (member* a (cdr l)))])))
-  
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; takes an expression and completely converts it to show sharing
-  ;; (or if just-circular, just circularity) and special forms.
-  ;; --------- THIS PROCEDURE IS EXPORTED ----------
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  (define print-convert
-    (case-lambda
-      [(expr) (print-convert expr (not (show-sharing)))]
-      [(expr just-circ)
-       (let* ([csi (build-share expr)])
-         (let ([shared (get-shared csi just-circ)]
-               [body (print-convert-expr csi expr #f)])
-           (if (null? shared)
-               body
-               `(shared ,shared ,body))))]))
-  
-  (define current-read-eval-convert-print-prompt
-    (make-parameter "|- "))
-  
-  (define install-converting-printer
-    (lambda ()
-      (let ([print (current-print)])
-        (current-print (lambda (v)
-                         (unless (void? v)
-                           (print (print-convert v))))))
-      (print-as-expression #f)
-      (current-prompt-read (lambda ()
-                             (display (current-read-eval-convert-print-prompt))
-                             (read-syntax 'STDIN))))))
diff --git a/pkgs/pict-pkgs/pict-doc/LICENSE.txt b/pkgs/pict-pkgs/pict-doc/LICENSE.txt
deleted file mode 100644
index ae46431d16..0000000000
--- a/pkgs/pict-pkgs/pict-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-pict-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/pict-pkgs/pict-doc/info.rkt b/pkgs/pict-pkgs/pict-doc/info.rkt
deleted file mode 100644
index ba67cb0d65..0000000000
--- a/pkgs/pict-pkgs/pict-doc/info.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("mzscheme-doc"
-                     "draw-doc"
-                     "gui-doc"
-                     "slideshow-doc"
-                     "draw-lib"
-                     "gui-lib"
-                     "scribble-lib"
-                     "slideshow-lib"
-                     "pict-lib"
-                     "racket-doc"))
-(define deps '("base"))
-(define update-implies '("pict-lib"))
-
-(define pkg-desc "documentation part of \"pict\"")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/pict-pkgs/pict-doc/pict/info.rkt b/pkgs/pict-pkgs/pict-doc/pict/info.rkt
deleted file mode 100644
index 855051f686..0000000000
--- a/pkgs/pict-pkgs/pict-doc/pict/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define scribblings 
-  '(("scribblings/pict.scrbl" (multi-page) (gui-library 100))))
diff --git a/pkgs/pict-pkgs/pict-doc/pict/scribblings/anim.scrbl b/pkgs/pict-pkgs/pict-doc/pict/scribblings/anim.scrbl
deleted file mode 100644
index 6ca921c2c3..0000000000
--- a/pkgs/pict-pkgs/pict-doc/pict/scribblings/anim.scrbl
+++ /dev/null
@@ -1,157 +0,0 @@
-#lang scribble/doc
-
-@(require (for-label pict racket)
-          scribble/manual)
-
-@title{Animation Helpers}
-
-These functions are designed to work with the
-slide constructors in @racketmodname[slideshow/play].
-
-@declare-exporting[pict slideshow/play]
-
-@section{Pict Interoplations}
-
-@defproc[(fade-pict [n (real-in 0.0 1.0)] [p1 pict?] [p2 pict?]
-                    [#:combine combine (pict? pict? . -> . pict?) cc-superimpose])
-         pict?]{
-
-Interpolates @racket[p1] and @racket[p2], where the result with
-@racket[n] as @racket[0.0] is @racket[p1], and the result with
-@racket[n] as @racket[1.0] is @racket[p2]. For intermediate points,
-@racket[p1] fades out while @racket[p2] fades in as @racket[n] changes
-from @racket[0.0] to @racket[1.0]. At the same time, the width and
-height of the generated pict are intermediate between
-@racket[p1] and @racket[p2], and the relative baselines and last
-pict correspondingly morph within the bounding box.
-
-The @racket[combine] argument determines how @racket[p1] and
-@racket[p2] are aligned for morphing. For example, if @racket[p1] and
-@racket[p2] both contain multiple lines of text with the same line
-height but different number of lines, then using
-@racket[ctl-superimpose] would keep the ascent line in a fixed
-location relative to the top of the resulting pict as the rest of the
-shape morphs around it.}
-
-@defproc[(fade-around-pict [n (real-in 0.0 1.0)]
-                           [p1 pict?] 
-                           [make-p2 (pict? . -> . pict?)])
-         pict?]{
-
-Similar to @racket[fade-pict], but the target is not a fixed
-@racket[_p2], but instead a function @racket[make-p2] that takes a
-@racket[launder]ed @racket[ghost] of @racket[p1] and places it into a
-larger scene. Also, @racket[p1] does not fade out as @racket[n]
-increases; instead, @racket[p1] is placed wherever its ghost appears
-in the result of @racket[make-p2].
-
-For example,
-
-@RACKETBLOCK[
-(lambda (n)
-  (fade-around-pict n
-                    (code x)
-                    (lambda (g) (code (+ #,x 1)))))
-]
-
-animates the wrapping of @racket[x] with a @racket[(+ .... 1)] form.}
-
-@defproc[(slide-pict [base pict?]
-                     [p pict?]
-                     [p-from pict?]
-                     [p-to pict?]
-                     [n (real-in 0.0 1.0)])
-         pict?]{
-
-Pins @racket[p] onto @racket[base], sliding from @racket[p-from] to
-@racket[p-to] (which are picts within @racket[base]) as
-@racket[n] goes from @racket[0.0] to @racket[1.0]. The top-left
-locations of @racket[p-from] and @racket[p-to] determine the placement
-of the top-left of @racket[p].
-
-The @racket[p-from] and @racket[p-to] picts are typically
-@racket[launder]ed @racket[ghost]s of @racket[p] within @racket[base],
-but they can be any picts within @racket[base].}
-
-@defproc[(slide-pict/center [base pict?]
-                            [p pict?]
-                            [p-from pict?]
-                            [p-to pict?]
-                            [n (real-in 0.0 1.0)])
-         pict?]{
-
-  Like @racket[slide-pict], but aligns the center of @racket[p]
-  with @racket[p-from] and @racket[p-to].
-}
-
-@; --------------------------------------------------
-
-@section{Merging Animations}
-
-@defproc[(sequence-animations [gen (-> (real-in 0.0 1.0) pict?)]
-                              ...)
-         (-> (real-in 0.0 1.0) pict?)]{
-
-Converts a list of @racket[gen] functions into a single function that
-uses each @racket[gen] in sequence.}
-
-@defproc[(reverse-animations [gen (-> (real-in 0.0 1.0) pict?)]
-                             ...)
-         (-> (real-in 0.0 1.0) pict?)]{
-
-Converts a list of @racket[gen] functions into a single function that
-run @racket[(sequence-animations gen ...)] in reverse.}
-
-@; --------------------------------------------------
-
-@section{Stretching and Squashing Time}
-
-@deftogether[(
-@defproc[(fast-start [n (real-in 0.0 1.0)]) (real-in 0.0 1.0)]
-@defproc[(fast-end [n (real-in 0.0 1.0)]) (real-in 0.0 1.0)]
-@defproc[(fast-edges [n (real-in 0.0 1.0)]) (real-in 0.0 1.0)]
-@defproc[(fast-middle [n (real-in 0.0 1.0)]) (real-in 0.0 1.0)]
-)]{
-
-Monotonically but non-uniformly maps @racket[n] with fixed
-points at @racket[0.0] and @racket[1.0].
-
-The @racket[fast-start] mapping is convex, so that
-
-@racketblock[(slide-pict _base p _p1 _p2 (fast-start n))]
-
-appears to move quickly away from @racket[_p1] and then slowly as it
-approaches @racket[_p2], assuming that @racket[n] increases uniformly.
-
-The @racket[fast-end] mapping is concave, so that
-
-@racketblock[(slide-pict _base _p _p1 _p2 (fast-end _n))]
-
-appears to move slowly away from @racket[_p1] and then quicly as it
-approaches @racket[_p2], assuming that @racket[_n] increases uniformly.
-
-The @racket[fast-edges] mapping is convex at first and concave at the
-end, so that
-
-@racketblock[(slide-pict _base _p _p1 _p2 (fast-edges _n))]
-
-appears to move quickly away from @racket[_p1], then more slowly, and
-then quickly again near @racket[_p2], assuming that @racket[_n] increases
-uniformly.
-
-The @racket[fast-middle] mapping is concave at first and convex at the
-end, so that
-
-@racketblock[(slide-pict _base _p _p1 _p2 (fast-middle _n))]
-
-appears to move slowly away from @racket[_p1], then more quickly, and
-then slowly again near @racket[_p2], assuming that @racket[_n] increases
-uniformly.}
-
-@defproc[(split-phase [n (real-in 0.0 1.0)])
-         (values (real-in 0.0 1.0) (real-in 0.0 1.0))]{
-
-Splits the progression of @racket[n] from @racket[0.0] to @racket[1.0]
-into a progression from @racket[(values 0.0 0.0)] to @racket[(values
-1.0 0.0)] and then @racket[(values 1.0 0.0)] to @racket[(values 1.0
-1.0)].}
diff --git a/pkgs/pict-pkgs/pict-doc/pict/scribblings/code.scrbl b/pkgs/pict-pkgs/pict-doc/pict/scribblings/code.scrbl
deleted file mode 100644
index 1ffa3da159..0000000000
--- a/pkgs/pict-pkgs/pict-doc/pict/scribblings/code.scrbl
+++ /dev/null
@@ -1,394 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          (for-label (except-in racket only drop)
-                     pict/code
-                     pict
-                     racket/gui/base))
-
-@(define stx-obj
-  (tech #:doc '(lib "scribblings/reference/reference.scrbl") "syntax object"))
-
-@(define ss-eval (make-base-eval))
-@(interaction-eval #:eval ss-eval 
-  (begin
-   (require pict/code
-            pict
-            (for-syntax racket/base))
-   (current-code-tt (lambda (s) (text s "monospace" 14)))
-   (define-code code typeset-code)))
-
-@title{Typesetting Racket Code}
-
-@defmodule[pict/code]{This library is re-provided by
-                      @racketmodname[slideshow/code], but
-                      initializes @racket[get-current-code-font-size].}
-
-@defproc[(typeset-code [stx syntax?]) pict?]{
-
-Produces a pict for code in the given @|stx-obj|. The
-source-location information of the syntax object determines the line
-breaks, line indenting, and space within a row.  Empty rows are
-ignored. 
-
-Beware that if you use @racket[read-syntax] on a file port, you may
-have to turn on line counting via @racket[port-count-lines!] for the
-code to typeset properly. Also beware that when a source file
-containing a @racket[syntax] or @racket[quote-syntax] form is
-compiled, source location information is omitted from the compiled
-@|stx-obj|.
-
-Normally, @racket[typeset-code] is used through the @racket[code]
-syntactic form, which works properly with compilation, and that
-escapes to pict-producing code via @racket[unsyntax]. See also
-@racket[define-code].
-
-Embedded picts within @racket[stx] are used directly. Row elements are
-combined using and operator like @racket[htl-append], so use
-@racket[code-align] (see below) as necessary to add an ascent to
-ascentless picts. More precisely, creation of a line of code uses
-@racket[pict-last] to determine the end point of the element most
-recently added to a line; the main effect is that closing parentheses
-are attached in the right place when a multi-line pict is embedded in
-@racket[stx].
-
-An identifier that starts with @litchar{_} is italicized in the pict,
-and the @litchar{_} is dropped, unless the
-@racket[code-italic-underscore-enabled] parameter is set to
-@racket[#f]. Also, unless @racket[code-scripts-enabled] is set to
-@racket[#f], @litchar{_} and @litchar{^} in the middle of a word
-create superscripts and subscripts, respectively (like TeX); for
-example @racketidfont{foo^4_ok} is displayed as the identifier
-@racketidfont{foo} with a @racketidfont{4} superscript and an
-@racketidfont{ok} subscript.
-
-Further, uses of certain identifiers in @racket[stx] typeset
-specially:
-
-@itemize[
-
- @item{@as-index{@racketidfont{code:blank}} --- produces a space.}
-
- @item{@racket[(#,(as-index (racketidfont "code:comment")) _s ...)]
- --- produces a comment block, with each @racket[_s] on its own line,
- where each @racket[_s] must be a string or a pict.}
-
- @item{@racket[(#,(as-index (racketidfont "code:line")) _datum ...)]
- --- typesets the @racket[_datum] sequence, which is mostly useful for
- the top-level sequence, since @racket[typeset-code] accepts only one
- argument.}
-
- @item{@racket[(#,(as-index (racketidfont "code:contract")) _datum
- ...)]  --- like @racketidfont{code:line}, but every @racket[_datum]
- is colored as a comment, and a @litchar{;} is prefixed to every line.}
-
- @item{@racket[(#,(as-index (racketidfont "code:template")) _datum
- ...)]  --- like @racketidfont{code:line}, but a @litchar{;} is
- prefixed to every line.}
-
- @item{@racketidfont{$} --- typesets as a vertical bar (for no
- particularly good reason).}
-
-]}
-
-
-@defform[(code datum ...)]{
-
-The macro form of @racket[typeset-code]. Within a @racket[datum],
-@racket[unsyntax] can be used to escape to an expression, and
-identifiers bound as syntax to @tech{code transformer}s trigger
-transformations.
-
-For more information, see @racket[typeset-code] and
-@racket[define-code], since @racket[code] is defined as
-
-@racketblock[
-(define-code code typeset-code)
-]
-
-@defexamples[#:eval ss-eval #:escape potato
-  (code (+ 1 2))
-  (code (+ 1 #,(+ 1 1)))
-  (code (+ 1 #,(frame (code 2))))
-  (define-syntax two (make-code-transformer #'(code 2)))
-  (code (+ 1 two))
-]}
-
-
-@defparam[current-code-font style text-style/c]{
-
-Parameter for a base font used to typeset text. The default is
-@racket[`(bold . modern)]. For even more control, see
-@racket[current-code-tt].}
-
-
-@defparam[current-code-tt proc (string? . -> . pict?)]{
-
-Parameter for a one-argument procedure to turn a
-  string into a pict, used to typeset text. The default is
-
-@racketblock[
-(lambda (s) (text s (current-code-font) ((get-current-code-font-size))))
-]
-
-This procedure is not used to typeset subscripts or other items that
-require font changes, where @racket[current-code-font] is used
-directly.}
-
-
-@defparam[get-current-code-font-size proc (-> exact-nonnegative-integer?)]{
-
-A parameter used to access the default font size. The
-@racketmodname[slideshow/code] library initializes this parameter to
-@racket[current-font-size].}
-
-
-@defparam[current-code-line-sep amt real?]{
-
-A parameter that determines the spacing between lines of typeset code.
-The default is @racket[2].}
-
-
-@defparam[current-comment-color color (or/c string? (is-a?/c color%))]{
-
-A parameter for the color of comments.}
-
-
-@defparam[current-keyword-color color (or/c string? (is-a?/c color%))]{
-
-A parameter for the color of syntactic-form names. See
-@racket[current-keyword-list].}
-
-
-@defparam[current-id-color color (or/c string? (is-a?/c color%))]{
-
-A parameter for the color of identifiers that are not syntactic form
-names or constants.}
-
-
-@defparam[current-literal-color color (or/c string? (is-a?/c color%))]{
-
-A parameter for the color of literal values, such as strings and
-numbers.  See also @racket[current-literal-list]}
-
-
-@defparam[current-const-color color (or/c string? (is-a?/c color%))]{
-
-A parameter for the color of constant names. See
-@racket[current-const-list].}
-
-
-@defparam[current-base-color color (or/c string? (is-a?/c color%))]{
-
-A parameter for the color of everything else.}
-
-
-@defparam[current-reader-forms syms (listof symbol?)]{
-
-Parameter for a list of symbols indicating which built-in reader forms
-should be used. The default is @racket['(quote quasiquote unquote
-unquote-splicing syntax quasisyntax unsyntax unsyntax-splicing)].
-Remove a symbol to suppress the corresponding reader output.}
-
-
-@defproc[(code-align [pict pict?]) pict?]{
-
-Adjusts the ascent of @racket[pict] so that its bottom aligns with the
-baseline for text; use this function when @racket[pict] has no
-ascent.}
-
-
-@defparam[current-keyword-list names (listof string?)]{
-
-A list of strings to color as syntactic-form names. The default
-includes all of the forms provided by @racketmodname[racket/base] 
-and all of the forms provided by @racketmodname[mzscheme].}
-
-
-@defparam[current-const-list names (listof string?)]{
-
-A list of strings to color as constant names. The default is
-@racket[null].}
-
-
-@defparam[current-literal-list names (listof string?)]{
-
-A list of strings to color as literals, in addition to literals such
-as strings. The default is @racket[null].}
-
-@defthing[racket/base-const-list (listof string?)]{
-
-A list of strings that could be used to initialize the
-@racket[current-const-list] parameter.}
-
-@defthing[mzscheme-const-list (listof string?)]{
-
-A list of strings that could be used to initialize the
-@racket[current-const-list] parameter.}
-
-@defboolparam[code-colorize-enabled on?]{
-
-A parameter to enable or disable all code coloring. The default is
-@racket[#t].}
-
-
-@defboolparam[code-colorize-quote-enabled on?]{
-
-A parameter to control whether under a @racket[quote] is colorized as
-a literal (as in this documentation). The default is @racket[#t].}
-
-
-@defboolparam[code-italic-underscore-enabled on?]{
-
-A parameter to control whether @litchar{_}-prefixed identifiers are
-italicized (dropping the @litchar{_}). The default is @racket[#t].}
-
-@defboolparam[code-scripts-enabled on?]{
-
-A parameter to control whether TeX-style subscripts and subscripts are
-recognized in an identifier.}
-
-@defform*[[(define-code code-id typeset-code-id) 
-           (define-code code-id typeset-code-id escape-id)]]{
-
-Defines @racket[code-id] as a macro that uses
-@racket[typeset-code-id], which is a function with the same input as
-@racket[typeset-code]. The @racket[escape-id] form defaults to
-@racket[unsyntax].
-
-The resulting @racket[code-id] syntactic form takes a sequence of
-@racket[_datum]s:
-
-@racketblock[
-(code-id _datum ...)
-]
-
-It produces a pict that typesets the sequence. Source-location
-information for the @racket[_datum] determines the layout of code in
-the resulting pict. The @racket[code-id] is expanded in such a way
-that source location is preserved during compilation (so
-@racket[typeset-code-id] receives a syntax object with source
-locations intact).
-
-If a @racket[_datum] contains @racket[(escape-id _expr)]---perhaps as
-@RACKET[#,_expr] when @racket[escape-id] is @racket[unsyntax]---then
-the @racket[_expr] is evaluated and the result datum is spliced in
-place of the @racket[escape-id] form in @racket[_datum]. If the result
-is not a syntax object, it is given the source location of the
-@racket[escape-id] form. A pict value intected this way as a
-@racket[_datum] is rendered as itself.
-
-If a @racket[_datum] contains @racket[(transform-id _datum ...)] or
-@racket[transform-id] for a @racket[transform-id] that is bound as syntax to a
-@tech{code transformer}, then the @racket[(transform-id _datum ...)]
-or @racket[transform-id] may be replaced with an escaped expression,
-depending on the @tech{code transformer}'s result.}
-
-@deftogether[(
-@defproc[(make-code-transformer [proc-or-stx (or/c (syntax? . -> . (or/c syntax? #f))
-                                                   syntax?)])
-         code-transformer?]
-@defthing[prop:code-transformer struct-type-property?]
-@defproc[(code-transformer? [v any/c]) boolean?]
-)]{
-
-Exported @racket[for-syntax] for creating @deftech{code transformers}.
-
-For @tech{code transformer} created with
-@racket[(make-code-transformer _proc)], @racket[proc] takes a syntax
-object representing the use of an identifier bound to the transformer,
-and it produces an expression whose value replaces the identifier use
-within a @racket[code] form or a form defined via
-@racket[define-code].  Like a macro transformer, a code transformer is
-triggered either by a use of the bound identifier in an
-``application'' position, in which case the transformer receives the
-entire ``application'' form, or the identifier by itself can also
-trigger the transformer. The @tech{code transformer}'s @racket[_proc]
-can return @racket[#f], in which case the use of the identifier is
-left untransformed; if the identifier was used in an ``application''
-position, the transformer @racket[_proc] will be called again for the
-identifier use by itself.
-
-A @tech{code transformer} produced by @racket[(make-code-transformer _stx)]
-is equivalent to 
-
-@racketblock[
-(make-code-transformer (lambda (use-stx) 
-                         (if (identifier? use-stx)
-                             _stx
-                             #f)))
-]
-
-A structure type with the @racket[prop:code-transformer] property
-implements a @tech{code transformer}. The property value must be a
-procedure of one argument, which receives the structure and returns a
-procedure that is like a @racket[_proc] passed to
-@racket[make-code-transformer], except that the property value takes
-the structure instance as an argument before the syntax object to
-transform.
-
-The @racket[code-transformer?] predicate returns @racket[#t] for a
-value produced by @racket[make-code-transformer] or for an instance of
-a structure type with the @racket[prop:code-transformer] property,
-@racket[#f] otherwise.
-
-@examples[
-#:eval ss-eval
-(let-syntax ([bag (make-code-transformer #'(code hat))]
-             [copy (make-code-transformer (syntax-rules ()
-                                           [(_ c) (code (* 2 c))]))])
-  (inset (frame (code ((copy cat) in the bag))) 2))
-]}
-
-
-@defform[(define-exec-code (pict-id runnable-id string-id)
-           datum ...)]{
-
-Binds @racket[pict-id] to the result of @racket[(code datum ...)],
-except that if an identifier @racketidfont{_} appears anywhere in a
-@racket[datum], then the identifier and the following expression are
-not included for @racket[code].
-
-Meanwhile, @racket[runnable-id] is bound to a @|stx-obj| that wraps
-the @racket[datum]s in a @racket[begin]. In this case,
-@racketidfont{_}s are removed from the @racket[datum]s, but not the
-following expression. Thus, an @racketidfont{_} identifier is used to
-comment out an expression from the pict, but have it present in the
-@|stx-obj| for evaluation.
-
-The @racket[string-id] is bound to a string representation of the code
-that is in the pict. This string is useful for copying to the
-clipboard with @racket[(send the-clipboard set-clipboard-string
-string-id 0)].}
-
-
-@defform[(define-exec-code/scale scale-expr (pict-id runnable-id string-id)
-           datum ...)]{
-
-Like @racket[define-exec-code], but with a scale to use via
-@racket[scale/improve-new-text] when generating the pict.}
-
-
-@deftogether[(
-@defthing[comment-color (or/c string? (is-a?/c color%))]
-@defthing[keyword-color (or/c string? (is-a?/c color%))]
-@defthing[id-color (or/c string? (is-a?/c color%))]
-@defthing[literal-color (or/c string? (is-a?/c color%))]
-)]{
-
-For backward compatibility, the default values for
-@racket[current-comment-color], etc.}
-
-@defproc[(code-pict-bottom-line-pict [pict pict?])
-         (or/c pict? #f)]{
-
-The same as @racket[pict-last], provided for backward compatibility.}
-
-@defproc[(pict->code-pict [pict pict?] [bl-pict (or/c pict? #f)]) pict?]{
-
-Mainly for backward compatibility: returns @racket[(if bl-pict
-(use-last pict (or (pict-last bl-pict) bl-pict)))].}
-
-@; ----------------------------------------
-
-@(close-eval ss-eval)
diff --git a/pkgs/pict-pkgs/pict-doc/pict/scribblings/more.scrbl b/pkgs/pict-pkgs/pict-doc/pict/scribblings/more.scrbl
deleted file mode 100644
index 1572d5f97a..0000000000
--- a/pkgs/pict-pkgs/pict-doc/pict/scribblings/more.scrbl
+++ /dev/null
@@ -1,431 +0,0 @@
-#lang scribble/doc
-@(require "pict-diagram.rkt"
-          scribble/eval scribble/manual
-          pict/face pict
-          (for-label racket/gui 
-                     slideshow/base slideshow/code
-                     pict/flash pict/face pict/balloon
-                     (except-in racket only drop)
-                     pict
-                     pict/convert))
-
-
-@(define ss-eval (make-base-eval))
-@(ss-eval '(require pict racket/math racket/class racket/draw
-                    racket/list pict/balloon pict/flash))
-
-@title{More Pict Constructors}
-
-
-@section{Dingbats}
-
-@defproc[(cloud [w real?]
-                [h real?] 
-                [color (or/c string? (is-a?/c color%)) "gray"])
-         pict?]{
-
-Creates a fluffy cloud.
-
-@examples[#:eval ss-eval
-  (cloud 100 75)
-  (cloud 100 75 "lavenderblush")
-]}
-
-@defproc[(file-icon [w real?]
-                    [h real?] 
-                    [color (or/c string? (is-a?/c color%) any/c)]
-                    [shaded? any/c #f])
-         pict?]{
-
-Creates a Mac-like file icon, optionally shaded. If @racket[color] is
-not a string or @racket[color%] object, it is treated as a boolean, in
-which case true means @racket["gray"] and false means
-@racket["white"].
-
-@examples[#:eval ss-eval
-  (file-icon 50 60 "bisque")
-  (file-icon 50 60 "honeydew" #t)
-]}
-
-@defproc[(standard-fish [w real?]
-                        [h real?] 
-                        [#:direction direction (or/c 'left 'right) 'left] 
-                        [#:color color (or/c string? (is-a?/c color%)) "blue"] 
-                        [#:eye-color eye-color (or/c string? (is-a?/c color%) #f) "black"]
-                        [#:open-mouth open-mouth (or/c boolean? real?) #f])
-         pict?]{
-
-Creates a fish swimming either @racket['left] or @racket['right].
-If @racket[eye-color] is @racket[#f], no eye is drawn.
-
-The @racket[open-mouth] argument can be either @racket[#f] (mouth
-closed), @racket[#t] (mouth fully open), or a number: @racket[0.0] is
-closed, @racket[1.0] is fully open, and numbers in between are
-partially open.
-
-@examples[#:eval ss-eval
-  (standard-fish 100 50)
-  (standard-fish 100 50 #:direction 'right #:color "chocolate")
-  (standard-fish 100 50 #:eye-color "saddlebrown" #:color "salmon")
-  (standard-fish 100 50 #:open-mouth #t #:color "olive")
-]}
-
-@defproc[(jack-o-lantern [size real?]
-                         [pumpkin-color (or/c string? (is-a?/c color%)) "orange"] 
-                         [face-color (or/c string? (is-a?/c color%)) "black"])
-         pict?]{
-
-Creates a jack-o-lantern; use the same pumpkin and face color to get a
-plain pumpkin. The @racket[size] determines the width.
-
-@examples[#:eval ss-eval
-  (jack-o-lantern 100)
-  (jack-o-lantern 100 "cadet blue" "khaki")
-]}
-
-@defproc[(angel-wing [w real?]
-                     [h real?] 
-                     [left? any/c])
-         pict?]{
-
-Creates an angel wing, left or right, or any size.  The color and pen
-width for drawing the wing outline is the current one.
-
-@examples[#:eval ss-eval
-  (angel-wing 100 40 #f)
-  (angel-wing 100 40 #t)
-]}
-
-@defproc[(desktop-machine [scale real?]
-                          [style (listof symbol?) null])
-         pict?]{
-
-Produces a picture of ancient desktop computer. The @racket[scale]
-argument scales the size relative to the base size of 120 by 115. 
-
-The @racket[style] can include any of the following:
-
-@itemlist[
-
- @item{@racket['plt] --- include a Racket logo on the machine's screen}
-
- @item{@racket['binary] --- put 1s and 0s on the machine's screen}
-
- @item{@racket['devil] --- like @racket['binary], and also give the machine 
-                           horns and a tail}
-
-]
-
-@examples[#:eval ss-eval
-  (desktop-machine 1)
-  (desktop-machine 1 '(devil plt))
-  (desktop-machine 1 '(plt binary))
-]}
-               
-@defproc[(thermometer [#:height-% height-% (between/c 0 1) 1]
-                      [#:color-% color-% (between/c 0 1) height-%]
-                      [#:ticks ticks non-exact-negative-integer? 4]
-                      [#:start-color start-color (or/c string? (is-a?/c color%)) "lightblue"]
-                      [#:end-color end-color (or/c string? (is-a?/c color%)) "lightcoral"]
-                      [#:top-circle-diameter top-circle-diameter positive-real? 40]
-                      [#:bottom-circle-diameter bottom-circle-diameter positive-real? 80]
-                      [#:stem-height stem-height positive-real? 180]
-                      [#:mercury-inset mercury-inset positive-real? 8])
-         pict?]{
-  Produces a thermometer that consists of a semi-circle on top of a rectangle on
-  top of a circle. The sizes of the three components are controlled via the
-  @racket[top-circle-diameter], @racket[stem-height], and @racket[bottom-circle-diameter]
-  arguments. 
-  
-  The mercury is drawn the same way, but by creating the three components inset from the
-  versions that draw the boundary of the thermometer. This inset is conrolled by the
-  @racket[mercury-inset] argument.
-  
-  The height of the mercury in the thermometer is controlled by the @racket[height-%] argument.
-  Its color is interpolated between the @racket[start-color] and @racket[end-color], as 
-  determined by the @racket[color-%] argument. 
-  
-  Finally, some number of ticks are drawn, basd on the @racket[ticks] argument.
-  
-@examples[#:eval ss-eval
-  (thermometer #:stem-height 90
-               #:bottom-circle-diameter 40
-               #:top-circle-diameter 20
-               #:mercury-inset 4)
-]}
-
-@; ----------------------------------------
-
-@section{Balloon Annotations}
-
-@defmodule[pict/balloon]{The @racketmodname[pict/balloon]
-library provides functions for creating and placing cartoon-speech
-balloons.}
-
-@defproc[(wrap-balloon [pict pict?]
-                       [spike (or/c 'n 's 'e 'w 'ne 'se 'sw 'nw)]
-                       [dx real?]
-                       [dy real?]
-                       [color (or/c string? (is-a?/c color%)) balloon-color]
-                       [corner-radius (and/c real? (not/c negative?)) 32])
-         balloon?]{
-
-Superimposes @racket[pict] on top of a balloon that wraps it.
-
-The @racket[spike] argument indicates the corner from which a spike
-protrudes from the balloon (i.e., the spike that points to whatever
-the balloon is about). For example, @racket['n] means ``north,'',
-which is a spike in the top middle of the balloon.
-
-The @racket[dx] and @racket[dy] arguments specify how far the spike
-should protrude.  For a @racket['w] spike, @racket[dx] should be
-negative, etc.
-
-The @racket[color] argument is the background color for the balloon.
-
-The @racket[corner-radius] argument determines the radius of the cicle
-used to roun the balloon's corners. As usual, if it is less than
-@racket[1], then it acts as a ratio of the balloon's width or height.
-
-The result is a balloon, not a pict. The @racket[balloon-pict]
-function extracts a pict whose @tech{bounding box} does not include the
-spike, but includes the rest of the image, and the
-@racket[balloon-point-x] and @racket[balloon-point-y] functions
-extract the location of the spike point. More typically, the
-@racket[pin-balloon] function is used to add a balloon to a pict.}
-
-@defproc[(pip-wrap-balloon [pict pict?]
-                           [spike (or/c 'n 's 'e 'w 'ne 'se 'sw 'nw)]
-                           [dx real?]
-                           [dy real?]
-                           [color (or/c string? (is-a?/c color%)) balloon-color]
-                           [corner-radius (and/c real? (not/c negative?)) 32])
-         pict?]{
-
-Like @racket[wrap-balloon], but produces a zero-sized pict suitable
-for use with @racket[pin-over].}
-
-
-@defproc*[([(pin-balloon [balloon balloon?]
-                         [base pict?]
-                         [x real?]
-                         [y real?])
-            pict?]
-           [(pin-balloon [balloon balloon?]
-                         [base pict?]
-                         [at-pict pict-path?]
-                         [find (pict? pict-path? . -> . (values real? real?))])
-            pict?])]{
-
-Superimposes the pict in @racket[balloon] onto @racket[base] to
-produce a new pict. The balloon is positioned so that its spike points
-to the location specified by either @racket[x] and @racket[y]
-(numbers) or at the position determined by combining @racket[base] and
-@racket[at-pict] with @racket[find]. The @racket[find] function uses
-its arguments like @racket[lt-find].
-
-The resulting pict has the same @tech{bounding box}, descent, and ascent as
-@racket[base], even if the balloon extends beyond the bounding box.
-
-@examples[#:eval ss-eval
-  (define a-pict (standard-fish 70 40))
-  (pin-balloon (balloon 40 30 5 'se 5 5)
-               (cc-superimpose (blank 300 150) a-pict)
-               a-pict
-               lc-find)
-  (pin-balloon (wrap-balloon (text "Hello!") 'sw -5 3)
-               (cc-superimpose (blank 300 150) a-pict)
-               a-pict
-               rt-find)
-]}
-
-
-@defproc[(balloon [w real?]
-                  [h real?]
-                  [corner-radius (and/c real? (not/c negative?))]
-                  [spike (or/c 'n 's 'e 'w 'ne 'se 'sw 'nw)]
-                  [dx real?]
-                  [dy real?]
-                  [color (or/c string? (is-a?/c color%)) balloon-color])
-         balloon?]{
-
-Creates a balloon, much like @racket[wrap-balloon] except that the balloon's
-width is @racket[w] and its height is @racket[h].}
-
-@defproc*[([(balloon? [v any/c]) boolean?]
-           [(make-balloon [pict pict?] [x real?] [y real?]) balloon?]
-           [(balloon-pict [balloon balloon?]) pict?]
-           [(balloon-point-x [balloon balloon?]) real?]
-           [(balloon-point-y [balloon balloon?]) real?])]{
-
-A balloon encapsulates a pict and the position of the balloon's spike
-relative to the balloon's top-left corner.}
-
-@defthing[balloon-color (or/c string? (is-a?/c color%))]
-
-The default background color for a balloon.
-
-@defboolparam[balloon-enable-3d on?]{
-
-A parameter that determines whether balloons are drawn with 3-D shading.}
-
-@; ----------------------------------------
-
-@section{Face}
-
-@defmodule[pict/face]{The @racketmodname[pict/face] library
-provides functions for a kind of @as-index{Mr. Potatohead}-style face
-library.}
-
-@defthing[default-face-color (or/c string (is-a?/c color%))]{
-
-Orange.}
-
-@; helper for the next defproc
-@(define (small-face mood) (scale (face mood) 0.25))
-
-@defproc[(face [mood symbol?]
-               [color (or/c string (is-a?/c color%)) default-face-color])
-         pict?]{
-
-Returns a pict for a pre-configured face with the given base
-color. The built-in configurations, selected by mood-symbol, are as
-follows:
-
-@tabular[#:sep @hspace[2]
-  (list (list @para{@racket['unhappy] --- @racket[(face* 'none 'plain #t default-face-color 6)]}
-              @(small-face 'unhappy))
-        (list @para{@racket['sortof-unhappy] --- @racket[(face* 'worried 'grimace #t default-face-color 6)]}
-              @(small-face 'sortof-unhappy))
-        (list @para{@racket['sortof-happy] --- @racket[(face* 'worried 'medium #f default-face-color 6)]}
-                    @(small-face 'sortof-happy))
-        (list @para{@racket['happy] --- @racket[(face* 'none 'plain #f default-face-color 6)]}
-                    @(small-face 'happy))
-        (list @para{@racket['happier] --- @racket[(face* 'none 'large #f default-face-color 3)]}
-                    @(small-face 'happier))
-        (list @para{@racket['embarrassed] --- @racket[(face* 'worried 'medium #f default-face-color 3)]}
-                    @(small-face 'embarrassed))
-        (list @para{@racket['badly-embarrassed] --- @racket[(face* 'worried 'medium #t default-face-color 3)]}
-                    @(small-face 'badly-embarrassed))
-        (list @para{@racket['unhappier] --- @racket[(face* 'normal 'large #t default-face-color 3)]}
-                    @(small-face 'unhappier))
-        (list @para{@racket['happiest] --- @racket[(face* 'normal 'huge #f default-face-color 0 -3)]}
-                    @(small-face 'happiest))
-        (list @para{@racket['unhappiest] --- @racket[(face* 'normal 'huge #t default-face-color 0 -3)]}
-                    @(small-face 'unhappiest))
-        (list @para{@racket['mad] --- @racket[(face* 'angry 'grimace #t default-face-color 0)]}
-                    @(small-face 'mad))
-        (list @para{@racket['mean] --- @racket[(face* 'angry 'narrow #f default-face-color 0)]}
-                    @(small-face 'mean))
-        (list @para{@racket['surprised] --- @racket[(face* 'worried 'oh #t default-face-color -4 -3 2)]}
-                    @(small-face 'surprised)))
-]}
-
-@defproc[(face* [eyebrow-kind (or/c 'none 'normal 'worried 'angry)]
-                [mouth-kind (or/c 'plain 'smaller 'narrow 'medium 'large 
-                                  'huge 'grimace 'oh 'tongue)]
-                [frown? any/c]
-                [color (or/c string (is-a?/c color%))]
-                [eye-inset real?]
-                [eyebrow-dy real?]
-                [pupil-dx real?]
-                [pupil-dy real?]
-                [#:eyebrow-shading? eyebrow-on? any/c #t]
-                [#:mouth-shading? mouth-on? any/c #t]
-                [#:eye-shading? eye-on? any/c #t]
-                [#:tongue-shading? tongue-on? any/c #t]
-                [#:face-background-shading? face-bg-on? any/c #t]
-                [#:teeth? teeth-on? any/c #t])
-         pict?]{
-
-Returns a pict for a face:
-
-@itemize[
-
- @item{@racket[eyebrow-kind] determines the eyebrow shape.}
-
- @item{@racket[mouth-kind] determines the mouth shape, combined with
-       @racket[frown?].}
-
- @item{@racket[frown?] determines whether the mouth is up or down.}
-
- @item{@racket[color] determines the face color.}
-
- @item{@racket[eye-inset] adjusts the eye size; recommend values are
-       between 0 and 10.}
-
- @item{@racket[eyebrow-dy] adjusts the eyebrows; recommend values:
-       between -5 and 5.}
-
- @item{@racket[pupil-dx] adjusts the pupil; recommend values are
-       between -10 and 10.}
-
- @item{@racket[pupil-dy] adjusts the pupil; recommend values are
-       between -15 and 15.}
-
-]
-
-The @racket[#:eyebrow-shading?] through
-@racket[#:face-background-shading?] arguments control whether a
-shading is used for on a particular feature in the face (shading tends
-to look worse than just anti-aliasing when the face is small). The
-@racket[#:teeth?] argument controls the visibility of the teeth for
-some mouth shapes.}
-
-@; ----------------------------------------
-
-@section{Flash}
-
-@defmodule[pict/flash]
-
-@defproc[(filled-flash [width real?]
-                       [height real?]
-                       [n-points exact-positive-integer? 10]
-                       [spike-fraction (real-in 0 1) 0.25]
-                       [rotation real? 0])
-         pict?]{
-
-Returns a pict for a ``flash'': a spiky oval, like the yellow
-background that goes behind a ``new!'' logo on web pages or a box of
-cereal.
-  
-The @racket[height] and @racket[width] arguments determine the size of
-the oval in which the flash is drawn, prior to rotation. The actual
-height and width may be smaller if @racket[points] is not a multiple
-of 4, and the actual height and width will be different if the flash
-is rotated.
-
-The @racket[n-points] argument determines the number of points on the
-flash.
-
-The @racket[spike-fraction] argument determines how big the flash
-spikes are compared to the bounding oval.
-
-The @racket[rotation] argument specifies an angle in radians for
-counter-clockwise rotation.
-
-The flash is drawn in the default color.
-
-@examples[#:eval ss-eval
-  (filled-flash 100 50)
-  (filled-flash 100 50 8 0.25 (/ pi 2))
-]}
-
-@defproc[(outline-flash [width real?]
-                        [height real?]
-                        [n-points exact-positive-integer? 10]
-                        [spike-fraction (real-in 0 1) 0.25]
-                        [rotation real? 0])
-         pict?]{
-
-Like @racket[filled-flash], but drawing only the outline.
-
-@examples[#:eval ss-eval
-  (outline-flash 100 50)
-  (outline-flash 100 50 8 0.25 (/ pi 2))
-]}
-
-@include-section["code.scrbl"]
-               
-@(close-eval ss-eval)
-
diff --git a/pkgs/pict-pkgs/pict-doc/pict/scribblings/pict-diagram.rkt b/pkgs/pict-pkgs/pict-doc/pict/scribblings/pict-diagram.rkt
deleted file mode 100644
index 4101fc4a74..0000000000
--- a/pkgs/pict-pkgs/pict-doc/pict/scribblings/pict-diagram.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang racket/base
-(require pict
-         racket/class
-         racket/draw)
-
-(provide pict-diagram)
-
-(define pict-diagram
-  (parameterize ([dc-for-text-size (make-object bitmap-dc%
-                                                (make-bitmap 1 1))])
-    (let ([t (lambda (s)
-               (text s `(italic . roman) 12))])
-      (let ([top
-             (hc-append (vline 0 10)
-                        (hline 30 0)
-                        (inset (t "w") 1 0)
-                        (hline 30 0)
-                        (vline 0 10))]
-            [right
-             (vc-append (hline 10 0)
-                        (vline 0 25)
-                        (inset (t "h") 0 1)
-                        (vline 0 25)
-                        (hline 10 0))])
-        (inset
-         (vl-append
-          2
-          top
-          (hc-append
-           2
-           (frame (let* ([line (hline (pict-width top) 0 #:segment 5)]
-                         [top-line (launder line)]
-                         [bottom-line (launder line)]
-                         [top-edge (launder (ghost line))]
-                         [bottom-edge (launder (ghost line))]
-                         [p (vc-append
-                             (/ (pict-height right) 4)
-                             top-edge
-                             top-line
-                             (blank)
-                             bottom-line
-                             bottom-edge)]
-                         [p (pin-arrows-line
-                             4 p
-                             top-edge ct-find 
-                             top-line ct-find)]
-                         [p (pin-arrows-line
-                             4 p
-                             bottom-edge ct-find 
-                             bottom-line ct-find)]
-                         [a (t "a")]
-                         [p (let-values ([(dx dy) (ct-find p top-line)])
-                              (pin-over p (+ dx 5) (/ (- dy (pict-height a)) 2) a))]
-                         [d (t "d")]
-                         [p (let-values ([(dx dy) (ct-find p bottom-line)])
-                              (pin-over p 
-                                        (+ dx 5) 
-                                        (+ dy (/ (- (- (pict-height p) dy) (pict-height d)) 2))
-                                        d))])
-                    p))
-           right))
-         1)))))
-
diff --git a/pkgs/pict-pkgs/pict-doc/pict/scribblings/pict.scrbl b/pkgs/pict-pkgs/pict-doc/pict/scribblings/pict.scrbl
deleted file mode 100644
index 871d584d42..0000000000
--- a/pkgs/pict-pkgs/pict-doc/pict/scribblings/pict.scrbl
+++ /dev/null
@@ -1,1158 +0,0 @@
-#lang scribble/doc
-@(require "pict-diagram.rkt"
-          scribble/eval scribble/manual
-          pict/face pict
-          (for-label racket/gui 
-                     slideshow/base slideshow/code
-                     pict/flash pict/face pict/balloon
-                     (except-in racket only drop)
-                     pict
-                     pict/convert))
-
-
-@(define ss-eval (make-base-eval))
-@(ss-eval '(require pict racket/math racket/class racket/draw
-                    racket/list pict/balloon pict/flash))
-
-@title[#:style 'toc]{Pict: Functional Pictures}
-
-@declare-exporting[pict]
-
-@defmodule*/no-declare[(pict)]{ The
-@racketmodname[pict] library is one of the standard Racket
-functional picture libraries (the other being @racketmodname[2htdp/image #:indirect]).
-This library was original designed for use with 
-@seclink[#:doc '(lib "scribblings/slideshow/slideshow.scrbl") "top"]{Slideshow},
-and is re-provided by the @racketmodname[slideshow] language.}
-
-@local-table-of-contents[]
-
-@; ------------------------------------------------------------------------
-
-@section{Pict Datatype}
-
-A @deftech{pict} is a @racket[pict] structure representing an image.
-Some functions, such as
-@racket[hline], create new simple picts. Other functions, such as
-@racket[ht-append], build new picts out of existing picts. In the
-latter case, the embedded picts retain their identity, so that
-offset-finding functions, such as @racket[lt-find], can find the
-offset of an embedded pict in a larger pict.
-
-In addition to its drawing part, a pict has the following
-@deftech{bounding box} structure:
-
-@centerline[pict-diagram]
-
-That is, the bounding box has a width @math{w} and a height
-@math{h}. For a single text line, @math{d} is descent below the
-baseline, and @math{a+d=h}. For multiple text lines (often created
-with a function like @racket[vc-append]), @math{a} is the ascent of
-the top line, and @math{d} is the descent of the bottom line, so
-@math{a+d<h}. Many picts have @math{d=0} and @math{a=h}.
-
-In addition, a pict can have a @defterm{last} sub-pict that
-corresponds to the last item on the last line of text, so that extra
-lines can be added to the last line. In particular, the @defterm{last}
-element is useful for adding closing parentheses to a block of Racket
-code, where the last line of code not the longest line in the block.
-
-The size information for a pict is computed when the pict is
-created. This strategy supports programs that create new picts though
-arbitrarily complex computations on the size and shape of existing
-picts. The functions @racket[pict-width], @racket[pict-height],
-@racket[pict-descent], and @racket[pict-ascent] extract bounding box
-information from a pict.
-
-A pict is a convertible datatype through the
-@racketmodname[file/convertible] protocol. Supported conversions
-include @racket['png-bytes], @racket['eps-bytes], @racket['pdf-bytes],
-@racket['svg-bytes], and variants such as @racket['png-bytes+bounds]
-and @racket['png-bytes+bounds8].
-
-A pict is serializable via @racketmodname[racket/serialize], but
-serialization loses sub-pict information (preserving only the pict's
-drawing and bounding box).
-
-@history[#:changed "1.2" @elem{Added support for
-                               @racket['png-bytes+bounds],
-                               @racket['png-bytes+bounds8] and similar
-                               variants.}
-         #:changed "1.3" @elem{Enabled serialization.}]
-
-
-@defstruct[pict ([draw any/c]
-                 [width real?]
-                 [height real?]
-                 [ascent real?]
-                 [descent real?]
-                 [children (listof child?)]
-                 [panbox (or/c #f any/c)]
-                 [last (or/c #f pict-path?)])]{
-
-A @racket[pict] structure is normally not created directly with
-@racket[make-pict]. Instead, functions like @racket[text],
-@racket[hline], and @racket[dc] are used to construct a pict.
-
-The @racket[draw] field contains the pict's drawing information in an
-internal format. Roughly, the drawing information is a procedure that
-takes a @racket[dc<%>] drawing context and an offset for the pict's
-top-left corner (i.e., it's @tech{bounding box}'s top left corner relative to
-the @racket[dc<%>] origin). The state of the @racket[dc<%>] is
-intended to affect the pict's drawing; for example, the pen and brush
-will be set for a suitable default drawing mode, and the
-@racket[dc<%>] scale will be set to scale the resulting image. Use
-@racket[draw-pict] (as opposed to @racket[pict-draw]) to draw the
-picture.
-
-The @racket[panbox] field is internal and initialized to @racket[#f].
-
-The @racket[last] field indicates a pict within the @racket[children]
-list (transitively) that can be treated as the last element of the
-last line in the pict. A @racket[#f] value means that the pict is its
-own last sub-pict.}
-
-
-@defstruct[child ([pict pict?]
-                  [dx real?]
-                  [dy real?]
-                  [sx real?]
-                  [sy real?]
-                  [sxy real?]
-                  [syx real?])]{
-
-Records, for a pict constructed of other picts, the transformation to
-arrive at a @tech{inverted point} in the composed pict from an
-@tech{inverted point} in a constituent pict's. An @deftech{inverted
-point} is a point relative to a pict's lower-left corner with an
-increasing value moving upward.
-
-A @racket[child] structure is normally not created directly with
-@racket[make-child]. Instead, functions like @racket[hc-append] create
-@racket[child] structures when combining picts to create a new one.}
-
-@; ------------------------------------------------------------------------
-
-@section{Basic Pict Constructors}
-
-@defproc[(dc [draw (-> (is-a?/c dc<%>) real? real? any)]
-             [w real?]
-             [h real?]
-             [a real? h]
-             [d real? 0])
-         pict?]{
-
-Creates an arbitrary self-rendering pict.  The arguments to the
-rendering procedure will be a drawing context and top-left location for
-drawing.
-
-The @racket[w], @racket[h], @racket[a], and @racket[d] arguments 
-determine the width, height, ascent, and descent of the
-of the resulting pict's @tech{bounding box} respectively.
-
-When the rendering procedure is called, the current pen and brush will
-be @racket['solid] and in the pict's color and @racket[linewidth], and the scale and
-offset of the drawing context will be set. The text mode will be transparent, but
-the font and text colors are not guaranteed to be anything in
-particular.
-
-@examples[#:eval ss-eval
-  (dc (λ (dc dx dy)
-        (define old-brush (send dc get-brush))
-        (define old-pen (send dc get-pen))
-        (send dc set-brush
-          (new brush% [style 'fdiagonal-hatch]
-                      [color "darkslategray"]))
-        (send dc set-pen
-          (new pen% [width 3] [color "slategray"]))
-        (define path (new dc-path%))
-        (send path move-to 0 0)
-        (send path line-to 50 0)
-        (send path line-to 25 50)
-        (send path close)
-        (send dc draw-path path dx dy)
-        (send dc set-brush old-brush)
-        (send dc set-pen old-pen))
-    50 50)]
-
-The @racket[draw] is called during the dynamic extent of
-the call to @racket[dc] as part of the contract checking.
-
-Specifically, the pre-condition portion of the contract
-for @racket[dc] concocts a @racket[dc<%>] object with a 
-random initial state, calls the @racket[draw] argument 
-with that @racket[dc<%>] and then checks to make sure that 
-@racket[draw] the state of the  @racket[dc<%>] object
-is the same as it was before @racket[draw] was called.
-
-@examples[#:eval 
-          ss-eval
-          (dc (λ (dc dx dy)
-                (send dc set-brush "red" 'solid)
-                (send dc set-pen "black" 1 'transparent)
-                (send dc draw-ellipse dx dy 50 50))
-              50 50)]
-
-@history[#:changed "1.3" @list{The @racket[draw] argument is 
-                               now called by the @racket[#:pre] 
-                               condition of @racket[dc].}]
-}
-
-@defproc*[([(blank [size real? 0]) pict?]
-           [(blank [w real?] [h real?]) pict?]
-           [(blank [w real?] [a real?] [d real?]) pict?]
-           [(blank [w real?] [h real?] [a real?] [d real?]) pict?])]{
-
-Creates a pict that draws nothing. The one-argument case supplies a
-value used for both the width and height of the resulting pict's
-@tech{bounding box}. In the one- and two-argument
-case, the ascent and descent are @math{0} for the resulting pict's
-bounding box; in the three-argument case, the height is computed by
-adding the given ascent and descent.
-
-@examples[#:eval ss-eval
-  (blank 50)
-]}
-
-
-@defproc[(text [content string?]
-               [style text-style/c null]
-               [size (integer-in 1 1024) 12]
-               [angle real? 0])
-         pict?]{
-
-Creates a pict that draws text. For creating text picts within a slide
-presentation, see @racket[t]. The size of the resulting pict may
-depend on the value of @racket[dc-for-text-size].
-
-The @racket[style] argument must be one of the following:
-
-@itemize[
-
- @item{@racket[null] --- the default, same as @racket['default]}
-
- @item{a @racket[font%] object}
-
- @item{a font family symbol, such a @racket['roman] (see @racket[font%])}
-
- @item{a font face string, such as @racket["Helvetica"] (see @racket[font%])}
-
- @item{@racket[(cons _str _sym)] combining a face string and a font
-       family (in case the face is unavailable; see @racket[font%])}
-
- @item{@racket[(cons 'bold style)] for a valid @racket[style]}
-
- @item{@racket[(cons 'italic style)]}
- @item{@racket[(cons 'subscript style)]}
- @item{@racket[(cons 'superscript style)]}
- @item{@racket[(cons 'caps style)]}
-
- @item{@racket[(cons 'combine style)] --- allows kerning and ligatures
-      (the default, unless the @racket['modern] family is specified)}
-
- @item{@racket[(cons 'no-combine style)] --- renders characters individually}
-
- @item{@racket[(cons 'aligned style)] --- enables hinting, which
-       rounds metrics to integers}
-
- @item{@racket[(cons 'unaligned style)] --- disables hinting (which is
-       the default), so that metrics are scalable}
-
- @item{@racket[(cons _color style)] --- where @racket[_color] is a @racket[color%] object,
-       @racket[colorize]s the text}
-
-]
-
-If both @racket['combine] and @racket['no-combine] are specified, the
-first one in @racket[style] takes precedence. Similarly, if both
-@racket['aligned] and @racket['unaligned] are specified, the first one
-in @racket[style] takes precedence. If @racket['caps] is specified,
-the @racket[angle] must be zero.
-
-The given @racket[size] is in pixels, but it is ignored if a
-@racket[font%] object is provided in the text-style.
-
-The @racket[angle] is in radians, and positive values rotate
-counter-clockwise. For a non-zero @racket[angle], the resulting
-pict's @tech{bounding box} covers the rotated text, and the descent is zero
-and the ascent is the height.
-
-@examples[#:eval ss-eval
-  (text "tom collins")
-  (text "g & t" (cons 'bold 'roman))
-  (text "martini" null 13 (/ pi 2))
-]}
-
-
-@defproc*[([(hline [w real?] [h real?]
-                   [#:segment seg-length (or/c #f real?) #f]) pict?]
-           [(vline [w real?] [h real?]
-                   [#:segment seg-length (or/c #f real?) #f]) pict?])]{
-
-Straight lines, centered within their @tech{bounding box}es.
-
-@examples[#:eval ss-eval
-  (hline 40 5)
-  (vline 5 40 #:segment 5)
-]}
-
-
-@defproc[(frame [pict pict?]
-                [#:segment seg-length (or/c #f real?) #f]
-                [#:color color (or/c #f string? (is-a?/c color<%>)) #f]
-                [#:line-width width (or/c #f real?) #f])
-          pict?]{
-
-Frames a given pict. If the color or line width are provided, the
-override settings supplied by the context.
-
-@examples[#:eval ss-eval
-  (frame (circle 30))
-  (frame (circle 30) #:segment 5)
-  (frame (circle 30) #:color "chartreuse" #:line-width 3)
-]}
-
-@defproc*[([(ellipse [w real?] [h real?]) pict?]
-           [(circle [diameter real?]) pict?]
-           [(filled-ellipse [w real?] [h real?] [#:draw-border? draw-border? any/c #t]) pict?]
-           [(disk [diameter (and/c rational? (not/c negative?))]
-                  [#:draw-border? draw-border? any/c #t]) pict?])]{
-
-Unfilled and filled ellipses.
-
-If @racket[draw-border?] is @racket[#f], then the pen is set to be transparent
-before drawing the ellipse.
-
-@examples[#:eval ss-eval
-  (ellipse 40 30)
-  (circle 30)
-  (filled-ellipse 30 40)
-  (disk 30)
-]}
-
-@defproc*[([(rectangle [w real?] [h real?]) pict?]
-           [(filled-rectangle [w real?]
-                              [h real?]
-                              [#:draw-border? draw-border? any/c #t])
-            pict?])]{
-
-Unfilled and filled rectangles.
-
-If @racket[draw-border?] is @racket[#f], then the pen is set to be transparent
-before drawing the rectangle.
-
-@examples[#:eval ss-eval
-  (rectangle 50 50)
-  (filled-rectangle 50 80)
-]}
-
-@defproc*[([(rounded-rectangle [w real?] [h real?] 
-                               [corner-radius real? -0.25]
-                               [#:angle angle real? 0])
-            pict?]
-           [(filled-rounded-rectangle [w real?] [h real?]
-                                      [corner-radius real? -0.25]
-                                      [#:angle angle real? 0] 
-                                      [#:draw-border? draw-border? any/c #t])
-            pict?])]{
-
-Unfilled and filled rectangles with rounded corners.  The
-@racket[corner-radius] is used to determine how much
-rounding occurs in the corners. If it is a positive number,
-then it determines the radius of a circle touching the edges
-in each corner, and the rounding of the rectangle follow the
-edge of those circles. If it is a negative number, then the
-radius of the circles in the corners is the absolute value of the
-@racket[corner-radius] times the smaller of @racket[width]
-and @racket[height].
-
-The @racket[angle] determines how much the rectangle is
-rotated, in radians.
-
-If @racket[draw-border?] is @racket[#f], then the pen is set to be transparent
-before drawing the rectangle.
-
-@examples[#:eval ss-eval
-  (rounded-rectangle 40 40 -0.3 #:angle (/ pi 4))
-  (filled-rounded-rectangle 50 40)
-]}
-
-@defproc[(bitmap [img (or/c path-string?
-                            (is-a?/c bitmap%)
-                            (is-a?/c image-snip%))])
-         pict]{
-
-A pict that display a bitmap. When a path is provided, the image is
-loaded with the @racket['unknown/mask] flag, which means that a mask
-bitmap is generated if the file contains a mask.
-
-If the bitmap cannot be loaded, if the given @racket[bitmap%] object
-is not valid, or if the @racket[bitmap-draft-mode] parameter is set to
-@racket[#t], the result pict draws the word ``bitmap failed''.}
-
-
-@defproc*[([(arrow [size real?] [radians real?]) pict?]
-           [(arrowhead [size real?] [radians real?]) pict?])]{
-
-Creates an arrow or arrowhead in the specific direction within a
-@racket[size] by @racket[size] pict. Points on the arrow may extend
-slightly beyond the @tech{bounding box}.
-
-@examples[#:eval ss-eval
-  (arrow 30 0)
-  (arrow 30 (/ pi 2))
-  (arrowhead 30 0)
-]}
-
-
-@defproc*[([(pip-line [dx real?] [dy real?] [size real?]) pict?]
-           [(pip-arrow-line [dx real?] [dy real?] [size real?]) pict?]
-           [(pip-arrows-line [dx real?] [dy real?] [size real?]) pict?])]{
-
-Creates a line (with some number of arrowheads) as a zero-sized pict
-suitable for use with @racket[pin-over]. The 0-sized picture contains
-the starting point.
-
-The @racket[size] is used for the arrowhead size. Even though
-@racket[pip-line] creates no arrowheads, it accepts the @racket[size]
-argument for consistency with the other functions.}
-
-@defproc*[([(pin-line [pict pict?]
-                      [src pict-path?]
-                      [find-src (pict? pict-path? . -> . (values real? real?))]
-                      [dest pict-path?]
-                      [find-dest (pict? pict-path? . -> . (values real? real?))]
-                      [#:start-angle start-angle (or/c real? #f) #f]
-                      [#:end-angle end-angle (or/c real? #f) #f]
-                      [#:start-pull start-pull real? 1/4]
-                      [#:end-pull end-pull real? 1/4]
-                      [#:line-width line-width (or/c #f real?) #f]
-                      [#:color color (or/c #f string? (is-a?/c color%)) #f]
-                      [#:alpha alpha (real-in 0.0 1.0) #f]
-                      [#:style style (one-of/c 'transparent 'solid 'xor 'hilite 
-                                               'dot 'long-dash 'short-dash 'dot-dash 
-                                               'xor-dot 'xor-long-dash 'xor-short-dash 
-                                               'xor-dot-dash)
-                               'solid]
-                      [#:under? under? any/c #f])
-            pict?]
-           [(pin-arrow-line [arrow-size real?] [pict pict?]
-                      [src pict-path?]
-                      [find-src (pict? pict-path? . -> . (values real? real?))]
-                      [dest pict-path?]
-                      [find-dest (pict? pict-path? . -> . (values real? real?))]
-                      [#:start-angle start-angle (or/c real? #f) #f]
-                      [#:end-angle end-angle (or/c real? #f) #f]
-                      [#:start-pull start-pull real? 1/4]
-                      [#:end-pull end-pull real? 1/4]
-                      [#:line-width line-width (or/c #f real?) #f]
-                      [#:color color (or/c #f string? (is-a?/c color%)) #f]
-                      [#:alpha alpha (real-in 0.0 1.0) #f]
-                      [#:style style (one-of/c 'transparent 'solid 'xor 'hilite 
-                                               'dot 'long-dash 'short-dash 'dot-dash 
-                                               'xor-dot 'xor-long-dash 'xor-short-dash 
-                                               'xor-dot-dash)
-                               'solid]
-                      [#:under? under? any/c #f]
-                      [#:solid? solid? any/c #t]
-		      [#:hide-arrowhead? hide-arrowhead? any/c #f])
-            pict?]
-           [(pin-arrows-line [arrow-size real?] [pict pict?]
-                      [src pict-path?]
-                      [find-src (pict? pict-path? . -> . (values real? real?))]
-                      [dest pict-path?]
-                      [find-dest (pict? pict-path? . -> . (values real? real?))]
-                      [#:start-angle start-angle (or/c real? #f) #f]
-                      [#:end-angle end-angle (or/c real? #f) #f]
-                      [#:start-pull start-pull real? 1/4]
-                      [#:end-pull end-pull real? 1/4]
-                      [#:line-width line-width (or/c #f real?) #f]
-                      [#:color color (or/c #f string? (is-a?/c color%)) #f]
-                      [#:alpha alpha (real-in 0.0 1.0) #f]
-                      [#:style style (one-of/c 'transparent 'solid 'xor 'hilite 
-                                               'dot 'long-dash 'short-dash 'dot-dash 
-                                               'xor-dot 'xor-long-dash 'xor-short-dash 
-                                               'xor-dot-dash)]
-                      [#:under? under? any/c #f]
-                      [#:solid? solid? any/c #t]
-		      [#:hide-arrowhead? hide-arrowhead? any/c #f])
-            pict?])]{
-
-Adds a line or line-with-arrows onto @racket[pict], using one of the
-pict-finding functions (e.g., @racket[lt-find]) to extract the source
-and destination of the line.
-
-If @racket[under?] is true, then the line and arrows are added under
-the existing @racket[pict] drawing, instead of on top. If
-@racket[solid?] is false, then the arrowheads are hollow instead of
-filled.
-
-The @racket[start-angle], @racket[end-angle], @racket[start-pull], and
-@racket[end-pull] arguments control the curve of the line (and the
-defaults produce a straight line):
-
-@itemize[
-
- @item{The @racket[start-angle] and @racket[end-angle] arguments
-       specify the direction of curve at its start and end positions;
-       if either is @racket[#f], it defaults to the angle of a
-       straight line from the start position to end position.}
-
- @item{The @racket[start-pull] and @racket[end-pull] arguments specify
-       a kind of momentum for the starting and ending angles; larger
-       values preserve the angle longer.}
-
-]
-
-The @racket[line-width], @racket[color], @racket[alpha], and @racket[style] arguments
-apply to the added line.
-
-When the @racket[hide-arrowhead?] argument is a true value, then space
-for an arrowhead is kept around the line, but the arrowhead itself is
-not drawn.
-
-@defexamples[#:eval ss-eval
-  (define pict-a (rectangle 40 40))
-  (define pict-b (circle 40))
-  (define combined (hc-append 200 pict-a pict-b))
-  (pin-line combined
-            pict-a cc-find
-            pict-b cc-find)
-  (pin-arrow-line 30 combined
-                  pict-a rc-find
-                  pict-b lc-find
-                  #:line-width 3
-                  #:style 'long-dash
-                  #:color "medium goldenrod")
-  (pin-arrows-line 30 combined
-                   pict-a rc-find
-                   pict-b lc-find
-                   #:start-angle (/ pi 11)
-                   #:end-angle (- (/ pi 11))
-                   #:solid? #f)
-]}
-
-
-@defthing[text-style/c contract?]{
-
-A contract that matches the second argument of @racket[text].}
-
-@defboolparam[bitmap-draft-mode on?]{
-
-A parameter that determines whether @racket[bitmap] loads/uses a
-bitmap.}
-
-
-@; ------------------------------------------------------------------------
-
-@section{Pict Combiners}
-
-@defproc*[([(vl-append [d real? 0.0] [pict pict?] ...) pict?]
-           [(vc-append [d real? 0.0] [pict pict?] ...) pict?]
-           [(vr-append [d real? 0.0] [pict pict?] ...) pict?]
-           [(ht-append [d real? 0.0] [pict pict?] ...) pict?]
-           [(htl-append [d real? 0.0] [pict pict?] ...) pict?]
-           [(hc-append [d real? 0.0] [pict pict?] ...) pict?]
-           [(hbl-append [d real? 0.0] [pict pict?] ...) pict?]
-           [(hb-append [d real? 0.0] [pict pict?] ...) pict?])]{
-
-Creates a new pict as a column (for @racket[v...-append]) or row (for
-@racket[h...-append]) of other picts. The optional @racket[d] argument
-specifies amount of space to insert between each pair of pictures in
-making the column or row.
-
-Different procedures align pictures in the orthogonal direction in
-different ways. For example, @racket[vl-append] left-aligns all of the
-pictures.
-
-The descent of the result corresponds to baseline that is lowest in
-the result among all of the picts' descent-specified baselines;
-similarly, the ascent of the result corresponds to the highest
-ascent-specified baseline. If at least one @racket[pict] is supplied,
-then the last element (as reported by @racket[pict-last]) for the
-result is @racket[(or (pict-last pict) pict)] for the using last
-supplied @racket[pict].
-
-@defexamples[#:eval ss-eval
-  (define combiners (list vl-append vc-append vr-append
-                          ht-append htl-append hc-append
-                          hbl-append hb-append))
-  (define names (list "vl-append" "vc-append" "vr-append"
-                      "ht-append" "htl-append" "hc-append"
-                      "hbl-append" "hb-append"))
-  (define pict-a (colorize (filled-rectangle 60 30) "tomato"))
-  (define pict-b (colorize (disk 45) "cornflower blue"))
-  (define picts
-    (for/list ([combiner combiners] [name names])
-      (list (text name null 15)
-            (combiner pict-a pict-b))))
-  (take picts 4)
-  (drop picts 4)
-]}
-
-@defproc*[([(lt-superimpose [pict pict?] ...) pict?]
-           [(ltl-superimpose [pict pict?] ...) pict?]
-           [(lc-superimpose [pict pict?] ...) pict?]
-           [(lbl-superimpose [pict pict?] ...) pict?]
-           [(lb-superimpose [pict pict?] ...) pict?]
-           [(ct-superimpose [pict pict?] ...) pict?]
-           [(ctl-superimpose [pict pict?] ...) pict?]
-           [(cc-superimpose [pict pict?] ...) pict?]
-           [(cbl-superimpose [pict pict?] ...) pict?]
-           [(cb-superimpose [pict pict?] ...) pict?]
-           [(rt-superimpose [pict pict?] ...) pict?]
-           [(rtl-superimpose [pict pict?] ...) pict?]
-           [(rc-superimpose [pict pict?] ...) pict?]
-           [(rbl-superimpose [pict pict?] ...) pict?]
-           [(rb-superimpose [pict pict?] ...) pict?])]{
-
-Creates a new picture by superimposing a set of pictures. The name
-prefixes are alignment indicators: horizontal alignment then vertical
-alignment.
-
-The descent of the result corresponds to baseline that is lowest in
-the result among all of the picts' descent-specified baselines;
-similarly, the ascent of the result corresponds to the highest
-ascent-specified baseline. The last element (as reported by
-@racket[pict-last]) for the result is the lowest, right-most among the
-last-element picts of the @racket[pict] arguments, as determined by
-comparing the last-element bottom-right corners.
-
-@defexamples[#:eval ss-eval
-  (define combiners (list lt-superimpose  ltl-superimpose lc-superimpose
-                          lbl-superimpose lb-superimpose  ct-superimpose
-                          ctl-superimpose cc-superimpose  cbl-superimpose
-                          cb-superimpose  rt-superimpose  rtl-superimpose
-                          rc-superimpose  rbl-superimpose rb-superimpose))
-  (define names (list "lt-superimpose"  "ltl-superimpose" "lc-superimpose"
-                      "lbl-superimpose" "lb-superimpose"  "ct-superimpose"
-                      "ctl-superimpose" "cc-superimpose"  "cbl-superimpose"
-                      "cb-superimpose"  "rt-superimpose"  "rtl-superimpose"
-                      "rc-superimpose"  "rbl-superimpose" "rb-superimpose"))
-  (define pict-a (colorize (filled-rectangle 60 30) "tomato"))
-  (define pict-b (colorize (disk 45) "cornflower blue"))
-  (define picts
-    (for/list ([combiner combiners] [name names])
-      (list (text name null 15)
-            (combiner pict-a pict-b))))
-  (take picts 3)
-  (take (drop picts 3) 3)
-  (take (drop picts 6) 3)
-  (take (drop picts 9) 3)
-  (take (drop picts 12) 3)
-]}
-
-
-@defproc*[([(pin-over [base pict?] [dx real?] [dy real?] [pict pict?])
-            pict?]
-           [(pin-over [base pict?]
-                      [find-pict pict-path?]
-                      [find (pict? pict-path? . -> . (values real? real?))]
-                      [pict pict?])
-            pict?])]{
-
-Creates a pict with the same @tech{bounding box}, ascent, and descent as
-@racket[base], but with @racket[pict] placed on top.  The @racket[dx]
-and @racket[dy] arguments specify how far right and down the second
-pict's corner is from the first pict's corner.  Alternately, the
-@racket[find-pict] and @racket[find] arguments find a point in
-@racket[base] for @racket[find-pict]; the @racket[find] procedure
-should be something like @racket[lt-find].}
-
-
-@defproc*[([(pin-under [base pict?] [dx real?] [dy real?] [pict pict?])
-            pict?]
-           [(pin-under [base pict?] 
-                       [find-pict pict?]
-                       [find (pict? pict? . -> . (values real? real?))]
-                       [pict pict?])
-            pict?])]{
-
-Like @racket[pin-over], but @racket[pict] is drawn before
-@racket[base] in the resulting combination.}
-
-
-@defproc[(table [ncols exact-positive-integer?]
-                [picts (non-empty-listof pict?)]
-                [col-aligns (list*of (->* () #:rest (listof pict?) pict?))]
-                [row-aligns (list*of (->* () #:rest (listof pict?) pict?))]
-                [col-seps (list*of real?)]
-                [row-seps (list*of real?)])
-         pict?]{
-
-Creates a table given a list of picts. The @racket[picts] list is a
-concatenation of the table's rows (which means that a Racket
-@racket[list] call can be formatted to reflect the shape of the output
-table).
-  
-The @racket[col-aligns], @racket[row-aligns], @racket[col-seps], and
-@racket[row-seps] arguments are ``lists'' specifying the row and
-columns alignments separation between rows and columns.  For @math{c}
-columns and @math{r} rows, the first two should have @math{c} and
-@math{r} superimpose procedures, and the last two should have
-@math{c-1} and @math{r-1} numbers, respectively. The lists can be
-``improper'' (i.e., ending in a number instead of an empty list), in
-which case the non-pair @racket[cdr] is used as the value for all remaining
-list items that were expected. The @racket[col-aligns] and
-@racket[row-aligns] procedures are used to superimpose all of the
-cells in a column or row; this superimposition determines the total
-width or height of the column or row, and also determines the
-horizontal or vertical placement of each cell in the column or row.
-
-@defexamples[#:eval 
-             ss-eval
-             (table 4
-                    (map (λ (x) (text (format "~a" x)))
-                         (list 1 2 3 4
-                               5 6 7 8
-                               9000 10 11 12))
-                    cc-superimpose
-                    cc-superimpose
-                    10
-                    10)
-             
-             (table 4
-                    (map (λ (x) (text (format "~a" x)))
-                         (list 1 2 3 4
-                               5 6 7 8
-                               9000 10 11 12))
-                    rc-superimpose
-                    cc-superimpose
-                    10
-                    10)]
-}
-
-@; ------------------------------------------------------------------------
-
-@section{Pict Drawing Adjusters}
-
-@defproc*[([(scale [pict pict?] [factor real?]) pict?]
-           [(scale [pict pict?] [w-factor real?] [h-factor real?]) pict?])]{
-
-Scales a pict drawing, as well as its @tech{bounding box}, by multiplying
-it current size by @racket[factor] (if two arguments are supplied)
-or by multiplying the current width by @racket[w-factor] and current height by
-@racket[h-factor] (if three arguments are supplied).
-
-The drawing is scaled by adjusting the destination @racket[dc<%>]'s
-scale while drawing the original @racket[pict].
-
-@examples[#:eval
-          ss-eval
-          (filled-rectangle 80 40)
-          (scale (filled-rectangle 40 20) 2)
-          (scale (filled-rectangle 20 20) 4 2)]
-
-}
-
-@defproc*[([(scale-to-fit [pict pict?] [size-pict pict?]) pict?]
-           [(scale-to-fit [pict pict?] [width real?] [height real?]) pict?])]{
-  Scales @racket[pict] so that it fits within the bounding box of
-         @racket[size-pict] (if two arguments are supplied) or
-         into a box of size @racket[width] by @racket[height] 
-         (if three arguments are supplied).
-         
-         The aspect ratio of the pict is preserved, so the resulting pict
-         will have either the width or the height of the @racket[size-pict]
-         (or @racket[width] by @racket[height] box), but not necessarily
-         both.
-}
-
-
-@defproc[(rotate [pict pict?] [theta real?]) pict?]{
-
-Rotates a pict's drawing by @racket[theta] radians counter-clockwise.
-
-The @tech{bounding box} of the resulting pict is the box encloses the rotated
-corners of @racket[pict] (which inflates the area of the bounding
-box, unless @racket[theta] is a multiple of half of @racket[pi]). The
-ascent and descent lines of the result's bounding box are the
-horizontal lines that bisect the rotated original lines; if the ascent
-line drops below the descent line, the two lines are flipped.}
-
-
-@defproc[(ghost [pict pict?]) pict?]{
-
-Creates a container picture that doesn't draw the child picture,
-but uses the child's size.}
-
-
-@defproc[(linewidth [w (or/c real? #f)] [pict pict?]) pict?]{
-
-Selects a specific pen width for drawing, which applies to pen drawing
-for @racket[pict] that does not already use a specific pen width.
-A @racket[#f] value for @racket[w] makes the pen transparent (in contrast
-to a zero value, which means ``as thin as possible for the target device'').}
-
-
-@defproc[(linestyle [style (one-of/c 'transparent 'solid 'xor 'hilite 
-                                     'dot 'long-dash 'short-dash 'dot-dash 
-                                     'xor-dot 'xor-long-dash 'xor-short-dash 
-                                     'xor-dot-dash)]
-                    [pict pict?])
-         pict?]{
-
-Selects a specific pen style for drawing, which applies to pen drawing
-for @racket[pict] that does not already use a specific pen style.}
-
-
-@defproc[(colorize [pict pict?]
-                   [color (or/c string? (is-a?/c color%)
-                                (list/c byte? byte? byte?))])
-         pict?]{
-
-Selects a specific color drawing, which applies to drawing in
-@racket[pict] that does not already use a specific color. The
-@racket[black-and-white] parameter causes all non-white colors to be
-converted to black.}
-
-@defproc[(cellophane [pict pict?] [opacity (real-in 0 1)])
-         pict?]{
-
-Makes the given @racket[pict] semi-transparent, where an opacity of
-@racket[0] is fully transparent, and an opacity of @racket[1] is fully
-opaque.  See @method[dc<%> set-alpha] for information about the
-contexts and cases when semi-transparent drawing works.}
-
-@defproc[(clip [pict pict?]) pict]{
-
-Clips a pict's drawing to its @tech{bounding box}.}
-
-
-@defproc*[([(inset/clip [pict pict?] [amt real?]) pict?]
-           [(inset/clip [pict pict?] [h-amt real?] [v-amt real?]) pict?]
-           [(inset/clip [pict pict?] [l-amt real?] [t-amt real?] 
-                        [r-amt real?] [b-amt real?]) pict?])]{
-
-Insets and clips the pict's drawing to its @tech{bounding
-box}. Usually, the inset amounts are negative.}
-
-
-@defform*[[(scale/improve-new-text pict-expr scale-expr)
-           (scale/improve-new-text pict-expr x-scale-expr y-scale-expr)]]{
-
-Like the @racket[scale] procedure, but also sets
-@racket[current-expected-text-scale] while evaluating @racket[pict-expr].}
-
-@defboolparam[black-and-white on?]{
-
-A parameter that determines whether @racket[colorize] uses color or
-black-and-white colors.}
-
-@; ------------------------------------------------------------------------
-
-@section{Bounding Box Adjusters}
-
-@defproc*[([(inset [pict pict?] [amt real?]) pict?]
-           [(inset [pict pict?] [h-amt real?] [v-amt real?]) pict?]
-           [(inset [pict pict?] [l-amt real?] [t-amt real?] 
-                   [r-amt real?] [b-amt real?]) pict?])]{
-
-Extends @racket[pict]'s @tech{bounding box} by adding the given amounts
-to the corresponding sides; ascent and descent are extended, too.}
-
-
-@defproc[(clip-descent [pict pict?]) pict?]{
-
-Truncates @racket[pict]'s @tech{bounding box} by removing the descent part.}
-
-
-@defproc[(lift-above-baseline [pict pict?] [amt real?]) pict?]{
-
-Lifts @racket[pict] relative to its baseline, extending the
-@tech{bounding box} height if necessary.}
-
-@defproc[(drop-below-ascent [pict pict?] [amt real?]) pict?]{
-
-Drops @racket[pict] relative to its ascent line, extending the
-@tech{bounding box} height if necessary.}
-
-@defproc[(baseless [pict pict?]) pict?]{
-
-Makes the descent @racket[0] and the ascent the same as the height.}
-
-@defproc[(refocus [pict pict?] [sub-pict pict?]) pict?]{
-
-Assuming that @racket[sub-pict] can be found within @racket[pict],
-shifts the overall bounding box to that of @racket[sub-pict] (but
-preserving all the drawing of @racket[pict]). The last element, as
-reported by @racket[pict-last] is also set to @racket[(or (pict-last
-sub-pict) sub-pict)].}
-
-
-@defproc[(panorama [pict pict?]) pict?]{
-
-Shifts the given pict's @tech{bounding box} to enclose the bounding boxes of
-all sub-picts (even @racket[launder]ed picts).}
-
-
-@defproc[(use-last [pict pict?] [sub-pict pict-path?]) pict?]{
-
-Returns a pict like @racket[pict], but with the last element (as
-reported by @racket[pict-last]) set to @racket[sub-pict]. The
-@racket[sub-pict] must exist as a sub-pict (or path of sub-picts)
-within @racket[pict].}
-
-@defproc[(use-last* [pict pict?] [sub-pict pict-path?]) pict?]{
-
-Propagates the last element of @racket[sub-pict] to @racket[pict].
-
-That is, @racket[use-last*] is like @racket[use-last], but the last
-element of @racket[sub-pict] is used as the new last element for
-@racket[pict], instead of @racket[sub-pict] itself---unless
-@racket[(pict-last sub-pict)] is @racket[#f], in which case
-@racket[sub-pict] is used as the last element of @racket[pict].}
-
-@; ------------------------------------------------------------------------
-
-@section{Pict Finders}
-
-@defproc*[([(lt-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(ltl-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(lc-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(lbl-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(lb-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(ct-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(ctl-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(cc-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(cbl-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(cb-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(rt-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(rtl-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(rc-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(rbl-find [pict pict?] [find pict-path?]) (values real? real?)]
-           [(rb-find [pict pict?] [find pict-path?]) (values real? real?)])]{
-
-Locates a pict designated by @racket[find] is within @racket[pict]. If
-@racket[find] is a pict, then the @racket[pict] must have been created
-as some combination involving @racket[find].
-
-If @racket[find] is a list, then the first element of @racket[find]
-must be within @racket[pict], the second element of @racket[find] must
-be within the second element, and so on.}
-
-@defproc[(pict-path? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a @racket[pict] or a non-empty
-list of @racket[pict]s.}
-
-
-@defproc[(launder [pict pict?]) pict?]{
-
-Creates a pict that has the same drawing and @tech{bounding box} of
-@racket[pict], but which hides all of its sub-picts so that they
-cannot be found with functions like @racket[lt-find]. If @racket[pict]
-has a last-line pict, then the laundered pict has a fresh last-line
-pict with the same shape and location.}
-
-@; ------------------------------------------------------------------------
-
-@include-section["more.scrbl"]
-
-@; ----------------------------------------
-
-@include-section["anim.scrbl"]
-
-@; ----------------------------------------
-
-@include-section["tree-layout.scrbl"]
-
-@; ----------------------------------------
-
-@section{Miscellaneous}
-
-@defproc[(hyperlinkize [pict pict?])
-         pict?]{
-
-Adds an underline and blue color. The @racket[pict]'s height and
-descent are extended.}
-
-
-@defproc[(scale-color [factor real?]
-                      [color (or/c string (is-a?/c color%))])
-         (is-a?/c color%)]{
-
-Scales a color, making it brighter or darker. If the factor is less
-than 1, the color is darkened by multiplying the RGB components by the
-factor. If the factor is greater than 1, the color is lightened by
-dividing the gap between the RGB components and 255 by the factor.}
-
-@defproc[(color-series [dc (is-a?/c dc<%>)]
-                       [max-step exact-nonnegative-integer?]
-                       [step-delta (and/c exact? positive?)]
-                       [start (or/c string? (is-a?/c color%))]
-                       [end (or/c string? (is-a?/c color%))]
-                       [proc (exact? . -> . any)]
-                       [set-pen? any/c]
-                       [set-brush? any/c])
-          void?]{
-
-Calls a @racket[proc] multiple times, gradually changing the pen
-and/or brush color for each call. For the first call, the current pen
-and/or brush color matches @racket[start]; for the last call, it
-matches @racket[end]; and for intermediate calls, the color is an
-intermediate color.
-
-The @racket[max-step] and @racket[step-delta] arguments should be
-exact numbers; the procedure is called with each number from 0 to
-@racket[max-step] inclusive using a @racket[step-delta] increment.}
-
-@; ------------------------------------------------------------------------
-
-@section{Rendering}
-
-@defparam[dc-for-text-size dc (or/c #f (is-a?/c dc<%>))]{
-
-A parameter that is used to determine the @tech{bounding box} of picts
-created with @racket[text].
-
-The drawing context installed in this parameter need not be the same
-as the ultimate drawing context, but it should measure text in the same
-way. Under normal circumstances, font metrics are the same for all
-drawing contexts, so the default value of @racket[dc-for-text-size] is
-a @racket[bitmap-dc%] that draws to a 1-by-1 bitmap.}
-
-
-@defparam[convert-bounds-padding padding (list/c (>=/c 0) (>=/c 0) (>=/c 0) (>=/c 0))]{
-
-A parameter that determines an amount of padding added to each edge of
-a @tech{pict} when converting to a format like @racket['png@2x-bytes+bounds8]
-(see @racketmodname[file/convertible]). The default value of the parameter
-is @racket['(3 3 3 3)], which adds three pixels to each edge to accommodate
-a small amount of drawing outside the pict's @tech{bounding box}.
-
-@history[#:added "1.2"]}
-
-
-@defproc[(draw-pict [pict pict?]
-                    [dc (is-a?/c dc<%>)]
-                    [x real?]
-                    [y real?])
-         void?]{
-
-Draws @racket[pict] to @racket[dc], with its top-left corner at offset
- (@racket[x], @racket[y]).}
-
-
-@defproc[(pict->bitmap [pict pict?] 
-                       [smoothing (or/c 'unsmoothed 'smoothed 'aligned) 'aligned])
-         (is-a?/c bitmap%)]{
-
-Returns a @racket[bitmap%] with an alpha channel, no larger than @racket[pict],
-with @racket[pict] drawn on it in the top-left corner (@racket[0], @racket[0]).
-
-When drawing the pict into the bitmap using the smoothing mode @racket[smoothing]
-(see @method[set-smoothing dc<%>] for more information on smoothing modes).
-}
-
-@defproc[(pict->argb-pixels [pict pict?]
-                            [smoothing (or/c 'unsmoothed 'smoothed 'aligned) 'aligned])
-         bytes?]{
-Returns the @racket[bytes?] with the pixels corresponding the bitmap that @racket[pict->bitmap]
-returns. Each pixel has four bytes in the result: the alpha, red, green, and blue components.
-
-@examples[#:eval 
-          ss-eval
-          (pict->argb-pixels
-           (filled-rectangle 1 1))
-          (pict->argb-pixels
-           (colorize (filled-rectangle 1 1) "red"))]
-
-@history[#:added "1.1"]
-}
-
-@defproc[(argb-pixels->pict [bytes bytes?] [width exact-nonnegative-integer?]) pict?]{
-  Constructs a pict from @racket[bytes] with the width @racket[width]. Each pixel
-  in the resulting pict corresponds to four entries in @racket[bytes]: the alpha value,
-  and the red, green, and blue values.
-  
- @examples[#:eval 
-          ss-eval
-          (let ([b (make-bytes (* 40 40 4) 255)])
-            (for ([x (in-range (bytes-length b))])
-              (code:comment "when in one of two vertical bands (10-20 & 30-40)")
-              (when (or (<= 10 (modulo (quotient x 4) 40) 20)
-                        (<= 30 (modulo (quotient x 4) 40) 40))
-                (code:comment "change the red and green fields of the pixel")
-                (when (= 1 (modulo x 4)) (bytes-set! b x 0))
-                (when (= 2 (modulo x 4)) (bytes-set! b x 150))))
-            (argb-pixels->pict b 40))]
- 
-@history[#:added "1.1"]
-}
-
-@defproc[(make-pict-drawer [pict pict?])
-         ((is-a?/c dc<%>) real? real? . -> . void?)]{
-
-Generates a pict-drawer procedure for multiple renderings of
-@racket[pict]. Using the generated procedure can be faster than
-repeated calls to @racket[draw-pict].}
-
-
-@defproc[(show-pict [pict pict?]
-                    [w (or/c #f exact-nonnegative-integer?) #f] 
-                    [h (or/c #f exact-nonnegative-integer?) #f] 
-                    [#:frame-x frame-x (or/c (integer-in -10000 10000) #f)] 
-                    [#:frame-y frame-y (or/c (integer-in -10000 10000) #f)] 
-                    [#:frame-style frame-style (listof (or/c 'no-resize-border 'no-caption
-                                                             'no-system-menu 'hide-menu-bar
-                                                             'toolbar-button 'float 'metal))])
-         void?]{
-
-Opens a frame that displays @racket[pict].  The frame adds one method,
-@racket[set-pict], which takes a pict to display. The optional
-@racket[w] and @racket[h] arguments specify a minimum size for the
-frame's drawing area, and the @racket[frame-x], @racket[frame-y], 
-and @racket[frame-style] keyword arguments behave in the same manner as @racket[x], 
-@racket[y], and @racket[style] arguments for the @racket[frame%].}
-
-@defparam[current-expected-text-scale scales (list/c real? real?)]{
-
-A parameter used to refine text measurements to better match an
-expected scaling of the image. The @racket[scale/improve-new-text]
-form sets this parameter while also scaling the resulting pict.}
-
-@;----------------------------------------
-
-@section{Conversion to Picts}
-
-@defmodule[pict/convert]{The
-@racketmodname[pict/convert] library defines a protocol for
-values to convert themselves to @tech{picts}. The protocol
-is used by DrRacket's interactions window, for example, to render
-values that it prints.}
-
-@defthing[prop:pict-convertible struct-type-property?]{
-
-A property whose value should be a procedure matching the
-contract @racket[(-> any/c pict?)]. The
-procedure is called when a structure with the property is passed to
-@racket[pict-convert]; the argument to the procedure is the
-structure, and the procedure's result should be a pict.
-}
-
-@defthing[prop:pict-convertible? struct-type-property?]{
-A property whose value should be a predicate procedure
-(i.e., matching the contract @racket[predicate/c]).
-
-If this property is not set, then it is assumed to be
-the function @racket[(λ (x) #t)]. 
-
-If this property is set, then this procedure is called
-by @racket[pict-convertible?] to determine if this particular
-value is convertible (thereby supporting situations
-where some instances of a given struct are convertible
-to picts, but others are not).
-}
-
-@defproc[(pict-convertible? [v any/c]) boolean?]{
-Returns @racket[#t] if @racket[v] supports the conversion protocol
-(by being a struct with the @racket[prop:pict-convertible] property)
-and @racket[#f] otherwise.
-}
-
-@defproc[(pict-convert [v pict-convertible?]) pict?]{
-  Requests a data conversion from @racket[v] to a pict.
-}
-
-@(close-eval ss-eval)
diff --git a/pkgs/pict-pkgs/pict-doc/pict/scribblings/tree-layout.scrbl b/pkgs/pict-pkgs/pict-doc/pict/scribblings/tree-layout.scrbl
deleted file mode 100644
index 899d6ae2d7..0000000000
--- a/pkgs/pict-pkgs/pict-doc/pict/scribblings/tree-layout.scrbl
+++ /dev/null
@@ -1,204 +0,0 @@
-#lang scribble/doc
-
-@(require (for-label pict racket pict/tree-layout)
-          pict/private/layout
-          scribble/manual
-          scribble/eval)
-
-@(define tree-layout-eval (make-base-eval))
-@(tree-layout-eval '(require pict/tree-layout pict))
-
-@title{Tree Layout}
-
-These functions specify tree layouts and functions
-that render them as @racket[pict]s.
-
-@defmodule[pict/tree-layout]
-
-@defproc[(tree-layout [#:pict node-pict (or/c #f pict?) #f]
-                      [child (or/c tree-layout? tree-edge? #f)] ...)
-         tree-layout?]{
-  Specifies an interior node of a tree for use with one of the renderers below.
-  
-  If the children are @racket[tree-layout?]s, then they have edges
-  created by passing the corresponding @racket[tree-layout?]s directly
-  to @racket[tree-edge]. Children that are @racket[#f] correspond to
-  leaf nodes that are not drawn.
-  
-  The default @racket[node-pict] (used when it is @racket[#f]) is
-  @default-node-pict
-}
-
-@defproc[(tree-edge [node tree-layout?]
-                    [#:edge-color edge-color
-                                  (or/c string? 
-                                        (is-a?/c color%)
-                                        (list/c byte? byte? byte?))
-                                  "gray"]
-                    [#:edge-width edge-width
-                                  (or/c 'unspecified real? #f)
-                                  'unspecified])
-         tree-edge?]{
-  This function specifies an edge from some parent to the given @racket[node].
-  It it intended to be used with @racket[tree-layout].
-
-  When @racket[edge-width] is @racket['unspecified], the line width will not be
-  set. This is intended to allow the line width to be set for the whole pict
-  via @racket[linewidth]. Otherwise, @racket[edge-width] is interpreted the
-  same way as the width argument for the @racket[linewidth] function.
-
-  @examples[#:eval
-            tree-layout-eval
-            (naive-layered (tree-layout
-                            (tree-edge #:edge-width 3 (tree-layout))
-                            (tree-edge #:edge-color "green" (tree-layout))))]
-
-  @history[#:changed "6.1.0.5" "Added an #:edge-width option"]
-}
-
-@defproc[(tree-layout? [v any/c]) boolean?]{
-  Recognizes a tree layout. It returns @racket[#t]
-  when given @racket[#f] or the result of @racket[tree-layout].
-}
-
-@defproc[(binary-tree-layout? [v any/c]) boolean?]{
-  Recognizes a @racket[tree-layout?] that represents
-  a binary tree. That is, each interior node
-  has either two children or is @racket[#f]. Note
-  that a node with zero children does not count as a
-  leaf for the purposes of @racket[binary-tree-layout?].
-  
-  @examples[#:eval 
-            tree-layout-eval
-            (binary-tree-layout? (tree-layout #f #f))
-            (binary-tree-layout? #f)
-            (binary-tree-layout? (tree-layout (tree-layout) (tree-layout)))]
-}
-
-@defproc[(tree-edge? [v any/c]) boolean?]{
-  Recognizes an @racket[tree-edge].
-}
-
-
-@defproc[(naive-layered [tree-layout tree-layout?]
-                        [#:x-spacing x-spacing (or/c (and/c real? positive?) #f) #f]
-                        [#:y-spacing y-spacing (or/c (and/c real? positive?) #f) #f])
-         pict?]{
-  Uses a naive algorithm that ensures that all nodes at a fixed
-  depth are the same vertical distance from the root (dubbed ``layered'').
-  It recursively lays out subtrees and then horizontally
-  combines them, aligning them at their tops. Then it places
-  the root node centered over the children nodes.
-  
-  @examples[#:eval 
-            tree-layout-eval
-            (define (complete d)
-              (cond
-                [(zero? d) #f]
-                [else (define s (complete (- d 1)))
-                      (tree-layout s s)]))
-            
-            (naive-layered (complete 4))
-            
-            (naive-layered (tree-layout
-                            (tree-layout)
-                            (tree-layout)
-                            (tree-layout
-                             (tree-layout)
-                             (tree-layout)
-                             (tree-layout
-                              (tree-layout)
-                              (tree-layout)))))
-            (define right-subtree-with-left-chain
-              (tree-layout
-               (tree-layout
-                (tree-layout #f #f)
-                (tree-layout
-                 (tree-layout #f #f)
-                 #f))
-               (tree-layout
-                (tree-layout
-                 (tree-layout
-                  (tree-layout 
-                   (tree-layout #f #f)
-                   #f)
-                  #f)
-                 #f)
-                #f)))
-            (naive-layered right-subtree-with-left-chain)]
-}
-                
-@defproc[(binary-tidier [tree-layout binary-tree-layout?]
-                        [#:x-spacing x-spacing (or/c (and/c real? positive?) #f) #f]
-                        [#:y-spacing y-spacing (or/c (and/c real? positive?) #f) #f])
-         pict?]{
-  Uses the layout algorithm from
-  @italic{Tidier Drawing of Trees} by Edward M. Reingold and John S. Tilford
-  (IEEE Transactions on Software Engineering, Volume 7, Number 2, March 1981)
-  to lay out @racket[tree-layout].
-  
-  The layout algorithm guarantees a number of properties, namely:
-  @itemlist[@item{nodes at the same level of tree appear at 
-                  the same vertical distance from the top of the pict}
-             @item{parents are centered over their children, which are 
-                   placed from left to right,}
-             @item{isomorphic subtrees are drawn the same way, no matter
-                   where they appear in the complete tree, and}
-             @item{a tree and its mirror image produce picts that are
-                   mirror images of each other (which also holds for subtrees
-                   of the complete tree).}]
-  Within those constraints, the algorithm tries to make as narrow a drawing
-  as it can, even to the point that one subtree of a given node might cross
-  under the other one.
-
-  More precisely, it recursively lays out the two subtree and then,
-  without adjusting the layout of the two subtrees, moves them as
-  close together as it can, putting the root of the new tree centered
-  on top of its children. (It does this in linear time, using clever
-  techniques as discussed in the paper.)
-  
-  The @racket[x-spacing] and @racket[y-spacing] are the amount of space that each
-  row and each column takes up, measured in pixels. If @racket[x-spacing] is @racket[#f],
-  it is the width of the widest node @racket[pict?] in the tree. 
-  If @racket[y-spacing] is @racket[#f],
-  it is @racket[1.5] times the width of the widest node @racket[pict?] in the tree. 
-  
-  @examples[#:eval 
-            tree-layout-eval
-            
-            (binary-tidier (complete 4))
-
-            
-            (define (dl t) (tree-layout (tree-layout #f #f) t))
-            (define (dr t) (tree-layout t (tree-layout #f #f)))
-            (binary-tidier
-             (tree-layout
-              (dr (dr (dr (dl (dl (dl (complete 2)))))))
-              (dl (dl (dl (dr (dr (dr (complete 2)))))))))
-            
-            
-            (binary-tidier right-subtree-with-left-chain)]
-
-
-}
-
-@defproc[(hv-alternating [tree-layout binary-tree-layout?]
-                         [#:x-spacing x-spacing (or/c (and/c real? positive?) #f) #f]
-                         [#:y-spacing y-spacing (or/c (and/c real? positive?) #f) #f])
-         pict?]{
-                
-  Uses the ``CT'' binary tree layout algorithm from 
-  @italic{A note on optimal area algorithms for upward drawing of binary trees}
-  by P. Crescenzi, G. Di Battista, and A. Piperno 
-  (Computational Geometry, Theory and Applications, 1992) to lay out @racket[tree-layout].
-  
-  It adds horizontal and vertical space between layers based on @racket[x-spacing] and
-  @racket[y-spacing]. If either is @racket[#f], @racket[1.5] times the size of the biggest
-  node is used.
-                
-  @examples[#:eval 
-            tree-layout-eval
-            (hv-alternating (complete 8))]
-}
-
-@history[#:added "6.0.1.4"]
diff --git a/pkgs/pict-pkgs/pict-lib/LICENSE.txt b/pkgs/pict-pkgs/pict-lib/LICENSE.txt
deleted file mode 100644
index 4f8d34963f..0000000000
--- a/pkgs/pict-pkgs/pict-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-pict-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/pict-pkgs/pict-lib/info.rkt b/pkgs/pict-pkgs/pict-lib/info.rkt
deleted file mode 100644
index 905a473146..0000000000
--- a/pkgs/pict-pkgs/pict-lib/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base"
-               "compatibility-lib"
-               "draw-lib"))
-(define build-deps '("rackunit-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"pict\"")
-
-(define pkg-authors '(mflatt robby))
-
-(define version "1.3")
diff --git a/pkgs/pict-pkgs/pict-lib/pict/balloon.rkt b/pkgs/pict-pkgs/pict-lib/pict/balloon.rkt
deleted file mode 100644
index 6d2604ef73..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/balloon.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require texpict/balloon)
-(provide (except-out (all-from-out texpict/balloon)
-                     place-balloon))
-
diff --git a/pkgs/pict-pkgs/pict-lib/pict/code.rkt b/pkgs/pict-pkgs/pict-lib/pict/code.rkt
deleted file mode 100644
index 011578439a..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/code.rkt
+++ /dev/null
@@ -1,160 +0,0 @@
-#lang racket/base
-(require pict
-         texpict/code
-         mzlib/unit
-         racket/contract
-         racket/class
-         racket/draw
-         (for-syntax racket/base
-                     syntax/to-string
-                     mzlib/list))
-
-(define get-current-code-font-size (make-parameter (lambda () 12)))
-
-(define current-code-line-sep (make-parameter 2))
-(define (current-font-size) ((get-current-code-font-size)))
-
-(define-values/invoke-unit/infer code@)
-
-(define-code code typeset-code)
-
-(provide code
-         define-code
-         (for-syntax prop:code-transformer
-                     code-transformer?
-                     make-code-transformer))
-(provide-signature-elements
- (except code^
-         typeset-code
-         current-code-font
-         current-code-tt
-         current-comment-color
-         current-keyword-color
-         current-id-color
-         current-literal-color
-         current-const-color
-         current-base-color
-         current-reader-forms
-         code-align
-         current-keyword-list
-         current-const-list
-         current-literal-list))
-(provide
- (contract-out
-  [typeset-code (-> syntax? pict?)]
-  [current-code-font (parameter/c text-style/c)]
-  [current-code-tt (parameter/c (-> string? pict?))]
-  [get-current-code-font-size (parameter/c (-> exact-nonnegative-integer?))]
-  [current-code-line-sep (parameter/c real?)]
-  [current-comment-color (parameter/c (or/c string? (is-a?/c color%)))]
-  [current-keyword-color (parameter/c (or/c string? (is-a?/c color%)))]
-  [current-id-color (parameter/c (or/c string? (is-a?/c color%)))]
-  [current-literal-color (parameter/c (or/c string? (is-a?/c color%)))]
-  [current-const-color (parameter/c (or/c string? (is-a?/c color%)))]
-  [current-base-color (parameter/c (or/c string? (is-a?/c color%)))]
-  [current-reader-forms (parameter/c (listof symbol?))]
-  [code-align (-> pict? pict?)]
-  [current-keyword-list (parameter/c (listof string?))]
-  [current-const-list (parameter/c (listof string?))]
-  [current-literal-list (parameter/c (listof string?))]))
-
-(provide define-exec-code/scale
-         define-exec-code)
-(define-syntax (define-exec-code/scale stx)
-  (define (drop-to-run l)
-    (map (lambda (x)
-           (cond
-            [(and (pair? (syntax-e x))
-                  (eq? 'local (syntax-e (car (syntax-e x)))))
-             (let ([l (syntax->list x)])
-               (list* 'local
-                      (drop-to-run (syntax->list (cadr l)))
-                      (cddr l)))]
-            [(and (pair? (syntax-e x))
-                  (eq? 'define (syntax-e (car (syntax-e x)))))
-             (let ([l (syntax->list x)])
-               (list* 'define
-                      (cadr l)
-                      (drop-to-run (cddr l))))]
-            [else x]))
-         (filter (lambda (x)
-                   (cond
-                    [(eq? '_ (syntax-e x))
-                     #f]
-                    [(eq? '... (syntax-e x))
-                     #f]
-                    [(eq? 'code:blank (syntax-e x))
-                     #f]
-                    [(and (pair? (syntax-e x))
-                          (eq? 'code:comment (syntax-e (car (syntax-e x)))))
-                     #f]
-                    [(and (pair? (syntax-e x))
-                          (eq? 'code:contract (syntax-e (car (syntax-e x)))))
-                     #f]
-                    [(and (pair? (syntax-e x))
-                          (eq? 'unsyntax (syntax-e (car (syntax-e x)))))
-                     #f]
-                    [else #t]))
-                 l)))
-  (define (drop-to-show l)
-    (foldr (lambda (x r)
-             (cond
-              [(and (identifier? x) (eq? '_ (syntax-e x)))
-               (cdr r)]
-              [(and (pair? (syntax-e x))
-                    (eq? 'local (syntax-e (car (syntax-e x)))))
-               (cons
-                (let ([l (syntax->list x)])
-                  (datum->syntax
-                   x
-                   (list* (car l)
-                          (datum->syntax
-                           (cadr l)
-                           (drop-to-show (syntax->list (cadr l)))
-                           (cadr l))
-                          (cddr l))
-                   x))
-                r)]
-              [(and (pair? (syntax-e x))
-                    (eq? 'cond (syntax-e (car (syntax-e x)))))
-               (cons
-                (let ([l (syntax->list x)])
-                  (datum->syntax
-                   x
-                   (list* (car l)
-                          (drop-to-show (cdr l)))
-                   x))
-                r)]
-              [(and (pair? (syntax-e x))
-                    (eq? 'define (syntax-e (car (syntax-e x)))))
-               (cons (let ([l (syntax->list x)])
-                       (datum->syntax
-                        x
-                        (list* (car l)
-                               (cadr l)
-                               (drop-to-show (cddr l)))
-                        x))
-                     r)]
-              [else (cons x r)]))
-           empty
-           l))
-
-  (syntax-case stx ()
-    [(_ s (showable-name runnable-name string-name) . c)
-     #`(begin
-         (define runnable-name
-           (quote-syntax
-            (begin
-              #,@(drop-to-run (syntax->list #'c)))))
-         (define showable-name
-           (scale/improve-new-text
-            (code
-             #,@(drop-to-show (syntax->list #'c)))
-            s))
-         (define string-name
-           #,(syntax->string #'c)))]))
-
-(define-syntax define-exec-code
-  (syntax-rules ()
-    [(_ (a b c) . r)
-     (define-exec-code/scale 1 (a b c) . r)]))
diff --git a/pkgs/pict-pkgs/pict-lib/pict/convert.rkt b/pkgs/pict-pkgs/pict-lib/pict/convert.rkt
deleted file mode 100644
index d49ea13350..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/convert.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require "main.rkt"
-         racket/contract/base
-         "private/convertible.rkt")
-
-(provide pict-convert pict-convertible?)
-(provide/contract
- [prop:pict-convertible (struct-type-property/c (-> pict-convertible? pict?))]
- [prop:pict-convertible? (struct-type-property/c predicate/c)])
diff --git a/pkgs/pict-pkgs/pict-lib/pict/face.rkt b/pkgs/pict-pkgs/pict-lib/pict/face.rkt
deleted file mode 100644
index 55a8ac2d5d..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/face.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require texpict/face)
-(provide (all-from-out texpict/face))
diff --git a/pkgs/pict-pkgs/pict-lib/pict/flash.rkt b/pkgs/pict-pkgs/pict-lib/pict/flash.rkt
deleted file mode 100644
index 75d59ac674..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/flash.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require texpict/flash)
-(provide (all-from-out texpict/flash))
diff --git a/pkgs/pict-pkgs/pict-lib/pict/main.rkt b/pkgs/pict-pkgs/pict-lib/pict/main.rkt
deleted file mode 100644
index 5daf03affb..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/main.rkt
+++ /dev/null
@@ -1,181 +0,0 @@
-#lang racket/base
-(require "private/main.rkt"
-         racket/contract
-         racket/class
-         racket/draw
-         racket/bool)
-
-(define a-number 0)
-
-(provide 
- (except-out (all-from-out "private/main.rkt")
-             pict->bitmap
-             pict->argb-pixels
-             argb-pixels->pict
-             colorize
-             pin-under pin-over disk
-             vl-append
-             vc-append
-             vr-append
-             ht-append
-             hc-append
-             hb-append
-             htl-append
-             hbl-append
-             cellophane
-             dc
-             table)
- (contract-out
-  [table (->i ([ncols exact-positive-integer?]
-               [picts (non-empty-listof pict?)]
-               [col-aligns (list*of (->* () #:rest (listof pict?) pict?))]
-               [row-aligns (list*of (->* () #:rest (listof pict?) pict?))]
-               [col-seps (list*of real?)]
-               [row-seps (list*of real?)])
-              #:pre (ncols picts)
-              (zero? (remainder (length picts) ncols))
-              [result pict?])]
-  [dc (->i ([draw (-> (is-a?/c dc<%>) real? real? any)]
-            [w real?]
-            [h real?])
-           ([d (or/c #f real?)]
-            [a (or/c #f real?)])
-           #:pre (draw) (does-draw-restore-the-state-after-being-called? draw)
-           [p pict?])]
-  [cellophane (-> pict? (real-in 0 1) pict?)]
-  [vl-append *-append/c]
-  [vc-append *-append/c]
-  [vr-append *-append/c]
-  [ht-append *-append/c]
-  [hc-append *-append/c]
-  [hb-append *-append/c]
-  [htl-append *-append/c]
-  [hbl-append *-append/c]
-  
-  [colorize (-> pict? 
-                (or/c string? 
-                      (is-a?/c color%)
-                      (list/c byte? byte? byte?))
-                pict?)]
-                
-  [pict->bitmap (->* (pict?)
-                     ((or/c 'unsmoothed 'smoothed 'aligned))
-                     (is-a?/c bitmap%))]
-  [pict->argb-pixels (->* (pict?) 
-                          ((or/c 'unsmoothed 'smoothed 'aligned))
-                          (and/c bytes? multiple-of-four-bytes?))]
-  [argb-pixels->pict (-> (and/c bytes? multiple-of-four-bytes?) 
-                         exact-nonnegative-integer?
-                         pict?)]
-  [pin-under
-   (->i ([base pict?]
-         [dx/fp (or/c real? pict?)]
-         [dy/f (dx/fp)
-               (if (real? dx/fp)
-                   real?
-                   (-> pict? pict? (values real? real?)))]
-         [pict pict?])
-        [result pict?])]
-  [pin-over
-   (->i ([base pict?]
-         [dx/fp (or/c real? pict?)]
-         [dy/f (dx/fp)
-               (if (real? dx/fp)
-                   real?
-                   (-> pict? pict? (values real? real?)))]
-         [pict pict?])
-        [result pict?])]
-  [disk (->* ((and/c rational? (not/c negative?))) (#:draw-border? any/c) pict?)]))
-
-(define (does-draw-restore-the-state-after-being-called? draw)
-  (define bdc (new bitmap-dc% [bitmap (make-bitmap 1 1)]))
-  (randomize-state bdc)
-  (define old-state (get-dc-state bdc))
-  (draw bdc 0 0)
-  (equal? (get-dc-state bdc) old-state))
-
-;; randomizes some portions of the state of the given dc;
-;; doesn't pick random values for things that the 'dc'
-;; function promises not to change (e.g. the pen/brush style).
-(define (randomize-state dc)
-  (send dc set-origin (random-real) (random-real))
-  (send dc set-pen (random-color) (random 255) 'solid)
-  (send dc set-brush (random-color) 'solid)
-  (send dc set-alpha (random))
-  (send dc set-text-background (random-color))
-  (send dc set-text-foreground (random-color))
-  (send dc set-text-mode 'transparent)
-  (send dc set-font (send the-font-list find-or-create-font 
-                          (+ 1 (random 254))
-                          (pick-one 'default 'decorative 'roman 'script
-                                    'swiss 'modern 'symbol 'system)
-                          (pick-one 'normal 'italic 'slant)
-                          (pick-one 'normal 'bold 'light)))
-  ;; set-transformation is relatively expensive 
-  ;; at the moment, so we don't randomize it
-  #;
-  (send dc set-transformation
-        (vector (vector (random-real) (random-real) (random-real) 
-                        (random-real) (random-real) (random-real))
-                (random-real) (random-real) (random-real) (random-real) (random-real))))
-
-(define (random-real) (+ (random 1000) (random)))
-(define (random-color) (make-object color% (random 255) (random 255) (random 255)))
-(define (pick-one . args) (list-ref args (random (length args))))
-
-(define (get-dc-state dc)
-  (vector (pen->vec (send dc get-pen))
-          (brush->vec (send dc get-brush))
-          (send dc get-alpha)
-          (font->vec (send dc get-font))
-          (let-values ([(ox oy) (send dc get-origin)])
-            (cons ox oy))
-          (color->vec (send dc get-text-background))
-          (send dc get-text-mode)
-          (send dc get-transformation)
-          (color->vec (send dc get-text-foreground))))
-
-(define (pen->vec pen) 
-  (vector (color->vec (send pen get-color))
-          (send pen get-width)
-          (send pen get-style)))
-
-(define (brush->vec brush)
-  (vector (color->vec (send brush get-color))
-          (send brush get-style)))
-
-(define (font->vec font)
-  (vector (send font get-point-size)
-          (send font get-family)
-          (send font get-style)
-          (send font get-weight)))
-
-(define (color->vec c) 
-  (vector (send c red) (send c green) (send c blue)))
-
-(define *-append/c
-  (->* ()
-       ()
-       #:rest (or/c (cons/c real? (listof pict?))
-                    (listof pict?))
-       pict?))
-
-(define (multiple-of-four-bytes? b)
-  (zero? (modulo (bytes-length b) 4)))
-  
-(require "private/play-pict.rkt")
-(provide
- (contract-out
-  [fade-pict (->* ((real-in 0.0 1.0) pict? pict?) (#:combine (-> pict? pict? pict?)) pict?)]
-  [slide-pict (-> pict? pict? pict? pict? (real-in 0.0 1.0) pict?)]
-  [slide-pict/center (-> pict? pict? pict? pict? (real-in 0.0 1.0) pict?)]
-  [fade-around-pict (-> (real-in 0.0 1.0) pict? (-> pict? pict?) pict?)]
-  [sequence-animations (->* () #:rest (listof (-> (real-in 0.0 1.0) pict?))
-                            (-> (real-in 0.0 1.0) pict?))]
-  [reverse-animations (->* () #:rest (listof (-> (real-in 0.0 1.0) pict?))
-                           (-> (real-in 0.0 1.0) pict?))]
-  [fast-start (-> (real-in 0.0 1.0) (real-in 0.0 1.0))]
-  [fast-end (-> (real-in 0.0 1.0) (real-in 0.0 1.0))]
-  [fast-edges (-> (real-in 0.0 1.0) (real-in 0.0 1.0))]
-  [fast-middle (-> (real-in 0.0 1.0) (real-in 0.0 1.0))]
-  [split-phase (-> (real-in 0.0 1.0) (values (real-in 0.0 1.0) (real-in 0.0 1.0)))]))
diff --git a/pkgs/pict-pkgs/pict-lib/pict/private/convertible.rkt b/pkgs/pict-pkgs/pict-lib/pict/private/convertible.rkt
deleted file mode 100644
index 579c48da3d..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/private/convertible.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(provide prop:pict-convertible prop:pict-convertible? pict-convertible? pict-convert)
-
-(define-values (prop:pict-convertible -pict-convertible? pict-convertible-ref)
-  (make-struct-type-property 'pict-convertible))
-
-(define-values (prop:pict-convertible? pict-convertible?? pict-convertible?-ref)
-  (make-struct-type-property 'pict-convertible?))
-
-(define (pict-convertible? x)
-  (and (-pict-convertible? x)
-       (if (pict-convertible?? x)
-           ((pict-convertible?-ref x) x)
-           #t)))
-
-(define (pict-convert v)
-  (unless (pict-convertible? v)
-    (raise-type-error 'pict-convert "pict-convertible" v))
-  ((pict-convertible-ref v) v))
diff --git a/pkgs/pict-pkgs/pict-lib/pict/private/hv.rkt b/pkgs/pict-pkgs/pict-lib/pict/private/hv.rkt
deleted file mode 100644
index 085800c025..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/private/hv.rkt
+++ /dev/null
@@ -1,129 +0,0 @@
-#lang racket/base
-(require "../main.rkt"
-         "layout.rkt"
-         racket/match)
-
-#|
-
-A note on optimal area algorithms for upward drawing of binary trees
-P. Crescenzi, G. Di Battista, and A. Piperno
-Computational Geometry, Theory and Applications 2 (1992)
-
-|#
-(provide hv-alternating)
-(define (hv-alternating t #:x-spacing [given-x-spacing #f] #:y-spacing [given-y-spacing #f])
-  (define-values (x-size y-size) (compute-spacing t #f #f))
-  (define x-spacing (or given-x-spacing (* x-size 1.5)))
-  (define y-spacing (or given-y-spacing (* y-size 1.5)))
-  (inset
-   (let loop ([t t]
-              [l #t])
-     (match t
-       [#f (blank)]
-       [(tree-layout pict (list left right))
-        (define-values (left-t left-color left-width)
-          (match left
-            [#f (values #f #f #f)]
-            [(tree-edge child color width) (values child color width)]))
-        (define-values (right-t right-color right-width)
-          (match right
-            [#f (values #f #f #f)]
-            [(tree-edge child color width) (values child color width)]))
-        (cond
-          [(and (not left-t) (not right-t)) 
-           (dot-ize pict)]
-          [(not left-t) 
-           (empty-left (dot-ize pict) x-spacing right-color right-width (loop right-t (not l)))]
-          [(not right-t)
-           (empty-right (dot-ize pict) y-spacing left-color left-width (loop left-t (not l)))]
-          [else
-           (define left-p (loop left-t (not l)))
-           (define right-p (loop right-t (not l)))
-           (define main
-             ((if l left-right top-bottom)
-              x-spacing y-spacing
-              left-p right-p))
-           (pin-over
-            (add-lines main left-color right-color left-width right-width left-p right-p)
-            (- (/ (pict-width pict) 2))
-            (- (/ (pict-height pict) 2))
-            pict)])]))
-   (/ x-size 2)
-   (/ y-size 2)))
-
-(define (dot-ize p)
-  (define b (blank))
-  (refocus (cc-superimpose b p) b))
-
-(define (left-right hgap vgap left right)
-  (ht-append
-   hgap
-   (vl-append (blank 0 vgap) left)
-   right))
-
-(define (top-bottom hgap vgap left right)
-  (vl-append 
-   vgap
-   (ht-append (blank hgap 0) left)
-   right))
-
-(define (empty-left pict hgap color width sub-tree-p)
-  (add-a-line (ht-append hgap pict sub-tree-p)
-              color 
-              width
-              sub-tree-p))
-  
-(define (empty-right pict vgap color width sub-tree-p)
-  (add-a-line (vl-append vgap pict sub-tree-p)
-              color
-              width
-              sub-tree-p))
-
-(define (add-lines main left-color right-color left-width right-width t1 t2)
-  (add-a-line (add-a-line main left-color left-width t1)
-              right-color right-width t2))
-  
-(define (add-a-line main color width sub)
-  (define colored
-    (colorize
-      (pin-line (ghost main)
-                main lt-find
-                sub lt-find)
-      color))
-  (define with-linewidth
-    (if (eq? width 'unspecified)
-        colored
-        (linewidth width colored)))
-  (cc-superimpose
-   (launder with-linewidth)
-   main))
-
-(module+ test
-  (require rackunit)
-  
-  (check-pred pict? 
-              (hv-alternating 
-               (let* ([p1 (_tree-layout #f #f)]
-                      [p2 (_tree-layout p1 p1)]
-                      [p3 (_tree-layout p2 p2)]
-                      [p4 (_tree-layout p3 p3)])
-                 (_tree-layout p4 p4))))
-  (check-pred 
-   pict?
-   (hv-alternating (_tree-layout (_tree-layout #f #f) #f)))
-  (check-pred
-   pict?
-   (hv-alternating (_tree-layout #f (_tree-layout #f (_tree-layout #f #f)))))
-  (check-pred pict? (hv-alternating #f)))
-
-(module+ main
-  (define (complete n)
-    (cond
-      [(= n 0) #f]
-      [else
-       (define t (complete (- n 1)))
-       (_tree-layout t t)]))
-  
-  ;; an example from the paper
-  (hv-alternating (complete 4)))
-
diff --git a/pkgs/pict-pkgs/pict-lib/pict/private/layout.rkt b/pkgs/pict-pkgs/pict-lib/pict/private/layout.rkt
deleted file mode 100644
index ae4579adc3..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/private/layout.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-(require "../main.rkt" racket/match)
-
-(provide (struct-out tree-layout)
-         (struct-out tree-edge)
-         binary-tree-layout?
-         _tree-layout?
-         _tree-layout
-         _tree-edge
-         default-node-pict
-         compute-spacing)
-
-;; values of this struct leak outside, so it cannot be transparent
-(struct tree-layout (pict children))
-(struct tree-edge (child edge-color edge-width))
-
-(define _tree-layout
-  (let ([constructor tree-layout])
-    (define (tree-layout #:pict [node-pict #f]
-                         . children)
-      (constructor (or node-pict default-node-pict)
-                   (for/list ([child (in-list children)])
-                     (cond
-                       [(tree-edge? child) child]
-                       [(not child) child]
-                       [else (_tree-edge child)]))))
-    tree-layout))
-
-(define _tree-layout?
-  (let ([predicate tree-layout?])
-    (define (tree-layout? v)
-      (or (not v) (predicate v)))
-    tree-layout?))
-
-(define default-node-pict
-  (cc-superimpose
-   (disk 16 #:draw-border? #f)
-   (colorize (disk 12 #:draw-border? #f) "white")))
-
-(define _tree-edge
-  (let ([constructor tree-edge])
-    (define (tree-edge child
-                       #:edge-color [edge-color "gray"]
-                       #:edge-width [edge-width 'unspecified])
-      (constructor child edge-color edge-width))
-    tree-edge))
-
-(define (binary-tree-layout? t)
-  (match t
-    [#f #t]
-    [(tree-layout pict (list left right))
-     (and (binary-tree-edge? left)
-          (binary-tree-edge? right))]
-    [else #f]))
-
-(define (binary-tree-edge? e)
-  (match e
-    [(tree-edge t _ _) (binary-tree-layout? t)]
-    [#f #t]))
-
-(define (compute-spacing t given-x-spacing given-y-spacing)
-  (cond
-    [(and given-x-spacing given-y-spacing)
-     (values given-x-spacing given-y-spacing)]
-    [else
-     (define x-spacing 0)
-     (define y-spacing 0)
-     
-     (let loop ([t t])
-       (match t
-         [#f (void)]
-         [(tree-layout pict (list children ...))
-          (set! x-spacing (max (pict-width pict) x-spacing))
-          (set! y-spacing (max (pict-height pict) y-spacing))
-          (for ([edge (in-list children)])
-            (match edge
-              [#f (void)]
-              [(tree-edge child edge-color _)
-               (loop child)]))]))
-     
-     (values (or given-x-spacing x-spacing)
-             (or given-y-spacing y-spacing))]))
diff --git a/pkgs/pict-pkgs/pict-lib/pict/private/main.rkt b/pkgs/pict-pkgs/pict-lib/pict/private/main.rkt
deleted file mode 100644
index 9268f5ed17..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/private/main.rkt
+++ /dev/null
@@ -1,309 +0,0 @@
-(module pict scheme/base
-  (require (rename-in "pict.rkt"
-                      [hline t:hline]
-                      [vline t:vline]
-                      [frame t:frame])
-           (rename-in "utils.rkt"
-                      [pin-line t:pin-line]
-                      [pin-arrow-line t:pin-arrow-line]
-                      [pin-arrows-line t:pin-arrows-line])
-           (only-in racket/draw dc-path% make-bitmap bitmap% bitmap-dc%)
-           (only-in racket/class new send make-object is-a?/c))
-
-  (define (hline w h #:segment [seg #f])
-    (if seg
-        (dash-hline w h seg)
-        (t:hline w h)))
-
-  (define (vline w h #:segment [seg #f])
-    (if seg
-        (dash-vline w h seg)
-        (t:vline w h)))
-
-  (define (frame p
-                 #:color [col #f]
-                 #:line-width [lw #f]
-                 #:segment [seg #f])
-    (let* ([f (if seg
-                  (dash-frame (launder (ghost p)) seg)
-                  (t:frame (launder (ghost p))))]
-           [f (if col
-                  (colorize f col)
-                  f)]
-           [f (if lw 
-                  (linewidth lw f)
-                  f)])
-      (refocus (cc-superimpose p f)
-               p)))
-
-  (define (pict-path? p)
-    (or (pict? p)
-        (and (pair? p)
-             (list? p)
-             (andmap pict? p))))
-
-  (define (pin-line p 
-                    src src-find
-                    dest dest-find
-                    #:start-angle [sa #f] #:end-angle [ea #f]
-                    #:start-pull [sp #f] #:end-pull [ep #f]
-                    #:color [col #f]
-                    #:alpha [alpha 1.0]
-                    #:line-width [lw #f]
-                    #:under? [under? #f]
-                    #:solid? [solid? #t]
-                    #:style [style #f])
-    (if (not (or sa ea))
-        (finish-pin (launder (t:pin-line (ghost p)
-                                         src src-find 
-                                         dest dest-find
-                                         #:style style))
-                    p lw col alpha under?)
-        (pin-curve* #f #f p src src-find dest dest-find
-                    sa ea sp ep 0 col lw under? #t
-                    style alpha)))
-
-  (define (pin-arrow-line sz p 
-                          src src-find
-                          dest dest-find
-                          #:start-angle [sa #f] #:end-angle [ea #f]
-                          #:start-pull [sp #f] #:end-pull [ep #f]
-                          #:color [col #f]
-                          #:alpha [alpha 1.0]
-                          #:line-width [lw #f]
-                          #:under? [under? #f]
-                          #:solid? [solid? #t]
-                          #:style [style #f]
-                          #:hide-arrowhead? [hide-arrowhead? #f])
-    (if (not (or sa ea))
-        (finish-pin (launder (t:pin-arrow-line sz (ghost p)
-                                               src src-find 
-                                               dest dest-find
-                                               #f #f #f solid?
-                                               #:hide-arrowhead? hide-arrowhead?
-                                               #:style style))
-                    p lw col alpha under?)
-        (pin-curve* #f (not hide-arrowhead?) p src src-find dest dest-find
-                    sa ea sp ep sz col lw under? solid?
-                    style alpha)))
-  
-    (define (pin-arrows-line sz p 
-                             src src-find
-                             dest dest-find
-                             #:start-angle [sa #f] #:end-angle [ea #f]
-                             #:start-pull [sp #f] #:end-pull [ep #f]
-                             #:color [col #f]
-                             #:alpha [alpha 1.0]
-                             #:line-width [lw #f]
-                             #:under? [under? #f]
-                             #:solid? [solid? #t]
-                             #:style [style #f]
-                             #:hide-arrowhead? [hide-arrowhead? #f])
-      (if (not (or sa ea))
-          (finish-pin (launder (t:pin-arrows-line sz (ghost p)
-                                                  src src-find 
-                                                  dest dest-find
-                                                  #f #f #f solid?
-                                                  #:hide-arrowhead? hide-arrowhead?
-                                                  #:style style))
-                      p lw col alpha under?)
-          (pin-curve* (not hide-arrowhead?) (not hide-arrowhead?)
-                      p src src-find dest dest-find
-                      sa ea sp ep sz col lw under? solid? 
-                      style alpha)))
-    
-  (define (pin-curve* start-arrow? end-arrow? p 
-                      src src-find
-                      dest dest-find
-                      sa ea sp ep
-                      sz col lw
-                      under? solid?
-                      style alpha)
-    (let-values ([(sx0 sy0) (src-find p src)]
-                 [(dx0 dy0) (dest-find p dest)])
-      (let* ([sa (or sa
-                     (atan (- sy0 dy0) (- dx0 sx0)))]
-             [ea (or ea
-                     (atan (- sy0 dy0) (- dx0 sx0)))]
-             [d (sqrt (+ (* (- dy0 sy0) (- dy0 sy0)) (* (- dx0 sx0) (- dx0 sx0))))]
-             [sp (* (or sp 1/4) d)]
-             [ep (* (or ep 1/4) d)])
-        (let ([dx (if end-arrow? (- dx0 (* sz (cos ea))) dx0)]
-              [dy (if end-arrow? (+ dy0 (* sz (sin ea))) dy0)]
-              [sx (if start-arrow? (+ sx0 (* sz (cos sa))) sx0)]
-              [sy (if start-arrow? (- sy0 (* sz (sin sa))) sy0)]
-              [path (new dc-path%)]
-              [maybe-pin-line
-               (lambda (arrow? p sx sy dx dy)
-                 (if arrow?
-                     (pin-arrow-line 
-                      sz
-                      p
-                      p (lambda (a b) (values sx sy))
-                      p (lambda (a b) (values dx dy))
-                      #:line-width lw
-                      #:color col
-                      #:under? under?
-                      #:solid? solid?
-                      #:style style)
-                     p))])
-          (send path move-to sx sy)
-          (send path curve-to
-                (+ sx (* sp (cos sa)))
-                (- sy (* sp (sin sa)))
-                (- dx (* ep (cos ea)))
-                (+ dy (* ep (sin ea)))
-                dx
-                dy)
-          (maybe-pin-line 
-           start-arrow?
-           (maybe-pin-line 
-            end-arrow?
-            ((if under? pin-under pin-over)
-             p
-             0 0
-             (let* ([p (dc (lambda (dc x y)
-                             (let ([b (send dc get-brush)])
-                               (send dc set-brush "white" 'transparent)
-                               (send dc draw-path path x y)
-                               (send dc set-brush b)))
-                           0 0)]
-                    [p (if col
-                           (colorize p col)
-                           p)]
-                    [p (if (= alpha 1.0)
-                           p
-                           (cellophane p alpha))]
-                    [p (if lw
-                           (linewidth lw p)
-                           p)]
-                    [p (if style
-                           (linestyle style p)
-                           p)])
-               p))
-            dx dy dx0 dy0)
-           sx sy sx0 sy0)))))
-
-
-  (define (finish-pin l p lw col alpha under?)
-    (let* ([l (if lw
-                  (linewidth lw l)
-                  l)]
-           [l (if col
-                  (colorize l col)
-                  l)]
-           [l (if (= alpha 1.0)
-                  l
-                  (cellophane l alpha))])
-      (if under?
-          (cc-superimpose l p)
-          (cc-superimpose p l))))
-
-  (define fish
-    (let ([standard-fish
-           (lambda (w h 
-                      #:direction [direction 'left]
-                      #:color [color "blue"]
-                      #:eye-color [eye-color "black"]
-                      #:open-mouth [open-mouth #f])
-             (standard-fish w h direction color eye-color open-mouth))])
-      standard-fish))
-
-  (define (pict->bitmap p [smoothing 'aligned])
-    (define w (pict-width p))
-    (define h (pict-height p))
-    (define bm (make-bitmap (max 1 (inexact->exact (ceiling w)))
-                            (max 1 (inexact->exact (ceiling h)))))
-    (unless (send bm ok?)
-      (error 'pict->bitmap
-             (string-append "bitmap creation failed\n"
-                            "  possible reason: out of memory\n"
-                            "  pict width: ~a\n"
-                            "  pict height: ~a")
-             w
-             h))
-    (define dc (make-object bitmap-dc% bm))
-    (send dc set-smoothing smoothing)
-    (draw-pict p dc 0 0)
-    bm)
-  
-  (define (pict->argb-pixels p [smoothing 'aligned])
-    (define bm (pict->bitmap p smoothing))
-    (define w (send bm get-width)) 
-    (define h (send bm get-height))
-    (define bytes (make-bytes (* w h 4)))
-    (send bm get-argb-pixels 0 0 w h bytes)
-    bytes)
-  
-  (define (argb-pixels->pict b w)
-    (define h (/ (bytes-length b) w 4))
-    (define bm (make-bitmap w (/ (bytes-length b) w 4)))
-    (send bm set-argb-pixels 0 0 w h b)
-    (bitmap bm))
-
-  (provide hline vline
-           frame
-           pict-path?
-           pin-line pin-arrow-line pin-arrows-line
-           (except-out (all-from-out "pict.rkt")
-                       
-                       dash-hline dash-vline
-
-                       dash-frame oval oval/radius
-
-                       caps-text
-                       big-circle
-
-                       picture
-                       cons-picture
-                       cons-picture*
-                       place-over
-                       place-under
-
-                       record
-                       thick
-                       thin
-
-                       find-lt
-                       find-lc
-                       find-lb
-                       find-ltl
-                       find-lbl
-                       find-ct
-                       find-cc
-                       find-cb
-                       find-ctl
-                       find-cbl
-                       find-rt
-                       find-rc
-                       find-rb
-                       find-rtl
-                       find-rbl
-
-                       drop
-                       lift)
-           (rename-out [drop drop-below-ascent]
-                       [lift lift-above-baseline])
-
-           (except-out (all-from-out "utils.rkt")
-                   
-                       color-frame color-dash-frame
-                       round-frame color-round-frame
-    
-                       cons-colorized-picture
-                       arrow-line
-                       arrows-line
-
-                       add-line
-                       add-arrow-line
-                       add-arrows-line
-
-                       explode-star
-
-                       standard-fish
-
-                       find-pen find-brush)
-           (rename-out [fish standard-fish])
-           pict->bitmap
-           pict->argb-pixels
-           argb-pixels->pict))
diff --git a/pkgs/pict-pkgs/pict-lib/pict/private/naive-layered.rkt b/pkgs/pict-pkgs/pict-lib/pict/private/naive-layered.rkt
deleted file mode 100644
index c28278e66a..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/private/naive-layered.rkt
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang racket/base
-(require racket/match
-         "../main.rkt"
-         "layout.rkt")
-(provide naive-layered)
-(define (naive-layered t #:x-spacing [given-x-spacing #f] #:y-spacing [given-y-spacing #f])
-  (define-values (x-space y-space) (compute-spacing t given-x-spacing given-y-spacing))
-
-  (define root+tree-pair
-    (let loop ([t t])
-      (match t
-        [#f (cons #f (blank))]
-        [(tree-layout pict children)
-         (cond
-           [(andmap not children)
-            (define this-root (ghost (launder pict)))
-            (cons this-root (cc-superimpose this-root pict))]
-           [else
-            (define children-pairs
-              (for/list ([child (in-list children)])
-                (match child
-                  [#f 
-                   (define b (blank))
-                   (cons b b)]
-                  [(tree-edge child color _)
-                   (loop child)])))
-            (define this-root (launder (ghost pict)))
-            (define children-roots (map car children-pairs))
-            (define children-trees (map cdr children-pairs))
-            (let loop ([main (place-parent-over-children
-                              (cc-superimpose this-root pict)
-                              children-roots
-                              (vc-append
-                               y-space
-                               (ghost (launder pict))
-                               (apply ht-append x-space children-trees)))]
-                       [children-roots children-roots]
-                       [tree-edges children])
-              (cond
-                [(null? children-roots) (cons this-root main)]
-                [else 
-                 (define child-root (car children-roots))
-                 (define this-tree-edge (car tree-edges))
-                 (match this-tree-edge
-                   [#f (loop main (cdr children-roots) (cdr tree-edges))]
-                   [(tree-edge child edge-color edge-width)
-                    (define *w/line
-                      (colorize
-                       (launder
-                        (pin-line (ghost main)
-                                  this-root cc-find
-                                  child-root cc-find))
-                       edge-color))
-                    (define w/line
-                      (if (eq? edge-width 'unspecified)
-                          *w/line
-                          (linewidth edge-width *w/line)))
-                    (loop (cc-superimpose w/line main)
-                          (cdr children-roots)
-                          (cdr tree-edges))])]))])])))
-  
-  (cdr root+tree-pair))
-
-(define (place-parent-over-children parent-root children-roots main)
-  (define x-min (pict-width main))
-  (define x-max 0)
-  (for ([child-root (in-list children-roots)])
-    (when child-root
-      (define-values (c-min _1) (lc-find main child-root))
-      (define-values (c-max _2) (rc-find main child-root))
-      (set! x-min (min c-min x-min))
-      (set! x-max (max c-max x-max))))
-  (pin-over main
-            (- (/ (+ x-min x-max) 2) (/ (pict-width parent-root) 2))
-            0
-            parent-root))
-                             
-
-(module+ test 
-  (require rackunit)
-  (check-pred pict? (naive-layered #f))
-  (check-pred pict? (naive-layered (_tree-layout)))
-  (check-pred pict? (naive-layered (_tree-layout
-                                    (_tree-layout)
-                                    (_tree-layout))))
-  (check-pred pict? (naive-layered (_tree-layout
-                                    (_tree-layout)
-                                    (_tree-layout)
-                                    (_tree-layout
-                                     (_tree-layout)
-                                     (_tree-layout)
-                                     (_tree-layout
-                                      (_tree-layout)
-                                      (_tree-layout)))))))
-
-(module+ main
-  (define (complete n)
-    (cond
-      [(= n 0) #f]
-      [else
-       (define t (complete (- n 1)))
-       (apply _tree-layout (build-list n (λ (_) t)))]))
-  
-  (naive-layered (complete 4))
-  (define right-subtree-with-long-left-chain
-    (_tree-layout
-     (_tree-layout
-      (_tree-layout #f #f)
-      (_tree-layout
-       (_tree-layout #f #f)
-       #f))
-     (_tree-layout
-      (_tree-layout
-       (_tree-layout
-        (_tree-layout 
-         (_tree-layout #f #f)
-         #f)
-        #f)
-       #f)
-      #f)))
-  (naive-layered right-subtree-with-long-left-chain))
diff --git a/pkgs/pict-pkgs/pict-lib/pict/private/pict.rkt b/pkgs/pict-pkgs/pict-lib/pict/private/pict.rkt
deleted file mode 100644
index 0bc369b6a0..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/private/pict.rkt
+++ /dev/null
@@ -1,1894 +0,0 @@
-#lang racket/base
-(require racket/draw
-         racket/gui/dynamic
-         racket/serialize
-         (except-in racket/list drop)
-         racket/contract/base
-         racket/class
-         (prefix-in file: file/convertible)
-         "convertible.rkt")
-
-(provide dc-for-text-size
-         convert-bounds-padding
-         show-pict
-         caps-text current-expected-text-scale
-         dc
-         linewidth
-         linestyle
-         
-         draw-pict
-         make-pict-drawer
-
-         (contract-out
-          [text (->* (string?)
-                     (text-style/c 
-                      (and/c (between/c 1 1024) integer?)
-                      number?)
-                     pict?)])
-
-         text-style/c
-
-         
-         (struct-out pict)
-         (struct-out child)
-
-         black-and-white
-
-         lt-find
-         lc-find
-         lb-find
-         ltl-find
-         lbl-find
-         ct-find
-         cc-find
-         cb-find
-         ctl-find
-         cbl-find
-         rt-find
-         rc-find
-         rb-find
-         rtl-find
-         rbl-find
-
-         find-lt  ; (left & top)  ; pict pict-path -> dx dy
-         find-lc  ; (left & vertical center)
-         find-lb  ; (left & bottom)
-         find-ltl ; (left and top baseline)
-         find-lbl ; (left and bottom baseline)
-         find-ct  ; (horizontal center & top)
-         find-cc
-         find-cb
-         find-ctl
-         find-cbl
-         find-rt
-         find-rc
-         find-rb
-         find-rtl
-         find-rbl
-
-         launder  ; pict -> pict
-
-         blank        ; -> pict
-         ;; w h -> pict
-         ;; w h d -> pict
-
-         clip-descent   ; pict -> pict
-         clip-ascent    ; pict -> pict
-         lift           ; pict -> pict
-         drop           ; pict -> pict
-         baseless       ; pict -> pict
-         inset          ; pict i -> pict
-                                        ; pict hi vi -> pict
-                                        ; pict l t r b -> pict
-         refocus        ; pict pict -> pict
-         panorama       ; pict -> pict
-
-         use-last       ; pict pict -> pict
-         use-last*      ; pict pict -> pict
-
-         hline        ; w h -> pict
-         dash-hline   ; w h seg-length -> pict ; default seg-length is 5
-         vline        ; w h -> pict
-         dash-vline   ; w h seg-length -> pict ; default seg-length is 5
-
-         frame        ; pict -> pict
-         dash-frame   ; pict seg-length -> pict ; default seg-length is 5
-         oval         ; pict -> pict
-         oval/radius  ; pict r -> pict ; r is radius of corners
-
-         big-circle   ; diameter -> pict
-
-         thick       ; pict -> pict
-         thin        ; pict -> pict
-
-         ghost        ; pict -> pict
-
-         record       ; pict pict ... -> pict
-
-         vl-append    ; d pict ... -> pict ; d units between each picture
-         vc-append
-         vr-append
-         ht-append
-         hc-append
-         hb-append
-         htl-append       ; align bottoms of ascents
-         hbl-append       ; align tops of descents (normal text alignment)
-
-         lt-superimpose ; pict ... -> pict
-         lb-superimpose
-         lc-superimpose
-         ltl-superimpose
-         lbl-superimpose
-         rt-superimpose
-         rb-superimpose
-         rc-superimpose
-         rtl-superimpose
-         rbl-superimpose
-         ct-superimpose
-         cb-superimpose
-         cc-superimpose
-         ctl-superimpose
-         cbl-superimpose
-
-         table ; ncols pict-list col-aligns row-aligns col-seps row-seps -> pict
-
-         colorize ; pict color-string -> pict
-
-         picture       ; w h command-list -> pict
-         picture*      ; w h a d command-list -> pict
-
-         cons-picture  ; pict command-list -> pict
-         cons-picture* ; pict command-list -> pict
-
-         place-over
-         place-under
-         pin-over
-         pin-under)
-
-;; ; ----------------------------------------
-
-(define-struct pict (draw       ; drawing instructions
-                     width      ; total width
-                     height     ; total height >= ascent + desecnt
-                     ascent     ; portion of height above top baseline
-                     descent    ; portion of height below bottom baseline
-                     children   ; list of child records
-                     panbox     ; panorama box, computed on demand
-                     last)      ; a descendent for the bottom-right
-  #:mutable
-  #:property prop:pict-convertible (λ (v) v)
-  #:property file:prop:convertible (lambda (v mode default)
-                                     (convert-pict v mode default))
-  #:property prop:serializable (make-serialize-info
-                                (lambda (p)
-                                  (convert-pict-to-vector p))
-                                #'pict-deserialize-info
-                                #f
-                                (or (current-load-relative-directory)
-                                    (current-directory))))
-(define-struct child (pict dx dy sx sy syx sxy))
-(define-struct bbox (x1 y1 x2 y2 ay dy))
-
-;; ----------------------------------------
-
-(define family/c
-  (or/c 'base 'default 'decorative 'roman 'script 'swiss 'modern 'symbol 'system))
-
-(define text-style/c
-  (flat-rec-contract
-   text-style/c
-   (or/c null?
-         (is-a?/c font%)
-         family/c
-         string? ;; could be more specific, I guess.
-         (cons/c string? family/c)
-         (cons/c (or/c 'bold 'italic 'superscript 'subscript 'combine 'no-combine 'caps
-                       'outline 'aligned 'unaligned
-                       (is-a?/c color%))
-                 text-style/c))))
-
-
-(define default-seg 5)
-(define recordseplinespace 4)
-
-(define (quotient* a b)
-  (if (integer? a)
-      (quotient a b)
-      (/ a b)))
-
-(define blank 
-  (case-lambda
-   [() (blank 0 0 0)]
-   [(s) (blank s s)]
-   [(w h) (blank w h 0)]
-   [(w a d) (make-pict `(picture ,w ,(+ a d)) w (+ a d) a d null #f #f)]
-   [(w h a d) (make-pict `(picture ,w ,h) w h a d null #f #f)]))
-
-(define (extend-pict box dx dy dw da dd draw)
-  (let ([w (pict-width box)]
-        [h (pict-height box)]
-        [d (pict-descent box)]
-        [a (pict-ascent box)])
-    (make-pict (if draw draw (pict-draw box))
-               (+ w dw) (+ h da dd) 
-               (max 0 (+ a da)) (max 0 (+ d dd))
-               (list (make-child box dx dy 1 1 0 0))
-               #f
-               (pict-last box))))
-
-(define (transform dx dy tdx tdy tsx tsy tsxy tsyx)
-  (values (+ (* tsx dx) (* tsxy dy) tdx)
-          (+ (* tsy dy) (* tsyx dx) tdy)))
-
-(define (single-pict-offset pict subbox dx dy)
-  (let floop ([box pict]
-              [found values]
-              [not-found (lambda () (error 'find-XX
-                                           "sub-pict: ~a not found in: ~a" 
-                                           subbox pict))])
-    (if (eq? box subbox)
-        (found dx dy)
-        (let loop ([c (pict-children box)])
-          (if (null? c) 
-              (not-found)
-              (floop (child-pict (car c))
-                     (lambda (dx dy)
-                       (let ([c (car c)])
-                         (let-values ([(dx dy)
-                                       (transform
-                                        dx dy
-                                        (child-dx c) (child-dy c)
-                                        (child-sx c) (child-sy c)
-                                        (child-sxy c) (child-syx c))])
-                           (found dx dy))))
-                     (lambda ()
-                       (loop (cdr c)))))))))
-
-(define (find-lbx pict subbox-path dx dy)
-  (if (pict? subbox-path)
-      (single-pict-offset pict subbox-path dx dy)
-      (let loop ([l (cons pict subbox-path)])
-        (if (null? (cdr l))
-            (values dx dy)
-            (let-values ([(dx dy) (loop (cdr l))])
-              (single-pict-offset (car l) (cadr l) dx dy))))))
-
-(define-values (find-lt
-                find-lc
-                find-lb
-                find-ltl
-                find-lbl
-                find-ct
-                find-cc
-                find-cb
-                find-ctl
-                find-cbl
-                find-rt
-                find-rc
-                find-rb
-                find-rtl
-                find-rbl)
-  (let ([lb (lambda (x sx w d a) x)]
-        [c (lambda (x sx w d a) (+ x (* sx (quotient* w 2))))]
-        [rt (lambda (x sx w d a) (+ x (* sx w)))]
-        [tline (lambda (x sx w d a) (+ x (* sx (- w a))))]
-        [bline (lambda (x sx w d a) (+ x (* sx d)))]
-        [find (lambda (get-x get-y)
-                (lambda (pict pict-path)
-                  (let ([p (let loop ([path pict-path])
-                             (cond
-                              [(pict? path) path]
-                              [(null? (cdr path)) (loop (car path))]
-                              [else (loop (cdr path))]))])
-                    (let ([w (pict-width p)]
-                          [h (pict-height p)]
-                          [d (pict-descent p)]
-                          [a (pict-ascent p)])
-                      (find-lbx pict pict-path
-                                (get-x 0 1 w 0 0)
-                                (get-y 0 1 h d a))))))])
-    (values (find lb rt)
-            (find lb c)
-            (find lb lb)
-            (find lb tline)
-            (find lb bline)
-            (find c rt)
-            (find c c)
-            (find c lb)
-            (find c tline)
-            (find c bline)
-            (find rt rt)
-            (find rt c)
-            (find rt lb)
-            (find rt tline)
-            (find rt bline))))
-
-(define-values (lt-find
-                lc-find
-                lb-find
-                ltl-find
-                lbl-find
-                ct-find
-                cc-find
-                cb-find
-                ctl-find
-                cbl-find
-                rt-find
-                rc-find
-                rb-find
-                rtl-find
-                rbl-find)
-  (let ([flip (lambda (orig)
-                (lambda (pict pict-path)
-                  (let-values ([(x y) (orig pict pict-path)])
-                    (values x (- (pict-height pict) y)))))])
-    (values (flip find-lt)
-            (flip find-lc)
-            (flip find-lb)
-            (flip find-ltl)
-            (flip find-lbl)
-            (flip find-ct)
-            (flip find-cc)
-            (flip find-cb)
-            (flip find-ctl)
-            (flip find-cbl)
-            (flip find-rt)
-            (flip find-rc)
-            (flip find-rb)
-            (flip find-rtl)
-            (flip find-rbl))))
-
-(define (launder box)
-  (unless (pict-panbox box)
-    (panorama-box! box))
-  (let ([b (extend-pict box 0 0 0 0 0 #f)])
-    (set-pict-children! b null)
-    (set-pict-panbox! b (pict-panbox box))
-    ;; After laundering, we can't find the last-pos box.
-    ;; So create a new last-position box to preserve the
-    ;; original shape:
-    (let ([l (pict-last box)])
-      (set-pict-last! box #f) ; preserve invariants
-      (cond
-       [(not l) b]
-       [else 
-        (let-values ([(x y) (lt-find box l)]
-                     [(l) (let loop ([l l])
-                            (if (pair? l)
-                                (if (null? (cdr l))
-                                    (car l)
-                                    (loop (cdr l)))
-                                l))])
-          (let ([b2 (blank (pict-width l) (pict-height l)
-                           (pict-ascent l) (pict-descent l))])
-            (use-last/unchecked
-             (pin-over b x y b2)
-             b2)))]))))
-
-(define (lift p n)
-  (let* ([dh (- (max 0 (- n (pict-descent p))))]
-         [do-a? (= (pict-height p)
-                   (+ (pict-ascent p) (pict-descent p)))]
-         [h2 (+ dh (pict-height p))]
-         [d2 (max 0 (- (pict-descent p) n))])
-    (make-pict (pict-draw p)
-               (pict-width p) h2
-               (if do-a?
-                   (- h2 d2)
-                   (pict-ascent p))
-               d2
-               (map (lambda (c)
-                      (make-child 
-                       (child-pict c)
-                       (child-dx c)
-                       (+ dh (child-dy c))
-                       1 1
-                       0 0))
-                    (pict-children p))
-               #f
-               (pict-last p))))
-
-(define (drop p n)
-  (let* ([dh (- (max 0 (- n (pict-ascent p))))]
-         [do-d? (= (pict-height p)
-                   (+ (pict-ascent p) (pict-descent p)))]
-         [h2 (+ dh (pict-height p))]
-         [a2  (max 0 (- (pict-ascent p) n))])
-    (make-pict (pict-draw p)
-               (pict-width p) h2
-               a2
-               (if do-d?
-                   (- h2 a2)
-                   (pict-descent p))
-               (pict-children p)
-               #f
-               (pict-last p))))
-
-(define (baseless p)
-  (let ([p (lift p (pict-descent p))])
-    (drop p (- (pict-ascent p) (pict-height p)))))
-
-(define (refocus p c)
-  (let-values ([(x y) (find-lt p c)])
-    (let ([p (inset p 
-                    (- x) (- y (pict-height p)) 
-                    (- (- (pict-width p) x (pict-width c)))
-                    (- (pict-height c) y))])
-      (make-pict (pict-draw p)
-                 (pict-width c) (pict-height c)
-                 (pict-ascent c) (pict-descent c)
-                 (pict-children p)
-                 #f
-                 (last* c)))))
-
-(define (panorama-box! p)
-  (let ([bb (pict-panbox p)])
-    (if bb
-        (values (bbox-x1 bb) (bbox-y1 bb) (bbox-x2 bb) (bbox-y2 bb)
-                (bbox-ay bb) (bbox-dy bb))
-        (let loop ([x1 0][y1 0][x2 (pict-width p)][y2 (pict-height p)]
-                   [ay (- (pict-height p) (pict-ascent p))][dy (pict-descent p)]
-                   [l (pict-children p)])
-          (if (null? l)
-              (begin
-                (set-pict-panbox! p (make-bbox x1 y1 x2 y2 ay dy))
-                (values x1 y1 x2 y2 ay dy))
-              (let ([c (car l)])
-                (let-values ([(cx1 cy1 cx2 cy2 cay cdy) (panorama-box! (child-pict c))])
-                  (loop (min x1 (* (+ cx1 (child-dx c)) (child-sx c)))
-                        (min y1 (* (+ cy1 (child-dy c)) (child-sy c)))
-                        (max x2 (* (+ cx2 (child-dx c)) (child-sx c)))
-                        (max y2 (* (+ cy2 (child-dy c)) (child-sy c)))
-                        (max ay (* (+ cay (child-dy c)) (child-sy c)))
-                        (min dy (* (+ cdy (child-dy c)) (child-sy c)))
-                        (cdr l)))))))))
-
-(define (panorama p)
-  (let-values ([(x1 y1 x2 y2 ay dy) (panorama-box! p)])
-    (let ([h (- y2 y1)])
-      (place-over (blank (- x2 x1) h (- h ay) dy)
-                  (- x1) (- y2 (pict-height p))
-                  p))))
-
-(define (clip-descent b)
-  (let* ([w (pict-width b)]
-         [h (pict-height b)]
-         [d (pict-descent b)])
-    (extend-pict
-     b 0 (- d) 
-     0 0 (- d)
-     `(picture ,w ,(- h d)
-               (put 0 ,(- d) ,(pict-draw b))))))
-
-(define (clip-ascent b)
-  (let* ([w (pict-width b)]
-         [h (pict-height b)]
-         [a (pict-descent b)])
-    (extend-pict
-     b 0 a
-     0 (- a) 0
-     `(picture ,w ,(- h a)
-               (put 0 0 ,(pict-draw b))))))
-
-(define (thickness mode b)
-  (let* ([w (pict-width b)]
-         [h (pict-height b)])
-    (extend-pict
-     b 0 0 0 0 0
-     `(picture ,w ,h
-               (thickness ,mode ,(pict-draw b))))))
-
-(define (thick b) (thickness 'thicklines b))
-(define (thin b) (thickness 'thinlines b))
-(define (line-thickness n b) (thickness n b))
-(define (line-style n s) (thickness n s))
-
-(define inset
-  (case-lambda
-   [(box a) (inset box a a a a)]
-   [(box h v) (inset box h v h v)]
-   [(box l t r b)
-    (let ([w (+ l r (pict-width box))]
-          [h (+ t b (pict-height box))])
-      (extend-pict
-       box l b
-       (+ l r) t b
-       `(picture
-         ,w ,h
-         (put ,l ,b ,(pict-draw box)))))]))
-
-(define (use-last* p sub-p)
-  (use-last p (last* sub-p)))
-
-(define (last* sub-p)
-  ;; Either use `sub-p' for last or create a path though `sub-p'
-  ;; to the last of `sub-p' (in case the last of `sub-p' is also
-  ;; in other places within `p')
-  (let ([l (pict-last sub-p)])
-    (cond
-     [(not l) sub-p]
-     [(eq? l sub-p) sub-p]
-     [(pair? l) (if (eq? (car l) sub-p)
-                    l
-                    (cons sub-p l))]
-     [else (list sub-p l)])))
-
-(define (use-last p sub-p)
-  (if (let floop ([p p] [sub-p sub-p])
-        (or (eq? p sub-p)
-            (and (pair? sub-p)
-                 (eq? p (car sub-p))
-                 (or (null? (cdr sub-p))
-                     (floop p (cdr sub-p))))
-            (ormap (lambda (c) (floop (child-pict c) sub-p))
-                   (pict-children p))))
-      (use-last/unchecked p sub-p)
-      (error 'use-last
-             "given new last-pict path: ~e not in the base pict: ~e"
-             sub-p
-             p)))
-
-(define (use-last/unchecked p sub-p)
-  (make-pict (pict-draw p)
-             (pict-width p) (pict-height p)
-             (pict-ascent p) (pict-descent p)
-             (list (make-child p 0 0 1 1 0 0))
-             #f
-             sub-p))
-
-(define dash-frame 
-  (case-lambda
-   [(box) (dash-frame box default-seg)]
-   [(box seg)
-    (let ([w (pict-width box)]
-          [h (pict-height box)])
-      (extend-pict
-       box 0 0 0 0 0
-       `(picture
-         ,w ,h
-         (put 0 0 ,(pict-draw box))
-         (put 0 0 ,(pict-draw (dash-hline w 0 seg)))
-         (put 0 ,h ,(pict-draw (dash-hline w 0 seg)))
-         (put 0 0 ,(pict-draw (dash-vline 0 h seg)))
-         (put ,w 0 ,(pict-draw (dash-vline 0 h seg))))))]))
-
-(define (frame box)
-  (dash-frame box (max (pict-width box) (pict-height box))))
-
-(define (dash-line width height rotate seg)
-  (let ([vpos (quotient* height 2)])
-    (make-pict
-     `(picture
-       ,@(rotate width height)
-       ,@(if (>= seg width)
-             `((put ,@(rotate 0 vpos) (line ,@(rotate 1 0) ,width)))
-             (let* ([remain (+ (- width (floor width))
-                               (remainder (floor width) (* 2 seg)))]
-                    [count (inexact->exact (floor (quotient* width (* 2 seg))))]
-                    [lremain (quotient* remain 2)]
-                    [rremain (- remain lremain)])
-               `((put ,@(rotate 0 vpos) (line ,@(rotate 1 0) ,lremain))
-                 ,@(let loop ([count count][pos lremain])
-                     (if (zero? count)
-                         null
-                         (cons `(put ,@(rotate (+ pos seg) vpos) 
-                                     (line ,@(rotate 1 0) ,seg))
-                               (loop (sub1 count) (+ pos seg seg)))))
-                 (put ,@(rotate (- width rremain) vpos) 
-                      (line ,@(rotate 1 0) ,rremain))))))
-     (car (rotate width height))
-     (cadr (rotate width height))
-     (cadr (rotate 0 height)) 0
-     null
-     #f
-     #f)))
-
-(define (rlist b a) (list a b))
-
-(define (hline width height)
-  (dash-line width height list width))
-
-(define (vline width height)
-  (dash-line height width rlist height))
-
-(define dash-hline
-  (case-lambda 
-   [(width height) (dash-hline width height default-seg)]
-   [(width height seg) (dash-line width height list seg)]))
-
-(define dash-vline
-  (case-lambda 
-   [(width height) (dash-vline width height default-seg)]
-   [(width height seg) (dash-line height width rlist seg)]))
-
-(define (oval box)
-  (let ([w (pict-width box)]
-        [h (pict-height box)])
-    (extend-pict
-     box 0 0 0 0 0
-     `(picture
-       ,w ,h
-       (put 0 0 ,(pict-draw box))
-       (put ,(quotient* w 2) ,(quotient* h 2) (oval "" ,w ,h))))))
-
-(define (oval/radius box r)
-  (let* ([w (pict-width box)]
-         [h (pict-height box)]
-         [rr (* 2 r)]
-         [lw (- w rr)]
-         [lh (- h rr)])
-    (extend-pict
-     box 0 0 0 0 0
-     `(picture
-       ,w ,h
-       (put 0 0 ,(pict-draw box))
-       (put ,r ,r (oval "[bl]" ,rr ,rr))
-       (put ,r 0 (line 1 0 ,lw))
-       (put ,(- w r) ,r (oval "[br]" ,rr ,rr))
-       (put ,w ,r (line 0 1 ,lh))
-       (put ,r ,(- h r) (oval "[tl]" ,rr ,rr))
-       (put ,r ,h (line 1 0 ,lw))
-       (put ,(- w r) ,(- h r) (oval "[tr]" ,rr ,rr))
-       (put ,0 ,r (line 0 1 ,lh))))))
-
-(define (big-circle d)
-  (let ([r (quotient* d 2)])
-    (picture
-     d d
-     `((curve 0 ,r ,r 0 0 0)
-       (curve ,r 0 ,d ,r ,d 0)
-       (curve ,d ,r ,r ,d ,d ,d)
-       (curve ,r ,d 0 ,r 0 ,d)))))
-
-(define (ghost box)
-  (let ([w (pict-width box)]
-        [h (pict-height box)])
-    (extend-pict
-     box 0 0 0 0 0
-     `(picture
-       ,w ,h))))
-
-(define-values (vl-append 
-                vc-append 
-                vr-append 
-                ht-append
-                hc-append
-                hb-append
-                htl-append
-                hbl-append)
-  (let ([make-append-boxes 
-         (lambda (wcomb hcomb fxoffset fyoffset rxoffset ryoffset 
-                        combine-ascent combine-descent)
-           (let ([do-append
-                  (lambda (sep args)
-                    (let append-boxes ([args args])
-                      (cond
-                       [(null? args) (blank)]
-                       [(null? (cdr args)) (car args)]
-                       [else
-                        (let* ([first (car args)]
-                               [rest (append-boxes (cdr args))]
-                               [w (wcomb (pict-width first) (pict-width rest) sep first rest)]
-                               [h (hcomb (pict-height first) (pict-height rest) sep first rest)]
-                               [fw (pict-width first)]
-                               [fh (pict-height first)]
-                               [rw (pict-width rest)]
-                               [rh (pict-height rest)]
-                               [fd1 (pict-ascent first)]
-                               [fd2 (pict-descent first)]
-                               [rd1 (pict-ascent rest)]
-                               [rd2 (pict-descent rest)]
-                               [dx1 (fxoffset fw fh rw rh sep fd1 fd2 rd1 rd2)]
-                               [dy1 (fyoffset fw fh rw rh sep fd1 fd2 rd1 rd2 h)]
-                               [dx2 (rxoffset fw fh rw rh sep fd1 fd2 rd1 rd2)]
-                               [dy2 (ryoffset fw fh rw rh sep fd1 fd2 rd1 rd2 h)])
-                          (make-pict
-                           `(picture 
-                             ,w ,h
-                             (put ,dx1
-                                  ,dy1
-                                  ,(pict-draw first))
-                             (put ,dx2
-                                  ,dy2
-                                  ,(pict-draw rest)))
-                           w h
-                           (combine-ascent fd1 rd1 fd2 rd2 fh rh h (+ dy1 fh) (+ dy2 rh))
-                           (combine-descent fd2 rd2 fd1 rd1 fh rh h (- h dy1) (- h dy2))
-                           (list (make-child first dx1 dy1 1 1 0 0)
-                                 (make-child rest dx2 dy2 1 1 0 0))
-                           #f
-                           (last* rest)))])))])
-             (let ([*-append (case-lambda
-                              [() (do-append 0 null)]
-                              [(sep . args)
-                               (if (number? sep)
-                                   (do-append sep args)
-                                   (do-append 0 (cons sep args)))])])
-               *-append)))]
-        [2max (lambda (a b c . rest) (max a b))]
-        [zero (lambda (fw fh rw rh sep fd1 fd2 rd1 rd2 . args) 0)]
-        [fv (lambda (a b . args) a)]
-        [sv (lambda (a b . args) b)]
-        [min2 (lambda (a b . args) (min a b))]
-        [max2 (lambda (a b . args) (max a b))]
-        [3+ (lambda (a b c . args) (+ a b c))]
-        [a-max (lambda (a b c first rest)
-                 (+ (max (pict-ascent first) (pict-ascent rest))
-                    (max (- (pict-height first) (pict-ascent first))
-                         (- (pict-height rest) (pict-ascent rest)))))]
-        [d-max (lambda (a b c first rest)
-                 (+ (max (pict-descent first) (pict-descent rest))
-                    (max (- (pict-height first) (pict-descent first))
-                         (- (pict-height rest) (pict-descent rest)))))]
-        [min-ad (lambda (a b oa ob ah bh h da db)
-                  (- h (max oa ob) (max (- ah oa a)
-                                        (- bh ob b))))]
-        [xmin-ad (lambda (a b oa ob ah bh h da db)
-                   (min (+ (- h da) a) (+ (- h db) b)))])
-    (values
-     (make-append-boxes 2max 3+ 
-                        zero (lambda (fw fh rw rh sep . a) (+ sep rh))
-                        zero zero 
-                        fv sv)
-     (make-append-boxes 2max 3+ 
-                        (lambda (fw fh rw rh sep . a) (quotient* (- (max fw rw) fw) 2))
-                        (lambda (fw fh rw rh sep . a) (+ sep rh))
-                        (lambda (fw fh rw rh sep . a) (quotient* (- (max fw rw) rw) 2))
-                        zero 
-                        fv sv)
-     (make-append-boxes 2max 3+ 
-                        (lambda (fw fh rw rh sep . a) (- (max fw rw) fw))
-                        (lambda (fw fh rw rh sep . a) (+ sep rh))
-                        (lambda (fw fh rw rh sep . a) (- (max fw rw) rw))
-                        zero 
-                        fv sv)
-     (make-append-boxes 3+ 2max
-                        zero
-                        (lambda (fw fh rw rh sep . a) (- (max fh rh) fh))
-                        (lambda (fw fh rw rh sep . a) (+ sep fw))
-                        (lambda (fw fh rw rh sep . a) (- (max fh rh) rh))
-                        xmin-ad xmin-ad)
-     (make-append-boxes 3+ 2max
-                        zero
-                        (lambda (fw fh rw rh sep . a) (quotient* (- (max fh rh) fh) 2))
-                        (lambda (fw fh rw rh sep . a) (+ sep fw))
-                        (lambda (fw fh rw rh sep . a) (quotient* (- (max fh rh) rh) 2))
-                        xmin-ad xmin-ad)
-     (make-append-boxes 3+ 2max 
-                        zero zero
-                        (lambda (fw fh rw rh sep . a) (+ sep fw)) zero
-                        xmin-ad xmin-ad)
-     (make-append-boxes 3+ a-max
-                        zero
-                        (lambda (fw fh rw rh sep fd1 fd2 rd1 rd2 h) 
-                          (- h fh (- (max fd1 rd1) fd1)))
-                        (lambda (fw fh rw rh sep . a) (+ sep fw))
-                        (lambda (fw fh rw rh sep fd1 fd2 rd1 rd2 h) 
-                          (- h rh (- (max fd1 rd1) rd1)))
-                        max2 min-ad)
-     (make-append-boxes 3+ d-max
-                        zero
-                        (lambda (fw fh rw rh sep fd1 fd2 rd1 rd2 h) 
-                          (- (max fd2 rd2) fd2))
-                        (lambda (fw fh rw rh sep . a) (+ sep fw))
-                        (lambda (fw fh rw rh sep fd1 fd2 rd1 rd2 h) 
-                          (- (max fd2 rd2) rd2))
-                        min-ad max2))))
-
-(define-values (lt-superimpose
-                lb-superimpose
-                lc-superimpose
-                ltl-superimpose
-                lbl-superimpose
-                rt-superimpose
-                rb-superimpose
-                rc-superimpose
-                rtl-superimpose
-                rbl-superimpose
-                ct-superimpose
-                cb-superimpose
-                cc-superimpose
-                ctl-superimpose
-                cbl-superimpose)
-  (let ([make-superimpose 
-         (lambda (get-h get-v get-th name)
-           (lambda boxes
-             (when (null? boxes)
-               (error name "expected at least one argument, got none"))
-             (unless (andmap pict? boxes)
-               (error name "expected all picts as arguments, got ~a"
-                      (apply string-append (add-between (map (λ (x) (format "~e" x)) boxes) " "))))
-             (let ([max-w (apply max (map pict-width boxes))]
-                   [max-h (apply max (map pict-height boxes))]
-                   [max-a (apply max (map pict-ascent boxes))]
-                   [max-a-complement (apply max (map (lambda (b) (- (pict-height b) (pict-ascent b)))
-                                                     boxes))]
-                   [max-d (apply max (map pict-descent boxes))]
-                   [max-d-complement (apply max (map (lambda (b) (- (pict-height b) (pict-descent b)))
-                                                     boxes))])
-               (let ([p (picture max-w (get-th max-h max-a max-d max-a-complement max-d-complement)
-                                 (map (lambda (box)
-                                        `(place ,(get-h max-w (pict-width box))
-                                                ,(get-v max-h (pict-height box)
-                                                        max-d (pict-descent box)
-                                                        max-a-complement (pict-ascent box))
-                                                ,box))
-                                      boxes))])
-                 ;; Figure out top and bottom baselines by finding the picts again, etc:
-                 (let ([ys (map (lambda (box)
-                                  (let-values ([(x y) (find-lt p box)])
-                                    y))
-                                boxes)])
-                   (let ([min-a (apply min (map (lambda (box y)
-                                                  (+ (- (pict-height p) y) (pict-ascent box)))
-                                                boxes ys))]
-                         [min-d (apply min (map (lambda (box y)
-                                                  (+ (- y (pict-height box)) (pict-descent box)))
-                                                boxes ys))])
-                     (make-pict (pict-draw p)
-                                (pict-width p) (pict-height p)
-                                min-a min-d
-                                (pict-children p)
-                                #f
-                                ;; Find bottomost, rightmost of old last picts to be the
-                                ;;  new last pict.
-                                (let ([subs (map (lambda (box)
-                                                   (let ([last (last* box)])
-                                                     (let-values ([(x y) (rb-find p last)])
-                                                       (list last x y))))
-                                                 boxes)])
-                                  (if (null? subs)
-                                      #f
-                                      (caar (sort subs
-                                                  (lambda (a b)
-                                                    (let ([ay (caddr a)]
-                                                          [by (caddr b)])
-                                                      (cond
-                                                       [(ay . > . by) #t]
-                                                       [(= ay by) ((cadr a) . > . (cadr b))]
-                                                       [else #f]))))))))))))))]
-        [norm (lambda (h a d ac dc) h)]
-        [tbase (lambda (h a d ac dc) (+ a ac))] 
-        [bbase (lambda (h a d ac dc) (+ d dc))] 
-        [lb (lambda (m v . rest) 0)]
-        [rt (lambda (m v . rest) (- m v))]
-        [tline (lambda (m v md d mac a) (- mac (- v a)))]
-        [bline (lambda (m v md d mac a) (- md d))]
-        [c (lambda (m v . rest) (quotient* (- m v) 2))])
-    (values
-     (make-superimpose lb rt norm 'lt-superimpose)
-     (make-superimpose lb lb norm 'lb-superimpose)
-     (make-superimpose lb c norm 'lc-superimpose)
-     (make-superimpose lb tline tbase 'ltl-superimpose)
-     (make-superimpose lb bline bbase 'lbl-superimpose)
-     (make-superimpose rt rt norm 'rt-superimpose)
-     (make-superimpose rt lb norm 'rb-superimpose)
-     (make-superimpose rt c norm 'rc-superimpose)
-     (make-superimpose rt tline tbase 'rtl-superimpose)
-     (make-superimpose rt bline bbase 'rbl-superimpose)
-     (make-superimpose c rt norm 'ct-superimpose)
-     (make-superimpose c lb norm 'cb-superimpose)
-     (make-superimpose c c norm 'cc-superimpose)
-     (make-superimpose c tline tbase 'ctl-superimpose)
-     (make-superimpose c bline bbase 'cbl-superimpose))))
-
-(define table
-  (case-lambda
-   [(ncol cells col-aligns row-aligns col-seps row-seps)
-    (let ([count (length cells)])
-      (unless (zero? (remainder count ncol))
-        (error 'table "cell count isn't divisble by the provided column count"))
-      (let* ([w ncol]
-             [h (/ count w)]
-             [cells (let rloop ([r h][cells cells][r-acc null])
-                      (if (zero? r)
-                          (list->vector (reverse r-acc))
-                          (let loop ([c w][cells cells][one-acc null])
-                            (if (zero? c)
-                                (rloop (sub1 r) cells (cons (list->vector (reverse one-acc)) r-acc))
-                                (loop (sub1 c) (cdr cells) (cons (car cells) one-acc))))))]
-             [imp-list->vector (lambda (l n)
-                                 (let ([v (make-vector n)])
-                                   (let loop ([l l][p 0])
-                                     (unless (= n p)
-                                       (vector-set! v
-                                                    p
-                                                    (if (pair? l)
-                                                        (car l)
-                                                        l))
-                                       (loop (if (pair? l) (cdr l) l) (add1 p))))
-                                   v))]
-             [ralign (imp-list->vector row-aligns h)]
-             [calign (imp-list->vector col-aligns w)]
-             [rsep (imp-list->vector row-seps h)]
-             [csep (imp-list->vector col-seps w)]
-             [get-cell (lambda (c r) (vector-ref (vector-ref cells r) c))]
-             [nmap (lambda (f w)
-                     (let loop ([n w][acc null])
-                       (if (zero? n)
-                           acc
-                           (loop (sub1 n) (cons (f (sub1 n)) acc)))))]
-             [rowmap (lambda (f) (nmap f h))]
-             [colmap (lambda (f) (nmap f w))]
-             [superimposed-rows (list->vector
-                                 (rowmap (lambda (r)
-                                           (apply
-                                            (vector-ref ralign r)
-                                            (colmap (lambda (c) (get-cell c r)))))))]
-             [superimposed-cols (list->vector
-                                 (colmap (lambda (c)
-                                           (apply
-                                            (vector-ref calign c)
-                                            (rowmap (lambda (r) (get-cell c r)))))))])
-                                        ; No space after the last row/col
-        (vector-set! rsep (sub1 h) 0)
-        (vector-set! csep (sub1 w) 0)
-
-        (apply
-         vl-append
-         0
-         (rowmap
-          (lambda (r)
-            (vl-append
-             0
-             (apply
-              ht-append
-              0
-              (colmap (lambda (c)
-                        (ht-append
-                         0
-                         (let* ([cell (get-cell c r)]
-                                [sc (vector-ref superimposed-cols c)]
-                                [sr (vector-ref superimposed-rows r)]
-                                [w (pict-width sc)]
-                                [h (pict-height sr)])
-                           (let-values ([(x __) (find-lb sc cell)]
-                                        [(_  y) (find-lb sr cell)])
-                             (picture
-                              w h
-                              `((place ,x ,y ,cell)))))
-                         (blank (vector-ref csep c) 0)))))
-             (blank 0 (vector-ref rsep r))))))))]))
-
-(define (record title . fields)
-  (let* ([totalwidth (apply max (pict-width title) (map pict-width fields))]
-         [linespace (if (null? fields) 0 recordseplinespace)]
-         [totalheight (+ (pict-height title) (apply + (map pict-height fields))
-                         linespace)]
-         [title-y (- totalheight (pict-height title))]
-         [field-ys (let loop ([pos (- totalheight (pict-height title) linespace)]
-                              [fields fields])
-                     (if (null? fields)
-                         null
-                         (let* ([p (- pos (pict-height (car fields)))])
-                           (cons p
-                                 (loop p (cdr fields))))))])
-    (make-pict
-     `(picture
-       ,totalwidth ,totalheight
-       (put 0 0 (line 1 0 ,totalwidth))
-       (put 0 ,totalheight (line 1 0 ,totalwidth))
-       (put 0 0 (line 0 1 ,totalheight))
-       (put ,totalwidth 0 (line 0 1 ,totalheight))
-       (put 0 ,title-y ,(pict-draw title))
-       ,@(if (null? fields)
-             '()
-             `((put 0 ,(- totalheight (pict-height title) (quotient* linespace 2))
-                    (line 1 0 ,totalwidth))))
-       ,@(map (lambda (f p) `(put 0 ,p ,(pict-draw f)))
-              fields field-ys))
-     totalwidth totalheight
-     totalheight 0
-     (cons
-      (make-child title 0 title-y 1 1 0 0)
-      (map (lambda (child child-y) (make-child child 0 child-y 1 1 0 0)) fields field-ys))
-     #f
-     #f)))
-
-(define (picture* w h a d commands)
-  (let loop ([commands commands][translated null][children null])
-    (if (null? commands)
-        (make-pict
-         `(picture ,w ,h
-                   ,@(reverse translated))
-         w h a d
-         children
-         #f
-         #f)
-        (let ([c (car commands)]
-              [rest (cdr commands)])
-          (unless (and (pair? c) (symbol? (car c)))
-            (error 'picture "bad command: ~a" c))
-          (case (car c)
-            [(connect) (loop rest
-                             (append (apply connect (cdr c))
-                                     translated)
-                             children)]
-            [(dconnect) (loop rest
-                              (let ([x (cadr c)]
-                                    [y (caddr c)]
-                                    [dx (cadddr c)]
-                                    [dy (list-ref c 4)])
-                                (append (connect x y (+ x dx) (+ y dy)
-                                                 (if (null? (list-tail c 5))
-                                                     #t
-                                                     (list-ref c 5)))
-                                        translated))
-                              children)]
-            [(connect~y) (loop rest
-                               (append (apply ~connect 'x (cdr c))
-                                       translated)
-                               children)]
-            [(connect~x) (loop rest
-                               (append (apply ~connect 'y (cdr c))
-                                       translated)
-                               children)]
-            [(connect~xy) (loop rest
-                                (append (apply ~connect 'r (cdr c))
-                                        translated)
-                                children)]
-            [(curve) (loop rest
-                           (let ([x1 (cadr c)]
-                                 [y1 (caddr c)]
-                                 [x2 (cadddr c)]
-                                 [y2 (list-ref c 4)]
-                                 [xm (list-ref c 5)]
-                                 [ym (list-ref c 6)]
-                                 [d (if (null? (list-tail c 7))
-                                        1.0
-                                        (list-ref c 7))])
-                             (let ([p (if (and d (>= d 0))
-                                          (inexact->exact (floor (* d (sqrt (+ (expt (- x2 x1) 2) (expt (- y2 y1) 2))))))
-                                          #f)])
-                               (if (and (= x1 x2) (= y1 y2))
-                                   translated
-                                   (cons `(qbezier ,p ,x1 ,y1 ,xm ,ym ,x2 ,y2)
-                                         translated))))
-                           children)]
-            [(place) (let ([x (cadr c)]
-                           [y (caddr c)]
-                           [p (cadddr c)])
-                       (loop rest
-                             (cons
-                              `(put ,x ,y ,(pict-draw p))
-                              translated)
-                             (cons
-                              (make-child p x y 1 1 0 0)
-                              children)))]
-            [else (loop rest (cons c translated) children)])))))
-
-(define (picture w h commands)
-  (picture* w h h 0 commands))
-
-(define (cons-picture p commands)
-  (picture
-   (pict-width p) (pict-height p)
-   (cons
-    `(place 0 0 ,p)
-    commands)))
-
-(define (cons-picture* p commands)
-  (picture*
-   (pict-width p) (pict-height p)
-   (pict-ascent p) (pict-descent p)
-   (cons
-    `(place 0 0 ,p)
-    commands)))
-
-(define (place-it who flip? base dx dy target)
-  (let-values ([(dx dy)
-                (cond
-                 [(and (number? dx) (number? dy))
-                  (values dx (- (pict-height base) dy))]
-                 [(and (or (pict? dx) 
-                           (and (list? dx) (andmap pict? dx)))
-                       (procedure? dy)
-                       (procedure-arity-includes? dy 2))
-                  (if flip?
-                      (let-values ([(dx dy) (dy base dx)])
-                        (values dx (- (pict-height base) dy)))
-                      (dy base dx))]
-                 [else
-                  (error who
-                         "expects two numbers or a sub-pict and a find procedure")])])
-    (use-last/unchecked (cons-picture*
-                         base
-                         `((place ,dx ,(- dy (pict-height target)) ,target)))
-                        (last* base))))
-
-(define (place-over base dx dy target)
-  (place-it 'place-over #f base dx dy target))
-(define (place-under base dx dy target)
-  (cc-superimpose
-   (place-it 'place-under #f (ghost base) dx dy target)
-   base))
-
-(define (pin-over base dx dy target)
-  (place-it 'pin-over #t base dx dy target))
-(define (pin-under base dx dy target)
-  (cc-superimpose
-   (place-it 'pin-under #t (ghost base) dx dy target)
-   (launder base)))
-
-(define black-and-white
-  (make-parameter #f
-                  (lambda (x)
-                    (and x #t))))
-
-(define (colorize p color)
-  (unless (or (string? color)
-              (is-a? color color%)
-              (and (list? color) (= 3 (length color)) (andmap byte? color)))
-    (error 'colorize "expected a color, given ~e" color))
-  (let ([color (if (list? color) 
-                   (apply make-color color) 
-                   color)])
-    (if (black-and-white)
-        p
-        (extend-pict 
-         p 0 0 0 0 0
-         `(color ,color ,(pict-draw p))))))
-
-(define (optimize s)
-  (let o-loop ([s s][dx 0][dy 0])
-    (if (string? s)
-        s
-        (let ([tag (car s)])
-          (case tag
-            [(picture)
-             (list* 'picture (cadr s) (caddr s)
-                    (map optimize (cdddr s)))]
-            [(color)
-             (let ([next (caddr s)])
-               (if (and (pair? next) (eq? (car next) 'color))
-                   (optimize next)
-                   (list* 'color (cadr s) 
-                          (list 'put dx dy (optimize next)))))]
-            [(thickness)
-             (let ([t (cadr s)]
-                   [p (caddr s)])
-               (list 'put dx dy 
-                     (list 'thickness t 
-                           (optimize p))))]
-            [(put)
-             (let ([x (cadr s)]
-                   [y (caddr s)]
-                   [next (cadddr s)])
-               (if (and (pair? next) (eq? (car next) 'picture))
-                                        ; optmize put-picture to just contents ...
-                   (cons 'begin (map (lambda (s) (o-loop s (+ x dx) (+ y dy))) (cdddr next)))
-                                        ; normal
-                   (list 'put (+ x dx) (+ y dy) (optimize next))))]
-            [(qbezier)
-             (let ([x1 (list-ref s 2)]
-                   [y1 (list-ref s 3)]
-                   [xm (list-ref s 4)]
-                   [ym (list-ref s 5)]
-                   [x2 (list-ref s 6)]
-                   [y2 (list-ref s 7)]
-                   [p (list-ref s 1)])
-               (list 'qbezier p
-                     (+ x1 dx) (+ y1 dy)
-                     (+ xm dx) (+ ym dy)
-                     (+ x2 dx) (+ y2 dy)))]
-            [(frame)
-             (list 'frame (optimize (cadr s)))]
-            [(colorbox)
-             (list 'colorbox (cadr s) (optimize (caddr s)))]
-            [(line vector dirline dirvector circle circle* make-box oval prog) s]
-            [else (error 'optimize "bad tag: ~s" tag)])))))
-
-(define (fixup-top s)
-  (cond
-   [(and (pair? s) (eq? (car s) 'color))
-    ;; Drop initial put
-    (list* 'color (cadr s) (caddr (cdddr s)))]
-   [(and (pair? s) (eq? (car s) 'put))
-    ;; Wrap initial put (from thickness) in a pair of braces
-    `(local ,(cadddr s))]
-   [else
-    ;; Do nothing
-    s]))
-
-(define (prepare-for-output s)
-  (fixup-top (optimize (pict-draw s))))
-
-(define (pict->command-list s)
-  (let output ([s (prepare-for-output s)])
-    (if (string? s)
-        (list s)
-        (let ([tag (car s)])
-          (case tag
-            [(local)
-             (output (cadr s))]
-            [(begin)
-             (apply append (map output (cdr s)))]
-            [(picture)
-             (apply append (map output (cdddr s)))]
-            [(color)
-             `((with-color ,(cadr s) ,(output (cddr s))))]
-            [(thickness)
-             `((with-thickness ,(cadr s) ,(output (caddr s))))]
-            [(put)
-             `((offset ,(cadr s) ,(caddr s) ,(output (cadddr s))))]
-            [(qbezier)
-             `((bezier ,@(cddr s)))]
-            [(line vector)
-             `((,tag ,(cadr s) ,(caddr s) ,(cadddr s)))]
-            [(circle circle*)
-             `((,tag ,(cadr s)))]
-            [(frame)
-             `((frame ,(output (cadr s))))]
-            [(colorbox)
-             `((colorbox ,(cadr s) ,(output (caddr s))))]
-            [(oval)
-             `((oval ,(caddr s) ,(cadddr s) ,(cadr s)))]
-            [(make-box)
-             `((make-box ,(cadr s) ,(caddr s) ,(cadddr s) ,(car (cddddr s))))]
-            [(prog)
-             `((prog ,(cadr s) ,(caddr s)))]
-            [else (error 'pict->commands "bad tag: ~s" tag)])))))
-
-
-
-(define show-pict
-  (λ (p [w #f] 
-        [h #f] 
-        #:frame-style [frame-style '()]
-        #:frame-x [frame-x #f]
-        #:frame-y [frame-y #f])
-    (define the-pict p)
-    (define pict-drawer (make-pict-drawer the-pict))
-    (define no-redraw? #f)
-    (define pict-frame%
-      (class (gui-dynamic-require 'frame%)
-        (define/public (set-pict p)
-          (set! the-pict p)
-          (set! pict-drawer (make-pict-drawer the-pict))
-          (set! no-redraw? #t)
-          (let ([pw (inexact->exact (floor (pict-width the-pict)))]
-                [ph (inexact->exact (floor (pict-height the-pict)))])
-            (send c min-width (if w (max w pw) pw))
-            (send c min-height (if h (max h ph) ph)))
-          (set! no-redraw? #f)
-          (send c on-paint))
-        (super-instantiate ())))
-    (define pict-canvas%
-      (class (gui-dynamic-require 'canvas%)
-        (inherit get-dc)
-        (define/override (on-paint)
-          (unless no-redraw?
-            (let ([dc (get-dc)])
-              (send dc clear)
-              (let* ([pw (pict-width the-pict)]
-                     [ph (pict-height the-pict)]
-                     [xo (if (and w
-                                  (pw . < . w))
-                             (- (/ w 2) (/ pw 2))
-                             0)]
-                     [yo (if (and h
-                                  (ph . < . h))
-                             (- (/ h 2) (/ ph 2))
-                             0)])
-                (pict-drawer dc xo yo)))))
-        (super-instantiate ())))
-    (define f (new pict-frame% 
-                   [label "MrPict"] 
-                   [style frame-style] 
-                   [x frame-x]
-                   [y frame-y]))
-    (define c (make-object pict-canvas% f))
-    (send (send c get-dc) set-smoothing 'aligned)
-    (send f set-pict p)
-    (send f show #t)))
-
-(define dc-for-text-size (make-parameter 
-                          (make-object bitmap-dc% (make-bitmap 1 1))
-                          (lambda (x)
-                            (unless (or (not x)
-                                        (is-a? x dc<%>))
-                              (raise-argument-error 'dc-for-parameter "(or/c (is-a?/c dc<%>) #f)" x))
-                            x)))
-
-(define convert-bounds-padding
-  (make-parameter
-   (list 3 3 3 3)
-   (lambda (x)
-     (unless (and (list? x) (= 4 (length x)) (andmap real? x)
-                  (andmap (lambda (i) (not (negative? i))) x))
-       (raise-argument-error 'convert-bounds-padding
-                             "(list/c (>=/c 0) (>=/c 0) (>=/c 0) (>=/c 0))"
-                             x))
-     x)))
-
-(define (dc f w h [a h] [d 0])
-  (make-pict `(prog ,f ,h) w h a d null #f #f))
-
-(define prog-picture dc)
-
-(define current-expected-text-scale (make-parameter (list 1 1)))
-(define (with-text-scale dc thunk)
-  (let ([x (current-expected-text-scale)])
-    (if (equal? x '(1 1))
-        (thunk)
-        (let-values ([(xs ys) (send dc get-scale)])
-          (send dc set-scale (* xs (car x)) (* ys (cadr x)))
-          (let-values ([(w h d s) (thunk)])
-            (send dc set-scale xs ys)
-            (values w h d s))))))
-
-(define (memq* a l)
-  (if (pair? l)
-      (or (eq? (car l) a)
-          (memq* a (cdr l)))
-      #f))
-
-(define (extend-font font size style weight hinting)
-  (if (send font get-face)
-      (send the-font-list find-or-create-font
-            size 
-            (send font get-face)
-            (send font get-family)
-            style
-            weight
-            #f
-            'default
-            #t
-            hinting)
-      (send the-font-list find-or-create-font
-            size 
-            (send font get-family)
-            style
-            weight
-            #f
-            'default
-            #t
-            hinting)))
-
-(define text
-  (case-lambda
-   [(string) (text string '() 12)]
-   [(string style) (text string style 12)]
-   [(string style size) (text string style size 0)]
-   [(str style size angle)
-    (if (il-memq 'caps style)
-        (begin
-          (unless (zero? angle) 
-            (error 'text "the style cannot include 'caps with a non-zero angle"))
-          (caps-text str (il-remq 'caps style) size))
-        (not-caps-text str style size angle))]))
-
-(define families '(default decorative roman script swiss modern symbol system))
-
-(define (il-memq sym s)
-  (and (pair? s)
-       (or (eq? sym (car s))
-           (il-memq sym (cdr s)))))
-(define (il-remq sym s)
-  (if (pair? s)
-      (if (eq? sym (car s))
-          (cdr s)
-          (cons (car s) (il-remq sym (cdr s))))
-      s))
-
-(define (not-caps-text string orig-style size angle)
-  (let ([font
-         (let loop ([style orig-style])
-           (cond
-            [(null? style) 
-             (send the-font-list find-or-create-font
-                   size 'default 'normal 'normal #f 'default #t 'unaligned)]
-            [(is-a? style font%)
-             style]
-            [(memq style families)
-             (send the-font-list find-or-create-font
-                   size style 'normal 'normal #f 'default #t 'unaligned)]
-            [(string? style)
-             (send the-font-list find-or-create-font
-                   size style 'default 'normal 'normal #f 'default #t 'unaligned)]
-            [(and (pair? style)
-                  (string? (car style))
-                  (memq (cdr style) families))
-             (send the-font-list find-or-create-font
-                   size (car style) (cdr style) 'normal 'normal #f 'default #t 'unaligned)]
-            [(and (pair? style)
-                  (memq (car style)
-                        '(superscript 
-                          subscript
-                          bold italic
-                          aligned unaligned)))
-             (let ([font (loop (cdr style))]
-                   [style (car style)])
-               (cond
-                [(eq? style 'bold)
-                 (extend-font font
-                              (send font get-point-size)
-                              (send font get-style)
-                              'bold
-                              (send font get-hinting))]
-                [(eq? style 'italic)
-                 (extend-font font
-                              (send font get-point-size)
-                              'italic
-                              (send font get-weight)
-                              (send font get-hinting))]
-                [(or (eq? style 'aligned)
-                     (eq? style 'unaligned))
-                 (extend-font font
-                              (send font get-point-size)
-                              (send font get-style)
-                              (send font get-weight)
-                              style)]
-                [else font]))]
-            [(and (pair? style)
-                  (memq (car style) '(combine no-combine outline)))
-             (loop (cdr style))]
-            [(and (pair? style)
-                  (is-a? (car style) color%))
-             (loop (cdr style))]
-            [else (raise-type-error 'text
-                                    "style"
-                                    orig-style)]))]
-        [combine? (let loop ([style orig-style])
-                    (cond
-                     [(eq? style 'modern) #f]
-                     [(not (pair? style)) #t]
-                     [(eq? (car style) 'combine) #t]
-                     [(eq? (car style) 'no-combine) #f]
-                     [else (loop (cdr style))]))]
-        [sub? (memq* 'subscript orig-style)]
-        [sup? (memq* 'superscript orig-style)]
-        [outline? (memq* 'outline orig-style)]
-        [color (let loop ([style orig-style])
-                 (cond
-                  [(not (pair? style)) #f]
-                  [(is-a? (car style) color%) 
-                   (resolve-color (car style))]
-                  [else (loop (cdr style))]))])
-    (let ([s-font (if (or sub? sup?)
-                      (extend-font font
-                                   (floor (* 6/10 (send font get-point-size)))
-                                   (send font get-style)
-                                   (send font get-weight)
-                                   (send font get-hinting))
-                      font)]
-          [dc (dc-for-text-size)])
-      (unless dc
-        (error 'text "no dc<%> object installed for sizing"))
-      (let-values ([(w h d s) (with-text-scale
-                               dc
-                               (lambda ()
-                                 (send dc get-text-extent string s-font combine?)))])
-        (define (make-draw adj-x adj-y angle)
-          (define p 
-            (and outline?
-                 (let ([p (new dc-path%)])
-                   (send p text-outline
-                         s-font string 0 0 combine?)
-                   (unless (zero? angle)
-                     (send p rotate angle))
-                   p)))
-          (lambda (dc x y)
-            (let ([f (send dc get-font)])
-              (define dest-x (adj-x x))
-              (define dest-y (adj-y y))
-              (cond
-               [outline?
-                (define pn (and color (send dc get-pen)))
-                (when color (send dc set-pen color (send pn get-width) (send pn get-style)))
-                (send dc draw-path p dest-x dest-y)
-                (when color (send dc set-pen pn))]
-               [else
-                (define fg (and color (send dc get-text-foreground)))
-                (when color (send dc set-text-foreground color))
-                (send dc set-font s-font)
-                (send dc draw-text string
-                      dest-x dest-y
-                      combine? 0 angle)
-                (when fg (send dc set-text-foreground fg))
-                (send dc set-font f)]))))
-        (if (or sub? sup?)
-            (let-values ([(ww wh wd ws) (with-text-scale
-                                         dc
-                                         (lambda ()
-                                           (send dc get-text-extent "Wy" font)))])
-              (prog-picture (make-draw
-                             (lambda (x) x)
-                             (lambda (y) (if sub?
-                                             (+ y (- wh h))
-                                             y))
-                             0)
-                            w wh (- wh wd) wd))
-            (if (zero? angle)
-                ;; Normal case: no rotation
-                (prog-picture (make-draw (lambda (x) x)
-                                         (lambda (y) y)
-                                         0)
-                              w h (- h d) d)
-                ;; Rotation case. Need to find the bounding box.
-                ;; Calculate the four corners, relative to top left as origin:
-                (let* ([tlx 0]
-                       [tly 0]
-                       [ca (cos angle)]
-                       [sa (sin angle)]
-                       [trx (* w ca)]
-                       [try (- (* w sa))]
-                       [brx (+ trx (* h sa))]
-                       [bry (- try (* h ca))]
-                       [blx (* h sa)]
-                       [bly (- (* h ca))]
-                       ;;min-x and min-y must be non-positive,
-                       ;; since tlx and tly are always 0
-                       [min-x (min tlx trx blx brx)]
-                       [min-y (min tly try bly bry)])
-                  (let ([pw (- (max tlx trx blx brx) min-x)]
-                        [ph (- (max tly try bly bry) min-y)]
-                        [dx (cond
-                             [(and (positive? ca) (positive? sa)) 0]
-                             [(positive? ca) (- (* h sa))]
-                             [(positive? sa) (- (* w ca))]
-                             [else (+ (- (* w ca)) (- (* h sa)))])]
-                        [dy (cond
-                             [(and (positive? ca) (negative? sa)) 0]
-                             [(positive? ca) (* w sa)]
-                             [(negative? sa) (- (* h ca))]
-                             [else (+ (- (* h ca)) (* w sa))])])
-                    (prog-picture (make-draw (lambda (x) (+ x dx))
-                                             (lambda (y) (+ y dy))
-                                             angle)
-                                  pw ph ph 0)))))))))
-
-(define caps-text
-  (case-lambda
-   [(string) (caps-text string '() 12)]
-   [(string style) (caps-text string style 12)]
-   [(string style size)
-    (let ([strings
-           (let loop ([l (string->list string)] [this null] [results null] [up? #f])
-             (if (null? l)
-                 (reverse (cons (reverse this) results))
-                 (if (eq? up? (char-upper-case? (car l)))
-                     (loop (cdr l) (cons (car l) this) results up?)
-                     (loop (cdr l) (list (car l)) (cons (reverse this) results) (not up?)))))]
-          [cap-style
-           (let loop ([s style])
-             (cond
-              [(pair? s) (cons (car s) (loop (cdr s)))]
-              [(is-a? s font%) (send the-font-list find-or-create-font
-                                     (floor (* 8/10 (send s get-point-size)))
-                                     (send s get-family)
-                                     (send s get-style)
-                                     (send s get-weight)
-                                     (send s get-underlined?)
-                                     (send s get-smoothing)
-                                     (send s get-size-in-pixels?))]
-              [else s]))]
-          [cap-size (floor (* 8/10 size))])
-      (let ([picts
-             (let loop ([l strings] [up? #f])
-               (if (null? l)
-                   null
-                   (let* ([first-string (list->string (map char-upcase (car l)))]
-                          [first
-                           (not-caps-text first-string
-                                          (if up? style cap-style)
-                                          (if up? size cap-size)
-                                          0)]
-                          [rest (loop (cdr l) (not up?))])
-                     (if (and up? (pair? (cdr l)))
-                         ;; kern capital followed by non-captial
-                         (let ([plain-first (not-caps-text first-string
-                                                           cap-style
-                                                           cap-size
-                                                           0)]
-                               [together (not-caps-text (string-append
-                                                         first-string
-                                                         (list->string (map char-upcase (cadr l))))
-                                                        cap-style
-                                                        cap-size
-                                                        0)])
-                           (cons (hbl-append (- (pict-width together)
-                                                (+ (pict-width plain-first)
-                                                   (pict-width (car rest))))
-                                             first
-                                             (car rest))
-                                 (cdr rest)))
-                         ;; no kerning needed:
-                         (cons first rest)))))])
-        (apply hbl-append 0 picts)))]))
-
-(define (linewidth n p) (line-thickness n p))
-(define (linestyle n p) 
-  (unless (memq n '(transparent solid xor hilite 
-                                dot long-dash short-dash dot-dash 
-                                xor-dot xor-long-dash xor-short-dash 
-                                xor-dot-dash))
-    (raise-type-error 'linestyle "style symbol" n))
-  (line-style n p))
-
-(define connect
-  (case-lambda
-   [(x1 y1 x2 y2) (connect x1 y1 x2 y2 #f)]
-   [(x1 y1 x2 y2 arrow?) (~connect 'r +inf.0 x1 y1 x2 y2 arrow?)]))
-
-(define ~connect 
-  (case-lambda
-   [(exact close-enough x1 y1 x2 y2) (~connect exact close-enough x1 y1 x2 y2 #f)]
-   [(exact close-enough x1 y1 x2 y2 arrow?)
-    `((put ,x1 ,y1 (,(if arrow? 'vector 'line) ,(- x2 x1) ,(- y2 y1) #f)))]))
-
-(define (resolve-color c)
-  (let* ([requested-color (cond
-                           [(is-a? c color%) c]
-                           [(string? c)
-                            (send the-color-database find-color c)]
-                           [(list? c)
-                            (apply make-object color% c)])]
-         [color (or requested-color 
-                    (send the-color-database find-color "BLACK"))])
-    (unless requested-color
-      (eprintf "WARNING: couldn't find color: ~s\n" c))
-    color))
-
-
-(define (render dc h+top l dx dy)
-  (define b&w? #f)
-  
-  (with-method ([draw-line (dc draw-line)]
-                [draw-spline (dc draw-spline)]
-                [draw-ellipse (dc draw-ellipse)]
-                [get-pen (dc get-pen)]
-                [get-brush (dc get-brush)]
-                [get-text-foreground (dc get-text-foreground)]
-                [set-pen (dc set-pen)]
-                [set-brush (dc set-brush)]
-                [set-text-foreground (dc set-text-foreground)]
-                [find-or-create-pen (the-pen-list find-or-create-pen)]
-                [find-or-create-brush (the-brush-list find-or-create-brush)])
-
-      (let loop ([dx dx][dy dy][l l])
-        (unless (null? l)
-          (let ([x (car l)])
-            (if (string? x)
-                (error 'draw-pict "how did a string get here?: ~s" x)
-                (case (car x)
-                  [(offset) (loop (+ dx (cadr x))
-                                  (+ dy (caddr x))
-                                  (cadddr x))]
-                  [(line vector)
-                   (let ([xs (cadr x)]
-                         [ys (caddr x)]
-                         [len (cadddr x)])
-                     (let ([mx (if len (abs (if (zero? xs) ys xs)) 1)]
-                           [len (or len 1)])
-                       (draw-line dx (- h+top dy)
-                                  (+ dx (* (/ xs mx) len)) (- h+top (+ dy (* (/ ys mx) len))))))]
-                  [(circle circle*)
-                   (let ([size (cadr x)])
-                     (draw-ellipse (- dx (/ size 2)) (- h+top dy (/ size 2))
-                                   size size))]
-                  [(oval)
-                   (let ([b (get-brush)]
-                         [rx (- dx (/ (cadr x) 2))]
-                         [ry (- h+top dy (/ (caddr x) 2))])
-                     (set-brush (find-or-create-brush "BLACK" 'transparent))
-                     (let ([part (cadddr x)]
-                           [cr (send dc get-clipping-region)]
-                           [set-rect (lambda (l t r b)
-                                       (let ([cr (make-object region% dc)])
-                                         (send cr set-rectangle
-                                               (+ rx (* l (cadr x)))
-                                               (+ ry (* t (caddr x)))
-                                               (* (- r l) (cadr x))
-                                               (* (- b t) (caddr x)))
-                                         cr))])
-                       (send dc set-clipping-region
-                             (cond
-                              [(string=? part "[l]")
-                               (set-rect 0 0 0.5 1.0)]
-                              [(string=? part "[tl]")
-                               (set-rect 0 0 0.5 0.5)]
-                              [(string=? part "[tr]")
-                               (set-rect 0.5 0 1.0 0.5)]
-                              [(string=? part "[r]")
-                               (set-rect 0.5 0 1.0 1.0)]
-                              [(string=? part "[bl]")
-                               (set-rect 0 0.5 0.5 1.0)]
-                              [(string=? part "[br]")
-                               (set-rect 0.5 0.5 1.0 1.0)]
-                              [else cr]))
-                       (send dc draw-rounded-rectangle
-                             rx ry
-                             (cadr x) (caddr x)
-                             (if (string=? part "") -0.2 -0.5))
-                       (send dc set-clipping-region cr)
-                       (set-brush b)))]
-                  [(bezier)
-                   (draw-spline (+ dx (list-ref x 1))
-                                (- h+top (+ dy (list-ref x 2)))
-                                (+ dx (list-ref x 3))
-                                (- h+top (+ dy (list-ref x 4)))
-                                (+ dx (list-ref x 5))
-                                (- h+top (+ dy (list-ref x 6))))]
-                  [(with-color)
-                   (if b&w?
-                       (loop dx dy (caddr x))
-                       (let ([p (get-pen)]
-                             [b (get-brush)]
-                             [fg (get-text-foreground)])
-                         (let ([color (resolve-color (cadr x))])
-                           (set-pen (find-or-create-pen color 
-                                                        (send p get-width) (send p get-style)
-                                                        (send p get-cap) (send p get-join)))
-                           (set-brush (find-or-create-brush color 'solid))
-                           (set-text-foreground color))
-                         (loop dx dy (caddr x))
-                         (set-pen p)
-                         (set-brush b)
-                         (set-text-foreground fg)))]
-                  [(with-thickness)
-                   (let ([p (get-pen)])
-                     (set-pen (find-or-create-pen (send p get-color) 
-                                                  (if (number? (cadr x))
-                                                      (cadr x)
-                                                      (case (cadr x)
-                                                        [(thicklines) 1]
-                                                        [(thinlines) 0]
-                                                        [else (send p get-width)]))
-                                                  (if (number? (cadr x))
-                                                      (send p get-style)
-                                                      (case (cadr x)
-                                                        [(#f) 'transparent]
-                                                        [(thicklines thinlines) (send p get-style)]
-                                                        [else (cadr x)]))
-                                                  (send p get-cap) 
-                                                  (send p get-join)))
-                     (loop dx dy (caddr x))
-                     (set-pen p))]
-                  [(prog)
-                   ((cadr x) dc dx (- h+top dy (caddr x)))]
-                  [else (error 'render "unknown command: ~a\n" x)])))
-          (loop dx dy (cdr l))))))
-
-(define (make-pict-drawer p)
-  (let ([cmds (pict->command-list p)])
-    (lambda (dc dx dy)
-      (render dc (+ (pict-height p) dy)
-              cmds
-              dx 0))))
-
-(define (draw-pict p dc dx dy)
-  ((make-pict-drawer p) dc dx dy))
-
-(define (convert-pict p format default #:pad? [pad? #t])
-  (cond
-   [(member format '(pdf-bytes+bounds8 eps-bytes+bounds8
-                                       png-bytes+bounds8 png@2x-bytes+bounds8
-                                       svg-bytes+bounds8))
-    (define xscale (box 1))
-    (define yscale (box 1))
-    (case format
-      [(pdf-bytes+bounds8 eps-bytes+bounds8)
-       (send (current-ps-setup) get-scaling xscale yscale)])
-    (define-values (pad-l pad-t pad-r pad-b)
-      (if pad?
-          (apply values (convert-bounds-padding))
-          (values 0 0 0 0)))
-    (define pad-p (inset p pad-l pad-t pad-r pad-b))
-    (list (convert-pict/bytes pad-p
-                              (case format
-                                [(pdf-bytes+bounds8) 'pdf-bytes]
-                                [(eps-bytes+bounds8) 'eps-bytes]
-                                [(png-bytes+bounds8) 'png-bytes]
-                                [(png@2x-bytes+bounds8) 'png@2x-bytes]
-                                [(svg-bytes+bounds8) 'svg-bytes]
-                                [else (error "internal error" format)])
-                              default)
-          (* (unbox xscale) (pict-width pad-p))
-          (* (unbox yscale) (pict-height pad-p))
-          (* (unbox yscale) (pict-descent pad-p))
-          0
-          (* (unbox xscale) pad-l)
-          (* (unbox yscale) pad-t)
-          (* (unbox xscale) pad-r)
-          (* (unbox yscale) pad-b))]
-   [(member format '(pdf-bytes+bounds eps-bytes+bounds
-                                      png-bytes+bounds
-                                      png@2x-bytes+bounds
-                                      svg-bytes+bounds))
-    (take (convert-pict p
-                        (case format
-                          [(pdf-bytes+bounds) 'pdf-bytes+bounds8]
-                          [(eps-bytes+bounds) 'eps-bytes+bounds8]
-                          [(png-bytes+bounds) 'png-bytes+bounds8]
-                          [(png@2x-bytes+bounds) 'png@2x-bytes+bounds8]
-                          [(svg-bytes+bounds) 'svg-bytes+bounds8]
-                          [else (error "internal error" format)])
-                        default
-                        #:pad? #f)
-          5)]
-   [else
-    (convert-pict/bytes p format default)]))
-
-(define (convert-pict/bytes p format default)
-  (case format
-    [(png-bytes png@2x-bytes)
-     (let* ([bm (make-bitmap
-                 (max 1 (inexact->exact (ceiling (pict-width p))))
-                 (max 1 (inexact->exact (ceiling (pict-height p))))
-                 #:backing-scale (if (eq? format 'png@2x-bytes) 2 1))]
-            [dc (make-object bitmap-dc% bm)])
-       (send dc set-smoothing 'aligned)
-       (draw-pict p dc 0 0)
-       (send dc set-bitmap #f)
-       (let ([s (open-output-bytes)])
-         (send bm save-file s 'png #:unscaled? #t)
-         (get-output-bytes s)))]
-    [(eps-bytes pdf-bytes)
-     (let ([s (open-output-bytes)]
-           [xs (box 1)]
-           [ys (box 1)])
-       (send (current-ps-setup) get-scaling xs ys)
-       (let ([dc (new (if (equal? format 'eps-bytes) post-script-dc% pdf-dc%)
-                      [interactive #f]
-                      [as-eps #t]
-                      [width (* (pict-width p) (unbox xs))]
-                      [height (* (pict-height p) (unbox ys))]
-                      [output s])])
-         (send dc set-smoothing 'smoothed)
-         (send dc start-doc "pict")
-         (send dc start-page)
-         (draw-pict p dc 0 0)
-         (send dc end-page)
-         (send dc end-doc))
-       (get-output-bytes s))]
-    [(svg-bytes)
-     (let ([s (open-output-bytes)])
-       (define dc (new svg-dc% 
-                       [width  (pict-width p)]
-                       [height (pict-height p)]
-                       [output s]))
-       (send dc set-smoothing 'smoothed)
-       (send dc start-doc "Generating svg")
-       (send dc start-page)
-       (draw-pict p dc 0 0)
-       (send dc end-page)
-       (send dc end-doc)
-       (regexp-replace "width=\"(.*pt)\" height=\"(.*pt)\"" 
-                       (get-output-bytes s)
-                       (λ (all w h) 
-                         (define (rem x) (bytes->string/utf-8 (regexp-replace "pt" x "")))
-                         (string->bytes/utf-8
-                          (string-append "width=\"" (rem w) "\" height=\"" (rem h) "\"")))))]
-    [else default]))
-
-(define (convert-pict-to-vector p)
-  (define dc (new record-dc%
-                  [width (pict-width p)]
-                  [height (pict-height p)]))
-  (draw-pict p dc 0 0)
-  (vector (send dc get-recorded-datum)
-          (pict-width p)
-          (pict-height p)
-          (pict-ascent p)
-          (pict-descent p)))
-
-(define (deserialize-pict datum w h d a)
-  (define draw (recorded-datum->procedure datum))
-  (make-pict `(prog ,(lambda (dc x y)
-                       (define t (send dc get-transformation))
-                       (send dc translate x y)
-                       (draw dc)
-                       (send dc set-transformation t))
-                    ,h)
-             w h d a
-             null
-             #f
-             #f))
-
-(define pict-deserialize-info
-  (make-deserialize-info deserialize-pict
-                         (lambda () (error "no cycles"))))
-
-(module+ deserialize-info
-  (provide pict-deserialize-info))
diff --git a/pkgs/pict-pkgs/pict-lib/pict/private/play-pict.rkt b/pkgs/pict-pkgs/pict-lib/pict/private/play-pict.rkt
deleted file mode 100644
index 4bddb4a04a..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/private/play-pict.rkt
+++ /dev/null
@@ -1,175 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/math
-         "main.rkt")
-
-(provide fade-pict
-         slide-pict
-         slide-pict/center
-         fade-around-pict
-         sequence-animations
-         reverse-animations
-         fast-start
-         fast-end
-         fast-edges
-         fast-middle
-         split-phase)
-
-(define (fail-gracefully t)
-  (with-handlers ([exn:fail? (lambda (x) (values 0 0))])
-    (t)))
-
-(define single-pict (lambda (p) (if (list? p) (last p) p)))
-
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Animation combinators
-
-;; "Morph" from one pict to another. Use `combine' to align
-;; the picts relative to another. Only the bounding box is
-;; actually morphed; the drawing part transitions by fading
-;; the original `a' out and the new `b' in. The `n' argument
-;; ranges from 0.0 (= `a') to 1.0 (= `b').
-(define (fade-pict #:combine [combine cc-superimpose] n a b)
-  ;; Combine ghosts of scaled pictures:
-  (let ([orig (combine (cellophane a (- 1.0 n))
-                       (cellophane b n))])
-    (cond
-     [(zero? n) (refocus orig a)]
-     [(= n 1.0) (refocus orig b)]
-     [else
-      (let-values ([(atx aty) (ltl-find orig a)]
-                   [(abx aby) (rbl-find orig a)]
-                   [(btx bty) (ltl-find orig b)]
-                   [(bbx bby) (rbl-find orig b)])
-        (let ([da (+ aty (* (- bty aty) n))]
-              [dd (- (pict-height orig)
-                     (+ aby (* (- bby aby) n)))]
-              [orig 
-               ;; Generate intermediate last-pict
-               (let ([ap (or (pict-last a) a)]
-                     [bp (or (pict-last b) b)])
-                 (let-values ([(al at) (lt-find orig (if (pair? ap) (cons a ap) (list a ap)))]
-                              [(bl bt) (lt-find orig (if (pair? bp) (cons b bp) (list b bp)))]
-                              [(ae) (single-pict ap)]
-                              [(be) (single-pict bp)])
-                   (let ([ar (+ al (pict-width ae))]
-                         [ab (+ at (pict-height ae))]
-                         [br (+ bl (pict-width be))]
-                         [bb (+ bt (pict-height be))])
-                     (let ([atl (+ at (pict-ascent ae))]
-                           [abl (- ab (pict-descent ae))]
-                           [btl (+ bt (pict-ascent be))]
-                           [bbl (- bb (pict-descent be))]
-                           [btw (lambda (a b)
-                                  (+ a (* (- b a) n)))])
-                       (let ([t (btw at bt)]
-                             [l (btw al bl)])
-                         (let ([b (max t (btw ab bb))]
-                               [r (max l (btw ar br))])
-                           (let ([tl (max t (min (btw atl btl) b))]
-                                 [bl (max t (min (btw abl bbl) b))])
-                             (let ([p (blank (- r l) (- b t)
-                                             (- tl t) (- b bl))])
-                               (let ([orig+p (pin-over orig l t p)])
-                                 (use-last orig+p p))))))))))])
-          (let ([p (make-pict (pict-draw orig)
-                              (pict-width orig)
-                              (pict-height orig)
-                              da
-                              dd
-                              (list (make-child orig 0 0 1 1 0 0))
-                              #f
-                              (pict-last orig))])
-            (let ([left (+ atx (* (- btx atx) n))]
-                  [right (+ abx (* (- bbx abx) n))])
-              (let ([hp (inset p
-                               (- left)
-                               0
-                               (- right (pict-width p))
-                               0)])
-                (let-values ([(atx aty) (lt-find hp a)]
-                             [(abx aby) (lb-find hp a)]
-                             [(btx bty) (lt-find hp b)]
-                             [(bbx bby) (lb-find hp b)])
-                  (let ([top (+ aty (* (- bty aty) n))]
-                        [bottom (+ aby (* (- bby aby) n))])
-                    (inset hp
-                           0
-                           (- top)
-                           0
-                           (- bottom (pict-height hp))))))))))])))
-
-;; Pin `p' into `base', sliding from `p-from' to `p-to'
-;;  (which are picts within `base') as `n' goes from 0.0 to 1.0.
-;; The `p-from' and `p-to' picts are typically ghosts of
-;;   `p' within `base', but they can be any picts within
-;;   `base'. The top-left locations of `p-from' and `p-to'
-;;   determine the placement of the top-left of `p'.
-(define (slide-pict base p p-from p-to n)
-  (let-values ([(x1 y1) (fail-gracefully (lambda () (lt-find base p-from)))]
-               [(x2 y2) (fail-gracefully (lambda () (lt-find base p-to)))])
-    (pin-over base
-              (+ x1 (* (- x2 x1) n))
-              (+ y1 (* (- y2 y1) n))
-              p)))
-
-(define (slide-pict/center base p p-from p-to n)
-  (let-values ([(x1 y1) (fail-gracefully (lambda () (cc-find base p-from)))]
-               [(x2 y2) (fail-gracefully (lambda () (cc-find base p-to)))])
-    (pin-over base
-              (- (+ x1 (* (- x2 x1) n)) (/ (pict-width p) 2))
-              (- (+ y1 (* (- y2 y1) n)) (/ (pict-height p) 2))
-              p)))
-
-(define (fade-around-pict n base evolved)
-  (define tg1 (launder (ghost base)))
-  (define tg2 (launder (ghost base)))
-  (slide-pict
-   (fade-pict n
-              tg1
-              (evolved tg2))
-   base
-   tg1
-   tg2
-   n))
-
-;; Concatenate a sequence of animations
-(define (sequence-animations . l)
-  (let ([len (length l)])
-    (lambda (n)
-      (cond
-       [(zero? n)
-        ((car l) 0.0)]
-       [(= n 1.0)
-        ((list-ref l (sub1 len)) n)]
-       [else
-        (let ([pos (inexact->exact (floor (* n len)))])
-          ((list-ref l pos) (* len (- n (* pos (/ len))))))]))))
-
-;; Reverse a sequence of animations
-(define (reverse-animations . l)
-  (let ([s (apply sequence-animations l)])
-    (lambda (n)
-      (s (- 1 n)))))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; [0,1] -> [0,1] functions
-
-(define (fast-start n)
-  (- 1 (* (- 1 n) (- 1 n))))
-
-(define (fast-end n)
-  (* n n))
-
-(define (fast-edges n)
-  (+ 0.5 (* (sin (- (* n pi) (/ pi 2))) 0.5)))
-
-(define (fast-middle n)
-  (- 0.5 (/ (cos (* n pi)) 2)))
-
-(define (split-phase opt-n)
-  (values (* 2 (min opt-n 0.5))
-          (* 2 (- (max opt-n 0.5) 0.5))))
-
diff --git a/pkgs/pict-pkgs/pict-lib/pict/private/tidier.rkt b/pkgs/pict-pkgs/pict-lib/pict/private/tidier.rkt
deleted file mode 100644
index 50fabcb7e6..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/private/tidier.rkt
+++ /dev/null
@@ -1,346 +0,0 @@
-#lang racket/base
-(require "../main.rkt"
-         racket/match
-         "layout.rkt")
-
-(provide binary-tidier)
-
-#|
-
-Tidier Drawing of Trees
-Edward M. Reingold and John S. Tilford
-IEEE Transactions on Software Engineering, 
-Vol 7, #2, March 1981
-
-|#
-
-(define (binary-tidier t #:x-spacing [given-x-spacing #f] #:y-spacing [given-y-spacing #f])
-  (cond
-    [t
-     (define-values (x-spacing y-spacing) (compute-spacing t given-x-spacing given-y-spacing))
-     (unless given-y-spacing (set! y-spacing (* y-spacing 1.5)))
-     (define minsep 2)
-     (define xc (tidier-x-coordinates t minsep))
-     (define x-max (let loop ([xc xc])
-                     (match xc
-                       [#f 0]
-                       [(x-node x left-xc right-xc)
-                        (max x (loop left-xc) (loop right-xc))])))
-     (define y-max (let loop ([xc xc])
-                     (match xc 
-                       [#f 0]
-                       [(x-node x left-xc right-xc)
-                        (+ 1 (max (loop left-xc) (loop right-xc)))])))
-     
-     (define main (blank (* x-spacing (+ x-max 1))
-                         (* y-spacing y-max)))
-     (let loop ([t t]
-                [xc xc]
-                [y 0])
-       (match* (t xc)
-         [(#f #f) (void)]
-         [((tree-layout pict (list left-t right-t))
-           (x-node x left-xc right-xc))
-          (define node-pict (launder pict))
-          (set! main (pin-over main 
-                               (* x x-spacing)
-                               (* y y-spacing)
-                               node-pict))
-          (define (add-edge to color width)
-            (define colored
-              (colorize (launder (pin-line (ghost main)
-                                           node-pict cc-find
-                                           to cc-find))
-                        color))
-            (define with-linewidth
-              (if (eq? width 'unspecified)
-                  colored
-                  (linewidth width colored)))
-            (set! main (cc-superimpose with-linewidth main)))
-          (match left-t
-            [#f (void)]
-            [(tree-edge left-t left-color left-width)
-             (define left-pict (loop left-t left-xc (+ y 1)))
-             (add-edge left-pict left-color left-width)])
-          (match right-t
-            [#f (void)]
-            [(tree-edge right-t right-color right-width)
-             (define right-pict (loop right-t right-xc (+ y 1)))
-             (add-edge right-pict right-color right-width)])
-          node-pict]))
-     
-     main]
-    [else (blank)]))
-
-;; x-coordinate-tree : (or/c #f x-node?)
-
-;; x : exact-positive-integer?
-;; l : x-coordinate-tree?
-;; r : x-coordinate-tree?
-(struct x-node (x l r) #:transparent)
-
-(define (tidier-x-coordinates t minsep)
-  (cond
-    [(not t) #f]
-    [else
-     (define t-link
-       (let loop ([t t])
-         (match t
-           [(tree-layout pict (list left right))
-            (link (and left (loop (tree-edge-child left)))
-                  (and right (loop (tree-edge-child right)))
-                  #f #f #f #f)])))
-     (setup t-link 0 (extreme #f #f #f) (extreme #f #f #f) minsep)
-     (petrify t-link 0)
-     
-     (define smallest
-       (let loop ([t-link t-link])
-         (match t-link
-           [#f #f]
-           [(link llink rlink xcoord _ _ _)
-            (min2/f xcoord (min2/f (loop llink) (loop rlink)))])))
-     
-     (let loop ([t-link t-link])
-       (match t-link
-         [#f #f]
-         [(link llink rlink xcoord ycoord offset thread)
-          (x-node (- xcoord smallest) (loop llink) (loop rlink))]))]))
-
-(define (min2/f a b) 
-  (cond
-    [(not a) b]
-    [(not b) a]
-    [else (min a b)]))
-
-(struct extreme (addr off lev) #:mutable)
-(struct link (llink rlink xcoord ycoord offset thread) #:mutable)
-
-(define (setup t level rmost lmost minsep)
-  (cond
-    [(not t) 
-     (set-extreme-lev! lmost -1)
-     (set-extreme-lev! rmost -1)]
-    [else
-     (define lr (extreme #f #f #f))
-     (define ll (extreme #f #f #f))
-     (define rr (extreme #f #f #f))
-     (define rl (extreme #f #f #f))
-     (set-link-ycoord! t level)
-     (define l (link-llink t))
-     (define r (link-rlink t))
-     (setup l (+ level 1) lr ll minsep)
-     (setup r (+ level 1) rr rl minsep)
-     (cond 
-       [(and (not l) (not r))
-        (set-extreme-addr! rmost t)
-        (set-extreme-addr! lmost t)
-        (set-extreme-lev! rmost level)
-        (set-extreme-lev! lmost level)
-        (set-extreme-off! rmost 0)
-        (set-extreme-off! lmost 0)
-        (set-link-offset! t 0)]
-       [else
-        (define cursep minsep)
-        (define rootsep minsep)
-        (define loffsum 0)
-        (define roffsum 0)
-        
-        (let loop ()
-          (when (and l r)
-            (when (< cursep minsep)
-              (set! rootsep (+ rootsep (- minsep cursep)))
-              (set! cursep minsep))
-            (cond
-              [(link-rlink l)
-               (set! loffsum (+ loffsum (link-offset l)))
-               (set! cursep (- cursep (link-offset l)))
-               (set! l (link-rlink l))]
-              [else 
-               (set! loffsum (- loffsum (link-offset l)))
-               (set! cursep (+ cursep (link-offset l)))
-               (set! l (link-llink l))])
-            (cond
-              [(link-llink r)
-               (set! roffsum (- roffsum (link-offset r)))
-               (set! cursep (- cursep (link-offset r)))
-               (set! r (link-llink r))]
-              [else
-               (set! roffsum (+ roffsum (link-offset r)))
-               (set! cursep (+ cursep (link-offset r)))
-               (set! r (link-rlink r))])
-            (loop)))
-        
-        (set-link-offset! t (quotient (+ rootsep 1) 2))
-        (set! loffsum (- loffsum (link-offset t)))
-        (set! roffsum (+ roffsum (link-offset t)))
-        
-        (cond
-          [(or (> (extreme-lev rl) (extreme-lev ll)) (not (link-llink t)))
-           (extreme-copy! lmost rl)
-           (set-extreme-off! lmost (+ (extreme-off lmost) (link-offset t)))]
-          [else
-           (extreme-copy! lmost ll)
-           (set-extreme-off! lmost (- (extreme-off lmost) (link-offset t)))])
-        (cond
-          [(or (> (extreme-lev lr) (extreme-lev rr)) (not (link-rlink t)))
-           (extreme-copy! rmost lr)
-           (set-extreme-off! rmost (- (extreme-off rmost) (link-offset t)))]
-          [else
-           (extreme-copy! rmost rr)
-           (set-extreme-off! rmost (+ (extreme-off rmost) (link-offset t)))])
-        
-        (cond
-          [(and l (not (eq? l (link-llink t))))
-           (set-link-thread! (extreme-addr rr) #t)
-           (set-link-offset! (extreme-addr rr) 
-                             (abs (- (+ (extreme-off rr) (link-offset t)) loffsum)))
-           (cond
-             [(<= (- loffsum (link-offset t)) (extreme-off rr))
-              (set-link-llink! (extreme-addr rr) l)]
-             [else
-              (set-link-rlink! (extreme-addr rr) l)])]
-          [(and r (not (eq? r (link-rlink t))))
-           (set-link-thread! (extreme-addr ll) #t)
-           (set-link-offset! (extreme-addr ll) 
-                             (abs (- (- (extreme-off ll) (link-offset t)) roffsum)))
-           (cond
-             [(>= (+ roffsum (link-offset t)) (extreme-off ll))
-              (set-link-rlink! (extreme-addr ll) r)]
-             [else 
-              (set-link-llink! (extreme-addr ll) r)])])])]))
-
-(define (extreme-copy! dest src)
-  (set-extreme-addr! dest (extreme-addr src))
-  (set-extreme-off! dest (extreme-off src))
-  (set-extreme-lev! dest (extreme-lev src)))
-
-(define (petrify t xpos)
-  (when t
-    (set-link-xcoord! t xpos)
-    (when (link-thread t)
-      (set-link-thread! t #f)
-      (set-link-rlink! t #f)
-      (set-link-llink! t #f))
-    (petrify (link-llink t) (- xpos (link-offset t)))
-    (petrify (link-rlink t) (+ xpos (link-offset t)))))  
-
-(module+ test
-  (require rackunit)
-  (check-equal? (tidier-x-coordinates #f 2)
-                #f)
-  (check-equal? (tidier-x-coordinates (_tree-layout #f #f) 2)
-                (x-node 0 #f #f))
-  (check-equal? (tidier-x-coordinates (_tree-layout
-                                       (_tree-layout
-                                        #f #f)
-                                       (_tree-layout
-                                        #f #f))
-                                      2)
-                (x-node 1 (x-node 0 #f #f) (x-node 2 #f #f)))
-  
-  (check-equal? (tidier-x-coordinates (_tree-layout
-                                       #f
-                                       (_tree-layout 
-                                        (_tree-layout #f #f)
-                                        (_tree-layout #f #f)))
-                                      2)
-                (x-node 0 #f (x-node 1 (x-node 0 #f #f) (x-node 2 #f #f))))
-  (check-equal? (tidier-x-coordinates (_tree-layout
-                                       (_tree-layout 
-                                        (_tree-layout #f #f)
-                                        (_tree-layout #f #f))
-                                       #f)
-                                      2)
-                (x-node 2 (x-node 1 (x-node 0 #f #f) (x-node 2 #f #f)) #f))
-  
-  
-  ;; this is building up an example from 
-  ;; http://rp-www.cs.usyd.edu.au/~comp5048/Lect2-trees.pdf and from
-  ;; http://sydney.edu.au/engineering/it/~shhong/comp5048-lec2.pdf
-  ;; for the tidier algorithm
-  (define triangle
-    (_tree-layout 
-     (_tree-layout #f #f)
-     (_tree-layout #f #f)))
-  
-  (define left-subtree
-    (_tree-layout (_tree-layout #f triangle) 
-                  #f))
-
-  (define right-subtree
-    (_tree-layout 
-     triangle
-     (_tree-layout #f #f)))
-  
-  (check-equal? (tidier-x-coordinates left-subtree 2)
-                (x-node 1 (x-node 0 #f (x-node 1 (x-node 0 #f #f) (x-node 2 #f #f))) #f))
-  
-  (check-equal? (tidier-x-coordinates (_tree-layout left-subtree right-subtree) 2)
-                (x-node 3
-                        (x-node 1
-                                (x-node 0 
-                                        #f
-                                        (x-node 1
-                                                (x-node 0 #f #f)
-                                                (x-node 2 #f #f)))
-                                #f)
-                        (x-node 5
-                                (x-node 4
-                                        (x-node 3 #f #f)
-                                        (x-node 5 #f #f))
-                                (x-node 6 #f #f))))
-  
-  
-  ;; this is a simplification of the tree in figure 2 from the tidier paper
-  (define (build-left t) (_tree-layout (_tree-layout #f #f) t))
-  (define (build-right t) (_tree-layout t (_tree-layout #f #f)))
-  (check-equal? (tidier-x-coordinates
-                 (_tree-layout
-                  #f
-                  (build-left
-                   (build-left
-                    (build-right
-                     (build-right
-                      triangle)))))
-                 2)
-                (x-node
-                 0
-                 #f 
-                 (x-node
-                  1 
-                  (x-node 0 #f #f)
-                  (x-node
-                   2 
-                   (x-node 1 #f #f) 
-                   (x-node
-                    3
-                    (x-node
-                     2 
-                     (x-node
-                      1 
-                      (x-node 0 #f #f) 
-                      (x-node 2 #f #f))
-                     (x-node 3 #f #f))
-                    (x-node 4 #f #f))))))
-  
-  
-  (check-pred pict? (binary-tidier #f))
-  (check-pred pict? (binary-tidier (_tree-layout #f #f))))
-
-
-(module+ main
-  (define (full d)
-    (cond
-      [(zero? d) #f]
-      [else (define s (full (- d 1)))
-            (_tree-layout s s)]))
-  (define triangle (full 1))
-  (define (build-left t) (_tree-layout (_tree-layout #f #f) t))
-  (define (build-right t) (_tree-layout t (_tree-layout #f #f)))
-  (define (n-of n f t) (if (zero? n) t (n-of (- n 1) f (f t))))
-  ;; this is the example from the paper
-  (binary-tidier
-   (_tree-layout
-    (n-of 3 build-right (n-of 3 build-left triangle))
-    (n-of 3 build-left (n-of 3 build-right triangle)))) 
-  (binary-tidier (full 3)))
diff --git a/pkgs/pict-pkgs/pict-lib/pict/private/utils.rkt b/pkgs/pict-pkgs/pict-lib/pict/private/utils.rkt
deleted file mode 100644
index 06e44b6f59..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/private/utils.rkt
+++ /dev/null
@@ -1,1275 +0,0 @@
-#lang racket/base
-
-  (require racket/contract
-           racket/class
-           racket/draw
-           racket/math
-           file/convertible
-           racket/gui/dynamic
-           "pict.rkt")
-
-  (provide cons-colorized-picture
-	   color-frame
-	   round-frame
-	   color-round-frame
-	   color-dash-frame
-
-	   arrow
-	   arrowhead
-	   arrowhead/offset
-	   arrow-line
-	   arrows-line
-	   pip-line
-	   pip-arrow-line
-	   pip-arrows-line
-	   
-           ellipse
-           filled-ellipse
-	   circle
-	   disk
-           rectangle
-           filled-rectangle
-	   rounded-rectangle
-           filled-rounded-rectangle
-           
-	   cloud
-	   file-icon
-	   jack-o-lantern
-	   angel-wing
-	   desktop-machine
-	   standard-fish
-           thermometer
-           
-	   add-line
-	   add-arrow-line
-	   add-arrows-line
-
-	   bitmap-draft-mode
-
-           find-pen
-           find-brush
-           
-           color-series
-           scale-color
-	   scale/improve-new-text
-           
-           cellophane
-
-	   inset/clip
-           clip
-
-	   hyperlinkize)
-  
-  (define (pict-path? p)
-    (or (pict? p) 
-        (and (pair? p)
-             (list? p)
-             (andmap pict? p))))
-  
-  (provide/contract 
-   [scale (case-> (-> pict? number? number? pict?)
-                  (-> pict? number? pict?))]
-   [scale-to-fit (case-> (-> pict? number? number? pict?)
-                         (-> pict? pict? pict?))]
-   [rotate (case-> (-> pict? number? pict?))]
-   [pin-line (->* (pict?
-                   pict-path? (-> pict? pict-path? (values number? number?))
-                   pict-path? (-> pict? pict-path? (values number? number?)))
-                  ((or/c false/c number?)
-                   (or/c false/c string?)
-                   boolean?
-                   #:style (or/c false/c symbol?))
-                  pict?)]
-   [pin-arrow-line (->* (number?
-                         pict?
-                         pict-path? (-> pict? pict-path? (values number? number?))
-                         pict-path? (-> pict? pict-path? (values number? number?)))
-                        ((or/c false/c number?) 
-                         (or/c false/c string?)
-                         boolean?
-                         boolean?
-                         #:style (or/c false/c symbol?)
-                         #:hide-arrowhead? any/c)
-                        pict?)]
-   [pin-arrows-line (->* (number? pict?
-                           pict-path? (-> pict? pict-path? (values number? number?))
-                           pict-path? (-> pict? pict-path? (values number? number?)))
-                          ((or/c false/c number?)
-                           (or/c false/c string?)
-                           boolean?
-                           boolean?
-                           #:style (or/c false/c symbol?)
-                           #:hide-arrowhead? any/c)
-                          pict?)]
-   [bitmap (-> (or/c path-string?
-                     (is-a?/c bitmap%)
-                     convertible?)
-               pict?)]
-   )
-
-
-
-  (define (re-pict box naya)
-    (let ([w (pict-width box)]
-	  [h (pict-height box)]
-	  [d (pict-descent box)]
-	  [a (pict-ascent box)])
-      (make-pict (pict-draw naya)
-		 w h
-		 a d
-		 (list (make-child box 0 0 1 1 0 0))
-		 #f
-                 (pict-last box))))
-  
-  (define cons-colorized-picture
-    (lambda (p color cmds)
-      (re-pict
-       p
-       (cc-superimpose
-	p
-	(colorize
-	 (cons-picture
-	  (ghost (launder p))
-	  cmds)
-	 color)))))
-
-  (define (round-frame p radius)
-    (re-pict
-     p
-     (cc-superimpose
-      p
-      (let ([w (pict-width p)]
-	    [h (pict-height p)])
-	(dc (lambda (dc x y)
-	      (let ([b (send dc get-brush)])
-		(send dc set-brush (send the-brush-list find-or-create-brush
-					 "white" 'transparent))
-		(send dc draw-rounded-rectangle x y w h radius)
-		(send dc set-brush b)))
-	    (pict-width p) (pict-height p))))))
-
-  ;; FIXME: abstract common part of color-frame, etc.
-
-  (define color-frame
-    (case-lambda
-     [(p color w)
-      (re-pict
-       p
-       (cc-superimpose
-	p
-	(let ([p2 (colorize (frame (ghost (launder p))) color)])
-	  (if w
-	      (linewidth w p2)
-	      p2))))]
-     [(p color) (color-frame p color #f)]))
-  
-  (define color-round-frame
-    (case-lambda
-     [(p radius color w)
-      (re-pict
-       p
-       (cc-superimpose
-	p
-	(let ([p2 (colorize (round-frame (ghost (launder p)) radius) color)])
-	  (if w
-	      (linewidth w p2)
-	      p2))))]
-     [(p radius color) (color-round-frame p radius color #f)]))  
-
-  (define color-dash-frame
-    (case-lambda
-     [(p seg-length color w)
-      (re-pict
-       p
-       (cc-superimpose
-	p
-	(let ([p2 (colorize (dash-frame (ghost (launder p)) seg-length) color)])
-	  (if w
-	      (linewidth w p2)
-	      p2))))]
-     [(p seg-length color) (color-dash-frame p seg-length color #f)]))  
-
-  ;; Returns three values: pict dx dy
-  ;;  dx is in [-size, 0] and dy is in [0, size]
-  (define (generic-arrow stem? solid? size angle pen-thickness)
-    (values
-     (dc
-      (lambda (dc x y)
-	(define (pt->xform-obj p)
-	  (let* ([x (car p)]
-		 [y (cadr p)]
-		 [d (sqrt (+ (* x x) (* y y)))]
-		 [a (atan y x)])
-	    (make-object point% 
-              (* d size 1/2 (cos (+ a angle)))
-              (* d size 1/2 (- (sin (+ a angle)))))))
-	(let ([b (send dc get-brush)]
-	      [p (send dc get-pen)])
-	  (send dc set-pen (send the-pen-list
-				 find-or-create-pen
-				 (send p get-color)
-				 (if solid? 0 (send p get-width))
-				 'solid))
-	  (send dc set-brush (send the-brush-list
-				   find-or-create-brush
-				   (if solid? (send p get-color) "white")
-				   'solid))
-	  (send dc draw-polygon 
-		(map pt->xform-obj
-		     (if stem?
-			 `((1 0)
-			   (0 -1)
-			   (0 -1/2)
-			   (-1 -1/2)
-			   (-1 1/2)
-			   (0 1/2)
-			   (0 1))
-			 `((1 0)
-			   (-1 -1)
-			   (-1/2 0)
-			   (-1 1))))
-		(+ x (/ size 2)) (+ y (/ size 2)))
-	  (send dc set-brush b)
-	  (send dc set-pen p)))
-      size size)
-     (- (- 0 (* 1/2 size (cos angle))) (/ size 2))
-     (- (+ (* 1/2 size) (- (* 1/2 size (sin angle)))) size)))
-
-  (define (arrow/delta size angle)
-    (generic-arrow #t #t size angle 0))
-  (define (arrow size angle)
-    (let-values ([(p dx dy) (arrow/delta size angle)])
-      p))
-
-  (define (arrowhead/delta pen-thickness size angle solid-head?)
-    (generic-arrow #f solid-head? size angle pen-thickness))
-  (define (arrowhead size angle)
-    (let-values ([(p dx dy) (arrowhead/delta 0 size angle #t)])
-      p))
-  (define (arrowhead/offset size angle)
-    (arrowhead/delta 0 size angle #t))
-
-  (define (pip-line dx dy size)
-    (picture
-     0 0
-     `((connect 0 0 ,dx ,(- dy)))))
-
-  (define (arrow-line dx dy size)
-    (let-values ([(a adx ady) (arrowhead/delta 0 size (atan dy dx) #t)])
-      (picture
-       0 0
-       `((connect 0 0 ,dx ,dy)
-	 (place ,(+ dx adx) ,(+ ady dy) ,a)))))
-
-  (define (pip-arrow-line dx dy size)
-    (arrow-line dx (- dy) size))
-
-  (define (arrows-line dx dy size)
-    (picture
-     0 0
-     `((place 0 0 ,(arrow-line dx dy size))
-       (place ,dx ,dy ,(arrow-line (- dx) (- dy) size)))))
-
-  (define (pip-arrows-line dx dy size)
-    (arrows-line dx (- dy) size))
-
-  (define (filled-rectangle w h #:draw-border? [draw-border? #t])
-    (dc
-     (lambda (dc x y)
-       (let ([b (send dc get-brush)]
-             [p (send dc get-pen)])
-         (send dc set-brush (send the-brush-list find-or-create-brush
-                                  (send p get-color)
-                                  'solid))
-         (unless draw-border?
-           (send dc set-pen "black" 1 'transparent))
-	 (send dc draw-rectangle x y w h)
-         (send dc set-brush b)
-         (send dc set-pen p)))
-     w
-     h))
-  
-  (define (rectangle w h)
-    (dc
-     (lambda (dc x y)
-       (let ([b (send dc get-brush)])
-         (send dc set-brush (send the-brush-list find-or-create-brush
-                                  "white" 'transparent))
-         (send dc draw-rectangle x y w h)
-         (send dc set-brush b)))
-     w
-     h))
-  
-  (define (rounded-rectangle w h [corner-radius -0.25] #:angle [angle 0])
-    (let ([dc-path (new dc-path%)])
-      (send dc-path rounded-rectangle 0 0 w h corner-radius)
-      (send dc-path rotate angle)
-      (let-values ([(x y w h) (send dc-path get-bounding-box)])
-        (dc (λ (dc dx dy) 
-              (let ([brush (send dc get-brush)])
-                (send dc set-brush (send the-brush-list find-or-create-brush
-                                         "white" 'transparent))
-                (send dc draw-path dc-path (- dx x) (- dy y))
-                (send dc set-brush brush)))
-            w
-            h))))
-  
-  (define (filled-rounded-rectangle w h [corner-radius -0.25] #:angle [angle 0] #:draw-border? [draw-border? #t])
-    (let ([dc-path (new dc-path%)])
-      (send dc-path rounded-rectangle 0 0 w h corner-radius)
-      (send dc-path rotate angle)
-      (let-values ([(x y w h) (send dc-path get-bounding-box)])
-        (dc (λ (dc dx dy) 
-              (let ([brush (send dc get-brush)]
-                    [pen (send dc get-pen)])
-                (send dc set-brush (send the-brush-list find-or-create-brush
-                                         (send (send dc get-pen) get-color)
-                                         'solid))
-                (unless draw-border?
-                  (send dc set-pen "black" 1 'transparent))
-                (send dc draw-path dc-path (- dx x) (- dy y))
-                (send dc set-brush brush)
-                (send dc set-pen pen)))
-            w
-            h))))
-  
-  (define (circle size) (ellipse size size))
-  
-  (define (ellipse width height)
-    (dc (lambda (dc x y)
-	  (let ([b (send dc get-brush)])
-	    (send dc set-brush (send the-brush-list find-or-create-brush
-				     "white" 'transparent))
-	    (send dc draw-ellipse x y width height)
-	    (send dc set-brush b)))
-	width height))
-
-  (define (disk size #:draw-border? [draw-border? #t])
-    (filled-ellipse size size #:draw-border? draw-border?))
-  
-  (define (filled-ellipse width height #:draw-border? [draw-border? #t])
-    (dc (lambda (dc x y)
-	  (define b (send dc get-brush))
-          (define p (send dc get-pen))
-          (send dc set-brush (send the-brush-list find-or-create-brush
-                                   (send (send dc get-pen) get-color)
-                                   'solid))
-          (unless draw-border?
-            (send dc set-pen "black" 1 'transparent))
-          (send dc draw-ellipse x y width height)
-          (send dc set-brush b)
-          (send dc set-pen p))
-	width height))
-
-  (define cloud
-    (case-lambda
-     [(w h) (cloud w h "gray")]
-     [(w h color)
-      (dc
-       (lambda (dc x y)
-	 (let ([b (send dc get-brush)]
-	       [p (send dc get-pen)])
-	   (send dc set-pen (send the-pen-list
-				  find-or-create-pen
-				  "white" 0 'transparent))
-	   (send dc set-brush (send the-brush-list
-				    find-or-create-brush
-				    color
-				    'solid))
-	   (send dc draw-ellipse
-		 x (+ y (* 1/4 h))
-		 (* 1/2 w) (* 1/2 h))
-	   (send dc draw-ellipse
-		 (+ x (* 1/5 w)) y
-		 (* 3/5 w) (add1 (* 2/5 h)))
-	   (send dc draw-ellipse
-		 (+ x (* 1/5 w)) (+ y (* 1/3 h))
-		 (* 3/5 w) (* 2/3 h))
-	   (send dc draw-ellipse
-		 (+ x (* 3/5 w)) (+ y (* 1/4 h))
-		 (* 2/5 w) (* 1/3 h))
-	   (send dc draw-ellipse
-		 (+ x (* 3/5 w)) (+ y (* 1/2 h))
-		 (* 2/5 w) (* 1/3 h))
-
-	   (send dc set-brush b)
-	   (send dc set-pen p)))
-       w h)]))
-  
-  (define (thermometer #:height-% [height-% 1]
-                       #:color-% [color-% height-%]
-                       #:ticks [ticks 4]
-                       #:start-color [_start-color "lightblue"]
-                       #:end-color [_end-color "lightcoral"]
-                       #:top-circle-diameter [top-circle-diameter 40]
-                       #:bottom-circle-diameter [bottom-circle-diameter 80]
-                       #:stem-height [stem-height 180]
-                       #:mercury-inset [mercury-inset 8])
-    (define (to-color s)
-      (if (string? s)
-          (or (send the-color-database find-color s) 
-              (send the-color-database find-color "white"))
-          s))
-    (define start-color (to-color _start-color))
-    (define end-color (to-color _end-color))
-    (define (between lo hi) (round (+ lo (* (- hi lo) color-%))))
-    (define fill-color (make-object color%
-                         (between (send start-color red) (send end-color red))
-                         (between (send start-color green) (send end-color green))
-                         (between (send start-color blue) (send end-color blue))))
-    (define tw bottom-circle-diameter)
-    (define th
-      (+ stem-height 
-         (/ top-circle-diameter 2)
-         (/ bottom-circle-diameter 2)))
-    
-    (define (make-region dc dx dy offset %)
-      (define top (new region% [dc dc]))
-      (define bottom (new region% [dc dc]))
-      (define middle (new region% [dc dc]))
-      (send top set-ellipse 
-            (+ dx 
-               (/ (- bottom-circle-diameter top-circle-diameter) 2)
-               offset)
-            (+ dy offset (* (- 1 %) stem-height))
-            (- top-circle-diameter offset offset)
-            (- top-circle-diameter offset offset))
-      (send middle set-rectangle 
-            (+ dx 
-               (/ (- bottom-circle-diameter top-circle-diameter) 2)
-               offset)
-            (+ dy (/ top-circle-diameter 2) (* (- 1 %) stem-height))
-            (- top-circle-diameter offset offset)
-            (* % stem-height))
-      (send bottom set-ellipse 
-            (+ dx offset)
-            (+ dy (+ (/ top-circle-diameter 2) 
-                     stem-height
-                     (- (/ bottom-circle-diameter 2)))
-               offset)
-            (- bottom-circle-diameter offset offset)
-            (- bottom-circle-diameter offset offset))
-      (send top union middle)
-      (send top union bottom)
-      top)
-    
-    (dc
-     (λ (dc dx dy)
-       (define old-pen (send dc get-pen))
-       (define old-brush (send dc get-brush))
-       (define boundary (make-region dc dx dy 0 1))
-       (define fill (make-region dc dx dy mercury-inset height-%))
-       (define old-rgn (send dc get-clipping-region))
-       (send dc set-clipping-region boundary)
-       (send dc set-brush "black" 'solid)
-       (send dc draw-rectangle dx dy tw th)
-       (send dc set-clipping-region fill)
-       (send dc set-brush fill-color 'solid)
-       (send dc draw-rectangle dx dy tw th)
-       (send dc set-pen "black" mercury-inset 'solid)
-       (for ([x (in-range ticks)])
-         (define y (+ (/ top-circle-diameter 2)
-                      (* (/ (+ x 1/2) ticks) 
-                         (- stem-height (/ bottom-circle-diameter 3)))))
-         (send dc draw-line 
-               dx
-               (+ dy y)
-               (+ dx (/ tw 2))
-               (+ dy y)))
-       
-       (send dc set-clipping-region old-rgn)
-       (send dc set-brush old-brush)
-       (send dc set-pen old-pen))
-     tw th))
-
-  (define file-icon
-    (lambda (w h gray [fancy? #f])
-      (dc
-       (let* ([sw (lambda (x) (* (/ w 110) x))]
-	      [sh (lambda (y) (* (/ h 150) y))]
-	      [->pt (lambda (l)
-		      (map (lambda (p)
-			     (make-object point% 
-					  (sw (car p))
-					  (sh (cadr p))))
-			   l))])
-	 (lambda (dc x y)
-	   (define p (send dc get-pen))
-	   (define b (send dc get-brush))
-
-	   (let* ([bg-color (cond
-                                 [(or (string? gray) (is-a? gray color%)) gray]
-                                 [gray (make-object color% 200 200 255)]
-                                 [else "white"])]
-                  [line-color (if fancy?
-                                  (scale-color 0.6 bg-color)
-                                  "black")]
-                  [color (send the-brush-list
-                               find-or-create-brush
-                               bg-color
-                               'solid)])
-
-	     (send dc set-pen (send the-pen-list 
-				    find-or-create-pen 
-                                    line-color
-				    (send p get-width)
-				    'solid))
-	     (send dc set-brush color)
-	     
-	     (send dc draw-polygon 
-		   (->pt '((0 0)
-			   (0 150)
-			   (110 150)
-			   (110 20)
-			   (90 0)))
-		   x y)
-
-             (send dc draw-line (+ x (sw 90)) (+ y 1) (+ x (sw 90)) (+ y (sh 20)))
-             (send dc draw-line (+ x (sw 90)) (+ y (sh 20)) (+ x (sw 110) -1) (+ y (sh 20))))
-	   
-           (send dc set-brush b)
-	   (send dc set-pen p)))
-       w h)))
-
-  (define angel-wing
-    (lambda (w h left?)
-      (dc
-       (lambda (dc x y)
-	 (let-values ([(sx sy) (send dc get-scale)]
-		      [(dx dy) (send dc get-origin)])
-	   (let ([nsx (* sx (/ w 54))]
-		 [nsy (* sy (/ h 110))])
-	     (send dc set-origin (+ dx (* x sx) (* (- 16) nsx)) (+ dy (* y sy) (* (- 20) nsy)))
-	     (send dc set-scale nsx nsy)
-
-	     (let ([wing
-		    (list
-		     
-		     (list 70 (+ 50 40)  35 65     20 20)
-		     (list 20 20    (- 20 5) (+ 20 30)    (+ 20 5) (+ 20 60))
-		     (list (+ 20 5) (+ 20 60)    50 100    70 (+ 50 45))
-		     
-		     (list 22 70   (- 30 5) (+ 65 30)   (+ 30 5) (+ 65 40))
-		     (list (+ 30 5) (+ 65 40)  50 110     70 (+ 50 50))
-		     
-		     (list 32 102   (- 40 5) (+ 65 50)   (+ 40 5) (+ 65 58))
-		     (list (+ 40 5) (+ 65 58)   60  130    70 (+ 50 52)))])
-	       (when left?
-		 (for-each
-		  (lambda (spline)
-		    (send dc draw-spline . spline))
-		  wing))
-	       (unless left?
-		 (for-each
-		  (lambda (spline)
-		    (let-values ([(x1 y1 x2 y2 x3 y3) (apply values spline)])
-		      (send dc draw-spline (- 87 x1) y1 (- 86 x2) y2 (- 86 x3) y3)))
-		  wing)))
-
-	     (send dc set-origin dx dy)
-	     (send dc set-scale sx sy))))
-       w h)))
-
-  (define desktop-machine
-    (lambda (s [style null])
-      (define icon
-	(let ([bm (if (and (list? style) (memq 'plt style))
-		      (make-object bitmap% (build-path (collection-path "icons") "plt-small-shield.gif"))
-		      #f)])
-	  (dc (lambda (dc x y)
-		(let-values ([(sx sy) (send dc get-scale)]
-			     [(dx dy) (send dc get-origin)]
-			     [(op) (send dc get-pen)]
-			     [(ob) (send dc get-brush)])
-		  (send dc set-origin (+ dx (* sx x) (* s sx 10)) (+ dy (* sy y) (* s sy 15)))
-		  (send dc set-scale (* sx s) (* sy s))
-		  
-		  (let ([gray (send the-brush-list
-				    find-or-create-brush
-				    "gray"
-				    'solid)])
-		    (send dc set-brush gray)
-		    (send dc draw-polygon (list
-					   (make-object point% 10 60)
-					   (make-object point% 0 80)
-					   (make-object point% 80 80)
-					   (make-object point% 100 60)
-					   (make-object point% 100 0)
-					   (make-object point% 20 0)
-					   (make-object point% 10 5))))
-		  (send dc draw-line 80 80 90 60)
-		  (send dc draw-rectangle 10 5 80 55)
-		  (send dc set-brush (send the-brush-list
-					   find-or-create-brush
-					   "white"
-					   'solid))
-		  (send dc draw-rounded-rectangle 15 10 70 45 5)
-
-		  (when (and (list? style) 
-			     (or (memq 'devil style)
-				 (memq 'binary style)))
-		    (send dc set-font (make-object font% 12 'modern 'normal 'normal))
-		    (let-values ([(w h d a) (send dc get-text-extent "101010")])
-		      (let ([dx (+ (/ (- 70 w) 2) 15)]
-			    [dy (+ (/ (- 45 (* 2 h) 2) 2) 10)])
-			(send dc draw-text "101010" dx dy)
-			(send dc draw-text "010101" dx (+ dy h 2))))
-		    
-		    (when (memq 'devil style)
-		      (send dc set-brush (send the-brush-list
-					       find-or-create-brush
-					       "red"
-					       'solid))
-		      (let ([horn (list
-				   (make-object point% 0 17)
-				   (make-object point% 2 0)
-				   (make-object point% 4 17))])
-			(send dc draw-polygon horn 30 -15)
-			(send dc draw-polygon horn 70 -15))
-		      
-		      (send dc draw-polygon (list
-					     (make-object point% 0 0)
-					     (make-object point% 10 2)
-					     (make-object point% 0 6))
-			    115 32)
-		      
-		      (send dc set-pen (send the-pen-list
-					     find-or-create-pen
-					     "red"
-					     2
-					     'solid))
-		      (send dc draw-line 101 55 110 55)
-		      (send dc draw-spline 110 55   130 50    110  45)
-		      (send dc draw-spline 110 45   90 40    115  35)))
-		    
-		  (send dc set-origin dx dy)
-
-		  (send dc set-pen op)
-		  (send dc set-brush ob)
-
-		  (send dc set-scale (* sx s 2/3) (* sy s 2/3))
-
-		  (when (and (list? style) (memq 'plt style))
-		    (when (send bm ok?)
-		      (let ([w (send bm get-width)]
-			    [h (send bm get-height)])
-			(send dc draw-bitmap bm 
-			      (/ (+ x (/ (- (* s 70) (* w 2/3 s)) 2) (* s 25)) (* 2/3 s))
-			      (/ (+ y (/ (- (* s 45) (* h 2/3 s)) 2) (* s 25)) (* 2/3 s))))))
-
-		  (send dc set-scale sx sy)))
-	      (* s 120) (* s 115))))
-      (if (pict? style)
-	  (lt-superimpose
-	   icon
-	   (inset
-	    (cc-superimpose (blank (* s 70) (* s 45)) style)
-	    (* s 25) (* s 25) 0 0))
-	  icon)))
-
-  (define jack-o-lantern
-    (lambda (size [pumpkin-color "orange"] [face-color "black"] [stem-color "brown"])
-      (dc (lambda (dc x y)
-	    (let ([b (send dc get-brush)]
-		  [p (send dc get-pen)]
-		  [set-brush (lambda (c)
-			       (send dc set-brush 
-				     (send the-brush-list
-					   find-or-create-brush
-					   c 'solid)))]
-		  [r (make-object region% dc)]
-		  [path (make-object dc-path%)]
-		  [c (send dc get-clipping-region)])
-	      (send dc set-pen (send the-pen-list
-				     find-or-create-pen
-				     "white" 1 'transparent))
-
-	      ;; Stem ----------------------------------------
-	      (send path arc
-		    (+ x (* 0.42 size)) (- y (*  0.2 size))
-		    size size
-		    (* 0.8 pi) pi)
-	      (send path arc
-		    (+ x (* 0.52 size)) (- y (* 0.1 size))
-		    (* 0.8 size) (* 0.8 size)
-		    pi (* 0.8 pi) #f)
-	      (send r set-path path)
-	      (send dc set-clipping-region r)
-	      (set-brush stem-color)
-	      (send dc draw-rectangle x y size size)
-
-	      ;; Body ----------------------------------------
-	      (send dc set-clipping-region c)
-	      (set-brush pumpkin-color)
-
-	      (send dc draw-ellipse 
-		    x (+ y (* 0.2 size))
-		    (* 0.4 size) (* 0.8 size))
-	      (send dc draw-ellipse 
-		    (+ x (* 0.6 size)) (+ y (* 0.2 size))
-		    (* 0.4 size) (* 0.8 size))
-
-	      (send dc draw-ellipse 
-		    (+ x (* 0.2 size)) (+ y (* 0.15 size))
-		    (* 0.4 size) (* 0.9 size))
-	      (send dc draw-ellipse 
-		    (+ x (* 0.4 size)) (+ y (* 0.15 size))
-		    (* 0.4 size) (* 0.9 size))
-
-	      ;; Smile ----------------------------------------
-
-	      (send r set-rectangle x (+ y (* 0.4 size)) size (* 0.7 size))
-	      (send dc set-clipping-region r)
-
-	      (set-brush face-color)
-	      (send dc draw-ellipse
-		    (+ x (* 0.15 size)) (+ y (* 0.2 size))
-		    (* 0.7 size) (* 0.7 size))
-	      
-	      (set-brush pumpkin-color)
-	      (send dc draw-ellipse
-		    (+ x (* 0.15 size)) (sub1 (+ y (* 0.2 size)))
-		    (* 0.7 size) (* 0.5 size))
-	      (send dc draw-rectangle
-		    (+ x (* 0.35 size)) (+ y (* 0.55 size))
-		    (* 0.1 size) (* 0.2 size))
-	      
-	      ;; Eyes ----------------------------------------
-	      (send dc set-clipping-region c)
-	      (set-brush face-color)
-
-	      (send dc draw-ellipse
-		    (+ x (* 0.25 size)) (+ y (* 0.3 size))
-		    (* 0.175 size) (* 0.25 size))
-	      (send dc draw-ellipse
-		    (+ x (* (- 0.75 0.175) size)) (+ y (* 0.3 size))
-		    (* 0.175 size) (* 0.25 size))
-
-	      (set-brush pumpkin-color)
-
-	      (send dc draw-polygon
-		    (list
-		     (make-object point%
-				  (* 0.5 size)
-				  (* 0.45 size))
-		     (make-object point%
-				  (* 0.2 size)
-				  (* 0.25 size))
-		     (make-object point%
-				  (* 0.8 size)
-				  (* 0.25 size)))
-		    x y)
-	      
-	      (send dc set-brush b)
-	      (send dc set-pen p)))
-	  size (* 1.1 size))))
-
-  (define standard-fish 
-    (lambda (w h [direction 'left] [c "blue"] [ec #f] [mouth-open #f])
-      (define no-pen (send the-pen-list find-or-create-pen "black" 1 'transparent))
-      (define color (if (string? c) (make-object color% c) c))
-      (define dark-color (scale-color 0.8 color))
-      (define eye-color (and ec (if (string? ec) (make-object color% ec) ec)))
-      (define dark-eye-color color)
-      (define mouth-open? (and mouth-open
-                               (or (not (number? mouth-open))
-                                   (not (zero? mouth-open)))))
-      (define mouth-open-amt (if (number? mouth-open)
-                                 mouth-open
-                                 (if mouth-open 1.0 0.0)))
-      (dc (lambda (dc x y)
-            (let ([rgn (make-object region% dc)]
-                  [old-rgn (send dc get-clipping-region)]
-                  [old-pen (send dc get-pen)]
-                  [old-brush (send dc get-brush)]
-                  [flip-rel (lambda (x0) 
-                              (if (eq? direction 'left)
-                                  x0
-                                  (- w x0)))]
-                  [flip (lambda (x0 w0) 
-                          (if (eq? direction 'left)
-                              x0
-                              (+ x (- w (- x0 x) w0))))]
-		  [set-rgn (lambda (rgn flip? old-rgn)
-                             (let ([dy (if flip? (/ h 2) 0)]
-                                   [wf (λ (x) (* (if (eq? 'left direction) x (+ 1 (* x -1))) w))])
-			       (if mouth-open?
-				   (send rgn set-polygon
-					 (list (make-object point% (wf 0) dy)
-					       (make-object point% (wf 1) dy)
-					       (make-object point% (wf 1) (- (* 1/2 h) dy))
-					       (make-object point% (wf 1/6) (- (* 1/2 h) dy))
-                                               (make-object point% (wf 0) (if flip?
-                                                                              (* 1/6 mouth-open-amt h)
-                                                                              (+ (* 1/3 h)
-                                                                                 (* 1/6 (- 1 mouth-open-amt) h)))))
-					 x (+ y dy))
-				   (send rgn set-rectangle 
-					 x (+ y dy)
-					 w (/ h 2))))
-                             (when old-rgn
-                               (send rgn intersect old-rgn)))])
-              (send dc set-pen no-pen)
-              (color-series
-               dc 4 1
-               dark-color color
-               (lambda (ii)
-		 (define i (* ii (min 1 (* w 1/100))))
-                 (send dc draw-polygon (list (make-object point% (flip-rel (+ (* 1/2 w) i)) (* 1/10 h))
-                                             (make-object point% (flip-rel (- (* 3/4 w) i)) (+ 0 i))
-                                             (make-object point% (flip-rel (- (* 3/4 w) i)) (- (* 2/10 h) i)))
-                       x y)
-                 (send dc draw-polygon (list (make-object point% (flip-rel (+ (* 1/2 w) i)) (* 9/10 h))
-                                             (make-object point% (flip-rel (- (* 3/4 w) i)) (- h i))
-                                             (make-object point% (flip-rel (- (* 3/4 w) i)) (+ (* 8/10 h) i)))
-                       x y)
-                 (send dc draw-polygon (list (make-object point% (flip-rel (+ (* 3/4 w) i)) (/ h 2))
-                                             (make-object point% (flip-rel (- w i)) (+ (* 1/10 h) i))
-                                             (make-object point% (flip-rel (- w i)) (- (* 9/10 h) i)))
-                       x y))
-               #f #t)
-
-	      (set-rgn rgn #f old-rgn)
-	      (send dc set-clipping-region rgn)
-              (color-series
-               dc 4 1
-               dark-color color
-               (lambda (i)
-                 (send dc draw-ellipse (+ (- x (* 1/4 w)) i) (+ y i)
-                       (- (* 6/4 w) (* 2 i)) (- (* 4 h) (* 2 i))))
-               #f #t)
-              (send dc set-clipping-region old-rgn)
-
-              (set-rgn rgn #t old-rgn)
-              (send dc set-clipping-region rgn)
-              (color-series
-               dc 4 1
-               dark-color color
-               (lambda (i)
-                 (send dc draw-ellipse (+ (- x (* 1/4 w)) i) (+ (- y (* 3 h)) i)
-                       (- (* 6/4 w) (* 2 i)) (- (* 4 h) (* 2 i))))
-               #f #t)
-              (send dc set-clipping-region old-rgn)
-
-              (when mouth-open?
-                ;; Repaint border, just in case round-off does weird things
-                (send dc set-pen color 1 'solid)
-                (let ([y (+ y (/ h 2))])
-                  (send dc draw-line 
-                        (+ x (if (eq? direction 'left) (* 1/6 w) 6)) y
-                        (+ x (if (eq? direction 'left) w (* 5/6 w)) -6) y))
-                (send dc set-pen no-pen))
-
-              (color-series
-               dc 4 1
-               dark-color color
-               (lambda (ii)
-		 (define i (* ii (min 1 (* w 1/100))))
-		 (send dc draw-polygon (list (make-object point% (flip-rel (+ (* 1/2 w) i)) (/ h 2))
-					     (make-object point% (flip-rel (- (* 5/8 w) i)) (+ (* 1/4 h) i))
-					     (make-object point% (flip-rel (- (* 5/8 w) i)) (- (* 3/4 h) i)))
-		       x y))
-               #f #t)
-              (when eye-color
-		(if (eq? eye-color 'x)
-		    (begin
-		      (send dc set-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-		      (let* ([ew (* 1/10 w)]
-			     [eh (* 1/10 h)]
-			     [x0 (flip (+ x (* 1/5 w)) ew)]
-			     [x1 (flip (+ x (* 1/5 w) ew) ew)]
-			     [y0 (+ y (* 2/3 h))]
-			     [y1 (- (+ y (* 2/3 h)) eh)])
-			(send dc draw-line x0 y0 x1 y1)
-			(send dc draw-line x0 y1 x1 y0))
-		      )
-		    (color-series
-		     dc
-		     1/20 1/80
-		     dark-eye-color eye-color
-		     (lambda (s)
-		       (let ([ew (* (- 1/10 s) w)])
-			 (send dc draw-ellipse 
-			       (flip (+ x (* 1/5 w) (* s 1/2 w)) ew)
-			       (+ y (* 1/3 h) (* (* s 4/2) 1/2 h))
-			       ew
-			       (* (- 1/10 s) 4/2 h))))
-		     #f #t)))
-              (send dc set-pen old-pen)
-              (send dc set-brush old-brush)))
-          w h)))
-
-  (define (-add-line base src find-src dest find-dest thickness color arrow-size arrow2-size under? solid-head?
-                     #:style [style #f]
-                     #:hide-arrowhead? [hide-arrowhead? #f])
-    (let-values ([(sx sy) (find-src base src)]
-                 [(dx dy) (find-dest base dest)])
-      (let ([arrows
-             (let ([p (cons-picture
-                       (ghost (launder base))
-                       `(,(let* ([angle (atan (- sy dy) 
-                                              (- sx dx))]
-                                 [cosa (cos angle)]
-                                 [sina (sin angle)]
-                                 ;; If there's an arrow, line goes only half-way in
-                                 [ddx (* (or arrow-size 0) 0.5 cosa)]
-                                 [ddy (* (or arrow-size 0) 0.5 sina)]
-                                 [dsx (* (or arrow2-size 0) 0.5 (- cosa))]
-                                 [dsy (* (or arrow2-size 0) 0.5 (- sina))])
-                            `(connect ,(+ sx dsx) ,(+ sy dsy) ,(+ dx ddx) ,(+ dy ddy)))
-                         ,@(if (and arrow-size
-                                    (not hide-arrowhead?))
-                               (let-values ([(arrow xo yo)
-                                             (arrowhead/delta
-                                              (or thickness 0)
-                                              arrow-size 
-                                              (atan (- dy sy) 
-                                                    (- dx sx))
-                                              solid-head?)])
-                                 `((place ,(+ dx xo) ,(+ dy yo) ,arrow)))
-                               null)
-                         ,@(if (and arrow2-size
-                                    (not hide-arrowhead?))
-                               (let-values ([(arrow xo yo)
-                                             (arrowhead/delta
-                                              (or thickness 0)
-                                              arrow-size 
-                                              (atan (- sy dy) 
-                                                    (- sx dx))
-                                              solid-head?)])
-                                 `((place ,(+ sx xo) ,(+ sy yo) ,arrow)))
-                               null)))])
-               (let* ([p2 (if thickness
-                              (linewidth thickness p)
-                              p)]
-                      [p2 (if style
-                              (linestyle style p2)
-                              p2)])
-                 (if color
-                     (colorize p2 color)
-                     p2)))])
-        (refocus
-         (if under?
-             (cc-superimpose arrows base)
-             (cc-superimpose base arrows))
-         base))))
-
-  (define add-line
-    (lambda (base src find-src dest find-dest [thickness #f] [color #f] [under? #f])
-      (-add-line base src find-src dest find-dest thickness color #f #f under? #t)))
-  
-  (define add-arrow-line
-    (lambda (arrow-size base src find-src dest find-dest [thickness #f] [color #f] [under? #f]
-                        #:hide-arrowhead? [hide-arrowhead? #f])
-      (-add-line base src find-src dest find-dest thickness color arrow-size #f under? #t
-                 #:hide-arrowhead? hide-arrowhead?)))
-  
-  (define add-arrows-line
-    (lambda (arrow-size base src find-src dest find-dest [thickness #f] [color #f] [under? #f]
-                        #:hide-arrowhead? [hide-arrowhead? #f])
-      (-add-line base src find-src dest find-dest thickness color arrow-size arrow-size under? #t
-                 #:hide-arrowhead? hide-arrowhead?)))
-
-  (define (flip-find-y find-)
-    (lambda (base path)
-      (let-values ([(x y) (find- base path)])
-	(values x (- (pict-height base) y)))))
-
-  (define pin-line
-    (lambda (base src find-src dest find-dest [thickness #f] [color #f] [under? #f] #:style [style #f])
-      (-add-line base src (flip-find-y find-src) dest (flip-find-y find-dest)
-                 thickness color #f #f under? #t
-                 #:style style)))
-
-  (define pin-arrow-line
-    (lambda (arrow-size base src find-src dest find-dest [thickness #f] [color #f] [under? #f] [solid-head? #t]
-                        #:hide-arrowhead? [hide-arrowhead? #f]
-                        #:style [style #f])
-      (-add-line base src (flip-find-y find-src) dest (flip-find-y find-dest)
-		 thickness color arrow-size #f under? solid-head?
-                 #:style style
-                 #:hide-arrowhead? hide-arrowhead?)))
-  
-  (define pin-arrows-line
-    (lambda (arrow-size base src find-src dest find-dest [thickness #f] [color #f] [under? #f] [solid-head? #t]
-                        #:hide-arrowhead? [hide-arrowhead? #f]
-                        #:style [style #f])
-      (-add-line base src (flip-find-y find-src) dest (flip-find-y find-dest)
-                 thickness color arrow-size arrow-size under? solid-head?
-                 #:style style
-                 #:hide-arrowhead? hide-arrowhead?)))
-  
-  (define black-color (make-object color% 0 0 0))
-
-  (define bitmap-draft-mode (make-parameter #f (lambda (x) (and x #t))))
-
-(define (bitmap arg)
-  (define bm
-    (cond
-      [(bitmap-draft-mode) #f]
-      [(arg . is-a? . bitmap%) arg]
-      [(path-string? arg) (make-object bitmap% arg 'unknown/alpha)]
-      [(convertible? arg)
-       (define bytes (convert arg 'png-bytes #f))
-       (and bytes (read-bitmap (open-input-bytes bytes)))]))
-  (cond
-    [(and bm (send bm ok?))
-     (define w (send bm get-width))
-     (define h (send bm get-height))
-     (dc
-      (λ (dc x y)
-        (send dc draw-bitmap bm x y 'solid black-color (send bm get-loaded-mask)))
-      w h)]
-    [else
-     (frame (inset (colorize (text "bitmap failed") "red") 2))]))
-  
-  (define find-brush
-    (lambda (color [style 'solid])
-      (send the-brush-list find-or-create-brush color style)))
-  (define find-pen
-    (lambda (color [size 1] [style 'solid])
-      (send the-pen-list find-or-create-pen color size style)))  
-
-  (define (color-series dc steps dstep start-c end-c f pen? brush?)
-    (let ([start-c (if (string? start-c)
-		       (make-object color% start-c)
-		       start-c)]
-	  [end-c (if (string? end-c)
-		       (make-object color% end-c)
-		       end-c)])
-      (let ([sr (send start-c red)]
-	    [sg (send start-c green)]
-	    [sb (send start-c blue)]
-	    [er (send end-c red)]
-	    [eg (send end-c green)]
-	    [eb (send end-c blue)]
-	    [c (make-object color%)]
-	    [s (lambda (start end i)
-                 (if (= steps 0)
-                     end
-                     (floor (+ start (* (- end start) (/ i steps))))))])
-	(let loop ([i 0])
-	  (send c set (s sr er i) (s sg eg i) (s sb eb i))
-	  (when brush?
-	    (send dc set-brush (find-brush c)))
-	  (when pen?
-	    (send dc set-pen (find-pen c)))
-	  (f i)
-	  (unless (= i steps)
-	    (loop (+ dstep i)))))))
-  
-  (define (scale-color s c)
-    (let ([c (if (string? c)
-                 (make-object color% c)
-                 c)])
-      (let ([s (lambda (v)
-                 (if (> s 1)
-                     (- 255 (inexact->exact (floor (/ (- 255 v) s))))
-                     (min 255 (inexact->exact (floor (* v s))))))])
-        (make-object color%
-          (s (send c red))
-          (s (send c green))
-          (s (send c blue))))))
-  
-  (define scale-to-fit
-    (case-lambda
-      [(main-pict size-pict)
-       (scale-to-fit main-pict (pict-width size-pict) (pict-height size-pict))]
-      [(main-pict w h)
-       (scale main-pict (min (/ w (pict-width main-pict))
-                             (/ h (pict-height main-pict))))]))
-  
-(define scale
-  (case-lambda
-    [(p x-factor y-factor)
-     (define drawer (make-pict-drawer p))
-     (define new
-       (dc
-        (λ (dc x y)
-          (define t (send dc get-transformation))
-          (send dc scale x-factor y-factor)
-          (drawer dc
-                  (/ x x-factor)
-                  (/ y y-factor))
-          (send dc set-transformation t))
-        (* (pict-width p) x-factor)
-        (* (pict-height p) y-factor)
-        (* (pict-ascent p) y-factor)
-        (* (pict-descent p) y-factor)))
-     (make-pict (pict-draw new)
-                (pict-width new)
-                (pict-height new)
-                (pict-ascent new)
-                (pict-descent new)
-                (list (make-child p 0 0 x-factor y-factor 0 0))
-                #f
-                (pict-last p))]
-    [(p factor) (scale p factor factor)]))
-
-  (define (rotate p theta)
-    (let ([w (pict-width p)]
-          [h (pict-height p)]
-          [drawer (make-pict-drawer p)])
-      (let ([dl (min 0 (* w (cos theta)) (* h (sin theta)) (+ (* w (cos theta)) (* h (sin theta))))]
-            [dr (max 0 (* w (cos theta)) (* h (sin theta)) (+ (* w (cos theta)) (* h (sin theta))))]
-            [dt (min 0 (* w -1 (sin theta)) (* h (cos theta)) (+ (* w -1 (sin theta)) (* h (cos theta))))]
-            [db (max 0 (* w -1 (sin theta)) (* h (cos theta)) (+ (* w -1 (sin theta)) (* h (cos theta))))]
-            [da (- (* (pict-ascent p) (cos theta)) (* (sin theta) w 1/2))]
-            [dd (- (* (- (pict-height p) (pict-descent p)) (cos theta)) (* (sin theta) w 1/2))])
-        (let ([new (dc
-                    (lambda (dc x y)
-                      (let ([t (send dc get-transformation)])
-                        (send dc translate (- x dl) (- y dt))
-                        (send dc rotate theta)
-                        (drawer dc 0 0)
-                        (send dc set-transformation t)))
-                    (- dr dl) (- db dt) 
-                    (min (- da dt) (- (- db dt) (- db dd)))
-                    (min (- db da) (- db dd)))])
-          (make-pict (pict-draw new)
-		     (pict-width new)
-		     (pict-height new)
-		     (pict-ascent new)
-		     (pict-descent new)
-		     (list (make-child p 
-                                       (- (* h (sin theta)) dl) 
-                                       (max 0 (- db (* h (cos theta))))
-                                       (cos theta) (cos theta) 
-                                       (sin theta) (- (sin theta))))
-		     #f
-                     (pict-last p))))))
-
-  (define cellophane
-    (case-lambda
-     [(p alpha-factor)
-      (cond
-       [(= 1.0 alpha-factor)
-        (inset p 0)]
-       [(zero? alpha-factor)
-        (ghost p)]
-       [else
-        (let ([drawer (make-pict-drawer p)])
-          (let ([new
-                 (dc
-                  (lambda (dc x y)
-                    (let ([a (send dc get-alpha)])
-                      (send dc set-alpha (* a alpha-factor))
-                      (drawer dc x y)
-                      (send dc set-alpha a)))
-                  (pict-width p)
-                  (pict-height p)
-                  (pict-ascent p)
-                  (pict-descent p))])
-            (make-pict (pict-draw new)
-                       (pict-width new)
-                       (pict-height new)
-                       (pict-ascent new)
-                       (pict-descent new)
-                       (list (make-child p 0 0 1 1 0 0))
-                       #f
-                       (pict-last p))))])]))
-
-  (define inset/clip
-    (case-lambda
-     [(p l t r b)
-      (let* ([p (inset p l t r b)]
-	     [drawer (make-pict-drawer p)]
-	     [w (pict-width p)]
-	     [h (pict-height p)])
-	(let ([new
-	       (dc
-		(lambda (dc x y)
-		  (let ([rgn (make-object region% dc)])
-		    (send rgn set-rectangle x y w h)
-		    (let ([r (send dc get-clipping-region)])
-		      (when r
-			(send rgn intersect r))
-		      (send dc set-clipping-region rgn)
-		      (drawer dc x y)
-		      (send dc set-clipping-region r))))
-		w h (pict-ascent p) (pict-descent p))])
-	  (make-pict (pict-draw new)
-		     (pict-width new)
-		     (pict-height new)
-		     (pict-ascent new)
-		     (pict-descent new)
-		     (list (make-child p 0 0 1 1 0 0))
-		     #f
-                     (pict-last p))))]
-     [(p h v) (inset/clip p h v h v)]
-     [(p a) (inset/clip p a a a a)]))
-  
-  (define (clip p) (inset/clip p 0))
-  
-  (define-syntax scale/improve-new-text
-    (syntax-rules ()
-      [(_ expr s)
-       (scale/improve-new-text expr s s)]
-      [(_ expr sx sy)
-       (let ([xs sx]
-	     [ys sy])
-	 (parameterize ([current-expected-text-scale
-			 (let ([s (current-expected-text-scale)])
-			   (list (* xs (car s)) (* ys (cadr s))))])
-	   (scale expr xs ys)))]))
-
-  (define (hyperlinkize r)
-    (colorize (inset
-	       (place-over r
-			   0 (pict-height r)
-			   (linewidth 2 (hline (pict-width r) 1)))
-	       0 0 0 2)
-	      "blue"))
-  
-  
-  (provide/contract [explode-star
-                     (-> number? number?  number? number? (or/c (is-a?/c color%) string?) pict?)])
-  ;; abstract-explosion number number number number color -> pict
-  (define (explode-star small-rad large-rad points line-size line-color)
-    (define (find-xy radius theta)
-      (values (* radius (cos theta))
-              (* radius (sin theta))))
-    (let ([roff (floor (/ large-rad 2))]
-          [fx #f]
-          [fy #f])
-      (dc
-       (lambda (dc dx dy)
-         (let ([old-pen (send dc get-pen)])
-           (send dc set-pen (send the-pen-list find-or-create-pen line-color line-size 'solid))
-           (let loop ([i points]
-                      [lx #f]
-                      [ly #f])
-             (cond
-               [(zero? i) (when (and lx ly)
-                            (send dc draw-line
-                                  (+ dx large-rad lx)
-                                  (+ dy large-rad ly)
-                                  (+ dx large-rad fx)
-                                  (+ dy large-rad fy)))]
-               [else (let* ([this-p (- i 1)]
-                            [theta1 (* 2 pi (/ this-p points))]
-                            [theta2 (* 2 pi (/ (- this-p 1/2) points))])
-                       (let-values ([(x1 y1) (find-xy small-rad theta1)]
-                                    [(x2 y2) (find-xy large-rad theta2)])
-                         (unless (and fx fy)
-                           (set! fx x1)
-                           (set! fy y1))
-                         (when (and lx ly)
-                           (send dc draw-line
-                                 (+ dx large-rad lx)
-                                 (+ dy large-rad ly)
-                                 (+ dx large-rad x1)
-                                 (+ dy large-rad y1)))
-                         (send dc draw-line
-                               (+ dx large-rad x1)
-                               (+ dy large-rad y1)
-                               (+ dx large-rad x2)
-                               (+ dy large-rad y2))
-                         (loop (- i 1)
-                               x2
-                               y2)))]))
-           (send dc set-pen old-pen)))
-       (* large-rad 2)
-       (* large-rad 2)
-       0
-       0)))
diff --git a/pkgs/pict-pkgs/pict-lib/pict/tree-layout.rkt b/pkgs/pict-pkgs/pict-lib/pict/tree-layout.rkt
deleted file mode 100644
index e431cbd3b6..0000000000
--- a/pkgs/pict-pkgs/pict-lib/pict/tree-layout.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/class
-         racket/draw
-         "main.rkt"
-         "private/tidier.rkt"
-         "private/layout.rkt"
-         "private/hv.rkt"
-         "private/naive-layered.rkt")
-
-(provide
- (contract-out
-  [rename _tree-layout
-          tree-layout
-          (->* () 
-               (#:pict pict?) 
-               #:rest (listof (or/c tree-edge? tree-layout? #f))
-               tree-layout?)]
-  [rename _tree-edge
-          tree-edge
-          (->* (tree-layout?) 
-               (#:edge-color (or/c string? 
-                                   (is-a?/c color%)
-                                   (list/c byte? byte? byte?))
-                #:edge-width (or/c 'unspecified real? #f))
-               tree-edge?)]
-          
-
-  [tree-edge? (-> any/c boolean?)]
-  [rename _tree-layout? tree-layout? (-> any/c boolean?)]
-  [binary-tree-layout? (-> any/c boolean?)]
-  [binary-tidier (->* (binary-tree-layout?)
-                      (#:x-spacing 
-                       (or/c (and/c real? positive?) #f)
-                       #:y-spacing (or/c (and/c real? positive?) #f))
-                      pict?)]
-  [hv-alternating (->* (binary-tree-layout?)
-                       (#:x-spacing 
-                        (or/c (and/c real? positive?) #f)
-                        #:y-spacing (or/c (and/c real? positive?) #f))
-                       pict?)]
-  [naive-layered (->* (tree-layout?)
-                      (#:x-spacing 
-                       (or/c (and/c real? positive?) #f)
-                       #:y-spacing (or/c (and/c real? positive?) #f))
-                      pict?)]))
-
diff --git a/pkgs/pict-pkgs/pict-lib/texpict/balloon.rkt b/pkgs/pict-pkgs/pict-lib/texpict/balloon.rkt
deleted file mode 100644
index c5a0e9bde3..0000000000
--- a/pkgs/pict-pkgs/pict-lib/texpict/balloon.rkt
+++ /dev/null
@@ -1,186 +0,0 @@
-(module balloon racket/base
-  (require pict/private/pict
-           pict/private/utils
-           racket/draw
-           mzlib/class
-           mzlib/math)
-
-  (provide wrap-balloon pip-wrap-balloon
-           place-balloon
-           pin-balloon
-           (rename-out [mk-balloon balloon])
-           make-balloon
-           balloon?
-           balloon-pict
-           balloon-point-x
-           balloon-point-y
-           balloon-color
-           balloon-enable-3d)
-
-  (define-struct balloon (pict point-x point-y))
-    
-  (define no-pen (find-pen "white" 1 'transparent))
-  (define no-brush (find-brush "white" 'transparent))
-  (define black-pen (find-pen "black"))
-
-  (define balloon-enable-3d (make-parameter #t (lambda (x) (and x #t))))
-
-  (define (series dc steps start-c end-c f pen? brush?)
-    (if (balloon-enable-3d)
-        (color-series dc steps #e0.5 start-c end-c f pen? brush?)
-        (color-series dc 0 0 start-c end-c f pen? brush?)))
-    
-  (define (mk-balloon w h corner-radius spike-pos dx dy
-                      [color balloon-color])
-    (let ([dw (if (< corner-radius 1)
-                  (* corner-radius w)
-                  corner-radius)]
-          [dh (if (< corner-radius 1)
-                  (* corner-radius h)
-                  corner-radius)]
-          [dxbig (lambda (v) (if (> (abs dx) (abs dy))
-                                 v
-                                 0))]
-          [dybig (lambda (v) (if (<= (abs dx) (abs dy))
-                                 v
-                                 0))])
-      (let-values ([(bx0 by0 bx1 by1 x0 y0 x1 y1 xc yc mx0 mx1 my0 my1 mfx mfy)
-                    (case spike-pos
-                      [(w) (values -1 -0.5 -1 0.5
-                                   1 (/ (- h dh) 2)
-                                   1 (/ (+ h dh) 2)
-                                   1 (/ h 2)
-                                   0.5 1 0.5 -1
-                                   1 0)]
-                      [(nw) (values 0 0 0 0
-                                    0 dh
-                                    dw 0
-                                    0 0
-                                    1 -0.5 -1 0.5
-                                    (dxbig 1) (dybig 1))]
-                      [(e) (values 1 -0.5 1 0.5
-                                   (sub1 w) (/ (- h dh) 2)
-                                   (sub1 w) (/ (+ h dh) 2)
-                                   (sub1 w) (/ h 2)
-                                   -1 -1 1 -1
-                                   -1 0)]
-                      [(ne) (values 0 0 0 0 
-                                    (- w dw) 0
-                                    w dh
-                                    w 0
-                                    0.5 -1 0.5 -1
-                                    (dxbig -1) (dybig 1))]
-                      [(s) (values -0.5 1 0.5 1
-                                   (/ (- w dw) 2) (sub1 h)
-                                   (/ (+ w dw) 2) (sub1 h)
-                                   (/ w 2) (sub1 h)
-                                   1 -1 -1 -1
-                                   0 -1)]
-                      [(n) (values -0.5 -1 0.5 -1
-                                   (/ (- w dw) 2) 1
-                                   (/ (+ w dw) 2) 1
-                                   (/ w 2) 1
-                                   1 -1 1 1
-                                   0 1)]
-                      [(sw) (values 0 0 0 0
-                                    0 (- (sub1 h) dh)
-                                    dw (sub1 h)
-                                    0 (sub1 h)
-                                    0.5 -1 0.5 -1
-                                    (dxbig 1) (dybig -1))]
-                      [(se) (values 0 1 0 1
-                                    (- w dw) (sub1 h)
-                                    w (- (sub1 h) dh)
-                                    w (sub1 h)
-                                    0.5 -1 -1 0.5
-                                    (dxbig -1) (dybig -1))])])
-        (let ([xf (+ xc dx)]
-              [yf (+ yc dy)]
-              [dark-color (scale-color #e0.6 color)])
-          (make-balloon
-           (dc (lambda (dc x y)
-                 (let ([b (send dc get-brush)]
-                       [p (send dc get-pen)]
-                       [draw-once
-                        (lambda (i rr?)
-                          (when rr?
-			    (send dc draw-rounded-rectangle 
-                                  (+ x (/ i 2)) (+ y (/ i 2))
-                                  (- w i) (- h i)
-                                  (if (and (< (* 2 corner-radius) (- w i))
-					   (< (* 2 corner-radius) (- h i)))
-				      corner-radius
-				      (/ (min (- w i) (- h i)) 2)))
-                            (let ([p (send dc get-pen)])
-                              (send dc set-pen no-pen)
-                              (send dc draw-polygon (list (make-object point% (+ x0 (* i mx0)) (+ y0 (* i my0)))
-                                                          (make-object point% (+ xf (* i mfx)) (+ yf (* i mfy)))
-                                                          (make-object point% (+ x1 (* i mx1)) (+ y1 (* i my1))))
-                                    x y)
-                              (send dc set-pen p)))
-                          (send dc draw-line (+ x x0 bx0 (* i mx0)) (+ y y0 by0 (* i my0)) 
-                                (+ x xf (* i mfx)) (+ y yf (* i mfy)))
-                          (send dc draw-line (+ x x1 bx1 (* i mx1)) (+ y y1 by1 (* i my1))
-                                (+ x xf (* i mfx)) (+ y yf (* i mfy))))])
-                   (series dc 5
-                           dark-color
-                           (if (string? color) (make-object color% color) color)
-                           (lambda (i) (draw-once i #t))
-                           #t #t)
-                   (when (balloon-enable-3d)
-                     (send dc set-brush no-brush)
-                     (send dc set-pen (find-pen dark-color 0.5))
-                     (draw-once 0 #f))
-                   
-                   (send dc set-pen p)
-                   (send dc set-brush b)))
-               w h 0 0)
-           xf yf)))))
-
-  (define balloon-color (make-object color% 255 255 170))
-  
-  (define corner-size 32)
-
-  (define wrap-balloon
-    (lambda (p corner dx dy [color balloon-color] [c-rad corner-size] 
-               #:factor [factor 1])
-      (let ([b (mk-balloon (+ (pict-width p) (* 2 c-rad))
-			   (+ (pict-height p) c-rad)
-			   c-rad
-			   corner dx dy
-			   color)])
-	(make-balloon
-         (scale (cc-superimpose
-                 (balloon-pict b)
-                 p)
-                factor)
-	 (* factor (balloon-point-x b))
-	 (* factor (balloon-point-y b))))))
-
-  (define pip-wrap-balloon
-    (lambda (p corner dx dy [color balloon-color] [c-rad corner-size]
-               #:factor [factor 1])
-      (pin-balloon (wrap-balloon p corner dx dy color c-rad #:factor factor) (blank 0) 0 0)))
-  
-  (define (do-place-balloon flip-proc? balloon p to find-to)
-    (let-values ([(x y) (if (and (number? to) 
-				 (number? find-to)) 
-			    (values to (- (pict-height p)
-					  find-to))
-			    (if flip-proc?
-				(let-values ([(x y) (find-to p to)])
-				  (values x (- (pict-height p) y)))
-				(find-to p to)))])
-      (cons-picture
-       p
-       `((place ,(- x (balloon-point-x balloon))
-                ,(- y  ; up-side down!
-                    (- (pict-height (balloon-pict balloon))
-                       (balloon-point-y balloon)))
-                ,(balloon-pict balloon))))))
-
-  (define (place-balloon balloon p to find-to)
-    (do-place-balloon #f balloon p to find-to))
-
-  (define (pin-balloon balloon p to find-to)
-    (do-place-balloon #t balloon p to find-to)))
diff --git a/pkgs/pict-pkgs/pict-lib/texpict/code.rkt b/pkgs/pict-pkgs/pict-lib/texpict/code.rkt
deleted file mode 100644
index 6ec9f5da9a..0000000000
--- a/pkgs/pict-pkgs/pict-lib/texpict/code.rkt
+++ /dev/null
@@ -1,706 +0,0 @@
-(module code racket/base
-  (require pict/private/pict
-           (prefix-in r: racket/base)
-           mzlib/class
-           mzlib/list
-           (only-in scheme/list last)
-           racket/draw
-           mzlib/unit
-           (for-syntax racket/base)
-           (only-in mzscheme make-namespace))
-
-  (provide define-code code^ code-params^ code@
-           (for-syntax prop:code-transformer
-                       code-transformer?
-                       make-code-transformer))
-
-  (define (to-code-pict p extension)
-    (use-last* p extension))
-
-  (define (code-pict? p)
-    (and (pict-last p) #t))
-
-  (define (code-pict-bottom-line p)
-    (single-pict (pict-last p)))
-
-  (define (single-pict p)
-    (if (list? p)
-        (last p)
-        p))
-
-  (define (make-code-append htl-append)
-    (case-lambda
-     [(a b) (let ([a-last (pict-last a)])
-              (if a-last
-                  (let* ([a-dup (launder (ghost (single-pict a-last)))]
-                         [extension (htl-append a-dup b)])
-                    (let ([p (let-values ([(x y) (lt-find a a-last)]
-                                          [(dx dy) (lt-find extension a-dup)])
-                               (let ([ex (- x dx)]
-                                     [ey (- y dy)])
-                                 (if (negative? ey)
-                                     (lt-superimpose
-                                      (inset a 0 (- ey) 0 0)
-                                      (inset extension ex 0 0 0))
-                                     (lt-superimpose
-                                      a
-                                      (inset extension ex ey 0 0)))))])
-                      (use-last* p b)))
-                  (htl-append a b)))]
-     [(a) a]
-     [(a . rest)
-      ((make-code-append htl-append)
-       a
-       (apply (make-code-append htl-append) rest))]))
-
-  (define code-htl-append (make-code-append htl-append))
-  (define code-hbl-append (make-code-append hbl-append))
-
-  (define code-vl-append
-    (case-lambda
-     [(sep a b) (to-code-pict (vl-append sep a b) b)]
-     [(sep a) a]
-     [(sep a . rest)
-      (code-vl-append sep a (apply code-vl-append sep rest))]))
-
-  (begin-for-syntax
-   (define-values (prop:code-transformer code-transformer? code-transformer-ref)
-     (make-struct-type-property 'code-transformer
-                                (lambda (proc info)
-                                  (unless (and (procedure? proc)
-                                               (procedure-arity-includes? proc 2))
-                                    (raise-argument-error 'guard-for-code-transformer
-                                                          "(procedure-arity-includes/c 2)"
-                                                          proc))
-                                  proc)))
-
-   (define make-code-transformer
-     (let ()
-       (define-struct code-transformer (proc)
-         #:property prop:code-transformer (lambda (r stx)
-                                            (let ([proc (code-transformer-proc r)])
-                                              (if (syntax? proc)
-                                                  (if (identifier? stx)
-                                                      proc
-                                                      #f) ; => render normally
-                                                  (proc stx)))))
-       (lambda (proc)
-         (unless (or (syntax? proc)
-                     (and (procedure? proc)
-                          (procedure-arity-includes? proc 1)))
-           (raise-argument-error 'make-code-transformer
-                                 "(or/c syntax? (procedure-arity-includes/c 1))"
-                                 proc))
-         (make-code-transformer proc))))
-   
-   (define (transform id stx uncode-stx recur default)
-     (define r (syntax-local-value id (lambda () #f)))
-     (define t ((code-transformer-ref r) r stx))
-     (if t
-         (recur (datum->syntax stx
-                               (list uncode-stx t)
-                               stx
-                               stx))
-         (default stx))))
-
-  (define-syntax (define-code stx)
-    (syntax-case stx ()
-      [(_ code typeset-code uncode)
-       (syntax/loc stx
-	 (define-syntax (code stx)
-	   (define (stx->loc-s-expr v)
-	     (cond
-	      [(syntax? v)
-               (define (default v)
-                 (let ([mk `(datum->syntax
-                             #f
-                             ,(syntax-case v (uncode)
-                                [(uncode e) #'e]
-                                 [_ (stx->loc-s-expr (syntax-e v))])
-                              (list 'code
-                                    ,(syntax-line v)
-                                    ,(syntax-column v)
-                                    ,(syntax-position v)
-                                    ,(syntax-span v)))])
-                   (let ([prop (syntax-property v 'paren-shape)])
-                     (if prop
-                         `(syntax-property ,mk 'paren-shape ,prop)
-                         mk))))
-               (syntax-case v ()
-                 [(id e (... ...))
-                  (and (identifier? #'id)
-                       (code-transformer? (syntax-local-value #'id (lambda () #f))))
-                  (transform #'id v (quote-syntax uncode) stx->loc-s-expr default)]
-                 [id
-                  (and (identifier? #'id)
-                       (code-transformer? (syntax-local-value #'id (lambda () #f))))
-                  (transform #'id v (quote-syntax uncode) stx->loc-s-expr default)]
-                 [_ (default v)])]
-              [(pair? v) `(cons ,(stx->loc-s-expr (car v))
-				,(stx->loc-s-expr (cdr v)))]
-	      [(vector? v) `(vector ,@(map
-				       stx->loc-s-expr
-				       (vector->list v)))]
-	      [(box? v) `(box ,(stx->loc-s-expr (unbox v)))]
-	      [(null? v) 'null]
-	      [else `(quote ,v)]))
-	   (define (cvt s)
-	     (datum->syntax #'here (stx->loc-s-expr s)))
-	   (syntax-case stx ()
-	     [(_ expr) #`(typeset-code #,(cvt #'expr))]
-	     [(_ expr (... ...))
-	      #`(typeset-code #,(cvt #'(code:line expr (... ...))))])))]
-      [(_ code typeset-code) #'(define-code code typeset-code unsyntax)]))
-  
-  (define-signature code^
-    (typeset-code code-pict-bottom-line-pict pict->code-pict
-     comment-color keyword-color id-color const-color literal-color
-     code-align current-code-tt current-code-font
-     current-keyword-list current-const-list current-literal-list 
-     code-colorize-enabled code-colorize-quote-enabled 
-     code-italic-underscore-enabled code-scripts-enabled
-     current-comment-color current-keyword-color 
-     current-base-color current-id-color current-literal-color current-const-color
-     current-reader-forms
-     mzscheme-const-list
-     racket/base-const-list))
-
-  (define-signature code-params^
-    (current-font-size 
-     current-code-line-sep))
-
-  (define-syntax (define-computed stx)
-    (syntax-case stx ()
-      [(_ id v)
-       #'(begin
-	   (define (get-val) v)
-	   (define-syntax id
-	     (syntax-id-rules (set!)
-	       [(x (... ...)) ,illegal-use-of-once]
-	       [x (get-val)])))]))
-
-  ;; Find which line `stx' ends on, #f for unknown
-  (define (syntax-end-line stx)
-    (cond
-     [(syntax? stx) (or (syntax-end-line (syntax-e stx))
-                        (syntax-line stx))]
-     [(pair? stx) (or (syntax-end-line (cdr stx))
-                      (syntax-end-line (car stx)))]
-     [(vector? stx) (syntax-end-line (reverse (vector->list stx)))]
-     [else #f]))
-
-  ;; Find which column `stx' ends on if it's not on `line'
-  (define (syntax-end-column stx line delta)
-    (cond
-     [(syntax? stx) (or (syntax-end-column (syntax-e stx) line delta)
-                        (let ([line2 (syntax-line stx)])
-                          (and line line2
-                               (not (= line line2))
-                               (let ([span (syntax-span stx)]
-                                     [col (syntax-column stx)])
-                                 (and span col (+ col span delta))))))]
-     [(pair? stx) (or (syntax-end-column (cdr stx) line (+ delta 1))
-                      (and (or (null? (cdr stx)) 
-                               (and (syntax? (cdr stx)) (null? (cdr stx))))
-                           (syntax-end-column (car stx) line (+ delta 1))))]
-     [else #f]))
-  
-  (define-unit code@
-      (import code-params^)
-      (export code^)
-
-      (define current-code-font (make-parameter `(bold . modern)))
-      
-      (define (default-tt s)
-	(text s (current-code-font) (current-font-size)))
-
-      (define current-code-tt (make-parameter default-tt))
-
-      (define (tt s)
-	((current-code-tt) s))
-
-      (define (code-align p)
-        (let ([b (dc void 
-                     (pict-width p)
-                     (pict-height p)
-                     (pict-height p)
-                     0)])
-          (refocus (cc-superimpose p b) b)))
-
-      (define (code-pict-bottom-line-pict p)
-	(if (code-pict? p)
-	    (code-pict-bottom-line p)
-	    #f))
-
-      (define (pict->code-pict p bottom-line)
-	(if bottom-line
-	    (to-code-pict p bottom-line)
-	    p))
-      
-    (define (get-vars/bindings ns require-spec)  
-      (define ns (let ([n (make-namespace)])
-                   (parameterize ([current-namespace n])
-                     (namespace-require/copy require-spec))
-                   n))
-      (define bindings (namespace-mapped-symbols ns))
-      (define vars (filter (lambda (n)
-                             (not (eq? 'nope
-                                       (namespace-variable-value n #f (lambda () 'nope) ns))))
-                           bindings))
-      (values vars bindings))
-    
-    (define-values (mzscheme-vars mzscheme-bindings) (get-vars/bindings (make-namespace) 'mzscheme))
-    (define-values (racket/base-vars racket/base-bindings) (get-vars/bindings (r:make-base-namespace) 'racket/base))
-    
-      (define current-keyword-list 
-	(make-parameter 
-	 (let ([ht (make-hasheq)])
-           (for-each (lambda (n) (hash-set! ht n #f))
-		     mzscheme-vars)
-           (for-each (lambda (n) (hash-set! ht n #f))
-		     racket/base-vars)
-	   (map symbol->string
-                (filter (lambda (n)
-			  (hash-ref ht n #t))
-                        (append mzscheme-bindings
-                                racket/base-bindings))))))
-      (define current-const-list 
-	(make-parameter '()))
-      (define current-literal-list 
-	(make-parameter '()))
-
-      (define mzscheme-const-list
-	(map symbol->string mzscheme-vars))
-      (define racket/base-const-list
-        (map symbol->string racket/base-vars))
-
-      (define code-colorize-enabled
-	(make-parameter #t))
-
-      (define code-colorize-quote-enabled
-	(make-parameter #t))
-
-      (define code-italic-underscore-enabled (make-parameter #t))
-      (define code-scripts-enabled (make-parameter #t))
-
-      (define (maybe-colorize p c)
-	(if (code-colorize-enabled)
-	    (colorize p c)
-	    p))
-      
-      (define current-base-color (make-parameter "brown"))
-      (define keyword-color "black")
-      (define current-keyword-color (make-parameter keyword-color))
-      (define id-color "navy")
-      (define current-id-color (make-parameter id-color))
-      (define literal-color (make-object color% 51 135 39))
-      (define current-literal-color (make-parameter literal-color))
-      (define const-color (make-object color% #x99 0 0))
-      (define current-const-color (make-parameter const-color))
-      (define comment-color (current-base-color))
-      (define current-comment-color (make-parameter comment-color))
-      (define current-reader-forms (make-parameter '(quote
-						     quasiquote 
-						     unquote unquote-splicing
-						     syntax
-						     quasisyntax
-						     unsyntax unsyntax-splicing)))
-      
-      (define-computed open-paren-p (tt "("))
-      (define-computed close-paren-p (tt ")"))
-      (define-computed open-sq-p (tt "["))
-      (define-computed close-sq-p (tt "]"))
-      (define-computed open-curly-p (tt "{"))
-      (define-computed close-curly-p (tt "}"))
-
-      (define-computed quote-p (tt "'"))
-      (define-computed unquote-p (tt ","))
-      (define-computed unquote-splicing-p (tt ",@"))
-      (define-computed quasiquote-p (tt "`"))
-      (define-computed syntax-p (tt "#'"))
-      (define-computed unsyntax-p (tt "#,"))
-      (define-computed unsyntax-splicing-p (tt "#,@"))
-      (define-computed quasisyntax-p (tt "#`"))
-      (define-computed semi-p (tt "; "))
-
-      (define (comment-mode? mode)
-	(eq? mode 'comment))
-      
-      (define-computed dot-p (tt "."))
-
-      (define (mode-colorize mode type p)
-	(maybe-colorize
-	 p
-	 (case mode
-	   [(literal) (current-literal-color)]
-	   [(comment) (current-comment-color)]
-	   [else (cond
-		  [(number? mode) (current-literal-color)]
-		  [(eq? type 'keyword) (current-keyword-color)]
-		  [(eq? type 'literal) (current-literal-color)]
-		  [(eq? type 'const) (current-const-color)]
-		  [(eq? type 'id) (current-id-color)]
-		  [else (current-base-color)])])))
-	
-      (define (get-open mode stx)
-	(if (memq mode '(contract line))
-	    (blank)
-	    (mode-colorize 
-	     mode #f
-	     (case (syntax-property stx 'paren-shape)
-	       [(#\[) open-sq-p]
-	       [(#\{) open-curly-p]
-	       [else open-paren-p]))))
-	
-      (define (get-close mode stx)
-	(if (memq mode '(contract line))
-	    (blank)
-	    (mode-colorize
-	     mode #f
-	     (case (syntax-property stx 'paren-shape)
-	       [(#\[) close-sq-p]
-	       [(#\{) close-curly-p]
-	       [else close-paren-p]))))
-      
-      (define (add-close p closes [force-line #f])
-	(cond
-	 [(null? closes) p]
-	 [(memq (caar closes) '(contract line))
-	  (add-close p (cdr closes) force-line)]
-	 [else
-          (let ([p (if force-line
-                       (vl-append p (tt ""))
-                       p)])
-            (add-close (code-hbl-append p (get-close (caar closes) (cdar closes)))
-                       (cdr closes)
-                       #f))]))
-      
-      (define (pad-left space p)
-	(if (= 0 space)
-	    p
-	    (code-htl-append (tt (make-string space #\space)) p)))
-
-      (define (pad-bottom space p)
-	(if (= 0 space)
-	    p
-	    (code-vl-append (current-code-line-sep) (tt " ") (pad-bottom (sub1 space) p))))
-
-      (define (colorize-id str mode)
-	(cond
-	 [(and (code-italic-underscore-enabled)
-	       ((string-length str) . > . 1)
-	       (char=? #\_ (string-ref str 0))
-	       (not (char=? #\_ (string-ref str 1))))
-	  (mode-colorize
-	   mode 'id
-	   (text (substring str 1) `(italic . ,(current-code-font)) (current-font-size)))]
-	 [(and (code-scripts-enabled)
-	       (regexp-match #rx"^(.+)_([0-9a-z()+-]+)\\^([0-9a-z()+-]+)$" str))
-	  => (lambda (m)
-	       (hbl-append (colorize-id (cadr m) mode)
-			   (cc-superimpose
-			    (text (caddr m) `(subscript . ,(current-code-font)) (current-font-size))
-			    (text (cadddr m) `(superscript . ,(current-code-font)) (current-font-size)))))]
-	 [(and (code-scripts-enabled)
-	       (regexp-match #rx"^(.+)\\^([0-9a-z()+-]+)_([0-9a-z()+-]+)$" str))
-	  => (lambda (m)
-	       (hbl-append (colorize-id (cadr m) mode)
-			   (cc-superimpose
-			    (text (cadddr m) `(subscript . ,(current-code-font)) (current-font-size))
-			    (text (caddr m) `(superscript . ,(current-code-font)) (current-font-size)))))]
-	 [(and (code-scripts-enabled)
-	       (regexp-match #rx"^(.+)\\^([0-9a-z()+-]+)$" str))
-	  => (lambda (m)
-	       (hbl-append (colorize-id (cadr m) mode)
-			   (text (caddr m) `(superscript . ,(current-code-font)) (current-font-size))))]
-	 [(and (code-scripts-enabled)
-	       (regexp-match #rx"^(.+)_([0-9a-z()+-]+)$" str))
-	  => (lambda (m)
-	       (hbl-append (colorize-id (cadr m) mode)
-			   (text (caddr m) `(subscript . ,(current-code-font)) (current-font-size))))]
-	 [else
-	  (mode-colorize
-	   mode 
-	   (cond
-	    [(member str (current-keyword-list)) 'keyword]
-	    [(member str (current-const-list)) 'const]
-	    [(member str (current-literal-list)) 'literal]
-	    [else 'id])
-	   (tt str))]))
-
-      (define (sub-mode mode)
-	(case mode
-	  [(line cond local) #f]
-	  [(template-cond) 'template]
-	  [(contract) 'comment]
-	  [else mode]))
-
-      (define (cond? s)
-	(memq (syntax-e s) '(cond))) ;  syntax-rules syntax-case)))
-
-      (define (local? s)
-	(memq (syntax-e s) '(local)))
-
-      (define (get-span stx)
-        (syntax-case stx (code:blank)
-          [code:blank 1]
-          [_ (or (syntax-span stx) 1)]))
-      
-      (define (color-semi-p)
-	(mode-colorize 'comment #f semi-p))
-
-      (define (add-semis p)
-	(let loop ([p p] [semis (color-semi-p)])
-	  (if ((pict-height p) . > . (+ (pict-height semis) 1))
-	      (loop p (vl-append (current-code-line-sep) (color-semi-p) semis))
-	      (htl-append semis p))))
-
-      (define (add-unquote unquote-p loop x closes mode)
-	(let ([mode (cond
-		     [(number? mode) (if (zero? mode)
-					 #f
-					 (sub1 mode))]
-		     [else mode])])
-	  (code-htl-append (mode-colorize mode 'keyword unquote-p) 
-			   (loop x closes mode))))
-
-      (define (typeset-code stx)
-	(let loop ([stx stx][closes null][mode #f])
-	  (syntax-case* stx (quote unquote unquote-splicing quasiquote
-				   syntax-unquote syntax unsyntax
-				   unsyntax-splicing quasisyntax
-				   code:contract code:comment code:line
-				   code:template code:blank $)
-			(lambda (a b) (eq? (syntax-e a) (syntax-e b)))
-	    [() (add-close (htl-append (get-open mode stx) (get-close mode stx))
-			   closes)]
-	    [code:blank (add-close (tt " ")
-                                   closes)]
-	    [$ (colorize-id "|" closes)]
-	    [(quote x)
-	     (memq 'quote (current-reader-forms))
-	     (code-htl-append (mode-colorize mode 'literal quote-p) 
-			      (loop #'x closes (if (or (not (code-colorize-quote-enabled))
-						       (comment-mode? mode))
-						   mode
-						   'literal)))]
-	    [(unquote x)
-	     (memq 'unquote (current-reader-forms))
-	     (add-unquote unquote-p loop #'x closes mode)]
-	    [(unquote-splicing x)
-	     (memq 'unquote-splicing (current-reader-forms))
-	     (add-unquote unquote-splicing-p loop #'x closes mode)]
-	    [(quasiquote x)
-	     (memq 'quasiquote (current-reader-forms))
-	     (code-htl-append (mode-colorize mode 'keyword quasiquote-p) 
-			      (loop #'x closes (cond
-						[(not (code-colorize-quote-enabled)) mode]
-						[(comment-mode? mode) mode]
-						[(number? mode) (add1 mode)]
-						[else 0])))]
-	    [(syntax x)
-	     (memq 'syntax (current-reader-forms))
-	     (code-htl-append (mode-colorize mode 'literal syntax-p) 
-			      (loop #'x closes mode))]
-	    [(unsyntax x)
-	     (memq 'unsyntax (current-reader-forms))
-	     (code-htl-append (mode-colorize mode 'literal unsyntax-p) 
-			      (loop #'x closes mode))]
-	    [(unsyntax-splicing x)
-	     (memq 'unsyntax-splicing (current-reader-forms))
-	     (code-htl-append (mode-colorize mode 'literal unsyntax-splicing-p) 
-			      (loop #'x closes mode))]
-	    [(quasisyntax x)
-	     (memq 'unsyntax-splicing (current-reader-forms))
-	     (code-htl-append (mode-colorize mode 'literal quasisyntax-p) 
-			      (loop #'x closes mode))]
-	    [(code:contract i ...)
-	     (add-semis (loop (datum->syntax #f (syntax->list #'(i ...)))
-			      closes 'contract))]
-	    [(code:line i ...)
-             (loop (datum->syntax #f (syntax->list #'(i ...))
-                                  (syntax-case stx ()
-                                    [(_ a . b)
-                                     (let ([src (syntax-source stx)]
-                                           [line (syntax-line stx)]
-                                           [col (syntax-column stx)]
-                                           [pos (syntax-position stx)]
-                                           [span (syntax-span stx)]
-                                           [a-pos (syntax-position #'a)])
-                                       (if (and pos a-pos (a-pos . > . pos))
-                                           (vector src
-                                                   line
-                                                   (and col (+ col (- a-pos pos)))
-                                                   a-pos
-                                                   (and span (max 0 (- span (- a-pos pos)))))
-                                           stx))]
-                                    [else stx]))
-                   closes 'line)]
-	    [(code:comment s ...)
-	     (let ([p
-                    (apply htl-append 
-                           (color-semi-p)
-                           (map (lambda (s)
-                                  (if (pict? (syntax-e s))
-                                      (syntax-e s)
-                                      (maybe-colorize (tt (syntax-e s)) (current-comment-color))))
-                                (syntax->list #'(s ...))))])
-               ;; Ungraceful handling of ungraceful closes by adding a line
-               ;; --- better than sticking them to the right of the comment, at least
-               (add-close p closes 'force-line))]
-	    [(code:template i ...)
-	     (add-semis (loop #'(code:line i ...) closes 'template))]
-            [(a b i ... c)
-             (let ([pos (for/fold ([pos (syntax-position #'b)]) ([i (in-list (syntax->list #'(i ... c)))])
-                          (and pos 
-                               (syntax-position i)
-                               ((syntax-position i) . > . pos)
-                               (syntax-position i)))])
-               (and pos 
-                    ((syntax-position #'a) . > . (syntax-position #'b))
-                    ((syntax-position #'a) . < . (syntax-position #'c))))
-             ;; position of `a' is after `b', while everything else is in
-             ;; order, so print as infix-dot notation
-             (loop
-              (datum->syntax
-               stx
-               (cons #'b
-                     (let loop ([l (syntax->list #'(i ... c))])
-                       (cond
-                        [((syntax-position #'a) . < . (syntax-position (car l)))
-                         (let ([src (syntax-source #'a)]
-                               [pos (syntax-position #'a)]
-                               [line (syntax-line #'a)]
-                               [col (syntax-column #'a)]
-                               [span (syntax-span #'a)])
-                           (list* (datum->syntax #f '|.| 
-                                                 (vector src line 
-                                                         (and col (max 0 (- col 2))) 
-                                                         (max 1 (- pos 2)) 
-                                                         1))
-                                  #'a 
-                                  (datum->syntax #f '|.| 
-                                                 (vector src line 
-                                                         (and col (+ col 1 span))
-                                                         (+ pos 1 span) 
-                                                         1))
-                                  l))]
-                        [else (cons (car l) (loop (cdr l)))])))
-               stx)
-              closes
-              mode)]
-	    [(i ...)
-	     (let ([is (syntax->list #'(i ...))])
-	       ;; Convert each i to a picture, include close paren in last item:
-	       (let ([ips (let iloop ([is is][sub-mode (sub-mode mode)])
-			    (cond
-			     [(null? (cdr is)) (list (loop (car is) (cons (cons mode stx) closes) sub-mode))]
-			     [else (cons (loop (car is) null sub-mode)
-					 (iloop (cdr is) (cond
-							  [(cond? (car is))
-							   (if (eq? mode 'template)
-							       'template-cond
-							       'cond)]
-							  [(local? (car is))
-							   'local]
-							  [(eq? sub-mode 'local)
-							   #f]
-							  [else
-							   sub-mode])))]))])
-		 ;; Combine the parts:
-		 (let ([left (or (syntax-column stx) +inf.0)])
-		   (let loop ([stxs is]
-			      [ps ips]
-			      [line-so-far (get-open mode stx)]
-			      [col (+ left 1)]
-			      [line (syntax-line stx)]
-			      [always-space? #f]
-                              [col->width (make-hash)])
-		     (cond
-		      [(null? ps) (blank)]
-		      [(or (not line)
-			   (= line (or (syntax-line (car stxs)) line)))
-		       (let* ([space (if (syntax-column (car stxs))
-					 (inexact->exact
-					  (max (if always-space? 1 0) (- (syntax-column (car stxs)) col)))
-					 (if always-space? 1 0))]
-			      [p (code-htl-append
-				  line-so-far
-				  (pad-left space (car ps)))])
-			 (unless (equal? +inf.0 (+ space col))
-			   (hash-set! col->width 
-                                      (+ space col) 
-                                      (pict-width (code-htl-append line-so-far (pad-left space (blank))))))
-			 (if (null? (cdr stxs))
-			     p
-			     (loop (cdr stxs)
-				   (cdr ps)
-				   p
-                                   (or (syntax-end-column (car stxs) line 0)
-                                       (if (not (syntax-column (car stxs)))
-                                           +inf.0
-                                           (+ col space (get-span (car stxs)))))
-				   (or (syntax-end-line (car stxs))
-                                       line 
-                                       (syntax-line (car stxs)))
-				   #t
-                                   col->width)))]
-		      [else
-		       ;; Start on next line:
-		       (code-vl-append
-			(current-code-line-sep)
-			line-so-far
-			(let* ([space (max 0 (- (or (syntax-column (car stxs)) 0) left))]
-			       [p 
-                                (let/ec k
-                                  (code-htl-append
-                                   (blank (hash-ref col->width 
-                                                    (+ space left)
-                                                    (lambda ()
-                                                      (k (pad-left space (car ps)))))
-                                          0)
-                                   (car ps)))])
-			  (if (null? (cdr stxs))
-			      p
-			      (loop (cdr stxs)
-				    (cdr ps)
-				    p
-				    (+ left space (get-span (car stxs)))
-				    (or (syntax-line (car stxs)) (add1 line))
-				    #t
-                                    (let ([ht (make-hash)]
-                                          [v (hash-ref col->width (+ space left) #f)])
-                                      (when v (hash-set! ht (+ space left) v))
-                                      ht)))))])))))]
-	    [id
-	     (identifier? stx)
-	     (add-close (colorize-id (symbol->string (syntax-e stx)) mode) closes)]
-	    [kw
-	     (keyword? (syntax-e #'kw))
-	     (add-close (mode-colorize mode #f (tt (format "~s" (syntax-e stx)))) closes)]
-	    [(a . b)
-             ;; Build a list that makes the "." explicit.
-             (let ([p (let loop ([a (syntax-e stx)])
-                        (cond
-                         [(pair? a) (cons (car a) (loop (cdr a)))]
-                         [else (list (datum->syntax #f
-                                                    (mode-colorize mode #f dot-p)
-                                                    (list (syntax-source a)
-                                                          (syntax-line a)
-                                                          (- (syntax-column a) 2)
-                                                          (- (syntax-position a) 2)
-                                                          1))
-                                     a)]))])
-               (loop (datum->syntax stx
-                                    p
-                                    stx)
-                     closes
-                     mode))]
-	    [else
-	     (add-close (if (pict? (syntax-e stx))
-			    (syntax-e stx)
-			    (mode-colorize mode 'literal
-					   (tt (format "~s" (syntax-e stx))) ))
-			closes)])))
-      
-      ))
diff --git a/pkgs/pict-pkgs/pict-lib/texpict/doc.txt b/pkgs/pict-pkgs/pict-lib/texpict/doc.txt
deleted file mode 100644
index 1cd632513a..0000000000
--- a/pkgs/pict-pkgs/pict-lib/texpict/doc.txt
+++ /dev/null
@@ -1,1264 +0,0 @@
-
-_texpict_ is a Racket/GRacket library for creating pictures using a
-GRacket dc<%> (including post-script-dc% for _PostScript_ output) or
-_LaTeX_ as the back-end. The two back-ends are incompatible; picts
-must be created for one or the other. The library was originally
-designed for LaTeX output, hence the name.
-
-Pictures are created as `pict' structures. Some procedures in the
-texpict library create new simple picts (e.g., `hline'). Others build
-new picts out of existing picts (e.g., `ht-append'). In the latter
-case, the embedded picts retain their identity, so that offset-finding
-functions (e.g., `lt-find') can find the offset of an embedded pict in
-a larger pict.
-
-A pict has the following structure:
-                w
-        ------------------
-       |                  | a  \
-       |------------------|    |
-       |                  |    | h
-       |------------------|    |
-       |                  | d  /
-        ------------------     
-
-For a single text line, d is descent below the baseline and
-a + d = h. For multiple text lines (created with vX-append), a is 
-ascent of top line above baseline and d is descent of bottom line,
-so a + d < h. Most other boxes have d = 0 and a = h.
-
-The size information for a pict is computed when the pict is
-created. This strategy supports programs that create new picts though
-arbitrarily complex computations on the size and shape of existing
-picts. However, it also means that a pict cannot be generated before
-its target device is known.
-
-A slightly different set of picture-making function are available for
-GRacket and LaTeX output. For example, the LaTeX set includes `tex',
-which accepts a string of arbitrary LaTeX code, and the GRacket set
-includes `dc', which accepts an arbitrary Scheme procedure for drawing
-to a dc<%>.
-
-When creating pictures with the obsolete `picture' or `cons-picture'
-functions, or when finding relative picture locations with the
-obsolete `find-lt', etc., the coordinate system is upside-down: (0, 0)
-is in the lower left.
-
-Slideshow output
-----------------
-
-Slideshow (see the "slideshow" collection) takes care of configuring
-texpict and rendering them to the screen or printer. In particular,
-the `slide' function takes any number of picts and assembles them into
-a slide.
-
-If you are using Slideshow, skip the following two sections. In the
-reference below, functions marked "GRacket only" or "GRacket only, in
-utils.ss" are available, and functions marked "LaTeX only" are not
-available.
-
-For non-Slideshow users, _utils.ss_ library provides additional
-drawing procedures for GRacket (not LaTeX) output. These are marked below
-with "GRacket only, in utils.ss".
-
-
-GRacket (or PostScript) output
----------------------------
-
-The GRacket texpict function set is loaded by the _mrpict.ss_ library.
-The library is available in unit form via _mrpict-unit.ss_, which
-exports a `mrpict@' unit that imports draw^ and exports
-`texpict-common^' and `mrpict-extra^'. The _mrpict-sig.ss_ library
-file provides both signatures.
-
-When creating a picture for a GRacket dc<%> that contains text, texpict
-needs a drawing context for measuring the text. Provide a dc<%> before
-constructing pictures via the `dc-for-text-size' parameter. The dc<%>
-should have the same text-measuring results as the destination dc<%>;
-in particular, use a post-script-dc% for preparing PostScript output,
-and a bitmap-dc% will work fine for bitmap-dc% or canvas% output.
-
-The `draw-pict' function takes a picture, a device context
-
- ;; Example of producing PostScript output
- (require texpict/mrpict)
-
- ;; Create PS context
- (define ps-dc (make-object post-script-dc%))
- (send ps-dc start-doc "Pict output")
- (send ps-dc start-page)
-
- ;; Install context for sizing
- (dc-for-text-size ps-dc)
-
- ;; Create the pict
- (define p ...)
-
- ;; Output pict
- (draw-pict p ps-dc 0 0)
- (send ps-dc end-page)
- (send ps-dc end-doc)
-
-If the output dc<%> has a "user scale", it is not reflected in the
-size information reported for pictures. This is consistent with GRacket's
-usual policy for reporting size information.
-
-LaTeX output
-------------
-
-The LaTeX texpict function set is loaded by the _texpict_ library.
-The library is available in unit form via _texpict-unit.ss_, which
-provides a `texpict@' unit with no imports and that exports
-`texpict-common^' and `texpict-extra^'. The _texpict-sig.ss_ library
-provides both signatures.
-
-Pictures created with this library are incompatible with Slideshow
-and GRacket-based output.
-
-To create a LaTeX picture, assemble a pict and then
-call `pict->string'. This string can be `display'ed to obtain the
-LaTeX code, which is usually of the form:
-   \begin{picture} ... \end{picture}
-When using colors, the output may be of the form:
-   \special{color push ...} ... \special{color pop ...}
-so consider putting the output in an \hbox{} when using color.
-
-The `tex' function creates a pict given an arbitrary LaTeX
-expression as a string. Initially, `tex' guess at the size of the
-resulting pict. (It always guesses 10 x 10.) The LaTeX expression
-generated for a `tex' pict causes information to be written to an
-auxiliary file when LaTeX evaluates the expression. If you use
-`tex' boxes, then:
-
-   * Use the package "mztp.sty" at the start of your LaTeX
-     document "X.tex".
-   * In the Racket code creating `tex' picts, call
-     (read-in-sizes "X.mztp") before calling `tex'.
-   * Run the texpict-LaTeX cycle twice to get properly
-     draw pictures.
-
-texpict keys `tex' size information on the exact LaTeX expression
-provided to `tex'. If you use a single `tex' pict in two different
-contexts where the provided expression produces differently sized
-output, texpict will not distinguish the uses (and the size of the
-first instance of the pict will be used) by default. The
-`serialize-tex-picts' parameter can solve this problem, but
-serialization requires that the output is built in exactly the same
-order every time, and generally requires more texpict-tex cycles to
-reach a fixed point after a small change to the output. The
-`tex-series-prefix' parameter may be used to explicitly tag `tex'
-sequences in different contexts.
-
-For LaTeX output, all positions and sizes must be specified as exact
-integers, but texpict does not check that exact integers are supplied.
-
-------------------------------------------------------------
-Structures
-------------------------------------------------------------
-
-A pict is an instance of the `pict' structure type:
-
-> struct:pict :: (struct pict (draw width height ascent descent children panbox))
-
-The `children' field is a list of `child' structures:
-
-> struct:child :: (struct child (pict dx dy sx sy sxy syx))
-
-------------------------------------------------------------
-Procedures
-------------------------------------------------------------
-
-Basic Constructors:
--------------------
-
->  (dc draw-proc w h) -> pict
->  (dc draw-proc w h a d) -> pict
-       where draw proc is (dc x y -> void)
-
-   Creates an arbitrary self-rendering pict.  The arguments to the
-   rendering procedure will be a device context and top-left
-   location for drawing.
-  
-   When the rendering procedure is called, the current pen and
-   brush will be solid and in the pict's color (and linewidth), and
-   the scale and offset of the dc will be set. The text mode will
-   be transparent, but the font and colors are not guaranteed to be
-   anything in particular.
-      [GRacket only]
-
->  (blank)  -> pict
->  (blank s)  -> pict   ; s is side length of square
->  (blank w h)  -> pict
->  (blank w a d)  -> pict  ; => h = a + d
->  (blank w g a d)  -> pict
-
-   Creates an empty pict
-
->  (text string [text-style null] [size 12] [angle 0]) -> pict
-
-   Creates a pict from a string, style, size, and rotation.
-    A _text-style_ is one of
-      null (the default, same a 'default),
-      a font% object,
-      a font family symbol (e.g., 'roman),
-      a font face string (e.g., "-adobe-symbol"),
-      `(bold . ,text-style),
-      `(italic . ,text-style), 
-      `(subscript . ,text-style), 
-      `(superscript . ,text-style),
-      `(combine . ,text-style), or
-      `(no-combine . ,text-style).
-      `(caps . ,text-style).
-    A size is an exact number in [1, 255] in pixels; the
-     default size is 12, but the size is ignored if
-     a font% object is provided in the text-style.
-    The default rotation is 0; for a non-zero rotation,
-     the pict covers the rotated text, and the descent
-     is zero and the ascent is the height
-    By default, text drawing can combine characters (to
-     form ligatures, for kerning, etc.), unless the
-     base text-style is 'modern. The 'combine text-style symbol
-     overrides the default to allow combining, and the
-     'no-combine text-style symbol overrides the default to
-     disable combining; if both 'combine and 'no-combine
-     are specified, the first one takes precedence
-    If caps is specified, the angle must be zero.
-      [GRacket only]
-
-> text-style/c :: contract?
-
-  This is a contract that matches the second argument of `text'.
-
->  (caps-text string [text-style null] [size 12] [angle 0]) -> pict
-
-   Same as `text', but use small caps:
-
->  (hline w h) -> pict
->  (dash-hline w h seg-length) -> pict ; default seg-length is 5
->  (vline w h) -> pict
->  (dash-vline w h seg-length) -> pict ; default seg-length is 5
-
-   To draw other kinds of lines, use `dc' [GRacket only] or `picture' or
-   `cons-picture' [LaTeX].
-
->  (frame pict) -> pict
->  (dash-frame pict seg-length) -> pict ; default seg-length is 5
->  (oval pict) -> pict
->  (oval/radius pict r) -> pict ; r is radius of corners
-
->  (big-circle diameter) -> pict
-
-   Creates a fairly round circle using four splines (intended
-   for LaTeX output)
-
->  (color-frame pict color-string) -> pict
->  (color-frame pict color-string line-w) -> pict
->  (color-dash-frame pict seg-length color-string) -> pict
->  (color-dash-frame pict seg-length color-string line-w) -> pict
-
-   Like `frame' and `dash-frame', but the frame gets a color and
-   optional line width
-      [GRacket only, in utils.ss]
-
->  (round-frame pict radius-w) -> pict
->  (color-round-frame pict radius-w color-string) -> pict
->  (color-round-frame pict radius-w color-string line-w) -> pict
-
-   Rounded frames, given a radius for the corners
-      [GRacket only, in utils.ss]
-
->  (circle diameter) -> pict
->  (disk diameter) -> pict
-
-   Unfilled and filled circles; works for all sizes.
-      [GRacket only, in utils.ss]
-
->  (ellipse width height) -> pict
->  (filled-ellipse width height) -> pict
-
-   Unfilled and filled ellipses; works for all sizes.
-      [GRacket only, in utils.ss]
-
->  (rectangle width height) -> pict
->  (filled-rectangle width height) -> pict
-
-   Unfilled and filled rectangle; works for all sizes.
-      [GRacket only, in utils.ss]
-
->  (rounded-rectangle width height [corner]) -> pict
->  (filled-rounded-rectangle width height [corner]) -> pict
-
-   Unfilled and filled rounded rectangle; works for all sizes.
-      [GRacket only, in utils.ss]
-
->  (arrow size radians) -> pict
->  (arrowhead size radians) -> pict
-
-   Creates an arrow or arrowhead in the specific direction
-    within a size x size pict. (Points on the arrow may
-    extend slightly beyond the box.)
-      [GRacket only, in utils.ss]
-
->  (pip-line dx dy size) -> pict
->  (pip-arrow-line dx dy size) -> pict
->  (pip-arrows-line dx dy size) -> pict
-
-   Creates a line [with arrowhead(s)] as a 0-sized picture suitable
-   for use with `pin-over'. The 0-sized picture contains the starting
-   point.
-      [GRacket only, in utils.ss]
-
->  (bitmap filename) -> pict
->  (bitmap bitmap%-object) -> pict
-
-   Loads a bitmap into a pict; if the bitmap is not ok,
-    the result is a box containing the words "bitmap failed"
-      [GRacket only, in utils.ss]
-
->  (cloud w h [color-string "gray"]) -> pict
-
-   Fluffy cloud.
-      [GRacket only, in utils.ss]
-
->  (file-icon w h gray [fancy? ...]) -> pict
-
-   Creates a MacOS-like file icon, optionally shaded.
-   Default for `fancy?': gray = #f -> white
-                         gray = #t -> default color
-                         gray = color/string -> uses color
-
-      [GRacket only, in utils.ss]
-
->  (jack-o-lantern size [pumpkin-color "orange"] [face-color "black"]) -> pict
-
-   Creates a jack-o-lantern; use the same pumpkin-color and
-   face color to get a plain pumpkin. The size is the width.
-      [GRacket only, in utils.ss]
-
->  (angel-wing w h left?) -> pict
-
-   Creates an angel wing, left or right, or any size.
-   The color and pen width for drawing the wing outline is the
-   current one.
-      [GRacket only, in utils.ss]
-
-
->  (standard-fish w h [direction 'left] [color "blue"] 
-                      [eye-color "black"] [open-mouth? #t]) -> pict
-
-   Creates a fish, swimming either 'left or 'right.
-      [GRacket only, in utils.ss]
-
-> (explode-star small-rad large-rad points line-size line-color)
-
-  Creates a star-shaped explosion thingy. The points are
-  aligned on two radii, one for the beginning of the points
-  and one for the end, large-rad and small-rad. points is
-  the number of spikes sitcking out, and line-size and
-  line-color are the thickness of the lines and the lines
-  color.
-
-
-Combiners:
-----------
-
->  (vl-append [d 0] pict ...) -> pict ; d units between each picture
->  (vc-append [d 0] pict ...) -> pict
->  (vr-append [d 0] pict ...) -> pict
->  (ht-append [d 0] pict ...) -> pict
->  (hc-append [d 0] pict ...) -> pict
->  (hb-append [d 0] pict ...) -> pict
->  (htl-append [d 0] pict ...) -> pict  ; align bottoms of ascents
->  (hbl-append [d 0] pict ...) -> pict  ; align tops of descents (normal text alignment)
-
-   Make a new picture as a column (vX-append) or row (hX-append)
-   of other pictures. Different procedures align pictures in the
-   orthogonal direction in different ways; e.g, vl-append left-aligns
-   all of the pictures. A specified amount of space is inserted
-   between each pair of pictures in making the column or row.
-   The descent of the result corresponds to baseline that is lowest
-   in the result among all of the picts' descent-specified
-   baselines; similarly, the ascent of the result corresponds to
-   the highest ascent-specified baseline.
-
->  (lt-superimpose pict ...) -> pict
->  (lb-superimpose pict ...) -> pict
->  (lc-superimpose pict ...) -> pict
->  (ltl-superimpose pict ...) -> pict
->  (lbl-superimpose pict ...) -> pict
->  (rt-superimpose pict ...) -> pict
->  (rb-superimpose pict ...) -> pict
->  (rc-superimpose pict ...) -> pict
->  (rtl-superimpose pict ...) -> pict
->  (rbl-superimpose pict ...) -> pict
->  (ct-superimpose pict ...) -> pict
->  (cb-superimpose pict ...) -> pict
->  (cc-superimpose pict ...) -> pict
->  (ctl-superimpose pict ...) -> pict
->  (cbl-superimpose pict ...) -> pict
-
-   Make a new picture by superimposing a set of pictures. The
-   alignment indicators are essentially as above: horizontal
-   alignment then vertical alignment. The descent and the ascent
-   of the result is also computed as above (i.e., lowest descent
-   and highest ascent).
-
->  (pin-over pict dx dy pict) -> pict
->  (pin-over pict sub-pict find-proc pict) -> pict
-
-   Creates a pict with the same bounding box, ascent, and descent
-   as the initial argument, but with the second pict placed on top.
-   The dx and dy argument specify how far right and down the second
-   pict's corner is from the first pict's corner.
-   Alternately, the sub-pict and procedure arguments find a point
-   in the initial pict for the second pict's corner. The procedure
-   should be like lt-find.
-
->  (pin-under pict dx dy pict) -> pict
->  (pin-under pict sub-pict find-proc pict) -> pict
-
-   Like pin-over, but the second pict is drawn first, then the
-   initial pict.
-
->  (table ncols pict-list col-aligns row-aligns col-seps row-seps) -> pict
-
-   Make a table given a list of picts. The list is a
-   concatenation of rows (which means that a Scheme `list' call
-   can be formatted to reflect the shape of the output table).
-  
-   The col-aligns, row-aligns, col-seps, and row-seps arguments are
-   `lists' specifying the row and columns alignments separation
-   between rows and columns.  For C columns and R rows, the first
-   two should have C and R superimpose procedures, and the last two
-   should have C - 1 and R - 1 numbers, respectively. The lists can
-   be improper (e.g. just a number), in which case the non-pair cdr
-   is used as the value for all remaining list items that were
-   expected. The alignment procedures are used to superimpose all
-   of the cells in a column or row; this superimposition determines
-   the total width or height of the column or row, and also
-   determines the horizontal or vertical placement of each cell in
-   the column or row.
-
->  (record pict pict ...) -> pict
-
-   Make a UML-like record picture, where the
-   first argument is the title and the rest are fields.
-
-
-Drawing Adjusters:
-------------------
-
->  (scale pict factor) -> pict
->  (scale pict x-factor y-factor) -> pict
-
-   Scales a pict (by adjusting the destination dc<%>'s
-   scale while drawing the pict.
-      [GRacket only, in utils.ss]
-
->  (ghost pict) -> pict
-
-   Make a container picture that doesn't draw the child picture,
-   but uses the child's size
-
->  (thick pict) -> pict
->  (thin pict) -> pict
-
-   Set the line thickness for a picture. For GRacket output,
-   selects between a pen width of 0 or 1.
-
->  (linewidth w pict) -> pict
-
-   Set a specific pen width for drawing.
-      [GRacket only]
-
->  (colorize pict color-string) -> pict
-
-   Apply a color to a picture. If the given picture has a colorized
-   sub-picture, the color of the sub-picture is not affected.
-   [LaTeX: use the LaTeX package "colordvi"]
-
->  (colorize pict color%) -> pict
-
-   Same as above, except uses the color% object instead of a string
-   to indicate the color of the pict.
-      [GRacket only]
-
->  (colorize pict num-list) -> pict
-
-   Same as above, except the list of three numbers indicate the
-   red, green, and blue components of the color.
-      [GRacket only]
-
->  (cellophane pict opacity) -> pict
-
-   Makes the given pict semi-transparent, where an opacity of 0.0 is
-   fully transparent, and an opacity of 1.0 is fully opaque.  See
-   `set-alpha' of dc<%> for information about the contexts and cases
-   when semi-transparent drawing works.
-
->  (clip pict)
-
-   Clips a pict to its bounding box.
-      [GRacket only, in utils.ss]
-
->  (scale/improve-new-text pict-expr s-expr)
->  (scale/improve-new-text pict-expr sx-expr sy-expr)
-
-   Syntax that is like `scale', but also sets
-   `current-expected-text-scale' while evaluating
-   `pict-expr':
-      [GRacket only, in utils.ss]
-
->  (inset/clip pict amt)
->  (inset/clip pict h-amt v-amt)
->  (inset/clip pict l-amt t-amt r-amt b-amt)
-
-   Insets and clips the pict's drawing to its
-   bounding box. (Usually the inset amounts are negative.)
-      [GRacket only, in utils.ss]
-
-
-Bounding-Box Adjusters:
------------------------
-
->  (inset pict i) -> pict
->  (inset pict hi vi) -> pict
->  (inset pict li ti ri bi) -> pict
-
-   Extends picture size by adding the give amounts to the
-    corresponding side; ascent and descent are extended, too.
-
->  (clip-descent pict) -> pict
-
-   Truncates picture, removing descent part.
-
->  (lift pict n) -> pict
-
-   Lifts picture relative to its baseline, extending
-    the height if necessary
-
->  (drop pict n) -> pict
-
-   Drops picture below its ascent line, extending
-    the height if necessary
-
->  (baseless pict) -> pict
-
-   Makes the descent 0 and the ascent the height
-
->  (refocus pict pict) -> pict
-
-   Given a pict and an embedded pict, shifts the
-    given pict's bounding box to that of the
-    embedded pict
-
->  (panorama pict) -> pict
-
-   Given a pict, shifts the given pict's bounding box
-    to enclose the bounding boxes of all sub-picts
-    (laundered or not)
-
-
-Finders:
---------
-
->  (lt-find pict pict-path) -> dx dy
->  (lc-find pict pict-path) -> dx dy
->  (lb-find pict pict-path) -> dx dy
->  (ltl-find pict pict-path) -> dx dy
->  (lbl-find pict pict-path) -> dx dy
->  (rt-find pict pict-path) -> dx dy
->  (rc-find pict pict-path) -> dx dy
->  (rb-find pict pict-path) -> dx dy
->  (rtl-find pict pict-path) -> dx dy
->  (rbl-find pict pict-path) -> dx dy
->  (ct-find pict pict-path) -> dx dy
->  (cc-find pict pict-path) -> dx dy
->  (cb-find pict pict-path) -> dx dy
->  (ctl-find pict pict-path) -> dx dy
->  (cbl-find pict pict-path) -> dx dy
-
-   Finds an embedded picture.
-   A pict-path is either
-    pict
-    non-empty-pict-path-list
-
->  (launder pict) -> pict
-
-   Creates a new pict that hides the given pict from XX-find
-
-
-Other constructors:
--------------------
-
->  pin-line                ; pict 
-                           ; src-pict (pict pict -> x y)
-                           ; dest-pict (pict pict -> x y)
-                           ; [line-w [color-string [lines-under?]]]
-                           ; -> pict
->  pin-arrow-line          ; arrow-size pict 
-                           ; src-pict (pict pict -> x y)
-                           ; dest-pict (pict pict -> x y)
-                           ; [line-w [color-string [lines-under? [solid-head?]]]]
-                           ; -> pict
->  pin-arrows-line         ; arrow-size pict 
-                           ; src-pict (pict pict -> x y)
-                           ; dest-pict (pict pict -> x y)
-                           ; [line-w [color-string [lines-under? [solid-head?]]]] 
-                           ; -> pict
-
-   Adds a line or line-with-arrows onto a pict, using
-   one of the sub-pict-finding functions (e.g., `lt-find')
-   to extract the source and destination of the line.
-
-   The defaults for line-w, color-string, and lines-under?
-   are #f, and the default for solid-head? is #t.
-
-      [GRacket only, in utils.ss]
-
->  (hyperlinkize pict) -> pict
-
-   Adds an underline and blue color. The pict's
-    height and descent are extended.
-      [GRacket only, in utils.ss]
-
-
-Renderers:
-----------
-
->  (show-pict pict [w #f] [h #f]) -> void
-
-   Opens a frame that displays the pict.
-   The frame adds one method: 
-     set-pict : pict -> void
-   that changes the visible pict.
-   the optional w and h arguments must
-   be either numbers of #f. If numbers,
-   the window is at least that size
-   and the pict is drawn in the middle of
-   the window.
-      [GRacket only]
-
->  (draw-pict pict dc x y) -> void
-
-   Draw a pict to a dc<%>
-      [GRacket only]
-
->  (make-pict-drawer pict) -> ((dc x y) -> void)
-
-   Generate a pict-drawer procedure for multiple renderings of a
-   pict (much faster than repeated calls to draw-pict)
-      [GRacket only]
-
-
-GRacket DC Helpers:
-----------------
-
->  (scale-color factor string-or-color%) -> color%
-
-   Scales a color, making it brighter or darker. If the
-   factor is < 1, the color is darkened by multiplying
-   the RGB components by the factor. If the factor is > 1,
-   the color is lightened by dividing the gap between
-   the RGB components and 255 by the factor.
-      [GRacket only, in utils.ss]
-
->  (find-pen string-or-color% [size 1] [style 'solid]) -> pen%
-
-   Gets an immutable pen% from the-pen-list
-      [GRacket only, in utils.ss]
-
->  (find-brush string-or-color% [style 'solid]) -> brush%
-
-   Gets an immutable brush from the-brush-list
-      [GRacket only, in utils.ss]
-
->  color-series            ; dc<%> num-steps step-delta
-                           ;  start-color-or-string%
-                           ;  end-color-or-string%
-                           ;  (num -> any)
-                           ;  set-pen? set-brush? -> void
-
-   Calls a drawing function multiple times, gradually
-   changing the pen/brush color for each call. The
-   step count and step delta should be exact numbers;
-   the procedure is called with each number from 0 to 
-   the step count, using the step delta. For the first
-   call, the current pen and/or brush color matches the
-   starting color; for the last call, it matches the
-   ending color; and for intermediate calls, the color
-   is an intermediate color.
-      [GRacket only, in utils.ss]
-
-------------------------------------------------------------
-Additional LaTex Utilities
-------------------------------------------------------------
-
->  (tex string) -> pict
->  (text-line string) -> pict
->  (text-line/phantom string string) -> pict
->  (tex-paragraph w string ['top|'bottom]) -> pict
-
-   Create picts from LaTeX code
-      [LaTeX only]
-
->  (left-brace h) -> pict
->  (right-brace h) -> pict
->  (left-delimit str h) -> pict
->  (right-delimit str h) -> pict
->  (middle-delimit str h) -> pict
->  (top-brace w) -> pict
->  (bottom-brace w) -> pict
-
-   Delimiters to go around height h (result is taller than h;
-    try h/2)
-   Delimiter to go around width w (result is w wide)
-      [LaTeX only]
-
->  (pict->string pict) -> string
-
-   Generate the LaTeX code for a pict.
-      [LaTeX only]
-
-------------------------------------------------------------
-GRacket and LaTex Setup
-------------------------------------------------------------
-
->  dc-for-text-size
-
-   Parameter specifying the dc<%> to use for measuring text.
-   Default: #f
-      [GRacket only]
-
->  current-expected-text-scale ; -> (list num num)
-                               ; (list num num) -> void
-
-   A parameter used to refine text measurements to better
-   match an expected scaling of the image.
-   Default: 1
-      [GRacket only]
-
->  (read-in-sizes string) -> void
-
-   Load `tex' pict size information generated by a LaTeX run.
-      [LaTeX only]
-
->  output-measure-commands
-
-   Parameter specifying whether to produce LaTeX commands to
-   produce size information for a future run.
-   Default: #t
-      [LaTeX only]
-
->  using-pict2e-package
-
-   Parameter specifying whether the `pict2e' package is active.
-   Default: #f
-      [LaTeX only]
-
->  draw-bezier-lines
-
-   Parameter specifying whether to draw precise lines for `connect'
-   with bezier curves. The value is a Boolean or a procedure that
-   takes a length and returns the number of points to use.
-   Default: #f
-      [LaTeX only]
-
->  use-old-connect
-
-   Parameter to use the old implementation of `connect'.
-   Default: #f
-      [LaTeX only]
-
->  tex-series-prefix
-
-   Parameter specifying a string to embed in the sizing key for a
-   pict created with `tex'. The prefix is applied when the `tex'
-   pict is created. Turning on the `serialize-tex-picts' parameter
-   effectively generates a new series prefix for every `tex' pict.
-   Default: #f
-      [LaTeX only]
-   
->  serialize-tex-picts
-
-   Parameter specifying whether to assign serial numbers to
-   `tex'-generated strings for sizing purposes. Serial numbers
-   allow the same tex string to be used in multiple contexts, but
-   the output must be built in the same order every time.
-   Default: #f
-      [LaTeX only]
-
->  black-and-white
-
-   Parameter specifying whether to draw in B&W or color (when
-   `colorize' is used).
-   Default: #f
-
-------------------------------------------------------------
-Obsolete functions
-------------------------------------------------------------
-
->  (picture w h command-list) -> pict
-
-   Obsolete: describes a picture with low-level commands; see below.
-
->  (cons-picture pict command-list) -> pict
->  (cons-picture* pict command-list) -> pict
-
-   Create a new picture by `cons'ing drawing commands onto
-   an existing picture. `cons-picture*' maintains the pict's
-   descent and ascent.
-
->  (cons-colorized-picture pict color-string command-list) -> pict
-
-   Like `cons-picture', but the newly consed commands get a
-   color
-
->  (place-over pict dx dy pict) -> pict
->  (place-over pict sub-pict find-proc pict) -> pict
-
-   Obsolete versions of `pin-over', where a procedure is expected
-   to return a flipped y value, like find-lt.
-
->  (place-under pict dx dy pict) -> pict
->  (place-under pict sub-pict find-proc pict) -> pict
-
-   Like `place-over', but the second pict is drawn first, then the
-   initial pict.
-
->  find-lt
->  find-lc
->  find-lb
->  find-ltl
->  find-lbl
->  find-ct
->  find-cc
->  find-cb
->  find-ctl
->  find-cbl
->  find-rt
->  find-rc
->  find-rb
->  find-rtl
->  find-rbl
-
-   Obsolete versions of ...-find, where the result y is flipped
-
->  (arrow-line dx dy size) -> pict
->  (arrows-line dx dy size) -> pict
-
-   Obsolete versions of the `line+arrow[s]' functions,
-   where the vertical delta is negated.
-      [GRacket only, in utils.ss]
-
->  add-line
->  add-arrow-line
->  add-arrows-line
-
-   Obsolete variants of the pin-...line functions
-   where the pict-finding functions are like `find-lt' (i.e.,
-   the y result is flipped)
-      [GRacket only, in utils.ss]
-
-------------------------------------------------------------
-Obsolete: Commands, Putables, and Drawables
-------------------------------------------------------------
-
-Commands:
----------
-
-These commands use LaTeX-style coordinates: bottom-left
-is (0, 0).
-
-The varieties of `connect' commands are for LaTeX, where
-lines are constrained to a small set of allowed angles.
-For GRacket, all of the commands below act the same, and produce
-lines with precisely the requested angle.
-
-A command is one of the following:
-   `(place ,x ,y ,pict)
-   `(put ,x ,y ,putable)
-   
-
-   `(connect ,x1 ,y1 ,x2 ,y2 ,bool)         ; line or vector; bool => vector;
-                                            ;   from (x1,y1) to (~x2,~y2)
-                                            ;   as close as possible
-                                            ;   (synonym for connect~xy with 
-                                            ;   an infinite tolerance when
-                                            ;   draw-bezier-lines is #f, or
-                                            ;   for curve when draw-bezier-lines
-                                            ;   is #t)
-   `(dconnect ,x ,y ,dx ,dy ,bool)          ; line or vector; bool => vector;
-                                            ;   from (x,y) to (~(x+dx),~(y+dy))
-                                            ;   as close as possible (uses
-                                            ;   connect)
-   `(connect~y ,tol ,x1 ,y2 ,x2 ,y2 ,bool)  ; sequence of lines from
-                                            ;  (~x1,~y1) to (~x2,~y2) where
-                                            ;  either: 
-                                            ;    1) ~x2=x2 and |~y2-y2|<tol
-                                            ;    2) ~y2=y2 and |~x2-x2|<tol and 
-                                            ;       the final line is vertical
-   `(connect~x ,tol ,x1 ,y2 ,x2 ,y2 ,bool)  ; like connect~y, but either:
-                                            ;    1) ~x2=x2 and |~y2-y2|<tol
-                                            ;       the final line is horizontal
-                                            ;    2) ~y2=y2 and |~x2-x2|<tol
-   `(connect~xy ,tol ,x1 ,y2 ,x2 ,y2 ,bool) ; like connect~y, but either:
-                                            ;    1) ~x2=x2 and |~y2-y2|<tol
-                                            ;       the final line is horizontal
-                                            ;    2) ~y2=y2 and |~x2-x2|<tol
-                                            ;       the final line is vertical
-                                            ;    3) |(x2,y2)-(~x2,~y2)|<tol
-   `(curve ,x1 ,y1 ,x2 ,y2 ,xc ,yc ,d)      ; bezier curve; d is optional density
-                                            ;  for LaTeX; the default d is 1.0
-
-  [Notes: curve can generate more precise lines than connect~, but it usually 
-          requires more LaTeX memory.]
-
-Putables:
----------
-
-A putable is one of the following:
-   draw
-   `(line ,dh ,dv ,hlen)       ; LaTeX-style line - slope and size is limited
-   `(vector ,dh ,dv ,hlen)     ; LaTeX-style vector - slope and size is limited
-   `(circle ,d)                ; LaTeX-style circle - size is limited
-   `(circle* ,d)
-   `(frame ,draw)
-   `(colorbox ,color-str ,draw)
-   `(oval ,str ,w ,h)  ; str is portion a la LaTeX: e.g., "" or "[bl]";
-                       ;  the oval is centered at the put position, instead of
-                       ;  bl-aligned
-   ; plus some more undocumented ones...
-
-Draws:
-------
-
-A draw is one of the following:
-   string ; latex string
-   `(picture ,w ,h ,@command-list)
-   `(color ,color-string ,draw)
-   `(thickness ,thickness ,draw) ; thickness is thicklines or thinlines
-
-------------------------------------------------------------
-_slideshow-run.ss_ and _slideshow.ss_
-------------------------------------------------------------
-
-The "slideshow-run.ss" and "slideshow.ss" modules simply re-export
-`slideshow/run' and `slideshow/slideshow'
-for backward compatibility.
-
-See the "slideshow" collection for more details.
-
-------------------------------------------------------------
-_balloon.ss_
-------------------------------------------------------------
-
-The "balloon.ss" module produce functions for creating and placing
-cartoon-speech balloons.
-
-> (wrap-balloon pict spike-sym dx dy [color corner-radius])
-
-Superimposes `pict' on top of a balloon that wraps it.
-
-The `spike-sym' indicates the corner from which a spike protrudes from
-the balloon (i.e., the spike that points to whatever the balloon is
-about). It's one of 'n, 's, 'e, 'w, 'ne, 'se, 'sw, or 'nw.
-
-The `dx' and `dy' arguments specify how far the spike should protrude.
-For a 'w spike, `dx' should be negative, etc.
-
-The `color' argument is the background color for the balloon. It
-defaults to `balloon-color'.
-
-The result is a balloon, not a pict. The `balloon-pict' function
-extracts a pict whose bounding box does not include the spike, but
-includes the rest of the image. (The `balloon-point-x' and
-`balloon-point-y' functions specify the location of the spike point.)
-
-> (pip-wrap-balloon pict spike-sym dx dy [color corner-radius])
-
-Like `wrap-balloon', but produces a zero-sized pict suitable for use
-with `pin-over'.
-
-> (pin-balloon balloon pict to-pict find-to-pos)
-> (pin-balloon balloon pict x y)
-
-Superimposes the pict in `balloon' onto `pict' to produce a new
-pict. The balloon is positioned so that its spike points to the
-location specified by either `x' and `y' (numbers) or `to-pict' and
-`find-to-pos'. In the latter case, `to-pict' is a sub-pict in `pict'
-and `find-to-pos' is a function like `lt-find'.
-
-The resulting pict has the same bounding box, descent, and ascent as
-`pict', even if the balloon extends beyond the bounding box.
-
-> (place-balloon balloon pict to-pict find-to-pos)
-> (place-balloon balloon pict x y)
-
-Obsolete version of `pin-balloon' where `find-to-pos' is a function
-like `find-lt' (i.e., the y result is flipped).
-
-> (balloon w h corner-radius spike-pos dx dy color)
-
-Creates a balloon, much like `wrap-balloon' except that the balloon's
-width is `w' and its height is `h'. The `corner-radius' argument
-specifies the radius for the balloon's rounded corners; if the radius
-is positive, the value is used as the radius of the rounded corner,
-but if radius is negative, the absolute value is used as the
-proportion of the smallest dimension of the balloon.
-
-> (make-balloon pict num num) -> balloon
-> (balloon-pict balloon)      -> pict
-> (balloon-point-x balloon)   -> num
-> (balloon-point-y balloon)   -> num
-> (balloon? v)                -> bool
-
-A balloon value encapsulates a pict and the position of the balloon's
-spike relative to the balloon's top-left corner.
-
-> balloon-color
-
-The default background color for a balloon.
-
-------------------------------------------------------------
-_face.ss_
-------------------------------------------------------------
-
-The "face.ss" module provides functions for a kind of
-Mr.-Potatohead-style face library. The _face-demo.ss_ module
-implements an interactive browser for face configurations.
-
-> default-face-color - orange
-
-> (face mood-symbol [color]) - returns a pict a pre-configured face
-  with the given base color. The built-in configurations, selected by
-  mood-symbol, are as follows:
-
-    'unhappy - (face* 'none 'plain #t default-face-color 6)
-    'sortof-unhappy - (face* 'worried 'grimace #t default-face-color 6)
-    'sortof-happy - (face* 'worried 'medium #f default-face-color 6)
-    'happy - (face* 'none 'plain #f default-face-color 6)
-    'happier - (face* 'none 'large #f default-face-color 3)
-    'embarrassed - (face* 'worried 'medium #f default-face-color 3)
-    'badly-embarrassed - (face* 'worried 'medium #t default-face-color 3)
-    'unhappier - (face* 'normal 'large #t default-face-color 3)
-    'happiest - (face* 'normal 'huge #f default-face-color 0 -3)
-    'unhappiest - (face* 'normal 'huge #t default-face-color 0 -3)
-    'mad - (face* 'angry 'grimace #t default-face-color 0)
-    'mean - (face* 'angry 'narrow #f default-face-color 0)
-    'surprised - (face* 'worried 'oh #t default-face-color -4 -3 2)
-
-> (face* eyebrow-kind mouth-kind frown? [color eye-inset eyebrow-dy pupil-dx pupil-dy])
-  - returns a pict for a configured face:
-
-      - eyebrow-kind is one of 'none, 'normal, 'worried, or 'angry
-      - mouth-kind is one of 'plain, 'narrow, 'medium, 'large, 'huge, 
-                             'grimace, 'oh, or 'tongue
-      - frown? determines whether the mouth is up or down
-      - color is either a color string or a color% object
-      - eye-inset adjusts the eye size; recommend values: between 0 and 10
-      - eyebrow-dy adjusts the eyebrows; recommend values: between -5 and 5
-      - pupil-dx adjusts the pupil; recommend values: between -10 and 10
-      - pupil-dy adjusts the pupil; recommend values: between -15 and 15
-
-In addition to the above, the function also accepts these keywords,
-each of which is a boolean. With the exception of the last one, they
-control if there is a shading on a particular feature in the face
-(shading tends to look worse than just anti-aliasing when the face is
-small). The last one controls the visibility of the teeth.
-
- #:eyebrow-shading?
- #:mouth-shading?
- #:eye-shading?
- #:tongue-shading?
- #:face-background-shading?
- #:teeth?
-
-------------------------------------------------------------
-_flash.ss_
-------------------------------------------------------------
-
-> (filled-flash width height [points spike-fraction rotation])
-  - returns a pict for a "flash" (a spiky oval, like the
-    yellow background that goes behind a "New!" logo).
-  
-    The `height' and `width' arguments determine the size of the oval
-    in which the flash is drawn, prior to rotation. The actual height
-    and width may be smaller if `points' is not a multiple of 4, and
-    the actuall height and width will be different if the flash is
-    rotated.
-
-    The `points' argument defaults to 10, and it determines
-    the number of points on the flash. 
-
-    The `spike-fraction' argument determines how big the flash spikes
-    are compared to the bounding oval. It should be a value between 0
-    and 1 (exclusive), and the default is 0.25.
-
-    The `rotation' argument specifies an angle in radians for
-    counter-clockwise rotation.
-
-    The flash is drawn in the default color.
-
-> (outline-flash width height [points spike-fraction rotation])
-   - like `filled-flash', but drawing only the outline.
-
-------------------------------------------------------------
-_code.ss_
-------------------------------------------------------------
-
-The "code.ss" module provides a unit for typesetting Scheme code a la
-SlaTeX.
-
-The _code@_ unit imports _code-params^_ and exports _code^_.  The
-_code-params^_ signature contains two elements:
-
-   current-font-size - a thunk to obtain the font size to use for
-                       text
-   line-sep - an integer for the amount of space (in drawing units) to
-              insert between lines of text
-
-The _code^_ unit supplies the following
-
-> (typeset-code stx) - produces a pict for code in the given
-  syntax object. The source-location information of the
-  syntax object determines the line breaks, line indenting,
-  and space within a row.  Empty rows are ignored. (Beware
-  that if you use read-syntax on a file port, you may have
-  to turn on line counting via port-count-lines! for the
-  code to typeset properly.)
-
-  Normally, `typeset-code' is used through a macro (often called
-  `code') that is generated by `define-code'. See below for more
-  information.
-
-  Embedded picts within `stx' are used directly. Row elements are
-  combined using `htl-append', so use `code-align' (see below) as
-  necessary to add an ascent to ascentless picts.
-
-  The resulting pict is actually an instance of code-pict, which is a
-  sub-type of `pict'. When an embedded pict in `stx' is a code-pict,
-  then elements (such as closing parens) are added after the code-pict
-  based on the code-pict's bottom line, instead of the code-pict's
-  bounding box. See also `code-pict-bottom-line-pict' and
-  `pict->code-pict'.
-
-  An identifier that starts with an underscore is italicized in the
-  pict and the underscore is dropped, unless the
-  `code-italic-underscore-enabled' parameter is set to false. Also,
-  unless `code-scripts-enabled' is set to false, underscores and
-  carets in the middle of a word create superscripts and subscripts
-  (like TeX); for example `foo^4_ok' is displayed as the identifier
-  "foo" with a "4" superscript and an "ok" subscript.
-
-  Further, uses of certain keywords in `stx' typeset specially:
-
->    code:blank - produces a space
->    (code:comment s ...) - produces a comment block, with each `s'
-                            on its own line; each `s' must be a string
-                            or a pict
->    (code:line datum ...) - typesets the `datum' sequence, mostly useful
-                             for the top-level sequence, since 
-                             `typeset-code' takes only one argument
->    (code:contract datum ...) - like code:line, but every `datum' is
-                                 colored as a comment, and a semi-colon
-                                 is prefixed to every line
->    (code:template datum ...) - like code:line, but a semi-colon
-                                 is prefixed to every line
->     $                        - typesets as a vertical bar (for no
-                                 particularly good reason)
-
-> current-code-font - parameter for a base font used to typeset text.
-  The default is `(bold . modern).
-> current-code-tt - parameter for a one-argument procedure to turn a
-  string into a pict, used to typeset text. The default is
-    (lambda (s) (text s (current-code-font) (current-font-size)))
-  This procedure is not used to typeset subscripts or other items
-  that require font changes, but `current-code-font' is always used.
-
-> current-comment-color - parameter for a string or color% for comments
-> current-keyword-color - parameter for a string or color% for keywords
-> current-id-color - parameter for a string or color% for identifiers
-> current-literal-color - parameter for a string or color% for literals
-> current-const-color - parameter for a string or color% for constants
-> current-base-color - parameter for a string or color% for everything else
-
-> current-reader-forms - parameter for a list of symbols indicating
-  which built-in reader forms should be used; the default is '(quote
-  quasiquote unquote unquote-splicing syntax quasisyntax unsyntax
-  unsyntax-splicing); remove a symbol to suppress the corresponding
-  reader output
-
-The following four are for backward compatibility:
-> comment-color - default string/color% for comments
-> keyword-color - default string/color% for keywords
-> id-color - default string/color% for ids
-> literal-color - default string/color% for literals
-
-> (code-align pict) - adjusts the ascent of `pict' so that its bottom
-  aligns with the baseline for text; use this function when `pict'
-  has no ascent.
-
-> current-keyword-list - a parameter, a list of strings to color as
-  keywords; the default includes the Racket syntactic form names
-> current-const-list - a parameter, a list of strings to color as
-  constants; the default is empty
-> current-literal-list - a parameter, a list of strings to color as
-  literals; the default is empty
-
-> mzscheme-const-list - a list of strings that could be used to initialize
-  the `current-const-list' parameter
-
-> code-colorize-enabled - a parameter to enable or disable all code
-  coloring; the default is #t
-
-> code-colorize-quote-enabled - a parameter to control whether everything
-  under a quote is colorized as a literal (like DrRacket's Check Syntax,
-  and unlike DrRacket's interactive text coloring); the default is #t
-
-> code-italic-underscore-enabled - a boolean parameter to control
-  whether underscore-prefixed identifiers are italicized (dropping
-  the underscore); the default is #t
-
-> code-scripts-enabled - a boolean parameter to control whether
-  TeX-style subscripts and subscripts are recognized in an identifier
-
-> (code-pict-bottom-line-pict pict) - returns a pict inside of the
-  given code-pict that represents the end of the code-pict's bottom
-  line; if `pict' is a pict but not a code-pict, the result is #f
-
-> (pict->code-pict pict bl-pict-or-false) - returns a code-pict if
-  `bl-pict-of-false' is not false; the code-pict is like the given
-  `pict', except that it reports `bl-pict-or-false' as its bottom-line
-  pict (for adding closing parens after, etc.)
-
-
-In addition to the `code@' unit, the "code.ss" module exports a
-`define-code' macro for defining other macros:
-
-> (define-code code-id typeset-code-id) 
-> (define-code code-id typeset-code-id escape-id)
-
-  Defines `code-id' as a macro that uses `typeset-code-id', which is a
-  function with the same input as `typeset-code'. The `escape-id' form
-  defaults to `unsyntax'.
-
-  The `code-id' syntactic form takes a sequence of `datum's:
-
-    (code datum ...)
-
-  It produces a pict that typesets the sequence. Source-location
-  information for the `datum' determine the layout of code in the
-  resulting pict. A pict datum is drawn as itself.
-
-  If a `datum' contains `(escape-id expr)' (perhaps as #,expr when
-  `escape-id' is `unsyntax'), then the `expr' is evaluated and the
-  result datum is spliced in place of the `unsyntax' form in
-  `datum'. If the result is not a syntax object, it is given the
-  source location of the `(unsyntax expr)'.
-
-  The `code' syntactic form expands to a use of `typeset-code'. The
-  `datum's are not merely syntax-quoted, because then the compiled
-  form of the call would loose source information. Instead, `code'
-  expands to an expression that preserves expansion-time
-  source-location information.
diff --git a/pkgs/pict-pkgs/pict-lib/texpict/face.rkt b/pkgs/pict-pkgs/pict-lib/texpict/face.rkt
deleted file mode 100644
index 7a7ebd1754..0000000000
--- a/pkgs/pict-pkgs/pict-lib/texpict/face.rkt
+++ /dev/null
@@ -1,387 +0,0 @@
-(module face mzscheme
-  (require racket/draw
-           pict/private/pict
-           pict/private/utils
-           mzlib/class
-           mzlib/math
-           mzlib/etc
-           mzlib/kw)
-
-  (provide face face* default-face-color)
-  
-  (define no-brush (find-brush "white" 'transparent))
-  (define no-pen (find-pen "white" 1 'transparent))
-
-  (define (series dc steps start-c end-c f pen? brush?)
-    (color-series dc steps #e0.5 start-c end-c f pen? brush?))
-
-  (define default-face-color (make-object color% "orange"))
-
-  (define face*
-    (lambda/kw (eyebrows-kind
-                mouth-kind
-                frown?
-                #:optional
-                [in-face-color default-face-color]
-                [eye-inset 0]
-                [eyebrow-dy 0]
-                [eye-dx 0]
-                [eye-dy 0]
-                #:key
-                (mouth-shading? #t)
-                (eye-shading? #t)
-                (eyebrow-shading? #t)
-                (tongue-shading? #t)
-                (face-background-shading? #t)
-                (teeth? #t))
-               
-      (define face-color (if (string? in-face-color)
-                             (make-object color% in-face-color)
-                             in-face-color))
-      (define face-bright-edge-color (scale-color #e1.6 face-color))
-      (define face-edge-color (scale-color #e0.8 face-color))
-      (define face-dark-edge-color (scale-color #e0.6 face-color))
-      (define face-hard-edge-color (scale-color #e0.8 face-edge-color))
-      (let ([w 300]
-            [h 300])
-          (dc (lambda (dc x y)
-                (define old-pen (send dc get-pen))
-                (define old-brush (send dc get-brush))
-                
-                (define (one-eye l? p? dd look?)
-                  (define s (if p? 1/3 1))
-                  (define sdd (if p? 1 1/2))
-                  (define dx (+ (if p? (* 1/5 w 1/3) 0) (if look? eye-dx 0)))
-                  (define dy (+ (if p? (* 1/4 w 1/3) 0) (if look? eye-dy 0)))
-                  (send dc draw-ellipse
-                        (+ x (* w (if l? 1/5 3/5)) dx (* dd sdd)) (+ y (* h 1/5) dy (* dd sdd))
-                        (- (* w 1/5 s) (* 2 dd)) (- (* h 1/4 s) (* 2 dd))))
-                
-                (define (one-eye-brow l? dd dy dr)
-                  (send dc draw-arc
-                        (+ x (* w (if l? 1/5 3/5)))
-                        (+ y (* h 3/20) dd dy)
-                        (* w 1/5) 
-                        (* h 1/4)
-                        ((if l? + -) (* pi 1/3) dr) ((if l? + -) (* pi 2/3) dr)))
-                
-                (define (eye-series steps start-c end-c p? extra-inset look?)
-                  (series dc
-                          (if eye-shading? steps 0)
-                          start-c end-c
-                          (lambda (i)
-                            (one-eye #t p? (+ extra-inset i) look?)
-                            (one-eye #f p? (+ extra-inset i) look?))
-                          #f #t))
-                
-                (define (eyebrows dy dr)
-                  (send dc set-brush no-brush)
-                  (series dc
-                          (if eyebrow-shading? 3 0)
-                          face-hard-edge-color
-                          face-edge-color
-                          (lambda (i)
-                            (one-eye-brow #t i dy dr)
-                            (one-eye-brow #f i dy dr))
-                          #t #f)
-                  (send dc set-pen no-pen))
-                
-                (define (normal-eyebrows dy)
-                  (eyebrows dy 0))
-                
-                (define (worried-eyebrows dy)
-                  (eyebrows dy 0.3))
-                
-                (define (angry-eyebrows dy)
-                  (eyebrows dy -0.3))
-                
-                (define (smile sw sh i da path dy flip?)
-                  ;; Either draw or set path.
-                  ((if path 
-                       (lambda (x y w h s e)
-			 (send path arc x y w h s e))
-                       (lambda (x y w h s e)
-                         (send dc draw-arc x y w h s e)))
-                   (+ x (/ (- w sw) 2) (* 1/6 sw)) 
-                   (+ y (/ (- sh h) 2) (* 1/8 h) dy (if flip? i 0) (if flip? (- (* h 1/2) (- sh h)) 0))
-                   (* sw 2/3) (+ (if flip? 0 i) (* h 2/3))
-                   (- (* pi (- 5/4 (if flip? 1 0))) da) (+ (* pi (- 7/4 (if flip? 1 0))) da)))
-                
-                (define (plain-smile flip? tongue? narrow?)
-		  (send dc set-brush no-brush)
-		  (series dc 
-                          (if mouth-shading? 3 0)
-                          (make-object color% "black")
-                          face-edge-color
-                          (lambda (i)
-                            (let ([da (if narrow? (* pi -1/8) 0)])
-                              (smile w h i da #f 0 flip?)
-                              (smile w h (+ 1 (- i)) da #f 0 flip?)))
-                          #t #f)
-		  (when tongue?
-		    (let ([path (new dc-path%)]
-			  [rgn (make-object region% dc)])
-		      (smile w h 2 0 path 0 flip?)
-		      (send path line-to (+ w x) (+ h y))
-		      (send path line-to x (+ h y))
-		      (send rgn set-path path)
-		      (send dc set-clipping-region rgn)
-		      (send dc set-pen no-pen)
-		      (let ([dx (+ x (if flip?
-					 (* 1/3 w)
-					 (* 1/2 w)))]
-			    [dy (+ y (if flip?
-					 (* 1/2 h)
-					 (* 13/20 h)))]
-			    [tw (* 1/5 w)]
-			    [th (* 1/4 h)])
-			(series dc
-                                (if tongue-shading? 3 0)
-				face-color
-				(make-object color% "red")
-				(lambda (i)
-				  (send dc draw-ellipse dx dy (- tw i) (- th i)))
-				#f #t)
-			(series dc 
-                                (if tongue-shading? 4 0)
-				(make-object color% "black")
-				(scale-color 0.6 (make-object color% "red"))
-				(lambda (i)
-				  (send dc draw-line (- (+ dx i) (* tw 1/10)) dy (+ dx (* tw 0.65)) (+ dy (* th 0.75))))
-				#t #f)
-			(send dc set-clipping-region #f)))))
-                
-                (define (teeth)
-                  ;; Assumes clipping region is set
-                  (send dc set-brush (find-brush "white"))
-                  (send dc draw-ellipse x y w h)
-                  (when teeth?
-                    (series dc 
-                            5
-                            (make-object color% "darkgray")
-                            (make-object color% "lightgray")
-                            (lambda (i)
-                              (let loop ([j 0][delta 0][tw (* w 1/10)])
-                                (unless (= j 5)
-                                  (send dc draw-rectangle
-                                        (+ x (* w 1/2) delta 1) y
-                                        (- tw i 1) h)
-                                  (send dc draw-rectangle
-                                        (+ x (* w 1/2) (- delta) (- tw) 1) y
-                                        (- tw i 1) h)
-                                  (loop (add1 j) (+ delta tw) (* 8/10 tw)))))
-                            #f #t)))
-                
-                (define (toothy-smile tw th ta bw bh ba flip? ddy)
-                  (let-values ([(path) (make-object dc-path%)]
-			       [(tmp-rgn1) (make-object region% dc)]
-                               [(dy) (+ ddy (/ (- h (if flip? (+ th (abs (- bh th))) th)) 2))])
-                    ;; Teeth:
-                    (smile tw th 0 ta path dy flip?)
-		    (send path reverse)
-                    (smile bw bh 0 ba path dy flip?)
-		    (send tmp-rgn1 set-path path)
-                    (send dc set-clipping-region tmp-rgn1)
-                    (teeth)
-                    (send dc set-clipping-region #f)
-                    
-                    ;; Smile edges:
-                    (send dc set-brush no-brush)
-                    (series dc 
-                            (if mouth-shading? 3 0)
-                            (if flip? face-bright-edge-color face-hard-edge-color)
-                            (if flip? face-color face-edge-color)
-                            (lambda (i)
-                              (smile bw bh (if flip? i (- i)) ba #f dy flip?))
-                            #t #f)
-                    (series dc
-                            (if mouth-shading? 3 0)
-                            (if flip? face-hard-edge-color face-bright-edge-color)
-                            (if flip? face-edge-color face-color)
-                            (lambda (i)
-                              (smile tw th (if flip? (- i) i) ta #f dy flip?))
-                            #t #f)))
-                
-                (define (grimace tw th ta flip?)
-                  (let-values ([(path) (make-object dc-path%)]
-                               [(tmp-rgn1) (make-object region% dc)]
-                               [(dy) (/ (- h th) 2)]
-                               [(elx ely) (values (+ x (* w 0.27)) (+ y (* h 0.65) (if flip? 3 1)))])
-                    ;; Teeth:
-		    (smile tw th 0 ta path (+ (if flip? -30 0) dy) flip?)
-		    (send path arc elx ely 30 30 (* 1/2 pi) (* 3/2 pi) #t)
-		    (send path reverse)
-		    (send path arc (- (+ x w) (- elx x) 30) ely 30 30 (* 1/2 pi) (* 3/2 pi) #f)
-		    (smile tw th 0 ta path (+ (if flip? 0 -30) dy) flip?)
-                    (send tmp-rgn1 set-path path)
-                    (send dc set-clipping-region tmp-rgn1)
-		    (teeth)
-                    (send dc set-clipping-region #f)
-		    
-                    ;; Smile edges:
-                    (send dc set-brush no-brush)
-                    (let ([sides (lambda (top? i)
-                                   (send dc draw-arc (- elx (/ i 2)) (- ely (/ i 2)) 30 (+ 30 i) 
-                                         (* pi (if top? 1 1/2)) (* pi (if top? 3/2 1)))
-                                   (send dc draw-arc (+ (- (+ x w) (- elx x) 30) (/ i 2)) (- ely (/ i 2)) 30 (+ 30 i) 
-                                         (* pi (if top? -1/2 0)) (* pi (if top? 0 1/2))))])
-                      (series dc 
-                              (if mouth-shading? 3 0)
-                              (if flip? face-bright-edge-color face-hard-edge-color)
-                              (if flip? face-color face-edge-color)
-                              (lambda (i)
-                                (sides flip? i)
-                                (smile tw th (if flip? i (- i)) ta #f (+ (if flip? -2 -30) dy) flip?))
-                              #t #f)
-                      (series dc 
-                              (if mouth-shading? 3 0)
-                              (if flip? face-hard-edge-color face-bright-edge-color)
-                              (if flip? face-edge-color face-color)
-                              (lambda (i)
-                                (sides (not flip?) i)
-                                (smile tw th (if flip? (- i) i) ta #f (+ (if flip? -30 0) dy) flip?))
-                              #t #f))))
-                
-                (define (medium-grimace flip?)
-                  (grimace
-                   (* 1.2 w) (* h 0.9) (- (* 0.1 pi)) 
-                   flip?))
-                
-                (define (narrow-grimace flip?)
-                  (grimace
-                   (* 1.2 w) (* h 0.9) (- (* 0.1 pi))
-                   flip?))
-                
-                (define (large-smile flip?)
-                  (toothy-smile
-                   w (* 1.05 h) (* 0.10 pi)
-                   (* 1.1 w) (* h 0.95) (* 0.05 pi)
-                   flip? 0))
-                
-                (define (largest-smile flip?)            
-                  (toothy-smile
-                   w (* 1.1 h) (* 0.14 pi)
-                   (* 1.2 w) (* h 0.9) (* 0.05 pi)
-                   flip? (if flip? (* h 0.1) 0)))
-                
-                (define (narrow-smile flip?)
-                  (toothy-smile
-                   (* 0.8 w) (* h 0.7) (- (* 0.00 pi))
-                   (* 1.0 w) (* h 0.6) (- (* 0.06 pi))
-                   flip? (if flip? (- (* h 0.2)) 0)))
-                
-                (define (medium-smile flip?)
-                  (toothy-smile
-                   (* 0.8 w) (* h 0.9) (* 0.08 pi)
-                   (* 1.0 w) (* h 0.75) (- (* 0.01 pi))
-                   flip? 0))
-                
-                (define (oh)
-                  (let ([do-draw
-                         (λ (i)
-                           (let ([sw (* w 7/20)]
-                                 [sh (* h 8/20)])
-                             (send dc draw-ellipse
-                                   (+ x i (/ (- w sw) 2))
-                                   (+ y (* i .75) (* h 1/4) (* h -1/16) (/ (- h sh) 2))
-                                   (- sw (* i 2))
-                                   (- sh (* i 2)))))])
-                    (series dc 
-                            (if mouth-shading? 5 0)
-                            face-color
-                            face-dark-edge-color
-                            do-draw
-                            #t #t)
-                    (send dc set-brush (find-brush "black"))
-                    (send dc set-pen no-pen)
-                    (do-draw 9)))
-                
-                (define (draw-eyes inset)
-                  ;; Draw eyes
-                  (eye-series 10 
-                              (make-object color% "lightgray")
-                              (make-object color% "white")
-                              #f
-                              inset
-                              #f)
-                  
-                  ;; Draw pupils
-                  (eye-series 3
-                              (make-object color% 220 220 220)
-                              (make-object color% "black")
-                              #t
-                              0
-                              #t))
-                
-                (send dc set-pen no-pen)
-                
-                ;; Draw face background
-                (series dc
-                        (if face-background-shading? 3 0)
-                        face-edge-color
-                        face-color
-                        (lambda (i)
-                          (send dc draw-ellipse 
-                                (+ x (/ i 2)) (+ y (/ i 2))
-                                (- w (* 2 i)) (- h (* 2 i))))
-                        #f #t)
-
-		(draw-eyes eye-inset)
-		(case eyebrows-kind
-		  [(normal) (normal-eyebrows eyebrow-dy)]
-		  [(worried) (worried-eyebrows eyebrow-dy)]
-		  [(angry) (angry-eyebrows eyebrow-dy)]
-		  [(none) (void)])
-		(case mouth-kind
-		  [(plain) (plain-smile frown? #f #f)]
-		  [(smaller) (plain-smile frown? #f #t)]
-                  [(narrow) (narrow-smile frown?)]
-		  [(medium) (medium-smile frown?)]
-		  [(large) (large-smile frown?)]
-		  [(huge) (largest-smile frown?)]
-		  [(grimace) (medium-grimace frown?)]
-                  [(oh) (oh)]
-		  [(tongue) (plain-smile frown? #t #f)])
-                
-                (send dc set-brush old-brush)
-                (send dc set-pen old-pen))
-              w h 0 0))))
-
-  (define-syntax (case/good-error-message stx)
-    (syntax-case stx (else)
-      [(_ test [(sym ...) e] ... [else x last-e])
-       (syntax
-        (case test 
-          [(sym ...) e]  ...
-          [else (let ([x (apply append '((sym ...) ...))]) last-e)]))]))
-      
-  (define face
-    (opt-lambda (mood [face-color default-face-color])
-      (case/good-error-message mood
-	[(unhappy)
-	 (face* 'none 'plain #t face-color 6)]
-	[(sortof-happy)
-	 (face* 'worried 'medium #f face-color 6)]
-	[(sortof-unhappy)
-	 (face* 'worried 'grimace #t face-color 6)]
-	[(happy)
-	 (face* 'none 'plain #f face-color 6)]
-	[(happier)
-	 (face* 'none 'large #f face-color 3)]
-	[(embarrassed embarassed) ; keep older misspelled name
-	 (face* 'worried 'medium #f face-color 3)]
-	[(badly-embarrassed badly-embarassed) ; here too
-	 (face* 'worried 'medium #t face-color 3)]
-	[(unhappier)
-	 (face* 'normal 'large #t face-color 3)]
-	[(happiest)
-	 (face* 'normal 'huge #f face-color 0 -3)]
-	[(unhappiest)
-	 (face* 'normal 'huge #t face-color 0 -3)]
-        [(mad)
-         (face* 'angry 'grimace #t face-color 0)]
-        [(mean)
-         (face* 'angry 'narrow #f face-color 0)]
-        [(surprised)
-         (face* 'worried 'oh #t face-color -4 -3 2)]
-	[else all-ids (error 'face "unknown mood: ~e, expected one of ~s" mood all-ids)]))))
diff --git a/pkgs/pict-pkgs/pict-lib/texpict/flash.rkt b/pkgs/pict-pkgs/pict-lib/texpict/flash.rkt
deleted file mode 100644
index 9a90fa44e0..0000000000
--- a/pkgs/pict-pkgs/pict-lib/texpict/flash.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-(module flash mzscheme
-  (require pict/private/pict
-           mzlib/math
-           mzlib/etc
-           racket/draw
-           mzlib/class)
-
-  (provide filled-flash
-           outline-flash)
-
-  (define-syntax define-flash
-    (syntax-rules ()
-      [(_ id filled?)
-       (define id
-	 (opt-lambda (w h [points 10] [spike-fraction 0.25] [rotation 0])
-	   (do-flash filled? w h points spike-fraction rotation)))]))
-
-  (define-flash filled-flash #t)
-  (define-flash outline-flash #f)
-
-  (define no-brush
-    (send the-brush-list find-or-create-brush "white" 'transparent))
-
-  (define do-flash
-    (lambda (filled? w h points spike-fraction rotation)
-      (let ([p (new dc-path%)]
-            [delta (/ pi points)]
-            [in (- 1 spike-fraction)])
-        (send p move-to 1 0)
-        (let loop ([angle delta][points (sub1 points)])
-          (send p line-to (* in (cos angle)) (* in (sin angle)))
-          (unless (zero? points)
-            (let ([angle (+ angle delta)])
-              (send p line-to (cos angle) (sin angle))
-              (loop (+ angle delta) (sub1 points)))))
-        (send p close)
-        (send p scale (/ w 2) (/ h 2))
-        (unless (zero? rotation)
-          (send p rotate rotation))        
-        (let-values ([(bx by bw bh) (send p get-bounding-box)])
-          (send p translate (- bx) (- by))
-          (dc (lambda (dc x y)
-		(let ([b (send dc get-brush)])
-		  (if filled?
-                      (send dc set-brush (send (send dc get-pen) get-color) 'solid)
-                      (send dc set-brush no-brush))
-		  (send dc draw-path p x y)
-                  (send dc set-brush b)))
-              bw bh))))))
diff --git a/pkgs/pict-pkgs/pict-lib/texpict/mrpict.rkt b/pkgs/pict-pkgs/pict-lib/texpict/mrpict.rkt
deleted file mode 100644
index b2e43452f9..0000000000
--- a/pkgs/pict-pkgs/pict-lib/texpict/mrpict.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require pict/private/pict)
-(provide (all-from-out pict/private/pict))
-
diff --git a/pkgs/pict-pkgs/pict-lib/texpict/utils.rkt b/pkgs/pict-pkgs/pict-lib/texpict/utils.rkt
deleted file mode 100644
index ee70eb2ed7..0000000000
--- a/pkgs/pict-pkgs/pict-lib/texpict/utils.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pict/private/utils)
-(provide (all-from-out pict/private/utils))
diff --git a/pkgs/pict-pkgs/pict/LICENSE.txt b/pkgs/pict-pkgs/pict/LICENSE.txt
deleted file mode 100644
index 92d15fd09e..0000000000
--- a/pkgs/pict-pkgs/pict/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-pict
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/pict-pkgs/pict/info.rkt b/pkgs/pict-pkgs/pict/info.rkt
deleted file mode 100644
index dc4341b2c5..0000000000
--- a/pkgs/pict-pkgs/pict/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("pict-lib"
-               "pict-doc"))
-(define implies '("pict-lib"
-                  "pict-doc"))
-
-(define pkg-desc "Building pictures with functional combinators")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/pict-snip-pkgs/pict-snip-doc/info.rkt b/pkgs/pict-snip-pkgs/pict-snip-doc/info.rkt
deleted file mode 100644
index 1bf5648456..0000000000
--- a/pkgs/pict-snip-pkgs/pict-snip-doc/info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("pict-snip-lib"
-                     "gui-doc"
-                     "pict-doc"
-                     "pict-lib"
-                     "racket-doc"
-                     "scribble-lib"
-                     "snip-lib"))
-(define deps '("base"))
-(define update-implies '("pict-snip-lib"))
-
-(define pkg-desc "documentation part of \"pict\"")
-
-(define pkg-authors '(robby))
diff --git a/pkgs/pict-snip-pkgs/pict-snip-doc/scribblings/info.rkt b/pkgs/pict-snip-pkgs/pict-snip-doc/scribblings/info.rkt
deleted file mode 100644
index 3ef64a1dbd..0000000000
--- a/pkgs/pict-snip-pkgs/pict-snip-doc/scribblings/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define scribblings 
-  '(("pict-snip/pict-snip.scrbl" (multi-page) (gui-library 100))))
diff --git a/pkgs/pict-snip-pkgs/pict-snip-doc/scribblings/pict-snip/pict-snip.scrbl b/pkgs/pict-snip-pkgs/pict-snip-doc/scribblings/pict-snip/pict-snip.scrbl
deleted file mode 100644
index 111fd91fd2..0000000000
--- a/pkgs/pict-snip-pkgs/pict-snip-doc/scribblings/pict-snip/pict-snip.scrbl
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang scribble/doc
-@(require 
-   scribble/manual
-   (for-label
-    pict/snip
-    pict
-    racket
-    racket/snip
-    racket/contract))
-
-
-@title{Pict Snip: Build Snips from Picts}
-
-@defmodule[pict/snip]{ 
-  The @racketmodname[pict/snip] library
-  constructs @racket[snip%] instances that
-  draw based on a given @racket[pict?] object.
-}
-
-@defclass[pict-snip% snip% ()]{
-  @defconstructor[([pict pict?])]{
-    Creates a @racket[pict-snip%] object, using
-    @racket[pict] to draw.
-  }
-  @defmethod[(get-pict) pict?]{
-    Returns the pict passed to the constructor.
-  }
-  
-  @defmethod[(get-extent [dc (is-a?/c dc<%>)] [x real?] [y real?]
-                         [w (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                         [h (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                         [descent (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                         [lspace (or/c (box/c (and/c real? (not/c negative?))) #f)]
-                         [rspace (or/c (box/c (and/c real? (not/c negative?))) #f)])
-             void?]{
-    Updates the arguments based on the 
-    size of the pict returned from @racket[get-pict].
-  }
-
-  @defmethod[#:mode 
-             override
-             (draw [dc (is-a?/c dc<%>)] [x real?] [y real?]
-                   [left real?]
-                   [top real?]
-                   [right real?]
-                   [bottom real?]
-                   [dx real?]
-                   [dy real?]
-                   [draw-caret (or/c 'no-caret 'show-inactive-caret 'show-caret
-                                     (cons/c exact-nonnegative-integer?
-                                             exact-nonnegative-integer?))])
-             void?]{
-    Draws the pict returned from @racket[get-pict].
-  }
-  
-  @defmethod[(write [f (is-a?/c editor-stream-out%)]) void?]{
-    Uses a @racket[record-dc%] to write the way that the
-           result of @racket[get-pict] draws and saves that
-           to @racket[f].
-  }
-                                                                            
-  @defmethod[(copy) (is-a?/c pict-snip%)]{
-    Returns a snip that has the same pict as @racket[this] one.
- }
-  
-}
-
-@defthing[snipclass (is-a?/c snip-class%)]{
-  The @racket[snip-class%] instance used by
-      instances of @racket[pict-snip%].
-}
-@defthing[reader (is-a?/c snip-reader<%>)]{
-  The @racket[snip-reader<%>] instance used
-      by the @racketmodname[wxme] library.
-}
diff --git a/pkgs/pict-snip-pkgs/pict-snip-lib/info.rkt b/pkgs/pict-snip-pkgs/pict-snip-lib/info.rkt
deleted file mode 100644
index 822874c327..0000000000
--- a/pkgs/pict-snip-pkgs/pict-snip-lib/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("draw-lib"
-               "snip-lib"
-               "pict-lib"
-               "wxme-lib"
-               "base"))
-(define build-deps '("rackunit-lib"
-                     "gui-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"pict-snip\"")
-
-(define pkg-authors '(robby))
diff --git a/pkgs/pict-snip-pkgs/pict-snip-lib/pict/snip.rkt b/pkgs/pict-snip-pkgs/pict-snip-lib/pict/snip.rkt
deleted file mode 100644
index 306c2e7c99..0000000000
--- a/pkgs/pict-snip-pkgs/pict-snip-lib/pict/snip.rkt
+++ /dev/null
@@ -1,123 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/snip
-         racket/draw
-         racket/format
-         (prefix-in racket: racket/base)
-         pict
-         wxme)
-
-(provide snipclass
-         reader
-         pict-snip%)
-
-(define pict-snip%
-  (class snip%
-    (init-field pict)
-    (define drawer (make-pict-drawer pict))
-    (define/override (get-extent dc x y wb hb db sb lb rb)
-      (set-box/f! wb (pict-width pict))
-      (set-box/f! hb (pict-height pict))
-      (set-box/f! db (pict-descent pict))
-      (set-box/f! sb (pict-ascent pict))
-      (set-box/f! lb 0)
-      (set-box/f! rb 0))
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (define smoothing (send dc get-smoothing))
-      (send dc set-smoothing 'aligned)
-      (drawer dc x y)
-      (send dc set-smoothing smoothing))
-    (define/override (copy)
-      (new pict-snip% [pict pict]))
-    
-    (define/override (write f)
-      (define dc (new record-dc% [width (pict-width pict)] [height (pict-height pict)]))
-      (send dc set-smoothing 'aligned)
-      (drawer dc 0 0)
-      (define bp (open-output-bytes))
-      (racket:write (list (send dc get-recorded-datum)
-                          (pict-width pict)
-                          (pict-height pict)
-                          (pict-descent pict)
-                          (pict-ascent pict))
-                    bp)
-      (define bts (get-output-bytes bp))
-      (send f put (bytes-length bts) bts))
-    
-    (define/public (get-pict) pict)
-    
-    (inherit set-snipclass)
-    (super-new)
-    (set-snipclass snipclass)))
-
-(define snipclass 
-  (new (class snip-class%
-         (define/override (read f)
-           (raw-data->snip (send f get-unterminated-bytes)))
-         (super-new))))
-(send snipclass set-classname (~s '((lib "snip.rkt" "pict") (lib "snip-wxme.rkt" "pict"))))
-(send snipclass set-version 1)
-(define (set-box/f! b v) (when (box? b) (set-box! b v)))
-(send (get-the-snip-class-list) add snipclass)
-
-(define reader
-  (class* object% (snip-reader<%>)
-    (define/public (read-header version stream) (void))
-    (define/public (read-snip text-only? version stream) 
-      (cond
-        [text-only?
-         #"."]
-        [else
-         (raw-data->snip (send stream read-raw-bytes 'pict-snip%))]))
-    (super-new)))
-
-(define (raw-data->snip bts)
-  (define p (open-input-bytes bts))
-  (define saved (read p))
-  (define-values (recorded-datum w h d a) (apply values saved))
-  (define drawer (recorded-datum->procedure recorded-datum))
-  (new pict-snip%
-       [pict (dc (λ (dc dx dy)
-                   (define-values (ox oy) (send dc get-origin))
-                   (send dc set-origin (+ ox dx) (+ oy dy))
-                   (drawer dc)
-                   (send dc set-origin ox oy))
-                 w h d a)]))
-
-(module+ test
-  (require racket/gui/base
-           racket/file
-           racket/port
-           rackunit)
-  
-  (define tmp-file (make-temporary-file "pict-snip-test-case~a.rkt"))
-
-  (dynamic-wind
-   void
-   (λ ()
-     
-     ;; make sure that saving the file in graphical mode works
-     (define t1 (new text%))
-     (define disk-size 10)
-     (define a-pict (disk disk-size))
-     (send t1 insert (new pict-snip% [pict a-pict]))
-     (unless (send t1 save-file tmp-file 'standard)
-       (error 'snip.rkt "'standard didn't save properly"))
-     (define t2
-       (parameterize ([current-namespace (make-gui-namespace)])
-         (eval `(let ()
-                  (define t2 (new text%))
-                  (send t2 load-file ,tmp-file 'standard)
-                  t2))))
-     (define pict2 (send (send t2 find-first-snip) get-pict))
-     (define bytes1 (pict->argb-pixels a-pict))
-     (define bytes2 (pict->argb-pixels pict2))
-     (check-equal? bytes1 bytes2)
-     
-     ;; make sure that saving the file in text mode works
-     (unless (send t1 save-file tmp-file 'text) 
-       (error 'snip.rkt "'text didn't save properly"))
-     (define sp (open-output-string))
-     (call-with-input-file tmp-file (λ (port) (copy-port port sp)))
-     (check-equal? (get-output-string sp) "."))
-   (λ () (delete-file tmp-file))))
diff --git a/pkgs/pict-snip-pkgs/pict-snip/LICENSE.txt b/pkgs/pict-snip-pkgs/pict-snip/LICENSE.txt
deleted file mode 100644
index 92d15fd09e..0000000000
--- a/pkgs/pict-snip-pkgs/pict-snip/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-pict
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/pict-snip-pkgs/pict-snip/info.rkt b/pkgs/pict-snip-pkgs/pict-snip/info.rkt
deleted file mode 100644
index f2a4a6f902..0000000000
--- a/pkgs/pict-snip-pkgs/pict-snip/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("pict-snip-lib"
-               "pict-snip-doc"))
-(define implies '("pict-snip-lib"
-                  "pict-snip-doc"))
-
-(define pkg-desc "Build snips out of picts")
-
-(define pkg-authors '(robby))
diff --git a/pkgs/plai/HISTORY.txt b/pkgs/plai/HISTORY.txt
deleted file mode 100644
index 5049f99487..0000000000
--- a/pkgs/plai/HISTORY.txt
+++ /dev/null
@@ -1,212 +0,0 @@
-February 2010
--------------
-Adding to core
-
-From Robby:
-- added test-random-mutator.ss
-- added docs at the end of plai.scrbl
-- added random-mutator.ss
-- changed gc-gui.ss
-
-March 2009
-----------
-
-Updated by JM to PLT 4.1.5 and PLaneT distribution
-
-
-PLAI-4.1.3 (6 December 2008)
-----------------------------
-
-+ The GC languages are now compatible with PLT Scheme 4.1.3.
-
-+ plai/mutator supports halt-on-errors and print-only-errors.
-
-+ Defining a global as an alias for a primitive now works correctly.
-  Previously, a mutator containing a definition such as (define car first) would
-  signal a contract violation.
-
-+ A mutator with just allocator-setup and no expression no longer signals a
-  syntax error.
-
-+ When installed for --all-users, scribble docs should be in the plai
-  directory and not the manual directory.
-
-+ Allocations made in init-allocator are now displayed in the heap 
-  visualization.
-
-
-+ Error reporting for type-case and define-type has improved.
-
-+ Importing was not broken in the previous release.  Documentation clarified
-  with an example.
-
-+ Documentation for gc:set-first! and gc:set-rest! was missing; it's now
-  present.
-
-
-PLAI-4.1.1 (28 October 2008)
-----------------------------
-
-+ plai/gc-test.ss and plai/plai-test.ss removed.  They are part of the
-  173tourney (test-fest) distribution.
-
-+ Fixed a bug in the GC Mutator languages that manifested itself as missing
-  roots in (get-root-set).  For example, in the previous release, the following   program does not signal an error:
-
-  (allocator-setup "mark-and-sweep.ss" 3) ; assume that 5 occupies 3 locations
-
-  (5 (lambda (x) x))
-
-Known Issues:
-
-+ A mutator with just an allocator-setup line and no other expressions signals
-  an error.
-
-+ import-gc does not work in all contexts.
-
-
-PLAI-4.1 (August 2008)
-----------------------
-
-+ plai/gc-test is analogous to plai/plai-test, but for the GC languages.
-
-+ The 'alternate-collector' parameter in plai/private/command-line may be set
-  to override the collector specified in 'allocator-setup' in Mutator Scheme.
-  Note that this parameter is examined during macro expansion.  Set it using
-  'begin-for-syntax' before requiring the mutator.
-
-+ The '--plai-gc-no-custom-imports' commmand line argument has been removed.
-  The 'gc-disable-import-gc?' parameter in plai/private/command-line may be used
-  to achieve the same effect for 'import-gc' but not 'import-primitive'.
-
-+ The 'error' function in the PLAI language now has the same signature as
-  'error' in scheme/base.
-
-+ In Mutator Scheme, define works in the interactions pane.
-
-+ Mutator Scheme no longer provides letrec, named let and letrec-values.  These
-  expressions were broken in earlier versions of PLAI.
-
-+ Mutator Scheme includes 'begin'.
-
-+ In Mutator Scheme, primitive expression that expand to use quote are 
-  properly annotated.  (Bug introduced in PLAI-4.)
-
-+ In Mutator Scheme, else-branches are available for cond and case. (Bug
-  introduced in PLAI-4.)
-
-+ The 'Stop' button in plai/web works better.
-
-+ test/exn, test and other testing macros produce more helpful errors when
-  reporting on exceptions.  When either fails because an exception is raised
-  that is not explicitly signalled by the user, they both print
-
-  (exception <evaluated-expression> <exception-message> <location>)
-
-  where <exception-message> is the message of the exception that was signalled.
-
-  For example,
-
-  (test (/ 1 0) "system exception")
-  > (exception (/ 1 0) "/: division by zero" "at line 1")
-
-+ When test fails because *any* exception is raised, it prints (exception ...)
-  as above.
-
-+ When test/exn fails because an exception with a mismatched error message is
-  signalled, it prints (bad ...) as in previous versions of PLAI.
-
-+ plai/plai-test.ss is a script for running solutions against an external
-  test file.
-
-+ plai/private/command-line defines various parameters that affect PLAI
-  (largely tests).  Some of these parameters aren't available without requiring
-  this module.
-
-PLAI-4 (July 2008)
-------------------
-
-+ PLAI software has been updated for PLT Scheme 4.0.  
-
-+ The PLAI Restricted / PLAI Pretty Big distinction has been removed.  There is
-  now a single PLAI Scheme language, which extends `#lang scheme' with
-  `define-type', `type-case' and the testing procedures.
-
-+ PLAI languages are also available as module languages.  Use `#lang plai',
-  `#lang plai/collector' and `#lang plai/mutator'.
-
-+ PLAI exceptions are subtypes of exn:fail instead of exn.
-
-+ In the GC Mutator language, when expressions are evaluated in the REPL, the
-  value is printed in addition to the address of the value.
-
-+ In the GC Mutator language, circular data structures print correctly in the
-  REPL.
-
-+ The GC Mutator language includes support for testing.  See `test/value=?'
-  and `test/location=?'.
-
-+ The testing framework no longer provides the print-tests parameter.  See
-  `halt-on-errors' and `print-only-errors' instead.  The arguments
-  `--plai-halt-on-errors' and `--plai-print-only-errors' may be specified
-  on the command line as well.
-
-+ The testing framework no longer provides procedural (*/proc) testing forms.
-
-+ The GC Mutator language dynamically loads MrEd when it's available.  Hence,
-  it may be executed on the command-line.
-
-+ In the GC Mutator language, if the heap size specified exceeds 200 locations,
-  the heap visualization is not displayed.
-
-+ The heap-offset notion has been removed from the GC languages.  Heaps now
-  begin at address 0 only.  `allocator-setup' has been affected and 
-  `heap-offset' has been removed.
-
-+ Testing forms print the supplied expressions, instead of their values.  For
-  example, (test (+ 2 3) 5) prints (good (+ 2 3) 5) instead of (good 5 5).
-
-+ GC Mutator allows arbitrary procedures to be imported from the collector
-  and from #lang scheme.  See `import-gc' and `import-primitives'.  These
-  forms may be disabled on the command line with the switch
-  `--plai-gc-no-custom-imports'.
-
-+ A 'web application' language level has been added to ease experiments with
-  the PLT Web Server.
-
-PLAI-v371/372 (January 2008)
-----------------------------
-
-+ Fixed `type-case' to report the correct error location when an element of a
-  field list is not an identifier.
-
-  (type-case WAE expr
-    [num (10) 5] 
-    ...)  => expected an identifier at 10
-
-+ `define-type' gives a more helpful error messages if it isn't given any
-  arguments.
-
-+ PLAI Pretty Big Scheme is now derived from plt-pretty-big-text.  This allows
-  you to run the language in MzScheme.
-
-+ The testing framework defines the parameter `plai-ignore-exn-strings.' When
-  set to true, exception strings passed to test/exn, test/regexp, etc. are
-  treated as the empty string.  The default value of this parameter is false.
-
-+ The testing framework defines the variable `plai-all-test-results.'  This
-  variable is a list of test results (i.e. (good ...), (bad ...), 
-  (exception ...)).
-
-+ cons? and empty? signal an error if they are not provided with a `list?'
-
-+ cons requires its second argument to be a list.
-
-+ PLAI Restricted Scheme now provides `when' and `unless'.
-
-+ Modules (i.e. files) written in PLAI Pretty Big and PLAI Restricted now
-  automatically (provide (all-defined)).
-
-+ plai-ignore-exn-strings and plai-all-test-results; see doc.txt for details.
-
-+ The collector-lang now provides all-from (lib "list.ss") and (lib "etc.ss").
diff --git a/pkgs/plai/LICENSE.txt b/pkgs/plai/LICENSE.txt
deleted file mode 100644
index ebefcbe4de..0000000000
--- a/pkgs/plai/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-plai
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/plai/collector.rkt b/pkgs/plai/collector.rkt
deleted file mode 100644
index 0f15d5f6e4..0000000000
--- a/pkgs/plai/collector.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang scheme
-
-(require (for-syntax scheme)
-         plai/datatype
-         plai/test-harness
-         plai/private/gc-core)
-
-(provide (except-out (all-from-out scheme) #%module-begin error)
-         (all-from-out plai/private/gc-core)
-         (all-from-out plai/datatype)
-         (rename-out
-          [plai-error error])
-         (except-out (all-from-out plai/test-harness))
-         (rename-out 
-          [collector-module-begin #%module-begin]))
-
-(provide with-heap)
-(define-syntax-rule (with-heap heap exp ...) (with-heap/proc heap (λ () exp ...)))
-(define (with-heap/proc vec h)
-  (unless (vector? vec)
-    (error 'with-heap "expected a vector as first argument, got ~e" vec))
-  (for ([v (in-vector vec)]
-        [i (in-naturals)])
-    (unless (heap-value? v)
-      (error 'with-heap "expected the heap to contain only heap values, but found ~e at position ~a"
-             v i)))
-  (parameterize ([current-heap vec])
-    (h)))
-
-;;; Since we explicitly identify the procedures to be exported here, an error is raised in the
-;;; collector if a procedure is not defined.
-(define-syntax (collector-module-begin stx)
-  (syntax-case stx ()
-    [(_ body ...) 
-     (with-syntax ([(init-allocator gc:deref gc:alloc-flat gc:cons gc:first gc:rest gc:flat?
-                                    gc:cons? gc:set-first! gc:set-rest!)
-                    (map (λ (s) (datum->syntax stx s))
-                         '(init-allocator gc:deref gc:alloc-flat gc:cons gc:first gc:rest gc:flat? 
-                                          gc:cons? gc:set-first! gc:set-rest!))])
-       #`(#%module-begin 
-          
-          (require (for-syntax scheme))
-          
-          (provide/contract (init-allocator (-> any)))
-          
-          (provide/contract (gc:deref (location? . -> . heap-value?)))
-          
-          (provide/contract (gc:alloc-flat (heap-value? . -> . location?)))
-          (provide/contract (gc:cons (location? location? . -> . location?)))
-          
-          (provide/contract (gc:first (location? . -> . location?)))
-          (provide/contract (gc:rest (location? . -> . location?)))
-          
-          (provide/contract (gc:flat? (location? . -> . boolean?)))
-          (provide/contract (gc:cons? (location? . -> . boolean?)))
-          
-          (provide/contract (gc:set-first! (location? location? . -> . void?)))
-          (provide/contract (gc:set-rest! (location? location? . -> . void?)))
-          
-          body ...
-          
-          ))]))
diff --git a/pkgs/plai/collector/lang/reader.rkt b/pkgs/plai/collector/lang/reader.rkt
deleted file mode 100644
index f170a4281d..0000000000
--- a/pkgs/plai/collector/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-(module reader syntax/module-reader
-  #:language `plai/collector)
diff --git a/pkgs/plai/datatype.rkt b/pkgs/plai/datatype.rkt
deleted file mode 100644
index 3f204ccd93..0000000000
--- a/pkgs/plai/datatype.rkt
+++ /dev/null
@@ -1,478 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     racket/list)
-         racket/list
-         racket/contract
-         racket/undefined)
-
-(provide define-type type-case)
-
-(define-for-syntax (plai-syntax-error id stx-loc format-string . args)
-  (raise-syntax-error
-   id (apply format (cons format-string args)) stx-loc))
-
-(define bug:fallthru-no-else
-  (string-append
-   "You have encountered a bug in the PLAI code.  (Error: type-case "
-   "fallthru on cond without an else clause.)"))
-(define-for-syntax bound-id
-  (string-append
-   "identifier is already bound in this scope (If you didn't define it, "
-   "it was defined by the PLAI language.)"))
-(define-for-syntax type-case:generic
-  (string-append
-   "syntax error in type-case; search the Help Desk for `type-case' for "
-   "assistance."))
-(define-for-syntax define-type:duplicate-variant
-  "this identifier has already been used")
-(define-for-syntax type-case:not-a-type
-  "this must be a type defined with define-type")
-(define-for-syntax type-case:not-a-variant
-  "this is not a variant of the specified type")
-(define-for-syntax type-case:argument-count
-  "this variant has ~a fields, but you provided bindings for ~a fields")
-(define-for-syntax type-case:missing-variant
-  "syntax error; probable cause: you did not include a case for the ~a variant, or no else-branch was present")
-(define-for-syntax type-case:unreachable-else
-  "the else branch of this type-case is unreachable; you have matched all variants")
-(define-for-syntax define-type:zero-variants
-  "you must specify a sequence of variants after the type, ~a")
-
-(define-for-syntax ((assert-unbound stx-symbol) id-stx)
-  (when (identifier-binding id-stx)
-    (plai-syntax-error stx-symbol id-stx bound-id)))
-
-(define-for-syntax (assert-unique variant-stx)
-  (let ([dup-id (check-duplicate-identifier (syntax->list variant-stx))])
-    (when dup-id
-      (plai-syntax-error 'define-type dup-id
-                         define-type:duplicate-variant))))
-
-(define-for-syntax type-symbol (gensym))
-
-(define-for-syntax (validate-and-remove-type-symbol stx-loc lst)
-  (if (and (list? lst) (eq? type-symbol (first lst)))
-    (rest lst)
-    (plai-syntax-error 'type-case stx-loc type-case:not-a-type)))
-
-(require (for-syntax syntax/parse
-                     syntax/stx
-                     racket/string
-                     racket/match
-                     (only-in racket/function curry)))
-
-(begin-for-syntax
-  (define SRBS null)
-  (define (CLEAR-SRBS!)
-    (set! SRBS null))
-  (define (GRAB-SRBS)
-    SRBS)
-
-  (define (format-id lctx fmt #:source src . v)
-    (define-values
-      (fmt+vs-strs final-make-srbs)
-      (let loop ([l (string->list fmt)]
-                 [v v]
-                 [here 0]
-                 [ss empty]
-                 [make-srbs (λ () null)])
-        (match l
-          [(list* #\~ #\a more)
-           (define first-v (first v))
-           (define first-s (format "~a" (syntax->datum first-v)))
-           (define first-len (string-length first-s))
-           (loop more (rest v) (+ here first-len)
-                 (cons first-s ss)
-                 (if (syntax-source first-v)
-                   (λ ()
-                     (cons (vector (syntax-local-introduce this-id)
-                                   here first-len
-                                   (syntax-local-introduce first-v)
-                                   0 first-len)
-                           (make-srbs)))
-                   make-srbs))]
-          [(list* other more)
-           (loop more v (+ here 1)
-                 (cons (string other) ss)
-                 make-srbs)]
-          [(list)
-           (values (reverse ss) make-srbs)])))
-    (define fmt+vs-str
-      (string-append* fmt+vs-strs))
-    (define fmt+vs-sym
-      (string->symbol fmt+vs-str))
-    (define this-id
-      (datum->syntax lctx fmt+vs-sym src))
-    (define srbs
-      (final-make-srbs))
-    (set! SRBS (cons srbs SRBS))
-    this-id)
-
-  (define (syntax-string s)
-    (symbol->string (syntax-e s))))
-
-;; XXX Copied from racket/private/define-struct
-(begin-for-syntax
-  (require racket/struct-info)
-  (define (transfer-srcloc orig stx)
-    (datum->syntax orig (syntax-e orig) stx orig))
-  (struct self-ctor-checked-struct-info (info renamer)
-          #:property prop:struct-info
-          (λ (i)
-            ((self-ctor-checked-struct-info-info i)))
-          #:property prop:procedure
-          (λ (i stx)
-            (define orig ((self-ctor-checked-struct-info-renamer i)))
-            (syntax-case stx ()
-              [(self arg ...)
-               (datum->syntax
-                stx
-                (cons (syntax-property (transfer-srcloc orig #'self)
-                                       'constructor-for
-                                       (syntax-local-introduce
-                                        #'self))
-                      (syntax-e (syntax (arg ...))))
-                stx
-                stx)]
-              [_ (transfer-srcloc orig stx)]))))
-
-(define (undefined? x)
-  (eq? undefined x))
-
-(define-syntax (define-type stx)
-  (syntax-parse
-      stx
-    [(_ datatype:id
-        [variant:id (field:id field/c:expr) ...]
-        ...)
-
-     ;; Ensure we have at least one variant.
-     (when (empty? (syntax->list #'(variant ...)))
-       (plai-syntax-error 'define-type stx define-type:zero-variants
-                          (syntax-e #'datatype)))
-
-     ;; Ensure variant names are unique.
-     (assert-unique #'(variant ...))
-     ;; Ensure each set of fields have unique names.
-     (stx-map assert-unique #'((field ...) ...))
-
-     ;; Ensure type and variant names are unbound
-     (map (assert-unbound 'define-type)
-          (cons #'datatype? (syntax->list #'(variant ...))))
-
-     (CLEAR-SRBS!)
-
-     (with-syntax
-         ([(variant* ...)
-           (stx-map (λ (x) (datum->syntax #f (syntax->datum x)))
-                    #'(variant ...))]
-          [(underlying-variant ...)
-           (stx-map (λ (x) (datum->syntax #f (syntax->datum x)))
-                    #'(variant ...))])
-
-       (with-syntax
-           ([((field/c-val ...) ...)
-             (stx-map generate-temporaries #'((field/c ...) ...))]
-            [((the-field/c ...) ...)
-             (stx-map generate-temporaries #'((field/c ...) ...))]
-            [datatype?
-             (format-id stx "~a?" #'datatype #:source #'datatype)]
-            [(variant? ...)
-             (stx-map (λ (x) (format-id stx "~a?" x #:source x)) #'(variant ...))]
-            [(variant*? ...)
-             (stx-map (λ (x) (format-id x "~a?" x #:source x)) #'(variant* ...))]
-            [(make-variant ...)
-             (stx-map (λ (x) (format-id stx "make-~a" x #:source x)) #'(variant ...))]
-            [(make-variant* ...)
-             (stx-map (λ (x) (format-id x "make-~a" x #:source x)) #'(variant* ...))])
-
-         (with-syntax
-             ([((f:variant? ...) ...)
-               (stx-map (lambda (v? fs)
-                          (stx-map (lambda (f) v?) fs))
-                        #'(variant? ...)
-                        #'((field ...) ...))]
-              [((variant-field ...) ...)
-               (stx-map (lambda (variant fields)
-                          (stx-map (λ (f) (format-id stx "~a-~a" variant f #:source f))
-                                   fields))
-                        #'(variant ...)
-                        #'((field ...) ...))]
-              [((variant*-field ...) ...)
-               (stx-map (lambda (variant fields)
-                          (stx-map (λ (f) (format-id variant "~a-~a" variant f #:source f))
-                                   fields))
-                        #'(variant* ...)
-                        #'((field ...) ...))]
-
-              [((set-variant-field! ...) ...)
-               (stx-map (lambda (variant fields)
-                          (stx-map (λ (f) (format-id stx "set-~a-~a!" variant f #:source f))
-                                   fields))
-                        #'(variant ...)
-                        #'((field ...) ...))]
-              [((set-variant*-field! ...) ...)
-               (stx-map (lambda (variant fields)
-                          (stx-map (λ (f) (format-id variant "set-~a-~a!" variant f #:source f))
-                                   fields))
-                        #'(variant* ...)
-                        #'((field ...) ...))])
-
-           (define srbs (GRAB-SRBS))
-
-           (syntax-property
-            (syntax/loc stx
-              (begin
-                (define-syntax datatype
-                  (list type-symbol
-                        (list (list #'variant (list #'variant-field ...) #'variant?)
-                              ...)
-                        #'datatype?))
-                (define-struct variant* (field ...)
-                  #:transparent
-                  #:omit-define-syntaxes
-                  #:mutable
-                  #:reflection-name 'variant)
-                ...
-                (define variant?
-                  variant*?)
-                ...
-                (define (datatype? x)
-                  (or (variant? x) ...))
-                (begin
-                  ;; If this is commented in, then contracts will be
-                  ;; checked early.  However, this will disallow mutual
-                  ;; recursion, which PLAI relies on.  It could be
-                  ;; allowed if we could have module-begin cooperate
-                  ;; and lift the define-struct to the top-level but,
-                  ;; that would break web which doesn't use the plai
-                  ;; language AND would complicate going to a
-                  ;; student-language based deployment
-
-                  ;; (define field/c-val field/c)
-                  ;; ...
-
-                  (define (the-field/c)
-                    (or/c undefined?
-                          field/c))
-                  ...
-
-                  (define make-variant
-                    (lambda-memocontract (field ...)
-                                         (contract ((the-field/c) ... . -> . variant?)
-                                                   make-variant*
-                                                   'make-variant 'use
-                                                   'make-variant #'variant)))
-                  (define underlying-variant
-                    (lambda-memocontract (field ...)
-                                         (contract ((the-field/c) ... . -> . variant?)
-                                                   make-variant*
-                                                   'variant 'use
-                                                   'variant #'variant)))
-                  (define-syntax
-                    variant
-                    (self-ctor-checked-struct-info
-                     (λ ()
-                       (list #'struct:variant*
-                             #'make-variant*
-                             #'variant*?
-                             (reverse (list #'variant*-field ...))
-                             (reverse (list #'set-variant*-field! ...))
-                             #t))
-                     (λ () #'underlying-variant)))
-                  (define variant-field
-                    (lambda-memocontract (v)
-                                         (contract (f:variant? . -> . (the-field/c))
-                                                   variant*-field
-                                                   'variant-field 'use
-                                                   'variant-field #'field)))
-                  ...
-                  (define set-variant-field!
-                    (lambda-memocontract (v nv)
-                                         (contract (f:variant? (the-field/c) . -> . void)
-                                                   set-variant*-field!
-                                                   'set-variant-field! 'use
-                                                   'set-variant-field! #'field)))
-                  ...
-                  )
-                ...))
-            'sub-range-binders
-            srbs))))]))
-
-(define-syntax-rule (lambda-memocontract (field ...) c-expr)
-  (let ([cd #f])
-    (lambda (field ...)
-      (unless cd
-        (set! cd c-expr))
-      (cd field ...))))
-
-;;; Asserts that variant-id-stx is a variant of the type described by
-;;; type-stx.
-(define-for-syntax ((assert-variant type-info) variant-id-stx)
-  (unless (ormap (λ (stx) (free-identifier=? variant-id-stx stx))
-                 (map first type-info))
-    (plai-syntax-error 'type-case variant-id-stx type-case:not-a-variant)))
-
-;;; Asserts that the number of fields is appropriate.
-(define-for-syntax ((assert-field-count type-info) variant-id-stx field-stx)
-  (let ([field-count
-         (ormap (λ (type) ; assert-variant first and this ormap will not fail
-                  (and (free-identifier=? (first type) variant-id-stx)
-                       (length (second type))))
-                type-info)])
-    (unless (= field-count (length (syntax->list field-stx)))
-      (plai-syntax-error 'type-case variant-id-stx type-case:argument-count
-                         field-count (length (syntax->list field-stx))))))
-
-(define-for-syntax ((ensure-variant-present stx-loc variants) variant)
-  (unless (ormap (λ (id-stx) (free-identifier=? variant id-stx))
-                 (syntax->list variants))
-    (plai-syntax-error 'type-case stx-loc type-case:missing-variant
-                       (syntax->datum variant))))
-
-(define-for-syntax ((variant-missing? stx-loc variants) variant)
-  (not (ormap (λ (id-stx) (free-identifier=? variant id-stx))
-              (syntax->list variants))))
-
-
-(define-syntax (lookup-variant stx)
-  (syntax-case stx ()
-    [(_ variant-id ((id (field ...) id?) . rest))
-     (free-identifier=? #'variant-id #'id)
-     #'(list (list field ...) id?)]
-    [(_ variant-id (__ . rest)) #'(lookup-variant variant-id rest)]
-    [(_ variant-id ()) (error 'lookup-variant "variant ~a not found (bug in PLAI code)"
-                              (syntax-e #'variant-id))]))
-
-(define-for-syntax (validate-clause clause-stx)
-  (syntax-case clause-stx ()
-    [(variant (field ...) body ...)
-     (cond
-       [(not (identifier? #'variant))
-        (plai-syntax-error 'type-case #'variant
-                           "this must be the name of a variant")]
-       [(ormap (λ (stx)
-                 (and (not (identifier? stx)) stx)) (syntax->list #'(field ...)))
-        => (λ (malformed-field)
-             (plai-syntax-error
-              'type-case malformed-field
-              "this must be an identifier that names the value of a field"))]
-       [(not (= (length (syntax->list #'(body ...))) 1))
-        (plai-syntax-error
-         'type-case clause-stx
-         (string-append
-          "there must be just one body expression in a clause, but you "
-          "provided ~a body expressions.")
-         (length (syntax->list #'(body ...))))]
-       [else #t])]
-    [(variant (field ...))
-     (plai-syntax-error
-      'type-case clause-stx
-      "this case is missing a body expression")]
-    [_
-     (plai-syntax-error
-      'type-case clause-stx
-      "this case is missing a field list (possibly an empty field list)")]))
-
-(define-syntax (bind-fields-in stx)
-  (syntax-case stx ()
-    [(_ (binding-name ...) case-variant-id ((variant-id (selector-id ...) ___) . rest) value-id body-expr)
-     (if (free-identifier=? #'case-variant-id #'variant-id)
-       #'(let ([binding-name (selector-id value-id)]
-               ...)
-           body-expr)
-       #'(bind-fields-in (binding-name ...) case-variant-id rest value-id body-expr))]))
-
-(define-syntax (type-case stx)
-  (syntax-case stx (else)
-    [(_ type-id test-expr [variant (field ...) case-expr] ... [else else-expr])
-     ;; Ensure that everything that should be an identifier is an identifier.
-     (and (identifier? #'type-id)
-          (andmap identifier? (syntax->list #'(variant ...)))
-          (andmap (λ (stx) (andmap identifier? (syntax->list stx)))
-                  (syntax->list #'((field ...) ...))))
-     (let* ([info (validate-and-remove-type-symbol
-                   #'type-id (syntax-local-value #'type-id (λ () #f)))]
-            [type-info (first info)]
-            [type? (second info)])
-
-       ;; Ensure all names are unique
-       (assert-unique #'(variant ...))
-       (map assert-unique (syntax->list #'((field ...) ...)))
-
-       ;; Ensure variants are valid.
-       (map (assert-variant type-info) (syntax->list #'(variant ...)))
-
-       ;; Ensure field counts match.
-       (map (assert-field-count type-info)
-            (syntax->list #'(variant ...))
-            (syntax->list #'((field ...) ...)))
-
-       ;; Ensure some variant is missing.
-       (unless (ormap (variant-missing? stx #'(variant ...))
-                      (map first type-info))
-         (plai-syntax-error 'type-case stx type-case:unreachable-else))
-
-
-       #`(let ([expr test-expr])
-           (if (not (#,type? expr))
-             #,(syntax/loc #'test-expr
-                 (error 'type-case "expected a value from type ~a, got: ~a"
-                        'type-id
-                        expr))
-             (cond
-               [(let ([variant-info (lookup-variant variant #,type-info)])
-                  ((second variant-info) expr))
-                (bind-fields-in (field ...) variant #,type-info expr case-expr)]
-               ...
-               [else else-expr]))))]
-    [(_ type-id test-expr [variant (field ...) case-expr] ...)
-     ;; Ensure that everything that should be an identifier is an identifier.
-     (and (identifier? #'type-id)
-          (andmap identifier? (syntax->list #'(variant ...)))
-          (andmap (λ (stx) (andmap identifier? (syntax->list stx)))
-                  (syntax->list #'((field ...) ...))))
-     (let* ([info (validate-and-remove-type-symbol
-                   #'type-id (syntax-local-value #'type-id (λ () #f)))]
-            [type-info (first info)]
-            [type? (second info)])
-
-       ;; Ensure all names are unique
-       (assert-unique #'(variant ...))
-       (map assert-unique (syntax->list #'((field ...) ...)))
-
-       ;; Ensure variants are valid.
-       (map (assert-variant type-info) (syntax->list #'(variant ...)))
-
-       ;; Ensure field counts match.
-       (map (assert-field-count type-info)
-            (syntax->list #'(variant ...))
-            (syntax->list #'((field ...) ...)))
-
-       ;; Ensure all variants are covered
-       (map (ensure-variant-present stx #'(variant ...))
-            (map first type-info))
-
-       #`(let ([expr test-expr])
-           (if (not (#,type? expr))
-             #,(syntax/loc #'test-expr
-                 (error 'type-case "expected a value from type ~a, got: ~e"
-                        'type-id
-                        expr))
-             (cond
-               [(let ([variant-info (lookup-variant variant #,type-info)])
-                  ((second variant-info) expr))
-                (bind-fields-in (field ...) variant #,type-info expr case-expr)]
-               ...
-               [else (error 'type-case bug:fallthru-no-else)]))))]
-    ;;; The remaining clauses are for error reporting only.  If we got this
-    ;;; far, either the clauses are malformed or the error is completely
-    ;;; unintelligible.
-    [(_ type-id test-expr clauses ...)
-     (begin
-       (unless (identifier? #'type-id)
-         (plai-syntax-error 'type-case #'type-id type-case:not-a-type))
-       (validate-and-remove-type-symbol #'type-id (syntax-local-value #'type-id (λ () #f)))
-       (andmap validate-clause (syntax->list #'(clauses ...)))
-       (plai-syntax-error 'type-case stx "Unknown error"))]
-    [_ (plai-syntax-error 'type-case stx type-case:generic)]))
diff --git a/pkgs/plai/gc2/collector.rkt b/pkgs/plai/gc2/collector.rkt
deleted file mode 100644
index 5077ecc304..0000000000
--- a/pkgs/plai/gc2/collector.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang scheme
-
-(require (for-syntax scheme)
-         plai/datatype
-         plai/test-harness
-         plai/gc2/private/gc-core)
-
-(provide (except-out (all-from-out scheme) #%module-begin error)
-         (all-from-out plai/gc2/private/gc-core)
-         (all-from-out plai/datatype)
-         (rename-out
-          [plai-error error])
-         (except-out (all-from-out plai/test-harness))
-         (rename-out 
-          [collector-module-begin #%module-begin]))
-
-(provide with-heap)
-(define-syntax-rule (with-heap heap exp ...) (with-heap/proc heap (λ () exp ...)))
-(define (with-heap/proc vec h)
-  (unless (vector? vec)
-    (error 'with-heap "expected a vector as first argument, got ~e" vec))
-  (for ([v (in-vector vec)]
-        [i (in-naturals)])
-    (unless (heap-value? v)
-      (error 'with-heap "expected the heap to contain only heap values, but found ~e at position ~a"
-             v i)))
-  (parameterize ([current-heap vec])
-    (h)))
-
-;;; Since we explicitly identify the procedures to be exported here, an error is raised in the
-;;; collector if a procedure is not defined.
-(define-syntax (collector-module-begin stx)
-  (syntax-case stx ()
-    [(_ body ...) 
-     (with-syntax ([(init-allocator gc:deref gc:alloc-flat gc:cons gc:first gc:rest gc:flat?
-                                    gc:closure gc:closure? gc:closure-code-ptr gc:closure-env-ref
-                                    gc:cons? gc:set-first! gc:set-rest!)
-                    (map (λ (s) (datum->syntax stx s))
-                         '(init-allocator gc:deref gc:alloc-flat gc:cons gc:first gc:rest gc:flat? 
-                                          gc:closure gc:closure? gc:closure-code-ptr gc:closure-env-ref
-                                          gc:cons? gc:set-first! gc:set-rest!))])
-       #`(#%module-begin 
-          
-          (require (for-syntax scheme))
-          
-          (provide/contract (init-allocator (-> any)))
-          
-          (provide/contract (gc:deref (location? . -> . heap-value?)))
-          
-          (provide/contract (gc:alloc-flat (heap-value? . -> . location?)))
-          (provide/contract (gc:cons (root? root? . -> . location?)))
-          (provide/contract (gc:closure (closure-code? (listof root?) . -> . location?))) 
-
-          (provide/contract (gc:closure-code-ptr (location? . -> . closure-code?)))
-          (provide/contract (gc:closure-env-ref (location? integer? . -> . location?)))          
-
-          (provide/contract (gc:first (location? . -> . location?)))
-          (provide/contract (gc:rest (location? . -> . location?)))
-          
-          (provide/contract (gc:flat? (location? . -> . boolean?)))
-          (provide/contract (gc:cons? (location? . -> . boolean?)))
-          (provide/contract (gc:closure? (location? . -> . boolean?)))
-          
-          (provide/contract (gc:set-first! (location? location? . -> . void?)))
-          (provide/contract (gc:set-rest! (location? location? . -> . void?)))
-          
-          body ...
-          
-          ))]))
diff --git a/pkgs/plai/gc2/collector/lang/reader.rkt b/pkgs/plai/gc2/collector/lang/reader.rkt
deleted file mode 100644
index a94053e90d..0000000000
--- a/pkgs/plai/gc2/collector/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-(module reader syntax/module-reader
-  #:language `plai/gc2/collector)
diff --git a/pkgs/plai/gc2/mutator.rkt b/pkgs/plai/gc2/mutator.rkt
deleted file mode 100644
index 3cb1687291..0000000000
--- a/pkgs/plai/gc2/mutator.rkt
+++ /dev/null
@@ -1,711 +0,0 @@
-#lang scheme
-(require (prefix-in scheme: scheme)
-         plai/private/command-line
-         (for-syntax plai/private/command-line)
-         plai/gc2/private/collector-exports
-         plai/gc2/private/gc-core
-         scheme/gui/dynamic
-         (only-in plai/test-harness
-                  exn:plai? equal~?
-                  plai-error generic-test test halt-on-errors print-only-errors)
-         (for-syntax scheme)
-         (for-syntax plai/gc2/private/gc-transformer)
-         scheme/stxparam
-         (for-syntax scheme/stxparam-exptime))
-
-(provide else require provide #%top
-         values
-         test/location=? 
-         test/value=?
-         (rename-out
-          [plai-error error]
-          
-          [mutator-and and]
-          [mutator-or or]
-          [mutator-cond cond]
-          [mutator-case case]
-          [mutator-define define]
-          [mutator-define-values define-values]
-          (mutator-let let)
-          [mutator-let* let*]
-          [mutator-begin begin]
-          
-          [mutator-if if]
-          [mutator-let-values let-values]
-          [mutator-set! set!]
-          [mutator-lambda lambda]
-          [mutator-lambda λ]
-          (mutator-app #%app)
-          (mutator-datum #%datum)
-          (mutator-cons cons)
-          (collector:first first)
-          (collector:rest rest)
-          (mutator-quote quote)
-          (mutator-top-interaction #%top-interaction)
-          (mutator-module-begin #%module-begin)))
-
-(define-syntax-parameter mutator-name #f)
-(define-syntax-parameter mutator-tail-call? #t)
-(define-syntax-parameter mutator-env-roots empty)
-
-(define-syntax-parameter mutator-assignment-allowed? #t)
-(define-syntax-rule (no! e) (syntax-parameterize ([mutator-assignment-allowed? #f]) e))
-(define-syntax-rule (yes! e) (syntax-parameterize ([mutator-assignment-allowed? #t]) e))
-
-; Sugar Macros
-(define-syntax mutator-and
-  (syntax-rules ()
-    [(_) (mutator-quote #t)]
-    [(_ fe) fe]
-    [(_ fe e ...) (mutator-if fe (mutator-and e ...) (mutator-quote #f))]))
-(define-syntax mutator-or
-  (syntax-rules ()
-    [(_) (mutator-quote #f)]
-    [(_ fe) fe]
-    [(_ fe e ...) (mutator-let ([tmp fe]) (mutator-if tmp tmp (mutator-or e ...)))]))
-(define-syntax mutator-cond
-  (syntax-rules (else)
-    [(_) (mutator-begin)]
-    [(_ [else e ...]) (mutator-begin e ...)]
-    [(_ [q ans] e ...) (mutator-if q ans (mutator-cond e ...))]))
-(define-syntax mutator-case
-  (syntax-rules (else)
-    [(_ value
-        [(v ...) e ...]
-        ...
-        [else ee ...])
-     (mutator-let ([tmp value])
-                  (mutator-cond [(mutator-app mutator-member? tmp (mutator-quote (v ...)))
-                                 e ...]
-                                ...
-                                [else ee ...]))]
-    [(_ value
-        [(v ...) e ...]
-        ...)
-     (mutator-case value
-                   [(v ...) e ...]
-                   ...
-                   [else (mutator-begin)])]))
-(define-syntax mutator-define
-  (syntax-rules ()
-    [(_ (f a ...) e ...)
-     (mutator-define-values (f) 
-                            (syntax-parameterize ([mutator-name #'f])
-                                                 (mutator-lambda (a ...) e ...)))]
-    [(_ id e)
-     (mutator-define-values (id) 
-                            (syntax-parameterize ([mutator-name #'id])
-                                                 e))]))
-(define-syntax-rule (mutator-let ([id e] ...) be ...)
-  (mutator-let-values ([(id) (syntax-parameterize ([mutator-name #'id])
-                                                  e)]
-                       ...)
-                      be ...))
-(define-syntax mutator-let*
-  (syntax-rules ()
-    [(_ () be ...)
-     (mutator-begin be ...)]
-    [(_ ([fid fe] [rid re] ...) be ...)
-     (mutator-let ([fid fe])
-                  (mutator-let* ([rid re] ...)
-                                be ...))]))
-(define-syntax mutator-begin
-  (syntax-rules ()
-    [(_) (mutator-app void)]
-    [(_ e) e]
-    [(_ fe e ...)
-     (let ([tmp 
-            (syntax-parameterize ([mutator-tail-call? #f])
-                                 (yes! fe))])
-       (mutator-begin e ...))]))
-
-(define mutator-cons
-  (let ([cons 
-         (λ (hd tl)
-           (define roots (compute-current-roots))
-           (define-values (hd-roots no-hd-roots)
-             (partition (λ (x) (= hd (read-root x))) roots))
-           (define-values (tl-roots no-hd-no-tl-roots)
-             (partition (λ (x) (= tl (read-root x))) no-hd-roots))
-           (parameterize ([active-roots no-hd-no-tl-roots])
-             (collector:cons (make-root 'hd
-                                        (λ () hd)
-                                        (λ (v)
-                                          (set! hd v)
-                                          (for ([r (in-list hd-roots)])
-                                            (set-root! r v))))
-                             (make-root 'tl
-                                        (λ () tl)
-                                        (λ (v)
-                                          (set! tl v)
-                                          (for ([r (in-list tl-roots)])
-                                            (set-root! r v)))))))])
-    cons))
-
-(define (do-alloc-flat flat)
-  (parameterize ([active-roots (compute-current-roots)])
-    (collector:alloc-flat flat)))
-
-; Real Macros
-(define-syntax-rule (mutator-define-values (id ...) e)
-  (begin (define-values (id ...) 
-           (syntax-parameterize ([mutator-tail-call? #f])
-                                e))
-         (add-global-root! (make-env-root id))
-         ...))
-(define-syntax-rule (mutator-if test true false)
-  (if (syntax-parameterize ([mutator-tail-call? #f])
-                           (collector:deref (no! test)))
-      true
-      false))
-(define-syntax (mutator-set! stx)
-  (syntax-case stx ()
-    [(_ id e)
-     (let ()
-       (if (syntax-parameter-value #'mutator-assignment-allowed?)
-           #'(begin
-               (set! id (no! e))
-               (mutator-app void))
-           (raise-syntax-error 'set! "allowed only inside begin expressions and at the top-level" stx)))]))
-(define-syntax (mutator-let-values stx)
-  (syntax-case stx ()
-    [(_ ([(id ...) expr] ...) body-expr)
-     (with-syntax ([((tmp ...) ...)
-                    (map generate-temporaries (syntax->list #'((id ...) ...)))])
-       (let ([binding-list (syntax->list #'((id ...) ...))])
-         (with-syntax ([((previous-id ...) ...)
-                        (build-list (length binding-list) 
-                                    (λ (n) (append-map syntax->list (take binding-list n))))])
-           (syntax/loc stx
-             (let*-values ([(tmp ...) 
-                            (syntax-parameterize ([mutator-env-roots 
-                                                   (append
-                                                    (switch-over
-                                                     (syntax->list #'(id ... ...))
-                                                     (syntax->list #'(tmp ... ...))
-                                                     (find-referenced-locals
-                                                      (list #'previous-id ...)
-                                                      #'body-expr))
-                                                    (syntax-parameter-value #'mutator-env-roots))]
-                                                  [mutator-tail-call? #f])
-                                                 (no! expr))]
-                           ...)
-               (let-values ([(id ...) (values tmp ...)] ...)
-                 (syntax-parameterize ([mutator-env-roots 
-                                        (append (find-referenced-locals
-                                                 (list #'id ... ...)
-                                                 #'body-expr)
-                                                (syntax-parameter-value #'mutator-env-roots))])
-                                      body-expr)))))))]
-    [(_ ([(id ...) expr] ...) body-expr ...)
-     (syntax/loc stx
-       (mutator-let-values
-        ([(id ...) expr] ...)
-        (mutator-begin body-expr ...)))]))
-(define-syntax (mutator-lambda stx)
-  (syntax-case stx ()
-    [(_ (id ...) body)
-     (let ([env-roots (syntax-parameter-value #'mutator-env-roots)])
-       (with-syntax ([(free-id ...) (map syntax-local-introduce 
-                                         (filter
-                                          (λ (x) (for/and ([id (in-list (syntax->list #'(id ...)))])
-                                                   (not (free-identifier=? id x))))
-                                          (find-referenced-locals env-roots stx)))]
-                     [(env-id ...) env-roots]
-                     [closure (or (syntax-parameter-value #'mutator-name)
-                                  (syntax-local-name)
-                                  (let ([prop (syntax-property stx 'inferred-name)])
-                                    (if (or (identifier? prop)
-                                            (symbol? prop))
-                                        prop
-                                        #f))
-                                  (string->symbol "#<proc>"))])
-         (quasisyntax/loc stx
-           (let ([closure 
-                  (closure-code
-                   #,(length (syntax->list #'(free-id ...)))
-                   (let ([closure
-                          (lambda (free-id ... id ...) 
-                            (syntax-parameterize ([mutator-env-roots 
-                                                   (append
-                                                    (find-referenced-locals
-                                                     (list #'id ...)
-                                                     #'body)
-                                                    (list #'free-id ...))]
-                                                  [mutator-tail-call? #t])
-                                                 (no! body)))])
-                     closure))])
-             #,(if (syntax-parameter-value #'mutator-tail-call?)
-                   (syntax/loc stx
-                     (#%app do-collector:closure closure 
-                            (list (λ () free-id) ...)
-                            (list (λ (v) (set! free-id v)) ...)))
-                   (syntax/loc stx
-                     (with-continuation-mark 
-                      gc-roots-key 
-                      (list (make-env-root env-id) ...)
-                      (#%app do-collector:closure closure
-                             (list (λ () free-id) ...)
-                             (list (λ (v) (set! free-id v)) ...)))))))))]
-    [(_ (id ...) body ...)
-     (syntax/loc stx
-       (mutator-lambda (id ...) (mutator-begin body ...)))]))
-
-(define (do-collector:closure closure getters setters)
-  (define-values (remaining-roots closure-roots)
-    (let loop ([getters getters]
-               [setters setters]
-               [remaining-roots (compute-current-roots)]
-               [closure-roots '()])
-      (cond
-        [(null? getters) (values remaining-roots closure-roots)]
-        [else
-         (define this-loc ((car getters)))
-         (define this-setter (car setters))
-         (define-values (this-other-roots leftovers) 
-           (partition (λ (x) (= (read-root x) this-loc)) remaining-roots))
-         (loop (cdr getters) (cdr setters)
-               leftovers
-               (cons (make-root 'closure-root
-                                (λ () this-loc)
-                                (λ (v) (set! this-loc v)
-                                   (this-setter v)
-                                   (for ([root (in-list this-other-roots)])
-                                     (set-root! root v))))
-                     closure-roots))])))
-  (parameterize ([active-roots remaining-roots])
-    (collector:closure closure (reverse closure-roots))))
-  
-(define-syntax (mutator-app stx)
-  (syntax-case stx ()
-    [(_ e ...)
-     (local [(define (do-not-expand? exp) (identifier? exp))
-             (define exps (syntax->list #'(e ...)))
-             (define tmps
-               (generate-temporaries #'(e ...)))]
-       (with-syntax ([(ne ...)
-                      (map (lambda (exp tmp) (if (do-not-expand? exp) exp tmp))
-                           exps tmps)])
-         (for/fold ([acc (syntax/loc stx (mutator-anf-app ne ...))])
-           ([exp (in-list (reverse exps))]
-            [tmp (in-list (reverse tmps))])
-           (if (do-not-expand? exp)
-               acc
-               (quasisyntax/loc stx
-                 (mutator-let ([#,tmp #,exp])
-                              #,acc))))))]))
-(define-syntax (mutator-anf-app stx)
-  (syntax-case stx ()
-    [(_ fe ae ...)
-     (let ()
-       (define prim-app? (ormap (λ (x) (free-identifier=? x #'fe))
-                                prim-ids))
-       (define is-set-fst? (free-identifier=? #'collector:set-first! #'fe))
-       (when (or is-set-fst? (free-identifier=? #'collector:set-rest! #'fe))
-         (unless (syntax-parameter-value #'mutator-assignment-allowed?)
-           (raise-syntax-error (if is-set-fst? 'set-first! 'set-rest!)
-                               "can appear only at the top-level or in a begin"
-                               stx)))
-       (with-syntax ([(env-id ...) (syntax-parameter-value #'mutator-env-roots)]
-                     [app-exp (if prim-app?
-                                  (syntax/loc stx (do-alloc-flat (fe (collector:deref ae) ...)))
-                                  (syntax/loc stx ((deref-proc fe) ae ...)))])
-         (if (syntax-parameter-value #'mutator-tail-call?)
-             ; If this call is in tail position, we will not need access
-             ; to its environment when it returns.
-             #'app-exp
-             ; If this call is not in tail position, we make the
-             ; environment at the call site reachable.
-             #`(with-continuation-mark gc-roots-key 
-                 (list (make-env-root env-id) ...)
-                 app-exp))))]))
-(define-syntax mutator-quote
-  (syntax-rules ()
-    [(_ (a . d))
-     (mutator-app mutator-cons (mutator-quote a) (mutator-quote d))]
-    [(_ s) 
-     (mutator-datum . s)]))
-(define-syntax (mutator-datum stx)
-  (syntax-case stx ()
-    [(_ . e) 
-     (quasisyntax/loc stx (mutator-anf-app do-alloc-flat (#%datum . e)))]))
-
-(define-syntax (mutator-top-interaction stx)
-  (syntax-case stx (require provide mutator-define mutator-define-values test/value=? import-primitives)
-    [(_ . (require . e))
-     (syntax/loc stx
-       (require . e))]
-    [(_ . (provide . e))
-     (syntax/loc stx
-       (provide . e))]
-    [(_ . (mutator-define . e))
-     (syntax/loc stx
-       (mutator-define . e))]
-    [(_ . (mutator-define-values . e))
-     (syntax/loc stx
-       (mutator-define-values . e))]
-    [(_ . (test/value=? . e))
-     (syntax/loc stx
-       (test/value=? . e))]
-    [(_ . (import-primitives . e))
-     (syntax/loc stx
-       (import-primitives . e))]
-    [(_ . expr)
-     (syntax/loc stx
-       (call-with-values
-        (lambda ()
-          (syntax-parameterize ([mutator-tail-call? #f])
-                               expr))
-        (case-lambda
-          [() (void)]
-          [(result-addr)
-           (show-one-result result-addr)]
-          [result-addrs
-           (show-multiple-results result-addrs)])))]))
-
-(define (show-one-result result-addr)
-  (cond
-    [(procedure? result-addr)
-     (printf "Imported procedure:\n")
-     result-addr]
-    [(location? result-addr)
-     (printf "Value at location ~a:\n" result-addr)
-     (gc->scheme result-addr)]))
-
-(define (show-multiple-results results)
-  (define addrs
-    (for/list ([result-addr (in-list results)]
-               #:when (location? result-addr))
-      result-addr))
-  
-  (printf "Values at locations ")
-  (cond
-    [(= (length addrs) 2)
-     (printf "~a and ~a:\n" (car addrs) (cadr addrs))]
-    [else
-     (let loop ([addr (car addrs)]
-                [addrs (cdr addrs)])
-       (cond
-         [(null? addrs)
-          (printf "and ~a:\n" addr)]
-         [else
-          (printf "~a, " addr)
-          (loop (car addrs) (cdr addrs))]))])
-  (apply values 
-         (for/list ([result (in-list results)])
-           (cond
-             [(procedure? result)
-              result]
-             [(location? result)
-              (gc->scheme result)]))))
-             
-
-; Module Begin
-(define-for-syntax (allocator-setup-internal stx)
-  (syntax-case stx ()
-    [(collector-module heap-size)
-     (with-syntax ([(args ...)
-                    (map (λ (s) (datum->syntax stx s))
-                         '(init-allocator gc:deref gc:alloc-flat gc:cons 
-                                          gc:closure gc:closure? gc:closure-code-ptr gc:closure-env-ref
-                                          gc:first gc:rest 
-                                          gc:flat? gc:cons?
-                                          gc:set-first! gc:set-rest!))]) 
-       #`(begin
-           #,(if (alternate-collector)
-                 #`(require #,(datum->syntax #'collector-module (alternate-collector)))
-                 #`(require #,(syntax-case #'collector-module (mutator-quote)
-                                [(mutator-quote . x) 
-                                 (datum->syntax #'collector-module (cons #'quote #'x))]
-                                [else #'collector-module])))
-           (allocator-setup/proc args ... (#%datum . heap-size))))]
-    [_ (raise-syntax-error 'mutator 
-                           "Mutator must start with an 'allocator-setup' expression, such as: (allocator-setup <module-path> <literal-number>)"
-                           stx)]))
-
-(define (allocator-setup/proc init-allocator gc:deref gc:alloc-flat gc:cons 
-                              gc:closure gc:closure? gc:closure-code-ptr gc:closure-env-ref
-                              gc:first gc:rest 
-                              gc:flat? gc:cons?
-                              gc:set-first! gc:set-rest!
-                              heap-size)
-  (set-collector:deref! gc:deref)
-  (set-collector:alloc-flat! gc:alloc-flat)
-  (set-collector:cons! gc:cons)
-  (set-collector:first! gc:first)
-  (set-collector:rest! gc:rest)
-  (set-collector:flat?! gc:flat?)
-  (set-collector:cons?! gc:cons?)
-  (set-collector:set-first!! gc:set-first!)
-  (set-collector:set-rest!! gc:set-rest!)
-  (set-collector:closure! gc:closure)
-  (set-collector:closure?! gc:closure?)
-  (set-collector:closure-code-ptr! gc:closure-code-ptr)
-  (set-collector:closure-env-ref! gc:closure-env-ref)
-  
-  (init-heap! heap-size)
-  (when (gui-available?) 
-    (if (<= heap-size 500)
-        (set-ui! (dynamic-require `plai/gc2/private/gc-gui 'heap-viz%))
-        (printf "Large heap; the heap visualizer will not be displayed.\n")))
-  (init-allocator))  
-
-(define-for-syntax allocator-setup-error-msg
-  "Mutator must start with an 'allocator-setup' expression, such as: (allocator-setup <module-path> <literal-number>)")
-
-(define-syntax (mutator-module-begin stx)
-  (syntax-case stx (allocator-setup)
-    [(_ (allocator-setup . setup) module-expr ...)
-     (begin
-       (syntax-case #'setup ()
-         [(collector heap-size)
-          (begin
-            (unless (module-path? (syntax->datum #'collector))
-              (raise-syntax-error 'allocator-setup "expected a module path" #'collector))
-            (unless (number? (syntax->datum #'heap-size))
-              (raise-syntax-error 'allocator-setup "expected a literal number" #'heap-size)))]
-         [_
-          (raise-syntax-error 'mutator allocator-setup-error-msg (syntax/loc #'setup (allocator-setup . setup)))])
-       (quasisyntax/loc stx
-         (#%module-begin
-          #,(allocator-setup-internal #'setup)
-          #,@(for/list ([me (in-list (syntax->list #'(module-expr ...)))])
-               (quasisyntax/loc me
-                 (mutator-top-interaction . #,me))))))]
-    [(_ first-expr module-expr ...)
-     (raise-syntax-error 'mutator allocator-setup-error-msg #'first-expr)]
-    [(_)
-     (raise-syntax-error 'mutator allocator-setup-error-msg)]))
-
-; User Macros
-(provide import-primitives)
-(define-syntax (import-primitives stx)
-  (syntax-case stx ()
-    [(_ id ...) 
-     (andmap identifier? (syntax->list #'(id ...)))
-     (with-syntax ([(renamed-id ...) (generate-temporaries #'(id ...))]
-                   [source (syntax-local-get-shadower
-                            (syntax-local-introduce #'scheme))])
-       #`(begin
-           (require (only-in source [id renamed-id] ...))
-           ;; XXX make a macro to unify this and provide/lift
-           (define id
-             (lambda args
-               (unless (andmap (lambda (v) (and (location? v) (collector:flat? v))) args)
-                 (error 'id (string-append "all arguments must be <heap-value?>s, "
-                                           "even if the imported procedure accepts structured "
-                                           "data")))
-               (let ([result (apply renamed-id (map collector:deref args))])
-                 (cond
-                   [(void? result) (void)]
-                   [(heap-value? result) (do-alloc-flat result)]
-                   [else 
-                    (error 'id (string-append "imported primitive must return <heap-value?>, "
-                                              "received ~a" result))]))))
-           ...))]
-    [(_ maybe-id ...) 
-     (ormap (λ (v) (and (not (identifier? v)) v)) (syntax->list #'(maybe-id ...)))
-     (let ([offending-stx (findf (λ (v) (not (identifier? v))) (syntax->list #'(maybe-id ...)))])
-       (raise-syntax-error 
-        #f "expected identifier to import" offending-stx))]
-    [(_ . __)
-     (raise-syntax-error #f "expected list of identifiers to import" stx)]
-    [_ (raise-syntax-error #f "expected open parenthesis before import-primitive")]))
-
-(define-for-syntax ((mk-id-macro p-id) stx)
-  (syntax-case stx ()
-    [id
-     (identifier? #'id)
-     (raise-syntax-error (syntax-e stx)
-                         "primitive must appear in the function position of an application"
-                         stx)]
-    [(id exp ...)
-     #`(mutator-app #,p-id exp ...)]))
-    
-(define-syntax (provide-flat-prims/lift stx)
-  (syntax-case stx ()
-    [(_ prim-ids id ...)
-     (andmap identifier? (syntax->list #'(id ...)))
-     (with-syntax ([(id2 ...) (generate-temporaries #'(id ...))]
-                   [(p ...) (generate-temporaries #'(id ...))])
-       #'(begin
-           (define-for-syntax prim-ids (syntax->list #'(id ...)))
-           (provide (rename-out [id2 id] ...))
-           (define-syntax id2 (mk-id-macro #'id)) ...))]))
-
-(provide-flat-prims/lift
- prim-ids
- symbol? boolean? number? symbol=?
- add1 sub1 zero? + - * / even? odd? = < > <= >=)
-
-(define (member? v l)
-  (and (member v l) #t))
-(define (mutator-member? v l)
-  (do-alloc-flat
-   (member? (collector:deref v)
-            (gc->scheme l))))
-
-(provide (rename-out (mutator-set-first! set-first!)))
-(define-syntax (mutator-set-first! stx)
-  (syntax-case stx ()
-    [x 
-     (identifier? #'x)
-     (raise-syntax-error 'set-first! "must appear immediately following an open paren" stx)]
-    [(_ args ...)
-     (begin
-       #'(mutator-app collector:set-first! args ...))]))
-
-(provide (rename-out (mutator-set-rest! set-rest!)))
-(define-syntax (mutator-set-rest! stx)
-  (syntax-case stx ()
-    [x 
-     (identifier? #'x)
-     (raise-syntax-error 'set-rest! "must appear immediately following an open paren" stx)]
-    [(_ args ...)
-     (begin
-       #'(mutator-app collector:set-rest! args ...))]))
-
-(provide (rename-out [mutator-empty empty]))
-(define-syntax mutator-empty
-  (syntax-id-rules (mutator-empty)
-    [_ (mutator-quote ())]))
-
-(provide (rename-out (mutator-empty? empty?)))
-(define (mutator-empty? loc)
-  (cond
-    [(collector:flat? loc) 
-     (do-alloc-flat (empty? (collector:deref loc)))]
-    [else 
-     (do-alloc-flat false)]))
-
-(provide (rename-out [mutator-cons? cons?]))
-(define (mutator-cons? loc)
-  (do-alloc-flat (collector:cons? loc)))
-
-(provide (rename-out [mutator-eq? eq?]))
-(define (mutator-eq? l1 l2)
-  (do-alloc-flat (= l1 l2)))
-
-(provide (rename-out [mutator-printf printf]))
-(define-syntax (mutator-printf stx)
-  (syntax-case stx ()
-    [(_ fmt arg ...)
-     ; We must invoke mutator-app to A-normalize the arguments.
-     (syntax/loc stx 
-       (begin
-         (mutator-app printf (#%datum . fmt)
-                      (mutator-app gc->scheme arg) ...)
-         (void)))]))
-
-(provide (rename-out
-          (mutator-halt-on-errors halt-on-errors)
-          (mutator-print-only-errors print-only-errors)))
-(define-syntax (mutator-halt-on-errors stx)
-  (syntax-case stx ()
-    [(_) #'(halt-on-errors)]
-    [(_ arg) #'(#%app halt-on-errors (#%datum . arg))]))
-
-(define-syntax (mutator-print-only-errors stx)
-  (syntax-case stx ()
-    [(_) #'(print-only-errors)]
-    [(_ arg) #'(#%app print-only-errors (#%datum . arg))]))
-
-; Implementation Functions
-(define (deref-proc proc/loc)
-  (define v
-    (cond
-      [(procedure? proc/loc) proc/loc]
-      [(location? proc/loc) (collector:closure-code-ptr proc/loc)]
-      [else 
-       (error 'procedure-application "expected procedure, given something else")]))
-  (cond
-   [(procedure? v)
-    v]
-   [(closure-code? v)
-    (lambda args
-      (apply (closure-code-proc v) 
-             (append 
-              (for/list ([i (in-range (closure-code-env-count v))])
-                (collector:closure-env-ref proc/loc i))
-              args)))]
-   [else
-    (error 'procedure-application "expected procedure, given ~e" v)]))
-
-(define (gc->scheme loc)
-  (define-struct an-unset ())
-  (define unset (make-an-unset))
-  (define phs (make-hash))
-  (define (unwrap loc)
-    (if (hash-has-key? phs loc)
-        (hash-ref phs loc)
-        (begin
-          (local [(define ph (make-placeholder unset))]
-            (hash-set! phs loc ph)
-            (cond
-              [(collector:flat? loc)
-               (placeholder-set! ph (collector:deref loc))]
-              [(collector:cons? loc)
-               (local [(define car-ph (make-placeholder unset))
-                       (define cdr-ph (make-placeholder unset))]
-                 (placeholder-set! ph (cons car-ph cdr-ph))
-                 (placeholder-set! car-ph (unwrap (collector:first loc)))
-                 (placeholder-set! cdr-ph (unwrap (collector:rest loc))))]
-              [(collector:closure? loc)
-               ;; XXX get env?
-               (placeholder-set! ph (closure-code-proc (collector:closure-code-ptr loc)))]
-              [else 
-               (error (format "gc:flat?, gc:cons?, gc:closure? all returned false for ~a" loc))])
-            (placeholder-get ph)))))
-  (make-reader-graph (unwrap loc)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Testing support
-
-(define-syntax (test/location=? stx)
-  (syntax-case stx ()
-    [(_ e1 e2)
-     (quasisyntax/loc stx
-       (generic-test 
-        (λ () e1) 
-        (λ (result-value)
-          (define expected-val e2)
-          (values
-           (cond
-             [(exn:plai? result-value) result-value]
-             [(equal~? result-value expected-val) true]
-             [else false])
-           expected-val))
-        (quote (heap-loc #,(syntax->datum #'e1)))
-        (format "at line ~a" #,(syntax-line stx))))]))
-
-(define-for-syntax (flat-heap-value? v)
-  (or (number? v) (boolean? v)))
-
-(define-syntax (expand-scheme stx)
-  (syntax-case stx (mutator-quote mutator-datum)
-    [(_ val) (flat-heap-value? (syntax->datum #'val)) #'(#%datum . val)]
-    [(_ (mutator-datum . val))
-     #'(#%datum . val)]
-    [(_ (mutator-quote e))
-     #'(quote e)]
-    [_ 
-     (raise-syntax-error 'test/value=? "must be a number, boolean or a quoted value" stx)]))
-
-(define-syntax (test/value=? stx)
-  (syntax-case stx (mutator-quote)
-    [(_ mutator-expr scheme-datum)
-     (quasisyntax/loc stx
-       (generic-test 
-        (λ () 
-          (mutator-let ([v1 mutator-expr])
-                       (gc->scheme v1))) 
-        (λ (result-value)
-          (define expected-val (expand-scheme scheme-datum))
-          (values
-           (cond
-             [(exn:plai? result-value) result-value]
-             [(equal~? result-value expected-val) true]
-             [else false])
-           expected-val))
-        (quote #,(syntax->datum #'mutator-expr))
-        (format "at line ~a" #,(syntax-line stx))))]))
diff --git a/pkgs/plai/gc2/mutator/lang/reader.rkt b/pkgs/plai/gc2/mutator/lang/reader.rkt
deleted file mode 100644
index bb383b60be..0000000000
--- a/pkgs/plai/gc2/mutator/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-(module reader syntax/module-reader
-  #:language `plai/gc2/mutator)
diff --git a/pkgs/plai/gc2/private/collector-exports.rkt b/pkgs/plai/gc2/private/collector-exports.rkt
deleted file mode 100644
index e6e96ddd1c..0000000000
--- a/pkgs/plai/gc2/private/collector-exports.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/syntax
-                     racket/base))
-(provide (all-defined-out))
-
-(define-syntax (define-collector-export stx)
-  (syntax-case stx ()
-    [(_ i)
-     (with-syntax 
-      ([collector:i (format-id #'i "collector:~a" #'i)]
-       [set-collector:i! (format-id #'i "set-collector:~a!" #'i)]
-       [uninit-collector:i (format-id #'i "uninit-collector:~a" #'i)])
-      #'(begin (define collector:i 'uninit-collector:i)
-               (define (set-collector:i! proc)
-                 (set! collector:i proc))))]))
-
-(define-syntax-rule (define-collector-exports i ...)
-  (begin (define-collector-export i)
-         ...))
-
-(define-collector-exports
-  deref
-  alloc-flat
-  cons
-  first
-  rest
-  flat?
-  cons?
-  set-first!
-  set-rest!
-  closure
-  closure?
-  closure-code-ptr
-  closure-env-ref)
diff --git a/pkgs/plai/gc2/private/gc-core.rkt b/pkgs/plai/gc2/private/gc-core.rkt
deleted file mode 100644
index 4d6bac4fb7..0000000000
--- a/pkgs/plai/gc2/private/gc-core.rkt
+++ /dev/null
@@ -1,218 +0,0 @@
-#lang racket/base
-(require
- racket/bool
- racket/contract
- racket/list
- racket/class
- (for-syntax racket/base
-             racket/bool))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Locations
-#|
-(provide wrapped-location?)
-(define-struct wrapped-location (location))
-
-(provide/contract (wrap-location (location? . -> . wrapped-location?)))
-(define (wrap-location loc)
-  (make-wrapped-location loc))
-
-(provide/contract (unwrap-location (wrapped-location? . -> . location?)))
-(define (unwrap-location wloc)
-  (wrapped-location-location wloc))
-|#
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Heap management
-(provide current-heap)
-(define current-heap (make-parameter false))
-
-(define (format-cell cell)
-  (let* ([str (format "~s" cell)]
-         [len (string-length str)])
-    (if (<= len 10)
-        (string-append str (build-string (- 10 len) (λ (_) #\space)))
-        (substring str 0 10))))
-
-;;; Textual representation of the heap
-(provide heap-as-string)
-(define (heap-as-string)
-  (let ([step 0])
-    (apply string-append
-           (for/list ([elt (in-vector (current-heap))])
-             (cond
-               [(= step 0) 
-                (begin
-                  (set! step (add1 step))
-                  (format-cell elt))]
-               [(= step 9) 
-                (begin
-                  (set! step 0)
-                  (string-append (format-cell elt) "\n"))]
-               [else
-                (begin
-                  (set! step (add1 step))
-                  (string-append " " (format-cell elt)))])))))
-
-;;; Predicate determines values that may be stored on the heap.  Limit this to "small" values that
-;;; conceptually occupy a small, fixed amount of space.
-(provide/contract [heap-value? (any/c . -> . boolean?)])
-(define (heap-value? v)
-  (or (number? v) (symbol? v) (boolean? v) (empty? v) (closure-code? v)))
-
-(provide location?)
-(define (location? v)
-  (if (vector? (current-heap))
-      (and (exact-nonnegative-integer? v) (< v (vector-length (current-heap))))
-      (error "Heap is uninitialized")))
-
-(provide/contract (init-heap! (exact-nonnegative-integer? . -> . void?)))
-(define (init-heap! size)
-  (current-heap (build-vector size (λ (ix) false))))
-
-(provide/contract (heap-set! (location? heap-value? . -> . void?)))
-(define (heap-set! location value)
-  (vector-set! (current-heap) location value)
-  (when gui
-    (send gui update-view #:location location)))
-
-(provide/contract (heap-ref (location? . -> . heap-value?)))
-(define (heap-ref location)
-  (vector-ref (current-heap) location))
-
-(provide/contract (heap-size (-> (or/c false/c exact-nonnegative-integer?))))
-(define (heap-size)
-  (and (vector? (current-heap)) (vector-length (current-heap))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Root set management
-
-(provide gc-roots-key)
-(define gc-roots-key (gensym 'gc-roots-key))
-
-;;; Roots are defined with custom getters and setters as they can be created in various ways.
-(define-struct root (name get set!)
-  #:property prop:custom-write (λ (v port write?)
-                                 (display (format "#<root:~a>" (root-name v)) port)))
-(provide/contract
- [root? (-> any/c boolean?)]
- [root-name (-> root? any/c)]
- [make-root (-> any/c (-> location?) (-> location? void) root?)]
- [simple-root (-> location? root?)])
-
-(define (simple-root n)
-  (make-root 'simple-root
-             (λ () n)
-             (λ (n2) (set! n n2))))
-
-(provide make-env-root)
-(define-syntax (make-env-root stx)
-  (syntax-case stx ()
-    [(_ id) (identifier? #'id)
-            #`(make-root 'id
-                         (λ () 
-                            id)
-                         (λ (loc) (set! id loc)))]))
-
-;;; Roots on the stack.
-(provide/contract (stack-roots (-> (listof root?))))
-(define (stack-roots)
-  (filter is-mutable-root?
-          (apply append (continuation-mark-set->list (current-continuation-marks) gc-roots-key))))
-
-; An immutable root is a reference to a value or procedure in the Scheme heap.
-(define (is-mutable-root? root)
-  (location? ((root-get root))))
-
-(provide/contract (make-stack-root (symbol? location? . -> . root?)))
-(define (make-stack-root id location)
-  (make-root id
-             (λ () 
-                location)
-             (λ (new-location) (set! location new-location))))
-
-(provide/contract (read-root (root? . -> . location?)))
-(define (read-root root)
-  ((root-get root)))
-
-(provide/contract (set-root! (root? location? . -> . any)))
-(define (set-root! root loc)
-  ((root-set! root) loc))
-
-(provide/contract (get-global-roots (-> (listof root?))))
-(define (get-global-roots)
-  (filter is-mutable-root? global-roots))
-
-(define global-roots empty)
-
-(provide/contract (add-global-root! (root? . -> . void?)))
-(define (add-global-root! root)
-  (set! global-roots (cons root global-roots)))
-
-(provide get-root-set)
-(define (get-root-set) (append (active-roots) (user-specified-roots)))
-
-(provide compute-current-roots)
-(define (compute-current-roots) (append (get-global-roots) (stack-roots)))
-
-(provide active-roots)
-(define active-roots (make-parameter '()))
-
-(provide with-roots)
-(define-syntax (with-roots stx)
-  (syntax-case stx ()
-    [(_ (x ...) e2 e3 ...)
-     (begin
-       (for ([x (in-list (syntax->list #'(x ...)))])
-         (unless (identifier? #'x)
-           (raise-syntax-error 'with-roots "expected an identifier" stx x)))
-       #'(with-roots/proc 
-          (list (λ () x) ...)
-          (list (λ (v) (set! x v)) ...)
-          (λ () e2 e3 ...)))]))
-
-(define (with-roots/proc getters setters thunk)
-  (define c (listof location?))
-  (for ([getter (in-list getters)])
-    (define rt (getter))
-    (unless (location? rt)
-      (raise-argument-error 'with-roots
-                            "location?"
-                            rt)))
-  (parameterize ([user-specified-roots 
-                  (append
-                   (map (λ (x y) (make-root 'user-specified x y))
-                        getters 
-                        setters)
-                   (user-specified-roots))])
-    (thunk)))
-
-(define user-specified-roots (make-parameter '()))
-
-(provide/contract
- [vector->roots (-> (vectorof location?) (listof root?))])
-(define (vector->roots v)
-  (for/list ([e (in-vector v)]
-             [i (in-naturals)])
-            (make-root 'vector
-                       (λ () 
-                          (vector-ref v i))
-                       (λ (ne) (vector-set! v i ne)))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Environments of closures
-
-(define-struct closure-code (env-count proc) #:transparent)
-(provide/contract
- [struct closure-code ([env-count exact-nonnegative-integer?]
-                       [proc procedure?])])
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Optional UI
-
-(provide set-ui!)
-(define (set-ui! ui%)
-  (set! gui (new ui% [heap-vec (current-heap)])))
-
-(define gui false)
diff --git a/pkgs/plai/gc2/private/gc-gui.rkt b/pkgs/plai/gc2/private/gc-gui.rkt
deleted file mode 100644
index 0a53fe91ff..0000000000
--- a/pkgs/plai/gc2/private/gc-gui.rkt
+++ /dev/null
@@ -1,446 +0,0 @@
-#lang scheme/gui
-(require "gc-core.rkt")
-(provide heap-viz%)
-
-(define row-size 10)
-
-(define heap-viz<%> (interface () update-view))
-
-(define horizontal-axis-height 0)
-(define vertical-axis-width 0)
-(define label-line-size 2)
-(define cell-horizontal-padding 6)
-(define cell-vertical-padding 4)
-(define vertical-axis-spacer 2)
-
-(define-struct arrow (from to) #:transparent)
-
-(define show-arrows? #t)
-(define show-highlighted-cells? #f)
-
-(define heap-canvas%
-  (class* canvas% (heap-viz<%>)
-    
-    (init-field heap-vec)
-  
-    (define column-widths (make-vector 
-                           (cond
-                             [(<= (vector-length heap-vec) 300) 10]
-                             [else 20])
-                           0))
-    (define row-heights (make-vector (ceiling (/ (vector-length heap-vec) 
-                                                 (vector-length column-widths)))
-                                     0))
-    
-    (define arrows '())
-    (define highlighted-cells '())
-    
-    (define/public (update-view)
-      (setup-min-width/height)
-      (redraw-offscreen)
-      (recompute-arrows-and-highlighted-cells)
-      (on-paint))
-
-    (inherit get-dc get-client-size refresh min-width min-height)
-    
-    (define/private (setup-min-width/height)
-      (fill-in-min-sizes)
-      (min-width (ceiling (inexact->exact (+ vertical-axis-width (vector-sum column-widths)))))
-      (min-height (ceiling (inexact->exact (+ horizontal-axis-height (vector-sum row-heights)))))
-      (compute-sizes))
-    
-    (define/private (compute-sizes)
-      (fill-in-min-sizes)
-      (let-values ([(w h) (get-client-size)])
-        
-        (define (distribute-extras sizes avail-size)
-          (let ([min-size (vector-sum sizes)])
-            (cond
-              [(< avail-size min-size) 
-               ;; just give up here; we'll draw outside the frame and get clipped
-               ;; could try to shrink the bigger columns or something, tho.
-               (void)]
-              [else
-               ;; distribute the extra width evenly to all the columns
-               (let ([extra-space (/ (- avail-size min-size)
-                                     (vector-length sizes))])
-                 (for ([i (in-range 0 (vector-length sizes))])
-                   (vector-set! sizes
-                                i
-                                (+ (vector-ref sizes i)
-                                   extra-space))))])))
-        
-        (distribute-extras column-widths (- w vertical-axis-width))
-        (distribute-extras row-heights (- h horizontal-axis-height))))
-        
-    (define/private (fill-in-min-sizes)
-      (let ([dc (get-dc)])
-        (let-values ([(w h d a) 
-                      (send dc get-text-extent (format "~a" (vector-length heap-vec)))])
-          (set! vertical-axis-width (+ w label-line-size vertical-axis-spacer)))
-        (let-values ([(w h d a) (send dc get-text-extent "1")])
-          (set! horizontal-axis-height (+ h label-line-size))))
-      
-      (for ([i (in-range 0 (vector-length heap-vec))])
-        (let ([column (remainder i (vector-length column-widths))]
-              [row (quotient i (vector-length column-widths))])
-          (let-values ([(cw ch) (cell-min-size (vector-ref heap-vec i))])
-            (vector-set! row-heights 
-                         row
-                         (max (+ ch cell-vertical-padding)
-                              #;(vector-ref row-heights row)))
-            (vector-set! column-widths 
-                         column
-                         (max (+ cw cell-horizontal-padding) 
-                              #;(vector-ref column-widths column)))))))
-    
-    (define/private (cell-min-size obj)
-      (let ([dc (get-dc)])
-        (let-values ([(w h d a) (send dc get-text-extent (val->string obj))])
-          (values w h))))
-    
-    (define/private (val->string obj)
-      (cond
-        [(boolean? obj) (if obj "#t" "#f")]
-        [(number? obj) (format "~a" obj)]
-        [(closure-code? obj)
-         (format "~a" (or (object-name (closure-code-proc obj)) "#<closure>"))]
-        [(symbol? obj) (format "'~s" obj)]
-        [(null? obj) "empty"]
-        [else (error 'val->string "unknown object, expected a heap-value.")]))
-    
-    (define/override (on-paint)
-      (unless offscreen (redraw-offscreen))
-      (let ([dc (get-dc)])
-        (send dc set-origin 0 0)
-        (send dc draw-bitmap offscreen 0 0)
-        (send dc set-origin vertical-axis-width horizontal-axis-height)
-        (for-each (λ (i) (draw-cell dc i #t))
-                  highlighted-cells)
-        (for-each (λ (arrow) (draw-arrow dc arrow))
-                  arrows)))
-    
-    (define offscreen #f)
-    
-    (define/private (redraw-offscreen)
-      (let-values ([(w h) (get-client-size)])
-        (when (or (not offscreen)
-                  (not (equal? w (send offscreen get-width)))
-                  (not (equal? h (send offscreen get-height))))
-          (set! offscreen (make-object bitmap% w h)))
-        (let ([dc (make-object bitmap-dc% offscreen)])
-          (send dc set-smoothing 'aligned)
-          (send dc clear)
-          
-          (send dc set-origin 0 0)
-          
-          ;; draw lines
-          (let-values ([(w h) (get-client-size)])
-            (send dc set-pen "navy" label-line-size 'solid)
-            (send dc draw-line 
-                  (- vertical-axis-width (/ label-line-size 2)) 0
-                  (- vertical-axis-width (/ label-line-size 2)) h)
-            (send dc draw-line 
-                  0 (- horizontal-axis-height (/ label-line-size 2))
-                  w (- horizontal-axis-height (/ label-line-size 2))))
-          
-          (send dc set-origin vertical-axis-width horizontal-axis-height)
-          
-          ;; draw x axis
-          (let ([y (- 0 horizontal-axis-height label-line-size)])
-            (for/fold ([x 0])
-              ([i (in-range 0 (vector-length column-widths))])
-              (let ([str (format "~a" i)])
-                (let-values ([(w h d a) (send dc get-text-extent str)])
-                  (setup-colors dc (+ i 1) 0 #f)
-                  (send dc draw-rectangle x y
-                        (vector-ref column-widths i)
-                        horizontal-axis-height)
-                  (send dc draw-text str 
-                        (+ x (- (/ (vector-ref column-widths i) 2)
-                                (/ w 2)))
-                        y)
-                  (+ x (vector-ref column-widths i))))))
-          
-          ;; draw y axis
-          (for/fold ([y 0])
-            ([i (in-range 0 (vector-length row-heights))])
-            (let ([str (format "~a" (* i (vector-length column-widths)))])
-              (let-values ([(w h d a) (send dc get-text-extent str)])
-                (let ([x (- 0 label-line-size w vertical-axis-spacer)])
-                  (setup-colors dc 0 (+ i 1) #f)
-                  (send dc draw-rectangle 
-                        (- vertical-axis-width)
-                        y 
-                        (- vertical-axis-width label-line-size)
-                        (vector-ref row-heights i))
-                  (send dc draw-text str 
-                        x
-                        (+ y (- (/ (vector-ref row-heights i) 2)
-                                (/ h 2))))
-                  (+ y (vector-ref row-heights i))))))
-          
-          ;; draw cells (this is O(n^2), but it seems unlikely to ever matter
-          ;; to fix, one would have to precompute the partial sums of the widths
-          ;; and heights of the columns)
-          (for ([i (in-range 0 (round-up-to-even-multiple 
-                                (vector-length heap-vec)
-                                (vector-length column-widths)))])
-            (draw-cell dc i #f))
-          
-          (send dc set-bitmap #f))))
-        
-    (define/private (draw-cell dc i highlighted?)
-      (let-values ([(cell-x cell-y cell-w cell-h) (cell->ltwh i)])
-        (let* ([column (remainder i (vector-length column-widths))]
-               [row (quotient i (vector-length column-widths))])
-          (setup-colors dc (+ column 1) (+ row 1) highlighted?)
-          (send dc draw-rectangle cell-x cell-y cell-w cell-h)
-          (when (< i (vector-length heap-vec))
-            (let-values ([(ow oh) (cell-min-size (vector-ref heap-vec i))])
-              (send dc draw-text 
-                    (val->string (vector-ref heap-vec i))
-                    (+ cell-x (- (/ cell-w 2) (/ ow 2)))
-                    (+ cell-y (- (/ cell-h 2) (/ oh 2)))))))))
-    
-    (define/private (draw-arrow dc arrow)
-      (let-values ([(fcell-x fcell-y fcell-w fcell-h) (cell->ltwh (arrow-from arrow))]
-                   [(tcell-x tcell-y tcell-w tcell-h) (cell->ltwh (arrow-to arrow))])
-        (let ([alpha (send dc get-alpha)])
-          (send dc set-alpha 2/3)
-          (send dc set-brush highlighted-color 'solid)
-          (send dc set-pen "black" 1 'transparent)
-          (send dc draw-ellipse 
-                (+ fcell-x (/ fcell-w 2) -4) 
-                (+ fcell-y (/ fcell-h 2) -4)
-                8 8)
-          (let-values ([(x y)
-                        (fill-in-arrow (+ fcell-x (/ fcell-w 2)) 
-                                       (+ fcell-y (/ fcell-h 2))
-                                       (+ tcell-x (/ tcell-w 2))
-                                       (+ tcell-y (/ tcell-h 2)))])
-            (send dc draw-polygon arrow-points)
-            (send dc set-pen highlighted-color 2 'solid)
-            (send dc draw-line 
-                  (+ fcell-x (/ fcell-w 2)) 
-                  (+ fcell-y (/ fcell-h 2))
-                  x y))
-          (send dc set-alpha alpha))))
-    
-    (define arrow-point1 (make-object point%))
-    (define arrow-point2 (make-object point%))
-    (define arrow-point3 (make-object point%))
-    (define arrow-points (list arrow-point1 arrow-point2 arrow-point3))
-    
-      ;; fill-in-arrow : number^ -> number number
-      ;; returns the end point for the line, so that the line
-      ;; doesn't cross over the arrow
-    
-    (define triangle-left (make-polar 1 (* pi 1/12)))
-    (define triangle-right (make-polar 1 (* pi -1/12)))
-    (define/private (fill-in-arrow sx sy ex ey)
-      (let* ([dir (make-polar 16
-                              (angle (- (make-rectangular sx (- sy))
-                                        (make-rectangular ex (- ey)))))]
-             [left-corner (* dir triangle-left)]
-             [right-corner (* dir triangle-right)]
-             [line-end-point (/ (+ left-corner right-corner) 2)])
-        (send arrow-point1 set-x ex)
-        (send arrow-point1 set-y ey)
-        (send arrow-point2 set-x (+ ex (real-part left-corner)))
-        (send arrow-point2 set-y (+ ey (- (imag-part left-corner))))
-        (send arrow-point3 set-x (+ ex (real-part right-corner)))
-        (send arrow-point3 set-y (+ ey (- (imag-part right-corner))))
-        (values (/ (+ (send arrow-point2 get-x) (send arrow-point3 get-x)) 2)
-                (/ (+ (send arrow-point2 get-y) (send arrow-point3 get-y)) 2))))
-        
-    (define (cell->ltwh i)
-      (let* ([column (remainder i (vector-length column-widths))]
-             [row (quotient i (vector-length column-widths))]
-             [cell-x (vector-sum column-widths column)]
-             [cell-y (vector-sum row-heights row)])
-        (values cell-x cell-y 
-                (vector-ref column-widths column)
-                (vector-ref row-heights row))))
-          
-    (define/override (on-size w h)
-      (compute-sizes)
-      (redraw-offscreen)
-      (refresh))
-    
-    (define/private (mouse-xy->ij mx my)
-      (define (find-index start vec m-coord)
-        (let loop ([coord start]
-                   [i 0])
-          (cond
-            [(< i (vector-length vec))
-             (cond
-               [(<= coord m-coord (+ coord (vector-ref vec i)))
-                i]
-               [else
-                (loop (+ coord (vector-ref vec i))
-                      (+ i 1))])]
-            [else #f])))
-      (values (find-index vertical-axis-width column-widths mx)
-              (find-index horizontal-axis-height row-heights my)))
-    
-    (define/override (on-event evt)
-      (cond
-        [(or (send evt moving?)
-             (send evt entering?))
-         (set! mouse-x (send evt get-x))
-         (set! mouse-y (send evt get-y))]
-        [else
-         (set! mouse-x #f)
-         (set! mouse-y #f)])
-      (recompute-arrows-and-highlighted-cells))
-    
-    (define mouse-x #f)
-    (define mouse-y #f)
-    
-    (define/private (recompute-arrows-and-highlighted-cells)
-      (cond
-        [(and mouse-x mouse-y)
-         (let-values ([(i j) (mouse-xy->ij mouse-x mouse-y)])
-           (let ([index (and i j (+ (* j (vector-length column-widths)) i))])
-             (cond
-               [(and index (< index (vector-length heap-vec)))
-                (update-arrows (find-connections index))
-                (update-highlighted-cells (cons index (index->nexts index)))]
-               [else
-                (update-highlighted-cells '())
-                (update-arrows '())])))]
-        [else
-         (update-highlighted-cells '())
-         (update-arrows '())]))
-
-    (define/private (index->nexts index)
-      (if (< index (vector-length heap-vec))
-          (let ([n (vector-ref heap-vec index)])
-            (cond
-              [(and (exact-integer? n)
-                    (<= 0 n)
-                    (< n (vector-length heap-vec)))
-               (list n)]
-              [(closure-code? n)
-               '()]
-              [else
-               '()]))
-          '()))
-    
-    (define/private (find-connections start)
-      (let ([visited (make-hash)]
-            [ans '()])
-        (let loop ([i start])
-          (unless (hash-ref visited i #f)
-            (hash-set! visited i #t)
-            (for-each
-             (λ (next) 
-               (set! ans (cons (make-arrow i next) ans))
-               (loop next))
-             (index->nexts i))))
-        ans))
-    
-    (define/private (update-arrows new)
-      (when show-arrows?
-        (unless (equal? new arrows)
-          (set! arrows new)
-          (refresh))))
-    
-    (define/private (update-highlighted-cells new)
-      (when show-highlighted-cells?
-        (unless (equal? new highlighted-cells)
-          (set! highlighted-cells new)
-          (refresh))))
-    
-    (super-new)
-    
-    (setup-min-width/height)
-    (send (get-dc) set-smoothing 'aligned)))
-
-(define (round-up-to-even-multiple n cols)
-  (let ([%% (remainder n cols)])
-    (cond
-      [(zero? %%) n]
-      [else (+ n (- cols %%))])))
-
-(define highlighted-color "forestgreen")
-
-(define (setup-colors dc i j highlighted-cell?)
-  (send dc set-pen "black" 1 'transparent)
-  (cond
-    [highlighted-cell?
-     (send dc set-brush highlighted-color 'solid)
-     (send dc set-text-foreground (send the-color-database find-color "white"))]
-    [else
-     (send dc set-brush (ij->background-color i j) 'solid)
-     (send dc set-text-foreground (send the-color-database find-color (ij->text-color i j)))]))
-
-(define (ij->background-color i j)
-  (cond
-    [(zero? i)
-     (if (zero? (modulo j 5))
-         "black"
-         "white")]
-    [(zero? j)
-     (if (zero? (modulo i 2)) 
-         "gray"
-         "white")]
-    [(zero? (modulo j 5))
-     "black"]
-    [(zero? (modulo i 2))
-     "gray"]
-    [else
-     "white"]))
-
-(define (ij->text-color i j)
-  (let ([bkg (ij->background-color i j)])
-    (cond
-      [(equal? bkg "black")
-       "white"]
-      [else 
-       "black"])))
-
-(define (vector-sum v [cap (vector-length v)])
-  (for/fold ((sum 0))
-    ((i (in-range cap)))
-    (+ sum (vector-ref v i))))
-    
-
-(define heap-viz%
-  (class* object% (heap-viz<%>)
-    (init heap-vec)
-    (define eventspace (make-eventspace))
-    (define frame
-      (parameterize ([current-eventspace eventspace])
-        (new frame% [label "Heap"])))
-    (define canvas (new heap-canvas% [parent frame] [heap-vec heap-vec] [style '(no-autoclear)]))
-    (new grow-box-spacer-pane% [parent frame])
-    (send frame show #t)
-    
-    ;; protects 'queued'
-    (define queued-sema (make-semaphore 1))
-    (define queued #f)
-    
-    (define/public (update-view #:location loc) 
-      (semaphore-wait queued-sema)
-      (cond
-        [queued
-         (semaphore-post queued-sema)]
-        [else
-         (set! queued #t)
-         (semaphore-post queued-sema)
-         (parameterize ([current-eventspace eventspace])
-           (queue-callback
-            (λ () 
-              (semaphore-wait queued-sema)
-              (set! queued #f)
-              (semaphore-post queued-sema)
-              ;; we might get others queued while this happens, but that seems ok
-              (send canvas update-view))
-            ;; low priority, so that mouse movements and window resizes
-            ;; take priority (important in the case that the mutator is 
-            ;; running a tight loop that changes the heap)
-            #f))]))
-            
-    (super-new)))
diff --git a/pkgs/plai/gc2/private/gc-transformer.rkt b/pkgs/plai/gc2/private/gc-transformer.rkt
deleted file mode 100644
index bf0714ef2a..0000000000
--- a/pkgs/plai/gc2/private/gc-transformer.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/dict)
-(provide
- (contract-out
-  [find-referenced-locals (-> (listof identifier?) syntax? (listof identifier?))]
-  [switch-over (-> (listof identifier?) (listof identifier?) (listof identifier?) (listof identifier?))]))
-
-(define (find-referenced-locals env-ids stx)
-  (define id-hash
-    (make-custom-hash free-identifier=?
-                      (λ (v) (equal-hash-code (syntax->datum v)))
-                      (λ (v) (equal-secondary-hash-code (syntax->datum v)))))
-  (let find ([stx stx])
-    (syntax-case stx ()
-      [(head . tail)
-       (begin
-         (find #'head)
-         (find #'tail))]
-      [id (identifier? stx)
-          (unless (dict-ref id-hash stx #false)
-            (dict-set! id-hash stx #true))]
-      [_ (void)]))
-  (filter (λ (env-id) (dict-ref id-hash env-id #false)) env-ids))
-
-(define (switch-over src-ids dest-ids to-switch)
-  (for/list ([id (in-list to-switch)])
-    (or (for/or ([src-id (in-list src-ids)]
-                 [dest-id (in-list dest-ids)])
-          (and (free-identifier=? src-id id)
-               dest-id))
-        (error 'switch-over "didn't find src-id for ~s" id))))
-
diff --git a/pkgs/plai/info.rkt b/pkgs/plai/info.rkt
deleted file mode 100644
index 7dc858427a..0000000000
--- a/pkgs/plai/info.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang info
-
-(define collection "plai")
-
-(define blurb '("Language levels for the Programming Languages: Application and Interpretation textbook"))
-(define homepage "http://www.cs.brown.edu/~sk/Publications/Books/ProgLangs/")
-(define primary-file "main.rkt")
-
-(define scribblings '(("scribblings/plai.scrbl" (multi-page) (teaching -20))))
-(define release-note-files (list (list "PLAI" "HISTORY.txt")))
-(define deps '("scheme-lib"
-               "srfi-lite-lib"
-               "base"
-               "gui-lib"
-               "sandbox-lib"
-               "web-server-lib"))
-(define build-deps '("at-exp-lib"
-                     "eli-tester"
-                     "pconvert-lib"
-                     "rackunit-lib"
-                     "racket-doc"
-                     "web-server-doc"
-                     "scribble-lib"))
-
-(define pkg-desc "Teaching languages for _Programming Languages: Application and Interpretation_")
-
-(define pkg-authors '(jay))
diff --git a/pkgs/plai/lang/reader.rkt b/pkgs/plai/lang/reader.rkt
deleted file mode 100644
index f8b85a8e48..0000000000
--- a/pkgs/plai/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-(module reader syntax/module-reader
-  #:language `plai)
diff --git a/pkgs/plai/main.rkt b/pkgs/plai/main.rkt
deleted file mode 100644
index 0f738af107..0000000000
--- a/pkgs/plai/main.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket
-(require plai/datatype
-         plai/test-harness)
-
-(provide (all-from-out plai/datatype)
-         (except-out (all-from-out racket) error (for-syntax error) #%module-begin provide)
-         (except-out (all-from-out plai/test-harness) plai-error)
-         (rename-out [plai-error error] 
-                     [plai-module-begin #%module-begin])
-         (rename-out [plai-provide provide]))
-
-(define-syntax (plai-provide stx)
-  (raise-syntax-error #f "The PLAI language provides all defined names" stx))
-
-(define-syntax (plai-module-begin stx)
-  (syntax-case stx ()
-    [(_ body ...)
-     #`(#%module-begin
-        (provide #,(datum->syntax stx '(all-defined-out)))
-        body ...)]))
diff --git a/pkgs/plai/mutator.rkt b/pkgs/plai/mutator.rkt
deleted file mode 100644
index 620397864c..0000000000
--- a/pkgs/plai/mutator.rkt
+++ /dev/null
@@ -1,564 +0,0 @@
-#lang scheme
-(require (prefix-in scheme: scheme)
-         plai/private/command-line
-         (for-syntax plai/private/command-line)
-         plai/private/collector-exports
-         plai/private/gc-core
-         scheme/gui/dynamic
-         (only-in plai/test-harness
-                  exn:plai? equal~?
-                  plai-error generic-test test halt-on-errors print-only-errors)
-         (for-syntax scheme)
-         (for-syntax plai/private/gc-transformer)
-         scheme/stxparam
-         (for-syntax scheme/stxparam-exptime))
-
-(provide else require provide #%top
-         test/location=? 
-         test/value=?
-         (rename-out
-          [plai-error error]
-          
-          [mutator-and and]
-          [mutator-or or]
-          [mutator-cond cond]
-          [mutator-case case]
-          [mutator-define define]
-          [mutator-define-values define-values]
-          (mutator-let let)
-          [mutator-let* let*]
-          [mutator-begin begin]
-          
-          [mutator-if if]
-          [mutator-let-values let-values]
-          [mutator-set! set!]
-          [mutator-lambda lambda]
-          [mutator-lambda λ]
-          (mutator-app #%app)
-          (mutator-datum #%datum)
-          (collector:cons cons)
-          (collector:first first)
-          (collector:rest rest)
-          (mutator-quote quote)
-          (mutator-top-interaction #%top-interaction)
-          (mutator-module-begin #%module-begin)))
-
-(define-syntax-parameter mutator-name #f)
-(define-syntax-parameter mutator-tail-call? #t)
-(define-syntax-parameter mutator-env-roots empty)
-
-; Sugar Macros
-(define-syntax-rule (->address e) e)
-(define-syntax mutator-and
-  (syntax-rules ()
-    [(_) (mutator-quote #t)]
-    [(_ fe) fe]
-    [(_ fe e ...) (mutator-if fe (mutator-and e ...) (mutator-quote #f))]))
-(define-syntax mutator-or
-  (syntax-rules ()
-    [(_) (mutator-quote #f)]
-    [(_ fe) fe]
-    [(_ fe e ...) (mutator-let ([tmp fe]) (mutator-if tmp tmp (mutator-or e ...)))]))
-(define-syntax mutator-cond
-  (syntax-rules (else)
-    [(_) (mutator-begin)]
-    [(_ [else e ...]) (mutator-begin e ...)]
-    [(_ [q ans] e ...) (mutator-if q ans (mutator-cond e ...))]))
-(define-syntax mutator-case
-  (syntax-rules (else)
-    [(_ value
-        [(v ...) e ...]
-        ...
-        [else ee ...])
-     (mutator-let ([tmp value])
-                  (mutator-cond [(mutator-app mutator-member? tmp (mutator-quote (v ...)))
-                                 e ...]
-                                ...
-                                [else ee ...]))]
-    [(_ value
-        [(v ...) e ...]
-        ...)
-     (mutator-case value
-                   [(v ...) e ...]
-                   ...
-                   [else (mutator-begin)])]))
-(define-syntax mutator-define
-  (syntax-rules ()
-    [(_ (f a ...) e ...)
-     (mutator-define-values (f) 
-                            (syntax-parameterize ([mutator-name #'f])
-                                                 (mutator-lambda (a ...) e ...)))]
-    [(_ id e)
-     (mutator-define-values (id) 
-                            (syntax-parameterize ([mutator-name #'id])
-                                                 e))]))
-(define-syntax-rule (mutator-let ([id e] ...) be ...)
-  (mutator-let-values ([(id) (syntax-parameterize ([mutator-name #'id])
-                                                  e)]
-                       ...)
-                      be ...))
-(define-syntax mutator-let*
-  (syntax-rules ()
-    [(_ () be ...)
-     (mutator-begin be ...)]
-    [(_ ([fid fe] [rid re] ...) be ...)
-     (mutator-let ([fid fe])
-                  (mutator-let* ([rid re] ...)
-                                be ...))]))
-(define-syntax mutator-begin
-  (syntax-rules ()
-    [(_) (mutator-app void)]
-    [(_ e) e]
-    [(_ fe e ...)
-     (let ([tmp 
-            (syntax-parameterize ([mutator-tail-call? #f])
-                                 fe)])
-       (mutator-begin e ...))]))
-
-; Real Macros
-(define-syntax-rule (mutator-define-values (id ...) e)
-  (begin (define-values (id ...) 
-           (syntax-parameterize ([mutator-tail-call? #f])
-                                (->address e)))
-         (add-global-root! (make-env-root id))
-         ...))
-(define-syntax-rule (mutator-if test true false)
-  (if (syntax-parameterize ([mutator-tail-call? #f])
-                           (collector:deref (->address test)))
-      (->address true)
-      (->address false)))
-(define-syntax-rule (mutator-set! id e)
-  (begin
-    (set! id (->address e))
-    (mutator-app void)))
-(define-syntax (mutator-let-values stx)
-  (syntax-case stx ()
-    [(_ ([(id ...) expr]
-         ...)
-        body-expr)
-     (with-syntax ([((tmp ...) ...)
-                    (map generate-temporaries (syntax->list #'((id ...) ...)))])
-       (let ([binding-list (syntax->list #'((id ...) ...))])
-         (with-syntax ([((previous-id ...) ...)
-                        (build-list (length binding-list) 
-                                    (λ (n) (append-map syntax->list (take binding-list n))))])
-           (syntax/loc stx
-             (let*-values ([(tmp ...) 
-                            (syntax-parameterize
-                                ([mutator-env-roots 
-                                  (append
-                                   (switch-over
-                                    (syntax->list #'(id ... ...))
-                                    (syntax->list #'(tmp ... ...))
-                                    (find-referenced-locals
-                                     (list #'previous-id ...)
-                                     #'body-expr))
-                                   (syntax-parameter-value #'mutator-env-roots))]
-                                 [mutator-tail-call? #f])
-                                                 expr)]
-                           ...)
-               (let-values ([(id ...) (values tmp ...)]
-                            ...)
-                 (syntax-parameterize ([mutator-env-roots 
-                                        (append (find-referenced-locals
-                                                 (list #'id ... ...)
-                                                 #'body-expr)
-                                                (syntax-parameter-value #'mutator-env-roots))])
-                                      (->address body-expr))))))))]
-    [(_ ([(id ...) expr]
-         ...)
-        body-expr ...)
-     (syntax/loc stx
-       (mutator-let-values
-        ([(id ...) expr]
-         ...)
-        (mutator-begin body-expr ...)))]))
-(define-syntax (mutator-lambda stx)
-  (syntax-case stx ()
-    [(_ (id ...) body)
-     (let ([env-roots (syntax-parameter-value #'mutator-env-roots)])
-       (with-syntax ([(free-id ...) (find-referenced-locals env-roots stx)]
-                     [(env-id ...) env-roots]
-                     [closure (or (syntax-parameter-value #'mutator-name)
-                                  (syntax-local-name)
-                                  (let ([prop (syntax-property stx 'inferred-name)])
-                                    (if (or (identifier? prop)
-                                            (symbol? prop))
-                                        prop
-                                        #f))
-                                  (string->symbol "#<proc>"))])
-         (quasisyntax/loc stx
-           (let ([closure (lambda (id ...) 
-                            (syntax-parameterize ([mutator-env-roots 
-                                                   (append
-                                                    (find-referenced-locals
-                                                     (list #'id ...)
-                                                     #'body)
-                                                    (list #'free-id ...))]
-                                                  [mutator-tail-call? #t])
-                                                 (->address body)))])
-             (add-closure-env! closure (list (make-env-root free-id) ...))
-             #,(if (syntax-parameter-value #'mutator-tail-call?)
-                   (syntax/loc stx
-                     (#%app collector:alloc-flat closure))
-                   (syntax/loc stx
-                     (with-continuation-mark gc-roots-key 
-                       (list (make-env-root env-id) ...)
-                       (#%app collector:alloc-flat closure))))))))]
-    [(_ (id ...) body ...)
-     (syntax/loc stx
-       (mutator-lambda (id ...) (mutator-begin body ...)))]))
-(define-syntax (mutator-app stx)
-  (syntax-case stx ()
-    [(_ e ...)
-     (local [(define (do-not-expand? exp)
-               (and (identifier? exp)
-                    (free-identifier=? exp #'empty)))
-             (define exps
-               (syntax->list #'(e ...)))
-             (define tmps
-               (generate-temporaries #'(e ...)))]
-       (with-syntax ([(ne ...)
-                      (map (lambda (exp tmp) (if (do-not-expand? exp) exp tmp))
-                           exps tmps)])
-         (for/fold ([acc (syntax/loc stx (mutator-anf-app ne ...))])
-           ([exp (in-list (reverse exps))]
-            [tmp (in-list (reverse tmps))])
-           (if (do-not-expand? exp)
-               acc
-               (quasisyntax/loc stx
-                 (mutator-let ([#,tmp #,exp])
-                              #,acc))))))]))
-(define-syntax (mutator-anf-app stx)
-  (syntax-case stx ()
-    [(_ fe ae ...)
-     (with-syntax ([(env-id ...) (syntax-parameter-value #'mutator-env-roots)])
-       (if (syntax-parameter-value #'mutator-tail-call?)
-           ; If this call is in tail position, we will not need access to its environment when it returns.
-           (syntax/loc stx ((deref-proc fe) ae ...))
-           ; If this call is not in tail position, we make the environment at the call site
-           ; reachable.
-           #`(with-continuation-mark gc-roots-key 
-               (list (make-env-root env-id) ...)
-               #,(syntax/loc stx ((deref-proc fe) ae ...)))))]))
-(define-syntax mutator-quote
-  (syntax-rules ()
-    [(_ (a . d))
-     (mutator-app collector:cons (mutator-quote a) (mutator-quote d))]
-    [(_ s) 
-     (mutator-datum . s)]))
-(define-syntax (mutator-datum stx)
-  (syntax-case stx ()
-    [(_ . e) 
-     (quasisyntax/loc stx (mutator-anf-app collector:alloc-flat (#%datum . e)))]))
-
-(define-syntax (mutator-top-interaction stx)
-  (syntax-case stx (require provide mutator-define mutator-define-values test/value=? import-primitives)
-    [(_ . (require . e))
-     (syntax/loc stx
-       (require . e))]
-    [(_ . (provide . e))
-     (syntax/loc stx
-       (provide . e))]
-    [(_ . (mutator-define . e))
-     (syntax/loc stx
-       (mutator-define . e))]
-    [(_ . (mutator-define-values . e))
-     (syntax/loc stx
-       (mutator-define-values . e))]
-    [(_ . (test/value=? . e))
-     (syntax/loc stx
-       (test/value=? . e))]
-    [(_ . (import-primitives . e))
-     (syntax/loc stx
-       (import-primitives . e))]
-    [(_ . expr)
-     (syntax/loc stx
-       (call-with-values
-        (lambda ()
-          (syntax-parameterize ([mutator-tail-call? #f])
-                               (->address expr)))
-        (case-lambda
-          [() (void)]
-          [(result-addr)
-           (cond
-             [(procedure? result-addr)
-              (printf "Imported procedure\n")
-              result-addr]
-             [(location? result-addr)
-              (printf "Value at location ~a:\n" result-addr)
-              (gc->scheme result-addr)])])))]))
-
-; Module Begin
-(define-for-syntax (allocator-setup-internal stx)
-  (syntax-case stx ()
-    [(collector-module heap-size)
-     (with-syntax ([(init-allocator gc:deref gc:alloc-flat gc:cons 
-                                    gc:first gc:rest 
-                                    gc:flat? gc:cons?
-                                    gc:set-first! gc:set-rest!)
-                    (map (λ (s) (datum->syntax stx s))
-                         '(init-allocator gc:deref gc:alloc-flat gc:cons 
-                                          gc:first gc:rest 
-                                          gc:flat? gc:cons?
-                                          gc:set-first! gc:set-rest!))]) 
-       (begin
-         #`(begin
-             #,(if (alternate-collector)
-                   #`(require #,(datum->syntax #'collector-module (alternate-collector)))
-                   #`(require collector-module))
-             
-             (set-collector:deref! gc:deref)
-             (set-collector:alloc-flat! gc:alloc-flat)
-             (set-collector:cons! gc:cons)
-             (set-collector:first! gc:first)
-             (set-collector:rest! gc:rest)
-             (set-collector:flat?! gc:flat?)
-             (set-collector:cons?! gc:cons?)
-             (set-collector:set-first!! gc:set-first!)
-             (set-collector:set-rest!! gc:set-rest!)
-             
-             (init-heap! (#%datum . heap-size))
-             (when (gui-available?) 
-               (if (<= (#%datum . heap-size) 500)
-                   (set-ui! (dynamic-require `plai/private/gc-gui 'heap-viz%))
-                   (printf "Large heap; the heap visualizer will not be displayed.\n")))
-             (init-allocator))))]
-    [_ (raise-syntax-error 'mutator 
-                           "Mutator must start with an 'allocator-setup' expression, such as: (allocator-setup <module-path> <literal-number>)"
-                           stx)]))
-
-(define-for-syntax allocator-setup-error-msg
-  "Mutator must start with an 'allocator-setup' expression, such as: (allocator-setup <module-path> <literal-number>)")
-
-(define-syntax (mutator-module-begin stx)
-  (syntax-case stx (allocator-setup)
-    [(_ (allocator-setup . setup) module-expr ...)
-     (begin
-       (syntax-case #'setup ()
-         [(collector heap-size)
-          (begin
-            (unless (module-path? (syntax->datum #'collector))
-              (raise-syntax-error 'allocator-setup "expected a module path" #'collector))
-            (unless (number? (syntax->datum #'heap-size))
-              (raise-syntax-error 'allocator-setup "expected a literal number" #'heap-size)))]
-         [_
-          (raise-syntax-error 'mutator allocator-setup-error-msg (syntax/loc #'setup (allocator-setup . setup)))])
-       (quasisyntax/loc stx
-         (#%module-begin
-          #,(allocator-setup-internal #'setup)
-          #,@(for/list ([me (in-list (syntax->list #'(module-expr ...)))])
-               (quasisyntax/loc me
-                 (mutator-top-interaction . #,me))))))]
-    [(_ first-expr module-expr ...)
-     (raise-syntax-error 'mutator allocator-setup-error-msg #'first-expr)]
-    [(_)
-     (raise-syntax-error 'mutator allocator-setup-error-msg)]))
-
-; User Macros
-(provide import-primitives)
-(define-syntax (import-primitives stx)
-  (syntax-case stx ()
-    [(_ id ...) 
-     (andmap identifier? (syntax->list #'(id ...)))
-     (with-syntax ([(renamed-id ...) (generate-temporaries #'(id ...))]
-                   [source (syntax-local-get-shadower
-                            (syntax-local-introduce #'scheme))])
-       #`(begin
-           (require (only-in source [id renamed-id] ...))
-           (define id
-             (lambda args
-               (unless (andmap (lambda (v) (and (location? v) (collector:flat? v))) args)
-                 (error 'id (string-append "all arguments must be <heap-value?>s, "
-                                           "even if the imported procedure accepts structured "
-                                           "data")))
-               (let ([result (apply renamed-id (map collector:deref args))])
-                 (cond
-                   [(void? result) (void)]
-                   [(heap-value? result) (collector:alloc-flat result)]
-                   [else 
-                    (error 'id (string-append "imported primitive must return <heap-value?>, "
-                                              "received ~a" result))]))))
-           ...))]
-    [(_ maybe-id ...) 
-     (ormap (λ (v) (and (not (identifier? v)) v)) (syntax->list #'(maybe-id ...)))
-     (let ([offending-stx (findf (λ (v) (not (identifier? v))) (syntax->list #'(maybe-id ...)))])
-       (raise-syntax-error 
-        #f "expected identifier to import" offending-stx))]
-    [(_ . __)
-     (raise-syntax-error #f "expected list of identifiers to import" stx)]
-    [_ (raise-syntax-error #f "expected open parenthesis before import-primitive")]))
-
-; User Functions
-(define (mutator-lift f) 
-  (lambda args
-    (let ([result (apply f (map collector:deref args))])
-      (if (void? result)
-          (void)
-          (collector:alloc-flat result)))))
-(define-syntax (provide/lift stx)
-  (syntax-case stx ()
-    [(_ id ...)
-     (andmap identifier? (syntax->list #'(id ...)))
-     (with-syntax ([(lifted-id ...) (generate-temporaries #'(id ...))])
-       #'(begin
-           (define lifted-id (mutator-lift id)) ...
-           (provide (rename-out [lifted-id id] ...))))]))
-
-(provide/lift 
- symbol? boolean? number? symbol=?
- add1 sub1 zero? + - * / even? odd? = < > <= >=)
-
-(define (member? v l)
-  (and (member v l) #t))
-(define (mutator-member? v l)
-  (collector:alloc-flat
-   (member? (collector:deref v)
-            (gc->scheme l))))
-
-(provide (rename-out (mutator-set-first! set-first!)))
-(define (mutator-set-first! x y)
-  (collector:set-first! x y)
-  (void))
-
-(provide (rename-out (mutator-set-rest! set-rest!)))
-(define (mutator-set-rest! x y)
-  (collector:set-rest! x y)
-  (void))
-
-(provide (rename-out [mutator-empty empty]))
-(define-syntax mutator-empty
-  (syntax-id-rules (mutator-empty)
-    [_ (mutator-quote ())]))
-
-(provide (rename-out (mutator-empty? empty?)))
-(define (mutator-empty? loc)
-  (cond
-    [(collector:flat? loc) 
-     (collector:alloc-flat (empty? (collector:deref loc)))]
-    [else 
-     (collector:alloc-flat false)]))
-
-(provide (rename-out [mutator-cons? cons?]))
-(define (mutator-cons? loc)
-  (collector:alloc-flat (collector:cons? loc)))
-
-(provide (rename-out [mutator-eq? eq?]))
-(define (mutator-eq? l1 l2)
-  (collector:alloc-flat (= l1 l2)))
-
-(provide (rename-out [mutator-printf printf]))
-(define-syntax (mutator-printf stx)
-  (syntax-case stx ()
-    [(_ fmt arg ...)
-     ; We must invoke mutator-app to A-normalize the arguments.
-     (syntax/loc stx 
-       (begin
-         (mutator-app printf (#%datum . fmt)
-                      (mutator-app gc->scheme arg) ...)
-         (void)))]))
-
-(provide (rename-out
-          (mutator-halt-on-errors halt-on-errors)
-          (mutator-print-only-errors print-only-errors)))
-(define-syntax (mutator-halt-on-errors stx)
-  (syntax-case stx ()
-    [(_) #'(halt-on-errors)]
-    [(_ arg) #'(#%app halt-on-errors (#%datum . arg))]))
-
-(define-syntax (mutator-print-only-errors stx)
-  (syntax-case stx ()
-    [(_) #'(print-only-errors)]
-    [(_ arg) #'(#%app print-only-errors (#%datum . arg))]))
-
-; Implementation Functions
-(define (deref proc/loc)
-  (cond
-    [(procedure? proc/loc) proc/loc]
-    [(location? proc/loc) (collector:deref proc/loc)]
-    [else (error 'deref "expected <location?> or <procedure?>; received ~a" proc/loc)]))
-
-(define (deref-proc proc-or-loc)
-  (define v 
-    (with-handlers ([exn? (lambda (x) 
-                            (error 'procedure-application "expected procedure, given something else"))])
-      (deref proc-or-loc)))
-  (if (procedure? v)
-      v
-      (error 'procedure-application "expected procedure, given ~e" v)))
-
-(define (gc->scheme loc)
-  (define-struct an-unset ())
-  (define unset (make-an-unset))
-  (define phs (make-hash))
-  (define (unwrap loc)
-    (if (hash-has-key? phs loc)
-        (hash-ref phs loc)
-        (begin
-          (local [(define ph (make-placeholder unset))]
-            (hash-set! phs loc ph)
-            (cond
-              [(collector:flat? loc)
-               (placeholder-set! ph (collector:deref loc))]
-              [(collector:cons? loc)
-               (local [(define car-ph (make-placeholder unset))
-                       (define cdr-ph (make-placeholder unset))]
-                 (placeholder-set! ph (cons car-ph cdr-ph))
-                 (placeholder-set! car-ph (unwrap (collector:first loc)))
-                 (placeholder-set! cdr-ph (unwrap (collector:rest loc))))]
-              [else 
-               (error (format "gc:flat? and gc:cons? both returned false for ~a" loc))])
-            (placeholder-get ph)))))
-  (make-reader-graph (unwrap loc)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Testing support
-
-(define-syntax (test/location=? stx)
-  (syntax-case stx ()
-    [(_ e1 e2)
-     (quasisyntax/loc stx
-       (generic-test 
-        (λ () e1) 
-        (λ (result-value)
-          (define expected-val e2)
-          (values
-           (cond
-             [(exn:plai? result-value) result-value]
-             [(equal~? result-value expected-val) true]
-             [else false])
-           expected-val))
-        (quote (heap-loc #,(syntax->datum #'e1)))
-        (format "at line ~a" #,(syntax-line stx))))]))
-
-(define-for-syntax (flat-heap-value? v)
-  (or (number? v) (boolean? v)))
-
-(define-syntax (expand-scheme stx)
-  (syntax-case stx (mutator-quote mutator-datum)
-    [(_ val) (flat-heap-value? (syntax->datum #'val)) #'(#%datum . val)]
-    [(_ (mutator-datum . val))
-     #'(#%datum . val)]
-    [(_ (mutator-quote e))
-     #'(quote e)]
-    [_ 
-     (raise-syntax-error 'test/value=? "must be a number, boolean or a quoted value" stx)]))
-
-(define-syntax (test/value=? stx)
-  (syntax-case stx (mutator-quote)
-    [(_ mutator-expr scheme-datum)
-     (quasisyntax/loc stx
-       (generic-test 
-        (λ () 
-          (mutator-let ([v1 mutator-expr])
-                       (gc->scheme v1))) 
-        (λ (result-value)
-          (define expected-val (expand-scheme scheme-datum))
-          (values
-           (cond
-             [(exn:plai? result-value) result-value]
-             [(equal~? result-value expected-val) true]
-             [else false])
-           expected-val))
-        (quote #,(syntax->datum #'mutator-expr))
-        (format "at line ~a" #,(syntax-line stx))))]))
diff --git a/pkgs/plai/mutator/lang/reader.rkt b/pkgs/plai/mutator/lang/reader.rkt
deleted file mode 100644
index 370ea7039c..0000000000
--- a/pkgs/plai/mutator/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-(module reader syntax/module-reader
-  #:language `plai/mutator)
diff --git a/pkgs/plai/plai-large.gif b/pkgs/plai/plai-large.gif
deleted file mode 100644
index 42860240e2..0000000000
Binary files a/pkgs/plai/plai-large.gif and /dev/null differ
diff --git a/pkgs/plai/plai-small.gif b/pkgs/plai/plai-small.gif
deleted file mode 100644
index 13f1afde15..0000000000
Binary files a/pkgs/plai/plai-small.gif and /dev/null differ
diff --git a/pkgs/plai/private/collector-exports.rkt b/pkgs/plai/private/collector-exports.rkt
deleted file mode 100644
index a8ac1f0b53..0000000000
--- a/pkgs/plai/private/collector-exports.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang scheme
-(provide (all-defined-out))
-
-(define collector:deref false)
-(define collector:alloc-flat false)
-(define collector:cons false)
-(define collector:first false)
-(define collector:rest false)
-(define collector:flat? false)
-(define collector:cons? false)
-(define collector:set-first! false)
-(define collector:set-rest! false)
-
-(define (set-collector:deref! proc)
-  (set! collector:deref proc))
-
-(define (set-collector:alloc-flat! proc)
-  (set! collector:alloc-flat proc))
-
-(define (set-collector:cons! proc)
-  (set! collector:cons proc))
-
-(define (set-collector:first! proc)
-  (set! collector:first proc))
-
-(define (set-collector:rest! proc)
-  (set! collector:rest proc))
-
-(define (set-collector:flat?! proc)
-  (set! collector:flat? proc))
-
-(define (set-collector:cons?! proc)
-  (set! collector:cons? proc))
-
-(define (set-collector:set-first!! proc)
-  (set! collector:set-first! proc))
-
-(define (set-collector:set-rest!! proc)
-  (set! collector:set-rest! proc))
diff --git a/pkgs/plai/private/command-line.rkt b/pkgs/plai/private/command-line.rkt
deleted file mode 100644
index e1834f0e51..0000000000
--- a/pkgs/plai/private/command-line.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scheme
-
-(provide disable-tests provide abridged-test-output gc-disable-import-gc?
-         alternate-collector set-alternate-collector!)
-
-
-;;; HACK!!!
-(define (alternate-collector)
-  (getenv "PLAI_ALTERNATE_COLLECTOR"))
-(define (set-alternate-collector! path)
-  (putenv "PLAI_ALTERNATE_COLLECTOR"
-          (if (path? path) (path->string path) path)))
-
-
-(define gc-disable-import-gc? (make-parameter false))
-(define disable-tests (make-parameter false))
-(define abridged-test-output (make-parameter false))
diff --git a/pkgs/plai/private/gc-core.rkt b/pkgs/plai/private/gc-core.rkt
deleted file mode 100644
index afe18b756c..0000000000
--- a/pkgs/plai/private/gc-core.rkt
+++ /dev/null
@@ -1,204 +0,0 @@
-#lang scheme
-(require
- (for-syntax scheme))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Locations
-#|
-(provide wrapped-location?)
-(define-struct wrapped-location (location))
-
-(provide/contract (wrap-location (location? . -> . wrapped-location?)))
-(define (wrap-location loc)
-  (make-wrapped-location loc))
-
-(provide/contract (unwrap-location (wrapped-location? . -> . location?)))
-(define (unwrap-location wloc)
-  (wrapped-location-location wloc))
-|#
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Heap management
-(provide current-heap)
-(define current-heap (make-parameter false))
-
-(define (format-cell cell)
-  (let* ([str (format "~s" cell)]
-         [len (string-length str)])
-    (if (<= len 10)
-        (string-append str (build-string (- 10 len) (λ (_) #\space)))
-        (substring str 0 10))))
-
-;;; Textual representation of the heap
-(provide heap-as-string)
-(define (heap-as-string)
-  (let ([step 0])
-    (apply string-append
-           (for/list ([elt (in-vector (current-heap))])
-             (cond
-               [(= step 0) 
-                (begin
-                  (set! step (add1 step))
-                  (format-cell elt))]
-               [(= step 9) 
-                (begin
-                  (set! step 0)
-                  (string-append (format-cell elt) "\n"))]
-               [else
-                (begin
-                  (set! step (add1 step))
-                  (string-append " " (format-cell elt)))])))))
-
-;;; Predicate determines values that may be stored on the heap.  Limit this to "small" values that
-;;; conceptually occupy a small, fixed amount of space.  Closures are an exception.
-(provide/contract [heap-value? (any/c . -> . boolean?)])
-(define (heap-value? v)
-  (or (number? v) (symbol? v) (boolean? v) (empty? v) (procedure? v)))
-
-(provide location?)
-(define (location? v)
-  (if (vector? (current-heap))
-      (and (exact-nonnegative-integer? v) (< v (vector-length (current-heap))))
-      (error "Heap is uninitialized")))
-
-(provide/contract (init-heap! (exact-nonnegative-integer? . -> . void?)))
-(define (init-heap! size)
-  (current-heap (build-vector size (λ (ix) false))))
-
-(provide/contract (heap-set! (location? heap-value? . -> . void?)))
-(define (heap-set! location value)
-  (vector-set! (current-heap) location value)
-  (when gui
-    (send gui update-view #:location location)))
-
-(provide/contract (heap-ref (location? . -> . heap-value?)))
-(define (heap-ref location)
-  (vector-ref (current-heap) location))
-
-(provide/contract (heap-size (-> (or/c false/c exact-nonnegative-integer?))))
-(define (heap-size)
-  (and (vector? (current-heap)) (vector-length (current-heap))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Root set management
-
-(provide gc-roots-key)
-(define gc-roots-key (gensym 'gc-roots-key))
-
-;;; Roots are defined with custom getters and setters as they can be created in various ways.
-(provide root? root-name make-root)
-(define-struct root (name get set!)
-  #:property prop:custom-write (λ (v port write?)
-                                 (display (format "#<root:~a>" (root-name v)) port)))
-
-(provide make-env-root)
-(define-syntax (make-env-root stx)
-  (syntax-case stx ()
-    [(_ id) (identifier? #'id)
-            #`(make-root 'id (λ () id) (λ (loc) (set! id loc)))]))
-
-;;; Roots on the stack.
-(provide/contract (stack-roots (-> (listof root?))))
-(define (stack-roots)
-  (filter is-mutable-root?
-          (apply append (continuation-mark-set->list (current-continuation-marks) gc-roots-key))))
-
-; An immutable root is a reference to a value or procedure in the Scheme heap.
-(define (is-mutable-root? root)
-  (location? ((root-get root))))
-
-(provide/contract (make-stack-root (symbol? location? . -> . root?)))
-(define (make-stack-root id location)
-  (make-root id (λ () location) (λ (new-location) (set! location new-location))))
-
-(provide/contract (read-root (root? . -> . location?)))
-(define (read-root root)
-  ((root-get root)))
-
-(provide/contract (set-root! (root? location? . -> . any)))
-(define (set-root! root loc)
-  ((root-set! root) loc))
-
-(provide/contract (get-global-roots (-> (listof root?))))
-(define (get-global-roots)
-  (filter is-mutable-root? global-roots))
-
-(define global-roots empty)
-
-(provide/contract (add-global-root! (root? . -> . void?)))
-(define (add-global-root! root)
-  (set! global-roots (cons root global-roots)))
-
-(provide get-root-set)
-(define-syntax (get-root-set stx)
-  (syntax-case stx ()
-    [(_ root-id ...)
-     (andmap identifier? (syntax->list #'(root-id ...)))
-     #`(get-root-set/proc (list root-id ...) '(root-id ...))]
-    [(_ e ...)
-     (let ([err (ormap (λ (x) (and (not (identifier? x)) x)) (syntax->list #'(e ...)))])
-       (raise-syntax-error false
-                           "expected an identifier to treat as a root"
-                           stx
-                           err))]
-    [_ (raise-syntax-error false
-                           "missing open parenthesis"
-                           stx)]))
-
-(define (get-root-set/proc root-locs root-ids)
-  (append
-   (for/list ([root-loc (in-list root-locs)]
-              [root-id (in-list root-ids)])
-     (if (location? root-loc)
-         (make-root root-id
-                    (λ () root-loc) 
-                    (λ (loc) (set! root-loc loc)))
-         (error 'get-root-set "expected a location, given ~e" root-loc)))
-   (get-global-roots)
-   (stack-roots)
-   (user-specified-roots)))
-
-(provide with-roots)
-(define-syntax-rule 
-  (with-roots e1 e2 e3 ...)
-  (with-roots/proc e1 (λ () e2 e3 ...)))
-
-(define (with-roots/proc roots thunk)
-  (define c (listof location?))
-  (unless (c roots)
-    (raise-argument-error 'with-roots
-                          (format "~s" (contract-name c))
-                          roots))
-  (parameterize ([user-specified-roots (append roots (user-specified-roots))])
-    (thunk)))
-
-(define user-specified-roots (make-parameter '()))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Environments of closures
-
-; Once the closure is garbage collected, its environment is only reachable by a weak reference to 
-; the closure.
-(define closure-envs (make-weak-hash))
-
-(provide/contract (add-closure-env! (procedure? (listof root?) . -> . any)))
-(define (add-closure-env! proc roots)
-  (hash-set! closure-envs proc roots))
-
-(provide/contract (get-closure-env (procedure? . -> . (or/c false/c (listof root?)))))
-(define (get-closure-env proc)
-  (hash-ref closure-envs proc false))
-
-(provide/contract (procedure-roots (procedure? . -> . (listof root?))))
-(define (procedure-roots proc)
-  (filter is-mutable-root? (hash-ref closure-envs proc empty)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Optional UI
-
-(provide set-ui!)
-(define (set-ui! ui%)
-  (set! gui (new ui% [heap-vec (current-heap)])))
-
-(define gui false)
diff --git a/pkgs/plai/private/gc-gui.rkt b/pkgs/plai/private/gc-gui.rkt
deleted file mode 100644
index 61100a8cd8..0000000000
--- a/pkgs/plai/private/gc-gui.rkt
+++ /dev/null
@@ -1,448 +0,0 @@
-#lang scheme/gui
-(require "gc-core.rkt")
-(provide heap-viz%)
-
-(define row-size 10)
-
-(define heap-viz<%> (interface () update-view))
-
-(define horizontal-axis-height 0)
-(define vertical-axis-width 0)
-(define label-line-size 2)
-(define cell-horizontal-padding 6)
-(define cell-vertical-padding 4)
-(define vertical-axis-spacer 2)
-
-(define-struct arrow (from to) #:transparent)
-
-(define show-arrows? #t)
-(define show-highlighted-cells? #f)
-
-(define heap-canvas%
-  (class* canvas% (heap-viz<%>)
-    
-    (init-field heap-vec)
-  
-    (define column-widths (make-vector 
-                           (cond
-                             [(<= (vector-length heap-vec) 300) 10]
-                             [else 20])
-                           0))
-    (define row-heights (make-vector (ceiling (/ (vector-length heap-vec) 
-                                                 (vector-length column-widths)))
-                                     0))
-    
-    (define arrows '())
-    (define highlighted-cells '())
-    
-    (define/public (update-view)
-      (setup-min-width/height)
-      (redraw-offscreen)
-      (recompute-arrows-and-highlighted-cells)
-      (on-paint))
-
-    (inherit get-dc get-client-size refresh min-width min-height)
-    
-    (define/private (setup-min-width/height)
-      (fill-in-min-sizes)
-      (min-width (ceiling (inexact->exact (+ vertical-axis-width (vector-sum column-widths)))))
-      (min-height (ceiling (inexact->exact (+ horizontal-axis-height (vector-sum row-heights)))))
-      (compute-sizes))
-    
-    (define/private (compute-sizes)
-      (fill-in-min-sizes)
-      (let-values ([(w h) (get-client-size)])
-        
-        (define (distribute-extras sizes avail-size)
-          (let ([min-size (vector-sum sizes)])
-            (cond
-              [(< avail-size min-size) 
-               ;; just give up here; we'll draw outside the frame and get clipped
-               ;; could try to shrink the bigger columns or something, tho.
-               (void)]
-              [else
-               ;; distribute the extra width evenly to all the columns
-               (let ([extra-space (/ (- avail-size min-size)
-                                     (vector-length sizes))])
-                 (for ([i (in-range 0 (vector-length sizes))])
-                   (vector-set! sizes
-                                i
-                                (+ (vector-ref sizes i)
-                                   extra-space))))])))
-        
-        (distribute-extras column-widths (- w vertical-axis-width))
-        (distribute-extras row-heights (- h horizontal-axis-height))))
-        
-    (define/private (fill-in-min-sizes)
-      (let ([dc (get-dc)])
-        (let-values ([(w h d a) 
-                      (send dc get-text-extent (format "~a" (vector-length heap-vec)))])
-          (set! vertical-axis-width (+ w label-line-size vertical-axis-spacer)))
-        (let-values ([(w h d a) (send dc get-text-extent "1")])
-          (set! horizontal-axis-height (+ h label-line-size))))
-      
-      (for ([i (in-range 0 (vector-length heap-vec))])
-        (let ([column (remainder i (vector-length column-widths))]
-              [row (quotient i (vector-length column-widths))])
-          (let-values ([(cw ch) (cell-min-size (vector-ref heap-vec i))])
-            (vector-set! row-heights 
-                         row
-                         (max (+ ch cell-vertical-padding)
-                              #;(vector-ref row-heights row)))
-            (vector-set! column-widths 
-                         column
-                         (max (+ cw cell-horizontal-padding) 
-                              #;(vector-ref column-widths column)))))))
-    
-    (define/private (cell-min-size obj)
-      (let ([dc (get-dc)])
-        (let-values ([(w h d a) (send dc get-text-extent (val->string obj))])
-          (values w h))))
-    
-    (define/private (val->string obj)
-      (cond
-        [(boolean? obj) (if obj "#t" "#f")]
-        [(number? obj) (format "~a" obj)]
-        [(procedure? obj)
-         (if (object-name obj)
-             (format "~a" (object-name obj))
-             "#<proc>")]
-        [(symbol? obj) (format "'~s" obj)]
-        [(null? obj) "empty"]
-        [else (error 'val->string "unknown object, expected a heap-value.")]))
-    
-    (define/override (on-paint)
-      (unless offscreen (redraw-offscreen))
-      (let ([dc (get-dc)])
-        (send dc set-origin 0 0)
-        (send dc draw-bitmap offscreen 0 0)
-        (send dc set-origin vertical-axis-width horizontal-axis-height)
-        (for-each (λ (i) (draw-cell dc i #t))
-                  highlighted-cells)
-        (for-each (λ (arrow) (draw-arrow dc arrow))
-                  arrows)))
-    
-    (define offscreen #f)
-    
-    (define/private (redraw-offscreen)
-      (let-values ([(w h) (get-client-size)])
-        (when (or (not offscreen)
-                  (not (equal? w (send offscreen get-width)))
-                  (not (equal? h (send offscreen get-height))))
-          (set! offscreen (make-object bitmap% w h)))
-        (let ([dc (make-object bitmap-dc% offscreen)])
-          (send dc set-smoothing 'aligned)
-          (send dc clear)
-          
-          (send dc set-origin 0 0)
-          
-          ;; draw lines
-          (let-values ([(w h) (get-client-size)])
-            (send dc set-pen "navy" label-line-size 'solid)
-            (send dc draw-line 
-                  (- vertical-axis-width (/ label-line-size 2)) 0
-                  (- vertical-axis-width (/ label-line-size 2)) h)
-            (send dc draw-line 
-                  0 (- horizontal-axis-height (/ label-line-size 2))
-                  w (- horizontal-axis-height (/ label-line-size 2))))
-          
-          (send dc set-origin vertical-axis-width horizontal-axis-height)
-          
-          ;; draw x axis
-          (let ([y (- 0 horizontal-axis-height label-line-size)])
-            (for/fold ([x 0])
-              ([i (in-range 0 (vector-length column-widths))])
-              (let ([str (format "~a" i)])
-                (let-values ([(w h d a) (send dc get-text-extent str)])
-                  (setup-colors dc (+ i 1) 0 #f)
-                  (send dc draw-rectangle x y
-                        (vector-ref column-widths i)
-                        horizontal-axis-height)
-                  (send dc draw-text str 
-                        (+ x (- (/ (vector-ref column-widths i) 2)
-                                (/ w 2)))
-                        y)
-                  (+ x (vector-ref column-widths i))))))
-          
-          ;; draw y axis
-          (for/fold ([y 0])
-            ([i (in-range 0 (vector-length row-heights))])
-            (let ([str (format "~a" (* i (vector-length column-widths)))])
-              (let-values ([(w h d a) (send dc get-text-extent str)])
-                (let ([x (- 0 label-line-size w vertical-axis-spacer)])
-                  (setup-colors dc 0 (+ i 1) #f)
-                  (send dc draw-rectangle 
-                        (- vertical-axis-width)
-                        y 
-                        (- vertical-axis-width label-line-size)
-                        (vector-ref row-heights i))
-                  (send dc draw-text str 
-                        x
-                        (+ y (- (/ (vector-ref row-heights i) 2)
-                                (/ h 2))))
-                  (+ y (vector-ref row-heights i))))))
-          
-          ;; draw cells (this is O(n^2), but it seems unlikely to ever matter
-          ;; to fix, one would have to precompute the partial sums of the widths
-          ;; and heights of the columns)
-          (for ([i (in-range 0 (round-up-to-even-multiple 
-                                (vector-length heap-vec)
-                                (vector-length column-widths)))])
-            (draw-cell dc i #f))
-          
-          (send dc set-bitmap #f))))
-        
-    (define/private (draw-cell dc i highlighted?)
-      (let-values ([(cell-x cell-y cell-w cell-h) (cell->ltwh i)])
-        (let* ([column (remainder i (vector-length column-widths))]
-               [row (quotient i (vector-length column-widths))])
-          (setup-colors dc (+ column 1) (+ row 1) highlighted?)
-          (send dc draw-rectangle cell-x cell-y cell-w cell-h)
-          (when (< i (vector-length heap-vec))
-            (let-values ([(ow oh) (cell-min-size (vector-ref heap-vec i))])
-              (send dc draw-text 
-                    (val->string (vector-ref heap-vec i))
-                    (+ cell-x (- (/ cell-w 2) (/ ow 2)))
-                    (+ cell-y (- (/ cell-h 2) (/ oh 2)))))))))
-    
-    (define/private (draw-arrow dc arrow)
-      (let-values ([(fcell-x fcell-y fcell-w fcell-h) (cell->ltwh (arrow-from arrow))]
-                   [(tcell-x tcell-y tcell-w tcell-h) (cell->ltwh (arrow-to arrow))])
-        (let ([alpha (send dc get-alpha)])
-          (send dc set-alpha 2/3)
-          (send dc set-brush highlighted-color 'solid)
-          (send dc set-pen "black" 1 'transparent)
-          (send dc draw-ellipse 
-                (+ fcell-x (/ fcell-w 2) -4) 
-                (+ fcell-y (/ fcell-h 2) -4)
-                8 8)
-          (let-values ([(x y)
-                        (fill-in-arrow (+ fcell-x (/ fcell-w 2)) 
-                                       (+ fcell-y (/ fcell-h 2))
-                                       (+ tcell-x (/ tcell-w 2))
-                                       (+ tcell-y (/ tcell-h 2)))])
-            (send dc draw-polygon arrow-points)
-            (send dc set-pen highlighted-color 2 'solid)
-            (send dc draw-line 
-                  (+ fcell-x (/ fcell-w 2)) 
-                  (+ fcell-y (/ fcell-h 2))
-                  x y))
-          (send dc set-alpha alpha))))
-    
-    (define arrow-point1 (make-object point%))
-    (define arrow-point2 (make-object point%))
-    (define arrow-point3 (make-object point%))
-    (define arrow-points (list arrow-point1 arrow-point2 arrow-point3))
-    
-      ;; fill-in-arrow : number^ -> number number
-      ;; returns the end point for the line, so that the line
-      ;; doesn't cross over the arrow
-    
-    (define triangle-left (make-polar 1 (* pi 1/12)))
-    (define triangle-right (make-polar 1 (* pi -1/12)))
-    (define/private (fill-in-arrow sx sy ex ey)
-      (let* ([dir (make-polar 16
-                              (angle (- (make-rectangular sx (- sy))
-                                        (make-rectangular ex (- ey)))))]
-             [left-corner (* dir triangle-left)]
-             [right-corner (* dir triangle-right)]
-             [line-end-point (/ (+ left-corner right-corner) 2)])
-        (send arrow-point1 set-x ex)
-        (send arrow-point1 set-y ey)
-        (send arrow-point2 set-x (+ ex (real-part left-corner)))
-        (send arrow-point2 set-y (+ ey (- (imag-part left-corner))))
-        (send arrow-point3 set-x (+ ex (real-part right-corner)))
-        (send arrow-point3 set-y (+ ey (- (imag-part right-corner))))
-        (values (/ (+ (send arrow-point2 get-x) (send arrow-point3 get-x)) 2)
-                (/ (+ (send arrow-point2 get-y) (send arrow-point3 get-y)) 2))))
-        
-    (define (cell->ltwh i)
-      (let* ([column (remainder i (vector-length column-widths))]
-             [row (quotient i (vector-length column-widths))]
-             [cell-x (vector-sum column-widths column)]
-             [cell-y (vector-sum row-heights row)])
-        (values cell-x cell-y 
-                (vector-ref column-widths column)
-                (vector-ref row-heights row))))
-          
-    (define/override (on-size w h)
-      (compute-sizes)
-      (redraw-offscreen)
-      (refresh))
-    
-    (define/private (mouse-xy->ij mx my)
-      (define (find-index start vec m-coord)
-        (let loop ([coord start]
-                   [i 0])
-          (cond
-            [(< i (vector-length vec))
-             (cond
-               [(<= coord m-coord (+ coord (vector-ref vec i)))
-                i]
-               [else
-                (loop (+ coord (vector-ref vec i))
-                      (+ i 1))])]
-            [else #f])))
-      (values (find-index vertical-axis-width column-widths mx)
-              (find-index horizontal-axis-height row-heights my)))
-    
-    (define/override (on-event evt)
-      (cond
-        [(or (send evt moving?)
-             (send evt entering?))
-         (set! mouse-x (send evt get-x))
-         (set! mouse-y (send evt get-y))]
-        [else
-         (set! mouse-x #f)
-         (set! mouse-y #f)])
-      (recompute-arrows-and-highlighted-cells))
-    
-    (define mouse-x #f)
-    (define mouse-y #f)
-    
-    (define/private (recompute-arrows-and-highlighted-cells)
-      (cond
-        [(and mouse-x mouse-y)
-         (let-values ([(i j) (mouse-xy->ij mouse-x mouse-y)])
-           (let ([index (and i j (+ (* j (vector-length column-widths)) i))])
-             (cond
-               [(and index (< index (vector-length heap-vec)))
-                (update-arrows (find-connections index))
-                (update-highlighted-cells (cons index (index->nexts index)))]
-               [else
-                (update-highlighted-cells '())
-                (update-arrows '())])))]
-        [else
-         (update-highlighted-cells '())
-         (update-arrows '())]))
-
-    (define/private (index->nexts index)
-      (if (< index (vector-length heap-vec))
-          (let ([n (vector-ref heap-vec index)])
-            (cond
-              [(and (exact-integer? n)
-                    (<= 0 n)
-                    (< n (vector-length heap-vec)))
-               (list n)]
-              [(procedure? n)
-               (map read-root (procedure-roots n))]
-              [else
-               '()]))
-          '()))
-    
-    (define/private (find-connections start)
-      (let ([visited (make-hash)]
-            [ans '()])
-        (let loop ([i start])
-          (unless (hash-ref visited i #f)
-            (hash-set! visited i #t)
-            (for-each
-             (λ (next) 
-               (set! ans (cons (make-arrow i next) ans))
-               (loop next))
-             (index->nexts i))))
-        ans))
-    
-    (define/private (update-arrows new)
-      (when show-arrows?
-        (unless (equal? new arrows)
-          (set! arrows new)
-          (refresh))))
-    
-    (define/private (update-highlighted-cells new)
-      (when show-highlighted-cells?
-        (unless (equal? new highlighted-cells)
-          (set! highlighted-cells new)
-          (refresh))))
-    
-    (super-new)
-    
-    (setup-min-width/height)
-    (send (get-dc) set-smoothing 'aligned)))
-
-(define (round-up-to-even-multiple n cols)
-  (let ([%% (remainder n cols)])
-    (cond
-      [(zero? %%) n]
-      [else (+ n (- cols %%))])))
-
-(define highlighted-color "forestgreen")
-
-(define (setup-colors dc i j highlighted-cell?)
-  (send dc set-pen "black" 1 'transparent)
-  (cond
-    [highlighted-cell?
-     (send dc set-brush highlighted-color 'solid)
-     (send dc set-text-foreground (send the-color-database find-color "white"))]
-    [else
-     (send dc set-brush (ij->background-color i j) 'solid)
-     (send dc set-text-foreground (send the-color-database find-color (ij->text-color i j)))]))
-
-(define (ij->background-color i j)
-  (cond
-    [(zero? i)
-     (if (zero? (modulo j 5))
-         "black"
-         "white")]
-    [(zero? j)
-     (if (zero? (modulo i 2)) 
-         "gray"
-         "white")]
-    [(zero? (modulo j 5))
-     "black"]
-    [(zero? (modulo i 2))
-     "gray"]
-    [else
-     "white"]))
-
-(define (ij->text-color i j)
-  (let ([bkg (ij->background-color i j)])
-    (cond
-      [(equal? bkg "black")
-       "white"]
-      [else 
-       "black"])))
-
-(define (vector-sum v [cap (vector-length v)])
-  (for/fold ((sum 0))
-    ((i (in-range cap)))
-    (+ sum (vector-ref v i))))
-    
-
-(define heap-viz%
-  (class* object% (heap-viz<%>)
-    (init heap-vec)
-    (define eventspace (make-eventspace))
-    (define frame
-      (parameterize ([current-eventspace eventspace])
-        (new frame% [label "Heap"])))
-    (define canvas (new heap-canvas% [parent frame] [heap-vec heap-vec] [style '(no-autoclear)]))
-    (new grow-box-spacer-pane% [parent frame])
-    (send frame show #t)
-    
-    ;; protects 'queued'
-    (define queued-sema (make-semaphore 1))
-    (define queued #f)
-    
-    (define/public (update-view #:location loc) 
-      (semaphore-wait queued-sema)
-      (cond
-        [queued
-         (semaphore-post queued-sema)]
-        [else
-         (set! queued #t)
-         (semaphore-post queued-sema)
-         (parameterize ([current-eventspace eventspace])
-           (queue-callback
-            (λ () 
-              (semaphore-wait queued-sema)
-              (set! queued #f)
-              (semaphore-post queued-sema)
-              ;; we might get others queued while this happens, but that seems ok
-              (send canvas update-view))
-            ;; low priority, so that mouse movements and window resizes
-            ;; take priority (important in the case that the mutator is 
-            ;; running a tight loop that changes the heap)
-            #f))]))
-            
-    (super-new)))
diff --git a/pkgs/plai/private/gc-transformer.rkt b/pkgs/plai/private/gc-transformer.rkt
deleted file mode 100644
index 22367311fa..0000000000
--- a/pkgs/plai/private/gc-transformer.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang scheme
-
-(provide/contract
- (find-referenced-locals ((listof identifier?) syntax? . -> . (listof identifier?)))
- [switch-over (-> (listof identifier?) 
-                  (listof identifier?)
-                  (listof identifier?)
-                  (listof identifier?))])
-(define (find-referenced-locals env-ids stx)
-  (local ([define id-hash (make-custom-hash free-identifier=?
-                                            (λ (v) (equal-hash-code (syntax->datum v)))
-                                            (λ (v) (equal-secondary-hash-code (syntax->datum v))))]
-          [define (find stx)
-            (syntax-case stx ()
-              [(head . tail)
-               (begin
-                 (find #'head)
-                 (find #'tail))]
-              [id (identifier? stx)
-                  (begin
-                    (unless (dict-ref id-hash stx false)
-                      (dict-set! id-hash stx true)))]
-              [_ (void)])])
-         (find stx)
-         (filter (λ (env-id) (dict-ref id-hash env-id false)) env-ids)))
-
-(define (switch-over src-ids dest-ids to-switch)
-  (for/list ([id (in-list to-switch)])
-    (or (for/or ([src-id (in-list src-ids)]
-                 [dest-id (in-list dest-ids)])
-          (and (free-identifier=? src-id id)
-               dest-id))
-        (error 'switch-over "didn't find src-id for ~s" id))))
diff --git a/pkgs/plai/private/random-mutator.rkt b/pkgs/plai/private/random-mutator.rkt
deleted file mode 100644
index 99f0d1e576..0000000000
--- a/pkgs/plai/private/random-mutator.rkt
+++ /dev/null
@@ -1,326 +0,0 @@
-#lang scheme/base
-(require scheme/pretty
-         scheme/match
-         scheme/contract
-         "gc-core.rkt")
-
-(provide save-random-mutator 
-         find-heap-values
-         (struct-out terminal)
-         (struct-out proc)
-         (struct-out pair)
-         (struct-out obj-graph)
-         obj-graph->code)
-
-;; graph : hash-table[number -o> obj]
-;; path : sexp
-;; result : flat-value
-;; root : nat (the id of the reference to keep live)
-(define-struct obj-graph (graph path result root) #:transparent)
-
-;; an obj is either:
-;;  - (make-terminal <constant>)
-;;  - (make-proc (listof ids))
-;;  - (make-pair id id)
-
-(define-struct terminal (const) #:transparent)
-(define-struct proc (ids) #:transparent)
-(define-struct pair (hd tl) #:transparent)
-
-;; select : (or/c 'first 'rest nat)
-;;    numbers indicate the selector is to call a proc with that number
-;;    'first and 'rest indicate the selector is either first or rest.
-;; id : num
-(define-struct connection (select id) #:transparent)
-
-(define (random-obj-graph size heap-values)
-  (let ([num-cells (+ 1 (random size))]
-        [hash (make-hash)])
-    (for ([i (in-range 0 num-cells)])
-      (hash-set! hash i (random-obj i num-cells size heap-values)))
-    (let-values ([(code last first-id) (random-path hash size)])
-      (make-obj-graph hash code last first-id))))
-
-(define (random-path hash size)
-  (let-values ([(first-terminal first-id) (pick-first hash)])
-    (let loop ([i (random size)]
-               [last-id first-id]
-               [codes '()])
-      (let ([done
-             (λ ()
-               (values codes
-                       (terminal-const first-terminal)
-                       last-id))])
-        (cond
-          [(zero? i) (done)]
-          [else
-           (let ([next (find-connections-to hash last-id)])
-             (cond
-               [next (loop (- i 1)
-                           (connection-id next)
-                           (cons (connection-select next) codes))]
-               [else (done)]))])))))
-
-;; find-connection-to : hash id -> connection
-;; returns a random choice of one of the nodes with a connection to the node 'id'
-(define (find-connections-to hash id) 
-  (let ([candidate-code '()]
-        [candidate-ids '()])
-    (hash-for-each
-     hash
-     (λ (k v)
-       (cond
-         [(pair? v) 
-          (when (equal? id (pair-hd v))
-            (set! candidate-code (cons 'first candidate-code))
-            (set! candidate-ids (cons k candidate-ids)))
-          (when (equal? id (pair-tl v))
-            (set! candidate-code (cons 'rest candidate-code))
-            (set! candidate-ids (cons k candidate-ids)))]
-         [(terminal? v)
-          (void)]
-         [(proc? v)
-          (for ([proc-id (in-list (proc-ids v))]
-                [case-num (in-naturals)])
-            (when (equal? proc-id id)
-              (set! candidate-code (cons case-num candidate-code))
-              (set! candidate-ids (cons k candidate-ids))))])))
-    (cond
-      [(null? candidate-code)
-       #f]
-      [else
-       (let ([choice (random (length candidate-code))])
-         (make-connection (list-ref candidate-code choice)
-                          (list-ref candidate-ids choice)))])))
-
-#;
-(define (find-connections-to hash id) 
-  (let ([candidate-code '()]
-        [candidate-ids '()])
-    (hash-for-each
-     hash
-     (λ (k v)
-       (cond
-         [(pair? v) 
-          (when (equal? id (pair-hd v))
-            (set! candidate-code (cons (λ (x) `(first ,x)) candidate-code))
-            (set! candidate-ids (cons k candidate-ids)))
-          (when (equal? id (pair-tl v))
-            (set! candidate-code (cons (λ (x) `(rest ,x)) candidate-code))
-            (set! candidate-ids (cons k candidate-ids)))]
-         [(terminal? v)
-          (void)]
-         [(proc? v)
-          (for ([proc-id (in-list (proc-ids v))]
-                [case-num (in-naturals)])
-            (when (equal? proc-id id)
-              (set! candidate-code (cons (λ (x) `(,x ,case-num)) candidate-code))
-              (set! candidate-ids (cons k candidate-ids))))])))
-    (cond
-      [(null? candidate-code)
-       #f]
-      [else
-       (let ([choice (random (length candidate-code))])
-         (make-connection (list-ref candidate-code choice)
-                          (list-ref candidate-ids choice)))])))
-  
-(define (pick-first hash)
-  (let ([candidate-terminals '()]
-        [candidate-ids '()])
-    (hash-for-each
-     hash
-     (λ (k v) 
-       (when (terminal? v)
-         (set! candidate-terminals (cons v candidate-terminals))
-         (set! candidate-ids (cons k candidate-ids)))))
-    (let ([choice (random (length candidate-terminals))])
-      (values (list-ref candidate-terminals choice)
-              (list-ref candidate-ids choice)))))
-
-;; obj-graph->code : obj-graph? nat nat -> (listof sexp)
-(define (obj-graph->code obj-graph iterations heap-size)
-  (let ([graph (obj-graph-graph obj-graph)]
-        [init-code '()])
-    (list 
-     `(define (build-one)
-        (let* (,@(build-list (hash-count graph)
-                             (λ (i) 
-                               (let-values ([(binding-code cell-init-code)
-                                             (obj->code i (hash-ref graph i))])
-                                 (set! init-code (append cell-init-code init-code)) 
-                                 `[,(obj-num->id i) ,binding-code]))))
-          ,@(reverse init-code)
-          ,(obj-num->id (obj-graph-root obj-graph))))
-     `(define (traverse-one ,(obj-num->id (obj-graph-root obj-graph)))
-        ,(result->comparison (obj-graph-result obj-graph)
-                             (let loop ([path (reverse (obj-graph-path obj-graph))])
-                               (cond
-                                 [(null? path) (obj-num->id (obj-graph-root obj-graph))]
-                                 [else 
-                                  (case (car path)
-                                    [(first) `(first ,(loop (cdr path)))]
-                                    [(rest) `(rest ,(loop (cdr path)))]
-                                    [else `(,(loop (cdr path)) ,(car path))])]))))
-     
-     `(define (trigger-gc n)
-        (if (zero? n)
-            0
-            (begin 
-              (cons n n)
-              (trigger-gc (- n 1)))))
-     `(define (loop i)
-        (if (zero? i)
-            'passed
-            (let ([obj (build-one)])
-              (trigger-gc ,heap-size)
-              (if (traverse-one obj)
-                  (loop (- i 1))
-                  'failed))))
-     `(loop ,iterations))))
-
-(define (result->comparison expected-result exp)
-  (cond
-    [(number? expected-result) `(= ,expected-result ,exp)]
-    [(symbol? expected-result)
-     `(symbol=? ',expected-result ,exp)]
-    [(eq? expected-result #t)
-     `(let ([res ,exp])
-        (if (boolean? res)
-            res
-            #f))]
-    [(eq? expected-result #f) `(if ,exp #f #t)]
-    [(null? expected-result) `(empty? ,exp)]
-    [else (error 'result->comparison "unknown value ~s\n" expected-result)]))
-
-(define (obj-num->id x) (string->symbol (format "x~a" x)))
-
-;; random-obj : number obj -> (values sexp[constructor] (list sexp[init-code]))
-(define (obj->code cell-number obj)
-  (cond
-    [(terminal? obj) (values (terminal->code (terminal-const obj)) '())]
-    [(pair? obj)
-     (let* ([hd-direct? (< (pair-hd obj) cell-number)]
-            [tl-direct? (< (pair-tl obj) cell-number)]
-            [code0 (if hd-direct? 
-                       '()
-                       (list `(set-first! ,(obj-num->id cell-number)
-                                          ,(obj-num->id (pair-hd obj)))))]
-            [code1 (if tl-direct?
-                       code0
-                       (cons `(set-rest! ,(obj-num->id cell-number)
-                                         ,(obj-num->id (pair-tl obj)))
-                             code0))])
-       (values `(cons ,(if hd-direct?
-                           (obj-num->id (pair-hd obj))
-                           #f)
-                      ,(if tl-direct?
-                           (obj-num->id (pair-tl obj))
-                           #f))
-               code1))]
-    [(proc? obj)
-     (values `(lambda (x)
-                ,(let loop ([eles (proc-ids obj)]
-                            [i 0])
-                   (cond
-                     [(null? (cdr eles))
-                      (obj-num->id (car eles))]
-                     [else
-                      `(if (= x ,i)
-                           ,(obj-num->id (car eles))
-                           ,(loop (cdr eles) (+ i 1)))])))
-             '())]))
-
-(define (terminal->code const)
-  (cond
-    [(symbol? const) `',const]
-    [(null? const) 'empty]
-    [else const]))
-
-(define (random-obj cell-number num-cells size heap-values)
-  (case (random (if (zero? cell-number) 1 3))
-    [(0) (make-terminal (pick-from-list heap-values))]
-    [(1) (make-pair (random num-cells)
-                    (random num-cells))]
-    [(2) (make-proc (build-list (+ (random size) 1) (λ (i) (random cell-number))))]))
-
-(define (pick-from-list l) (list-ref l (random (length l))))
-
-(define (save-random-mutator filename collector 
-                             #:heap-values [heap-values (list 0 1 -1 'x 'y #f #t '())]
-                             #:iterations [iterations 200]
-                             #:program-size [program-size 10]
-                             #:heap-size [heap-size 200]
-                             #:gc2? [gc2? #f])
-  (call-with-output-file filename
-    (λ (port)
-      (cond
-        [collector
-         (fprintf port "#lang plai/~amutator\n" (if gc2? "gc2/" ""))
-         (fprintf port "~s\n" `(allocator-setup ,collector ,heap-size))]
-        [else
-         (fprintf port "#lang scheme\n")
-         (for-each
-          (λ (pair) (fprintf port "~s\n" `(define ,@pair)))
-          '((cons mcons)
-            (first mcar)
-            (rest mcdr)
-            (set-first! set-mcar!)
-            (set-rest! set-mcdr!)))])
-      (for-each (λ (x) (pretty-print x port))
-                (obj-graph->code (random-obj-graph program-size heap-values) 
-                                 iterations
-                                 heap-size)))
-    #:exists 'truncate))
-
-(define (find-heap-values in)
-  (cond
-    [(input-port? in)
-     (find-heap-values/main in)]
-    [else
-     (call-with-input-file in find-heap-values/main)]))
-
-(define (find-heap-values/main port)
-  (let* ([ht (make-hash)]
-         [exp (parameterize ([read-accept-reader #t])
-                (read port))]
-         [plai-collector-lang?
-          (match exp
-            [`(module ,name ,langname ,the-rest ...)
-             (and (regexp-match #rx"collector" (format "~s" langname))
-                  (regexp-match #rx"plai" (format "~s" langname)))]
-            [_ #f])])
-    (let loop ([exp exp]
-               [quoted? #f])
-      (match exp
-        [`',arg (loop arg #t)]
-        [``,arg (loop arg #t)]
-        [(? symbol?) 
-         (cond
-           [quoted? (hash-set! ht exp #t)]
-           [else
-            (case exp
-              [(true) (hash-set! ht #t #t)]
-              [(false) (hash-set! ht #f #t)]
-              [(null) (hash-set! ht '() #t)]
-              [(empty) (hash-set! ht '() #t)]
-              [else (void)])])]
-        [`() (when quoted?
-               (hash-set! ht '() #t))]
-        [(? heap-value?) (hash-set! ht exp #t)]
-        [(? list?)
-         (if (or quoted? (not plai-collector-lang?))
-             (for-each (λ (x) (loop x quoted?)) exp)
-             (match exp
-               [`(error ,skippable ,rest ...)
-                (for-each (λ (x) (loop x quoted?)) rest)]
-               [`(test ,a ,b)
-                (void)]
-               [`(test/exn ,a ,b)
-                (void)]
-               [else
-                (for-each (λ (x) (loop x quoted?)) exp)]))]
-        [else (void)]))
-    (sort (hash-map ht (λ (x y) x))
-          string<=?
-          #:key (λ (x) (format "~s" x)))))
-
diff --git a/pkgs/plai/private/sandbox.rkt b/pkgs/plai/private/sandbox.rkt
deleted file mode 100644
index 539f4e6c89..0000000000
--- a/pkgs/plai/private/sandbox.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang scheme
-(require scheme/sandbox)
-
-(define timeout/c (and/c integer? positive?))
-(define memory-limit/c (and/c integer? positive?))
-(define sandbox-result/c (or/c exn? (listof any/c)))
-(define eval-expression/c any/c)
-
-(define memory-accounting?
-  (custodian-memory-accounting-available?))
-
-(provide exn:fail:cpu-resource? exn:fail:cpu-resource-resource)
-(define-struct (exn:fail:cpu-resource exn:fail) (resource))
-
-
-(provide/contract
- (call-with-limits/cpu-time
-  (timeout/c (-> any) . -> . any)))
-(define (call-with-limits/cpu-time sec thunk)
-  (let ([ch   (make-channel)]
-        ;; use this to copy parameter changes from the sub-thread
-        [p    current-preserved-thread-cell-values])
-    (let* ([start-cpu-time (current-process-milliseconds)]
-           ; cpu-time is modulo fixnum, so we may never reach end-cpu-time
-           [end-cpu-time (+ start-cpu-time (* 1000 sec))]
-           [work 
-            (thread (lambda ()
-                      (channel-put ch
-                                   (with-handlers ([void (lambda (e)
-                                                           (list (p) raise e))])
-                                     (call-with-values thunk
-                                                       (lambda vs (list* (p) values vs)))))))]
-           [watch (thread 
-                   (λ ()
-                     (channel-put 
-                      ch (let loop ([wait-sec 
-                                     (quotient 
-                                      (- end-cpu-time (current-process-milliseconds))
-                                      1000)])
-                           ; Wait for sec.  The process would have got < sec cpu-time.
-                           (sync/timeout wait-sec work)
-                           (if (>= (current-process-milliseconds) end-cpu-time)
-                               'time
-                               (loop (quotient 
-                                      (- end-cpu-time (current-process-milliseconds))
-                                      1000)))))))]
-           [r (channel-get ch)])
-      (kill-thread watch)
-      (if (list? r)
-          ;; apply parameter changes first
-          (begin (p (car r)) (apply (cadr r) (cddr r)))
-          (raise (make-exn:fail:cpu-resource "out of cpu time"
-                                             (current-continuation-marks)
-                                             r))))))
-
-
-(provide evaluate/limits/cpu-time)
-(define (evaluate/limits/cpu-time  evaluator memory-limit cpu-time-limit expr)
-  (parameterize ([sandbox-eval-limits `(#f ,memory-limit)])
-    (call-with-limits/cpu-time
-     cpu-time-limit
-     (λ () (evaluator expr)))))
-
-
-
-#|(provide/contract 
-   (sandbox-execution (timeout/c memory-limit/c eval-expression/c
-                                 . -> . sandbox-result/c)))|#
-
-(provide sandbox-execution)
-
-(define-struct (exn:sandbox:unknown exn:fail) (value))
-
-(define (sandbox-execution timeout memory-limit language requires body to-evaluate)
-  (with-handlers ([exn? (λ (exn) exn)]
-                  [(λ (x) #t) 
-                   (λ (v) 
-                     (make-exn:sandbox:unknown 
-                      v "not a subclass of exn:fail"
-                      (current-continuation-marks)))])
-    
-    (call-with-values
-     (λ ()
-       (parameterize ([sandbox-eval-limits `(,timeout ,memory-limit)])
-         (let ([evaluator (make-evaluator language requires body)])
-           (evaluator to-evaluate))))
-     (λ results results))))
-
diff --git a/pkgs/plai/private/test.rkt b/pkgs/plai/private/test.rkt
deleted file mode 100644
index b2264e97be..0000000000
--- a/pkgs/plai/private/test.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang scheme
-(require plai/test-harness)
-
-(provide count-errors)
-(define (count-errors [results plai-all-test-results])
-  (foldl (λ (r n) 
-           (if (or (symbol=? (first r) 'bad) (symbol=? (first r) 'exception))
-               (+ n 1) n))
-         0 results))
diff --git a/pkgs/plai/random-mutator.rkt b/pkgs/plai/random-mutator.rkt
deleted file mode 100644
index 791c9fb3c5..0000000000
--- a/pkgs/plai/random-mutator.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scheme/base
-(require "private/random-mutator.rkt"
-         scheme/contract
-         "private/gc-core.rkt")
-
-(provide/contract
- [save-random-mutator 
-  (->* (path-string?
-        string?)
-       (#:iterations 
-        exact-positive-integer?
-        #:heap-values (cons/c heap-value? (listof heap-value?))
-        #:program-size exact-positive-integer?
-        #:heap-size exact-positive-integer?
-        #:gc2? boolean?)
-       void?)]
- [find-heap-values
-  (-> (or/c path-string? input-port?)
-      (listof heap-value?))])
diff --git a/pkgs/plai/scribblings/collector.scrbl b/pkgs/plai/scribblings/collector.scrbl
deleted file mode 100644
index 51b88d007d..0000000000
--- a/pkgs/plai/scribblings/collector.scrbl
+++ /dev/null
@@ -1,229 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          "rkt-exports.rkt"
-          "plai-exports.rkt"
-          "lang-names.rkt"
-          (for-syntax scheme)
-          (for-label (except-in scheme
-                                error printf)
-                     (prefix-in scheme:
-                                scheme)
-                     (only-in plai/main
-                              type-case define-type error
-                              test test/pred test/exn test/regexp
-                              abridged-test-output
-                              plai-catch-test-exn
-                              halt-on-errors print-only-errors
-                              test-inexact-epsilon plai-ignore-exn-strings
-                              plai-all-test-results)
-                     (only-in plai/collector
-                              root?
-                              heap-size
-                              location?
-                              heap-value?
-                              heap-set! heap-ref with-heap
-                              get-root-set read-root set-root!
-                              procedure-roots)
-                     plai/scribblings/fake-collector
-                     plai/scribblings/fake-mutator
-                     plai/scribblings/fake-web
-                     plai/random-mutator
-                     (only-in plai/web
-                              no-web-browser
-                              static-files-path)
-                     (only-in plai/mutator
-                              set-first!
-                              set-rest!
-                              import-primitives
-                              test/location=?
-                              test/value=?
-                              printf)))
-
-@title[#:tag "collector"]{@COLLECT-LANG}
-
-@defmodulelang[plai/collector]
-
-@COLLECT-LANG is based on @seclink["plai-scheme"]{PLAI Scheme}.  It provides
-additional procedures and syntax for writing garbage collectors.
-
-@section{Garbage Collector Interface}
-
-The @COLLECT-LANG language provides the following functions that provide access
-to the heap and root set:
-
-@defproc[(heap-size) exact-nonnegative-integer?]{
-
-Returns the size of the heap.  The size of the heap is specified by the mutator
-that uses the garbage collector.  See @racket[allocator-setup] for more
-information.
-}
-
-@defproc[(location? [v any/c])
-         boolean?]{
-  Determines if @racket[v] is an integer between @racket[0] and
-  @racket[(- (heap-size) 1)] inclusive.
-}
-
-@defproc[(root? [v any/c])
-         boolean?]{
-Determines if @racket[v] is a root.
-}
-
-@defproc[(heap-value? [v any/c]) boolean?]{
-  A value that may be stored on the heap. Roughly corresponds to the contract
-  @racket[(or/c boolean? number? procedure? symbol? empty?)].
-}
-
-
-@defproc[(heap-set! (loc location?) (val heap-value?)) void?]{
-  Sets the value at @racket[_loc] to @racket[_val].
-}
-
-@defproc[(heap-ref (loc location?)) heap-value?]{
-  Returns the value at @racket[_loc].
-}
-
-@defform/subs[(get-root-set id ...)()]{
-  Returns the current roots as a list.  Local roots are created for the
-  identifiers @racket[_id] as well.
-}
-
-@defproc[(read-root (root root?)) location?]{
-  Returns the location of @racket[_root].
-}
-
-@defproc[(set-root! (root root?) (loc location?)) void?]{
-  Updates the root to reference the given location.
-}
-
-@defproc[(procedure-roots (proc procedure?)) (listof root?)]{
-  Given a closure stored on the heap, returns a list of the roots reachable
-  from the closure's environment.  If @racket[_proc] is not reachable, the
-  empty list is returned.
-}
-
-@defform[(with-heap heap-expr body-expr ...)
-         #:contracts ([heap-expr (vectorof heap-value?)])]{
- Evaluates each of the @racket[body-expr]s in a context where
- the value of @racket[heap-expr] is used as the heap. Useful in
- tests:
- @racketblock[
-  (test (with-heap (make-vector 20) 
-          (init-allocator)
-          (gc:deref (gc:alloc-flat 2)))
-        2)
-  ]}
-                                                     
-@defform[(with-roots roots-expr expr1 expr2 ...)
-         #:contracts ([roots-expr (listof location?)])]{
-  Evaluates each of @racket[expr1] and the @racket[expr2]s in
-  in a context with the result of @racket[roots-expr]
-  as additional roots.
-  
-  This function is intended to be used in test suites
-  for collectors. Since your test suites are not running
-  in the @racketmod[plai/mutator] language, @racket[get-root-set]
-  returns a list consisting only of the roots it created,
-  not all of the other roots it normally would return.
-  Use this function to note specific locations as roots
-  and set up better tests for your GC.
-  
-  @racketblock[
-    (test (with-heap (make-vector 4)
-                     (define f1 (gc:alloc-flat 1))
-                     (define c1 (gc:cons f1 f1))
-                     (with-roots (list c1)
-                                 (gc:deref
-                                  (gc:first
-                                   (gc:cons f1 f1)))))
-          1)]
-  
-}
-
-@section{Garbage Collector Exports}
-
-@declare-exporting[#:use-sources (plai/scribblings/fake-collector)]
-
-A garbage collector must define the following functions:
-
-@defproc[(init-allocator) void?]{
-
-@racket[init-allocator] is called before all other procedures by a
-mutator. Place any requisite initialization code here.
-
-}
-
-@defproc[(gc:deref (loc location?)) heap-value?]{
-
-Given the location of a flat Scheme value, this procedure should return that
-value.  If the location does not hold a flat value, this function should signal
-an error.
-
-}
-
-@defproc[(gc:alloc-flat (val heap-value?)) location?]{
-
-This procedure should allocate a flat Scheme value (number, symbol, boolean,
-closure or empty list) on the heap, returning its location (a number). The
-value should occupy a single heap cell, though you may use additional space to
-store a tag, etc. You are also welcome to pre-allocate common constants (e.g.,
-the empty list). This procedure may need to perform a garbage-collection. If
-there is still insufficient space, it should signal an error.
-
-Note that closures are flat values. The environment of a closure is internally
-managed, but contains references to values on the heap. Therefore, during
-garbage collection, the environment of reachable closures must be updated. The
-language exposes the environment via the @racket[procedure-roots] function.
-
-}
-
-@defproc[(gc:cons (first location?) (rest location?)) location?]{
-
-Given the location of the @racket[_first] and @racket[_rest] values, this
-procedure must allocate a cons cell on the heap.  If there is insufficient
-space to allocate the cons cell, it should signal an error.
-
-}
-
-@defproc[(gc:first (cons-cell location?)) location?]{
-
-If the given location refers to a cons cell, this should return the first
-field. Otherwise, it should signal an error.
-
-}
-
-@defproc[(gc:rest (cons-cell location?)) location?]{
-
-If the given location refers to a cons cell, this should return the rest
-field. Otherwise, it should signal an error.
-
-}
-
-@defproc[(gc:set-first! (cons-cell location?) (first-value location?)) void?]{
-
-If @racket[_cons-cell] refers to a cons cell, set the head of the cons cell to
-@racket[_first-value].  Otherwise, signal an error.
-
-}
-
-@defproc[(gc:set-rest! (cons-cell location?) (rest-value location?)) void?]{
-
-If @racket[_cons-cell] refers to a cons cell, set the tail of the cons cell to
-@racket[_rest-value].  Otherwise, signal an error.
-
-}
-
-@defproc[(gc:cons? (loc location?)) boolean?]{
-
-
-Returns @racket[true] if @racket[_loc] refers to a cons cell.  This function
-should never signal an error.
-
-}
-
-@defproc[(gc:flat? (loc location?)) boolean?]{
-
-Returns @racket[true] if @racket[_loc] refers to a flat value.  This function
-should never signal an error.
-
-}
diff --git a/pkgs/plai/scribblings/collector2.scrbl b/pkgs/plai/scribblings/collector2.scrbl
deleted file mode 100644
index 81eba98eeb..0000000000
--- a/pkgs/plai/scribblings/collector2.scrbl
+++ /dev/null
@@ -1,275 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          "rkt-exports.rkt"
-          "plai-exports.rkt"
-          "lang-names.rkt"
-          (for-syntax scheme)
-          (for-label (except-in scheme
-                                error printf)
-                     (prefix-in scheme:
-                                scheme)
-                     (only-in plai/main
-                              type-case define-type error
-                              test test/pred test/exn test/regexp
-                              abridged-test-output
-                              plai-catch-test-exn
-                              halt-on-errors print-only-errors
-                              test-inexact-epsilon plai-ignore-exn-strings
-                              plai-all-test-results)
-                     (only-in plai/gc2/collector
-                              root?
-                              heap-size
-                              location?
-                              heap-value?
-                              heap-set! heap-ref with-heap
-                              get-root-set read-root set-root! make-root)
-                     plai/scribblings/fake-collector2
-                     plai/scribblings/fake-mutator2
-                     plai/random-mutator
-                     (only-in plai/web
-                              no-web-browser
-                              static-files-path)
-                     (only-in plai/gc2/mutator
-                              set-first!
-                              set-rest!
-                              import-primitives
-                              test/location=?
-                              test/value=?
-                              printf)))
-
-
-@title[#:tag "gc2-collector"]{GC Collector Language, 2}
-
-@defmodulelang[plai/gc2/collector]
-
-@COLLECT-LANG is based on @seclink["plai-scheme"]{PLAI}.  It provides
-additional procedures and syntax for writing garbage collectors.
-
-@section{Garbage Collector Interface for GC2}
-
-The @COLLECT-LANG language provides the following functions that provide access
-to the heap and root set:
-
-@defproc[(heap-size) exact-nonnegative-integer?]{
-
-Returns the size of the heap.  The size of the heap is specified by the mutator
-that uses the garbage collector.  See @racket[allocator-setup] for more
-information.
-}
-
-@defproc[(location? [v any/c])
-         boolean?]{
-  Determines if @racket[v] is an integer between @racket[0] and
-  @racket[(- (heap-size) 1)] inclusive.
-}
-
-@defproc[(root? [v any/c])
-         boolean?]{
-Determines if @racket[v] is a root.
-}
-
-@defproc[(heap-value? [v any/c]) boolean?]{
-  A value that may be stored on the heap. Roughly corresponds to the contract
-  @racket[(or/c boolean? number? symbol? empty?)].
-}
-
-
-@defproc[(heap-set! (loc location?) (val heap-value?)) void?]{
-  Sets the value at @racket[_loc] to @racket[_val].
-}
-
-@defproc[(heap-ref (loc location?)) heap-value?]{
-  Returns the value at @racket[_loc].
-}
-
-@defform[(get-root-set)]{
-  Returns the current @racket[root?]s as a list. This returns
-  valid roots only when invoked via the mutator language. Otherwise
-  it returns only what has been set up with @racket[with-roots].
-  
-  Note that if your collector is being invoked via @racket[gc:cons]
-  or @racket[gc:closure], then there may be live data that is 
-  not reachable via the result of @racket[get-root-set], but that
-  is reachable via the roots passed as arguments to those functions.
-}
-
-@defproc[(read-root (root root?)) location?]{
-  Returns the location of @racket[_root].
-}
-
-@defproc[(set-root! (root root?) (loc location?)) void?]{
-  Updates @racket[root] to refer to @racket[loc].
-}
-
-@defproc[(simple-root [l location?]) root?]{
-  Makes a root that is initialized with @racket[l].                                            
-}
-
-@defproc[(make-root [name symbol?] [get (-> location?)] [set (-> location? void?)])
-         root?]{
-  Creates a new root. When @racket[read-root] is called, it invokes
-  @racket[get] and when @racket[set-root!] is called, it invokes
-  @racket[set].
-  
-  For example, this creates a root that uses the local variable
-  @racket[x] to hold its location:
-  @racketblock[(let ([x 1])
-                 (make-root 'x
-                            (λ () x)
-                            (λ (new-x) (set! x new-x))))]
-}
-
-@defform[(with-heap heap-expr body-expr ...)
-         #:contracts ([heap-expr (vectorof heap-value?)])]{
- Evaluates each of the @racket[body-expr]s in a context where
- the value of @racket[heap-expr] is used as the heap. Useful in
- tests:
- @racketblock[
-  (test (with-heap (make-vector 20) 
-          (init-allocator)
-          (gc:deref (gc:alloc-flat 2)))
-        2)
-  ]}
-                                                     
-@defform[(with-roots (root-var ...) expr1 expr2 ...)
-         #:contracts ([root-var location?])]{
-  Evaluates each of @racket[expr1] and the @racket[expr2]s in
-  in a context with additional roots, one for each of
-  the @racket[root-var]s. The @racket[get-root-set] function
-  returns these additional roots. Calling @racket[read-root] on
-  one of the newly created roots returns the value of the 
-  corresponding @racket[root-var] and calling @racket[set-root!]
-  mutates the corresponding variable.
-  
-  This form is intended to be used in test suites
-  for collectors. Since your test suites are not running
-  in the @racketmod[plai/gc2/mutator] language, @racket[get-root-set]
-  returns a list consisting only of the roots it created,
-  not all of the other roots it normally would return.
-  Use @racket[with-roots] to note specific locations as roots
-  and set up better tests for your GC.
-  
-  @racketblock[
-    (test (with-heap (make-vector 4)
-                     (init-allocator)
-                     (define f1 (gc:alloc-flat 1))
-                     (define r1 (make-root 'f1 
-                                           (λ () f1)
-                                           (λ (v) (set! f1 v))))
-                     (define c1 (gc:cons r1 r1))
-                     (with-roots (c1)
-                                 (gc:deref
-                                  (gc:first
-                                   (gc:cons r1 r1)))))
-          1)]
-  
-}
-
-@section{Garbage Collector Exports for GC2}
-
-@declare-exporting[#:use-sources (plai/scribblings/fake-collector2)]
-
-A garbage collector must define the following functions:
-
-@defproc[(init-allocator) void?]{
-
-@racket[init-allocator] is called before all other procedures by a
-mutator. Place any requisite initialization code here.
-
-}
-
-@defproc[(gc:deref (loc location?)) heap-value?]{
-
-Given the location of a flat value, this procedure should return that
-value.  If the location does not hold a flat value, this function should signal
-an error.
-
-}
-
-@defproc[(gc:alloc-flat (val heap-value?)) location?]{
-
-This procedure should allocate a flat value (number, symbol, boolean,
-or empty list) on the heap, returning its location (a number). The
-value should occupy a single heap cell, though you may use additional space to
-store a tag, etc. You are also welcome to pre-allocate common constants (e.g.,
-the empty list). This procedure may need to perform a garbage-collection. If
-there is still insufficient space, it should signal an error.
-
-}
-
-@defproc[(gc:cons (first root?) (rest root?)) location?]{
-
-Given two roots, one for the @racket[first] and @racket[rest] values, this
-procedure must allocate a cons cell on the heap.  If there is insufficient
-space to allocate the cons cell, it should signal an error.
-
-}
-
-@defproc[(gc:first (cons-cell location?)) location?]{
-
-If the given location refers to a cons cell, this should return the first
-field. Otherwise, it should signal an error.
-
-}
-
-@defproc[(gc:rest (cons-cell location?)) location?]{
-
-If the given location refers to a cons cell, this should return the rest
-field. Otherwise, it should signal an error.
-
-}
-
-@defproc[(gc:set-first! (cons-cell location?) (first-value location?)) void?]{
-
-If @racket[cons-cell] refers to a cons cell, set the head of the cons cell to
-@racket[first-value].  Otherwise, signal an error.
-
-}
-
-@defproc[(gc:set-rest! (cons-cell location?) (rest-value location?)) void?]{
-
-If @racket[cons-cell] refers to a cons cell, set the tail of the cons cell to
-@racket[rest-value].  Otherwise, signal an error.
-
-}
-
-@defproc[(gc:cons? (loc location?)) boolean?]{
-
-
-Returns @racket[#true] if @racket[loc] refers to a cons cell.  This function
-should never signal an error.
-
-}
-
-@defproc[(gc:flat? (loc location?)) boolean?]{
-
-Returns @racket[#true] if @racket[loc] refers to a flat value.  This function
-should never signal an error.
-
-}
-
-@defproc[(gc:closure [code-ptr heap-value?] [free-vars (listof root?)]) 
-         location?]{
-  Allocates a closure with @racket[code-ptr] and the free variables
-  in the list @racket[free-vars].
-}
-@defproc[(gc:closure-code-ptr [loc location?]) heap-value?]{
- Given a location returned from an earlier allocation
- check to see if it is a closure; if not signal an
- error. If so, return the @racket[_code-ptr] for that closure.
-}
-
-@defproc[(gc:closure-env-ref [loc location?] [i exact-nonnegative-integer?])
-         location?]{
-  Given a location returned from an earlier allocation, check
-  to see if it is a closure; if not signal an error. If so,
-  return the @racket[i]th variable in the closure (counting from 0).
-}
-
-@defproc[(gc:closure? [loc location?]) boolean?]{
-  Determine if a previously allocated location 
-  holds a closure. This function will be called only
-  with locations previous returned from an allocating
-  function or passed to @racket[set-root!]. It should
-  never signal an error.
-}
diff --git a/pkgs/plai/scribblings/fake-collector.rkt b/pkgs/plai/scribblings/fake-collector.rkt
deleted file mode 100644
index 01b7123222..0000000000
--- a/pkgs/plai/scribblings/fake-collector.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scheme
-(provide (all-defined-out))
-
-(define init-allocator #f)
-(define gc:deref #f)
-(define gc:alloc-flat #f)
-(define gc:cons #f)
-(define gc:first #f)
-(define gc:rest #f)
-(define gc:set-first! #f)
-(define gc:set-rest! #f)
-(define gc:cons? #f)
-(define gc:flat? #f)
diff --git a/pkgs/plai/scribblings/fake-collector2.rkt b/pkgs/plai/scribblings/fake-collector2.rkt
deleted file mode 100644
index 49618658d1..0000000000
--- a/pkgs/plai/scribblings/fake-collector2.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scheme
-(provide (all-defined-out))
-
-(define init-allocator #f)
-(define gc:deref #f)
-(define gc:alloc-flat #f)
-(define gc:cons #f)
-(define gc:first #f)
-(define gc:rest #f)
-(define gc:set-first! #f)
-(define gc:set-rest! #f)
-(define gc:cons? #f)
-(define gc:flat? #f)
-(define gc:closure #f)
-(define gc:closure-code-ptr #f)
-(define gc:closure-env-ref #f)
-(define gc:closure? #f)
diff --git a/pkgs/plai/scribblings/fake-mutator.rkt b/pkgs/plai/scribblings/fake-mutator.rkt
deleted file mode 100644
index 5692205145..0000000000
--- a/pkgs/plai/scribblings/fake-mutator.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang scheme
-(provide (all-defined-out))
-(define-syntax allocator-setup #f)
diff --git a/pkgs/plai/scribblings/fake-mutator2.rkt b/pkgs/plai/scribblings/fake-mutator2.rkt
deleted file mode 100644
index 5692205145..0000000000
--- a/pkgs/plai/scribblings/fake-mutator2.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang scheme
-(provide (all-defined-out))
-(define-syntax allocator-setup #f)
diff --git a/pkgs/plai/scribblings/fake-web.rkt b/pkgs/plai/scribblings/fake-web.rkt
deleted file mode 100644
index 55e3235e67..0000000000
--- a/pkgs/plai/scribblings/fake-web.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang scheme
-(provide (all-defined-out))
-(define start #f)
diff --git a/pkgs/plai/scribblings/lang-names.rkt b/pkgs/plai/scribblings/lang-names.rkt
deleted file mode 100644
index 5145a5b29e..0000000000
--- a/pkgs/plai/scribblings/lang-names.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-(provide PLAI-LANG COLLECT-LANG MUTATE-LANG WEB-LANG)
-(define PLAI-LANG "PLAI Scheme")
-(define COLLECT-LANG "GC Collector Scheme")
-(define MUTATE-LANG "GC Mutator Scheme")
-(define WEB-LANG "Web Application Scheme")
diff --git a/pkgs/plai/scribblings/mutator.scrbl b/pkgs/plai/scribblings/mutator.scrbl
deleted file mode 100644
index 596be5a5c9..0000000000
--- a/pkgs/plai/scribblings/mutator.scrbl
+++ /dev/null
@@ -1,256 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          "rkt-exports.rkt"
-          "plai-exports.rkt"
-          "lang-names.rkt"
-          (for-syntax scheme)
-          (for-label (only-in racket/base
-                              list modulo
-                              procedure? path-string? 
-                              input-port? string? void?
-                              exact-nonnegative-integer?
-                              exact-positive-integer?)
-                     (only-in racket/contract/base
-                              or/c listof any/c)
-                     (only-in plai/collector
-                              root?
-                              heap-size
-                              location?
-                              heap-value?
-                              heap-set! heap-ref with-heap
-                              get-root-set read-root set-root!
-                              procedure-roots)
-                     plai/scribblings/fake-collector
-                     plai/scribblings/fake-mutator
-                     plai/scribblings/fake-web
-                     plai/random-mutator
-                     (only-in plai/web
-                              no-web-browser
-                              static-files-path)
-                     plai/mutator))
-
-@title[#:tag "mutator"]{@MUTATE-LANG}
-
-@defmodulelang[plai/mutator]
-
-The @MUTATE-LANG language is used to test garbage collectors written with the
-@secref["collector"] language.  Since collectors support a subset of Scheme's
-values, the @MUTATE-LANG language supports a subset of procedures and syntax.
-In addition, many procedures that can be written in the mutator are omitted as
-they make good test cases.  Therefore, the mutator language provides only
-primitive procedures, such as @racket[+], @racket[cons], etc.
-
-@section{Building Mutators}
-
-@declare-exporting[#:use-sources (plai/scribblings/fake-mutator)]
-
-The first expression of a mutator must be:
-
-@defform/subs[
-(allocator-setup collector-module 
-                 heap-size)
-([heap-size exact-nonnegative-integer])]{
-
-The @racket[_collector-module] form specifies the path to the garbage collector that the
-mutator should use.  The collector must be written in the @COLLECT-LANG
-language.
-}
-
-The rest of a mutator module is a sequence of definitions, expressions and test
-cases. The @MUTATE-LANG language transforms these definitions and statements to
-use the collector specified in @racket[allocator-setup].  In particular, many
-of the primitive forms, such as @racket[cons] map directly to procedures such
-as @racket[gc:cons], written in the collector.
-
-@section{Mutator API}
-
-The @MUTATE-LANG language supports the following procedures and syntactic
-forms:
-
-@(define-syntax-rule (defprocthing id content ...)
-   @defthing[id procedure? content ...]) 
-
-@(define-syntax (document/lift stx)
-   (syntax-case stx ()
-     [(_ defidform a ...)
-      (with-syntax ([(doc ...)
-                     (map (λ (a)
-                            (with-syntax ([a a]
-                                          [rkt:a (string->symbol (format "rkt:~a" (syntax-e a)))]) 
-                              #'@defidform[a]{Just like Racket's @|rkt:a|.}))
-                          (syntax->list #'(a ...)))])
-
-      #'(begin
-          doc ...))]))
-
-@document/lift[defidform
-               if and or cond case define-values let let-values let* set! quote begin]
-
-@defform[(define (id arg-id ...) body-expression ...+)]{
-  Just like Racket's @racket[define], except restricted to the simpler form
-  above.
-}
-@deftogether[(@defform[(lambda (arg-id ...) body-expression ...+)]{}
-              @defform[(λ (arg-id ...) body-expression ...+)]{})]{
-  Just like Racket's @racket[lambda] and @racket[λ], except restricted to the
-  simpler form above.
-}
-
-@document/lift[defprocthing
-               error
-               add1 sub1 zero? + - * / even? odd? = < > <= >= 
-                    symbol? symbol=? number? boolean? empty? eq?]
-
-@defproc[(cons [hd any/c] [tl any/c]) cons?]{
-  Constructs a (mutable) pair.
-}
-@defproc[(cons? [v any/c]) boolean?]{
-  Returns @racket[#t] when given a value created by @racket[cons],
-          @racket[#f] otherwise.
-}
-@defproc[(first [c cons?]) any/c]{
-  Extracts the first component of @racket[c].
-}
-@defproc[(rest [c cons?]) any/c]{
-  Extracts the rest component of @racket[c].
-}
-
-@defproc[(set-first! [c cons?] [v any/c])
-         void?]{
-  Sets the @racket[first] of the cons cell @racket[c].
-}
-
-@defproc[(set-rest! [c cons?] [v any/c])
-         void?]{
-  Sets the @racket[rest] of the cons cell @racket[c].
-}
-
-@defidform[empty]{
-  The identifier @racket[empty] is defined to invoke
-  @racket[(gc:alloc-flat '())] wherever it is used.
-}
-
-@defprocthing[print-only-errors]{
-  Behaves like PLAI's @|plai:print-only-errors|.
-}
-
-@defprocthing[halt-on-errors]{
-  Behaves like PLAI's @|plai:halt-on-errors|.
-}
-
-Other common procedures are left undefined as they can be defined in
-terms of the primitives and may be used to test collectors.
-
-Additional procedures from @racketmodname[scheme] may be imported with:
-
-@defform/subs[(import-primitives id ...)()]{
-
-Imports the procedures @racket[_id ...] from @racketmodname[scheme].  Each
-procedure is transformed to correctly interface with the mutator.  That is, its
-arguments are dereferenced from the mutator's heap and the result is allocated
-on the mutator's heap.  The arguments and result must be @racket[heap-value?]s,
-even if the imported procedure accepts or produces structured data.
-
-For example, the @MUTATE-LANG language does not define @racket[modulo]:
-
-@racketblock[
-
-(import-primitives modulo)
-
-(test/value=? (modulo 5 3) 2)
-]
-
-}
-
-@section{Testing Mutators}
-
-@MUTATE-LANG provides two forms for testing mutators:
-
-@defform/subs[(test/location=? mutator-expr1 mutator-expr2)()]{
-
-@racket[test/location=?] succeeds if @racket[_mutator-expr1] and
-@racket[_mutator-expr2] reference the same location on the heap.
-
-}
-
-@defform/subs[(test/value=? mutator-expr scheme-datum/quoted)()]{
-
-@racket[test/value=?] succeeds if @racket[_mutator-expr] and
-@racket[_scheme-datum/expr] are structurally equal.
-@racket[_scheme-datum/quoted] is not allocated on the mutator's
-heap. Futhermore, it must either be a quoted value or a literal value.
-
-}
-
-@defform/subs[
-(printf format mutator-expr ...)
-([format literal-string])]{
-
-In @|MUTATE-LANG|, @racket[printf] is a syntactic form and not a procedure. The
-format string, @racket[_format] is not allocated on the mutator's heap.
-
-}
-
-@section{Generating Random Mutators}
-
-@defmodule[plai/random-mutator]
-
-This PLAI library provides a facility for generating random mutators,
-in order to test your garbage collection implementation.
-
-@defproc[(save-random-mutator
-          [file path-string?]
-          [collector-name string?]
-          [#:heap-values heap-values (cons heap-value? (listof heap-value?))
-                                     (list 0 1 -1 'x 'y #f #t '())]
-          [#:iterations iterations exact-positive-integer? 200]
-          [#:program-size program-size exact-positive-integer? 10]
-          [#:heap-size heap-size exact-positive-integer? 100])
-         void?]{
-Creates a random mutator that uses the collector @racket[collector-name] and
-saves it in @racket[file].
-
-The mutator is created by first making a random graph whose nodes either have
-no outgoing edges, two outgoing edges, or some random number of outgoing edges
-and then picking a random path in the graph that ends at one of the nodes with
-no edges.
-
-This graph and path are then turned into a PLAI program by creating a
-@racket[let] expression that binds one variable per node in the graph.  If the
-node has no outgoing edges, it is bound to a @racket[heap-value?].  If the node
-has two outgoing edges, it is bound to a pair and the two edges are put into
-the first and rest fields. Otherwise, the node is represented as a procedure
-that accepts an integer index and returns the destination node of the
-corresponding edge.
-
-Once the @racket[let] expression has been created, the program creates a bunch
-of garbage and then traverses the graph, according to the randomly created
-path. If the result of the path is the expected heap value, the program does
-this again, up to @racket[iterations] times. If the result of the path is not
-the expected heap value, the program terminates with an error.
-
-The keyword arguments control some aspects of the generation
-of random mutators:
-@itemize[
-@item{Elements from the @racket[heap-values] argument are used as the base
-  values when creating nodes with no outgoing edges.  See also
-  @racket[find-heap-values].}
-@item{The @racket[iterations] argument controls how many times the graph is
-  created (and traversed).}
-@item{The @racket[program-size] argument is a bound on how big the program it
-  is; it limits the number of nodes, the maximum number of edges, and the
-  length of the path in the graph.}
-@item{The @racket[heap-size] argument controls the size of the heap in the
-  generated mutator.}]
-
-}
-
-@defproc[(find-heap-values [input (or/c path-string? input-port?)])
-         (listof heap-value?)]{
-  Processes @racket[input] looking for occurrences of @racket[heap-value?]s in
-  the source of the program and returns them. This makes a good start for the
-  @racket[_heap-values] argument to @racket[save-random-mutator].
-
-  If @racket[input] is a port, its contents are assumed to be a well-formed
-  PLAI program. If @racket[input] is a file, the contents of the file are used.
-}
diff --git a/pkgs/plai/scribblings/mutator2.scrbl b/pkgs/plai/scribblings/mutator2.scrbl
deleted file mode 100644
index b9bb4e668a..0000000000
--- a/pkgs/plai/scribblings/mutator2.scrbl
+++ /dev/null
@@ -1,312 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          "rkt-exports.rkt"
-          "plai-exports.rkt"
-          "lang-names.rkt"
-          scribble/decode
-          (for-syntax scheme)
-          (for-label (only-in racket/base
-                              list modulo
-                              procedure? path-string? 
-                              input-port? string? void?
-                              exact-nonnegative-integer?
-                              exact-positive-integer?)
-                     (only-in racket/contract/base
-                              or/c listof any/c)
-                     (only-in plai/gc2/collector
-                              root?
-                              heap-size
-                              location?
-                              heap-value?
-                              heap-set! heap-ref with-heap
-                              get-root-set read-root set-root!)
-                     plai/scribblings/fake-collector2
-                     plai/scribblings/fake-mutator2
-                     plai/random-mutator
-                     (only-in plai/web
-                              no-web-browser
-                              static-files-path)
-                     plai/gc2/mutator))
-
-@title[#:tag "gc2-mutator"]{GC Mutator Language, 2}
-
-@defmodulelang[plai/gc2/mutator]
-
-The @MUTATE-LANG language is used to test garbage collectors written
-with the @secref["gc2-collector"] language.  Since collectors support
-a subset of Racket's values, the @MUTATE-LANG language supports a
-subset of procedures and syntax.  In addition, many procedures that
-can be written in the mutator are omitted as they make good test
-cases.  Therefore, the mutator language provides only primitive
-procedures, such as @racket[+], @racket[cons], etc.
-
-@section{Building Mutators for GC2}
-
-@declare-exporting[#:use-sources (plai/scribblings/fake-mutator2)]
-
-The first expression of a mutator must be:
-
-@defform/subs[
-(allocator-setup collector-module 
-                 heap-size)
-([heap-size exact-nonnegative-integer])]{
-
-@racket[_collector-module] specifies the path to the garbage collector that the
-mutator should use.  The collector must be written in the @COLLECT-LANG
-language.
-}
-
-The rest of a mutator module is a sequence of definitions, expressions and test
-cases. The @MUTATE-LANG language transforms these definitions and statements to
-use the collector specified in @racket[allocator-setup].  In particular, many
-of the primitive forms, such as @racket[cons] map directly to procedures such
-as @racket[gc:cons], written in the collector.
-
-@section{Mutator API for GC2}
-
-The @MUTATE-LANG language supports the following procedures and syntactic
-forms:
-
-@(define-syntax-rule (defprocthing id content ...)
-   @defthing[id procedure? content ...]) 
-
-@(define-syntax (document/lift stx)
-   (syntax-case stx ()
-     [(_ defidform a ...)
-      (with-syntax ([(doc ...)
-                     (for/list ([a (in-list (syntax->list #'(a ...)))])
-                       (syntax-case a ()
-                         [a
-                          (identifier? #'a)
-                          (with-syntax ([rkt:a (string->symbol (format "rkt:~a" (syntax-e #'a)))])
-                            #'@defidform[a]{Just like Racket's @|rkt:a|.})]
-                         [(a stuff)
-                          (identifier? #'a)
-                          (with-syntax ([rkt:a (string->symbol (format "rkt:~a" (syntax-e #'a)))])
-                            #'@defidform[a]{Similar to Racket's @|rkt:a|. @stuff})]))])
-        #'(begin
-            doc ...))]))
-
-@document/lift[defidform
-               if and or cond case define-values let let-values let* 
-                  (set! @splice[@list{Unlike Racket's @|rkt:set!|, this @racket[set!] is syntactically allowed only
-                                      in positions that discard its result, e.g., at the top-level
-                                      or in a @racket[begin] expression (although not as the last expression
-                                      in a @racket[begin]).}])
-                  quote begin]
-
-@defform[(define (id arg-id ...) body-expression ...+)]{
-  Just like Racket's @racket[define], except restricted to the simpler form
-  above.
-}
-@deftogether[(@defform[(lambda (arg-id ...) body-expression ...+)]{}
-              @defform[(λ (arg-id ...) body-expression ...+)]{})]{
-  Just like Racket's @racket[lambda] and @racket[λ], except restricted to the
-  simpler form above.
-}
-
-@document/lift[defprocthing
-               error add1 sub1 zero? + - * / even? odd? = < > <= >= 
-                    symbol? symbol=? number? boolean? empty? eq?]
-
-@defproc[(cons [hd any/c] [tl any/c]) cons?]{
-  Constructs a (mutable) pair.
-}
-@defproc[(cons? [v any/c]) boolean?]{
-  Returns @racket[#t] when given a value created by @racket[cons],
-          @racket[#f] otherwise.
-}
-@defproc[(first [c cons?]) any/c]{
-  Extracts the first component of @racket[c].
-}
-@defproc[(rest [c cons?]) any/c]{
-  Extracts the rest component of @racket[c].
-}
-
-@defproc[(set-first! [c cons?] [v any/c])
-         void]{
-  Sets the @racket[first] of the cons cell @racket[c].
-           
-  Calls to this function are allowed only in syntactic 
-  positions that would discard its result, e.g., at the
-  top-level or inside a @racket[begin] expression (but
-  not in the last expression in a @racket[begin]). 
-  Also, this function appear only in the function
-  position of an application expression.
-
-  So, in order to pass around a version of this function,
-  you must write something like this
-  @racket[(λ (c v) (begin (set-first! c v) 42))],
-  perhaps picking a different value than @racket[42]
-  as the result.
-}
-
-@defproc[(set-rest! [c cons?] [v any/c])
-         void]{
-  Sets the @racket[rest] of the cons cell @racket[c],
-  with the same syntactic restrictions as
-  @racket[set-first!].
-}
-
-@defidform[empty]{
-  The identifier @racket[empty] is defined to invoke
-  @racket[(gc:alloc-flat '())] wherever it is used.
-}
-
-@defidform[print-only-errors]{
-  Behaves like PLAI's @|plai:print-only-errors|.
-}
-
-@defidform[halt-on-errors]{
-  Behaves like PLAI's @|plai:halt-on-errors|.
-}
-
-Other common procedures are left undefined as they can be defined in
-terms of the primitives and may be used to test collectors.
-
-Additional procedures from @racketmodname[scheme] may be imported with:
-
-@defform/subs[(import-primitives id ...)()]{
-
-Imports the procedures @racket[_id ...] from @racketmodname[scheme].  Each
-procedure is transformed to correctly interface with the mutator.  That is, its
-arguments are dereferenced from the mutator's heap and the result is allocated
-on the mutator's heap.  The arguments and result must be @racket[heap-value?]s,
-even if the imported procedure accepts or produces structured data.
-
-For example, the @MUTATE-LANG language does not define @racket[modulo]:
-
-@racketblock[
-
-(import-primitives modulo)
-
-(test/value=? (modulo 5 3) 2)
-]
-
-}
-
-@section{Testing Mutators with GC2}
-
-@MUTATE-LANG provides two forms for testing mutators:
-
-@defform/subs[(test/location=? mutator-expr1 mutator-expr2)()]{
-
-@racket[test/location=?] succeeds if @racket[_mutator-expr1] and
-@racket[_mutator-expr2] reference the same location on the heap.
-
-}
-
-@defform/subs[(test/value=? mutator-expr datum/quoted)()]{
-
-@racket[test/value=?] succeeds if @racket[_mutator-expr] and
-@racket[_datum/expr] are structurally equal.
-@racket[_datum/quoted] is not allocated on the mutator's
-heap. Futhermore, it must either be a quoted value or a literal value.
-
-}
-
-@defform/subs[
-(printf format mutator-expr ...)
-([format literal-string])]{
-
-In @|MUTATE-LANG|, @racket[printf] is a syntactic form and not a procedure. The
-format string, @racket[_format] is not allocated on the mutator's heap.
-
-}
-
-@section{Generating Random Mutators for GC2}
-
-@defmodule[plai/gc2/random-mutator]
-
-This PLAI library provides a facility for generating random mutators,
-in order to test your garbage collection implementation.
-
-@defproc[(save-random-mutator
-          [file path-string?]
-          [collector-name string?]
-          [#:heap-values heap-values (cons heap-value? (listof heap-value?))
-                                     (list 0 1 -1 'x 'y #f #t '())]
-          [#:iterations iterations exact-positive-integer? 200]
-          [#:program-size program-size exact-positive-integer? 10]
-          [#:heap-size heap-size exact-positive-integer? 100])
-         void?]{
-Creates a random mutator that uses the collector @racket[collector-name] and
-saves it in @racket[file].
-
-The mutator is created by first making a random graph whose nodes either have
-no outgoing edges, two outgoing edges, or some random number of outgoing edges
-and then picking a random path in the graph that ends at one of the nodes with
-no edges.
-
-This graph and path are then turned into a PLAI program by creating a
-@racket[let] expression that binds one variable per node in the graph.  If the
-node has no outgoing edges, it is bound to a @racket[heap-value?].  If the node
-has two outgoing edges, it is bound to a pair and the two edges are put into
-the first and rest fields. Otherwise, the node is represented as a procedure
-that accepts an integer index and returns the destination node of the
-corresponding edge.
-
-Once the @racket[let] expression has been created, the program creates a bunch
-of garbage and then traverses the graph, according to the randomly created
-path. If the result of the path is the expected heap value, the program does
-this again, up to @racket[iterations] times. If the result of the path is not
-the expected heap value, the program terminates with an error.
-
-The keyword arguments control some aspects of the generation
-of random mutators:
-@itemize[
-@item{Elements from the @racket[heap-values] argument are used as the base
-  values when creating nodes with no outgoing edges.  See also
-  @racket[find-heap-values].}
-@item{The @racket[iterations] argument controls how many times the graph is
-  created (and traversed).}
-@item{The @racket[program-size] argument is a bound on how big the program it
-  is; it limits the number of nodes, the maximum number of edges, and the
-  length of the path in the graph.}
-@item{The @racket[heap-size] argument controls the size of the heap in the
-  generated mutator.}]
-
-}
-
-Example:
-@racketblock[(save-random-mutator "tmp.rkt" "mygc.rkt" #:gc2? #t)]
-will write to @filepath{tmp.rkt} with a program like this one:
-@codeblock{
-#lang plai/gc2/mutator
-(allocator-setup "mygc.rkt" 200)
-(define (build-one)
-  (let* ((x0 1)
-         (x1 (cons #f #f))
-         (x2
-          (lambda (x)
-            (if (= x 0)
-              x0
-              (if (= x 1) x0 (if (= x 2) x1 (if (= x 3) x1 x0))))))
-         (x3 1)
-         (x4 (cons x3 x3))
-         (x5 (lambda (x) (if (= x 0) x4 (if (= x 1) x1 x2)))))
-    (set-first! x1 x2)
-    (set-rest! x1 x3)
-    x5))
-(define (traverse-one x5) (= 1 (first (x5 0))))
-(define (trigger-gc n)
-  (if (zero? n) 0 (begin (cons n n) (trigger-gc (- n 1)))))
-(define (loop i)
-  (if (zero? i)
-    'passed
-    (let ((obj (build-one)))
-      (trigger-gc 200)
-      (if (traverse-one obj) (loop (- i 1)) 'failed))))
-(loop 200)
-}
-
-
-@defproc[(find-heap-values [input (or/c path-string? input-port?)])
-         (listof heap-value?)]{
-  Processes @racket[input] looking for occurrences of @racket[heap-value?]s in
-  the source of the program and returns them. This makes a good start for the
-  @racket[_heap-values] argument to @racket[save-random-mutator].
-
-  If @racket[input] is a port, its contents are assumed to be a well-formed
-  PLAI program. If @racket[input] is a file, the contents of the file are used.
-}
diff --git a/pkgs/plai/scribblings/plai-exports.rkt b/pkgs/plai/scribblings/plai-exports.rkt
deleted file mode 100644
index 263d10f9b9..0000000000
--- a/pkgs/plai/scribblings/plai-exports.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require (for-label (except-in plai #%module-begin provide))
-         scribble/manual)
-(provide plai:print-only-errors
-         plai:halt-on-errors)
-(define plai:print-only-errors (racket print-only-errors))
-(define plai:halt-on-errors (racket halt-on-errors))
-
diff --git a/pkgs/plai/scribblings/plai.scrbl b/pkgs/plai/scribblings/plai.scrbl
deleted file mode 100644
index ebd8bea40f..0000000000
--- a/pkgs/plai/scribblings/plai.scrbl
+++ /dev/null
@@ -1,285 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          "rkt-exports.rkt"
-          "plai-exports.rkt"
-          "lang-names.rkt"
-          (for-syntax scheme)
-          (for-label (except-in scheme
-                                error printf)
-                     (prefix-in scheme:
-                                scheme)
-                     (only-in plai/main
-                              type-case define-type error
-                              test test/pred test/exn test/regexp
-                              abridged-test-output
-                              plai-catch-test-exn
-                              halt-on-errors print-only-errors
-                              test-inexact-epsilon plai-ignore-exn-strings
-                              plai-all-test-results)
-                     (only-in plai/collector
-                              root?
-                              heap-size
-                              location?
-                              heap-value?
-                              heap-set! heap-ref with-heap
-                              get-root-set read-root set-root!
-                              procedure-roots)
-                     plai/scribblings/fake-collector
-                     plai/scribblings/fake-mutator
-                     plai/scribblings/fake-web
-                     plai/random-mutator
-                     (only-in plai/web
-                              no-web-browser
-                              static-files-path)
-                     (only-in plai/mutator
-                              set-first!
-                              set-rest!
-                              import-primitives
-                              test/location=?
-                              test/value=?
-                              printf)))
-
-@title{@italic{Programming Languages: Application and Interpretation}}
-
-This is the documentation for the software accompanying the textbook @bold{Programming Languages: Application and
-Interpretation} (PLAI). The full book can be found on the Web at:
-
-@(link "http://www.cs.brown.edu/~sk/Publications/Books/ProgLangs/"
-       "http://www.cs.brown.edu/~sk/Publications/Books/ProgLangs/")
-
-This package contains the following languages:
-
-@local-table-of-contents[#:style 'immediate-only]
-
-@section[#:tag "plai-scheme"]{@PLAI-LANG} 
-
-@defmodulelang[plai]
-
-@(define scheme-guide '(lib "scribblings/reference/reference.scrbl"))
-
-@PLAI-LANG is derived from the @racketmodname[scheme] language.  In addition,
-it includes the @racket[define-type] and @racket[type-case] forms and testing
-support. Also, modules written in @racketmodname[plai] export every definition
-(unlike @racketmodname[scheme]).
-
-@subsection[#:tag "define-type"]{Defining Types: @racket[define-type]}
-
-@defform/subs[(define-type type-id variant ...)
-              ([variant (variant-id (field-id contract-expr) ...)])]{
-
-Defines the datatype @racket[_type-id].  A constructor @racket[_variant-id] is
-defined for each variant.  Each constructor takes an argument for each field of
-its variant.
-
-The value of each field is checked by its associated @racket[_contract-expr].
-A @racket[_contract-expr] may be an arbitrary predicate or a contract.
-
-In addition to the contructors, a @racket[define-type] expression also defines:
-
-@itemize[
-
-  @item{a predicate @racket[_type-id?] that returns @racket[true] for instances
-    of the datatype, and @racket[false] for any other value,}
-
-  @item{for each variant, a predicate @racket[_variant-id?] that returns
-    @racket[true] when applied to a value of the same variant and
-    @racket[false] for any other value,}
-
-  @item{for each field of each variant, an accessor
-    @racket[_variant-id-field-id] that returns the value of the field, and}
-
-  @item{for each field of each variant, a mutator
-    @racket[_set-variant-id-field-id!] that set the value of the field.}
-]}
-
-@subsection[#:tag "type-case"]{Deconstructing Data Structures: @racket[type-case]}
-
-@defform/subs[(type-case datatype-id expr
-                 branch ...)
-
-              ([branch (variant-id (field-id ...) result-expr ...)
-                       (else result-expr ...)])]{
-
-Branches on the datatype instance produced by @racket[_expr], which must be an
-instance of @racket[_datatype-id] (previously defined with
-@racket[define-type]) Each @racket[_branch] extracts the values of the fields,
-and binds them to @racket[_field-id ...].
-
-If a branch is not specified for each variant, you may use an @racket[else]
-branch to create a catch-all branch.  An @racket[else] branch must be the last
-branch in the sequence of branches.  @racket[type-case] signals a compile-time
-error if all variants are not covered and the @racket[else] branch is missing.
-Similarly, @racket[type-case] signals a compile-time error if an @racket[else]
-branch is unreachable because a branch exists for all variants.
-
-}
-
-@subsection[#:tag "testing"]{Testing Infrastructure}
-
-PLAI Scheme provides the following syntactic forms for testing.
-
-@defform/subs[(test result-expr expected-expr)()]{
-
-If @racket[_result-expr] and @racket[_expected-expr] evaluate to the same
-value, @racket[_result-value], the test prints the following expression:
-
-@racketresultfont{(good result-expr result-value expected-value location)}.
-
-If they do not evaluate to the same value, the test prints
-
-@racketresultfont{(bad result-expr result-value expected-value location)}.
-
-If evaluating @racket[_result-expr] signals an error, the test prints
-
-@racketresultfont{(exception result-expr exception-message <no-expected-value> location)}
-
-If evaluating @racket[_expected-expr] signals an error, the test prints
-
-@racketresultfont{(pred-exception result-expr exception-message <no-expected-value> location)}
-
-If the printout begins with @racket[good], then it is printed to
-@racket[(current-output-port)]; otherwise it is printed to @racket[(current-error-port)].
-
-}
-
-@defform/subs[(test/pred result-expr pred?)()]{
-
-Similar to @racket[test], but instead of supplying an expected value, the
-predicate @racket[_pred?] is applied to @racket[_result-expr].
-
-If evaluating @racket[_pred?] signals an error, the test prints
-
-@racketresultfont{(pred-exception result-expr exception-message <no-expected-value> location)}
-
-The syntax of @racket[_pred?] is considered @racket[_expected-value] for the
-purposes of test reporting.
-}
-
-@defthing[error procedure?]{
- Like @racketmodname[scheme]'s @racket[scheme:error],
- but generates exceptions that are caught by @racket[test/exn].
-}
-
-@defform/subs[(test/exn result-expr error-message)()]{
-
-This test succeeds if the expression evaluates to a call to
-@racket[error]. Moreover, the error message contained in the exception must
-contain the string @racket[_error-message]. Note that @racket[test/exn] only
-succeeds if the exception was explicitly raised by the user.
-
-For example, the following test succeeds:
-
-@racketblock[(test/exn (error "/: division by zero") "by zero")]
-
-The error message is @racket["/: division by zero"], and @racket["by zero"] is
-a substring of the error message. However, the following test fails:
-
-@racketblock[(test/exn (/ 25 0) "by zero")]
-
-Although the expression raises an exception and the error string contains
-@racket["by zero"], since the error was not explicitly raised by user-written
-code, the test fails.
-
-The evaluation of @racket[_error-message] is considered
-@racket[_expected-value] for the purposes of test reporting.
-}
-
-@defform/subs[(test/regexp result-expr error-message-regexp)()]{
-
-This test is similar to @racket[test/exn],but the error message is matched
-against a regular expression instead.
-
-The evaluation of @racket[_error-message-regexp] is considered
-@racket[_expected-value] for the purposes of test reporting.
-}
-
-@subsubsection{Test Flags}
-
-@defproc[(abridged-test-output (abridge? boolean? false)) void?]{
-
-When this flag is set to @racket[true], the test forms never prints
-@racket[_result-expr] or @racket[_location].
-
-}
-
-@defproc[(plai-catch-test-exn (catch? boolean? true)) void?]{
-
-When this flag is set to @racket[true], exceptions from tests will be caught.
-By default, exceptions are caught.
-
-}
-
-
-@defproc[(halt-on-errors (halt? boolean? true)) void?]{
-
-This flag determines whether the program immediately halts when a test fails.
-By default, programs do not halt on failures.
-}
-
-@defproc[(print-only-errors (print? boolean? true)) void?]{
-
-When this flag is set to @racket[true], only tests that fail will be printed.
-By default, the results of all tests are printed.
-
-}
-
-@defproc[(test-inexact-epsilon (epsilon number?)) void?]{
-
-When testing inexact values for equality, @racket[test] permits them to differ
-by @racket[_epsilon].  The default value of @racket[_epsilon] is @racket[0.01].
-
-}
-
-@defproc[(plai-ignore-exn-strings (ignore? boolean?)) void?]{
-
-If this flag is set to @racket[true], when testing for exceptions with
-@racket[test/exn] and @racket[test/regexp], the message of the exception is
-ignored.  By default, @racket[test/exn] and @racket[test/regexp] only succeed
-when the message of the exception matches the supplied string or regular
-expression.
-
-}
-
-@defidform[plai-all-test-results]{
-
-This variable is the list of all tests that have been run so far, with the most
-recent test at the head.
-
-}
-@include-section["collector.scrbl"]
-@include-section["mutator.scrbl"]
-@include-section["collector2.scrbl"]
-@include-section["mutator2.scrbl"]
-
-@section[#:tag "web"]{@WEB-LANG}
-
-@defmodulelang[plai/web]
-
-The @WEB-LANG language allows you to write server-side Web applications for the
-PLT Web Server.
-
-For more information about writing Web applications, see:
-@other-manual['(lib "web-server/scribblings/web-server.scrbl")].
-
-When you click on the @onscreen{Run} button in DrRacket, your Web application
-is launched in the Web server.
-
-The application is available at
-@italic{http://localhost:8000/servlets/standalone.rkt}.
-
-The @WEB-LANG language will automatically load this URL in your Web browser.
-
-You may use @racket[no-web-browser] to prevent the browser from being launched
-and @racket[static-files-path] to serve additional static files.
-
-@subsection{Web Application Exports}
-
-@declare-exporting[#:use-sources (plai/scribblings/fake-web)]
-
-A Web application must define a procedure @racket[start]:
-
-@defproc[(start (initial-request request?)) response?]{
-
-The initial request to a Web application is serviced by this procedure.
-
-}
diff --git a/pkgs/plai/scribblings/rkt-exports.rkt b/pkgs/plai/scribblings/rkt-exports.rkt
deleted file mode 100644
index 15e1a60e59..0000000000
--- a/pkgs/plai/scribblings/rkt-exports.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-(require (for-label racket)
-         (for-syntax racket/base)
-         scribble/manual)
-(define-syntax-rule (is x ...)  (begin (i x) ...))
-(define-syntax (i stx)
-  (syntax-case stx ()
-    [(_ id)
-     (with-syntax ([ext-id (string->symbol (format "rkt:~a" (symbol->string (syntax-e #'id))))])
-       #`(begin (provide ext-id)
-                (define ext-id (racket id))))]))
-
-(is add1 sub1 zero? + - * / even? odd? = < > <= >= 
-    symbol? symbol=? number? boolean? empty? eq?)
-(is if and or cond case define-values let let-values let* set! quote error begin)
diff --git a/pkgs/plai/test-harness.rkt b/pkgs/plai/test-harness.rkt
deleted file mode 100644
index ba1364561b..0000000000
--- a/pkgs/plai/test-harness.rkt
+++ /dev/null
@@ -1,210 +0,0 @@
-#lang scheme
-(require (only-in srfi/13 string-contains)
-         plai/private/command-line)
-
-(provide plai-error test test/pred test/regexp test/exn)
-(provide/contract
- [exn:plai? (any/c . -> . boolean?)]
- [abridged-test-output (parameter/c boolean?)]
- [plai-ignore-exn-strings (parameter/c boolean?)]
- [plai-catch-test-exn (parameter/c boolean?)]
- [test-inspector (parameter/c inspector?)]
- [test-inexact-epsilon (parameter/c number?)])
-
-(define thunk (-> any))
-
-(define test-inspector (make-parameter (current-inspector)))
-(define test-inexact-epsilon (make-parameter 0.01))
-
-; We only catch exceptions of this type.  plai-error throws such exceptions.
-(define-struct (exn:plai exn:fail) () #:transparent)
-
-(define (plai-error . args)
-  (with-handlers
-      [(exn:fail? (λ (exn) 
-                    (raise
-                     (make-exn:plai (exn-message exn)
-                                    (exn-continuation-marks exn)))))]
-    (apply error args)))
-
-(define-struct (exn:test exn:fail) ())
-
-(define (install-test-inspector)
-  (test-inspector (current-inspector))
-  (current-inspector (make-inspector))
-  (print-struct #t))
-
-(define (maybe-command-line arg)
-  (and (member arg (vector->list (current-command-line-arguments))) true))
-
-(define halt-on-errors? (maybe-command-line "--plai-halt-on-errors"))
-(define print-only-errors? (maybe-command-line "--plai-print-only-errors"))
-
-(provide/contract (halt-on-errors (() (boolean?) . ->* . void?)))
-(define (halt-on-errors [halt? true])
-  (set! halt-on-errors? halt?))
-
-(provide/contract (print-only-errors (() (boolean?) . ->* . void?)))
-(define (print-only-errors [print? true])
-  (set! print-only-errors? print?))
-
-; list of all test results
-(provide plai-all-test-results)
-(define plai-all-test-results empty)
-
-; set to true if 
-(define plai-ignore-exn-strings (make-parameter false))
-
-(define (may-print-result result)
-  (parameterize ([current-inspector (test-inspector)]
-                 [print-struct #t])
-    (define error? 
-      (not (eq? (first result) 'good)))
-    (define print?
-      (if print-only-errors?
-          (if error?
-              #t
-              #f)
-          #t))
-    (set! plai-all-test-results (cons result plai-all-test-results))
-    (when print?
-      (if (abridged-test-output)
-          (apply (if error? eprintf printf) "(~s ~v ~v)\n" result)
-          (apply (if error? eprintf printf) "(~s ~s ~v ~v ~s)\n" result)))
-    (when (and halt-on-errors? error?)
-      (raise (make-exn:test (string->immutable-string (format "test failed: ~s" result))
-                            (current-continuation-marks))))))
-
-(define plai-catch-test-exn (make-parameter true))
-(define (exn+catching? x)
-  (and (exn? x) (plai-catch-test-exn)))
-
-;;; If the expression raises an exception, it is returned as a value, only if
-;;; the exception subclasses struct:exn.
-(define-syntax (return-exception stx)
-  (syntax-case stx ()
-    [(_ expr)
-     #'(with-handlers
-           ([exn+catching? (λ (exn) exn)])
-         expr)]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Syntax forms for the test procedures make it unnecessary to enclose the
-;;; expression in a thunk.  More importantly, they automatically specify the
-;;; line number of the test as the comment.
-
-(provide generic-test equal~?)
-(define (abridged v)
-  (if (abridged-test-output)
-      empty
-      (list v)))
-(define (print-error case test-sexp test-result expected-val loc)
-  `(,case
-    ,@(abridged test-sexp)
-    ,test-result
-    ,expected-val
-    ,@(abridged loc)))
-
-(define (generic-test test-thunk pred test-sexp loc)
-  (unless (disable-tests)
-    (may-print-result
-     (with-handlers
-         ; Applying the predicate shouldn't raise an exception.
-         ([exn+catching? (λ (exn) 
-                           (print-error
-                            'pred-exception
-                            test-sexp
-                            (exn-message exn)
-                            '<no-expected-value>
-                            loc))])
-       (let ([test-result (return-exception (test-thunk))])
-         (if (or (exn:plai? test-result)
-                 (not (exn? test-result)))
-             (local [(define-values (test-value expected-val)
-                       (pred test-result))]
-               (print-error 
-                (cond
-                  [(exn:plai? test-value) 'exception]
-                  [test-value 'good]
-                  [else 'bad]) 
-                test-sexp
-                (if (exn:plai? test-result)
-                    (exn-message test-result)
-                    test-result)
-                expected-val loc))
-             (print-error
-              'exception
-              test-sexp
-              (exn-message test-result)
-              '<no-expected-value>
-              loc)))))))
-
-(define (equal~? x y)
-  (or (parameterize ([current-inspector (test-inspector)])
-        (equal? x y))
-      (and (number? x) (number? y)
-           (or (inexact? x) (inexact? y))
-           ; If one of them is inexact, we do the math.
-           (< (abs (- x y)) (test-inexact-epsilon)))))
-
-(define-syntax (test stx)
-  (syntax-case stx ()
-    [(_ result-expr expected-expr)
-     #`(generic-test 
-        (λ () result-expr) 
-        (λ (result-value)
-          (define expected-val expected-expr)
-          (values
-           (cond
-             [(exn:plai? result-value) result-value]
-             [(equal~? result-value expected-val) true]
-             [else false])
-           expected-val))
-        (quote #,(syntax->datum #'result-expr))
-        (format "at line ~a" #,(syntax-line stx)))]))
-
-(define-syntax (test/pred stx)
-  (syntax-case stx ()
-    [(_ test-expr pred)
-     #`(generic-test 
-        (λ () test-expr)
-        (λ (val)
-          (values
-           (cond
-             [(exn:plai? val) val]
-             [else (pred val)])
-           (quote #,(syntax->datum #'pred))))
-        (quote #,(syntax->datum #'test-expr))
-        (format "at line ~a" #,(syntax-line stx)))]))
-
-(define-syntax (test/exn stx)
-  (syntax-case stx ()
-    [(_ test-expr exception-substring)
-     #`(generic-test
-        (λ () test-expr)
-        (λ (val)
-          (define exception-substring-val exception-substring)
-          (values
-           (and (exn:plai? val)
-                (or (plai-ignore-exn-strings)
-                    (string-contains (exn-message val) exception-substring-val)))
-           exception-substring-val))
-        (quote #,(syntax->datum #'test-expr))
-        (format "at line ~a" #,(syntax-line stx)))]))
-
-(define-syntax (test/regexp stx)
-  (syntax-case stx ()
-    [(_ test-expr regexp)
-     #`(generic-test
-        (λ () test-expr)
-        (λ (val)
-          (define regexp-val regexp)
-          (values 
-           (and (exn:plai? val)
-                (or (plai-ignore-exn-strings)
-                    (regexp-match regexp (exn-message val))))
-           regexp-val))
-        (quote #,(syntax->datum #'test-expr))
-        (format "at line ~a" #,(syntax-line stx)))]))
-
-(install-test-inspector)
diff --git a/pkgs/plai/tests/datatype-coverage.rkt b/pkgs/plai/tests/datatype-coverage.rkt
deleted file mode 100644
index bcf84bf084..0000000000
--- a/pkgs/plai/tests/datatype-coverage.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang plai
-;; RE: PR10485
-(define-type toy
-  [airplane (lift number?) (name string?)])
-
-(type-case toy (airplane 3412 "the bat!")
-  [airplane (lift name) (+ lift 13)])
-
-;; The body of this function should be the only red in the file
-(define (f x)
-  (+ 1 1))
diff --git a/pkgs/plai/tests/datatype-exports.rkt b/pkgs/plai/tests/datatype-exports.rkt
deleted file mode 100644
index 7a89dde775..0000000000
--- a/pkgs/plai/tests/datatype-exports.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/load
-(require tests/eli-tester)
-
-(module ex plai
-  (define-type Type
-    [Variant (field number?)]))
-  
-(define-syntax (exports-of stx)
- (syntax-case stx ()
-   [(_ module-name)
-    (let ([exports (syntax-local-module-exports (syntax->datum #'module-name))])
-      #`(quote #,(cdaddr exports)))]))
-
-(test (sort (exports-of 'ex) string-ci<? #:key symbol->string)
-      =>
-      '(make-Variant set-Variant-field! Type Type? Variant Variant-field Variant?))
diff --git a/pkgs/plai/tests/datatype-state.rkt b/pkgs/plai/tests/datatype-state.rkt
deleted file mode 100644
index d84ab10e91..0000000000
--- a/pkgs/plai/tests/datatype-state.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang plai
-(require (prefix-in eli: tests/eli-tester))
-
-(define-type A (a (x number?)))
-
-(define an-a (a 10))
-
-(eli:test
- (a-x an-a) => 10
- (set-a-x! an-a 20)
- (a-x an-a) => 20)
diff --git a/pkgs/plai/tests/datatype.rkt b/pkgs/plai/tests/datatype.rkt
deleted file mode 100644
index 20de5126a6..0000000000
--- a/pkgs/plai/tests/datatype.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang plai
-(require (prefix-in eli: tests/eli-tester)
-         "util.rkt")
-
-(define-type A
-  [mta]
-  [a (b B?)])
-
-(define-type B
-  [mtb]
-  [b (a A?)])
-
-(define-type T
-  [i (f number?)])
-
-(define-type T1
-  [i1 (f (car 1))])
-
-(define-type DefrdSub
-  [mtSub]
-  [aSub (value boolean?)])
-
-(define (lookup ds the-name)
-  (type-case DefrdSub ds
-             [mtSub () 1]
-             [aSub (a-name) 2]))
-
-(define-type t (c))
-
-(define-type t1 (c1 (n number?)))
-
-(define ((ERR f) line#)
-  (format f (+ line# THIS-LINE#)))
-
-(define ERR1
-  (ERR "\\(exception \\(make-i #f\\) \"make-i.+\" '<no-expected-value> \"at line ~a\"\\)"))
-
-(define ERR2
-  (ERR "\\(exception \\(i-f #f\\) \"i-f.+\" '<no-expected-value> \"at line ~a\"\\)"))
-
-(define ERR3 
-  (ERR
-   "\\(exception \\(c1 \\(quote not-a-number\\)\\) \"c1.+\" '<no-expected-value> \"at line ~a\"\\)"))
-
-(define (ERR4 line#)
-  (string-append 
-   (regexp-quote "(exception (type-case t (list 1) (c () 1)) \"")
-   (regexp-quote "type-case: expected a value from type t, got: '(1)\"")
-   (regexp-quote " '<no-expected-value> \"at line ")
-   ((ERR "~a") line#)
-   (regexp-quote "\")")))
-
-(define THIS-LINE# 53)
-
-(eli:test
- (i 4)
- (regexp-match (ERR1 4) (with-both-output-to-string (λ () (test/exn (make-i #f) "contract"))))
- (regexp-match (ERR2 5) (with-both-output-to-string (λ () (test/exn (i-f #f) "contract"))))
- (type-case A (mta) [mta () 1] [a (x) 2])
- =>
- 1
- (regexp-match (ERR3 9) (with-both-output-to-string (λ () (test (c1 'not-a-number) (list 5)))))
- 
- (regexp-match 
-  (ERR4 (+ 12 1))
-  (with-both-output-to-string (λ () (test/exn (type-case t (list 1) (c () 1)) "expected"))))
-
- (type-case "foo" "bar") =error> "this must be a type defined with define-type"
- (type-case + "bar") =error> "this must be a type defined with define-type"
- (type-case #f [x () 1]) =error> "this must be a type defined with define-type")
diff --git a/pkgs/plai/tests/gc/bad-collectors/no-collection-collector.rkt b/pkgs/plai/tests/gc/bad-collectors/no-collection-collector.rkt
deleted file mode 100644
index 880ec650a8..0000000000
--- a/pkgs/plai/tests/gc/bad-collectors/no-collection-collector.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang plai/collector
-
-(define ptr 0)
-
-(define (init-allocator) (void))
-
-(define (gc:deref loc) #f)
-(define (gc:alloc-flat hv) 0)
-(define (gc:cons hd tl) 0)
-(define (gc:first pr) 0)
-(define (gc:rest pr) 0)
-(define (gc:flat? loc) #t)
-(define (gc:cons? loc) #f)
-(define (gc:set-first! pr new) (void))
-(define (gc:set-rest! pr new) (void))
-
-(with-heap (vector 1 2 3)
-  (test (gc:deref 0) #f))
diff --git a/pkgs/plai/tests/gc/bad-mutators/mut-1.rkt b/pkgs/plai/tests/gc/bad-mutators/mut-1.rkt
deleted file mode 100644
index f65b316abd..0000000000
--- a/pkgs/plai/tests/gc/bad-mutators/mut-1.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../bad-collectors/broken-collector.rkt" 12)
-
-50
-60
-70
-80
-(define x (cons 1 2))
-
-(set-first! x x)
diff --git a/pkgs/plai/tests/gc/bad-mutators/mutator0.rkt b/pkgs/plai/tests/gc/bad-mutators/mutator0.rkt
deleted file mode 100644
index e01e30a3a9..0000000000
--- a/pkgs/plai/tests/gc/bad-mutators/mutator0.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang plai/mutator
diff --git a/pkgs/plai/tests/gc/bad-mutators/mutator1.rkt b/pkgs/plai/tests/gc/bad-mutators/mutator1.rkt
deleted file mode 100644
index 4ae13eb3a4..0000000000
--- a/pkgs/plai/tests/gc/bad-mutators/mutator1.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang plai/mutator
-1
diff --git a/pkgs/plai/tests/gc/bad-mutators/mutator2.rkt b/pkgs/plai/tests/gc/bad-mutators/mutator2.rkt
deleted file mode 100644
index c55f336206..0000000000
--- a/pkgs/plai/tests/gc/bad-mutators/mutator2.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../collectors/trivial-collector.rkt" "y")
diff --git a/pkgs/plai/tests/gc/bad-mutators/mutator3.rkt b/pkgs/plai/tests/gc/bad-mutators/mutator3.rkt
deleted file mode 100644
index 2b0c79fdb7..0000000000
--- a/pkgs/plai/tests/gc/bad-mutators/mutator3.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang plai/mutator
-(allocator-setup a 100)
diff --git a/pkgs/plai/tests/gc/bad-mutators/mutator5.rkt b/pkgs/plai/tests/gc/bad-mutators/mutator5.rkt
deleted file mode 100644
index 7316851b96..0000000000
--- a/pkgs/plai/tests/gc/bad-mutators/mutator5.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/trivial-collector.rkt")
diff --git a/pkgs/plai/tests/gc/bad-mutators/void-app.rkt b/pkgs/plai/tests/gc/bad-mutators/void-app.rkt
deleted file mode 100644
index c1a80220e9..0000000000
--- a/pkgs/plai/tests/gc/bad-mutators/void-app.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 100)
-(define x (cons 1 2))
-((set-first! x 2) 1)
diff --git a/pkgs/plai/tests/gc/good-collectors/good-collector.rkt b/pkgs/plai/tests/gc/good-collectors/good-collector.rkt
deleted file mode 100644
index c249cc1819..0000000000
--- a/pkgs/plai/tests/gc/good-collectors/good-collector.rkt
+++ /dev/null
@@ -1,286 +0,0 @@
-#lang plai/collector
-
-#|
-
-A collector for use in testing the random mutator generator.
-
-|#
-
-(print-only-errors #t)
-
-(define (find-free-space start size)
-  (cond
-    [(= start (heap-size))
-     #f]
-    [(n-free-blocks? start size)
-     start]
-    [else
-     (find-free-space (+ start 1) size)]))
-
-(define (n-free-blocks? start size)
-  (cond
-    [(= size 0) #t]
-    [(= start (heap-size)) #f]
-    [else 
-     (and (eq? 'free (heap-ref start))
-          (n-free-blocks? (+ start 1) (- size 1)))]))
-
-(test (with-heap #(free free free)
-                 (n-free-blocks? 0 2))
-      #t)
-(test (with-heap #(free free free)
-                 (n-free-blocks? 0 3))
-      #t)
-(test (with-heap #(free free free)
-                 (n-free-blocks? 0 4))
-      #f)
-(test (with-heap #(free free free)
-                 (n-free-blocks? 2 1))
-      #t)
-(test (with-heap #(free free free)
-                 (n-free-blocks? 2 2))
-      #f)
-
-(test (with-heap #(free free free)
-                 (find-free-space 0 1))
-      0)
-(test (with-heap #(pair free free)
-                 (find-free-space 0 1))
-      1)
-(test (with-heap #(pair free free)
-                 (find-free-space 0 2))
-      1)
-(test (with-heap #(pair free free)
-                 (find-free-space 0 3))
-      #f)
-
-(define (init-allocator) 
-  (for ([i (in-range 0 (heap-size))])
-    (heap-set! i 'free)))
-
-(test (let ([v (make-vector 12 'x)])
-        (with-heap v (init-allocator))
-        v)
-      (make-vector 12 'free))
-
-(define (gc:deref loc) 
-  (cond
-    [(equal? (heap-ref loc) 'flat)
-     (heap-ref (+ loc 1))]
-    [else
-     (error 'gc:deref "attempted to deref a non flat value, loc ~s" loc)]))
-
-(test (with-heap (vector 'free 'free 'free 'flat 14 'free 'free)
-                 (gc:deref 3))
-      14)
-
-(define (gc:first pr-ptr) 
-  (if (equal? (heap-ref pr-ptr) 'pair)
-      (heap-ref (+ pr-ptr 1))
-      (error 'first "non pair")))
-
-(test (with-heap (vector 'free 'flat 3 'pair 0 1)
-                 (gc:first 3))
-      0)
-
-(define (gc:rest pr-ptr) 
-  (if (equal? (heap-ref pr-ptr) 'pair)
-      (heap-ref (+ pr-ptr 2))
-      (error 'first "non pair")))
-
-(test (with-heap (vector 'free 'flat 3 'pair 0 1)
-                 (gc:rest 3))
-      1)
-
-(define (gc:flat? loc) (equal? (heap-ref loc) 'flat))
-
-(test (with-heap (vector 'free 'free 'pair 0 1 'flat 14)
-                 (gc:flat? 2))
-      #f)
-(test (with-heap (vector 'free 'free 'pair 0 1 'flat 14)
-                 (gc:flat? 5))
-      #t)
-
-(define (gc:cons? loc) (equal? (heap-ref loc) 'pair))
-
-(test (with-heap (vector 'free 'free 'pair 0 1 'flat 14)
-                 (gc:cons? 2))
-      #t)
-(test (with-heap (vector 'free 'free 'pair 0 1 'flat 14)
-                 (gc:cons? 5))
-      #f)
-
-(define (gc:set-first! pr-ptr new) 
-  (if (equal? (heap-ref pr-ptr) 'pair)
-      (heap-set! (+ pr-ptr 1) new)
-      (error 'set-first! "non pair")))
-
-(define (gc:set-rest! pr-ptr new) 
-  (if (equal? (heap-ref pr-ptr) 'pair)
-      (heap-set! (+ pr-ptr 2) new)
-      (error 'set-first! "non pair")))
-
-
-(define (gc:alloc-flat fv) 
-  (let ([ptr (alloc 2 (λ () 
-                        (if (procedure? fv)
-                            (append (procedure-roots fv)
-                                    (get-root-set))
-                            (get-root-set))))])
-    (heap-set! ptr 'flat)
-    (heap-set! (+ ptr 1) fv)
-    ptr))
-
-(define (gc:cons hd tl)
-  (let ([ptr (alloc 3 (λ () (get-root-set hd tl)))])
-    (heap-set! ptr 'pair)
-    (heap-set! (+ ptr 1) hd)
-    (heap-set! (+ ptr 2) tl)
-    ptr))
-
-(define (alloc n get-roots)
-  (let ([next (find-free-space 0 n)])
-    (cond
-      [next
-       next]
-      [else
-       (collect-garbage get-roots)
-       (let ([next (find-free-space 0 n)])
-         (unless next
-           (error 'alloc "out of space"))
-         next)])))
-
-(define (collect-garbage get-roots)
-  (let ([roots (map read-root (get-roots))])
-    ;; (eprintf "roots: ~a\n" roots)
-    (collect-garbage-help roots
-                          (remove* roots (get-all-records 0)))))
-
-(define (collect-garbage-help gray white)
-  (cond
-    [(null? gray) (free! white)]
-    [else
-     (case (heap-ref (car gray))
-       [(flat) 
-        (let ([proc (heap-ref (+ (car gray) 1))])
-          (if (procedure? proc)
-              (let ([new-locs (map read-root (procedure-roots proc))])
-                ;; (eprintf "proc roots: ~a\n" new-locs)
-                (collect-garbage-help 
-                 (add-in new-locs (cdr gray) white)
-                 (remove* new-locs white)))
-              (collect-garbage-help (cdr gray) white)))]
-       [(pair) 
-        (let ([hd (heap-ref (+ (car gray) 1))]
-              [tl (heap-ref (+ (car gray) 2))])
-          (collect-garbage-help 
-           (add-in (list hd tl) (cdr gray) white)
-           (remove tl (remove hd white))))]
-       [else
-        (error 'collect-garbage "unknown tag ~s, loc ~s" (heap-ref (car gray)) (car gray))])]))
-
-(define (free! whites)
-  (cond
-    [(null? whites) (void)]
-    [else
-     (let ([white (car whites)])
-       (case (heap-ref white)
-         [(pair) 
-          (heap-set! white 'free)
-          (heap-set! (+ white 1) 'free)
-          (heap-set! (+ white 2) 'free)]
-         [(flat)
-          (heap-set! white 'free)
-          (heap-set! (+ white 1) 'free)]
-         [else 
-          (error 'free! "unknown tag ~s\n" (heap-ref white))])
-       (free! (cdr whites)))]))
-
-(test (let ([v (vector #f #t '() 0 1 2 3 4 5 6 'pair 0 1 'flat 14 'pair 0 1 'flat 12)])
-        (with-heap v (free! (list 10 18)))
-        v)
-      (vector #f #t '() 0 1 2 3 4 5 6 'free 'free 'free 'flat 14 'pair 0 1  'free 'free))
-      
-;; add-in : (listof location) (listof location) (listof location) -> (listof location)
-;; computes a new set of gray addresses by addding all white elements of locs to gray
-(define (add-in locs gray white)
-  (cond
-    [(null? locs) gray]
-    [else
-     (let* ([loc (car locs)]
-            [white? (member loc white)])
-       (add-in (cdr locs)
-               (if white? (cons loc gray) gray)
-               white))]))
-
-(test (add-in '(13 14) '(100 102) '(13 14 104 105))
-      '(14 13 100 102))
-
-(test (add-in '(13 14) '(100 102) '(13 104 105))
-      '(13 100 102))
-
-(define (get-all-records i)
-  (cond
-    [(< i (heap-size))
-     (case (heap-ref i)
-       [(pair) (cons i (get-all-records (+ i 3)))]
-       [(flat) (cons i (get-all-records (+ i 2)))]
-       [(free) (get-all-records (+ i 1))]
-       [else (get-all-records (+ i 1))])]
-    [else null]))
-
-(test (with-heap (vector #f #t '() 0 1 2 3 4 5 6 'pair 0 1 'flat 14 'pair 0 1 'flat 12)
-                 (get-all-records 0))
-      (list 10 13 15 18))
-
-(test (with-heap (make-vector 10 'free) (gc:alloc-flat #f))
-      0)
-
-(test (with-heap (make-vector 10 'free) (gc:alloc-flat #t) (gc:alloc-flat #f))
-      2)
-
-(test (let ([v (vector 'flat 0 'flat 1)])
-        (with-heap v (collect-garbage-help (list) 
-                                           (get-all-records 0)))
-        v)
-      (vector 'free 'free 'free 'free))
-
-(test (let ([v (vector 'flat 0 'flat 1)])
-        (with-heap v (collect-garbage-help (list 0) 
-                                           (remove 0 (get-all-records 0))))
-        v)
-      (vector 'flat 0 'free 'free))
-
-(test (let ([v (vector 'flat 0 'flat 1)])
-        (with-heap v (collect-garbage-help (list 2) 
-                                           (remove 2 (get-all-records 0))))
-        v)
-      (vector  'free 'free 'flat 1))
-
-(test (let ([v (vector 'flat 0 'flat 1 'pair 0 2)])
-        (with-heap v (collect-garbage-help (list 4) 
-                                           (remove 4 (get-all-records 0))))
-        v)
-      (vector 'flat 0 'flat 1 'pair 0 2))
-
-(test (let ([v (vector 'flat 0 'flat 1 'pair 0 0)])
-        (with-heap v (collect-garbage-help (list 4) 
-                                           (remove 4 (get-all-records 0))))
-        v)
-      (vector 'flat 0 'free 'free 'pair 0 0))
-
-(test (let ([v (vector 'flat 0 'flat 1 'pair 4 4)])
-        (with-heap v (collect-garbage-help (list 4) 
-                                           (remove 4 (get-all-records 0))))
-        v)
-      (vector 'free 'free 'free 'free 'pair 4 4))
-
-(test (with-heap (make-vector 50)
-                 (with-roots (list 1 2 3)
-                             (get-root-set)))
-      (list 1 2 3))
-(test (with-heap (make-vector 50)
-                 (with-roots (list 1 2 3)
-                             (with-roots (list 4 5 6)
-                                         (sort (get-root-set) <))))
-      (list 1 2 3 4 5 6))
diff --git a/pkgs/plai/tests/gc/good-collectors/trivial-collector.rkt b/pkgs/plai/tests/gc/good-collectors/trivial-collector.rkt
deleted file mode 100644
index b3e1773c85..0000000000
--- a/pkgs/plai/tests/gc/good-collectors/trivial-collector.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang plai/collector
-(define heap-ptr 'uninitialized-heap-ptr)
-
-(define (init-allocator)
-  ; calling heap-offset before init-allocator is called gives 'undefined
- (set! heap-ptr 0))
-
-(define (gc:alloc-flat p)
-  (begin 
-    (when (> (+ heap-ptr 2) (heap-size))
-      (error "out of memory"))
-    (heap-set! heap-ptr 'prim)
-    (heap-set! (+ 1 heap-ptr) p)
-    (set! heap-ptr (+ 2 heap-ptr))
-    ; return the location of this flat data
-    (- heap-ptr 2)))
-
-(define (gc:cons f r)
-  (begin
-    (when (> (+ heap-ptr 3) (heap-size))
-      (error "out of memory"))
-    (heap-set! heap-ptr 'cons)
-    (heap-set! (+ 1 heap-ptr) f)
-    (heap-set! (+ 2 heap-ptr) r)
-    (set! heap-ptr (+ 3 heap-ptr))
-    (- heap-ptr 3)))
-
-(define (gc:deref a)
-  (heap-ref (+ 1 a)))
-
-; number -> boolean
-(define (gc:cons? a)
-  (eq? (heap-ref a) 'cons))
-
-; number -> any
-(define (gc:first a)
-  (heap-ref (+ 1 a)))
-
-; number -> number
-(define (gc:rest a)
-  (heap-ref (+ 2 a)))
-
-(define (gc:set-first! a f)
-  (if (gc:cons? a)
-      (heap-set! (+ 1 a) f)
-      (error 'set-first! "expects address of cons")))
-
-(define (gc:set-rest! a r)
-  (heap-set! (+ 2 a) r))
-
-; function number -> boolean
-(define (gc:flat? a)
-  (eq? 'prim (heap-ref a)))
-
diff --git a/pkgs/plai/tests/gc/good-mutators/andor.rkt b/pkgs/plai/tests/gc/good-mutators/andor.rkt
deleted file mode 100644
index 74c06d7f21..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/andor.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 400)
-(define (do-one i) (/ (- i 1)))
-(define (loop i)
-  (or (= 1 i)
-      (and (do-one i)
-           (loop (- i 1)))))
-(loop 50)
diff --git a/pkgs/plai/tests/gc/good-mutators/app.rkt b/pkgs/plai/tests/gc/good-mutators/app.rkt
deleted file mode 100644
index 3038959241..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/app.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 28)
-
-(define (app f)
-  (lambda (x)
-    (f x)))
-
-(define plus (app add1))
-
-(plus 23)
-(plus 5)
diff --git a/pkgs/plai/tests/gc/good-mutators/bindings.rkt b/pkgs/plai/tests/gc/good-mutators/bindings.rkt
deleted file mode 100644
index 5b1c5aa41e..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/bindings.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 58)
-
-(define x 'intial)
-(set! x 'final)
-(test/value=? x 'final)
-
-
-(define y
-  (let ([outer-local
-         (let ([inner-local 'value-expected])
-           inner-local)])
-    outer-local))
-
-(test/value=? y 'value-expected)
-
-(define (local-vars)
-  (let ([x 23] [y 23])
-    x))
-
-(test/value=? (local-vars) 23)
-
-(define (locals-2 x)
-  (+ x 5))
-
-(test/value=? (locals-2 23) 28)
diff --git a/pkgs/plai/tests/gc/good-mutators/by-val.rkt b/pkgs/plai/tests/gc/good-mutators/by-val.rkt
deleted file mode 100644
index 35d54cb3c6..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/by-val.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-; Ensure that call by value is correctly implemented.
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-
-(define global-val 'global)
-
-(define (mut-arg arg)
-  (set! arg 'mutated))
-
-(mut-arg global-val)
-
-
-(test/value=? global-val 'global)
diff --git a/pkgs/plai/tests/gc/good-mutators/case.rkt b/pkgs/plai/tests/gc/good-mutators/case.rkt
deleted file mode 100644
index 9497bc8aa2..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/case.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-(test/value=? (case 1 [(1) 2])
-              2)
-(test/value=? (case 1 [(1) 2] [else 3])
-              2)
-(test/value=? (case 2 [(1) 2] [else 3])
-              3)
diff --git a/pkgs/plai/tests/gc/good-mutators/circular.rkt b/pkgs/plai/tests/gc/good-mutators/circular.rkt
deleted file mode 100644
index dd99eff806..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/circular.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 68)
-
-(define (gen-circular)
-  (let ([x (cons 3 4)])
-    (let ([y (cons 2 x)])
-      (set-rest! x y)
-      x)))
-
-(define x (gen-circular))
-(test/location=? x (rest (rest x)))
diff --git a/pkgs/plai/tests/gc/good-mutators/classic-error.rkt b/pkgs/plai/tests/gc/good-mutators/classic-error.rkt
deleted file mode 100644
index 24aea5acb3..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/classic-error.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang plai/mutator
-; This is `classic' in that it caught many bugs in copying collectors that students wrote for CS173, Fall 2007.
-(allocator-setup "../good-collectors/good-collector.rkt" 28)
-
-'trash
-'junk
-; after GC, alpha beta are copied but the cons references them in the old semispace
-(define my-pair (cons 'alpha 'beta))
-; we have room for our-pair, but 'refuse forces a semi-space swap that exposes
-; the memory corruption (if one exists)
-'refuse
-(define our-pair (cons my-pair my-pair))
-(test/value=? our-pair '((alpha . beta) . (alpha . beta)))
-(test/location=? (first our-pair) (rest our-pair))
diff --git a/pkgs/plai/tests/gc/good-mutators/closure-1.rkt b/pkgs/plai/tests/gc/good-mutators/closure-1.rkt
deleted file mode 100644
index 2dabb5d8bc..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/closure-1.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 60)
-
-(define lst '(2 -10)) ; (cons 2 (cons -10 empty)))
-
-(define (map f lst)
-  (if (cons? lst)
-      (cons (f (first lst)) (map f (rest lst)))
-      empty))
-
-(define x 'gc-garbage)
-
-(test/value=? (map add1 lst) '(3 -9))
diff --git a/pkgs/plai/tests/gc/good-mutators/closure-2.rkt b/pkgs/plai/tests/gc/good-mutators/closure-2.rkt
deleted file mode 100644
index 07e3890b02..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/closure-2.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-
-
-(define make-conser
-  (lambda (n)
-    (lambda (x) 
-      (cons n x))))
-
-
-(define kons (make-conser 'catamaran))
-;1 2 3 5 6 7 
-(kons 'people)
-(kons 'maroon)
-(kons 'srfi)
-(test/value=? (kons 'peace) '(catamaran . peace))
diff --git a/pkgs/plai/tests/gc/good-mutators/cond.rkt b/pkgs/plai/tests/gc/good-mutators/cond.rkt
deleted file mode 100644
index ba9871c98a..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/cond.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-
-(cond
- [(zero? 3) 1111]
- [#f 2222]
- [#t 3333])
diff --git a/pkgs/plai/tests/gc/good-mutators/danny-bug.rkt b/pkgs/plai/tests/gc/good-mutators/danny-bug.rkt
deleted file mode 100644
index 1801c3723a..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/danny-bug.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 6)
-
-(define
-  proc
-  (let* ([not-root 1] ; 2
-         [root 2]) ; 4
-    (lambda () ; 6
-      3
-      root)))
-
-(proc)
diff --git a/pkgs/plai/tests/gc/good-mutators/else.rkt b/pkgs/plai/tests/gc/good-mutators/else.rkt
deleted file mode 100644
index 92812c0076..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/else.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang plai/mutator
-; Is else defined?
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-
-(test/value=? (cond [else 28935723]) 28935723)
diff --git a/pkgs/plai/tests/gc/good-mutators/empty-mutator.rkt b/pkgs/plai/tests/gc/good-mutators/empty-mutator.rkt
deleted file mode 100644
index c4ca4ab497..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/empty-mutator.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang plai/mutator
-
-(allocator-setup "../good-collectors/good-collector.rkt" 80)
diff --git a/pkgs/plai/tests/gc/good-mutators/gc-order.rkt b/pkgs/plai/tests/gc/good-mutators/gc-order.rkt
deleted file mode 100644
index fecb8145a0..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/gc-order.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 58)
-
-(define x 3)
-(cons (begin (set! x 2)
-             1)
-      (begin (set! x 3)
-             1))
-(test/value=? x 3)
diff --git a/pkgs/plai/tests/gc/good-mutators/global-roots.rkt b/pkgs/plai/tests/gc/good-mutators/global-roots.rkt
deleted file mode 100644
index 408cc17c6a..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/global-roots.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 20)
-
-
-(define car first)
-
-
-'junk
-'junk
-'junk
-(test/value=? (car (cons 'this-car 2)) 'this-car)
diff --git a/pkgs/plai/tests/gc/good-mutators/imports.rkt b/pkgs/plai/tests/gc/good-mutators/imports.rkt
deleted file mode 100644
index 2d749d2b5a..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/imports.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 20)
-
-(import-primitives modulo)
-
-(test/value=? (modulo 5 3) 2)
diff --git a/pkgs/plai/tests/gc/good-mutators/kathi-bug-1.rkt b/pkgs/plai/tests/gc/good-mutators/kathi-bug-1.rkt
deleted file mode 100644
index 1e33fcf950..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/kathi-bug-1.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 84)
-(define L (cons 3 empty))
-(test/value=? L '(3))
diff --git a/pkgs/plai/tests/gc/good-mutators/me-let.rkt b/pkgs/plai/tests/gc/good-mutators/me-let.rkt
deleted file mode 100644
index e7ff51f725..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/me-let.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 20)
-
-2 4 6 8 10 12 14
-
-(define g
-  (let [[i 1] ;; 2
-        [j 2] ;; 4
-        [k 3] ;; 6
-        [m 4] ;; 8 <-- GC
-        [n 5] ;; 10
-        [o 6] ;; 12
-        [p 7]] ;; 14
-    ;; 16
-    (lambda (x) (+ i j k m n o p))))
-
-;; 18 for the 8
-(g 8)
-;; 20 for the answer
diff --git a/pkgs/plai/tests/gc/good-mutators/modpath.rkt b/pkgs/plai/tests/gc/good-mutators/modpath.rkt
deleted file mode 100644
index eab1728d81..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/modpath.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang plai/mutator
-(allocator-setup plai/tests/gc/good-collectors/good-collector 10)
-1
-2
diff --git a/pkgs/plai/tests/gc/good-mutators/mutator4.rkt b/pkgs/plai/tests/gc/good-mutators/mutator4.rkt
deleted file mode 100644
index 2cd344cc0b..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/mutator4.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 100)
-(cons 4 #t)
diff --git a/pkgs/plai/tests/gc/good-mutators/mutator6.rkt b/pkgs/plai/tests/gc/good-mutators/mutator6.rkt
deleted file mode 100644
index 4039c2ded2..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/mutator6.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 58)
-
-(define x 'intial)
-(test/value=? x 'intial)
diff --git a/pkgs/plai/tests/gc/good-mutators/mutator7.rkt b/pkgs/plai/tests/gc/good-mutators/mutator7.rkt
deleted file mode 100644
index 4b0888d5ff..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/mutator7.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 58)
-
-(define x 'initial)
-
-(eq? x x)
-(eq? x 'initial)
-(eq? 5 4)
diff --git a/pkgs/plai/tests/gc/good-mutators/names.rkt b/pkgs/plai/tests/gc/good-mutators/names.rkt
deleted file mode 100644
index 0a5ecf912e..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/names.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 10)
-(let ([f (λ (x) x)]) f)
diff --git a/pkgs/plai/tests/gc/good-mutators/proc-list.rkt b/pkgs/plai/tests/gc/good-mutators/proc-list.rkt
deleted file mode 100644
index 35bfd39e97..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/proc-list.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang plai/mutator
-; Demonstrates garbage collection while a closure is on the stack.  A correct collector must ensure that the roots
-; reachable from (make-adder 90) and (make-adder 200) -- that is, the values 90 and 200 that k is bound to -- do
-; not get discarded.
-(allocator-setup "../good-collectors/good-collector.rkt" 58)
-
-(define (make-adder k)
-  (lambda (n) (+ n k)))
-
-(define proc-list
-  (cons (make-adder 90)
-        (cons (make-adder 200)
-              empty)))
-
-(test/value=? ((first proc-list) 7) 97)
-(test/value=? ((first proc-list) 300) 390)
-(test/value=? ((first (rest proc-list)) 73) 273)
diff --git a/pkgs/plai/tests/gc/good-mutators/repeat-test.rkt b/pkgs/plai/tests/gc/good-mutators/repeat-test.rkt
deleted file mode 100644
index 25a08bc68a..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/repeat-test.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang plai/mutator
-
-(allocator-setup "../good-collectors/good-collector.rkt" 30)
-
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
diff --git a/pkgs/plai/tests/gc/good-mutators/setbang.rkt b/pkgs/plai/tests/gc/good-mutators/setbang.rkt
deleted file mode 100644
index 41d4a4c152..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/setbang.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-
-(test/value=?
- (let ([f 0])
-   (let ([g (lambda (n) f)])
-     (set! f 1)
-     (g 11)))
- 1)
-
-(test/value=?
- (let ([f (lambda (n) 'wrong-answer)])
-   (let ([g (lambda (n) (f n))])
-     (set! f (lambda (n) 'right-answer))
-     (g 11)))
- 'right-answer)
diff --git a/pkgs/plai/tests/gc/good-mutators/sfs.rkt b/pkgs/plai/tests/gc/good-mutators/sfs.rkt
deleted file mode 100644
index e746eeefe0..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/sfs.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 7)
-(let ([x (cons 1 2)])
- (let ([y (cons 3 4)])
-   y))
diff --git a/pkgs/plai/tests/gc/good-mutators/student-1.rkt b/pkgs/plai/tests/gc/good-mutators/student-1.rkt
deleted file mode 100644
index b7c31ecd57..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/student-1.rkt
+++ /dev/null
@@ -1,131 +0,0 @@
-#lang plai/mutator
-
-; mark-and-sweep-test.rkt - Ben Childs
-; Designed to test the mark and sweep collector
-; Runs three tests:
-;
-; Allocation of subsequently larger lists
-;
-; Use of Local variables in a loop (garbage after each iteration)
-; Followed by allocation of large list (verifies that they are correctly collected)
-;
-; Generation of a number of circularly referenced lists
-; Followed by allocation of several large lists
-;
-; Finally it runs the sample tests distributed with the assignment
-
-
-(allocator-setup "../good-collectors/good-collector.rkt" 80)
-
-; Helper to generate long lists
-(define (gen-list x)
-  (if (zero? x) '() (cons x (gen-list (- x 1)))))
-
-; Function that defines local vars
-(define (local-vars)
-  (let ((x 3) (y 5) (z 10) (a 5))
-    (+ x (- 10 y))))
-
-(define (loop x)
-  
-  (printf "Iteration: ~a\n" x)
-  
-  (if (zero? x) 0
-        (loop (- (+ (local-vars) (- x 1)) 8))))
-; Generate gradually increasing sizes of lists
-; To trigger garbage collection at different points
-(printf "~a\n" (gen-list 1))
-(printf "~a\n" (gen-list 2))
-(printf "~a\n" (gen-list 4))
-(printf "~a\n" (gen-list 8))
-
-; Run a loop that uses local vars a few times
-(printf "Generating Primitives in loops\n")
-(loop 20)
-
-(printf "Try Allocating large list again\n")
-(printf "~a\n" (gen-list 8))
-
-
-; Create some circular references
-(define (gen-circular)
-  (let ([x (cons 3 4)])
-    (let ([y (cons 2 x)])
-      (set-rest! x y)
-      x)))
-
-(printf "Testing Circular References\n")
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-
-(printf "Try allocating large list again\n")
-(printf "~a\n" (gen-list 8))
-(printf "~a\n" (gen-list 8))
-(printf "~a\n" (gen-list 8))
-(printf "~a\n" (gen-list 8))
-(printf "~a\n" (gen-list 8))
-
-(printf "Running sample tests\n")
-(define (fact x)
-  (if (zero? x)
-      1
-      (* x (fact (sub1 x)))))
-
-(define (fact-help x a)
-  (if (zero? x)
-      a
-      (fact-help (sub1 x) (* x a))))
-
-(define lst (cons 1 (cons 2 (cons 3 empty))))
-
-(define (map-add n lst)
-  (map (lambda (x) (+ n x)) lst))
-
-(define (map f lst)
-  (if (cons? lst)
-      (cons (f (first lst)) (map f (rest lst)))
-      empty))
-
-(define (filter p lst)
-  (if (cons? lst)
-      (if (p (first lst))
-          (cons (first lst) (filter p (rest lst)))
-          (filter p (rest lst)))
-      lst))
-
-(define (append l1 l2)
-  (if (cons? l1)
-      (cons (first l1) (append (rest l1) l2))
-      l2))
-
-(define (length lst)
-  (if (empty? lst)
-      0
-      (add1 (length (rest lst)))))
-
-(define tail (cons 1 empty))
-(define head (cons 4 (cons 3 (cons 2 tail))))
-(set-rest! tail head)
-
-(printf "res ~a\n" head)
-(set! head empty)
-(set! tail head)
-(printf "res ~a\n" lst)
-(printf "res ~a\n" (length '(hello goodbye)))
-(printf "res ~a\n" (map sub1 lst))
-
-(printf "(fact-help 15 1): ~a\n" (fact-help 15 1))
-(printf "(fact 9): ~a\n" (fact 9))
-
-(printf "(append lst lst): ~a\n" (append lst lst))
-
-(printf "(map-add 5 lst): ~a\n" (map-add 5 lst))
-(printf "(filter even? (map sub1 lst)): ~a\n" (filter even? (map sub1 lst)))
-(printf "(length lst): ~a\n" (length lst))
diff --git a/pkgs/plai/tests/gc/good-mutators/student20111116.rkt b/pkgs/plai/tests/gc/good-mutators/student20111116.rkt
deleted file mode 100644
index 29abe5eb6b..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/student20111116.rkt
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 84)
-(halt-on-errors)
-
-;(check-temps1 temps) -> boolean?
-; temps : (listof number?)
-;Consumes a list of temperature measures and checks whether all measurements are between 5 and 95 degrees celsius (inclusively.)
-
-(define (check-temps1 temps)
-  (if (empty? temps) #t ;divide end of the list / empty list from not-the-end
-    (and ; ? this temp is between 5 & 95
-     (>= (first temps) 5)
-     (<= (first temps) 95)
-     (check-temps1 (rest temps)) ; ? and so are all the rest
-    )
-  )
-)
-
-(check-temps1 '(7 10 32 87))
-(check-temps1 '(7 4 32 87))
-(check-temps1 '(7 98 32 87))
-
-;(check-temps temps low high) -> boolean?
-;  temps : (listof number?)
-;  low : number?
-;  high : number?
-;Consumes a list of temperature measures and checks whether all measurements are between low and high degrees celsius (inclusively.)
-
-(define (check-temps temps low high)
-  (if (empty? temps) #t ;divide end of the list / empty list from not-the-end
-    (and ; ? this temp is between low & high
-     (>= (first temps) low)
-     (<= (first temps) high)
-     (check-temps (rest temps) low high) ; ? and so are all the rest
-    )
-  )
-)
-
-(check-temps '(7 10 32 87) 5 90)
-(check-temps '(7 10 32 87) 8 90)
-(check-temps '(7 10 32 87) 5 80)
-
-;(convert digits) -> number?
-;  digits : (listof number?)
-;Consumes a list of digits (numbers between 0 and 9) and produces the corresponding number. The first digit is the least significant, and so on.
-
-(define (convert digits)
-  (if (empty? digits) 0 ;at the end, don't add anything!
-    (+ (first digits) (* 10 (convert (rest digits))))
-  )
-)
-
-(convert '(1 2 3))
-
-;(average-price prices) -> number?
-;  prices : (listof number?)
-;Consumes a list of toy prices and computes the average price of a toy. The average is total of all prices divided by the number of toys.
-
-(define (count-prices prices sum count) ;need to introduce some extra parameters to hold the count & sum for averaging
-  (if (empty? prices) (/ sum count) ;end of the list- calculate the average
-    (count-prices (rest prices) (+ sum (first prices)) (+ count 1)) ;increment the count & update the total sum
-  )
-)
-(define (average-price prices)
-  (if (empty? prices) 0 ;divide special case empty list from everything else
-    (count-prices prices 0 0)
-  )
-)
-
-(average-price '())
-(average-price '(5 15 32 6))
-
-;(convertFC fahrenheit) -> (listof number?)
-;  fahrenheit : (listof number?)
-;Converts a list of of Fahrenheit measurements to a list of Celsius measurements.
-
-(define (convertFC fahrenheit)
-  (if (empty? fahrenheit) empty
-    (cons (* (- (first fahrenheit) 32) 5/9) (convertFC (rest fahrenheit)))
-  )
-)
-
-(convertFC '(-40 15 32 50 60 85))
-
-;(eliminate-exp ua lotp) -> (listof number?)
-;  ua : number?
-;  lotp : (listof number?)
-;Eliminates from lotp all toys whose price is greater than ua.
-
-(define (eliminate-exp ua lotp)
-  (cond
-    [(empty? lotp) empty] ; end of the list
-    [(> (first lotp) ua) (eliminate-exp ua (rest lotp))] ;skip this element
-    [else (cons (first lotp) (eliminate-exp ua (rest lotp)))] ;keep this element
-  )
-)
-
-(eliminate-exp 15 '(1 16 3 5 22 8))
diff --git a/pkgs/plai/tests/gc/good-mutators/tail-calls.rkt b/pkgs/plai/tests/gc/good-mutators/tail-calls.rkt
deleted file mode 100644
index 39b081ce22..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/tail-calls.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 68)
-
-(define (length-accum lst len)
-  (if (empty? lst)
-      len
-      (length-accum (rest lst) (+ 1 len))))
-
-(define (length lst)
-  (length-accum lst 0))
-
-(define (fact/acc n a)
-  (if (zero? n)
-      a
-      (fact/acc (- n 1) (* n a))))
-
-(test/value=? (length '(1 2 3 4)) 4)
-(test/value=? (fact/acc 40 1) 815915283247897734345611269596115894272000000000)
diff --git a/pkgs/plai/tests/gc/good-mutators/test-framework.rkt b/pkgs/plai/tests/gc/good-mutators/test-framework.rkt
deleted file mode 100644
index 5b928df3c2..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/test-framework.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 28)
-
-(halt-on-errors #t)
-(test/value=? 12 12)
diff --git a/pkgs/plai/tests/gc/good-mutators/thunks.rkt b/pkgs/plai/tests/gc/good-mutators/thunks.rkt
deleted file mode 100644
index 6c9f73ef88..0000000000
--- a/pkgs/plai/tests/gc/good-mutators/thunks.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 4)
-
-; 2
-(define thunker
-  (lambda ()
-    ; 2
-    'alligator
-    ; 2
-    'bananna
-    ; 2
-    'frog))
-; 4 total
-
-(thunker)
diff --git a/pkgs/plai/tests/gc/info.rkt b/pkgs/plai/tests/gc/info.rkt
deleted file mode 100644
index 5dfba24454..0000000000
--- a/pkgs/plai/tests/gc/info.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("bad-mutators"
-                             "bad-collectors"
-                             "other-mutators"))
-(define test-omit-paths '("bad-mutators"
-                          "other-mutators"))
diff --git a/pkgs/plai/tests/gc/other-mutators/begin.rkt b/pkgs/plai/tests/gc/other-mutators/begin.rkt
deleted file mode 100644
index c561325261..0000000000
--- a/pkgs/plai/tests/gc/other-mutators/begin.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 6)
-
-(define (go)
-  (let ([obj 'z])
-    2 3
-    (symbol? obj)))
-
-(go)
diff --git a/pkgs/plai/tests/gc/other-mutators/error.rkt b/pkgs/plai/tests/gc/other-mutators/error.rkt
deleted file mode 100644
index d811c4825a..0000000000
--- a/pkgs/plai/tests/gc/other-mutators/error.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 400)
-(error 'error "plai/mutator has error")
diff --git a/pkgs/plai/tests/gc/other-mutators/printing.rkt b/pkgs/plai/tests/gc/other-mutators/printing.rkt
deleted file mode 100644
index 611212d99d..0000000000
--- a/pkgs/plai/tests/gc/other-mutators/printing.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 400)
-(print-only-errors #f)
-
-(define lst (cons 1 (cons 2 (cons 3 empty))))
-(test/value=? lst '(1 2 3))
-
-(define (length lst)
-  (if (empty? lst)
-      0
-      (add1 (length (rest lst)))))
-
-(test/value=? (length '(hello goodbye)) 2)
-
-(define tail (cons 1 empty))
-(define head (cons 4 (cons 3 (cons 2 tail))))
-(set-rest! tail head)
-(test/location=? head (rest tail))
-(test/location=? head tail)
diff --git a/pkgs/plai/tests/gc/other-mutators/quote.rkt b/pkgs/plai/tests/gc/other-mutators/quote.rkt
deleted file mode 100644
index 5a10cc835e..0000000000
--- a/pkgs/plai/tests/gc/other-mutators/quote.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 28)
-
-1 2
-(define x
-  (cons 'apple-pie ; 2 + 3
-        (cons 'pumpkin-pie ; 2 + 3
-              empty))) ; 2
-; Need 12 cells
-1 2
-(define y
-  '(apple-pie pumpkin-pie))
-; Need 24 cells
-
-(define (equal? l r)
-  (cond
-    [(and (empty? l) (empty? r))
-     #t]
-    [(and (cons? l) (cons? r))
-     (and (equal? (first l) (first r))
-          (equal? (rest l) (rest r)))]
-    [(and (symbol? l) (symbol? r))
-     (symbol=? l r)]
-    [else
-     #f]))
-; Need 2 more for the proc
-
-; Need 2 more for the ans
-(equal? x y)
diff --git a/pkgs/plai/tests/gc/other-mutators/top.rkt b/pkgs/plai/tests/gc/other-mutators/top.rkt
deleted file mode 100644
index 26ebad09e3..0000000000
--- a/pkgs/plai/tests/gc/other-mutators/top.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang plai/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 400)
-frozzle
diff --git a/pkgs/plai/tests/gc/run-test.rkt b/pkgs/plai/tests/gc/run-test.rkt
deleted file mode 100644
index dffa6c55fa..0000000000
--- a/pkgs/plai/tests/gc/run-test.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang racket
-(require tests/eli-tester
-         racket/runtime-path
-         "../util.rkt")
-
-(module test racket/base
-  (require syntax/location)
-  (parameterize ([current-command-line-arguments (vector "-g")])
-    (dynamic-require (quote-module-path "..") #f)))
-
-(define-runtime-path here ".")
-
-(define (in-directory pth rx)
-  (in-list
-   (map (curry build-path pth)
-        (filter (compose (curry regexp-match rx) path->bytes)
-                (directory-list pth)))))
-
-(define (test-mutator m)
-  (printf "Running ~a\n" m)
-  (parameterize ([current-namespace (make-base-empty-namespace)])
-    (dynamic-require m #f)))
-
-(define run-good? (make-parameter #f))
-
-(command-line #:program "run-test"
-              #:once-each ["-g" "Enable running good mutators" (run-good? #t)])
-
-(define (drop-first-line e)
-  (regexp-replace "^[^\n]+\n" e ""))
-(define-syntax-rule (capture-output e)
-  (drop-first-line (with-both-output-to-string (λ () e))))
-
-(test
- (if (run-good?)
-     (for ([m (in-directory (build-path here "good-mutators") #rx"rkt$")])
-       (test
-        (test-mutator m)))
-     (void))
- (for ([m (in-directory (build-path here "bad-mutators") #rx"rkt$")])
-   (test
-    (test-mutator m) =error> #rx""))
- 
- (test-mutator (build-path here "other-mutators" "error.rkt"))
- =error>
- #rx"plai/mutator has error"
- 
- (test-mutator (build-path here "other-mutators" "top.rkt"))
- =error>
- #rx"unbound identifier in module\n  in: frozzle"
- 
- (capture-output (test-mutator (build-path here "other-mutators" "printing.rkt")))
- =>
- #<<END
-(good lst '(1 2 3) '(1 2 3) "at line 6")
-(good (length (quote (hello goodbye))) 2 2 "at line 13")
-(good (heap-loc head) 62 62 "at line 18")
-(bad (heap-loc head) 62 47 "at line 19")
-
-END
- 
-  (capture-output (test-mutator (build-path here "other-mutators" "begin.rkt")))
- =>
- #<<END
-Value at location 2:
-#t
-
-END
- 
- (test-mutator (build-path here "other-mutators" "quote.rkt"))
- =error> "alloc: out of space"
- )
diff --git a/pkgs/plai/tests/gc2/bad-collectors/no-collection-collector.rkt b/pkgs/plai/tests/gc2/bad-collectors/no-collection-collector.rkt
deleted file mode 100644
index 8ff0f06325..0000000000
--- a/pkgs/plai/tests/gc2/bad-collectors/no-collection-collector.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang plai/gc2/collector
-
-(define ptr 0)
-
-(define (init-allocator) (void))
-
-(define (gc:deref loc) #f)
-(define (gc:alloc-flat hv) 0)
-(define (gc:cons hd tl) 0)
-(define (gc:first pr) 0)
-(define (gc:rest pr) 0)
-(define (gc:flat? loc) #t)
-(define (gc:cons? loc) #f)
-(define (gc:set-first! pr new) (void))
-(define (gc:set-rest! pr new) (void))
-(define (gc:closure code-ptr env) 0)
-(define (gc:closure-code-ptr ptr) #f)
-(define (gc:closure-env-ref ptr i) 0)
-(define (gc:closure? ptr) #f)
-
-(with-heap (vector 1 2 3)
-  (test (gc:deref 0) #f))
diff --git a/pkgs/plai/tests/gc2/bad-mutators/mut-1.rkt b/pkgs/plai/tests/gc2/bad-mutators/mut-1.rkt
deleted file mode 100644
index 6eb1c12f7b..0000000000
--- a/pkgs/plai/tests/gc2/bad-mutators/mut-1.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../bad-collectors/broken-collector.rkt" 12)
-
-50
-60
-70
-80
-(define x (cons 1 2))
-
-(set-first! x x)
diff --git a/pkgs/plai/tests/gc2/bad-mutators/mutator0.rkt b/pkgs/plai/tests/gc2/bad-mutators/mutator0.rkt
deleted file mode 100644
index fe6cd55a83..0000000000
--- a/pkgs/plai/tests/gc2/bad-mutators/mutator0.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang plai/gc2/mutator
diff --git a/pkgs/plai/tests/gc2/bad-mutators/mutator1.rkt b/pkgs/plai/tests/gc2/bad-mutators/mutator1.rkt
deleted file mode 100644
index 6a288bd51d..0000000000
--- a/pkgs/plai/tests/gc2/bad-mutators/mutator1.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang plai/gc2/mutator
-1
diff --git a/pkgs/plai/tests/gc2/bad-mutators/mutator2.rkt b/pkgs/plai/tests/gc2/bad-mutators/mutator2.rkt
deleted file mode 100644
index 2e702b24fc..0000000000
--- a/pkgs/plai/tests/gc2/bad-mutators/mutator2.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../collectors/trivial-collector.rkt" "y")
diff --git a/pkgs/plai/tests/gc2/bad-mutators/mutator3.rkt b/pkgs/plai/tests/gc2/bad-mutators/mutator3.rkt
deleted file mode 100644
index c1fed47545..0000000000
--- a/pkgs/plai/tests/gc2/bad-mutators/mutator3.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup a 100)
diff --git a/pkgs/plai/tests/gc2/bad-mutators/mutator5.rkt b/pkgs/plai/tests/gc2/bad-mutators/mutator5.rkt
deleted file mode 100644
index 58681864d9..0000000000
--- a/pkgs/plai/tests/gc2/bad-mutators/mutator5.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/trivial-collector.rkt")
diff --git a/pkgs/plai/tests/gc2/bad-mutators/setbang.rkt b/pkgs/plai/tests/gc2/bad-mutators/setbang.rkt
deleted file mode 100644
index 36e3100d2f..0000000000
--- a/pkgs/plai/tests/gc2/bad-mutators/setbang.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 1024)
-
-;; xxx someday we should move this to good by fixing set! or rejecting
-;; the program
-
-(if (= (let ([f 0])
-         (let ([g (lambda (n) f)])
-           (set! f 1)
-           (g 11)))
-       1)
-  "okay"
-  (/ 1 0))
-
-(if (= (let ([f (lambda (n) 'wrong-answer)])
-         (let ([g (lambda (n) (f n))])
-           (set! f (lambda (n) 'right-answer))
-           (g 11)))
-       'right-answer)
-  "okay"
-  (/ 1 0))
diff --git a/pkgs/plai/tests/gc2/bad-mutators/void-app.rkt b/pkgs/plai/tests/gc2/bad-mutators/void-app.rkt
deleted file mode 100644
index d0affa4d6e..0000000000
--- a/pkgs/plai/tests/gc2/bad-mutators/void-app.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 100)
-(define x (cons 1 2))
-((set-first! x 2) 1)
diff --git a/pkgs/plai/tests/gc2/good-collectors/good-collector.rkt b/pkgs/plai/tests/gc2/good-collectors/good-collector.rkt
deleted file mode 100644
index a241a0ba88..0000000000
--- a/pkgs/plai/tests/gc2/good-collectors/good-collector.rkt
+++ /dev/null
@@ -1,352 +0,0 @@
-#lang plai/gc2/collector
-
-#|
-
-A collector for use in testing the random mutator generator.
-
-|#
-
-(print-only-errors #t)
-
-;; find-free-space : loc number -> loc or #f
-;; start must be a valid pointer 
-;; (not to the middle of an object)
-(define (find-free-space start size)
-  (cond
-    [(= start (heap-size)) #f]
-    [else
-     (case (heap-ref start)
-       [(free)
-        (if (n-free-blocks? start size)
-            start
-            (find-free-space (+ start 1) size))]
-       [(flat) (find-free-space (+ start 2) size)]
-       [(pair) (find-free-space (+ start 3) size)]
-       [(closure)
-        (find-free-space (+ start 3 (heap-ref (+ start 2))) size)]
-       [else
-        (error 'find-free-space "ack ~s" start)])]))
-
-(define (n-free-blocks? start size)
-  (cond
-    [(= size 0) #t]
-    [(= start (heap-size)) #f]
-    [else 
-     (and (eq? 'free (heap-ref start))
-          (n-free-blocks? (+ start 1) (- size 1)))]))
-
-(test (with-heap #(free free free)
-                 (n-free-blocks? 0 2))
-      #t)
-(test (with-heap #(free free free)
-                 (n-free-blocks? 0 3))
-      #t)
-(test (with-heap #(free free free free)
-                 (n-free-blocks? 0 4))
-      #t)
-(test (with-heap #(free free free)
-                 (n-free-blocks? 0 4))
-      #f)
-(test (with-heap #(free free free)
-                 (n-free-blocks? 2 1))
-      #t)
-(test (with-heap #(free free free)
-                 (n-free-blocks? 2 2))
-      #f)
-
-(test (with-heap #(free free free)
-                 (find-free-space 0 1))
-      0)
-(test (with-heap #(pair free free)
-                 (find-free-space 0 1))
-      #f)
-(test (with-heap #(pair free free)
-                 (find-free-space 0 2))
-      #f)
-(test (with-heap #(flat free free free)
-                 (find-free-space 0 2))
-      2)
-(test (with-heap #(pair free free)
-                 (find-free-space 0 3))
-      #f)
-
-(define (init-allocator) 
-  (for ([i (in-range 0 (heap-size))])
-    (heap-set! i 'free)))
-
-(test (let ([v (make-vector 12 'x)])
-        (with-heap v (init-allocator))
-        v)
-      (make-vector 12 'free))
-
-(define (gc:deref loc) 
-  (cond
-    [(equal? (heap-ref loc) 'flat)
-     (heap-ref (+ loc 1))]
-    [else
-     (error 'gc:deref "attempted to deref a non flat value, loc ~s, tag ~s" loc (heap-ref loc))]))
-
-(test (with-heap (vector 'free 'free 'free 'flat 14 'free 'free)
-                 (gc:deref 3))
-      14)
-
-(define (gc:first pr-ptr) 
-  (if (equal? (heap-ref pr-ptr) 'pair)
-      (heap-ref (+ pr-ptr 1))
-      (error 'first "non pair: loc ~e val ~e" pr-ptr (heap-ref pr-ptr))))
-
-(test (with-heap (vector 'free 'flat 3 'pair 0 1)
-                 (gc:first 3))
-      0)
-
-(define (gc:rest pr-ptr) 
-  (if (equal? (heap-ref pr-ptr) 'pair)
-      (heap-ref (+ pr-ptr 2))
-      (error 'first "non pair")))
-
-(test (with-heap (vector 'free 'flat 3 'pair 0 1)
-                 (gc:rest 3))
-      1)
-
-(define (gc:closure-code-ptr a)
-  (if (gc:closure? a)
-      (heap-ref (+ a 1))
-      (error 'closure-code "non closure")))
-
-;; XXX test
-
-(define (gc:closure-env-ref a i)
-  (if (gc:closure? a)
-      (if (< i (heap-ref (+ a 2)))
-          (heap-ref (+ a 3 i))
-          (error 'closure-env-ref "closure-env-ref out of bounds"))
-      (error 'closure-env-ref "non closure")))
-
-;; XXX test
-
-(define (gc:flat? loc) (equal? (heap-ref loc) 'flat))
-
-(test (with-heap (vector 'free 'free 'pair 0 1 'flat 14)
-                 (gc:flat? 2))
-      #f)
-(test (with-heap (vector 'free 'free 'pair 0 1 'flat 14)
-                 (gc:flat? 5))
-      #t)
-
-(define (gc:cons? loc) (equal? (heap-ref loc) 'pair))
-
-(test (with-heap (vector 'free 'free 'pair 0 1 'flat 14)
-                 (gc:cons? 2))
-      #t)
-(test (with-heap (vector 'free 'free 'pair 0 1 'flat 14)
-                 (gc:cons? 5))
-      #f)
-
-(define (gc:closure? loc) (equal? (heap-ref loc) 'closure))
-
-(test (with-heap (vector 'free 'free 'closure #f 0 'flat 14)
-                 (gc:closure? 2))
-      #t)
-(test (with-heap (vector 'free 'free 'closure #f 0 'flat 14)
-                 (gc:closure? 5))
-      #f)
-
-(define (gc:set-first! pr-ptr new) 
-  (if (equal? (heap-ref pr-ptr) 'pair)
-      (heap-set! (+ pr-ptr 1) new)
-      (error 'set-first! "non pair")))
-
-(define (gc:set-rest! pr-ptr new) 
-  (if (equal? (heap-ref pr-ptr) 'pair)
-      (heap-set! (+ pr-ptr 2) new)
-      (error 'set-first! "non pair")))
-
-
-(define (gc:alloc-flat fv) 
-  (let ([ptr (alloc 2 (λ () (get-root-set)))])
-    (heap-set! ptr 'flat)
-    (heap-set! (+ ptr 1) fv)
-    ptr))
-
-(define (gc:cons hd tl)
-  (define ptr (alloc 3 (λ () (list* hd tl (get-root-set)))))
-  (heap-set! ptr 'pair)
-  (heap-set! (+ ptr 1) (read-root hd))
-  (heap-set! (+ ptr 2) (read-root tl))
-  ptr)
-
-(define (gc:closure code env)
-  (define len (length env))
-  (define ptr (alloc (+ 3 len) (λ () (append (get-root-set) env))))
-  (heap-set! ptr 'closure)
-  (heap-set! (+ ptr 1) code)
-  (heap-set! (+ ptr 2) len)
-  (for ([r (in-list env)]
-        [i (in-naturals)])
-    (heap-set! (+ ptr 3 i) (read-root r)))
-  ptr)
-
-(define (alloc n get-roots)
-  (let ([next (find-free-space 0 n)])
-    (cond
-      [next
-       next]
-      [else
-       (collect-garbage get-roots)
-       (let ([next (find-free-space 0 n)])
-         (unless next
-           (error 'alloc "out of space"))
-         next)])))
-
-(define (collect-garbage get-roots)
-  (let ([roots (map read-root (get-roots))])
-    (collect-garbage-help roots
-                          (remove* roots (get-all-records 0)))))
-
-(define (collect-garbage-help gray white)
-  (cond
-    [(null? gray) (free! white)]
-    [else
-     (case (heap-ref (car gray))
-       [(flat) 
-        (let ([proc (heap-ref (+ (car gray) 1))])
-          (collect-garbage-help (cdr gray) white))]
-       [(pair) 
-        (let ([hd (heap-ref (+ (car gray) 1))]
-              [tl (heap-ref (+ (car gray) 2))])
-          (collect-garbage-help 
-           (add-in (list hd tl) (cdr gray) white)
-           (remove tl (remove hd white))))]
-       [(closure)
-        (define env-count
-          (heap-ref (+ (car gray) 2)))
-        (define-values
-          (gray* white*)
-          (for/fold ([gray* (cdr gray)]
-                     [white* white])
-                    ([i (in-range env-count)])
-                    (define env (gc:closure-env-ref (car gray) i))
-                    (values (add-in (list env) gray* white)
-                            (remove env white*))))
-        (collect-garbage-help
-         gray*
-         white*)]
-       [else
-        (error 'collect-garbage "unknown tag ~s, loc ~s" (heap-ref (car gray)) (car gray))])]))
-
-(define (free! whites)
-  (cond
-    [(null? whites) (void)]
-    [else
-     (let ([white (car whites)])
-       (case (heap-ref white)
-         [(pair) 
-          (heap-set! white 'free)
-          (heap-set! (+ white 1) 'free)
-          (heap-set! (+ white 2) 'free)]
-         [(flat)
-          (heap-set! white 'free)
-          (heap-set! (+ white 1) 'free)]
-         [(closure)
-          (heap-set! white 'free)
-          (heap-set! (+ white 1) 'free)
-          (define env-len (heap-ref (+ white 2)))
-          (heap-set! (+ white 2) 'free)
-          (for ([i (in-range env-len)])
-               (heap-set! (+ white 3 i) 'free))]
-         [else 
-          (error 'free! "unknown tag ~s\n" (heap-ref white))])
-       (free! (cdr whites)))]))
-
-(test (let ([v (vector #f #t '() 0 1 2 3 4 5 6 'pair 0 1 'flat 14 'pair 0 1 'flat 12)])
-        (with-heap v (free! (list 10 18)))
-        v)
-      (vector #f #t '() 0 1 2 3 4 5 6 'free 'free 'free 'flat 14 'pair 0 1  'free 'free))
-      
-;; add-in : (listof location) (listof location) (listof location) -> (listof location)
-;; computes a new set of gray addresses by addding all white elements of locs to gray
-(define (add-in locs gray white)
-  (cond
-    [(null? locs) gray]
-    [else
-     (let* ([loc (car locs)]
-            [white? (member loc white)])
-       (add-in (cdr locs)
-               (if white? (cons loc gray) gray)
-               white))]))
-
-(test (add-in '(13 14) '(100 102) '(13 14 104 105))
-      '(14 13 100 102))
-
-(test (add-in '(13 14) '(100 102) '(13 104 105))
-      '(13 100 102))
-
-(define (get-all-records i)
-  (cond
-    [(< i (heap-size))
-     (case (heap-ref i)
-       [(closure) (cons i (get-all-records (+ i 2 (heap-ref (+ i 2)) 1)))]
-       [(pair) (cons i (get-all-records (+ i 2 1)))]
-       [(flat) (cons i (get-all-records (+ i 1 1)))]
-       [(free) (get-all-records (+ i 0 1))]
-       [else (error 'get-all-records "Unknown tag ~e in cell ~e" (heap-ref i) i)])]
-    [else null]))
-
-(test (with-heap (vector #f #t '() 0 1 2 3 4 5 6 'pair 0 1 'flat 14 'pair 0 1 'flat 12 'closure #f 1 10 'flat 16)
-                 (get-all-records 10))
-      (list 10 13 15 18 20 24))
-
-(test (with-heap (make-vector 10 'free) (gc:alloc-flat #f))
-      0)
-
-(test (with-heap (make-vector 10 'free) (gc:alloc-flat #t) (gc:alloc-flat #f))
-      2)
-
-(test (let ([v (vector 'flat 0 'flat 1)])
-        (with-heap v (collect-garbage-help (list) 
-                                           (get-all-records 0)))
-        v)
-      (vector 'free 'free 'free 'free))
-
-(test (let ([v (vector 'flat 0 'flat 1)])
-        (with-heap v (collect-garbage-help (list 0) 
-                                           (remove 0 (get-all-records 0))))
-        v)
-      (vector 'flat 0 'free 'free))
-
-(test (let ([v (vector 'flat 0 'flat 1)])
-        (with-heap v (collect-garbage-help (list 2) 
-                                           (remove 2 (get-all-records 0))))
-        v)
-      (vector  'free 'free 'flat 1))
-
-(test (let ([v (vector 'flat 0 'flat 1 'pair 0 2)])
-        (with-heap v (collect-garbage-help (list 4) 
-                                           (remove 4 (get-all-records 0))))
-        v)
-      (vector 'flat 0 'flat 1 'pair 0 2))
-
-(test (let ([v (vector 'flat 0 'flat 1 'pair 0 0)])
-        (with-heap v (collect-garbage-help (list 4) 
-                                           (remove 4 (get-all-records 0))))
-        v)
-      (vector 'flat 0 'free 'free 'pair 0 0))
-
-(test (let ([v (vector 'flat 0 'flat 1 'pair 4 4)])
-        (with-heap v (collect-garbage-help (list 4) 
-                                           (remove 4 (get-all-records 0))))
-        v)
-      (vector 'free 'free 'free 'free 'pair 4 4))
-
-(test (with-heap (make-vector 50)
-                 (let ([x 1][y 2][z 3])
-                   (with-roots (x y z)
-                               (map read-root (get-root-set)))))
-      (list 1 2 3))
-
-(test (with-heap (make-vector 50)
-                 (let ([x 1][y 2][z 3][a 4][b 5][c 6])
-                   (with-roots (x y z)
-                               (with-roots (a b c)
-                                           (sort (map read-root (get-root-set)) <)))))
-      (list 1 2 3 4 5 6))
diff --git a/pkgs/plai/tests/gc2/good-collectors/trivial-collector.rkt b/pkgs/plai/tests/gc2/good-collectors/trivial-collector.rkt
deleted file mode 100644
index 86e9fd8427..0000000000
--- a/pkgs/plai/tests/gc2/good-collectors/trivial-collector.rkt
+++ /dev/null
@@ -1,85 +0,0 @@
-#lang plai/gc2/collector
-(define heap-ptr 'uninitialized-heap-ptr)
-
-(define (init-allocator)
-  ; calling heap-offset before init-allocator is called gives 'undefined
- (set! heap-ptr 0))
-
-(define (gc:closure code roots)
-  (define len (length roots))
-  (when (> (+ heap-ptr len) (heap-size))
-        (error "out of memory"))
-  (heap-set! heap-ptr 'closure)
-  (heap-set! (+ 1 heap-ptr) code)
-  (for ([r (in-list roots)]
-        [i (in-naturals 1)])
-    (heap-set! (+ 1 i heap-ptr) (read-root r)))
-  (set! heap-ptr (+ len 2 heap-ptr))
-  (- heap-ptr len 2))
-
-(define (gc:closure-code-ptr a)
-  (heap-ref (+ a 1)))
-(define (gc:closure-env-ref a i)
-  (heap-ref (+ a 1 1 i)))
-(define (gc:closure? a)
-  (eq? (heap-ref a) 'closure))
-
-(define (gc:alloc-flat p)
-  (begin 
-    (when (> (+ heap-ptr 2) (heap-size))
-      (error "out of memory"))
-    (heap-set! heap-ptr 'prim)
-    (heap-set! (+ 1 heap-ptr) p)
-    (set! heap-ptr (+ 2 heap-ptr))
-    ; return the location of this flat data
-    (- heap-ptr 2)))
-
-(define (gc:cons f r)
-  (begin
-    (when (> (+ heap-ptr 3) (heap-size))
-      (error "out of memory"))
-    (heap-set! heap-ptr 'cons)
-    (heap-set! (+ 1 heap-ptr) (read-root f))
-    (heap-set! (+ 2 heap-ptr) (read-root r))
-    (set! heap-ptr (+ 3 heap-ptr))
-    (- heap-ptr 3)))
-
-(define (gc:deref a)
-  (heap-ref (+ 1 a)))
-
-; number -> boolean
-(define (gc:cons? a)
-  (eq? (heap-ref a) 'cons))
-
-; number -> any
-(define (gc:first a)
-  (heap-ref (+ 1 a)))
-
-; number -> number
-(define (gc:rest a)
-  (heap-ref (+ 2 a)))
-
-(define (gc:set-first! a f)
-  (if (gc:cons? a)
-      (heap-set! (+ 1 a) f)
-      (error 'set-first! "expects address of cons")))
-
-(define (gc:set-rest! a r)
-  (heap-set! (+ 2 a) r))
-
-; function number -> boolean
-(define (gc:flat? a)
-  (eq? 'prim (heap-ref a)))
-
-(module+ test
-  (require rackunit)
-  
-  (check-equal? (let ([h (make-vector 7)])
-                  (with-heap 
-                   h
-                   (init-allocator)
-                   (define one (gc:alloc-flat 1))
-                   (define clos (gc:closure 'something (list (make-root 'dummy (λ () one) void))))
-                   (gc:alloc-flat 2))
-                  h)
-                (vector 'prim 1 'closure 'something 0 'prim 2)))
diff --git a/pkgs/plai/tests/gc2/good-collectors/trivial-moving-collector.rkt b/pkgs/plai/tests/gc2/good-collectors/trivial-moving-collector.rkt
deleted file mode 100644
index aed6169f3c..0000000000
--- a/pkgs/plai/tests/gc2/good-collectors/trivial-moving-collector.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang plai/gc2/collector
-#|
-
-This is just like trivial-collector.rkt, except
-it moves all addresses forward by one on each
-allocation
-
-|#
-
-(define heap-ptr 'uninitialized-heap-ptr)
-(define starting-point 0)
-
-(define (alloc n roots)
-  (when (> (+ heap-ptr n) (heap-size))
-    (error "out of memory"))
-  
-  ;; slide everything in the heap forward by one address
-  (for ([i (in-range (- heap-ptr 1) (- starting-point 1) -1)])
-    (heap-set! (+ i 1) (heap-ref i)))
-  (heap-set! starting-point 'before-start)
-  (set! starting-point (+ starting-point 1))
-  (set! heap-ptr (+ heap-ptr 1))
-
-  ;; update all the roots
-  (for ([root (in-list (append roots (get-root-set)))])
-    (set-root! root (+ (read-root root) 1)))
-  
-  ;; update all the internal pointers
-  (let loop ([addr starting-point])
-    (when (< addr heap-ptr)
-      (case (heap-ref addr)
-        [(closure)
-         (define size (heap-ref (+ addr 2)))
-         (for ([i (in-range size)])
-           (inc-at-addr (+ addr 3 i)))
-         (loop (+ addr size 3))]
-        [(prim)
-         (loop (+ addr 2))]
-        [(cons)
-         (inc-at-addr (+ addr 1))
-         (inc-at-addr (+ addr 2))
-         (loop (+ addr 3))]
-        [else (error 'alloc "unknown value at addr ~a: ~s" addr (heap-ref addr))])))
-  
-  ;; do the actual allocation
-  (define old-heap-ptr heap-ptr)
-  (set! heap-ptr (+ heap-ptr n))
-  old-heap-ptr)
-
-(define (print-heap)
-  (for ([i (in-range (+ heap-ptr 4))])
-    (printf "~a: ~a\n" i (heap-ref i)))
-  (newline))
-
-(define (inc-at-addr a)
-  (heap-set! a (+ (heap-ref a) 1)))
-
-(define (init-allocator)
-  (set! heap-ptr 0))
-
-(define (gc:closure code roots)
-  (define len (length roots))
-  (define heap-ptr (alloc (+ len 3) roots))
-  (heap-set! heap-ptr 'closure)
-  (heap-set! (+ heap-ptr 1) code)
-  (heap-set! (+ heap-ptr 2) len)
-  (for ([r (in-list roots)]
-        [i (in-naturals 3)])
-    (heap-set! (+ i heap-ptr) (read-root r)))
-  heap-ptr)
-
-(define (gc:closure-code-ptr a)
-  (heap-ref (+ a 1)))
-(define (gc:closure-env-ref a i)
-  (heap-ref (+ a 3 i)))
-(define (gc:closure? a)
-  (eq? (heap-ref a) 'closure))
-
-(define (gc:alloc-flat p)
-  (define heap-ptr (alloc 2 '()))
-  (heap-set! heap-ptr 'prim)
-  (heap-set! (+ 1 heap-ptr) p)
-  heap-ptr)
-
-(define (gc:cons f r)
-  (define heap-ptr (alloc 3 (list f r)))
-  (heap-set! heap-ptr 'cons)
-  (heap-set! (+ 1 heap-ptr) (read-root f))
-  (heap-set! (+ 2 heap-ptr) (read-root r))
-  heap-ptr)
-
-(define (gc:deref a)
-  (heap-ref (+ 1 a)))
-
-; number -> boolean
-(define (gc:cons? a)
-  (eq? (heap-ref a) 'cons))
-
-; number -> any
-(define (gc:first a)
-  (heap-ref (+ 1 a)))
-
-; number -> number
-(define (gc:rest a)
-  (heap-ref (+ 2 a)))
-
-(define (gc:set-first! a f)
-  (if (gc:cons? a)
-      (heap-set! (+ 1 a) f)
-      (error 'set-first! "expects address of cons")))
-
-(define (gc:set-rest! a r)
-  (heap-set! (+ 2 a) r))
-
-; function number -> boolean
-(define (gc:flat? a)
-  (eq? 'prim (heap-ref a)))
diff --git a/pkgs/plai/tests/gc2/good-mutators/andor.rkt b/pkgs/plai/tests/gc2/good-mutators/andor.rkt
deleted file mode 100644
index 0d17c2cef8..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/andor.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 400)
-(define (do-one i) (/ (- i 1)))
-(define (loop i)
-  (or (= 1 i)
-      (and (do-one i)
-           (loop (- i 1)))))
-(loop 50)
diff --git a/pkgs/plai/tests/gc2/good-mutators/app.rkt b/pkgs/plai/tests/gc2/good-mutators/app.rkt
deleted file mode 100644
index 2d880241ba..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/app.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 28)
-
-(define (app f)
-  (lambda (x)
-    (f x)))
-
-(define plus (app (λ (x) (add1 x))))
-
-(plus 23)
-(plus 5)
diff --git a/pkgs/plai/tests/gc2/good-mutators/bindings.rkt b/pkgs/plai/tests/gc2/good-mutators/bindings.rkt
deleted file mode 100644
index 3f9c32ebd5..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/bindings.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 58)
-
-(define x 'intial)
-(set! x 'final)
-(test/value=? x 'final)
-
-
-(define y
-  (let ([outer-local
-         (let ([inner-local 'value-expected])
-           inner-local)])
-    outer-local))
-
-(test/value=? y 'value-expected)
-
-(define (local-vars)
-  (let ([x 23] [y 23])
-    x))
-
-(test/value=? (local-vars) 23)
-
-(define (locals-2 x)
-  (+ x 5))
-
-(test/value=? (locals-2 23) 28)
diff --git a/pkgs/plai/tests/gc2/good-mutators/by-val.rkt b/pkgs/plai/tests/gc2/good-mutators/by-val.rkt
deleted file mode 100644
index 01cafee4c4..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/by-val.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-; Ensure that call by value is correctly implemented.
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-
-(define global-val 'global)
-
-(define (mut-arg arg)
-  (set! arg 'mutated)
-  0)
-
-(mut-arg global-val)
-
-
-(test/value=? global-val 'global)
diff --git a/pkgs/plai/tests/gc2/good-mutators/case.rkt b/pkgs/plai/tests/gc2/good-mutators/case.rkt
deleted file mode 100644
index 48713eefcb..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/case.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-(test/value=? (case 1 [(1) 2])
-              2)
-(test/value=? (case 1 [(1) 2] [else 3])
-              2)
-(test/value=? (case 2 [(1) 2] [else 3])
-              3)
diff --git a/pkgs/plai/tests/gc2/good-mutators/circular.rkt b/pkgs/plai/tests/gc2/good-mutators/circular.rkt
deleted file mode 100644
index 5fba10af5a..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/circular.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 68)
-
-(define (gen-circular)
-  (let ([x (cons 3 4)])
-    (let ([y (cons 2 x)])
-      (set-rest! x y)
-      x)))
-
-(define x (gen-circular))
-(test/location=? x (rest (rest x)))
diff --git a/pkgs/plai/tests/gc2/good-mutators/classic-error.rkt b/pkgs/plai/tests/gc2/good-mutators/classic-error.rkt
deleted file mode 100644
index 986140c45f..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/classic-error.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang plai/gc2/mutator
-; This is `classic' in that it caught many bugs in copying collectors that students wrote for CS173, Fall 2007.
-(allocator-setup "../good-collectors/good-collector.rkt" 28)
-
-'trash
-'junk
-; after GC, alpha beta are copied but the cons references them in the old semispace
-(define my-pair (cons 'alpha 'beta))
-; we have room for our-pair, but 'refuse forces a semi-space swap that exposes
-; the memory corruption (if one exists)
-'refuse
-(define our-pair (cons my-pair my-pair))
-(test/value=? our-pair '((alpha . beta) . (alpha . beta)))
-(test/location=? (first our-pair) (rest our-pair))
diff --git a/pkgs/plai/tests/gc2/good-mutators/closure-1.rkt b/pkgs/plai/tests/gc2/good-mutators/closure-1.rkt
deleted file mode 100644
index d734ab4a81..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/closure-1.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 60)
-
-(define lst '(2 -10)) ; (cons 2 (cons -10 empty)))
-
-(define (map f lst)
-  (if (cons? lst)
-      (cons (f (first lst)) (map f (rest lst)))
-      empty))
-
-(define x 'gc-garbage)
-
-(test/value=? (map (λ (x) (add1 x)) lst) '(3 -9))
diff --git a/pkgs/plai/tests/gc2/good-mutators/closure-2.rkt b/pkgs/plai/tests/gc2/good-mutators/closure-2.rkt
deleted file mode 100644
index 31d32c87bf..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/closure-2.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-
-
-(define make-conser
-  (lambda (n)
-    (lambda (x) 
-      (cons n x))))
-
-
-(define kons (make-conser 'catamaran))
-;1 2 3 5 6 7 
-(kons 'people)
-(kons 'maroon)
-(kons 'srfi)
-(test/value=? (kons 'peace) '(catamaran . peace))
diff --git a/pkgs/plai/tests/gc2/good-mutators/cond.rkt b/pkgs/plai/tests/gc2/good-mutators/cond.rkt
deleted file mode 100644
index 9994a19a46..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/cond.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-
-(cond
- [(zero? 3) 1111]
- [#f 2222]
- [#t 3333])
diff --git a/pkgs/plai/tests/gc2/good-mutators/danny-bug.rkt b/pkgs/plai/tests/gc2/good-mutators/danny-bug.rkt
deleted file mode 100644
index 2a16a3091b..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/danny-bug.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 8)
-
-(define
-  proc
-  (let* ([not-root 1] ; 2
-         [root 2]) ; 4
-    (lambda () ; 8
-      3
-      root)))
-
-(proc)
diff --git a/pkgs/plai/tests/gc2/good-mutators/else.rkt b/pkgs/plai/tests/gc2/good-mutators/else.rkt
deleted file mode 100644
index ee1d988267..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/else.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang plai/gc2/mutator
-; Is else defined?
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-
-(test/value=? (cond [else 28935723]) 28935723)
diff --git a/pkgs/plai/tests/gc2/good-mutators/empty-mutator.rkt b/pkgs/plai/tests/gc2/good-mutators/empty-mutator.rkt
deleted file mode 100644
index d28d9759e3..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/empty-mutator.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang plai/gc2/mutator
-
-(allocator-setup "../good-collectors/good-collector.rkt" 80)
diff --git a/pkgs/plai/tests/gc2/good-mutators/gc-order.rkt b/pkgs/plai/tests/gc2/good-mutators/gc-order.rkt
deleted file mode 100644
index 1baf727887..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/gc-order.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 58)
-
-(define x 3)
-(cons (begin (set! x 2)
-             1)
-      (begin (set! x 3)
-             1))
-(test/value=? x 3)
diff --git a/pkgs/plai/tests/gc2/good-mutators/global-roots.rkt b/pkgs/plai/tests/gc2/good-mutators/global-roots.rkt
deleted file mode 100644
index b657b4d978..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/global-roots.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 20)
-
-
-(define car first)
-
-
-'junk
-'junk
-'junk
-(test/value=? (car (cons 'this-car 2)) 'this-car)
diff --git a/pkgs/plai/tests/gc2/good-mutators/imports.rkt b/pkgs/plai/tests/gc2/good-mutators/imports.rkt
deleted file mode 100644
index 22d76e0c7a..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/imports.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 20)
-
-(import-primitives modulo)
-
-(test/value=? (modulo 5 3) 2)
diff --git a/pkgs/plai/tests/gc2/good-mutators/kathi-bug-1.rkt b/pkgs/plai/tests/gc2/good-mutators/kathi-bug-1.rkt
deleted file mode 100644
index da14c0ead4..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/kathi-bug-1.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 84)
-(define L (cons 3 empty))
-(test/value=? L '(3))
diff --git a/pkgs/plai/tests/gc2/good-mutators/modpath.rkt b/pkgs/plai/tests/gc2/good-mutators/modpath.rkt
deleted file mode 100644
index 2fcb2d08fa..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/modpath.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup plai/tests/gc2/good-collectors/good-collector 10)
-1
-2
diff --git a/pkgs/plai/tests/gc2/good-mutators/mutator4.rkt b/pkgs/plai/tests/gc2/good-mutators/mutator4.rkt
deleted file mode 100644
index ee1f0d9f5a..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/mutator4.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 100)
-(cons 4 #t)
diff --git a/pkgs/plai/tests/gc2/good-mutators/mutator6.rkt b/pkgs/plai/tests/gc2/good-mutators/mutator6.rkt
deleted file mode 100644
index df218371a7..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/mutator6.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 58)
-
-(define x 'intial)
-(test/value=? x 'intial)
diff --git a/pkgs/plai/tests/gc2/good-mutators/mutator7.rkt b/pkgs/plai/tests/gc2/good-mutators/mutator7.rkt
deleted file mode 100644
index d64e0e63a5..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/mutator7.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 58)
-
-(define x 'initial)
-
-(eq? x x)
-(eq? x 'initial)
-(eq? 5 4)
diff --git a/pkgs/plai/tests/gc2/good-mutators/mv.rkt b/pkgs/plai/tests/gc2/good-mutators/mv.rkt
deleted file mode 100644
index ffa93dea28..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/mv.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-
-(define (f x y)
-  (values (+ x 11) (+ y 3)))
-
-(let-values ([(x y) (values 1 2)])
-  (let-values ([(a b) (f x y)])
-    (let-values ([(a b) (f a b)])
-      (+ a b))))
-
-(values 1 2)
-(values 3 4 5 6 7)
\ No newline at end of file
diff --git a/pkgs/plai/tests/gc2/good-mutators/names.rkt b/pkgs/plai/tests/gc2/good-mutators/names.rkt
deleted file mode 100644
index 3a976bf02b..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/names.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 10)
-(let ([f (λ (x) x)]) f)
diff --git a/pkgs/plai/tests/gc2/good-mutators/nested-lam.rkt b/pkgs/plai/tests/gc2/good-mutators/nested-lam.rkt
deleted file mode 100644
index 9c167c0ced..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/nested-lam.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 40)
-(let ([x 1])
-  ((λ (x)
-     x)
-   x))
diff --git a/pkgs/plai/tests/gc2/good-mutators/proc-list.rkt b/pkgs/plai/tests/gc2/good-mutators/proc-list.rkt
deleted file mode 100644
index 7e6ebf8f4c..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/proc-list.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang plai/gc2/mutator
-; Demonstrates garbage collection while a closure is on the stack.  A correct collector must ensure that the roots
-; reachable from (make-adder 90) and (make-adder 200) -- that is, the values 90 and 200 that k is bound to -- do
-; not get discarded.
-(allocator-setup "../good-collectors/good-collector.rkt" 58)
-
-(define (make-adder k)
-  (lambda (n) (+ n k)))
-
-(define proc-list
-  (cons (make-adder 90)
-        (cons (make-adder 200)
-              empty)))
-
-(test/value=? ((first proc-list) 7) 97)
-(test/value=? ((first proc-list) 300) 390)
-(test/value=? ((first (rest proc-list)) 73) 273)
diff --git a/pkgs/plai/tests/gc2/good-mutators/repeat-test.rkt b/pkgs/plai/tests/gc2/good-mutators/repeat-test.rkt
deleted file mode 100644
index 5258ddbb46..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/repeat-test.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang plai/gc2/mutator
-
-(allocator-setup "../good-collectors/good-collector.rkt" 30)
-
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
-(test/value=? (cons 1 empty) '(1))
diff --git a/pkgs/plai/tests/gc2/good-mutators/sfs.rkt b/pkgs/plai/tests/gc2/good-mutators/sfs.rkt
deleted file mode 100644
index 9914f17784..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/sfs.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 7)
-(let ([x (cons 1 2)])
- (let ([y (cons 3 4)])
-   y))
diff --git a/pkgs/plai/tests/gc2/good-mutators/student-1.rkt b/pkgs/plai/tests/gc2/good-mutators/student-1.rkt
deleted file mode 100644
index b8e1492442..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/student-1.rkt
+++ /dev/null
@@ -1,131 +0,0 @@
-#lang plai/gc2/mutator
-
-; mark-and-sweep-test.rkt - Ben Childs
-; Designed to test the mark and sweep collector
-; Runs three tests:
-;
-; Allocation of subsequently larger lists
-;
-; Use of Local variables in a loop (garbage after each iteration)
-; Followed by allocation of large list (verifies that they are correctly collected)
-;
-; Generation of a number of circularly referenced lists
-; Followed by allocation of several large lists
-;
-; Finally it runs the sample tests distributed with the assignment
-
-
-(allocator-setup "../good-collectors/good-collector.rkt" 112)
-
-; Helper to generate long lists
-(define (gen-list x)
-  (if (zero? x) '() (cons x (gen-list (- x 1)))))
-
-; Function that defines local vars
-(define (local-vars)
-  (let ((x 3) (y 5) (z 10) (a 5))
-    (+ x (- 10 y))))
-
-(define (loop x)
-  
-  (printf "Iteration: ~a\n" x)
-  
-  (if (zero? x) 0
-        (loop (- (+ (local-vars) (- x 1)) 8))))
-; Generate gradually increasing sizes of lists
-; To trigger garbage collection at different points
-(printf "~a\n" (gen-list 1))
-(printf "~a\n" (gen-list 2))
-(printf "~a\n" (gen-list 4))
-(printf "~a\n" (gen-list 8))
-
-; Run a loop that uses local vars a few times
-(printf "Generating Primitives in loops\n")
-(loop 20)
-
-(printf "Try Allocating large list again\n")
-(printf "~a\n" (gen-list 8))
-
-
-; Create some circular references
-(define (gen-circular)
-  (let ([x (cons 3 4)])
-    (let ([y (cons 2 x)])
-      (set-rest! x y)
-      x)))
-
-(printf "Testing Circular References\n")
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-(printf "~a\n" (gen-circular))
-
-(printf "Try allocating large list again\n")
-(printf "~a\n" (gen-list 8))
-(printf "~a\n" (gen-list 8))
-(printf "~a\n" (gen-list 8))
-(printf "~a\n" (gen-list 8))
-(printf "~a\n" (gen-list 8))
-
-(printf "Running sample tests\n")
-(define (fact x)
-  (if (zero? x)
-      1
-      (* x (fact (sub1 x)))))
-
-(define (fact-help x a)
-  (if (zero? x)
-      a
-      (fact-help (sub1 x) (* x a))))
-
-(define lst (cons 1 (cons 2 (cons 3 empty))))
-
-(define (map-add n lst)
-  (map (lambda (x) (+ n x)) lst))
-
-(define (map f lst)
-  (if (cons? lst)
-      (cons (f (first lst)) (map f (rest lst)))
-      empty))
-
-(define (filter p lst)
-  (if (cons? lst)
-      (if (p (first lst))
-          (cons (first lst) (filter p (rest lst)))
-          (filter p (rest lst)))
-      lst))
-
-(define (append l1 l2)
-  (if (cons? l1)
-      (cons (first l1) (append (rest l1) l2))
-      l2))
-
-(define (length lst)
-  (if (empty? lst)
-      0
-      (add1 (length (rest lst)))))
-
-(define tail (cons 1 empty))
-(define head (cons 4 (cons 3 (cons 2 tail))))
-(set-rest! tail head)
-
-(printf "res ~a\n" head)
-(set! head empty)
-(set! tail head)
-(printf "res ~a\n" lst)
-(printf "res ~a\n" (length '(hello goodbye)))
-(printf "res ~a\n" (map (λ (x) (sub1 x)) lst))
-
-(printf "(fact-help 15 1): ~a\n" (fact-help 15 1))
-(printf "(fact 9): ~a\n" (fact 9))
-
-(printf "(append lst lst): ~a\n" (append lst lst))
-
-(printf "(map-add 5 lst): ~a\n" (map-add 5 lst))
-(printf "(filter even? (map sub1 lst)): ~a\n" (filter (λ (x) (even? x)) (map (λ (x) (sub1 x)) lst)))
-(printf "(length lst): ~a\n" (length lst))
diff --git a/pkgs/plai/tests/gc2/good-mutators/student20111116.rkt b/pkgs/plai/tests/gc2/good-mutators/student20111116.rkt
deleted file mode 100644
index 4173601a99..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/student20111116.rkt
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 104)
-(halt-on-errors)
-
-;(check-temps1 temps) -> boolean?
-; temps : (listof number?)
-;Consumes a list of temperature measures and checks whether all measurements are between 5 and 95 degrees celsius (inclusively.)
-
-(define (check-temps1 temps)
-  (if (empty? temps) #t ;divide end of the list / empty list from not-the-end
-    (and ; ? this temp is between 5 & 95
-     (>= (first temps) 5)
-     (<= (first temps) 95)
-     (check-temps1 (rest temps)) ; ? and so are all the rest
-    )
-  )
-)
-
-(check-temps1 '(7 10 32 87))
-(check-temps1 '(7 4 32 87))
-(check-temps1 '(7 98 32 87))
-
-;(check-temps temps low high) -> boolean?
-;  temps : (listof number?)
-;  low : number?
-;  high : number?
-;Consumes a list of temperature measures and checks whether all measurements are between low and high degrees celsius (inclusively.)
-
-(define (check-temps temps low high)
-  (if (empty? temps) #t ;divide end of the list / empty list from not-the-end
-    (and ; ? this temp is between low & high
-     (>= (first temps) low)
-     (<= (first temps) high)
-     (check-temps (rest temps) low high) ; ? and so are all the rest
-    )
-  )
-)
-
-(check-temps '(7 10 32 87) 5 90)
-(check-temps '(7 10 32 87) 8 90)
-(check-temps '(7 10 32 87) 5 80)
-
-;(convert digits) -> number?
-;  digits : (listof number?)
-;Consumes a list of digits (numbers between 0 and 9) and produces the corresponding number. The first digit is the least significant, and so on.
-
-(define (convert digits)
-  (if (empty? digits) 0 ;at the end, don't add anything!
-    (+ (first digits) (* 10 (convert (rest digits))))
-  )
-)
-
-(convert '(1 2 3))
-
-;(average-price prices) -> number?
-;  prices : (listof number?)
-;Consumes a list of toy prices and computes the average price of a toy. The average is total of all prices divided by the number of toys.
-
-(define (count-prices prices sum count) ;need to introduce some extra parameters to hold the count & sum for averaging
-  (if (empty? prices) (/ sum count) ;end of the list- calculate the average
-    (count-prices (rest prices) (+ sum (first prices)) (+ count 1)) ;increment the count & update the total sum
-  )
-)
-(define (average-price prices)
-  (if (empty? prices) 0 ;divide special case empty list from everything else
-    (count-prices prices 0 0)
-  )
-)
-
-(average-price '())
-(average-price '(5 15 32 6))
-
-;(convertFC fahrenheit) -> (listof number?)
-;  fahrenheit : (listof number?)
-;Converts a list of of Fahrenheit measurements to a list of Celsius measurements.
-
-(define (convertFC fahrenheit)
-  (if (empty? fahrenheit) empty
-    (cons (* (- (first fahrenheit) 32) 5/9) (convertFC (rest fahrenheit)))
-  )
-)
-
-(convertFC '(-40 15 32 50 60 85))
-
-;(eliminate-exp ua lotp) -> (listof number?)
-;  ua : number?
-;  lotp : (listof number?)
-;Eliminates from lotp all toys whose price is greater than ua.
-
-(define (eliminate-exp ua lotp)
-  (cond
-    [(empty? lotp) empty] ; end of the list
-    [(> (first lotp) ua) (eliminate-exp ua (rest lotp))] ;skip this element
-    [else (cons (first lotp) (eliminate-exp ua (rest lotp)))] ;keep this element
-  )
-)
-
-(eliminate-exp 15 '(1 16 3 5 22 8))
diff --git a/pkgs/plai/tests/gc2/good-mutators/tail-calls.rkt b/pkgs/plai/tests/gc2/good-mutators/tail-calls.rkt
deleted file mode 100644
index 83ce62aa84..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/tail-calls.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 68)
-
-(define (length-accum lst len)
-  (if (empty? lst)
-      len
-      (length-accum (rest lst) (+ 1 len))))
-
-(define (length lst)
-  (length-accum lst 0))
-
-(define (fact/acc n a)
-  (if (zero? n)
-      a
-      (fact/acc (- n 1) (* n a))))
-
-(test/value=? (length '(1 2 3 4)) 4)
-(test/value=? (fact/acc 40 1) 815915283247897734345611269596115894272000000000)
diff --git a/pkgs/plai/tests/gc2/good-mutators/test-framework.rkt b/pkgs/plai/tests/gc2/good-mutators/test-framework.rkt
deleted file mode 100644
index a7f945fa33..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/test-framework.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 28)
-
-(halt-on-errors #t)
-(test/value=? 12 12)
diff --git a/pkgs/plai/tests/gc2/good-mutators/test-moving.rkt b/pkgs/plai/tests/gc2/good-mutators/test-moving.rkt
deleted file mode 100644
index bf59cfe476..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/test-moving.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/trivial-moving-collector.rkt" 100)
-
-;; just some random allocation here
-;; this is really about testing 
-;; things moving around in a moving collector
-
-;; the 'let' is important as it means that the
-;; closure is the only thing holding onto the '2'
-
-(define f (cons 1 (let ([y 2]) (λ (x) (+ y x)))))
-(define a ((rest f) 11))
-(define b ((rest f) 22))
-
-(define c
-  ((let ([x (cons 1 2)])
-     (λ (y)
-       ((first y) (first x))))
-   (cons (λ (z) z)
-         5)))
diff --git a/pkgs/plai/tests/gc2/good-mutators/thunks.rkt b/pkgs/plai/tests/gc2/good-mutators/thunks.rkt
deleted file mode 100644
index 534b1a509c..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/thunks.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 5)
-
-; 3
-(define thunker
-  (lambda ()
-    ; 2
-    'alligator
-    ; 2
-    'bananna
-    ; 2
-    'frog))
-; 5 total
-
-(thunker)
diff --git a/pkgs/plai/tests/gc2/good-mutators/yixi.rkt b/pkgs/plai/tests/gc2/good-mutators/yixi.rkt
deleted file mode 100644
index 66b9510dbb..0000000000
--- a/pkgs/plai/tests/gc2/good-mutators/yixi.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 255)
-
-(define (f b) 17)
-(define (g l f)
-  ((lambda (x) (f (first l)))
-   1))
-(g '(3) f)
\ No newline at end of file
diff --git a/pkgs/plai/tests/gc2/info.rkt b/pkgs/plai/tests/gc2/info.rkt
deleted file mode 100644
index 5dfba24454..0000000000
--- a/pkgs/plai/tests/gc2/info.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("bad-mutators"
-                             "bad-collectors"
-                             "other-mutators"))
-(define test-omit-paths '("bad-mutators"
-                          "other-mutators"))
diff --git a/pkgs/plai/tests/gc2/other-mutators/begin.rkt b/pkgs/plai/tests/gc2/other-mutators/begin.rkt
deleted file mode 100644
index 7d3c760c71..0000000000
--- a/pkgs/plai/tests/gc2/other-mutators/begin.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 10)
-
-; 3
-(define (go)
-  ; 2
-  (let ([obj 'z])
-    9 10
-    ; 3
-    (symbol? obj)))
-
-; 2
-(go)
diff --git a/pkgs/plai/tests/gc2/other-mutators/error.rkt b/pkgs/plai/tests/gc2/other-mutators/error.rkt
deleted file mode 100644
index 57dffbec82..0000000000
--- a/pkgs/plai/tests/gc2/other-mutators/error.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 400)
-(error 'error "plai/gc2/mutator has error")
diff --git a/pkgs/plai/tests/gc2/other-mutators/morse.rkt b/pkgs/plai/tests/gc2/other-mutators/morse.rkt
deleted file mode 100644
index a80228b44e..0000000000
--- a/pkgs/plai/tests/gc2/other-mutators/morse.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 24)
-
-(define a '(1 2 3 4 5))
-
diff --git a/pkgs/plai/tests/gc2/other-mutators/printing.rkt b/pkgs/plai/tests/gc2/other-mutators/printing.rkt
deleted file mode 100644
index fe58aabf75..0000000000
--- a/pkgs/plai/tests/gc2/other-mutators/printing.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 400)
-(print-only-errors #f)
-
-(define lst (cons 1 (cons 2 (cons 3 empty))))
-(test/value=? lst '(1 2 3))
-
-(define (length lst)
-  (if (empty? lst)
-      0
-      (add1 (length (rest lst)))))
-
-(test/value=? (length '(hello goodbye)) 2)
-
-(define tail (cons 1 empty))
-(define head (cons 4 (cons 3 (cons 2 tail))))
-(set-rest! tail head)
-(test/location=? head (rest tail))
-(test/location=? head tail)
diff --git a/pkgs/plai/tests/gc2/other-mutators/quote.rkt b/pkgs/plai/tests/gc2/other-mutators/quote.rkt
deleted file mode 100644
index 72b6b2e991..0000000000
--- a/pkgs/plai/tests/gc2/other-mutators/quote.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 28)
-
-1 2
-(define x
-  (cons 'apple-pie ; 2 + 3
-        (cons 'pumpkin-pie ; 2 + 3
-              empty))) ; 2
-; Need 12 cells
-1 2
-(define y
-  '(apple-pie pumpkin-pie))
-; Need 24 cells
-
-(define (equal? l r)
-  (cond
-    [(and (empty? l) (empty? r))
-     #t]
-    [(and (cons? l) (cons? r))
-     (and (equal? (first l) (first r))
-          (equal? (rest l) (rest r)))]
-    [(and (symbol? l) (symbol? r))
-     (symbol=? l r)]
-    [else
-     #f]))
-; Need 2 more for the proc
-
-; Need 2 more for the ans
-(equal? x y)
diff --git a/pkgs/plai/tests/gc2/other-mutators/top.rkt b/pkgs/plai/tests/gc2/other-mutators/top.rkt
deleted file mode 100644
index afbec9e97d..0000000000
--- a/pkgs/plai/tests/gc2/other-mutators/top.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang plai/gc2/mutator
-(allocator-setup "../good-collectors/good-collector.rkt" 400)
-frozzle
diff --git a/pkgs/plai/tests/gc2/roots-test.rkt b/pkgs/plai/tests/gc2/roots-test.rkt
deleted file mode 100644
index 04d22b1bb2..0000000000
--- a/pkgs/plai/tests/gc2/roots-test.rkt
+++ /dev/null
@@ -1,200 +0,0 @@
-#lang at-exp racket
-(require rackunit)
-
-#|
-
-This file has tests for the mutator transformation to make
-sure that the right things are in the result of get-root-set.
-
-It works by setting up a collector (one that doesn't actually collect)
-that prints out all of the flat values in the root set at the point
-when a cons happens. 
-
-Then it sets up various little expressions (in the calls to 'run-one')
-that check the root set contents and the arguments to cons.
-
-The roots are printed only if they are flat values and the values 
-themselves are printed, sorted with duplicates removed. (Also the code 
-crashes if there are non-real-number flat values
-because the root values are sorted before printing.) So this means
-that the test cases have to be set up somewhat carefully.
-
-|#
-
-(define ns (make-base-namespace))
-(parameterize ([current-namespace ns]
-               [current-module-declare-name (make-resolved-module-path 'gc)])
-  (eval
-   (parameterize ([read-accept-reader #t])
-     (read-syntax
-      'stuff
-      (open-input-string
-       @string-append{#lang plai/gc2/collector
-      (define heap-ptr 'uninitialized-heap-ptr)
-      (define (init-allocator) (set! heap-ptr 0))
-
-      (define (gc:closure code vs)
-        (define len (length vs))
-        (when (> (+ heap-ptr len) (heap-size))
-          (error "out of memory"))
-        (heap-set! heap-ptr 'closure)
-        (heap-set! (+ 1 heap-ptr) code)
-        (for ([v (in-list vs)]
-              [i (in-naturals 1)])
-          (heap-set! (+ 1 i heap-ptr) (read-root v)))
-        (set! heap-ptr (+ len 2 heap-ptr))
-        ;; return the location of this flat data
-        (- heap-ptr len 2))
-
-      (define (gc:closure-code-ptr a) (heap-ref (+ a 1)))
-      (define (gc:closure-env-ref a i) (heap-ref (+ a 1 1 i)))
-      (define (gc:closure? a) (eq? (heap-ref a) 'closure))
-      
-      (define (gc:alloc-flat p)
-        (begin 
-          (when (> (+ heap-ptr 2) (heap-size))
-            (error "out of memory"))
-          (heap-set! heap-ptr 'prim)
-          (heap-set! (+ 1 heap-ptr) p)
-          (set! heap-ptr (+ 2 heap-ptr))
-          ; return the location of this flat data
-          (- heap-ptr 2)))
-
-      (define (gc:cons f r)
-        (begin
-          (when (> (+ heap-ptr 3) (heap-size))
-            (error "out of memory"))
-          (define (get-prim x) (heap-ref (+ (read-root x) 1)))
-          (define prim-roots
-            (for/list ([x (in-list (get-root-set))]
-                       #:when (eq? 'prim (heap-ref (read-root x))))
-              (get-prim x)))
-          (printf "~s\n" (append (cons 'roots (remove-duplicates (sort prim-roots <)))
-                                 (list 'hd (get-prim f) 'tl (get-prim r))))
-          (heap-set! heap-ptr 'cons)
-          (heap-set! (+ 1 heap-ptr) (read-root f))
-          (heap-set! (+ 2 heap-ptr) (read-root r))
-          (set! heap-ptr (+ 3 heap-ptr))
-          (- heap-ptr 3)))
-
-      (define (gc:deref a) (heap-ref (+ 1 a)))
-      (define (gc:cons? a) (eq? (heap-ref a) 'cons))
-      (define (gc:first a) (heap-ref (+ 1 a)))
-      (define (gc:rest a) (heap-ref (+ 2 a)))
-      (define (gc:set-first! a f) 
-        (if (gc:cons? a)
-            (heap-set! (+ 1 a) f)
-            (error 'set-first! "expects address of cons")))
-      
-      (define (gc:set-rest! a r) (heap-set! (+ 2 a) r))
-      (define (gc:flat? a) (eq? 'prim (heap-ref a)))})))))
-
-;; each call to 'run-one' must have a unique name;
-;; these names are used as module names. 
-;; the result is a list with one element for each
-;; call to cons, listing the roots (as discussed above)
-(define (run-one name . strings)
-  (parameterize ([current-namespace ns]
-                 [current-module-declare-name 
-                  (make-resolved-module-path name)])
-    (eval
-     (parameterize ([read-accept-reader #t])
-       (read-syntax
-        'stuff
-        (open-input-string (apply string-append strings)))))
-    (define sp (open-output-string))
-    (parameterize ([current-output-port sp])
-      (namespace-require `',name))
-    (define ip (open-input-string (get-output-string sp)))
-    (let loop ()
-      (define l (read-line (peeking-input-port ip)))
-      (cond
-        [(eof-object? l) '()]
-        [(regexp-match #rx"^[(]roots" l)
-         (cons (read ip) (loop))]
-        [else
-         ;; skip over lines that don't look like the roots printouts
-         (read-line ip)
-         (loop)]))))
-
-(check-equal?
- @run-one['non-tail-cons]{#lang plai/gc2/mutator
-                          (allocator-setup 'gc 200)
-                          (first (cons 1 2))}
- '((roots hd 1 tl 2)))
-
-(check-equal?
- @run-one['tail-cons]{#lang plai/gc2/mutator
-                      (allocator-setup 'gc 200)
-                      (define (f x) (cons 1 2))
-                      (f 3)}
- '((roots 3 hd 1 tl 2)))
-
-(check-equal?
- @run-one['tail-cons-with-unused-var]{#lang plai/gc2/mutator
-                                      (allocator-setup 'gc 200)
-                                      (define (f x) (let ([y 2]) (cons 3 4)))
-                                      (f 1)}
- '((roots 1 hd 3 tl 4)))
-
-(check-equal?
- @run-one['cons-with-used-var]{#lang plai/gc2/mutator
-                               (allocator-setup 'gc 200)
-                               (define (f x) (let ([y 2]) 
-                                               (let ([z (cons 3 4)])
-                                                 y)))
-                               (f 1)}
- '((roots 1 2 hd 3 tl 4)))
-
-
-(check-equal?
- @run-one['cons-with-unused-var]{#lang plai/gc2/mutator
-                                 (allocator-setup 'gc 200)
-                                 (define (f x) (let ([y 2]) 
-                                                 (let ([z (cons 3 4)])
-                                                   x)))
-                               (f 1)}
- '((roots 1 hd 3 tl 4)))
-
-
-(check-equal?
- @run-one['let-values]{#lang plai/gc2/mutator
-                                 (allocator-setup 'gc 200)
-                                 (define (f x) (let-values ([(y) 2]
-                                                            [(z) (cons 3 4)])
-                                                   x))
-                                 (f 1)}
- '((roots 1 hd 3 tl 4)))
-
-(check-equal?
- @run-one['let-values2]{#lang plai/gc2/mutator
-                        (allocator-setup 'gc 200)
-                        (define (f x) (let-values ([(y) 2]
-                                                   [(z) (cons 3 4)])
-                                        y))
-                        (f 1)}
- '((roots 1 2 hd 3 tl 4)))
-
-(check-equal?
- @run-one['fn-args]{#lang plai/gc2/mutator
-                    (allocator-setup 'gc 200)
-                    (define (f x) (let ([z (cons 1 2)]) x))
-                    (define (g y) (f 3))
-                    (g 4)}
- '((roots 3 4 hd 1 tl 2)))
-
-(check-equal?
- @run-one['fn-args2]{#lang plai/gc2/mutator
-                    (allocator-setup 'gc 200)
-                    (define (f x) (let ([z (cons 1 2)]) z))
-                    (define (g y) (f 3))
-                    (g 4)}
- '((roots 4 hd 1 tl 2)))
-
-(check-equal?
- @run-one['fn-args3]{#lang plai/gc2/mutator
-                    (allocator-setup 'gc 200)
-                    (define (f x) (cons 1 2))
-                    (define (g y) (f 3))
-                    (g 4)}
- '((roots 4 hd 1 tl 2)))
diff --git a/pkgs/plai/tests/gc2/run-test.rkt b/pkgs/plai/tests/gc2/run-test.rkt
deleted file mode 100644
index 7ec95b631d..0000000000
--- a/pkgs/plai/tests/gc2/run-test.rkt
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang racket
-(require tests/eli-tester
-         racket/runtime-path
-         "../util.rkt")
-
-(module test racket/base
-  (require syntax/location)
-  (parameterize ([current-command-line-arguments (vector "-g")])
-    (dynamic-require (quote-module-path "..") #f)))
-
-(define-runtime-path here ".")
-
-(define (in-directory pth rx)
-  (in-list
-   (map (curry build-path pth)
-        (filter (compose (curry regexp-match rx) path->bytes)
-                (directory-list pth)))))
-
-(define (test-mutator m)
-  (printf "Running ~a\n" (simplify-path m))
-  (parameterize ([current-namespace (make-base-empty-namespace)])
-    (dynamic-require m #f)))
-
-(define run-good? (make-parameter #f))
-
-(command-line #:program "run-test"
-              #:once-each ["-g" "Enable running good mutators" (run-good? #t)])
-
-(define (drop-first-line e)
-  (regexp-replace "^[^\n]+\n" e ""))
-(define-syntax-rule (capture-output e)
-  (drop-first-line (with-both-output-to-string (λ () e))))
-
-(test
- (if (run-good?)
-     (for ([m (in-directory (build-path here "good-mutators") #rx"rkt$")])
-       (test #:failure-prefix (format "~a" m)
-             (test-mutator m)))
-     (void))
- (for ([m (in-directory (build-path here "bad-mutators") #rx"rkt$")])
-   (test
-    (test-mutator m) =error> #rx""))
- 
- (test-mutator (build-path here "other-mutators" "error.rkt"))
- =error>
- #rx"plai/gc2/mutator has error"
- 
- (test-mutator (build-path here "other-mutators" "top.rkt"))
- =error>
- #rx"unbound identifier in module\n  in: frozzle"
- 
- (capture-output (test-mutator (build-path here "other-mutators" "printing.rkt")))
- =>
- #<<END
-(good lst '(1 2 3) '(1 2 3) "at line 6")
-(good (length (quote (hello goodbye))) 2 2 "at line 13")
-(good (heap-loc head) 63 63 "at line 18")
-(bad (heap-loc head) 63 48 "at line 19")
-
-END
- 
-  (capture-output (test-mutator (build-path here "other-mutators" "begin.rkt")))
- =>
- #<<END
-Value at location 3:
-#t
-
-END
- 
- (test-mutator (build-path here "other-mutators" "quote.rkt"))
- =error> "alloc: out of space"
- 
- (when (run-good?)
-   (test
-    (capture-output (test-mutator (build-path here "good-mutators" "mv.rkt")))
-    =>
-    #<<END
-Value at location 23:
-31
-Values at locations 25 and 27:
-1
-2
-Values at locations 29, 31, 33, 35, and 37:
-3
-4
-5
-6
-7
-
-END
-    )))
diff --git a/pkgs/plai/tests/gc2/set-restriction-test.rkt b/pkgs/plai/tests/gc2/set-restriction-test.rkt
deleted file mode 100644
index 8233ff549c..0000000000
--- a/pkgs/plai/tests/gc2/set-restriction-test.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang racket
-(require racket/runtime-path)
-(define-syntax (test stx)
-  (syntax-case stx ()
-    [(_ exp reg)
-     (with-syntax ([line (syntax-line stx)])
-       #'(test/proc line 'exp reg))]))
-
-(define-runtime-path here ".")
-
-(define ns (make-base-namespace))
-(define tests 0)
-(define failed 0)
-(define (test/proc line exp reg)
-  (set! tests (+ tests 1))
-  (define err
-    (with-handlers (((λ (x)
-                       (and (exn:fail:syntax? x)
-                            reg
-                            (let ([m (exn-message x)])
-                              (regexp-match? reg m))))
-                     exn-message))
-      (parameterize ([current-namespace ns]
-                     [current-directory here])
-        (expand 
-         `(,#'module m plai/gc2/mutator
-                     (allocator-setup "good-collectors/trivial-collector.rkt" 200)
-                     (define x '(1))
-                     ,exp))
-        #f)))
-  (unless (or (and reg err)
-              (and (not reg) (not err)))
-    (set! failed (+ failed 1))
-    (eprintf "test on line ~a failed:\n  ~s\n  expected ~a, got ~a\n"
-             line
-             exp
-             (if reg (format "a syntax error matching ~a" reg) "no error")
-             (or err "no error"))))
-  
-  
-(test (+ (set! x 2) 1) #rx"set!")
-(test (cons (set! x 3) empty) #rx"set!")
-(test (set! x 2) #f)
-(test (set! x (set! x 2)) #rx"set!")
-(test (begin (begin (set! x 2) 1) 2) #f)
-(test (λ () (set! x 1)) #rx"set!")
-(test (λ () (set! x 1) 2) #f)
-(test (let ([y (begin 1 (set! x 2))]) 1) #rx"set!")
-(test (let ([y 2]) (begin 1 (set! x 2))) #f)
-(test (+ (set-first! x 2) 3) #rx"set-first!")
-(test (begin (set-first! x 2) 3) #f)
-(test (+ (set-rest! x 2) 3) #rx"set-rest!")
-(test (begin (set-rest! x 2) 3) #f)
-(test set-first! #rx"set-first!")
-(test set-rest! #rx"set-rest!")
-(test (if (set! x 1) 2 3) #rx"set!")
-(test (if 1 (set! x 2) (set! x 3)) #f)
-
-(cond
-  [(zero? failed)
-   (printf "passed ~a tests\n" tests)]
-  [else
-   (eprintf "failed ~a test~a\n" failed (if (= 1 failed) "" "s"))])
diff --git a/pkgs/plai/tests/info.rkt b/pkgs/plai/tests/info.rkt
deleted file mode 100644
index bc9152b9f6..0000000000
--- a/pkgs/plai/tests/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define test-omit-paths '("web.rkt"))
-
-(define test-responsibles '(("test-random-mutator.rkt" (jay robby))))
diff --git a/pkgs/plai/tests/printer.rkt b/pkgs/plai/tests/printer.rkt
deleted file mode 100644
index 363486fdb1..0000000000
--- a/pkgs/plai/tests/printer.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang racket/base
-(require (only-in plai define-type)
-         racket/contract
-         mzlib/pconvert
-         racket/pretty)
-
-(define-type Foo
-  [bar (v any/c)
-       (v2 any/c)])
-
-(define (to-string print v)
-  (let ([s (open-output-string)])
-    (print v s)
-    (get-output-string s)))
-
-(define success 0)
-(define (check a b) 
-  (if (equal? a b) 
-      (set! success (add1 success))
-      (error 'check "failed: ~s vs. ~s" a b)))
-
-(check (to-string print Foo?) "#<procedure:Foo?>")
-(check (to-string write Foo?) "#<procedure:Foo?>")
-(check (to-string display Foo?) "#<procedure:Foo?>")
-
-(check (to-string print bar?) "#<procedure:bar?>")
-(check (to-string write bar?) "#<procedure:bar?>")
-(check (to-string display bar?) "#<procedure:bar?>")
-
-(check (to-string print (bar "a" 'b)) "(bar \"a\" 'b)")
-(check (to-string write (bar "a" 'b)) "#(struct:bar \"a\" b)")
-(check (to-string display (bar "a" 'b)) "#(struct:bar a b)")
-
-(check (to-string print (list (bar "a" (list 'b)))) "(list (bar \"a\" '(b)))")
-(check (to-string write (list (bar "a" (list 'b)))) "(#(struct:bar \"a\" (b)))")
-(check (to-string display (list (bar "a" (list 'b)))) "(#(struct:bar a (b)))")
-
-;; Check `print-convert' plus `pretty-write'
-;; as used by DrRacket's "constructor" printing mode:
-(constructor-style-printing #t)
-(check (to-string pretty-write (print-convert '(a b))) "(list 'a 'b)\n")
-(check (to-string pretty-write (print-convert (bar "a" 'b))) "(bar \"a\" 'b)\n")
-;; "quasiquote" printing mode:
-(constructor-style-printing #f)
-(check (to-string pretty-write (print-convert '(a b))) "`(a b)\n")
-(check (to-string pretty-write (print-convert (bar "a" 'b))) "(bar \"a\" 'b)\n")
-
-(printf "~a tests passed.\n" success)
diff --git a/pkgs/plai/tests/shared.rkt b/pkgs/plai/tests/shared.rkt
deleted file mode 100644
index 4bd806891c..0000000000
--- a/pkgs/plai/tests/shared.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang plai
-
-(define-type Node
-  (node (data string?) (adj list?)))
-
-(define g
-  (shared ([PVD (node "Providence" (list ORH BOS))]
-           [ORH (node "Worcester" (list PVD BOS))]
-           [BOS (node "Boston" (list PVD ORH))])
-          (list PVD ORH BOS)))
-
-g
-
-(define PVD (first g))
-(define ORH (second g))
-(define BOS (third g))
-
-PVD
-ORH
-BOS
-
-(test (node-adj PVD) (list ORH BOS))
-(test (node-adj ORH) (list PVD BOS))
-(test (node-adj BOS) (list PVD ORH))
diff --git a/pkgs/plai/tests/test-harness.rkt b/pkgs/plai/tests/test-harness.rkt
deleted file mode 100644
index ba7633f86b..0000000000
--- a/pkgs/plai/tests/test-harness.rkt
+++ /dev/null
@@ -1,216 +0,0 @@
-#lang plai
-(require (prefix-in eli: tests/eli-tester)
-         "util.rkt")
-
-(define-type WAE
-  [binop (p procedure?) (lhs WAE?) (rhs WAE?)]
-  [num (n number?)]
-  [id (s symbol?)])
-
-(define-syntax-rule (->string e)
-  (regexp-replace "line [0-9]+" (with-both-output-to-string (λ () e)) "line ??"))
-(define-syntax-rule (->err-string e)
-  (regexp-replace "line [0-9]+" (with-err-output-to-string (λ () e)) "line ??"))
-(define-syntax-rule (->out-string e)
-  (regexp-replace "line [0-9]+" (with-output-to-string (λ () e)) "line ??"))
-
-(define (with-err-output-to-string thunk)
-  (define sp (open-output-string))
-  (parameterize ([current-error-port sp])
-    (thunk))
-  (get-output-string sp))
-
-(define (go catch? errors? abridged?)
-  (eli:test 
-   #:failure-prefix (format "~a / ~a / ~a" catch? errors? abridged?)
-   (eli:test
-    (plai-catch-test-exn catch?)
-    (print-only-errors errors?)
-    (abridged-test-output abridged?)
-    
-    (->string (test (list 'binop + (num 1) (num 2)) (binop + (num 1) (num 2))))
-    =>
-    (if abridged?
-        "(bad (list 'binop #<procedure:+> (num 1) (num 2)) (binop #<procedure:+> (num 1) (num 2)))\n"
-        "(bad (list (quote binop) + (num 1) (num 2)) (list 'binop #<procedure:+> (num 1) (num 2)) (binop #<procedure:+> (num 1) (num 2)) \"at line ??\")\n")
-    
-    (->string (test (num 5) (id 'x)))
-    =>
-    (if abridged?
-        "(bad (num 5) (id 'x))\n"
-        "(bad (num 5) (num 5) (id 'x) \"at line ??\")\n")
-    
-    (->string (test 1 (+ 1 0)))
-    =>
-    (if errors?
-        ""
-        (if abridged?
-            "(good 1 1)\n"
-            "(good 1 1 1 \"at line ??\")\n"))
-    
-    (->string (test 1 1))
-    =>
-    (if errors?
-        ""
-        (if abridged?
-            "(good 1 1)\n"
-            "(good 1 1 1 \"at line ??\")\n"))
-    
-    (->out-string (test 1 1))
-    =>
-    (if errors?
-        ""
-        (if abridged?
-            "(good 1 1)\n"
-            "(good 1 1 1 \"at line ??\")\n"))
-    
-    (->string (test 1 2))
-    =>
-    (if abridged?
-        "(bad 1 2)\n"
-        "(bad 1 1 2 \"at line ??\")\n")
-    
-    (->err-string (test 1 2))
-    =>
-    (if abridged?
-        "(bad 1 2)\n"
-        "(bad 1 1 2 \"at line ??\")\n")
-    
-    (->string (test (/ 1 0) 0))
-    =>
-    (if catch?
-        (if abridged?
-            "(exception \"/: division by zero\" '<no-expected-value>)\n"
-            "(exception (/ 1 0) \"/: division by zero\" '<no-expected-value> \"at line ??\")\n")
-        (error '/ "division by zero"))
-    
-    (->string (test (error "zamboni") 347))
-    =>
-    (if catch?
-        (if abridged?
-            "(exception \"zamboni\" 347)\n"
-            "(exception (error \"zamboni\") \"zamboni\" 347 \"at line ??\")\n")
-        (error "zamboni"))
-    
-    (->string (test 3.4 3.4000001))
-    =>
-    (if errors?
-        ""
-        (if abridged?
-            "(good 3.4 3.4000001)\n"
-            "(good 3.4 3.4 3.4000001 \"at line ??\")\n"))
-    
-    (->string (test +inf.0 +inf.0))
-    =>
-    (if errors?
-        ""
-        (if abridged?
-            "(good +inf.0 +inf.0)\n"
-            "(good +inf.0 +inf.0 +inf.0 \"at line ??\")\n"))
-    
-    (->string (test/pred 0 zero?))
-    =>
-    (if errors?
-        ""
-        (if abridged?
-            "(good 0 'zero?)\n"
-            "(good 0 0 'zero? \"at line ??\")\n"))
-    
-    (->string (test/pred 1 zero?))
-    =>
-    (if abridged?
-        "(bad 1 'zero?)\n"
-        "(bad 1 1 'zero? \"at line ??\")\n")
-    
-    (->string (test/pred 1 (error 'pred)))
-    =>
-    (if catch?
-        (if abridged?
-            "(pred-exception \"error: pred\" '<no-expected-value>)\n"
-            "(pred-exception 1 \"error: pred\" '<no-expected-value> \"at line ??\")\n")
-        (error 'pred))
-    
-    (->string (test/pred 1 (lambda (n) (/ 1 0))))
-    =>
-    (if catch?
-        (if abridged?
-            "(pred-exception \"/: division by zero\" '<no-expected-value>)\n"
-            "(pred-exception 1 \"/: division by zero\" '<no-expected-value> \"at line ??\")\n")
-        (error '/ "division by zero"))
-    
-    (->string (test/pred "a" string->number))
-    =>
-    (if abridged?
-        "(bad \"a\" 'string->number)\n"
-        "(bad \"a\" \"a\" 'string->number \"at line ??\")\n")
-    
-    (->string (test/exn (error "zamboni") "zamboni"))
-    =>
-    (if catch?
-        (if errors?
-            ""
-            (if abridged?
-                "(good \"zamboni\" \"zamboni\")\n"
-                "(good (error \"zamboni\") \"zamboni\" \"zamboni\" \"at line ??\")\n"))
-        (error "zamboni"))
-    
-    (->string (test/exn (error "samboni") "zamboni"))
-    =>
-    (if catch?
-        (if abridged?
-            "(bad \"samboni\" \"zamboni\")\n"
-            "(bad (error \"samboni\") \"samboni\" \"zamboni\" \"at line ??\")\n")
-        (error "samboni"))
-    
-    (->string (test/exn 5 "zamboni"))
-    =>
-    (if abridged?
-        "(bad 5 \"zamboni\")\n"
-        "(bad 5 5 \"zamboni\" \"at line ??\")\n")
-    
-    (->string (test/exn (/ 1 0) "division"))
-    =>
-    (if catch?
-        (if abridged?
-            "(exception \"/: division by zero\" '<no-expected-value>)\n"
-            "(exception (/ 1 0) \"/: division by zero\" '<no-expected-value> \"at line ??\")\n")
-        (error '/ "division by zero"))
-    
-    (->string (test/regexp (error "zamboni") "zam"))
-    =>
-    (if catch?
-        (if errors?
-            ""
-            (if abridged?
-                "(good \"zamboni\" \"zam\")\n"
-                "(good (error \"zamboni\") \"zamboni\" \"zam\" \"at line ??\")\n"))
-        (error "zamboni"))
-    
-    (->string (test/regexp (error "samboni") "zam"))
-    =>
-    (if catch?
-        (if abridged?
-            "(bad \"samboni\" \"zam\")\n"
-            "(bad (error \"samboni\") \"samboni\" \"zam\" \"at line ??\")\n")
-        (error "samboni"))
-    
-    (->string (test/regexp 5 "zam"))
-    =>
-    (if abridged?
-        "(bad 5 \"zam\")\n"
-        "(bad 5 5 \"zam\" \"at line ??\")\n")
-    
-    (->string (test/regexp (/ 1 0) "divis"))
-    =>(if catch?
-          (if abridged?
-              "(exception \"/: division by zero\" '<no-expected-value>)\n"
-              "(exception (/ 1 0) \"/: division by zero\" '<no-expected-value> \"at line ??\")\n")
-          (error '/ "division by zero"))
-    
-    )))
-
-(eli:test
- (for* ([catch? (in-list (list #t #f))]
-        [errors? (in-list (list #t #f))]
-        [abridged? (in-list (list #t #f))])
-   (go catch? errors? abridged?)))
diff --git a/pkgs/plai/tests/test-random-mutator.rkt b/pkgs/plai/tests/test-random-mutator.rkt
deleted file mode 100644
index 39c925efe2..0000000000
--- a/pkgs/plai/tests/test-random-mutator.rkt
+++ /dev/null
@@ -1,137 +0,0 @@
-#lang racket/base
-(require rackunit
-         plai/random-mutator
-         racket/runtime-path
-         racket/file
-         racket/pretty
-         ;; test find-heap-values and save-random-mutator via the contract'd
-         ;; interface, just in case they break their contracts
-         (except-in plai/private/random-mutator find-heap-values save-random-mutator))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  random mutator generation tests
-;;
-
-;; test-code : exp -> boolean
-;; returns true if evaluating the example code (as a mutator)
-;; returns one result at the top-level, namely the symbol 'passed.
-(define (test-code exps)
-  (let ([tmpfile (make-temporary-file "plai-random-mutator-test-~a")])
-    (call-with-output-file tmpfile
-      (λ (port)
-        (fprintf port "#lang plai/mutator\n")
-        (fprintf port "~s\n" `(allocator-setup plai/tests/gc/good-collectors/good-collector 100))
-        (for-each (λ (exp) (pretty-write exp port)) exps))
-      #:exists 'truncate)
-
-    (let ([sp (open-output-string)])
-      (parameterize ([current-output-port sp])
-        (dynamic-require tmpfile #f))
-      (delete-file tmpfile)
-      (and (regexp-match #rx"Value at location [0-9]+:\n'passed\n"
-                         (get-output-string sp))
-           #t))))
-
-
-(define (make-simple-obj-graph/code heap-value)
-  (obj-graph->code (make-obj-graph
-                    (let ([ht (make-hash)])
-                      (hash-set! ht 0 (make-terminal heap-value))
-                      ht)
-                    '()
-                    heap-value
-                    0)
-                   1
-                   100))
-
-(check-true (test-code (list ''passed)))
-(check-true (test-code (make-simple-obj-graph/code 'z)))
-(check-true (test-code (make-simple-obj-graph/code 111)))
-(check-true (test-code (make-simple-obj-graph/code '())))
-(check-true (test-code (make-simple-obj-graph/code #t)))
-(check-true (test-code (make-simple-obj-graph/code #f)))
-(check-true (test-code
-             (obj-graph->code (make-obj-graph
-                               (let ([ht (make-hash)])
-                                 (hash-set! ht 2 (make-pair 2 1))
-                                 (hash-set! ht 1 (make-pair 3 4))
-                                 (hash-set! ht 0 (make-terminal 'z))
-                                 (hash-set! ht 4 (make-pair 0 0))
-                                 (hash-set! ht 3 (make-proc (list 0 1 2 0 1)))
-                                 ht)
-                               '(first 2 rest first 4 first 3)
-                               'z
-                               1)
-                              1
-                              100)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  find-heap-values tests
-;;
-
-(check-equal?
- (find-heap-values
-  (open-input-string
-   "#lang plai/mutator\n'x"))
- (list 'x))
-
-(check-equal?
- (find-heap-values
-  (open-input-string
-   "#lang plai/collector\ntrue"))
- (list #t))
-(check-equal?
- (find-heap-values
-  (open-input-string
-   "#lang plai/collector\n1"))
- (list 1))
-
-(check-equal?
- (find-heap-values
-  (open-input-string
-   "#lang plai/collector\n'(x y 1)"))
- (list 1 'x 'y))
-
-(check-equal?
- (find-heap-values
-  (open-input-string
-   "#lang plai/collector\n(error 'x \"hm\")(test 'y 'z) (test/exn 'w 'q)"))
- (list))
-
-(check-equal?
- (find-heap-values
-  (open-input-string
-   "#lang scheme/base\n(error 'x \"hm\")(test 'y 'z) (test/exn 'w 'q)"))
- (list 'q 'w 'x 'y 'z))
-
-(check-equal?
- (find-heap-values
-  (open-input-string
-   "((error 'x \"hm\")(test 'y 'z) (test/exn 'w 'q))"))
- (list 'q 'w 'x 'y 'z))
-
-(check-equal?
- (find-heap-values
-  (open-input-string
-   "(true false null)"))
- (list #f #t'()))
-
-(check-equal?
- (find-heap-values
-  (open-input-string
-   "empty"))
- (list '()))
-
-(check-equal?
- (find-heap-values
-  (open-input-string
-   "`x"))
- (list 'x))
-
-(check-equal?
- (find-heap-values
-  (open-input-string
-   "`(())"))
- (list '()))
diff --git a/pkgs/plai/tests/util.rkt b/pkgs/plai/tests/util.rkt
deleted file mode 100644
index dd365b4242..0000000000
--- a/pkgs/plai/tests/util.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(provide with-both-output-to-string)
-(define (with-both-output-to-string thunk)
-  (define sp (open-output-string))
-  (parameterize ([current-output-port sp]
-                 [current-error-port sp])
-    (thunk))
-  (get-output-string sp))
\ No newline at end of file
diff --git a/pkgs/plai/tests/web.rkt b/pkgs/plai/tests/web.rkt
deleted file mode 100644
index 041f08ff91..0000000000
--- a/pkgs/plai/tests/web.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang plai/web
-
-(define-type A
-  [mta])
-
-(define (start req)
-  (response/xexpr
-   "Hello"))
diff --git a/pkgs/plai/web.rkt b/pkgs/plai/web.rkt
deleted file mode 100644
index 57af60dacb..0000000000
--- a/pkgs/plai/web.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scheme
-(require plai/datatype
-         plai/test-harness
-         web-server/servlet
-         (prefix-in insta: web-server/insta/insta))
-
-(provide (all-from-out plai/datatype)
-         (all-from-out web-server/servlet)
-         (except-out (all-from-out scheme) error #%module-begin)
-         (except-out (all-from-out plai/test-harness) plai-error)
-         (rename-out [plai-error error]
-                     [insta:no-web-browser no-web-browser]
-                     [insta:static-files-path static-files-path] 
-                     [insta:#%module-begin #%module-begin]))
-
diff --git a/pkgs/plai/web/lang/reader.rkt b/pkgs/plai/web/lang/reader.rkt
deleted file mode 100644
index f35caf1570..0000000000
--- a/pkgs/plai/web/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-(module reader syntax/module-reader
-  #:language `plai/web)
diff --git a/pkgs/planet-pkgs/planet-doc/LICENSE.txt b/pkgs/planet-pkgs/planet-doc/LICENSE.txt
deleted file mode 100644
index e6b1fa97ab..0000000000
--- a/pkgs/planet-pkgs/planet-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-planet-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/planet-pkgs/planet-doc/info.rkt b/pkgs/planet-pkgs/planet-doc/info.rkt
deleted file mode 100644
index 3ba3cae1f7..0000000000
--- a/pkgs/planet-pkgs/planet-doc/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("planet-lib"
-               "scribble-lib"
-               "base"))
-
-(define pkg-desc "documentation part of \"planet\"")
-
-(define pkg-authors '(mflatt robby))
-(define build-deps '("racket-doc"
-                     "scribble-doc"))
-(define update-implies '("planet-lib"))
diff --git a/pkgs/planet-pkgs/planet-doc/planet/info.rkt b/pkgs/planet-pkgs/planet-doc/planet/info.rkt
deleted file mode 100644
index fdc4fd119c..0000000000
--- a/pkgs/planet-pkgs/planet-doc/planet/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define name "PLaneT")
-(define scribblings '(("planet.scrbl" (multi-page) (tool))))
diff --git a/pkgs/planet-pkgs/planet-doc/planet/planet.scrbl b/pkgs/planet-pkgs/planet-doc/planet/planet.scrbl
deleted file mode 100644
index f28c2b336f..0000000000
--- a/pkgs/planet-pkgs/planet-doc/planet/planet.scrbl
+++ /dev/null
@@ -1,837 +0,0 @@
-#lang scribble/manual
-
-@(require
-   (for-label
-     racket/base
-     scribble/manual
-     planet/config
-     planet/util
-     planet/version
-     planet/syntax
-     planet/resolver
-     planet/scribble)
-   scribble/bnf)
-
-@(define-syntax-rule (eg (code resl) ...)
-   (interaction
-     (eval:alts code resl)
-     ...))
-
-@title{PLaneT: Automatic Package Distribution}
-
-@author["Jacob Matthews" "Robert Bruce Findler"]
-
-The @PLaneT system is a method for automatically sharing code packages,
-both as libraries and as full applications, that gives every user of a
-@PLaneT client the illusion of having a local copy of every code
-package on the server. It
-consists of @link["http://planet.racket-lang.org/"]{the central @PLaneT
-package repository}, a server that holds all PLaneT packages, and
-the PLaneT client, built into Racket, which transparently
-interacts with the server on your behalf when necessary.
-
-@table-of-contents[]
-
-@section{Using PLaneT}
-
-To use a @PLaneT package in a program, require it using the
-@racket[planet] @racket[require] form (see @(secref "require" #:doc
-'(lib "scribblings/reference/reference.scrbl")) for a full reference
-on the features of the @racket[require] statement in general and the
-exact allowed grammar of PLaneT require statements). Here we explain
-how to use PLaneT by example.
-
-@subsection[#:tag "finding-a-package"]{Finding a Package}
-
-If you are new to PLaneT, the first thing to do is visit
-@link["http://planet.racket-lang.org/"]{the PLaneT repository web site}
-and see what packages are available. People contribute new PLaneT
-packages all the time --- if you want to be notified whenever a new or
-updated package is released, you can subscribe to the
-(announcement-only) 
-@link["http://lists.racket-lang.org/planet-announce/"]{PLaneT-announce mailing list} 
-or use an RSS reader to subscribe to 
-@link["http://planet.racket-lang.org/300/planet.rss"]{PLaneT's RSS feed}.
-
-To use a package from PLaneT in your program, the easiest thing to do
-is copy the @racket[require] code snippet off of that package's page
-and paste it ino your program. For instance, to use Schematics'
-@link["http://planet.racket-lang.org/users/schematics/spgsql.plt"]{spgsql.plt}
-package (a library for interacting with the
-@link["http://www.postgresql.org/"]{PostgresQL} database), as of this
-writing you would copy and paste the line:
-
-@racketblock[(require (planet "spgsql.rkt" ("schematics" "spgsql.plt" 2 3)))]
-
-into your program. This line requires the file @filepath{spgsql.rkt} in package
-version 2.3 of the @filepath{spgsql.plt} package written by
-@filepath{schematics}. That does two things: first, it downloads and
-installs a version of @filepath{spgsql.plt} that is compatible with
-package version 2.3 from @link["http://planet.racket-lang.org/"]{the
-central PLaneT repository} if a compatible version hasn't already been
-installed. Second, it requires the module in file @filepath{spgsql.rkt}
-from that package, making all of its exported bindings available for use.
-
-Unlike with most package-distribution systems, package downloading and
-installation in PLaneT is @emph{transparent}: there's no need for
-you to do anything special the first time you want to use a package,
-and there's no need for you to even know whether or not a particular
-package is installed on your computer or the computers where your code
-will be deployed.
-
-If you want to find all of the latest versions of the
-packages that planet has available, visit
-@centered{@url{http://planet.racket-lang.org/servlets/pkg-info.ss}}
-It returns a list matching the contract
-@racketblock[(listof (list/c string? 
-                             string?
-                             (list/c exact-positive-integer?
-                                     exact-nonnegative-integer?)))]
-Each sublist represents
-the latest version of one of the packages and contains the
-userid, the package name (including ".plt"), and
-the version (major and minor numbers).
-
-@subsection{Shorthand Syntax}
-
-The code snippet above can also be written using a new shorter syntax:
-
-@racketblock[(require (planet schematics/spgsql:2:3/spgsql))]
-
-The two forms behave identically. In the abbreviated syntax, however,
-it is illegal to write the trailing @filepath{.rkt} suffix on the file
-name to be required or the trailing @filepath{.plt} on the package file
-name. (They are mandatory for the long-form syntax.) It is also legal
-in the abbreviated syntax to omit a filename to be required entirely;
-in that case, PLaneT requires the file @filepath{main.rkt} in the given
-package.
-
-@subsection{Networking troubles}
-
-Sometimes, when PLaneT tries to download and install a
-package for the first time, your operating system may block
-it from access to the network. If you are uncomfortable
-giving DrRacket free access to the network (or if your
-attempts to do so do not seem to work), then you can use
-your browser to manually install a planet package.
-
-To see how this works, lets assume you want to install the PLAI package
-and @racketblock[(require (planet plai/plai:1))] is not working for you.
-@itemize[
-@item{First, 
-fire up a command-line window and use @tt{raco planet url} to 
-determine the url for downloading the package. 
-To find the url for version @tt{(1 1)} of the plai package,
-do this:
-
-@tt{% raco planet url plai plai.plt 1 1}
-
-and get this as a response:
-
-@tt{http://planet.racket-lang.org/servlets/planet-servlet.rkt?lang=%224.1.5.3%22&name=%22plai.plt%22&maj=1&min-lo=1&min-hi=%23f&path=%28%22plai%22%29}}
-
-@item{Copy and paste that url into your browser, which
-should trigger the dowload of a file called
-@tt{plai.plt}. Note that your browser will probably try to
-call the file something else. Rename it to @tt{plai.plt}.}
-
-@item{Now run the command-line tool one more time to install the plt file:
-
-@tt{% raco planet fileinject plai plai.plt 1 1}
-
-This command should be run from the same directory where you saved @tt{plai.plt}.
-
-This command may fail, since version @tt{(1 1)} of the PLAI
-package depends on @tt{cce/scheme:4:1}. If it does, simply
-repeat the above steps for that package first, and then
-continue with the @tt{fileinject} command for PLAI.}
-
-@item{Finally, to check that the installation is successful,
-run @tt{raco planet show}. You should see output like this
-(possibly with slightly different version numbers, if the
-packages have been updated since this was written):
-@verbatim{
-Normally-installed packages:
-  cce   scheme.plt      4 1
-  plai  plai.plt        1 1
-}}
-]
-
-Once that is complete, PLaneT will use that version of the
-package for any subsequent @racket[require]s and won't try
-to use the network.
-
-If you wish to ensure that PLaneT won't use the network even if your
-operating system allows it, you can use the @racket[download?]
-parameter of the @racketmodname[planet/resolver] module to control
-whether it attempts to download files. Similarly, you can use the
-@racket[install?] parameter to prevent installation. Finally, you can
-block access at the operating system level to the path returned by
-@racket[(PLANET-BASE-DIR)] to control which operating system users can
-install PLaneT packages.
-
-@subsection{Fine-Grained Control Over Package Imports}
-
-The PLaneT client is designed to balance two competing goals:
-transparent upgradability and control over the effect of a package
-requirement. To that end, the most basic PLaneT require form offers
-maximum upgradability, but several more specialized forms allow
-finer-grained control over what versions of the named package may be
-downloaded.
-
-@margin-note{Package versions should not be confused with program or library
-versions; a @italic{package version} is a PLaneT-specific version
-number that encodes backwards-compatibility information.}
-
-The most basic planet require line, which is what is used in the form
-
-@racketblock[(require (planet "spgsql.rkt" ("schematics" "spgsql.plt" 2 3)))]
-
-in longhand notation, or 
-
-@racketblock[(require (planet schematics/spgsql:2:3/spgsql))]
-
-in shorthand notation, should be read ``Require from PLaneT
-@italic{any} release of Schematics' @filepath{spgsql.plt} package that
-is backwards-compatible with package version 2.3.'' (The actual
-package version used is determined by @seclink["search-order"]{the
-PLaneT search order}.) To signal this explicitly, it is possible to
-write
-
-@racketblock[(require (planet "spgsql.rkt" ("schematics" "spgsql.plt" 2 (+ 3))))]
-
-or
-
-@racketblock[(require (planet schematics/spgsql:2:>=3/spgsql))]
-
-both of which mean the same thing as the first pair of require lines.
-
-@margin-note{See @secref{backwards-compatibility} for a more detailed discussion of
-backwards-compatibility obligations for PLaneT packages.}
-The notion of ``backwards-compatibility'' has a specific meaning in
-PLaneT: by definition, for the purposes of automation, a package is
-considered to be backwards-compatible with any other package of the
-same owner, name, and major version, and any @italic{lower} minor
-version. Package maintainers are responsible for marking new releases
-that break backwards-compatibility by incrementing their major-version
-number. This means that all of the above require specifications will
-match any release of @filepath{unlib.plt} with major package version 3
-(and any minor version), but will @italic{never} match releases of
-@filepath{unlib.plt} with higher (or lower) major version numbers.
-
-Of course a package author may make a mistake and introduced a
-backwards-incompatibility unintentionally, or may fix a bug that code
-in third-party libraries was already working around. In those cases,
-it may help to make use of the ``upper bound'' form of the planet
-require, in longhand form:
-
-@racketblock[(require (planet "reduction-semantics.rkt" 
-                              ("robby" "redex.plt" 4 (- 3))))]
-
-and using shorthand notation:
-
-@racketblock[(require (planet robby/redex:4:<=3/reduction-semantics))]
-
-In this require line, any version of the package @filepath{redex.plt}
-from package version 4.0 to package version 4.3 will match the require
-spec (though as with any PLaneT require specification,
-@seclink["search-order"]{the PLaneT package search order} determines
-which package is actually loaded).
-
-It is also possible to specify both an upper and a lower bound, using
-the planet require's ``range'' form:
-
-@racketblock[(require (planet "test.rkt" ("schematics" "schemeunit.plt" 2 (9 10))))]
-
-or
-
-@racketblock[(require (planet schematics/schemeunit:2:9-10/test))]
-
-This form matches any package in the specified range (inclusive on
-both ends), in this example the specifications match either package
-version 2.9 or 2.10 of the @filepath{schemeunit.plt} package, but do
-not match version with higher or lower minor version numbers (or any
-other major version number).
-
-Using the range form, it is possible to require a specific version of
-a package as a special case (choosing the upper and lower bounds to be
-equal), but this is a common enough case that it has special support
-with the ``exact-match'' form:
-
-@racketblock[(require (planet "unzip.rkt" ("dherman" "zip.plt" 2 (= 1))))]
-
-or
-
-@racketblock[(require (planet dherman/zip:2:=1/unzip))]
-
-match only the exact package version 2.1 of the @filepath{zip.plt} package.
-
-@;@subsection{Linkage}
-
-@;@subsection{The Diamond Property}
-
-@subsection{Monitoring PLaneT's progress}
-
-PLaneT logs information about what it is doing to the @tt{info}
-log (via @racket[log-info]). 
-In DrRacket, you can view the logs from the @onscreen{Show Log}
-menu item in the @onscreen{View} menu, and Racket's logging output
-can be controlled via command-line options and via environment
-variables. See 
-@secref["logging" #:doc '(lib "scribblings/reference/reference.scrbl")] 
-for more details.
-
-@section[#:tag "search-order"]{The PLaneT Search Order}
-
-PLaneT has four strategies it uses in order to match a request with an
-appropriate package that.
-
-@subsection{Previous Linkage}
-
-Whenever a file requires a package via PLaneT and that requirement is
-satisfied, the system makes a note of exactly which package satisfied
-that requirement and from then on always uses that exact same package,
-even if a newer version is available. This is done to prevent "magic
-upgrades" in which a program stops working after installation because
-an unrelated package was installed. Such connections are called links
-and are stored in a user-specific table called the linkage table.
-
-@subsection{Acceptable Local Package}
-
-If the PLaneT client doesn't have any previous linkage information, it
-checks its list of already-installed PLaneT packages for one that
-meets the requirement, and uses it if available. Both PLaneT-installed
-packages and packages established through a development link 
-(see @secref{devlinks})
-are checked simultaneously at this stage.
-
-@subsection{Acceptable Remote Package}
-
-If there is no acceptable local package, the PLaneT client sends 
-a request to the PLaneT server for a new package that would satisfy
-the requirement. The server then finds the newest matching package
-and sends it back to the client, which then installs it and uses
-it to satisfy the original requirement.
-
-@subsection{Cached Installation Archive}
-
-If the remote server cannot be contacted (or fails in any way to
-deliver an acceptable package), the PLaneT client consults the 
-uninstalled-packages cache, a cache of all previously-downloaded
-packages, even those that are not currently installed. Racket
-users who frequently upgrade their installations may have many 
-packages downloaded but not installed at any given time; this step 
-is intended to ensure that these users can still run programs even
-if they temporarily lose network connection.
-
-@section[#:tag "cmdline"]{The @exec{raco planet} Command-Line Tool}
-
-The @exec{raco planet} command-line tool allows a command-line interface to
-the most commonly-performed PLaneT tasks. It is invoked from the
-command line as
-
-@commandline{raco planet @italic{subcommand} @italic{arg} ...}
-
-where @italic{subcommand} is a subcommand from the following list, and
-@exec{@italic{arg}} is a sequence of arguments determined by that subcommand:
-
-@(define (cmd name desc)
-    @item{@(seclink name (exec name)): @desc})
-
-@itemize[
-  @cmd["create"]{create a PLaneT archive from a directory}
-  @cmd["install"]{download and install a given package}
-  @cmd["remove"]{remove the specified package from the local cache}
-  @cmd["show"]{list the packages installed in the local cache}
-  @cmd["clearlinks"]{clear the linkage table, allowing upgrades}
-  @cmd["fileinject"]{install a local file to the planet cache}
-  @cmd["link"]{create a development link}
-  @cmd["unlink"]{remove development link associated with the given package}
-  @cmd["fetch"]{download a package file without installing it}
-  @cmd["url"]{get a URL for the given package}
-  @cmd["open"]{unpack the contents of the given package}
-  @cmd["structure"]{display the structure of a given .plt archive}
-  @cmd["print"]{display a file within of the given .plt archive}]
-
-Each of these commands is described in more detail below. All the
-functionality of the command-line tool is also provided with a programmatic interface by 
-@seclink["util.rkt"]{the @filepath{util.rkt} library}.
-
-@subsection[#:tag "create"]{@exec{create}}
-
-Usage:
-@commandline{raco planet create [ <option> ... ] <path>}
-Create a PLaneT archive in the current directory whose contents are the
-directory @exec{<path>}.
-
-@exec{<option>} is one of:
-@itemize[
-  @item{@exec{-f, --force}: force a package to be created even if its info.rkt file contains
-    errors.}]
-
-@subsection[#:tag "install"]{@exec{install}}
-
-Usage:
-@commandline{raco planet install <owner> <pkg> <maj> <min>}
-Download and install the package that @racket[(require (planet "file.rkt" (<owner> <pkg> <maj> <min>)))]
-would install.
-
-@subsection[#:tag "remove"]{@exec{remove}}
-
-Usage:
-@commandline{raco planet remove [ <option> ... ] <owner> <pkg> <maj> <min>}
-Remove the specified package from the local cache, optionally also removing its
-distribution file.
-
-@exec{<option>} is one of:
-@itemize[
-	@item{@exec{-e, --erase}: also remove the package's distribution file from the
-    uninstalled-package cache}]
-
-@subsection[#:tag "show"]{@exec{show}}
-
-Usage:
-@commandline{raco planet show [ <option> ... ]}
-List the packages installed in the local cache.
-
-@exec{<option>} is one of:
-@itemize[
-  @item{@exec{-p, --packages}: show packages only (default)}
-  @item{@exec{-l, --linkage}: show linkage table only}
-  @item{@exec{-a, --all}: show packages and linkage}]
-
-@subsection[#:tag "clearlinks"]{@exec{clearlinks}}
-
-Usage:
-@commandline{raco planet clearlinks}
-Clear the linkage table, allowing upgrades.
-
-@subsection[#:tag "fileinject"]{@exec{fileinject}}
-
-Usage:
-@commandline{raco planet fileinject <owner> <plt-file> <maj> <min>}
-Install local file <plt-file> into the planet cache as though it had been
-downloaded from the planet server.  It is treated as though it had the given owner name as its owner name, 
-the given file's filename as the its package name, and the given major and minor version numbers.
-
-@subsection[#:tag "link"]{@exec{link}}
-
-Usage:
-@commandline{raco planet link  <owner> <pkg> <maj> <min> <path>}
-Create a development link (see @secref{devlinks}) between the given
-package specifier and the specified directory name.
-
-@subsection[#:tag "unlink"]{@exec{unlink}}
-
-Usage:
-@commandline{raco planet unlink [ <option> ] <owner> <pkg> <maj> <min>}
-Remove any development link (see @secref{devlinks}) associated with
-the given package.
-
-@exec{<option>} can only be:
-@itemize[@item{@exec{-q, --quiet}: don't signal an error on nonexistent links}]
-
-@subsection[#:tag "fetch"]{@exec{fetch}}
-
-Usage:
-@commandline{raco planet fetch <owner> <pkg> <maj> <min>}
-Download the given package file from the central PLaneT repository without installing it.
-
-@subsection[#:tag "url"]{@exec{url}}
-
-Usage:
-@commandline{raco planet url <owner> <pkg> <maj> <min>}
-Get a URL for the given package.
-
-This is never necessary for normal use of planet, but may be helpful in some
-circumstances for retrieving packages.
-
-@subsection[#:tag "open"]{@exec{open}}
-
-Usage:
-@commandline{raco planet open <plt-file> <target>}
-Unpack the contents of the given package into the given directory without
-installing.
-
-This command is not necessary for normal use of planet. It is intended to allow
-you to inspect package contents offline without needing to install the package.
-
-@subsection[#:tag "structure"]{@exec{structure}}
-
-Usage:
-@commandline{raco planet structure <plt-file>}
-Print the structure of the PLaneT archive named by <plt-file> to the standard
-output port.
-
-This command does not unpack or install the named .plt file.
-
-@subsection[#:tag "print"]{@exec{print}}
-
-Usage:
-@commandline{raco planet print <plt-file> <path>}
-
-Print the contents of the file named by <path>, which must be a relative path
-within the PLaneT archive named by <plt-file>, to the standard output port.
-
-This command does not unpack or install the named .plt file.
-
-@section[#:tag "hash-lang-planet"]{The @racketmodname[planet] Language}
-
-@defmodulelang[planet]
-
-When used with @hash-lang[], @racketmodname[planet] must be followed
-by a short-form PLaneT path. The path is used in the same way that
-@hash-lang[] uses plain identifiers: @racketidfont{/lang/reader} is
-added to the given path to determine a module that supplies a module
-reader.
-
-The @racketmodname[planet] module (as opposed to the reader used with
-@hash-lang[]) implements the @exec{raco planet} command-line tool.
-
-@include-section["private/util.scrbl"]
-
-@section{Developing Packages for PLaneT}
-
-To put a package on PLaneT, or release an upgrade to an
-already-existing package:
-
-@subsection{Write Your Package}
-
-PLaneT can distribute whatever programs you write, but keep
-these guidelines in mind as you write:
-@itemize[
-  @item{Organize your code into modules. Since the PLaneT client is
-integrated into the @racket[require] form, it works best if your code
-is arranged into modules.}
-  @item{When one module in your program depends on another, it is best 
-to require it using the relative-file-name form rather than the
-planet require form. For instance, if your program contains files
-primary.rkt and helper.rkt where primary.rkt requires helper, use the form
-
-@racket[(require "helper.rkt")]
-
-instead of
-
-@racket[(require (planet "helper.rkt" ("username" "packagename.plt" 1 0)))]
-
-in files that will also be a part of the package.}]
-
-@subsubsection[#:tag "devlinks"]{Development Links}
-
-To aid development, PLaneT allows users to establish direct
-associations between a particular planet package
-with an arbitrary directory on the filesystem, for instance connecting the package named by the require line
-
-@racket[(require (planet "file.rkt" ("my" "mypackage.plt" 1 0)))]
-
-to the directory @filepath{/home/myname/svn/mypackages/devel/}.
-
-These associations are intended to allow developers to use their own
-directory structures, version control systems, and so on while still
-being able to use the packages they create as though they were
-distributed directly by PLaneT. Development links are local to a
-particular user and repository (but not to a particular Racket minor
-revision).
-
-To establish a development link, use the @exec{raco planet} command-line tool:
-
-@commandline{raco planet link myname mypackage.plt 1 0 ~/svn/mypackages/devel}
-
-Once you are finished developing a package, you should remove any
-development links you have established for it, again using the planet
-command-line tool:
-
-@commandline{raco planet unlink myname mypackage.plt 1 0}
-
-You may alternately use the functions @racket[add-hard-link] and @racket[remove-hard-link].
-
-@subsection{Prepare Your Distribution}
-
-@subsubsection{Arrange Files Into a Directory}
-
-Make sure that all source files, documentation, etc. that you want to
-be a part of the package are in a single directory and its
-subdirectories. Furthermore make sure that nothing else, @italic{e.g.}
-unneeded backup files, is in that directory (with the exception that
-the meta-subdirectories and files Git/Subversion/CVS uses are
-automatically skipped by the packaging tool).
-
-@subsubsection{Create Documentation [Optional]}
-
-Use Scribble to write documentation for your package. See
-@secref["scribble.rkt"] for macros that ensure proper bindings and version
-numbers in documentation for @|PLaneT| packages, and
-@other-manual['(lib "scribblings/scribble/scribble.scrbl")]
-for instructions on how to write Scribble documentation.
-
-When testing your documentation, set up a development link and  use 
-@centered{@tt{raco setup -P <owner> <package-name> <maj> <min>}}
-with arguments based on the development link to build and 
-test your documentation.
-
-@italic{Note:} Always use @racket[this-package-in] in @racket[for-label]
-bindings when documenting @|PLaneT| packages, and always use the bindings in
-@racketmodname[planet/scribble] rather than @racketmodname[scribble/manual].
-These macros automatically produce @racket[planet]-based module paths with
-appropriate version numbers.  Other @racket[require] subforms and Scribble
-declarations may refer to the wrong version of a package, or may not be
-recognized as part of a @|PLaneT| package at all when documentation is produced.
-
-@subsubsection{Create an @filepath{info.rkt} File [Optional]}
-
-If you put a file named @filepath{info.rkt} in your package's root directory, the
-PLaneT system (as well as the rest of the Racket tool suite) will
-look in it for descriptive metadata about your package. The PLaneT
-system looks for certain names in that file:
-
-@itemize[
-
-@item{The @indexed-racket['blurb] field: If present, the blurb field
-should contain a list of XHTML fragments encoded as x-expressions (see
-the xml collection for details) that PLaneT will use as a short
-description of your project.}
-
-@item{The @indexed-racket['release-notes] field: If present, the
-release-notes field should contain a list of XHTML fragments encoded
-as x-expressions (see the xml collection for details) that PLaneT will
-use as a short description of what's new in this release of your
-package.}
-
-@item{The @indexed-racket['categories] field: If present, the categories
-field should be a list of symbols corresponding to the categories
-under which this package should be listed.
-
-The valid categories are:
-
-@itemize[
-  @item{@indexed-racket['devtools]:         Development Tools}
-  @item{@indexed-racket['net]:              Networking and Protocols}
-  @item{@indexed-racket['media]:            Graphics and Audio}
-  @item{@indexed-racket['xml]:              XML-Related}
-  @item{@indexed-racket['datastructures]:   Data Structures and Algorithms}
-  @item{@indexed-racket['io]:               Input/Output and Filesystem}
-  @item{@indexed-racket['scientific]:       Mathematical and Scientific}
-  @item{@indexed-racket['system]:           Hardware/Operating System-Specific Tools}
-  @item{@indexed-racket['ui]:               Textual and Graphical User Interface}
-  @item{@indexed-racket['metaprogramming]:  Metaprogramming Tools}
-  @item{@indexed-racket['planet]:           PLaneT-Related}
-  @item{@indexed-racket['misc]:             Miscellaneous}]
-
-If you put symbols other than these the categories field, they will be
-ignored. If you put no legal symbols in the categories field or do not
-include this field in your info.rkt file, your package will be
-categorized as "Miscellaneous."}
-
-@item{The @indexed-racket['can-be-loaded-with] field:
-If present, the can-be-loaded-with field should be a quoted datum of
-one of the following forms:
-
-@BNF[(list @racket[can-be-loaded-with]
-           @racket['all]
-           @racket['none]
-           @racket[(list 'all-except 'VER-SPEC ...)]
-           @racket[(list 'only 'VER-SPEC ...)])
-     (list @racket[VER-SPEC]
-           @racket[Nat] 
-           @racket[(Nat MINOR)])
-     (list @racket[MINOR]
-           @racket[Nat]
-           @racket[(Nat Nat)]
-           @racket[(= Nat)]
-           @racket[(+ Nat)]
-           @racket[(- Nat)])] 
-
-where @racket[VER-SPEC] is a PLaneT package version specification
-in a manner like using @racket[planet] in @racket[require].
-
-Depending on your package's behavior, it may or may not be okay for
-multiple versions of the same package to be loaded at one time on the
-entire system --- for instance, if your package relies on writing to a
-particular file and assumes that nothing else writes to that same
-file, then multiple versions of the same package being loaded
-simultaneously may be a problem. This field allows you to specify
-whether your package can be loaded simultaneously with older versions
-of itself. If its value is @indexed-racket['all], then the package may be
-loaded with any older version. If it is @indexed-racket['none], then it
-may not be loaded with older versions at all. If it is @racket[(list
-'all-except VER-SPEC ...)] then any package except those that match
-one of the given @racket[VER-SPEC] forms may be loaded with this package; if it
-is @racket[(list 'only VER-SPEC ...)]  then only packages that match
-one of the given @racket[VER-SPEC] forms may be loaded with this package.
-
-When checking to see if a package may be loaded, PLaneT compares it to
-all other currently-loaded instances of the same package with any
-version: for each comparison, it checks to see if the newer package's
-can-be-loaded-with field allows the older package to be loaded. If all
-such comparisons succeed then the new package may be loaded; otherwise
-PLaneT signals an error.
-
-The default for this field is @indexed-racket['none] as a conservative
-protection measure. For many packages it is safe to set this field to
-@indexed-racket['all].}
-
-@item{The @indexed-racket['homepage] field:
-If present, the URL field should be a string corresponding to a URL
-for the package. PLaneT provides this link with the description of your
-package on the main PLaneT web page.}
-
-@item{The @indexed-racket['primary-file] field:
-If present, the primary-file field should be a either a string
-corresponding to the name (without path) of the main Racket source
-file of your package, or a list of such strings. The PLaneT web page
-corresponding to this package will present all files listed here as
-interface files for your package; it will give direct links to each
-package and a listing of all names provided by the package along with
-their contracts (if present).
-
-If you include only a single string, it will be used as the require
-line printed on your package's page. If you include a list of strings,
-then the first legal file string in the list will be used.}
-
-@item{The @indexed-racket['required-core-version] field: If present, the
-required-core-version field should be a string with the same syntax as
-the output of the @racket[version] function. Defining this field
-indicates that PLaneT should only allow users of a version of Racket
-equal to or more recent than the version specified by this field. This
-allows you finer-grained control of your package's core-language
-requirements than its inclusion in a particular repository; for
-instance, setting this field to @racket["5.1.3"] would cause the PLaneT server
-not to serve it to Racket v5.1.2 or older clients.}
-
-@item{The @indexed-racket['version] field:
-If present, the version field should be a string that describes the 
-version number of this code that should be presented to users (e.g., 
-@racket["0.15 alpha"]). This field does not override or in any way interact 
-with your package's package version number, which is assigned by 
-PLaneT, but may be useful to users.}
-
-@item{The @indexed-racket['repositories] field: If present, the repositories
-field should be a list consisting of some subset of the strings
-@racket["4.x"] and @racket["3xx"]. The string @racket["4.x"] indicates
-that this package should be included in the v4.x repository (which
-contains packages that are intended to run in Racket and PLT Scheme versions at
-or above version 4.0, including the 5.0 series), and the string @racket["3xx"] indicates that
-the package should be included in the v3xx repository (containing
-packages intended to run in PLT Scheme versions in the 3xx series). A
-single package (and a single version of a package) may be included in
-multiple repositories with the same PLaneT version number.}]
-
-In addition, PLaneT uses the setup-plt installer to install packages
-on client machines, so most fields it looks for can be included with
-their usual effects. In particular, adding a @indexed-racket['name]
-field indicates that the Racket files in the package should be
-compiled during installation; it is a good idea to add it.
-
-An example info.rkt file looks like this:
-
-@racketmod[
-info
-(define name "My Application")
-(define blurb
-  '("My application runs 60% faster on 20% less peanut "
-    "butter. It even shows a fancy graphic!"))
-(define primary-file "my-app.rkt")
-(define categories '(system xml))
-]
-
-See @secref[#:doc '(lib "scribblings/raco/raco.scrbl") "info.rkt"]
-for more information on @filepath{info.rkt} files.
-
-@subsection{Build a Distribution Archive}
-
-@itemlist[#:style 
-          'ordered
-          @item{So that the next step can find @racket[for-label] documentation
-                in your own package, first set up a development link
-                (if it is not already set), using 
-                @commandline{raco planet link <owner> pkg.plt> <maj> <min> <path-to-files>}
-                This step is not necessary if your package has no documentation.}
-          @item{Use the planet command-line tool in its archive-creation mode to
-                create a planet archive:
-
-                @commandline{raco planet create /home/jacobm/my-app/}
-
-                This will create a planet archive named @filepath{my-app.plt} in the current
-                directory whose contents are the contents of @filepath{/home/jacobm/my-app} and
-                all its subdirectories. 
-
-                Alternately, you can run @racket[make-planet-archive] with the name of the directory
-                you've prepared as its argument:
-                
-                @racket[(make-planet-archive "/home/jacobm/my-app/")]
-
-                This function will build a packaged version of your directory and
-                return the path to that package. The path will always be a file named
-                @filepath{X.plt}, where @filepath{X} is the name of the directory you
-                gave to @racket[make-planet-archive], located in that same directory.}
-          @item{Remove the development link from the first step (assuming you added one) using
-                @commandline{raco planet unlink <owner> <packagename.plt> <maj> <min>}}
-          @item{Now test that your archive file works as intended using the
-                planet command-line tool in its install mode:
-                @commandline{raco planet fileinject <owner> <path to .plt file> <maj> <min>}
-                installs the specified file into your local PLaneT cache as
-                though it had been downloaded from the PLaneT server with the given
-                owner name and major and minor versions. After you run this command,
-                you can require your package on your local machine using
-
-                @racket[(require (planet <file> (<owner> <.plt file name> <maj> <min>)))]
-
-                to verify everything works.}
-          
-          @item{Finally, use
-                @commandline{raco planet remove <owner> <.plt file name> <maj> <min>}
-                to remove the test package from your local cache. (Not removing it is
-                safe as long as you use the same name and version numbers the package
-                will have on the PLaneT server; otherwise you may experience
-                problems.)}]
-
-@subsection[#:tag "backwards-compatibility"]{Determine Your Package's Backwards-Compatibility}
-
-If you are updating a previously-released package, you must decide
-whether your package is a backwards-compatible change or not. A rule
-of thumb is to remember that modules written to work with the
-previously-released version of your package should unmodified with the
-new package. This means that at a minimum, a backwards compatible
-update should:
-@itemize[
-@item{Contain all the same Racket source files in that the previous
-version contained in directories intended for public access}
-@item{In each public file, provide at least all the bindings that the
-previous version provided}
-@item{For each name provided with a contract (see @(secref #:doc '(lib
-"scribblings/guide/guide.scrbl") "contracts" )), provide it
-with a contract that is at least as permissive as the previous
-contract}]
-A backwards-compatible upgrade may, however:
-@itemize[
-@item{Change any behavior that
-reasonable consumers of your package would not consider guaranteed
-(@italic{e.g.}, by fixing bugs or improving the efficiency of
-operations).}
-@item{Remove files in clearly-marked private
-sections. By convention, the contents of any directory called
-@filepath{private} are considered private and should not be relied
-upon by external users of your package.}
-@item{Extend the set of names exported by a module.}]
-Currently these rules are guidelines only, but in the future some or
-all of them may be enforced programmatically. Ultimately, though, no
-technical device can precisely capture what it means for a package to
-be backwards-compatible with a previous version, so you should use your
-best judgment.
-
-@subsection{Submit Your Package}
-
-Go to @link["http://planet.racket-lang.org/"]{the central PLaneT
-package repository web page} and click on the link marked "contribute
-a package / log in" in the upper-right-hand corner. If you have not
-yet created an account, then do so on that page by providing your
-name, a user name, an email address, and a password and then
-responding to the confirmation message delivered to the email address
-you provide.
-
-Once you have an account, then if this is a new package then upload it
-using the "Contribute a package" section in your user account page. If
-this is a package update then click "update this package" next to its
-name in the "Manage your packages" section of your user account page,
-then upload the .plt file and indicate on the form whether your update
-is backwards-compatible with the prior version or not.
diff --git a/pkgs/planet-pkgs/planet-doc/planet/private/util.scrbl b/pkgs/planet-pkgs/planet-doc/planet/private/util.scrbl
deleted file mode 100644
index 276f6c3c29..0000000000
--- a/pkgs/planet-pkgs/planet-doc/planet/private/util.scrbl
+++ /dev/null
@@ -1,719 +0,0 @@
-#lang scribble/manual
-
-@(require
-  (for-label
-   racket/base
-   scribble/manual
-   planet/resolver
-   planet/config
-   planet/util
-   planet/version
-   planet/syntax
-   planet/scribble
-   setup/dirs))
-
-@title{Utility Libraries}
-
-The planet collection provides configuration and utilities for using @|PLaneT|. 
-
-@section{Resolver}
-
-@defmodule[planet/resolver]
-
-The primary purpose of this library to for @racket[require] to find
-@PLaneT packages. It also, however, provides some utilities for manipulating
-the resolvers behavior.
-
-@defproc*[(((planet-module-name-resolver [r-m-p resolved-module-path?])
-            void?)
-           ((planet-module-name-resolver [spec (or/c module-path? path?)]
-                                         [module-path (or/c #f resolved-module-path?)]
-                                         [stx (or/c #f syntax?)]
-                                         [load boolean?]
-                                         [orig-paramz parameterization?])
-           resolved-module-path?))]{
-  This implements the @|PLaneT| module resolution process. It is @racket[dynamic-require]d
-  by racket when the first @|PLaneT| module require is needed. It acts much like a 
-  @racket[current-module-name-resolver] would, but racket provides it with a special
-  @racket[parameterization?] (giving it special privileges) that it uses when installing new packages.
-}
-
-@defproc[(get-planet-module-path/pkg [spec (or/c module-path? path?)]
-                                     [module-path (or/c #f resolved-module-path?)]
-                                     [stx (or/c #f syntax?)])
-         (values path? pkg?)]{
-  Returns the path corresponding to the package (interpreting the arguments
-  the same way as @racket[planet-module-name-resolver] and @racket[(current-module-name-resolver)]).
-}
-
-@defproc[(resolve-planet-path [planet-path any/c]) path?]{
-Returns the file system path to the file specified by the given quoted 
-@|PLaneT| require specification. This function downloads and installs the
-specified package if necessary, but does not verify that the actual
-file within it actually exists.
-
-If the @|PLaneT| package is not actually installed, then this function expects
-to be called with a very powerful security guard, one that is available to
-the built-in module name resolver, but not generally available to user code.
-So probably this function will fail (possibly deadlock).
-
-This is the same function as the one with the same name,
-exported by @racketmodname[planet/util].
-}
-
-@defparam[download? dl? boolean?]{
-  A parameter that controls if @PLaneT attempts to download a package that isn't already present.
-  If the package isn't present, the resolver will raise the @racket[exn:fail:planet?] exception
-  instead of downloading it.
-}
-
-@defparam[install? inst? boolean?]{
-  A parameter that controls if @PLaneT attempts to install a package that isn't already installed.
-  If the package isn't installed, the resolver will raise the @racket[exn:fail:planet?] exception
-  instead of installing it.
-}
-
-@subsection{Resolver file locking}
-
-When @|PLaneT| is asked to resolve a module path for loading the file
-(e.g., when the last argument to the @racket[(current-module-name-resolver)]
-is @racket[#t] and that resolver triggers a call to the @|PLaneT| resolver),
-it finds the directory
-where the files are installed, say in this directory, which
-corresponds to version 1.2 of dyoo's closure-compile.plt package:
-
-@centered{@filepath{@racket[(CACHE-DIR)]/dyoo/closure-compile.plt/1/2/}}
-
-If the file
-
-@centered{@filepath{@racket[(CACHE-DIR)]/dyoo/closure-compile.plt/1/2.SUCCESS}}
-
-is there, it assumes that there is no installation needed and it just
-continues, using the path to the file inside that directory.
-
-If the @filepath{2.SUCCESS} file is not there, then it attempts to grab an
-@racket['exclusive] filesystem lock on this file (via @racket[port-try-file-lock?])
-
-@centered{@filepath{@racket[(CACHE-DIR)]/dyoo/closure-compile.plt/1/2.LOCK}}
-
-If it gets the lock, it then proceeds with the installation, calling
-raco setup to do the unpacking, compilation, and docs building.
-After the unpacking has finished, but before beginning compilation and docs
-building, it creates the @filepath{2.UNPACKED} file:
-
-@centered{@filepath{@racket[(CACHE-DIR)]/dyoo/closure-compile.plt/1/2.UNPACKED}}
-
-When compilation and docs build are complete, it creates the @filepath{2.SUCCESS} file:
-
-@centered{@filepath{@racket[(CACHE-DIR)]/dyoo/closure-compile.plt/1/2.SUCCESS}}
-
-and releases the lock on the @filepath{2.LOCK} file.
-
-If it fails to get the lock on @filepath{2.LOCK} and it does not already hold the 
-lock (due to a re-entrant call to the resolver (the resolver knows about locks it 
-holds via an internal parameter that gets created when the @racketmodname[planet/resolver]
-module is instantiated) then it goes into a loop that polls for
-the existence of the @filepath{2.SUCCESS} file; when it that file appears, it
-just continues, without installing anything (since that means someone
-else installed it).
-
-In some situations (e.g., when a new namespace is created and a fresh instantiation of
-@racketmodname[planet/resolver] is created), @|PLaneT| can be fooled into thinking that it
-does not hold the lock on some installation. In order to cope with these situations somewhat,
-@|PLaneT| takes an easier path when the resolver is only looking for information about
-package files (i.e., when the last argument to the resolver is @racket[#f], or when
-@racket[get-planet-module-path/pkg] is called directly (as opposed to being called
-via module resolution). In those cases, @|PLaneT| will look only for the 
-@filepath{2.UNPACKED} file instead of the @filepath{2.SUCCESS} file.
-
-@section{Client Configuration}
-
-@defmodule[planet/config]
-
-The @racketmodname[planet/config] library provides several parameters
-useful for configuring how PLaneT works.
-
-Note that while these parameters can be useful to modify
-programmatically, PLaneT code runs at module-expansion time, so
-most user programs cannot set them until PLaneT has already
-run. Therefore, to meaningfully change these settings, it is best to
-manually edit the @filepath{config.rkt} file.
-
-@defparam[PLANET-BASE-DIR dir path-string?]{
-  The root of the tree where planet stores all of its files. Defaults to
-  @racketblock[(let ([plt-planet-dir-env-var (getenv "PLTPLANETDIR")])
-                 (if plt-planet-dir-env-var
-                     (string->path plt-planet-dir-env-var)
-                     (build-path (find-system-path 'addon-dir)
-                                 "planet"
-                                 (PLANET-CODE-VERSION))))]
-}
-
-@defparam[PLANET-DIR dir path-string?]{
-The root of the version-specific PLaneT files. 
-Defaults to @racket[(build-path (PLANET-BASE-DIR) (get-installation-name))].
-}
-
-@defparam[CACHE-DIR dir path-string?]{
-The root of the PLaneT client's cache directory.}
-
-@defparam[UNINSTALLED-PACKAGE-CACHE dir path-string?]{
-The root of the PLaneT client's uninstalled-packages cache. PLaneT
-stores package distribution files in this directory, and searches for
-them in this directory for them if necessary. Unlike the main PLaneT
-cache, which contains compiled files and is specific to each
-particular version of Racket, the uninstalled package cache is
-shared by all versions of Racket that use the same package
-repository, and it is searched if a package is not installed in the
-primary cache and cannot be downloaded from the central PLaneT repository
-(for instance due to a loss of Internet connectivity). This behavior
-is intended to primarily benefit users who upgrade their Racket
-installations frequently.}
-
-@defparam[LINKAGE-FILE file path-string?]{
-The file to use as the first place PLaneT looks to determine how a
-particular PLaneT dependence in a file should be satisfied. The
-contents of this file are used to ensure that no "magic upgrades"
-occur after a package is installed. The default is the file @filepath{LINKAGE}
-in the root PLaneT directory.}
-
-@defparam[LOG-FILE file (or/c path-string? false?)]{
-If @racket[#f], indicates that no logging should take place. Otherwise
-specifies the file into which logging should be written. The default
-is the file @filepath{INSTALL-LOG} in the root PLaneT directory.}
-
-@defboolparam[USE-HTTP-DOWNLOADS? bool]{
-PLaneT can use two different protocols to retrieve packages. If @racket[#t],
-PLaneT will use the HTTP protocol; if @racket[#f] it will use the custom-built
-PLaneT protocol. The default value for this parameter is @racket[#t] and setting
-this parameter to @racket[#f] is not recommended.}
-
-@defparam[HTTP-DOWNLOAD-SERVLET-URL url string?]{
-The URL  for the servlet that will provide PLaneT packages if 
-@racket[USE-HTTP-DOWNLOADS?] is @racket[#t], represented as a string.  
-This defaults to the value of the @indexed-envvar{PLTPLANETURL} environment
-variable if it is set and otherwise is
-@racket["http://planet.racket-lang.org/servlets/planet-servlet.rkt"].}
-
-@defparam[PLANET-SERVER-NAME host string?]{
-The name of the PLaneT server to which the client should connect if
-@racket[USE-HTTP-DOWNLOADS?] is @racket[#f]. The default value for this parameter is
-@racket["planet.racket-lang.org"].}
-
-@defparam[PLANET-SERVER-PORT port natural-number?]{
-The port on the server the client should connect to if
-@racket[USE-HTTP-DOWNLOADS?] is @racket[#f]. The default value for this parameter is
-@racket[270].}
-
-@defparam[HARD-LINK-FILE file path?]{
-  The name of the file where hard links are saved. Defaults to
-  @racket[(build-path (PLANET-BASE-DIR) (get-installation-name) "HARD-LINKS")].
-}
-@defparam[PLANET-ARCHIVE-FILTER regexp-filter (or/c #f string? regexp?)]{
-  A regular-expression based filter that is used to skip files when building a @|PLaneT| archive.
-}
-@defparam[PLANET-CODE-VERSION vers string?]{
-  Used to compute @racket[PLANET-BASE-VERSION].
-}
-
-@defparam[DEFAULT-PACKAGE-LANGUAGE vers string?]{
-  The package language used when communicating with the server to find
-  which package to download.
-
-  Defaults to @racket[(version)].
-}
-
-@section{Package Archives}
-
-@defmodule[planet/planet-archives]
-
-@defproc[(get-all-planet-packages)
-         (listof (list/c (and/c path? absolute-path?) string? string? (listof string?) 
-                         exact-nonnegative-integer?
-                         exact-nonnegative-integer?))]{
-  Returns the installed planet package. Each element of the result list corresponds to
-  a single package. The first element in an inner list is the location of the installed files.
-  The second and third elements are the owner and package names. The last two elements
-  are the major and minor verisons
-}
-
-@defproc[(get-installed-planet-archives)
-         (listof (list/c (and/c path? absolute-path?) string? string? (listof string?) 
-                         exact-nonnegative-integer?
-                         exact-nonnegative-integer?))]{
- Like @racket[get-all-planet-archives], except that it does not return packages linked in
-      with ``raco planet link''.
-
-}
-
-@defproc[(get-hard-linked-packages)
-         (listof (list/c (and/c path? absolute-path?) string? string? (listof string?) 
-                         exact-nonnegative-integer?
-                         exact-nonnegative-integer?))]{
- Like @racket[get-all-planet-archives], except that it return only packages linked in
-      with ``raco planet link''.
-
-}
-
-@section[#:tag "util.rkt"]{Package Utils}
-
-@defmodule[planet/util]
-
-The @racketmodname[planet/util] library supports examination of the pieces of
-PLaneT. It is meant primarily to support debugging and to allow easier
-development of higher-level package-management tools. The
-functionality exposed by @seclink["cmdline"]{the @exec{raco planet} command-line tool} is
-also available programmatically through this library.
-
-@defproc[(download/install-pkg [owner string?]
-                               [pkg (and/c string? #rx"[.]plt$")]
-                               [maj natural-number/c]
-                               [min natural-number/c])
-         (or/c pkg? #f)]{
-Downloads and installs the package specifed by the given owner name,
-package name, major and minor version number. Returns false if no such
-package is available; otherwise returns a package structure for the
-installed package.
-
-The @racket[pkg] argument must end with @racket[".plt"].
-}
-
-@defproc[(install-pkg [pkg-spec pkg-spec?]
-                      [file path-string?]
-                      [maj natural-number/c]
-                      [min natural-number/c])
-         (or/c pkg-spec? #f)]{
- Installs the package represented by the arguments, using
- the @racket[pkg-spec] argument to find the path and name of
- the package to install.
- 
- See @racket[get-package-spec] to build a @racket[pkg-spec] argument.
- 
- Returns a new @racket[pkg-spec?] corresponding to the package
- that was actually installed.
-}
-
-
-@defproc[(get-package-spec [owner string?]
-                           [pkg (and/c string? #rx"[.]plt$")]
-                           [maj (or/c #f natural-number/c) #f]
-                           [min (or/c #f natural-number/c) #f])
-         pkg-spec?]{
-  Builds a @racket[pkg-spec?] corresponding to the package specified by 
-  @racket[owner], @racket[pkg], @racket[maj], and @racket[min].
-  
-  The @racket[pkg] argument must end with the string @racket[".plt"].
-}
-
-@defproc[(pkg-spec? [v any/c]) boolean?]{
-  Recognizes the result of @racket[get-package-spec] (and @racket[install-pkg]).
-}
-                   
-@defparam[current-cache-contents contents
-          (listof
-           (list/c string? 
-                   (listof 
-                    (list/c string? 
-                            (cons/c natural-number/c 
-                                    (listof natural-number/c))))))]{
-Holds a listing of all package names and versions installed in the
-local cache.}
-
-@defproc[(current-linkage)
-         (listof (list/c path-string? 
-                         (list/c string?
-                                 (list/c string?) 
-                                 natural-number/c
-                                 natural-number/c)))]{
-Returns the current linkage table.
-
-The linkage table is an association between file locations (encoded as path strings)
-and concrete planet package versions. If a require line in the associated file requests a package,
-this table is consulted to determine a particular concrete package to satisfy the request.}
-
-@defproc[(make-planet-archive [directory path-string?]
-                              [output-file (or/c path? path-string?) 
-                                           (string-append (path->string name) ".plt")]) 
-         path-string?]{
-Makes a .plt archive file suitable for PLaneT whose contents are all
-files in the given directory and returns that file's name.  If the
-optional filename argument is provided, that filename will be used as
-the output file's name.
-
-See also @racket[build-scribble-docs?] and @racket[force-package-building?]
-}
-
-@defparam[build-scribble-docs? b boolean?]{
-  Determines if @racket[make-planet-archive] builds scribble docs (or not).
-}
-
-@defparam[force-package-building? b boolean?]{
-  Determines if @racket[make-planet-archive] signals an error and refuses
-  to continue packaging for certain, more significant errors.
-  
-  Defaults to @racket[#t], and thus packaging will signal errors.
-}
-
-@defproc[(download-package [pkg-spec pkg-spec?]) 
-         (or/c (list/c #true path? natural-number/c natural-number/c)
-               string?
-               (list/c #false string?))]{
-  Downloads the package given by @racket[pkg-spec]. If the result is
-  a list whose first element is @racket[#true], then the package was
-  downloaded successfully and the rest of the elements of the list
-  indicate where it was downloaded, and the precise version number.
-  
-  The other two possible results indicate errors. If the result is
-  a list, then the server is saying that there is no matching package;
-  otherwise the error is some lower-level problem (perhaps no networking, etc.)
-}
-
-@defproc[(pkg->download-url [pkg pkg?]) url?]{
-  Returns the url for a given package.
-}
-
-@defproc[(get-package-from-cache [pkg-spec pkg-spec?]) (or/c #false path?)]{
-  Returns the location of the already downloaded package, 
-  if it exists (and @racket[#false] otherwise).
-}
-
-@defproc[(lookup-package-by-keys [owner string?]
-                                 [name string?]
-                                 [major exact-nonnegative-integer?]
-                                 [minor-lo exact-nonnegative-integer?]
-                                 [minor-hi exact-nonnegative-integer?])
-         (or/c (list/c path?
-                       string?
-                       string?
-                       (listof string?)
-                       exact-nonnegative-integer?
-                       exact-nonnegative-integer?)
-               #false)]{
-   Looks up and returns a list representation of the package named by the given owner,
-   package name, major and (range of) minor version(s).
-}
-
-@defproc[(unpack-planet-archive [plt-file (or/c path? path-string?)]
-                                [output-dir (or/c path? path-string?)])
-         any]{
-Unpacks the PLaneT archive with the given filename, placing its contents
-into the given directory (creating that path if necessary).}
-
-@defproc[(remove-pkg [owner string?]
-                     [pkg   (and/c string? #rx"[.]plt$")]
-                     [maj   natural-number/c]
-                     [min   natural-number/c])
-         any]{
-Removes the specified package from the local planet cache, deleting the installed files.
-}
-
-@defproc[(erase-pkg [owner string?]
-                    [pkg   (and/c string? #rx"[.]plt$")]
-                    [maj   natural-number/c]
-                    [min   natural-number/c])
-         any]{
-Like @racket[remove-pkg], removes the specified package from the local planet cache and deletes
-all of the files corresponding to the package, but also deletes the cached @filepath{.plt} file
-(so it will be redownloaded later).
-}
-
-@defproc[(display-plt-file-structure [plt-file (or/c path-string? path?)])
-         any]{
-Print a tree representing the file and directory structure of the
-PLaneT archive .plt file named by @racket[plt-file] to @racket[(current-output-port)].}
-
-@defproc[(display-plt-archived-file [plt-file (or/c path-string? path?)]
-                                    [file-to-print string?])
-         any]{
-Print the contents of the file named @racket[file-to-print] within the 
-PLaneT archive .plt file named by @racket[plt-file] to @racket[(current-output-port)].}
-
-@defproc[(unlink-all) any]{
-Removes the entire linkage table from the system, which will force all
-modules to relink themselves to PLaneT modules the next time they run.}
-
-@defproc[(add-hard-link [owner string?]
-                        [pkg   (and/c string? #rx"[.]plt$")]
-                        [maj   natural-number/c]
-                        [min   natural-number/c]
-                        [dir   path?])
-         any]{
-Adds a development link between the specified package and the given
-directory; once a link is established, PLaneT will treat the cache as
-having a package with the given owner, name, and version whose files
-are located in the given path. This is intended for package
-development; users only interested in using PLaneT packages
-available online should not need to create any development links.
-
-If the specified package already has a development link, this function
-first removes the old link and then adds the new one.
-
-The @racket[pkg] argument must end with the string @racket[".plt"].
-}
-
-@defproc[(remove-hard-link [owner string?]
-                           [pkg   (and/c string? #rx"[.]plt$")]
-                           [maj   natural-number/c]
-                           [min   natural-number/c]
-                           [#:quiet? quiet? boolean? #false])
-         any]{
-Removes any hard link that may be associated with the given package.
-
-The @racket[pkg] argument must end with the string @racket[".plt"].
-The @racket[maj] and @racket[min] arguments must be integers. This
-procedure signals an error if no such link exists, unless
-@racket[#:quiet?] is @racket[#true].
-}
-
-@defproc[(resolve-planet-path [spec quoted-planet-require-spec?])
-         path?]{
-This is the same function as the one with the same name,
-exported by @racketmodname[planet/resolver].
-}
-
-@defproc[(path->package-version [p path?])
-         (or/c (list/c string? string? natural-number/c natural-number/c) #f)]{
-
-Given a path that corresponds to a PLaneT package (or some part of one),
-produces a list corresponding to its name and version, exactly like
-@racket[(this-package-version)].  Given any other path, produces @racket[#f].
-
-}
-
-@defstruct[(exn:fail:planet exn:fail) ([message string?] [continuation-marks continuation-mark-set?])]{
-   This exception record is used to report planet-specific exceptions.
-}
-
-@defproc[(pkg? [v any/c]) boolean?]{
-  Determines if its argument is a pkg, the representation of an
-  installed package.
-}
-
-@section[#:tag "version.rkt"]{Package Version}
-
-Provides bindings for @|PLaneT| developers that automatically
-produce references to the name and version of the containing @|PLaneT| package
-so the same code may be reused across releases without accidentally referring to
-a different version of the same package.
-
-@defmodule[planet/version #:use-sources (planet/private/version)]
-
-@deftogether[(
-@defform[(this-package-version)]
-@defform*[[(this-package-version-symbol)
-           (this-package-version-symbol suffix-id)]]
-@defform[(this-package-version-name)]
-@defform[(this-package-version-owner)]
-@defform[(this-package-version-maj)]
-@defform[(this-package-version-min)]
-)]{
-
-Macros that expand into expressions that evaluate to information about the name,
-owner, and version number of the package in which they
-appear. @racket[this-package-version] returns a list consisting of a string
-naming the package's owner, a string naming the package, a number indicating the
-package major version and a number indicating the package minor version, or
-@racket[#f] if the expression appears outside the context of a package.
-The macros @racket[this-package-version-name],
-@racket[this-package-version-owner], @racket[this-package-version-maj], and
-@racket[this-package-version-min] produce the relevant fields of the package
-version list.
-
-@racket[this-package-version-symbol] produces a symbol
-suitable for use in @racket[planet] module paths.  For instance, in version
-@racketmodfont{1:0} of the package @racketmodfont{package.plt} owned by
-@racketmodfont{author}, @racket[(this-package-version-symbol dir/file)] produces
-@racket['author/package:1:0/dir/file].  In the same package,
-@racket[(this-package-version-symbol)] produces @racket['author/package:1:0].
-
-}
-
-@defform[(this-package-in suffix-id ...)]{
-
-A @racket[require] sub-form that requires modules from within the same @|PLaneT|
-package version as the require, as referred to by each @racket[suffix-id]. For
-instance, in version @racketmodfont{1:0} of the package
-@racketmodfont{package.plt} owned by @racketmodfont{author},
-@racket[(require (this-package-in dir/file))] is equivalent to
-@racket[(require (planet author/package:1:0/dir/file))].
-
-@italic{Note:} Use @racket[this-package-in] when documenting @|PLaneT| packages
-with Scribble to associate each documented binding with the appropriate package.
-
-}
-
-@defproc[(make-planet-symbol [stx syntax?]
-                             [suffix (or/c #false string?) #false])
-         (or/c #false symbol?)]{
-  Returns a symbol representing a require spec for the location of @racket[stx],
-  as a planet package.
-}
-
-@defproc[(package-version->symbol [ver (or/c (list/c string? string? exact-nonnegative-integer? exact-nonnegative-integer?)
-                                             #false)]
-                                  [suffix (or/c #false string?) #false])
-         (or/c #false symbol?)]{
-  Returns a symbol representing the require spec for @racket[ver],
-  as a planet package.
-}
-
-@section[#:tag "syntax.rkt"]{Macros and Syntax Objects}
-
-@defmodule[planet/syntax]
-
-Provides bindings useful for @|PLaneT|-based macros.
-
-@deftogether[(
-@defproc[(syntax-source-planet-package [stx syntax?]) (or/c list? #f)]
-@defproc[(syntax-source-planet-package-owner [stx syntax?]) (or/c string? #f)]
-@defproc[(syntax-source-planet-package-name [stx syntax?]) (or/c string? #f)]
-@defproc[(syntax-source-planet-package-major [stx syntax?]) (or/c integer? #f)]
-@defproc[(syntax-source-planet-package-minor [stx syntax?]) (or/c integer? #f)]
-@defproc[(syntax-source-planet-package-symbol
-           [stx syntax?]
-           [suffix (or/c symbol? #f) #f])
-         (or/c symbol? #f)]
-)]{
-
-Produce output analogous to @racket[this-package-version],
-@racket[this-package-version-owner], @racket[this-package-version-name],
-@racket[this-package-version-maj], @racket[this-package-version-min], and
-@racket[this-package-version-symbol] based on the source location of
-@racket[stx].
-
-}
-
-@defproc[(make-planet-require-spec
-           [stx syntax?]
-           [suffix (or/c symbol? #f) #f])
-         syntax?]{
-
-Produces a @racket[require] sub-form for the module referred to by
-@racket[suffix] in the @|PLaneT| package containing the source location of
-@racket[stx].
-
-}
-
-@section[#:tag "scribble.rkt"]{Scribble Documentation}
-
-@defmodule[planet/scribble]
-
-Provides bindings for documenting @|PLaneT| packages.
-
-@defform[(this-package-in suffix-id ...)]{
-
-This binding from @racketmodname[planet/version] is also exported from
-@racketmodname[planet/scribble], as it is useful for @racket[for-label] imports
-in Scribble documentation.
-
-}
-
-@deftogether[(
-@defform[(racketmod/this-package maybe-file suffix-id datum ...)]
-@defform*[((racketmodname/this-package suffix-id)
-           (racketmodname/this-package (#,(racket unsyntax) suffix-expr)))]
-@defform[(racketmodlink/this-package suffix-id pre-content-expr ...)]
-@defform[(defmodule/this-package maybe-req suffix-id maybe-sources pre-flow ...)]
-@defform*[((defmodulelang/this-package suffix-id maybe-sources pre-flow ...)
-           (defmodulelang/this-package suffix-id
-             #:module-paths (mod-suffix-id ...) maybe-sources 
-             pre-flow ...))]
-@defform[(defmodulereader/this-package suffix-id maybe-sources pre-flow ...)]
-@defform[(defmodule*/this-package maybe-req (suffix-id ...+) 
-           maybe-sources pre-flow ...)]
-@defform*[((defmodulelang*/this-package (suffix-id ...+) 
-             maybe-sources pre-flow ...)
-           (defmodulelang*/this-package (suffix-id ...+) 
-             #:module-paths (mod-suffix-id ...) maybe-sources 
-             pre-flow ...))]
-@defform[(defmodulereader*/this-package (suffix-id ...+) 
-           maybe-sources pre-flow ...)]
-@defform[(defmodule*/no-declare/this-package maybe-req (suffix-id ...+)
-           maybe-sources pre-flow ...)]
-@defform*[((defmodulelang*/no-declare/this-package (suffix-id ...+)
-             maybe-sources pre-flow ...)
-           (defmodulelang*/no-declare/this-package (suffix-id ...+) 
-             #:module-paths (mod-suffix-id ...) maybe-sources pre-flow ...))]
-@defform[(defmodulereader*/no-declare/this-package (suffix-id ...+)
-           maybe-sources pre-flow ...)]
-@defform[(declare-exporting/this-package suffix-id ... maybe-sources)]
-)]{
-
-Variants of @racket[racketmod], @racket[racketmodname],
-@racket[racketmodlink], @racket[defmodule], @racket[defmodulereader],
-@racket[defmodulelang], @racket[defmodule*], @racket[defmodulelang*],
-@racket[defmodulereader*], @racket[defmodule*/no-declare],
-@racket[defmodulelang*/no-declare],
-@racket[defmodulereader*/no-declare], and @racket[declare-exporting],
-respectively, that implicitly refer to the PLaneT package that
-contains the enclosing module.
-
-The full module name passed to @racket[defmodule], etc is formed by
-appending the @racket[suffix-id] or @racket[mod-suffix-id] to the
-symbol returned by @racket[(this-package-version-symbol)], separated
-by a @litchar{/} character, and tagging the resulting symbol as a
-@racket[planet] module path. As a special case, if @racket[suffix-id]
-is @racketid[main], the suffix is omitted.
-
-For example, within a package named @tt{package.plt} by @tt{author},
-version @tt{1:0}, the following are equivalent:
-@racketblock[
-(defmodule/this-package dir/file)
-  @#,elem{=} (defmodule (planet author/package:1:0/dir/file))
-]
-and
-@racketblock[
-(defmodule/this-package main)
-  @#,elem{=} (defmodule (planet author/package:1:0))
-]
-}
-
-@section{Terse Status Updates}
-
-@defmodule[planet/terse-info]
-
-This module provides access to some PLaneT status information. This
-module is first loaded by PLaneT in the initial namespace (when
-PLaneT's resolver is loaded), but PLaneT uses @racket[dynamic-require] to load
-this module each time it wants to announce information. Similarly, the
-state of which procedures are registered (via @racket[planet-terse-register]) 
-is saved in the namespace, making the listening and information producing
-namespace-specific.
-
-@defproc[(planet-terse-register
-          [proc (-> (or/c 'download 'install 'docs-build 'finish)
-                    string?
-                    any/c)])
-         void?]{
-Registers @racket[proc] as a function to be called when
-@racket[planet-terse-log] is called.
-
-Note that @racket[proc] is called 
-asynchronously (ie, on some thread other than the one calling @racket[planet-terse-register]).
-}
-
-@defproc[(planet-terse-log [id (or/c 'download 'install 'finish)]
-                           [msg string?]) void?]{
-This function is called by PLaneT to announce when things are happening. See also
-@racket[planet-terse-set-key].
-}
-
-@defproc[(planet-terse-set-key [key any/c]) void?]{
-  This sets a @seclink["threadcells" #:doc '(lib "scribblings/reference/reference.scrbl")]{thread cell}
-  to the value of @racket[key].
-  The value of the thread cell is used as an index into a table to determine which
-  of the functions passed to @racket[planet-terse-register] to call when 
-  @racket[planet-terse-log] is called.
-  
-  The table holding the key uses ephemerons and a weak hash table to ensure that
-  when the @racket[key] is unreachable, then the procedures passed to @racket[planet-terse-log]
-  cannot be reached through the table.
-}
-
-@section{The Cache File's Path}
-
-@defmodule[planet/cachepath]
-
-@defproc[(get-planet-cache-path) (and/c path? absolute-path?)]{
- Returns the path to the @filepath{cache.rktd} file for the planet installation.
-}
diff --git a/pkgs/planet-pkgs/planet-doc/planet/scribble.rkt b/pkgs/planet-pkgs/planet-doc/planet/scribble.rkt
deleted file mode 100644
index a03cdf3a4a..0000000000
--- a/pkgs/planet-pkgs/planet-doc/planet/scribble.rkt
+++ /dev/null
@@ -1,190 +0,0 @@
-#lang racket/base
-
-(provide
-  this-package-in
-  racketmod/this-package
-  racketmodname/this-package
-  racketmodlink/this-package
-  defmodule/this-package
-  defmodulelang/this-package
-  defmodulereader/this-package
-  defmodule*/this-package
-  defmodulelang*/this-package
-  defmodulereader*/this-package
-  defmodule*/no-declare/this-package
-  defmodulelang*/no-declare/this-package
-  defmodulereader*/no-declare/this-package
-  declare-exporting/this-package)
-
-(require
-  scribble/manual
-  planet/version
-  (for-label
-    racket/base)
-  (for-syntax
-    racket/base
-    syntax/parse
-    planet/syntax))
-
-(define-syntax-rule (define-syntaxes-with [name ...] body ...)
-  (define-syntaxes [name ...] (let () body ... (values name ...))))
-
-(define-syntaxes-with
-  [ racketmod/this-package
-    racketmodname/this-package
-    racketmodlink/this-package
-    defmodule/this-package
-    defmodulelang/this-package
-    defmodulereader/this-package
-    defmodule*/this-package
-    defmodulelang*/this-package
-    defmodulereader*/this-package
-    defmodule*/no-declare/this-package
-    defmodulelang*/no-declare/this-package
-    defmodulereader*/no-declare/this-package
-    declare-exporting/this-package ]
-
-  (define-syntax-class id/this-package
-    #:attributes [planet-id]
-    (pattern (~and src (~datum main))
-      #:attr planet-id
-      (datum->syntax
-        #'src
-        (syntax-source-planet-package-symbol #'src #f)
-        #'src))
-    (pattern suffix:id
-      #:attr planet-id
-      (datum->syntax
-        #'suffix
-        (syntax-source-planet-package-symbol #'suffix #'suffix)
-        #'suffix)))
-
-  (define-splicing-syntax-class (maybe-option kw)
-    #:attributes [(option 1)]
-    (pattern (~seq
-               (~and key:keyword
-                 (~fail #:unless (eq? (syntax-e #'key) kw)))
-               arg:expr)
-      #:attr (option 1) (list #'key #'arg))
-    (pattern (~seq) #:attr (option 1) (list)))
-
-  (define-splicing-syntax-class maybe-sources
-    #:attributes [(option 1)]
-    (pattern (~seq #:use-sources [src:id/this-package ...])
-      #:attr (option 1) (list #'#:use-sources #'[(planet src.planet-id) ...]))
-    (pattern (~seq) #:attr (option 1) (list)))
-
-  (define racketmod/this-package
-    (syntax-parser
-      [(_ filename lang:id/this-package . body)
-       #:declare filename (maybe-option '#:file)
-       (with-syntax ([spec (syntax/loc #'lang
-                             (code:line planet lang.planet-id))])
-         #'(racketmod filename.option ... spec . body))]))
-
-  (define racketmodname/this-package
-    (syntax-parser #:literals [unsyntax]
-      [(~and orig (_ (unsyntax e:expr)))
-       #'(racketmodname
-           (unsyntax `(planet ,(make-planet-symbol (quote-syntax orig) e))))]
-      [(_ suffix:id/this-package)
-       #'(racketmodname (planet suffix.planet-id))]))
-
-  (define racketmodlink/this-package
-    (syntax-parser
-      [(_ suffix:id/this-package . body)
-       #'(racketmodlink (planet suffix.planet-id) . body)]))
-
-  (define defmodule/this-package
-    (syntax-parser
-      [(_ req-form suffix:id/this-package src:maybe-sources . body)
-       #:declare req-form (maybe-option '#:require-form)
-       #'(defmodule
-           req-form.option ...
-           (planet suffix.planet-id)
-           src.option ...
-           . body)]))
-
-  (define defmodule*/this-package
-    (syntax-parser
-      [(_ req-form [suffix:id/this-package ...] src:maybe-sources . body)
-       #:declare req-form (maybe-option '#:require-form)
-       #'(defmodule*
-           req-form.option ...
-           [(planet suffix.planet-id) ...]
-           src.option ...
-           . body)]))
-
-  (define defmodule*/no-declare/this-package
-    (syntax-parser
-      [(_ req-form [suffix:id/this-package ...] . body)
-       #:declare req-form (maybe-option '#:require-form)
-       #'(defmodule*/no-declare
-           req-form.option ...
-           [(planet suffix.planet-id) ...]
-           . body)]))
-
-  (define defmodulelang/this-package
-    (syntax-parser
-      [(_ suffix:id/this-package #:module-paths [path:id/this-package ...]
-         src:maybe-sources
-         . body)
-       #'(defmodulelang (racket (code:line planet suffix.planet-id))
-           #:module-paths [(planet path.planet-id) ...]
-           src.option ...
-           . body)]
-      [(_ suffix:id/this-package src:maybe-sources . body)
-       #'(defmodulelang (racket (code:line planet suffix.planet-id))
-           #:module-paths [(planet suffix.planet-id)]
-           src.option ...
-           . body)]))
-
-  (define defmodulelang*/this-package
-    (syntax-parser
-      [(_ [suffix:id/this-package ...] #:module-paths [path:id/this-package ...]
-         src:maybe-sources
-         . body)
-       #'(defmodulelang* [(racket (code:line planet suffix.planet-id)) ...]
-           #:module-paths [(planet path.planet-id) ...]
-           src.option ...
-           . body)]
-      [(_ [suffix:id/this-package ...] src:maybe-sources . body)
-       #'(defmodulelang* [(racket (code:line planet suffix.planet-id)) ...]
-           #:module-paths [(planet suffix.planet-id) ...]
-           src.option ...
-           . body)]))
-
-  (define defmodulelang*/no-declare/this-package
-    (syntax-parser
-      [(_ [suffix:id/this-package ...] #:module-paths [path:id/this-package ...]
-         . body)
-       #'(defmodulelang*/no-declare
-           [(racket (code:line planet suffix.planet-id)) ...]
-           #:module-paths [(planet path.planet-id) ...]
-           . body)]
-      [(_ [suffix:id/this-package ...] . body)
-       #'(defmodulelang*/no-declare
-           [(racket (code:line planet suffix.planet-id)) ...]
-           #:module-paths [(planet suffix.planet-id) ...]
-           . body)]))
-
-  (define defmodulereader/this-package
-    (syntax-parser
-      [(_ suffix:id/this-package src:maybe-sources . body)
-       #'(defmodulereader (planet suffix.planet-id) src.option ... . body)]))
-
-  (define defmodulereader*/this-package
-    (syntax-parser
-      [(_ [suffix:id/this-package ...] src:maybe-sources . body)
-       #'(defmodulereader* [(planet suffix.planet-id) ...] src.option ...
-           . body)]))
-
-  (define defmodulereader*/no-declare/this-package
-    (syntax-parser
-      [(_ [suffix:id/this-package ...] . body)
-       #'(defmodulereader*/no-declare [(planet suffix.planet-id) ...] . body)]))
-
-  (define declare-exporting/this-package
-    (syntax-parser
-      [(_ suffix:id/this-package ... src:maybe-sources)
-       #'(declare-exporting (planet suffix.planet-id) ... src.option ...)])))
diff --git a/pkgs/planet-pkgs/planet-lib/LICENSE.txt b/pkgs/planet-pkgs/planet-lib/LICENSE.txt
deleted file mode 100644
index a958389d7d..0000000000
--- a/pkgs/planet-pkgs/planet-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-planet-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/planet-pkgs/planet-lib/info.rkt b/pkgs/planet-pkgs/planet-lib/info.rkt
deleted file mode 100644
index c235f82f6c..0000000000
--- a/pkgs/planet-pkgs/planet-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-(define collection 'multi)
-(define deps '("srfi-lite-lib"
-               "base"))
-
-(define pkg-desc "implementation (no documentation) part of \"planet\"")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/planet-pkgs/planet-lib/planet/info.rkt b/pkgs/planet-pkgs/planet-lib/planet/info.rkt
deleted file mode 100644
index 9d08118a3a..0000000000
--- a/pkgs/planet-pkgs/planet-lib/planet/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define name "PLaneT")
-
-(define raco-commands '(("planet" planet/raco "manage Planet package installations" 80)))
diff --git a/pkgs/planet-pkgs/planet-lib/planet/lang/reader.rkt b/pkgs/planet-pkgs/planet-lib/planet/lang/reader.rkt
deleted file mode 100644
index a2007ea87a..0000000000
--- a/pkgs/planet-pkgs/planet-lib/planet/lang/reader.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-(require syntax/module-reader
-         planet/resolver)
-
-(provide (rename-out [planet-read read]
-                     [planet-read-syntax read-syntax]
-                     [planet-get-info get-info]))
-
-(define (str->spec str)
-  (let ([str (bytes->string/latin-1 str)])
-    (if (module-path? `(planet ,(string->symbol str)))
-        (vector `(submod (planet ,(string->symbol str)) reader)
-                `(planet ,(string->symbol (string-append str "/lang/reader"))))
-        #f)))
-
-(define-values (planet-read planet-read-syntax real-planet-get-info)
-  (make-meta-reader
-   'planet
-   "planet path"
-   str->spec
-   values
-   values
-   values))
-
-(define op (current-output-port))
-
-(define (planet-get-info inport module-path line col pos)
-  (parameterize ([install? #f]
-                 [download? #f])
-    (real-planet-get-info inport module-path line col pos)))
-
diff --git a/pkgs/planet-pkgs/planet-lib/planet/planet.rkt b/pkgs/planet-pkgs/planet-lib/planet/planet.rkt
deleted file mode 100644
index 0e937555a1..0000000000
--- a/pkgs/planet-pkgs/planet-lib/planet/planet.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require "private/cmdline-tool.rkt")
-
-(with-handlers ([exn:fail? 
-                 (lambda (e) 
-                   ((error-display-handler) (exn-message e) e)
-                   (exit 1))])
-  (void (start #f)))
diff --git a/pkgs/planet-pkgs/planet-lib/planet/private/cmdline-tool.rkt b/pkgs/planet-pkgs/planet-lib/planet/private/cmdline-tool.rkt
deleted file mode 100644
index 186898eecb..0000000000
--- a/pkgs/planet-pkgs/planet-lib/planet/private/cmdline-tool.rkt
+++ /dev/null
@@ -1,318 +0,0 @@
-#lang racket/base
-#|
-This module contains code that implements the `planet' command-line tool.
-  
-PLANNED FEATURES:
-* Disable a package without removing it (disabling meaning
-  that if it's a tool it won't start w/ DrRacket, etc)
-|#
-  (require (only-in racket/path simple-form-path)
-           net/url
-           racket/file
-           racket/match
-           raco/command-name
-           
-           (only-in planet/resolver download?)
-           planet/config
-           planet/private/planet-shared
-           planet/util
-           planet/private/command)
-  (provide start)
-  
-  (define erase? (make-parameter #f))
-  (define displayer (make-parameter (λ () (show-installed-packages))))
-  (define quiet-unlink? (make-parameter #f))
-
-  (define (read-from-string str)
-    (read
-      (if (bytes? str) (open-input-bytes str) (open-input-string str))))
-
-  
-  (define (start raco?)
-
-    (make-directory* (PLANET-DIR))
-    (make-directory* (CACHE-DIR))
-    (planet-logging-to-stdout #t)
-    
-    (svn-style-command-line
-     #:program (short-program+command-name)
-     #:argv (current-command-line-arguments)
-     "The Racket command-line tool for manipulating packages installed by PLaneT."
-     ["create" "create a PLaneT archive from a directory"
-      "\nCreate a PLaneT archive in the current directory whose contents are the directory <path>."
-      #:once-each
-      [("-f" "--force") ("force a package to be created even if its info.rkt file contains"
-                         "errors.")
-       (force-package-building? #t)]
-      #:args (path)
-      (do-archive path)]
-     ["install" "download and install a package"
-      "
-Download and install the package that
-   (require (planet \"file.rkt\" (<owner> <pkg> <maj> <min>)))
-would install"
-      #:args (owner pkg maj min)
-      (begin
-        (verify-package-name pkg)
-        (download/install owner pkg maj min))]
-     ["remove" "remove a package from the local cache"
-      "
-Remove the specified package from the local cache, optionally also removing its distribution file"
-      #:once-each 
-      [("-e" "--erase") 
-       ("also remove the package's distribution file from the"
-        "uninstalled-package cache")
-       (erase? #t)]
-      #:args (owner pkg maj min)
-      (begin
-        (verify-package-name pkg)
-        ((if (erase?) erase remove) owner pkg maj min))]
-     ["show" "list the packages installed in the local cache"
-      "\nList the packages installed in the local cache"
-      #:once-any
-      [("-p" "--packages") "show packages only (default)" (displayer show-installed-packages)]
-      [("-l" "--linkage")  "show linkage table only"      (displayer show-linkage)]
-      [("-a" "--all")      "show packages and linkage"    (displayer (λ () (show-installed-packages) (newline) (show-linkage)))]
-      #:args ()
-      ((displayer))]
-     ["clearlinks" "clear the linkage table, allowing upgrades"
-      "\nClear the linkage table, allowing upgrades"
-      #:args ()
-      (unlink-all)]
-     ["fileinject" "install a local file to the planet cache"
-       "
-Install local file <plt-file> into the planet cache as though it had been downloaded from the planet server.  The installed package has path
-  (planet (<owner> <plt-file's filename> <maj> <min>))"
-       #:args (owner plt-file maj min)
-       (install-plt-file plt-file owner maj min)]
-     ["link" "create a package development link"
-      "\nCreate a development link between the specified package specifier and the specified directory name"
-      #:args (owner pkg maj min path)
-      (begin
-        (verify-package-name pkg)
-        (add-hard-link-cmd owner pkg maj min path))]
-     ["unlink" "remove a package development link"
-      "\nRemove development link associated with the given package"
-      #:once-each
-      [("-q" "--quiet") "don't signal an error on nonexistent links" (quiet-unlink? #t)]
-      #:args (owner pkg maj min)
-      (begin
-        (verify-package-name pkg)
-        (remove-hard-link-cmd owner pkg maj min (quiet-unlink?)))]
-     ["fetch" "download a package file without installing it"
-       "\nDownload the given package file without installing it"
-       #:args (owner pkg maj min)
-       (begin
-         (verify-package-name pkg)
-         (download/no-install owner pkg maj min))]
-     ["url" "get a URL for a package"
-      "
-Get a URL for the given package.
-This is not necessary for normal use of planet, but may be helpful in some circumstances for retrieving packages."
-      #:args (owner pkg maj min)
-      (begin
-        (verify-package-name pkg)
-        (get-download-url owner pkg maj min))]
-     ["open" "unpack the contents of a package"
-      "
-Unpack the contents of the given package into the given directory without installing.
-This command is not necessary for normal use of planet. It is intended to allow you to inspect package contents offline without needing to install the package."
-      #:args (plt-file target)
-      (do-unpack plt-file target)]
-     
-     ["structure" "display the structure of a .plt archive"
-      "\nPrint the structure of the PLaneT archive named by <plt-file> to the standard output port.
-This command does not unpack or install the named .plt file."
-      #:args (plt-file)
-      (do-structure plt-file)]
-     
-     ["print" "display a file within a .plt archive"
-      "\nPrint the contents of the file named by <path>, which must be a relative path within the PLaneT archive named by <plt-file>, to the standard output port.
-This command does not unpack or install the named .plt file."
-      #:args (plt-file path)
-      (do-display plt-file path)]
-
-     ;; unimplemented so far:
-     #;(("-u" "--unlink")
-         module
-         "Remove all linkage the given module has, forcing it to upgrade"
-         ...)))
-
-  (define (verify-package-name pkg)
-    (unless (regexp-match #rx"\\.plt$" pkg)
-      (eprintf "Expected package name to end with '.plt', got: ~a\n" pkg)
-      (exit 1)))
-  
-  
-  ;; ============================================================
-  ;; FEATURE IMPLEMENTATIONS
-  
-  (define (fail s . args)
-    (raise (make-exn:fail (apply format s args) (current-continuation-marks))))
-  (define (warn s . args)
-    (apply printf s args)
-    (newline))
-  
-  (define (download/install owner name majstr minstr)
-    (let* ([maj (read-from-string majstr)]
-           [min (read-from-string minstr)]
-           [full-pkg-spec (get-package-spec owner name maj min)])
-      (if (get-package-from-cache full-pkg-spec)
-          (warn "No package installed (cache already contains a matching package)")
-          (unless (download/install-pkg owner name maj min)
-            (fail "Could not find matching package")))))
-  
-  (define (download/no-install owner pkg majstr minstr)
-    (parameterize ([download? #t])
-      (let* ([maj (read-from-string majstr)]
-             [min (read-from-string minstr)]
-             [full-pkg-spec (get-package-spec owner pkg maj min)])
-        (when (file-exists? pkg)
-          (fail "Cannot download, there is a file named ~a in the way" pkg))
-        (match (download-package full-pkg-spec)
-          [(list #t path maj min) 
-           (copy-file path pkg)
-           (printf "Downloaded ~a package version ~a.~a\n" pkg maj min)]
-          [_ 
-           (fail "Could not find matching package")]))))
-  
-  ;; params->full-pkg-spec : string string string string -> pkg
-  ;; gets a full package specifier for the given specification
-  (define (params->full-pkg-spec ownerstr pkgstr majstr minstr)
-    (let ((maj (string->number majstr))
-          (min (string->number minstr)))
-      (unless (and (integer? maj) (integer? min) (> maj 0) (>= min 0))
-        (fail "Invalid major/minor version"))
-      (let* ([fullspec (get-package-spec ownerstr pkgstr maj min)])
-        (unless fullspec (fail "invalid spec: ~a" fullspec))
-        fullspec)))
-    
-  (define (install-plt-file filestr owner majstr minstr)
-    (unless (file-exists? filestr) (fail "File does not exist: ~a" filestr))
-    (let* ([file (simple-form-path filestr)]
-           [name (let-values ([(base name dir?) (split-path file)]) (path->string name))]
-           [fullspec (params->full-pkg-spec owner name majstr minstr)])
-      (install-pkg fullspec file (pkg-spec-maj fullspec) (pkg-spec-minor-lo fullspec))))
-  
-  (define (do-archive p)
-    (unless (directory-exists? p)
-      (fail "No such directory: ~a" p))
-    (make-planet-archive (simple-form-path p)))
-  
-  (define (remove owner pkg majstr minstr)
-    (let ((maj (string->number majstr))
-          (min (string->number minstr)))
-      (unless (and (integer? maj) (integer? min) (> maj 0) (>= min 0))
-        (fail "Invalid major/minor version"))
-      (with-handlers ([exn:fail:planet? (λ (e) (fail (exn-message e)))]) 
-        (remove-pkg owner pkg maj min))))
-  
-  (define (erase owner pkg majstr minstr)
-    (let ((maj (string->number majstr))
-          (min (string->number minstr)))
-      (unless (and (integer? maj) (integer? min) (> maj 0) (>= min 0))
-        (fail "Invalid major/minor version"))
-      (with-handlers ([exn:fail:planet? (λ (e) (fail (exn-message e)))])
-        (erase-pkg owner pkg maj min))))
-        
-  (define (show-installed-packages)
-    (let ([normal-packages (get-installed-planet-archives)]
-          [devel-link-packages (get-hard-linked-packages)])
-      
-      (define (show-normals)
-        (printf "Normally-installed packages:\n")
-        (for-each 
-         (lambda (l) (apply printf "  ~a \t~a \t~a ~a\n" l))
-         (sort-by-criteria 
-          (map (lambda (x) (match x [(list _ owner pkg _ maj min)
-                                     (list owner pkg maj min)]))
-               normal-packages)
-          (list string<? string=?)
-          (list string<? string=?)
-          (list < =)
-          (list < =))))
-      
-      (define (show-devel-links)
-        (printf "Development links:\n")
-        (for-each 
-         (lambda (l) (apply printf "  ~a\t~a\t~a ~a\n    --> ~a\n" l))
-         (sort-by-criteria 
-          (map 
-           (lambda (x) (match x [(list dir owner pkg _ maj min)
-                                 (list owner pkg maj min (path->string dir))]))
-           devel-link-packages)
-          (list string<? string=?)
-          (list string<? string=?)
-          (list < =)
-          (list < =)
-          (list string<? string=?))))
-      
-      (cond
-        [(and (pair? normal-packages) (pair? devel-link-packages))
-         (begin 
-           (show-normals)
-           (newline)
-           (show-devel-links))]
-        [(pair? normal-packages) (show-normals)]
-        [(pair? devel-link-packages) (show-devel-links)]
-        [else (printf "No packages installed.\n")])))
-      
-  
-  (define (show-linkage)
-    (for-each
-     (lambda (module)
-       (printf "  ~a:\n" (car module))
-       (for-each 
-        (lambda (link) (apply printf "    ~a\t~a\t~a ~a\n" link))
-        (cdr module)))
-     (sort (current-linkage) string<? #:key car)))
-  
-  (define (add-hard-link-cmd ownerstr pkgstr majstr minstr pathstr)
-    (let* ([maj (read-from-string majstr)]
-           [min (read-from-string minstr)]
-           [path (string->path pathstr)])
-      (unless (and (integer? maj) (integer? min) (> maj 0) (>= min 0))
-        (fail "Invalid major/minor version"))
-      (add-hard-link ownerstr pkgstr maj min path)))
-  
-  (define (remove-hard-link-cmd ownerstr pkgstr majstr minstr quiet?)
-    (let* ([maj (read-from-string majstr)]
-           [min (read-from-string minstr)])
-      (unless (and (integer? maj) (integer? min) (> maj 0) (>= min 0))
-        (fail "Invalid major/minor version"))
-      (remove-hard-link ownerstr pkgstr maj min #:quiet? quiet?)))
-      
-  (define (get-download-url ownerstr pkgstr majstr minstr)
-    (let ([fps (params->full-pkg-spec ownerstr pkgstr majstr minstr)])
-      (printf "~a\n" (url->string (pkg->download-url fps)))))
-  
-  (define (do-unpack plt-file target)
-    (unless (file-exists? plt-file)
-      (fail (format "The specified file (~a) does not exist" plt-file))) 
-    (let ([file (simple-form-path plt-file)])
-      (unpack-planet-archive file target)))
-  
-  (define (do-structure plt-file)
-    (unless (file-exists? plt-file)
-      (fail (format "The specified file (~a) does not exist" plt-file))) 
-    (let ([file (simple-form-path plt-file)])
-      (display-plt-file-structure file)))
-  
-  (define (do-display plt-file file-to-print)
-    (unless (file-exists? plt-file)
-      (fail (format "The specified file (~a) does not exist" plt-file))) 
-    (let ([file (simple-form-path plt-file)])
-      (display-plt-archived-file file file-to-print)))
-  
-  ;; ------------------------------------------------------------
-  ;; Utility
-    
-  (define (sort-by-criteria l . criteria)
-    (sort l
-          (lambda (a b)
-            (let loop ((a a) (b b) (c criteria))
-              (cond
-               [(null? a) #f]
-               [((caar c) (car a) (car b)) #t]
-               [(not ((cadar c) (car a) (car b))) #f]
-               [else (loop (cdr a) (cdr b) (cdr c))])))))
diff --git a/pkgs/planet-pkgs/planet-lib/planet/private/version.rkt b/pkgs/planet-pkgs/planet-lib/planet/private/version.rkt
deleted file mode 100644
index 366fe576f7..0000000000
--- a/pkgs/planet-pkgs/planet-lib/planet/private/version.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base syntax/parse)
-         racket/path
-         racket/match
-         unstable/syntax
-         racket/syntax
-         racket/private/this-expression-source-directory
-         planet/planet-archives)
-
-(provide this-package-version
-         this-package-version-name
-         this-package-version-owner
-         this-package-version-maj
-         this-package-version-min
-         this-package-version-symbol
-         package-version->symbol
-         make-planet-symbol
-         (rename-out [this-package-version/proc path->package-version]))
-
-(define-syntax (this-package-version stx)
-  (syntax-case stx ()
-    [(_)
-     #`(this-package-version/proc
-         (this-expression-source-directory #,stx))]))
-
-(define-syntax define-getters
-  (syntax-rules ()
-    [(define-getters (name position) ...)
-     (begin
-       (define-syntax (name stx)
-         (syntax-case stx ()
-           [(name)
-            #`(let ([p #,(datum->syntax stx `(,#'this-package-version))])
-                (and p (position p)))]))
-       ...)]))
-
-(define-getters
-  (this-package-version-name pd->name)
-  (this-package-version-owner pd->owner)
-  (this-package-version-maj pd->maj)
-  (this-package-version-min pd->min))
-
-(define-syntax (this-package-version-symbol stx)
-  (syntax-parse stx
-    [(_ (~optional suffix:id))
-     #`(package-version->symbol
-         (this-package-version/proc
-           (this-expression-source-directory #,stx))
-         #,@(if (attribute suffix) #'['suffix] #'[]))]))
-
-
-;; ----------------------------------------
-
-(define (make-planet-symbol stx [suffix #f])
-  (match (syntax-source-directory stx)
-    [#f #f]
-    [dir (match (this-package-version/proc dir)
-           [#f #f]
-           [ver (package-version->symbol ver suffix)])]))
-
-(define (package-version->symbol ver [suffix #f])
-  (match ver
-    [(list owner name major minor)
-     (string->symbol
-       (format "~a/~a:~a:~a~a"
-         owner
-         (regexp-replace #rx"\\.plt$" name "")
-         major
-         minor
-         (if suffix (format-symbol "/~a" suffix) "")))]
-    [#f #f]))
-
-(define (this-package-version/proc srcdir)
-  (define (archive-retval->simple-retval p)
-    (list-refs p '(1 2 4 5)))
-  
-  ;; predicate->projection : #f \not\in X ==> (X -> boolean) -> (X -> X)
-  (define (predicate->projection pred) (λ (x) (if (pred x) x #f)))
-
-  (let* ([package-roots (get-all-planet-packages)]
-         [thepkg (ormap (predicate->projection (contains-dir? srcdir))
-                        package-roots)])
-    (and thepkg (archive-retval->simple-retval thepkg))))
-
-;; contains-dir? : path -> pkg -> boolean
-(define ((contains-dir? srcdir) alleged-superdir-pkg)
-  (let* ([nsrcdir (simple-form-path srcdir)]
-         [nsuperdir (simple-form-path (car alleged-superdir-pkg))]
-         [nsrclist (explode-path nsrcdir)]
-         [nsuperlist (explode-path nsuperdir)])
-    (list-prefix? nsuperlist nsrclist)))
-
-(define (list-prefix? sup sub)
-  (let loop ([sub sub]
-             [sup sup])
-    (cond
-      [(null? sup) #t]
-      [(equal? (car sup) (car sub))
-       (loop (cdr sub) (cdr sup))]
-      [else #f])))
-
-(define-values (pd->owner pd->name pd->maj pd->min)
-  (apply values (map (λ (n) (λ (l) (list-ref l n))) '(0 1 2 3))))
-
-(define (list-refs p ns)
-  (map (λ (n) (list-ref p n)) ns))
diff --git a/pkgs/planet-pkgs/planet-lib/planet/raco.rkt b/pkgs/planet-pkgs/planet-lib/planet/raco.rkt
deleted file mode 100644
index 7626a8b0b8..0000000000
--- a/pkgs/planet-pkgs/planet-lib/planet/raco.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require "private/cmdline-tool.rkt")
-
-(with-handlers ([exn:fail? 
-                 (lambda (e) 
-                   ((error-display-handler) (exn-message e) e)
-                   (exit 1))])
-  (start #t))
diff --git a/pkgs/planet-pkgs/planet-lib/planet/syntax.rkt b/pkgs/planet-pkgs/planet-lib/planet/syntax.rkt
deleted file mode 100644
index 6768d538ff..0000000000
--- a/pkgs/planet-pkgs/planet-lib/planet/syntax.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-
-(provide make-planet-require-spec
-         syntax-source-planet-package
-         syntax-source-planet-package-owner
-         syntax-source-planet-package-name
-         syntax-source-planet-package-major
-         syntax-source-planet-package-minor
-         syntax-source-planet-package-symbol)
-
-(require racket/match
-         planet/util
-         racket/syntax
-         unstable/syntax
-         (for-template racket/base)
-         (for-label racket/base))
-
-(define (syntax-source-planet-package stx)
-  (let* ([dir (syntax-source-directory stx)])
-    (and dir (path->package-version dir))))
-
-(define (syntax-source-planet-package-owner stx)
-  (match (syntax-source-planet-package stx)
-    [(list owner name major minor) owner]
-    [_ #f]))
-
-(define (syntax-source-planet-package-name stx)
-  (match (syntax-source-planet-package stx)
-    [(list owner name major minor) name]
-    [_ #f]))
-
-(define (syntax-source-planet-package-major stx)
-  (match (syntax-source-planet-package stx)
-    [(list owner name major minor) major]
-    [_ #f]))
-
-(define (syntax-source-planet-package-minor stx)
-  (match (syntax-source-planet-package stx)
-    [(list owner name major minor) minor]
-    [_ #f]))
-
-(define (syntax-source-planet-package-symbol stx [suffix #f])
-  (match (syntax-source-planet-package stx)
-    [(list owner name major minor)
-     (string->symbol
-      (format "~a/~a:~a:=~a~a"
-              owner
-              (regexp-replace "\\.plt$" name "")
-              major
-              minor
-              (if suffix (format-symbol "/~a" suffix) "")))]
-    [#f #f]))
-
-(define (make-planet-require-spec stx [id/f #f])
-  (datum->syntax
-   stx
-   (list #'planet (syntax-source-planet-package-symbol stx id/f))
-   (or id/f stx)))
diff --git a/pkgs/planet-pkgs/planet-lib/planet/util.rkt b/pkgs/planet-pkgs/planet-lib/planet/util.rkt
deleted file mode 100644
index ff144398f6..0000000000
--- a/pkgs/planet-pkgs/planet-lib/planet/util.rkt
+++ /dev/null
@@ -1,829 +0,0 @@
-#lang racket/base
-
-(require planet/config
-         planet/planet-archives
-         
-         planet/private/planet-shared
-         planet/private/linkage
-         
-         planet/private/resolver
-         "private/version.rkt"
-         
-         net/url
-         xml/xml
-         
-         racket/file
-         racket/list
-         
-         racket/contract/base
-         racket/port
-         racket/path
-         racket/class
-         racket/match
-         
-         setup/pack
-         setup/plt-single-installer 
-         setup/getinfo
-         setup/unpack
-
-         (for-syntax racket/base)
-         (prefix-in srfi1: srfi/1)
-         )
-
-#| The util collection provides a number of useful functions for interacting with the PLaneT system. |#
-
-(provide 
- 
- current-cache-contents
- current-linkage
- make-planet-archive
- unpack-planet-archive
- force-package-building?
- build-scribble-docs?
- get-installed-planet-archives
- get-hard-linked-packages
- unlink-all
- lookup-package-by-keys
- resolve-planet-path
- display-plt-file-structure
- display-plt-archived-file
- get-package-from-cache
- pkg->download-url
- (struct-out exn:fail:planet)
- pkg-spec?
- pkg?)
-
-(provide/contract
- [get-package-spec
-  (->* (string? string?) (natural-number/c any/c) pkg-spec?)]
- [download-package 
-  (-> pkg-spec? 
-      (or/c string?
-            (list/c #t path? natural-number/c natural-number/c)
-            (list/c #f string?)))]
- [download/install-pkg
-  (-> string? (and/c string? #rx"[.]plt$") natural-number/c any/c (or/c pkg? #f))]
- [install-pkg
-  (-> pkg-spec? path-string? natural-number/c any/c (or/c pkg? #f))]
- [add-hard-link 
-  (-> string? (and/c string? #rx"[.]plt$") natural-number/c natural-number/c path? void?)]
- [remove-hard-link 
-  (->* (string? (and/c string? #rx"[.]plt$") natural-number/c natural-number/c)
-       (#:quiet? boolean?)
-      void?)]
- [remove-pkg
-  (-> string? (and/c string? #rx"[.]plt$") natural-number/c natural-number/c void?)]
- [erase-pkg
-  (-> string? (and/c string? #rx"[.]plt$") natural-number/c natural-number/c void?)])
-
-
-;; get-package-spec : string string [nat | #f] [min-ver-spec | #f] -> pkg?
-;; gets the package that corresponds to the given arguments, which are
-;; values corresponding to the four parts of a package specifier in require syntax
-(define (get-package-spec owner pkg [maj #f] [min #f])
-  (define arg
-    (cond
-      [(not maj) (list owner pkg)]
-      [(not min) (list owner pkg maj)]
-      [else      (list owner pkg maj min)]))
-  (pkg-spec->full-pkg-spec arg #f))
-
-;; download/install-pkg : string string nat nat -> pkg | #f
-(define (download/install-pkg owner name maj min)
-  (parameterize ([install? #t]
-                 [download? #t])
-    (let* ([pspec (pkg-spec->full-pkg-spec (list owner name maj min) #f)]
-           [upkg (get-package-from-server pspec)])
-      (cond
-        [(uninstalled-pkg? upkg)
-         (pkg-promise->pkg upkg)]
-        [else #f]))))
-
-;; current-cache-contents : -> ((string ((string ((nat (nat ...)) ...)) ...)) ...)
-;; returns the packages installed in the local PLaneT cache
-(define (current-cache-contents)
-  (cdr (tree->list (repository-tree))))
-
-;; just so it will be provided
-(define unlink-all remove-all-linkage!)
-
-;; to remove:
-;;   -- setup-plt -c the package
-;;   -- remove relevant infodomain cache entries
-;;   -- delete files from cache directory
-;;   -- remove any existing linkage for package
-;; returns void if the removal worked; raises an exception if no package existed.
-
-(define (remove-pkg owner name maj min)
-  (let ((p (get-installed-package owner name maj min)))
-    (unless p
-      (raise (make-exn:fail:planet "Could not find package" (current-continuation-marks))))
-    (unless (normally-installed-pkg? p)
-      (raise (make-exn:fail:planet "Not a normally-installed package, can't remove" (current-continuation-marks))))
-    
-    (let ((path (pkg-path p)))
-      (with-logging 
-       (LOG-FILE)
-       (lambda () 
-         (printf "\n============= Removing ~a =============\n" (list owner name maj min))
-         (clean-planet-package path (list owner name '() maj min))))
-      (planet-log "Erasing metadata")
-      (erase-metadata p)
-      (planet-log "Deleting metadata and files in ~a" (path->string path))
-      (for ([file (in-list (dir->metadata-files path))])
-        (with-handlers ((exn:fail:filesystem? void))
-          (delete-file file)))
-      (delete-directory/files path)
-      (planet-log "Trimming empty directories")
-      (trim-directory (CACHE-DIR) path)
-      (planet-log "Rebuilding documentation index")
-      (reindex-user-documentation)
-      (void))))
-
-;; erase-metadata : pkg -> void
-;; clears out any references to the given package in planet's metadata files
-;; (i.e., linkage and info.rkt cache; not hard links which are not considered metadata)
-(define (erase-metadata p)
-  (remove-infodomain-entries (pkg-path p))
-  (remove-linkage-to! p))
-
-;; this really should go somewhere else. But what should setup's behavior be
-;; when a package is cleaned? should it clear info-domain entries out? I think
-;; no; an uncompiled package isn't necessarily not to be indexed and so on.
-;; remove-infodomain-entries : path -> void
-(define (remove-infodomain-entries path)
-  (let* ([pathbytes (path->bytes path)]
-         [cache-file (build-path (PLANET-DIR) "cache.rktd")])
-    (when (file-exists? cache-file)
-      (let ([cache-lines (with-input-from-file cache-file read)])
-        (call-with-output-file cache-file
-          (λ (op)
-            (if (pair? cache-lines)
-                (write (filter
-                        (λ (line) 
-                          (not 
-                           (and
-                            (pair? line)
-                            (or (not (directory-exists? (bytes->path (car line))))
-                                (subpath? path (bytes->path (car line)))))))                              
-                        cache-lines)
-                       op)
-                (fprintf op "\n")))
-          #:exists 'truncate/replace)))))
-
-;; subpath? : path path -> boolean
-;; determines if p1 is a subpath of p2.
-(define (subpath? p1 p2)
-  (let ([full-p1 (explode-path (simple-form-path p1))]
-        [full-p2 (explode-path (simple-form-path p2))])
-    (sublist? full-p1 full-p2 (o2 bytes=? path->bytes))))
-
-;; o2 : (X X -> Y) (Z -> X) -> (Z Z -> Y)
-;; "compose-two"
-(define (o2 a b) (λ (x y) (a (b x) (b y))))
-
-;; sublist? : (listof X) (listof X) (X X -> boolean) -> boolean
-;; determine if l1 is a sublist of l2, using = as the comparison operator for elements
-(define (sublist? l1 l2 =)
-  (cond
-    [(null? l1) #t]
-    [(null? l2) #f]
-    [(= (car l1) (car l2)) (sublist? (cdr l1) (cdr l2) =)]
-    [else #f]))
-
-(define (erase-pkg owner name maj min)
-  (let* ([uninstalled-pkg-dir
-          (build-path (UNINSTALLED-PACKAGE-CACHE) owner name (number->string maj) (number->string min))]
-         [uninstalled-pkg-file (build-path uninstalled-pkg-dir name)]
-         [uninstalled-file-exists? (file-exists? uninstalled-pkg-file)])
-    (when uninstalled-file-exists?
-      (delete-file uninstalled-pkg-file)
-      (trim-directory (UNINSTALLED-PACKAGE-CACHE) uninstalled-pkg-dir))
-    (with-handlers ([exn:fail:planet? 
-                     (λ (e) (if uninstalled-file-exists? 
-                                ;; not really a failure, just return
-                                (void)
-                                (raise e)))])
-      (remove-pkg owner name maj min))))
-
-;; listof X * listof X -> nonempty listof X
-;; returns de-prefixed version of l2 if l1 is a proper prefix of l2; 
-;; signals an error otherwise.
-(define (drop-common-base list1 list2)
-  (let loop ((l1 list1) (l2 list2))
-    (cond
-      [(null? l2)
-       (error 'drop-common-base "root ~s is not a prefix of stem ~s" list1 list2)]
-      [(null? l1) l2]
-      [(not (equal? (car l1) (car l2)))
-       (error 'drop-common-base "root ~s is not a prefix of stem ~s" list1 list2)]
-      [else (loop (cdr l1) (cdr l2))])))
-
-;; pathify-list : path (listof path) -> listof path
-;; given a base and a list of names, interprets each name as a subdirectory
-;; of the previous, starting with base, and returns a list. (This list
-;; is in reverse order, so the deepest subdirectory is returned first)
-(define (pathify-list root dirs)
-  (let loop ((base root) (dirs dirs) (acc '()))
-    (cond
-      [(null? dirs) acc]
-      [else
-       (let ((new (build-path base (car dirs))))
-         (loop new (cdr dirs) (cons new acc)))])))
-
-;; directory-empty? path -> bool
-;; #t iff the given directory contains no subdirectories of files
-(define (directory-empty? dir)
-  (null? (directory-list dir)))
-
-;; trim-directory: path path -> void
-;; deletes empty directories starting with stem and working down to root
-(define (trim-directory root stem)
-  (let* ([rootl (explode-path root)]
-         [steml (explode-path stem)]
-         [extras (cdr (pathify-list root (drop-common-base rootl steml)))])
-    (let loop ((dirs extras))
-      (cond
-        [(null? dirs) (void)]
-        [(directory-empty? (car dirs))
-         (delete-directory (car dirs))
-         (loop (cdr dirs))]
-        [else (void)]))))
-
-;; regexp->filter : (string | regexp) -> (path -> bool)
-;; computes a filter that accepts paths that match the given regexps and rejects other paths
-(define (regexp->filter re-s)
-  (let ([re (cond
-              [(string? re-s) (regexp re-s)]
-              [(regexp? re-s) re-s]
-              [else (error 'regexp->filter "not a regular expression")])])
-    (lambda (p) (regexp-match re (path->bytes p)))))
-
-(define force-package-building? (make-parameter #f))
-(define build-scribble-docs? (make-parameter #t))
-
-;; ---
-;; documentation stuff --- loaded on demand so that setup/scribble can be
-;; omitted in the Racket distribution
-(define-namespace-anchor anchor)
-
-;; render : path[fully-expanded scribble file path] path[fully expanded directory] boolean? -> xref?
-;; renders the given scribble doc file (in src dir) into the directory
-;; dir as a real scribble document
-(define (render src-file dest-dir multi-page?)
-  (parameterize ([current-namespace (namespace-anchor->empty-namespace anchor)])
-    (make-directory* dest-dir)
-    (let* ([index-dir (if multi-page?
-                          (let-values ([(base name dir?) (split-path dest-dir)]) base)
-                          dest-dir)]
-           [renderer (new ((if multi-page?
-                               (dynamic-require 'scribble/html-render 'render-multi-mixin)
-                               values)
-                           ((dynamic-require 'scribble/html-render 'render-mixin) 
-                            (dynamic-require 'scribble/base-render 'render%)))
-                          [dest-dir index-dir]
-                          [root-path dest-dir])]
-           [doc (dynamic-require `(file ,(path->string src-file)) 'doc)]
-           [fp (send renderer traverse (list doc) (list dest-dir))]
-           [ci (send renderer collect (list doc) (list dest-dir) fp)]
-           [xref ((dynamic-require 'setup/xref 'load-collections-xref))]
-           [_ ((dynamic-require 'scribble/xref 'xref-transfer-info) renderer ci xref)]
-           [ri (send renderer resolve (list doc) (list dest-dir) ci)])
-      (send renderer set-external-tag-path
-            "/servlets/doc-search.rkt")
-      (send renderer render 
-            (list doc) 
-            (list (if multi-page? 
-                      dest-dir
-                      (build-path dest-dir "index.html")))
-            ri)
-      ;; return cross-reference info:
-      (send renderer serialize-info ri))))
-
-;; this MUST BE a syntactic directory (with the trailing slash)
-;; or the scribble renderer gets very confused
-(define SCRIBBLE-DOCUMENT-DIR "planet-docs/")
-
-;; scribble-entry? : Any -> Boolean
-;; Recognizes valid list entries in info.rkt's scribblings field.
-(define scribble-entry?
-  (match-lambda
-    [(or (list (? string?))
-         (list (? string?) (? scribble-flags?))
-         (list (? string?) (? scribble-flags?) (? scribble-category?))
-         (list (? string?) (? scribble-flags?) (? scribble-category?) (? string?)))
-     #t]
-    [_ #f]))
-
-;; scribble-flags? : Any -> Boolean
-;; Recognizes a list of flags from an info.rkt scribblings entry.
-(define scribble-flags?
-  (match-lambda
-    [(list (? symbol?) ...) #t]
-    [_ #f]))
-
-;; scribble-category : Any -> Boolean
-;; Recognizes a category descriptor from an info.rkt scribblings entry.
-(define scribble-category?
-  (match-lambda
-    [(or (list (? symbol?))
-         (list (? symbol?) (? real?))) #t]
-    [_ #f]))
-
-;; scribble-entry-file : ScribbleEntry -> String
-;; Produces the filename of an info.rkt scribblings entry.
-(define scribble-entry-file
-  (match-lambda [(list file _ ...) file]))
-
-;; scribble-entry-flags : ScribbleEntry -> (Listof Symbol)
-;; Produces the list of flags from an info.rkt scribblings entry.
-(define scribble-entry-flags
-  (match-lambda
-    [(list _) null]
-    [(list _ flags _ ...) flags]))
-
-;; make-planet-archive: path<directory> [path<file>] -> path<file>
-;; Makes a .plt archive file suitable for PLaneT whose contents are
-;; all files in the given directory and returns that file's name.
-;; If the optional filename argument is provided, that filename will 
-;; be used as the output file's name.
-(define make-planet-archive
-  (case-lambda
-    [(dir) 
-     (let-values ([(path name must-be-dir?) (split-path dir)])
-       (make-planet-archive 
-        dir 
-        (build-path (current-directory)
-                    (string-append (path->string name) ".plt"))))]
-    [(dir archive-name)
-     (let ([abs-dir (simple-form-path dir)])
-       (parameterize ((current-directory abs-dir))
-         (let ([announcements '()]
-               [warnings '()]
-               [critical-errors '()])
-           
-           (define info.rkt
-             (let ([real-info
-                    (check-info.rkt-sanity 
-                     abs-dir
-                     (λ (msg . args) (set! announcements (cons (apply format msg args) announcements)))
-                     (λ (bad) (set! warnings (cons bad warnings)))
-                     (λ (err) (set! critical-errors (cons err critical-errors))))])
-               (or real-info (λ (x [y (λ () (error 'info.rkt (format "undefined field: ~a" x)))]) (y)))))
-
-           (let ([scribble-files (info.rkt 'scribblings (λ () '()))])
-             
-             (define (outdir file-str)
-               (let* ([filename (file-name-from-path file-str)]
-                      [pathname (regexp-match #rx"(.*)\\.scrbl$" (path->bytes filename))])
-                 (build-path SCRIBBLE-DOCUMENT-DIR (bytes->path (cadr pathname)))))
-             
-             (when (and (build-scribble-docs?)
-                        (file-exists? (collection-file-path "scribble.rkt" "setup")))
-               (with-handlers ([exn:fail? 
-                                (lambda (e)
-                                  (set! critical-errors
-                                        (cons (format "Error generating scribble documentation: ~a" (render-exn e))
-                                              critical-errors)))])
-                 (unless (list? scribble-files)
-                   (error (format (string-append
-                                   "malformed scribblings field; expected"
-                                   " (listof (list string (listof symbol))), received ~e") 
-                                  scribble-files)))
-                 (for ([entry scribble-files])
-                   (unless (scribble-entry? entry)
-                     (error "malformed scribblings entry"))
-                   (let* ([filename (scribble-entry-file entry)]
-                          [flags (scribble-entry-flags entry)])
-                     (unless (and (relative-path? filename) 
-                                  (subpath? abs-dir filename)
-                                  (bytes=? (filename-extension filename) #"scrbl"))
-                       (error (string-append
-                               "illegal scribblings file ~a (must be a file with"
-                               " extension .scrbl in the package directory or a subdirectory")))
-                     (unless (file-exists? (build-path abs-dir filename))
-                       (error (format "scribblings file ~a not found" filename)))
-                     (printf "Building: ~a\n" filename)
-                     (let* ([name.scrbl (file-name-from-path filename)]
-                            [name       (path-replace-suffix name.scrbl #"")])
-                       (render (build-path filename)
-                               (build-path SCRIBBLE-DOCUMENT-DIR name)
-                               (memq 'multi-page flags))))))))
-           
-           (unless (or (null? critical-errors)
-                       (force-package-building?))
-             (raise-user-error '|PLaneT packager| "~a\nRefusing to continue packaging." 
-                               (if (pair? critical-errors)
-                                   (car critical-errors)
-                                   "")))
-
-           (pack archive-name
-                 "archive" 
-                 (list ".") ;; if this changes, the filter (just below) must also change
-                 null
-                 (let ([p-a-f (PLANET-ARCHIVE-FILTER)])
-                   (if p-a-f
-                       (regexp->filter p-a-f)
-                       (λ (p)
-                         (or (for/and ([always-in (list 'same (string->path "planet-docs"))]
-                                       [this-one (explode-path p)])
-                               (equal? always-in this-one))
-                             (std-filter p)))))
-                 #t
-                 'file
-                 #f
-                 #f)
-           
-           (for-each display (reverse announcements))
-           (newline)
-           (for-each (λ (s) (eprintf "WARNING:\n\t~a\n" s))
-                     (reverse warnings))))
-       
-       (simple-form-path archive-name))]))
-
-(define (unpack-planet-archive plt-file target)
-  (parameterize ([current-directory target])
-    (unpack plt-file)))
-
-(define (foreach-planet-archive plt-file on-dir on-file)
-  (fold-plt-archive plt-file
-                    void
-                    void 
-                    (λ (l _)     (on-dir l))
-                    (λ (l fip _) (on-file l fip))
-                    (void)))
-
-;; hash-tree ::= (hash-table [string -o> (union string hash-tree)])
-
-;; chop-path : path -> (listof (union path symbol))
-;; fully chops up the given path into directory list, without
-;; accessing the filesystem
-(define (chop-path path)
-  (let loop ([p path] [acc '()])
-    (cond
-      [(not (path? p)) acc]
-      [else
-       (let-values ([(base name _) (split-path p)])
-         (loop base (cons name acc)))])))
-
-;; ============================================================
-;; hash trees
-
-(define (new-hash-tree)
-  (make-hash))
-
-(define (hash-tree-get htree pth)
-  (let loop ([pth pth]
-             [htree htree]
-             [route '()])
-    (cond
-      [(null? pth) htree]
-      [(not (hash? htree))
-       (error (format "subpath ~s maps to a value" (reverse route)))]
-      [else 
-       (let* ([head (car pth)]
-              [next (hash-ref htree
-                              head
-                              (λ ()
-                                (let ([extension (new-hash-tree)])
-                                  (hash-set! htree head extension)
-                                  extension)))])
-         (loop (cdr pth) next (cons (car pth) route)))])))
-
-(define (hash-tree-put-value htree pth val)
-  (let-values ([(where key) (split-last pth)])
-    (let ([ht (hash-tree-get htree where)])
-      (unless (hash? ht)
-        (error "subpath ~s maps to a value" where))
-      (hash-set! ht key val))))
-
-(define (split-last l)
-  (let loop ([l l]
-             [front '()])
-    (cond
-      [(null? (cdr l)) (values (reverse front) (car l))]
-      [else
-       (loop (cdr l) 
-             (cons (car l) front))])))
-
-(define (hash-tree->list ht)
-  (let ([lst (hash-map ht 
-                       (λ (k v)
-                         (cons k 
-                               (if (hash? v)
-                                   (hash-tree->list v)
-                                   (list v)))))])
-    (sort lst (λ (a b) (string<? (car a) (car b))))))
-              
-;; a 'a treelist is ::= (list string 'a) | (list string ('a treelist) ...)
-
-;; ============================================================
-
-;; print out file treelists (treelists where 'file is the only non-structure
-;; element)
-(define (print-tree t depth)
-  (cond
-    [(and (not (null? (cdr t)))
-          (not (pair? (cadr t))))
-     (printf "~a~a\n" (padding depth) (car t))]
-    [else
-     (printf "~a~a:\n" (padding depth) (car t))
-     (print-tree-list (cdr t) (add1 depth))]))
-
-(define (print-tree-list ts depth)
-  (for-each (λ (t) (print-tree t depth)) ts))
-       
-(define (padding n)
-  (apply string-append (build-list n (λ (_) "  "))))
-
-;; list-plt-file-contents : path-string[.plt-file] -> void
-;; prints out a manifest of the given plt file
-(define (display-plt-file-structure plt-file)
-  
-  (define root (new-hash-tree))
-
-  (define (gen-put f)
-    (λ (path) (f (chop-path (simplify-path path #f)))))
-  
-  (define put-directory
-    (gen-put
-     (λ (ps)
-       (cond
-         [(equal? ps '(same)) (void)]
-         [else (hash-tree-get root (map path->string ps))]))))
-  
-  (define put-file 
-    (gen-put
-     (λ (ps)
-       (hash-tree-put-value root (map path->string ps) 'file))))
-  
-  (foreach-planet-archive
-   plt-file
-   put-directory
-   (λ (p _) (put-file p)))
-  
-  (print-tree-list (hash-tree->list root) 0))
-
-;; display-plt-archived-file : path-string[.plt-file] string -> void
-(define (display-plt-archived-file plt-file file-to-print)
-  (let/ec finished
-    (let ([target (simplify-path file-to-print #f)])
-      (foreach-planet-archive
-       plt-file
-       void
-       (λ (path fip)
-         (when (equal? (simplify-path path #f) target)
-           (copy-port fip (current-output-port))
-           (finished (void))))))
-    (error 'display-archived-plt-file "The given file was not found in the given package")))
-
-;; check-info.rkt-sanity : path (string -> void) (string -> void) (string -> void) -> info.rkt-fn | #f
-;; gets all the info.rkt fields that planet will use (using the info.rkt file
-;; from the current directory) and calls the announce, warn, and fail functions with strings
-;; that describe how PLaneT sees the info.rkt file. NOTA BENE: if this function calls fail, it may 
-;; also warn on the same field, and the warning may not make sense. This is based on the
-;; assumption that errors will be turned into some kind of critical failure that obliterates
-;; all the other information produced.
-(define (check-info.rkt-sanity dir announce warn fail)
-  (with-handlers ([exn:fail:read? 
-                   (λ (e) 
-                     (fail (format "Package has an unreadable info.rkt file. ~a" (render-exn e))) 
-                     #f)]
-                  [exn:fail:syntax? 
-                   (λ (e) 
-                     (fail (format "Package's info.rkt has an syntactically ill-formed info.rkt file: ~a" (render-exn e)))
-                     #f)])
-    (let ([i* (get-info/full dir)])
-      (cond
-        [(not i*) 
-         (warn (string-append
-                "Package has no info.rkt file. This means it will not have"
-                " a description or documentation on the PLaneT web site."))]
-        [else
-         (let ([i (λ (field) (i* field (λ () #f)))])
-           (checkinfo i fail
-                      [name     ; field name 
-                       string?  ; check
-                       (announce "Name: ~a\n" name)  ; success action
-                       (warn "Package's info.rkt file has no name field.") ;failure action
-                       ]
-                      [blurb 
-                       (λ (b) (and (list? b) (andmap xexpr? b)))
-                       (announce "Package blurb: ~s\n" blurb)
-                       (unless blurb
-                         (warn 
-                          (string-append
-                           "Package's info.rkt does not contain a blurb field."
-                           " Without a blurb field, the package will have no description on planet.racket-lang.org.")))]
-                      [release-notes 
-                       (λ (b) (and (list? b) (andmap xexpr? b)))
-                       (announce "Release notes: ~s\n" release-notes)
-                       (unless release-notes
-                         (warn
-                          (string-append
-                           "Package's info.rkt does not contain a release-notes field. Without a release-notes"
-                           " field, the package will not have any listed release information on"
-                           " planet.racket-lang.org beyond the contents of the blurb field.")))]
-                      [categories
-                       (λ (s) (and (list? s) (andmap symbol? s)))
-                       (cond
-                         [(ormap illegal-category categories)
-                          =>
-                          (λ (bad-cat)
-                            (fail (format (string-append
-                                           "Package's info.rkt file contains illegal category \"~a\"."
-                                           " The legal categories are: ~a\n") 
-                                          bad-cat
-                                          legal-categories)))]
-                         [else (announce "Categories: ~a\n" categories)])
-                       (unless categories
-                         (warn (string-append
-                                "Package's info.rkt file does not contain a category listing."
-                                " It will be placed in the Miscellaneous category.")))]
-                      [doc.txt
-                       string?
-                       (announce "doc.txt file: ~a\n" doc.txt)
-                       (when doc.txt
-                         (warn
-                          (string-append
-                           "Package's info.rkt contains a doc.txt entry, which is now considered deprecated."
-                           " The preferred method of documentation for PLaneT packages is now Scribble"
-                           " (see the Scribble documentation included in the Racket distribution for"
-                           " more information).")))]
-                      [html-docs
-                       (lambda (s) (and (list? s) (andmap string? s)))
-                       (warn (string-append
-                              "Package specifies an html-docs entry. The preferred method of documentation"
-                              " for PLaneT packages is now Scribble (see the Scribble documentation included"
-                              " in the Racket distribution for more information)."))]
-                      [scribblings
-                       (lambda (s) 
-                         (and (list? s) 
-                              (andmap scribble-entry? s)))
-                       (void)
-                       (unless scribblings
-                         (warn (string-append
-                                "Package does not specify a scribblings field. Without a scribblings field,"
-                                " the package will not have browsable online documentation.")))]
-                      [homepage 
-                       string?
-                       (cond
-                         [(url-string? homepage)
-                          (announce "Home page: ~a\n" homepage)]
-                         [else
-                          (fail (format (string-append
-                                         "The value of the package's info.rkt homepage field, ~s, "
-                                         "does not appear to be a legal URL.")
-                                        homepage))])]
-                      [primary-file
-                       (λ (x) (or (string? x) (and (list? x) (andmap string? x))))
-                       (begin
-                         (cond
-                           [(string? primary-file) 
-                            (unless (file-in-current-directory? primary-file)
-                              (warn (format (string-append
-                                             "Package's info.rkt primary-file field is ~s, a file that"
-                                             " does not exist in the package.") 
-                                            primary-file)))]
-                           [(pair? primary-file)
-                            (let ([bad-files (filter (λ (f) (not (file-in-current-directory? f))) primary-file)])
-                              (unless (null? bad-files)
-                                (warn (format (string-append
-                                               "Package's info.rkt primary-file field is ~s, which contains"
-                                               " non-existant files ~s.")
-                                              primary-file bad-files))))])
-                         (announce "Primary file: ~a\n" primary-file))
-                       (unless primary-file
-                         (warn 
-                          (string-append
-                           "Package's info.rkt does not contain a primary-file field."
-                           " The package's listing on planet.racket-lang.org will not have a"
-                           " valid require line for your package.")))]
-                      [required-core-version 
-                       core-version?
-                       (announce "Required racket version: ~a\n" required-core-version)]
-                      [repositories
-                       (λ (x) (and (list? x) 
-                                   (srfi1:lset<= equal? x '("3xx" "4.x"))))
-                       (announce "Repositories: ~s\n" repositories)
-                       (unless repositories
-                         (warn (string-append
-                                "Package's info.rkt does not contain a repositories field."
-                                " The package will be listed in all repositories by default.")))]
-                      [version
-                       string?
-                       (announce "Version description: ~a\n" version)]))])
-      i*)))
-
-
-(define (render-exn e)
-  (let ([sp (open-output-string)])
-    (parameterize ([current-output-port sp]
-                   [current-error-port sp])
-      ((error-display-handler) (exn-message e) e))
-    (get-output-string sp)))
-
-;; legal-categories : (listof symbol)
-(define legal-categories
-  '(devtools net media xml datastructures io scientific
-             system ui metaprogramming planet misc))
-
-;; legal-category : symbol -> boolean
-;; determine if the given symbol is a legal category
-(define (legal-category? x) (memq x legal-categories))
-
-;; illegal-category : symbol -> (union symbol false)
-;; returns #f if the symbol is a legal category, or the symbol itself if it isn't
-(define (illegal-category s) (if (legal-category? s) #f s)) 
-
-;; url-string? : string -> boolean
-;; determines if the given string is a reasonable homepage url
-(define (url-string? s)
-  (and (string? s)
-       (let ([u (string->url s)])
-         (and (url-scheme u)
-              (url-host u)))))
-
-;; file-in-current-directory? : string -> boolean
-;; determines if the given string represents a file in the current directory
-(define (file-in-current-directory? f)
-  (and (string? f) (file-exists? f)))
-
-;; core-version : string -> boolean
-;; determines if the given string is something that (version) could've produced
-(define (core-version? s)
-  (and (string? s)
-       (string->mz-version s)))
-
-;; checkinfo: syntax
-;; given an info.rkt function, a failure function, and a bunch of fields to check,
-;; goes through the checklist calling either the success or the failure branch
-;; of each check as appropriate
-(define-syntax checkinfo
-  (syntax-rules ()
-    [(checkinfo fn fail clauses ...)
-     (let ([fn* fn] [fail* fail])
-       (checkinfo* () fn* fail* clauses ...))]))
-
-(define-syntax checkinfo*
-  (syntax-rules ()
-    [(checkinfo* () fn fail) (void)]
-    [(checkinfo* (handler1 handler ...) fn fail) (begin handler1 handler ...)]
-    [(checkinfo* (handler ...) fn fail [id check on-success] clauses ...)
-     (checkinfo* (handler ...) fn fail [id check on-success void] clauses ...)]
-    [(checkinfo* (handler ...) fn fail [id check on-success on-fail] clauses ...)
-     (checkinfo*
-      (handler ...
-       (let ([id (fn 'id)])
-         (cond
-           [id
-            (let ([checked (check id)])
-              (unless checked
-                on-fail
-                (fail (format "Package's info.rkt contained a malformed ~a field." 'id)))
-              on-success)]
-           [else on-fail])))
-      fn fail clauses ...)]))
-
-;; ============================================================
-;; HARD LINKS (aka development links)
-
-;; add-hard-link : string string num num path -> void
-;; adds an entry in the hard-links table associating the given
-;; require spec to the given path
-(define (add-hard-link owner pkg-name maj min path)
-  (unless (directory-exists? path)
-    (if (file-exists? path)
-        (error 'add-hard-link "Hard links must point to directories, not files")
-        (eprintf "Warning: directory ~a does not exist\n"
-                 (path->string path))))
-  (add-hard-link! pkg-name (list owner) maj min path))
-
-;; remove-hard-link : string string num num (#:quiet boolean) -> void
-;; removes any development association from the given package spec
-(define (remove-hard-link owner pkg-name maj min #:quiet? [quiet? #false])
-  (define (matching-link? row)
-    (points-to? row pkg-name (list owner) maj min))
-  (when (and (empty? (filter matching-link? (get-hard-link-table)))
-             (not quiet?))
-    (error "no existing links match the given specification"))
-  (filter-link-table!
-   (lambda (row) (not (matching-link? row)))
-   (lambda (row) 
-     (let ([p (row->package row)])
-       (when p
-         (erase-metadata p))))))
-
-;; ============================================================
-;; VERSION INFO
-;;  re-provided here for backwards compatibility (no idea 
-;;  why it was here in the first place, actually)
-(provide this-package-version
-         this-package-version-name
-         this-package-version-owner
-         this-package-version-maj
-         this-package-version-min
-         this-package-version-symbol
-         package-version->symbol
-         make-planet-symbol
-         path->package-version)
diff --git a/pkgs/planet-pkgs/planet-lib/planet/version.rkt b/pkgs/planet-pkgs/planet-lib/planet/version.rkt
deleted file mode 100644
index df1d8f07a1..0000000000
--- a/pkgs/planet-pkgs/planet-lib/planet/version.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-
-(provide this-package-version
-         this-package-version-name
-         this-package-version-owner
-         this-package-version-maj
-         this-package-version-min
-         this-package-version-symbol
-         this-package-in
-         make-planet-symbol
-         package-version->symbol)
-
-(require
- "private/version.rkt"
- (for-syntax
-  racket/base
-  racket/require-transform
-  syntax/parse
-  planet/syntax))
-
-(define-syntax this-package-in
-  (make-require-transformer
-   (lambda (stx)
-     (define-syntax-class suffix
-       #:description "module suffix identifier"
-       (pattern (~datum main) #:attr suf #f)
-       (pattern suf:id))
-     (syntax-parse stx
-       [(_ s:suffix ...)
-        (expand-import
-         #`(combine-in
-            #,@(for/list ([src (in-list (attribute s))]
-                          [suf (in-list (attribute s.suf))])
-                 (make-planet-require-spec src suf))))]))))
diff --git a/pkgs/planet-pkgs/planet-test/LICENSE.txt b/pkgs/planet-pkgs/planet-test/LICENSE.txt
deleted file mode 100644
index f486e9baa4..0000000000
--- a/pkgs/planet-pkgs/planet-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-planet-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/planet-pkgs/planet-test/info.rkt b/pkgs/planet-pkgs/planet-test/info.rkt
deleted file mode 100644
index 4c7e5b5e0a..0000000000
--- a/pkgs/planet-pkgs/planet-test/info.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "tests for \"planet-lib\"")
-
-(define pkg-authors '(mflatt robby))
-(define build-deps '("racket-index"
-                     "eli-tester"
-                     "planet-lib"
-                     "rackunit-lib"
-                     "scheme-lib"))
-(define update-implies '("planet-lib"))
-
-(define test-omit-paths
-  '("tests/planet/examples"))
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/cmdline-tool.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/cmdline-tool.rkt
deleted file mode 100644
index 39e807bd3c..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/cmdline-tool.rkt
+++ /dev/null
@@ -1,330 +0,0 @@
-#lang racket
-
-#|
-
-This runs a bunch of integration tests for the planet command-line tool,
-using 'system' to call out to the tool and then reading its results, etc.
-
-|#
-
-;; do nothing via 'raco test' because run-all.rkt runs this test
-;; and that way we can guarantee they run sequentially in drdr
-(module test racket/base)
-
-(require racket/system
-         planet/config
-         net/url)
-
-(define debug? #f)
-
-(define raco-bin-path
-  (simplify-path (build-path (collection-path "racket") 'up 'up  
-                             (if (eq? (system-type) 'windows)
-                                 "raco.exe"
-                                 (build-path "bin" "raco")))))
-
-(define test-connection-spec '("planet" "test-connection.plt" "1" "0"))
-(define test-connection.plt-cache
-  (apply build-path
-         (UNINSTALLED-PACKAGE-CACHE) 
-         (append test-connection-spec
-                 (list (list-ref test-connection-spec 1)))))
-
-(define (call-planet . args)
-  (when debug? (printf "~s\n" (cons 'call-planet args)))
-  (let ([sp (open-output-string)])
-    (parameterize ([current-input-port (open-input-string "")]
-                   [current-output-port sp]
-                   [current-error-port sp])
-      (apply system* raco-bin-path "planet" args))
-    (when debug? (display (get-output-string sp)))
-    (get-output-string sp)))
-
-(let ([result (call-planet "show")])
-  (unless (regexp-match #rx"No packages" result)
-    (error 'cmdline-tool.rkt 
-           (string-append 
-            "please clear out all planet packages before running this test.\n"
-            "============================================================\n~a" 
-            result))))
-  
-(when (file-exists? test-connection.plt-cache)
-  (delete-file test-connection.plt-cache))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;   planet install, w/out cached file
-;;
-
-(define (do-install w-w/out)
-  (printf "Installing test-connection.plt (~a cached .plt) ... " w-w/out) (flush-output)
-  (void (apply call-planet "install" test-connection-spec))
-  (printf "done\n")
-  (cond
-    [(regexp-match #rx"test-connection.plt" (call-planet "show"))
-     (printf "Installed successfully\n")]
-    [else
-     (error 'cmdline-tool.rkt "Installation failed\n")])
-  
-  (unless (file-exists? test-connection.plt-cache)
-    (error 'cmdline-tool.rkt "Installation did not populate ~s" test-connection.plt-cache)))
-
-  
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  planet remove
-;;
-
-(define (do-remove)
-  (printf "Removing test-connection.plt ... ") (flush-output)
-  (void (apply call-planet "remove" test-connection-spec))
-  (printf "done\n")
-  (cond
-    [(regexp-match #rx"test-connection.plt" (call-planet "show"))
-     (error 'cmdline-tool.rkt "Removal failed\n")]
-    [else
-     (printf "Removed successfully\n")])
-  
-  (unless (file-exists? test-connection.plt-cache)
-    (error 'cmdline-tool.rkt "Removal removed ~s" test-connection.plt-cache)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  planet fetch vs planet url
-;;  
-
-;; NB: this test leaves behind test-connection.plt, which other tests rely on
-
-(define (fetch-vs-url)
-  (define direct-file (format "direct-~a" (list-ref test-connection-spec 1)))
-  
-
-  (ensure-not-there direct-file)
-  (ensure-not-there (list-ref test-connection-spec 1))
-  (printf "Downloading test-connection.plt (2 ways) ... ")
-  (flush-output)
-  
-  (define direct-download-thread
-    (thread
-     (λ ()
-       (call-with-output-file direct-file
-         (λ (f-port)
-           (call/input-url (string->url (apply call-planet "url" test-connection-spec))
-                           get-pure-port
-                           (λ (u-port)
-                             (copy-port u-port f-port))))
-         #:exists 'truncate))))
-  
-  (void (apply call-planet "fetch" test-connection-spec))
-  (thread-wait direct-download-thread)
-  (printf "done\n")
-  
-  (unless (same-file? direct-file (list-ref test-connection-spec 1))
-    (error 'cmdline-tool.rkt
-           (string-append
-            "expected planet fetch and planet url to point at the same file,"
-            " but found different ones")))
-  
-  (delete-file direct-file)
-  (printf "Download succesful\n"))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  planet fileinject
-;;
-
-(define (do-fileinject)
-  (printf "Running fileinject ... ")
-  (flush-output)
-  (apply call-planet "fileinject" test-connection-spec)
-  (printf "done\n")
-  (unless (regexp-match #rx"test-connection.plt" (call-planet "show"))
-    (error 'cmdline-tool.rkt "expected a fileinject to show up in planet info"))
-  (apply call-planet "remove" test-connection-spec)
-  (when (regexp-match #rx"test-connection.plt" (call-planet "show"))
-    (error 'cmdline-tool.rkt "expected remove (after fileinject) to remove test-connection.plt"))
-  (printf "Fileinject successful\n"))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  planet sructure & open
-;;
-
-(define (do-structure)
-  (printf "Running open vs structure & print test ... ")
-  (flush-output)
-  (define structure-files 
-    (filter
-     (λ (x) (not (equal? "" x)))
-     (sort 
-      (regexp-split #rx"\n" (call-planet "structure" (list-ref test-connection-spec 1)))
-      string<=?)))
-  (define tmp-dir "test-connection-contents")
-  (when (directory-exists? tmp-dir)
-      (error 'cmdline-tool.rkt "expected the directory ~a to not exist" tmp-dir))
-  (call-planet "open" (list-ref test-connection-spec 1) tmp-dir)
-  (define open-files
-    (sort (let f/d-loop ([f/d #f]
-                         [acc '()])
-            (let ([this-one (if f/d
-                                (build-path tmp-dir f/d)
-                                tmp-dir)])
-              (cond
-                [(file-exists? this-one) 
-                 (cons (path->string f/d) acc)]
-                [(directory-exists? this-one)
-                 (let loop ([contents (directory-list this-one)]
-                            [acc acc])
-                   (cond
-                     [(null? contents) acc]
-                     [else
-                      (loop (cdr contents)
-                            (f/d-loop (if f/d 
-                                          (build-path f/d (car contents))
-                                          (car contents))
-                                      acc))]))]
-                [else acc])))
-          string<=?))
-  
-  (define doc.txt-print (call-planet "print" (list-ref test-connection-spec 1) "doc.txt"))
-  (define doc.txt-fetch (let ([sp (open-output-string)])
-                          (call-with-input-file (build-path tmp-dir "doc.txt")
-                            (λ (port)
-                              (copy-port port sp)))
-                          (get-output-string sp)))
-  
-  (delete-directory/files tmp-dir)
-  (printf "done\n")
-  (unless (equal? open-files structure-files)
-    (error 'cmdline-tool.rkt 
-           "expected planet structure to produce the same files as planet open, got ~s and ~s"
-           structure-files 
-           open-files))
- 
-  (unless (equal? doc.txt-fetch doc.txt-print)
-    (error 'cmdline-tool.rkt
-           "expected planet print to produce the same content as the actual file, got\n~s\nand\n~s"
-           doc.txt-print
-           doc.txt-fetch)))
-    
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  planet create
-;;
-
-(define files
-  '(("info.rkt"
-     #<<--
-#lang info
-
-(define name "the-name")
-(define blurb
-  (list "the blurb"))
-(define primary-file "main.rkt")
-(define scribblings '(("doc.scrbl")))
-(define release-notes '("release notes"))
-(define categories '(misc))
-(define repositories '("4.x"))
---
-     )
-    ("doc.scrbl" 
-     #<<--
-#lang scribble/doc
-@(require scribble/base)
-@title{the docs}
---
-     )
-    ("main.rkt" "#lang racket\n(provide the-export)\n(define the-export 1)\n")))
-     
-(define (do-create)
-  (printf "Running create test ... ")
-  (flush-output)
-  (define tmp-root-dir (make-temporary-file "planet-cmdline-tool-test-create-~a" 'directory))
-  (define tmp-dir (build-path tmp-root-dir "the-source"))
-  (define plt-file (build-path tmp-root-dir "the-source.plt"))
-  (make-directory tmp-dir)
-  (for ([f (in-list files)])
-    (define file (list-ref f 0))
-    (define contents (list-ref f 1))
-    (call-with-output-file (build-path tmp-dir file)
-      (λ (port) (display contents port))))
-  (define output (parameterize ([current-directory tmp-root-dir])
-                   (call-planet "create" (path->string tmp-dir))))
-  (cond
-    [(or (regexp-match #rx"[Ee]rror" output)
-         (regexp-match #rx"Refusing" output)
-         (regexp-match #rx"=== context ===" output))
-     (eprintf "error during planet create test:\n~a" output)]
-    [(regexp-match #rx"WARNING" output)
-     (eprintf "warning during planet create test:\n~a" output)]
-    [else
-     (define contents 
-       (filter
-        (λ (x) (not (equal? x "")))
-        (sort (regexp-split #rx"\n" (call-planet "structure" (path->string plt-file)))
-              string<=?)))
-     (unless (equal? contents
-                     (list "    index.html"
-                           "    scribble-common.js"
-                           "    scribble-style.css"
-                           "    scribble.css"
-                           "  doc:"
-                           "doc.scrbl"
-                           "info.rkt"
-                           "main.rkt"
-                           "planet-docs:"))
-       (eprintf "planet create test doesn't contain expected stuff; got:\n  ~s\n"
-                contents))])
-  
-  (delete-directory/files tmp-root-dir)
-  (printf "done\n"))
-                           
-    
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  util
-;;
-  
-(define (ensure-not-there fn)
-  (when (file-exists? fn)
-    (error 'cmdline-tool.rkt
-           (string-append
-            "test script expects no file named ~a to exist in the current directory"
-            " (may have been left behind by test script, tho ... (which would be a bug))")
-           fn)))
-
-;; same-file? : string-or-port string-or-port -> boolean
-;; compares the contents of f1 and f2
-(define (same-file? f1 f2)
-  (call-with-input-file f1
-    (λ (direct-port)
-      (call-with-input-file f2
-        (λ (via-planet-port)
-          (let loop ()
-            (let ([b1 (read-byte direct-port)]
-                  [b2 (read-byte via-planet-port)])
-              (cond
-                [(equal? b1 b2)
-                 (if (eof-object? b1)
-                     #t
-                     (loop))]
-                [else #f]))))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; main
-;;
-
-(fetch-vs-url)
-(do-install "without")
-(do-remove)
-(do-install "with")
-(do-remove)
-(do-fileinject)
-(do-structure)
-(do-create)
-
-(delete-file (list-ref test-connection-spec 1))
-(printf "Finished tests\n")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/docs-build.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/docs-build.rkt
deleted file mode 100644
index 93a2325909..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/docs-build.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang racket/base
-(require racket/file 
-         racket/system
-         racket/port
-         planet/util)
-
-;; do nothing via 'raco test' because run-all.rkt runs this test
-;; and that way we can guarantee they run sequentially in drdr
-(module test racket/base)
-
-
-(define files
-  '(("info.rkt"
-     #<<--
-#lang info
-
-(define name "planet-docs-test")
-(define scribblings '(("docs.scrbl")))
-
---
-     )
-    ("docs.scrbl"
-     #<<--
-#lang scribble/doc
-
-@(require scribble/manual)
-
-@title{AWESOMENESS!!1!!}
-@author{Bob Trotsky}
-
---
-     )))
-
-(define planet-docs-test (make-temporary-file "planet-docs-test-~a" 'directory))
-(for ([file (in-list files)])
-  (call-with-output-file (build-path planet-docs-test (list-ref file 0))
-    (λ (port)
-      (display (list-ref file 1) port))))
-
-(add-hard-link "planet" "docs-test.plt" 1 0 planet-docs-test)
-
-(define raco-bin-path
-  (simplify-path (build-path (collection-path "racket") 'up 'up "bin" "raco")))
-
-;; send all of the output of 'raco setup' to stdout
-;; and to 'sp' and then check to see if there is an 
-;; error by grepping for 'error running' in order
-;; to cooperate with drdr more effectively
-(define-values (in out) (make-pipe))
-(define sp (open-output-string))
-(define thd (thread (λ () (copy-port in (current-output-port) sp))))
-
-(define res
-  (parameterize ([current-output-port out]
-                 [current-error-port out])
-    (system* (path->string raco-bin-path)
-             "setup" "-xind" "-P" "planet" "docs-test.plt" "1" "0")))
-
-(remove-hard-link "planet" "docs-test.plt" 1 0)
-
-;; run raco setup a second time to clear out the
-;; indices that were added by running docs-test.plt.
-(define res2
-  (parameterize ([current-output-port out]
-                 [current-error-port out])
-    (system* (path->string raco-bin-path)
-             "setup" "-xin")))
-
-;; make sure all of the output has appeared
-(close-output-port out)
-(thread-wait thd)
-
-(cond
-  [(or (not res)
-       (not res2)
-       (regexp-match #rx"error running" (get-output-string sp)))
-   (eprintf "FAILED test (res ~s res2 ~s)\n" res res2)]
-  [else
-   (printf "PASSED\n")])
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-module.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-module.rkt
deleted file mode 100644
index 01b54b75dd..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-module.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang planet plt/dummy-package
-
-successful
-test
-result
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-package/lang/reader.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-package/lang/reader.rkt
deleted file mode 100644
index a775ac8e4a..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-package/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-#:language '(planet plt/dummy-package)
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-package/main.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-package/main.rkt
deleted file mode 100644
index d8297d1489..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-package/main.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang scheme
-
-(define-syntax (module-begin stx)
-  (syntax-case stx ()
-    [(_ term ...)
-     (syntax/loc stx
-       (#%module-begin
-        (define result '(term ...))
-        (provide result)))]))
-
-(provide (rename-out [module-begin #%module-begin]))
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-package/me.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-package/me.rkt
deleted file mode 100644
index d0fbb6151d..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/dummy-package/me.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require planet/version)
-(provide me)
-(define me (this-package-version))
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/doc.scrbl b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/doc.scrbl
deleted file mode 100644
index c662f783ce..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/doc.scrbl
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang scribble/manual
-
-@(require
-   planet/version
-   planet/scribble
-   (for-label
-     racket/base
-     (this-package-in
-       require-mod require-one require-two require-three require-four
-       lang-mod lang-one lang-two lang-three lang-four
-       reader-mod reader-one reader-two reader-three reader-four
-       lib main)))
-
-@title{Sample Planet Package: @racket[#,(this-package-version-symbol)]}
-
-@declare-exporting/this-package[lib main]
-@defmodule*/no-declare/this-package[(lib main)]
-
-@racketmod/this-package[
-main
-(code:comment "Uh oh, no bindings!")
-]
-
-Here we document @racketmodname/this-package[lib], which is also the
-@racketmodlink/this-package[main]{main library} of this package.
-
-@defthing[x any/c]{Solve for @racket[x].}
-
-@section{Require}
-
-@subsection[#:tag-prefix "require"]{One}
-@defmodule/this-package[require-mod]
-@;(@defthing[x any/c]{Solve for @racket[x].})
-
-@subsection[#:tag-prefix "require"]{Many}
-@defmodule*/this-package[(require-one require-two)]
-@;(@defthing[x any/c]{Solve for @racket[x].})
-
-@subsection[#:tag-prefix "require"]{None}
-@defmodule*/no-declare/this-package[(require-three require-four)]
-@;(@defthing[x any/c]{Solve for @racket[x].})
-
-@section{Lang}
-
-@subsection[#:tag-prefix "lang"]{One}
-@defmodulelang/this-package[lang-mod]
-@;(@defthing[x any/c]{Solve for @racket[x].})
-
-@subsection[#:tag-prefix "lang"]{Many}
-@defmodulelang*/this-package[(lang-one lang-two)]
-@;(@defthing[x any/c]{Solve for @racket[x].})
-
-@subsection[#:tag-prefix "lang"]{None}
-@defmodulelang*/no-declare/this-package[(lang-three lang-four)]
-@;(@defthing[x any/c]{Solve for @racket[x].})
-
-@section{Reader}
-
-@subsection[#:tag-prefix "reader"]{One}
-@defmodulereader/this-package[reader-mod]
-@;(@defthing[x any/c]{Solve for @racket[x].})
-
-@subsection[#:tag-prefix "reader"]{Many}
-@defmodulereader*/this-package[(reader-one reader-two)]
-@;(@defthing[x any/c]{Solve for @racket[x].})
-
-@subsection[#:tag-prefix "reader"]{None}
-@defmodulereader*/no-declare/this-package[(reader-three reader-four)]
-@;(@defthing[x any/c]{Solve for @racket[x].})
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/info.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/info.rkt
deleted file mode 100644
index 2032672449..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define name "Sample Package")
-(define scribblings '(("doc.scrbl")))
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-four.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-four.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-four.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-mod.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-mod.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-mod.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-one.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-one.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-one.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-three.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-three.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-three.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-two.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-two.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lang-two.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lib.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lib.rkt
deleted file mode 100644
index fa23c7281e..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/lib.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide x)
-(define x 1)
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/main.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/main.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/main.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-four.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-four.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-four.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-mod.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-mod.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-mod.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-one.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-one.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-one.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-three.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-three.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-three.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-two.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-two.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/reader-two.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-four.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-four.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-four.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-mod.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-mod.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-mod.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-one.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-one.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-one.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-three.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-three.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-three.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-two.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-two.rkt
deleted file mode 100644
index cfc81bcc2f..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/examples/scribblings-package/require-two.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket
-(provide (all-from-out "lib.rkt"))
-(require "lib.rkt")
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/info.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/info.rkt
deleted file mode 100644
index e753b10bd8..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("examples"))
-(define test-omit-paths '("examples"))
-
-(define test-responsibles '((all (robby jay))))
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/lang.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/lang.rkt
deleted file mode 100644
index 3e90c0e391..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/lang.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang scheme/base
-(require planet/util
-         scheme/runtime-path
-         tests/eli-tester)
-
-;; do nothing via 'raco test' because run-all.rkt runs this test
-;; and that way we can guarantee they run sequentially in drdr
-(module test racket/base)
-
-(define-runtime-path here ".")
-(define (in-here path) (path->string (build-path here path)))
-
-(test
-
- ;; Testing: #lang planet
- (add-hard-link "plt" "dummy-package.plt" 1 0
-                (string->path (in-here "examples/dummy-package")))
- => (void)
- (dynamic-require `(file ,(in-here "examples/dummy-module.rkt")) 'result)
- => '(successful test result)
- (dynamic-require '(planet plt/dummy-package/me) 'me)
- => '("plt" "dummy-package.plt" 1 0)
- (remove-hard-link "plt" "dummy-package.plt" 1 0)
- => (void)
-
- )
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/run-all.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/run-all.rkt
deleted file mode 100644
index c9f5de70b7..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/run-all.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-
-#|
-
-Run all of the PLaneT tests sequentially since they 
-manipulate the planet state in ways that doesn't work
-in parallel
-
-|#
-
-(module test racket/base
-  (require racket/path)
-  (module config info
-    (define timeout 500))
-  
-  (require racket/runtime-path)
-  (define-runtime-path me "run-all.rkt")
-  
-  (define ran-tests '())
-  
-  (dynamic-wind
-   void
-   (λ ()
-     (for ([test (in-list (sort (directory-list (path-only me))
-                                string<=?
-                                #:key (λ (x) (format "~s" x))))])
-       (when (file-exists? (build-path (path-only me) test))
-         (when (regexp-match #rx"rkt$" (path->string test))
-           (unless (equal? (file-name-from-path me)
-                           test)
-             (flush-output)
-             (printf "============================================================\nrunning ~a\n"
-                     test)
-             (dynamic-require (build-path (path-only me) test) #f)
-             (printf "finished ~a\n\n"
-                     test)
-             (set! ran-tests (cons test ran-tests)))))))
-   (λ ()
-     (printf "\nran: ~a\n" ran-tests))))
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/submod.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/submod.rkt
deleted file mode 100644
index c5e3fc2fac..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/submod.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket
-(require setup/dirs)
-
-;; do nothing via 'raco test' because run-all.rkt runs this test
-;; and that way we can guarantee they run sequentially in drdr
-(module test racket/base)
-
-
-(define raco (build-path (find-console-bin-dir)
-                         (if (eq? 'windows (system-type))
-                             "raco.exe"
-                             "raco")))
-
-(void
- (system* raco "planet" "link" "racket-tester" "p1.plt" "1" "0"
-          (path->string (collection-path "tests" "compiler" "embed" "embed-planet-1"))))
-
-(define (test expected got)
-  (unless (equal? expected got)
-    (error "failed")))
-
-(define-syntax-rule (test/exn e)
-  (test 'exn
-        (with-handlers ([exn:fail? (lambda (exn) 'exn)])
-          e)))
-
-(test #f (module-declared? `(submod (planet racket-tester/p1) reader) #f))
-(test #f (module-declared? `(planet racket-tester/p1) #f))
-(test #f (module-declared? `(planet racket-tester/p1/none) #f))
-
-(test/exn (module-declared? `(planet racket-tester/p1/none) #t))
-(test #f (module-declared? `(submod (planet racket-tester/p1/none) reader) #t))
-
-
-(test #f (module-declared? `(submod (planet racket-tester/p1) reader) #t))
-(test #t (module-declared? `(planet racket-tester/p1) #f))
-
-(test #f (module-declared? `(submod (planet racket-tester/p1/has-sub) the-sub) #f))
-(test #t (module-declared? `(submod (planet racket-tester/p1/has-sub) the-sub) #t))
-
-(void
- (system* raco "planet" "unlink" "racket-tester" "p1.plt" "1" "0"))
-
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/test-docs-complete.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/test-docs-complete.rkt
deleted file mode 100644
index c64d4af17a..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/test-docs-complete.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs 'planet/version)
-(check-docs 'planet/util)
-(check-docs 'planet/syntax)
-(check-docs 'planet/scribble)
-(check-docs 'planet/resolver)
-(check-docs 'planet/raco)
-(check-docs 'planet/planet)
-(check-docs 'planet/planet-archives)
-(check-docs 'planet/config)
-(check-docs 'planet/cachepath)
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/thread-safe-resolver.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/thread-safe-resolver.rkt
deleted file mode 100644
index 057d833b1d..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/thread-safe-resolver.rkt
+++ /dev/null
@@ -1,113 +0,0 @@
-#lang racket/base
-(require planet/util
-         rackunit
-         racket/port)
-
-;; do nothing via 'raco test' because run-all.rkt runs this test
-;; and that way we can guarantee they run sequentially in drdr
-(module test racket/base)
-
-(define debug? #t)
-
-(define (install-one package-spec key)
-  (define op (open-output-string))
-  (parameterize ([current-output-port op]
-                 [current-namespace (make-base-namespace)])
-    (dynamic-require package-spec #f))
-  (unless (regexp-match #rx"working properly" (get-output-string op))
-    (error 'install-one "installation failed; key ~s" key)))
-
-(define (find-test-connection-dir package-spec)
-  (define-values (base name dir?)
-    (split-path
-     (resolved-module-path-name
-      ((current-module-name-resolver) 
-       package-spec 
-       #f #f #f))))
-  (define-values (base2 name2 dir?2)
-    (split-path base))
-  base2)
-
-(define (dir-tree-and-sizes path)
-  (let loop ([path path]
-             [inside-compiled? #f])
-    (define-values (base name dir?) (split-path path))
-    (define s-name (path->string name))
-    (cond
-      [(directory-exists? path)
-       (cons s-name
-             (map (λ (x) (loop (build-path path x) 
-                               (or inside-compiled?
-                                   (equal? "compiled" s-name))))
-                  (directory-list path)))]
-      [(file-exists? path)
-       (list s-name (if inside-compiled?
-                        'ignore-sizes-inside-compiled-dirs
-                        (file-size path)))]
-      [else
-       (list s-name #f)])))
-
-
-(define lr (make-log-receiver (current-logger) 'info))
-(define docs-build-chan (make-channel))
-
-;; get-docs-build-count : -> number
-;; effect: aborts the loop that watches the docs build counting
-(define (get-docs-build-count)
-  (define new-chan (make-channel))
-  (channel-put docs-build-chan new-chan)
-  (channel-get new-chan))
-(void
- (thread
-  (λ ()
-    (let loop ([num 0])
-      (sync
-       (handle-evt
-        lr
-        (λ (vec)
-          (when debug?
-            (printf "~a\n" (vector-ref vec 1)))
-          (loop
-           (if (regexp-match #rx"raco setup: --- building documentation ---"
-                             (vector-ref vec 1))
-               (+ num 1)
-               num))))
-       (handle-evt
-        docs-build-chan
-        (λ (return)
-          (channel-put return num))))))))
-
-(let ([package-spec '(planet "test-connection-mzscheme.scm" 
-                             ("planet" "test-connection.plt" 1 (= 0)))])
-  (printf "installing for the first time\n")
-  (install-one package-spec 'seq1)
-  (define test-connection-dir (find-test-connection-dir package-spec))
-  (define non-parallel-install-sizes (dir-tree-and-sizes test-connection-dir))
-  (printf "removing the first one\n")
-  
-  (parameterize ([current-output-port (if debug?
-                                          (current-output-port)
-                                          (open-output-nowhere))])
-    (remove-pkg "planet" "test-connection.plt" 1 0))
-
-  (printf "installing in parallel\n")
-  (define thds
-    (for/list ([x (in-range 0 10)])
-      (thread (λ () (install-one package-spec 'par1)))))
-  (for ([thd (in-list thds)])
-    (thread-wait thd))
-  
-  (define parallel-install-sizes (dir-tree-and-sizes test-connection-dir))
-  
-  (check-equal? parallel-install-sizes
-                non-parallel-install-sizes)
-  
-  (printf "removing the parallel one\n")
-  (parameterize ([current-output-port (if debug?
-                                          (current-output-port)
-                                          (open-output-nowhere))])
-    (remove-pkg "planet" "test-connection.plt" 1 0))
-  
-  (check-equal? (get-docs-build-count)
-                6))
-
diff --git a/pkgs/planet-pkgs/planet-test/tests/planet/version.rkt b/pkgs/planet-pkgs/planet-test/tests/planet/version.rkt
deleted file mode 100644
index 5d8ac058a2..0000000000
--- a/pkgs/planet-pkgs/planet-test/tests/planet/version.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang scheme
-
-(require planet/private/planet-shared)
-
-(define-syntax (test stx)
-  (syntax-case stx ()
-    [(_ a b)
-     (with-syntax ([line (syntax-line stx)]
-                   [file (let ([s (syntax-source stx)])
-                           (if (string? s)
-                               s
-                               "<<unknown file>>"))])
-       #`(test/proc file line a b))]))
-
-(define (test/proc file line got expected)
-  (unless (equal? got expected)
-    (error 'test.rkt "FAILED ~a: ~s\n     got ~s\nexpected ~s" file line got expected)))
-
-
-(test (string->mz-version "372")
-      (make-mz-version 372 0))
-
-(test (string->mz-version "372.2")
-      (make-mz-version 372 2000))
-
-(test (string->mz-version "4.0")
-      (make-mz-version 400 0))
-
-(test (string->mz-version "4.1")
-      (make-mz-version 401 0))
-
-(test (string->mz-version "4.0.1")
-      (make-mz-version 400 1000))
-
-(test (string->mz-version "4..1")
-      #f)
-
-(printf "tests passed\n")
diff --git a/pkgs/planet-pkgs/planet/LICENSE.txt b/pkgs/planet-pkgs/planet/LICENSE.txt
deleted file mode 100644
index 60c6395e47..0000000000
--- a/pkgs/planet-pkgs/planet/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-planet
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/planet-pkgs/planet/info.rkt b/pkgs/planet-pkgs/planet/info.rkt
deleted file mode 100644
index bcdd37a3e8..0000000000
--- a/pkgs/planet-pkgs/planet/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("planet-lib" "planet-doc"))
-(define implies '("planet-lib" "planet-doc"))
-
-(define pkg-desc "Legacy support for automatic package distribution")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/plot-pkgs/plot-compat/LICENSE.txt b/pkgs/plot-pkgs/plot-compat/LICENSE.txt
deleted file mode 100644
index dbb89375c4..0000000000
--- a/pkgs/plot-pkgs/plot-compat/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-plot
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/plot-pkgs/plot-compat/info.rkt b/pkgs/plot-pkgs/plot-compat/info.rkt
deleted file mode 100644
index 1efe590f32..0000000000
--- a/pkgs/plot-pkgs/plot-compat/info.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "plot-gui-lib"
-               "draw-lib"
-               "plot-lib"
-               "snip-lib"
-               "unstable-latent-contract-lib"))
-
-(define build-deps '())
-
-(define pkg-desc "Compatibility library for Plot 5.1.3 and earlier")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/plot-pkgs/plot-compat/plot/compat.rkt b/pkgs/plot-pkgs/plot-compat/plot/compat.rkt
deleted file mode 100644
index 130aaaac70..0000000000
--- a/pkgs/plot-pkgs/plot-compat/plot/compat.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require "private/compat.rkt")
-(provide (all-from-out "private/compat.rkt"))
diff --git a/pkgs/plot-pkgs/plot-compat/plot/info.rkt b/pkgs/plot-pkgs/plot-compat/plot/info.rkt
deleted file mode 100644
index e0c94f2762..0000000000
--- a/pkgs/plot-pkgs/plot-compat/plot/info.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang info
diff --git a/pkgs/plot-pkgs/plot-compat/plot/private/compat.rkt b/pkgs/plot-pkgs/plot-compat/plot/private/compat.rkt
deleted file mode 100644
index 4d64a08651..0000000000
--- a/pkgs/plot-pkgs/plot-compat/plot/private/compat.rkt
+++ /dev/null
@@ -1,199 +0,0 @@
-#lang racket/base
-
-;; A compatibility module for the old 'plot'.
-
-(require racket/contract racket/class racket/snip racket/draw racket/vector
-         unstable/latent-contract unstable/latent-contract/defthing
-         ;; Plotting
-         plot/private/common/math
-         plot/private/common/contract
-         plot/private/common/plot-element
-         plot/private/plot2d/plot-area
-         plot/private/plot3d/plot-area
-         (prefix-in new. (only-in plot
-                                  x-axis y-axis
-                                  plot-x-ticks plot-y-ticks plot-z-ticks
-                                  points error-bars vector-field
-                                  plot-title plot-x-label plot-y-label plot-z-label
-                                  plot-foreground plot-background
-                                  plot3d-angle plot3d-altitude))
-         plot/private/deprecated/renderers
-         ;; Miscellaneous
-         plot/private/deprecated/math)
-
-(provide mix
-         (activate-contract-out plot-color?
-                                plot plot3d
-                                points vector-field error-bars
-                                line
-                                contour shade
-                                surface)
-         (only-doc-out (all-defined-out))
-         ;; Miscellaneous
-         make-vec derivative gradient)
-
-(define (mix . data)
-  (for/fold ([f  (λ (area) (void))]) ([d  (in-list data)])
-    (λ (area)
-      (f area)
-      (d area)
-      (void))))
-
-(defproc (plot-color? [v any/c]) boolean?
-  (and (member v '(white black yellow green aqua pink wheat gray brown blue violet cyan
-                         turquoise magenta salmon red))
-       #t))
-
-(define ((renderer2d->plot-data r) area)
-  ((renderer2d-render-proc r) area)
-  (void))
-
-(define ((renderer3d->plot-data r) area)
-  ((renderer3d-render-proc r) area)
-  (void))
-
-;; ===================================================================================================
-;; Plotting
-
-(define x-axis-data (renderer2d->plot-data (new.x-axis)))
-(define y-axis-data (renderer2d->plot-data (new.y-axis)))
-
-(defproc (plot [data ((is-a?/c 2d-plot-area%) . -> . void?)]
-               [#:width width real? 400] [#:height height real? 400]
-               [#:x-min x-min real? -5] [#:x-max x-max real? 5]
-               [#:y-min y-min real? -5] [#:y-max y-max real? 5]
-               [#:x-label x-label string? "X axis"] [#:y-label y-label string? "Y axis"]
-               [#:title title string? ""]
-               [#:fgcolor fgcolor (list/c byte? byte? byte?) '(0 0 0)]
-               [#:bgcolor bgcolor (list/c byte? byte? byte?) '(255 255 255)]
-               [#:lncolor lncolor (list/c byte? byte? byte?) '(255 0 0)]
-               [#:out-file out-file (or/c path-string? output-port? #f) #f]
-               ) (is-a?/c image-snip%)
-  (define x-ticks ((new.plot-x-ticks) x-min x-max))
-  (define y-ticks ((new.plot-y-ticks) y-min y-max))
-  (define bounds-rect (vector (ivl x-min x-max) (ivl y-min y-max)))
-  
-  (parameterize ([new.plot-title       title]
-                 [new.plot-x-label     x-label]
-                 [new.plot-y-label     y-label]
-                 [new.plot-foreground  fgcolor]
-                 [new.plot-background  bgcolor])
-    (define bm (make-bitmap (ceiling width) (ceiling height)))
-    (define dc (make-object bitmap-dc% bm))
-    (define area (make-object 2d-plot-area%
-                   bounds-rect x-ticks x-ticks y-ticks y-ticks dc 0 0 width height))
-    
-    (define data+axes (mix x-axis-data y-axis-data data))
-    
-    (send area start-plot)
-    (send area start-renderer bounds-rect)
-    (data+axes area)
-    (send area end-renderers)
-    (send area end-plot)
-    
-    (when out-file (send bm save-file out-file 'png))
-    
-    (make-object image-snip% bm)))
-
-(defproc (plot3d [data ((is-a?/c 3d-plot-area%) . -> . void?)]
-                 [#:width width real? 400] [#:height height real? 400]
-                 [#:x-min x-min real? -5] [#:x-max x-max real? 5]
-                 [#:y-min y-min real? -5] [#:y-max y-max real? 5]
-                 [#:z-min z-min real? -5] [#:z-max z-max real? 5]
-                 [#:alt alt real? 30]
-                 [#:az az real? 45]
-                 [#:x-label x-label string? "X axis"]
-                 [#:y-label y-label string? "Y axis"]
-                 [#:z-label z-label string? "Z axis"]
-                 [#:title title string? ""]
-                 [#:fgcolor fgcolor (list/c byte? byte? byte?) '(0 0 0)]
-                 [#:bgcolor bgcolor (list/c byte? byte? byte?) '(255 255 255)]
-                 [#:lncolor lncolor (list/c byte? byte? byte?) '(255 0 0)]
-                 [#:out-file out-file (or/c path-string? output-port? #f) #f]
-                 ) (is-a?/c image-snip%)
-  (define x-ticks ((new.plot-x-ticks) x-min x-max))
-  (define y-ticks ((new.plot-y-ticks) y-min y-max))
-  (define z-ticks ((new.plot-z-ticks) z-min z-max))
-  (define bounds-rect (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max)))
-  
-  (parameterize ([new.plot-title       title]
-                 [new.plot-x-label     x-label]
-                 [new.plot-y-label     y-label]
-                 [new.plot-z-label     z-label]
-                 [new.plot-foreground  fgcolor]
-                 [new.plot-background  bgcolor]
-                 [new.plot3d-angle     az]
-                 [new.plot3d-altitude  alt])
-    (define bm (make-bitmap (ceiling width) (ceiling height)))
-    (define dc (make-object bitmap-dc% bm))
-    (define area (make-object 3d-plot-area%
-                   bounds-rect x-ticks x-ticks y-ticks y-ticks z-ticks z-ticks dc 0 0 width height))
-    
-    (send area start-plot)
-    (send area start-renderer bounds-rect)
-    (data area)
-    (send area end-renderers)
-    (send area end-plot)
-    
-    (when out-file (send bm save-file out-file 'png))
-    
-    (make-object image-snip% bm)))
-
-;; ===================================================================================================
-;; Functions that generate "plot data"
-
-(defproc (points [vecs (listof (vectorof real?))]
-                 [#:sym sym (or/c char? string? exact-integer? symbol?) 'square]
-                 [#:color color plot-color? 'black]
-                 ) ((is-a?/c 2d-plot-area%) . -> . void?)
-  (renderer2d->plot-data (new.points (map (λ (v) (vector-take v 2)) vecs)
-                                     #:sym sym #:size 6 #:color color)))
-
-(defproc (vector-field [f ((vector/c real? real?) . -> . (vector/c real? real?))]
-                       [#:samples samples (and/c exact-integer? (>=/c 2)) 20]
-                       [#:width width exact-positive-integer? 1]
-                       [#:color color plot-color? 'red]
-                       [#:style style (one-of/c 'scaled 'normalized 'real) 'scaled]
-                       ) ((is-a?/c 2d-plot-area%) . -> . void?)
-  (define scale (case style
-                  [(scaled)      'auto]
-                  [(normalized)  'normalized]
-                  [(real)        1.0]))
-  (renderer2d->plot-data
-   (new.vector-field f #:samples samples #:line-width width #:color color #:scale scale)))
-
-(defproc (error-bars [vecs (listof (vector/c real? real? real?))]
-                     [#:color color plot-color? 'black]
-                     ) ((is-a?/c 2d-plot-area%) . -> . void?)
-  (renderer2d->plot-data (new.error-bars vecs #:color color #:alpha 1 #:width 4)))
-
-(defproc (line [f (real? . -> . (or/c real? (vector/c real? real?)))]
-               [#:samples samples (and/c exact-integer? (>=/c 2)) 150]
-               [#:width width (>=/c 0) 1]
-               [#:color color plot-color/c 'red]
-               [#:mode mode (one-of/c 'standard 'parametric) 'standard]
-               [#:mapping mapping (one-of/c 'cartesian 'polar) 'cartesian]
-               [#:t-min t-min real? -5] [#:t-max t-max real? 5]
-               ) ((is-a?/c 2d-plot-area%) . -> . void?)
-  (renderer2d->plot-data (line-renderer f samples width color mode mapping t-min t-max)))
-
-(defproc (contour [f (real? real? . -> . real?)]
-                  [#:samples samples exact-nonnegative-integer? 50]
-                  [#:width width (>=/c 0) 1]
-                  [#:color color plot-color/c 'black]
-                  [#:levels levels (or/c (and/c exact-integer? (>=/c 2)) (listof real?)) 10]
-                  ) ((is-a?/c 2d-plot-area%) . -> . void?)
-  (renderer2d->plot-data (contour-renderer f samples width color levels)))
-
-(defproc (shade [f (real? real? . -> . real?)]
-                [#:samples samples (and/c exact-integer? (>=/c 2)) 50]
-                [#:levels levels (or/c (and/c exact-integer? (>=/c 2)) (listof real?)) 10]
-                ) ((is-a?/c 2d-plot-area%) . -> . void?)
-  (renderer2d->plot-data (shade-renderer f samples levels)))
-
-(defproc (surface [f (real? real? . -> . real?)]
-                  [#:samples samples (and/c exact-integer? (>=/c 2)) 50]
-                  [#:width width (>=/c 0) 1]
-                  [#:color color plot-color/c 'black]
-                  ) ((is-a?/c 3d-plot-area%) . -> . void?)
-  (renderer3d->plot-data (surface-renderer f samples width color)))
diff --git a/pkgs/plot-pkgs/plot-doc/LICENSE.txt b/pkgs/plot-pkgs/plot-doc/LICENSE.txt
deleted file mode 100644
index dbb89375c4..0000000000
--- a/pkgs/plot-pkgs/plot-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-plot
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/plot-pkgs/plot-doc/info.rkt b/pkgs/plot-pkgs/plot-doc/info.rkt
deleted file mode 100644
index e9069c535a..0000000000
--- a/pkgs/plot-pkgs/plot-doc/info.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "plot-lib"
-               "plot-gui-lib"
-               "unstable-latent-contract-lib"))
-
-(define build-deps '("db-doc"
-                     "db-lib"
-                     "draw-doc"
-                     "draw-lib"
-                     "gui-doc"
-                     "gui-lib"
-                     "pict-doc"
-                     "pict-lib"
-                     "plot-compat"
-                     "racket-doc"
-                     "scribble-lib"
-                     "slideshow-doc"
-                     "slideshow-lib"
-                     "unstable-contract-lib"
-                     "unstable-doc"))
-(define update-implies '("plot-lib"))
-
-(define pkg-desc "Documentation for plot")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/plot-pkgs/plot-doc/plot/info.rkt b/pkgs/plot-pkgs/plot-doc/plot/info.rkt
deleted file mode 100644
index b076008cd3..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/info.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang info
-(define scribblings '(["scribblings/plot.scrbl" (multi-page) (gui-library)]))
diff --git a/pkgs/plot-pkgs/plot-doc/plot/private/doc.rkt b/pkgs/plot-pkgs/plot-doc/plot/private/doc.rkt
deleted file mode 100644
index da0ae8e6ec..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/private/doc.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang racket/base
-
-(require unstable/latent-contract/defthing)
-
-;; ===================================================================================================
-;; Common exports
-
-(require plot/private/common/parameters
-         plot/private/common/contract
-         plot/private/common/axis-transform
-         plot/private/common/ticks
-         plot/private/common/math
-         plot/private/common/plot-element
-         plot/private/common/nonrenderer
-         plot/private/common/format
-         plot/private/common/sample
-         plot/private/common/draw
-         plot/private/common/date-time
-         plot/private/common/marching-squares
-         plot/private/common/marching-cubes
-         plot/private/common/legend
-         plot/private/common/kde)
-
-(provide (only-doc-out
-          (combine-out
-           (all-from-out
-            plot/private/common/parameters
-            plot/private/common/contract
-            plot/private/common/axis-transform
-            plot/private/common/ticks
-            plot/private/common/math
-            plot/private/common/plot-element
-            plot/private/common/nonrenderer
-            plot/private/common/format
-            plot/private/common/sample
-            plot/private/common/draw
-            plot/private/common/date-time
-            plot/private/common/marching-squares
-            plot/private/common/marching-cubes
-            plot/private/common/legend
-            plot/private/common/kde))))
-
-;; ===================================================================================================
-;; 2D exports
-
-(require plot/private/no-gui/plot2d
-         plot/private/gui/plot2d
-         plot/private/plot2d/point
-         plot/private/plot2d/line
-         plot/private/plot2d/interval
-         plot/private/plot2d/contour
-         plot/private/plot2d/rectangle
-         plot/private/plot2d/decoration)
-
-(provide (only-doc-out
-          (combine-out
-           (all-from-out
-            plot/private/no-gui/plot2d
-            plot/private/gui/plot2d
-            plot/private/plot2d/point
-            plot/private/plot2d/line
-            plot/private/plot2d/interval
-            plot/private/plot2d/contour
-            plot/private/plot2d/rectangle
-            plot/private/plot2d/decoration))))
-
-;; ===================================================================================================
-;; 3D exports
-
-(require plot/private/no-gui/plot3d
-         plot/private/gui/plot3d
-         plot/private/plot3d/surface
-         plot/private/plot3d/contour
-         plot/private/plot3d/line
-         plot/private/plot3d/point
-         plot/private/plot3d/isosurface
-         plot/private/plot3d/rectangle
-         plot/private/plot3d/decoration)
-
-(provide (only-doc-out
-          (combine-out
-           (all-from-out
-            plot/private/no-gui/plot3d
-            plot/private/gui/plot3d
-            plot/private/plot3d/surface
-            plot/private/plot3d/contour
-            plot/private/plot3d/line
-            plot/private/plot3d/point
-            plot/private/plot3d/isosurface
-            plot/private/plot3d/rectangle
-            plot/private/plot3d/decoration))))
-
-;; ===================================================================================================
-;; Deprecated functions
-
-(require plot/private/deprecated/deprecated)
-
-(provide (only-doc-out
-          (all-from-out
-           plot/private/deprecated/deprecated)))
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/common.rkt b/pkgs/plot-pkgs/plot-doc/plot/scribblings/common.rkt
deleted file mode 100644
index 478403c3df..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/common.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-
-(require scribble/eval
-         (for-label racket
-                    racket/gui/base
-                    pict
-                    db
-                    plot
-                    plot/utils
-                    unstable/contract)
-         plot
-         plot/utils
-         plot/private/doc
-         unstable/latent-contract/defthing)
-
-(provide (all-defined-out)
-         (all-from-out scribble/eval)
-         (for-label (all-from-out racket
-                                  racket/gui/base
-                                  pict
-                                  db
-                                  plot
-                                  plot/utils
-                                  unstable/contract))
-         (all-from-out plot)
-         (all-from-out plot/private/doc)
-         (all-from-out plot/utils)
-         doc-apply)
-
-(define (plot-name) "Plot")
-
-(define plot-eval
-  (let ([eval  (make-base-eval)])
-    (eval '(begin
-             (require racket/math racket/match racket/list racket/draw racket/class
-                      plot/pict
-                      plot/utils)))
-    eval))
-
-(define (close-plot-eval)
-  (close-eval plot-eval))
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/compat.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/compat.scrbl
deleted file mode 100644
index d2b8f0af80..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/compat.scrbl
+++ /dev/null
@@ -1,149 +0,0 @@
-#lang scribble/manual
-@(require (for-label racket
-                     racket/gui/base
-                     plot/compat)
-          plot/compat
-          (only-in unstable/latent-contract/defthing
-                   doc-apply)
-          (only-in "common.rkt" plot-name))
-
-@title[#:tag "compat"]{Compatibility Module}
-
-@author["Alexander Friedman" "Jamie Raymond" "Neil Toronto"]
-
-@defmodule[plot/compat]
-
-This module provides an interface compatible with @(plot-name) 5.1.3 and earlier.
-
-@bold{Do not use both @racketmodname[plot] and @racketmodname[plot/compat] in the same module.}
-It is tempting to try it, to get both the new features and comprehensive backward compatibility.
-But to enable the new features, the objects plotted in @racketmodname[plot] have to be a different data type than the objects plotted in @racketmodname[plot/compat].
-They do not coexist easily, and trying to make them do so will result in contract violations.
-
-@; ----------------------------------------
-
-@section[#:tag "plot"]{Plotting}
-
-@doc-apply[plot]{
-Plots @racket[data] in 2D, where @racket[data] is generated by
-functions like @racket[points] or @racket[line].
-
-A @racket[data] value is represented as a procedure that takes a
-@racket[2d-plot-area%] instance and adds plot information to it.
-
-The result is a @racket[image-snip%] for the plot. If an @racket[#:out-file]
-path or port is provided, the plot is also written as a PNG image to
-the given path or port.
-
-The @racket[#:lncolor] keyword argument is accepted for backward compatibility, but does nothing.
-}
-
-@doc-apply[plot3d]{
-Plots @racket[data] in 3D, where @racket[data] is generated by a
-function like @racket[surface]. The arguments @racket[alt] and
-@racket[az] set the viewing altitude (in degrees) and the azimuth
-(also in degrees), respectively.
-
-A 3D @racket[data] value is represented as a procedure that takes a
-@racket[3d-plot-area%] instance and adds plot information to it.
-
-The @racket[#:lncolor] keyword argument is accepted for backward compatibility, but does nothing.
-}
-
-@doc-apply[points]{
-Creates 2D plot data (to be provided to @racket[plot]) given a list
-of points specifying locations. The @racket[sym] argument determines
-the appearance of the points.  It can be a symbol, an ASCII character,
-or a small integer (between -1 and 127).  The following symbols are
-known: @racket['pixel], @racket['dot], @racket['plus],
-@racket['asterisk], @racket['circle], @racket['times],
-@racket['square], @racket['triangle], @racket['oplus], @racket['odot],
-@racket['diamond], @racket['5star], @racket['6star],
-@racket['fullsquare], @racket['bullet], @racket['full5star],
-@racket['circle1], @racket['circle2], @racket['circle3],
-@racket['circle4], @racket['circle5], @racket['circle6],
-@racket['circle7], @racket['circle8], @racket['leftarrow],
-@racket['rightarrow], @racket['uparrow], @racket['downarrow].
-}
-
-
-@doc-apply[line]{
-Creates 2D plot data to draw a line.
-
-The line is specified in either functional, i.e. @math{y = f(x)}, or
-parametric, i.e. @math{x,y = f(t)}, mode.  If the function is
-parametric, the @racket[mode] argument must be set to
-@racket['parametric].  The @racket[t-min] and @racket[t-max] arguments
-set the parameter when in parametric mode.
-}
-
-
-@doc-apply[error-bars]{
-Creates 2D plot data for error bars given a list of vectors.  Each
-vector specifies the center of the error bar @math{(x,y)} as the first
-two elements and its magnitude as the third.
-}
-
-
-@doc-apply[vector-field]{
-Creates 2D plot data to draw a vector-field from a vector-valued
-function.
-}
-
-
-@doc-apply[contour]{
-Creates 2D plot data to draw contour lines, rendering a 3D function
-a 2D graph cotours (respectively) to represent the value of the
-function at that position.
-}
-
-@doc-apply[shade]{
-Creates 2D plot data to draw like @racket[contour], except using
-shading instead of contour lines.
-}
-
-
-@doc-apply[surface]{
-Creates 3D plot data to draw a 3D surface in a 2D box, showing only
-the @italic{top} of the surface.
-}
-
-
-@defproc[(mix [data (any/c . -> . void?)] ...)
-         (any/c . -> . void?)]{
-Creates a procedure that calls each @racket[data] on its argument in
-order. Thus, this function can composes multiple plot @racket[data]s
-into a single data.
-}
-
-@doc-apply[plot-color?]{
-Returns @racket[#t] if @racket[v] is one of the following symbols,
-@racket[#f] otherwise:
-
-@racketblock[
-'white 'black 'yellow 'green 'aqua 'pink
-'wheat 'grey 'blown 'blue 'violet 'cyan
-'turquoise 'magenta 'salmon 'red
-]}
-
-@; ----------------------------------------
-
-@section{Miscellaneous Functions}
-
-@defproc[(derivative [f (real? . -> . real?)] [h real? .000001])
-         (real? . -> . real?)]{
-
-Creates a function that evaluates the numeric derivative of
-@racket[f].  The given @racket[h] is the divisor used in the
-calculation.}
-
-@defproc[(gradient [f (real? real? . -> . real?)] [h real? .000001])
-         ((vector/c real? real?) . -> . (vector/c real? real?))]{
-
-Creates a vector-valued function that computes the numeric gradient of
-@racket[f].}
-
-@defproc[(make-vec [fx (real? real? . -> . real?)] [fy (real? real? . -> . real?)])
-         ((vector/c real? real?) . -> . (vector/c real? real?))]{
-
-Creates a vector-valued function from two parts.}
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/contracts.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/contracts.scrbl
deleted file mode 100644
index 3f1d53b5e2..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/contracts.scrbl
+++ /dev/null
@@ -1,151 +0,0 @@
-#lang scribble/manual
-
-@(require "common.rkt"
-          (for-label (rename-in racket/draw [font-family/c ff/c])))
-
-@title[#:tag "contracts"]{Plot Contracts}
-
-@declare-exporting[plot/utils]
-@defmodule*/no-declare[(plot/utils) #:link-target? #f]
-
-@section{Plot Element Contracts}
-
-@defproc[(renderer2d? [value any/c]) boolean?]{
-Returns @racket[#t] if @racket[value] is a 2D @tech{renderer}; that is, if @racket[plot] can plot @racket[value].
-See @secref["renderer2d"] for functions that construct them.
-}
-
-@defproc[(renderer3d? [value any/c]) boolean?]{
-Returns @racket[#t] if @racket[value] is a 3D @tech{renderer}; that is, if @racket[plot3d] can plot @racket[value].
-See @secref["renderer3d"] for functions that construct them.
-}
-
-@defproc[(nonrenderer? [value any/c]) boolean?]{
-Returns @racket[#t] if @racket[value] is a @tech{nonrenderer}. See @secref["nonrenderer"] for functions that construct them.
-}
-
-@section{Appearance Argument Contracts}
-
-@doc-apply[anchor/c]{
-The contract for @(racket anchor) arguments and parameters, such as @(racket plot-legend-anchor).
-}
-
-@doc-apply[color/c]{
-A contract for very flexible color arguments.
-Functions that accept a @racket[color/c] almost always convert it to an RGB triplet using @racket[->color].
-}
-
-@doc-apply[plot-color/c]{
-The contract for @(racket #:color) arguments, and parameters such as @(racket line-color) and @(racket surface-color).
-For the meaning of integer colors, see @(racket ->pen-color) and @(racket ->brush-color).
-}
-
-@doc-apply[plot-pen-style/c]{
-The contract for @(racket #:style) arguments (when they refer to lines), and paramters such as @(racket line-style).
-For the meaning of integer pen styles, see @(racket ->pen-style).
-}
-
-@doc-apply[plot-brush-style/c]{
-The contract for @(racket #:style) arguments (when they refer to fills), and parameters such as @(racket interval-style).
-For the meaning of integer brush styles, see @(racket ->brush-style).
-}
-
-@;; This is to let me link to a different font-family/c
-@;; Builds an element inside the submodule that links to the
-@;; right identifier and exports it.
-@(module id-holder racket/base
-   (require scribble/manual (for-label racket/draw))
-   (provide ff/c-element)
-   (define ff/c-element (racket font-family/c)))
-@(require 'id-holder)
-
-@defthing[font-family/c flat-contract?]{
-Identifies legal font family values. The same as @ff/c-element
-from @racketmodname[racket/draw].
-}
-
-@doc-apply[point-sym/c]{
-The contract for the @(racket #:sym) arguments in @(racket points) and @(racket points3d), and the parameter @(racket point-sym).
-}
-
-@doc-apply[known-point-symbols]{
-A list containing the symbols that are valid @(racket points) symbols.
-}
-
-@section{Appearance Argument List Contracts}
-
-@doc-apply[maybe-function/c]{
-Returns a contract that accepts either a function from @racket[in-contract] to @racket[out-contract], or a plain @racket[out-contract] value. 
-
-@interaction[#:eval plot-eval
-                    (require racket/contract)
-                    (define/contract (maybe-function-of-real-consumer x)
-                        ((maybe-function/c real? real?) . -> . real?)
-                      (maybe-apply x 10))
-                    (maybe-function-of-real-consumer 4)
-                    (maybe-function-of-real-consumer (λ (x) x))]
-
-Many @racketmodname[plot] functions, such as @racket[contours] and @racket[isosurfaces3d], optionally take lists of appearance values (such as @racket[(listof plot-color/c)]) as arguments.
-A very flexible argument contract would accept @italic{functions} that produce lists of appearance values.
-For example, @racket[contours] would accept any @racket[f] with contract @racket[((listof real?) . -> . (listof plot-color/c))] for its @racket[#:colors] argument.
-When rendering a contour plot, @racket[contours] would apply @racket[f] to a list of the contour @italic{z} values to get the contour colors.
-
-However, most uses do not need this flexibility.
-Therefore, @racketmodname[plot]'s functions accept @italic{either} a list of appearance values @italic{or} a function from a list of appropriate values to a list of appearance values.
-The @racket[maybe-function/c] function constructs contracts for such arguments.
-
-In @racketmodname[plot] functions, if @racket[in-contract] is a @racket[listof] contract, the output list's length need not be the same as the input list's length.
-If it is shorter, the appearance values will cycle; if longer, the tail will not be used.
-}
-
-@doc-apply[maybe-apply]{
-If @racket[f] is a function, applies @racket[f] to @racket[args]; otherwise returns @racket[f].
-
-This is used inside many renderer-producing @racket[plot] functions to convert @racket[maybe-function/c] values to lists of appearance values.
-}
-
-@doc-apply[plot-colors/c]{
-Returns a contract for @(racket #:colors) arguments, as in @(racket contours) and @racket[contour-intervals].
-See @racket[maybe-function/c] for a discussion of the returned contract.
-
-The following example sends a @italic{list}-valued @racket[(plot-colors/c ivl?)] to @racket[contour-intervals], which then cycles through the colors:
-@interaction[#:eval plot-eval
-                    (plot (contour-intervals (λ (x y) (+ x y)) 0 1 0 1
-                                             #:colors '(1 2)))]
-This is equivalent to sending @racket[(λ _ '(1 2))].
-
-The next example is more sophisticated: it sends a @italic{function}-valued @racket[(plot-colors/c ivl?)] to @racket[contour-intervals].
-The function constructs colors from the values of the contour intervals.
-@interaction[#:eval plot-eval
-                    (define (brown-interval-colors ivls)
-                      (define z-size (- (ivl-max (last ivls))
-                                        (ivl-min (first ivls))))
-                      (for/list ([i  (in-list ivls)])
-                        (match-define (ivl z-min z-max) i)
-                        (define z-mid (/ (* 1/2 (+ z-min z-max)) z-size))
-                        (list (* 255 z-mid) (* 128 z-mid) (* 64 z-mid))))
-                    
-                    (plot (contour-intervals (λ (x y) (+ x y)) 0 1 0 1
-                                             #:colors brown-interval-colors))]
-}
-
-@doc-apply[plot-pen-styles/c]{
-Like @(racket plot-colors/c), but for line styles.
-}
-
-@doc-apply[pen-widths/c]{
-Like @(racket plot-colors/c), but for line widths.
-}
-
-@doc-apply[plot-brush-styles/c]{
-Like @(racket plot-colors/c), but for fill styles.
-}
-
-@doc-apply[alphas/c]{
-Like @(racket plot-colors/c), but for opacities.
-}
-
-@doc-apply[labels/c]{
-Like @racket[plot-colors/c], but for strings.
-This is used, for example, to label @racket[stacked-histogram]s.
-}
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/custom.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/custom.scrbl
deleted file mode 100644
index c0bcf1b5af..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/custom.scrbl
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang scribble/manual
-
-@(require "common.rkt")
-
-@title[#:tag "custom"]{Custom Plot Elements}
-
-@declare-exporting[plot/utils]
-@defmodule*/no-declare[(plot/utils plot/typed/utils) #:link-target? #f]
-
-@section{Plot Elements}
-
-@defstruct[plot-element ([bounds-rect  (or/c (vectorof ivl?) #f)]
-                         [bounds-fun   (or/c bounds-fun/c #f)]
-                         [ticks-fun    (or/c ticks-fun/c #f)])]{
-}
-
-@defstruct[(nonrenderer plot-element) ()]{
-Examples: @racket[x-ticks], @racket[y-ticks], @racket[z-ticks], @racket[invisible-rect] and @racket[invisible-rect3d]
-}
-
-@subsection{Plot Element Bounds}
-                                                               
-@doc-apply[bounds-fun/c]{
-}
-
-@doc-apply[function-bounds-fun]
-@doc-apply[inverse-bounds-fun]
-@doc-apply[function-interval-bounds-fun]
-@doc-apply[inverse-interval-bounds-fun]
-@doc-apply[surface3d-bounds-fun]
-
-@subsection{Plot Element Ticks}
-
-@doc-apply[ticks-fun/c]{
-}
-
-@doc-apply[default-ticks-fun]{
-}
-
-@section{2D Renderers}
-
-@defstruct[(renderer2d plot-element) ([render-proc  (or/c ((is-a?/c 2d-plot-area%)
-                                                           . -> . (treeof legend-entry?))
-                                                          #f)])]{
-}
-
-@section{3D Renderers}
-
-@defstruct[(renderer3d plot-element) ([render-proc  (or/c ((is-a?/c 3d-plot-area%)
-                                                           . -> . (treeof legend-entry?))
-                                                          #f)])]{
-}
-
-
-@section{Memoized Function Samplers}
-
-@defstruct[sample ([xs (listof real?)]
-                   [ys (listof real?)]
-                   [y-min (or/c rational? #f)]
-                   [y-max (or/c rational? #f)])]{
-}
-
-@defstruct[2d-sample ([xs (listof real?)]
-                      [ys (listof real?)]
-                      [zss (vectorof (vectorof real?))]
-                      [z-min (or/c rational? #f)]
-                      [z-max (or/c rational? #f)])]{
-}
-
-@defstruct[3d-sample ([xs (listof real?)]
-                      [ys (listof real?)]
-                      [zs (listof real?)]
-                      [dsss (vectorof (vectorof (vectorof real?)))]
-                      [d-min (or/c rational? #f)]
-                      [d-max (or/c rational? #f)])]{
-}
-
-@doc-apply[sampler/c]
-
-@doc-apply[2d-sampler/c]
-
-@doc-apply[3d-sampler/c]
-
-
-@section{Legend Entries}
-
-@defstruct[legend-entry ([label string?]
-                         [draw ((is-a?/c plot-device%) real? real? real? real?
-                                                       . -> . void?)])]{
-}
-
-@doc-apply[line-legend-entry]
-@doc-apply[line-legend-entries]
-@doc-apply[rectangle-legend-entry]
-@doc-apply[rectangle-legend-entries]
-@doc-apply[interval-legend-entry]
-@doc-apply[interval-legend-entries]
-@doc-apply[point-legend-entry]
-@doc-apply[arrow-legend-entry]
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/intro.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/intro.scrbl
deleted file mode 100644
index daffd67af5..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/intro.scrbl
+++ /dev/null
@@ -1,205 +0,0 @@
-#lang scribble/manual
-
-@(require "common.rkt")
-
-@title[#:tag "intro"]{Introduction}
-
-@defmodule*/no-declare[(plot plot/typed) #:link-target? #f]
-
-@section{Plotting 2D Graphs}
-
-To plot a one-input, real-valued function, do something like
-
-@racketinput[(require plot)]
-@interaction[#:eval plot-eval (plot (function sin (- pi) pi #:label "y = sin(x)"))]
-
-The first argument to @(racket function) is the function to be plotted, and the @(racket #:label) argument becomes the name of the function in the legend.
-
-If you're not using DrRacket, start with
-@racketblock[(require plot)
-             (plot-new-window? #t)]
-to open each plot in a new window.
-
-@section{Terminology}
-
-In the above example, @(racket (- pi)) and @(racket pi) define the @italic{x}-axis @deftech{bounds}, or the closed interval in which to plot the @(racket sin) function.
-The @(racket function) function automatically determines that the @italic{y}-axis bounds should be [-1,1].
-
-The @(racket function) function constructs a @deftech{renderer}, which does the actual drawing. A renderer also produces legend entries, requests bounds to draw in, and requests axis ticks and tick labels.
-
-The @(racket plot) function collects legend entries, bounds and ticks. It then sets up a @deftech{plot area} with large enough bounds to contain the renderers, draws the axes and ticks, invokes the renderers' drawing procedures, and then draws the legend.
-
-@section{Plotting 3D Graphs}
-
-To plot a two-input, real-valued function as a surface, try something like
-
-@margin-note{The documentation can't show it, but in DrRacket you can rotate 3D plots by clicking on them and dragging the mouse. Try it!}
-
-@interaction[#:eval plot-eval
-                    (plot3d (surface3d (λ (x y) (* (cos x) (sin y)))
-                                       (- pi) pi (- pi) pi)
-                            #:title "An R × R → R function"
-                            #:x-label "x" #:y-label "y" #:z-label "cos(x) sin(y)")]
-
-This example also demonstrates using keyword arguments that change the plot, such as @(racket #:title).
-In @(plot-name), every keyword argument is optional and almost all have parameterized default values.
-In the case of @(racket plot3d)'s @(racket #:title), the corresponding parameter is @(racket plot-title).
-That is, keyword arguments are usually shortcuts for parameterizing plots or renderers:
-
-@margin-note{When parameterizing more than one plot, it is often easier to set parameters globally, as in @(racket (plot-title "Untitled")) and @(racket (plot3d-angle 45)).
-
-There are many parameters that do not correspond to keyword arguments, such as @(racket plot-font-size). See @seclink["params"] for the full listing.}
-
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-title  "An R × R → R function"]
-                                   [plot-x-label "x"]
-                                   [plot-y-label "y"]
-                                   [plot-z-label "cos(x) sin(y)"])
-                      (plot3d (contour-intervals3d (λ (x y) (* (cos x) (sin y)))
-                                                   (- pi) pi (- pi) pi)))]
-
-This example also demonstrates @(racket contour-intervals3d), which colors the surface between contour lines, or lines of constant height.
-By default, @(racket contour-intervals3d) places the contour lines at the same heights as the ticks on the @italic{z} axis.
-
-@section{Plotting Multiple 2D Renderers}
-
-Renderers may be plotted together by passing them in a list:
-
-@interaction[#:eval plot-eval
-                    (plot (list (axes)
-                                (function sqr -2 2)
-                                (function (λ (x) x) #:color 0 #:style 'dot)
-                                (inverse sqr -2 2 #:color 3)))]
-
-Here, @(racket inverse) plots the inverse of a function. (Both @(racket function) and @(racket inverse) plot the reflection line @(racket (λ (x) x)) identically.)
-
-Notice the numbered colors.
-@(plot-name) additionally recognizes, as colors, lists of RGB values such as @(racket '(128 128 0)), @(racket color%) instances, and strings like @(racket "red") and @(racket "navajowhite").
-(The last are turned into RGB triples using a @(racket color-database<%>).)
-Use numbered colors when you just need different colors with good contrast, but don't particularly care what they are.
-
-The @(racket axes) function returns a list of two renderers, one for each axis.
-This list is passed in a list to @(racket plot), meaning that @(racket plot) accepts @italic{lists of lists} of renderers.
-In general, both @(racket plot) and @(racket plot3d) accept a @(racket treeof) renderers.
-
-Renderers generate legend entries when passed a @(racket #:label) argument. For example,
-
-@interaction[#:eval plot-eval
-                    (plot (list (axes)
-                                (function sqr -2 2 #:label "y = x^2")
-                                (function (λ (x) x) #:label "y = x" #:color 0 #:style 'dot)
-                                (inverse sqr -2 2 #:label "x = y^2" #:color 3)))]
-
-Lists of renderers are @(racket flatten)ed, and then plotted @italic{in order}. The order is more obvious with interval plots:
-
-@interaction[#:eval plot-eval
-                    (plot (list (function-interval (λ (x) (- (sin x) 3))
-                                                   (λ (x) (+ (sin x) 3)))
-                                (function-interval (λ (x) (- (sqr x))) sqr #:color 4
-                                                   #:line1-color 4 #:line2-color 4))
-                          #:x-min (- pi) #:x-max pi)]
-
-Clearly, the blue-colored interval between sine waves is drawn first.
-
-@section{Renderer and Plot Bounds}
-
-In the preceeding example, the @italic{x}-axis @tech{bounds} are passed to @(racket plot) using the keyword arguments @(racket #:x-min) and @(racket x-max).
-The bounds could easily have been passed in either call to @(racket function-interval) instead.
-In both cases, @(racket plot) and @(racket function-interval) work together to determine @italic{y}-axis @tech{bounds} large enough for both renderers.
-
-It is not always possible for renderers and @(racket plot) or @(racket plot3d) to determine the bounds:
-
-@interaction[#:eval plot-eval
-                    (eval:alts
-                     (plot (function sqr))
-                     (eval:result "" "" "plot: could not determine sensible plot bounds; got x ∈ [#f,#f], y ∈ [#f,#f]"))
-                    (eval:alts
-                     (plot (function sqr #f #f))
-                     (eval:result "" "" "plot: could not determine sensible plot bounds; got x ∈ [#f,#f], y ∈ [#f,#f]"))
-                    (eval:alts
-                     (plot (function sqr (- pi)))
-                     (eval:result "" "" "plot: could not determine sensible plot bounds; got x ∈ [-3.141592653589793,#f], y ∈ [#f,#f]"))
-                    (eval:alts
-                     (plot (list (function sqr #f 0)
-                                 (function sqr 0 #f)))
-                     (eval:result "" "" "plot: could not determine sensible plot bounds; got x ∈ [0,0], y ∈ [0,0]"))]
-
-There is a difference between passing bounds to renderers and passing bounds to @(racket plot) or @(racket plot3d): bounds passed to @(racket plot) or @(racket plot3d) cannot be changed by a renderer that requests different bounds.
-We might say that bounds passed to renderers are @italic{suggestions}, and bounds passed to @(racket plot) and @(racket plot3d) are @italic{commandments}.
-
-Here is an example of commanding @(racket plot3d) to override a renderer's bounds. First, consider the plot of a sphere with radius @(racket 1):
-
-@interaction[#:eval plot-eval (plot3d (polar3d (λ (θ ρ) 1) #:color 2 #:line-style 'transparent)
-                                      #:altitude 25)]
-
-Passing bounds to @(racket plot3d) that are smaller than [-1..1] × [-1..1] × [-1..1] cuts off the six axial poles:
-
-@interaction[#:eval plot-eval
-                    (plot3d (polar3d (λ (θ ρ) 1) #:color 2 #:line-style 'transparent)
-                            #:x-min -0.8 #:x-max 0.8
-                            #:y-min -0.8 #:y-max 0.8
-                            #:z-min -0.8 #:z-max 0.8
-                            #:altitude 25)]
-
-@section{Plotting Multiple 3D Renderers}
-
-Unlike with rendering 2D plots, rendering 3D plots is order-independent.
-Their constituent shapes (such as polygons) are merged, sorted by view distance, and drawn back-to-front.
-
-@interaction[#:eval plot-eval (define ((dist cx cy cz) x y z)
-                                (sqrt (+ (sqr (- x cx)) (sqr (- y cy)) (sqr (- z cz)))))
-                    
-                    (plot3d (list (isosurface3d (dist  1/4 -1/4 -1/4) 0.995
-                                                #:color 4 #:alpha 0.8 #:samples 21)
-                                  (isosurface3d (dist -1/4  1/4  1/4) 0.995
-                                                #:color 6 #:alpha 0.8 #:samples 21))
-                            #:x-min -1 #:x-max 1
-                            #:y-min -1 #:y-max 1
-                            #:z-min -1 #:z-max 1
-                            #:altitude 25)]
-
-@section{Plotting to Files}
-
-Any plot can be rendered to PNG, PDF, PS and SVG files using @(racket plot-file) and @(racket plot3d-file), to include in papers and other published media.
-
-@section{Colors and Styles}
-
-In papers, stick to dark, fully saturated colors for lines, and light, desaturated colors for areas and surfaces.
-Papers are often printed in black and white, and sticking to this guideline will help black-and-white versions of color plots turn out nicely.
-
-To make this easy, @(plot-name) provides numbered colors that follow these guidelines, that are designed for high contrast in color as well.
-When used as line colors, numbers are interpreted as dark, fully saturated colors.
-When used as area or surface colors, numbers are interpreted as light, desaturated colors.
-
-@interaction[#:eval plot-eval
-                    (parameterize ([interval-line1-width  3]
-                                   [interval-line2-width  3])
-                      (plot (for/list ([i  (in-range -7 13)])
-                              (function-interval
-                               (λ (x) (* i 1.3)) (λ (x) (+ 1 (* i 1.3)))
-                               #:color i #:line1-color i #:line2-color i))
-                            #:x-min -8 #:x-max 8))]
-
-Color @(racket 0) is black for lines and white for areas.
-Colors @(racket 1)..@(racket 120) are generated by rotating hues and adjusting to make neighbors more visually dissimilar.
-Colors @(racket 121)..@(racket 127) are grayscale.
-
-Colors @(racket -7)..@(racket -1) are also grayscale because before @(racket 0), colors repeat.
-That is, colors @(racket -128)..@(racket -1) are identical to colors @(racket 0)..@(racket 127).
-Colors also repeat after @(racket 127).
-
-If the paper will be published in black and white, use styles as well as, or instead of, colors.
-There are @(racket 5) numbered pen styles and @(racket 7) numbered brush styles, which also repeat.
-
-@interaction[#:eval plot-eval
-                    (parameterize ([line-color  "black"]
-                                   [interval-color  "black"]
-                                   [interval-line1-color  "black"]
-                                   [interval-line2-color  "black"]
-                                   [interval-line1-width  3]
-                                   [interval-line2-width  3])
-                      (plot (for/list ([i  (in-range 7)])
-                              (function-interval
-                               (λ (x) (* i 1.5)) (λ (x) (+ 1 (* i 1.5)))
-                               #:style i #:line1-style i #:line2-style i))
-                            #:x-min -8 #:x-max 8))]
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/nonrenderer.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/nonrenderer.scrbl
deleted file mode 100644
index 28b27f2a72..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/nonrenderer.scrbl
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang scribble/manual
-
-@(require "common.rkt")
-
-@declare-exporting[plot]
-@defmodule*/no-declare[(plot plot/typed) #:link-target? #f]
-
-@title[#:tag "nonrenderer"]{Nonrenderers}
-
-The following functions create @deftech{nonrenderers}, or plot elements that draw nothing in the plot.
-
-@doc-apply[x-ticks]
-@doc-apply[y-ticks]
-@doc-apply[z-ticks]{
-The @racket[x-ticks], @racket[y-ticks] and @racket[z-ticks] return a nonrenderer that adds custom ticks to a 2D or 3D plot.
-
-Although @racket[ticks-add] allows placing arbitrary major and minor ticks on an axis, it does not allow them to be formatted differently from the other ticks on the same axis.
-Use one of these functions to get maximum control.
-
-@examples[#:eval plot-eval
-                 (parameterize ([plot-x-ticks  no-ticks])
-                   (plot (list (function sin (- pi) pi)
-                               (x-ticks (list (tick (- pi) #t "-π")
-                                              (tick (* -3/4 pi) #f "")
-                                              (tick (* -1/2 pi) #t "-π/2")
-                                              (tick (* -1/4 pi) #f "")
-                                              (tick 0 #t "0")
-                                              (tick (* 1/4 pi) #f "")
-                                              (tick (* 1/2 pi) #t "π/2")
-                                              (tick (* 3/4 pi) #f "")
-                                              (tick pi #t "π")))
-                               (axes))))]
-When considering using one of these functions, remember that minor tick labels are never drawn,
-and that including a @racket[z-ticks] nonrenderer will not add extra contour lines to contour plots.
-}
-
-@doc-apply[invisible-rect]{
-Returns a nonrenderer that simply takes up space in the plot. Use this to cause the plot area to include a minimal rectangle.
-@examples[#:eval plot-eval
-                 (plot (list (function sin (- pi) pi)
-                             (invisible-rect #f #f -2 2)))]
-}
-
-@doc-apply[invisible-rect3d]{
-Returns a nonrenderer that simply takes up space in the plot. Use this to cause the plot area to include a minimal rectangle.
-See @racket[invisible-rect] for a 2D example.
-}
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/params.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/params.scrbl
deleted file mode 100644
index 0a75379a6e..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/params.scrbl
+++ /dev/null
@@ -1,266 +0,0 @@
-#lang scribble/manual
-
-@(require "common.rkt")
-
-@title[#:tag "params"]{Plot and Renderer Parameters}
-
-@declare-exporting[plot]
-@defmodule*/no-declare[(plot plot/typed) #:link-target? #f]
-
-@section{Compatibility}
-
-@doc-apply[plot-deprecation-warnings?]{
-When @(racket #t), prints a deprecation warning to @(racket current-error-port) on the first use of @(racket mix), @(racket line), @(racket contour), @(racket shade), @(racket surface), or a keyword argument of @(racket plot) or @(racket plot3d) that exists solely for backward compatibility.
-}
-
-@section{Output}
-
-@doc-apply[plot-new-window?]{When @(racket #t), @(racket plot) and @(racket plot3d) open a new window for each plot instead of returning an @(racket image-snip%).
-
-Users of command-line Racket, which cannot display image snips, should enter
-@racketblock[(plot-new-window? #t)]
-before using @(racket plot) or @(racket plot3d).}
-
-@doc-apply[plot-width]
-@doc-apply[plot-height]{The width and height of a plot, in logical drawing units (e.g. pixels for bitmap plots).}
-
-@doc-apply[plot-jpeg-quality]{
-The quality of JPEG images written by @(racket plot-file) and @(racket plot3d-file). See @(method bitmap% save-file).
-}
-
-@doc-apply[plot-ps/pdf-interactive?]{
-If @(racket #t), @(racket plot-file) and @(racket plot3d-file) open a dialog when writing PostScript or PDF files. See @(racket post-script-dc%) and @(racket pdf-dc%).
-}
-
-@section{General Appearance}
-
-@doc-apply[plot-foreground]
-@doc-apply[plot-background]{
-The plot foreground and background color.
-That both are @(racket 0) by default is not a mistake: for foreground colors, @(racket 0) is interpreted as black; for background colors, @(racket 0) is interpreted as white.
-See @(racket ->pen-color) and @(racket ->brush-color) for details on how @(plot-name) interprets integer colors.}
-@doc-apply[plot-foreground-alpha]
-@doc-apply[plot-background-alpha]{The opacity of the background and foreground colors.}
-@doc-apply[plot-font-size]{The font size of the title, axis labels, tick labels, and other labels, in drawing units.}
-@doc-apply[plot-font-face]{The font face used for the title and labels.}
-@doc-apply[plot-font-family]{The font family used for the title and labels.}
-@doc-apply[plot-line-width]{The width of axis lines and major tick lines. (Minor tick lines are half this width.)}
-
-@doc-apply[plot-legend-anchor]{Controls the placement of the legend.}
-@doc-apply[plot-legend-box-alpha]{The opacity of the filled rectangle behind the legend entries.}
-
-@doc-apply[plot-tick-size]{The length of tick lines, in drawing units.}
-
-@doc-apply[plot-title]
-@doc-apply[plot-x-label]
-@doc-apply[plot-y-label]
-@doc-apply[plot-z-label]{The title and axis labels. A @(racket #f) value means the label is not drawn and takes no space. A @(racket "") value effectively means the label is not drawn, but it takes space.
-}
-@doc-apply[plot-x-far-label]
-@doc-apply[plot-y-far-label]
-@doc-apply[plot-z-far-label]{
-The axis labels for ``far'' axes. See @racket[plot-x-ticks] for a discussion of near and far axes.
-}
-
-@doc-apply[plot-x-tick-label-anchor]
-@doc-apply[plot-x-tick-label-angle]
-@doc-apply[plot-y-tick-label-anchor]
-@doc-apply[plot-y-tick-label-angle]
-@doc-apply[plot-x-far-tick-label-anchor]
-@doc-apply[plot-x-far-tick-label-angle]
-@doc-apply[plot-y-far-tick-label-anchor]
-@doc-apply[plot-y-far-tick-label-angle]{
-Anchor and angles for axis tick labels (2D only).
-Angles are in degrees.
-The anchor refers to the part of the label attached to the end of the tick line.
-
-Set these when labels would otherwise overlap; for example, in histograms with long category names.
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-x-tick-label-anchor  'top-right]
-                                   [plot-x-tick-label-angle   30])
-                      (plot (discrete-histogram '(#(really-long-category-name-1 2)
-                                                  #(long-category-name-2 1.75)
-                                                  #(long-category-name-3 2.5)))))]
-}
-
-@doc-apply[plot-x-axis?]
-@doc-apply[plot-x-far-axis?]
-@doc-apply[plot-y-axis?]
-@doc-apply[plot-y-far-axis?]
-@doc-apply[plot-z-axis?]
-@doc-apply[plot-z-far-axis?]{
-When any of these is @racket[#f], the corresponding axis is not drawn.
-
-Use these along with @racket[x-axis] and @racket[y-axis] if you want axes that intersect the origin or some other point.
-}
-
-@doc-apply[plot-animating?]{
-When @(racket #t), certain renderers draw simplified plots to speed up drawing. @(plot-name) sets it to @(racket #t), for example, when a user is clicking and dragging a 3D plot to rotate it.
-}
-
-@doc-apply[animated-samples]{
-Given a number of samples, returns the number of samples to use.
-This returns @racket[samples] when @racket[plot-animating?] is @racket[#f].
-}
-
-@doc-apply[plot-decorations?]{
-When @(racket #f), axes, axis labels, ticks, tick labels, and the title are not drawn.
-}
-
-@section{Lines}
-
-@doc-apply[line-samples]
-@doc-apply[line-color]
-@doc-apply[line-width]
-@doc-apply[line-style]
-@doc-apply[line-alpha]
-
-@section{Intervals}
-
-@doc-apply[interval-color]
-@doc-apply[interval-style]
-@doc-apply[interval-line1-color]
-@doc-apply[interval-line1-width]
-@doc-apply[interval-line1-style]
-@doc-apply[interval-line2-color]
-@doc-apply[interval-line2-width]
-@doc-apply[interval-line2-style]
-@doc-apply[interval-alpha]
-
-@section{Points}
-
-@doc-apply[point-sym]
-@doc-apply[point-color]
-@doc-apply[point-size]
-@doc-apply[point-line-width]
-@doc-apply[point-alpha]
-
-@section{Vector Fields}
-
-@doc-apply[vector-field-samples]
-@doc-apply[vector-field-color]
-@doc-apply[vector-field-line-width]
-@doc-apply[vector-field-line-style]
-@doc-apply[vector-field-scale]
-@doc-apply[vector-field-alpha]
-
-@doc-apply[vector-field3d-samples]
-
-@section{Error Bars}
-
-@doc-apply[error-bar-width]
-@doc-apply[error-bar-color]
-@doc-apply[error-bar-line-width]
-@doc-apply[error-bar-line-style]
-@doc-apply[error-bar-alpha]
-
-@section{Contours and Contour Intervals}
-
-@doc-apply[default-contour-colors]
-@doc-apply[default-contour-fill-colors]
-
-@doc-apply[contour-samples]
-@doc-apply[contour-levels]
-@doc-apply[contour-colors]
-@doc-apply[contour-widths]
-@doc-apply[contour-styles]
-@doc-apply[contour-alphas]
-
-@doc-apply[contour-interval-colors]
-@doc-apply[contour-interval-styles]
-@doc-apply[contour-interval-alphas]
-
-@section{Rectangles}
-
-@doc-apply[rectangle-color]
-@doc-apply[rectangle-style]
-@doc-apply[rectangle-line-color]
-@doc-apply[rectangle-line-width]
-@doc-apply[rectangle-line-style]
-@doc-apply[rectangle-alpha]
-
-@doc-apply[rectangle3d-line-width]
-
-@doc-apply[discrete-histogram-gap]
-@doc-apply[discrete-histogram-skip]
-@doc-apply[discrete-histogram-invert?]
-
-@doc-apply[stacked-histogram-alphas]
-@doc-apply[stacked-histogram-colors]
-@doc-apply[stacked-histogram-line-colors]
-@doc-apply[stacked-histogram-line-styles]
-@doc-apply[stacked-histogram-line-widths]
-@doc-apply[stacked-histogram-styles]
-
-@section{Decorations}
-
-These parameters do not control the @italic{typical} appearance of plots.
-Instead, they control the look of renderers that add specific decorations, such as labeled points.
-
-@doc-apply[x-axis-alpha]
-@doc-apply[y-axis-alpha]
-@doc-apply[z-axis-alpha]
-
-@doc-apply[x-axis-far?]
-@doc-apply[y-axis-far?]
-@doc-apply[z-axis-far?]
-
-@doc-apply[x-axis-ticks?]
-@doc-apply[y-axis-ticks?]
-@doc-apply[z-axis-ticks?]
-
-@doc-apply[x-axis-labels?]
-@doc-apply[y-axis-labels?]
-@doc-apply[z-axis-labels?]
-
-@doc-apply[polar-axes-number]
-@doc-apply[polar-axes-alpha]
-@doc-apply[polar-axes-ticks?]
-@doc-apply[polar-axes-labels?]
-
-@doc-apply[label-anchor]
-@doc-apply[label-angle]
-@doc-apply[label-alpha]
-@doc-apply[label-point-size]
-
-@section{3D General Appearance}
-
-@doc-apply[plot3d-samples]
-@doc-apply[plot3d-angle]
-@doc-apply[plot3d-altitude]
-@doc-apply[plot3d-ambient-light]
-@doc-apply[plot3d-diffuse-light?]
-@doc-apply[plot3d-specular-light?]
-
-@section{Surfaces}
-
-@doc-apply[surface-color]
-@doc-apply[surface-style]
-@doc-apply[surface-line-color]
-@doc-apply[surface-line-width]
-@doc-apply[surface-line-style]
-@doc-apply[surface-alpha]
-
-@section{Contour Surfaces}
-
-Contour surface renderers use shared contour parameters except for the following three.
-
-@doc-apply[contour-interval-line-colors]
-@doc-apply[contour-interval-line-widths]
-@doc-apply[contour-interval-line-styles]
-
-@section{Isosurfaces}
-
-Single isosurfaces (@(racket isosurface3d)) use surface parameters.
-Nested isosurfaces (@(racket isosurfaces3d)) use the following.
-
-@doc-apply[default-isosurface-colors]
-@doc-apply[default-isosurface-line-colors]
-
-@doc-apply[isosurface-levels]
-@doc-apply[isosurface-colors]
-@doc-apply[isosurface-styles]
-@doc-apply[isosurface-line-colors]
-@doc-apply[isosurface-line-widths]
-@doc-apply[isosurface-line-styles]
-@doc-apply[isosurface-alphas]
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/plot.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/plot.scrbl
deleted file mode 100644
index ffded0cc28..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/plot.scrbl
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang scribble/manual
-
-@(require "common.rkt")
-
-@(define (author-email) "neil.toronto@gmail.com")
-
-@title[#:tag "top"]{@(plot-name): Graph Plotting}
-@author{@(author+email "Neil Toronto" (author-email))}
-
-@defmodule[plot]
-
-Typed Racket users should use
-
-@defmodule*/no-declare[(plot/typed)]
-
-@(plot-name) provides a flexible interface for producing nearly any kind of plot.
-It includes many common kinds already, such as scatter plots, line plots, contour plots, histograms, and 3D surfaces and isosurfaces.
-Thanks to Racket's excellent multiple-backend drawing library, @(plot-name) can render plots as manipulatable images in DrRacket, as bitmaps in slideshows, as PNG, PDF, PS and SVG files, or on any device context.
-
-For non-GUI uses, see @racketmodname[plot/no-gui].
-For REPL-like environments outside of DrRacket (including Scribble manuals) in particular, see @racketmodname[plot/pict] and @racketmodname[plot/bitmap].
-
-@bold{A note on backward compatibility.} @(plot-name) has undergone a major rewrite between versions 5.1.3 and 5.2.
-Many programs written using @(plot-name) 5.1.3 and earlier will still compile, run and generate plots.
-Some programs will not.
-Most programs use deprecated functions such as @(racket mix), @(racket line) and @(racket surface). These functions still exist for backward compatibility, but are deprecated and may be removed in the future.
-If you have code written for @(plot-name) 5.1.3 or earlier, please see @secref["porting"] (and possibly @secref["compat"]).
-
-@table-of-contents[]
-
-@include-section["intro.scrbl"]
-
-@include-section["plotting.scrbl"]
-
-@include-section["renderer2d.scrbl"]
-
-@include-section["renderer3d.scrbl"]
-
-@include-section["nonrenderer.scrbl"]
-
-@include-section["ticks.scrbl"]
-
-@include-section["utils.scrbl"]
-
-@include-section["params.scrbl"]
-
-@include-section["contracts.scrbl"]
-
-@;@include-section["custom.scrbl"]
-
-@include-section["porting.scrbl"]
-
-@include-section["compat.scrbl"]
-
-@close-plot-eval[]
-
-@; Needs a timeout for testing:
-@(module* test racket/base
-   (require (submod ".."))
-   (module config info
-     (define timeout 180)))
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/plotting.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/plotting.scrbl
deleted file mode 100644
index a63b51d66c..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/plotting.scrbl
+++ /dev/null
@@ -1,221 +0,0 @@
-#lang scribble/manual
-
-@(require (for-label slideshow
-                     racket/gui/dynamic)
-          "common.rkt")
-
-@declare-exporting[plot]
-
-@title[#:tag "plotting"]{2D and 3D Plotting Procedures}
-
-The plotting procedures exported by @racketmodname[plot/no-gui] produce @racket[bitmap%] and @racket[pict] instances, and write to files.
-They do not require @racketmodname[racket/gui], so they work in headless environments; for example, a Linux terminal with @tt{DISPLAY} unset.
-
-The @racketmodname[plot] module re-exports everything exported by @racketmodname[plot/no-gui], as well as @racket[plot], @racket[plot3d], and other procedures that create interactive plots and plot frames.
-Interactive plotting procedures can always be imported, but fail when called if there is no working display or @racketmodname[racket/gui] is not present.
-
-Each 3D plotting procedure behaves the same way as its corresponding 2D procedure, but takes the additional keyword arguments @(racket #:z-min), @(racket #:z-max), @(racket #:angle), @(racket #:altitude) and @(racket #:z-label).
-
-@section{GUI Plotting Procedures}
-
-@defmodule*/no-declare[(plot plot/typed) #:link-target? #f]
-
-@defproc[(plot [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-               [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-               [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-               [#:width width exact-positive-integer? (plot-width)]
-               [#:height height exact-positive-integer? (plot-height)]
-               [#:title title (or/c string? #f) (plot-title)]
-               [#:x-label x-label (or/c string? #f) (plot-x-label)]
-               [#:y-label y-label (or/c string? #f) (plot-y-label)]
-               [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-               [#:out-file out-file (or/c path-string? output-port? #f) #f]
-               [#:out-kind out-kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-               ) (or/c (is-a?/c image-snip%) void?)]{
-Plots a 2D renderer or list of renderers (or more generally, a tree of renderers), as returned by @(racket points), @(racket function), @(racket contours), @(racket discrete-histogram), and others.
-
-By default, @(racket plot) produces a Racket value that is displayed as an image and can be manipulated like any other value.
-For example, they may be put in lists:
-
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-width    150]
-                                   [plot-height   150]
-                                   [plot-x-label  #f]
-                                   [plot-y-label  #f])
-                      (list (plot (function sin (- pi) pi))
-                            (plot (function sqr -2 2))))]
-
-When the parameter @(racket plot-new-window?) is @(racket #t), @(racket plot) opens a new window to display the plot and returns @(racket (void)).
-
-When @(racket #:out-file) is given, @(racket plot) writes the plot to a file using @(racket plot-file) as well as returning an @(racket image-snip%) or opening a new window.
-
-When given, the @(racket x-min), @(racket x-max), @(racket y-min) and @(racket y-max) arguments determine the bounds of the plot, but not the bounds of the renderers. For example,
-
-@interaction[#:eval plot-eval
-(plot (function (λ (x) (sin (* 4 x))) -1 1)
-      #:x-min -1.5 #:x-max 1.5 #:y-min -1.5 #:y-max 1.5)]
-
-Here, the renderer draws in [-1,1] × [-1,1], but the plot area is [-1.5,1.5] × [-1.5,1.5].
-
-@bold{Deprecated keywords.} The @(racket #:fgcolor) and @(racket #:bgcolor) keyword arguments are currently supported for backward compatibility, but may not be in the future.
-Please set the @(racket plot-foreground) and @(racket plot-background) parameters instead of using these keyword arguments.
-The @(racket #:lncolor) keyword argument is also accepted for backward compatibility but deprecated. It does nothing.
-}
-
-@defproc[(plot3d [renderer-tree (treeof (or/c renderer3d? nonrenderer?))]
-                 [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                 [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                 [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-                 [#:width width exact-positive-integer? (plot-width)]
-                 [#:height height exact-positive-integer? (plot-height)]
-                 [#:angle angle real? (plot3d-angle)]
-                 [#:altitude altitude real? (plot3d-altitude)]
-                 [#:title title (or/c string? #f) (plot-title)]
-                 [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                 [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                 [#:z-label z-label (or/c string? #f) (plot-z-label)]
-                 [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                 [#:out-file out-file (or/c path-string? output-port? #f) #f]
-                 [#:out-kind out-kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-                 ) (or/c (is-a?/c image-snip%) void?)]{
-Plots a 3D renderer or list of renderers (or more generally, a tree of renderers), as returned by @(racket points3d), @(racket parametric3d), @(racket surface3d), @(racket isosurface3d), and others.
-
-When the parameter @(racket plot-new-window?) is @(racket #t), @(racket plot3d) opens a new window to display the plot and returns @(racket (void)).
-
-When @(racket #:out-file) is given, @(racket plot3d) writes the plot to a file using @(racket plot3d-file) as well as returning a @(racket image-snip%) or opening a new window.
-
-When given, the @(racket x-min), @(racket x-max), @(racket y-min), @(racket y-max), @(racket z-min) and @(racket z-max) arguments determine the bounds of the plot, but not the bounds of the renderers.
-
-@bold{Deprecated keywords.} The @(racket #:fgcolor) and @(racket #:bgcolor) keyword arguments are currently supported for backward compatibility, but may not be in the future.
-Please set the @(racket plot-foreground) and @(racket plot-background) parameters instead of using these keyword arguments.
-The @(racket #:lncolor) keyword argument is also accepted for backward compatibility but deprecated. It does nothing.
-
-The @(racket #:az) and @(racket #:alt) keyword arguments are backward-compatible, deprecated aliases for @(racket #:angle) and @(racket #:altitude), respectively.
-}
-
-@defproc[(plot-snip [<plot-argument> <plot-argument-contract>] ...)
-         (is-a?/c image-snip%)]
-@defproc[(plot3d-snip [<plot-argument> <plot-argument-contract>] ...)
-         (is-a?/c image-snip%)]
-@defproc[(plot-frame [<plot-argument> <plot-argument-contract>] ...)
-         (is-a?/c frame%)]
-@defproc[(plot3d-frame [<plot-argument> <plot-argument-contract>] ...)
-         (is-a?/c frame%)]{
-Plot to different GUI backends.
-These procedures accept the same arguments as @(racket plot) and @(racket plot3d), except deprecated keywords, and @racket[#:out-file] and @racket[#:out-kind].
-
-Use @(racket plot-frame) and @(racket plot3d-frame) to create a @(racket frame%) regardless of the value of @(racket plot-new-window?). The frame is initially hidden.
-
-Use @(racket plot-snip) and @(racket plot3d-snip) to create an interactive @(racket image-snip%) regardless of the value of @(racket plot-new-window?).
-}
-
-@section{Non-GUI Plotting Procedures}
-
-@defmodule*/no-declare[(plot/no-gui plot/typed/no-gui)]
-
-@defproc[(plot-file [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-                    [output (or/c path-string? output-port?)]
-                    [kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-                    [#:<plot-keyword> <plot-keyword> <plot-keyword-contract>] ...)
-         void?]
-@defproc[(plot3d-file [renderer-tree (treeof (or/c renderer3d? nonrenderer?))]
-                      [output (or/c path-string? output-port?)]
-                      [kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-                      [#:<plot3d-keyword> <plot3d-keyword> <plot3d-keyword-contract>] ...)
-         void?]
-@defproc[(plot-pict [<plot-argument> <plot-argument-contract>] ...)
-         pict?]
-@defproc[(plot3d-pict [<plot3d-argument> <plot3d-argument-contract>] ...)
-         pict?]
-@defproc[(plot-bitmap [<plot-argument> <plot-argument-contract>] ...)
-         (is-a?/c bitmap%)]
-@defproc[(plot3d-bitmap [<plot3d-argument> <plot3d-argument-contract>] ...)
-         (is-a?/c bitmap%)]{
-Plot to different non-GUI backends.
-These procedures accept the same arguments as @(racket plot) and @(racket plot3d), except deprecated keywords, and @racket[#:out-file] and @racket[#:out-kind].
-
-Use @(racket plot-file) or @(racket plot3d-file) to save a plot to a file.
-When creating a JPEG file, the parameter @(racket plot-jpeg-quality) determines its quality.
-When creating a PostScript or PDF file, the parameter @(racket plot-ps/pdf-interactive?) determines whether the user is given a dialog to set printing parameters.
-(See @(racket post-script-dc%) and @(racket pdf-dc%).)
-When @(racket kind) is @(racket 'auto), @(racket plot-file) and @(racket plot3d-file) try to determine from the file name extension the kind of file to write.
-
-Use @(racket plot-pict) or @(racket plot3d-pict) to create a @(racket pict).
-For example, this program creates a slide containing a 2D plot of a parabola:
-@racketmod[slideshow
-(require plot)
-
-(plot-font-size (current-font-size))
-(plot-width (current-para-width))
-(plot-height 600)
-(plot-background-alpha 1/2)
-
-(slide
- #:title "A 2D Parabola"
- (plot-pict (function sqr -1 1 #:label "y = x^2")))]
-
-Use @(racket plot-bitmap) or @(racket plot3d-bitmap) to create a @(racket bitmap%).
-}
-
-@defproc[(plot/dc [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-                  [dc (is-a?/c dc<%>)]
-                  [x real?]
-                  [y real?]
-                  [width (>=/c 0)]
-                  [height (>=/c 0)]
-                  [#:<plot-keyword> <plot-keyword> <plot-keyword-contract>] ...)
-         void?]
-@defproc[(plot3d/dc [renderer-tree (treeof (or/c renderer3d? nonrenderer?))]
-                    [dc (is-a?/c dc<%>)]
-                    [x real?]
-                    [y real?]
-                    [width (>=/c 0)]
-                    [height (>=/c 0)]
-                    [#:<plot3d-keyword> <plot3d-keyword> <plot3d-keyword-contract>] ...)
-         void?]{
-Plot to an arbitrary device context, in the rectangle with width @(racket width), height @(racket height), and upper-left corner @(racket x),@(racket y).
-These procedures accept the same arguments as @(racket plot) and @(racket plot3d), except deprecated keywords, and @racket[#:out-file] and @racket[#:out-kind].
-
-Use these if you need to continually update a plot on a @(racket canvas%), or to create other @(racket plot)-like functions with different backends.
-}
-
-@section{Pict-Plotting Work-a-Likes}
-
-@declare-exporting[plot/pict]
-@defmodule*/no-declare[(plot/pict plot/typed/pict)]
-
-When setting up an evaluator for a Scribble manual, require @racketmodname[plot/pict] instead of @racketmodname[plot].
-Evaluation will produce picts instead of snips, which scale nicely in PDF-rendered documentation.
-
-For example, this is how the evaluator for the @(plot-name) documentation is defined:
-@racketblock[
-(define plot-eval
-  (let ([eval  (make-base-eval)])
-    (eval '(begin
-             (require racket/math
-                      racket/match
-                      racket/list
-                      racket/draw
-                      racket/class
-                      plot/pict
-                      plot/utils)))
-    eval))]
-
-If you use @racket[(require (for-label plot))], links in example code should resolve to documentation for the functions exported by @racketmodname[plot].
-
-@defproc[(plot [<plot-argument> <plot-argument-contract>] ...) pict?]
-@defproc[(plot3d [<plot3d-argument> <plot3d-argument-contract>] ...) pict?]{
-Like the functions of the same name exported from @racketmodname[plot], but these produce @racket[pict] instances instead of interactive snips.
-}
-
-@section{Bitmap-Plotting Work-a-Likes}
-
-@declare-exporting[plot/bitmap]
-@defmodule*/no-declare[(plot/bitmap plot/typed/bitmap)]
-
-When plotting in an environment where @racket[bitmap%] instances can be shown but @racket[snip%] instances cannot (for example, on a web page that evaluates Racket code), require @racketmodname[plot/bitmap] instead of @racketmodname[plot].
-
-@defproc[(plot [<plot-argument> <plot-argument-contract>] ...) (is-a?/c bitmap%)]
-@defproc[(plot3d [<plot3d-argument> <plot3d-argument-contract>] ...) (is-a?/c bitmap%)]{
-Like the functions of the same name exported from @racketmodname[plot], but these produce @racket[bitmap%] instances instead of interactive snips.
-}
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/porting.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/porting.scrbl
deleted file mode 100644
index b851900b01..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/porting.scrbl
+++ /dev/null
@@ -1,139 +0,0 @@
-#lang scribble/manual
-
-@(require "common.rkt")
-
-@title[#:tag "porting"]{Porting From @(plot-name) <= 5.1.3}
-
-If it seems porting will take too long, you can get your old code running more quickly using the @secref["compat"].
-
-The update from @(plot-name) version 5.1.3 to 5.2 introduces a few incompatibilities:
-@itemlist[
-          @item{@(plot-name) now allows plot elements to request plot area bounds, and finds bounds large enough to fit all plot elements.
-                The old default plot area bounds of [-5,5] × [-5,5] cannot be made consistent with the improved behavior; the default bounds are now "no bounds".
-                This causes code such as @(racket (plot (line sin))), which does not state bounds, to fail.}
-          @item{The @(racket #:width) and @(racket #:style) keyword arguments to @(racket vector-field) have been replaced by @(racket #:line-width) and @(racket #:scale) to be consistent with other functions.}
-          @item{The @(racket plot) function no longer takes a @(racket ((is-a?/c 2d-view%) . -> . void?)) as an argument, but a @(racket (treeof renderer2d?)).
-                The argument change in @(racket plot3d) is similar.
-                This should not affect most code because @(plot-name) encourages regarding these data types as black boxes.}
-          @item{The @(racket plot-extend) module no longer exists.}
-          @item{The @racket[fit] function and @racket[fit-result] struct type have been removed.}
-
-          ]
-
-This section of the @(plot-name) manual will help you port code written for @(plot-name) 5.1.3 and earlier to the most recent @(plot-name).
-There are four main tasks:
-@itemlist[
-          @item{Replace deprecated functions.}
-          @item{Ensure that plots have bounds.}
-          @item{Change @(racket vector-field), @(racket plot) and @(racket plot3d) keyword arguments.}
-          @item{Fix broken calls to @(racket points).}
-          ]
-
-You should also set @(racket (plot-deprecation-warnings? #t)) to be alerted to uses of deprecated features.
-
-
-@section{Replacing Deprecated Functions}
-
-Replace @(racket mix) with @(racket list), and replace @(racket surface) with @(racket surface3d). These functions are drop-in replacements, but @(racket surface3d) has many more features (and a name more consistent with similar functions).
-
-Replace @(racket line) with @(racket function), @(racket parametric) or @(racket polar), depending on the keyword arguments to @(racket line). These are not at all drop-in replacements, but finding the right arguments should be straightforward.
-
-Replace @(racket contour) with @(racket contours), and replace @(racket shade) with @(racket contour-intervals).
-These are @italic{mostly} drop-in replacements: they should always work, but may not place contours at the same values (unless the levels are given as a list of values).
-For example, the default @(racket #:levels) argument is now @(racket 'auto), which chooses contour values in the same way that @italic{z} axis tick locations are usually chosen in 3D plots.
-The number of contour levels is therefore some number between @(racket 4) and @(racket 10), depending on the plot.
-
-
-@section{Ensuring That Plots Have Bounds}
-
-The safest way to ensure that @(racket plot) can determine bounds for the plot area is to add @(racket #:x-min -5 #:x-max 5 #:y-min -5 #:y-max 5) to every call to @(racket plot). Similarly, add @(racket #:x-min -5 #:x-max 5 #:y-min -5 #:y-max 5 #:z-min -5 #:z-max 5) to every call to @(racket plot3d).
-
-Because @(plot-name) is now smarter about choosing bounds, there are better ways. For example, suppose you have
-
-@interaction[#:eval plot-eval
-                    (eval:alts
-                     (plot (line sin))
-                     (eval:result "" "" "plot: could not determine sensible plot bounds; got x ∈ [#f,#f], y ∈ [#f,#f]"))]
-
-You could either change it to
-
-@interaction[#:eval plot-eval (plot (function sin) #:x-min -5 #:x-max 5 #:y-min -5 #:y-max 5)]
-
-or change it to
-
-@interaction[#:eval plot-eval (plot (function sin -5 5))]
-
-When @(racket function) is given @italic{x} bounds, it determines tight @italic{y} bounds.
-
-
-@section{Changing Keyword Arguments}
-
-Replace every @(racket #:width) in a call to @(racket vector-field) with @(racket #:line-width).
-
-Replace every @(racket #:style 'scaled) with @(racket #:scale 'auto) (or because it is the default in both the old and new, take it out).
-
-Replace every @(racket #:style 'real) with @(racket #:scale 1.0).
-
-Replace every @(racket #:style 'normalized) with @(racket #:scale 'normalized).
-
-The @(racket plot) and @(racket plot3d) functions still accept @(racket #:bgcolor), @(racket #:fgcolor) and @(racket #:lncolor), but these are deprecated.
-Parameterize on @(racket plot-background) and @(racket plot-foreground) instead.
-
-For example, if you have @(racket (plot (function sin -5 5) #:fgcolor '(0 0 128) #:bgcolor '(224 224 224))), change it to
-@interaction[#:eval plot-eval (parameterize ([plot-foreground  '(0 0 128)]
-                                             [plot-background  '(224 224 224)])
-                                (plot (function sin -5 5)))]
-
-The @(racket #:lncolor) keyword argument now does nothing; change the renderer instead.
-For example, if you have @(racket (plot (function sin -5 5) #:lncolor '(0 0 128))), change it to
-@interaction[#:eval plot-eval (plot (function sin -5 5 #:color '(0 0 128)))]
-
-Change @(racket #:az) in calls to @(racket plot3d) to @(racket #:angle), and @(racket #:alt) to @(racket #:altitude).
-Alternatively, parameterize multiple plots by setting the @(racket plot3d-angle) and @(racket plot3d-altitude) parameters.
-
-
-@section{Fixing Broken Calls to @(racket points)}
-
-The @(racket points) function used to be documented as accepting a @(racket (listof (vector/c real? real?))), but actually accepted a @(racket (listof (vectorof real?))) and silently ignored any extra vector elements.
-
-If you have code that takes advantage of this, strip down the vectors first.
-For example, if @(racket vs) is the list of vectors, send @(racket (map (λ (v) (vector-take v 2)) vs)) to @(racket points).
-
-
-@section{Replacing Uses of @(racket plot-extend)}
-
-Chances are, if you used @(racket plot-extend), you no longer need it.
-The canonical @(racket plot-extend) example used to be a version of @(racket line) that drew dashed lines.
-Every line-drawing function in @(plot-name) now has a @(racket #:style) or @(racket #:line-style) keyword argument.
-
-The rewritten @(plot-name) will eventually have a similar extension mechanism.
-
-
-@section{Deprecated Functions}
-
-@declare-exporting[plot]
-@defmodule*/no-declare[(plot) #:link-target? #f]
-
-The following functions exist for backward compatibility, but may be removed in the future.
-Set @(racket (plot-deprecation-warnings? #t)) to be alerted the first time each is used.
-
-@defproc[(mix [plot-data (any/c . -> . void?)] ...)
-         (any/c . -> . void?)]{
-See @(secref "compat") for the original documentation. Replace this with @(racket list).
-}
-
-@doc-apply[line]{
-See @(secref "compat") for the original documentation. Replace this with @(racket function), @(racket parametric) or @(racket polar), depending on keyword arguments.
-}
-
-@doc-apply[contour]{
-See @(secref "compat") for the original documentation. Replace this with @(racket contours).
-}
-
-@doc-apply[shade]{
-See @(secref "compat") for the original documentation. Replace this with @(racket contour-intervals).
-}
-
-@doc-apply[surface]{
-See @(secref "compat") for the original documentation. Replace this with @(racket surface3d).
-}
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/renderer2d.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/renderer2d.scrbl
deleted file mode 100644
index ec6a40e7fa..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/renderer2d.scrbl
+++ /dev/null
@@ -1,385 +0,0 @@
-#lang scribble/manual
-
-@(require "common.rkt")
-
-@title[#:tag "renderer2d"]{2D Renderers}
-
-@declare-exporting[plot]
-@defmodule*/no-declare[(plot plot/typed) #:link-target? #f]
-
-@section[#:tag "renderer2d-function-arguments"]{2D Renderer Function Arguments}
-
-Functions that return 2D renderers always have these kinds of arguments:
-@itemlist[
-          @item{Required (and possibly optional) arguments representing the graph to plot.}
-          @item{Optional keyword arguments for overriding calculated bounds, with the default value @(racket #f).}
-          @item{Optional keyword arguments that determine the appearance of the plot.}
-          @item{The optional keyword argument @(racket #:label), which specifies the name of the renderer in the legend.}]
-
-We will take @(racket function), perhaps the most commonly used renderer-producing function, as an example.
-
-@bold{Graph arguments.} The first argument to @(racket function) is the required @(racket f), the function to plot.
-It is followed by two optional arguments @(racket x-min) and @(racket x-max), which specify the renderer's @italic{x} bounds.
-(If not given, the @italic{x} bounds will be the plot area @italic{x} bounds, as requested by another renderer or specified to @(racket plot) using @(racket #:x-min) and @(racket #:x-max).)
-
-These three arguments define the @deftech{graph} of the function @(racket f), a possibly infinite set of pairs of points @(racket x),@(racket (f x)).
-An infinite graph cannot be plotted directly, so the renderer must approximately plot the points in it.
-The renderer returned by @(racket function) does this by drawing lines connected end-to-end.
-
-@bold{Overriding bounds arguments.} Next in @(racket function)'s argument list are the keyword arguments @(racket #:y-min) and @(racket #:y-max), which override the renderer's calculated @italic{y} bounds if given.
-
-@bold{Appearance arguments.} The next keyword argument is @(racket #:samples), which determines the quality of the renderer's approximate plot (higher is better).
-Following @(racket #:samples) are @(racket #:color), @(racket #:width), @(racket #:style) and @(racket #:alpha), which determine the color, width, style and opacity of the lines comprising the plot.
-
-In general, the keyword arguments that determine the appearance of plots follow consistent naming conventions.
-The most common keywords are @(racket #:color) (for fill and line colors), @(racket #:width) (for line widths), @(racket #:style) (for fill and line styles) and @(racket #:alpha).
-When a function needs both a fill color and a line color, the fill color is given using @(racket #:color), and the line color is given using @(racket #:line-color) (or some variation, such as @(racket #:line1-color)). Styles follow the same rule.
-
-Every appearance keyword argument defaults to the value of a parameter.
-This allows whole families of plots to be altered with little work.
-For example, setting @(racket (line-color 3)) causes every subsequent renderer that draws connected lines to draw its lines in blue.
-
-@bold{Label argument.} Lastly, there is @(racket #:label). If given, the @(racket function) renderer will generate a label entry that @(racket plot) puts in the legend.
-
-Not every renderer-producing function has a @(racket #:label) argument; for example, @(racket error-bars).
-
-
-@section{2D Point Renderers}
-
-@doc-apply[points]{
-Returns a @tech{renderer} that draws points. Use it, for example, to draw 2D scatter plots.
-
-The renderer sets its bounds to the smallest rectangle that contains the points.
-Still, it is often necessary to override these bounds, especially with randomized data. For example,
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-width    150]
-                                   [plot-height   150]
-                                   [plot-x-label  #f]
-                                   [plot-y-label  #f])
-                      (define xs (build-list 20 (λ _ (random))))
-                      (define ys (build-list 20 (λ _ (random))))
-                      (list (plot (points (map vector xs ys)))
-                            (plot (points (map vector xs ys)
-                                          #:x-min 0 #:x-max 1
-                                          #:y-min 0 #:y-max 1))))]
-Readers of the first plot could only guess that the random points were generated in [0,1] × [0,1].
-
-The @(racket #:sym) argument may be any integer, a Unicode character or string, or a symbol in @(racket known-point-symbols).
-Use an integer when you need different points but don't care exactly what they are.
-}
-
-@doc-apply[vector-field]{
-Returns a renderer that draws a vector field.
-
-If @(racket scale) is a real number, arrow lengths are multiplied by @(racket scale).
-If @(racket 'auto), the scale is calculated in a way that keeps arrows from overlapping.
-If @(racket 'normalized), each arrow is made the same length: the maximum length that would have been allowed by @(racket 'auto).
-
-An example of automatic scaling:
-@interaction[#:eval plot-eval
-                    (plot (vector-field (λ (x y) (vector (+ x y) (- x y)))
-                                        -2 2 -2 2))]
-}
-
-@doc-apply[error-bars]{
-Returns a renderer that draws error bars.
-The first and second element in each vector in @(racket bars) comprise the coordinate; the third is the height.
-@interaction[#:eval plot-eval
-                    (plot (list (function sqr 1 7)
-                                (error-bars (list (vector 2 4 12)
-                                                  (vector 4 16 20)
-                                                  (vector 6 36 10)))))]
-}
-
-@section{2D Line Renderers}
-
-@doc-apply[function]{
-Returns a renderer that plots a function of @italic{x}. For example, a parabola:
-@interaction[#:eval plot-eval (plot (function sqr -2 2))]
-}
-
-@doc-apply[inverse]{
-Like @(racket function), but regards @(racket f) as a function of @italic{y}.
-For example, a parabola, an inverse parabola, and the reflection line:
-@interaction[#:eval plot-eval
-                    (plot (list (axes)
-                                (function sqr -2 2 #:label "y = x^2")
-                                (function (λ (x) x) #:color 0 #:style 'dot #:label "y = x")
-                                (inverse sqr -2 2 #:color 3 #:label "x = y^2")))]
-}
-
-@doc-apply[lines]{
-Returns a renderer that draws lines.
-This is directly useful for plotting a time series, such as a random walk:
-@interaction[#:eval plot-eval
-                    (plot (lines
-                           (reverse
-                            (for/fold ([lst (list (vector 0 0))]) ([i  (in-range 1 200)])
-                              (match-define (vector x y) (first lst))
-                              (cons (vector i (+ y (* 1/100 (- (random) 1/2)))) lst)))
-                           #:color 6 #:label "Random walk"))]
-
-The @(racket parametric) and @(racket polar) functions are defined using @(racket lines).
-}
-
-@doc-apply[parametric]{
-Returns a renderer that plots vector-valued functions of time.
-For example, the circle as a function of time can be plotted using
-@interaction[#:eval plot-eval
-                    (plot (parametric (λ (t) (vector (cos t) (sin t))) 0 (* 2 pi)))]
-}
-
-@doc-apply[polar]{
-Returns a renderer that plots functions from angle to radius.
-Note that the angle parameters @(racket θ-min) and @(racket θ-max) default to @(racket 0) and @(racket (* 2 pi)).
-
-For example, drawing a full circle:
-@interaction[#:eval plot-eval (plot (polar (λ (θ) 1)))]
-}
-
-@doc-apply[density]{
-Returns a renderer that plots an estimated density for the given points, which are optionally weighted by @racket[ws].
-The bandwidth for the kernel is calculated as @(racket (* bw-adjust 1.06 sd (expt n -0.2))), where @(racket sd) is the standard deviation of the data and @(racket n) is the number of points.
-Currently, the only supported kernel is the Gaussian.
-
-For example, to plot an estimated density of the triangle distribution:
-@interaction[#:eval plot-eval
-                    (plot (list (function (λ (x) (cond [(or (x . < . -1) (x . > . 1))  0]
-                                                       [(x . < . 0)   (+ 1 x)]
-                                                       [(x . >= . 0)  (- 1 x)]))
-                                          -1.5 1.5 #:label "Density")
-                                (density (build-list
-                                          2000 (λ (n) (- (+ (random) (random)) 1)))
-                                         #:color 0 #:width 2 #:style 'dot
-                                         #:label "Est. density")))]
-}
-
-@section{2D Interval Renderers}
-
-These renderers each correspond with a line renderer, and graph the area between two lines.
-
-@doc-apply[function-interval]{
-Corresponds with @(racket function).
-
-@interaction[#:eval plot-eval (plot (function-interval (λ (x) 0) (λ (x) (exp (* -1/2 (sqr x))))
-                                                       -4 4 #:line1-style 'transparent))]
-}
-
-@doc-apply[inverse-interval]{
-Corresponds with @(racket inverse).
-
-@interaction[#:eval plot-eval (plot (inverse-interval sin (λ (x) 0) (- pi) pi
-                                                      #:line2-style 'long-dash))]
-}
-
-@doc-apply[lines-interval]{
-Corresponds with @(racket lines).
-
-@interaction[#:eval plot-eval
-                    (plot (list
-                           (tick-grid)
-                           (lines-interval (list #(0 0) #(1 1/2)) (list #(0 1) #(1 3/2))
-                                           #:color 4 #:line1-color 4 #:line2-color 4
-                                           #:label "Parallelogram")))]
-}
-
-@doc-apply[parametric-interval]{
-Corresponds with @(racket parametric).
-
-@interaction[#:eval plot-eval
-                    (define (f1 t) (vector (* 2 (cos (* 4/5 t)))
-                                           (* 2 (sin (* 4/5 t)))))
-                    (define (f2 t) (vector (* 1/2 (cos t))
-                                           (* 1/2 (sin t))))
-                    (plot (parametric-interval f1 f2 (- pi) pi))]
-}
-
-@doc-apply[polar-interval]{
-Corresponds with @(racket polar).
-
-@interaction[#:eval plot-eval
-                    (define (f1 θ) (+ 1/2 (* 1/6 (cos (* 5 θ)))))
-                    (define (f2 θ) (+ 1 (* 1/4 (cos (* 10 θ)))))
-                    (plot (list (polar-axes #:number 10)
-                                (polar-interval f1 f2 #:label "[f1,f2]")))]
-}
-
-@section{2D Contour (Isoline) Renderers}
-
-@doc-apply[isoline]{
-Returns a renderer that plots a contour line, or a line of constant value (height).
-A circle of radius @(racket r), for example, is the line of constant value @(racket r) for the distance function:
-@interaction[#:eval plot-eval (plot (isoline (λ (x y) (sqrt (+ (sqr x) (sqr y)))) 1.5
-                                             -2 2 -2 2 #:label "z"))]
-}
-In this case, @(racket r) = @(racket 1.5).
-
-This function would have been named @racket[contour], except the name was already used by a deprecated function.
-It may be renamed in the future, with @racket[isoline] as an alias.
-
-@doc-apply[contours]{
-Returns a renderer that plots contour lines, or lines of constant value (height).
-
-When @(racket levels) is @(racket 'auto), the number of contour lines and their values are chosen the same way as axis tick positions; i.e. they are chosen to be simple.
-When @(racket levels) is a number, @(racket contours) chooses that number of values, evenly spaced, within the output range of @(racket f).
-When @(racket levels) is a list, @(racket contours) plots contours at the values in @(racket levels).
-
-For example, a saddle:
-@interaction[#:eval plot-eval (plot (contours (λ (x y) (- (sqr x) (sqr y)))
-                                              -2 2 -2 2 #:label "z"))]
-
-The appearance keyword arguments assign a color, width, style and opacity @italic{to each contour line}.
-Each can be given as a list or as a function from a list of output values of @(racket f) to a list of appearance values.
-In both cases, when there are more contour lines than list elements, the colors, widths, styles and alphas in the list repeat.
-
-For example,
-@interaction[#:eval plot-eval (plot (contours (λ (x y) (- (sqr x) (sqr y)))
-                                              -2 2 -2 2 #:levels 4
-                                              #:colors '("blue" "red")
-                                              #:widths '(4 1)
-                                              #:styles '(solid dot)))]
-}
-
-@doc-apply[contour-intervals]{
-Returns a renderer that fills the area between contour lines, and additionally draws contour lines.
-
-For example, the canonical saddle, with its gradient field superimposed:
-@interaction[#:eval plot-eval
-                    (plot (list (contour-intervals (λ (x y) (- (sqr x) (sqr y)))
-                                                   -2 2 -2 2 #:label "z")
-                                (vector-field (λ (x y) (vector (* 2 x) (* -2 y)))
-                                              #:color "black" #:label "Gradient")))]
-}
-
-@section{2D Rectangle Renderers}
-
-@doc-apply[rectangles]{
-Returns a renderer that draws rectangles.
-The rectanges are given as a list of vectors of intervals---each vector defines the bounds of a rectangle. For example,
-@interaction[#:eval plot-eval (plot (rectangles (list (vector (ivl -1 1) (ivl -1 1))
-                                                      (vector (ivl 1 2) (ivl 1 2)))))]
-}
-
-@doc-apply[area-histogram]{
-Returns a renderer that draws a histogram approximating the area under a curve.
-The @(racket #:samples) argument determines the accuracy of the calculated areas.
-@interaction[#:eval plot-eval
-                    (require (only-in plot/utils linear-seq))
-                    (define (f x) (exp (* -1/2 (sqr x))))
-                    (plot (list (area-histogram f (linear-seq -4 4 10))
-                                (function f -4 4)))]
-}
-
-@doc-apply[discrete-histogram]{
-Returns a renderer that draws a discrete histogram.
-
-@examples[#:eval plot-eval
-                 (plot (discrete-histogram (list #(A 1) #(B 2) #(B 3)
-                                                 (vector 'C (ivl 0.5 1.5)))))]
-
-Use @racket[#:invert? #t] to draw horizontal bars. See @racket[stacked-histogram] for an example.
-
-Each bar takes up exactly one plot unit, and is drawn with @racket[(* 1/2 gap)] empty space on each side.
-Bar number @racket[i] is drawn at @racket[(+ x-min (* i skip))].
-Thus, the first bar (@racket[i] = @racket[0]) is drawn in the interval between @racket[x-min] (default @racket[0]) and @racket[(+ x-min 1)].
-
-To plot two histograms side-by-side, pass the appropriate @racket[x-min] value to the second renderer. For example,
-@interaction[#:eval plot-eval
-                    (plot (list (discrete-histogram (list #(a 1) #(b 2) #(c 3) #(d 2)
-                                                          #(e 4) #(f 2.5) #(g 1))
-                                                    #:label "Numbers per letter")
-                                (discrete-histogram (list #(1 1) #(4 2) #(3 1.5))
-                                                    #:x-min 8
-                                                    #:label "Numbers per number"
-                                                    #:color 2 #:line-color 2)))]
-Here, the first histogram has @racket[7] bars, so the second is drawn starting at @racket[x-min] = @racket[8].
-
-To interleave histograms, such as when plotting benchmark results, use a @racket[skip] value larger than or equal to the number of histograms, and give each histogram a different @racket[x-min].
-For example,
-@interaction[#:eval plot-eval
-                    (plot (list (discrete-histogram
-                                 '(#(Eggs 1.5) #(Bacon 2.5) #(Pancakes 3.5))
-                                 #:skip 2.5 #:x-min 0
-                                 #:label "AMD")
-                                (discrete-histogram
-                                 '(#(Eggs 1.4) #(Bacon 2.3) #(Pancakes 3.1))
-                                 #:skip 2.5 #:x-min 1
-                                 #:label "Intel" #:color 2 #:line-color 2))
-                          #:x-label "Breakfast Food" #:y-label "Cooking Time (minutes)"
-                          #:title "Cooking Times For Breakfast Food, Per Processor")]
-When interleaving many histograms, consider setting the @racket[discrete-histogram-skip] parameter to change @racket[skip]'s default value.
-}
-
-@doc-apply[stacked-histogram]{
-Returns a list of renderers that draw parts of a stacked histogram.
-The heights of each bar section are given as a list.
-@examples[#:eval plot-eval
-                 (plot (stacked-histogram (list #(a (1 1 1)) #(b (1.5 3))
-                                                #(c ()) #(d (1/2)))
-                                          #:invert? #t
-                                          #:labels '("Red" #f "Blue"))
-                       #:legend-anchor 'top-right)]
-}
-
-@section{2D Plot Decoration Renderers}
-
-@doc-apply[x-axis]{
-Returns a renderer that draws an @italic{x} axis.
-}
-
-@doc-apply[y-axis]{
-Returns a renderer that draws a @italic{y} axis.
-}
-
-@doc-apply[axes]{
-Returns a list containing an @(racket x-axis) renderer and a @(racket y-axis) renderer. See @(racket inverse) for an example.
-}
-
-@doc-apply[polar-axes]{
-Returns a renderer that draws polar axes. See @(racket polar-interval) for an example.
-}
-
-@doc-apply[x-tick-lines]{
-Returns a renderer that draws vertical lines from the lower @italic{x}-axis ticks to the upper.
-}
-
-@doc-apply[y-tick-lines]{
-Returns a renderer that draws horizontal lines from the left @italic{y}-axis ticks to the right.
-}
-
-@doc-apply[tick-grid]{
-Returns a list containing an @(racket x-tick-lines) renderer and a @(racket y-tick-lines) renderer.
-See @(racket lines-interval) for an example.
-}
-
-@doc-apply[point-label]{
-Returns a renderer that draws a labeled point.
-If @(racket label) is @(racket #f), the point is labeled with its position.
-
-@interaction[#:eval plot-eval
-                    (plot (list (function sqr 0 2)
-                                (point-label (vector 1 1))))]
-
-The remaining labeled-point functions are defined in terms of this one.
-}
-
-@doc-apply[function-label]{
-Returns a renderer that draws a labeled point on a function's graph.
-
-@interaction[#:eval plot-eval
-                    (plot (list (function sin (- pi) pi)
-                                (function-label sin (* 1/6 pi) "(1/6 π, 1/2)"
-                                                #:anchor 'right)))]
-}
-
-@doc-apply[inverse-label]{
-Returns a renderer that draws a labeled point on a function's inverted graph.
-}
-
-@doc-apply[parametric-label]{
-Returns a renderer that draws a labeled point on a parametric function's graph.
-}
-
-@doc-apply[polar-label]{
-Returns a renderer that draws a labeled point on a polar function's graph.
-}
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/renderer3d.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/renderer3d.scrbl
deleted file mode 100644
index 43fb7d49ec..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/renderer3d.scrbl
+++ /dev/null
@@ -1,211 +0,0 @@
-#lang scribble/manual
-
-@(require "common.rkt")
-
-@title[#:tag "renderer3d"]{3D Renderers}
-
-@declare-exporting[plot]
-@defmodule*/no-declare[(plot plot/typed) #:link-target? #f]
-
-@section{3D Renderer Function Arguments}
-
-As with functions that return 2D renderers, functions that return 3D renderers always have these kinds of arguments:
-@itemlist[
-          @item{Required (and possibly optional) arguments representing the graph to plot.}
-          @item{Optional keyword arguments for overriding calculated bounds, with the default value @(racket #f).}
-          @item{Optional keyword arguments that determine the appearance of the plot.}
-          @item{The optional keyword argument @(racket #:label), which specifies the name of the renderer in the legend.}]
-
-See @secref["renderer2d-function-arguments"] for a detailed example.
-
-@section{3D Point Renderers}
-
-@doc-apply[points3d]{
-Returns a renderer that draws points in 3D space.
-
-For example, a scatter plot of points sampled uniformly from the surface of a sphere:
-@interaction[#:eval plot-eval
-                    (define (runif) (- (* 2 (random)) 1))
-                    (define (rnormish) (+ (runif) (runif) (runif) (runif)))
-                    
-                    (define xs0 (build-list 1000 (λ _ (rnormish))))
-                    (define ys0 (build-list 1000 (λ _ (rnormish))))
-                    (define zs0 (build-list 1000 (λ _ (rnormish))))
-                    (define mags (map (λ (x y z) (sqrt (+ (sqr x) (sqr y) (sqr z))))
-                                      xs0 ys0 zs0))
-                    (define xs (map / xs0 mags))
-                    (define ys (map / ys0 mags))
-                    (define zs (map / zs0 mags))
-                    
-                    (plot3d (points3d (map vector xs ys zs) #:sym 'dot)
-                            #:altitude 25)]
-}
-
-@doc-apply[vector-field3d]{
-Returns a renderer that draws a vector field in 3D space.
-The arguments are interpreted identically to the corresponding arguments to @racket[vector-field].
-@examples[#:eval plot-eval
-                 (plot3d (vector-field3d (λ (x y z) (vector x z y))
-                                         -2 2 -2 2 -2 2))]
-}
-
-@section{3D Line Renderers}
-
-@doc-apply[lines3d]{
-Returns a renderer that draws connected lines.
-The @racket[parametric3d] function is defined in terms of this one.
-}
-
-@doc-apply[parametric3d]{
-Returns a renderer that plots a vector-valued function of time. For example,
-@interaction[#:eval plot-eval
-                    (require (only-in plot/utils 3d-polar->3d-cartesian))
-                    (plot3d (parametric3d (λ (t) (3d-polar->3d-cartesian (* t 80) t 1))
-                                          (- pi) pi #:samples 3000 #:alpha 0.5)
-                            #:altitude 25)]
-}
-
-@section{3D Surface Renderers}
-
-@doc-apply[surface3d]{
-Returns a renderer that plots a two-input, one-output function. For example,
-@interaction[#:eval plot-eval (plot3d (list (surface3d (λ (x y) (+ (sqr x) (sqr y))) -1 1 -1 1
-                                                       #:label "z = x^2 + y^2")
-                                            (surface3d (λ (x y) (- (+ (sqr x) (sqr y)))) -1 1 -1 1
-                                                       #:color 4 #:line-color 4
-                                                       #:label "z = -x^2 - y^2")))]
-}
-
-@doc-apply[polar3d]{
-Returns a renderer that plots a function from latitude and longitude to radius.
-
-Currently, latitudes range from @(racket 0) to @(racket (* 2 pi)), and longitudes from @(racket (* -1/2 pi)) to @(racket (* 1/2 pi)).
-These intervals may become optional arguments to @racket[polar3d] in the future.
-
-A sphere is the graph of a polar function of constant radius:
-@interaction[#:eval plot-eval (plot3d (polar3d (λ (θ ρ) 1)) #:altitude 25)]
-
-Combining polar function renderers allows faking latitudes or longitudes in larger ranges, to get, for example, a seashell plot:
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-decorations?  #f]
-                                   [plot3d-samples     75])
-                      (define (f1 θ ρ) (+ 1 (/ θ 2 pi) (* 1/8 (sin (* 8 ρ)))))
-                      (define (f2 θ ρ) (+ 0 (/ θ 2 pi) (* 1/8 (sin (* 8 ρ)))))
-                      
-                      (plot3d (list (polar3d f1 #:color "navajowhite"
-                                             #:line-style 'transparent #:alpha 2/3)
-                                    (polar3d f2 #:color "navajowhite"
-                                             #:line-style 'transparent #:alpha 2/3))))]
-}
-
-@section{3D Contour (Isoline) Renderers}
-
-@doc-apply[isoline3d]{
-Returns a renderer that plots a single contour line on the surface of a function.
-
-The appearance keyword arguments are interpreted identically to the appearance keyword arguments to @(racket isoline).
-
-This function is not terribly useful by itself, but can be when combined with others:
-@interaction[#:eval plot-eval
-                    (define (saddle x y) (- (sqr x) (sqr y)))
-                    (plot3d (list (surface3d saddle -1 1 -1 1)
-                                  (isoline3d saddle 1/4 #:width 2 #:style 'long-dash)))]
-}
-
-@doc-apply[contours3d]{
-Returns a renderer that plots contour lines on the surface of a function.
-
-The appearance keyword arguments are interpreted identically to the appearance keyword arguments to @(racket contours).
-In particular, when @(racket levels) is @(racket 'auto), contour values correspond precisely to @italic{z} axis ticks.
-
-For example,
-@interaction[#:eval plot-eval (plot3d (contours3d (λ (x y) (+ (sqr x) (sqr y))) -1.1 1.1 -1.1 1.1
-                                                  #:label "z = x^2 + y^2"))]
-}
-
-@doc-apply[contour-intervals3d]{
-Returns a renderer that plots contour intervals and contour lines on the surface of a function.
-The appearance keyword arguments are interpreted identically to the appearance keyword arguments to @(racket contour-intervals).
-
-For example,
-@interaction[#:eval plot-eval (plot3d (contour-intervals3d (λ (x y) (+ (sqr x) (sqr y)))
-                                                           -1.1 1.1 -1.1 1.1
-                                                           #:label "z = x^2 + y^2"))]
-}
-
-@section{3D Isosurface Renderers}
-
-@doc-apply[isosurface3d]{
-Returns a renderer that plots the surface of constant output value of the function @(racket f). The argument @(racket d) is the constant value.
-
-For example, a sphere is all the points in which the Euclidean distance function returns the sphere's radius:                                                           
-@interaction[#:eval plot-eval (plot3d (isosurface3d
-                                       (λ (x y z) (sqrt (+ (sqr x) (sqr y) (sqr z)))) 1
-                                       -1 1 -1 1 -1 1)
-                                      #:altitude 25)]
-}
-
-@doc-apply[isosurfaces3d]{
-Returns a renderer that plots multiple isosurfaces. The appearance keyword arguments are interpreted similarly to those of @(racket contours).
-
-Use this to visualize functions from three inputs to one output; for example:
-@interaction[#:eval plot-eval
-                    (define (saddle x y z) (- (sqr x) (* 1/2 (+ (sqr y) (sqr z)))))
-                    (plot3d (isosurfaces3d saddle #:d-min -1 #:d-max 1 #:label "")
-                            #:x-min -2 #:x-max 2
-                            #:y-min -2 #:y-max 2
-                            #:z-min -2 #:z-max 2)]
-
-If it helps, think of the output of @(racket f) as a density or charge.
-}
-
-@section{3D Rectangle Renderers}
-
-@doc-apply[rectangles3d]{
-Returns a renderer that draws rectangles.
-
-This can be used to draw histograms; for example,
-@interaction[#:eval plot-eval
-                    (require (only-in plot/utils bounds->intervals linear-seq))
-                    
-                    (define (norm2 x y) (exp (* -1/2 (+ (sqr (- x 5)) (sqr y)))))
-                    (define x-ivls (bounds->intervals (linear-seq 2 8 16)))
-                    (define y-ivls (bounds->intervals (linear-seq -5 5 16)))
-                    (define x-mids (linear-seq 2 8 15 #:start? #f #:end? #f))
-                    (define y-mids (linear-seq -5 5 15 #:start? #f #:end? #f))
-                    
-                    (plot3d (rectangles3d (append*
-                                           (for/list ([y-ivl  (in-list y-ivls)]
-                                                      [y  (in-list y-mids)])
-                                             (for/list ([x-ivl  (in-list x-ivls)]
-                                                        [x  (in-list x-mids)])
-                                               (define z (norm2 x y))
-                                               (vector x-ivl y-ivl (ivl 0 z)))))
-                                          #:alpha 3/4
-                                          #:label "Appx. 2D Normal"))]
-}
-
-@doc-apply[discrete-histogram3d]{
-Returns a renderer that draws discrete histograms on a two-valued domain.
-
-Missing pairs are not drawn; for example,
-@interaction[#:eval plot-eval
-                    (plot3d (discrete-histogram3d '(#(a a 1) #(a b 2) #(b b 3))
-                                                  #:label "Missing (b,a)"
-                                                  #:color 4 #:line-color 4))]
-}
-
-@doc-apply[stacked-histogram3d]{
-Returns a renderer that draws a stacked histogram.
-Think of it as a version of @racket[discrete-histogram] that allows multiple values to be specified for each pair of categories.
-@examples[#:eval plot-eval
-                 (define data '(#(a a (1 1 1)) #(a b (1.5 3)) #(b b ()) #(b a (1/2))))
-                 (plot3d (stacked-histogram3d data #:labels '("Red" #f "Blue")
-                                              #:alphas '(2/3 1 2/3)))]
-}
-
-@doc-apply[point-label3d]{
-Returns a renderer that draws a labeled point.
-If @(racket label) is @(racket #f), the point is labeled with its position.
-Analogous to @racket[point-label].
-}
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/ticks.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/ticks.scrbl
deleted file mode 100644
index 2e556a7c3e..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/ticks.scrbl
+++ /dev/null
@@ -1,506 +0,0 @@
-#lang scribble/manual
-
-@(require "common.rkt" (for-label racket/date db))
-
-@title[#:tag "ticks and transforms"]{Axis Transforms and Ticks}
-
-@declare-exporting[plot]
-@defmodule*/no-declare[(plot plot/typed) #:link-target? #f]
-
-@section[#:tag "transforms"]{Axis Transforms}
-
-The @italic{x}, @italic{y} and @italic{z} axes for any plot can be independently transformed by parameterizing the plot on different @racket[plot-x-transform], @racket[plot-y-transform] and @racket[plot-z-transform] values.
-For example, to plot the @italic{x} axis with a log transform:
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-x-transform  log-transform])
-                      (plot (function sin 1 100)))]
-Most @racket[log-transform]ed plots use different ticks than the default, uniformly spaced ticks, however.
-To put log ticks on the @italic{x} axis, set the @racket[plot-x-ticks] parameter:
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-x-transform  log-transform]
-                                   [plot-x-ticks      (log-ticks)])
-                      (plot (function sin 1 100)))]
-See @secref["ticks"] for more details on parameterizing a plot's axis ticks.
-
-@margin-note*{
-To sample nonlinearly, the @italic{inverse} of a transform is applied to linearly sampled points. See @racket[make-axis-transform] and @racket[nonlinear-seq].}
-Renderers cooperate with the current transforms by sampling nonlinearly. For example,
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-x-transform  log-transform])
-                      (plot3d (surface3d + 0.01 1 0.01 1)))]
-Notice that the surface is sampled uniformly in appearance even though the @italic{x}-axis ticks are not spaced uniformly.
-
-Transforms are applied to the primitive shapes that comprise a plot:
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-x-transform  log-transform])
-                      (plot3d (surface3d + 0.01 1 0.01 1 #:samples 3)))]
-Here, the renderer returned by @racket[surface3d] does not have to bend the polygons it draws; @racket[plot3d] does this automatically (by recursive subdivision).
-
-@doc-apply[plot-x-transform]
-@doc-apply[plot-y-transform]
-@doc-apply[plot-z-transform]{
-Independent, per-axis, monotone, nonlinear transforms. @(plot-name) comes with some typical (and some atypical) axis transforms, documented immediately below.
-}
-
-@doc-apply[id-transform]{
-The identity axis transform, the default transform for all axes.
-}
-
-@doc-apply[log-transform]{
-A log transform. Use this to generate plots with log-scale axes. Any such axis must have positive bounds.
-
-The beginning of the @secref["ticks and transforms"] section has a working example. An example of exceeding the bounds is
-@interaction[#:eval plot-eval
-                    (eval:alts
-                     (parameterize ([plot-x-transform  log-transform])
-                       (plot (function (λ (x) x) -1 1)))
-                     (eval:result "" "" "log-transform: expects type <positive real> as 1st argument, given: -1; other arguments were: 1"))]
-See @racket[axis-transform-bound] and @racket[axis-transform-append] for ways to get around an axis transform's bounds limitations.
-}
-
-@doc-apply[stretch-transform]{
-Returns an axis transform that stretches a finite interval.
-
-The following example uses a @racket[stretch-transform] to draw attention to the interval [-1,1] in an illustration of the limit of @italic{sin(x)/x} as @italic{x} approaches zero (a critical part of proving the derivative of @italic{sin(x)}):
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-x-transform  (stretch-transform -1 1 20)]
-                                   [plot-x-ticks  (ticks-add (plot-x-ticks) '(-1 1))])
-                      (plot (list (y-axis -1 #:ticks? #f) (y-axis 1 #:ticks? #f)
-                                  (function (λ (x) (/ (sin x) x)) -14 14
-                                            #:width 2 #:color 4 #:label "y = sin(x)/x")
-                                  (point-label (vector 0 1) "y → 1 as x → 0"
-                                               #:anchor 'bottom-right))
-                            #:y-max 1.2))]
-}
-
-@doc-apply[collapse-transform]{
-Returns an axis transform that collapses a finite interval to its midpoint.
-For example, to remove part of the long, boring asymptotic approach of @italic{atan(x)} toward π/2:
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-x-transform  (collapse-transform 50 150)])
-                      (plot (function atan 10 200 #:label "y = atan(x)")
-                            #:legend-anchor 'center))]
-In this case, there were already ticks at the collapsed interval's endpoints.
-If there had not been, it would have been necessary to use @racket[ticks-add] to let viewers know precisely the interval that was collapsed.
-(See @racket[stretch-transform] for an example.)
-}
-
-@doc-apply[cbrt-transform]{
-A ``cube-root'' transform, mostly used for testing.
-Unlike the log transform, it is defined on the entire real line, making it better for testing the appearance of plots with nonlinearly transformed axes.
-}
-
-@doc-apply[hand-drawn-transform]{
-An @italic{extremely important} test case, which makes sure that @(plot-name) can use any monotone, invertible function as an axis transform.
-The @(racket freq) parameter controls the ``shakiness'' of the transform. At high values, it makes plots look like Peanuts cartoons.
-@examples[#:eval plot-eval
-                 (parameterize ([plot-x-transform  (hand-drawn-transform 200)]
-                                [plot-y-transform  (hand-drawn-transform 200)])
-                   (plot (function sqr -1 1)))
-                 (parameterize ([plot-x-transform  (hand-drawn-transform 50)]
-                                [plot-y-transform  (hand-drawn-transform 50)]
-                                [plot-z-transform  (hand-drawn-transform 50)])
-                   (plot3d (contour-intervals3d (λ (x y) (- (sqr x) (sqr y)))
-                                                -1 1 -1 1 #:samples 9)))]
-}
-
-@doc-apply[axis-transform/c]{
-The contract for axis transforms.
-
-The easiest ways to construct novel axis transforms are to use the axis transform combinators @racket[axis-transform-append], @racket[axis-transform-bound] and @racket[axis-transform-compose], or to apply @racket[make-axis-transform] to an @racket[invertible-function].
-}
-
-@doc-apply[axis-transform-append]{
-Returns an axis transform that transforms values less than @racket[mid] like @racket[t1], and transforms values greater than @racket[mid] like @racket[t2].
-(Whether it transforms @racket[mid] like @racket[t1] or @racket[t2] is immaterial, as a transformed @racket[mid] is equal to @racket[mid] either way.)
-@examples[#:eval plot-eval
-                 (parameterize ([plot-x-transform  (axis-transform-append
-                                                    (stretch-transform -2 -1 10)
-                                                    (stretch-transform 1 2 10)
-                                                    0)])
-                   (plot (function (λ (x) x) -3 3)))]
-}
-
-@doc-apply[axis-transform-bound]{
-Returns an axis transform that transforms values like @racket[t] does in the interval [@racket[a],@racket[b]], but like the identity transform outside of it.
-For example, to bound @racket[log-transform] to an interval in which it is well-defined,
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-x-transform  (axis-transform-bound
-                                                       log-transform 0.01 +inf.0)])
-                      (plot (function (λ (x) x) -4 8 #:label "y = x")))]
-}
-
-@doc-apply[axis-transform-compose]{
-Composes two axis transforms.
-For example, to collapse part of a @racket[log-transform]ed axis, try something like
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-x-transform  (axis-transform-compose
-                                                       log-transform
-                                                       (collapse-transform 2 4))])
-                      (plot (function (λ (x) x) 1 5)))]
-Argument order matters, but predicting the effects of exchanging arguments can be difficult.
-Fortunately, the effects are usually slight.
-}
-
-@doc-apply[make-axis-transform]{
-Given a monotone @racket[invertible-function], returns an axis transform.
-Monotonicity is necessary, but cannot be enforced.
-The inverse is used to take samples uniformly along transformed axes (see @racket[nonlinear-seq]).
-
-@examples[#:eval plot-eval
-                 (parameterize ([plot-y-transform  (make-axis-transform
-                                                    (invertible-function sqrt sqr))])
-                   (plot (function (λ (x) x) 0 5)))]
-
-An axis transform created by @racket[make-axis-transform] (or by any of the above combinators) does not transform the endpoints of an axis's bounds, to within floating-point error.
-For example,
-@interaction[#:eval plot-eval
-                    (match-let ([(invertible-function f g)
-                                 (apply-axis-transform log-transform 1 3)])
-                      (define xs '(1 2 3))
-                      (define new-xs (map f xs))
-                      (define old-xs (map g new-xs))
-                      (values new-xs old-xs))]
-
-Technically, @racket[fun] does not need to be truly invertible.
-Given @racket[fun] = @racket[(invertible-function f g)], it is enough for @racket[f] to be a @hyperlink["http://en.wikipedia.org/wiki/Inverse_function#Left_and_right_inverses"]{left inverse} of @racket[g];
-that is, always @racket[(f (g x)) = x] but not necessarily @racket[(g (f x)) = x].
-If @racket[f] and @racket[g] had to be strict inverses of each other, there could be no @racket[collapse-transform].
-}
-
-@doc-apply[apply-axis-transform]{
-Returns an invertible function that transforms axis points within the given axis bounds.
-This convenience function is used internally to transform points before rendering, but is provided for completeness.
-}
-
-@section[#:tag "ticks"]{Axis Ticks}
-
-Each plot axis has two indepedent sets of ticks: the @italic{near} ticks and the @italic{far} ticks.
-
-@doc-apply[plot-x-ticks]
-@doc-apply[plot-x-far-ticks]
-@doc-apply[plot-y-ticks]
-@doc-apply[plot-y-far-ticks]
-@doc-apply[plot-z-ticks]
-@doc-apply[plot-z-far-ticks]{
-@examples[#:eval plot-eval
-                 (parameterize ([plot-x-label      "Near x axis"]
-                                [plot-y-label      "Near y axis"]
-                                [plot-z-label      "Near z axis"]
-                                [plot-x-ticks      (date-ticks)]
-                                [plot-y-ticks      (time-ticks)]
-                                [plot-z-ticks      (fraction-ticks)]
-                                [plot-x-far-label  "Far x axis"]
-                                [plot-y-far-label  "Far y axis"]
-                                [plot-z-far-label  "Far z axis"]
-                                [plot-x-far-ticks  (linear-ticks)]
-                                [plot-y-far-ticks  (currency-ticks)]
-                                [plot-z-far-ticks  (log-ticks #:base 2)])
-                   (plot3d (lines3d '(#(1 1 1) #(40000000 4 4)) #:style 'transparent)
-                           #:angle 45 #:altitude 50
-                           #:title "Axis Names and Tick Locations"))]
-At any @racket[#:angle], the far @italic{x} and @italic{y} ticks are behind the plot, and the far @italic{z} ticks are on the right.
-Far ticks are drawn, but not labeled, if they are identical to their corresponding near ticks.
-They are always identical by default.
-
-@deftech{Major ticks} are longer than @deftech{minor ticks}. Major tick labels are always drawn unless collapsed with a nearby tick.
-Minor tick labels are never drawn.
-
-Renderers produced  by @racket[contours] and @racket[contour-intervals] use the value of @racket[plot-z-ticks] to place and label contour lines.
-For example, compare plots of the same function renderered using both @racket[contour-intervals] and @racket[contour-intervals3d]:
-@interaction[#:eval plot-eval
-                    (parameterize ([plot-z-ticks  (currency-ticks)])
-                      (define (saddle x y) (- (sqr x) (sqr y)))
-                      (values
-                       (plot (contour-intervals saddle -1 1 -1 1 #:label "z")
-                             #:legend-anchor 'center)
-                       (plot3d (contour-intervals3d saddle -1 1 -1 1 #:label "z")
-                               #:legend-anchor 'center)))]
-}
-
-@doc-apply[contour-ticks]{
-Returns the ticks used for contour values.
-This is used internally by renderers returned from @racket[contours], @racket[contour-intervals], @racket[contours3d], @racket[contour-intervals3d], and @racket[isosurfaces3d], but is provided for completeness.
-
-When @racket[levels] is @racket['auto], the returned values do not correspond @italic{exactly} with the values of ticks returned by @racket[z-ticks]: they might be missing the endpoint values. For example,
-@interaction[#:eval plot-eval
-                 (map pre-tick-value 
-                      (filter pre-tick-major? ((plot-z-ticks) 0 1)))
-                 (map pre-tick-value
-                      (contour-ticks (plot-z-ticks) 0 1 'auto #f))]
-}
-
-@doc-apply[plot-d-ticks]{
-The ticks used for default isosurface values in @racket[isosurfaces3d].
-}
-
-@doc-apply[plot-r-ticks]{
-The ticks used for radius lines in @racket[polar-axes].
-}
-
-@defstruct[ticks ([layout ticks-layout/c] [format ticks-format/c])]{
-A @racket[ticks] for a near or far axis consists of a @racket[layout] function, which determines the number of ticks and where they will be placed, and a @racket[format] function, which determines the ticks' labels.
-}
-
-@doc-apply[ticks-default-number]{
-Most tick layout functions (and thus their corresponding @racket[ticks]-constructing functions) have a @racket[#:number] keyword argument with default @racket[(ticks-default-number)].
-What the number means depends on the tick layout function.
-Most use it for an average number of major ticks.
-
-It is unlikely to mean the exact number of major ticks.
-Without adjusting the number of ticks, layout functions usually cannot find uniformly spaced ticks that will have simple labels after formatting.
-For example, the following plot shows the actual number of major ticks for the interval [0,@italic{x}] when the requested number of ticks is 8, as generated by @racket[linear-ticks-layout]:
-@interaction[#:eval plot-eval
-                    (plot (function (λ (x)
-                                      (count pre-tick-major?
-                                             ((linear-ticks-layout #:number 8) 0 x)))
-                                    0.1 10)
-                          #:x-label "Interval [0,x]" #:y-label "Number of ticks")]
-}
-
-@subsection{Linear Ticks}
-
-@doc-apply[linear-ticks-layout]
-@doc-apply[linear-ticks-format]
-@doc-apply[linear-ticks]{
-The layout function, format function, and combined @racket[ticks] for uniformly spaced ticks.
-
-To lay out ticks, @racket[linear-ticks-layout] finds the power of @racket[base] closest to the axis interval size, chooses a simple first tick, and then chooses a skip length using @racket[divisors] that maximizes the number of ticks without exceeding @racket[number].
-@margin-note*{For strategic use of non-default arguments, see @racket[bit/byte-ticks], @racket[currency-ticks], and @racket[fraction-ticks].}
-The default arguments correspond to the standard 1-2-5-in-base-10 rule used almost everywhere in plot tick layout.
-
-To format ticks, @racket[linear-ticks-format] uses @racket[real->plot-label], and uses @racket[digits-for-range] to determine the maximum number of fractional digits in the decimal expansion.
-}
-
-@subsection{Log Ticks}
-
-@doc-apply[log-ticks-layout]
-@doc-apply[log-ticks-format]
-@doc-apply[log-ticks]{
-The layout function, format function, and combined @racket[ticks] for exponentially spaced major ticks.
-(The minor ticks between are uniformly spaced.)
-Use these ticks for @racket[log-transform]ed axes, because when exponentially spaced tick positions are @racket[log-transform]ed, they become uniformly spaced.
-
-The @racket[#:base] keyword argument is the logarithm base.
-See @racket[plot-z-far-ticks] for an example of use.
-}
-
-@subsection{Date Ticks}
-
-@doc-apply[date-ticks-layout]
-@doc-apply[date-ticks-format]
-@doc-apply[date-ticks]{
-The layout function, format function, and combined @racket[ticks] for uniformly spaced ticks with date labels.
-
-These axis ticks regard values as being in seconds since @italic{a system-dependent Universal Coordinated Time (UTC) epoch}.
-(For example, the Unix and Mac OS X epoch is January 1, 1970 UTC, and the Windows epoch is January 1, 1601 UTC.)
-Use @racket[date->seconds] to convert local dates to seconds, or @racket[datetime->real] to convert dates to UTC seconds in a way that accounts for time zone offsets.
-
-Actually, @racket[date-ticks-layout] does not always space ticks @italic{quite} uniformly.
-For example, it rounds ticks that are spaced about one month apart or more to the nearest month.
-Generally, @racket[date-ticks-layout] tries to place ticks at minute, hour, day, week, month and year boundaries, as well as common multiples such as 90 days or 6 months.
-
-To try to avoid displaying overlapping labels, @racket[date-ticks-format] chooses date formats from @racket[formats] for which labels will contain no redundant information.
-
-All the format specifiers given in @racketmodname[srfi/19 #:indirect] (which are derived from Unix's @tt{date} command), except those that represent time zones, are allowed in date format strings.
-}
-
-@doc-apply[date-ticks-formats]{
-The default date formats.
-}
-
-@doc-apply[24h-descending-date-ticks-formats]
-@doc-apply[12h-descending-date-ticks-formats]
-
-@subsection{Time Ticks}
-
-@doc-apply[time-ticks-layout]
-@doc-apply[time-ticks-format]
-@doc-apply[time-ticks]{
-The layout function, format function, and combined @racket[ticks] for uniformly spaced ticks with time labels.
-
-These axis ticks regard values as being in seconds.
-Use @racket[datetime->real] to convert @racket[sql-time] or @racket[plot-time] values to seconds.
-
-Generally, @racket[time-ticks-layout] tries to place ticks at minute, hour and day boundaries, as well as common multiples such as 12 hours or 30 days.
-
-To try to avoid displaying overlapping labels, @racket[time-ticks-format] chooses a date format from @racket[formats] for which labels will contain no redundant information.
-
-All the time-related format specifiers given in @racketmodname[srfi/19 #:indirect] (which are derived from Unix's @tt{date} command) are allowed in time format strings.
-}
-
-@doc-apply[time-ticks-formats]{
-The default time formats.
-}
-
-@doc-apply[24h-descending-time-ticks-formats]
-@doc-apply[12h-descending-time-ticks-formats]
-
-@subsection{Currency Ticks}
-
-@doc-apply[currency-ticks-format]
-@doc-apply[currency-ticks]{
-The format function and combined @racket[ticks] for uniformly spaced ticks with currency labels.
-
-The @racket[#:kind] keyword argument is either a string containing the currency symbol, or a currency code such as @racket['USD], @racket['GBP] or @racket['EUR].
-The @racket[currency-ticks-format] function can map most ISO 4217 currency codes to their corresponding currency symbol.
-
-The @racket[#:scales] keyword argument is a list of suffixes for each 10@superscript{3} scale, such as @racket["K"] (US thousand, or kilo), @racket["bn"] (UK short-scale billion) or @racket["Md"] (EU long-scale milliard). Off-scale amounts are given power-of-ten suffixes such as ``×10@superscript{21}.''
-
-The @racket[#:formats] keyword argument is a list of three format strings, representing the formats of positive, negative, and zero amounts, respectively. The format specifiers are:
-@itemlist[@item{@racket["~$"]: replaced by the currency symbol}
-          @item{@racket["~w"]: replaced by the whole part of the amount}
-          @item{@racket["~f"]: replaced by the fractional part, with 2 or more decimal digits}
-          @item{@racket["~s"]: replaced by the scale suffix}
-          @item{@racket["~~"]: replaced by ``~''}]
-}
-
-@doc-apply[currency-ticks-scales]
-@doc-apply[currency-ticks-formats]{
-The default currency scales and formats.
-
-For example, a @(plot-name) user in France would probably begin programs with
-@racketblock[(require plot)
-             (currency-ticks-scales eu-currency-scales)
-             (currency-ticks-formats eu-currency-formats)]
-and use @racket[(currency-ticks #:kind 'EUR)] for local currency or @racket[(currency-ticks #:kind 'JPY)] for Japanese Yen.
-
-Cultural sensitivity notwithstanding, when writing for a local audience, it is generally considered proper to use local currency scales and formats for foreign currencies, but use the foreign currency symbol.
-}
-
-@doc-apply[us-currency-scales]{
-Short-scale suffix abbreviations as commonly used in the United States, Canada, and some other English-speaking countries. These stand for ``kilo,'' ``million,'' ``billion,'' and ``trillion.''
-}
-
-@doc-apply[uk-currency-scales]{
-Short-scale suffix abbreviations as commonly used in the United Kingdom since switching to the short scale in 1974, and as currently recommended by the Daily Telegraph and Times style guides.
-}
-
-@doc-apply[eu-currency-scales]{
-European Union long-scale suffix abbreviations, which stand for ``kilo,'' ``million,'' ``milliard,'' and ``billion.''
-
-The abbreviations actually used vary with geography, even within countries, but these seem to be common.
-Further long-scale suffix abbreviations such as for ``billiard'' are ommitted due to lack of even weak consensus.
-}
-
-@doc-apply[us-currency-formats]{
-Common currency formats used in the United States.
-}
-
-@doc-apply[uk-currency-formats]{
-Common currency formats used in the United Kingdom.
-Note that it sensibly uses a negative sign to denote negative amounts.
-}
-
-@doc-apply[eu-currency-formats]{
-A guess at common currency formats for the European Union.
-Like scale suffixes, actual formats vary with geography, but currency formats can even vary with audience or tone.
-}
-
-@subsection{Other Ticks}
-
-@doc-apply[no-ticks-layout]
-@doc-apply[no-ticks-format]
-@doc-apply[no-ticks]{
-The layout function, format function, and combined @racket[ticks] for no ticks whatsoever.
-@examples[#:eval plot-eval
-                 (parameterize ([plot-x-ticks  no-ticks]
-                                [plot-y-ticks  no-ticks]
-                                [plot-x-label  #f]
-                                [plot-y-label  #f])
-                   (plot (list (polar-axes) (polar (λ (θ) 1/3)))))]
-}
-
-@doc-apply[bit/byte-ticks-format]
-@doc-apply[bit/byte-ticks]{
-The format function and and combined @racket[ticks] for bit or byte values.
-
-The @racket[#:kind] keyword argument indicates either International System of Units (@racket['SI]) suffixes, as used to communicate hard drive capacities, or Computer Science (@racket['CS]) suffixes, as used to communicate memory capacities.
-}
-
-@doc-apply[fraction-ticks-format]
-@doc-apply[fraction-ticks]{
-The format function and and combined @racket[ticks] for fraction-formatted values.
-}
-
-@subsection{Tick Combinators}
-
-@doc-apply[ticks-mimic]{
-Returns a @racket[ticks] that mimics the given @racket[ticks] returned by @racket[thunk].
-Used in default values for @racket[plot-x-far-ticks], @racket[plot-y-far-ticks] and @racket[plot-z-far-ticks] to ensure that, unless one of these parameters is changed, the far tick labels are not drawn.
-}
-
-@doc-apply[ticks-add]{
-Returns a new @racket[ticks] that acts like @racket[t], except that it puts additional ticks at positions @racket[xs]. If @racket[major?] is true, the ticks at positions @racket[xs] are all @tech{major ticks}; otherwise, they are minor ticks.
-}
-
-@doc-apply[ticks-scale]{
-Returns a new @racket[ticks] that acts like @racket[t], but for an axis transformed by @racket[fun].
-Unlike with typical @secref["transforms"], @racket[fun] is allowed to transform axis endpoints.
-(See @racket[make-axis-transform] for an explanation about transforming endpoints.)
-
-Use @racket[ticks-scale] to plot values at multiple scales simultaneously, with one scale on the near axis and one scale on the far axis.
-The following example plots degrees Celsius on the left and degrees Farenheit on the right:
-@interaction[#:eval plot-eval
-                    (parameterize
-                        ([plot-x-ticks      (time-ticks)]
-                         [plot-y-far-ticks  (ticks-scale (plot-y-ticks)
-                                                         (linear-scale 9/5 32))]
-                         [plot-y-label      "Temperature (\u00b0C)"]
-                         [plot-y-far-label  "Temperature (\u00b0F)"])
-                      (define data
-                        (list #(0 0) #(15 0.6) #(30 9.5) #(45 10.0) #(60 16.6)
-                              #(75 41.6) #(90 42.7) #(105 65.5) #(120 78.9)
-                              #(135 78.9) #(150 131.1) #(165 151.1) #(180 176.2)))
-                      (plot (list
-                             (function (λ (x) (/ (sqr x) 180)) 0 180
-                                       #:style 'long-dash #:color 3 #:label "Trend")
-                             (lines data #:color 2 #:width 2)
-                             (points data #:color 1 #:line-width 2 #:label "Measured"))
-                            #:y-min -25 #:x-label "Time"))]
-}
-
-@subsection{Tick Data Types and Contracts}
-
-@defstruct[pre-tick ([value real?] [major? boolean?])]{
-Represents a tick that has not yet been labeled.
-}
-@defstruct[(tick pre-tick) ([label string?])]{
-Represents a tick with a label.
-}
-
-@doc-apply[ticks-layout/c]{
-The contract for tick layout functions. Note that a layout function returns @racket[pre-tick]s, or unlabeled ticks.
-}
-
-@doc-apply[ticks-format/c]{
-The contract for tick format functions. A format function receives axis bounds so it can determine how many decimal digits to display (usually by applying @racket[digits-for-range] to the bounds).
-}
-
-@section[#:tag "invertible"]{Invertible Functions}
-
-@defstruct[invertible-function ([f (real? . -> . real?)] [g (real? . -> . real?)])]{
-Represents an invertible function. Used for @secref["transforms"] and by @racket[ticks-scale].
-
-The function itself is @racket[f], and its inverse is @racket[g].
-Because @racket[real?]s can be inexact, this invariant must be approximate and therefore cannot be enforced.
-(For example, @racket[(exp (log 10))] = @racket[10.000000000000002].)
-The obligation to maintain it rests on whomever constructs one.
-}
-
-@doc-apply[id-function]{
-The identity function as an @racket[invertible-function].
-}
-
-@doc-apply[invertible-compose]{
-Returns the composition of two invertible functions.
-}
-
-@doc-apply[invertible-inverse]{
-Returns the inverse of an invertible function.
-}
-
-@doc-apply[linear-scale]{
-Returns a one-dimensional linear scaling function, as an @racket[invertible-function].
-This function constructs the most common arguments to @racket[ticks-scale].
-}
diff --git a/pkgs/plot-pkgs/plot-doc/plot/scribblings/utils.scrbl b/pkgs/plot-pkgs/plot-doc/plot/scribblings/utils.scrbl
deleted file mode 100644
index 7ec70bccb2..0000000000
--- a/pkgs/plot-pkgs/plot-doc/plot/scribblings/utils.scrbl
+++ /dev/null
@@ -1,518 +0,0 @@
-#lang scribble/manual
-
-@(require "common.rkt")
-
-@title[#:tag "utils"]{Plot Utilities}
-
-@declare-exporting[plot/utils]
-@defmodule*/no-declare[(plot/utils plot/typed/utils)]
-
-@;====================================================================================================
-@section{Formatting}
-
-@doc-apply[digits-for-range]{
-Given a range, returns the number of decimal places necessary to distinguish numbers in the range.
-This may return negative numbers for large ranges.
-
-@examples[#:eval plot-eval
-                 (digits-for-range 0.01 0.02)
-                 (digits-for-range 0 100000)]
-}
-
-@doc-apply[real->plot-label]{
-Converts a real number to a plot label.
-Used to format axis tick labels, @(racket point-label)s, and numbers in legend entries.
-
-@examples[#:eval plot-eval
-                 (let ([d  (digits-for-range 0.01 0.03)])
-                   (real->plot-label 0.02555555 d))
-                 (real->plot-label 2352343 -2)
-                 (real->plot-label 1000000000. 4)
-                 (real->plot-label 1000000000.1234 4)]
-}
-
-@doc-apply[ivl->plot-label]{
-Converts an interval to a plot label.
-
-If @racket[i] = @racket[(ivl x-min x-max)], the number of digits used is @racket[(digits-for-range x-min x-max 10 extra-digits)] when both endpoints are @racket[rational?].
-Otherwise, it is unspecified---but will probably remain @racket[15].
-@examples[#:eval plot-eval
-                 (ivl->plot-label (ivl -10.52312 10.99232))
-                 (ivl->plot-label (ivl -inf.0 pi))]
-}
-
-@doc-apply[->plot-label]{
-Converts a Racket value to a label. Used by @(racket discrete-histogram) and @(racket discrete-histogram3d).
-}
-
-@doc-apply[real->string/trunc]{
-Like @(racket real->decimal-string), but removes any trailing zeros and any trailing decimal point.
-}
-
-@doc-apply[real->decimal-string*]{
-Like @racket[real->decimal-string], but accepts both a maximum and minimum number of digits.
-@examples[#:eval plot-eval
-                 (real->decimal-string* 1 5 10)
-                 (real->decimal-string* 1.123456 5 10)
-                 (real->decimal-string* 1.123456789123456 5 10)]
-Applying @racket[(real->decimal-string* x min-digits)] yields the same value as @racket[(real->decimal-string x min-digits)].
-}
-
-@doc-apply[integer->superscript]{
-Converts an integer into a string of superscript Unicode characters.
-@examples[#:eval plot-eval
-                 (integer->superscript -1234567890)]
-Systems running some out-of-date versions of Windows XP have difficulty with Unicode superscripts for 4 and up.
-Because @racket[integer->superscript] is used by every number formatting function to format exponents, if you have such a system, @(plot-name) will apparently not format all numbers with exponents correctly (until you update it).
-}
-
-@;{
-@doc-apply[format-tick-labels]{
-}
-}
-
-@;====================================================================================================
-@section{Sampling}
-
-@doc-apply[linear-seq]{
-Returns a list of uniformly spaced real numbers between @(racket start) and @(racket end).
-If @(racket start?) is @(racket #t), the list includes @(racket start).
-If @(racket end?) is @(racket #t), the list includes @(racket end).
-
-This function is used internally to generate sample points.
-
-@examples[#:eval plot-eval
-                 (linear-seq 0 1 5)
-                 (linear-seq 0 1 5 #:start? #f)
-                 (linear-seq 0 1 5 #:end? #f)
-                 (linear-seq 0 1 5 #:start? #f #:end? #f)
-                 (define xs (linear-seq -1 1 11))
-                 (plot (lines (map vector xs (map sqr xs))))]
-}
-
-@doc-apply[linear-seq*]{
-Like @(racket linear-seq), but accepts a list of reals instead of a start and end.
-The @(racket #:start?) and @(racket #:end?) keyword arguments work as in @(racket linear-seq).
-This function does not guarantee that each inner value will be in the returned list.
-
-@examples[#:eval plot-eval
-                 (linear-seq* '(0 1 2) 5)
-                 (linear-seq* '(0 1 2) 6)
-                 (linear-seq* '(0 1 0) 5)]
-}
-
-@doc-apply[nonlinear-seq]{
-Generates a list of reals that, if transformed using @(racket transform), would be uniformly spaced.
-This is used to generate samples for transformed axes.
-@examples[#:eval plot-eval
-                 (linear-seq 1 10 4)
-                 (nonlinear-seq 1 10 4 log-transform)
-                 (parameterize ([plot-x-transform  log-transform])
-                   (plot (area-histogram sqr (nonlinear-seq 1 10 4 log-transform))))]
-}
-
-@;{
-@doc-apply[build-linear-seq]
-@doc-apply[make-function->sampler]
-@doc-apply[make-2d-function->sampler]
-@doc-apply[make-3d-function->sampler]
-@doc-apply[sample-exact->inexact]
-@doc-apply[2d-sample-exact->inexact]
-@doc-apply[3d-sample-exact->inexact]
-}
-
-@defstruct[mapped-function ([f (any/c . -> . any/c)] [fmap ((listof any/c) . -> . (listof any/c))])]{
-Represents a function that maps over lists differently than @(racket (map f xs)).
-
-With some functions, mapping over a list can be done much more quickly if done specially.
-(An example is a piecewise function with many pieces that first must decide which interval its input belongs to. Deciding that for many inputs can be done more efficiently by sorting all the inputs first.)
-Renderer-producing functions that accept a @(racket (real? . -> . real?)) also accept a @(racket mapped-function), and use its @(racket fmap) to sample more efficiently.
-}
-
-@doc-apply[kde]{
-Given optionally weighted samples and a kernel bandwidth, returns a @(racket mapped-function) representing a kernel density estimate, and bounds, outside of which the density estimate is zero.
-Used by @(racket density).
-}
-
-@;====================================================================================================
-@section{Plot Colors and Styles}
-
-@doc-apply[color-seq]{
-Interpolates between colors---red, green and blue components separately---using @(racket linear-seq).
-The @(racket #:start?) and @(racket #:end?) keyword arguments work as in @(racket linear-seq).
-
-@examples[#:eval plot-eval (plot (contour-intervals (λ (x y) (+ x y)) -2 2 -2 2
-                                                    #:levels 4 #:contour-styles '(transparent)
-                                                    #:colors (color-seq "red" "blue" 5)))]
-}
-
-@doc-apply[color-seq*]{
-Interpolates between colors---red, green and blue components separately---using @(racket linear-seq*).
-The @(racket #:start?) and @(racket #:end?) keyword arguments work as in @(racket linear-seq).
-
-@examples[#:eval plot-eval (plot (contour-intervals (λ (x y) (+ x y)) -2 2 -2 2
-                                                    #:levels 4 #:contour-styles '(transparent)
-                                                    #:colors (color-seq* '(red white blue) 5)))]
-}
-
-@doc-apply[->color]{
-Converts a non-integer plot color to an RGB triplet.
-
-Symbols are converted to strings, and strings are looked up in a @(racket color-database<%>).
-Lists are unchanged, and @(racket color%) objects are converted straightforwardly.
-
-@examples[#:eval plot-eval
-                 (->color 'navy)
-                 (->color "navy")
-                 (->color '(36 36 140))
-                 (->color (make-object color% 36 36 140))]
-
-This function does not convert integers to RGB triplets, because there is no way for it to know whether the color will be used for a pen or for a brush.
-Use @(racket ->pen-color) and @(racket ->brush-color) to convert integers.
-}
-
-@doc-apply[->pen-color]{
-Converts a @italic{line} color to an RGB triplet. This function interprets integer colors as darker and more saturated than @(racket ->brush-color) does.
-
-Non-integer colors are converted using @(racket ->color).
-Integer colors are chosen for good pairwise contrast, especially between neighbors.
-Integer colors repeat starting with @(racket 128).
-
-@examples[#:eval plot-eval
-                 (equal? (->pen-color 0) (->pen-color 8))
-                 (plot (contour-intervals
-                        (λ (x y) (+ x y)) -2 2 -2 2
-                        #:levels 7 #:contour-styles '(transparent)
-                        #:colors (map ->pen-color (build-list 8 values))))]
-}
-
-@doc-apply[->brush-color]{
-Converts a @italic{fill} color to an RGB triplet. This function interprets integer colors as lighter and less saturated than @(racket ->pen-color) does.
-
-Non-integer colors are converted using @(racket ->color).
-Integer colors are chosen for good pairwise contrast, especially between neighbors.
-Integer colors repeat starting with @(racket 128).
-
-@examples[#:eval plot-eval
-                 (equal? (->brush-color 0) (->brush-color 8))
-                 (plot (contour-intervals
-                        (λ (x y) (+ x y)) -2 2 -2 2
-                        #:levels 7 #:contour-styles '(transparent)
-                        #:colors (map ->brush-color (build-list 8 values))))]
-
-In the above example, @(racket map)ping @(racket ->brush-color) over the list is actually unnecessary, because @(racket contour-intervals) uses @(racket ->brush-color) internally to convert fill colors.
-
-The @(racket function-interval) function generally plots areas using a fill color and lines using a line color.
-Both kinds of color have the default value @(racket 3).
-The following example reverses the default behavior; i.e it draws areas using @italic{line} color @(racket 3) and lines using @italic{fill} color @(racket 3):
-@interaction[#:eval plot-eval (plot (function-interval sin (λ (x) 0) -4 4
-                                                       #:color (->pen-color 3)
-                                                       #:line1-color (->brush-color 3)
-                                                       #:line2-color (->brush-color 3)
-                                                       #:line1-width 4 #:line2-width 4))]
-}
-
-@doc-apply[->pen-style]{
-Converts a symbolic pen style or a number to a symbolic pen style.
-Symbols are unchanged.
-Integer pen styles repeat starting at @(racket 5).
-
-@examples[#:eval plot-eval
-                 (eq? (->pen-style 0) (->pen-style 5))
-                 (map ->pen-style '(0 1 2 3 4))]
-}
-
-@doc-apply[->brush-style]{
-Converts a symbolic brush style or a number to a symbolic brush style.
-Symbols are unchanged.
-Integer brush styles repeat starting at @(racket 7).
-
-@examples[#:eval plot-eval
-                 (eq? (->brush-style 0) (->brush-style 7))
-                 (map ->brush-style '(0 1 2 3))
-                 (map ->brush-style '(4 5 6))]
-}
-
-@;====================================================================================================
-@section{Plot-Specific Math}
-
-@;----------------------------------------------------------------------------------------------------
-@subsection{Real Functions}
-
-@doc-apply[polar->cartesian]{
-Converts 2D polar coordinates to 3D cartesian coordinates.
-}
-
-@doc-apply[3d-polar->3d-cartesian]{
-Converts 3D polar coordinates to 3D cartesian coordinates.
-See @racket[parametric3d] for an example of use.
-}
-
-@doc-apply[ceiling-log/base]{
-Like @racket[(ceiling (/ (log x) (log b)))], but @racket[ceiling-log/base] is not susceptible to floating-point error.
-@examples[#:eval plot-eval
-                 (ceiling (/ (log 100) (log 10)))
-                 (ceiling-log/base 10 100)
-                 (ceiling (/ (log 1/1000) (log 10)))
-                 (ceiling-log/base 10 1/1000)]
-Various number-formatting functions use this.
-}
-
-@doc-apply[floor-log/base]{
-Like @racket[(floor (/ (log x) (log b)))], but @racket[floor-log/base] is not susceptible to floating-point error.
-@examples[#:eval plot-eval
-                 (floor (/ (log 100) (log 10)))
-                 (floor-log/base 10 100)
-                 (floor (/ (log 1000) (log 10)))
-                 (floor-log/base 10 1000)]
-This is a generalization of @racket[order-of-magnitude].
-}
-
-@doc-apply[maybe-inexact->exact]{
-Returns @racket[#f] if @racket[x] is @racket[#f]; otherwise @racket[(inexact->exact x)].
-Use this to convert interval endpoints, which may be @racket[#f], to exact numbers.
-}
-
-@;----------------------------------------------------------------------------------------------------
-@subsection[#:tag "math.vectors"]{Vector Functions}
-
-@doc-apply[v+]
-@doc-apply[v-]
-@doc-apply[vneg]
-@doc-apply[v*]
-@doc-apply[v/]{
-Vector arithmetic. Equivalent to @racket[vector-map]p-ing arithmetic operators over vectors, but specialized so that 2- and 3-vector operations are much faster.
-@examples[#:eval plot-eval
-                 (v+ #(1 2) #(3 4))
-                 (v- #(1 2) #(3 4))
-                 (vneg #(1 2))
-                 (v* #(1 2 3) 2)
-                 (v/ #(1 2 3) 2)]
-}
-
-@doc-apply[v=]{
-Like @racket[equal?] specialized to numeric vectors, but compares elements using @racket[=].
-@examples[#:eval plot-eval
-                 (equal? #(1 2) #(1 2))
-                 (equal? #(1 2) #(1.0 2.0))
-                 (v= #(1 2) #(1.0 2.0))]
-}
-
-@doc-apply[vcross]{
-Returns the right-hand vector cross product of @racket[v1] and @racket[v2].
-@examples[#:eval plot-eval
-                 (vcross #(1 0 0) #(0 1 0))
-                 (vcross #(0 1 0) #(1 0 0))
-                 (vcross #(0 0 1) #(0 0 1))]
-}
-
-@doc-apply[vcross2]{
-Returns the signed area of the 2D parallelogram with sides @racket[v1] and @racket[v2].
-Equivalent to @racket[(vector-ref (vcross (vector-append v1 #(0)) (vector-append v2 #(0))) 2)] but faster.
-@examples[#:eval plot-eval
-                 (vcross2 #(1 0) #(0 1))
-                 (vcross2 #(0 1) #(1 0))]
-}
-
-@doc-apply[vdot]{
-Returns the dot product of @racket[v1] and @racket[v2].
-}
-
-@doc-apply[vmag^2]{
-Returns the squared magnitude of @racket[v]. Equivalent to @racket[(vdot v v)].
-}
-
-@doc-apply[vmag]{
-Returns the magnitude of @racket[v]. Equivalent to @racket[(sqrt (vmag^2 v))].
-}
-
-@doc-apply[vnormalize]{
-Returns a normal vector in the same direction as @racket[v]. If @racket[v] is a zero vector, returns @racket[v].
-@examples[#:eval plot-eval
-                 (vnormalize #(1 1 0))
-                 (vnormalize #(1 1 1))
-                 (vnormalize #(0 0 0.0))]
-}
-
-@doc-apply[vcenter]{
-Returns the center of the smallest bounding box that contains @racket[vs].
-@examples[#:eval plot-eval
-                 (vcenter '(#(1 1) #(2 2)))]
-}
-
-@doc-apply[vrational?]{
-Returns @racket[#t] if every element of @racket[v] is @racket[rational?].
-@examples[#:eval plot-eval
-                 (vrational? #(1 2))
-                 (vrational? #(+inf.0 2))
-                 (vrational? #(#f 1))]
-}
-
-@;----------------------------------------------------------------------------------------------------
-@subsection[#:tag "math.intervals"]{Intervals and Interval Functions}
-
-@defstruct[ivl ([min real?] [max real?])]{
-Represents a closed interval.
-
-An interval with two real-valued endpoints always contains the endpoints in order:
-@interaction[#:eval plot-eval (ivl 0 1) (ivl 1 0)]
-
-@;{
-If either endpoint is @racket[+nan.0], both are, and the interval represents the empty interval:
-@interaction[#:eval plot-eval (ivl +nan.0 0) (ivl 0 +nan.0)]
-}
-
-An interval can have infinite endpoints:
-@interaction[#:eval plot-eval (ivl -inf.0 0) (ivl 0 +inf.0) (ivl -inf.0 +inf.0)]
-
-Functions that return rectangle renderers, such as @racket[rectangles] and @racket[discrete-histogram3d], accept vectors of @racket[ivl]s as arguments.
-The @racket[ivl] struct type is also provided by @racketmodname[plot] so users of such renderers do not have to require @racketmodname[plot/utils].
-}
-
-@doc-apply[rational-ivl?]{
-Returns @racket[#t] if @racket[i] is an interval and each of its endpoints is @racket[rational?].
-@examples[#:eval plot-eval
-                 (map rational-ivl? (list (ivl -1 1) (ivl -inf.0 2) 'bob))]
-}
-
-@;{
-@doc-apply[empty-ivl]{
-The empty interval.
-}
-
-@defproc[(ivl-meet [i ivl?] ...) ivl?]{
-Returns the intersection of the given intervals.
-@examples[#:eval plot-eval
-                 (ivl-meet)
-                 (ivl-meet (ivl 0 1) (ivl 2 3))
-                 (ivl-meet (ivl 0 2) (ivl 1 3))
-                 (ivl-meet empty-ivl (ivl 0 1))]
-}
-
-@defproc[(ivl-join [i ivl?] ...) ivl?]{
-Returns the smallest interval that contains all the points in the given intervals.
-@examples[#:eval plot-eval
-                 (ivl-join)
-                 (ivl-join (ivl 0 1) (ivl 2 3))
-                 (ivl-join (ivl 0 2) (ivl 1 3))
-                 (ivl-join empty-ivl (ivl 0 1))]
-Think of it as returning an interval union, but with any gaps filled.
-}
-
-@doc-apply[ivl-center]{
-@examples[#:eval plot-eval
-                 (ivl-center (ivl -1 1))
-                 (ivl-center empty-ivl)
-                 (ivl-center (ivl -inf.0 +inf.0))]
-}
-
-@doc-apply[ivl-contains?]{
-@examples[#:eval plot-eval
-                 (ivl-contains? (ivl -1 1) 0)
-                 (ivl-contains? (ivl -1 1) 2)
-                 (ivl-contains? (ivl -inf.0 +inf.0) 0)
-                 (ivl-contains? empty-ivl 0)]
-}
-
-@doc-apply[ivl-empty?]{
-@examples[#:eval plot-eval
-                 (ivl-empty? empty-ivl)
-                 (ivl-empty? (ivl 0 0))]
-}
-
-@doc-apply[ivl-length]{
-@examples[#:eval plot-eval
-                 (ivl-length empty-ivl)
-                 (ivl-length (ivl 0 0))
-                 (ivl-length (ivl -1 1))
-                 (ivl-length (ivl -inf.0 +inf.0))]
-}
-
-@doc-apply[ivl-inexact->exact]
-@doc-apply[ivl-rational?]
-@doc-apply[ivl-singular?]
-@doc-apply[ivl-translate]
-@doc-apply[ivl-zero-length?]
-}
-
-@doc-apply[bounds->intervals]{
-Given a list of points, returns intervals between each pair.
-
-Use this to construct inputs for @(racket rectangles) and @(racket rectangles3d).
-@examples[#:eval plot-eval (bounds->intervals (linear-seq 0 1 5))]
-}
-
-@doc-apply[clamp-real]{
-}
-
-@;----------------------------------------------------------------------------------------------------
-@;{
-@subsection[#:tag "math.rectangles"]{Rectangles and Rectangle Functions}
-
-@margin-note*{The @racket[rect-meet] and @racket[rect-join] functions define a @link["http://en.wikipedia.org/wiki/Lattice_%28order%29"]{pointed lattice} over rectangles.
-                  This fact may seem esoteric, but it allows @(plot-name) to combine multiple renderers with different rectangular bounds in a way that is intuitive and mathematically sound.}
-@defproc[(rect-meet [i (vectorof ivl?)] ...) (vectorof ivl?)]{
-}
-
-@defproc[(rect-join [i (vectorof ivl?)] ...) (vectorof ivl?)]{
-}
-
-@doc-apply[empty-rect]
-@doc-apply[rect-area]
-@doc-apply[rect-center]
-@doc-apply[rect-contains?]
-@doc-apply[rect-empty?]
-@doc-apply[rect-inexact->exact]
-@doc-apply[rect-known?]
-@doc-apply[rect-rational?]
-@doc-apply[rect-singular?]
-@doc-apply[rect-translate]
-@doc-apply[rect-zero-area?]
-@doc-apply[rational-rect?]
-@doc-apply[bounding-rect]
-}
-
-@;====================================================================================================
-@;{
-@section{Marching Squares and Cubes}
-
-@doc-apply[heights->cube-polys]
-@doc-apply[heights->lines]
-@doc-apply[heights->polys]{
-winding warning
-}
-}
-
-@;====================================================================================================
-@section{Dates and Times}
-
-@doc-apply[datetime->real]{
-Converts various date/time representations into UTC seconds, respecting time zone offsets.
-
-For dates, the value returned is the number of seconds since @italic{a system-dependent UTC epoch}.
-See @racket[date-ticks] for more information.
-
-To plot a time series using dates pulled from an SQL database, simply set the relevant axis ticks (probably @racket[plot-x-ticks]) to @racket[date-ticks], and convert the dates to seconds using @racket[datetime->real] before passing them to @racket[lines].
-To keep time zone offsets from influencing the plot, set them to @racket[0] first.
-}
-
-@defstruct[plot-time ([second (and/c (>=/c 0) (</c 60))]
-                      [minute (integer-in 0 59)]
-                      [hour (integer-in 0 23)]
-                      [day exact-integer?])]{
-A time representation that accounts for days, negative times (using negative days), and fractional seconds.
-
-@(plot-name) (specifically @racket[time-ticks]) uses @racket[plot-time] internally to format times, but because renderer-producing functions require only real values,
-user code should not need it. It is provided just in case.
-}
-
-@doc-apply[plot-time->seconds]
-@doc-apply[seconds->plot-time]{
-Convert @racket[plot-time]s to real seconds, and vice-versa.
-@examples[#:eval plot-eval
-                 (define (plot-time+ t1 t2)
-                   (seconds->plot-time (+ (plot-time->seconds t1)
-                                          (plot-time->seconds t2))))
-                 (plot-time+ (plot-time 32 0 12 1)
-                             (plot-time 32 0 14 1))]
-}
diff --git a/pkgs/plot-pkgs/plot-gui-lib/LICENSE.txt b/pkgs/plot-pkgs/plot-gui-lib/LICENSE.txt
deleted file mode 100644
index dbb89375c4..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-plot
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/plot-pkgs/plot-gui-lib/info.rkt b/pkgs/plot-pkgs/plot-gui-lib/info.rkt
deleted file mode 100644
index 7864181fdd..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/info.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "plot-lib"
-               "gui-lib"
-               "snip-lib"
-               "typed-racket-lib"
-               "typed-racket-more"
-               "unstable-lib"
-               "unstable-contract-lib"
-               "unstable-latent-contract-lib"
-               "unstable-parameter-group-lib"))
-
-(define build-deps '())
-
-(define pkg-desc "Plot GUI interface")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/info.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/info.rkt
deleted file mode 100644
index e0c94f2762..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/info.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang info
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/main.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/main.rkt
deleted file mode 100644
index b2114ce04b..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/main.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-
-(require unstable/latent-contract
-         plot/no-gui
-         "private/gui/plot2d.rkt"
-         "private/gui/plot3d.rkt")
-
-(provide (all-from-out plot/no-gui)
-         (activate-contract-out plot-snip plot-frame plot)
-         (activate-contract-out plot3d-snip plot3d-frame plot3d))
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/gui.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/gui.rkt
deleted file mode 100644
index 404dc863c6..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/gui.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-
-;; GUI helpers
-
-(require racket/gui/base racket/class unstable/gui/snip)
-
-(provide (all-defined-out))
-
-(define snip-frame%
-  (class frame%
-    (define/override (on-traverse-char event)
-      (define key-code (send event get-key-code))
-      (case key-code
-        [(escape)  (send this show #f)]
-        [else  (super on-traverse-char event)]))
-    
-    (super-new)))
-
-(define (make-snip-frame snip width height label)
-  (define (make-snip w h) snip)
-  
-  (define frame
-    (new snip-frame% [label label] [width (+ 20 width)] [height (+ 20 height)]))
-  
-  (new snip-canvas%
-       [parent frame]
-       [make-snip make-snip]
-       [horiz-margin 5] [vert-margin 5]
-       [horizontal-inset 5] [vertical-inset 5])
-  
-  frame)
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/plot2d.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/plot2d.rkt
deleted file mode 100644
index a8330352ae..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/plot2d.rkt
+++ /dev/null
@@ -1,134 +0,0 @@
-#lang racket/base
-
-(require racket/snip racket/contract racket/class racket/match
-         unstable/contract
-         unstable/parameter-group
-         racket/lazy-require
-         unstable/latent-contract/defthing
-         plot/private/common/contract
-         plot/private/common/math
-         plot/private/common/draw
-         plot/private/common/parameters
-         plot/private/common/plot-element
-         plot/private/common/deprecation-warning
-         plot/private/plot2d/plot-area
-         plot/private/no-gui/plot2d
-         plot/private/no-gui/plot2d-utils)
-
-;; Require lazily, in case someone wants to just (require plot) in a headless setup
-(lazy-require ["snip2d.rkt" (make-2d-plot-snip)]
-              ["gui.rkt" (make-snip-frame)])
-
-(provide plot-snip plot-frame plot)
-
-;; ===================================================================================================
-;; Plot to a snip
-
-(defproc (plot-snip [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-                    [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                    [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                    [#:width width exact-positive-integer? (plot-width)]
-                    [#:height height exact-positive-integer? (plot-height)]
-                    [#:title title (or/c string? #f) (plot-title)]
-                    [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                    [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                    [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                    ) (is-a?/c image-snip%)
-  (parameterize ([plot-title          title]
-                 [plot-x-label        x-label]
-                 [plot-y-label        y-label]
-                 [plot-legend-anchor  legend-anchor])
-    (define saved-plot-parameters (plot-parameters))
-    (define renderer-list (get-renderer-list renderer-tree))
-    (define bounds-rect (get-bounds-rect renderer-list x-min x-max y-min y-max))
-    
-    (define (make-bm anim? bounds-rect width height)
-      (define area #f)
-      (define bm
-        (parameterize/group ([plot-parameters  saved-plot-parameters]
-                             [plot-animating?  (if anim? #t (plot-animating?))])
-          ((if (plot-animating?) draw-bitmap draw-bitmap/supersampling)
-           (λ (dc)
-             (define-values (x-ticks x-far-ticks y-ticks y-far-ticks)
-               (get-ticks renderer-list bounds-rect))
-             
-             (set! area (make-object 2d-plot-area%
-                          bounds-rect x-ticks x-far-ticks y-ticks y-far-ticks
-                          dc 0 0 width height))
-             
-             (plot-area area renderer-list))
-           width height)))
-      
-      (define (area-bounds->plot-bounds rect)
-        (match-define (vector (ivl area-x-min area-x-max) (ivl area-y-min area-y-max)) rect)
-        (match-define (vector x-min y-min) (send area dc->plot (vector area-x-min area-y-min)))
-        (match-define (vector x-max y-max) (send area dc->plot (vector area-x-max area-y-max)))
-        (vector (ivl x-min x-max) (ivl y-min y-max)))
-      
-      (values bm (send area get-area-bounds-rect) area-bounds->plot-bounds))
-    
-    (define-values (bm area-bounds-rect area-bounds->plot-bounds)
-      (make-bm #f bounds-rect width height))
-    
-    (make-2d-plot-snip
-     bm saved-plot-parameters
-     make-bm bounds-rect area-bounds-rect area-bounds->plot-bounds width height)))
-
-;; ===================================================================================================
-;; Plot to a frame
-
-(defproc (plot-frame [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-                     [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                     [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                     [#:width width exact-positive-integer? (plot-width)]
-                     [#:height height exact-positive-integer? (plot-height)]
-                     [#:title title (or/c string? #f) (plot-title)]
-                     [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                     [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                     [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                     ) (is-a?/c object%)
-  (define snip
-    (plot-snip
-     renderer-tree
-     #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:width width #:height height
-     #:title title #:x-label x-label #:y-label y-label #:legend-anchor legend-anchor))
-  (make-snip-frame snip width height (if title (format "Plot: ~a" title) "Plot")))
-
-;; ===================================================================================================
-;; Plot to a frame or a snip, depending on (plot-new-window?)
-
-(defproc (plot [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-               [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-               [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-               [#:width width exact-positive-integer? (plot-width)]
-               [#:height height exact-positive-integer? (plot-height)]
-               [#:title title (or/c string? #f) (plot-title)]
-               [#:x-label x-label (or/c string? #f) (plot-x-label)]
-               [#:y-label y-label (or/c string? #f) (plot-y-label)]
-               [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-               [#:out-file out-file (or/c path-string? output-port? #f) #f]
-               [#:out-kind out-kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-               [#:fgcolor fgcolor plot-color/c #f] [#:bgcolor bgcolor plot-color/c #f]
-               [#:lncolor lncolor plot-color/c #f]  ; unused
-               ) (or/c (is-a?/c snip%) void?)
-  (when fgcolor
-    (deprecation-warning "the plot #:fgcolor keyword argument" "plot-foreground"))
-  (when bgcolor
-    (deprecation-warning "the plot #:bgcolor keyword argument" "plot-background"))
-  (when lncolor
-    (deprecation-warning "the plot #:lncolor keyword argument"))
-  
-  (define (call f . args)
-    (apply f renderer-tree args
-           #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:width width #:height height
-           #:title title #:x-label x-label #:y-label y-label #:legend-anchor legend-anchor))
-  
-  (parameterize ([plot-foreground  (if fgcolor fgcolor (plot-foreground))]
-                 [plot-background  (if bgcolor bgcolor (plot-background))])
-    (when out-file
-      (call plot-file out-file out-kind))
-    
-    (cond [(plot-new-window?)  (define frame (call plot-frame))
-                               (send frame show #t)
-                               (void)]
-          [else  (call plot-snip)])))
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/plot3d.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/plot3d.rkt
deleted file mode 100644
index 648e1a47c3..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/plot3d.rkt
+++ /dev/null
@@ -1,166 +0,0 @@
-#lang racket/base
-
-(require racket/snip racket/match racket/list racket/class racket/contract
-         unstable/contract
-         unstable/parameter-group
-         racket/lazy-require
-         unstable/latent-contract/defthing
-         plot/private/common/contract
-         plot/private/common/math
-         plot/private/common/draw
-         plot/private/common/parameters
-         plot/private/common/plot-element
-         plot/private/common/deprecation-warning
-         plot/private/plot3d/plot-area
-         plot/private/no-gui/plot3d
-         plot/private/no-gui/plot3d-utils)
-
-;; Require lazily, in case someone wants to just (require plot) in a headless setup
-(lazy-require ["snip3d.rkt" (make-3d-plot-snip)]
-              ["gui.rkt" (make-snip-frame)])
-
-(provide plot3d-snip plot3d-frame plot3d)
-
-;; ===================================================================================================
-;; Plot to a snip
-
-(defproc (plot3d-snip [renderer-tree (treeof (or/c renderer3d? nonrenderer?))]
-                      [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                      [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                      [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-                      [#:width width exact-positive-integer? (plot-width)]
-                      [#:height height exact-positive-integer? (plot-height)]
-                      [#:angle angle real? (plot3d-angle)]
-                      [#:altitude altitude real? (plot3d-altitude)]
-                      [#:title title (or/c string? #f) (plot-title)]
-                      [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                      [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                      [#:z-label z-label (or/c string? #f) (plot-z-label)]
-                      [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                      ) (is-a?/c image-snip%)
-  (parameterize ([plot-title          title]
-                 [plot-x-label        x-label]
-                 [plot-y-label        y-label]
-                 [plot-z-label        z-label]
-                 [plot-legend-anchor  legend-anchor])
-    (define saved-plot-parameters (plot-parameters))
-    (define renderer-list (get-renderer-list renderer-tree))
-    (define bounds-rect (get-bounds-rect renderer-list x-min x-max y-min y-max z-min z-max))
-    (define-values (x-ticks x-far-ticks y-ticks y-far-ticks z-ticks z-far-ticks)
-      (get-ticks renderer-list bounds-rect))
-    
-    (define render-tasks-hash (make-hash))
-    (define legend-entries-hash (make-hash))
-    
-    (define (make-bm anim? angle altitude width height)
-      (parameterize/group ([plot-parameters  saved-plot-parameters]
-                           [plot-animating?  (if anim? #t (plot-animating?))]
-                           [plot3d-angle     angle]
-                           [plot3d-altitude  altitude])
-        ((if (plot-animating?) draw-bitmap draw-bitmap/supersampling)
-         (λ (dc)
-           (define area (make-object 3d-plot-area%
-                          bounds-rect x-ticks x-far-ticks y-ticks y-far-ticks z-ticks z-far-ticks
-                          dc 0 0 width height))
-           (send area start-plot)
-           
-           (cond [(not (hash-ref render-tasks-hash (plot-animating?) #f))
-                  (hash-set!
-                   legend-entries-hash (plot-animating?)
-                   (flatten (for/list ([rend  (in-list renderer-list)])
-                              (match-define (renderer3d rend-bounds-rect _bf _tf render-proc) rend)
-                              (send area start-renderer (if rend-bounds-rect
-                                                            (rect-inexact->exact rend-bounds-rect)
-                                                            (unknown-rect 3)))
-                              (if render-proc (render-proc area) empty))))
-                  
-                  (hash-set! render-tasks-hash (plot-animating?) (send area get-render-tasks))]
-                 [else
-                  (send area set-render-tasks (hash-ref render-tasks-hash (plot-animating?)))])
-           
-           (send area end-renderers)
-           
-           (define legend-entries (hash-ref legend-entries-hash (plot-animating?) #f))
-           (when (not (empty? legend-entries))
-             (send area draw-legend legend-entries))
-           
-           (send area end-plot))
-         width height)))
-    
-    (make-3d-plot-snip
-     (make-bm #f angle altitude width height) saved-plot-parameters
-     make-bm angle altitude width height)))
-
-;; ===================================================================================================
-;; Plot to a frame
-
-(defproc (plot3d-frame [renderer-tree (treeof (or/c renderer3d? nonrenderer?))]
-                       [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                       [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                       [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-                       [#:width width exact-positive-integer? (plot-width)]
-                       [#:height height exact-positive-integer? (plot-height)]
-                       [#:angle angle real? (plot3d-angle)]
-                       [#:altitude altitude real? (plot3d-altitude)]
-                       [#:title title (or/c string? #f) (plot-title)]
-                       [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                       [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                       [#:z-label z-label (or/c string? #f) (plot-z-label)]
-                       [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                       ) (is-a?/c object%)
-  (define snip
-    (plot3d-snip
-     renderer-tree
-     #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:z-min z-min #:z-max z-max
-     #:width width #:height height #:angle angle #:altitude altitude #:title title
-     #:x-label x-label #:y-label y-label #:z-label z-label #:legend-anchor legend-anchor))
-  (make-snip-frame snip width height (if title (format "Plot: ~a" title) "Plot")))
-
-;; ===================================================================================================
-;; Plot to a frame or a snip, depending on the value of plot-new-window?
-
-(defproc (plot3d [renderer-tree (treeof (or/c renderer3d? nonrenderer?))]
-                 [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                 [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                 [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-                 [#:width width exact-positive-integer? (plot-width)]
-                 [#:height height exact-positive-integer? (plot-height)]
-                 [#:angle angle real? #f] [#:altitude altitude real? #f]
-                 [#:az az real? #f] [#:alt alt real? #f]  ; backward-compatible aliases
-                 [#:title title (or/c string? #f) (plot-title)]
-                 [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                 [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                 [#:z-label z-label (or/c string? #f) (plot-z-label)]
-                 [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                 [#:out-file out-file (or/c path-string? output-port? #f) #f]
-                 [#:out-kind out-kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-                 [#:fgcolor fgcolor plot-color/c #f] [#:bgcolor bgcolor plot-color/c #f]
-                 [#:lncolor lncolor plot-color/c #f]  ; unused
-                 ) (or/c (is-a?/c snip%) void?)
-  (when fgcolor
-    (deprecation-warning "the plot3d #:fgcolor keyword argument" "plot-foreground"))
-  (when bgcolor
-    (deprecation-warning "the plot3d #:bgcolor keyword argument" "plot-background"))
-  (when lncolor
-    (deprecation-warning "the plot3d #:lncolor keyword argument"))
-  (when az
-    (deprecation-warning "the plot3d #:az keyword argument" "#:angle"))
-  (when alt
-    (deprecation-warning "the plot3d #:alt keyword argument" "#:altitude"))
-  
-  (define (call f . args)
-    (apply f renderer-tree args
-           #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:z-min z-min #:z-max z-max
-           #:width width #:height height #:title title
-           #:angle (or angle az (plot3d-angle)) #:altitude (or altitude alt (plot3d-altitude))
-           #:x-label x-label #:y-label y-label #:z-label z-label #:legend-anchor legend-anchor))
-  
-  (parameterize ([plot-foreground  (if fgcolor fgcolor (plot-foreground))]
-                 [plot-background  (if bgcolor bgcolor (plot-background))])
-    (when out-file
-      (call plot3d-file out-file out-kind))
-    
-    (cond [(plot-new-window?)  (define frame (call plot3d-frame))
-                               (send frame show #t)
-                               (void)]
-          [else  (call plot3d-snip)])))
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/snip.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/snip.rkt
deleted file mode 100644
index 6031d795f6..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/snip.rkt
+++ /dev/null
@@ -1,208 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base racket/class racket/list unstable/parameter-group
-         plot/private/common/math
-         plot/private/common/parameters
-         plot/private/common/plot-device
-         plot/private/common/worker-thread)
-
-(provide plot-snip%)
-
-;; delay between update timer ticks
-(define update-delay 16)  ; about 60 fps (just over)
-
-;; update timer cancels itself if no useful work has been done in this amount of time
-(define useful-work-timeout 1000)
-
-;; message disappears after this long
-(define message-timeout 2000)
-
-(define plot-snip%
-  (class image-snip%
-    (init bm)
-    (init-field saved-plot-parameters)
-    (inherit set-bitmap get-bitmap get-admin)
-    
-    (super-make-object bm)
-    
-    (define/override (copy) (make-object this% (get-bitmap) saved-plot-parameters))
-    
-    (define/public (get-saved-plot-parameters) saved-plot-parameters)
-    
-    (define x-mid (* 1/2 (send bm get-width)))
-    (define y-mid (* 1/2 (send bm get-height)))
-    
-    (define/public (set-message-center new-x-mid new-y-mid)
-      (set! x-mid new-x-mid)
-      (set! y-mid new-y-mid))
-    
-    (define/public (refresh)
-      ;(printf "~a: refresh~n" (current-milliseconds))
-      (define s-admin (get-admin))
-      (when s-admin
-        (define bm (get-bitmap))
-        (send s-admin needs-update this 0 0 (send bm get-width) (send bm get-height))))
-    
-    (define message #f)
-    (define message-timer (make-object timer% (λ () (stop-message))))
-    
-    (define/public (stop-message)
-      ;(printf "~a: stop-message~n" (current-milliseconds))
-      (send message-timer stop)
-      (set! message #f)
-      (refresh))
-    
-    (define/public (reset-message-timeout)
-      (send message-timer start message-timeout #t))
-    
-    (define/public (set-message msg #:refresh? [refresh? #t])
-      (let ([refresh?  (and refresh? (not (equal? msg message)))])
-        (set! message msg)
-        (reset-message-timeout)
-        (when refresh? (refresh))))
-    
-    (define (draw-message dc dc-x-min dc-y-min)
-      (define bm (get-bitmap))
-      (define width (send bm get-width))
-      (define height (send bm get-height))
-      
-      (define pd (make-object plot-device% dc dc-x-min dc-y-min width height))
-      (send pd reset-drawing-params #f)
-      
-      (define lines (map (λ (line) (format " ~a " line)) (regexp-split "\n" message)))
-      
-      (define-values (_1 char-height baseline _2) (send pd get-text-extent (first lines)))
-      (define line-widths (map (λ (line) (send pd get-text-width line)) lines))
-      
-      (define box-x-size (apply max line-widths))
-      (define box-y-size (+ baseline (* (length lines) (+ char-height baseline))))
-      (define box-x-min (- x-mid (* 1/2 box-x-size)))
-      (define box-x-max (+ x-mid (* 1/2 box-x-size)))
-      (define box-y-min (- y-mid (* 1/2 box-y-size)))
-      (define box-y-max (+ y-mid (* 1/2 box-y-size)))
-      
-      (define box-rect (vector (ivl box-x-min box-x-max) (ivl box-y-min box-y-max)))
-      
-      ;; inside selection
-      (send pd set-pen (plot-foreground) 1 'transparent)
-      (send pd set-brush (plot-background) 'solid)
-      (send pd set-alpha 1/4)
-      (send pd draw-rect box-rect)
-      
-      ;; selection border
-      (send pd set-minor-pen)
-      (send pd set-brush (plot-background) 'transparent)
-      (send pd set-alpha 3/4)
-      (send pd draw-rect box-rect)
-      
-      (send pd set-alpha 1)
-      (for ([line  (in-list lines)] [i  (in-naturals)])
-        (send pd draw-text
-              line (vector box-x-min (+ box-y-min baseline (* i (+ char-height baseline))))
-              'top-left #:outline? #t))
-      (send pd restore-drawing-params))
-    
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      ;(printf "~a: drawing~n" (current-milliseconds))
-      (super draw dc x y left top right bottom dx dy draw-caret)
-      ;(send dc draw-bitmap-section bm x y 0 0 width height)
-      (when message
-        (parameterize/group ([plot-parameters  saved-plot-parameters])
-          (draw-message dc x y))))
-    
-    (define left-down-admin #f)
-    (define/public (get-left-down-here?)
-      (eq? (get-admin) left-down-admin))
-    
-    (send this set-flags (list* 'handles-events 'handles-all-mouse-events (send this get-flags)))
-    
-    (define/override (on-event dc x y editorx editory evt)
-      (define admin (get-admin))
-      (define editor (send admin get-editor))
-      (case (send evt get-event-type)
-        ;; The editor gives ownership to the snip as soon as the mouse left-clicks on it, before the
-        ;; snip handles any events. On one hand, this is good: it means that mouse movement events are
-        ;; sent to the snip even after the mouse leaves. On the other hand, it's bad: we don't want
-        ;; the snip to *retain* ownership after the button is up, because it'll continue to hog all
-        ;; the mouse movement events, keeping other plot snips from displaying hover messages. Also,
-        ;; a plot snip has no selectable text, focusable controls, or any other reason to own the
-        ;; caret.
-        ;; So on left button up, if the left button went down on this snip, we give ownership to the
-        ;; snip's editor.
-        [(left-down)  (set! left-down-admin admin)]
-        [(left-up)    (when (get-left-down-here?)
-                        (set! left-down-admin #f)
-                        (send editor set-caret-owner #f))]
-        ;; The 'handles-events flag keeps the editor from handling right-click events, so the pop-up
-        ;; menu won't pop up. So we call the editor's "local" event handler, which would have been
-        ;; called had this snip not trapped events.
-        ;; We also don't allow right/middle mouse clicks to transfer caret ownership, ever. We would
-        ;; have similar rules to left-up, but the pop-up menu apparently gets right-up events, not
-        ;; the snip.
-        [(right-down middle-down)  (send editor set-caret-owner #f)
-                                   (send editor on-local-event evt)]
-        ;; Just in case (we don't want these events anyway):
-        [(right-up middle-up)  (send editor on-local-event evt)]
-        ))
-    
-    (define rth #f)
-    (define update-timer #f)
-    (define update? #t)
-    ;; timestamp of the last known time a timer tick did useful work
-    (define last-useful-work-time #f)
-    
-    (define/public (stop-update-thread)
-      (when rth
-        (worker-thread-kill rth)
-        (set! rth #f))
-      (when update-timer
-        (send update-timer stop)
-        (set! update-timer #f))
-      (set! last-useful-work-time #f))
-    
-    (define/public (update-thread-running?)
-      (and rth #t))
-    
-    (define/public (start-update-thread make-render-thread make-draw-command poll-worker-thread
-                                        animating?)
-      (stop-update-thread)
-      (set! rth (make-render-thread))
-      (set! update-timer
-            (make-object timer%
-              (update-tick make-render-thread make-draw-command poll-worker-thread animating?)
-              update-delay)))
-    
-    (define/public (set-update up)
-      (set! update? up))
-    
-    (define ((update-tick make-render-thread make-draw-command poll-worker-thread animating?))
-      (cond [animating?
-             (define can-update?
-               (cond [(worker-thread-working? rth)
-                      ;; rendering is useful work (otherwise, animating would stutter if rendering a
-                      ;; plot takes too long)
-                      (set! last-useful-work-time (current-milliseconds))
-                      (poll-worker-thread rth)]
-                     [else  #t]))
-             ;; can-update? is #t if the worker thread is ready for another command
-             (when (and update? can-update?)
-               (set! update? #f)
-               (set! last-useful-work-time (current-milliseconds))
-               (worker-thread-put rth (make-draw-command animating?)))
-             ;; if it's been too long since useful work was done, switch to drawing the final plot
-             (when (and last-useful-work-time
-                        ((- (current-milliseconds) last-useful-work-time) . > . useful-work-timeout))
-               (stop-update-thread)
-               (start-update-thread make-render-thread make-draw-command poll-worker-thread #f))
-             ;; keep any messages up
-             (reset-message-timeout)]
-            [else
-             (cond [(worker-thread-working? rth)
-                    (when (poll-worker-thread rth)
-                      (stop-update-thread))]
-                   [else
-                    (worker-thread-put rth (make-draw-command animating?))])]))
-    
-    (define cross-cursor (make-object cursor% 'cross))
-    (define/override (adjust-cursor dc x y editorx editory evt) cross-cursor)
-    ))
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/snip2d.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/snip2d.rkt
deleted file mode 100644
index 2b948fed49..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/snip2d.rkt
+++ /dev/null
@@ -1,216 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base racket/class racket/match racket/list racket/math unstable/parameter-group
-         plot/private/common/plot-device
-         plot/private/common/math
-         plot/private/common/format
-         plot/private/common/ticks
-         plot/private/common/worker-thread
-         plot/private/common/parameters
-         "snip.rkt")
-
-(provide 2d-plot-snip% make-2d-plot-snip)
-
-(define update-delay 16)
-(define show-zoom-message? #t)
-
-(struct draw-command (animating? plot-bounds-rect width height) #:transparent)
-
-(define 2d-plot-snip%
-  (class plot-snip%
-    (init init-bm saved-plot-parameters)
-    (init-field make-bm plot-bounds-rect area-bounds-rect area-bounds->plot-bounds width height)
-    
-    (inherit set-bitmap get-bitmap
-             get-saved-plot-parameters
-             refresh
-             stop-message set-message reset-message-timeout
-             update-thread-running? set-update
-             get-left-down-here?)
-    
-    (super-make-object init-bm saved-plot-parameters)
-    
-    (define (set-message-center)
-      (match-define (vector x-mid y-mid) (rect-center area-bounds-rect))
-      (send this set-message-center x-mid y-mid))
-    
-    (set-message-center)
-    
-    (define/override (copy)
-      (make-object this%
-        (get-bitmap) (get-saved-plot-parameters)
-        make-bm plot-bounds-rect area-bounds-rect area-bounds->plot-bounds width height))
-    
-    (define left-click-x 0)
-    (define left-click-y 0)
-    (define left-drag-x 0)
-    (define left-drag-y 0)
-    
-    (define plot-bounds-rects empty)
-    
-    (define (get-new-area-bounds-rect)
-      (rect-meet area-bounds-rect
-                 (rect-inexact->exact
-                  (vector (ivl left-click-x left-drag-x) (ivl left-click-y left-drag-y)))))
-    
-    (define dragging? #f)
-    
-    (define zoom-timer #f)
-    (define (set-zoom-timer)
-      (when (not zoom-timer)
-        (set! zoom-timer (make-object timer%
-                           (λ ()
-                             (set! zoom-timer #f)
-                             (refresh))
-                           update-delay #t))))
-    
-    (define (set-click-message)
-      (when show-zoom-message?
-        (set-message "Click and drag to zoom\n Click to unzoom once")))
-    
-    (define (zoom-or-unzoom)
-      (cond [dragging?
-             (set! dragging? #f)
-             (define new-rect (area-bounds->plot-bounds (get-new-area-bounds-rect)))
-             (cond [(and (rect-rational? new-rect) (not (rect-zero-area? new-rect)))
-                    #;(printf "~a: new-plot-bounds-rect = ~v~n"
-                              (current-milliseconds) new-rect)
-                    (set! plot-bounds-rects (cons plot-bounds-rect plot-bounds-rects))
-                    (set! plot-bounds-rect new-rect)
-                    (update-plot)]
-                   [else
-                    (refresh)])]
-            [(not (empty? plot-bounds-rects))
-             (set! plot-bounds-rect (first plot-bounds-rects))
-             (set! plot-bounds-rects (rest plot-bounds-rects))
-             (set! show-zoom-message? #f)
-             (update-plot)]))
-    
-    (define (start-update-thread animating?)
-      (send this start-update-thread
-            (λ () (make-worker-thread
-                   (match-lambda
-                     [(draw-command animating? plot-bounds-rect width height)
-                      (make-bm animating? plot-bounds-rect width height)])))
-            (λ (animating?) (draw-command animating? plot-bounds-rect width height))
-            (λ (rth)
-              (define-values (new-bm new-area-bounds-rect new-area-bounds->plot-bounds)
-                (worker-thread-try-get rth (λ () (values #f #f #f))))
-              (cond [(is-a? new-bm bitmap%)
-                     (set! area-bounds-rect new-area-bounds-rect)
-                     (set! area-bounds->plot-bounds new-area-bounds->plot-bounds)
-                     (set-bitmap new-bm)
-                     (set-message-center)
-                     #t]
-                    [else  #f]))
-            animating?))
-    
-    (define (update-plot)
-      (start-update-thread #f)
-      (set-update #t))
-    
-    (define/override (on-event dc x y editorx editory evt)
-      (define evt-type (send evt get-event-type))
-      (define mouse-x (- (send evt get-x) x))
-      (define mouse-y (- (send evt get-y) y))
-      (case evt-type
-        [(left-down)  (set! left-click-x mouse-x)
-                      (set! left-click-y mouse-y)
-                      (set! left-drag-x mouse-x)
-                      (set! left-drag-y mouse-y)
-                      (set! dragging? #f)
-                      (set-message #f)
-                      (set-zoom-timer)]
-        [(left-up)    (set! left-drag-x mouse-x)
-                      (set! left-drag-y mouse-y)
-                      (zoom-or-unzoom)]
-        [(motion)     (cond [(get-left-down-here?)  ; only #t if clicked on snip
-                             (when (not (and (= left-drag-x mouse-x)
-                                             (= left-drag-y mouse-y)))
-                               (set! left-drag-x mouse-x)
-                               (set! left-drag-y mouse-y)
-                               (set! dragging? #t)
-                               (set-zoom-timer))]
-                            [(and (not (send evt get-left-down))
-                                  (<= 0 mouse-x (send (get-bitmap) get-width))
-                                  (<= 0 mouse-y (send (get-bitmap) get-height)))
-                             (set-click-message)])])
-      (super on-event dc x y editorx editory evt))
-    
-    (define (draw-selection dc dc-x-min dc-y-min rect)
-      (when (and (rect-rational? rect) (not (rect-zero-area? rect)))
-        (define width (send (get-bitmap) get-width))
-        (define height (send (get-bitmap) get-height))
-        
-        (define pd (make-object plot-device% dc dc-x-min dc-y-min width height))
-        (send pd reset-drawing-params #f)
-        
-        (define select-color (get-highlight-background-color))
-        
-        ;; inside selection
-        (send pd set-pen select-color 1 'transparent)
-        (send pd set-brush select-color 'solid)
-        (send pd set-alpha 1/4)
-        (send pd draw-rect rect)
-        
-        ;; selection border
-        (send pd set-minor-pen)
-        (send pd set-brush select-color 'transparent)
-        (send pd set-alpha 3/4)
-        (send pd draw-rect rect)
-        
-        ;; format side labels
-        (match-define (vector (ivl x-min x-max) (ivl y-min y-max)) plot-bounds-rect)
-        (match-define (vector (ivl new-x-min new-x-max) (ivl new-y-min new-y-max))
-          (area-bounds->plot-bounds rect))
-        
-        (match-define (list new-x-min-str new-x-max-str)
-          (format-tick-labels (plot-x-ticks) x-min x-max (list new-x-min new-x-max)))
-        
-        (match-define (list new-y-min-str new-y-max-str)
-          (format-tick-labels (plot-y-ticks) y-min y-max (list new-y-min new-y-max)))
-        
-        ;; draw side labels
-        (match-define (vector (ivl new-area-x-min new-area-x-max)
-                              (ivl new-area-y-min new-area-y-max))
-          rect)
-        (define new-area-x-mid (* 1/2 (+ new-area-x-min new-area-x-max)))
-        (define new-area-y-mid (* 1/2 (+ new-area-y-min new-area-y-max)))
-        
-        (send pd set-alpha 1)
-        
-        (send pd draw-text new-x-min-str (vector new-area-x-min new-area-y-mid)
-              'center (* 1/2 pi) #:outline? #t)
-        (send pd draw-text new-x-max-str (vector new-area-x-max new-area-y-mid)
-              'center (* 1/2 pi) #:outline? #t)
-        (send pd draw-text new-y-min-str (vector new-area-x-mid new-area-y-max)
-              'center #:outline? #t)
-        (send pd draw-text new-y-max-str (vector new-area-x-mid new-area-y-min)
-              'center #:outline? #t)
-        
-        (send pd restore-drawing-params)))
-    
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      ;(printf "~a: drawing~n" (current-milliseconds))
-      (super draw dc x y left top right bottom dx dy draw-caret)
-      (when dragging?
-        (parameterize/group ([plot-parameters  (get-saved-plot-parameters)])
-          (draw-selection dc x y (get-new-area-bounds-rect)))))
-    
-    (define/override (resize w h)
-      (when (not (and (= w width) (= h height)))
-        (set! width w)
-        (set! height h)
-        (stop-message)
-        (when (not (update-thread-running?))
-          (start-update-thread #t))
-        (set-update #t))
-      (super resize w h))
-    ))
-
-(define (make-2d-plot-snip
-         init-bm saved-plot-parameters
-         make-bm plot-bounds-rect area-bounds-rect area-bounds->plot-bounds width height)
-  (make-object 2d-plot-snip%
-    init-bm saved-plot-parameters
-    make-bm plot-bounds-rect area-bounds-rect area-bounds->plot-bounds width height))
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/snip3d.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/snip3d.rkt
deleted file mode 100644
index bc7aadc227..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/private/gui/snip3d.rkt
+++ /dev/null
@@ -1,142 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base racket/class racket/match unstable/parameter-group
-         plot/private/common/math
-         plot/private/common/worker-thread
-         plot/private/common/parameters
-         "snip.rkt")
-
-(provide 3d-plot-snip% make-3d-plot-snip)
-
-(define show-rotate-message? #t)
-
-(struct draw-command (animating? angle altitude width height) #:transparent)
-
-(define (clamp x mn mx) (min* (max* x mn) mx))
-
-(define 3d-plot-snip%
-  (class plot-snip%
-    (init init-bm saved-plot-parameters)
-    (init-field make-bm angle altitude width height)
-    
-    (inherit set-bitmap get-bitmap
-             get-saved-plot-parameters
-             set-message stop-message set-message-center reset-message-timeout
-             update-thread-running? set-update
-             get-left-down-here?)
-    
-    (super-make-object init-bm saved-plot-parameters)
-    
-    (define/override (copy)
-      (make-object this%
-        (get-bitmap) (get-saved-plot-parameters)
-        make-bm angle altitude width height))
-    
-    (define mouse-x 0)
-    (define mouse-y 0)
-    (define left-click-x 0)
-    (define left-click-y 0)
-    
-    (define last-angle angle)
-    (define last-altitude altitude)
-    
-    (define (set-angle!)
-      (define degrees-per-pixel (/ 180 (send (get-bitmap) get-width)))
-      (define dx (- mouse-x left-click-x))
-      (set! angle (real-modulo (+ last-angle (* dx degrees-per-pixel)) 360)))
-    
-    (define (set-altitude!)
-      (define degrees-per-pixel (/ 180 (send (get-bitmap) get-height)))
-      (define dy (- mouse-y left-click-y))
-      (set! altitude (clamp (+ last-altitude (* dy degrees-per-pixel)) 0 90)))
-    
-    (define (start-update-thread animating?)
-      (send this start-update-thread
-            (λ () (make-worker-thread
-                   (match-lambda
-                     [(draw-command animating? angle altitude width height)
-                      (make-bm animating? angle altitude width height)])))
-            (λ (animating?) (draw-command animating? angle altitude width height))
-            (λ (rth)
-              (define new-bm (worker-thread-try-get rth))
-              (cond [(is-a? new-bm bitmap%)
-                     (set-bitmap new-bm)
-                     (when (not (and (= last-angle angle)
-                                     (= last-altitude altitude)))
-                       (set-angles-message))
-                     #t]
-                    [else  #f]))
-            animating?))
-    
-    (define (set-angles-message)
-      (set-message (format "angle = ~a\naltitude = ~a"
-                           (number->string (inexact->exact (round angle)))
-                           (number->string (inexact->exact (round altitude))))
-                   #:refresh? #f))
-    
-    (define (set-click-message)
-      (when show-rotate-message?
-        (set-message "Click and drag to rotate")))
-    
-    (define (on-left-down)
-      (set! left-click-x mouse-x)
-      (set! left-click-y mouse-y)
-      (set! last-angle angle)
-      (set! last-altitude altitude)
-      (set-angles-message)
-      (start-update-thread #t)
-      (set-update #t))
-    
-    (define (on-left-up)
-      (when (get-left-down-here?)
-        (set! last-angle angle)
-        (set! last-altitude altitude)
-        (when (update-thread-running?)
-          (start-update-thread #f)
-          (set-update #t))))
-    
-    (define (on-motion evt last-mouse-x last-mouse-y)
-      (cond [(get-left-down-here?)
-             (when (not (and (= last-mouse-x mouse-x)
-                             (= last-mouse-y mouse-y)))
-               (set! show-rotate-message? #f)
-               (set-angle!)
-               (set-altitude!)
-               (unless (update-thread-running?)
-                 (start-update-thread #t))
-               (set-update #t))]
-            [(and (not (send evt get-left-down))
-                  (<= 0 mouse-x (send (get-bitmap) get-width))
-                  (<= 0 mouse-y (send (get-bitmap) get-height)))
-             (set-click-message)]))
-    
-    (define/override (on-event dc x y editorx editory evt)
-      (define evt-type (send evt get-event-type))
-      (define last-mouse-x mouse-x)
-      (define last-mouse-y mouse-y)
-      (set! mouse-x (- (send evt get-x) x))
-      (set! mouse-y (- (send evt get-y) y))
-      (case evt-type
-        [(left-down)  (on-left-down)]
-        [(left-up)    (on-left-up)]
-        [(motion)     (on-motion evt last-mouse-x last-mouse-y)])
-      (super on-event dc x y editorx editory evt))
-    
-    (define/override (resize w h)
-      (when (not (and (= w width) (= h height)))
-        (set! width w)
-        (set! height h)
-        (set-message-center (* 1/2 w) (* 1/2 h))
-        (stop-message)
-        (when (not (update-thread-running?))
-          (start-update-thread #t))
-        (set-update #t))
-      (super resize w h))
-    ))
-
-(define (make-3d-plot-snip
-         init-bm saved-plot-parameters
-         make-bm angle altitude width height)
-  (make-object 3d-plot-snip%
-    init-bm saved-plot-parameters
-    make-bm angle altitude width height))
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/typed.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/typed.rkt
deleted file mode 100644
index 91d24a87ee..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/typed.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/racket/base
-
-(require "typed/main.rkt")
-(provide (all-from-out "typed/main.rkt"))
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/typed/main.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/typed/main.rkt
deleted file mode 100644
index 08cdddfb32..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/typed/main.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/racket/base
-
-(require plot/typed/no-gui
-         "private/gui/plot2d.rkt"
-         "private/gui/plot3d.rkt")
-
-(provide (all-from-out
-          plot/typed/no-gui
-          "private/gui/plot2d.rkt"
-          "private/gui/plot3d.rkt"))
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/typed/private/gui/plot2d.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/typed/private/gui/plot2d.rkt
deleted file mode 100644
index b64afacc3a..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/typed/private/gui/plot2d.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang typed/racket/base
-
-(require (only-in typed/mred/mred Snip% Frame%)
-         plot/typed/private/common/types
-         plot/typed/private/syntax)
-
-(provide plot-snip
-         plot-frame
-         plot)
-
-(require/typed*
- plot
- 
- [plot-snip ((Treeof (U renderer2d nonrenderer))
-             [#:x-min (Option Real)]
-             [#:x-max (Option Real)]
-             [#:y-min (Option Real)]
-             [#:y-max (Option Real)]
-             [#:width  Integer]
-             [#:height Integer]
-             [#:title (Option String)]
-             [#:x-label (Option String)]
-             [#:y-label (Option String)]
-             [#:legend-anchor Anchor]
-             -> (Instance Snip%))]
- 
- [plot-frame ((Treeof (U renderer2d nonrenderer))
-              [#:x-min (Option Real)]
-              [#:x-max (Option Real)]
-              [#:y-min (Option Real)]
-              [#:y-max (Option Real)]
-              [#:width  Integer]
-              [#:height Integer]
-              [#:title (Option String)]
-              [#:x-label (Option String)]
-              [#:y-label (Option String)]
-              [#:legend-anchor Anchor]
-              -> (Instance Frame%))]
- 
- [plot ((Treeof (U renderer2d nonrenderer))
-        [#:x-min (Option Real)]
-        [#:x-max (Option Real)]
-        [#:y-min (Option Real)]
-        [#:y-max (Option Real)]
-        [#:width  Integer]
-        [#:height Integer]
-        [#:title (Option String)]
-        [#:x-label (Option String)]
-        [#:y-label (Option String)]
-        [#:legend-anchor Anchor]
-        [#:out-file (Option (U Path-String Output-Port))]
-        [#:out-kind (U 'auto Image-File-Format)]
-        -> (U (Instance Snip%) Void))]
- )
diff --git a/pkgs/plot-pkgs/plot-gui-lib/plot/typed/private/gui/plot3d.rkt b/pkgs/plot-pkgs/plot-gui-lib/plot/typed/private/gui/plot3d.rkt
deleted file mode 100644
index 35139595e9..0000000000
--- a/pkgs/plot-pkgs/plot-gui-lib/plot/typed/private/gui/plot3d.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang typed/racket/base
-
-(require (only-in typed/mred/mred Snip% Frame%)
-         plot/typed/private/common/types
-         plot/typed/private/syntax)
-
-(provide plot3d-snip
-         plot3d-frame
-         plot3d)
-
-(require/typed*
- plot
- 
- [plot3d-snip ((Treeof (U renderer3d nonrenderer))
-               [#:x-min (Option Real)]
-               [#:x-max (Option Real)]
-               [#:y-min (Option Real)]
-               [#:y-max (Option Real)]
-               [#:z-min (Option Real)]
-               [#:z-max (Option Real)]
-               [#:width  Integer]
-               [#:height Integer]
-               [#:angle Real]
-               [#:altitude Real]
-               [#:title (Option String)]
-               [#:x-label (Option String)]
-               [#:y-label (Option String)]
-               [#:z-label (Option String)]
-               [#:legend-anchor Anchor]
-               -> (Instance Snip%))]
- 
- [plot3d-frame ((Treeof (U renderer3d nonrenderer))
-                [#:x-min (Option Real)]
-                [#:x-max (Option Real)]
-                [#:y-min (Option Real)]
-                [#:y-max (Option Real)]
-                [#:z-min (Option Real)]
-                [#:z-max (Option Real)]
-                [#:width  Integer]
-                [#:height Integer]
-                [#:angle Real]
-                [#:altitude Real]
-                [#:title (Option String)]
-                [#:x-label (Option String)]
-                [#:y-label (Option String)]
-                [#:z-label (Option String)]
-                [#:legend-anchor Anchor]
-                -> (Instance Frame%))]
- 
- [plot3d ((Treeof (U renderer3d nonrenderer))
-          [#:x-min (Option Real)]
-          [#:x-max (Option Real)]
-          [#:y-min (Option Real)]
-          [#:y-max (Option Real)]
-          [#:z-min (Option Real)]
-          [#:z-max (Option Real)]
-          [#:width  Integer]
-          [#:height Integer]
-          [#:angle Real]
-          [#:altitude Real]
-          [#:title (Option String)]
-          [#:x-label (Option String)]
-          [#:y-label (Option String)]
-          [#:z-label (Option String)]
-          [#:legend-anchor Anchor]
-          [#:out-file (Option (U Path-String Output-Port))]
-          [#:out-kind (U 'auto Image-File-Format)]
-          -> (U (Instance Snip%) Void))]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/LICENSE.txt b/pkgs/plot-pkgs/plot-lib/LICENSE.txt
deleted file mode 100644
index dbb89375c4..0000000000
--- a/pkgs/plot-pkgs/plot-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-plot
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/plot-pkgs/plot-lib/info.rkt b/pkgs/plot-pkgs/plot-lib/info.rkt
deleted file mode 100644
index 52295e901c..0000000000
--- a/pkgs/plot-pkgs/plot-lib/info.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "draw-lib"
-               "pict-lib"
-               "db-lib"
-               "srfi-lite-lib"
-               "typed-racket-lib"
-               "typed-racket-more"
-               "compatibility-lib"
-               "math-lib"
-               "unstable-contract-lib"
-               "unstable-flonum-lib"
-               "unstable-latent-contract-lib"
-               "unstable-parameter-group-lib"))
-
-(define build-deps '())
-
-(define pkg-desc "Plot non-GUI interface")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/bitmap.rkt b/pkgs/plot-pkgs/plot-lib/plot/bitmap.rkt
deleted file mode 100644
index d31ac1339b..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/bitmap.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require unstable/latent-contract
-         "no-gui.rkt"
-         "private/no-gui/plot-bitmap.rkt")
-
-(provide (all-from-out "no-gui.rkt")
-         (activate-contract-out plot plot3d))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/info.rkt b/pkgs/plot-pkgs/plot-lib/plot/info.rkt
deleted file mode 100644
index e0c94f2762..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/info.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang info
diff --git a/pkgs/plot-pkgs/plot-lib/plot/no-gui.rkt b/pkgs/plot-pkgs/plot-lib/plot/no-gui.rkt
deleted file mode 100644
index 2a17aba884..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/no-gui.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang racket/base
-
-(require racket/contract unstable/latent-contract)
-
-;; ===================================================================================================
-;; General exports
-
-(require "private/contracted/parameters.rkt")
-(provide (all-from-out "private/contracted/parameters.rkt"))
-
-(require "private/contracted/math.rkt")
-(provide (struct-out ivl))
-
-(require "private/contracted/axis-transform.rkt")
-(provide (all-from-out "private/contracted/axis-transform.rkt"))
-
-(require "private/contracted/ticks.rkt")
-(provide (all-from-out "private/contracted/ticks.rkt"))
-
-(require "private/contracted/date-time.rkt")
-(provide (struct-out plot-time)
-         plot-time->seconds seconds->plot-time
-         datetime->real)
-
-(require "private/common/nonrenderer.rkt")
-(provide (activate-contract-out x-ticks y-ticks z-ticks invisible-rect invisible-rect3d))
-
-;; ===================================================================================================
-;; 2D exports
-
-(require "private/no-gui/plot2d.rkt")
-(provide (activate-contract-out plot/dc plot-bitmap plot-pict plot-file))
-
-(require "private/plot2d/point.rkt")
-(provide (activate-contract-out points vector-field error-bars))
-
-(require "private/plot2d/line.rkt")
-(provide (activate-contract-out lines parametric polar function inverse density))
-
-(require "private/plot2d/interval.rkt")
-(provide (activate-contract-out
-          lines-interval parametric-interval polar-interval function-interval inverse-interval))
-
-(require "private/plot2d/contour.rkt")
-(provide (activate-contract-out isoline contours contour-intervals))
-
-(require "private/plot2d/rectangle.rkt")
-(provide (activate-contract-out rectangles area-histogram discrete-histogram stacked-histogram))
-
-(require "private/plot2d/decoration.rkt")
-(provide (activate-contract-out
-          x-axis y-axis axes polar-axes
-          x-tick-lines y-tick-lines tick-grid
-          point-label parametric-label polar-label function-label inverse-label))
-
-;; ===================================================================================================
-;; 3D exports
-
-(require "private/no-gui/plot3d.rkt")
-(provide (activate-contract-out plot3d/dc plot3d-bitmap plot3d-pict plot3d-file))
-
-(require "private/plot3d/surface.rkt")
-(provide (activate-contract-out surface3d))
-
-(require "private/plot3d/contour.rkt")
-(provide (activate-contract-out isoline3d contours3d contour-intervals3d))
-
-(require "private/plot3d/line.rkt")
-(provide (activate-contract-out lines3d parametric3d))
-
-(require "private/plot3d/point.rkt")
-(provide (activate-contract-out points3d vector-field3d))
-
-(require "private/plot3d/isosurface.rkt")
-(provide (activate-contract-out isosurface3d isosurfaces3d polar3d))
-
-(require "private/plot3d/rectangle.rkt")
-(provide (activate-contract-out rectangles3d discrete-histogram3d stacked-histogram3d))
-
-(require "private/plot3d/decoration.rkt")
-(provide (activate-contract-out point-label3d))
-
-;; ===================================================================================================
-;; Deprecated functions
-
-(require "private/deprecated/deprecated.rkt")
-(provide mix (activate-contract-out line contour shade surface))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/pict.rkt b/pkgs/plot-pkgs/plot-lib/plot/pict.rkt
deleted file mode 100644
index c4c1c4aef3..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/pict.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require unstable/latent-contract
-         "no-gui.rkt"
-         "private/no-gui/plot-pict.rkt")
-
-(provide (all-from-out "no-gui.rkt")
-         (activate-contract-out plot plot3d))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/axis-transform.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/axis-transform.rkt
deleted file mode 100644
index b096f64085..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/axis-transform.rkt
+++ /dev/null
@@ -1,164 +0,0 @@
-#lang racket/base
-
-(require racket/math racket/flonum racket/contract racket/match unstable/latent-contract/defthing
-         "math.rkt"
-         "contract.rkt")
-
-(provide (all-defined-out))
-
-(struct invertible-function (f g) #:transparent)
-
-(defproc (invertible-compose [f1 invertible-function?] [f2 invertible-function?]
-                             ) invertible-function?
-  (match-let ([(invertible-function f1 g1)  f1]
-              [(invertible-function f2 g2)  f2])
-    (invertible-function (compose f1 f2) (compose g2 g1))))
-
-(defproc (invertible-inverse [h invertible-function?]) invertible-function? #:document-body
-  (match-define (invertible-function f g) h)
-  (invertible-function g f))
-
-(defcontract axis-transform/c (real? real? invertible-function? . -> . invertible-function?))
-
-(defthing id-transform axis-transform/c
-  (λ (x-min x-max old-function) old-function))
-
-(defthing id-function invertible-function? (invertible-function (λ (x) x) (λ (x) x)))
-
-(defproc (apply-axis-transform [t axis-transform/c] [x-min real?] [x-max real?]
-                               ) invertible-function? #:document-body
-  (t x-min x-max id-function))
-
-;; Turns any total, surjective, monotone real function and its inverse into an axis transform
-(defproc (make-axis-transform [fun invertible-function?]) axis-transform/c
-  (match-define (invertible-function f g) fun)
-  (λ (x-min x-max old-function)
-    (define fx-min (f x-min))
-    (define fx-scale (/ (- x-max x-min) (- (f x-max) fx-min)))
-    (define (new-f x) (+ x-min (* (- (f x) fx-min) fx-scale)))
-    (define (new-g y) (g (+ fx-min (/ (- y x-min) fx-scale))))
-    (invertible-compose (invertible-function new-f new-g) old-function)))
-
-;; ===================================================================================================
-;; Axis transform combinators
-
-(defproc (axis-transform-compose [t1 axis-transform/c] [t2 axis-transform/c]) axis-transform/c
-  (λ (x-min x-max old-function)
-    (t1 x-min x-max (t2 x-min x-max old-function))))
-
-(defproc (axis-transform-append [t1 axis-transform/c] [t2 axis-transform/c] [mid real?]
-                                ) axis-transform/c
-  (λ (x-min x-max old-function)
-    (match-define (invertible-function old-f old-g) old-function)
-    (let ([mid  (old-f mid)])
-      (cond [(mid . >= . x-max)  (t1 x-min x-max old-function)]
-            [(mid . <= . x-min)  (t2 x-min x-max old-function)]
-            [else
-             (match-define (invertible-function f1 g1) (t1 x-min mid old-function))
-             (match-define (invertible-function f2 g2) (t2 mid x-max old-function))
-             ((make-axis-transform
-               (invertible-function
-                (λ (x) (cond [((old-f x) . < . mid)  (f1 x)]
-                             [else  (f2 x)]))
-                (λ (x) (cond [(x . < . mid)  (g1 x)]
-                             [else  (g2 x)]))))
-              x-min x-max id-function)]))))
-
-(defproc (axis-transform-bound [t axis-transform/c] [a real?] [b real?]
-                               ) axis-transform/c #:document-body
-  (axis-transform-append
-   (axis-transform-append id-transform t a) id-transform b))
-
-;; ===================================================================================================
-;; Specific axis transforms
-
-(define ((flnewton-invert f f-diff f-inv-guess n) y)
-  (let ([y  (exact->inexact y)])
-    (let loop ([x  (f-inv-guess y)] [n n])
-      (let/ec return
-        (when (zero? n) (return x))
-        
-        (define dx (fl/ (fl- y (f x)) (f-diff x)))
-        (when (zero? dx) (return x))
-        
-        (loop (fl- x dx) (sub1 n))))))
-
-(define (sine-diag d)
-  (let ([d  (exact->inexact d)])
-    (λ (x) (let ([x  (exact->inexact x)])
-             (fl+ x (fl* (fl/ 1.0 (fl* 4.0 d)) (flsin (fl* d x))))))))
-
-(define (sine-diag-diff d)
-  (let ([d  (exact->inexact d)])
-    (λ (x) (let ([x  (exact->inexact x)])
-             (fl- (fl/ (flcos (fl* d x)) 4.0) 1.0)))))
-
-(define (sine-diag-inv d)
-  (flnewton-invert (sine-diag d) (sine-diag-diff d) values 10))
-
-(define cbrt
-  (let ([e  (exact->inexact 1/3)])
-    (λ (x) (let ([x  (exact->inexact x)])
-             (fl* (sgn x) (expt (flabs x) e))))))
-
-(define (cube x)
-  (let ([x  (exact->inexact x)])
-    (fl* x (fl* x x))))
-
-(define (real-log x)
-  (fllog (exact->inexact x)))
-
-(define (real-exp x)
-  (flexp (exact->inexact x)))
-
-(defthing log-transform axis-transform/c
-  (λ (x-min x-max old-function)
-    (when ((exact->inexact x-min) . <= . 0)
-      (raise-type-error 'log-transform "positive real" 0 x-min x-max))
-    ((make-axis-transform (invertible-function real-log real-exp)) x-min x-max old-function)))
-
-(defthing cbrt-transform axis-transform/c
-  (λ (x-min x-max old-function)
-    ((make-axis-transform (invertible-function cbrt cube)) x-min x-max old-function)))
-
-(defproc (hand-drawn-transform [freq (>/c 0)]) axis-transform/c
-  (λ (x-min x-max old-function)
-    (define d (/ freq (- x-max x-min)))
-    ((make-axis-transform (invertible-function (sine-diag d) (sine-diag-inv d)))
-     x-min x-max old-function)))
-
-;; ===================================================================================================
-
-(define (stretch a b s)
-  (define d (- b a))
-  (define ds (* d s))
-  (λ (x)
-    (cond [(x . < . a)  x]
-          [(x . > . b)  (+ (- x d) ds)]
-          [else         (+ a (* (- x a) s))])))
-
-(defproc (stretch-transform [a real?] [b real?] [scale (>/c 0)]) axis-transform/c
-  (when (a . > . b) (error 'stretch-transform "expected a <= b; given ~e and ~e" a b))
-  (λ (x-min x-max old-function)
-    (match-define (invertible-function old-f old-g) old-function)
-    (let ([a  (old-f a)]
-          [b  (old-f b)])
-      (define f (stretch a b scale))
-      (define g (stretch (f a) (f b) (/ 1 scale)))
-      ((make-axis-transform (invertible-function f g)) x-min x-max old-function))))
-
-(defproc (collapse-transform [a real?] [b real?]) axis-transform/c
-  (when (a . > . b) (error 'stretch-transform "expected a <= b; given ~e and ~e" a b))
-  (λ (x-min x-max old-function)
-    (match-define (invertible-function old-f old-g) old-function)
-    (let ([a  (old-f a)]
-          [b  (old-f b)])
-      (define 1/2size (* 1/2 (- b a)))
-      (define center (* 1/2 (+ a b)))
-      (define (f x) (cond [(x . < . a)  (+ x 1/2size)]
-                          [(x . > . b)  (- x 1/2size)]
-                          [else  center]))
-      (define (g x) (cond [(x . < . center)  (- x 1/2size)]
-                          [(x . > . center)   (+ x 1/2size)]
-                          [else  center]))
-      ((make-axis-transform (invertible-function f g)) x-min x-max old-function))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/contract.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/contract.rkt
deleted file mode 100644
index 3866f896fd..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/contract.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang racket/base
-
-(require racket/contract racket/draw racket/class unstable/contract unstable/latent-contract
-         unstable/latent-contract/defthing)
-
-(provide (except-out (all-defined-out)
-                     maybe-function/c maybe-apply
-                     plot-colors/c pen-widths/c plot-pen-styles/c plot-brush-styles/c alphas/c
-                     labels/c)
-         (activate-contract-out
-          maybe-function/c maybe-apply
-          plot-colors/c pen-widths/c plot-pen-styles/c plot-brush-styles/c alphas/c
-          labels/c)
-         (rename-out [natural-number/c nat/c])
-         font-family/c
-         truth/c)
-
-;; ===================================================================================================
-;; Plot-specific contracts
-
-(defcontract anchor/c (one-of/c 'top-left    'top    'top-right
-                                'left        'center 'right
-                                'bottom-left 'bottom 'bottom-right))
-
-(defcontract color/c (or/c (list/c real? real? real?)
-                           string? symbol?
-                           (is-a?/c color%)))
-
-(defcontract plot-color/c (or/c exact-integer? color/c))
-
-(defcontract plot-pen-style/c (or/c exact-integer?
-                                    (one-of/c 'transparent 'solid    'dot 'long-dash
-                                              'short-dash  'dot-dash)))
-
-(defcontract plot-brush-style/c (or/c exact-integer?
-                                      (one-of/c 'transparent      'solid
-                                                'bdiagonal-hatch  'fdiagonal-hatch 'crossdiag-hatch
-                                                'horizontal-hatch 'vertical-hatch  'cross-hatch)))
-
-(defthing known-point-symbols (listof symbol?) #:document-value
-  (list 'dot               'point            'pixel
-        'plus              'times            'asterisk
-        '5asterisk         'odot             'oplus
-        'otimes            'oasterisk        'o5asterisk
-        'circle            'square           'diamond
-        'triangle          'fullcircle       'fullsquare
-        'fulldiamond       'fulltriangle     'triangleup
-        'triangledown      'triangleleft     'triangleright
-        'fulltriangleup    'fulltriangledown 'fulltriangleleft
-        'fulltriangleright 'rightarrow       'leftarrow
-        'uparrow           'downarrow        '4star
-        '5star             '6star            '7star
-        '8star             'full4star        'full5star
-        'full6star         'full7star        'full8star
-        'circle1           'circle2          'circle3
-        'circle4           'circle5          'circle6
-        'circle7           'circle8          'bullet
-        'fullcircle1       'fullcircle2      'fullcircle3
-        'fullcircle4       'fullcircle5      'fullcircle6
-        'fullcircle7       'fullcircle8))
-
-(defcontract point-sym/c (or/c char? string? integer? (apply one-of/c known-point-symbols)))
-
-(defcontract (maybe-function/c [in-contract contract?] [out-contract contract?])
-  (or/c out-contract (in-contract . -> . out-contract)))
-
-(defproc (maybe-apply [f (maybe-function/c any/c any/c)]
-                      [arg any/c]) any/c
-  (cond [(procedure? f)  (f arg)]
-        [else            f]))
-
-(defcontract (plot-colors/c [in-contract contract?])
-  (maybe-function/c in-contract (listof plot-color/c)))
-
-(defcontract (pen-widths/c [in-contract contract?])
-  (maybe-function/c in-contract (listof (>=/c 0))))
-
-(defcontract (plot-pen-styles/c [in-contract contract?])
-  (maybe-function/c in-contract (listof plot-pen-style/c)))
-
-(defcontract (plot-brush-styles/c [in-contract contract?])
-  (maybe-function/c in-contract (listof plot-brush-style/c)))
-
-(defcontract (alphas/c [in-contract contract?])
-  (maybe-function/c in-contract (listof (real-in 0 1))))
-
-(defcontract (labels/c [in-contract contract?])
-  (maybe-function/c in-contract (listof (or/c string? #f))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/currency.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/currency.rkt
deleted file mode 100644
index e73f2f3fa6..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/currency.rkt
+++ /dev/null
@@ -1,122 +0,0 @@
-#lang racket/base
-
-(provide (all-defined-out))
-
-(define currency-code->sign
-  #hash((ALL . "Lek")
-        (AFN . "\u60b")
-        (ARS . "$")
-        (AWG . "\u192")
-        (AUD . "$")
-        (AZN . "\u43c\u430\u43d")
-        (BSD . "$")
-        (BBD . "$")
-        (BYR . "p.")
-        (BZD . "BZ$")
-        (BMD . "$")
-        (BOB . "$b")
-        (BAM . "KM")
-        (BWP . "P")
-        (BGN . "\u43b\u432")
-        (BRL . "R$")
-        (BND . "$")
-        (KHR . "\u17db")
-        (CAD . "$")
-        (KYD . "$")
-        (CLP . "$")
-        (CNY . "\ua5")
-        (COP . "$")
-        (CRC . "\u20a1")
-        (HRK . "kn")
-        (CUP . "\u20b1")
-        (CZK . "\u4b\u10d")
-        (DKK . "kr")
-        (DOP . "RD$")
-        (XCD . "$")
-        (EGP . "\ua3")
-        (SVC . "$")
-        (EEK . "kr")
-        (EUR . "\u20ac")
-        (FKP . "\ua3")
-        (FJD . "$")
-        (GHC . "\ua2")
-        (GIP . "\ua3")
-        (GTQ . "Q")
-        (GGP . "\ua3")
-        (GYD . "$")
-        (HNL . "L")
-        (HKD . "$")
-        (HUF . "Ft")
-        (ISK . "kr")
-        (INR . "\u20B9")
-        (IDR . "Rp")
-        (IRR . "\ufdfc")
-        (IMP . "\ua3")
-        (ILS . "\u20aa")
-        (JMD . "J$")
-        (JPY . "\ua5")
-        (JEP . "\ua3")
-        (KZT . "\u43b\u432")
-        (KPW . "\u20a9")
-        (KRW . "\u20a9")
-        (KGS . "\u43b\u432")
-        (LAK . "\u20ad")
-        (LVL . "Ls")
-        (LBP . "\ua3")
-        (LRD . "$")
-        (LTL . "Lt")
-        (MKD . "\u434\u435\u43d")
-        (MYR . "RM")
-        (MUR . "\u20a8")
-        (MXN . "$")
-        (MNT . "\u20ae")
-        (MZN . "MT")
-        (NAD . "$")
-        (NPR . "\u20a8")
-        (ANG . "\u192")
-        (NZD . "$")
-        (NIO . "C$")
-        (NGN . "\u20a6")
-        (KPW . "\u20a9")
-        (NOK . "kr")
-        (OMR . "\ufdfc")
-        (PKR . "\u20a8")
-        (PAB . "B/.")
-        (PYG . "Gs")
-        (PEN . "S/.")
-        (PHP . "\u20b1")
-        (PLN . "z\u142")
-        (QAR . "\ufdfc")
-        (RON . "lei")
-        (RUB . "\u440\u443\u431")
-        (SHP . "\ua3")
-        (SAR . "\ufdfc")
-        (RSD . "\u414\u438\u43d.")
-        (SCR . "\u20a8")
-        (SGD . "$")
-        (SBD . "$")
-        (SOS . "S")
-        (ZAR . "R")
-        (KRW . "\u20a9")
-        (LKR . "\u20a8")
-        (SEK . "kr")
-        (CHF . "CHF")
-        (SRD . "$")
-        (SYP . "\ua3")
-        (TWD . "NT$")
-        (THB . "\ue3f")
-        (TTD . "TT$")
-        (TRY . "TL")
-        (TRL . "\u20a4")
-        (TVD . "$")
-        (UAH . "\u20b4")
-        (GBP . "\ua3")
-        (USD . "$")
-        (UYU . "$U")
-        (UZS . "\u43b\u432")
-        (VEF . "Bs")
-        (VND . "\u20ab")
-        (YER . "\ufdfc")
-        (ZWD . "Z$")))
-
-(define known-currency-codes (sort (hash-keys currency-code->sign) string<=? #:key symbol->string))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/date-time.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/date-time.rkt
deleted file mode 100644
index 97ae40dcf1..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/date-time.rkt
+++ /dev/null
@@ -1,175 +0,0 @@
-#lang racket/base
-
-(require racket/date racket/contract racket/match unstable/latent-contract/defthing
-         (prefix-in srfi-date: srfi/19)
-         db
-         "contract.rkt"
-         "math.rkt"
-         "format.rkt")
-
-(provide (all-defined-out))
-
-(define seconds-per-minute 60)
-(define seconds-per-hour (* 60 seconds-per-minute))
-(define seconds-per-day (* 24 seconds-per-hour))
-(define seconds-per-week (* 7 seconds-per-day))
-(define avg-seconds-per-year (* #e365.2425 seconds-per-day))
-(define avg-seconds-per-month (* 1/12 avg-seconds-per-year))
-
-;; ===================================================================================================
-;; UTC dates for plotting
-
-;; A date is always represented by the number of seconds since the platform-specific, UTC epoch
-
-(define (date*->utc-seconds dt)
-  (- (date*->seconds dt #f) (date-time-zone-offset dt)))
-
-(define (date->utc-seconds dt)
-  (- (date->seconds dt #f) (date-time-zone-offset dt)))
-
-(define (utc-seconds-second secs)
-  (define w (floor secs))
-  (define f (- secs w))
-  (+ f (date-second (seconds->date w #f))))
-
-(define (utc-seconds-round-year secs)
-  (define dt (seconds->date secs #f))
-  (define y1 (date-year dt))
-  ;; Find start of this year, start of next year, and difference between them in UTC seconds
-  (define s1 (date->seconds (date 0 0 0 1 1 y1 0 0 #f 0) #f))
-  (define s2 (date->seconds (date 0 0 0 1 1 (+ y1 1) 0 0 #f 0) #f))
-  (define diff (- s2 s1))
-  ;; Round by 1) subtracting this year; 2) rounding to this year or next; 3) adding this year
-  (+ (* (round (/ (- secs s1) diff)) diff) s1))
-
-(define (utc-seconds-round-month secs)
-  (define dt (seconds->date secs #f))
-  (define m1 (date-month dt))
-  (define y1 (date-year dt))
-  ;; Find start of this month, start of next month, and difference between them in UTC seconds
-  (define s1 (date->seconds (date 0 0 0 1 m1 y1 0 0 #f 0) #f))
-  (define-values (m2 y2) (cond [((+ m1 1) . > . 12)  (values 1 (+ y1 1))]
-                               [else                 (values (+ m1 1) y1)]))
-  (define s2 (date->seconds (date 0 0 0 1 m2 y2 0 0 #f 0) #f))
-  (define diff (- s2 s1))
-  ;; Round by 1) subtracting this month; 2) rounding to this month or next; 3) adding this month
-  (+ (* (round (/ (- secs s1) diff)) diff) s1))
-
-;; ===================================================================================================
-;; Time
-
-;; A date-independent representation of time
-
-(struct plot-time (second minute hour day) #:transparent)
-
-(defproc (seconds->plot-time [s real?]) plot-time?
-  (let* ([s  (inexact->exact s)]
-         [day  (floor (/ s seconds-per-day))]
-         [s  (- s (* day seconds-per-day))]
-         [hour  (floor (/ s seconds-per-hour))]
-         [s  (- s (* hour seconds-per-hour))]
-         [minute  (floor (/ s seconds-per-minute))]
-         [s  (- s (* minute seconds-per-minute))])
-    (plot-time s minute hour day)))
-
-(defproc (plot-time->seconds [t plot-time?]) real?
-  (match-define (plot-time second minute hour day) t)
-  (+ second
-     (* minute seconds-per-minute)
-     (* hour seconds-per-hour)
-     (* day seconds-per-day)))
-
-(defproc (datetime->real [x (or/c plot-time? date? date*? sql-date? sql-time? sql-timestamp?)]) real?
-  (match x
-    [(? plot-time?)    (plot-time->seconds x)]
-    [(? date*?)        (date*->utc-seconds x)]
-    [(? date?)         (date->utc-seconds x)]
-    [(sql-date y m d)  (date->utc-seconds (date 0 0 0 d m y 0 0 #t 0))]
-    [(sql-time h m s ns tz)  (plot-time->seconds (- (plot-time (+ s (/ ns 1000000000)) m h 0)
-                                                    (if tz tz 0)))]
-    [(sql-timestamp y m d h mn s ns tz)  (date*->utc-seconds
-                                          (date* s mn h d m y 0 0 #t (if tz tz 0) ns "UTC"))]))
-
-;; ===================================================================================================
-;; Formatting following SRFI 19, with alterations
-
-#|
-Supported format specifiers:
-
-~a  locale's abbreviated weekday name (Sun...Sat)
-~A  locale's full weekday name (Sunday...Saturday)
-~b  locale's abbreviate month name (Jan...Dec)
-~B  locale's full month day (January...December)
-~d  day of month, zero padded (01...31)
-~D  date (mm/dd/yy)
-~e  day of month, blank padded ( 1...31)
-~h  same as ~b
-~H  hour, zero padded, 24-hour clock (00...23)
-~I  hour, zero padded, 12-hour clock (01...12)
-~j  day of year, zero padded
-~k  hour, blank padded, 24-hour clock (00...23)
-~l  hour, blank padded, 12-hour clock (01...12)
-~m  month, zero padded (01...12)
-~M  minute, zero padded (00...59)
-~N  nanosecond, zero padded
-~p  locale's AM or PM
-~r  time, 12 hour clock, same as "~I:~M:~S ~p"
-~S  second, zero padded (00...60)
-~f  seconds+fractional seconds, using locale's decimal separator (e.g. 5.2).
-~s  number of full seconds since "the epoch" (in UTC)
-~T  time, 24 hour clock, same as "~H:~M:~S"
-~U  week number of year with Sunday as first day of week (00...53)
-~V  week number of year with Monday as first day of week (01...52)
-~w  day of week (0...6)
-~W  week number of year with Monday as first day of week (01...52)
-~x  week number of year with Monday as first day of week (00...53)
-~X  locale's date representation, for example: "07/31/00"
-~y  last two digits of year (00...99)
-~Y  year
-~1  ISO-8601 year-month-day format
-~3  ISO-8601 hour-minute-second format
-~5  ISO-8601 year-month-day-hour-minute-second format
-|#
-
-(define (plot-date-formatter x-min x-max)
-  (define digits (digits-for-range x-min x-max))
-  (λ (fmt secs)
-    (case fmt
-      [(~f)  (define s (utc-seconds-second secs))
-             (define str (real->string/trunc s (max 0 digits)))
-             (if (s . < . 10) (format "0~a" str) str)]
-      [(~s)  (real->plot-label secs digits)]
-      [(~a ~A ~b ~B ~d ~D ~e ~h ~H ~I ~j ~k ~l ~m ~M ~N
-           ~p ~r ~S ~f ~s ~T ~U ~V ~w ~W ~x ~X ~y ~Y ~1 ~3 ~5)
-       (match-define (date* s mn h d m y _wd _yd _dst? tz ns _tz-name)
-         (seconds->date secs #f))
-       (srfi-date:date->string (srfi-date:make-date ns s mn h d m y tz) (symbol->string fmt))]
-      [else  #f])))
-
-#|
-Supported format specifiers:
-
-~d  day
-~H  hour, zero padded, 24-hour clock (00...23)
-~I  hour, zero padded, 12-hour clock (01...12)
-~k  hour, blank padded, 24-hour clock ( 0...23)
-~l  hour, blank padded, 12-hour clock ( 1...12)
-~p  locale's AM or PM
-~M  minute, zero padded (00...59)
-~S  second, zero padded (00...60)
-~f  seconds+fractional seconds, using locale's decimal separator (e.g. 5.2).
-~s  second, formatted (nanoseconds, etc.)
-~r  time, 12 hour clock, same as "~I:~M:~S ~p"
-~T  time, 24 hour clock, same as "~H:~M:~S"
-~3  ISO-8601 hour-minute-second format
-|#
-
-(define (plot-time-formatter x-min x-max)
-  (define digits (digits-for-range x-min x-max))
-  (λ (fmt secs)
-    (case fmt
-      [(~H ~I ~k ~l ~p ~M ~S ~f ~s ~r ~T ~3)
-       ((plot-date-formatter x-min x-max) fmt (real-modulo secs seconds-per-day))]
-      [(~d)  (define digits (digits-for-range (/ x-min seconds-per-day) (/ x-max seconds-per-day)))
-             (real->plot-label (plot-time-day (seconds->plot-time secs)) digits)]
-      [else  #f])))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/deprecation-warning.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/deprecation-warning.rkt
deleted file mode 100644
index b651c5504b..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/deprecation-warning.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/base
-
-(require "parameters.rkt")
-
-(provide deprecation-warning)
-
-(define warnings (make-hash))
-
-(define (deprecation-warning name [replacement-name #f])
-  (when (plot-deprecation-warnings?)
-    (hash-ref! warnings name
-               (λ ()
-                 (if replacement-name
-                     (eprintf "~a is deprecated and may be removed in the future; use ~a instead~n"
-                              name replacement-name)
-                     (eprintf "~a is deprecated and may be removed in the future"
-                              name))
-                 #t))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/draw.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/draw.rkt
deleted file mode 100644
index 9b80ec6fac..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/draw.rkt
+++ /dev/null
@@ -1,591 +0,0 @@
-#lang racket/base
-
-;; Extra drawing, font, color and style functions.
-
-(require racket/draw racket/class racket/match racket/list racket/contract racket/math racket/flonum
-         unstable/latent-contract/defthing
-         "math.rkt"
-         "utils.rkt"
-         "contract.rkt"
-         "sample.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Drawing text rotated around an anchor point
-
-(define sin45 (/ 1 (sqrt 2)))
-
-(define (draw-text/anchor dc str x y [anchor 'top-left] [angle 0] [dist 0])
-  (define-values (width height _1 _2) (send dc get-text-extent str #f #t 0))
-  (let ([dist  (case anchor
-                 [(top-left bottom-left top-right bottom-right)  (* sin45 dist)]
-                 [else  dist])])
-    (define dx (case anchor
-                 [(top-left left bottom-left)     (- dist)]
-                 [(top center bottom)             (* 1/2 width)]
-                 [(top-right right bottom-right)  (+ width dist)]
-                 [else  (raise-type-error 'draw-text/anchor "anchor/c" anchor)]))
-    (define dy (case anchor
-                 [(top-left top top-right)           (- dist)]
-                 [(left center right)                (* 1/2 height)]
-                 [(bottom-left bottom bottom-right)  (+ height dist)]))
-    (define rdx (+ (* (sin angle) dy) (* (cos angle) dx)))
-    (define rdy (- (* (cos angle) dy) (* (sin angle) dx)))
-    
-    (send dc draw-text str (- x rdx) (- y rdy) #t 0 angle)))
-
-(define (get-text-corners/anchor dc str x y [anchor 'top-left] [angle 0] [dist 0])
-  (define-values (width height _1 _2) (send dc get-text-extent str #f #t 0))
-  (let ([dist  (case anchor
-                 [(top-left bottom-left top-right bottom-right)  (* sin45 dist)]
-                 [else  dist])])
-    (define dxs (case anchor
-                  [(top-left left bottom-left)     (list (- dist) (- width dist))]
-                  [(top center bottom)             (list (* -1/2 width) (* 1/2 width))]
-                  [(top-right right bottom-right)  (list (- dist width) dist)]
-                  [else  (raise-type-error 'get-text-corners/anchor "anchor/c" anchor)]))
-    (define dys (case anchor
-                  [(top-left top top-right)           (list (- dist) (- height dist))]
-                  [(left center right)                (list (* -1/2 height) (* 1/2 width))]
-                  [(bottom-left bottom bottom-right)  (list (- dist height) dist)]))
-    
-    (for*/list ([dx  (in-list dxs)] [dy  (in-list dys)])
-      (define rdx (+ (* (sin angle) dy) (* (cos angle) dx)))
-      (define rdy (- (* (cos angle) dy) (* (sin angle) dx)))
-      (vector (+ x rdx) (+ y rdy)))))
-
-;; ===================================================================================================
-;; Draw paramter normalization
-
-(define (real->font-size size)
-  (define i (inexact->exact (round size)))
-  (min (max i 1) 255))
-
-(define (real->color-byte f)
-  (cond [(rational? f)  (define i (inexact->exact (floor f)))
-                        (min (max i 0) 255)]
-        [(eqv? f +inf.0)  255]
-        [else  0]))
-
-;; Returns an immutable instance of color%. Immutable colors are faster because they don't have to
-;; have immutable copies made when they're used in a dc.
-(define (make-color% r g b)
-  (make-color r g b))
-
-;; Returns an immutable instance of pen%. Same reasoning as for make-color%.
-(define (make-pen% r g b w s)
-  (make-pen #:color (make-color% r g b) #:width w #:style s))
-
-;; Returns an immutable instance of brush%. Same reasoning as for make-color%.
-(define (make-brush% r g b s)
-  (make-brush #:color (make-color% r g b) #:style s))
-
-(define (color%? c) (is-a? c color%))
-
-(defproc (->color [c color/c]) (list/c real? real? real?)
-  (match c
-    [(? color%?)  (list (send c red) (send c green) (send c blue))]
-    [(? string?)  (define color (send the-color-database find-color c))
-                  (when (not color) (error 'decode-color "unknown color name ~e" c))
-                  (->color color)]
-    [(list (? real?) (? real?) (? real?))  c]
-    [(? symbol?)  (->color (symbol->string c))]
-    [_  (error '->color "unable to convert to color triple: ~e" c)]))
-
-(define (color->color% c)
-  (match-define (list r g b) c)
-  (make-color% (real->color-byte r) (real->color-byte g) (real->color-byte b)))
-
-(define (rgb->hsv rgb)
-  (match-define (list r g b) (map (λ (x) (/ x 255)) rgb))
-  (define mx (max r g b))
-  (define mn (min r g b))
-  (define c (- mx mn))
-  (define h (* 60 (cond [(zero? c)  0]
-                        [(= mx r)   (/ (- g b) c)]
-                        [(= mx g)   (+ (/ (- b r) c) 2)]
-                        [(= mx b)   (+ (/ (- r g) c) 4)])))
-  (list (if (h . < . 0) (+ h 360) h)
-        (if (zero? mx) 0 (/ c mx))
-        mx))
-
-(define (hsv->rgb hsv)
-  (match-define (list h s v) hsv)
-  (define c (* v s))
-  (let ([h  (/ (real-modulo h 360) 60)])
-    (define x (* c (- 1 (abs (- (real-modulo h 2) 1)))))
-    (define-values (r g b)
-      (cond [(and (0 . <= . h) (h . < . 1))  (values c x 0)]
-            [(and (1 . <= . h) (h . < . 2))  (values x c 0)]
-            [(and (2 . <= . h) (h . < . 3))  (values 0 c x)]
-            [(and (3 . <= . h) (h . < . 4))  (values 0 x c)]
-            [(and (4 . <= . h) (h . < . 5))  (values x 0 c)]
-            [(and (5 . <= . h) (h . < . 6))  (values c 0 x)]))
-    (define m (- v c))
-    (list (* 255 (+ r m))
-          (* 255 (+ g m))
-          (* 255 (+ b m)))))
-
-(define (integer->hue n)
-  (let ([n  (abs n)])
-    (define i (+ (case (remainder n 6) [(0) 0] [(1) 2] [(2) 4] [(3) 1] [(4) 3] [(5) 5])
-                 (* 6 3 (quotient n 6))))
-    (remainder (* i 59) 360)))
-
-(define (integer->gray-value n)
-  (* 1/7 (remainder (abs n) 8)))
-
-(define (integer->pen-color n)
-  (define h (integer->hue n))
-  (hsv->rgb (list (- h (* 25 (sin (* (/ h 360) (* 3 pi)))))
-                  1
-                  (+ 1/2 (* 1/6 (sin (* (/ h 360) (* 3 pi))))))))
-
-(define (integer->brush-color n)
-  (define h (integer->hue n))
-  (hsv->rgb (list (let ([y  (* (/ (- (sqrt (+ (/ h 60) 2)) (sqrt 2))
-                                  (- (sqrt 8) (sqrt 2)))
-                               6)])
-                    (- h (* 15 (sin (* (/ y 6) (* 3 pi))))))
-                  (+ 3/16 (* 3/32 (sin (* (/ h 360) (* 2 pi)))))
-                  1)))
-
-(define (integer->gray-pen-color i)
-  (make-list 3 (* 128 (expt (integer->gray-value i) 3/4))))
-
-(define (integer->gray-brush-color i)
-  (make-list 3 (+ 127 (* 128 (expt (- 1 (integer->gray-value i)) 3/4)))))
-
-(define pen-colors
-  (for/vector ([color  (in-list (append (list (integer->gray-pen-color 0))
-                                        (build-list 120 integer->pen-color)
-                                        (build-list 7 (λ (n) (integer->gray-pen-color (- 7 n))))))])
-    (map real->color-byte color)))
-
-(define brush-colors
-  (for/vector ([color  (in-list (append (list (integer->gray-brush-color 0))
-                                        (build-list 120 integer->brush-color)
-                                        (build-list 7 (λ (n) (integer->gray-brush-color (- 7 n))))))])
-    (map real->color-byte color)))
-
-(defproc (->pen-color [c plot-color/c]) (list/c real? real? real?)
-  (cond [(exact-integer? c)  (vector-ref pen-colors (modulo c 128))]
-        [else                (->color c)]))
-
-(defproc (->brush-color [c plot-color/c]) (list/c real? real? real?)
-  (cond [(exact-integer? c)  (vector-ref brush-colors (modulo c 128))]
-        [else                (->color c)]))
-
-(defproc (->pen-style [s plot-pen-style/c]) symbol?
-  (cond [(exact-integer? s)  (case (remainder (abs s) 5)
-                               [(0)  'solid]
-                               [(1)  'dot]
-                               [(2)  'long-dash]
-                               [(3)  'short-dash]
-                               [(4)  'dot-dash])]
-        [(symbol? s)  s]
-        [else  (raise-type-error '->pen-style "symbol or integer" s)]))
-
-(defproc (->brush-style [s plot-brush-style/c]) symbol?
-  (cond [(exact-integer? s)  (case (remainder (abs s) 7)
-                               [(0)  'solid]
-                               [(1)  'bdiagonal-hatch]
-                               [(2)  'fdiagonal-hatch]
-                               [(3)  'crossdiag-hatch]
-                               [(4)  'horizontal-hatch]
-                               [(5)  'vertical-hatch]
-                               [(6)  'cross-hatch])]
-        [(symbol? s)  s]
-        [else  (raise-type-error '->brush-style "symbol or integer" s)]))
-
-;; ===================================================================================================
-;; Color functions
-
-(defproc (color-seq [c1 color/c] [c2 color/c] [num exact-nonnegative-integer?]
-                    [#:start? start? boolean? #t]
-                    [#:end? end? boolean? #t]) (listof (list/c real? real? real?))
-  (match-define (list r1 g1 b1) (->color c1))
-  (match-define (list r2 g2 b2) (->color c2))
-  (define rs (linear-seq r1 r2 num #:start? start? #:end? end?))
-  (define gs (linear-seq g1 g2 num #:start? start? #:end? end?))
-  (define bs (linear-seq b1 b2 num #:start? start? #:end? end?))
-  (map list rs gs bs))
-
-(defproc (color-seq* [colors (listof color/c)] [num exact-nonnegative-integer?]
-                     [#:start? start? boolean? #t]
-                     [#:end? end? boolean? #t]) (listof (list/c real? real? real?))
-  (when (empty? colors) (raise-type-error 'color-seq* "nonempty (listof plot-color/c)" colors))
-  (match-define (list (list rs gs bs) ...) (map ->color colors))
-  (let ([rs  (linear-seq* rs num #:start? start? #:end? end?)]
-        [gs  (linear-seq* gs num #:start? start? #:end? end?)]
-        [bs  (linear-seq* bs num #:start? start? #:end? end?)])
-    (map list rs gs bs)))
-
-;; Returns an alpha value b such that, if 
-(defproc (alpha-expt [a (real-in 0 1)] [n (>/c 0)]) real?
-  (- 1 (expt (- 1 a) n)))
-
-;; ===================================================================================================
-;; Subdividing nonlinearly transformed shapes
-
-(define subdivide-fracs '(3/7 4/7 2/7 5/7 1/7 6/7))
-
-(define (subdivide-line transform v1 v2)
-  (let loop ([v1 v1] [v2 v2] [depth 10])
-    (let/ec return
-      (when (zero? depth) (return (list v1 v2)))
-      
-      (define dc-v1 (transform v1))
-      (define dc-v2 (transform v2))
-      (define dc-dv (v- dc-v2 dc-v1))
-      (when ((vmag dc-dv) . <= . 3)
-        (return (list v1 v2)))
-      
-      (define dv (v- v2 v1))
-      (define-values (max-area vc)
-        (for/fold ([max-area 0] [vc v1]) ([frac  (in-list subdivide-fracs)])
-          (define test-vc (v+ (v* dv frac) v1))
-          (define test-area (abs (vcross2 dc-dv (v- (transform test-vc) dc-v1))))
-          (cond [(test-area . > . max-area)  (values test-area test-vc)]
-                [else  (values max-area vc)])))
-      (when (max-area . <= . 3) (return (list v1 v2)))
-      
-      ;(plot3d-subdivisions (+ (plot3d-subdivisions) 1))
-      (append (loop v1 vc (- depth 1))
-              (rest (loop vc v2 (- depth 1)))))))
-
-(define (subdivide-lines transform vs)
-  (append
-   (append*
-    (for/list ([v1  (in-list vs)] [v2  (in-list (rest vs))])
-      (define line-vs (subdivide-line transform v1 v2))
-      (drop-right line-vs 1)))
-   (list (last vs))))
-
-(define subdivide-polygon
-  (case-lambda
-    [(transform vs)
-     (reverse
-      (for/fold ([vs empty]) ([v1  (in-list (cons (last vs) vs))]
-                              [v2  (in-list vs)])
-        (define line-vs (rest (subdivide-line transform v1 v2)))
-        (append (reverse line-vs) vs)))]
-    [(transform vs ls)
-     (define-values (new-vs new-ls)
-       (for/fold ([vs empty] [ls empty]) ([v1  (in-list (cons (last vs) vs))]
-                                          [v2  (in-list vs)]
-                                          [l   (in-list ls)])
-         (define line-vs (rest (subdivide-line transform v1 v2)))
-         (values (append (reverse line-vs) vs)
-                 (append (make-list (length line-vs) l) ls))))
-     (values (reverse new-vs)
-             (reverse new-ls))]))
-
-;; ===================================================================================================
-;; Fixpoint margin computation
-
-;; In calculating margins in 2d-plot-area% and 3d-plot-area%, we have a mutual dependence problem:
-;; 1. We can't set the margins without knowing where the ticks and axis labels will be drawn.
-;; 2. We can't determine the tick and label angles (and thus their vertexes) without the margins.
-
-;; The margins could be solved exactly using algebra and trigonometry, but the solutions wouldn't
-;; be robust, as small changes to the layout algorithms would invalidate them.
-
-;; So we use a fixpoint solution: iterate
-;; 1. Getting tick and label vertexes ('get-vs' below); then
-;; 2. Calculating new margins by how far off the dc the vertexes would be.
-
-;; As long as this process is monotone and bounded, the distance off the dc is zero in the limit. In
-;; practice, only a few iterations drives this distance to less than 1 drawing unit.
-
-(define (margin-fixpoint x-min x-max y-min y-max
-                         init-left init-right init-top init-bottom
-                         get-vs)
-  (let/ec return
-    (for/fold ([left init-left] [right init-right] [top init-top] [bottom init-bottom]
-                                ) ([i  (in-range 3)])
-      (match-define (list (vector xs ys) ...) (get-vs left right top bottom))
-      (define param-x-min (apply min x-min xs))
-      (define param-x-max (apply max (sub1 x-max) xs))
-      (define param-y-min (apply min y-min ys))
-      (define param-y-max (apply max (sub1 y-max) ys))
-      
-      (define new-left (round (+ left (- x-min param-x-min))))
-      (define new-right (round (- right (- (sub1 x-max) param-x-max))))
-      (define new-top (round (+ top (- y-min param-y-min))))
-      (define new-bottom (round (- bottom (- (sub1 y-max) param-y-max))))
-      
-      ;; Not enough space?
-      (define area-x-min (+ x-min new-left))
-      (define area-x-max (- x-max new-right))
-      (define area-y-min (+ y-min new-top))
-      (define area-y-max (- y-max new-bottom))
-      (when (or (area-x-min . > . area-x-max)
-                (area-y-min . > . area-y-max))
-        (return init-left init-right init-top init-bottom))
-      
-      ;; Early out: if the margins haven't changed much, another iteration won't change them more
-      ;; (hopefully)
-      (when (and (= left new-left) (= right new-right)
-                 (= top new-top) (= bottom new-bottom))
-        (return new-left new-right new-top new-bottom))
-      
-      (values new-left new-right new-top new-bottom))))
-
-;; ===================================================================================================
-;; Null device context (used for speed testing)
-
-(define-syntax-rule (define-public-stubs val name ...)
-  (begin (define/public (name . args) val) ...))
-
-(define null-dc%
-  (class* object% (dc<%>)
-    (define color (make-object color% 0 0 0))
-    (define font (make-object font% 8 'default))
-    (define pen (make-object pen% color 1 'solid))
-    (define brush (make-object brush% color 'solid))
-    (define matrix (vector 1 0 0 0 1 0))
-    (define transformation (vector matrix 0 0 0 0 0))
-    (define-public-stubs transformation get-transformation)
-    (define-public-stubs matrix get-initial-matrix)
-    (define-public-stubs 'solid get-text-mode)
-    (define-public-stubs color get-text-foreground get-text-background get-background)
-    (define-public-stubs #t get-smoothing ok? start-doc glyph-exists?)
-    (define-public-stubs #f get-clipping-region get-gl-context)
-    (define-public-stubs 0 get-rotation get-char-height get-char-width)
-    (define-public-stubs (values 0 0) get-origin get-scale get-size)
-    (define-public-stubs font get-font)
-    (define-public-stubs pen get-pen)
-    (define-public-stubs brush get-brush)
-    (define-public-stubs 1 get-alpha)
-    (define-public-stubs (values 1 1) get-device-scale)
-    (define-public-stubs (values 0 0 0 0) get-text-extent)
-    (define-public-stubs (void)
-      flush suspend-flush resume-flush
-      start-page end-page end-doc
-      set-transformation
-      set-text-mode
-      set-smoothing
-      set-text-foreground
-      set-text-background
-      set-scale
-      set-rotation
-      set-origin
-      set-initial-matrix
-      set-font
-      set-clipping-region
-      set-clipping-rect
-      set-brush
-      set-pen
-      set-alpha
-      set-background
-      set-alignment-scale
-      draw-text
-      draw-spline
-      draw-line
-      draw-lines
-      draw-ellipse
-      draw-rectangle
-      draw-rounded-rectangle
-      draw-polygon
-      draw-point
-      draw-path
-      draw-bitmap-section
-      draw-bitmap
-      draw-arc
-      copy clear erase
-      cache-font-metrics-key
-      transform rotate scale translate
-      try-color)
-    (super-new)))
-
-;; ===================================================================================================
-;; Visible faces of a 3D rectangle
-
-(define (rect-visible-faces r theta)
-  (match-define (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max)) r)
-  (list 
-   ;; Top (z-max) face
-   (list (vector 0.0 0.0 1.0)
-         (vector x-min y-min z-max) (vector x-max y-min z-max)
-         (vector x-max y-max z-max) (vector x-min y-max z-max))
-   ;; Front (y-min) face
-   (if ((cos theta) . > . 0.0)
-       (list (vector 0.0 -1.0 0.0)
-             (vector x-min y-min z-min) (vector x-max y-min z-min)
-             (vector x-max y-min z-max) (vector x-min y-min z-max))
-       empty)
-   ;; Back (y-max) face
-   (if ((cos theta) . < . 0.0)
-       (list (vector 0.0 1.0 0.0)
-             (vector x-min y-max z-min) (vector x-max y-max z-min)
-             (vector x-max y-max z-max) (vector x-min y-max z-max))
-       empty)
-   ;; Left (x-min) face
-   (if ((sin theta) . > . 0.0)
-       (list (vector -1.0 0.0 0.0)
-             (vector x-min y-min z-min) (vector x-min y-max z-min)
-             (vector x-min y-max z-max) (vector x-min y-min z-max))
-       empty)
-   ;; Right (x-max) face
-   (if ((sin theta) . < . 0.0)
-       (list (vector 1.0 0.0 0.0)
-             (vector x-max y-min z-min) (vector x-max y-max z-min)
-             (vector x-max y-max z-max) (vector x-max y-min z-max))
-       empty)))
-
-;; ===================================================================================================
-;; Origin-neutral pen styles
-
-(struct pen-style (length ps) #:transparent)
-
-(define (make-pen-style diff-ps)
-  (let* ([diff-ps  (map exact->inexact diff-ps)]
-         [diff-ps  (if (even? (length diff-ps)) diff-ps (append diff-ps diff-ps))])
-    (define ps (map exact->inexact (cumulative-sum diff-ps)))
-    (define len (last ps))
-    (pen-style len ps)))
-
-(define long-dash-pen-style (make-pen-style '(5 4)))
-(define short-dash-pen-style (make-pen-style '(3 2)))
-(define dot-pen-style (make-pen-style '(1 2)))
-(define dot-dash-pen-style (make-pen-style '(1 3 4 3)))
-
-(define (scale-pen-style sty scale)
-  (let ([scale  (exact->inexact scale)])
-    (match-define (pen-style len ps) sty)
-    (pen-style (fl* scale len) (map (λ (p) (fl* scale p)) ps))))
-
-(define (cons-exact->inexact v)
-  (match-define (cons x1 y1) v)
-  (cons (exact->inexact x1) (exact->inexact y1)))
-
-(define (cons=? v1 v2)
-  (match-define (cons x1 y1) v1)
-  (match-define (cons x2 y2) v2)
-  (and (fl= x1 x2) (fl= y1 y2)))
-
-(define (segment-reverse seg)
-  (reverse (map reverse seg)))
-
-(define (segment-join s1 s2)
-  (match-let ([(list s1 ... a)  s1]
-              [(list b s2 ...)  s2])
-    (append s1 (list (append a (rest b))) s2)))
-
-(define (join-styled-segments segments)
-  (let ([segments  (filter (compose not empty?) segments)])
-    (if (empty? segments)
-        empty
-        (match-let ([(cons current-segment segments)  segments])
-          (let loop ([current-segment current-segment] [segments segments])
-            (cond [(empty? segments)  (list current-segment)]
-                  [else
-                   (define lst (last (last current-segment)))
-                   (match-let ([(cons segment segments)  segments])
-                     (define fst (first (first segment)))
-                     (cond [(cons=? lst fst)  (loop (segment-join current-segment segment) segments)]
-                           [else  (cons current-segment (loop segment segments))]))]))))))
-
-(define (styled-segment* x1 y1 x2 y2 sty pair)
-  (match-define (pen-style len (cons p rest-ps)) sty)
-  (define start-x (fl* len (flfloor (fl/ x1 len))))
-  (define m (fl/ (fl- y2 y1) (fl- x2 x1)))
-  (define b (fl- y1 (fl* m x1)))
-  (let loop ([xa start-x] [base-x 0.0] [ps rest-ps] [on? #t] [res empty])
-    (let-values ([(base-x ps)  (cond [(empty? ps)  (values (fl+ base-x len) rest-ps)]
-                                     [else         (values base-x ps)])])
-      (cond [(xa . fl>= . x2)  (reverse res)]
-            [else
-             (match-let ([(cons p ps)  ps])
-               (define xb (fl+ start-x (fl+ p base-x)))
-               (cond [(and on? (xb . fl>= . x1))
-                      (define v (let ([xa  (flmax x1 xa)]
-                                      [xb  (flmin x2 xb)])
-                                  (define ya (if (fl= x1 xa) y1 (fl+ (fl* m xa) b)))
-                                  (define yb (if (fl= x2 xb) y2 (fl+ (fl* m xb) b)))
-                                  (list (pair xa ya) (pair xb yb))))
-                      (loop xb base-x ps (not on?) (cons v res))]
-                     [else  (loop xb base-x ps (not on?) res)]))]))))
-
-(define (styled-segment x1 y1 x2 y2 sty)
-  (define dx (flabs (fl- x2 x1)))
-  (define dy (flabs (fl- y2 y1)))
-  (cond [(and (fl= dx 0.0) (fl= dy 0.0))  (list (list (cons x1 y1) (cons x2 y2)))]
-        [(dx . > . dy)
-         (define reverse? (x1 . fl> . x2))
-         (let-values ([(x1 y1)  (if reverse? (values x2 y2) (values x1 y1))]
-                      [(x2 y2)  (if reverse? (values x1 y1) (values x2 y2))])
-           (define segment (styled-segment* x1 y1 x2 y2 sty cons))
-           (if reverse? (segment-reverse segment) segment))]
-        [else
-         (define reverse? (y1 . fl> . y2))
-         (let-values ([(x1 y1)  (if reverse? (values x2 y2) (values x1 y1))]
-                      [(x2 y2)  (if reverse? (values x1 y1) (values x2 y2))])
-           (define segment (styled-segment* y1 x1 y2 x2 sty (λ (y x) (cons x y))))
-           (if reverse? (segment-reverse segment) segment))]))
-
-(define (symbol->style name style-sym)
-  (case style-sym
-    [(long-dash)   long-dash-pen-style]
-    [(short-dash)  short-dash-pen-style]
-    [(dot)         dot-pen-style]
-    [(dot-dash)    dot-dash-pen-style]
-    [else  (error name "unknown pen style ~e" style-sym)]))
-
-(define (draw-line/pen-style dc x1 y1 x2 y2 style-sym)
-  (case style-sym
-    [(transparent)  (void)]
-    [(solid)        (send dc draw-line x1 y1 x2 y2)]
-    [else
-     (let ([x1  (exact->inexact x1)]
-           [y1  (exact->inexact y1)]
-           [x2  (exact->inexact x2)]
-           [y2  (exact->inexact y2)])
-       (define sty (symbol->style 'draw-line style-sym))
-       (define pen (send dc get-pen))
-       (define scale (flmax 1.0 (exact->inexact (send pen get-width))))
-       (define vss (styled-segment x1 y1 x2 y2 (scale-pen-style sty scale)))
-       (for ([vs  (in-list vss)] #:when (not (empty? vs)))
-         (match-define (list (cons xa ya) (cons xb yb)) vs)
-         (send dc draw-line xa ya xb yb)))]))
-
-(define (draw-lines* dc vs sty)
-  (define vss
-    (append* (join-styled-segments
-              (for/list ([v1  (in-list vs)] [v2  (in-list (rest vs))])
-                (match-define (cons x1 y1) v1)
-                (match-define (cons x2 y2) v2)
-                (styled-segment x1 y1 x2 y2 sty)))))
-  (for ([vs  (in-list vss)])
-    (match vs
-      [(list (cons x1 y1) (cons x2 y2))  (send dc draw-line x1 y1 x2 y2)]
-      [_  (send dc draw-lines vs)])))
-
-(define (draw-lines/pen-style dc vs style-sym)
-  (cond [(or (empty? vs) (eq? style-sym 'transparent))  (void)]
-        [else
-         (let ([vs  (map cons-exact->inexact vs)])
-           (cond [(eq? style-sym 'solid)  (send dc draw-lines vs)]
-                 [else
-                  (define pen (send dc get-pen))
-                  (define scale (flmax 1.0 (exact->inexact (send pen get-width))))
-                  (define sty (scale-pen-style (symbol->style 'draw-lines style-sym) scale))
-                  (draw-lines* dc vs sty)]))]))
-
-;; ===================================================================================================
-;; Drawing a bitmap using 2x supersampling
-
-(define (draw-bitmap/supersampling draw width height)
-  (define bm (make-bitmap width height #:backing-scale 2))
-  (define dc (make-object bitmap-dc% bm))
-  (send dc set-alignment-scale 2)
-  (draw dc)
-  bm)
-
-(define (draw-bitmap draw width height)
-  (define bm (make-bitmap width height))
-  (define dc (make-object bitmap-dc% bm))
-  (draw dc)
-  bm)
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/file-type.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/file-type.rkt
deleted file mode 100644
index 614097bd3c..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/file-type.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-;; Detect an image file type from a filename extension.
-
-(require racket/match racket/list)
-
-(provide (all-defined-out))
-
-(define file-type-hash
-  '((#rx"(?i:.*\\.png)$" . png)
-    (#rx"(?i:.*\\.(jpg)|(jpeg))$" . jpeg)
-    (#rx"(?i:.*\\.xbm)$" . xbm)
-    (#rx"(?i:.*\\.xpm)$" . xpm)
-    (#rx"(?i:.*\\.bmp)$" . bmp)
-    (#rx"(?i:.*\\.pdf)$" . pdf)
-    (#rx"(?i:.*\\.ps)$" . ps)
-    (#rx"(?i:.*\\.svg)$" . svg)))
-
-(define (detect-image-file-type output)
-  (define name
-    (cond [(string? output)  output]
-          [(path? output)    (path->string output)]
-          [else  (error 'detect-image-file-type "cannot detect file type for ~e" output)]))
-  (let loop ([hash  file-type-hash])
-    (cond [(empty? hash)  (error 'detect-image-file-type "~e has unknown file type" name)]
-          [(regexp-match (car (first hash)) name)  (cdr (first hash))]
-          [else  (loop (rest hash))])))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/format.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/format.rkt
deleted file mode 100644
index 251a5d87a4..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/format.rkt
+++ /dev/null
@@ -1,195 +0,0 @@
-#lang racket/base
-
-;; Functions to format numbers, and data structures containing numbers.
-
-(require racket/string racket/list racket/pretty racket/contract racket/match
-         unstable/latent-contract/defthing
-         "contract.rkt"
-         "math.rkt")
-
-(provide (all-defined-out))
-
-(define (string-map f str)
-  (list->string (map f (string->list str))))
-
-(defproc (integer->superscript [x exact-integer?]) string?
-  (string-map (λ (c) (case c
-                       [(#\0)  #\u2070]
-                       [(#\1)  #\u00b9]
-                       [(#\2)  #\u00b2]
-                       [(#\3)  #\u00b3]
-                       [(#\4)  #\u2074]
-                       [(#\5)  #\u2075]
-                       [(#\6)  #\u2076]
-                       [(#\7)  #\u2077]
-                       [(#\8)  #\u2078]
-                       [(#\9)  #\u2079]
-                       [(#\+)  #\u207a]
-                       [(#\-)  #\u207b]
-                       [else   c]))
-              (number->string x)))
-
-(defproc (real->decimal-string* [x  real?]
-                                [min-digits exact-nonnegative-integer?]
-                                [max-digits exact-nonnegative-integer? min-digits]) string?
-  (when (min-digits . > . max-digits)
-    (error 'real->decimal-string* "expected min-digits <= max-digits; given ~e and ~e"
-           min-digits max-digits))
-  (define str (real->decimal-string x max-digits))
-  (let loop ([i  (string-length str)] [j (- max-digits min-digits)])
-    (cond [(zero? j)  (substring str 0 i)]
-          [(zero? i)  "0"]  ; shouldn't happen, as real->decimal-string guarantees a "0." prefix
-          [(char=? #\0 (string-ref str (- i 1)))  (loop (- i 1) (- j 1))]
-          [else  (substring str 0 i)])))
-
-(define (remove-trailing-zeros str)
-  (let loop ([i  (string-length str)])
-    (cond [(zero? i)  "0"]
-          [(char=? #\0 (string-ref str (sub1 i)))  (loop (sub1 i))]
-          [(char=? #\. (string-ref str (sub1 i)))  (substring str 0 (sub1 i))]
-          [else  (substring str 0 i)])))
-
-;; Returns the number of fractional digits needed to distinguish numbers [x-min..x-max]
-(defproc (digits-for-range [x-min real?] [x-max real?]
-                           [base (and/c exact-integer? (>=/c 2)) 10]
-                           [extra-digits exact-integer? 3]) exact-integer?
-  (define range (abs (- x-max x-min)))
-  (+ extra-digits (if (zero? range) 0 (- (floor-log/base base range)))))
-
-(define (int-str->e-str str)
-  (define n (string-length str))
-  (cond [(or (= 0 n) (string=? str "0"))  "0"]
-        [else
-         (define fst (substring str 0 1))
-         (define rst (substring str 1 n))
-         (format "~a×10~a"
-                 (remove-trailing-zeros (format "~a.~a" fst rst))
-                 (integer->superscript (sub1 n)))]))
-
-(define (frac-str->e-str str)
-  (define n (string-length str))
-  (let loop ([i 0])
-    (cond [(= i n)  "0"]
-          [(char=? #\0 (string-ref str i))  (loop (add1 i))]
-          [else  (define fst (substring str i (add1 i)))
-                 (define rst (substring str (add1 i) n))
-                 (cond [(= 0 (string-length rst))
-                        (format "~a×10~a" fst (integer->superscript (- (add1 i))))]
-                       [else
-                        (format "~a.~a×10~a" fst rst (integer->superscript (- (add1 i))))])])))
-
-(define (zero-string n)
-  (make-string n #\0))
-
-(defproc (real->plot-label [x real?] [digits exact-integer?] [scientific? boolean? #t]) any
-  (cond
-    [(zero? x)  "0"]
-    [(eqv? x +nan.0)  "+nan.0"]
-    [(eqv? x +inf.0)  "+inf.0"]
-    [(eqv? x -inf.0)  "-inf.0"]
-    [else
-     (define front-sign (if (x . < . 0) "-" ""))
-     (define mid-sign (if (x . < . 0) "-" "+"))
-     (let* ([x  (abs (inexact->exact x))])
-       ;; Round away any extra digits
-       (define round-fac (expt 10 digits))
-       (define y (/ (round (* x round-fac)) round-fac))
-       ;; Parse the output of real->decimal-string
-       (define-values (int-str frac-str)
-         (match-let ([(list _ int-str frac-str)
-                      (regexp-match #rx"(.*)\\.(.*)" (real->decimal-string y (max 0 digits)))])
-           (values int-str (remove-trailing-zeros frac-str))))
-       (define int-zero? (string=? int-str "0"))
-       (define frac-zero? (string=? frac-str "0"))
-       (cond
-         [scientific?
-          ;; Get scientific notation for the integer and fractional parts
-          (define int-e-str (int-str->e-str int-str))
-          (define frac-e-str (frac-str->e-str frac-str))
-          ;(printf "int-str = ~v, frac-str = ~v~n" int-str frac-str)
-          ;(printf "int-e-str = ~v, frac-e-str = ~v~n" int-e-str frac-e-str)
-          (define int-e-zero? (string=? int-e-str "0"))
-          (define frac-e-zero? (string=? frac-e-str "0"))
-          ;; Build a list of possible output strings
-          (define strs
-            (list (cond [(and int-zero? frac-zero?)  "0"]
-                        [int-zero?   (format "~a.~a" front-sign frac-str)]
-                        [frac-zero?  (format "~a~a" front-sign int-str)]
-                        [else        (format "~a~a.~a" front-sign int-str frac-str)])
-                  (cond [(and int-e-zero? frac-zero?)  "0"]
-                        [int-e-zero?  (format "~a.~a" front-sign frac-str)]
-                        [frac-zero?   (format "~a~a" front-sign int-e-str)]
-                        [else         (format "~a(~a)~a.~a" front-sign int-e-str mid-sign frac-str)])
-                  (cond [(and int-zero? frac-e-zero?)  "0"]
-                        [int-zero?     (format "~a~a" front-sign frac-e-str)]
-                        [frac-e-zero?  (format "~a~a" front-sign int-str)]
-                        [else          (format "~a~a~a(~a)" front-sign int-str mid-sign frac-e-str)])
-                  (cond [(and int-e-zero? frac-e-zero?)  "0"]
-                        [int-e-zero?   (format "~a~a" front-sign frac-e-str)]
-                        [frac-e-zero?  (format "~a~a" front-sign int-e-str)]
-                        [else
-                         (format "~a(~a)~a(~a)" front-sign int-e-str mid-sign frac-e-str)])))
-          ;; Return the shortest possible output string
-          (argmin string-length strs)]
-         [else
-          (cond [(and int-zero? frac-zero?)  "0"]
-                [int-zero?   (format "~a.~a" front-sign frac-str)]
-                [frac-zero?  (format "~a~a" front-sign int-str)]
-                [else        (format "~a~a.~a" front-sign int-str frac-str)])]))]))
-
-(define (format-special x)
-  (case x
-    [(#f)  "#f"]
-    [(+nan.0)  "+nan.0"]
-    [(+inf.0)  "+inf.0"]
-    [(-inf.0)  "-inf.0"]
-    [else  "<unknown>"]))
-
-(defproc (ivl->plot-label [i ivl?] [extra-digits exact-integer? 3]) string?
-  (match-define (ivl a b) i)
-  (cond [(and (not (rational? a)) (not (rational? b)))
-         (format "[~a,~a]" (format-special a) (format-special b))]
-        [(not (rational? a))  (format "[~a,~a]" (format-special a) (real->plot-label b 15))]
-        [(not (rational? b))  (format "[~a,~a]" (real->plot-label a 15) (format-special b))]
-        [else
-         (define digits (digits-for-range a b 10 extra-digits))
-         (format "[~a,~a]"
-                 (real->plot-label a digits)
-                 (real->plot-label b digits))]))
-
-(defproc (->plot-label [a any/c] [digits exact-integer? 7]) string?
-  (let loop ([a a])
-    (cond [(string? a)   a]
-          [(symbol? a)   (symbol->string a)]
-          [(real? a)     (real->plot-label a digits)]
-          [(ivl? a)      (ivl->plot-label a)]
-          [(list? a)     (string-append "(" (string-join (map loop a)) ")")]
-          [(cons? a)     (string-append "(" (loop (car a)) " . " (loop (cdr a)) ")")]
-          [(boolean? a)  (if a "true" "false")]
-          [(char? a)     (list->string (list a))]
-          [else  (pretty-format a)])))
-
-;; Like real->decimal-string, but removes trailing zeros
-(defproc (real->string/trunc [x real?] [e exact-integer?]) string?
-  (remove-trailing-zeros (real->decimal-string x (max 0 e))))
-
-;; ===================================================================================================
-;; Format strings
-
-(defproc (parse-format-string [str string?]) (listof (or/c string? symbol?))
-  (define n (string-length str))
-  (let loop ([i 0] [fmt-list  empty])
-    (cond [(i . >= . n)  (reverse fmt-list)]
-          [(i . = . (- n 1))  (reverse (cons (substring str i (+ i 1)) fmt-list))]
-          [(char=? #\~ (string-ref str i))
-           (loop (+ i 2) (cons (string->symbol (substring str i (+ i 2))) fmt-list))]
-          [else  (loop (+ i 1) (cons (substring str i (+ i 1)) fmt-list))])))
-
-(defproc (apply-formatter [formatter (symbol? any/c . -> . (or/c string? #f))]
-                          [fmt-list (listof (or/c string? symbol?))]
-                          [d any/c]) (listof string?)
-  (for/list ([fmt  (in-list fmt-list)])
-    (cond [(eq? fmt '~~)  "~"]
-          [(symbol? fmt)  (let ([val  (formatter fmt d)])
-                            (if val val (symbol->string fmt)))]
-          [(string? fmt)  fmt])))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/kde.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/kde.rkt
deleted file mode 100644
index 933071eaf1..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/kde.rkt
+++ /dev/null
@@ -1,163 +0,0 @@
-#lang racket/base
-
-(require racket/flonum racket/list racket/promise racket/math racket/contract
-         unstable/latent-contract/defthing
-         (except-in "math.rkt" sum)
-         "utils.rkt"
-         "sample.rkt"
-         (only-in math/base sum)
-         (only-in math/statistics sort-samples))
-
-(provide (all-defined-out))
-
-;; make-kde/windowed : (vectorof flonum) flonum (vectorof flonum) flonum flonum -> (listof flonum)
-;;                       -> (listof flonum)
-;; (can assume that xs is sorted)
-;; Make a naive KDE, but uses windows to keep from adding Gaussians more than max-dist away
-(define ((make-kde/windowed xs h ws max-dist) ys)
-  (define-values (_i ps)
-    (for/fold ([i 0] [ps empty]) ([y  (in-list ys)])
-      (define new-i (vector-find-index (λ (x) ((flabs (fl- x y)) . fl<= . max-dist)) xs i))
-      (cond [new-i
-             (define new-j (vector-find-index (λ (x) ((flabs (fl- x y)) . fl> . max-dist)) xs new-i))
-             (define p (apply + (for/list ([x  (in-vector xs new-i new-j)]
-                                           [w  (in-vector ws new-i new-j)])
-                                  (define z (fl/ (fl- x y) h))
-                                  (fl* w (flexp (fl- 0.0 (fl* z z)))))))
-             (values new-i (cons p ps))]
-            [else
-             (values 0 (cons 0.0 ps))])))
-  (reverse ps))
-
-;; make-kde/fast-gauss : natural
-;;                       (vectorof flonum) flonum (vectorof flonum) flonum flonum (listof flonum)
-;;                         -> (listof flonum) -> (listof flonum)
-;; (can assume that xs is sorted)
-;; Make a KDE using the Improved Fast Gauss Transform
-;; Using the algorithm published in:
-;;   Changjiang Yang, Ramani Duraiswami, Nail A. Gumerov and Larry Davis
-;;   "Improved Fast Gauss Transform and Efficient Kernel Density Estimation"
-;;   Proceedings of the Ninth IEEE International Conference on Computer Vision (ICCV 2003)
-;; This also uses windows to keep from adding terms in Css more than max-dist away
-(define (make-kde/fast-gauss p xs h ws max-dist bin-bounds)
-  ;; Calculate the centers of each bin
-  (define x*s (for/list ([x1  (in-list bin-bounds)] [x2  (in-list (rest bin-bounds))])
-                (cond [(eqv? x1 -inf.0)  x2]
-                      [(eqv? x2 +inf.0)  x1]
-                      [else  (fl* 0.5 (+ x1 x2))])))
-  
-  ;; Precalculate multiplicative factors
-  (define scales (for/list ([a  (in-range p)])
-                   (fl/ (real->double-flonum (expt 2.0 a))
-                        (real->double-flonum (factorial a)))))
-  
-  ;; Calculate per-x*, per-a constants Css
-  (define-values (_i Css)
-    (for/fold ([i 0] [Css empty]) ([x*  (in-list x*s)])
-      (define new-i (vector-find-index (λ (x) ((flabs (fl- x* x)) . fl<= . max-dist)) xs i))
-      ;; A delay keeps this from evaluating until asking for the KDE in a range near this x*
-      (define Cs
-        (delay
-          (cond [new-i
-                 (define new-j (vector-find-index (λ (x) ((flabs (fl- x* x)) . fl> . max-dist))
-                                                  xs new-i))
-                 (for/list ([a  (in-range p)] [scale  (in-list scales)])
-                   (* scale (apply + (for/list ([x  (in-vector xs new-i new-j)]
-                                                [w  (in-vector ws new-i new-j)])
-                                       (define zx (fl/ (fl- x x*) h))
-                                       (fl* w (fl* (flexp (fl- 0.0 (fl* zx zx)))
-                                                   (real->double-flonum (expt zx a))))))))]
-                [else  (build-list p (λ _ 0.0))])))
-      (values (if new-i new-i 0) (cons Cs Css))))
-  
-  (λ (ys)
-    (define yss (bin-samples bin-bounds ys))
-    (append*
-     (for/list ([x*  (in-list x*s)] [Cs  (in-list (reverse Css))] [ys  (in-list yss)])
-       (for/list ([y  (in-list ys)])
-         (apply + (for/list ([a  (in-range p)] [C  (in-list (force Cs))])
-                    (define zy (fl/ (fl- y x*) h))
-                    (fl* C (fl* (flexp (fl- 0.0 (fl* zy zy)))
-                                (real->double-flonum (expt zy a)))))))))))
-
-;; The number of series terms to compute
-;; Making this odd ensures fast-gauss doesn't return negatives (the series partial sums alternate +/-)
-(define series-terms 9)
-
-;; Below this amount, we're fine with a kernel not contributing to the sum
-(define eps 1e-06)
-;; 1e-06 is the density returned at just over 5 standard deviations away from zero. If the estimate
-;; needs more sensitivity, then KDE is almost certainly the wrong thing to do.
-
-;; weight-max-dist : flonum flonum -> flonum
-;; Returns the maximum distance at which unnormalized kernel (with weight w and width h) will
-;; contribute at least eps to the sum
-(define (weight-max-dist w h)
-  (define a (/ w eps))
-  (if (a . > . 1.0)
-      (fl* h (fl* (flsqrt 2.0) (flsqrt (fllog a))))
-      0.0))
-
-(defproc (kde [xs (listof real?)]
-              [h (>/c 0)]
-              [ws (or/c (listof (>=/c 0)) #f) #f]
-              ) (values mapped-function?
-                        (or/c rational? #f)
-                        (or/c rational? #f))
-  (define N (length xs))
-  (define M (if ws (length ws) N))
-  (cond
-    [(= N 0)
-     (values (mapped-function (λ (y) 0) (λ (ys) (map (λ _ 0.0) ys))) #f #f)]
-    [(not (= N M))
-     (error 'kde
-            "values and weights must be the same length; given ~e (length ~a) and ~e (length ~a)"
-            xs N ws M)]
-    [else
-     (let*-values ([(xs ws)  (sort-samples < xs ws)]
-                   [(xs)  (list->vector (map real->double-flonum xs))]
-                   [(sum-ws)  (sum ws)]
-                   [(ws)  (map (λ (w) (real->double-flonum (/ w sum-ws))) ws)]
-                   [(max-dist)  (apply max (map (λ (w) (weight-max-dist w h)) ws))]
-                   [(ws)  (list->vector ws)]
-                   [(h)  (real->double-flonum h)])
-       (define c (fl/ 1.0 (fl* (sqrt pi) h)))
-       ;; The range of non-zero KDE values
-       (define x-min (fl- (vector-ref xs 0) max-dist))
-       (define x-max (fl+ (vector-ref xs (sub1 N)) max-dist))
-       ;; Parameters for fast-gauss
-       (define K (inexact->exact (flceiling (fl/ (fl- x-max x-min) h))))
-       (define p series-terms)
-       ;; Make the KDE functions
-       (define kde/windowed (make-kde/windowed xs h ws max-dist))
-       (define kde/fast-gauss
-         (delay
-           (define bin-bounds (append (list -inf.0) (linear-seq x-min x-max (+ K 1)) (list +inf.0)))
-           (make-kde/fast-gauss p xs h ws max-dist bin-bounds)))
-       (define fmap
-         (sorted-apply
-          (λ (ys) (sort ys <))
-          (λ (ys)
-            (let ([ys  (map real->double-flonum ys)])
-              (define first-ps (build-list (count (λ (y) (y . fl< . x-min)) ys) (λ _ 0.0)))
-              (define last-ps (build-list (count (λ (y) (y . fl> . x-max)) ys) (λ _ 0.0)))
-              (define mid-ys (filter (λ (y) (and (x-min . fl<= . y) (y . fl<= . x-max))) ys))
-              (define mid-ps
-                (cond [(empty? mid-ys)  empty]
-                      [else
-                       (define M (length mid-ys))
-                       ;; Use the KDE algorithms' asymptotic complexity to decide which to use
-                       (define fast-gauss-time (+ M (* K p N)))
-                       (define windowed-time   (* M N))
-                       ;(printf "est. fast-gauss-time = ~v~n" (real->double-flonum fast-gauss-time))
-                       ;(printf "est. windowed-time   = ~v~n" (real->double-flonum windowed-time))
-                       ;; A bit of testing shows these to be fairly accurate estimates of actual time
-                       ;; (proportional to a constant)
-                       ;; So it seems the algorithms have similar multiplicative constants
-                       (if (fast-gauss-time . < . windowed-time)
-                           ((force kde/fast-gauss) mid-ys)
-                           (kde/windowed mid-ys))]))
-              (append first-ps
-                      (map (λ (p) (fl* p c)) mid-ps)
-                      last-ps)))))
-       (values (mapped-function (λ (x) (first (fmap (list x)))) fmap) x-min x-max))]))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/legend.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/legend.rkt
deleted file mode 100644
index ea8f37baf2..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/legend.rkt
+++ /dev/null
@@ -1,178 +0,0 @@
-#lang racket/base
-
-;; Functions that create legend entries and lists of legend entries.
-
-(require racket/class racket/match racket/list racket/string racket/sequence racket/contract
-         unstable/latent-contract/defthing
-         "math.rkt"
-         "contract.rkt"
-         "format.rkt"
-         "draw.rkt"
-         "utils.rkt")
-
-(provide (all-defined-out))
-
-(struct legend-entry (label draw) #:transparent)
-
-;; ===================================================================================================
-;; Line legends
-
-(defproc (line-legend-entry [label string?]
-                            [color plot-color/c] [width (>=/c 0)] [style plot-pen-style/c]
-                            ) legend-entry?
-  (legend-entry label (λ (pd x-size y-size)
-                        (define y (* 1/2 y-size))
-                        (send pd set-pen color width style)
-                        (send pd set-alpha 1)
-                        (send pd draw-line (vector 0 y) (vector x-size y)))))
-
-(defproc (line-legend-entries [label string?] [zs (listof real?)] [z-labels (listof string?)]
-                              [colors (plot-colors/c (listof real?))]
-                              [widths (pen-widths/c (listof real?))]
-                              [styles (plot-pen-styles/c (listof real?))]
-                              ) (listof legend-entry?)
-  (define hash
-    (for/fold ([hash  empty]) ([z        (in-list zs)]
-                               [z-label  (in-list z-labels)]
-                               [color    (in-cycle* (maybe-apply colors zs))]
-                               [width    (in-cycle* (maybe-apply widths zs))]
-                               [style    (in-cycle* (maybe-apply styles zs))])
-      (assoc-cons hash (list color width style) z-label)))
-  
-  (reverse
-   (for/list ([entry  (in-list hash)])
-     (match-define (cons args vs) entry)
-     (apply line-legend-entry
-            (cond [(= 1 (length vs))  (format "~a = ~a" label (first vs))]
-                  [else  (format "~a ∈ {~a}" label (string-join (reverse vs) ","))])
-            args))))
-
-;; ===================================================================================================
-;; Rectangle legends
-
-(defproc (rectangle-legend-entry [label string?]
-                                 [color plot-color/c] [style plot-brush-style/c]
-                                 [line-color plot-color/c] [line-width (>=/c 0)]
-                                 [line-style plot-pen-style/c]) legend-entry?
-  (legend-entry label (λ (pd x-size y-size)
-                        (send pd set-brush color style)
-                        (send pd set-pen line-color line-width line-style)
-                        (send pd set-alpha 1)
-                        (send pd draw-rect (vector (ivl 0 x-size) (ivl 0 y-size))))))
-
-(defproc (rectangle-legend-entries [label string?] [zs (listof real?)]
-                                   [colors (plot-colors/c (listof real?))]
-                                   [styles (plot-brush-styles/c (listof real?))]
-                                   [line-colors (plot-colors/c (listof real?))]
-                                   [line-widths (pen-widths/c (listof real?))]
-                                   [line-styles (plot-pen-styles/c (listof real?))]
-                                   ) (listof legend-entry?)
-  (define z-min (first zs))
-  (define z-max (last zs))
-  (define digits (digits-for-range z-min z-max))
-  (define hash
-    (for/fold ([hash  empty]) ([z           (in-list zs)]
-                               [color       (in-cycle* (maybe-apply colors zs))]
-                               [style       (in-cycle* (maybe-apply styles zs))]
-                               [line-color  (in-cycle* (maybe-apply line-colors zs))]
-                               [line-width  (in-cycle* (maybe-apply line-widths zs))]
-                               [line-style  (in-cycle* (maybe-apply line-styles zs))])
-      (define entry-label (real->plot-label z digits))
-      (assoc-cons hash (list color style line-color line-width line-style) entry-label)))
-  
-  (reverse
-   (for/list ([entry  (in-list hash)])
-     (match-define (cons (list color style line-color line-width line-style) vs) entry)
-     (rectangle-legend-entry (if (= 1 (length vs))
-                                 (format "~a = ~a" label (first vs))
-                                 (format "~a ∈ {~a}" label (string-join (reverse vs) ",")))
-                             color style line-color line-width line-style))))
-
-;; ===================================================================================================
-;; Interval legends
-
-(defproc (interval-legend-entry
-          [label string?]
-          [color plot-color/c] [style plot-brush-style/c]
-          [line-color plot-color/c] [line-width (>=/c 0)] [line-style plot-pen-style/c]
-          [line1-color plot-color/c] [line1-width (>=/c 0)] [line1-style plot-pen-style/c]
-          [line2-color plot-color/c] [line2-width (>=/c 0)] [line2-style plot-pen-style/c]
-          ) legend-entry?
-  (legend-entry label (λ (pd x-size y-size)
-                        (send pd set-alpha 1)
-                        ;; rectangle
-                        (send pd set-pen line-color line-width line-style)
-                        (send pd set-brush color style)
-                        (send pd draw-rect (vector (ivl 0 x-size) (ivl 0 y-size)))
-                        ;; bottom line
-                        (send pd set-pen line1-color line1-width line1-style)
-                        (send pd draw-line (vector 0 y-size) (vector x-size y-size))
-                        ;; top line
-                        (send pd set-pen line2-color line2-width line2-style)
-                        (send pd draw-line (vector 0 0) (vector x-size 0)))))
-
-(defproc (interval-legend-entries [label string?] [ivls (listof ivl?)] [ivl-labels (listof string?)]
-                                  [colors (plot-colors/c (listof ivl?))]
-                                  [styles (plot-brush-styles/c (listof ivl?))]
-                                  [line-colors (plot-colors/c (listof ivl?))]
-                                  [line-widths (pen-widths/c (listof ivl?))]
-                                  [line-styles (plot-pen-styles/c (listof ivl?))]
-                                  [line1-colors (plot-colors/c (listof ivl?))]
-                                  [line1-widths (pen-widths/c (listof ivl?))]
-                                  [line1-styles (plot-pen-styles/c (listof ivl?))]
-                                  [line2-colors (plot-colors/c (listof ivl?))]
-                                  [line2-widths (pen-widths/c (listof ivl?))]
-                                  [line2-styles (plot-pen-styles/c (listof ivl?))]
-                                  ) (listof legend-entry?)
-  (define hash
-    (for/fold ([hash  empty]) ([ivl-label    (in-list ivl-labels)]
-                               [color        (in-cycle* (maybe-apply colors ivls))]
-                               [style        (in-cycle* (maybe-apply styles ivls))]
-                               [line-color   (in-cycle* (maybe-apply line-colors ivls))]
-                               [line-width   (in-cycle* (maybe-apply line-widths ivls))]
-                               [line-style   (in-cycle* (maybe-apply line-styles ivls))]
-                               [line1-color  (in-cycle* (maybe-apply line1-colors ivls))]
-                               [line1-width  (in-cycle* (maybe-apply line1-widths ivls))]
-                               [line1-style  (in-cycle* (maybe-apply line1-styles ivls))]
-                               [line2-color  (in-cycle* (maybe-apply line2-colors ivls))]
-                               [line2-width  (in-cycle* (maybe-apply line2-widths ivls))]
-                               [line2-style  (in-cycle* (maybe-apply line2-styles ivls))])
-      (assoc-cons hash
-                  (list color style line-color line-width line-style
-                        line1-color line1-width line1-style
-                        line2-color line2-width line2-style)
-                  ivl-label)))
-  
-  (reverse
-   (for/list ([entry  (in-list hash)])
-     (match-define (cons (list color style line-color line-width line-style
-                               line1-color line1-width line1-style
-                               line2-color line2-width line2-style)
-                         ivl-labels)
-       entry)
-     (interval-legend-entry (format "~a ∈ ~a" label (string-join (reverse ivl-labels) " ∪ "))
-                            color style line-color line-width line-style
-                            line1-color line1-width line1-style
-                            line2-color line2-width line2-style))))
-
-;; ===================================================================================================
-;; Point legends
-
-(defproc (point-legend-entry [label string?] [sym point-sym/c]
-                             [color plot-color/c] [fill-color plot-color/c]
-                             [size (>=/c 0)] [line-width (>=/c 0)]) legend-entry?
-  (legend-entry label (λ (pd x-size y-size)
-                        (send pd set-pen color line-width 'solid)
-                        (send pd set-brush fill-color 'solid)
-                        (send pd set-alpha 1)
-                        (send pd draw-glyphs (list (vector (* 1/2 x-size) (* 1/2 y-size))) sym size))))
-
-(defproc (arrow-legend-entry [label string?] [color plot-color/c]
-                             [line-width (>=/c 0)] [line-style plot-pen-style/c]
-                             ) legend-entry?
-  (legend-entry label (λ (pd x-size y-size)
-                        (send pd set-pen color line-width line-style)
-                        (send pd set-alpha 1)
-                        (send pd draw-arrow-glyph
-                              (vector (* 1/2 x-size) (* 1/2 y-size))
-                              (* 1/4 x-size) 0))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/marching-cubes.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/marching-cubes.rkt
deleted file mode 100644
index 11b1d12457..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/marching-cubes.rkt
+++ /dev/null
@@ -1,547 +0,0 @@
-#lang racket/base
-
-(require racket/contract racket/flonum racket/fixnum racket/list racket/match racket/unsafe/ops
-         unstable/latent-contract/defthing
-         (for-syntax racket/base racket/syntax racket/match racket/list)
-         "math.rkt"
-         "utils.rkt"
-         "marching-utils.rkt")
-
-(provide heights->cube-polys heights->cube-polys:doc)
-
-(define-for-syntax (->datum x)
-  (if (syntax? x) (syntax->datum x) x))
-
-(define-for-syntax (t=? a b)
-  (eq? (->datum a) (->datum b)))
-
-;; edge vertexes 
-
-(define-syntax-rule (edge-1-2 d d1 d2) (vector (solve-t d d1 d2) 0 0))
-(define-syntax-rule (edge-2-3 d d2 d3) (vector 1 (solve-t d d2 d3) 0))
-(define-syntax-rule (edge-3-4 d d3 d4) (vector (solve-t d d4 d3) 1 0))
-(define-syntax-rule (edge-1-4 d d1 d4) (vector 0 (solve-t d d1 d4) 0))
-
-(define-syntax-rule (edge-5-6 d d5 d6) (vector (solve-t d d5 d6) 0 1))
-(define-syntax-rule (edge-6-7 d d6 d7) (vector 1 (solve-t d d6 d7) 1))
-(define-syntax-rule (edge-7-8 d d7 d8) (vector (solve-t d d7 d8) 1 1))
-(define-syntax-rule (edge-5-8 d d5 d8) (vector 0 (solve-t d d5 d8) 1))
-
-(define-syntax-rule (edge-1-5 d d1 d5) (vector 0 0 (solve-t d d1 d5)))
-(define-syntax-rule (edge-2-6 d d2 d6) (vector 1 0 (solve-t d d2 d6)))
-(define-syntax-rule (edge-3-7 d d3 d7) (vector 1 1 (solve-t d d3 d7)))
-(define-syntax-rule (edge-4-8 d d4 d8) (vector 0 1 (solve-t d d4 d8)))
-
-#|
-Cube vertex numbers:
-
-   8--------7
-  /|       /|
- 5--------6 |
- | |      | |      d  y
- | 4------|-3      | /
- |/       |/       |/
- 1--------2        +--- x
-|#
-
-(define (known-cube-0000-0000 d d1 d2 d3 d4 d5 d6 d7 d8) empty)
-
-(define known-cube-1111-1111 known-cube-0000-0000)
-
-(define (known-cube-1000-0000 d d1 d2 d3 d4 d5 d6 d7 d8)
-  (list (list (edge-1-2 d d1 d2) (edge-1-5 d d1 d5) (edge-1-4 d d1 d4))))
-
-(define known-cube-0111-1111 known-cube-1000-0000)
-
-(define (known-cube-1100-0000 d d1 d2 d3 d4 d5 d6 d7 d8)
-  (list (list (edge-1-5 d d1 d5) (edge-2-6 d d2 d6)
-              (edge-2-3 d d2 d3) (edge-1-4 d d1 d4))))
-
-(define known-cube-0011-1111 known-cube-1100-0000)
-
-(define (known-cube-1110-0000 d d1 d2 d3 d4 d5 d6 d7 d8)
-  (list (list (edge-1-5 d d1 d5) (edge-2-6 d d2 d6) (edge-3-7 d d3 d7)
-              (edge-3-4 d d3 d4) (edge-1-4 d d1 d4))))
-
-(define known-cube-0001-1111 known-cube-1110-0000)
-
-(define (known-cube-1111-0000 d d1 d2 d3 d4 d5 d6 d7 d8)
-  (list (list (edge-1-5 d d1 d5) (edge-2-6 d d2 d6)
-              (edge-3-7 d d3 d7) (edge-4-8 d d4 d8))))
-
-(define known-cube-0000-1111 known-cube-1111-0000)
-
-(define ((make-known-cube-1010-0000 test?) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (define da (/ (+ d1 d2 d3 d4) 4))
-  (cond
-    [(test? da d)
-     (list (list (edge-1-2 d d1 d2) (edge-2-3 d d2 d3)
-                 (edge-3-7 d d3 d7) (edge-1-5 d d1 d5))
-           (list (edge-3-4 d d3 d4) (edge-1-4 d d1 d4)
-                 (edge-1-5 d d1 d5) (edge-3-7 d d3 d7)))]
-    [else
-     (list (list (edge-1-2 d d1 d2) (edge-1-5 d d1 d5) (edge-1-4 d d1 d4))
-           (list (edge-2-3 d d2 d3) (edge-3-4 d d3 d4) (edge-3-7 d d3 d7)))]))
-
-(define known-cube-1010-0000 (make-known-cube-1010-0000 >=))
-(define known-cube-0101-1111 (make-known-cube-1010-0000 <))
-
-(define (known-cube-1000-0010 d d1 d2 d3 d4 d5 d6 d7 d8)
-  (list (list (edge-1-2 d d1 d2) (edge-1-5 d d1 d5) (edge-1-4 d d1 d4))
-        (list (edge-6-7 d d6 d7) (edge-3-7 d d3 d7) (edge-7-8 d d7 d8))))
-
-(define known-cube-0111-1101 known-cube-1000-0010)
-
-(define ((make-known-cube-1100-0010 test?) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (define da (/ (+ d2 d6 d7 d3) 4))
-  (cond
-    [(test? da d)
-     (list (list (edge-1-5 d d1 d5) (edge-2-6 d d2 d6)
-                 (edge-6-7 d d6 d7) (edge-7-8 d d7 d8))
-           (list (edge-1-4 d d1 d4) (edge-2-3 d d2 d3)
-                 (edge-3-7 d d3 d7) (edge-7-8 d d7 d8))
-           (list (edge-1-5 d d1 d5) (edge-1-4 d d1 d4) (edge-7-8 d d7 d8)))]
-    [else
-     (list (list (edge-1-5 d d1 d5) (edge-2-6 d d2 d6)
-                 (edge-2-3 d d2 d3) (edge-1-4 d d1 d4))
-           (list (edge-6-7 d d6 d7) (edge-3-7 d d3 d7) (edge-7-8 d d7 d8)))]))
-
-(define known-cube-1100-0010 (make-known-cube-1100-0010 >=))
-(define known-cube-0011-1101 (make-known-cube-1100-0010 <))
-
-(define ((make-known-cube-1100-0011 test?) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (define da (/ (+ d1 d5 d8 d4) 4))
-  (define db (/ (+ d2 d6 d7 d3) 4))
-  (cond
-    [(and (test? da d) (test? db d))
-     (list (list (edge-1-5 d d1 d5) (edge-5-8 d d5 d8)
-                 (edge-6-7 d d6 d7) (edge-2-6 d d2 d6))
-           (list (edge-1-4 d d1 d4) (edge-2-3 d d2 d3)
-                 (edge-3-7 d d3 d7) (edge-4-8 d d4 d8)))]
-    [(test? da d)
-     (define ec (v* (v+ (v+ (v+ (edge-1-5 d d1 d5) (edge-1-4 d d1 d4))
-                            (v+ (edge-4-8 d d4 d8) (edge-5-8 d d5 d8)))
-                        (v+ (v+ (edge-6-7 d d6 d7) (edge-2-6 d d2 d6))
-                            (v+ (edge-2-3 d d2 d3) (edge-3-7 d d3 d7))))
-                    1/8))
-     (list (list ec (edge-5-8 d d5 d8) (edge-6-7 d d6 d7))
-           (list ec (edge-1-5 d d1 d5) (edge-2-6 d d2 d6))
-           (list ec (edge-4-8 d d4 d8) (edge-3-7 d d3 d7))
-           (list ec (edge-1-4 d d1 d4) (edge-2-3 d d2 d3))
-           (list ec (edge-1-5 d d1 d5) (edge-5-8 d d5 d8))
-           (list ec (edge-1-4 d d1 d4) (edge-4-8 d d4 d8))
-           (list ec (edge-3-7 d d3 d7) (edge-6-7 d d6 d7))
-           (list ec (edge-2-3 d d2 d3) (edge-2-6 d d2 d6)))]
-    [(test? db d)
-     (define ec (v* (v+ (v+ (v+ (edge-1-5 d d1 d5) (edge-1-4 d d1 d4))
-                            (v+ (edge-4-8 d d4 d8) (edge-5-8 d d5 d8)))
-                        (v+ (v+ (edge-6-7 d d6 d7) (edge-2-6 d d2 d6))
-                            (v+ (edge-2-3 d d2 d3) (edge-3-7 d d3 d7))))
-                    1/8))
-     (list (list ec (edge-5-8 d d5 d8) (edge-6-7 d d6 d7))
-           (list ec (edge-1-5 d d1 d5) (edge-2-6 d d2 d6))
-           (list ec (edge-4-8 d d4 d8) (edge-3-7 d d3 d7))
-           (list ec (edge-1-4 d d1 d4) (edge-2-3 d d2 d3))
-           (list ec (edge-1-5 d d1 d5) (edge-1-4 d d1 d4))
-           (list ec (edge-4-8 d d4 d8) (edge-5-8 d d5 d8))
-           (list ec (edge-3-7 d d3 d7) (edge-2-3 d d2 d3))
-           (list ec (edge-6-7 d d6 d7) (edge-2-6 d d2 d6)))]
-    [else
-     (list (list (edge-1-5 d d1 d5) (edge-2-6 d d2 d6)
-                 (edge-2-3 d d2 d3) (edge-1-4 d d1 d4))
-           (list (edge-5-8 d d5 d8) (edge-6-7 d d6 d7)
-                 (edge-3-7 d d3 d7) (edge-4-8 d d4 d8)))]))
-
-(define known-cube-1100-0011 (make-known-cube-1100-0011 >=))
-(define known-cube-0011-1100 (make-known-cube-1100-0011 <))
-
-#|
-Cube vertex numbers:
-
-   8--------7
-  /|       /|
- 5--------6 |
- | |      | |      d  y
- | 4------|-3      | /
- |/       |/       |/
- 1--------2        +--- x
-|#
-
-
-(define ((make-known-cube-1010-0101 test?) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (define da (/ (+ d1 d2 d3 d4) 4))
-  (define db (/ (+ d1 d5 d8 d4) 4))
-  (define dc (/ (+ d3 d4 d8 d7) 4))
-  (define dd (/ (+ d1 d2 d6 d5) 4))
-  (define de (/ (+ d2 d3 d7 d6) 4))
-  (define df (/ (+ d5 d6 d7 d8) 4))
-  (append
-   (list (list (edge-1-5 d d1 d5) (edge-1-2 d d1 d2) (edge-1-4 d d1 d4))
-         (list (edge-2-3 d d2 d3) (edge-3-7 d d3 d7) (edge-3-4 d d3 d4))
-         (list (edge-5-6 d d5 d6) (edge-2-6 d d2 d6) (edge-6-7 d d6 d7))
-         (list (edge-7-8 d d7 d8) (edge-5-8 d d5 d8) (edge-4-8 d d4 d8)))
-   (if (test? da d)
-       (list (list (edge-1-2 d d1 d2) (edge-2-3 d d2 d3)
-                   (edge-3-4 d d3 d4) (edge-1-4 d d1 d4)))
-       empty)
-   (if (test? db d)
-       (list (list (edge-1-5 d d1 d5) (edge-5-8 d d5 d8)
-                   (edge-4-8 d d4 d8) (edge-1-4 d d1 d4)))
-       empty)
-   (if (test? dc d)
-       (list (list (edge-3-4 d d3 d4) (edge-3-7 d d3 d7)
-                   (edge-7-8 d d7 d8) (edge-4-8 d d4 d8)))
-       empty)
-   (if (test? dd d)
-       (list (list (edge-1-2 d d1 d2) (edge-2-6 d d2 d6)
-                   (edge-5-6 d d5 d6) (edge-1-5 d d1 d5)))
-       empty)
-   (if (test? de d)
-       (list (list (edge-2-3 d d2 d3) (edge-3-7 d d3 d7)
-                   (edge-6-7 d d6 d7) (edge-2-6 d d2 d6)))
-       empty)
-   (if (test? df d)
-       (list (list (edge-5-6 d d5 d6) (edge-6-7 d d6 d7)
-                   (edge-7-8 d d7 d8) (edge-5-8 d d5 d8)))
-       empty)))
-
-(define known-cube-1010-0101 (make-known-cube-1010-0101 >=))
-(define known-cube-0101-1010 (make-known-cube-1010-0101 <))
-
-(define ((make-known-cube-1110-0001 >=) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (define da (/ (+ d1 d5 d8 d4) 4))
-  (define db (/ (+ d7 d8 d4 d3) 4))
-  (cond
-    [(and (da . >= . d) (db . >= . d))
-     (list (list (edge-1-5 d d1 d5) (edge-2-6 d d2 d6) (edge-3-7 d d3 d7))
-           (list (edge-1-5 d d1 d5) (edge-3-7 d d3 d7)
-                 (edge-7-8 d d7 d8) (edge-5-8 d d5 d8))
-           (list (edge-1-4 d d1 d4) (edge-3-4 d d3 d4) (edge-4-8 d d4 d8)))]
-    [(da . >= . d)
-     (define ec (v* (v+ (edge-1-5 d d1 d5) (edge-3-7 d d3 d7)) 1/2))
-     (list (list (edge-1-5 d d1 d5) (edge-2-6 d d2 d6) (edge-3-7 d d3 d7))
-           (list ec (edge-3-7 d d3 d7) (edge-3-4 d d3 d4) (edge-1-4 d d1 d4))
-           (list ec (edge-1-5 d d1 d5) (edge-5-8 d d5 d8) (edge-7-8 d d7 d8))
-           (list ec (edge-1-4 d d1 d4) (edge-4-8 d d4 d8) (edge-7-8 d d7 d8)))]
-    [(db . >= . d)
-     (define ec (v* (v+ (edge-1-5 d d1 d5) (edge-3-7 d d3 d7)) 1/2))
-     (list (list (edge-1-5 d d1 d5) (edge-2-6 d d2 d6) (edge-3-7 d d3 d7))
-           (list ec (edge-1-5 d d1 d5) (edge-1-4 d d1 d4) (edge-3-4 d d3 d4))
-           (list ec (edge-3-7 d d3 d7) (edge-7-8 d d7 d8) (edge-5-8 d d5 d8))
-           (list ec (edge-3-4 d d3 d4) (edge-4-8 d d4 d8) (edge-5-8 d d5 d8)))]
-    [else
-     (list (list (edge-1-5 d d1 d5) (edge-2-6 d d2 d6) (edge-3-7 d d3 d7))
-           (list (edge-1-5 d d1 d5) (edge-3-7 d d3 d7)
-                 (edge-3-4 d d3 d4) (edge-1-4 d d1 d4))
-           (list (edge-7-8 d d7 d8) (edge-5-8 d d5 d8) (edge-4-8 d d4 d8)))]))
-
-(define known-cube-1110-0001 (make-known-cube-1110-0001 >=))
-(define known-cube-0001-1110 (make-known-cube-1110-0001 <))
-
-(define (known-cube-1110-0100 d d1 d2 d3 d4 d5 d6 d7 d8)
-  (list (list (edge-1-5 d d1 d5) (edge-5-6 d d5 d6) (edge-6-7 d d6 d7)
-              (edge-3-7 d d3 d7) (edge-3-4 d d3 d4) (edge-1-4 d d1 d4))))
-
-(define known-cube-0001-1011 known-cube-1110-0100)
-
-(define (known-cube-1110-0010 d d1 d2 d3 d4 d5 d6 d7 d8)
-  (list (list (edge-1-5 d d1 d5) (edge-2-6 d d2 d6) (edge-6-7 d d6 d7)
-              (edge-7-8 d d7 d8) (edge-3-4 d d3 d4) (edge-1-4 d d1 d4))))
-
-(define known-cube-0001-1101 known-cube-1110-0010)
-
-(define ((make-known-cube-1010-0001 test?) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (define da (/ (+ d1 d2 d3 d4) 4))
-  (define db (/ (+ d1 d5 d8 d4) 4))
-  (define dc (/ (+ d3 d4 d8 d7) 4))
-  (append
-   (list (list (edge-1-5 d d1 d5) (edge-1-2 d d1 d2) (edge-1-4 d d1 d4))
-         (list (edge-2-3 d d2 d3) (edge-3-7 d d3 d7) (edge-3-4 d d3 d4))
-         (list (edge-7-8 d d7 d8) (edge-5-8 d d5 d8) (edge-4-8 d d4 d8)))
-   (if (test? da d)
-       (list (list (edge-1-2 d d1 d2) (edge-2-3 d d2 d3)
-                   (edge-3-4 d d3 d4) (edge-1-4 d d1 d4)))
-       empty)
-   (if (test? db d)
-       (list (list (edge-1-5 d d1 d5) (edge-5-8 d d5 d8)
-                   (edge-4-8 d d4 d8) (edge-1-4 d d1 d4)))
-       empty)
-   (if (test? dc d)
-       (list (list (edge-3-4 d d3 d4) (edge-3-7 d d3 d7)
-                   (edge-7-8 d d7 d8) (edge-4-8 d d4 d8)))
-       empty)))
-
-(define known-cube-1010-0001 (make-known-cube-1010-0001 >=))
-(define known-cube-0101-1110 (make-known-cube-1010-0001 <))
-
-(define-for-syntax known-cubes
-  '((0 0 0 0 0 0 0 0)
-    (1 0 0 0 0 0 0 0)
-    (1 1 0 0 0 0 0 0)
-    (1 1 1 0 0 0 0 0)
-    (1 1 1 1 0 0 0 0)
-    (1 0 1 0 0 0 0 0)
-    (1 0 0 0 0 0 1 0)
-    (1 1 0 0 0 0 1 0)
-    (1 1 0 0 0 0 1 1)
-    (1 0 1 0 0 1 0 1)
-    (1 1 1 0 0 0 0 1)
-    (1 1 1 0 0 1 0 0)
-    (1 1 1 0 0 0 1 0)
-    (1 0 1 0 0 0 0 1)
-    (1 1 1 1 1 1 1 1)
-    (0 1 1 1 1 1 1 1)
-    (0 0 1 1 1 1 1 1)
-    (0 0 0 1 1 1 1 1)
-    (0 0 0 0 1 1 1 1)
-    (0 1 0 1 1 1 1 1)
-    (0 1 1 1 1 1 0 1)
-    (0 0 1 1 1 1 0 1)
-    (0 0 1 1 1 1 0 0)
-    (0 1 0 1 1 0 1 0)
-    (0 0 0 1 1 1 1 0)
-    (0 0 0 1 1 0 1 1)
-    (0 0 0 1 1 1 0 1)
-    (0 1 0 1 1 1 1 0)))
-
-;; cube transformations: mirror
-
-(define (mirror-vec-d v)
-  (match-define (vector x y d) v)
-  (vector x y (- 1 d)))
-
-(define ((mirror-cube-d f) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (map (λ (poly) (map mirror-vec-d poly))
-       (f d d5 d6 d7 d8 d1 d2 d3 d4)))
-
-(define (mirror-vec-y v)
-  (match-define (vector x y d) v)
-  (vector x (- 1 y) d))
-
-(define ((mirror-cube-y f) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (map (λ (poly) (map mirror-vec-y poly))
-       (f d d4 d3 d2 d1 d8 d7 d6 d5)))
-
-(define (mirror-vec-x v)
-  (match-define (vector x y d) v)
-  (vector (- 1 x) y d))
-
-(define ((mirror-cube-x f) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (map (λ (poly) (map mirror-vec-x poly))
-       (f d d2 d1 d4 d3 d6 d5 d8 d7)))
-
-;; cube transformations: rotate clockwise (looking positively along axis)
-
-(define (unrotate-vec-d v)
-  (match-define (vector x y d) v)
-  (vector (- 1 y) x d))
-
-(define ((rotate-cube-d f) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (map (λ (poly) (map unrotate-vec-d poly))
-       (f d d2 d3 d4 d1 d6 d7 d8 d5)))
-
-(define (unrotate-vec-y v)
-  (match-define (vector x y d) v)
-  (vector d y (- 1 x)))
-
-(define ((rotate-cube-y f) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (map (λ (poly) (map unrotate-vec-y poly))
-       (f d d5 d1 d4 d8 d6 d2 d3 d7)))
-
-(define (unrotate-vec-x v)
-  (match-define (vector x y d) v)
-  (vector x (- 1 d) y))
-
-(define ((rotate-cube-x f) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (map (λ (poly) (map unrotate-vec-x poly))
-       (f d d4 d3 d7 d8 d1 d2 d6 d5)))
-
-;; cube transformations: rotate counterclockwise (looking negatively along axis)
-
-(define (rotate-vec-d v)
-  (match-define (vector x y d) v)
-  (vector y (- 1 x) d))
-
-(define ((unrotate-cube-d f) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (map (λ (poly) (map rotate-vec-d poly))
-       (f d d4 d1 d2 d3 d8 d5 d6 d7)))
-
-(define (rotate-vec-y v)
-  (match-define (vector x y d) v)
-  (vector (- 1 d) y x))
-
-(define ((unrotate-cube-y f) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (map (λ (poly) (map rotate-vec-y poly))
-       (f d d2 d6 d7 d3 d1 d5 d8 d4)))
-
-(define (rotate-vec-x v)
-  (match-define (vector x y d) v)
-  (vector x d (- 1 y)))
-
-(define ((unrotate-cube-x f) d d1 d2 d3 d4 d5 d6 d7 d8)
-  (map (λ (poly) (map rotate-vec-x poly))
-       (f d d5 d6 d2 d1 d8 d7 d3 d4)))
-
-(define-for-syntax (cube-points-transform trans src)
-  (match-define (list j1 j2 j3 j4 j5 j6 j7 j8) src)
-  (cond [(t=? trans #'mirror-cube-d)    (list j5 j6 j7 j8 j1 j2 j3 j4)]
-        [(t=? trans #'mirror-cube-y)    (list j4 j3 j2 j1 j8 j7 j6 j5)]
-        [(t=? trans #'mirror-cube-x)    (list j2 j1 j4 j3 j6 j5 j8 j7)]
-        [(t=? trans #'rotate-cube-d)    (list j4 j1 j2 j3 j8 j5 j6 j7)]
-        [(t=? trans #'unrotate-cube-d)  (list j2 j3 j4 j1 j6 j7 j8 j5)]
-        [(t=? trans #'rotate-cube-y)    (list j2 j6 j7 j3 j1 j5 j8 j4)]
-        [(t=? trans #'unrotate-cube-y)  (list j5 j1 j4 j8 j6 j2 j3 j7)]
-        [(t=? trans #'rotate-cube-x)    (list j5 j6 j2 j1 j8 j7 j3 j4)]
-        [(t=? trans #'unrotate-cube-x)  (list j4 j3 j7 j8 j1 j2 j6 j5)]))
-
-(define-for-syntax known-transforms
-  (list #'mirror-cube-d
-        #'mirror-cube-y
-        #'mirror-cube-x
-        #'rotate-cube-d
-        #'rotate-cube-y
-        #'rotate-cube-x
-        #'unrotate-cube-d
-        #'unrotate-cube-y
-        #'unrotate-cube-x))
-
-(define-for-syntax (opposite-transform? t1 t2)
-  (or (and (t=? t1 #'mirror-d) (t=? t2 #'mirror-d))
-      (and (t=? t1 #'mirror-y) (t=? t2 #'mirror-y))
-      (and (t=? t1 #'mirror-x) (t=? t2 #'mirror-x))
-      (and (t=? t1 #'rotate-d) (t=? t2 #'unrotate-d))
-      (and (t=? t1 #'unrotate-d) (t=? t2 #'rotate-d))
-      (and (t=? t1 #'rotate-y) (t=? t2 #'unrotate-y))
-      (and (t=? t1 #'unrotate-y) (t=? t2 #'rotate-y))
-      (and (t=? t1 #'rotate-x) (t=? t2 #'unrotate-x))
-      (and (t=? t1 #'unrotate-x) (t=? t2 #'rotate-x))))
-
-(define-for-syntax (first-path-to-cube/src src dst depth)
-  (let/ec return
-    (let loop ([src src] [path empty] [depth depth])
-      ;(printf "path = ~v~n" path)
-      (cond [(or (equal? src dst) #;(equal? (invert-cube src) dst))  path]
-            [(zero? depth)  #f]
-            [else
-             (for ([move  (in-list known-transforms)]
-                   #:when (or (empty? path)
-                              (not (opposite-transform? move (first path)))))
-               (define new-src (cube-points-transform move src))
-               (define new-path (cons move path))
-               (if (or (equal? new-src dst)
-                       #;(equal? (invert-cube new-src) dst))
-                   (return new-path)
-                   (loop new-src new-path (sub1 depth))))
-             #f]))))
-
-(define-for-syntax (shortest-path-to-cube dst)
-  (let/ec return
-    (for ([depth  (in-list '(1 2 3))])
-      (for ([src  (in-list known-cubes)])
-        (define path (first-path-to-cube/src src dst depth))
-        (when path (return (cons src path)))))
-    (list #f #f)))
-
-(define-for-syntax (format-cube-id ctxt cube j1 j2 j3 j4 j5 j6 j7 j8)
-  (format-id ctxt "~a-~a~a~a~a-~a~a~a~a" cube
-             (->datum j1) (->datum j2)
-             (->datum j3) (->datum j4)
-             (->datum j5) (->datum j6)
-             (->datum j7) (->datum j8)))
-
-(define-syntax (define-all-cube-functions stx)
-  (syntax-case stx ()
-    [(id)
-     #`(begin
-         #,@(for*/list ([j8  (in-list '(0 1))]
-                        [j7  (in-list '(0 1))]
-                        [j6  (in-list '(0 1))]
-                        [j5  (in-list '(0 1))]
-                        [j4  (in-list '(0 1))]
-                        [j3  (in-list '(0 1))]
-                        [j2  (in-list '(0 1))]
-                        [j1  (in-list '(0 1))])
-              (define dst (list j1 j2 j3 j4 j5 j6 j7 j8))
-              (match-define (cons src path) (shortest-path-to-cube dst))
-              (cond [(or (empty? path) (first path))
-                     (with-syntax ([define-cube-function
-                                     (format-id #'id "define-cube-function")])
-                       #`(define-cube-function
-                           #,dst #,src #,path))]
-                    [else  (void)])))]))
-
-(define-syntax (define-cube-function stx)
-  (syntax-case stx ()
-    [(id (d1 d2 d3 d4 d5 d6 d7 d8)
-         (s1 s2 s3 s4 s5 s6 s7 s8)
-         path)
-     (with-syntax ([cube-dst  (format-cube-id #'id "cube"
-                                              #'d1 #'d2 #'d3 #'d4
-                                              #'d5 #'d6 #'d7 #'d8)]
-                   [cube-src  (format-cube-id #'id "known-cube"
-                                              #'s1 #'s2 #'s3 #'s4
-                                              #'s5 #'s6 #'s7 #'s8)])
-       (define new-stx
-         (syntax-case #'path ()
-           [()          #'(define cube-dst cube-src)]
-           [(path ...)  #'(define cube-dst ((compose path ...) cube-src))]))
-       ;(printf "~a~n" (syntax->datum new-stx))
-       new-stx)]))
-
-
-(define-syntax (make-cube-dispatch-table stx)
-  (syntax-case stx ()
-    [(id)
-     #`(vector
-        #,@(for*/list ([j8  (in-list '(0 1))]
-                       [j7  (in-list '(0 1))]
-                       [j6  (in-list '(0 1))]
-                       [j5  (in-list '(0 1))]
-                       [j4  (in-list '(0 1))]
-                       [j3  (in-list '(0 1))]
-                       [j2  (in-list '(0 1))]
-                       [j1  (in-list '(0 1))])
-             (format-cube-id #'id "cube" j1 j2 j3 j4 j5 j6 j7 j8)))]))
-
-(define-all-cube-functions)
-
-(define cube-dispatch-table
-  (make-cube-dispatch-table))
-
-(define-syntax-rule (add-digit j idx)
-  (unsafe-fx+ (unsafe-fx* idx 2) j))
-
-(define (do-heights->cube-polys d d1 d2 d3 d4 d5 d6 d7 d8)
-  (define j1 (if (d1 . < . d) 0 1))
-  (define j2 (if (d2 . < . d) 0 1))
-  (define j3 (if (d3 . < . d) 0 1))
-  (define j4 (if (d4 . < . d) 0 1))
-  (define j5 (if (d5 . < . d) 0 1))
-  (define j6 (if (d6 . < . d) 0 1))
-  (define j7 (if (d7 . < . d) 0 1))
-  (define j8 (if (d8 . < . d) 0 1))
-  (define facet-num
-    (add-digit
-     j1 (add-digit
-         j2 (add-digit
-             j3 (add-digit
-                 j4 (add-digit
-                     j5 (add-digit
-                         j6 (add-digit j7 j8))))))))
-  (define f (vector-ref cube-dispatch-table facet-num))
-  (f d d1 d2 d3 d4 d5 d6 d7 d8))
-
-(defproc (heights->cube-polys [xa real?] [xb real?] [ya real?] [yb real?] [za real?] [zb real?]
-                              [d real?]
-                              [d1 real?] [d2 real?] [d3 real?] [d4 real?]
-                              [d5 real?] [d6 real?] [d7 real?] [d8 real?]
-                              ) (listof (listof (vector/c real? real? real?)))
-  (cond [(= d d1 d2 d3 d4 d5 d6 d7 d8)  empty]
-        [else
-         (define polys (do-heights->cube-polys d d1 d2 d3 d4 d5 d6 d7 d8))
-         (for/list ([poly  (in-list polys)])
-           (for/list ([uvw  (in-list poly)])
-             (match-define (vector u v w) uvw)
-             (vector (unsolve-t xa xb u)
-                     (unsolve-t ya yb v)
-                     (unsolve-t za zb w))))]))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/marching-squares.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/marching-squares.rkt
deleted file mode 100644
index 94cba6148a..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/marching-squares.rkt
+++ /dev/null
@@ -1,601 +0,0 @@
-#lang racket/base
-
-(require racket/flonum racket/fixnum racket/list racket/match racket/unsafe/ops racket/contract
-         unstable/latent-contract/defthing
-         (only-in math/flonum fl)
-         (for-syntax racket/base)
-         "math.rkt"
-         "utils.rkt"
-         "marching-utils.rkt")
-
-(provide heights->lines heights->polys
-         heights->lines:doc heights->polys:doc)
-
-#|
-Z values are at these normalized coordinates:
-
-(0,1)           (1,1)
-      z4 --- z3
-       |     |
-       |     |
-      z1 --- z2
-(0,0)           (1,0)
-
-A marching squares algorithm and all of its facet functions have this type:
-
-    ftype m = real real real real real -> m
-
-where 'm' is a use-specific type, such as the type of "list of lines". The
-first argument is the contour value; the rest are z coordinates arranged as
-above.
-|#
-
-;; =============================================================================
-;; Contour lines
-
-;; Except for opposite-corner facets, every line-returning facet function is
-;; identical to the facet for its bitwise complement.
-
-;; -----------------------------------------------------------------------------
-;; all corners left out or included
-
-;(: lines0000 (FType Lines))
-(define-syntax-rule (lines0000 z z1 z2 z3 z4) empty)
-(define-syntax-rule (lines1111 z z1 z2 z3 z4) empty)
-
-;; -----------------------------------------------------------------------------
-;; one corner included or left out
-
-;(: lines1000 (FType Lines))
-(define-syntax-rule (lines1000 z z1 z2 z3 z4)
-  (list (vector (solve-t z z1 z2) 0
-                0 (solve-t z z1 z4))))
-
-;(: lines0100 (FType Lines))
-(define-syntax-rule (lines0100 z z1 z2 z3 z4)
-  (list (vector (solve-t z z1 z2) 0
-                1 (solve-t z z2 z3))))
-
-;(: lines0010 (FType Lines))
-(define-syntax-rule (lines0010 z z1 z2 z3 z4)
-  (list (vector 1 (solve-t z z2 z3)
-                (solve-t z z4 z3) 1)))
-
-;(: lines0001 (FType Lines))
-(define-syntax-rule (lines0001 z z1 z2 z3 z4)
-  (list (vector 0 (solve-t z z1 z4)
-                (solve-t z z4 z3) 1)))
-
-(define-syntax-rule (lines0111 z z1 z2 z3 z4) (lines1000 z z1 z2 z3 z4))
-(define-syntax-rule (lines1011 z z1 z2 z3 z4) (lines0100 z z1 z2 z3 z4))
-(define-syntax-rule (lines1101 z z1 z2 z3 z4) (lines0010 z z1 z2 z3 z4))
-(define-syntax-rule (lines1110 z z1 z2 z3 z4) (lines0001 z z1 z2 z3 z4))
-
-;; -----------------------------------------------------------------------------
-;; adjacent corners included or left out
-
-;(: lines1100 (FType Lines))
-(define-syntax-rule (lines1100 z z1 z2 z3 z4)
-  (list (vector 0 (solve-t z z1 z4)
-                1 (solve-t z z2 z3))))
-
-;(: lines0110 (FType Lines))
-(define-syntax-rule (lines0110 z z1 z2 z3 z4)
-  (list (vector (solve-t z z1 z2) 0
-                (solve-t z z4 z3) 1)))
-
-(define-syntax-rule (lines0011 z z1 z2 z3 z4) (lines1100 z z1 z2 z3 z4))
-(define-syntax-rule (lines1001 z z1 z2 z3 z4) (lines0110 z z1 z2 z3 z4))
-
-;; -----------------------------------------------------------------------------
-;; opposite corners left out / included
-
-;(: lines-opposite ((Float Float -> Boolean) -> (FType Lines)))
-(define-syntax-rule (lines-opposite test? z z1 z2 z3 z4)
-  ; disambiguate using average of corners as guess for center value
-  (let ([z5  (/ (+ z1 z2 z3 z4) 4)])
-    (if (test? z5 z)
-        (list (vector (solve-t z z1 z2) 0
-                      1 (solve-t z z2 z3))
-              (vector 0 (solve-t z z1 z4)
-                      (solve-t z z4 z3) 1))
-        (list (vector (solve-t z z1 z2) 0
-                      0 (solve-t z z1 z4))
-              (vector 1 (solve-t z z2 z3)
-                      (solve-t z z4 z3) 1)))))
-
-(define-syntax-rule (lines1010 z z1 z2 z3 z4) (lines-opposite >= z z1 z2 z3 z4))
-(define-syntax-rule (lines0101 z z1 z2 z3 z4) (lines-opposite <  z z1 z2 z3 z4))
-
-(define (do-heights->lines z z1 z2 z3 z4)
-  ;(printf "~v ~v ~v ~v ~v~n" z z1 z2 z3 z4)
-  (define p1 (z1 . >= . z))
-  (define p2 (z2 . >= . z))
-  (define p3 (z3 . >= . z))
-  (define p4 (z4 . >= . z))
-  ;(printf "~v ~v ~v ~v~n~n" p1 p2 p3 p4)
-  (if p1
-      (if p2
-          (if p3
-              (if p4
-                  (lines1111 z z1 z2 z3 z4)
-                  (lines1110 z z1 z2 z3 z4))
-              (if p4
-                  (lines1101 z z1 z2 z3 z4)
-                  (lines1100 z z1 z2 z3 z4)))
-          (if p3
-              (if p4
-                  (lines1011 z z1 z2 z3 z4)
-                  (lines1010 z z1 z2 z3 z4))
-              (if p4
-                  (lines1001 z z1 z2 z3 z4)
-                  (lines1000 z z1 z2 z3 z4))))
-      (if p2
-          (if p3
-              (if p4
-                  (lines0111 z z1 z2 z3 z4)
-                  (lines0110 z z1 z2 z3 z4))
-              (if p4
-                  (lines0101 z z1 z2 z3 z4)
-                  (lines0100 z z1 z2 z3 z4)))
-          (if p3
-              (if p4
-                  (lines0011 z z1 z2 z3 z4)
-                  (lines0010 z z1 z2 z3 z4))
-              (if p4
-                  (lines0001 z z1 z2 z3 z4)
-                  (lines0000 z z1 z2 z3 z4))))))
-
-(defproc (heights->lines [xa real?] [xb real?] [ya real?] [yb real?]
-                         [z real?] [z1 real?] [z2 real?] [z3 real?] [z4 real?]
-                         ) (listof (list/c (vector/c real? real? real?) (vector/c real? real? real?)))
-  (cond [(= z z1 z2 z3 z4)  empty]
-        [else
-         (define lines (do-heights->lines z z1 z2 z3 z4))
-         (for/list ([line  (in-list lines)])
-           (match-define (vector u1 v1 u2 v2) line)
-           (list (vector (unsolve-t xa xb u1) (unsolve-t ya yb v1) z)
-                 (vector (unsolve-t xa xb u2) (unsolve-t ya yb v2) z)))]))
-
-;; =============================================================================
-;; Isoband marching squares: polygonizes contour between two isoline values
-
-(define-syntax-rule (unrotate-vec v)
-  (match-let ([(vector x y z)  v])
-    (vector (- 1 y) x z)))
-
-(define-syntax-rule (unrotate-vec2 v)
-  (match-let ([(vector x y z)  v])
-    (vector (- 1 x) (- 1 y) z)))
-
-(define-syntax-rule (unrotate-vec3 v)
-  (match-let ([(vector x y z)  v])
-    (vector y (- 1 x) z)))
-
-(define-syntax-rule (rotate-facet f)
-  (λ (za zb z1 z2 z3 z4)
-    (map (λ (vs) (map (λ (v) (unrotate-vec v)) vs))
-         (f za zb z2 z3 z4 z1))))
-
-(define-syntax-rule (rotate-facet2 f)
-  (λ (za zb z1 z2 z3 z4)
-    (map (λ (vs) (map (λ (v) (unrotate-vec2 v)) vs))
-         (f za zb z3 z4 z1 z2))))
-
-(define-syntax-rule (rotate-facet3 f)
-  (λ (za zb z1 z2 z3 z4)
-    (map (λ (vs) (map (λ (v) (unrotate-vec3 v)) vs))
-         (f za zb z4 z1 z2 z3))))
-
-;; -----------------------------------------------------------------------------
-;; all corners same
-
-(define (polys0000 za zb z1 z2 z3 z4) empty)
-(define (polys2222 za zb z1 z2 z3 z4) empty)
-(define (polys1111 za zb z1 z2 z3 z4) (list 'full))
-
-;; -----------------------------------------------------------------------------
-;; single triangle
-
-(define (polys1000 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector (solve-t za z1 z2) 0 za)
-              (vector 0 (solve-t za z1 z4) za))))
-
-(define polys0100 (rotate-facet polys1000))
-(define polys0010 (rotate-facet2 polys1000))
-(define polys0001 (rotate-facet3 polys1000))
-
-(define (polys1222 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector (solve-t zb z1 z2) 0 zb)
-              (vector 0 (solve-t zb z1 z4) zb))))
-
-(define polys2122 (rotate-facet polys1222))
-(define polys2212 (rotate-facet2 polys1222))
-(define polys2221 (rotate-facet3 polys1222))
-
-;; -----------------------------------------------------------------------------
-;; single trapezoid
-
-(define (polys2000 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t zb z1 z2) 0 zb)
-              (vector (solve-t za z1 z2) 0 za)
-              (vector 0 (solve-t za z1 z4) za)
-              (vector 0 (solve-t zb z1 z4) zb))))
-
-(define polys0200 (rotate-facet polys2000))
-(define polys0020 (rotate-facet2 polys2000))
-(define polys0002 (rotate-facet3 polys2000))
-
-(define (polys0222 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t za z1 z2) 0 za)
-              (vector (solve-t zb z1 z2) 0 zb)
-              (vector 0 (solve-t zb z1 z4) zb)
-              (vector 0 (solve-t za z1 z4) za))))
-
-(define polys2022 (rotate-facet polys0222))
-(define polys2202 (rotate-facet2 polys0222))
-(define polys2220 (rotate-facet3 polys0222))
-
-;; -----------------------------------------------------------------------------
-;; single rectangle
-
-(define (polys1100 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector 1 0 z2)
-              (vector 1 (solve-t za z2 z3) za)
-              (vector 0 (solve-t za z1 z4) za))))
-
-(define polys0110 (rotate-facet polys1100))
-(define polys0011 (rotate-facet2 polys1100))
-(define polys1001 (rotate-facet3 polys1100))
-
-(define (polys1122 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector 1 0 z2)
-              (vector 1 (solve-t zb z2 z3) zb)
-              (vector 0 (solve-t zb z1 z4) zb))))
-
-(define polys2112 (rotate-facet polys1122))
-(define polys2211 (rotate-facet2 polys1122))
-(define polys1221 (rotate-facet3 polys1122))
-
-(define (polys0022 za zb z1 z2 z3 z4)
-  (list (list (vector 0 (solve-t za z1 z4) za)
-              (vector 1 (solve-t za z2 z3) za)
-              (vector 1 (solve-t zb z2 z3) zb)
-              (vector 0 (solve-t zb z1 z4) zb))))
-
-(define polys2002 (rotate-facet polys0022))
-(define polys2200 (rotate-facet2 polys0022))
-(define polys0220 (rotate-facet3 polys0022))
-
-;; -----------------------------------------------------------------------------
-;; single pentagon
-
-(define (polys0111 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t za z1 z2) 0 za)
-              (vector 1 0 z2)
-              (vector 1 1 z3)
-              (vector 0 1 z4)
-              (vector 0 (solve-t za z1 z4) za))))
-
-(define polys1011 (rotate-facet polys0111))
-(define polys1101 (rotate-facet2 polys0111))
-(define polys1110 (rotate-facet3 polys0111))
-
-(define (polys2111 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t zb z1 z2) 0 zb)
-              (vector 1 0 z2)
-              (vector 1 1 z3)
-              (vector 0 1 z4)
-              (vector 0 (solve-t zb z1 z4) zb))))
-
-(define polys1211 (rotate-facet polys2111))
-(define polys1121 (rotate-facet2 polys2111))
-(define polys1112 (rotate-facet3 polys2111))
-
-(define (polys1002 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector (solve-t za z1 z2) 0 za)
-              (vector (solve-t za z4 z3) 1 za)
-              (vector (solve-t zb z4 z3) 1 zb)
-              (vector 0 (solve-t zb z1 z4) zb))))
-
-(define polys2100 (rotate-facet polys1002))
-(define polys0210 (rotate-facet2 polys1002))
-(define polys0021 (rotate-facet3 polys1002))
-
-(define (polys1220 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector (solve-t zb z1 z2) 0 zb)
-              (vector (solve-t zb z4 z3) 1 zb)
-              (vector (solve-t za z4 z3) 1 za)
-              (vector 0 (solve-t za z1 z4) za))))
-
-(define polys0122 (rotate-facet polys1220))
-(define polys2012 (rotate-facet2 polys1220))
-(define polys2201 (rotate-facet3 polys1220))
-
-(define (polys1200 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector (solve-t zb z1 z2) 0 zb)
-              (vector 1 (solve-t zb z2 z3) zb)
-              (vector 1 (solve-t za z2 z3) za)
-              (vector 0 (solve-t za z1 z4) za))))
-
-(define polys0120 (rotate-facet polys1200))
-(define polys0012 (rotate-facet2 polys1200))
-(define polys2001 (rotate-facet3 polys1200))
-
-(define (polys1022 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector (solve-t za z1 z2) 0 za)
-              (vector 1 (solve-t za z2 z3) za)
-              (vector 1 (solve-t zb z2 z3) zb)
-              (vector 0 (solve-t zb z1 z4) zb))))
-
-(define polys2102 (rotate-facet polys1022))
-(define polys2210 (rotate-facet2 polys1022))
-(define polys0221 (rotate-facet3 polys1022))
-
-;; -----------------------------------------------------------------------------
-;; single hexagon
-
-(define (polys0112 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t za z1 z2) 0 za)
-              (vector 1 0 z2)
-              (vector 1 1 z3)
-              (vector (solve-t zb z4 z3) 1 zb)
-              (vector 0 (solve-t zb z1 z4) zb)
-              (vector 0 (solve-t za z1 z4) za))))
-
-(define polys2011 (rotate-facet polys0112))
-(define polys1201 (rotate-facet2 polys0112))
-(define polys1120 (rotate-facet3 polys0112))
-
-(define (polys2110 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t zb z1 z2) 0 zb)
-              (vector 1 0 z2)
-              (vector 1 1 z3)
-              (vector (solve-t za z4 z3) 1 za)
-              (vector 0 (solve-t za z1 z4) za)
-              (vector 0 (solve-t zb z1 z4) zb))))
-
-(define polys0211 (rotate-facet polys2110))
-(define polys1021 (rotate-facet2 polys2110))
-(define polys1102 (rotate-facet3 polys2110))
-
-(define (polys0121 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t za z1 z2) 0 za)
-              (vector 1 0 z2)
-              (vector 1 (solve-t zb z2 z3) zb)
-              (vector (solve-t zb z4 z3) 1 zb)
-              (vector 0 1 z4)
-              (vector 0 (solve-t za z1 z4) za))))
-
-(define polys1012 (rotate-facet polys0121))
-(define polys2101 (rotate-facet2 polys0121))
-(define polys1210 (rotate-facet3 polys0121))
-
-;; -----------------------------------------------------------------------------
-;; 6-sided saddle
-
-(define (polys10100 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector (solve-t za z1 z2) 0 za)
-              (vector 0 (solve-t za z1 z4) za))
-        (list (vector 1 1 z3)
-              (vector (solve-t za z4 z3) 1 za)
-              (vector 1 (solve-t za z2 z3) za))))
-
-(define (polys10101 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector (solve-t za z1 z2) 0 za)
-              (vector 1 (solve-t za z2 z3) za)
-              (vector 1 1 z3)
-              (vector (solve-t za z4 z3) 1 za)
-              (vector 0 (solve-t za z1 z4) za))))
-
-(define (polys1010 za zb z1 z2 z3 z4)
-  (define z5 (/ (+ z1 z2 z3 z4) 4))
-  (cond [(z5 . < . za)  (polys10100 za zb z1 z2 z3 z4)]
-        ; (z5 . >= . zb) is impossible
-        [else  (polys10101 za zb z1 z2 z3 z4)]))
-
-(define polys0101 (rotate-facet polys1010))
-
-(define (polys1212-2 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector (solve-t zb z1 z2) 0 zb)
-              (vector 0 (solve-t zb z1 z4) zb))
-        (list (vector 1 1 z3)
-              (vector (solve-t zb z4 z3) 1 zb)
-              (vector 1 (solve-t zb z2 z3) zb))))
-
-(define (polys1212-1 za zb z1 z2 z3 z4)
-  (list (list (vector 0 0 z1)
-              (vector (solve-t zb z1 z2) 0 zb)
-              (vector 1 (solve-t zb z2 z3) zb)
-              (vector 1 1 z3)
-              (vector (solve-t zb z4 z3) 1 zb)
-              (vector 0 (solve-t zb z1 z4) zb))))
-
-(define (polys1212 za zb z1 z2 z3 z4)
-  (define z5 (/ (+ z1 z2 z3 z4) 4))
-  (cond [(z5 . >= . zb)  (polys1212-2 za zb z1 z2 z3 z4)]
-        ; (z5 . < . za) is impossible
-        [else  (polys1212-1 za zb z1 z2 z3 z4)]))
-
-(define polys2121 (rotate-facet polys1212))
-
-;; -----------------------------------------------------------------------------
-;; 7-sided saddle
-
-(define (polys0212-1 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t za z1 z2) 0 za)
-              (vector (solve-t zb z1 z2) 0 zb)
-              (vector 1 (solve-t zb z2 z3) zb)
-              (vector 1 1 z3)
-              (vector (solve-t zb z4 z3) 1 zb)
-              (vector 0 (solve-t zb z1 z4) zb)
-              (vector 0 (solve-t za z1 z4) za))))
-
-(define (polys0212-2 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t za z1 z2) 0 za)
-              (vector (solve-t zb z1 z2) 0 zb)
-              (vector 0 (solve-t zb z1 z4) zb)
-              (vector 0 (solve-t za z1 z4) za))
-        (list (vector 1 (solve-t zb z2 z3) zb)
-              (vector 1 1 z3)
-              (vector (solve-t zb z4 z3) 1 zb))))
-
-(define (polys0212 za zb z1 z2 z3 z4)
-  (define z5 (/ (+ z1 z2 z3 z4) 4))
-  (cond [(z5 . < . zb)  (polys0212-1 za zb z1 z2 z3 z4)]
-        ; handling (z5 . < . za) separately results in a non-convex polygon
-        [else  (polys0212-2 za zb z1 z2 z3 z4)]))
-
-(define polys2021 (rotate-facet polys0212))
-(define polys1202 (rotate-facet2 polys0212))
-(define polys2120 (rotate-facet3 polys0212))
-
-(define (polys2010-1 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t zb z1 z2) 0 zb)
-              (vector (solve-t za z1 z2) 0 za)
-              (vector 1 (solve-t za z2 z3) za)
-              (vector 1 1 z3)
-              (vector (solve-t za z4 z3) 1 za)
-              (vector 0 (solve-t za z1 z4) za)
-              (vector 0 (solve-t zb z1 z4) zb))))
-
-(define (polys2010-0 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t zb z1 z2) 0 zb)
-              (vector (solve-t za z1 z2) 0 za)
-              (vector 0 (solve-t za z1 z4) za)
-              (vector 0 (solve-t zb z1 z4) zb))
-        (list (vector 1 (solve-t za z2 z3) za)
-              (vector 1 1 z3)
-              (vector (solve-t za z4 z3) 1 za))))
-
-(define (polys2010 za zb z1 z2 z3 z4)
-  (define z5 (/ (+ z1 z2 z3 z4) 4))
-  (cond [(z5 . >= . za)  (polys2010-1 za zb z1 z2 z3 z4)]
-        ; handling (z5 . >= . zb) separately results in a non-convex polygon
-        [else  (polys2010-0 za zb z1 z2 z3 z4)]))
-
-(define polys0201 (rotate-facet polys2010))
-(define polys1020 (rotate-facet2 polys2010))
-(define polys0102 (rotate-facet3 polys2010))
-
-;; -----------------------------------------------------------------------------
-;; 8-sided saddle
-
-(define (polys0202-0 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t za z1 z2) 0 za)
-              (vector (solve-t zb z1 z2) 0 zb)
-              (vector 1 (solve-t zb z2 z3) zb)
-              (vector 1 (solve-t za z2 z3) za))
-        (list (vector 0 (solve-t za z1 z4) za)
-              (vector (solve-t za z4 z3) 1 za)
-              (vector (solve-t zb z4 z3) 1 zb)
-              (vector 0 (solve-t zb z1 z4) zb))))
-
-(define (polys0202-1 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t za z1 z2) 0 za)
-              (vector (solve-t zb z1 z2) 0 zb)
-              (vector 1 (solve-t zb z2 z3) zb)
-              (vector 1 (solve-t za z2 z3) za)
-              (vector (solve-t za z4 z3) 1 za)
-              (vector (solve-t zb z4 z3) 1 zb)
-              (vector 0 (solve-t zb z1 z4) zb)
-              (vector 0 (solve-t za z1 z4) za))))
-
-(define (polys0202-2 za zb z1 z2 z3 z4)
-  (list (list (vector (solve-t za z1 z2) 0 za)
-              (vector (solve-t zb z1 z2) 0 zb)
-              (vector 0 (solve-t zb z1 z4) zb)
-              (vector 0 (solve-t za z1 z4) za))
-        (list (vector 1 (solve-t zb z2 z3) zb)
-              (vector 1 (solve-t za z2 z3) za)
-              (vector (solve-t za z4 z3) 1 za)
-              (vector (solve-t zb z4 z3) 1 zb))))
-
-(define (polys0202 za zb z1 z2 z3 z4)
-  (define z5 (/ (+ z1 z2 z3 z4) 4))
-  (cond [(z5 . < . za)  (polys0202-0 za zb z1 z2 z3 z4)]
-        [(z5 . < . zb)  (polys0202-1 za zb z1 z2 z3 z4)]
-        [else  (polys0202-2 za zb z1 z2 z3 z4)]))
-
-(define polys2020 (rotate-facet polys0202))
-
-#|
-(printf "(define polys-dispatch-table~n")
-(printf "  (vector ")
-(for* ([t1  (in-range 3)]
-       [t2  (in-range 3)]
-       [t3  (in-range 3)])
-  (printf "~n  ")
-  (for ([t4  (in-range 3)])
-    (printf " polys~a~a~a~a" t1 t2 t3 t4)))
-(printf "))")
-|#
-
-(define polys-dispatch-table
-  (vector polys0000 polys0001 polys0002 
-          polys0010 polys0011 polys0012 
-          polys0020 polys0021 polys0022 
-          polys0100 polys0101 polys0102 
-          polys0110 polys0111 polys0112 
-          polys0120 polys0121 polys0122 
-          polys0200 polys0201 polys0202 
-          polys0210 polys0211 polys0212 
-          polys0220 polys0221 polys0222 
-          polys1000 polys1001 polys1002 
-          polys1010 polys1011 polys1012 
-          polys1020 polys1021 polys1022 
-          polys1100 polys1101 polys1102 
-          polys1110 polys1111 polys1112 
-          polys1120 polys1121 polys1122 
-          polys1200 polys1201 polys1202 
-          polys1210 polys1211 polys1212 
-          polys1220 polys1221 polys1222 
-          polys2000 polys2001 polys2002 
-          polys2010 polys2011 polys2012 
-          polys2020 polys2021 polys2022 
-          polys2100 polys2101 polys2102 
-          polys2110 polys2111 polys2112 
-          polys2120 polys2121 polys2122 
-          polys2200 polys2201 polys2202 
-          polys2210 polys2211 polys2212 
-          polys2220 polys2221 polys2222))
-
-(define (do-heights->polys za zb z1 z2 z3 z4)
-  (define t1 (if (z1 . < . za) 0 (if (z1 . <= . zb) 1 2)))
-  (define t2 (if (z2 . < . za) 0 (if (z2 . <= . zb) 1 2)))
-  (define t3 (if (z3 . < . za) 0 (if (z3 . <= . zb) 1 2)))
-  (define t4 (if (z4 . < . za) 0 (if (z4 . <= . zb) 1 2)))
-  (define facet-num
-    (unsafe-fx+ (unsafe-fx+ (unsafe-fx+ (unsafe-fx* (unsafe-fx* (unsafe-fx* t1 3) 3) 3)
-                                        (unsafe-fx* (unsafe-fx* t2 3) 3))
-                            (unsafe-fx* t3 3))
-                t4))
-  (define f (vector-ref polys-dispatch-table facet-num))
-  (f za zb z1 z2 z3 z4))
-
-(defproc (heights->polys [xa real?] [xb real?] [ya real?] [yb real?]
-                         [za real?] [zb real?]
-                         [z1 real?] [z2 real?] [z3 real?] [z4 real?]
-                         ) (listof (listof (vector/c real? real? real?)))
-  (cond
-    [(= za zb z1 z2 z3 z4)  (list (list (vector xa ya z1) (vector xb ya z2)
-                                        (vector xb yb z3) (vector xa yb z4)))]
-    [else
-     (define polys (do-heights->polys za zb z1 z2 z3 z4))
-     (for/list ([poly  (in-list polys)])
-       (cond [(eq? poly 'full)  (list (vector xa ya z1) (vector xb ya z2)
-                                      (vector xb yb z3) (vector xa yb z4))]
-             [else  (for/list ([uvz  (in-list poly)])
-                      (match-define (vector u v z) uvz)
-                      (vector (unsolve-t xa xb u) (unsolve-t ya yb v) z))]))]))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/marching-utils.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/marching-utils.rkt
deleted file mode 100644
index 0b02734e9e..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/marching-utils.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base) racket/unsafe/ops
-         "utils.rkt")
-
-(provide (all-defined-out))
-
-;; Returns the interpolated distance of z from za toward zb
-;; Examples: if z = za, this returns 0.0
-;;           if z = zb, this returns 1.0
-;;           if z = (za + zb) / 2, this returns 0.5
-;; Intuitively, regard a use (solve-t z za zb) as "the point between za and zb".
-(define-syntax-rule (solve-t z za zb)
-  (/ (- z za) (- zb za)))
-
-(define-syntax-rule (unsafe-solve-t z za zb)
-  (unsafe-fl/ (unsafe-fl- z za) (unsafe-fl- zb za)))
-
-(define-syntax-rule (unsafe-unsolve-t za zb t)
-  (unsafe-fl+ (unsafe-fl* t zb) (unsafe-fl* (unsafe-fl- 1.0 t) za)))
-
-(define-syntax-rule (unsolve-t za zb t)
-  (cond [(eq? t 0)  za]
-        [(eq? t 1)  zb]
-        [else  (+ (* t zb) (* (- 1 t) za))]))
-
-(define-syntax-rule (unsafe-flavg4 z1 z2 z3 z4)
-  (unsafe-fl* 0.25 (unsafe-fl+ (unsafe-fl+ (unsafe-fl+ z1 z2) z3) z4)))
-
-(define-syntax-rule (all pred? obj ...) (and (pred? obj) ...))
-
-(define-syntax (find-failure-index stx)
-  (syntax-case stx ()
-    [(_ pred? id ...)
-     (with-syntax ([(i ...)   (build-list (length (syntax->list #'(id ...))) values)])
-       (syntax/loc stx
-         (or (and (not (pred? id)) i) ...)))]))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/math.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/math.rkt
deleted file mode 100644
index 1ef5248931..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/math.rkt
+++ /dev/null
@@ -1,587 +0,0 @@
-#lang racket/base
-
-(require racket/math racket/string racket/match racket/list racket/vector
-         racket/contract racket/unsafe/ops
-         unstable/flonum unstable/latent-contract/defthing)
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Integers
-
-(defproc (factorial [n exact-nonnegative-integer?]) exact-nonnegative-integer?
-  (if (zero? n) 1 (* n (factorial (sub1 n)))))
-
-;; ===================================================================================================
-;; Flonums
-
-(defproc (flblend [x flonum?] [y flonum?] [α flonum?]) flonum?
-  (cond [(not (flonum? x))  (raise-type-error 'flblend "flonum" 0 x y α)]
-        [(not (flonum? y))  (raise-type-error 'flblend "flonum" 1 x y α)]
-        [(not (flonum? α))  (raise-type-error 'flblend "flonum" 2 x y α)]
-        [else  (unsafe-fl+ (unsafe-fl* α x) (unsafe-fl* (unsafe-fl- 1.0 α) y))]))
-
-(defproc (flsum [f (any/c . -> . flonum?)] [xs (listof any/c)]) flonum?
-  (define ys (map f xs))
-  (cond [(not (andmap flonum? ys))  (raise-type-error 'sum "any -> flonum" f)]
-        [else  (for/fold ([sum 0.0]) ([y  (in-list ys)])
-                 (unsafe-fl+ sum y))]))
-
-(define fldistance
-  (case-lambda
-    [()   0.0]
-    [(x)  (if (flonum? x) (abs x) (raise-type-error 'fldistance "flonum" x))]
-    [(x y)  (cond [(not (flonum? x))  (raise-type-error 'fldistance "flonum" 0 x y)]
-                  [(not (flonum? y))  (raise-type-error 'fldistance "flonum" 1 x y)]
-                  [else  (unsafe-flsqrt (unsafe-fl+ (unsafe-fl* x x) (unsafe-fl* y y)))])]
-    [(x y z)  (cond [(not (flonum? x))  (raise-type-error 'fldistance "flonum" 0 x y z)]
-                    [(not (flonum? y))  (raise-type-error 'fldistance "flonum" 1 x y z)]
-                    [(not (flonum? z))  (raise-type-error 'fldistance "flonum" 2 x y z)]
-                    [else  (unsafe-flsqrt (unsafe-fl+ (unsafe-fl+ (unsafe-fl* x x) (unsafe-fl* y y))
-                                                      (unsafe-fl* z z)))])]
-    [xs  (cond [(not (andmap flonum? xs))  (raise-type-error 'fldistance "flonums" xs)]
-               [else  (unsafe-flsqrt (flsum (λ (x) (unsafe-fl* x x)) xs))])]))
-
-;; ===================================================================================================
-;; Reals
-
-(defproc (maybe-inexact->exact [x (or/c rational? #f)]) (or/c rational? #f)
-  (cond [x  (unless (rational? x)
-              (raise-type-error 'maybe-inexact->exact "rational or #f" x))
-            (inexact->exact x)]
-        [else  #f]))
-
-(define equal?*
-  (case-lambda
-    [()   #t]
-    [(x)  #t]
-    [xs   (and (equal? (car xs) (cadr xs))
-               (apply equal?* (cdr xs)))]))
-
-(define-syntax-rule (min2* x y)
-  (cond [(x . < . y)  x]
-        [(y . < . x)  y]
-        [(exact? x)   x]
-        [else  y]))
-
-(define-syntax-rule (max2* x y)
-  (cond [(x . > . y)  x]
-        [(y . > . x)  y]
-        [(exact? x)   x]
-        [else  y]))
-
-(define min*
-  (case-lambda
-    [()        +inf.0]
-    [(x)       (if (real? x) x (raise-type-error 'min* "real number" x))]
-    [(x y)     (cond [(not (real? x))  (raise-type-error 'min* "real number" 0 x y)]
-                     [(not (real? y))  (raise-type-error 'min* "real number" 1 x y)]
-                     [else  (min2* x y)])]
-    [(x . xs)  (cond [(not (real? x))  (apply raise-type-error 'min* "real number" 0 x xs)]
-                     [else  (for/fold ([m x]) ([y  (in-list xs)] [i  (in-naturals 1)])
-                              (cond [(real? y)  (min2* m y)]
-                                    [else  (apply raise-type-error 'min* "real number" i x xs)]))])]))
-
-(define max*
-  (case-lambda
-    [()        -inf.0]
-    [(x)       (if (real? x) x (raise-type-error 'max* "real number" x))]
-    [(x y)     (cond [(not (real? x))  (raise-type-error 'max* "real number" 0 x y)]
-                     [(not (real? y))  (raise-type-error 'max* "real number" 1 x y)]
-                     [else  (max2* x y)])]
-    [(x . xs)  (cond [(not (real? x))  (apply raise-type-error 'max* "real number" 0 x xs)]
-                     [else  (for/fold ([m x]) ([y  (in-list xs)] [i  (in-naturals 1)])
-                              (cond [(real? y)  (max2* m y)]
-                                    [else  (apply raise-type-error 'max* "real number" i x xs)]))])]))
-
-(defproc (blend [x real?] [y real?] [α real?]) real?
-  (cond [(not (real? x))  (raise-type-error 'blend "real number" 0 x y α)]
-        [(not (real? y))  (raise-type-error 'blend "real number" 1 x y α)]
-        [(not (real? α))  (raise-type-error 'blend "real number" 2 x y α)]
-        [else  (+ (* α x) (* (- 1 α) y))]))
-
-(defproc (atan2 [y real?] [x real?]) real?
-  (cond [(not (real? y))  (raise-type-error 'atan2 "real number" 0 y x)]
-        [(not (real? x))  (raise-type-error 'atan2 "real number" 1 y x)]
-        [(and (zero? y) (zero? x))  0]
-        [else  (atan y x)]))
-
-(defproc (sum [f (any/c . -> . real?)] [xs (listof any/c)]) real?
-  (define ys (map f xs))
-  (cond [(not (andmap real? ys))  (raise-type-error 'sum "any -> real" f)]
-        [else  (apply + ys)]))
-
-(defproc (real-modulo [x real?] [y real?]) real?
-  (cond [(not (real? x))  (raise-type-error 'real-modulo "real number" 0 x y)]
-        [(not (real? y))  (raise-type-error 'real-modulo "real number" 1 x y)]
-        [else  (- x (* y (floor (/ x y))))]))
-
-(define distance
-  (case-lambda
-    [()  0]
-    [(x)  (if (real? x) (abs x) (raise-type-error 'distance "real number" x))]
-    [(x y)  (cond [(not (real? x))  (raise-type-error 'distance "real number" 0 x y)]
-                  [(not (real? y))  (raise-type-error 'distance "real number" 1 x y)]
-                  [else  (sqrt (+ (* x x) (* y y)))])]
-    [(x y z)  (cond [(not (real? x))  (raise-type-error 'distance "real number" 0 x y z)]
-                    [(not (real? y))  (raise-type-error 'distance "real number" 1 x y z)]
-                    [(not (real? z))  (raise-type-error 'distance "real number" 2 x y z)]
-                    [else  (sqrt (+ (* x x) (* y y) (* z z)))])]
-    [xs  (cond [(not (andmap real? xs)) (raise-type-error 'distance "real numbers" xs)]
-               [else  (sqrt (sum sqr xs))])]))
-
-(define (exact∘log x)
-  (define y (log x))
-  (cond [(infinite? y)  (- (inexact->exact (log (numerator x)))
-                           (inexact->exact (log (denominator x))))]
-        [else  (inexact->exact y)]))
-
-(defproc (floor-log/base [b (and/c exact-integer? (>=/c 2))] [x (>/c 0)]) exact-integer?
-  (cond [(not (and (exact-integer? b) (b . >= . 2)))
-         (raise-type-error 'floor-log/base "exact integer >= 2" 0 b x)]
-        [(not (and (real? x) (x . > . 0)))
-         (raise-type-error 'floor-log/base "real > 0" 1 b x)]
-        [else
-         (define q (inexact->exact x))
-         (define m (floor (/ (exact∘log q) (inexact->exact (log b)))))
-         (let loop ([m m] [p  (expt b m)])
-           (cond [(q . < . p)  (loop (sub1 m) (/ p b))]
-                 [else  (define u (* p b))
-                        (cond [(q . >= . u)  (loop (add1 m) u)]
-                              [else  m])]))]))
-
-(defproc (ceiling-log/base [b (and/c exact-integer? (>=/c 2))] [x (>/c 0)]) exact-integer?
-  (- (floor-log/base b (/ (inexact->exact x)))))
-
-(defproc (polar->cartesian [θ real?] [r real?]) (vector/c real? real?)
-  (cond [(not (real? θ))  (raise-type-error 'polar->cartesian "real number" 0 θ r)]
-        [(not (real? r))  (raise-type-error 'polar->cartesian "real number" 1 θ r)]
-        [else  (let ([θ  (exact->inexact θ)]
-                     [r  (exact->inexact r)])
-                 (vector (unsafe-fl* r (unsafe-flcos θ))
-                         (unsafe-fl* r (unsafe-flsin θ))))]))
-
-(defproc (3d-polar->3d-cartesian [θ real?] [ρ real?] [r real?]) (vector/c real? real? real?)
-  (cond [(not (real? θ))  (raise-type-error '3d-polar->3d-cartesian "real number" 0 θ ρ r)]
-        [(not (real? ρ))  (raise-type-error '3d-polar->3d-cartesian "real number" 1 θ ρ r)]
-        [(not (real? r))  (raise-type-error '3d-polar->3d-cartesian "real number" 2 θ ρ r)]
-        [else  (let ([θ  (exact->inexact θ)]
-                     [ρ  (exact->inexact ρ)]
-                     [r  (exact->inexact r)])
-                 (let ([cos-ρ  (unsafe-flcos ρ)])
-                   (vector (unsafe-fl* r (unsafe-fl* (unsafe-flcos θ) cos-ρ))
-                           (unsafe-fl* r (unsafe-fl* (unsafe-flsin θ) cos-ρ))
-                           (unsafe-fl* r (unsafe-flsin ρ)))))]))
-
-;; ===================================================================================================
-;; Vectors
-
-(define vector-andmap
-  (case-lambda
-    [(f v)  (let/ec break
-              (for ([e  (in-vector v)])
-                (unless (f e) (break #f)))
-              #t)]
-    [(f v . vs)  (define ns (cons (vector-length v) (map vector-length vs)))
-                 (unless (apply equal?* ns)
-                   (error 'vector-andmap "all vectors must have same size; arguments were ~e ~e ~e"
-                          f v (string-join (map (λ (v) (format "~e" v)) vs))))
-                 (let/ec break
-                   (define ess (apply map list (map vector->list vs)))
-                   (for ([e  (in-vector v)] [es  (in-list ess)])
-                     (when (not (apply f e es)) (break #f)))
-                   #t)]))
-
-(define vector-ormap
-  (case-lambda
-    [(f v)  (let/ec break
-              (for ([e  (in-vector v)])
-                (when (f e) (break #t)))
-              #f)]
-    [(f v . vs)  (define ns (cons (vector-length v) (map vector-length vs)))
-                 (unless (apply equal?* ns)
-                   (error 'vector-andmap "all vectors must have same size; arguments were ~e ~e ~e"
-                          f v (string-join (map (λ (v) (format "~e" v)) vs))))
-                 (let/ec break
-                   (define ess (apply map list (map vector->list vs)))
-                   (for ([e  (in-vector v)] [es  (in-list ess)])
-                     (when (apply f e es) (break #t)))
-                   #f)]))
-
-(defproc (vcross [v1 (vector/c real? real? real?)] [v2 (vector/c real? real? real?)]
-                 ) (vector/c real? real? real?)
-  (match v1
-    [(vector (? real? x1) (? real? y1) (? real? z1))
-     (match v2
-       [(vector (? real? x2) (? real? y2) (? real? z2))
-        (vector (- (* y1 z2) (* z1 y2))
-                (- (* z1 x2) (* x1 z2))
-                (- (* x1 y2) (* y1 x2)))]
-       [_  (raise-type-error 'vcross "vector of 3 real numbers" 1 v1 v2)])]
-    [_  (raise-type-error 'vcross "vector of 3 real numbers" 0 v1 v2)]))
-
-(defproc (vcross2 [v1 (vector/c real? real?)] [v2 (vector/c real? real?)]) real?
-  (match v1
-    [(vector (? real? x1) (? real? y1))
-     (match v2
-       [(vector (? real? x2) (? real? y2))  (- (* x1 y2) (* y1 x2))]
-       [_  (raise-type-error 'vcross "vector of 2 real numbers" 1 v1 v2)])]
-    [_  (raise-type-error 'vcross "vector of 2 real numbers" 0 v1 v2)]))
-
-(define-syntax-rule (vmap name f v)
-  (let ()
-    (unless (vector? v)
-      (raise-type-error name "vector of real numbers" v))
-    (define n (vector-length v))
-    (for/vector #:length n ([x  (in-vector v)])
-      (cond [(real? x)    (f x)]
-            [else  (raise-type-error name "vector of real numbers" v)]))))
-
-(define-syntax-rule (unrolled-vmap name f v)
-  (let ()
-    (match v
-      [(vector (? real? x) (? real? y))              (vector (f x) (f y))]
-      [(vector (? real? x) (? real? y) (? real? z))  (vector (f x) (f y) (f z))]
-      [_  (vmap name f v)])))
-
-(define-syntax-rule (vmap2 name f v1 v2)
-  (let ()
-    (unless (vector? v1)
-      (raise-type-error name "vector of real numbers" 0 v1 v2))
-    (unless (vector? v2)
-      (raise-type-error name "vector of real numbers" 1 v1 v2))
-    (define n (vector-length v1))
-    (unless (= n (vector-length v2))
-      (raise-type-error name (format "vector of ~a real numbers" n) 1 v1 v2))
-    (for/vector #:length n ([x  (in-vector v1)] [y  (in-vector v2)])
-      (if (real? x)
-          (if (real? y)
-              (f x y)
-              (raise-type-error name "vector of real numbers" 1 v1 v2))
-          (raise-type-error name "vector of real numbers" 0 v1 v2)))))
-
-(define-syntax-rule (unrolled-vmap2 name f v1 v2)
-  (match v1
-    [(vector (? real? x1) (? real? y1))
-     (match v2
-       [(vector (? real? x2) (? real? y2))  (vector (f x1 x2) (f y1 y2))]
-       [_  (raise-type-error name "vector of 2 real numbers" 1 v1 v2)])]
-    [(vector (? real? x1) (? real? y1) (? real? z1))
-     (match v2
-       [(vector (? real? x2) (? real? y2) (? real? z2))  (vector (f x1 x2) (f y1 y2) (f z1 z2))]
-       [_  (raise-type-error name "vector of 3 real numbers" 1 v1 v2)])]
-    [_  (vmap2 name f v1 v2)]))
-
-(defproc (v+ [v1 (vectorof real?)] [v2 (vectorof real?)]) (vectorof real?)
-  (unrolled-vmap2 'v+ + v1 v2))
-
-(defproc (v- [v1 (vectorof real?)] [v2 (vectorof real?)]) (vectorof real?)
-  (unrolled-vmap2 'v- - v1 v2))
-
-(defproc (vneg [v (vectorof real?)]) (vectorof real?)
-  (unrolled-vmap 'vneg - v))
-
-(defproc (v* [v (vectorof real?)] [c real?]) (vectorof real?)
-  (cond [(real? c)  (define-syntax-rule (f x) (* x c))
-                    (unrolled-vmap 'v* f v)]
-        [else  (raise-type-error 'v* "real" 1 v c)]))
-
-(defproc (v/ [v (vectorof real?)] [c real?]) (vectorof real?)
-  (cond [(real? c)  (define-syntax-rule (f x) (/ x c))
-                    (unrolled-vmap 'v/ f v)]
-        [else  (raise-type-error 'v/ "real" 1 v c)]))
-
-(defproc (vmag^2 [v (vectorof real?)]) real?
-  (match v
-    [(vector (? real? x) (? real? y))              (+ (* x x) (* y y))]
-    [(vector (? real? x) (? real? y) (? real? z))  (+ (* x x) (* y y) (* z z))]
-    [_  (unless (vector? v)
-          (raise-type-error 'vmag^2 "vector of real numbers" v))
-        (for/fold ([mag  0]) ([x  (in-vector v)])
-          (+ mag (cond [(real? x)    (* x x)]
-                       [else  (raise-type-error 'vmag^2 "vector of real numbers" v)])))]))
-
-(defproc (vmag [v (vectorof real?)]) real?
-  (sqrt (vmag^2 v)))
-
-(defproc (vnormalize [v (vectorof real?)]) (vectorof real?)
-  (match v
-    [(vector (? real? x) (? real? y))              (define m (sqrt (+ (* x x) (* y y))))
-                                                   (if (= m 0) v (vector (/ x m) (/ y m)))]
-    [(vector (? real? x) (? real? y) (? real? z))  (define m (sqrt (+ (* x x) (* y y) (* z z))))
-                                                   (if (= m 0) v (vector (/ x m) (/ y m) (/ z m)))]
-    [_  (define m (vmag v))
-        (if (= m 0) v (v/ v m))]))
-
-(defproc (vdot [v1 (vectorof real?)] [v2 (vectorof real?)]) real?
-  (match v1
-    [(vector (? real? x1) (? real? y1))
-     (match v2
-       [(vector (? real? x2) (? real? y2))  (+ (* x1 x2) (* y1 y2))]
-       [_  (raise-type-error 'vdot "vector of 2 real numbers" 1 v1 v2)])]
-    [(vector (? real? x1) (? real? y1) (? real? z1))
-     (match v2
-       [(vector (? real? x2) (? real? y2) (? real? z2))  (+ (* x1 x2) (* y1 y2) (* z1 z2))]
-       [_  (raise-type-error 'vdot "vector of 3 real numbers" 1 v1 v2)])]
-    [_  (unless (= (vector-length v1) (vector-length v2))
-          (raise-type-error 'vdot (format "vector of ~a real numbers" (vector-length v1)) 1 v1 v2))
-        (for/fold ([dot  0]) ([x1  (in-vector v1)] [x2  (in-vector v2)])
-          (if (real? x1)
-              (if (real? x2)
-                  (+ dot (* x1 x2))
-                  (raise-type-error 'vdot "vector of real numbers" 1 v1 v2))
-              (raise-type-error 'vdot "vector of real numbers" 0 v1 v2)))]))
-
-(defproc (vcos-angle [v1 (vectorof real?)] [v2 (vectorof real?)]) real?
-  (define d (vdot v1 v2))
-  (cond [(= d 0)  0]
-        [else     (/ d (vmag v1) (vmag v2))]))
-
-(defproc (vrational? [v (vectorof real?)]) boolean?
-  (match v
-    [(vector (? rational? x) (? rational? y))  #t]
-    [(vector (? rational? x) (? rational? y) (? rational? z))  #t]
-    [(? vector?)  (vector-andmap rational? v)]
-    [_  (raise-type-error 'vrational? "vector" v)]))
-
-(defproc (v= [v1 (vectorof real?)] [v2 (vectorof real?)]) boolean?
-  (match v1
-    [(vector (? real? x1) (? real? y1))
-     (match v2
-       [(vector (? real? x2) (? real? y2))  (and (= x1 x2) (= y1 y2))]
-       [_  (raise-type-error 'v= "vector of 2 real numbers" 1 v1 v2)])]
-    [(vector (? real? x1) (? real? y1) (? real? z1))
-     (match v2
-       [(vector (? real? x2) (? real? y2) (? real? z2))  (and (= x1 x2) (= y1 y2) (= z1 z2))]
-       [_  (raise-type-error 'v= "vector of 3 real numbers" 1 v1 v2)])]
-    [_  (unless (= (vector-length v1) (vector-length v2))
-          (raise-type-error 'v= (format "vector of ~a real numbers" (vector-length v1)) 1 v1 v2))
-        (let/ec break
-          (for ([x1  (in-vector v1)] [x2  (in-vector v2)])
-            (if (real? x1)
-                (if (real? x2)
-                    (unless (= x1 x2) (break #f))
-                    (raise-type-error 'v= "vector of real numbers" 1 v1 v2))
-                (raise-type-error 'v= "vector of real numbers" 0 v1 v2)))
-          #t)]))
-
-(defproc (vcenter [vs (listof (vectorof real?))]) (vectorof real?)
-  (match vs
-    [(list (vector xs ys) ...)
-     (define x-min (apply min* xs))
-     (define x-max (apply max* xs))
-     (define y-min (apply min* ys))
-     (define y-max (apply max* ys))
-     (vector (* 1/2 (+ x-min x-max)) (* 1/2 (+ y-min y-max)))]
-    [(list (vector xs ys zs) ...)
-     (define x-min (apply min* xs))
-     (define x-max (apply max* xs))
-     (define y-min (apply min* ys))
-     (define y-max (apply max* ys))
-     (define z-min (apply min* zs))
-     (define z-max (apply max* zs))
-     (vector (* 1/2 (+ x-min x-max)) (* 1/2 (+ y-min y-max)) (* 1/2 (+ z-min z-max)))]
-    [_
-     (define xss (apply vector-map list vs))
-     (define mins (vector-map (λ (xs) (apply min xs)) xss))
-     (define maxs (vector-map (λ (xs) (apply max xs)) xss))
-     (unrolled-vmap2 'vcenter (λ (x1 x2) (* 1/2 (+ x1 x2))) mins maxs)]))
-
-(define (vrational-sublists vs)
-  (define res
-    (let loop ([vs vs])
-      (cond [(null? vs)  (list null)]
-            [(vrational? (car vs))  (define rst (loop (cdr vs)))
-                                    (cons (cons (car vs) (car rst)) (cdr rst))]
-            [else  (cons null (loop (cdr vs)))])))
-  (cond [(and (not (null? res)) (null? (car res)))  (cdr res)]
-        [else  res]))
-
-(define (remove-degenerate-edges vs)
-  (cond
-    [(empty? vs)  empty]
-    [else
-     (let*-values ([(last vs)
-                    (for/fold ([last  (first vs)] [vs  (list (first vs))])
-                      ([v  (in-list (rest vs))])
-                      (cond [(v= last v)  (values v vs)]
-                            [else         (values v (cons v vs))]))]
-                   [(vs)  (reverse vs)])
-       (cond [(v= last (first vs))  (rest vs)]
-             [else  vs]))]))
-
-(define default-normal (vector 0.0 -1.0 0.0))
-
-(define (vnormal vs)
-  (let ([vs  (remove-degenerate-edges vs)])
-    (cond
-      [((length vs) . < . 3)  default-normal]
-      [else
-       (let ([vs  (append vs (take vs 2))])
-         (define norm
-           (for/fold ([norm  (vector 0.0 0.0 0.0)]) ([v1  (in-list vs)]
-                                                     [v2  (in-list (rest vs))]
-                                                     [v3  (in-list (rest (rest vs)))])
-             (v+ norm (vcross (v- v3 v2) (v- v1 v2)))))
-         (define m (vmag norm))
-         (if (m . > . 0) (v/ norm m) default-normal))])))
-
-;; ===================================================================================================
-;; Intervals
-
-(define-syntax-rule (maybe-min x y)
-  (if x (if y (min* x y) x)
-      (if y y #f)))
-
-(define-syntax-rule (maybe-max x y)
-  (if x (if y (max* x y) x)
-      (if y y #f)))
-
-(define (maybe-real? x)
-  (or (real? x) (not x)))
-
-(struct ivl (min max) #:transparent
-  #:guard (λ (a b _)
-            (cond [(or (and a (nan? a)) (and b (nan? b)))  (values +nan.0 +nan.0)]
-                  [(and a b)  (values (min* a b) (max* a b))]
-                  [else  (values a b)])))
-
-(defthing empty-ivl ivl? (ivl +nan.0 +nan.0))
-(defthing unknown-ivl ivl? (ivl #f #f))
-
-(defproc (ivl-empty? [i ivl?]) boolean?
-  (define a (ivl-min i))
-  (and a (nan? a)))
-
-(defproc (ivl-known? [i ivl?]) boolean?
-  (match-define (ivl a b) i)
-  (and a b #t))
-
-(defproc (ivl-rational? [i ivl?]) boolean?
-  (match-define (ivl a b) i)
-  (and (rational? a) (rational? b)))
-
-(defproc (rational-ivl? [i any/c]) boolean?
-  (and (ivl? i) (ivl-rational? i)))
-
-(defproc (ivl-singular? [i ivl?]) boolean?
-  (match-define (ivl a b) i)
-  (and a b (= a b)))
-
-(defproc (ivl-length [i ivl?]) (or/c real? #f)
-  (match-define (ivl a b) i)
-  (if (and a b) (- b a) #f))
-
-(defproc (ivl-center [i ivl?]) (or/c real? #f)
-  (match-define (ivl a b) i)
-  (if (and a b) (* 1/2 (+ a b)) #f))
-
-(defproc (ivl-zero-length? [i ivl?]) boolean?
-  (or (ivl-empty? i) (ivl-singular? i)))
-
-(defproc (ivl-inexact->exact [i ivl?]) ivl?
-  (match-define (ivl a b) i)
-  (ivl (and a (if (nan? a) a (inexact->exact a)))
-       (and b (if (nan? b) b (inexact->exact b)))))
-
-(defproc (ivl-contains? [i ivl?] [x real?]) boolean?
-  (match-define (ivl a b) i)
-  (and a b (x . >= . a) (x . <= . b)))
-
-(define (ivl-meet2 i1 i2) ivl?
-  (cond [(or (ivl-empty? i1) (ivl-empty? i2))  empty-ivl]
-        [else
-         (match-define (ivl a1 b1) i1)
-         (match-define (ivl a2 b2) i2)
-         (define a (maybe-max a1 a2))
-         (define b (maybe-min b1 b2))
-         (if (and a b (a . > . b)) empty-ivl (ivl a b))]))
-
-(define (ivl-meet . is)
-  (for/fold ([res  unknown-ivl]) ([i  (in-list is)])
-    (ivl-meet2 res i)))
-
-(define (ivl-join2 i1 i2)
-  (cond [(ivl-empty? i1)  i2]
-        [(ivl-empty? i2)  i1]
-        [else
-         (match-define (ivl a1 b1) i1)
-         (match-define (ivl a2 b2) i2)
-         (ivl (maybe-min a1 a2) (maybe-max b1 b2))]))
-
-(define (ivl-join . is)
-  (for/fold ([res  empty-ivl]) ([i  (in-list is)])
-    (ivl-join2 res i)))
-
-(defproc (ivl-translate [i ivl?] [d real?]) ivl?
-  (match-define (ivl a b) i)
-  (ivl (and a (+ a d)) (and b (+ b d))))
-
-(defproc (bounds->intervals [xs (listof real?)]) (listof ivl?)
-  (cond [((length xs) . < . 2)  (raise-type-error 'bounds->intervals "list with length >= 2" xs)]
-        [else
-         (for/list ([x1  (in-list xs)]
-                    [x2  (in-list (rest xs))])
-           (ivl x1 x2))]))
-
-(defproc (clamp-real [x real?] [i ivl?]) real?
-  (match-define (ivl a b) i)
-  (max (min x b) a))
-
-;; ===================================================================================================
-;; Rectangles
-
-(defproc (empty-rect [n exact-nonnegative-integer?]) (vectorof ivl?)
-  (make-vector n empty-ivl))
-
-(defproc (unknown-rect [n exact-nonnegative-integer?]) (vectorof ivl?)
-  (make-vector n unknown-ivl))
-
-(defproc (bounding-rect [vs (listof (vectorof ivl?))]) (vectorof ivl?)
-  (define xss (apply vector-map list vs))
-  (define vmin (vector-map (λ (xs) (apply min xs)) xss))
-  (define vmax (vector-map (λ (xs) (apply max xs)) xss))
-  (vector-map ivl vmin vmax))
-
-(defproc (rect-empty? [r (vectorof ivl?)]) boolean?
-  (vector-ormap ivl-empty? r))
-
-(defproc (rect-known? [r (vectorof ivl?)]) boolean?
-  (vector-andmap ivl-known? r))
-
-(defproc (rect-rational? [r (vectorof ivl?)]) boolean?
-  (vector-andmap ivl-rational? r))
-
-(defproc (rational-rect? [r any/c]) boolean?
-  (and (vector? r) (vector-andmap rational-ivl? r)))
-
-(defproc (rect-area [r (vectorof ivl?)]) (or/c real? #f)
-  (let/ec break
-    (for/fold ([area 1]) ([i  (in-vector r)])
-      (define len (ivl-length i))
-      (when (or (not len) (zero? len)) (break len))
-      (* area (ivl-length i)))))
-
-(defproc (rect-center [r (vectorof ivl?)]) (vectorof real?)
-  (vector-map ivl-center r))
-
-(defproc (rect-zero-area? [r (vectorof ivl?)]) boolean?
-  (vector-ormap ivl-zero-length? r))
-
-(defproc (rect-singular? [r (vectorof ivl?)]) boolean?
-  (vector-andmap ivl-singular? r))
-
-(defproc (rect-inexact->exact [r (vectorof ivl?)]) (vectorof ivl?)
-  (vector-map ivl-inexact->exact r))
-
-(defproc (rect-contains? [r (vectorof ivl?)] [v (vectorof real?)]) boolean?
-  (vector-andmap ivl-contains? r v))
-
-(define (rect-meet . rs)
-  (apply vector-map ivl-meet rs))
-
-(define (rect-join . rs)
-  (apply vector-map ivl-join rs))
-
-(defproc (rect-translate [r (vectorof ivl?)] [v (vectorof real?)]) (vectorof ivl?)
-  (vector-map ivl-translate r v))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/nonrenderer.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/nonrenderer.rkt
deleted file mode 100644
index 5b44d35b7f..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/nonrenderer.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket/base
-
-(require racket/list racket/contract unstable/latent-contract/defthing
-         "math.rkt"
-         "contract.rkt"
-         "ticks.rkt"
-         "plot-element.rkt")
-
-(provide (all-defined-out))
-
-(define ((x-ticks-fun ts far?) r)
-  (let-values ([(ts far-ts)  (if far? (values empty ts) (values ts empty))])
-    (cond [(= (vector-length r) 2)  (values ts far-ts empty empty)]
-          [(= (vector-length r) 3)  (values ts far-ts empty empty empty empty)]
-          [else  (raise-type-error 'x-ticks-fun "2- or 3-vector of ivls" r)])))
-
-(define ((y-ticks-fun ts far?) r)
-  (let-values ([(ts far-ts)  (if far? (values empty ts) (values ts empty))])
-    (cond [(= (vector-length r) 2)  (values empty empty ts far-ts)]
-          [(= (vector-length r) 3)  (values empty empty ts far-ts empty empty)]
-          [else  (raise-type-error 'y-ticks-fun "2- or 3-vector of ivls" r)])))
-
-(define ((z-ticks-fun ts far?) r)
-  (let-values ([(ts far-ts)  (if far? (values empty ts) (values ts empty))])
-    (cond [(= (vector-length r) 3)  (values empty empty empty empty ts far-ts)]
-          [else  (raise-type-error 'z-ticks-fun "3-vector of ivls" r)])))
-
-(defproc (x-ticks [ts (listof tick?)] [#:far? far? boolean? #f]) nonrenderer?
-  (nonrenderer #f #f (x-ticks-fun ts far?)))
-
-(defproc (y-ticks [ts (listof tick?)] [#:far? far? boolean? #f]) nonrenderer?
-  (nonrenderer #f #f (y-ticks-fun ts far?)))
-
-(defproc (z-ticks [ts (listof tick?)] [#:far? far? boolean? #f]) nonrenderer?
-  (nonrenderer #f #f (z-ticks-fun ts far?)))
-
-(defproc (invisible-rect [x-min (or/c rational? #f)] [x-max (or/c rational? #f)]
-                         [y-min (or/c rational? #f)] [y-max (or/c rational? #f)]
-                         ) nonrenderer?
-  (nonrenderer (vector (ivl x-min x-max) (ivl y-min y-max)) #f #f))
-
-(defproc (invisible-rect3d [x-min (or/c rational? #f)] [x-max (or/c rational? #f)]
-                           [y-min (or/c rational? #f)] [y-max (or/c rational? #f)]
-                           [z-min (or/c rational? #f)] [z-max (or/c rational? #f)]
-                           ) nonrenderer?
-  (nonrenderer (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max)) #f #f))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/parameters.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/parameters.rkt
deleted file mode 100644
index e8984c1d8d..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/parameters.rkt
+++ /dev/null
@@ -1,323 +0,0 @@
-#lang racket/base
-
-;; Parameters that control the look and behavior of plots.
-
-(require racket/contract unstable/parameter-group unstable/latent-contract/defthing
-         racket/class racket/draw
-         "contract.rkt"
-         "draw.rkt"
-         "axis-transform.rkt"
-         "ticks.rkt"
-         "math.rkt")
-
-(provide (all-defined-out))
-
-(defparam plot-deprecation-warnings? boolean? #f)
-
-;; ===================================================================================================
-;; General plot parameters
-
-;; General appearance
-
-(defparam plot-width exact-positive-integer? 400)
-(defparam plot-height exact-positive-integer? 400)
-(defparam plot-foreground color plot-color/c 0)
-(defparam plot-background color plot-color/c 0)
-(defparam plot-foreground-alpha alpha (real-in 0 1) 1)
-(defparam plot-background-alpha alpha (real-in 0 1) 1)
-(defparam plot-line-width width (>=/c 0) 1)
-(defparam plot-tick-size (>=/c 0) 10)
-(defparam plot-font-size size (>=/c 0) 11)
-(defparam plot-font-face face (or/c string? #f) #f)
-(defparam plot-font-family family font-family/c 'roman)
-(defparam plot-legend-anchor anchor anchor/c 'top-left)
-(defparam plot-legend-box-alpha alpha (real-in 0 1) 2/3)
-(defparam plot-animating? boolean? #f)
-
-(defparam plot-x-axis? boolean? #t)
-(defparam plot-y-axis? boolean? #t)
-(defparam plot-z-axis? boolean? #t)
-
-(defparam plot-x-far-axis? boolean? #t)
-(defparam plot-y-far-axis? boolean? #t)
-(defparam plot-z-far-axis? boolean? #t)
-
-(defparam plot-x-tick-label-angle angle real? 0)
-(defparam plot-y-tick-label-angle angle real? 0)
-(defparam plot-x-far-tick-label-angle angle real? 0)
-(defparam plot-y-far-tick-label-angle angle real? 0)
-
-(defparam plot-x-tick-label-anchor anchor anchor/c 'top)
-(defparam plot-y-tick-label-anchor anchor anchor/c 'right)
-(defparam plot-x-far-tick-label-anchor anchor anchor/c 'bottom)
-(defparam plot-y-far-tick-label-anchor anchor anchor/c 'left)
-
-(defparam plot-decorations? boolean? #t)
-
-(define-parameter-group plot-axes?
-  (plot-x-axis? plot-x-far-axis?
-   plot-y-axis? plot-y-far-axis?
-   plot-z-axis? plot-z-far-axis?)
-  #:struct list)
-
-(define-parameter-group plot-tick-labels
-  (plot-x-tick-label-anchor
-   plot-x-tick-label-angle
-   plot-x-far-tick-label-anchor
-   plot-x-far-tick-label-angle
-   plot-y-tick-label-anchor
-   plot-y-tick-label-angle
-   plot-y-far-tick-label-anchor
-   plot-y-far-tick-label-angle))
-
-(define-parameter-group plot-appearance
-   (plot-width
-    plot-height
-    plot-foreground plot-foreground-alpha
-    plot-background plot-background-alpha
-    plot-line-width plot-tick-size
-    plot-font-size plot-font-face plot-font-family
-    plot-legend-anchor plot-legend-box-alpha
-    plot-axes? plot-tick-labels
-    plot-decorations?
-    plot-animating?))
-
-(defproc (pen-gap) real? #:document-body
-  (max 1 (* 2 (plot-line-width))))
-
-(defproc (animated-samples [samples (and/c exact-integer? (>=/c 2))]
-                           ) (and/c exact-integer? (>=/c 2)) #:document-body
-  (cond [(plot-animating?)  (max 2 (ceiling (* 1/4 samples)))]
-        [else  samples]))
-
-;; 3D-specific appearance
-
-(defparam plot3d-samples (and/c exact-integer? (>=/c 2)) 41)
-(defparam plot3d-angle real? 30)
-(defparam plot3d-altitude real? 60)
-(defparam plot3d-ambient-light (real-in 0 1) 2/3)
-(defparam plot3d-diffuse-light? boolean? #t)
-(defparam plot3d-specular-light? boolean? #t)
-
-(define-parameter-group plot3d-appearance
-  (plot3d-samples
-   plot3d-angle
-   plot3d-altitude
-   plot3d-ambient-light
-   plot3d-diffuse-light?
-   plot3d-specular-light?))
-
-;; Output
-
-(define default-plot-ps-setup (new ps-setup%))
-(send default-plot-ps-setup set-margin 0 0)
-(send default-plot-ps-setup set-scaling 1 1)
-
-(defparam plot-new-window? boolean? #f)
-(defparam plot-jpeg-quality (integer-in 0 100) 100)
-(defparam plot-ps/pdf-interactive? boolean? #f)
-(defparam plot-ps-setup (is-a?/c ps-setup%) default-plot-ps-setup)
-
-(define-parameter-group plot-output
-  (plot-new-window? plot-jpeg-quality plot-ps/pdf-interactive? plot-ps-setup))
-
-;; Labels
-
-(defparam plot-title (or/c string? #f) #f)
-(defparam plot-x-label (or/c string? #f) "x axis")
-(defparam plot-y-label (or/c string? #f) "y axis")
-(defparam plot-z-label (or/c string? #f) #f)
-
-(defparam plot-x-far-label (or/c string? #f) #f)
-(defparam plot-y-far-label (or/c string? #f) #f)
-(defparam plot-z-far-label (or/c string? #f) #f)
-
-(define-parameter-group plot-labels
-  (plot-title
-   plot-x-label plot-y-label plot-z-label
-   plot-x-far-label plot-y-far-label plot-z-far-label))
-
-;; Axes: transform, ticks
-
-(defparam plot-x-transform axis-transform/c id-transform)
-(defparam plot-y-transform axis-transform/c id-transform)
-(defparam plot-z-transform axis-transform/c id-transform)
-
-(defparam plot-x-ticks ticks? (linear-ticks))
-(defparam plot-y-ticks ticks? (linear-ticks))
-(defparam plot-z-ticks ticks? (linear-ticks))
-(defparam plot-d-ticks ticks? (linear-ticks))
-(defparam plot-r-ticks ticks? (linear-ticks))
-
-(defparam plot-x-far-ticks ticks? (ticks-mimic plot-x-ticks))
-(defparam plot-y-far-ticks ticks? (ticks-mimic plot-y-ticks))
-(defparam plot-z-far-ticks ticks? (ticks-mimic plot-z-ticks))
-
-(struct axis (transform ticks far-ticks) #:transparent)
-(define-parameter-group plot-x-axis (plot-x-transform plot-x-ticks plot-x-far-ticks) #:struct axis)
-(define-parameter-group plot-y-axis (plot-y-transform plot-y-ticks plot-y-far-ticks) #:struct axis)
-(define-parameter-group plot-z-axis (plot-z-transform plot-z-ticks plot-z-far-ticks) #:struct axis)
-
-(define-parameter-group plot-axes (plot-x-axis plot-y-axis plot-z-axis plot-d-ticks plot-r-ticks)
-  #:struct list)
-
-;; ===================================================================================================
-
-(define-parameter-group plot-parameters
-  (plot-appearance
-   plot3d-appearance
-   plot-labels
-   plot-output
-   plot-axes))
-
-;; ===================================================================================================
-;; Renderer-specific parameters
-
-;; Lines
-
-(defparam line-samples (and/c exact-integer? (>=/c 2)) 500)
-(defparam line-color plot-color/c 1)
-(defparam line-width (>=/c 0) 1)
-(defparam line-style plot-pen-style/c 'solid)
-(defparam line-alpha (real-in 0 1) 1)
-
-;; Intervals
-
-(defparam interval-color plot-color/c 3)
-(defparam interval-style plot-brush-style/c 'solid)
-(defparam interval-line1-color plot-color/c 3)
-(defparam interval-line1-width (>=/c 0) 1)
-(defparam interval-line1-style plot-pen-style/c 'solid)
-(defparam interval-line2-color plot-color/c 3)
-(defparam interval-line2-width (>=/c 0) 1)
-(defparam interval-line2-style plot-pen-style/c 'solid)
-(defparam interval-alpha (real-in 0 1) 3/4)
-
-;; Points
-
-(defparam point-sym point-sym/c 'circle)
-(defparam point-color plot-color/c 0)
-(defparam point-size (>=/c 0) 6)
-(defparam point-line-width (>=/c 0) 1)
-(defparam point-alpha (real-in 0 1) 1)
-
-;; Vector fields
-
-(defparam vector-field-samples exact-positive-integer? 20)
-(defparam vector-field-color plot-color/c 1)
-(defparam vector-field-line-width (>=/c 0) 2/3)
-(defparam vector-field-line-style plot-pen-style/c 'solid)
-(defparam vector-field-scale (or/c real? (one-of/c 'auto 'normalized)) 'auto)
-(defparam vector-field-alpha (real-in 0 1) 1)
-(defparam vector-field3d-samples exact-positive-integer? 9)
-
-;; Error bars
-
-(defparam error-bar-width (>=/c 0) 6)
-(defparam error-bar-color plot-color/c 0)
-(defparam error-bar-line-width (>=/c 0) 1)
-(defparam error-bar-line-style plot-pen-style/c 'solid)
-(defparam error-bar-alpha (real-in 0 1) 2/3)
-
-;; Contours
-
-(defproc (default-contour-colors [zs (listof real?)]) (listof plot-color/c) #:document-body
-  (color-seq* (list (->pen-color 5) (->pen-color 0) (->pen-color 1))
-              (length zs)))
-
-(defproc (default-contour-fill-colors [z-ivls (listof ivl?)]) (listof plot-color/c) #:document-body
-  (color-seq* (list (->brush-color 5) (->brush-color 0) (->brush-color 1))
-              (length z-ivls)))
-
-(defparam contour-samples (and/c exact-integer? (>=/c 2)) 51)
-(defparam contour-levels (or/c 'auto exact-positive-integer? (listof real?)) 'auto)
-(defparam contour-colors (plot-colors/c (listof real?)) default-contour-colors)
-(defparam contour-widths (pen-widths/c (listof real?)) '(1))
-(defparam contour-styles (plot-pen-styles/c (listof real?)) '(solid long-dash))
-(defparam contour-alphas (alphas/c (listof real?)) '(1))
-
-(defparam contour-interval-colors (plot-colors/c (listof ivl?)) default-contour-fill-colors)
-(defparam contour-interval-styles (plot-brush-styles/c (listof ivl?)) '(solid))
-(defparam contour-interval-alphas (alphas/c (listof ivl?)) '(1))
-
-;; Rectangles
-
-(defparam rectangle-color plot-color/c 3)
-(defparam rectangle-style plot-brush-style/c 'solid)
-(defparam rectangle-line-color plot-color/c 3)
-(defparam rectangle-line-width (>=/c 0) 1)
-(defparam rectangle-line-style plot-pen-style/c 'solid)
-(defparam rectangle-alpha (real-in 0 1) 1)
-(defparam rectangle3d-line-width (>=/c 0) 1/3)
-
-(defparam discrete-histogram-gap (real-in 0 1) 1/8)
-(defparam discrete-histogram-skip (>=/c 0) 1)
-(defparam discrete-histogram-invert? boolean? #f)
-
-(defparam stacked-histogram-colors (plot-colors/c nat/c) (λ (n) (build-list n add1)))
-(defparam stacked-histogram-styles (plot-brush-styles/c nat/c) '(solid))
-(defparam stacked-histogram-line-colors (plot-colors/c nat/c) (stacked-histogram-colors))
-(defparam stacked-histogram-line-widths (pen-widths/c nat/c) '(1))
-(defparam stacked-histogram-line-styles (plot-pen-styles/c nat/c) '(solid))
-(defparam stacked-histogram-alphas (alphas/c nat/c) '(1))
-
-;; Decorations
-
-(defparam x-axis-ticks? boolean? #t)
-(defparam y-axis-ticks? boolean? #t)
-(defparam z-axis-ticks? boolean? #t)
-
-(defparam x-axis-labels? boolean? #f)
-(defparam y-axis-labels? boolean? #f)
-(defparam z-axis-labels? boolean? #f)
-
-(defparam x-axis-far? boolean? #f)
-(defparam y-axis-far? boolean? #f)
-(defparam z-axis-far? boolean? #f)
-
-(defparam x-axis-alpha (real-in 0 1) 1)
-(defparam y-axis-alpha (real-in 0 1) 1)
-(defparam z-axis-alpha (real-in 0 1) 1)
-
-(defparam polar-axes-number exact-nonnegative-integer? 12)
-(defparam polar-axes-ticks? boolean? #t)
-(defparam polar-axes-labels? boolean? #t)
-(defparam polar-axes-alpha (real-in 0 1) 1/2)
-
-(defparam label-anchor anchor/c 'left)
-(defparam label-angle real? 0)
-(defparam label-alpha (real-in 0 1) 1)
-(defparam label-point-size (>=/c 0) 4)
-
-;; Surfaces
-
-(defparam surface-color plot-color/c 0)
-(defparam surface-style plot-brush-style/c 'solid)
-(defparam surface-line-color plot-color/c 0)
-(defparam surface-line-width (>=/c 0) 1/3)
-(defparam surface-line-style plot-pen-style/c 'solid)
-(defparam surface-alpha (real-in 0 1) 1)
-
-;; Contour surfaces
-
-(defparam contour-interval-line-colors (plot-colors/c (listof ivl?)) '(0))
-(defparam contour-interval-line-widths (pen-widths/c (listof ivl?)) '(1/3))
-(defparam contour-interval-line-styles (plot-pen-styles/c (listof ivl?)) '(solid))
-
-;; Isosurfaces
-
-(defproc (default-isosurface-colors [zs (listof real?)]) (listof plot-color/c) #:document-body
-  (color-seq* (list (->brush-color 5) (->brush-color 0) (->brush-color 1))
-              (length zs)))
-
-(defproc (default-isosurface-line-colors [zs (listof real?)]) (listof plot-color/c) #:document-body
-  (color-seq* (list (->pen-color 5) (->pen-color 0) (->pen-color 1))
-              (length zs)))
-
-(defparam isosurface-levels (or/c 'auto exact-positive-integer? (listof real?)) 'auto)
-(defparam isosurface-colors (plot-colors/c (listof real?)) default-isosurface-colors)
-(defparam isosurface-styles (plot-brush-styles/c (listof real?)) '(solid))
-(defparam isosurface-line-colors (plot-colors/c (listof real?)) default-isosurface-line-colors)
-(defparam isosurface-line-widths (pen-widths/c (listof real?)) '(1/3))
-(defparam isosurface-line-styles (plot-pen-styles/c (listof real?)) '(solid))
-(defparam isosurface-alphas (alphas/c (listof real?)) '(1/2))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/plot-device.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/plot-device.rkt
deleted file mode 100644
index 321865f24c..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/plot-device.rkt
+++ /dev/null
@@ -1,599 +0,0 @@
-#lang racket/base
-
-;; Instances of this class know how to draw points, polygons, rectangles, lines, text, a bunch of
-;; different "glyphs" (used for point symbols and ticks), and legends on their underlying device
-;; contexts. Drawing functions accept vectors representing dc coordinates.
-
-;; It is up to callers to transform view or plot coordinates into dc coordinates.
-
-(require racket/draw racket/class racket/match racket/math racket/bool racket/list racket/contract
-         racket/vector
-         "contract.rkt"
-         "draw.rkt"
-         "math.rkt"
-         "sample.rkt"
-         "parameters.rkt"
-         "legend.rkt")
-
-(provide plot-device%)
-
-(define (coord->cons v)
-  (match-define (vector x y) v)
-  (cons x y))
-
-(define (translate-glyph-sym+size sym size)
-  (let ([sym  (if (integer? sym) (remainder (abs sym) 128) sym)])
-    (case sym
-      [(0)   (values 'square size)]
-      [(1)   (values 'dot size)]
-      [(2)   (values 'plus size)]
-      [(3)   (values 'asterisk size)]
-      [(4)   (values 'circle size)]
-      [(5)   (values 'times size)]
-      [(6)   (values 'square size)]
-      [(7)   (values 'triangle size)]
-      [(8)   (values 'oplus size)]
-      [(9)   (values 'odot size)]
-      [(10)  (values '4star size)]
-      [(11)  (values 'diamond size)]
-      [(12)  (values '5star size)]
-      [(13)  (values 'square size)]
-      [(14)  (values 'circle (* 9/12 size))]
-      [(15)  (values '6star size)]
-      [(16)  (values 'fullsquare size)]
-      [(17)  (values 'fullcircle (* 4/6 size))]
-      [(18)  (values 'full5star size)]
-      [(19)  (values 'square size)]
-      [(20 circle1)  (values 'circle (* 3/6 size))]
-      [(21 cirlce2)  (values 'circle (* 4/6 size))]
-      [(22 circle3)  (values 'circle (* 5/6 size))]
-      [(23 circle4)  (values 'circle size)]
-      [(24 circle5)  (values 'circle (* 8/6 size))]
-      [(25 circle6)  (values 'circle (* 12/6 size))]
-      [(26 circle7)  (values 'circle (* 14/6 size))]
-      [(27 circle8)  (values 'circle (* 18/6 size))]
-      [(28)  (values 'leftarrow size)]
-      [(29)  (values 'rightarrow size)]
-      [(30)  (values 'uparrow size)]
-      [(31)  (values 'downarrow size)]
-      [(fullcircle1)  (values 'fullcircle (* 3/6 size))]
-      [(bullet fullcircle2)  (values 'fullcircle (* 4/6 size))]
-      [(fullcircle3)  (values 'fullcircle (* 5/6 size))]
-      [(fullcircle4)  (values 'fullcircle size)]
-      [(fullcircle5)  (values 'fullcircle (* 8/6 size))]
-      [(fullcircle6)  (values 'fullcircle (* 12/6 size))]
-      [(fullcircle7)  (values 'fullcircle (* 14/6 size))]
-      [(fullcircle8)  (values 'fullcircle (* 18/6 size))]
-      [else  (cond [(and (integer? sym) (<= 32 sym 127))
-                    (values (bytes->string/utf-8 (bytes sym)) size)]
-                   [(char? sym)
-                    (values (list->string (list sym)) size)]
-                   [else
-                    (values sym size)])])))
-
-(define full-glyph-hash
-  #hash((fullcircle . circle)
-        (fullsquare . square)
-        (fulldiamond . diamond)
-        (fulltriangle . triangle)
-        (fulltriangleup . triangleup)
-        (fulltriangledown . triangledown)
-        (fulltriangleleft . triangleleft)
-        (fulltriangleright . triangleright)
-        (full4star . 4star)
-        (full5star . 5star)
-        (full6star . 6star)
-        (full7star . 7star)
-        (full8star . 8star)))
-
-(define plot-device%
-  (class object%
-    (init-field dc dc-x-min dc-y-min dc-x-size dc-y-size)
-    
-    ;(init-field the-dc dc-x-min dc-y-min dc-x-size dc-y-size)
-    ;(define dc (make-object null-dc%))
-    
-    (super-new)
-    
-    ;; ===============================================================================================
-    ;; Drawing parameters
-    
-    (define-values (old-scale-x old-scale-y) (send dc get-scale))
-    (define-values (old-origin-x old-origin-y) (send dc get-origin))
-    (define old-smoothing (send dc get-smoothing))
-    (define old-text-mode (send dc get-text-mode))
-    (define old-clipping-region (send dc get-clipping-region))
-    (define old-font (send dc get-font))
-    (define old-text-foreground (send dc get-text-foreground))
-    (define old-pen (send dc get-pen))
-    (define old-brush (send dc get-brush))
-    (define old-background (send dc get-background))
-    (define old-alpha (send dc get-alpha))
-    
-    (define/public (restore-drawing-params)
-      (send dc set-origin old-origin-x old-origin-y)
-      (send dc set-smoothing old-smoothing)
-      (send dc set-text-mode old-text-mode)
-      (send dc set-clipping-region old-clipping-region)
-      (send dc set-font old-font)
-      (send dc set-text-foreground old-text-foreground)
-      (send dc set-pen old-pen)
-      (send dc set-brush old-brush)
-      (send dc set-background old-background)
-      (send dc set-alpha old-alpha))
-    
-    (define/public (reset-drawing-params [clipping-rect? #t])
-      (send dc set-origin
-            (+ old-origin-x (* old-scale-x dc-x-min))
-            (+ old-origin-y (* old-scale-y dc-y-min)))
-      (send dc set-smoothing 'smoothed)
-      (send dc set-text-mode 'transparent)
-      (when clipping-rect?
-        (send dc set-clipping-rect 0 0 dc-x-size dc-y-size))
-      (set-font (plot-font-size) (plot-font-face) (plot-font-family))
-      (set-text-foreground (plot-foreground))
-      (set-pen (plot-foreground) (plot-line-width) 'solid)
-      (set-brush (plot-background) 'solid)
-      (set-background (plot-background))
-      (set-background-alpha (plot-background-alpha))
-      (set-alpha (plot-foreground-alpha)))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Pen, brush, alpha parameters
-    
-    (define pen-hash (make-hash))
-    (define transparent-pen (make-pen% 0 0 0 1 'transparent))
-    
-    (define pen-color (->pen-color (plot-foreground)))
-    (define pen-width (plot-line-width))
-    (define pen-style 'solid)
-    
-    ;; Sets the pen, using a hash table to avoid making duplicate objects. At time of writing (and for
-    ;; the forseeable future) this is much faster than using a pen-list%, because it doesn't have to
-    ;; synchronize access. It's also not thread-safe.
-    (define/public (set-pen color width style)
-      (set! pen-style (->pen-style style))
-      (cond [(eq? pen-style 'transparent)
-             (set! pen-color '(0 0 0))
-             (set! pen-width 1)
-             (send dc set-pen transparent-pen)]
-            [else
-             (set! pen-color (->pen-color color))
-             (set! pen-width width)
-             (match-define (list (app real->color-byte r)
-                                 (app real->color-byte g)
-                                 (app real->color-byte b))
-               pen-color)
-             (send dc set-pen (hash-ref! pen-hash (vector r g b width)
-                                         (λ () (make-pen% r g b width 'solid))))]))
-    
-    ;; Sets the pen used to draw major ticks.
-    (define/public (set-major-pen [style 'solid])
-      (set-pen (plot-foreground) (plot-line-width) style))
-    
-    ;; Sets the pen used to draw minor ticks.
-    (define/public (set-minor-pen [style 'solid])
-      (set-pen (plot-foreground) (* 1/2 (plot-line-width)) style))
-    
-    (define brush-hash (make-hash))
-    (define transparent-brush (make-brush% 0 0 0 'transparent))
-    
-    (define brush-color (->brush-color (plot-background)))
-    (define brush-style 'solid)
-    
-    ;; Sets the brush. Same idea as set-pen.
-    (define/public (set-brush color style)
-      (set! brush-style (->brush-style style))
-      (cond [(eq? brush-style 'transparent)
-             (set! brush-color '(0 0 0))
-             (send dc set-brush transparent-brush)]
-            [else
-             (set! brush-color (->brush-color color))
-             (match-define (list (app real->color-byte r)
-                                 (app real->color-byte g)
-                                 (app real->color-byte b))
-               brush-color)
-             (send dc set-brush (hash-ref! brush-hash (vector r g b brush-style)
-                                           (λ () (make-brush% r g b brush-style))))]))
-    
-    ;; Sets alpha.
-    (define/public (set-alpha a)
-      (send dc set-alpha a))
-    
-    ;; Sets the background color.
-    (define/public (set-background color)
-      (send dc set-background (color->color% (->brush-color color))))
-    
-    (define background-alpha 1)
-    
-    ;; Sets the background opacity.
-    (define/public (set-background-alpha alpha)
-      (set! background-alpha alpha))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Text parameters
-    
-    ;; Sets the font, using the-font-list to cache fonts.
-    (define/public set-font
-      (case-lambda
-        [(font)  (send dc set-font font)]
-        [(size family) (set-font size #f family)]
-        [(size face family)
-         (send dc set-font
-               (if face
-                   (send the-font-list find-or-create-font
-                         (real->font-size size)
-                         face
-                         family
-                         'normal
-                         'normal)
-                   (send the-font-list find-or-create-font
-                         (real->font-size size)
-                         family
-                         'normal
-                         'normal)))]))
-    
-    ;; Sets only the font size, not the family.
-    (define/public (set-font-size size)
-      (set-font size 
-                (send (send dc get-font) get-face)
-                (send (send dc get-font) get-family)))
-    
-    ;; Returns the character height, as an exact real.
-    (define/public (get-char-height)
-      (inexact->exact (send dc get-char-height)))
-    
-    ;; Returns the character baseline, as an exact real.
-    (define/public (get-char-baseline)
-      (define-values (_1 _2 b _3) (get-text-extent ""))
-      (inexact->exact b))
-    
-    ;; Returns the extent of a string, as exact reals.
-    (define/public (get-text-extent str)
-      (define-values (w h b d)
-        (send dc get-text-extent str #f #t 0))
-      (values (inexact->exact w) (inexact->exact h)
-              (inexact->exact b) (inexact->exact d)))
-    
-    ;; Returns the width of a string, as an exact real.
-    (define/public (get-text-width str)
-      (define-values (w _1 _2 _3) (get-text-extent str))
-      (inexact->exact w))
-    
-    ;; Sets the text foreground color.
-    (define/public (set-text-foreground color)
-      (send dc set-text-foreground (color->color% (->pen-color color))))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Clipping
-    
-    ;; Sets a clipping rectangle
-    (define/public (set-clipping-rect r)
-      (match-define (vector (ivl x1 x2) (ivl y1 y2)) r)
-      (send dc set-clipping-rect x1 y1 (- x2 x1) (- y2 y1)))
-    
-    ;; Clears the clipping rectangle.
-    (define/public (clear-clipping-rect)
-      (send dc set-clipping-region #f))
-    
-    ;; Derived classes both do manual clipping against plot bounds (instead of dc bounds).
-    
-    ;; ===============================================================================================
-    ;; Drawing primitives
-    
-    (define/public (clear)
-      (define old-alpha (send dc get-alpha))
-      (send dc set-alpha background-alpha)
-      (send dc clear)
-      (send dc set-alpha old-alpha))
-    
-    (define/public (draw-point v)
-      (when (vrational? v)
-        (match-define (vector x y) v)
-        (send dc draw-point x y)))
-    
-    (define/public (draw-polygon vs)
-      (when (andmap vrational? vs)
-        (let ([vs  (map coord->cons vs)])
-          (cond [(eq? pen-style 'transparent)
-                 (send dc set-smoothing 'unsmoothed)
-                 (send dc draw-polygon vs 0 0 'winding)
-                 (send dc set-smoothing 'smoothed)]
-                [else
-                 (define old-pen (send dc get-pen))
-                 (send dc set-pen transparent-pen)
-                 (send dc set-smoothing 'unsmoothed)
-                 (send dc draw-polygon vs 0 0 'winding)
-                 (send dc set-smoothing 'smoothed)
-                 (send dc set-pen old-pen)
-                 (draw-lines/pen-style dc (cons (last vs) vs) pen-style)]))))
-    
-    (define/public (draw-rect r)
-      (when (rect-rational? r)
-        (match-define (vector (ivl x1 x2) (ivl y1 y2)) r)
-        (draw-polygon (list (vector x1 y1) (vector x1 y2) (vector x2 y2) (vector x2 y1)))))
-    
-    (define/public (draw-lines vs)
-      (when (andmap vrational? vs)
-        (draw-lines/pen-style dc (map coord->cons vs) pen-style)))
-    
-    (define/public (draw-line v1 v2)
-      (when (and (vrational? v1) (vrational? v2))
-        (match-define (vector x1 y1) v1)
-        (match-define (vector x2 y2) v2)
-        (draw-line/pen-style dc x1 y1 x2 y2 pen-style)))
-    
-    (define/public (draw-text str v [anchor 'top-left] [angle 0] [dist 0] #:outline? [outline? #f])
-      (when (vrational? v)
-        (match-define (vector x y) v)
-        
-        (when outline?
-          ;(define alpha (send dc get-alpha))
-          (define fg (send dc get-text-foreground))
-          
-          ;(send dc set-alpha (alpha-expt alpha 1/2))
-          (send dc set-text-foreground (send dc get-background))
-          (for* ([dx  (list -1 0 1)]
-                 [dy  (list -1 0 1)]
-                 #:when (not (and (zero? dx) (zero? dy))))
-            (draw-text/anchor dc str (+ x dx) (+ y dy) anchor angle dist))
-          ;(send dc set-alpha alpha)
-          (send dc set-text-foreground fg))
-        
-        (draw-text/anchor dc str x y anchor angle dist)))
-    
-    (define/public (get-text-corners str v [anchor 'top-left] [angle 0] [dist 0])
-      (cond [(vrational? v)
-             (match-define (vector x y) v)
-             (map (λ (v) (vector-map inexact->exact v))
-                  (get-text-corners/anchor dc str x y anchor angle dist))]
-            [else  empty]))
-    
-    (define/public (draw-arrow v1 v2)
-      (when (and (vrational? v1) (vrational? v2))
-        (match-define (vector x1 y1) v1)
-        (match-define (vector x2 y2) v2)
-        (define dx (- x2 x1))
-        (define dy (- y2 y1))
-        (define angle (if (and (zero? dy) (zero? dx)) 0 (atan dy dx)))
-        (define dist (sqrt (+ (sqr dx) (sqr dy))))
-        (define head-r (* 2/5 dist))
-        (define head-angle (* 1/6 pi))
-        (define dx1 (* (cos (+ angle head-angle)) head-r))
-        (define dy1 (* (sin (+ angle head-angle)) head-r))
-        (define dx2 (* (cos (- angle head-angle)) head-r))
-        (define dy2 (* (sin (- angle head-angle)) head-r))
-        (send dc draw-line x1 y1 x2 y2)
-        (send dc draw-line x2 y2 (- x2 dx1) (- y2 dy1))
-        (send dc draw-line x2 y2 (- x2 dx2) (- y2 dy2))))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Glyph (point sym) primitives
-    
-    (define/public ((make-draw-circle-glyph r) v)
-      (when (vrational? v)
-        (match-define (vector x y) v)
-        (send dc draw-ellipse (- x r -1/2) (- y r -1/2) (* 2 r) (* 2 r))))
-    
-    (define/public (make-draw-polygon-glyph r sides start-angle)
-      (define angles (linear-seq start-angle (+ start-angle (* 2 pi)) (+ 1 sides)))
-      (λ (v)
-        (when (vrational? v)
-          (match-define (vector x y) v)
-          (send dc draw-polygon (map (λ (a) (cons (+ x (* (cos a) r)) (+ y (* (sin a) r))))
-                                     angles)))))
-    
-    (define/public (make-draw-star-glyph r sides start-angle)
-      (define angles (linear-seq start-angle (+ start-angle (* 2 pi)) (+ 1 (* 2 sides))))
-      (λ (v)
-        (when (vrational? v)
-          (match-define (vector x y) v)
-          (define pts
-            (for/list ([a  (in-list angles)] [i  (in-naturals)])
-              (define r-cos-a (* r (cos a)))
-              (define r-sin-a (* r (sin a)))
-              (cond [(odd? i)  (cons (+ x r-cos-a) (+ y r-sin-a))]
-                    [else      (cons (+ x (* 1/2 r-cos-a)) (+ y (* 1/2 r-sin-a)))])))
-          (send dc draw-polygon pts))))
-    
-    (define/public (make-draw-flare-glyph r sticks start-angle)
-      (define step (/ (* 2 pi) sticks))
-      (define angles (build-list sticks (λ (n) (+ start-angle (* n step)))))
-      (λ (v)
-        (when (vrational? v)
-          (match-define (vector x y) v)
-          (for ([a  (in-list angles)])
-            (send dc draw-line x y (+ x (* (cos a) r)) (+ y (* (sin a) r)))))))
-    
-    (define/public (get-tick-endpoints v r angle)
-      (match-define (vector x y) v)
-      (define dx (* (inexact->exact (cos angle)) r))
-      (define dy (* (inexact->exact (sin angle)) r))
-      (list (vector (- x dx) (- y dy)) (vector (+ x dx) (+ y dy))))
-    
-    (define/public (make-draw-tick r angle)
-      (define dx (* (cos angle) r))
-      (define dy (* (sin angle) r))
-      (λ (v)
-        (when (vrational? v)
-          (match-define (vector x y) v)
-          (send dc draw-line (- x dx) (- y dy) (+ x dx) (+ y dy)))))
-    
-    (define/public (draw-tick v r angle)
-      ((make-draw-tick r angle) v))
-    
-    (define/public (make-draw-arrow-glyph r angle)
-      (define head-r (* 4/5 r))
-      (define head-angle (* 1/6 pi))
-      (define dx (* (cos angle) r))
-      (define dy (* (sin angle) r))
-      (define dx1 (* (cos (+ angle head-angle)) head-r))
-      (define dy1 (* (sin (+ angle head-angle)) head-r))
-      (define dx2 (* (cos (- angle head-angle)) head-r))
-      (define dy2 (* (sin (- angle head-angle)) head-r))
-      (λ (v)
-        (when (vrational? v)
-          (match-define (vector x y) v)
-          (define head-x (+ x dx))
-          (define head-y (+ y dy))
-          (define tail-x (- x dx))
-          (define tail-y (- y dy))
-          (send dc draw-line head-x head-y tail-x tail-y)
-          (send dc draw-line head-x head-y (- head-x dx1) (- head-y dy1))
-          (send dc draw-line head-x head-y (- head-x dx2) (- head-y dy2)))))
-    
-    (define/public (draw-arrow-glyph v r angle)
-      ((make-draw-arrow-glyph r angle) v))
-    
-    (define/public (make-draw-text-glyph str)
-      (define-values (x-size y-size _1 _2) (get-text-extent str))
-      (define dx (* 1/2 x-size))
-      (define dy (* 1/2 y-size))
-      (λ (v)
-        (when (vrational? v)
-          (match-define (vector x y) v)
-          (send dc draw-text str (- x dx) (- y dy) #t))))
-    
-    (define ((mix-draw-glyph d1 d2) v)
-      (d1 v)
-      (d2 v))
-    
-    (define/public (draw-glyphs vs sym size)
-      (let-values ([(real-sym size)  (translate-glyph-sym+size sym size)])
-        (define draw-glyph
-          (cond
-            [(string? real-sym)  (set-font-size (* 2 size))
-                                 (set-text-foreground pen-color)
-                                 (make-draw-text-glyph real-sym)]
-            [(symbol? real-sym)
-             (define r (* 1/2 size))
-             (define line-sym
-               (cond [(hash-has-key? full-glyph-hash real-sym)
-                      (when (eq? pen-color brush-color)
-                        (set-pen pen-color 1 'transparent)
-                        (set-brush brush-color 'solid))
-                      (hash-ref full-glyph-hash real-sym)]
-                     [else  (set-brush brush-color 'transparent)
-                            real-sym]))
-             (case line-sym
-               ; circles
-               [(circle)  (make-draw-circle-glyph r)]
-               ; squares
-               [(square)   (make-draw-polygon-glyph r 4 (* 1/4 pi))]
-               [(diamond)  (make-draw-polygon-glyph r 4 0)]
-               ; triangles
-               [(triangle
-                 triangleup)     (make-draw-polygon-glyph r 3 (* -1/2 pi))]
-               [(triangledown)   (make-draw-polygon-glyph r 3 (* 1/2 pi))]
-               [(triangleleft)   (make-draw-polygon-glyph r 3 pi)]
-               [(triangleright)  (make-draw-polygon-glyph r 3 0)]
-               ; dots
-               [(point pixel dot)  (set-pen pen-color (* 1/2 r) 'solid)
-                                   (λ (v) (draw-point v))]
-               [(odot)        (set-pen pen-color 1 'solid)
-                              (mix-draw-glyph (make-draw-circle-glyph (+ pen-width r))
-                                              (λ (v) (draw-point v)))]
-               ; flares
-               [(plus)        (make-draw-flare-glyph r 4 0)]
-               [(times)       (make-draw-flare-glyph r 4 (* 1/4 pi))]
-               [(5asterisk)   (make-draw-flare-glyph r 5 (* -1/2 pi))]
-               [(asterisk)    (make-draw-flare-glyph r 6 (* -1/2 pi))]
-               [(oplus)       (mix-draw-glyph (make-draw-circle-glyph (+ pen-width r))
-                                              (make-draw-flare-glyph r 4 0))]
-               [(otimes)      (mix-draw-glyph (make-draw-circle-glyph (+ pen-width r))
-                                              (make-draw-flare-glyph r 4 (* 1/4 pi)))]
-               [(o5asterisk)  (mix-draw-glyph (make-draw-circle-glyph (+ pen-width r))
-                                              (make-draw-flare-glyph r 5 (* -1/2 pi)))]
-               [(oasterisk)   (mix-draw-glyph (make-draw-circle-glyph (+ pen-width r))
-                                              (make-draw-flare-glyph r 6 (* -1/2 pi)))]
-               ; arrows
-               [(rightarrow)  (make-draw-arrow-glyph (+ 1 r) 0)]
-               [(leftarrow)   (make-draw-arrow-glyph (+ 1 r) pi)]
-               [(uparrow)     (make-draw-arrow-glyph (+ 1 r) (* -1/2 pi))]
-               [(downarrow)   (make-draw-arrow-glyph (+ 1 r) (* 1/2 pi))]
-               ; stars
-               [(3star)       (make-draw-star-glyph (+ 1 r) 3 (* 1/2 pi))]
-               [(4star)       (make-draw-star-glyph (+ 1 r) 4 (* 1/2 pi))]
-               [(5star)       (make-draw-star-glyph (+ 1 r) 5 (* 1/2 pi))]
-               [(6star)       (make-draw-star-glyph (+ 1 r) 6 (* 1/2 pi))]
-               [(7star)       (make-draw-star-glyph (+ 1 r) 7 (* 1/2 pi))]
-               [(8star)       (make-draw-star-glyph (+ 1 r) 8 (* 1/2 pi))]
-               [else  (raise-type-error 'draw-glyphs (format "one of ~a" known-point-symbols) sym)])]
-            [else  (raise-type-error 'draw-glyphs "integer, character, string or symbol" sym)]))
-      
-        (for ([v  (in-list vs)])
-          (draw-glyph v))))
-    
-    ;; ===============================================================================================
-    ;; Legend
-    
-    (define/public (draw-legend legend-entries rect)
-      (define n (length legend-entries))
-      (match-define (list (legend-entry labels draw-procs) ...) legend-entries)
-      
-      (match-define (vector (ivl x-min x-max) (ivl y-min y-max)) rect)
-      
-      (define-values (_1 label-y-size baseline _2) (get-text-extent (first labels)))
-      (define horiz-gap (get-text-width " "))
-      (define top-gap baseline)
-      (define bottom-gap (* 1/2 baseline))
-      (define baseline-skip (+ label-y-size baseline))
-      
-      (define max-label-x-size (apply max (map (λ (label) (get-text-width label)) labels)))
-      (define labels-x-size (+ max-label-x-size horiz-gap))
-      
-      (define draw-y-size (- label-y-size baseline))
-      (define draw-x-size (* 4 draw-y-size))
-      
-      (define legend-x-size (+ horiz-gap
-                               labels-x-size (* 2 horiz-gap)
-                               draw-x-size horiz-gap))
-      (define legend-y-size (+ top-gap (* n baseline-skip) bottom-gap))
-      
-      (define legend-x-min
-        (case (plot-legend-anchor)
-          [(top-left left bottom-left)     x-min]
-          [(top-right right bottom-right)  (- x-max legend-x-size)]
-          [(center bottom top)             (- (* 1/2 (+ x-min x-max))
-                                              (* 1/2 legend-x-size))]))
-      
-      (define legend-y-min
-        (case (plot-legend-anchor)
-          [(top-left top top-right)           y-min]
-          [(bottom-left bottom bottom-right)  (- y-max legend-y-size)]
-          [(center left right)                (- (* 1/2 (+ y-min y-max))
-                                                 (* 1/2 legend-y-size))]))
-      
-      (define legend-rect (vector (ivl legend-x-min (+ legend-x-min legend-x-size))
-                                  (ivl legend-y-min (+ legend-y-min legend-y-size))))
-      
-      (define label-x-min (+ legend-x-min horiz-gap))
-      (define draw-x-min (+ legend-x-min (* 2 horiz-gap) labels-x-size horiz-gap))
-      
-      ;; legend background
-      (set-pen (plot-foreground) 1 'transparent)
-      (set-brush (plot-background) 'solid)
-      (set-alpha (plot-legend-box-alpha))
-      (draw-rect legend-rect)
-      
-      ;; legend border
-      (set-minor-pen)
-      (set-brush (plot-background) 'transparent)
-      (set-alpha 3/4)
-      (draw-rect legend-rect)
-      
-      (set-alpha (plot-foreground-alpha))
-      (set-clipping-rect legend-rect)
-      (for ([label  (in-list labels)] [draw-proc  (in-list draw-procs)] [i  (in-naturals)])
-        (define label-y-min (+ legend-y-min top-gap (* i baseline-skip)))
-        (draw-text label (vector label-x-min label-y-min) #:outline? #t)
-        
-        (define draw-y-min (+ label-y-min (* 1/2 baseline)))
-        
-        (define entry-pd (make-object plot-device% dc draw-x-min draw-y-min draw-x-size draw-y-size))
-        (send entry-pd reset-drawing-params #f)
-        (draw-proc this draw-x-size draw-y-size)
-        (send entry-pd restore-drawing-params))
-      
-      (clear-clipping-rect))
-    ))  ; end class
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/plot-element.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/plot-element.rkt
deleted file mode 100644
index c5d491a3ab..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/plot-element.rkt
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang racket/base
-
-(require racket/list racket/contract racket/match unstable/latent-contract/defthing
-         "math.rkt"
-         "ticks.rkt"
-         "contract.rkt"
-         "parameters.rkt"
-         "sample.rkt")
-
-(provide (all-defined-out))
-
-(struct plot-element (bounds-rect bounds-fun ticks-fun) #:transparent)
-(struct nonrenderer plot-element () #:transparent)
-(struct renderer2d plot-element (render-proc) #:transparent)
-(struct renderer3d plot-element (render-proc) #:transparent)
-
-(defcontract bounds-fun/c ((vectorof ivl?) . -> . (vectorof ivl?)))
-(defcontract ticks-fun/c ((vectorof ivl?) . -> . any))
-
-;; ===================================================================================================
-;; Common field values
-
-(defthing default-ticks-fun ticks-fun/c
-  (λ (r)
-    (match r
-      [(vector (ivl xa xb) (ivl ya yb))
-       (values ((plot-x-ticks) xa xb) ((plot-x-far-ticks) xa xb)
-               ((plot-y-ticks) ya yb) ((plot-y-far-ticks) ya yb))]
-      [(vector (ivl xa xb) (ivl ya yb) (ivl za zb))
-       (values ((plot-x-ticks) xa xb) ((plot-x-far-ticks) xa xb)
-               ((plot-y-ticks) ya yb) ((plot-y-far-ticks) ya yb)
-               ((plot-z-ticks) za zb) ((plot-z-far-ticks) za zb))]
-      [_  (raise-type-error 'default-ticks-fun "2- or 3-vector of ivl" r)])))
-
-(defproc (function-bounds-fun [f sampler/c] [samples exact-nonnegative-integer?]) bounds-fun/c
-  (λ (r)
-    (match-define (vector xi yi) r)
-    (cond [(ivl-known? xi)
-           (match-define (sample xs ys y-min y-max) (f xi samples))
-           (vector xi (ivl y-min y-max))]
-          [else  r])))
-
-(defproc (inverse-bounds-fun [f sampler/c] [samples exact-nonnegative-integer?]) bounds-fun/c
-  (λ (r)
-    (match-define (vector xi yi) r)
-    (cond [(ivl-known? yi)
-           (match-define (sample ys xs x-min x-max) (f yi samples))
-           (vector (ivl x-min x-max) yi)]
-          [else  r])))
-
-(defproc (function-interval-bounds-fun [f1 sampler/c] [f2 sampler/c]
-                                       [samples exact-nonnegative-integer?]) bounds-fun/c
-  (λ (r)
-    (rect-join ((function-bounds-fun f1 samples) r)
-               ((function-bounds-fun f2 samples) r))))
-
-(defproc (inverse-interval-bounds-fun [f1 sampler/c] [f2 sampler/c]
-                                      [samples exact-nonnegative-integer?]) bounds-fun/c
-  (λ (r)
-    (rect-join ((inverse-bounds-fun f1 samples) r)
-               ((inverse-bounds-fun f2 samples) r))))
-
-(defproc (surface3d-bounds-fun [f 2d-sampler/c] [samples exact-nonnegative-integer?]) bounds-fun/c
-  (λ (r)
-    (match-define (vector xi yi zi) r)
-    (cond [(and (ivl-known? xi) (ivl-known? yi))
-           (match-define (2d-sample xs ys zss z-min z-max)
-             (f (vector xi yi) (vector samples samples)))
-           (vector xi yi (ivl z-min z-max))]
-          [else  r])))
-
-;; ===================================================================================================
-;; Fixpoint computation of bounding rectangles
-
-;; The reasoning in the following comments is in terms of a lattice comprised of rectangles,
-;; rect-meet and rect-join. Think of rect-meet like a set intersection; rect-join like a set union.
-
-;; Attempts to comptute a fixpoint of, roughly, the bounds functions for the given plot elements.
-;; More precisely, starting with the given plot bounds, it attempts to compute a fixpoint of
-;; (apply-bounds* elems), overridden at every iteration by the plot bounds (if given). Because a
-;; fixpoint doesn't always exist, or only exists in the limit, it stops after max-iters.
-(define (bounds-fixpoint elems given-bounds-rect [max-iters 4])
-  (let/ec break
-    ;; Shortcut eval: if the plot bounds are all given, the code below just returns them anyway
-    (when (rect-known? given-bounds-rect) (break given-bounds-rect))
-    ;; A list of elements' known bounds rects
-    (define elem-bounds-rects (filter values (map plot-element-bounds-rect elems)))
-    ;; The minimum bounding rectangle
-    (define min-bounds-rect
-      (cond [(empty? elem-bounds-rects)  given-bounds-rect]
-            [else  (rect-join given-bounds-rect
-                              (rect-meet given-bounds-rect
-                                         (apply rect-join elem-bounds-rects)))]))
-    ;; Objective: find the fixpoint of F starting at min-bounds-rect
-    (define (F bounds-rect) (rect-meet given-bounds-rect (apply-bounds* elems bounds-rect)))
-    ;; Iterate joint bounds to (hopefully) a fixpoint
-    (define-values (bounds-rect area delta-area)
-      (for/fold ([bounds-rect  min-bounds-rect]
-                 [area  (rect-area min-bounds-rect)]
-                 [delta-area  #f]
-                 ) ([n  (in-range max-iters)])
-        ;(printf "bounds-rect = ~v~n" bounds-rect)
-        ;; Get new bounds from the elements' bounds functions
-        (define new-bounds-rect (F bounds-rect))
-        (define new-area (rect-area new-bounds-rect))
-        (define new-delta-area (and area new-area (- new-area area)))
-        (cond
-          ;; Shortcut eval: if the bounds haven't changed, we have a fixpoint
-          [(equal? bounds-rect new-bounds-rect)  (break bounds-rect)]
-          ;; If the area grew more this iteration than last, it may not converge, so stop now
-          [(and delta-area new-delta-area (new-delta-area . > . delta-area))  (break bounds-rect)]
-          ;; All good - one more iteration
-          [else  (values new-bounds-rect new-area new-delta-area)])))
-    bounds-rect))
-
-;; Applies the bounds functions of multiple plot elements, in parallel, and returns the smallest
-;; bounds containing all the new bounds. This function is monotone and increasing regardless of
-;; whether any element's bounds function is. If iterating it is bounded, a fixpoint exists.
-(define (apply-bounds* elems bounds-rect)
-  (apply rect-join bounds-rect (for/list ([elem  (in-list elems)])
-                                 (apply-bounds elem bounds-rect))))
-
-;; Applies the plot element's bounds function. Asks this question: If these are your allowed bounds,
-;; what bounds will you try to use?
-(define (apply-bounds elem bounds-rect)
-  (match-define (plot-element elem-bounds-rect elem-bounds-fun _) elem)
-  ;(printf "elem-bounds-rect = ~v~n" elem-bounds-rect)
-  (let* ([bounds-rect  (if elem-bounds-fun (elem-bounds-fun bounds-rect) bounds-rect)]
-         [bounds-rect  (if elem-bounds-rect (rect-join elem-bounds-rect bounds-rect) bounds-rect)])
-    bounds-rect))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/sample.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/sample.rkt
deleted file mode 100644
index 29771dac12..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/sample.rkt
+++ /dev/null
@@ -1,270 +0,0 @@
-#lang racket/base
-
-;; Functions that sample from functions, and functions that create memoized samplers.
-
-(require racket/match racket/flonum racket/math racket/contract racket/list racket/vector
-         unstable/latent-contract/defthing
-         "math.rkt"
-         "axis-transform.rkt")
-
-(provide (all-defined-out))
-
-(defproc (build-linear-seq [start real?] [step real?]
-                           [num exact-nonnegative-integer?]
-                           [min-val real? start]
-                           [max-val real? (+ start (* (- num 1) step))]
-                           ) (listof real?)
-  (define n-start (max 0 (inexact->exact (floor (/ (- min-val start) step)))))
-  (define n-end (min num (+ (inexact->exact (ceiling (/ (- max-val start) step))) 1)))
-  (for*/list ([n  (in-range n-start n-end)]
-              [x  (in-value (+ start (* n step)))]
-              #:when (<= min-val x max-val))
-    x))
-
-(defproc (linear-seq [start real?] [end real?] [num exact-nonnegative-integer?]
-                     [#:start? start? boolean? #t]
-                     [#:end? end? boolean? #t]) (listof real?)
-  (cond
-    [(zero? num)  empty]
-    ; ambiguous request: arbitrarily return start
-    [(and start? end? (= 1 num))  (list start)]
-    [(end . < . start)  (reverse (linear-seq end start num #:start? end? #:end? start?))]
-    [(end . = . start)  (build-list num (λ _ start))]
-    [else
-     (define size (- end start))
-     (define step (/ size (cond [(and start? end?)  (- num 1)]
-                                [(or start? end?)   (- num 1/2)]
-                                [else               num])))
-     (define real-start
-       (cond [start?  start]
-             [else    (+ start (* 1/2 step))]))
-     
-     (build-linear-seq real-start step num)]))
-
-(defproc (linear-seq* [points (listof real?)] [num exact-nonnegative-integer?]
-                      [#:start? start? boolean? #t]
-                      [#:end? end? boolean? #t]) (listof real?)
-  (let/ec return
-    (when (empty? points) (raise-type-error 'linear-seq* "nonempty (listof real?)" points))
-    
-    (define pts (list->vector points))
-    (define len (vector-length pts))
-    
-    (define indexes (linear-seq 0 (sub1 len) num #:start? start? #:end? end?))
-    (define int-parts (map floor indexes))
-    (define frac-parts (map - indexes int-parts))
-    (map (λ (i f)
-           (if (= i (sub1 len))
-               (vector-ref pts i)
-               (blend (vector-ref pts (add1 i)) (vector-ref pts i) f)))
-         int-parts frac-parts)))
-
-(defproc (nonlinear-seq [start real?] [end real?] [num exact-nonnegative-integer?]
-                        [transform axis-transform/c]
-                        [#:start? start? boolean? #t]
-                        [#:end? end? boolean? #t]) (listof real?)
-  (match-define (invertible-function _ finv) (apply-axis-transform transform start end))
-  (map finv (linear-seq start end num #:start? start? #:end? end?)))
-
-;; ===================================================================================================
-
-(define (ensure-endpoints xs i-min i-max)
-  (cond [(empty? xs)  (cond [(i-min . = . i-max)  (list i-min)]
-                            [else  (list i-min i-max)])]
-        [else
-         (define xs-min (first xs))
-         (define xs-max (last xs))
-         (let* ([xs  (if (xs-min . <= . i-min) xs (cons i-min xs))]
-                [xs  (if (xs-max . >= . i-max) xs (append xs (list i-max)))])
-           xs)]))
-
-(defproc (sample-points [outer-ivl rational-ivl?] [inner-ivl ivl?]
-                        [num exact-nonnegative-integer?]
-                        [transform axis-transform/c id-transform]) (listof real?)
-  (let* ([inner-ivl  (ivl-meet inner-ivl outer-ivl)]
-         [inner-ivl  (ivl-inexact->exact inner-ivl)]
-         [outer-ivl  (ivl-inexact->exact outer-ivl)])
-    (match-define (ivl o-min o-max) outer-ivl)
-    (match-define (ivl i-min i-max) inner-ivl)
-    (match-define (invertible-function f finv) (apply-axis-transform transform o-min o-max))
-    (cond
-      [(ivl-empty? inner-ivl)  empty]
-      [(= num 0)  empty]
-      [(or (= o-min o-max) (= num 1))
-       (cond [(<= i-min o-min i-max)  (build-list num (λ _ o-min))]
-             [else  empty])]
-      [else
-       (define step (/ (- o-max o-min) (- num 1)))
-       (let* ([xs  (map finv (build-linear-seq o-min step num (f i-min) (f i-max)))]
-              [xs  (remove-duplicates (map (λ (x) (clamp-real x inner-ivl)) xs))])
-         (ensure-endpoints xs i-min i-max))])))
-
-;; ===================================================================================================
-
-(struct mapped-function (f fmap) #:transparent
-  #:property prop:procedure
-  (λ (g x) ((mapped-function-f g) x)))
-
-(define (map* f xs)
-  (match f
-    #;; gives obviously wrong chaperone error (tries to apply a hash?):
-    [(mapped-function _ fmap)  (fmap xs)]
-    [(? mapped-function?)  ((mapped-function-fmap f) xs)]
-    [_  (map f xs)]))
-
-;; ===================================================================================================
-;; Making memoized samplers
-
-(struct sample (xs ys y-min y-max) #:transparent)
-(struct 2d-sample (xs ys zss z-min z-max) #:transparent)
-(struct 3d-sample (xs ys zs dsss d-min d-max) #:transparent)
-
-(defcontract sampler/c
-  (-> rational-ivl? exact-nonnegative-integer? sample?))
-
-(defcontract 2d-sampler/c
-  (-> (vector/c rational-ivl? rational-ivl?)
-      (vector/c exact-nonnegative-integer? exact-nonnegative-integer?)
-      2d-sample?))
-
-(defcontract 3d-sampler/c
-  (-> (vector/c rational-ivl? rational-ivl? rational-ivl?)
-      (vector/c exact-nonnegative-integer? exact-nonnegative-integer? exact-nonnegative-integer?)
-      3d-sample?))
-
-(defproc (make-function->sampler [transform-thnk (-> axis-transform/c)]
-                                 ) (-> (real? . -> . real?) ivl? sampler/c)
-  (λ (g inner-ivl)
-    (define f (λ (x) (with-handlers ([exn:fail?  (λ (_) +nan.0)]) (g x))))
-    (define memo (make-hash))
-    (λ (outer-ivl num)
-      (define tx (transform-thnk))
-      (hash-ref! memo (vector outer-ivl num tx)
-                 (λ ()
-                   (define xs (sample-points outer-ivl inner-ivl num tx))
-                   (define y-min #f)
-                   (define y-max #f)
-                   (define ys (for/list ([x  (in-list xs)])
-                                (define y (f x))
-                                (cond [(rational? y)
-                                       (unless (and y-min (y . >= . y-min)) (set! y-min y))
-                                       (unless (and y-max (y . <= . y-max)) (set! y-max y))
-                                       (inexact->exact y)]
-                                      [else  y])))
-                   (sample xs ys
-                           (maybe-inexact->exact y-min)
-                           (maybe-inexact->exact y-max)))))))
-
-(defproc (make-2d-function->sampler [transform-x-thnk (-> axis-transform/c)]
-                                    [transform-y-thnk (-> axis-transform/c)]
-                                    ) (-> (real? real? . -> . real?)
-                                          (vector/c ivl? ivl?)
-                                           2d-sampler/c)
-  (λ (g inner-rect)
-    (define f (λ (x y) (with-handlers ([exn:fail?  (λ (_) +nan.0)]) (g x y))))
-    (define memo (make-hash))
-    (λ (outer-rect nums)
-      (define tx (transform-x-thnk))
-      (define ty (transform-y-thnk))
-      (hash-ref! memo (vector outer-rect nums tx ty)
-                 (λ ()
-                   (match-define (vector outer-x-ivl outer-y-ivl) outer-rect)
-                   (match-define (vector inner-x-ivl inner-y-ivl) inner-rect)
-                   (match-define (vector x-num y-num) nums)
-                   (define xs (sample-points outer-x-ivl inner-x-ivl x-num tx))
-                   (define ys (sample-points outer-y-ivl inner-y-ivl y-num ty))
-                   (define z-min #f)
-                   (define z-max #f)
-                   (define zss (for/vector #:length (length ys) ([y  (in-list ys)])
-                                 (for/vector #:length (length xs) ([x  (in-list xs)])
-                                   (define z (f x y))
-                                   (cond [(rational? z)
-                                          (unless (and z-min (z . >= . z-min)) (set! z-min z))
-                                          (unless (and z-max (z . <= . z-max)) (set! z-max z))
-                                          (inexact->exact z)]
-                                         [else  z]))))
-                   (2d-sample xs ys zss
-                              (maybe-inexact->exact z-min)
-                              (maybe-inexact->exact z-max)))))))
-
-(defproc (make-3d-function->sampler [transform-x-thnk (-> axis-transform/c)]
-                                    [transform-y-thnk (-> axis-transform/c)]
-                                    [transform-z-thnk (-> axis-transform/c)]
-                                    ) (-> (real? real? real? . -> . real?)
-                                          (vector/c ivl? ivl? ivl?)
-                                          3d-sampler/c)
-  (λ (g inner-rect)
-    (define f (λ (x y z) (with-handlers ([exn:fail?  (λ (_) +nan.0)]) (g x y z))))
-    (define memo (make-hash))
-    (λ (outer-rect nums)
-      (define tx (transform-x-thnk))
-      (define ty (transform-y-thnk))
-      (define tz (transform-z-thnk))
-      (hash-ref! memo (vector outer-rect nums tx ty tz)
-                 (λ ()
-                   (match-define (vector outer-x-ivl outer-y-ivl outer-z-ivl) outer-rect)
-                   (match-define (vector inner-x-ivl inner-y-ivl inner-z-ivl) inner-rect)
-                   (match-define (vector x-num y-num z-num) nums)
-                   (define xs (sample-points outer-x-ivl inner-x-ivl x-num tx))
-                   (define ys (sample-points outer-y-ivl inner-y-ivl y-num ty))
-                   (define zs (sample-points outer-z-ivl inner-z-ivl z-num tz))
-                   (define d-min #f)
-                   (define d-max #f)
-                   (define dsss (for/vector #:length (length zs) ([z  (in-list zs)])
-                                  (for/vector #:length (length ys) ([y  (in-list ys)])
-                                    (for/vector #:length (length xs) ([x  (in-list xs)])
-                                      (define d (f x y z))
-                                      (cond [(rational? d)
-                                             (unless (and d-min (d . >= . d-min)) (set! d-min d))
-                                             (unless (and d-max (d . <= . d-max)) (set! d-max d))
-                                             (inexact->exact d)]
-                                            [else  d])))))
-                   (3d-sample xs ys zs dsss
-                              (maybe-inexact->exact d-min)
-                              (maybe-inexact->exact d-max)))))))
-
-(define-syntax-rule (for-2d-sample (xa xb ya yb z1 z2 z3 z4) sample expr ...)
-  (let ()
-    (match-define (2d-sample xs ys zss fz-min fz-max) sample)
-    (define ya (first ys))
-    (define zs0 (vector-ref zss 0))
-    (for/fold ([ya ya] [zs0 zs0]) ([yb  (in-list (rest ys))]
-                                   [zs1  (in-vector zss 1)])
-      (define xa (first xs))
-      (define z1 (vector-ref zs0 0))
-      (define z4 (vector-ref zs1 0))
-      (for/fold ([xa xa] [z1 z1] [z4 z4]) ([xb  (in-list (rest xs))]
-                                           [z2  (in-vector zs0 1)]
-                                           [z3  (in-vector zs1 1)])
-        expr ...
-        (values xb z2 z3))
-      (values yb zs1))))
-
-(define-syntax-rule (for-3d-sample (xa xb ya yb za zb d1 d2 d3 d4 d5 d6 d7 d8) sample expr ...)
-  (let ()
-    (match-define (3d-sample xs ys zs dsss fd-min fd-max) sample)
-    (define za (first zs))
-    (define dss0 (vector-ref dsss 0))
-    (for/fold ([za za] [dss0 dss0]) ([zb  (in-list (rest zs))]
-                                     [dss1  (in-vector dsss 1)])
-      (define ya (first ys))
-      (define ds00 (vector-ref dss0 0))
-      (define ds10 (vector-ref dss1 0))
-      (for/fold ([ya ya] [ds00 ds00] [ds10 ds10]) ([yb  (in-list (rest ys))]
-                                                   [ds01  (in-vector dss0 1)]
-                                                   [ds11  (in-vector dss1 1)])
-        (define xa (first xs))
-        (define d1 (vector-ref ds00 0))
-        (define d4 (vector-ref ds01 0))
-        (define d5 (vector-ref ds10 0))
-        (define d8 (vector-ref ds11 0))
-        (for/fold ([xa xa] [d1 d1] [d4 d4] [d5 d5] [d8 d8]) ([xb  (in-list (rest xs))]
-                                                             [d2  (in-vector ds00 1)]
-                                                             [d3  (in-vector ds01 1)]
-                                                             [d6  (in-vector ds10 1)]
-                                                             [d7  (in-vector ds11 1)])
-          expr ...
-          (values xb d2 d3 d6 d7))
-        (values yb ds01 ds11))
-      (values zb dss1))))
-
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/samplers.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/samplers.rkt
deleted file mode 100644
index 91e58d59e4..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/samplers.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-;; Functions that sample from functions, and functions that create memoized samplers.
-
-(require racket/match racket/flonum racket/math racket/contract racket/list
-         unstable/latent-contract/defthing
-         "parameters.rkt"
-         "sample.rkt"
-         "math.rkt")
-
-(provide (all-defined-out))
-
-(defthing function->sampler ((real? . -> . real?) ivl? . -> . sampler/c)
-  (make-function->sampler plot-x-transform))
-
-(defthing inverse->sampler ((real? . -> . real?) ivl? . -> . sampler/c)
-  (make-function->sampler plot-y-transform))
-
-(defthing 2d-function->sampler (-> (real? real? . -> . real?)
-                                   (vector/c ivl? ivl?)
-                                   2d-sampler/c)
-  (make-2d-function->sampler plot-x-transform plot-y-transform))
-
-(defthing 3d-function->sampler (-> (real? real? real? . -> . real?)
-                                   (vector/c ivl? ivl? ivl?)
-                                   3d-sampler/c)
-  (make-3d-function->sampler plot-x-transform plot-y-transform plot-z-transform))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/ticks.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/ticks.rkt
deleted file mode 100644
index 314736e158..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/ticks.rkt
+++ /dev/null
@@ -1,756 +0,0 @@
-#lang racket/base
-
-;; Data structure that represents a tick, and functions that produce ticks.
-
-(require racket/string racket/list racket/contract racket/pretty racket/match racket/sequence
-         unstable/latent-contract/defthing
-         "math.rkt"
-         "contract.rkt"
-         "format.rkt"
-         "utils.rkt"
-         "axis-transform.rkt"
-         "sample.rkt"
-         "date-time.rkt"
-         "currency.rkt")
-
-(provide (all-defined-out))
-
-(struct pre-tick (value major?) #:transparent)
-(struct tick pre-tick (label) #:transparent)
-
-(struct ticks (layout format) #:transparent
-  #:property prop:procedure
-  (λ (t x-min x-max)
-    (match-define (ticks layout format) t)
-    (define ts (map pre-tick-inexact->exact (layout x-min x-max)))
-    (match-define (list (pre-tick xs majors) ...) ts)
-    (map tick xs majors (format x-min x-max ts))))
-
-(defcontract ticks-layout/c (real? real? . -> . (listof pre-tick?)))
-(defcontract ticks-format/c (real? real? (listof pre-tick?) . -> . (listof string?)))
-
-(defparam ticks-default-number exact-positive-integer? 4)
-
-;; ===================================================================================================
-;; Helpers
-
-(define-syntax-rule (with-exact-bounds x-min x-max body ...)
-  (cond [(x-min . > . x-max)
-         (error 'bounds-check "expected min <= max; given min = ~e and max = ~e" x-min x-max)]
-        [else  (let ([x-min  (inexact->exact x-min)]
-                     [x-max  (inexact->exact x-max)])
-                 body ...)]))
-
-(define (linear-seq-args x-min x-max step)
-  (define start (* (ceiling (/ x-min step)) step))
-  (define end (* (floor (/ x-max step)) step))
-  (define num (+ 1 (inexact->exact (round (/ (- end start) step)))))
-  (values start end num))
-
-(define (linear-major-values/step x-min x-max step)
-  (define-values (start end num) (linear-seq-args x-min x-max step))
-  (linear-seq start end num))
-
-(defproc (linear-minor-values/step [major-xs (listof real?)] [major-step real?]
-                                   [minor-ticks exact-nonnegative-integer?]) (listof real?)
-  (cond [(or (zero? minor-ticks) (empty? major-xs))  empty]
-        [else
-         (define major-start (first major-xs))
-         (define minor-step (/ major-step (+ minor-ticks 1)))
-         (for*/list ([x  (in-list (cons (- major-start major-step) major-xs))]
-                     [i  (in-range 1 (+ minor-ticks 1))])
-           (+ x (* i minor-step)))]))
-
-(defproc (tick-values->pre-ticks [major-xs (listof real?)] [minor-xs (listof real?)]
-                                 ) (listof pre-tick?)
-  (define major-ts (map (λ (x) (pre-tick x #t)) major-xs))
-  (define minor-ts (map (λ (x) (pre-tick x #f)) minor-xs))
-  (sort (append major-ts minor-ts) < #:key pre-tick-value))
-
-;; ===================================================================================================
-;; Linear ticks (default tick function, evenly spaced)
-
-(defproc (linear-tick-step [x-min real?] [x-max real?]
-                           [num-ticks exact-positive-integer?]
-                           [base (and/c exact-integer? (>=/c 2))]
-                           [divisors (listof exact-positive-integer?)]) real?
-  (define range (- x-max x-min))
-  (define mag (expt base (floor-log/base base range)))
-  (define epsilon (expt 10 (- (digits-for-range x-min x-max))))
-  (define e-start (floor-log/base base num-ticks))
-  (define-values (step diff)
-    (for*/fold ([step #f] [diff +inf.0]) ([e  (in-range e-start -2 -1)]
-                                          [d  (in-list (sort divisors <))])
-      ;; when num-ticks > base, we sometimes must divide by (expt base e) instead of just base
-      (define new-step (/ mag d (expt base e)))
-      ;; find the start, end and number of ticks with this step size
-      (define-values (new-start new-end new-num) (linear-seq-args x-min x-max new-step))
-      ;; endpoints don't count in the number of ticks (a concession for contour-ticks, which
-      ;; seems to work well outside of contour plots anyway)
-      (let* ([new-num  (if ((abs (- new-start x-min)) . < . epsilon) (- new-num 1) new-num)]
-             [new-num  (if ((abs (- new-end x-max)) . < . epsilon) (- new-num 1) new-num)])
-        ;; keep the step size that generates the number of ticks closest to num-ticks
-        (define new-diff (abs (- new-num num-ticks)))
-        (cond [(new-diff . <= . diff)  (values new-step new-diff)]
-              [else  (values step diff)]))))
-  (if step step (/ range num-ticks)))
-
-(defproc (linear-tick-values [x-min real?] [x-max real?]
-                             [num-ticks exact-positive-integer?]
-                             [base (and/c exact-integer? (>=/c 2))]
-                             [divisors (listof exact-positive-integer?)]
-                             ) (values (listof real?) (listof real?))
-  (with-exact-bounds
-   x-min x-max
-   (cond
-     [(= x-min x-max)  (values empty empty)]
-     [else
-      (define major-step (linear-tick-step x-min x-max num-ticks base divisors))
-      (define major-xs (linear-major-values/step x-min x-max major-step))
-      (define num-major-ticks (length major-xs))
-      
-      (define minor-xs
-        (let loop ([mult 2])
-          (cond [(mult . > . 4)  empty]
-                [else
-                 (define minor-step (linear-tick-step x-min x-max (* mult num-ticks) base divisors))
-                 (define minor-xs (linear-major-values/step x-min x-max minor-step))
-                 (cond [(empty? (remove* minor-xs major-xs))
-                        ;; this covers the major ticks as well; check for additional minor ticks
-                        (define real-minor-xs (remove* major-xs minor-xs))
-                        (cond [(empty? real-minor-xs)  (loop (+ 1 mult))]
-                              [else  real-minor-xs])]
-                       [else  (loop (+ 1 mult))])])))
-      
-      (values major-xs minor-xs)])))
-
-(defproc (linear-ticks-layout [#:number number exact-positive-integer? (ticks-default-number)]
-                              [#:base base (and/c exact-integer? (>=/c 2)) 10]
-                              [#:divisors divisors (listof exact-positive-integer?) '(1 2 4 5)]
-                              ) ticks-layout/c
-  (λ (x-min x-max)
-    (define-values (major-xs minor-xs) (linear-tick-values x-min x-max number base divisors))
-    (tick-values->pre-ticks major-xs minor-xs)))
-
-(defproc (linear-ticks-format) ticks-format/c
-  (λ (x-min x-max ts)
-    (with-exact-bounds
-     x-min x-max
-     (define digits (digits-for-range x-min x-max))
-     (for/list ([t  (in-list ts)])
-       (real->plot-label (pre-tick-value t) digits)))))
-
-(defproc (linear-ticks [#:number number exact-positive-integer? (ticks-default-number)]
-                       [#:base base (and/c exact-integer? (>=/c 2)) 10]
-                       [#:divisors divisors (listof exact-positive-integer?) '(1 2 4 5)]
-                       ) ticks? #:document-body
-  (ticks (linear-ticks-layout #:number number #:base base
-                              #:divisors divisors)
-         (linear-ticks-format)))
-
-;; ===================================================================================================
-;; No ticks
-
-(defthing no-ticks-layout ticks-layout/c #:document-value
-  (λ (x-min x-max) empty))
-
-(defthing no-ticks-format ticks-format/c #:document-value
-  (λ (x-min x-max pre-ticks)
-    (map (λ (_) "") pre-ticks)))
-
-(defthing no-ticks ticks? #:document-value
-  (ticks no-ticks-layout no-ticks-format))
-
-;; ===================================================================================================
-;; Exponential ticks (for log scale)
-
-(defproc (log-ticks-layout [#:number number exact-positive-integer? (ticks-default-number)]
-                           [#:base base (and/c exact-integer? (>=/c 2)) 10]
-                           ) ticks-layout/c
-  (λ (x-min x-max)
-    (with-exact-bounds
-     x-min x-max
-     (when ((exact->inexact x-min) . <= . 0)
-       (raise-type-error 'log-ticks-layout "positive real" 0 x-min x-max))
-     (define log-start (ceiling-log/base base x-min))
-     (define log-end (floor-log/base base x-max))
-     (define skip (max 1 (ceiling (/ (+ 1 (- log-end log-start)) number))))
-     (filter (λ (t) (<= x-min (pre-tick-value t) x-max))
-             (append*
-              (for/list ([log-x  (in-range (- log-start 1) (+ log-end 2))]
-                         [m      (in-cycle (in-range skip))])
-                (define x (expt base log-x))
-                (cond [(= skip 1)  (for/list ([i  (in-range 0 (sub1 base))])
-                                     (pre-tick (+ x (* i x))
-                                               (and (zero? i) (zero? m))))]
-                      [else  (list (pre-tick x (zero? m)))])))))))
-
-(defproc (log-ticks-format [#:base base (and/c exact-integer? (>=/c 2)) 10]) ticks-format/c
-  (define base-str (number->string base))
-  (λ (x-min x-max ts)
-    (with-exact-bounds
-     x-min x-max
-     (define epsilon (expt 10 (- (digits-for-range x-min x-max))))
-     (define base-digits (digits-for-range 0 base))
-     (for/list ([t  (in-list ts)])
-       (define x (pre-tick-value t))
-       (define log-x (floor-log/base base x))
-       (define (major-str)
-         (if (zero? log-x) "1" (format "~a~a" base-str (integer->superscript log-x))))
-       (cond [((abs (- x (expt base log-x))) . < . epsilon)  (major-str)]
-             [(zero? log-x)  (real->plot-label x base-digits)]
-             [else  (format "~a×~a"
-                            (real->plot-label (/ x (expt base log-x)) base-digits)
-                            (major-str))])))))
-
-(defproc (log-ticks [#:number number exact-positive-integer? (ticks-default-number)]
-                    [#:base base (and/c exact-integer? (>=/c 2)) 10]
-                    ) ticks? #:document-body
-  (ticks (log-ticks-layout #:number number #:base base)
-         (log-ticks-format #:base base)))
-
-;; ===================================================================================================
-;; Date/time helpers
-
-(defproc (find-linear-tick-step [x-min real?] [x-max real?]
-                                [num-ticks exact-positive-integer?]
-                                [steps (listof real?)]) real?
-  (with-exact-bounds
-   x-min x-max
-   (define epsilon (expt 10 (- (digits-for-range x-min x-max))))
-   (define-values (step diff)
-    (for/fold ([step #f] [diff +inf.0]) ([new-step  (in-list (sort steps <))])
-      (define-values (new-start new-end new-num) (linear-seq-args x-min x-max new-step))
-      ;; endpoints don't count in number of ticks (see linear-tick-step)
-      (let* ([new-num  (if ((abs (- new-start x-min)) . < . epsilon) (- new-num 1) new-num)]
-             [new-num  (if ((abs (- new-end x-max)) . < . epsilon) (- new-num 1) new-num)])
-        (define new-diff (abs (- new-num num-ticks)))
-        (cond [(new-diff . <= . diff)  (values new-step new-diff)]
-              [else  (values step diff)]))))
-   step))
-
-(define (count-changing-fields formatter fmt-list xs)
-  (let ([fmt-list  (filter symbol? fmt-list)])
-    (define formatted-dates (for/list ([x  (in-list xs)])
-                              (apply-formatter formatter fmt-list x)))
-    (count (λ (fields) (not (apply equal?* fields)))
-           (transpose formatted-dates))))
-
-;; Find the shortest format string that has the maximum number of changing fields
-(define (choose-format-list formatter fmt-lists xs)
-  (let ([fmt-lists  (sort fmt-lists <
-                          #:key (λ (fmt-list) (count symbol? fmt-list))
-                          #:cache-keys? #t)])
-    (argmax (λ (fmt-list) (count-changing-fields formatter fmt-list xs))
-            fmt-lists)))
-
-;; ===================================================================================================
-;; Date ticks
-
-(defthing 24h-descending-date-ticks-formats (listof string?) #:document-value
-  '("~Y-~m-~d ~H:~M:~f"
-    "~Y-~m-~d ~H:~M"
-    "~Y-~m-~d ~Hh"
-    "~Y-~m-~d"
-    "~Y-~m"
-    "~Y"
-    "~m-~d ~H:~M:~f"
-    "~m-~d ~H:~M"
-    "~m-~d ~Hh"
-    "~m-~d"
-    "~H:~M:~f"
-    "~H:~M"
-    "~Hh"
-    "~M:~fs"
-    "~Mm"
-    "~fs"))
-
-(defthing 12h-descending-date-ticks-formats (listof string?) #:document-value
-  '("~Y-~m-~d ~I:~M:~f ~p"
-    "~Y-~m-~d ~I:~M ~p"
-    "~Y-~m-~d ~I ~p"
-    "~Y-~m-~d"
-    "~Y-~m"
-    "~Y"
-    "~m-~d ~I:~M:~f ~p"
-    "~m-~d ~I:~M ~p"
-    "~m-~d ~I ~p"
-    "~m-~d"
-    "~I:~M:~f ~p"
-    "~I:~M ~p"
-    "~I ~p"
-    "~M:~fs"
-    "~Mm"
-    "~fs"))
-
-(defparam date-ticks-formats (listof string?) 24h-descending-date-ticks-formats)
-
-;; Tick steps to try, in seconds
-(define date-steps
-  (list 1 2 4 5 10 15 20 30 40 45
-        seconds-per-minute
-        (* 2 seconds-per-minute)
-        (* 4 seconds-per-minute)
-        (* 5 seconds-per-minute)
-        (* 10 seconds-per-minute)
-        (* 15 seconds-per-minute)
-        (* 20 seconds-per-minute)
-        (* 30 seconds-per-minute)
-        (* 45 seconds-per-minute)
-        seconds-per-hour
-        (* 2 seconds-per-hour)
-        (* 3 seconds-per-hour)
-        (* 4 seconds-per-hour)
-        (* 6 seconds-per-hour)
-        (* 8 seconds-per-hour)
-        (* 12 seconds-per-hour)
-        (* 18 seconds-per-hour)
-        seconds-per-day
-        (* 2 seconds-per-day)
-        (* 4 seconds-per-day)
-        (* 5 seconds-per-day)
-        (* 10 seconds-per-day)
-        seconds-per-week
-        (* 2 seconds-per-week)
-        avg-seconds-per-month
-        (* 2 avg-seconds-per-month)
-        (* 3 avg-seconds-per-month)
-        (* 4 avg-seconds-per-month)
-        (* 6 avg-seconds-per-month)
-        (* 8 avg-seconds-per-month)
-        (* 9 avg-seconds-per-month)
-        avg-seconds-per-year
-        (* 2 avg-seconds-per-year)
-        (* 4 avg-seconds-per-year)
-        (* 5 avg-seconds-per-year)))
-
-(define (date-tick-values x-min x-max num-ticks)
-  (with-exact-bounds
-   x-min x-max
-   (cond [(= x-min x-max)  (values empty empty)]
-         [else
-          (define range (- x-max x-min))
-          (define step
-            (cond [(range . < . (* num-ticks (first date-steps)))
-                   (linear-tick-step x-min x-max num-ticks 10 '(1 2 4 5))]
-                  [(range . > . (* num-ticks (last date-steps)))
-                   (* avg-seconds-per-year
-                      (linear-tick-step (/ x-min avg-seconds-per-year) (/ x-max avg-seconds-per-year)
-                                        num-ticks 10 '(1 2 4 5)))]
-                  [else  (find-linear-tick-step x-min x-max num-ticks date-steps)]))
-          (define date-round
-            (cond [(step . >= . avg-seconds-per-year)   utc-seconds-round-year]
-                  [(step . >= . avg-seconds-per-month)  utc-seconds-round-month]
-                  [else  (λ (d) d)]))
-          (define major-xs (linear-major-values/step x-min x-max step))
-          (values (map date-round major-xs) empty)])))
-
-(defproc (date-ticks-layout [#:number number exact-positive-integer? (ticks-default-number)]
-                            ) ticks-layout/c
-  (λ (x-min x-max)
-    (define-values (major-xs minor-xs) (date-tick-values x-min x-max number))
-    (tick-values->pre-ticks major-xs minor-xs)))
-
-(defproc (date-ticks-format [#:formats formats (listof string?) (date-ticks-formats)]) ticks-format/c
-  (define fmt-lists (map parse-format-string formats))
-  (λ (x-min x-max ts)
-    (with-exact-bounds
-     x-min x-max
-     (define formatter (plot-date-formatter x-min x-max))
-     (define xs (map pre-tick-value ts))
-     (cond [(empty? xs)  empty]
-           [else
-            (define fmt-list (choose-format-list formatter fmt-lists xs))
-            (cons (string-append* (apply-formatter formatter fmt-list (first xs)))
-                  (for/list ([last-x  (in-list xs)] [x  (in-list (rest xs))])
-                    (define fmt-list (choose-format-list formatter fmt-lists (list last-x x)))
-                    (string-append* (apply-formatter formatter fmt-list x))))]))))
-
-(defproc (date-ticks [#:number number exact-positive-integer? (ticks-default-number)]
-                     [#:formats formats (listof string?) (date-ticks-formats)]
-                     ) ticks? #:document-body
-  (ticks (date-ticks-layout #:number number)
-         (date-ticks-format #:formats formats)))
-
-;; ===================================================================================================
-;; Time ticks
-
-(defthing 24h-descending-time-ticks-formats (listof string?) #:document-value
-  '("~dd ~H:~M:~f"
-    "~dd ~H:~M"
-    "~dd ~Hh"
-    "~dd"
-    "~H:~M:~f"
-    "~H:~M"
-    "~Hh"
-    "~M:~fs"
-    "~Mm"
-    "~fs"))
-
-(defthing 12h-descending-time-ticks-formats (listof string?) #:document-value
-  '("~dd ~I:~M:~f ~p"
-    "~dd ~I:~M ~p"
-    "~dd ~I ~p"
-    "~dd"
-    "~I:~M:~f ~p"
-    "~I:~M ~p"
-    "~I ~p"
-    "~M:~fs"
-    "~Mm"
-    "~fs"))
-
-(defparam time-ticks-formats (listof string?) 24h-descending-time-ticks-formats)
-
-;; Tick steps to try, in seconds
-(define time-steps
-  (list 1 2 4 5 10 15 20 30 40 45
-        seconds-per-minute
-        (* 2 seconds-per-minute)
-        (* 4 seconds-per-minute)
-        (* 5 seconds-per-minute)
-        (* 10 seconds-per-minute)
-        (* 15 seconds-per-minute)
-        (* 20 seconds-per-minute)
-        (* 30 seconds-per-minute)
-        (* 45 seconds-per-minute)
-        seconds-per-hour
-        (* 2 seconds-per-hour)
-        (* 3 seconds-per-hour)
-        (* 4 seconds-per-hour)
-        (* 6 seconds-per-hour)
-        (* 8 seconds-per-hour)
-        (* 12 seconds-per-hour)
-        (* 18 seconds-per-hour)
-        seconds-per-day
-        (* 2 seconds-per-day)
-        (* 4 seconds-per-day)
-        (* 5 seconds-per-day)
-        (* 10 seconds-per-day)
-        (* 15 seconds-per-day)
-        (* 30 seconds-per-day)
-        (* 60 seconds-per-day)
-        (* 90 seconds-per-day)))
-
-(define (time-tick-values x-min x-max num-ticks)
-  (with-exact-bounds
-   x-min x-max
-   (cond [(= x-min x-max)  (values empty empty)]
-         [else
-          (define range (- x-max x-min))
-          (define step
-            (cond [(range . < . (* num-ticks (first time-steps)))
-                   (linear-tick-step x-min x-max num-ticks 10 '(1 2 4 5))]
-                  [(range . > . (* num-ticks (last time-steps)))
-                   (* seconds-per-day
-                      (linear-tick-step (/ x-min seconds-per-day) (/ x-max seconds-per-day)
-                                        num-ticks 10 '(1 2 4 5)))]
-                  [else
-                   (find-linear-tick-step x-min x-max num-ticks time-steps)]))
-          (define major-xs (linear-major-values/step x-min x-max step))
-          (values major-xs empty)])))
-
-(defproc (time-ticks-layout [#:number number exact-positive-integer? (ticks-default-number)]
-                            ) ticks-layout/c
-  (λ (x-min x-max)
-    (define-values (major-xs minor-xs) (time-tick-values x-min x-max number))
-    (tick-values->pre-ticks major-xs minor-xs)))
-
-(defproc (time-ticks-format [#:formats formats (listof string?) (time-ticks-formats)]) ticks-format/c
-  (define fmt-lists (map parse-format-string formats))
-  (λ (x-min x-max ts)
-    (with-exact-bounds
-     x-min x-max
-     (define formatter (plot-time-formatter x-min x-max))
-     (define xs (map pre-tick-value ts))
-     (cond [(empty? xs)  empty]
-           [else
-            (define fmt-list (choose-format-list formatter fmt-lists xs))
-            (cons (string-append* (apply-formatter formatter fmt-list (first xs)))
-                  (for/list ([last-x  (in-list xs)] [x  (in-list (rest xs))])
-                    (define fmt-list (choose-format-list formatter fmt-lists (list last-x x)))
-                    (string-append* (apply-formatter formatter fmt-list x))))]))))
-
-(defproc (time-ticks [#:number number exact-positive-integer? (ticks-default-number)]
-                     [#:formats formats (listof string?) (time-ticks-formats)]
-                     ) ticks? #:document-body
-  (ticks (time-ticks-layout #:number number)
-         (time-ticks-format #:formats formats)))
-
-;; ===================================================================================================
-;; Byte and bit ticks
-
-;; "", Kilo, Mega, Giga, Tera, Peta, Exa, Zeta, Yotta
-(define byte-suffixes #("B" "KB" "MB" "GB" "TB" "PB" "EB" "ZB" "YB"))
-(define bit-suffixes #("b" "Kb" "Mb" "Gb" "Tb" "Pb" "Eb" "Zb" "Yb"))
-
-(defproc (bit/byte-ticks-format [#:size size (or/c 'byte 'bit) 'byte]
-                                [#:kind kind (or/c 'CS 'SI) 'CS]) ticks-format/c
-  (λ (x-min x-max ts)
-    (with-exact-bounds
-     x-min x-max
-     (define suffixes (if (eq? size 'bit) bit-suffixes byte-suffixes))
-     (define-values (base pow) (case kind
-                                 [(SI)  (values 10 3)]
-                                 [else  (values 2 10)]))
-     (define x-largest (max* (abs x-min) (abs x-max)))
-     (define b (floor-log/base (expt base pow) x-largest))
-     (define format-str
-       (cond [(and (b . >= . 0) (b . < . (vector-length suffixes)))
-              (format "~a ~a" "~a" (vector-ref suffixes b))]
-             [else
-              (format "~a×~a~a ~a" "~a"
-                      base (integer->superscript (* b pow)) (vector-ref suffixes 0))]))
-     (define unit (expt base (* b pow)))
-     (define digits (digits-for-range (/ x-min unit) (/ x-max unit)))
-     (for/list ([t  (in-list ts)])
-       (define unit-x (/ (pre-tick-value t) unit))
-       (format format-str (real->plot-label unit-x digits #f))))))
-
-(defproc (bit/byte-ticks [#:number number exact-positive-integer? (ticks-default-number)]
-                         [#:size size (or/c 'byte 'bit) 'byte]
-                         [#:kind kind (or/c 'CS 'SI) 'CS]
-                         ) ticks? #:document-body
-  (define si? (eq? kind 'SI))
-  (ticks (linear-ticks-layout #:number number #:base (if si? 10 2)
-                              #:divisors (if si? '(1 2 4 5) '(1 2)))
-         (bit/byte-ticks-format #:size size #:kind kind)))
-
-;; ===================================================================================================
-;; Currency
-
-;; US "short scale" suffixes
-(defthing us-currency-scales (listof string?) #:document-value '("" "K" "M" "B" "T"))
-;; The UK officially uses the short scale since 1974
-;; Million is abbreviated "m" instead of "mn" because "mn" stands for minutes
-(defthing uk-currency-scales (listof string?) #:document-value '("" "k" "m" "bn" "tr"))
-;; European countries use the long scale: million, milliard, billion
-(defthing eu-currency-scales (listof string?) #:document-value '("" "K" "M" "Md" "B"))
-;; The larger the scale suffixes get, the less standardized they are; so we stop at billion (long)
-
-;; US negative amounts are in parenthesis:
-(defthing us-currency-formats (list/c string? string? string?) #:document-value
-  '("~$~w.~f~s" "(~$~w.~f~s)" "~$0"))
-;; The UK is more reasonable, using a negative sign for negative amounts:
-(defthing uk-currency-formats (list/c string? string? string?) #:document-value
-  '("~$~w.~f~s" "-~$~w.~f~s" "~$0"))
-;; The more common EU format (e.g. France, Germany, Italy, Spain):
-(defthing eu-currency-formats (list/c string? string? string?) #:document-value
-  '("~w,~f ~s~$" "-~w,~f ~s~$" "0 ~$"))
-
-(defparam currency-ticks-scales (listof string?) us-currency-scales)
-(defparam currency-ticks-formats (list/c string? string? string?) us-currency-formats)
-
-(struct amount-data (sign amount unit suffix) #:transparent)
-
-(define (currency-formatter x-min x-max)
-  (λ (fmt data)
-    (case fmt
-      [(~$)  (amount-data-sign data)]
-      [(~s)  (amount-data-suffix data)]
-      [(~w ~f)
-       (match-define (amount-data _sign amt unit _suffix) data)
-       (define digits (digits-for-range (/ x-min unit) (/ x-max unit)))
-       (define n (max 2 digits))
-       (define 10^n (expt 10 n))
-       (define x (/ (round (* (inexact->exact amt) 10^n)) 10^n))
-       (define whole (floor x))
-       (case fmt
-         [(~w)  (number->string whole)]
-         [(~f)  (define frac (- x whole))
-                (cond [(= 1 unit)    (substring (real->decimal-string* frac 2 n) 2)]
-                      [(zero? frac)  "0"]
-                      [else          (substring (real->decimal-string* frac 1 n) 2)])])]
-      [else  #f])))
-
-(defproc (currency-ticks-format [#:kind kind (or/c string? symbol?) 'USD]
-                                [#:scales scales (listof string?) (currency-ticks-scales)]
-                                [#:formats formats (list/c string? string? string?)
-                                           (currency-ticks-formats)]
-                                ) ticks-format/c
-  (match-define (list positive-format-string negative-format-string zero-format-string) formats)
-  (define positive-format-list (parse-format-string positive-format-string))
-  (define negative-format-list (parse-format-string negative-format-string))
-  (define zero-format-list (parse-format-string zero-format-string))
-  (define suffixes (list->vector scales))
-  (define n (vector-length suffixes))
-  (λ (x-min x-max ts)
-    (with-exact-bounds
-     x-min x-max
-     (define formatter (currency-formatter x-min x-max))
-     (define sign (cond [(string? kind)  kind]
-                        [else  (hash-ref currency-code->sign kind (λ () (symbol->string kind)))]))
-     (define x-largest (max* (abs x-min) (abs x-max)))
-     (define b (let ([b  (floor-log/base 1000 x-largest)])
-                 (if (b . < . 0) (+ b 1) b)))
-     (define suffix
-       (cond [(and (b . >= . 0) (b . < . n))  (vector-ref suffixes b)]
-             [else  (format "×10~a" (integer->superscript (* b 3)))]))
-     (define unit
-       (cond [(= 0 (string-length suffix))  1]
-             [else  (expt 1000 b)]))
-     (for/list ([t  (in-list ts)])
-       (define x (pre-tick-value t))
-       (define format-list (cond [(positive? x)  positive-format-list]
-                                 [(negative? x)  negative-format-list]
-                                 [else           zero-format-list]))
-       (define unit-x (/ (abs x) unit))
-       (string-append*
-        (apply-formatter formatter format-list
-                         (amount-data sign unit-x unit suffix)))))))
-
-(defproc (currency-ticks [#:number number exact-positive-integer? (ticks-default-number)]
-                         [#:kind kind (or/c string? symbol?) 'USD]
-                         [#:scales scales (listof string?) (currency-ticks-scales)]
-                         [#:formats formats (list/c string? string? string?) (currency-ticks-formats)]
-                         ) ticks? #:document-body
-  (ticks (linear-ticks-layout #:number number)
-         (currency-ticks-format #:kind kind #:scales scales
-                                #:formats formats)))
-
-;; ===================================================================================================
-;; Fractions
-
-(define (format-fraction x)
-  (cond [(inexact? x)  (format-fraction (inexact->exact x))]
-        [(x . < . 0)  (format "-~a" (format-fraction (- x)))]
-        [(x . = . 0)  "0"]
-        [(x . < . 1)  (format "~a/~a" (numerator x) (denominator x))]
-        [else
-         (define d (denominator x))
-         (cond [(d . = . 1)  (format "~a" (numerator x))]
-               [else
-                (define w (floor x))
-                (let ([x  (- x w)])
-                  (format "~a ~a/~a" w (numerator x) (denominator x)))])]))
-
-(defproc (fraction-ticks-format [#:base base (and/c exact-integer? (>=/c 2)) 10]
-                                [#:divisors divisors (listof exact-positive-integer?) '(1 2 3 4 5)]
-                                ) ticks-format/c
-  (define fracs (remove-duplicates (map (λ (d) (/ d base)) divisors)))
-  (λ (x-min x-max ts)
-    (define digits (digits-for-range x-min x-max base (ceiling-log/base base 1000)))
-    (define fracs (remove-duplicates (map (λ (d) (* (/ base d) (expt base (- digits)))) divisors)))
-    (for/list ([t  (in-list ts)])
-      (define x (inexact->exact (pre-tick-value t)))
-      (define xs
-        (for/list ([frac  (in-list fracs)])
-          (* frac (round (/ x frac)))))
-      (format-fraction (argmin (λ (y) (abs (- x y))) xs)))))
-
-(defproc (fraction-ticks [#:base base (and/c exact-integer? (>=/c 2)) 10]
-                         [#:divisors divisors (listof exact-positive-integer?) '(1 2 3 4 5)]
-                         ) ticks? #:document-body
-  (ticks (linear-ticks #:base base #:divisors divisors)
-         (fraction-ticks-format #:base base #:divisors divisors)))
-
-;; ===================================================================================================
-;; Tick combinators
-
-(defproc (ticks-mimic [thunk (-> ticks?)]) ticks?
-  (ticks (λ (x-min x-max) ((ticks-layout (thunk)) x-min x-max))
-         (λ (x-min x-max ts) ((ticks-format (thunk)) x-min x-max ts))))
-
-(defproc (ticks-scale [t ticks?] [fun invertible-function?]) ticks?
-  (match-define (invertible-function f g) fun)
-  (match-define (ticks layout format) t)
-  (ticks (λ (x-min x-max)
-           (define ts (layout (f x-min) (f x-max)))
-           (for/list ([t  (in-list ts)])
-             (match-define (pre-tick x major?) t)
-             (pre-tick (g x) major?)))
-         (λ (x-min x-max ts)
-           (format (f x-min) (f x-max) (map (λ (t)
-                                              (match-define (pre-tick x major?) t)
-                                              (pre-tick (f x) major?))
-                                            ts)))))
-
-(defproc (ticks-add [t ticks?] [xs (listof real?)] [major? boolean? #t]) ticks?
-  (match-define (ticks layout format) t)
-  (ticks (λ (x-min x-max)
-           (append (layout x-min x-max)
-                   (for/list ([x  (in-list xs)])
-                     (pre-tick x major?))))
-         format))
-
-(defproc (linear-scale [m rational?] [b rational? 0]) invertible-function? #:document-body
-  (invertible-function (λ (x) (+ (* m x) b))
-                       (λ (y) (/ (- y b) m))))
-
-;; ===================================================================================================
-;; Tick utils
-
-(define (same-label? t1 t2) (string=? (tick-label t1) (tick-label t2)))
-
-(define (collapse-equiv-ticks ts near-format-string)
-  (match-define (list (tick xs majors labels) ...) ts)
-  (define x (/ (apply + xs) (length ts)))
-  (define major? (ormap values majors))
-  (define label1 (first labels))
-  (define label2 (last labels))
-  (define label
-    (cond [(string=? label1 label2)  label1]
-          [else  (format near-format-string label1 label2)]))
-  (tick x major? label))
-
-(defproc (collapse-ticks [ts (listof tick?)] [near? (tick? tick? . -> . boolean?)]
-                         [near-format-string string? "~a|~a"]) (listof tick?)
-  (let ([ts  (sort ts < #:key pre-tick-value)])
-    (append*
-     (for/list ([ts  (in-list (group-neighbors
-                               ts (λ (t1 t2) (or (same-label? t1 t2) (near? t1 t2)))))])
-       (define n (length ts))
-       (define m (count pre-tick-major? ts))
-       (cond [(n . <= . 1)  ts]
-             [(m . = . 0)  (list (collapse-equiv-ticks ts near-format-string))]
-             [(m . = . 1)  (filter pre-tick-major? ts)]
-             [else  (list (collapse-equiv-ticks (filter pre-tick-major? ts) near-format-string))])))))
-
-(defproc (pre-tick-inexact->exact [t pre-tick?]) pre-tick?
-  (match-define (pre-tick x major?) t)
-  (pre-tick (inexact->exact x) major?))
-
-(defproc (tick-inexact->exact [t tick?]) tick?
-  (match-define (tick x major? label) t)
-  (tick (inexact->exact x) major? label))
-
-(defproc (contour-ticks [z-ticks ticks?] [z-min real?] [z-max real?]
-                        [levels (or/c 'auto exact-positive-integer? (listof real?))]
-                        [intervals? boolean?]) (listof tick?)
-  (define epsilon (expt 10 (- (digits-for-range z-min z-max))))
-  (match-define (ticks layout format) z-ticks)
-  ;; initial tick layout
-  (define ts
-    (cond [(eq? levels 'auto)  (filter pre-tick-major? (layout z-min z-max))]
-          [else  (define zs (cond [(list? levels)  (filter (λ (z) (<= z-min z z-max)) levels)]
-                                  [else  (linear-seq z-min z-max levels #:start? #f #:end? #f)]))
-                 (map (λ (z) (pre-tick z #t)) zs)]))
-  (let* (;; remove z-min tick (or the one close to it) if present
-         [ts  (if (and (not (empty? ts))
-                       ((abs (- z-min (pre-tick-value (first ts)))) . < . epsilon))
-                  (rest ts)
-                  ts)]
-         ;; remove z-max tick (or the one close to it) if present
-         [ts  (if (and (not (empty? ts))
-                       ((abs (- z-max (pre-tick-value (last ts)))) . < . epsilon))
-                  (drop-right ts 1)
-                  ts)]
-         ;; add z-min and z-max if doing intervals
-         [ts  (cond [(not intervals?)  ts]
-                    [else  (append (list (pre-tick z-min #t)) ts (list (pre-tick z-max #t)))])])
-    ;; format the ticks
-    (match-define (list (pre-tick zs majors) ...) ts)
-    (define labels (format z-min z-max ts))
-    (map tick zs majors labels)))
-
-(defproc (format-tick-labels [x-ticks ticks?] [x-min real?] [x-max real?] [xs (listof real?)]
-                             ) (listof string?)
-  (match-define (ticks layout format) x-ticks)
-  (let* ([tick-xs  (map pre-tick-value (filter pre-tick-major? (layout x-min x-max)))]
-         [tick-xs  (remove* xs tick-xs)]
-         [tick-xs  (if (empty? tick-xs) empty (list (apply min tick-xs) (apply max tick-xs)))]
-         [tick-xs  (sort (append xs tick-xs) <)])
-    (define ts (map (λ (x) (pre-tick x #t)) tick-xs))
-    (for/list ([x  (in-list tick-xs)]
-               [l  (in-list (format x-min x-max ts))]
-               #:when (member x xs))
-      l)))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/utils.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/utils.rkt
deleted file mode 100644
index 046ded3d92..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/utils.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang racket/base
-
-;; Extra functions that can't be easily categorized
-
-(require racket/sequence racket/list racket/math racket/flonum racket/match)
-
-(provide (all-defined-out))
-
-(define (in-cycle* s)
-  (define n (sequence-length s))
-  (if (zero? n) empty-sequence (in-cycle s)))
-
-(define (sequence-take seq start end)
-  (for/list ([e  (sequence-tail seq start)] 
-             [_  (in-range (- end start))])
-    e))
-
-(define (sequence-head-vector name xs n)
-  (define vec (for/vector ([x  xs] [i  (in-range n)]) x))
-  (unless (= n (vector-length vec))
-    (raise-argument-error name (format "sequence of length >= ~a" n) xs))
-  vec)
-
-(define (sequence->listof-vector name vs n)
-  (map (λ (v) (sequence-head-vector name v n)) (sequence->list vs)))
-
-(define (list-index v lst [equal? equal?])
-  (for/first ([e  (in-list lst)] [i  (in-naturals)] #:when (equal? e v))
-    i))
-
-(define (list-duplicate-index lst)
-  (let loop ([lst lst] [j 0])
-    (cond [(empty? lst)  #f]
-          [else
-           (define fst (first lst))
-           (define idx
-             (for/first ([e  (in-list (rest lst))] [i  (in-naturals)] #:when (equal? e fst))
-               (+ i j 1)))
-           (if idx idx (loop (rest lst) (+ j 1)))])))
-
-(define (cumulative-sum xs)
-  (reverse (foldl (λ (x xs) (cons (+ x (first xs)) xs)) '(0) xs)))
-
-(define (assoc-cons hash key new-value)
-  (let loop ([hash  hash])
-    (cond [(empty? hash)  (list (cons key (list new-value)))]
-          [else
-           (define entry (first hash))
-           (cond [(equal? (car entry) key)  (cons (cons key (cons new-value (cdr entry)))
-                                                  (rest hash))]
-                 [else  (cons (first hash) (loop (rest hash)))])])))
-
-(define (vector-find-index pred? xs [start 0] [end (vector-length xs)])
-  (for/first ([i  (in-range start end)] #:when (pred? (vector-ref xs i)))
-    i))
-
-(define ((sorted-apply sort f) lst)
-  (define h
-    (let ([sorted-lst  (sort lst)])
-      (make-hash (map cons sorted-lst (f sorted-lst)))))
-  (map (λ (e) (hash-ref h e)) lst))
-
-(define (transpose xss)
-  (cond [(andmap empty? xss)  empty]
-        [else  (cons (map (λ (xs) (if (empty? xs) #f (first xs))) xss)
-                     (transpose (map (λ (xs) (if (empty? xs) empty (rest xs))) xss)))]))
-
-(define (group-neighbors lst equiv?)
-  (reverse
-   (map reverse
-        (cond
-          [(empty? lst)  empty]
-          [else
-           (for/fold ([res  (list (list (first lst)))]) ([e  (in-list (rest lst))])
-             (cond
-               [(andmap (λ (e2) (equiv? e e2)) (first res))  (cons (cons e (first res)) (rest res))]
-               [else  (list* (list e) res)]))]))))
-
-(define (bin-samples bin-bounds xs)
-  (let* ([bin-bounds  (filter (λ (x) (not (eqv? x +nan.0))) (remove-duplicates bin-bounds))]
-         [bin-bounds  (sort bin-bounds <)]
-         [x-min  (first bin-bounds)]
-         [x-max  (last bin-bounds)]
-         [xs  (filter (λ (x) (<= x-min x x-max)) xs)]
-         [xs  (sort xs <)])
-    (define-values (res rest-xs)
-      (for/fold ([res empty] [xs xs]) ([x1  (in-list bin-bounds)]
-                                       [x2  (in-list (rest bin-bounds))])
-        (define-values (lst rest-xs)
-          (let loop ([lst empty] [xs xs])
-            (if (and (not (empty? xs)) (<= x1 (first xs) x2))
-                (loop (cons (first xs) lst) (rest xs))
-                (values lst xs))))
-        (values (cons (reverse lst) res)
-                rest-xs)))
-    (reverse res)))
-
-(define-syntax-rule (let-map (id ...) fun body0 body ...)
-  (let ([id  (fun id)] ...)
-    body0 body ...))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/common/worker-thread.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/common/worker-thread.rkt
deleted file mode 100644
index 8514ffa44a..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/common/worker-thread.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-
-(require racket/bool racket/match racket/async-channel)
-
-(provide make-worker-thread worker-thread? worker-thread-working? worker-thread-waiting?
-         worker-thread-put worker-thread-try-put
-         worker-thread-get worker-thread-try-get
-         worker-thread-wait
-         worker-thread-send
-         worker-thread-kill)
-
-(struct worker-thread (state message-channel result-channel thread) #:mutable #:transparent)
-(struct values-result (value-list) #:transparent)
-(struct error-result (value) #:transparent)
-
-(define (make-worker-thread handle-message)
-  (define msg-ch (make-channel))
-  (define res-ch (make-async-channel))
-  (define (loop)
-    (with-handlers ([(λ (e) #t)  (λ (e) (async-channel-put res-ch (error-result e)))])
-      (define msg (channel-get msg-ch))
-      (define res (call-with-values (λ () (handle-message msg))
-                                    (λ value-list (values-result value-list))))
-      (async-channel-put res-ch res))
-    (loop))
-  (worker-thread 'waiting msg-ch res-ch (thread loop)))
-
-(define (worker-thread-working? r)
-  (symbol=? (worker-thread-state r) 'working))
-
-(define (worker-thread-waiting? r)
-  (symbol=? (worker-thread-state r) 'waiting))
-
-(define (worker-thread-get* r get fail-thunk)
-  (match-define (worker-thread state msg-ch res-ch th) r)
-  (case state
-    [(working)  (define res (get res-ch))
-                (when res (set-worker-thread-state! r 'waiting))
-                (match res
-                  [(values-result value-list)  (apply values value-list)]
-                  [(error-result value)        (raise value)]
-                  [#f  (fail-thunk)])]
-    [(waiting)  (fail-thunk)]))
-
-(define (worker-thread-try-get r [fail-thunk (λ () #f)])
-  (worker-thread-get* r async-channel-try-get fail-thunk))
-
-(define (worker-thread-get-fail)
-  (error 'worker-thread-get "cannot get a value from a waiting worker thread"))
-
-(define (worker-thread-get r [fail-thunk worker-thread-get-fail])
-  (worker-thread-get* r async-channel-get fail-thunk))
-
-(define (worker-thread-wait r)
-  (when (worker-thread-working? r) (worker-thread-get r))
-  (void))
-
-(define (worker-thread-put* r msg fail-thunk)
-  (match-define (worker-thread state msg-ch res-ch th) r)
-  (case state
-    [(waiting)  (channel-put msg-ch msg)
-                (set-worker-thread-state! r 'working)
-                #t]
-    [(working)  (fail-thunk)]))
-
-(define (worker-thread-try-put r msg [fail-thunk (λ () #f)])
-  (worker-thread-put* r msg fail-thunk))
-
-(define (worker-thread-put-fail)
-  (error 'worker-thread-put "cannot send a message to a working worker thread"))
-
-(define (worker-thread-put r msg [fail-thunk worker-thread-put-fail])
-  (worker-thread-put* r msg fail-thunk))
-
-(define (worker-thread-send r msg)
-  (worker-thread-wait r)
-  (worker-thread-put r msg)
-  (worker-thread-get r))
-
-(define (worker-thread-kill r)
-  (match-define (worker-thread state msg-ch res-ch th) r)
-  (kill-thread th))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/axis-transform.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/axis-transform.rkt
deleted file mode 100644
index 187e27b5b7..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/axis-transform.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-
-(require racket/contract unstable/latent-contract)
-
-(require "../common/axis-transform.rkt")
-(provide (contract-out (struct invertible-function ([f (real? . -> . real?)]
-                                                    [g (real? . -> . real?)])))
-         (activate-contract-out id-function
-                                invertible-compose
-                                invertible-inverse
-                                axis-transform/c
-                                id-transform
-                                apply-axis-transform
-                                make-axis-transform
-                                axis-transform-compose
-                                axis-transform-append
-                                axis-transform-bound
-                                log-transform
-                                cbrt-transform
-                                hand-drawn-transform
-                                stretch-transform
-                                collapse-transform))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/date-time.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/date-time.rkt
deleted file mode 100644
index a605d0364b..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/date-time.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require racket/contract unstable/latent-contract)
-
-(require "../common/date-time.rkt")
-(provide (contract-out (struct plot-time ([second (and/c (>=/c 0) (</c 60))]
-                                          [minute (integer-in 0 59)]
-                                          [hour (integer-in 0 23)]
-                                          [day exact-integer?])))
-         (activate-contract-out plot-time->seconds seconds->plot-time
-                                datetime->real))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/draw.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/draw.rkt
deleted file mode 100644
index e7e1474f97..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/draw.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(require unstable/latent-contract)
-
-(require "../common/draw.rkt")
-(provide (activate-contract-out ->color ->pen-color ->brush-color ->pen-style ->brush-style
-                                color-seq color-seq*
-                                alpha-expt))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/format.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/format.rkt
deleted file mode 100644
index 2abd949ea8..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/format.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require unstable/latent-contract)
-
-(require "../common/format.rkt")
-(provide (activate-contract-out
-          integer->superscript
-          digits-for-range
-          real->decimal-string* real->string/trunc
-          real->plot-label ivl->plot-label ->plot-label
-          parse-format-string apply-formatter))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/kde.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/kde.rkt
deleted file mode 100644
index 389549dfa7..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/kde.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-(require unstable/latent-contract)
-
-(require "../common/kde.rkt")
-(provide (activate-contract-out
-          kde))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/legend.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/legend.rkt
deleted file mode 100644
index 8b3797143f..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/legend.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-
-(require racket/contract unstable/latent-contract racket/class)
-
-(require "../common/legend.rkt"
-         "../common/plot-device.rkt")
-(provide (contract-out
-          (struct legend-entry ([label string?]
-                                [draw ((is-a?/c plot-device%) real? real? . -> . void?)])))
-         (activate-contract-out
-          line-legend-entry line-legend-entries
-          rectangle-legend-entry rectangle-legend-entries
-          interval-legend-entry interval-legend-entries
-          point-legend-entry
-          arrow-legend-entry))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/math.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/math.rkt
deleted file mode 100644
index 4cf0305255..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/math.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-
-(require racket/contract unstable/latent-contract)
-
-(require "../common/math.rkt")
-(provide equal?*
-         ;; Flonums
-         flblend flsum fldistance
-         ;; Reals
-         maybe-inexact->exact
-         min* max* blend atan2 sum real-modulo distance
-         floor-log/base ceiling-log/base
-         polar->cartesian 3d-polar->3d-cartesian
-         ;; Vectors
-         vcross vcross2 v+ v- vneg v* v/ vmag^2 vmag vnormalize vdot vcos-angle vrational? v= vcenter)
-
-;; Intervals
-(provide (contract-out (struct ivl ([min (or/c real? #f)] [max (or/c real? #f)]))
-                       [ivl-meet  (->* () () #:rest (listof ivl?) ivl?)]
-                       [ivl-join  (->* () () #:rest (listof ivl?) ivl?)])
-         empty-ivl unknown-ivl rational-ivl?
-         (activate-contract-out
-          ivl-empty? ivl-known? ivl-rational? ivl-singular? ivl-length ivl-center ivl-zero-length?
-          ivl-inexact->exact ivl-contains? ivl-translate bounds->intervals clamp-real))
-
-;; Rectangles
-(provide (contract-out [rect-meet (->* () () #:rest (listof (vectorof ivl?)) (vectorof ivl?))]
-                       [rect-join (->* () () #:rest (listof (vectorof ivl?)) (vectorof ivl?))])
-         (activate-contract-out
-          empty-rect unknown-rect bounding-rect rational-rect?
-          rect-empty? rect-known? rect-rational? rect-area rect-center rect-zero-area? rect-singular?
-          rect-inexact->exact rect-translate rect-contains?))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/parameters.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/parameters.rkt
deleted file mode 100644
index f8456c09bb..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/parameters.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang racket/base
-
-(require unstable/latent-contract)
-
-(require "../common/parameters.rkt")
-(provide
- (activate-contract-out
-  plot-deprecation-warnings?
-  ;; General plot parameters
-  plot-x-axis? plot-y-axis? plot-z-axis?
-  plot-x-far-axis? plot-y-far-axis? plot-z-far-axis?
-  plot-x-tick-label-anchor
-  plot-y-tick-label-anchor
-  plot-x-far-tick-label-anchor
-  plot-y-far-tick-label-anchor
-  plot-x-tick-label-angle
-  plot-y-tick-label-angle
-  plot-x-far-tick-label-angle
-  plot-y-far-tick-label-angle
-  plot-width plot-height
-  plot-foreground plot-foreground-alpha
-  plot-background plot-background-alpha
-  plot-line-width plot-tick-size
-  plot-font-size plot-font-face plot-font-family
-  plot-legend-anchor plot-legend-box-alpha
-  plot-decorations?
-  plot-animating?
-  plot3d-samples
-  plot3d-angle plot3d-altitude
-  plot3d-ambient-light plot3d-diffuse-light? plot3d-specular-light?
-  plot-new-window? plot-jpeg-quality plot-ps/pdf-interactive? plot-ps-setup
-  plot-title
-  plot-x-label plot-y-label plot-z-label
-  plot-x-far-label plot-y-far-label plot-z-far-label
-  plot-x-transform plot-x-ticks plot-x-far-ticks
-  plot-y-transform plot-y-ticks plot-y-far-ticks
-  plot-z-transform plot-z-ticks plot-z-far-ticks
-  plot-d-ticks plot-r-ticks
-  ;; Renderer parameters
-  line-samples line-color line-width line-style line-alpha
-  interval-color interval-style
-  interval-line1-color interval-line1-width interval-line1-style
-  interval-line2-color interval-line2-width interval-line2-style
-  interval-alpha
-  point-sym point-color point-size point-line-width point-alpha
-  vector-field-samples
-  vector-field-color vector-field-line-width vector-field-line-style
-  vector-field-scale
-  vector-field-alpha
-  vector-field3d-samples
-  error-bar-width error-bar-color error-bar-line-width error-bar-line-style error-bar-alpha
-  contour-samples contour-levels contour-colors contour-widths contour-styles contour-alphas
-  contour-interval-colors contour-interval-styles contour-interval-alphas
-  rectangle-color rectangle-style
-  rectangle-line-color rectangle-line-width rectangle-line-style
-  rectangle-alpha
-  rectangle3d-line-width
-  discrete-histogram-gap discrete-histogram-skip discrete-histogram-invert?
-  stacked-histogram-colors stacked-histogram-styles
-  stacked-histogram-line-colors stacked-histogram-line-widths stacked-histogram-line-styles
-  stacked-histogram-alphas
-  x-axis-ticks? y-axis-ticks? z-axis-ticks?
-  x-axis-labels? y-axis-labels? z-axis-labels?
-  x-axis-far? y-axis-far? z-axis-far?
-  x-axis-alpha y-axis-alpha z-axis-alpha
-  polar-axes-number polar-axes-ticks? polar-axes-labels? polar-axes-alpha
-  label-anchor label-angle label-alpha label-point-size
-  surface-color surface-style surface-line-color surface-line-width surface-line-style surface-alpha
-  contour-interval-line-colors contour-interval-line-widths contour-interval-line-styles
-  isosurface-levels
-  isosurface-colors isosurface-styles
-  isosurface-line-colors isosurface-line-widths isosurface-line-styles
-  isosurface-alphas
-  ;; Functions
-  pen-gap
-  animated-samples
-  default-contour-colors default-contour-fill-colors
-  default-isosurface-colors default-isosurface-line-colors)
- ;; Parameter groups
- plot-parameters
- plot-axes?
- plot-tick-labels
- plot-appearance
- plot3d-appearance
- plot-output
- plot-labels
- plot-axes plot-x-axis plot-y-axis plot-z-axis)
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/plot-element.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/plot-element.rkt
deleted file mode 100644
index 1b35b99fcb..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/plot-element.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket/base
-
-(require racket/contract unstable/latent-contract unstable/contract racket/class)
-
-(require "../common/contract.rkt"
-         "../common/plot-element.rkt"
-         "../common/math.rkt"
-         "../common/legend.rkt"
-         "../plot2d/plot-area.rkt"
-         "../plot3d/plot-area.rkt")
-
-(provide
- (contract-out
-  (struct plot-element
-    ([bounds-rect  (or/c (vectorof ivl?) #f)]
-     [bounds-fun   (or/c bounds-fun/c #f)]
-     [ticks-fun    (or/c ticks-fun/c #f)]))
-  (struct (nonrenderer plot-element)
-    ([bounds-rect  (or/c (vectorof ivl?) #f)]
-     [bounds-fun   (or/c bounds-fun/c #f)]
-     [ticks-fun    (or/c ticks-fun/c #f)]))
-  (struct (renderer2d plot-element)
-    ([bounds-rect  (or/c (vectorof ivl?) #f)]
-     [bounds-fun   (or/c bounds-fun/c #f)]
-     [ticks-fun    (or/c ticks-fun/c #f)]
-     [render-proc  (or/c ((is-a?/c 2d-plot-area%) . -> . (treeof legend-entry?)) #f)]))
-  (struct (renderer3d plot-element)
-    ([bounds-rect  (or/c (vectorof ivl?) #f)]
-     [bounds-fun   (or/c bounds-fun/c #f)]
-     [ticks-fun    (or/c ticks-fun/c #f)]
-     [render-proc  (or/c ((is-a?/c 3d-plot-area%) . -> . (treeof legend-entry?)) #f)])))
- bounds-fun/c ticks-fun/c
- (activate-contract-out default-ticks-fun
-                        function-bounds-fun function-interval-bounds-fun
-                        inverse-bounds-fun inverse-interval-bounds-fun
-                        surface3d-bounds-fun)
- plot3d-back-layer
- plot3d-area-layer
- plot3d-front-layer
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/sample.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/sample.rkt
deleted file mode 100644
index 34c466cdb5..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/sample.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-
-(require racket/contract unstable/latent-contract)
-
-(require "../common/sample.rkt"
-         "../common/math.rkt")
-(provide (contract-out (struct sample ([xs (listof real?)]
-                                       [ys (listof real?)]
-                                       [y-min (or/c rational? #f)]
-                                       [y-max (or/c rational? #f)]))
-                       (struct 2d-sample ([xs (listof real?)]
-                                          [ys (listof real?)]
-                                          [zss (vectorof (vectorof real?))]
-                                          [z-min (or/c rational? #f)]
-                                          [z-max (or/c rational? #f)]))
-                       (struct 3d-sample ([xs (listof real?)]
-                                          [ys (listof real?)]
-                                          [zs (listof real?)]
-                                          [dsss (vectorof (vectorof (vectorof real?)))]
-                                          [d-min (or/c rational? #f)]
-                                          [d-max (or/c rational? #f)])))
-         (activate-contract-out build-linear-seq linear-seq linear-seq* nonlinear-seq
-                                sampler/c 2d-sampler/c 3d-sampler/c
-                                make-function->sampler
-                                make-2d-function->sampler
-                                make-3d-function->sampler
-                                )
-         (contract-out (struct mapped-function ([f (any/c . -> . any/c)]
-                                                [fmap ((listof any/c) . -> . (listof any/c))])))
-         map*
-         for-2d-sample for-3d-sample)
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/samplers.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/samplers.rkt
deleted file mode 100644
index 8ac38bc3f4..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/samplers.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-
-(require unstable/latent-contract)
-
-(require "../common/samplers.rkt")
-(provide (activate-contract-out function->sampler
-                                inverse->sampler
-                                2d-function->sampler
-                                3d-function->sampler))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/ticks.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/contracted/ticks.rkt
deleted file mode 100644
index cf26c32686..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/contracted/ticks.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-(require racket/contract unstable/latent-contract)
-
-(require "../common/ticks.rkt")
-(provide
- (contract-out (struct pre-tick ([value real?] [major? boolean?]))
-               (struct (tick pre-tick) ([value real?] [major? boolean?] [label string?]))
-               (struct ticks ([layout ticks-layout/c] [format ticks-format/c])))
- 24h-descending-date-ticks-formats 12h-descending-date-ticks-formats
- 24h-descending-time-ticks-formats 12h-descending-time-ticks-formats
- us-currency-scales uk-currency-scales eu-currency-scales
- us-currency-formats uk-currency-formats eu-currency-formats
- ticks-layout/c ticks-format/c
- no-ticks-layout no-ticks-format no-ticks
- (activate-contract-out ticks-default-number
-                        ticks-mimic ticks-scale ticks-add linear-scale
-                        linear-ticks-layout linear-ticks-format linear-ticks
-                        log-ticks-layout log-ticks-format log-ticks
-                        date-ticks-formats date-ticks-layout date-ticks-format date-ticks
-                        time-ticks-formats time-ticks-layout time-ticks-format time-ticks
-                        bit/byte-ticks-format bit/byte-ticks
-                        currency-ticks-scales currency-ticks-formats
-                        currency-ticks-format currency-ticks
-                        fraction-ticks-format fraction-ticks
-                        collapse-ticks
-                        contour-ticks format-tick-labels))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/deprecated/deprecated.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/deprecated/deprecated.rkt
deleted file mode 100644
index b767e57ea7..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/deprecated/deprecated.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket/base
-
-(require racket/contract plot/utils unstable/latent-contract/defthing
-         "../common/deprecation-warning.rkt"
-         "renderers.rkt")
-
-(provide (all-defined-out))
-
-(define (mix . renderers)
-  (deprecation-warning "mix" "list")
-  (apply list renderers))
-
-(defproc (line [f (real? . -> . (or/c real? (vector/c real? real?)))]
-               [#:samples samples (and/c exact-integer? (>=/c 2)) 150]
-               [#:width width (>=/c 0) 1]
-               [#:color color plot-color/c 'red]
-               [#:mode mode (one-of/c 'standard 'parametric) 'standard]
-               [#:mapping mapping (one-of/c 'cartesian 'polar) 'cartesian]
-               [#:t-min t-min real? -5] [#:t-max t-max real? 5]
-               ) renderer2d?
-  (deprecation-warning "line" "function, parametric or polar")
-  (line-renderer f samples width color mode mapping t-min t-max))
-
-(defproc (contour [f (real? real? . -> . real?)]
-                  [#:samples samples (and/c exact-integer? (>=/c 2)) 50]
-                  [#:width width (>=/c 0) 1]
-                  [#:color color plot-color/c 'black]
-                  [#:levels levels (or/c (and/c exact-integer? (>=/c 2)) (listof real?)) 10]
-                  ) renderer2d?
-  (deprecation-warning "contour" "contours")
-  (contour-renderer f samples width color levels))
-
-(defproc (shade [f (real? real? . -> . real?)]
-                [#:samples samples (and/c exact-integer? (>=/c 2)) 50]
-                [#:levels levels (or/c (and/c exact-integer? (>=/c 2)) (listof real?)) 10]
-                ) renderer2d?
-  (deprecation-warning "shade" "contour-intervals")
-  (shade-renderer f samples levels))
-
-(defproc (surface [f (real? real? . -> . real?)]
-                  [#:samples samples (and/c exact-integer? (>=/c 2)) 50]
-                  [#:width width (>=/c 0) 1]
-                  [#:color color plot-color/c 'black]
-                  ) renderer3d?
-  (deprecation-warning "surface" "surface3d")
-  (surface-renderer f samples width color))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/deprecated/math.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/deprecated/math.rkt
deleted file mode 100644
index a8ef955d88..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/deprecated/math.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-(module math mzscheme
-
-  ; Usefull mathy functions for plots
-  
-  (require mzlib/list mzlib/etc mzlib/math)
-  
-  ; using vectors for n-dimensional points
-  
-  ; vector-magnitude : (vectorof number) -> number
-  ; computes the magnituded of the vector by using pythegorean theorem
-  (define (vector-magnitude vec)
-    (sqrt (foldl (lambda (item total) (+ (sqr item) total)) 0 (vector->list vec))))
-  
-  ; shortcuts to avoid writing ugly vector-ref code
-  (define (vector-x vec)
-    (vector-ref vec 0))
-  
-  (define (vector-y vec)
-    (vector-ref vec 1))
-  
-  (define (vector-z vec)
-    (vector-ref vec 2))
-          
-  ;  make-vec : (number number -> number) (number number -> number) -> (vector -> vector)
-  (define (make-vec func1 func2)
-    (lambda (point) (vector (func1 (vector-x point) (vector-y point)) (func2 (vector-x point) (vector-y point)))))
-  
-  ; derivative : (number -> number) [number] -> (number -> number)
-  (define derivative
-    (opt-lambda (func [h .00000001])
-      (lambda (x) (/ (- (func (+ x h)) (func x)) h))))
-  
-  ; gradient : (number number -> number) [number] -> (vector -> vector)
-  (define gradient
-    (opt-lambda (func-3d [h .00000001])
-      (lambda (point) (vector ((derivative (lambda (x) (func-3d x (vector-y point))) h) (vector-x point))
-                              ((derivative (lambda (y) (func-3d (vector-x point) y)) h) (vector-y point))))))
-  
-  (provide (all-defined)))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/deprecated/renderers.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/deprecated/renderers.rkt
deleted file mode 100644
index c81c46825b..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/deprecated/renderers.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-
-;; Functions that create renderers for backward-compatible functions 'line', 'contour', etc.
-
-(require racket/match plot/utils
-         "../plot2d/line.rkt"
-         "../plot2d/contour.rkt"
-         "../plot3d/surface.rkt")
-
-(provide line-renderer
-         contour-renderer
-         shade-renderer
-         surface-renderer)
-
-(define (line-renderer f samples width color mode mapping t-min t-max)
-  (case mode
-    [(standard)
-     (case mapping
-       [(cartesian)  (function f #:samples samples #:width width #:color color)]
-       [(polar)      (polar f t-min t-max
-                            #:samples samples #:width width #:color color)])]
-    [(parametric)
-     (case mapping
-       [(cartesian)  (parametric f t-min t-max
-                                 #:samples samples #:width width #:color color)]
-       [(polar)      (parametric (λ (t)
-                                   (match-define (vector θ r) (f t))
-                                   (vector (* r (cos θ)) (* r (sin θ))))
-                                 t-min t-max
-                                 #:samples samples #:width width #:color color)])]))
-
-(define (contour-renderer f samples width color levels)
-  (contours f #:samples samples #:levels (if (exact-integer? levels) (sub1 levels) levels)
-            #:colors (list color) #:widths (list width) #:styles '(solid)))
-
-(define (shade-fill-colors zs)
-  (color-seq* '((0 0 255) (255 255 255) (255 0 0)) (sub1 (length zs))))
-
-(define (shade-renderer f samples levels)
-  (contour-intervals f #:samples samples #:levels (if (exact-integer? levels) (sub1 levels) levels)
-                     #:colors shade-fill-colors #:contour-styles '(transparent)))
-
-(define (surface-renderer f samples width color)
-  (surface3d f #:samples samples #:line-color color #:line-width width))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot-bitmap.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot-bitmap.rkt
deleted file mode 100644
index c66558d672..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot-bitmap.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         racket/class
-         unstable/latent-contract/defthing
-         unstable/contract
-         racket/draw
-         "../common/contract.rkt"
-         "../common/parameters.rkt"
-         "../common/plot-element.rkt"
-         "plot2d.rkt"
-         "plot3d.rkt")
-
-(provide (all-defined-out))
-
-(defproc (plot [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-               [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-               [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-               [#:width width exact-positive-integer? (plot-width)]
-               [#:height height exact-positive-integer? (plot-height)]
-               [#:title title (or/c string? #f) (plot-title)]
-               [#:x-label x-label (or/c string? #f) (plot-x-label)]
-               [#:y-label y-label (or/c string? #f) (plot-y-label)]
-               [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-               [#:out-file out-file (or/c path-string? output-port? #f) #f]
-               [#:out-kind out-kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-               ) (is-a?/c bitmap%)
-  (define (call f . args)
-    (apply f renderer-tree args
-           #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:width width #:height height
-           #:title title #:x-label x-label #:y-label y-label #:legend-anchor legend-anchor))
-  
-  (when out-file
-    (call plot-file out-file out-kind))
-  
-  (call plot-bitmap))
-
-(defproc (plot3d [renderer-tree (treeof (or/c renderer3d? nonrenderer?))]
-                 [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                 [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                 [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-                 [#:width width exact-positive-integer? (plot-width)]
-                 [#:height height exact-positive-integer? (plot-height)]
-                 [#:angle angle real? #f] [#:altitude altitude real? #f]
-                 [#:title title (or/c string? #f) (plot-title)]
-                 [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                 [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                 [#:z-label z-label (or/c string? #f) (plot-z-label)]
-                 [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                 [#:out-file out-file (or/c path-string? output-port? #f) #f]
-                 [#:out-kind out-kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-                 ) (is-a?/c bitmap%)
-  (define (call f . args)
-    (apply f renderer-tree args
-           #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:z-min z-min #:z-max z-max
-           #:width width #:height height #:title title
-           #:angle (or angle (plot3d-angle)) #:altitude (or altitude (plot3d-altitude))
-           #:x-label x-label #:y-label y-label #:z-label z-label #:legend-anchor legend-anchor))
-  
-  (when out-file
-    (call plot3d-file out-file out-kind))
-  
-  (call plot3d-bitmap))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot-pict.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot-pict.rkt
deleted file mode 100644
index d66394f8b9..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot-pict.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         unstable/latent-contract/defthing
-         unstable/contract
-         pict
-         "../common/contract.rkt"
-         "../common/parameters.rkt"
-         "../common/plot-element.rkt"
-         "plot2d.rkt"
-         "plot3d.rkt")
-
-(provide (all-defined-out))
-
-(defproc (plot [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-               [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-               [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-               [#:width width exact-positive-integer? (plot-width)]
-               [#:height height exact-positive-integer? (plot-height)]
-               [#:title title (or/c string? #f) (plot-title)]
-               [#:x-label x-label (or/c string? #f) (plot-x-label)]
-               [#:y-label y-label (or/c string? #f) (plot-y-label)]
-               [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-               [#:out-file out-file (or/c path-string? output-port? #f) #f]
-               [#:out-kind out-kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-               ) pict?
-  (define (call f . args)
-    (apply f renderer-tree args
-           #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:width width #:height height
-           #:title title #:x-label x-label #:y-label y-label #:legend-anchor legend-anchor))
-  
-  (when out-file
-    (call plot-file out-file out-kind))
-  
-  (call plot-pict))
-
-(defproc (plot3d [renderer-tree (treeof (or/c renderer3d? nonrenderer?))]
-                 [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                 [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                 [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-                 [#:width width exact-positive-integer? (plot-width)]
-                 [#:height height exact-positive-integer? (plot-height)]
-                 [#:angle angle real? #f] [#:altitude altitude real? #f]
-                 [#:title title (or/c string? #f) (plot-title)]
-                 [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                 [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                 [#:z-label z-label (or/c string? #f) (plot-z-label)]
-                 [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                 [#:out-file out-file (or/c path-string? output-port? #f) #f]
-                 [#:out-kind out-kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-                 ) pict?
-  (define (call f . args)
-    (apply f renderer-tree args
-           #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:z-min z-min #:z-max z-max
-           #:width width #:height height #:title title
-           #:angle (or angle (plot3d-angle)) #:altitude (or altitude (plot3d-altitude))
-           #:x-label x-label #:y-label y-label #:z-label z-label #:legend-anchor legend-anchor))
-  
-  (when out-file
-    (call plot3d-file out-file out-kind))
-  
-  (call plot3d-pict))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot2d-utils.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot2d-utils.rkt
deleted file mode 100644
index d6bce12bc0..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot2d-utils.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang racket/base
-
-(require racket/list racket/class racket/match
-         "../common/math.rkt"
-         "../common/plot-element.rkt"
-         "../common/format.rkt")
-
-(provide (all-defined-out))
-
-(define (get-renderer-list renderer-tree)
-  (for/list ([r  (flatten (list renderer-tree))])
-    (match r
-      [(nonrenderer bounds-rect bounds-fun ticks-fun)
-       (renderer2d bounds-rect bounds-fun ticks-fun #f)]
-      [_  r])))
-
-(define (get-bounds-rect renderer-list x-min x-max y-min y-max)
-  (define given-bounds-rect (vector (ivl x-min x-max) (ivl y-min y-max)))
-  (let* ([plot-bounds-rect  (bounds-fixpoint renderer-list given-bounds-rect)]
-         [plot-bounds-rect
-          (cond [(not (rect-rational? plot-bounds-rect))
-                 (match-define (vector x-ivl y-ivl) plot-bounds-rect)
-                 (error 'plot "could not determine sensible plot bounds; got x ∈ ~a, y ∈ ~a"
-                        (ivl->plot-label x-ivl) (ivl->plot-label y-ivl))]
-                [(rect-zero-area? plot-bounds-rect)
-                 (for/vector ([i  (in-vector plot-bounds-rect)])
-                   (match-define (ivl a b) i)
-                   (cond [(= a b)  (if (zero? a) (ivl -1 1) (ivl (* a (- 1 1e-2)) (* b (+ 1 1e-2))))]
-                         [else  i]))]
-                [else
-                 plot-bounds-rect])])
-    (rect-inexact->exact plot-bounds-rect)))
-
-(define (get-ticks renderer-list bounds-rect)
-  (define-values (all-x-ticks all-x-far-ticks all-y-ticks all-y-far-ticks)
-    (for/lists (all-x-ticks all-x-far-ticks all-y-ticks all-y-far-ticks
-                            ) ([r  (in-list renderer-list)])
-      (define ticks-fun (plot-element-ticks-fun r))
-      (cond [ticks-fun  (ticks-fun bounds-rect)]
-            [else       (values empty empty empty empty)])))
-  (values (remove-duplicates (append* all-x-ticks))
-          (remove-duplicates (append* all-x-far-ticks))
-          (remove-duplicates (append* all-y-ticks))
-          (remove-duplicates (append* all-y-far-ticks))))
-
-(define (plot-area area renderer-list)
-  (send area start-plot)
-  
-  (define legend-entries
-    (flatten (for/list ([rend  (in-list renderer-list)])
-               (match-define (renderer2d rend-bounds-rect _bf _tf render-proc) rend)
-               (send area start-renderer (if rend-bounds-rect
-                                             (rect-inexact->exact rend-bounds-rect)
-                                             (unknown-rect 2)))
-               (if render-proc (render-proc area) empty))))
-  
-  (send area end-renderers)
-  
-  (when (not (empty? legend-entries))
-    (send area draw-legend legend-entries))
-  
-  (send area end-plot))
-
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot2d.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot2d.rkt
deleted file mode 100644
index cc755f46c8..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot2d.rkt
+++ /dev/null
@@ -1,134 +0,0 @@
-#lang racket/base
-
-(require racket/draw racket/contract racket/class
-         unstable/contract
-         pict
-         unstable/parameter-group
-         unstable/latent-contract/defthing
-         "../common/contract.rkt"
-         "../common/draw.rkt"
-         "../common/parameters.rkt"
-         "../common/plot-element.rkt"
-         "../common/file-type.rkt"
-         "../plot2d/plot-area.rkt"
-         "plot2d-utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Plot to a given device context
-
-(defproc (plot/dc [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-                  [dc (is-a?/c dc<%>)]
-                  [x real?] [y real?] [width (>=/c 0)] [height (>=/c 0)]
-                  [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                  [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                  [#:title title (or/c string? #f) (plot-title)]
-                  [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                  [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                  [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]) void?
-  (define renderer-list (get-renderer-list renderer-tree))
-  (define bounds-rect (get-bounds-rect renderer-list x-min x-max y-min y-max))
-  (define-values (x-ticks x-far-ticks y-ticks y-far-ticks)
-    (get-ticks renderer-list bounds-rect))
-  
-  (parameterize ([plot-title          title]
-                 [plot-x-label        x-label]
-                 [plot-y-label        y-label]
-                 [plot-legend-anchor  legend-anchor])
-    (define area (make-object 2d-plot-area%
-                   bounds-rect x-ticks x-far-ticks y-ticks y-far-ticks dc x y width height))
-    (plot-area area renderer-list)))
-
-;; ===================================================================================================
-;; Plot to a bitmap
-
-(defproc (plot-bitmap [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-                      [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                      [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                      [#:width width exact-positive-integer? (plot-width)]
-                      [#:height height exact-positive-integer? (plot-height)]
-                      [#:title title (or/c string? #f) (plot-title)]
-                      [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                      [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                      [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                      ) (is-a?/c bitmap%)
-  (define renderer-list (get-renderer-list renderer-tree))
-  (define bounds-rect (get-bounds-rect renderer-list x-min x-max y-min y-max))
-  (define-values (x-ticks x-far-ticks y-ticks y-far-ticks)
-    (get-ticks renderer-list bounds-rect))
-  ((if (plot-animating?) draw-bitmap draw-bitmap/supersampling)
-   (λ (dc) 
-     (plot/dc renderer-tree dc 0 0 width height
-              #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max
-              #:title title #:x-label x-label #:y-label y-label #:legend-anchor legend-anchor))
-   width height))
-
-;; ===================================================================================================
-;; Plot to a pict
-
-(defproc (plot-pict [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-                    [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                    [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                    [#:width width exact-positive-integer? (plot-width)]
-                    [#:height height exact-positive-integer? (plot-height)]
-                    [#:title title (or/c string? #f) (plot-title)]
-                    [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                    [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                    [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                    ) pict?
-  (define saved-values (plot-parameters))
-  (dc (λ (dc x y)
-        (parameterize/group
-            ([plot-parameters  saved-values])
-          (plot/dc renderer-tree dc x y width height
-                   #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max
-                   #:title title #:x-label x-label #:y-label y-label #:legend-anchor legend-anchor)))
-      width height))
-
-;; ===================================================================================================
-;; Plot to a file
-
-(defproc (plot-file [renderer-tree (treeof (or/c renderer2d? nonrenderer?))]
-                    [output (or/c path-string? output-port?)]
-                    [kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-                    [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                    [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                    [#:width width exact-positive-integer? (plot-width)]
-                    [#:height height exact-positive-integer? (plot-height)]
-                    [#:title title (or/c string? #f) (plot-title)]
-                    [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                    [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                    [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]) void?
-  (define real-kind (if (eq? kind 'auto) (detect-image-file-type output) kind))
-  (case real-kind
-    [(png jpeg xbm xpm bmp)
-     (define bm
-       (plot-bitmap
-        renderer-tree
-        #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:width width #:height height
-        #:title title #:x-label x-label #:y-label y-label #:legend-anchor legend-anchor))
-     (send bm save-file output real-kind (plot-jpeg-quality))]
-    [(ps pdf svg)
-     (define dc
-       (case real-kind
-         [(ps)   (parameterize ([current-ps-setup  (plot-ps-setup)])
-                   (new post-script-dc%
-                        [interactive (plot-ps/pdf-interactive?)] [parent #f] [use-paper-bbox #f]
-                        [as-eps #t] [width width] [height height] [output output]))]
-         [(pdf)  (parameterize ([current-ps-setup  (plot-ps-setup)])
-                   (new pdf-dc%
-                        [interactive (plot-ps/pdf-interactive?)] [parent #f] [use-paper-bbox #f]
-                        [width width] [height height] [output output]))]
-         [(svg)  (new svg-dc%
-                      [width width] [height height] [output output] [exists 'truncate/replace])]))
-     (define-values (x-scale y-scale) (send dc get-device-scale))
-     (send dc start-doc "Rendering plot")
-     (send dc start-page)
-     (plot/dc renderer-tree dc 0 0
-              (inexact->exact (/ width x-scale)) (inexact->exact (/ height y-scale))
-              #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max
-              #:title title #:x-label x-label #:y-label y-label #:legend-anchor legend-anchor)
-     (send dc end-page)
-     (send dc end-doc)])
-  (void))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot3d-utils.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot3d-utils.rkt
deleted file mode 100644
index 4436de1d26..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot3d-utils.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket/base
-
-(require racket/match racket/list racket/class
-         "../common/math.rkt"
-         "../common/plot-element.rkt"
-         "../common/format.rkt")
-
-(provide (all-defined-out))
-
-(define (get-renderer-list renderer-tree)
-  (for/list ([r  (flatten (list renderer-tree))])
-    (match r
-      [(nonrenderer bounds-rect bounds-fun ticks-fun)
-       (renderer3d bounds-rect bounds-fun ticks-fun #f)]
-      [_  r])))
-
-(define (get-bounds-rect renderer-list x-min x-max y-min y-max z-min z-max)
-  (define given-bounds-rect (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max)))
-  (let* ([plot-bounds-rect  (bounds-fixpoint renderer-list given-bounds-rect)]
-         [plot-bounds-rect
-          (cond [(not (rect-rational? plot-bounds-rect))
-                 (match-define (vector x-ivl y-ivl z-ivl) plot-bounds-rect)
-                 (error 'plot "could not determine sensible plot bounds; got x ∈ ~a, y ∈ ~a, z ∈ ~a"
-                        (ivl->plot-label x-ivl) (ivl->plot-label y-ivl) (ivl->plot-label z-ivl))]
-                [(rect-zero-area? plot-bounds-rect)
-                 (for/vector ([i  (in-vector plot-bounds-rect)])
-                   (match-define (ivl a b) i)
-                   (cond [(= a b)  (if (zero? a) (ivl -1 1) (ivl (* a (- 1 1e-2)) (* b (+ 1 1e-2))))]
-                         [else  i]))]
-                [else
-                 plot-bounds-rect])])
-    (rect-inexact->exact plot-bounds-rect)))
-
-(define (get-ticks renderer-list bounds-rect)
-  (define-values (all-x-ticks all-x-far-ticks all-y-ticks all-y-far-ticks all-z-ticks all-z-far-ticks)
-    (for/lists (all-x-ticks
-                all-x-far-ticks
-                all-y-ticks
-                all-y-far-ticks
-                all-z-ticks
-                all-z-far-ticks) ([r  (in-list renderer-list)])
-      (define ticks-fun (plot-element-ticks-fun r))
-      (cond [ticks-fun  (ticks-fun bounds-rect)]
-            [else       (values empty empty empty empty empty empty)])))
-  (values (remove-duplicates (append* all-x-ticks))
-          (remove-duplicates (append* all-x-far-ticks))
-          (remove-duplicates (append* all-y-ticks))
-          (remove-duplicates (append* all-y-far-ticks))
-          (remove-duplicates (append* all-z-ticks))
-          (remove-duplicates (append* all-z-far-ticks))))
-
-(define (plot-area area renderer-list)
-  (send area start-plot)
-  
-  (define legend-entries
-    (flatten (for/list ([rend  (in-list renderer-list)])
-               (match-define (renderer3d rend-bounds-rect _bf _tf render-proc) rend)
-               (send area start-renderer (if rend-bounds-rect
-                                             (rect-inexact->exact rend-bounds-rect)
-                                             (unknown-rect 3)))
-               (if render-proc (render-proc area) empty))))
-  
-  (send area end-renderers)
-  
-  (when (not (empty? legend-entries))
-    (send area draw-legend legend-entries))
-  
-  (send area end-plot))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot3d.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot3d.rkt
deleted file mode 100644
index 6dd1ccdc2e..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/no-gui/plot3d.rkt
+++ /dev/null
@@ -1,152 +0,0 @@
-#lang racket/base
-
-(require racket/draw racket/class racket/contract
-         unstable/contract
-         pict
-         unstable/parameter-group
-         unstable/latent-contract/defthing
-         "../common/contract.rkt"
-         "../common/draw.rkt"
-         "../common/parameters.rkt"
-         "../common/plot-element.rkt"
-         "../common/file-type.rkt"
-         "../plot3d/plot-area.rkt"
-         "plot3d-utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Plot to a given device context
-
-(defproc (plot3d/dc [renderer-tree  (treeof (or/c renderer3d? nonrenderer?))]
-                    [dc  (is-a?/c dc<%>)]
-                    [x real?] [y real?] [width (>=/c 0)] [height (>=/c 0)]
-                    [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                    [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                    [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-                    [#:angle angle real? (plot3d-angle)] [#:altitude altitude real? (plot3d-altitude)]
-                    [#:title title (or/c string? #f) (plot-title)]
-                    [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                    [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                    [#:z-label z-label (or/c string? #f) (plot-z-label)]
-                    [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]) void?
-  (define renderer-list (get-renderer-list renderer-tree))
-  (define bounds-rect (get-bounds-rect renderer-list x-min x-max y-min y-max z-min z-max))
-  (define-values (x-ticks x-far-ticks y-ticks y-far-ticks z-ticks z-far-ticks)
-    (get-ticks renderer-list bounds-rect))
-  
-  (parameterize ([plot3d-angle        angle]
-                 [plot3d-altitude     altitude]
-                 [plot-title          title]
-                 [plot-x-label        x-label]
-                 [plot-y-label        y-label]
-                 [plot-z-label        z-label]
-                 [plot-legend-anchor  legend-anchor])
-    (define area (make-object 3d-plot-area%
-                   bounds-rect x-ticks x-far-ticks y-ticks y-far-ticks z-ticks z-far-ticks
-                   dc x y width height))
-    (plot-area area renderer-list)))
-
-;; ===================================================================================================
-;; Plot to a bitmap
-
-(defproc (plot3d-bitmap [renderer-tree (treeof (or/c renderer3d? nonrenderer?))]
-                        [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                        [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                        [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-                        [#:width width exact-positive-integer? (plot-width)]
-                        [#:height height exact-positive-integer? (plot-height)]
-                        [#:angle angle real? (plot3d-angle)]
-                        [#:altitude altitude real? (plot3d-altitude)]
-                        [#:title title (or/c string? #f) (plot-title)]
-                        [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                        [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                        [#:z-label z-label (or/c string? #f) (plot-z-label)]
-                        [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                        ) (is-a?/c bitmap%)
-  ((if (plot-animating?) draw-bitmap draw-bitmap/supersampling)
-   (λ (dc)
-     (plot3d/dc renderer-tree dc 0 0 width height
-                #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:z-min z-min #:z-max z-max
-                #:angle angle #:altitude altitude #:title title #:x-label x-label #:y-label y-label
-                #:z-label z-label #:legend-anchor legend-anchor))
-   width height))
-
-;; ===================================================================================================
-;; Plot to a pict
-
-(defproc (plot3d-pict [renderer-tree (treeof (or/c renderer3d? nonrenderer?))]
-                      [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                      [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                      [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-                      [#:width width exact-positive-integer? (plot-width)]
-                      [#:height height exact-positive-integer? (plot-height)]
-                      [#:angle angle real? (plot3d-angle)]
-                      [#:altitude altitude real? (plot3d-altitude)]
-                      [#:title title (or/c string? #f) (plot-title)]
-                      [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                      [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                      [#:z-label z-label (or/c string? #f) (plot-z-label)]
-                      [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]
-                      ) pict?
-  (define saved-plot-parameters (plot-parameters))
-  (dc (λ (dc x y)
-        (parameterize/group ([plot-parameters  saved-plot-parameters])
-          (plot3d/dc renderer-tree dc x y width height
-                     #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:z-min z-min
-                     #:z-max z-max #:angle angle #:altitude altitude #:title title #:x-label x-label
-                     #:y-label y-label #:z-label z-label #:legend-anchor legend-anchor)))
-      width height))
-
-;; ===================================================================================================
-;; Plot to any supported kind of file
-
-(defproc (plot3d-file [renderer-tree (treeof (or/c renderer3d? nonrenderer?))]
-                      [output (or/c path-string? output-port?)]
-                      [kind (one-of/c 'auto 'png 'jpeg 'xmb 'xpm 'bmp 'ps 'pdf 'svg) 'auto]
-                      [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                      [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                      [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-                      [#:width width exact-positive-integer? (plot-width)]
-                      [#:height height exact-positive-integer? (plot-height)]
-                      [#:angle angle real? (plot3d-angle)]
-                      [#:altitude altitude real? (plot3d-altitude)]
-                      [#:title title (or/c string? #f) (plot-title)]
-                      [#:x-label x-label (or/c string? #f) (plot-x-label)]
-                      [#:y-label y-label (or/c string? #f) (plot-y-label)]
-                      [#:z-label z-label (or/c string? #f) (plot-z-label)]
-                      [#:legend-anchor legend-anchor anchor/c (plot-legend-anchor)]) void?
-  (define real-kind (if (eq? kind 'auto) (detect-image-file-type output) kind))
-  (case real-kind
-    [(png jpeg xbm xpm bmp)
-     (define bm
-       (plot3d-bitmap
-        renderer-tree
-        #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:z-min z-min #:z-max z-max
-        #:width width #:height height #:angle angle #:altitude altitude #:title title
-        #:x-label x-label #:y-label y-label #:z-label z-label #:legend-anchor legend-anchor))
-     (send bm save-file output real-kind (plot-jpeg-quality))]
-    [(ps pdf svg)
-     (define dc
-       (case real-kind
-         [(ps)   (parameterize ([current-ps-setup  (plot-ps-setup)])
-                   (new post-script-dc%
-                        [interactive (plot-ps/pdf-interactive?)] [parent #f] [use-paper-bbox #f]
-                        [as-eps #t] [width width] [height height] [output output]))]
-         [(pdf)  (parameterize ([current-ps-setup  (plot-ps-setup)])
-                   (new pdf-dc%
-                        [interactive (plot-ps/pdf-interactive?)] [parent #f] [use-paper-bbox #f]
-                        [width width] [height height] [output output]))]
-         [(svg)  (new svg-dc%
-                      [width width] [height height] [output output] [exists 'truncate/replace])]))
-     (define-values (x-scale y-scale) (send dc get-device-scale))
-     (send dc start-doc "Rendering plot")
-     (send dc start-page)
-     (plot3d/dc renderer-tree dc 0 0
-                (inexact->exact (/ width x-scale)) (inexact->exact (/ height y-scale))
-                #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:z-min z-min #:z-max z-max
-                #:angle angle #:altitude altitude #:title title #:x-label x-label #:y-label y-label
-                #:z-label z-label #:legend-anchor legend-anchor)
-     (send dc end-page)
-     (send dc end-doc)])
-  (void))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/clip.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/clip.rkt
deleted file mode 100644
index 9ab9a7c737..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/clip.rkt
+++ /dev/null
@@ -1,228 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         racket/match
-         racket/list)
-
-(provide point-in-bounds?
-         point-inside-plane?
-         clip-line/bounds
-         clip-line/plane
-         clip-lines/bounds
-         clip-lines/plane
-         clip-polygon/bounds
-         clip-polygon/plane)
-
-;; ===================================================================================================
-;; Basic plane intersection and distance tests
-
-;; Need to use this instead of `*' to make axial plane tests as fast as hand-written because the
-;; optimizer doesn't always figure out (* 0 e) = 0, etc.
-(define-syntax (times stx)
-  (syntax-case stx ()
-    [(_ 0 e)  (syntax/loc stx 0)]
-    [(_ 1 e)  (syntax/loc stx e)]
-    [(_ 0.0 e)  (syntax/loc stx 0.0)]
-    [(_ 1.0 e)  (syntax/loc stx (real->double-flonum e))]
-    [(_ . es)  (syntax/loc stx (* . es))]))
-
-(define-syntax-rule (plane-line-intersect a b c x1-stx y1-stx x2-stx y2-stx)
-  (let ([x1 x1-stx] [y1 y1-stx] [x2 x2-stx] [y2 y2-stx])
-    (let ([dot1  (+ (times a x1) (times b y1))]
-          [dot2  (+ (times a x2) (times b y2))])
-      (let ([denom  (- dot1 dot2)])
-        (if (zero? denom)
-            (values x2 y2)
-            (let ([t  (/ (+ dot1 c) denom)])
-              (values (+ x1 (* t (- x2 x1))) (+ y1 (* t (- y2 y1))))))))))
-
-(define-syntax-rule (plane-point-dist a b c x y)
-  (+ (times a x) (times b y) c))
-
-;; ===================================================================================================
-;; Points
-
-(define (point-in-bounds? v x-min x-max y-min y-max)
-  (match-define (vector x y) v)
-  (and (<= x-min x x-max) (<= y-min y y-max)))
-
-(define (point-inside-plane? v plane)
-  (match-define (vector x y) v)
-  (match-define (vector a b c) plane)
-  (>= (plane-point-dist a b c x y) 0))
-
-;; ===================================================================================================
-;; Line clipping
-
-(define (clip-line/plane v1 v2 plane)
-  (match-define (vector x1 y1) v1)
-  (match-define (vector x2 y2) v2)
-  (match-define (vector a b c) plane)
-  (define v1? (>= (plane-point-dist a b c x1 y1) 0))
-  (define v2? (>= (plane-point-dist a b c x2 y2) 0))
-  (cond [(and v1? v2?)       (values v1 v2)]
-        [(not (or v1? v2?))  (values #f #f)]
-        [else
-         (define-values (x y) (plane-line-intersect a b c x1 y1 x2 y2))
-         (if v1? (values v1 (vector x y)) (values (vector x y) v2))]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Clipping inside axial bounding box
-
-(define-syntax-rule (make-clip-line/axis a b gte?)
-  (λ (val x1 y1 x2 y2)
-    (define v1? (gte? (plane-point-dist a b (- val) x1 y1) 0))
-    (define v2? (gte? (plane-point-dist a b (- val) x2 y2) 0))
-    (cond [(or (and v1? v2?) (not (or v1? v2?))) (values x1 y1 x2 y2)]
-          [else
-           (define-values (x y) (plane-line-intersect a b (- val) x1 y1 x2 y2))
-           (if v1? (values x1 y1 x y) (values x y x2 y2))])))
-
-(define clip-line-x-min (make-clip-line/axis 1 0 >=))
-(define clip-line-x-max (make-clip-line/axis 1 0 <=))
-(define clip-line-y-min (make-clip-line/axis 0 1 >=))
-(define clip-line-y-max (make-clip-line/axis 0 1 <=))
-
-(define (clip-line/bounds v1 v2 x-min x-max y-min y-max)
-  (let/ec return
-    (match-define (vector x1 y1) v1)
-    (match-define (vector x2 y2) v2)
-    ;; early accept: both endpoints in bounds
-    (when (and (<= x-min x1 x-max) (<= y-min y1 y-max)
-               (<= x-min x2 x-max) (<= y-min y2 y-max))
-      (return v1 v2))
-    ;; early reject: both endpoints on the outside of the same plane
-    (when (or (and (x1 . < . x-min) (x2 . < . x-min)) (and (x1 . > . x-max) (x2 . > . x-max))
-              (and (y1 . < . y-min) (y2 . < . y-min)) (and (y1 . > . y-max) (y2 . > . y-max)))
-      (return #f #f))
-    (let*-values ([(x1 y1 x2 y2)  (clip-line-x-min x-min x1 y1 x2 y2)]
-                  [(x1 y1 x2 y2)  (clip-line-x-max x-max x1 y1 x2 y2)]
-                  [(x1 y1 x2 y2)  (clip-line-y-min y-min x1 y1 x2 y2)]
-                  [(x1 y1 x2 y2)  (clip-line-y-max y-max x1 y1 x2 y2)])
-      (values (vector x1 y1) (vector x2 y2)))))
-
-;; ===================================================================================================
-;; Connected lines clipping
-
-(define-syntax-rule (make-clip-lines/plane a b c gte?)
-  (λ (vs)
-    (cond
-      [(empty? vs)  empty]
-      [else
-       (define v1 (first vs))
-       (match-define (vector x1 y1) v1)
-       (define v1? (gte? (plane-point-dist a b c x1 y1) 0))
-       
-       (define init-vss (if v1? (list (list v1)) (list empty)))
-       
-       (define-values (vss _x1 _y1 _v1?)
-         (for/fold ([vss init-vss] [x1 x1] [y1 y1] [v1? v1?]) ([v2  (in-list (rest vs))])
-           (define x2 (vector-ref v2 0))
-           (define y2 (vector-ref v2 1))
-           (define v2? (gte? (plane-point-dist a b c x2 y2) 0))
-           (cond [(and v1? v2?)       (values (cons (cons v2 (first vss)) (rest vss)) x2 y2 v2?)]
-                 [(not (or v1? v2?))  (values vss x2 y2 v2?)]
-                 [else
-                  (define-values (x y) (plane-line-intersect a b c x1 y1 x2 y2))
-                  (if v1?
-                      (values (cons (cons (vector x y) (first vss)) (rest vss)) x2 y2 v2?)
-                      (values (cons (list v2 (vector x y)) vss) x2 y2 v2?))])))
-       
-       (filter (compose not empty?) vss)])))
-
-(define (clip-lines/plane vs plane)
-  (match-define (vector a b c) plane)
-  ((make-clip-lines/plane a b c >=) vs))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Clipping inside axial bounding box
-
-;; Early accept: all endpoints in bounds (or empty vs)
-(define (early-accept? vs x-min x-max y-min y-max)
-  (andmap (λ (v) (and (<= x-min (vector-ref v 0) x-max)
-                      (<= y-min (vector-ref v 1) y-max)))
-          vs))
-
-;; Early reject: all endpoints on the outside of the same plane
-(define (early-reject? vs x-min x-max y-min y-max)
-  (or (andmap (λ (v) ((vector-ref v 0) . < . x-min)) vs)
-      (andmap (λ (v) ((vector-ref v 0) . > . x-max)) vs)
-      (andmap (λ (v) ((vector-ref v 1) . < . y-min)) vs)
-      (andmap (λ (v) ((vector-ref v 1) . > . y-max)) vs)))
-
-(define-syntax-rule (make-clip-lines/axis a b gte?)
-  (λ (val vs)
-    ((make-clip-lines/plane a b (- val) gte?) vs)))
-
-(define clip-lines-x-min (make-clip-lines/axis 1 0 >=))
-(define clip-lines-x-max (make-clip-lines/axis 1 0 <=))
-(define clip-lines-y-min (make-clip-lines/axis 0 1 >=))
-(define clip-lines-y-max (make-clip-lines/axis 0 1 <=))
-
-(define (clip-lines/bounds vs x-min x-max y-min y-max)
-  (let/ec return
-    (when (early-accept? vs x-min x-max y-min y-max) (return (list vs)))
-    (when (early-reject? vs x-min x-max y-min y-max) (return empty))
-    (let* ([vss  (clip-lines-x-min x-min vs)]
-           [_    (when (empty? vss) (return empty))]
-           [vss  (append* (map (λ (vs) (clip-lines-x-max x-max vs)) vss))]
-           [_    (when (empty? vss) (return empty))]
-           [vss  (append* (map (λ (vs) (clip-lines-y-min y-min vs)) vss))]
-           [_    (when (empty? vss) (return empty))]
-           [vss  (append* (map (λ (vs) (clip-lines-y-max y-max vs)) vss))])
-      vss)))
-
-;; ===================================================================================================
-;; Polygon clipping
-
-(define-syntax-rule (make-clip-polygon/plane a b c gte?)
-  (λ (vs ls)
-    (define v1 (last vs))
-    (define x1 (vector-ref v1 0))
-    (define y1 (vector-ref v1 1))
-    (define v1? (gte? (plane-point-dist a b c x1 y1) 0))
-    
-    (define-values (new-vs new-ls _x1 _y1 _v1?)
-      (for/fold ([vs empty] [ls empty] [x1 x1] [y1 y1] [v1? v1?]) ([v2  (in-list vs)]
-                                                                   [l   (in-list ls)])
-        (define x2 (vector-ref v2 0))
-        (define y2 (vector-ref v2 1))
-        (define v2? (gte? (plane-point-dist a b c x2 y2) 0))
-        (cond [(and v1? v2?)       (values (cons v2 vs) (cons l ls) x2 y2 v2?)]
-              [(not (or v1? v2?))  (values vs ls x2 y2 v2?)]
-              [else
-               (define-values (x y) (plane-line-intersect a b c x1 y1 x2 y2))
-               (if v1?
-                   (values (cons (vector x y) vs) (cons l ls) x2 y2 v2?)
-                   (values (list* v2 (vector x y) vs) (list* l #t ls) x2 y2 v2?))])))
-    
-    (values (reverse new-vs) (reverse new-ls))))
-
-(define (clip-polygon/plane vs ls plane)
-  (match-define (vector a b c) plane)
-  ((make-clip-polygon/plane a b c >=) vs ls))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Clipping inside axial bounding box
-
-(define-syntax-rule (make-clip-polygon/axis a b gte?)
-  (λ (vs ls val)
-    ((make-clip-polygon/plane a b (- val) gte?) vs ls)))
-
-(define clip-polygon-x-min (make-clip-polygon/axis 1 0 >=))
-(define clip-polygon-x-max (make-clip-polygon/axis 1 0 <=))
-(define clip-polygon-y-min (make-clip-polygon/axis 0 1 >=))
-(define clip-polygon-y-max (make-clip-polygon/axis 0 1 <=))
-
-(define (clip-polygon/bounds vs ls x-min x-max y-min y-max)
-  (let/ec return
-    (when (early-accept? vs x-min x-max y-min y-max) (return vs ls))
-    (when (early-reject? vs x-min x-max y-min y-max) (return empty empty))
-    (let*-values ([(vs ls)  (clip-polygon-x-min vs ls x-min)]
-                  [(_)      (when (empty? vs) (return empty empty))]
-                  [(vs ls)  (clip-polygon-x-max vs ls x-max)]
-                  [(_)      (when (empty? vs) (return empty empty))]
-                  [(vs ls)  (clip-polygon-y-min vs ls y-min)]
-                  [(_)      (when (empty? vs) (return empty empty))]
-                  [(vs ls)  (clip-polygon-y-max vs ls y-max)])
-      (values vs ls))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/contour.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/contour.rkt
deleted file mode 100644
index f9ebce8162..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/contour.rkt
+++ /dev/null
@@ -1,185 +0,0 @@
-#lang racket/base
-
-;; Renderers for contour lines and contour intervals
-
-(require racket/contract racket/class racket/match racket/list racket/vector
-         unstable/latent-contract/defthing
-         plot/utils
-         "../common/utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; One contour line
-
-(define ((isoline-render-proc g z samples color width style alpha label) area)
-  (match-define (vector x-ivl y-ivl) (send area get-bounds-rect))
-  (match-define (ivl x-min x-max) x-ivl)
-  (match-define (ivl y-min y-max) y-ivl)
-  (define num (animated-samples samples))
-  (define sample (g (vector x-ivl y-ivl) (vector num num)))
-  (match-define (2d-sample xs ys zss z-min z-max) sample)
-  
-  (when (<= z-min z z-max)
-    (send area put-alpha alpha)
-    (send area put-pen color width style)
-    (for-2d-sample
-     (xa xb ya yb z1 z2 z3 z4) sample
-     (for/list ([line  (in-list (heights->lines xa xb ya yb z z1 z2 z3 z4))])
-       (send/apply area put-line (map (λ (v) (vector-take v 2)) line)))))
-  
-  (cond [label  (line-legend-entry label color width style)]
-        [else   empty]))
-
-(defproc (isoline
-          [f (real? real? . -> . real?)] [z real?]
-          [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-          [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (contour-samples)]
-          [#:color color plot-color/c (line-color)]
-          [#:width width (>=/c 0) (line-width)]
-          [#:style style plot-pen-style/c (line-style)]
-          [#:alpha alpha (real-in 0 1) (line-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer2d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (define g (2d-function->sampler f (vector x-ivl y-ivl)))
-  (renderer2d (vector x-ivl y-ivl) #f default-ticks-fun
-              (isoline-render-proc g z samples color width style alpha label)))
-
-;; ===================================================================================================
-;; Contour lines
-
-(define ((contours-render-proc g levels samples colors widths styles alphas label) area)
-  (let/ec return
-    (match-define (vector x-ivl y-ivl) (send area get-bounds-rect))
-    (match-define (ivl x-min x-max) x-ivl)
-    (match-define (ivl y-min y-max) y-ivl)
-    (define num (animated-samples samples))
-    (define sample (g (vector x-ivl y-ivl) (vector num num)))
-    (match-define (2d-sample xs ys zss z-min z-max) sample)
-    
-    (unless (and z-min z-max) (return empty))
-    
-    (match-define (list (tick zs _ labels) ...) (contour-ticks (plot-z-ticks) z-min z-max levels #f))
-    
-    (let* ([colors  (maybe-apply colors zs)]
-           [widths  (maybe-apply widths zs)]
-           [styles  (maybe-apply styles zs)]
-           [alphas  (maybe-apply alphas zs)])
-      (for ([z      (in-list zs)]
-            [color  (in-cycle* colors)]
-            [width  (in-cycle* widths)]
-            [style  (in-cycle* styles)]
-            [alpha  (in-cycle* alphas)])
-        (send area put-alpha alpha)
-        (send area put-pen color width style)
-        (for-2d-sample
-         (xa xb ya yb z1 z2 z3 z4) sample
-         (for/list ([line  (in-list (heights->lines xa xb ya yb z z1 z2 z3 z4))])
-           (match-define (list v1 v2) (map (λ (v) (vector-take v 2)) line))
-           (send area put-line v1 v2)))))
-    
-    (cond [(and label (not (empty? zs)))  (line-legend-entries label zs labels colors widths styles)]
-          [else  empty])))
-
-(defproc (contours
-          [f (real? real? . -> . real?)]
-          [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-          [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (contour-samples)]
-          [#:levels levels (or/c 'auto exact-positive-integer? (listof real?)) (contour-levels)]
-          [#:colors colors (plot-colors/c (listof real?)) (contour-colors)]
-          [#:widths widths (pen-widths/c (listof real?)) (contour-widths)]
-          [#:styles styles (plot-pen-styles/c (listof real?)) (contour-styles)]
-          [#:alphas alphas (alphas/c (listof real?)) (contour-alphas)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer2d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (define g (2d-function->sampler f (vector x-ivl y-ivl)))
-  (renderer2d (vector x-ivl y-ivl) #f default-ticks-fun
-              (contours-render-proc g levels samples colors widths styles alphas label)))
-
-;; ===================================================================================================
-;; Contour intervals
-
-(define ((contour-intervals-render-proc
-          g levels samples colors styles contour-colors contour-widths contour-styles alphas label)
-         area)
-  (let/ec return
-    (match-define (vector x-ivl y-ivl) (send area get-bounds-rect))
-    (match-define (ivl x-min x-max) x-ivl)
-    (match-define (ivl y-min y-max) y-ivl)
-    (define num (animated-samples samples))
-    (define sample (g (vector x-ivl y-ivl) (vector num num)))
-    (match-define (2d-sample xs ys zss z-min z-max) sample)
-    
-    (unless (and z-min z-max) (return empty))
-    
-    (match-define (list (tick zs _ labels) ...) (contour-ticks (plot-z-ticks) z-min z-max levels #t))
-    
-    (define-values (z-ivls ivl-labels)
-      (for/lists (z-ivls ivl-labels) ([za  (in-list zs)]
-                                      [zb  (in-list (rest zs))]
-                                      [la  (in-list labels)]
-                                      [lb  (in-list (rest labels))])
-        (values (ivl za zb) (format "[~a,~a]" la lb))))
-    
-    (send area put-pen 0 1 'transparent)
-    (let* ([colors  (map ->brush-color (maybe-apply colors z-ivls))]
-           [styles  (map ->brush-style (maybe-apply styles z-ivls))]
-           [alphas  (maybe-apply alphas z-ivls)])
-      (for ([za     (in-list zs)]
-            [zb     (in-list (rest zs))]
-            [color  (in-cycle* colors)]
-            [style  (in-cycle* styles)]
-            [alpha  (in-cycle* alphas)])
-        (send area put-brush color style)
-        (send area put-alpha alpha)
-        (for-2d-sample
-         (xa xb ya yb z1 z2 z3 z4) sample
-         (for/list ([poly  (in-list (heights->polys xa xb ya yb za zb z1 z2 z3 z4))])
-           (send area put-polygon (map (λ (v) (vector-take v 2)) poly)))))
-      
-      ((contours-render-proc g levels samples contour-colors contour-widths contour-styles alphas #f)
-       area)
-      
-      (define n (- (length zs) 2))
-      (define contour-colors*
-        (append (list 0) (sequence-take (in-cycle* (maybe-apply contour-colors zs)) 0 n) (list 0)))
-      (define contour-widths*
-        (append (list 0) (sequence-take (in-cycle* (maybe-apply contour-widths zs)) 0 n) (list 0)))
-      (define contour-styles*
-        (append '(transparent) (sequence-take (in-cycle* (maybe-apply contour-styles zs)) 0 n)
-                '(transparent)))
-      
-      (cond [label  (interval-legend-entries
-                     label z-ivls ivl-labels
-                     colors styles colors '(1) '(transparent)
-                     contour-colors* contour-widths* contour-styles*
-                     (rest contour-colors*) (rest contour-widths*) (rest contour-styles*))]
-            [else   empty]))))
-
-(defproc (contour-intervals
-          [f (real? real? . -> . real?)]
-          [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-          [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (contour-samples)]
-          [#:levels levels (or/c 'auto exact-positive-integer? (listof real?)) (contour-levels)]
-          [#:colors colors (plot-colors/c (listof ivl?)) (contour-interval-colors)]
-          [#:styles styles (plot-brush-styles/c (listof ivl?)) (contour-interval-styles)]
-          [#:contour-colors contour-colors (plot-colors/c (listof real?)) (contour-colors)]
-          [#:contour-widths contour-widths (pen-widths/c (listof real?)) (contour-widths)]
-          [#:contour-styles contour-styles (plot-pen-styles/c (listof real?)) (contour-styles)]
-          [#:alphas alphas (alphas/c (listof ivl?)) (contour-interval-alphas)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer2d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (define g (2d-function->sampler f (vector x-ivl y-ivl)))
-  (renderer2d (vector x-ivl y-ivl) #f default-ticks-fun
-              (contour-intervals-render-proc g levels samples colors styles
-                                             contour-colors contour-widths contour-styles
-                                             alphas label)))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/decoration.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/decoration.rkt
deleted file mode 100644
index 16f9088297..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/decoration.rkt
+++ /dev/null
@@ -1,331 +0,0 @@
-#lang racket/base
-
-;; Renderers for plot decorations: axes, grids, labeled points, etc.
-
-(require racket/contract racket/class racket/match racket/math racket/list
-         unstable/latent-contract/defthing
-         unstable/contract
-         plot/utils
-         "../common/utils.rkt"
-         "clip.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; X and Y axes
-
-(define ((x-axis-render-proc y ticks? labels? far? alpha) area)
-  (match-define (vector (ivl x-min x-max) y-ivl) (send area get-bounds-rect))
-  (define x-ticks (if far? (send area get-x-far-ticks) (send area get-x-ticks)))
-  (define radius (if ticks? (* 1/2 (plot-tick-size)) 0))
-  
-  (send area put-alpha alpha)
-  (send area put-minor-pen)
-  (send area put-line (vector x-min y) (vector x-max y))
-  
-  (when ticks?
-    (for ([t  (in-list x-ticks)])
-      (match-define (tick x major? _) t)
-      (if major? (send area put-major-pen) (send area put-minor-pen))
-      (send area put-tick (vector x y) (if major? radius (* 1/2 radius)) (* 1/2 pi))))
-  
-  (when labels?
-    (define dist (+ radius (pen-gap)))
-    (for ([t  (in-list x-ticks)] #:when (pre-tick-major? t))
-      (match-define (tick x _ label) t)
-      (send area put-text label (vector x y) (if far? 'bottom 'top) 0 dist)))
-  
-  empty)
-
-(defproc (x-axis [y real? 0]
-                 [#:ticks? ticks? boolean? (x-axis-ticks?)]
-                 [#:labels? labels? boolean? (x-axis-labels?)]
-                 [#:far? far? boolean? (x-axis-far?)]
-                 [#:alpha alpha (real-in 0 1) (x-axis-alpha)]) renderer2d?
-  (renderer2d #f #f #f (x-axis-render-proc y ticks? labels? far? alpha)))
-
-(define ((y-axis-render-proc x ticks? labels? far? alpha) area)
-  (match-define (vector x-ivl (ivl y-min y-max)) (send area get-bounds-rect))
-  (define y-ticks (if far? (send area get-y-far-ticks) (send area get-y-ticks)))
-  (define radius (if ticks? (* 1/2 (plot-tick-size)) 0))
-  
-  (send area put-alpha alpha)
-  (send area put-minor-pen)
-  (send area put-line (vector x y-min) (vector x y-max))
-  
-  (when ticks?
-    (for ([t  (in-list y-ticks)])
-      (match-define (tick y major? _) t)
-      (if major? (send area put-major-pen) (send area put-minor-pen))
-      (send area put-tick (vector x y) (if major? radius (* 1/2 radius)) 0)))
-  
-  (when labels?
-    (define dist (+ radius (pen-gap)))
-    (for ([t  (in-list y-ticks)] #:when (pre-tick-major? t))
-      (match-define (tick y _ label) t)
-      (send area put-text label (vector x y) (if far? 'left 'right) 0 dist)))
-  
-  empty)
-
-(defproc (y-axis [x real? 0]
-                 [#:ticks? ticks? boolean? (y-axis-ticks?)]
-                 [#:labels? labels? boolean? (y-axis-labels?)]
-                 [#:far? far? boolean? (y-axis-far?)]
-                 [#:alpha alpha (real-in 0 1) (y-axis-alpha)]) renderer2d?
-  (renderer2d #f #f #f (y-axis-render-proc x ticks? labels? far? alpha)))
-
-(defproc (axes [x real? 0] [y real? 0]
-               [#:x-ticks? x-ticks? boolean? (x-axis-ticks?)]
-               [#:y-ticks? y-ticks? boolean? (y-axis-ticks?)]
-               [#:x-labels? x-labels? boolean? (x-axis-labels?)]
-               [#:y-labels? y-labels? boolean? (y-axis-labels?)]
-               [#:x-alpha x-alpha (real-in 0 1) (x-axis-alpha)]
-               [#:y-alpha y-alpha (real-in 0 1) (y-axis-alpha)]) (listof renderer2d?)
-  (list (x-axis y #:ticks? x-ticks? #:labels? x-labels? #:alpha x-alpha)
-        (y-axis x #:ticks? y-ticks? #:labels? y-labels? #:alpha y-alpha)))
-
-;; ===================================================================================================
-;; Polar axes
-
-(define (build-polar-axes num x-min x-max y-min y-max [start-θ 0])
-  (define step (/ (* 2 pi) num))
-  (define θs (build-list num (λ (n) (+ start-θ (* n step)))))
-  (define max-r (max (vmag (vector x-min y-min)) (vmag (vector x-min y-max))
-                     (vmag (vector x-max y-max)) (vmag (vector x-max y-min))))
-  (define-values (r-mins r-maxs)
-    (for/lists (r-mins r-maxs) ([θ  (in-list θs)])
-      (define-values (v1 v2)
-        (clip-line/bounds (vector 0 0) (vector (* max-r (cos θ)) (* max-r (sin θ)))
-                          x-min x-max y-min y-max))
-      (values (if v1 (vmag v1) #f)
-              (if v2 (vmag v2) #f))))
-  (for/lists (θs r-mins r-maxs) ([θ  (in-list θs)] [r-min  (in-list r-mins)] [r-max  (in-list r-maxs)]
-                                                   #:when (and r-min r-max (not (= r-min r-max))))
-    (values θ r-min r-max)))
-
-(define (draw-polar-axis-ticks num labels? area)
-  (match-define (vector (ivl x-min x-max) (ivl y-min y-max)) (send area get-bounds-rect))
-  (define-values (θs r-mins r-maxs) (build-polar-axes num x-min x-max y-min y-max
-                                                      (* 1/2 (/ (* 2 pi) num))))
-  (define corner-rs
-    (list (vmag (vector x-min y-min)) (vmag (vector x-min y-max))
-          (vmag (vector x-max y-max)) (vmag (vector x-max y-min))))
-  (define r-min (if (and (<= x-min 0 x-max) (<= y-min 0 y-max)) 0 (apply min corner-rs)))
-  (define r-max (apply max corner-rs))
-  (define ts (filter (λ (t) (not (zero? (pre-tick-value t))))
-                     ((plot-r-ticks) r-min r-max)))
-  ;; Draw the tick lines
-  (for ([t  (in-list ts)])
-    (match-define (tick r major? label) t)
-    (if major? (send area put-minor-pen) (send area put-minor-pen 'long-dash))
-    (define pts (for/list ([θ  (in-list (linear-seq 0 (* 2 pi) 500))])
-                  (vector (* r (cos θ)) (* r (sin θ)))))
-    (send area put-lines pts))
-  ;; Draw the labels
-  (when (and labels? (not (empty? θs)))
-    ;; Find the longest half-axis, rounded to drown out floating-point error
-    (define mag (expt 10 (- (digits-for-range r-min r-max))))
-    (match-define (list mθ mr-min mr-max)
-      (argmax (λ (lst) (* (round (/ (- (third lst) (second lst)) mag)) mag))
-              (map list θs r-mins r-maxs)))
-    ;; Actually draw the labels
-    (for ([t  (in-list ts)])
-      (match-define (tick r major? label) t)
-      (when (and major? (<= mr-min r mr-max))
-        (send area put-text label (vector (* r (cos mθ)) (* r (sin mθ)))
-              'center #:outline? #t)))))
-
-(define (draw-polar-axis-lines num area)
-  (match-define (vector (ivl x-min x-max) (ivl y-min y-max)) (send area get-bounds-rect))
-  (define-values (θs r-mins r-maxs) (build-polar-axes num x-min x-max y-min y-max))
-  
-  (send area put-minor-pen)
-  (for ([θ  (in-list θs)] [r-min  (in-list r-mins)] [r-max  (in-list r-maxs)])
-    (send area put-line
-          (vector (* r-min (cos θ)) (* r-min (sin θ)))
-          (vector (* r-max (cos θ)) (* r-max (sin θ))))))
-
-(define ((polar-axes-render-proc num ticks? labels? alpha) area)
-  (send area put-alpha alpha)
-  (when (num . > . 0) (draw-polar-axis-lines num area))
-  (when ticks? (draw-polar-axis-ticks (if (num . > . 0) num 12) labels? area))
-  empty)
-
-(defproc (polar-axes [#:number num exact-nonnegative-integer? (polar-axes-number)]
-                     [#:ticks? ticks? boolean? (polar-axes-ticks?)]
-                     [#:labels? labels? boolean? (polar-axes-labels?)]
-                     [#:alpha alpha (real-in 0 1) (polar-axes-alpha)]) renderer2d?
-  (renderer2d #f #f #f (polar-axes-render-proc num ticks? labels? alpha)))
-
-;; ===================================================================================================
-;; Grid
-
-(define ((x-tick-lines-render-proc) area)
-  (match-define (vector x-ivl (ivl y-min y-max)) (send area get-bounds-rect))
-  (define x-ticks (send area get-x-ticks))
-  
-  (send area put-alpha 1/2)
-  (for ([t  (in-list x-ticks)])
-    (match-define (tick x major? _) t)
-    (if major? (send area put-minor-pen) (send area put-minor-pen 'long-dash))
-    (send area put-line (vector x y-min) (vector x y-max)))
-  
-  empty)
-
-(define ((y-tick-lines-render-proc) area)
-  (match-define (vector (ivl x-min x-max) y-ivl) (send area get-bounds-rect))
-  (define y-ticks (send area get-y-ticks))
-  
-  (send area put-alpha 1/2)
-  (for ([t  (in-list y-ticks)])
-    (match-define (tick y major? _) t)
-    (if major? (send area put-minor-pen) (send area put-minor-pen 'long-dash))
-    (send area put-line (vector x-min y) (vector x-max y)))
-  
-  empty)
-
-(defproc (x-tick-lines) renderer2d?
-  (renderer2d #f #f #f (x-tick-lines-render-proc)))
-
-(defproc (y-tick-lines) renderer2d?
-  (renderer2d #f #f #f (y-tick-lines-render-proc)))
-
-(defproc (tick-grid) (listof renderer2d?)
-  (list (x-tick-lines) (y-tick-lines)))
-
-;; ===================================================================================================
-;; Labeled points
-
-(define (format-coordinate v area)
-  (match-define (vector x y) v)
-  (match-define (vector (ivl x-min x-max) (ivl y-min y-max)) (send area get-bounds-rect))
-  (match-define (list x-str) (format-tick-labels (plot-x-ticks) x-min x-max (list x)))
-  (match-define (list y-str) (format-tick-labels (plot-y-ticks) y-min y-max (list y)))
-  (format "(~a,~a)" x-str y-str))
-
-(define ((label-render-proc label v color size face family anchor angle
-                            point-color point-fill-color point-size point-line-width point-sym
-                            alpha)
-         area)
-  (let ([label  (if label label (format-coordinate v area))])
-    (send area put-alpha alpha)
-    ; label
-    (send area put-text-foreground color)
-    (send area put-font size face family)
-    (send area put-text (string-append " " label " ") v anchor angle (* 1/2 point-size) #:outline? #t)
-    ; point
-    (send area put-pen point-color point-line-width 'solid)
-    (send area put-brush point-fill-color 'solid)
-    (send area put-glyphs (list v) point-sym point-size))
-  
-  empty)
-
-(defproc (point-label
-          [v (sequence/c real?)] [label (or/c string? #f) #f]
-          [#:color color plot-color/c (plot-foreground)]
-          [#:size size (>=/c 0) (plot-font-size)]
-          [#:face face (or/c string? #f) (plot-font-face)]
-          [#:family family font-family/c (plot-font-family)]
-          [#:anchor anchor anchor/c (label-anchor)]
-          [#:angle angle real? (label-angle)]
-          [#:point-color point-color plot-color/c (point-color)]
-          [#:point-fill-color point-fill-color (or/c plot-color/c 'auto) 'auto]
-          [#:point-size point-size (>=/c 0) (label-point-size)]
-          [#:point-line-width point-line-width (>=/c 0) (point-line-width)]
-          [#:point-sym point-sym point-sym/c 'fullcircle]
-          [#:alpha alpha (real-in 0 1) (label-alpha)]
-          ) renderer2d?
-  (let ([v  (sequence-head-vector 'point-label v 2)])
-    (match-define (vector x y) v)
-    (renderer2d (vector (ivl x x) (ivl y y)) #f #f
-                (label-render-proc
-                 label v color size face family anchor angle
-                 point-color (cond [(eq? point-fill-color 'auto)  (->pen-color point-color)]
-                                   [else  point-fill-color])
-                 point-size point-line-width point-sym
-                 alpha))))
-
-(defproc (parametric-label
-          [f (real? . -> . (sequence/c real?))] [t real?] [label (or/c string? #f) #f]
-          [#:color color plot-color/c (plot-foreground)]
-          [#:size size (>=/c 0) (plot-font-size)]
-          [#:face face (or/c string? #f) (plot-font-face)]
-          [#:family family font-family/c (plot-font-family)]
-          [#:anchor anchor anchor/c (label-anchor)]
-          [#:angle angle real? (label-angle)]
-          [#:point-color point-color plot-color/c (point-color)]
-          [#:point-fill-color point-fill-color (or/c plot-color/c 'auto) 'auto]
-          [#:point-size point-size (>=/c 0) (label-point-size)]
-          [#:point-line-width point-line-width (>=/c 0) (point-line-width)]
-          [#:point-sym point-sym point-sym/c 'fullcircle]
-          [#:alpha alpha (real-in 0 1) (label-alpha)]
-          ) renderer2d?
-  (point-label (sequence-head-vector 'parametric-label (f t) 2) 
-               label
-               #:color color #:size size #:face face #:family family #:anchor anchor #:angle angle
-               #:point-color point-color #:point-fill-color point-fill-color #:point-size point-size
-               #:point-line-width point-line-width #:point-sym point-sym
-               #:alpha alpha))
-
-(defproc (polar-label
-          [f (real? . -> . real?)] [θ real?] [label (or/c string? #f) #f]
-          [#:color color plot-color/c (plot-foreground)]
-          [#:size size (>=/c 0) (plot-font-size)]
-          [#:face face (or/c string? #f) (plot-font-face)]
-          [#:family family font-family/c (plot-font-family)]
-          [#:anchor anchor anchor/c (label-anchor)]
-          [#:angle angle real? (label-angle)]
-          [#:point-color point-color plot-color/c (point-color)]
-          [#:point-fill-color point-fill-color (or/c plot-color/c 'auto) 'auto]
-          [#:point-size point-size (>=/c 0) (label-point-size)]
-          [#:point-line-width point-line-width (>=/c 0) (point-line-width)]
-          [#:point-sym point-sym point-sym/c 'fullcircle]
-          [#:alpha alpha (real-in 0 1) (label-alpha)]
-          ) renderer2d?
-  (point-label (polar->cartesian θ (f θ)) label
-               #:color color #:size size #:face face #:family family #:anchor anchor #:angle angle
-               #:point-color point-color #:point-fill-color point-fill-color #:point-size point-size
-               #:point-line-width point-line-width #:point-sym point-sym
-               #:alpha alpha))
-
-(defproc (function-label
-          [f  (real? . -> . real?)] [x real?] [label (or/c string? #f) #f]
-          [#:color color plot-color/c (plot-foreground)]
-          [#:size size (>=/c 0) (plot-font-size)]
-          [#:face face (or/c string? #f) (plot-font-face)]
-          [#:family family font-family/c (plot-font-family)]
-          [#:anchor anchor anchor/c (label-anchor)]
-          [#:angle angle real? (label-angle)]
-          [#:point-color point-color plot-color/c (point-color)]
-          [#:point-fill-color point-fill-color (or/c plot-color/c 'auto) 'auto]
-          [#:point-size point-size (>=/c 0) (label-point-size)]
-          [#:point-line-width point-line-width (>=/c 0) (point-line-width)]
-          [#:point-sym point-sym point-sym/c 'fullcircle]
-          [#:alpha alpha (real-in 0 1) (label-alpha)]
-          ) renderer2d?
-  (point-label (vector x (f x)) label
-               #:color color #:size size #:face face #:family family #:anchor anchor #:angle angle
-               #:point-color point-color #:point-fill-color point-fill-color #:point-size point-size
-               #:point-line-width point-line-width #:point-sym point-sym
-               #:alpha alpha))
-
-(defproc (inverse-label
-          [f  (real? . -> . real?)] [y real?] [label (or/c string? #f) #f]
-          [#:color color plot-color/c (plot-foreground)]
-          [#:size size (>=/c 0) (plot-font-size)]
-          [#:face face (or/c string? #f) (plot-font-face)]
-          [#:family family font-family/c (plot-font-family)]
-          [#:anchor anchor anchor/c (label-anchor)]
-          [#:angle angle real? (label-angle)]
-          [#:point-color point-color plot-color/c (point-color)]
-          [#:point-fill-color point-fill-color (or/c plot-color/c 'auto) 'auto]
-          [#:point-size point-size (>=/c 0) (label-point-size)]
-          [#:point-line-width point-line-width (>=/c 0) (point-line-width)]
-          [#:point-sym point-sym point-sym/c 'fullcircle]
-          [#:alpha alpha (real-in 0 1) (label-alpha)]
-          ) renderer2d?
-  (point-label (vector (f y) y) label
-               #:color color #:size size #:face face #:family family #:anchor anchor #:angle angle
-               #:point-color point-color #:point-fill-color point-fill-color #:point-size point-size
-               #:point-line-width point-line-width #:point-sym point-sym
-               #:alpha alpha))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/interval.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/interval.rkt
deleted file mode 100644
index 0e217a2066..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/interval.rkt
+++ /dev/null
@@ -1,220 +0,0 @@
-#lang racket/base
-
-;; Renderers for intervals between functions.
-
-(require racket/contract racket/class racket/match racket/math racket/list
-         unstable/latent-contract/defthing
-         unstable/contract
-         plot/utils
-         "../common/utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Lines, parametric, polar
-
-(define ((lines-interval-render-proc v1s v2s color style
-                                     line1-color line1-width line1-style
-                                     line2-color line2-width line2-style
-                                     alpha label)
-         area)
-  (send area put-alpha alpha)
-  (send area put-pen 0 0 'transparent)
-  (send area put-brush color style)
-  (send area put-polygon (append v1s (reverse v2s)))
-  
-  (send area put-pen line1-color line1-width line1-style)
-  (send area put-lines v1s)
-  
-  (send area put-pen line2-color line2-width line2-style)
-  (send area put-lines v2s)
-  
-  (cond [label  (interval-legend-entry label color style 0 0 'transparent
-                                       line1-color line1-width line1-style
-                                       line2-color line2-width line2-style)]
-        [else  empty]))
-
-(defproc (lines-interval
-          [v1s (sequence/c (sequence/c #:min-count 2 real?))]
-          [v2s (sequence/c (sequence/c #:min-count 2 real?))]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-          [#:color color plot-color/c (interval-color)]
-          [#:style style plot-brush-style/c (interval-style)]
-          [#:line1-color line1-color plot-color/c (interval-line1-color)]
-          [#:line1-width line1-width (>=/c 0) (interval-line1-width)]
-          [#:line1-style line1-style plot-pen-style/c (interval-line1-style)]
-          [#:line2-color line2-color plot-color/c (interval-line2-color)]
-          [#:line2-width line2-width (>=/c 0) (interval-line2-width)]
-          [#:line2-style line2-style plot-pen-style/c (interval-line2-style)]
-          [#:alpha alpha (real-in 0 1) (interval-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer2d?
-  (let ([v1s  (sequence->listof-vector 'lines-interval v1s 2)]
-        [v2s  (sequence->listof-vector 'lines-interval v2s 2)])
-    (define rvs (filter vrational? (append v1s v2s)))
-    (cond
-      [(empty? rvs)  (renderer2d #f #f #f #f)]
-      [else
-       (match-define (list (vector rxs rys) ...) rvs)
-       (let ([x-min  (if x-min x-min (apply min* rxs))]
-             [x-max  (if x-max x-max (apply max* rxs))]
-             [y-min  (if y-min y-min (apply min* rys))]
-             [y-max  (if y-max y-max (apply max* rys))])
-         (renderer2d (vector (ivl x-min x-max) (ivl y-min y-max)) #f default-ticks-fun
-                     (lines-interval-render-proc v1s v2s color style
-                                                 line1-color line1-width line1-style
-                                                 line2-color line2-width line2-style
-                                                 alpha label)))])))
-
-(defproc (parametric-interval
-          [f1 (real? . -> . (sequence/c real?))]
-          [f2 (real? . -> . (sequence/c real?))]
-          [t-min rational?] [t-max rational?]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (line-samples)]
-          [#:color color plot-color/c (interval-color)]
-          [#:style style plot-brush-style/c (interval-style)]
-          [#:line1-color line1-color plot-color/c (interval-line1-color)]
-          [#:line1-width line1-width (>=/c 0) (interval-line1-width)]
-          [#:line1-style line1-style plot-pen-style/c (interval-line1-style)]
-          [#:line2-color line2-color plot-color/c (interval-line2-color)]
-          [#:line2-width line2-width (>=/c 0) (interval-line2-width)]
-          [#:line2-style line2-style plot-pen-style/c (interval-line2-style)]
-          [#:alpha alpha (real-in 0 1) (interval-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer2d?
-  (let ([f1  (λ (t) (sequence-head-vector 'parametric-interval (f1 t) 2))]
-        [f2  (λ (t) (sequence-head-vector 'parametric-interval (f2 t) 2))])
-    (lines-interval
-     (map f1 (linear-seq t-min t-max samples))
-     (map f2 (linear-seq t-min t-max samples))
-     #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max
-     #:color color #:style style
-     #:line1-color line1-color #:line1-width line1-width #:line1-style line1-style
-     #:line2-color line2-color #:line2-width line2-width #:line2-style line2-style
-     #:alpha alpha #:label label)))
-
-(defproc (polar-interval
-          [f1 (real? . -> . real?)] [f2 (real? . -> . real?)]
-          [θ-min rational? 0] [θ-max rational? (* 2 pi)]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (line-samples)]
-          [#:color color plot-color/c (interval-color)]
-          [#:style style plot-brush-style/c (interval-style)]
-          [#:line1-color line1-color plot-color/c (interval-line1-color)]
-          [#:line1-width line1-width (>=/c 0) (interval-line1-width)]
-          [#:line1-style line1-style plot-pen-style/c (interval-line1-style)]
-          [#:line2-color line2-color plot-color/c (interval-line2-color)]
-          [#:line2-width line2-width (>=/c 0) (interval-line2-width)]
-          [#:line2-style line2-style plot-pen-style/c (interval-line2-style)]
-          [#:alpha alpha (real-in 0 1) (interval-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer2d?
-  (define θs (linear-seq θ-min θ-max samples))
-  (lines-interval
-   (map polar->cartesian θs (map* f1 θs))
-   (map polar->cartesian θs (map* f2 θs))
-   #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max
-   #:color color #:style style
-   #:line1-color line1-color #:line1-width line1-width #:line1-style line1-style
-   #:line2-color line2-color #:line2-width line2-width #:line2-style line2-style
-   #:alpha alpha #:label label))
-
-;; ===================================================================================================
-;; Function
-
-(define ((function-interval-render-proc f1 f2 samples color style
-                                        line1-color line1-width line1-style
-                                        line2-color line2-width line2-style
-                                        alpha label)
-         area)
-  (match-define (vector x-ivl y-ivl) (send area get-bounds-rect))
-  (match-define (sample x1s y1s _ _) (f1 x-ivl samples))
-  (match-define (sample x2s y2s _ _) (f2 x-ivl samples))
-  (define v1s (map vector x1s y1s))
-  (define v2s (map vector x2s y2s))
-  
-  ((lines-interval-render-proc v1s v2s color style
-                               line1-color line1-width line1-style
-                               line2-color line2-width line2-style
-                               alpha label)
-   area))
-
-(defproc (function-interval
-          [f1 (real? . -> . real?)] [f2 (real? . -> . real?)]
-          [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (line-samples)]
-          [#:color color plot-color/c (interval-color)]
-          [#:style style plot-brush-style/c (interval-style)]
-          [#:line1-color line1-color plot-color/c (interval-line1-color)]
-          [#:line1-width line1-width (>=/c 0) (interval-line1-width)]
-          [#:line1-style line1-style plot-pen-style/c (interval-line1-style)]
-          [#:line2-color line2-color plot-color/c (interval-line2-color)]
-          [#:line2-width line2-width (>=/c 0) (interval-line2-width)]
-          [#:line2-style line2-style plot-pen-style/c (interval-line2-style)]
-          [#:alpha alpha (real-in 0 1) (interval-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer2d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (define g1 (function->sampler f1 x-ivl))
-  (define g2 (function->sampler f2 x-ivl))
-  (renderer2d (vector x-ivl y-ivl)
-              (function-interval-bounds-fun g1 g2 samples)
-              default-ticks-fun
-              (function-interval-render-proc g1 g2 samples color style
-                                             line1-color line1-width line1-style
-                                             line2-color line2-width line2-style
-                                             alpha label)))
-
-;; ===================================================================================================
-;; Inverse function
-
-(define ((inverse-interval-render-proc f1 f2 samples color style
-                                       line1-color line1-width line1-style
-                                       line2-color line2-width line2-style
-                                       alpha label)
-         area)
-  (match-define (vector x-ivl y-ivl) (send area get-bounds-rect))
-  (match-define (sample y1s x1s _ _) (f1 y-ivl samples))
-  (match-define (sample y2s x2s _ _) (f2 y-ivl samples))
-  (define v1s (map vector x1s y1s))
-  (define v2s (map vector x2s y2s))
-  
-  ((lines-interval-render-proc v1s v2s color style
-                               line1-color line1-width line1-style
-                               line2-color line2-width line2-style
-                               alpha label)
-   area))
-
-(defproc (inverse-interval
-          [f1 (real? . -> . real?)] [f2 (real? . -> . real?)]
-          [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (line-samples)]
-          [#:color color plot-color/c (interval-color)]
-          [#:style style plot-brush-style/c (interval-style)]
-          [#:line1-color line1-color plot-color/c (interval-line1-color)]
-          [#:line1-width line1-width (>=/c 0) (interval-line1-width)]
-          [#:line1-style line1-style plot-pen-style/c (interval-line1-style)]
-          [#:line2-color line2-color plot-color/c (interval-line2-color)]
-          [#:line2-width line2-width (>=/c 0) (interval-line2-width)]
-          [#:line2-style line2-style plot-pen-style/c (interval-line2-style)]
-          [#:alpha alpha (real-in 0 1) (interval-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer2d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (define g1 (inverse->sampler f1 y-ivl))
-  (define g2 (inverse->sampler f2 y-ivl))
-  (renderer2d (vector x-ivl y-ivl)
-              (inverse-interval-bounds-fun g1 g2 samples)
-              default-ticks-fun
-              (inverse-interval-render-proc g1 g2 samples color style
-                                            line1-color line1-width line1-style
-                                            line2-color line2-width line2-style
-                                            alpha label)))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/line.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/line.rkt
deleted file mode 100644
index 932c70625d..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/line.rkt
+++ /dev/null
@@ -1,170 +0,0 @@
-#lang racket/base
-
-;; Line renderers.
-
-(require racket/contract racket/class racket/match racket/math racket/list racket/sequence
-         unstable/latent-contract/defthing
-         unstable/contract
-         plot/utils
-         (only-in math/statistics stddev)
-         "../common/utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Lines, parametric, polar
-
-(define ((lines-render-proc vs color width style alpha label) area)
-  (send area put-alpha alpha)
-  (send area put-pen color width style)
-  (send area put-lines vs)
-  
-  (cond [label  (line-legend-entry label color width style)]
-        [else   empty]))
-
-(defproc (lines [vs  (sequence/c (sequence/c #:min-count 2 real?))]
-                [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                [#:color color plot-color/c (line-color)]
-                [#:width width (>=/c 0) (line-width)]
-                [#:style style plot-pen-style/c (line-style)]
-                [#:alpha alpha (real-in 0 1) (line-alpha)]
-                [#:label label (or/c string? #f) #f]
-                ) renderer2d?
-  (let ([vs  (sequence->listof-vector 'lines vs 2)])
-    (define rvs (filter vrational? vs))
-    (cond [(empty? rvs)  (renderer2d #f #f #f #f)]
-          [else
-           (match-define (list (vector rxs rys) ...) rvs)
-           (let ([x-min  (if x-min x-min (apply min* rxs))]
-                 [x-max  (if x-max x-max (apply max* rxs))]
-                 [y-min  (if y-min y-min (apply min* rys))]
-                 [y-max  (if y-max y-max (apply max* rys))])
-             (renderer2d (vector (ivl x-min x-max) (ivl y-min y-max)) #f default-ticks-fun
-                         (lines-render-proc vs color width style alpha label)))])))
-
-(defproc (parametric [f (real? . -> . (sequence/c real?))]
-                     [t-min rational?] [t-max rational?]
-                     [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                     [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                     [#:samples samples (and/c exact-integer? (>=/c 2)) (line-samples)]
-                     [#:color color plot-color/c (line-color)]
-                     [#:width width (>=/c 0) (line-width)]
-                     [#:style style plot-pen-style/c (line-style)]
-                     [#:alpha alpha (real-in 0 1) (line-alpha)]
-                     [#:label label (or/c string? #f) #f]
-                     ) renderer2d?
-  (let ([f  (λ (t) (sequence-head-vector 'parametric (f t) 2))])
-    (lines (map f (linear-seq t-min t-max samples))
-           #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max
-           #:color color #:width width #:style style #:alpha alpha
-           #:label label)))
-
-(defproc (polar [f (real? . -> . real?)]
-                [θ-min real? 0] [θ-max real? (* 2 pi)]
-                [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                [#:samples samples (and/c exact-integer? (>=/c 2)) (line-samples)]
-                [#:color color plot-color/c (line-color)]
-                [#:width width (>=/c 0) (line-width)]
-                [#:style style plot-pen-style/c (line-style)]
-                [#:alpha alpha (real-in 0 1) (line-alpha)]
-                [#:label label (or/c string? #f) #f]
-                ) renderer2d?
-  (lines (let ([θs  (linear-seq θ-min θ-max samples)])
-           (map polar->cartesian θs (map* f θs)))
-         #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max
-         #:color color #:width width #:style style #:alpha alpha
-         #:label label))
-
-;; ===================================================================================================
-;; Function
-
-(define ((function-render-proc f samples color width style alpha label) area)
-  (match-define (vector x-ivl y-ivl) (send area get-bounds-rect))
-  (match-define (sample xs ys y-min y-max) (f x-ivl samples))
-  
-  (send area put-alpha alpha)
-  (send area put-pen color width style)
-  (send area put-lines (map vector xs ys))
-  
-  (cond [label  (line-legend-entry label color width style)]
-        [else   empty]))
-
-(defproc (function [f (real? . -> . real?)]
-                   [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-                   [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                   [#:samples samples (and/c exact-integer? (>=/c 2)) (line-samples)]
-                   [#:color color plot-color/c (line-color)]
-                   [#:width width (>=/c 0) (line-width)]
-                   [#:style style plot-pen-style/c (line-style)]
-                   [#:alpha alpha (real-in 0 1) (line-alpha)]
-                   [#:label label (or/c string? #f) #f]
-                   ) renderer2d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (let ([f  (function->sampler f x-ivl)])
-    (renderer2d (vector x-ivl y-ivl)
-                (function-bounds-fun f samples)
-                default-ticks-fun
-                (function-render-proc f samples color width style alpha label))))
-
-;; ===================================================================================================
-;; Inverse function
-
-(define ((inverse-render-proc f samples color width style alpha label) area)
-  (match-define (vector x-ivl y-ivl) (send area get-bounds-rect))
-  (match-define (sample ys xs x-min x-max) (f y-ivl samples))
-  
-  (send area put-alpha alpha)
-  (send area put-pen color width style)
-  (send area put-lines (map vector xs ys))
-  
-  (cond [label  (line-legend-entry label color width style)]
-        [else   empty]))
-
-(defproc (inverse [f (real? . -> . real?)]
-                  [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-                  [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                  [#:samples samples (and/c exact-integer? (>=/c 2)) (line-samples)]
-                  [#:color color plot-color/c (line-color)]
-                  [#:width width (>=/c 0) (line-width)]
-                  [#:style style plot-pen-style/c (line-style)]
-                  [#:alpha alpha (real-in 0 1) (line-alpha)]
-                  [#:label label (or/c string? #f) #f]
-                  ) renderer2d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (define g (inverse->sampler f y-ivl))
-  (renderer2d (vector x-ivl y-ivl)
-              (inverse-bounds-fun g samples)
-              default-ticks-fun
-              (inverse-render-proc g samples color width style alpha label)))
-
-;; ===================================================================================================
-;; Kernel density estimation
-
-(defproc (density [xs (sequence/c real?)]
-                  [bw-adjust (>/c 0) 1]
-                  [ws (or/c (sequence/c (>=/c 0)) #f) #f]
-                  [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                  [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                  [#:samples samples (and/c exact-integer? (>=/c 2)) (line-samples)]
-                  [#:color color plot-color/c (line-color)]
-                  [#:width width (>=/c 0) (line-width)]
-                  [#:style style plot-pen-style/c (line-style)]
-                  [#:alpha alpha (real-in 0 1) (line-alpha)]
-                  [#:label label (or/c string? #f) #f]
-                  ) renderer2d?
-  (let ([xs  (sequence->list xs)]
-        [ws  (if ws (sequence->list ws) #f)])
-    (define n (length xs))
-    (define sd (stddev xs ws))
-    (define h (max 1e-308
-                   (* 1e-14 (apply max (map abs (filter rational? xs))))
-                   (* bw-adjust 1.06 sd (expt n -0.2))))
-    (define-values (f fx-min fx-max) (kde xs h ws))
-    (let ([x-min  (if x-min x-min fx-min)]
-          [x-max  (if x-max x-max fx-max)])
-      (function f x-min x-max #:y-min y-min #:y-max y-max #:samples samples
-                #:color color #:width width #:style style #:alpha alpha #:label label))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/plot-area.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/plot-area.rkt
deleted file mode 100644
index d5d237e321..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/plot-area.rkt
+++ /dev/null
@@ -1,548 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/match racket/math racket/list racket/flonum
-         (only-in math/flonum fl)
-         "../common/plot-device.rkt"
-         "../common/ticks.rkt"
-         "../common/math.rkt"
-         "../common/draw.rkt"
-         "../common/axis-transform.rkt"
-         "../common/parameters.rkt"
-         "../common/utils.rkt"
-         "clip.rkt"
-         "vector.rkt")
-
-(provide (all-defined-out))
-
-(define plot2d-subdivisions (make-parameter 0))
-
-(define 2d-plot-area%
-  (class object%
-    (init-field bounds-rect rx-ticks rx-far-ticks ry-ticks ry-far-ticks)
-    (init dc dc-x-min dc-y-min dc-x-size dc-y-size)
-    (super-new)
-    
-    (define pd (make-object plot-device% dc dc-x-min dc-y-min dc-x-size dc-y-size))
-    (send pd reset-drawing-params)
-    
-    (define char-height (send pd get-char-height))    
-    (define half-char-height (* 1/2 char-height))
-    
-    (match-define (vector (ivl x-min x-max) (ivl y-min y-max)) bounds-rect)
-    (define x-size (- x-max x-min))
-    (define y-size (- y-max y-min))
-    (define x-mid (* 1/2 (+ x-min x-max)))
-    (define y-mid (* 1/2 (+ y-min y-max)))
-    
-    (define clipping? #f)
-    (define clip-x-min x-min)
-    (define clip-x-max x-max)
-    (define clip-y-min y-min)
-    (define clip-y-max y-max)
-    
-    (define/public (put-clip-rect rect)
-      (match-define (vector (ivl rx-min rx-max) (ivl ry-min ry-max)) rect)
-      (define cx-min (if rx-min (max* x-min rx-min) x-min))
-      (define cx-max (if rx-max (min* x-max rx-max) x-max))
-      (define cy-min (if ry-min (max* y-min ry-min) y-min))
-      (define cy-max (if ry-max (min* y-max ry-max) y-max))
-      (let ([cx-min  (min* cx-min cx-max)]
-            [cx-max  (max* cx-min cx-max)]
-            [cy-min  (min* cy-min cy-max)]
-            [cy-max  (max* cy-min cy-max)])
-        (set! clip-x-min cx-min)
-        (set! clip-x-max cx-max)
-        (set! clip-y-min cy-min)
-        (set! clip-y-max cy-max))
-      (set! clipping? #t))
-    
-    (define/public (clear-clip-rect) (set! clipping? #f))
-    
-    (define (in-bounds? v)
-      (or (not clipping?) (point-in-bounds? v clip-x-min clip-x-max clip-y-min clip-y-max)))
-    
-    (define/public (get-x-ticks) x-ticks)
-    (define/public (get-x-far-ticks) x-far-ticks)
-    (define/public (get-y-ticks) y-ticks)
-    (define/public (get-y-far-ticks) y-far-ticks)
-    
-    (define/public (get-bounds-rect) bounds-rect)
-    
-    (define/public (get-clip-rect)
-      (cond [clipping?  (vector (ivl clip-x-min clip-x-max) (ivl clip-y-min clip-y-max))]
-            [else       bounds-rect]))
-    
-    ;; There are three coordinate systems:
-    ;;  1. Plot coordinates (original, user-facing coordinate system)
-    ;;  2. View coordinates (from plot coordinates: transform for each axis, then translate and scale
-    ;;     to the interval [0,1])
-    ;;  3. Device context coordinates (from view coordinates: scale to plot area)
-    
-    (match-define (invertible-function fx gx) (apply-axis-transform (plot-x-transform) x-min x-max))
-    (match-define (invertible-function fy gy) (apply-axis-transform (plot-y-transform) y-min y-max))
-    
-    (define identity-transforms?
-      (and (equal? (plot-x-transform) id-transform)
-           (equal? (plot-y-transform) id-transform)))
-    
-    (define plot->view
-      (if identity-transforms?
-          (match-lambda
-            [(vector (? rational? x) (? rational? y))
-             (vector (fl (/ (- x x-min) x-size))
-                     (fl (/ (- y y-min) y-size)))]
-            [(vector x y)
-             (vector +nan.0 +nan.0)])
-          (match-lambda
-            [(vector (? rational? x) (? rational? y))
-             (let ([x  (fx x)] [y  (fy y)])
-               (vector (if (rational? x) (fl (/ (- (inexact->exact x) x-min) x-size)) +nan.0)
-                       (if (rational? y) (fl (/ (- (inexact->exact y) y-min) y-size)) +nan.0)))]
-            [(vector x y)
-             (vector +nan.0 +nan.0)])))
-    
-    (define view->dc #f)
-    (define (plot->dc v) (view->dc (plot->view v)))
-    
-    (define-values (view-x-size view-y-size)
-      (match-let ([(vector view-x-ivl view-y-ivl)
-                   (bounding-rect (map plot->view (list (vector x-min y-min) (vector x-min y-max)
-                                                        (vector x-max y-min) (vector x-max y-max))))])
-        (values (ivl-length view-x-ivl) (ivl-length view-y-ivl))))
-    
-    (define (make-view->dc left right top bottom)
-      (define area-x-min left)
-      (define area-x-max (- dc-x-size right))
-      (define area-y-min top)
-      (define area-y-max (- dc-y-size bottom))
-      (define area-per-view-x (/ (- area-x-max area-x-min) view-x-size))
-      (define area-per-view-y (/ (- area-y-max area-y-min) view-y-size))
-      (let-map
-       (area-x-min area-y-max area-per-view-x area-per-view-y) fl
-       (λ (v)
-         (match-define (vector x y) v)
-         (vector (fl+ area-x-min (fl* x area-per-view-x))
-                 (fl- area-y-max (fl* y area-per-view-y))))))
-    
-    (define init-top-margin
-      (cond [(and (plot-decorations?) (plot-title))  (* 3/2 char-height)]
-            [else  0]))
-    
-    ;; Initial view->dc (draws labels and half of every tick off the allotted space on the dc)
-    (set! view->dc (make-view->dc 0 0 init-top-margin 0))
-    
-    ;; ===============================================================================================
-    ;; Tick and label constants
-    
-    (define tick-radius (* 1/2 (plot-tick-size)))
-    (define half-tick-radius (* 1/2 tick-radius))
-    
-    (define near-dist^2 (sqr (* 3 (plot-line-width))))
-    (define (vnear? v1 v2)
-      ((vmag^2 (v- (plot->dc v1) (plot->dc v2))) . <= . near-dist^2))
-    
-    (define ((x-tick-near? y) t1 t2)
-      (vnear? (vector (pre-tick-value t1) y)
-              (vector (pre-tick-value t2) y)))
-    
-    (define ((y-tick-near? x) t1 t2)
-      (vnear? (vector x (pre-tick-value t1))
-              (vector x (pre-tick-value t2))))
-    
-    (define x-ticks
-      (collapse-ticks (filter (λ (t) (<= x-min (pre-tick-value t) x-max))
-                              (map tick-inexact->exact rx-ticks))
-                      (x-tick-near? y-min)))
-    (define x-far-ticks
-      (collapse-ticks (filter (λ (t) (<= x-min (pre-tick-value t) x-max))
-                              (map tick-inexact->exact rx-far-ticks))
-                      (x-tick-near? y-max)))
-    (define y-ticks
-      (collapse-ticks (filter (λ (t) (<= y-min (pre-tick-value t) y-max))
-                              (map tick-inexact->exact ry-ticks))
-                      (y-tick-near? x-min)))
-    (define y-far-ticks
-      (collapse-ticks (filter (λ (t) (<= y-min (pre-tick-value t) y-max))
-                              (map tick-inexact->exact ry-far-ticks))
-                      (y-tick-near? x-max)))
-    
-    ;; ===============================================================================================
-    ;; Tick and label parameters, and fixpoint margin computation
-    
-    ;; From here through "All parameters" are functions that compute *just the parameters* of ticks
-    ;; and labels that will be drawn on the plot. We have to separate computing parameters from
-    ;; actually drawing the ticks and labels so we can solve for the plot margins using a fixpoint
-    ;; computation. See ../common/draw.rkt for more explanation. (Search for 'margin-fixpoint'.)
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Tick parameters
-    
-    (define (x-tick-value->dc x) (plot->dc (vector x y-min)))
-    (define (y-tick-value->dc y) (plot->dc (vector x-min y)))
-    
-    (define (x-far-tick-value->dc x) (plot->dc (vector x y-max)))
-    (define (y-far-tick-value->dc y) (plot->dc (vector x-max y)))
-    
-    (define (get-tick-params ticks tick-value->dc angle)
-      (for/list ([t  (in-list ticks)])
-        (match-define (tick x major? _) t)
-        (list major? (tick-value->dc x) (if major? tick-radius half-tick-radius) angle)))
-    
-    (define (get-x-tick-params)
-      (if (plot-x-axis?) (get-tick-params x-ticks x-tick-value->dc (* 1/2 pi)) empty))
-    
-    (define (get-y-tick-params)
-      (if (plot-y-axis?) (get-tick-params y-ticks y-tick-value->dc 0) empty))
-    
-    (define (get-x-far-tick-params)
-      (if (plot-x-far-axis?) (get-tick-params x-far-ticks x-far-tick-value->dc (* 1/2 pi)) empty))
-    
-    (define (get-y-far-tick-params)
-      (if (plot-y-far-axis?) (get-tick-params y-far-ticks y-far-tick-value->dc 0) empty))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Tick label parameters
-    
-    (define draw-x-far-tick-labels? (not (and (plot-x-axis?) (equal? x-ticks x-far-ticks))))
-    (define draw-y-far-tick-labels? (not (and (plot-y-axis?) (equal? y-ticks y-far-ticks))))
-    
-    (define x-tick-label-offset (vector 0 (+ (pen-gap) tick-radius)))
-    (define y-tick-label-offset (vector (- (+ (pen-gap) tick-radius)) 0))
-    
-    (define x-far-tick-label-offset (vneg x-tick-label-offset))
-    (define y-far-tick-label-offset (vneg y-tick-label-offset))
-    
-    (define (get-tick-label-params ticks tick-label-offset tick-value->dc anchor angle)
-      (for/list ([t  (in-list ticks)] #:when (pre-tick-major? t))
-        (match-define (tick p _ label) t)
-        (list label (v+ (tick-value->dc p) tick-label-offset) anchor (degrees->radians angle))))
-    
-    (define (get-x-tick-label-params)
-      (if (plot-x-axis?)
-          (get-tick-label-params x-ticks x-tick-label-offset x-tick-value->dc
-                                 (plot-x-tick-label-anchor)
-                                 (plot-x-tick-label-angle))
-          empty))
-    
-    (define (get-y-tick-label-params)
-      (if (plot-y-axis?)
-          (get-tick-label-params y-ticks y-tick-label-offset y-tick-value->dc
-                                 (plot-y-tick-label-anchor)
-                                 (plot-y-tick-label-angle))
-          empty))
-    
-    (define (get-x-far-tick-label-params)
-      (if (and (plot-x-far-axis?) draw-x-far-tick-labels?)
-          (get-tick-label-params x-far-ticks x-far-tick-label-offset x-far-tick-value->dc
-                                 (plot-x-far-tick-label-anchor)
-                                 (plot-x-far-tick-label-angle))
-          empty))
-    
-    (define (get-y-far-tick-label-params)
-      (if (and (plot-y-far-axis?) draw-y-far-tick-labels?)
-          (get-tick-label-params y-far-ticks y-far-tick-label-offset y-far-tick-value->dc
-                                 (plot-y-far-tick-label-anchor)
-                                 (plot-y-far-tick-label-angle))
-          empty))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Axis label parameters
-    
-    (define (max-tick-offset ts)
-      (cond [(empty? ts)  0]
-            [(ormap pre-tick-major? ts)  (+ (pen-gap) tick-radius)]
-            [else  (+ (pen-gap) (* 1/4 (plot-tick-size)))]))
-    
-    (define max-x-tick-offset (if (plot-x-axis?) (max-tick-offset x-ticks) 0))
-    (define max-y-tick-offset (if (plot-y-axis?) (max-tick-offset y-ticks) 0))
-    
-    (define max-x-far-tick-offset (if (plot-x-far-axis?) (max-tick-offset x-far-ticks) 0))
-    (define max-y-far-tick-offset (if (plot-y-far-axis?) (max-tick-offset y-far-ticks) 0))
-    
-    (define (get-relative-corners params)
-      (append* (map (match-lambda
-                      [(list label _ anchor angle)
-                       (send pd get-text-corners label #(0 0) anchor angle)])
-                    params)))
-    
-    (define max-x-tick-label-height
-      (if (plot-x-axis?)
-          (apply max 0 (map (λ (corner) (vector-ref corner 1))
-                            (get-relative-corners (get-x-tick-label-params))))
-          0))
-    
-    (define max-y-tick-label-width
-      (if (plot-y-axis?)
-          (- (apply min 0 (map (λ (corner) (vector-ref corner 0))
-                               (get-relative-corners (get-y-tick-label-params)))))
-          0))
-    
-    (define max-x-far-tick-label-height
-      (if (and (plot-x-far-axis?) draw-x-far-tick-labels?)
-          (- (apply min 0 (map (λ (corner) (vector-ref corner 1))
-                               (get-relative-corners (get-x-far-tick-label-params)))))
-          0))
-    
-    (define max-y-far-tick-label-width
-      (if (and (plot-y-far-axis?) draw-y-far-tick-labels?)
-          (apply max 0 (map (λ (corner) (vector-ref corner 0))
-                            (get-relative-corners (get-y-far-tick-label-params))))
-          0))
-    
-    (define (get-x-label-params)
-      (define offset (vector 0 (+ max-x-tick-offset max-x-tick-label-height half-char-height)))
-      (list (plot-x-label) (v+ (view->dc (vector 0.5 0.0)) offset) 'top))
-    
-    (define (get-y-label-params)
-      (define offset (vector (+ max-y-tick-offset max-y-tick-label-width half-char-height) 0))
-      (list (plot-y-label) (v- (view->dc (vector 0.0 0.5)) offset) 'bottom (/ pi 2)))
-    
-    (define (get-x-far-label-params)
-      (define offset (vector 0 (+ max-x-far-tick-offset max-x-far-tick-label-height
-                                  half-char-height)))
-      (list (plot-x-far-label) (v- (view->dc (vector 0.5 1.0)) offset) 'bottom))
-    
-    (define (get-y-far-label-params)
-      (define offset (vector (+ max-y-far-tick-offset max-y-far-tick-label-width half-char-height) 0))
-      (list (plot-y-far-label) (v+ (view->dc (vector 1.0 0.5)) offset) 'top (/ pi 2)))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; All parameters
-    
-    (define (get-all-label-params)
-      (if (plot-decorations?)
-          (append (if (plot-x-label) (list (get-x-label-params)) empty)
-                  (if (plot-y-label) (list (get-y-label-params)) empty)
-                  (if (plot-x-far-label) (list (get-x-far-label-params)) empty)
-                  (if (plot-y-far-label) (list (get-y-far-label-params)) empty)
-                  (get-x-tick-label-params)
-                  (get-y-tick-label-params)
-                  (get-x-far-tick-label-params)
-                  (get-y-far-tick-label-params))
-          empty))
-    
-    (define (get-all-tick-params)
-      (if (plot-decorations?)
-          (append (get-x-tick-params) (get-y-tick-params)
-                  (get-x-far-tick-params) (get-y-far-tick-params))
-          empty))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Fixpoint margin computation
-    
-    (define (get-param-vs/set-view->dc! left right top bottom)
-      ;(printf "margins: ~v ~v ~v ~v~n~n" left right top bottom)
-      (set! view->dc (make-view->dc left right top bottom))
-      ;(printf "params: ~v~n~n" (get-x-label-params))
-      (define res
-        (append (append* (map (λ (params) (send/apply pd get-text-corners params))
-                              (get-all-label-params)))
-                (append* (map (λ (params) (send/apply pd get-tick-endpoints (rest params)))
-                              (get-all-tick-params)))))
-      ;(printf "res = ~v~n~n" res)
-      res)
-    
-    (define-values (left right top bottom)
-      (margin-fixpoint 0 dc-x-size init-top-margin dc-y-size 0 0 init-top-margin 0
-                       get-param-vs/set-view->dc!))
-    
-    (define area-x-min left)
-    (define area-x-max (- dc-x-size right))
-    (define area-y-min top)
-    (define area-y-max (- dc-y-size bottom))
-    
-    (define/public (get-area-bounds-rect)
-      (vector (ivl area-x-min area-x-max) (ivl area-y-min area-y-max)))
-    
-    (define view->plot
-      (let-map
-       (x-min y-min x-size y-size) inexact->exact
-       (cond [identity-transforms?
-              (match-lambda
-                [(vector x y)
-                 (vector (+ (* (inexact->exact x) x-size) x-min)
-                         (+ (* (inexact->exact y) y-size) y-min))])]
-             [else
-              (match-lambda
-                [(vector x y)
-                 (vector (gx (+ (* (inexact->exact x) x-size) x-min))
-                         (gy (+ (* (inexact->exact y) y-size) y-min)))])])))
-    
-    (define dc->view
-      (let ([area-per-view-x  (/ (- area-x-max area-x-min) view-x-size)]
-            [area-per-view-y  (/ (- area-y-max area-y-min) view-y-size)])
-        (match-lambda
-          [(vector x y)
-           (vector (/ (- x area-x-min) area-per-view-x)
-                   (/ (- area-y-max y) area-per-view-y))])))
-    
-    (define/public (dc->plot v)
-      (view->plot (dc->view v)))
-    
-    ;; ===============================================================================================
-    ;; Plot decoration
-    
-    (define (draw-title)
-      (when (and (plot-decorations?) (plot-title))
-        (send pd draw-text (plot-title) (vector (* 1/2 dc-x-size) 0) 'top)))
-    
-    (define (draw-axes)
-      (when (plot-decorations?)
-        (send pd set-minor-pen)
-        (when (plot-x-axis?)
-          (send pd draw-line
-                (vector area-x-min area-y-max)
-                (vector area-x-max area-y-max)))
-        (when (plot-x-far-axis?)
-          (send pd draw-line
-                (vector area-x-min area-y-min)
-                (vector area-x-max area-y-min)))
-        (when (plot-y-axis?)
-          (send pd draw-line
-                (vector area-x-min area-y-min)
-                (vector area-x-min area-y-max)))
-        (when (plot-y-far-axis?)
-          (send pd draw-line
-                (vector area-x-max area-y-min)
-                (vector area-x-max area-y-max)))))
-    
-    (define (draw-ticks)
-      (for ([params  (in-list (get-all-tick-params))])
-        (match-define (list major? v r angle) params)
-        (if major? (send pd set-major-pen) (send pd set-minor-pen))
-        (send pd draw-tick v r angle)))
-    
-    (define (draw-labels)
-      (for ([params  (in-list (get-all-label-params))])
-        (send/apply pd draw-text params #:outline? #t)))
-    
-    ;; ===============================================================================================
-    ;; Public drawing control (used by plot/dc)
-    
-    (define/public (start-plot)
-      (send pd reset-drawing-params)
-      (send pd clear)
-      (draw-title)
-      (draw-axes)
-      (draw-ticks)
-      (draw-labels)
-      (define lw (plot-line-width))
-      (send pd set-clipping-rect
-            (vector (ivl (+ 1/2 (- area-x-min lw)) (+ area-x-max lw))
-                    (ivl (+ 1/2 (- area-y-min lw)) (+ area-y-max lw)))))
-    
-    (define/public (start-renderer rend-bounds-rect)
-      (reset-drawing-params)
-      (put-clip-rect rend-bounds-rect))
-    
-    (define/public (end-renderers)
-      (clear-clip-rect)
-      (send pd reset-drawing-params))
-    
-    (define/public (draw-legend legend-entries)
-      (define gap-size (+ (pen-gap) tick-radius))
-      (send pd draw-legend legend-entries
-            (vector (ivl (+ area-x-min gap-size) (- area-x-max gap-size))
-                    (ivl (+ area-y-min gap-size) (- area-y-max gap-size)))))
-    
-    (define/public (end-plot)
-      (send pd restore-drawing-params))
-    
-    ;; ===============================================================================================
-    ;; Public drawing interface (used by renderers)
-    
-    (define/public (put-alpha alpha) (send pd set-alpha alpha))
-    
-    (define/public (put-pen color width style) (send pd set-pen color width style))
-    (define/public (put-major-pen [style 'solid]) (send pd set-major-pen style))
-    (define/public (put-minor-pen [style 'solid]) (send pd set-minor-pen style))
-    
-    (define/public (put-brush color style) (send pd set-brush color style))
-    
-    (define/public (put-background color) (send pd set-background color))
-    
-    (define/public (put-font-size size) (send pd set-font-size size))
-    (define/public (put-font-family family) (send pd set-font-family family))
-    (define/public put-font
-      (case-lambda 
-        [(size family) (send pd set-font size #f family)]
-        [(size face family) (send pd set-font size face family)]))
-    (define/public (put-text-foreground color) (send pd set-text-foreground color))
-    
-    (define/public (reset-drawing-params)
-      (put-alpha (plot-foreground-alpha))
-      (put-pen (plot-foreground) (plot-line-width) 'solid)
-      (put-brush (plot-background) 'solid)
-      (put-background (plot-background))
-      (put-font (plot-font-size) (plot-font-face) (plot-font-family))
-      (put-text-foreground (plot-foreground)))
-    
-    ;; Shapes
-    
-    (define/public (put-lines vs)
-      (for ([vs  (in-list (exact-vector2d-sublists vs))])
-        (let ([vss  (if clipping?
-                        (clip-lines/bounds vs
-                                           clip-x-min clip-x-max
-                                           clip-y-min clip-y-max)
-                        (list vs))])
-          (for ([vs  (in-list vss)])
-            (unless (empty? vs)
-              (let* ([vs  (if identity-transforms? vs (subdivide-lines plot->dc vs))]
-                     [vs  (map plot->dc vs)])
-                (send pd draw-lines vs)))))))
-    
-    (define/public (put-line v1 v2)
-      (let ([v1  (exact-vector2d v1)]
-            [v2  (exact-vector2d v2)])
-        (when (and v1 v2)
-          (let-values ([(v1 v2)  (if clipping?
-                                     (clip-line/bounds v1 v2
-                                                       clip-x-min clip-x-max
-                                                       clip-y-min clip-y-max)
-                                     (values v1 v2))])
-            (when (and v1 v2)
-              (if identity-transforms?
-                  (send pd draw-line (plot->dc v1) (plot->dc v2))
-                  (send pd draw-lines (map plot->dc (subdivide-line plot->dc v1 v2)))))))))
-    
-    (define/public (put-polygon vs)
-      (define ls (make-list (length vs) #t))
-      (let-values ([(vs ls)  (exact-polygon2d vs ls)])
-        (unless (empty? vs)
-          (let-values ([(vs ls)  (if clipping?
-                                     (clip-polygon/bounds vs ls
-                                                          clip-x-min clip-x-max
-                                                          clip-y-min clip-y-max)
-                                     (values vs ls))])
-            (unless (empty? vs)
-              (if identity-transforms?
-                  (send pd draw-polygon (map plot->dc vs))
-                  (send pd draw-polygon (map plot->dc (subdivide-polygon plot->dc vs)))))))))
-    
-    (define/public (put-rect r)
-      (when (rect-rational? r)
-        (match-define (vector (ivl x1 x2) (ivl y1 y2)) r)
-        (put-polygon (list (vector x1 y1) (vector x2 y1) (vector x2 y2) (vector x1 y2)))))
-    
-    (define/public (put-text str v [anchor 'top-left] [angle 0] [dist 0] #:outline? [outline? #f])
-      (let ([v  (exact-vector2d v)])
-        (when (and v (in-bounds? v))
-          (send pd draw-text str (plot->dc v) anchor angle dist #:outline? outline?))))
-    
-    (define/public (put-glyphs vs symbol size)
-      (let ([vs  (filter (λ (v) (and v (in-bounds? v))) (map exact-vector2d vs))])
-        (unless (empty? vs)
-          (send pd draw-glyphs (map plot->dc vs) symbol size))))
-      
-    (define/public (put-arrow v1 v2)
-      (let ([v1  (exact-vector2d v1)]
-            [v2  (exact-vector2d v2)])
-        (when (and v1 v2 (in-bounds? v1))
-          (send pd draw-arrow (plot->dc v1) (plot->dc v2)))))
-    
-    (define/public (put-tick v r angle)
-      (let ([v  (exact-vector2d v)])
-        (when (and v (in-bounds? v))
-          (send pd draw-tick (plot->dc v) r angle))))
-    ))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/point.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/point.rkt
deleted file mode 100644
index 715ed961ba..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/point.rkt
+++ /dev/null
@@ -1,154 +0,0 @@
-#lang racket/base
-
-;; Renderers for points and other point-like things.
-
-(require racket/contract racket/class racket/match racket/math racket/list
-         unstable/latent-contract/defthing
-         unstable/contract
-         plot/utils
-         "../common/utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Points (scatter plots)
-
-(define ((points-render-fun vs sym color fill-color size line-width alpha label) area)
-  (send area put-alpha alpha)
-  (send area put-pen color line-width 'solid)
-  (send area put-brush fill-color 'solid)
-  (send area put-glyphs vs sym size)
-  
-  (if label (point-legend-entry label sym color fill-color size line-width) empty))
-
-(defproc (points [vs  (sequence/c (sequence/c #:min-count 2 real?))]
-                 [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-                 [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-                 [#:sym sym point-sym/c (point-sym)]
-                 [#:color color plot-color/c (point-color)]
-                 [#:fill-color fill-color (or/c plot-color/c 'auto) 'auto]
-                 [#:size size (>=/c 0) (point-size)]
-                 [#:line-width line-width (>=/c 0) (point-line-width)]
-                 [#:alpha alpha (real-in 0 1) (point-alpha)]
-                 [#:label label (or/c string? #f) #f]
-                 ) renderer2d?
-  (let* ([vs  (sequence->listof-vector 'points vs 2)]
-         [vs  (filter vrational? vs)])
-    (cond
-      [(empty? vs)  (renderer2d #f #f #f #f)]
-      [else  (match-define (list (vector xs ys) ...) vs)
-             (let ([x-min  (if x-min x-min (apply min* xs))]
-                   [x-max  (if x-max x-max (apply max* xs))]
-                   [y-min  (if y-min y-min (apply min* ys))]
-                   [y-max  (if y-max y-max (apply max* ys))])
-               (renderer2d
-                (vector (ivl x-min x-max) (ivl y-min y-max)) #f default-ticks-fun
-                (points-render-fun vs sym color (cond [(eq? fill-color 'auto)  (->pen-color color)]
-                                                      [else  fill-color])
-                                   size line-width alpha label)))])))
-
-;; ===================================================================================================
-;; Vector fields
-
-(define ((vector-field-render-fun f samples scale color line-width line-style alpha label) area)
-  (match-define (vector (ivl x-min x-max) (ivl y-min y-max)) (send area get-bounds-rect))
-  
-  (define xs0 (linear-seq x-min x-max samples #:start? #t #:end? #t))
-  (define ys0 (linear-seq y-min y-max samples #:start? #t #:end? #t))
-  
-  (define-values (xs ys dxs dys angles mags)
-    (for*/lists (xs ys dxs dys angles mags) ([x   (in-list xs0)]
-                                             [y   (in-list ys0)]
-                                             [dv  (in-value (f x y))] #:when (vrational? dv))
-      (match-define (vector dx dy) dv)
-      (values x y dx dy (atan2 dy dx) (sqrt (+ (sqr dx) (sqr dy))))))
-  
-  (cond [(empty? xs)  empty]
-        [else (define box-x-size (/ (- x-max x-min) samples))
-              (define box-y-size (/ (- y-max y-min) samples))
-              
-              (define new-mags
-                (match scale
-                  [(? real?)  (map (λ (mag) (* scale mag)) mags)]
-                  ['normalized  (define box-size (min box-x-size box-y-size))
-                                (build-list (length dxs) (λ _ box-size))]
-                  ['auto  (define dx-max (apply max (map abs dxs)))
-                          (define dy-max (apply max (map abs dys)))
-                          (define scale (min (/ box-x-size dx-max)
-                                             (/ box-y-size dy-max)))
-                          (map (λ (mag) (* scale mag)) mags)]))
-              
-              (send area put-alpha alpha)
-              (send area put-pen color line-width line-style)
-              (for ([x      (in-list xs)]
-                    [y      (in-list ys)]
-                    [angle  (in-list angles)]
-                    [mag    (in-list new-mags)])
-                (send area put-arrow
-                      (vector x y)
-                      (vector (+ x (* mag (cos angle))) (+ y (* mag (sin angle))))))
-              
-              (cond [label  (arrow-legend-entry label color line-width line-style)]
-                    [else   empty])]))
-
-(defproc (vector-field
-          [f (or/c (real? real? . -> . (sequence/c real?))
-                   ((vector/c real? real?) . -> . (sequence/c real?)))]
-          [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-          [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-          [#:samples samples exact-positive-integer? (vector-field-samples)]
-          [#:scale scale (or/c real? (one-of/c 'auto 'normalized)) (vector-field-scale)]
-          [#:color color plot-color/c (vector-field-color)]
-          [#:line-width line-width (>=/c 0) (vector-field-line-width)]
-          [#:line-style line-style plot-pen-style/c (vector-field-line-style)]
-          [#:alpha alpha (real-in 0 1) (vector-field-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer2d?
-  (let ([f  (cond [(procedure-arity-includes? f 2 #t)
-                   (λ (x y) (sequence-head-vector 'vector-field (f x y) 2))]
-                  [else
-                   (λ (x y) (sequence-head-vector 'vector-field (f (vector x y)) 2))])])
-    (renderer2d (vector (ivl x-min x-max) (ivl y-min y-max)) #f default-ticks-fun
-                (vector-field-render-fun f samples scale color line-width line-style alpha label))))
-
-;; ===================================================================================================
-;; Error bars
-
-(define ((error-bars-render-fun xs ys hs color line-width line-style width alpha) area)
-  (define clip-rect (send area get-clip-rect))
-  (define radius (* 1/2 width))
-  
-  (send area put-alpha alpha)
-  (send area put-pen color line-width line-style)
-  (for ([x  (in-list xs)] [y  (in-list ys)] [h  (in-list hs)])
-    (when (rect-contains? clip-rect (vector x y))
-      (define v1 (vector x (- y h)))
-      (define v2 (vector x (+ y h)))
-      (send area put-line v1 v2)
-      (send area put-tick v1 radius 0)
-      (send area put-tick v2 radius 0)))
-  
-  empty)
-
-(defproc (error-bars
-          [bars (sequence/c (sequence/c #:min-count 3 real?))]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-          [#:color color plot-color/c (error-bar-color)]
-          [#:line-width line-width (>=/c 0) (error-bar-line-width)]
-          [#:line-style line-style plot-pen-style/c (error-bar-line-style)]
-          [#:width width (>=/c 0) (error-bar-width)]
-          [#:alpha alpha (real-in 0 1) (error-bar-alpha)]
-          ) renderer2d?
-  (let* ([bars  (sequence->listof-vector 'error-bars bars 3)]
-         [bars  (filter vrational? bars)])
-    (cond [(empty? bars)  (renderer2d #f #f #f #f)]
-          [else
-           (match-define (list (vector xs ys hs) ...) bars)
-           (let ([x-min  (if x-min x-min (apply min* xs))]
-                 [x-max  (if x-max x-max (apply max* xs))]
-                 [y-min  (if y-min y-min (apply min* (map - ys hs)))]
-                 [y-max  (if y-max y-max (apply max* (map + ys hs)))])
-             (renderer2d (vector (ivl x-min x-max) (ivl y-min y-max)) #f default-ticks-fun
-                         (error-bars-render-fun xs ys hs
-                                                color line-width line-style width alpha)))])))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/rectangle.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/rectangle.rkt
deleted file mode 100644
index 7ae3e7a8e2..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/rectangle.rkt
+++ /dev/null
@@ -1,196 +0,0 @@
-#lang racket/base
-
-;; The histogram renderer.
-
-(require racket/match racket/contract racket/class racket/list racket/sequence
-         unstable/latent-contract/defthing
-         unstable/contract
-         plot/utils
-         "../common/utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Rectangles
-
-(define ((rectangles-render-proc rects color style line-color line-width line-style alpha label)
-         area)
-  (send area put-pen line-color line-width line-style)
-  (send area put-brush color style)
-  (send area put-alpha alpha)
-  (for ([rect  (in-list rects)])
-    (send area put-rect rect))
-  
-  (cond [label  (rectangle-legend-entry label color style line-color line-width line-style)]
-        [else  empty]))
-
-(defproc (rectangles
-          [rects  (sequence/c (sequence/c #:min-count 2 ivl?))]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-          [#:color color plot-color/c (rectangle-color)]
-          [#:style style plot-brush-style/c (rectangle-style)]
-          [#:line-color line-color plot-color/c (rectangle-line-color)]
-          [#:line-width line-width (>=/c 0) (rectangle-line-width)]
-          [#:line-style line-style plot-pen-style/c (rectangle-line-style)]
-          [#:alpha alpha (real-in 0 1) (rectangle-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer2d?
-  (let ([rects  (sequence->listof-vector 'rectangles rects 2)])
-    (match-define (list (vector (ivl x1s x2s) (ivl y1s y2s)) ...) rects)
-    (define rxs (filter rational? (append x1s x2s)))
-    (define rys (filter rational? (append y1s y2s)))
-    (cond
-      [(or (empty? rxs) (empty? rys))  (renderer2d #f #f #f #f)]
-      [else
-       (let ([x-min  (if x-min x-min (apply min* rxs))]
-             [x-max  (if x-max x-max (apply max* rxs))]
-             [y-min  (if y-min y-min (apply min* rys))]
-             [y-max  (if y-max y-max (apply max* rys))])
-         (renderer2d (vector (ivl x-min x-max) (ivl y-min y-max)) #f default-ticks-fun
-                     (rectangles-render-proc rects color style line-color line-width line-style alpha
-                                             label)))])))
-
-;; ===================================================================================================
-;; Real histograms (or histograms on the real line)
-
-(defproc (area-histogram
-          [f (real? . -> . real?)]
-          [bin-bounds (sequence/c real?)]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) 0] [#:y-max y-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (line-samples)]
-          [#:color color plot-color/c (rectangle-color)]
-          [#:style style plot-brush-style/c (rectangle-style)]
-          [#:line-color line-color plot-color/c (rectangle-line-color)]
-          [#:line-width line-width (>=/c 0) (rectangle-line-width)]
-          [#:line-style line-style plot-pen-style/c (rectangle-line-style)]
-          [#:alpha alpha (real-in 0 1) (rectangle-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer2d?
-  (let* ([bin-bounds  (sequence->list bin-bounds)]
-         [bin-bounds  (filter rational? bin-bounds)]
-         [bin-bounds  (sort bin-bounds <)])
-    (cond
-      [((length bin-bounds) . < . 2)  (renderer2d #f #f #f #f)]
-      [else
-       (define xs (linear-seq (apply min* bin-bounds) (apply max* bin-bounds) samples
-                              #:start? #f #:end? #f))
-       (define xss (bin-samples bin-bounds xs))
-       (define heights (for/list ([xs  (in-list xss)]
-                                  [x1  (in-list bin-bounds)]
-                                  [x2  (in-list (rest bin-bounds))])
-                         (define x-size (- x2 x1))
-                         (define ys (map f xs))
-                         (/ (apply + ys) (length xs))))
-       (rectangles (map (λ (x-ivl h) (vector x-ivl (ivl 0 h)))
-                        (bounds->intervals bin-bounds)
-                        heights)
-                   #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max
-                   #:color color #:style style #:line-color line-color #:line-width line-width
-                   #:line-style line-style #:alpha alpha #:label label)])))
-
-;; ===================================================================================================
-;; Discrete histograms
-
-(define ((discrete-histogram-ticks-fun cats tick-xs add-ticks? far-ticks? maybe-invert) r)
-  (match-define (vector _ (ivl y-min y-max)) (apply maybe-invert (vector->list r)))
-  (define-values (x-ticks x-far-ticks)
-    (let ([ticks  (cond [add-ticks?  (for/list ([cat  (in-list cats)] [x  (in-list tick-xs)])
-                                       (tick x #t (->plot-label cat)))]
-                        [else  empty])])
-      (if far-ticks? (values empty ticks) (values ticks empty))))
-  (match-let*
-      ([(vector plot-x-ticks plot-y-ticks)          (maybe-invert (plot-x-ticks)
-                                                                  (plot-y-ticks))]
-       [(vector plot-x-far-ticks plot-y-far-ticks)  (maybe-invert (plot-x-far-ticks)
-                                                                  (plot-y-far-ticks))]
-       [(vector x-ticks y-ticks)          (maybe-invert x-ticks (plot-y-ticks y-min y-max))]
-       [(vector x-far-ticks y-far-ticks)  (maybe-invert x-far-ticks (plot-y-far-ticks y-min y-max))])
-    (values x-ticks x-far-ticks y-ticks y-far-ticks)))
-
-(defproc (discrete-histogram
-          [cat-vals (sequence/c (or/c (vector/c any/c (or/c real? ivl? #f))
-                                      (list/c any/c (or/c real? ivl? #f))))]
-          [#:x-min x-min (or/c rational? #f) 0] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) 0] [#:y-max y-max (or/c rational? #f) #f]
-          [#:gap gap (real-in 0 1) (discrete-histogram-gap)]
-          [#:skip skip (>=/c 0) (discrete-histogram-skip)]
-          [#:invert? invert? boolean? (discrete-histogram-invert?)]
-          [#:color color plot-color/c (rectangle-color)]
-          [#:style style plot-brush-style/c (rectangle-style)]
-          [#:line-color line-color plot-color/c (rectangle-line-color)]
-          [#:line-width line-width (>=/c 0) (rectangle-line-width)]
-          [#:line-style line-style plot-pen-style/c (rectangle-line-style)]
-          [#:alpha alpha (real-in 0 1) (rectangle-alpha)]
-          [#:label label (or/c string? #f) #f]
-          [#:add-ticks? add-ticks? boolean? #t]
-          [#:far-ticks? far-ticks? boolean? #f]
-          ) renderer2d?
-  (let ([cat-vals  (sequence->list cat-vals)])
-    (match-define (list (or (vector cats ys) (list cats ys)) ...) cat-vals)
-    (define rys (filter rational? (append* (for/list ([y  (in-list ys)])
-                                             (match y
-                                               [(ivl y1 y2)  (list y1 y2)]
-                                               [_            (list y)])))))
-    (cond
-      [(empty? rys)  (renderer2d #f #f #f #f)]
-      [else
-       (define n (length cats))
-       (let* ([x-min  (if x-min x-min 0)]
-              [x-max  (if x-max x-max (max x-min (+ x-min (* (- n 1) skip) 1)))]
-              [y-min  (if y-min y-min (apply min* rys))]
-              [y-max  (if y-max y-max (apply max* rys))])
-         (define xs (build-list n (λ (i) (+ x-min (* i skip)))))
-         (define x-ivls (for/list ([x  (in-list xs)])
-                          (ivl (+ x (* 1/2 gap)) (- (+ x 1) (* 1/2 gap)))))
-         (define tick-xs (for/list ([x  (in-list xs)]) (+ x 1/2)))
-         (define y-ivls (map (λ (y) (if (ivl? y) y (ivl 0 y))) ys))
-         (define maybe-invert (if invert? (λ (x y) (vector y x)) vector))
-         (renderer2d
-          (maybe-invert (ivl x-min x-max) (ivl y-min y-max)) #f
-          (discrete-histogram-ticks-fun cats tick-xs add-ticks? far-ticks? maybe-invert)
-          (rectangles-render-proc (map maybe-invert x-ivls y-ivls)
-                                  color style line-color line-width line-style alpha label)))])))
-
-(defproc (stacked-histogram
-          [cat-vals (sequence/c (or/c (vector/c any/c (sequence/c real?))
-                                      (list/c any/c (sequence/c real?))))]
-          [#:x-min x-min (or/c rational? #f) 0] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) 0] [#:y-max y-max (or/c rational? #f) #f]
-          [#:gap gap (real-in 0 1) (discrete-histogram-gap)]
-          [#:skip skip (>=/c 0) (discrete-histogram-skip)]
-          [#:invert? invert? boolean? (discrete-histogram-invert?)]
-          [#:colors colors (plot-colors/c nat/c) (stacked-histogram-colors)]
-          [#:styles styles (plot-brush-styles/c nat/c) (stacked-histogram-styles)]
-          [#:line-colors line-colors (plot-colors/c nat/c) (stacked-histogram-line-colors)]
-          [#:line-widths line-widths (pen-widths/c nat/c) (stacked-histogram-line-widths)]
-          [#:line-styles line-styles (plot-pen-styles/c nat/c) (stacked-histogram-line-styles)]
-          [#:alphas alphas (alphas/c nat/c) (stacked-histogram-alphas)]
-          [#:labels labels (labels/c nat/c) '(#f)]
-          [#:add-ticks? add-ticks? boolean? #t]
-          [#:far-ticks? far-ticks? boolean? #f]
-          ) (listof renderer2d?)
-  (let ([cat-vals  (sequence->list cat-vals)])
-    (match-define (list (or (vector cats ys) (list cats ys)) ...) cat-vals)
-    (let ([ys  (map sequence->list ys)])
-      (define yss (map cumulative-sum ys))
-      (define y-ivlss (for/list ([ys  (in-list yss)])
-                        (for/list ([y1  (in-list ys)] [y2  (in-list (rest ys))])
-                          (ivl y1 y2))))
-      (define max-num (apply max (map length yss)))
-      (for/list ([y-ivls  (in-list (transpose y-ivlss))]
-                 [color   (in-cycle* (maybe-apply colors max-num))]
-                 [style   (in-cycle* (maybe-apply styles max-num))]
-                 [line-color  (in-cycle* (maybe-apply line-colors max-num))]
-                 [line-width  (in-cycle* (maybe-apply line-widths max-num))]
-                 [line-style  (in-cycle* (maybe-apply line-styles max-num))]
-                 [alpha   (in-cycle* (maybe-apply alphas max-num))]
-                 [label   (in-cycle* (maybe-apply labels max-num))])
-        (discrete-histogram
-         (map vector cats y-ivls)
-         #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max
-         #:gap gap #:skip skip #:invert? invert?
-         #:color color #:style style #:line-color line-color #:line-width line-width
-         #:line-style line-style #:alpha alpha #:label label
-         #:add-ticks? add-ticks? #:far-ticks? far-ticks?)))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/vector.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/vector.rkt
deleted file mode 100644
index aed08755e3..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot2d/vector.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         (only-in racket/unsafe/ops unsafe-vector-ref))
-
-(provide exact-vector2d
-         exact-vector2d-sublists
-         exact-polygon2d)
-
-(define (exact-vector2d v)
-  (define n (vector-length v))
-  (cond [(= n 2)
-         (define v1 (unsafe-vector-ref v 0))
-         (define v2 (unsafe-vector-ref v 1))
-         (cond [(and (exact? v1) (exact? v2))  v]
-               [(and (rational? v1) (rational? v2))
-                (vector (inexact->exact v1) (inexact->exact v2))]
-               [else  #f])]
-        [else  #f]))
-
-(define (sublists vs)
-  (define vss
-    (for/fold ([vss  (list null)]) ([v  (in-list vs)])
-      (cond [v  (cons (cons v (car vss)) (cdr vss))]
-            [(null? (car vss))  vss]
-            [else  (cons null vss)])))
-  (cond [(null? (car vss))  (cdr vss)]
-        [else  vss]))
-
-(define (exact-vector2d-sublists vs)
-  (sublists (map exact-vector2d vs)))
-
-(define (exact-polygon2d vs ls)
-  (cond
-    [(null? vs)  (values null null)]
-    [else
-     (define-values (new-vs new-ls _)
-       (for/fold ([vs null] [ls null] [v1 (last vs)]) ([v2  (in-list vs)]
-                                                       [l   (in-list ls)])
-         (cond [(equal? v1 v2)  (values vs ls v2)]
-               [else
-                (define exact-v2 (exact-vector2d v2))
-                (if exact-v2
-                    (values (cons exact-v2 vs) (cons l ls) v2)
-                    (values vs ls v2))])))
-     (values (reverse new-vs) (reverse new-ls))]))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/bsp-trees.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/bsp-trees.rkt
deleted file mode 100644
index 11785e04d9..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/bsp-trees.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match
-         racket/list
-         racket/flonum
-         "bsp.rkt")
-
-(provide (all-defined-out))
-
-(: all-bsp-trees (HashTable Symbol (HashTable Integer BSP-Tree)))
-(define all-bsp-trees (make-weak-hasheq))
-
-(: build-bsp-trees (-> (HashTable Integer (Listof BSP-Shape)) Symbol))
-(define (build-bsp-trees structural-shapes)
-  (define key (gensym))
-  (define bsp-trees
-    (for/hasheq : (HashTable Integer BSP-Tree) ([(layer ss)  (in-hash structural-shapes)])
-      (values layer (build-bsp-tree ss))))
-  (hash-set! all-bsp-trees key bsp-trees)
-  key)
-
-(: walk-bsp-trees (-> Symbol FlVector (HashTable Integer (Listof BSP-Shape))
-                      (HashTable Integer (Listof BSP-Shape))))
-(define (walk-bsp-trees key view-dir detail-shapes)
-  (define bsp-trees (hash-ref all-bsp-trees key
-                              (λ () ((inst make-immutable-hasheq Integer BSP-Tree)))))
-  (define vx (flvector-ref view-dir 0))
-  (define vy (flvector-ref view-dir 1))
-  (define vz (flvector-ref view-dir 2))
-  
-  (define layers (sort (append (hash-keys bsp-trees) (hash-keys detail-shapes)) >))
-  (for/hasheq : (HashTable Integer (Listof BSP-Shape)) ([layer  (in-list layers)])
-    (define bsp (hash-ref bsp-trees layer (λ () (bsp-leaf empty))))
-    (define ss (hash-ref detail-shapes layer (λ () empty)))
-    
-    (: in-order-ss (Listof BSP-Shape))
-    (define in-order-ss
-      (let loop ([bsp  (bsp-tree-insert bsp ss)])
-        (match bsp
-          [(bsp-leaf ss)  ss]
-          [(bsp-node plane neg pos)
-           (define a (flvector-ref plane 0))
-           (define b (flvector-ref plane 1))
-           (define c (flvector-ref plane 2))
-           (define cos-angle (+ (* a vx) (* b vy) (* c vz)))
-           (if (cos-angle . > . -1e-16)
-               (append (loop neg) (loop pos))
-               (append (loop pos) (loop neg)))])))
-    
-    (values layer in-order-ss)))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/bsp.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/bsp.rkt
deleted file mode 100644
index 89920188b9..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/bsp.rkt
+++ /dev/null
@@ -1,608 +0,0 @@
-#lang typed/racket/base
-
-(require racket/list
-         racket/match
-         racket/promise
-         math/flonum
-         "split.rkt")
-
-(provide
- ;; BSP shapes
- (struct-out points)
- (struct-out line)
- (struct-out poly)
- (struct-out lines)
- BSP-Shape
- (rename-out [shape? bsp-shape?])
- ;; BSP tree
- (struct-out bsp-node)
- (struct-out bsp-leaf)
- BSP-Tree
- ;; BSP tree operations
- build-bsp-tree
- bsp-tree-insert)
-
-;; ===================================================================================================
-;; Shape types
-
-;; Parent type, not exported as a structure
-(struct shape ([data : Any]) #:transparent)
-
-(struct points shape ([vertices : (Listof FlVector)])
-  #:transparent)
-
-(struct poly shape ([vertices : (Listof FlVector)]
-                    [lines? : (Listof Boolean)]
-                    [normal : FlVector])
-  #:transparent)
-
-(struct line shape ([start : FlVector]
-                    [end : FlVector])
-  #:transparent)
-
-(struct lines shape ([vertices : (Listof FlVector)])
-  #:transparent)
-
-(define-type BSP-Shape shape)
-
-;; ===================================================================================================
-;; BSP tree type
-
-(struct: bsp-node ([plane : FlVector]
-                   [neg : BSP-Tree]
-                   [pos : BSP-Tree])
-  #:transparent)
-
-(struct: bsp-leaf ([shapes : (Listof BSP-Shape)])
-  #:transparent)
-
-(define-type BSP-Tree (U bsp-node bsp-leaf))
-
-(: bsp-tree-size (-> BSP-Tree Natural))
-(define (bsp-tree-size bsp)
-  (match bsp
-    [(bsp-node _ neg pos)  (+ (bsp-tree-size neg) (bsp-tree-size pos))]
-    [(bsp-leaf shapes)  (length shapes)]))
-
-;; ===================================================================================================
-
-(define eps 1e-14)
-
-(: flnonpos? (-> Flonum Boolean))
-(define (flnonpos? x)
-  (<= x eps))
-
-(: flnonneg? (-> Flonum Boolean))
-(define (flnonneg? x)
-  (>= x (- eps)))
-
-;; ===================================================================================================
-;; Bin shapes: on the negative side of a plane, on the plane, or on the positive side
-
-(: bin-bsp-points (-> points FlVector (Values (Listof BSP-Shape) (Listof BSP-Shape))))
-(define (bin-bsp-points s plane)
-  (match-define (points data vs) s)
-  (define ds (map (λ ([v : FlVector]) (point3d-plane-dist v plane)) vs))
-  (define-values (neg-vs pos-vs)
-    (for/fold ([neg-vs : (Listof FlVector)  empty]
-               [pos-vs : (Listof FlVector)  empty]
-               ) ([v  (in-list vs)])
-      (define d (point3d-plane-dist v plane))
-      (if (d . >= . 0.0)
-          (values neg-vs (cons v pos-vs))
-          (values (cons v neg-vs) pos-vs))))
-  (values (if (empty? neg-vs) empty (list (points data neg-vs)))
-          (if (empty? pos-vs) empty (list (points data pos-vs)))))
-
-(: bin-bsp-line (-> line FlVector Boolean (Values (Listof BSP-Shape) (Listof BSP-Shape))))
-(define (bin-bsp-line s plane disjoint?)
-  (match-define (line data v1 v2) s)
-  (define d1 (point3d-plane-dist v1 plane))
-  (define d2 (point3d-plane-dist v2 plane))
-  (cond [(and (flnonneg? d1) (flnonneg? d2))  (values empty (list s))]
-        [(and (flnonpos? d1) (flnonpos? d2))  (values (list s) empty)]
-        [disjoint?  (values empty empty)]
-        [(<= d1 0.0)
-         (define v (split-line3d v1 v2 plane))
-         (values (list (line data v1 v)) (list (line data v v2)))]
-        [else
-         (define v (split-line3d v1 v2 plane))
-         (values (list (line data v v2)) (list (line data v1 v)))]))
-
-(: bin-bsp-poly (-> poly FlVector Boolean (Values (Listof BSP-Shape) (Listof BSP-Shape))))
-(define (bin-bsp-poly s plane disjoint?)
-  (match-define (poly data vs ls norm) s)
-  (define ds (map (λ ([v : FlVector]) (point3d-plane-dist v plane)) vs))
-  (cond [(andmap flnonneg? ds)  (values empty (list s))]
-        [(andmap flnonpos? ds)  (values (list s) empty)]
-        [disjoint?  (values empty empty)]
-        [else
-         (define-values (vs1 ls1 vs2 ls2 ok?) (split-polygon3d vs ls plane))
-         (cond [ok?  (values (if ((length vs2) . < . 3) empty (list (poly data vs2 ls2 norm)))
-                             (if ((length vs1) . < . 3) empty (list (poly data vs1 ls1 norm))))]
-               [else
-                (define-values (vs1 ls1 vs2 ls2) (polygon3d-divide vs ls))
-                (define-values (neg-ss1 pos-ss1) (bin-bsp-poly (poly data vs1 ls1 norm) plane #f))
-                (define-values (neg-ss2 pos-ss2) (bin-bsp-poly (poly data vs2 ls2 norm) plane #f))
-                (values (append neg-ss1 neg-ss2) (append pos-ss1 pos-ss2))])]))
-
-(: bin-bsp-lines (-> lines FlVector Boolean (Values (Listof BSP-Shape) (Listof BSP-Shape))))
-(define (bin-bsp-lines s plane disjoint?)
-  (match-define (lines data vs) s)
-  (define ds (map (λ ([v : FlVector]) (point3d-plane-dist v plane)) vs))
-  (cond [(andmap flnonneg? ds)  (values empty (list s))]
-        [(andmap flnonpos? ds)  (values (list s) empty)]
-        [disjoint?  (values empty empty)]
-        [else
-         (: vertices->lines (-> (Listof (Listof FlVector)) (Listof BSP-Shape)))
-         (define (vertices->lines vss)
-           (append*
-            (map (λ ([vs : (Listof FlVector)])
-                   (define n (length vs))
-                   (cond [(n . < . 2)  empty]
-                         [(n . = . 2)  (list (line data (first vs) (second vs)))]
-                         [else  (list (lines data vs))]))
-                 vss)))
-         
-         (define-values (vss1 vss2) (split-lines3d vs plane))
-         (values (vertices->lines vss2) (vertices->lines vss1))]))
-
-(: bin-shapes (-> (Listof BSP-Shape) FlVector Boolean
-                  (Values (U #f (Listof BSP-Shape)) (U #f (Listof BSP-Shape)))))
-(define (bin-shapes ss plane disjoint?)
-  (let loop ([ss ss] [neg-ss  : (Listof BSP-Shape)  empty]
-                     [pos-ss  : (Listof BSP-Shape)  empty])
-    (cond [(empty? ss)  (values neg-ss pos-ss)]
-          [else
-           (define s (first ss))
-           (define-values (new-neg-ss new-pos-ss)
-             (cond [(points? s)  (bin-bsp-points s plane)]
-                   [(line? s)    (bin-bsp-line   s plane disjoint?)]
-                   [(poly? s)    (bin-bsp-poly   s plane disjoint?)]
-                   [(lines? s)   (bin-bsp-lines  s plane disjoint?)]
-                   [else  (raise-argument-error 'bin-shapes "known shape" s)]))
-           (cond [(and (empty? new-neg-ss) (empty? new-pos-ss))  (values #f #f)]
-                 [else  (loop (rest ss)
-                              (append new-neg-ss neg-ss)
-                              (append new-pos-ss pos-ss))])])))
-
-;; ===================================================================================================
-;; Build BSP tree
-
-(: bsp-polys->vertices (-> (Listof poly) (Listof FlVector)))
-(define (bsp-polys->vertices ss)
-  (append* (map poly-vertices ss)))
-
-(: bsp-lines->vertices (-> (Listof line) (Listof FlVector)))
-(define (bsp-lines->vertices ss)
-  (append (map line-start ss) (map line-end ss)))
-
-(: coordinate-min-max (-> (Listof FlVector) Index (Values Flonum Flonum)))
-(define (coordinate-min-max vs i)
-  (for/fold ([x-min : Flonum  +inf.0] [x-max : Flonum  -inf.0]) ([v  (in-list vs)])
-    (define x (flvector-ref v i))
-    (values (min x x-min) (max x x-max))))
-
-(struct: interval ([min : Flonum] [max : Flonum] [weight : Natural]) #:transparent)
-
-(: shapes->intervals (-> (Listof BSP-Shape) Index (Listof interval)))
-(define (shapes->intervals ss i)
-  (for/list: ([s  (in-list ss)])
-    (match s
-      [(points _ vs)
-       (define-values (x-min x-max) (coordinate-min-max vs i))
-       (interval x-min x-max 1)]
-      [(line _ v1 v2)
-       (define x1 (flvector-ref v1 i))
-       (define x2 (flvector-ref v2 i))
-       (interval (min x1 x2) (max x1 x2) 1)]
-      [(poly _data vs ls _norm)
-       (define-values (x-min x-max) (coordinate-min-max vs i))
-       (interval x-min x-max 1)]
-      [(lines _ vs)
-       (define-values (x-min x-max) (coordinate-min-max vs i))
-       (interval x-min x-max 1)])))
-
-(: interval-list-union (-> (Listof interval) (Listof interval) (Listof interval)))
-(define (interval-list-union I1 I2)
-  (cond
-    [(empty? I1)  I2]
-    [(empty? I2)  I1]
-    [else
-     (match-define (interval a1 b1 w1) (first I1))
-     (match-define (interval a2 b2 w2) (first I2))
-     (cond
-       [(b1 . <= . a2)
-        ;; ------
-        ;;        ------
-        (cons (first I1) (interval-list-union (rest I1) I2))]
-       [(b2 . <= . a1)
-        ;;        ------
-        ;; ------
-        (cons (first I2) (interval-list-union I1 (rest I2)))]
-       [(a1 . < . a2)
-        (cond [(b2 . < . b1)
-               ;; ------
-               ;;   --
-               (define I (interval a1 b1 (+ w1 w2)))
-               (interval-list-union (cons I (rest I1)) (rest I2))]
-              [else
-               ;; ------           ------
-               ;;    ------   or      ---
-               (define I (interval a1 b2 (+ w1 w2)))
-               (interval-list-union (rest I1) (cons I (rest I2)))])]
-       [else
-        (cond [(b2 . < . b1)
-               ;;    ------        ------
-               ;; ------      or   ---
-               (define I (interval a2 b1 (+ w1 w2)))
-               (interval-list-union (cons I (rest I1)) (rest I2))]
-              [else
-               ;;   --             ---        ---           ------
-               ;; ------   or   ------   or   ------   or   ------
-               (define I (interval a2 b2 (+ w1 w2)))
-               (interval-list-union (rest I1) (cons I (rest I2)))])])]))
-
-(: interval-split (-> (Listof interval) (Option Flonum)))
-(define (interval-split all-ivls)
-  (: ivls (Listof interval))
-  (define ivls
-    (let loop ([ivls  all-ivls])
-      (cond [(empty? ivls)  empty]
-            [(empty? (rest ivls))  ivls]
-            [else
-             (define n (length ivls))
-             (define-values (ivls1 ivls2) (split-at ivls (quotient n 2)))
-             (interval-list-union (loop ivls1) (loop ivls2))])))
-  
-  (cond [(empty? ivls)  #f]
-        [(empty? (rest ivls))  #f]
-        [else
-         (define total-w (length all-ivls))
-         (define-values (best-x best-w _)
-           (for/fold ([best-x : Flonum  (interval-min (first ivls))]
-                      [best-w : Integer  total-w]
-                      [left-w : Integer  0]
-                      ) ([ivl  (in-list ivls)])
-             (define max-w (max left-w (- total-w left-w)))
-             (define new-left-w (+ (interval-weight ivl) left-w))
-             (cond [(max-w . < . best-w)
-                    (values (interval-min ivl) max-w new-left-w)]
-                   [else
-                    (values best-x best-w new-left-w)])))
-         best-x]))
-
-(struct: axis ([index : Index] [size : Flonum] [min : Flonum] [max : Flonum] [mid : Flonum])
-  #:transparent)
-
-(: vertices->axes (-> (Listof FlVector) (Listof axis)))
-(define (vertices->axes vs)
-  (for/list ([i  (in-list '(0 1 2))])
-    (define-values (x-min x-max) (coordinate-min-max vs i))
-    (axis i (- x-max x-min) x-min x-max (* 0.5 (+ x-min x-max)))))
-
-(: axial-plane (-> Index Flonum FlVector))
-(define (axial-plane i x)
-  (define plane (flvector 0.0 0.0 0.0 (- x)))
-  (flvector-set! plane i 1.0)
-  plane)
-
-(: flvector-plane (-> FlVector FlVector FlVector FlVector))
-(define (flvector-plane v1 v2 v3)
-  (define x2 (flvector-ref v2 0))
-  (define y2 (flvector-ref v2 1))
-  (define z2 (flvector-ref v2 2))
-  (define dx1 (- (flvector-ref v1 0) x2))
-  (define dy1 (- (flvector-ref v1 1) y2))
-  (define dz1 (- (flvector-ref v1 2) z2))
-  (define dx3 (- (flvector-ref v3 0) x2))
-  (define dy3 (- (flvector-ref v3 1) y2))
-  (define dz3 (- (flvector-ref v3 2) z2))
-  (define a (- (* dy1 dz3) (* dz1 dy3)))
-  (define b (- (* dz1 dx3) (* dx1 dz3)))
-  (define c (- (* dx1 dy3) (* dy1 dx3)))
-  (define d (- (+ (* a x2) (* b y2) (* c z2))))
-  (define n (flsqrt (+ (* a a) (* b b) (* c c))))
-  (flvector (/ a n) (/ b n) (/ c n) (/ d n)))
-
-(: line3d-planes (-> FlVector FlVector (Listof FlVector)))
-(define (line3d-planes v1 v2)
-  (define planes
-    (list (flvector-plane v1 v2 (flvector+ v1 (flvector 1.0 0.0 0.0)))
-          (flvector-plane v1 v2 (flvector+ v1 (flvector 0.0 1.0 0.0)))
-          (flvector-plane v1 v2 (flvector+ v1 (flvector 0.0 0.0 1.0)))))
-  (filter
-   flvector?
-   (for/list : (Listof (U #f FlVector)) ([plane  (in-list planes)])
-     (cond [(and (flrational? (flvector-ref plane 0))
-                 (flrational? (flvector-ref plane 1))
-                 (flrational? (flvector-ref plane 2))
-                 (flrational? (flvector-ref plane 3)))
-            plane]
-           [else  #f]))))
-
-(: bsp-line-planes (-> line (Listof FlVector)))
-(define (bsp-line-planes s)
-  (match-define (line _ v1 v2) s)
-  (line3d-planes v1 v2))
-
-(: find-bounding-planes (-> (Listof FlVector) FlVector (Listof FlVector)))
-(define (find-bounding-planes vs normal)
-  (define n (length vs))
-  (cond [(n . < . 3)  empty]
-        [(n . = . 3)  (list (flvector-plane (first vs) (second vs) (third vs)))]
-        [else
-         (define a (flvector-ref normal 0))
-         (define b (flvector-ref normal 1))
-         (define c (flvector-ref normal 2))
-         ;; Pilot plane
-         (define v1 (first vs))
-         (define d1 (- (+ (* a (flvector-ref v1 0))
-                          (* b (flvector-ref v1 1))
-                          (* c (flvector-ref v1 2)))))
-         ;; Find min and max signed distances from pilot plane
-         (define-values (dmin dmax)
-           (for/fold ([dmin : Flonum  0.0] [dmax : Flonum  0.0]) ([v  (in-list (rest vs))])
-             (define d (+ (* a (flvector-ref v 0))
-                          (* b (flvector-ref v 1))
-                          (* c (flvector-ref v 2))
-                          d1))
-             (values (min dmin d) (max dmax d))))
-         ;; Return min and max plane
-         (list (flvector a b c (- d1 dmin))
-               (flvector a b c (- d1 dmax)))]))
-
-(: sort-planes (-> (Listof FlVector) FlVector (Listof FlVector)))
-;; Sort planes by absolute distance from a central point
-(define (sort-planes planes center)
-  ((inst sort FlVector Flonum) planes <
-                               #:key (λ ([plane : FlVector])
-                                       (abs (point3d-plane-dist center plane)))
-                               #:cache-keys? #t))
-
-(: bsp-poly-triangulate (-> poly (Listof poly)))
-(define (bsp-poly-triangulate s)
-  (match-define (poly data vs ls norm) s)
-  (define-values (vss lss) (polygon3d-triangulate vs ls))
-  (map (λ ([vs : (Listof FlVector)] [ls : (Listof Boolean)]) (poly data vs ls norm))
-       vss lss))
-
-(: bsp-poly-divide (-> poly (Listof poly)))
-(define (bsp-poly-divide s)
-  (match-define (poly data vs ls norm) s)
-  (define-values (vs1 ls1 vs2 ls2) (polygon3d-divide vs ls))
-  (cond [(empty? vs2)  (list s)]
-        [else  (list (poly data vs1 ls1 norm)
-                     (poly data vs2 ls2 norm))]))
-
-(: triangulate-polygons (-> (Listof BSP-Shape) (Listof BSP-Shape)))
-(define (triangulate-polygons ss)
-  (append* (map (λ ([s : BSP-Shape])
-                  (if (poly? s) (bsp-poly-triangulate s) (list s)))
-                ss)))
-
-(: bsp-poly-planes (-> poly (Listof FlVector)))
-(define (bsp-poly-planes s)
-  (define vs (poly-vertices s))
-  (cond [(< (length vs) 3)  empty]
-        [(= (length vs) 3)  (list (flvector-plane (first vs) (second vs) (third vs)))]
-        [else
-         (filter
-          flvector?
-          (for/list: : (Listof (U #f FlVector))
-            ([v1  (in-list (append vs (take vs 2)))]
-             [v2  (in-list (append (list (last vs)) vs (list (first vs))))]
-             [v3  (in-list (append (take-right vs 2) vs))])
-            (define plane (flvector-plane v1 v2 v3))
-            (cond [(and (flrational? (flvector-ref plane 0))
-                        (flrational? (flvector-ref plane 1))
-                        (flrational? (flvector-ref plane 2))
-                        (flrational? (flvector-ref plane 3)))
-                   plane]
-                  [else  #f])))]))
-
-(: canonicalize-shapes (-> (Listof BSP-Shape) (Listof BSP-Shape)))
-(define (canonicalize-shapes ss)
-  (append*
-   (for/list : (Listof (Listof BSP-Shape)) ([s  (in-list ss)])
-     (match s
-       [(points _ vs)
-        (if (empty? vs) empty (list s))]
-       [(line _ v1 v2) 
-        (if (equal? v1 v2) empty (list s))]
-       [(poly data vs ls norm)
-        (let-values ([(vs ls)  (canonical-polygon3d vs ls)])
-          (if ((length vs) . < . 3) empty (list (poly data vs ls norm))))]
-       [(lines data vs)
-        (let ([vs  (canonical-lines3d vs)])
-          (define n (length vs))
-          (cond [(n . < . 2)  empty]
-                [(n . = . 2)  (list (line data (first vs) (second vs)))]
-                [else  (list (lines data vs))]))]))))
-
-;; ===================================================================================================
-
-(: build-bsp-tree (-> (Listof BSP-Shape) BSP-Tree))
-(define (build-bsp-tree ss)
-  (let* ([ss  (canonicalize-shapes ss)])
-    (build-bsp-tree* ss)))
-
-(: bad-plane? (-> FlVector Boolean))
-(define (bad-plane? plane)
-  (define a (flvector-ref plane 0))
-  (define b (flvector-ref plane 1))
-  (define c (flvector-ref plane 2))
-  (define d (flvector-ref plane 3))
-  (or (and ((abs a) . < . 1e-16) ((abs b) . < . 1e-16) ((abs c) . < . 1e-16))
-      (not (flrational? a)) (not (flrational? b)) (not (flrational? c)) (not (flrational? d))))
-
-(: try-bsp-split (-> (Listof BSP-Shape) FlVector Boolean (-> (U #f BSP-Tree)) (U #f BSP-Tree)))
-(define (try-bsp-split ss plane disjoint? k)
-  (cond [(bad-plane? plane)  (k)]
-        [else
-         (define-values (neg-ss pos-ss) (bin-shapes ss plane disjoint?))
-         (cond [(not (and neg-ss pos-ss))  (k)]
-               [(empty? neg-ss)  (k)]
-               [(empty? pos-ss)  (k)]
-               [(and disjoint? ((+ (length neg-ss) (length pos-ss)) . > . (length ss)))  (k)]
-               [else  (bsp-node plane (build-bsp-tree* neg-ss) (build-bsp-tree* pos-ss))])]))
-
-(: try-bsp-split/axial-planes (-> (Listof BSP-Shape) (Listof axis) (U #f BSP-Tree)))
-(define (try-bsp-split/axial-planes ss axes)
-  (define sorted-axes ((inst sort axis Flonum) axes > #:key axis-size))
-  (let loop ([axes sorted-axes])
-    (cond [(empty? axes)  #f]
-          [else
-           (define i (axis-index (first axes)))
-           (define split (interval-split (shapes->intervals ss i)))
-           (cond [split  (define plane (axial-plane i split))
-                         (try-bsp-split ss plane #t (λ () (loop (rest axes))))]
-                 [else  (loop (rest axes))])])))
-
-(: try-bsp-split/planes (-> (Listof BSP-Shape) (Listof FlVector) Boolean (U #f BSP-Tree)))
-(define (try-bsp-split/planes ss planes disjoint?)
-  ;; Try each plane in order
-  (let loop ([planes planes])
-    (cond [(empty? planes)  #f]
-          [else  (try-bsp-split ss (first planes) disjoint?
-                                (λ () (try-bsp-split ss (flvector- (first planes)) disjoint?
-                                                     (λ () (loop (rest planes))))))])))
-
-(: try-bsp-split/bounding-planes (-> (Listof BSP-Shape) (Listof poly) FlVector
-                                          (U #f BSP-Tree)))
-;; Tries splitting using polygons' bounding planes
-;; Bounding planes aren't necessarily coplanar with any triangle in a polygon, so
-;; splitting won't always make progress; we therefore split only disjointly
-(define (try-bsp-split/bounding-planes ss ps center)
-  (cond [((length ps) . > . 5)  #f]
-        [else
-         (define vss (map poly-vertices ps))
-         (define norms (map poly-normal ps))
-         (define planes (sort-planes (append* (map find-bounding-planes vss norms)) center))
-         (try-bsp-split/planes ss planes #t)]))
-
-(: try-bsp-split/triangulating (-> (Listof BSP-Shape) (U #f BSP-Tree)))
-;; Tries recurring on triangulated polygons
-(define (try-bsp-split/triangulating ss)
-  (define new-ss (triangulate-polygons ss))
-  (cond [(= (length new-ss) (length ss))  #f]
-        [else  (build-bsp-tree* new-ss)]))
-
-;; ---------------------------------------------------------------------------------------------------
-
-(: build-bsp-tree* (-> (Listof BSP-Shape) BSP-Tree))
-(define (build-bsp-tree* ss)
-  (cond
-    [(or (empty? ss) (empty? (rest ss)))  (bsp-leaf ss)]
-    [else
-     (let* ([bsp  #f]
-            [bsp  (if bsp bsp (build-bsp-tree*/poly ss))]
-            [bsp  (if bsp bsp (build-bsp-tree*/line ss))]
-            [bsp  (if bsp bsp (build-bsp-tree*/axial ss))]
-            [bsp  (if bsp bsp (bsp-leaf ss))])
-       bsp)]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Phase 1: build by splitting on polygon faces
-
-(: build-bsp-tree*/poly (-> (Listof BSP-Shape) (U #f BSP-Tree)))
-(define (build-bsp-tree*/poly ss)
-  (define ps (filter poly? ss))
-  (cond
-    [(empty? ps)  #f]
-    [else
-     (define axes (vertices->axes (bsp-polys->vertices ps)))
-     (define center (list->flvector (map axis-mid axes)))
-     
-     ;; Planes defined by neighboring polygon vertices
-     (define polygon-planes (delay (sort-planes (append* (map bsp-poly-planes ps)) center)))
-     
-     (: try-bsp-split/polygon-planes (-> Boolean (U #f BSP-Tree)))
-     ;; Tries splitting using polygon-planes
-     (define (try-bsp-split/polygon-planes disjoint?)
-       (define planes (force polygon-planes))
-       (cond [(and disjoint? ((length planes) . > . 10))  #f]
-             [else  (try-bsp-split/planes ss planes disjoint?)]))
-     
-     (let* ([bsp  #f]
-            [bsp  (if bsp bsp (try-bsp-split/axial-planes ss axes))]
-            [bsp  (if bsp bsp (try-bsp-split/bounding-planes ss ps center))]
-            [bsp  (if bsp bsp (try-bsp-split/polygon-planes #t))]
-            [bsp  (if bsp bsp (try-bsp-split/polygon-planes #f))]
-            [bsp  (if bsp bsp (try-bsp-split/triangulating ss))])
-       bsp)]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Phase 2: build by splitting on planes aligned with axes and line segments
-
-(: build-bsp-tree*/line (-> (Listof BSP-Shape) (U #f BSP-Tree)))
-(define (build-bsp-tree*/line ss)
-  (define ls (filter line? ss))
-  (cond
-    [(empty? ls)  #f]
-    [else
-     (define axes (vertices->axes (bsp-lines->vertices ls)))
-     (define center (list->flvector (map axis-mid axes)))
-     
-     ;; Planes defined by line segments and basis vectors (i.e. one basis in normal is zero)
-     (define line-planes (delay (sort-planes (append* (map bsp-line-planes ls)) center)))
-     
-     (: try-bsp-split/line-planes (-> Boolean (U #f BSP-Tree)))
-     ;; Tries splitting using line-planes
-     (define (try-bsp-split/line-planes disjoint?)
-       (define planes (force line-planes))
-       (cond [(and disjoint? ((length planes) . > . 10))  #f]
-             [else  (try-bsp-split/planes ss planes disjoint?)]))
-     
-     (let* ([bsp  #f]
-            [bsp  (if bsp bsp (try-bsp-split/axial-planes ss axes))]
-            [bsp  (if bsp bsp (try-bsp-split/line-planes #t))]
-            [bsp  (if bsp bsp (try-bsp-split/line-planes #f))])
-       bsp)]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Phase 3: build by splitting on axis-aligned planes using lines and points vertices
-
-(: build-bsp-tree*/axial (-> (Listof BSP-Shape) (U #f BSP-Tree)))
-(define (build-bsp-tree*/axial ss)
-  (define ls (filter lines? ss))
-  (define ps (filter points? ss))
-  (cond
-    [(and (empty? ls) (empty? ps))  #f]
-    [else
-     (define axes (vertices->axes (append (append* (map lines-vertices ls))
-                                          (append* (map points-vertices ps)))))
-     (define center (list->flvector (map axis-mid axes)))
-     
-     (: try-nondisjoint-split (-> (U #f BSP-Tree)))
-     (define (try-nondisjoint-split)
-       (match-define (axis i size _mn _mx mid) (argmax axis-size axes))
-       (cond [(size . < . 0.01)  #f]
-             [else
-              (define plane (axial-plane i mid))
-              (try-bsp-split ss plane #f (λ () #f))]))
-     
-     (let* ([bsp  #f]
-            [bsp  (if bsp bsp (try-bsp-split/axial-planes ss axes))]
-            [bsp  (if bsp bsp (try-nondisjoint-split))])
-       bsp)]))
-
-;; ===================================================================================================
-;; BSP tree insert
-
-(: bsp-tree-insert (-> BSP-Tree (Listof BSP-Shape) BSP-Tree))
-(define (bsp-tree-insert bsp ss)
-  (bsp-tree-insert* bsp (canonicalize-shapes ss)))
-
-(: bsp-tree-insert* (-> BSP-Tree (Listof BSP-Shape) BSP-Tree))
-(define (bsp-tree-insert* bsp ss)
-  (cond [(empty? ss)  bsp]
-        [else
-         (match bsp
-           [(bsp-leaf other-ss)
-            (build-bsp-tree* (append other-ss ss))]
-           [(bsp-node plane neg pos)
-            (define-values (neg-ss pos-ss) (bin-shapes ss plane #f))
-            (if (and neg-ss pos-ss)
-                (bsp-node plane (bsp-tree-insert* neg neg-ss) (bsp-tree-insert* pos pos-ss))
-                (error 'bsp-tree-insert* "shouldn't happen"))])]))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/clip.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/clip.rkt
deleted file mode 100644
index fe75b7e0b7..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/clip.rkt
+++ /dev/null
@@ -1,253 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         racket/match
-         racket/list)
-
-(provide point-in-bounds?
-         point-inside-plane?
-         clip-line/bounds
-         clip-line/plane
-         clip-lines/bounds
-         clip-lines/plane
-         clip-polygon/bounds
-         clip-polygon/plane)
-
-;; ===================================================================================================
-;; Basic plane intersection and distance tests
-
-;; Need to use this instead of `*' to make axial plane tests as fast as hand-written because the
-;; optimizer doesn't always figure out (* 0 e) = 0, etc.
-(define-syntax (times stx)
-  (syntax-case stx ()
-    [(_ 0 e)  (syntax/loc stx 0)]
-    [(_ 1 e)  (syntax/loc stx e)]
-    [(_ 0.0 e)  (syntax/loc stx 0.0)]
-    [(_ 1.0 e)  (syntax/loc stx (real->double-flonum e))]
-    [(_ . es)  (syntax/loc stx (* . es))]))
-
-(define-syntax-rule (plane-line-intersect a b c d x1-stx y1-stx z1-stx x2-stx y2-stx z2-stx)
-  (let ([x1 x1-stx] [y1 y1-stx] [z1 z1-stx] [x2 x2-stx] [y2 y2-stx] [z2 z2-stx])
-    (let ([dot1  (+ (times a x1) (times b y1) (times c z1))]
-          [dot2  (+ (times a x2) (times b y2) (times c z2))])
-      (let ([denom  (- dot1 dot2)])
-        (if (zero? denom)
-            (values x2 y2 z2)
-            (let ([t  (/ (+ dot1 d) denom)])
-              (values (+ x1 (* t (- x2 x1)))
-                      (+ y1 (* t (- y2 y1)))
-                      (+ z1 (* t (- z2 z1))))))))))
-
-(define-syntax-rule (plane-point-dist a b c d x y z)
-  (+ (times a x) (times b y) (times c z) d))
-
-;; ===================================================================================================
-;; Points
-
-(define (point-in-bounds? v x-min x-max y-min y-max z-min z-max)
-  (match-define (vector x y z) v)
-  (and (<= x-min x x-max) (<= y-min y y-max) (<= z-min z z-max)))
-
-(define (point-inside-plane? v plane)
-  (match-define (vector x y z) v)
-  (match-define (vector a b c d) plane)
-  (>= (plane-point-dist a b c d x y z) 0))
-
-;; ===================================================================================================
-;; Line clipping
-
-(define (clip-line/plane v1 v2 plane)
-  (match-define (vector x1 y1 z1) v1)
-  (match-define (vector x2 y2 z2) v2)
-  (match-define (vector a b c d) plane)
-  (define v1? (>= (plane-point-dist a b c d x1 y1 z1) 0))
-  (define v2? (>= (plane-point-dist a b c d x2 y2 z2) 0))
-  (cond [(and v1? v2?)       (values v1 v2)]
-        [(not (or v1? v2?))  (values #f #f)]
-        [else
-         (define-values (x y z) (plane-line-intersect a b c d x1 y1 z1 x2 y2 z2))
-         (if v1? (values v1 (vector x y z)) (values (vector x y z) v2))]))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Clipping inside axial bounding box
-
-(define-syntax-rule (make-clip-line/axis a b c gte?)
-  (λ (val x1 y1 z1 x2 y2 z2)
-    (define v1? (gte? (plane-point-dist a b c (- val) x1 y1 z1) 0))
-    (define v2? (gte? (plane-point-dist a b c (- val) x2 y2 z2) 0))
-    (cond [(or (and v1? v2?) (not (or v1? v2?))) (values x1 y1 z1 x2 y2 z2)]
-          [else
-           (define-values (x y z) (plane-line-intersect a b c (- val) x1 y1 z1 x2 y2 z2))
-           (if v1? (values x1 y1 z1 x y z) (values x y z x2 y2 z2))])))
-
-(define clip-line-x-min (make-clip-line/axis 1 0 0 >=))
-(define clip-line-x-max (make-clip-line/axis 1 0 0 <=))
-(define clip-line-y-min (make-clip-line/axis 0 1 0 >=))
-(define clip-line-y-max (make-clip-line/axis 0 1 0 <=))
-(define clip-line-z-min (make-clip-line/axis 0 0 1 >=))
-(define clip-line-z-max (make-clip-line/axis 0 0 1 <=))
-
-(define (clip-line/bounds v1 v2 x-min x-max y-min y-max z-min z-max)
-  (let/ec return
-    (match-define (vector x1 y1 z1) v1)
-    (match-define (vector x2 y2 z2) v2)
-    ;; early accept: both endpoints in bounds
-    (when (and (<= x-min x1 x-max) (<= y-min y1 y-max) (<= z-min z1 z-max)
-               (<= x-min x2 x-max) (<= y-min y2 y-max) (<= z-min z2 z-max))
-      (return v1 v2))
-    ;; early reject: both endpoints on the outside of the same plane
-    (when (or (and (x1 . < . x-min) (x2 . < . x-min)) (and (x1 . > . x-max) (x2 . > . x-max))
-              (and (y1 . < . y-min) (y2 . < . y-min)) (and (y1 . > . y-max) (y2 . > . y-max))
-              (and (z1 . < . z-min) (z2 . < . z-min)) (and (z1 . > . z-max) (z2 . > . z-max)))
-      (return #f #f))
-    (let*-values ([(x1 y1 z1 x2 y2 z2)  (clip-line-x-min x-min x1 y1 z1 x2 y2 z2)]
-                  [(x1 y1 z1 x2 y2 z2)  (clip-line-x-max x-max x1 y1 z1 x2 y2 z2)]
-                  [(x1 y1 z1 x2 y2 z2)  (clip-line-y-min y-min x1 y1 z1 x2 y2 z2)]
-                  [(x1 y1 z1 x2 y2 z2)  (clip-line-y-max y-max x1 y1 z1 x2 y2 z2)]
-                  [(x1 y1 z1 x2 y2 z2)  (clip-line-z-min z-min x1 y1 z1 x2 y2 z2)]
-                  [(x1 y1 z1 x2 y2 z2)  (clip-line-z-max z-max x1 y1 z1 x2 y2 z2)])
-      (values (vector x1 y1 z1) (vector x2 y2 z2)))))
-
-;; ===================================================================================================
-;; Connected lines clipping
-
-(define-syntax-rule (make-clip-lines/plane a b c d gte?)
-  (λ (vs)
-    (cond
-      [(empty? vs)  empty]
-      [else
-       (define v1 (first vs))
-       (match-define (vector x1 y1 z1) v1)
-       (define v1? (gte? (plane-point-dist a b c d x1 y1 z1) 0))
-       
-       (define init-vss (if v1? (list (list v1)) (list empty)))
-       
-       (define-values (vss _x1 _y1 _z1 _v1?)
-         (for/fold ([vss init-vss] [x1 x1] [y1 y1] [z1 z1] [v1? v1?]) ([v2  (in-list (rest vs))])
-           (define x2 (vector-ref v2 0))
-           (define y2 (vector-ref v2 1))
-           (define z2 (vector-ref v2 2))
-           (define v2? (gte? (plane-point-dist a b c d x2 y2 z2) 0))
-           (cond [(and v1? v2?)       (values (cons (cons v2 (first vss)) (rest vss)) x2 y2 z2 v2?)]
-                 [(not (or v1? v2?))  (values vss x2 y2 z2 v2?)]
-                 [else
-                  (define-values (x y z) (plane-line-intersect a b c d x1 y1 z1 x2 y2 z2))
-                  (if v1?
-                      (values (cons (cons (vector x y z) (first vss)) (rest vss)) x2 y2 z2 v2?)
-                      (values (cons (list v2 (vector x y z)) vss) x2 y2 z2 v2?))])))
-       
-       (filter (compose not empty?) vss)])))
-
-(define (clip-lines/plane vs plane)
-  (match-define (vector a b c d) plane)
-  ((make-clip-lines/plane a b c d >=) vs))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Clipping inside axial bounding box
-
-;; Early accept: all endpoints in bounds (or empty vs)
-(define (early-accept? vs x-min x-max y-min y-max z-min z-max)
-  (andmap (λ (v) (and (<= x-min (vector-ref v 0) x-max)
-                      (<= y-min (vector-ref v 1) y-max)
-                      (<= z-min (vector-ref v 2) z-max)))
-          vs))
-
-;; Early reject: all endpoints on the outside of the same plane
-(define (early-reject? vs x-min x-max y-min y-max z-min z-max)
-  (or (andmap (λ (v) ((vector-ref v 0) . < . x-min)) vs)
-      (andmap (λ (v) ((vector-ref v 0) . > . x-max)) vs)
-      (andmap (λ (v) ((vector-ref v 1) . < . y-min)) vs)
-      (andmap (λ (v) ((vector-ref v 1) . > . y-max)) vs)
-      (andmap (λ (v) ((vector-ref v 2) . < . z-min)) vs)
-      (andmap (λ (v) ((vector-ref v 2) . > . z-max)) vs)))
-
-(define-syntax-rule (make-clip-lines/axis a b c gte?)
-  (λ (val vs)
-    ((make-clip-lines/plane a b c (- val) gte?) vs)))
-
-(define clip-lines-x-min (make-clip-lines/axis 1 0 0 >=))
-(define clip-lines-x-max (make-clip-lines/axis 1 0 0 <=))
-(define clip-lines-y-min (make-clip-lines/axis 0 1 0 >=))
-(define clip-lines-y-max (make-clip-lines/axis 0 1 0 <=))
-(define clip-lines-z-min (make-clip-lines/axis 0 0 1 >=))
-(define clip-lines-z-max (make-clip-lines/axis 0 0 1 <=))
-
-(define (clip-lines/bounds vs x-min x-max y-min y-max z-min z-max)
-  (let/ec return
-    (when (early-accept? vs x-min x-max y-min y-max z-min z-max) (return (list vs)))
-    (when (early-reject? vs x-min x-max y-min y-max z-min z-max) (return empty))
-    (let* ([vss  (clip-lines-x-min x-min vs)]
-           [_    (when (empty? vss) (return empty))]
-           [vss  (append* (map (λ (vs) (clip-lines-x-max x-max vs)) vss))]
-           [_    (when (empty? vss) (return empty))]
-           [vss  (append* (map (λ (vs) (clip-lines-y-min y-min vs)) vss))]
-           [_    (when (empty? vss) (return empty))]
-           [vss  (append* (map (λ (vs) (clip-lines-y-max y-max vs)) vss))]
-           [_    (when (empty? vss) (return empty))]
-           [vss  (append* (map (λ (vs) (clip-lines-z-min z-min vs)) vss))]
-           [_    (when (empty? vss) (return empty))]
-           [vss  (append* (map (λ (vs) (clip-lines-z-max z-max vs)) vss))])
-      vss)))
-
-;; ===================================================================================================
-;; Polygon clipping
-
-(define-syntax-rule (make-clip-polygon/plane a b c d gte?)
-  (λ (vs ls)
-    (define v1 (last vs))
-    (define x1 (vector-ref v1 0))
-    (define y1 (vector-ref v1 1))
-    (define z1 (vector-ref v1 2))
-    (define v1? (gte? (plane-point-dist a b c d x1 y1 z1) 0))
-    
-    (define-values (new-vs new-ls _x1 _y1 _z1 _v1?)
-      (for/fold ([vs empty] [ls empty] [x1 x1] [y1 y1] [z1 z1] [v1? v1?]) ([v2  (in-list vs)]
-                                                                           [l   (in-list ls)])
-        (define x2 (vector-ref v2 0))
-        (define y2 (vector-ref v2 1))
-        (define z2 (vector-ref v2 2))
-        (define v2? (gte? (plane-point-dist a b c d x2 y2 z2) 0))
-        (cond [(and v1? v2?)       (values (cons v2 vs) (cons l ls) x2 y2 z2 v2?)]
-              [(not (or v1? v2?))  (values vs ls x2 y2 z2 v2?)]
-              [else
-               (define-values (x y z) (plane-line-intersect a b c d x1 y1 z1 x2 y2 z2))
-               (if v1?
-                   (values (cons (vector x y z) vs) (cons l ls) x2 y2 z2 v2?)
-                   (values (list* v2 (vector x y z) vs) (list* l #t ls) x2 y2 z2 v2?))])))
-    
-    (values (reverse new-vs) (reverse new-ls))))
-
-(define (clip-polygon/plane vs ls plane)
-  (match-define (vector a b c d) plane)
-  ((make-clip-polygon/plane a b c d >=) vs ls))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Clipping inside axial bounding box
-
-(define-syntax-rule (make-clip-polygon/axis a b c gte?)
-  (λ (vs ls val)
-    ((make-clip-polygon/plane a b c (- val) gte?) vs ls)))
-
-(define clip-polygon-x-min (make-clip-polygon/axis 1 0 0 >=))
-(define clip-polygon-x-max (make-clip-polygon/axis 1 0 0 <=))
-(define clip-polygon-y-min (make-clip-polygon/axis 0 1 0 >=))
-(define clip-polygon-y-max (make-clip-polygon/axis 0 1 0 <=))
-(define clip-polygon-z-min (make-clip-polygon/axis 0 0 1 >=))
-(define clip-polygon-z-max (make-clip-polygon/axis 0 0 1 <=))
-
-(define (clip-polygon/bounds vs ls x-min x-max y-min y-max z-min z-max)
-  (let/ec return
-    (when (early-accept? vs x-min x-max y-min y-max z-min z-max) (return vs ls))
-    (when (early-reject? vs x-min x-max y-min y-max z-min z-max) (return empty empty))
-    (let*-values ([(vs ls)  (clip-polygon-x-min vs ls x-min)]
-                  [(_)      (when (empty? vs) (return empty empty))]
-                  [(vs ls)  (clip-polygon-x-max vs ls x-max)]
-                  [(_)      (when (empty? vs) (return empty empty))]
-                  [(vs ls)  (clip-polygon-y-min vs ls y-min)]
-                  [(_)      (when (empty? vs) (return empty empty))]
-                  [(vs ls)  (clip-polygon-y-max vs ls y-max)]
-                  [(_)      (when (empty? vs) (return empty empty))]
-                  [(vs ls)  (clip-polygon-z-min vs ls z-min)]
-                  [(_)      (when (empty? vs) (return empty empty))]
-                  [(vs ls)  (clip-polygon-z-max vs ls z-max)])
-      (values vs ls))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/contour.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/contour.rkt
deleted file mode 100644
index c8b4910657..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/contour.rkt
+++ /dev/null
@@ -1,209 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/match racket/list racket/contract
-         unstable/latent-contract/defthing
-         plot/utils
-         "../common/utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; One contour line in 3D (using marching squares)
-
-(define ((isoline3d-render-proc f z samples color width style alpha label) area)
-  (match-define (vector x-ivl y-ivl z-ivl) (send area get-bounds-rect))
-  (match-define (ivl x-min x-max) x-ivl)
-  (match-define (ivl y-min y-max) y-ivl)
-  (match-define (ivl z-min z-max) z-ivl)
-  (define num (animated-samples samples))
-  (define sample (f (vector x-ivl y-ivl) (vector num num)))
-  
-  (when (<= z-min z z-max)
-    (send area put-alpha alpha)
-    (send area put-pen color width style)
-    (for-2d-sample
-     (xa xb ya yb z1 z2 z3 z4) sample
-     (for ([line  (in-list (heights->lines xa xb ya yb z z1 z2 z3 z4))])
-       (match-define (list v1 v2) line)
-       (send area put-line v1 v2))))
-  
-  (cond [label  (line-legend-entry label color width style)]
-        [else   empty]))
-
-(defproc (isoline3d
-          [f (real? real? . -> . real?)] [z real?]
-          [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-          [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-          [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (plot3d-samples)]
-          [#:color color plot-color/c (line-color)]
-          [#:width width (>=/c 0) (line-width)]
-          [#:style style plot-pen-style/c (line-style)]
-          [#:alpha alpha (real-in 0 1) (line-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer3d?
-  (let ([z-min  (if z-min z-min z)]
-        [z-max  (if z-max z-max z)])
-    (define x-ivl (ivl x-min x-max))
-    (define y-ivl (ivl y-min y-max))
-    (define z-ivl (ivl z-min z-max))
-    (define g (2d-function->sampler f (vector x-ivl y-ivl)))
-    (renderer3d (vector x-ivl y-ivl z-ivl)
-                #f default-ticks-fun
-                (isoline3d-render-proc g z samples color width style alpha label))))
-
-;; ===================================================================================================
-;; Contour lines in 3D (using marching squares)
-
-(define ((contours3d-render-proc f levels samples colors widths styles alphas label) area)
-  (match-define (vector x-ivl y-ivl z-ivl) (send area get-bounds-rect))
-  (match-define (ivl x-min x-max) x-ivl)
-  (match-define (ivl y-min y-max) y-ivl)
-  (match-define (ivl z-min z-max) z-ivl)
-  (define num (animated-samples samples))
-  (define sample (f (vector x-ivl y-ivl) (vector num num)))
-  ;; can't use the actual z ticks because some or all could be collapsed
-  (match-define (list (tick zs _ labels) ...) (contour-ticks (plot-z-ticks) z-min z-max levels #f))
-  
-  (let* ([colors  (maybe-apply colors zs)]
-         [widths  (maybe-apply widths zs)]
-         [styles  (maybe-apply styles zs)]
-         [alphas  (maybe-apply alphas zs)])
-    (for ([z  (in-list zs)]
-          [color  (in-cycle* colors)]
-          [width  (in-cycle* widths)]
-          [style  (in-cycle* styles)]
-          [alpha  (in-cycle* alphas)])
-      (send area put-alpha alpha)
-      (send area put-pen color width style)
-      (for-2d-sample
-       (xa xb ya yb z1 z2 z3 z4) sample
-       (for ([line  (in-list (heights->lines xa xb ya yb z z1 z2 z3 z4))])
-         (match-define (list v1 v2) line)
-         (send area put-line v1 v2))))
-    
-    (cond [label  (line-legend-entries label zs labels colors widths styles)]
-          [else   empty])))
-
-(defproc (contours3d
-          [f (real? real? . -> . real?)]
-          [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-          [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-          [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (plot3d-samples)]
-          [#:levels levels (or/c 'auto exact-positive-integer? (listof real?)) (contour-levels)]
-          [#:colors colors (plot-colors/c (listof real?)) (contour-colors)]
-          [#:widths widths (pen-widths/c (listof real?)) (contour-widths)]
-          [#:styles styles (plot-pen-styles/c (listof real?)) (contour-styles)]
-          [#:alphas alphas (alphas/c (listof real?)) (contour-alphas)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer3d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (define z-ivl (ivl z-min z-max))
-  (define g (2d-function->sampler f (vector x-ivl y-ivl)))
-  (renderer3d (vector x-ivl y-ivl z-ivl)
-              (surface3d-bounds-fun g samples)
-              default-ticks-fun
-              (contours3d-render-proc g levels samples colors widths styles alphas label)))
-
-;; ===================================================================================================
-;; Contour intervals in 3D (using marching squares)
-
-(define ((contour-intervals3d-render-proc
-          f levels samples colors styles line-colors line-widths line-styles
-          contour-colors contour-widths contour-styles alphas label)
-         area)
-  (match-define (vector x-ivl y-ivl z-ivl) (send area get-bounds-rect))
-  (match-define (ivl x-min x-max) x-ivl)
-  (match-define (ivl y-min y-max) y-ivl)
-  (match-define (ivl z-min z-max) z-ivl)
-  (define num (animated-samples samples))
-  (define sample (f (vector x-ivl y-ivl) (vector num num)))
-  ;; can't use the actual z ticks because some or all could be collapsed
-  (match-define (list (tick zs _ labels) ...) (contour-ticks (plot-z-ticks) z-min z-max levels #t))
-  
-  (define-values (z-ivls ivl-labels)
-    (for/lists (z-ivls ivl-labels) ([za  (in-list zs)]
-                                    [zb  (in-list (rest zs))]
-                                    [la  (in-list labels)]
-                                    [lb  (in-list (rest labels))])
-      (values (ivl za zb) (format "[~a,~a]" la lb))))
-  
-  (let* ([colors  (maybe-apply colors z-ivls)]
-         [styles  (maybe-apply styles z-ivls)]
-         [alphas  (maybe-apply alphas z-ivls)]
-         [line-colors  (maybe-apply line-colors z-ivls)]
-         [line-widths  (maybe-apply line-widths z-ivls)]
-         [line-styles  (maybe-apply line-styles z-ivls)])
-    (for ([za  (in-list zs)]
-          [zb  (in-list (rest zs))]
-          [color  (in-cycle* colors)]
-          [style  (in-cycle* styles)]
-          [alpha  (in-cycle* alphas)]
-          [line-color  (in-cycle* line-colors)]
-          [line-width  (in-cycle* line-widths)]
-          [line-style  (in-cycle* line-styles)])
-      (send area put-alpha alpha)
-      (send area put-pen line-color line-width line-style)
-      (send area put-brush color style)
-      (for-2d-sample
-       (xa xb ya yb z1 z2 z3 z4) sample
-       (for ([vs  (in-list (heights->polys xa xb ya yb za zb z1 z2 z3 z4))])
-         (define ls
-           (for/list ([v1  (in-list (cons (last vs) vs))]
-                      [v2  (in-list vs)])
-             (define z1 (vector-ref v1 2))
-             (define z2 (vector-ref v2 2))
-             (not (or (and (= z1 za) (= z2 za))
-                      (and (= z1 zb) (= z2 zb))))))
-         (send area put-polygon vs 'both ls))))
-    
-    ((contours3d-render-proc f levels samples contour-colors contour-widths contour-styles alphas #f)
-     area)
-    
-    (define n (- (length zs) 2))
-    (define contour-colors*
-      (append (list 0) (sequence-take (in-cycle* (maybe-apply contour-colors zs)) 0 n) (list 0)))
-    (define contour-widths*
-      (append (list 0) (sequence-take (in-cycle* (maybe-apply contour-widths zs)) 0 n) (list 0)))
-    (define contour-styles*
-      (append '(transparent) (sequence-take (in-cycle* (maybe-apply contour-styles zs)) 0 n)
-              '(transparent)))
-    
-    (cond [label  (interval-legend-entries
-                   label z-ivls ivl-labels
-                   colors styles line-colors line-widths line-styles
-                   contour-colors* contour-widths* contour-styles*
-                   (rest contour-colors*) (rest contour-widths*) (rest contour-styles*))]
-          [else  empty])))
-
-(defproc (contour-intervals3d
-          [f (real? real? . -> . real?)]
-          [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-          [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-          [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (plot3d-samples)]
-          [#:levels levels (or/c 'auto exact-positive-integer? (listof real?)) (contour-levels)]
-          [#:colors colors (plot-colors/c (listof ivl?)) (contour-interval-colors)]
-          [#:styles styles (plot-brush-styles/c (listof ivl?)) (contour-interval-styles)]
-          [#:line-colors line-colors (plot-colors/c (listof ivl?)) (contour-interval-line-colors)]
-          [#:line-widths line-widths (pen-widths/c (listof ivl?)) (contour-interval-line-widths)]
-          [#:line-styles line-styles (plot-pen-styles/c (listof ivl?)) (contour-interval-line-styles)]
-          [#:contour-colors contour-colors (plot-colors/c (listof real?)) (contour-colors)]
-          [#:contour-widths contour-widths (pen-widths/c (listof real?)) (contour-widths)]
-          [#:contour-styles contour-styles (plot-pen-styles/c (listof real?)) (contour-styles)]
-          [#:alphas alphas (alphas/c (listof ivl?)) (contour-interval-alphas)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer3d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (define z-ivl (ivl z-min z-max))
-  (define g (2d-function->sampler f (vector x-ivl y-ivl)))
-  (renderer3d (vector x-ivl y-ivl z-ivl)
-              (surface3d-bounds-fun g samples)
-              default-ticks-fun
-              (contour-intervals3d-render-proc g levels samples colors styles
-                                               line-colors line-widths line-styles
-                                               contour-colors contour-widths contour-styles
-                                               alphas label)))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/decoration.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/decoration.rkt
deleted file mode 100644
index 9192f7386e..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/decoration.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket/base
-
-;; Renderers for plot decorations: labeled points only so far
-
-(require racket/contract racket/class racket/match racket/list
-         unstable/latent-contract/defthing
-         unstable/contract
-         plot/utils
-         "../common/utils.rkt"
-         )
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Labeled points
-
-(define (format-coordinate3d v area)
-  (match-define (vector x y z) v)
-  (match-define (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max))
-    (send area get-bounds-rect))
-  (match-define (list x-str) (format-tick-labels (plot-x-ticks) x-min x-max (list x)))
-  (match-define (list y-str) (format-tick-labels (plot-y-ticks) y-min y-max (list y)))
-  (match-define (list z-str) (format-tick-labels (plot-z-ticks) z-min z-max (list z)))
-  (format "(~a,~a,~a)" x-str y-str z-str))
-
-(define ((label3d-render-proc label v color size face family anchor angle
-                              point-color point-fill-color point-size point-line-width point-sym
-                              alpha)
-         area)
-  (let ([label  (if label label (format-coordinate3d v area))])
-    (send area put-alpha alpha)
-    ; label
-    (send area put-text-foreground color)
-    (send area put-font size face family)
-    (send area put-text (string-append " " label " ") v anchor angle (* 1/2 point-size)
-          #:outline? #t #:layer plot3d-front-layer)
-    ; point
-    (send area put-pen point-color point-line-width 'solid)
-    (send area put-brush point-fill-color 'solid)
-    (send area put-glyphs (list v) point-sym point-size #:layer plot3d-front-layer))
-  
-  empty)
-
-(defproc (point-label3d
-          [v (sequence/c real?)] [label (or/c string? #f) #f]
-          [#:color color plot-color/c (plot-foreground)]
-          [#:size size (>=/c 0) (plot-font-size)]
-          [#:face face (or/c string? #f) (plot-font-face)]
-          [#:family family font-family/c (plot-font-family)]
-          [#:anchor anchor anchor/c (label-anchor)]
-          [#:angle angle real? (label-angle)]
-          [#:point-color point-color plot-color/c (point-color)]
-          [#:point-fill-color point-fill-color (or/c plot-color/c 'auto) 'auto]
-          [#:point-size point-size (>=/c 0) (label-point-size)]
-          [#:point-line-width point-line-width (>=/c 0) (point-line-width)]
-          [#:point-sym point-sym point-sym/c 'fullcircle]
-          [#:alpha alpha (real-in 0 1) (label-alpha)]
-          ) renderer3d?
-  (let ([v  (sequence-head-vector 'point-label3d v 3)])
-    (match-define (vector x y z) v)
-    (renderer3d (vector (ivl x x) (ivl y y) (ivl z z)) #f #f
-                (label3d-render-proc
-                 label v color size face family anchor angle
-                 point-color (cond [(eq? point-fill-color 'auto)  (->pen-color point-color)]
-                                   [else  point-fill-color])
-                 point-size point-line-width point-sym
-                 alpha))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/isosurface.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/isosurface.rkt
deleted file mode 100644
index 81a5570bc0..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/isosurface.rkt
+++ /dev/null
@@ -1,221 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/match racket/list racket/flonum racket/contract racket/math
-         unstable/latent-contract/defthing
-         plot/utils
-         "../common/utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Surfaces of constant value (isosurfaces)
-
-(define ((isosurface3d-render-proc
-          f d samples color style line-color line-width line-style alpha label)
-         area)
-  (match-define (vector x-ivl y-ivl z-ivl) (send area get-bounds-rect))
-  (match-define (ivl x-min x-max) x-ivl)
-  (match-define (ivl y-min y-max) y-ivl)
-  (match-define (ivl z-min z-max) z-ivl)
-  (define num (animated-samples samples))
-  (define sample (f (vector x-ivl y-ivl z-ivl) (vector num num num)))
-  (match-define (3d-sample xs ys zs dsss d-min d-max) sample)
-  
-  (send area put-alpha alpha)
-  (send area put-brush color style)
-  (send area put-pen line-color line-width line-style)
-  (for-3d-sample
-   (xa xb ya yb za zb d1 d2 d3 d4 d5 d6 d7 d8) sample
-   (for ([vs  (in-list (heights->cube-polys xa xb ya yb za zb d d1 d2 d3 d4 d5 d6 d7 d8))])
-     (send area put-polygon vs)))
-  
-  (cond [label  (rectangle-legend-entry
-                 label color style line-color line-width line-style)]
-        [else  empty]))
-
-(defproc (isosurface3d [f (real? real? real? . -> . real?)] [d rational?]
-                       [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-                       [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-                       [z-min (or/c rational? #f) #f] [z-max (or/c rational? #f) #f]
-                       [#:samples samples (and/c exact-integer? (>=/c 2)) (plot3d-samples)]
-                       [#:color color plot-color/c (surface-color)]
-                       [#:style style plot-brush-style/c (surface-style)]
-                       [#:line-color line-color plot-color/c (surface-line-color)]
-                       [#:line-width line-width (>=/c 0) (surface-line-width)]
-                       [#:line-style line-style plot-pen-style/c (surface-line-style)]
-                       [#:alpha alpha (real-in 0 1) (surface-alpha)]
-                       [#:label label (or/c string? #f) #f]
-                       ) renderer3d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (define z-ivl (ivl z-min z-max))
-  (define g (3d-function->sampler f (vector x-ivl y-ivl z-ivl)))
-  (renderer3d (vector x-ivl y-ivl z-ivl) #f default-ticks-fun
-              (isosurface3d-render-proc
-               g d samples color style line-color line-width line-style alpha label)))
-
-;; ===================================================================================================
-;; Nested isosurfaces
-
-(define ((isosurfaces3d-render-proc f rd-min rd-max levels samples colors styles
-                                    line-colors line-widths line-styles alphas label)
-         area)
-  (match-define (vector x-ivl y-ivl z-ivl) (send area get-bounds-rect))
-  (match-define (ivl x-min x-max) x-ivl)
-  (match-define (ivl y-min y-max) y-ivl)
-  (match-define (ivl z-min z-max) z-ivl)
-  (define num (animated-samples samples))
-  (define sample (f (vector x-ivl y-ivl z-ivl) (vector num num num)))
-  (match-define (3d-sample xs ys zs dsss fd-min fd-max) sample)
-  
-  (define d-min (if rd-min rd-min fd-min))
-  (define d-max (if rd-max rd-max fd-max))
-  
-  (match-define (list (tick ds _ labels) ...)
-    (cond [(and d-min d-max)  (contour-ticks (plot-d-ticks) d-min d-max levels #f)]
-          [else  empty]))
-  
-  (let* ([colors  (maybe-apply colors ds)]
-         [styles  (maybe-apply styles ds)]
-         [alphas  (maybe-apply alphas ds)]
-         [line-colors  (maybe-apply line-colors ds)]
-         [line-widths  (maybe-apply line-widths ds)]
-         [line-styles  (maybe-apply line-styles ds)])
-    (for ([d      (in-list ds)]
-          [color  (in-cycle* colors)]
-          [style  (in-cycle* styles)]
-          [alpha  (in-cycle* alphas)]
-          [line-color  (in-cycle* line-colors)]
-          [line-width  (in-cycle* line-widths)]
-          [line-style  (in-cycle* line-styles)])
-      (send area put-alpha alpha)
-      (send area put-brush color style)
-      (send area put-pen line-color line-width line-style)
-      (for-3d-sample
-       (xa xb ya yb za zb d1 d2 d3 d4 d5 d6 d7 d8) sample
-       (for ([vs  (in-list (heights->cube-polys xa xb ya yb za zb d d1 d2 d3 d4 d5 d6 d7 d8))])
-         (send area put-polygon vs)))))
-  
-  (cond
-    [(and label (not (empty? ds)))  (rectangle-legend-entries
-                                     label ds colors styles line-colors line-widths line-styles)]
-    [else  empty]))
-
-(defproc (isosurfaces3d
-          [f (real? real? real? . -> . real?)]
-          [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-          [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-          [z-min (or/c rational? #f) #f] [z-max (or/c rational? #f) #f]
-          [#:d-min d-min (or/c rational? #f) #f] [#:d-max d-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (plot3d-samples)]
-          [#:levels levels (or/c 'auto exact-positive-integer? (listof real?)) (isosurface-levels)]
-          [#:colors colors (plot-colors/c (listof real?)) (isosurface-colors)]
-          [#:styles styles (plot-brush-styles/c (listof real?)) (isosurface-styles)]
-          [#:line-colors line-colors (plot-colors/c (listof real?)) (isosurface-line-colors)]
-          [#:line-widths line-widths (pen-widths/c (listof real?)) (isosurface-line-widths)]
-          [#:line-styles line-styles (plot-pen-styles/c (listof real?)) (isosurface-line-styles)]
-          [#:alphas alphas (alphas/c (listof real?)) (isosurface-alphas)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer3d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (define z-ivl (ivl z-min z-max))
-  (define g (3d-function->sampler f (vector x-ivl y-ivl z-ivl)))
-  (renderer3d (vector x-ivl y-ivl z-ivl) #f default-ticks-fun
-              (isosurfaces3d-render-proc g d-min d-max levels samples colors styles
-                                         line-colors line-widths line-styles alphas
-                                         label)))
-
-;; ===================================================================================================
-
-(define ((polar3d-render-proc f g samples color style line-color line-width line-style alpha label)
-         area)
-  (match-define (vector x-ivl y-ivl z-ivl) (send area get-bounds-rect))
-  (match-define (ivl x-min x-max) x-ivl)
-  (match-define (ivl y-min y-max) y-ivl)
-  (match-define (ivl z-min z-max) z-ivl)
-  (define num (animated-samples samples))
-  (define sample (g (vector x-ivl y-ivl z-ivl) (vector num num num)))
-  (match-define (3d-sample xs ys zs dsss d-min d-max) sample)
-  
-  (define (draw-cube xa xb ya yb za zb d d1 d2 d3 d4 d5 d6 d7 d8)
-    (for ([vs  (in-list (heights->cube-polys xa xb ya yb za zb d d1 d2 d3 d4 d5 d6 d7 d8))])
-      (send area put-polygon vs)))
-  
-  (send area put-alpha alpha)
-  (send area put-brush color style)
-  (send area put-pen line-color line-width line-style)
-  (define d 0)
-  (for-3d-sample
-   (xa xb ya yb za zb d1 d2 d3 d4 d5 d6 d7 d8) sample
-   (cond [(and (xb . > . 0) (ya . < . 0) (yb . > . 0))
-          (let* ([yb  -0.00001]
-                 [d3  (f xb yb za)]
-                 [d4  (f xa yb za)]
-                 [d7  (f xb yb zb)]
-                 [d8  (f xa yb zb)])
-            (draw-cube xa xb ya yb za zb d d1 d2 d3 d4 d5 d6 d7 d8))
-          (let* ([ya  0.00001]
-                 [d1  (f xa ya za)]
-                 [d2  (f xb ya za)]
-                 [d5  (f xa ya zb)]
-                 [d6  (f xb ya zb)])
-            (draw-cube xa xb ya yb za zb d d1 d2 d3 d4 d5 d6 d7 d8))]
-         [else
-          (draw-cube xa xb ya yb za zb d d1 d2 d3 d4 d5 d6 d7 d8)]))
-  
-  (cond [label  (rectangle-legend-entry
-                 label color style line-color line-width line-style)]
-        [else  empty]))
-
-(define 2pi (* 2 pi))
-
-(define (flmodulo x y)
-  (fl- x (fl* y (flfloor (fl/ x y)))))
-
-(define ((2d-polar->3d-function f) x y z)
-  (let ([x  (exact->inexact x)]
-        [y  (exact->inexact y)]
-        [z  (exact->inexact z)])
-    (define-values (θ ρ)
-      (cond [(and (fl= x 0.0) (fl= y 0.0))  (values 0.0 0.0)]
-            [else  (values (flmodulo (atan y x) 2pi)
-                           (flatan (fl/ z (fldistance x y))))]))
-    (fl- (exact->inexact (f θ ρ)) (fldistance x y z))))
-
-(defproc (polar3d
-          [f (real? real? . -> . real?)]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-          [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (plot3d-samples)]
-          [#:color color plot-color/c (surface-color)]
-          [#:style style plot-brush-style/c (surface-style)]
-          [#:line-color line-color plot-color/c (surface-line-color)]
-          [#:line-width line-width (>=/c 0) (surface-line-width)]
-          [#:line-style line-style plot-pen-style/c (surface-line-style)]
-          [#:alpha alpha (real-in 0 1) (surface-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer3d?
-  (define vs (for*/list ([θ  (in-list (linear-seq 0.0 2pi (* 4 samples)))]
-                         [ρ  (in-list (linear-seq (* -1/2 pi) (* 1/2 pi) (* 2 samples)))])
-               (3d-polar->3d-cartesian θ ρ (f θ ρ))))
-  (define rvs (filter vrational? vs))
-  (cond [(empty? rvs)  (renderer3d #f #f #f #f)]
-        [else
-         (match-define (list (vector rxs rys rzs) ...) rvs)
-         (let ([x-min  (if x-min x-min (apply min* rxs))]
-               [x-max  (if x-max x-max (apply max* rxs))]
-               [y-min  (if y-min y-min (apply min* rys))]
-               [y-max  (if y-max y-max (apply max* rys))]
-               [z-min  (if z-min z-min (apply min* rzs))]
-               [z-max  (if z-max z-max (apply max* rzs))])
-           (define x-ivl (ivl x-min x-max))
-           (define y-ivl (ivl y-min y-max))
-           (define z-ivl (ivl z-min z-max))
-           (define new-f (2d-polar->3d-function f))
-           (define g (3d-function->sampler new-f (vector x-ivl y-ivl z-ivl)))
-           (renderer3d (vector x-ivl y-ivl z-ivl) #f
-                       default-ticks-fun
-                       (polar3d-render-proc new-f g samples color style
-                                            line-color line-width line-style alpha label)))]))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/line.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/line.rkt
deleted file mode 100644
index f8937c2307..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/line.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/match racket/list racket/contract
-         unstable/latent-contract/defthing
-         unstable/contract
-         plot/utils
-         "../common/utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-
-(define ((lines3d-render-proc vs-fun color width style alpha label) area)
-  (send area put-alpha alpha)
-  (send area put-pen color width style)
-  (send area put-lines (vs-fun))
-  
-  (cond [label  (line-legend-entry label color width style)]
-        [else  empty]))
-
-(define (lines3d-renderer
-         vs-thnk x-min x-max y-min y-max z-min z-max color width style alpha label)
-  (define rvs (filter vrational? (vs-thnk)))
-  (cond [(empty? rvs)  (renderer3d #f #f #f #f)]
-        [else
-         (match-define (list (vector rxs rys rzs) ...) rvs)
-         (let ([x-min  (if x-min x-min (apply min* rxs))]
-               [x-max  (if x-max x-max (apply max* rxs))]
-               [y-min  (if y-min y-min (apply min* rys))]
-               [y-max  (if y-max y-max (apply max* rys))]
-               [z-min  (if z-min z-min (apply min* rzs))]
-               [z-max  (if z-max z-max (apply max* rzs))])
-           (renderer3d (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max)) #f
-                       default-ticks-fun
-                       (lines3d-render-proc vs-thnk color width style alpha label)))]))
-
-(defproc (lines3d
-          [vs  (sequence/c (sequence/c #:min-count 3 real?))]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-          [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-          [#:color color plot-color/c (line-color)]
-          [#:width width (>=/c 0) (line-width)]
-          [#:style style plot-pen-style/c (line-style)]
-          [#:alpha alpha (real-in 0 1) (line-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer3d?
-  (let ([vs  (sequence->listof-vector 'lines3d vs 3)])
-    (lines3d-renderer (λ () vs) x-min x-max y-min y-max z-min z-max color width style alpha label)))
-
-(defproc (parametric3d
-          [f (real? . -> . (sequence/c real?))]
-          [t-min rational?] [t-max rational?]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-          [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (line-samples)]
-          [#:color color plot-color/c (line-color)]
-          [#:width width (>=/c 0) (line-width)]
-          [#:style style plot-pen-style/c (line-style)]
-          [#:alpha alpha (real-in 0 1) (line-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer3d?
-  (let ([f  (λ (t) (sequence-head-vector 'parametric3d (f t) 3))])
-    (lines3d-renderer (λ () (map f (linear-seq t-min t-max (animated-samples samples))))
-                      x-min x-max y-min y-max z-min z-max color width style alpha label)))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/plot-area.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/plot-area.rkt
deleted file mode 100644
index 246bc6c2da..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/plot-area.rkt
+++ /dev/null
@@ -1,1129 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/match racket/list racket/math racket/flonum
-         (only-in math fl flvector->vector vector->flvector)
-         "../common/math.rkt"
-         "../common/plot-device.rkt"
-         "../common/ticks.rkt"
-         "../common/draw.rkt"
-         "../common/axis-transform.rkt"
-         "../common/parameters.rkt"
-         "../common/utils.rkt"
-         "vector.rkt"
-         "clip.rkt"
-         "bsp-trees.rkt"
-         "bsp.rkt")
-
-(provide (all-defined-out)
-         plot3d-back-layer
-         plot3d-area-layer
-         plot3d-front-layer
-         )
-
-(define plot3d-back-layer 2)
-(define plot3d-area-layer 1)
-(define plot3d-front-layer 0)
-
-(define plot3d-subdivisions (make-parameter 0))
-
-(struct render-tasks (structural-shapes detail-shapes bsp-trees))
-
-(struct data (alpha) #:transparent)
-(struct poly-data data (center pen-color pen-width pen-style brush-color brush-style face)
-  #:transparent)
-(struct line-data data (pen-color pen-width pen-style)
-  #:transparent)
-(struct text-data data (anchor angle dist str font-size font-family color outline?)
-  #:transparent)
-(struct glyph-data data (symbol size pen-color pen-width pen-style brush-color brush-style)
-  #:transparent)
-(struct arrow-data data (start end outline-color pen-color pen-width pen-style)
-  #:transparent)
-
-;(: structural-shape? (shape -> Boolean))
-;; Determines whether a shape is view-independent, and thus used to *create* BSP trees
-;; Other shapes are view-dependent, so they are inserted into BSP trees before each refresh
-(define (structural-shape? s)
-  (poly? s))
-
-(define 3d-plot-area%
-  (class object%
-    (init-field bounds-rect rx-ticks rx-far-ticks ry-ticks ry-far-ticks rz-ticks rz-far-ticks)
-    (init dc dc-x-min dc-y-min dc-x-size dc-y-size)
-    (super-new)
-    
-    (define pd (make-object plot-device% dc dc-x-min dc-y-min dc-x-size dc-y-size))
-    (send pd reset-drawing-params)
-    
-    (define char-height (send pd get-char-height))
-    (define half-char-height (* 1/2 char-height))
-    
-    (match-define (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max)) bounds-rect)
-    (define x-size (- x-max x-min))
-    (define y-size (- y-max y-min))
-    (define z-size (- z-max z-min))
-    (define x-mid (* 1/2 (+ x-min x-max)))
-    (define y-mid (* 1/2 (+ y-min y-max)))
-    (define z-mid (* 1/2 (+ z-min z-max)))
-    
-    (define clipping? #f)
-    (define clip-x-min x-min)
-    (define clip-x-max x-max)
-    (define clip-y-min y-min)
-    (define clip-y-max y-max)
-    (define clip-z-min z-min)
-    (define clip-z-max z-max)
-    
-    (define/public (put-clip-rect rect)
-      (match-define (vector (ivl rx-min rx-max) (ivl ry-min ry-max) (ivl rz-min rz-max)) rect)
-      (define cx-min (if rx-min (max* x-min rx-min) x-min))
-      (define cx-max (if rx-max (min* x-max rx-max) x-max))
-      (define cy-min (if ry-min (max* y-min ry-min) y-min))
-      (define cy-max (if ry-max (min* y-max ry-max) y-max))
-      (define cz-min (if rz-min (max* z-min rz-min) z-min))
-      (define cz-max (if rz-max (min* z-max rz-max) z-max))
-      (let ([cx-min  (min* cx-min cx-max)]
-            [cx-max  (max* cx-min cx-max)]
-            [cy-min  (min* cy-min cy-max)]
-            [cy-max  (max* cy-min cy-max)]
-            [cz-min  (min* cz-min cz-max)]
-            [cz-max  (max* cz-min cz-max)])
-        (set! clip-x-min cx-min)
-        (set! clip-x-max cx-max)
-        (set! clip-y-min cy-min)
-        (set! clip-y-max cy-max)
-        (set! clip-z-min cz-min)
-        (set! clip-z-max cz-max))
-      (set! clipping? #t))
-    
-    (define/public (clear-clip-rect) (set! clipping? #f))
-    
-    (define (in-bounds? v)
-      (or (not clipping?) (point-in-bounds? v
-                                            clip-x-min clip-x-max
-                                            clip-y-min clip-y-max
-                                            clip-z-min clip-z-max)))
-    
-    (define/public (get-x-ticks) x-ticks)
-    (define/public (get-x-far-ticks) x-far-ticks)
-    (define/public (get-y-ticks) y-ticks)
-    (define/public (get-y-far-ticks) y-far-ticks)
-    (define/public (get-z-ticks) z-ticks)
-    (define/public (get-z-far-ticks) z-far-ticks)
-    
-    (define/public (get-bounds-rect) bounds-rect)
-    
-    (define/public (get-clip-rect)
-      (if clipping?
-          (vector (ivl clip-x-min clip-x-max) (ivl clip-y-min clip-y-max) (ivl clip-z-min clip-z-max))
-          bounds-rect))
-    
-    (define angle (plot3d-angle))
-    (define altitude (plot3d-altitude))
-    ;; FLOATING-POINT HACK: Adding an epsilon to the angle ensures that, when it is 90, 180
-    ;; or 270, the x/y/z tick labels are drawn on the left side.
-    (define theta (+ (degrees->radians angle) 0.00001))
-    (define rho (degrees->radians altitude))
-    
-    ;; There are four coordinate systems:
-    ;;  1. Plot coordinates (original, user-facing coordinate system)
-    ;;  2. Normalized coordinates (from plot coordinates: for each axis: transform, center, and scale
-    ;;     to [-0.5,0.5]) - these are always flvectors
-    ;;  3. View coordinates (from normalized coordinates: rotate)
-    ;;  4. Device context coordinates (from view coordinates: project to 2D)
-    
-    (match-define (invertible-function fx _) (apply-axis-transform (plot-x-transform) x-min x-max))
-    (match-define (invertible-function fy _) (apply-axis-transform (plot-y-transform) y-min y-max))
-    (match-define (invertible-function fz _) (apply-axis-transform (plot-z-transform) z-min z-max))
-    
-    (define identity-transforms?
-      (and (equal? (plot-x-transform) id-transform)
-           (equal? (plot-y-transform) id-transform)
-           (equal? (plot-z-transform) id-transform)))
-    
-    (define plot->norm
-      (if identity-transforms?
-          (match-lambda
-            [(vector (? rational? x) (? rational? y) (? rational? z))
-             (flvector (fl (/ (- x x-mid) x-size))
-                       (fl (/ (- y y-mid) y-size))
-                       (fl (/ (- z z-mid) z-size)))]
-            [(vector x y z)
-             (flvector +nan.0 +nan.0 +nan.0)])
-          (match-lambda
-            [(vector (? rational? x) (? rational? y) (? rational? z))
-             (let ([x  (fx x)] [y  (fy y)] [z  (fz z)])
-               (flvector (if (rational? x) (fl (/ (- (inexact->exact x) x-mid) x-size)) +nan.0)
-                         (if (rational? y) (fl (/ (- (inexact->exact y) y-mid) y-size)) +nan.0)
-                         (if (rational? z) (fl (/ (- (inexact->exact z) z-mid) z-size)) +nan.0)))]
-            [(vector x y z)
-             (flvector +nan.0 +nan.0 +nan.0)])))
-    
-    (define rotate-theta-matrix (m3-rotate-z theta))
-    (define rotate-rho-matrix (m3-rotate-x rho))
-    (define rotation-matrix (m3* rotate-rho-matrix rotate-theta-matrix))
-    
-    (define (norm->view v) (m3-apply rotation-matrix v))
-    (define (plot->view v) (norm->view (plot->norm v)))
-    (define (plot->view/no-rho v) (m3-apply rotate-theta-matrix (plot->norm v)))
-    (define (norm->view/no-rho v) (m3-apply rotate-theta-matrix v))
-    (define (rotate/rho v) (m3-apply rotate-rho-matrix v))
-    
-    (define unrotation-matrix (m3-transpose rotation-matrix))
-    (define (view->norm v) (m3-apply unrotation-matrix v))
-    
-    (define view->dc #f)
-    (define (plot->dc v) (view->dc (plot->view v)))
-    (define (norm->dc v) (view->dc (norm->view v)))
-    
-    (define-values (view-x-size view-y-size view-z-size)
-      (match-let ([(vector view-x-ivl view-y-ivl view-z-ivl)
-                   (bounding-rect
-                    (map (compose flvector->vector plot->view)
-                         (list (vector x-min y-min z-min) (vector x-min y-min z-max)
-                               (vector x-min y-max z-min) (vector x-min y-max z-max)
-                               (vector x-max y-min z-min) (vector x-max y-min z-max)
-                               (vector x-max y-max z-min) (vector x-max y-max z-max))))])
-        (values (ivl-length view-x-ivl) (ivl-length view-y-ivl) (ivl-length view-z-ivl))))
-    
-    (define (make-view->dc left right top bottom)
-      (define area-x-min left)
-      (define area-x-max (- dc-x-size right))
-      (define area-y-min top)
-      (define area-y-max (- dc-y-size bottom))
-      (define area-x-mid (* 1/2 (+ area-x-min area-x-max)))
-      (define area-y-mid (* 1/2 (+ area-y-min area-y-max)))
-      (define area-per-view-x (/ (- area-x-max area-x-min) view-x-size))
-      (define area-per-view-z (/ (- area-y-max area-y-min) view-z-size))
-      (let-map
-       (area-x-mid area-y-mid area-per-view-x area-per-view-z) fl
-       (λ (v)
-         (define x (flvector-ref v 0))
-         (define z (flvector-ref v 2))
-         (vector (fl+ area-x-mid (fl* x area-per-view-x))
-                 (fl- area-y-mid (fl* z area-per-view-z))))))
-    
-    ;; Initial view->dc
-    (define init-top-margin (if (and (plot-decorations?) (plot-title)) (* 3/2 char-height) 0))
-    (set! view->dc (make-view->dc 0 0 init-top-margin 0))
-    
-    (define (x-axis-angle)
-      (match-define (vector dx dy) (v- (norm->dc (flvector 0.5 0.0 0.0))
-                                       (norm->dc (flvector -0.5 0.0 0.0))))
-      (- (atan2 (- dy) dx)))
-    
-    (define (y-axis-angle)
-      (match-define (vector dx dy) (v- (norm->dc (flvector 0.0 0.5 0.0))
-                                       (norm->dc (flvector 0.0 -0.5 0.0))))
-      (- (atan2 (- dy) dx)))
-    
-    (define (x-axis-dir)
-      (vnormalize (v- (norm->dc (flvector 0.5 0.0 0.0))
-                      (norm->dc (flvector -0.5 0.0 0.0)))))
-    
-    (define (y-axis-dir)
-      (vnormalize (v- (norm->dc (flvector 0.0 0.5 0.0))
-                      (norm->dc (flvector 0.0 -0.5 0.0)))))
-    
-    ;; ===============================================================================================
-    ;; Tick and label constants
-    
-    (define tick-radius (* 1/2 (plot-tick-size)))
-    (define half-tick-radius (* 1/2 tick-radius))
-    
-    (define x-axis-y-min? ((cos theta) . >= . 0))  ; #t iff x near labels should be drawn at y-min
-    (define y-axis-x-min? ((sin theta) . >= . 0))  ; #t iff y near labels should be drawn at x-min
-    
-    (define x-axis-y (if x-axis-y-min? y-min y-max))
-    (define y-axis-x (if y-axis-x-min? x-min x-max))
-    (define z-axis-x (if x-axis-y-min? x-min x-max))
-    (define z-axis-y (if y-axis-x-min? y-max y-min))
-    
-    (define x-far-axis-y (if x-axis-y-min? y-max y-min))
-    (define y-far-axis-x (if y-axis-x-min? x-max x-min))
-    (define z-far-axis-x (if x-axis-y-min? x-max x-min))
-    (define z-far-axis-y (if y-axis-x-min? y-min y-max))
-    
-    (define x-axis-norm-y (if x-axis-y-min? -0.5 0.5))
-    (define y-axis-norm-x (if y-axis-x-min? -0.5 0.5))
-    (define z-axis-norm-x (if x-axis-y-min? -0.5 0.5))
-    (define z-axis-norm-y (if y-axis-x-min? 0.5 -0.5))
-    
-    (define x-far-axis-norm-y (if x-axis-y-min? 0.5 -0.5))
-    (define y-far-axis-norm-x (if y-axis-x-min? 0.5 -0.5))
-    (define z-far-axis-norm-x (if x-axis-y-min? 0.5 -0.5))
-    (define z-far-axis-norm-y (if y-axis-x-min? -0.5 0.5))
-    
-    (define near-dist^2 (sqr (* 3 (plot-line-width))))
-    (define (vnear? v1 v2)
-      ((vmag^2 (v- (plot->dc v1) (plot->dc v2))) . <= . near-dist^2))
-    
-    (define ((x-ticks-near? y) t1 t2)
-      (vnear? (vector (pre-tick-value t1) y z-min)
-              (vector (pre-tick-value t2) y z-min)))
-    
-    (define ((y-ticks-near? x) t1 t2)
-      (vnear? (vector x (pre-tick-value t1) z-min)
-              (vector x (pre-tick-value t2) z-min)))
-    
-    (define ((z-ticks-near? x y) t1 t2)
-      (vnear? (vector x y (pre-tick-value t1))
-              (vector x y (pre-tick-value t2))))
-    
-    (define x-ticks
-      (collapse-ticks (filter (λ (t) (<= x-min (pre-tick-value t) x-max))
-                              (map tick-inexact->exact rx-ticks))
-                      (x-ticks-near? x-axis-y)))
-    (define y-ticks
-      (collapse-ticks (filter (λ (t) (<= y-min (pre-tick-value t) y-max))
-                              (map tick-inexact->exact ry-ticks))
-                      (y-ticks-near? y-axis-x)))
-    (define z-ticks
-      (collapse-ticks (filter (λ (t) (<= z-min (pre-tick-value t) z-max))
-                              (map tick-inexact->exact rz-ticks))
-                      (z-ticks-near? z-axis-x z-axis-y)))
-    
-    (define x-far-ticks
-      (collapse-ticks (filter (λ (t) (<= x-min (pre-tick-value t) x-max))
-                              (map tick-inexact->exact rx-far-ticks))
-                      (x-ticks-near? x-far-axis-y)))
-    (define y-far-ticks
-      (collapse-ticks (filter (λ (t) (<= y-min (pre-tick-value t) y-max))
-                              (map tick-inexact->exact ry-far-ticks))
-                      (y-ticks-near? y-far-axis-x)))
-    (define z-far-ticks
-      (collapse-ticks (filter (λ (t) (<= z-min (pre-tick-value t) z-max))
-                              (map tick-inexact->exact rz-far-ticks))
-                      (z-ticks-near? z-far-axis-x z-far-axis-y)))
-    
-    ;; ===============================================================================================
-    ;; Tick and label parameters, and fixpoint margin computation
-    
-    ;; From here through "All parameters" are functions that compute *just the parameters* of ticks
-    ;; and labels that will be drawn on the plot. We have to separate computing parameters from
-    ;; actually drawing the ticks and labels so we can solve for the plot margins using a fixpoint
-    ;; computation. See ../common/draw.rkt for more explanation. (Search for 'margin-fixpoint'.)
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Tick parameters
-    
-    (define (x-tick-value->view x) (plot->view (vector x x-axis-y z-min)))
-    (define (y-tick-value->view y) (plot->view (vector y-axis-x y z-min)))
-    (define (x-tick-value->dc x) (view->dc (x-tick-value->view x)))
-    (define (y-tick-value->dc y) (view->dc (y-tick-value->view y)))
-    (define (z-tick-value->dc z) (plot->dc (vector z-axis-x z-axis-y z)))
-    
-    (define (x-far-tick-value->view x) (plot->view (vector x x-far-axis-y z-min)))
-    (define (y-far-tick-value->view y) (plot->view (vector y-far-axis-x y z-min)))
-    (define (x-far-tick-value->dc x) (view->dc (x-far-tick-value->view x)))
-    (define (y-far-tick-value->dc y) (view->dc (y-far-tick-value->view y)))
-    (define (z-far-tick-value->dc z) (plot->dc (vector z-far-axis-x z-far-axis-y z)))
-    
-    (define (get-tick-params ticks tick-value->dc angle)
-      (for/list ([t  (in-list ticks)])
-        (match-define (tick p major? _) t)
-        (list major? (tick-value->dc p) (if major? tick-radius half-tick-radius) angle)))
-    
-    (define (get-x-tick-params)
-      (if (plot-x-axis?) (get-tick-params x-ticks x-tick-value->dc (y-axis-angle)) empty))
-    
-    (define (get-y-tick-params)
-      (if (plot-y-axis?) (get-tick-params y-ticks y-tick-value->dc (x-axis-angle)) empty))
-    
-    (define (get-z-tick-params)
-      (if (plot-z-axis?) (get-tick-params z-ticks z-tick-value->dc 0) empty))
-    
-    (define (get-x-far-tick-params)
-      (if (plot-x-far-axis?) (get-tick-params x-far-ticks x-far-tick-value->dc (y-axis-angle)) empty))
-    
-    (define (get-y-far-tick-params)
-      (if (plot-y-far-axis?) (get-tick-params y-far-ticks y-far-tick-value->dc (x-axis-angle)) empty))
-    
-    (define (get-z-far-tick-params)
-      (if (plot-z-far-axis?) (get-tick-params z-far-ticks z-far-tick-value->dc 0) empty))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Tick label parameters
-    
-    (define draw-x-far-tick-labels? (not (and (plot-x-axis?) (equal? x-ticks x-far-ticks))))
-    (define draw-y-far-tick-labels? (not (and (plot-y-axis?) (equal? y-ticks y-far-ticks))))
-    (define draw-z-far-tick-labels? (not (and (plot-z-axis?) (equal? z-ticks z-far-ticks))))
-    
-    (define (sort-ticks ticks tick-value->view)
-      (sort ticks > #:key (λ (t) (flvector-ref (tick-value->view (pre-tick-value t)) 2))
-            #:cache-keys? #t))
-    
-    (define (opposite-anchor a)
-      (case a
-        [(top-left)  'bottom-right] [(top)  'bottom] [(top-right)  'bottom-left] [(right)  'left]
-        [(bottom-right)  'top-left] [(bottom)  'top] [(bottom-left)  'top-right] [(left)  'right]))
-    
-    (define x-tick-label-anchor
-      (let ([s  (sin theta)])
-        (cond [(s . < . (sin (degrees->radians -67.5)))  (if x-axis-y-min? 'top-right 'top-left)]
-              [(s . < . (sin (degrees->radians -22.5)))  (if x-axis-y-min? 'top-right 'top-left)]
-              [(s . < . (sin (degrees->radians 22.5)))   'top]
-              [(s . < . (sin (degrees->radians 67.5)))   (if x-axis-y-min? 'top-left 'top-right)]
-              [else                                      (if x-axis-y-min? 'top-left 'top-right)])))
-    
-    (define y-tick-label-anchor
-      (let ([c  (cos theta)])
-        (cond [(c . > . (cos (degrees->radians 22.5)))   (if y-axis-x-min? 'top-right 'top-left)]
-              [(c . > . (cos (degrees->radians 67.5)))   (if y-axis-x-min? 'top-right 'top-left)]
-              [(c . > . (cos (degrees->radians 112.5)))  'top]
-              [(c . > . (cos (degrees->radians 157.5)))  (if y-axis-x-min? 'top-left 'top-right)]
-              [else                                      (if y-axis-x-min? 'top-left 'top-right)])))
-    
-    (define z-tick-label-anchor 'right)
-    
-    (define x-far-tick-label-anchor (opposite-anchor x-tick-label-anchor))
-    (define y-far-tick-label-anchor (opposite-anchor y-tick-label-anchor))
-    (define z-far-tick-label-anchor 'left)
-    
-    (define (get-tick-label-params ticks tick-value->dc offset-dir anchor)
-      (define dist (+ (pen-gap) tick-radius))
-      (for/list ([t  (in-list ticks)] #:when (pre-tick-major? t))
-        (match-define (tick x _ label) t)
-        (list label (v+ (tick-value->dc x) (v* offset-dir dist)) anchor)))
-    
-    (define (get-x-tick-label-params)
-      (if (plot-x-axis?)
-          (let ([offset  (if x-axis-y-min? (vneg (y-axis-dir)) (y-axis-dir))])
-            (get-tick-label-params (sort-ticks x-ticks x-tick-value->view)
-                                   x-tick-value->dc offset x-tick-label-anchor))
-          empty))
-    
-    (define (get-y-tick-label-params)
-      (if (plot-y-axis?)
-          (let ([offset  (if y-axis-x-min? (vneg (x-axis-dir)) (x-axis-dir))])
-            (get-tick-label-params (sort-ticks y-ticks y-tick-value->view)
-                                   y-tick-value->dc offset y-tick-label-anchor))
-          empty))
-    
-    (define (get-z-tick-label-params)
-      (if (plot-z-axis?)
-          (get-tick-label-params z-ticks z-tick-value->dc #(-1 0) z-tick-label-anchor)
-          empty))
-    
-    (define (get-x-far-tick-label-params)
-      (if (and (plot-x-far-axis?) draw-x-far-tick-labels?)
-          (let ([offset  (if x-axis-y-min? (y-axis-dir) (vneg (y-axis-dir)))])
-            (get-tick-label-params (sort-ticks x-far-ticks x-far-tick-value->view)
-                                   x-far-tick-value->dc offset x-far-tick-label-anchor))
-          empty))
-    
-    (define (get-y-far-tick-label-params)
-      (if (and (plot-y-far-axis?) draw-y-far-tick-labels?)
-          (let ([offset  (if y-axis-x-min? (x-axis-dir) (vneg (x-axis-dir)))])
-            (get-tick-label-params (sort-ticks y-far-ticks y-far-tick-value->view)
-                                   y-far-tick-value->dc offset y-far-tick-label-anchor))
-          empty))
-    
-    (define (get-z-far-tick-label-params)
-      (if (and (plot-z-far-axis?) draw-z-far-tick-labels?)
-          (get-tick-label-params z-far-ticks z-far-tick-value->dc #(1 0) z-far-tick-label-anchor)
-          empty))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Axis label parameters
-    
-    (define (max-tick-offset ts)
-      (cond [(empty? ts)  0]
-            [(ormap pre-tick-major? ts)  (+ (pen-gap) tick-radius)]
-            [else  (+ (pen-gap) (* 1/4 (plot-tick-size)))]))
-    
-    (define max-x-tick-offset (if (plot-x-axis?) (max-tick-offset x-ticks) 0))
-    (define max-y-tick-offset (if (plot-y-axis?) (max-tick-offset y-ticks) 0))
-    
-    (define max-x-far-tick-offset (if (plot-x-far-axis?) (max-tick-offset x-far-ticks) 0))
-    (define max-y-far-tick-offset (if (plot-y-far-axis?) (max-tick-offset y-far-ticks) 0))
-    
-    (define (max-tick-label-height ts)
-      (if (ormap pre-tick-major? ts) char-height 0))
-    
-    (define (max-tick-label-width ts)
-      (apply max 0 (for/list ([t  (in-list ts)] #:when (pre-tick-major? t))
-                     (send pd get-text-width (tick-label t)))))
-    
-    (define max-x-tick-label-width (max-tick-label-width x-ticks))
-    (define max-y-tick-label-width (max-tick-label-width y-ticks))
-    (define max-z-tick-label-width (max-tick-label-width z-ticks))
-    (define max-x-tick-label-height (max-tick-label-height x-ticks))
-    (define max-y-tick-label-height (max-tick-label-height y-ticks))
-    (define max-z-tick-label-height (max-tick-label-height z-ticks))
-    
-    (define max-x-far-tick-label-width (max-tick-label-width x-far-ticks))
-    (define max-y-far-tick-label-width (max-tick-label-width y-far-ticks))
-    (define max-z-far-tick-label-width (max-tick-label-width z-far-ticks))
-    (define max-x-far-tick-label-height (max-tick-label-height x-far-ticks))
-    (define max-y-far-tick-label-height (max-tick-label-height y-far-ticks))
-    (define max-z-far-tick-label-height (max-tick-label-height z-far-ticks))
-    
-    (define (max-tick-label-diag axis-dc-dir max-tick-label-width max-tick-label-height)
-      (match-define (vector dx dy) axis-dc-dir)
-      (+ (* (abs dx) max-tick-label-width) (* (abs dy) max-tick-label-height)))
-    
-    (define (max-x-tick-label-diag)
-      (if (plot-x-axis?)
-          (max-tick-label-diag (y-axis-dir) max-x-tick-label-width max-x-tick-label-height)
-          0))
-    
-    (define (max-y-tick-label-diag)
-      (if (plot-y-axis?)
-          (max-tick-label-diag (x-axis-dir) max-y-tick-label-width max-y-tick-label-height)
-          0))
-    
-    (define (max-x-far-tick-label-diag)
-      (if (and (plot-x-far-axis?) draw-x-far-tick-labels?)
-          (max-tick-label-diag (y-axis-dir) max-x-far-tick-label-width max-x-far-tick-label-height)
-          0))
-    
-    (define (max-y-far-tick-label-diag)
-      (if (and (plot-y-far-axis?) draw-y-far-tick-labels?)
-          (max-tick-label-diag (x-axis-dir) max-y-far-tick-label-width max-y-far-tick-label-height)
-          0))
-    
-    (define (get-x-label-params)
-      (define v0 (norm->dc (flvector 0.0 x-axis-norm-y -0.5)))
-      (define dist (+ max-x-tick-offset (max-x-tick-label-diag) half-char-height))
-      (list (plot-x-label) (v+ v0 (v* (y-axis-dir) (if x-axis-y-min? (- dist) dist)))
-            'top (- (if x-axis-y-min? 0 pi) (x-axis-angle))))
-    
-    (define (get-y-label-params)
-      (define v0 (norm->dc (flvector y-axis-norm-x 0.0 -0.5)))
-      (define dist (+ max-y-tick-offset (max-y-tick-label-diag) half-char-height))
-      (list (plot-y-label) (v+ v0 (v* (x-axis-dir) (if y-axis-x-min? (- dist) dist)))
-            'top (- (if y-axis-x-min? pi 0) (y-axis-angle))))
-    
-    (define (get-z-label-params)
-      (list (plot-z-label) (v+ (plot->dc (vector z-axis-x z-axis-y z-max))
-                               (vector 0 (- half-char-height)))
-            'bottom-left 0))
-    
-    (define (get-x-far-label-params)
-      (define v0 (norm->dc (flvector 0.0 x-far-axis-norm-y -0.5)))
-      (define dist (+ max-x-far-tick-offset (max-x-far-tick-label-diag) half-char-height))
-      (list (plot-x-far-label) (v+ v0 (v* (y-axis-dir) (if x-axis-y-min? dist (- dist))))
-            'bottom (- (if x-axis-y-min? 0 pi) (x-axis-angle))))
-    
-    (define (get-y-far-label-params)
-      (define v0 (norm->dc (flvector y-far-axis-norm-x 0.0 -0.5)))
-      (define dist (+ max-y-far-tick-offset (max-y-far-tick-label-diag) half-char-height))
-      (list (plot-y-far-label) (v+ v0 (v* (x-axis-dir) (if y-axis-x-min? dist (- dist))))
-            'bottom (- (if y-axis-x-min? pi 0) (y-axis-angle))))
-    
-    (define (get-z-far-label-params)
-      (list (plot-z-far-label) (v+ (plot->dc (vector z-far-axis-x z-far-axis-y z-max))
-                                   (vector 0 (- half-char-height)))
-            'bottom-right 0))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; All parameters
-    
-    ;; Within each get-back-* or get-front-*, the parameters are ordered (roughly) back-to-front
-    
-    (define (get-back-label-params)
-      (if (plot-decorations?)
-          (append (if (plot-x-far-label) (list (get-x-far-label-params)) empty)
-                  (if (plot-y-far-label) (list (get-y-far-label-params)) empty)
-                  (get-x-far-tick-label-params)
-                  (get-y-far-tick-label-params))
-          empty))
-    
-    (define (get-front-label-params)
-      (if (plot-decorations?)
-          (append (get-z-tick-label-params)
-                  (get-z-far-tick-label-params)
-                  (get-x-tick-label-params)
-                  (get-y-tick-label-params)
-                  (if (plot-x-label) (list (get-x-label-params)) empty)
-                  (if (plot-y-label) (list (get-y-label-params)) empty)
-                  (if (plot-z-label) (list (get-z-label-params)) empty)
-                  (if (plot-z-far-label) (list (get-z-far-label-params)) empty))
-          empty))
-    
-    (define (get-back-tick-params)
-      (if (plot-decorations?)
-          (append (if (plot-x-far-axis?) (get-x-far-tick-params) empty)
-                  (if (plot-y-far-axis?) (get-y-far-tick-params) empty)
-                  (if (plot-x-axis?) (get-x-tick-params) empty)
-                  (if (plot-y-axis?) (get-y-tick-params) empty))
-          empty))
-    
-    (define (get-front-tick-params)
-      (if (plot-decorations?)
-          (append (if (plot-z-axis?) (get-z-tick-params) empty)
-                  (if (plot-z-far-axis?) (get-z-far-tick-params) empty))
-          empty))
-    
-    (define (get-all-tick-params)
-      (append (get-back-tick-params) (get-front-tick-params)))
-    
-    (define (get-all-label-params)
-      (append (get-back-label-params) (get-front-label-params)))
-    
-    ;; -----------------------------------------------------------------------------------------------
-    ;; Fixpoint margin computation
-    
-    (define (get-param-vs/set-view->dc! left right top bottom)
-      ;(printf "margins: ~v ~v ~v ~v~n" left right top bottom)
-      ;(printf "label params = ~v~n" (get-all-label-params))
-      ;(printf "tick params = ~v~n" (get-all-tick-params))
-      (set! view->dc (make-view->dc left right top bottom))
-      ;(printf "~v~n" (get-all-tick-params))
-      (append (append* (map (λ (params) (send/apply pd get-text-corners params))
-                            (get-all-label-params)))
-              (append* (map (λ (params) (send/apply pd get-tick-endpoints (rest params)))
-                            (get-all-tick-params)))))
-    
-    (define-values (left right top bottom)
-      (margin-fixpoint 0 dc-x-size 0 dc-y-size 0 0 init-top-margin 0 get-param-vs/set-view->dc!))
-    
-    (define area-x-min left)
-    (define area-x-max (- dc-x-size right))
-    (define area-y-min top)
-    (define area-y-max (- dc-y-size bottom))
-    
-    ;; ===============================================================================================
-    ;; Plot decoration
-    
-    (define (draw-title)
-      (when (and (plot-decorations?) (plot-title))
-        (send pd draw-text (plot-title) (vector (* 1/2 dc-x-size) 0) 'top)))
-    
-    (define (draw-back-axes)
-      (when (plot-decorations?)
-        (send pd set-minor-pen)
-        (when (plot-x-axis?)
-          (send pd draw-line
-                (norm->dc (flvector -0.5 x-axis-norm-y -0.5))
-                (norm->dc (flvector 0.5 x-axis-norm-y -0.5))))
-        (when (plot-x-far-axis?)
-          (send pd draw-line
-                (norm->dc (flvector -0.5 x-far-axis-norm-y -0.5))
-                (norm->dc (flvector 0.5 x-far-axis-norm-y -0.5))))
-        (when (plot-y-axis?)
-          (send pd draw-line
-                (norm->dc (flvector y-axis-norm-x -0.5 -0.5))
-                (norm->dc (flvector y-axis-norm-x 0.5 -0.5))))
-        (when (plot-y-far-axis?)
-          (send pd draw-line
-                (norm->dc (flvector y-far-axis-norm-x -0.5 -0.5))
-                (norm->dc (flvector y-far-axis-norm-x 0.5 -0.5))))))
-    
-    (define (draw-front-axes)
-      (when (plot-decorations?)
-        (send pd set-minor-pen)
-        (when (plot-z-axis?)
-          (send pd draw-line
-                (norm->dc (flvector z-axis-norm-x z-axis-norm-y -0.5))
-                (norm->dc (flvector z-axis-norm-x z-axis-norm-y 0.5))))
-        (when (plot-z-far-axis?)
-          (send pd draw-line
-                (norm->dc (flvector z-far-axis-norm-x z-far-axis-norm-y -0.5))
-                (norm->dc (flvector z-far-axis-norm-x z-far-axis-norm-y 0.5))))))
-    
-    (define (draw-ticks tick-params)
-      (for ([params  (in-list tick-params)])
-        (match-define (list major? v r angle) params)
-        (if major? (send pd set-major-pen) (send pd set-minor-pen))
-        (send pd draw-tick v r angle)))
-    
-    (define (draw-labels label-params)
-      (for ([params  (in-list label-params)])
-        (send/apply pd draw-text params #:outline? #t)))
-    
-    ;; ===============================================================================================
-    ;; Render list and its BSP representation
-    
-    ;; (: structural-shapes (HashTable Integer shape))
-    ;; View-independent shapes, used to built initial BSP trees
-    (define structural-shapes (hasheq))
-    
-    ;; (: detail-shapes (HashTable Integer shape))
-    ;; View-dependent shapes, inserted into BSP trees before each refresh
-    (define detail-shapes (hasheq))
-    
-    ;; (: bsp-trees (U #f (HashTable Integer BSP-Tree)))
-    ;; Structural shapes partitioned in BSP trees, indexed by drawing layer
-    ;; #f means not in sync with structural-shapes
-    (define bsp-trees #f)
-    
-    (define (add-shape! layer s)
-      (cond [(structural-shape? s)
-             (define ss structural-shapes)
-             (set! structural-shapes (hash-set ss layer (cons s (hash-ref ss layer empty))))
-             (set! bsp-trees #f)]
-            [else
-             (define ss detail-shapes)
-             (set! detail-shapes (hash-set ss layer (cons s (hash-ref ss layer empty))))]))
-    
-    (define (add-shapes! layer ss)
-      (for ([s  (in-list ss)])
-        (add-shape! layer s)))
-    
-    (define (clear-shapes!)
-      (set! structural-shapes (hasheq))
-      (set! detail-shapes (hasheq))
-      (set! bsp-trees #f))
-    
-    (define/public (get-render-tasks)
-      (define bsp-trees (sync-bsp-trees))
-      (render-tasks structural-shapes detail-shapes bsp-trees))
-    
-    (define/public (set-render-tasks tasks)
-      (match-define (render-tasks sts dts bsps) tasks)
-      (set! structural-shapes sts)
-      (set! detail-shapes dts)
-      (set! bsp-trees bsps))
-    
-    (define (sync-bsp-trees)
-      (cond
-        [bsp-trees  bsp-trees]
-        [else
-         (define new-bsp-trees (build-bsp-trees structural-shapes))
-         (set! bsp-trees new-bsp-trees)
-         new-bsp-trees]))
-    
-    (define (adjust-detail-shapes ss)
-      (define d (view->norm view-dir))
-      (define dx (flvector-ref d 0))
-      (define dy (flvector-ref d 1))
-      (define dz (flvector-ref d 2))
-      (define area-size (fl (min (- area-x-max area-x-min)
-                                 (- area-y-max area-y-min))))
-      
-      (for/list ([s  (in-list ss)])
-        (match s
-          [(points data vs)
-           ;; Bring points forward a smidge so any *on* a polygon will draw on either side
-           (define frac #i1/10000)
-           (points data (for/list ([v  (in-list vs)])
-                          (flvector (+ (flvector-ref v 0) (* dx frac))
-                                    (+ (flvector-ref v 1) (* dy frac))
-                                    (+ (flvector-ref v 2) (* dz frac)))))]
-          [(line data v1 v2)
-           ;; Bring line forward by about half its apparent thickness
-           (define frac (* 0.5 (/ pen-width area-size)))
-           (line data 
-                 (flvector (+ (flvector-ref v1 0) (* dx frac))
-                           (+ (flvector-ref v1 1) (* dy frac))
-                           (+ (flvector-ref v1 2) (* dz frac)))
-                 (flvector (+ (flvector-ref v2 0) (* dx frac))
-                           (+ (flvector-ref v2 1) (* dy frac))
-                           (+ (flvector-ref v2 2) (* dz frac))))]
-          [(lines data vs)
-           ;; Bring lines forward by about half its apparent thickness
-           (define frac (* 0.5 (/ pen-width area-size)))
-           (lines data (for/list ([v  (in-list vs)])
-                         (flvector (+ (flvector-ref v 0) (* dx frac))
-                                   (+ (flvector-ref v 1) (* dy frac))
-                                   (+ (flvector-ref v 2) (* dz frac)))))]
-          [_  s])))
-    
-    (define (draw-all-shapes)
-      (define bsp-trees (sync-bsp-trees))
-      
-      (define adj-detail-shapes
-        (for/hasheq ([(layer ss)  (in-hash detail-shapes)])
-          (values layer (adjust-detail-shapes ss))))
-      
-      (define all-shapes (walk-bsp-trees bsp-trees (view->norm view-dir) adj-detail-shapes))
-      
-      (for* ([layer  (in-list (sort (hash-keys all-shapes) >))]
-             [s      (in-list (hash-ref all-shapes layer))])
-        (draw-shape s)))
-    
-    ;; ===============================================================================================
-    ;; Lighting
-    
-    ;; Light position, in normalized view coordinates: 5 units up, ~3 units back and to the left
-    ;; (simulates non-noon daylight conditions)
-    (define light (m3-apply rotate-rho-matrix (flvector (- -0.5 2.0)
-                                                        (- -0.5 2.0)
-                                                        (+ 0.5 5.0))))
-    
-    ;; Do lighting only by direction so we can precalculate light-dir and half-dir
-    ;; Conceptually, the viewer and light are at infinity
-    
-    ;; Light direction
-    (define light-dir (vector->flvector (vnormalize (flvector->vector light))))
-    ;; View direction, in normalized view coordinates
-    (define view-dir (flvector 0.0 -1.0 0.0))
-    ;; Blinn-Phong "half angle" direction
-    (define half-dir (vector->flvector
-                      (vnormalize (v* (v+ (flvector->vector light-dir)
-                                          (flvector->vector view-dir))
-                                      0.5))))
-    
-    (define diffuse-light? (plot3d-diffuse-light?))
-    (define specular-light? (plot3d-specular-light?))
-    (define ambient-light (fl (plot3d-ambient-light)))
-    
-    (define get-light-values
-      (cond
-        [(not (or diffuse-light? specular-light?))  (λ (v normal) (values 1.0 0.0))]
-        [else
-         (λ (v normal)
-           ;; Diffuse lighting: typical Lambertian surface model (using absolute value because we
-           ;; can't expect surface normals to point the right direction)
-           (define diff
-             (cond [diffuse-light?  (flabs (flv3-dot normal light-dir))]
-                   [else  1.0]))
-           ;; Specular highlighting: Blinn-Phong model
-           (define spec
-             (cond [specular-light?  (fl* 32.0 (expt (flabs (flv3-dot normal half-dir)) 20.0))]
-                   [else  0.0]))
-           ;; Blend ambient light with diffuse light, return specular as it is
-           ;; As ambient-light -> 1.0, contribution of diffuse -> 0.0
-           (values (fl+ ambient-light (fl* (fl- 1.0 ambient-light) diff)) spec))]))
-    
-    ;; ===============================================================================================
-    ;; Drawing
-    
-    (define (draw-polygon s)
-      (match-define (poly (poly-data alpha center
-                                     pen-color pen-width pen-style
-                                     brush-color brush-style face)
-                          vs ls normal)
-        s)
-      (define view-normal (norm->view normal))
-      (define cos-view (flv3-dot view-dir view-normal))
-      (cond
-        [(and (cos-view . < . 0.0) (eq? face 'front))  (void)]
-        [(and (cos-view . > . 0.0) (eq? face 'back))   (void)]
-        [else
-         (send pd set-alpha alpha)
-         (define-values (diff spec) (get-light-values center view-normal))
-         (let ([pen-color    (map (λ (v) (+ (* v diff) spec)) pen-color)]
-               [brush-color  (map (λ (v) (+ (* v diff) spec)) brush-color)]
-               [vs  (map norm->dc vs)])
-           ;(send pd set-pen "black" 0.5 'solid)  ; for BSP debugging
-           (send pd set-pen "black" 0 'transparent)
-           (send pd set-brush brush-color brush-style)
-           (send pd draw-polygon vs)
-           ;; Draw lines around polygon
-           (send pd set-pen pen-color pen-width pen-style)
-           (cond [(andmap values ls)
-                  ;; Fast path: all lines drawn
-                  (send pd draw-lines (cons (last vs) vs))]
-                 [else
-                  ;; Slow path: draw each as indicated by ls
-                  ;; TODO: draw contiguous lines using draw-lines
-                  (for ([v1  (in-list (cons (last vs) vs))]
-                        [v2  (in-list vs)]
-                        [l   (in-list ls)])
-                    (when l (send pd draw-line v1 v2)))]))]))
-    
-    (define (draw-line s)
-      (match-define (line (line-data alpha pen-color pen-width pen-style) v1 v2) s)
-      (send pd set-alpha alpha)
-      (send pd set-pen pen-color pen-width pen-style)
-      (send pd draw-line (norm->dc v1) (norm->dc v2)))
-    
-    (define (draw-lines s)
-      (match-define (lines (line-data alpha pen-color pen-width pen-style) vs) s)
-      (send pd set-alpha alpha)
-      (send pd set-pen pen-color pen-width pen-style)
-      (send pd draw-lines (map norm->dc vs)))
-    
-    (define (draw-glyph data vs)
-      (match-define (glyph-data alpha symbol size
-                                pen-color pen-width pen-style
-                                brush-color brush-style)
-        data)
-      (send pd set-alpha alpha)
-      (send pd set-pen pen-color pen-width pen-style)
-      (send pd set-brush brush-color brush-style)
-      (send pd draw-glyphs (map norm->dc vs) symbol size))
-    
-    (define (draw-text data vs)
-      (match-define (text-data alpha anchor angle dist str font-size font-family color outline?) data)
-      (send pd set-alpha alpha)
-      (send pd set-font font-size font-family)
-      (send pd set-text-foreground color)
-      (for ([v  (in-list vs)])
-        (send pd draw-text str (norm->dc v) anchor angle dist #:outline? outline?)))
-    
-    (define (draw-arrow data vs)
-      (match-define (arrow-data alpha v1 v2 outline-color pen-color pen-width pen-style) data)
-      (let ([v1  (norm->dc v1)]
-            [v2  (norm->dc v2)])
-        (send pd set-alpha alpha)
-        (send pd set-pen outline-color (+ 2 pen-width) 'solid)
-        (send pd draw-arrow v1 v2)
-        (send pd set-pen pen-color pen-width pen-style)
-        (send pd draw-arrow v1 v2)))
-    
-    (define (draw-points s)
-      (match-define (points data vs) s)
-      (cond [(glyph-data? data)  (draw-glyph data vs)]
-            [(text-data? data)   (draw-text data vs)]
-            [(arrow-data? data)  (draw-arrow data (first vs))]))
-    
-    (define (draw-shape s)
-      (cond [(poly? s)    (draw-polygon s)]
-            [(line? s)    (draw-line s)]
-            [(lines? s)   (draw-lines s)]
-            [(points? s)  (draw-points s)]
-            [else  (raise-argument-error 'draw-shape "known shape" s)]))
-    
-    ;; ===============================================================================================
-    ;; Public drawing control (used by plot3d/dc)
-    
-    (define/public (start-plot)
-      (send pd reset-drawing-params)
-      (send pd clear)
-      (draw-title)
-      (draw-labels (get-back-label-params))
-      (draw-ticks (get-back-tick-params))
-      (draw-back-axes)
-      (send pd set-clipping-rect
-            (vector (ivl (+ 1/2 (- area-x-min (plot-line-width))) (+ area-x-max (plot-line-width)))
-                    (ivl (+ 1/2 (- area-y-min (plot-line-width))) (+ area-y-max (plot-line-width)))))
-      (clear-shapes!))
-    
-    (define/public (start-renderer rend-bounds-rect)
-      (reset-drawing-params)
-      (put-clip-rect rend-bounds-rect))
-    
-    (define/public (end-renderers)
-      (clear-clip-rect)
-      (draw-all-shapes)
-      (send pd reset-drawing-params)
-      (draw-front-axes)
-      (draw-ticks (get-front-tick-params))
-      (draw-labels (get-front-label-params)))
-    
-    (define (draw-legend* legend-entries)
-      (define gap-size (+ (pen-gap) tick-radius))
-      (send pd draw-legend legend-entries
-            (vector (ivl (+ area-x-min gap-size) (- area-x-max gap-size))
-                    (ivl (+ area-y-min gap-size) (- area-y-max gap-size)))))
-    
-    (define/public (draw-legend legend-entries) (draw-legend* legend-entries))
-    
-    (define/public (end-plot)
-      (send pd restore-drawing-params))
-    
-    ;; ===============================================================================================
-    ;; Public drawing interface (used by renderers)
-    
-    ;; Drawing parameters
-    
-    (define alpha 1)
-    
-    (define pen-color '(0 0 0))
-    (define pen-width 1)
-    (define pen-style 'solid)
-    
-    (define brush-color '(255 255 255))
-    (define brush-style 'solid)
-    
-    (define background-color '(255 255 255))
-    
-    (define font-size 11)
-    (define font-face #f)
-    (define font-family 'roman)
-    (define text-foreground '(0 0 0))
-    
-    ;; Drawing parameter accessors
-    
-    (define/public (put-alpha a) (set! alpha a))
-    
-    (define/public (put-pen color width style)
-      (set! pen-color (->pen-color color))
-      (set! pen-width width)
-      (set! pen-style (->pen-style style)))
-    
-    (define/public (put-major-pen [style 'solid])
-      (put-pen (plot-foreground) (plot-line-width) style))
-    
-    (define/public (put-minor-pen [style 'solid])
-      (put-pen (plot-foreground) (* 1/2 (plot-line-width)) style))
-    
-    (define/public (put-brush color style)
-      (set! brush-color (->brush-color color))
-      (set! brush-style (->brush-style style)))
-    
-    (define/public (put-background color)
-      (set! background-color (->brush-color color)))
-    
-    (define/public (put-font-size size) (set! font-size size))
-    (define/public (put-font-face face) (set! font-face face))
-    (define/public (put-font-family family) (set! font-family family))
-    
-    (define/public put-font
-      (case-lambda 
-        [(size family)
-         (put-font-size size)
-         (put-font-family family)]
-        [(size face family)
-         (put-font-size size)
-         (put-font-face face)
-         (put-font-family family)]))
-    
-    (define/public (put-text-foreground c)
-      (set! text-foreground (->pen-color c)))
-    
-    (define/public (reset-drawing-params)
-      (put-alpha (plot-foreground-alpha))
-      (put-pen (plot-foreground) (plot-line-width) 'solid)
-      (put-brush (plot-background) 'solid)
-      (put-background (plot-background))
-      (put-font (plot-font-size) (plot-font-face) (plot-font-family))
-      (put-text-foreground (plot-foreground)))
-    
-    ;; Drawing shapes
-    
-    (define/public (put-line v1 v2)
-      (let ([v1  (exact-vector3d v1)]
-            [v2  (exact-vector3d v2)])
-        (when (and v1 v2)
-          (let-values ([(v1 v2)  (if clipping?
-                                     (clip-line/bounds v1 v2
-                                                       clip-x-min clip-x-max
-                                                       clip-y-min clip-y-max
-                                                       clip-z-min clip-z-max)
-                                     (values v1 v2))])
-            (when (and v1 v2)
-              (cond [identity-transforms?
-                     (add-shape! plot3d-area-layer
-                                 (line (line-data alpha pen-color pen-width pen-style)
-                                       (plot->norm v1)
-                                       (plot->norm v2)))]
-                    [else
-                     (define vs (subdivide-line plot->dc v1 v2))
-                     (add-shape! plot3d-area-layer
-                                 (lines (line-data alpha pen-color pen-width pen-style)
-                                        (map plot->norm vs)))]))))))
-    
-    (define/public (put-lines vs)
-      (for ([vs  (in-list (exact-vector3d-sublists vs))])
-        (let ([vss  (if clipping?
-                        (clip-lines/bounds vs
-                                           clip-x-min clip-x-max
-                                           clip-y-min clip-y-max
-                                           clip-z-min clip-z-max)
-                        (list vs))])
-          (cond [identity-transforms?
-                 (for ([vs  (in-list vss)])
-                   (add-shape! plot3d-area-layer
-                               (lines (line-data alpha pen-color pen-width pen-style)
-                                      (map plot->norm vs))))]
-                [else
-                 (for ([vs  (in-list vss)])
-                   (let ([vs  (subdivide-lines plot->dc vs)])
-                     (add-shape! plot3d-area-layer
-                                 (lines (line-data alpha pen-color pen-width pen-style)
-                                        (map plot->norm vs)))))]))))
-    
-    (define/public (put-polygon vs [face 'both] [ls (make-list (length vs) #t)])
-      (let-values ([(vs ls)  (exact-polygon3d vs ls)])
-        (unless (empty? vs)
-          (let*-values ([(vs ls)  (if clipping?
-                                      (clip-polygon/bounds vs ls
-                                                           clip-x-min clip-x-max
-                                                           clip-y-min clip-y-max
-                                                           clip-z-min clip-z-max)
-                                      (values vs ls))]
-                        [(vs ls)  (if identity-transforms?
-                                      (values vs ls)
-                                      (subdivide-polygon plot->dc vs ls))])
-            (unless (empty? vs)
-              (define norm-vs (map plot->norm vs))
-              (define normal (flv3-normal norm-vs))
-              (define center (flv3-center norm-vs))
-              (add-shape! plot3d-area-layer
-                          (poly (poly-data alpha center
-                                           pen-color pen-width pen-style
-                                           brush-color brush-style face)
-                                norm-vs ls normal)))))))
-    
-    (define/public (put-rect r)
-      (let ([r  (if (rect-rational? r) (rect-meet r bounds-rect) r)])
-        (when (rect-rational? r)
-          (match-define (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max)) r)
-          (define v-min (plot->norm (vector (inexact->exact x-min)
-                                            (inexact->exact y-min)
-                                            (inexact->exact z-min))))
-          (define v-max (plot->norm (vector (inexact->exact x-max)
-                                            (inexact->exact y-max)
-                                            (inexact->exact z-max))))
-          (let ()
-            (define x-min (flvector-ref v-min 0))
-            (define y-min (flvector-ref v-min 1))
-            (define z-min (flvector-ref v-min 2))
-            (define x-max (flvector-ref v-max 0))
-            (define y-max (flvector-ref v-max 1))
-            (define z-max (flvector-ref v-max 2))
-            (define x-mid (* 0.5 (+ x-max x-min)))
-            (define y-mid (* 0.5 (+ y-max y-min)))
-            (define z-mid (* 0.5 (+ z-max z-min)))
-            ;; Faces are a list of center, normal, then vertices
-            (define faces
-              (list 
-               ;; Bottom (z-min) face
-               (list (flvector x-mid y-mid z-min) (flvector 0.0 0.0 -1.0)
-                     (flvector x-min y-min z-min) (flvector x-max y-min z-min)
-                     (flvector x-max y-max z-min) (flvector x-min y-max z-min))
-               ;; Top (z-max) face
-               (list (flvector x-mid y-mid z-max) (flvector 0.0 0.0 1.0)
-                     (flvector x-min y-min z-max) (flvector x-max y-min z-max)
-                     (flvector x-max y-max z-max) (flvector x-min y-max z-max))
-               ;; Front (y-min) face
-               (list (flvector x-mid y-min z-mid) (flvector 0.0 -1.0 0.0)
-                     (flvector x-min y-min z-min) (flvector x-max y-min z-min)
-                     (flvector x-max y-min z-max) (flvector x-min y-min z-max))
-               ;; Back (y-max) face
-               (list (flvector x-mid y-max z-mid) (flvector 0.0 1.0 0.0)
-                     (flvector x-min y-max z-min) (flvector x-max y-max z-min)
-                     (flvector x-max y-max z-max) (flvector x-min y-max z-max))
-               ;; Left (x-min) face
-               (list (flvector x-min y-mid z-mid) (flvector -1.0 0.0 0.0)
-                     (flvector x-min y-min z-min) (flvector x-min y-max z-min)
-                     (flvector x-min y-max z-max) (flvector x-min y-min z-max))
-               ;; Right (x-max) face
-               (list (flvector x-max y-mid z-mid) (flvector 1.0 0.0 0.0)
-                     (flvector x-max y-min z-min) (flvector x-max y-max z-min)
-                     (flvector x-max y-max z-max) (flvector x-max y-min z-max))))
-            (define ls (list #t #t #t #t))
-            (for ([face  (in-list faces)])
-              (match-define (list center normal vs ...) face)
-              (add-shape! plot3d-area-layer
-                          (poly (poly-data alpha center
-                                           pen-color pen-width pen-style
-                                           brush-color brush-style 'front)
-                                vs ls normal)))))))
-    
-    (define/public (put-text str v [anchor 'center] [angle 0] [dist 0]
-                             #:outline? [outline? #f]
-                             #:layer [layer plot3d-area-layer])
-      (let ([v  (exact-vector3d v)])
-        (when (and v (in-bounds? v))
-          (add-shape! layer (points (text-data alpha anchor angle dist str
-                                               font-size font-family text-foreground outline?)
-                                    (list (plot->norm v)))))))
-    
-    (define/public (put-glyphs vs symbol size #:layer [layer plot3d-area-layer])
-      (let ([vs  (filter (λ (v) (and v (in-bounds? v))) (map exact-vector3d vs))])
-        (unless (empty? vs)
-          (add-shape! layer (points (glyph-data alpha symbol size
-                                                pen-color pen-width pen-style
-                                                brush-color brush-style)
-                                    (map plot->norm vs))))))
-    
-    (define/public (put-arrow v1 v2)
-      (let ([v1  (exact-vector3d v1)]
-            [v2  (exact-vector3d v2)])
-        (when (and v1 v2 (in-bounds? v1))
-          (cond [(in-bounds? v2)
-                 (define c (v* (v+ v1 v2) 1/2))
-                 (define outline-color (->brush-color (plot-background)))
-                 (add-shape! plot3d-area-layer
-                             (points (arrow-data alpha (plot->norm v1) (plot->norm v2)
-                                                 outline-color pen-color pen-width pen-style)
-                                     (list (plot->norm c))))]
-                [else
-                 (put-line v1 v2)]))))
-    )) ; end class
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/point.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/point.rkt
deleted file mode 100644
index 07ed26af19..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/point.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/list racket/match racket/contract
-         unstable/latent-contract/defthing
-         unstable/contract
-         plot/utils
-         "../common/utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-
-(define ((points3d-render-proc vs sym color fill-color size line-width alpha label) area)
-  (send area put-alpha alpha)
-  (send area put-pen color line-width 'solid)
-  (send area put-brush fill-color 'solid)
-  (send area put-glyphs vs sym size)
-  
-  (cond [label  (point-legend-entry label sym color fill-color size line-width)]
-        [else   empty]))
-
-(defproc (points3d
-          [vs  (sequence/c (sequence/c #:min-count 3 real?))]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-          [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-          [#:sym sym point-sym/c (point-sym)]
-          [#:color color plot-color/c (point-color)]
-          [#:fill-color fill-color (or/c plot-color/c 'auto) 'auto]
-          [#:size size (>=/c 0) (point-size)]
-          [#:line-width line-width (>=/c 0) (point-line-width)]
-          [#:alpha alpha (real-in 0 1) (point-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer3d?
-  (let* ([vs  (sequence->listof-vector 'points3d vs 3)]
-         [vs  (filter vrational? vs)])
-    (cond [(empty? vs)  (renderer3d #f #f #f #f)]
-          [else
-           (match-define (list (vector xs ys zs) ...) vs)
-           (let ([x-min  (if x-min x-min (apply min* xs))]
-                 [x-max  (if x-max x-max (apply max* xs))]
-                 [y-min  (if y-min y-min (apply min* ys))]
-                 [y-max  (if y-max y-max (apply max* ys))]
-                 [z-min  (if z-min z-min (apply min* zs))]
-                 [z-max  (if z-max z-max (apply max* zs))])
-             (renderer3d
-              (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max)) #f default-ticks-fun
-              (points3d-render-proc vs sym color (cond [(eq? fill-color 'auto)  (->pen-color color)]
-                                                       [else  fill-color])
-                                    size line-width alpha label)))])))
-
-;; ===================================================================================================
-
-(define ((vector-field3d-render-fun f samples scale color line-width line-style alpha label) area)
-  (match-define (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max))
-    (send area get-bounds-rect))
-  
-  (define xs0 (linear-seq x-min x-max samples #:start? #t #:end? #t))
-  (define ys0 (linear-seq y-min y-max samples #:start? #t #:end? #t))
-  (define zs0 (linear-seq z-min z-max samples #:start? #t #:end? #t))
-  
-  (define-values (vs dxs dys dzs norms mags)
-    (for*/lists (vs dxs dys dzs norms mags) ([x   (in-list xs0)]
-                                                   [y   (in-list ys0)]
-                                                   [z   (in-list zs0)]
-                                                   [dv  (in-value (f x y z))] #:when (vrational? dv))
-      (match-define (vector dx dy dz) dv)
-      (values (vector x y z) dx dy dz (vnormalize dv) (vmag dv))))
-  
-  (cond [(empty? vs)  empty]
-        [else (define box-x-size (/ (- x-max x-min) samples))
-              (define box-y-size (/ (- y-max y-min) samples))
-              (define box-z-size (/ (- z-max z-min) samples))
-              
-              (define new-mags
-                (match scale
-                  [(? real?)  (map (λ (mag) (* scale mag)) mags)]
-                  ['normalized  (define box-size (min box-x-size box-y-size box-z-size))
-                                (build-list (length dxs) (λ _ box-size))]
-                  ['auto  (define dx-max (apply max (map abs dxs)))
-                          (define dy-max (apply max (map abs dys)))
-                          (define dz-max (apply max (map abs dzs)))
-                          (define scale (min (/ box-x-size dx-max)
-                                             (/ box-y-size dy-max)
-                                             (/ box-z-size dz-max)))
-                          (map (λ (mag) (* scale mag)) mags)]))
-              
-              (send area put-alpha alpha)
-              (send area put-pen color line-width line-style)
-              (for ([v     (in-list vs)]
-                    [norm  (in-list norms)]
-                    [mag   (in-list new-mags)])
-                (send area put-arrow v (v+ v (v* norm mag))))
-              
-              (cond [label  (arrow-legend-entry label color line-width line-style)]
-                    [else   empty])]))
-
-(defproc (vector-field3d
-          [f (or/c (real? real? real? . -> . (sequence/c real?))
-                   ((vector/c real? real? real?) . -> . (sequence/c real?)))]
-          [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-          [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-          [z-min (or/c rational? #f) #f] [z-max (or/c rational? #f) #f]
-          [#:samples samples exact-positive-integer? ( vector-field3d-samples)]
-          [#:scale scale (or/c real? (one-of/c 'auto 'normalized)) (vector-field-scale)]
-          [#:color color plot-color/c (vector-field-color)]
-          [#:line-width line-width (>=/c 0) (vector-field-line-width)]
-          [#:line-style line-style plot-pen-style/c (vector-field-line-style)]
-          [#:alpha alpha (real-in 0 1) (vector-field-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer3d?
-  (let ([f  (cond [(procedure-arity-includes? f 3 #t)
-                   (λ (x y z) (sequence-head-vector 'vector-field3d (f x y z) 3))]
-                  [else
-                   (λ (x y z) (sequence-head-vector 'vector-field3d (f (vector x y z)) 3))])])
-    (renderer3d (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max)) #f default-ticks-fun
-                (vector-field3d-render-fun f samples scale color line-width line-style alpha label))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/rectangle.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/rectangle.rkt
deleted file mode 100644
index 265c442bd0..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/rectangle.rkt
+++ /dev/null
@@ -1,190 +0,0 @@
-#lang racket/base
-
-;; Functions to create renderers for 3D histograms
-
-(require racket/match racket/list racket/contract racket/class racket/sequence
-         unstable/latent-contract/defthing
-         unstable/contract
-         plot/utils
-         "../common/utils.rkt")
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Rectangles
-
-(define ((rectangles3d-render-proc rects color style line-color line-width line-style alpha label)
-         area)
-  (send area put-pen line-color line-width line-style)
-  (send area put-brush color style)
-  (send area put-alpha alpha)
-  (for ([rect  (in-list rects)])
-    (send area put-rect rect))
-  
-  (cond [label  (rectangle-legend-entry label color style line-color line-width line-style)]
-        [else  empty]))
-
-(defproc (rectangles3d
-          [rects  (sequence/c (sequence/c #:min-count 3 ivl?))]
-          [#:x-min x-min (or/c rational? #f) #f] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) #f] [#:y-max y-max (or/c rational? #f) #f]
-          [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-          [#:color color plot-color/c (rectangle-color)]
-          [#:style style plot-brush-style/c (rectangle-style)]
-          [#:line-color line-color plot-color/c (rectangle-line-color)]
-          [#:line-width line-width (>=/c 0) (rectangle3d-line-width)]
-          [#:line-style line-style plot-pen-style/c (rectangle-line-style)]
-          [#:alpha alpha (real-in 0 1) (rectangle-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer3d?
-  (let ([rects  (sequence->listof-vector 'rectangles3d rects 3)])
-    (match-define (list (vector (ivl x1s x2s) (ivl y1s y2s) (ivl z1s z2s)) ...) rects)
-    (define rxs (filter rational? (append x1s x2s)))
-    (define rys (filter rational? (append y1s y2s)))
-    (define rzs (filter rational? (append z1s z2s)))
-    (cond
-      [(or (empty? rxs) (empty? rys) (empty? rzs))  (renderer3d #f #f #f #f)]
-      [else
-       (let ([x-min  (if x-min x-min (apply min* rxs))]
-             [x-max  (if x-max x-max (apply max* rxs))]
-             [y-min  (if y-min y-min (apply min* rys))]
-             [y-max  (if y-max y-max (apply max* rys))]
-             [z-min  (if z-min z-min (apply min* rzs))]
-             [z-max  (if z-max z-max (apply max* rzs))])
-         (renderer3d (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max)) #f
-                     default-ticks-fun
-                     (rectangles3d-render-proc rects color style line-color line-width line-style
-                                               alpha label)))])))
-
-;; ===================================================================================================
-;; Discrete histograms
-
-(define ((discrete-histogram3d-ticks-fun
-          c1s c2s tick-xs tick-ys add-x-ticks? add-y-ticks? x-far-ticks? y-far-ticks?) r)
-  (match-define (vector _xi _yi (ivl z-min z-max)) r)
-  (define-values (x-ticks x-far-ticks)
-    (let ([ts  (cond [add-x-ticks?  (for/list ([cat  (in-list c1s)] [x  (in-list tick-xs)])
-                                      (tick x #t (->plot-label cat)))]
-                     [else  empty])])
-      (if x-far-ticks? (values empty ts) (values ts empty))))
-  (define-values (y-ticks y-far-ticks)
-    (let ([ts  (cond [add-y-ticks?  (for/list ([cat  (in-list c2s)] [y  (in-list tick-ys)])
-                                      (tick y #t (->plot-label cat)))]
-                     [else  empty])])
-      (if y-far-ticks? (values empty ts) (values ts empty))))
-  (values x-ticks x-far-ticks
-          y-ticks y-far-ticks
-          ((plot-z-ticks) z-min z-max) ((plot-z-far-ticks) z-min z-max)))
-
-(define (adjust/gap i gap)
-  (match-define (ivl x1 x2) i)
-  (define 1/2-gap-size (* 1/2 gap (- x2 x1)))
-  (ivl (+ x1 1/2-gap-size) (- x2 1/2-gap-size)))
-
-(defproc (discrete-histogram3d
-          [cat-vals (sequence/c (or/c (vector/c any/c any/c (or/c real? ivl? #f))
-                                      (list/c any/c any/c (or/c real? ivl? #f))))]
-          [#:x-min x-min (or/c rational? #f) 0] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) 0] [#:y-max y-max (or/c rational? #f) #f]
-          [#:z-min z-min (or/c rational? #f) 0] [#:z-max z-max (or/c rational? #f) #f]
-          [#:gap gap (real-in 0 1) (discrete-histogram-gap)]
-          [#:color color plot-color/c (rectangle-color)]
-          [#:style style plot-brush-style/c (rectangle-style)]
-          [#:line-color line-color plot-color/c (rectangle-line-color)]
-          [#:line-width line-width (>=/c 0) (rectangle3d-line-width)]
-          [#:line-style line-style plot-pen-style/c (rectangle-line-style)]
-          [#:alpha alpha (real-in 0 1) (rectangle-alpha)]
-          [#:label label (or/c string? #f) #f]
-          [#:add-x-ticks? add-x-ticks? boolean? #t]
-          [#:add-y-ticks? add-y-ticks? boolean? #t]
-          [#:x-far-ticks? x-far-ticks? boolean? #f]
-          [#:y-far-ticks? y-far-ticks? boolean? #f]
-          ) renderer3d?
-  (let ([cat-vals  (sequence->list cat-vals)])
-    (match-define (list (or (vector cat1s cat2s zs) (list cat1s cat2s zs)) ...) cat-vals)
-    (define rzs (filter rational? (append* (for/list ([z  (in-list zs)])
-                                             (match z
-                                               [(ivl z1 z2)  (list z1 z2)]
-                                               [_            (list z)])))))
-    (cond
-      [(empty? rzs)  (renderer3d #f #f #f #f)]
-      [else
-       (define c1s (remove-duplicates cat1s))
-       (define c2s (remove-duplicates cat2s))
-       (define x-num (length c1s))
-       (define y-num (length c2s))
-       (let* ([x-min  (if x-min x-min 0)]
-              [x-max  (if x-max x-max (+ x-min x-num))]
-              [y-min  (if y-min y-min 0)]
-              [y-max  (if y-max y-max (+ y-min y-num))]
-              [z-min  (if z-min z-min (apply min* rzs))]
-              [z-max  (if z-max z-max (apply max* rzs))])
-         (define xs (linear-seq x-min x-max (add1 x-num)))
-         (define ys (linear-seq y-min y-max (add1 y-num)))
-         (define h (make-hash (for/list ([c1 (in-list cat1s)] [c2 (in-list cat2s)] [z (in-list zs)])
-                                (cons (cons c1 c2) z))))
-         (match-define (list (vector x1s x2s y1s y2s all-zs) ...)
-           (for/list ([y1  (in-list ys)]
-                      [y2  (in-list (rest ys))]
-                      [c2  (in-list c2s)]
-                      #:when #t
-                      [x1  (in-list xs)]
-                      [x2  (in-list (rest xs))]
-                      [c1  (in-list c1s)])
-             (vector x1 x2 y1 y2 (hash-ref h (cons c1 c2) +nan.0))))
-         (define tick-xs (linear-seq x-min x-max x-num #:start? #f #:end? #f))
-         (define tick-ys (linear-seq y-min y-max y-num #:start? #f #:end? #f))
-         (define rects (map (λ (x1 x2 y1 y2 z)
-                              (vector (adjust/gap (ivl x1 x2) gap)
-                                      (adjust/gap (ivl y1 y2) gap)
-                                      (if (ivl? z) z (ivl 0 z))))
-                            x1s x2s y1s y2s all-zs))
-         (renderer3d
-          (vector (ivl x-min x-max) (ivl y-min y-max) (ivl z-min z-max)) #f
-          (discrete-histogram3d-ticks-fun c1s c2s tick-xs tick-ys
-                                          add-x-ticks? add-y-ticks? x-far-ticks? y-far-ticks?)
-          (rectangles3d-render-proc rects color style line-color line-width line-style
-                                    alpha label)))])))
-
-(defproc (stacked-histogram3d
-          [cat-vals (sequence/c (or/c (vector/c any/c any/c (sequence/c real?))
-                                      (list/c any/c any/c (sequence/c real?))))]
-          [#:x-min x-min (or/c rational? #f) 0] [#:x-max x-max (or/c rational? #f) #f]
-          [#:y-min y-min (or/c rational? #f) 0] [#:y-max y-max (or/c rational? #f) #f]
-          [#:z-min z-min (or/c rational? #f) 0] [#:z-max z-max (or/c rational? #f) #f]
-          [#:gap gap (real-in 0 1) (discrete-histogram-gap)]
-          [#:colors colors (plot-colors/c nat/c) (stacked-histogram-colors)]
-          [#:styles styles (plot-brush-styles/c nat/c) (stacked-histogram-styles)]
-          [#:line-colors line-colors (plot-colors/c nat/c) (stacked-histogram-line-colors)]
-          [#:line-widths line-widths (pen-widths/c nat/c) (stacked-histogram-line-widths)]
-          [#:line-styles line-styles (plot-pen-styles/c nat/c) (stacked-histogram-line-styles)]
-          [#:alphas alphas (alphas/c nat/c) (stacked-histogram-alphas)]
-          [#:labels labels (labels/c nat/c) '(#f)]
-          [#:add-x-ticks? add-x-ticks? boolean? #t]
-          [#:add-y-ticks? add-y-ticks? boolean? #t]
-          [#:x-far-ticks? x-far-ticks? boolean? #f]
-          [#:y-far-ticks? y-far-ticks? boolean? #f]
-          ) (listof renderer3d?)
-  (let ([cat-vals  (sequence->list cat-vals)])
-    (match-define (list (or (vector cat1s cat2s zs) (list cat1s cat2s zs)) ...) cat-vals)
-    (let ([zs  (map sequence->list zs)])
-      (define zss (map cumulative-sum zs))
-      (define z-ivlss (for/list ([zs  (in-list zss)])
-                        (for/list ([z1  (in-list zs)] [z2  (in-list (rest zs))])
-                          (ivl z1 z2))))
-      (define max-num (apply max (map length zss)))
-      (for/list ([z-ivls  (in-list (transpose z-ivlss))]
-                 [color   (in-cycle* (maybe-apply colors max-num))]
-                 [style   (in-cycle* (maybe-apply styles max-num))]
-                 [line-color  (in-cycle* (maybe-apply line-colors max-num))]
-                 [line-width  (in-cycle* (maybe-apply line-widths max-num))]
-                 [line-style  (in-cycle* (maybe-apply line-styles max-num))]
-                 [alpha   (in-cycle* (maybe-apply alphas max-num))]
-                 [label   (in-cycle* (maybe-apply labels max-num))])
-        (discrete-histogram3d
-         (map vector cat1s cat2s z-ivls)
-         #:x-min x-min #:x-max x-max #:y-min y-min #:y-max y-max #:z-min z-min #:z-max z-max #:gap gap
-         #:color color #:style style #:line-color line-color #:line-width line-width
-         #:line-style line-style #:alpha alpha #:label label
-         #:add-x-ticks? add-x-ticks? #:add-y-ticks? add-y-ticks?
-         #:x-far-ticks? x-far-ticks? #:y-far-ticks? y-far-ticks?)))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/split.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/split.rkt
deleted file mode 100644
index a785cc1a85..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/split.rkt
+++ /dev/null
@@ -1,254 +0,0 @@
-#lang typed/racket/base
-
-(require racket/list
-         racket/flonum)
-
-(provide point3d-plane-dist
-         split-line3d
-         canonical-polygon3d
-         split-polygon3d
-         canonical-lines3d
-         split-lines3d
-         polygon3d-divide
-         polygon3d-triangulate)
-
-;; ===================================================================================================
-
-(: plane-line-intersect (-> Flonum Flonum Flonum Flonum
-                            Flonum Flonum Flonum Flonum Flonum Flonum
-                            (Values Flonum Flonum Flonum)))
-(define (plane-line-intersect a b c d x1 y1 z1 x2 y2 z2)
-  (define dot1 (+ (* a x1) (* b y1) (* c z1)))
-  (define dot2 (+ (* a x2) (* b y2) (* c z2)))
-  (define denom (- dot1 dot2))
-  (if (zero? denom)
-      (values x2 y2 z2)
-      (let ([t  (/ (+ dot1 d) denom)])
-        (values (+ x1 (* t (- x2 x1)))
-                (+ y1 (* t (- y2 y1)))
-                (+ z1 (* t (- z2 z1)))))))
-
-;; ===================================================================================================
-;; Points
-
-(: point3d-plane-dist (-> FlVector FlVector Flonum))
-(define (point3d-plane-dist v plane)
-  (+ (* (flvector-ref plane 0) (flvector-ref v 0))
-     (* (flvector-ref plane 1) (flvector-ref v 1))
-     (* (flvector-ref plane 2) (flvector-ref v 2))
-     (flvector-ref plane 3)))
-
-;; ===================================================================================================
-;; Splitting lines
-
-(: split-line3d (-> FlVector FlVector FlVector FlVector))
-(define (split-line3d v1 v2 plane)
-  (define-values (x y z)
-    (plane-line-intersect
-     (flvector-ref plane 0) (flvector-ref plane 1) (flvector-ref plane 2) (flvector-ref plane 3)
-     (flvector-ref v1 0) (flvector-ref v1 1) (flvector-ref v1 2)
-     (flvector-ref v2 0) (flvector-ref v2 1) (flvector-ref v2 2)))
-  (flvector x y z))
-
-;; ===================================================================================================
-;; Splitting polygons
-
-(: canonical-polygon3d (-> (Listof FlVector) (Listof Boolean)
-                           (Values (Listof FlVector) (Listof Boolean))))
-(define (canonical-polygon3d vs ls)
-  (cond
-    [(empty? vs)  (values vs empty)]
-    [else
-     (define-values (new-vs new-ls)
-       (for/fold ([vs : (Listof FlVector)  empty]
-                  [ls : (Listof Boolean)   empty]
-                  ) ([v1  (in-list (cons (last vs) vs))]
-                     [v2  (in-list vs)]
-                     [l   (in-list ls)])
-         (if (equal? v1 v2)
-             (values vs ls)
-             (values (cons v2 vs) (cons l ls)))))
-     (values (reverse new-vs) (reverse new-ls))]))
-
-(: split-polygon3d (-> (Listof FlVector) (Listof Boolean) FlVector
-                       (Values (Listof FlVector) (Listof Boolean)
-                               (Listof FlVector) (Listof Boolean)
-                               Boolean)))
-(define (split-polygon3d vs ls plane)
-  (define a (flvector-ref plane 0))
-  (define b (flvector-ref plane 1))
-  (define c (flvector-ref plane 2))
-  (define d (flvector-ref plane 3))
-  
-  (: in-bounds? (-> Flonum Flonum Flonum Boolean))
-  (define (in-bounds? x1 y1 z1)
-    ((+ (* a x1) (* b y1) (* c z1) d) . >= . 0.0))
-  
-  (define v1 (last vs))
-  (define x1 (flvector-ref v1 0))
-  (define y1 (flvector-ref v1 1))
-  (define z1 (flvector-ref v1 2))
-  (define v1? (in-bounds? x1 y1 z1))
-  
-  (define-values (vs1 ls1 vs2 ls2 crossings _x1 _y1 _z1 _v1?)
-    (for/fold: ([vs1 : (Listof FlVector)  empty]
-                [ls1 : (Listof Boolean)   empty]
-                [vs2 : (Listof FlVector)  empty]
-                [ls2 : (Listof Boolean)   empty]
-                [crossings : Natural  0]
-                [x1 : Flonum  x1]
-                [y1 : Flonum  y1]
-                [z1 : Flonum  z1]
-                [v1? : Boolean  v1?]
-                ) ([v2  (in-list vs)]
-                   [l   (in-list ls)])
-      (define x2 (flvector-ref v2 0))
-      (define y2 (flvector-ref v2 1))
-      (define z2 (flvector-ref v2 2))
-      (define v2? (in-bounds? x2 y2 z2))
-      (cond
-        [(and v1? v2?)       (values (cons v2 vs1) (cons l ls1) vs2 ls2 crossings x2 y2 z2 v2?)]
-        [(not (or v1? v2?))  (values vs1 ls1 (cons v2 vs2) (cons l ls2) crossings x2 y2 z2 v2?)]
-        [v1?
-         (let-values ([(x y z)  (plane-line-intersect a b c d x1 y1 z1 x2 y2 z2)])
-           (define v (flvector x y z))
-           (values (cons v vs1) (cons l ls1) (list* v2 v vs2) (list* l #f ls2)
-                   (+ crossings 1) x2 y2 z2 v2?))]
-        [else
-         (let-values ([(x y z)  (plane-line-intersect a b c d x1 y1 z1 x2 y2 z2)])
-           (define v (flvector x y z))
-           (values (list* v2 v vs1) (list* l #f ls1) (cons v vs2) (cons l ls2)
-                   (+ crossings 1) x2 y2 z2 v2?))])))
-  
-  (let-values ([(vs1 ls1)  (canonical-polygon3d (reverse vs1) (reverse ls1))]
-               [(vs2 ls2)  (canonical-polygon3d (reverse vs2) (reverse ls2))])
-    (values vs1 ls1 vs2 ls2
-            (crossings . <= . 2))))
-
-;; ===================================================================================================
-;; Splitting connected lines
-
-(: canonical-lines3d (All (A) ((Listof A) -> (Listof A))))
-(define (canonical-lines3d xs)
-  (if (empty? xs)
-      xs
-      (cons (first xs)
-            (for/list: : (Listof A) ([x1  (in-list xs)]
-                                     [x2  (in-list (rest xs))]
-                                     #:unless (equal? x1 x2))
-              x2))))
-
-(: split-lines3d (-> (Listof FlVector) FlVector (Values (Listof (Listof FlVector))
-                                                        (Listof (Listof FlVector)))))
-(define (split-lines3d vs plane)
-  (define a (flvector-ref plane 0))
-  (define b (flvector-ref plane 1))
-  (define c (flvector-ref plane 2))
-  (define d (flvector-ref plane 3))
-  
-  (: in-bounds? (-> Flonum Flonum Flonum Boolean))
-  (define (in-bounds? x1 y1 z1)
-    ((+ (* a x1) (* b y1) (* c z1) d) . >= . 0.0))
-  
-  (define v1 (first vs))
-  (define x1 (flvector-ref v1 0))
-  (define y1 (flvector-ref v1 1))
-  (define z1 (flvector-ref v1 2))
-  (define v1? (in-bounds? x1 y1 z1))
-  
-  (define-values (vss1 vss2 _x1 _y1 _z1 _v1?)
-    (for/fold: ([vss1 : (Listof (Listof FlVector))  (if v1? (list (list v1)) (list empty))]
-                [vss2 : (Listof (Listof FlVector))  (if v1? (list empty) (list (list v1)))]
-                [x1 : Flonum  x1]
-                [y1 : Flonum  y1]
-                [z1 : Flonum  z1]
-                [v1? : Boolean  v1?]
-                ) ([v2  (in-list (rest vs))])
-      (define x2 (flvector-ref v2 0))
-      (define y2 (flvector-ref v2 1))
-      (define z2 (flvector-ref v2 2))
-      (define v2? (in-bounds? x2 y2 z2))
-      (cond
-        [(and v1? v2?)       (values (cons (cons v2 (first vss1)) (rest vss1)) vss2 x2 y2 z2 v2?)]
-        [(not (or v1? v2?))  (values vss1 (cons (cons v2 (first vss2)) (rest vss2)) x2 y2 z2 v2?)]
-        [v1?
-         (define-values (x y z) (plane-line-intersect a b c d x1 y1 z1 x2 y2 z2))
-         (define v (flvector x y z))
-         (values (cons (cons v (first vss1)) (rest vss1))
-                 (cons (list v2 v) vss2)
-                 x2 y2 z2 v2?)]
-        [else
-         (define-values (x y z) (plane-line-intersect a b c d x1 y1 z1 x2 y2 z2))
-         (define v (flvector x y z))
-         (values (cons (list v2 v) vss1)
-                 (cons (cons v (first vss2)) (rest vss2))
-                 x2 y2 z2 v2?)])))
-  
-  (values (map (inst canonical-lines3d FlVector) (filter (compose not empty?) vss1))
-          (map (inst canonical-lines3d FlVector) (filter (compose not empty?) vss2))))
-
-;; ===================================================================================================
-;; Dividing and triangulating polygons
-
-(: polygon3d-divide (-> (Listof FlVector) (Listof Boolean)
-                        (Values (Listof FlVector) (Listof Boolean)
-                                (Listof FlVector) (Listof Boolean))))
-(define (polygon3d-divide vs-list ls-list)
-  ;(printf "vs-list = ~v~n" vs-list)
-  (define n (length vs-list))
-  (cond
-    [(<= n 3)  (values vs-list ls-list empty empty)]
-    [else
-     (define vs (list->vector vs-list))
-     (define ls (list->vector ls-list))
-     (define n/2 (quotient n 2))
-     
-     (define opposite (λ ([i1 : Fixnum]) (modulo (+ i1 n/2) n)))
-     
-     (define opposite-dist
-       (λ ([i1 : Fixnum])
-         (define v1 (vector-ref vs i1))
-         (define v2 (vector-ref vs (opposite i1)))
-         (define x (- (flvector-ref v2 0) (flvector-ref v1 0)))
-         (define y (- (flvector-ref v2 1) (flvector-ref v1 1)))
-         (define z (- (flvector-ref v2 2) (flvector-ref v1 2)))
-         (+ (* x x) (* y y) (* z z))))
-     
-     (define-values (i1 _)
-       (for/fold ([best-i : Fixnum  0]
-                  [best-dist : Flonum  (opposite-dist 0)]
-                  ) ([i1 : Positive-Fixnum  (in-range 1 n)])
-         (define dist (opposite-dist i1))
-         (if (dist . < . best-dist)
-             (values i1 dist)
-             (values best-i best-dist))))
-     
-     (define i2 (opposite i1))
-     
-     (: extract (-> Fixnum Fixnum (Values (Listof FlVector) (Listof Boolean))))
-     (define (extract i1 i2)
-       (let loop ([i i2] [new-vs : (Listof FlVector)  empty]
-                         [new-ls : (Listof Boolean)   empty])
-         (cond [(= i i1)  (values (reverse (cons (vector-ref vs i) new-vs))
-                                  (reverse (cons (vector-ref ls i) new-ls)))]
-               [else
-                (loop (modulo (+ i 1) n)
-                      (cons (vector-ref vs i) new-vs)
-                      (cons (if (= i i2) #f (vector-ref ls i)) new-ls))])))
-     
-     (define-values (vs1 ls1) (extract i1 i2))
-     (define-values (vs2 ls2) (extract i2 i1))
-     (values vs1 ls1 vs2 ls2)]))
-
-(: polygon3d-triangulate (-> (Listof FlVector) (Listof Boolean)
-                             (Values (Listof (Listof FlVector)) (Listof (Listof Boolean)))))
-(define (polygon3d-triangulate vs ls)
-  (if (empty? vs)
-      (values empty empty)
-      (let loop ([vs vs] [ls ls])
-        (define-values (vs1 ls1 vs2 ls2) (polygon3d-divide vs ls))
-        (cond [(empty? vs2)  (values (list vs1) (list ls1))]
-              [else
-               (define-values (vss1 lss1) (polygon3d-triangulate vs1 ls1))
-               (define-values (vss2 lss2) (polygon3d-triangulate vs2 ls2))
-               (values (append vss1 vss2) (append lss1 lss2))]))))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/surface.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/surface.rkt
deleted file mode 100644
index ca00ac0190..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/surface.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/match racket/list racket/contract
-         unstable/latent-contract/defthing
-         plot/utils)
-
-(provide (all-defined-out))
-
-;; ===================================================================================================
-;; Surface plots of R R -> R functions
-
-(define ((surface3d-render-proc f samples color style line-color line-width line-style alpha label)
-         area)
-  (match-define (vector x-ivl y-ivl z-ivl) (send area get-bounds-rect))
-  (define num (animated-samples samples))
-  (define sample (f (vector x-ivl y-ivl) (vector num num)))
-  
-  (match-define (ivl x-min x-max) x-ivl)
-  (match-define (ivl y-min y-max) y-ivl)
-  (match-define (ivl z-min z-max) z-ivl)
-
-  (send area put-alpha alpha)
-  (send area put-brush color style)
-  (send area put-pen line-color line-width line-style)
-  (for-2d-sample
-   (xa xb ya yb z1 z2 z3 z4) sample
-   (define vs (list (vector xa ya z1) (vector xb ya z2) (vector xb yb z3) (vector xa yb z4)))
-   (send area put-polygon vs))
-  
-  (cond [label  (rectangle-legend-entry label color style line-color line-width line-style)]
-        [else   empty]))
-
-(defproc (surface3d
-          [f (real? real? . -> . real?)]
-          [x-min (or/c rational? #f) #f] [x-max (or/c rational? #f) #f]
-          [y-min (or/c rational? #f) #f] [y-max (or/c rational? #f) #f]
-          [#:z-min z-min (or/c rational? #f) #f] [#:z-max z-max (or/c rational? #f) #f]
-          [#:samples samples (and/c exact-integer? (>=/c 2)) (plot3d-samples)]
-          [#:color color plot-color/c (surface-color)]
-          [#:style style plot-brush-style/c (surface-style)]
-          [#:line-color line-color plot-color/c (surface-line-color)]
-          [#:line-width line-width (>=/c 0) (surface-line-width)]
-          [#:line-style line-style plot-pen-style/c (surface-line-style)]
-          [#:alpha alpha (real-in 0 1) (surface-alpha)]
-          [#:label label (or/c string? #f) #f]
-          ) renderer3d?
-  (define x-ivl (ivl x-min x-max))
-  (define y-ivl (ivl y-min y-max))
-  (define z-ivl (ivl z-min z-max))
-  (define g (2d-function->sampler f (vector x-ivl y-ivl)))
-  (renderer3d (vector x-ivl y-ivl z-ivl)
-              (surface3d-bounds-fun g samples)
-              default-ticks-fun
-              (surface3d-render-proc g samples color style
-                                     line-color line-width line-style alpha label)))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/vector.rkt b/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/vector.rkt
deleted file mode 100644
index 026a1b9f5b..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/private/plot3d/vector.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         racket/list
-         (only-in math/flonum fl flvector+ flvector-)
-         (only-in racket/unsafe/ops unsafe-vector-ref)
-         racket/flonum)
-
-(provide m3-apply m3-transpose m3* m3-rotate-z m3-rotate-x
-         flv3-dot
-         flv3-normal
-         flv3-center
-         exact-vector3d
-         exact-vector3d-sublists
-         exact-polygon3d)
-
-(define-syntax-rule (dot x1 y1 z1 x2 y2 z2) (fl+ (fl+ (fl* x1 x2) (fl* y1 y2)) (fl* z1 z2)))
-
-(define (m3-apply m v)
-  (match-define (vector v1 v2 v3) m)
-  (define x (flvector-ref v 0))
-  (define y (flvector-ref v 1))
-  (define z (flvector-ref v 2))
-  (flvector (dot x y z (flvector-ref v1 0) (flvector-ref v1 1) (flvector-ref v1 2))
-            (dot x y z (flvector-ref v2 0) (flvector-ref v2 1) (flvector-ref v2 2))
-            (dot x y z (flvector-ref v3 0) (flvector-ref v3 1) (flvector-ref v3 2))))
-
-(define (m3-transpose m)
-  (match-define (vector v1 v2 v3) m)
-  (vector (flvector (flvector-ref v1 0) (flvector-ref v2 0) (flvector-ref v3 0))
-          (flvector (flvector-ref v1 1) (flvector-ref v2 1) (flvector-ref v3 1))
-          (flvector (flvector-ref v1 2) (flvector-ref v2 2) (flvector-ref v3 2))))
-
-(define (m3* m1 m2)
-  (match-define (vector v1 v2 v3) m1)
-  (define m (m3-transpose m2))
-  (vector (m3-apply m v1) (m3-apply m v2) (m3-apply m v3)))
-
-(define (m3-rotate-z theta)
-  (let ([theta  (fl theta)])
-    (define cos-theta (flcos theta))
-    (define sin-theta (flsin theta))
-    (vector (flvector cos-theta (- sin-theta) 0.0)
-            (flvector sin-theta cos-theta 0.0)
-            (flvector 0.0 0.0 1.0))))
-
-(define (m3-rotate-x rho)
-  (let ([rho  (fl rho)])
-    (define cos-rho (flcos rho))
-    (define sin-rho (flsin rho))
-    (vector (flvector 1.0 0.0 0.0)
-            (flvector 0.0 cos-rho (- sin-rho))
-            (flvector 0.0 sin-rho cos-rho))))
-
-(define (flv3-dot v1 v2)
-  (fl+ (fl* (flvector-ref v1 0)
-            (flvector-ref v2 0))
-       (fl+ (fl* (flvector-ref v1 1)
-                 (flvector-ref v2 1))
-            (fl* (flvector-ref v1 2)
-                 (flvector-ref v2 2)))))
-
-(define default-normal (flvector 0.0 -1.0 0.0))
-
-(define (flv3-normal vs)
-  (define n (length vs))
-  (cond
-    [(n . < . 3)  default-normal]
-    [else
-     (match-define (list v1 v2) (take-right vs 2))
-     (define x1 (flvector-ref v1 0))
-     (define y1 (flvector-ref v1 1))
-     (define z1 (flvector-ref v1 2))
-     (define x2 (flvector-ref v2 0))
-     (define y2 (flvector-ref v2 1))
-     (define z2 (flvector-ref v2 2))
-     (define-values (x y z _x1 _y1 _z1 _x2 _y2 _z2)
-       (for/fold ([x 0.0] [y 0.0] [z 0.0] [x1 x1] [y1 y1] [z1 z1] [x2 x2] [y2 y2] [z2 z2]
-                          ) ([v3  (in-list vs)])
-         (define x3 (flvector-ref v3 0))
-         (define y3 (flvector-ref v3 1))
-         (define z3 (flvector-ref v3 2))
-         (define x32 (fl- x3 x2))
-         (define y32 (fl- y3 y2))
-         (define z32 (fl- z3 z2))
-         (define x12 (fl- x1 x2))
-         (define y12 (fl- y1 y2))
-         (define z12 (fl- z1 z2))
-         (values (+ x (fl- (fl* y32 z12) (fl* z32 y12)))
-                 (+ y (fl- (fl* z32 x12) (fl* x32 z12)))
-                 (+ z (fl- (fl* x32 y12) (fl* y32 x12)))
-                 x2 y2 z2
-                 x3 y3 z3)))
-     (define m (flsqrt (fl+ (fl* x x) (fl+ (fl* y y) (fl* z z)))))
-     (if (fl> m 0.0)
-         (flvector (fl/ x m) (fl/ y m) (fl/ z m))
-         default-normal)]))
-
-(define (flv3-center vs)
-  (define xs (map (λ (v) (flvector-ref v 0)) vs))
-  (define ys (map (λ (v) (flvector-ref v 1)) vs))
-  (define zs (map (λ (v) (flvector-ref v 2)) vs))
-  (flvector (* 0.5 (+ (apply min xs) (apply max xs)))
-            (* 0.5 (+ (apply min ys) (apply max ys)))
-            (* 0.5 (+ (apply min zs) (apply max zs)))))
-
-(define (exact-vector3d v)
-  (define n (vector-length v))
-  (cond [(= n 3)
-         (define v1 (unsafe-vector-ref v 0))
-         (define v2 (unsafe-vector-ref v 1))
-         (define v3 (unsafe-vector-ref v 2))
-         (cond [(and (exact? v1) (exact? v2) (exact? v3))  v]
-               [(and (rational? v1) (rational? v2) (rational? v3))
-                (vector (inexact->exact v1) (inexact->exact v2) (inexact->exact v3))]
-               [else  #f])]
-        [else  #f]))
-
-(define (sublists vs)
-  (define vss
-    (for/fold ([vss  (list null)]) ([v  (in-list vs)])
-      (cond [v  (cons (cons v (car vss)) (cdr vss))]
-            [(null? (car vss))  vss]
-            [else  (cons null vss)])))
-  (cond [(null? (car vss))  (cdr vss)]
-        [else  vss]))
-
-(define (exact-vector3d-sublists vs)
-  (sublists (map exact-vector3d vs)))
-
-(define (exact-polygon3d vs ls)
-  (cond
-    [(null? vs)  (values null null)]
-    [else
-     (define-values (new-vs new-ls _)
-       (for/fold ([vs null] [ls null] [v1 (last vs)]) ([v2  (in-list vs)]
-                                                       [l   (in-list ls)])
-         (cond [(equal? v1 v2)  (values vs ls v2)]
-               [else
-                (define exact-v2 (exact-vector3d v2))
-                (if exact-v2
-                    (values (cons exact-v2 vs) (cons l ls) v2)
-                    (values vs ls v2))])))
-     (values (reverse new-vs) (reverse new-ls))]))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/bitmap.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/bitmap.rkt
deleted file mode 100644
index c3393b2a3f..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/bitmap.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket/base
-
-(require "no-gui.rkt"
-         "private/no-gui/plot-bitmap.rkt")
-
-(provide (all-from-out
-          "no-gui.rkt"
-          "private/no-gui/plot-bitmap.rkt"))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/no-gui.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/no-gui.rkt
deleted file mode 100644
index 1d9c785ff3..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/no-gui.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang typed/racket/base
-
-;; Every require/provide pair in this file corresponds with a require/provide pair in plot/no-gui
-
-;; ===================================================================================================
-;; General exports
-
-(require (except-in "private/common/types.rkt" Pict))
-(provide (all-from-out "private/common/types.rkt"))
-
-(require "private/contracted/parameters.rkt")
-(provide (all-from-out "private/contracted/parameters.rkt"))
-
-;; Not necessary because re-exporting "types.rkt" exports the `ivl' struct
-;(require "private/contracted/math.rkt")
-;(provide (struct-out ivl))
-
-(require "private/contracted/axis-transform.rkt")
-(provide (all-from-out "private/contracted/axis-transform.rkt"))
-
-(require "private/contracted/ticks.rkt")
-(provide (all-from-out "private/contracted/ticks.rkt"))
-
-(require "private/contracted/date-time.rkt")
-(provide plot-time->seconds seconds->plot-time datetime->real)
-
-(require "private/common/nonrenderers.rkt")
-(provide (all-from-out "private/common/nonrenderers.rkt"))
-
-;; ===================================================================================================
-;; 2D exports
-
-(require "private/no-gui/plot2d.rkt")
-(provide (all-from-out "private/no-gui/plot2d.rkt"))
-
-(require "private/plot2d/point.rkt")
-(provide (all-from-out "private/plot2d/point.rkt"))
-
-(require "private/plot2d/line.rkt")
-(provide (all-from-out "private/plot2d/line.rkt"))
-
-(require "private/plot2d/interval.rkt")
-(provide (all-from-out "private/plot2d/interval.rkt"))
-
-(require "private/plot2d/contour.rkt")
-(provide (all-from-out "private/plot2d/contour.rkt"))
-
-(require "private/plot2d/rectangle.rkt")
-(provide (all-from-out "private/plot2d/rectangle.rkt"))
-
-(require "private/plot2d/decoration.rkt")
-(provide (all-from-out "private/plot2d/decoration.rkt"))
-
-;; ===================================================================================================
-;; 3D exports
-
-(require "private/no-gui/plot3d.rkt")
-(provide (all-from-out "private/no-gui/plot3d.rkt"))
-
-(require "private/plot3d/surface.rkt")
-(provide (all-from-out "private/plot3d/surface.rkt"))
-
-(require "private/plot3d/contour.rkt")
-(provide (all-from-out "private/plot3d/contour.rkt"))
-
-(require "private/plot3d/line.rkt")
-(provide (all-from-out "private/plot3d/line.rkt"))
-
-(require "private/plot3d/point.rkt")
-(provide (all-from-out "private/plot3d/point.rkt"))
-
-(require "private/plot3d/isosurface.rkt")
-(provide (all-from-out "private/plot3d/isosurface.rkt"))
-
-(require "private/plot3d/rectangle.rkt")
-(provide (all-from-out "private/plot3d/rectangle.rkt"))
-
-(require "private/plot3d/decoration.rkt")
-(provide (all-from-out "private/plot3d/decoration.rkt"))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/pict.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/pict.rkt
deleted file mode 100644
index 0d046513a7..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/pict.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket/base
-
-(require "no-gui.rkt"
-         "private/no-gui/plot-pict.rkt")
-
-(provide (all-from-out
-          "no-gui.rkt"
-          "private/no-gui/plot-pict.rkt"))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/common/nonrenderers.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/common/nonrenderers.rkt
deleted file mode 100644
index ee5382d793..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/common/nonrenderers.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang typed/racket/base
-
-(require "types.rkt")
-
-(require/typed/provide
- plot/no-gui
- [x-ticks ((Listof tick) [#:far? Boolean] -> nonrenderer)]
- [y-ticks ((Listof tick) [#:far? Boolean] -> nonrenderer)]
- [z-ticks ((Listof tick) [#:far? Boolean] -> nonrenderer)]
- 
- [invisible-rect ((Option Real)
-                  (Option Real)
-                  (Option Real)
-                  (Option Real)
-                  -> nonrenderer)]
- 
- [invisible-rect3d ((Option Real)
-                    (Option Real)
-                    (Option Real)
-                    (Option Real)
-                    (Option Real)
-                    (Option Real)
-                    -> nonrenderer)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/common/types.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/common/types.rkt
deleted file mode 100644
index 988dbf4260..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/common/types.rkt
+++ /dev/null
@@ -1,164 +0,0 @@
-#lang typed/racket/base
-
-(require (for-syntax racket/base)
-         (only-in typed/mred/mred Color%))
-
-(require/typed
- pict
- [#:opaque Pict pict?])
-
-(provide (all-defined-out)
-         Pict)
-
-(define-type (Treeof A) (Rec T (U A (Listof T))))
-
-(define-type Plot-Device% (Class))
-(define-type 2D-Plot-Area% (Class))
-(define-type 3D-Plot-Area% (Class))
-
-;; ===================================================================================================
-;; Struct types
-
-(require/typed/provide
- plot/private/common/plot-device
- [plot-device%  Plot-Device%])
-
-(require/typed/provide
- plot/private/plot2d/plot-area
- [2d-plot-area%  2D-Plot-Area%])
-
-(require/typed/provide
- plot/private/plot3d/plot-area
- [3d-plot-area%  3D-Plot-Area%])
-
-(require-typed-struct/provide
- mapped-function
- ([f    : (Any -> Any)]
-  [fmap : ((Listof Any) -> (Listof Any))])
- plot/utils)
-
-(require-typed-struct/provide
- ivl
- ([min : (Option Real)] [max : (Option Real)])
- plot/private/common/math)
-
-(require-typed-struct/provide
- plot-time
- ([second : Nonnegative-Integer]
-  [minute : Nonnegative-Integer]
-  [hour   : Nonnegative-Integer]
-  [day    : Integer])
- plot/private/common/date-time)
-
-(require-typed-struct/provide
- invertible-function
- ([f : (Real -> Real)] [g : (Real -> Real)])
- plot/private/common/axis-transform)
-
-(require-typed-struct/provide
- pre-tick
- ([value  : Real] [major? : Boolean])
- plot/private/common/ticks)
-
-(require-typed-struct/provide
- (tick pre-tick)
- ([label : String])
- plot/private/common/ticks)
-
-(define-type Ticks-Layout (Real Real -> (Listof pre-tick)))
-(define-type Ticks-Format (Real Real (Listof pre-tick) -> (Listof String)))
-
-(require-typed-struct/provide
- ticks
- ([layout : Ticks-Layout]
-  [format : Ticks-Format])
- plot/private/common/ticks)
-
-(require-typed-struct/provide
- legend-entry
- ([label : String]
-  [draw  : ((Instance Plot-Device%) Real Real -> Void)])
- plot/private/common/legend)
-
-(define-type Bounds-Fun ((Vectorof ivl) -> (Vectorof ivl)))
-(define-type Ticks-Fun ((Vectorof ivl) -> Any))
-
-(require-typed-struct/provide
- plot-element
- ([bounds-rect : (Option (Vectorof ivl))]
-  [bounds-fun  : (Option Bounds-Fun)]
-  [ticks-fun   : (Option Ticks-Fun)])
- plot/private/common/plot-element)
-
-(require-typed-struct/provide
- (nonrenderer plot-element)
- ()
- plot/private/common/plot-element)
-
-(require-typed-struct/provide
- (renderer2d plot-element)
- ([render-proc : (Option ((Instance 2D-Plot-Area%) -> (Treeof legend-entry)))])
- plot/private/common/plot-element)
-
-(require-typed-struct/provide
- (renderer3d plot-element)
- ([render-proc : (Option ((Instance 3D-Plot-Area%) -> (Treeof legend-entry)))])
- plot/private/common/plot-element)
-
-;; ===================================================================================================
-;; Styles and colors
-
-(require (for-syntax (only-in plot/private/common/contract known-point-symbols)))
-
-(define-syntax (define-point-sym-type stx)
-  (syntax-case stx ()
-    [(_ name)
-     (with-syntax ([(point-sym-types ...)  (map (λ (sym) `',sym) known-point-symbols)])
-       (syntax/loc stx
-         (define-type name (U point-sym-types ...))))]))
-
-(define-point-sym-type Point-Sym)
-
-(define-type Anchor
-  (U 'top-left 'top 'top-right
-     'left 'center 'right
-     'bottom-left 'bottom 'bottom-right))
-
-(define-type Font-Family
-  (U 'default 'decorative 'roman 'script 
-     'swiss 'modern 'symbol 'system))
-
-(define-type Color
-  (U (List Real Real Real) String Symbol (Instance Color%)))
-
-(define-type Plot-Color
-  (U Integer Color))
-
-(define-type Plot-Brush-Style
-  (U Integer 'transparent 'solid
-     'bdiagonal-hatch 'fdiagonal-hatch 'crossdiag-hatch
-     'horizontal-hatch 'vertical-hatch 'cross-hatch))
-
-(define-type Plot-Pen-Style 
-  (U Integer 'transparent 'solid 'dot 'long-dash 'short-dash 'dot-dash))
-
-(define-type (Maybe-Function In Out) (U Out (In -> Out)))
-
-(define-type (Plot-Colors In) (Maybe-Function In (Listof Plot-Color)))
-(define-type (Plot-Pen-Styles In) (Maybe-Function In (Listof Plot-Pen-Style)))
-(define-type (Pen-Widths In) (Maybe-Function In (Listof Real)))
-(define-type (Plot-Brush-Styles In) (Maybe-Function In (Listof Plot-Brush-Style)))
-(define-type (Alphas In) (Maybe-Function In (Listof Real)))
-(define-type (Labels In) (Maybe-Function In (Listof (Option String))))
-
-;; ===================================================================================================
-;; Other argument and parameter types
-
-(define-type Image-File-Format
-  (U 'png 'jpeg 
-     'xmb 'xpm 'bmp 
-     'ps 'pdf 'svg))
-
-(define-type Axis-Transform (Real Real invertible-function -> invertible-function))
-
-(define-type Contour-Levels (U 'auto Positive-Integer (Listof Real)))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/axis-transform.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/axis-transform.rkt
deleted file mode 100644
index 699180055b..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/axis-transform.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt")
-
-(require/typed/provide
- plot/private/contracted/axis-transform
- 
- [id-function invertible-function]
- [invertible-compose (invertible-function invertible-function -> invertible-function)]
- [invertible-inverse (invertible-function -> invertible-function)]
- 
- [id-transform Axis-Transform]
- [apply-axis-transform (Axis-Transform Real Real -> invertible-function)]
- [make-axis-transform (invertible-function -> Axis-Transform)]
- [axis-transform-compose (Axis-Transform Axis-Transform -> Axis-Transform)]
- [axis-transform-append (Axis-Transform Axis-Transform Real -> Axis-Transform)]
- [axis-transform-bound (Axis-Transform Real Real -> Axis-Transform)]
-
- [log-transform Axis-Transform]
- [cbrt-transform Axis-Transform]
- [hand-drawn-transform (Real -> Axis-Transform)]
- [stretch-transform (Real Real Real -> Axis-Transform)]
- [collapse-transform (Real Real -> Axis-Transform)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/date-time.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/date-time.rkt
deleted file mode 100644
index b5a7bee03c..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/date-time.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt")
-
-(require/typed/provide
- plot/private/contracted/date-time
- #;
- [datetime->real ((U plot-time Date Date* SQL-Date SQL-Time SQL-Timestamp)
-                  -> Real)]
- 
- [datetime->real (plot-time -> Real)]
- [plot-time->seconds (plot-time -> Real)]
- [seconds->plot-time (Real -> plot-time)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/draw.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/draw.rkt
deleted file mode 100644
index 42da125f1f..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/draw.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt")
-
-(require/typed/provide
- plot/private/contracted/draw
- [->color (Color -> (List Real Real Real))]
- [->pen-color (Plot-Color -> (List Real Real Real))]
- [->brush-color (Plot-Color -> (List Real Real Real))]
- [->pen-style (Plot-Pen-Style -> Symbol)]
- [->brush-style (Plot-Brush-Style -> Symbol)]
- 
- [color-seq (Color Color Integer [#:start? Boolean] [#:end? Boolean] 
-                   -> (Listof (List Real Real Real)))]
- 
- [color-seq* ((Listof Color) Integer [#:start? Boolean] [#:end? Boolean]
-                             -> (Listof (List Real Real Real)))]
- 
- [alpha-expt (Real Real -> Real)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/format.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/format.rkt
deleted file mode 100644
index fa2ec8a80c..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/format.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt")
-
-(require/typed/provide
- plot/private/contracted/format
- 
- [integer->superscript (Integer -> String)]
- 
- [digits-for-range (case-> (Real Real -> Integer)
-                           (Real Real Integer -> Integer)
-                           (Real Real Integer Integer -> Integer))]
- 
- [real->decimal-string* (case-> (Real Integer -> String)
-                                (Real Integer Integer -> String))]
- 
- [real->string/trunc (Real Integer -> String)]
- 
- [real->plot-label (case-> (Real Integer -> Any)
-                           (Real Integer Boolean -> Any))]
- 
- [ivl->plot-label (case-> (ivl -> String)
-                          (ivl Integer -> String))]
- 
- [->plot-label (case-> (Any -> String)
-                       (Any Integer -> String))]
- 
- [parse-format-string (String -> (Listof (U String Symbol)))]
- 
- [apply-formatter (All (T) ((Symbol T -> (U String #f)) (Listof (U String Symbol)) T
-                                                        -> (Listof String)))]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/kde.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/kde.rkt
deleted file mode 100644
index ce4b58b0fd..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/kde.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt")
-
-(require/typed/provide
- plot/private/contracted/kde
- [kde  (case-> ((Listof Real) Real
-                              -> (Values mapped-function (Option Real) (Option Real)))
-               ((Listof Real) Real (U (Listof Real) #f)
-                              -> (Values mapped-function (Option Real) (Option Real))))]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/math.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/math.rkt
deleted file mode 100644
index f80012b182..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/math.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt")
-
-;; Misc
-(require/typed/provide
- plot/private/common/math
- [polar->cartesian  (Real Real -> (Vector Real Real))]
- [3d-polar->3d-cartesian  (Real Real Real -> (Vector Real Real Real))]
- [ceiling-log/base  (Integer Real -> Integer)]
- [floor-log/base  (Integer Real -> Integer)]
- [maybe-inexact->exact  ((U #f Real) -> (U #f Real))]
- )
-
-;; Vectors
-(require/typed/provide
- plot/private/common/math
- [v+  ((Vectorof Real) (Vectorof Real) -> (Vectorof Real))]
- [v-  ((Vectorof Real) (Vectorof Real) -> (Vectorof Real))]
- [vneg  ((Vectorof Real) -> (Vectorof Real))]
- [v*  ((Vectorof Real) Real -> (Vectorof Real))]
- [v/  ((Vectorof Real) Real -> (Vectorof Real))]
- [v=  ((Vectorof Real) (Vectorof Real) -> Boolean)]
- [vcross  ((Vectorof Real) (Vectorof Real) -> (Vectorof Real))]
- [vcross2  ((Vectorof Real) (Vectorof Real) -> Real)]
- [vdot  ((Vectorof Real) (Vectorof Real) -> Real)]
- [vmag^2  ((Vectorof Real) -> Real)]
- [vnormalize  ((Vectorof Real) -> (Vectorof Real))]
- [vcenter  ((Listof (Vectorof Real)) -> (Vectorof Real))]
- [vrational?  ((Vectorof Real) -> Boolean)]
- [vcos-angle  ((Vectorof Real) (Vectorof Real) -> Real)]
- )
-
-;; Intervals
-(require/typed/provide
- plot/private/common/math
- [empty-ivl  ivl]
- [unknown-ivl  ivl]
- [rational-ivl?  (Any -> Boolean)]
- [ivl-empty?  (ivl -> Boolean)]
- [ivl-known?  (ivl -> Boolean)]
- [ivl-rational?  (ivl -> Boolean)]
- [ivl-singular?  (ivl -> Boolean)]
- [ivl-length  (ivl -> (U #f Real))]
- [ivl-center  (ivl -> (U #f Real))]
- [ivl-zero-length?  (ivl -> Boolean)]
- [ivl-inexact->exact  (ivl -> ivl)]
- [ivl-contains?  (ivl Real -> Boolean)]
- [ivl-meet  (ivl * -> ivl)]
- [ivl-join  (ivl * -> ivl)]
- [ivl-translate  (ivl Real -> ivl)]
- [bounds->intervals  ((Listof Real) -> (Listof ivl))]
- [clamp-real  (Real ivl -> Real)]
- )
-
-(define-type Rect (Vectorof ivl))
-(provide Rect)
-
-;; Rectangles
-(require/typed/provide
- plot/private/common/math
- [empty-rect  (Natural -> Rect)]
- [unknown-rect  (Natural -> Rect)]
- [bounding-rect  ((Listof Rect) -> Rect)]
- [rect-empty?  (Rect -> Boolean)]
- [rect-known?  (Rect -> Boolean)]
- [rect-rational?  (Rect -> Boolean)]
- [rational-rect?  (Any -> Boolean)]
- [rect-area  (Rect -> (U #f Real))]
- [rect-center  (Rect -> (Vectorof Real))]
- [rect-zero-area?  (Rect -> Boolean)]
- [rect-singular?  (Rect -> Boolean)]
- [rect-inexact->exact  (Rect -> Rect)]
- [rect-contains?  (Rect (Vectorof Real) -> Boolean)]
- [rect-meet  (Rect * -> Rect)]
- [rect-join  (Rect * -> Rect)]
- [rect-translate  (Rect (Vectorof Real) -> Rect)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/parameters.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/parameters.rkt
deleted file mode 100644
index b9deff45a2..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/parameters.rkt
+++ /dev/null
@@ -1,194 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt")
-
-(require/typed/provide 
- plot/private/contracted/parameters
- 
- ;; 9.1 Compatibility
- [plot-deprecation-warnings? (Parameterof Boolean)]
- 
- ;; 9.2 Output
- [plot-new-window? (Parameterof Boolean)]
- [plot-width (Parameterof Integer)]
- [plot-height (Parameterof Integer)]
- [plot-jpeg-quality (Parameterof Integer Natural)]
- [plot-ps/pdf-interactive? (Parameterof Boolean)]
- 
- ;; 9.3 Appearance 
- [plot-foreground (Parameterof Plot-Color)]
- [plot-background (Parameterof Plot-Color)]
- [plot-foreground-alpha (Parameterof Real)]
- [plot-font-size (Parameterof Real Nonnegative-Real)]
- [plot-font-family (Parameterof Font-Family)]
- [plot-line-width (Parameterof Real Nonnegative-Real)]
- [plot-legend-anchor (Parameterof Anchor)]
- [plot-legend-box-alpha (Parameterof Real Nonnegative-Real)]
- [plot-tick-size (Parameterof Real Nonnegative-Real)]
- [plot-title (Parameterof (Option String))]
- [plot-x-label (Parameterof (Option String))]
- [plot-y-label (Parameterof (Option String))]
- [plot-x-far-label (Parameterof (Option String))]
- [plot-y-far-label (Parameterof (Option String))]
- [plot-z-far-label (Parameterof (Option String))]
- [plot-x-tick-label-anchor (Parameterof Anchor)]
- [plot-x-tick-label-angle (Parameterof Real)]
- [plot-y-tick-label-anchor (Parameterof Anchor)]
- [plot-y-tick-label-angle (Parameterof Real)]
- [plot-x-far-tick-label-anchor (Parameterof Anchor)]
- [plot-x-far-tick-label-angle (Parameterof Real)]
- [plot-y-far-tick-label-anchor (Parameterof Anchor)]
- [plot-y-far-tick-label-angle (Parameterof Real)]
- [plot-x-axis? (Parameterof Boolean)]
- [plot-x-far-axis? (Parameterof Boolean)]
- [plot-y-axis? (Parameterof Boolean)]
- [plot-y-far-axis? (Parameterof Boolean)]
- [plot-z-axis? (Parameterof Boolean)]
- [plot-z-far-axis? (Parameterof Boolean)]
- [plot-animating? (Parameterof Boolean)]
- [animated-samples (Integer -> Integer)]
- [plot-decorations? (Parameterof Boolean)]
- 
- ;; 9.4 Lines
- [line-samples (Parameterof Integer Natural)]
- [line-color (Parameterof Plot-Color)]
- [line-width (Parameterof Integer Natural)]
- [line-style (Parameterof Plot-Pen-Style)]
- [line-alpha (Parameterof Real Nonnegative-Real)]
- 
- ;; 9.5 Intervals
- [interval-color (Parameterof Plot-Color)]
- [interval-style (Parameterof Plot-Brush-Style)]
- [interval-line1-color (Parameterof Plot-Color)]
- [interval-line1-width (Parameterof Real Nonnegative-Real)]
- [interval-line1-style (Parameterof Plot-Pen-Style)]
- [interval-line2-color (Parameterof Plot-Color)]
- [interval-line2-width (Parameterof Real Nonnegative-Real)]
- [interval-line2-style (Parameterof Plot-Pen-Style)]
- [interval-alpha (Parameterof Real)]
- 
- ;; 9.6 Points
- [point-sym (Parameterof Point-Sym)]
- [point-color (Parameterof Plot-Color)]
- [point-size (Parameterof Real Nonnegative-Real)]
- [point-line-width (Parameterof Real Nonnegative-Real)]
- [point-alpha (Parameterof Real Nonnegative-Real)]
- 
- ;; 9.7 Vector Fields
- [vector-field-samples (Parameterof Integer Positive-Integer)]
- [vector-field-color (Parameterof Plot-Color)]
- [vector-field-line-width (Parameterof Real Nonnegative-Real)]
- [vector-field-line-style (Parameterof Plot-Pen-Style)]
- [vector-field-scale (Parameterof (U Real 'auto 'normalized))]
- [vector-field-alpha (Parameterof Real Nonnegative-Real)]
- [vector-field3d-samples (Parameterof Integer Positive-Integer)]
- 
- ;; 9.8 Error Bars
- [error-bar-width (Parameterof Real Nonnegative-Real)]
- [error-bar-color (Parameterof Plot-Color)]
- [error-bar-line-width (Parameterof Real Nonnegative-Real)]
- [error-bar-line-style (Parameterof Plot-Pen-Style)]
- [error-bar-alpha (Parameterof Real Nonnegative-Real)]
- 
- ;; 9.9 Contours and Contour Intervals
- [default-contour-colors ((Listof Real) ->  (Listof Plot-Color))]
- [default-contour-fill-colors ((Listof Real) -> (Listof Plot-Color))]
- [contour-samples (Parameterof Integer Natural)]
- [contour-levels (Parameterof (U 'auto Integer (Listof Real))
-                              (U 'auto Positive-Integer (Listof Real)))]
- [contour-colors (Parameterof (Plot-Colors (Listof Real)))]
- [contour-widths (Parameterof (Pen-Widths (Listof Real)))]
- [contour-styles (Parameterof (Plot-Pen-Styles (Listof Real)))]
- [contour-alphas (Parameterof (Alphas (Listof Real)))]
- [contour-interval-colors (Parameterof (Plot-Colors (Listof ivl)))]
- [contour-interval-styles (Parameterof (Plot-Brush-Styles (Listof ivl)))]
- [contour-interval-alphas (Parameterof (Alphas (Listof ivl)))]
- 
- ;; 9.10 Rectangles
- [rectangle-color (Parameterof Plot-Color)]
- [rectangle-style (Parameterof Plot-Brush-Style)]
- [rectangle-line-color (Parameterof Plot-Color)]
- [rectangle-line-width (Parameterof Real Nonnegative-Real)]
- [rectangle-line-style (Parameterof Plot-Pen-Style)]
- [rectangle-alpha (Parameterof Real Nonnegative-Real)]
- [rectangle3d-line-width (Parameterof Real Nonnegative-Real)]
- [discrete-histogram-skip (Parameterof Real Nonnegative-Real)]
- [discrete-histogram-invert? (Parameterof Boolean)]
- [stacked-histogram-alphas (Parameterof (Alphas Integer) (Alphas Natural))]
- [stacked-histogram-colors (Parameterof (Plot-Colors Integer) (Plot-Colors Natural))]
- [stacked-histogram-line-styles (Parameterof (Plot-Pen-Styles Integer)
-                                             (Plot-Pen-Styles Natural))]
- [stacked-histogram-styles (Parameterof (Plot-Brush-Styles Integer)
-                                        (Plot-Brush-Styles Natural))]
- 
- ;; 9.11 Decorations
- [x-axis-alpha (Parameterof Real Nonnegative-Real)]
- [y-axis-alpha (Parameterof Real Nonnegative-Real)]
- [z-axis-alpha (Parameterof Real Nonnegative-Real)]
- [x-axis-far? (Parameterof Boolean)]
- [y-axis-far? (Parameterof Boolean)]
- [z-axis-far? (Parameterof Boolean)]
- [x-axis-ticks? (Parameterof Boolean)]
- [y-axis-ticks? (Parameterof Boolean)]
- [z-axis-ticks? (Parameterof Boolean)]
- [x-axis-labels? (Parameterof Boolean)]
- [y-axis-labels? (Parameterof Boolean)]
- [z-axis-labels? (Parameterof Boolean)]
- [polar-axes-number (Parameterof Integer Natural)]
- [polar-axes-alpha (Parameterof Real Nonnegative-Real)]
- [polar-axes-ticks? (Parameterof Boolean)]
- [polar-axes-labels? (Parameterof Boolean)]
- [label-anchor (Parameterof Anchor)]
- [label-angle (Parameterof Real)]
- [label-alpha (Parameterof Real Nonnegative-Real)]
- [label-point-size (Parameterof Real Nonnegative-Real)]
- 
- ;; 9.12 General Appearance
- [plot3d-samples (Parameterof Integer)]
- [plot3d-angle (Parameterof Real)]
- [plot3d-altitude (Parameterof Real)]
- [plot3d-ambient-light (Parameterof Real Nonnegative-Real)]
- [plot3d-diffuse-light? (Parameterof Boolean)]
- [plot3d-specular-light? (Parameter Boolean)]
- 
- ;; 9.13 Surfaces
- [surface-color (Parameterof Plot-Color)]
- [surface-style (Parameterof Plot-Brush-Style)]
- [surface-line-color (Parameterof Plot-Color)]
- [surface-line-width (Parameterof Real Nonnegative-Real)]
- [surface-alpha (Parameterof Real Nonnegative-Real)]
- 
- ;; 9.14 Contour Surfaces
- [contour-interval-line-colors (Parameterof (Plot-Colors (Listof ivl)))]
- [contour-interval-line-widths (Parameterof (Pen-Widths (Listof ivl)))]
- [contour-interval-line-styles (Parameterof (Plot-Pen-Styles (Listof ivl)))]
- 
- ;; 9.15 Isosurfaces
- [default-isosurface-colors ((Listof Real) -> (Listof Plot-Color))]
- [default-isosurface-line-colors ((Listof Real) -> (Listof Plot-Color))]
- [isosurface-levels (Parameterof (U 'auto Integer (Listof Real)) (U 'auto Natural (Listof Real)))]
- [isosurface-colors (Parameterof (Plot-Colors (Listof Real)))]
- [isosurface-styles (Parameterof (Plot-Brush-Styles (Listof Real)))]
- [isosurface-line-colors (Parameterof (Plot-Colors (Listof Real)))]
- [isosurface-line-widths (Parameterof (Pen-Widths (Listof Real)))]
- [isosurface-line-styles (Parameterof (Plot-Pen-Styles (Listof Real)))]
- [isosurface-alphas (Parameterof (Alphas (Listof Real)))]
- 
- ;; 7.1 Axis Transforms
- [plot-x-transform (Parameterof Axis-Transform)]
- [plot-y-transform (Parameterof Axis-Transform)]
- [plot-z-transform (Parameterof Axis-Transform)]
- 
- ;; 7.2 Axis Ticks
- [plot-x-ticks (Parameterof ticks)]
- [plot-x-far-ticks (Parameterof ticks)]
- 
- [plot-y-ticks (Parameterof ticks)]
- [plot-y-far-ticks (Parameterof ticks)]
- 
- [plot-z-ticks (Parameterof ticks)]
- [plot-z-far-ticks (Parameterof ticks)]
- 
- [plot-d-ticks (Parameterof ticks)]
- [plot-r-ticks (Parameterof ticks)] 
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/sample.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/sample.rkt
deleted file mode 100644
index 50a4acbb83..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/sample.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang typed/racket/base
-
-;; This is very incomplete, but exports enough that typed/plot/utils at least exports typed versions
-;; all of the *documented* functions in plot/utils
-
-(require "../common/types.rkt")
-
-(require/typed/provide
- plot/private/contracted/sample
- [linear-seq (Real Real Integer [#:start? Boolean] [#:end? Boolean] -> (Listof Real))]
- 
- [linear-seq* ((Listof Real) Integer [#:start? Boolean] [#:end? Boolean] -> (Listof Real))]
- 
- [nonlinear-seq (Real Real Integer Axis-Transform 
-                      [#:start? Boolean] [#:end? Boolean] -> (Listof Real))])
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/ticks.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/ticks.rkt
deleted file mode 100644
index 1d2b246200..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/contracted/ticks.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt")
-
-(require/typed/provide
- plot/private/contracted/ticks
- [24h-descending-date-ticks-formats  (Listof String)]
- [12h-descending-date-ticks-formats  (Listof String)]
- [24h-descending-time-ticks-formats  (Listof String)]
- [12h-descending-time-ticks-formats  (Listof String)]
- [us-currency-scales  (Listof String)]
- [uk-currency-scales  (Listof String)]
- [eu-currency-scales  (Listof String)]
- [us-currency-formats  (Listof String)]
- [uk-currency-formats  (Listof String)]
- [eu-currency-formats  (Listof String)]
- 
- [ticks-default-number (Parameterof Integer Positive-Integer)]
- [date-ticks-formats (Parameterof (Listof String))]
- [time-ticks-formats (Parameterof (Listof String))]
- [currency-ticks-scales (Parameterof (Listof String))]
- [currency-ticks-formats (Parameterof (List String String String))]
- 
- [no-ticks-layout Ticks-Layout]
- [no-ticks-format Ticks-Format]
- [no-ticks ticks]
- 
- [ticks-mimic ((-> ticks) -> ticks)]
- [ticks-scale (ticks invertible-function -> ticks)]
- [ticks-add (case-> (ticks (Listof Real) -> ticks)
-                    (ticks (Listof Real) Boolean -> ticks))]
- 
- [linear-scale (case-> (Real -> invertible-function)
-                       (Real Real -> invertible-function))]
- 
- [linear-ticks-layout
-  ([#:number Integer] [#:base Integer] [#:divisors (Listof Integer)] -> Ticks-Layout)]
- [linear-ticks-format (-> Ticks-Format)]
- [linear-ticks ([#:number Integer] [#:base Integer] [#:divisors (Listof Integer)] -> ticks)]
- 
- [log-ticks-layout ([#:number Integer] [#:base Integer] -> Ticks-Layout)]
- [log-ticks-format ([#:base Integer] -> Ticks-Format)]
- [log-ticks ([#:number Integer] [#:base Integer] -> ticks)]
-
- [date-ticks-layout ([#:number Integer] -> Ticks-Layout)]
- [date-ticks-format ([#:formats (Listof String)] -> Ticks-Format)]
- [date-ticks ([#:number Integer] [#:formats (Listof String)] -> ticks)]
- 
- [time-ticks-layout ([#:number Integer] -> Ticks-Layout)]
- [time-ticks-format ([#:formats (Listof String)] -> Ticks-Format)]
- [time-ticks ([#:number Integer] [#:formats (Listof String)] -> ticks)]
-
- [bit/byte-ticks-format ([#:size (U 'byte 'bit)] [#:kind (U 'CS 'SI)] -> Ticks-Format)]
- [bit/byte-ticks ([#:number Integer] [#:size (U 'byte 'bit)] [#:kind (U 'CS 'SI)] -> ticks)]
- 
- [fraction-ticks-format ([#:base Integer] [#:divisors (Listof Integer)] -> Ticks-Format)]
- [fraction-ticks ([#:base Integer] [#:divisors (Listof Integer)] -> ticks)]
-
- [currency-ticks-format ([#:kind (U String Symbol)]
-                         [#:scales (Listof String)]
-                         [#:formats (List String String String)]
-                         -> Ticks-Format)]
- [currency-ticks ([#:number Integer]
-                  [#:kind (U String Symbol)]
-                  [#:scales (Listof String)]
-                  [#:formats (List String String String)]
-                  -> Ticks-Format)]
- 
- [contour-ticks (ticks Real Real Contour-Levels Boolean -> (Listof tick))]
- 
- [format-tick-labels  (ticks Real Real (Listof Real) -> (Listof String))]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot-bitmap.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot-bitmap.rkt
deleted file mode 100644
index d2c676afa9..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot-bitmap.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang typed/racket/base
-
-(require (only-in typed/mred/mred Bitmap%)
-         "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide plot plot3d)
-
-(require/typed*
- plot/bitmap
- 
- [plot ((Treeof (U renderer2d nonrenderer))
-        [#:x-min (Option Real)]
-        [#:x-max (Option Real)]
-        [#:y-min (Option Real)]
-        [#:y-max (Option Real)]
-        [#:width  Integer]
-        [#:height Integer]
-        [#:title (Option String)]
-        [#:x-label (Option String)]
-        [#:y-label (Option String)]
-        [#:legend-anchor Anchor]
-        [#:out-file (Option (U Path-String Output-Port))]
-        [#:out-kind (U 'auto Image-File-Format)]
-        -> (Instance Bitmap%))]
- 
- [plot3d ((Treeof (U renderer3d nonrenderer))
-          [#:x-min (Option Real)]
-          [#:x-max (Option Real)]
-          [#:y-min (Option Real)]
-          [#:y-max (Option Real)]
-          [#:z-min (Option Real)]
-          [#:z-max (Option Real)]
-          [#:width  Integer]
-          [#:height Integer]
-          [#:angle Real]
-          [#:altitude Real]
-          [#:title (Option String)]
-          [#:x-label (Option String)]
-          [#:y-label (Option String)]
-          [#:z-label (Option String)]
-          [#:legend-anchor Anchor]
-          [#:out-file (Option (U Path-String Output-Port))]
-          [#:out-kind (U 'auto Image-File-Format)]
-          -> (Instance Bitmap%))]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot-pict.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot-pict.rkt
deleted file mode 100644
index 1da4e4510c..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot-pict.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang typed/racket/base
-
-(require (only-in typed/mred/mred Bitmap%)
-         "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide plot plot3d)
-
-(require/typed*
- plot/pict
- 
- [plot ((Treeof (U renderer2d nonrenderer))
-        [#:x-min (Option Real)]
-        [#:x-max (Option Real)]
-        [#:y-min (Option Real)]
-        [#:y-max (Option Real)]
-        [#:width  Integer]
-        [#:height Integer]
-        [#:title (Option String)]
-        [#:x-label (Option String)]
-        [#:y-label (Option String)]
-        [#:legend-anchor Anchor]
-        [#:out-file (Option (U Path-String Output-Port))]
-        [#:out-kind (U 'auto Image-File-Format)]
-        -> Pict)]
- 
- [plot3d ((Treeof (U renderer3d nonrenderer))
-          [#:x-min (Option Real)]
-          [#:x-max (Option Real)]
-          [#:y-min (Option Real)]
-          [#:y-max (Option Real)]
-          [#:z-min (Option Real)]
-          [#:z-max (Option Real)]
-          [#:width  Integer]
-          [#:height Integer]
-          [#:angle Real]
-          [#:altitude Real]
-          [#:title (Option String)]
-          [#:x-label (Option String)]
-          [#:y-label (Option String)]
-          [#:z-label (Option String)]
-          [#:legend-anchor Anchor]
-          [#:out-file (Option (U Path-String Output-Port))]
-          [#:out-kind (U 'auto Image-File-Format)]
-          -> Pict)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot2d.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot2d.rkt
deleted file mode 100644
index ab7d09dfc9..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot2d.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang typed/racket/base
-
-(require (only-in typed/mred/mred Bitmap%)
-         "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide plot/dc
-         plot-bitmap
-         plot-pict
-         plot-file)
-
-(require/typed*
- plot/no-gui
- 
- [plot/dc ((Treeof (U renderer2d nonrenderer))
-           Any Real Real Real Real
-           [#:x-min (Option Real)]
-           [#:x-max (Option Real)]
-           [#:y-min (Option Real)]
-           [#:y-max (Option Real)]
-           [#:title (Option String)]
-           [#:x-label (Option String)]
-           [#:y-label (Option String)]
-           [#:legend-anchor Anchor]
-           -> Void)]
- 
- [plot-bitmap ((Treeof (U renderer2d nonrenderer))
-               [#:x-min (Option Real)]
-               [#:x-max (Option Real)]
-               [#:y-min (Option Real)]
-               [#:y-max (Option Real)]
-               [#:width  Integer]
-               [#:height Integer]
-               [#:title (Option String)]
-               [#:x-label (Option String)]
-               [#:y-label (Option String)]
-               [#:legend-anchor Anchor]
-               -> (Instance Bitmap%))]
- 
- [plot-pict ((Treeof (U renderer2d nonrenderer))
-             [#:x-min (Option Real)]
-             [#:x-max (Option Real)]
-             [#:y-min (Option Real)]
-             [#:y-max (Option Real)]
-             [#:width  Integer]
-             [#:height Integer]
-             [#:title (Option String)]
-             [#:x-label (Option String)]
-             [#:y-label (Option String)]
-             [#:legend-anchor Anchor]
-             -> Pict)]
- 
- [plot-file (((Treeof (U renderer2d nonrenderer))
-              (U Path-String Output-Port))
-             ((U 'auto Image-File-Format)
-              [#:x-min (Option Real)]
-              [#:x-max (Option Real)]
-              [#:y-min (Option Real)]
-              [#:y-max (Option Real)]
-              [#:width  Integer]
-              [#:height Integer]
-              [#:title (Option String)]
-              [#:x-label (Option String)]
-              [#:y-label (Option String)]
-              [#:legend-anchor Anchor])
-             ->* Void)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot3d.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot3d.rkt
deleted file mode 100644
index 00b72cda9f..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/no-gui/plot3d.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang typed/racket/base
-
-(require (only-in typed/mred/mred Bitmap%)
-         "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide plot3d/dc
-         plot3d-bitmap
-         plot3d-pict
-         plot3d-file)
-
-(require/typed*
- plot/no-gui
- 
- [plot3d/dc ((Treeof (U renderer3d nonrenderer))
-             Any Real Real Real Real
-             [#:x-min (Option Real)]
-             [#:x-max (Option Real)]
-             [#:y-min (Option Real)]
-             [#:y-max (Option Real)]
-             [#:z-min (Option Real)]
-             [#:z-max (Option Real)]
-             [#:angle Real]
-             [#:altitude Real]
-             [#:title (Option String)]
-             [#:x-label (Option String)]
-             [#:y-label (Option String)]
-             [#:z-label (Option String)]
-             [#:legend-anchor Anchor]
-             -> Void)]
- 
- [plot3d-bitmap ((Treeof (U renderer3d nonrenderer))
-                 [#:x-min (Option Real)]
-                 [#:x-max (Option Real)]
-                 [#:y-min (Option Real)]
-                 [#:y-max (Option Real)]
-                 [#:z-min (Option Real)]
-                 [#:z-max (Option Real)]
-                 [#:width  Integer]
-                 [#:height Integer]
-                 [#:angle Real]
-                 [#:altitude Real]
-                 [#:title (Option String)]
-                 [#:x-label (Option String)]
-                 [#:y-label (Option String)]
-                 [#:z-label (Option String)]
-                 [#:legend-anchor Anchor]
-                 -> (Instance Bitmap%))]
- 
- [plot3d-pict ((Treeof (U renderer3d nonrenderer))
-               [#:x-min (Option Real)]
-               [#:x-max (Option Real)]
-               [#:y-min (Option Real)]
-               [#:y-max (Option Real)]
-               [#:z-min (Option Real)]
-               [#:z-max (Option Real)]
-               [#:width  Integer]
-               [#:height Integer]
-               [#:angle Real]
-               [#:altitude Real]
-               [#:title (Option String)]
-               [#:x-label (Option String)]
-               [#:y-label (Option String)]
-               [#:z-label (Option String)]
-               [#:legend-anchor Anchor]
-               -> Pict)]
- 
- [plot3d-file (((Treeof (U renderer3d nonrenderer))
-                (U Path-String Output-Port))
-               ((U 'auto Image-File-Format)
-                [#:x-min (Option Real)]
-                [#:x-max (Option Real)]
-                [#:y-min (Option Real)]
-                [#:y-max (Option Real)]
-                [#:z-min (Option Real)]
-                [#:z-max (Option Real)]
-                [#:width  Integer]
-                [#:height Integer]
-                [#:angle Real]
-                [#:altitude Real]
-                [#:title (Option String)]
-                [#:x-label (Option String)]
-                [#:y-label (Option String)]
-                [#:z-label (Option String)]
-                [#:legend-anchor Anchor])
-               ->* Void)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/contour.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/contour.rkt
deleted file mode 100644
index 7773f5701e..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/contour.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide isoline contours contour-intervals)
-
-(require/typed*
- plot/no-gui
- 
- [isoline (((Real Real -> Real) Real)
-           ((Option Real)
-            (Option Real)
-            (Option Real)
-            (Option Real)   
-            [#:samples Integer]
-            [#:color Plot-Color]
-            [#:width Real]
-            [#:style Plot-Pen-Style]
-            [#:alpha Real]
-            [#:label (Option String)])
-           ->* renderer2d)]
- 
- [contours (((Real Real -> Real))
-            ((Option Real)
-             (Option Real)
-             (Option Real)
-             (Option Real)
-             [#:samples Integer]
-             [#:levels Contour-Levels]
-             [#:colors (Plot-Colors (Listof Real))]
-             [#:widths (Pen-Widths (Listof Real))]
-             [#:styles (Plot-Pen-Styles (Listof Real))]
-             [#:alphas (Alphas (Listof Real))]
-             [#:label (Option String)])
-            ->* renderer2d)]
- 
- [contour-intervals (((Real Real -> Real))
-                     ((Option Real)
-                      (Option Real)
-                      (Option Real)
-                      (Option Real)
-                      [#:samples Integer]
-                      [#:levels Contour-Levels]
-                      [#:colors (Plot-Colors (Listof ivl))]
-                      [#:styles (Plot-Brush-Styles (Listof ivl))]
-                      [#:contour-colors (Plot-Colors (Listof Real))]
-                      [#:contour-widths (Pen-Widths (Listof Real))]
-                      [#:contour-styles (Plot-Pen-Styles (Listof Real))]
-                      [#:alphas (Alphas (Listof ivl))]
-                      [#:label (Option String)])
-                     ->* renderer2d)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/decoration.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/decoration.rkt
deleted file mode 100644
index 2b4bd01ef1..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/decoration.rkt
+++ /dev/null
@@ -1,124 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide x-axis y-axis axes polar-axes
-         x-tick-lines y-tick-lines tick-grid
-         point-label parametric-label polar-label function-label inverse-label)
-
-(require/typed*
- plot/no-gui
- 
- [x-axis (()
-          (Real
-           [#:ticks? Boolean]
-           [#:labels? Boolean]
-           [#:far? Boolean]
-           [#:alpha Real])
-          ->* renderer2d)]
- 
- [y-axis (()
-          (Real
-           [#:ticks? Boolean]
-           [#:labels? Boolean]
-           [#:far? Boolean]
-           [#:alpha Real])
-          ->* renderer2d)]
- 
- [axes (()
-        (Real
-         Real
-         [#:x-ticks? Boolean]
-         [#:y-ticks? Boolean]
-         [#:x-labels? Boolean]
-         [#:y-labels? Boolean]
-         [#:x-alpha Real]
-         [#:y-alpha Real])
-        ->* (Listof renderer2d))]
- 
- [polar-axes ([#:number Integer]
-              [#:ticks? Boolean]
-              [#:labels? Boolean]
-              [#:alpha Real]
-              -> renderer2d)]
- 
- [x-tick-lines (-> renderer2d)]
- [y-tick-lines (-> renderer2d)]
- [tick-grid (-> (Listof renderer2d))]
- 
- [point-label (((Sequenceof Real))
-               ((Option String)
-                [#:color Plot-Color]
-                [#:size Real]
-                [#:family Font-Family]
-                [#:anchor Anchor]
-                [#:angle Real]
-                [#:point-color Plot-Color]
-                [#:point-fill-color (U Plot-Color 'auto)]
-                [#:point-size Real]
-                [#:point-line-width Real]
-                [#:point-sym Point-Sym]
-                [#:alpha Real])
-               ->* renderer2d)]
- 
- [parametric-label (((Real -> (Sequenceof Real)) Real)
-                    ((Option String)
-                     [#:color Plot-Color]
-                     [#:size Real]
-                     [#:family Font-Family]
-                     [#:anchor Anchor]
-                     [#:angle Real]
-                     [#:point-color Plot-Color]
-                     [#:point-fill-color (U Plot-Color 'auto)]
-                     [#:point-size Real]
-                     [#:point-line-width Real]
-                     [#:point-sym Point-Sym]
-                     [#:alpha Real])
-                    ->* renderer2d)]
- 
- [polar-label (((Real -> Real) Real)
-               ((Option String)
-                [#:color Plot-Color]
-                [#:size Real]
-                [#:family Font-Family]
-                [#:anchor Anchor]
-                [#:angle Real]
-                [#:point-color Plot-Color]
-                [#:point-fill-color (U Plot-Color 'auto)]
-                [#:point-size Real]
-                [#:point-line-width Real]
-                [#:point-sym Point-Sym]
-                [#:alpha Real])
-               ->* renderer2d)]
- 
- [function-label (((Real -> Real) Real)
-                  ((Option String)
-                   [#:color Plot-Color]
-                   [#:size Real]
-                   [#:family Font-Family]
-                   [#:anchor Anchor]
-                   [#:angle Real]
-                   [#:point-color Plot-Color]
-                   [#:point-fill-color (U Plot-Color 'auto)]
-                   [#:point-size Real]
-                   [#:point-line-width Real]
-                   [#:point-sym Point-Sym]
-                   [#:alpha Real])
-                  ->* renderer2d)]
- 
- [inverse-label (((Real -> Real) Real)
-                 ((Option String)
-                  [#:color Plot-Color]
-                  [#:size Real]
-                  [#:family Font-Family]
-                  [#:anchor Anchor]
-                  [#:angle Real]
-                  [#:point-color Plot-Color]
-                  [#:point-fill-color (U Plot-Color 'auto)]
-                  [#:point-size Real]
-                  [#:point-line-width Real]
-                  [#:point-sym Point-Sym]
-                  [#:alpha Real])
-                 ->* renderer2d)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/interval.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/interval.rkt
deleted file mode 100644
index 188d899a31..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/interval.rkt
+++ /dev/null
@@ -1,108 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide lines-interval parametric-interval polar-interval function-interval inverse-interval)
-
-(require/typed*
- plot/no-gui
- 
- [lines-interval ((Sequenceof (Sequenceof Real))
-                  (Sequenceof (Sequenceof Real))
-                  [#:x-min (Option Real)]
-                  [#:x-max (Option Real)]
-                  [#:y-min (Option Real)]
-                  [#:y-max (Option Real)]
-                  [#:color Plot-Color]
-                  [#:style Plot-Brush-Style]
-                  [#:line1-color Plot-Color]
-                  [#:line1-width Real]
-                  [#:line1-style Plot-Pen-Style]
-                  [#:line2-color Plot-Color]
-                  [#:line2-width Real]
-                  [#:line2-style Plot-Pen-Style]
-                  [#:alpha Real]
-                  [#:label (Option String)]
-                  -> renderer2d)]
- 
- [parametric-interval ((Real -> (Sequenceof Real))
-                       (Real -> (Sequenceof Real))
-                       Real
-                       Real
-                       [#:x-min (Option Real)]
-                       [#:x-max (Option Real)]
-                       [#:y-min (Option Real)]
-                       [#:y-max (Option Real)]
-                       [#:samples Integer]
-                       [#:color Plot-Color]
-                       [#:style Plot-Brush-Style]
-                       [#:line1-color Plot-Color]
-                       [#:line1-width Real]
-                       [#:line1-style Plot-Pen-Style]
-                       [#:line2-color Plot-Color]
-                       [#:line2-width Real]
-                       [#:line2-style Plot-Pen-Style]
-                       [#:alpha Real]
-                       [#:label (Option String)]
-                       -> renderer2d)]
- 
- [polar-interval (((Real -> Real)
-                   (Real -> Real))
-                  (Real
-                   Real
-                   [#:x-min (Option Real)]
-                   [#:x-max (Option Real)]
-                   [#:y-min (Option Real)]
-                   [#:y-max (Option Real)]
-                   [#:samples Integer]
-                   [#:color Plot-Color]
-                   [#:style Plot-Brush-Style]
-                   [#:line1-color Plot-Color]
-                   [#:line1-width Real]
-                   [#:line1-style Plot-Pen-Style]
-                   [#:line2-color Plot-Color]
-                   [#:line2-width Real]
-                   [#:line2-style Plot-Pen-Style]
-                   [#:alpha Real]
-                   [#:label (Option String)])
-                  ->* renderer2d)]
- 
- [function-interval (((Real -> Real)
-                      (Real -> Real))
-                     ((Option Real)
-                      (Option Real)
-                      [#:y-min (Option Real)]
-                      [#:y-max (Option Real)]
-                      [#:samples Integer]
-                      [#:color Plot-Color]
-                      [#:style Plot-Brush-Style]
-                      [#:line1-color Plot-Color]
-                      [#:line1-width Real]
-                      [#:line1-style Plot-Pen-Style]
-                      [#:line2-color Plot-Color]
-                      [#:line2-width Real]
-                      [#:line2-style Plot-Pen-Style]
-                      [#:alpha Real]
-                      [#:label (Option String)])
-                     ->* renderer2d)]
- 
- [inverse-interval (((Real -> Real)
-                     (Real -> Real))
-                    ((Option Real)
-                     (Option Real)
-                     [#:x-min (Option Real)]
-                     [#:x-max (Option Real)]
-                     [#:samples Integer]
-                     [#:color Plot-Color]
-                     [#:style Plot-Brush-Style]
-                     [#:line1-color Plot-Color]
-                     [#:line1-width Real]
-                     [#:line1-style Plot-Pen-Style]
-                     [#:line2-color Plot-Color]
-                     [#:line2-width Real]
-                     [#:line2-style Plot-Pen-Style]
-                     [#:alpha Real]
-                     [#:label (Option String)])
-                    ->* renderer2d)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/line.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/line.rkt
deleted file mode 100644
index 20c08d1405..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/line.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide lines parametric polar function inverse density)
-
-(require/typed*
- plot/no-gui
- 
- [lines ((Sequenceof (Sequenceof Real))
-         [#:x-min (Option Real)]
-         [#:x-max (Option Real)]
-         [#:y-min (Option Real)]
-         [#:y-max (Option Real)]
-         [#:color Plot-Color]
-         [#:width Real]
-         [#:style Plot-Pen-Style]
-         [#:alpha Real]
-         [#:label (Option String)]
-         -> renderer2d)]
- 
- [parametric ((Real -> (Sequenceof Real))
-              Real
-              Real
-              [#:x-min (Option Real)]
-              [#:x-max (Option Real)]
-              [#:y-min (Option Real)]
-              [#:y-max (Option Real)]
-              [#:samples Integer]
-              [#:color Plot-Color]
-              [#:width Real]
-              [#:style Plot-Pen-Style]
-              [#:alpha Real]
-              [#:label (Option String)]
-              -> renderer2d)]
- 
- [polar (((Real -> Real))
-         (Real
-          Real
-          [#:x-min (Option Real)]
-          [#:x-max (Option Real)]
-          [#:y-min   Real]
-          [#:y-max   Real]
-          [#:samples Integer]
-          [#:color   Plot-Color]
-          [#:width   Real]
-          [#:style   Plot-Pen-Style]
-          [#:alpha   Real]
-          [#:label  (Option String)])
-         ->* renderer2d)]
- 
- [function (((Real -> Real))
-            ((Option Real)
-             (Option Real)
-             [#:y-min (Option Real)]
-             [#:y-max (Option Real)]
-             [#:samples Integer]
-             [#:color Plot-Color]
-             [#:width Real]
-             [#:style Plot-Pen-Style]
-             [#:alpha Real]
-             [#:label (Option String)])
-            ->* renderer2d)]
- 
- [inverse (((Real -> Real))
-           ((Option Real)
-            (Option Real)
-            [#:x-min (Option Real)]
-            [#:x-max (Option Real)]
-            [#:samples Integer]
-            [#:color Plot-Color]
-            [#:width Real]
-            [#:style Plot-Pen-Style]
-            [#:alpha Real]
-            [#:label (Option String)])
-           ->* renderer2d)]
- 
- [density (((Sequenceof Real))
-           (Real
-            (Option (Sequenceof Real))
-            [#:x-min (Option Real)]
-            [#:x-max (Option Real)]
-            [#:y-min (Option Real)]
-            [#:y-max (Option Real)]
-            [#:samples Integer]
-            [#:color Plot-Color]
-            [#:width Real]
-            [#:style Plot-Pen-Style]
-            [#:alpha Real]
-            [#:label (Option String)])
-           ->* renderer2d)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/point.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/point.rkt
deleted file mode 100644
index a584f4d2dd..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/point.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide points vector-field error-bars)
-
-(require/typed*
- plot/no-gui
- 
- [points ((Sequenceof (Sequenceof Real))
-          [#:x-min (Option Real)]
-          [#:x-max (Option Real)]
-          [#:y-min (Option Real)]
-          [#:y-max (Option Real)]
-          [#:sym Point-Sym]
-          [#:color Plot-Color]
-          [#:fill-color (U Plot-Color 'auto)]
-          [#:size Real]
-          [#:line-width Real]
-          [#:alpha Real]
-          [#:label (Option String)]
-          -> renderer2d)]
- 
- [vector-field  (((Real Real -> (Sequenceof Real)))
-                 ((Option Real)
-                  (Option Real)
-                  (Option Real)
-                  (Option Real)
-                  [#:samples Integer]
-                  [#:scale (U Real 'auto 'normalized)]
-                  [#:color Plot-Color]
-                  [#:line-width Real]
-                  [#:line-style Plot-Pen-Style]
-                  [#:alpha Real]
-                  [#:label (Option String)])
-                 ->* renderer2d)]
- 
- [error-bars ((Sequenceof (Sequenceof Real))
-              [#:x-min (Option Real)]
-              [#:x-max (Option Real)]
-              [#:y-min (Option Real)]
-              [#:y-max (Option Real)]
-              [#:color Color]
-              [#:line-width Real]
-              [#:line-style Plot-Pen-Style]
-              [#:width Real]
-              [#:alpha Real]
-              -> renderer2d)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/rectangle.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/rectangle.rkt
deleted file mode 100644
index e0d28ca971..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot2d/rectangle.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide rectangles area-histogram discrete-histogram stacked-histogram)
-
-(require/typed*
- plot/no-gui
- 
- [rectangles ((Sequenceof (Sequenceof ivl))
-              [#:x-min (Option Real)]
-              [#:x-max (Option Real)]
-              [#:y-min (Option Real)]
-              [#:y-max (Option Real)]
-              [#:color Plot-Color]
-              [#:style Plot-Brush-Style]
-              [#:line-color Plot-Color]
-              [#:line-width Real]
-              [#:line-style Plot-Pen-Style]
-              [#:alpha Real]
-              [#:label (Option String)]
-              -> renderer2d)]
- 
- [area-histogram ((Real -> Real) 
-                  (Sequenceof Real)
-                  [#:x-min (Option Real)]
-                  [#:x-max (Option Real)]
-                  [#:y-min (Option Real)]
-                  [#:y-max (Option Real)]
-                  [#:samples Integer]                   
-                  [#:color Plot-Color]
-                  [#:style Plot-Brush-Style]
-                  [#:line-color Plot-Color]
-                  [#:line-width Real]
-                  [#:line-style Plot-Pen-Style]
-                  [#:alpha Real]
-                  [#:label (Option String)]
-                  -> renderer2d)]
- 
- [discrete-histogram ((Sequenceof (U (Vector Any (U Real ivl #f))
-                                     (List Any (U Real ivl #f))))
-                      [#:x-min (Option Real)]
-                      [#:x-max (Option Real)]
-                      [#:y-min (Option Real)]
-                      [#:y-max (Option Real)]
-                      [#:gap Real]
-                      [#:skip Real]
-                      [#:invert? Boolean]
-                      [#:color Plot-Color]
-                      [#:style Plot-Brush-Style]
-                      [#:line-color Plot-Color]
-                      [#:line-width Real]
-                      [#:line-style Plot-Pen-Style]
-                      [#:alpha Real]
-                      [#:label (Option String)]
-                      [#:add-ticks? Boolean]
-                      [#:far-ticks? Boolean]
-                      -> renderer2d)]
- 
- [stacked-histogram ((Sequenceof (U (Vector Any (Sequenceof Real))
-                                    (List Any (Sequenceof Real))))
-                     [#:x-min (Option Real)]
-                     [#:x-max (Option Real)]
-                     [#:y-min (Option Real)]
-                     [#:y-max (Option Real)]
-                     [#:gap Real]
-                     [#:skip Real]
-                     [#:invert? Boolean]
-                     [#:colors (Plot-Colors Natural)]
-                     [#:styles (Plot-Brush-Styles Natural)]
-                     [#:line-colors (Plot-Colors Natural)]
-                     [#:line-widths (Pen-Widths Natural)]
-                     [#:line-styles (Plot-Pen-Styles Natural)]
-                     [#:alphas (Alphas Natural)]
-                     [#:labels (Labels Natural)]
-                     [#:add-ticks? Boolean]
-                     [#:far-ticks? Boolean]
-                     -> (Listof renderer2d))]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/contour.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/contour.rkt
deleted file mode 100644
index ffafa81c08..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/contour.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide isoline3d contours3d contour-intervals3d)
-
-(require/typed*
- plot/no-gui
- 
- [isoline3d (((Real Real -> Real) Real)
-             ((Option Real)
-              (Option Real)
-              (Option Real)
-              (Option Real)
-              [#:z-min (Option Real)]
-              [#:z-max (Option Real)]
-              [#:samples Integer]
-              [#:color Plot-Color]     
-              [#:width Real]
-              [#:style Plot-Pen-Style]
-              [#:alpha Real]
-              [#:label (Option String)])
-             ->* renderer3d)]
- 
- [contours3d (((Real Real -> Real))
-              ((Option Real)
-               (Option Real)
-               (Option Real)
-               (Option Real)
-               [#:z-min (Option Real)]
-               [#:z-max (Option Real)]
-               [#:samples Integer]
-               [#:levels Contour-Levels]
-               [#:colors (Plot-Colors (Listof Real))]
-               [#:widths (Pen-Widths (Listof Real))]
-               [#:styles (Plot-Pen-Styles (Listof Real))]
-               [#:alphas (Alphas (Listof Real))]
-               [#:label (Option String)])
-              ->* renderer3d)]
- 
- [contour-intervals3d (((Real Real -> Real))
-                       ((Option Real)
-                        (Option Real)
-                        (Option Real)
-                        (Option Real)
-                        [#:z-min (Option Real)]
-                        [#:z-max (Option Real)]
-                        [#:samples Integer]
-                        [#:levels Contour-Levels]
-                        [#:colors (Plot-Colors (Listof ivl))]  
-                        [#:styles (Plot-Brush-Styles (Listof ivl))]
-                        [#:line-colors (Plot-Colors (Listof ivl))]
-                        [#:line-widths (Pen-Widths (Listof ivl))]
-                        [#:line-styles (Plot-Pen-Styles (Listof ivl))]
-                        [#:contour-colors (Plot-Colors (Listof Real))]
-                        [#:contour-widths (Plot-Colors (Listof Real))]
-                        [#:contour-styles (Plot-Pen-Styles (Listof Real))]
-                        [#:alphas (Alphas (Listof ivl))]
-                        [#:label (Option String)])
-                       ->* renderer3d)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/decoration.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/decoration.rkt
deleted file mode 100644
index bd4b0588b4..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/decoration.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide point-label3d)
-
-(require/typed*
- plot/no-gui
- 
- [point-label3d (((Sequenceof Real))
-                 ((Option String)
-                  [#:color Plot-Color]
-                  [#:size Real]
-                  [#:family Font-Family]
-                  [#:anchor Anchor]
-                  [#:angle Real]
-                  [#:point-color Plot-Color]
-                  [#:point-fill-color (U Plot-Color 'auto)]
-                  [#:point-size Real]
-                  [#:point-line-width Real]
-                  [#:point-sym Point-Sym]
-                  [#:alpha Real])
-                 ->* renderer3d)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/isosurface.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/isosurface.rkt
deleted file mode 100644
index 7b8ccad954..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/isosurface.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide isosurface3d isosurfaces3d polar3d)
-
-(require/typed*
- plot/no-gui
- 
- [isosurface3d (((Real Real Real -> Real) Real)
-                ((Option Real)
-                 (Option Real)
-                 (Option Real)
-                 (Option Real)
-                 (Option Real)
-                 (Option Real)
-                 [#:samples Integer]
-                 [#:color Plot-Color]  
-                 [#:style Plot-Brush-Style]
-                 [#:line-color Plot-Color]
-                 [#:line-width Real]
-                 [#:line-style Plot-Pen-Style]
-                 [#:alpha Real]
-                 [#:label (Option String)])
-                ->* renderer3d)]
- 
- [isosurfaces3d (((Real Real Real -> Real))
-                 ((Option Real)
-                  (Option Real)
-                  (Option Real)
-                  (Option Real)
-                  (Option Real)
-                  (Option Real)
-                  [#:d-min (Option Real)]
-                  [#:d-max (Option Real)]
-                  [#:samples Integer]
-                  [#:levels Contour-Levels]
-                  [#:colors (Plot-Colors (Listof Real))]
-                  [#:styles (Plot-Brush-Styles (Listof Real))]
-                  [#:line-colors (Plot-Colors (Listof Real))]
-                  [#:line-widths (Pen-Widths (Listof Real))]
-                  [#:line-styles (Plot-Pen-Styles (Listof Real))]
-                  [#:alphas (Alphas (Listof Real))]
-                  [#:label (Option String)])
-                 ->* renderer3d)]
- 
- [polar3d ((Real Real -> Real)
-           [#:x-min (Option Real)]
-           [#:x-max (Option Real)]
-           [#:y-min (Option Real)]
-           [#:y-max (Option Real)]
-           [#:z-min (Option Real)]
-           [#:z-max (Option Real)]
-           [#:samples Integer]
-           [#:color Plot-Color]     
-           [#:style Plot-Brush-Style]
-           [#:line-color Plot-Color]
-           [#:line-width Real]
-           [#:line-style Plot-Pen-Style]
-           [#:alpha Real]
-           [#:label (Option String)]
-           -> renderer3d)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/line.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/line.rkt
deleted file mode 100644
index e87eb91089..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/line.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide lines3d parametric3d)
-
-(require/typed*
- plot/no-gui
- 
- [lines3d ((Sequenceof (Sequenceof Real))
-           [#:x-min (Option Real)]
-           [#:x-max (Option Real)]
-           [#:y-min (Option Real)]
-           [#:y-max (Option Real)]
-           [#:z-min (Option Real)]
-           [#:z-max (Option Real)]
-           [#:color Plot-Color]
-           [#:width Real]
-           [#:style Plot-Pen-Style]
-           [#:alpha Real]
-           [#:label (Option String)]
-           -> renderer3d)]
- 
- [parametric3d ((Real -> (Sequenceof Real))
-                Real
-                Real
-                [#:x-min (Option Real)]
-                [#:x-max (Option Real)]
-                [#:y-min (Option Real)]
-                [#:y-max (Option Real)] 
-                [#:z-min (Option Real)]
-                [#:z-max (Option Real)] 
-                [#:samples Integer]
-                [#:color Plot-Color]
-                [#:width Real]
-                [#:style Plot-Pen-Style]
-                [#:alpha Real]
-                [#:label (Option String)]
-                -> renderer3d)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/point.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/point.rkt
deleted file mode 100644
index d7993a7102..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/point.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide points3d vector-field3d)
-
-(require/typed*
- plot/no-gui
- 
- [points3d ((Sequenceof (Sequenceof Real))
-            [#:x-min (Option Real)]
-            [#:x-max (Option Real)]
-            [#:y-min (Option Real)]
-            [#:y-max (Option Real)] 
-            [#:z-min (Option Real)]
-            [#:z-max (Option Real)] 
-            [#:sym Point-Sym]
-            [#:color Plot-Color]
-            [#:fill-color (U Plot-Color 'auto)]
-            [#:size Real]
-            [#:line-width Real]
-            [#:alpha Real]
-            [#:label (Option String)]
-            -> renderer3d)]
- 
- [vector-field3d (((U (Real Real Real -> (Sequenceof Real))
-                      ((Vector Real Real Real) -> (Sequenceof Real))))
-                  ((Option Real)
-                   (Option Real)
-                   (Option Real)
-                   (Option Real) 
-                   (Option Real)
-                   (Option Real) 
-                   [#:samples Integer]
-                   [#:scale (U Real 'auto 'normalized)]
-                   [#:color Plot-Color]
-                   [#:line-width Real]
-                   [#:line-style Plot-Pen-Style]
-                   [#:alpha Real]
-                   [#:label (Option String)])
-                  ->* renderer3d)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/rectangle.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/rectangle.rkt
deleted file mode 100644
index 904658ef85..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/rectangle.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide rectangles3d discrete-histogram3d stacked-histogram3d)
-
-(require/typed*
- plot/no-gui
- 
- [rectangles3d ((Sequenceof (Sequenceof ivl))
-                [#:x-min (Option Real)]
-                [#:x-max (Option Real)]
-                [#:y-min (Option Real)]
-                [#:y-max (Option Real)]
-                [#:z-min (Option Real)]
-                [#:z-max (Option Real)]
-                [#:color Plot-Color]
-                [#:style Plot-Brush-Style]
-                [#:line-color Plot-Color]
-                [#:line-width Real]
-                [#:line-style Plot-Pen-Style]
-                [#:alpha Real] 
-                [#:label (Option String)]
-                -> renderer3d)]
- 
- [discrete-histogram3d ((Sequenceof (U (Vector Any Any (Option (U Real ivl)))
-                                       (List Any Any (Option (U Real ivl)))))
-                        [#:x-min (Option Real)]
-                        [#:x-max (Option Real)]
-                        [#:y-min (Option Real)]
-                        [#:y-max (Option Real)]
-                        [#:z-min (Option Real)]
-                        [#:z-max (Option Real)]
-                        [#:gap Real]
-                        [#:color Plot-Color]
-                        [#:style Plot-Brush-Style]
-                        [#:line-color Plot-Color]
-                        [#:line-width Real]
-                        [#:line-style Plot-Pen-Style]
-                        [#:alpha Real]
-                        [#:label (Option String)]
-                        [#:add-x-ticks? Boolean]
-                        [#:add-y-ticks? Boolean]
-                        [#:x-far-ticks? Boolean]
-                        [#:y-far-ticks? Boolean]
-                        -> renderer3d)]
- 
- [stacked-histogram3d ((Sequenceof (U (Vector Any Any (Sequenceof Real))
-                                      (List Any Any (Sequenceof Real))))
-                       [#:x-min (Option Real)]
-                       [#:x-max (Option Real)]
-                       [#:y-min (Option Real)]
-                       [#:y-max (Option Real)]
-                       [#:z-min (Option Real)]
-                       [#:z-max (Option Real)]
-                       [#:gap Real]
-                       [#:colors (Plot-Colors Natural)]
-                       [#:styles (Plot-Brush-Styles Natural)]
-                       [#:line-colors (Plot-Colors Natural)]
-                       [#:line-widths (Pen-Widths Natural)]
-                       [#:line-styles (Plot-Pen-Styles Natural)]
-                       [#:alphas (Alphas Natural)]
-                       [#:labels (Labels Natural)]
-                       [#:add-x-ticks? Boolean]
-                       [#:add-y-ticks? Boolean]
-                       [#:x-far-ticks? Boolean]
-                       [#:y-far-ticks? Boolean]
-                       -> (Listof renderer3d))]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/surface.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/surface.rkt
deleted file mode 100644
index 35a2a36903..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/plot3d/surface.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang typed/racket/base
-
-(require "../common/types.rkt"
-         "../syntax.rkt")
-
-(provide surface3d)
-
-(require/typed*
- plot/no-gui
- 
- [surface3d (((Real Real -> Real))
-             ((Option Real)
-              (Option Real)
-              (Option Real)
-              (Option Real)
-              [#:z-min (Option Real)]
-              [#:z-max (Option Real)]
-              [#:samples Integer]
-              [#:color Plot-Color]     
-              [#:style Plot-Brush-Style]
-              [#:line-color Plot-Color]
-              [#:line-width Real]
-              [#:line-style Plot-Pen-Style]
-              [#:alpha Real]
-              [#:label (Option String)])
-             ->* renderer3d)]
- )
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/private/syntax.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/private/syntax.rkt
deleted file mode 100644
index c13c02f3e0..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/private/syntax.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang typed/racket
-
-;; This currently does nothing useful with `->*' types
-;; TODO: make it do something useful after Vincent fixes PR 13354
-
-(require (for-syntax racket/base
-                     racket/list))
-
-(provide require/typed*)
-
-(define-for-syntax (list-accum lst)
-  (for/list ([i  (in-range (+ 1 (length lst)))])
-    (take lst i)))
-
-(define-for-syntax (interpret-opts stx)
-  (let loop ([stxs  (syntax->list stx)] [opts  empty] [kws  empty])
-    (cond [(empty? stxs)  #`(#,(list-accum (reverse opts)) #,(reverse kws))]
-          [else
-           (syntax-case (first stxs) ()
-             [[kw T]
-              (keyword? (syntax->datum #'kw))
-              (loop (rest stxs) opts (cons (first stxs) kws))]
-             [_
-              (loop (rest stxs) (cons (first stxs) opts) kws)])])))
-
-(define-for-syntax (interpret-clause stx)
-  (syntax-case stx ()
-    [[name  ((Rs ...) (opts ...) arrow T)]
-     (and (identifier? #'arrow) (eq? '->* (syntax->datum #'arrow)))
-     (with-syntax ([(((Os ...) ...) (Ks ...))  (interpret-opts #'(opts ...))])
-       (quasisyntax/loc stx
-         [name  (case-> (Rs ... Os ... Ks ... -> T) ...)]))]
-    [_  stx]))
-
-(define-syntax (require/typed* stx)
-  (syntax-case stx ()
-    [(_ module-name clause ...)
-     (with-syntax ([(clause ...)  (map interpret-clause (syntax->list #'(clause ...)))])
-       (syntax/loc stx
-         (require/typed module-name clause ...)))]))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/typed/utils.rkt b/pkgs/plot-pkgs/plot-lib/plot/typed/utils.rkt
deleted file mode 100644
index a9af11cdc8..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/typed/utils.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang typed/racket/base
-
-;; The commented-out module paths are those that don't exist yet
-
-(require "private/common/types.rkt"
-         ;"private/common/marching-squares.rkt"
-         ;"private/common/marching-cubes.rkt"
-         "private/contracted/parameters.rkt"
-         "private/contracted/math.rkt"
-         "private/contracted/axis-transform.rkt"
-         "private/contracted/ticks.rkt"
-         "private/contracted/format.rkt"
-         "private/contracted/draw.rkt"
-         "private/contracted/sample.rkt"  ; incomplete
-         ;"private/contracted/samplers.rkt"
-         ;"private/contracted/legend.rkt"
-         ;"private/contracted/plot-element.rkt"
-         "private/contracted/date-time.rkt"
-         "private/contracted/kde.rkt"
-         )
-
-(provide (all-from-out
-          "private/common/types.rkt"
-          ;"private/common/marching-squares.rkt"
-          ;"private/common/marching-cubes.rkt"
-          "private/contracted/parameters.rkt"
-          "private/contracted/math.rkt"
-          "private/contracted/axis-transform.rkt"
-          "private/contracted/ticks.rkt"
-          "private/contracted/format.rkt"
-          "private/contracted/draw.rkt"
-          "private/contracted/sample.rkt"  ; incomplete
-          ;"private/contracted/samplers.rkt"
-          ;"private/contracted/legend.rkt"
-          ;"private/contracted/plot-element.rkt"
-          "private/contracted/date-time.rkt"
-          "private/contracted/kde.rkt"
-          ))
diff --git a/pkgs/plot-pkgs/plot-lib/plot/utils.rkt b/pkgs/plot-pkgs/plot-lib/plot/utils.rkt
deleted file mode 100644
index ef3636a853..0000000000
--- a/pkgs/plot-pkgs/plot-lib/plot/utils.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-
-(require "private/common/contract.rkt"
-         "private/common/marching-squares.rkt"
-         "private/common/marching-cubes.rkt"
-         "private/contracted/parameters.rkt"
-         "private/contracted/math.rkt"
-         "private/contracted/axis-transform.rkt"
-         "private/contracted/ticks.rkt"
-         "private/contracted/format.rkt"
-         "private/contracted/draw.rkt"
-         "private/contracted/sample.rkt"
-         "private/contracted/samplers.rkt"
-         "private/contracted/legend.rkt"
-         "private/contracted/plot-element.rkt"
-         "private/contracted/date-time.rkt"
-         "private/contracted/kde.rkt")
-
-(provide (all-from-out "private/common/contract.rkt")
-         (all-from-out "private/common/marching-squares.rkt")
-         (all-from-out "private/common/marching-cubes.rkt")
-         (all-from-out "private/contracted/parameters.rkt")
-         (all-from-out "private/contracted/math.rkt")
-         (all-from-out "private/contracted/axis-transform.rkt")
-         (all-from-out "private/contracted/ticks.rkt")
-         (all-from-out "private/contracted/format.rkt")
-         (all-from-out "private/contracted/draw.rkt")
-         (all-from-out "private/contracted/sample.rkt")
-         (all-from-out "private/contracted/samplers.rkt")
-         (all-from-out "private/contracted/legend.rkt")
-         (all-from-out "private/contracted/plot-element.rkt")
-         (all-from-out "private/contracted/date-time.rkt")
-         (all-from-out "private/contracted/kde.rkt"))
diff --git a/pkgs/plot-pkgs/plot-test/LICENSE.txt b/pkgs/plot-pkgs/plot-test/LICENSE.txt
deleted file mode 100644
index dbb89375c4..0000000000
--- a/pkgs/plot-pkgs/plot-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-plot
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/plot-pkgs/plot-test/info.rkt b/pkgs/plot-pkgs/plot-test/info.rkt
deleted file mode 100644
index 727a4a6c65..0000000000
--- a/pkgs/plot-pkgs/plot-test/info.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "plot-compat"
-               "plot-gui-lib"
-               "plot-lib"
-               "plot-doc"
-               "draw-lib"
-               "pict-lib"
-               "rackunit-lib"
-               "slideshow-lib"
-               "typed-racket-lib"
-               "typed-racket-more"
-               "unstable-flonum-lib"))
-
-(define build-deps '())
-(define update-implies '("plot-lib"))
-
-(define pkg-desc "Plot tests")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/plot-pkgs/plot-test/plot/info.rkt b/pkgs/plot-pkgs/plot-test/plot/info.rkt
deleted file mode 100644
index 38d2700d4e..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/info.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang info
-(define compile-omit-paths '("tests"))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/PRs/13620.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/PRs/13620.rkt
deleted file mode 100644
index 51c5ee4cb2..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/PRs/13620.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket
-
-;; These tests pass when they terminate
-
-(require plot)
-
-(printf "The following three plots should be blank:~n")
-(plot (contour-intervals * -1 1 -1 1 #:alphas '()))
-(plot3d (contour-intervals3d * -1 1 -1 1 #:alphas '()))
-(plot3d (isosurfaces3d * -1 1 -1 1 -1 1 #:alphas '()))
-
-(with-handlers ([exn?  (λ (_) (void))])
-  (plot (stacked-histogram (list (vector 'a 1))
-                           #:alphas '())))
-
-(with-handlers ([exn?  (λ (_) (void))])
-  (plot3d (stacked-histogram3d (list (vector 'a 'a 1))
-                               #:alphas '())))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/PRs/13709.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/PRs/13709.rkt
deleted file mode 100644
index dc417a195f..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/PRs/13709.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket
-
-(require plot rackunit)
-
-(check-exn exn:fail:contract? (λ () (lines '((1)))))
-(check-exn exn:fail:contract? (λ () (rectangles (list (list (ivl 1 2))))))
-(check-exn exn:fail:contract? (λ () (points '((1)))))
-(check-exn exn:fail:contract? (λ () (error-bars '((1)))))
-(check-exn exn:fail:contract? (λ () (error-bars '((1 2)))))
-(check-exn exn:fail:contract? (λ () (lines-interval '((1)) '((1 2)))))
-(check-exn exn:fail:contract? (λ () (lines-interval '((1 2)) '((1)))))
-
-(check-exn exn:fail:contract? (λ () (lines3d '((1)))))
-(check-exn exn:fail:contract? (λ () (lines3d '((1 2)))))
-(check-exn exn:fail:contract? (λ () (rectangles3d (list (list (ivl 1 2))))))
-(check-exn exn:fail:contract? (λ () (rectangles3d (list (list (ivl 1 2) (ivl 2 3))))))
-(check-exn exn:fail:contract? (λ () (points3d '((1)))))
-(check-exn exn:fail:contract? (λ () (points3d '((1 2)))))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/axis-transform-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/axis-transform-tests.rkt
deleted file mode 100644
index c5ee9a0e35..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/axis-transform-tests.rkt
+++ /dev/null
@@ -1,297 +0,0 @@
-#lang racket
-
-(require plot plot/utils)
-
-(x-axis-ticks? #f)
-(y-axis-ticks? #f)
-
-(values
- (parameterize ([plot-x-transform  log-transform])
-   (plot (list (function values 1 5)
-               (function cos 1 5 #:color 3))))
- (parameterize ([plot-x-transform  cbrt-transform])
-   (plot (list (function values -2 2)
-               (function cos -2 2 #:color 3))))
- (parameterize ([plot-x-transform  log-transform]
-                [plot-y-transform  cbrt-transform])
-   (define xs (nonlinear-seq 1 5 20 log-transform))
-   (define ys (nonlinear-seq -1 5 20 cbrt-transform))
-   (plot (points (map vector xs ys)))))
-
-(let ()
-  (define trans1 (hand-drawn-transform 25))
-  (define trans2 (hand-drawn-transform 100))
-  (values
-   (parameterize ([plot-x-transform  trans1])
-     (plot (list (function values -2 2)
-                 (function cos -2 2 #:color 3))))
-   (parameterize ([plot-x-transform  trans2])
-     (plot (list (function values -2 2)
-                 (function cos -2 2 #:color 3))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq -2 2 20 trans1))
-     (define ys (nonlinear-seq -2 2 20 trans2))
-     (plot (points (map vector xs ys))))))
-
-(let ()
-  (define trans1 (stretch-transform -1/2 1/2 4))
-  (define trans2 (stretch-transform -1/2 1/2 1/4))
-  (values
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (plot (list (y-axis -1/2) (y-axis 1/2)
-                 (x-axis -1/2) (x-axis 1/2)
-                 (function values -2 2)
-                 (function cos -2 2 #:color 3))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq -2 2 20 trans1))
-     (define ys (nonlinear-seq -2 2 20 trans2))
-     (plot (points (map vector xs ys))))))
-
-(let ()
-  (define trans1 (axis-transform-compose id-transform (stretch-transform -1 1 1/4)))
-  (define trans2 (axis-transform-compose (stretch-transform -1 1 1/4) id-transform))
-  (values
-   (parameterize ([plot-x-transform  trans1])
-     (plot (list (y-axis -1) (y-axis 1)
-                 (function values -2 2)
-                 (function cos -2 2 #:color 3))))
-   (parameterize ([plot-x-transform  trans2])
-     (plot (list (y-axis -1) (y-axis 1)
-                 (function values -2 2)
-                 (function cos -2 2 #:color 3))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq -2 2 20 trans1))
-     (define ys (nonlinear-seq -2 2 20 trans2))
-     (plot (points (map vector xs ys))))))
-
-(let ()
-  (define t1 (stretch-transform -2 -1 4))
-  (define t2 (stretch-transform 1 2 4))
-  (values
-   (parameterize ([plot-x-transform  (axis-transform-compose t1 t2)]
-                  [plot-x-ticks      (ticks-add (plot-x-ticks) '(-1 1))])
-     (plot (list (y-axis -2) (y-axis -1)
-                 (y-axis 1) (y-axis 2)
-                 (function values -3 3)
-                 (function cos -3 3 #:color 3))))
-   (parameterize ([plot-x-transform  (axis-transform-compose t2 t1)]
-                  [plot-x-ticks      (ticks-add (plot-x-ticks) '(-1 1))])
-     (plot (list (y-axis -2) (y-axis -1)
-                 (y-axis 1) (y-axis 2)
-                 (function values -3 3)
-                 (function cos -3 3 #:color 3))))
-   (parameterize ([plot-x-transform  (axis-transform-compose t2 t1)]
-                  [plot-y-transform  (axis-transform-compose t1 t2)])
-     (define xs (nonlinear-seq -3 3 20 (axis-transform-compose t2 t1)))
-     (define ys (nonlinear-seq -3 3 20 (axis-transform-compose t1 t2)))
-     (plot (points (map vector xs ys))))))
-
-(let ()
-  (define t1 (stretch-transform -2 0 4))
-  (define t2 (stretch-transform -1 1 1/4))
-  (define t3 (stretch-transform 2 3 4))
-  (define trans1 (axis-transform-compose (axis-transform-compose t3 t2) t1))
-  (define trans2 (axis-transform-compose (axis-transform-compose t2 t1) t3))
-  (values
-   (parameterize ([plot-x-transform  trans1])
-     (plot (list (y-axis -2) (y-axis 0)
-                 (y-axis -1) (y-axis 1)
-                 (y-axis 2) (y-axis 3)
-                 (function values -3 4)
-                 (function cos -3 4 #:color 3))))
-   (parameterize ([plot-x-transform  trans2])
-     (plot (list (y-axis -2) (y-axis 0)
-                 (y-axis -1) (y-axis 1)
-                 (y-axis 2) (y-axis 3)
-                 (function values -3 4)
-                 (function cos -3 4 #:color 3))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq -3 4 20 trans1))
-     (define ys (nonlinear-seq -3 4 20 trans2))
-     (plot (points (map vector xs ys))))))
-
-(let ()
-  (define trans1 (axis-transform-compose (stretch-transform 2 3 4) log-transform))
-  (define trans2 (axis-transform-compose log-transform (stretch-transform 2 3 4)))
-  (values
-   (parameterize ([plot-x-transform  trans1])
-     (plot (list (y-axis 2) (y-axis 3)
-                 (function values 1 5)
-                 (function cos 1 5 #:color 3))))
-   (parameterize ([plot-x-transform  trans2])
-     (plot (list (y-axis 2) (y-axis 3)
-                 (function values 1 5)
-                 (function cos 1 5 #:color 3))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq 1 5 20 trans1))
-     (define ys (nonlinear-seq 1 5 20 trans2))
-     (plot (points (map vector xs ys))))))
-
-(let ()
-  (define trans (collapse-transform -1 1))
-  (values
-   (parameterize ([plot-x-transform  trans])
-     (plot (list (y-axis 1)
-                 (function values -2 2)
-                 (function cos -2 2 #:color 3))))
-   (parameterize ([plot-x-transform  trans]
-                  [plot-y-transform  trans])
-     (define xs (nonlinear-seq -2 2 20 trans))
-     (plot (points (map vector xs xs))))))
-
-(let ()
-  (define trans1 (axis-transform-compose (collapse-transform 2 3) log-transform))
-  (define trans2 (axis-transform-compose log-transform (collapse-transform 2 3)))
-  (values
-   (parameterize ([plot-x-transform  trans1])
-     (plot (list (y-axis 3)
-                 (function values 1 5)
-                 (function cos 1 5 #:color 3))))
-   (parameterize ([plot-x-transform  trans2])
-     (plot (list (y-axis 3)
-                 (function values 1 5)
-                 (function cos 1 5 #:color 3))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq 1 5 20 trans1))
-     (define ys (nonlinear-seq 1 5 20 trans2))
-     (plot (points (map vector xs ys))))))
-
-(let ()
-  (define trans1 (axis-transform-compose (stretch-transform -1 1 4)
-                                         (collapse-transform -1/2 1/2)))
-  (define trans2 (axis-transform-compose (collapse-transform -1/2 1/2)
-                                         (stretch-transform -1 1 4)))
-  (values
-   (parameterize ([plot-x-transform  trans1])
-     (plot (list (y-axis -1) (y-axis 1)
-                 (y-axis -1/2) (y-axis 1/2)
-                 (function values -2 2)
-                 (function cos -2 2 #:color 3))))
-   (parameterize ([plot-x-transform  trans2])
-     (plot (list (y-axis -1) (y-axis 1)
-                 (y-axis -1/2) (y-axis 1/2)
-                 (function values -2 2)
-                 (function cos -2 2 #:color 3))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq -2 2 20 trans1))
-     (define ys (nonlinear-seq -2 2 20 trans2))
-     (plot (points (map vector xs ys))))))
-
-(let ()
-  (define trans1 (axis-transform-compose (collapse-transform -1 1) (collapse-transform -1/2 1/2)))
-  (define trans2 (axis-transform-compose (collapse-transform -1/2 1/2) (collapse-transform -1 1)))
-  (values
-   (parameterize ([plot-x-transform  trans1])
-     (plot (list (y-axis 1) (y-axis 1/2)
-                 (function values -2 2)
-                 (function cos -2 2 #:color 3))))
-   (parameterize ([plot-x-transform  trans2])
-     (plot (list (y-axis 1) (y-axis 1/2)
-                 (function values -2 2)
-                 (function cos -2 2 #:color 3))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq -2 2 20 trans1))
-     (define ys (nonlinear-seq -2 2 20 trans2))
-     (plot (points (map vector xs ys))))))
-
-(parameterize ([plot-x-transform  (collapse-transform -1 1)])
-  (plot (function values 0 2)))
-
-(parameterize ([plot-x-transform  (collapse-transform -1 1)])
-  (plot (function values -2 0)))
-
-(parameterize ([plot-x-transform  (axis-transform-append id-transform log-transform 0.1)])
-  (plot (function sin -4 4)))
-
-(let ()
-  (define trans (axis-transform-append id-transform log-transform 2))
-  (define ticks (log-ticks #:base 10))
-  (values
-   (parameterize ([plot-x-transform  trans]
-                  [plot-x-ticks      ticks])
-     (plot (list (function values 1 15)
-                 (function cos 1 15 #:color 3))))
-   (parameterize ([plot-x-transform  trans]
-                  [plot-y-transform  trans])
-     (define xs (nonlinear-seq 1 15 20 trans))
-     (plot (points (map vector xs xs))))))
-
-(let ()
-  (define t1 (stretch-transform 2 3 4))
-  (define t2 (stretch-transform 7 8 4))
-  (define trans1 (axis-transform-compose (axis-transform-append t1 t2 5) log-transform))
-  (define trans2 (axis-transform-compose log-transform (axis-transform-append t1 t2 5)))
-  (values
-   (parameterize ([plot-x-transform  trans1])
-     (plot (list (for/list ([x  (in-list '(2 3 7 8))]) (y-axis x))
-                 (function values 1 9))))
-   (parameterize ([plot-x-transform  trans2])
-     (plot (list (for/list ([x  (in-list '(2 3 7 8))]) (y-axis x))
-                 (function values 1 9))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq 1 9 50 trans1))
-     (define ys (nonlinear-seq 1 9 50 trans2))
-     (plot (points (map vector xs ys))))))
-
-(let ()
-  (define trans1 (axis-transform-append log-transform id-transform 5))
-  (define trans2 (axis-transform-append id-transform log-transform 5))
-  (values
-   (parameterize ([plot-x-transform  trans1])
-     (plot (list (y-axis 5)
-                 (function values 6 10)
-                 (function cos 6 10 #:color 3))))
-   (parameterize ([plot-x-transform  trans2])
-     (plot (list (y-axis 5)
-                 (function values 6 10)
-                 (function cos 6 10 #:color 3))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq 6 10 20 trans1))
-     (define ys (nonlinear-seq 6 10 20 trans2))
-     (plot (points (map vector xs ys))))
-   (parameterize ([plot-x-transform  trans1])
-     (plot (list (y-axis 5)
-                 (function values 1 4)
-                 (function cos 1 4 #:color 3))))
-   (parameterize ([plot-x-transform  trans2])
-     (plot (list (y-axis 5)
-                 (function values 1 4)
-                 (function cos 1 4 #:color 3))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq 1 4 20 trans1))
-     (define ys (nonlinear-seq 1 4 20 trans2))
-     (plot (points (map vector xs ys))))))
-
-(parameterize ([plot-x-transform  (axis-transform-compose (collapse-transform 2 6)
-                                                          log-transform)]
-               [plot-x-ticks      (ticks-add (log-ticks) '(2 6))])
-  (plot (list (y-axis 2) (y-axis 6)
-              (function values 1 10))))
-
-(let ()
-  (define trans1 (axis-transform-bound log-transform 0.1 5))
-  (define trans2 (axis-transform-bound (stretch-transform 1 2 4) 1 2))
-  (values
-   (parameterize ([plot-x-transform  trans1])
-     (plot (list (y-axis 0.1) (y-axis 5)
-                 (function values -3 9))))
-   (parameterize ([plot-x-transform  trans2])
-     (plot (list (y-axis 1) (y-axis 2)
-                 (function values 0 3))))
-   (parameterize ([plot-x-transform  trans1]
-                  [plot-y-transform  trans2])
-     (define xs (nonlinear-seq -3 9 20 trans1))
-     (define ys (nonlinear-seq 0 3 20 trans2))
-     (plot (points (map vector xs ys))))))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/compat-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/compat-tests.rkt
deleted file mode 100644
index 79ca0c7e86..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/compat-tests.rkt
+++ /dev/null
@@ -1,15824 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 6.0.1.10 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 31 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 93
-(
- #"((lib \"collapsed-snipclass.ss\" \"framework\") (lib \"collapsed-sni"
- #"pclass-wxme.ss\" \"framework\"))\0"
-) 0 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 88
-(
- #"((lib \"pict-snip.rkt\" \"drracket\" \"private\") (lib \"pict-snip.r"
- #"kt\" \"drracket\" \"private\"))\0"
-) 0 0 34 #"(lib \"bullet-snip.rkt\" \"browser\")\0"
-0 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 29 #"drclickable-string-snipclass\0"
-0 0 26 #"drracket:spacer-snipclass\0"
-0 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 1 6 #"wxloc\0"
-          0 0 144 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 7 #"Monaco\0"
-0 11 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1 2
-1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1 0 -1 92 93 -1 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 38
-#"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 35
-#"framework:syntax-color:scheme:text\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 49
-#"framework:syntax-color:scheme:hash-colon-keyword\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 16
-#"Misspelled Text\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
-#"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 37
-#"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 37 #"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 92 -1 93 -1 -1 0 1 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 0 1
-#"\0"
-0 75 10 #"Monospace\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 41 128 38 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 81 112 203 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 178 34 34 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 0 203 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 116 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 142 28 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 176 48 96 0
-0 0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 200 0 0 0 0
-0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 0 -1 -1 0 1 #"\0"
-0 75 1 #"\0"
-0.0 11 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 11 #" Monospace\0"
-0.0 14 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 38 #"drscheme:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 81 112 203 0
-0 0 -1 -1 2 31 #"drscheme:check-syntax:imported\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 68 0 203 0 0
-0 -1 -1 2 35 #"profj:syntax-colors:scheme:keyword\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 37 #"profj:syntax-colors:scheme:prim-type\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 2 38 #"profj:syntax-colors:scheme:identifier\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 38 38 128 0
-0 0 -1 -1 2 34 #"profj:syntax-colors:scheme:string\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:literal\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 34 139 34 0
-0 0 -1 -1 2 35 #"profj:syntax-colors:scheme:comment\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 194 116 31 0
-0 0 -1 -1 2 33 #"profj:syntax-colors:scheme:error\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 35 #"profj:syntax-colors:scheme:default\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 37 #"profj:syntax-colors:scheme:uncovered\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 35 #"profj:syntax-colors:scheme:covered\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 139 0
-0 0 -1 -1 8 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 8 24 #"drscheme:text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 0 1 #"\0"
-0 75 11 #" Monospace\0"
-0.0 11 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 11 #" Monospace\0"
-0.0 15 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 14 #"Html Standard\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 0 1
-#"\0"
-0 75 1 #"\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 10 90 -1 90 -1 2 -1 0 1 0 0 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 40 25 15 0 0
-0 -1 -1 2 30 #"drscheme:check-syntax:keyword\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 40 25 15 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0
-0 0 -1 -1 2 39 #"drscheme:check-syntax:unbound-variable\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 248 20 64 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 2 37 #"drscheme:check-syntax:bound-variable\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 2 32 #"drscheme:check-syntax:primitive\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 36 36 140 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 51 135 39 0
-0 0 -1 -1 2 31 #"drscheme:check-syntax:constant\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 51 135 39 0
-0 0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 165 0 0
-0 0 -1 -1 2 32 #"drscheme:check-syntax:tail-call\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 165 0 0
-0 0 -1 -1 2 27 #"drscheme:check-syntax:base\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 132 60 36 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0
-0 0 -1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 80 80 248 0
-0 0 -1 -1 2 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 94 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 200 0 0 0 0
-0 -1 -1 4 32 #"widget.rkt::browser-text% basic\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 59
-#"macro-debugger/syntax-browser/properties color-text% basic\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 114 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 190 190 190
-0 0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 107 142 35 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 139 0 0 0 0
-0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 100 149 237
-0 0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 65 105 225 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 70 130 180 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 47 79 79 0 0
-0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 139 0 0
-0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 75 0 130 0 0
-0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 160 32 240 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 165 0 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 250 128 114
-0 0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 184 134 11 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 128 128 0 0
-0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 169 169 169
-0 0 0 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-228 225 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 0 0 224
-255 255 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 224
-255 255 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-0.0 11 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-0.0 11 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 24 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 14 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 44 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1 46 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 1 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 -1 -1           0 1416 0 28 3 12 #"#lang racket"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 17 3 1 #"#"
-0 0 17 3 1 #"|"
-0 0 17 29 1 #"\n"
-0 0 17 3 51 #"Visual compatibility tests for the new plot library"
-0 0 17 29 1 #"\n"
-0 0 17 29 1 #"\n"
-0 0 17 3 97
-(
- #"This file outputs old plots followed by new plots, twice. The first "
- #"time, it uses the bare 'plot'"
-) 0 0 17 29 1 #"\n"
-0 0 17 3 101
-(
- #"module. The second time, it uses 'plot/compat', which is a bit more "
- #"faithful to the old version (i.e."
-) 0 0 17 29 1 #"\n"
-0 0 17 3 95
-(
- #"it renders axes in 2D plots, uses a 45-degree viewing angle in 3D pl"
- #"ots, matches colors better,"
-) 0 0 17 29 1 #"\n"
-0 0 17 3 28 #"uses default bounds [-5,5])."
-0 0 17 29 1 #"\n"
-0 0 17 29 1 #"\n"
-0 0 17 3 46 #"Some plots may not match semantically because:"
-0 0 17 29 1 #"\n"
-0 0 17 3 102
-(
- #" - The new plot library (not plot/compat) sometimes finds tight plot"
- #" bounds (e.g. first 'points' test)"
-) 0 0 17 29 1 #"\n"
-0 0 17 3 83
-(
- #" - Bug fixes in plot and plot/compat (e.g. line #:mapping 'polar use"
- #"s min/max args)"
-) 0 0 17 29 1 #"\n"
-0 0 17 3 86
-(
- #" - The new libraries interpret the #:levels argument to 'contour' a "
- #"little differently"
-) 0 0 17 29 1 #"\n"
-0 0 17 3 2 #"|#"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 7 #"require"
-0 0 24 3 2 #" ("
-0 0 14 3 7 #"only-in"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"plot/compat"
-0 0 24 3 1 #" "
-0 0 14 3 8 #"gradient"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"trig"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"y"
-0 0 24 3 3 #") ("
-0 0 14 3 1 #"*"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"sin"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 24 3 3 #") ("
-0 0 14 3 3 #"sin"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"y"
-0 0 24 3 3 #")))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 2 #" ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"snip"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 49 #"\"-----------------------------------------------\""
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 1 #"\""
-0 0 19 3 41 #"The old plot library produced this plot:\""
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"snip"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 2 #" ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"snip"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 6 #"printf"
-0 0 24 3 1 #" "
-0 0 19 3 40 #"\"The '~a' library produces this plot:~n\""
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"snip"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 24 3 2 #" ("
-0 0 14 3 9 #"run-tests"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"dynamic-require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 6 #"plot3d"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"dynamic-require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 6 #"plot3d"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"mix"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"dynamic-require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 3 #"mix"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 6 #"points"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"dynamic-require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 6 #"points"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 10 #"error-bars"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"dynamic-require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 10 #"error-bars"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"line"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"dynamic-require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"line"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 12 #"vector-field"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"dynamic-require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 12 #"vector-field"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 5 #"shade"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"dynamic-require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 5 #"shade"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 7 #"contour"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"dynamic-require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 7 #"contour"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 7 #"surface"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"dynamic-require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 7 #"surface"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 71
-(
- #"#;; Commenting it out because DrDr complains about deprecation warni"
- #"ngs"
-) 0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 4 #"when"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"eq?"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"plot"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 5 #"    ("
-0 0 15 3 6 #"define"
-0 0 24 3 1 #" "
-0 0 14 3 26 #"plot-deprecation-warnings?"
-0 0 24 3 2 #" ("
-0 0 14 3 15 #"dynamic-require"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 26 #"plot-deprecation-warnings?"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 5 #"    ("
-0 0 14 3 26 #"plot-deprecation-warnings?"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"#t"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 14 #";; Points test"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2          39 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          14 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0\32JIDATx\234\355\335\177hU\347\35"
- #"\307\361\317\251\365\0321\20s\35q\235,n\336\216\201\375#\222`mS\205A"
- #"\241[I\re0\2450Ah\375\363"
- #"\b\241\203N\241\375c\203\220\250\223\302"
- #"\330\330\17(\263\376\221\325\2774\16\373"
- #"\307\"\254\271\331\330 )\246\260\25\246"
- #"\ts$\260\320aZ\32\207I\324\263"
- #"?\322\334\346\306\253I\236\234s\317\363"
- #"=\367\375\202\v\315\2757\317\375\346\211"
- #"O>}\236\347\374\b\242(\212\4\0\300\32=\226v\1\0\0\233\b\20\0\200"
- #"\23\2\4\0\340\204\0\1\08!@\0\0N\b\20\0\200\23\2\4\0\340\204"
- #"\0\1\08!@\0\0N\b\20\0\200\23\2\4\0\340\204\0\1\08!@"
- #"\0\0N\b\20\0\200\23\2\4\0\340\204\0\1\08!@\0\0N\b\20\0"
- #"\200\23\2\4\0\340\204\0\1\08!@\0\0N\b\20\0\200\23\2\4\0\340"
- #"\204\0\1\08!@\0\0N\b\20\0\200\23\2\4\0\340\204\0\1\08!"
- #"@\0\0N\b\20\0\200\23\2\4\0\340\204\0\1\08!@\0\0N\b\20"
- #"\0\200\23\263\1R(\24\24\4A\351\261s\347\316\262\327'&&\24\206\241\32"
- #"\32\32\24\206\241&''S\252\24\0"
- #"\262\311l\200\214\215\215)\212\"\335\275"
- #"{W\317<\363\214N\236<Y\366\372\236={$IW\257^\225$\265\264\264"
- #"T\275F\0\310\262 \212\242(\355\""
- #"\326\343\314\2313\32\30\30\320\373\357\277\257 \b$ISSS*\24\n\232\231"
- #"\231)\275\257\276\276^\343\343\343jj"
- #"jJ\253T\0\310\24\363\1\322\334\334\254\333\267o\353\322\245K\332"
- #"\277\177\277$\251\253\253K\2337oVwww\351}'N\234\320\354"
-) 500
-(
- #"\354\254\316\236=\233V\251\0\220)\346"
- #"\3D\222>\374\360Cuvv\352\334\271sz\376\371\347+\3166*\315J\0"
- #"\0\356\36O\273\2008\264\266\266\252\257"
- #"\257O\235\235\235\232\236\236^\323\367."
- #".{\1\200o>\377\374s\325\327\327\247]\306Ce\"@\226\v\303P=="
- #"=e\313U===:~\374x\305\367?j\22\26\4\301#__\r\332\360"
- #"\257\r\37j\240\215\370\333\360\241\2068"
- #"\333\3609<$\243KX\355\355\355:u\352Ti\317C\222\32\e\eu\371\362"
- #"e\355\337\277\177M\233\350+\375\242}"
- #"\372\307D\e\361\265\341C\r\264\21\177\e>\324\340S\eI3y\30ooo"
- #"\257\16\35:\244\241\241\241\322\371\36\e"
- #"6l(\5\312\366\355\333UWW\2470\f5<<\2540\fUWW\347t"
- #"\4\326\246M\233\326]o\34m\304\301\227\237\305\2276|\250!Km\304a\275"
- #"u\370\322\27\276\364g\322L\6\310\201"
- #"\3\a\364\336{\357\351\245\227^\322\223O>)I\32\35\35-{\317\265k\327"
- #"$I\35\35\35\25__\255;w\356\254\243\322\370\332\210\203/?\213/m\370"
- #"PC\226\332\210\303z\353\360\245/|"
- #"\351\317\244\231\\\302\212\223\205i\242d"
- #"\247N+\350\317\370\321\247\361\262\320\237"
- #"&g \300z\325\312\22C5\321\247"
- #"\265\207\31\210\201\224\227\354\324\t \36"
- #"\26\306<3\20\0\200\23\2\4\0\340\204\0\1\08!@\0\0N\b\20\0"
- #"\200\23\2\4\0\340\204\0\1\08!@\0\0N\b\20\0\200\23\2\4\0\340"
- #"\204\0\321\302%\3\202 P.\227K\273\2242\271\\\256T\233\344o\235\0\342"
- #"\261|\314\373\216ka\31\270\336\214d"
- #"\247N\0\361\2600\346\231\201\0\0\234\20 \0\0'\4\b\0\300\t"
- #"\1\2\0pB\200\0\0\234\20 \0\0'\4\b\0\300\t\1\2\0"
-) 500
-(
- #"pB\200\0@\\\362y)\b\276|\344\363iW\224(\316D7p\266\247d"
- #"\247N\240\246\5\201\264t\234.\377zMM\371?\346\231\201\0\0\234\20 \0"
- #"\0'\217\247]\0\0dFc\343\302"
- #"\262\325\242\346\346\364j\251\2\366@\f\2543Jv\352\4\20\17\vc\236%,"
- #"\0\200\23\2\4\0\340\204\0\221\277w"
- #"\372\343\216\204@m\341\216\204\306XX"
- #"g\224\354\324\t \36\26\306<3\20\0\200\23\2\4\0\340\204\0\1\08!"
- #"@\0\0N\b\20\0\200\23\2\4\0\340\204\0\1\08!@\0\0N\b\20"
- #"\0\200\23\2\4\0\340\204\0\1\08!@\0\0N\b\20\0\200\23\2\4\0"
- #"\340\204\0\1\08!@\0\0N\b\20\0\200\23\2D\376\336*\226[\332\2"
- #"\265\205[\332\32c\341\266\221\222\235:"
- #"\1\304\303\302\230g\6\2\0pB\200\0\0\234\20 \0\0'\4\b\0\300\t"
- #"\1\2\0pB\200\0\0\234\20 \0\0'\4\b\0\300\t\1\2\0pB\200"
- #"\0\0\234\20 \0\0'\4\b\0\300\t\1\2\0pB\200\0\0\234\20 \0"
- #"\354\313\347\245 \370\362\221\317\247]Q"
- #"M\340~ \6\256\271/\331\251\23HE\20HK\307\307\362\257\r\2620\346\231"
- #"\201\310\337;\375qGB\240\266pGBc,\244\274d\247N \25\314@R"
- #"\361x\332\5\0\300\27256.\204\306"
- #"\242\346\346\364j\251!\314@\f\244\274"
- #"d\247N\0\361\2600\346\331\3\1\200"
- #"\325\342h\2572\4\b\200\332\20\307\37"
- #"\377\351\351\205\275\225\305\307\364t\374u"
- #"\32\302\22\226\201i\242d\247N\300[ql\264Wq\263\336\302\230g\6\2\0"
- #"p\302QX\0\260Z\34\355U\206\0\1P\e\342\370\343\177\353V|\365d\0"
- #"{ \6\326\31%;u\2\17\310\347\3137\233"
- #"\e\e\371C\274\n\26\306<\1b\340\227$\331"
-) 500
-(
- #"\251\23x@\6\317\22\257\6\vc\236Mt\0\200\23\263\1R,\26\265m\333"
- #"6\5A\240m\333\266ihh\250\354"
- #"\365\211\211\t\205a\250\206\206\6\205a"
- #"\250\311\311\311\224*\5\200l2\e "
- #"\235\235\235\272t\351\222\242(\322\305\213"
- #"\27u\360\340\301\262\327\367\354\331#I"
- #"\272z\365\252$\251\245\245\245\3525\2"
- #"\320\227\233\327\213\217\32?r)K\314"
- #"\356\201<\365\324S\372\373\337\377^\372"
- #"z\351z\341\324\324\224\n\205\202fffJ\257\327\327\327k||\\MMM"
- #"e\355XXg\224\354\324\t \36\26"
- #"\306\274\331\31\310\322\360\230\232\232\322\226"
- #"-[J_\367\364\364\350\370\361\343e\357\17\303P===U\253\17\0\262\316"
- #"\354\fd\251\256\256.m\336\274Y\335\335\335\222*\3176*\315J$\e)/"
- #"\331\251\23@<,\214y\363'\22\26"
- #"\213E\365\365\365\351\243\217>rn\243"
- #"\322\335\2776n\334\250\271\271\271\365\224"
- #"\346$\227\313i~~\276\342k>\325\t \36\217\32\363\2763\273\204%I\3"
- #"\3\3z\345\225Wt\345\312\225\262\331"
- #"F\245\345\252J\313Z\213\242(z\340"
- #"\221\326\37\345\271\271\271\212\365\370V'"
- #"\200x<j\314\373\316\354\22\326\300\300"
- #"\200\216\36=\252\376\376~\265\266\266\226"
- #"\275\306&:\0\353,\214y\2233\220G\205\207$m\337\276]uuu\n\303"
- #"P\303\303\303\n\303Puuu\17\204\a\0\300\235\311\09v\354\230&''"
- #"\325\326\326\246 \bJ\217B\241Pz"
- #"\317\265k\327$I\35\35\35\222\244\321"
- #"\321\321Tj\5\200\2542\273\204\25\27"
- #"\v\323D\311N\235\0\342aa\314\233\234\201\0\0\322G\200\0\0\234\20 \0"
- #"\0'\4\b\0\300\t\1\2\0pB\200\0\0\234\20 \0\340\223\\N\n"
- #"\2\215\245]\307*p\36\210\201c\255%;u\2X\247/\356\31oa\314"
-) 500
-(
- #"3\3\1\08!@\0\0N\b\20\0\360\311\27\367\220\267\260\aB\200\0\265"
- #",\237_Xs_|\344\363iW\204[\267\244(Ra\345w\246\216M\364%"
- #"w\371\363\355\356~\17\273S\231ou\302\260/6l\37\3725\252j\371\230\367"
- #"\375\3173\1b\340H\a\311N\2350"
- #"\206\0\361\226\2051\317\22\26\0\300\311\343i\27\0 E_l\330\22647\247"
- #"W\v\314a\t\313\3004Q\262S'\200xX\30\363,a\1\0\234\20 \0"
- #"\0'\4\b\0\300\t\1\2\0pB\200\0\0\234\20 \0\0'\4\b\0\300"
- #"\t\1\2\0pB\200\0\0\234\20 \0\0'\4\b\0\300\t\1\2\0pB"
- #"\200\0\0\234\20 \0\0'\4\210\26"
- #".\233\34\4\201r\271\\\332\245\224\311"
- #"\345r\245\332$\177\353\4\20\217\345c"
- #"\336w\334\17\304\3005\367%;u\2\210\207\2051\317\f\4\0\340\204\0\1\0"
- #"8!@\0\244/\237_\2707\373\342#\237O\273\"\254\2{ \6\326\31%"
- #";u\2N\202@Z\372\357{\371\3275\310\302\230g\6\2\0pB\200\0\0"
- #"\234<\236v\1\0\240\306\306\205e\253"
- #"E\315\315\351\325\202Uc\17\304\300:"
- #"\243d\247N\0\361\2600\346Y\302\2\08!@\0\0N\b\20\0\200\223\304"
- #"\2\244X,\252\275\275\275\364\337O="
- #"\365\224\206\206\206\222\3728\0@\225%"
- #"\26 \235\235\235:u\352\224\246\246\246"
- #"\364\203\37\374@\307\216\35\323\241C\207"
- #"\b\21`\2658;\e\236K\354(\254\305#\b~\364\243\37)\b\2\235>}"
- #"Z\305bQ\235\235\235\232\236\236N\342#\235X8\322A\262S'b\304\331\331"
- #"5\315\302\230O\374<\220_\375\352W\32\37\37O\372c\0\0U\226\330\22\326"
- #"\326\255[\365\366\333ok\343\306\215jjjR"
- #"\261X\324\341\303\207u\371\362\345\244>\22\0P"
-) 500
-(
- #"E\211\5H\177\177\277\372\372\372J\201"
- #"\361\306\eo\350\302\205\v\332\277\177\177"
- #"R\37\351\314\327;\375qG\302\32\267"
- #"xv\366\342\203\263\2633\217;\22\32ca\235Q\262S'\200xX\30\363\261"
- #"\316@\362\371\274v\355\332%I*\24\n\245$]\372(\24\nq~$\0 "
- #"%\261n\242\177\345+_\321;\357\274#I\32\e\e\213\263i\0\200gX\302"
- #"20M\224\354\324\t \36\26\306|b\233\350mmm\272p\341B\331s\27"
- #".\\P[[[R\37\t\0\250\242\304\316\3\371\335\357~\247\316\316N\375\371"
- #"\317\177\326\317~\3663\275\376\372\353\352"
- #"\357\357W\177\177\177R\37\t\0\250\242"
- #"D\227\260\376\373\337\377\352\345\227_\326"
- #"?\377\371O}\373\333\337\326\305\213\27"
- #"\265m\333\266\244>\316\211\205i\242d"
- #"\247N\0\361\2600\346\23\275\32\357\314"
- #"\314\214>\373\3543544\350\323O"
- #"?\325\347\237\177\236\344\307\1\0\252("
- #"\261\0\371\340\203\17\264o\337>\275\366"
- #"\332k\272~\375\272^{\3555\355\333\267O\37|\360AR\37\t\0\250\242\304"
- #"\226\260\332\332\332\364\306\eo\350\320\241"
- #"C\245\347.\\\270\240\336\336^\215\214\214$\361\221N,L\23%;u\2\210"
- #"\207\2051\317a\274\6~I\222\235:"
- #"\1\304\303\302\230Ol\tk\307\216\35"
- #"\234\211\16\0\31\226X\200\374\357\177\377"
- #"S\261XT\24E\212\242H\203\203\203z\342\211't\356\334\271\244>\22\0P"
- #"E\211\337Pj)n(\345\316J\235\0\342aa\314'z\30/\0 \273\22"
- #"\275\241\324\322\373\237sC)\0\310\226"
- #"\304\226\260\212\305\242\16\36<\250\317>"
- #"\373L\222\324\320\320\240?\374\341\17\336"
- #"\335P\312\3024Q\262S'\200xX\30\363\34\306\273\344\316_\e7n"
- #"\324\334\334\\\212\325\224\313\345r\232\237"
- #"\237\177\340y\337\352\4\20\217\345c\336"
-) 500
-(
- #"\367?\317\4\210\201\224\227\354\324\t "
- #"\36\26\306<\233\350\0\0'\4\b\0\300\t\1\2\0pB\200\0i\310\347\245"
- #" \370\362\221\317\247]\21\260fl\242"
- #"\e\330\250\222\354\324\211U\n\2i\351"
- #"\357s\371\327\250y\26\306|\2543\220"
- #"\275{\367r\255+\0\250\21\261\316@"
- #"\256_\277\256C\207\16\351\233\337\374\246"
- #"\336y\347\35m\335\2725\256\246\23c!\345%;ub\225\230\201`\5\26\306"
- #"|\2543\220o}\353[\372\353_\377"
- #"\252\257\177\375\353\332\267o\237\256]\273"
- #"\26g\363@v46\226\357\20147\307\377\31\354\263 a\211\355\201\234<y"
- #"R\247O\237\326\335\273w\313\236\337\265"
- #"k\227\306\306\306\222\370H'\26R^\262S'<\302,\3074\vc>\221\243"
- #"\260\6\6\6\364\356\273\357\352o\177\373"
- #"[\351~ \213\17\237\302\3\0\340."
- #"\366\0\31\30\30\320\321\243G\325\337\337"
- #"\257\326\326\326\270\233\a\0x\"\326\0"
- #"\251vx\24\213E\355\336\275\273\342k\23\23\23\n\303P\r\r\r\n\303P\223"
- #"\223\223\211\327\3x\245\32\373,\250i"
- #"\261\6\310[o\275\245\337\377\376\367U"
- #"\v\217\303\207\17\353\343\217?\256\370\372"
- #"\236={$IW\257^\225$\265\264\264$^\23\340\225[\267\26\366<\26\37"
- #"7o\246]\0212\306\354\211\204\355\355"
- #"\355:u\352\224\16\348\360\300F\323"
- #"\324\324\224\n\205\202fffJ\317\325\327\327k||\\MMMe\357\265\260"
- #"Q%\331\2513\23\362yi\351m\227\e\e\27\376\30\3Uda\314\233\r\220"
- #"E\225:\271\253\253K\2337oVwww\351\271\23'NhvvVg\317"
- #"\236]\361\373}d\245\316LX\351\350%\2\6U`a\314g2@*\3156"
- #"*\315J\36\366\375>\262Rg&\254\24 \34\36\213"
- #"*\2600\346\271\230\242\26~Q\313\37\271\\.\225Z"
-) 500
-(
- #"r\271\\\305z|\253\23@<\0365\346}\227\311\0\t\303P===e\317"
- #"\365\364\364\350\370\361\343\25\337\277\374\\"
- #"\225(\212R\273e\354\334\334\\\305z|\2533\3238z\tU\364\2501\357\273"
- #"L.a\261\211\216D-\337\3in\346\b'\304\316\302\230\317\344\fd\373\366"
- #"\355\252\253\253S\30\206\32\36\36V\30\206\252\253\253{ <\0'\265tx,"
- #"\327\323\302#\230\17\220\207\235H\270x"
- #"!\307\216\216\16I\322\350\350h\325j"
- #"\0022cz\272<,\227\316\274P\363\314/a\255\227\205i\242d\247Nd\f"
- #"G\234\245\306\302\2307?\3\1\0\244"
- #"\343\361\264\v\0\340\261\305#\322\26qD\32\226`\t\313\3004Q\262S'\200"
- #"xX\30\363,a\1\0\234\20 \0\0'\4\b\200\365\341\\\221\265\311P\177"
- #"\261\ab`\235Q\262S'j\20\207\372\256\315*\373\313\302\230g\6\2\0p"
- #"B\200\0\0\234p\36\b\200\365\341\\\221\265\311P\177\261\ab`\235Q\262S"
- #"'\200xX\30\363,a\301\226\f\35\301\2X\307\f\304@\312Kv\352L\34"
- #"G\374\240FX\30\363\314@\364\345\255b}\273=\354\322[]J\376\326\t "
- #"\36\313\307\274\357\230\201\30Hy\311N"
- #"\235\211c\6\202\32aa\314s\24\26l\311\320\21,\200u\314@\f\244\274d"
- #"\247N\0\361\2600\346\331\3\1\08!@\0\0N\b\20\0\200\23\2\4\0"
- #"\340\204\0\1\08!@\0\0N\b\20\0\200\23\2\4\0\340\204\0\1\08"
- #"!@\0\0N\b\20\0\200\23\2\4\331\302\r\247\200\252\341b\212\6.X&"
- #"\331\2513u\\\356\35\31aa\3143\3\1\08!@\344\357\235\376\270#!"
- #"P[\254\335\221\220\eJI\336N\23\347\346\346J\377ma:"
- #"\353\5n8\5\303\226\217y\337\261\ab\344\17\263\225:\1\304"
-) 500
-(
- #"\303\302\230g\t\v\0\340\204\0\1\08!@\0\0N\b\20\0\200\23\2\4"
- #"\361\340\fp\240\346p\24\226\201#\35$\3ur\68\20+\357\307\274\230\201"
- #"\0\0\34\21 \0\0'\234\211\216xp\68Ps\330\0031\260\316(\331\251"
- #"\23HD>/MO\177\371uc\243t\353Vz\365T\201\2051\317\22\26`"
- #"U-\35\3716=\275pP\306\342ci\230 5\314@\f\244\274d\247NT"
- #"Q-\35\371VK?\353\27,\214yf \0\0'l\242\3\360\37\aix"
- #"\211\0\1\254\252\245?\252\31\3370\267\212=\220%\3p\343\306\215e7tI"
- #"[.\227\323\374\374\374\3\317\373V'\200x,\37\363\276\377y&@\flT"
- #"Iv\352\4\20\17\vc\236Mt\0\200\23\2\4\0\340\204\0\1\08!@"
- #"\0\0N\b\20\370\243\226.\315\1d\0Ga\318\322A\262S\347\272\324\340"
- #"\345*\200\207\2610\346\231\201\240z\230"
- #"a\0\231\302\f\304@\312Kv\352|\244\225f\30\314@\200\22\vc\236\31\b"
- #"V\247\32\263\207\305Ks,>\262|i\16 \3\230\201\30Hy\311\203:\343"
- #"\230\0350\303\0V-\3651\277\n\\L\21\325SK\27\377\3j\0003\20\3"
- #")/yP'\263\a\240\252R\37\363\253\300\36\bV'+\373\23\34\t\6\304"
- #"\206\31\210\201\224\227\354\324\351=fR"
- #"0\302\302\230g\6\2\0pB\200\324\2\226m\0$\200\0\321\302T1\b\2"
- #"\345r\271\264K)\223\313\345J\265I\353\250szza\231f\3611=\235@"
- #"\265Fde/\a\231\264|\314\373\216=\20\3\353\214\322:\353d\335\0370\307"
- #"\302\337&f \0\0'\234HX\v8\201\17@\2X\30220M\224\354\324"
- #"\t\230\225\317\227\357\01766J\267n\245"
- #"V\216\2051O\200\30\370%Iv\352\4"
-) 500
-(
- #"\314\362l\257\320\302\230g\17\4\0\340\204\0\1\08a\23\35\0$\0166q"
- #"\300\36\210\201uFi\205:=\333\374"
- #"\3\260~\26\3766\261\204\225\5\353=\323\234K\235\0p\300\f\304@\312K+"
- #"\324\271\336\243G<;\372\4\200\215\277"
- #"M\314@P\223|\273\356Y\26\320\247\265'\263\001211\2410\f\325\320\320"
- #"\2400\f599\231vI\311\341\2\201k6??\237\354\a\324\340\262`\342"
- #"}\n\357d6@\366\354\331#I\272z\365\252$\251\245\245%\315r\222u\353"
- #"V\371\36\310\315\233k\373~\2(~\\\1\0315 \223{ SSS*\24"
- #"\n\232\231\231)=W__\257\361\361q555\225\275w\245u\306\\.\247"
- #"\271\271\271u\325\23G\eq\254\207\372"
- #"\362\263\370\320F\342\375\271\312}%\37"
- #"\372\"\2566|\3707\352K_\370\322\237I\313d\200tuui\363\346\315\352"
- #"\356\356.=w\342\304\t\315\316\316\352"
- #"\354\331\263e\357]\351\227\24\307/\2216\374k#\361\32V\31 >\364E\226"
- #"\332\360\241\6\237\332HZ&\3\244\322l\243\322\254D\"@j\265\215\304kX"
- #"~nNss\305\245E\37\372\"Km\370P\203Om$\2153\321\245\25\357"
- #"\376\25\307\335\301h\303\2776\252Z\303\277\377]~\226sZu\324@\e>\324"
- #"\20W\esss^\37\335\226\311\31H\245\345\252J\313Z\0223\220Zm\303"
- #"\207\32h#\3766|\250\301\2476\222"
- #"\226\311\0\211s\23\335\227\177\b\264\21"
- #"o\e>\324@\e\361\267\341C\r>"
- #"\265\221\264L\36\306\273}\373v\325\325"
- #"\325)\fC\r\17\17+\fC\325\325\325=\20\36\253\261i\323\246u\327\23G"
- #"\eq\360\345g\361\245\r\37j\310R\eqXo\35\276\364\205/"
- #"\375\231\264L\6\210$]\273vM\222\324\321\321!I\32\35\35u"
-) 500
-(
- #"j\347\316\235;\353\256%\2166\342\340"
- #"\313\317\342K\e>\324\220\2456\342\260\336:|\351\v_\3723i\231\\\302Z"
- #"\v\v\323D\311N\235V\320\237\361\243O\343e\241?3;\3\1\36\245V\226"
- #"\30\252\211>\255=\314@\f\244\274d"
- #"\247N\0\361\2600\346\231\201\0\0\234\20 \0\0'\4\b\0\300\t\1\2\0"
- #"pB\200\0\0\234\20 \0\0'\4\b\0\300\t\1\2\0pB\200\0\0\234"
- #"\20 \0\0'\4\b\0\300\t\1\242\205k\316\4A\340\335\255#s\271\\\251"
- #"6\311\337:\1\304c\371\230\367\35\27S4p\3012\311N\235\0\342aa\314"
- #"3\3\1\08!@\0\0N\b\20\0\200\23\2\4\0\340\204\0\1\08!"
- #"@\0\0N\b\20\0\200\23\2\4\0\340\204\0\1\08!@\0\0N\b\20"
- #"\0\200\23\2\4\0\340\204\0\1\08!@\0\0N\b\20\0\200\23\2\4\0"
- #"\340\204\0\221\277w\372\343\216\204@m"
- #"\341\216\204\306X\270\353\227d\247N\0"
- #"\361\2600\346\231\201\0\0\234\20 \250I,\3\306\217>\255=\4\bj\322\374"
- #"\374|\332%d\16}Z{\b\20\0\200\23\2d\5qL\313}\231\332\373\362"
- #"\263\370\322\206\0175d\251\2158\254\267"
- #"\16_\372\302\227\376L\32Ga\255p\244C\34GB\320\206\177m\370P\3m"
- #"\304\337\206\0175\370\324F\322\230\201\0"
- #"\0\234\324\374\fd\323\246M\232\233\233"
- #"K\273\f\0x\300\354\354\254\327\313a5\37 \0\0007,a\1\0\234\20 "
- #"\0\0'\4\b\0\300\t\1\2\0pB\200\0\0\234\20 \236\233\230\230P\30"
- #"\206jhhP\30\206\232\234\234L\273$s\212\305\242v\357\336]\3615\372w"
- #"\355\212\305\242\266m\333\246 \b\264m\3336\r\r\r\225\275N"
- #"\237\256M\241P(\335\3$\b\2\355\334\271\263\354u\237\373\223\0"
-) 500
-(
- #"\361\334\236={$IW\257^\225$\265\264\264\244Y\2169\305bQ\207\17\37"
- #"\326\307\37\177\\\361u\372w\355:;;u\351\322%EQ\244\213\27/\352\340"
- #"\301\203e\257\323\247k366\246(\212t\367\356]=\363\3143:y\362d"
- #"\331\353^\367g\4o\375\347?\377\211"
- #"\266l\331R\366\334\226-[\242\251\251"
- #"\251\224*\262\347\331g\237\215\212\305b"
- #"T\351\237:\375\353f\367\356\335e_"
- #"/\355[\372\324\335\351\323\247\243\357~"
- #"\367\273\321\375\373\367K\317\371\336\237\234"
- #"H\350\261\256\256.m\336\274Y\335\335"
- #"\335\245\347N\2348\241\331\331Y\235="
- #"{6\305\312\354\251t]!\372w\375\246\246\246T(\024433#\211>]"
- #"\217\346\346f\335\276}[\227.]\322"
- #"\376\375\373%\371\337\237\4\210\307\352\353"
- #"\3535>>\256\246\246\246\322s\313\a"
- #",V\247R\200\320\277\353\267\374\17\34}\272>\37~\370\241:;;u\356\334"
- #"9=\377\374\363\336\367\347\343i\27\0"
- #"\300\246b\261\250\276\276>}\364\321G"
- #"i\227\222\31\255\255\255\352\353\353Sg"
- #"g\247\246\247\247\323.gEl\242{"
- #",\fC\365\364\364\224=\327\323\323\243"
- #"\343\307\217\247TQ\266\320\277\356\6\6"
- #"\6\364\312+\257\350\312\225+e\377w"
- #"L\237\306\313\373\376Ls\3\6\217\346"
- #"\373\6\232%\225\376\251\323\277n\376\370\307?F;v\354\210FFF\36x\215"
- #">]\233\305\203<\226\332\272uk\351"
- #"9\337\373\223\31\210\307\266o\337\256\272"
- #"\272:\205a\250\341\341a\205a\250\272"
- #"\272\272\262\377\343\203;\372w\355\6\6"
- #"\6t\364\350Q\365\367\367\253\265\265\365"
- #"\201\327\351\323\265\351\355\355\325\241C\207"
- #"444T:\337c\303\206\r\245Mt\337\373\223\0\361\334\265k\327$I\35"
- #"\35\35\222\244\321\321\3214\3131\353a'\22\322\277ks\354\3301MNN\252"
-) 500
-(
- #"\255\255\255\354\344\267B\241Pz\17}"
- #"\272z\a\16\34\320{\357\275\247\227^"
- #"zIO>\371\244\244\a\373\313\347\376\344(,\0\200\23f \0\0'\4\b"
- #"\0\300\t\1\2\0pB\200\240\346=\367\334s\32\e\e+{\356\306\215\e\245"
- #"#a\222\220\317\347\265k\327\256\304\332"
- #"\a\252\201\0A\315;r\344\210~\370"
- #"\303\37\352\336\275{\222\244{\367\356\351"
- #"\310\221#:r\344Hb\237\371\325\257~U\357\276\373nb\355\3\325\300QX"
- #"\250yQ\24\351{\337\373\236^x\341"
- #"\5\275\376\372\353:s\346\214\6\6\6"
- #"\364\376\373\357+\b\202\264\313\3\274\305"
- #"\f\0045/\b\2\375\3467\277Qoo\257._\276\254S\247N\351\327\277\376"
- #"\365\252\302c\351\315\225\202 \320\206\r"
- #"\eJ\257=\375\364\323\32\31\31)}=22\242\247\237~Z\222\312\316\233X"
- #"\336F\245\2334\1^J\365<x\300"
- #"#\277\370\305/\242\372\372\372\350\227\277"
- #"\374\345\252\277g\351e'\242\250\374\222"
- #")W\256\\\211v\354\330\21\335\274y3\272y\363f\364\265\257}-\272r\345"
- #"\312\3\357\333\271sg\364\366\333o\227"
- #"\276\36\34\34\214\236}\366\331\365\374(@Up5^\340\v\267o\337\326\246M"
- #"\233t\373\366\355U\177\317\247\237~\372"
- #"\320\315\366\27_|Qa\30\352\340\301"
- #"\203\212\242H\307\217\37\327\213/\276\370"
- #"\300\373\316\237?\257\357\177\377\373\272q"
- #"\343\206~\374\343\37\353\300\201\3\372\313"
- #"_\376\342\374s\0\325\302\36\b \351"
- #"\37\377\370\207\276\363\235\357\350\342\305\213"
- #"z\371\345\227\365\247?\375\351\241\227?"
- #"Yj\371}F\226\177}\377\376}\355\332\265KA\20hllL\217=\366X"
- #"\305\367MLL\250\267\267W\277\375\355"
- #"o\265e\313\226\262\233\n\1\276b\17\0045\357\336\275{"
- #"z\365\325W\365\323\237\376T\355\355\355\372\311O~\242W"
-) 287
-(
- #"_}\265tT\326\243l\335\272\365\221"
- #"\373\25o\276\371\246v\356\334\251\346\346"
- #"f\275\365\326[\25\337\323\336\336\256\177"
- #"\375\353_\372\371\317\177\256;w\356\350"
- #"\3157\337L\364\b0 6i\256\237\1>X~/\352\373\367\357G/\274\360"
- #"Bt\346\314\231\25\277wpp0z\342\211'\242b\261\30\r\16\16\226\355m"
- #"\234?\177>*\24\n\321'\237|\22}\362\311'Q\241P\210\316\237?\37E"
- #"Q\371\36\310\310\310H\264c\307\216h"
- #"``\340\221\227J\a|C\200\240\346\265\267\267G7n\334({\356\372\365\353"
- #"\321s\317=\267\252\357\37\34\34\214\32"
- #"\32\32\242\206\206\206\350\e\337\370F\351"
- #"\371\275{\367F\303\303\303\245\257\207\207"
- #"\207\243\275{\367FQ\24E\273w\357~h\e\313\357\17\1\370\212=\20\0\200"
- #"\23\366@\0\0N\b\20\0\200\23\2\4\0\340\204\0\1\08!@\0\0N"
- #"\b\20\0\200\23\2\4\0\340\204\0\1\08!@\0\0N\376"
- #"\17\240\262\220%\30\34\301\277\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 21 #"                    ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 6 #"points"
-0 0 24 3 2 #" ("
-0 0 15 3 8 #"for/list"
-0 0 24 3 3 #" (["
-0 0 14 3 1 #"x"
-0 0 24 3 3 #"  ("
-0 0 14 3 8 #"in-range"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"1"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"31"
-0 0 24 3 3 #")])"
-0 0 24 29 1 #"\n"
-0 0 24 3 37 #"                                    ("
-0 0 14 3 6 #"vector"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"*"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"abs"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"sin"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"*"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"87"
-0 0 24 3 6 #"))))))"
-0 0 24 29 1 #"\n"
-0 0 24 3 34 #"                                  "
-0 0 23 3 7 #"#:color"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 3 #"red"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 26 #"                          "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"30"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"30"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 4 #"when"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"eq?"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"plot"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 5 #"    ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 55 #"\"The only semantic difference should be tighter bounds\""
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 28 #";; Points integer #:sym test"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2          71 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          30 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0 \0IDATx\234\355\335\177p\24u\236"
- #"?\376\327$$!?\347W\2\306\201$d\300\225\344\312 \b$!X+*"
- #"\334\356\231\310\311\257\335ZQ\366\340~"
- #"\255\23\224\322:\311U\351\262\272\37\26"
- #"\2243l\201\277Oo\27\266$\200w"
- #"\213\301\322\255J\330\323\356\254u\256\316"
- #".\356n\244\\\22\26%\260\211\260\220"
- #"%D%\222\274\276\177\360\355qf2\223L\277\373=\231\356\231\347\243j\nf"
- #"2\375\232W\277\273\373\375\352~wO\217\215\231\231\0\0\0tJKt\2\0"
- #"\0`M( \0\0 \4\5\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20"
- #"\202\2\2\0\0BP@\0\0@\b\n\b\0\0\bA\1\1\0\0!( "
- #"\0\0 \4\5\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0"
- #"BP@\0\0@\b\n\b\0\0\bA\1\1\0\0!( \0\0 \4\5"
- #"\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0BP@\0\0"
- #"@\b\n\b\0\0\bA\1\1\0\0!( \0\0 \4\5\4\0\0\204\240"
- #"\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0BP@\0\0@\b\n\b\0"
- #"\0\bA\1\1\0\0!( \0\0 \4\5\4\0\0\204\240\200\0\0\200\20"
- #"\24\20\0\0\20\202\2\2\0\0BP@\0\0@\310\244D'\220h6\233-"
- #"\321)\0\0Dt\371\362e\312\314\314Lt\32Q\331\230\231\23\235D\"\331l"
- #"6\32\257\tby\217\314\317\233\31082c\231-\216\314X\310\311\232qd\306"
- #"\232\350\234d~^\274`\b\v\0\0\204\240\200\304 ++\313"
- #"t\261\314\230\223,f\23473\346$\223\331\332\t\355m\r\30"
-) 500
-(
- #"\302\262\300a\242U\240-'\26\332{bMt{[a\371\342\b\4\0\0\204"
- #"\240\200\2004\311rXn\25h\357\211\205\366\36\rCX\268L\4\200\324c"
- #"\205\276\tG \0\0 \4\5\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20"
- #"\202\2\2\0\0BP@\0\0@\b\n\b\0H\343\361x\250\266\266\326p\34"
- #"\257\327+!\e\242\332\332Z\362x<Rb\301hI[@TU\245\374\374|"
- #"\262\331l\344v\273\251\243\243#\321)%=Y\e=XS{{;\2359s"
- #"\206v\357\336m8\326\211\23'$dD\264{\367n:s\346\f\359rD"
- #"J<\b\225\264_$t:\235t\370\360a\252\253\253#UU\251\241\241\201."
- #"\\\2700\352}V\370\262\216U\240-"
- #"S\233\323\351\244\376\376~S\336:\335"
- #"\341pD\334\376\315\314\n\333S\322\26"
- #"\220\360\306\217\2660\254\260\220\254\2m"
- #"\231\332P@\344\262\302\366\224\264CX"
- #"N\247\223\334n7\355\334\271\223\334n"
- #"7\225\224\224\350\216\221\236\236N6\233"
- #"M\3120\230\252\252\344v\273\3\361\322\323\323\205cy<\236@,#\303F."
- #"\227+\220\217\315f#\227\313%\34K"
- #"\313\303HN\341\323\31\231\267\252\252*"
- #"\32\30\30 \"\242\201\201\1\252\252\252"
- #"\322\35c\366\354\331\364\345\227_\322\300"
- #"\300\0egg\323\300\300\0\r\r\r\321\354\331\263\205rZ\264h\21uww"
- #"\23\21QWW\27\325\325\325\t\305\2211o\32\257\327\e\262\16dgg\v\307"
- #"jmm5\264^\307Kzz:\35>|8\321i$\245\244- DD\347"
- #"\317\237\247M\2336\321\371\363\347\3\e"
- #"\234\36###\304\314\304\314t\350\320"
- #"!\252\257\257\27\316\245\241\241\201^{\355\265@\274\221\221\21\341Xg"
- #"\316\234\t\304\322:$\21\27.\\\b\344\303\314T\\\\,\34K\313"
-) 500
-(
- #"\303HN\341\343\336F\306\301g\315\232"
- #"E\257\275\366\32\21\21\35:t\210\256"
- #"\273\356:\3351\322\322\322\350\243\217>"
- #"\242C\207\16\221\333\355\246\327^{\215"
- #">\372\350#\341Nr\355\332\265t\367"
- #"\335w\323\320\320\20\255]\273\226\326\256"
- #"]+\24G\306\274i\272\273\273\211\231\351\312\225+T]]M;w\356\24\216"
- #"ED\224\237\237oh\372x\20\315IUU\262\333\355d\263\331(33\223\32"
- #"\e\e\351\364\351\323\201\277\343\234\37\21"
- #"q\22R\24\205\35\16G\310k\16\207"
- #"\203UU\35\365^\"\212\370\310\310\310"
- #"\340\360\3461\322\\\361\214%\312\351t"
- #"rVV\26\373|>\356\351\3511\34\317h^2\333\250\245\245\205\e\32\32\230"
- #"\231\271\276\276\236\367\357\337\257;\306\252"
- #"U\253\270\245\245\205\353\353\353\371\376\373"
- #"\357\347\206\206\6\336\267o\37\257^\275"
- #"Z(\247\221\221\21^\272t)\337q\307\35\274l\3312\36\31\31\21\212#c"
- #"\336\302=\371\344\223\206rbf.--\345\235;w\32\316\205Y\336:\316\314"
- #"\334\334\334\314eee\272\247KKK\343\334\334\\nnnf\227\313\3057\334"
- #"p\3\273\\.nnn\346\202\202\2NKK\223\222\237\326\327Dz\230\235\371"
- #"3\24\20\251XD**\314c\257\250\311^@\230\231O\235:\305>\237\217\263"
- #"\262\262\330\351t\32\212e\246\00228"
- #"8\310.\227\213?\371\344\23v\271\\<88\250;\306\367\277\377}~\370\341"
- #"\207\331\345r\361\331\263g\331\345r\361"
- #"\277\375\333\277\361\226-[\204\363jkk\343\264\2644nkk\23\216!c\336"
- #"\202uvvrQQ\21\237<y\322P\234h\333\230\b\231\353x\264\235\307\361"
- #"TTT\4\376\257m'Zg\237\233\233+\24S\17+\24\220\244\36"
- #"\302\222IUUr8\34\302\323;\34\16\323]J\354\365zi\332\264i"
-) 500
-(
- #"\264k\327.\372\342\213/Lu\222QUUC\323\347\344\344\320-\267\334B["
- #"\267n\245%K\226PNN\216\356\30"
- #"\225\225\225\364\313_\376\222\226,YB"
- #"\205\205\205t\313-\267\320/\177\371K"
- #"\252\254\254\24\312ixx\230\36y\344"
- #"\21\372\326\267\276E\217<\362\b\r\17"
- #"\17\v\305\2211o\3019\255_\277\236\36\177\374q*--\25\216\243\271x\361"
- #"\242\341\30\262\211\346\324\331\331\31\370\277"
- #"\266\235\f\r\r\0213\323\245K\227\204"
- #"\317a%\225DW\260x\360\373\375\354"
- #"\361x\270\275\275\235\231\257\356\365y<"
- #"\36\366\373\375\243\336;V\23\20\21\253"
- #"\252\312\212\242pqq\261\241=\216\340"
- #"\30\212\242\230\342\b\304\355v\a\206\257"
- #"d\354=\212\356\351\205O\257\265\225\321"
- #"\371lii\341k\256\271Fx\210\247"
- #"\263\263\223\363\362\362\2\323\267\264\264p"
- #"^^\36\177\370\341\207B\361\264a\242"
- #"\341\341a^\272t)\357\330\261C("
- #"\216\226\213\221y\v\317\311\310\320\225\306\341pH[7evMD$\355\310h"
- #"\"Y\241{6\177\206\202\24Ea\273\335\316D\304v\273=j\3076^\1\261"
- #"\333\355cN/\222\223\226\227\250\340C"
- #"k#\202\207\257d\314\2436\177\345\345"
- #"\345\206\246\327r1:\237\27/^\344"
- #"\274\274<\276x\361\242\320\364\227/_"
- #"\346\234\234\234\300\364\27/^\344\234\234"
- #"\34\36\32\32\22\212W[[\313]]]\314\314|\374\370q^\264h\221P\34"
- #"f\346_\374\342\27\234\221\221!<o"
- #"\232\311\223'\207\214\271\213.;f\24"
- #"\20\331\254P@\222\366{ \261\32\353"
- #"Z\353x^\207m\205k\274\301\234\332"
- #"\333\333i\335\272u\324\332\332Js\347\316Mt:\1\277\371\315oh\336\274y"
- #"\324\336\336N\267\336z\253\241X\262\266\217\366\366v\272\375\366"
- #"\333\311\357\367\233\252\255ba\205>\2\5d\214\205TYY"
-) 500
-(
- #"\0312\16*S<cC\362\362z\275"
- #"\364\227\277\374\205^\177\375uS\216\301"
- #"\317\2301\203\212\213\213\351\235w\3361"
- #"\24G\326\366Q[[K\177\376\363\237"
- #"\351O\177\372\223\341X\23\r\5\304\2\254\260\220\0 \365X\241o\302UX\0"
- #"\0 \4\5\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0B"
- #"P@\0\0@\b\n\b\0\0\bA\1\1\0\0!( \0\0 \4\5\4"
- #"\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2BWoZf\263\331(3"
- #"33\321\251\0@\n\313\314\314\f\364"
- #"GV\200\273\361Z\340\216\227\0\220z"
- #"\254\3207\341\b\4\0\0\204\240\200\0"
- #"\0\200\20\24\20\0\0\20\202\2\2\0\0BP@\0\0@\b\n\b\0\0\b"
- #"A\1\1\0\0!( \0\0 \4\5\4\0\0\204\240\200\0\0\200\20\24\20"
- #"\0\0\20\202\2\2\0\0BP@\0\0@\b\n\3108\262\263\263\251\273\273;"
- #"\321i\4x\275\336D\2470.3\345\250\252*\271\335nS\344$;\a\231\361"
- #"\\.\27\225\227\227\233\"\227x\304\203"
- #"\370\300\355\334\307\271erNN\16\225"
- #"\227\227\323\a\37|@\351\351\351\23\230"
- #"YdV\270\305\263\231rt:\235t\370\360a\252\253\253Kt*\322\333\245\262"
- #"\262\222:;;\245\304\252\250\250\240\27"
- #"^xA\270\235d\317\233\231\326\241D\261B\e\240\200\214\263\220\374~?-Z"
- #"\264\210\326\255[G\317=\367\334\4f\26\231%V*\23\345\210\\&\6\n\210"
- #"|Vh\3\fa\215c\336\274y\364\223\237\374\204^y\345\25Cq\264\241\24"
- #"\355\327\306\214\34\315h1\334n7uttH\313\311\345rI\211\223\350|4"
- #"\3320\210\315f\23\36\22\221\271\334\210\210\n\n\n\244\317\237\f2"
- #"c\251\252J\265\265\265\322\342\351UVV\26\322\316\16\207\303P\273\207"
-) 500
-(
- #"\3073\262\334d\257\343\t\307)n\242\232\300\341p\260\252\252\206?7x:E"
- #"Q\330\341pH\313\251\242\242BJ\34\321y\223\25'\230\321\0302s\"\"n"
- #"jj\222\226\233\314uWV.mmm\354\361x\330\357\367',\237H\355l"
- #"\244\335e.\267\360\365)\374y\370\347"
- #"\232\35\206\260\202\366\230322hh"
- #"h(n\237\23\334\324\242\207\247\262\342"
- #"\30\2356\369\205\37\275\224\224\224\320"
- #"\307\37\177,57\243\323\em\357\276\276>\2322eJ\\r3BF.m"
- #"mm\364\315o~\223\336x\343\r\272"
- #"\355\266\333\22\226O\244v6\322\3562\227[\370\264\252\252RCC\3]\270p"
- #"\201\210\256\376&\372\227_~\31\370\273"
- #"\331\273g\fa\321\325\205\304\314q+\36\20;mY0\263\341\342aFZ'"
- #"\224\214\326\255[G\337\371\316w\350\215"
- #"7\336Ht*\243\332\331h\273O\324r\e\32\32\n\254\377V\200\0022A\34"
- #"\16\207\241\363\25\221\250\252J\16\207C"
- #"x\372\360\234D\307\301e\315\233\254|d\212\307rKV---\264c\307\16"
- #"\372\331\317~Fg\316\234It:\246\24\276>544\320\341\303\207\23\230\221"
- #"1\223\22\235@\252hmm\245\325\253W\323\201\3\a\f\357]ttt\0203"
- #"\323\2325k\f\255|\3419\235?\177^J\234D\347#\223\314\345\226\354\264K"
- #"\200\327\257_O;v\354\240\247\236z"
- #"*\301\31\231O\244\365\311\f\227\230\v"
- #"\213\367I\26\263\233\310&P\24\205\355v;\333\355v.++\23\212QVV"
- #"\26\210\21\355\344\233hNF\342\311\230"
- #"7\231\371hD/\f\210\226\223\221\365"
- #"%<\27\243\271\311\2307\215\321\355 "
- #"8\227\336\336^\256\253\253\223\26\317\350\264F\333]\366r\213u\35\267"
- #"B\367\214\223\350\26\270\326\32\314#Y\327\227d\235/+\263\3022\301"
-) 500
-(
- #"9\20\200qx\275\336\300u\373N\2473\321\351H\245\315[\262\315\27L\f\34"
- #"\201X\240\312\3@\352\261B\337\204#\20\0\0\20\202\2\2\0\0BP@\0"
- #"\0@\b\n\b\0\0\bA\1\1\0\0!( \0\0 \4\5\4\0\0\204"
- #"\240\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0BP@\0\0@\b\n\b"
- #"\0\0\bA\1!\n\334i5333\321\251\0@\n\313\314\314\f\364GV"
- #"\200\273\361Z\340\216\227\0\220z\254\320"
- #"7\341\b\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0BP"
- #"@\0\0@\b\n\b\0\0\bA\1\1\0\0!( \0\0 \4\5\4\0"
- #"\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0BP@\0@\212\264"
- #"\264\264\300\235d\275^o\242\323!\257\327\e\310'-\r]]<$u\253\252"
- #"\252Jn\267\233\334n7utt\350\2326\370\266\3126\233M(Fx.\371"
- #"\371\371\206b\305#'\267\333m(V\360F\32\374\320\333\201D{\277HGT"
- #"UUE\3\3\3!\257\r\f\fPUUU\3141f\317\236M\237\177\3769"
- #"\21\21}\366\331g\224\225\225\25\362\274"
- #"\242\242BWN\213\26-\242\356\356\356"
- #"\220\327\272\272\272\250\256\256NW\234y"
- #"\363\346\321\357~\367\273\220\327>\370\340"
- #"\3\272\351\246\233t\305!\212\276\354\262"
- #"\263\263u\307\"\"b\346\300#|^\23\241\273\273;$'#TU\245\0313"
- #"f\30\332\336\222\22')EQ\270\270\270\230UUeEQ\270\246\246&\342\373"
- #"\2425A\370\353~\277\237=\36\17\267"
- #"\267\267\353\316\245\255\255\215=\36\17\373"
- #"\375~C\261d\346\344t:\331n\267"
- #"\263\252\252\314|\265\275\354v;\227\227\227\353\216\25-?\31\323\212"
- #"\304\\\261b\5\357\335\2737\344\265={\366\360\312\225+c\2161"
-) 500
-(
- #"\177\376|~\373\355\267\231\231\371\255\267"
- #"\336\342\334\334\334\220\347\v\26,\320\225"
- #"\323\263\317>\313\325\325\325|\345\312\25ff\276r\345\nWWW\363s\317="
- #"\247+\316\177\375\327\177\261\327\353\345\376"
- #"\376~ff\376\313_\376\302\245\245\245"
- #"\374\312+\257\350\212\23\211hN\0323"
- #"w'Fr\323\266\225\346\346f\266\333\355\354t:%f\26\235\231\333Sc\376"
- #"\f\59\34\216@\3478\26=\35\227\242(\354p8\244\344\"\22+\3369\31"
- #"e\226\2\322\322\322\302\r\r\r!\257"
- #"\325\327\327\363\376\375\373c\216\261q\343"
- #"F\336\266m\e33\377\350G?\3429s\346\204<\277\377\376\373u\34542"
- #"2\302K\227.\345\35;v03\363\223O>\311\313\226-\343\221\221\21]q"
- #"\230\231\327\255[\307+W\256\344\221\221"
- #"\21\256\257\257\347\357~\367\273\272cDb$'fswxFr\v\336VD"
- #"\2677\21fnO\215\3713\24DD"
- #"\254(\n\227\226\226\262\317\347\343\236\236"
- #"\236\250\357\213\365u\321\225GV\347\30"
- #"\351\375N\247Sh\217\310\310\321K4f) \203\203\203\354r\271\2{\351\375"
- #"\375\375\354r\271xpp0\346\30\373"
- #"\366\355\343;\357\274\223\231\231\e\32\32"
- #"x\343\306\215!\317[ZZt\347u\362\344I.**\342\326\326V.**"
- #"\342\223'O\352\216\301\314|\351\322%"
- #"\256\250\250\340\225+WrUU\25\177\376\371\347Bq\202uvv\32\312\211\331"
- #"\334\35\236\221\334\264\243s\"\n9j\21773\267\247\306\374\31\n\"\".."
- #".\346W_}\225}>\37\273\335\356"
- #"\250\357\213\345\365\360a(\275\271\350y"
- #"}\2548\341\17#\207\323\212\242paa\341\230\5Vo~\262\247\25\215\31<"
- #"\214\245w\370\212\371jg?e\312\24ff\2362"
- #"e\n\277\363\316;!\317?\376\370c\241\274\236~\372"
-) 500
-(
- #"i\316\313\313\343g\236yFhz\315\321\243G9--\215?\370\340\3Cq"
- #"\230\215\17]i\314\334\341\2319\267h\254\220sR\237D?p\340\0\255X\261"
- #"\202v\355\332E\303\303\303QO\200E"
- #":\221\30\376\372\312\225+\251\245\245\205"
- #"\346\316\235;\221\2630\n\377\377'\4"
- #"\267n\335J\313\226-\243\363\347\317\v"
- #"\307Z\274x1\375\366\267\277%\242\253"
- #"'T\215\236\2247\223U\253V\321\301"
- #"\203\a\211\210\350\340\301\203\264j\325*"
- #"]\323\227\226\226RFF\6\275\365\326[\224\221\221A555!\317KJJ"
- #"\204\362\32\34\34\244\254\254,\32\34\34\24\232^SUUE###t\303\r"
- #"7\30\212CD\324\334\334Lv\273\235"
- #"\376\351\237\376\311p,Yn\277\375\366"
- #"D\247\20W\301\363\27~q\214\225~\23\335\374%NP\370\254577sY"
- #"Y\331\270\357\e\357u\31\271\210~F\360\373/_\276\314\327_\177=\37:t"
- #"\310Pn\301\214\216\357\32i3Y\347\2114\3320\326'\237|\242{\370Js"
- #"\327]w\361\277\376\353\277\362\212\25+\">\327K\e&\372\325\257~\305EE"
- #"E\334\331\331)\24G#c\35\2251t%3\237x1sn\321X!\347\244"
- #"=\2q8\34!{\323?\370\301\17h\357\336\275\t\311\305\351t\222\313\345\""
- #"\"\242\205\v\27\3223\317<C.\227Kx/\226\350\352^\313\256]\273h\343"
- #"\306\215B{\263\265\265\265\246:\332h"
- #"mm\245\372\372\372\220\327\32\32\32\350"
- #"\360\341\303B\361rrr\350\226[n\241\255[\267\322\222%K(''Gw"
- #"\214\352\352jRU\225\252\253\253#>\327cxx\230\326\257_O\217?\3768"
- #"\325\326\326\322c\217=F\353\327\257\247\341\341a\335\261d\t\316\251"
- #"\264\2644ay\200\205%\272\202\305\213v\31\257\254s Fi{\330"
-) 500
-(
- #"g\316\234\341E\213\26\361\244I\223\370"
- #"\330\261c\272bD\312i\345\312\225\374"
- #"\350\243\217\352\316'\374$\272\221s<"
- #"c\345\247\207\333\355f\237\317\307\357\275"
- #"\367\336\230\313,V---|\3155"
- #"\327\350\272\372*\230\252\252\234\223\223\303"
- #"\35\35\35\21\237\353\21~\205S\370U"
- #"Y\"\214\266\267\321\253\256d\347\23Of\316-\32+\344l\376\f\r0r\25"
- #"VEE\205\364\\\202\257\344\330\264i\23/\\\270PW\214H9\2358q\202"
- #"\253\253\253\245\344d\364\352\22\243mv"
- #"\352\324)\366\371|<e\312\24)'\366/^\274\310yyy|\361\342E\241"
- #"\351\a\a\a9;;\233?\373\354\263"
- #"\210\317\365\250\255\255\345\256\256\256\220\327"
- #"\216\37?\316\213\26-\22\312\215\331x"
- #"{O\236<9\342\205\31\242\337\0052s\207g\346\334\242\261B\3166f\203_"
- #"\321\2648\233\315f\370[\252\0`\356"
- #"m\311\314\271Ec\205\234\223\366\34\b"
- #"\0L,#\267\262\211\207\360[\265\200|8\2\261@\225\a\200\324c\205\276\t"
- #"G \0\0 \4\5\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2\2"
- #"\0\0BP@\0\0@\b\n\b\0\0\bA\1\1\0\0!( \0\0 "
- #"\4\5\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2B_\335E43"
- #"33\321\251\0@\n\v\376}t+\300\335x-p\307K\0H=V\350\233"
- #"p\4\2\0\0BP@\0\0@\b\n\b\0\0\bA\1\1\0\0!( "
- #"\0\0 \4\5\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0"
- #"BP@\0\0@\b\n\b\0\0\bA\1\1\0\0!( \0\0 \4\5"
- #"d\f===\324\330\330H\223'O&\267\333M\35\35\35\206\342\r"
- #"\f\fPvv6\r\f\f\bM\37|\253g\233\315&%'UU"
-) 500
-(
- #"\311\355v\v\307\n\316\311h>\341\363"
- #"g\263\331\310\353\365&<\226\3216\""
- #"\242\250\237-\232\223\321ie\306\2144\215\252\252T[[;!\237\37IVV"
- #"\326\250\355l``\200\262\262\262t\305"
- #"\311\316\316\246\356\356\356Q\257\eY\227"
- #"\362\363\363\245m\277\t\307).Z\23"
- #"(\212\302\205\205\205\354\363\371\270\247\247"
- #"\207\25Ea\273\335\316.\227\213UU"
- #"\25\372\254={\366\260\307\343\341\275{"
- #"\367J\311\325\357\367\263\307\343\341\366\366"
- #"v\241xN\247\223\355v;\253\252\32"
- #"\230?\247\323)\234\223h\214H\261\214"
- #"\222\25KF\e\215\225\217\221<\343\261"
- #"\371\212\304\f\237\246\255\255\215=\36\17"
- #"\373\375\376\t\371\374hq\302\267\263={\366\350\216OD\\]]\315W\256\\"
- #"\31\365\272^\341\3552\336\366k\205\356"
- #"\331\374\31\306Y\244\205\244(\n\27\27"
- #"\27\263\252\252\274{\367n\2364i\22\273\\.NOOgEQ\330\341p\b"
- #"}V}}=\337\177\377\375\334\320\320 5W\221|\242MWQQa8'"
- #"\207\303!Td\315V@d\265\321X\371$[\0011R<D??Z\234\360"
- #"\355\254\276\276^\250\200,]\272\224w\354\3301\352u\275\"m\27cm\277("
- #" \0260V\a\230\227\227\307iii\374\322K/\261\242(\201\367\212,\330\376"
- #"\376~v\271\\|\366\354Yv\271\\\334\337\337/%W\247\323)\264G,\332"
- #"\311\307\222\223hQ3[\1\221\325F\314\251Q@\214\26\17\321\317\217\26'x"
- #";\323\266?\221\2r\362\344I.**\342\316\316NCy\352]\aP@,"
- #" \322B\n.\24\301\35\210\221\2\262g\317\36^\271r%33\257X\261B"
- #"h\30\213\210B\36iii\234\237\237\257;\216\26K\6\231+\177\360"
- #"\274\225\227\227\e\316\313h,\331\5-\332\303HL\331D\227[[[\e"
-) 500
-(
- #"gff\362+\257\2742\341\237\37-N\360v\246m\177\"\5\204\231\371\331g"
- #"\237\r\31\312B\1\271\n'\321)\266\337DWU\325\320g\34<x\220V\255"
- #"ZEDD\253V\255\242\203\a\17\n\305\341\253E\237\230\231\336{\357=*("
- #"(\240#G\216\350\216\223\233\233K\237"
- #"~\372\251P\16\343\351\353\353\243\334\334"
- #"\\\241i\265y\213t\342r\242c\205"
- #"\267\221\327\353\35w=\211%\237\340G"
- #"\262X\267n\35m\335\272\225\36z\350!:s\346L\242\323!\242\320\355,x"
- #"\373\23\361\317\377\374\317TPP@;w\356\224\225^DV\373M\364\270\2258"
- #"EQ\270\246\246&\360\377\212\212\ni"
- #"\303\0012Ej\202\340!\254\274\274\274"
- #"\3009\21\"\22\32\236\351\357\357\347\264"
- #"\264\264QG\17z\207\261\"\345*:\\\264y\363f\336\264i\223\356\351b\311"
- #"\351\201\a\36\340\246\246&)\261D\311"
- #"\210\25\255\215DbG\233\306H\2362"
- #"\3461\374\350Lt\336\264m\373\341\207"
- #"\37\346\332\332Z\276|\371\262P>\262"
- #"\326\1\"\342\301\301Av\271\\\374\311"
- #"'\237\260\313\345\342\301\301A\341#\20"
- #"f\16\31\312\232\210u \216\335\2634q\313P\353\204{{{y\352\324\251\334"
- #"\334\334\3481m&\321:\345\342\342b\336\275{7\247\245\245\5\256\302IO"
- #"O\0375\254\25\213\340\341+\215\3100"
- #"\226\314\2\242-\227\340y\t.\372\242"
- #"9)\212\302S\247N\345\276\276>\3359\231\255\200Dk#\231\347w\22]@"
- #"\202c\310\230\267\341\341a\376\3467\277"
- #"\311\367\335w\237\341|\214\320\342\254X"
- #"\261\202\377\345_\376%\260\375\31) "
- #"\314_\re\211\344\31\351|\245\323\351"
- #"\344\222\222\222\230>\333\214\342\226\241"
- #"6\363\17>\370 ?\364\320C\314,\276\202\306S\264\205"
- #"\24\3512^\227\313\25ua\217\245\276\276\236\367\357\337\37"
-) 500
-(
- #"\362ZKK\213\356\253\261\302s5z\3222\3702B\321X\3019\231\345\n\34"
- #"\231\261d\264\321X\371$\272\200h;"
- #"z\301W\36\32\315\343\374\371\363<s"
- #"\346L~\361\305\27\r\307\22\245\305iii\341k\256\271&\260\375\31- #"
- #"##\274t\351R\341<\203/\314\30"
- #"\257?D\1a\346\334\334\334\300\336\250"
- #"\225\n\b3\363\251S\247\330\347\363qVVV\340(D\304\202\5\v\370\342\305"
- #"\213!\257]\274x\221\27.\\\250+Nfff\3100\230\221\2344\332w\e"
- #"Dc\5\347d4\237\360\371#\3'\300E.\265\215\306h\e\215\225\217\221<"
- #"e\314c\274\346\315\357\367\363M7\335\244;V\370:`t\371_\274x\221\363"
- #"\362\362\2\333\237\3366\213\364\376\343\307"
- #"\217sNN\216P^Z{\307\262\275X\241\200\330\230\343s&\317\351t\322\367"
- #"\277\377}\372\301\17~@\27.\\ UUi\315\2325t\340\300\1\252\253\253"
- #"\213\307G\n\261\331lIu2\23\0"
- #"\222\203\25\372\246\270]\205\325\332\332J"
- #"\373\366\355\243\303\207\17\23\21\321\303\17"
- #"?l\272\342\1\0\0\342\342v\4b\25V\250\362\0\220z\254\3207I=\2"
- #"q\271\\T^^ND_]3/\353\206v\0\0`.\223d\6+,,"
- #"\244\227_~\231\210H\312\27\301\0\0\300\2740\204e\201\303D\0H=V\350"
- #"\233\342v\22}\336\274yt\340\300\201"
- #"\220\327\16\348@\363\346\315\213\327G"
- #"\2\0\300\4\222:\204\25\354'?\371\t544\320\257~\365+\372\217\377\370"
- #"\17z\360\301\a\251\265\265\225Z[["
- #"\343\365\221\0\0000\201\342:\204u\356"
- #"\3349Z\276|9\375\361\217\177\244\257"
- #"}\355kt\350\320!r\273\335\361\3728!V8L\4\200\324c\205"
- #"\276)\256w\343\275t\351\22\375\365"
- #"\257\177%\273\335N\375\375\375\302?"
-) 500
-(
- #"\345\n\0\0\346\23\267\2\362\366\333o"
- #"\323\302\205\vi\303\206\rt\374\370q"
- #"\332\260a\3-\\\270\220\336~\373\355x}$\0\0L\240\270\ra\315\2337"
- #"\217\36~\370aZ\275zu\340\265\3"
- #"\a\16\320\366\355\333\311\357\367\307\343#"
- #"\205X\3410\21\0R\217\25\372&\\\306k\201\205\4\0\251\307\n}S\334\206"
- #"\260<\36\17\276\211\16\0\220\304\342V"
- #"@>\373\3543RU5\360\323\235\212\242Pqq1\375\364\247?\215\327G\2"
- #"\0\300\4\212\333\20V\244\303/UU"
- #"\251\241\241\201.\\\270\20\217\217\24\22"
- #"\374\333\303\31\31\031444\224\300l\0 \225eff\322\227_~\31xn"
- #"\366!\254\270}\221\320J\314\276\220\0"
- #" 5\4\357\300\6\357\334\232U\334\206\260\34\16\autt\4\236k?(\245"
- #"\375>\b\0\0X[\334\206\260TU\245\372\372z\372\353_\377JDDv\273"
- #"\235^\177\375u\323\375\240\224\25\256t"
- #"\0\200\324c\205\276\t\227\361Z`!\1@\352\261B\337\24\327[\231\0\0@"
- #"\362B\1\1\0\0!( \0\0 \4\5\4\0\0\204\240\200\0\0\200\20\24"
- #"\20\0\0\20\"\265\200\314\237?\37\367\272\2\0H\21R\277\ar\374\370qZ"
- #"\275z5\315\2301\203^~\371er8\34\262B\307\215\25\256\265\6\200\324c"
- #"\205\276I\352\21\310\254Y\263\350\377\376"
- #"\357\377h\372\364\351\264p\341B:z"
- #"\364\250\314\360\0\0`\"\322\317\201d"
- #"ee\321\217\177\374cZ\261b\5\315"
- #"\237??\341\277\a\322\325\325E\331\331"
- #"\331B\323\366\364\364Pcc#\331\355vjll\244\323\247O\e\312EUU"
- #"\252\250\2500\34\303\355v\223\315f#"
- #"\267\333\35r\2771\275\274^o\310\262)--5\224\233\221\266&\""
- #"r\271\\R\327\25\255\255D\333)\274}\264GVV\226p>\371\371\371"
-) 500
-(
- #"\206\227\235\266^\226\225\225\31Z\3760"
- #"\361dn\277\246\300q\320\326\326\306\36"
- #"\217\207\375~\177<\302\307\354\312\225+"
- #"\\]]\315c\315\346X\177s\273\335"
- #"\354\363\371\370\275\367\336c\237\317\307n"
- #"\267[8\27EQ\270\270\270x\314\317"
- #"\213\205\303\341`UU\0031\35\16\207\241x\314_\265\323s\317=g8\206\221"
- #"\371\223\271:j\355\255\252*+\212\302"
- #"555R\342>\372\350\243\374\275\357}OhZ\31\313\256\267\267\227\v\v\v"
- #"\331\347\363\361\253\257\276\312v\273\235\235"
- #"N\247P>f722\302\273w\357\346\205\v\27&,\207\5\v\26\360\323O"
- #"?\315###R\342\351Y\a\342\324=K%=C\263\24\17f\346'\237|"
- #"\222\227-[&T@z{{9777\344\265\334\334\\\356\353\353\23\312\245"
- #"\246\246\206UU5\274RTTT\204<\227\261\222i\355dd#\211\245\255\307"
- #"#s\203\t\336Pe\371\354\263\317x"
- #"\352\324\251\374\307?\376Qh\372\360\371"
- #"\23\231\337\a\36x\200\233\232\232\f\307"
- #"1\273c\307\216quu5\337y\347\235\374\347?\3779ay\2349s\206\e"
- #"\32\32\270\272\272\232\217\35;f8\236"
- #"\236\355\327\n\313Uj\206f*\36\235\235\235\\TT\304'O\236\24ZH\221"
- #"6\324\315\2337\363\246M\233\f\345%s\245\210T\344DL\237>\235].\227"
- #"p\207\ek[\217\207\210B\36F\366"
- #"\254\211\210\25E\341\322\322R\366\371|"
- #"\334\323\323#\34K\363\302\v/pCC\203\360\364N\247\223].\027777"
- #"\263\313\345\342\222\222\22\3351f\314\230\301\207\16\35\nyM\306:U^^n"
- #"8\206\2148W\256\\\341m\333\266\361"
- #"\265\327^\313\a\16\34\220\222\223\f"
- #"\a\16\34\340k\257\275\226\267m\333\306W\256\\\221\26"
- #"\27\5$\210\266\227\235h\341C2\"\v)\322\321\206"
-) 500
-(
- #"\214\16[\346J\21\251\310\211\362\373\375"
- #"\354\361x\270\275\275]\327tz\332z"
- #"<\341{gF\216\"\210\210\213\213\213\371\325W_5<\374\310\314<<<\314"
- #"_\373\332\327\370\177\377\367\177\205c8"
- #"\235N\303\0052|\330CQ\24)\353Tx\333'\"\216\254\243\216\362\362\362Q"
- #";#\301\17\321\"'\363h\344\324\251S\343\256\227)W@\314\"|Hf\274"
- #"\2\22\355a\346\2\242(\nO\235:UxH-ZL\275\343\362z\332z\""
- #"\362\321\20QH\3611:\244\365\306\e"
- #"o\360\374\371\363\205\247\2174/\2429"
- #"\5\27\"\273\335n\211\216&\26\263f\315\342[o\275U\352\36\276lW\256\\"
- #"\341%K\226\360u\327]g(\216v~\265\247\247\207322\242\366Afg"
- #"\376\f\5L\237>=\346=\217h\v)\322p\225\214=~\31+E\274\206\n"
- #"E:l=m=\21\371h\302\333\271"
- #"\271\271\231\313\312\312\204s\271\375\366\333"
- #"y\317\236=\302\323G*\26\262.\202\260BG\23\vY{\370\361:\2\221y"
- #"^&\226#5+,W\363g(\201\31N\242\307\222K,d\25\217H\303\215"
- #"2N<\213\316\237\354|\302\2475\22"
- #"\353\350\321\243<}\372t\36\32\32\22"
- #"\232>\332\347\213\26\220\340\16PV\0212\223x\235o\20\225\250\3632( &"
- #"a\206\313xc\371\274\361\310<\362\b"
- #"\276\3145\226\361\330X\211\316\237\354|"
- #"\264x2\316\201\374\303?\374\3o\335"
- #"\272Uxz\346\321\347\230\214,K\255"
- #"\30\5\267\231Qf9\211\256\221}\365\223\250x]\r\26K;\241\200\230\304X"
- #"\207\213c-$\255#\2332e\212\264+y\214\234d,++\223zH\256("
- #"\n\333\355v\316\312\3122\305\374\311\316G\326UX\325\325\325|\366\354"
- #"YC\271h\371h\347,\354v\273p\307\257\3051\22#\234\254\223\350"
-) 500
-(
- #"2;\275d\374\36\210&Y\206\260\360\233\350\26\270\337\f\200UTVVRg"
- #"gg\242\323H\nV\350\233P@,\260\220\0 \365X\241o\302\357\201\0\0"
- #"\200\20\24\20\0\0\20\202\2\2\0\0BP@\0\0@\b\n\b\0\0\bA"
- #"\1\1\0\0!( \0\0 \4\5\4\0\0\204\240\200\0\0\200\20\24\20\0"
- #"\0\20\202\2\2\0\0BP@\0\0@\b\n\b\0\0\bA\1\241\253w\275"
- #"\264\331l\224\231\231\231\350T\0 \205eff\6\372#+\300\355\334-p\313"
- #"d\0H=V\350\233p\4\2\0\0BP@\0\0@\b\n\b\0\0\bA"
- #"\1\1\0\0!( \0\0 \4\5\4\0\0\204\240\200\0\0\200\20\24\20\0"
- #"\0\20\202\2\2\0\0BP@\0\0@\b\n\b\0\0\bA\1\1\0\0!"
- #"( )nhh\210f\3225zG\0\0\30tIDAT\317\236MDD"
- #"\203\203\203TYY)\24\307\353\365\206\374\v\321\365\365\365QAA\201p[y"
- #"\275^*((\240O?\375Trf\220\b]]]TWW\227\3504\204\240"
- #"\200L0\243\35l\370\364F\343}\364\321G\224\236\236NDD\35\35\35TX"
- #"X\250;\206\252\252t\342\304\t\262\331"
- #"lt\342\304\t\352\350\350\20\2121k"
- #"\326\254Q\323>\377\374\363\224\237\237/"
- #"\24\257\262\262R(\227Hd\26\306m"
- #"\333\266\221\317\347\243\356\356n\241\351\273"
- #"\273\273\351\276\373\356\243m\333\266I\313"
- #"\t\22cxx\230\326\256]Kk\327\256Mt*b8\305Mt\23\30\375\274"
- #"\360\351\215\306\333\267o\37\257^\275\232"
- #"\231\231\233\232\232\370\321G\37\3255\275"
- #"\323\351d\273\335\36\310\203\210\330n\267"
- #"syy\271\356\30\315\315\315LD!\17\233\315\306?\376\361\217u"
- #"\345\304\314\354p8\270\271\271\231\35\16\207\356i#\221\265\236(\212"
-) 500
-(
- #"\302S\247N\345\276\276>Cqz{"
- #"{y\352\324\251\254\252\252\224\274d\321"
- #"\263\334\201\371\311'\237\344e\313\226\361"
- #"\310\310\310\250\277Y\241{6\177\206q"
- #"\226\352\5\344\221G\36\341-[\26603sMM\r\379rD\327\364\16\207"
- #"\203UU\r) zi1\202\247\377\344\223Ox\372\364\351\374\312+\257\350\216"
- #"\27\34G\326\362\225\25'x^\215R\24EZ\201\224\305\n\235\236Ytvv"
- #"rQQ\21\237<y2\342\337\255\320\226\346\3170\316\254V@***\306|"
- #"\256\327]w\335\305\a\17\36\344\213\27"
- #"/r^^\36\177\376\371\347\272\246\367"
- #"\373\375\354\361x\fu\330\212\242\4\216"
- #"b\234N'_\270p\201\377\346o\376\206\267n\335\252;\226&77\227\267m"
- #"\333\306n\267;\360\31.\227\213\235N"
- #"\247P<\243\355\254\221\275\276\311\212'"
- #"\353\310\301\n\235\236\31\\\271r\205\253"
- #"\253\253\371\271\347\236\213\372\36+\264\245"
- #"\3713\2143\253\25\20\231\312\313\313G"
- #"\r\31\211t$\212\2420\21\261\317\347"
- #"3<\177_|\361\5\177\375\353_\347"
- #"\215\e7\n\307\350\356\356\346\2313g"
- #"\362\314\2313\371\304\211\23\314\374\325\236"
- #"\277\254B \312l\5\244\262\2622\260\334|>\37WVV&4\237T1\326"
- #"\320\225\306\nm\211\223\350\224\272\277\211"
- #"\376\341\207\37RNN\16\r\r\rQSS\23=\372\350\243B'v\27/^"
- #"\34\362\334\355v\v\235\274\36\31\31\241"
- #"u\353\326\221\333\355\246\346\346f\335\323"
- #"\23\21\271\\.\252\252\252\242\r\e6"
- #"\320\300\300\0\235>}\232\210\210\372\373"
- #"\373\251\256\256\216:;;\205\342&\253\227_~\231\24E!\"\"EQ\350\345"
- #"\227_\3265\275\327\353\rl?\332\357x\a?O\304Uy\3419\205?\22"
- #"}\245\340\207\37~HO<\361\4=\377\374\363\243~\373\334j\277\211n\376"
-) 500
-(
- #"\22\27g\23\335\4\211\336\3\326D:"
- #"\372 \301#\20\346\320s\16\242c\363"
- #"\17?\3740\327\325\325\361g\237}\306"
- #"N\247\223\211\210].\227\256s\6\301\313SQ\24...\226z2\335(\331"
- #"\353\233\321x\363\346\315\v9\2\271\351"
- #"\246\233\22\232O\262\213e\350Jc\205"
- #"\2664\177\206qf\205\205\24/\332\25X\242\347?\230\257\236x\17?\211.R"
- #"@v\356\334\311\327_\177=\237;w"
- #".\20\207\231\271\271\271\231\313\312\312b"
- #"\216\23\276<\265+\273v\356\334\251+"
- #"\237x1[\1\321\230\365\34O\262\211e\350Jc\205\2664\177\206q6\321\v"
- #"\311L\2279jW`\375\342\27\277\340"
- #"\233o\276Y(F\244\223\350\36\217\207\375~\177\3141\16\36<\310%%%|"
- #"\352\324\251\300k\332e\270\305\305\305\272"
- #"\216@\234Ng\340\250%\370\bD\213\223\350\366\307UX\261I\364r\212\304h"
- #"N\343]u\25\16\5\304\2Ru\b\213\371\253+\260D\276\377\21L;\211\256"
- #"=\364v\220\v\26,\340w\337}wT\314\5\v\26\bu\266\332U]v\273"
- #"=0\275\366ZII\211\356x2%"
- #"\373\367@\222\371H\306\310\274\351\31\272"
- #"\322\230\261\r\302\331\230\231\343{\226\305"
- #"\334l6\e\245j\23\314\236=\233\376"
- #"\347\177\376\207\326\257_O?\374\341\17"
- #"i\311\222%\302\261*++\251\263\2633\360/D\327\324\324D\227/_\246\247"
- #"\236zJ8\306\246M\233(;;\233\266n\335*13\363H\266\365h\307\216"
- #"\35\324\336\336No\276\371f\314'\310"
- #"\255\3207\241\200X`!\305\313\2157"
- #"\336H\277\376\365\257\251\272\272\232TU"
- #"\245\234\234\234D\247\224\22\372\372\372h"
- #"\326\254YTTT$t\325\233\327\353\245\263g\317RWW\27M\2312"
- #"%\16\31\202l\213\26-\242={\366\350\272\2\314\n}\23\n\210\5\26\22"
-) 500
-(
- #"\0\244\36+\364M\370\36\b\0\0\bA\1\1\0\0!( \0\0 \4\5"
- #"\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0BP@\0\0"
- #"@\b\n\b\0\0\bA\1\1\0\0!( \0\0 \4\5\4\0\0\204\240"
- #"\200P\352\376&:\0\230\213\325~\23\35w\343\265\300\35/\1 \365X\241o"
- #"\302\21\b\0\0\bA\1\1\0\0!( \0\240KOO\017566\322\344"
- #"\311\223\3\343\365c=&O\236L\215"
- #"\215\215t\372\364\351D\247\16\222\241\200"
- #"\0@L\216\37?N\367\334s\17\315"
- #"\2313\207\334n7\365\364\364\0203\217"
- #"\373\350\351\351!\267\333MUUUt\317=\367\320\361\343\307\23=+ \t\n"
- #"\b\0\214KUU\252\255\255%\273\335N\37|\360\1m\331\262\205\n\v\vc"
- #"\232\266\260\260\220\266l\331BG\217\36"
- #"%\273\335N\265\265\265\324\321\321\21\347"
- #"\214a\"\340*,\v\\\351\0\220H\355\355\355\264n\335:jmm\245\271s"
- #"\347\32\216\367\233\337\374\206\32\32\32\350"
- #"\247?\375)\335z\353\255\0222LNV\350\233p\4\2\0Q\311.\36DD"
- #"s\347\316\245\326\326V\272\367\336{\351\310\221#RbBb\240\200\0@D\361"
- #"(\36\32\24\221\344\200\2\2\0\243\304\263xhPD\254\17\5\4 E\205_"
- #"\216\253]n{\364\350Q\272\373\356\273"
- #"\251\245\245%n\305C3w\356\\\332\267o\37}\347;\337\241O?\3754\256"
- #"\237\5\362\241\200\0\244\220\340\2421s"
- #"\346L\"\"\352\356\356&f\246\256\256"
- #".\"\"\272\351\246\233\350\334\271s\264"
- #"\177\377\376\t\371\356\306\342\305\213\351\273"
- #"\337\375.m\333\266-\356\237\5r\241"
- #"\200\0X\214\252\252\224\237\237O6\233\215\334nw\314\227\304\252\252J"
- #"7\336x#\21]-\32_|\361\5\355\332\265\213<\36\17\21\21M"
-) 500
-(
- #"\2336\2156o\336L.\227\213~\373"
- #"\333\337\22\21\321\2349s&\344\222\333"
- #"\207\36z\210~\366\263\237\321\2313g"
- #"\342\376Y \17.\343\265\300\245r\0DW\v\300\362\345\313ixx\230^\177"
- #"\375u\252\253\253#UU\251\276\276\236"
- #"\322\323\323\351\265\327^\243\272\272\272\210"
- #"\323\366\365\365QUU\25\275\372\352\253"
- #"Q\337CD\264i\323&\312\316\316\246"
- #"\255[\267\6>s\325\252U\364\273\337"
- #"\375\216\246L\231\22\227\371\322455"
- #"\321\345\313\227\351\251\247\236\212\353\347X"
- #"\205%\372&NR\212\242\260\313\345b\"b\227\313\305\252\252F|_\0227\1"
- #"$\221\266\2666\366x<\354\367\373#"
- #"\376\335\357\367\263\307\343\341\366\366\366\210"
- #"\177\177\340\201\a\270\251\251i\334\317\311"
- #"\315\315\345\276\276\276\220\3276o\336\314"
- #"\2336m\322\237\264N\275\275\275\234\233"
- #"\233\e\367\317\261\n+\364M\346\317P\220\303\341\b\24\rEQ\330\341pD|"
- #"\237\25\26\22X_\360\16\215\366\30k\307&\330x\305C3V\21\211T\30\""
- #"\211\264=Ld\307n\326\355\261\267\267"
- #"\227=\36OLm\30\213\362\362\362q\337c\326\266\bf\376\f\5UTT\204"
- #"<\217\2660\254\260\220 qN\235:\305>\237\217\v\n\n\330\347\363qOO"
- #"\217\356\30\321\n\300xG\r\232\340\235"
- #"\241\361D\332Y\322S\0\242m\17\261"
- #"\26 \243\314\272=\256Y\263\206\211\210"
- #"\277\375\355oK\211\27\313|\232\265-"
- #"\202%\355I\364\316\316\316\300\377\373\372\372(77Ww\f\227\313\25rWQ"
- #"\227\313e('UUi\306\214\31\206OJ\366\365\365QFF\206\341\313\36e"
- #"\317\237\f\262\332HUUr\273\335\272"
- #"O4\a\353\353\353\v\234t\326\276\247"
- #"0g\316\34\335\355\276j\325\252\210\227\304j\227\260\256\\"
- #"\2712\352\264\252\252\22\21\215y\336\"\330\342\305\213\211\210"
-) 500
-(
- #"B\346w\333\266m\264q\343F]9\207kll\234\260\253\244jkk\343\22"
- #"St\235RU\225~\376\363\237\23\21"
- #"\321\177\377\367\177\343>^\301\22]\301&\302X\343\277c5\1\21qFF\6"
- #"\333l6\316\310\3100\264G\240(\n\247\247\2473\21qzzz\314{\224\341"
- #"233C\206A233\205s\n\237\37\243\363WVV&<_Z\214\342"
- #"\342bnnn\346\342\342bC\261b\35\302\34K\244\365F\344|\300x\355:"
- #"\326\337\365\34}h\302\347W\317\321C"
- #"\264\\\342=\214u\352\324)\276\363\316"
- #";\231\210\306\35\252\23\341\367\3739#"
- #"#\203\227/_\256\373(\262\246\246\206UUe\"bEQ\270\246\246\306p>"
- #"\261lkV\350\236\315\237\241A\212\242"
- #"\360\324\251S\243n@\301\235q\360C+\30\341\17Q\245\245\245!qJKK"
- #"\205\342\354\337\277?$\316\301\203\a\205s\222Y@JKKy\356\334\271\\V"
- #"Vf(\306\316\235;\231\231\271\271\271"
- #"\331P,\31\363V\\\\\314\177\370\303"
- #"\37B^\373\375\357\177\317\327^{\255\241\\\364\374]t\231\4O\247'F<"
- #"r\211\305\254Y\263\242n\213D\24\323"
- #"9\3Myy\371\230\261\256\273\356:\241\34e\316\177p\254h}\r\nH\202"
- #"\305r\362q\274\r&++\213m6\egee\31\336C\2374i\22\333l"
- #"6\2364i\222\360\336\365\312\225+\3"
- #"\5\210\210x\365\352\325\3029\311>\2Y\260`AR\35\201D:\332\210\365j"
- #"\246`8\2\31\337\251S\247\2\347\31\306;'$\242\255\255\215322x\315"
- #"\2325B\347\261\230\345\24\20=G3( \t\24\353\225+c-$\247\323\31"
- #"\2627PRRb('\31\235l~~>\377\373\277\377;33"
- #"755q~~\276p,\331\363'\203\2146\322\342\330\355v&"
-) 500
-(
- #"\"\266\333\355B\361z{{\271\260\260"
- #"\220}>\37\277\367\336{\354\363\371\270"
- #"\260\260P\367\311\344\261\212\300x\305M"
- #"\244\370\205\177\236\236a\267h\333\203H"
- #"\341\24ADR\206\210\302i\35\267\0212:tEQ\2G\34\31\31\31c\346"
- #"\204\2\222 \261\26\17fk,$H\34\355*\254)S\246\b_\205\25\355j"
- #"\253X\327S\\\205e\16\262r[\263f\r\333l\266q\257\3502s[h\314"
- #"\237\241\200\262\262\262\230\307Q\255\260\220"
- #"\300\372\202\217\210\264G\254GF\261^"
- #"\356;VA\302\367@\214\v\377j\200"
- #"\250\336\336^\366z\275\343.\0173\267"
- #"\205\6\2672\261\302\355\2 \345\215\367"
- #"+~\343\335~=\326\333\204\344\345\345\321\211\23'Bn[\22~{\223x\351"
- #"\353\353#\257\327K\227.]\212\353\347X\205\25\372&\24\20\v,$\0\"\212"
- #"x\337\253H\367\307\212$\326{a\205"
- #"\27\232\211\274\27\326D\25*\253\260D"
- #"\337\224\270\203\37s@\23\200\325\210^"
- #" \240(J\340\242\200h\347r\316\235;\307EEE\374\376\373\357\a.\0320"
- #"z\3629\26===\\TT\304\347\316\235\213\373gY\205\25\372\246\244\375&"
- #":@\262Z\274x1\365\367\367\0233S\177\177\277\256o\251k\267i\367z\275"
- #"\201\37\220\322~\363\243\247\247\207\266l"
- #"\331B\347\317\237\247\205\v\27\22\21\321"
- #"\321\243Gc\216o\304\216\35;h\303\206\r\344v\273\343\376Y \17\n\b@"
- #"\n\2316m\32\355\332\265\213\276\370\342"
- #"\213\300\17Hy\275^\262\331l\201\37"
- #"\230z\377\375\367\251\260\260\220\326\254Y"
- #"\23\370\255\220xRU\225\366\355\333G\17<\360@\334?\v\344\3029\20+\214"
- #"3\2L\260\361N\332\3132\21\277\275nUV\350\233p\4\2\0\243\314"
- #"\235;\227Z[[\351\336{\357\r\334HR6\24\17\353C\1\1\200\210"
-) 500
-(
- #"\342YDP<\222\3\n\b\0D\25\217\"\202\342\221<P@\0`L\332\357"
- #"\226|\353[\337\n\271jK\257\236\236"
- #"\36jll\244o\177\373\333\21\177\37\5\254\a\5\4\0\306\265x\361b:v"
- #"\354\30\271\335n\252\252\252\242{\356\271"
- #"\207\216\37?\36\323\264\307\217\37\247{"
- #"\356\271\207\346\314\231Cn\267\233\216\35"
- #";6!\227\6C\374\341*,\v\\\351\0`&===\264}\373vz\361"
- #"\305\27\351\362\345\313\343\276?++\213"
- #"\376\361\37\377\2216o\336<!\227\5'\v+\364M( \26XH\0\220z"
- #"\254\3207a\b\v\0\0\204\240\200\0\0\200\20\24\20\272z\250h\263\331(3"
- #"33\321\251\0@\n\313\314\314\f\364GV\200s \26\30g\4\200\324c\205"
- #"\276\tG \0\0 \4\5\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202"
- #"\2\2\0\0BP@\0\0@\b\n\b\0\0\bA\1\1\0\0!( \0"
- #"\0 \4\5\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0B"
- #"P@\0&\210\252\252\224\237\237O6\233\215\334n7utt\b\305\351\351\351"
- #"\241\306\306F\232<y\262\2418\0F\241\200\0\304Y__\37\25\24\24P}"
- #"}=\275\371\346\233DDt\350\320!"
- #"\272\343\216;\250\240\240\200>\375\364S]qf\316\234IDD\335\335\335Bq"
- #"\210\210\n\n\n\350\231g\236\211\370\267"
- #"\247\237~\232\n\n\nb\216\25\234\337"
- #"\264i\323t\345\21\311\300\300\0M\237"
- #">\235\6\6\6\f\305\201\t\300)\316\252MP^^\236\350\24\2N\235:\305"
- #">\237\217\v\n\n\330\347\363qOOO\242S\222\352\304\211\23\\^^\316\177"
- #"\372\323\237\204\246\177\340\201\a\270\251\251)\360<x\235\333\274y3"
- #"o\332\264I(N0=q\230\231w\357\336\3156\233\215\211h\324"
-) 500
-(
- #"\303f\263\361\323O?\35s,\315\203\17>\310EEE\374\320C\17\351\2366"
- #"\330\236={\230\210x\357\336\275\206\342"
- #"\230U\254\353\223\25\372&\363g\30gc-$\247\323\31\262a9\235\316\t\314"
- #"ll2W.#\305\250\267\267\227\v"
- #"\v\v\331\347\363\361{\357\275\307>\237"
- #"\217\v\v\v\271\257\257Ow\254\232\232"
- #"\32VU\225\231\231\25E\341\232\232\32"
- #"\341\274d.\273;\357\274\223g\317\236"
- #"\315\313\227/\27\232>777\244=\202\227]oo/\347\346\346\n\305\t\246"
- #"'N\244<by},===\\TT\304\37}\364\21\27\25\25\361\351\323"
- #"\247u\307\320,_\276\234\357\270\343\16"
- #"\376\373\277\377{\341\30\314r\327\1-"
- #"\226\221\30\36\217'b\301\2366mZ\304\367\243\200X\300X\v)\374ofZ"
- #"\2402r\251\254\254d\237\317\307D\304>\237\217+++u\307\210\264W\254w"
- #"oX\343\367\373\331\343\361\360\23O<"
- #"\301\36\217\207\375~\277\356\30\32Y\313"
- #"\356\347?\3779\317\236=\233\a\6\6"
- #"\370\372\353\257\347C\207\16I\317%\326"
- #"\334\302\337\227\226\226\26\322\241\351\235G"
- #"\231\5$x=\20]\376^\257\227\211\210\v\n\n\370\364\351\323\\PP\300D"
- #"\3043g\316\324\35\213Y\336:\340t"
- #":\3\355\34\374\177\275\266n\335\3127"
- #"\336xc\310\3724g\316\34\376\321\217"
- #"~\24\361\375f\352o\2421\177\206q\26\274'\220\221\2211\352oc=\27q"
- #"\333m\267\tO[^^\36q\17F\364\b\342\335w\337\345\en\270\201\211\210"
- #"o\270\341\6~\367\335wu\307(."
- #".\346?\374\341\17!\257\375\376\367\277"
- #"\347k\257\275V(\247g\236y\206\323"
- #"\323\323\371\331g\237\25\232^#c\331]\272t\211KJJ\270\275\275\235"
- #"\231\231\333\332\332\270\244\244\204/]\272"
- #"\244;\227\361\36\261\306\t\226\236\236\316"
-) 500
-(
- #"%%%Q\377\2567\236h\34\346\320\365@t\371\237:u\2127l\330\20X"
- #"\237g\314\230\301\e6l\20\36\22\225"
- #"\265\375\312\212s\376\374y\316\310\310\340"
- #"\307\36{\214\231\231\267l\331\302\31\31"
- #"\31|\376\374\371\300{222t\257\27\211\204\223\350D\304W\v)\r\r\r"
- #"\305\375\263\332\332\332\204\247\355\356\356\16"
- #"\344J\364U\336\335\335\335B\361\276\367"
- #"\275\357\321\3157\337LDD7\337|3\335w\337}\272c\334{\357\275\364\322"
- #"K/\205\274\366\322K/\321\275\367\336"
- #"\253;V{{;\375\277\377\367\377h"
- #"\317\236=\364\303\37\376\220\216\349\242"
- #";\206L\333\267o\247\205\v\27\322\255\267\336JDD\267\335v\e-X\260\200"
- #"\236x\342\t\335\261\264e\25\276\354\264\347\261p8\34!W\\]\271r\205>"
- #"\376\370c\"\272z\205\227\303\341\320\235"
- #"\227,\301\353\201\350\362\2376m\32\335"
- #"r\313-444D\225\225\225\364\345\227_\322\222%K\310\343\361\310NW\27"
- #"\247\323I.\227\213\210\210\\.\27\225"
- #"\224\224\b\305inn\246\232\232\32\372"
- #"\317\377\374O:{\366,\275\374\362\313TSSC;w\356\f\274ghhH"
- #"\367z\221P\211\250Zf2V\23\204\217\241\6\357\355%\232\314EWQQ!"
- #"<\255U\316\201\210,\273hc\326\263"
- #"g\317\326\25\307\341p\4\346\2139t"
- #"\331)\212\302\16\207#\2468\332\20\237"
- #"vD\244ikk\23\32\362\213\266\16"
- #"\211\254[\347\316\235\343\242\242\"\376\365"
- #"\257\177\315EEE|\356\3349\3351"
- #"\230\257\236\377\310\313\313\343\346\346f\316"
- #"\313\3133t\36D\346\366\253\3052\22"
- #"C\357\372d\205\356\331\374\31\306\231\25"
- #"\26R$F:}\331\264\253\260\246L\231\222\224Wa\31\25\336\361k\353\234"
- #"H\307\257(J\240`\367\364\364\260\242(\\\\\\\34R\240ba\326\253\260"
-) 500
-(
- #"\252\253\253Cv\"\252\253\253\205c\231\25\256\302J\"VXH`}\212\242\260"
- #"\335n\17\351\250\355v\273\356\216\237\371"
- #"\253\202\235\225\225%\34#???j"
- #"\221\330\275{7\347\347\347\353\216\331\333"
- #"\333\313^\257W\350\350\23F\263B\337dc\266\312`[|\330l6\353\2147"
- #"\2@\312\260B\337\204\223\350\0\0 "
- #"\4\5\4\0\0\204\240\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0BP@"
- #"\0\0@\b\n\b\0\0\bA\1\1\0\0!(  Mfff\242SH"
- #")h\357\211\205\366\36\r\337D\267\300"
- #"\267=\255\2m9\261\320\336\23k\242\333\333\n\313\27G \0\0 \4\5$"
- #"\0062\17]e\3052cN\262\230q\336\314\230\223Lfk'\264\2675`\b"
- #"+\206\303D\231\207\222\262b%sN\311<o2c%sN\311<o\261\306"
- #"\302\20\26\0\0$-\34\201\330l\211N\1\0 \242\313\227/\233z\270kR"
- #"\242\23H\264\24\257\237\0\0\3020\204\5\0\0BP@\0\0@\b\n\b\0"
- #"\0\bA\1\1\0\0!( \0\0 \4\5\4\fs\271\\d\263\331\2\17"
- #"\257\327\233\350\224\222\216\252\252TQQ"
- #"\21\361o===\324\330\330Hv\273"
- #"\235\32\e\e\351\364\351\323\23\234]\362"
- #"\31\253\275\261\276\177\5\5\4\f\273p"
- #"\341\0021s\340\321\335\335\235\350\224\222"
- #"\212\252\252\264f\315\32:v\354X\304"
- #"\277\317\2313\207\210\210\216\349BDDUUU\23\226[2\32\257\275\261\276"
- #"\177%\345\277H\b\306Y\341\226\vVV[[KO<\361\4-^\274xT"
- #";\367\365\365\221\327\353\245K\227.\5"
- #"^\313\313\313\243\23'N\320\224)S&:\325\2440V{\23a}\17\206\2"
- #"\2\206\205\177\233\337\351t\322\371\363\347\23\224M"
- #"\362\212\324qm\332\264\211\262\263\263i\353\326\255\201"
-) 500
-(
- #"\327\232\232\232\350\362\345\313\364\324SO"
- #"Mt\212I%Z\241\300\372\376\25\24\0200\254\262\262\222:;;\3\317\235N"
- #"'\35>|\230\352\352\352\22\230U\362\211\324\241E:\332\210tT\2\372E+"
- #" X\337\277\202s `X\360\306DD\324\332\332J\365\365\365\t\312\6 \276"
- #"\260\276\177\5\5\4\300\302\32\e\ei"
- #"\333\266m!\257m\333\266\2156n\334\230\240\214 \225`\b\v\f\321N8\6"
- #"\37\276\247\362!}<E\32R\301I\364\370\211\324\336X\337C\341\b\4\f\331"
- #"\276};\255^\275\232:::\2\337GHOOO\311\215)\21\246N\235J"
- #"\223'O\246\306\306Fz\377\375\367\251"
- #"\261\261\221&O\236\214\342\21'X\337"
- #"C\241\200\200!\213\27/\246\375\373\367\323\35w\334A3g\316$\"\242\17>"
- #"\370 \301Y%\247h_l;z\364(\21\21\375\335\337\375\35\21\241\375e\211"
- #"\324\336X\337Ca\b\v\0\0\204\340\b\4\0\0\204\240\200\0\0\200\20\24\20"
- #"\0\0\20\202\2\2)o\321\242E\243n\210\327\325\325\25\327+k\\.\27\225"
- #"\227\227\307->\300D@\1\201\224\267"
- #"v\355Z\272\373\356\273ixx\230\210"
- #"\210\206\207\207i\355\332\265\264v\355\332"
- #"\270}\3465\327\\C{\366\354\211["
- #"|\200\211\200\253\260 \34513\375\355"
- #"\337\376--]\272\224\36|\360A\332"
- #"\261c\a\265\267\267\323\233o\2769\352"
- #"\306y\0\360\25\34\201@\312\263\331l"
- #"\364\302\v/\320\366\355\333\351\360\341\303"
- #"\364\304\23O\320\363\317?\37S\361P"
- #"U\225\334nw\340\307\205\322\323\323\3"
- #"\177[\260`\1\371\375\376\300s\277\337O\v\26, \"\n\371\21\242\360\30n"
- #"\267\233:::$\316!@\2340\00003\363\323O?\315yyy"
- #"\374\3143\317\304<\215\303\341`UU\3\317\2037\2517\336x\203=\36"
-) 500
-(
- #"\17\177\374\361\307\374\361\307\37\363\265\327"
- #"^\313o\274\361\306\250\367\225\226\226\362"
- #"\316\235;\3\317\25E\341\232\232\32#"
- #"\263\0020!&%\272\200\1\230\305\340"
- #"\340 eee\321\340\340`\314\323\364\367\367G=\331\376\215o|\203\32\e\e"
- #"\251\276\276\236\230\2316n\334H\337\370"
- #"\3067F\275o\357\336\275t\327]wQWW\27m\336\274\231\26/^L\357"
- #"\274\363\216\360|\0L\24\234\3\1 "
- #"\242\17?\374\220\276\376\365\257\323\241C"
- #"\207h\371\362\345\364\326[oE\275u"
- #"H\260\360\e\356\205?\37\31\31\241\362"
- #"\362r\262\331l\324\335\335Miii\21\337\327\323\323C\333\267o\247\27_|"
- #"\221rss\351\265\327^K\331\373+\201u\340\34\b\244\274\341\341aZ\277~"
- #"==\376\370\343T[[K\217=\366\30\255_\277>pU\326X\34\16\307\230"
- #"\347+\36y\344\21*--\245\222\222"
- #"\22z\364\321G#\276\247\266\266\226N"
- #"\236<I\273v\355\242/\276\370\202\36y\344\221\270^\1\6 M\"\307\317\0"
- #"\314\340\311'\237\344e\313\226\361\310\310"
- #"\b33\217\214\214\360\322\245Ky\307"
- #"\216\35\343N\253(\n\27\27\27\263\252"
- #"\252\254(J\310\271\215\275{\367\262\327"
- #"\353\345\263g\317\362\331\263g\331\353\365"
- #"\362\336\275{\2319\364\34\210\337\357g"
- #"\217\307\303\355\355\355\334\326\326\306\36\217"
- #"\207\375~\277\344\271\4\220\17\5\4R^mm-wuu\205\274v\374\370q"
- #"^\264hQL\323+\212\302v\273\235\355v;\227\225\225\5^\237?\177>\277"
- #"\377\376\373\201\347\357\277\377>\317\237?"
- #"\237\231\231+**\242\306\b>)\17`f8\a\2\0\0Bp\16\4\0\0"
- #"\204\240\200\0\0\200\20\24\20\0\0\20\202\2\2\0\0BP@\0\0@"
- #"\b\n\b\0\0\bA\1\1\0\0!( \0\0 \4\5\4\0\0\204\374"
-) 21 #"\177\260\254!O\336\260gH\0\0\0\0IEND\256B`\202"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 5 #"apply"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"mix"
-0 0 24 3 2 #" ("
-0 0 15 3 9 #"for*/list"
-0 0 24 3 3 #" (["
-0 0 14 3 1 #"y"
-0 0 24 3 3 #"  ("
-0 0 14 3 8 #"in-range"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"8"
-0 0 24 3 4 #")] ["
-0 0 14 3 1 #"x"
-0 0 24 3 3 #"  ("
-0 0 14 3 8 #"in-range"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"16"
-0 0 24 3 3 #")])"
-0 0 24 29 1 #"\n"
-0 0 24 3 23 #"                      ("
-0 0 14 3 6 #"points"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"list"
-0 0 24 3 2 #" ("
-0 0 14 3 6 #"vector"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"+"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"1"
-0 0 24 3 3 #") ("
-0 0 14 3 1 #"+"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"y"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"1"
-0 0 24 3 3 #")))"
-0 0 24 29 1 #"\n"
-0 0 24 3 30 #"                              "
-0 0 23 3 5 #"#:sym"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"+"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"*"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"y"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"16"
-0 0 24 3 5 #")))))"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:x-min"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"0.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"16.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-min"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"0.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"8.5"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 16 #";; Function test"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2          45 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          17 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0 \0IDATx\234\355\335\177lV\365\335"
- #"\377\361\327\5m\21\313l\3232\34\26"
- #"\241\2661f\220\f\205\240\261B\306\356)\352\r5f\213l\367}CR\6\342"
- #"TZ%\270{\340\202\313=w\343/&\316\37|\2438\335`w\34\325;\1"
- #"\266\260(5\31\275\230\333\35ln$\241.\263u\30 \21\360\v\210b\240\365"
- #"\352\347\376\343\330\366\272\332\253\265\375\\"
- #"\347\\\347|\316\365|$W\224\323\353\\\347sz\336\347z\365s~|N\302"
- #"\30c\4\0\300(\215\t\273\1\0\0007\21 \0\0+\4\b\0\300\n\1\2"
- #"\0\260B\200\0\0\254\20 \0\0+\4\b\0\300\n\1\2\0\260B\200\0\0"
- #"\254\20 \0\0+\4\b\0\300\n\1\2\0\260B\200\0\0\254\20 \0\0+"
- #"\4\b\0\300\n\1\2\0\260B\200\0\0\254\20 \0\0+\4\b\0\300\n\1"
- #"\2\0\260B\200\0\0\254\20 \0\0+\4\b\0\300\n\1\2\0\260B\200\0"
- #"\0\254\20 \0\0+\4\b\0\300\n\1\2\0\260B\200\0\0\254\20 \0\0"
- #"+\4\b\0\300\n\1\2\0\260B\200\0\0\254\20 \0\0+\4\b\0\300\n"
- #"\1\2\0\260B\200\0\0\254\20 \0\0+\4\b\0\300JQ\330\r\b[\""
- #"\221\b\273\t\0\220\325'\237|\242\t\23&\204\335\214!%\2141&\354F\204"
- #")\221H\310\366W`;o\30\313\fk^\327\332\233\313\274\256\2657\227y]"
- #"ko.\363\272\326\336|\342\20\26\0"
- #"\300\n\1\222\203q\343\3069\265\314\260"
- #"\346\rc\231\254k\360\363\206\261\314BZW\27p\b+\204n\242\v]S\277"
- #"\260\256\361\304\272\306w\271\243A\17\4\0"
- #"`\205\0\tA\334\273\265\351\ni]\vI"
-) 500
-(
- #"!m\327BZ\327\321\342\20\226\3\335D\270\201Z\202\237\\\250'z \0\0"
- #"+\4\b\0\300\n\1\2\0\260B\200\0\0\254\20 \0\0+\4\b\0\300\n"
- #"\1\2\0\260B\200\0\0\254\20 \362n\330I$\22*))\t\273)pL"
- #"III_\375H\324\22r3\260\236\242\216;\321\35\270\333\23n\240\226\340'"
- #"\27\352\211\36\b\0\300\n\1\2\0\260B\200\0\0\254\20 \0\0+\4\b\0"
- #"\300\n\1\2\0\260B\200\0\0\254\20 \0\0+\4\b\0\300J\354\3\244\243"
- #"\243C\343\307\217\17\273\31\0\20;\261"
- #"\16\220T*\245\245K\227\352\374\371\363a7\5\0b'\326\1\262i\323&\225"
- #"\225\225\205\335\f\0\210\245\330\16\246\330"
- #"\336\336\256\371\363\347k\377\376\375\252\256"
- #"\256\36rP2\27\6,\203\e\250%\370\311\205z\212e\17$\225Ji\371\362"
- #"\345z\370\341\2075m\332\264\260\233\3"
- #"\0\261\24\313\0\351=t\265r\345\312"
- #"\21\275\277w\374\375\364\27\317s\300P"
- #"\322\237\331\220\376\222\250%\214\336p\365\24u\261<\2045u\352T\359rd"
- #"\320\364\232\232\32uvvfLs\241\233\b7PK\360\223\v\365\24\313\0\31"
- #"h\270\r\341\302F\202\e\250%\370\311\205z\212\345!,\0@\360\n\"@\246"
- #"O\237\36v\23\0 v\n\342\20\326p\\\350&\302\r\324\22\374\344B=\25"
- #"D\17\4\0\340?\2\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25"
- #"\2\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25\2\4\0`\205\0"
- #"\221xn\3\254\245?\313A\242\226\220"
- #"\233\201\365\24u\214\205\345\300x3p\3\265\4?\271PO\364@\0\0V\b"
- #"\20\0\200\25\2\4\0`\205\0\1\0X!@\0\0V\b\20"
- #"\0\200\25\2\4\0`\205\0\1\0X!@\0\0V\b\20\0\200"
-) 500
-(
- #"\25\2\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25\2D<\303\1"
- #"\366x\36\b\374\304\363@\34\343\302\230\373p\3\265\4?\271PO\364@\0\0"
- #"V\b\20\0\200\25\2\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25"
- #"\2\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25\2\4\0`\205\0"
- #"\1\0X!@\0\0V\b\20\0\200\25\2D<\303\1\366x\36\b\374\304\363"
- #"@\34\343\302\230\373p\3\265\4?\271PO\364@\0\0V\b\20\0\200\25\2"
- #"\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25\2\4\0`\205\0\1"
- #"\0X!@\0\0Vb\e \311dR\225\225\225J$\22\252\254\254\324\276}"
- #"\373\302n\22\0\304Jl\3\344\266\333n\323\316\235;e\214\321\216\35;T_"
- #"_\37v\223\0 Vb;\26\326\214\0313t\350\320\241\276\177\0175\256\214\v"
- #"\343\315\300\r\324\22\374\344B=\305\266"
- #"\a\222\36\36\307\217\37Wiii\210"
- #"\255\1\200\370\211m\200\244{\364\321G\325\324\324\24v3\0 V\212\302n@"
- #"\320\222\311\244^y\345\25\35<xp\310\367d\e{\277\270\270X]]]A"
- #"6\r\216*))Qwww\326\237QK\30\255\341\352)\352b\35 --"
- #"-jhh\320\356\335\2735i\322\244"
- #"!\337\27\365\343\214\210\226\241\302\300\205"
- #"c\326\210\236\341\352)\352b{\b\2537<v\355\332\245Y\263f\205\335\34\0"
- #"\210\235X\6\b\341\1\0\301\213\345e\274W\\q\205\16\37><hzMM"
- #"\215:;;3\246q\330\1~\241\226\340'\27\352)\226\0012\32.l$\270"
- #"\201Z\202\237\\\250\247X\36\302\2\0\4\217\0\1\0X!@\0\0V\b\20"
- #"\0\200\25\2\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25\2\4\0`\205"
-) 500
-(
- #"\0\1\0X!@\344\r\31\220H$TRR\22vS\340\230\222\222\222\276\372"
- #"\221\250%\344f`=E\35ca90\336\f\334@-\301O.\324\23=\20"
- #"\0\200\25\2\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25\2\4\0"
- #"`\205\0\1\0X!@\0\0V\b\20\0\200\25\2\4\0`\205\0\1\0X"
- #"!@\0\0V\b\20\0\200\25\2\4\200d\214\364\306\e\322-\267H\323\247K"
- #"?\370\201t\342D\330\255B\304\25v"
- #"\200<\366\230\376\277\244\266DB\217&\22ZP\\,]\270\20v\253\340\20\347"
- #"\237\a\322\335-m\333&]s\215t"
- #"\363\315\322\353\257K\357\276+\275\374\262"
- #"\364\365\257K\277\372\225\27.\310\v\236"
- #"\a\342\222\257~U\372\350\243\314i\245"
- #"\245\3227\277)\335t\223\264`\201\367"
- #"\327\0300\2.<\277\241\317\331\263\322"
- #"\v/H\277\374\245t\364\350\360\357\2357Oz\376y/P\2207.\324Sa"
- #"\a\310#\217\250\347\301\a\207\357\206M"
- #"\231\322\37&\337\376\266\27:@\26.\354\360:rDz\372i/<\316\236\315"
- #"\374Yq\261\364\375\357{\265\376\37\377"
- #"!ut\364\377\254\244D\372\367\177\227"
- #"~\362\23\351\242\213\362\333\346\2\345B"
- #"=\25v\200H\232\220H\350\323={"
- #"\244\226\26\357\325\3266\374\f55\322\2157z\257\233o\226.\271$?\rE"
- #"\344Ez\207\177\353-\351\221G\244\335"
- #"\273\245\236\236\314\237M\234(\335{\257"
- #"\367\352\375\3\251\273[\332\274\331\v\214"
- #"s\347\372\337[U\345\365Z\276\373\335"
- #"\374\265\275@E\272\236\276P\360\0012"
- #"h#\375\343\37Rz\240\234>=\364\314EE\322\314\231^\230,Z$\325\325"
- #"Ic\n\373\264R!\213\334\16\237JI\377\365_^\217#\333\37FW"
- #"]%=\370\240\364\275\357I\343\306"
- #"e\377\214\367\337\227\356\271\307;7\222"
-) 500
-(
- #"n\321\"/`.\277\334\377vCR\4\353)\v\2d\270\215\224JI\a\16"
- #"\364\207Ik\253\324\3255\364\207M\234(}\353[^\240\334r\2134uj0"
- #"\215F$Ef\207\377\3543i\313\26"
- #"\351\231g\244\316\316\301?\257\253\223\326"
- #"\256\225\26.\34\371\37<\257\276*\255Z\225yeVi\251\264~\275\364\300\3"
- #"\322\330\261\376\264\35}\"SO\303 "
- #"@F\263\221\316\235\223\376\362\27\16w"
- #"!\253\320w\370\217>\222\236}\326\353"
- #"\31\234<\231\371\263\261c\245\177\375W"
- #"\351\276\373\244\331\263\355>\377\314\31\351"
- #"\247?\365\226\221~\30\354\232k\274\223"
- #"\354s\346\330\267\35\203\204^O#@"
- #"\200\344\262\2218\334\2054\241\355\360\177"
- #"\373\233\264a\203\324\334<\3702\364\213"
- #"/\226V\254\220\232\232\244\332Z\177\226"
- #"\367\347?Kw\335%\35:\324?\255"
- #"\250\310;\324\365\363\237K_\371\212?\313)p\4\210\3|\333H\34\356*x"
- #"y\337\341G{b\334O\234d\17\34"
- #"\1\342\200\3006\322\311\223^\220\354\331"
- #"\343\335\341{\354\330\320\357\0353Fj"
- #"l\224\236|\222^\211\303\362\262\303\e"
- #"\343\325\324\306\215\336\177\a\2322\305;"
- #"L\265re~\16\231\266\267K?\374\241\224LfN_\262D\372\305/\244I"
- #"\223\202oCL\21 \16\310\333Fjo\367\202d\317\36i\357\336\314\277\332z"
- #"-[&\275\370\"!\342\250@k\251"
- #"\273[\372\335\357\274/\345w\336\31\374"
- #"\363\2313\2455k\274\3738\212\213\203"
- #"i\303P\214\361\356X\377\361\217\245S"
- #"\247\372\247WTH\217?\356\r\213\342"
- #"\310\235\325QB\2008 \224\215t\341"
- #"\202w\370\341\2157\274\303\17\a\17\366"
- #"\377\214\20qV \265\364ew\214\337"
- #"t\223\364\243\37y\377\r\333\211\23^\210\375\366\267\231\323\271"
- #"\223\335\n\1\342\200\3207\2221\336\341\253\347\236\353\237\266x"
-) 500
-(
- #"\261w\375~QQx\355\302\250\371ZK\371>1\356'N\262\373\"\364\357\246"
- #"\21\b\354\317\334d2\251\272\272\272\276"
- #"\377\2371c\206\366\355\333\27\324\342\334"
- #"\225Hx\327\353\337{o\377\264\346f"
- #"\351\337\376M\372\374\363\360\332\205p\274"
- #"\365\226T_/\315\230\341\rr\230\36"
- #"\36\23'z\227\321\36>\354\365H\242"
- #"\30\36\222t\303\r\322\377\376\257\364\324"
- #"S\336\275\"\222W\313O?\355\365B\376\373\277\303m\37\374c\2R^^n"
- #"\222\311\244\371\360\303\17\315\245\227^j"
- #"6m\332d&O\236l\222\311dP\213\264\22\340\257`tR)c\32\32\214"
- #"\361\372$\336k\3312o:\234\220S-\245R\306\334}w\346\366\357}M\231"
- #"b\314\23O\30\363\361\307\37656_"
- #"\16\0352f\336\274\301\353\264d\2111"
- #"\307\217\207\335\272H\213\314w\3230\2"
- #"ka\357\312\257Y\263\306<\360\300\3\306\30cZ[[MyyyP\213\264"
- #"\22\251\215D\2108\315\272\226\262mw"
- #"\311\230\2313\215\331\272\325\230\256.\177\e\232o==\306l\331bLEE\346"
- #"\372UT\30\363\342\213\336\3171H\244"
- #"\276\233\206\20x\200\224\226\226\232\343_"
- #"\374\245\21\325\0\351}\25\27\27\207\335"
- #"\34B\3041\305\305\305\03154\352Z"
- #"\312\266\275\347\3177\346\2157\202mx"
- #"\30\216\37\367z\36\3\203r\336<c"
- #"\332\333\303n]$\f\254\247\250\v\364"
- #"\20\326\246M\233\372\2\243\265\265\225C"
- #"X#\325\323c\314\275\367f\356d\213\27\e\323\335\35v\3130\214Q\327Rw"
- #"\2671w\334\221\271\235W\255\212\377_"
- #"\344\373\366\0313cF\346z\27\25\31"
- #"\323\324d\314\331\263a\267.2\"\371\3354@`-lmm5\327^{m"
- #"_`\\\177\375\365\221\v\17c\"\274\221\b\21\347\214\252"
- #"\226\n5<zuu\31\363\324S\306\224\226f\376\16\252"
-) 500
-(
- #"\252\214y\355\265\260[\27\t\221\375nJ\303e\274Q\276T\256\247GZ\276\\"
- #"\372\365\257\373\247q\237Hd\215\270\226"
- #"\330\256\375\206\272\223\375\236{\274\253\23"
- #"\v\355\367\221&\322\337M_\360u\353TTT\250\246\246F\222T[[\333\367"
- #"l\337\364WmT/=\214\2421c\274;|\e\32\372\247\275\374\262w\17\300"
- #"\300\261\217\340\6\302#\323\364\351\336\310"
- #"\f[\266xw\256\367\332\274\231:w\200\257\25;q\342Dm\335\272U\222\324"
- #"\331\331)\343\35\"\313xuf{>\1\206F\210\304\a\341\221]\"\341\325\363"
- #"\273\357f\16\302H\235G\36\207\260\34"
- #"\350&J\342\216u\a\f[K\237\177"
- #"\356=\217\343\325W\373\247\255Z\345\335"
- #"\\\3078Q\375\250\363>.|7\5"
- #"\366g\317\354\331\263\325\334\334\2341\255"
- #"\271\271Y\263m\37fS\350\270c\335"
- #"]\204\307\310Q\347n\t\352\354\374\301\203\aMuu\265ijj2\335\335\335"
- #"\246\251\251\311TWW\233\203\a\17\6"
- #"\265H+\1\376\n\202\301\325Y\221\225"
- #"\265\226\n\375j+[\324\271\23\337M"
- #"\201\36\302\372\350\243\217t\373\355\267\353"
- #"\357\177\377\273\256\272\352*\355\330\261C"
- #"\225\225\225A-\316\212\v\335\304A\350"
- #"\346G\322\240Z\242\347\221\233\2\257s"
- #"\27\276\233\2=s\367\351\247\237\352\343"
- #"\217?VYY\231\316\2349\243O>\371$\310\305e8z\364\250\32\e\eU"
- #"VV\246\306\306F\35\e\356\201NyVRR\222\333\a8\324\315\317y]]"
- #"\25\363\360\310\313v\215H\235\27l\r\217@`\1\262w\357^]w\335uZ"
- #"\261b\205\336{\357=\255X\261B\327]w\235\366\356\335\e\324\"3\\}\365"
- #"\325\222\2447\337|S\2224s\346\314\274,w$\272\273\273s\377\220\210"
- #"\354\\_\306\227uuM\314\303C\312\343v\215@\235\27d\r\217TP"
-) 500
-(
- #"\307\306f\315\232e\266o\337\2361m"
- #"\373\366\355f\326\254YA-\262\317\207\37~hJKK3\246\245\217\311\225."
- #"\300_\301\220|]f\304\217\25\207\361"
- #"\373\r\213\244\2029\347\221\367\355\32b"
- #"\235\207U\303.\354;\261\274\214w\365"
- #"\352\325\32?~\2746l\330\3207m"
- #"\335\272u\272p\341\202\236|\362\311\214"
- #"\367\346r\234\261\244\244D]]]\243\236\317\367e\216\360X\261m{s\2317"
- #"\214\337oX\363\26'\22\352\276\343\16"
- #"\253\236\207k\353\32\312v5F\377\257\250Hw\247\337\0272\212s\"N\255k"
- #"\216\313\315\233\240\222\351\262\313.\313:"
- #"JiMMMP\213\354\223\255\267\221\255WbLn)o;o \313\34\301"
- #"_h\261Y\327(\316\333\335m\232\a\2162;\212\236\207S\353\32\3222\2151"
- #"&!Y\367D\\[\327\0\277\236}\23\3309\220\317>\373L\311d\262\357\16"
- #"\364\326\326VM\236<Y\277\371\315o"
- #"\202Zda\213\300\261\342\202\365\3059"
- #"\217;\322\247\305\354\234GT\30\211:"
- #"\217\222\240\222)\333G\347\353y k"
- #"\327\2565\253W\257\316\230v\377\375\367"
- #"\233u\353\326\rz\257\262\364\222\\~"
- #"%$\363\354\200\277\204\267K\246(\2"
- #"m\213\343\253H\32\324\363x\346\213\355"
- #"\20v\333\342\374*\224:\277p\341B"
- #"\340\337\227\271\210e\200\344\353$\272\355"
- #"\274\201/s\210\303YEq\\\3270"
- #"\347\365\361\204y\344\3275\2\313\0344"
- #"\357(O\254;\275\256\21\25X\v{"
- #"\237\211\336+\337\17\224\252\254\2544\253"
- #"V\2552\373\367\3577\253V\2552\225"
- #"\225\225Y\337\27\333\235/\313\316\265]"
- #"\262\276j%\322\353\32\306\274Y\302\343"
- #"\31\311\372j\253H\257kD\226\231u"
- #"\336Q\204\210\363\353\32A\201\235\3\331\265k\227\26-Z\324"
- #"7\214{}}\275\232\233\2335w\356\334\240\26\231\341\300\201"
-) 500
-(
- #"\3\222\244\205\v\27J\222\336y\347\35\337\2271n\3348\337?\323\267ef9"
- #"'\262X\262>V\34\351u\315\367\274"
- #"C\334\347\321$Y\237\363\210\354\272\6"
- #"\300\327\366\216\342\334\237k\353\352\202X"
- #"^\306;\32a\\*\227\327e\216\360\22\337\2408q)\342h\fs\223`b"
- #"\314\230x\255\3530\"\267]\3\254\363"
- #"\260\3265r\277\343,\n\370!\4\5\202\253\263\374S\0w\230;\213:\17\5"
- #"\1\22\202\274wkC\334\271b\323\205'<2Dr\273\6T\347\221\\\327\210"
- #"\340\20\226\3\335D\337\204|8\313Y#\f\217\202\252\245(\213I\235\273PO"
- #"\364@\n\t\335\374\321\243\347\341\36\352"
- #"<o\b\220B\303\3165r\204\207\273\250\363\274 @\nQ\"\341}\t64"
- #"\364Okn\226\376\345_\244\23'BkV\244\364\364Hw\336\231\31\36\313\226"
- #"I\277\374%\341\341\212\241\352|\345J"
- #"o\373\"g\276\6\310\2349s\30\353"
- #"\312\25c\306H\277\372U\346\316\365\332"
- #"k\322\327\277\356M\217\370\261\327@\365"
- #"\364H\313\227K\277\376u\377\264e\313\244\27_\364~opG\266:\177\371e"
- #"i\305\nB\304\a\276\236D\177\357\275"
- #"\367\264x\361b]q\305\25z\351\245\227T^^\356\327G\a\306\205\23U\201"
- #"\352\351\361N8n\336\2349}\336<\351\371\347\275@)$9\204G\301\327R"
- #"\2249\370G\201\v\365\344\353o\356\312"
- #"+\257\324_\377\372W]~\371\345\272"
- #"\356\272\353\372\356\6G\204\215\31\343]"
- #"\255\262o\2374cF\377\364dR\372"
- #"\3067\244\373\356\223\362\370(\342P}"
- #"\376\271\364\375\357g~\311\254Z\345\375"
- #"\5\e\321/\31\214\320\2301\322K/e\236\23y\371e\357\260-\347D\354\5"
- #"5F\312\272u\353LQQ\321\240\321%\363\361<"
- #"\220\321\b\360W\340\236\256.c\236z\312\230\322\322\314"
-) 500
-(
- #"\261\205\252\252\214y\355\265\260[\27,"
- #"\37\6F\244\226\34\20\361'x\246s\241\236\2i\341\236={LUU\225i"
- #"kk\v\342\343}\225\36n\305\305\305a7'\32\16\0352f\336\274\314\235L"
- #"2f\311\22c\262\214h\354\264\236\36c^\177\335\230\371\3633\327u\3312c"
- #"R\251/\235\275\270\2708\3530\334\324R\204\245R\30644Xm\357\240\r\254"
- #"\247\250\363\275\205.\205\2071n\244|"
- #"(zz\214\331\262\305\230\212\212\314\35"
- #"\255\242\302\230\27_t\377\31\337]]"
- #"\306l\335j\314\314\231\203\203\322\362\313"
- #"\204ZrH\204C\244\227\v\365\344k\v]\v\17c\334\330H\241:~\334\353"
- #"y\f\374\222\2357\317\230\366\366\260["
- #"7z\37\177l\314\23O\0303e\312\340u\222\214\271\373n\353/\21j\3111"
- #"\21\17\21\27\352\311\327\26^\177\375\365"
- #"y{\336\207_\\\330H\221\260o\23713fd\356lEE\30645\31s"
- #"\366l\330\255\373r\357\276k\314\322\245"
- #"\306\214\e784.\276\330[\217\216\216\234\26A-9(\302\347D\\\250'"
- #"\306\302r\340R\271\310\350\356\366.\367"
- #"\375\311O\244s\347\372\247WUy7\330}\367\273\341\265m(o\275%=\362"
- #"\210\264{\367\340\353\376'N\364\256\312"
- #"\271\367^\351\253_\315yQ\324\222\243"
- #"\":v\226\v\365D\2008\260\221\"\247\275]\372\341\17\275K}\323-Y\""
- #"\375\342\27\322\244I\341\264\253\2271\322"
- #"\236=\322\306\215\336\177\a\2322\305\273"
- #"<y\345J\351\222K|[,\265\344\260l\367\211|\343\e\322?\377\263\264`"
- #"\201TW'\345yT^\27\352\211\0q`#E\2221\336\375\21?\376\261t"
- #"\352T\377\364\212\n\351\361\307\245\37\374 \377C~twK\277\373\235"
- #"\27b\331\236@9s\246\264f\215w\257Gq\261\357\213\247\226\34\227"
-) 500
-(
- #"-Dz\225\226J\337\374\246t\323M^\240L\237\36xs\\\250'\2\304\201"
- #"\215\24i'Nx_\312\277\375m\346"
- #"\364|\336\311~\366\254\364\302\v\336a"
- #"\264\243G\a\377\374\246\233\244\37\375\310"
- #"\373o\200\250\245\30\350\351\221V\257\226"
- #"\236}v\370\241N\246L\351\17\223o\177\333\227C\240\3\271PO\4\210\3\e"
- #"\311\t\177\376\263t\327]\322\241C\375"
- #"\323\212\212\244{\356\221~\376s\351+"
- #"_\361\177\231\177\373\233\264a\2037@"
- #"\336\205\v\231?\273\370bo\274\243\246"
- #"&\251\266\326\377egA-\305\310\271"
- #"s\322_\376\"\265\264x\257\266\266\341"
- #"\337_S#\335x\243\367\272\371f_\16\215\272PO\4\210\3\e\311\31\371:"
- #"\311\236\307\23\343\243A-\305\330?\376"
- #"\341\235O\353\r\224\323\247\207~oQ"
- #"\221w\270\364\306\e\245E\213\274\363'"
- #"\26C\341\270PO\4\210\3\e\3119\357\277\357\365<^\177=s\372\242E^"
- #"\300\\~\371\350?3\225\362\256\212y"
- #"\372\351\354\177\r^u\225\364\340\203\322"
- #"\367\276\227\367\223\235\275\250\245\2\221J"
- #"I\a\16\364\207Ik\253\324\3255\364\373'N\224\276\365-/Pn\271E\232"
- #":uD\213q\241\236\b\20\a6\222\263^}\325\e\2140\375\31#\245\245\322"
- #"\372\365\322\3\17Hc\307~\371g|"
- #"\366\231\264e\213\367p\240\316\316\301?"
- #"\257\253\223\326\256\225\26.\f}\300Cj\251@\5t\270\313\205z\"@\34\330"
- #"HN;sF\372\351O\a\237\224\274\346\32\357$\373\2349\331\347\373\350#o"
- #"\236\315\233\245\223'3\1776v\254\367"
- #"\244\300\373\356\223f\317\16\256\355\243D"
- #"-A\222o\207\273\\\250'\2\304\201\215\24\v#=\311\36\261\23\343\243A-"
- #"a\220\34\16wM\273\353.}\20\361z\"@\330\351"
- #"\363\347\374y\351?\377\323\273O$}'\272\362J\351\241"
-) 500
-(
- #"\207\274s&\333\267{'\343\323]r\211w\323\337}\367y\227OF\24\265\204"
- #"/u\362\244\27${\366Ho\274!\35;6\344[{$\215y\344\21\357\20"
- #"mD\21 \354\364\3717\324\235\354\3\5t\307xP\250%\214Z{\273\27$"
- #"{\366H{\367f^\275(yW\22\246\237C\214\30\2$\355n\351\342\342b"
- #"u\r\327\275\204\177\206\272\223]\n\374"
- #"\216q?\225\224\224\250{`\217I\324\22,\\\270\240\5\23&\350\237>\377\\"
- #"\v$UK\252x\364Qo\37\211("
- #"\2\204\277\32\303u\342\204\267\203\374\317"
- #"\377x\2277\256Y\23\370\35\343A\241"
- #"\226\340'\27\352\211\0q`#\301\r\324\22\374\344B=\205{\341<\0\300Y"
- #"\4\b\0\300\n\1\2\0\260B\200\0\0\254\20 \0\0+\4\b\0\300\n\1"
- #"\2\0\260B\200\0\0\254\20 \0\0+\4\b\0\300\n\1\2\0\260B\200\0"
- #"\0\254\20 \0\0+\4\210\274Q/\23\211\204JJJ\302n\n\34SRR"
- #"\322W?\22\265\204\334\f\254\247\250c"
- #"8w\a\206L\206\e\250%\370\311\205z\242\a\2\0\260B\200\0\0\254\20 "
- #"\0\0+\4\b\0\300\n\1\2\0\260B\200\0\0\254\20 \0\0+\4\b\0"
- #"\300\n\1\2\0\260\22\333\0I&\223\252\254\254Tee\245\366\355\333\27vs"
- #"\0 v\212\302n@\20***\324\323\323\243?\374\341\0172\306h\361\342\305"
- #"jnn\326\334\271s\303n\32\0\304F,\3d\362\344\311:t\350P\337\277"
- #"\267o\337\256\372\372z\235>}:\304"
- #"V\1@\274\24\304`\212\25\25\25\222"
- #"\244S\247N\r\372\231\v\3\226\301\r\324\22\374\344B=\25D\200\f\267!\\"
- #"\330Hp\3\265\4?\271PON\235D\257\255\255\355\e+\177"
- #"\340\253\266\2666\353<\311dR\345\345\345\303~n\266\317\343y\16"
-) 500
-(
- #"\30J\3723\e\322_\22\265\204\321\e"
- #"\256\236\242\316\251s \235\235\235\243z"
- #"\177KK\213\32\32\32\364\346\233o\16"
- #"\373\276\250\247<\242\245\253\253+\353t\27\376bD\364\fWOQ\347T\17d"
- #"4z\303c\327\256]\2325kV\330\315\1\200\330\211e\200\20\36\0\20\274X"
- #"\236D\277\342\212+t\370\360\341\214i555Y\17\201q\330\1~\241\226\340"
- #"'\27\352)\226\0012\32.l$\270\201Z\202\237\\\250\247X\36\302\2\0\4"
- #"\217\0\1\0X!@\0\0V\b\20\0\200\25\2\4\0`\205\0\1\0X!"
- #"@\0\0V\b\20\0\200\25\2\4\0`\205\0\1\0X!@$\236\333\0k"
- #"\351\317r\220\250%\344f`=E\35ca90\336\f\334@-\301O.\324"
- #"\23=\20\0\200\25\2\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25"
- #"\2\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25\2\4\0`\205\0"
- #"\1\0X!@\0\0V\b\20\0\200\25\2\4\0`\205\0\21\317p\200=\236"
- #"\a\2?\361<\20\307\2700\346>\334@-\301O.\324\23=\20\0\200\25\2"
- #"\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25\2\4\0`\205\0\1"
- #"\0X!@\0\0V\b\20\0\200\25\2\4\0`\205\0\1\0X!@\0\0"
- #"V\b\20\0\200\25\2\4\0`\205\0\21\317p\200=\236\a\2?\361<\20\307"
- #"\2700\346>\334@-\301O.\324\23=\20\0\200\25\2\4\0`\205\0\1\0"
- #"X!@\0\0V\b\20\0\200\25\2\4\0`\205\0\1\0X!@\0\0V"
- #"\b\20\0\200\225\330\aHGG\207\306\217\37\37v3\0 vb\35 \251T"
- #"JK\227.\325\371\363\347\303n\n\0\304N\254\3d\323\246"
- #"M*++\v\273\31\0\20K\261\35L\261\275\275]\363\347\317"
-) 500
-(
- #"\327\376\375\373U]]=\344\240d.\fX\0067PK\360\223\v\365\24\313\36"
- #"H*\225\322\362\345\313\365\360\303\17k"
- #"\332\264ia7\a\0b\311\251\0\251"
- #"\255\255\355\e+\177\340\253\266\266\266\357"
- #"}\275\207\256V\256\\9\242\317\315\366y<\317\1CI\177fC\372K\242\226"
- #"0z\303\325S\324\305\362\20\326\324\251"
- #"Su\344\310\221A\323kjj\324\331\331\2311\315\205n\"\334@-\301O."
- #"\324S,\3d\240\3416\204\v\e\tn\240\226\340'\27\352\311\251CX\0\200"
- #"\350(\210\0\231>}z\330M\0\200\330)\210CX\303q\241\233\b7PK"
- #"\360\223\v\365T\20=\20\0\200\377\b\20\0\200\25\2\4\0`\205\0\1\0X"
- #"!@\0\0V\b\20\0\200\25\2\4\0`\205\0\1\0X!@\0\0V\b"
- #"\20\0\200\25\2D\342\271\r\260\226\376,\a\211ZBn\6\326S\3241\26\226"
- #"\3\343\315\300\r\324\22\374\344B=\321\3\1\0X!@\0\0V\b\20\0\200"
- #"\25\2\4\0`\205\0\1\0X!@\0\0V\b\20\0\200\25\2\4\0`\205"
- #"\0\tA!\335\245\\H\353ZH\ni\273\26\322\272\216\26w\242\207p\267\247"
- #"\vw\230\372\205u\215'\3265\276\313\35\rz \0\0+\4H\16\302\350\332"
- #"\346\262\314\260\346\rc\231\254k\360\363"
- #"\206\261\314BZW\27p\b+\207n\242\355\274a,3\254y]ko.\363"
- #"\272\326\336\\\346u\255\275\271\314\353Z"
- #"{\363\211\36\b\0\300\n=\20G\306\335\aPx>\371\344\23M\2300!\354"
- #"f\f\251(\354\6\204\255\300\363\23\0\254q\b\v\0`\205\0\1\0X!@"
- #"\0\0V\b\20\0\200\25\2\4\0`\205\0\211\220\216\216\16\215\37?>\354f"
- #"\4*\231L\252\262\262R\225\225\225\332\267o"
- #"_\330\315\361\305\321\243G\325\330\330\250\262\262"
-) 500
-(
- #"2566\352\330\261ca7)P\275\3330\221H\304j;\16\247\20\366M"
- #"\e\4HD\244R)-]\272T\347\317\237\17\273)\201\251\250\250P}}\275"
- #"v\356\334\251\35;vh\361\342\305\261"
- #"\370\362\271\372\352\253%Io\276\371\246"
- #"$i\346\314\231a6'p\267\335v\233v\356\334)c\214v\354\330\241\372\372"
- #"\372\260\233\24\250B\3307m\25\374\215"
- #"\204Q\261q\343F\265\264\264\350\365\327"
- #"_\217\355\275)3f\314\320\241C\207"
- #"\372\376\235L&u\333m\267\351\364\351\323!\266*7\307\217\37Wmm\255>"
- #"\375\364\323\276i\23&L\320\373\357\277"
- #"\257I\223&\205\330\262\340\f\334\216."
- #"\f\271\221\213B\3307m\21 \21\320"
- #"\336\336\256\371\363\347k\377\376\375\252\256"
- #"\256.\230\"\255\250\250\220$\235:u"
- #"*\344\226\330[\275z\265\306\217\37\257"
- #"\r\e6\364M[\267n\235.\\\270\240'\237|2\304\226\345G\266\0\215\223"
- #"B\3357G\212\0\tY*\225\322\334"
- #"\271s\325\320\320\240\273\356\272+\366\177"
- #"\315\245\213\303\272f\353m\304\375K5]\266\0\215\213B\3367G\212s \1"
- #"\251\255\255U\"\221\310\372\252\255\255\355"
- #"{\337\246M\233TVV\246\225+W\206\330\332\334\214t]\323%\223I\225\227"
- #"\227\347\271\245\360S2\231\324+\257\274"
- #"\242\373\357\277?\354\246\4\"\16\373f"
- #"\320\350\201\204l\352\324\251:r\344\310"
- #"\240\351555\352\354\354\f\241E\301kiiQCC\203v\355\332\245Y\263"
- #"f\205\335\234\234d;\\\25\347\277\312"
- #"{\305i\e\16\245\20\367\315\321\"@"
- #"\"&\356\335\344\270}\361\24\342I\364"
- #"\270m\303\221\212\373\276i\203CX\310"
- #"\2338~\361\\z\351\245\272\350\242\213"
- #"\324\330\330\250\267\337~[\215\215\215\272\350\242\213\b\17\24"
- #"\4\2$b\246O\237\36v\23\2s\347\235w\352\330\261"
-) 500
-(
- #"c\232={\366\227\236#q\311\201\3\a$I\v\27.\224$\275\363\316;a"
- #"6'P\331\266a\\\266\343\227\211\363\276i\213CX\0\0+\364@\0\0V"
- #"\b\20\0\200\25\2\4\0`\205\0A"
- #"\301\273\341\206\e\6]\327\337\321\321\241"
- #"\271s\347\6\266\314\212\212\n\325\324\324"
- #"\4\366\371@>\20 (xK\227.\325\222%K\224J\245$\365\217\276\272t"
- #"\351\322\300\226\371\265\257}M[\267n\r\354\363\201|\340*,\24<c\214n"
- #"\271\345\26-X\260@k\326\254\351\e"
- #"}\365\217\177\374\243\22\211D\330\315\3"
- #"\"\213\36\b\n^\"\221\320\v/\274"
- #"\240\307\36{L\277\377\375\357\365\370\343"
- #"\217\353\371\347\237\37Qx\244?\\)"
- #"\221Hh\354\330\261}?\273\366\332k"
- #"\325\326\326\326\367\357\266\2666]{\355"
- #"\265\222\224q\337\304\300\317(\224\2074"
- #"!\6\f\0c\2141\317=\367\234\2310a\202\331\274y\363\210\347)//7"
- #"\311d\262\357\337\351\273\324\356\335\273M"
- #"UU\225\371\340\203\17\314\a\37|`.\273\3542\263{\367\356A\357\2336m"
- #"\232y\352\251\247\372\376\335\332\332j\256"
- #"\277\376\372\\V\5\310\213\242\260\3\f"
- #"\210\212s\347\316i\334\270q:w\356"
- #"\334\210\3479s\346\314\220'\333o\275\365V566\252\276\276^\306\03055"
- #"5\351\326[o\35\364\276m\333\266\351"
- #";\337\371\216:::\264v\355Z\315\2337Oo\275\365\226\365z\0\371\3029"
- #"\20@\375\17\16\332\261c\207n\277\375"
- #"v\375\351O\177\32\321\320\25\3\a\330"
- #"\e\370\357\236\236\36\325\324\324(\221H"
- #"\250\263\263Sc\306\214\311\372\276\243G"
- #"\217\352\261\307\36\323\226-[TZZ"
- #"\252\235;w\6z\25\30\340\a\316\201\240\340\245R)-_\276\\\17?\374"
- #"\260\352\352\352\364\263\237\375L\313\227/"
- #"\357\273*k8\345\345\345\303\236\257X"
-) 301
-(
- #"\277~\275\246M\233\246\251S\247\352\241"
- #"\207\36\312\372\236\272\272:\35>|X"
- #"\317<\363\214\316\237?\257\365\353\327\a"
- #"z\5\30\340\2330\217\237\1Q\360\304"
- #"\23O\230\233o\276\331\364\364\364\30c"
- #"\214\351\351\3511\v\26,0\e7n\374\322y[[[\315\344\311\223M2\231"
- #"4\255\255\255\31\3476\266m\333fjkk\315\311\223'\315\311\223'Mmm"
- #"\255\331\266m\2331&\363\34H[[\233\251\252\2522---f\317\236=\246"
- #"\252\252\312\264\265\265\371\274\226\200\377\b"
- #"\20\24\274\272\272:\323\321\321\2211\355"
- #"\275\367\33637\334p\303\210\346omm5eee\246\254\254\314TWW\367"
- #"M\2373g\216y\373\355\267\373\376\375"
- #"\366\333o\2339s\346\30c\214\231>"
- #"}\372\220\237\221~R\36\2102\316\201\0\0\254p\16\4\0`\205\0\1\0X"
- #"\222\316a\323\0\0\0(IDAT!@\0\0V\b\20\0\200\25\2\4\0"
- #"`\205\0\1\0X!@\0\0V\b\20\0\200\25\2\4\0`\345"
- #"\377\0\213@\367\0245\377\341_\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"line"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"sin"
-0 0 24 3 1 #" "
-0 0 23 3 9 #"#:samples"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"10"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:width"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"3"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:color"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 3 #"red"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:x-min"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"-5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-min"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"-5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"5"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 22 #";; Polar function test"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2          39 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          14 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0\32\237IDATx\234\355\335\177hU\347\35"
- #"\307\361\317\315\3525bhB2\354\254Lm.\373G\321\212b\245\326\201\177u"
- #"km\262ak\366\317\204\224X;\212\327\256t\320\372\207R\f\330i\273j\327"
- #"\265\320\255\243]\205\311\262VLZ\35c\21V\257\373\1\232a\23\364\237&b"
- #"Q\aR\250\16uSK\356\331\37\227{s\363\263\311\367\236s\317y\316y\277"
- #" \364\3466\347\236\347x\2779\237<\317s\317sR\236\347y\2\0`\206j"
- #"\302n\0\0\300M\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B"
- #"\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1"
- #"\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000"
- #"!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200"
- #"\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0"
- #"\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!"
- #"@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0"
- #"\0L\b\20\0\200\311]a7 l\251T*\354&\0\300\204\256_\277\256\272"
- #"\272\272\260\2331\251\224\347y^\330\215"
- #"\bS*\225\222\365\237\300\272m\30\373"
- #"\fk[\327\332[\311\266\256\265\267\222m]ko%\333\272\326\336jb\b\v"
- #"\0`B\200T`\366\354\331N\3553\254m\303\330'\307\32\374\266a\3543I"
- #"\307\352\2\206\260B\350&\272\3205\365\v\307\32O\34k|\367;\23\364@\0"
- #"\0&\4H\b\342\336\255-\227\244cM\222$\275\257I:\326\231b\b\313\201n"
-) 500
-(
- #"\"\334@-\301O.\324\23=\20\0\200\t\1\2\0000!@\0\0&\4\b"
- #"\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\25."
- #"\330I\245RJ\247\323a7\5\216I\247\323\245\372\221\250%Tfl=E\35"
- #"W\242;p\265'\334@-\301O.\324\23=\20\0\200\t\1\2\0000!@"
- #"\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0"
- #"L\b\20\0\200I\354\3dppPs\346\314\t\273\31\0\20;\261\16\220\341"
- #"\341am\336\274Y\267n\335\n\273)"
- #"\0\20;\261\16\220\375\373\367\253\276\276"
- #">\354f\0@,\305v1\305s\347\316i\375\372\365:u\352\224\26/^<"
- #"\351\242d.,X\0067PK\360\223\v\365\24\313\36\310\360\360\260:::\324"
- #"\331\331\251E\213\26\205\335\34\0\210\245"
- #"X\6Hq\350j\353\326\255\323\372\371"
- #"\342\372\373\345_\334\317\1\223)\277g"
- #"C\371\227D-a\346\246\252\247\250\213"
- #"\345\20\326\302\205\vu\361\342\305q\317777khhh\324s.t\23\341"
- #"\6j\t~r\241\236b\31 cM\365F\270\360&\301\r\324\22\374\344B="
- #"\305r\b\v\0\20\274D\4\310\222%K\302n\2\0\304N\"\206\260\246\342B"
- #"7\21n\240\226\340'\27\352)\21=\20\0\200\377\b\20\0\200\t\1\2\0000"
- #"!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200"
- #"\0\0L\b\20\0\200\t\1\"q\337"
- #"\6\230\225\337\313A\242\226P\231\261\365"
- #"\24u\254\205\345\300z3p\3\265\4?\271PO\364@\0\0&\4\b\0\300"
- #"\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1"
- #"\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0"
-) 500
-(
- #"\0L\b\20q\17\a\330q?\20\370\211\373\2018\306\2055\367\341\6j\t~"
- #"r\241\236\350\201\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0"
- #"\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t"
- #"\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \342\36\16\260\343"
- #"~ \360\23\367\3q\214\vk\356\303\r\324\22\374\344B=\321\3\1\0\230\20"
- #" \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0"
- #"\0&\4\b\0\300\204\0\1\0\230\304"
- #"6@r\271\234\232\232\232\224J\245\324"
- #"\324\324\244\223'O\206\335$\0\210\225"
- #"\330\6Hkk\253\272\273\273\345y\236"
- #"\216\349\242\226\226\226\260\233\4\0\261"
- #"\22\333\265\260\226.]\252\263g\317\226"
- #"\276\237l]\31\27\326\233\201\e\250%"
- #"\370\311\205z\212m\17\244<<\256\\"
- #"\271\242\271s\347\206\330\32\0\210\237\330"
- #"\6H\271\237\377\374\347\332\276}{\330"
- #"\315\0\200X\271+\354\6\4-\227\313"
- #"\351\320\241C\352\357\357\237\364g&Z"
- #"{\177\326\254Y\272s\347N\220M\203"
- #"\243\322\351\264\276\372\352\253\t\377\37\265"
- #"\204\231\232\252\236\242.\326\1\322\333\333"
- #"\253\366\366v\35;vL\363\346\315\233"
- #"\364\347\242>\316\210h\231,\f\\\30\263F\364LUOQ\27\333!\254bx"
- #"\364\364\364h\345\312\225a7\a\0b'\226\1Bx\0@\360b\3711\336\373"
- #"\356\273O\27.\\\30\367|ss\263\206\206\206F=\307\260\3\374B-\301O"
- #".\324S,\3d&\\x\223\340\6j\t~r\241\236b9\204\5\0\b\36"
- #"\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4"
- #"\0`B\200\0\0L\b\20\0\200\t\1\2\0000"
- #"!@TX2 \225J)\235N\207\335\248&\235"
-) 500
-(
- #"N\227\352G\242\226P\231\261\365\24u\254\205\345\300z3p\3\265\4?\271P"
- #"O\364@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B"
- #"\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1"
- #"\0\230\20 \0\0\23\2\4\0`B\200\0\32340 \265\265IuuR*"
- #"5\376K\362&|>\225*l\323\326Vx\r .X\316\275l\335\375Y\263"
- #"f\351\316\235;!\266\6Q30 uvJ\307\216I7o\372\363\232s\347"
- #"J\217>*\355\334)-[\346\317k"
- #"\"\36\322\351\264\276\372\352\253\322\367Q"
- #"?=\23 \16\254\271\217\352\e\30\220"
- #"v\357\226\16\37\226\362\371`\366QS#=\3768A\202\211\271pnb\b\v"
- #"(30 m\332$\255X!}\360\301\370\360H\247\v\377\277\277_\362\274\321"
- #"_Rj\334s\236W\370\331M\233\n"
- #"\333\226\313\347\245?\376\261\260\257l6"
- #"\270\240\2\202B\17\304\201\224G\360\362"
- #"y\351\331g\245\267\336\32\177\"\177\354"
- #"1i\317\236\257\357%L\267\226&\353\335Lw?H\6\27\316M\4\210\3o"
- #"\22\202\225\317K\35\35\322{\357\215~"
- #"\276\246Fz\346\31\351\365\327\v\217\277\316Lki`@\332\261C:zt\364"
- #">\31\326\202\344\306\271\211!,$\332D\341QSS\30r:sFz\343\215"
- #"\351\205\207\305\262eRO\217\264m\333"
- #"\310>\312\207\265:;\203\331/\340\27z \16\244<\2021QxT2\214T"
- #"I-M4\254USS\b1z\"\311\344\302\271\211\36\b\22i\242\360x\362"
- #"I\251\273;\234\23\366\262e\205\236\307"
- #"\2313\322\203\17\216\264\361\351\247\271v"
- #"\4\321E\17\304\201\224\207\277&\v\217w\336\251l\270\312\257Z\352"
- #"\357/\fa\25_\252\246Fz\351\245\302\274\b\222\303\205s\23=\20"
-) 500
-(
- #"$JP\341\341\247\345\313\v\201Q>/\362\322K\364D\20=\21\371\225\1\202"
- #"\347Bx\24\355\3325~8k\367\356p\333\4\214\305\20\226\3\335D\370c\333"
- #"6\351\3157G\276\367;<\202\250\245"
- #"\362\341,&\325\223\305\205sS\304\376"
- #"\356\2\202\321\337_\270H\260h\303\206"
- #"h\366<\306Z\276\\\332\270\261\3608\237/\\7\302\25\353\210\212\300~}r"
- #"\271\234\326\256][z\274t\351R\235<y2\250\335\1\223*\236x\313'\245"
- #"_~9\372\341Q\264kWq\265\337\302E\207\317>\en{\200\242\300~\205"
- #"Z[[\265o\337>]\271rE\2336m\322SO=\245\266\2666B\4U"
- #"U\234\3678vl\344\271g\236qk\30h\371\362B\233\213\336z\213\tuD"
- #"C`s \305\361\273\237\375\354gJ"
- #"\245Rz\345\225W\224\313\345\324\332\332"
- #"\252\253W\257\6\261K\23\27\306\31a"
- #"\367\342\213\322\336\275#\337o\330P\270"
- #"\372;\210\336G\220\265\224\317K--#A\370\304\23\205\353F\20_.\234\233"
- #"\2\17\220\272\272:\235?\177^\363\346"
- #"\315\213l\200\24q?\220\370\271\373n"
- #"\351\372\365\302\343 &\241\307\336\277\241(\210ZbB=\376\\\273\37H`C"
- #"X\r\r\r:p\340\200f\315\232U"
- #"\n\217\37\375\350G\372\350\243\217\202\332"
- #"\245\231\347y\362<\217\360\210\241bx"
- #"H\205\311h\277O\270w\356\334)\325"
- #"\217\24l-\215\235P\347c\275\3613"
- #"\266\236\242.\260\0\351\351\351\321\241C"
- #"\207J\201\361\302\v/\250\253\253K\353"
- #"\326\255\vj\227\300(\375\375#\217kj\n\223\321\256+\237P?|\230\271\20"
- #"\204\213\353@\34\30g\204\315\23OH\37~8\3628\3509\203j\325R\265\217"
- #"\v\341p\341\334\344k\200466\252\241\241A\347"
- #"\317\237W&\223\321\371\363\347\307\375Lss\263\206\206"
-) 500
-(
- #"\206\374\332e\305\\x\2230sa\314\27T\253\226\230\vI\6\27\316M\276\16"
- #"a}\363\233\337\324\373\357\277/I\32"
- #"\32\32*\215\345\225\177E)<\20_\235\235#\327}\0041\367\21\246\261s!"
- #"\3347\4aa\b\313\201\224\307\314\325\326J\267o\27\36\367\367W'@\252Y"
- #"K\375\375\322\375\367\27\36\327\326J\377"
- #"\373_Uv\213*r\341\334\24\330$"
- #"\372\252U\253\324\325\3255\352\271\256\256"
- #".\255Z\265*\250]\2%\305\360\220"
- #"\342\325\373(Z\276|\344\361\255[\341"
- #"\265\3\311vWP/\374\336{\357\251"
- #"\265\265U\177\373\333\337\364\213_\374B"
- #"\317?\377\274zzz\324\323\323\23\324"
- #".\1I\243?}\225N\207\327\216\240\315\236=\22\224\3\3\361\fJD[`"
- #"=\220e\313\226\351\324\251S\352\353\353"
- #"\323\275\367\336\253\177\375\353_:}\372"
- #"\264\226Q\345\bX\371\234@\234?5"
- #"\336\3222\362\230y\20\204!\320\345\344"
- #"n\334\270\241\377\374\347?\252\257\257\327"
- #"\265k\327t\275\374\252\256\200]\272t"
- #"I\331lV\365\365\365\312f\263\272|"
- #"\371r\325\366\375u\322q\376\263x\214"
- #"0\216\265\374Z\325M\233\252\276\373\252"
- #")\277Ca\265\257\317\245\206!\5\30"
- #" \237|\362\211\326\254Y\243-[\266"
- #"\350\263\317>\323\226-[\264f\315\32}\362\311'A\355r\224\25+VH\222"
- #"\216\37?.I\272\2778\343\30\1\23-}\21Wa\34k\371\374G\361\323J"
- #"q\24\346<\b5\f)\300Oa\255Z\265J/\274\360\202\332\332\332J\317u"
- #"uui\357\336\275\352\353\353\vb\227%W\256\\Q&\223\321\215\e7J\317"
- #"\225\257\311U.\214O:\270\360\351\n"
- #"\277\204\363\357;\362\270\232\273\346X\343"
- #")\254cu\341\3378\226\37\343}\356\271\3474g\316\34"
- #"\355\331\263\247\364\334\216\35;t\373\366m\275\366\332k\243"
-) 500
-(
- #"~\266\2227)\235N\233\326<\nc\237am\e\316\277\357\310c\313\2569\326"
- #"\351\354\227\32\16r\237\225\356\267Z\2"
- #"\v\220\5\v\26\350\337\377\376\367\270\347"
- #"\253q%\372D\275\215\211z%Reo\222u\3330\366\31\326\266\341\354s\344"
- #"\261e\327\34kp\333\271\270\255k\355"
- #"\255\246\300\346@\376\373\337\377*\227\313"
- #"\225\256@?q\342\204\346\317\237\257\337"
- #"\375\356wA\355\22\0PE\201\337\17\244\\\265\356\a2\321p\325D\303Z\305"
- #"v\"n\312\353.\356\357o\222\2165yn\337\276\35\351O\201\3052@\2525"
- #"\211\236\244.\261K\307\232\244a\235$"
- #"\35kX\333\272\326\336j\n\364\206R"
- #"\345\367?\257\346\r\245\356\271\347\36\325"
- #"\326\326*\233\315\352\364\351\323\312f\263"
- #"\252\255\255\35\27\36\0\0\273@o("
- #"\365\330c\217)\225J)\225J\251\245"
- #"\245\245\2527\224:s\346\214$i\303"
- #"\206\r\222\244O?\375\324\367}\314\236"
- #"=\333\367\327\fr\237am\353\322>\303\332/\307\32\355m]\332g5\305\362"
- #"c\2743\301u \301\n\373\332\210+W\244ju<\303>V\256\3\t\6\327"
- #"\201L.\320\245L\2000\224\377\321w"
- #"\370px\355\bZ\371\242\221\265\265\341"
- #"\265\3\311E\200\204 \356\335\332ra"
- #"\34k\371\"\203q\276\335k\371\2\212"
- #"\345\307\\\r\3240$\206\260\234\350&bf\312o\266\224N\217^\e+H\325"
- #"\256\2450n\232\205\352q\341\334D\2008\360&a\346\302\230\e\250v-\2055"
- #"\377\201\352p\341\334\304\20\26b\251|\324a` \274v\4\205\371\17D\1\1"
- #"\202X*\237\23\330\275;\274v\4\245"
- #"\374\230\252=\377\1\24\371\32 \253W\257f\255+D\302\316\235#C<\207\17"
- #"\307\253\27\322\337?\362\351\262\232\232\3217\226\2\252\311"
- #"\327\0\371\375\357\177\257\3\a\16h\343\306\215\272v\355"
-) 500
-(
- #"\232\237/\r\314\310\362\345#7\223\312"
- #"\347\343\325\v\331\275{d\316c\343F"
- #"&\317\21\36_\3\344;\337\371\216\376"
- #"\371\317\177\352\333\337\376\266\326\254YS"
- #"\272\32\34\b\303\256]#\217\343\322\v"
- #"\31\333\373(?F\240\332|\237\3\231={\266^\177\375u=\376\370\343Z\275"
- #"zui)\223\342W&\223\361{\227\300\204\312o\371\32\227^\b\275\17DI"
- #" \37\343\355\355\355U{{\273zzz\264r\345J\277_\336W\345\313\271\317"
- #"\2325\313|\3670D\323\335wK\327\257\27\36\327\324Hg\316\370{\322M\247"
- #"\323\23\3363;\210Z\352\357\227V\254"
- #"(\4H\20\307\202\360\215\255\247\304}"
- #"\214\327\245\360(*\336\364\212\360\210\237"
- #"g\236\31y\234\317K;v\24\376\353"
- #"\227;w\356\224\352G\n\256\226\212m"
- #"\247\367\21oc\353)\352|\r\20\27"
- #"\303\3\361\266g\217\324\336>\362\375\321"
- #"\243\322\263\317\206\326\34\263\355\333\245c"
- #"\307\n\217\231\373@T\370:\204\265v"
- #"\355Z\355\333\267\257jK\266\373\301\205"
- #"\253=Q\231|\276p\255D\371\t8\210\341\237\240j\251|\350J\222\266m\223"
- #"\336x\303\367\335 b\\87\261\224\211\3o\22*7\366$\274a\203\324\323"
- #"S\b\23\277\4UKO<!}\370a\341q\20\355F4\271pn\242\f\221"
- #"\b\313\227\217\236\179zT\332\262\305"
- #"\337\371\220 \214\375\330\356\313/\23\36"
- #"\210\16J\21\211\361\313_\216\236\17y"
- #"\367\335h\207\310\300\200\364\223\2370q"
- #"\216\350\"@\220\03055\322o\177\353F\210\354\336]\30r\373\307?\n\3373"
- #"q\216(b\16\304\201qF\370k\354"
- #"\244\272$=\371\244\364\316;\225\r\17\371UKc\347kjj\244\227^b\315"
- #"\253\244q\341\334D\17\4\211S\234K(\277\237FT"
- #"z\"c\207\255\36|\260\360\2111\302\3QD\200 \221"
-) 500
-(
- #"\226//\374U_\336\343x\367]\351\a?\bg\315\254\201\1i\323\246\361\303"
- #"Vo\277\315\274\a\242\213\0Ab\355"
- #"\332U\370\353~\303\206\221\347>\376\270"
- #"p\22ok\253N\220\344\363R6["
- #"\330\347\a\37\214\364\200\212\303V\204\a"
- #"\242\2149\20\a\306\31\21\254|^\352"
- #"\350\220\336{o\364\36355\205\217\376"
- #"\276\376\372\364\346FfZK\3\3\205"
- #"\345I\216\36\35\275\317\307\37/\fY"
- #"\21\36\311\346\302\271\211\36\b\22\257\370"
- #"\351\254m\333F\aE>/\375\352W\376\17k\225\17W\225\207\307c\217\25z"
- #"D]]\204\a\334@\17\304\201\224G\365\f\f\24>B{\370\360\304\23\352s"
- #"\347J\217>:q\17a\262Z\32\30\220:;\v\237\372\272ys\374k\316\264"
- #"\247\203dp\341\334D\2008\360&\241"
- #"\372\276.H\374\300p\25\246\342\302\271"
- #"\211\0\341~ \230B\261\367\320\335-"
- #"\371U\32\351taX\214\340\300X\256"
- #"\335\17\204\0q \345\21\r\225\204\t"
- #"\241\201\231r\341\334D\2008\360&\301\r\324\22\374\344B=1e\a\0000!"
- #"@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0"
- #"\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230"
- #"\20 \0\0\23\2D\205U/S\251\224\322\351t\330M\201c\322\351t\251~"
- #"$j\t\225\31[OQ\307r\356\16,\231\f7PK\360\223\v\365D\17\4"
- #"\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300"
- #"\204\0\1\0\230\20 \0\0\23\2\4\0`\22\333\0\311\345rjjjRS"
- #"S\223N\236<\31vs\0 v\356\n\273\1AhllT>\237\327\307\37"
- #"\177,\317\363\324\326\326\246\256\256.\255[\267.\354"
- #"\246\1@l\3042@\346\317\237\257\263g\317\226\276"
-) 500
-(
- #"\377\303\37\376\240\226\226\26]\275z5\304V\1@\274$b1\305\306\306FI"
- #"\322\227_~9\356\377\271\260`\31\334@-\301O.\324S\"\2d\2527\302"
- #"\2057\tn\240\226\340'\27\352\311\251I\364L&SZ+\177\354W&\223\231"
- #"p\233\\.\247\206\206\206)_w\242\327\343~\16\230L\371=\e\312\277$j"
- #"\t37U=E\235Ss CCC3\372\371\336\336^\265\267\267\353\370\361"
- #"\343S\376\\\324S\36\321r\347\316\235\t\237w\341/FD\317T\365\24uN"
- #"\365@f\242\30\36===Z\271re\330\315\1\200\330\211e\200\20\36\0\20"
- #"\274XN\242\337w\337}\272p\341\302"
- #"\250\347\232\233\233'\34\2c\330\1~"
- #"\241\226\340'\27\352)\226\0012\23.\274Ip\3\265\4?\271PO\261\34\302"
- #"\2\0\4\217\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0"
- #"\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \22\367m"
- #"\200Y\371\275\34$j\t\225\31[OQ\307ZX\16\2547\0037PK\360\223"
- #"\v\365D\17\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0"
- #"&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b"
- #"\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\21\367p\200\35\367"
- #"\3\201\237\270\37\210c\\Xs\37n"
- #"\240\226\340'\27\352\211\36\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`"
- #"B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0"
- #"\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\"\356"
- #"\341\0;\356\a\2?q?\20\307\270\260\346>\334@-\301"
- #"O.\324\23=\20\0\200\t\1\2\0000!@\0\0&\4\b"
-) 500
-(
- #"\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200"
- #"I\354\3dppPs\346\314\t\273\31\0\20;\261\16\220\341\341am\336\274"
- #"Y\267n\335\n\273)\0\20;\261\16\220\375\373\367\253\276\276>\354f\0@,"
- #"\305v1\305s\347\316i\375\372\365:u\352\224\26/^<\351\242d.,X"
- #"\0067PK\360\223\v\365\24\313\36\310"
- #"\360\360\260:::\324\331\331\251E\213"
- #"\26\205\335\34\0\210%\247\2$\223\311"
- #"\224\326\312\37\373\225\311dJ?W\34"
- #"\272\332\272u\353\264^w\242\327\343~\16\230L\371=\e\312\277$j\t37"
- #"U=E],\207\260\26.\\\250\213\27/\216{\276\271\271YCCC\243\236"
- #"s\241\233\b7PK\360\223\v\365\24\313\0\31k\2527\302\2057\tn\240\226"
- #"\340'\27\352\311\251!,\0@t$\"@\226,Y\22v\23\0 v\0221"
- #"\2045\25\27\272\211p\3\265\4?\271PO\211\350\201\0\0\374G\200\0\0L"
- #"\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 "
- #"\0\0\23\2\4\0`B\200\0\0L\b\20\211\3736\300\254\374^\16\22\265\204"
- #"\312\214\255\247\250c-,\a\326\233\201"
- #"\e\250%\370\311\205z\242\a\2\0000!@\0\0&\4\b\0\300\204\0\1\0"
- #"\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\22\202$]"
- #"\245\234\244cM\222$\275\257I:\326"
- #"\231\342J\364\20\256\366t\341\nS\277"
- #"p\254\361\304\261\306w\2773A\17\4\0`B\200T \214\256m%\373\fk"
- #"\3330\366\311\261\6\277m\30\373L\322"
- #"\261\272\200!\254\n\272\211\326m\303\330"
- #"gX\333\272\326\336J\266u\255\275\225l\353Z{+\331\326\265\366"
- #"V\23=\20\0\200\t=\20G\326\335\a\220<\327\257_W]]"
-) 500
-(
- #"]\330\315\230\324]a7 l\t\317O\0000c\b\v\0`B\200\0\0L"
- #"\b\20\0\200\t\1\2\0000!@\0\0&\4H\204\f\16\16j\316\2349a"
- #"7#P\271\\NMMMjjj\322\311\223'\303n\216/.]\272\244l"
- #"6\253\372\372ze\263Y]\276|9\354&\5\252\370\36\246R\251X\275\217S"
- #"I\302\357\246\5\1\22\21\303\303\303\332"
- #"\274y\263n\335\272\25vS\2\323\330"
- #"\330\250\226\226\26uww\353\310\221#"
- #"jkk\213\305\311g\305\212\25\222\244"
- #"\343\307\217K\222\356\277\377\3760\233\23"
- #"\270\326\326Vuww\313\363<\359rD---a7)PI\370\335\264"
- #"J\374\205\204Q\361\352\253\257\252\267\267"
- #"W\177\376\363\237c{m\312\322\245K"
- #"u\366\354\331\322\367\271\\N\255\255\255"
- #"\272z\365j\210\255\252\314\225+W\224\311dt\343\306\215\322suuu:\177"
- #"\376\274\346\315\233\27b\313\2023\366}"
- #"ta\311\215J$\341w\323\212\0\211"
- #"\200s\347\316i\375\372\365:u\352\224\26/^\234\230\"mll\224$}\371"
- #"\345\227!\267\304\356\271\347\236\323\2349"
- #"s\264g\317\236\322s;v\354\320\355"
- #"\333\267\365\332k\257\205\330\262\352\230("
- #"@\343$\251\277\233\323E\200\204lxxX\353\326\255S{{\273\236~\372\351"
- #"\330\3775W.\16\307:Qo#\356'\325r\23\5h\\$\371ws\272\230"
- #"\3\tH&\223Q*\225\232\360+\223"
- #"\311\224~n\377\376\375\252\257\257\327\326"
- #"\255[Clme\246{\254\345r\271"
- #"\234\32\32\32\252\334R\370)\227\313\351"
- #"\320\241C\372\351O\177\32vS\2\21"
- #"\207\337\315\240\321\3\t\331\302\205\vu\361\342\305q\317777khh(\204"
- #"\26\5\257\267\267W\355\355\355\352\351\351\321\312\225+\303"
- #"nNE&\32\256\212\363_\345Eqz\17'\223\304"
-) 500
-(
- #"\337\315\231\"@\"&\356\335\344\270\235"
- #"x\2228\211\36\267\367p\272\342\376\273"
- #"i\301\20\26\252&\216'\236{\356\271"
- #"G\265\265\265\312f\263:}\372\264\262\331\254jkk\t\17$\2\1\0221K"
- #"\226,\t\273\t\201y\352\251\247t\371"
- #"\362e\255Z\265\352k\347H\\r\346\314\31I\322\206\r\e$I\237~\372i"
- #"\230\315\t\324D\357a\\\336\307\257\23"
- #"\347\337M+\206\260\0\0&\364@\0\0&\4\b\0\300\204\0\1\0\230\20 "
- #"H\274\207\36zh\334\347\372\a\a\a"
- #"\265n\335\272\300\366\331\330\330\250\346\346"
- #"\346\300^\37\250\6\2\4\211\267y\363"
- #"f\375\370\307?\326\360\360\260\244\221\325"
- #"W7o\336\34\330>\277\365\255o\351\375\367\337\17\354\365\201j\340SXH<"
- #"\317\363\364\375\357\177_\17?\374\260\236"
- #"\177\376\371\322\352\253\177\372\323\237\224J"
- #"\245\302n\36\20Y\364@\220x\251TJ\277\376\365\257\265w\357^}\364\321G"
- #"\332\267o\237\336~\373\355i\205G\371"
- #"\315\225R\251\224\276\361\215o\224\376\337"
- #"\3\17<\240\276\276\276\322\367}}}z\340\201\a$i\324u\23c_#)"
- #"7iB\fx\0<\317\363\2747\337|\323\253\253\253\363\336z\353\255io\323"
- #"\320\320\340\345r\271\322\367\345\277R\307"
- #"\216\35\363\26,X\340}\376\371\347\336"
- #"\347\237\177\356\335{\357\275\336\261c\307"
- #"\306\375\334\242E\213\274\3\a\16\224\276"
- #"?q\342\204\367\340\203\17Vr(@U\334\25v\200\1Qq\363\346M\315\236"
- #"=[7o\336\234\3666\327\256]\233t\262\375\221G\36Q6\233UKK\213"
- #"<\317\323\366\355\333\365\310#\217\214\373"
- #"\271\203\a\17j\343\306\215\32\34\34\324"
- #"\213/\276\250\357~\367\273\372\373\337\377n>\16\240Z\230\3\0014r\343"
- #"\240#G\216\350\207?\374\241\376\372\327"
- #"\277Nk\351\212\261\v\354\215\375>\237"
-) 372
-(
- #"\317\253\271\271Y\251TJCCC\252"
- #"\251\251\231\360\347.]\272\244\275{\367"
- #"\3527\277\371\215\346\316\235\253\356\356\356"
- #"@?\5\6\370\2019\20$\336\360\360\260:::\324\331\331\251\265k\327j\367"
- #"\356\335\352\350\350(}*k*\r\r\rS\316W\354\334\271S\213\26-\322\302"
- #"\205\v\265k\327\256\t\177f\355\332\265"
- #"\272p\341\202\336x\343\r\335\272uK;w\356\f\364\23`\200o\302\34?\3"
- #"\242\340\225W^\361\276\367\275\357y\371"
- #"|\336\363<\317\313\347\363\336\303\17?"
- #"\354\275\372\352\253_\273\355\211\23'\274"
- #"\371\363\347{\271\\\316;q\342\304\250"
- #"\271\215\203\a\17z\231L\306\373\342\213"
- #"/\274/\276\370\302\313d2\336\301\203"
- #"\a=\317\e=\a\322\327\327\347-X"
- #"\260\300\353\355\355\365\376\362\227\277x\v"
- #"\26,\360\372\372\372|>J\300\177\4"
- #"\b\22o\355\332\265\336\340\340\340\250\347"
- #">\373\3543\357\241\207\36\232\326\366'"
- #"N\234\360\352\353\353\275\372\372zo\361"
- #"\342\305\245\347W\257^\355\235>}\272"
- #"\364\375\351\323\247\275\325\253W{\236\347"
- #"yK\226,\231\3645\312'\345\201(c\16\4\0`\302\34\b\0\300\204\0\1"
- #"\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000"
- #"!@\0\0&\4\b\0\300\344\377\335\263$\224"
- #"\343<\2153\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"line"
-0 0 24 3 2 #" ("
-0 0 15 3 2 #"\316\273"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"t"
-0 0 24 3 2 #") "
-0 0 21 3 1 #"1"
-0 0 24 3 2 #") "
-0 0 23 3 7 #"#:width"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"3"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:color"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"blue"
-0 0 24 29 1 #"\n"
-0 0 24 3 15 #"               "
-0 0 23 3 9 #"#:mapping"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 5 #"polar"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:t-min"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"*"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-1/2"
-0 0 24 3 1 #" "
-0 0 14 3 2 #"pi"
-0 0 24 3 2 #") "
-0 0 23 3 7 #"#:t-max"
-0 0 24 3 1 #" "
-0 0 14 3 2 #"pi"
-0 0 24 3 3 #")))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 81
-(
- #"\"The new library fixes an error (#:mapping 'polar uses #:t-min and "
- #"#:t-max args)\""
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 4 #"when"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"eq?"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"plot"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 5 #"    ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 35 #"\"Also, 'plot' finds tighter bounds\""
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 27 #";; Parametric function test"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2          37 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          13 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0\31%IDATx\234\355\335ohU\367\35"
- #"\307\361\317\355\364jh Y2\323\3310\377\344\322\r\224`Q\2544f%\245"
- #"\340\37\272d\331\272\272=X `\347"
- #"\36\335\262\322\302\332A\367`B\231\332"
- #"\326\302\330`\e\24V\37\224\345\311nbk\327-a57u\e\32h'\372"
- #" &b\361\17hFuh\207\306\305\263\aroo\342M\232|\3579\367\234"
- #"\3379\357\227\4\314\365\236{~\307\363"
- #"\315\371\344\367\373\335\373;)\317\363<"
- #"\1\0\260H\367\205\335\0\0\200\233\b\20\0\200\t\1\2\0000!@\0\0&"
- #"\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20"
- #"\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0"
- #"\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4"
- #"\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0"
- #"\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23"
- #"\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b"
- #"\0\300\204\0\1\0\230\20 \0\0\223%a7 l\251T*\354&\0@Y"
- #"\327\257_Wmmm\330\315\230S\312\363</\354F\204)\225J\311\372_`"
- #"\3356\214}\206\265\255k\355\255d["
- #"\327\332[\311\266\256\265\267\222m]ko51\204\5\0000!@*\260l\331"
- #"2\247\366\31\326\266a\354\223c\r~\3330\366\231\244cu\1CX!t\23"
- #"]\350\232\372\205c\215'\2165\276\373]\fz \0\0\23\2"
- #"$\4q\357\326\226J\322\261&I\222\316k\222\216u\261\30\302"
-) 500
-(
- #"r\240\233\b7PK\360\223\v\365D\17\4\0`B\200\0\0L\b\20\0\200"
- #"\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2"
- #"Dw?\260\223J\245\224N\247\303n\n\34\223N\247\213\365#QK\250\314\354"
- #"z\212:>\211\356\300\247=\341\6j\t~r\241\236\350\201\0\0L\b\20\0"
- #"\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23"
- #"\2\4\0`B\200\0\0Lb\37 \343\343\343\252\251\251\t\273\31\0\20;\261"
- #"\16\220\351\351i\365\364\364\350\346\315\233"
- #"a7\5\0b'\326\1r\360\340A\325\325\325\205\335\f\0\210\245\330.\246x"
- #"\372\364iutt\350\370\361\343Z\263"
- #"f\315\234\213\222\271\260`\31\334@-"
- #"\301O.\324S,{ \323\323\323\332"
- #"\275{\267\366\356\335\253\325\253W\207\335"
- #"\34\0\210\245X\6Ha\350j\317\236=\vz~a\375\375\322/\356\347\200\271"
- #"\224\336\263\241\364K\242\226\260x\363\325"
- #"S\324\305r\bk\325\252U:\177\376\374=\217\267\264\264hbbb\306c."
- #"t\23\341\6j\t~r\241\236b\31 \263\315w\"\\8Ip\3\265\4?"
- #"\271PO\261\34\302\2\0\4/\21\1"
- #"\262n\335\272\260\233\0\0\261\223\210!"
- #"\254\371\270\320M\204\e\250%\370\311\205zJD\17\4\0\340?\2\4\0`B"
- #"\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1"
- #"\0\230\20 \0\0\23\2\4\0`B\200H\334\267\1f\245\367r\220\250%T"
- #"fv=E\35ka9\260\336\f\334@-\301O.\324\23=\20\0\200\t\1"
- #"\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0"
- #"`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230"
-) 500
-(
- #"\20 \0\0\23\2D\334\303\1v\334\17\4~\342~ \216qa\315}\270\201"
- #"Z\202\237\\\250'z \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t"
- #"\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4"
- #"\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\210\270\207"
- #"\3\354\270\37\b\374\304\375@\34\343\302"
- #"\232\373p\3\265\4?\271PO\364@\0\0&\4\b\0\300\204\0\1\0\230\20"
- #" \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0"
- #"\0&\261\r\220|>\257\306\306F\245R)566jdd$\354&\1@"
- #"\254\3046@\272\272\272\324\337\337/\317"
- #"\363\224\313\345\324\331\331\31v\223\0 "
- #"Vb\273\26\326\372\365\353u\352\324\251"
- #"\342\367s\255+\343\302z3p\3\265"
- #"\4?\271PO\261\355\201\224\206\307\345"
- #"\313\227u\377\375\367\207\330\32\0\210\237"
- #"\330\6H\251_\376\362\227z\366\331g"
- #"\303n\6\0\304\312\222\260\e\20\264|"
- #">\257\267\337~[\377\372\327\277\346|"
- #"N\271\265\367\227.]\252\251\251\251 "
- #"\233\6G\245\323i\335\276}\273\354\277"
- #"QKX\254\371\352)\352b\35 \203"
- #"\203\203\352\355\355\325\221#G\324\324\324"
- #"4\347\363\242>\316\210h\231+\f\\\30\263F\364\314WOQ\27\333!\254B"
- #"x\f\f\fh\343\306\215a7\a\0b'\226\1Bx\0@\360b\3716\336"
- #"\265k\327\352\334\271s\367<\336\322\322"
- #"\242\211\211\211\31\2171\354\0\277PK"
- #"\360\223\v\365\24\313\0Y\f\27N\22\334@-\301O.\324S,\207\260\0\0"
- #"\301#@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B"
- #"\200\0\0L\b\20\0\200\t\1\2\0000!@\0"
- #"\0&\4\210\356.\31\220J\245\224N\247\303n\n\34"
-) 500
-(
- #"\223N\247\213\365#QK\250\314\354z"
- #"\212:\326\302r`\275\31\270\201Z\202\237\\\250'z \0\0\23\2\4\0`"
- #"B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0"
- #"\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0"
- #"0!@\0\0&\4\210\270\207\3\26fR\223\352P\207Rs\374\221\2479\377"
- #"\355q=\256IM\206}\b\2108\356\a\342\30\27\326\334Gx&5\251\247\365"
- #"\264\216\352\250o\257\331\241\16\365\251O"
- #"+\264\302\267\327D\374\270pm\242\a\2\224Q\350m4\251iFx\264\251M"
- #"WtE^\231?w;!\367\376\271\242+zT\217\26_\343\3}\240&5"
- #")\245\224\276\243\357\204qx\200/\b"
- #"\20\240D\267\272\225RjFp\224\206\306\207\372p\321=\207\25Z\241c:V"
- #"6Lr\3121\274\5g\21 \200>\357q\364\253\277\370X!8,\2411\227"
- #"\3220\331\256\355\222>\357\221\20$p\rs \16\2143\"X\223\232\324\23z"
- #"B'uR\222\264C;\364\236\336[\364\353XjiR\223\372\266\276\255\277\353"
- #"\357\222\244V\265jHC\314\217\300\211"
- #"k\23\1\342\300IBp.\351\222\36"
- #"\327\343\32\323\2306k\263\376\242\277\250"
- #"^\365\246\327\252\244\226\256\351\232\266i"
- #"\233\216\353\270\276\256\257\353o\372\233\36"
- #"\324\203\246\327B<\270pmb\b\v\211T\30\262jV\263\3064\246V\265\352"
- #"]\275k\16\217J\325\253^\357\352]\265\252Uc\32S\263\232\231`G\344\321"
- #"\3q \345\341\277\307\364\230\362\312K\272;\327\221S\256\342a#?ji\366"
- #"\220\326\25]a8+\241\\\2706\21 \16\234$\370kR\223jR\223$\177"
- #"/\320~\326\322Vm\3251\35\223t\367\235"
- #"a\177\322\237|y]\270\303\205k\23CXH"
-) 500
-(
- #"\224nu\27\303c\253\266F\366\267\373"
- #"\234r\305\267\373\346\224\343\335Y\210$"
- #"z \16\244<\374Q\332\363\360k\330"
- #"\252T\20\265T\350\211\360\356\254\344q"
- #"\341\332D\17\4\211\361\224\236\222t\367"
- #"\242\354\347g;\202\224SN\255j\325"
- #"I\235\324\23z\202\236\b\"%\260\0\311\347\363jkk+\376}\375\372\365\32"
- #"\31\31\tjw\300\274\272\325]\2344wi>a\205VhHC\305\20\371\236"
- #"\276\27v\223\200\242\300\206\260\276\374\345"
- #"/\353\360\341\303z\350\241\207\264a\303"
- #"\6\275\370\342\213\332\277\177\277\372\372\372"
- #"\324\336\336\36\304.M\\\350&\2422"
- #"\245CW\326\17\t.D\220\265\24\324\304?\242\313\205kS`\1R8\370\27"
- #"^xA\251TJ\a\16\34P>\237WWW\227\256^\275\32\304.M\\8"
- #"I\250L\341-\273[\265U#\n\256\27\34t-\25\346C\36\323c\276\256\16"
- #"\214hr\341\332\24x\200\324\326\326\352"
- #"\354\331\263jjj\212l\200\24,]\272TSSS!\266\6~\v\3727\367"
- #"t:\255\333\267o\337\363x\20\265D/$\376f\327S\324\3$\2609\220\372"
- #"\372z\275\361\306\eZ\272ti1<"
- #"\276\377\375\357\353\360\341\303A\355\322\314"
- #"\363<y\236Gx\304P\351\304y\20"
- #"\27\334\251\251\251b\375H\301\326\322\n"
- #"\255P\233\356\316+2\27\22O\263\353"
- #")\352\2\353\201\344\363y\275\360\302\v"
- #"z\355\265\327\324\336\336\256\266\2666\355"
- #"\337\277?R\363\37\222\e\335D\330T"
- #"\3737\366j\324\22\275\220\344p\341\332"
- #"\304\347@\348I\260\251\326\334GA"
- #"\265j\211\271\220dp\341\332\344k\200444\250\276\276^g\317\236U&\223"
- #"\321\331\263g\357yNKK\213&&&\374\332e\305\\8I\260I\351\356"
- #"\374V\265~S\257V-\225\366B<Q\273q\345\302\265i\211\237/\366\225"
-) 500
-(
- #"\257|Eo\276\371\246$E*$\220<\245\37\270\213\3330O\351\361Lj2"
- #"v\307\aw\370:\211>66\26\2719\16$S\351\344y\0341\231\216(\b"
- #"\354]X\2336mR__\337\214\307"
- #"\372\372\372\264i\323\246\240v\t\24\271"
- #"\370\251\363\305\310)'I\32\326p\310-A\222\0056\211~\362\344Iuuu"
- #"\251\253\253K\257\275\366\232\236\177\376y"
- #"\r\f\fh``@\255\255\255A\354\322\304\205qF,^a\376\243\232s\4"
- #"\325\256\2450\216\21\325\343\302\265)\320"
- #"wa\375\373\337\377Vww\267\306\306\306\364\215o|C\271\\N\215\215\215A"
- #"\355\316\304\205\223\204\305\tk\2229\254"
- #"\0\341\355\274\361\344\302\265)\320\325x"
- #"o\334\270\241\377\374\347?\252\253\253\323"
- #"\265k\327t\375\372\365 w7\303\205\v\27\224\315fUWW\247l6\253\213"
- #"\27/Vm\337_$\235N\207\335\204\252\t\343X\343>\377Q\20\346<\b5"
- #"\f)\300\09z\364\250\266l\331\242g\236yFg\316\234\3213\317<\243-"
- #"[\266\350\350\321\352\274o\375\341\207\37"
- #"\226$\r\r\rI\2226l\330P\225\375.D\271\245/\342*\214c\215\373\374"
- #"GA\230\363 \3240\244\0\207\2606"
- #"m\332\244\237\376\364\247\332\265kW\361"
- #"\261\276\276>\355\333\267O\243\243\243A"
- #"\354\262\350\362\345\313\312d2\272q\343"
- #"F\361\261\3225\271J\205\321Mt\241k\352\227P\376\177C\232\e\340X\343)"
- #"\254cu\341\3778\226\237D\177\356\271\347TSS\243W^y\245\370\330K/"
- #"\275\244[\267n\351\365\327_\237\361\334"
- #"JNR:\2356\255y\24\306>\303\3326\224\377\337\n/\252\34\353\2\366K"
- #"\r\a\272\317J\367[-\201\5Hss\263.]\272t\317\343\325\370"
- #"$z\271\336F\271^\211T\331I\262n\e\306>\303\3326\224}V"
-) 500
-(
- #"xQ\345X\203\333\316\305m]ko5\0056\a\362\337\377\376W\371|\276\270"
- #"\262\344\360\360\260V\256\\\251?\374\341"
- #"\17A\355\22\0PE\201\337\17\244T"
- #"\265\356\aRn\270\252\334\260V\241\235"
- #"\210\231B\331%\341\324&\351X\23\350"
- #"\326\255[\221~\27X,\3\244Z\223"
- #"\350I\352\22\273t\254;\264C\357\377\371}y;\342\177\254\fa\5\277\255k"
- #"\355\255\246@o(52\362\371\22\332"
- #"\325\274\241\324\3\17<\240\345\313\227+"
- #"\233\315\352\304\211\23\312f\263Z\276|"
- #"\371=\341\201x\372\263\376,\355\f\273"
- #"\25@\374\5\26 \3\3\3\372\326\267"
- #"\276\245T*\245T*\245\316\316N\365"
- #"\365\365Um\261\305\217>\372H\222\364"
- #"\344\223OJ\222>\376\370c\337\367\261"
- #"l\3312\337_3\310}\206\265m\30\373L\322\261\272\266_\316k|\304\362m"
- #"\274\213\301\347@\202\305\261\6\274O>\a\228>\a2\267@\2272\1\20\234"
- #"\322{\236\0a @B\20\367nm\251$\35k\265\205\271\346W\222\316k\222"
- #"\216u\261\30\302r\240\233\b7\260\32"
- #"/\374\344\302\265\211\0q\340$\301\r"
- #"\334\17\4~r\341\332\304\20\26\340 "
- #"\346?\20\5\4\b\340\240\244\334\363\4"
- #"\321\346k\200l\336\274\231\265\256\200*"
- #"H\312=O\20m\276\316\201\2349s"
- #"F\273v\355\322\332\265k\365\346\233o"
- #"\252\276\276\336\257\227\16\214\v\343\214p"
- #"C\265j)\254[\366\242\272\\\2706"
- #"\371\332\3y\350\241\207\364\217\177\374C"
- #"_\373\332\327\264e\313\226\342\247\301\1"
- #"\370\207\341+DE`\357\302\372\331\317"
- #"~\246\3\a\16\350\177\377\373\337\214\307"
- #"\253q?\220\305p!\345\341\206j\324"
- #"Ri\357\203\267\357\306\233\v\327\246@"
- #"&\321\a\a\a\365\326[o\351\237\377\374g\361~ \205\257"
- #"(\205GAa\275\256(/\233\214hJ\247\323\305\372\221\202\257"
-) 500
-(
- #"\245\322\336\a\341\21?\263\353)\352|"
- #"\357\201\f\16\16\252\267\267W\3\3\3\332\270q\243\237/\35\b\27R\36n\b"
- #"\272\226\350}$\213\v\327&_{ \256\205\a\340\212IM\352\t=!\211\336"
- #"\a\242\303\327\36H[[\233\366\357\337"
- #"_\265%\333\375\340B\312\303\rA\326\322czLy\345\325\252V\ri\210\0"
- #"I\0\27\256M,e\342\300I\202\e\202\252%\206\256\222\311\205k\23\237D\a"
- #"\"\214\241+D\331\222\260\e\0\240\274"
- #"K\272\244\307\365\270\3064\246\315\332\254"
- #"w\364N\330M\2f\240\a\2D\324\17\364\3\215iL\255j\325\273zW\365"
- #"\212\376\312\16H\26\346@\34\30g\204\e\374\252\245IM\352i=\255\243:*"
- #"\211y\217\244r\341\332\304\20\26\0201"
- #"O\351\251\342b\211;\264\203\360@d"
- #"\21 @D\24z\36\205\360\240\347\201"
- #"\250#@\200\b\350V\267\372\325_\374\236\236\a\\\300$:\20\242IM\252C"
- #"\35\305\360hS\233\256\350\212\336\323{"
- #"!\267\f\370b\364@\200\20\314\236("
- #"\227\356\366:\b\16\270\204\36\bPE"
- #"\205\36G\223\232\212\341A\257\3\256\242"
- #"\a\2\4\254\\oC\272\e\349\345"
- #"\230\353\200\263\b\20\251\270\366\376\322\245"
- #"K555\25rk\340\222t:\255\333\267oK9I\236\224\322\27\337\307\201"
- #"\340\300\\\212\365\344\b\206\260\244\342\315"
- #"\256\b\17,\326\324\324\224<\317\323\366"
- #"oo\237\367y\205a*O\236>\324\207\204\a\312*\324S\324?@X\300'"
- #"\321\35\370\264'\334@-\301O.\324\23=\20\0\200\t\1\2\0000!@\0"
- #"\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L"
- #"\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0"
- #"\230\20 \272\273\352e*\225R:\235\16\273)pL:\235.\326\217D"
-) 500
-(
- #"-\2412\263\353)\352X\316\335\201%\223\341\6j\t~r\241\236\350\201\0\0"
- #"L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20"
- #" \0\0\23\2\4\0`B\200\0\0Lb\e \371|^\215\215\215jll"
- #"\324\310\310H\330\315\1\200\330Y\22v"
- #"\3\202\320\320\320\240;w\356\350\235w"
- #"\336\221\347y\332\265k\227\372\372\372\324"
- #"\336\336\36v\323\0 6b\31 +"
- #"W\256\324\251S\247\212\337\377\361\217\177"
- #"Tgg\247\256^\275\32b\253\0 ^\22\261\230bCC\203$\351\323O?"
- #"\275\347\337\\X\260\fn\240\226\340'"
- #"\27\352)\21\0012\337\211p\341$\301\r\324\22\374\344B=95\211\236\311d"
- #"\212k\345\317\376\312d2e\267\311\347"
- #"\363\252\257\257\237\367u\313\275\36\367s"
- #"\300\\J\357\331P\372%QKX\274"
- #"\371\352)\352\234\232\3\231\230\230X\324"
- #"\363\a\a\a\325\333\333\253\241\241\241y"
- #"\237\27\365\224G\264LMM\225}\334\205\337\30\21=\363\325S\3249\325\3Y"
- #"\214Bx\f\f\fh\343\306\215a7\a\0b'\226\1Bx\0@\360b9"
- #"\211\276v\355Z\235;wn\306c---e\207\300\30v\200_\250%\370\311"
- #"\205z\212e\200,\206\v'\tn\240\226\340'\27\352)\226CX\0\200\340\21"
- #" \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0"
- #"\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2D\342\276\r0+\275\227"
- #"\203D-\2412\263\353)\352X\v\313\201\365f\340\6j\t~r\241\236\350\201"
- #"\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0"
- #"\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1"
- #"\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \342\36\16"
-) 500
-(
- #"\260\343~ \360\23\367\3q\214\vk\356\303\r\324\22\374\344B=\321\3\1\0"
- #"\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!"
- #"@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0"
- #"\0L\b\20\0\200\t\1\2\0000!@\304=\34`\307\375@\340'\356\a\342"
- #"\30\27\326\334\207\e\250%\370\311\205z\242\a\2\0000!@\0\0&\4\b\0"
- #"\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t"
- #"\1\2\0000\211}\200\214\217\217\253\246"
- #"\246&\354f\0@\354\304:@\246\247"
- #"\247\325\323\323\243\2337o\206\335\24\0"
- #"\210\235X\a\310\301\203\aUWW\27"
- #"v3\0 \226b\273\230\342\351\323\247"
- #"\325\321\321\241\343\307\217k\315\2325s"
- #".J\346\302\202ep\3\265\4?\271PO\261\354\201LOOk\367\356\335\332"
- #"\273w\257V\257^\35vs\0 \226\234\n\220L&S\\+\177\366W&\223"
- #")>\2570t\265g\317\236\5\275n\271\327\343~\16\230K\351=\eJ\277$"
- #"j\t\2137_=E],\207\260V\255Z\245\363\347\317\337\363xKK\213&"
- #"&&f<\346B7\21n\240\226\340'\27\352)\226\0012\333|'\302\205\223"
- #"\0047PK\360\223\v\365\344\324\20\26\0 :\22\21 \353\326\255\v\273\t\0"
- #"\20;\211\30\302\232\217\v\335D\270\201"
- #"Z\202\237\\\250\247D\364@\0\0\376#@\0\0&\4\b\0\300\204\0\1\0"
- #"\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!"
- #"@\0\0&\4\210\304}\e`Vz/\a\211ZBef\327S\324\261\26\226"
- #"\3\353\315\300\r\324\22\374\344B=\321\3\1\0\230\20 \0\0"
- #"\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@"
-) 500
-(
- #"\0\0&\4\b\0\300\204\0\tA\222>\245\234\244cM\222$\235\327$\35\353"
- #"b\361I\364\20>\355\351\302'L\375"
- #"\302\261\306\23\307\32\337\375.\6=\20"
- #"\0\200\t\1R\2010\272\266\225\3543"
- #"\254m\303\330'\307\32\374\266a\3543I\307\352\2\206\260*\350&Z\267\rc"
- #"\237am\353Z{+\331\326\265\366V\262\255k\355\255d[\327\332[M\364@"
- #"\0\0&\364@\34Yw\37@\362\\\277~]\265\265\265a7cNK\302n"
- #"@\330\22\236\237\0`\306\20\26\0\300\204\0\1\0\230\20 \0\0\23\2\4\0"
- #"`B\200\0\0L\b\220\b\31\37\37WMMM\330\315\bT>\237Wcc"
- #"\243\32\e\e522\22vs|q\341\302\5e\263Y\325\325\325)\233\315\352"
- #"\342\305\213a7)P\205s\230J\245bu\36\347\223\204\237M\v\2$\"\246"
- #"\247\247\325\323\323\243\2337o\206\335\224"
- #"\300444\250\263\263S\375\375\375\312\345r\332\265kW,.>\17?\374\260"
- #"$ihhH\222\264a\303\2060\233"
- #"\23\270\256\256.\365\367\367\313\363<\345"
- #"r9uvv\206\335\244@%\341g\323*\361\37$\214\212W_}U\203\203"
- #"\203z\377\375\367c\373\331\224\365\353\327"
- #"\353\324\251S\305\357\363\371\274\272\272\272"
- #"t\365\352\325\20[U\231\313\227/+"
- #"\223\311\350\306\215\e\305\307jkku"
- #"\366\354Y555\205\330\262\340\314>\217.,\271Q\211$\374lZ\21 \21"
- #"p\372\364iutt\350\370\361\343Z"
- #"\263fMb\212\264\241\241A\222\364\351"
- #"\247\237\206\334\22\273\347\236{N55"
- #"5z\345\225W\212\217\275\364\322K\272"
- #"u\353\226^\177\375\365\20[V\35\345"
- #"\0024N\222\372\263\271P\4H\310"
- #"\246\247\247\325\336\336\256\336\336^\375\370\307?\216\375o"
- #"s\245\342p\254\345z\eq\277\250\226*\27\240q\221"
-) 500
-(
- #"\344\237\315\205b\16$ \231LF\251"
- #"T\252\354W&\223)>\357\340\301\203\252\253\253\323\236={Blme\26z"
- #"\254\245\362\371\274\352\353\353\253\334R\370"
- #")\237\317\353\355\267\337\326O~\362\223"
- #"\260\233\22\2108\374l\6\215\36H\310"
- #"V\255Z\245\363\347\317\337\363xKK\213&&&BhQ\360\6\a\a\325\333"
- #"\333\253\201\201\1m\334\2701\354\346T"
- #"\244\334pU\234\177+/\210\3239\234"
- #"K\22\1776\27\213\0\211\230\270w\223"
- #"\343v\341I\342$z\334\316\341B\305\375g\323\202!,TM\34/<\17<"
- #"\360\200\226/_\256l6\253\23'N"
- #"(\233\315j\371\362\345\204\a\22\201\0"
- #"\211\230u\353\326\205\335\204\300\374\350G"
- #"?\322\305\213\27\265i\323\246/\234#q\311G\37}$Iz\362\311'%I"
- #"\37\177\374q\230\315\tT\271s\30\227"
- #"\363\370E\342\374\263i\305\20\26\0\300"
- #"\204\36\b\0\300\204\0\1\0\230\20 "
- #"\0\0\23\2\4\211\267u\353\326{\336"
- #"\327?>>\256\366\366\366\300\366\331\320"
- #"\320\240\226\226\226\300^\37\250\6\2\4"
- #"\211\327\323\323\243\37\376\360\207\232\236\236"
- #"\226\364\371\352\253===\201\355\363\253"
- #"_\375\252\336z\353\255\300^\37\250\6"
- #"\336\205\205\304\363<O;v\354\320\266"
- #"m\333\364\374\363\317\27W_}\357\275"
- #"\367\224J\245\302n\36\20Y\364@\220"
- #"x\251TJ\277\373\335\357\264o\337>"
- #"\35>|X\373\367\357\327o\177\373\333"
- #"\5\205G\351\315\225R\251\224\276\364\245"
- #"/\25\377\355\221G\36\321\350\350h\361"
- #"\373\321\321Q=\362\310#\2224\343s\23\263_#)7iB\fx\0<\317"
- #"\363\274_\377\372\327^mm\255\367\233"
- #"\337\374f\301\333\324\327\327{\371|\276"
- #"\370}\351\217\324\221#G\274\346\346f\357\223O>\361>\371"
- #"\344\23\357\301\a\37\364\216\349r\317\363V\257^\355\275\361\306"
-) 494
-(
- #"\e\305\357\207\207\207\275G\37}\264\222C\1\252bI\330\1\6D\305g\237}"
- #"\246e\313\226\351\263\317>[\3606\327"
- #"\256]\233s\262}\347\316\235\312f\263"
- #"\352\354\354\224\347yz\366\331g\265s"
- #"\347\316{\236w\350\320!}\367\273\337"
- #"\325\370\370\270^|\361E}\363\233\337"
- #"\324\261c\307\314\307\1T\vs \200>\277qP.\227Sww\267>\370\340"
- #"\203\5-]1{\201\275\331\337\337\271sG---J\245R\232\230\230\320}"
- #"\367\335W\366y\27.\\\320\276}\373"
- #"\364\373\337\377^\367\337\177\277\372\373\373"
- #"\3}\27\30\340\a\346@\220x\323\323"
- #"\323\332\275{\267\366\356\335\253\266\2666"
- #"\375\342\27\277\320\356\335\273\213\357\312\232"
- #"O}}\375\274\363\25/\277\374\262V"
- #"\257^\255U\253V\351\347?\377y\331"
- #"\347\264\265\265\351\334\271s\372\325\257~"
- #"\245\2337o\352\345\227_\16\364\35`"
- #"\200o\302\34?\3\242\340\300\201\3\336"
- #"\366\355\333\275;w\356x\236\347yw"
- #"\356\334\361\266m\333\346\275\372\352\253_"
- #"\270\355\360\360\260\267r\345J/\237\317"
- #"{\303\303\3033\3466\16\35:\344e2\31orr\322\233\234\234\3642\231\214"
- #"w\350\320!\317\363f\316\201\214\216\216"
- #"z\315\315\315\336\340\340\240\367\327\277\376"
- #"\325knn\366FGG}>J\300\177\4\b\22\257\255\255\315\e\37\37\237\361"
- #"\330\2313g\274\255[\267.h\373\341"
- #"\341a\257\256\256\316\253\253\253\363\326\254"
- #"YS||\363\346\315\336\211\23'\212"
- #"\337\2378q\302\333\274y\263\347y\236"
- #"\267n\335\2729_\243tR\36\2102\346@\0\0&\314\201\0\0L\b\20\0"
- #"\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23"
- #"\2\4\0`B\200\0\0L\376\17hhH\v\tJ\37r\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"line"
-0 0 24 3 2 #" ("
-0 0 15 3 2 #"\316\273"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"t"
-0 0 24 3 3 #") ("
-0 0 14 3 6 #"vector"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"cos"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"t"
-0 0 24 3 3 #") ("
-0 0 14 3 3 #"sin"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"t"
-0 0 24 3 4 #"))) "
-0 0 23 3 7 #"#:width"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"2"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:color"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 5 #"green"
-0 0 24 29 1 #"\n"
-0 0 24 3 15 #"               "
-0 0 23 3 6 #"#:mode"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 10 #"parametric"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:t-min"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"*"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-1/2"
-0 0 24 3 1 #" "
-0 0 14 3 2 #"pi"
-0 0 24 3 2 #") "
-0 0 23 3 7 #"#:t-max"
-0 0 24 3 1 #" "
-0 0 14 3 2 #"pi"
-0 0 24 3 3 #")))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 4 #"when"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"eq?"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"plot"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 5 #"    ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 29 #"\"'plot' finds tighter bounds\""
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 26 #";; Parametric + polar test"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2          41 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          15 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0\34\vIDATx\234\355\335\177\214\324u~"
- #"\307\361\327\210\fP\327\356v\367D\221\36\v;\2716\201zR\b\222C.\245"
- #"m\342\217\350\256wR\327\376ps\233"
- #"\240\330\364\262(\325\24\311\325+\221\236"
- #"\21\264\240w\325\236z5\n^\210{^\17\226\v\326\270\30\335!\27-\354\235"
- #"\330\300\37e\227\302\1\246\34)H\301"
- #"\v?n\371\366\217a\307\331\231\331\335"
- #"\231\367|\277\363\235\317\367\373|$\23"
- #"\235/\363\235\357\347\273\337\317~_\373"
- #"\371|\276\337\3177\341y\236'\0\0\312tE\330\5\0\0\270\211\0\1\0\230"
- #"\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@"
- #"\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0"
- #"L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20"
- #" \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0"
- #"\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L"
- #"\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 "
- #"\0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000\2712\354\2"
- #"\204-\221H\204]\4\0(\352\314\231"
- #"3\252\253\253\v\273\30\243Jx\236\347\205]\2100%\22\tY\177\4\326u\303"
- #"\330fX\353\272V\336J\326u\255\274\225\254\353Zy+Y\327\265\362V\23]"
- #"X\0\0\23\2\244\2\223&Mrj\233a\255\e\3066\331\327\340\327\rc\233"
- #"q\332W\27\320\205\25B3\321\205\246\251_\330\327hb_\243"
- #"\273\335r\320\2\1\0\230\20 !\210z\2636W\234\3665N\342"
-) 500
-(
- #"t\\\343\264\257\345\242\v\313\201f\"\334@]\202\237\\\250O\264@\0\0&"
- #"\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20"
- #"\0\200\t\1\2\0000!@\224\271a'\221H(\231L\206]\248&\231L"
- #"f\353\217D]Be\362\353S\255\343Nt\a\356\366\204\e\250K\360\223\v\365"
- #"\211\26\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b"
- #"\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300$\362\001200\240)"
- #"S\246\204]\f\0\210\234H\a\310\320"
- #"\320\220:::t\356\334\271\260\213\2"
- #"\0\221\23\351\0\331\270q\243\352\353\353"
- #"\303.\6\0DRd'S\334\277\177\277\226,Y\242\335\273wk\346\314\231\243"
- #"NJ\346\302\204ep\3u\t~r\241>E\262\005244\244e\313\226i"
- #"\355\332\265jnn\16\2738\0\20I"
- #"\221\f\220\341\256\253\345\313\227\227\364\371"
- #"\341\371\367s_<\317\1\243\311}fC\356K\242.\241|c\325\247Z\27\311"
- #".\254\0313f\350\310\221#\5\313[ZZ4888b\231\v\315D\270\201"
- #"\272\4?\271P\237\"\31 \371\306:\20.\34$\270\201\272\4?\271P\237\""
- #"\331\205\5\0\b^,\2d\366\354\331a\27\1\0\"'\26]Xcq\241\231"
- #"\b7P\227\340'\27\352S,Z \0\0\377\21 \0\0\23\2\4\0`B"
- #"\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1"
- #"\0\230\20 \0\0\23\2D\342\271\r0\313}\226\203D]Be\362\353S\255"
- #"c.,\a\346\233\201\e\250K\360\223"
- #"\v\365\211\26\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0"
- #"L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0"
-) 500
-(
- #"\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\"\236\341\0;\236\a\2?"
- #"\361<\20\307\2700\347>\334@]\202\237\\\250O\264@\0\0&\4\b\0\300"
- #"\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1"
- #"\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0"
- #"`B\200\0\0L\b\20\361\f\a\330"
- #"\361<\20\370\211\347\2018\306\2059\367"
- #"\341\6\352\22\374\344B}\242\5\2\0000!@\0\0&\4\b\0\300\204\0\1"
- #"\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000"
- #"\211l\200\244\323i555)\221H\250\251\251I\273v\355\n\273H\0\20)"
- #"\221\r\220\266\2666m\333\266M\236\347i\353\326\255jmm\r\273H\0\20)"
- #"\221\235\vk\316\2349\332\267o_\366"
- #"\375h\363\312\2700\337\f\334@]\202"
- #"\237\\\250O\221m\201\344\206\307\361\343"
- #"\307u\325UW\205X\32\0\210\236\310\6H\256\247\236zJ+V\254\b\273\30"
- #"\0\20)W\206]\200\240\245\323im"
- #"\331\262E\37\177\374\361\250\237)6\367"
- #"\376\304\211\23u\341\302\205 \213\6G"
- #"%\223I]\274x\261\350\277Q\227P"
- #"\256\261\352S\255\213t\200\364\366\366\252"
- #"\263\263S;v\354\320\324\251SG\375"
- #"\\\255\3673\242\266\214\26\6.\364Y"
- #"\243\366\214U\237j]d\273\260\206\303"
- #"\243\247\247G\363\346\315\v\2738\0\20"
- #"9\221\f\20\302\3\0\202\27\311\313xg\315\232\245C\207\16\25,oii\321"
- #"\340\340\340\210et;D\324YI\317KzE\322\177]^\366{\222\226I\372"
- #"\eIu\376o\222\272\4?\271P\237\"\31 \345p\341 !O\261p\360C"
- #"\205\1C]\202\237\\\250O\4\210\3\a)\326."
- #"JzW\322\217$\275%\351\223*n\273Y\322\6"
-) 500
-(
- #"Iw\227\366q\352\22\374\344B}\"@\348H\261\22T\353\302j\202\244'"
- #"$\255\320\270\255\22\352\22\374\344B}\212\344 :\34tV\322:I-\222\36"
- #"\223?\3411\343\362w\236\271\374z\352"
- #"\362\262r\fI\372\226\244\253%%$"
- #"\375\276\244\365\227\313\v\304\34-\20\a"
- #"R>\322\206[\34\377$\351D\31\353\315\220\364M\3717 >\\\216\27$\375"
- #"\262\204\317_#\351_$-\375|\21u\t~r\241>\21 \16\34\244\310\311"
- #"\35\327\370\211\244\223\343|\376\32Im"
- #"\222\356\221\364\247\252\316\355\257o*\23Nc\205Z^\367\26u\t~r\241>"
- #"\21 \16\34\244\310\30\376+\177\203\244"
- #"_\215\361\271k$=\252\300.\267-"
- #"Y\251\255\222\313\345\275z\325\325:\343"
- #"\235\251J\321\20}.\234\233\b\20\a\16R$\224\362\27}\255\4\307h\316J"
- #"zN\322?(36\222\347\204N\350\2327\257\31\321\255\5X\271pn\"@"
- #"\348H\316{]R\247\212\236t%IS%=\242\332\r\216|c\205\341\4"
- #"I\257I\372\253\252\226\b\21\344\302\271"
- #"\211\0q\340 9k\254\277\330\e%}]\325\35\327\360\323\360Uc\377X\344"
- #"\337\312\270\364\27\30\215\v\347&.\343"
- #"E0\336T\346\222\334\277\327\310\360\230"
- #" \351;\222\16K\372\201\244[\345^x\f;>\312\362\341K\177[$\375\270"
- #"z\305\1\252\215\26H\316\224\311<\267"
- #"\301'\243uYE\245{\247\224\361\234aQ\331gTE\376\263Aj\375\364L"
- #"\vD\231\203\344y\36\341Q\251\263\312\264.:U\30\36\327HzC\356\237H"
- #"_\227\364\347*\f\217Fi\231\226e\3663\327\220\244oH\372a5\n\a\327"
- #"]\270p!{>r\1-\20\a\372\31\2350\332_\345Q\32\17"
- #"\30\255e5U\322O\244\304\315\tyg\274\342\343>\264DP&\27"
-) 500
-(
- #"\316M\4\210\3\a\251\346E\275\313J"
- #"\312\334\364\370\27*\f\205\321n$,"
- #"\3663\211\322\317\3\201s\341\334D\2008p\220j\332\213\312L)R\254\313*"
- #"o\252\17g\235\2264K\322\251\234e"
- #"E\302\240\240.\21\"\250\200\v\347&"
- #"\306@`sL\322\235\222\376Z\305\257"
- #"\262:\250h\204\207$m\324\270\341Q\324}\222^\275\374\371a\214\211 B\\"
- #"\275\200\22azW\231p\3704oy\24\377\272~]\205\367z<\256\322\367\361"
- #"\276\313\377\355\324\347A;\34\"\277-"
- #"\251\265\302\362\1!\242\v\313\201fbM9\255\314\375\r\371\23 6HzY"
- #"\322\237U\275D\301)\326\5\325(\351"
- #"\277\2259\371\347\31\263.\25\373\256\205"
- #"\222>\360\241\234\210$\27\316M\264@"
- #"P\236\215*\f\217;$\275$\351\372\352\27'0?R\361\361\213\27U4<"
- #"\3065\334\22\351\310Y\366\241\251d@"
- #"\315\240\5\342@\312\327\214b\177E\377\2352SzDI\211\203\346\371J\252K"
- #"\211\274\367\257\217\375\235\210/\27\316M"
- #"\f\242\2434\243u\347|+\224\322\4\313:h^\212?\314{\377\re\356\241"
- #"\1\34D\200`|\243]\216j\355\316"
- #"\251e\333U\331\240\371x\326\250\360\252"
- #"\254\a%\375\237O\337\17T\21\1\202"
- #"\261\215u/C\224\6\314\207\375\243\n[Y+}\374\3766\25^\332{R\322"
- #"w}\334\6P%\4\bF\27\307\e\341\376#\357}\20\255\254\373\224\231\2458"
- #"\327\17|\336\6P\5\f\242;0P\25\2128\206\307veZ\b\271\312\250\32"
- #"e\325\245\323\312\\\372\234\253G\334\27"
- #"\202,\27\316M\264@P(\216\341!\25\216}\314\vp[\365*\34P\377N"
- #"\200\333\3\2@\200(\223\364\211DB\311d2\354\242\204/\256\341q"
- #"Z\205\335Wk\306_-\231Lf\353\217Tf]\312\377~\356\v\211\275"
-) 500
-(
- #"\374\372T\353\b\20\361<\220\254\270\206\207T8\210=C%u'\345?\277\241"
- #"\254\272\224\337]&e\272\321\20[\256"
- #"=\17\204\0A\306\277)\276\341!I\377\232\367\376\201*m\227n,8\214A"
- #"t\a\6\252\2wQ\231\277\270\377'gY\234\302C*\274C\374\264\312\276\372"
- #"\312T\227z$\335\225\267,\346\325\21"
- #"\31.\234\233h\201 3\273n\234\303\243\230j\335 I7\26\34F\200@\352"
- #"\316{\337\251x\205G\330'l\272\261\340(\2$\356^W\246\265\221\253=\214"
- #"\202\204\250\232\227\357\26\263&\357=W"
- #"c\301\21\214\2018\320\317\30\230nI"
- #"\177\251\221\3\347\327I:\242xM\364"
- #"\237?\376a\274\241\257\242\272\224_\206"
- #"\230VI|\316\205s\23\1\342\300A\n\304aI_\326\310I\374&(\23*"
- #"w\207R\242\360\370t\362&@\340'"
- #"\27\316Mta\305\221\247\314e\252\371"
- #"\341\361\232\342\27\36\0\314\b\2208z"
- #"Y\322;y\313\276\253x\r\234\3\250\30]X\0164\23}uQ\322\357J\372"
- #"U\316\262[$\375\273\n\273Q\342\202.,\324 \27\316M\264@\342\346]\215"
- #"\f\217\253\225i\221\3045<\0\230\5\26 \351tZ\213\26-\312\376\377\2349"
- #"s\264k\327\256\2406\207R\375(\357"
- #"\375\275\312\334\205\16\0e\n,@\332\332\332\264~\375z\35?~\\\367\334s"
- #"\217\36x\340\1\265\267\267\23\"a\272(ik\336\262{\302(\b\200(\bl"
- #"\fd\270\377\356\321G\37U\"\221\320\323O?\255t:\255\266\2666\235:u"
- #"*\210M\232\270\320\317\350\233\267%\335"
- #"\226\363\276I\231)L\342t\317G1"
- #"\334\a\202\32\344\302\271)\360S\307\367"
- #"\277\377}\35<x0\350\315Tdx\356\375\211\23'F{J\367\374"
- #")K\276.\302C\312L%\362\213\234\367\337Q\311\1\222L&u\361"
-) 500
-(
- #"\342\305\354{S]\n{*\25\324\214\374\372T\353\2\353\302jhh\320\263\317"
- #">\253\211\23'j\352\324\251J\247\323"
- #"\272\367\336{\265}{\355\375\266\304\342"
- #"y \305\246,\241\373*cM\336\3732\246\22\251\350y \303\302\236J\0055"
- #"\203\347\201\\\326\323\323\243-[\266d"
- #"\3c\325\252U\352\356\356\326\342\305\213"
- #"\203\332$FS\354Y\37\327I\372\223PJS{\212\315\210[M\206'!\2"
- #"\265\200\373@\34\350g\254\310h\317\372"
- #"\210\343\224%c\361a\34\304T\227\266"
- #"\2530\300\"\\\35Q:\27\316M\276\266@\32\e\e\325\322\322\"IJ\245R"
- #"\331g\373\346\276R\251\224\237\233\304xF{\326\a\3411RXS\252\323}\5"
- #"\207\371\32 _\370\302\27\264i\323&I\322\340\340`\266//\367588\350"
- #"\347&1\236\374\373>:\305\224%\305"
- #"\254\311{\377\241\202\37\334\336.\272\257"
- #"\3404\272\260\34h&\232]\2244M\322\377\346,{[\231\251KPh\236F"
- #"^\215\265P\322\a\245\257^v]Z\250\221\0012OR\177\351\253#\332\\8"
- #"7\0056\210>\177\376|uw\217\274"
- #"n\264\273\273[\363\347\317\17j\223\310"
- #"\367\256F\206G\223\308\37\313\232\274\367A\266Bh} \2\2\v\220W_"
- #"}U\253V\255\322C\17=\244\337\374"
- #"\3467z\350\241\207\264j\325*\275\372"
- #"\352\253Am\22\371\362\273\257\270\357c"
- #"lm\252\336XH\261\261\17\303\315\213@\230\2\v\220\en\270A\273w\357V"
- #"\177\177\277\256\277\376z\375\374\347?\327"
- #"\236={t\303\r7\4\265I\344b\332\22\2335y\357?\224\364C\237\267\361"
- #"\272h} \22\2\235\215\367\354\331\263"
- #":}\372\264\352\353\353\365\351\247\237\352\314\2313Ann\204\243G\217"
- #"\252\253\253K\365\365\365\352\352\352\322"
- #"\261c\307\252\266\355\361$\223\311\3407"
-) 500
-(
- #"R#\335WU\331W?\25k\205|C\376\204\310\373\222R\222:\362\226;\330"
- #"\372p\356\270V N\373Z\256\300\2"
- #"\344\375\367\337\327\302\205\vu\377\375\367"
- #"\353\300\201\3\272\377\376\373\265p\341B"
- #"\275\377\376\373Amr\204\271s\347J"
- #"\222v\356\334)I\272\361\306\e\253\262"
- #"\335RTe\252\202\32\351\276riZ\206\2545\312\\\356<lH\376\204\3107"
- #"%\345\317\3523AN\266>\234<\256Fq\332\327r\5v\25\326\374\371\363\265"
- #"j\325*\265\267\267g\227uwwk"
- #"\335\272u\352\357\17\366R\223\343\307\217"
- #"+\225J\351\354\331\263\331euuu:x\360\240\246N\235:\342\263a\\\351"
- #"\20\3706/I\232\252\232\270\372\312\205+I\212z]\205w\357KR\263\244\r"
- #"*z\37\315\250\373\372cI\217(\363"
- #"\34\372\\\303\367\3448xY\265\263\307"
- #"\325 \254}u\341g\34\311\313xW\256\\\251)S\246\350\311'\237\314.["
- #"\275z\265\316\237?\257\r\e6\214\370l%\a)\231L\232\346\317\n|\233\277"
- #"\320\310\e\322~G\322\257\244\344o\331"
- #"\312[\362v\213\b\343\347\353\333\272\243"
- #"\205\210T4H\n\366u\264\340\2202O\205\374gIw\371X\336*\256\353\364"
- #"q-SX\373\32\353\0\231>}\272>\371\344\223\202\345---\201\337LX"
- #"\254\265Q\254U\"Uv\220\254\353\6"
- #"\276\315\215\222\3766\347\375]\222\266F"
- #"t_\203^w\254\20\311sX\207\325\334\334\\<0rM\220\364\23\215\30\367"
- #"\250\211}\255\361m\206\265\256k\345\255"
- #"\246\300\306@~\375\353_+\235Ng"
- #"\357@\357\353\353\323\264i\323\364\332k"
- #"\371S\302\302w\357\345\275_\22B\31\242\342>IoH\272~\374\2176\253\204"
- #"\360\370\2622-\23\307\6\315\201\242\274\200\24\373\352"
- #"\276\276>\257\241\241!\250Mf=\366\330c\336\312\225"
-) 500
-(
- #"+G,{\370\341\207\275\325\253W\27|V\231\251\353\"\365\372\245~9b\2"
- #"\231\271\232\ez\231\242\360Z\252\245\336"
- #"1\35+2A\317\370\257\275\332\353\335"
- #"\245\273B\337\a^n\275\316\237?\37\334\211\322\a\201?\2210W\265\236HX"
- #"\255A\364\232m\22\377\261>o\205L"
- #"\223tT\322\25\21\335\3270\326\375\261"
- #"\244\25\222\n{h\v}Y\322\23\312\216u\230\267Yc\353\272V\336J\326u"
- #"\255\274\325\24\350\3\245r\237\177^\315"
- #"\aJ]{\355\265\232<y\262\272\272\272\264g\317\36uuui\362\344\311\5"
- #"\341\21Yk$\375\201\244\e$mQ\300w\373\304\320RI\3074\362o\3057"
- #"\245\375\332/\315V&`\206\227\357\325"
- #"\270\341\1\270*\320\aJ\335y\347\235"
- #"\331i\334[[[\253\372@\251\217>"
- #"\372H\222t\307\35wH\222\366\356\335"
- #"\353\3736&M\232\344\373w\372\262\315"
- #"?\222\364\237\222>\276\374\377\345\254["
- #"\311v}\26VyM\353.\225\346h"
- #"\216\264O\246\251\362\235\332\327\n\261\257"
- #"\321\21\311\313x\313\21\311\373@j\b\373\32M\354kt\267[\16:7\0\0"
- #"&\4H\b\242\336\254\315\25\247}\215"
- #"\2238\35\3278\355k\271\350\302r\240\231\b7P\227\340'\27\352\23-\20\0"
- #"\200\t\1\2\0000!@\0\0&\276\6\310\202\5\v\230\353\n\0b\302\327A"
- #"\364\3\a\16\250\275\275]\263f\315\322"
- #"+\257\274\242\206\206\6\277\276:0."
- #"\fT\301\r\324%\370\311\205\372\344k"
- #"\v\344K_\372\222>\370\340\3}\361"
- #"\213_\324\302\205\v\263w\203\3\0\242"
- #"\307\3671\220I\223&\351\271\347\236\323"
- #"\322\245K\265`\301\202\354T&\303\257T*\345\367&\1\0!\bd\20\275\267"
- #"\267W\2336m\322\207\37~X0\261u\320\17\223\262"
- #"\30\16\267d2\31vQ\340\230d2\231\255?\22u\t"
-) 500
-(
- #"\225\311\257O\265\316\367\e\t{{{"
- #"\325\331\331\251\236\236\36\315\2337o\374"
- #"\25B\346B?#\334@]\202\237\\\250O\276\266@\\\v\17\0\200\235\257-"
- #"\220E\213\26i\375\372\365U\233\262\335"
- #"\17.\244<\334@]\202\237\\\250O"
- #"\314\205\345\300A\202\e\250K\360\223\v"
- #"\365\211;\321\1\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`"
- #"B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0"
- #"\1\0\230\20 \342\31\16\260\343y "
- #"\360S\354\237\a\342\32\27&,\203\e"
- #"\250K\360\223\v\365\211\26\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`"
- #"B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0"
- #"\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\"\236"
- #"\341\0;\236\a\2?\361<\20\307\2700\347>\334@]\202\237\\\250O\264@"
- #"\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0"
- #"L\b\20\0\200\t\1\2\0000!@\0\0&\221\r\220t:\255\246\246&5"
- #"55i\327\256]a\27\a\0\"\347\312\260\v\20\204\306\306F]\272tI?"
- #"\375\351O\345y\236\332\333\333\325\335\335"
- #"\255\305\213\27\207]4\0\210\214H\6"
- #"\310\264i\323\264o\337\276\354\3737\336"
- #"xC\255\255\255:u\352T\210\245\2"
- #"\200h\211\305d\212\215\215\215\222\244\223"
- #"'O\26\374\233\v\23\226\301\r\324%"
- #"\370\311\205\372\24\213\0\31\353@\270p"
- #"\220\340\6\352\22\374\344B}rj\20"
- #"=\225Je\347\312\317\177\245R\251\242"
- #"\353\244\323i544\214\371\275\305\276\217\3479`4\271\317l\310}I\324%"
- #"\224o\254\372T\353\234\32\3\31\34\34,\353\363\275"
- #"\275\275\352\354\354\324\316\235;\307\374\\\255\247<j\313"
-) 500
-(
- #"\205\v\27\212.w\341/F\324\236\261"
- #"\352S\255s\252\5R\216\341\360\350\351"
- #"\351\321\274y\363\302.\16\0DN$\3\204\360\0\200\340Er\20}\326\254Y"
- #":t\350\320\210e---E\273\300\350v\200_\250K\360\223\v\365)\222\1"
- #"R\16\27\16\22\334@]\202\237\\\250"
- #"O\221\354\302\2\0\4\217\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0"
- #"L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20"
- #" \22\317m\200Y\356\263\34$\352\22*\223_\237j\35sa90\337\f\334"
- #"@]\202\237\\\250O\264@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0"
- #"\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4"
- #"\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\361"
- #"\f\a\330\361<\20\370\211\347\2018\306"
- #"\2059\367\341\6\352\22\374\344B}\242\5\2\0000!@\0\0&\4\b\0\300"
- #"\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1"
- #"\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0"
- #"`B\200\210g8\300\216\347\201\300O<\17\3041.\314\271\0177P\227\340'"
- #"\27\352\23-\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0"
- #"\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200I\344\3d``"
- #"@S\246L\t\273\30\0\209\221\16\220\241\241!utt\350\334\271sa\27"
- #"\5\0\"'\322\1\262q\343F\325\327"
- #"\327\207]\f\0\210\244\310N\246\270\177"
- #"\377~-Y\262D\273w\357\326\314\231"
- #"3G\235\224\314\205\t\313\340\6\352\22\374\344B}\212d\vd"
- #"hhH\313\226-\323\332\265k\325\334\334\34vq\0 \222\234\n"
-) 500
-(
- #"\220T*\225\235+?\377\225J\245\262\237\e\356\272Z\276|yI\337[\354\373"
- #"x\236\3F\223\373\314\206\334\227D]B\371\306\252O\265.\222]X3f\314"
- #"\320\221#G\n\226\267\264\264hppp\3042\27\232\211p\3u\t~r\241"
- #">E2@\362\215u \\8Hp\3u\t~r\241>9\325\205\5\0\250"
- #"\35\261\b\220\331\263g\207]\4\0\210\234Xta\215\305\205f\"\334@]\202"
- #"\237\\\250O\261h\201\0\0\374G\200\0\0L\b\20\0\200\t\1\2\0000!"
- #"@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0"
- #"\0L\b\20\211\3476\300,\367Y\16"
- #"\22u\t\225\311\257O\265\216\271\260\34\230o\6n\240.\301O.\324'Z "
- #"\0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0"
- #"&\4\b\0\300\204\0\1\0\230\20 !\210\323]\312q\332\3278\211\323q\215"
- #"\323\276\226\213;\321C\270\333\323\205;"
- #"L\375\302\276F\23\373\32\335\355\226\203"
- #"\26\b\0\300\204\0\251@\30M\333J\266\31\326\272al\223}\r~\3350\266"
- #"\31\247}u\1]X\0254\23\255\353"
- #"\206\261\315\260\326u\255\274\225\254\353Z"
- #"y+Y\327\265\362V\262\256k\345\255&Z \0\0\23Z \216\314\273\17 "
- #"~\316\2349\243\272\272\272\260\2131\252"
- #"+\303.@\330b\236\237\0`F\27\26\0\300\204\0\1\0\230\20 \0\0\23"
- #"\2\4\0`B\200\0\0L\b\220\032200\240)S\246\204]\214@\245\323"
- #"i555\251\251\251I\273v\355\n\2738\2768z\364\250\272\272\272T__"
- #"\257\256\256.\35;v,\354\"\5j\370\30&\22\211H\35\307\261\304\341w\323"
- #"\202\0\251\21CCC\352\350\350\320\271s\347"
- #"\302.J`\32\e\e\325\332\332\252m\333\266"
-) 500
-(
- #"i\353\326\255joo\217\304\311g\356"
- #"\334\271\222\244\235;wJ\222n\274\361"
- #"\3060\213\23\270\266\2666m\333\266M"
- #"\236\347i\353\326\255jmm\r\273H"
- #"\201\212\303\357\246U\354o$\254\25\317"
- #"<\363\214z{{\365\366\333oG\366\336\2249s\346h\337\276}\331\367\351t"
- #"Zmmm:u\352T\210\245\252\314"
- #"\361\343\307\225J\245t\366\354\331\354\262"
- #"\272\272:\35<xPS\247N\r\261d\301\311?\216.L\271Q\2118\374n"
- #"Z\21 5`\377\376\375Z\262d\211v\357\336\255\2313g\306\246\222666"
- #"J\222N\236<\31rI\354V\256\\\251)S\246\350\311'\237\314.[\275z"
- #"\265\316\237?\257\r\e6\204X\262\352(\26\240Q\22\327\337\315R\21 !\e"
- #"\32\32\322\342\305\213\325\331\331\251\a\37"
- #"|0\362\177\315\345\212\302\276\26km"
- #"D\375\244\232\253X\200FE\234\1777K\305\30H@R\251\224\22\211D\321W"
- #"*\225\312~n\343\306\215\252\257\257\327"
- #"\362\345\313C,meJ\335\327\\\351tZ\r\r\rU.)\374\224N\247\265"
- #"e\313\26=\374\360\303a\27%\20Q\370\335\f\32-\220\220\315\2301CG\216"
- #"\34)X\336\322\322\242\301\301\301\20J"
- #"\24\274\336\336^uvv\252\247\247G"
- #"\363\346\315\v\2738\25)\326]\25\345"
- #"\277\312\207E\351\30\216&\216\277\233\345"
- #"\"@jL\324\233\311Q;\361\304q\20=j\307\260TQ\377\335\264\240\v\v"
- #"U\23\305\23\317\265\327^\253\311\223'\253\253\253K{\366\354QWW\227&O"
- #"\236Lx \26\b\220\0323{\366\354"
- #"\260\213\20\230\a\36x@\307\216\35\323"
- #"\374\371\363\307\35#q\311G\37}$I\272\343\216;$I{\367\356\r\2638"
- #"\201*v\f\243r\34\307\23\345\337M+\272\260\0"
- #"\0&\264@\0\0&\4\b\0\300\204\0\1\0\230\20"
-) 500
-(
- #" \210\275\233o\276\271\340\272\376\201\201"
- #"\1-^\2748\260m666\252\245\245%\260\357\a\252\201\0A\354utt"
- #"\350\276\373\356\323\320\320\220\244\317g_"
- #"\355\350\350\bl\233\327]w\2356m"
- #"\332\24\330\367\3\325\300UX\210=\317"
- #"\363t\333m\267\351\226[n\321#\217"
- #"<\222\235}\365\255\267\336R\"\221\b"
- #"\273x@\315\242\5\202\330K$\22z"
- #"\351\245\227\264n\335:m\337\276]\353\327\257\327\213/\276XRx\344>\\)"
- #"\221Hh\302\204\t\331\177\273\351\246\233"
- #"\324\337\337\237}\337\337\337\257\233n\272"
- #"I\222F\3347\221\377\35qyH\23\"\300\3\340y\236\347=\377\374\363^]"
- #"]\235\367\302\v/\224\274NCC\203"
- #"\227N\247\263\357s\177\245v\354\330\341"
- #"M\237>\335;|\370\260w\370\360a"
- #"\357\372\353\257\367v\354\330Q\360\271\346"
- #"\346f\357\331g\237\315\276\357\353\353\363"
- #"\276\362\225\257T\262+@U\\\31v"
- #"\200\1\265\342\263\317>\323\244I\223\364"
- #"\331g\237\225\274\316\247\237~:\352`"
- #"\373\355\267\337\256\256\256.\265\266\266\312"
- #"\363<\255X\261B\267\337~{\301\3476o\336\254\273\357\276[\3\3\3z\354"
- #"\261\307\364\325\257~U?\373\331\317\314"
- #"\373\1T\vc \200>\177p\320\326\255[\365\265\257}M\357\275\367^IS"
- #"W\344O\260\227\377\376\322\245Kji"
- #"iQ\"\221\320\340\340\240\256\270\342\212"
- #"\242\237;z\364\250\326\255[\247\227_~YW]u\225\266m\333\26\350U`"
- #"\200\37\30\3A\354\r\r\ri\331\262eZ\273v\255\26-Z\244'\236xB"
- #"\313\226-\313^\2255\226\206\206\2061\307+\36\177\374q577k\306\214\31"
- #"\372\366\267\277]\3643\213\26-\322\241"
- #"C\207\364\275\357}O\347\316\235\323\343\217?\36\350\25`"
- #"\200o\302\354?\3j\301\323O?\355\335z\353\255\336\245"
-) 236
-(
- #"K\227<\317\363\274K\227.y\267\334r\213\367\3143\317\214\273n__\2377"
- #"m\3324/\235N{}}}#\30666o\336\354\245R)\357\304\211\23\336"
- #"\211\23'\274T*\345m\336\274\331\363"
- #"\274\221c \375\375\375\336\364\351\323\275"
- #"\336\336^\357\235w\336\361\246O\237\356"
- #"\365\367\367\373\274\227\200\377\b\20\304\336"
- #"\242E\213\274\201\201\201\21\313\16\348"
- #"\340\335|\363\315%\255\337\327\327\347\325"
- #"\327\327{\365\365\365\336\314\2313\263\313"
- #"\27,X\340\355\331\263'\373~\317\236"
- #"=\336\202\5\v<\317\363\274\331\263g\217\372\35\271\203\362@-c\f\4\0`"
- #"\302\30\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b"
- #"\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\344\377\1"
- #"\353\372e(\267\372j\241\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"line"
-0 0 24 3 2 #" ("
-0 0 15 3 2 #"\316\273"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"t"
-0 0 24 3 3 #") ("
-0 0 14 3 6 #"vector"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"t"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"t"
-0 0 24 3 3 #")) "
-0 0 23 3 7 #"#:width"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"4"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:color"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 7 #"magenta"
-0 0 24 29 1 #"\n"
-0 0 24 3 15 #"               "
-0 0 23 3 6 #"#:mode"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 10 #"parametric"
-0 0 24 3 1 #" "
-0 0 23 3 9 #"#:mapping"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 5 #"polar"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:t-min"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"*"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-1/2"
-0 0 24 3 1 #" "
-0 0 14 3 2 #"pi"
-0 0 24 3 2 #") "
-0 0 23 3 7 #"#:t-max"
-0 0 24 3 1 #" "
-0 0 14 3 2 #"pi"
-0 0 24 3 3 #")))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 15 3 4 #"when"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"eq?"
-0 0 24 3 1 #" "
-0 0 14 3 11 #"module-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"plot"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 5 #"    ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 29 #"\"'plot' finds tighter bounds\""
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 47 #";; mix test (rendering order - red drawn first)"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2          45 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          17 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0 \0IDATx\234\355\335{\214T\367y"
- #"\377\361gXX\e\201\262\e\266^\2H\\vY\353\27l)\326&F\2c"
- #"\211\266\222/\245\213lG\262j\24*Z\344%\221\0/\266\333\232\2528j\34"
- #"E\361\25\252\310\211q\252\337/@\362CX\252\312\256-\254\310\270F;(R"
- #"\3\344\202\4Q\r\e\343\202[S\""
- #"\23\311\261\204\315\316<\375c\275\353\275"
- #"\314\356\316<\347\373=\337\363=\363~"
- #"I#\231\361\316\314s\346<\337\3639\2279\347\24TU\5\0\200\32\315\b]"
- #"\0\0 N\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0"
- #"\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230"
- #"\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@"
- #"\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0"
- #"L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20"
- #" \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0"
- #"\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L"
- #"\b\20\0\200\311\314\320\5\204V(\24"
- #"B\227\0\0\25}\370\341\2072w\356"
- #"\334\320eL\252\240\252\32\272\210\220\n"
- #"\205\202X\277\2\353kC|f\250\327\306Vo\222\327\306Vo\222\327\306Vo"
- #"\222\327\306Vo\232\330\205\5\0000!"
- #"@\22\270\341\206\e\242\372\314P\257\r"
- #"\361\231L\253\377\327\206\370\314z\232\326"
- #"\30\260\v+\300fb\f\233\246\2560\255\371\304\264\346\367sk\301"
- #"\26\b\0\300\204\0\t \357\233"
- #"\265\243\325\323\264\326\223z\232\257\365"
-) 500
-(
- #"4\255\265b\27V\4\233\211\210\3\275\4\227b\350'\266@\0\0&\4\b\0"
- #"\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t"
- #"\1\2\0000!@d\350\204\235B\241 \215\215\215\241KAd\32\e\eG\372"
- #"G\204^B2\343\373)\3538\23=\202\263=\21\az\t.\305\320Ol\201"
- #"\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0"
- #"\230\20 \0\0\23\2\4\0`B\200\0\0Lr\37 \347\317\237\227\331\263g"
- #"\207.\3\0r'\327\1R*\225d\343\306\215r\355\332\265\320\245\0@\356\344"
- #":@v\357\336-MMM\241\313\0\200\\\312\355\305\24\317\236=+k\327\256"
- #"\225\23'N\310\322\245K'\275(Y\f\27,C\34\350%\270\24C?\345r"
- #"\v\244T*\311\346\315\233\345\251\247\236"
- #"\222%K\226\204.\a\0r)\227\1"
- #"2\274\353\252\273\273\273\252\277\37\276\376"
- #"\376\350\a\367s\300dF\337\263a\364"
- #"C\204^B\355\246\352\247\254\313\345."
- #"\254\305\213\27\313\305\213\27'<\337\326"
- #"\326&\3\3\3c\236\213a3\21q\240\227\340R\f\375\224\313\0\31o\252\31"
- #"\21\303LB\34\350%\270\24C?\345r\27\26\0\300\277\272\b\220\25+V\204"
- #".\1\0r\247.vaM%\206\315D\304\201^\202K1\364S]l\201\0"
- #"\0\334#@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`"
- #"B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\210\b\367m\200"
- #"\331\350{9\210\320KHf|?e\35\327\302\212\340z3\210\3\275\4\227b"
- #"\350'\266@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`"
- #"B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230"
-) 500
-(
- #"\20 \0\0\23\2\4\0`B\200\0\0L\b\20\341\36\16\260\343~ p\211"
- #"\373\201D&\206k\356#\16\364\22\\"
- #"\212\241\237\330\2\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0"
- #"\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23"
- #"\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\204{8\300\216"
- #"\373\201\300%\356\a\22\231\30\256\271\2178\320Kp)\206~b\v\4\0`B"
- #"\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1"
- #"\0\230\20 \0\0\23\2\4\0`\222\333\0)\26\213\322\322\322\"\205BAZ"
- #"ZZ\344\370\361\343\241K\2\200\\\311m\200\254_\277^z{{EU\345\360"
- #"\341\303\322\325\325\25\272$\0\310\225\334"
- #"^\v\353\226[n\2213g\316\214\374"
- #"{\262\353\312\304p\275\31\304\201^\202"
- #"K1\364Sn\267@F\207\307\345\313"
- #"\227e\316\2349\1\253\1\200\374\311m"
- #"\200\214\366\335\357~W\266o\337\36\272"
- #"\f\0\310\225\231\241\v\360\255X,\312"
- #"\301\203\a\345\364\351\323\223\376M\245k"
- #"\357\317\2325K>\371\344\23\237\245!"
- #"R\215\215\215r\375\372\365\212\377\217^"
- #"B\255\246\352\247\254\313u\200\34=zT6m\332$G\216\34\221\326\326\326I"
- #"\377.\353\373\31\221-\223\205A\f\373"
- #"\254\221=S\365S\326\345v\27\326px\364\365\365Iggg\350r\0 w"
- #"r\31 \204\a\0\370\227\313\237\361.[\266L.\\\2700\341\371\266\2666\31"
- #"\30\30\30\363\34\273\35\340\n\275\4\227"
- #"b\350\247\\\6H-b\230I\210\3\275\4\227b\350\247\\\356\302\2\0\370G"
- #"\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300"
- #"\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\31"
-) 500
-(
- #"\272d@\241P\220\306\306\306\320\245 "
- #"2\215\215\215#\375#B/!\231\361\375\224u\\\v+\202\353\315 \16\364\22"
- #"\\\212\241\237\330\2\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20"
- #"\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0"
- #"\223\372\r\220RI\344\307?\226\377/"
- #"\"\262|\271H\241P\333\243\243Cd"
- #"\303\6\221\37\377x\350\275\220[\237\266"
- #"\212l\3300u\253\210h\366\332\245\332"
- #"\3423W8bP\237\327\302\352\353\23"
- #"y\374q\221s\347\334\275\347\362\345\""
- #"\267\337.\362g\177&\362\320C\"\r\r\356\336\eA\\\273&\262w\257\310\v"
- #"/\210\374\347\177\272{\337\305\213E\36}Td\313\26\221\eot\367\276\"2"
- #"\264\220?xP\344\310\21\221\237\377\\"
- #"d`\300\355\373\323\347\251\211\341ZX"
- #"\365\27 \273v\211|\373\333~?\243\243c\350s6l`\200E\310Wp\214"
- #"\3474HJ%\221\237\374d\250\267]"
- #"\256\30M\205>\367\212\0\311\2327\336"
- #"\20\271\373n\221\264&\331\353\252&\\"
- #"K+8\306K\324&\241\212\36\215>\367\202\0\311\232\365\353E^}5\375\317"
- #"eM-\323\262\260\f\26\251q9\34b\213c:\364yb\215\215\215r\375\372"
- #"\365\221\177g}\361\\_\1\262h\221"
- #"\310\177\375W\270\317g\200eJ\26\227"
- #"\301\"\323\264IV\213\36\255\243C\344"
- #"\371\347E\272\272BW\0225\266@\262"
- #"f\301\2\221\367\337\17]\5\3,\260"
- #"\254lqLg\302\26\211\217\37\177\370\324\3233\364%Grw\275\254!@\262"
- #"\246\253K\344\265\327BW\361\31\6X\352b[\6\213|\272\276\361\177~(]"
- #"\257v\207.\245v[\266\210\274\370\"[\334\6\4H\326\24\213\"k\327"
- #"\212\224\313\241+\371\f\3,\25\252\";v\210\374\323?\205\256\304\256G"
-) 500
-(
- #"\366\310\v\362\250\24$\262!\313\26\267I\f\1R_'\22\336y\247\310?\374"
- #"C\266\326\370\367\356\25\371\342\27\303\34"
- #"\334\257\23\245\222\310\327\277\36wx\210"
- #"\210\354\221\36\371\206\374@J\22\331\312"
- #"\306\271sC?`\331\261#\275_@\"\25\365\25 \"\"\377\370\217\"o\276"
- #")r\317=\"\363\346\311e\21\221\257"
- #"~U\344\300\1\221\301\301\241\6\237\352"
- #"188\364\267\17< \322\332\352\246&\6\2307}}C\371\374\362\313n\336"
- #"\257\243Cd\377\376\312\255\"R\250\330"
- #".\373\366\r\275\316\205\275\262E\276("
- #"\277\221W\245\306\265\371\371\363\303\367\371"
- #"\236=\"\337\370\6g\264\347\211\326\271"
- #"\304_\301\340\240\352\276}\252\35\35\323"
- #"\r\311\352\36[\266\f\275'\22)\227"
- #"U\37y\304\315,\21\31\232\275\373\367O=k\246\352%\327m\"\242\332#\273"
- #"\265,\205dEW\313\345\4tt\250\366\365%\257)\347bX<g\277B\317"
- #"\234\315$\6Xf\224\313\252\335\335\351"
- #"\5\307\260jz\311\371\372\206\27441"
- #"D\\\6\207\317\t\350\351\31\232Y\250"
- #"\210\0\211\200\363\231\304\0\v\312Ux"
- #"X\226\301\265\364\222\3136\31\t\21\237"
- #"\301\341k\2\266l\241\307'A\200D\300\333Lb\200\245np0yx$Y"
- #"\6[zipPu_\317/\264c\326;\311\332\344\217\377C\a?\16\260\353"
- #"\323\305\227N\217WD\200D\300\373Lb\200\245\242\2677YV\273Xy\257\271"
- #"\227F\35\250\31\224\6\335'\177\251\35"
- #"\362v\242i\b\262\347\323\305\1'\216"
- #"\375M@\200D \225\231\344j\200\21\"\23di\331US/M\262\257mP"
- #"\32\264[\366&\232\236`{>]\244"
- #"8\307\376F\324u\200\364\367\367\353\252U\253F\376{\305\212\25Z,\26"
- #"}}\234Y\2523)\351\0#D\306pq\274\303\345\302\266\352^\232\246\360"
-) 500
-(
- #"\262\24\364\21\331\23\347\372\206\213-n"
- #"\216\375\251j\235\aHss\263\26\213"
- #"E}\377\375\367u\376\374\371\272{\367n]\260`A\346B$\365\231\224t\200"
- #"\21\"\252\232<<|\254\354V\325K5\24\336+\353\23\355\322\n\326*lq"
- #";Q\327\0012<\361\217=\366\230>"
- #"\376\370\343\252:\264%\322\334\334\354\353"
- #"#M\202\314\244\244\3\254\316\aW\322"
- #"\360\360\265\273}\332^2\24\236t\227V\320Va\213;\21\2DU\347\314\231"
- #"\243\227/_V\325\354\6\310\360c\326\254Y\351~x\222\1V\247\203\313Ex"
- #"\270\374\332f\315\2325\246\207&\355\245"
- #"\4\205\227\245\240\335_\354\317\3144\327"
- #"\204-\356\232\214\357\247\254\363Vas"
- #"s\263\356\336\275{$0\372\373\373\331\205UI\222\1Vg\203kpP\365/"
- #"\376\302\276,\372\273\277\363[\337\244\275"
- #"\2244\365zz\264\\*'\332h\335\264I\265T\362;\375\223\312Z\352G\""
- #"\370\262\251\n\336*\354\357\357\327\225+"
- #"W\216\4\306\252U\2532\23\36\377\366"
- #"o\252\353\326\251.Y\242*rA\327\255S}\353\255\200\5%\31`u2\270"
- #"\34,\203\275\177M\25\a|\222\302\307"
- #"\35\250\211z\317'!R\225\314-\233\246\221\375\210s\354\311'U\v\25.\37"
- #"T(\250\376\375\337\a,\214\20\231\224\303e\260W\23\2$\351<\235\344@M"
- #"\264{>\243N@\377v\356\234|\331"
- #"\364\315o\206\256\2562\247\1\362\371\317\177^\227-[\246\252\252mmmZi"
- #"\337p[[\233\313\217\254I\177\277\352"
- #"\214\31S\367\350+\257\4+\217\20\251"
- #"\300\3232\330\2131\1\342y^F\275"
- #"\3473\332\4\364\347\320\241\251'{\306"
- #"\f\325\214\354\300\31\303i\200tttdf7U%]]\323\367\347M"
- #"7\251~z\314?\214$\v\236G\37\rX\270{\261\345\351H\200\244T"
-) 500
-(
- #"xl\337\317\30I\22\360\221G\2\26"
- #"\356\336\345\313\252\177\364G\323O\366\372"
- #"\365\241+\235\310i\200d\335\302\205\325"
- #"\365\347\3\17\4\36\\\326%C\241\240"
- #"\372\372\353\1\vw'\306\205\243\210\244"
- #"^x\214\337\223\223\342\203\356*p\247"
- #"\\V\275\377\376\352&y\321\242\320\325N\344-@:;;\365\320\241Cc\236"
- #";t\350\220vvv\372\372\310i-_^\a\203\353\226[\2\376\334\306\215X"
- #"\27\212\5\221 \205\307\372}%*>"
- #"\370\256\202\344j\235\364\216\216\320\25O"
- #"\344-@N\237>\255K\227.\325\355"
- #"\333\267\353\365\353\327u\373\366\355\272t"
- #"\351R=}\372\264\257\217\234\326\243\217"
- #"\326\311\340\n^x2\333\267G\2700,\227u\257\245hG\205'\t\221\340{"
- #"\204\254\305\a\337U`g\231\344\307\36\v]\365D\336\2DU\365\312\225+z"
- #"\307\35w\350M7\335\244k\326\254\321\337\375\356w>?nZ\305bd\v%"
- #"\325\272\v\221\351\16&frr3\262\t\20\365\36\241:\352s\353\244\36?\36"
- #"\272\362\211\274\6\310;\357\274\243\267\336"
- #"z\253._\276\\o\275\365V}\347\235w|~\334\30\27/^\324\255[\267"
- #"\352\347>\3679\335\272u\253^\272tIUU\37z\250\366\31\347\372$\254\232"
- #"\317x\217xp\3252\255\27/\25267\327>\231\276O\20\234RF\302ct"
- #"9\226_\31267\253~:D\252\342\345\252\r\31\355s\227\323j=\31v\303"
- #"\6g%8\345-@\216\35;\246\255\255\255\272g\317\36UU\335\263g\217\266"
- #"\266\266\352\261c\307|}\344\30---\272u\353V=q\342\204n\335\272U"
- #"[ZZT\265\372_<\370\354Q\323\31\246\31\35\\\323\251vZk9\230\230"
- #"\241\311S\375\233\277\311Lx\fKc\217\220\267"
- #"\263\2443\330\347\256\2465\217\207{\274\5H\310\203"
-) 500
-(
- #"\350\357\277\377\276\316\2313g\314s\243"
- #"\257\311\25z7\211\271!K\245\241\203"
- #"\344\31\32\\\323\251fZ3\270\314\250"
- #"\316/~\241\332\320\220\311\302}\177\247"
- #"^/\263\221\261\265\t\27\323\32\365\356"
- #"\305)x\354\202pzzzt\347\316\235c\236{\342\211't\307\216\35#\377"
- #"vq\240\326\272i\233\244!\377|\346\314\312\247\253VQxc\202Mq_\323"
- #"\352kA\227d\267C\325\257\375\223?qV\270\217z}\206H\222\36\256jZ"
- #"=\354*\b1^g\315\232\25\367\17\34\246\341-@\26.\\\250\241\316D\37"
- #"\275\2651l\374V\211\213]\327\326\306J\322\220\"R\373\317\311>}\274$b"
- #"^C\3631\255Y]\300U\365\332K"
- #"\227\246\277\254A\r\205\373\252\327\327w"
- #"\354\375\373Uu\276\253 \314x-$\270\4\330K\241\17aN\313[\200\f\337"
- #"PjX\232W\343\255&@T\207C\300v\257\205-[\206\232\303\"\361\340\v"
- #"p\340\326\365\340\363\275\237\336\353\2\256"
- #"\\V\375\253\277r\372\275\373\254\327\307"
- #"\36\241T\2D\325\351o\272\323\16\220P\313\2274y\v\220J_zZ\367\3"
- #"\31\277\273J\265\362n-\325\241\231$"
- #"\346\333\207\376?\25\231\241\225\266\264|"
- #"?\n\"\346\363\16^\372\364\365!\352\36z4\250\310AC\351\377\255\"-\1"
- #"\353\266}\357\341\277o\371\364{\373o"
- #"\303w\36\256\307\223\366\371\363A\277o"
- #"k\217\253\212|w\344}>\376\370c\357\313\313$r\31 \323\35D\37MD"
- #"R_\241\257\364\335\230^\233\342\316U"
- #"k\315\343_\227\326\301Dg\337q\322"
- #"\342\377\372\257\253j\20/\365\216\343r"
- #"\217P\32\365\216pti\37W=\354\253\334\361\337u\222\3578-\336*\f\271"
- #"\vKu\362\237\361\2167<\223\322\f\21\247\203/"
- #"\245%\262\213\301\227\346\301D\347\v8K\3613f\250"
-) 500
-(
- #"\276\367^\230z'\341j\217P\252\1\242\352\344\322>i\4\210\313\345H]\a"
- #"H\177\177\277655\351\360\246XSSS\252W\352\35>\221\260\265\265u\314"
- #"\211\204\343\215_\300YoWP\313\311\206I\32\343\206\en\230\370d\n?0"
- #"\257\370\271U\30\236\326$w\23\264\234"
- #"(h\255\267\342k\255\337\357\237\376i"
- #"\230z\247\340\252\307\235\367p\225\305\377"
- #"s\202\237M'\355\341\351\270\356\361\272"
- #"\16\220XT\332\305\342;D\2744FF\257'$\"\251\207\207S\326\357\265\241"
- #"A\365\227\277\f\\|e.z<\330\302-\300IC\325L\253\217\36'@\""
- #"Pi&\371\16\21o\215\221\3013\362D\32\352/<DT\377\366o\3\27?"
- #"\265\244=.2#l\361)\366\371t"
- #"\343\325\327\n\22\1\22\201\311f\222\317"
- #"\20I\262\273bZ\31\n\221\301A\325\0313\16\325_x\4?E\276:Iz"
- #"\274\241a\177\330\273\6\244\330\347S\215"
- #"W\237[\327\4H\4\246\232Ii\35\23q.\3!R\227\273\255\"\n\217a"
- #"\321\366\270j\360K\373\370\356q\2$\2\323\315\244h\aX\300\353\t\325kx"
- #"$9\323?\244h{\\u\350g\272\306K\373$\231Wi\3648\1\22\201j"
- #"fR\264\3,\300\245\207\3535<t\313\226\241;\22F*\332\36W5_\332"
- #"\307\332\347i\3658\1\22\201jgR\264\3,\305K\17\327sxh\271\34\305"
- #"\200\237J\264=\236\342.\3074{<\206~rZ\341W\276\362\25\375\321\217~"
- #"\344\362-\275\253\365$\241(\aX\222"
- #"\263\307\6\a\253\372\210z\17\17\3258"
- #"\6\374t\242\355\361\24B$\355\36\217"
- #"\241\237\234V\370\366\333o\353m\267\335"
- #"\246\367\337\177\277^\275z\325\345[{c\271LAt\3,\311\340"
- #"\352\350P\355\353\233\362\355\t\217!1\f\370jD\331\343\303\205{\n"
-) 500
-(
- #"\221\20=\36C?9\257\360\332\265k"
- #"\272}\373v\275\371\346\233\365\227\31="
- #"\221j4\313L\212r\200%\31\\\"\252==\25\aX\324\34118\350t\201"
- #"\23\303\200\257V\224=>\\\270\343\20"
- #"\t\325\3431\364\223\267\nw\356\334\251"
- #"3g\316\324\361W\251L\343~ \265"
- #"\260\316\244(\aX\322\20\0317\300\242"
- #"\16\217\336\336\241\255+\207\v\232\30\6"
- #"|-\242\354\361\341\302\35\205H\310\36"
- #"\217\241\237\274T\370\306\eo\350\242E"
- #"\213\364\324\251S>\336\336\251\321\341V"
- #"\353\35\313\242\34`\216B$\332\360H2\323*,`f\315\232\245\343W\222,"
- #"\275\224UQ\366\370p\341IBdp0H\217\217\357\247\254s^aL\341\241"
- #"\232<\345\243<\347,a\210\fv\177"
- #"C\273\37.\3075\315\16\246\333\347M"
- #"\241\262\314\301\2628\272\302\313\0357k"
- #"\367\335\27\202\366x\f\375\344\264\302\330"
- #"\302C\325\315L\212r\200\31\213\356\225"
- #"\365\332!o\23\36\25\3040\340\255<\377\16#S\205\17J\203v'\270\223\240"
- #"\253\36\217\241\237\234V\270j\325\252T"
- #"/\331\356\202\253\231\24\345\0\253\241\350"
- #"\262\24\364\21\363\235\e\3\207G\222\203"
- #"\3455\24\37\303\200O\302\323\35702"
- #"Ux\226V\220b\350\247\354W\350\231"
- #"\313\231\24\345\0\253b'w\2225\262"
- #"\340\341\221\344`y\215\305\3070\340\223"
- #"r\261!\227\305-\356,\256 \305\320O\331\257\3203\3273)\332\1VaA"
- #";(\r\272O\376\322\274F\0264<\222\36,7\24\37\303\200w!i\217w"
- #"t\250\356\337\37\240\317')<\253+H1\364S\366+\364\314\307L\212v\200"
- #"\215\332\325\223dS>xx$\335e"
- #"%b\332\34\214a\300\273\222\264\307\207"
- #"\373<\365]\267\243\n\317\372\nR\f\375\224\375\n=\363"
- #"5\223\\\r\260\264\203\244\\*\353#\267\36MT\267\210\352"
-) 500
-(
- #"\226\356r\372\34118\250\272o_\262]V\t\226j1\fx\227\\\364\2701"
- #"\253\23\31\274^\326}k\377o\362\25\244?\376\17-_\36778c\350\247\354"
- #"W\350\231\317\231\344j\200\245\25$."
- #"V\334ET\267\310KZ\356\2709\275"
- #"\364s\21\34\303\253\223\t\352\215a\300"
- #"\273\346\252\307\323\330u\353\252MFz\\\n^\ag\f\375\224\375\n=\363="
- #"\223\\\r0\237A\342r`\365\310\356\241\201\225F\3729]\"$\337\27\21\303"
- #"\200\367\301\305\341\246X\372{Lxx.>\206~\312~\205\236\2451\223\\\r"
- #"0W\275:8\250z\340\200\352C\17\251\266\267;\252I\336\326>\351Jg\351"
- #"\340|\211\340fGv\f\3\336\247\244?x\e\375X\276|\250?\17\34H\326"
- #"\347.\333D\244\302\n\222\307>\217\241"
- #"\237\262_\241gi\316$\227\3l\370"
- #"\261d\211\352\272u\252o\2755\375\347"
- #"\373\30P\"Ckd\203\322\340o\351\340#\361F\226\b\356v\300\3070\340}"
- #"s\265\e\324\262L\366\331&\323\256 "
- #"y\350\363\v\"\325\17\356@\352\276\343\323\36\364>\6X\310\307\264kdY}"
- #"x\370\t\20\0012\304\365\26w\350G"
- #"\315+H\256\37\205\202\3527\277\31z"
- #"\266VT\367\35\37b\320\347a\200\231"
- #"\326\310\262\362\360t\304\226\0\31\313\307"
- #"\26w\332\217\314\254 \315\230\241\232\301"
- #"\253|\314\20\244\256P\20\331\263G\244"
- #"\267W\244\243#t5\265\351\350\20\331"
- #"\377\243\262\374\346\341\27\244K^\r]"
- #"N\355zzD~\360\3\221\206\206\320"
- #"\225\344\336\372\365\"\277\371\215\310\276}"
- #"\21\366\371\302\217\244o\341\327e\267\354"
- #"\220\202h\350rD\312e\221g\237\r"
- #"]\305D\241\23,\264\320_\201\257"
- #"\343\22\336W\334c\333\214J\341\254\265\320\275\224e\261\354"
- #"\272\35s\274%k\203s\321\242\320\263q\202\272\357x\221"
-) 500
-(
- #"l\334\303!k\275:\3761\351\261\346"
- #"\254\357\247\360|\22M\336\357\a\342R"
- #"\226\3279\246l\223\254\f\316\5\vR"
- #"\237g\323\221\320\5\204\226\265\265\306\254"
- #"\364\352\350\2015\355\212{\326\212\236v"
- #"\211\340G\326z)\253\262\264\316QS"
- #"\233\204\356\363\256.\357\363\246Vu\337"
- #"\361Y\35\364\345\362\320\202\273\2633L\257vv\16}~M\277p\r]\264\271"
- #"p7\262\332KY\24\272U\22\265I"
- #"\210\342\e\32T\377\375\337\235\317\207\244"
- #"\352\276\343\263>\350\323\\\351\231?_\365\253_Mv\362V\352E\17?\202]"
- #"\201\3623Y\357\245,\32>\365\341\201\aT[[#k\2234\373|\327.\a"
- #"\5\273WPUM\377\320}v\24\n\5\211\341+(\225D\16\36\24\371\327\177"
- #"\259~\\\344\177\376\307\315\373vt"
- #"\210\354\332%\262a\203\207\37&\371*"
- #"z\330\374\371\"k\326\210\334w\237\310"
- #"C\17\5\377eU,\275\224e\245\222\310O~\"\362\355o\213\234;\347\346="
- #"\275\267\211\317>\357\350\20y\376y\221"
- #"\256.w\357\351\20\1\22\351\240\177\353"
- #"-\221g\236\21\371\371\317E>\370\240"
- #"\266\327\6[\356&\35h\31\v\214\361b\355\245,J\322*\301\333\304Q\237o"
- #"\374\227\177\221\3\203\203\231\353\363\321\b"
- #"\20\6=\34\241\227\340R\f\375\304\211\204\0\0\23\2\4\0`B\200\0\0L"
- #"\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 "
- #"\0\0\23\2D\206\316\370,\24\n\322"
- #"\330\330\30\272\24D\246\261\261q\244\177"
- #"D\350%$3\276\237\262\216K\231Dp\271\0\304\201^\202K1\364\23[ "
- #"\0\0\23\2\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0"
- #"&\4\b\0\300\204\0\1\0\230\20 \0\0\223\334\6"
- #"H\261X\224\226\226\26iii\221\343\307\217\207.\a"
-) 500
-(
- #"\0rgf\350\2|\2307o\236\224\313ey\355\265\327DU\345\301\a\37\224"
- #"W^yE\326\254Y\23\2724\0\310\215\\\6\310\202\5\v\344\314\2313#\377"
- #">t\350\220tuu\311\325\253W\3V\5\0\371R\27\27S\2347o\236\210"
- #"\210|\360\301\a\23\376_\f\27,C\34\350%\270\24C?\325E\200L5#"
- #"b\230I\210\3\275\4\227b\350\247\250"
- #"\16\242\267\267\267\217\\+\177\374\243\275"
- #"\275\275\342k\212\305\242477O\371"
- #"\276\225\336\217\3739`2\243\357\3310\372!B/\241vS\365S\326Eu\f"
- #"d``\240\246\277?z\364\250l\332\264I\336|\363\315)\377.\353)\217l"
- #"\371\344\223O*>\37\303\32#\262g\252~\312\272\250\266@j1\34\36}}"
- #"}\322\331\331\31\272\34\0\310\235\\\6"
- #"\b\341\1\0\376\345\362 \372\262e\313"
- #"\344\302\205\vc\236kkk\253\270\v\214\335\16p\205^\202K1\364S.\3"
- #"\244\0261\314$\304\201^\202K1\364S.wa\1\0\374#@\0\0&\4"
- #"\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0"
- #"\200\t\1\2\0000!@\0\0&\4\210\b\367m\200\331\350{9\210\320KH"
- #"f|?e\35\327\302\212\340z3\210\3\275\4\227b\350'\266@\0\0&\4"
- #"\b\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0L\b\20\0"
- #"\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23"
- #"\2\4\0`B\200\0\0L\b\20\341\36\16\260\343~ p\211\373\201D&\206"
- #"k\356#\16\364\22\\\212\241\237\330\2\1\0\230\20 \0\0\23\2\4\0`B"
- #"\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b"
- #"\0\300\204\0\1\0\230\20 \0\0\23\2\4\0`B\200\0\0"
-) 500
-(
- #"L\b\20\0\200\t\1\2\0000!@\204{8\300\216\373\201\300%\356\a\22\231"
- #"\30\256\271\2178\320Kp)\206~b\v\4\0`B\200\0\0L\b\20\0\200"
- #"\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2"
- #"\4\0`\222\373\09\177\376\274\314\236=;t\31\0\220;\271\16\220R\251$"
- #"\e7n\224k\327\256\205.\5\0r'\327\1\262{\367nijj\n]\6"
- #"\0\344Rn/\246x\366\354YY\273v\255\2348qB\226.]:\351E\311"
- #"b\270`\31\342@/\301\245\30\372)\227[ \245RI6o\336,O=\365"
- #"\224,Y\262$t9\0\220KQ\5H{{\373\310\265\362\307?\332\333\333G"
- #"\376nx\327UwwwU\357[\351\375\270\237\3&3\372\236\r\243\37\"\364"
- #"\22j7U?e].wa-^\274X.^\2748\341\371\266\2666\31\30"
- #"\30\30\363\\\f\233\211\210\3\275\4\227"
- #"b\350\247\\\6\310xS\315\210\30f\22\342@/\301\245\30\372)\252]X\0"
- #"\200\354\250\213\0Y\261bE\350\22\0 w\352b\27\326Tb\330LD\34\350"
- #"%\270\24C?\325\305\26\b\0\300=\2\4\0`B\200\0\0L\b\20\0\200"
- #"\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 \0\0\23\2"
- #"\4\0`B\200\210p\337\6\230\215\276"
- #"\227\203\b\275\204d\306\367S\326q-\254\b\2567\2038\320Kp)\206~b"
- #"\v\4\0`B\200\0\0L\b\20\0\200\t\1\2\0000!@\0\0&\4\b"
- #"\0\300\204\0\1\0\230\20 \0\0\23"
- #"\2$\200z:K\271\236\246\265\236\324\323|\255\247i\255\25g\242\a8\3333"
- #"\2063L]aZ\363\211i\315\357\347\326\202-\20\0\200\t"
- #"\1\222@\210M\333$\237\31\352\265!>\223i\365\377\332\20\237"
-) 500
-(
- #"YO\323\32\3va%\330L\264\2766\304g\206zml\365&yml\365"
- #"&yml\365&yml\365\246\211-\20\0\200\t[ \221\\w\37@\375"
- #"\371\360\303\17e\356\334\271\241\313\230\324"
- #"\314\320\5\204V\347\371\t\0f\354\302\2\0\230\20 \0\0\23\2\4\0`B"
- #"\200\0\0L\b\20\0\200\t\1\222!"
- #"\347\317\237\227\331\263g\207.\303\253b"
- #"\261(---\322\322\322\"\307\217\37\17]\216\23\227.]\222m\333\266IS"
- #"S\223l\333\266M\336{\357\275\320%y5<\17\v\205B\256\346\343T\352a"
- #"lZ\20 \31Q*\225d\343\306\215r\355\332\265\320\245x3o\336<\351\352"
- #"\352\222\336\336^9|\370\260<\370\340"
- #"\203\271X\370\334v\333m\"\"\362\346"
- #"\233o\212\210\310\227\276\364\245\220\345x"
- #"\267~\375z\351\355\355\25U\225\303\207"
- #"\17KWWW\350\222\274\252\207\261iU\367'\22f\305s\317='G\217\36"
- #"\225\237\376\364\247\271=7\345\226[n"
- #"\2213g\316\214\374\273X,\312\372\365"
- #"\353\345\352\325\253\1\253J\346\362\345\313"
- #"\322\336\336.\177\370\303\37F\236\233;"
- #"w\256\374\366\267\277\225\326\326\326\200\225"
- #"\3713~>\306p\311\215$\352alZ\21 \31p\366\354YY\273v\255\234"
- #"8qB\226.]Z7M:o\336<\21\21\371\340\203\17\2Wb\267c\307"
- #"\16\231={\266|\347;\337\31yn"
- #"\347\316\235\362\361\307\37\313\v/\274\20"
- #"\260\262tT\n\320<\251\327\261Y-\2$\260R\251$k\326\254\221M\2336"
- #"\311\226-[r\27767Z\36\246\265"
- #"\322\326F\336\27\252\243U\n\320\274\250"
- #"\347\261Y-\216\201x\322\336\336.\205"
- #"B\241\342\243\275\275}\344\357v\357\336-MMM\322\335\335\35\260\332d"
- #"\252\235\326\321\212\305\242477\247\\)\\*\26\213r\360\340A\351\351"
-) 500
-(
- #"\351\t]\212\27y\30\233\276\261\5\22"
- #"\330\342\305\213\345\342\305\213\23\236ok"
- #"k\223\201\201\201\0\25\371w\364\350Q"
- #"\331\264i\223\364\365\365Iggg\350"
- #"r\22\251\264\273*\317k\345\303\3624\17'S\217c\263V\4H\306\344}3"
- #"9o\v\236z<\210\236\267yX\255\274\217M\vva!5y\\\360\314\237"
- #"?_n\274\361F\331\266m\233\234<yR\266m\333&7\336x#\341\201\272"
- #"@\200d\314\212\25+B\227\340\315\303"
- #"\17?,\357\275\367\236|\371\313_\236"
- #"\366\30IL~\365\253_\211\210\310\272"
- #"u\353DD\344\327\277\376u\310r\274"
- #"\2524\17\3632\37\247\223\347\261i\305.,\0\200\t[ \0\0\23\2\4\0"
- #"`B\200\0\0L\b\20\324\275;\356"
- #"\270c\302\357\372\317\237?/k\326\254"
- #"\361\366\231\363\346\315\223\266\2666o\357"
- #"\17\244\201\0A\335\333\270q\243|\355k_\223R\251$\"\237]}u\343\306"
- #"\215\336>\363\v_\370\202\354\337\277\337"
- #"\333\373\3i\340WX\250{\252*\367"
- #"\334s\217\334u\327]\362\330c\217\215"
- #"\\}\365\365\327_\227B\241\20\272< \263\330\2A\335+\24\n\362\362\313/"
- #"\313\323O?-\257\276\372\252<\363\314"
- #"3\262w\357\336\252\302c\364\315\225\n"
- #"\205\202444\214\374\277\225+W\312\251S\247F\376}\352\324)Y\271r\245"
- #"\210\310\230\363&\306\277G\275\334\244\t"
- #"9\240\0TU\365\305\27_\324\271s"
- #"\347\352\367\277\377\375\252_\323\334\334\254"
- #"\305bq\344\337\243\207\324\221#Gt"
- #"\321\242E\372\356\273\357\352\273\357\276\253"
- #"\v\27.\324#G\216L\370\273%K\226\350\236={F\376\335\337\337\257\253V"
- #"\255J2)@*f\206\0160 +>\372\350#\271\341\206\e\344\243\217>"
- #"\252\3725\277\377\375\357'=\330~\357"
- #"\275\367\312\266m\333\244\253\253KTU"
-) 451
-(
- #"\266o\337.\367\336{\357\204\277;p"
- #"\340\200<\360\300\3r\376\374yy\342"
- #"\211'\344\316;\357\224\237\375\354g\346"
- #"\351\0\322\3021\20@>\273q\320\341"
- #"\303\207\345\276\373\356\223c\307\216Uu"
- #"\351\212\361\27\330\e\377\357r\271,mmmR(\24d``@f\314\230Q"
- #"\361\357.]\272$O?\375\264\374\360\207?\2249s\346Hoo\257\327_\201"
- #"\1.p\f\4u\257T*\311\346\315"
- #"\233\345\251\247\236\222\325\253W\313\267\276"
- #"\365-\331\274y\363\310\257\262\246\322\334"
- #"\334<\345\361\212]\273v\311\222%K"
- #"d\361\342\305\362\344\223OV\374\233\325"
- #"\253W\313\205\v\27\344{\337\373\236\\"
- #"\273vMv\355\332\345\365\27`\2003"
- #"!\367\237\1Y\360\354\263\317\352\335w"
- #"\337\255\345rYUU\313\345\262\336u"
- #"\327]\372\334s\317M\373\332\376\376~]\260`x\201\v\371\0\0\0\276ID"
- #"AT\201\26\213E\355\357\357\37sl"
- #"\343\300\201\3\332\336\336\256W\256\\\321+W\256h{{\273\368p@U\307"
- #"\36\39u\352\224.Z\264H\217\36=\252o\274\361\206.Z\264HO\235:"
- #"\345x*\1\367\b\20\324\275\325\253W"
- #"\353\371\363\347\307<w\356\3349\275\343\216;\252z}\177\177\277655iS"
- #"S\223.]\272t\344\371\333o\277]O\236<9\362\357\223'O\352\355\267\337"
- #"\256\252\252+V\254\230\364=F\37\224\a\262\214c \0\0\23\216\201\0\0L"
- #"\b\20\0\200\t\1\2\0000!@\0\0&\4\b\0\300\204\0\1\0\230\20 "
- #"\0\0\23\2\4\0`B\200\0\0L\376\27\e\263\207"
- #"\345q'1a\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"mix"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"line"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"sin"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:width"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"10"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 15 #"              ("
-0 0 14 3 4 #"line"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"cos"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:width"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"10"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:color"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"blue"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:x-min"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"-5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-min"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"-5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"5"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 18 #";; Error bars test"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2          35 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          12 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0\25\211IDATx\234\355\335_\210T\347\371"
- #"\a\360g\332\270*\25v\331-\246V\352\237\35JA/\22\24#5\26\274J"
- #"\e\322]BK\355M\5\301\304^mhH!\315EzQ!T\223\306\224\322"
- #"\322?\20\332x!\365J7\305R\272B\343\330\322\242BR\320\213\272+\6\265"
- #" )1ES\324\260\236\337E\273\373[u5\356\2733s\346=\363\371\300`"
- #"fv\316\274\357\311yf\277\373\2363"
- #"\363\276\265\242(\212\0\2009\372D\331\35\0 O\2\4\200$\2\4\200$\2"
- #"\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4"
- #"\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200"
- #"$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$"
- #"\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2"
- #"\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4"
- #"\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\17\224\335\201\262\325j"
- #"\265\262\273\0000\253+W\256\304\222%"
- #"K\312\356\306]\325\212\242(\312\356D"
- #"\231j\265Z\244\376/H\335\266\2146"
- #"\313\3326\267\376\316g\333\334\372;\237"
- #"ms\353\357|\266\315\255\277\355\344\24\26\0I\4\310<,\\\2700\2536\313"
- #"\332\266\2146\355k\353\267-\243\315n"
- #"\332\327\348\205U\30201\207\241i\263\330\327j\262\257\325mw.\214@\0"
- #"H\"@JP\365a\355L\335\264\257"
- #"\335\244\233\216k7\355\353\\9\205\225\3010\221<\250%\232)"
- #"\207z2\2\1 \211\0\1 \211\0\1 \211\0\1 \211\0\1"
-) 500
-(
- #" \211\0\1 \211\0\1 \211\0\1 \211\0\211\377~a\247V\253EOO"
- #"O\331]!3===\323\365\23\241"
- #"\226\230\237\333\353\251\323\371&z\6\337"
- #"\366$\17j\211f\312\241\236\214@\0H\"@\0H\"@\0H\"@\0H"
- #"\"@\200\316\327\23\21\265\0317\37r"
- #"\353\b\17\224\335\1\200\217u\343\177\377"
- #"\326\"\242\263?\230\324U\214@\0H\"@\0H\"@\0HR\371\0\31\37"
- #"\37\217\305\213\27\227\335\r\200\312\251t"
- #"\200LNN\306\266m\333\342\332\265kew\5\240r*\35 {\367\356\215\336"
- #"\336\336\262\273\1PI\225\235L\361\364"
- #"\351\323\261e\313\2268~\374x\254Z\265\352\256\223\222\3450a\31yPKm"
- #"\320E\37\343\315\241\236*9\2\231\234"
- #"\234\214\35;v\304\256]\273b\345\312\225ew\a\240\222*\31 S\247\256v"
- #"\356\334y_\317\237\232\177\177\346\315z"
- #"\16\334\315\3145\ef\336\"\324\22sw\257z\352t\225<\205\265b\305\2128"
- #"\177\376\374\35\217\17\16\16\306\304\304\304"
- #"-\217\3450L$\17j\251\r\234\302"
- #"\352(\225\f\220\333\335\353@\344p\220\310\203Zj\3\1\322Q*y\n\v\200"
- #"\326\353\212\0Y\263fM\331]\0\250\234\2568\205u/9\f\23\311\203Zj"
- #"\3\247\260:JW\214@\0h>\1\2@\22\1\2@\22\1\2t\276\251%"
- #"m#,i\333A,i\vt\276\e\37\377\24\332\317\b\4\200$\2\4\200$"
- #"\2\4\200$\2\4\200$\2\4\200$\2$\302\272\r$\233\271\226C\204Zb"
- #"~n\257\247Ng.\254\f\346\233!\17j\211f\312\241\236\214@\0H\"@"
- #"\0H\"@\0H\"@\0H\"@\0H\"@\0H\"@\0H\"@\200"
- #"\3737\265.\307\324\315\367%\273\232\365@\200\373"
- #"7\265.G-\":\373;n\264\201\21\b\0"
-) 500
-(
- #"I\4\b\0I\4\b\0I\4\b\0I\4\b\0I\4HX\303\201t\326\3"
- #"\241\231\254\a\222\231\34\346\334'\17]UK>\306\333r9\324\223\21\b\0I"
- #"\4\b\0I\4\b\0I\4\b\0I\4\bp\377\246&S\2140\231\"&S"
- #"\4\346\340\306\307?\205\356a\4\2@\22\1\2@\22\1\2@\22\1\2@\22"
- #"\1\2@\22\1\2@\22\1\2@\22\1\2@\22\1\22\326p \235\365@h"
- #"&\353\201d&\2079\367\311\203Z\242\231r\250'#\20\0\222\b\20\0\222\b"
- #"\20\0\222\b\20\0\222\b\20\0\222\b"
- #"\20\0\222\b\20\0\222\b\20\0\222\b\20\0\222T6@\32\215F\f\f\fD"
- #"\255V\213\201\201\2018v\354X\331]\2\250\224\312\6\310\360\360p\34:t("
- #"\212\242\210\203\a\17\306\320\320P\331]"
- #"\2\250\224\312\316\205\265v\355\3328u"
- #"\352\324\364\375\273\315+\223\303|3\344"
- #"\241\355\265\324\23\21\37\315\270\277 \""
- #"n\264\257yZ+\207\337M\225\r\220\231.]\272\24\365z=\256^\275z\307"
- #"\317r8H\344\241\264Z\252E\204\22\256\234\34~7U\366\24\326L?\374\341"
- #"\17\343\231g\236)\273\e\0\225\362@"
- #"\331\35h\265F\243\21\373\367\357\217\277"
- #"\377\375\357w}\316ls\357/X\260 n\334p>\200;\365\364\364\304G\37"
- #"}4\353\317\324\22su\257z\352t\225\16\220\261\261\261\330\276}{\34>|"
- #"8\226.]z\327\347u\3720\221\316"
- #"r\2670\310\341\224\3\235\347^\365\324\351*{\nk*<FGGc\335\272"
- #"uew\a\240r*\31 \302\203\256"
- #"\320\23\377\275\200\36\377\373\327*\272\264"
- #"Y%?\205\265z\365\3528w\356\334"
- #"\35\217\17\16\16\306\304\304\304-\2179\355@\263\250%\232)\207z"
- #"\252d\200\314E\16\a\211<\250%\232)\207z\252\344),\0ZO"
-) 500
-(
- #"\200\0\220D\200\0\220D\200\0\220D"
- #"\200\0\220D\200\0\220D\200\0\220D"
- #"\200\0\220D\200\0\220D\200\0\220D"
- #"\200\304\177\247\f\250\325j\321\323c6"
- #":\346\246\247\247g\272~\"\324\22\363s{=u:sae0\337\fyP"
- #"K4S\16\365d\4\2@\22\1\2@\22\1\2@\22\1\2@\22\1\2@"
- #"\22\1\2@\22\1\2@\22\1\2@\22\1\2@\22\1\2@\22\1\2@\22"
- #"\1\2@\22\1\2@\22\1\2@\22\1\22\326p \235\365@h&\353\201d"
- #"&\2079\367\311\203Z\242\231r\250'#\20\0\222\b\20\0\222\b\20\0\222\b"
- #"\20\0\222\b\20\0\222\b\20\0\222\b"
- #"\20\0\222\b\20\0\222\b\20\0\222\b\20\0\222\b\20\0\222\264,@\32\215F"
- #"l\332\264i\372\277\327\256]\e\307\216\35kUs\0\264Y\313\2dxx8"
- #"\366\354\331\23\227.]\212o|\343\e"
- #"\361\364\323O\307\326\255[\205\b@E"
- #"\264l6\336\251\231$\277\373\335\357F\255V\213\227_~9\32\215F\f\17\17"
- #"\307\345\313\227[\321d\222\34f\274$\17j\211f\312\241\236\36hu\3?\377"
- #"\371\317\343\354\331\263\255nf^\246\346"
- #"\336_\260`A\334\270q\243\344\336\220"
- #"\223\236\236\236\370\350\243\217\246\357\253%"
- #"\346\343\366z\352t-\v\220\276\276\276"
- #"x\355\265\327b\301\202\5\261t\351\322h4\32\361\315o~3\336|\363\315V"
- #"5\231\254\323S\236\31653$r\370\213\221\316v{=u\272\226]\3\31\35"
- #"\35\215\375\373\367O\a\306\363\317?\37"
- #"\a\16\34\210\315\2337\267\252I\0\332"
- #"\310\212\204\376j\244I\324\22\315\224C"
- #"=5u\4\322\337\337\37\203\203\203\21"
- #"\21Q\257\327\247\327\366\235y\253\327"
- #"\353\315l\22\200\2224\365\32\310\247?\375\351x\375\365"
- #"\327#\"bbb\242\231/\r@\207q\n+\203a"
-) 500
-(
- #"\"yPK4S\16\365\324\262\213\350"
- #"\353\327\257\217\3\a\16\334\362\330\201\3"
- #"\ab\375\372\365\255j\22\2006j\331"
- #"\307x\177\375\353_\307\360\360p\374\371"
- #"\317\177\216\37\375\350G\361\334s\317\305"
- #"\350\350h\214\216\216\266\252I\0\332\250"
- #"\245\247\260\376\365\257\177\305\223O>\31"
- #"\377\370\307?\342\v_\370B\34<x0\6\6\6Z\325\\\222\34\206\211\344A"
- #"-\321L9\324SKg\343\275z\365"
- #"j\374\373\337\377\216\336\336\336\370\340\203"
- #"\17\342\312\225+\255l\356\26\27.\\"
- #"\210\221\221\221\350\355\355\215\221\221\221\270"
- #"x\361b\333\332\3768===ew\241m\272i_\273I7\35\327n\332\327"
- #"\271jY\200\274\365\326[\261q\343\306"
- #"x\352\251\247\342\314\2313\361\324SO"
- #"\305\306\215\e\343\255\267\336jU\223\267"
- #"x\370\341\207#\"\342\310\221#\21\21"
- #"\361\320C\17\265\245\335\373\221\323T\5"
- #"\363\325M\373\332M\272\351\270v\323\276"
- #"\316U\313Na\255_\277>\236\177\376"
- #"\371\330\272u\353\364c\a\16\34\210\335"
- #"\273w\307\311\223'[\321\344\264K\227.E\275^\217\253W\257N?\266d\311"
- #"\2228{\366l,]\272\364\226\347\2261L\314ah\332,\366\265\232\354ku"
- #"\333\235\213J~\214\367\331g\237\215\305"
- #"\213\27\307K/\2754\375\330\v/\274"
- #"\20\327\257_\217W_}\365\226\347\316\347 \365\364\364$M\230WF\233em"
- #"k_[\333fY\333\332\327\326\2669\337v\333\245e\1\262|\371\362\370\347?"
- #"\377y\307\343\203\203\203-\377\222\341l"
- #"\243\215\331F%\21\363;H\251\333\226"
- #"\321fY\333\346\326\337\371l\233[\177"
- #"\347\263mn\375\235\317\266\271\365\267\235"
- #"Zv\r\344?\377\371O4\32\215("
- #"\212\"\212\242\210\243G\217\306\262e\313\3427\277\371M\253\232"
- #"\4\240\215Z\276\240\324L\355ZPj\266\323U\263\235\326\232"
-) 500
-(
- #"\352'@'\272~\375zG\177\n\254"
- #"\222\1\322\256\213\350\3354$\266\257\235"
- #"\331fY\333\346\326\337\371l\233[\177"
- #"\333\251e\247\260\372\372\372nY\377\274"
- #"\235\vJ=\370\340\203\261h\321\242\30"
- #"\31\31\211\23'N\304\310\310H,Z\264\350\216\360\0 ]K\27\224\372\352W"
- #"\277:=\215\373\320\320P[\27\224z"
- #"\373\355\267#\"\342\211'\236\210\210\210"
- #"w\336y\247\351m,\\\270\260\351\257"
- #"\331\3126\313\332\266\2146\355k\353\267"
- #"-\243\315n\332\327\34T\362c\274s"
- #"\341{ \255e_\253\311\276V\267\335\271h\351T&\0T\227\0)A\325\207"
- #"\2653u\323\276v\223n:\256\335\264"
- #"\257s\345\24V\6\303D\362\240\226h\246\34\352\311\b\4\200$\2\4\200$\2"
- #"\4\200$M\r\220\r\e6\230\353\n\240K4\365\"\372\2313gb\353\326\255"
- #"\261z\365\352x\375\365\327\243\257\257\257"
- #"Y/\33529\\\250\"\17j\211f\312\241\236\232:\2\371\374\347?\37\177\375"
- #"\353_\343s\237\373\\l\334\270q\372\333\340\0TO\323\257\201,\\\2700~"
- #"\374\343\37\307\327\277\376\365\330\260a\303"
- #"\364T&S\267z\275\336\354&\1(AK.\242\217\215\215\305\eo\274\21\177"
- #"\373\333\337\246\327\3\231\272\265z1\251"
- #"\24S\341\326\311\323&\323\231zzz\246\353'B-1?\267\327S\247k\372"
- #"\27\t\307\306\306b\373\366\3551::"
- #"\32\353\326\255k\346K\267D\16\347\31"
- #"\311\203Z\242\231r\250\247\246\216@r"
- #"\v\17\0\3225u\4\262i\323\246\330\263gO\333\246lo\206\34R\236<\250"
- #"%\232)\207z2\27V\6\a\211<\250%\232)\207z\362Mt\0\222\b\20"
- #"\0\222\b\20\0\222\b\20\0\222\b\20\0\222\b\20\0\222\b\20\0\222\b"
- #"\20\0\222\b\20\0\222\b\20\0\222\b\20\0\222\b\220\260\206\3\351\254\a"
-) 500
-(
- #"B3u\375z \271\311a\3022\362\240\226h\246\34\352\311\b\4\200$\2\4"
- #"\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200"
- #"$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$"
- #"\2$\254\341@:\353\201\320L\326\3\311L\16s\356\223\a\265D3\345PO"
- #"F \0$\21 \0$\21 \0$\21 \0$\21 \0$\21 \0$\21"
- #" \0$\21 \0$\21 \0$\251l\2004\32\215\30\30\30\210\201\201\2018"
- #"v\354X\331\335\1\250\234\a\312\356@"
- #"+\364\367\367\307\315\2337\343w\277\373"
- #"]\24E\21[\267n\215\3\a\16\304\346\315\233\313\356\32@eT2@\226-"
- #"[\26\247N\235\232\276\377\333\337\3766"
- #"\206\206\206\342\362\345\313%\366\n\240Z"
- #"\272b2\305\376\376\376\210\210x\377\375"
- #"\367\357\370Y\16\23\226\221\a\265D3\345PO]\21 \367:\209\34$\362"
- #"\240\226h\246\34\352)\253\213\350\365z"
- #"}z\256\374\333o\365z}\326m\32\215F\364\365\365\335\363ug{=\3539"
- #"p73\327l\230y\213PK\314\335\275\352\251\323eu\rdbbbN\317"
- #"\37\e\e\213\355\333\267\307\221#G\356\371\274NOy:\313\215\e7f}<"
- #"\207\277\30\351<\367\252\247N\227\325\bd.\246\302ctt4\326\255[Wv"
- #"w\0*\247\222\1\"<\0Z\257\222"
- #"\27\321W\257^\35\347\316\235\273\345\261"
- #"\301\301\301YO\2019\355@\263\250%\232)\207z\252d\200\314E\16\a\211<"
- #"\250%\232)\207z\252\344),\0ZO\200\0\220D\200\0\220D\200\0\220D"
- #"\200\0\220D\200\0\220D\200\0\220D"
- #"\200\0\220D\200\0\220D\200\0\220D\200DX\267\201d3\327r"
- #"\210PK\314\317\355\365\324\351\314\205\225\301|3\344A-\321L9"
-) 500
-(
- #"\324\223\21\b\0I\4\b\0I\4\b\0I\4\b\0I\4\b\0I\4\b\0"
- #"I\4\b\0I\4\b\0I\4\b\0I\4\b\0I\4\b\0I\4\b\0I"
- #"\4\b\0I\4\b\0I\4HX\303\201t\326\3\241\231\254\a\222\231\34\346\334"
- #"'\17j\211f\312\241\236\214@\0H\"@\0H\"@\0H\"@\0H\""
- #"@\0H\"@\0H\"@\0H\"@\0H\"@\0H\"@\0H\"@"
- #"\0H\"@\0H\"@\0H\"@\0H\"@\302\32\16\244\263\36\b\315d"
- #"=\220\314\3440\347>yPK4S\16\365d\4\2@\22\1\2@\22\1\2"
- #"@\22\1\2@\22\1\2@\22\1\2@\22\1\2@\22\1\2@\22\1\2@"
- #"\222\312\a\310\370\370x,^\274\270\354n\0TN\245\3drr2\266m\333"
- #"\26\327\256]+\273+\0\225S\351\0"
- #"\331\273wo\364\366\366\226\335\r\200J"
- #"\252\354d\212\247O\237\216-[\266\304"
- #"\361\343\307c\325\252Uw\235\224,\207"
- #"\t\313\310\203Z\242\231r\250\247J\216@&''c\307\216\35\261k\327\256X"
- #"\271re\331\335\1\250\244\254\2\244^"
- #"\257O\317\225\177\373\255^\257O?o"
- #"\352\324\325\316\235;\357\353ug{=\3539p73\327l\230y\213PK\314"
- #"\335\275\352\251\323U\362\24\326\212\25+"
- #"\342\374\371\363w<>88\30\23\23\23\267<\226\3030\221<\250%\232)\207"
- #"z\252d\200\334\356^\a\"\207\203D\36\324\22\315\224C=eu\n\v\200\316"
- #"\321\25\1\262f\315\232\262\273\0P9]q\n\353^r\30&\222\a\265D3"
- #"\345PO]1\2\1\240\371\4\b\0I\4\b\0I\4\b\0I\4\b\0I"
- #"\4\b\0I\4\b\0I\4\b\0I\4\b\0I\4\b\0I"
- #"\4H\204u\eH6s-\207\b\265\304\374\334^O\235\316\\X"
-) 500
-(
- #"\31\3147C\36\324\22\315\224C=\31"
- #"\201\0\220D\200\0\220D\200\0\220D"
- #"\200\0\220D\200\0\220D\200\0\220D"
- #"\200\0\220D\200\0\220D\200\224\240\233"
- #"\276\245\334M\373\332M\272\351\270v\323"
- #"\276\316\225o\242\227\360m\317\34\276a"
- #"\332,\366\265\232\354ku\333\235\v#\20\0\222\b\220y(ch;\2376\313"
- #"\332\266\2146\355k\353\267-\243\315n"
- #"\332\327\348\2055\217ab\352\266e"
- #"\264Y\326\266\271\365w>\333\346\326\337"
- #"\371l\233[\177\347\263mn\375m'#\20\0\222\30\201d2\357>\320}\256"
- #"\\\271\22K\226,)\273\ew\365@\331\35([\227\347'@2\247\260\0H"
- #"\"@\0H\"@\0H\"@\0H\"@\0H\"@:\310\370\370x,^"
- #"\274\270\354n\264T\243\321\210\201\201\201"
- #"\30\30\30\210c\307\216\225\335\235\246\270"
- #"p\341B\214\214\214Dooo\214\214\214\304\305\213\27\313\356RKM\35\303Z"
- #"\255V\251\343x/\335\360\336L!@:\304\344\344dl\333\266-\256]\273V"
- #"vWZ\246\277\277?\206\206\206\342\320"
- #"\241Cq\360\340\301\330\272uk%~"
- #"\371<\374\360\303\21\21q\344\310\221\210"
- #"\210x\350\241\207\312\354N\313\r\17\17"
- #"\307\241C\207\242(\2128x\360`\f"
- #"\r\r\225\335\245\226\352\206\367f\252\256"
- #"\377\"a\247x\345\225Wbll,\376\360\207?T\366\273)k\327\256\215S"
- #"\247NM\337o4\0321<<\34\227/_.\261W\363s\351\322\245\250\327\353"
- #"q\365\352\325\351\307\226,Y\22g\317"
- #"\236\215\245K\227\226\330\263\326\271\3758"
- #"\3460\345\306|t\303{3\225\0\351"
- #"\0\247O\237\216-[\266\304\361\343\307"
- #"c\325\252U]S\244\375\375\375\21\21"
- #"\361\376\373\357\227\334\223t\317>\373l,^\2748^z"
- #"\351\245\351\307^x\341\205\270~\375z\274\372\352\253%\366"
-) 500
-(
- #"\254=f\v\320*\351\326\367\346\375\22"
- #" %\233\234\234\214\315\2337\307\366\355"
- #"\333\343\333\337\376v\345\377\232\233\251\n"
- #"\373:\333h\243\352\277Tg\232-@"
- #"\253\242\233\337\233\367\3135\220\26\251\327"
- #"\353Q\253\325f\275\325\353\365\351\347\355"
- #"\335\2737z{{c\347\316\235%\366v~\356w_gj4\32\321\327\327\327"
- #"\346\236\322L\215F#\366\357\337\37\337"
- #"\371\316w\312\356JKT\341\275\331jF %[\261bE\234?\177\376\216\307"
- #"\a\a\acbb\242\204\36\265\336\330\330Xl\337\276=FGGc\335\272u"
- #"ewg^f;]U\345\277\312\247T\351\30\336M7\2767\347J\200t\230"
- #"\252\17\223\253\366\213\247\e/\242W\355"
- #"\30\336\257\252\2777S8\205E\333T"
- #"\361\27\317\203\17>\30\213\26-\212\221"
- #"\221\2218q\342D\214\214\214\304\242E"
- #"\213\204\a]A\200t\2305k\326\224"
- #"\335\205\226y\372\351\247\343\342\305\213\261"
- #"~\375\372\217\275F\222\223\267\337~;"
- #"\"\"\236x\342\211\210\210x\347\235w\312\354NK\315v\f\253r\34?N\225"
- #"\337\233\251\234\302\2 \211\21\b\0I\4\b\0I\4\b\0I\4\b]\357\321"
- #"G\37\275\343s\375\343\343\343\261y\363"
- #"\346\226\265\331\337\337\37\203\203\203-{}h\a\1B\327\333\266m[|\353["
- #"\337\212\311\311\311\210\370\377\331W\267m"
- #"\333\326\2626?\363\231\317\304\eo\274"
- #"\321\262\327\207v\360),\272^Q\24"
- #"\361\225\257|%\36{\354\261x\356\271"
- #"\347\246g_\375\375\357\177\37\265Z\255"
- #"\354\356A\3072\2\241\353\325j\265\370"
- #"\345/\177\31\273w\357\2167\337|3\366\354\331\23\277\370\305/\356+<f."
- #"\256T\253\325\342\223\237\374\344\364\317\36"
- #"y\344\2218y\362\344\364\375\223'O\306#\217<\22\21"
- #"q\313\367&n\177\215nY\244\211\n(\200\242(\212\342"
-) 500
-(
- #"\247?\375i\261d\311\222\342g?\373"
- #"\331}o\323\327\327W4\32\215\351\3733\337R\207\17\37.\226/_^\274\373"
- #"\356\273\305\273\357\276[|\366\263\237-"
- #"\16\37>|\307\363V\256\\Y\274\366\332k\323\367\217\36=Z|\361\213_\234"
- #"\317\256@[<Pv\200A\247\370\360"
- #"\303\17c\341\302\205\361\341\207\37\336\367"
- #"6\37|\360\301]/\266?\376\370\343122\22CCCQ\24E<\363\314"
- #"3\361\370\343\217\337\361\274}\373\366\305"
- #"\327\276\366\265\30\37\37\217\357}\357{"
- #"\361\245/})\376\362\227\277$\357\a"
- #"\264\213k \20\377\277p\320\301\203\a"
- #"\343\311'\237\214?\375\351O\3675u"
- #"\305\355\23\354\335~\377\346\315\23318"
- #"8\30\265Z-&&&\342\23\237\370\304\254\317\273p\341B\354\336\275;~\365"
- #"\253_\305\247>\365\2518t\350PK?\5\6\315\340\32\b]orr2v"
- #"\354\330\21\273v\355\212M\2336\305\17"
- #"~\360\203\330\261c\307\364\247\262\356\245"
- #"\257\257\357\236\327+^|\361\305X\271"
- #"re\254X\261\"\276\377\375\357\317\372"
- #"\234M\2336\305\271s\347\342'?\371I\\\273v-^|\361\305\226~\2\f"
- #"\232\246\314\363g\320\t^~\371\345\342"
- #"\313_\376rq\363\346\315\242(\212\342"
- #"\346\315\233\305c\217=V\274\362\312+"
- #"\37\273\355\321\243G\213e\313\226\25\215"
- #"F\2438z\364\350-\3276\366\355\333"
- #"W\324\353\365\342\275\367\336+\336{\357"
- #"\275\242^\257\27\373\366\355+\212\342\326"
- #"k 'O\236,\226/_^\214\215\215\25\177\374\343\37\213\345\313\227\27'O"
- #"\236l\362^B\363\t\20\272\336\246M"
- #"\233\212\361\361\361[\36;s\346L\361"
- #"\350\243\217\336\327\366G\217\36-z{"
- #"{\213\336\336\336b\325\252U\323\217o\330\260\2418q\342"
- #"\304\364\375\23'N\24\e6l(\212\242(\326\254Ys\327"
-) 70
-(
- #"\327\230yQ\36:\231k \0$q\r\4\200$\2\4\200$\2\4\200$\2"
- #"\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200$\2\4\200"
- #"$\377\a\23N$\341\360\257\17U\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 10 #"error-bars"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 24 3 3 #"(#("
-0 0 21 3 1 #"1"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"2"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"0.1"
-0 0 24 3 4 #") #("
-0 0 21 3 1 #"2"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"3"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"0.2"
-0 0 24 3 4 #") #("
-0 0 21 3 1 #"3"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"4"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"0.3"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 21 #"                     "
-0 0 23 3 7 #"#:color"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 7 #"magenta"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:x-min"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"-5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-min"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"-5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"5"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 20 #";; Vector field test"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2         149 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          69 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0 \0IDATx\234\354\235{|\24\325\371"
- #"\377?A\t* $\21\223\20\22r\217\1\r\227\200\206K@\251\205\257\26("
- #"*\242\275\200X-Z\5\304/ \340\327\276j/?\213B\275b\261\332V\1"
- #"\261 U1R\254\25)dU\360\2\212\0274@\bH\2\e\271\203\b\201$"
- #"\317\357\217\207\311e\263;s\236\311n"
- #"vfs\336\257\327\276\26\262\317\2319"
- #"3\363\314y\316\365s\242\210\210\240\321"
- #"h4\32\215\2206\341\316\200F\243\321"
- #"h\334\211\16 \32\215F\243\261\205\16"
- #" \32\215F\243\261\205\16 \32\215F"
- #"\243\261\205\16 \32\215F\243\261\205\16"
- #" \32\215F\243\261\205\16 \32\215F"
- #"\243\261\205\16 \32\215F\243\261\205\16"
- #" \32\215F\243\261\205\16 \32\215F"
- #"\243\261\205\16 \32\215F\243\261\205\16"
- #" \32\215F\243\261\205\16 \32\215F"
- #"\243\261\205\16 \32\215F\243\261\205\16"
- #" \32\215F\243\261\205\16 \32\215F"
- #"\243\261\205\16 \32\215F\243\261\205\16"
- #" \32\215\2\225\225\225\350\327\257_P"
- #"\217\231\221\221\201\v/\274\20\337~\373mP\217\333RTVV\342\302\v/D"
- #"FF\206\245mFF\6bcc[ W\301!66V\371\272\334\374\f\233"
- #"\213\16 !\302\343\361 ..\16qqqx\367\335w\203~\374\206\316\35\e"
- #"\e\213\364\364\364\240\37\327\n\343\32\215"
- #"4\222|\230\235G\222\aI\376\314\210\216\216FTTT\243O\303ts\347\316"
- #"\305\360\341\303\203\222/\203\322\322R\334"
- #"}\367\335\230;wnP\217k\27\351}\237;w.&O\236\214\322\322RK"
- #"\333\322\322R\34>|\330n\326\232EZZ\2328x"
- #"\35>|X\371\272\234\364\f[\34\322\4\235\230\230\30"
-) 500
-(
- #"\352\324\251\23y<\36*..\246N\235:QLLLP\317\321\360\321\345\346"
- #"\346\222\307\343\t\372q\255\350\334\271s"
- #"\243\363J\362av\236`\271\245o\376"
- #"\354\346\247\270\270\230\342\343\343\251\262\262"
- #"2(\371j\210\327\353\245\366\355\333\a"
- #"\375\270v\350\321\243\207\262\255\235{\""
- #"y\36\301\244\270\270\230rssE\366\235;wV\266w\3223lit\0\t"
- #"2\201\234O\362r\252\20\252\330/9ns\362\320\22\1$X\327\22\352\202\257"
- #"}\373\366!\tN\241\304\316=\221\26"
- #"\314\341\300\353\365R||\274\370\332\334"
- #"\370\f\203\201\16 AF\345\305\352\332\265+\305\306\306\22\0JOO'\"~"
- #"\271\214\277\1\240\330\330X\352\332\265k"
- #"]\232\206\277\e\337\6\3061\fbbb\32\35\247a~\272w\357N\35;v"
- #"\254\373\335h\31\245\247\247\327\375\315\367"
- #"x\3760\354\e\3326\374\267\357\365\370"
- #"\266\300\32\346\337\354\332\314(..\246"
- #"\16\35:\370\275N\177\3713C\32\320\6\16\34H;v\354 \"\242\355\333\267"
- #"\323\240A\203\374\246\315\317\317oT\260"
- #"\34;v\214\362\362\362\32\331\314\236="
- #"\233\356\275\367^\245|6\227\206\276\341"
- #"\373\\\32\336+_?\351\330\261c\243"
- #"\353\260{O\244\225\3\325\347\347\357\375"
- #"\361\365\a\203@\357\0\21\321\264i\323"
- #"h\316\2349\215\216\355\264g\350$t\0\t2*/\b\200&A\3067\360\24"
- #"\27\27\327\35\253\270\270\230\22\23\23\353"
- #"~o\370\233\3579}ky\276\377\a\320\350\5\361\315osj\355\r\377\357{"
- #"=\276\377W\275\266@\274\375\366\333\224"
- #"\224\224D\2336m\"\"\242M\2336QRR\22\255Y\263\306\366\265\4\n\240"
- #"\376\216\263p\341B*((\240\252\252**((\240g\236y\306\357q"
- #"}\v\226\305\213\27\323\330\261c\e\331"
- #"\250v\2014\f\362\376>*\205\255\357"
-) 500
-(
- #"\2654l\31\373\372TC?\361\275\16"
- #"\273\367D\365\231\364\354\331\223&O\236"
- #"L\0h\362\344\311\324\263gOS\373"
- #"\356\335\273\323\343\217?^\367\377\342\342"
- #"b\0320`\200\322\2655\374\315_K"
- #"\"\230\3170\322\320\1$\310\370:\240"
- #"\361\322\267m\333\266\356o\376^\"\263\277\371k\325\4\n \235:ujR\260"
- #"\244\244\2444\2625\253I\6+\200\370"
- #"+\340\32\326\332T\257-\20\376\322\371"
- #"\v\226v\257\305\352\267\332\332Z\32>"
- #"|8\215\349\222F\214\30A\265\265\265~\323\368p\200\272t\351B\25\25"
- #"\25DD4j\324(Z\276|\271\350\374\301$&&\206\332\265kG\223'O"
- #"\246\362\362\362\200y\360\365\23\337\2\322"
- #"\356=Q\275\316\17>\370\200\362\362\362"
- #"\352\374\346\203\17>0\2657\306\32\355"
- #"\\[\240w\311\300i\317\320I\350YXAf\312\224)\215fd\224\226\226\202"
- #"\210p\346\314\231\269\177TT\24<"
- #"\36\17\210+\a \"\354\336\275\273\221"
- #"\315\305\27_\334\"yi\230\a\"\302\226-[Z\344\274-ATT\24f\316"
- #"\234\211\325\253Wc\306\214\31\210\212\212"
- #"\362k\27\27\27\207\333n\273\r\363\347"
- #"\317\307\321\243G\361\336{\357a\344\310\221\215l*++\321\276}{\313sf"
- #"dd4\231)\26h\326X \16\35:\204\35;v\324\35\317lvRC?"
- #"\211\217\217\307\211\23'L\217\255zO"
- #"T\270\353\256\2730d\310\20\0\300\220"
- #"!Cp\367\335w\233\332\27\26\26\342"
- #"\310\221#u\327\326\273wo\323\331\217"
- #"\201\336\201\366\355\3337\231\222\e\314g\30q\204/vE&\376\6\341Tj\306"
- #"\241\354\302\n\324\224W\371\277\31fi"
- #"\375]\217\277|\330\355\302\362\355\262\362"
- #"\355\322j\356\265X\375V]]M\5\5\5\364\323\237\376"
- #"\224\n\n\n\250\272\272:`z\243\6\373\304\23O4\351"
-) 500
-(
- #"\372 \362\337\357\36*\314\272\347\2\375[\365w\225{\"-rT'\237\f\30"
- #"0\240\221\277=\366\330c\224\232\232\352"
- #"\367\274f~\eh,\303I\317\320I\350\0\22\2\32\26n\252\5\233\2774\201"
- #"\2C\347\316\235M_\b\243\360\366-"
- #"\234\375\331\6J\253\202\331\261$\367\300"
- #"\354\332\314\360Mg\247+L\305\326\337"
- #"\261\347\315\233G#F\214\240\232\232\32"
- #"\32>|8\315\237?\277\356\267\230\230"
- #"\230&\223\6f\317\236M\351\351\351~\273>Zr\6O\303k1\253\330X\5"
- #"\20\351=\361w\276`\"\36173\2775\233\205\345\224g\350$t\0\t\21F"
- #"\237\254\261\36\244!\201jU\276i|"
- #"\355\214\0314)))\215~\363\265\223\234;PZ\225\1Y\325c\251\344#\320"
- #"\265Y\3210\235U\376\3140\263\365\267"
- #"\346\301l\306Qlll\223\202\362\365"
- #"\327_\247\266m\333\322\261c\307\32\375"
- #"\275\245\a_\215g\2\240\311s1\363"
- #")\337\277I\357\tQ\350\247C\253\372"
- #"\233\212\337\372\vtNy\206N\"\212\210($}c\32M\0041g\316\34T"
- #"UU\341\321G\37\265\264\358p \36y\344\21\f\36<\30\0\260f\315\32"
- #"L\2348\21EEE\350\333\267o#\333{\357\275\27\347\237\177>\36z\350\241"
- #"\220\344;\224H\356\t\300c$n)n|\363\32\251\317\260\271\350\0\242\321("
- #"PYY\211\261c\307\302\343\361\210\322edd\340\340\301\203X\265jU]@"
- #"i\370\333\376\375\373\261c\307\216\26\233"
- #"\330\20L*++\221\225\225\205.]\272X\312~ddd\340\360\341\3038t"
- #"\350P\v\345\256y\304\306\306\"&&"
- #"\6\245\245\245\21\375\f\233\213\16 \32"
- #"\215F\243\261\205\236\306\253\321h4\32[\350\0\242\321h4\32[\350"
- #"\0\242\321h4\32[\350\0\242\321h4\32[\350\0\242\321h4\32["
-) 500
-(
- #"\350\0\242\321h4\32[\350\0\242\321h4\32[\350\0\242\321h4\32{\204"
- #"OE\305\31\300d\203\236H\374\24\2\364\2760M\27\200>\25\330\267\3h\253"
- #"\360\34\2456\256e\e@\347\b\354\277\2\350|\201\375\6\200R\205\327@\r>"
- #"v\256I\177\232\367\211\2\350n\2006"
- #"\n\322t\0\350\v\201\375\271\0\225\b"
- #"\363u\16\330_\245\327s\374\370\361p\27\221\246\350\0\2\301-8v\214()"
- #"\211\350\254`\234(\255\335s\0061\355"
- #"\325\0\347\277\201J\251\22\277\375-\375"
- #"Er\336\17> \352\327\217\210\4\371\365cg\2316>\236h\337\276\0\207\363"
- #"\223\266\177\177\242\365\353\25\262r6\355"
- #"C\17\21\215\30aiozN\267\245\335\276\235\250[7\366\365\226:g\260\322"
- #"\346\346\22\r\32Dt\325UD;w\252\247}\3555\323\347\334$]y9Q"
- #"\203\355\246\315\250K\273w/QB\202"
- #"R\232\200\347u \255\276\v\353\24\0\370l \23\2207\336\0**\200\333n"
- #"\3jkC\231\255\340\343\361`1\0,[\6\370\210\301\231r\3724\360\227\277"
- #"\340I\311\271>\376\30\310\317\227\345\317"
- #"\16\361\361@e\245\272\375\200\1\300\206"
- #"\r\352\366\323\247\3\273w\3\257\277."
- #"\317\233\23\250\254\4\272uS\367\357\332"
- #"Z\366\355\362r`\325\252\320\346-\24"
- #"x\275|\255\357\274\3\244\245\251\247{"
- #"\363M\340\232k\324\355\367\356\5\272v"
- #"\225\345\255\262\222\3755\302h\365\1\244"
- #"\35\0004\330A\320\224\25+\370\233\b"
- #"x\372i\264k\327\316:\215\364%\266"
- #"@\351\234\376\2305\v?k\333\26\360"
- #"\21\203\263\344\225W\200\234\34\354\220\234"
- #"w\323\246\240\4\20\313k5\t ~"
- #"\323*\6\220\272\264\321\321\300\237\376"
- #"\4L\231\2\364\350a\231\2569\330~\256fi\347\315\343"
- #"\n\317\274yji\27,\0\214]\4\r_W\301\343\341"
-) 500
-(
- #"\2U\321\307Cr\255\0p\350\20\260m[\3755\250\244%\2V\257\226\a\220"
- #"\304D%\323\272s\352\0\22\301|\360\201\232\335'\237\360wq1\360\31438"
- #"u\352\224u\32\205\227X\202\3229\375\361\376\373X{\372\264<\335SO\1S"
- #"\246\310\316\e\244\0by\316\370x\256u\252\246U\f \215\322^{-p\346"
- #"\f\360\325W\226\351\232\203\345\265\232T"
- #"D\2\246}\343\r\376~\377}\265\363"
- #"\316\237\17\254_\317\377\336\265\313<?"
- #"\6\36\0170z4\260o\237\262\217\333\366\341P\244\375\362K\240]; ;["
- #"\375@\373\366)\267@\352\316\351\365\352"
- #"\0\22\261\274\367\236\232\235\361R\21\261"
- #"\343\251\240\360\22;\226\304D`\363f"
- #"Y\227\327\311\223\300\216\35\300\245\227\206"
- #"._\6\t\t\262.\254\356\335\201\266m\201\235;e\347y\371e 7W\226"
- #"&\330\330\251\210\224\224\360\267\252\177\177"
- #"\363\r\3736\300\317]\205\t\23\200#"
- #"G\370\337n\363\361\274<\340\27\277\0"
- #"\256\276Z\226n\337>\345\26H\35\225"
- #"\225\354\257\21\206\16 \241\306\317Kl"
- #"\331\204\17r\267\227m\274^\240\252\n\30>\\=\315\347\237sa\e\35\r\240"
- #"y\335\25\226H\307@\0\240\177\177\340\326[\201K.QOSX\bl\335*"
- #";O\260qXE\244\356\271\226\225\1+W\2\243F\251\a*\247\370\367\360\341"
- #"\300G\37\1k\326\230\2325\361aA\27V\35\272\vK\23,,\233\341A\356"
- #"\366\262Mj*0y2\260v\255z\32\237\1\364\346t9Xb'\200|\375"
- #"5w\273\204xL#\350\224\224\0007\336\b\334sO\270s\2\300\347\271\n\272"
- #"t\08\307\277g\316\4\322\323\201\27^05k\342\303\322\353\5\"6\200\234"
- #"\e\356\fh\374\340\224\332fY\231<\315\3\17"
- #"\0\207\17\3\377\371\217\274\253H\302\361\343\300\366\355"
-) 500
-(
- #"|\257rs\325\307(~\364#\16\""
- #"7\336\30\272\274\251\220\234\f\374\343\37"
- #"\262I\r\335\272\1{\366\204.Ov"
- #"\221v\3518\305\277\343\343\1\213\235\24"
- #"\233\220\223\303\3\365\333\267\3#G\252"
- #"\247\213\320\0\242[ N\344\316;\201"
- #"\251S\325\273\4\234\304\341\303@\207\16"
- #"\300\342\305\352iRS\371[2\365\262"
- #"\177\177\2569\36=*\e\237\2309\23"
- #"\310\314\224\275\374\241\240\274\34\30?^"
- #"\226\246[7N\3474\244]:n\366\357Q\243\370{\364h\365499\334M"
- #"6|8\267xTHK\2030\264\205\5\35@\234\310\216\35\\\310\271\221\254,"
- #"\236W/\251Y\367\351\323\370[\205\347\236\343V\b kM\304\307s\355\261c"
- #"G\3654\241 #\38\377\374\372Ak\25\234\32@\244]:n\366\357\2313"
- #"\371\331\315\234\251\236\306\b:11\352"
- #"\25\253\305\213!\354\234\r\v:\2008\21;/XZ\32\20\e\e\232\374H\330"
- #"\266M\276\326\344\346\233\e\177\253PX"
- #"\b\24\25\361\313\34\356\326\204\35v\354\0\3169\aX\267N=Mr\2623\273"
- #"\260\244\v\353\354\370wF\6\317\242\v"
- #"7\361\361\234\377\213/VOc\214\265"
- #"\24\25\251\277\e\205\205\30h/\207-\212\36\3q\"\333\267sM^\25\217\207"
- #"gK\271u\232\340\265\327\362\365J\26s\1\34Dv\354\bM\236Z\202\333o"
- #"\a\236}\26\270\352*5{\247\266@\244]XR\377\6\270\313\350\374\363ei"
- #"\234\202\235\261\26\227\320\352[ \342\311"
- #"\231vf\357H\323t\354(\253m\315\232\305k\25T\247\232\16\32do\360\360"
- #"\314\31u\373\354l\240\246F\315\266cG\266\225t+UW\313\n\241\352j\276"
- #"\6U\252\252d\317-#C\336g\375\363\237\313&*$&\2qq"
- #"\262s\264\204\277^|\261\254F.\365o\200g\367M\233\246n\337\253W"
-) 500
-(
- #"}\27\247\n\241\364o\203\214\f\221\271\eBN\253\17 =\245\tT\27\0206"
- #"'\315\226-\274\340M\225\367\337\227u"
- #"\e\215\37\317\205\227\344\5\250\255\225\25"
- #"v\307\216\1\373\367\253\333Kgl\358\300\3\350\252TT\360\"GU\266l"
- #"\1\332\267W\267/-\205\254x\0\a"
- #"\203\215\e\325\355\317=\227\363%\241%"
- #"\374\365\263\317\270;N\25\251\177\3\334"
- #"\312\226\4\251\254,\231\206Y\250\375\e"
- #"\20\373\270\342p{Xi\365\1\244U2i\22\353\5Ij\360\231\231\334\365\240"
- #"\212\2355\32\22\366\357\a\272tQ\267//\347. UZJ\20R\23\32\256"
- #"\277\236gz\251\3424\377v\t:\200\0\210\212\212BTT\24\242\317\256\2366"
- #"\245\262\222\a3%\315c\247\321\246\r\317\2341$(T\310\312r\326\vf'"
- #"\200$'\253\333+\352yEGG\327\371\17 \364%'\22\t\376\r\360\314'"
- #"\311\272\v\207\370\267\257?9\35\35@"
- #"\0\20\357\213\202\323*b\203\363\346\271W\356\272!ee\254^\252Jf\246l"
- #"\300\332D\3500(|\373\255\254Kc"
- #"\317\36Y\v\344\265\327\200?\376\321\322"
- #"\354\364\351\323u\376\3\b})\224\330"
- #"\225\v\211\24\377\356\330Q&\200\351\20"
- #"\377\366\365'\247\243\3\210\224\177\375\213"
- #"\277%r\327\0\277\224S\246\3105t\234\202\364\5\223\n\35J\tu\27\326E"
- #"\27\311\26C:\r\273r!\332\277\325"
- #"\b\265\177\273\4=\215W\312\377\373\177<\206 \35\364\0356L\326Dv\32w"
- #"\337-\353\362\nu\v\304N\0\0314H\335~\3336y\236BAb\"0v"
- #",0{6\220\224\244\236\316\256\\\310\333os\27Vk\364\357]\273x\275\206"
- #"\312\265\207\332\277]\202n\201H9~\234\327-|\372\251,\335\332\265"
- #"\334\317*)\4\234\304\342\305\262\2\333Ic 99\2741\326\3\17"
-) 500
-(
- #"\204.?\241\302\353\345\215\236\206\r\223"
- #"\245+)\341\5\226\263f\311\322\31\255"
- #"\264\226\362o\247\264\\\26/fI\35"
- #"\325V\247\36D\a\240\3\210\34\273\272\376\35;\2\a\17\312k\26699<c"
- #"*%E~\316`RX\250\236w_\241\303P \31\3\261\243_\344\24RS"
- #"\201\363\316\343\255\210\245t\355\312\223%"
- #"Z\2\273\376=l\30\a\310p\327\346\v\vy\\Pu:\374\257\177\r\274\370"
- #"\242L\277-\2\321\1D\212]U\315\242\"~Y.\270@\226n\344H\16 "
- #"7\335$?g\270\260+t\250Jj*\360\352\253\300\270qj\v\322\354\350\27"
- #"\205\202\36=\200w\337\225\245)+\343"
- #"\5tK\226\310\317\227\230\330r\1\304"
- #"\256\177_s\r\320\263g\275\240\246["
- #"\260\243\337\246JJJ\300my\235\206\16 R\354\6\220\25+\344\22\342'O"
- #"\362\2\252\204\204\360\27~\22\244B\207"
- #"\306\n\361\250(5\265R\343\245\355\326"
- #"\r\2301\303\332\336\216~Q(\370\352+.0\245Ad\306\f\256\355\356\335+"
- #"K\227\230(Oc\27;\376\275z5\von\334ho\353\200p\"\321oK"
- #"K\253\17\b*j\b\367\337\17\24\24\330\317[\v\242\3\210\24;\1\344\350Q"
- #"\226\256\226\210\376\325\326\2?\375)K"
- #"2\354\335++\374\362\362\270_\271\242"
- #"B\226\317`!\25:4\272\230\22\23\325\372\240\215\202*#\203\a?\335Bn"
- #".\360\373\337s\313I\22D\342\342\200"
- #"\333n\343=\313%\264T\27\226\35\377"
- #"\256\254\344\311(K\227\262\374\277\2043"
- #"gX84\234\342\212\22\375\266\305\213"
- #"\353\307xT\272Q\357\270\3\270\360\302"
- #"\346\345\257\245\240V\216\370\26\\z)\321g\237\311\322,^L4v\254,\315"
- #"\375\367\23\r\35Jt\372\264,\335\261cD#F"
- #"\20\1D\351\351\262\264\341\302\353\345\274z<j\366\307"
-) 500
-(
- #"\216\21ef\22\355\330\21\332|\tQ"
- #"\366\245M\233\210\222\222\210\326\254Q?"
- #"\370\201\3D]\272\20UT\250\247\371"
- #"\370c\242\276}\325\355\r\244\357\204\324"
- #"\277kk\211\256\271\206\350\301\ae\347!\"z\347\35\242\36=8\2173f\310"
- #"\323\207\213\342b\366\361\312J5\373\355"
- #"\333\351\204\v\212g\347\3470\304\210\3"
- #"H\227.\352N`0j\24\321\362\345\352\366K\226\20ed\20\355\337\257f\177"
- #"\354\30\321\322\245Dc\306\20\305\304\360"
- #"wv\266z\201\254\221S\\L\224\233\333\350O\"_\262\23Df\317&\272\367"
- #"^u\373\212\n\242\204\4u{\3\351;!\365\357\205\v\271rTS\243\236\246"
- #"\274\234\350\346\233\211z\366$Z\273\226"
- #"('G\376\36\272\f7\324\357\235\237\303f\262}\373v:\357\274\363\2\376."
- #"~H\227]FT]-Ks\371\345\\\310\253\322\277?\327\36U\271\342\n\16"
- #"\32K\227\252\235\247wo\231=\21\321"
- #"\300\201\262\32\177^\236\354\232\263\262d"
- #"\367\365\304\211&\5\270)\273v\21\345"
- #"\347\253\333/]jn\237\232\312\5m"
- #"\203O\251\324\227\212\213\211\6\fP\267"
- #"\367z\211\6\17V\267?s\206\237\203\224\36=d\366R\377\36<\230h\373v"
- #"\3319\6\f \2327O\275E\236\227G\364\363\237\363=&\"JI1\178"
- #"\3\6\310*\\\227^Jt\360\240\272=\221\254G\340\304\t\332\252\3Hx\251"
- #"\256\256\246\202\202\2\323 \341\206(\37"
- #"t\374\265Xrs\315_\240\205\v\211"
- #"\n\n\324\v\371\en\340\226\224*\211"
- #"\211\262\356\231u\353\270\340R\345\372\353"
- #"\211~\373[k\273\252*\242I\223\370~\224\224\250\37\237Z\251/9\225\3\a"
- #"\210\36}\224\237cn\256u\227\227\264Ex\363\315DO<!\313\223\304"
- #"?\326\255\243\17\\\340O\21=\210"
- #"\376\330c\217\241S\247N\341\316\206\363"
-) 500
-(
- #"\350\330\221\a\350_{\r\330\275\233\a"
- #"\245\275^`\302\204\300i\214\201\275\307"
- #"\37W;\307\2157\312\3440\272v\225"
- #"\315\30\332\260\1\0300@\315v\315\32\26G4\233\311fhG\215\30\301+\221"
- #"=\36\336\363A\343N\342\342\200{\357"
- #"\345=r\236y\206\267\223}\371\345\300"
- #"\366}\373\362\304\217[n\1\336y\307"
- #"\372\370\267\334\2,Z\24\274\374\372\262"
- #"a\0036\204\356\350\301#\334\21,T"
- #"|\371\345\227\324\245K\27\332\265k\227"
- #"n\201\4\213]\273x\f\350\313/\255mO\234 \212\215%:rD\355\330#"
- #"G\22\275\376\272z^F\217&Z\266\314\332\256\272\232\250W/nq\2311}"
- #":\327\20\207\f\341\256\37\eh_\212\0T[\"55D\311\311D\237~\252"
- #"~l\211\177\214\36M7\271\300\237\""
- #"\262\5RSS\203\333n\273\r\277\377"
- #"\375\357\321\335\t\373(G\n\335\273\263"
- #"\34\310O\177j\275k\335\5\27\360V"
- #"\255\206&\223\25\322)\247\e7\252\265"
- #"@\236\177\236[\\?\371\211\271\235Q"
- #";\255\256\346\215\2334\255\223\276}y"
- #"\335\315\2301\346S\255\333\264\1~\366"
- #"\263\320\tnn\334\350\212\26H\24\221"
- #"Kt\203\5\314\237?\37k\326\254\301"
- #"\233o\276Y\247\255\37\3502\3\351\356"
- #"\267m\3336\374\222\334N\244\266\226\327"
- #"\301\348\300C\307f,_\16\274\364"
- #"\222\332\316p\17>\330\370\333\214\322R"
- #"`\350P\353\375\301\23\23\201S\247\200"
- #"\277\376\25\270\341\6\353\343*\22\35\35"
- #"\2153\202\355O\265/\271\214\2644\26VLK3\27V\334\266\215\327<\225\227"
- #"\253\355\260\30\25\345\367\235\361\365\247\f"
- #"\0\353\1t\3\34/\353\36\221-\220'\237|\22o\275\365\26\332\264i\323h"
- #"\243\237\214\0{\22\323Y\375\375\206\237\200/\274\307\303\265e"
- #"\351>\v\221B\2336,#\242\"Q\222\227\a\274\365\226\232"
-) 500
-(
- #"P\236d\325\364\206\rj+u\275^V\20\276\377~\265\343*\322p\317\206\206"
- #"\37@\350K\241\242\262\222}T\272\342"
- #"\335\300\343\t\277\366Z8)+\343\202"
- #"\336J\2257;\233\357\323u\327\261\257\333\304\327\237v,Y\202\244 VxB"
- #"ID\6\220o\276\371\306\357\213]Z\32\204m\352'N\344\256\26\351>\v\6"
- #"\221\360r\26\26\362\340\244\25#G\2UUjBy\252]Xyy\300\357~"
- #"\247\246A\224\232\nL\236\314J\261\255"
- #"\211y\363\370^N\234h/\375\370\361"
- #"\274\1\227\35\"\301\277%\34:\304{\250\214\30\21\274cN\235\n\349\2W"
- #"\350v\267\324`K81\273L\361-"
- #"X\276\234\350\342\213y\255\206\224\232\32"
- #"\242\213.\222/\324r+\305\305D\35:\250]ov6\333eg\233\333\31\203"
- #"\335\31\31\301\311c\20\t\352\353\224\234"
- #"\254v?\374\321\277?\177\356\270\303\336"
- #"\271\377\372W\242\2708y\272\326\346\337"
- #"D\354\343ii\326\213\32U\375\233\210"
- #"\355\332\264\241\22\27\334\307\210l\201\370"
- #"\322\303j\300WBE\5\v\250}\370\241<\355\202\5\274_\202\35\205ZC\326"
- #"\335M\223\2\n\vY0/+\313\332VUr}\346L\26\\|\341\205fg"
- #"\317\321\214\e\307\337\335\273[\2175\371"
- #"\362\341\207\254\336k\354.(\345\3301"
- #"\36 \226\22\f\377V\25\324t\n\205\205\334\325e\245U'\331R 5\25\270"
- #"\353.\bw\200\t\17\341\216`\341F"
- #"|\v\356\272\213\350\311'\345'\372\362"
- #"K\236\2\273k\227,]u5\321\263\317\22u\356\354>\375\37\t^/\267*"
- #"\\,O\321\304\227\32\256V\227\266$"
- #"\214\373\321\267/\321\270qD\337\177/"
- #"\317PF\6\321\27_\310\323\331\361q\273\376MD\264g\17Q\237>|"
- #"\237:t\220\255\b\317\311!\232<\231\245N\234\214\r\377vC\361\334*"
-) 500
-(
- #"Z Ae\307\16\336?YBM\r"
- #"\253\251\376\376\367\262\26\304\177\377\v\344"
- #"\347\3\177\3763K\244\333\331\323\"11\274\312\274\2528Er=\230,^\\"
- #"\2574\273{7\17\266\276\364R\275\324"
- #"\275\31\306\375x\377}\236\22}\305\25<3H\302\210\21,\227.E\352\343v"
- #"\375\333\330\215\360\322K\371\372\262\2639"
- #"\277*\233:\235:\5\254_\317\347^\260@\266]q8\210D\377\6\\\20\342"
- #"B\214\370\26\244\245\311u|\346\315c"
- #"\205\334\332Z5\373\317>#\272\372j\242\356\335\211^~Y-]e%/\202"
- #"**\"Z\260\200\205\367\306\217\257\257"
- #"\1gf\312\362\254i\314\236=\\\323"
- #"5\21'\364\353K\305\305\334\372\330\261"
- #"\243\251|\214D\213\354\361\307y\354m"
- #"\335:\365<\277\361\6\321\260a\352\366"
- #"\6R\37\227\372\367\266m\354\233qq"
- #"D\277\371\215\232h\350\311\223|\355\17"
- #">Ht\345\225|\17\257\274\222\350\246"
- #"\233\"\266e\356\206\342\331\3719\f1"
- #"\342\207\224\227'\227X\227\n\21\366\351"
- #"Ct\337}DG\217\252\331\17\36\314\1b\350P~1\347\314\341 RT\304"
- #"\335(\276M\374\313/\17l\277n\235"
- #"\177%\337\334\\Y\236\244\327\234\235-"
- #"\273\257^\257L\34q\371r5i\363"
- #"\352j\242\325\253\271`\352\325\253\376\357"
- #"\351\351M\304\23m\213)6\324\"+(\b\3765\30\34?N\324\257\237\272\275"
- #"\201\324\307\245\317:?_\336\3554`"
- #"\0\a\214\a\37$Z\277\236\350\324)\376\273!\355\357\3335d\346\343\t\tM"
- #"\317\337\263\247,OR\301S\"\231\217{\275\364\261\16 \316\307\rQ>$\4"
- #"j\261\304\305q\201\230\226\326\330\276\274"
- #"\234\177\217\215%\232;\227E\a\315\220\212/ff\312\304\v\247M\343B\301"
- #"\212\232\32\242\251S9\220\372\356\343\342"
- #"\365\262lEe%\321\326\255D\263f"
-) 500
-(
- #"\21u\355\312\371^\270\220\350\360\341z"
- #"[\243\5\222\232\32\360T\255\326\227\234"
- #"\212U\253\274\341L\276\375\373\2715\24"
- #"\27\3076\333\266\231\37{\365j\366\235"
- #"\335\273\325\363#\361\361i\323\350!\27"
- #"\370\223\363s\30b\364K\357C\377\376"
- #"\3465\261\265k\271f\336\2737\321\212"
- #"\25\365\5\260/\265\265D\303\207\23\315"
- #"\237\257v\336\377\371\37\242U\253\324l"
- #"\313\313y\300\366\300\1s\273#Gx"
- #"\343\242\241C\375\333\32S\202\23\23\371"
- #":f\315\"\372\352+\265<\370A\373\222K\360\327*70*\n\235:\21\335"
- #"y\247\371\276:s\347\362{\360\335w"
- #"j\347U\365\361\263\376\35\347\2\177\212"
- #"H)\23\tf2'\232\0\324\324\0\177\377;p\337}\274\322{\306\f\377\v"
- #"+w\357\6\372\367\a\326\255\263\326\316"
- #"\232:\225\247oN\233f}\376{\357\5\316?\37x\350!\377\277WV\362\344"
- #"\203\370x\36\f~\341\5\266\367%%"
- #"\205\27\314\365\353\307\332Z\347\234c}"
- #"n\23\264/E\20\345\345<\345\366\223Ox\"D\240\301\375_\376\228x\20"
- #"\370\347?Y\245\301\fU\37?\353\337"
- #"Q\177\374\243\343\375I\317\302\322\3109"
- #"\347\34~q\214\31%\201d\262%\342"
- #"\213\231\231<K\305\212\212\n\336G{"
- #"\372\364\3006\363\346\261]\\\34\260l"
- #"\231\377\340\1\0\337|\303\235\31\37}"
- #"\324\354\340\241\2110\272u\3N\234\340"
- #"\177\177\367]\340\255\16\236|\222+JW_m-\331\243\342\343*\376\355 t"
- #"\vD\327\32C\213\252\370bN\16\213\323eg\3%%\201\355bc\201\316\235"
- #"\315u\212\222\223\271\69p \360\336{\366\363.D\373R+%;\e\330\276"
- #"\235\377m\345\343\373\367\263\374I b"
- #"c\201\303\207\201\314LD\355\330\341x\177\322-\20Mh"
- #"Q\25_T]\251{\321E\326\22\332{\366\360\213\334\202\301"
-) 500
-(
- #"C\323\212Y\273\2265\327RS\315\355"
- #"\256\277\236\203\203\31\235:\361\261\326\255"
- #"\vV\356B\212n\201\350Z\2433\250"
- #"\254\344\305`\357\277\357\332\305V\332\227"
- #"4\246TV\3626\4_\177\255d\356\6\177\322\1\244\301~ z\337\6\215\224"
- #"@{\203h_\322\330\301\327\237\234^"
- #"<\353\0\342\202(\257q\a\332\2274\301\304\r\376\244\307@4\32\215Fc\v"
- #"\35@\354\220\226\306\263%\354P\\\314i\355JV\333\21G4\4\31\35^\233"
- #"\211(\f\241@\225\335\30}IIaY\363\344d\236\231&%6\2267\350\262"
- #"\373\274\335\346\337\0O\23\267\273\3\243"
- #"\3066\272\vK\332L\364x\200\233n"
- #"\342\251\244*\273\362\1\274\320h\361b"
- #"V\324\5\370\305~\3569s\325\321o"
- #"\277\345B\250\242\202\327+\30\377^\262"
- #"\204\177\317\314\254\237:h\305u\327\361"
- #"L\221\374|\340o\177\343\2\302\212\36"
- #"=\200g\237USF\215t\312\313\201\207\37\346\305b&\273&6\362%c_"
- #"m\200\367cOJ\2\22\22\232~\307\3055=\320\214\31\300c\217\1\227_\316"
- #"\323>\1\340\232k\370s\345\225\254\316"
- #"kF\217\36\\\210GG\253?\357\206\334q\a\260j\225z!\36n\377\68"
- #"\340&&\362\232$\25\237u\201\177\273\241\vK\a\20\351C\328\20x\344\21"
- #"\231\343]~9\317\1\2374\2117\240"
- #"\261\242\260\220\267\201MJ\342\332h\267"
- #"n\365\377\236:\225\267\212\235=\233\377"
- #"\6\260\314\273\325\376\315\6\231\231\\h"
- #"\355\335\313\265\324\213/\346Ob\"\177"
- #"'$\360g\310\20\266[\271\222\257\265"
- #"_?\240cG.\300\256\272\212\345\267"
- #"\333\265\253_\365\275ys\343\331S\275"
- #"z\361\366\263\252\327\334\257\37o>\245"
- #"2\3\313(\320\377\373_\340\213/\314m\267m\343U\304"
- #"o\276\311\205\361\246M\365\351\227/\a\376\372W^M_"
-) 500
-(
- #"Q\301\367\274\341wB\2\357\277\3360\30\230\260\23@\272\341K\36\17OI>"
- #"r\204\367\205\367=\266\361\235\234\314\265"
- #"\366\206\370\316Hkx\r\307\216\361\337\255 \342V\347\222%\274\312^Ba!"
- #"\360\312+\352\263\341B\355\337\200\272\217"
- #"\247\247\3\245\245@A\1\337\307@\201"
- #"{\304\b\256\4\276\361\6\373\367\25W"
- #"\360\372\f\177y\2324\t\30;\266q\236\372\364\341i\2737\336\310S\320;v"
- #"\264\316\233\252\217\237}v\37L\236\214"
- #"+\34^<\353\0\342\202(\337l\216\37\az\366\4~\374\343\372\227\340\350Q"
- #"\256M\357\337\317\337\225\225\\+\334\267"
- #"\217\277\337x\203\323\246\245\361\213{\352"
- #"\24\360\301\a<?}\335:`\313\26\16\22m\332\360\276\f\367\336\333X\316D"
- #"Z+\2353\207\367O\177\364\321\300\327"
- #"\341\361\0\267\336\312\213\22\307\217oZ"
- #"\310\0306w\334\1\f\e\6\374\373\337\3747\337\332{\303\205_II\334B0"
- #"k\35\30\255\316}\373L\273\205\232\370"
- #"\222\221\27\325\226\252\306>iiM\3"
- #"\317\301\203\201\3\367+\257\324\2473\2"
- #"\223U\253(#\243~%\371\361\343\374\216\254X\301\376?t(/\2005k\325"
- #"\250\370x\203\326c\372\177\377\213\235N"
- #"/\233B\254\265\345x\364-\b\200\231\340\34Q\375\376\f]\273\262 aJJ"
- #"\340c\255_\317\3737\370*\3746\304\353eYz\253<\245\244\230Kn\247\246"
- #"\362~\342\217?\36X\371\264\241\234\272"
- #"\352\336\366\305\305,io\202\366%\27"
- #"a\345\337\22[\303\237\202\341\34311DYYD\265\265\256\360'\335\2i\r"
- #"-\20M\213\240}I\23L\334\340Oz\26\226F\243\321hl\241\3\210F\243"
- #"\321hl\241\3\210F\243\321hl\241\3\210F\243\321hl\241\3\210"
- #"F\243\321hl\241\3\210F\243\321hl\241\3\210F\243\321hl\241\3"
-) 500
-(
- #"\bx\276uTT\24\242\243\243\303\235\25\367\221\227g-~\247\"\260WY\311"
- #"{\250\233a\210\374\231\235+%\205m"
- #"\236x\"\260\20\341\361\343\300K/\261"
- #"F\230\325N\211\26DGG\327\371\17\240})\"\261\22x4\374\311\312\307\25"
- #"D*\17GEa_T\24\3324\330\247\310\311\234\e\356\f8\1\247/\326i"
- #"6\307\217\263\16\317\337\376\246\256\341\225"
- #"\230\330X\377\207\210e \312\312\200\335"
- #"\273Y\ej\327.\226\177X\260\2005"
- #"~JK\353\323\373J\231\304\307\327\377"
- #"\333\37\363\346\1~6fj\304\342\305,e\322\263g`)\223q\343\200?\375"
- #"\211\245J\236z\212\377\346+e\222\227"
- #"W\257mu\321E\300=\367\230K\231\230\210)6\3344\312\r\v\2774g\361"
- #"\365o \260\224\211\327\313>\376\357\177"
- #"\327K\340\370\2232IH`)\223@\245Q48\0\0 \0IDAT\f"
- #"\37\316\"\225&\304\344\346\2\261\261\250=+e\342t\364Jt\351K?h\20"
- #"\27d\31\31\352i\6\16\344\375\220\357"
- #"\271\ah\333\326\332\276_?\340\274\363"
- #"X\20n\340@\376\356\332\225\177\363\247"
- #"\"ZP`.\216\370\325W\300\363\317\263\323\257\\\t\334r\213L|q\373v"
- #">\337\201\3\334JHM\255\377t\351\2\334}w\323\340dG`OU\300\317"
- #"(\3207n\4>\372\250\361o\276\333\206\372\23\"4\204\16;w\6&L\340"
- #"gi&thGL\21h\252\205u\346\f\360\345\227,\350h|\210\200\17?"
- #"4?\260?AH\25<\36`\326,5\361\305\206\364\352\305\322\350*\2\201@"
- #"p\375;\20V\342\210\267\334\3228 \250\212/\32\376-\25x,(\340wL"
- #"\"\246\250\352\343ZL\321=\210\3\3103\317\0\213\26\361\vv\316"
- #"9ji\16\35\2~\373[.\0\36{\f\370\321\217\314\355O\237\6"
-) 500
-(
- #">\371\204\v\310\215\e\353\v\200\201\3\201e\313\200\16\35\370X\r\vl3q"
- #"\304W_\5\16\37f;C\255\324\n"
- #"\177\342t\221\204\307\3\374\362\227\34\200"
- #"\254^~;b\212\36\17p\355\265\300"
- #"w\337\1\277\372\25\27\372\333\266qP"
- #"\315\317\257\377\364\354\t\234\353\323\21\340"
- #"\361\0\267\337\16\\}5+\371\00229w\0X\263\6\2308\21(*\2\372"
- #"\366\265\266o\310\330\261\300\2301\300\317"
- #"\177\256f\37L\377^\267\256i\313\300"
- #"@E\34\261\241\340\241\31.\360oW"
- #"\264h\303\240\277\345(\304\267\240\246\206"
- #"h\300\0s\321\264@\274\363\16Q\217"
- #"\36D\335\273\23y<\262\264\25\25D"
- #"\257\274\302\302\205\200\354\374yy,\34"
- #"\270t)\v\277i\344H\305\24\323\322"
- #"\352\237\325\337\376F\364\351\247Dg\316\250\235\313H;xp`AH3rs"
- #"\211\22\23\345>f\360\247?\21u\351"
- #"\"O\27L\377\316\310\220\245\227\210#"
- #"\272\0047\24\317\272\5b'\312\247\245"
- #"q\215\377\320!\371\t\317\234\341\361\200"
- #"\316\235\325\273\221|\317\355\360\232Sk"
- #"\245\221/\31\335l\253V\361\270\221\4#\355\a\37Xwo\371#6\226\273\337"
- #"\266l\221\247\5\264\177;\0047\264@t\0q\301C\322\270\3\355K\232`\342"
- #"\6\177\322\323x5\32\215Fc\v\35@4\32\215Fc\v\35@4\241\307\343"
- #"\341\351\220V6ii<\273\315\214\344"
- #"dk\e\215\306\211\250\274\aV\213\26\35\206\36\3qA?\243\353IJ\342u"
- #"*f\367\331Xk\221\227g>\370\e"
- #"\25\305\353O\314\6\246\263\262\200\377\371"
- #"\237\26\37\210\325\276\324J1|7&\306|\342AZ\32\257\305:p \260\215"
- #"\261\2=;\eQ\333\2669\336\237t\vDc\237\234\34vx\263Z\325\273"
- #"\357\00255\326\222!O=\305\353\34"
- #"\254f\16\345\344\360\361\252\253\3\333\374"
-) 500
-(
- #"\370\307\274rx\350P\363ci4\301"
- #"\340\221G\370\333Xk\25\210\247\236\342"
- #"\5\266f\244\246\2\355\332\1\377\371OP\262\26jt\0\321\330\343\340Avt"
- #"\200\27\331\371\243\246\6\230<\31x\364"
- #"\321\372\325\330\201\330\276\235[\16V|"
- #"\3755/\26\373\347?\3\333\314\234\tdg\3\337\177o\336\335U^\316\335\5"
- #"\211\211\326\347\325\264>\214\n\222\231F"
- #"\333\311\223,\3033a\202u%I\305"
- #"\307\313\312\200\1\3\200\r\e\344\371\r"
- #"\3:\200h\32\243\322\a\273v-\320\247\0170l\30\27\3463g\372\267{\376"
- #"y^\345\375\223\237X\237w\307\16\226"
- #"\225Pa\312\224z\235+\177\304\307\3"
- #"%%\274\6\343\346\233\201w\336\361oWX\310\2620^/\a;\215\6`_"
- #"x\3569Vr\0X_\315\37\265\265\300O\177\312\322/\213\26YW\222T}"
- #"\334\312\277\235D\30\26/:\n}\v"
- #"\316\342\273\228=\275\251\315\211\23D"
- #"\223&\21ef\22}\360\201\371\361\216"
- #"\34!JH \332\264I\355\374\303\207\23\255^\255f[]\315\253\265?\374\320"
- #"\332v\323&\242\244$\2425k\232\376V\\L\324\241\3_oR\22\321\254Y"
- #"D_}\245\226\a?h_r8\25\25D))\346j\16k\327\22\365\352E"
- #"\324\2737\321\212\25\274\"\276\262\322\377"
- #"\361\356\277\237h\350P\242\323\247\325\316"
- #"\257\352\343g\375\273\277\v\374I\267@"
- #"Z#\247O\363*\347'\236\340\326A"
- #"\367\356\334l^\261\202\177\357\320\201k"
- #"T\r\371\364S\240\177\177n\262o\332"
- #"d\335\227\373\307?\2?\374\241\272\16"
- #"\223j\27\26\300\32dw\336\311\343\34"
- #"V\364\355\313zP\267\334\322\264%R"
- #"X\310*\302\271\271\300\333o\363\337~"
- #"\360\3\276\27\317<\3\349\322\330^wy\271\207@>"
- #"\36\23\303\237\16\35X\24\325\340\363\317\331_o\275\25\370"
-) 500
-(
- #"\277\377\0036ofM\256\35;\374\213\37\276\370\"\260|9w\245\252\bH\2"
- #"\352>~\326\277'\253\0355\274\204;"
- #"\202\205\e\0u\237\266m\333Z'\310\316V\257q\30\f\34H\264c\207\272}"
- #"n.\321}\367\21\35=\252f\177\371\345\334*\30:\224h\374x\2429s\210"
- #"\26, **\342V\200\257F\320\300"
- #"\201D\203\6\21M\237\316\255\216\212\212"
- #"\306\347\366\247c\324\277?\321s\317\251"
- #"_\303\240AD\273v\251\333\347\345\311"
- #"\356\353\267\337\22\25\24\250\333\27\27\263"
- #"\206\231\25\325\325\\K\274\351&\242+"
- #"\256h\374[zz}\355\325\317\247T"
- #"\325\227\32\236\243W/\365kX\276\234"
- #"\250o_u\373\343\307\211z\366T\2677\220\372x\250\375\233\210}<'\207k"
- #"\361\223&\21=\364\20\321K/\371\367"
- #"o#O\376|\334\353\345\353\363\365\361"
- #">}dy\352\337\237\350\343\217\325\363"
- #"O\244\344\343m\333\266%\0\324\5\240"
- #"\r.(\236\235\237\303\20#\216\241\231"
- #"\231r\201\273\205\v\271\260\253\256V\263//\347@\20\eK4w.QU\225"
- #"u\232\312J\356\256)*\342\3401{6\37\303\2568\235\246){\366pa\225"
- #"\232\352\367g\277\276\344\365r\367Xe"
- #"%\321\326\255\334M\326\265+\373\303\302"
- #"\205D\207\17[\237\267\246\206h\352T"
- #">\357g\237\251\347\367\265\327\210F\214"
- #"P\2677\220\372xK\370wm-\321"
- #"\336\275D\357\275\307\201\343\241\2078\220"
- #"D\260\177\273\241~\357\374\34\206\30\361"
- #"C\372\237\377!Z\265J\226\246\266\226"
- #"kN\363\347\313\322\371\366\307\32\5\221\204\bT)u*~}i\372t.\340"
- #"\22\23\355\215\263\349Bt\3155\334"
- #"\272<p@\226\241I\223\210\36\177\\\226\206H\356\343\332\277C\202\16 ."
- #"@\374\220\246L!z\3541\371\211v"
- #"\355b\211\354/\277\224\245\253\256&z\366"
-) 500
-(
- #"Y\242\316\235\271 \2321C~n7"
- #"\320\260\246\36\f\2730\340\327\227\222\223"
- #"\371\271\365\353\247^C'\252\277\316\276"
- #"}\211\306\215#\372\376{Yfjk\211\272u\263'\ao\307\307\265\177\233#"
- #"\361\333\344d\"\217\307\25\1D\17\242"
- #"K\311\314T\333\260\306\227\356\335y\0"
- #"v\344H\331 \3549\347\360\306G\306@\336\313/\313\317\35NT\344\e\0\236"
- #"K_Q\301\337\301\260s\n\337|\303\235,\37}\244\276\1\31P\177\235qq"
- #"\274\211\330\371\347\313\316\373\345\227\274N"
- #"';[\226\16\260\347\343\335\273\3\17"
- #"<\300\323Z{\364PO\347v\377\256"
- #"\254\344\335\v\215)\277\201\220\370\355\236"
- #"=\3005\327@q\363\351\260\242\3\210"
- #"\224\204\4\236\255\224\227'O\273d\t/\24\362z\345iKJ\270 \332\275["
- #"\2366\\\30\273\362\355\331cm\373\306"
- #"\e\374m\265\375\252\252\35\340:]\241"
- #"F,_\316\337'N\324\313[\250\222"
- #"\227\a\374\342\27\274\243\241\224\362r^"
- #"|\371\322K\362\264\223'\363\275\376\352"
- #"+yZ7\3727\300\1\341\333o\255"
- #"\3\203\304ocb\200\357\276\303\323\315"
- #"\317]\350\tw\23(\334\210o\2011\23\307NS\333b\0206\342HM\345{"
- #"\225\222bm\273r%\321\250Qj\307"
- #"\375\313_\210n\273\315\332\316\30`\315"
- #"\316V;n3q\314\353d\214\273\330\31X\316\312\"j\333\226\323\333Aa\347"
- #"\306\210\"#\203\357\325\300\201\326\266\252"
- #"\367\364\254\177;\306\237L\320-\20)/\274\300\373\212\aZ}mF\267n\274"
- #"\302T\272C\235\223\220\254\205\370\364S"
- #"\336\35O\245F\272o\37\320\265\253Z"
- #"\36\362\363y-\212\25\251\251\300y\347"
- #"q\27Pkb\346L\366\321\27^\220\247]\273\26\270\343\16\276wv(,"
- #"\264^\221\355t\f\37\267Z\263q\364"
- #"(\353_\2358\1\274\367^\360\316\257\352"
-) 500
-(
- #"\337\16@\253\361j\5U\31\331\331\274"
- #" \n0W\327\5\270\313\256\250\250~"
- #"\201\242\31\277\371\r\320\246\r\177[q\3724\a\246\3\a8@\2301g\16P"
- #"U\305z\\!F\373R\204\220\221\301"
- #"\333\361\316\230a\3365%\361o\200\273"
- #"\"U\374\343\254\177\237\177\342\4N:\334\237t\vD#c\374x\226\245V\251"
- #"\241\256X\1\334x\243\332q\367\356U"
- #"\237\\\20\35\r\\r\t\257\36\266b\306\f^5\274w\257\271]j*\277\340"
- #"\351\351jy\320D&'O\262~[r\262u/\203\304\277%\234\365\357\313\202"
- #"\177\344\240\243\3\210\206\a]U\6\233"
- #"\267n\345.\270\377\376\327\272\e\356\350"
- #"Qn\326\217\34\251\226\aI\27\26\300"
- #"\315\374\217?\266\266\213\213\3n\273\r"
- #"\230?\337\334n\311\22\236 \221\237o"
- #".\25\257\211\\\fq\304\376\375y\366"
- #"\234?\t\23\3\251\177K\311\317G\277\320\349\250Dl\0\361x<\210\213\213"
- #"CTT\24\342\342\342\360\256\336\305\316"
- #"?\307\217s\301\275`\0010dH`\273\232\32.\210\177\377{syk\203\242"
- #"\"V\353\275\340\2\265|\354\335+\17"
- #" \252\375\304*\255\220\302B\236\tT]\r\\y\245\275\231r\32gR\\\314"
- #"]\236V\255\313_\377\232\3074\376\374g\353cJ\375[J~>\362Cs\344"
- #"\240\22\261\1d\364\350\321x\375\365\327ADX\271r%F\215\32\25\356,9"
- #"\207\343\307y\232\346u\327q08\377|\36\333\360\25Pl\310c\217\1\235:"
- #"\1\223&\251\235C\332\274\227ta\1"
- #"\262\0\242\332\n\271\360B\340\325W\201"
- #"Q\243\270\26\272qc`[\217G\266\336A\323\262\34<\310>\333\243\a\vo"
- #"\306\3077\26O\364E*\216\30\252\356+\3\227\4\20\347\317\23\263I"
- #"\217\36=\32\375?\320\245\212oAV\226lE1\21\321%\227\310V\22"
-) 500
-(
- #"K\305\351\362\362\210~\376s\236B\251"
- #"\302\25W\20\215\31C\264t)\321\261"
- #"c\241\311\323\345\227\253\37\233\210\350\262"
- #"\313d\367\365\324)\26\300S\305\353%"
- #"\32<X\335~\351R\242\374\374\300\277w\357\356WLQ\204\3259|\361ze"
- #"\366g\316\330\233\302\354O\312\337\214\274"
- #"<\331\263\266+D(\361\361\376\375\345"
- #"\366\222<I\375\233\210\310\247L2\345"
- #"\324)\332\354\202\342\331\3719\f\2^\257\227\332\267o\357\3677q\0ILl"
- #"\254^\253B\377\376D\353\327\253\333K"
- #"\305\351\16\34 z\364Q\236\177\237\233"
- #"K\364\300\3\356\232\213\177\354\30\313<"
- #"H\2T\270\361\263\336A\331\227\252\252X\247*7W&52m\32+-\253"
- #"R^\316\302\215R\244\357\304\r7\20-Y\242n\277z5?\357\335\273\325\323"
- #"\370\372xV\226\177\325h\247\262};"
- #"K\313\b\202\216\e\352\367\316\317a\20"
- #"\2306m\32\315\t\360\342\211\37R~"
- #">\321G\37\311\322L\235\312\252\243\252"
- #"\330\25\247#\342@\25\23\303\37\267\260t)\27ZC\207\262\362\254\25^/\a"
- #"r\207\25 J\276\264w/\313\214\217"
- #"\31#\253\301\226\227\263\326\224DP\361"
- #"\303\17Y\203K\212\364\235X\266\214h"
- #"\364hY\232\271sYD\361\273\357d"
- #"\351\210\210n\2769\360\206PN\244\246"
- #"\206h\310\20\316\363K/\251\245).\246\255.\b \21;\6b\340\361x\360"
- #"\217\177\374\3\323\246M\vh\23\25\25"
- #"\325\344\23\35\35\355\33781\321zJ"
- #"\250/\322=\216\243\242x\253\325\207\37"
- #"\226/\312\0322\48t\210?\341\304\343\341Aq+\215 \240~\36=\21\360"
- #"\264\202\200\303\274y<kk\364h\363=\317CDtt\264_\237\1,|\251"
- #"G\17\366\205\202\2\276\346\216\35\325O:\177>p\373\355"
- #"<\236\243\212t\\\311.\243F\361s8zT=\315\254"
-) 500
-(
- #"Y@\277~<-\274\266Vv\276\322R\226M\361xd\351\202\211\252\6\26\300"
- #"\23T\f9\32?kF|\375iHT\24\366\r\31\2\213\35\326\235A\270#"
- #"X(y\373\355\267)))\2116\231l\253*\276\5\223&\21=\363\214,\315"
- #"\256]D\27_,KCD\364\304\23,w\355\246\356(\"\356\336\221\250\2536"
- #"\34OP\351'\316\316\256\267\317\313\263"
- #"\266o!\5_K_\212\211\221\365\203\e\330i}\20qW\350\35w\310\317g"
- #"\247X\220vc\21\361\270`\377\376|"
- #"_\34\250\256l\212!\27\243\342\337\206\"3\2406ngH\0\271\240x\216\330"
- #"\26\310\2325k0q\342D\24\25\25\241\257\352\266\252*$&r\355WB\367"
- #"\356<\263c\347NY\272\346\210\323\205"
- #"\223\t\23\352\267\203U\21\217\333\265\213"
- #"\277\211XE\326\212\222\22\336~\364\255"
- #"\267\200-[\254\355\235\242\340{\350\220"
- #"\332\365\371b\247\365\1\260\237\266\324\366"
- #"\2737\336\250\276\"\333\340\374\363y\372"
- #"\364\221#\341\1776R$\342\210\206\"3\300[\345ZQV\246\266b\335\1D"
- #"d\0\tY\360\0\354ua\1\300\25W\310\272\261\0\226\366x\365U\336\263;"
- #"\334TV\252\255\377\0\370\5X\271\222"
- #"\2736\202\251\21\324\220\370x\365\265\32"
- #"\222\227\335i$&\362\376\354v\246\214"
- #"\266T\27\26`\257\e\v\0V\255\342\302\322P\37\16\27\222.)\0x\344\221"
- #"\320\372\267K\210\310\0\362\313_\376\22"
- #"\25\25\25\310\317\317o\324\267\230\221\221"
- #"\321\374\203w\355*o\201\0\300\27_\0?\3779\220\223#K\347\24q\272\271"
- #"s\271&\245\212te\271\224\204\4~\351U()\341\2\370\236{B\227\237P"
- #"\341\365\2\247N\0017\337,O\e\352g\320\220C\207\270\205$}\307"
- #"\f\31w\211o\205\2i+\265%\357\255\203\211\310\0RVV\6\342"
-) 500
-(
- #"\31f\215>\245\245\245\315?\370\214\31"
- #"\\k\222\6\2c!\343\350\321\315\317C8X\275\232kh\252\204\272\373$>"
- #"^=\200\0\234w\225}I\fRR\3022@\337\204\324T\356\312\\\273V\226"
- #".'\a\370\327\277\200\351\323\345\347\3"
- #"X\357L\302\260a,\262y\360\240,\235S\220\266R[\262{\320\301Dd\0"
- #"\t)v\3\301\314\231\\;\263#\3\357\4\356\274\23\270\376zu\373Pw\237"
- #"\330\t \345\345\352\366{\366\360\f\241pSV\306\372cII\262tv\375\264"
- #"O\237\306\337\252\254]\313\201\316\256\f"
- #"|\270\271\363N`\352T\365.\251\226\354\36t0:\200H\261\e\b\342\343y"
- #"\233P3\2016'\263c\aou\252J\250\233\370\241\16 ]\272\0\277\372\225"
- #"<_N\301\256\237\32]e\322.3\267\357u\3434\377v\t:\200Hq{"
- #" \0\270\340\275\360BY\177\265\364\5\223\212#JIH\220\t\36&'\313\272"
- #"\260\376\360\a`\3336y\276\234\202]"
- #"?\275\366Z\336H\351\232kB\223\257\226\"-\215\5\24Uq\232\177\273\4\35"
- #"@Z#s\347rw\203dLh\373v\353\35\332\32\342\366.,\27\355\n\27"
- #"T:v\344\300)Y\344\350D\206\17\347i\302\2528\315\277]B\253\17 \342"
- #"au;3\271\244irr\2003g\324\355{\365b\205]U>\376\0300Y"
- #"\231\357\227\216\35\325\247\361\2\\\363\225"
- #"\324~\245\312\266\27]\304\255\20U\22"
- #"\23e\353(.\275\264~\365\260\n\31\31r_\252\252\222]wu\265|\362F"
- #"K\370\253\35\377\226\356\271\"\365\361\255"
- #"[\201O>Q\267\17\265\177\3b\37w\300\334KKZ\375\226\266\312\333L\332"
- #"\265\267\223&+\213g\320dg\253\331\217\35\v\214\31\303\323\204"
- #"5aC\274\245\355\207\37\2w\337\r|\364\221\232\375\356\335<\255"
-) 500
-(
- #"[2\345\265%\374Uj\237\232\312\203"
- #"\356\222\335\37[\241\217\273a\213\344V"
- #"\337\2q$\231\231\365\373\216\253p\375"
- #"\365<\203\304\255\34?\316c\24\222\32f$\360\361\307\334U\246Jy\271l*"
- #"\265SIM\255W\37Pe\340@\340\177\3777\24\271\t=\307\217\363s\v\306"
- #"2\2\207\241\3\210\23\311\312\222\5\220"
- #"Q\243xL\300\255\254\\\311\205\343\353"
- #"\257\313\322I\4\e\235\310\246M\362\0"
- #"\222\234\34\272\374\264\24v\2\310SO"
- #"\271w\253\3417\336\340E\212\267\335&"
- #"\27\216t8:\2008\221\314L\236\25"
- #"\242J\307\216\316\321\313\262\263\0\357\325"
- #"W\e\177\253\340\361\360\32\207}\373\334"
- #"\247\243\4\360,\241\277\377\35\370\343\37"
- #"\325\323\354\331\239-\220\335\273ei"
- #"\312\312\302\2570\r\310%O\200z\215"
- #"\260\322R5\265i\0\360x\340\6\341\35\35@\234\2104\2008\211={x\n"
- #"\250$\210\30\203\235\222Z\251T\260\321"
- #"\300N\1\20\n\26/\346\202\324l\233U_\"\245\v\253{wy\v\304)\330"
- #"\21\3464\374\273\274\234u\315T\2300\1\256\350S\b\233\16\260S\0\bg?"
- #"m\333\266U\262\267s\16\21\251\251,"
- #"\207\356Fbb\324e\326\eb\347\276"
- #"\376\373\337\274\361\226\4\211\f\267\2m"
- #"\333\266\255\363\37H}I\312\r7\20"
- #"\275\374\262,MK\370\253\324\336\220\343"
- #"\267\263\335n\2701\362>p\240,\335"
- #"\330\261\274\361\226\5\276\376\344tt\v"
- #"\4\250\323\312:}\372t\270\263\302,^\314+\241\303Mr\262\274;j\356\\"
- #"\356\353U\221Yo.^\257|\354'"
- #"\310\312\274\247O\237\256\363\37 \204\276"
- #"\224\223\3\274\362\n0n\234l\366\222\23q\212.\\b\"0e\n\267(T"
- #"))\1F\216\344\r\261$t\351\2\354\337oi\346\353"
- #"ONG\a\220PcG\234\256\260\320\31\253\240\313\313\345z"
-) 500
-(
- #"P-\271\0\257\262R\266\26\4\0.\271\4X\266\314}2\334F\241\333\251\223"
- #"\254\333+\324\0303\347\256\273N}\215\212St\341\274^\336-p\3300Y:"
- #";\212\334\212\1\304m\350\0\2\310\225G%\330\25\247s\299@M\215l"
- #"\366\313e\227\361\f\262S\247B\227/\203\312Jy\vd\343F\336VV\202\307"
- #"\303\223\3\302\311\314\231\334\362X\265\n\30<X-\215]e]\tF^\326\254"
- #"au\3\25\234\"\a\224\232\n\264k\a\374\347?\262tv6\225\323\1$\202"
- #"\351\327O\315\316\250aEE\251w#\330\25\247s\2_\177\3155\305\177\376S"
- #"=Mt4\327\362?\377<t\3712\220\6\220\322R\336\31R\32\fn\272I"
- #"\266*=\24\304\307s\376U\203\a "
- #"\257\274\244\245\325_\247jk\342\207?"
- #"\344\357\374|^\24\351&\312\312\2702"
- #"!\335\350\315\316\246r\27_\34\376\211\e!@\a\20@}\2677\243\e!1"
- #"Q\275\e\301)\342t\261\261\366\372\316"
- #"\247L\3419\370\22\362\363y\221\\\250"
- #"\221\6\220\r\e\200\202\2\3319V\256"
- #"\4:w\226\255\313q\n\322\312\313\342"
- #"\305\365\372N\252\343\0233g\362\254\301"
- #"\277\375\215w\320\f\27R\361D\3;"
- #"\376\255\273\260\352h\365\1\344k@\275p7\272\21^~Y\275&\350\24q\272"
- #"\204\4\356V\222\16\212\377\370\307\374\262"
- #"\250\312m\0-7\16\342\365\312\306@"
- #"\244\1\344\304\t\336\305\360\251\247\270e"
- #"\3456\244\225\227\302B\336Z6=]}|\">\236\203k0v\373l\16\213"
- #"\27s\353\362\326[\201\357\277WOg\307\277\273v\225\267@t\0\211Lr\1"
- #"\365\302\335N7\202S\330\272\225\373\317"
- #"o\276\31x\347\35\365t\347\234\303"
- #"\233\355,X\240\236\246\245\2\210\235\26\210d\374\343"
- #"\341\207y/\373\37\374@\236\267\36=\302\277\243\241\235"
-) 500
-(
- #"\312Ka!\373x\270\307'\244\30\32a\27^\310]v\237~\252\226\316\216\177"
- #"\353.\254:Z}\0\331\6\360@\261*\322\232\326\367\337\313T8++\325\307"
- #"d\210xe\253j\255\272o_\340\37\377\0~\375k\365\374\0\\\253\223\314\n"
- #"\223*\331\2r5^\200[\37\22\205]\200\357\201*o\277\r<\362\210\262y"
- #")\300\327\35\25\305\312\0\23&X'\312\317\a>\373L=O=z\310j\330"
- #"\331\3312\377\256\251Q\27\361\4\344\212"
- #"\302\22\377\6x&\340\224)\354SV\264k\a<\361\0040g\16\360\313_\252"
- #"\237C\352\337v\224xcc#r\377\220V\37@.\4dM\313\235;e'"
- #"\370\350#Y\rp\356\\\336\313\300\212"
- #"\36=\270\326\365\312+\34\24T),"
- #"\224\257\201\350\322E6\320\330\256\35\260"
- #"y\263\354\34_~)\263\a\270\340=\347\34u\373\315\233e{Dl\330 \332"
- #"\2425\3\340\240n|T|e\312\24\26\303<zT\355$\27]$k\331\34"
- #";&\363\357o\277\225\211Zn\331\2"
- #"\264o\257n\257\352\337\36\17\217\255\30"
- #"\201\343\255\267\324\3171q\242\254KJ"
- #"\352\337\347\236+_\347t\356\271\262\212"
- #"\202K87\334\31\b7\225\0\342\355\254'PE\322mRQ\1,]\252\246"
- #"k\345\365\362\364\332\222\222\360\317\20\322"
- #"\330g\342D`\375z\340\366\333\3535"
- #"\223\314\270\362J\266W)\204\201\372\215"
- #"\267T\375[\332-(Q\24\226\370\367\204\t,<\370\345\227\362\375\3405-F"
- #"\253o\201T\2\262\235\355\244H\2\310"
- #"\374\371\\\220\250t\313\34:\304\315n"
- #"\35<\334\317\223Or\237\275\312\226\252"
- #"C\207\2\353\326\251\37[\272s\2434\200H\24\205%\376]V\306\202\213:x"
- #"8\32\35@\0\331\336\332RT\27\256\365\350\301\265"
- #"3\351N\201\221@s\4\16\235\260\310\257\271t\354"
-) 500
-(
- #"\310\255I\25\265\331\201\3\271+\344\304"
- #"\t\265c\307\307\313\374[*\17\243\32"
- #"@\214\326\307\364\351\352\307\216\24\234\""
- #"\340\31\2Z}\0\361\2\241k\201H\26\256}\365\25p\301\5\356\233\375b`"
- #"GW\310\300\216\302)\300\301\343\332k"
- #"Y\1\330\355\250\312\225\237\177>\3172R\225bIH\220\267@T\273\273N\236"
- #"\344\25\345*\3\334\227]\306c1\322u8N\302\2166\34`\337\277]@\253"
- #"\17 !\355\302\222\254;\310\312\2^|14\371h\t\354\352\n\1\366\5\16"
- #"'N\224o\327j`\314\3561\26\316\271\211\201\3\271&\237\227gm\e\312."
- #"\254\317?\ars\325\326\310t\352\304R'\222\3567\247aG\e\16\b\272\200"
- #"\247\223\320\203\350@h\2H^\36/\334\273\345\0265{'\210'6\207\324T"
- #"\16\"\313\226\311\323\32\23\1\244\2\207"
- #"\353\327\263\224\306\261c\362s\16\e\346"
- #"\316\325\345\0\17\266\357\334\t\314\230am\e\37/\2331TY\251&}\222\233"
- #"\3133\340\222\222x\326\226\325L\303\262"
- #"2\365<8\225\2644\371\264q\200\375{\3348\336\327=\302h\365-\220\337\3"
- #"\300\213/bWT\24\242\255jR\227\\\302\337*\3354\303\207s\1\365\374\363"
- #"\315\315b\313\22\e+\323\3722(+\343\361\233%KB\223/\177t\353\306\335"
- #">R-#\200Wg\367\354)\232\246\353\217\350\350hDEE!\352\354d\6"
- #"\343\337\226\276\324\34^x\201\v3\225\325\342\277\3765\267lU\5\25U[ "
- #"\227\\\302\225\236\367\336\3.\277\\\355\330N %\205\375[U\353\253!;v"
- #"\360\375\261\263UA\267nJ]\255\276\376\344tZ}\09\273W\30R\257\273"
- #"\316z\17\207\334\\\3766\4\344\3140dO^x\2419\331k"
- #"y\16\37\346\357\301\203\345\335C3fpa%]\245k\27\273\342"
-) 500
-(
- #"\210\253W\3o\276\311\23\34\2445\343"
- #"\234\34.\200\272w\a\320\202\373\2014"
- #"\244\260\220[ *\343e\22A\305\234"
- #"\34V\325\35>\334\272\2q\343\215\300\2313|/\236{\316\372\330Na\3348"
- #"\376\356\336]\356\337m\332\0?\373\231"
- #"=9\375n\335\270\v\314\2\275\37\210"
- #"\313\250\353pQ\21\2343D\27\177\364"
- #"#k\333p\313\236\330\355\343\317\315e"
- #"\255\257\257\276\342{r\362\244z\332\270"
- #"8\336Lj\376|\3319\355bG\34\261\262\22\2304\211g\4u\350\240\236\256"
- #"\246\206\vJc&\215Q\209\35\211\240\242!\26\32\23c]H\216\32\305\252"
- #"\fo\276\351.i\37c/\222\203\a\345\376\r\360\252\365\27_\344\340)A1"
- #"\200\270\216pl\203\350$:\2DYYD\307\216Y\e\37;F\224\231IT"
- #"Y\31\372\2145\227\364t\242\250(^\23]R\"O\177\352\24\321\304\211D\227"
- #"]FTV\246\236\356\300\1\242.]\210**d\347\263\343\212w\335E4o"
- #"\236\272}m-\3215\327\20=\370\240"
- #"\354<k\327\22\365\352E\324\2737\321"
- #"\212\25D\31\31~}\300\221\257\323\261"
- #"c\352\376\355\365\262\337x<\241\317W"
- #"0HN\346-\224\37\177\\\356\343v"
- #"\375\233\210\250\240\200\350\365\327ei\336"
- #"\177\237\350\212+DI\34\351O>8?\207!\306\r\17\311\26{\366\20M\236"
- #"\314/YF\6\177&O&\372\327\277\210N\234P?\316\343\217\23]|1\321"
- #"\272u\352if\317&\272\367^Y~\355<\207>}\210\336}W\335~\341B"
- #"\242\241C\211jj\324\354?\373\214\350"
- #"\352\253\211\272w\347\275\310kkM\315"
- #"\3\372RB\2\337\373\362r\365\274j"
- #"\2541\366\267\277\373n\373>n\307\277\27.$\272\376zY^\277\371\206"
- #"()I\224\304\re\223\363s\30b\266\2\352\316v\346\fQv\266\354"
-) 500
-(
- #"\4^/Q~\276\272\375\362\345D}\373\372?NRR}\315\267\244\204\235\177"
- #"\304\b\377\366\2764\264\0370@=?fy\n\204\327K4x\260\354\34=z"
- #"\310\354\2118\200|\377\275\272\375\340\301"
- #"D\333\267\313\216\177\337}DG\217*\231\2276V\302j\372\311\314l\232(7"
- #"Wt\16\3615\\z)\321\301\203\352"
- #"\366R\37\17\226\177\373r\362$\27\352"
- #"\17>Ht\345\225\376\317\341\365\22\345"
- #"\344\324\377\337\256\217K\375\373\340A\242"
- #"\313/W\267'\342\373\232\227'J\242\3\210\v(\6\210\336zK\315x\327."
- #"\256\321K\2306\215h\316\34k\273\232"
- #"\32\242\251S\211RS\271\346\353\313\364\351Dm\332p\363\2719-\nM\310\b"
- #"\370\302\247\246\6n\201\224\227\23\215\37O\24\eK4w.QU\225\371I\226"
- #",\341\240p\362\244Z\246n\276\231\350"
- #"\211'\324l\211\344>\36,\3776Z\314\t\t\0340bb\370\373\301\a\211\326"
- #"\257\347.\247V\206\16 .\340w\0"
- #"\321\375\367\253\31\277\373\256\254fS^"
- #"\316\343\1\a\16\230\333\359\302}\363"
- #"C\207\6\266MN\346Zl\357\336\366\30644!\247Y/\274\3578K\303\326"
- #"\246/?\373\31W(Tx\363MY"
- #"\355Z\342\343\301\364\357\214\f\366\357\224"
- #"\224V\e0|qC\0i\365\263\260\326\3\352\253c\313\313Y\316@\25+\361"
- #"8C#g\3300^\210\365\346\233\201m\277\371\206;B>\371D\266_\203\306"
- #"\35\\u\25\353J\335u\27\357ea&}\361\364\323\300\253\257\262\277X1|"
- #"8K\210\250\256]\220\370x0\375{\307\16\366\357\335\273\201!CxK\0\215"
- #"\343i\365\1\344}@]\234n\317\36~!TP\21\21734r\342\342x\5"
- #"\267d\257\nM\344q\3169\34<\214\365\35/"
- #"\277\354\337\256S'\340\357\177\a~\365+\240\250\310"
-) 500
-(
- #"|C'\351\332\5U\37\327\376\255\201"
- #"\16 8\t\250\213\323\225\227\253\275\\=z\0w\334\3012&f\322\a\313\227"
- #"\363\367\211\23Z\226]SOII}m<\20W^\311\255\213\en\260\336_"
- #"C\262vA\325\307U\244\331\265\177G<\255^\v\v@\2758]T\224\371\256"
- #"a\345\345\300\240A\326\307\373\352+\356"
- #"r\372\373\337\315\355\"AEV\23>\336y\207e\340\255\270\340\2\16H]\273"
- #"Z\357N\250\342\343\211\211\300\221#\326"
- #"\342\200\332\277#\236V\337\2\1\300\342t_|\1\214\30an\267v-\257@"
- #"V\321\211\372\325\257\334+\315\256q\a"
- #"\353\327\263\302\255\225\236\327\260a\348"
- #"\16\0340\267\313\311\341-\222\37x\300"
- #"\334\316\353e\241P\225\325\355\232\210&"
- #"d\1\304\343\361`\340\300\201u\377\356"
- #"\331\263'\336\265\243\245\337\22\250\212\323"
- #"\35>\314\375\317V\375\31199jBw\32&%\305\336>\v\255\235n\335\200"
- #"\247\236\262\326\363Z\273V-\320\30R"
- #"&\243G\233\333\245\246\362\361\326\256U"
- #"\315i\353\306\356>\"n T\323\273:w\356L\36\217\207\274^/\305\307\307"
- #"\323c\217=F\211\211\211\344q\230L\202\350\26de\271G\346\241%1\246\30"
- #"K\27Y\32\0\274>\300.\251\251\274n\300\16\227]\26\264U\342!|\235Z"
- #"\6\2577\240LK\253&L\376\355\6\177\nY\v\344\310\221#\30<x0\346"
- #"\315\233\207\361\343\307c\332\264iX\276"
- #"|9F\31\265\0347\262m\233\273\204\343$\0302\327ii,\34(\301\20\26"
- #"LHP\353\223\367\245K\27\356\362\263"
- #"\303\361\343\300\271\347\262\f\275\35\362\363"
- #"y#\254!Cd\351.\271\304\376\16\214N%>\236\247\323Fb\327k8\375"
- #";#\203g\240\271DaWB\310\307@\236y\346"
- #"\31\314txwN\213\354\341\320R\330U\3415^"
-) 500
-(
- #"\222\252*\226\272\236=\e\370\372k\265"
- #"\264\206\302i\2336\274\317\306\301\203\262"
- #"s\377\341\17\3666\324\"\342)\252\205\205\\\360\251R]\315Sd\v\vY\276"
- #"<+\vX\264H-\355\336\275\274\6\243\252\nX\260\0\337$'\267\374~ "
- #"\255\0317\372\367\216\35<E[a\275\231\333\366\3\ti\27\326c\217=F\235"
- #";w&\"\242\342\342b\367wa\271\201\324\324z\355\245\361\343Yfb\301\2"
- #"\242\242\"\242\315\233\3wO4\354\276"
- #"\330\272\225h\326,\242\256]Y:e"
- #"\341B\242\303\207\255\317][\313r\34"
- #"\335\272\21m\330\240\236\347\217?\346\25"
- #"\330R\236|\222Wo\253\312z\354\336\315\327\25\37O4r$\321\333o\233\v"
- #"+VU\21m\334\310\372J7\337\314"
- #"\253\244SR\370\337\267\336\312\367x\306\214:sK_JL$\0323\206h\351"
- #"R5u\\MS\32\372\367\r7\260<\312C\17\21-Z\304\222D_|\341"
- #"\177\265{8\375\233\250\336\207\4\270\241"
- #"l\nY\16\213\213\213\351\362\313/\257\v\30\3\6\fp\\\360 \"\332\0\250"
- #"\3139\237:\305\342w\252\324\326r\341\255\"\343\\]M\264z5\321M7q"
- #"\241H\324X\37\350\255\267\370%y\350!~in\270\201h\320 ~\241\n\n"
- #"\352\217S\\L\324\2713\277`EE|\376\331\2639\230\f\35\312/\221\252\320"
- #"a\303<I\244\250\227.\225\t\354\235"
- #":\305\302\205R\372\366%\332\262E\335"
- #"\276\177\177.\3707oV\263\378\220"
- #"\357\361\364\351D\257\274\322X\242\336\217"
- #"\264\277\245\230b\303\217\321\237\236\237\37"
- #"\370\34\376\220\212/>J\336\342\0\0 \0IDAT\366\353\247~\275Dr"
- #"\37W}\326\376\374\233H\356\343\r\375\333\314\276\260P\226\247P\3727"
- #"\21\a5-\347\36y\314\1X\275S\205\17>\340\27R\205\257\276b"
-) 500
-(
- #"\247\377\361\217\211\366\355k\374\233\327\313"
- #"\265\230c\307\314kC\231\231\366j[\305\305\262B@\23\24,_x\200\5\2"
- #"\257\272\212h\347N\376\233Y+\307\237\f\274T|\361\325W\331\267T\367gQ"
- #"\365\361\252*\242I\223\330\317\374i\263"
- #"\31>hU\333\267\343\343\255\304\277["
- #"]\0\211\211\211\241\264\2644\"\"JOO'\0M>\351\351\351\301<e\263"
- #"\211\6\210.\271\204h\345Jk\343\247"
- #"\237&\272\343\16s\233\352j~\261\273"
- #"v\345=$\374a\354c\220\236\316\242"
- #"y\263fq\300\361\305\250\2355g\206"
- #"\222\246\305\260|\34133\331\207,\366\25\241\212\nn\215\30\5kFFS\e"
- #"\211\370\342\254Y\334\232\262\n6Dj"
- #">\276w/\327\364\307\214\361\337\25W"
- #"\\L\324\241\3\347\335\314\277\211\264\217"
- #"\233\320\352\2HVV\226#\273\251\314"
- #"\0\300\222\350\311\311\326\265\232_\374\202"
- #"\350\331g\3\377^\\\314\265\307>}"
- #"\352k\230\376\350\336\235_\256\302B\16"
- #"8\232\210 \350/\274\231\f<\21\373"
- #"\316\263\317\326w\3514\30\217i\304\231"
- #"3\34@\314\202\214\201\212\217_t\21"
- #"\321\330\261|\\\177\244\245\21EGs"
- #"\236\264\177\333\306\r\1$\212(\2\347"
- #"\226\t\210\212\212\342\r\354\23\23y\205"
- #"\255\331\355\210\215\5:w\6v\356\364\377{Z\32\260k\27\220\227g\256~Z"
- #"^\16<\3740\340\361\0\237~\332\254\374k\234C\235/\265499<\213-"
- #"%%\260~VF\6\373\355\214\31\201U~\r\377\375\350#\240_?s\e3"
- #"\0377\374{\325*\353E\216\232\200\204"
- #"\315\237\4\204,\200\344\347\347c\326\254"
- #"Y\30gL\237\3\360\362\313/\343\341\207\37\306\246M\233BqJ[\324=$"
- #"\217\207\5\20\267n\rl\234\235\315\372V\221\272\26D\323"
- #",\34\375\302\e\205\372\372\365\201\365\336<\36\340\27\277`"
-) 500
-(
- #"Y\37-\247\36v\34\355Og\tY\0\371\374\363\3171z\364h\214\36=\32"
- #"\177\372\323\2370}\372t\24\25\25\241\250\250\b\227]vY(Ni\v7<"
- #"$\215;\320\276\244\t&n\360\247\220va\358p\0c\306\214\301\266m\333"
- #"\220\223\223\203\225+W\"\316L\3769\f\270\341!i\334\201\366%M0q\203"
- #"?\205t%\372w\337}\207\243G\217\242S\247N8r\344\b\216\37?\36\312"
- #"\3235\242\274\274\34S\246LA\247N\2350e\312\24T8Hr\2425\255R"
- #"nM\327\332\232hM\317\2655]\253"
- #"\224\220\5\220\365\353\327\343\212+\256\300"
- #"\355\267\337\216\355\333\267\343\366\333o\307"
- #"\25W\\\201\365\353\327\207\352\224\215\350"
- #"\335\2737\0\340\235w\336\1\0\364\352"
- #"\325\253E\316\253\302\31\225\215}\"\204"
- #"\326t\255\255\211\326\364\\[\323\265J"
- #"\211\310A\364\312\312Jddd\340\273"
- #"\357\276\253\373[\207\16\35\260s\347N"
- #"\\\354#\24\27\216f\242\e\232\246\301B_kd\242\2575r\317+!\"\247"
- #"\361\336{\357\2758\377\374\363\361\320C"
- #"\17\325\375m\316\2349\250\252\252\302\243"
- #"\217>\332\310\2669\17)::\32\247O\237\26\247\v\3079\303\225V_kh"
- #"\317\31\256\264\372ZC{\316\346\236\267\245\bY\27VRRR\235\252d\303O"
- #"FFF\250NY\307s\317=\207i\323\2465\372\333\264i\323\360\354\263\317\6"
- #"\365<v\233\266\205\0\357\233n\5\21"
- #"\360\364\323\254\26\253zN\217'\340\261M\323\232\244S:o\bh\3169Ei"
- #"\273w\a\276\375V\236\266G\17\371FAYY\300\237\377\334d\275Q\300s*"
- #"\234\343\314\2313\366\362bv\336\346 \361%\v[_\n\214k\265\221\247-."
- #"\363aW\20\252\25\212\306\206R\6-\251\306\333"
- #"\276}{\252\364Yq\353\365z\251}\373\366Ml"
-) 500
-(
- #"\353nAn\256\365fQ>2,Mn\237\212FOq1\3555$*\314("
- #"-\255\327Mj`k\372\310\212\213Y"
- #"\3615\200M\300\264\26\351\224\316\e\340"
- #"\272\225\\,@ze\367\364\363\354D"
- #"\256\r\20\335{\257<-\300\367\355\354"
- #"\271\225\322\371\323\3032K\353s\16\377&P\262S\272OVRCg\237UP"
- #"|I\301\326\367\330J\357\216\215<\231"
- #"Q\b\330\326\336\2`[\273+\204\305s\320\bY\16\375]|qqq\235\274"
- #"{(\231={6\335\333\240@ \"\2326m\32\315\2313\247\211mC\5\325"
- #"\235~\264\273\32~\16\1Tj\362{Y\0\345\325R\5\e_\373\35\2e\327"
- #"R\301\261}\363#\311\223\344\272\315\354"
- #"\375\245?$\2607>\222g\347k\357\373\331#\264\367w\255\"5^\200\266\206"
- #"\340\34\276\367\335\327>\24>n\307\277"
- #"%\376j\244\221\332;\311\277\245i\214"
- #"O\225\212~Y\30A\310\16\214\246\207"
- #"n\251\0\342\257\265\341\257UB\344?"
- #"\237\252\330J\273g\17=\5X\213\307"
- #"\35;\306\262\321c\3064\2625=\247\2050]\300\264\n\202vv\357S\213\337"
- #"_;i}j\346\312i}\264\252\224\322\245\246\372\335\23$`Z+=,#"
- #"\255\202]\300\2646\b\212/I\205\24U\337\235\0y*\213d\37\16\23!\e"
- #"D\217\211\211\301\eo\274\201\301ge"
- #"?<\36\17n\272\351&\274\374\362\313u\177\v%\27]t\21~\362\223\237\340"
- #"\226[n\301\242E\213\360\217\177\374\3"
- #"\a\16\34hb\327\234\201*\273i\303q\316p\245u[~\233\223\326m\371m"
- #"NZ\267\345\2679i\335\226\337\226$d\203\350EEE\309rd\335\340\371"
- #"\250Q\243Z,x\0\300\247gE\n\177\364\243\37\1\0\266\230\211\e"
- #"\332\244]\30\364\202\232s\316p\245\r\3079\365\265\206>m8\316\331"
-) 500
-(
- #"\232\256\325\rD\3444^\tz\35Hh\321\327\32\231\350k\215\334\363J\b\251"
- #"\224\211F\243\321h\"\27\35@\302@"
- #"\2447k\e\322\232\256\2655\321\232\236kk\272V)\272\v\313\5\315D\215;"
- #"\320\276\244\t&n\360'\335\0021\360xxG73RRl\255\366\325h\302"
- #"Ny90e\n\220\231\31\330\306\343\1\272u\3\252\252Z._\32W\243\3"
- #"\210\301\270q\300\236=\3466\337}\a"
- #"\334}w\340\337\323\322\200\250( =\335\3748\306\313|\311%\362|j4\276"
- #"\344\344\260\337u\357\36\330f\350P`"
- #"\301\2\340\272\353\2\333L\230\0TT"
- #"\0\237\177\36\330&5\325\332\307\r\377"
- #"NL\264\314\272\306\335\350\0\2\0\253"
- #"W\3m\333\2\271\271\346v7\336\b\334yg\340\337\27/\346mo;w6"
- #"\337\vz\320 ~\231/\276\30\250\251"
- #"\261\227gM\344\223\230\310\5q\240\275"
- #"ljj\200\347\236\253\327\361j\240|\335\210\352j !\1HJ\2f\316\f"
- #"|\276\2622`\322$\336\23=\20K"
- #"\226\360\261\362\363\371\270\376(,\4\236"
- #"}\26\360z\265\177G8A\r \375"
- #"\373\367\307\242E\213\202y\310\220\323\36"
- #"\0~\365+\340\371\347\315\367C\a\370\2451\223\242/,\4JJ\2009sx"
- #"\337\364\207\37\366\377\2\335x#\177W"
- #"Tp\255q\366l\340\353\257\233\332\351"
- #"\232\\d\21@H\261\t{\367\2\257"
- #"\276\312\5\360\202\5\300\225W6\265\371"
- #"\357\177\331\37\377\374g\16\"\31\31\201"
- #"\203\303=\367p\245\346\233o\270\322b"
- #"\206\252\217WWs\276\274\336\2466\213\27\3\306&Lf\376\rh\37w;\301"
- #"\\\326\276m\3336\352\335\2737]w\335ut\370\360\341`\36:d\374\16 "
- #"\272\361F5\343\217?&\352\335[\315v\357^\242\321"
- #"\243\211\n\n\210\276\372\252\361o^/Qf&KY"
-) 500
-(
- #"l\335J4k\26Q\327\256l\273p!\221q\357\322\323\353\365wn\270\201h"
- #"\352T\242\207\36\"Z\264\210\350\255\267"
- #"\210\276\370\202\350\300\201\246\347\266)\336"
- #"\246i\36\226\257\23\320TH\261\252\212"
- #"h\343F\242\307\37'\272\371f\242\224"
- #"\24\376\334|\263\177y\222\317>#\272"
- #"\372j\242\356\335\211^~\231\250\266\326"
- #"\374\234\317=\307\276v\350\220\332E\250"
- #"\372xm-\321\334\271D\335\272\21m"
- #"\330\320\364w\303\a\315\374\233\310\236\217"
- #"\267\22\377\16r\361\34\22\202>\v\253"
- #"\252\252\n\367\335w\37\376\375\357\177c\371\362\345u;\3:\225\215QQ(("
- #"+\343\276]+\252\252\200\1\3\200\315"
- #"\233\325\16N\3045\304%K\200\215\e"
- #"\315mkj\200\377\374\aX\264\b\330"
- #"\265\213\355\313\313\271\25\263j\25\360\227"
- #"\277pm\257\242\242\351wr2P\\"
- #"\314\307\361x\200\321\243\201#G\200\242"
- #"\"\256u\226\227\263\235\361\357\213.\262"
- #"\316\217o\236\276\376\328\273\272\337\222"
- #"\227^\2\36}\24\370\370c5\373\252"
- #"*\240O\37\353\26\240/\371\371\334r"
- #"\314\313S\263\317\313\3\372\365\343\32o"
- #"\237>\326\366\375\372\1\347\235\a\24\24"
- #"\0\3\a\362w\327\256\374\333\361\343\334\345\271ys]\255~gT\24,F\277"
- #"\352\311\315\345\353\0354\210\307\24\374\235"
- #"\303\37}\373\2?\374!\360\177\377\a"
- #"\\x\241\365y\372\367\347\356$\225\353"
- #"\5\344>\256\372\254\375\3717 \367\361"
- #"\206\376\375\326[\201\355\23\22\200\r\e"
- #"\324\363\24J\377\6\200\203\a\201a\303"
- #"\0\201\"\206\efa\205l\32\357\375"
- #"\367\337\217y\363\346\241\332\247\2374="
- #"=\35\245\245\245\2418\245-\334\360\220"
- #"D\244\247\327\217\277\214\37\317\263j\222"
- #"\222x\6\231\361o\177\335\30\225\225\\ o\336\314\316\276h\21"
- #"\a\276\224\24\340\226[\200\233o\346n\0203N\237\346\302\331\343\1"
-) 500
-(
- #"V\256\344\361 \25>\374\220''\230"
- #"\365\275\373\343\205\27\200?\374\201\273\\"
- #":u\262\266?v\fX\266\fx\3541\340\202\v\200;\356\340{t\376\371\376"
- #"\355O\237\6>\371\204\v\273\215\e\201"
- #"\367\337\347\277\17\34\310i\236\177\36\230"
- #"1\3\2307\17\200\202/\245\245\1\275"
- #"{s\27\346\250Q@\307\216\262\353\3254\366\357\en`\1776\306w\32~\307"
- #"\3055N\27N\377\6\200G\36\341\n\303\v/('qE\331\24\212f\315\333"
- #"o\277MIII\264i\323\246P\34>\250\240\201tr\333\266m\303\235\235\346"
- #"#U85\230>\235\273\21\22\23\211"
- #"\222\222\270\333\301\267\353-\20^/\247"
- #"\271\362J\356^\361\327\255f\306\323O"
- #"\23\335q\207,\215\301\304\211Dc\307"
- #"\312\322\2349C\264|9\321\340\301\334"
- #"\5\223\225e\275\27\214AE\5\321+\257\360\375\5hwT\224_\31\356\210\360"
- #"%'\342F\377\256\255%\312\310 z\367]K\323\266m\3336\362#\247\23\364"
- #"\34\272)x\20\271\243\237\261EHN\346\27\254_?\242\352jYZ\343\345\34"
- #"2\204\vg)]\272\20=\374\260<\35\21\217#ef\362\vj\207\211\239"
- #"\357ii\262t\275z5\31\237\320\276\344`\302\351\337\31\31<fc5^\345"
- #"\203\e\374)\250\263\260\326\254Y\203\211"
- #"\23'\242\250\250\b}\373\366\r\346\241"
- #"\235A$/$\374\346\e\36\263\371\350#\340\234sdi_~\231\277\253\253\201"
- #"s\317\225\237{\377~`\341By:"
- #"\200\273\201\252\253\201C\207\354\245\377\362"
- #"K`\362d\356\226\220\360\351\247\300S"
- #"Oq\227I\244PY\311\335\234\r\266"
- #"\367\215\30\302\351\337\245\245\300\311\223<"
- #"\326\25i\0043\32\r\0300\240E"
- #"\266\254\r&\0\352\267\274\364\263\341\224\2171Q\247N"
- #"\326\335\35))\326\307\322\324#\351Br0A~\235\202"
-) 500
-(
- #"\207\321\355\223\220`ng\324\264g\314"
- #"0\267KH\260\265yU\253\305\246\177"
- #";\326\237\32\240\265\260\242\242@\351\351"
- #"\300\316\235\215\6D\375\22\e\v\34>\314\263y\314fSDEY\37K\23q"
- #"\264\370\240\2471\203\351\237\377\4\366\355"
- #"\vl\227\235\rl\337\316\3776\313_N\16\260m\eO\22x\357\275\300vF"
- #"M:;\233\327\204hB\202\e\6\321\365Jt\200g\305\\z)\260~\275\271"
- #"\335\325W\3\313\227\253M\305[\2700"
- #"2\273\0024\316\301\220'\361\267\230\257"
- #"!k\327\2]\272p\367\224\31%%\374.\334s\217\271]j*Oo^\266"
- #"L\224]M\344\241\3\b\300\363\313\237"
- #"x\202\247\223\232\321\255\233\265^\26\300"
- #"s\374\257\274\322\272\5\222\222\302\265\271"
- #"\234\34\345\254j4u\374\340\aj}"
- #"\362\a\17r\201\277{\267\265\255\212\217"
- #"\227\225\1\323\246\3614X3\264\177G<\255>\200t\4X<n\340@k\343"
- #"n\335\270\333\300\212\255[y\236\371\242E,K\21\bC\273\250{wky\v"
- #"M\353AE\34q\335:^\4\367\312+\326\32n\213\26\1?\373\31\320F\341"
- #"uW\365\361\0313\200\27_\324\376\335"
- #"\312i\365\1d \300\253{\317;\317\332X\365\345\2x!\323m\267\1\363\347"
- #"\a\266\2319\2235\214\16\36\344\205L'O\252\35[\23\231\250\212#VV\2"
- #"?\3779\260b\5\257\3126[\301\177\346\f\260t)p\353\255jyP\365q"
- #"\355\337\32\350\0\202\241\200\177\261:\177"
- #"$'\253ua\31X\325\322\342\343\201\35;x\205\363\5\27\0W\\\3012\17"
- #"\3760\272\3\222\223y\240S\23Y\250"
- #"\212#\22q0\370\345/Y\246\304\212"
- #"\325\253y\365\266\352\252i\211\217\a\323\277\215\255\20bc\271KY\357"
- #"I\342\nZ}\0\271\22\340\301H\25$-\20@\255\226\6\0\355\332\261"
-) 500
-(
- #",\306m\267\361K\346o0\177\3348"
- #"\356\202\350\326\r\270\366Z\336\30h\312"
- #"\24. \276\377^=O\232\226\307L"
- #"\226\375\363\317Y\333\352\326[Y\337j\363f`\354X.x\375I\316\374\345/"
- #"\374\274\177\375k\265s/Z\304R\35"
- #"\252\4\273\225\r\250\371\367\342\305@\207"
- #"\16<\313\3617\277\341{v\325U\300"
- #"o\177\253\3\212\223\t\357,\342\360\263"
- #"\t :qB\315\370\314\31\242\274<\331\t\274^\226\314Pe\371r\242\276}"
- #"\375\37'#\243~}II\t+\270\216\30A4`\200\365q\e\332\373;\276"
- #"\235<\5\302\353%\312\317\227\235#=]fODt\311%D\337\177\257n?"
- #"x0\321\366\355\352\366\271\271D\367\335"
- #"Gt\364\250\222y\251\241*\e\350\223"
- #"\231\3314Q\237>\242s\210\257\241\177"
- #"\177\242\203\a\325\355\245>\36,\377&"
- #"j\254\262{\362$\321\272uD\17>\310\22\"\3\a\372?wJJ\375\377\355"
- #"\372\270\324\277\17\36$\272\3542u{"
- #"\"\276\257\331\331\242$n(\236\235\237"
- #"\303\20\343\206\207d\vc\361X\227."
- #"\34x22\370\377\377\372\227z\300\254\251ay\355\324T\226\21We\3324\242"
- #"9sd\371\265\363\34\372\367'Z\277^\335~\311\22\242K/\345\302I\205\362"
- #"r\242\361\343\211bcY\272\274\252\312"
- #"\324<\240/\371\223e\3274\37c\341"
- #"\343\335w\333\363q\273\376mH\357K\330\265\213\345T\4\270\241lr~\16C"
- #"LG\200\5\365\216\35\2636>v\214E\325\334\260\312<3\223(*\212_\260"
- #"\222\22y\372#G\210\256\271\206h\350P\231x\\y9\a-\251\340\234\235\227"
- #"e\352T.\330%\374\354g\\\360HX\273\226\265\257z\367&Z\261\"\240\17"
- #"\270\341\2057\305\353eE\6\267\250\2$'\363\347"
- #"\361\307\345>n\327\277\211\270\325\370\346\233\2624\357\276"
-) 500
-(
- #"\253\326S\320\0007\370S\253\37\3\31"
- #"\3p\237\357\353\257[\e\277\361\6\367"
- #"c\273a\205\371\177\377\313\22\351\251\251"
- #"2\331\351\36=xv\317\325W\263\316"
- #"\324\233o6\225\3066c\376|\340\366"
- #"\333ei\3542`\200\365\236\17\276<"
- #"\3754\357\366\367\346\233\352i\256\272\212"
- #"%\343\357\272\213\a\257\335\342\3\200L"
- #"\337j\336<^\321>z\264\265\346\333"
- #"\361\343\254\3\26Nm\270o\276\341\317"
- #"=\367\250\373\270q?\206\r\263\347\337"
- #"[\266\0\a\16\0\303\207\313\362Z^\316\23\24\"\215pG\260p\363\232\321?"
- #"}\335u\326\306c\306\260\255\312nh"
- #"n\253\315\31\30\367c\374x\261z\250\355\326\207q^)\273v\21]|\261<"
- #"\335\273\357r\337\371\376\375\362\264\331\331"
- #"\234\327\206}\357gq\344\353\244\252o"
- #"ET\177m\200\3658\310\322\245l\327"
- #"\241\203\273|\334\270\37?\374\241\334\277"
- #"\211\210\356\275\227h\366ly\272y\363"
- #"\210\376\367\177EI\34\351O>\264\372"
- #"\26\210\261O\333'\257\275\206hc\37"
- #"\347@\30\e\331\274\375\266\365\201\215\332"
- #"\334\304\211\315\311^\313\23\23\303\337["
- #"\266\310\325C[\262\365\1\360\2\265\266mY\307L\302\240A\300\2301<}["
- #"\272\27wI\t\27\261gWuGGG#**\nQg\357\225\361oK_"
- #"j\16\36\17\357Z\250\322\252x\343\r"
- #"\37666\3032\243\244\204g\204\275\365"
- #"\226\265\\\317\212\25|\357\211\270U\346"
- #"\26\226/\347\357\23'\344\376-]S\323\220\362rk)\0314\365'\247\323\352"
- #"\3\310o\0`\374x\364!\302\351\323"
- #"\247\315\215\215-/U$\274\213\213\201"
- #"\254,{\316\26N\16\35\342BA\260\365&\0.\210\237y\206\265\224Z\212\362"
- #"r\356\206PY\17\341\313\233o\262\224\273\225\216\224\5\247O"
- #"\237\6\361X\"\0\324\375\333\322\227\232\303\304\211\\9Q\351"
-) 500
-(
- #"F{\344\21\336\375\320L\34\261!\361\361j\367d\347N\3566\0324\310Z\2"
- #"\310I\354\331\303\376\255z?\32\222\223"
- #"\303\353\261$]\302\6\212\1\304\327\237"
- #"\234N\253\17 \361\0o\201\31l>\374\20\370\335\357\324\267iMNv\367^"
- #"#^/p\352\24\2578\226bh%I5\223\206\16\345\2\301\316^ k\327"
- #"\362> \251\251\362\264\341FU\374\23\340@c\266\307\272/\t\t<N`\305"
- #"\226-\274\306\344\333o\325\266\3465["
- #"\v\343\26\312\312x\374CJN\16K\316<\360@\360\363\24ft\0\1\270\326"
- #"\25\n$\203\274\345\345,O\341VRS\271@^\273V\236v\324(\376\36="
- #"Z\226\356\205\27\354o\322\323\255\eo\betK\272\tU\361O\200\3\210\244"
- #"\233.>^-\200\0\300e\227\261L\374\251S\326\266UU\254\34l<k7"
- #"\222\225e- \351\17\273\376\355\2t\0\1B\27@$}\364\271\271\274\302\330"
- #"\255\22\360ee\366w\35034\223\374Iw\230QX\310+\361\263\262\344\347t"
- #"\32ii,\343a\305\361\343\352\342\237"
- #"\0\313\214\204*\200DG\3\227\\\302\371\261b\373v\226\224_\265J=/N"
- #"c\3336`\360`y:\273\376\355\2t\0\1B\27@\0\226nPi\205l"
- #"\335\312R\17s\347\206./N\305\320L\362'\335aEa\241\373\265\301\216\37"
- #"gYv\225\0\362\376\373\352\342\237\200"
- #"\274\vK\22@\0\326\357\372\370ck;U\331\223H\2449\376\355pZ}\0"
- #"I\0B3\6bPP\240\336\215\245\"\221m\20\e\313\5\203K\6\3334\1"
- #" b\251\365\302B.d\254X\277^]\374\23`_\222\216\201H&\26\344\347"
- #"\363\32\31\25$\376m\264\310\334<f\322\nh\365\1$\344-"
- #"\20\3118\210\244\226\226\220\300*\253?\370\201;\373\3615\314\202"
-) 500
-(
- #"\5\274\30\356\317\177V\263_\267N]\374\23\bm\27\26 \v \22\377^\274"
- #"\230\3H\317\236\356\37|\217`Z}\0\361\2\262u\v=z\310N\320\267\257"
- #"\254\2250m\232\332\314\255\255[y="
- #"\300\r7\0?\371\211\372\361=\36\365"
- #"\376s\203\375\373\201\336\275\325\355\253\252"
- #"\344\367)#Cf\17\360t\312\232\32"
- #"u\373\334\\\331\236\24\3\6\4\226\37"
- #"\367C)\300\203\372\306'=\335:\321\v/pa\251\332%UU\305\255ZU"
- #".\276X\326ur\321E\262\26\371\245"
- #"\227\312&2\250\372\267\321\"\373\342\v"
- #"\376\377\2301\352\347x\341\5\331\324n\251\177WW\313g\fVWG\306X\235"
- #"/\341\\\305\350\4Z\325-x\373m\326q\332\264I\226\356\267\277%\2324I"
- #"\335\376\203\17\210\372\365\223\235\303\316s"
- #"\210\217'\332\267O\335^*\276\370\320"
- #"C\254\354\252H#_\312\315u\327\n\355H\340\360aV\224\270\374r\242\2622"
- #"\365tR\377./'\352\332U\226\267}\373X\245A\200\e\312\246V\337\2\251"
- #"\2x\20S\205\312J\356Ov\343z\215\36=\200\t\23\200e\313\270U\244\312"
- #"\351\323\274\a\305\324\251\352i>\376\230"
- #"\2736B\215\264\273E\252\2355}:\2578W\321I\363e\353V{3v\202"
- #"\311\361\343\274\276H\325\277\1\331*w"
- #"'\341\361p\253\240S'\326\201S]\337c\307\277\245\343J\0\267r\272t\221"
- #"\245q\1\255>\200D\3\352\5\204!O2n\234z\20\261\363\22\207\2\257\227"
- #"\35XZ\250\275\362\n\277\230={\252\247\331\264)2\2Ht4OM\236:"
- #"\225\245/\334\306\312\225\352B\241\0\27"
- #"\3027\335\244\276\312\35\340\373\237\224\4"
- #"\224\226\332\317g0\2300\201\273\1\237\177\236w?T\305\216\177K\307"
- #"\225\0\35@\"\232\25+\324\354\f]\241}\373X\351V\5\351K\34"
-) 500
-(
- #"*\16\35\222\313\223\0\\\200N\231\"K\323\222\1D2c\310\216z\357\325W"
- #"\263\6\222\e\225T_}\265\361\267\25\23&\260o\3j\332Y\0\a\232\275{"
- #"yp\274\266V\236\307`QVV\247O&\302\216\177K\247F\3\334\242\323\323"
- #"x#\24\325=\240KJ\370[\242\25%}\211\235\304%\227p\360\223\254\36>"
- #"y\222\a?/\2754t\3712P\225\3350\260+\276\270|yh\247z\253`"
- #"\247\373\364\223O\370[u\"@YY\375\204\17U\255(CXt\323&\226\312"
- #"w\23\211\211\274\205\260\244K\27\220\257"
- #"\356\at\v$\242\331\2749t\307\226"
- #"\276\304N\242\244\48\347\34^\344\246"
- #"\312\347\237\363l\247P\252\321\32H\273"
- #"\260\0\365\205\235\r),\3441\215p"
- #"bt\237\216\34\251\36D\f\237\v\245"
- #"\177\ey\271\372j\340\271\347\324\322H"
- #"\366(\t%^/\317j\223\356\355\241\273\260\352\320\1$\324\330y\211=\36V"
- #"\375\f7v\264\177Zj\0\35\260\27"
- #"@\276\370\2025\307\244\3230\303\215\321}z\364\250z\367iK`\b)\276\366"
- #"\32\360\331gji\346\315s\306\246\\v\365\333\354taEh\0\21T-#"
- #"\27C{\277m\333\266\241\225\341Ve\302\4\326\305\n7v$B\36x\08"
- #"|\30\370\317\177\344]ER\354\4\220Q\243\200?\375)h\302v\321\321\3218"
- #"s\346L\335\377C\346K%%<yc\354X\376v3\222=JB\211\235\5"
- #"\27099\374^l\337\316\255AU\24\307@|\375\311\351\350\26\bZh\17\a"
- #"\tO=\5\\~y\270sa\217\303\207\201\16\35xq\234*\306\224\313\2644"
- #"\3654ii\300\210\21\334\a/iM\4Y\330\316\366~ \36\17_\203dL"
- #"\243[7\365\361:'s\337}\274\247\211\235"
- #"=9\302\215\35e\335\324T\36\3\0357\216\307"
-) 500
-(
- #"\341L\250\363\247\324T\204y^\233\22"
- #":\2008\221\355\333\335\273j5+\213"
- #"7k\222L\27\356\323\247\361\267\n\213"
- #"\27\3\235;\363\277%/\263S\204\355&L\340\356MIwT\267n<\251\301"
- #"\355\354\336mY\220:\26;\25\20\303\257\273uc=0\25\26/\206\260m\35"
- #"\26t\0q\";v\0\231\231\352\366\307\217;gc$;\222\327\306&T\222"
- #"\315\250\n\v\201\242\"\226\vq\243LvY\0310i\22p\347\235\352i\"%"
- #"\200\354\332%\367WU\271\373Pc\247\2b\354\322\231\221\241^a(,\204P"
- #"p(,\350\0\342D\244\1\344\2157\2341fb\227k\257\345\226\3135\327\310"
- #"\322\25\26\362\2\266p\267&\354\"\21\"\4x-J$ta\331\t S\246"
- #"\310f\3:\211Q\243\370}\376\333\337"
- #"\2006\221U\344F\326\325D\n\322."
- #"\254e\313X\325\325\255t\354\310-\27\225\255Q#\ti\0i\315-\220u\353"
- #"\334\353\343\35;\362;mG0\324\341"
- #"\264\372\0\"\236\335/U\231\265\223\246"
- #"cGY\37qe\245\254\366\336\257\237|\16~N\16\257\310VE\252\224+}"
- #"\271jj\370\34\252H\25T\245\212\302\31\31\362AO\251\222mb\242L9\32"
- #"h\31\177\225\332\307\304p0\224\20j"
- #"\37\17\265\177\3b\37\327\203\350.@"
- #"\240\200\303|\371\245\374$\3224[\266"
- #"\360\212iU>\370@V{\377\341\17\345;\37\326\326\312\246=~\367\235l\212"
- #"\255t\312\357\267\337\312\364\305**d"
- #"R\356[\266\0\355\333\253\333\227\226B"
- #"\\\277l\327N\266>\350\334s\345r4-\341\257v\374[\332\35%\365\361\374"
- #"|\331\244\214P\3737 \366q\205\315"
- #"\0\302N\253\17 \255\222i\323\200\277\376UV#\312\314\344f\270*"
- #"]\273\252\355<g\227\312J\331F`\345\345\262ZoK.\210t\22"
-) 500
-(
- #"N\21\377l.\377\371\217\254\302\3404\377v\t:\200Hq\212\fCs\210\217"
- #"\a\216\35\223)\250fe\311^\260\304"
- #"D\347\5\20\211 \342\203\17\252m\b\345T\354\372\251S\304?\233KY\31\v"
- #"\210\252\3424\377v\t:\200H\261+"
- #"\303\340\366\300\223\231\251\266g\267A\327"
- #"\256\365\312\256\241\300\353\225\5\220={"
- #"d-\220\375\373\201\205\v\345\371r\n"
- #"v\375\324\256\370gy9\317\224\222j"
- #"D9\5\247\371\267K\210\330\0\342\361"
- #"x\20\27\27\207\270\2708\274\e\314\r\240\354\31208E\377\307.O?\r\274"
- #"\364\222\272}bbh_\260\312J\231B\256\264\v\313\216\16X(HL\264\267"
- #"'\270]?\265+\3769l\30\317\222"
- #"\222\310\353;\211\247\237\346\217\352D\213"
- #"P\373\267K\210\310\0\22\e\e\213Q"
- #"\243F\341\365\327_\307\312\225+1n"
- #"\334\270\340\5\221G\36\341y\335R\31"
- #"\6\247\350\377\330\345\372\353Y\246D\25"
- #"'vaI\2\210\235\5\221\241\300\353\345\202y\3300Y\272\222\22\326j\2325"
- #"K\226\316\256\202\357\332\265\34t\223\222"
- #"d\351\234\202T\242Dwa\1\210\320"
- #"\0\222\230\230\210#G\216`\360\340\301"
- #"(,,\304\362\345\3131J\262\247\205\31v\2248\1\336[c\3312y\340q"
- #"\2122\357\264i\262i\260\241n\342K\2HN\16\357<\367\300\3\241\313O\250"
- #"HM\345\235\366\226-\223\247m\311n"
- #"\226\216\35\201\203\a\345\2\23499<\2259\334>.\225(\321]X\0\"4"
- #"\200|\3513\255\360\307?\376q\235J"
- #"j\263\261\263\231\f\0l\334\310;\342"
- #"I\250\255\345\232\277\23V\37\307\307\3"
- #"_\177\255f\233\226\3065\271U\253B'\233.\t v\4\360\234BY\31\a"
- #"o;\335i-\331\315RT\304\255$\311v\262\0\267"
- #"\222\242\242x+\335p\"\225(\2311#\264\376\355\22\""
-) 500
-(
- #"2\200\370r\370\360a\34\222\314\3100"
- #"\303\316f2\245\245\274\256CZ\313Z"
- #"\260\200\273\4rse\351\302\215T\350"
- #"\320X\225\34\25\245\266\2002'\aX\263\2067\2R\231)\25d\5^\333\304"
- #"\306\332\23\21\2341\3x\361Ey\227"
- #"IKv\263\254XQ\257\371\244\312\311"
- #"\223\334\302NH\b\377\263\221\"\251\224\244\244\324/\30UQ\234NK\223-0"
- #"\r#\256\n \31\31\31\210\212\212\362"
- #"\373\311\b\260\246\301\343\361\240\263Q\230"
- #"\5\300\337\361\242\3\355\250g\247\vk"
- #"\303\6\240\240@\226f\353V\340\17\177"
- #"\340\351\224\341\336\rO\212T\350\320X"
- #"\3605d\210\232Z\251\361\362\306\304\250"
- #"\311\306\aY\2017::\332\257\317\0"
- #"\26\276\224\220\300\5\303\214\31\2742^"
- #"\225\2708\336s|\376|YF[\252\233\345\350Q\356\232\225\354\217Q[\v\374"
- #"\364\247@\257^\34\344$\317&/\317"
- #"\336\304\202`\"\251\224\314\230\1\f\35"
- #"\312\377\366\263\270\321\327\237\362w\355B\30\257L\6E0o\277\3756%%%"
- #"\321\246M\233\2\332\210oA\237>D&\307\363\313]w\21\315\233\247n_]"
- #"MTP@\364\3143\262\363\20\21\255"
- #"_O\24\23\303\37\267\260\364\377\267w\356\321QU\367\36\377\0166Q06\20"
- #"\4\22\242y'\274\224\247\274\2\21\360"
- #"\1\242\302\205\252\300\262\206\322\213\202\367"
- #"J|,\260\302U{\265vY0\24T\4+\336\336\266P\250\342\322\3622\226"
- #"+\"f\24\24\210\242\26,&1 \t$\2\202\4\220W\362\273\177\3748d"
- #"\b3\347\354}2\2239g\346\367Yk\326\204a\357s\3669\347w\366o\277"
- #"~\337\275\214\b \0322\204\250\256\316:}u5QF\6\221\327\e\362\242\351"
- #"\240dK?\374@4f\f\321\240AD\373\367\253\37"
- #"\374\340A\242v\355\210\252\252\324\363l\333F\324\273\267"
-) 500
-(
- #"zz\3\335wb\311\22\242;\357\324\313\363_\377\305\317\373\364i\275|DD"
- #"\23&p\03132\364\363\206\203\272:"
- #"\242\353\257\3472/_\256\226\247\270\230N\270\240zv~\tm\242\342<\210l"
- #"8\220\16\35\210\366\355\323\313\323\253\27"
- #"\321\207\37\252\247/,$\0321\202\250"
- #"\276^-\375\301\203D\363\346\21u\351\302\237'\236\340o\267p\364(QV\26"
- #"QYY\270K\242Nq\361E\367X\331\226\352\353\211f\317&\272\352*\242\315"
- #"\233\325\3179s&\321#\217\250\247\257\252\"JLTOo\240\373N\214\32E"
- #"\364\372\353\352\351\227.%\312\314$:p@=Oc\e\317\316v\\\3\302\224"
- #"\322R\266\361\243G\225\263\270\241}\357"
- #"\374\22\332@\325y\20\331xH\327^\313=\4\35z\365\":qB=}n"
- #"\256^e\332\267/\321=\367p\245\246"
- #"B\317\236\334\n^\266L\335\240u\313"
- #"\324\275\273\326\313B\331\331z\367\365\344"
- #"I='Y]M\324\247\217z\372e\313\314\323\247\246rE\353\363)\327\265%"
- #"\253s4\246\272\232h\360`\365\364g"
- #"\316\360s\320\245kW\275\364\375\372\351"
- #"=\353\276}\271w\244\203\256\215w\357"
- #"\256\227^\267L\272\366M\244\327c:y\222v\212\3\t\17iii\4\340\202"
- #"OF\200\207\347\6/\37t\216\36\345"
- #"\312k\314\30\36\352\0323\206('\307"
- #"\274E\367\362\313<\254\246Z\311\337q"
- #"\a\2674UIJ\322\e\236\371\344\23\242\353\256SO\377\360\303D\263fY\247"
- #";u\212h\312\24vN\273v\5N\327\224\36\210\20z\32\367X:w6\267"
- #"\357\242\"\242\344d\242={\324\216\257k\337Dz=\273O>\241\255.\260'"
- #"\347\2270\304D\375K\177\364(\17\227\1D\351\351\201\323\325\327\23\r"
- #"\37N4w\256\332q_{\215h\364h\365r\364\351C\264u\253z"
-) 500
-(
- #"\372\205\v\211\246NUK[Y\311\363"
- #"\a\a\17\232\247\333\267\217\347&\306\214"
- #"\321o]\222\330\222c1\346\5\315\354"
- #"\233\210\207\25{\366$:v\314\372\230"
- #"\272\366M\244\347@\26.\244?\270\300\236\\\265\nK\b\1W\\\301\242s\323"
- #"\246\361\222\312@x<\300\342\305\300\234"
- #"9j\253\302F\215\2>\374\220W\350"
- #"\250\240\273\344\264\244D]-w\356\\\340\336{\315\367\322\360zyuOR\22"
- #"/I\215\266\315\255\"\231\353\257g\e"
- #"\267\222S\177\3541\336\360\215D\256\0\0 \0IDATG$?\237W\211"
- #"\231\241k\337\272\224\224@c\253\261\260"
- #"!\16D\0\266l\1\26,\260\226\241"
- #"HM\345\345\223\267\337n\35\v\323\252\0250lX\203\204\213\25\272KNU\35"
- #"HU\25\260l\0310}\272y\272\211\23\201\203\a9\222\332\255[\247\nM\347"
- #"\305\27\331\321\244\245\231\v\237\352\332\267"
- #".\342@\204\210d\351R\216\216V\21"
- #"\315\273\353.n\315\253\240\0235\375\343"
- #"\217\34\327q\3155\326iUz\37\0_\23\221\376\206MBd\321\262%\357\205"
- #"\262w\257\265\360\251\216}\353p\316\276"
- #"\377\31\374#\a\35q \272x\275\334Zv\253,{S\331\260\201\207\273T\366"
- #"\264\326\351\346\353\fa}\371%G\347"
- #"\a\n\366\364=\346\37\376\240\37!\355"
- #"v\232\272u\200S\364\327\302\305\a\37"
- #"\260\215\257[g\236.T\303X\347\354"
- #"\373tp\217\32\22\304\201\3502i\22"
- #"\267\224\355\310\262\273}\317\4\200+\246"
- #"\5\v\324\266\377\374\376{n\371\253\354|\2503\204\245\272[`u5p\362$"
- #"0a\202\332q#\205\302B\3736\352\365\2\267\335f_\177-\22\234\217a\343"
- #"_|a\236\256U+VCh\335:\270\232Xn\332\r3\334\263\370\341"
- #"F\373\26\274\376:Q\373\366\274n\\\227\354\354\206\270\201h@\347zsr"
-) 500
-(
- #"8]NNp\322\21\21\245\245\21M\233\306\253\260\232\201\240\276NW_\255~"
- #"\235\2151\356\221\3162g\203\2644\316"
- #"{\325U\372y\353\352\210\256\2742z"
- #"\354\233\210h\372t\242\230\30\242\0313"
- #"\314\323\351\330m\2336D\0}\343\202\373(=\20]\252\252\270E\273e\213~"
- #"\336\374|\26JS\31\376i\214!{mG\214/\\\350\16w\1\326\342t:"
- #"\"v\25\25j\213\3\234\310\270q\374"
- #"\235\232\312.X\207]\273X9\331\316"
- #"\346N\25\25\300\274y\254\2\255KS\304?\335h\337\0ka\245\244Xkb"
- #"\351\330\355\341\303@\\\34&6\275t"
- #"\241'\334\36,\334h\337\202\377\374O"
- #"\242\27_\324?\321\216\35\34\213\260{"
- #"\267^\276\263g\211\26/&j\335\232[0V-\35\267R]\315\362\02655"
- #"\301I\27\6\374\332\222\321\223HK\323"
- #"\213\2647\256\263wo\242q\343\364\224\f\f23\211\376\371O\375|vl\\"
- #"\354\333\34\35\273='\323\342\206\352Y"
- #"z \272\224\225\361\376\311:\324\325\261"
- #"\232\3523\317\350\265\260\336\177\237\307B"
- #"\27-\2^}\325\236$\271\335-Q\233\eU\305\334 +\353\206\34\243'q"
- #"\352\24?\373\2313\325\366U1\256s"
- #"\323&\36k\357\337_\177\233\331\21#"
- #"\200w\336\321.\262\266\215\213}[\243c\267N\331\rS\205p{\260p\243}"
- #"\v\322\323Y\30M\a]q\304/\276 \272\351&\326[Z\261B-_M\r"
- #"\253\4\257^M\364\322K,\274\227\237"
- #"\3370\a\221\225\245Wf\341b\366\356"
- #"\3459\225\0\2\205~m\311\267\345\271s'\321c\217\21u\354\310\2620/\277"
- #"Lt\370\260\332\271\237\177\236\347\3366"
- #"nT/\357\2325D7\334\240\236\336@\327\306\233\303\276\353\353Y)\340"
- #"\243\217X\321\366\331gYr&\202\355\333\r\325\263\363K\30b\340\243\227"
-) 500
-(
- #"\25\23\23c\235\241{w}\tj]!\302^\275\210~\365+\226\376Va\360"
- #"`~\201\206\fa\2471k\26;\221"
- #"\325\253\375O$\367\351\303\222\35\323\247"
- #"\23\275\371\346\205\32T]\272\370\327\f"
- #"\352\333\227\350\325W\325\257\241wo\275"
- #"\341\214\234\34\275\373\372\335wD=z"
- #"\250\247/.&\328\320:\335\331\263"
- #"\254\2134~\374\305\307\317\310\270H@"
- #"\261\261\230\242\222-\371\236\243\177\177\365"
- #"kx\375u=y\366\332Z{\23\351\2726\36j\373&b{\355\324\211\345t"
- #"\246La\a\262|y\340\205\22\201l"
- #"\374\350Q\377\272o]\272\350\225\311\216"
- #" \244\202\215\307\304\304\20\0j\a\320vq \316\307\r^>\350\234:E\364"
- #"\361\307\334\252\2350\201(%\205?\306>\vqq\27\277`\273w\23\345\345\21"
- #"\335|\263\232\234\375SO\261\340\234*YY\346\342\205\215y\372i\256HTx"
- #"\367]\26\312\363\247\316l\210\"\252\364"
- #"\16\214\36HZ\232\337\323D\245-9\225@6\236\227G\324\262\345\3056^Y"
- #"\311\215\257\204\4\326\304:u\312\374\370"
- #"\272\342\213Dz6\376\364\323\364\212\v"
- #"\354\311\371%\f1\362\322\237\243\252\212"
- #"[jF\213\332\237\360\334\331\263\374r"
- #"%'\363\360\210\31'N\360\20\205\352"
- #"\220\313-\267\20\255]\253\226\366\324)"
- #"\256\350U&\210\255\234G\\\34_or2;\220\257\276R+\203\37\304\226\34"
- #"NU\25\367\310Z\265\n\274!\325\226"
- #"-\334s\311\311\341\36\274\31:\342\213"
- #"D\3526~\316\276\273\271\300\236\234_\302\20#/}#Tb'\336{\217W"
- #"\27=\364\20W\274\201V\226\374\365\257"
- #"\374\202\251\254>*( \232?_\255"
- #"\214\313\227\23\r\ef\235\316\314y\20"
- #"\261\223\214\215\345\312Dw\217\27?\210-\271\200\356\335\255"
- #"\367\3021V\206]y%\367\32\314d\340\357\275\227h\354"
-) 500
-(
- #"X\265\2354Um\374\234}\273\301\236"
- #"\234_\302\20\343\206\207\344H\16\36\344"
- #"\315\265\314\226^\326\327\363\374\314\377\374"
- #"\217\365\361^x\201\350\201\a\324\316=p \321[o\5\376\377\352jnA&"
- #"%\231\277\374\26CR\272\210-E\30FP\245\231\f\374\211\23<\0372q\242"
- #"\365\6g\2526~\316\276\335`O\262\214W\260G\333\266\2744\25\0V\254\360"
- #"\237\306\343\1~\367;\340\361\307\201\256"
- #"]\315\217\227\225\305\313\34\255\350\334\231"
- #"%a\214\300,\177\24\26\362R\310V"
- #"\255\314\227C\352\310\262\b\321\207!\260"
- #"i&\3\337\262%/=^\262\4\370\352+\363\343\251\330xR\22\360\351\247@"
- #"\357\336\372\345\r\3\36\"\3350\327\310"
- #"\302\343\361 \312oA\350INf\241"
- #"D\263\373\234\236\316q\16\351\351\346/"
- #"\254\307\303\221\355f\225\376\265\327\2C"
- #"\207r\314E3F\241\213-E)\206\355\266i\303\372of\351\216\34\341H\363"
- #"@x<\374\235\223\3\317\327_;\336"
- #"\236\244\a\"\204\236\327^\3\262\263\315"
- #"\323,Y\302\216a\311\22\363t\331\331,)o\306\227_\272W\302Dp\37F"
- #"O\305\314y\0l\333\355\332\231\247IKc\371\237\r\e\202V\274P\"=\20"
- #"i5\nABlI\b&n\260'\351\201\b\202 \b\266\20\a\"\b\202 "
- #"\330B\34\210\35\322\323\201\204\4{y"
- #"\317\234\341\274\31\31\366\362\273E<."
- #"\332i\312\346aF\336\356\335\355\235\273"
- #")\366\5\210}\v\312\210\3\321\245\276\236\215\274uk\375\274\e6\0={\2"
- #"?\375\251\365dqc\366\355\3\336z"
- #"\213\367xx\351%\340\372\353\325\363v"
- #"\351\2\214\35\v,_\316\373=\v\372x\275\326K\221}\311\313\343\347T]\r"
- #"\374\357\377\362^\353g\317\352\345\215\217\347\345\310\272$"
- #"&\362N\214\37~\250\237\27\340\n\374'?\321\317\27"
-) 500
-(
- #"L\373\36:T/\2778\236\260`\303J\242\234y\363\370\5\371\350#\365<\25"
- #"\25\300\203\17\362\36\325\177\371\vp\335"
- #"u\346\351O\237\6>\373\f\370\370c"
- #"\376l\332\304\277\347\346\362w\\\34\37"
- #"\307\227\37~\340mL\17\34\340\357\232"
- #"\32>\237\361\367\277\376\5\254\\\311\222"
- #"\331*\361\26II\300\235w6\373R"
- #"\330f\303\353\5\356\273\17\330\272\25\270"
- #"\342\n\353\264\343\307\253o\271\vp\5"
- #"z\353\255\300\261c\274E\351+\257\260"
- #"3\350\324\211%\314\215O\267n\27W"
- #"\326K\226\0\367\336\313=\220[o\345"
- #"\337F\216\344\317\320\241\34\337b\306\316"
- #"\235\34K0z4\333\311\2157\252\227\e\0006n\344J\\\225`\332wZ\32"
- #"p\373\355lw\2159t\210\35LU"
- #"\225\377\357\227^\2\376\361\17\240\264\324"
- #"\272\314\221n\337\315\204\254\302\322]\351"
- #"0h\20\277\340*\373|\e\344\346\362"
- #"\16o\17=\4\304\304\250\235\303\343\1"
- #"\6\f\340\274\3\6\360\236\341\0\267\202"
- #"\27/\2760@./\17\330\263\207\323\264o\317\237\244$\376NL\344\0\247?"
- #"\375\211{\37+W\2\277\370\205y\254\205/YY\374B\366\357\317N*5\225"
- #"_r\343\323\256\35\360\300\3\300\37\377"
- #"xa\231z\364\340\np\312\24.\237\25\327]\a\24\25\251\355\227PY\t\314"
- #"\231\303\373I\374\363\237\27\376_M\r"
- #"\320\257\37\337\17\200+\355w\336\341\317"
- #"\201\3@I\t;\204\321\243\271\279q\"?K\177\225Rb\"\260ys\303"
- #":\177\v\276\1\220\341kK^/0u*W\350\0\17\357\354\330\301e0>"
- #"11\326=\5\337k8z\264\241\302\265\302\353\5\36{L=\275A\377\376\300"
- #"\372\365\326\216\325 \230\366\35\210\274<"
- #"~\356\311\311\374\\\32\177O\235\332\340x\222\223\371\231\252"
- #"\330\270\257}\177\377=\347MI\341 S\343\357)S."
-) 500
-(
- #"v6\275z\261\375\337u\27\a\265\252\334+U\e'\2\26-\302'\323\246\241"
- #"\277\303\253gq .X*\327djk\331x\eW\362f\244\247_\370B\22"
- #"q\305ZQ\301\225\363\356\335\374Y\265"
- #"\212+\355\306\1\200\207\16\261\243}\365"
- #"U\3767\21\377\35\350\374\263fqd"
- #"\373\274y\201\313\344\365\2\277\374%p"
- #"\360 o\17\354\257\3658c\6\360\373"
- #"\337\263S\373\307?\370\267\306\255w\337"
- #"\312\345\312+\201\273\357\366_)\265m\313i\f\207\265v\255i\0cT\330R"
- #"\244\320\330\276\1\356AUVr\343\341"
- #"\333o\e\3766\342\216|{\357\265\265\300\2325\300\eo\0\37|\0\f\31\302"
- #"[\t7n\334\3712u*\333\220\3310[\327\256<\207\24\e\213\214\367\337\307"
- #"7\16\267'q F\344'\200\230\230\30\234>}:\214\245q!\375\372q\353"
- #"\315l(\240\270\30\0303\206[\374\201Z\20555\334\312\363z\3\237+=\235"
- #"\347\2406m\n|\256\224\24\376\236>\235\235FN\316\305i|_\376\212\n`"
- #"\373\366\300\347\264 66\26g\316\234"
- #"\271\350w\261\245\b\302\237\263\361\305\260"
- #"\247i\323\314m<=\235{\361&\1\207\207=\36\34\4\320\t\3476\226qx"
- #"\365,\16DZ\215B\220\20[\22\202\211\e\354IVa\t\202 \b\266\20\a"
- #"\"\b\202 \330B\34\210 \b\202`\vq \202 \b\202-\304\201\b\202 "
- #"\b\266\20\a\"\b\202 \330B\34\210 \b\202`\vq \202\177\254\304\351N"
- #"\236\344\b\334\344d\226\245HM\r|\254\342bk\205\326\232\32k\r%C%"
- #"\326,\222\327H\363\302\v\201\205\bkkYXr\354X\226\\QAWLQ"
- #"p6:\342\213Vi\r{\n\206\215'$\260\254\213\303\343?\f"
- #"DL1\32\250\255e\31\206\361\343\e\242i\315\304\27\277\373\256A"
-) 500
-(
- #"\234\256\250\b(/g\207\361\311',"
- #"\264\267q#\253\313\366\350\1t\356\314"
- #"y\307\215\273\360\234\215\245L:th"
- #"\370\333\37\263g\3\303\207\233_\307\222%,e\322\255[`)\223%KX2"
- #"\242\264\224\267\265\5.\2262\351\331\263"
- #"!Z89\2315\234\314\244L\354\210)\32\371|\265\260\204\320\341O\34QE"
- #"|\321\260o \260\224\211?\241F\177R&\211\211,e\22\b\25\eOLd"
- #"'r\343\215Ho\372]\t9\22\211"
- #"\256\e\355\231\233\v<\367\234\272\246\24"
- #"\240/,\250+\354\246*\34\a\360\236\342\35:\230\213/&&\262\\|\333\266"
- #",\2768x0_\367\245\227r%<l\30\227\361\322K\331y\f\32\304\362\""
- #"\276\"q\375\372\261\362\254\3525\347\345"
- #"\1o\276\251'\246\370\361\307\254\246k\206?!B#\377\252U\\1\349\342"
- #"\277\222\271\372j\356=\331\21S4\4"
- #"\e\217\34\1\326\255\v\\\221\31\202\215"
- #"\276\324\324\260R\357\247\237\362\375\360'\bi\3059A>,]\312\367I\a\35"
- #"aK \364\366\r\250\333xF\6;\4+\361\305\21#Xvd\315\32\266\357"
- #"\274<~&\376\312\364\340\203\27K\231"
- #"\f\30\300\357\214\216\230\242\252\215\213\230"
- #"\242{\320v Fk\264uk\365\226\245\256\260 \240'\354f\305\330\261\274W"
- #"C\237>,\250\230\256\320\266\361\247\372"
- #"\e\255\330\21S\314\310hH{\307\35"
- #"\201+2\243\227\343\313\214\31\300\374\371"
- #"\354\204\17\34\340\337t\344\334}\4\371"
- #"\224\237\267/*\242\177\276\204\333\276\1"
- #"\36FMJ\2V\254P\263Y\27\330\267\e\244L@Q\216\255[\220\226F\324"
- #"\246\215\275\23~\360\1\347MO\267\227?-\215h\3324\242\312J\365<\275{"
- #"\23-\\HT_o\357\234\202\22\27\330\322\336\275"
- #"\374\234\322\322\364\17t\365\325D\0Q\317\236D\273v"
-) 500
-(
- #"\351\347o\323\206(;\333\376\363v\233}\23\21u\351B\344\365\332;\247Cq"
- #"C\365,=\0207xy\301\25\210-\t\301\304\r\366$\253\260\4A\20\4["
- #"\210\3\1{z\217\307\203\330\330\330p"
- #"\27Ep\31\261\261\261\347\355\a\20[\22\232Fc{r:\342@\300\233\266\20"
- #"\221l\0\24Njjx\345\313w\337\205\273$Z\234>}\372\274\375\0bK"
- #"\202\t55\346\361R\270\330\236\234\216"
- #"8\20!\364x\275\r;\5\6\242\260"
- #"\220W\341\24\26\232\247\273\372j\353="
- #"\304\5\2419\251\254\344@\303\244$\363t\263g\363\21233t\2\34\35\200L"
- #"\242\273`\242\312\325\324\327s\334\311\301"
- #"\203\346\321\265\235:q\274Cn.\360"
- #"\321G\201\323%$\360\361\276\372*p"
- #"\232\224\24`\357^\336\316v\327.\373e\327Dl)J\311\311i\b0\264\262"
- #"\361\23'\3306\3\221\220\0\34>\f"
- #"\364\352\5\317g\2379\336\236\244\a\""
- #"\330\247S'k\31\223\227^\342\230\207"
- #".]\314\217u\377\375\34\260e\346<"
- #"\0~Q\17\35\2\366\355\v\234\306\210\212OMu\215$\204\340@\f\373\366x"
- #"\2K\224\374\370#\a\21\16\e\6\244"
- #"\245\231\37\357\376\373\201\237\375\314<M"
- #"i)\320\256\35\307\341\270\0q \202>uu\34(f\314W4\22611\330"
- #"\271\23\370\355o9\342\333*\350\262\254"
- #"\f\310\312\262>w\333\266\300\344\311\300"
- #"\334\271\201\323<\372(\a\242\35:\4L\230\300/\271?RR\270rHO\347"
- #"k\22\4\203\312J\340\362\313\371\357\270"
- #"8\16\224lL}=p\367\335@\357\336\34\250k\22d\n@\315\306U\354\333"
- #"A\210\3\21.\244{w\3631\330\367"
- #"\337\347\210\366E\213\330\211dfr\205\335\230\272:~\21\236y\306r\342"
- #"\20\200\272\3\18R\373\257\177\r\334\v\351\320\201\217\267i\23Gm\367"
-) 500
-(
- #"\357\357_\212\304p|\247Nq\31g\316\4\376\365/\2652\b\356\305l\236\301"
- #"\230\317\270\346\32\266\233\234\34\226\220\361"
- #"\27\261\376\344\223<\334\264h\221\332yUm\374\234}wT;jxi\356\310"
- #"E\247\21\265\267\240\246\206\250\244\204h"
- #"\365j\242\227^\"\2329\223(?\237"
- #"\250m[\216\202\316\310\2700\375\27_"
- #"\20\335t\23Qj*\321\212\25\326Q\316\205\205D#F\250GC\247\247\23\225"
- #"\226\252\227\177\346L\242G\36QK\373"
- #"\374\363D\355\333\23m\334x\341\357\325"
- #"\325D\231\231|/v\356$z\3541\242\216\35\211\6\f z\371e\242\303\207"
- #"\e\322\32\221\345\211\211\1O\23\265\266"
- #"\344T\2\3318\17l\22ee5\244\375\372\353\6\373\377\357\377&:p\300\374"
- #"\330K\227\262\355X\245\363E\307\306g"
- #"\316\244y.\260'\347\2270\304h\277\36499D\247O\353\345\311\315%*+"
- #"SO\337\245\v\321\257~E\364\303\17"
- #"j\351\373\365\343\227a\310\20~\tf\315\342\27f\365j\256\360\32KC\f\36"
- #"\348\375\306\215|\215\215e!z\365"
- #"\322+\223\3565w\357\256w_\253\253\371:Ty\375u\226t\261\342\354Y\242"
- #"\242\"\242\361\343\211\372\367o\370=#"
- #"\243\241\342\t\360)W\265\245\243G\211"
- #"\226-#\0323\206\357k\260\257\301\240"
- #"\266\226\250[7\365\364\6\2726\256\373"
- #"\254\273u\323\227+\351\323\207h\350P"
- #"\242\247\236b\271\224\223'\371\367\243G"
- #"\211\222\223\331Y\370bf\343\376\344R"
- #"\372\364\321+S\337\276D\333\266\251\227"
- #"\237H\317\306\253\253\311+\16\304\371h"
- #";\220\254,}}\242\227_\346V\355\331\263j\351++\331\350\23\22\210f\317"
- #"&:u\312:\217Uk+3S\257\314\302\205(h[\371\265\245\342b"
- #"\256\220\313\312\32\234F\2336\374\275l"
- #"\31W\200V\324\325\21=\370 \237\373"
-) 500
-(
- #"\213/\324\313\374\367\277s/P\27]"
- #"\e\327\265\357\3\a\270\225\337\266-\333"
- #"\350\327_[\347\371\361Gn\334<\365\24;\2226m\370{\374x\266\357\0313"
- #"\324\313\353\22\334\320\243u~\tC\214"
- #"\366C\272\345\26\242\265k\365\362\324\327"
- #"\23\r\37N4w\256^\276\r\e\210z\364`Q\2757\336\360\337\322\262\302\256"
- #"8\235\240\315E\266T\\L\24\27\307"
- #"\25\334\245\227\3529\r\203#G\210F"
- #"\216\344\226\364\301\203z\5\2322\205\207"
- #"\357t\321\265q\273\366m8\345\370x"
- #"\242\373\357\367\337\363\r\204\341P\262\262"
- #"\370\376\246\246\352\235\333\5\210\3q\0"
- #"\245\245\245t\331e\227\5\374\177\355\207TP@4\177\276~Av\357&j\327"
- #"\216h\307\16\275|g\317\22-^L"
- #"\324\272u\304\266\264\210\210\207\244\3548"
- #"H\aq\221-\245\2455\364\0ss\365\16f\334\217\336\275\211\306\215#:q"
- #"B/\177}=\321UW\331S\363\265c\343v\355\233\210\35I\257^|\237\342"
- #"\342\364Tu{\364pG\3\311\206}"
- #"\273\301\201D\364*\254\272\272:\344\347"
- #"\347\343\344\311\223\301;hV\226\336>"
- #"\5\6\251\251\300\23O\360\262?\235\255"
- #"Q/\271\4\270\357\276\206MhV\254\320?w8Q\211B\a\324#\321kj"
- #"8\256\304\r\222'\25\25\r3$V\361-\2151\356G\333\266\300k\257\1-"
- #"[\352\345\337\261\2037\374\312\311\321\313"
- #"\a\330\263q\273\366\r\260\204\315\361\343"
- #"\374\367\261c\300\304\211\352y\267o\347"
- #"\235'\e\357L\3514T\355\e8\277J\314\341W\4 \302\227\361\316\237?\37"
- #"\361\361\361\301=hb\"oc\331\275"
- #"\273~\336i\323\330\210\314\242\250\3\261k\27WD{\366\350\347\r\27^/p"
- #"\353\255\346\221\267\6k\326\360\367\246M\346\351\n\vy"
- #"\371\256\312\213\350f^\177\235\277\217\37\347X\25\35\272w"
-) 500
-(
- #"\a\376\375\337\201\233n\262w\356\313/g\247\245K0\354\233H}wM'\340"
- #"\365\362\316\236V\r\32U\373\6xg"
- #"\304E\213\260\241\351\245\v=\341\356\2"
- #"\205\212\35;vP\273v\355h\367\356\335\246]A\355[`\254\306\261;\224T"
- #"\\\314\253\254\242\1\337\225KV\254\\I4j\224u\272\234\34\365!!\177+"
- #"\320B\210c^\247\351\323\233\266p\"5U\355\231\371#\232\354\233H\257>P"
- #"\275\247\355\333\23\335x#%;\305\236L\210\310\36H]]\35&O\236\214g"
- #"\236y\6\251*Al:\374\371\317,k\340/xN\205\274<\365\255p\235\212"
- #"\352\260\324\332\265<\214b%\361\0\0"
- #"\373\367sK\316\212]\273\200\277\375\215"
- #"\345\36\254\250\256f)\225\en\260N\eI<\372(\333\350\237\377l/\377\322"
- #"\245@v\266\275\274\221`\337:$$\0\267\335\6|\360A\360\216\371\302\v@"
- #"\\\34\334 \247\370\223p\27@\207\314"
- #"\314L|\23\240{\233\221\221\201\362\362r\0\rCWS\246LQ:\256?\355"
- #"\375\230\230\30\377\222\334yy\300\271\363"
- #"D%\365\365\254\347s\360\240u\332m"
- #"\333\200Q\243x\310\317\212\375\373\255\325L\r\6\16\4\36z\310:]Z\32p"
- #"\344\b\360\354\263j\307U$66\26g\316\234\361\373\177Z\266\24*:th"
- #"\232\215\346\345\261\260e\264\222\236\316\312"
- #"\5\351\351\346\303i\237\177\316sr\237"
- #"|\2\264\260\337\26olO\251\0\266\330>Z\363\342\252\36Hyy\371y\255"
- #"\374\306\237r\237\27\346\305\27_\304\272"
- #"u\353\320\242E\213\v6\372\311\314\314"
- #"\364{\\\177\307\223\375\34\2\240*\216"
- #"\b\260\343\270\353.\265\343\356\333\247\356"
- #"@RS\201\230\30\353\261\362\212\n.\357o\177k\255ue\350bu"
- #"\352dyz\337=\e|?\200\330RD\360\320C\201\365\257|\371\313"
-) 500
-(
- #"_\200\237\377\274I\316\3\270\330\236v\23\241}r2\2\3107:\nW9\20"
- #"U\276\375\366[\277/vy4\367\34\202\201\2168\342\17?\360\312\243\333oW"
- #";\266\352\20\226A\377\376\300\346\315\326"
- #"\351\356\276\233+\3\253\341\34C\27+1\218{V\275\34Bd\261~=\v"
- #"\31~\360\201\177\375+\2033g\200e\313\200_\37624\345\350\337\37\3Cs"
- #"\344\240\22\221\16D\320\240\266\26X\276"
- #"\234\307r\3IV\3\372\342\210\253W"
- #"\363\334C\253Vj\345\330\267O\317\201"
- #"\f\30\240\346@<\36\256\20\36\177\234\235Z \f\5\337\26-\200\221#Y\311"
- #"W\210\f\212\213\331\276\255\354v\375z"
- #"`\322$\266\335\336\275\315\323\26\25\361"
- #"\373bg\231\264\n\3\6\210\3q\n]u\327\245G:\206\323\30;\226_\252"
- #"7\336\340\226\267Y\227}\376| >"
- #"\36P\234W\322\32\276\2\364\206\260\0\236\aQq \0\367Vn\276\231w\204"
- #"\v\204\241\340\273a\3/\177\355\331\23"
- #"\370\370c\365\362\b\316\342\320!\266\331"
- #"\256]y\37\216\303\207\3o;\0\350"
- #"9\17\200\207\257~\361\213\240\25\367\""
- #"\6\16t\205\3q\376:\261\20\243}"
- #"\v\262\263\3255\177\f\272w\327\223\257"
- #"\320\25j\353\331SO&\243\177\177}"
- #"Y\r]\301\274~\375\364\256\371\332k"
- #"\365\356\353\361\343zB\204\273w\353\211"
- #"/.[\306\2{\201\360\2152\327\25S4(.&\328P=}u\265y"
- #"\231\32s\346\f/{\326\245\261\22\263"
- #"\25\272\366=x\260\236\3622\21\337\247"
- #"\302Bu1\302\276}\211\356\271\207\3571\21Q\247N\346Q\340\3\a\352E\300"
- #"\367\355Kt\350\220zz\"\242\256]\325\323\36?N\237\272\240zv~\tC"
- #"\214\266\3\351\320\201h\377~\275<w\334\301\362\317\252"
- #"\24\25\261\354\301\236=j\351}\325]\r\241>\35]"
-) 500
-(
- #"!A\37?\361\16Z\266\364\356\273\374\214KJ\324\363<\3740\253\312\252RY"
- #"\311\362\364\272\350\276\23\272\366\275t)"
- #"\3215\327\260\236\225*\225\225D\23&"
- #"\260\222\357\206\rD))\256\226\275Q"
- #"\301\r\355{\347\2270\304h?\244\356"
- #"\335\211\266o\327\313\363\332kD\243G"
- #"\353\345\231=\233{\26\307\216\351\345;"
- #"z\224\25X\1\336\177\300\rTW\23%%\251;<C\302[\247G\324\f("
- #"\333\222\35\347QY\311ZS:\202\212[\266\20]w\235zz\3\335w\302\216"
- #"}\377\374\347\34\360\250\313{\357qK"
- #"\336m\272p\305\305l\343\252N\257\264"
- #"\224>\27\a\342|\264\35\310\3157\23\255[\247\227\347\370q\226f?rD/"
- #"\337\275\367\22\215\35\313r\336:\364\355"
- #"\e~\201\271\342bn\375\252\fm\30\221\323\252Nd\3312N?d\210\376\275"
- #"\t!\226\266\324\245\v\213\24\3528K\3\335\336\a\221zt\177ct\337\t;"
- #"\366}\344\b7p\212\212\364\316E\304\303Xm\332p/$\\\34=\312b\225"
- #"*\366m8\17U\247w\366,\313\343\273\300\201D\305$zP\351\320\201#\234"
- #"uh\325\n\0306\254A\17G\225\27_\344-6\257\274RO<p\313\226\360"
- #"\n\314y\275\300\350\321<1\276v\255uz\343\276\354\337\17<\360\200uz#"
- #"0\261\274\34X\270\320~9\233\233\257\276\342mPW\2540_\"\332\230\252*"
- #"^2:}\272\336\371t\227F\333\305"
- #"\216}\307\307s\304\373\375\367\253\5\245"
- #"\372\22\23\3|\377}xu\341V\256\344ws\325*\353\264\23'\362\263\0\324"
- #"\264\260\26.d\5\a\27 \16D\227\304D\216>\325\345\256\273\324\"\262}i"
- #"\331\222\243\202\217\34q\227x\340}\367\1W\\\301\177\253\\\363\256"
- #"]\374M\304\321\275V|\366\31\177WV\2\177\370\203u\372\232\32V"
-) 500
-(
- #"|\r\267\202ovv\340\375\265\315\230"
- #";\27\270\367^V\346\325A'\272\277"
- #"\251\330\261\357A\203\2001c\200\241C"
- #"\233\257\234\301\342\255\267.\3746\303P"
- #"e\6\324T\231\2158\24\27 \16D\227\16\35\3549\220Q\243\200\17?4\217"
- #"E\360\307\332\265l|\206:\253\e\330"
- #"\272\225\227D\306\307\207FYu\367n\340\316;Y1v\307\16\353\364:R\332"
- #"\241\344\353\257\365\235GR\22;I\235"
- #"%\321\6\272K\243\233\202]\373~\347\35~\206\272\275\372pc4bv\357\16"
- #"\376\261\277\375\266\301\3418\34q \272"
- #"\330u \337\177\317-\310\0r*\0011d\256\277\375V\377\234\301DU@\21"
- #"\340\336Gf&\17cm\337\36\232\362\264k\a\348\240\226VGJ\333iT"
- #"W\3'O\2\23&\350\347m\256!,\300\276}o\330\3002\360*\202\233\241"
- #"DU\226\335\340\351\247\201\374|\340\323OC[.\207#\16D\227\313/\347V"
- #"S\347\316z\371n\270\1(-uo\204\363\304\211\300\211\23\352\351kjx\270"
- #"/T\3508\220]\273\270\5\257\"\300"
- #"\3504\322\322\270\202\335\240\271;D\247"
- #"N\300\333o\353\317\233TV\362ws\331\367UW\361|]E\205^\276`3"
- #"i\22;\\\325^j\250\355\333%\210\3\321\345\361\307\371%\321\215nwJK"
- #"\313.\v\26\0\375\372\251\247\257\251\341\336Z\250\320q \0WT*\e[\31"
- #"\244\244\360\220L\270\251\250\260\267 b"
- #"\324(\376\36=Z/\337\3157\363w"
- #"\264\331\367\357~\307\273~\252\316=\204"
- #"\332\276]\2028\20]n\273\215\277u"
- #"\307\244\235\322\322\262Ki\251\336\36\21"
- #"\241~\301\332\267\327\233\24\277\352\252\206"
- #"\326\265\n\307\216\251\255\bs*\206\266\227\356\2765\321j\337UU<"
- #"L\270EQH]\34\b\0q \0X\352\335\343\361 66\326:\361"
-) 500
-(
- #"\243\217\362\236\321\252*\263N%=\235"
- #"\5\346T)+\343\353V\305\211=\20"
- #"\35\ar\327]\274\304\324\202\330\330\330"
- #"\363\366\3h\332R(1\264\275\332\267\327\313\27)\366][\253\327\er\210}"
- #"7\266'\247#\16\4\r{8(\355"
- #"\333\320\241\3\267\306\215e\252n\244\276"
- #"\236W\347\264n\255\236G\367\5\253\256"
- #"v\316\34\b\0\\}\265\336\20V\237>@I\211e2\337\275\34\0M[r"
- #"\"\221`\337\0/\234\320\231\263s\210}7\266'\247#\16$\32\2317\17\370"
- #"\351O\365v\255\213\266!,E\a\"8\224\327^\343\315\304Tq\232}\273\204"
- #"\250w \332[L\351.S\264\223\247"
- #"S'\336\260F\225\334\\\275\t\337\277"
- #"\377\235\243]u\272\311W\\\241\266\17"
- #"\210Ab\242^\340\233\356\244mB\202"
- #"\336\22\325\244$\275\362\\s\215\336\375"
- #"\311\314\324\267\245C\207\200\36=\324\323"
- #"\237=\253\264c\342\0054\207\275\346\344"
- #"X\357\370\350\213\256}\3\300u\327\3515\30jjx_\27UBm\337\200\266"
- #"\215\273agy\17\271\245\257\24*<\36\275\240\35\335\364v\362dg\363\22L"
- #"\325\315j\274^`\374x\36\222\262\332"
- #")\320\211\324\326\362\313\265s\247\253\207"
- #"N<\36\217\336\320\303s\317\3615["
- #"\355\226h\260g\17+\23\350\304\0045"
- #"\207\275v\354\bl\333\246\356\320u\355"
- #"\e\0f\315\2N\235\342\336s\224\240mOa \352{ \216$+\213\273\324"
- #"\252\344\345\261v\216\333\242y\rtt\205|\361zyykmmh\312\25J"
- #"\210\200\305\213Y\366E\225\312J\36\212"
- #"s\32\35;r\324\273*\272\366\r\260~\330\233o\352\345q\n55|\217\234"
- #"\260,<\310\210\3q\"\331\331\372/XE\5G\3\207\e;\361\23:"
- #"\272B\6\272\202\215N#;\e\210\215\345\341GU*+y1\200\323HJ"
-) 500
-(
- #"\322s v\354\273\274<\274\342\211\6vt\325\n\v9Hq\364h\365w\303"
- #"\353\205\et\23\304\2018\221\254,^\25\342F\366\356\345\261g\35'bGW"
- #"HW\260\321\240\246\206+\341p\367Z"
- #"\312\313\201\37\177\324\233g\331\273\327\271"
- #"=\20CmV\0057\333\267\35]5CJ\347\360a\365\330\242\211\23\341\206)"
- #"zq Nd\341B\376\350N\230:\2016m\364\203\360\f\307\241\243+dW"
- #"\260\261\260\220[\362\341\356\265dg\263"
- #"\234\271\16N\35\302JJ\322s n\266o;\272j\273vq\204\377\272uj"
- #"j\323\0PQ\1\e\313\37\232\35q N\304\256\fE\260IJ\2\n\n\270"
- #"\305\245\312\354\331\300\344\311\352/\212]"
- #"\354\n6\276\3756\267\372u\245\307\203"
- #"\215\35e^';\20\235!,\247\330"
- #"\267\235\271\211]\2738\310\362\261\307\364\316eg\37!\27 \16$\fXF)"
- #"\333\225\241\b6\325\325\274\226\376\206\e"
- #"\324\3634\212\237\biD\266\35A\273\316\235y\321A(d\346CI\247N<"
- #"\211\374\304\23\341.\t\200F\317Uw\b\313)\366m\314ML\232d\232\354\""
- #"\e\326\275^\300\376>B\16G\34H\2501\272\351>\335\3653Vk\340\355\312"
- #"P\4\233\2644^\335\365\177\377\247\236"
- #"\347\332ky\202\364\344I\0\n\327\332\24\354\4sm\332\304CG:\275\26\35"
- #")\373P\341\224V\3739\316?\327\364t.\323\332\265\352CRN\261\357\342b"
- #"\240o_\340\246\233L\223]d\303\272Cv\200\375m \34\2168\20@\335\360"
- #"\rm\35\217G=\350\310a/\276\26"
- #"\25\25\300\300\201\300\346\315\352ybc"
- #"\271\225\377\345\227\241+\227\201\256\3)"
- #"/\347\355Pu\235\301\270qz2(\241\300N\253\335O\343\305\224"
- #"\224\224\206I\375\364t\265<K\2264H\342\270\315\306\267l\341\306\304"
-) 500
-(
- #"\333o\353\345\323\35\262\3\304\201D4"
- #"w\334\241\226\256W/\376\276\376z`\306\fu\361\305 v\327m\17\t\345\346"
- #"bXL\214~\276\202\2`\301\2\275"
- #"\363\366\351\303\201eM\304\362\234&\16"
- #"\304o\336\315\233\201\1\3\364\316[T\304N\247K\27\313|M\301\362ZMZ"
- #"\355\1\363*4^.\310;c\0060d\b\377m\330\272\25yy\300\352\325@"
- #"F\206\262\2157eX3\350y;u\342^\266\312\316\226\6\32CX\347\317)"
- #"\16$2\331\5\0\17?\254\226\330\220\270\366x\200\a\36P\e\236\trw\335"
- #"\366\220\320\2349X~\366\254~\214\306\277\375\e\260\177?z\352\2347H:R"
- #"\226\327j\"h\3477\257\242\39\237"
- #"\367\370q\340?\376\3\370\323\237B\36"
- #"\341\337\224\241\276\200y\25\32/\27\344\2356\255!\2]G\316=/\217{w"
- #"\2126\36\222k\5\32\344m\2Do\a\314;b\4o\22\247\212F\340\344\371"
- #"s&&\312$z$\322\31P\257\334G\215\3425\354\177\374#\320\302e\267."
- #"/\17\267\3\274\347\301{\357\251\347\273"
- #"\344\22\340\376\3731M\347\\\315%D\250;\204\265y3\17\311\2512g\16\320"
- #"\277?p\343\215\372es\2\272\215\227"
- #"\26-\330\266\335*\347\236\230\310=\276\215\36g\0\0\5\316IDAT\241\e"
- #"o\324\333\227d\344H=\a\"CX\rP\224\3 \252>y\0m\322\314\323"
- #"\16\240\315\32\351/\5\350S\315s\354\260q-_\0t\211F\372O\1j\251"
- #"\221~3@i\32\351\313\1\"\237O\271\3\236w\264}<\0=\0\320\307\32"
- #"y\342\0\332\252\221\376'\0}\256Y\256Kl\344\1@\265\265\265\341\256\"M"
- #"\0211EA\20\4\301\26.\e\207\21\4A\20\234\2028\20A"
- #"\20\4\301\26\342@\4A\20\4[\210\3\21\4A\20l!\16D"
-) 500
-(
- #"\20\4A\260\2058\20\aQVV\206\226-[\206\273\30!\305\353\365\242m\333"
- #"\266h\333\266->\214\220\35\332*++QPP\200\370\370x\24\24\24\240J"
- #"G\275\330\205\30\317\320\343\361D\324s4#\32\336M;\210\3q\buuu"
- #"\310\317\317\307\311s\"\204\221HBB"
- #"\2F\215\32\205U\253Va\345\312\225\0307n\\DT>={\366\4\0\274"
- #"w.@\263G\217\36\341,N\310\31=z4V\255Z\5\"\302\312\225+1"
- #"\312\220L\211P\242\341\335\264\213\304\201"
- #"8\204\271s\347b\375\372\365X\267n\35\"\365\221t\353\326\r;|4\207\274"
- #"^/F\217\36\215\303\207\17\207\261T"
- #"M\243\246\246\6\231\231\2318v\354\330"
- #"\371\337\342\342\342\360\3157\337\240}\270"
- #"\325fCD\343\347\350\361x\"\326f"
- #"\201\350x7\355\"\16\304\1\354\334\271"
- #"\23C\207\16\305\326\255[\221\226\226\26"
- #"5F\232\220\220\0\0\370\336\t{\271"
- #"\333\344\221G\36A\313\226-\361\354\263"
- #"\317\236\377m\326\254Y8u\352\24\346"
- #"\315\233\27\306\2225\17\376\34h$\21\255\357\246*\342@\302L]]\35\6\17"
- #"\36\214I\223&a\352\324\251\21\337\232\363%\22\256\325_o#\322+U_\374"
- #"9\320H!\232\337MUd\16$Ddff\302\343\361\370\375df6\354v"
- #"<\177\376|\304\307\307c\312\224)a,m\323P\275V_\274^/Z\e\373"
- #"H\b\256\304\353\365\342o\177\373\e\36"
- #"VU\263v\31\221\360n\206\32\351\201"
- #"\204\231\224\224\24\354\365\263YQFF"
- #"\6\312\313\313\303P\242\320\263~\375z"
- #"L\2324\t\253W\257F\357\336\275\303"
- #"]\234&\341o\270*\222[\345\6\221\364\f\3\21\215\357\246.\342@\34F\244"
- #"w\223#\255\342\211\306I\364H{\206\252D\372\273"
- #"i\a\31\302\22\232\215H\254x:t\350\200\313.\273"
-) 500
-(
- #"\f\5\5\5\330\266m\e\n\n\np\331e\227\211\363\20\242\2q \16\243k"
- #"\327\256\341.B\310\270\357\276\373PU"
- #"U\205>}\372X\316\221\270\211\355\333"
- #"\267\3\0n\273\3556\0\300\347\237\177"
- #"\36\316\342\204\24\177\3170R\236\243\25"
- #"\221\374n\332E\206\260\4A\20\4[H\17D\20\4A\260\2058\20A\20\4"
- #"\301\26\342@\4A\20\4[\210\3\21"
- #"\242\236A\203\6]\264\256\277\254\254\f"
- #"\203\a\17\16\3319\23\22\22\220\221\221"
- #"\21\262\343\vBs \16D\210z\362"
- #"\363\363q\317=\367\240\256\256\16@\203"
- #"\372j~~~\310\316\231\230\230\210%"
- #"K\226\204\354\370\202\320\34\310*,!\352!\"\334r\313-\30>|8\246O"
- #"\237~^}\365\235w\336\201\307\343\tw\361\4\301\261H\17D\210z<\36\17"
- #"\26/^\2149s\346`\315\2325x\356\271\347\360\312+\257(9\17\337\315\225"
- #"<\36\17.\271\344\222\363\377\327\257_"
- #"?\224\224\224\234\377wII\t\372\365\353\a\0\27\304M4>F\264l\322$"
- #"D\0$\b\2\21\21-\\\270\220\342\342\342h\321\242E\312yZ\267nM^"
- #"\257\367\374\277}_\251\242\242\"JNN\246={\366\320\236={\250c\307\216"
- #"TTTtQ\272\324\324Tz\376\371"
- #"\347\317\377\273\270\270\230\6\16\34\330\224"
- #"K\21\204f\341'\341v`\202\340\24\216\37?\216K/\275\24\307\217\37W\316"
- #"s\344\310\221\200\223\355#G\216DAA\1F\215\32\5\"\302\203\17>\210\221"
- #"#G^\224n\351\322\245\370\331\317~"
- #"\206\262\2622\314\2349\23yyy\330"
- #"\264i\223\355\353\20\204\346B\346@\4"
- #"\1\r\e\a\255\\\271\22c\306\214\301"
- #"\306\215\e\225\244+\32\v\3545\376w}}=222\340\361xP^"
- #"^\216\26-Z\370MWYY\2119s\346\340\325W_\305\345\227_\216"
-) 359
-(
- #"U\253V\205t\25\230 \4\3\231\3\21\242\236\272\272:L\236<\31\317<\363"
- #"\frss\361\233\337\374\6\223'O>\277*\313\214\326\255[\233\316W<\371"
- #"\344\223HMMEJJ\n~\375\353_\373M\223\233\233\213\335\273wc\301\202"
- #"\58y\362$\236|\362\311\220\256\0"
- #"\23\204\240\21\316\3613Ap\2\205\205"
- #"\2054b\304\b\252\257\257'\"\242\372\372z\32>|8\315\235;\3272oq"
- #"q1%%%\221\327\353\245\342\342\342\v\3466\226.]J\231\231\231t\340\300"
- #"\1:p\340\0eff\322\322\245K\211\350\3029\220\222\222\22JNN\246\365"
- #"\353\327\323\273\357\276K\311\311\311TR"
- #"R\22\344\253\24\204\340#\16D\210zrss\251\254\254\354\202\337JKKi"
- #"\320\240AJ\371\213\213\213)>>\236"
- #"\342\343\343)--\355\374\357}\373\366"
- #"\245m\333\266\235\377\367\266m\333\250o"
- #"\337\276DD\324\265k\327\200\307\360\235\224\27\4'#s \202 \b\202-d"
- #"\16D\20\4A\260\2058\20A\20\4\301\26\342@\4A\20\4[\210\3\21\4"
- #"A\20l!\16D\20\4A\260\2058\20A\20\4\301\26\342@\4A\20\4["
- #"\210\3\21\4A\20l!\16D\20\4A\260\305\377\3\230"
- #"\305\275\362\v\277o\300\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 12 #"vector-field"
-0 0 24 3 2 #" ("
-0 0 14 3 8 #"gradient"
-0 0 24 3 2 #" ("
-0 0 15 3 6 #"lambda"
-0 0 24 3 2 #" ("
-0 0 14 3 1 #"x"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"y"
-0 0 24 3 3 #") ("
-0 0 14 3 1 #"*"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"sin"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"x"
-0 0 24 3 3 #") ("
-0 0 14 3 3 #"cos"
-0 0 24 3 1 #" "
-0 0 14 3 1 #"y"
-0 0 24 3 5 #")))) "
-0 0 23 3 9 #"#:samples"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"25"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:title"
-0 0 24 3 1 #" "
-0 0 19 3 44 #"\"Gradient field of F(x,y) = sin(x) * sin(y)\""
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:x-min"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"-5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-min"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"-5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"5"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 25 #";; Contour intervals test"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2          81 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          35 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0 \0IDATx\234\355\335il\\\327y"
- #"7\360\377\231;+g8\34\356\242\250"
- #"\235\226%K\212\274\310\362\236\246\37\n"
- #"\273Ab7\350\233\332@Q\243\1\222\17\5*\0255\22\324v\201\344C\v\30"
- #"v\354\32\t\212\266I\v\4\255\375\245"
- #"\21P\274\211\\\244\r\254\0\t\3518"
- #"\361kI\221m\311\262\26j\337\270\210\3732$\347\336\363~8\274\324p83"
- #"\234\31\316=\313\275\317\17 lQ\324"
- #"\334\313Y\356\377\236\3559\214s\316A"
- #"\b!\204T)\244\372\4\b!\204\230\211\2\204\20BHM(@\b!\204\324"
- #"\204\2\204\20BHM(@\b!\204\324\204\2\204\20BHM(@\b!\204"
- #"\324\204\2\204\20BHM(@\b!\204\324\204\2\204\20BHM(@\b!"
- #"\204\324\204\2\204\20BHM(@\b!\204\324\204\2\204\20BHM(@\b"
- #"!\204\324\204\2\204\20BHM(@"
- #"\b!\204\324\204\2\204\370\306\300\300\0\322\3514zzz\352\366\230===H"
- #"\247\323\30\34\34\254\333c\312T\315s"
- #"\322\323\323\203\226\226\26\tgU\37\3\3\3x\360\301\aW\3759\323_C\235"
- #"Q\200\30\246\257\257\17\255\255\255`\214"
- #"\241\265\265\25\357\275\367\336\262\277\257\367"
- #"\305\323k\356\357S\311\261\242\321(\30"
- #"c\313\276\362\377\335\253\257\276\212\3\a"
- #"\16\240\277\277\277n\347\327\337\337\217\277"
- #"\374\313\277\304\253\257\276Z\267\307\\\213"
- #"j_\223j\236\223\376\376~\214\216\216"
- #"\326zjk\262u\353\326\252\303\353\325"
- #"W_\305\223O>\271\352\317\351\366\32\372\n'\306hnn\346MMM\274\257"
- #"\257\217s\316yoo/ojj\342\333\266m["
- #"\372\231z\276\2442\336\36\231Lf\351\367YM\271\363"
-) 500
-(
- #"\351\355\355\345\235\235\235|``\240^"
- #"\247\266\344\326\255[\274\263\263\263\342\363"
- #"\364\322\256]\273*\376\331Z\236\223j"
- #"^\217z\352\355\355\345\367\334sOU?_\315\357v\353\326-\236L&k="
- #"=R\2\5\210A*\371p\233\26 "
- #"\325\34\243\334\317z}\341\353\355\355\345"
- #"\231L\306\263\307\367B-\317\211\227A"
- #"\\O\265\374n\311dR\373\337\3134\24 \69v\354\30\357\356\356\346G\216"
- #"\34)\3713\0xcc#\a\300\1\360\346\346\346\245\277\353\355\355\345---"
- #"K\177\327\322\322\302\327\257__\364\357"
- #"\335\377\226\372\267\371\217[Noo/"
- #"O\245RK\217\231\377\241\337\266m\e\a\260\254\5UN\271\0)\366w\217="
- #"\366\30?\177\376<\347\234\363s\347\316"
- #"\361\307\37\177\274\350\277\335\267o\337\262"
- #"\v\313\304\304\4\337\273woU\307\257"
- #"\247\346\346\346\245\347\271\360\271\316\177\256"
- #"6o\336\274\354\265nll\\\366{"
- #"\324\372\234\274\364\322K\374\205\27^\250"
- #"\370|+}\3758\257\375w+|\277\25\376n\225\274\206\325\376^du\24 "
- #"\206\351\355\355\345mmm\374\300\201\3"
- #"\374\332\265k+\376\36\0\177\371\345\227"
- #"\227\375\331Ux\327\326\333\333\273\364\367"
- #"\275\275\275\274\253\253kY\367X\271\177"
- #"[\311\35\340\273\357\276\313\273\273\273\371"
- #"\261c\3078\347\305\3\260\332\26\210\373"
- #"Ux\321*\3668\377\362/\377\302\37y\344\21>77\307\37y\344\21\376\203"
- #"\37\374\240\350\343\26^X\336z\353-"
- #"\376\325\257~\265\350\361+\341\6c\261"
- #"\257J.\266\205\307\311\357\266\312\377\273"
- #"\302\327\272\360\367\250\3659\251\264\273g"
- #"\367\356\335\374\300\201\3\34\0?p\340"
- #"\0\337\275{\367\252\377\246\326\337\255\360"
- #"\337\25\376\271\222\327\220\272\261\352\217\2\304@W\257^\345\a"
- #"\16\34\340\261Xl\305]=\200\222w\241\305.(\356\367\212"
-) 500
-(
- #"\5B\341\277-\374*v\227\236\257\330"
- #"c\26v\5\325\253\v\253\330\3379\216"
- #"\303\237|\362I\376\345/\177\231?\365"
- #"\324S\334q\234\242\377vxx\230\267"
- #"\267\267\363\353\327\257s\3169\177\372\351"
- #"\247\371\217\177\374\343\252\216_O\315\315"
- #"\315<\26\213\25\275I(|M\362_\353\302\v\344Z\236\223J~\327\17>\370"
- #"\200\357\335\273w\351\275\360\301\a\37x"
- #"\366\273\255\26 \272\275\206AA\317\246\341V\273 \3273@\252\245:@8\27"
- #"\255\240P(\304\337}\367\335\262\217\355"
- #"\336\301\216\215\215\361\226\226\26>=="
- #"]\325\361\363\255\265\5\302\371\362\233\204"
- #"\374\356\233J_\317r\347\273\332sR"
- #"\351\235\372\276}\373\226\265@\36|\360"
- #"\301U\377\r\347\265\375n\253\375\231\363"
- #"\325_Cj\201\324\37\5\210A\36}\364\321\252/\310^ua\365\366\366\362G"
- #"\37}\264\354\371\26vY\25vi\25;\337r\252\r\220\\.\307\37y\344\21"
- #"\376\247\177\372\247\374\221G\36\341\271\\"
- #"\256\344\277w\357`\277\377\375\357\27\355"
- #"\276\252\366\\\327\242\\\367\334Z\3\244"
- #"\222\347\344\257\377\372\257\227u\37\255\246"
- #"\232\231a\265\376n\225\4\310j\257a"
- #"\265\277\27Y\35\5\210Aj\271 \347"
- #"\3779\377\337\273\377\266p\240\334\r\243"
- #"L&\263\352\277\315?n)\205\217Y"
- #"\256\225\263\232jga\275\376\372\353\374"
- #"\251\247\236\342\266m\363'\237|\222\277"
- #"\361\306\eK\177\267e\313\226\25\3\263"
- #"/\275\364\22\337\266m[\321\256\17\231"
- #"\263\260\362\177\227r7\b\253\5H\265\317\211{</ga\271\347\344\266BZ"
- #"[[\213\236\373j\201Qj\f\256\334"
- #"kH\263\260\352\217\2\3040\356\332\17"
- #"\0\313\326\204\270\n\357\6\v\377\354\376"
- #"{\367\337\26\376\275;Kf\323\246M\253\376\333J\345?f"
- #"\241j\356^\313\375l\261\v_\271\31G\205-,\3169\377\351"
-) 500
-(
- #"O\177\312#\221\b\237\230\230X\366}"
- #"\331\353@\312\275\306\371\317A\261\347#"
- #"\377{\325>'\234\313\231\16\335\324\324"
- #"Tt\34\244\334\357V\354\275X,\350"
- #"\312\275\206\324}U\177\214s\316A\210"
- #"\17\274\374\362\313\230\233\233\303\233o\276"
- #"\271\352\317\366\364\364`tt\24###\0\200#G\216\340k_\373\32\16\37"
- #">\214\a\36x`\331\317\276\360\302\vH$\22x\345\225W<9o/U\363"
- #"\234\0\0c\f\246\\\22\n\1777\277\276\206:\243\0!\276100\200\355\333"
- #"\267\243\275\275\275\252r&===\270"
- #"}\3736\376\373\277\377\eO<\361\304"
- #"\212\277\e\32\32\302\371\363\347\321\321\321"
- #"Q\357S\366\\5\317Ia\250\352n``\0_\375\352W\321\327\327\347\353\327"
- #"Pg\24 \204\20BjB\305\24\t!\204\324\204\2\204\20BHM(@\b"
- #"!\204\324\204\2\204\20BHM(@\b!\204\324\204\2\204\20BHM(@"
- #"\b!\204\324\204\2\204\20BHM\302\252O@\265?fS\b#\265\346\307\341"
- #"\340``\236\375|=\316\2071\340\356G=;\344\322\221Qx\334\20p\367#"
- #"+\276]\333\243s\16\306V>\320\216G\353\363\370\340\\<Qy\36\370\203,"
- #"B\341\342\17\277\362\267]\375\3578\0"
- #"\374\374\347`\271\\\305\217U\225\337\374"
- #"\6p\234\225\307-\361\334U\355\203\17"
- #"\200\202s\257\353\343\227r\374x\361\343"
- #"\242N\317\233f\246\0\2444_\347\35\370\0\251Gx\0\250:\f\274\f\217R"
- #"\217\37\211{z\310\245#\2578n\254\350\267k{\364R\27\250z=\235E\36"
- #"\337*\363))w\330R\177\307\200\242"
- #"\27\302\272\275#\212\204\aP\346\271\253"
- #"V\211\307\3614<\312\35\327\333\243*S\237+\223\267\250\v+@\242"
- #"R\2\244\310q\23j\216K<\22W\364F\212\305\324\34\227\224D\1\22"
-) 500
-(
- #" \21E\27r9-\37\"M2\251\346\270\t\272\23\321\r\5H\200$\32\325"
- #"\0347nB[\234T.\221\0,K\376q\e\32\200p\340{\335\265B\1\22"
- #" \261\6E\307Ut\303J<\222H\0!\5\227\216XL\315qII\364j"
- #"\4\210\25Qs\334pT\315q\211G\22\t1[M\266x\34\260m\371\307%"
- #"%Q\200\4\4c\345g\23yIEoG\2750\367\23R\317\31F\214\325\367"
- #"\361d\213F\213\316\"\363\\,F\1\242\31\n\220\200\210&\0^|v\247\367"
- #"\f\276V\306\223\34v\16\365\275\343\346"
- #"\\\335L\246zP\325\215\304\30\315\304"
- #"\322\f\5H@\304\32\362\356\246I\305\22)\a,\344A\0026*\232\321`:"
- #"U3\300HQtI\t\210X\312\354^\23U\32\329B\314\203\376\376t\232"
- #"^\220Z\250\32\300'E\321+\21\20\ri5\343\236\246K5so\272\340\322"
- #"i\263\a\207TI$h*\257F(@\2\202\26\363\325&\336\340\321\300Q\212"
- #"\26\307\324$\221(Y\252\205\310G\1\22\0!\v\b)\272i\2231\356\342e"
- #"OP$\346Q\263-\231T3\223\311t\3618=o\32\241\0\t\200\206&u"
- #"\23\241\"1\357o\30\215l]y\331\217\37\221\260\340'\252hq\17c\242\373"
- #"\217h\201\2$\0\232:\324\5H4\341}+\304\310\0\361\222\214)\302*\353"
- #"R57\313\tI\262*\n\220\0H4-\356A\241@$\16x1\v6_"
- #"\214j\354-'c\252k\203\242\2728"
- #"\0\320\324D\343 \232\240\0\361\271h"
- #"\203\367\27\360r\342)\357g\177Q\255"
- #"\255\2\r\r\336\317\360\212\307\325\315\""
- #"Syl\262\f\5\210\3175\266\252\e@\a\344\\\334U\25\211\324V<\356\375"
- #"Z\t\325\3531\232\233i\35\215\6(@|"
- #".\335\246\260\204\t\344\24R\fSu\213\345"
-) 500
-(
- #"\342q\357\273xT\25Tt55\321z\20\rP\200\370\230\25V\267\v! "
- #"\246\17{\335\323\340}\221H\17\357r\275\272\203\226Q\265VUAEWc#"
- #"\260\260\240\356\370\22\230\260\356\227\2\304"
- #"\307\232\272\324\326\277J\265\302\363\351_"
- #"\321\4\300=\275Vz\3701\366\352\16^F\321\301P\bhi\361\366\30\345X"
- #"\26\320\326\346\353\262&&t\320\371\367"
- #"\331'h\351R\333\313\320\334\345\3751b\r\240wq12fb\265\265\251\355"
- #"Fjo\367u\200\230\200\236}\237jhR;Q\305\n\213\31`^\213%i"
- #",\265\250\224\204\352\231\255\255j\247\323"
- #"66\3228\210b\24 >\325\322\5\245\257n\262E\316\315a\202\26%\27'"
- #"c*o(\4d2\336\36c5\353\326\251=~\300Q\200\370T\262\5JG"
- #"\341dt_\1\264\n\275$Y\v\375Twc\251\34\207!\24 ~\244j\357"
- #"s\27\v\211\5\2042\204=\377]\r\234\205\5\310+:\330\322\242v6\26u"
- #"a)E\1\342C-\335j\217/\243\200\242<\6\316\302\2\344\r\fY\226\272"
- #"\302\212\256\2666Z\231\256\b\5\210\3170\0064u\252=\a\31\5\24\211FT"
- #"\26V\4\200.I\375\245d\5\372\230\373L\252U,\340SIF\1E\242\21"
- #"\225\205\25\1\21`\252\317!\240(@|\246}\223\372\5H2\n(\22\215\350"
- #"P\334p\335:*\361\256\0\5\210\217"
- #"\304SrjO\255\206\252\343\6\214\352"
- #"\302\212\200\372\351\304\1E\1\342#\355\233\324w_\1z\204\30\221HuaE"
- #"@\f\376uuQ+D2\n\20\237\210%\0277\216R\3749\16G\345\365f"
- #"x=\321\310\363\211\0~YB\37\215z_\274\261\22mm\276*\260hB/"
- #"0\5\210\17Xa`\343n=\256G\255\233"
- #"\344\235\207\327\205\24\343I\16\333\313%\16^"
-) 500
-(
- #"o=\353uAEW(\4l\330 \347X\345\204\303\300\266m\352\307c\352D"
- #"\203\217\363\252(@|`\303=2\26"
- #"\324\255.\24\0022\235\362\356\234\274.\244\230H9`^N'kl\364\356\261"
- #"\19\5\25]\272L\245mk\23\233M\321\2C)(@\f\327\274\36\210i"
- #"2\353)\336$\367x^\27Rlh\344\b1\17\237\330t\332\333_@FA"
- #"EW$\"7\260\312\331\262\205\2D\22\n\20\203Y\21\240c\263\36]W\0"
- #"\220\222<\21\306\353B\212\251f\356m"
- #"?B:\355mw\213\214\202\212\371\232"
- #"\233\325\317\306\2\3049\334u\227\352\263"
- #"\b\4\r^mR\253\316m\320\252\2434\325*\367x^\27R\2147x\\\217"
- #"%\345q\3010\331\213\353\232\24\357!"
- #"\220\257\241A\254\r\241\226\210\247(@"
- #"\f\25O\1\215\32\25\"\265\"\242\6"
- #"\226,\241\220\367\343>\221\230\307\375\202"
- #"\311\244\267\205\be\25Tt\351\266\315lW\227\332B\217\1@\1b\240HL"
- #"\314\272\322\251\365\321\322-\367t\0322"
- #"\0007\275`\243\327\335=\214\211n2Y,\v\350\354\324\243\e\v\20\3432;"
- #"v\350\323*\362!M^iR\251\220\5l\334#\246\356\352\202\205\200\246ur"
- #"\347\255\247\333\251`cEdW\252]"
- #"\277^\336\261*\321\324$\316\211\272\262"
- #"<A\37A\303l\330-\372\376u\230u\345jl\225|\323\311\200$U\256\250"
- #"\214\354\22\37\r\r\372\314\306ruu\211}K(D\352\216\2\304 \353z\200"
- #"D\n\332-Qm\223\270x\20\0b\th\325}\2475\25u\252\272\273\365+"
- #")\262y\263x.\250;\253\256(@\f\221\356\20\3356\272I4\312\257}\225"
- #"\322d\266\2501Z[\345&\274\354\343U\2021\240\247\207\3368u"
- #"F\317\246\1\32\322@\327]z\366\371\267m\4\230\344\233:\35\203T"
-) 500
-(
- #"k--\362\357\274u\34w\210F\201\273\357V}\26\276\242\341%\211\344K\267"
- #"\1\e\366\250>\213\342\254\b\220\310@"
- #"j\227Z\310\2\242\322\2267H\270\213"
- #"\226q\247\236N\313\237\316\332\321\241\347"
- #"\24\332d\22\270\347\36\325gQ\21\315"
- #"z\252\213\242\0\321\24c@\367N`\335v}\273\3733\353\344\367T$\32e"
- #"N\337\225\360\21\2261\e\302\262\274_\264X(\22\1\332\333\365\3542jl\4"
- #"\366\356\25\305&uk%\345\321\365s"
- #"\237O\303W\267~\372\372\372\260k\327"
- #".\325\247Q\265p\24\330r\277X\331\255[W\262\213\1hVP?\257\241I"
- #"\317\256<\35557\313?fg\247\276o\340x\34\330\263G\204\211\306!\242;"
- #"\337~\24\373\372\372\360\334s\317\341\364"
- #"\351\323\252O\245*\361F`\353\375@,\16\255\333\260\211&5\233W\2454Z"
- #"}o\224&\311\225.\335cF5\336]\314\262D\315\254\366v\232\235U#\337"
- #"\6\310\213/\276\210C\207\16\251>\215"
- #"\2524\244\201\315{\304\205Y\343\354\0"
- #"\0004w\253i\tD\23\362\217\351\v^\227\216/e\335:5\307\255\24c\300"
- #"\306\215\300\326\255\252\317\304H\276m\273"
- #"\275\377\376\373\252O\241*\ri`\303.\230\321\361\t1\225\226\30D\325XD"
- #"G\ap\361\242\232cW\243\245\5\330\275\e8sF\317\301\177M\371\266\5b"
- #"\222\246N1\323\312\224\276}\231E\23"
- #"\363\311\270\6\272\371-\355\265\320u\214"
- #"\240^L\32_H&\201\355\333U\237\205Q\f\271d\371\223\25\0066}N\254"
- #"07\3512\322\245\3503\326 \241*\207\333u\30Kp82\266\371\2269F"
- #"\240\252\ek\343Fs\306\30\334\31Z"
- #"\211\204Y\341\247\b\5\210\"\211F`\353\3\242\353\312$\2114\20W"
- #"t\3162\27\20\306\223\\\3168TB\342\240\216\354\302\212\256\r\e\364"
-) 500
-(
- #"\234\316[J<.\272\263hk\334U\31\364\252\372C$\nt\335-Z\36V"
- #"D\257\242\210\253a\20\347\256\244\327E"
- #"r\1\305X\302\221s\315\223\331*P1\225\27\20\341\261u\253Y\27c\367\234"
- #"7m\22\1776\245\5%\231A\257\250\331\"Q\240}\353\342&P\356\5\330\240"
- #"\360\0D\311\366\210\242Y\231\321\204\334\340jHs9\307kl\24\27'[B"
- #"\177\231[XQ\306\261\n\265\267\0037"
- #"n\0\323\323f\3355\265\265\211\212\306"
- #"\3\3\300\315\233\342\371\243A\366%\276o\201\250^H\30\215\3\ew\1[\367"
- #"\1\351V\2305\330\221\307\n\3\355[\240\354\374\e\233\345N2hHIZ\356"
- #"\236L\6\247\320aO\217\231\223\6\302aQax\357^\361\374\205B\372U\e"
- #"V\304\367\1r\352\324)\245\307\337\372"
- #"\200\30\374e\314\270\6\3072m\233\325"
- #",\34t\311.\240(m\275\211\354\2753T\24Vt\245R\342\2lRWV"
- #"\276hT\224\205\337\273W<\217\304\377\1\262\32/\206JC\226(\202\270qw"
- #"\335\37Z\211DZ\324\275REn\1E\321\322\tG%\305}\"!\267KD"
- #"Ea\305|\2337\253\351B\253'7H<f\302\r\247\241\267\2\365\303\352\324"
- #"'\23\262\304\370F\363\6 \32[,qn\302;`\25\r\31`\203\342\342\245"
- #"\215-\242\333\\V\357G<\311a\347$m\e\34\n\211\20\231\235\225p0\210"
- #"\326Gs30:*\347x\205b1Q\203\352\364i\363\307\22\366\355\3\306\306"
- #"\200\221\21`|\\\4\313\334\\\335\306"
- #"xL\350\354\v|\200\254E\310\22+\262\233\273\201x\22\342\25w\337;>\b"
- #"\217XR\217V\224\354\252\277\211\224\3\26\312\1771=\326\330(/@\0\261:"
- #"|rR\335\5<\235\26%\325O\2364k@\275\220e\211.\271\326V\321\252r\303d"
-) 500
-(
- #"tT\204\311\374\274\3523\364\34\5H\225\312\2664\f\376,\24\nYz\204G"
- #"\310\2b\222+\22174r\204\230\304\0273\235\6\206\206\344]L\233\233\1G"
- #"ZM\374\342\322i1\250~\361\242\371]Z@\3510\361\240e\242\23\n\220R"
- #"\230\b\210h\203\270\200\2452\242\204\207"
- #"\25\201\357Z\32\205\30D].K\203\211&\215\n\306*S\315\\n\377A:"
- #"-.@\262Z\4\226%*\345\252\352\306ruv\2\23\23\300\355\333\376\b\21"
- #"W\271\226I$\"\232\323\271\234\372\20"
- #"\257\3\n\220\22A\21\212\0p\362*\343\346\a\205\17C#_K7\20\227|"
- #"\327_\212\212M\253\342\r\222?\330\2627{\2\324wc\271\266m\23!\3428"
- #"\276\274C_\26&\234\213\226\310\354,\220\315\00233b]L6kl\260\4"
- #">@v<Z\346/C\376|O\227\23K\2m[T\237\205`\205\201\230\202"
- #"\362M\221\230\344\27=\231\224\177!o"
- #"nV\37\36\200\270\300\356\334\t\2348"
- #"\241\372L\274\307\230(\223\22\217/\377"
- #"~~\260\314\316\2SS\342\277\6\4"
- #"I\340\3\204\334a\205\201\215{\260\274"
- #"\213N\241\314:3f\242\254\231\212:Q\226%VY\337\276\255\376.)\231\24"
- #"\e;\371e<\244Z\371\301\242\252\334"
- #"L\215\2\277\16\204\b\f@\367\256\305"
- #"\251\253\32\204\a\30\220Q\260en\240"
- #"tu\351S\343\251\263\223\212\27\32\210\2\204\0\0\232\327/NE\326DCZ"
- #"\355\312\367@H\247\365\272`\337u\227^\347CVE\1B\20I\210B\217:"
- #"mh\325\334eV\5pc\255_\257\372\f\356p\307C\2101\350#\32p\f"
- #"\352W\232\27\262\"@\212J\r\311\321"
- #"\326\246\372\f\226K&\305\314,j\211\30\201\2$\340\2327\210\212"
- #"\301:i\367\276\314\20qE\"\242\322\254.c!\200\30\233I&\251"
-) 500
-(
- #"\tj\0z\205\2\254\251CT\331\325"
- #"i\252\223\25\21\347\245\352\224\32\233\35"
- #"(9:c\352J\235\257_\257\337\354"
- #"\247\273\3562b\32\253\227\270\352\331q"
- #"\25\240\0\t\240\220%vD\354\274K"
- #"\253\354\0p\247\365\241\352\243\263\363\341"
- #"\0055G\177\344\21u\323i\243Q\375Z!\361\270(V\330\320\20\330\356,f"
- #"\300\336)\24 \1\23O\1=\373\304"
- #",'\335\336\237\341\30\320\250\274K^"
- #"\321E\\\365\376\22\335\335j\217_L<~g\357\r\235\302\215,\241\0\t\220"
- #"D\32\330\274\27\bE\365X\352Q\250m#u{+\23\211\0\353\326\351w\241"
- #"\266,`\373vsw3\3649\372\270\6D\"\275X]W\223U\346\205\364h"
- #"}\4\234\216\255\20W{;p\357\275\372\5\\\300Q\200\4@CF\204\207N"
- #"\353<\nQ\353C\3\272\266B\\\311$\360\271\317\5vLDG\364\221\3651"
- #"\6\261 o\343.\275\303\303\235y\245\232\362\347H\207.\32\35gd\345K&"
- #"\305fTD\v\252?2\304#\261\4\260u\37\320\261\25\372M\265*\240\313\272"
- #"\217XBq\337^4\252\366\370\3569\3506#\253P:-fh56Rk"
- #"D1\n\20\237a\0Z\326\3[\356\a\242\th\37\36:\215}\304\223\212\3"
- #"$\221P{|\227N\345MJqghm^\274\373\320\241\365\26@\24 >"
- #"\22\211\3[\36\0\332\26[\35\6\254CBk\267>c\37\261\204\342\205k\215"
- #"\n6?)&\32\25c!&X\267\16\330\277_\354\260H\255\21\3514\371\350"
- #"\222\265`\20\233@\271\255\16S\356\305B\26\220\351T}\26w4\244\25'n"
- #"c\243>]G&\264B\\\321(\260{\267\230\356kY\372\334\221\4\0=\323"
- #"\206s\307:Z\327\233\367\271il\201Vi"
- #"\327\220R\334\2I&\365\351\212\211F\201LF"
-) 500
-(
- #"\365YT\247\245\5\270\357>\361<RkD\n\303.9$_\"m\316XG"
- #"1\31\315zI\242\252\207 \222\32m"
- #"\310\2\210M\236L\273\20\347\217\215\350"
- #"\22\306>f\330\273\203\0\242\fI\363z \325*\376l\302XG\241XJ\354"
- #"w\256j]c\341q\2550\20\216j0\210\256\303>\345.]\366M\257\305\272"
- #"u\242\216\326'\237\250>\223\232q\316"
- #"\265\277/\244\0001D$\n\264l\0\322\35b\275\202\3117W\221\330\342\302F"
- #"\250[\24_x\334L\207\r\307a\b\205\24\206H($V\\\17\r\251;\207"
- #"|\226\5\354\332\5\2349\243\367\332\220"
- #"R\322i\340\341\207\201\301A\340\346M`aA\334m\31R\345\327\204b\212\24"
- #" \232\v\307\200\366M@\272\35FvS\25\n\205\200\215{\364\31+vul"
- #"\264\325\206\207k\343F`tT\237;\377\346fqNW\257\232\31\"\341\260\230"
- #"\20\260~=01\1\334\272%\2\332\262\314\374}4C\1\242\251p\f\350\330"
- #"\"\272\251\f\270\21\251\210\273\373aD"
- #"\203\365r\371\254\b\320\320\244Ax\0"
- #"@G\207~}\222\335\335\300\314\fp\373\266\331\27\335tZ|m\335*Z$"
- #"7n\210\17\227.am \n\20\315D\23b\365xC\223\230\346\252\333\265d"
- #"-\332\267\2\3614\264kIe\3325\272(Z\226\230M\244K7\226\353\256\273"
- #"\200\331Y`z\332\230.\240\222\"\21`\323&1Nr\355\03200 \232\306"
- #"\24$U\243\0Q\214\205\200x#\220"
- #"j\26\373\200\347\317\4\362Sx\244\333\201\246N=[S\332t_\271t\353\306"
- #"\2\304\v\267s'p\342\204\371\1\342\212F\305\376\353\e6\210 \271yS\204"
- #"\213m\373\347w\364\30\5\b8T\334\22\207c@\353\6\375\246"
- #"\262z!\221\6\272\266\253>\213\342X\bH5kv\261ho\327"
-) 500
-(
- #"\263\253\310]\260w\342\204\3523\251/7H\266l\1&'\201\361q`dD"
- #"\264\266\24\242YXF\360\366%b\0\"\t \326\0\304\222\242k*\22\a\302"
- #"\232\215\3x%\221\0066\354R}\26"
- #"\245\305\22\34\216-\272\v\265\21\16\213"
- #"\213\332\334\234\3523Y)\231\24\373r\234:\245W\v\251\36B!Q\22\245\251"
- #"Itq\315\317/o\231\270\343%\222Z'4\v+\240B\226\350\216j\356\22"
- #"\335S\216#\336\233\314\220\372T\365\222\314\0\335;4(\223^F<\311u\334"
- #"_K\254\t\3211@\0 \225\22-\21?\206H>\267e\262m\e\220\315\212"
- #"\26\311\354,05%&\25\314\316\212`YXP}\246\312P\200\324I\310\2"
- #"\322-@\246{\261\36U\336E\323-"
- #"1\22\310\360\320\351\316\276\210X\302\321\263\4Lc#06\246\372,J\vJ"
- #"\210\270\342q\361\225\317\266EW\327\360"
- #"\260x\255\"\21\321j\t\320\a\235\2\244J%\273\244\"y?\20p\246\204\a"
- #" \n(j\331S\340\26V\324q,\304\25\264\20)dYb\274\312\35\263r"
- #"\303ddDI\227\227\n\24 %\224\e\273\bj\227T%L\n\17@\203\2"
- #"\212\245\350TX\261\234TJ\354\20x\372t0C\304\225\37&@\371./\37"
- #"\5K\340\3d\373#\34!\253\370\a\265TP\4\261K\252R\335\273\314j\204"
- #")/\240X\212n\205\25\313I\247E\210\30\\w\252\356\212uy\1\245\203\245"
- #"\b\36\ni\377Y\n|\200\224\e\340\245\240\250\2\3\232;\315\t\17\6 \332"
- #"\300\325\27P,%\277\260\242\tM\335"
- #"tZ\365\31\230\241T\260\24\243\373k\16*\347n\304T9\335Eb\300\226{"
- #"\27\367_7\5\3\266?\240\361\354\231PH\0242\f\207\215\270"
- #"\220\0\20;\3f2\372\25:3\224\t\327\246\300\a\bY\3"
-) 500
-(
- #"\6\264m\22{\222\304\32`N\363\3"
- #"\300\272\2559\365[\330\256f\353V\263"
- #"\356\354\335\205\206w\335E;\3\6\4"
- #"\275\302\244&\321\4\260\355~\240E\243=\315+e\205\201\r\333sz-\36,"
- #"e\357^3\6\323\363\265\265\211\235\1S)\3636\244\"U1\354\243Ot\220"
- #"H\3[\357\27\263\324L\273\266\1b\357\17cZK\311$\320\332\252\372,\252"
- #"\27\217\3{\366\210\25\335\304\267(@HU\226\225&1\244k\276P\307F\215"
- #"\327V\24\263i\223\231w\362\214\1]]\242\364\211\211\347OVE\1B*\22"
- #"\216\2\235=\300\246=\213S\233U\237P\215B\341\305\342\211&5\235::\364"
- #"^P\270\32w\255\b\251\n7`\362\4\335\26\220\262\"q\261\261U2\263|"
- #"\312\263\376o\355\342\232Z\354\305\342\211"
- #"\6\375\6\226%f7\215\216\252>\223"
- #"\332\245\323\300\203\17\212\342\204\203\203\""
- #"\300M\16E\tL\230\205E\1B\212c@K\27\320\276EU\301{o\264t"
- #"9f\f\236\27\352\352\22[\262\232|"
- #"\321\215\305\200\236\236;\373o\f\f\210"
- #"\357\ep\247M\212\243.,\262\202\273"
- #"\256\243}\263\370\263_\302\3\0\322m"
- #"\232O\335-\305-\221\341\an\220<\370\240(\235N\353F\214E-\20r\a"
- #"\3\3326\2\315\353\315\233\232[\211D"
- #"#\327k\347\301j\244R\372\27W\254\226\273ndx\308\177^\264D|P"
- #"\37*H|x\231 \2650y]G\2452m\266\326{\223\254j\235O\267\257"
- #"\244u#\3062\371\343D\352 \34\5\272\3562{]G\245Z\272l\263\177\277"
- #"\216\16\377^`\363\327\2150\346\337\273"
- #"\30\237\361\351\273\221\254&\34\5Z7\2\231N\361g\6\177\216e2\210I\0"
- #"\ri\216\206\264\341\277`k\353\362.,\23\212"
- #",V\303]7\322\322\2\\\275zg\220\235h\213"
-) 500
-(
- #"\2$`\3746-w5\34@8\302\261\343\301y\325\247\262v\3410\360\271\317"
- #"\1'O\212\261\2?\205G\276XL\324\323\332\270\221\246\375j\216\2$\0B"
- #"\26\220l\1Z\326\211=\332\3754-"
- #"\267\22=\367-\300\212\370\344b\273q"
- #"\243\270\240\16\r\371\377\202Zl\332o8\34\350=\310uC\1\342Snh\264"
- #"v\1\321\206\305\261\215\305\324\bRxtn\261\221\3128f\217}\24\272\367^"
- #"\240\257OlF\24\4n\220l\331\262|\17r7L\374\332\0223\0\5\210\217"
- #"\24\2664\2\327\324(\20\211rl\332"
- #"\261\340\277\347 \34\6\366\355\3\336{/X\27\317b{\220\17\r-\17\23\""
- #"\25\5\210\341\312\2654|w\341\254R"
- #"\367\335\6U\335\255V:-\356\310\257\\\361\177WV1\305\302\204Z&\322\5"
- #">@8\347F\324\234a\fH4\2\rM\"0\342\253l\231\355\316>\252\364"
- #"\373\246+\374\275\222i\a\355\er\376"
- #"\233\251\224o\373v\340\342\305\225\337\367"
- #"\363\357\\L\2610\31\34\24ab0"
- #"\316\271\366\367?\201\17\20\235\303#\277"
- #"K*\326\bp\247\362\351\361\245.\37"
- #"~\275\254\344\377^\3218\307\216\207\26"
- #"\2733\374|!\215D\3046\262\307\217/o\205\370\371w^M~\230\2708\a"
- #"&'\201\361q\21.\323\323Fty\351|mr\5>@tSv\360\233\326"
- #"V\255*\24\6v>4oV\265\335\265\350\350\20\3\314\27.\0\271\234\352\263"
- #"\321\23c\242\313/\235\26\263\330\250\313\253n(@Ta\242ha,)\272\243"
- #"\22i \32\27\v\374\202>\370]3\6\334\375\300\2\242\t\356\257YW\253\331"
- #"\276]\314\310\272q\203jIUb\265\301x@\2041\5\312\252(@\274V&"
- #"(\34[\264*X\b\313\373`\202t\361\253\243"
- #"M;sHf\f/WR\253\317}\16\230\232"
-) 500
-(
- #"\22%\337)D*\227\37&\234\3\331"
- #"\254\b\343\331Y\361|\316\314\210\357Q"
- #"\260\24E\1R\255R\201\20A\311\v"
- #"\177\251\240X\332\227\202\336\217k\326\326"
- #"m\243}C.\270%\224B!Q\36\275\267\27\230\367\301\252{\25\30\3\22\t"
- #"\361\225\257T\260\314\316\226~\234\200\4"
- #"N\340\3d\373C\34\241pu\267\254%[\16%PPxo\353\36\37\256\367"
- #"\250V,\6<\364\220X\37B\352\247T\260\224Rm\340\224z\230PH\373\267"
- #"t\340\3\244\226\335\351(\20\324)6"
- #"\r\271e\235\217\327{T\253\251\251\364"
- #"4\336\240M\357U\245\332\3001XP"
- #"\e\374w\4\262\303\334\\\205\227\277\215"
- #";s\330\272W\357\351\230\322=\361\204"
- #"\330\254\251\260?\217\302\303(&\\\231"
- #"(@\210\221\254\b\260\363\341ytl"
- #"\n\360\270G)\3514\360\205/\210\377\322v\261\304C\364\321#\306\211%8v"
- #"?:\207T\306\241\360(%\32\5\36}\24\350\354\364\357&TD9\372\370\21"
- #"\2434\2668\330\375\304<\242\r\1[\353Q\213P\b\270\377~Q3\213Z\""
- #"\304\3tkB\214\20\215s\254\277+"
- #"\207\366n\0320\257\332\216\35\242;\353"
- #"\370q\21*\264N\204\324\t\5\b\321R\376l\253\366\r6\266\354Y(\3627"
- #"\244b]]\300\37\374\1p\366\254\250\340\233\217fm\221\32Q\200\20-q\0"
- #"V\230\343\256\373sH5;\5\177Cj\22\213\211\25\353\333\266\1\37~(\326"
- #"%\224\333\32\227\302\203\254\202\306@\210"
- #"\226\222M\16\366\376\336<\32\233m\204Bt!\253\253dRL\365]\267\216\6"
- #"\330\311\232\320\273\207hei\254cC\0007I\222)\34\26\3\354W\257\2\37"
- #"\177Lc#\244&\24 D\v\3218G\367\366\34Z\273\2Z\fQ"
- #"\225\215\e\305T\337\v\27\200K\227\304\367\202\270\303!\251\t\5\bQ*"
-) 500
-(
- #"\236\344\330pw\16M\355\16B\214\323\f+\25\242Q`\347N1\335\367\3349"
- #"\340\372u\361}\n\22\262\n\n\20\242D~W\25\347TQF\v\361\270\30d"
- #"\337\276]\4\311\225+\324\265E\312\242"
- #"\0!RX\26\320\320\344 \335\352 \323n\243!\355\16\21430F\203\344J"
- #"\25N\327u\203\344\356\273\253\233\366K"
- #"\2\207\2\204x\306\n\3\231v\e\355"
- #"\233\03446\333\260s\242\222\361\362\326"
- #"\6]\210\224+\25\6\356\264\337]\273"
- #"\304n}\303\303\300\340\240\330\264*\34\246-t\t\5\b\251/74:6\333"
- #"H\24698\203\30\333X\374;b \313\2Z[\305\327\216\35\"8\6\a\201"
- #"k\327\304v\260\226E\233X\5\24}\244IM\30\3b\r\34\211\244\203D\232"
- #"#\325,\376?\32\347p\34\266\264v\203\2066|(\34\6\326\257\27_Dq"
- #"\4C\0\0 \0IDATn\230\\\275*Z(\221\210\370\31\237\357\304G"
- #"\4\317\2\244\257\257\17/\276\370\"\336"
- #"\177\377}\364\365\365\341/\376\342/\360"
- #"\303\37\376\20O<\361\204W\207$\36"
- #"(\27\24\266\315\300\0\260\320\362\302\206"
- #"\264\360/@\362\303\204s\261\363\236\273"
- #"7\373\330\330\235\335\370(X|\311\263\0y\346\231g\360\316;\357```\0"
- #"\177\362'\177\202\227^z\t\317>\373,\16\35:D!\242\261\220%V\2017"
- #"\265:\310t\330H4\226\16\n\313\242"
- #"\v\1\311\303\230X\345\236L\212\265%"
- #"\256\325\202\305\266i\246\227\241\30\347\336"
- #"\334\0160\306\3009\307\267\276\365-0"
- #"\306\360\372\353\257\243\257\257\17\317<\363"
- #"\fFGG\2758dM>\374\277\301\232C\272\254E\321\310\221\312p\304S\16"
- #"b\t\240\350\200v\265\205\366\2500\37\251\224\343\0\243\243w\6\347'"
- #"'\2614\247\333\313\367\234!\357E"
- #"\16\200\375\237\377\243\3724\312\362|\f"
-) 500
-(
- #"\344\a?\370\1.\\\270\340\365aj"
- #"\347\323\360\250\245\353\251\250j\v\355Q"
- #"a>R\251Ph\371\340\274\253\332\2560\237\276\27M\2702y\26 \231L\6"
- #"\337\373\336\367\20\211D\320\321\321\201\276"
- #"\276><\367\334sx\347\235w\274:d \325\22\24\324\365D\264VkW\30"
- #"@c,\222y\26 \207\17\37\306\267"
- #"\276\365\255\245\300x\361\305\27i\374#O\351\v?P|mD\351}0(("
- #"H T\e,\263\263\325waQ\20U\305\2631\20S|\370\223\342\337\257\337"
- #"\5\276\372\v?!D\201z\5Q=\3J\3631\220\272\6HKK\v2\231"
- #"\f.\\\270\200\236\236\236\242c\37\333"
- #"\266mC\177\177\177\275\16\271f\366T"
- #"\266\344\0027\272\300\23B\352\246\312\200"
- #"\342\3410\330\37\375\221\202\23\255\\]"
- #"\273\260\332\332\332\360\243\37\375\b\0\264"
- #"\n\211r\312\255\216\246. BH\335"
- #"\224\352\202+\365\343\22Ni\255\2\337"
- #"\205\305\263Y#^(\317\0312\265\221\20\337)\361\331\343\0X<.\377|\252"
- #"\340\331\226\266\373\366\355\303\241C\207\226"
- #"}\357\320\241C\330\267o\237W\207\254"
- #"\t\205\307\"\n\17B\324(\361\3313"
- #"\341\332\344\331,\254\177\377\367\177\3073"
- #"\317<\203_\377\372\327\370\207\177\370\a"
- #"|\363\233\337\304\341\303\207q\370\360a"
- #"\257\16I\b!D\"O\273\260\206\207"
- #"\207\361\225\257|\5g\317\236\305\216\35"
- #";\360\223\237\374\4\255\255\255^\35\256"
- #"6\331\254\3523 \204\220\342\202\332\205\5\0SSS\30\37\37GSS\23\306"
- #"\306\306099\351\345\341\226\271v\355"
- #"\32\16\36<\210\246\246&\34<x\20\327\335m:\t!\204\324\205g\1\362\253"
- #"_\375\n\17?\3740\276\361\215o\340"
- #"\334\271s\370\3067\276\201\207\37~\30\277\372\325\257\274:"
- #"\3442\367\335w\37\0\340\27\277\370\5\0\340\336{\357\225"
-) 500
-(
- #"r\\B\b\t\n\317\272\260\366\355\333"
- #"\207\27_|\21\317>\373\354\322\367\16"
- #"\35:\204\327^{\r\307\216\35\363\342"
- #"\220K\6\6\6\320\323\323\203\251\251\251"
- #"\245\357\245R)\\\270p\1\35\35\35"
- #"\313\177\230\272\260\b!\272\322\274\v\313"
- #"\227\323x_x\341\5$\22\t\274\362\312+K\337{\371\345\227177\2077"
- #"\337|s\371\17S\200\20Bt\25\324\0\351\356\356\306\215\e7V|_\306J"
- #"\364b\255\215b\255\22\0\24 \204\20"
- #"}i\36 \236\215\201\314\314\314\240\257"
- #"\257\17\234sp\316\321\333\333\213\256\256"
- #".\374\307\177\374\207W\207$\204\20\""
- #"\221\347\eJ\345\223\265\241T\261\356\252"
- #"b\335Z\0\250\5B\b\321\227\346-\20_\6\b\r\242\23B|A\363\0\361"
- #"\254\v+\223\311\340\275\367\336[\372\263"
- #"\314\r\245:;;\21\217\307q\360\340A\34=z\24\a\17\36D<\36_\31"
- #"\36\204\20Bj\346Y\200\34>|\30_\376\362\227\301\30\3c\fO?\375\264"
- #"\324\r\245N\2348\1\0\370\322\227\276"
- #"\4\0\370\350\243\217\244\34\227\20B\202"
- #"\302\227\323x\253B]X\204\20]\5\265\v\213\20B\210\277Q\200\20B\b\251"
- #"\t\5\b!\204\220\232P\200\20B\b\251I\340\3$\3303\b\3620\23\366?"
- #"#\304\207J|\366L\2706\5>@\350\262\271(\340\223\361\bQ\206\266\264\25"
- #"\366\357\337\217\3\a\16\340\317\377\374\317"
- #"\353\371\260\236\342?\3779X.W\374/\e\32\200T\n\310d\200tZ\374\177"
- #"C\3\335\255\23B\326\204s\200;\f\34\200e\1\305\332\ev\16\260d\237X"
- #"\225\352\272\16\344\334\271sx\366\331g"
- #"\261u\353V\374\350G?B&\223\251\327C{\347\277\376k\365\237a\f\b/"
- #"fm.W\374\216\201\261\352\276\17P@\21\242\251"
- #"J.\360\242\215P\315\367\201\371,\303\354t\bS\243"
-) 500
-(
- #"\f\263\23\342\377\347fX\311K\304\376"
- #"\257\324r\366\362\324}!\341\334\334\34"
- #"\376\346o\376\6\377\373\277\377\213\37\377"
- #"\370\307K;\3j\253\222\0\361\332Z\2\n\240 \"d\321\332.\374\325_\340"
- #"\275\246{\200\324\265\v\v\0b\261\30"
- #"\276\377\375\357\343o\377\366o\261\177\377"
- #"~\344\n\272\207d\354\ab\34\316\201"
- #"\205\205\325\177\246\224\231\31\36154\264"
- #"<\210\22\t\n\26\342K\313\202\"\3041?\247\327\205?(\352\36 \0p\344"
- #"\310\21\274\365\326[\370\340\203\17\360\300"
- #"\3\17xq\bRLa\20Q\260\20\303QP\350\255\356\1r\344\310\21|\355"
- #"k_\303\341\303\207\215\b\17\0163f;\254I\251`\31\34,\376\363\3514\320"
- #"\321\1\264\267\3\315\315\305\203\245\3321"
- #"\237r]p$\230\312\274'\346f\31\262S!L\2151\314N\212\240\230\237a"
- #"p\212\275\265J=<\252\355\300\322\f\327\377\352T\327\0001-<\0\335_\36"
- #"E&&\200\251)\340\362\345\352[,\245B\202\302\203`e\213bf\212a|"
- #"\320\302\370p\bS\343!p\247\206\307"
- #"\254\323\367\265c@\217@]\3\344;"
- #"\337\371\16\376\363?\377\323\230\360 e"
- #"8\216\370\2\250+\214T\215\272\236\202"
- #"\241\256\1\362\376\373\357\327\363\341\210n"
- #"*\31cYX\0\332\332\200\215\eE7X\330\223a6\242\31\307a\b\205\270"
- #"v\263\230\210\267\350\323M\326\2560X"
- #"\206\207\1w\333\342\246&`\363f\n"
- #"\23\37\262m\6\306\200\251\321\20\206\257"
- #"\20506d\301.\261&\227\370\23}\242\2117l[\374wdD\214\251\344r"
- #"\313\a\3473\31 \24\370J:F\341\34pl\261\276br\314\302\320\25\n\215"
- #"\240\243\0!\336s\327\2ML\210\257\363\347\305\2377m\2\356\276\e\210"
- #"\305\324\235\e)3\e\352\316|\245\231\t\206\261!\v\23\303!L\217\207"
-) 500
-(
- #"\226\206\307H\260Q\200\20u\256]\3"
- #"\256\\\21A\262}\273\366\333w\372V"
- #"\221\360\340\34`\214c\350\232\205\e\347"
- #"\302\230\237\243\211\21d%\n\20\242\216"
- #"{\e{\355\232\370\352\356\26-\22\n\22e\334\331S\3\227-\334\272h!\267"
- #"@\301AJ\243\0!\352\271Ar\375"
- #"\272\370\352\354\4v\354\0\222I\265\347"
- #"\25 \334\21\341q\373\206\205\e\347\251"
- #"\305A*C\1B\364\341\6\311\300\0p\363&\260w\257\230\16L<7|\203"
- #"\272\252H\365(@\210~\334 9uJ\2541\271\367^\267\264*\251#\2073"
- #"\314\3170\234=\32\301\334,\5\a\251"
- #"\36\315\243$\372\262mQ\257\353\227\277"
- #"\24\263\267H\3358\0160r=\204\223"
- #"\277\216Rx\220\232Q\200\20\275\3316\220\315\2}}\300'\237\0ss\252\317"
- #"\310`\213A\301\201\313\247\"\270x2\2\356\224/FHH9\324\205E\314\341"
- #"N\373}\340\1\240\253K\365\331\30\250"
- #"\370\264\\\343\213\16\22e(@\2109"
- #"\334\261\221\217>\2\306\307\201\235;\325\236\217!8\ar\v\fg>\214bv"
- #"\222\332\25\244~(@\210yl[\224\232\37\e\3\366\355\3\"\21\325g\244-"
- #"\356\0\263S!\234\3710Bk:H\335\321\30\b1S.'\n6\276\367\36"
- #"0;\253\372l\264\344\330\300\350\240\205"
- #"O\177\e\245\360 \236\240\0!\346r"
- #"\34\21\36\275\275\300\355\333\252\317F+"
- #"\216\r\334\272\24F\377\211HM\2334"
- #"\21R\211\300\a\b\r\24\32\216s\321\32\371\355oU\237\211V.~\22\301\365"
- #"s\313{\250\251\r\"\30\363<\30\260"
- #"\211\n\215\201\374\3467\250\272\264h\""
- #"!v\336K\245\356\374\177<N;\361\2516>.\366\37\t:\16\214\334Z\271"
- #"\360R\377\313\221\34R\237\a\266X&\306Y\334\275\240"
- #"\212K\204c{vVu\23\370\0a\265\324\245\236\235"
-) 500
-(
- #"\25_##\313w\342+\205\2G\216\17>\0\276\360\205@\227\207w\34\340\374"
- #"\357\242\252O\303\277*\t\4\16\344\26\200\271Y ;\td\247\201\271i`a"
- #"\16U\246\27\303\303_\255\313Y{&\360\1\262&\205;\361\225R*p(X"
- #"\352+\227\23-\312'\236\b\344\356\207"
- #"\216\r\334\270\20\306\370P\340{\246\327"
- #"\256 (\352\23\b\376\23\274O\231J\205\201S*X\232\233\305\256}--T"
- #"\3\252\32\234\213U\353\307\217\3\373\367"
- #"\a*\210\35\207al \204\233\375\364\221\256\311b\20PPT\207\336m:("
- #"\f\226\321Q`r\228wN\364\351wtP\230T\312\266\305\363\367\331g\300"
- #"=\367\250>\e)8\af\247\30.\234\244\3650\325pg\247e'\201\321A"
- #"`z\304\214q\a\235P\200\350\312\335\6vl\f\230\236\6\316\236\25]]-"
- #"-bo\361\306F\332S\274\224\\N,4ll\0046lP}6\236\313\315"
- #"3\234\375\220\246\353V\302q\200\20\3"
- #"f\247\200\321[\24\32k\25\370\0\341"
- #"\234\203\351\336\325\341\266N\246\246\304W"
- #"\241Lfe+\245\324>\327%\367\277\366\31\333\26%O:;\375\273R\2351"
- #"\300\3418wl\371*\363;;\231\373K\251\337\253\222\3377;-\302bz\2"
- #"\230\233\254~\342\245\n\234s\350>\3518\360\1\242}xTblL\4K%"
- #"]^A\b\17W(\4\2349\3\354\331\243\372L\274\3019n]\tczb"
- #"yK\324\257\257\360jE\37\375\326%"
- #"e\302\265)\360\1\342\e\305\272\274\326"
- #"\255\23;\372E\3:\255\323qDW\326\246M\242\333\317o8p\253?\330\343"
- #"b\356=\372\354$uI\251@\1\342Gn\227\327\340\240\330\36\266\2633\330A"
- #"r\364(\360{\277\347\253\251\275\216#V\233"
- #"/\314\353\177\227\352\25\307\1\306n\1#\327\1"
-) 500
-(
- #"\273\202\331\364\244\376\374\363\211\"+\271"
- #"\35\275\203\203\342\253\265U\4I\"\241"
- #"\366\274d\233\233\23\343!\373\366\251>"
- #"\223\272p\34`l\300\302\310\315\340\265"
- #">8\08\300\30400|\25\310\321\376bJQ\200\4\201\e$\267o\213="
- #"\306\2036\233\313q\304\357}\351\22\260"
- #"e\213\352\263Y\263\205,\303\305\200M"
- #"\331u\26\27\364M\16\2C\24\34\332\240\0\t\0227H\ngsuv\2\233"
- #"7\373w\266\22 fe\235:%\246\365\232\334\225\305E\251\22\307\16\306l+"
- #"\23gO\5\211\301\237$R7CCb\254\244\247G\204\211\1\263?j\22\211"
- #"\0\303\303br\201\241\246\307\31f\26"
- #"w\25\364cx\0\342\367\232\240\226\206"
- #"\21(@\310\235\333\272\313\227\305X\311"
- #"\216\35\376,H\230\313\211\24044@"
- #"\270\3\334\276\345\337\217,\347b6\325"
- #"\3153\242\244\b\321\237\317;\277IUr91\5\370\370q\340\372u\377\255\31"
- #"\341\\\4\210\2418\207o\v%\3326p\363\34p\365$\205\207I\374\371n$"
- #"\265s\34\361u\365\252\230\271\344\267\355"
- #"b\35G\324\0313\220m3d\247\375\325\275\3508\300\334\24p\371#`rX"
- #"\365\331\220jQ\200\220\342l\e\230\231"
- #"\21\255\221\376~`~^\365\31\325\317"
- #"\340\240\3523\250\311\330\240\177>\256\34"
- #"\242E5|\5\270\364\t\260\220U}F\244\26\376\355P%k\347va\371i"
- #"A\242m\0037o\212\t\3\6ql`l\320\37\353>h\1\240\177P\200\220"
- #"\325\271\203\354\267n\211\257\275{\305\32"
- #"\22S\307H&&D\220\230R\36\2371\204B\34\23\267\315l\201\270\323r9"
- #"\200\361\1\340\3665\232]U\t\23\212)\232\371\216$j\235:%jn\231\312"
- #"\262D\20\232\202sL\214X\306\326x\342\20-\250"
- #"k\237\0\3\375\24\36\2252\241\230\"\5\b\251\236m"
-) 500
-(
- #"\3'O\212\213\260\211\255\220\\\16\270"
- #"rE\365YTe\350\252\331\37\325\353\237\0023f\316] e\230\375\256$j"
- #"]\276\f|\362\211\2505e\232\221\21"
- #"1I\300\4\34\30\0376\244\273-\17"
- #"\347\300\314\4\320\377!\205\207_Q\200"
- #"\220\332\231\276n\344\350Q\355\317\331q"
- #"\30.\237\216\300\316\251>\223\352\320\272"
- #"\216`\240\0!kc\362\272\221\231\31Q`QS\342\16\236a\360\2129\255\17"
- #"Z\327\21,\201\17\20\256\371\35\2501"
- #"l\373Nk\304\24\266\r\234>\255m"
- #"\205>\306\200\v\37G4\237\207\263\334\360eZ\327Q/&\\\233h\32\357o"
- #"\177[\372\2\222H\0\r\r\242\374y\"\1$\223@<.\367\374L49)"
- #"\312\304\233\300\262D\253)\231T}&"
- #"+,\3141\314\315\30\24\37\34\30\275"
- #"\251\372$\314\300\230\250m\346\360\322\273"
- #")p=\357k\226\t|\200\260rw\237\263\263\342ktT\224\0\347\\\354\366"
- #"G\301R\336\251S\300\356\335\346\204\310"
- #"\364\264\226\0012o\320]\274c\213\361"
- #"\16\262\334\262\240`b<h!\v\314"
- #"\214\3s\323\300\334\f\2600[\252\262"
- #"\262\3767\17\201\17\220\2128\316\362R"
- #"\36\305\202%\227\3\232\233\201\2666\261"
- #"Y\223)\213\324\274\340\356\275q\317="
- #"@S\223\352\263)\317q\264\235\21553iF\17\263\e\36\331i\325g\242\201"
- #"\305$\250.(\314E\1\262\26\205\30122\"V9\237;\ad2@G\207"
- #"\b\225 \206\211;\276\240{\210hZ\\\221;\300\254\1\1B\341\1\200\213{"
- #"\310\354\224(\32125\2c\27}V\213\2\244\336r\213\363-GG\305\256\177"
- #"A\356\3622%D&&T\237\301\n\234\3Y\315\307?\202\30\36\205]R\331"
- #")1\356\23\244\320\310G\1\342\245\205\305\t\360\245\306"
- #"R\272\272\304\26\253&\27'\\\215\t!\242i\27\226"
-) 500
-(
- #"\316\245\333\35[\254.\17Jx\344\346"
- #"\203\321%U\255\300\a\b\347\\^\315\231\302.\257\2337\305W2)\306M2"
- #"\31\321J)5-\303Tn\351\223\373"
- #"\356\323r\260\32\363\363\242\345\250\321^"
- #"\351\241\0200\237\3257@\202R\232d"
- #"\354\26p\373\252\b\20\371\364/\246\250"
- #"\317'F\21-\n\226MO\213\26\312\255[\376n\231\234<\t\334\177\277~\277"
- #"W8,\312\325ww\253>\223%\23#\226\226\3238\35\a\270q\306\277\3411"
- #"\237\5\246n\3\323#b{]\265K14\2706\255\"\360\1\242\rwE7"
- #" .f\3\3b\20\336\364\3757\3629\316\235\226\210N\255,\267\270\242&\1"
- #"\342\330z\26O\344\\\354\3411=\252"
- #"\372L\352\207aq\257\225[\242\314\274"
- #"i%cT\243\0\321\221\e$\203\203"
- #"\342\253\265\25\330\264\311\374\201w\267\v"
- #"\357\263\317\200]\273T\237\315r\343\343"
- #"\242\365\27\211\250>\23\2001\214\ri6s\217\213;\363\333WU\237H\3758"
- #"\01605\4\f]Q\325Ee>\n\20\235\271A22\2\f\17\2135&\353"
- #"\326\211\315\234Le\333b\326\323\245K"
- #"\300\226-\252\317\346\16\306DXk\320\n\231\32\ri7\243';+\212#\372"
- #"\2\a&\206\200\241\313\24\34kE\1b\2{\361j2<,\302$\34\6\326"
- #"\257\27]\\\32\r\374V\314\335V6"
- #"\225\22\241\250\3M\272\261t\353\276b"
- #"\20\r\263k\247T\217\a\324\2161\361"
- #"\274.\314\213.\270\311\241`N\271\365\202\201W\237\0\343\\\\|m\e\270x"
- #"Q\334\305\357\331cf\213\304q\200\263g\305\3543]\306CFF\304y)<"
- #"\237PH\237\275?\30\304[\356\332i\263\367.\237\30\6Fo\0\263\372-\367"
- #"Y\205\376\263\2604\371\344\222\232p.6t2i"
- #"{\326|\226\5\334\276\255\372,\356\b\207\225\227\243"
-) 500
-(
- #"_\230g\332\f\344r\210\r\241\346\246T\237I\2158p\345\23\340\306g&\206"
- #"\a\240{x\0\24 \376p\3712\360\361\307@\326\240\352{\200\3506\32\30P"
- #"}\26\313M\253]\31\247[\1\3051\315^\236Jp.\246\340\236?jjp"
- #"\230\203\2\304\17r9Q6\345\304\t\340\3325\325gS\35w\366\223\0164("
- #"\254\250[\1E\243\246\354\262;;!^\371\30\260i\200\334sz\275[I\355"
- #"\334\361\221\353\327E\220hZ\236\243("
- #"]BO\203\302\212\272\24P\344\20\3\316\246\f6\273\305\f/\377N\f\222\23"
- #"9\364x\267\222\372\311\345D?\376\357"
- #"~g\316\330\310\300\200>\255\20\305\205"
- #"\25u)\240\310\35\21 F\340b'\304+'\200\2059\325'\23,\24 ~"
- #"\344\256\0371ilD\227V\210\342\226"
- #"\233\16\5\249\200\361[\372\257\312\316"
- #"\37\353\30\271N\205\rU\240\0\361\263"
- #"\\Nt\311\34;\246\374\316\272,\333"
- #"\6n\334\320\243\0252\257\266\343\\\207"
- #"\2\212\f\300m\335[\37\34\30\272\b"
- #"\\\245\261\16\245(@\202\342\323O\201\2611\325gQ\232e\351\323\nQHu"
- #"\1E\16\261fB\347u\37\216\3\\\376X\354\303A\255\16\265(@\202\302\266"
- #"E\r*]C\304\266\305X\210\342\26@\320qG\24\25\324\225\343\210U\361Y"
- #"S\327\246\370\f\5H\220\330\266h\211"
- #"\fi<M\345\272\356}'\376\245\365\330\a\3\300Ex\320\332\16}P\200\4"
- #"\r\347@\177\277\330\267\335\321l\303\tj\205(\245s\353c~\6\350?N\341"
- #"\241\e\n\220 \262mQ\367\351\370q\345+\257\213R\335\n\31\31Qs\\\205"
- #"\35\372\272\266>\270#\326u\\\372\35\2203`2a\320P\200\4U.\a\314"
- #"\315\1\37}\244\274\376\3232\356\214\254\234\302+"
- #"\331o\177\273\362{\365\334\271\262\330cq\340\263"
-) 500
-(
- #"\377\247f\3430\6Mg^q`\240\37\270q\326\334J\300k\243\377/M\1"
- #"B\2003gT\237\301r\226%\326\260\250R\354jU\317+X\261\307b\300\344"
- #"\250\232\217\243\2163\2578\a\206.\1"
- #"\343\203\252\317D%\365S\272WC\1\22t\234\213\226\210NShm\373\316\376"
- #"\360D\n\335Z\37s\323\"\324\210\336"
- #"(@\310\235\315\224t\253\2375\30\350\333O9\03009\254W\353\3\0n\234"
- #"1\241\3\207P\200\20\201s1\305W"
- #"\247\231Y\327\257\a\265\363[\32\307\26\v\362t\3019p\363,\260@\3\346F"
- #"\240\0!w\344r\300\371\363\252\317\342"
- #"\16\307\321\273\4\213\1789QOJ\27\323\267\305~\345\304\f\24 \344\16w"
- #"z\357MMnI\335\275\323\2117\270>\25w\31\23\255\216\e\347T\237\t\251"
- #"\6\355\211~\374\270\230\365\223H\0\251"
- #"\224\370o\"\1\304b\365\235\272i\n\333\6.\\\0\232\232\200\206\6\325g#"
- #"\266\274\265m\361\32\311\302\230\202\275\321"
- #"\345\277\3278\323\347n\237s\340\372g"
- #"\352k\201i\305\200\336[\n\220\\\356"
- #"\316\232\210\211\t \22\21\27\217\205\5"
- #" \36\a\222Iq!\215\307\203\23,"
- #"\214\211\361\220\373\356\23\373\204\253\24\16"
- #"\213VQ{\273\274cZ\226X`\331\330(\355\220\363Y\371W\213\331q=\26"
- #"\16r\16\334:'f^\5\6\23\267"
- #"\f\216-\376\337\311\211\275L\246\306\304"
- #"\36\364\3633\300\274\1{\233P\200\344s\34\21$\256lV|\215\216.\17\226"
- #"\346f\240\245\5\310d\344\336\31\313\342"
- #"\356nx\376<\260s\247\332sq\367M\227\31 \200\330\"Xb\200d\247\345"
- #"\276\217\270\243\311~\347\34\230\36\323\247"
- #"%\344\31&\236\363\222Aa@k\243\30\n\220J\24\6\313\350\250\330"
- #"g\343\342E\321\325\323\332*\376\353"
- #"\2470\311\345D\345\336\2337\201\256."
-) 500
-(
- #"\265\34729)\267\e\313\266EkT\342\357=5*\277U;\255\250bK\276"
- #"\2059\340\306g\252\317\242\376\30D\27"
- #"!\267\201\35440v\23\230\0325g\213\340JQ\200\324\312-\2651:*\272"
- #";\346\347\375\3272q\307C\222I "
- #"\235Vw\36\241\220\334n,\316\245\226"
- #"\275w\34\206\231I\271\0012;\251~"
- #"\3066\207\17\307=\330\342\376\354\323\300"
- #"\350u\177\206F>\n\220zp\253\307\372\265e\362\351\247\300\256]\352BDE"
- #"7\326\224\274\r'\270\303\221\235\2267`\257C\367\225c\3WO\232?\356\21"
- #"\224\226F)\201\17\20\216:\317\177\311"
- #"o\231\214\216\212\377\177\350\241z\36A>\333\6>\371\4x\360A1\211@\205"
- #"\211\t\2713\243\262Yi\307\263, ;#\257\5\302\0300=*\355p+p"
- #"\0\327>\365\307\246P\323\343\300\370\200"
- #"7\241\301\353\177u\252;_\257\3\351"
- #"\353\353\303\256]\273\312\376\214\224\227\347"
- #"\362e\363\367\270\b\205Dw\226*\226%w7\305pXZ\225\342\205y&\265"
- #"\e';\255\360\16\231\213\256\35_\354"
- #"\353\301\201\253\247\200\211ao\236O\246"
- #"yx\0>n\201\364\365\365\341\271\347"
- #"\236\303M\35\26\242\r\17\213]\0\333\333\305\300lTM\331\3565q\34q\1"
- #"\37\37\27\335r\262\331\266X\23\322\322"
- #"\"\357\230\323\323b\374\307c\363\222\313vL\f\313=^>\333\6n_Qw"
- #"\374\265b!1\223jt\0\30\321\250"
- #"\376\250*\276m\201\274\370\342\2138t"
- #"\350\220\352\323\20l[\\\200\207\207\201"
- #"\217?\26w\362Y\3\213\3758\216\272V\b\347w\272\4ep\34i\305%g"
- #"&\345}\f\35G]\367\25w\200\301\v\352\a\357k\26288>v\v\270p"
- #"\34\30\272\250_\1J\25|\333\2y\377\375\367U"
- #"\237\302J\366b;wtT\204\311\266m@[\233\332"
-) 500
-(
- #"s\252\326\374\274\30\320\356\354\224\177l"
- #"\367\242.c\205\274\343\210\t\21\36\343\0160+1@\270\r\314+\330?\214A"
- #"\264\264&\r[\357\301\30\340pq\336"
- #"C\227\200\234\341=\321\365\346\333\26\210"
- #"\326\334 \271|Y\334\321\233tK\226\313\211Yf*v\f\344\\\356v\263\22"
- #"\n9r.w\0}J\3420R>\307\1n\365\233\265^\2161\21\266\27\217"
- #"\211\n\301\24\36+\31\25 ===`\214\25\375\352\351\351Q}z\325\263m"
- #"1\256\360\311'\372\355\305Q\16cj6\240r\0341\16\"\213\244\327$;-"
- #"/@&\25\215\177\314\214\2335p\316"
- #"\271X\35\177\361\204X\354H\2123\252"
- #"\v\253\277\277_\365)\324\237[\213\353"
- #"\344I\340\236{\244\226\317\250Y.'"
- #"\366-\337\262E\376\261\247%.\34\2200s.\24\2\346\263\362\2D\325E|"
- #"\300\260\217\356\255\v\300\204\16\245^4"
- #"gT\v\304\367\316\2365g\377\v\316\325uc\371\t\223\273\22[\325\364]S"
- #"\356\342\35\e\270r\222\302\243R\24 "
- #":\261m\340\263\317\344\366\363\257\205\252"
- #"-g\355\200,\363\365\t\225\323\206+"
- #"\345\266\1\257\2356\253\253M5\337\a"
- #"\310j\v\t\265t\361\"p\365\252\376w\3337n\2509\256\204\331Q~\244\242"
- #"l\bwDy\17\235\261\20\2600\17\\\370\35\205G\265|\37 \247N\235R"
- #"}\n\325\263m1\315\367\364iQ>^Wn\325Z\331\306\307\345\37\323\a\246"
- #"\24\254\377\260sz_\2249\304\0\377"
- #"\305\337\1\v\n\2467\233\316\367\1b"
- #"\254\205\5\261\330\360\344I\251\205\375\252"
- #"\3428jZ!\246t\361i\204;\342B)\233.[\346\26\303\271XM~\345"
- #"\223\340\24?\254\267\300\a\210\326\235"
- #"D\271\234\b\222O?\325\263\333\306\235V+\273\2254"
- #"3#g\355\214\224\235'\345\314\300b\f\310\312~\v"
-) 500
-(
- #"q\2157\212\342\300\315s\300\260\306eU\270\336W'\0\24 \6\224+[t"
- #"\372\264\334)\254\225\n\207\201[\267\344\37SFaE)cPr.\22\331i"
- #"\271\353U\31\3&G\364-\367q\345\224\27251\2252\241\230b\340\3\304("
- #"g\316\350W\325\327]\23\"s\300\337-\254H*&{&\224m\353yw\317"
- #"\35\232iUO\24 &\341\\\204\210\216\245Od^\320e\27V4\34WP"
- #"@qaV\354\367\255\23\316\305\230\214"
- #"\312\275P\374\206\2\304$\266-\306\e"
- #"t[\221\237\313\1\327%\217\226J\254\226k:Gv\1E\16\334\276*\361x"
- #"\225`b\26\332\260n\347e8\n\20\323\344rb@]\366\5{5\263\263r"
- #"g\213\311.\254h0\331\5\24m\e"
- #"\230\322\250\207\2211\261\6\346\306\31\325"
- #"g\342?\24 &\312\345\304\300\265N\343\0\262\247\364:\16\5H\5\270#\177"
- #"\260x\364\206>\263\e\31\23Ut\257\236\202>'\345#\24 \246\262m\321\225"
- #"\245\313BC\316\305\342G\231\3433\223"
- #"\223\336\16\3363&\341\367\361v\246\rc\362\a\214uZy\316\271\0304\327u"
- #"6\230\351(@L\26\16\353\325\225\25"
- #"\16\313]\231nY\336\216\203X\226\347"
- #"S\247\347\263\336\336\26\347\26\344.\222"
- #"\233\317\212\325\347\272\30\273\5d5]\207\353\a\24 &\313\345DAC]\6"
- #"\223\335\375MdaL\214\275x\311\343"
- #"q\235\354\264\345\351\343/H\3369Y"
- #"\247\261\17@\303\301|\237\241\0\361\203"
- #"s\347\364\250P\3538r\247\327\332\266"
- #"\267\341)\241\326\327\324\250\267]X3"
- #"\222\273\257t\231\"\3139p\343\254h"
- #"\201\21\357P\200\370A.\a\\\272\244"
- #"\372,\204\231\31y\3432\234{\333B\340\334\323\26\225\3430\314Lz"
- #"\27 \234\313\257\300;\253Aw\21\203\b2\335W\232\373\1\5\210\37\270"
-) 500
-(
- #"]G\252\366\347($s\\\306\353\356;\17\3\212;\34\331i\357>\202\234\3"
- #"s\262z7\0310z\35\340\212\e\302\214\1\363s\242\365A\274G\1\342\27\266"
- #"-Z!*v\t,t\375\272\274\322&s\36ou\227\365n\20\301\262\200\354"
- #"\214w-\220PH\342\30\b\ank0\237\203s\340\372i\271\273<z\205\212"
- #")\22\271\302a=Z!\226\345\351\205\3277$lg++\307\355\5\r\246\312"
- #"2`jDb\253\313cTL\221\310\345.0T\275\223!\5H\340\3500X"
- #"\3155-\340\350g\24 ~\303\230\372"
- #"\25\332\266\355\375\364Z\242\2259\r\6"
- #"\317\347\263\376i}\230\202\2\304o\26"
- #"\26\344\357\317Q\210\2$pT/\326\343\234Z\37*P\200\370Q6\253~\363"
- #")\n\220\300\340\\\375~\342\334\326g"
- #"\rJ\220P\200\370\21\347\300M\305\5\211(@\202\203{?\31n5\2437\325"
- #"\17\375\5\21\5\210\37\351P\251v~^\336\352x\257\v*z\367\340\36>6"
- #"\344U\237\r\19\305s&F\25\367\332\6\25\5\210\237\251\\\23\22\16\313)"
- #"7\357uAEOok\275/\244("
- #"\303\354\204\342\273\177\256\301\24\342\200\242"
- #"\0\361\263a\205\265\34r9`h\310\373\343\310(\250h(Y\213\b\307$n"
- #"\3\263\2\3&5+\340\30$\24 ~\246z6\326\304\204\367\255 \257\v*"
- #"\32LF!E\307\221\277\343a>\356\210\361\17\242\6\5\210\2379\216\330tI"
- #"\225P\310\373\261\30\257\v*\32JV"
- #"!\305\354\224\332\372W\366\0020\253\360-\36t\24 ~f\333jK\233\310\352"
- #"\306\242\26\310\n\262\n)\252\354\276b\f\30Q\331}F(@|\215s1\220"
- #"-s\233\331Bcc\336\217\260\316\315yw\fCga\311*"
- #"\2448\255\262\373\212\3\23\32\224~\363\n\25S$\352E\"\300\370"
-) 500
-(
- #"\270\272\343\313\250\213\345\3451\f\235\205"
- #"e\347\274\317m[\362v\271\205\346f"
- #"\364\332>\267\336\250\230\"Q/\227\363"
- #"\177\200\320L\254\25\26$,\354SZ"
- #"@\221\371\273\365a\n\n\20\277\343\\"
- #"\355\242B\31u\2618\247\352\277\5\346"
- #"%\f\240\253,\240\310\35`\222J\227(G\1\22\4\234\253\273C\227\21 4"
- #"\225w\205YI3\260Tql\365\365\267\b\5H00\246\266\eKFxQ"
- #"\200,\343\365\0\272\312\2\212\214\1\323"
- #"\n\337\316\344\16\n\220 \310\345\200Q\205\355}\31\1B]X\313x~qW"
- #"X@\321qh\374C\27\24 A19\251\256`\321\374\274\367\307X\360hD"
- #"\2271\17\247A{7\313\306\353At\246\260\200\"crV\331\223\325Q\200\4"
- #"E8Lw\351\265\260,\317\366V\231\317z\27\3502\356\25T\335\217\330\vj"
- #"W\277\223;(@\202\"\24\242\251\256"
- #"\265\362\250TJv\332\362\344q\375n"
- #"\236\356\203\264A\1\22\24\v\v\24 "
- #"\265\260mQ\24\322\3S\243\372/\24\323\rc\242|<\321\3\5HP\250\234"
- #"\312k2\316E9\226:s\34\206\231I\n\220\252q\365\373\257\223;(@\202"
- #"D\365>\351\246\362\240\v\213;\34\331"
- #"i\372\370U\313q\344\24\211$\225\241wp\220xYtp5&oX\355\301"
- #"\344\3\313\2\2623\324\2\251\26\v\321\30\210N(@\202$\34V3y_F"
- #"=,\3230Q\216\303T\252\266\220\265s\220\267\327;Y\25\5H\220\204Bj"
- #".\344\24 \276\243\252\220\242-aI"
- #"\21\251\34\5H\2208\216\232\v\271\214zXD*U\205\24\2634\376\241\25\n"
- #"\220 \311\345\324\\\310\251\330\241\357\250"
- #"\232\t\225\245\355k\265B\1\0224\252Z\2\24 \276\242\252\220\"\r"
- #"\240\353\205\2$hTU\300\2431\20_Q\3656\242\22\356z\t|"
-) 500
-(
- #"\200\350\266&\251^\23LJ>\216\307\323iy\251\307\257\323qK>~\250>"
- #"o\345b\217\316\303\341\272N\374\341("
- #"\261\25k\275^\233\222/A\375\36\277x!E\357\247G\315\27\t.\23\366\16"
- #"\257EN\273\253\323J\214\327\355]E\b!$H\2\337\2!\204\20R\e\n"
- #"\20B\b!5\241\0!\204\20R\23\n\20B\b!5\241\0!\204\20R\23"
- #"\n\20\237\352\353\353\303\256]\273T\237F \\\273v\r\a\17\36DSS\23"
- #"\16\36<\210\353\327\257\253>\245@\243"
- #"\367\276<\24 >\324\327\327\207\347\236{\16\247O\237V}*\201p\337}\367"
- #"\1\0~\361\213_\0\0\356\275\367^"
- #"\225\247\23h\364\336\227\213\326\201\370\320"
- #"c\217=\206\357~\367\273\370\374\347?"
- #"_\277\305c\244\250\201\201\1\364\364\364"
- #"`*o\323\251T*\205\v\27.\240"
- #"\243\243C\341\231\5\23\275\367\345\242\0"
- #"\3611\306\30}\210<\366\302\v/ \221H\340\225W^Y\372\336\313/\277\214"
- #"\271\2719\274\371\346\233\n\317,\330\350"
- #"\275/\a\5\210\217\321\207\310{\305Z\e\305Z%D.z\357\313Ac \206"
- #"\350\351\351\1c\254\350WOO\217\352"
- #"\323#\204\4\20\265@|\214\356\302\274"
- #"W\254\273\252X\267\26\221\213\336\373r"
- #"P\200\370\30}\210\274G\203\350z\242"
- #"\367\276\34\324\205E\310\32tvv\""
- #"\36\217\343\340\301\2038z\364(\16\36<\210x<N\341A\2\201\2\304\307h"
- #"1\225\34'N\234\0\0|\351K_\2\0|\364\321G*O\207\200\336\373\262"
- #"P\27\26!\204\220\232P\v\204\20BHM(@\b!\204\250\36\315\205\0\0"
- #"\3\30IDAT\324\204\2\204\20BHM(@H\340=\376\370\343\350\357\357"
- #"_\366\275\363\347\317\343\211'\236\360\354\230---"
- #"\330\266m\233g\217O\210\f\24 $\360\236\177\376"
-) 500
-(
- #"y\374\331\237\375\31l\333\6\0\330\266"
- #"\215\347\237\177\36\317?\377\274g\307\\"
- #"\267n\35\336z\353-\317\36\237\20\31"
- #"h\26\26\t<\3169\376\360\17\377\20"
- #"O>\371$\276\371\315o\342\2157\336\300\221#G\360?\377\363?`\214\251>"
- #"=B\264E-\20\22x\2141\374\353\277\376+^{\3555\274\363\316;\370\356"
- #"w\277\213\37\376\360\207\25\205G__"
- #"\37Z[[\227\352\222Y\226\265\364w"
- #"\17=\364\20\216\35;\266\364\347c\307"
- #"\216\341\241\207\36\2\200e\365\313\n\37"
- #"\243\265\265\25\357\275\367^\35\177CB"
- #"<\302\t!\234s\316\377\351\237\376\211"
- #"\247R)\376\317\377\374\317\25\377\233L"
- #"&\303\373\372\372\226\376\234\377\221\372\331"
- #"\317~\306\273\273\273\371\345\313\227\371\345"
- #"\313\227\371\372\365\353\371\317~\366\263\25"
- #"?\267y\363f\376\275\357}o\351\317"
- #"\275\275\275\374\321G\37]\313\257B\210"
- #"\24a\325\1F\210.\246\247\247\21\213\3050==]\361\277\31\e\e+9\330"
- #"\376\305/~\21\a\17\36\304\323O?"
- #"\r\3169\376\352\257\376\n_\374\342\27"
- #"W\374\334\333o\277\215?\376\343?\306"
- #"\371\363\347\361\322K/\341\363\237\377<"
- #"\336\177\377\375\232\177\17Bd\2411\20"
- #"B\0|\372\351\247\370\375\337\377}\374"
- #"\344'?\301W\276\362\25\374\362\227\277"
- #"\254\250\34Fa\321\276\302?;\216\203"
- #"m\333\266\2011\206\376\376~\204B\241"
- #"\242?w\355\3325\274\366\332k\370\267"
- #"\177\3737$\223I\374\364\247?\365t\26\30!\365@c $\360l\333\306\327"
- #"\277\376u\374\375\337\377=\36{\3541"
- #"\374\335\337\375\35\276\376\365\257/\315\312"
- #"*'\223\311\224\35\257\370\366\267\277\215"
- #"\315\2337c\323\246M\370\316w\276S\364g\36{\3541\\\272t\t\377\370\217"
- #"\377\210l6\213o\177\373\333\236\316\0#"
- #"\244nT\366\237\21\242\203\327_\177\235?\365"
-) 257
-(
- #"\324S\334q\34\3169\347\216\343\360'"
- #"\237|\222\277\361\306\e\253\376\333\336\336"
- #"^\336\325\325\305\373\372\372xoo\357"
- #"\262\261\215\267\337~\233\367\364\364\360\241"
- #"\241!>44\304{zz\370\333o\277\3159_>\6r\354\3301\336\335\335"
- #"\315\217\349\302\337}\367]\336\335\335"
- #"\315\217\35;V\347\337\222\220\372\243\0"
- #"!\201\367\330c\217\361\363\347\317/\373"
- #"\336\271s\347\370\343\217?^\321\277\357"
- #"\355\355\345MMM\274\251\251\211o\331"
- #"\262e\351\373\373\367\357\347G\217\36]"
- #"\372\363\321\243G\371\376\375\3739\347\234"
- #"\357\332\265\253\344c\344\17\312\23\2423"
- #"\32\3!\204\20R\23\32\3!\204\20R\23\n\20B\b!5\241\0!\204\20"
- #"R\23\n\20B\b!5\241\0!\204\20R\23\n\20B\b!5\241\0!\204"
- #"\20R\23\n\20B\b!5\241\0!\204\20R\223\377\17\367"
- #"i\17\26;}\322\231\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 5 #"shade"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"trig"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:x-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-1.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"1.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-1.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"1.5"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:title"
-0 0 24 3 1 #" "
-0 0 19 3 35 #"\"Shade of F(x,y) = sin(x) * sin(y)\""
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 16 #";; Contours test"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2         107 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          48 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0 \0IDATx\234\354\235y\230\25\305\271"
- #"\377?\a\234\3\310:\3\250\340\n\250\250(.hDD\263\270%nqI4"
- #"1\233I\214&7\220\304\e\0230\277"
- #"\233\304\344\336$\340\26o\226\353\22c\364z]B4\32\304\250Q\223\310(F"
- #"#n\4T\24\334P@e\225u\68\277?\336\356\351\3523\347\314\234\245\253"
- #"\252\253O}\236\347<T\37z\272\352"
- #"tU\327\267\353\255\252\367\315\25\n\205"
- #"\2\36\217\307\343\361TI\17\333\5\360x<\36\217\233x\1\361x<\36OM"
- #"x\1\361x<\36OMx\1\361x<\36OMx\1\361x<\36OMx"
- #"\1\361x<\36OMx\1\361x<\36OMx\1\361x<\36OMx\1"
- #"\361x<\36OMx\1\361x<\36OMx\1\361x<\36OMx\1\361"
- #"x<\36OMx\1\361x<\36OMx\1\361x<\36OMx\1\361x"
- #"<\36OMx\1\361x<\36OMx\1\361x<\36OMx\1\3614\24"
- #"---\214\0325*\321k\216\0325\212\226\226\226D\257i\222J\357\311\250Q"
- #"\243\0300`\0\357\274\363\216\201R\325"
- #"\317\362\345\313\0310`@E\277\355\320C\17u\346w\245\t/ )\243\265\265"
- #"\225\301\203\a3x\360`\36}\364\321D\257\235t\307i\212\326\326V&L\230"
- #"\320\355y\371|\236\\.\27\373\24\377"
- #"\346U\253V\261h\321\242D\313\267h\321\"V\255Z\225\3505ke\304\210\21"
- #"U\213Y\245\367d\321\242E|\375\353_g\332\264i\265\26\257.ZZZ\30"
- #"9rd\305\347O\2336\215I\223&U\364\333\216;\3568k"
- #"\277\313i\n\236\324\320\334\334\\\308p`\241\265\265\2650{"
-) 500
-(
- #"\366\354\302\300\201\3\v\315\315\315\211]"
- #"\337\305\352~\360\301\a\v;\357\274s"
- #"a\356\334\271\335\236\333\335\357\233={"
- #"va\320\240AI\25-\306\240A\203\n\255\255\255Z\256]\r\263g\317.\354"
- #"\273\357\276U\235_\315=Y\266lY"
- #"a\307\35w\264\362[\367\335w\337\212\363\235={va\307\35w,,_\276"
- #"\274\242\363m\376.\227q\257G\311("
- #"\345\36\344\375\366\333/\261<\\\24\220"
- #"j:\346\256~\237\356\16\242\332\16+\r\324zOt\nqR\324\"\350.\374"
- #"\256\264\341^\217\222Q*i\360\263g"
- #"\317.\264\264\264\24\200\2\320it\262"
- #"\373\356\273\27\372\367\357\337\351\377G\216"
- #"\34\331\361\335\310\221#+\276\236zn"
- #"\361\361\360\341\303;\3766\374\276\271\271"
- #"\271\343Z\245\256W\311ojii\351"
- #"\270\17\345\312]\216\256\4\344[\337\372"
- #"V\341\342\213/\356\364\375\204\t\23\n"
- #"\257\274\362J\241P(\24^~\371\345"
- #"\302\221G\36Y\362\357\307\216\35[X"
- #"\273vm\307\361\262e\313\n\343\306\215"
- #"\213\2353u\352\324\302\205\27^\330m"
- #"9\353\245\253{V(\304\353\251\\\233(\24\352\273'\325\274\214TRw!\335"
- #"\265\a\365\232\352\271\375\373\367\217\211w"
- #"\251\362UR\207.\276d\331\304\337\255\224PI\303-\26\231\342c \326!\24"
- #"_\263\370\270\222\353\225\373{\240\223\340"
- #"\25\237_\311\350\2518\317\342\267\300j"
- #"\36hU\274\212;\255\276}\373\226\34"
- #"\35\\}\365\325\205\361\343\307\0276o\336\\\30?~|\341\232k\256)y\355"
- #"3\317<\263p\363\3157w\34\227\352|\227-[V\350\333\267o\267\345T\205"
- #"\261\370SIg\273\373\356\273\27\256\272"
- #"\352\252\216\343\331\263g\27\2168\342\210"
- #"\216\343\342z*\327&\352\271'\225\324\313\2301c\n\223"
- #"&M*\0\205I\223&\25\306\214\31S\327o+\376]\252"
-) 500
-(
- #"i\263X\274K\225\257\222:\364\2R\35\376n\245\204r\17\263Jq\343.\325"
- #"\331v\365\26\326\335qw\235w\361\3\\Lsss\241W\257^\205I\223&"
- #"\25\226,Y\322\345o\351\352:\335\345"
- #"S\315\265\272\373\277m\333\266\25\216?"
- #"\376\370\302\311'\237\\8\341\204\23\n"
- #"\333\266m+y\336\355\267\337^8\365"
- #"\324S\v\205B\241\260d\311\222\302\320\241C\v\357\275\367^UeH\212p~"
- #"\254\334\275.\276\177\345\332D=\367\244"
- #"\222\337\371\304\23O\24\306\216\35[\0"
- #"\nc\307\216-<\361\304\23\25\375\266!C\206T\364\273\324\27\217b\361.U"
- #"\276J\352\320\vHu\370\273\225\22*"
- #"1\177\324\323\341Wr\\\257\200\24\n\205\302\233o\276Y\2304iR\241W\257"
- #"^\25\231\260L\tHW\2\375\340\203"
- #"\17\26z\364\350Qx\360\301\a\313\376"
- #"\375\372\365\353\v---\205\325\253W"
- #"\2275\375\230\32\201\204\204\367z\310\220"
- #"!eG\216]\325a=\367\244\222z\0317n\\l\4r\350\241\207v\3737"
- #"\205B\274\r\251&\254\356\332Ew\377_I\35z\1\251\16\177\267RB\251\t"
- #"\315b\323D=&\247R\307\325\\o\366\354\331\335>\240\305\235_-f\271z"
- #"MX\345('\320[\266l)\214\37?\276p\3169\347\24\306\217\37_\330\262"
- #"eK\331k\234y\346\231\205_\374\342\27eG\37\345:\245\2449\342\210#b"
- #"\367\354\347?\377ya\217=\366\3508\256T@\352\271'\325\324K5\vA\272"
- #"\372m\365\nH\241\320}\35z\1\251\16\177\267R\304\334\271s\v;\357\274s"
- #"\341\241\207\36*\271|u\366\354\331\205a\303\206u,\363-^1R\255`t"
- #"w\275\360\374\360\274\356\36P\365\372\225\256h\351\3567'% \345"
- #"V\34]v\331e\205\23N8\241\260u\353\326\302\361\307\37_\270\374"
-) 500
-(
- #"\362\313;\376\257\271\27196\212\272\375\366\333\v#G\216,)\22&WaU"
- #"s\317\272j\23\265\334\223BA\357j\245\256~[5\2RnQJwu\350"
- #"WaU\207\27\220\224\21\332\267\303\375"
- #" \325\374\177\361\233^\361q\370\267\305"
- #"+\261\312]\257\370\377\324\353\225z\253"
- #"\f\317\a\312\226\277\332\337\\\315\333k"
- #"w\347\226\352 \272Zq\324\322\322\22"
- #";\177\355\332\265\205\36=z\224\24\t"
- #"\323\373@*\275g\225\264\211j\356\211"
- #"\211\375\22\345~[w\355O\375\256\234"
- #"\240\337\177\377\375\205\246\246\246N\337\373"
- #"} \265\221+\24\n\5<\236\6!\227\313Qi\223\2370a\2\227^z)"
- #"\23'N\4dG\374\251\247\236Zr\327y5\327M\e\325\224\375\302\v/\244"
- #"O\237>\374\364\247?\325\\\252\372\271\370\342\213\331\274y3W^ye\307w"
- #"\315\315\315\334s\317=\35u\32\342\322\357J\23^@<\rEKK\v\315\315"
- #"\315U\2733\0315j\24+V\254`\326\254Y\235:\237Q\243F\261j\325*"
- #"V\256\\\231dQ\215Q\351=\0315j\24\357\276\373.\257\274\362\n;\354\260"
- #"\203\241\322\325\316\362\345\313\331k\257\275"
- #"\30:t(\0\213\27/\246\271\271\271d=\35u\324Q\334y\347\235N\374\256"
- #"4\341\5\304\343\361x<5\341\235)z<\36\217\247&\274\200x<\36\217\247"
- #"&\274\200x<\36\217\247&\274\200x<\36\217\247&\274\200x<\36\217\247&"
- #"\274\200x<\36\217\247&\274\200x<\36O\32y\2\330b\273\20]\343\5\244"
- #"Q\270\32\30\fL7\234\357\317\202|/\323\230\307\264 \217K5\\{:\311"
- #"\3377\35\327\f\2714\270\266\316\360\336"
- #"\227\5y\374Lc\36\245\b\357\3335\206\363\265A\v0\36\350m"
- #"\273 ]\323\360\e\t\363\371<\355"
- #"\355\355\266\213\241\225]\331\225\327x"
-) 500
-(
- #"\215\36\364`5\253i\246\331H\276}"
- #"\350\303Z\326\262\35\333\261\214e\fcX\342y\364\244'\353YO/z\261\212"
- #"U\264\320\222\350\365\327\263\236\355\331\236"
- #"\365\254\247\37\375R{\315\220U\254b"
- #"\20\203\330\314f\372\322\227\255lM\364\372\0KY\312N\354D;\355\fd "
- #"\e\331\230x\36\245X\315j\0062\220mlcwvg\tK\214\344k\203\2"
- #"J\267\274\4\330\331ZQ\272\244\341\5\244R?@I\372:J\332oR\267\327"
- #"\233\6\\\34\244\217\1\36\252\363z\2252\2784H\357\r\274T\377%;\225"
- #"m\0050$H\17\2:\273\251\252\356"
- #"z\235NP\322\335\334\222\212\357[\205"
- #"\327\254\251\36\6\1k\202\364\nP\3654\261z\335\ex9H\317\5\16\251\377"
- #"\222\25\225\355\30\340\257Az\0320\245"
- #"\316\353%Y\266\244\257\267\3\360.5\265i\223x\23V#p\203\222>\327`"
- #"\276\v\224\364\30My\250\17\227\231\201"
- #"U\272Q\357\201\256\216G\255\313\5e"
- #"\317J\236s\225\364\215\6\363\265\301;"
- #"\220#\227j\361\0/ \25\323\253W\257T^\253[\376I\364\266\330\178\275"
- #"\373?I\254|\363\225\364~\311\\\262"
- #"S\331\324\a\254\6\353\225\321\272\250\222"
- #"\232\312\246\336\203\242\316'\261\337\252\326\345\374\262gUEEe;\3:,~"
- #"/\2O%\223ww$\335F\322\334\346\252\305\vH\205l\332\264)\225\327\352"
- #"\226\233\225\364\351@\337\356\377$\261\362i\30\201t*[\235#\20\243uQ%"
- #"5\225\255\213\21Hb\277U\303\b\244\242\262\365\5NS\216o.wb\262$"
- #"\335F\322\334\346\252\305\vH\226i\anW\216?g8\177\r#\220Nx\23"
- #"V\34\23&,\r#\220\212Q\333\360mH\e\367X\303\vH\6"
- #"(;$~\0\231\210\3\330\5\231\2044\305z\340\265 \335\23\30\255"
-) 500
-(
- #")\37\235\2\262MI\347\312\236U=UL\314W\215\t\1\331\a\251S\200W"
- #"\221\2726\305\261D+\222\336\5\376R"
- #"\372\264,\231\211\322\214\27\220\fPv"
- #"H\254\16\361?\205\331\332~\221\250\3"
- #"\36\205\276\365\354:\5d\203\222\336."
- #"\301\353\252\327\332P\366\254\3320! "
- #"\275\201\221Az\e\211\254\256\253\230\36"
- #"H[\16)c\306\312\222\231(\315x"
- #"\1\311*\253\201\231\312\261i\363\225\211\25X`N@\6%x\335\201e\362H"
- #"\2\23\2\2\366VbA\274-\377\ti\353\36+x\1\311*w\0\341K\330"
- #"\330\340c\22\23\363\37`N@\266O"
- #"\360\272\352\265\\\25\20\233\363 \a\22"
- #"\265\347M\300\235\206\363\367t\340\5$"
- #"\253\250n&\316\261\220\177\326F ^@\342\330\34\201\0|ZI\233v\251\342"
- #"\351\300\v\b\26234\227\313\221\317\347"
- #"m\27%\31V\0\213\225\343\317X(\303cJZ\347\bd\245\222NZ@\324"
- #"\311\3412\2\222\317\347;\332\17T\330"
- #"\226\324k%=\1\255\336\203\225e\317\252\37\265N\37+{\226>\3246\275\b"
- #"\275\277\325 \305\355)\355x\1\1\n\205\2\205B\201\266\2666\333EI\206{"
- #"\225\364\336\310\n,\223l!\376\366\273"
- #"\267\306\274,\217@\332\332\332:\332\17"
- #"T\330\226\2620\2QW\325\255\304\274"
- #"\327\330]\211\267\253{\313\235\350\26\305"
- #"\355)\355x\1\311\"\367(\351\v,\344\277\214hyj\177\240\217\306\274L\t"
- #"H\5\e0+F\275\226\253\2\322\a\251[\220\272^\2561\257r\234\257\244\357"
- #"){\226G#^@\262\306f\340~"
- #"\345\370\343\26\312\360\266\222\3269\372\0"
- #"\21\253\20?\a\22\277\a\313\312\236\225"
- #"\f{)\351\267\313\236\245\217S\224\364\3@F\f\b.\341\5$k\314"
- #"\6\326\5\351\321\310\36\f\323,U\322"
- #"\3035\346\263\21\21L\220\315y\3\22"
-) 500
-(
- #"\276~\5s 5\241s\16d \321F\305M\240\325\323\272Z\267K\313\236\245"
- #"\217\275\211^P\326\"m\337c\24/ Yc\226\222>\245\354YzQ\337F"
- #"\223\17\1\22\241\256\376\31L\264;:)\\\34\201\364D\356E\310\v\t__"
- #"E\255[\e#\20\210\267\361Ye\317\362h\302\vH\326Pm\301\266\4D}"
- #"\e5% Gi\270\276\213s \0\23\225\264\316%\266\266G \20o\343~"
- #"\36\3048^@\262\304|\3047\21\310"
- #"[\350\221\226\312\241\276\215\3524a\351"
- #"\336\254\350\342\b\4\314m\362K\303\bd\"\321\210k1v\366\24440^@"
- #"\262\204\372\6v\2\311\233t*\305\306\bD\307fE\265sOr%\231z-"
- #"\35\2bj\223\237Z\267\266F =\201\343\225c?\n1\212\27\220,\361\e"
- #"%m\313|\5\346F \2727+\272j\3022\265\311O\255[[#\20\210\267"
- #"\365\337\224=\313\243\1/ Y\341M\342\273\317\217/w\242\1^Q\322\272\4"
- #"d+\3727+\272j\302*\336\344\267"
- #"UC\36\20\257\333W\312\236\245\37\265"
- #"\255/\2\226\330*H\343\341\5$+\334\246\244GRSx\327Dx\237h\31"
- #"q\16\30\252)\237\225D\233\25\373\240"
- #"g\263\242\253\2\242\336\217\2\3726\24"
- #"\356@\264d\370\375\340c\203\301\300\b"
- #"\345\370\266r'z\222\306\vHV\270QI\177\337V!\2009Jz8\311\306"
- #"\321PQ}\37\355\\\366\254\372pq\37H\210::\320\345'j;\342\363 "
- #"\217k\312\247\22\3246\177\243\255B4"
- #"\36^@\262\300\263D\353\375\267\a\316"
- #"\260X\26\325\346~\246\306|\324NQ"
- #"\327h\313\3259\20\210\337\23\235\216\6"
- #"\325:\266\341T1\344L\242Q\327\2\3409\213ei \274\200d"
- #"\201[\224\364\311$\277#\273\32\324ND\3472\342\25Jzp\331\263"
-) 500
-(
- #"\352\303U\23\26\304\357\311\212\262g\325\217Z\3076\5d\0\322\366Cn)w"
- #"\242'I\274\200\270\316V\340V\345\330"
- #"\206\353\366\220-\300\23\312\361\304r'"
- #"&\200\351\21\210k\2bj\4\242n"
- #"\340\374\a\346\275\362\252\250m\377\26\364"
- #"-\36\360t\340\5\304u\376N\264\204r\b\3601{E\3419\"\233\376\36\350"
- #"]\302kB@\\\236\0031% \303\201\335\203\364z\340y\215yu\307\211D"
- #"#\257\267\201G,\226\245A\360\2\342:\352P\375\23@\223\255\202`\316|\5"
- #"~\16\244;T\23\226\356`Ki1c5\1\237T\216\275\31K;^@\\"
- #"f#\361x\3206\315W\220m\1q\315\204e*2!\244G@ \376\f\334"
- #"\201^o\304\36/ N3\vqc\r\262\16\336\226\357\253\220G\225t\26\4"
- #"d\255\222\326% k\22\274\256\212)"
- #"\23\26\304\353\372\321\262g\231\341H\242"
- #"=!k\311L\244\302\264\342\5\304e\324!\3729D\233\272l\360:\321\\\314"
- #"@`\177\315\371\231X\205\245N\b\353"
- #"\362\205\245k\322\331\324*,\200\3\220:\ax\vxCs~]\221\3>\255"
- #"\34{3\226V\274\200@G\20\373|>o\273(\225\263\2\270O9\376\254\255"
- #"\202\4\250\246\213\361\350oY&F jX\3522\342\234\317\347;\332\17T\330"
- #"\226\324{\243+\364\265\311\21H\17\340"
- #"p\345\330\266\31K}\26\376\214~\1"
- #"M\220\342\366\224v\274\200@G\20\373"
- #"\2666\207bb\336A\24\302\363\20`\37\213e\1\263\363\37`F@*\240\255"
- #"\255\255\243\375@\212\332\222I\1\201t"
- #"\315\203\354\v\34\34\244\333\200?X,"
- #"K\225\24\267\247\264\343\5\304U\276\245"
- #"\244?e\255\24\21\177R\322&\4D\365\376\252\313\204\3452\352=1"
- #"\341)W\255\363?\225=\313\34\35231\311Z)2\217\27\20\27\271"
-) 500
-(
- #"\32\211w\35b\323u;\210'\340\267"
- #"\224\343\3034\347\267\221\350\367\347\210\354"
- #"\357\236\210ADf\267\215\350_\215\364\1%\275\4i\0236Q\347A\266\2W"
- #"\331*H\266\361\2\342\32O\0\27*"
- #"\307\203\260o\276\272QI\357\r\364\327"
- #"\234\237\356X\350Y\300dlt\220:\337K9\276Is~\335\261+\361\245\314"
- #"S\201'-\225%\303x\1q\211\267"
- #"\201\217\3\233\203\343\303\200e\366\212\3"
- #"\310\333\335u\312\361\317\f\344\251;\26zV0\25\e=D\255\373\353\201m\6"
- #"\362\354\212\245\300\241Az3\362\354\330"
- #"\f|\225A\274\200\270B;\262\313vyp<\4\231H\357e\255D\302_\211"
- #"\2\370\354\200\31s\232\356X\350Y\301"
- #"Tl\364\220S\2206\0\262\254\373\257"
- #"\6\362\354\212^\310F\333!\301\3612"
- #"\344\31j\267V\242\314\341\5\304\25."
- #"&\212\265\321\23\270\35\330\315^q:\270AI\177\0163\256Tt\307B\317\n"
- #"\246b\243\207\344\211/\241\275\241\334\211"
- #"\6\331\r\t0\25\2329\347\0\337\263"
- #"W\234\254\341\5\304\5\376\0\\\251\34"
- #"\377\08\306RYT\336\3\376\250\34\237g(_\23#\20u\203\237\216%\371"
- #"\3525um&4=\2\1\370\222\222\276\v3K\210\273\343X\342\1\247\256\300"
- #"\251\245\275i\306\vH\332Y\200<\224"
- #"\341\262\360\223\200\377\260W\234\30\267\21"
- #"\355E\31\217\231\311\374\365\300kA\272"
- #"'\361\370\337I\262TI\353X\24\320"
- #"OI\353\232\307\332\207\350\315\373U\364"
- #"y\376U\31C\264\251p\23\361P\0036\371>\342\255\27\344Y\372\22fFe"
- #"\31\307\vH\232Y\213D\27\fc\214\217\2n&=\265v\275\222\376R\331\263"
- #"\222\345E\242\311\331Q@oM\371\250\313\222u\210\224z\315\267\312\236U"
- #"\37\275\201\221Az\e\360\222\246|\212"
- #"Q\333B\32\314X \317\314\377\21\335"
-) 500
-(
- #"\217u\310\263\265\266\354_x* -"
- #"]\221\247\230m\310\n\243\360\241\357\205"
- #"\274\3155\227\375\v\263<M\24\373\241"
- #"\37\361u\367:15\377\241\256\326\321"
- #"\21\327D\275\246\316\225A\246\347A@6\361\205\16#\237\t>i\240\31y\206"
- #"\302\205'/\1Gc\177\265\230\303x\1I#\333\200/\23\17\316s\25\361\315"
- #"Z\266Q\337,\317$n\222\321\211\251\25X\352\250`g\r\327W\257\251k\4"
- #"\2v\346A\6 \261iB\3222\n\0011\257\375\\9~\16\231\273\363\"R"
- #"\23^@\322F(\0367*\337\35\1|\325JiJ\263\0211\a\204\2302_"
- #"\201\37\201T\213\215\21\b\304\333\304\255"
- #"\304='\330\346k\3103\25\362;\274"
- #"\210\324\210\27\2204\261\5\31\376\337\250"
- #"|7\t\373\316\351\212\271\233(\216\305"
- #">\210\31\300\24\352\275\3209\2\311\212"
- #"\200\250\367\310d\254\216\243\211v\246\257"
- #"D\332L\232x\f\370\272r\374;\304\fk3\246\273\203x\1I\v[\220\230"
- #"\36\352\362\302I\300/\260\e\347\243\24\227(i\223Q\20\227\23-\v\315!n"
- #"St\241\232\225t\v\210N\23\326h\242\366\263\22xGc^*9d_P"
- #"\310\17\r\345[)9\340\227\304Ed"
- #"\6\322\236\275\210TL\246\5\244\265\265"
- #"\225\375\366s`\253\262K\342\361\17`\241r\374\5\203y\253o\261#H6\310"
- #"S1\352\250@\367\34\210\316\21H\37"
- #"`\17\345\330\344H\340\\%\275\20\361"
- #"\343\226&\274\210\324Mf\5\244\265\265"
- #"\225\263\317>\233\27^\320\355E\256N"
- #"\\\22\17\200\357*\351q\210\323:S\334\245\244\277\2519/\223&,\235#\20"
- #"\210\337\253\273\312\236\225<\273\"\261j"
- #"B\276c0\357J\361\"R\27\231\25\220)S\2460c\306\f\333\305("
- #"\317\373\310\236\216\275\211\213\307\27\201"
- #"\377&\235\342q\a\320\32\244{\5\307"
-) 500
-(
- #"\246XE\344[)\a\234\2461\257uDs<}\320\23\260\252\205h\17\313\32"
- #"\364n\362;\215\250==\f\254\326\230W1\252\277\266V\3047U\332\310!/"
- #"l\347*\337\315@\236\315\233\211\366ay:\221Y\1\2313g\16\23'N\354"
- #"\376D\223\264\3\367\"#\216\235\200\317"
- #"#;\204C\276\210l\316Kc\255\264"
- #"\23\367!\3645\342\246\21\335\334G\344"
- #"\4\357`\364\372\1\323=\372\0\351\264"
- #"LM\244\357\16\34\24\244\333\211\207B"
- #"\326\315\b\342+\b\277G:\235\31\366\0~K\\D^E\236\321\35\221g\366"
- #"^\322Yv\213\244\261\253\312\26\5\340"
- #"q\304,5\348\31q\1\262\241\350\274#I\257x\200\270l\1779H\267 "
- #"\376\270L\242\232^N\327\234\227\t\1)\276\266n7\343\352=3i\306\2q"
- #"\275\23\6\375Z\b\374\306p\376\225\22"
- #"\212\310\204\242\3577 \317\354\311\310\334"
- #"\325d\344\231\366\244\266\2732J\30\304"
- #"^\375\344\363\371\372.\372(b{\336\25i\220\277F\234\17vd\2128y\273"
- #"\t1\317<Jzkc-\360#\345\370;\230\335\21\277\t\270_9\326- "
- #"\335l\"\314\347\363%\333\fT\331\226"
- #"Lm&\204\370=\273\17\263\3732\206"
- #"\0S\224\343KH\257\v\221\36\310\22"
- #"\337U\310\263y,qs\362\273\300\257\220gz\27\344\31\257sytW\355)"
- #"\355\244\265\3132J\30\304^\375\264\265"
- #"\265u\377\207\305,B\36\2161\210\e\222_\320\271c8\4\331U\376\6\360 "
- #"2D\36T{\331\215p9\362\340\200"
- #"\230\216\276\325\305\271:x\210\310\16="
- #"\32\375.\334\273\31\201\264\265\265\225l3Pe[29\2\331\237h\331\363:"
- #"d.\304$\27\22-\270x\27\361\210\233f\6!\317\346\203\310\263z"
- #"\25b:Uy\vy\306\217B\332\344%H\37P%]\265\247\264\343\5"
-) 500
-(
- #"\244^\n\310\333\361^\300\236\310\233z"
- #"\361\216\337\241\210\tk\0160\27yk"
- #"\331\305`\31\353a)qW\362\227\240"
- #"\317\201a9T\223\313\307\r\344\227E"
- #"\23\26\304\357\235i3Vo\342\373\207"
- #"\256 \356\3618\315\204#\215\271\3103\374u\242 U!\v\220g\177OD\250"
- #"\37 \362\240\235a\274\200\324\312&\304"
- #"\226\273?\3601\340\225\242\377\337\36\331"
- #"\331:\vyS\371%q\367\t\256p\t\321\n\241\2031\273\357\3d)\345\237"
- #"\224c\235\253\257Bt\373\301*um\335&,\210\337\273?a~\231\352\27\200"
- #"\3\202\364z\342fQ\27\310!\317\360"
- #"\257\20\301\237\205<\343\333\27\235\3672"
- #"\360Q\344\267^O\272\334\270$L\346"
- #"\5$\361\215\204\313\221]\265\273\1\347"
- #"\323y\2641\n\370\337\340\274[\221\370"
- #"\35&\242\364\351`>2\251\30\362\23"
- #"\314\267\230\307\200\25Az\30Q\254\t\235du\0042\36\271\207 \363qs\272"
- #"8W\a=\201i\312\361\365\270\e\223"
- #"\243\ty\266oE\342\271\374/\362\354"
- #"\253\314\a\276\202\254\202\273\204(\34u"
- #"\206\310\274\200\314\237\237\220\v\322\307\221"
- #"\230\317\303\201\37\23\315\t\0\364\5\276"
- #"\201\330?_A\\8\230\362N\253\223\377\al\r\322\307\"#-\323\24\233\257"
- #"L\264\330\254\216@z\0\247*\307\246\315X A\235\302h\232[\2216\346:"
- #"\375\221g\376\225\340\363\r\244O\by"
- #"\a\31m\rG\372\220\f\255\340\312\25\\\231\255\321D.\227+?a\325\16\314"
- #"Dv_/.\361\377; \373!\276\206\254\25\317\22\177\3>\22\244{ \366"
- #"\337\203\312\237\256\205\2\262\217\340\365\340"
- #"\370\1\340x\3y\366&\212\264\270\201"
- #"\212]\246t\331\226J\261\201\250\243\351"
- #"\205x9\326\275\370\346\1\304\274\2\362f\374\252\201<\213"
- #"y\26\361b\20z\277m\5R\266e\253n\226\3\377\3"
-) 500
-(
- #"\\M\374e3d\24p)\"(e,\24U\267'\vx\1)UI\257\""
- #"\363\e\277\243t\270\3211\310J\244\317b~B\331\4\5\304\334\361dp\374i"
- #"\354\204&}\206\310\25F3\362P\3526\a\276\207,z\b\363\254\"\246wM"
- #"\17|3\321\316\360\367\200\301\325\375y"
- #"\325\264#/;\253\202\343g0\377b\0\322\246n\17\322\207#o\345n\254\\"
- #"\255\216M\310n\366\253(m\256\333\t"
- #"q}\177\36\362\262\244\340\202\200d\336"
- #"\204U1\355\210\233\205\23\220\225\24?"
- #"\243\263x\354\205\254\270\232\207Tx\26"
- #"\305\3\344>\204\342\321\v\370\251\245r\250&\226\02313\227d\312|U*\17"
- #"\23f\254&\342\246H\ef,\2206\25\2728y\2\370\243\245r\350\24672"
- #"\17\362/d\377\315\236E\377\277\f\271"
- #"\27{\"#\303?\342\324n\367\206\27"
- #"\220\261\214\205\v\220\267\316O\0\177!"
- #"\36Xf\0042\361\3676\262\213\366\4"
- #"\262\371\246\24b\333e\211\212\311\335\347"
- #"!\246&\320K\345ab\"\35\354\356J\17q\305\305IR\344\20\201x\31\251"
- #"\347i\304G\34\333\20\363\342\231\210i\374\28\240c\311Zzil\1\3711"
- #"<\3033\342\246c\215\362}\17D(\356D\342&O!Z\275\222ul\273,"
- #"\tY\210\274\265\201\314A|\264\213s"
- #"\223$\353#\20\220{\31\216\236\347\21w\317o\22W\\\234$\3150\244Oy"
- #"\tq6y<\361\236x5p\35<\313\263\360\237\26\312W\5\215- \277\204"
- #"\36\352-\330\ty\23z\0051U\235\201\273Kpk\301\266\313\22\25u\357\307"
- #"\261\304W\265\350\244\21F \375\220{"
- #"\0322\323P\276\305\270\344\342D\aM"
- #"\310\210\343\1\244\317\271\30\351\203\2"
- #"z\320C\366\217\245\230\306\26\220\213`1\213\345\215"
- #"\354N\304e\301O\3504\231\3250\330vY\242\362+"
-) 500
-(
- #"%m\312|\5\215! \20\277\2476;)\327\\\234\350b\0042\27\362\0062"
- #"*9!\350\233\276m\267X\335\341Wa9\260\322\301\bK\221E\2\341\256\363"
- #"\e\20\367\3626\330\200\274%\207\325\262"
- #"\34\261\v\233\340\24d\2071H\364\276"
- #"*\\\247\324\324\226\356&\352\314O\301"
- #"\334h`9\321\333n\16\361\217U\274\243\332\0247\0_\16\322}\21\23j\243"
- #"\230\214\273\300\205\276\251\261G \236\210"
- #"K\260\353\262D\345i\"\361\330\ts\342\1\2153\2\331\221h\357R\1Y\316"
- #"k\v\327]\23440^@<\351pY\2422WI\237h8ouB\331\364"
- #"$\272\351\311l\365\336\316-{\226~"
- #"\262\344\342\244\301\360\2\322\310l\3>"
- #"\2008\204\f]\226\34\205\35\227%*jg6\316p\336jhY\23#\37\325"
- #"\203\201\351\320\251\352\275\265)  b"
- #"vT\220\336\212l\326=\34\37\227<\345x\1iTV\0\3\200\177\26}\177"
- #"\231\205\262\24\363\27%mZ@T\223\363v\6\362S\3630m\356V\357\355_"
- #"\312\236e\216K\213\216\237D\226p\257(q\256'\25x\1iD\356EF\35"
- #"\353\213\276\377\30f\274\335v\305\363\304"
- #"\275\226\246\177/\225\273\214U\322\313\220"
- #"=!6\31O\347\321\357\26\244\255\336"
- #"k\2768\236\356\361\2\322H\274\217\270"
- #"`9\231\270\233\226\376\210\331\340\3176"
- #"\nU\3049J\372\0\354\255\fj\4\266G:\347\220s\312\235h\220?#m"
- #"q\240\362\3352\244\315~\5i\303\236"
- #"\324\340\5\244Q\270\a\211\224\246N\226"
- #"\17G\36\330\265\244\243%\334\206L\350\207\334b8\177u\23\233Iw5j^"
- #"\2467\322\251\367\370_H\35\330\246\a"
- #"\262\e\373^\342\313y\257G\332\360\254R\177\344\261A\32\272\r\353\204"
- #"A\354\363\371\274\355\242$\317:\304"
- #"\327\327\307\211\217:\316@\334j\333\236"
-) 500
-(
- #"0\17Y\210\2243\344(\314\233\257\36Q\322\273\226=+F>\237\357h?P"
- #"c[R\303\e\317\256\374\317\22a,\321\3445H\35\330rmR\314\211\300s"
- #"H[\rY\206\3044\271\0\363\213\16"
- #"\fP\334\236\322\216\27\20\350\bb\337"
- #"\326\326\326\375\311.\361\b\322\t_G4A\333\2\314@v\336\17-\363w\246"
- #"Y\217l\246\v\315\23\343\201\207-\224C\25\220\n\3159mmm\35\355\aj"
- #"lKj^\217\224=K\37\17#\367\34\244\16\316@6s\246\201\241H[\235"
- #"\201\264]\220\266|\35\"~6\356\227F\212\333S\332\361\2\222E6\3\337\4"
- #">\f\274\246|\1772b\"\372\244\2052u\305qD\353\376\373\0037a\307\a"
- #"\331\337\225\364\a\r\346\253\346\365\367r"
- #"'i\244\t\271\347\375\203\343\371H\235"
- #"\244\211O\"\345:I\371\356U\244\215"
- #"\177\23i\363\36\343xW&\16\270\v"
- #"\250\212\271\300\347\211o\304\352\207\370\30"
- #"\372\n\351sE\257F\310\3\t\\\365i\v\345X\2158\367\333\212t\250+\251"
- #":,q\315mi\35\362v\335\216l\252{\17\30T\375e\352\3466\342\243!"
- #"\23\21 \253\245\200x\355\3756q\23\326\30D\4M/\373\326\210\v}\223\37"
- #"\201d\205v`*b\212P\305\343hdi\354\371\244O<\302\371\231\220q\330"
- #"\21\17\220\260\252\341f\312q\230\215i"
- #"\337\217(\362\342V\340Q\203y\253|"
- #"Z)\a\244s\236!\207\264\345\347\221"
- #"\266\0352\37i\373S\311v\\\221\224"
- #"\341\5$\v\274\210\304\224\236N\264s"
- #"\267\27\22F\363o\244\327\273\360w\210"
- #"\342\235\357\2\374\325bYT[\372\207"
- #",\344\257\346i\323\256\377W\242I\375"
- #"\327\200\357\332+J\227\214@\332\366UD\221\r\267 \317\300D\344\231"
- #"\360h\307\v\210\313lC\36\230\203\211B\320\202\274E\316El\303i\255"
-) 500
-(
- #"\341\207\201k\225\343k\220\235\361\266\270"
- #"]I\233\234\377(\225\247\315\245\264\3\201\253\225\343k0\2772\254Rz m"
- #"|.\361\221\323\223\31031\235xtQO\342\3709\20\a\354\214%y\58"
- #"\27xL\371\256\t\211`\366m\314\270"
- #"\341\250\225\215\300\201D\221\17\317\2~"
- #"o\2578\235\334\307\257\241&1\253\253"
- #"-\255%\332<\227CV\246\365\251\355"
- #"R\211p\26\360\207 \2757\262\344\333"
- #"fy\272\243\35\270\22\370>q\23\326"
- #"\221\310\334\310(\e\205\252\17\27\372\246"
- #"\264\276\237z\272\342:\304N\257\212\307"
- #"h\304v>\205t\213\a\210\273\356P"
- #"<\206\2\277\266X\26\220\275\6\252\373x\e#\241\1\304\335\253?g\241\f*"
- #"\377C\264\314{!\360c\213e\251\204"
- #"&\244\355\267\"\317B\310c\310\350\344:\e\205\312>^@\\b\36\260\0172"
- #"\271\251\356X>\17q\212\370\1\e\205"
- #"\252\222\271\304\243\316]\216\254~\262\311"
- #"\263J\332\346\362U5\357g\313\236e\206!\304\35k^\216}\217\275\225p8"
- #"\362,|Y\371n-\362\314\354\203}\177_\31\303\v\210\v\314C\326\301\37\4"
- #"\274\244|?\fq\353\360\e\2425\374"
- #"i\246\35\370\22\321D\377G\221%\307\266Q\203)\35l\255\24\361\274m\6x"
- #"\n\371\2pB\220\336\202t\312.\254p\352\217\270=\231E,\3068/!\317"
- #"\320Yx!I\b/ iF\25\216;\210O\b\36\30\374\377I%\376.\255"
- #"\\\206,\277\4y\310\257\355\342\\\223x\1)\317\265D/'\317!#\21W"
- #"8\t\361\357u\240\362\3356dn\307\vI\"x\1I#O\"\346\214\261\304"
- #"\205c;d\r\374b\304\3041\330J\351jc\1q;\372O\200\335,\225E"
- #"\245\235\250\23\311!\35\213-\16&\332\253\363/\322"
- #"\21Liw\340\277\224\343\37\1/X*K-\f"
-) 500
-(
- #"F\236\225\305\310\263\23\316\17\206B2"
- #"\26y\326\236,\371\327\236n\360\2\222&B\3418\34xH\371>\24\216\205\310"
- #"\eaZ\367u\224c\e2O\23\272\233\230\b|\335^qb\274DT\256\335"
- #"\261\263\3<d\20\221\250n$n\256\264\311$\244\316@\356\325\227qoy\354"
- #"\b\344\331YH\\H@\236\265\303\361BR\3^@\322@V\205#\344\32\340"
- #"\361 \335\e\261O\247\245\345\245\305|"
- #"\25\222F3V\17\244\316z\a\307\217\223\36\363c\265x!I\224\264<\306\215"
- #"\305\353\210\317\247I\310$_\261p\364@\346>\236\306m\341\0x\3q/\21"
- #"\362=\342\313,m\343\5\2442F\3\27+\307S\2017-\225%\tB!y"
- #"\32\370\4\361\2360\24\222a\3103z+\322\216=\235\360\e\tuo\326\331\202"
- #"L\34?\n\314\t\376}\253<-\310R\0\0 \0IDAT\314\271=\200"
- #"3\221\315PY\t\345z\"p_\220\16w\314\247i\237\312G\20\227\30\0003"
- #"\201Sj\277T\"mi&\22\273\5\244l6\334\332\227c\v\262T<\24\266"
- #"\217\221\216(\226I0\17\231\243\373#"
- #"\345\315s\273 \e\23\303\317X\264\266e\0276\22z\1I\272\222\326\"C\374"
- #"9\310&\246'\350\336!]\16\21\214\377#;\302\1\22\355\356\263A\272'r"
- #"_\16\263W\234N\24\20/\270\253\203"
- #"\3437\211\aw\252\222D\332\322\233D"
- #"\363 \315\300\n\322\345\4\363\237\300\21"
- #"D\216'o!\35\241p\223b\36\322f\347\21m.-G?d\244\22\n\312"
- #"x\22\335\204\352\5\304\1\252\252\244\2\22\21m\t2\212x\243(=\37XU"
- #"\301u47\274T\360\16\260\37\322\1\2\\D|cZ\32x\215\310<8\24"
- #")s\35$\366\300\17E\\\272\203\224q\367"
- #"\372/\231(\27\21m\6\35\214\254\260\333\301"
-) 500
-(
- #"^q\264P\313\213 \310\v\311A\300\36%>\303\221\27\251\n\361\2\342\0e"
- #"+\351-\304\364\364\\\360\371;\260\234"
- #"\356\337JJax\350k\235\r\210\271*\f\215\272\a\362Fg\322Ez%\334"
- #"E\24.\3658\340/\365].\261\a"
- #"\3768\2429\261\273\200\323\352\277d\242"
- #"\254\3\366'\362\244\2747b\326\332\336Z\211\364S\215)\272\349Dh'\""
- #"/Wc\202\177G\3%\" \273  Y\356\306*\2427\275\305E\303\363\312"
- #"\3479\2427\347j\311!o\32\247\1"
- #"\23\220\306\222\206\375\16\246x\r\tO"
- #"\253\306\325\276\226\364\211\a\304\335\205\244"
- #"a\2=\344`\"\1y\226\364\tH?\244N\303@`\v\221\27\243\273\220\227"
- #"\205,\262\35\342S\353\20\340\e\301w"
- #"\257#\243\2239\300\335\300\333t\375\202"
- #"Y@^B\357\f>\352\265\367$\22\224\340\337|)UI\31\215=\2\271\22"
- #"\332\276\335V]E\265 \225\274\e\26032\272P\323;\221.\233\265I\36\2"
- #">E\\|\217!\276\302,M\234\n"
- #"\334\23\244\23\210\204\230\330\e\343\255\300"
- #"g\202\364\251\300\237\352\277\244\26\216%"
- #">\311?\4q\213\177\214\235\342Xg"
- #"+\"\"\257\225\370\324\360R\272\211M"
- #"\364\276\2627\\\230X\t\23\247\261\5D\2655\0273\30q\20106\370\34\210"
- #"\274\31\364*s~#\263\rY\236{)\321\eX\36\370%\262\326>\255\354\212"
- #"\314a\201\354\256\336\247\372K\344\363y"
- #"\332\333;;\210jjj\242\255\255\255"
- #"\266r\275\200\274\244\204eL\363\22\322"
- #"\353\200\311@\370SsH\20\252\237\342"
- #"7\t\24\323\206l\16]\200\314\227\206"
- #"\377\276By\257\3\t\314\315\351\244\261"
- #"\5d:\254\234\272\222\226\375Z\"\221\bEcg\273Es\2065\310\252"
- #"\225Y\312w\303\0207\21GZ)Qe\274K4\361\333\17\371\35uvx"
-) 500
-(
- #"\211\215@\266\"\261A\326\a\307\357b\337cqW<\206\354\245X\246|w2"
- #"\262\252p`\311\277\360\250\224\21\226\225"
- #"/\256\244eZ\213\270\251O)\215- \2701Q\225Z^@\354\363\352|\307"
- #"x\304\276;\334J\211*\347A\340\370 }\4b\307\256\223D\333\322\21\300?"
- #"\202\364\203\210\271(\315\274\205\210\310?"
- #"\224\357F#\363\"\373Z)\221\363\270"
- #"\3207\371A\246\2476\356F\226\"\253"
- #"\342q\36\262Z-\355\342\1\361\tt"
- #"\233\16\24\313\241\226\311vl\220J\330"
- #"\31\251\373\363\224\357^B^(\356\266"
- #"Q \217\t\274\200x\252c\e\342\306"
- #"\342\f\340\375\340\273<\262*\3477\270"
- #"3G\2246\27&\305\244\325\245IW\364B\332\300\265D\313R\327\"me*"
- #"\3569`\364t\2137a90LL\r\256\316w\224b\adn\1dw\365"
- #"\241\365_2\321\266\244F\230L\371D"
- #"jI\374\274H\335\270\3207\371\21\210\2472^@:4U<\306\3O\341\236"
- #"x\334F$\36 \253\353\322\206Z\246w\2212\273\304\221H\333\30\257|7\v"
- #"1{\272\24O\304\323%^@<\335\343\372|\207\312B$>v\310\4\240\217"
- #"\245\262t\305\366\310Dz\310\5\304\357"
- #"\277\v\370y\221\314\343\5\304S\236m"
- #"\300\277\341\376|G\310zd\227|\370[\306#\35\\Zy\204\350\r\376}\244"
- #"\0366\330+NMt5/\362o\244#\352\242\247f\374\34\210\3vF+\254"
- #"G\3467\336W\276s}\247\361D\3046\17\22\347\373)\304\217SBhiK"
- #"\v\221\371\231\260\36&\2\255\311fa\214R\236\n\232\20o\310Y\366\243U#"
- #".\364M~\4\342\351\314\2d\276C"
- #"\25\217\261\310\304\256\253\342\361\30\221"
- #"x\200\274\21'(\36\332\330\233x\364\277\320\231\237"
- #"\213\34\213\210\266\272D\271\35\21\310\5VJ\344\251\23"
-) 500
-(
- #"?\2q@\345\215r#\22\205m\275\362\335\0`)\356\276%nE\4\361\351"
- #"\340\370\20\304\201f\302hmK\207\20-\347\35\207\4\346r\365\365o\0032w"
- #"\266F\371\256/\360k\340\vVJ\224"
- #"J\\\350\233\\m\202\236\244\231\207\270"
- #"q\371\"\221x\364E\4e\r\356\212\a\300\325D\3421\210(B\242K\334\217"
- #"\224\35D\374\256\266X\226z\331\0361[\375\16ic m\356\\\244\r\316\263"
- #"S,O\365\370\21\210\3*\2378\e\220\335\315s\203\317}t\336g0\6\230"
- #"A\344\324\317U\336E\\j\204\201\276"
- #"~\16|KOV\332\333\322\317\201\177"
- #"\17\322\315\310\374H\232}dU\302\2"
- #"\340\223t6a\355\210\204\314\35\27|"
- #"\16\304\355\227\230\32p\241o\362\2\342"
- #"@%%B\e\342\26\374\373\310R\312\256\30\a\314&\e\17\354\5\210\307X\220"
- #"p\301O\243-\n\216\366\266\264\0051"
- #"e\205o\350\27\0\327\350\313\316\30\353"
- #"\201\243\211F\211\345\30\r\374'\0223"
- #">\375\2412\352\306\205\276\311\v\210\3"
- #"\225T\27\363\201\337\0027S\336u="
- #"\210\e\356\261\301yY\211\313\376Od"
- #"\31l\350B\343a\340#\372\2623\322"
- #"\226\376J\264\220\241\a\342\2740Mq\346\353a\36\3609$\250[W\267qH"
- #"p\336y\270?B\356\2\27\372&/ \16TR\325\274\217\230\237~\213\304u"
- #".E\326M\4\5d7t\370\373\317\4\356\320\233\245\261\266t&\360\307 ="
- #"\1Y\231\225\245 f\225\230XC\216\0\276\f\234M:\243^\326\201\v}\223"
- #"\27\20\a*\251\"\n\310\e\366u\300L`s\211s\16 z\330v2W4"
- #"+\334\f|>H\367E\334g\354\2527Kcm\351M\304Ez\270\330\341f"
- #"\304GY\226Y\6\374\36\270\36\370W\211\377\357\205"
- #"Do<\37\31\241e@P]\350\233\274\2008P"
-) 500
-(
- #"I]\362:\262\"\347V\244c)\246/\22\36\365|d\244\321\b\254A\354\345"
- #"\313\203\343K\200\37\352\317\326h[\272"
- #"\4\370Q\220\336\t\231\327\32`&k\353\314E^\224n!\276\334<dW\340"
- #"\34\340k\300\356\6\313\2250.\364M^@\34\250\244N\264#\276\204\256Cl"
- #"\342\245\334d\37\211\274\201\177\212\306\351"
- #"XB\276\v\\\26\244G \363@\6\374]\31mK\e\221\225r\257\6\307\337"
- #"\5\246\233\311:5\254E<#\374/\361M\242!=\2209\257\363\221\300gM"
- #"\346\212\226\4.\364M^@\34\250\244\16\346!C\370\31\304\335d\207\fAL"
- #"T\237'\323\223\213]\362\22\262\30 "
- #"\214\321}'\342w\311\0\306\333\322\235\210\313t\220UI\317##\257Fd\1"
- #"\"$\277\245\364b\221\235\200\263\200\257"
- #"\0\373\e,W\35\270\3207y\1\311"
- #"E\306\322\246\246&\332\332\332\2728\333 ~\"\2616\216GB\300\2|\24\355"
- #"\233\6\363\371<\355\355\355\235\2767\326"
- #"\226>\n<\20\244\217\3\376\242?\313"
- #"T\343\370\2\222\342\366\224\366\356\331\v"
- #"H\32T\276X,\346\2/\322\265\247\322\6Y\312X\0253\221=\2 \346\212"
- #"\3470\32\217\333J[z\1\351\0\303>g&p\212\331\"\244\226J\227\260o"
- #"\207\264\223q\244JTR\3217u\203\27\220\244+i=\342mt\245\362YQ"
- #"\364\257\372y\23\261\345VTX\304D\361c\32f3U\305lB\346\4\26\a"
- #"\307\27\2W\232-\202\265\a\376B\340\252 =\nY\245\324\333|1RK\270"
- #"\211\366\a\210\211\263\322*\32\200L\310"
- #"\267(\237\301e\322\341q\337\222W\252\t/ \16Ps%\25\217\32\376\202\314"
- #"K$u7S\372V\224Z~\2\374G\220\36\206t\24\375\315\26"
- #"\301\332\3\277\26\330\aqx\tr/\276g\276\30NP\313h\277"
-) 500
-(
- #"\32rH\373;\236\272\237[/ \16\220\313\345(\254+\350\e5TT\b\22"
- #"kt\r\311\353\210\31/\f\266t\3\342\24\3220V\37\370\e\220y0\220v"
- #"\263\0\247\227\260\32E\367\313 \3244"
- #"\232\311\365\363\2\222n~\5k'\257e@\222\353\\-\17{\e\216\25H\270"
- #"\335E\301\261EW\347V\5\244\330e\375(\340\t\244}yjC\2479\272\2"
- #"\326\262\226\1\277\34 \341\25RJc"
- #"\v\310P\272\236\\\353\n?j\260\317"
- #"\275\310\262\314\245\312w\217!\356=,"
- #"`\335\344\360\30\22\2610d\30\262\354"
- #"\373D;\305iH\222\36\315\f\245\374\352\313\24\320\330\0022\35VN]I\313"
- #"\260\226\370\250\300\217\32\322\315:\304\255"
- #"\371o\212\276\377\20\3607\343\245\351\300"
- #"\272\200\0|\230x\234\367\34\"\262W"
- #"\340\227x\333\244\332\321\314JX\271t%-\323Z`\212\235\"WBc\v\b"
- #")y\350=\225s/\262tY\335H\231\2227\355\324\264\245?#\367H\35\231"
- #"\245\344\36y*'5\355\251\v|DB\217\e\254G\342_\234B\\<NG"
- #"L\6\276c\2148\21\271'\247)\337-\5NF\356a)\377Q\36O\r\370"
- #"\21\210\3*\337\360<\212\304\312^\254|\327\f\\\213D\263K\t\251lK\177"
- #"@Dc\225\362\335H\340&\342\363%"
- #"\236\324\221\312\366T\204\37\201x\322K"
- #"\e0\25\261\353\253\342\361a\344\r;"
- #"E\342\221Z>\t<\203\334\263\220\305"
- #"\301\361T\"\237a\36O\r\370\21\210"
- #"\3*\337\220<\2138\205\234\247|\327"
- #"\27\331]\376\25R\31\357!\325m\251"
- #"\200,:\270\220h\277\fH\214\230\233"
- #"\221\25\204\236T\221\352\366\24\340G \236t\261\25qK~\4q\3618\24\t"
- #"Q{>\251\24\217\324\223C\356\335S\310\275\f\231"
- #"\207\204\375\235\216\334{\217\247\n\274\200x\322\303+\300"
-) 500
-(
- #"\321\210ieS\360]\36\230\206xV5\350\0301\263\354\213\334\313iD\3611"
- #"6!\367\374h\244\16<\236\n\361&,\a\206\211\231'4\257\\\204\270\343\16"
- #"\331\a\211\361p\230\215BU\217sm"
- #"\351\237\210\231\360E\345\273\376\300\345\310"
- #"h\305c\25\27\332\223\27\20\a*)\323\254Gv\216?\257|\347\350\3467'"
- #"\333R\271M\231\a\2s\360\236\25,\342B{\362&,\217=\26 \376\233T"
- #"\361\30\6\314B\226\350:$\36\316\322"
- #"\17\t\215<\v\271\367!\317!u\263"
- #"\300F\241<\256\340\5\304c\207\e\351"
- #"\334A\215C&u\375\246@\363\234\204"
- #"\334\373C\224\357\346#ut\223\225\22y\34\300\233\260\34\30&f\202\r@+"
- #"\3600p+\360\226\362\177}\201_#\233\5\35&3m\351F\304\3\254\272c"
- #"}g\340\34\340\30\340(\274i\313\0.\264'/ \16T\222\223lA\334\252"
- #"?\34|\36\247\364\246\2651H\f\353\f\204\345\315T[Z\200lB,e\302"
- #"\352\205,\375=\26\21\224\303\220\0h\236Dq\241=y\1\311E\233\n\232\232"
- #"\232hk\363[sk\242\200\230<B\301\370;\361\25U\245\370\0\342=\327\341"
- #"\267\331|>O{{{\247\3573\321\226\326#;\326\377\331\315y\3\200\17\""
- #"br\f\260\277\346re\230\342\366\224"
- #"\366\356\331\v\210\3*\237J\nH\360"
- #"\242\207\202\317?\220\25=\345\310!\366"
- #"\365c\203\317\21d\316%~f\333\322"
- #"zd\4\31\326\365\323t\35\337\242\37"
- #"\321\b\345X\244\336\375\346\317\252q\241"
- #"=y\1q\240\222R\303\23\210_\245\277\2\263\201\345\335\234?\28\16\351D"
- #">\204\4\307\3110\r\323\226\336EF"
- #"\230\17\1\17\2\257vs\376\216\310&\305c\221\345\301\207\341\227\357T"
- #"\200\v\355I\233\200\264\266\2662e\312\24\346\314\231Ckk+_\375"
-) 500
-(
- #"\352W\271\366\332k\23181].@]\250$k\254B&\276\377\6\\\rl"
- #"\356\346\374\0067e4d[\252\305t\331\23\370\6\362Rq\24\342Y\331\323\t"
- #"\27\332\2236\1inn\346\236{\356"
- #"a\257\275\366\342\300\3\17d\352\324\251"
- #"\\z\351\245\314\2301#U\"\342B%\31C\25\214G\220\275\0\333\2728\337"
- #"O\246\306\360m\211\312\27O\204\364@F%\37\302\vJ\21.\264'm\2\22"
- #"\376\370\213.\272\210\\.\307e\227]Fkk+\247\236z*\253V\255\352\376"
- #"\2\206p\241\222j\246\200\4_Z\202,\233}\243(=\37XMu\361\232{"
- #"!o\217~9g'2\335\226jE]\276\375\v\272\37\305\252\344\200A\310J"
- #"\275\335\220\245\304\273\24\245w\"\263\363"
- #"+.\264'\355\2\322\257_?\26/^\314\16;\354\340\5$I\272\23\207%"
- #"\300\333\324\27\357\301\277\35V\205\263m"
- #"\311$\325\216r\273#\17\f\247\263\260d@d\\hO\332\f\16\203\6\r\342"
- #"\252\253\256\242\251\251\251C<\316>\373"
- #"l\356\271\347\36]Yf\a\23\342P"
- #"\216\341\300\331x\301\360\350\241\3185"
- #"\370@\\Pf \355\272\32\332\200\327\202O92,2\266\321:\211~\321E"
- #"\27q\305\25W0q\342D&L\230\300\245\227^\232\252\371\17\350B\345\v\210"
- #"yg#\342\356zu\360\357\6`M\220^\17\254\r\322\353\220\311\303M\301\277"
- #"\353\202\364\332\340\274M\310\252\245MT"
- #"g2\252\a\377\340\30\305\2057F\247\260\371\"U\212\34\320\eYU\326\eY"
- #"\206> H\367C<\31\367\16\376\355"
- #"\27\244\a\4\347\365\6\6\"&\337\336"
- #"\210i\256\217\222.\361\f\272\320\236\32{\31\357t\3308u#}\350\23\377>"
- #"\207\271N\276V\2748\244\16\27\36\370\314\2216"
- #"\221\251\225\22}\316F6\322gZ\37\230b\245"
-) 500
-(
- #"D\25\221\250\200\264\264\2640h\320 \26/^\314\250Q\243X\274xq\247s"
- #"F\216\34\311\242E\213\222\312\262>\206"
- #"\2\357\331.D\31\232i\330\311CW\361\2\222R*YL\222\236i\3318C"
- #"\201wl\27\242<\211\316\201\f\0312\204\en\270\1 =\"\321\25\27A\373"
- #"\324v\232:B\263\0251\220\344\207\252"
- #"\275\361+\227<\36\223\344\20W\365\303"
- #"\250/8\331\6\"sv\222\246\3555\245\263k\247\235\246o\227\351\233RBc"
- #"\233\260\360o\215\236\344\360m\311\223$"
- #".\264'm\16\5\306\215\e\307\214\31"
- #"3b\337\315\2301\203q\343\306\351\312"
- #"\322\343\361x<\6\321\266\214\367\306\e"
- #"o\344\324SO\345\261\307\36\343\212+"
- #"\256\340\333\337\37663g\316d\346\314"
- #"\231\272\262\364x<\36\217A\264\232\260"
- #"\336{\357=N;\3554\26.\\\310"
- #"\350\321\243\271\373\356\273\31<x\260\256"
- #"\354j\302\205a\242\307\r|[\362$"
- #"\211\v\355I\253O\314u\353\326\261f"
- #"\315\32\6\16\34\310\352\325\253y\377\375"
- #"\356\274\254%\307\222%K\230<y2"
- #"\3\a\16d\362\344\311\274\365\326[\335"
- #"\377\221\243\344\363y\333E\360xR\205"
- #"\177&\314\240M@\36y\344\21\16?\374p\316;\357<^~\371e\316;\357"
- #"<\16?\374p\36y\344\21]Y\3068\350\240\203\0x\370\341\207\18\360\300"
- #"\3\215\344k\203R\1\215<\236F\306?\23f\320f\302\0327n\34S\246L"
- #"\341\254\263\316\352\370n\306\214\31L\237"
- #">\235\271s\347\352\310\262\203\345\313\227"
- #"3j\324(\326\255\213\"\34\251>\271T\\\30&vG\26~C\26\360\365\220"
- #"\36\262P\27.\374\206L.\343\275\360"
- #"\302\v\351\323\247\17?\375\351O;\276\273\370\342\213\331\274y3W^ye"
- #"\354\334J+)\237\317'\26\2424\311kA\362\r-\315\2775\315\327Ks"
-) 500
-(
- #"=$}\2754\227\r\222\255\v[\277\265\241\5d\347\235w\346\355\267;{F"
- #"3\261\23\275\324h\243\324\250\4*\257"
- #"\244$+3\351\206\221\346\353\245\271lI_/\315eK\372zi.[\322\327"
- #"\263U6\27\4D\333\34\310\206\r\ehmm\245P(P(\24\230={6"
- #"\303\206\r\343\246\233n\322\225\245\307\343"
- #"\361x\f\242=\36\210\212\251x \245\314U\245\314Za9=\36\217'\215\244"
- #"}\4\222I\1\3211\211\236\205!\261\215\353\245\271lI_/\315eK\372z"
- #"i.[\322\327\363&\254\362h3a\r\0324\210G\37}\264\343\330d@\251"
- #"\35w\334\221\336\275{3y\362d\236z\352)&O\236L\357\336\275;\211\207"
- #"\307\343\361xjG\233\200\314\2349\223\223O>\231\\.G.\227\343\224SN"
- #"a\306\214\31\306\2J=\373\354\263\0\234t\322I\0<\367\334su]\257W"
- #"\257^u\227I\307\265t\220\346\337\232"
- #"\366\353%I\232\177k\232\313\2264\215"
- #"\364[\253%\223\313x\253\301\205abwd\3417d\1_\17\351!\vu\341"
- #"\302o\320\352\312\304\343\361x<\331\305"
- #"\vH\6\310\322\220\330\343I\2\377L"
- #"\230\301\233\260\34\30&z\334\300\267%"
- #"O\222\270\320\236\374\b\304\343\361x<"
- #"5\341\5\304\343\361x<5\241-\"\241\23L\207\rl\200\342\315\3509\2407"
- #"\260c\360o_`@\220\356\a\364\17"
- #"\322\375\203\343\336\301\377\367\r\322\3\201"
- #"\355\203\364 \240\217\222\366\e\337=\36"
- #"w)\0\253\201\215\300\246 \275\t\330"
- #"\0\254\t\322\353\201\265Az\35\360~"
- #"\220~?8\336\24\374\377\372 \275<"
- #"\370\267\310Z\265\201\r0\35\230\242\367'\325C\242s \207\35v\30\223&M"
- #"\342\v_\370BR\227\324\313P\340=\303y\346\350"
- #"\324PJ\2363\b\30\3\354\6\354\f\354R\224\336"
-) 500
-(
- #"\t/F)\303\5\233uCR\0\226\1K\200\267\2007\212\322\363\21!\250\344"
- #"\2714]\275C\201w\f\347Y\5\211\n\310\313/\277\314Yg\235\305\210\21#"
- #"\270\341\206\e\0304hPR\227\326\303th\237\332N\23M\266KR=y`"
- #"8\235\205\305\213\2145\274\200X\240;"
- #"qX\2\274\r$\347\215\335\30\355\264\3234\255\251qF \0\2337o\346\273"
- #"\337\375.\367\337\177?\277\377\375\357;"
- #"\"\3\246\225\222\17\375\6\242\341i\222"
- #"C\3255\272\177M\21^d\214\342\5$a\322*\16\3I\336\264\335;\370?"
- #"\5\27\332\223\266e\274\337\373\336\367\270"
- #"\354\262\313\330\262eK\354{\23\361@"
- #"\252!\225\225d\353\301\311\1\303\200\263"
- #"\201\17\1G\1\315\t\347\221aR\331\226\322\316*\240\25\370\e0\3XJ\362"
- #"f\"G_\244\\hOZ\4\344\241\207\36\342\334s\317e\346\314\231\34r\310"
- #"!I_>Q\\\250\244\222\230\20\231\36\300\201\210\230|\b/(\335\340l["
- #"2\211*\30\217\0\317\1\333\352\270\236"
- #"\243\342P\t.\264\247\304\5\304%\361"
- #"\0007*\251f*\231<\254\326\263\376"
- #"\316\3009\3001\210\240l\337\365\351\215"
- #"D\246\333R\255l@\4\343a\340V"
- #"\244\355UC3\r\273\230\304\205\366\224"
- #"\250\200\270&\36\340F%\31\243\332\267"
- #"\303^\300x\340XDP\16\243\241\27\206\373\266\4l\1\236D\4\343a\340q"
- #"\272\36\5\373QnY\\hO\211\n\310\204\t\23\270\364\322K\215\271lO\2"
- #"\27*\311\32\305\366\351\316!\356\343\f"
- #"\0>\210\210\3111\300\376ZK\227:\32\262-\25\220\221l(\30\177G\26\221"
- #"t\305p\374<[\5\270\320\236\274/,\a*)5\254G\336(\37\n>O"
- #"\323\365\204g?\242\21\312\261\300!d\326\334\0\r"
- #"\322\226\nH\275\207m\340\37\310\212\303r\344\220z"
-) 500
-(
- #"\17\333\300\21\310\252$O\267\270\320\236"
- #"\274\2008PI\251\345]\344\215\363!\340A\340\325n\316\337\218\32\351H>"
- #"\212\330\2623Df\333\322\e\300\375H=\317FvNw\305\b\3408\244\236?"
- #"\204l\206\363T\215\v\355\311\vH.z%njj\242\255\315\301\35Gi\240"
- #"\26S\306\a\20\363\230\303\23\361\371|"
- #"\236\366\366\366N\337g\242-\255\a>"
- #"\f\374\263\233\363\32\334t\231$\305\355"
- #")\355\335\263\27\20\aT\336I*\235L\35\203\314\257\354g\256h\272\310T["
- #"Z\0|2\370\267\30\277x\302\b.\264'/ \16TR&\350j9g_"
- #"\340\327\200#.\324\312\221\231\266t#"
- #"0\t\31\201\204\370\345\333\306q\241="
- #"y\1q\240\2222\311\215t\356\244\306\1\17\0\203m\24\250~\234oK+\200"
- #"\343\221I\362\220\214\210\273\213\270\320\236"
- #"|<\20\217\35\316EL\\\252\351j.p\0\360g\e\5jp\356E\356\275"
- #"*\36c\220:\362\342\341)\203\37\2018\240\362\231f=0\1x^\371.\a"
- #"|\5\270\2Y\n\354\bN\266\245u\300\277\3\277)\372\376@`\16\336Te"
- #"\21\27\332\223\37\201x\354\322\27\331\361"
- #"~/\342\310\21dE\327u\300\336\370"
- #"\321\210N\356\5\366\".\36\303\202\357"
- #"\237\305\213\207\247[\274\200x\322\301\211"
- #"H\247u\232\362\335R\340d\340\2\342s%\236\372X\217\334\323S\20_i!"
- #"\247#up\242\215By\\\304\233\260\34\30&6\34\177@:8\325\321\343H"
- #"\340& \305^r\234hK\217\"s"
- #"\32\213\225\357\232\201k\221e\273\236\324"
- #"\340B{\362#\20O\372\370$\360\f\262\211-dqp<\25'\243\313Y\247"
- #"\r\271w\37&.\36\37FF\35^<<5\340G \16\250|\303"
- #"R@\354\363\27\"\373HB\16\0nF&zSDj\333\322\263\300"
-) 500
-(
- #"\347\201y\312w}\201+\221\305\n\31\366O\3462\251mO\n~\4\342I/"
- #"9\340|\340)\340P\345\373y\310N\350\351\300V\v\345r\205\255\310=:\202"
- #"\270x\34\212\270'9\37/\36\236\272\360\2\342I?\373\"\256P\246\1M\301"
- #"w\233\20\223\314\321\300+\226\312\225f"
- #"^A\356\315T\344^\201D\357\233\206"
- #"\334\313}-\225\313\223)\274\t\313\201"
- #"a\242G\341\237\2109\346E\345\273\376"
- #"\300\345\310\e\265ER\321\226B\263\337"
- #"E\304\235Y\356\3\374/\342\267\312\343\4\251hO\335\320\330\0022\35VN]"
- #"I\313\260\26h!\376\31\\&\35\36\373\230\6\366(\267\371\355C\210w_K"
- #"\244\342\201\3770\342\t9\304\321M\231\231c=\342*f\245\362YQ\364o\321"
- #"g\345\322\225\264Lk\201)v\212\\\t\215- C\201\367j\374\333\34\262\351"
- #"\352x\304\207\3238dR\327o\2762\307\275H\347\270T\371\3561dg\273\5"
- #"\254\v\310c\304\2279\17\3\256\307\357"
- #"\3530\311\6d\321\302\334\340\363\27d\257M\255\315b(\360N2E\323Ac"
- #"\v\310\257`\355\344\265\f`@r\327\34\0\354\212\37\315\230b\5p8\260("
- #"8\36\207\370o\2620\273gU@\266\"\361UB_V\243\200'p\3261e"
- #"*\250v\324\360&\2606\271\354\327\262\226\1\277\34 NGSJc\v\b\301"
- #"C\277\256`\265\241\370\321L\235\274\3"
- #"\214\6V\a\307\277\2\276n\276\30V\5\344W\300\344 =\bx\t\330\301N"
- #"Q\234#\351QC)jx\261\314\365K\201I\264\e\274\200\324\372\320\353nt"
- #"\333!+e\306\341E\245\22~\216\314\213\200\354\254^\b\f1[\4k\2\362"
- #".\"\240\341\316\375\237\3\3372_\f'(~n\347\"\v2"
- #"\266$t\375\4_\6\255\233D+\300\vH\322\225\244{\330;\32"
-) 500
-(
- #"\370O\340\343\310\262L\217\260\58\204"
- #"h\277\303\5\3005f\213`\355\201\277\0q>\t\221Kv\37!0\242\r\370"
- #"\23\360}ddV)\226\315\321^@\34 \25\225T\313[\321\20\340s\300y"
- #"d\"\34l\"\374\25\211\230\a2\a"
- #"\362\17\214.[\265\322\226\376\211l\252"
- #"\334\26\34?\f|\304l\21R\313|"
- #"\340\267\210\327\202\256\26\313\244t\264\237"
- #"\212\276\251\e\274\200\344\242\255\270MM"
- #"M\264\265\245\304\321R\261\250\334G\371"
- #"\325\30G\0_\6\316\306/\325<\23"
- #"\370c\220\236\2008\17\324\270\333:\237"
- #"\317\323\336\336\336\351{#m\251\0\34"
- #"\211l\f\4\371\355w\350\3152\365\274"
- #"\17\314@\204\343\3612\347\354\b|\214T\211EHq{J{\367\354\5\304\1"
- #"\225\357`\31\360{di\346\277J\374\177/\340TdC\33514\246\233\2127"
- #"\221\267\311\320\375\373\315\300g\315dm"
- #"\274-\335\214l\252\0041\235\274\200\230"
- #"\\\32\215\0022\362\272\16\230\tl.q\316\1D/Y;\231+Z=\270\320"
- #"7y\1q\240\222J2\27y`n\241t\254\214]\201s\200\257\1\273\e,"
- #"W\32\270\4\370Q\220\336\t\261{'\270R\273\34F\333\322\32d>lyp"
- #"|\t\360C3Y\247\206\327\201\253\201"
- #"[\221\27\207b\372\2\237A^\250\306\31,WB\270\3207y\1q\240\222\272"
- #"d-p;\342\246\342\261\22\377\337\3\261\211\237\217\4kj*qN\326\330\210"
- #"\304\363~58\376.\342TP3F\333\322w\201\313\202\364\b\304\336\337\307L"
- #"\326Vi\a\356F^\236\376J4\367\243r$22\373\24F^\34t\341B"
- #"\337\344\5\304\201J\252\230\5\210\220\374"
- #"\226\322\223\206;\1g!\273\267\3677X.\e\334\t|\"H\347\221"
- #"\230\353\243\365fi\254-\275\4\214%\212\213r'p\206\376l\2552\17"
-) 500
-(
- #"1\335\316 \36E1d\bb\242\372<\231YT\342B\337\344\5\304\201J\252"
- #"\32\307'\22\23\343\243\300\3A\3728"
- #"d\257\216F\214\265\245\343\201\a\203\364"
- #"G\221\5\26Y\302/ \1\334\350\233\274\2008PIuQ\351R\306\34\362V"
- #"{32\341\230\5^@\2041\\\3242\23\211\3\256\t#mi&\262\a\b"
- #"\304\34\371\34\331q\315>\17Y\232\376<]o\310m\220%\354.\364M^@"
- #"\34\250\244D\b7S\375\0001\201t"
- #"\365\223\307\1\263\311\306\210\344B\340\252"
- #" =\nY\275\326[OV\332\333\322&dn'\fI{!\22U\320u\326"
- #"#\261K\236\356\342\234\34b\202\3741"
- #"\r\263\211\326\205\276\311\v\210\3\225\224"
- #"8\225\230\b\306 f0\327\337\360\326\"\2610B\217\275?\1\276\247'+\355"
- #"m\351'\300\177\4\351a\310\213@\177}\331\31a\1\22\217}A\321\367\215`"
- #"b\355\6\27\372&/ \16T\222\21\346!\373%\236W\276\353\v\374\32\370\202"
- #"\225\22%\307\r\210\235\34\244\23Z\200"
- #"\226\245\315Z\333\322\353\210\230\207\261\341"
- #"o\0\276\250'+c\334\210x\232U"
- #"\227\241\217\5\376\217\354\230Q\353\300\205"
- #"\276\311\v\210\3\225d\224\e\351\374P"
- #"\177\0\t\324\344\352\e`\261\253\363C"
- #"\220\221W\302hmK\207\0\317\4i\213.\353\23a\3\22\374\353\237\312wY"
- #"yYI\20\27\372&W\233\240G\27\347\"\235\223j\272z\22Y[\377\232\205"
- #"\362$AO\340\27\312\361\323\300m\226"
- #"\312R\v\267\21\211\a\310oq\365\311}\riK\252x\214A\332\230\27\17\347"
- #"\360#\20\aT\336\n\353\201\17\22\177S\37\202lZ<\246\344_\244\237\211D"
- #"\233-\373\3O\1{'wy-mi!p(Q|\363\211@k"
- #"\262Y\30\343!ds\337\n\345\273,-\330H\30\27\372&W\337c"
-) 500
-(
- #"<\272\351\213t\260\327\22\255xy\17"
- #"\331O1\225\322;\200\323\316\337\20\317\265 \35\362\31Ds\nid=p:"
- #"\221x\214Gv_\273\3066\244\315\34O$\36y\244m=\205\27\17\207\361#"
- #"\20\aT\336:\217!\273\272\325\35\300"
- #"'#\223\235\3\255\224\250v\212\337\350'P\332\5L\r$\336\226&\20m\4"
- #"\3250b2\302\32dq\306,\345\273a\300\37\20S\226\247,.\364M^@"
- #"\34\250\244T\360\26\"\"\377P\276\e\r\334\205{\e\331nC\34M\206l "
- #"\21?R\211\266\245\r\304\203\23\335\n"
- #"|:\231K\e\343\5\304\377\332B\345"
- #"\273\361\210\353\225\341VJ\344\24.\364"
- #"M\336\204\345\251\214\235\201\277#\273\177"
- #"C^B:\204\273m\24\250\16>\215\3543\by\316VA\272@-\323\216\270"
- #"'\36w\3\207\23\27\217\363\2206\344\305#3x\1\361TN/\3407\304\347"
- #"E\326\"s\t\256\315\213\34\247\244\237"
- #"\265V\212\362\250e:\336Z)\252'\234\3578\203\310L\30\316w\374\6iC"
- #"\236\314\340\5\304S=\347#\223\271a"
- #"`\236\2\342.\375\343\210\315\333\5\16"
- #"V\322\317\224=\313\36j\231\16.{V\272X\203\264\201\351D\256r\206!m"
- #"\345|[\205\362\350\304\v\210\2476\216D&u\307+\337\315B\314\26/X)"
- #"Qux\1I\226\27\220\315\232\352d"
- #"\371x\244\215\370\311\362\314\322\330\0022"
- #"\35V\260B62}\32\230\206\370\205"
- #"z\313n\261\234\301\345y\221\203\211B"
- #"\376\376\v\330b\261,\305\264#\256e"
- #"@\312x\220\305\262T\202\237\357\250\217"
- #"6\244\276\177\2178;\375\4\260o\3207\31\b\204V\17\215\275\nk(\345]"
- #"\234\17F\34\270\215\r>\a\"B\343m\270\245\271\16\230L\24\344("
- #"\207D\315\373)\351}M\331\3\3611\5\"\"c\252\277D>\237\247\275"
-) 500
-(
- #"\275\275\323\367MMM\264\265\265\225\370"
- #"\213\n\370\27\221/\250=\210\"+\246\215m\210c\312K\211LVy\340\227x"
- #"\223U)\332\220\27\254\5H\230\205\360"
- #"\337W(\377\0023\224\362\261PR\300"
- #"v\266\v`\225\213\241\355\333m\344K\371\206^\201\330n\2137n\265 n>"
- #"vC\336\300w)J\357D\364f\333H\234\17\214$\332i\34\316\213<\205\354"
- #"@N#\a\23\t\3103\324$ \252"
- #"H$\266\354\322\25\363\325\361\300\303\312"
- #"\261\353\236\n\352e+\3606\342\256\245"
- #"\370\363\34\361\35\370\25\260\211M\364\276"
- #"XS\354\201\204hl\1\371w\30\370\355\201l|j\243x\241\r?]U\366"
- #"J\340\321.\256\231C\206\355\247!\e"
- #"\301&\"\2\323\b\34\213\b\306\351D\253\210\36F\"\1\246q%\321\301D\246"
- #"\266g\220\roi\300\5\1y\200\270x\34\204\354\t\332\303Ji\354\360:\262"
- #"\tu\16\322\216\336\246\3538;\345\330"
- #"\16\330\23y\201\331/\372w\340\330\201"
- #"l\276psB\205\325Cc\233\260\350\342\255\361-\"1y\16\261\347.\247\266"
- #"\6\262\v2\221\30~\306\222m\351\336"
- #"\200t|\241M|\17\304\306\233\266\220"
- #"\243jt\277\217\20\357\20k \261\21\310G\20\267+\240=\212bM\254\3\366"
- #"'\32\275\355\215\210^\226]\222lA"
- #"\372\203G\21\301x\224\352\347Js\300"
- #"\16\310K\245\"\24\214\246d\200,\0276\22z\1\251\246\222\n\210;\217%H"
- #"\343y\243(=\37XU\301u\372!\223\216\241\240\214\a\6TY\360\264\263\6"
- #"\351d\226\4\307_\3\376\307^qJ"
- #"\362&\321\350\260\31\31\f\260\300\214\0\0\35PIDATu\326a~L\344"
- #"\201/ f\322\325\301\361\233\310\vH\232\370\32pM\220\336\5i\367"
- #"Yk\277k\02172s\220Q\306\23\210pvG\v2\32\333\243\304g"
-) 500
-(
- #"8\342\31\272B\274\2008@\342\225T"
- #"K\303\313!\223\246Y\v\2443\213\350"
- #"\3559\207\214\342\216\266V\232\322\250\v"
- #")^\243\256@S\211\264\245\327\200\21A:\215\23\250\17#\2330\303\2379\v"
- #"8\311^q\22'\f\2546\217\356\255\r\232_\4\275\2008\200\366J\252f\350"
- #"\333\38\23\370>\331\21\222\263\20\307y \246\216gI\304\357Tb\34G4"
- #"\311\177\0272wU#\211\264\245\273\220]\334 e\373K}\227K\224\215\310j"
- #"\304\227\203\343\263\220\245\247Y`\36\22"
- #"o\375\217\224\367\250`\330\24\355\202\200"
- #"\244u\201ev\330\16\211&\367\rd\205\312\22\344-\363\26\340\353\304}2m"
- #"C:\333\203\220\207s\36\356\363?\310"
- #"\2334\310\234\310\217-\226\245\24\352$"
- #"u\32\\\232\250eH\333\4\372\217\210\304c(\22A\320u\346!1\331\17\2"
- #"\356 .\36;!\317\350-\310|\317\233\3103<\31y\246\263<\217Y!^"
- #"@l\260;\342\r\366W\310\234\312bd\31l\330 C!\31\213\274\205>i"
- #"\241\214I1\4\270L9\276\34-\341dkF\335\244\227\206\35\351j\31\322\264"
- #"\201p.p\205r|9R\267\256\362$\362l\215%.\34\333!\317\342b`"
- #")\362\214\236C\343\254\244\254\22/ i`\4\342ln!q!\0011\257\34"
- #"\216\333B\362\5\340\204 \275\5\3702"
- #"\262\333:\r\244\315\245I\32\227\360\266"
- #"\3_\"\332\354\366Q\340\363\366\212S\27\241p\34N|\177R(\34\v\221g"
- #"qD\347?\365t\306\vH\232\310\262\220\\\213\4E\2Y\26}\271\305\262\250"
- #"\354M\24w\343M\312{&0\301\273D\253\326\372\221\236\340Q\227!\363x "
- #"ux\255\305\262\324\212\27\16-x\1I#\241\220<\215\370\305Q"
- #"k)\24\222\203\250zg\253Uv\a\376K9\376\21\351p\272\330"
-) 500
-(
- #"\223\370\202\5\233\363 j\336\a\220\216"
- #"\247s\1\361y\253\237\340\2269g\5\362\254\24\vG\17d\356\343i\274p\324"
- #"A\32\232\250\247\34\a s!\317\322YH\236\v\376\377^\v\345\252\225I\310"
- #"&*\200\315\210)+\r1D\324\271\206\264\bH\32\346?\266!N\21\303\315"
- #"\320\23\221IeW\270\27\331\213\244\6\347\n\205\343Y`\6\331Y\355h\t/"
- #" .\240\n\311h\345\373\245Hl\362"
- #"\257\20\5\357I3=\200\353\201\320\275"
- #"\317\343\244\303\34\222\226y\220\264\315\177"
- #"\\C\24\223\2757Rw.\364\30\357#\302w2\262H%d4^8\22\306"
- #"\205\346\340\t9\0x\21y\263\32\246|\177=b/\237U\352\217R\306h\340"
- #"b\345x*2\367`\23\265\263\266\351"
- #"\370Q\315\333\266\200\274\201\324M\310\367"
- #"\210\277\274\244\225{\220g\341\267\312w"
- #"\303\201?#\317\216\27\216D\361\e\t"
- #"\35\330\254S\222w\201\257\"\e\237Br\310h\344\n\322\347wJe\v\22|"
- #"(|\343\376\30\362\200\333b\3r\277"
- #"\302f\260\206\232v\24\327\325\226\326\2"
- #"\3\303\v\1\353\261\273\341\362D$6"
- #"\16\210\230=I\272\367=\254\3\276\215"
- #"\204\315U\253\340\fd$5\264\324\37"
- #"\245\e\27\372&?\2q\225\241\300\235"
- #"\310p\274%\370\256\200\304\345\30\v<"
- #"b\251\\\225\260\35b\272\n\375\2\335\a\334j\2578lO\334\337\324l\ve"
- #"P\353k\27\354\212\307-D\342\321\23"
- #"\251\2534\213\307#\310\310\342:\"\361hA\236\215;qR<\\\301\v\210\353"
- #"|\22qf\247\372#z\25\3700\360M\242\t\320\264q\30\360-\345\370\e\330"
- #"\365\373t\216\222\266!\276j\236\237\261"
- #"\220\177\310;H\273\t\271\20\251\2534\262\31)\353\207\21\357\16!'#"
- #"\317\304'-\224\251\301\360\2\222\5vBl\277\327\22\231\256\n\300/\200"
-) 500
-(
- #"q\244k\347\267\312%D\316\vW f\23[|PI\377\335B\376j\236\37"
- #",w\222\1>F\264<|\17\340\207\366\212\322%s\21w\"\277 \32u\364"
- #"C\236\201\231\3103\341\321\216\27\220\254"
- #"\220C6D=O\334\343\355|\304K\350T\322\263\373;$|\340C\346\2\267"
- #"Y*\313Q@S\220~\206\310\235\272\tV\23-\341m\"Z\352l\232\333\220"
- #"}\21!\352\vIZhG\332\362xd\217J\310\321H\333?\237\306\214\bj"
- #"\t/ Yc\4\22\214\350*\242\370\355[\220\360\262\23\221\225(i\342\4\340"
- #"\b\345\370\2\242@T&\351\207\274\321"
- #"\202\204&\355*\352d\322\264\6y\202\214\30mt\332\v\221{\0372\201\364E"
- #"\221|\21i\303\323\211\334\252\364B\332"
- #"\372\337\360\233\1-\340\5$\213\364@l\303\3410?\344IdE\315t\322\261"
- #"\201/\344\21\344\215\22d\r\377\31\310"
- #"\312(\323|HI\233\234\aQ\363\372P\271\2234\262\36\tC\34\356%\32\217"
- #"\0353^9\266!m6\\\r\26r\b\322\306\277\211\357\311,\341o;\262\\"
- #".\227\313\221\317\227\210+\3512c\200"
- #"\177\0\323\210\3143\233\20\23\300\321\300"
- #"\"K\345*\246\t\270\211\310W\326|"
- #"\304a\237i\324\271\207\333+\373\223|"
- #">\337\321~\240\306\266\244\346ec\376\343cD\346\240\376H]4\225?\335("
- #"\257 mu*\322vA\3126\r\t\3266\306R\2714Q\334\236\322\216\337\a"
- #"\342\300Z\353Dx\2\361\212\373\222\362"
- #"\335\0\304Q\336\371VJ\324\231\333\210"
- #"\257\206z\36\263\e\277\212\367bT9J\253\271-\365\240\356=(5\363<\22"
- #"$*\344V\340\323\6\363\357\212\353\200"
- #"\357 \365\0222\32\370_d\37Q\306q\241o\362\2\342@%%"
- #"\306\373\310\262\314\337\26}\177(\"0i\30\217\356\217\214@@\304\343"
-) 500
-(
- #"\371.\316\325\201\372\342We\263\250\271"
- #"-\325\221g\335\34\0\374+H\357O:\202\230mC\4\242x\365\340y\300\225"
- #"D#\325\214\343B\337\344\5\304\201JJ\234{\221\207qY\321\367\266w\204C"
- #"\3477\342\365\310F?S4\222\200l re\17\346G|\245Pw\300\207\f"
- #"Cv\230g)\366z\5\270\3207\245"
- #"\341\235\323c\232\223\220\267\316\375\213\276"
- #"\277\17\31\211\330d,q?_i\b\362\224U\324%\273\303\261/\36\377\240\263"
- #"x\204\243\242\6\23\17W\360\2\322\250"
- #"\fF\334\\\27\3579\370\216\205\262\24"
- #"\243N\240\233\336\4\251\216\6\266\224="
- #"+9\324<L\317\233\252\367\326\306\242"
- #"\205b\276[t<\21i\243\203-\224\305S\21^@\32\231\36\310\36\204\305D"
- #"{FZ\21\377A6\31\247\244M\v"
- #"\210\272\a\243\330\304\247\203\245J\332\264"
- #"m_\275\267\343\312\236e\206;\220\266\a\322\26_\r\216}\17\225j|\365x"
- #"d\3\326W\225\343\357aw\327\272\332\231\335o8o\325e\371[\6\362S\363"
- #"0\355.\375\1%mS@\332\2216\27\3625\304\215\212'\365x\1\361\b\377"
- #"A\264\204u!2ii\213\261D\346\234w0\353dq\270\222~\333@~j"
- #"\36\303\313\236\225<\313\211\356k\16\273"
- #"\363\37\327\1/\a\351\26\340\a\26\313"
- #"\342\251\212\306\26\220\351\260\202\25b\377"
- #"\375#\351\363\25e\222!\300\24\345\370"
- #"\22\342\353\357M\262=\3617\320\273\r"
- #"\346\275\263\2226=\2\331\271\354Y\311"
- #"\243\336\323\21\230]\351\246\262\26\370\221"
- #"r\374\35\240\331RY\322@;bB>!\350\233\246\333.P\3274\266\200\\"
- #"\16-\264\310P\376L`7\340\377!\366\327F\344B`\327 \375.\22\230\312"
- #"\26\252K\361\273\f\346\333(#\20\365\236~\263\354"
- #"Y\372\271\34ik \317\337\267\27287\313\274\212\230"
-) 500
-(
- #"\361v\3>\1\374%\350\233l>\203"
- #"\25\320\330\0022\31\266\251\333\215\227\1"
- #"?\5\366\2441G%\275\221\221G\310\25\304'yMr\32\221\31\353a\314y"
- #"\307m\4\1Y\5\3745H\347\220{m\203\245\310\306\300\220K\2206\330(("
- #"\243\r\366\4~Fl\341\3066\266\301d+%\253\230\306\26\220\37\300.\354\""
- #"~uTO\236\333\210F%; ^J\323\260C\327\4_ \262\207\257'n"
- #"^0\311\356\300AA\272\235\316\373\3t\241v\342\246MX\246\4\344>\242\27"
- #"\243\203\221\267^\e\\\202\264\261\260\34"
- #"_\260T\16\323<\217\364)C\351\30"
- #"m\304\334\346\214\0\246\5}\323\367-"
- #"\224\257\n\32[@\200\245,\25\333\377"
- #"K\310R\302\343\211\337\225\325Dab\367B\204%\335\233C\353\243'\"\250!"
- #"\327\23\217\273`\222\323\225\264)3\226:\17az\4bj\16D\275\227\247\227"
- #"=K/\363\211\273\324\371\t\331\356\215"
- #"\n\310\212\302=\21O\v\327!~\317Bz #\221;\221\276hJ\3207\245"
- #"\34\357\312\244\224\273\200W\221UH\277"
- #"\243\364^\2001\210\255\366\263dw\310},b:\0021q\230\234\207\b\371\27"
- #"\321h\250\37b+\327}\277W \v\n@V\245Ua:\253\311\365\304 \242"
- #"\216d\5Q|{]lB\336|\327\5\307\377\302\216G\333\323\200?\5\351c"
- #"\201\a-\224\301\4\233\200\233\221\230%"
- #"\245^\304v\2\276\204\270\26*\212g\342\202+\23/ ]UR;\22\36s"
- #"\n\245]\237\357\200\254Y\377\32\260\243\246\2\332\342Ydo@8\264n\305N"
- #"\244\274\321D\1\246f\241\337\245E\1Y\221\24\272\16_G\334_T\27T\375"
- #"\300\257#\332<\330\a31Pf\1\247\4\351\321\330\t0\3667"
- #"\340#A\272\a\262\241\361\240\362\247;\311r\340\177\200\253\211\26\t"
-) 500
-(
- #"\250\354\211\254\260:\205\262\256\363]\20"
- #"\220,\17\32imme\277\375\366\253\375\2M\310<\310+\301\347\e\304;\223"
- #"w\2209\202\341HCx\274\366\254R\307A\300Y\312\361E\3301\335}\\I"
- #"\233\30\5\34507\221nc\2]\275\207\37/{\226>\nHl\217\220\263\311"
- #"\226x<\216\364\5\303\201\37\23\27\217"
- #"\276H\37\262\b\331\367r\6\351\211\273"
- #"R#\231\25\220\326\326V\316>\373l^x\341\205d.8\n\370o\244\362\177"
- #"\200\230\1B\266!ov\23\2207\213\233\211L\4.\363S\"\27'O \253"
- #"\322L\243\256\20\372\23f\374SeU"
- #"@\266\20\231\215\300\316\352\253;\211\242"
- #"\n\366B\332\230\353\274\217<\363{\""
- #"}\300,\342\223\342;\0?D\372\216\377\6F\232.\240>2+ S\246L"
- #"a\306\214\31\311_xGd\324\361\0062\21V<\300Y\4|>8\357\34\304"
- #"u\272\253K\201\323\340\342d<\221w"
- #"\336\367\2009\6\3624\265\231\320\364&"
- #"\302\307\220y\26\220{z\270\201<U\262\344\262\244\35y\266\317A\3461>O"
- #"g3\367\30d.\365ud\305Y\326\314\334dX@\346\314\231\303\304\211\32\215"
- #"\366\275\201\257 \223\220\367!+\264T"
- #"6 \21\366NF:\207\311\270i\342"
- #"\262\355\342\244\ap\252rl\302\214\225"
- #"\325\21H\261\371\312\364\323\357\272\313\222"
- #"\2\362\fOB\352\353d\344\31/\236\273\332\eYq5\17\231\34\317\352B\e"
- #"2, \306\310!\233\16\27\"\e\264nBV\225\250\256\271\337\5~\205\fo"
- #"wAv\376>j\266\2305\223\6\27'\305\313yu\317\305dQ@\n\304\335"
- #"\227\230^\276\353\262\313\222G\221gv"
- #"W\344\31\37652\32\16\311!\317\374MH\37\360\22\262$\327\215\260"
- #"\346u\341\224\200\214\0325\252#\340|\361g\324\250Q5_\267\324\365"
-) 500
-(
- #"\362\371|\365\27\32\204\fe\37DL\\W!\e\244T\336\2~\1\34\205\f"
- #"q/\241\364\n\2574a\333\305\311G"
- #"\210:\233\327\221\30\21:\351\306\204\225"
- #"\317\347K\266\31\250\262-\2314a="
- #"\213\334;\220{\371a\315\371\25\343\232"
- #"\313\222E\310\2639\6yV\177A\347"
- #"\266p\b\362\214\277\201<\363\237G\372"
- #"\200*\351\252=\245\35\247\4d\321\242"
- #"E\24\n\205\222\237E\213j\357\205K"
- #"]\257\255\255\255\276\302\206#\215\271\210"
- #"\335\376\353D\373\vB\26 oe{\"Kd\267\221Nl\2738iB\302\355"
- #"\206\3506cu3\2ikk+\331f\240\312\266dr\4\242\336\263\0231\273"
- #"\372\307%\227%\333\200#\221g\362Gt\336\2731\0241a\315A\236\355o\""
- #"\317z\35t\325\236\322\216S\2\342$"
- #"9\340\b\304\204\3656\262B\343\323t\366~\372\30b/M\253\210\330vqb"
- #"rWz\26'\321m\356>\277\0047\\\226l\3\276L\347\205\32\333#\317\354"
- #",\244\316~\211<\323\236\354o$\354n3\216\265\315:\357#6\351\37\22\367"
- #"\376\373E\304}H\32\245\375\317D\e\371z\">}\352\330fS\25\353\220\267"
- #"\277p\203\337K\310d\245\0166\20\355\367\351\5l\244\"{vUm\251\200\274"
- #"\205\207\203\223\r\310fB\35,$\nV\325\a1%U\2709\262n\346#\256"
- #";\266\6\307\177&>\232L\v\241x\334\250|7\2yQ:\235x\244JC"
- #"\370\215\204)\240\256\215\204:\351\17|"
- #"\16\261\265~]\371\376w\310\333\216\211\375\16\325r\"b\17\6\351\20>o0"
- #"\357~\310De\310L\215ymOd\313\336\f\254\324\220\307\n\"\361hF\237"
- #"x@|\357\307\261\230\23\17\2206\22\212\307Q\244S<\266\0\237"
- #"\".\36\223\220g\363sX\21\17W\310\274\200\314\237?\337v\21\272"
-) 500
-(
- #"&\207\f\211U\21\231\1|\206t\212\310\245Jz.\360\246\301\274U\323\313/"
- #"5\347\245\333\214e\322|\365+%m\322|\365&\360\264r|\231\301\274+e"
- #"\v\262\227\343\17\312w\223\220Is7\346\261\255\222y\1q\2\227Dd<q"
- #"\323\321M\6\363V\375`\275\211\230\226"
- #"t\241{)\257\251\t\364\215\304E^"
- #"\267/1\225\e\225\364\336\230\337\270\330\35^<\352\306\vHZpIDT\367"
- #"\23\327cn\342\177G`p\220.\0\ty\251)IVF \v\210\366\315\f"
- #"A\334j\230`+\262q0\344g\206\362\255\24/\36\211\340\5$M\344\220\6"
- #"|\256\362\335\f\340h+\245)\317)"
- #"D\35\321\353D\321\355Lp\224\222\326"
- #"\31\247$+#\20\365\36\35U\366\254\344\371+\260$H\357@\344\18-\34"
- #"M\\<\276\210\370\251\362\342Q\25^"
- #"@\322F\17$\320\316\271\312w\217\3\327X)Mi\362H,\224\220\e\f\346"
- #"\255\256\211\3209\275\225\25\1Q\357\221"
- #"\311\365$j\233\370\34\351\362:{5q\267Bi^\371\230r\374-K#\241"
- #"\210\214U\276\373\26\221\27\3234\360%%}\27zV*\225B\r~\244s\4"
- #"\222%\23V\210\251\300Q\357\21\367\334"
- #"|\236\241|+\341\t\304\263B\310\201x\361\250\3\177\333\322J\17D0\16\r"
- #"\2167#\16\360L\204Y\255\2041D\223\242\233\200[\r\345\353G \325ac"
- #"\4r\e\321\22\345\361\300>\206\362\355\216\267\221ghsp|\30\"(\276\27"
- #"\254\31\177\353\322L/$~B\350\2e\31\360I\322\343\36^\35\205\2302c"
- #"\355\203lb\4\331\200\271\276\213s\353A\35\25,,{V\355\250\327\3245\2"
- #"Y\17\274\26\244{\22m&\324\315\365J\372Ke\3172K;"
- #"\362\354,\17\216\207\0w\20\305\273\361\324\204\27\220\264\263\e\362F"
-) 500
-(
- #"\27v\232s\210\307T\260\311\247\210\\\262<\23|t\323\233( \3176dG"
- #"\272\16\324\330\r:\202\203\251\302\247k"
- #"e\324\213D+\344Fa\306\377\324\323\210\207\2\220\rx\2376\220g%\\L"
- #"\344\242\244'p;\362ly\352\302\v\210\v\34\v|_9\276\202\370\n\22["
- #"\f\0>\241\34\233\32\205\230\230\a\331"
- #"NI\353\360&\241^s\273\262g\325\207\215\371\17\265\r\234I:vq\377\201"
- #"\2703\307\37\0\307X*K\306\360\2\342\n\337G\\\211\200t>_B\357$"
- #"r\245\250&\212[\211|U\351\304\324"
- #"<\210\353\230\236\377\330\b\374\237r\234"
- #"\6\363\325\2\244\34\241`\237\204\4I"
- #"\363$\202\27\20W\350\201<\234\241\371f\35p\6\346\203;\25s4Q4\306"
- #"\225\304\203\26\351\302\324J,\3271="
- #"\2\271\eX\23\244\367\301\376\376\245\265"
- #"\3103\22\232 G!\261\313}\257\227"
- #"\30\376V\272D3\362\226\37N\374\275"
- #"\204\375\rZ9d\235\177\310\17\r\344\251\276M?f ?WQ\357\215\211\21"
- #"\210Z\367\2371\220_w\234L4G\326\vyv\\\211\202\350\b\231w\347\336"
- #"\35.\270L\356\304\325\300\277)\307o"
- #"RwP\233\272x\223\370\204\344Z\304"
- #"\333\260.6\22M\336\347\220\0256=\313\237^3\352\256\344\n\232HUm\251"
- #"\312kW\315Vd\363^xm\235\356\342A\302\23\fP\216\337 \212bi\203"
- #"\3426y5\360UKe\251\21\27\372&?\2q\221\257\1\273+\307\267\331*"
- #"H\300\256\304\37\326\307\313\235\230\20}"
- #"\210:\303\2\22\207\332\23g%\221x"
- #"\250\367K\27j\20\246\335\260+\36\20\177&v\3079\361p\5/ \256\242\232"
- #"\vn\264U\b\205\217+i\23f%u\363\235\251]\360.\241\336\23"
- #"\335\356\342!^\347\247\31\310\257;nT\322\227X*C\3\340\5\4"
-) 500
-(
- #":\202\330\347\363y\333E\251\2343\211\336*\27\0\317Y,\vH\34\351\20\23"
- #"\2\322\242\244-\nH>\237\357h?"
- #"\220\242\266\244\336\223\226\262g%\207Z"
- #"\347G\226=\313\f\317\22yj\336\36\231Hw\204\342\366\224v\274\200@G\20"
- #"\373\266\266\266\356ON\v\3\220I\302"
- #"\220[l\25$@\365\364\372\17\364\273"
- #"\240\37\254\244Wh\312\243\202y\212\266"
- #"\266\266\216\366\3\25\266%\325\375\275\256"
- #"~B\275'\203\313\236\225\f[\20\227"
- #" !\0235\347\327\35\352\263p2\361"
- #"\271\231\224S\334\236\322\216\27\20\227Q"
- #"W\272\334B\24:\324\6\303\211\346e"
- #"\326\23\355F\326\205\211\21\210\272\301o"
- #"C\202\327U\257\245k\23\241\311\21\310"
- #"sD;\353\367@\257o\257\356\330J\334/[\32V\203e\30/ .s\""
- #"\321\333\345\333\300#\26\313\2f\315X"
- #"&\4d\240\222\326% \203\312\236U\37&\5$M\346\253\277\239\252\34B"
- #":c\260g\b/ .\323\2048\210\v\261m\3062) \252YF\227\200l"
- #"\257\244u\t\310\366e\317\252\217F\25"
- #"\20\365\31\370\4\351\212C\222A\274\200"
- #"\270\216:D\277\3\275q\302\273C\355<\36\325\234\227\272!\314\vHgL\n"
- #"\210Z\3276\5d#\342\275:\304\233"
- #"\257\264\343\5\304u\216\4F\4\351\265"
- #"\300\275\26\313r\0\221\331\347-d3"
- #"\231.L\230\260\324\316=I\267\361\352"
- #"\265\\\27\220\327\211LF\3\201\3755"
- #"\346\325\35\263\210\\\373\214\300\376h\250"
- #"\1\360\2\342:9\342.\263m\232\261z\20\5\231\2\275f,\23\253\260\\\36"
- #"\201\230Z\205\245\326\361x\354\366(j"
- #"\333?\a\37\337\334\0^@\262\200\32"
- #"\237\374\317\350\353P+\301\324<\210\211\21H_%\255K@\372\226=\253>"
- #"L\215@\3222\377\261\2\270O9\376l\271\23=I\342\5$\v\354\v\34\34"
-) 500
-(
- #"\244\333\210\333\201M\243v\"\177,{V\375\2306a\2716\0021% j\35"
- #"\333\24\220;\210\302\350\36Bz\302\350f\34/ Y\341SJz\272\265R\300"
- #"\a\224\3642\364m(T\3152\272\342\304\273<\a\242\336\23]&\254-D!"
- #"bAb\214\333Bm\363\237*{\226'a\274\200d\5u\36d1\366\334{"
- #"\364'\362\304[ \336\301$\311 \"\e\367F\364\254>su\4\262\221(\260"
- #"W\216\370~\226$YF\264C_\255w\323\254\0^U\216\323\22F\267\1\360"
- #"\2\222\25v%\n\354\4vWc\251\345\3205:\350I\374\315\372\205r'\326"
- #"\201\253s j \251\301\350qu\17"
- #"\361\272\335[S\36\225\240\266\365\275\261"
- #"\e\332\240\301\360\2\222%.P\322\367"
- #"X+E\334\225\305R\215\371\250>\227tD&tu\4\242\336\213\243\312\236U"
- #"?j\335\332t_\242\266\365\v\312\236\345\321\200\27\220,\241F'|\200hR"
- #"\3214\303\224\264\256\21\b\350\217\215\256"
- #"\306\320\320% :\342t\230\212\205\256"
- #"\326\355\260\262g\351e3p\277r\374\361r'zt\340\5$K\354MdJ"
- #"X\v\314\266T\16S#\20\335\261\321\263`\302\322\31\v]\255[[\0022\233"
- #"(\346\371h$\356\271\307\30^@\262\206:\n\231e\251\f6F :\366\234"
- #"\270j\3022\25\v]\255[[&,\265\215\237R\366,\217&\274\200d\r\365"
- #"!\2625\17\242\n\210\316\21\310h%"
- #"\275\222\344\335\331\273( [\211\207\370"
- #"\3259\271\235\206\21\210\332\306\275\200\30"
- #"\307\vH\326\230H\264:i1zL;\335\241\276\215\352\34\201\364\1z\a\351"
- #"\2\260&\341\353\273\270\17d5\321\322"
- #"\332\336\350\215\205n{\0042\237h\371\356`\274\357+\vx\1\311"
- #"\32=\201\343\225c\e\243\20\2653yEs^;)\351Ue\317"
-) 500
-(
- #"\252\r\27\347@\324{\240{T\240\326"
- #"\255\r\1Q\333\366\t\350[\256\354)"
- #"\213\27\220,\242\16\345\257\267\220\377\16"
- #"D\233\374\336G\257\213y\325MG\322\2\342\242\tK\275\a:]\230l$\232"
- #"\274\316\1C5\346U\16\265m{\363\225\25\274\200@G\20\373|>o\273("
- #"\311\240\216@^\1\226\30\316\177;\364"
- #"o\362\vQ\343\202X\20\220|>\337\321~\240\302\266dJ@\232\313\236U?"
- #"\305\233\25u\205\346-\307\233\300\"\345\370\370r'\272Eq{J;^@\240"
- #"#\210}[\233\255\215\23\t3\30\30\251\34\333p\361\256{\223_\210)\1)"
- #"3\a\322\326\326\326\321~\240\302\266\244"
- #"s\16\304\206\200\350\334\254X\16\265M"
- #"\217B\177\320,C\24\267\247\264\343\5"
- #"$\253\\\242\244o\264\220\277\356M~!:\5\304\3659\20\235\2bj\263b"
- #"9nP\322\227X\310\337\3x\1\311"
- #".g\0\375\202\364\213\300S\206\363\327"
- #"\275\311/\304\262\t\253&\262f\302\322"
- #"\271Y\261\24\377\4^\16\322\375\200\323"
- #"\r\347\357\351\300\vHV\351\v\234\246"
- #"\34\337l8\377,\214@\324\316=\311%\302k\225\264\253\2bs\4\242\266\345"
- #"\323\321\27\224\313\323-^@2@\331"
- #"\t\333\317)\351\333\200v\23\245\t\330"
- #"\207hY\345\253$\273\217BE\247\200\250{(\222\214k\242^+\351}\32&"
- #"\4d=\360Z\220\356I|C\247n\332\201\333\225\343\317\225>-3\vbR"
- #"\216\27\220\f\320\336^F\31\216\5v\16\322\357\2\1771T \220Ml\341D"
- #"\3766\340%M\371\350\24\20\365\351HrNS\275V\322\213mL\b\310\213H"
- #"\235\202L`\367\356\342\334\244y\0i\313 n\333\217)}Z\331g\302\223("
- #"^@\262L\17\342\321\331L\233\261L\314\203\250\235"
- #"\244\255 ZiB\275\a\272\4\304\346\374\207\332\206"
-) 500
-(
- #"?\205\357\301,\343o\177\205$9$6:\274V\207\370\177B\\]tCb"
- #"\345\3230\17\322\251lu\216@\322l"
- #"\352\250\251l]\214@\22\373\255\32\346?**\333j`\246r\\\306|\2254"
- #"I\267\2214\267\271j\361\2R!I"
- #"\16\211\215\16\257\17\4\306\6\351M\300"
- #"\35\335\377Ib\345S\337N\23\22\220Ne\253S@\322l\352\250\251l]\b"
- #"Hb\277U\303\b\244\242\262\335A\24\252w,Q\273\326L\322m$\315m\256"
- #"Z\274\2004\2j\214\350I\6\363U"
- #"\337N\357\323\224\207\332I\276\241)\17"
- #"\227xKI\3532a=\244\244M\256"
- #"\300\372\256\222>\307`\276\236\262\344\n"
- #"\256ly\324D\257^\275\262\263\3\275\f\273\262+o(\275\353@\6\2626\266"
- #"\226T\17}\350\303\6e\323\203\216|"
- #"{\322\223-\312\262\246\244\363((3\336I][\3075K]\273\205\26V%"
- #"\276\262 \236\307N\354\304r\226'\236"
- #"Gw\371\356\313\276\274\310\213F\362\265"
- #"E>\237g\363\346\315\266\213\321%\r/ \r\303\376\210\351a\4q\37B\272"
- #"\31\215l\372\32\211>\317\274\373\0\v"
- #"\321\363\333t\\\333\265\362\26\263/\262"
- #"\252\316t[\n\177\333^\350[\325\347"
- #"\251\n/ \36\217\307\343\251\t?\a"
- #"\342\361x<\236\232\360\2\342\361x<"
- #"\236\232\360\2\342\361x<\236\232\360\2"
- #"\342\361x<\236\232\360\2\222QZ[[\331o?\e\201\32\32\217%K\2260"
- #"y\362d\6\16\34\310\344\311\223y\353"
- #"\255\267\376\177{\367\357\322\270\e\307\1"
- #"\374\35=P\261P\261\340\257\202\225f"
- #"s\321\305\202\251\5\247j\21A\\\\"
- #"\354\324\271\202\270\350P\a\5\241ZD"
- #"\20\5u\263\377\200\"\350\240\202\244\342"
- #"\324\202.\336`\25\v.\322\305\301\202\16\355\347;}\313"
- #"\351\365\356$gR\257}\277\240Cb\236\364\t<\341\335"
-) 500
-(
- #"\344\363\230\374\271\21\231\206c\337:\f"
- #"\220\n\224H$011\201\357\337\315|\227,\375\257\267\267\27\0pzz\n"
- #"\0\350\351\351)gw\252\32\307\276\265"
- #"8\215\267\2i\232\206\345\345e\370|"
- #"\276\177\346\325\230\377\252\307\307G\250\252"
- #"\212\347\347\347\342:\233\315\206\273\273;"
- #"\264\264\264\224\261g\325\211c\337Z\f\220\n\246(\nO\"\223MOO\243\241"
- #"\241\1KKK\305usssx}}\305\352\352j\31{V\3358\366\255\301"
- #"\0\251`<\211\314W\352j\243\324U\tY\213c\337\32\254\201\374#TU\205"
- #"\242(%?\252\252\226\273{DT\205x\5R\301\370+\314|\245nW\225\272"
- #"\255E\326\342\330\267\6\3\244\202\361$"
- #"2\37\213\350_\23\307\2765x\v\213"
- #"\350/\264\266\266\242\276\276\36\341p\30"
- #"\311d\22\341p\30\365\365\365\f\17\252"
- #"\n\f\220\n\306\177\246\262\306\345\345%\0`dd\4\0puuU\316\356\20"
- #"8\366\255\302[XDDd\b\257@\210\210\310\20\6\b\21\21\31\302\0!\""
- #"\"C\30 T\365\274^/no\337\276\334;\235Nc``\300\264\357ln"
- #"n\206\333\3556m\377DV`\200P\325\v\6\203\230\234\234D>\237\a\0\344"
- #"\363y\4\203A\4\203A\323\276\263\255"
- #"\255\r\273\273\273\246\355\237\310\n\234\205"
- #"EUOD0<<\f\277\337\217\231\231\31\304b1\234\234\234\340\350\350\b\212"
- #"\242\224\273{D_\26\257@\250\352)\212\202\355\355mD\243Q\34\34\34`y"
- #"y\31[[[\37\n\217D\"\1\207\303Q|.Ymmm\361o\36\217\a"
- #"\251T\252\270\234J\245\340\361x\0\340"
- #"\315\363\313\336\357\303\341p\340\374\374\374"
- #"\23\217\220\310$BD\"\"\262\261\261!6\233M677?\334\246"
- #"\251\251I\22\211Dq\371\307S\352\360\360P\234N\247d2\31\311d"
-) 469
-(
- #"2\322\321\321!\207\207\207?m\347r"
- #"\271dmm\255\270\254\353\272\364\367\367"
- #"\377\315\241\20Y\342[\271\3\214\350\253"
- #"\310\345r\250\253\253C.\227\373p\233"
- #"\247\247\247_\26\333\3\201\0\302\3410FGG!\"\230\232\232B \20\370i"
- #"\273x<\216\361\361q\244\323i\314\316"
- #"\316\302\347\363\341\342\342\302\360q\20Y"
- #"\2055\20\"\0\327\327\327\30\34\34\304"
- #"\336\336\36\306\306\306pvv\366\241\307"
- #"a\274\177h\337\373\345B\241\0\267\333"
- #"\rEQp{{\213\232\232\232\222\333=<< \32\215bgg\a\215\215\215"
- #"\330\337\3377u\26\30\321g`\r\204\252^>\237G(\24\302\342\342\"4M"
- #"\303\302\302\2B\241PqV\326\357455\375\266^\21\211D\340r\271\320\331"
- #"\331\211\371\371\371\222\333h\232\206\373\373"
- #"{\254\257\257\343\345\345\5\221H\304\324"
- #"\31`D\237\246\234\367\317\210\276\202\225"
- #"\225\25\31\32\32\222B\241 \"\"\205BA\374~\277\304b\261?\266\325u]"
- #"\332\333\333%\221H\210\256\353oj\e\361x\\TU\225l6+\331lVT"
- #"U\225x<.\"ok \251TJ\234N\247\234\234\234\310\361\361\2618\235N"
- #"I\245R\237|\224D\237\217\1BUO\3234I\247\323o\326\335\334\334\210\327"
- #"\353\375P{]\327\305n\267\213\335n"
- #"\227\256\256\256\342\372\276\276>I&\223"
- #"\305\345d2)}}}\"\"\322\335\335\375\313}\374X\224'\372\312X\3!"
- #"\"\"CX\3!\"\"C\30 DDd\b\3\204\210\210\fa\200\20\21\221"
- #"!\f\20\"\"2\204\1BDD\2060@\210\210\310\20\6\b\21\21\31\302\0"
- #"!\"\"C\376\3C\346\267\201\23\343\346\204\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 7 #"contour"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"trig"
-0 0 24 3 1 #" "
-0 0 23 3 9 #"#:samples"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"10"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:width"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"3"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:color"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 7 #"magenta"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:x-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-1.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"1.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-1.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"1.5"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:title"
-0 0 24 3 1 #" "
-0 0 19 3 38 #"\"Contours of F(x,y) = sin(x) * sin(y)\""
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 51 #";; Vector field + contours + contour intervals test"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2         271 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0         130 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0 \0IDATx\234\354\235wxTU\372"
- #"\307?wR&\275\367\4\322 \4\210\t\35\fE\260\320\4\224\252(\b*\226"
- #"\205\340\202e\301\265\375\334u]T\24"
- #"WD\20\205\25X\24\301\206@(\242\224 \2J'\324\24\2I\310\244W\222"
- #"I2\271\277?\206\304\224)wBf\22\310\375<\17\17\231\231\367=\347\334v"
- #"\336{\332\367\b\242(\212\310\310\310\310"
- #"\310\310\230\210\242\265\v ####sk\"\a\20\31\31\31\31\231f!\a"
- #"\20\31\31\31\31\231f!\a\20\31\31\31\31\231f!\a\20\31\31\31\31\231f"
- #"!\a\20\31\31\31\31\231f!\a\20\31\31\31\31\231f!\a\20\31\31\31\31"
- #"\231f!\a\20\31\31\31\31\231f!\a\20\31\31\31\31\231f!\a\20\31\31"
- #"\31\31\231f!\a\20\31\31\31\31\231f!\a\20\31\31\31\31\231f!\a\20"
- #"\31\31\31\31\231f!\a\20\31\31\31\31\231f!\a\20\31\31\31\31\231f!"
- #"\a\20\31\31\31\31\231f!\a\20\31\31\231f\341\341\341Axxx\213\246\31"
- #"\36\36\216\207\207G\213\246iI\244\236"
- #"\223\360\360p\\\\\\\310\316\316\266@"
- #"\251n\36\225J\205\213\213K\223ck\363\1\244~\201CCC[\354\3462\345"
- #"\306OHH\300\323\323\263\316\307\303\303"
- #"\203\260\260\260\233\316\247\245\37\276\346\226"
- #"\243%\354[\312\367V\341V=\306\204\204\4bcc\215\332\331\332\332\"\bB"
- #"\203\177\215\217\271\240\240\200\344\344\344\26-_rr2\5\5\5-\232fsi"
- #"N}#\365\234$''3g\316\34\26-Z\324\334\342\335\24\246\324a\0\213"
- #"\26-\"..\256\351\261\211m\234\372E\334"
- #"\277\177\277\330\265k\327\26O\327\30nnn"
-) 500
-(
- #"bBBB\335\347\256]\2736\370\334\334|\232{\372\303\302\302L\36615\257"
- #"\233\2715\314q[5\347\230\315\311-"
- #"\360\3504\341\247\237~\22\3\3\3\305"
- #"\243G\217\32\2655v|\373\367\357\27"
- #"\335\334\334Z\252h\rh\374\274\265\26"
- #"\246\3267\246\236\223\254\254,\321\327\327"
- #"\267U\216\325\224:l\377\376\375\242\257"
- #"\257\257\250R\251\232\374\326\346\237\2s"
- #"=\250\246\244k\256\312\264\271\3516\307"
- #"\357V\17 m\255\302nk\345\221\202)\25\263\241\3433w\305g\316\340d."
- #"\232{Nn\205c5t\337\334\364S\340\356\356.\2\" zxx\210\1\1"
- #"\1u\277\205\205\205\325\375^\373\6\271"
- #"\177\377~\321\303\303C\257O\343\337\e"
- #"\337\310\365\337D\353\333zxx48\310\340\340`\321\331\331\271.\rww\367"
- #"\6i\324/\223!jm\353\3337\366k|\16\352\227\243q\v\312\320\261IE"
- #"\237_\375r4>f\240\301\371pvvn\360F\321\370\\\32*\267\241kf"
- #"\314\267~\231Z\342\230\ra\350\3760"
- #"V.}\367\217\256\373\301X^\272\356"
- #"\263\372\337\5\4\4\324\371\326~o\350ZJ9\336\306\345\320Wn}\30:\337"
- #"\363\346\315\23_~\371\345&\337\307\306"
- #"\306\212III\242(\212\342\245K\227"
- #"\304\201\3\a\352\364\217\216\216\26\213\213"
- #"\213\353>gee\211\275{\367\226\234"
- #"\177Kb\350\234\211b\303\353d\250N"
- #"\271\231sb\312\261\232\322\0227t\17\325O',,\254\301yh\\7\350*"
- #"_\3555\274\251\253\3248z\356\337\277"
- #"\277Af@\223\350\3328\2325\366i"
- #"\374{\343\302\327~\336\277\177\277\350\357"
- #"\357_g\333\270,@\203\v\252/\35)\30\362\325u\16\32\227C\352\2615\267"
- #"<\372\276\357\326\255[\203\337\352\237\217\205\v\27\212\363"
- #"\347\317\257+s\343si\250\334\365\1777\325\267\271\335\23"
-) 500
-(
- #"\246\236+]\345\272\363\316;%\227\313"
- #"\324\373\247\276\177\343\274u\225\275\361s"
- #"\322\370\234\30\272\226\372\320u\235\364\335"
- #"\213\306\250_\3614\256\264\34\35\35uvg,_\276\\\0340`\200\250V\253"
- #"\305\1\3\6\210+V\254\320\231\366\304"
- #"\211\23\305u\353\326\325}\326U\371J"
- #"-k\375\300\330\370\237\224\312688X\374\360\303\17\353>7\276O\32_'"
- #"}\367\304\315\234\23)\307\332\275{w1..N\4\304\270\2708\261{\367\356"
- #"F}\214\325\a\365\377\256\337\265Y\277n\320W\276\332kxS\1DWe`"
- #"\352\203\241\313\307\220}\355gWW\327"
- #"&7L\307\216\35\e\330\31\212\242-\25@\244\224\343f\313 \365!qww"
- #"\27\225J\245\30\27\27'\246\247\2477"
- #"\311\253\376\371\310\312\312\22\35\35\35E"
- #"Q\224v\35\eS\373\235\24\337\306\377\242\243\243[\354\230\365a,P5>&"
- #"]\225\255)\367\217\241\364L\275\347E"
- #"\321\360\265\324Gs\3621%-c\277"
- #"\325\324\324\210\303\207\17\27\307\214\31#"
- #"\216\0301B\254\251\251\321i\267a\303\6q\334\270q\242(\212bzz\272\350"
- #"\355\355-\346\346\346J\316\277%\331\277"
- #"\177\277\350\352\352j\360\271\251\377\267\276"
- #"{\342f\316\211\224c=|\370\260\30"
- #"\35\35]\367\374\34>|\330\250\217\261"
- #"\372\240\376\337\365\237\225\372u\203\276\362"
- #"\325^C\263\317\302\0324h\220Y\322\25\4\201\204\204\4Dm7\34\242(\222"
- #"\226\226\326\300\306\307\307\307,y\233Z"
- #"\216\233%99\271A\372@\335\337\365"
- #"gE\344\347\347\223\224\224\4\350\236\16"
- #"Y\377|\370\372\372RVV\326\242\345"
- #"\324G\375\262\213\242\310\311\223'\215\372"
- #"H=fsb\211\373G\37\306\256ek\342\350\350\250s\372\251 \b\274\364"
- #"\322K\304\307\307\363\342\213/\"\b\202"
- #"N\377\261c\307r\340\300\1\212\212\212"
-) 500
-(
- #"X\274x1\263f\315\302\323\323\263Ye\t\17\17o2[L\337\2541]\f"
- #"\36<\230\302\302\302\272s\335\243G\17"
- #"\16\348\240\327^\337=q\263\347\304"
- #"\30\263g\317f\310\220!\0\f\0312\2049s\346\30\3651\345\36\252_OK"
- #"\251\eF\217\36\215J\245\272\2710/"
- #"\245\v\2531\346\354\302\322\327\364\224\362"
- #"\331\20\206|u\235\3}\3450w\27V\3437sc\327\302\320\2714T\356\233"
- #"\351\302j|~\244b\352\271j\211.,C\3717\376l\250\v\313\330=\257\353"
- #"\330\f]K}\264t\27\226>\32wq\324R]]-\16\0300@|\344\221"
- #"G\304\1\3\6\210\325\325\325z\323\230"
- #"8q\242\370\321G\37\351l}\230Z\326\233\341\316;\357lp\316\226,Y\""
- #"\206\204\204\350,\207\241{\340f\316\211"
- #")\307*\245+\263\26\251\365\201\241\272"
- #"\301X\371n\372*\325\336\264\265\17\215"
- #"\261\214\217\36=*\6\6\6\212\273w\357\256\233V\330\270B\256}\370\32?h"
- #"\215\323\254\377\200\230Z\1\334\314\214\24"
- #"}i5\2568t\225\327\320\261IE\237\237\247\247g]sUJ\345a\350\\"
- #"\326\377M\31253\305W\3124R\251\307l\bC\367G\343k\321x\254\316\324"
- #"\373\247~z\215\1773v\376\214\275h"
- #"I\235\251c\354\\\267T\0\3217\343\350\275\367\336\23G\214\30!j4\32q"
- #"\370\360\341\342\342\305\213\353~swwo0\210\273a\303\0061,,L\347\300"
- #"\263%g&\231r\316\f\335\23\3159'\242h\336c\225Z\37\30\253\e\314:"
- #"\v\253\266\17\321\325\325ULHHh"
- #"\220\261\276h\331\330\247\261]\375\337\353"
- #"\277\r\350J\263v\246A\375q\a]"
- #"v\372\362\220\322\237.5\255\332\343"
- #"\221j\333\370\330\244\242\357\274^\275zU\214\213\213"
- #"\23\225Je\223\262\350\3621t.\215\35\343\315\3706"
-) 500
-(
- #"\aS\336\274\364\225\2531\246\\7)"
- #"\367O\355wR\362\252\237\236\256c\253"
- #"\265\aL:o\246\34\223!\214\331\352\252\370\f\3158\362\360\360h`_\\\\"
- #",*\24\n\235\3\317\226^\a\"\365\234I\271'L9'\346\236\16-\265>"
- #"0V7\30Z\a\"\210\342\215\16\346\26B\20\4Z8I\31\31\2316\210)"
- #"\317zll,\357\276\373n]_{BB\2\343\306\215\323\271\352\374V\256C"
- #"L)\373\374\371\363\261\267\267\347\355\267"
- #"\3376s\251n\236\227_~\31\265Z\315\a\37|P\367]xx87\35@"
- #"\302\303\303III\251\373\354\356\356N~~\376\315$)##s\v\340\341\341"
- #"\201\273\273\273\311\223\32\302\303\303\311\313"
- #"\313c\353\326\255M&\331\204\207\207SPPp\313\326!R\317Ixx89"
- #"99$%%\265\352d\r\251\250T*:w\356\214\267\2677\0)))\270"
- #"\273\273\337|\0\221\221\221\221\221i\237"
- #"\264y1E\31\31\31\31\231\266\211\34@ddddd\232\205\34@ddd"
- #"dd\232\205\34@ddddd\232\205\34@ddddd\232\205\34@d"
- #"dddd\232\205\34@ddddd\232\205\34@ddddd\232\205u"
- #"k\27\240\265\361\24\372\23\303\373x!Mv~'Q\3700\214k\3043\232?"
- #"W\233\212\210\b\350\226j\376\211\2368"
- #"\22B\t\27\350\315J\274\30d\320~"
- #"7}\21\260\302\235\336\270\323\233\213,\256\363\323g/R\215\v]q!\n\27"
- #"\272r\206W\232\370\210B%?\bn\3708D\241\326\24\343\252\f\306M\31\202"
- #"\2532\0047\273\20~J}\236\256^\223\210\r\\\210\263m`\203<V\237\352"
- #"\217ZS\324\304g\367\345\27q\260\361ad\350R:\270\fB"
- #"\273e\207\300\352S\375\251\250\316\307\3316\20W\273\216$\25ma"
-) 500
-(
- #"\362\340\267\360t\351\310\27?\375\5g{o\36\273g)\21A\332\362\275\360Y"
- #"8\331\205)\30\303\306\312\216\325\317\227"
- #"\233\344ckc\307\201\215\345\214\1776"
- #"\234\f\225q{\255\217\22o\217@\311\366vJ%\1\1\1\244\244\246J\262\a"
- #"P\332\330\20\350\341A\212J%\315\336\332\232@OO\311\366\266VV\499"
- #"\221RT$-}++*\236{\216\360\325\253\215\372\330\n\2\352\276}\1\b"
- #"?y\222\24\265Z\262\275!\302O\236$9&F\347o\16G\216\220\386"
- #"\372^{\307\335~(\200\314k\327\360"
- #"\363\363k\355\242\350\245\335\257D\277["
- #"H\340\24\v\270\233\203\222\354\313I\347<\357p\215\255\214FZeQM\t\231"
- #"l\3418q\330\340\306h\fWJ5TQL\"\5\34\245\200\243\\a=\266"
- #"x\352\365\23\321PF\nE\234\241\230"
- #"s\24s\206L\266\242\304\253\201\317u"
- #"\345i\216XM\345\231\36\247)\255\314"
- #"\242P\235J\221:\215\302\212\313\24\251"
- #"/\223\230\3735jM\21\356va\314\351\325X\212A\324\351sL\265\22;k"
- #"w\252k\312Y8\240\274\201GYU6%\225\351\224\326\\fc\342C\334\337"
- #"\367E\362K3\3705q\35\366JW\2525jV\317/G\n\323\337\23ps"
- #"\364g\356\270\215uA\247\361\357G\276ox+\367\e/\340\345\356\317\333/m"
- #"\244GW\343/\b\375\306\v\364\216\32\n\202\300ksV\21\340\eZ\367\275X"
- #"\256\273\234\202\275=\376~~l\\\277"
- #"\236A\261\261F\363\20\354\355\31:d\b{\367\357'\345\223O\b5\"c\21"
- #":{6=BB\230|\347\235\214\355\323\ag{{\343yL\232D\\\217\36"
- #",\354\333\227@''\303\351\257ZE\17oo&GD06,"
- #"\fg[[\243\366W\213\213\271\24\23C\250Ri\264,\241'O"
-) 500
-(
- #"2\306\315\215\205\376\376\4\32I\e\240"
- #"\373\351\323$\336q\207\356\337~\377\235"
- #"\257E\221(\243\251\334F\264\361\352\271"
- #"\335\a\220)\267\343\253\213\36r\0347\220m\377=\23\"\276n\2614?>\32"
- #"Jg\2171:[-\265\24(\216\20\2374\207\177L\377\35\200\371+C\351\31"
- #">\206\261\375\27\342\356\244\333\2471\v"
- #"Vw\343\311\341+u\6\17\320\35@"
- #"\246\314\355\306\337g\257\224\24<\0&"
- #"\316\356\314\324\261\363\2318\362/\r6\376\0314\305\26uq\261N\237n={"
- #"\262r\3312I\301\3\240sT\24\363"
- #"\347\316e\376\213/\242\336\260A\222\217"
- #"\251\b\223&!\316\237o\226\264\1\372"
- #"|\3769\313;v\244\257c\343\266\200"
- #"y\231r\354\30\23\253\253y\310\242\271\2662m\274zn\367]X\355\211b\305"
- #"Y\274\354\273\265h\232q\275\215\267\302"
- #"\256\225\375A\250o\357\272\317K\236\226"
- #"\336\315S\313;O\2345\331g\343R"
- #"\323|\276\375\344\222\316\357+\253\252\364"
- #"\372\234=~\334\244<.\2359\3\300"
- #"\234y\363L\362kK\364\366\360\340\217"
- #"\2622\213\a\220n\266\266\234\255\256\266"
- #"h\2362\206\221\a\321\333\21\305$\342"
- #"\355\320\335\342\371^+=J\210_o\343\206m\24[\e\233\226O\323\372\326}"
- #"w\353\355\355\315\321\353\327-\236owGG\22\233\271%\254\214y\220\3H;"
- #"\242\240\352l\253\4\220\364\202\243\rZ"
- #" \267\32\206Z \315N\363\26~\223"
- #"\356\355\357\317Q#{f\233\203\356\216"
- #"\216\230\336\16\2251'r\0iG\24\252S\360\260\353d\361|\257\25\234'\310"
- #"\313\274\201\313\332\332\370\0m{\301V"
- #"a\336\307:\312\337\237sz&\25\230"
- #"\223N\316\316\244\264\3611\201\366\206\34"
- #"@\332\t\265-\177\205\320\362\3351F\21E\254\255\214\317"
- #"\330\271\0314\232*\252\252+[<\335\202b\25vvv\177"
-) 500
-(
- #"\236\300\226@\20\260\263\265%[\342\364"
- #"ZS\251\252\251\241R\2431K\332\0J{\373V\3311\320\326\316\169|\264"
- #"-\344\0\322N\20\354J\20\204V\272"
- #"\334\26\350\266\26E\21\e3\264B\376"
- #"\367\343\"\346\315\231\333\262\263aD\221"
- #"y\17<\300\242\357\277o\2714\353'\217v\r\210\3310s\vG/\202\200\2"
- #"(i\235\334et \a\220vB\226\365\17tv\37\323*yWkZ\276e"
- #"`)6nY\301_\347>\327\342\351\316\2336\215\345;w\266x\272\226\242\262"
- #"\225\272\222\356\267\265es\253\344,\243"
- #"\v9\200\264\23\3224\233\350\3465\271"
- #"\265\213q\313\241\256\254\300\317\307\253\305"
- #"\323\365\r\16\246\302\f\203\363\267;\223"
- #"\235\234\330$\317\304j3\310\1\244\235p\265|\27\341n\243Z%ok\253["
- #"w\200\333\306\306\306<]p..f\231\312\3339.\16@\362X\201\377\312\225"
- #"\314\335\263\207\214\322R\223\354m$V"
- #"\342\376\307\21737-\215\214J\343\255"
- #"\320\3503g\214\332\216vsc\347\215"
- #"\326\217?0\27\3100\222n\t\20\214\3662\6K(\363~\300\3\b\223`\233"
- #"n\202-@\350\r\373\333\205[w2\272\214IhD5\266V\316\255\222\267%"
- #"\272\260Zb\26\226\256\225\353UFZ\t\246\256D\367\17\ta\322\204\t,|"
- #"\366YISy\3\236z\212\376\235;K\2262I\312\312B!\b\334\363\3157"
- #"\254\272\357>B]]\311\253\250 \253"
- #"\254\214\214\322\322?\377\277~\275\356\363"
- #"\307'N\20\237\232J\362\23O\324\245"
- #"\223}\375:\351\245\245d\224\226r\245"
- #"\244\204\364\222\222\6\366\215\311\256\252\""
- #"\275\262\222\214\252*\256\250\325u\177g"
- #"UU\361\261J\305\216\242\".EG\3\332\340\226UUE\252ZM\232"
- #"Z\315e\265\232\313\225\225d\337\260\215/,l\242\207U\3\\U\253I"
-) 500
-(
- #"\22E\324\300\213@\26\3601\260\3h\274\4\264\4\330\2l\2\366\1\276h\3"
- #"\310\24=\347-\17X\v|v\343\263"
- #"o\275\277u\221\16\274\3\254\3\274\201"
- #"\377\32\260\255%\1P\3mW\331\312"
- #"t\332\275\224\211\233\20\303\335\34\300\32"
- #"i\225\353/\f\244\37kq\"\\r\36\277\20K4\357J\26l\334E\fn"
- #"D\23\306\323x1\330\250}\255Xc\20\223\t`l\223c\251\261*a\263\350"
- #"S\247U\365\371\311\3368\332x\23\356"
- #">\212Nn\243\360\260\2170\232\307\252S}\260\265r&\330e(!\256\303\b"
- #"t\352\217\225B\311\212\343\335\270?|"
- #"\345\r!\305\206\366\326\202\35>N\321"
- #"\234\310\376\234%O_\306\335)\0\320-K\362\177\377\e@\321u\25\36N\201"
- #"\270:\372\341\356\24\210\233\243\37\356\316"
- #"\332\317\237\306\317\240_\227I\r\344O"
- #"\352\373\\\312\374\215)\243\343\360t\367"
- #"\303\307#\20GGW\336^\366\24\367"
- #"\rz\210\31\23\26\342\355\31\310\23\v\6\220W\250\302\307#\20Ow?\274o"
- #"\374_\373y\356\233#pvt\343\375W\266\320\243\353 \236X0\200\304KG"
- #"\350\327\247\17>>>\370x{\343\357"
- #"\347\207\217\2677~~~\370\371\3722"
- #"\344\336{\361\364\360\340\207M\233\2301"
- #"k\226d1\305\260\320P\322\257^%\310\4q\304\210\200\0\2525\32\311\366]"
- #"=<\360\264\267'\275\244\204@''\374\34\35\265\377;8\324}\36\361\335w"
- #"\270)\225ly\340\1\6\5j\317\353"
- #"\340\215\e\311*+#\320\311\211\216\316"
- #"\316\49;\327\375=n\363f\334\224J\256WUq5&\6\37\e\e\6\237"
- #";GVU\25\20166tT*\t\262\265\255\373\373\271\264\264&ZX\203\316"
- #"\236%\267\272\232`\245\222\20\245\222\20[[B\224"
- #"J\274ml\230s\3712\253BC\31\344\334\360\36\36"
-) 500
-(
- #"t\366,\5\32\r\235\225J\266\25\26\262\30\370\20\30\3,\4\32\v\342\f@"
- #"\333B\231\f\214\5\256\3\3\201\203\200"
- #".\365\261~@\27\340i\220\360\304A\37\340N=y\353#\26x\27$\326\2"
- #"7h\343\325s\273\17 \35\204I\4\360 \301L\223d\237\314\n\322X\3030"
- #"\16  m\246K\1\307\370\225q\364c\r>\334c\324\276\222<.\263\226\324"
- #"\e\357@5T\323\227\325z\3P\255Xc:\233\310a\37\336\334\325@\371W"
- #"\345\270\216\34\273\37\231\330e\23\0U5\327I+\332KRA<\311\205;\0"
- #"\350\344>\212\324\302\237u\6\3\200\352"
- #"\232\n2J\17\223V\264\227\264\342\275"
- #"\250\312N\342\353\30CZ\321^l\255\234\230\332u{\3?\215XIV\351q"
- #"\366\\]@\245U\16\352*m\27I\347\200X\16\235\337\200\235\255\23/M\334"
- #"\336 \210\224\226\347QT\226E~i\6EeY\24\224dPX\226EAi"
- #"\6\277_\374\26\0\37\267p\336\177*"
- #"\251\201O\241:\225\327\376\e\313\253\263"
- #"?';?\203\274\202,~\371\355\er\3623\1\350\340\337\251N\246\244\250$"
- #"\217\274\202,rn\330\325\332\347\344g\360\313o\332<\2|C\371a\205V\204"
- #"\262\337x\201s'N\220\223\233\313\265\254,T*\25\33199\\\313\312\";"
- #"'\207-\333\266\1\20\32\22B\312\271"
- #"sF\257m}\361\305\301\367\334\203\370"
- #"\3157\206\355'Mbh\367\356\b\202"
- #"\300\252\331\263%\211/^\311\311a\325"
- #"\360\341L\354\324\311\2508b\2675k"
- #"Xy\357\275u\301\303\30\265\366\333\16\36D]]\315\a\35;J\362kI&"
- #"\35?\316\203UU\22\237\330[\2346^=\267\373\0\342$\204RE\21\17\220"
- #"/\311^\244\206}\f\243\230\263\214#Gr>"
- #"\271$\220\300h\24\330H\316\v\340\20S\271\312"
-) 500
-(
- #"\6\34\t5\252\342\v\177\6\223\303<"
- #"\212#!\214&\225\243N\343\350\0310"
- #"\215\256^\272\e\360\371\345\27I*\334"
- #"\316\256\324y\270)C$\351[\325\6\224ug\206\2\2nv!\304\365jZ"
- #"\276E\207\354\371\360/i\270:\370PP\232Ir\346!\376\263y\"\0\336\256"
- #"\241|\360\2644\271tC\2\214\227r"
- #"w\262\345\310\333|\372\326\276\272\357f"
- #"\276\324\17o\317@\356\215\235\314\340\276"
- #"cq\2607\336\302|\340\231P\6\367"
- #"\31S\327b\1\303B\212\0\241\221\221\214\31=\232\205/\276H`@\200\321<"
- #"\352wy)\235\235\215\n*v\216\213"
- #"c\376\330\261\374e\370\360\6\2\217\206"
- #"\30\362\374\363\274\332\247\17\303\203\245\364"
- #"\3707\17\325\261c\204$$P\336\247"
- #"\217\331\362\320\307\327))|\231\237\317"
- #"\346\232\32\213\347mq\332x\365\334\356"
- #"\307@\372\261\226\337yR\262\275\200\202"
- #">\254\342\0\246M\211\365b0\203\211"
- #"\347(\317\230\344WF2\235\210#\222"
- #"\205\222\354\255q\246#\217p\216\267\350"
- #"\315J\252)#\265t\e\343\335\364\367\322z\330G\320\317>\202cY\237r\177"
- #"\370Ji\371(\354\bv\271\v7eH\235\32\257.\252k*ps\364A\24"
- #"\301\335)\200>\21\23\360r\r\251\v\6R1$\300x\376\352>zw\37\332"
- #"\340\273/\336;\"9\355Z6\177\3324\17c2&\251\347\317\233\224G}\361"
- #"E)c \227>\376\330\244\364\1\206v\356\314\276\364t\263\6\20_77*"
- #"Z\251\2\37\355\347\307#\271\271\24\2n\255R\2\231Z\332}\0\361b0\243"
- #"\270h\222\217\23\235\30\211i\25Gm^#LT\363\271\a\323+B\240.\237"
- #"<\345N:(\aao\355i\324\347\331\236\246+\r\31k\255X)l"
- #"\233\274D5G\215\327\20gR\366\0227\344\255\26M\263\26s\b)\326"
-) 500
-(
- #"\245m&A\305\273\272v\345\365\357\276"
- #"3K\332u\330\331a\333J\323i\235\35\34\30(\b\34\21E\206\267J\td"
- #"j\221\247\361\336\346\24(\367\21\3426"
- #"\264\325\362\327\324\230\177\6\326\245+\307"
- #"\210\212\30`\226\264\315!\244X\227\266\231\4\25\aDFrT\342@{\263\261"
- #"\267o\265\305\204\0C\35\34\330g\334"
- #"L\306\314\310\1\3446G\245\331KG"
- #"\347\273Z\273\30f\245\252Z\215\235\322\241\265\213\321fptuEmF-,"
- #"\0$\354\214hN\356rwg\257\274"
- #"\240\260\325\221\3\310m\214\2255\250\312"
- #"\217\21\350l\236\267scTS\202\215"
- #"\225\235Y\363\20\4\363*\361\336\212]"
- #"X\330\331\231]\221\27[[\354\24\n"
- #"J\314\35\250\3640\300\333\233\243m|"
- #"\200\371f\271\25\216N\16 \2671\266>*\4\4l\24\255\363v~Y\375\3"
- #"=;\231W\177\313\326\314/\302\267b"
- #"\27\26\202\320\262\352\301\272P(\270\337"
- #"\333\233\315\205\205\346\315G\17\21666\b\202@vk\t;Z\200[\241}u"
- #"\373\236}\31\316\325,\242\177\200\371\366"
- #"\3066\232\177\336&\372u1\257\376\226"
- #"\322\1\252\315 \343^\313-\331\2\1\263\312\271\32729\"\202M\5\5f\317"
- #"G\37\363<<X\324j\271\313\200\34@n_\2343H\314[\317\200\200\27Z"
- #"%{\215P\302\251\264mt\357h|"
- #"\341\344\315\2404\363\266\334\267d\v\244\0263\267BFGE\2615?\237\274V"
- #"\330]1\372\314\31r\25\n\326\212\""
- #"\231\22\354\273 ]\v\253\326V\352\22"
- #"\311\366\254\205%\a\220\333\224d\233\305"
- #"\364\364\235%i\372\2569H\255\370\201"
- #"\276\21\23p\2627o\376\25\242\n\245\255\371\306Yn\265\26H\267y\3638p"
- #"\376<v66d\253\325F\355\233+\246\230QZ\212"
- #"\263\235\35\343}}\331\256cc,\215(\22z\362$\302"
-) 500
-(
- #"\221#\4\353\320\316\272Y\373\241\316\316"
- #"|\236\223\203F\20Xl\3046\5\255"
- #"\226\26\350\327\302\252\245\32\255\16\26\300"
- #"CFK\241\325\267\252B\253\243%\205\341@\353N?hY\344\0r\233r\252"
- #"p\5\375\374\347\265Z\376\226\350\276\2\370j\307\"\246\2165_7]K\267@"
- #"\272\365\354\311\201\203\a\265iKxs"
- #"\367\2375\213\271\253V\221\221/M\275"
- #"\340\\z:S\336\177\237I\375\372\261\350\360a\2356U55\234\310\311a\325"
- #"\2313u\342\210C6n4\230nfi)\337%%\325\331\17\335\244\225\305i"
- #"\334\215u\256\274\234\205W\257\322\361\344"
- #"I\3247\26\32N\361\324\377\22a\252}ze%s\323\322X\233\233K\270R"
- #"\311\232\220\20\226\353\261\25\201eh5"
- #"\250f\1\341\300K\6\2161\27\30\211vq\2341[\200\335\300T\264b\215R"
- #"\364\2552\200\357\201S\22lo\25\332"
- #"\375B\302\333\21+\e\320T\251\261\263"
- #"n\235u\272\202\2\316^\335E\334\3"
- #"\353\315\236\327\367\273V\260\345\263\264&"
- #"\337\353R\3265\206.\37C-\220\200"
- #"\320P\372\367\355\313\344\211\23\31;z"
- #"4\316\316\306\345R\316\235?\317\224G"
- #"\37e\343\372\365u-\220\274\222\22\262"
- #"\n\v\311\310\317\327\376\237\227\327\340\363"
- #"\307\333\267\23\177\354\30\311\313\226\31\265"
- #"\a\270\256V\223p\361\"\252\202\2\336"
- #"\318\220\304\274<\216\252T\34\315\316"
- #"\346\250J\305\305\202\2\272\270\273\323\333"
- #"W\373\256\355lk\313\232\21#\352\312"
- #"X\251\321p<'\207C\327\256q\350\3325\16fj;\211b\3\2\bqq"
- #"aLX\30\v\373\366\5`t\367\356\314\370\365WVdg\263&7\227\253\225"
- #"\225L\363\364\344\347\310H\334\255\254\30"
- #"x\366,/\3715\324\237-\324h\330\220\227'\331\36\340"
- #"RE\5\377\314\314$\276\260\2208__\222bb\360\272"
-) 500
-(
- #"q\376\324))T\2\365\347\342\235\a\36G\333\2328\201V\1w\201\201\353r"
- #"\b\255\360b\34\3607\214\17`\357\6f\2?\2\275\214\330\326\262\30m k"
- #"\235>\1\363\320\356\265\260\332\242\32\357"
- #"n\372\322\2118B\230!\311~'Q\3700\214H\26bO \266\201Il\274"
- #"\26\303\202\1e:\355\233\243\306k\212"
- #"\217\255=\274\376\263@D\340@:\5\f\240s@,\341\1\3pw\n\240\250"
- #"L\305[_\r\341\251\221\253$\253\361:(]\371|\347S\f\210|\250\221\32"
- #"o\177\222\257\35\241W\367\273\360\363\356"
- #"\210\217g\20\336\236\201\370yu\344\205"
- #"\267\3075P\326\5LV\343\35\377l8\31*iZ]]##Q\253\325&"
- #"\251\361\246\244\2462(2\222\364\374|\2=<\360ss\373\363\177OO\374\334"
- #"\334\30\361\317\177\342\346\350\310\226\227_"
- #"fPd$\203_}\325\240\3753\237~\312\230\336\275Y8~<AO?M"
- #"l@\0\232\232\32z\373\372j\377\371"
- #"\370\320\335\323\23\353\e\263\227t\211)"
- #"\16\374\372k\4`\200\277?\261\1\1"
- #"\f\360\363#\300\311I\357\261\bK\226"
- #"\360\260\247'3\274\274\270\317\305\5+"
- #"#c/\375\23\23\t\263\263\223l\17"
- #"\320'1\221;\235\234\32\250\372\326\342"
- #"\370\373\357\234R(\b\2577q\240?0\3\370\v\322f3\365\1^@\333\242"
- #"\220Bs\224u\a\3\337\242[\rX/m\274zn\367\1\244-\252\361\226r"
- #"\211\337\230\202#\241\364e56F\24"
- #"\177\312I\347<\357\220\306:\202\231F"
- #"\261\303~\212+\257\362\227\236\27p\264iz\273\352R\343\rw\eIJ\321O"
- #"\214\r_\245S\215\327\24\37[\3272"
- #"\376\261\313\223W\247\356#)\363\20"
- #"I\231\207\270\224\251\355\266q\264s'\257\370\n\232\232"
- #"*\311j\274\277_\374\206\202R\355[\260\257{'\26"
-) 500
-(
- #"\317\372s\367\207\307\227\330\262\372\235C"
- #"\344\344e\220\225{\205\354\334tr\362"
- #"3\210\337\273\16h\250\254\v\315S\343"
- #"\25\313\313u\236\367\320\310HzDG"
- #"\233\324\2\251/\276\30\24\36nT\215\267\333\274y\254|\366Y\6EF\32M"
- #"\2731\312)SP\377\365\257&\373\231"
- #"\212\335\177\376C~\257^8\264\322\224"
- #"\332\25\31\31\254\311\314\344\200(J|"
- #"\"o!\332x\365\334\356\3H\17\341\3\316\263\210qdK\262\27\251a\17\203"
- #"\250 K\222:n-\271$\360\e\17a\213\233$=\254j\3128\316\34\3628"
- #"\214\200 \311\247\234t\216\330<LN\325o\210\3240 \340E\356\ry\317\250"
- #"_~\371E\266$=\301\325\222_q\263\v\325\251\252k\212O\266\325N\366_"
- #"~\233W\36n(6QP\232\311\233\353\357$\257\370\n ]\215\367\215u\375"
- #"pw\16\244_\227\311\364\n\37\213\235"
- #"\355\237\25\365\364\367\4\216|\337\364\26"
- #"\326\245\254k\214\346\250\361\336\fR\324"
- #"xo\6a\322$\304\371\346\237\306="
- #"d\355Z^\365\362b\270\253\253\331\363"
- #"\322\205\b\214<v\214\341\325\325\264\316"
- #"\234C3\322\306\253\347v?\6\222\304RD\244OC\24PP\3015\252h:"
- #"\363\304\20^\f\306\n%\25dI\262"
- #"\267\306\221\276|\301V\202\320p]\222"
- #"\217\r\256\24h\216\343\252\f\246P\235"
- #"\312\271\274\215\222\2\210\207}\4\32\261\222\276\376qzUuM\361I+\332G"
- #"\327\16C\233\370\270;\5\360\3413M"
- #"\307+\214\361\346t\375\202\222\372V\241\353R\3265Fs|\3322f_\215~"
- #"\203\241~~\354+,l\265\0\"\0\313\202\202\350q\3712O\203\304\316h\231"
- #"\226\240\335\a\220\321\230^i4\307\247\271~cH\227l\233m\367\3\235"
- #"\34F31r\223\311\371<\21m\272\352\257>\237\244\354\275L\351j\36"
-) 500
-(
- #"u\334\306\230s\21!\334\332\353@*-$\267~WP\20\257_\271\2\0227"
- #"\2452\a\235\274\275\31y\345\n\233kj\332\307FSm\4y\32\357m\3045"
- #"\233Mt\3636\377\324Yc\244\345\34"
- #"\243\223\177\353\350o\311X\236\1\35:"
- #"p\264L\367\204\r\213!\bL\366\360`\323m,m\322\26\221\317\366mB\221"
- #"]\2\351\327\367\20\3566\252U\313Q"
- #"\201\nMM\25\n\205\371\e\267\352\252\22lm\314\267\210PP\334z\v\t\353"
- #"cgeEI\245\371\345\364\35\35\35\251\252\251!\303\2y\31bt` \277"
- #"\324\324p\240UK\321r\264\355\321\17-r\0\271\r(\267Jbo\325\375L"
- #"\355\272\35[\253\326\355\1>Z\260\210"
- #"\261\375\27`me>\205\334ZN\244\375\300\240>\346\23k\264s\24o\351."
- #"\254\373;ubsr\262Y\363\0@\241\340o]\272\360~\226\264\361=s\341"
- #"\254T\22\37\20\300h\300\2Gmvd1E\31\263#\242\341\250r:\367\205"
- #"\274\247s\372\255%\251\26K8\230\364"
- #"\31#z[f\5\374\341\363\233\270'\326|]v\366N\267\366\236\333\223cb"
- #"\330t\351\222q\303\26`\336\300\201\254"
- #"\314\316n5y\367Z\6\a\5\361\256\223\23\323\4\201\346\226$\1\350 \3216"
- #"\35\230\v\30_I\365g\332R5\266n\5\344\0r\213\223\356\262\4{[W"
- #"z\372>\335\332E!\271\374\ab\302F\341\342`\322R\251f\363\307\371m\364"
- #"\2131\237Xc\215\242\30\205BA\245"
- #"\231\272f\24\202@\236D\r\252\3460"
- #"\272W/\266\246\244XD\231\327\327\325"
- #"\225\221\236\236\r\344\335#O\235bn"
- #"Z\232\344\256-\217c\307\20\216\34!"
- #"\354\344I\243\266]N\235\322\253\233\365Ld$.\202\300\207\365\276"
- #"\353\2104\21\303\34`\34H\236\2722\24\370\30xC\242\375c\334\32"
-) 500
-(
- #"-\v\251\310\1\344\26&\337:\201ce\377`T\3302\332\302my.\3072"
- #"\372W\265\210b\r\256\316\346\23\206\330{h3\23\36x\0[[\363t\307\215"
- #"\0371\202\355\22*\313\346\342\354\356N\215(bk\245{y]\3275k\30\377"
- #"\343\217|y\376\274\321\261\22\215(\22"
- #"\272j\25\302\222%\4\177\376\271N\233"
- #"\311\241\241l\272!\247\242\21E\274m"
- #"l\370X\245b\340\271s\6\323\256\325"
- #"\267*\250\256\306\311\312\212\265a\206\265"
- #"mS\324\352?\305\21u\350f\t\n\5\313:u\342M\264:U/\240\255\350"
- #"\232\n\2444\244\32\255\200\342\335@W#\266\0\225hW\225/\4\36\225`/"
- #"\2V\300\227\22lo\25\344\0r\v\263W3\234\251]\343q\267\223.\253b"
- #"N\316g\355\"&\264u\a\361[\222\315\361\3370y\342D\263\245?yG\343"
- #"\"\375\0\0 \0IDAT\302\4"
- #"6\375\372\253\336\337\273\376\365\257\214\177"
- #"\367]\276LH\240D\317j\370\3064\20_t\320\275\221X\255\230\242\215BA"
- #"\374\345\313<\272};=\327\353\326-"
- #";\227\237\317\302\3\a\350\370\371\347u"
- #"\333\344N\211\320\335a3:\"\202\35"
- #"EEu\342\210\2317\202\322d\17\335"
- #"\357\376\265\201#\352\364i\355\361\332\333"
- #"\263=\"\202AzV\364\213\3002\225\212\330\263g\231\345\355M\270R\251S7"
- #"\v\240\223\233\ek\335\334\270\e\255\32"
- #"\357i0\272\24\367\257h\225r7I\260\5\230\17\270\3\377\222`\v\260\347F"
- #"\372\3%\332\337\n\264\373u \267*U\16I(*\24\255>\356Q\213FQ"
- #"\202\200\320`\225\2709))7\257\214"
- #";\300\356=\273\371j\355\177\365\376\336\255gOV.[\306\240\330XI\3515"
- #"\26_\34\375\300\3\314\2303G\2578bNq1"
- #"\34732\370\341\310\21\302\375\374H\372\370c@\232"
-) 500
-(
- #"\370\342\216\343\307\271\264t)v\326\326"
- #"\374r\365*\251EEM\304\24\203\234"
- #"\234\270\\\\\214\322\312\212/\206\17\257+g\241Z\315\206\v\27Xs\366,W"
- #"KJ\230\326\265+?O\234\210\273\235"
- #"\35\3\277\376\232\227\372\364ip\\u"
- #"\366\211\211T\325\324P)\212\374\34\31"
- #"I\240\215\r\275\22\23\233T\362\206\204"
- #"\21\365q\276\242\202\307SR\360\265\261\341DT\24~66,\360\367\327k\177"
- #"\250\264\224\271eeX\1\357a|q\341\347\300.\340\b\322\336\252M\265\aX"
- #"\t<%\321\366V\241\335K\231\270\b"
- #"]\31\316\t\24(%\331\357\"\206\241"
- #"\374\202\255\t\232\232\277p'\375\371\nGB$\331\357\246/}X\211\e=u"
- #"\376n\255\324\260\337f\0201\2763\351"
- #"\345\373\f\253O\365'\332g\6}\374"
- #"\244I\307\2558\336\215\316\36c\31\24\364\nJ+\27IeZy\"\32\177\247"
- #">\364\365\237\213\237c\323r]\26\327q1\377G\346\216\323.b|eM\17"
- #"\2<\27228j\6Q!\367\241\20\f\253\24\275\276\266\0176\326vM\304\27"
- #"\365\261\361\340|\16&n \310/\234\250.\3\210\216\214%*b\0\336\36Z"
- #"\37]\312\272\206\304\24\35\35]y{\331S\3347\350\241:)\223~\343\5B"
- #"\202\203\t\f\b\300\317\327\227\300\300@"
- #"\355\3777>\217\30;\0267WW\266|\367\35\203bc\t\357\326M\262\230b"
- #"\327\310H\316\36?\216`oO\210\217\217Nq\304\344\254,\326\356\333GaY"
- #"Y\263\304\24\3=<\bz\342\t4\32\r\23:uj\"\246XRYI\237"
- #"/\277d\325}\3675\20S\354\377\325W\204\271\2722\243[7\356\v\0166."
- #"\216X\317\376\263C\207\30\357\350\3104=\255\0160,\214\2507\217"
- #"\304Dfx{\363\27\37\37i\342\210\211\211\274\340\347GQi)k"
-) 500
-(
- #"\262\263\215\352d\365E[\301\353~\342"
- #"n\336\36\264\2\217\361\230\250\306\333\306"
- #"\253\347v\37@<\204>\364b9\36"
- #"\364\225d\177\204\31\270\22E\27\243\273"
- #"\5\374\311y\376M\16\373\30\314\16I"
- #"\366\31|\317q\342\270\207\337\261\247a"
- #"%\252\260\202l\377\305\\)\335\315\324"
- #"n\333\1\201\322\312k\304\247<KYU6\343:\375\27O{\303\302{%\225"
- #"\31\374\222\3662I\5\333\2703\360o"
- #"\364\17\230\217\225`\370AVk\212I"
- #"\314\335\300\341\314%\330(\34\350\345\367"
- #"\f\321\336\323\261V\330#(`K\3468\6EM\243\177\27\355\226=\327\325\205"
- #"\34:\267\201\204\3045\344\25_e`"
- #"\367i\f\216\232\211\243\322\235\327\326\366"
- #"\346\255\31\307\32\f\266Wk*I\313>\336D|\261s@,\347\256\356\245_"
- #"\227I\r\224x\237\374\320\236\357\227'"
- #"\241\312K\347\314\305C\234\271p\210S\27\264>\321]b\331u`\3\16vN"
- #"|\370\372\366\6AD\237\230\342/\277"
- #"}CN\276V\260\261\203\177'\276\375"
- #"\344\22\375\306\v\344fd\220\225\225EFf&Y*\325\237\377gd\360\355\17"
- #"?\0\20\32\22B\212\221~~\320-\276(\330\333\353\25T,)/\247\317\202"
- #"\5\254\232=\273Yb\212\0\252\213\27"
- #"\ty\375u\312\347\316m\226\277\251|"
- #"}\3724_\36=\312\346\316\235-\222\2371D`\344\251S\f\257\254\344\5\v"
- #"\255\314oQ\332x\365\334\356\3H\270"
- #"\360\fn\364 \234\277H\262\317\345\0"
- #"\2773\223Q\\B\352\300u\r\225\354\"\206h\26\21\300\3\222|N\263\220\34"
- #"\22\30\312\36\24\365v:P\204'\360"
- #"\375\345\373y*\346x\223\261\217sy"
- #"\233\330\225:\217\276\376\317qg\300\213"
- #"\bF\336\372/\27\355\341\247\313\363\1\201AA\257\260+"
- #"u\36\263b\216\351T\360\255;\26\261\232\363y\337\361{"
-) 500
-(
- #"\326R\212*.c\255\260\347\341>\253\371\354\267{\371$.Gg\27Vf\336"
- #"9\22\22\327\360k\342:DQ\244\260"
- #"\354\32\243\373\276\310\324\241\206u\272\n"
- #"J3I\316<\304\1776k\307!|\334\302y\377\251$\20`\372\273\272E\24"
- #"s\36239s\361\20\v\336\321\3724"
- #"V\343\325\307\314\227\372\341\355\31\310\275"
- #"\261\223\31\334w,\16\366\316F\205\24"
- #"\353+\353\6\6\350o-\31\302\334\202"
- #"\212\224\227#L\237n\21QE\200\222\312J\274\227/\247\242Q7Wk\222T"
- #"QA\257\323\247\211W(\30\324\312\323"
- #"\214M\246\215W\317\355>\200\364\21V\222\317\21\372\240{f\211.vq\a="
- #"\370\b\37\206I\366\271\314\27\234\342%"
- #"\4\254\31\3135\243\366\"\325\354g8"
- #"6\270S\3029Fp\226\252\200\335\374"
- #"\234;\223\207\272\376\210\237\243\356ml"
- #"\n*R\370\366\302$\312\253\363x\260\363z\243c$\242\250\341D\366j~N"
- #"\373\e\25\325\205\222\25|\1\266$="
- #"\316\311\354/\360p\n\242\264\"\237U"
- #"\363\r\313Y\324\210\32^\370\254\23\271E\227\361t\351(YXq\376\312Pz"
- #"\206\217\251k\201(\35`\312\233\272\3H-\315Q\343m\2149\225xk1{"
- #"\0\301r\252\274\2658~\364\21\247z"
- #"\364 \\\317\354\257\326\340XY\31\343"
- #"\316\236e\215 p\317\255\324\22i\343\325s\273\17 NB(U\24\361\0\322"
- #"\266\f\5\210\307t\237\355DP\212vQ\327d\211\"\5jr\330N\4U\24"
- #"2\312\355'\16\\7\34<j\371\370h(\205\352\313\222\245\331\1>9\336\205"
- #"\374\362\213\270*;2\267\267\264\212}"
- #"\365\251~t\360\350\207\252\3427\206\365"
- #"x\232\273c\236\221\344w\263X\271\250x\374\237!$|-mfRs"
- #"1\264\27HKa\250\v\253\245\260\177\370a\322f\315\302\307\3362\273q"
-) 500
-(
- #"\2578u\2125G\216p 2R\322fQ\226\342XQ\21\343.^d\215("
- #"J\330\225\247\215\320\306\253\347v\37@"
- #"\356\26\22\370\235'\31\305E\311>\271"
- #"\230\356S\273\351\3235\266\232\244\312\233"
- #"K\2G\24\323\270.f0\255\373O\4\273Ho\365X\202s\232\305\\\314\336"
- #"\315K\223\266#Xh-\312\226\323\363"
- #"qp\264g\366\264\267\315\232\317\355\22@^^\265\nuN\16\37\f\36l\326"
- #"|j\21\201\221_}\305p;;^\360\261\314\242R\251$\344\3440,5\225"
- #"\237\300\204\376\203V\244\215W\317\355>"
- #"\200Li;/H:\271\356\232\300O\245\3673\265k|\233\231\262[\213\225\r"
- #"\274}\300\236EO\234\301\307\3152k"
- #"Q\252j\312\230\265\304\205\37W^\301"
- #"\247\231]SR\271]\272\260T\371\371\4<\363\fy\177\371\vnJi\263\r"
- #"o\226\244\334\\\356X\277\236\36264\26RK\202J\305\375ii\304c\332\226"
- #"\264\226F\4\2046^=\313\v\t\333"
- #"(\202\0\232\16\273\331_>\225\307\242"
- #"\366\266\271\340\1`\345\246\2\1\213\5"
- #"\17\200\313y\a\210\211\34d\366\340\1\346\335\v\244.\0173\v*\2\370zx"
- #"0\260C\a\216XP\354\260\223\227\27\0\331mp\320z\260\257/{;w\346"
- #"aA\340g\35\3434\246\350U\231b[\253\233\245\177\365JC\332\370\273-p"
- #"\233\a\220\204\204\4\272u\353\326\332\305"
- #"0\31k[\221\374\240el\315\34\317\204\210\rF\307<Z\3\18pe\21"
- #"#\373Xnp\26\340B\346>zG\r\265H^\346\224r\257\313\303\314\222\356"
- #"\265\f\215\214d_\272\364\315\311Z\202yQQ,\312\3144K\332\265ZX\35"
- #"uhaI\261\355\345\356\316W\21\21<XS\303'\nE\335\250"
- #"d\r0\1\270*\261\34\323L\260\35\212V7\313\374:\325\226\343\266"
-) 500
-(
- #"\r \t\t\t<\364\320C\234\2230?\277-\241v<\317~\333X\256\226\375"
- #"\304\354^\227\332d\313\3\240J\231\301o\347\3273\272\217ew\241NL\335K"
- #"\257\250\273,\222\327\355\322\2\1\270+"
- #":\232\275\26\f ]\276\370\202E\247"
- #"N\261\344\3325\235\202\207M\354\r\210#6F\4:\336X\200\370\220\16-\254"
- #"\306\fuq\321i;\330\325\225\21311\354\264\265%V\208\217\266\202\17D"
- #"\232\26\226\n(\227h\v\220\4\214E\2732\376v\341\266\r \v\26,`\343"
- #"\306\215\255]\f\223(qL`GE_\356\360\231\316\344\310\357q\2621&\377"
- #"\326z\34\311Y\314\320\230Y8\331\233O\314P\27\27.\37#*\3022\273\35"
- #"\336N-\220\00111\34U\251\32|\347\277r%s\367\354!C\202\"\260F"
- #"\24\361X\276\34a\311\22\302V\2576h\233^Z\212\343\215sg\253P0\300"
- #"\311\311`\272\237\345\344\220}#X\353"
- #"\22G\254\317\365\232\32\36NJ\242@\2431\250\205UKBI\t[\n\n\364"
- #"\332\372\333\332\362Ct4\323\274\274\350"
- #"\215VUw3\322\264\260\26\1\263$"
- #"\332\2\24\1\277\2\346\333\301\306\362\334"
- #"\266\1\344\340\301\203\f\32\3246\337\336"
- #"uQ\342\230\300/\25\332M\241\372\370"
- #"\315\246\255\367\200&\234_\301H\v\355\373Q\237\252*5vJ\335\"\201-M"
- #"k\267@\32\b#J\300\220\275\243\275}\235\30bfi)\337%%\221UV"
- #"\306\307'N0t\323&\275i\326\27"
- #"S,\250\250\300\311\306\206\265#F\350\264M/-e\356\236=D\255]K\177"
- #"??\"\334\335\3314z4?\326\223x\257\317\236\342bz'&\362\211J\305"
- #"g\241\241F\3\302e\265\232\1g\317\342\240P\360k\267n$\305"
- #"\304\340c \310\357..fjr2[#\"\f\332\n\300\263!"
-) 500
-(
- #"!\204*\225T \255K*\3X\217V\351W*?\242U\372\265\314\335k\31"
- #"d1\3056@\271{\2\277\24\267\315\231V\272P\v*\2525\2258(\335,"
- #"\232\257B\1\202 PU]\211\215\265yz\222\5\264]$\5\305*\354\354Z"
- #"V\254\321?$\204I\23&4X\271ngk\313\331\253W\251\250\252\"#?"
- #"\237+\271\271\244\347\3455\20F\214?"
- #"v\214\344e\313\352\322\311.*\252\263"
- #"\321e\277\343\370q.\335\20^\254\254"
- #"\256\346xj*\207.j\247\234w\374\374s\4 6 \200\20\27\27\306\204\205"
- #"\261\260oC\31\37}b\212\23\266la\345\275\3676\320\315\2\270TX\310?"
- #"\17\35\">5\225\270\36=Hz\374"
- #"q\274\352\2559\251\274\261\335m\255\356"
- #"\325\351\353\327y\376\312\25.\251\325\274"
- #"\327\241\3\223<<\20\200I\6\364\263"
- #"\366\225\2240%)\211\277\373\373\363W"
- #"#\255\16\320\6\217\231))\374\330\271"
- #"3\275\34\35\215\332/\311\312\"\310\316"
- #"\216O\374\374\30-a\206\326b\264\255"
- #"\17S\332\337\233\320\216\231\334N\264\373"
- #"\0\262\203.\f\347\f\n\244uW\354$\212{8\2145\306o\312Zv\323\207"
- #"\301\304\243\244\341\234x+k\250\356\260"
- #"\233}\0313y,jo\335`\371\27\247\a\362@\347\265\222e\332W\237\352\307"
- #"\250\260\345\370;\365\226d\377\371\311\336"
- #"\304\6.\240\233\327\24\311\307\260\372T?z\372>MO\337Y\34/^\304\30"
- #"#\333\326.\374o\24\335:\16k\240_e\210W\327\364\304\3135\204~]&"
- #"\323+|\254NI\24\205C\31\326\326"
- #"\266u\301\343\321\371=\b\r\352\312\375"
- #"w\317\240\177\314}(\24\206W>?\366b\37\2246v\222\304\27\327m^\204"
- #"\273\273;\235\243\242\b\f\b\240c\207\16\4\5\6"
- #"\326\375\355\342\342\302\323s\346\260j\305\212:5^)"
-) 500
-(
- #"b\212\37/_\316\216]\273\270t\346\f\0^..\f|\365Ub\202\203\351"
- #"\350\355M\220\247'A\236\236\304v\351\302\272}\373pstdM=\35\253\301"
- #"\257\276JVa!\201\36\36M\354\23\316\235\253\23R\254e\330\eo \b\2"
- #"\3\"\"\260Q(\3303y2\341\256\256\6\3138\342\273\357\bsu\345\215\1"
- #"\3\32\210)\236\2351C\247\375\324\370"
- #"x\356\364\367\347\344\364\351\4\352\350\256"
- #"\372[\227.\274\257R\361A\a\355>\1773RR\270\317\325\225o;w\306E"
- #"\342j\365\347\257\\aip0S\f\4\231\372\274\236\236\316\206\360pI\301\3"
- #"\340\373\202\2\326\206\207\23\256T\262\327"
- #"\326\226qII\254Q(\270G\317,\262?\200o%\245\374'*\340\366\331\354"
- #"@\313m\277\16D\20\4\f\35\242\263\320\231Al\303Y\342\246\224\373\31A'"
- #"fK\326\264\28\315\313\324\240&\206"
- #"\17\352\276\23\235\322Iu|\207S9\253y\244\333\316\6-\217\243Y+8\225"
- #"\263\206\231Q\a\214\352Y\1$\27lgk\362S\314\274\343 \256J\343\223\n"
- #"\263\257\237f\343\271qt\366\30\307\360\320%\b\22z2\213\324il\2764\35"
- #"+k\5\231%\177\360\301\323)\6w"
- #"\36,)\317\345\247c\37\363\323\361\217"
- #"\211\t\e\315\203w\276\206\237\273~\201"
- #"\275\212\312\22\216%o\341\310\205M\234"
- #"\277\272\217\310\16w\321\257\313d\272v"
- #"\30\312\333\e\206\361\324\310U8\372\225"
- #"\361\365\256\267\371\364\255}\332<\312\n"
- #"\371\351\300\6\266\376\262\6U\336UF"
- #"\3355\2151w\317\304\305\321\235\351/"
- #"\366\346\177\357\37\303\335\365\3172VU"
- #"Wr!\345\270$\361\305\301\17\331\223z\341\"VV\220\236\221AFF\6W"
- #"\256^\325\376\235\231I\374\216\35\344\345\347K\26R"
- #"\4\335\332Y\252\255[\ty\344\21\312\277\372\252\211"
-) 500
-(
- #"}\267y\363X\371\354\263\315\26Rl\314\220\5\vx\265gO\206w\220\272a"
- #"k\313\240*-\245\323\352\325$GG\e\354rjK$\24\0273\362\302\5\236"
- #"\20\4\26\326\324`\376I\343zh\343\325s\273\17 \376\302(:\21\207?\367"
- #"KJ\357\22\37R\314yz\263Br\31*\311c\a]\271\217\23X\333\324\220"
- #"\352\370\16\211\305\253\350\351\373$\261\201\vq\266m|{\212|yv$an"
- #"\303\31\20 \255\227\365`\306;$\346n`f\324\1l\254\214\277u]\257\312"
- #"\345\333\v\223\260\266r`B\304\6i"
- #"\262\356\242\206\257\323\206r5\367$\263"
- #"\307|I\317p\343\303\201\371%\351l"
- #"=\362\16\277&\256c`\367\351$\246"
- #"\375\314\223\303W\22\21\244\277\203\240~09s\371'\324Ue\330\331:1\354"
- #"\316\361\4\372\206\362\364\3247\233\370\\"
- #"N?\307\326=k\330\276W+\330\230[p\215i\17\276\310s3\f\317y\321"
- #"'\276\330o\274@\315\365r\364)q"
- #"\364\e4\210\376\375\372\335\224\220\"\0"
- #"\247N!\364\357o\366\325\350\0\257\377\357\177h\256]\343_\22\367/iI^"
- #"\336\265\vuA\1\37\4\5Y<\357\346\222^Y\311;))\254*.\346I"
- #"A`\241(Z>\220\264\361\352\371\266"
- #"\35D\227\212\23\235\3534\252\244\340\307"
- #"(\256\261\315\244<l\361$\334\352IN8Lg\233&\22[{\230\323\353\22"
- #"#B\227\352\b\36\0\2\367\207\257\344`\306;\344^\2276\307#6p\1\1"
- #"N}\370\341\322tD\214\213\3059\330"
- #"x\361p\267x\224V\316\374/\361\36"
- #"\262\312\216\263\364h\260A\237j\347T"
- #"\322sO\361\364\250/X\363\323l\376\367\313<\236[\36D\361\365l\275>\36"
- #"\316A<v\317R\376\375\270\266\313&3\357\34"
- #"\357};\212\213\351\a\364\372\330\331:\23\333\365\21"
-) 500
-(
- #"\346=\370=Q!\367\341\345\22LEe)?\37\334\244w\noHPW\342"
- #"\246/b\313gW\260\261\321\256\266\336"
- #"\375\253\361Yx\336\36\1\f\e0\1"
- #"\177\237\20\246\214\216\343\263\177%\324\375"
- #"fH\306\351\310\201\3,\375\340\203\233\v\36\0zv\3373\aw\305\304Xt"
- #"*o}\346\r\32\304\252\354l\222\325"
- #"\352V\311\2779\4\331\332\26242\222\213w\334\1\16\16t\201\6kFd\332"
- #"A\0001\266\220\320\211N\224\222$9"
- #"=g\272`\205\222b\22%\331\333\332\201c\370y\n\354ws\255\374WfF"
- #"\0370\208\376\304U\31L_\377\271l8?\206\17\177\227\266vuD\350G"
- #"\24\251\323X\237x\257$\37\e\205\266"
- #"\365\321\331\375~V\237\352G\221\372\212"
- #"^[\205\225\206M\247\247\363\360\320w"
- #"\351\e1\201\267f\34\347\354\225_("
- #"(\315`\333\21\3433\333k\3\211\243"
- #"\235;\25\225\245\254\210\177L\3221e"
- #"\27\246\20\354\333\2239\223?A\241\20"
- #"\214N\341U(\254\330\374i*G\276"
- #"\27\371q\2454QH\200\315\237\246\362"
- #"\342SK\353\224{m,\325\325\342\350"
- #"h\271\251\274\21\21\234\310\316&\333\314"
- #"\372^\272\360up\340\235\1\3\230\226"
- #"\234\214\246\215\277U7&\310\336\236\245"
- #"\335\273s\251{wv\332\330\20\v\234\267\3205k\353\334\366\1$1\321pE"
- #"\237\3142\256\230\270\315\275\200\25{\220&L\367e\205\202u\251=(R_F"
- #"#\252Yw\346n\311\371\234\316^GaE*\245U\322$(\254\25\366Tj"
- #"J\270\\\264G\262\17\b\f\351\360\177"
- #"\270)C\261\263v\327ku\352\372\22\34\354\\\31\26\3634\0N\366\236TU"
- #"k\337&\17_\220\276\336f\305\334"
- #"|\326\275$\362\301\323\322T\202\337\236y\222y\17~O"
- #"N\311E\36\0363\317bSx\253,0\205\27\0GG"
-) 500
-(
- #"\213-&tT*y\356\336{Y\364\307\37\26\311\2571\317\364\355\213\213\275="
- #"\37\346\344\264J\3767\213\277\243#?"
- #"\304\3040-(\210\36\32\r\n\240\262"
- #"\265\v\325\312\334\366\1\304\30\201L\240"
- #"\222\202\26\363\321PA\236b\37\311\16or\310q\30\"\"/\364\313eV\314"
- #"q\372\372\307agex\6L}\246E\375B_\3778\334\224!f\365\1\230"
- #"\335\353\"/\366\323\275\336@\245I`"
- #"\307\351\1770\363\336e\r\24w\337\233"
- #"u\201u/\211\222\367\365h.\225\232"
- #"\22~\334\373\31S\307Zf\335\211\240"
- #"\260\314\"B\0\354\355-\326\2\1\2307~<+O\236\244\244\322\362U\237\0"
- #",\e>\2347\257^\345@I\211\305\363o\t\4`N@\0\25}\373\"\242"
- #"\335\332\326\r\330\17\30\353\234K\0\2"
- #"\0\375\35\276\r\271\25\332i\355>\200"
- #"tf\36\316t\271i\237\n\253t\22"
- #"\355\347\362\243\302\223d\247\377\303\311\v"
- #"\206\205\276\311\313\3*\260U8\341b"
- #"\e\304\210\320\245\304\365\226.\345n)"
- #"\37Cd\327$\260\356\370\375\27441"
- #"\336\242\242\211\3659\223\371\3\261=G5\230QeN\354\34-\370\350*,\373"
- #"\b\372zx0\262sg6''[4\337Z:\371\370\260m\344HF_\274"
- #"h\261 \222PR\"I3\v\264\3\347s\323\322\360?~\334\250my\317\236"
- #"\250\254\254(\2\336\20\4<\320\212%f\350\261\237\t\\C\272\224I\333^J"
- #"\254\245\335\a\20;|\31\311\371f\371"
- #"\324X\225\220\343\374%\307]\307\263C"
- #"\354\202\243\e\314\351u\221\351Q{\30"
- #"\22\364\6\35]\206`\245\260\214|\2669\250\262Q\261\346\350(^\232\30op"
- #"\326\224\2719ra\23\367\16\234l\261\374\354\235j,\262\n\275\26Ku"
- #"a\325296\226MI\322\307\375Z\232\301\21\21l\e9\222\221\27."
-) 500
-(
- #"\324I\230l\314\317'Pb%o\212\220b\r0\341\322%\256Jlq\335}"
- #"\376<\37\253TdI\270\376\326\326\326\330XY\321\305\316\216=\275zq!8"
- #"\30\224J\"\200\361\n\5_\2\365C"
- #"\344\277\1\37`\237\244\222\334\32\264\373"
- #"\0b*5V%\344\272|\311\t\327\361|W\343F\246\355\327D\371Nf~"
- #"\337,I\203\343\267\n\n+8^\274"
- #"\210\341\275\237k\325\340Q\251)\341\267"
- #"\23\333\350\em\271=\344\34\234[\241"
- #"\363\300\202;\367\215\0364\210\255\311\311"
- #"\344\231q0\275\313\27_ ,YB"
- #"\360\347\272\267\212\36\34\21\301\334\310H"
- #"\26ee\361\177\31\31<\234\224D\246\304J^\2378\242.>V\251\b\264\265"
- #"\245\253\304\335\30\247{y\21\252T\22"
- #"\"a\337\224M\371\371t\266\263\343|"
- #"t4XY\21\344\353\313\322\230\30\262z\364`\262\2677\233llp\3\36\260"
- #"\262\342KA \5x\308\"\251$\267\6\362T\2}\b (KPYo"
- #"\341\212f\23W*\266\243\21\325X\213J\302mF\321\335s2\343#\327bk"
- #"e\271i\230\226B@+\257\262\377\360*\336\177\252\365\336TA\333}5t\300"
- #"\4\\\235-'\332\350\344\336\n\1\304"
- #"\312\n,\324\22qvr\302\331\326\226"
- #"\251\361\361\374w\304\b\235\253\307\e\23"
- #"\361\337\377r\251\260\220\216\316\316\244\315"
- #"\232\245\327N#\212\254>s\206\354\353"
- #"\327\1\230\22\241\177\201\3563w\336I"
- #"\347\325\253\351dg\307\327\235:\361F"
- #"\206\276\316\237?1&\216X\237\263\345"
- #"\345\274\225\221\301\357\335\273\23,! \234-/giV\226d\373\245*\25/"
- #"\3717\235\355\350lk\313#\301\301<\22\34LIe%[\256]cS~>"
- #"[\252\252\320\0+\200\321\202\300dQd,p+\327"
- #" \355>\200\324\bU\224\333$Rds\224B\341("
-) 500
-(
- #"\3715G\311.?\211H\r\212J\5"
- #"\341\216\243\210\361\234\314d\367\3333X"
- #"\350\"\327z7\e~\231\311+\17\357"
- #"5\270\332\334\22\34\271\260\211\373\357\261"
- #"\254\202\320\37'\23\260\267\320\376\341\0"
- #"\366\366\366\348w\216A\235\365\257\324"
- #"7F\364\363\317sW\367\356,\34?\236@\3r\37\25UU\34\276t\t\17"
- #"gg~\272r\205!\e7\222\374\304\23:m\253kj\370.)\211\245'N"
- #"p\365\206b\257\241\200\260\347\352U\346"
- #"\357\333\207\0|v\337},<p\200\227\364\354Hx\271\270\230q\23373*"
- #"$\204\243\231\231x\330\330p\366\216;"
- #"\f\36c\255\276\325\326\210\b\243\22%"
- #"\32Q\344\311\324T\376\31\24$)\30"
- #"\230j\177\244\254\214\254\252*\306\271\31"
- #"\326\203\253\37LF\\\270\300<\17\17\6)\24l),dSI\tOTV"
- #"R\203\266+\250\207 \320\e\350-\212"
- #"\364\6\272\323\366+\350\333~%\2721\224\326.x9t%\300\261\17~N\275"
- #"\361w\354\215\267Cw\24B[\277t"
- #"\346\241\312F\305\207\a\303\371\333\244\35"
- #"\255\332u\5Z\255\260\231\213\355\330\265"
- #"&\a\a{\313\5\357!\17\333\361S||\235\306UK\240KH\261\226\204\204"
- #"\4\206\337\177\177\39\23}\1A\24E\262\n\vI\315\316&-'\207\313\331"
- #"\331\\\316\311a\363\357\277\243*,$"
- #"\314\327\267\201\360bm\300\330{\346\f{\23\239y\37121!!\f\350\324"
- #"\211w6of\377\224)M\304\21s\312\313\371\354\364i\226\237<I\210\253+"
- #"\317\365\350Al@\0wm\332\304\301"
- #"\207\36\302\307\241\341T\352\323\271\271<\277o\37\227\n\vyo\360`&ED"
- #"\30\34\0\336\227\236\316\224m\333\370"
- #"{\277~\374\265gO\22\222\223\31\265u+)\6\24"
- #"sM\25G\\|\355\32\273\213\213\331\336\245\213\244\301h"
-) 500
-(
- #"S\355\37KI\341\16{{\235-\20}\204\235<\311\256.]\350\324X\244S"
- #"\24\251\252\250 \261\250\210\243%%\34"
- #"\275~\235\243\225\225\234\27Er\324jlm\333\356\26T\355>\200x:t\341"
- #"\331\36\211\222\3\306\212\343\335x2\346"
- #"\17l\24\322\327#\230\352\363\371\311\336"
- #"L\216\374\16W\245\341\225\341\265\2549"
- #"3\230\261\235\376\213\207]'I\366_"
- #"\234\216\345\236\340w\233(\377ZY\303o\245\363Q\332\3323e\360\333\r~{"
- #"s},S\357zWrPyc]?\206\305<\315\320h\375\335\35\365\321%"
- #"\276h\345\252\342\361\177\204\220\360\265\356"
- #"\276\372\346\210):\332;\323+j(}\242\206\321=\242?\2666M\3376k"
- #"\367B\357?x0\371\5\5:\305\24\237\2363\247I@\220\"\246\30\26\32J"
- #"\362\331?\325\5\214\3714\16\b\203^"
- #"}\225\334\342b\202\275\275\t\361\361!"
- #"\344\306\377\336..\314\371\374sV\315"
- #"\236\335@;+\366\357\177Gic\303"
- #"\320\356\335\31\26\25E\377\316\235Q\336"
- #"\250\244\355\37~\230\264Y\263\360i\324"
- #"\332\352\367\345\227Dyy1\267G\17z\372\30o\201\366Z\277\236\373:v\344"
- #"\225\376\375q\221P\331\365^\277\236\5"
- #"}\3736h\315\274\274s\247V\352D"
- #"\217NW\354\331\263\274\333\241\3\203$"
- #"\256\334\37x\366l\2358\2429\354\a"
- #"\234=\313\326\210\b\274L\230\202\35s"
- #"\346\f\177t\357\216\215)\343]\207\17K\267m\5\332}\0q\263\vaZ\367"
- #"_p\267\v\223d\277\366\314\20\6\5"
- #"\275J\230\333p\311y\230\352\263\377\352"
- #"\233d_?\315\244.\322\364\221N\347"
- #"\374\217\203\31\357\360d\364\357X+\214"
- #"K\220g\225\35\343\353s\343\30\327y"
- #"\r\241\256\332\301i\1\250\360N`\351\366\373y\377\251\244"
- #"&]W\227U\307\370\340\273q<3z\r\335\203\215\17"
-) 500
-(
- #"h\347\26\247\261b\333tl\254\355xf\364\32\334\34\r\277\2515\21_\214}"
- #"\215?2?\301\336\316\236\331\323\336\326"
- #"\351\243\256,\347\300\37[\371~\327J"
- #"\316'\37\343\236\330I\214\32:\275N"
- #"Q\2671\225U\25\234\271x\230\243g\366r\354\314^.^>IDH\f="
- #"\273\ra\327\201\r\274\32\267\212\36]\a\321o\274\200xc\2009;'G\247"
- #"\230\342\272/\265\213O\303\303\302H2"
- #"\262X\25@\260\267\307\337\317\217\215\353"
- #"\327\353l\331\b\366\366\r\364\260T\205\205\fy\375\365&\1\241%yy\365j"
- #"\324\331\331|0X\332\242Xs\242\272"
- #"~\235\316\253V\21\37\31\311 \207\333"
- #"i\307\214\233D\16 m\233\20\327\241"
- #"\f\356\360:!\256\322V\210\357\273\362"
- #":5h\30\326\361_\222\3630\325\247"
- #"\272\246\234\345\307\2732\256\363\32\202]"
- #"\244m\337\372\303\245i8\331\370qo\310bI\366\215\203H\256\365n\276>6"
- #"\223\347'\374H\210\257\356=\330M\r\"5\242\206\370#\213\331ul)\217\17"
- #"_a\222\370\342\201\3045\324\210\325,yu\eo\374gz\23e\335&e\253"
- #"'\246Xv\275\2301w\317d\306\204\205u\322$\272\250\r(\37\256~\236\363"
- #")\307\32\b)\212Ff(\351R\3265D\267\236=Y\271l\231\336n\261\306"
- #"\1\304\22\344\225\224\320u\316\34N<"
- #"\372(\1\22\6\322\315\315\261k\327\30"
- #"\367\375\367\254\t\r\345\36\27\t\342\236"
- #"\355\19\200\264mb|g\322\321e\b=|t\17$6&\265\350g\366]"
- #"y\235\231w\374*9\217\346\370\234\311"
- #"Y\317o\231\213\231\25\375\207$Iw"
- #"\265\246\210\317N\366dT\3502\302\335"
- #"\245\355:P\eD\6\206\274\310\336\313\257KZ\357aj\20\18{\345"
- #"\27V\306\317\244O\304\4\216\\\370\206\267f\0343:8\377\325\241\247H"
-) 500
-(
- #"\315<NR\332i\252\252+%)\353\2\324\324h\0300\321\32\ek[|\275"
- #":\360\335r\343\263\310f\276\324\217\250\210\376u\1GJ\0iiZ#\200\0"
- #"\274\374\351\247\250\363\362\370\340.\313\354"
- #"3o\214\204\344d\356\337\266\215\370\210"
- #"\b\311\335U\2675m<\200\264\373u n\312\20\212\324\322\2458:8\307\222"
- #"}\375\24U\2322\263\372Dy?\202"
- #"\255\225\23'\263\277\220d\257\264r\345"
- #"\201\316\353\210Oy\226\353U\271\222|\374\34{1:\354\23v^|\36\e+"
- #"%~\36\306\367D\t\361\355\305\234\261_\261b\333t^\372\274\213A%\336Z"
- #"\272u\274\333$\361E+\e\330}\350\177|\370Z<\376>!\2004e]\320"
- #"\212)\372\373\2040~\370\323u\373\206"
- #"\30\343\213\367\2164\20RlO\314\233"
- #"8\221\345\247N\265v1\352\30\34\36"
- #"\316\266\241C\31y\361b\335\"C\231\266K\273\17 \256\312`\212*.K\266"
- #"\267V\330\343\347\330\223\253%\322[\23"
- #"\315\361\1\201~\376\177ew\332\213\222"
- #"\325x;8\17$\302\343A\326%\16\225\354s\255f\17\35}b()\317\225"
- #"\244\252\v\320%h0\2666\366d\25\\\224\354c\212\370bVe\2\202 \340"
- #"\356\352\3037\313.\334\264\262\256\251X"
- #"L\a\253~\236\255\244\356\352\353\345\205 \b\34\310\222*\276i~\6GG3"
- #"\267C\a\26\265\2412\351\303\24\231\24UU\25A'N\334V\201\261\335\a\20"
- #"\205`\315\245\202\255&\371\370;\365\345"
- #"\307K\272\267\367\324G\220s,?]~\201\225'\242%\373\354I\373;\25\325"
- #"\205&(\353jw'\314\271\236h\324\247\2702\235=Ys9\224\272\222\362J"
- #"\255\340\202)\252\272\257<\274\217\373z\305q\372\362N\311>R\304"
- #"\27\255l`\341\177\206\363\361\377\355\222\234nKr\361\352>\2525\32"
-) 500
-(
- #"*-,6X\255\321\260G\302`\274"
- #"9\330\371\362\313\334\267Q\372\265\267\4"
- #"\363\206\16\345S\225\212\271iid\334\304\2650E\333\n\264\1!\340\370qI"
- #"\225|BI\t\243/^\224,\223\362\336\265kdTV\362\236\204\300\230PR"
- #"B\354Yi{\1\265&\355>\200\354\275\362\32\345\325\272Uh\365q>\357["
- #"\223*u\200sy\233\310\271~\2060"
- #"\267\21\222}\314\245\306\233^\232\300\247"
- #"'#qp\205\305\263.\362\376SI"
- #"&\253\352\326\356\357\361\366\314\226\355\376"
- #"\260vW!\b\20\243g&\225\271\231"
- #"\365\322\b\366\375\364\223\305\347\336\357\375"
- #"\366[F\277\365\226E\363\254ept"
- #"4(\24d\267\241\315\236|\335\335\271"
- #"\360\350\243`mM\344\351\323\r\204\27"
- #"My\353\277\353\3349\311\332V\0003SR\270VU%\251\222\237\231\222B\251"
- #"\236=\323u\261\245\260\20\200\203\22D$\37KIAu\v\264T\332\375 \372"
- #"\214;\22\330\232\364$\263{]\224\354s\245\270y>?&\315\340\361;\16\341"
- #"h\323z\253\2733\324\273\371\341\302L"
- #"^\230\360#\301zf[\265\26\326J\330|b>vJ\375Sw\315Mk\f"
- #"\240\327\322Z\3\351\0/\257[\207:"
- #"=\235\17\206\f\261x\336]\276\370\202\213\5\5tpv\346Jc\231\24\215\206"
- #"c\307\2173\356\360a\326\204\205q\217"
- #"\213\v\201'N\220YY\211\330\257\237"
- #"\321\264\177((`\374%\355\216\243R\354\373&&\342kcCvU\25G\272"
- #"w7h{\256\274\234\236g\316\340o"
- #"kKjL\214\321\264\277\316\317\347\273\374|\276\356$m\275\26j\1\5/\0"
- #"\0 \0IDAT\320\346\a\321\333\347r\353ztt\31lR \270\31\237"
- #"\270^\3226Q2\27*M\2_\235\236\300K\223"
- #"\342\333\\\360\0\250T&\261\345\347\325|\267\\\372\26"
-) 500
-(
- #"\3032-\303\274\261c\211\210\213cN"
- #"\317\236\204\337\344\354'\203\1A\aC"
- #"\203\202\270XP\300C\272dR\254\254"
- #"\350\325\247\17_\331\333s\377\317?\263((\b\215(J\26G<PR\302\30"
- #"77I[\351\236\274~\35UU\25\207\273w\227\3245\363GY\31c\335\335"
- #"\331$1 \\U\253\tj\303\253\312\233C\273\357\302j/\2504\177\356\353\21"
- #"\21\330\272\22%\272P\330jxo\335t\346\316x\327b\373~\264g\272\315\233"
- #"\307\201\363\177nc\340\353\346\306;\217"
- #">\312\264m\333\232l9\e\272j\25\302\222%\204\255^m4]\21\350x#"
- #"\0\351\f\b\215H\310\310`KJ\n\341nnzu\263\0\6w\357\316\226\321"
- #"\243\231{\345\n\317\370\370\30\325\315\2"
- #"\310\250\254dmn._\204\205I\262"
- #"_\223\233\313\243\236\236\222+\305M\371"
- #"\371L6\240;\326\230\364\252*9\200"
- #"\310\334zdV\357\346\233\304\251\274\362"
- #"\360\336V\327\267\322\307\276\363Kpr"
- #"te\374\360\247[\265\34\2551\3\253.\357\233\230\211\3258 \30\342XJ\n"
- #"\347\322\323\231\376\321G\r\276\177f\344"
- #"H\\\234\235\371\260\336\370BJQ\21"
- #"\356vvD\270\273\263v\204\341\361\273"
- #"\353\325\325<\274m\e\5j\265\321\200"
- #"\0\260\373\312\25\246\306\307\263\365\301\a"
- #"Iz\374\361&\32[\215\271TQA\264\207\a\253rr\370\271\270\330\310Q\302"
- #"\342\254,f\371\370\340)\341\274V\211"
- #"\"\353\363\362x\334\333\333\250-@\221"
- #"F\303\257\245\245\2141\"\246X\237\364"
- #"\312\312\333.\200\264\373.\254\333\231\222"
- #"\312t\216\26\274\303\221\264\325,\230\274"
- #"S\357\n\363\326\306\312\6\276\370\36156|t\6\301\202\373b4FhC\257"
- #"S\335\346\315c\345\263\317\32\2251\271\230\231\311\366\343"
- #"\307\353\2B\352'\237\350\264\253\326h\370\356\360a\226\306"
-) 500
-(
- #"\307s9'\207.\1\1|>{v\3\eA\20X\366\227\277p\307\213/2"
- #"\257G\17\26\377\361\a\37\2358\301\207"
- #"w\335\305d#\255\211Zu\335\336\276\276\374\372\320C(\255\f/~\335}\345"
- #"\n3w\356\344\307\a\36\240\227\4\275"
- #"\255\"\265\232\327\16\36d\333\203\17R"
- #"VX\310\310\355\333y\302\333\233\205\376"
- #"\376\4\352\250\2243*+Y\237\233\313\271hi\263\36\343\v\v\tS*\211h"
- #",t\250\207\37\v\n\270\333\305\5\a\23v\224\274\252V\323A\16 2\267\2"
- #"Y\352\4\326\235\32\305\220\250\307Y\374"
- #"\324\305:\201\302\266\210w\260VV$"
- #"\310\257u\266\314\255\245F(E0\303\26\263\206\224xkjj\270\232\236NR"
- #"r25\242\310_W\257&-'Go@\270\256V\26371\221\370c\307\330"
- #"q\243\2450\252gO\272\6\5\261\362\331g\233\344}%7\227Ov\354\340\213"
- #"\275{\351\e\36\316\eS\246p\367\35"
- #"w\240\320\23\250;u\350@\205F\303"
- #"\240\257\277\306\327\301\201\243\217<\202\237"
- #"\21\365\333\306\352\272\30605x\0\374"
- #"\373\367\337\271\257cG\255\275\217\17\27<<xg\317\36\"O\237f\273\216U"
- #"\353\246\264>@\333}5\303\313K\222-h\273\257\246\231`\17r\27\326m\311"
- #"'\307\"\250\21\245o\344\263\342x7"
- #"\252j\256\233\224\207\251>\237\236\270\303"
- #"\244\251\305\237\237\354]\267\232^\0\n"
- #"m\23\370\337\351\373\371\333\344\35<v"
- #"\357\322&\301\343\215u\375HU\35\225\234~s|^[\333[\322\272\22k%"
- #"$\347h\27\16.]\273\200\262\353\306\273&jyd^4\377\374\370\t.\244"
- #"H\233\343\377\330\v\275y\356\37#\331"
- #"\260\365?\\\311\324N\202\310/Tq\377\254 \n\212\2629\223t\200"
- #"\376}\373\326\331\367\37<\230\310\230"
- #"\30F\214\35\3133qq\374\373\275\367"
-) 500
-(
- #"\370j\343F\374CB\230\373\374\363ddf6H?\274[7\4{\373&\377"
- #"\262T*>^\276\234\241\303\233\212i\16\271\367^F?\370 K\227/\307\317"
- #"\335\35\4\201\271\243G\3235(\210u"
- #"\317=\327\304\376\2367\337\344\243\370x"
- #":\373\373\23\377\367\277\223\364\361\307,"
- #"}\362I\316~\370\241\316\326\312\244\305"
- #"\213\311.*b\373+\257\260\345\345\227\2717:Zo\360\250E!\b\304\6\6"
- #"\362\375\270qF\203\a\300\363\373\366\261"
- #"t\3300I\301\3\340\365\203\a\3310"
- #"z\264\344\340\1p #\203\177\326\323"
- #"\21\v\362\362b\351\344\311\304\17\e\246"
- #"\335_\375\306~%\265\374QV\306<__\311\351\247WV2\305\204\361\fU"
- #"U\25\243\\]%\333\3xY[\343\327\212]\244\346\240\335O\343uUv`"
- #"\306\35\277\342\252\354(\311\336\22j\274"
- #"\337_\234J\220\363\235\364\365oZ\201"
- #"\350\242V\275wj\3147\24;\357f\365\317\206E\21O\246ng\325\216\247x"
- #"\343\321\203x\272H;nS}\256\346"
- #"\234\346\203\357\307\321+|\34\323\356^"
- #"\202\240\247\177(\243r7\357\377o&"
- #"\257\316\371\234\235\373\277\344\300\37\333x"
- #"l\374\337\230:n>6\326\206\337\326\n\212s\370a\327g|\273c9\1>"
- #"!<4\3469\242\273\3042sA\177"
- #"\235\342\213\25\352\353\34=\263\227\203G"
- #"\343\371\355\370\16\0\334\\\2748{\351"
- #"w\36y\340y\\=\254\360\364\263\342\315\327^\3n\354\275\241R\221z\3712"
- #"iW\256p9-\215\313ii\254\\\265\n\220\256\304+Ux\361\365\27084"
- #"\5\5\374\353\221G\214\246iN\216\245\2440\356_\377b\315\275\367rOGi"
- #"\367Gkr,#\203q\2337\263\246S'\356\221\20\360n)\332\3704"
- #"\336v\37@\202\\\356\344\276\220\367\tr\226\266y\220%\324x\223\vw"
-) 500
-(
- #"\260'\355\25f\305H{\343\327\324\224"
- #"\263\374T\4\341\201}9\235\272\223\5"
- #"\223w\32\35,\337z\370\35\16\235\337"
- #"\300k\217\34@i#\355\2413\325\247\244<\227\2176OBi\355\300\234q\e"
- #"\260\267m\250\260ZR\241\342\205\317\302"
- #"\371\317\353;\352$\330\217\236\336\303\a"
- #"\253\347#\b\2\217Oz\205\17V\317"
- #"3\252\304\253\321T\263\347\320wl\334\266\224\263I\177PYU!I|\361J"
- #"\346Ef\277~\17\331y\351\370yw\244CP\0\213\336~\203\273\207\0165\350"
- #"g\252\22\257T~\376\352+^\177\367]~m\245\5\205\365I8u\212Q\377"
- #"\3767)O<atp\273-\220\220\221\301\310\357\276\343\t//\26\6\4\20"
- #"\330J\3220-\216\34@\3326\335\274"
- #"\246\320\325s\22\335\274\246H\262\267\204"
- #"\32\257H\rK\217\206\360P\344\26|\35\r/PR+\3229V\374\377\354\235"
- #"wx\215\347\e\307?'S\310\22!C\254\4\211Mb\324H\315\32\321\4%"
- #"V\355\331\"\250Q\332\376\252\245\255R[l\245D\315\3304(ZD\314$H"
- #"%!\313\312\20+\211\223\275\316\357\217"
- #"8i\3108\317\233\212\4\347s]\256"
- #"\323\236\334\317y\337\223\234\363|\237u"
- #"\177\357\205\234\t\334@y\35C~\30\356G%\3\261Q\343\246\23cILy"
- #"\312\344^{\v\235!\374\3276\351\31\311l86\222G\361\341\304'=|\311"
- #"\211\327\363\322\27\230T\311\2374\230\235"
- #"\235\305\341\323\233q\337\372%\362\244x"
- #"a'^\200\276\23\352\362 &\24\363\312\325%\371g\1\264\e\240K\\L\f"
- #"\345K\251\303L\272{\227J\215\e\223"
- #"\232\2472ai\362\325\212\25\244%%\225\31\247^UD&&\262\360\342E6"
- #"\5\0051\332\314\214\331ff\5n\260\277\r\304f"
- #"d\32020\220{e\310\35\240 \336\373=\20C"
-) 500
-(
- #"]+\236\247?\20\216\177\23n\27424hh\372)\1\217=\212\214\213\315\362"
- #"f\211OMd\232Y,\35\27\216E%;n\336=)|_C;\257\344\231"
- #"<\222\r\307F2ks}\3416O\236\337c\301\236.LZ\243\332\260QG"
- #";g\366Q\276\\\305|N\274\307/\255c\220\363\324|m444\351\375\321"
- #"\330\334Y\207\250\23/\300\2765!\222"
- #"\315\27\225\244\247\247\227\232x\0T\250"
- #"\\\231\2642d_1\325\331\271L9\365\252\302J_\37\367\217>\"d\364h"
- #"00\240\306\215\e\374-p\3347/%i\216(\305gkAL\f\367\337\260"
- #"\37[qP\v\210\216\25\317\323\"\205"
- #"\343\337\224\eo\323*#\271\371\370w"
- #"\262\25/\177\330\322\263\344\204&\355\340"
- #"HT\37<\374{\360\315\3003\f\357\262\6\23}+\68\376\214\247\3677\302"
- #"b\240\243\245G\317\22639\37\350A"
- #"\364\323`\3416\251\351r\202\356\377M"
- #"B\222\230\37\230\f\31O\237\337\a\3765l\214x\232\263qnR\304\322Tq"
- #"\234xEyu\e9!1\226r\202G8K\f==\312\351\350\360(!\241"
- #"t\357\343\5f5j #g\3\373m\302J_\37\367\236=\371\333\311\t\247"
- #"\220\20\364|}Y\367\350\21r\25\276U%i\216\b\322|\266\274^\370f\225"
- #"u\336{\0011\320\261B\236.. \317\323#Q\240`\177\310\300\22mc\242"
- #"W\27\r\2316K\257\346\234$IQDr\356\251\e\313\375\314\bK\362\244M"
- #"#WVM\210yi\257\243\256U;4d\232\302b\0\260\363\354\227\0T("
- #"WQ\270\315W\3\376\342#\373I\230\32\325\24n\223\327\211\367V\364)V\35"
- #"\34\304\306\237\317SZ\353\247\257^w\307\37?3u\222\330\241"
- #"\205\22CC\203\251\256\256,8p\240t\357C\211\246&\347\277\372"
-) 500
-(
- #"\212\201^^\234\276\177\277D.\21\231"
- #"\230\210\333\337\177c\261a\303k\217w\254[\27s}}R\263\263Y\22\e\213"
- #"\331\265k\270\335\277_\250\273oI\232#\2\254\256Y\23cMM\316\n\314\212"
- #"n\v\346\257\2246\357\310NS\361\371"
- #"\373\376W\244d\306\t\307\377~\263\23"
- #"\317R\303\310\337\5\275\3366\0\rL\ap)z)G\"\373\20\34\375'\355"
- #"\e\217b\361\330\320\"s:&:\357"
- #"\342\327\343\243\205\257\261l\334\35I\367"
- #"\4\377:\361\16\353\354.\271m\344\223\e,\335\327\233\25s\216cg]v\22"
- #"\ew\36X\317\275Pi\376f%\301\324)S\250\331\266-KG\214(\355["
- #"\1\300\276I\23v\216\32E\217\265k\2710p \215U\344>D&&\262\360"
- #"\352U\366\206\206\0223N\265\253@'"
- #"OOB%\214\266\245\306\233\352\351\321\240R%\36%'\363w\307\216,\274t"
- #"\211\272\1\1t56\306\265bE\234\215\2151x\221\364x\264n\335\\sD"
- #"\21\354\364\364\230ge\305\0\301\343\277\tYYt52\222f\246X\306y\357"
- #"g \3454+\222*A@r\354\322'\26\303b]Z\233\250\24o\374\37\257"
- #"\247\234\266>m\32\273\262z\342C\206"
- #"u\316\237\323\361*\266V\216,\32S\372\35aA$\245>c\371\341^|\375"
- #"\371\306\334SWe\201\264L9\240\240\212\240\215EIbV?g\371Q^J"
- #"\216\300\5R\2712\272\332\332|r\344\b\t*6u;yz\262\352\372u\36"
- #"&\211\355\367\365\250U\213\6\225*Q"
- #"S\260\6\372\374v\3550\326\325\25\212"
- #"\277\361\3701\261\311\311\34\356\325\213+\203\acea\201{\237><\0343\6"
- #"\327\332\265\361\214\213\243\352\365\353\271V\361JsD\21g]\200K"
- #"\211\211\264\226PK^m\246\370\16\322\245\346b\2644\304\234=!"
-) 500
-(
- #"g\317\244[-w&9\210\217\334\245"
- #"\264I\325\210\344|\274\e\333\377\351\316"
- #",\327\343l\234*\247M\275\301\224\323y\273\353C+P\260\345\314\bZ4\351"
- #"D\267\17\a\225\366\355\274\304\345\300\375"
- #"\364t\352Y\332\267\221\203\246&=\333"
- #"\264\341\320\325\253%\362\362\n\205\202Z\23&`2\\\254 \232wp0N?"
- #"\375\304\263\344d\34k\324`\314\251S"
- #"\205\306\246dfb\240\243C\307j\325\204:x\257;w8v\347\16\227\6\r"
- #"\342\316h\325\263\346,\205\202\37/_"
- #"fu\247NB\361[\203\202\370\324\316._\342\244A\205\n\fn\333\226\3\203"
- #"\6\361G\353\326t\273}\e\267\a\17\330\366\344\211\2609bxZ\32\3322\31"
- #"\325%\b\202:\23\375\35\244\206Q\a"
- #"f\177 -\263\374u\222\241\220\23\222"
- #"\264\203C\367\373\260\340r9\226_\254\215v9X<6\244L\272\346\26\27\357"
- #"\220U<\225\337g\366g\5{5\225&\247}<\351\337\367\223\322\276\215\\\\"
- #"\373\366\305\363\322%\341xQ#\305\210"
- #"\330X:}\377=I\251\251\304\t\314\20\274\203\203\31\260t)?\f\34H="
- #"++VM\235J\320\323\247\254*\340\224R\266B\301`//\354\253T\341\257"
- #"~\375Tv\360\261\311\311\214;u\212"
- #"\355NN\350\vfg\377\26\30\210\201"
- #"\216\16\203T\370\203\1ddg\263\375\326-F\26U\323CG\a\307\26-\270"
- #"=t(\351::\234|\376\234\241\341\341\364\t\vc\307\323\247En\272_L"
- #"L\344\3\t\263\17x7\315\24\337{\1\221\272/\361\272\320\322\205D\3o\26"
- #"^4\"4q'\355\232\272\262v\322c~\233\226*\264T\3656q7\316\233"
- #"\215\207\2460\373\363u\350h\227\362I\247W\220i\300_\347N\321"
- #"\243\0\233\221\322\342;ww\216\371"
- #"\373\253\214\223\247\244\260\303\333\273@"
-) 500
-(
- #"g\335\274(\24\nV\37?N\233o\276\301\265M\e\2\226.\305VE\2\344"
- #"\251\200\0\6-[\306\321\257\276b\352\307\37\23\264|9\25\f\f\3301u*"
- #"\223\377\376\233\223\367^>\31\367\355\205"
- #"\v\304\245\245\261\246sg\225\367\255\0F\2368\301\330F\215h!h7\2424"
- #"S\\\321\241C\276\23t\5\341u\347"
- #"\16\326FF\324\255\250\372p\210\225\211"
- #"\t\355\352\325\243_\235:<\0312$gy+!\1#??N\26\262\341}"
- #"Q.\347\3\211Y\357j3\305w\222"
- #"\222u\177\225\1\332z\200\216\234\320\370"
- #"#\374\23\343\311\315\a\307P(\262\321"
- #"\220i\362\355\240se\326b\375u\20"
- #"\372\370\24k\17\217\300c\211o\231\3324W\242\253\247 --\r\203\377XD"
- #"\251(\3527k\306\206\325\253i\327&\277\333AVV\26\21w\356p3(\210"
- #"\340[\267\270\31\30\310\355\320\302\vj"
- #"\311SR8\342\353\213\347\305\213\234\r"
- #"\f\244}\203\6\205\32)\2\334\212\212"
- #"b\344\352\325\230\31\31q}\361b\314_\330\217\337*BpN\5\0040b\325"
- #"*\16\317\236\215\275\265\365K?kR"
- #"\257\36\276s\347\342\262h\21[\273u"
- #"\243s\365\352\374\36\34\314\356\220\20."
- #"\r\34\210\266\200\31\345\372\200\0\22233\371\266U+\225\261J^2S\24`"
- #"kP\20\303\353\213\35g\a\360\f\taH\275z\30\230\2322\330\324\224\301m"
- #"\333\342}\367.]\17\35\"K\241@"
- #"&\223\341T\261b\316\306\273\221\21\27\23\23\31\2546ST\v\310j\177\e&"
- #"\332\207\v\307\257\275V\217qM\256\243"
- #"\251\241[hL&r\356\245\35\341\3263O\376\271\177\214\314\2544\2645ui"
- #"l\335\203\326\r]\231\330\313\243\310"
- #"=\215\257\2674a\316\340\363\302\373\36s<\2323\243"
- #"\237Wn\206\267*\346no\303\204\217\267S\331\250\226"
-) 500
-(
- #"P<\344\230#N\351\275\37S\303\32B\361\337mkI\227\226#9p\376'"
- #"\226|sX\245x\f\233\356\300\260O"
- #"f\321\245\255\230#\0\300\310/[\321"
- #"\263\343p\372v\377\\\310\6~\310\264fXT\251I\2276\2568\266p\246\274"
- #"\236\1\345*\24>\3m\331\256\35I"
- #"\311\311\324\251]\233:66\324\266\261"
- #"\341\373\37\177,\324Y\327\246~}\""
- #"\356\24\274\3175t\324(\356\24\260\314"
- #"\364a\227.$''S\317\316\216\206\r\32\340\332\267/\327\3\2\b.dI"
- #"\352\243y\363\260\250X\21\327\326\255\361"
- #"ps\303@Ee\276\341\356\356\f\357"
- #"\330\221\317\273v\25\266\312\237\263k\27"
- #"\273\246M\313'\36J\354\e4\340\360\314\231\271\"\262\362\3325v;9a*"
- #"X%p\373\255[\374\326\265\253JS"
- #"\307\274\234\217\212b{\217\36\302\361\221r9\375\5\nZ)\211MN\246G\315"
- #"\232/=\347X\263&)S\246\0 \227\3139r\3736\236\21\21\214\212\210 "
- #"-;\233N\301\3018\231\230\340jl\374\322i\256\302\220j\246X_\360\367Y"
- #"\232\274\367V&2\231\214\377\265\21\377"
- #"\25l\nhN\17\353\265X\352\267x\351\371L\344<H;B\3203On\334"
- #"=LS\233\217ie7\0{\eg~\336\335\231A\35\27cg%Voz"
- #"\345\241~8\324\351M\333\372C\204\342"
- #"\367\234\373\212\214\2544>\355\270T("
- #"\336\353\352\22\256\205\37\341\353\201\177#"
- #"\23\234\201\35\2700\227\a\217\377ar"
- #"/\261\232\335'\377Y\304\266\23\263\370"
- #"y\246'\235Z\367U\31\37v\357\37\246\317w\341\303\26.|1z\31\32\2"
- #"6)O\342bX\260\3563\236\305?"
- #"b\316\344\337\250Y\265\350\265\361\344"
- #"\249\336W\217p\352\202'\376\201g\261o\320\236\373"
- #"1\201D=\274GZ\1\311{y\255\326\303\302\303\t\r"
-) 500
-(
- #"\vc\311\212\25\200\270\221\"\24=\3)\f=cc\356\255YC\25\211\216\257"
- #"o\22o\177\177z.^\214W\357\336"
- #"\264\253\372\356,\271\212\"OI\341\310\315\233x\206\206r\370\321#>61a"
- #"\300\213\31\212*1\21F\355\205U\266\221* ^\341\343\2614nJ\343\352\316"
- #"x\337]\310\305\360\rdf\247\347\314"
- #"0j\365\240\245\235+\3666\316/\315\36\266\235\236BE}K>n5K\350"
- #"\32\227n\355\346b\360\16\276\350sH(>1\345)_n\256\307O\303\257S"
- #"Q_\265\271_\266\"\213\357\266\265\244"
- #"\273\303T\3326\30*t\215\364\314\24fm\252\307x\247\255\330U+\332\e)"
- #"\374\351)V\37\34A\307\326\237p="
- #"\310\233\215\363\317\243WN\365zq\374"
- #"\363'\314\376\245\37\345t\313\363\323\364"
- #"]T(\257\372$\217B\241`\357\3615l\332\363\3\203\235\277`\267\227\273J"
- #"\363E\370WL\276]\366)FFF\304\vf\23\227\224\221\342\253|5y2"
- #"i\261\261,\0356\254\304\256\361:\360\17\f|i9\353}%\257\230\34{\374"
- #"\230\264\354ltd2\306\231\2311\333\334\274\370\236\\j\1)\333\24& \17"
- #"\236{\263=\250+\231\331\251\271\317ijh\243Pd\223\255\310BKS\227\216"
- #"M\306\342\334j\266\312\r\357K\267vq1x\27_\3649(tO\351\31\311"
- #"LYW\215%\343\"(\257+6\2\225:\v\271\363\320\227\305\373z\262`T"
- #" \6zbk\271\27\202\266\343uu1\363\206\371\242!+x\204\245\24\17\345"
- #"\262\325Ok\306\222 \177\312\202/\367"
- #"\n\315*R\323\222\231\347>\222{Q\267IKOa\343|o\241\32\351Q\261"
- #"\21L\236\333\215\a1a\222\314\27[}\242\301\241\275{qv"
- #"r\22\212\177S\304\6\5Q\363\203\17H)#\306\212E\341\377\317"
-) 500
-(
- #"?\270,Y\362\336\211Hlr2\315\267o'h\370p\f^\25\210\324T\""
- #"\37?f\341\365\353l|\261\344\245%"
- #"\223\221\371Jw[NC\203\223\266\266"
- #"\371\nb\275-f\212j\1\221\311\320\324\320&+\373_\317)M\rm4d"
- #"\232|\351z\22\273j\355\220\311@\371"
- #"[\272\23\353\307\246\343c\370q\270X"
- #"\21#\200'\317\357\361\335\266\226\254\236"
- #"\30+\334F\3522\226\324Y\b\300\266\323\223I\313HfL\367_\205\342\25("
- #"\370q\347\207|\330p\4\355\e\25|Ls\330bM\326\314;\205C\303\216\0"
- #"\244\245\2470\376\233\366\324\254V\217\240"
- #"\320\253\354q\17R}\35\205\202\236\243"
- #"\253\362$.F\222\30\364\233h\313\375"
- #"\350\20IN\274-\373\310P\224\245\244=%II\310LMQ\354\25[2,"
- #"m\274}}\351\260p!)nn\350\274\256\345\233\327\200wT\24\237\36;\306"
- #"\3751cT\306\306&'\343\260};\376\237~*da?\343\3349\226\370\371"
- #"\261\303\311\211A\266\266*\357\303\345\320"
- #"!\342\323\322\230\321\240\1\213\352\327\207"
- #"\304D\274cb\350\32\20@\226BAF\236\256X\3\310&\347\273P\226y\357"
- #"7\321\1\266L/\332<-\357\337\260"
- #"\232i#\36\306\205\222\221\231\212\266\226"
- #"\330\221TS\303\32hjh\363(>\202*\306\5oL\276JK[W.\6"
- #"\357\20\26\20}\275Jth4\32\257\253\213\205g!}\333\315c\366\346\6\254"
- #"\375c\b\201\367N\263jBL\221\3612d\fp\374\231\225\207\373\341uu\t"
- #"\vG\375+\6\n\231\202\vak\320\321\326\315\25\17\0]\35=\26}u\220"
- #"\201\223\e O\22\263\240\220\311dl"
- #"Yt\5\217\375\v\271t\355\204\260\200\354]}[(.\347\275\300\315"
- #"\210s\350\225\325\215J==\364tt8\177\353\26\355\352\325{\371C"
-) 500
-(
- #"X\6ql\336\34]MM~\275y\223\317\2334)\261\263\215R\4\301;*"
- #"\n\247\3\aH\24t\313]\344\353KTb\"\213|}Y\364\241\352\375\312?"
- #"^\34\230\360\f\tQ) \303\216\37'\376\305l\342B\\\34XY\1\340h"
- #"gGJ\307\216\371\342m\267l!$N\334!\243\264P\347\201HDKS\a"
- #"K\23;\36<\371GR;\e\313V\204E_\24\216\267\267q&$\362<\311"
- #"i\342\316\254-m]9}}\255\220\315:@y]c\264\265\312\341\27zP"
- #"\330Y\267 \303\306\307\211\267X\270\277"
- #"\r\301\221'9\270>\"_\233\312&"
- #"\226,\371\372\260\312M\356\274T\251d"
- #"\305\214\261\356\354X^2v\342\317\22"
- #"b\2314\307\211?\217\36-\221\327\377"
- #"\317hhpb\323&\272\377\370#\217\336\22g\326\360\225+9\21\25E\233]"
- #"\273\270\365LuIf\251F\212JAx h^8\342\304\ta\361\08\22"
- #"\221\363\331\275\20S\364@JI[KKZ\231\233\23!\340\236|g\364h\16"
- #"\272\270\340lm\215\317\200\1*\343o\227\21/4U\250\5D\"\317\3449\316"
- #"\275\277xv\223\324&%-\1\217\323n\302mf\375\326\200\304\324gL\333 "
- #"~\324v\365\221\201dd\246\n\213\1"
- #"\300\270\36[\204\217w*\231\350\274\v"
- #"\363\212uP\310\24\\\274\273\232o~kA\317NC\371e\366\1*\31\233\27"
- #"\330\246i}G\366\254\22w\t.i<O\315\307\355\363\t\222NF\275i\34"
- #"\373\365\303\255O\237\262\343\316\253\2\213"
- #"*U\230\376\351\247\334NH\240\305\216\35\254\t\b(2MW\252o\326\260\343"
- #"\307I\314\310\240\272`\316\316\321\336\275"
- #"\321\325\324\24\366\331\26231a\227\223\223P\a\17\340\e\e\313\232"
- #"\316\235\271>Dl\225 &)\tK\211\331\353e\35\265\200\0003"
-) 500
-(
- #"\177-z\372\231\227\237v\265\347QB"
- #"\4I\251\342\323\313\237ww\"\350\376\337\222\332|\346\344A9\35}Im\212"
- #"c\263nk\345\310\214\276^XV\252'\251\315\227\203\16\263\360@\en\336;"
- #"\311\376\265\241\364\3531A\262\20\225\26"
- #"\232Z\360\373\336\r|1Y\\\320K"
- #"\213\251s\346\260\366\304\211R\273\276w"
- #"p0\325\306\217\27\212\315V(\350\273"
- #"h\21q\311\311\204,[\306\211\310H\332\354\336]\350lD\2121\"\300A\27"
- #"\27\252\31\30\b\371`AN\a\357lm-\34\177)&\206\326\202'\353R2"
- #"3\t\213\217\247a\245JB\361\220# \26\357X\315v\265\200\0-lU\347"
- #")(\31\327c\313K\e\356\"|5\340/\2724\233P\254\216\335\274b\35\341"
- #"6J\233u\251\26\355\266V\216/\355g\250\342n\2347\377\333\2343\353XT"
- #"\304\254\243\254b\\%\213\324\324\3242"
- #"\341\276\253\n\263\2325I}\215U\nwx{c%`\263\16\360\370\371s\\"
- #"\26, \362\351S\241\370U\307\216Q\265R%\352YYaan\316\301\37~"
- #"`H\333\266\264\330\261#_Q*\251\306\210P\2709bax\206\204\340*\230"
- #"L\30\36\37\217\266\206\206\360\354\346\237'O\250gb\"\351\300@tb\242Z"
- #"@\3365,Ll\351\356\220\277\254j"
- #"a\274\351\216\275\254Y\263\337\215\363\346"
- #"\347\355=Y>\347\30\375\272\277=\263"
- #"\216\274\204E\237-\273\233\347\5\240W"
- #"\256\34\347\213\2607\21!3+\213\351[\267\362\351\212\25D\t\354Odfe"
- #"1`\351R:5lH\275\27\e\276E\21\24\31\311\217{\367rh\326,\202"
- #"\226/\a@\246\241\301\304\1\3\360\2329\23\247\203\a_\22\21)\306\210 h"
- #"\216\230\207\204\2644|\242\243\371\270\220l\372W"
- #"\271\30\23\303\a\26b{\207\2203\273q\20\364"
-) 500
-(
- #"\361R\22\223\224\204\245Z@\336-~\31}K\330\2DIY\354\330K\32-"
- #"\35x\254x!\36\337z\321\254\f\325"
- #"\363\220\202\206\26\364\32\350\304\237\177\374"
- #"Q\332\267\"\314\211\303\207\371h\316\234"
- #"|\317\237\v\n\302d\370p\254'L(\262\375\23\271\234\356?\376H\300\275{"
- #"\34\2345KH\20\246l\336\214\236\216\16\2363f\344\nBadeg3z"
- #"\315\32~\0304\210\32\5\314\352\34\355"
- #"\355\371c\332\264\\\21\221j\214\b\322"
- #"\314\21\1\16GD\320\251Z5\312k\211\0354\225* ~\261\2618\b\372r"
- #")\211~\a\367@\324\307x\325\24\211v9\250R\23\2\357\237\342\347u#X"
- #"\367\343\31\354\254\355K\255\24\355\177\305"
- #"\310$\213\324\2644\332\265n]\332\267"
- #"\2@FF\6\201\301\301\370\371\373\343"
- #"w\355\32\333w\355\242\222\211\t\21\301\377\368ptt\314]\306z*\227\343"
- #"q\366,\e_\324\345036f\343\347\237\27\372\372\227BBp]\262\204I"
- #"=z\360e\257^\310d2z\265hQh<\300\257\247O\363\347\215\e\\Y"
- #"\270Ph\271h\331\321\243\30\225/\317\270.]\n\215ql\336\2343\337}\207"
- #"\313/\277\340ha\301G5j\b\e#B\361\315\21E\271\30\23\303`\301\331"
- #"\20\200\337\243GLl\332T8\36\324KX\357$\3237\332H\212\237\371k]"
- #"\262\25\342u\223\213\323f\326\246zdf\211g\240~\275\245\t\251\351bG\e"
- #"!\307|\361y\362\243\242\203d\20\223"
- #"\352\315\260\5zt\32-c\362\274n\314\36\277V\330Qw\314Wm\211|("
- #"nR9zv\e\256\a\237\27\216\a\0306\2439'\274\3053\265G\317n\303"
- #"\306\335\337S\256\234X\376N\223\226-\31:j\24\336>>B\361"
- #"6\365\353#\323\323\313\367\317\272\210\216\254C\327\256|6i\22\376"
-) 500
-(
- #"\327\257\323\334\336\236\252\226\226xl\332"
- #"\224/\256\234\256.\217\22\23\351\361\323O\370GD\260~\374x\202\226/'x"
- #"\305\n\332\25\321\361M\372\365W~\31:\224Y\275{\v/7\256\377\363O\366"
- #"L\237NE\301\316\356\300\345\313\254\36"
- #"3F\345\353\333\333\332\262s\306\f\366"
- #"\334\276\315\266\240 \364V\256\344|t"
- #"\264\3205^\2079\242*\244\b\232\206LF\3\t\e\350\0U\312\227\27JP"
- #"TR_\342\353\227\6\352Lt\231\214"
- #"m3\305\177\5\223\326\230\363\323\360\353"
- #"\30U\20\3378v[c\311\274a\276\302\31\342s<\2323\242\353Z\254\315\213"
- #"\36)*y\335\346\213\332\272\20\223u"
- #"\212\371\353\377\265$Y\275\355+22\323\230:R,Iq\377\211u\34\375k"
- #"+\277\376|\36\r\r\325\e\215\267\"\374\231>\337\205\357'o\245Ec\3255"
- #"%\0\356E\335f\346\202>4\253\357"
- #"\310\214\261\356hk\25\3557\364<\361"
- #"\31\323\27u\342\301\203\373xl\332DO\25\356\256O\237=\303c\373v6n"
- #"\336\f\344d\5o\\\263F\322\321\337\342\30)\26\304W\263g\223v\347N\231"
- #"\367\306\222\202\377\355\333\270,\\\310\326"
- #"\356\335\351\374\36\2321\n\261T\354\373VZ\274\3673\20\251\30\2267#!I"
- #"\334\222\4\240\242\276%\361\211b#-"
- #"\200\232\346\16\334y\350+\34\337\322\326"
- #"\225+\267=\205\343\235Z\314\300'\350w\342^\275'\31`\30\311>?7\276"
- #"Z\332\213\237f\354\312\235q\f\351="
- #"\203cg~\347\3613\261\367\321\247\353"
- #"x*\2247d\347\221\242\327\317\225\330Y\333\263\344\353\303|\277r8W\3N"
- #"\v\265\251Q\325\226\337\26^\342Y\302"
- #"#&|\333\211\247\361E\347\277\350\ei\21\26\26\306\306\265k\371\362"
- #"\233o\250ik\313\371\v\27\n\215\257db\302\27nn\4]\273\306:"
-) 500
-(
- #"wwbcc\31&xbHI\320\265k\257%\327d\352\264il\370\363\317"
- #"\262U+\375?bok\313\316\2313q9x\20\2673g\210J.\275\312\240"
- #"e\ryz:5\v\230\211\2265\324\2\"\21\243\nf$$K\23\20c}"
- #"\213\374\235u\21\3242s\340\316C?\341x\251Y\353ymO\224\3103\"9"
- #"x\303\2151?\324E&\203}\253Ch\232g\243\334\310\240\22.]F\263\375"
- #"\320\342\202^2\0372\231\214\257'l\300c\377B\356<\20;\"\\\34\21\251"
- #"P\336\220\0053=\251T\321\234AS\32\25\271\fv)`?=\272u\345\223"
- #"^\275\270~\3712\317\237?\27\26\204\17\333\265\343YL\314K{\23o\22\263"
- #"*U\350^\202\265\322K\v\307z\365"
- #"\270\355\356\16\246\246\324\331\264\t\267\263"
- #"g\211JL,\355\333\22\302;*\212\252\e7\"O/\332\n\tr\226\324,"
- #"7l\310w\234\2710\16\206\207s\257"
- #"\220j\210e\t\265\200H\304\250\274\231\244Lo\0c}K\342\223\304\354\21 "
- #"g\6r7V\\@t\264\313S\257zG\256\205\37\21n\243\234\205<x\352"
- #"\307>_7&\255\250\1\32Y\354_\23\312\214\261\356T\256\224\177IA\352,"
- #"\304\242r\r\306\17\236\307\17\253F\223"
- #"\235-\266\adgm\317\224\21\213\231\361s/z\214\24;\25\243\251\251Ep"
- #"\270\37\361\317\237\360\335\362\302\355\351\377"
- #"<\267\27\327\27699?\332\332\332\245"
- #"*\b\305\301\365\223O$\325J\177["
- #"\260\252T\t\367\361\343\tY\265\n\364"
- #"\365\251\376\353\257L\370\373\357\377,$R:xe\274\345\206\r<\22\230\t)"
- #"mU\242\23\239ZH\21\261\274,\362\365%&)\211\376\177\374!$\"\236"
- #"!o\307)O\265\200H\304\250\202\271\344%"
- #",\343\n\26\304'\212\vH^\303FQ\244,"
-) 500
-(
- #"c\245\246\313\t\214<\201\241AE\346l\375\0\35=8\272\361>\263\306\255)"
- #"P8\224\30\31T\342#\307\201L\373\351c\341\316\275w\327q\310d2>\231"
- #" \2367\263n\373\377HIM\"=S\374 \301\241\365w\270r@\301\241\365"
- #"/\177\231\225\333\272\301\367\316q\356\302"
- #"\3312U\373\\*N}\373\362W@\0\347\225\325\n\337\302\34\234\242\26025"
- #"\305}\362d\356\255\\\211f\371\362\324"
- #"\375\3557\372\34>\314\216[\267\220\247"
- #"\247\23\233\234\214\332Ye\345\0\0 \0IDAT\325\306\215%\322\301+\343"
- #"c\222\222X\344\253z\371x\354\311\2239N\3362\231Pg\257\364\331\212IJ"
- #"b\342_\177\251\214\17x\362DeLY@- \0221\252`\306\363b,a"
- #"I\331\3)\216a\243\3502V\370#o&\257\267\344\237hO\\\272\fGC"
- #"C\213\323\27\366bZ\204p\344\305\307"
- #"\367\17nG\\S\271\337\240DC\246\301\223\270\30a'^\200\375k\303\270r"
- #"@\301\351m\252\23\336T\241\0b\236\2042\351\333\2179v\350P\211\326>/"
- #"i\f\214\215\361\332\274\31\247\237~\""
- #"\374\341\3032\357\320\253\n\357\340`\252"
- #"\27P\313\335\312\302\2\367i\323x\270"
- #"~=\256-[\342\31\32J\325\215\e\231z\346L\256[\256*\306\236<\211\2"
- #"\320\326\320\20\352\340\225>[ f\246"
- #"xu\360`:U\253\206\215\261\261\220"
- #"\231\242\322\34Q\361\305\27\334\30\252\272"
- #"\210\333]\211{m\245\205Z@$bT\334Mt\tKX\0\325\2534\305\343"
- #"\224\e_n\22;\233\236\230\372\f}\275J\5\36K\326\320\204t\235H\16\\"
- #"wc\301\256\356\254\230s\214E_\35\340\350_[H\317H\25\26\3\200\357&"
- #"o\241|9i\311P\207\326\337y-bP\34"
- #"\262\263\263\370q\355P~\231?\277L\e'\212"
-) 500
-(
- #"\342\330\247\17\277L\234\310\220\225+\311"
- #"\312\316.\355\333y\211\302\4\2410\206"
- #"\256\\\311\203\"F\332\6FF\f\356\333\227\3s\347\362\307\250Q\354~!\4"
- #"g\"#U\276\366\325\301\203iciI\335\212\25\205\335rG5h\300\206."
- #"]\204\314\24\rtt\220\247\247\263\252cGa3\305w\21\265\200HDW\273"
- #"\0027\356\34\23\356\330\1v\374=\203k\341G%\2316\206F\371\20\36s\231"
- #"\252\225\304\222\247~\336\335\211\207q\241"
- #"$\246\344\370\26\245g\311\271\26\271\203"
- #"\r\177\365a\304\342r|\366Km\264\264_\336\34_\373\303_\364w\232\204E"
- #"\225\232\302\367\325\264\276#\313\277\365\242"
- #"\232\205\370\222Tir\344\374\22*\232"
- #"\0302\376-\31\321\2110~\316\34\f\365\365Y^\302V\364\257[\20^\245\262"
- #"\241!\265Dr/tuq\354\322\205.\215\32\321\255~}\376y\362\4\335\225"
- #"+\351s\364(;n\337.p\217\303@G\207G\311\311xt\357.\334\301\373"
- #"=z$\311\236$\340\311\23\232J\314F\177\327Pg\242\3C\27\311\250lT"
- #"\213\245\343\362\327\262x\25O\357oH"
- #"Ly\212\235\225\352\2023J\354k;\343uu\t\366\265]\204\3334\265\351I"
- #"\364\263[\264\264u\25\212\237=\3404"
- #"\353\275\206r\353\3019\206.\222\241\243"
- #"\255Kk\373\36t\375\320\225\37\246{"
- #"P^/\377\322\215\262\346\306\214\261\356"
- #"\302\367\59\"\262oM\331\337\344\323"
- #"\326Q\260d\355w\334\364\363{+=\273\nC\246\255\315\3525kh\344\350\310"
- #"t\27\361\317\224T\206\254X!,\b\231YYdegc+\350f{\343\356"
- #"]b\23\22\270\273v\255\360\375\334\270w\217\253\v\27R\335\324\24yb\"G"
- #"\316\235\303\363\342EF\2358\201\2\30\327\250\21"
- #"\263[\264\240\252\276\276d\267\\\251\361\321\211\211h"
-) 500
-(
- #"ihP\371-\362T+\t\324\2B\316&\367gN\36B\261R;v\0\247"
- #"\0263\361\r=H\317\2263%\265\361"
- #"\v;D3\233\217\213\214\323\320\204\270\314[l<5\222\312\346f,\375>\232"
- #"J\25\337.w\334\222\342\301\363\263\310d2l\4\r\365\336&j7i\202L"
- #"S\223\363!!\264\23\314\320\2565a\2\tII<\333\272Uell|<"
- #")\351\351B\276Y\0\236\27/R\307\302\202\277\276\377^(~\353\2313|\352"
- #"\350(\354\254\e\376\360!\332\232\232T75\5\300@_\237\301NN\fvr"
- #"\202\254,\236\334\277\317*//\232\374"
- #"\376;N\326\326\364\252UK\222[\256"
- #"Tw\335\eO\236\320\370\305\275\274\317"
- #"\274\367\2bY\251\36\243\273n\240\256"
- #"\225\2309\240h\307\236\27\243\nf,"
- #"\31\e&\351\276\214*\230\261x\314\277\16\2542\31\240#'\340\376\21.\6z"
- #"\342\355w\360\305\3632\264\265t\230:r)}\273\177\236;\322\226A\201~U"
- #"\205=\377\266\363\352\373z*\17\341\323"
- #"\211.o\225i\242T\264\264\264h\377"
- #"\3157\204\270\273cc\236g\320 \223\345\333`\367\16\16&-#\3sA3"
- #"\302\5\a\0172\246K\27\346\17\36,"
- #"\24\357\356\345\305\314^\275\204b3\262"
- #"\262\330\356\355\215\367\17?\b\305\3\\"
- #"\f\t\341\203\302\204RS\23\323Z\265"
- #"\370~\342D\306\270\272\262p\317\36\6"
- #"zy\221\231\235\215l\3312\0>\266"
- #"\266f\220\255-\316\326\326\30\350\344w"
- #",\220\352\256\e\360\3701M\336\202r\0%\315{/ R\352`@\376\216\275"
- #"$\321\320\204\n&\20\231\340\315\264_\272\2\n\225\313RJ\n\23\211wQ<"
- #"\340\345\367\245\245\223\311\367\356CY4\177~\2311MTEdT\24"
- #"\215\2337\307\330\330XenJRR\22\23\247NEOO\217q\203\a"
-) 500
-(
- #"3d\345J\316\377\370#\232\32/\2664_\21\217S\1\1\214X\265\212\243_"
- #"}\205\275\300l,\352\3313\266\237;"
- #"G\360\212\25B\367~%,\214\207\361"
- #"\361\270\2500iT\342\345\357\217\265\231"
- #"\31u\5\227\273\0.\336\276]\270\200\344\301\252J\25\334'M\"YC\203\17"
- #"\352\326el\227.\310\223\2239r\376|\316r\327\311\223\310\24\nN\16\30@"
- #"\273<\202\341\27\e+\311\2157\340\311"
- #"\23\311^[\357\"\357\275\200\2245\342\223#9~m!'\256l 33g"
- #"sPG\273\34\253\346\236|)3\\M\301hh\301\t\337\305\30\e\0311\256"
- #"\2247\316E|\260\"\243\242X\270d"
- #"\t\333v\354\240\262\251)\277\251\250\17"
- #"~\371\352U\6\16\35\212\313\307\37s"
- #"?4\24\35\35\35\272w\351\302\362c\307\230\336\263g\276x\245x\34\236=["
- #"H<\0\26\37>\314\230.]\250$x\344y\325\261c|\336\255\333\277\2\246"
- #"\202\255g\3160\274C\a\241X%\27"
- #"CB\30\354\350(\34\357\27\21\301\304"
- #"\356\335\0010(_\236\301]\2732\370E\16\220w` \37\375\370c\256\303\261"
- #"\216\246&\206::\302\305\247\0n<~\314lA\301|\227y\357Oa\225\226"
- #"\eoj\206\234+a;X\345\325\207a\2135\31\272H\306\320E2\246m\250"
- #"\315\271\200\355\354]u\213+\a\24\\"
- #"9\240\340\374\236\224\"\305\243\377\244z"
- #"\244\245\213{$\r\232\322\210\347\211\322"
- #"\216\325~\372ES\342\237\213\237\260\0316\2439q\t*\34\177\3630|f\v"
- #"nG\\\223tO\303\246;\20v7\340\337'd\360$\343o\346/\236\317\352"
- #"\25\313\363m\2347tp\300m\3324\242\4\35`\233\267iC\307n\335\230\373"
- #"\323Ol\331\266\215\372\315\232\25\31\377\252\eo"
- #"\360\255[*\255Rz\273\346\354\245\5\372\373\23z"
-) 500
-(
- #"\363\246\312\243\306\223\246N\345\373\377\375"
- #"\217\25\213\27\243\253\253\213L&c\365"
- #"\206\r\314\335\275\233\363\267o\347\213\237"
- #"\263k\27\273\246M\23\26\17\0\337\260"
- #"0\246\26 F\205\21\22\35\315\310N\235\204\343#\237>\245\1771\216TKy"
- #"\17\0322\31\r\252U+\360g\216\r\32\220\262s'\212\275{Q\354\336M\370"
- #"\17? \323\320\240\367\341\303\310\226-"
- #"C\266l\31\232\313\227\323+O\22\343\253hkh`+\270\34\250D\252\273\256"
- #"\332\215\367-\240\244\335x\237%F\362"
- #"\345\257vde\247\223\231\225\201\246\246"
- #"6YY\319\247\244\232\365\240s[W>l\351L\371r\377\216\366\206\315h"
- #"\316\354\317\326R\277\266\330\bg\304\314"
- #"\226L\31\261\230f\r\304N\206\375o"
- #"\311 \32\331\265f@\317\311B\361\0"
- #"\363\327\214\303\314\264\32\243\373\177+\24"
- #"/\325\275\367\314\245\3,\3328\211-\213\256R\331Dli\343\350_[\330\354"
- #"\371#\36K\374\320/o\304\335\270\23"
- #"|\361\277Q\34\336\267\17\373\2j5"
- #"\0244\332/\252\303NMM\345\362\325"
- #"\253\2349w\216\345\356\356\310d2\236"
- #"\t$\231\225\6\376\376\376\270\364\352\305"
- #"\326I\223\350\334\260ai\337\316\333\211"
- #"B\1\251\251\220\234\214<>\236#\276"
- #"\276x\336\270\301\261\360p\322\262\262\320"
- #"\326\320 #;\e\35M\315\227N|\225\4\362\364t\32m\333\306]\201\34\226"
- #"\322D- \22\5\344\353-M\370\314e#\n\315\24nE\236\341f\304\31\2"
- #"\303/\242\310\316&3+\3-M\355\227\36\265\265u\321/o\304\34\267-\264"
- #"m\336Ch\23\342\347\265\343\251[\253)}\273\27^((/K~\235Be"
- #"\23K\206}2K(\376\342\265\343\254\375\375\e<\226\210\373mE\334\17"
- #"\304mnW\16m\270\213\226\246\266\312"
- #"\370\4\371S\372O\252\307\357\313\256\v"
-) 500
-(
- #"\v\302\252m\263\271\36\344\315\332\37\376"
- #"Vi\315\256\344\333\245\203y\32\37K"
- #"\364\3430d\32\231\205\212G^\244\354"
- #"7\274M\370_\271\202\313'\237\344\210H\243F\245};o\25\362\224\24\352O"
- #"\235J\320\362\345\30\274z47\217\260\220\222Bdt4\337\2358\301o7n"
- #"\344f\273gdg\277\364\250!\223\321\272jU:T\255J\307j\325\250eh"
- #"H\353]\273\360\377\364S\241\232 \333"
- #"\202\203\31v\3748e\275{V\v\210\204\374\0-Mm\262\2623\321\324\324\246"
- #"\261]\e\34\32v\240y\303\2164\250"
- #"\333\n\35m\335B\333M\373\311\231\336"
- #"\37\215\345\303\226bg\366\17\374\271\201"
- #"\300\320+\374o\342\257B\361\177\236\337"
- #"\305I\357],\372\352\240P|\266\""
- #"\233^\343j\262\364\233#\324\251\331D"
- #"\250\r\300\347\337v\244O\267\361tm7P(^\352,$++\223Is\273"
- #"bX\241\"w\"\203\331\343\256\372\200"
- #"Cr\212\34\347\261\325\221'\305\363\327"
- #"\361\343tl\337^\350Z\357*\336\177"
- #"\376I\207\336\275I\331\271\23\35\301r"
- #"\256\357\"\261\361\3618|\371%\376\213"
- #"\26Q\305\310He\374\266\263g\31\346"
- #"\356\316\266\311\223\31\362\241\352\231\374\f"
- #"\17\17\226\34>\314\f\27\27\26\275Z\243E\241 U.\347r` g\2\3"
- #"9s\3736\347\357\335#3;\e\r\231\214l\t]nZZ\32:\5\234\32"
- #"++\274\277\237\260<\\9 \376\a\375n\371PZ5\371\b\247\216\342\205}"
- #"*\233X\362$N|\351\243\236\215\3\373\216\213'X5\262m\315\222_\247\b"
- #"\307k\3104\350\376\341\247\374\361\267\a"
- #"SG.\21n\327\277\247\e\333\17-\21\26\220A\316S\0314\245\21\27\374\217"
- #"\v\211\201\246\246\26\363g\354\246\337\204\272\205zg\275"
- #"z\\\267\274\236\1\323>\233\307\274\245S\336{\361\0"
-) 500
-(
- #"p\354\332\25]mm\256\204\205\345\257"
- #"TX\300\361\336\267\5\251\202\260\350\360"
- #"a\242\236=c\321\241C\371;\370\2"
- #"\330\177\371r\356\243\210\200\34y\341\307"
- #"u\241\200}'d2\312\31\32\322\276uk\332\267n\315w\200\355\344\311\204D"
- #"G\363A\335\272\370\374\364\223\312\327\257"
- #"\371\371\347\334{\374\270L\213\a\2507\321%S\251\2429O\23\244ya\231V"
- #"\264\340\251\4\1\261\251\321\210\a1\241"
- #"\244g\210\271\361ZT\256\201\226\2266"
- #"Q\261\2523\351\2258w\36\311\261\263"
- #"\277\223\231\225!\334\306\316\332\236[\341"
- #"~\302N\274&\306f\350\352\352q7R|\231\250\242ae\226|}\230\232U"
- #"\v\266\212y\265\373\273\23w\202_w"
- #".\300\267\210\302P\357\e\347\377\370\203"
- #"\201\313\226q\372\346\315\227\177P\206\304"
- #"\303;8\30\313\261cy$\270\306\237W\20D(\262\203/\200k/\34{\357"
- #">\22;\370\261r\324(\2726i\"$\6\0\267W\256\4\20\216\227\222\241_"
- #"\232\250\5D\"&Ff<\213\227& \225*Z\b\327\320\0\320\326\322\241F"
- #"U;\302\356\211\273\3616\254\323\212\177"
- #"n_\24\216\257nY\27\363\312\325\3517Q\334\237k\322\367]I\317H\223d"
- #"\2768o\352\357\222}\263\232\326wd\317\252\242EGS\eb\322\2173\255\210"
- #"M\363\367\25\373v\3558|\340\0\303"
- #"W\255\342t`\340\e\271\246T\337\254"
- #"\21\253V\21\23\27Wb\202\360\313\320"
- #"\24187o.\334a\317\0350\200\241"
- #"\355\333\343\277h\221P\374\303\370x\314"
- #"\214\215\205b\337e\324\2\"\21\23c"
- #"\351\2\"u\t\353\321\323\34\267Q\267"
- #"\271\335\204\333\204\337\277\311\234eC$\tB|\302c\242cU\327JPR\\"
- #"\363\305\327\355\233\245S.\e\357\240\25|:\332\225]"
- #"\333\266\251\305\243\0\354[\264`\347\216\35\364^\260\2005"
-) 500
-(
- #"'OJ\336\214-i#E\327\326\255iX\275:g\203\304\22y\347\r\30@"
- #"\3776m\204\5!&.\16K\t\307lc\343\3431\227 \bR\343\337U\324"
- #"\2\2\264\354#\303e\\\r\241\330\365"
- #";\276\345\330\331\337\3515\276\226P|"
- #"\257\361\265\230>\337\205\363\276G\205;\367\361\337\264'*6\2yb\234P<"
- #"\200c\vg\0\341\215z\200\271S\267I\232\35(\315\27_-\332\364&y\234"
- #"\30\304\370\357Z\363\267\367i\241\274\211\367\31GGGB\202\2028q\3736m"
- #"\276\371\206[\202\345TA\272 tn\324\210\252&&\302\361\347\202\202X1r"
- #"$W\26,\20\212\177\360\364)V\22\362\"b\342\342\260\220\" \t\t\230\t"
- #"\354\255\0247\376]E- @\263\6"
- #"\0372\244\327\f\241\330\272\3269\311d"
- #"\266\326E'\225)\231;\305\3\203\n"
- #"9#\25\321\316\375\273\311[\310\312\24"
- #"\337\233\0\30\332{&V\3466\f\355-n\330\370\266\270\352\2\304%>`\375"
- #"\376\2118\17o\304\340\1\38\260{"
- #"7\346\22\274\213\336W,\314\3159\350"
- #"\345E\350\243G\324\2332\205\t\277\376"
- #"J\3243\325I\244\215k\324\240\206\240"
- #"\327\223B\241\340\317\e7\204\215\24\345))\374s\377>m^\335\344/\202H"
- #"\211\2\22\375\354\2314\1\221\270$%5\376]E- \200\256\216\36\256N\223"
- #"\204b\225'\220DO\"5\255\357\310\222\257\17S\325\314Z\270s/N\315\r"
- #"\23c3\366\257\r\243\242\321\273Q\237"
- #" \357\341\352\273\217\317\362\311g\365\320"
- #"\323Wp?4\214\311\23&\274S\366"
- #"\354\305\301\304\302\2\353z\365\204b\23"
- #"\23\23\251X\251\0225\252UC\323\320"
- #"\20\273\311\223\377-\213\v\371J\343&$'\343s\353\26A\202^X"
- #"\201\17\36\240\253\255-\354mu\341"
- #"\366m\354\255\255)\247\255:\237H\211"
-) 500
-(
- #"T\1\211\211\217\307R\302\214H=\3"
- #")\36\357\3751\336\3325\e\363\345\270"
- #"\325\302\35R[\a'\252Y\324\241\215"
- #"}\17\341k4\255\357\310\201u\341\222\356\353m\232\35\224\4\n@SKAd"
- #"\342\t\276\370~4\347N\235zg\367:\24\n\5\225,-\205\23\e\275}|"
- #"\310\310\314\304c\323&\241\327\376t\344"
- #"H\34\333\266e\363\372\365\0\214\274x"
- #"\21\27WW\266\272\271\345d\255\277\262?r\370\352U:5jDy\301#\244"
- #"\307\256]\243\273\204\277\315\331\240 :"
- #"4h \34\17\360\340\311\23\252I\234\201H\331\3y\30\37/\354T\\\234\370"
- #"w\225\367~\6\262c\331\r\254\314\305"
- #"\375\260\312\353\31\260oMH\221N\270j\376;\211\351\367\331td\"\203F}"
- #"\362No\224G\334\271C\247\356\335\321"
- #"\323\323\23\22\204S\177\375\305\240a\303"
- #"8{\362\244\320\376\317\252\265k\271\377"
- #"\340\1k\362\314&\354[\267f\347\216"
- #"\35\270\374\3743n\277\375\226oI\313"
- #"\363\342E\\%\270\30\37\273v\215\36"
- #"*|\302\362r\346\346M\332\327\27\253\264\251$\362\3313iKXR\367@\342"
- #"\343\245\315@$\306\277\253\274\367\2\322\3473if\212}'\324%;[\232\231"
- #"bI_\243\377\244z\244g\244I\212"
- #"\227b\276\b\320\337\255>\251i\311\302\361\3\2474$%5I8~\324\254\326"
- #"\304<\272\233\273\327\321s\270-\32\232"
- #"\20R\304Fy\3636mx\364\370\261\3605\332t\350\300y\t\371\"\315Z\265"
- #"\242O\377\376\354\330\275\e\271\\\2562>\257\231\242\215`\a9h\3300\\?"
- #"\371\204\310\360p!A\2303o\236$A\335\262m\e\36\277\376J\271r\345^"
- #"z\336\361\303\17\271\35\30\b\25+Rg\322$\3346o\316\25\222\330"
- #"\370xI\202\360<9\231\16\22\374\267\32223\205\254\331\363bj` "
-) 500
-(
- #"\351\324S\25CC\241\204C%\346\306"
- #"\306\302\356\303\305\211\a\250/X\234\253"
- #"\270\361\245\301{/ R\222\357\0\222R\236\23\367\\\274\323*\3165RR\23"
- #"y*\341\250p\271r\25\b\273\27\240"
- #":\360\5\345\365\f\b\n\275*\351\236\214\rM\271\21|^8\276\262IU\256"
- #"\4\234\22\216o\321\264=\23\347\266\247"
- #"\367\330\272\350UP\20\32\30\210\373\322\245T-b]\375\243\316\235Y xn"
- #"\37`\325\362\345\f\34:\224\323\177\377"
- #"-\24\177\356\324)\\\373\366e\322\324\2514m\325Je|xP\20\212\224\24"
- #"\24))\204\v\36O\275\354\355\315\204"
- #"\361\343\205\227P/\2349#\351\344\231"
- #"\337\305\2134.\304\27\313\252jU\3347n$\344\306\r04\314\25\222\375_"
- #"~\231\337\17\252\b|\177\371\205\n\272"
- #"\205[\371\344\273\247_~\241\274\204x\200\eK\226\240%X-\20 `\351R"
- #"a{\3717\21\17\20\270|\271p\254<%\205\2444\361Aai\361\336\v\210"
- #"T\212\223\a\"\25S\23K\236HH<\254g\343@p\230\257p|#\333\326"
- #"\222\222\16\1\34\32v\300?\360\254p|\e\373\36\\\364?\2462.!\345\1"
- #"\e\17Nd\327\341\25$%?g\325\212\25\270/+Z8\224\314\370\342\v~"
- #"\337\271\223hA\207\\\373\246M\331\351"
- #"\341A\357\376\375\205f\"\6\6\6\f\0360\200g11\302\202\3606bU\263"
- #"&\356\277\375F\310\265k\240\257\237o"
- #"F\362>\20\366\360!\325\306\217G\236"
- #"\"63\227\232I\37\e\37\217\325\270"
- #"q\302\361\a\257\\\341\236\204\331ui\241\26\20\211T*F&\272TL%f"
- #"\256\333\3318\20\34.\356\254\333\310N"
- #"\272\200\3307h\217\337\3153\302\361m\354{p\336\267\360r\262\312\245"
- #"\252nCj\242\245\233Ih` {\266og\356\217?\222\224$\266"
-) 500
-(
- #"\364U\311\304\204>\275z\321\242m[\341\373rl\333\26m--\225u:\336"
- #"G\254\254\255q\337\2725WH\252\217\37/|\354\267\254!\245\203\317V(\30"
- #"\275f\r\221O\237r\324O\365\367\310;8\30\227\5\v$e\322K\265b\361"
- #"\274(\355\373YZ\250\5D\"&\306f<\215\23\267\362(\16\3051_\274%"
- #"E@l[\23 Q@\32\333\265!\354n\200\360\276F\215\252\266\350h\353\22"
- #"q?\307JCS\0234\312%p%d\e?l\350E\237q\266\271\307r\327"
- #"\254XAUKK\272t\352D\375z\365T\26n\312\313\237\247N\221\"8j"
- #"T\362,&\346\235\262q\377\317\274\262"
- #"|\246\24\222{\201\201h\32\32R\327"
- #"\315\215>\277\374\302\16o\357\234\21\372\e>B-u\364.\265\203_u\354\30"
- #"a\17s\276\323\"\35\3670ww\342_\frD\255U\244Z\261\4\334\273'"
- #"\24W\332\250\5D\"\3051S\224JY4_\324\325\321\243\256u3\2n\371"
- #"\b\267id\367\1\223\346v\242\325'\32|\360\2116m{\233q\352\274'\3"
- #"\a|\302\303{\367^\354q\274l\314x\353\366m\241\rk%wn\335*\263"
- #"E\236\336\32\n\2619\261\252U\v\367"
- #"\255[yx\357\36\256\303\206\341\31\20"
- #"@\345Q\243\320\351\337\37\335\201\3q"
- #"\333\264\251X\263\23\251\202 u\364."
- #"\265\203_|\3700\321/\336\207\210\231"
- #"\342\2355k8\376\277\377\251\315\24Q"
- #"\v\210d\212c\246(\225\262h\276\330k|-\256\ay\363\365\222\242\23(\323"
- #"2\344\370\4\374\316\274\365\2758~v"
- #"\aO\236=b\374\2301\244\313\345\244\306\307s`\317\36\6\17\30\200A!'"
- #"X\324\202P\366002b\360\350\321\34\360\362\"\365\371s\322\343"
- #"\343\t?{\26\364\364\250\353\346\206\323\317?c2b\4\21\261b"
-) 500
-(
- #"\337\213\222v\326\275\263f\r\ag\315\0226S\274\277n\35[&MR\233)"
- #"\26\3\265\200H\344Ml\242\227E\363\305\271S<(_N?\327\237K&\203"
- #"r\25\24T\254\222\305\203\347gp\34X\216\226}dt\31Z\2313\276\236\f"
- #"\32\370\t\307\16\35\242V\315\232\314\375"
- #"V\254\f\256\232\267\4--\254\354\355q\337\276\235\207w\357\"30 .1"
- #"\221\272nn\310\372\365Co\320\240\227"
- #"3\335_A\252 H\35\275\203\332L\361MQb\2\342\355\355M\233\27\307\r"
- #"\275\275\275i\320\240\1\347\317\213\37\3-\253T\222( \311)9\31313\27"
- #"\364\21\356\254Wl\231Qf\314\27\225"
- #"B\321\261C\e\266\255?\202M\255\332\310u\377\302q@9\32w\325\240N["
- #"->\35\327\235S^^(RRH\215\217\347\340\236\335\f\0360\200n\37}"
- #"DDp0U\4=\225\324\224\r\274}|\250^G\314F\307\300\330\230\260\27"
- #"&\215\255Z\266D\361\344\t\177n\337\316G\363\346!\353\327\357_A\t\r\5"
- #"mm\220\311\370\262W/Ft\354(I\20\244\2426S|3\224\230\225\211\213"
- #"\213\vG\216\34!66\26WWWf\317\236M\377\376\375\331\263g\17\355\332"
- #"\265+\251\313\26\213^\343k\t9\314"
- #"\366\32_\213\230Gw\1\3507\321\226"
- #"\275\253U\217\240\306|\235\363^\257\336"
- #"8\305\204!\363\205\356\307\261\2053\333\17-\221d\2768\365\a'\241X%C"
- #"{\317\344\354\345\203\371\374\27144\241"
- #"\202Q6F\225\2621\256\222\205\221\245"
- #">\0\31\231\231\2711=\3738q\322"
- #"\313K\355\204\373\226\340\355\343\303\247#"
- #"Fp?4T(~\330\350\321d\346\371{\253\342\263\261c\271{\357\36+\26"
- #"/\6\300\321\331\231\224<\373\e\336\347\317\363\321"
- #"\307\37\223\232'\257AC&c\373\271s\244\357"
-) 500
-(
- #"\337\17YY\220\235-|=\21\242\237"
- #"=\243E\355\332\302\361\261\361\3614\253"
- #"%\346\260]\234\370w\225\22\23\220\370"
- #"\370x\332\265k\307\214\0313\30:t(S\247N\305\301\301\1ggg\342\342"
- #"\304G\312o\202\372\265\233\v\305\315\235"
- #"\342\301\364\371.\310\223\342\205;\367VM>\"\354n\0v6\16\364s\232("
- #"\324\246\260\316\2750\224\346\213?\254R}4U&\3M\235t\322eQL\371"
- #"l\26{N\317! \320\237\253\376\5'\26\352hk\223\366\374y\301/T\320"
- #"\346\253\324\347\325HB.\227\323\250ys\356\n.\377@\216 H1\237\234\371"
- #"\305\27\4\274Z\315\260\b\302\302\303\261"
- #"+\"\263\334\261];R\342\377-Q<l\364h:u\350\300\370\211\23\221\365"
- #"\352U`\233\34666\264\254]\e\a\e\e\34\254\255s\236\224\360\331*\322L"
- #"\261\200x\365\f\244x\224\270\231\342\272"
- #"u\353\210\210\220\226\211\375\246\351\334\306"
- #"U(N\351\254;w\345\b\341\316}h\357\231\234\273r\210\377M\332\204\206L"
- #"l\305P\351\254+\205W\315\27e2\320-\257 [\226\300y\377#\34\373{"
- #"/'\377:\216\";\eMMM\2324n\214C3{\332\264m\206\333\244Q"
- #"4\250_\37--\t\37\207\302\304@\352\363j$q\304\313\213\344dqK\231"
- #"\250\350h\222\222\222\b\276qC\270\215\337\265k|\320\262\245p|Xx8\37"
- #"\367\0207\27\275{\357\0365k\324(x`\2d\244\247\23x\355\32~\227/"
- #"\343\353\347\307\372\27\316\1:\375\373#"
- #"\323\320\300\311\301\1\327\17>\300\331\301"
- #"!'c\276\200\317V\221f\212\5\304"
- #"\253\315\24\213G\211\t\210\261\2611\313"
- #"\227/G[[\233*U\252\340\355\355\315\200\1\38r\344HI"
- #"]\262X\324\254jW\242\316\272&\306f\354[#\266tP\34\36?"
-) 500
-(
- #"\213\344\367\303\v\331\373\307\00622\323\321\322\322\"33\23m--223"
- #"\321\325\325\245G\327\256\f\36\330\227\235"
- #"\36\277\26z\372IM\351\340\355\343\303"
- #"\254o\276\341\302\2313B\361\273<=Y%\301\22c\361\262e\214\319\222J"
- #"\22\254\315\375\256]c\242\204j\204\241"
- #"aa\324\221\260\\\244\24\220\302\320\326"
- #"\321\241i\253V4m\325\n\345\234Z"
- #"\246\247G\272\\\216\374\321#\216\34:"
- #"\204\347\241C\214Z\263\206\264\364t\264"
- #"55\311\310\312\312}\324\321\322BKSS\322\254Km\246X<JL@\16"
- #"\37>\314\214\0313r\5c\326\254Yer\377##3]\222\263n\337\tu"
- #"\360\\u\v\r\rq_\236>\237\331\344\23\35\345\fA\257B6Y\232\317\361"
- #"\366=\312\221c{9q\3628i\351\351/bd\271\245H\225\202\240\374\357\234"
- #"{\317\21\b\275r\345\b\371'\220\0325\254\204r\274\3526jD\320\265k\222"
- #"f\34\266\215\e\23\350\357/\334\306\266"
- #"qcn\372\371\241-X\363\241I\313"
- #"\226\234?}Z\222\300\325k\332\224\353"
- #"\227/\243+\350\253$\365\32m:t"
- #"\340\227\371\363\205\367zl\352\327'\342"
- #"\316\35\254k\325\22\266>\231\365\3157\3742_lo\f 66\226\36]\273"
- #"\n\307\373\372\373\263o\327.\341x\310\331\237h Xk\4r,_jT\257"
- #".\34_\261bE\254\252V\225tO\365\353\325\3\231\f\00333\6\217\e\307"
- #"\340q\343\376\375\241B\1\311\311\220\230"
- #"\b\317\237\23\31\32J\323\221#i\375\365\327\244ed\240\375\302C+#+\307"
- #"\240T)4\360\362w\254\332\370\36185o\216k\333\26687k\206\301+\6"
- #"\224yQ\233)\346 SH-\226\374\216!\223\311\270r \377\257 "
- #"o\a\257g\250\340yj$\356\e~a\355\306\234\4\37e\207.\372"
-) 500
-(
- #"\250l\3\344{^CC\203\217{\364`\200\253+\316NN\30V\251\202BB"
- #"v\265e\255Z\370^\270\200\245\205\205"
- #"\352`\240Z\355\332\370\374\3757\325\253U\23\276FM[[\376:~\34k\301"
- #"\215\303:\r\e\362\307\201\3\324\25<"
- #"\315\323o\320 z\273\2700d\320 \341{j\336\246\rk\335\335i\341\340P"
- #"\"\327\360\366\361\301\251wo\216\35:"
- #"\244>0\360\36 \177\376\234#\a\17\342\271o\37\207O\236$[9x\3133"
- #"\303\201\374B$\372\250\243\245\305\270n"
- #"\335\230\335\267/U\215\214\304\226u\373"
- #"\366-\261\367\373:x\2553\20\23\23"
- #"\223\234\2428\21\21\330\330\330\24\270\367ammMx\270\264\342J%M\313>"
- #"2\225\2\240\253\253\313\330Q\243\250S"
- #"\2736\373w\355\242\241\204\20282==I\202 \25K\v\v\242cb\204\5"
- #"\304\252jU\"\243\242\244\tH\215\32\334\275wOX@j\333\330\20\32\26&"
- #", \256}\373\262c\367nI\2\342`o\217\257\237\237\260\200|\322\2737\223"
- #"\246N\25\276F^\337,\265\365\311\273"
- #"\217\201\241!\203\207\rc\360\260aE"
- #"\306\311\345r\3525m\312\331\223'\261"
- #"Qn\360\253\300\333\307\207~\203\6\221"
- #"bl\214\315g\237\25\270\364\366\352\243"
- #"\226\246\346K\247\37\313\"\2575\17\304"
- #"\324\324\24\17\17\17\0\302\303\303Q("
- #"\24\371\376\2255\361\0P\244\244\220."
- #"\227\27\371\230\32\37\217\373\322\245X\230"
- #"\233\363\370\311\223\322\276\345\227\260\260\260"
- #" :Z<s\275\232\225\25\221/\316"
- #"\356\213\242\24\20Q\352\324\256M\250\204"
- #"\277\265\263\223\23\347}|H\20\264\267"
- #"\0\260\256U\213\357~\370A\3225\314$\326QW\373f\275}\310\345r\252\325"
- #"\256-l\211\23\373\350\21V66\302\265e\216xy"
- #"\21\25\35\315\350\317>#[\340\370\261\267\217\17\3\206\f"
-) 500
-(
- #"\341\321\343\307T\254\\\231\324\204\204\234"
- #"\276%1\261\320\307\251\223&\221\231%\255\356Pi\360Z\5$$$\244\314\355"
- #"q\274n\252T\256,\251\210\321\233\300"
- #"\322\302\202\230\207\342\6\217VU\253\362"
- #" 2\362\345'Ul\236\324\254Q\203{\367\357\v_\243\266\2655a\22\4\244"
- #"|\371\362tl\337\236#^^\302m\326n\330 I\314\r\f\f\b\276~]"
- #"8^M\331\300\333\307\a\313Z\265\204\277w\a\217\34!2*\212CG\217\n"
- #"\305/Z\272\224\250\350h\26-]*\24\357\271o\37\220S.x\365\272u*"
- #"\343\207\215\36\235\373\375\274p\351R\376\200\2\276{^'N\b\335KiSb"
- #"\231\350\16\16\16\354\331\263\347\245\347\366"
- #"\354\331\203\203\340rCY\245r\345\312<.c\2ban.M@\254\254\210"
- #"|U@T\254\307\326\250^]\322\f"
- #"\244\266\215\215$\1\201\234\323?\223\247"
- #"M\23\216\337\266y\263\244\323?jJ"
- #"\37\251\243}\345\350=\346\341C\341\16~\377\301\203/=\252B9h)\260s"
- #"/\200k/\216D\237;\177\236u\277\376\2522\376\316\255[\271K\330>\5\25"
- #"3+\340\273w;@\274@\\iRb\2\262e\313\26f\315\232\305\224)S"
- #"\310\314\314d\312\224)\314\2325\213-"
- #"[\266\224\324%\337\b\225MM\313\336\22\226\271\271pQ%\370w\17D\nZ"
- #"ZZ\34\2250;\2308u*'N\236\304Z\302i\36\217M\233055\25"
- #"\216wl\333\226\220\177\304\r$\325\274"
- #"~\244\n\202\324\321\276\312\321{\1(;x\321\1\217\262\263.\260s/\0e"
- #"\22\247\"%\205@\177\177\2416\357*"
- #"%& \215\0325\342\352\325\253\370\371"
- #"\371aii\211\277\277?\276\276\2764*\244\274\346\333BY\24\20"
- #"\251KX\337\316\235\313\336\3\a\260m\334XR\233g\22\34\4<6"
-) 500
-(
- #"m\242f\215\32xl\332$\334F-\bo\37R\5A\352h_\345\350\275\0"
- #"\224\35\274\277\3405\324\24\237\22u\343MLL$!!\1###\342\343\343"
- #"%\325y\370\257DFF\342\346\346\206\221\221\21nnnDI\34q\27F\225"
- #"*Ux$P3\340M2\343\253\2578\352\345%,\b\316N9\276Y.="
- #"{\n_C\352r\221c\333\266\334\271uK}\374\365-C\212\221\"H\27\4"
- #"\251\243}5e\233\22\23\220\263g\317\322\252U+\306\214\31Chh(c\306"
- #"\214\241U\253V\234=+^W\373\277\320\264iS\0N\237>\r@\223&M"
- #"\n\215\255eg'\364\232\325\353\324a\300\220!\354;xP\270MM[[I"
- #"\327P\212\200LOOx\371G\252 \314\2346\r\ekkfJ\330oP\317"
- #"\16\336N\252\327\251#T\377]\311\260"
- #"\321\243\363\37\260(\2\265 \274\337\224"
- #"\230\200L\2336\rwww\246L\231\2\300\224)Spwwg\232\204N\253"
- #"\270\304\306\306\222\232\232\212\273\273;\315"
- #"\2337\307\335\335\235\324\324\324Bg\16"
- #"\315\355\355\205^w\306\324\251\271\31\264"
- #"\315\212\20\244\274(\343D\343\225b`an.\274\374#U\20\314\252T!,"
- #"0Pm\263\376\36\360 2\222\211\200)\253\0\0 \0IDAT\211S\247"
- #"\n\307\337)\242\216\207\0325\257Rb"
- #"\2\342\347\347G\377\376\375_z\256\177"
- #"\377\376\370\t\24\255\377\257,X\260\200"
- #"\311\223'\277\364\234\233\233\e\v\26,"
- #"(0\336U0\333s\322\347\237\347&"
- #"\322\211\266\31\370\342w0\360\225\337E"
- #"a\314\2346\r\353Z\265\330\263}\273"
- #"\360\362\217Z\20\336\37l\352\327\227\334"
- #"\346\306\225+%p'j\324\224\240\225I\325\252U\vLn{\23\231"
- #"\350\372\372\372DDDP\245J\225\334\347bcc\261\261\261!11"
-) 500
-(
- #"\361\245\330zvv\\\361\366\26\366G\n\v\17\247\273\213\v\327.]\22j#"
- #"\227\313qh\323\6\277\v\27\324F\206j\362aS\277\276\260o\26Hw5("
- #"\216\vBI_\343]\270\2477\366\36"
- #"\312\270\323T\211\315@\222\223\223\361\366"
- #"\366\316\315@?w\356\34\26\26\26l"
- #"\335\272\265\244.Y,\202\257_\227\324"
- #"\261\327\266\261!,0P\270\215\201\201\1!\377\374\243\26\0175\5\22qGu"
- #"!35j\312*%& \312\202RJ\34\35\35\331\275{7\316\316\316%u"
- #"\311\\\nZ\256*hY\v\244/\t\24g\t\241\244\257\361>\276\2077q\215"
- #"\342\334\223T\352K\310\223y\23\361o"
- #"\342\32\357\302=\225\305\367P\32\224\330"
- #"\22V^\233d%\336\336\336\270\270\270"
- #"\224xE\302\202\226\253\nZ\326\312\275"
- #"\317\2628u-C\361\357\353=5\260"
- #"\267\177\357\23\305\324\374w\212c\276\230[yR\202\373CiPb3\20cc"
- #"c\316\237?\237\373\377o\262\240\224\231"
- #"\231\31\345\312\225\303\315\315\r___\334\334\334(W\256\\>\361P\363~!"
- #"uD\247\26\217\367\3\251^[%m\276\b9~^R\274\347J\213\22\23\220"
- #"\303\207\17\363\361\307\37#\223\311\220\311"
- #"d8;;\277\321\202R\327_\230\346\365|\221\eqCBIO5e\37\321"
- #"\274\232\274\250\5\341\335\347Mxm\25\327|1<\"B\310|\21\300s\377~"
- #"\241\270\322\246\304\4\304\321\321\221\370\370"
- #"\370\334M\364W\367DJ\32+++"
- #"\334\335\335\211\215\215\305\335\335\235\252\22"
- #"+\240\251y\363H\365\315R\e)\276\373\224E\257\255\342\232/FFE\t\231"
- #"/\2\4\274%I\273%je\242\346\375D\231M/\305k\253N\355\332j\337"
- #"\254\367\0\251\231\361e\321k\2538\346\213\375\372\364"
- #"a\327\266m\302\263`\245\237WYG- jT"
-) 500
-(
- #"\"U\20\212\343\265\25\362\317?j\337"
- #"\254\267\fo\37\37j\331\331I\22\204\a\221\221\f\0355J8\2768^[\37"
- #";91k\372t\341k\274\t\312b\31\210\327\201Z@\336r\336\25\257-5"
- #"\245Oq|\263\356\336\273'\311*\305"
- #"\244bE~\370\356;\341\370\333\1\1\270~\362\tS&M\22n#\325\235\372"
- #"MP\26]\274_\aj\1)A\252\327\251\203LO\17\220\336\301\213\216\366\325"
- #"^[j\nC\252 $&&J\366\315\352\336\265+\363\347\316\25n\343\334\263"
- #"'\351\351\351\302\361PH\5\315\"\220"
- #"Z`\355M\240\26\220w\30\321\316Z"
- #"\352\350}\306\324\251\264wt\4\244w"
- #"\360\242\243\375\327\346\265UDI[\265 \274\235H].Z\353\356N\315\0325"
- #"$]\243N\355\332\204J\260&\222Z\32\31\n\251\240Y\4R\v\254\275\t\212"
- #",\3\241\242\234tYF- @\337\336\275\205\342\244\216\336'}\376yn2"
- #"\245\250\371\242\324\321\276S\267n\324\251"
- #"]\233\36]\273\n\305\233U\251BxPP\376\375\2062\356\271\243&g\271R"
- #"JM\235\312\246\246|>n\234p\274\263\223\23\347}|HHH\20nS\333"
- #"\332ZR\351b\251\245\221Az\5\315\267n\t\353-\376\356\275V\1i\321\242"
- #"E\231\363\272R\205\266\226\26?/Z\204\216\276>2=\275B\37u\r\r\211"
- #"{\362\204\352\325\252\t;\345jhh\260i\335:j\333\330\360q\217\36B\367"
- #"#u\264\257\366\332z;\251eg\207\211\205\205\2446\311\311\311\34=vL8"
- #"\376\307\357\277'$4T8\276|\371\362tl\337>w\343Z\204\33266\222"
- #"\4\244f\215\32\222\5\244\232\225\225\244"
- #"%,KK\313\2\215\\K\223\312\246\246D\307\304\3406m\32"
- #"\272FF9}\213\201A\221\217o\3Z\257\363\305v\354\330A\377"
-) 500
-(
- #"\376\3759t\350\20\2337o\306\330\330"
- #"\370u\276|\211\220\276k\227\352 \231"
- #"\214\310\204\4\26\356\333G\354\303\2078"
- #"v\356\214\266\246&\31YY\302\217\206"
- #"U\252\240\255\251\t\360\322\3639//"
- #"\303\271sg\6\270\272\342\334\2737\6"
- #"\206\206%\371\226\325\224\1<6m\302\251wo\316_\270 |\372\314}\3312"
- #"v\354\336\315 \301\345J\a{{\326"
- #"n\330 \351\276\\\373\366e\307\356\335"
- #"\f\0314H(\276N\355\332\204\206\205\t\277~q\4D\352\f\244\270KXr"
- #"\271\234#^^x\356\333\307\241\243G"
- #"sW\17\264\265\264\310\310\314D[+"
- #"\247\273\314\310\314\4@\307\300 \367y"
- #"\221G\231LFV&\334\270\20\202\201nUR\236\313HI\322 -YV\340"
- #"$\244e\237\262\277\264\365\332\275\260\322"
- #"\322\322\370\362\313/9~\3748\273w\357\316\255\fXV\26117'|\365j"
- #"\361\370\211\23%\305gegSo\312"
- #"\24B\334\335\v\215\221\247\246r\344\3325<}|8\346\347GZF\6\360\262"
- #"\237X^\301\311+D:ZZ\224\327\325\345\246\207\aU\353\324\1CC\320\327"
- #"\207\362\345\v][\225j!\236\221\221AC\a\207\334\363\357\252HOO\247q"
- #"\213\26\334\22\314\376OKK\243\331\a"
- #"\37\20t\355\232\360=\305>zD\317"
- #"\336\275\361\25\334$\226\313\345\264\353\334"
- #"Y\2706\206\267\217\17\263\276\371\206\v"
- #"g\316\b\305+\215\27\245\374^\245^C.\227\363Q\317\236\\:wN(>"
- #"--\215\326\355\333K\252\r.\365\32"
- #"\351\351\351\264tt\344\372\345\313B\361\31\31\31\264h\327N8\36 33\23"
- #"\2076m\204\376v\n\5\334\271\373\200"
- #"\226\216\255\221\313\345\244\247\247\347\353"
- #"\370\225\35:\274\374\35\323\325\325\245[\227n8\367\350\207"
- #"c\363\217\321\3142,\264\203\0370\271\1\273W\6\n\277"
-) 500
-(
- #"\207\254\254L\206N\267g\307r\261\357"
- #"\220\362\32\21\367\305\257Q\32\224\230\231"
- #"\342\327_\177\315\242E\213\310|\361\207"
- #"R\362&\352\201HA&\223\241\330\273W<\276_?I\3611qq\330\317\234"
- #"I\214`\6\252\324x\337\360p:\314\231Cfv6i\31\31\371f>:\332"
- #"\33289:\342\332\253\27\316\275zaP\245\n\262\362\345%\231\n\206GD\320"
- #"\305\311I\270Z\335\355\220\20\234\373\366"
- #"\25N\364\273\342\353\313\304)S\270\352"
- #"\343#|O_\314\234\211\236\236\36\363"
- #"\347\315\23\212\337\266c\a\207\217\36\305"
- #"s\307\16\241\3706\35:\360\313\374\371"
- #"\352\334\2242F\336Y\302\261\23'H{!\20\31\231\231hii\221\231\231\211"
- #"\216\266.}\235\3062\324e6\246&o\247\3Er\212\234AS\32\21\375\350"
- #"ni\337J\221\274\326%,%\247N\235\302\303\303\203\313\227/c/X.\366"
- #"]%6!\0013\tKyR\343\25\n\5\365\254\254\270\272pa\201?\227\247"
- #"\244p\304\317\17\317\235;\0315cF"
- #"\256\231\333\a\16\1684j\204\203\203"
- #"\3\16\255Z\321\240Y3\264\264\265\v|\215\273\367\356I:\235\23\32\26Fm"
- #"\e\e\341x_??\34$|N\242\242\243\331\276k\27\301\22\374\315\246L\237"
- #"\316\352\25+\204\343Eg\5j^?\31\31\31\4\6\a\343\347\357\217\237\3775"
- #"\374\256]\343\306?\1dge\241\241"
- #"\251I\227\216\335\350\321\321\225\357'{"
- #"\240\2410*t\t\250\244x\20\23\306g\337v\340\367%\376T4Rm\320\372"
- #",>\226!\323\2321\177\346\36\232\326\23\263s:s\371 1\217\313\266\23/"
- #"\224\300)\254S\247N1b\304\b\16\37>\374\336\213\a@l|<fFF"
- #"%\26\37\35\27\207E\305\212\205\376\334@O\217"
- #"\301\355\332q`\306\fRw\356$}\367n\0\326"
-) 500
-(
- #"\215\32\205\275\211\t\276\247O3n\364h\264\r\r_:4\240\374\247c`P"
- #"\260\200\24v\364P&#4<<\277OU\21G\25\375\256]\303\241Y3\241"
- #"\367\v\320\310\301\1}}}*\231\230"
- #"\b\267133\23>\310\240\346\315\240"
- #"\334,\316\373Y\223\351\351\241ch\310"
- #"\230\317&p\351\342\rl\254Z\360\255\333z.\35\224sqo\6\336\273R\371"
- #"n\374!Z\326\35Jz\2421\251I2\310#\36\316c\253s=8\307\5\274"
- #"\260O\\\336\347\237\305\307\322s\214\25"
- #"q\t\205\34\261}\205lE6?\256\36\315\343\247Ql;\270H\250\315\266\203"
- #"\213x\22\27\303\364\371.\271\367\246\212"
- #"\323\27<\205\342J\233\327:\3Q\213"
- #"G~\36\306\307K\232QH\215\217\211\213\303\262\b\1)\214\2465k\322\264f"
- #"MFw\356\\p\200\206\6hj\242\333\267/\343&L [\241`\313\266m"
- #"\0\224\323\325\345\344\37\177\320\256m\333"
- #"\374\355\24\n\302\302\303\261\253[7\337"
- #"\363\205q\340\320!\376>{\226\261\2029\v\246\246\246l^\277^(VI\360"
- #"\vwf5o\36o\37\37\272\366\354IjZZ\356s\332ZZ\310d2\222"
- #"\36\245\222\360H\223\204'\32$&h"
- #"\240\310\343v\376,>\226\241\323\355\371"
- #"}\35152R\v\236\35\303K\372A\354\223\aL\235\327\203\345s\216\25:\332"
- #"\317\e\277\355\340\242\\1\230<\\\265 xz\255\342vD\316^\335\345\353'"
- #"a\270\312&x_\315)a!O\214\343\227\r\23\331\261L\365\3149\354\256\370"
- #"^Ii\362Zg s\346\314a\327\256]j\361\310Cl|<\346R\226\260"
- #"$\306\307\250\230\201\24\233\354l\310\310"
- #" m\327.>\375\360C~\2338\21\305\276}(\16\35\342\317\357"
- #"\277\347\243\36=rG\216zFF\234?z\24\222\222\260m\334\2305"
-) 500
-(
- #"\353\327\263J\320\266\32r\4A\212\221"
- #"\242\3327\253l\343\355\343\203\236\261q"
- #"\356\347\243k\317\236x\35<\206\245EU\366o=C\250O&~^\351\370x"
- #"\246\23\350\243Kd\250\26\362\270\227\305"
- #"\3^t\356\317\242\205G\372J4\265"
- #"\264\231\267r\204\330\275\276\350\334\3n"
- #"\211\35\3068\370\347FZ4\316\31t"
- #"m\234\357-\324f\357\352\333\264j\362"
- #"\21\356\337\235\20\22\17\200C\e\356\n"
- #"\305\2256\257u\6rA\202m\302\373BlB\202\244\31\202\324\370\350g\317h"
- #"Q\202\266\346\266\223'\23\22\35\315\345"
- #"\320PFt\354\b\31\318\326\251C"
- #"\312\316\235\2711\336\267n\361\321\340\301"
- #"\244fd\240\251\2213&\251ce\205<>\36\3\0011T\273\352\276}\304>"
- #"zD\263V\255\330\262q#O\236>e\317\276\375\34?q\234\264\364ttu"
- #"u\331\271\341\4\215j\267\373\367\24S*D\307D1d\374\307E\316\16\362\""
- #"\265s\a\250dlN\25S+\26\317>(\24\277w\365m\246\375\344L\357\217"
- #"\306\n\305\357\\\221\363Ym\331GFy=\361\334+\23c3\236\306\225\255\344"
- #"\306\327\201:\23\275\204\211\225\270$%5>&>\36K\t{\1\266/\352\302"
- #"\333\26P\37\276 \234\2337\a\300\345"
- #"\305cA8\332\331\221\262s'\212\275{\271\275r%fFFd'$`V"
- #"\263&n\203\6\21u\355\32\274r\32"
- #"O\315\333\315\234y\363\210y\370\220\356"
- #"..\354\334\265\237\16\315]9\365\373"
- #"\23\256\34P\340\275+\25+\303\366\304"
- #"=\322$5\351\337\rn\3\375\212$"
- #"\247&\362\313\206\211B\327\330\273\3726?N\337IECq\v\235e\377;J"
- #"VV&\225+\211\237\276\252lb\311\223\270\222\265>\251T\321\234\247\t"
- #"\261%z\215\322@- %LlB\202\360\246x\315\317?g\273\2677"
-) 500
-(
- #"CW\256\244\306g\237\251\214\267\235<"
- #"\231?\374\374p\376\371g\254'L\20"
- #"\272\206\210 \344e\246\213\v6\346\346"
- #"\314\354\325K(\336\306\334\234\207\2336"
- #"\341\365\365\327\204\254\\\tii\330\264"
- #"o\217\216\2611\272\206\206\364qrb\307\246M\310\237?\27z=5o\6\23"
- #"\v\213B\375\335\344r9;v\357\246"
- #"O\377\376\350\32\31\241c`\300\306\315"
- #"\23315\251B\217\16\2372g\374!\3326\36\202\256v\321#\362\0053=i"
- #"l\327Fx\31\a\240\221mk\2n_\24\216\267\251\321\210\a1\241\244g\244"
- #"\n\2671\255h\301\323\22\26\20\23#"
- #"3\236\305\253\5\344\235\244\226`\347+"
- #"u\364n;y2\247\2\2\350\372\303\17B\35|\263Z\265\0\26041a\206"
- #"\213\213\312x\245\30\30W\250\200\207\340"
- #"=I\25\0043cc\302V\255\242\212\204\223aJ\254*U\302}\364\350\334\323"
- #"_O6o\306\265qc<=<0\253V\r\267\341\303\211\272{W\362\353\252"
- #"QMQ\202\220\17\231\f}}}\354^\224\6P\22\31\25\215\333\264i\230\325"
- #"\250\301\256\335\373\351\322\316\225\v\a\37"
- #"qq_\6\227\367g\263v\3369|\3\316\b\337Sc\2736\204\335\r %"
- #"5I\270\215E\345\32hii\23\25\e!\24\257\255\245C\215\252v\204\335\23"
- #"_\26\255T\321\202\307\317J\326\372\304"
- #"\304X- \357,\315\5s\26\244\216\336\225\361\25\5;x\327\326\255\1\250c"
- #"n\316D\201#\2473]\\\26063\343\310W_\321N\320.\376\277\b\302\177"
- #"\305@O\217\301\216\216\34\370\362\313\234"
- #"\314\374\304D\252\327\257\317\204\241C\211"
- #"\272s\347\215\337\317\333Bq|\263\364"
- #"\364\364\350\332\245\213X\260BAX` w\356\336\345\320\221#DF"
- #"E\341\366\3054j\324\255C\322\363l\16m\b\341\333q9Gg\263\323"
-) 500
-(
- #"\214x\221JD\215\252\266\350h\353\n"
- #"gK\353\352\350Q\327\272\31\1\267\304\23F\1\32\326i\305?\22f!\365l"
- #"\34\b\16\363\25\216\177#KXj\1ywQv\334\252\220:zWv\360\207"
- #"\5;x\347\346\315\251mn\316\246\t\23\320\20\260x636&|\365ja"
- #"\361(KXU\252\204\373\250Q\334[\267\16\315\344d\3524m\212\333\260aj"
- #"!)\0\217M\233\310\310\314\224T\333"
- #"#\300\327\227\375\a\17\n{B\351\350\3500\347\353\257\31:j\24u\e6$"
- #"\351\271\f\257\337\356\361y\277u\30\353"
- #"[\25\332\356\203f\335\270\340/n\360"
- #"\350\320\260\3\376\201g\205\343\1\32\332"
- #"~\300?\267\304\5\304\316\306\201\340p?\341\370\312&\226<)\341\31H%c"
- #"s\236\306\2537\321\3379\354\252V\245"
- #"\207`\22\233\324\321\273\324\16\336@O"
- #"\217\320U\253\26017\27\212\177\27P\nI\210\273;$%\345\b\311\220!D"
- #"I0\350{\333\260\251_\37\23\v\vv\354\336-d\317\356\330\266-gO\236"
- #"d\340\320\241\234\26\254\303]\311\304\204"
- #"\321#F\260x\3312\225\261\312\31\307"
- #"\350\361\343151\243o\217\317\370\334u5&\206\205\v\207\2226\366=$\t"
- #"\210}\203\366\370\335<#\34\179\373 Rg \267$\b\310\233Z\302z\252"
- #"\236\201\274{\244gfb \301:\331"
- #"f\342\377\331;\363\270\32\323\367\217\277"
- #"O\373^\242\22Q!%\6\25\306\326`,3\"\313\220}\337g\210\354\313l"
- #"\346;\30\6\303L\214\335\330\31\315X"
- #"\262o3Hv\331\213B\244\264\250\264/\247N\347\367G2h9\367\323\217\n"
- #"\275_\257^f\316\271\356\347yN\313"
- #"\363y\356\373\276\256\317%\226A\222\207\"'\207\332\236\236o->["
- #"\241\20\336\223)N<@jf&u%t\252K\311\310\240\336\304\211"
-) 500
-(
- #"\302\361\311\351\351t\2327\357?!I"
- #"O\307\316\305\5\317\221#\211(\304\226"
- #"\373\372\215\e4\222P\v\342\347\357O"
- #"\363\326\255\205b\225J%\313W\256\244"
- #"\351'\237\b\305\327ttD\246\253\373"
- #"\302PQ\25\327.\\`\331\322\245\370"
- #"\374\3757\35:w\26\32\343\334\260!\3337m\342[\t\335\377\274<=\271t"
- #"\245\360\eixD\4\236\223&Q\273^=\322Se\354]\23\302\222Y\307\270"
- #"v[\334|\321\271^kR\323\305\23\"\352\325n\212<+Su\340K8\324"
- #"pF\211\270WI\215\352\365\220Ih\322djlN\5\23\325\226$/c["
- #"M\354g\235\207\211Q%*V\220\366`(\365\34\245\301\a/ \17\242\245="
- #"\25H\215\217IL$Y\202q\241\324\370\350\304DR2\3043N\"\342\343I"
- #"\227\330R\364LP\20\225$X\314\37"
- #"\277q\3\253\212\25\205\343\367\\\274H"
- #"\355*U\200\327f$\361\3618\324\253\307\2313\257\332?\304?{FW\17\17"
- #"&\v\212\332\361\177\376\241\357\240A,"
- #"[\272Te\254\237\277?Uk\324\340"
- #"\357={\330\276i\223\320\361\357\a\6\242LO\27v\342544\244_\357\336"
- #"\354\336\271\223s\247\304\227s\\[\264"
- #"\220\344\321ean\216\337\211\23\5\276"
- #"\347\347\357\217C\203\6(\262\300w]\b\243\277X\216\211\201\25U,lY\277"
- #"@\374i_O\307\200\215\v/\t\307"
- #"\353\352\350\263i\221\370\376\4\200\216\266"
- #"\36\233\27\a\b\307kijK\212WW\327\220\224\31\6Hr\342\5PSS"
- #"\177\353\347(\r>x\1y\333\274m"
- #"3\305'\361\361\222\n\17\303\343\342\260"
- #"\222P7\2p*0\220\326u\353\n\307\37\272zUxY\20\300\347\334\271|"
- #"\373PyBrj\316\34\372\364\351\303\211\3\a\200"
- #"\334\331\301\220\221#\371\264uk\241\276\30\216NN\f"
-) 500
-(
- #"\32>\234\35\2337\343,\320Z`\320\360\341hjjr\342\320!lml\204"
- #"?\303\273D\236\240\372n\375\207a\356"
- #"\277c\254\247z\251\252\234\342\223\226\236"
- #"L\347\21\325HK\27\357&\3718\362\36\375&\212\265\301.M\312\5\344-S"
- #"\332f\212\257\23\36\27G\265J\225\204"
- #"\343\1N\336\272E+\301\345\31\245R\311\301\200\0a\1ILK\303\377\316\35"
- #":\273\270\24\370\276\263\2655\333\275\274"
- #"\350\322\257\37\236\203\ac\353\340\300\235"
- #"\273w\371m\361b\241\343GEEaff&l}\22z\347\16\217\202\203%"
- #"-\201\274+\344\245\345v\355\331\223%"
- #"\263\267c\250l\2022G\314t\360}\345e\363E\21\342\23\242q\eVE\322"
- #"\230\223\27\366\20\23\27\316\251\213{\205"
- #"\342sr\24|\277t\340;\341\207U. o\231\262f\246\3708.N\322\362"
- #"Rrz:7\303\302h.\230\bp\373\361c\26455_,I\251\242\376\244"
- #"I\264\254S\a=m\355Bc\\\353\324\341\356\363\264\337Gaa\244&'\243"
- #"\257\257/t\374\370\310H\341&R\357+y{:6\317\323r\367\254\16\306\306"
- #"\354\277\375\235\302v\27\336\265N\335\361"
- #"\t\321t\32^U\330Y\27\3763_\24\25\204\27\316\272s\335\205\307\374{~"
- #"\327+\377\252\302\347\320r\2644\v\377"
- #"{(K\224\v\310[\246\254\231)\206"
- #"K\24\220\263w\357\342\\\243\6:\205"
- #"\364\ny\235\317\346\314\221\264\334\25\26"
- #"\e\313\r\201\26\247yKZO\326\254"
- #"\241\221\2655\315?\376\230;w\357\n"
- #"\237\347C\345\316\335\2734o\335\232#"
- #"\307\377\341\370\216p\225i\271e\211\316"
- #"#\252Iz\322/I\363\305\344\324\4"
- #"aK\226\340\347\356\275\221\202\315\241"
- #"\266\354Y$9\325\271\264(\27\220\267\214\24+\223\342"
- #"\304?\211\217\177k\2R\177\322$\246l\332D\363\327*"
-) 500
-(
- #"\224U]\317\t\t\346\210v\226\226l\226\220\25fY\241\2{\246Ne@\263"
- #"f4n\326\2143\202\255W?D\374\374\375i\334\262%\275\277\350\317\3541{"
- #"\320\327\224V\214\370&\3518\324\222Ek<y\32'\336\333<&.\234\357\227"
- #"\16\24\216/\256\371\242U\345\232\254\232"
- #"#v\303\376k\371]Z6\352\314\242\231{%9\353vl5\200\276\235\305\222"
- #">\366\255\t\343\342\356wc\376W. o\231\262d\246h?~<\177\237?"
- #"\3177/9\351\26E\207\206\r\271\25"
- #"\26\206\3179\361\254\34\251\202\20\354\355"
- #"-\271\20R&\2231\266C\aN\375"
- #"\370#}\372\365\343\304\341\303\222\306\177"
- #"\b\344m\224\357\333~\202\226u\306\243\310~\263\177\352Rg\aq\tQ\354<"
- #"\270\214/\277\373TxL\25\v[L"
- #"\214\304\367\353\312\262\371b\271\231b9"
- #"\305\2428f\212\337\356\330!\24\237g"
- #"\2468y\343F\241\370\342\30)\326\260\260`\303\270qB\361P<A(.\316"
- #"66\370\316\230\301\340\21#8\261Wl\203\362C\340\370?\3770d\344H\326"
- #"-\335\203~v\223|}6^\247\327"
- #"\270:\222\304\0\236\317\16\226\f\20\216"
- #"\2674\267AKS\e\357\331G\205\307"
- #"\354Zq\217\370\204hB\36\276\373\346"
- #"\213\345f\212\3571o\333Lq\234`"
- #"\263\244<3\305\274\177U\361\266\235u\337\5\253\24g[[\266{y\321y\240"
- #"\370R\307\373N\207\316\235\31\331o\26"
- #"\246\232\215_y\275\260\254\252\207\21w"
- #"\230<\327\235\204\244X\341s\330X\325!#3Mx\303z\357\252P\311\25\345"
- #"j25>\377\244?\a\376\25\253\307"
- #"\0011\363\305\227\277\17%e\276\370\276"
- #"\232)\276\321\206R\357*\17cb\220\365\354\2512.\317\237\352~d$"
- #"m\246N\245\265\275=m\352\325\343\343\272u\32160\310\327\367\333\275Q"
-) 500
-(
- #"#\26\373\372\n\337\340\373\264h\301\236"
- #"\213\27\351SP\253\330\2\230\332\245\v"
- #"{.^\224\354\254\373\276\341Z\247\16\362\354l\376=x\2206nn\245}9"
- #"\245\212\237\277?J\245\222\305+\276\245"
- #"\265\313`\364t\f^\274W\330\252\272\215U\35l\255\3520kQo\274\277?"
- #"\202\272\272\352\333\302N\357@\226o\236"
- #"\311\306]\363\361\32\372\213\320\265\365\352"
- #"\344\311\326\275\213\351\320\262\217P<\200"
- #"{\333\241\214\234\345\312\270A\363\321P"
- #"\27K\344\3103_\254jQ\243\300\367_\377>\344\231/:\326j\\`\374\353"
- #"\230\231V\341\314\345\375E\306\310\2632"
- #"\270\25|\201+\267Nr\345\326In\334\361G\241\310\346\330\231?\311Vd\t"
- #"\235\a@.\227\243\245\245%\34_\322"
- #"\310\224\312\"\232U\177\0\310d2\376"
- #"\354\324\211^\257\367\360.\200\350\2644"
- #"Z\374\371'\377\366\354\311\203\304DN"
- #"\206\207s2\"\202\363O\236\240\310\311!+'\aM5\265W\376\225\1\303\32"
- #"6\344\207\16\35\250Z\245\n\350\352\202"
- #"\236\36\350\350\344\23\234\344\364t\\\246"
- #"M\343\312\317?K\262W)\a\2\36<\240\313\202\5l\\\277\236\266\35:\224"
- #"\366\345\2741l\35\34HLL\344\346\225+\271\277?E\220\267t%SjS"
- #"\271\222-\25+T\346\307\211[\205\316"
- #"\223\243\314a\362\\w\252\230\3332u"
- #"\224\330CFbr\34\275\306\325a\313"
- #"\222k\230\231\252N\333\316\311Q\360\305"
- #"Wv\314\233\362\247\360\315\32`\330\364"
- #"f\f\3511\223O\232\250nq\0\271\331XQ1\217\204?\307\356\243\253\271\35"
- #"r\221o\306\256U\35,\3\377\313\207\370\337o\203IIK$+[\216\206\272"
- #"&\331\212\254W\376USS\307\261fS\352\325h\215C\2656\250)\364"
- #"X\261w\30\363\206\210\327v\f\\(\243\254\337\236?x\1\251S\261\"\27"
-) 500
-(
- #"\373\366\305\360-\251|xJ\n\v.]b\315\315\233d*\24/\204EK]"
- #"\35\267\2325\361h\320\0\367F\215r"
- #"[\277\26\",\345\210\21\20\32J\227\371\363\331\270a\3mE\255\314K\30S"
- #"KK\224J%^\236\236\264i\325\212"
- #"\217\e7F\273\210\32\30?\177\177\206"
- #"\216\32El\\\34\3\373\365c\306\224)\5\nI\236x\254Y\262\207JZ\215"
- #"I\317He\310\264&\364\370\374Kz\271\211\355a%\247<c\310\264&\f\352"
- #">\235\256\355G\b\215Y\276y&Y"
- #"\331\231\302\263\220\315\273\177\346\376\343\333"
- #"\314\36/\266o\a\260\353\310J.\\;\306\202\351\177\v\305_\v:\303/k"
- #"'\260i\261\230\241\342\235\373W\230\263"
- #"|\4[~\271\372\342\265\264\214dN_\334\307\t\177\37\316\6\34\"+;\23"
- #"uuM\24\212,44\264P\227i\260pd0\25\364\3056\337\23S\243\231"
- #"\265\241>\313\307\212/c\275\v\2\362"
- #"\301\357\201\310\25\na\361P(\225\324"
- #"\376\343\17I\3077\323\325\345DX\30"
- #"\31\343\307\243\2348\21\371\204\t('N$v\314\30<j\326\304' \0\223"
- #"\0313\220\215\36\215l\340@\264\373\364\301t\340@\"BB@\241Py\374\314"
- #"\254,\34%\30\35\246efJ\212\a\210OI\241\376\244I\302\361O\223\222h"
- #"8e\212p|tB\2\215\246M\223tM~AA4\2375\353\225\327\234m"
- #"m\331>i\22\335{\367\346\376\375\373"
- #"\257\274\267a\363f\32\v.\r\346\231\f\326+\244:>\17[\a\ad\272\272"
- #"/\276D\314\24+W\256\314\222\205\271"
- #"u\n\337\377\370#\237~\376y\221\361\256-Zp\357\366mn=7E\354\346"
- #"\341\221/\346\336\375\373|\321\247"
- #"\17\253\227l\245\222V\356\223\275\256\216>s&m"
- #"c\377?\eT^S\36\206\6\25\230;\345Ov\35"
-) 500
-(
- #"]%<\246\257\273\27\201!\342^X\235\333\16%,\"X8\36\240]\213^"
- #"\304\304\205\v\307K5_44\250\300\323\270\bZxh\323\244\273\214&\335e"
- #"\264\351g\302\376#\177R\277\252\a\277"
- #"\217{\312\346\251J6L\222\263y\252\222\265\23R17\251%,\36\0\206z"
- #"\2250\326\227f\246X\265b\3317S\374\340g 2\231\f\245\240sldj"
- #"*\316[\267\229j\224\360\361\257\306"
- #"\3040\364\350Q\256\r\20\313X\331\37"
- #"\32\312\360\243GI\314\314$\363\271\200"
- #"\350hjr\354\233ohY@\201\336\305{\367\30\273f\r\227\26,\20:\376"
- #"\251\300@\246m\332\304\205\371\363\205?"
- #"\303\257\a\16p>8\230\355\202\337\247"
- #"\377\371\370\20\21\37\317\252\321\243\205\342"
- #"'n\330\200\256\226\26\363\372\365\23\212"
- #"?~\343\6C\226-\303w\306\f\234k\344_\347^y\3748\e\375\3759s"
- #"\356\34\311))\f\e5\212\210'O\370s\313\26l\254\255\v=\256\350\323\376"
- #"\313\361\243\307\215#\360\352\325Bc\336"
- #"6\n\205\202\226\237~J_\217A4\257=Ve\306U9p-\320\217q\263"
- #";\274\310\274\322\324\320\246C\223\221t"
- #"t\232\201\261\236\270(\224\4\3~.\355+(\232\362Mt\tD\247\245a\241"
- #"\247'i\314\365\247Oi`&\236\227"
- #"\36\226\224D\367Z\265X\331\266\355\213"
- #"\327\374\242\243i\377\277\377\221\3\2709"
- #":\342\321\254\31\356-Z`\250\257\317"
- #"\345\373\367q)\340&Z\30\347\356\336"
- #"\245\231\204\302@\200\215'O\n\337\334"
- #"\345\331\331\254:v\214\243\337~+\24"
- #"\37\21\37\317\326\323\247\t\372\365W\241"
- #"xU\342\0010\272m[v\237?\317\204\321\243\3619z\24\267\317?g\313\37"
- #"\177\240\247\342g7h\370prrr\270\35\20\240r"
- #"\277\1rg\a\245)\36\0K\274\275124\246\245"
-) 500
-(
- #"\303\227(\262K\365R\312,i\351\311"
- #"\370]\332\307\361\263>\234\275r\b\231"
- #"L\306/\323\217ae\324\222\324x\310Q=\321/\247\20\312\5D\2\305\21\220"
- #"\e\261\261\324\227`^x%:\232\246\257\265/u\265\260 }\374x\222\345r"
- #"\366=x\200\317\211\23\f[\267\356\305\fECM\215\372\25+\362e\267n\310"
- #"4\236\377He2(`ry.8\230~-[\n_\317\365\207\17\211MN"
- #"\246\203\200\223-\300\337\347\317c_\245"
- #"\nu\253U\23\212_\344\353\313\210v"
- #"\355\250hh\2502\326\321\313\213\204\324"
- #"TvN\236\\\250x@\356\254r\371\210\21\330{zbff\306\37\253W\v"
- #"]K\350\235;Bqe\5\277\263g\371\337\274y\370\374~\345\225BA\31\357"
- #"\236\217\225\b\205}\256\227_\217\211\v"
- #"g\323\256\5\354>\272\232lE\26J\245\22-Mm>\256\337\221fu=\30"
- #"\321a\23jrCr2!\371i\311\\w\206<\231i\353\3520gp\0F"
- #"zb}G\356\206\373\261\376\350h\6"
- #"\374,\326\"\240\264\370\340\367@\244\20"
- #"\225\232Z\254\31\210$\1\211\211\301\305"
- #"\302\242\300\367\f\265\264\350\347\340\300\356"
- #".]^\354\251403\343@\267n\34\271|\231\346\23'r\347\324)x\372"
- #"\24\262\v~\34=\37\34,i\6\262\361\344I\372\273\272\n\265\330\5\360>x"
- #"\20O\201~\356\220+\b[O\237\306\253S'\241\370\250g\317032\22\252"
- #"K\251U\2712'\177\374\221\304\204\4\241c\277\213tpsc\313\312}\230\32"
- #"\330\275\362\372\373(\36P\264\351\343\343"
- #"\310\20\276_:\210\376\23\e\242\247U\221u_G\260ez\16\233\247*Y\347"
- #"\225\301\250Ow\363\221E?\3100|\321\323=C\236\314\370\25V"
- #"$\245\211\233/&\246FK\36\23p\177\37\317R\"8pQ\314\243"
-) 500
-(
- #"\353n\270\37\313|{\363$.H\370\34\245E\371\fD\2\321iiT\26t"
- #"\201\315\343Fl,\r\315\305\236:\322"
- #"\263\263\271\227\220@=A\257\252\274\370"
- #"\326VV\264\267\266\346\367\353\327i\370"
- #"\373\357d*\24\271Y^\16\16x\264n\215{\323\246\30\352\352r?*\nM"
- #"uu\252\v\nZ\226B\301V??\374~\374Q(\336a\374x\322\344\362\27"
- #"\5\216\252\b\n\17\307\332\314L\270E"
- #"p\274`\305}\36\256\16\16\250\1\367"
- #"o\334\240f\375\372\222\306\226u\356\335"
- #"\277\217\232\232\32\325M>!KZ\177"
- #"\260\367\202W\226\245\2\16\201\22\324d"
- #"\3524u\350\215\263\345Hdi\225P"
- #"\265\35\364\362\215\275ok\261\233\373\301"
- #"K\v%\217\271x\327\a\200k\17\16\b\215Yyp\20\t\251\322*\335K\213"
- #"\362\31\210\4\244.a=IIACM\r3\301\232\216\233\261\261\32415E"
- #"K]]r\274\f\30\333\240\301\213\231I\354\2301xX[\343s\344\bfC"
- #"\207\242\333\267/\eO\236\244\251@\275"
- #"K\36\366\236\236T\257TI\330\232\375"
- #"\356\223'\250\253\251\241!x\375v\226"
- #"\226l\2310A\370z\212\303\342!C\0300x0\212LimT\3132\n\205"
- #"\202\201\303\2061s\374b\262\344e?\345[\252o\26\24n\276x-\320\217\226"
- #"\275t\3510\330\214\343\376>4\255\343\301\252\tOY?1\203\314\2544N\335"
- #"\374\203y;\304\374\266^\276\261\213\22"
- #"p/\327\2601\344\211\270a\343\323\304P\ft+\342\341:W(~\311\250P"
- #"6O}7\346\221\345\2\"\201h\211KX\327%\356\177\\\216\216.t\371\352"
- #"u\352l\334\310\260\243G1\325\321!"
- #"\271\200\26\265\206ZZ\364\263\267g\267\273;\31\23&`\241\253\313\217"
- #"\177\375\305\205`\361\24\312\320\230\30"
- #"b\223\305\273\250\225\204\221\242TF\267"
-) 500
-(
- #"o\217\221\216\16K\277\371\346\255\236\247"
- #"$\371\3457o\364tL\350\360\361\230"
- #"\322\276\24!b\342\302%\365\334\200\202"
- #"\315\27/^?\316\327\277\364e\355<\177\362`\275\221\0\0 \0IDAT"
- #"\16,\313`L\207\335\3243\353\207\246,w\377\254\202A\25*W\250\315\254>"
- #"\377\b\235\343ib(5-?\246vU\261\364n\200\205#\356\342T\2633\235"
- #"\233L\27\0363w\3605\32\330v$C.\376\267\364\256P. \22\220:\3"
- #"\271!!\3\253\301\346\315\314}\336\370"
- #"\250 Ax\35\207\n\25\b~\366\f\377'Oh\242\312]7'\207\236v\271"
- #"\353\344Q\317\236\241\335\2737\335\177\370"
- #"\201mG\217\222\234\232Z\350\260\262(\bR\311\333P\377a\335:\316\374-V"
- #"\210V\226\361\363\367\347\307y\363\30?"
- #"\340\367R\353\232\330v\240)\335\306\210"
- #"g\376\1\244e\244\b\367\334\200<\363"
- #"E\35:\267\31\314\324\371\335i\341\241"
- #"\303\244\271\356|=l\a\232\211\316D"
- #"\335\203\354\327&\225\213F\204\220\222\36"
- #"\213\266\246A\301\a}\215\271\203\2571"
- #"\270\375rB\243\244\365h71\250\""
- #"y\211\311X\2772\211\251\357\237\27V\271\200\0\266\2f\207\366\e6p<,"
- #"\214\16\273vQc\375z\241\370\31g"
- #"\316\260\360\362e\241\370\366\326\326<I"
- #"Ia\325\215\e4\23p\343\365\250]"
- #"\373\205U\312\32\201\252\353\251\215\32Q"
- #"\323\304\204\210Q\243r\227\267\254\254\360"
- #"9q\2\213\341\303\361\374\345\27\"\242"
- #"\363\377r\227EA(\16\265*W\346\300\254Y|6|8\311\357\360\246zr"
- #"r2\237w\351\302\3629\a\250bV\363\215\264\234m;\320\224&\335e\364\370"
- #"\312Nu\360s\f\364\214\251T\301\222\34\301\242\23Ks\e\354k8\321"
- #"\302E,Y\342i\\8\256\215:\243\310\311f\357\361\365|l\357\301\372\231"
-) 500
-(
- #"O\371cR:\25i\231O8\362\320\322\324\243N\3656\\\275\277O\364\243P"
- #"\255\322GD=\v!+[\334\215\327D\337\222\204\24\251\2bARZ\271\200"
- #"\274\2274\22X6r\177\2366ZAG\207M\237}&\34o\250\245%\24?"
- #"\265Q#\252\31\0322\256aC\216|\361\205\320\361k\232\230p\250{wZV"
- #"U]\374d\241\247\307\275\241C1\327\323{%\233+x\350PHO\247\372\270"
- #"q|\365\333oD\304\305\251<\326\273\210k\235:ttqa\257\240U~Y"
- #"d\317\276}t\370\364s\34\254]\201"
- #"\374YI]G\331\320\244\273L\322\354\300@\317\30]\35}\306\364\233#~\35"
- #"+\37\240\253c\300v\337%B\361{W\205\262l\3661\216\372m/\322\3056"
- #"&.\234Ek<q\37iMF\252\202\237F\\%)9\t+\375\326\257d"
- #"O\25E\23{\217\27{\e\"h\250kQ\305\324\201\307\261\342n\274&\6\226"
- #"$\244Hs\3435\326\263(\237\201\274\257x\bl,Om\324\210\32\306\306\370"
- #"v\351\"t\303\316\213?\330\255\233\360"
- #"\r>l\304\b\274\333\264\241\252\201\352"
- #")\270\241\226\26\367\206\16\25:vQX\31\30\340\335\2725\217F\214@=%"
- #"\5\273\261c\361\\\275\232\210\370\370\377"
- #"\327q\313\"\36M\233\342\263K\254/uY\300\326\301\1SKK\262\262r\335"
- #"[}\376\336E{\327\374V&y\374\340\265\231\212&\225\251S\323\5\205`U"
- #"\341\336U\241\254\232{\232\245\e&s"
- #"\351\306\t\24112\231\214Y_\255f\323\256\5\204>\26\253S06\254H\227"
- #"v\303\331\272wQ\276\367\362\204\243\307"
- #"W\265\311\222\203\367\2700<\232\374\216"
- #"\245Q=Z\1774\234\203\227\362\217)\f\347\232\356\4\207\237!"
- #"-3Qx\214Me\27I\313X\25\212\261\204e\244oAb\371"
-) 500
-(
- #"\f\344\375\303\301\324\224\21666*\343,\364\364\270?l\230\360\r[j|i"
- #"ce`\200w\253V\4\17\e\6O"
- #"\237\342\340\351\311\231\240\262\237\207.\5"
- #"7''N\\\272D\314\323\22\252 {\215<A\360\363\367\27\212\337\264n\35"
- #"\206\206\20685m\312\256\275{\371\347"
- #"\344\2778;\24nW\337\320\321\225\277"
- #"\226\337%[\221\315\230oZ\23\227\20"
- #"%t\36\207\32\316,\236\345\313\354\337"
- #"\6\v\213\210\245\2315\243\373\375\217\37"
- #"\227\r'G\260\224{@\267)\34:\271\345\225Y\310\265@?<\3069\220\243"
- #"\204\337\247\204\360\205\2237F:\377\375"
- #"\315\2705\236\202\177\340\26\236\t>\361"
- #"\27g\31\313\326\302\205\320(1\343E"
- #"\310\335\3\21\275\236\27c\364+\223\230"
- #"*\366\363x\227\370\340\5$h\360\340"
- #"\267\346\304\373.b\245\257\217w\353\326"
- #"\234\352\325\213>?\377\314\211\313\3226"
- #"\30\3132\206\272\272x\272\2711\177\336"
- #"\274\377\367\261\374\374\375qtr\2224f\323\272uXXX0z\3348\34\235"
- #"\234X\272l\31\361\317\236\25\32\357\332"
- #"\242\5\217\202\203\331\260f\rc'L\240reK\242#\213^b\324\3273\342"
- #"\347\351\273pm\354\316\340)\215\271\25"
- #"|^\350\332\212#\"\335;\214F_"
- #"\317\210\355\373\226\n\305\277>\v\271x"
- #"\3758_/\356\313\262\257O\323\263\2217ZY\371\37\266\ft+J\236\205H"
- #"]\306\262\251\354\302\303h\t\2\242o)Y@\214\312\227\260\336Oj\nlp"
- #"\347\221\235\223\203\375\206\r\222\216\237\251"
- #"P\340(\241\0.-;[R|\262\\N\203\315\233\205\343\34332\250/\20"
- #"\357\\\251\22\333\335\334\350\274p!\262"
- #"\236=Q\367\360\340\214\240\325\307\275\250"
- #"(ZJH\233\rx\360\200\306\323\305\323\"\1\266\371\371"
- #"\t;\370\236\16\fd\300\257\277\322`\362d\274\334\335Y"
-) 500
-(
- #"Q\200\243r\236 \254\333\260\201\257&L\340cWW\232\24a\3712h\370p"
- #"\202\356\334\221\344\306\353\332\242\5A\327"
- #"\256\21x\365*+\275\275\271|\345\n"
- #"\35\273\250\356q\321\310\331\231\204\304D"
- #"\276\350\324\227o\227\364W\31/\223\311"
- #"\30\364\305t<\a-\340\347\325\342\355\210\35j83w\322vVn\23\3631"
- #"\223\311dL\e\265\234\223\347w\v\237"
- #"\343#\373fl\337\367+M\272\313\230"
- #"4\327\235\251\375w\240\225\354LQ\35e?s\361\342A\224\270\343o\303\32n"
- #"\222n\326\325*\325\243\360~\215\3711"
- #"\3223\27\266$\311\243\334\215\367=E\212\eoDJ\nM\266o'b\344H"
- #"\341\343_\214\212b\354?\377pI\320"
- #"\214\360Tx8\323\374\374\270\320\267\257"
- #"P\374\346\240 |\357\337\307\247sg\241\370_\257^\345|d$\333%t\356"
- #"\353\261\177?\346zz\354{\370\220\215"
- #"c\307\322\326\331\271\320XEN\16-\277\371\206!m\3320\272}{\225\307~"
- #"\22\37O\343\0313X6|8\335?\376Xe\274<;\e\317u\353\360\v\n"
- #"b\317\264i\205\269\372\5\0051j"
- #"\345\312\27\251\256\243\332\265cP\353\326"
- #"\230\32\30 \353\331\23ez\372+\361\266\16\16dff\322\275kW\\\234\234"
- #"pqr\242\256\243#\32\32e\303\254"
- #"A\246\253K\260\277\202\204\230w\367\231"
- #"\357\342\365\343\374\340=\204E3|\261\320s&>\2$4\347\373 )w\343"
- #"}\217x\222\232J\25\211V&R\212\3\1\316EF\322\35453\305\242\360\t"
- #"\16f@\235:\302\361\e\3\3\231'\330\27\3\340xX\30W\242\243\t\32<"
- #"\230~\366\366tZ\264\210\203S\246\320"
- #"\322\305\245@\263\306%\373\367c\254\247\307(\201\324byv6=\27"
- #"-bP\253V*\305\303\321\313\213\237\372\367\307\373\340Ad2\31~?"
-) 500
-(
- #"\376X\244\1\343 oorrr\3302a\2\256\257}\177t\265\2648s\346"
- #"\f-_\232a\224e#E\277\263g\321\325\325%)\356\335\24\17\31p5\320"
- #"\217i\v\276`\316\330\203h%:\363T\334J\352\203%\367\331\276l;\r\274"
- #"\233\277\221\245\304\223\224\24,%\n\310"
- #"\225\350h\\\4\275\260@\232\200$ff\342\377\344\t\235\5\355\334\257?}J"
- #"lz:\35\212\350\211\3612\n\245\222)\247O3\257E\vt54p\255Z"
- #"\225\3\335\272\341\266h\21g.\345_R\b\f\17\347\347={X5z\264\312"
- #"\"7G//\372.Y\202\256\2666?\366Q\335#;(<\234n\v\26\320"
- #"\320\326\226C_\177\255\322\2757\364\367\337y\264re>\361\082{6\355"
- #"\5\r\34\313\2\35\334\334\330\275\365\340"
- #";k;~5\320\17\257\37;1\253\337A\314d\205\327q\274\257x\255\254N"
- #"p\2704+\227\304\324h&\256\266y;\27\364\6)\27\20\tD\246\246RE"
- #" \305\366e\212r\327-\210\363\221\221"
- #"4\23\364\236\362}\360\200O\253UCOp\231ec` \375\35\34\204\235u"
- #"\377\270}\eC--\372\276TL\230'\"\35\27/\346\367\235;Q>O\316"
- #"w\364\362\242\337\322\245|\333\263'\326"
- #"\2\325\367A\341\341\374s\353\26\177N\232$\344\235U\263re\266yy\261h"
- #"\320 a\257\255\302p\255]\233\f\201j\377\262BFf&\265,]K\3732"
- #"$\243T*\3619\264\34\257\37\335\230"
- #"\325\377 \326\246\342m\4J\202\342\334"
- #"\330\307\375n\311\246\23\236<K\211P"
- #"\35\374\234\270\344\307,\374\273\243\244s"
- #"\355\2770\237\270\2440I\327V\32\224"
- #"\v\210\4\"SS%\315@\244\272\353\336OH@SM\215\352\2"
- #"\2751 w\371J\244\206\5 +'\207\255w\3560\264\200\256\206"
-) 500
-(
- #"\5a\271z5SO\237\306\313\311)\337$\332\265jU\202\207\16\345H@\0"
- #"\315'M\342Nh(A\341\341D\304\3051V\320\312\335\316\322\222}3gR"
- #"I\360\263\336[\266\214\276\22\372\230\250"
- #"BGK\213\230\260\262\377\a\32\35\23"
- #"\203\216\216\16\211\261\377?\321,i\36"
- #"F\334a\370\214\346\234\275|\214\305\243"
- #"C$\211\307\364\365\216e\366\306\236\230"
- #"\32\305\361\253\277\v\e6\346\241\256\246"
- #"\311\252CC\204\343\257=8(\351\370\245E\271\200H@\352\22\226Tw\335s"
- #"\221\221\371\232I\25\206\345\352\325\34y"
- #"\364H\330\254\321b\325*b\322\322\370|\267X\306LTj*\t\231\231\314*"
- #"\244f\301R_\237=\356\356\f\260\267"
- #"\247\361\254Y\230\e\30\260k\352T\341"
- #"\331Mi\333\244xu\352\304\374\2313"
- #"\v\334\307)K\374\264p\21\303\372z"
- #"\2753\335\6\363f\35\203\2474\246\205"
- #"\343@\356\205\336f\227\337\\I7\366'qA\305\272\261\37\vX&\351\306\256"
- #"\257S\201\fy\n\e\216\217\25\36c"
- #"\244g\216c\3656\302\206\215\220\353\203"
- #"enR\223o\372\236\22\36\263p\304]\341\330\322\244\\@$\20)a\23\335"
- #"a\303\6\306\377\373/\r\5\315\24\355"
- #"7l`\340\341\303\334\214\215\25\212\217JME\256P\320y\357^\241\370g\31"
- #"\31\30hj\n\331\252\0\330\30\0311"
- #"\256aC\376\351\331\263\320\30\0310\266"
- #"~}\202\207\16\245\251\205\5\323V\255"
- #"\342\316\375\373B\307/m\274:ub"
- #"\355\241C\234)\303\225\351\247\317\370\263"
- #"~\303\6\272\266\22\313\22,\tz\215"
- #"\253S\250\253n\336\254\343\334\345c,"
- #"\3712\204\226v_\341R\253+\307\2\2261g{+I\347Q*\225\222\236\330"
- #"+\31\333\240\251\241\303\270.\342V5\277\215\t\307@\307"
- #"\224o\372\236\26\0363\260\355\257hk\32P\301@\274@"
-) 500
-(
- #"xr\217\375\344\344dK\32\363\256P.  T\333a\277a\3\aBCq"
- #"\337\273W\310\34\261\216\251)\27\242\242"
- #"\360\177\"Vp\224\347\235\325EB\177s\3MM6t\350 \24k'\3017"
- #"\v t\370pa[\25K}}\366t\351\302\0{{\32\316\232%t\374\322"
- #"\306\302\304\204\3\263f\321~\350P\204"
- #"L\226J\201\317:w\302\373\207\3\230\32K\2539\20\245\307Wv\5\366\334("
- #"\212\207\21w\230<\327\275@O\253\1"
- #"\23\e\342\372\321@F\265\333\215\276F"
- #"n\315\203[\343\251\30\352\231Q\327\272"
- #"\255\3609*\31\333\340b\327\215\254\354"
- #"t\3222\305\314/\227\214\n\345s\27"
- #"/\316\334\26\257\211*N\325z\255*"
- #"\315\270\367\344\234p<\24\317\260\361]"
- #"\241\\@\200{\317\236![\262\344\305"
- #"\227\326\322\245\350\376\372+g\376\375\27"
- #"\356\334\201\360p\334\237/-\231hk"
- #"\v=\305\347\355Mt\262\265\25\272\206"
- #"<\267\334\251\202\335\374\244\nB\360\e"
- #"\360\315*\212\274\206VY99\374[@\206VY\304\265N\0352\262\262\340\265"
- #"\232\220\262BFf&\2165\\\205Z\324\272\217\254N\223\3562z\216\25oW"
- #"\374I\223\256\354<\270\214!\323\232 Z\16fcU\a\327\306\356L\375\251\e"
- #"\231\362\377\276o\327\2\375\310\316\316\242"
- #"\211\365\bd\312\377\2261\215\365-X4\"\204[\17\217q=\364\220\3209\226"
- #"\214\n\345\313N[h\\\273\a\333\376"
- #"\235\"\374y\244\332\236\200\364\252\365J"
- #"F\326\250\253i\22\223\360@xLA"
- #"\206\215\262\347\215\334\203\302\374\30\366\213"
- #".C\26k1p\241\354\305\327\220\305"
- #"\357\206;\306\a_H\350\240\253\313\351:u0\327\324|\345u\277\344d:\334"
- #"\275K\306KO\2472@]&#[\251DKM\215"
- #"Q5j0\243aC\252\232\231\201\216\316+\343\223\345r"
-) 500
-(
- #"\234\267n\305\277wo\314%\366Q\177"
- #"\227\t\210\211\241\313\336\275l\374\362K"
- #"\332\n\24\6\2266\272\375\372\361\350\374"
- #"y\314%\324\322\224\4\276\373\367\323\255"
- #"W/.\354\22\233\35\375\272a\n[\367.\246\232e-\274\277?J\25\v\325"
- #"\17.\361\t\321\214\372\372\23\264\265t"
- #"\261\256j\317\367\3437\240\255%\326="
- #"s\356\357#IL\216c\376\264\277\270|\343\37~\370m\bS<|\251bT"
- #"p\221ip\204?\277\357\357\307\217\203\256`\250+\266o\227!Of\372zG"
- #"F\273m\304\261\272\330\336\306\316\3233"
- #"\311Rd\322\277\315/B\361\362\2544"
- #"&\254\254\306\342Q\17\320\323\26k\255"
- #"\374\353\336\0364\266\373\202\346\216E\273"
- #"\2\304'\207\263\377\342\2\376\275\276\232"
- #"l\205\0345\231:2\231\32\212\234\377\252'5\324t\30\340x\f+\243\374I"
- #"\6s\316\312\204\205\275\264\370\340\5\204"
- #"b\336\344\302\345r\26DE\261&&"
- #"\206\314\234\34\264d2\334\314\315\361\260"
- #"\263\303\275^=\f\5\333\330\276\217\274\20\2211ch\333\264ii_N\221\314"
- #"\334\266\215LCC~Y\271\362\255\235#<\"\202\5\213\27\363\327\256]D>"
- #"|(4\306\330\334\234\244\344d~\234"
- #"\270\25\327\306\356\350\351\26\235\255\26\237"
- #"\20\315\210\231-\350\326~$\333\366-"
- #"aD\257\357\350\361\371\227BM\247\344"
- #"Y\231\314_9\206;\367\257\260x\226/\226\3466*\307de\313\361\234\335\1"
- #"\263\212U\t\270u\252H\361\310c\227\377l\36\305\\cb\367=*\217\237\307"
- #"\245\340\277\331yz\26?\r\275\201\206"
- #"\272\266\312\370\224\3648\246\255\257\303\334"
- #"\301\327\250` \226\16\377\333\336\236\270"
- #"\330u\243\205\343\0\241\370\3\27\27\22"
- #"\233\364\210\301\355\226\275x-C\236L\300\375}\\\274\343"
- #"\303\365\320Cd+2\321P\327\246Y\215\221\270\332\314\340"
-) 500
-(
- #"\326\343\3<~v\221N5\327\n\235\3\312\5\344\335\340\r=%'+\24\354"
- #"KH\300\347\3313|\343\343\351lfFo{\373\17VL\374\"\"\350\264g"
- #"\17\a'M\242\245\340\262\\i\20\235"
- #"\220\200\315W_\221\236(n\377\355\347"
- #"\357\317\350q\343\b\274zU(\276\246\243#\17BC\1\230\342\345E\255\2325"
- #"_|U\263\262BM-\377J\262\266\2611U+[S\335\262.\1\267O\341"
- #"\\\267\25\355\232{\b\211I\354\263H"
- #"\346\257\34C|B\f\337\215\377\3\233"
- #"\252b\331n;\366\377\312\37\177\315\343"
- #"\247\251;q\256\253z\323\373\314\345\375"
- #"L\236\327\225\36\237|M\327&\377S"
- #"\31\257\310\311f\356\216V\264\254;\210"
- #"O\e\214\26\272&\200%\273\273b["
- #"\271\21\335\232\211ytI\235\205\234\277"
- #"\363'\347\202\2661\261\273XBJp\370\0316\3773\201\257\373\234|!\32W"
- #"\357\373\362\221ug\34+\366\306Z\333"
- #"\35\r^\375\31E\246\\a\377\375\21\214l \366;\3\357\206\200|\360{ "
- #"5\257_\27\216\315V*\261\277q\243"
- #"\300\367\f\325\325\351W\261\"\273k\325"
- #"\"\301\305\205\336FF\370\4\5a\266"
- #"z5\262%K\320\376\365W\272\357\334"
- #"\311\266\313\227I.\242\317\370\3332G"
- #"\314\343QR\22\215\266m\23\216\a\bIH\300u\347N\341\370+\321\321L>"
- #"u\212\223\36\36\364Y\266\214\23\347\213"
- #"v\204\365\v\n\242\271\204\315w\245R"
- #"\311\362\303\207i:s\246\312\330\344\364"
- #"t\266\371\371\321\375\347\237q\236:5"
- #"\337\373\26&&d\310\3458:9\261"
- #"\333\327\227y?\377L\277\301\203q\372"
- #"\370\343B\315\24\a\16\e\226\317H\261"
- #"(3\305S\307\2161\356\313/\261\261"
- #"\266\246V\315\232\204\334\273\207\367\212\25\270u\353\306'\205"
- #"X\276\310\345r\16o\273\303\302\31\273\331\267\372\21\355\232{"
-) 500
-(
- #"p\374\254\17\343f\253N\232\250T\301"
- #"\222\2053\366\320\261\365\0Imd\373t\236\300\324\221\336,]?Ie\354\305"
- #"\353\307\371i\305\30<\273o\"\340\356"
- #"a\241\343\253\253i0\252\343\6\374\3\267\b_\23@\3776K\270\376@l\377"
- #"\4\336\216\371b\206<\231\263A\333X"
- #"\272\247;?\355l\307\303\350\0\276Z"
- #"f\306\371\333>\3246\366`Z\263\4"
- #"\334\253\354\245\246v\277|\342\1`\256W\17\231D[\222Jz\345f\212e\36"
- #"\231L\206\262I\23\241\330\b\271\234&\201\201D4l(|\374S\311\311L\v"
- #"\v\343\270\203\3\373\22\23\361y\366\214"
- #"C\317\236\221\243T\242.\223q\254[7Z\276d-\362\266\315\21{\354\333G"
- #"\00333\276\23\\Z\312\310\316\246\361"
- #"\266m\314h\322\204\376\2u\ea\311"
- #"\3114\333\261\203\265\355\333\323\321\306F"
- #"\345r\326\361\e7\30\262l\31\2763f\340,\220\201v'\"\202\241\313\227c"
- #"al\314\312\321\243\251lb\222/\306/(\210\321\253Va_\245\n\247n\337"
- #"\246U\335\272x4k\206{\243F\5\316\6e\317S\225\373\366\352E\275\272u"
- #"\251\343\340@=GGj\330\332\242^@\r\217\324\31Hq\220\351\352r\375H"
- #"\16\231ie\317\v\351\342\365\343\374\360"
- #"\333\20\246\365\366\245\262A\321\313V\3572w\303\375X\260\263\39J\5j2"
- #"5\352V\353\310G\226\36\330\231\270\203"
- #"\334\220\254\364\374]!\3374?\212\265"
- #"\216)5\312\315\24%\360$+\213*\257m\266\253\342\\J\n\315\f\rsg"
- #"(\246\246\36435}\361\236_r2\237\357\331C{SS<j\324\300\335\301"
- #"\341\255\232#\36\17\v\343JL\f[\4\253\305\1\2769{\226\6ffB\342"
- #"\221\222\225E\227\275{\31\337\260\341\213&]\316"
- #"\346\346lws\243\325\242E\234\375\356;\232\326\257"
-) 500
-(
- #"\377\337\365\b\212\207\365\2301\\\234?"
- #"\237\277\316\237\347\307\277\376\342;\17\17"
- #"\276\354\320\241\320\365\375\201\277\375\306\243"
- #"\247O\371\246G\0176yz\252\\B"
- #"\324\322\320\300\326\326\226m\2026\372\256-Z\274U\361HNNFG[\ey"
- #"F\331\23\217\220\207\327\0317\273\3\337"
- #"\r>\362^\212\307\213\275\214\273>\334"
- #"zx\214\261\355\216a\222\331\222\354\227"
- #"\234o\344\342\253\235\377O\312\276\231b"
- #"\271\200H\340\211\\\216e1\4\244_!V&\256\206\206D:9\345\356\235\334"
- #"\273\307\260\313\227\311\314\311\241jN\16"
- #"-\314\314\250Z\241B\221\307\226b\216"
- #"\370\2721\242\b\aCC\361\275\177\237\200\1\2527\27s\224J\6\36:Dc"
- #"\v\v\2467n\374\312{\256U\253\262\276C\a\6\374\366\eW\26-\242\331\354"
- #"\331\214j\327\216\237\367\356e\347\344\311"
- #"*g\36a\261\261|4i\22\365\252W\347\334\274y\330\2520\247\334<~<"
- #"\243W\255\242\237\253\230\177\224{\343\306"
- #"t+\242`\262\244\331\263o\37\237\265"
- #"\353\204\262\214\225\247$\245\3043y^"
- #"W&\366\336\212\235\271j\253\376w\205"
- #"\227\263\245d\310p\260\354\210cE\17"
- #"\332\271lB3\331\220\3223\1(\333"
- #"\342\1\345{ \222\210\314\312\242\212\304\356\205\347SRhVD1\336\313{'"
- #"kll\350db\202FF\6\16\2337\347:\336\26a\372'\305\34\261 c"
- #"\304\242\210NKc\324\361\343lus\303@\205hZ\256^M\273\277\377\346q"
- #"J\n\277\265iS`\314\220\272uq\255Z\225\21\213\26\21\24\36\316\267;v"
- #"\260s\362d!;\223\n\372\372X\233\231q\342\373\357U\212\a\344\326w\4."
- #"\25\353\222\a\317{\245\377\375\267p"
- #"\374\333f\347\337\273h\333\254\360\336\347\245\201R\251\344"
- #"\207\337\206\360Q\315Oq\256.\326\253\346] 8\334\217"
-) 500
-(
- #"i\353\34\310L\201\361\215\0360\375\343"
- #"\f\272V\337\215\235~?4\325\304|"
- #"\332\336\6\363\317\353\360(I\334\372\244"
- #"\264(\237\201H 2+K\322\f\344~f&\2322\31\325\5E\307'>\236"
- #"A\225*\321\313\324\224^\25*\360\371"
- #"\331\263\264\17\f\304\303\332\32w\27\27"
- #"\f_2\36\3143G\364\353\325K\345q-W\257&#;\233\265\355\333\v="
- #"\323X\256^ME\35\35z\332\331\321X\300I8*5\225\250\324TjW\250"
- #"P\344\354fY\23364\331\276\0353}}v\315\234)\354\205\25/\241Cc"
- #"qpsvf\360\262e\220\225\5\22g\230o\203c'\2163m\360\366\322\276"
- #"\214W\3609\270\214'Qa|\335S"
- #"<\231\242\254\222\267L\265\356\360\b\224"
- #"\310\30\370\321\21\252\350\212\231=.\275dI\235J=i^u\6\206Zb\205"
- #"\271\305\31\223\235\223\311\261\320I\200x"
- #"\253\335\322\240|\6\"\1\251KX\347RRh*h\377ny\365*G\22\23"
- #"\251\377\274\3500oy\313\243B\5|\36=\302b\375z<w\357&\"*\212"
- #"\372\2337\323\335\327\27kCCj\253"
- #"X\346\2\325\306\210\5\305\337\216\213\343"
- #"\220`\315\202\210o\26\200\276\246&\333:v$M.\207\310H\241c\227\4\206"
- #"\272\272\310d2b\202\202J\373R\210\216\211A&\223\241\243UzO\277\257s"
- #"-\320\217e\233g2\274\335&45tT\17(\5&\254\254\246\322|1>"
- #"9\234M'<\31\273\334\202\2637|\220g\247\323\240\322Pa\361\0H\311\212"
- #"\342R\344r6\337\0267m,\316\30\35\215\nd*\304l\\J\223r\1\21"
- #"\304\341\306\r|\23\0220\26\334?\260\277q\203\201\367\357s3-M(>*"
- #"+\v\271RI\347\273\377\271p\276\274\274\25\\"
- #"\277>\244\247S\373\317?IOM\345@h("
-) 500
-(
- #"\261\202\26\34\2427\370\342\306K\361\315"
- #"j`f\306\351^\275\350\263q#'\316H\263\354~\233xu\352\304\374\205\v"
- #"K\3732\370\351\347\205\f\351\345U\332"
- #"\227\361\202K\327\217\363\365\342\276|\333"
- #"\3774\325*\325W=\3405\212c\263>\306\333\224\201\veLZ-\356\v\27"
- #"\237\34\316\262}\371\e\223e\310\2239"
- #"\27\264\215\245\273\2733u\255=i\2110\326%\4w\253\335\350hT \344\231"
- #"\270\17\26\200\276\246\5\325\214Z0\260"
- #"\256\270\eoq\306\330\32\267\243M\365\237$][iP. Phm\307\313"
- #"\324\321\325%&+\213\37\"\304\376\20"
- #"\334\237\247\227v\21\230!\344a\240\256"
- #"\316\206B6\224\255\264\264\360\266\266&"
- #"\312\311\211I\26\26\350\253\251\21\235\222"
- #"\302\231\220\20\225\307\225r\203/N\274T\3622\263:{{\227\31#C\257N"
- #"\235X\261wo\251_\317\252uk\351"
- #"\321\241l\270\357\312\200\211s\335\361\354"
- #"\276\203\352\25\235\361ZY\235\201\ve"
- #"L]+\356\267U\34\233\365\324\214g\0\364i%\336\20\274J\305:\344(\263"
- #"\t\216\370o\226}7\334\17\317\25U\360\277\351CM}\17\274\\\242hc\341"
- #"\215\276z\3562\322\344&\261(Q\22"
- #"\235*^\v\326\255\366V\224\312\34\341"
- #"\245\250\342\2161\322\266\"I^\366\373"
- #"\325\224\v\b\320\343\245\324\332\302\360x"
- #"\36\323\251\200\272\203\202\230jiIM"
- #"mm\246V\256,\24o\247\243\303\241"
- #"\332\265i\251\242\301\222\241\272:_\232"
- #"\233\223\322\250\21\207\355\355i\265\177?"
- #"_\355\337ODJ\212\320y\312\n\256"
- #"U\253\202LF\214\3402\331\333\306\302\304\244L\30+fdd`\254\377v\334"
- #"w_F\304|1.!\267\270\316\366y3\250\217\35r\367\333*\31[\243"
- #"\24\254\200\250dl\203c\3656\350j\31\"\317\26\373\336V\251X\207\26u"
-) 500
-(
- #"\ar\340\342\317\302c\26\f\v\244_\353\305l:>\216\330\244Gl:\341\311"
- #"\334\35\255\351\337\320\27\367\252\273\251\255"
- #"\337\17-\365W\377\266d\250Q\257R\177n<\335$t\16\200j\206\315\211I"
- #"\273A\226\"\365\255\2161\322\262\")S|\326VZ|\360\2b\257\243\203\227"
- #"\300F\261\273\211\t\265tt\204\5\301BS\223{\r\32\3443i,\214\340\372"
- #"\365U\212\307\353\270\32\32\362\250aC"
- #"\324SR\260[\267\16\317c\307\336)!\361rrb\276`\203\253\222@[S"
- #"\2234\301~,o\203\324\324T\264\265T\373=\275N\236\30\364\370J\254;%"
- #"@\273\26\271b\360,1\206=\307\326"
- #"\220S@\303\365\215\273\346\323\245\345\177"
- #"\263!\267\306S17\251IJz\34\313}\373\b\335\334\227\214\nef\357\177"
- #"\260\266pb\305\376\376(\5r\223\27\f\vd\214\333&\252\2337\20\36\3`"
- #"_\355\23\22\323\242\231\262\2466\331r"
- #"\230\3304\fK\215\202\263\2\363hh>\224[O\267\220\243\314*2.\17\r"
- #"5]*\353;\3618Y\274\302\2578c\f\265\254H\226\207\v\307\227\26\37\274"
- #"\200\334\251__\350&o\250\256N\210`lIb\245\245\205w\265j\0047h"
- #"\0\261\2618\374\361\ag\4\227\331J\e/gg\326^\271\302\231[\267J\373"
- #"R\0hbg\307\2317\274/\23\36\21\201\347\244IX>/\254,\2123g"
- #"\317\342\334\240\311\vA\350<\242\32a"
- #"O\202U\216\313\23\203\350\330\307\214\232"
- #"\345\312\211\263>(T\2640\34\330m*V\225k2\353\2535\370\34\\\316\240"
- #")\215\270r\353\344\213\367\257\5\372\341"
- #"{|\35m?\372o?\306X\337\202\305#\357\361}\377\263hi\3521{\313"
- #"\307\304&>Ty}\0\203\333-'%#\236\277\317|'\24/u\314\335p?\246\257\253"
-) 500
-(
- #"\203]\225\226\350h\30\323H\177\16z"
- #"2\325KF\246\272\2651\321\251\301\275g\342V)\326F\255%\247\330J\35c"
- #"\244]\215$\371cI\347(\r\324g\317\236=\273\264/\242TY+\356\216Y"
- #"\2261RW\307\315\330\230\317MM\351\341\357O\3\23\23j\b\366b/-\f"
- #"45\371\314\306\206\36\2336\321\240F"
- #"\rj\b\314\4\337&\241\321\321\204FG\323\266S\247Bc\302#\"\370z\366"
- #"l\206\217\36\315\24/\325\233\335NM"
- #"\233r\344\3301RRS\211\214\212\342"
- #"\326\355\333\204GD\220\234\234\214\206\206"
- #"\6\206/\3553\255\337\270\21\363\n\265"
- #"\250lZ\233\333\301\27\260\261\252\303\236"
- #"ck\370\363\300o<\216\fA\t\230W\254\212\206\306\253\0171\265m\32p\362"
- #"\302n\266,\271F\245\n\226\354<\340"
- #"\315\232?\177 S\236\201\215\225\3\272"
- #"\332\371\273h\352\352\30\320\273\363xj"
- #"Ts\344\213\317FcbT\221\237W"
- #"\215\305\377\312\1\344\362L\26\256\365d"
- #"\316\227G0R\257\225o\254\232\232\6.v\335\310V\310Yup05-\233"
- #"P\311\330\246\310\357\203\232\232:N5;\263\345\37/\ftM\251n\246zC"
- #"^t\314\355G\307Yq` \23\335"
- #"\217\342\2401\236\310\244\eD\247\336\300"
- #"\326\244`\237\261\327\311Qfs7~\27\216\225z\v\305+\311\341z\314\0374"
- #"\264\30.\24_\3341\27\236,a\346\267\252}\311J\223\17~\6\"\205\242\314"
- #"\24\v#Y\241\240\201\204'\354\370\354"
- #"l\352K\210\217\316\312\242\321\355\333/"
- #"\376\337Y[\233\355\265j\321\375\320!"
- #"\316\334\274\231/\2768f\212~\21\0214\337!\336*tgp0.[\267\n"
- #"\305:\231\233\323\253V-:\374O\265\233k\36\1\17\0360t\371r\32"
- #"L\236\25426\370\311\23~=p\200\317\347\314\301e\332\264|\357\373\5"
-) 500
-(
- #"\5\341\350\345\305\211\2337I\316\310`"
- #"\203\257/\335z\365\242\256\2633\37\27P\311\336\252}{\226\255XATt\264"
- #"\220\231\342\313F\212\255?\371\4\200\223"
- #"\247O\363\303\334\271\264\371\3543\\\333"
- #"\376\327\251\357\344\351\3238\327m\305\300"
- #"nS\251ba\313\342Y{\331\265\342\36K\277=\210\225e-\376<\360\ec"
- #"\277\317\177S45\261`\327\212{\230"
- #"\231V\241]\213^\254\236\347\307\242Y{y\34\31\302\304\37\v\27\303<d2"
- #"\31m\233{\260m\351\r\354k8\363\323\3121\314\231\270\3S\265\242\255J>"
- #"s\231\300\240v\336l\375W\354&g"
- #"\250[\211q]\376\344\350\225\337\204\342"
- #"E\306\334\r\367c\351\236/\30\320x"
- #"\aD8\223\225\t\255\253\317\341q\262"
- #"\370L\322\261R/\2222\305\227\213\254"
- #"\f\232\242Pf\n\307\27g\214\201\226"
- #"%\272\32e\373\1\20\312\315\24%\331"
- #"\271?\312\314\3045(\2100\tf\212\233cc\361MH\300\247V\376'\271\202"
- #"\3705*\212\363\251\251l\257YS(~bX\30\272jj\314\263\262z\345u"
- #"\277\344d>\277{\227aU\2520\343\323O\251\372|6\"\325L\361xX\30"
- #"C\216\34\301\267kW\234UT\201\347"
- #"(\225L<u\n\337\373\367\361\355\332\225\217*\25\3358\350N|<C\217\36"
- #"\305B_\237\275\367\356\241\374\353\257B"
- #"c\323\345r6\237:\305\312\243G\311"
- #"\310\312\302\253S'\372\264l\211\321k"
- #">WyF\212\237\326\253\307\341k\327\0\350\350\344DG''Z\327\255\213\236"
- #"\366\253{\f6_~\311\243\247O\351\332\27016\346\346,?|\230\303\373\366"
- #"\25j\265\236\327\333c\377\301\203\204\336"
- #"\271S\344\347\223\212\216\2611\247\377\212G\246\310?c(I\232t\227q"
- #"d\271\222\230\207\245z\31E\22\237\34\316\376\v\v8us=\375?:"
-) 500
-(
- #"BU\t\265\34\357\22\345f\212\357\21\341YYXI\2642\361\211\217g\200\212"
- #"\e\351\313l\214\215e^\265jB\261\21r9[cc\t\252\237\177j\357j"
- #"h\310\335\372\365Y\20\31\211\303\226-\34rs#C[[\222\231\242\24\361H"
- #"\314\314\244\357\301\203\244egs\271\177\177*\352\24^p\246P*Yt\3712"
- #"\277]\273\306\322V\255\360\250]\e}oo\356\207\207S\363u!\f\nb\344"
- #"\212\25\244ffbcf\306\314/\276\240{\223&h\24\340\222\v\377\31)\216"
- #"n\337\236\361nn\324\256RtS\241"
- #"<\337\254=\323\247\3\260\342\310\21\332"
- #"\26b\307\2`U\265*\336\277\374\202\367/b\275&\244\240T*QS\352\277"
- #"u\207\327\242x\34y\17\35m=$\264I/q\356\206\373\261\360\257\2164\256"
- #">\224\257\32\6c !=\266\2347K\271\200H \\.\247\232\4\1IT"
- #"(\360OI\242-Al\0\0 \0IDATa\207\340\354\343zZ\32\261"
- #"\331\331t0\26k\255\271(*\212\21\346\346T,\244\2701\257vdh\245J"
- #"t9z\24\35mm\346\265l)d\246(*\36\321ii\270l\335\212\205\236"
- #"\36\265LL\370\333\335\275\310\343\373ED0\340\320!*\352\352r\246W/l"
- #"\237\177\326\305m\3320`\311\22\316,\\\210\372KO\375y\202\20\260p!N"
- #"\2\375\345\363\4aB\21\373\30/#\3257\353mS\232\6\21299\n\276_"
- #":\220Q_\374\202B,)\251\304\271\375\3508\253\16\16a\270\313i\225Kl"
- #"\345\274}\312\367@$\36083S\322\f\304\367\3313>52B\257\200\216s"
- #"\5\26116\226\376\25+\n\375P\362"
- #"f\37\223\5\322\212\235\365\365\351_\261\"\17SR\250\246\302"
- #"x1:-\215\252k\3260\350\360av\270\271\251\234y,\274"
-) 500
-(
- #"|\231\210\224\24*\352\352\262\243S'"
- #"\225\3424\350\360a\302\222\223Q\344\344"
- #"\274\20\17\200\321\365\352a$\223\261t"
- #"\357\253]\3416\217\37O\35++!\361\200\377\277 \310\263K\317{U\236U"
- #"\272w\355m\276K0\3203\346c\233"
- #"Q\245z\35\205\221\267\337\341QW\365\376L9%C\371\fD\2\341YYX"
- #"K\20\20)\313WYJ%[\343\342\360\23\350\5\342x\363&5\264\265\31l"
- #"fV\350\354\343\365\370\370\354l~\263"
- #"\266\246\323\221#\34\314\316\246e\335\272"
- #"\5\306.\274|\231'))\214\256_\237\226UU/\r\374\371\334z%5+"
- #"K\310\2501tx\301Y(2`y\273v8m\332\304\300O?\305\374\271\270"
- #"\224\265\31\302\373J|B4k\376\374"
- #"\201\0253\257\221\223R\366l\304\357F"
- #"\370\261\350\357N\fr:\210\271\372\373\271\337\361.R>\3\221@\270\\.<"
- #"\3y\335\34\261(\352\337\272E\367\220"
- #"\20\254\265\264\250]\304\336A\36A\351"
- #"\351\34HH\240\245\240\325HPz:\0322\31_\231\233s\322\301\201>'O"
- #"r\342\334\271\2m;\362\4\341\246`A\335\343\221#QN\234\210\177o\261\24"
- #"\310\242\250eh\3108''\346\227!"
- #"k\365\17\205\215\273\346\323\313\315\23\255"
- #"\f\261\344\215\222\344\366\243\343,\337\333"
- #"\227\301\rN\226\252x\244fE\263\364r\25\36'I\253\25\372\355r5\351c"
- #"\256T\227<\2464\370\340\5\244\346\365"
- #"\353\324\20\350\213n\177\343\6\177\307\307"
- #"\363M\270X\272_A\346\210\205\321\301"
- #"\310\210\3\t\t\304K\\>\231\34&"
- #"\346\225c\247\243\303\216\347Y]\316\372"
- #"\372l\257Y\223.\27/\342\351\343CDL\314+\261oR\20\212\203\227\213\v"
- #"+\216\36-\225s\3\350jiq\346\260X\217\3577"
- #"\211\237\277?\272*:'\276M\376>\274\22\267&^"
-) 500
-(
- #"\250\250?,Q\342\223\303\331t\334\223_vu\245k\215\35\230i\26\274l\265"
- #"\364\222%GB=I\226\213\357\374\27"
- #"g\314\271\210\205\244\310#\361\2757D"
- #"x\f@\222<\234\275!\3\245\215\311|,yLi\360\301\v\210\205\246&\233"
- #"\4zq\277is\304\227\231jiI\rmm\241X\0\emm\306YXp"
- #"J\260\365\355\3536)y\31Z(\24"
- #"\324\336\276\235\230\370x\241\343\224\4\26"
- #"\332\332\310\240\324\252\323\217|\373-\255"
- #"\276\370\2\371\353\215\274\4\232v\tS"
- #"\300\261Zw\350\300\312y\373\337\3349$p-\320\17\231L\206\"\351\315zp"
- #"MYk'\331\2117\317\260q\362\232ZL[\227\353\236\373e\303`\254\f\v"
- #"\237y\344\332\245/+\206\305\272\2641"
- #"aI\2471\323\253G\235\212\322\232}"
- #"\351kZ\340P\261\207\2441\272\32\246\264\252.^\eUZ|\360\2r\326\321"
- #"Q\310\203\352m\231#B\256\210\335o"
- #"\320@\330\v+\264A\3\274\255\255\251"
- #"*1\245\370e\3622\264\306W\256\314\374\177\304m\246K\202#={\322~\316"
- #"\234R9\267k\235:h\250\253\243\365\372\367\366M\226K\25p,\ruu\352"
- #"\330\210\337\314\336$\343fw`\336\270"
- #"\243Ef^\25\307\211\327\245VW\216\5,c\316\366V\302c\362\f\e\2655"
- #"\365hYs\2m*{\253t\2615\321\266\301L\257.\265L\304\322\323\363\306"
- #"\350h\230\360i\365y\302c\206\325\277"
- #"H\a\333\245\204%\235\26\36\3\271n"
- #"\274\341\311\347$\215\2613uG!\350\317U\232|\360\2\"JI\230#\226\6"
- #"^\26\26\254}\362\2043\317\213\356\312"
- #"\2\256\226\226\0\304\304\305\225\312\371K"
- #"#\23\253\270\31X1q\341,Z\343I\307\241\226\302c^v\342\215"
- #"O\210F&\3K\235\242\367\26\362n\354\232\32\332\244d\210\315X\335\32"
-) 500
-(
- #"O\245r\205\332\310\263\322T6{zyL\5\203\252\204?\275E%Y3\241"
- #"1\343\\B\31\362\221?\301\317|\271/\350i5\316%\224\317m\227\341\27>"
- #"\a\2452\277\221da\224\224\e\257\211"
- #"\266\r\211\231\217\204\343K\213r\1\371"
- #"\300\261\320\324\344@\355\332\270\235>\315"
- #"\231\a\17J\373r^\340\345\344\304\374"
- #"\355e\253\255kI\220'\b\375\274\304"
- #"\2327\215\376\272\25\273\217\256&.!"
- #"\252@G\335\202\3103_\214\214y\310\370\377}F\307\226#T\326}\3449\361"
- #"\326\251\326\206o6:\21\30\366\257\312"
- #"\363\30\353[\260p\304]&\367\330\317"
- #"\262}}\270\375\350\204\3121Q\317\202I\227'\321\325a-\a\357\177Ih\242"
- #"\3521\0\332\352\306t\265\333\314\301\acH\313\22K\0\251g\326\17-u\3"
- #"\256\307l\20\212\207\222s\3435\326\266&1\343\241p|iQ. \345\340j"
- #"h\230\233\235u\350\20'\36\225\215\247"
- #"\236)\215\32\261\345\342E\236\224\241\375"
- #"\31\310\335\354vtr\22\212\225\342\304"
- #"\233\307\310Y\256\354<\270\f\ruM\256\336>\215<\253h\377\244UsO\321"
- #"\275\303(L\214*\341>\312\232e\233g\3600\242h\213\225<'\336\3053\367"
- #"\362(\"\230#\376\233T\356U\3449\361\16l\373+\236]v\262\376\350(\326"
- #"\37\35\215<Ku\307M\e\vg&"
- #"}\341\313\252\203\203\213\24\221\333\217\216"
- #"\263|__F7?I=\323a\364\256\343\213o\310`a\21\251f\330\202\6"
- #"\346C\331\177\177\204P<\310hg\275\210\177\303\276&S\221(8\246d\334x"
- #"\215\265mH\310|(\351\34\245A\271"
- #"\27\226\4/\254\367\35\277\324T:\336\271\303\203\21#0\27H?~\333\314<"
- #"{\226Lcc~\31\365v\n\333\242\23\22p\231"
- #"6\215\200\205\v_\324\235\0\310z\366DY@c"
-) 500
-(
- #")?\177\177z\17\30@dTT\201\357\277NMGG\36\204\206\0020\260_"
- #"?\254\252V\245j\225*T\257V\r+++\252V\251\202\271\231Y\3569u"
- #"u\271\270[\311\265@?\346,\37A"
- #"\207\226}\270\32x\232\340\207\327\251m"
- #"\323\0\347z\255iT\257\ruk\177\214\226f\301=Cb\342\3029|j+"
- #"{\216\255ASS\233N\255\a\321\371\323!\230\232\24\354r\274d\375D4\325"
- #"uij5\211c\1\3138vu\31\rj\270\321\255\331\267T\256`W\344g"
- #"K\227'\261\361\3708\36F]\341\253"
- #"\316\333\250n\336@\345\367\343at\0"
- #"\277\354\352\302h\267\215\324\265n\373\312"
- #"{\211\251\321L^S\223q\355\17\243\233\360\337rZTj\0\177\6u\241\213"
- #"\335Fl\215\333\276~\310|\344(\263\331t\253\25\365\315\a\341l1Ze<"
- #"\300\336\220\201\30jY\361\251\265X\v"
- #"\331\320\304\23\234\n\373\216!\37\211\317"
- #"(\244\216I\310\be\363\355\326$d\224\215\a\272\302(\27\20\t\2\"W*"
- #"\251\177\363&w\n\360\236*\214\247\331"
- #"\331\264\277s\207k\365\352\t\305\337\313"
- #"\310`\310\203\a\234)\300\331\365M\304\373%'3\375\361c\316\26\22?3\""
- #"\202L\3\3~qs{\361\332\316\340`\26\\\272\304\225\376\375U\36?I."
- #"g\356\205\v\354{\360\200\300\301\203U"
- #"\306\a\304\304\340}\355\32\1\321\321\\"
- #"\37\370j\332btZ\0326\353\326\221\376\334\t8#+\213\v!!\234\274u"
- #"\213\223\267o\223\234\236\316\345\237\377k"
- #"{\352\27\24\304\210\25+X>b\4O\223\222x\30\23\303\303\247Oy\30\23"
- #"\303\243\247O1\326\323\343\302\374\371/"
- #"\342\247l\332\304\252\243G\351\325\274"
- #"9\355\352\327\177\21\277\366\370q\354\354\354062"
- #"\342\202\237\337\213x[\a\a\36\0261C\253ak\313"
-) 500
-(
- #"\375\300\300\27\377\377\262\361\342o\213\27"
- #"\23\366\3701\341\21\21D<y\362\342"
- #"\277-+W\306\357\304\t\264\215\2148"
- #"\263S\236\357\230\362\254\fn\5_\340"
- #"\312\255\223\4\334:IV\266\234\265?"
- #"\25}\23\312\311Qp\376\332Q\16\374"
- #"\273\221\310\230\207\254_p\276\300\270\226"
- #"\275tY\377\355#\224\311\271\331W\361"
- #"\311\341\354\277\270\200{O\316\363\277\201"
- #"\227\212<G\36'o\254\345\344\2155\314\36pA(\376n\270\37;NM\347"
- #"\373\376g_y}\353\277\23QG\27"
- #"g\235y\371\354\\\302\222\374\370\347\321"
- #"t\206|\364\352\230\302\210\317\ba\337"
- #"\275a\f\256\347\247:\30H\314|\304"
- #"\236\220\1\302\361Y\212T6\335n\305"
- #"\360\372\227\205\342\2133&G\231\305\272"
- #"\e\215\211J);{\223\5\361\301\v"
- #"\210\241L\206\243\232\32\21545q\321"
- #"\323\303\305\320\220\272\306\306h\350\350\344"
- #"K\267\274\233\221\201{p0\301\22\4\344\177\21\21Dde\261J`\31C\241"
- #"T\3222(\210!\225*1Z\205\205Hq\342\217'%1\344\301\3|\355\354"
- #"p\326/\330\3615:+\v\273\e78\330\2713\315mm\205\335u\345\n\5"
- #"K\2\2Xx\3712=\354\354\370\256i\323|=\325\363|\263.\366\355\313\231"
- #"'O\360\276v\215\207\211\211|\331\240\1#?\372\b\263\327\235u#\"h\265"
- #"s'\323\273v\345\374\275{\\\177\370"
- #"\220\00666\264\256[\2276\365\352\361"
- #"\261\235\35\332/%5\324\370\352+Bcb\250lbB\227\306\215\26113\303"
- #"\306\334\34k33l\315\315\261|-"
- #"\5\273\372\2301<\216\215\305\306\334\234"
- #"\16\r\32\274\210\37\272|9\177n\331B\327.]^\211\177[N\274~\376\376"
- #"|\346\356\316\251m\252\227\203\336\24i\351\311t\30l\316"
- #"\206)\351\245^\373q7<\267\312\334\253\331=4\262\336"
-) 500
-(
- #"~;\337\262H\2162\213\247i\267\211L\271Bd\352\25\"S\256\20\233\36H"
- #"rZ\\\376\214\3002\304\a/ Y2\31\267\201+\300\25\231\214+\300\r\245"
- #"\22\5\271\366\32nZZx\30\32\342nb\302)\205\202\337\237=\343\240\275X"
- #"*\243\\\251\304\366\372u\216\332\333SW\240HlQd$\307\223\2228do"
- #"/d\v\"%^D<\362\bHK\243sp0\325*T@WS\223\277\335"
- #"\335\vt\327\315\23\204\245\255[3\347"
- #"\302\5d\300\222\326\255i\375\232\243n"
- #"\36SN\237f\361\225+\350hh\320\310\302\202\361\r\e\322\275V-4\n\361"
- #"\n\253\261~=\241\211\211\330T\254\310"
- #"\306\t\23\362\t\306\353\204\307\305\261`"
- #"\317\36.\204\204p\361\245\231\206T\374"
- #"\202\203\351\360\303\17\244'$\24\373\30"
- #"R\32051\341\340\236\203\30d\224\\"
- #"\32\357\301\223\233\371\367\254/#Z\373\224\3309\v\"\317\34qP#_\f\345"
- #"\37\206\277\225\\\221L\360\263}\4\305"
- #"\371p/\376\20JrP\223\251c\246\323\0S5\27*(]0\312vAO"
- #"^\27\237\234\262\3556\365\301\vHQ\5b\311\300>\300G&\343\220RI&"
- #"\240\16\270kj\342aj\212\273\245%"
- #"\206E<\35l\217\213c\315\323\247\374"
- #"\343\340\240\3622\2\323\323i\35\24\304"
- #"\245\272u\261\326V\335\27[4\336\361\346MF\231\231\361sd$;k\325R"
- #"\231Z\354x\363&?T\255\312w\21\21\334\313\310\340\376\260aT72*0"
- #"6O\20L\264\265\371\331\325\225a\365"
- #"\352\241^\304\367\263\372\332\265<NN"
- #"\246\231\245%g\373\364Q\371\31\303S"
- #"R\30q\364(\27\242\243y\266e\213"
- #"\312\3707\206\206\6\262n\335\204\3669\336\0042]]\22\303\345\334\275"
- #"Tr\355\222'\317\355BS\373\1\324\257\322\253\304\316\371:/\366=>"
-) 500
-(
- #";\214n\374\373\351o\365\272X(\224"
- #"\231\250\313\264\251\256\323\221\352\352\36X"
- #"d\273\243\3144\2440\17\377\235e\374\356\\. \22*\214\307\2\266@\25r"
- #"E\305W\251\244\263\246&\275\v\21\223"
- #"\346\201\201L\265\264\244\273\212\352u\313"
- #"\253W\321USc\230\231\31\337\250\350_\1\2717y-\231\214\341ffx\252"
- #"h\3+\273x\21\200\245\325\2533A\240\bRv\361\"2\340\373\252U\311\200"
- #"|\373!/\223'\b\315\253Tyk\326'\311r9&\277\377N\314\2325T"
- #"|\356\6\360\326\221\311\220\365\350Q\242"
- #"\2\22q3\213\210{%\363\264\231\226"
- #"\236\314\247\375MX\341\31\203\236v\351"
- #"u\275\333\372\317D\324e\5\357{\274"
- #"\313\310\25\311\204<\333G`\234\17\301"
- #"\361\276\3240\354L5eo*\246\271"
- #"\243\246\220V\eV\326\5\244l\317\217\312\20\365\201(`9\340\1\364S*s"
- #"g(YY\370<}\312\210\350h\206kk3\243re\252V\252\204\303\355\333"
- #"\244\345\344\274\260@)\212\250\347Ed\233cc\205\4$(=\235J\32\32\214"
- #"\25\350!^AC\203g\331\331\254\217"
- #"\215\25\22\220\232\332\332\314\253V\215^"
- #"\246\246/\366C\276\b\t\241\245]\376"
- #"\254\234\260\21\242\351\222\305\307PK\213"
- #"\356vv\34\362\367g\200`\217\217\377"
- #"7\245\360L\225\226\\r\16\270'/\354\301\265\321\27\245*\36w\303\3758y"
- #"s\35^\315\356\361\16\24\\\v\221$"
- #"\17\347\\\304\2\256E\257\303\332\3603"
- #"\254r<\250\247\266\t\265\244\262_P\\\\\312\353@\4\351\0<\5f\276\364"
- #"\232!\320\17\330\235\223C0@f&\265\37=\242M@\0w32\310R("
- #"P(T\27w\345y[\211,uA\256M\312n;;\241\37^\274\263"
- #"3\312&M\270.\232\5\326\240\1\275LM\201\227\212\f\17\35\342LH"
-) 500
-(
- #"\210\320\370\267\201G\255Z\370\234\25\313"
- #"\300ySh\t\330\344\277\261sij\222\221Zr\177\212'\374}hR[\232"
- #"\237\323\233$o\323|`\303\203\357\364\246yvN\6aI\2478\35\376\3\233"
- #"o\265aE\200=\251\317\240\243,\4"
- #"\247\304\335\230%\367CMa\310\1\254\311$F\365\1_\2428cJ\203\17^"
- #"@D\2375\247\0025\200\r\205\274o\5x\3q\300l\245\222\212\200\245B\201"
- #"I@\200\312cK\365\266*I\233\24WC\303\27\"r?\246t~\241\335l"
- #"m9\361\340\0011\317\236\225\354\211\v"
- #"\260\273\177[d\244\225\314\f$>!\232K7\377\301\301B\3347\352M\22\375"
- #"\354\336\213\276\36\26\32of\337\243\244"
- #"\334x_\37\263\350b\5\376\r\235MJ,\324L\371\201.9\361\324\315\360F"
- #"[\361\252wW\32a\334AZRG\32a\4I\34S\32\274\327\2\342\347\347"
- #"\207\243\212\372\b\321?[\v\340>\240\352W^\ah\5\304\2\1@&\240s"
- #"\351\22\277?yR\252\275\256\377?\270\32\32\362s\365\352\f8p\0E),"
- #"\357\30ji\341\351\354\314\374?\377,"
- #"\261s\312\263\263\241\204\366@\344YY"
- #"%\266\a\260q\327|zv\30\217\226\372\333}\0)\310|1G\251`\345\201"
- #"\201ti\270\260\320\276\36\213.\232\362{@mI\347*)7\336le&\227"
- #"\"\227\361\307\315\246\314?\257\203\"'"
- #"\223&\251G\250\231\366=\25s>A\215\202\223Y\264\250\300S\304jL^\36"
- #"\23\217XmMi\362\336\n\210\237\237\37\275{\367&((\250T\257#\a\b"
- #"US\343HD\4\315\257^\345NRR\251^Oq\31mf\206\221R\311\322"
- #"\22^J\312\303\313\311\211U\247N\221\226Y\264\265\307\233BK"
- #"C\3R\305\315\357\376?h\n\32t\376\177I\317He\367\321U"
-) 500
-(
- #"\30\351Tg\351\236\356L_'\326\16`\342j[\6.\2241\306\333T\370\\"
- #"\5\231/\36\276\274\4]-c\34\264\nw\26\310\310~FBf(\247\37\377"
- #"\200\350\372\200\211\266\r6\306m\320V7$;GL\364M\264m0\321\261\245"
- #"\276\231x\317\215\276u\16\242&\323\244\222N]\6X=\244\267f\16j\250^"
- #"5\370\224sd\20%|\36\200\352\f\240\32\245\267\314(\312{+ \323\247O"
- #"g\347\316\235\245}\31@\356R\326\36"
- #"\245\222\1\n\5\316w\356\340y\343\6"
- #"\21\311\311\245}Y\222\220\1\313\255\255"
- #"\231}\345\n1i%W\360\226\207\205\256..\26\26\234y\203\5|E!\317"
- #"\316\206\22\372\234Y\317\223(\376?\316"
- #"\272]G\333\2524S\274\36t\206\234\34%\277\373|\311\243\350\253T\251(&"
- #" c\3346\241\243e@j\3063\341\376\36\257\233/^\n\336\305.\377\37p"
- #"\263[NNN\341\363\376\212\272\366\f"
- #"\253\177\221\220g\373\331\25\334GH\20\306\271\2042\240\356?T\326wbwp"
- #"\177\224\250\236\316\215s\te`\335\177"
- #"\271\30\371\e\261i\201E\306&\311\303"
- #"9\22\352\311\346\333\237b\245\333\6\315"
- #"\24GR\303*\2534\240\314\303\20{\324\321&\211\333b\3\0\3j\221\302="
- #"\341\370\322\342\275\25\220\263g\317\322\262"
- #"e\331\311-\227\1c_\332l\267\v\n\302\363\316\35\"^o\\T\206\251\245"
- #"\243\303\270\312\225\231\177J\232\221\334\233"
- #"\242u\265j\234\22\350\36\371\306\370\177"
- #"\212|\236\231b\375\306\215\v\215yy\351*\317H1.!\212\177\317\357\342i"
- #"\374\23\225\347\310s\326\315\312\312Ti"
- #"\246\30p\373\24\355[\364AG\313\200\330\244G\334|x\224\245{\272s6h"
- #"\e\31\362\302?\253\275\225+Sz\34|!8"
- #"3\326\327\225l\276\270\366\360p,\214k!K)"
-) 500
-(
- #"Z\34\277t\272Ce}'\206\324;\203\246\232\36\353o|,l*\370y\215"
- #"\345dd\307s*\354;\241xcmkZU\373\37\373\356\17/\320\322=O"
- #"8~\17\250\215<\35:\253\207\340\224"
- #"\266\215\207\212-\244\243\372g\3632\26|F$bV\363P. \345\24\202\25"
- #"\340\255T\346\nIr2\16\327\257s\346\35Z\326\36227gMH\b1\245"
- #"0\203jee\305\311\2337\337\330\361\374\202\202p\364\362*\360=\35--b"
- #"^j\31\\\34g]\327\266mY\266b\5O\236<a\320\360\341\314\372\356;"
- #"\226\257\\\311\276\3\a\270z\375:1"
- #"O\237\22\25\35\203\266Vn\225\377\17"
- #"\0236\241\247\223k\377r\302\337\207\341"
- #"3\232\321e\2245\337,\356\313\216\375"
- #"\277r+\370\2\331\257=\366\3469\353"
- #"n]r\215\345\263\217\0010\366\273\266"
- #"\f\233\336\214]GV\222\234\372_5\375\225['i\355<\220)=\16bi"
- #"j\317\302\21\3014\261\367\340\342]\37\274VY\27)&\366V\256,\30\26\310"
- #"\240\266\336,\32y\17\3\235\212\314\332"
- #"\320\200\225\a\a\21\365\254\350\f\275J"
- #"F6\344\344da\244a\307\332\e\215\211NU\375\20\240\256\246\215{\255?h"
- #"h1\234?n|,\344d\253.\323"
- #"\242\207\375_\334\216\335\301\315\247b\205"
- #"\247.\225G\243\255n\304\205\310\245\257"
- #"\274\36\226\344\307\312\253\16(\262\241\263"
- #"F\b\265\23\274\321\314\252\212\26\25\261e8\301,\22:~\36\226t$J\202"
- #"\200\30bG2\245\227\371(\312;UHX\263fM\36\24\322\263\242F\215\32"
- #"\334\277\177?\337\3532\231\214\"?\242\204B\302dr7\321\245<\3G\3\235"
- #"\200\302,\324\2\324\325\351\222\223\303Fkk\332\232\233\277qs\304\327"
- #"\331\31\37\317\202\310H\256\324\255+\24\237\244P0\367\311\23\366%$"
-) 500
-(
- #"\20\370\321G\300s\303E]]~q"
- #"w\317\27\37\236\222\302\202K\227\370\367"
- #"\361cn\r\32T\344\261\25J%G\37=bc` w\342\343\2716`@"
- #"\221\361\367\22\22p\334\270\221\361\235;s>8\230\314\254,.-X\220{\336"
- #"\3476&\177\235;\307\3521c\b\213\215%<.\216\210\370x\302\236>%<"
- #">\236J\206\206\234\377)\327q\325/"
- #"(\210.\363\347\223\220\232\212\357\214\31"
- #"\371\342\257?z\204\216\226\26\221Or"
- #"\2374_v\326-\214\327\315\24\375\374"
- #"\375\31\361\345\227\254^\276\234\244\244\244"
- #"\2\315\24\323\323\323\351\330j\b\243{"
- #"\347v\306\273\26\350\307\274\25\243\331\351"
- #"\235{\234\247\361O\270\25|\236\ew"
- #"\316r\353\356y\224(\213m\246\330\242"
- #"\227\16\233\276\211';%\277\323r\206"
- #"<\231\200\373\373\270x\327\207\304\324("
- #"\276\357\257\272\203\236\250\371\342\326\177&"
- #"B\266.\215\364\347q5z-W\243\3270\254\276\370\6q`\354N\316F,"
- #"`D\203+B\361\221)W8\364\340K\206\325\277(\24\37\237q\217}!C"
- #"\30\374Qn\323\253\320\304\343\370\206\f"
- #"\241\263\245/\212\307\316\371\22\0342\210"
- #"\346\34=i#ac<\233\24N\322\206v\210\231T\346 \347\4Mx\246,"
- #"7S,U\336\244\200l\6|\1)\356A\23\1]\240\250\306\231~\344\212\314"
- #"~kk\246\307\305\275Qs\304<r"
- #"\200\211\217\36\341\233\220\200\257\235\35\37"
- #"\251\260k\227+\377\257\2753\17\217\262"
- #":\373\360=\331Cv\22\262\220\220\25\20\2\24\4\211\310R\226Z* TD"
- #"\4)Q\21\225j\211\205\252U{U\277\257\325z\211\"\242,*\266*\362\25"
- #"\27\20A(\bB\5\6\220%a\223\20!{\3106\tYg\222\314L"
- #"\222y\277?&\t!$\231wB\336\231\220\234\373\272\270f\311s\316y\23"
-) 500
-(
- #"f\3467gy~\217\304;\205\205\274UP\300\234\336\275y\245o\337\246c\306"
- #"\232\332Z\372\2369C\3153\317\340\342\350\b@jy9\257\36?\316\356\314L"
- #"\226\216\30\301\322\21#\bh\305\34q\311\376\375|=s&\e/^dSJ"
- #"\n\341^^<\22\e\313\374\333n\303\267\231%K\243\20mMMeRX\30"
- #"\307\32>\310s\264Z\336~\344\21\306"
- #"\r\32\304\310\350h\234\e\306\37\260t"
- #")i\205\346\215\312\370\211\23\t\363\367"
- #"'\264wo\302\3\2\232\3567\267lo4^l+\336\305\311\211;\376\374g"
- #"j\32f\207J\31)\272\373\371\261cC6~^\312\347C\334y\277\3\237>"
- #"\247\227\265\361\333\231<\274\322\221?\335"
- #"\225\203;\355\227\246\355\n\344T\252\371\"e\6S}vw\t{\225\256\236\211"
- #".\4\304\n\1\231\5,\4\344\272\a\345\1\267\3)\200\245\234_5\360k`"
- #"\270\273;\307\207\r\353Ts\304\212\372"
- #"z\36JK\243\332d\342\353\1\3\360o#INS[\313\250\344dV\207\207"
- #"\363Z~\276\331\0341<\234I\255xa\271'&\362\345\364\351<\177\364(S"
- #"\372\365\343\363K\227\210\37<\230\27G"
- #"\217\276\301\205\27\314\3421\375\233o\320"
- #"\325\326\22\352\351\311\302\301\203y46\226A\275[?\3313\340\223OHk0"
- #"3\374z\346L\306\4\a\323\327\323\23\325;\357 m\335zC|\343\fdW"
- #"R\22\231\353\327\267\373\367\220\e\337V"
- #"]\220\316\244\261\16\210-\210\233\255b"
- #"\323\363\266}\273WTiX\276!\222\27\342ls$\372fh\24\217)n\273"
- #"\361\252\262\277x\200\20\20\273\323Y\2"
- #"R\2019\221\360\n \267\324\222\234\331G#\27\201q@-\360f\237><\25"
- #"\25\325\252\210hjk\31\231\234\214$I\26\315"
- #"\21\e\5!\310\331\231\376\256\256|\32\35\215{"
-) 500
-(
- #"\e\316\267\0\317\345\344\360va!\276"
- #"\216\216\274\31\36\316c\1\1m\232#.LO\347\253\2622jM&n\17\f"
- #"d\347o\177\333\252p4\22\365\257\177"
- #"\221UYI\270\227\27\31\213\27\267k"
- #"\272\b\327f \27322\310\\\274\270"
- #"\351y\267\367\336\243\364\223O\350e\203"
- #"\202W\256\363\347cPx\257\247\255:"
- #" \235M\215\276\212\273\37\366\347\343e"
- #"z\305\307j\316\277\377\273\34\251\326\235"
- #"\321\236r\336\5\366B\"\251p=\a\262_d\212\333\236.#\36\320\365\5\244"
- #"\333{aYJ$\224\313\267\300\24\344\213G,\346d\302\v2c]\200\277\3"
- #"\17\0\277\277z\225M\345\345|2h\20\203Z,\3\275UP@\276\321\310\222"
- #"\300@\213\331\350o\25\24\220g4\22"
- #"\353\356\316\27\375\373[\234\325|\325P"
- #">6\326\335\235'\32*\345\265\205Z"
- #"\253\245\266!S\333\335\311\251]\361\0\256\23\19\204yz\262f\362d\326L"
- #"\236|\335\363q\301\301\349s\206\251\343\306Y\325_G0\326)_(\303X"
- #"k\e#\250s)G\210\215\261m\365\3152]\36G/\376\233g\306\246@\27"
- #"\235\200\224\324\374\314\267i\213\350\345\30"
- #"\304\275\316\2518VY\366\213\23\\\243"
- #"\333\vHr\262\374\263\327\355\361G\240"
- #"\f\30\0\262\316F\244\0\21\200\234\225"
- #"\355\24 \0\263\333\257\3\260]\222X"
- #"o21\372\302\5\366\364\357\317\370fn\276_6|\310\377$#G\2411\266"
- #"\252\276^V\306}\316\210\0212\242\314"
- #"d\217\30a\336L\367\363c\325\257\177"
- #"-\273\335\3152),\214C\347\317\333"
- #"D@l\341\207\345b\243$\302\323\311\207\30\0225\311&c5\262\373\344J~"
- #"9\364qT5\3663ml\17\363\222\325t&\4\255 @\363\24\246z"
- #"\333\31Zv\27\3041^\231\370\0K\201\2032\343\a\0r+X\f\0\276"
-) 500
-(
- #"\341\332\177\206\n\370C}=\207\34\34"
- #"\230\237\226\306\1\215\246)\366\312\210\21"
- #"Hqq\34\2251\263\262&\266#,\v\16\346\375\213\355'au6\23\303\302"
- #"8x\351\222M\306\352N3\220\244\v\a\31\0302\321&c5r\340\334\a\304"
- #"\5\267~L\332\336dV\354\347\233\313"
- #"\0171\253\317!z\347?-\304\243\203"
- #"\364x\1\221\273\304\230\211\331,Q\356"
- #"9\222\313X\366\315\262\24;\262\276\236"
- #"\317%\211\331\331\331\34i&\"]\205 GG\34\200\364\253Wm6\346\230\220"
- #"\20\216\347\345\221W\\\254\370X\335e"
- #"\6RZ\256!9\365\4\241^\266\253"
- #"\370\247)KC\205\3\246\312\256\347\266"
- #"\233S\251f\313\317\367\363K\367/P"
- #"\25v\335*\210\322-\340\236\327\343\5"
- #"\244\253\177\357\230\0\374\a\230\224\235\315"
- #"\17vr\303m\217\267##mj\262"
- #"\350\341\354\314\237\343\342x\373\353\257\25"
- #"\37\253\273\314@6n{\203\0053^\300\315\3056\5\271LR=\37\354\216g"
- #"N\334*\331v\37\266\"\247R\315\246\344\3118K~TWX\327v'!\234"
- #"!\201\32\344;\370\2\354\242\37W9bU\233\377\20N\t\355\347\373t\5z"
- #"\274\200\334\nL\0N\2\361YY\34()\261\367\345\\\307\222\200\0\274M&"
- #"V'\311K\362\352\f\226\335~;\357\37<h\263\361nu\276\376\356\3\356\211"
- #"\263\335R\322w\211\357\340\344\340J\306"
- #"\225\vl8\373\v\331\355\336K\n\347\265c*\326\237\271\315rp\3k\223\242"
- #"x\355\230\212\265\247\243-\3066.["
- #"\335\353u\222*S\16G\230\211\1\371"
- #"\263g=\205\244\261\226CXW\273\276\236*N\363\264Um\352\320q\232?X"
- #"\325\306\36\b\1\271E\30\t|\353\340\300#\31\31\34(/\267\30o+"
- #"T\300\272\350h\376jC\227\336 ww\3646\230\35t\365%,\271\346"
-) 500
-(
- #"\213\306Z=\316\r\205\233J\265\271|"
- #"v \201\277|*\377\203\275\321\232}"
- #"\371\206(L\255xF\265d\353\221\227\321\224\245s\342\312ZB<\357\220=N"
- #"\254\2779\303\252\272\266\2103\232\217Z"
- #"\365\247j\311\254\1\237\321\333} n"
- #"\216\276\224\353\333v\nh\314.\377\215"
- #"\337\267\270U\216\304\233\301\0042\205\343"
- #"\314CB\336k\311\203H\\\t`\20\177\221\367\v50\216o\251\247\32\371\v"
- #"\346\20\306\\b\370\275U\343\330\3! \267\20#M&>wp`vj*"
- #"\3516\2625\227C\177''\220$\264"
- #"\2666\206\264\203+\260\\\254\365\316\252"
- #"\256\321\262\367\360f\236\177c6\v\226"
- #"\17\227\325\306\32\363Ec\3031\332W?\237\300\367\247\327b\222L$^\336F"
- #"\231\316\262)`\2435{]\235\201e\37D\360\345\341\27\311/m=\e_o"
- #"\324\202\4\363Fl\246\267\333\0002\313"
- #"\277g\343\205\t\244\224l\301$\265\377"
- #"A}W\350\363\370\271\3050#\346#\22\v\327\361\317\363w\220]q\260\3356"
- #"\341\336\23x\372\366K\214\v{\211\215\27\306s,o\305\r\302S\252Oc\313"
- #"\317\367sO\310\27\2504\346=\217\337"
- #"p\221\273\330\202#n\234E\336\354l"
- #":\231\334\311\347$\363\nu\310\267\372"
- #"\17`<\216\270S$\373\b\16\3701\2122l7\253\357(\335>\221\320\"V"
- #"d\242w\25>pp`\243\223\23G\206\17\267\230\220g+\36HO\347\276_"
- #"\374\202\205V\34\5\276\31\334\327\254!"
- #"\373\177\377\227@\231e\200[\242NI"
- #"\341\211\367\337\347\324\212\25x\265\310\265"
- #"i\2441\23]\253\325\262s\367n\266|\3755'N\235\"\337\202'\26@\324"
- #"\240Adeg\0030\347\276\373\b\r\r%8(\210\320\276}\257\335\6"
- #"\a\23\20\32\312\311o$f\377>\206<\215\331\347\255\217\177(S\306\314"
-) 500
-(
- #"\301\337/\230\300\336\241\370\373\5\323\247"
- #"\341\326\307\353\332\221\330\263\27\325,{"
- #"u:\325z\35S\307\317\347\374%\363,\360\27\267\215e\350mc\30:p\f"
- #"\201\376\241\334\377\324\0\376\265\314\254 "
- #"\227r\325\374\363\273\307\231<\374I2"
- #"\v\23I\3157\267\31\320w,\375\373"
- #"\216\241\177\3371D\6\215\304\321\341\332"
- #"\314\250\242J\303\3377\217\343\177~w"
- #"\f]M\t\352\344\215\34M\336\204\277"
- #"w8\23\206<\302\230\301\363\351\345j"
- #"\336_9\232\274\211\244\324o\271\247\317"
- #"\26$@\302DV\305\1779\231\377.\371\272S\f\17|\224Q\301O\343\343\32"
- #"n\341/(\221R\262\225\375Y\317\323\333m\0\277\216ZE`\257a\355\266\320"
- #"\31\v\330\235\361{\252j\213\230\325\377\23\374\335\a!I\365|za<C|"
- #"\37\305'w\311\r\223\0#e\34 \216A\274@\24\217[\270&3?2\27"
- #"ob\31\302\337d\305\3\244\362.%\34g\f\237\313\212/#\211D\36\247L"
- #":#{\f{ \4\304\212\17\340\22\314\311\204\326\230)\236\6\226\200L\v5"
- #"y\361\22p\217J\305\324\336\275\t\361\365eUa!\2112\314\21%`\275F"
- #"\303\246\222\22\216\313<\332\233k4\262"
- #"\242\240\200\37*+\2710\254\3557\360"
- #"\227\245\245\374[\253\345\251\261ce\233"
- #"#\266g\246\250\316\313\343\211\357\277\347"
- #"\324\202\5x\271\270Pk2\221\\RB\222FCRQ\21\333\323\3220\251T"
- #"\24~\372\351uF\212\e\23\22(,/'\257\244\304|[Z\332t\e\354\353"
- #"\313\217\257\277\336d\244\350\353\341\301\303"
- #"\23'\22\23\34\334j|VQ\21RM\r\375\207\f!\275\r\23\317\34647"
- #"ST\2370\333\24\0\0\35PIDAT\37=\312\2549s(\257"
- #"\250`\357\316\235\24j4\344\345\347\233o\363\362\232\36gegs\362\e"
-) 500
-(
- #"\211\242\222\\>\333\266\202C'w\360\374\23k\321U\225ST\232GIY!"
- #"\305\r\267E\245y\4\5\364c\303?\0167\215i\311|1O\223\301\304\341\217"
- #"r\337\350\2663\301\313t\371\244\347\37'5\377\30i\371f\303\306W\26X0"
- #"l\224\352\371)k\37G.l\244\270\"\213\377]h6l\\\265m\26\277\b"
- #"ZH\277V\f\177\n\253Ns\252`"
- #"\r\305\325\311\262\215\16\r\365\225\34\311"
- #"\375\a\231\345\373e\232)J$\26\256"
- #"\347\247\342M,\32v\234\343\371+\311"
- #"(\333O\\\365\36\352k[\177\257\227q\232$\226\3106:\254\"\223\23,`"
- #"\n\226\r'\e1R\202\232\31\374\212\343\262\342M\308\300]\224I\226Kb"
- #"\333\23! V\b\310\233\230-G>\225\31\237\17\214\6\326\2\263;9>\5"
- #"\30\6\ftsc\373\300\201\ftsk7\376g\275\236E\31\31\49;\363"
- #"Ad$\301\26\326\336S\365z^\315\317gwy9K\203\202X\32\24D@"
- #"\263=\1Mm-w$'sq\3300r\215F>*.fua!w\6"
- #"\a\363\310\220!7\230#j\252\253\31"
- #"\365\357\177s\372w\277\243D\257o\327L\261\3217K\245R1\276o_J\364"
- #"z.\227\225q\233\237\37\243\202\202\30"
- #"\25\24D\244\26773\266o\247\346\363"
- #"\317\31\220\220\320d\2448g\314\30B"
- #"{\367&\330\327\227P\177\177\363m\303"
- #"c\377\206\314\375\230?\374\201\214\206c"
- #"\321\1^^,\2300\241\325\370\260'"
- #"\237\244(7\27T\252\246\31\310\331\363"
- #"\347e\233)\252\217\36e\311\322\245\\"
- #"<\323\372\267H\255VK`\277~\34\376B9{\221\361\17\272\363\356S\331x"
- #"\272\332\3468\355c\253\334xnL1\216\222\262%s\345\362\306qw"
- #"\356u\273\200su\214\275/\245C\b+\223n\202\4l\0006\312\214"
-) 500
-(
- #"7b\266%y\30y\342aM|\1\360D\303\375\325nnm\212G\243\27V"
- #"BP\20\357\24\26\362Jh(O\5\6\266ytY\255\325\262$+\213_y"
- #"{\263\351\352U\342\3\287th\223\vos\336*( \327hd\304\205"
- #"\v\30$\211\205\376\376\27088\260\357"
- #"\356\273\361j\305\6\345\255\304D\362t"
- #":F\374\337\377\341\240R\261p\360`"
- #"\16\314\231\323\252\231\342\243{\367\242\253"
- #"\255\305\305\321\221<\235\216\317\356\271\207"
- #"!\376\3768\265\360\361\3227T\r\374"
- #"\341o\177k2F\334\372\334s\355\375"
- #"\351\08\273r%;\23\23\331\362\343"
- #"\217d\26\25\361\356c\217\265\0327\343"
- #"\216;\330\361\365\327,\\\264\210\5\363"
- #"\346\261`\336<\213}7g\302\270qm\212\a\300\366\235;\231~\317t\253\372"
- #"\264\26c\255\336f\342a\256#\242\352"
- #"2\342\221S\251\6Iu\313\212\307\255"
- #"\200\20\20\231\374\200\331\30Q\256\201\306"
- #"r\300\17\370\207\214\330X`pC\377"
- #"\257\312\210\255\306,6\257\1\263\312\313"
- #"9S^N\214\357\215g\374\e\275\260\376Y\\\314\217\261\261D5\233\21\264D"
- #"\255\3252\375\362et\365\365\374\312\333"
- #"\233\344a\303Z\25\216F\266\226\225\1"
- #"\20\352\342\302\17\203\6\341\250R\221f"
- #"0\260\343\347\237Y\330\212\200|u\371"
- #"\2629\336\323\223\343\17=\324\356\336\315"
- #"\331\205\v\331\231\221\301\226\313\227\311\254"
- #"\254dx{\276\\55\204\5\4\260f\361b\326\310\364\333\362rwg\301\204"
- #"\t,\2300\241\335\270\271\343\306\261y\3336\26.Z$\253_k\331\262m\e"
- #"s\356\375\235\"}\333\203\244\324\355\f"
- #"\t\275\327\336\227\1\2307\316\277H\231\301$\307}\310<d%\350\0b\tK"
- #"\346\22Vo\300\27\260\274\22n\2660\211\a\372#\3177"
- #"K\325\320w*fO,K\327\21\2M\325\225?\0006"
-) 500
-(
- #":8pd\304\b\34[\34;\r?{\226+F#c==-\332\231D\235"
- #";G\226\301@\270\213\v\33126\302\e\367F\324Z-g\207\16\5\314\373 "
- #"\233\313\313\331\21\37o\261}g\340\270"
- #"z5E\257\276\212\177\a7\322-\241"
- #"\325\353\361\215\217\247\246\274\34\227v\304"
- #"\264\2438zx\360\323\241\2\252\256*"
- #"3C\250\256\3212\371w\276|\274\274\6'G\345k\200\254\3326\213A^\v"
- #"\211\351%\267\340\20124n\234GH\217\22\252[b\327k\271Y\272\372\22\226"
- #"8\306+\223\0\3403\231\261+\260\3367k'\226\305\3\240\224k\342\1\346\r"
- #"woIbu+\353\3629Vxae\16\37\216\24\27'K<\0\302\\\\"
- #"X\23\21\321$\36\0\323}|8PZJ\221\215J\364\316\356\337\237=\355,"
- #"\21\335,^nn\230$I\21\361\0000\231L\2708*g4x\360\304v\356"
- #"\32z\277M\304\243\242J\303\305\234\377"
- #"\22\336k\232\342cY\342D\301;8\231|\b\325=i\357K\351\366\b\1\221"
- #"\2115\336V?\241\234oVKT\300:I\342o\325\325\34iV\303\333\36x"
- #"9:\222\20\24\304\e\207,\327\257\356"
- #"\f\346\16\30\300\226\363\347m2\226R"
- #"\350\253\224{\v\356?\272\205\270\333\346*\326\177sv\235|\203_\16|\6g"
- #"\354\273\377qE\253\346\360\225\2773\244"
- #"f\35]\337\250\350\326G\bH7\240"
- #"?f\277\254\337\24\26\242\265s\202\341"
- #"\262\340`\336MK\263\211\217\324\364\250"
- #"(\366\3128^{3(\231\215\356\342"
- #"\354\214\276Z\271\17\271\223\347\36614"
- #"\31463\202\275I\3571\324\333\276\326\e\306z-\233\223\357a\222\363n<L"
- #"\267\376\306\2710S\24\330\214\t\300"
- #"4\225\212\35W\256\330\365:\202\234\235qV\251\250"
- #"S\270\24,\200\227\213\v\206z\313v\0277\203\222B"
-) 500
-(
- #"h\254\255E2)\326=\306Z\3\256\316\312\317\b\f\265U8:8\343\241\262"
- #"o\315\363K\245\333\211\364\230\216\217\276"
- #"\353T\24\274\31T\267\300\fJ\bH7b\256$\261\245\254\f\354|.\"\316"
- #"\313\313\356\313i\2\333q9\367\b\321"
- #"A\266\255v\330\32\27\257n!\330h"
- #"\233%;\201\31! \335\210\351\300\17"
- #"\222D\272\235k\207L\362\366\346Pn"
- #"\256M\306ri\247\306{\247\364\257\360"
- #"\22\226\22289)\277y\16\220\222{\210\376}&]\367\\\2451\227\275\231\t"
- #"V\271\361v\244M\243\203\357\332\244h\262+~ \300 o\311n\a\275\331E"
- #"?\331\3434\266\331\215e\327\337\316h"
- #"\327\321\261l\215\20\220n\204\27\346l"
- #"\371\205\271\2716\253\317\321\32\23==9\330\220\31\2564F\223\202k@6D"
- #"\256\263\2565m\352\352\2567\267\324\e"
- #"\265\34K\331\314\352\355\263\371\313\247\362"
- #"\f\e\227o\210\"\376-\25\361o\251X\366aD\253\346\213)9\a\211\360\271"
- #"\276\332\341g?M\340T\301Z\\\235|(\255\271,k\254\216\264it\360\255"
- #"0d\341\357x\a\265\310;\1\350F0Nxr\212E\rN\271\362\332\324\243"
- #"\267\272\266\2073>\270\21\202\204\374\327"
- #"\252\n'\372\223`\3258\366@\344\201t\0213\302\316\242\311'+(\210g\303"
- #"-\31\326)C\225\311\204\377\351\323\350\377\370G\305\307r}\367]\f_}e"
- #"u;uJ\nK>\374\220\213\253W"
- #"\267\e\247z\340\1\256\244\245\261\342\355"
- #"\267\331\272m\e\5YY\26\373\226k\276\250rw\347\3447\346\267\337o\227D"
- #"QPd\356{\312]s\232\314\23\3333Sl\336f\372\244x\2\375\303\350\343"
- #"\37Jp@8\201\376a,z\341N>Y~MD\236\375(\206\242"
- #"r\363\241\3?\317PF\17\234\203\257G0~^\241\370x\4\323\333"
-) 500
-(
- #"\323|\353\351~m\214K\271jV~=\35G\ag\374\275\303\251\322\233\23H"
- #"\233\233/\276\366\371D\376\347\356R\f"
- #"\332^M\355r*\325\354J\177\234h\237\273I/\337\v@\177\277i\304\370N"
- #"#\302g\22\316\16\327bo\246MU"
- #"\255\206\17\316\f\241\267\333@\334u\243"
- #"\310f\23\21\3043\210\27q\267p\16"
- #"\322\204\201\363\374\231B\276c\f_\342"
- #"\213\345#\354e\234\346(\263\210c#"
- #"\201\374\312b\274\31\211\303\334C0S"
- #"\31\310\263\262Z\\\341Kr\330L\236\264C\346\30\366A\b\210\25\2\242\1f"
- #"\0\211Vt\257\6^\0\344V\313\330\f\254\2229\206\4\254\a6\301u\26m"
- #"i\16\16\f3\231\250\211\213\273.^\2561b#\365\222\304\276\312J6\26\27"
- #"\363\263^\177]\316\207\245\370/KK\221\226/o36_\247\343xa!\307"
- #"\362\3639^P\200\241\276\236S\v\26"
- #"4\375\\\235\227\307\222\375\373\271\370\310"
- #"#\0007\230)&i4H\222\304)\215\206+\37~\330!3\305\362\252*\366"
- #"\276\374r\273\361\307/_&2\"\242\311Y\267=\32\315\24\345\232/\2\204\6"
- #"E\363\315\a\351\234\275\250\346\331\327g"
- #"\241\255*g\315\377\354m2Ol\317L\261y\233\267\377\362-\205Ws(\272"
- #"\232Kqi\36\205\3059\234N>\304"
- #"\300\260\361\274\374\220\0320\327\2\331u"
- #"r\5\247Sw\360\360\335k\2516\224"
- #"S\246\315\243\274\252\2202]\36\25U"
- #"\205\224\352\362\360\367\352\307_\37\272f"
- #"\330\330\350\340\373\362\0025\336\275\2o"
- #"0_\274\234w\224\277\375J\242\266\235s\23\2455\227I+\337Cz\331\36\f"
- #"\365\225<:\314\362;Bn\2337\216\2733/\350\2\306\202\30j\310\345gV"
- #"P\302q\331\346\210Y|J\32\353d\307_E\315"
- #"y^`\212\354w5\350H\343\24\2172Y\346\354\245"
-) 500
-(
- #"\16-\207\3705%\222<\363E{!\4\304\n\1Y\216\331n\244m_\323\353"
- #"\331\17<\n|\213\271 T{\30\201\4\314\202\263\35\30h!\376g`\21\20"
- #"\2049\e=\270\305\317\35\0\375\350\321"
- #"\270\250T\26\215\21\341\232o\326\351!C(\251\253c\343\325\253l*)!\334"
- #"\305\205G\2\2\230\357\357\217\257\243\243"
- #"\354\370e99\24?\371$^\356\356\344\352t\2548u\212\255\251\251L\n\v"
- #"\343X\276y\31dl\337\276\214\t\taLH\b#\3\3qn\330\317h4"
- #"S\324\325\326\362\324\360\341$i47\230)\216\n\fd\210\277?^\353\326\21"
- #"\344\347GyU\25\25\325\325\262\314\24"
- #"\243\237~\232\314\206\362\300\226\342]\347"
- #"\317g\377w\3371o\341B\n\n\v\221d\234.k>\3i\317|\321\325\333"
- #"\233#_]\233!\264t\326\225C[mJ\3135\374vI$\377\374\243\262\247"
- #"\341\364F-O\257\r\344\30515v;\273\361\217c\16\314u\326#\325\332f"
- #"\317\307\226t\365Lt! 2\5$\17\270\35\263\v\256\234\334a\271\342\241\1"
- #"Fa\316Fw\2\276h\247\377\306\330\4\340\35\340\25\340)ZO\227r\a\276"
- #"\214\211ayn.%uu\304\a\4\360bHH\233\376V\317\345\344\360va"
- #"!!\316\316f\263C\177\177\36\355\323\207Am\0305Z\212\177 =\235\373n"
- #"\273\215\205w\336\311\200O>!\255\241"
- #"\212\342\3273g2&8\230\276\236\236"
- #"m\376M\242?\376\230\314\ns\301\352\177M\235\332$\26-\315\24\1^:v"
- #"\214\fIB\235\232JAY\31\322\326"
- #"\255m\366\333H\243\375\373\256\244$2"
- #"\327\257o7\266\261&\210%g\335\216"
- #"\320|\t\253\263y\347\343\3458;\272\363\353\1r\277\356t\214\243"
- #"\311\2338\371\363\267L\17\336\242\3508mQU\253aMR$\263"
-) 500
-(
- #"M\312\37\e\267\aB@\272:2\5$\24\230\211\371\333\276%\324\230OD\355"
- #"\301r\206\371s\300\333\300/\201\3\264"
- #"\357n\331\30\333\37\330\aD\265\23\373"
- #"\22\360\276\203\3\25&\23\317\4\5\361"
- #"nDD\273\327\321\350\233u\207\207\a\307cc-\26\252\262\24\377ei)\233"
- #"+*\330\261pa\323\fdWF\6\2312\f\17\255\211\327\30\fD~\364\21"
- #"\373^yE\326\236\206\2654\n\210\22() \343\37t\347\253U\331hs\224"
- #"u\342]\265m\26\261\276\v\211r\265"
- #"\217\377\325\276\254\345Hzw\"K\225\25J{!\4\244\253c\205\231b?\344"
- #"\25\223\212\2L\200\345Us\b\a\256\0c\201\366K\370X\27[\2\334\6\314"
- #"\n\b\340BM\r'e\24\234\352L\264\365\365\370&%Q\364\304\23\370\2673"
- #"\333\270iT*T\253V\311\232yt\4\327\371\3631h\265\312\364\335b\t\253"
- #"3\211\233\255b\317\32\211\253\n\246\343"
- #"\350\215Z\236|\317\227g\307\24\341\246R\316\323\253-\264\306<>:w;3"
- #"]S0\351l?\276-\350\352\2\"\216\361\312\244\24\371\225\b3\221'\36\0"
- #"9\2307\303-\t\202\265\261\376\300\23"
- #"\16\16\370\232L6\27\0170\373b\315"
- #"\366\367gOr\262\345\340\233\241\207\177"
- #"\377i\17\203\374\262\335\35\")u;\267G\335o\27\361\0\3701o%\303\3"
- #"\36\357\266\342q+ \4\244\e\263L"
- #"\222x\277\241n\207=\230\353\347\307\226"
- #"T9\206\3667\207K\263\315\375\316Fi+\23\245prr\301 /\275\241\303"
- #"\234\270\264\205\301~\366\313\374>\255\371"
- #"\200\376\3222\273\215/\20\2\322\255\t"
- #"\222$$I\242\332\6\306\206\2551\335\307\207\275%%\312\317\22$I\2611n"
- #"\345L\364Z\345*\345\2p!k\37\375\\\355"
- #"c\337^[_\205\204D\255B\265T\272\2\302L"
-) 500
-(
- #"Q`w\342T*\216\330\311\332\304\313\321\21\203\311\4ze?\311\214\n\216q"
- #"\253\316@\352\352\214\212\353vm\275\1"
- #"';\331\267\347h\217\20\322\353N\352\273q\265Aa\246(\260;\223$\211C"
- #"\rGh\355\206\302\2\342\352\350Hu\303\261_\1\324\350\253pvj\273|q"
- #"w \247\362\20A\252I\366\276\214\36"
- #"\217\20\220n\316D\340`\265\302\213\341"
- #"\355\340\242R\201\302\326\356q!!\34\271(?\371\316\32n\305%\254s)G"
- #"\30\34\245\274;\256\243\203\375\22\367\262"
- #"*\16\342k\234h9P\240(B@\2729c\200\343\222D\211Ng\227\361\215"
- #"\222\244\270\200L\n\r\345PJ\212\"}\337\212KX\247\223\17\21\e5\251S"
- #"\372*\325\346\362\331\201\4\226\256\277\321"
- #"\260\261\336\324\372\21\344FW\335\325\247"
- #"\344\eC\202\331\v\353\2033\226\313/"
- #"\e\353\265\344kO\340e\30\311U\324"
- #"\354\305r\233\346\324\220\313\31\22\330\207"
- #"|\327_\200\275\304Zm\244\b\360\37"
- #"\"\320\221ne\233\360\16\215ek\204\200ts<\200\331*\25{\354\264\17\342"
- #"\346\340@\221\302\313K\23\303\3028\230"
- #"\226&;^\222$\326}\367\35\3\226.\265\30\3338\3Q\37=J\354\355\267"
- #"\313\352?7/\217\204?\375\211\220\310"
- #"\310\366\373n6\3\261\326\215\267\272F"
- #"\313\336\303\233y\376\215\331,X~\275"
- #"\263n\322\205\203\f\356w\343\267\363\366"
- #"\304\240-^\375|\2\337\237^KEU!\211\227\2675\271\361\226Wipr"
- #"h\335\245\300\354\252\273\16]m!9"
- #"\225\207\2517\311\253\222\271#5\236\253"
- #"5)\234,x\267]7\336K\245\333\211\361\272\37g|9A<\225\244\220\303"
- #"f\352\220\227\257\363\3\23Hc->\264\357\355\326\22=\205\250\231f\365"
- #"\a\273\204\211D\26[\345\306[\207\216\323\330\267\302\243\34D\"a7s"
-) 500
-(
- #"\343m\215/\201\315NN\354\30i\311"
- #"\221\253\363y\351\312\25\f\16\16\314\36"
- #"7\356:s\304\366\220\200\365\347\316\261\372\364iR\27-j7Vk4\2625"
- #"5\225\307\277\377\236 __\362?\372"
- #"\250\335\370\f\215\206\305\353\327\243R\251"
- #"\370\341\302\5\213\t\210\252\a\36\340\360"
- #"\376\375VyaE\r\32\324d\2768s\306\f\2\373\364!$8\230\300>}"
- #"\b\16\16&8(\210>\1\1\f\0361\242\303n\274\263\177\37C\236\306l\330"
- #"\330\307?\224)c\3464\305\277\266\376q^}\364G|\335\"\257s\326m\356"
- #"\306;z\340\34\374<Ce\273\361\352"
- #"\215:\306\f\232Oj\276\331@\320\305\311\35w\37211\3645B<G\342\240"
- #"\272&\2069\225j\276H\231\216\261^G\204\317$4U\347\b\362\30N\204\367"
- #"$\"}&\23\352y'\216\0167\356"
- #"\321\344T\252\331\235\276\204H\237)\244"
- #"\227\177\a\264\356\306\373e\312,B\215"
- #"\v\351S\365 WQ\223\304\22\274\270"
- #"\215b\16\321\207\211\2041\227\276\314l"
- #"s\203\377*jN\261\30\207\6\337\207"
- #"h\236$\202\207q\241\267\305\377[\341\306{=B@\254\20\20k\235us\201"
- #"\25\300\17\300\5\31\361\207\201\r\300O"
- #"\264\236\264\330\350\205u\32\263\327\325N"
- #"`\v\346\244\305\323m\\\357\22\340\4"
- #"\20\0\274\31\36\316\236\212\n\212\353\352"
- #"Hj\221\\\250\326jy<3\223u\221\221\24\327\326\222e0\220e4\222e"
- #"0\220m0\340\343\350\310\211\2066\215"
- #"\256\276[KK\331\20\25E\216\301@\256\321H^mm\323\375\0gg\216\307"
- #"\306\242\251\255%\374\3349z9;Sn0\360\355o\177K\216VK\256VK"
- #"\236Ng\276\257\323\21\340\346\306\361"
- #"\207\36\"\243\242\202\305\373\366\221\255\325\222YQ\301\227"
- #"3f\240\251\256\246\250\272\232\202\252*\212\32\356\347WU"
-) 500
-(
- #"\21\352\351IqM\r\3512\17\tD\a\5\241R\251H\227Y\253$:(\210"
- #"\334\222\22\372\206\206Z\345\306\253>z"
- #"\224\373\346\316\245\264\254\214\303\373\367S"
- #"PX\210F\243\241\250\270\230\202\302B"
- #"\212\212\213)**\342db\"\303\a\217g\303?\16[\355\306[T\222\313g"
- #"\333Vp\350\344\16\236\177b-\272\252"
- #"\362\246\370\257v\257e@\337\273np\326mt\343=\223\276\213\307\246~HE"
- #"U\241l7\336\217\367-a\305c\346}\2462]>\3137D2\242\317\343\24"
- #"U\235GB\342\321a\327\247\2676\212"
- #"\301\357o\277H\235IO\236\356\4\331\25\a\311\256<H\275\311xC|k\264"
- #"\345\306\373\306q7f\251\212q\254\277"
- #"^ \352\320\222\317Nr\331\202\236B"
- #"\246\360\243\3051\2129L\6\e\320\221"
- #"\312\2578a1\36\204\eos\204\200"
- #"\310\24\220X\240\34\370\n\313\376Vj\314N\271W\201x\340Eh\2632\201\32"
- #"x\222k\206\210O\2\17C\253\337\205"
- #"\236\303l\365~\ef1\231\b\314\305"
- #"\354\321\325\362\273V\243\37\227\16\210\1"
- #"\322\201\245\376\376L\363\367g\222\2677"
- #"\275Z\30\23F\237;G\246\301@\260"
- #"\2633\263\374\374\210tq!\322\325\225\bWW\242\\]\ti\266\3342\340\374"
- #"y\322\32NV\305\a\4\20\346\342B"
- #"\250\2633\341\256\256M\367\3\233\305\253N\236l\272\37?x0a^^\204z"
- #"z\22\356\345E\230\247'\241\236\236\4"
- #"\3662\177\273\34\370\311'\244\226\227\343"
- #"\240Ra\222$\26\17\35J\210\207\a"
- #"\201\275z\21\334\253\27\301\36\36\364q"
- #"w'\304\303\3\37W\327&\3019\234\227\207I\222,\316(\26455\354LL"
- #"d\313\217?r6+K\226\231\342\225\263gY\361\341\207\354\332\275\273M"
- #"g\335\226\3101_l\351\205\325\0217\336\326\30;\327\225O\226\313[6\352"
-) 500
-(
- #"(\361o\251\370\353X\373|t\274vL\305\334[ G\2423\350\352V&B"
- #"@\24\364\302:F\333\302\3212\366\377\200\t\26b\e\275\260F\2\a\271Q4"
- #"Z\366\233\325\320\346{`8P\24\35\215W@@\253\361\215\263\212\23:\235E"
- #"\353\223\306\330]\345\345d\16\267\\\331"
- #"\316\345\324)\226\f\37.\313\34Qk4\2623#\203-\227/s\266\270X\226"
- #"\371\242\48\274\363\16\375\203\203I]"
- #"\273\326b\2745\270\316\237\217\341\362e"
- #"\b\261nCX\16.\336\336\34U\300\v+n\266\212M\317+\373\266^\264\312"
- #"\225\27\357TV\244Z\303X\257\345\355\223\201\334/uO\367\335\226tu\1Q"
- #"\356\214b7\243\324\212\330\326\353\317\335"
- #"|\2545\276x-\373\235\1\354(+ca\e\2\22\346\342\302\32\v\216\275-"
- #"c\345\306\327J\22k&Of\315\344\311\26c\275\\\\X0h\20\v\6\r"
- #"\222\3257\\\233\275u\266x@\303)\254\312JE\4\244V\301DB\245\251\253"
- #"W\306\4\322\22\227J\267\23\351~/"
- #"2\253\320\n\24F\234\302\352!\314\5"
- #"\266T)\354\256\327\rqsq\241\250\215\222\2647CAa1\256\256\255\237b"
- #"\22\264MJ\311\26\302\35\355\347\277%"
- #"\270\36! =\204\351\300^\243}\276"
- #"5\272\334\302'\335\226\315\230\301\e\e"
- #"7vz\277+V\276I\374\375m\227\374\355\35289\332'\2110\275l\37}"
- #"\352\354\343\277%\270\21! =\4/\314{\5v\263?Wx\\\25\312$\375"
- #"-\2331\203\367\377\363\237N\357\367\303"
- #"\177\375\223\271\323\224q\222U\251Tv[bR\36\tIo\37\377-\301\215\b"
- #"\1\351A\250\200Z\205}\251\332\32\327"
- #"\240\360\362\231\263\203\203\"\266#"
- #"A\276\276\350\25\330\253\320\353\365\370y)\343$\353"
- #"\350\350\254\350\f\241\256\336@\353\205\224\225\245^2\232"
-) 500
-(
- #"\307\355\342\e\313=\t! =\210\30"
- #"\225\212K\225\2256\37w\250\207\a\347"
- #"\v\n\24\35\303h\222\237\345\333\335\251"
- #"\253Sv\366\221]t\2160\377a\212\216\321\32%5\227\360s\355o\363q\5"
- #"m#\4\244\a1\4H\266\303F\372(\17\17\22\25\26\20%Qbf\243t"
- #"-\20%\311,L$\314w\224\315\307-\256N\306\317\331\366\3255\5m#\4"
- #"\244\a\21+I\\\264\2033\357(ww\222\212\213m>ng\241\304\336\212\222"
- #"\265@\224&K\223D\210\247\355\5\344j\365E\274\2554N\24(\213\20\220\36"
- #"\304\20 \331\16'\261Fyx\220d\307\322\2727KGf \226\314\27[\316"
- #"@$Ib\313\236u\314yz\200\3541\316^T\363`\202u\37\250\227r\325"
- #"\274\360\361\315\265\311\324$\21\354\336\266"
- #"\200t\324\215\327\22\3055\311x\231\304"
- #"\f\244+!\22\t{\20C\200\213\365\365m\376<\346\3349\322ed\2267\367"
- #"\302*\220\341P\353\347\344\304O:\35!\e6P\360\344\223\355\3066\317D?"
- #"QXH\276\205\370\\\235\216\25\247N"
- #"Y\274\206\246\376\233Y\231\234HM\265"
- #"h\276\250\255\251\301XW\307\354\a\37"
- #"\344\304\251S\344\313\310\tQ\37=\332d\276\330\26\315g y\232\f^[\273"
- #"\30T*\256\24\310s\25>{Q\315_V\316\343j\231\374\245\301K\271j\326"
- #"~;\217\362\252\233k\223_\3623\276"
- #"C\206 \265\221\210\276\376\364\0\234\34"
- #"\334\321\327\225\261;}\t>\256\221\370"
- #"\272E\342\343\32\201\257k\24\236.7\n\313\272\3231\224\3513pu\364aH"
- #"\300\274V\333\24W_\244\177\v\1\331M\24\6J\350\313\275x3\24o\6\343"
- #"\303P<\210F\205c\253\327\267\233(\214\224\21\316\357\360c\24~"
- #"\214\302\207!\250,|\34\356&\212Z*\270\235\265\355\2325\266d'"
-) 500
-(
- #"!\204\361\0\203x\21w\213\336\24f\376\313X~\301\233X6N\262/=\336"
- #"\312D\247R\341i\357\213h\206D\347\234oi\255\37#\340\6\\\0355\212\336"
- #"\2167\276\271\206\374\364\23\311\303,o"
- #"\216\272\235:\205\301\302\313&\332\325\265"
- #"I\214d\305\373\370\220\376\330c\270\275"
- #"\367\36\206vD\256e\233<\235N~|P\20y\245\245\30d.\37Y\35\337"
- #"`\246\350\356\353\213\336 \317\346#4"
- #"(\232\342\322<\214\265\362\343\277\371 "
- #"\235\361\17\272c\224Q\364<\3207\232"
- #"\267\2370\327\242xl\225;\265\365V"
- #"\266y\307\235\332\272\366\333\370\271E\363"
- #"\207\221\3514\276\352r*\325\354\313\374#\372\2722&G\274N\271>\213\nC"
- #"\26\345\206,*\f\331\364r\356\303#"
- #"C\325\327\365Qi\314\345\307\274\25\244"
- #"\226\356j\263\315\225\312\243\314T\25\340"
- #"&\0055\265kt\343\35\312?\250$\205J.PI\nNx\264i\\\330\330"
- #"f \317RF\22e$\341\200\263E\243\303\346\316\277r\315\32\1\3662\204@"
- #"\246P\302q\356F\336\227\235\253\2509"
- #"\307s\224H\362\f\36\355E\217\27\20\201@ \20t\f\261\a\"\20\b\4\202"
- #"\16!\4D \20\b\4\35B\b\210@ \20\b:\204\20\20\201@ \20t"
- #"\b! \2\201@ \350\20B@\272)j\265\232\330X\221\265k\vrss"
- #"IHH\300\307\307\207\204\204\4\362\362"
- #"\362\354}I=\32\361\332\267\35B@"
- #"\272!j\265\232y\363\346\221\222\222b"
- #"\357K\351\21\214\0301\2\200\3\a\16\0000\\F2\246@\31\304k\337\266\210"
- #"<\220n\310\330\261cy\363\3157\2310a\2\342\277WY4\32\r111"
- #"\350t\272\246\347<==\311\310\310 0P\31\273vA\333\210\327\276"
- #"m\21\2\322\215Q\251T\342M\2440\313\227/\307\335\335\235\327_\177\275"
-) 500
-(
- #"\351\271\227^z\t\203\301\300\252U\253\354xe=\e\361\332\267\rB@\2721"
- #"\342M\244<\255\3156Z\233\225\bl"
- #"\213x\355\333\6\261\ar\213\20\23\23\203J\245j\365_LL\214\275/O "
- #"\20\364@\304\f\244\e#\276\205)Ok\313U\255-k\tl\213x\355\333\6"
- #"! \335\30\361&R\36\261\211\3365\21\257}\333 \226\260\4\202\233 (("
- #"\b777\22\22\22HLL$!!\001777!\36\202\36\201\20\220n"
- #"\214H\246\262\rg\317\236\5`\306\214"
- #"\31\0\234;w\316\236\227#@\274\366m\205X\302\22\b\4\2A\207\0203\20"
- #"\201@ \20t\b! \2\201@ \350\20B@\4\2\201@\320!\204\200\b"
- #"z<\343\306\215#==\375\272\347\322"
- #"\322\322\30?~\274bc\366\356\335\233"
- #"\350\350h\305\372\27\bl\201\20\20A\217'>>\236\205\v\27R__\17@"
- #"}}=\361\361\361\304\307\307+6fpp0\237}\366\231b\375\v\4\266@"
- #"\234\302\22\364x$I\342\236{\356a"
- #"\352\324\251<\373\354\263\254\\\271\222\375"
- #"\373\367\263g\317\36T*\225\275/O"
- #" \350\262\210\31\210\240\307\243R\251\330"
- #"\260a\3+V\254`\347\316\235\274\371"
- #"\346\233|\370\341\207\262\304C\255V\343"
- #"\357\357\337\344K\346\350\350\330\364\263\270"
- #"\2708\222\222\222\232\36'%%\21\27\27\ap\235\177Y\313>\374\375\3759r"
- #"\344H'\376\206\2\201BH\2\201@\222$IZ\267n\235\344\351\351)\255_"
- #"\277^v\e___I\255V7=n\376\226\332\275{\267\24\32\32*eg"
- #"gK\331\331\331R\337\276}\245\335\273"
- #"w\337\20\27\21\21!\255^\275\272\351"
- #"\361\341\303\207\245\273\356\272\353f~"
- #"\25\201\300&8\331[\300\4\202\256BUU\25\256"
- #"\256\256TUU\311nS^^\336\346f\373\264i\323"
-) 489
-(
- #"HHH`\346\314\231H\222\3043\317"
- #"<\303\264i\323n\210\333\264i\23\367"
- #"\337\177?iii\274\370\342\213L\230"
- #"0\201c\307\216u\370\367\20\bl\205\330\3\21\b\200\213\27/2i\322$\266"
- #"o\337\316}\367\335\307\301\203\ae\331"
- #"a\2644\355k\371\330d2\21\35\35\215J\245\"==\35\a\a\207V\343r"
- #"ssY\261b\5\37}\364\21\36\36\36\354\330\261C\321S`\2Ag \366"
- #"@\4=\236\372\372z\26/^\314\253"
- #"\257\276\312\330\261c\371\373\337\377\316\342"
- #"\305\213\233Ne\265\207\257\257o\273\373"
- #"\25/\277\3742\21\21\21\204\207\207\363"
- #"\312+\257\264\0323v\354X\262\262\262X\263f\rz\275\236\227_~Y\321\23"
- #"`\2A\247a\317\3653\201\240+\360\326[oI\277\371\315o$\223\311$I"
- #"\222$\231L&i\352\324\251\322\312\225"
- #"+-\266=|\370\260\24\22\22\"\251"
- #"\325j\351\360\341\303\327\355ml\332\264"
- #"I\212\211\211\221\212\213\213\245\342\342b"
- #")&&F\332\264i\223$I\327\357\201$%%I\241\241\241\322\376\375\373\245"
- #"\357\277\377^\n\r\r\225\222\222\222:"
- #"\371\267\24\b:\37! \202\36\317\330"
- #"\261c\245\264\264\264\353\236KMM\225"
- #"\306\215\e'\253\375\341\303\207%\37\37"
- #"\37\311\307\307G\212\214\214lz~\364"
- #"\350\321Rbbb\323\343\304\304Di\364\350\321\222$IRlll\233}4"
- #"\337\224\27\b\2722b\17D \20\b\4\35B\354\201\b\4\2\201\240C\b\1"
- #"\21\b\4\2A\207\20\2\"\20\b\4\202\16!\4D \20\b\4\35B\b\210"
- #"@ \20\b:\204\20\20\201@ \20t\b! \2\201@ \350\20B@\4"
- #"\2\201@\320!\204\200\b\4\2\201\240C\374?\372_"
- #"R\364\335\333cu\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 3 #"mix"
-0 0 24 3 2 #" ("
-0 0 14 3 5 #"shade"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"trig"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 15 #"              ("
-0 0 14 3 7 #"contour"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"trig"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 15 #"              ("
-0 0 14 3 12 #"vector-field"
-0 0 24 3 2 #" ("
-0 0 14 3 8 #"gradient"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"trig"
-0 0 24 3 2 #") "
-0 0 23 3 9 #"#:samples"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"25"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:color"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 5 #"black"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:x-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-1.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"1.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-1.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"1.5"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 7 #"#:title"
-0 0 24 3 1 #" "
-0 0 19 3 63
-#"\"gradient field +shdade + contours of F(x,y) = sin(x) * sin(y)\""
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 17 3 15 #";; Surface test"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-old-plot"
-0 0 24 3 1 #" "
-0 2         113 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0          51 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\1\220\0\0\1\220\b"
- #"\6\0\0\0\200\2776\314\0\0 \0IDATx\234\354}w\230eE\265"
- #"\375\232\31\206\214$\t\212\350\210H4\374$\b\372\30\301\af0#\240O\34"
- #"3<\25\305\207\200\341=1\240(\212\2\6\214\fA\20\23J\320'\202\216\17"
- #"\220\21\1%\312H\32D@@\30\222"
- #"\16\303\204\365\373c\327\246\366\251[U"
- #"\347\366\235\356>\267\247\367\372\276\365\335"
- #"\276\247N\250{\273\373\354S;\254=\5\0\341p8\34\16\307\b1\265\353\t"
- #"8\34\16\207cb\302\r\210\303\341p8\6\202\e\20\207\303\341p\f\0047 "
- #"\16\207\303\341\30\bn@\34\16\207\3031\20\334\2008\34\16\207c \270\1q"
- #"8\34\16\307@p\3\342p8\34\216\201\340\6\304\341p8\34\3\301\r\210\303"
- #"\341p8\6\202\e\20\207\303\341p\f\0047 \16\207\303\341\30\bn@\34\16"
- #"\207\3031\20\334\2008\34\16\207c \270\1q8\34\16\307@p\3\342p8"
- #"\34\216\201\340\6\304\341p8\34\3\301"
- #"\r\210\303\341p8\6\202\e\20\207\303"
- #"\341p\f\0047 \16\207\303\341\30\bn@\34\16\207\3031\20\334\2008\34\16"
- #"\207c \270\1q8\34\16\307@p\3\342p8\34\216\201\340\6\304\341p8"
- #"\34\3\301\r\210\303\341p8\6\202\e"
- #"\20\207\303\341p\f\0047 \16\207\303"
- #"\341\30\bn@\34\16\207\3031\20\334\2008\34\16\207c \270\1q8\34\16"
- #"\307@p\3\342p8\34\216\201\340\6\304\341p8\34\3\301\r\210\303\341p8"
- #"\6\202\e\20\207\303\341p\f\0047 "
- #"\16\207\303\341\30\bn@\34\16\207\3031\20\334\2008\34\16\207c \270\1q"
- #"8\34\16\307@p\3\342p8\34\216\201\340"
- #"\6\304\341p8\34\3\301\r\210\303\341p8\6"
-) 500
-(
- #"\202\e\20\207\303\341p\f\0047 \16"
- #"\207\303\341\30\bn@\34\16\207\3031\20\334\2008\34\16\207c \270\1q8"
- #"\34\16\307@p\3\342p8\34\216\201"
- #"\340\6\304\341p8\34\3\301\r\210\303"
- #"\341p8\6\202\e\20\207\303\341p\f\0047 \16\207\303\341\30\bn@\34\16"
- #"\207\3031\20\334\2008\34\16\207c "
- #"\270\1\231\200\270\t\300}]O\302\341pLzL\1\300\256'\341\309\b\371"
- #"\3459\34\16GW\360\25\210\303\341p8\6\202\e\20\207\303\341p\f\0047 "
- #"\16\207\303\341\30\bn@\34\16\207\303"
- #"1\20\334\200\f!\256\3\260K\327\223p8\34\216\26x\26\326\20\202\0.\1"
- #"\360\374\226}<\v\313\341pt\t7 C\210~\214\203\e\20\207\303\3215\334"
- #"\2055\244\270\17\365b\301\353\314\317\267"
- #"\2\330pl\247\343p8\34=p\0032d\270\t\300\375\0\326\r,a[\363"
- #"\363\223\1\34>\226\223r8\34\216\f"
- #"\334\200\f\31\36\1\360J\0\177\36\341"
- #"q\377\1_\2058\34\216\361\205\307@"
- #"\206\30\375\3069\b\340(\0\253\0\370"
- #"\340\230\316\310\341p8\"|\0052\204\270\22\300\372}\354w\v$Nr?\200"
- #"\313\0\3548\226\223r8\34\216\4n@\206\20\177\2\36064\3\3459\354\17"
- #"\340\357\20\227\327\267\1\314\34\343y9"
- #"\34\16\207\205\273\260\206\20\273\0\230\r"
- #"\340\351\350\357\227s\23\200\315\340i\275"
- #"\16\207c|\341+\220!\304\267\0,\2\260[a<\355\a\262\31\304\215\345\325"
- #"\353\16\207c<\341+\220!\304\245\0\346\2\330\0\300~\205}l\200\235\0^"
- #"\0\340,\324S\177\35\16\207c4\341+\220!\304%\0\26\0x\352\b\216\271"
- #"\20\300:c3\35\207\303\341\310\302\r\310\20\342\22\0\317\6\260s\237"
- #"\373\273\373\312\341pt\1wa\r!\346\1\330\24\22D\277\275\260\217"
-) 500
-(
- #"ua\315\204\270\257\326\201\a\322\35\375b\6\200\313\1,\6\260q\267SqL"
- #"X\270\1\31B<\t\300\365\0n\6\360\254\302>i\221\241\6\325\327\e\303y"
- #"9V\24\354\0\340lD\303\261\t\200;\272\233\216c\302\302]XC\210\277\1"
- #"\370%\200\317\215\340\230\365\340\306\303\321"
- #"\17\366\5p\21\304x\334\e\266\375\277"
- #"\356\246\343\230\320p\0032\204\270\22\300"
- #"U\0\2367\340\361\204\b,:\34M\34\1\3404\210\350\3157\0\234\32\266?"
- #"\273\253\t9&8\334\200\f!\266\202hZ\rj@\0\340\303\2434\27\307\212"
- #"\200i\0\216\5\360\361\360\376p\0\a"
- #"@4\17\200\262\243\324\341\250\303\r\310\20be\0\377@= \336&s\362\352"
- #"\321\233\216cBcu\0?\2p\20\200G\1\314Bt\216^\31^}\5\342"
- #"\30\fn@\206\24\377\2\360_\225q\333\17$\327C}#H&\227c2c"
- #"c\0\277\205<N<\0\340e\0N6\343\327A\262\260\266\0\260\332\270\317\316"
- #"1\361\341\6d\bq?\200_CRs\373\301\326\0\316I\266\335\3\340#\243"
- #"9)\307\4\303S\1\334\t\311\270\272"
- #"\v\300\356\220\277*\213E\220\244\361i"
- #"\0\266\31\327\3319V\f\270\1\31B\274\22\300[\0\2549\202c\326\316ls"
- #"7\326d\305\316\0201\34\305\347!5\379\\\25^\335\215\345\309\334\200\f"
- #"!.D\336 \244\320~ \0\360O4;\22\256\216\221\31 \307\212\202\375!"
- #"n\253\r\1\\\21\266\375'\200\225\n"
- #"\373\253\1\361@\272c\344p\0032\201\241\375@\0\340x4\373\242o\1`\255"
- #"q\237\221\243;L\201\364\245\234\rI"
- #"\3038\16\262\22\271\6\300\323 M\217"
- #"s\360@\272c\371@\347\360\361>\200\267f\266o\224\331\316\260\375"
- #"a\363\376\353C\360\31\234\343\305\325\b\374\200\362\253_L\340]f"
-) 500
-(
- #"l\277\260\375F\2+\231\355\353\20x"
- #"=\201\323\3038\tL\37\202\317\342\234Ht)\223\t\206/@\262\263\26 V"
- #"\236\23Q\223F_\377\16\340\t]L\3201\316\330\30\300O\1\354\4\340A\0"
- #"o\200\350\30(\246BV\31\317\0\360iH~\337K\1<\37\275n\255g\0"
- #"\270v\214\347\353X\221Pr\214:\206\24\a@Rt\357j\331\317\335W\223\1"
- #"\e@2\255\0\251\34\332\23\300\357\223"
- #"}\326\0\360G\210q\370\230\331\276\4"
- #"\300\377\1\370\5\304\370\274\32\300K\340\6\3041\22x\fd\310\360($\0>"
- #"\22\344\344\334O\31\235\3518\306\rS\0L\17?OE\363\257 }\17\210\361"
- #"\270\300\274\277\27\"\277\251\330\2R}"
- #"\3767\0o6\333\177\5`\357p\374"
- #"\256\220\270\311\367\303\330\213\6\237\276c"
- #"\322\242s?\2323\222\0_X\31\377,\300c\302~\272m&\300\5f\e\1"
- #"\3369\4\237\305\331/_O`\t\361X,\242\304\277\228\216\300\213\t\314\v"
- #"\333.\17$\201\277\20x/\201\213\314"
- #"1\213\t\234L\340s\341\375y\231\353\257O`)\201\177\22Xe\b\276\17\347"
- #"\4b\347\23p\32\22\340\307*\343\32"
- #",g\346\270\5\346\347\207\a\274\276s"
- #"<\371\34\2s\210V\303Q\342\375\4\16!p \201\177$c\17\208\226\300"
- #"\323\303\265\326\f\373\223\30033s\271"
- #"4\214\355>\4\337\213s\2\261\363\t8\r\t\360\27}\354\303d\333u\0w"
- #"1\343\236\2055\314\234A\311\232Z\26~\225K\365WJ\340\n\2G\207\237o"
- #"#\360&\2\377M\340\377\30\r@\eo'\260u\346\272_\n\343_\313\214\35"
- #"\31\306\216\32\202\357\3079\201\330\371\4"
- #"\234\206\4x?\300i-\373\260e\334]X\303\310\265\t|\221\300"
- #"\277\302\257P\r\210\32\216\275\bL!0\225\300\325a\373\273\222sl"
-) 500
-(
- #"K`a\346\370\34\177\22\216\3372\34\3734FW\325z\311yw3\363\350\372"
- #"{rN v>\1\247\341\265\0o\0\370\314\312>D\273\1q\27\326\260\361"
- #"\315\372kKx\3\201\267\260Y\243\1"
- #"J\254C\367\271\234\300\17)+\223\367"
- #"\20\370r\330\276\230\300\217\t<X8\267\345\35\4N#pUx\177xr\275"
- #"\225\t<D1J\e\16\301\367\345\234 \354|\2\316\204\263\1\36P\31\267\1"
- #"\363\34\twa\r\17W#\360+\"{S\277\204\275\206c\220\270\310\333\b|"
- #"\2700v\31\305x\344\306N\242\4\360\327\t\327>;l\177\343\20|o\316\t"
- #"\302\316'\340L\370N\200\247T\306g"
- #"Bb\36\372\376V\200\e\232\367\204\273"
- #"\260\206\203/d\323\315\364Hx\275\232"
- #"\321\215\365\276\260\357\f6\343\"w3\336\320\317!\260'e\365q4e5r"
- #"\2059/)F\347\200d\233\306W\366"
- #"\242\270\261\336\315f\345\271\315\324\372-"
- #"\201\263\302\373\223\206\340\273sN\20v"
- #">\1g\302m\0\336\f\360\246>\367'$\265\327\276_\6p\323!\370,\223"
- #"\223S)\201jk<4K\352R\312\23\377[\303\373G)\256%5(\213("
- #"\201\354u)Fe)%\346\261N\346:\337\r\307<\34^\227\21\230o\256i"
- #"\371\"s\334\267\303\266\363(\206cqf\377\225\207\340{tN\0v>\1g"
- #"\302)\0\357E\335MeI\200w#\256B\b\360.\270\e\253\enA\340o"
- #"D\303p\314\17?\253\361\320}\177l"
- #"\366\323U\304s\222\363\375&\214\245\301t\20x]\30\233K1:\213\302\373e"
- #"\311\253\256D\16\245\0307=\356\242p"
- #"\36\325\305\372\216\331\177\373!\370.\235"
- #"\23\200\235O\300\231\3419\30\231\1\321\2C}\177\27V\0047\326"
- #"T\2\253\17\301<\372\345\177\262\3714\177>\245\270/g<6 p"
-) 500
-(
- #"\215\331\367\223\205s\316\n\343\27g\306"
- #"\36GY\301,\241dU\345\342'i\201\342\\\2\317N\216\263\347\374Z\330\357"
- #"\23C\360}:'\0;\237\2003\303\17\243\335\200\334\2Q\355]\0\360u\0"
- #"/\f\333\t\360\241\300\256?G;\247"
- #"\22\330\230\362\304\273/\201\217\21\230M"
- #"\271a\332`\363\3540\266O\330w]"
- #"\16\217q\331\210\300\37\315|\227Q\342"
- #"\b7\204\367\251\361x\"c%\371\355\341\365{\205s\257\301\230e\265Uf|"
- #"N\30\333\307l\333\327\314\345NF\367"
- #"\230\362\1\2\177\316\34\a\2/\17\333"
- #"=\235\327\331\27;\237\2003\303\27\240\335\200h0]\245Lt;\1>a\b"
- #">C\231\32\320=\215\30Q\266Q\216i\212\353\236\224Z\211\2658>\6\346-"
- #"-\363\273\216\262\332\320\375\255\361\270\224"
- #"\300\263X\217s\200\300\211a\377\317e"
- #"\306\16\vc\247&\333\2172s\270\225"
- #"\261v$\345\17\222\343V\245\304T\226"
- #"\21x\3228|\177\316\t\316\316'\340\314pu\200\v3\333s\375@nB\323"
- #"\330\20\303\24\377\230Jq\231\250\301("
- #"\245\224\376\236\275\253\214_\207\261\203Y"
- #"^\235\2641MU\35-\256A\t@\333k\335K\340\325\4\376d\266\375\330\34"
- #"\223\32\17\235S-\316\1\212;\251\237\317jeHfP\f\223V\271\3177\373"
- #"\375\215\342\302\322\367{$\327\373i\330"
- #"\376\356Q\376\316\234+ ;\237\200s"
- #"\4\374\2\344\277\376>\263\215\220\25\210"
- #"\2252\351>\376\261\26%E5w\243"
- #"\323\242\266w1\272y\236\2219\307\347"
- #"\303\330\177g\306N\rc\237do\212\353\0372\327\324T\325\303\tlG1\0"
- #"\203|\256\31\224\354\245\364\374\v(."
- #"\246=\303\373G\30\237\372\337\307\262"
- #"\361\0\313q\216\221\326\204,#\360\r\212{\17\214\206\351"
- #"\226\360z\257\331\367\227\225\343\336\36\266\237\263\34\277\177\347"
-) 500
-(
- #"$a\347\23p\216\200\17C\262\255h\266\21M7\26\321e%\372\26\24\21\277"
- #"\a\210\306\315\355L6e5\224z#{i\346\\o\nc?\312\214\2753\214"
- #"}\2770\17}\212\376\1\313\251\252\227"
- #"\262\277\330\312\24\2\377A\340\372\3149"
- #"H1\0243)\261\220\273\303\266\203\31Su\27St\255r\306\3\354\215s\314"
- #"`oM\310\334\360\363\201\231\317\372="
- #"3\0175f\3577\327\377=\243X\242"
- #"\315\314\322\357~qr\334\306\224\225\313\2778\270\241uN\22v>\1\347\bX"
- #"2 \351\353\370\272\260V\246\334`s2\342\32\\~Q\341X\255Ixgf"
- #"l\3330vcf\354\351a\354.\312\r>\35\327\330\200\n\a\346RU\227\207"
- #"\267P\262\230\226\22xC\270\306\317\302"
- #"\330\317\315\234\3160\307\\\303f<\304"
- #"\362\304\260\317\\\346kBj\6S\307~FY\201\351\365~\307X#\262#\243"
- #"\21!cv\226^\313\256\252.d\224<ye\37\277\177\347$f\347\23p\216"
- #"\200\271~ \352\276\322m\304x\272\260"
- #"\266'\0327\326TF\374\204\260\375\375"
- #"\205\343\217\b\343\271\264\321i\24\341\277"
- #"e\24!\302t\\\353-r\312\263/\bc\177\314\214m\313x\343<\221#\213"
- #"\255,&\360\2250/R\f\25\b\274#\274\277\227\300&\346Z\3372\307>\277"
- #"\362=\276)\271\316\0346kBj\0063\35\333\213\228'c\f\344\213\24\343"
- #"u\213\271\306R\306\25\311\327\222\343\324"
- #"\300\234\330\362\373wNrv>\1\347\b\230\353\a\222k(5\366.\254\251\224"
- #"\233\247\26\257\221r#^+\331\357\240"
- #"0\366\315\302y\364\306\373\235\302\270>"
- #"5\317\314\214i\34$\347\326Y\215\261"
- #"\326a\315\314\270\255\4\177\aEK"
- #"\252\344\352\262\234\317\350\246:>\234k\v\306'\375"
- #"\327\232k\274\321\\\2434O\20\330\201\222n\253\327("
-) 500
-(
- #"\5\323k\0063\35[7|\347\326e\365d\212\233M\337\337n~^H\251\t"
- #"\311\0357\2750\37\247\263\373\t8G"
- #"H\242i@\0\t\252\337g\306\307\326"
- #"\205\2659\305\257\256O\261\352\337\317\271"
- #"\251v\17c\27\25\316\365\2220\376\313"
- #"\302\3707\303\370\3732cmq\220\313\302\370\v3c[SRls+\f\r"
- #"\266\37\306\250_\365\253d\377\337Rn"
- #"\254\323\31\203\3666\225\366\251\214\375;"
- #"\324=\225\233\347\276\346\32*w\362\362"
- #"\302\347\251\31\314\322\230\256\304H\251\375"
- #"\330\20019\201\214I\f$\360Ys\334L\263}\363\302|\234\316\356'\340\34"
- #"!\211^\3\222\216\217\235\v\353\315\214"
- #"\1\362;(F\243\346\246\3328\214-"
- #"(\234O\343\34\327\25\306\337\23\306\277"
- #"\235\31k\213\203|%\214\177$\274_"
- #"\227r\203\325\200\264\345/\331L\367="
- #"\202\361)\374\4\212j\3567\315\376\32"
- #"\317\370\237\360~>\243\233m:\343\312"
- #"\351\324\312<\323k\250L\373\207\v\337"
- #"E?q\220\334\230\215o\314#\260\23"
- #"\233\356\253\273\315\370S\315q\232\210\260"
- #"\177a>Ng\367\23p\216\220D\273\1\31}\27\326\372lj7\235\315\30\20"
- #"nsSi\372\350\0233c\217\vc\17\26\216\375\2670~Ya\274\346\326\321"
- #"\270\302\25\224\25\204\225\365x\220\222\272"
- #"\252}7\316\f\307L\243\304pH\271\301j\214C\323s\02726{\2725\234"
- #"s\t\201]\314u?\35\306\3471\272"
- #"\317\354<K\327\230\25\266\235^\370\254"
- #"#\211\203\330\261O\2061uY\315\243"
- #"\4\330\311\270\372Q\336f~\257i\""
- #"\202\323\331\303\316'\340l\3415\0\327"
- #"0\357\307\277\37\310S\211\307n0\213\30E\371t\274\315Mua\30/eb"
- #"\351\212&\27(_\223\362\264\374\b\363\276\370\234\353F3"
- #"\256lF\222rn\330Wk\36\36\37\316\275\230\342\2529\323"
-) 500
-(
- #"|N}\362N\323s7`4\"$\360\325\344\273X\32\216\337!3\317\367\27"
- #"\256\1J\320\274\266\32\3G\26\aQ\276*l?\237qet\247\271\326b6"
- #"c\36\177\241\30\373Z\"\202\323\tb"
- #"\b&\340l\341/\1\276\312\274O\373\201\244$F\323\205\2653\345\251Vo."
- #"{f\366isS\265eb]\e\306s\305\204`\24$|ffL]7\347"
- #"\263\36\b?\205\371\233.\30Sm\365\t\375~\2\377n\306s\351\271\207\231s"
- #"k\252\353\343\31o\342i\307?\235\347"
- #"\275\205k\200\300*\214\201\377\325\ns"
- #"\35$\16\362\244\260\375\36\212qU#"
- #"\242\31Z\37\r\257\326\210\314#\260\31"
- #"\353\211\bNg\367\23p\266\360\3\0O\250\214_\207X\205\16\310\35`t\372"
- #"\201\354\317\230e\245F\3445\205}kn\2526\27W\255\230\20\224\242:R\342"
- #"/v\373Z\4>\25\306,m |v\330vL\345s\276\301\34\373w6\245"
- #"\314s\351\271kSn\306z\314\231\24"
- #"\303\362\363\360\376<6Wh\240\310\271"
- #"\224\256a\251+\233\322\270\32\242ZqenLW\34Of\323\210\350\n\352\b"
- #"\363^\177\347\363\b\\\31~\316%\"8\235\335O\300\331\302-\1\336V\31'"
- #"\300\373\223\367\313\327\17d\n\245\200M"
- #"\237H\217e\274Q\177\272pL\315M"
- #"\325\346\342\252\25\23\202\361\t\371\v\341"
- #"}\251\332\375G\354\325\275\3321\214\335"
- #"\306|\240}\3\306\2429\206\317\rs\235\\z\256~\27\2272\272\277\376;l"
- #"\273\223\371\236\342\2371\327xq\345\273"
- #"\327\252\362\267e\306\266f\263\256\244\306"
- #"\17\262\231R}n\330\256\17\0\e\20\270\331\354\377\4F)w\375\276tUI"
- #"\306D\4\247\263\301\316'\340\354\2037\2\334\2660F4c\"\304\362"
- #"\364\3Y\215\361\211\1771cM\202\372\321\177Q8ny2\261\216\b"
-) 500
-(
- #"\343\245\36\24\257\b\343\3270_\355~Ax?\253p\374\215a\374y\311v\253"
- #"Ou\35\305`\376\213\"%RJ\317}\2\243Q\231\311\350\376Z\22\216\317\255"
- #"\242\2667\343zs/}\377\352\32\373rx_\313\34k\243-\352\324@\272}"
- #"\0\2605!\227QdKl\217\22+Q\177~e\316\316I\314\316'\340\354\203"
- #"_\5xH\262\355\26H\355\a\21%N\20\336\17\326\17dc\306\e\325\3\224"
- #"\32\r\35\263~\364\334\261\313\223\211U"
- #"+&\334\232\315'\343\364\306\bJ`"
- #"\233\224\247\363\334\265\265\356\301\272\261r"
- #"\342\206\247\204\367?f>=\27f.*4\37023\257\334g\237\316\250\316\253"
- #"\351\264%#\f\212\1\"%.T\312\34\323^\36;f\216\327\225\306\0346c"
- #"AZ\303r^\341\273!%\5x=\363\376\267l\352\177\255R\231\267s\222\262"
- #"\363\t8\373\340\236\0/H\266i0"
- #"\235\350\355H\270\315\210\2571\203x\354"
- #"Fq\27\245V \335\307\372\321\323\261"
- #"\345\311\304J\213\tkO\335\207\261\267"
- #"\332\375\271a\254\224\275\224\272\261J\312"
- #"\270\e1\26\377\345\322s\267\246\334\224"
- #"\2270\6\364\3677s{E\346\332\207"
- #"\230k\317\240\4\256\377\311\362\315\370Y"
- #"\231\317\234f\216ivY\332\f\nl"
- #"\2564J\256\276\234\354\273\256\216\216d"
- #"\\\201\222\342\256\323\261T\366\335\351\354"
- #"~\2\316>\270&\300?\240Yq\256$\242\304\211\276\277|D\347O\2454R"
- #"W\2172\365\243[.O&\226\26\23"
- #"\336\316\362S\267\336\360\267\313\34?\235"
- #"Q3\253$V\250n\254\275X\226U"
- #"\ac\274\205\354\255\177\320\e\353\354\360"
- #"~%s^\262\267\253\340\323\0305\263"
- #"\364;\323\340\365\356\354\235c\32\217\371\32\363\231c\332,*Wp\230s"
- #"5\246\322\372%\331w]\261\3308\313R\306\225Y\251k\242s\22\263\363\t"
-) 500
-(
- #"8G@\242\331\373C\267\245\257\17\364"
- #"}\316\221Hi\344\374\350\226#\315\304"
- #"\322z\r\275A\325\236\272\265*\372\265"
- #"\205k\317\t\343{\25\306\325U\243A\341\234\361\0c\365:)}1t\373\363"
- #"(7\336\205\4\236\22\266\251\236\326\365"
- #"\354\355*8\205\261!\326O\314y\216\f\333\216J\256kWE\272b(}\226"
- #"w\207\361\234\313\256\346j\324B\320\222"
- #"\354\373\274\3609t\365\265\314\354\327\326"
- #"5\3219I\331\371\4\234# \221oa\233\276\366\327\322\366\b\216LJ\243-"
- #"\220\336O&\326\225\254\327k\224\236\272"
- #"un\245\0t\351\306\254|\255\271FIV]\253\3155\215\365F\312*\3\214"
- #"\335\a5\23\314\256>\366eoW\3017\207\367\v(\201w\275\306na\273\355"
- #"9\236\272\324\264J=\327H\v\341\373%%y 7^r5j\254\350{,"
- #"\313\276\1771\274j\215\210\246\361\252Q+\t=:');\237\200s\4d\362"
- #"\n\344\345\334\353)\274\203Ji\264\5"
- #"\322Kn\252\265(J\275\251\261\260\365"
- #"\32\352\332)\325\202\350\315\357\330\302\370"
- #"\313\303\370\205\231\261\264\30\362\365\231}"
- #"l\265\371\a\31\3531f1\6\266\357e\\\21\351S\373U\224\232\17\375\356."
- #"\246\244\361\352j\356\200\344:+\23x(|\357\e2\37\217\2515\322\2\3055"
- #"F\2124{n\274\344jLcE%\331\367\343\315w\365\v\306\224^\375|\335"
- #"\377\378\207\206\235O\3009\0022y"
- #"\5\362r\356\345\24\336\325\271|R\32\265@z\352\246*\5qOgo\275\206"
- #"\32\264\17\25\256\373\2320\376\263\302\370"
- #":\214\222'6@m\213!\365F\235\363\345\247\325\346\373\205\36772\306%t"
- #"e\226\256>\300fWA=\327\205\354-(\4EG\214\24\241\310\\"
- #"<\246\326HK\257\257\301\374\2253\343%Wc.V\224\223o\337\214"
-) 500
-(
- #"\300%\346\375+\330\224\355\337\2520/"
- #"\347$d\347\23p\216\200\271\216\204\b"
- #"\357\333[\332n\314X\3330\250\224F-\220\256n\252y\34ywBM\345="
- #"\271p]5nWV\276\37\255ax\36\363\305\220Oc\336\227\237\2536\237\312"
- #"\246\336\325m\346;IW\37z\236\23"
- #"\315\376\v\331\333\276W\251\206V\rk"
- #"\32\217ik\244\5\306\"\300\234\324z"
- #"\315\3258'\214\245\361\225T\366\375i"
- #"\346\375\25\224U\245\276\377n\345w\340"
- #"\234d\354|\2\316\0210\327\221\20h"
- #"\312\231\209\27\226\25D\\\36)\215"
- #"\334\323\255\6\303O7\327\320\ed\277\335\tw\nc%\341\276u\3159K\337"
- #"\217\236\377\303\314\27C\202\275\261\212R"
- #"\2659\30\335R$\360\201\260-\267\372"
- #"P\276\304\354\377\371\312<\237k\366+\305cj\215\264@)\354#\363U\3555"
- #"Wc-V4\307\314k\36\243\2520\303\367\371\177\346\275\327\2048A\f\301\4"
- #"\234#`\256#aJ\"ua\2451\200\234L\206\262&\245\1\306\247\333\337\261"
- #"\36\f?\224#\353N\270\6\353\252\273"
- #"`\254\321X\2570\256\201\353\373\302kZ\f\t6c\25\245js\345G\314\347"
- #"\321\eyi\365\1\2\3575\373\357Z\230\343\0246\3\330\317-\354Wk\244\5"
- #"J\32.\331\ecQ\226\\\215\265X\3211aLc\03670\32WR\262\276"
- #"tEW\312\324sN2v>\1\347\bI\264\e\220\350\302\2621\0\365\345\247"
- #"\325\310\226\251\224\206rKJ\372\250\246"
- #"\323Z\332`\270*\347>;s\356\266bC}\262\337\2460\256\25\335\271Z\20"
- #"0\0327\262\\\fic\25\332\vd>{]E[R\214\231\3360\217a}"
- #"\365\221\n,\226\304\e?l\2763R\332\336\346\366\2535\322B\370\256"
- #"k+\235\222\253\261\24+\2\243q\3751\343\nH\215\361\243f\254\355"
-) 500
-(
- #"o\3109\211\330\371\4\234-\34\244\37"
- #"\310\327\2621\200\265\31\237\342s\322\350"
- #"`\3148\272\224b0N\243t\36L\215\6)\253\2254\30~N\30\313\3250"
- #"\264\25\ejp?Wa\r\326kA\16d\254o \313\305\220`\214Uh\315"
- #"\303.\231}T!Xo\230\267QVe\245\325\207\n,^i\366O\305\e_"
- #"\302X\365\255\322\353\245\254\262\266FZ"
- #"\252 \\\312\324\252\325\354\330X\221\335"
- #"n\223(R\305\336E\214}C\2648\262\3647\344\234D\354|\2\316\26\266\365"
- #"\3\271\25\340\352\346\375\277\260\32\367*"
- #"\306\0\276\24\266\347\272\314\225\322mI"
- #"1\"\247\205si\377\216\234\26\223j"
- #"E\275\247\360yj\305\206m\205\212\271"
- #"Z\220\365\b\234e\346\251\256\233R\363"
- #"*P\214\233\356\377\225\314\270\336\234\357"
- #"\242\304^t\325\241\275>\322\325G*\260\230\23o\234a>\373Q\214\265\34s"
- #"\vslk\244\265C8\376O\205\343u5\226\3535\257\261\242C\222\355i\22"
- #"EjD\364\341@\225\2\274S\241\263"
- #"\373\t8[\330\326\17\204\0_\374\330"
- #"\373\215\271S\320\220\232\232\215\1h&\322?\31c\t\245t\333s)\6#\315"
- #"&\252i1\251\213\246T\320W+6\334;\214\225Ru\323Z\220\347\23\370k"
- #"\330\3660\305]\327\326\274j\n\233n"
- #"\270\264\211\325\332\214FHS\234\255\340"
- #"`n\365\221\n,\246\342\215\253\20\370"
- #"}\330\366\313p\374\332,\273\222\224\265"
- #"FZ\32\213\351\207\227P\344W>\26~g*=\177v\346\274i\22\305\6\224"
- #"z\23=\327\227\315\317\vY\216G9"
- #"'\t;\237\200\263\205\375\364\39\362"
- #"\261\367\342\262Z\37\367\360\320l\f\0"
- #"\214O\222\337c>\335Vo\260\245\252\357\232\26\223\26\301\235V8\266v"
- #"\203\337*\214\335\\8VkA\316\242T\321k\34\341*\306\332\2046U`"
-) 500
-(
- #"\315,\322\270\320\376\311\270\336 m\225"
- #"\367\363\315w\364\216d\377\234\300b*"
- #"\336\3705\363\336\366\n\251\251\352\202\371"
- #"FZ\317a3[jy\231\366\r\311%QX\331\367[(i\274\372\376\310\302"
- #"\334\235\223\204\235O\300\331\a\333\372\201"
- #"\\\374\330{1 O\307\365\274\246'=T\323m\325\277\257L\323m\367\t\333"
- #"K\222%5-\246\231a\254\24(\257"
- #"\335\340\247Q\372q,#\360\270\314\270\372\3505\bNJ6\322\252f\237Z\240"
- #"~\357p\356\305\214\202\201\326\r\263\35"
- #"\305\20<BY\225\351v\253\270\233\306"
- #"vR\201E\245\272\261\324`=\302\336"
- #"\240\376\3540\366\336\302we\ei\315"
- #"\b\327\322\230\326\335\224,\251\232\273N"
- #"\223\16\336Dq\273},\\\363\342\312"
- #"\357\277\224Dq\210\331\377/l\366\r"
- #"\361\224\336I\314\316'\340\354\203\271~"
- #" \177\205\324~,\200\304Ad\373:\3341\370\2557\307<\212\276S-\335\366"
- #"\353\354M\267]\237u\331\361\232\26\323"
- #"S\302\330_\v\237\245-\23\353\3620\236\v\202\3172\363^\310|\nk)P"
- #"\377\f\212\204\b)\325\356Z8\247u'\323\30Sz\355Su\252\270k\263\217"
- #"r\2\213Juci\274 \27\23\372\3170vJ\341\273\320FZ\267R\f\253"
- #"\256\234\216\242\304f\332\334u\265\244\3"
- #"\255\206\277\220\315\277\v\215o\3756\331"
- #"\177M6]\23470\32\263\324M\352\234D\354|\2\316>\230\353\ar\37\300"
- #"+\321+\256x76\340*\rYp\353\242\322t\333\317\206m\245t\314\232\354"
- #"xM\213\311\312l\344\202\277m\231X\263\303\270\r\374\347\3346/\253|_i"
- #"\240~\35\306x\202\352|\255\306\0300"
- #"^\223\222\305E\0027\261Y\205\257\261\206k\330\233\301\226\n,Z\356b"
- #"\346\372c\346\333\351n\37\306\377R"
- #"\370\34\266Y\25\303w\360\0343\336\346"
-) 500
-(
- #"\256\253\tPj\262\304\261,\307\300\216"
- #"aS\330R\0230\264\246H\323\226\317\254\374.\234+8;\237\200\263\17j?"
- #"\220\334\330M\220\377x}O\200\347c"
- #"\3\342\261\e\301U\354M\267]\223\365"
- #"\224\336Z\305r\233\26\223\n\364\315("
- #"|\236Z&\326\177\205\261\343\231w\333"
- #"h\2207'\245\242\264\201\372i\214."
- #"\273\313\3314\16\227\205\355\257g\274y"
- #"\332\247\351\264\356\303f\260\345\4\26-"
- #"\255\313\247$i2\235\321e\267\276\331"
- #">\225\342J\262\372S9\25\334\266\325"
- #"\\M\2002\227\5\226\366\r\241\331\347"
- #"@\212\213oi\230\363\25aL]\202"
- #"\233d\256\341\234\4\354|\2\316\21\362"
- #"\246\344=\321k@\244\37\310s(O"
- #"\331K\231\227\274\250\245\364\356\26\306\256"
- #"(\314\243\246\305\2447\360\27\24\216\255"
- #"eb\2758\214\335\306\274\333\246-\325\27l\272v4\6q\17{\335L\332\373"
- #"Cc\5iMEZun3\3304\6\220K$x\"\243\273\254\26\243\0c"
- #"<BU\2107g\314\330Z\312h\214s*\305m\253\271\232\0e-\vL\203"
- #"\376\227\263\31oZ\302\270\352\370\24\233"
- #")\276\271U\230s\22\260\363\t8GHf\336\247=\321c?\220\243\211\307\376"
- #"\311\177\312fZn.\245W\231\312\216\247\363\250i1i&\317\177\24>\303H"
- #"d\337\347\260\351\266i\353I\2F\327"
- #"\316\371\214O\3109W\334\233\314u\356"
- #"g\263oG\251\352\374\34s\214\25X\264<9\214\337T\370\234\226*\37\362q"
- #"J\266\225\256\204\356\240\30\2366\225\342"
- #"\332j\256M\200\262\224\5\246r'W\260\336^\370\0006S|=\245w\22\262"
- #"\363\t8GH&\357\37\6x2\300\243\315x\24S\\\215\350\371\307\327\e\324"
- #"i\214\362&\207g\256\245\201\326\234\334FM\213I\343"
- #"+\37)|\206~e\337sn\233\266\236$`t\355h"
-) 500
-(
- #"\0\273t\363\335\312\\+m\336T\322\274\332\323\34sp\346\234\2730Vk\377"
- #"O\3629s\324\2147\333R\370lF\201\3056\225\342\332j\256M\200rv\30"
- #"O\263\300V\245\324\325,\v\337\267n\337\232\315\232\30RVP\352b,\245n"
- #";WTN\205c\302\343\4\0O\a"
- #"\360:\263\355\325\217\375\264\20\300\272\0"
- #"\256\16\357\37\2p7\200'\0\330\17"
- #"\3003\303\366\317\2\230\v`6\200\217"
- #"\1\330\a\300\365a\354e\231\253\336\22"
- #"^7\313\214\335\26^7-\314\370\332"
- #"\360\272+\200\213\0\314\3p\20\200\325"
- #"\1\234\2\340\2620\376\327\314\261\177\3"
- #"\360w\0\217\a\360\344\302\371\365\372\323"
- #"\0\234\5\340\v\205\375\3664?_e"
- #"~^\t\300G\303\317\237\1\260\314\214\255g~\276\36ML\5p,\200)\0"
- #"\276\b\340\342\260}\233\302\365\1\371,"
- #"\0\2601\200G\1\34\6\340U\0\356"
- #"\t\333\365\367\366L\344\241\337e\356\32"
- #"\v\0<\0\340q\311\274\25\227\206\327"
- #"\235\222\355\217\08\37\3629^a\266"
- #"\377\31\300\241\0N\f\357\377\t\340\371"
- #"\341\347\245\220\277\247\367\25\346\351XQ"
- #"\321\271\25s\216\214L\336o\4p\36\232r\356\275\375@6 \32\231Y\257\244"
- #"\324s\244\22\354%\236\304f \276\246"
- #"\305\244O\351\347&\333U\220\361\314\344"
- #"\334i\35J\233\333\246\326\223$U\273-\25S\246q\n\233\215VZ}\244)"
- #"\275ic*\325\312\232OY\371\265\305(v`s\345\221s\263\265\251\24\267e"
- #"b\325\4(kY`o\17c\347d\306^\27\306\346RbS6\330_\212\267"
- #"9WPv>\1\347\b\311>\306\363-mmf\326C\2147\327o\207m_"
- #"e\275\340\214\214\251\3006\0\235^\347Ya\354\6\266\v2\346d\337\333"
- #"\3346\265@\272J\251\350M\255TM\257q\212\237\262\231\215VS\334U\303"
-) 500
-(
- #"r={\eS\255\315\230\336j%^J1\212})F\201\346\372\245\212\364\232"
- #"Jq[&V\255\26\244\224\5\6J\334K3\256\326H\306\36\307\230\2\275\36"
- #"\363i\326\351\357\324\271\202\262\363\t8"
- #"GH\3661^ni\253\351\233\244\334"
- #"\4\366g|\242\314\335\204\324\270\234\313"
- #"r1b\277\264\202\214\332\3125'\373"
- #"\336\326\\\252\24H\267j\267\237/\354"
- #"\0036\343\24\233\262\231\215\326\317\352c_\3666\246\372Bx?'\271V.F"
- #"q\4c\334\340\4\312*.5<\2265\225\342\266UN\255\26\4\354\315\2\263"
- #"\324l\260Wf\306\346d\346\244\375X\310zC-\347\n\304\316'\340\34!\331"
- #"\307x\276\245\255R\245\304I\271\221}\211\315'J\273o*k\242r(\3371"
- #"\347\250\361g\314\v2\326d\337\333\3346\271@\372\f6\325nK\325\364M<"
- #"L\276\0\0 \0IDATS\31\253\335?\31\266\331l4MO.\255>"
- #"\324\260\314\n\357/\246\4\343\365\373\373"
- #"\177\311q6\343l\32\243{n\31\245"
- #"\326\3\254k\213\201\355\251\313\265L\254"
- #"Z-\b\330\314\2K\307Tt1\327\302V%O\322F\\6u<m\231\354"
- #"\\\1\331\371\4\234#\344\265-\343D"
- #"\311\205\245\334\210\321m\242\231Jw\207"
- #"\327\364)\267&k\242O\316\2632\327"
- #"\250\305)\300v\331\367\266\346R\266\343"
- #"^N\355\26\314W\323\247q\n\335n"
- #"\323s\333V\37`\2631\325\357\302\353"
- #"\3273\363\324\30\305w\31W\22\213\330"
- #"\24q\254i\213\201\355*\305\265L\254Z-\b\30\37\20~E\211\211X\27\246"
- #"\3666Y\36\376[\341\272\316\25\204\235O\3009\312$j.,\345\241\304c\377"
- #"\3446\230\234\v\212\227dM\364\3516w\343k{jn\223}ok"
- #".e\rTI\3556\255\246/\305)@q\323\350w\220*\356\226\334Z"
-) 500
-(
- #"'\232c\376\301|\35\204\306(\364;"
- #"\276\237\275O\3465m1\260]\245\270"
- #"\246\211\245\265 \327\22\330\226\222\340\360"
- #"\36J}\320\17\211\254\344\315hr\t\201\317\321c\"+,;\237\200s9\251"
- #"\242\212\372\236\0\227\1\334\264z\334\312"
- #"\304c\377\344wP|\350\372>}\222-\311\232<7l\277.s\376\266\202\277"
- #"6\331\3676\3\244\343\332L*\247v\273[\30\323j\372R\234\2l\3663\267"
- #"n\265ZP\375\345\346\230\\\35\r(\256;\335\347\357\214}6,k\332b`"
- #"\273Jq.\23K]\215\326]\331\306"
- #"K\331\354\e\262=\2013\302\330\201\231"
- #"\353j\333\335\234\236\332\252\24\303\2614"
- #"\354\263\214y\27\233s\202\263\363\t8"
- #"\227\223DSL\221\220\30H\335\215\5J0Wo\0367\233\237\227Q\n\5U"
- #"\343i\267\260=\2255\231Nqm-#z\244\343\333\n\376\332d\337\333\3346"
- #"j\240\364\6\225s\205\331j\372\177c"
- #"9N\221\3663\357'\245\27\24\227\225"
- #"\36\2236\246\322\357\347<\263O.M"
- #"\27l\327\26\3\353*\305\272\312\271\222"
- #"u\345\345+)\253\216\243\303\367\265'eU\362\3070\236\313\2{g\30\373~"
- #"f\254\246\247\246z^\217\232\353_\305\336\277\23\347\4g\347\23p.'\31h"
- #"\337?\214~\334X\217\247<\271kF\220\246\332\352My\1\305-\262*\313\262"
- #"&s\302\276\271`\270\215S\244cO\tc%\331\3676\267\215\366\f'\313j"
- #"\267`\254\246W\21\306\\\234B\373\231"
- #"\317e\377)\275o\f\333\365\6\231>\241O\245\334t\311\30+\311=\305+k"
- #"\332b`^\245\30,\267!\266\312\313*|X\322\344\252u\230|z\30\273\253"
- #"\360\35\347\364\324R=\257/1\nW\316c\376\357\3019A\331\371\4"
- #"\234\3R]WD\257\1\371'\300\207\372:\217\272(n\17\257Z\233"
-) 500
-(
- #"\240\2751H\t\322\316\t?\247\262&"
- #"5\325\336Z \275M\366\275\346\266\331"
- #"\2311\226A\346\335B\312\203\314~\271"
- #"8E\332\317\274\237\224\336\2472\32\232"
- #"\23\303k\372\204\376\231\260\375^\306l"
- #"\246\334S\274\262\246-\0066U\212\301"
- #"\262\374\313\351\354U^n\353\e\322\226"
- #"\5\246\275\340\267\316\214\245zj9=/PV\36*@\271\214\315&`\316\t"
- #"\314\316'\340\34\220\332\17\204\3505 "
- #"\333\364}\236\2270\236\342\217\346\347\371"
- #"\4^\315\250\6\253\331Zi\314B\343\0\27f\316\335\26\307h\223}\317\271m"
- #"\366g,\22\324\e[\355\311~;\363\231r7\310\264\237y[J\357t\306\244"
- #"\202S\231\177B\327\330\300B\212Qj{\212\a\353\332b`T)\276\216\3716"
- #"\304\2321\365\302\314\261m\325\352mY`\32G)}\317\232\301f\3\362V\317"
- #"\v\24\327\334o\315\370\233\v\347rN"
- #"0v>\1\347r\222\350U\343\275\274"
- #"\357\343\247\22\217\375S\377\211\315\225\307"
- #"\241\2248\3107\31\335\\\351*d\35"
- #"\226e\301\333\2\351m\262\357\263\303\370"
- #"\273(7\336\243\314<\216e\274\361\325"
- #"\236\354\265\356\202\354mB\225\353g\16\326SzU\36~\36%\6\0006\237\320"
- #"_\25\316\267\224\"\367\202\314>\271y\36\36\306s\5x[ST\2\354J#"
- #"\225\177\321\272\234\334M\276\255Z\275-"
- #"\v\254\26\a\1\233\253\274E\224\277\e"
- #"\373\235Mel\375\253n\322\e)\253"
- #"\320\356\377\177\234\313\305\316'\340\\N"
- #"\22\340g\1\36c\336?0\242sX\205\325\237Q\342\22\372^%\316m\207="
- #"\262)\263\256\256\2114\300\333\26Ho"
- #"\223}W\267\315\327\31o@\213\31\343\0mO\366{\232c\310^\355\252R?"
- #"\363RJ\357\356\24\303\260\210\242c\245\333\365\t\375s"
- #"\224\225\v\31\213\4\323}JO\361\251\266XMF\375C"
-) 500
-(
- #"\354M\213\375P\30\313\25\f\266U\253"
- #"\267e\201\225\276\347\\\343\2537e\216"
- #"\327U\336\337)\361\21\215G\275\275p=\347\4b\347\23p.'\t\21T|"
- #"\330\274\177\302\210\3161\203Q\2\304\372"
- #"\365I\t\300j\214BSf5(\274\214r\23VCpH\346\334\265@z\233"
- #"\354\273\272m\0360\257i\377\355\322\223"
- #"\375F\214\305\221\237b\257vU\255\237"
- #"\271\326\250\220\342\242\3%\341@\257\225"
- #"\246\354\352\23\372\302\360z<{?K\333S\374\16a|>\245\250O]\206\372"
- #"}\177\203\261\277H.\343k\2570VjQ\\\253V\357'\v,\375\236\323@"
- #"\271\272\320>\232\34\247\17\1\0171\32"
- #"\335Y\346\263\255^\270\236s\202\260\363"
- #"\t8\227\223D\257\1iO\341M\371\e\312\241\32D\267n\234\357S\236<U"
- #"\276\342;l\252\260\352k\252\276\v\326"
- #"\3\351\377\31\306r\231Q\251\333\346."
- #"\346\225uKO\366?\v\333\177\36\346\256\237OW/\245~\346[\262\231\231v"
- #"f8\376\347\341\375y\354M\347\265q\226\363\231O\nh[-\275\325\234C\251"
- #"\255d5\235Z[\363\346t\2536\17c\245\254\266Z\265:\330\236\5f\277\347"
- #"\\\240<\247\247\366f\306\206^/7"
- #"\333u\265D\212\273\253\373\377!\347\300"
- #"\354|\2\316\345\344\2\200\347\240\331P"
- #"\252=\2057\345,\312\241\327Q\376\341"
- #"\365\351\\\377\321\217\244\304*\310(r"
- #"\230SaMe\337k\201\364T\366\275"
- #"\346\266)\311\262\347\236\354U\315\367^"
- #"\306^\335\372\371.f\275\237\271\336\244"
- #"gS\f\311b\306,\252;\331\233\306"
- #"\234\312\307\357Q\371\216s\253\245\334w"
- #"\3705\346c%*l\371\316\314\3304"
- #"F\303\227\253\372n\313\304j\313\2\323\357\37163O\e(O\25z_\304"
- #"\230\342l]UVF\177\31%\323nF\345;s\169;\237\200s99"
-) 500
-(
- #"\23\322\17\304\6\321\353b\2129Zm"
- #"\247\217\206\327%\311\353\a\30o\22k"
- #"\232c_\37\306-\265\16Ae\323\177"
- #"\231\271\246\312\276\337\306\262\333F3{"
- #"v-\314;}\262\337\2021-\327J\230\333\317w}xM\263\262\336`\316\265"
- #".c\212\363\22\312\315.\367\344\257\356"
- #".]\271\35S\371\216\355S\374\f\212\373OW:wS\2147\231\257\251\1c"
- #"\341\347'\n\343\32[\330!3\326\226\211U\313\2[\211q\365\251+\3164P"
- #"\16FCx\30\343\n\345\210d\37\375{\370\21\201S\302\317?\256|g\316!"
- #"g\347\23p\2162\211A\\X`\214}|\216\315*uUW]\302XX\227"
- #"\246\213\252\213\344;\\>\331\367\324m3;l\177we\336\372d\377L\306,"
- #"\262T%\326~>5ZVLqm\306x\215\n\35\276\302\354\237\273\361Z\371"
- #"\370\17\232\363\226Ru\365)\376z\312"
- #"\223\267\336\214\217\n\237W\223\31\322\366\272J]Y}\2470\256+\241\\RB"
- #"[&V.\vl%\2o\241\364u\261\277\243=\v\347P#\243\237\355\253\311"
- #"x*\243oE=s\222\361\316\t\300\316'\340\34e\22\203\270\260\300x\223!"
- #"%\373\312\306 ~\23^\3250\244\201\357\324E2R\331\367o2\357\266\321'"
- #"\374~\236\354\265\352|>\305 \244\373"
- #"Y\355\252\17$c\3327\303\246\262\36b\366O3\206f\260)\37\17F\343\232"
- #"\223\e\1eEd?\363\34\306L60\352\203\345\4-\301X\263\223[\315\201"
- #"uwa[&\226\315\2[5\374\36m6\336\25\214\306\271\244\260l3\365."
- #"`3\26\224\223\321\a\243\341Z\306\3364p\347\4`\347\23p\2162\tp\341"
- #"@\307\332\232\220\313(n\37[\\h\215\301\257\223ck.\222"
- #"\232\354\273\336\364\323\nw\245\312\221\347\2\364J}\262_FY%"
-) 500
-(
- #"\355R\330\317jW=\327l\337.\34\367\b\305\5\6\366\266\274\265u\v%\371"
- #"x]A\244\306.\227\356\372\276\314\374"
- #"\2665\327\312\315_\307s\342\225`\224"
- #"W)\31\240Z&\226f\201\375\215\275"
- #"\206c/\312\252\252f\240R\335\257\275"
- #"\223\361\222\214\276M\36xy\346\274\316"
- #"!g\347\23p\2162\227A\252\324\a"
- #";\336\326\204|\237\342Z\321\367\347\263"
- #"Y\5=\303\34Ws\221\324d\337U\307\251\324\360h\2330^\272\251\202\"\217"
- #"\256s\372Ja\237T\273J\323M\2471>Y\37i\366W_\375\217\31c\v"
- #"\263\302XI>~G\263]\335Xi\272\353\365\311\271,\2471\212S\346VP"
- #"\217\v\307>X\370\214\232\rvma\274\226\211\225f\201\335@q_\331b\277"
- #"Ra\250\325\375\322\324i\233N\\\222"
- #"\321O{\314\227R\220\235C\314\316'\340\34e^\6\371\217\\m\240\343g\260"
- #"Y\23r$c\301\35\331\253\340\253Y85\27IM\366]\253\240\347\26\346\263"
- #"2\305m\266\224y\375\244\35\30c\27d\276F\302jWi/w5t\a\206"
- #"\36771>\31\247\276\372\375\302>72>I\347\344\343\301\246\e+\227\356Z"
- #"3\246`\224I\231Y\30\327\363\345\f"
- #"\314\352\214\205\216\271*\357\\&V."
- #"\v\354\320\302\361\245\302P\253\373\265\35"
- #"{\25zK2\372j\264\256\311\34\343\234 \354|\2\316Q\346\206\220;\301\31"
- #"\3\237\3437\224Sh\274\343[\341U\237\242\3170\357\3471\272DJ.\222\232"
- #"\354\373\332,K\241(5\210\273m\262"
- #"}_\306\354\247\277\207\327\3753\327\266"
- #"\332U6\335t\e\306\e\262\26(\346|\365S\31W!\272\202)uR\324\25"
- #"\234\r<\333t\327\2321\5\305\5Xrq\201\262\272(\31JP\\"
- #"Ddt\305YZ7\343\f\366f\201i1`\311\235\b\366\26\206\246"
-) 500
-(
- #"\272_`S\220\262\324\3567U:\316\251\372:'\0;\237\200s\f\370(\300"
- #"%\0\247\ft\374,\3421\343\240\331"
- #"W\232\312\252\253\214\245\214\262\357jD"
- #"j.\2229a,\227\242\372\3470\226\353G\1\3068\311\353\314\266#\314|N"
- #"`\f\266\2477\240\234v\225\316E\347kc\6%_\375\273\302v2\26\27\326"
- #"\276;2\237\356Z3\246`\274!\177\273p\376Z1!\b\374o\30\317e5"
- #"\251\233\361o\314g\201\265\271\23\301f"
- #"ahI\367\313\nR\352w\235\26\213"
- #"\246J\307\251\252o\367\377C\316\276\330"
- #"\371\4\234c\300\323!w\2617\ft\274\255\231\370bxUc\241O\251\372\344"
- #"~Kx\235\307\230\327\237+V\253\311\276\317\16c\357-\314G] \37\241\304"
- #"\tT q\31\243\346TZ\344\b\226\265\253lM\303\375\214z_%_\375t"
- #"J\235\212\36\363?\2319\346\2\345\245l\2459a<gL\265\317\311e\205c"
- #"k\305\204`\314&K\265\270r}C\346\260\231\5\326\346N\4c \375D\226"
- #"u\277\300\246\222A*\243_\352\263\242"
- #"\307|\250r}\347\220\261\363\t8\307"
- #"\200O\200\4\323\377\nY\215\214\374\34'\22 \245&\344\370\3603)\1T["
- #"\215\374{F\27\221\336|s\231X5\331w\22549\2450\27\315\262\372\36c"
- #"\257\364El\272\253Vc\263\310\261\246"
- #"]\265\263\231\377\247\314\366\234\257\336\6"
- #"\210oc\276z:\r\224\377%\374\234\272\323\2245c\272&\243K/'\211r"
- #"D8\266TLx@\30?1\274/\365\r\311\325\325\364\343N\324@\272\272\16"
- #"s\272_\240\264\2\320k\245\5\233\245"
- #">+V\3042\367\331\235C\310\316'\340\34#\36\vp)\344?r\344\307\333"
- #"\232\220\315\b\\b\336\277\234\315'\355\35\31\215"
- #"H\351\351\271&\373\276}8\356/\205\271\350\352"
-) 500
-(
- #"B+\314\357\247d^\245\373i\327\273\177g]\273\312\32D\225@)\371\352m"
- #"\200x+\366VO\347\2\345\272\302)\371\363k\306\24\214\6(\27Pn+&"
- #"\3345\214\337\300|\337\20\225\211)U"
- #"\273\267\271\23\2671\347,\351~\201Q"
- #"(\223\24\243\243\333k]\36\0176\307lY8\257s\310\330\371\4\234c\3045"
- #"!\253\20\16t\274\255\t\3713\243\344"
- #"\267\336\370\336g\336\317\246\370\363\377l"
- #"\266\35\303\336\302\300\222\354\373t\306\356"
- #"\203\353g\346\362\16s\336\277\263\334\201"
- #"P3\2544f\222\323\256\322\202\271\205\214Z_\357ctQY_}.@l"
- #"\253\247/6\363\262\201\362\234;\315\262"
- #"fL\301\230\365\226k\272T*&\334"
- #"\222\262\252\370\211\231\223\272\32m\337\220"
- #"\266j\367\331a<\347NLk=v-\234c{6cf\375\364\230\337\230\321"
- #"mJ\326\233\2049\207\210\235O\3009"
- #"\206\274\32\362\37\271\346@\307\333\233\305"
- #"<\306x\210\272%l\207\271\215)7P&\264\322$\232F\232\223}\327\233\261"
- #"\r\16\347RLKO\316`\254\344\3264\3444\320\374d\2\367\205}\336\315x"
- #"3S\r.\353\253/\5\210Wb3\v-\27(O\335i\271\271\226\214)\30"
- #"\265\310R\245`0\26\23\336\34>\303i\214M\232R\36\312^a\305\266j\367"
- #"\222;\321\272\362\324\200\346\334h\323)"
- #"\215\311H\211\327\364\333c^\265\2704"
- #"\306Vk\22\346\34\"v>\1\347\30"
- #"\362\265\220U\310\276\3\35\257\1S\355\227~\3c\366\316R\306*qR\\\\"
- #"\323\31\237p\257b\363\211r\t\343M\363\234\314\265\216\tc\37g>\305tN"
- #"\370\271\344\373\a\305\365\244\327K\3430"
- #"\323\3149~`\266\333'v\325n\332\211\275\1\342\222.T.\240\16"
- #"FwZ\256\305,X7\246\252\301\365\177\224\247\371})\1\360\331\314+"
-) 500
-(
- #"\25\253\373\3544J\266\330\274\260\355\331"
- #"\231s\267U\273\227\334\211\326\225\247\31"
- #"iWd\216W\371\227\333()\323\375"
- #"\364\230\337\2361\331a\217\260O\255\375"
- #"\257s\210\330\371\4\234c\314E\0\257"
- #"\30\350X\r\230\236\317\30\343\320'x"
- #"\275\231\234i\336\177\237\261\316\3416\312"
- #"\323|I\236\375\22\312\r\361c\224\214"
- #"'M\303\275\211\371\24S\215\e\344nZ`\257{%\325\256\322\36\24\267S\202"
- #"\350\372\364n\347\264\224\300w\31\223\1"
- #"\216gY\27\352\350\360s\2515\253\272"
- #"\323J\315\262\336\34\306\177\301^#a"
- #"\333\n\327\370S\312\315<\215\27h6Sn\265\326V\355\236s'\246\256\274U"
- #")\361\250e\224\342B=\366i\214\206"
- #"\3675f[\255\307<\30\353\216\276\24"
- #"\336\267\265\377u\16\21;\237\200s\214"
- #"y\26$\230>m\304\307\332\312\343u"
- #"\330\f\224kZ\257>\221k\321\341\221"
- #"\314\213\nnM\311\350\352\347\306H\366"
- #"\246\230\226nZ`\323\275\242\5\205z"
- #"c\237Jq\333\250O\376\336>\257\277"
- #"\204\22\17\261\31gV\27\312\26\27j"
- #"\223*Ku\25\375/\345\251\177O\312"
- #"\215\370h\212j\356\325-\327W^\306"
- #"\246\241\335\236\2622!\313\265 *\265"
- #"R*vl\253v\267\356\304\222+\357\247a\37\315\346\232B\321G#eUg"
- #"\317W\3531\257\253X\375\e\3\333\333"
- #"\377:\207\210\235O\3009\306\334\24\362"
- #"\337\273\337@\307\333\312\343\324\210h\366"
- #"\221\26\25jj\247\6\244s\n\272Z\210v\b\233O\3356 ]\352R\227\336"
- #"\264\224\326\275\262\r\343\315\371g\346\234"
- #"\226\367\204\353\375\224\222\255\265\260\260\237"
- #"]i\35DY]\3319\377\245\345\270~\371\a\366\32\t\275\31\347V\21Z\a"
- #"S\252\227\320\325\\.M\30l\257vWw\342\267X\256\365"
- #"x{\330\256\356H]Q-`\254\253Q\332\364\\\2732\\\205"
-) 500
-(
- #"\261M\2575v\232\266\375\3\346\347\347"
- #"\34\"v>\1\3478p\1\244\351\324\310\217M[\322n\300X<HFi\17"
- #"R\212\330l\205z\2567FM\321U\237\234Kq\216\364\246\5\366\272WVb"
- #"\274A\16\v\377LYu\34\35\346\273'eU\242\265#\273f>k-[J"
- #"\263\322N.|O\272\3729\2550\336V\355\276O\30\257\325zl\30~\317Z"
- #"\23\363\217\260o\256!\225\3551o\v"
- #":\17\r\333\256\242\270\326t\373\266f"
- #"\377R\217v\347\220\260\363\t8\307\201\307A\202\351#?6w\303\337(l\323"
- #"\247s\375\371\\6\373;\220\275YF%EW\260=\316aoZk\260\351^"
- #"\331\217\22\344\236o\346\243s:\2101"
- #"\256B\312\312a6\233O\374j\234\356&p:\313\231M\3123(\6\353%,"
- #"\267f-\311\273+g\207\361\\Q_-[j\2470VJ\23\236\31\306K\315"
- #"\243\332\252\335w5\237\263V\353\241\6"
- #"PWK\27\262\267\346&\3551\257*\3106m7\255\351\371/s\375\235\v\327"
- #"v\16\t;\237\200s\34\270\22\344?r\351\210\217\325\e~Zw`\233-="
- #"l~~&\233\205z\263\223\343J\212"
- #"\256`=\316\241\324\233\326!\214\356\225"
- #"\263\330\fr\223\22\354\1771\245\32\\\213\36U$1\27\370\2661\215Ya\233"
- #"\326V\314I\316\255|\210\342NR\327Z\332\2325'\357nYk\226U\313\226"
- #"Z\203\365j\365\247\204c\377Z\370\16"
- #"k\325\356;3&\21\220\242\256[\372"
- #"\333\370o\263\337B\346\213\377T\273K"
- #"\23\34\324\250i\332\356\331\311\376i\37"
- #"\226Z#1\347\20\260\363\t8\307\211"
- #"w@\376+Gv\334\223\211\307\376\231"
- #"\337\311x\343]\223\275\362\30\244<U\356\304x\243'{[\254\246\212"
- #"\256\226\2458\207RoZ\272\242x\210\275s8\233\262Z9\212\361\311"
-) 500
-(
- #"\367X\312\31525\22\226V\266=50_\316\\\307RkI^\227\34W\353"
- #"RXk\226\325\226-\245\347\335&3\266\22%\251a\t\313\253\207\\\265\2735"
- #"\266\272\2\313}O\312\347\233\317\377\371"
- #"\314\270\3551\377d\306\332\230\0272\246"
- #"\355n\236\34\243}X.\b\257\265\26"
- #"\301\316!`\347\23p\216\23\17\201\374"
- #"\267?~\304\307\332\e\245m4\2449\376w%\373,bT\265U\316a\314\252"
- #"J\343*\226\2718\207\345\241\311y-\37\r\343k0Vs/f3K\252f"
- #"$j\231U\272\232H\r\326\0226W`\244\270\237\364\270\232\e\253\255YV-"
- #"[J\323\247\367)\34{k\30\237Q\30\267\325\356S\330kl\325\215T\352["
- #"\2\306\344\5\262W^>\327c~Nx\257\222\364_J\216I\373\260\264\265\b"
- #"v\16\1;\237\200s\234\270\26\344\277"
- #"\375\304\21\37\253\255l5?_\335#\237b\214I\\a\306H\271\21hj\355"
- #"\22\263\355\a\4\216\v\357s\201\3644"
- #"\316\241\333sU\351)\227R\334gz"
- #"\343}\200\261\317\207\322\32\211\367\263\267"
- #"\6\303fV\235D\351\353\256\351\245zC;\312|&\375|\337K\3462'\314"
- #"\271\346\306jk\226U\313\226\252%#"
- #"\200Q\252\376\5\205q\255v\3772\363\306\266\255oI*W\222\nG\346z\314"
- #"[\25d\233\266\253\277\227\264\17K["
- #"\f\3119\4\354|\2\316q\344\225\30\244_\272f\345\374/%\255\324\32\vu"
- #"%}\232\315\376\351zc\321\354\234s\31\335#\372zA\341z\352\376z%{"
- #"\253\322\355M\373\254\360\363\215\24\303ao\352w1\3371\20\24\303W3D)"
- #"\27Sd[T\272\3458J\215\204\r\314/3\343\217\230m?`\f\354\347\236"
- #"\244K\315\262\300z\266\324\336a\354g\205\317\250"
- #"\6-u\37*\265\332]\245FRc[\353["
-) 500
-(
- #"b\345J\264H\324\nG\346z\314\203\321\230\222\275\251\332\271>,m1$\347"
- #"\20\260\363\t8\307\221\317\206\374\a\277"
- #"tD\307\255\317XM\274\n\353\262\36"
- #"\1777\357\27\233\237o\242\244p\316I"
- #"\216\271\202\275)\256\32\204\277\212\361&"
- #"\255\376sR\\F_\r?\253J\356\312l\326\250\314\312|\216u)O\365\326"
- #"\30\345\n\365\264\316\342\"\212Q\260\237"
- #"C\371<J\3009\255!Y\32\366\377*\243\241\324\343O\310\314)\327,KY"
- #"\313\226\332*\214\335\\\370\235\251\32n\256\22~%6\225oK\306V\177Wi"
- #"-\212\225+yY\370Y3\302J=\346A\21h\324k\276\325l/\365a\1"
- #"\335\2155\364\354|\2\316q\346\3\0o\b?\367\337+Do\316\273\233m+"
- #"\261\331\201\217l\352_-c|\32'\243\356\323\353\223c\332x\3\343M\377_"
- #"\24\275,2\326~Let\303\334\23^\3174\363\234JqW-0sT7"
- #"V.\16\223>\371\256\23\346\254\256<]E\35@\361\375[\343\241?\177\201y"
- #"\267\333\177\261)ph\233e\245\363\250eKMc\224\34y\\\346X\25E\264"
- #"\352\302%\303_\312\264\312\365-I\345"
- #"JR\341\310\\\217yP\214\304=\346\2326\6U\352\231\16F7\326\227\vs"
- #"tv\314\316'\340\34g~\34R\23"
- #"\262\n\344\277\271\277\343jM\220\364\237"
- #"\374:\346\237\326\255kI\333\335j0\373\257\224Ta+\363a\265\240\254AZ"
- #"L\271i\247\322\32Z\200\250R\357\217\204}7\241\270\206.4\347\370!%U"
- #"\264-\206Pz\362M\213\24\317\"\360A\363\336\26V\252[j\357\344\30+\261"
- #"\256U\327'\25\346Q\353\r\2421\203"
- #"\334\323\371\236a\354\\\226\365\274\3643\226z\177\244}KJr%"
- #"*\34\371z\366\366\230W\252\333\360b63\341J}X\224\273\232"
-) 500
-(
- #"9{Q\341\20\262\363\t8;\340R\200'a$\6d7\342\261\eO:f"
- #"\237\330\267\244\334\34\355\215\337r\31E\23ku\346SjW\247Ht\244\232U"
- #"\177\241\30\237TZC\263\205\36b\254"
- #"rV\271\365\213\31o\350\267\262\351\212"
- #"\251\0254\202\345\0\256\336T\3473f"
- #"_\375\225\275u(\244\304\27\264w\311"
- #"\21a\333\315l\32\331\253\302k\251\250\257\326\edv\30\313iq=+\214\335"
- #"\311^\303\241z^?\f\333J\231\\i\337\222\222\\\211\nGj\\$-~"
- #"|\202\371\256f\262\231\tw~\3709"
- #"\355\231\256Tw\"Y\356\3\343\354\220"
- #"\235O\300\331\1\347B\202\351\354\373\230"
- #"\225)7\351e\354m\322\4\366>\261"
- #"\257\305\246\204E\312\233\31\237Jo\244"
- #"\270;>Y\330\367\37\224'u\215\257"
- #"\250\264\306\233\303|\26Sn\354:\227"
- #"\275\314\261\313(Ek\353&\363\255\25"
- #"4\202\345\0\256-v\334\215\321\0\330L3;\367G(Y^3(7\343\205"
- #"\24C\227k3{\6{\325uk\275A\324xZ\251\21u\267\235\232\234\333\246"
- #"_\353\276G\205\261\264\345\254\245J\360"
- #"\277\234e\271\2227\231\353\330\36\363J"
- #"]!jj\266\315\204\323\337\357z\231k\353*J\rnM\312\337\331\21;\237"
- #"\200\263\3n\206xw\351\3778\r\370\27613\246O\354\307%\3335\335\263d"
- #"Hjc9\376\232\22\17x\21\343\352\"\225n?\316\354\237\216Y\326\n\32\301"
- #"\262\e\313\26;\256\306XUm\215\326"
- #"\262\344\375a\214\262\345\272bX\213\315"
- #"\316\216\226\332\337C\23\n~\235\231\337"
- #"\213\303\330\345\214\r\276r.\304\203\231"
- #"\227\234\177w\30\257\325zh\337\22uS\345\344J\2662\327J\265\273\266f,"
- #"j\264n\270Y\346\230\234\1\333\210\"+CF\267a"
- #"I\342\306\331!;\237\200\263#\336\207\221\32\220\203("
-) 500
-(
- #"\207|\237\275\365\23\372$\276\274<\237"
- #"1\310{)\345\311\367&3\376e\212\257\\\237\336\217H\3468\222\247\326ZA"
- #"#X6\212\271b\307\3\331\214\177(\37`\263\265+)\2565{\276o\207\355"
- #"?d\275\303`?\324\224\343\303\31\373"
- #"\330\227\2728\276(\214\227\322\251\301\350"
- #"\266\"\313r%V\326\346U\311\230\272\340f'\333\337W9\6\214J\312?\247"
- #"\30\3516\211\egG\354|\2\316\216\370q\310\177\360Z}\37cUR\a\345"
- #"\277(\361\214t\345\261\210b\220\264\233"
- #"\336\245\24w\314\247\303\373\5\214Ew"
- #"\352J\321\16\202\312\221>\265\226\2\351"
- #"\252\201e\eT}\2201{\252T\354"
- #"\270\275\331\177\276\371\371\207\214\306E\r"
- #"\333V\3468\255\263\261\361\30\235C\332"
- #"\364\252\3043\330,z\4\333\373\237k"
- #"\237\373[*\337\321N\346\329\271\222"
- #"T\273\312\366?\177\36\345\246\277\220\242"
- #"\317\245\333\323\214\254\363\222s\252\332\360"
- #"\275\224D\b\260]\342\306\331\21;\237"
- #"\200\263#N\205\4\323\2771\242\343\364"
- #"\237\376\217\354\255\237\320'\321\364\206\0"
- #"6{\211\334\310\370\364O\212k\354\231\3545\36{3\3068vg\263'\273\272"
- #"\262\3545F\372\324\252\201\364\213\330\336"
- #"_\\W\23\232=e\213\35\3559\177e\366\277\323\374\2747c\321\36)\201g"
- #"=&\255\263I\347\251Yi\317\317\214\325VQm\375\317\255fV.\303i\3"
- #"6W\226[d\366Q\355\252\237\262\331\377\34\214\205\225i\374Fc_s3\307"
- #"l\301\30p\177\2559\246M\342\306\331"
- #"\21;\237\200\263C^\3\360\301\21\35"
- #"\243\356\226\17f\306\326d\357\r\301r\3F\215&2jW=\211\275\306\343\31"
- #"\214O\266\3328\351psl\372$:\310S\353+\314\371,m\177q\r"
- #"\366\376\202\315\370\202~\216\331\3119\255"
- #"\\\207\255\v\271\220\22\230\267\331eV"
-) 500
-(
- #"\b1Wg\243\324U\310[2c\265t\344\266\376\347`l3\233\212\32>\321"
- #"\374N\364w\232\32\251T\273\312\366?"
- #"\177\251\371}\330\4\2064#\313\0363"
- #"\235\321X\236\232\\\253\264\352sv\314"
- #"\316'\340\354\2203!w\263\247\366}L\316\335bio\bv{\256\250n)"
- #"\305\r\245\301j5\36\3530\326?\234\36\216O]%\266\20m\244O\255S)"
- #"7\372E\346|g3\337_\334\336\274\267`>{\352\337\314\376/\b\333\264\262"
- #"\332\312\235\34N`3\363\376\37\214\25"
- #"\340\265:\e5\22\237\312\214\325\322\221"
- #"\333\24}\301\230F\373b\263\315\32\217"
- #"K\31]a\326H\345\264\253l\377s\315\336J\3\344iF\226=F\253\347\347"
- #"\27\346[Z\3659;d\347\23pv\314E\0/\350{\3776w\213\275!\254"
- #"\307^-\253\273\31\213\6m\34\344\32"
- #"\312\ne\32c\17\211\313\31\253\231\325"
- #"U\362c6\353GF\372\324\2729\343"
- #"\215h)\243\361\312e\226\201\371\233\367"
- #"Z\214\t\5v%5\225\315\312\354\363"
- #"\315u\364\365%\214\"\223\244\30\261\375"
- #"Y\257\263\331?\214}?3\326\226\216\334\326\377\\3\3104575\36\3530"
- #"o\244r\332U`\263\377\371m\311X)#K\217Y\32\306v)\314U\245\374"
- #"K\235\24\235\35\260\363\t8;\346\271"
- #"\30\211\244\tXw\267\200\361\2060\207"
- #"\361\t|\21\345\351Z\335\31\251v\225"
- #"\366\304\326\240\371=\214\201\327\324Ub"
- #"\v\321\216\b?\317g\373S\353\233\31W\17wP\262\220>\26\336\37[\370,"
- #"\265\233\367\351aL\215\343\\\212\1\325"
- #"\224\327\327Pn\242v\265r/\243+\356/\346\370\243Y\256\263y^\330\257T"
- #"lXKGn\353\177\256s\371<\363\306\3\3545R5\355*\333\377<"
- #"us\2262\262^g\216I\23#,m}O\251\317\211s\234\331\371\4"
-) 500
-(
- #"\234\35\361V\200\e\6\22\340\222\276\217"
- #"\255\271[\300\346\323\271\32\222\347\230q"
- #"\253]\245A\353\e)YX6h\256\373\246\256\22[\210\326\357S\353-f>"
- #"g3*\314j*\353\334\302\361\265\233"
- #"\267\312\220\3141\237\343\1\306@\372G"
- #"(.*\315\300\322\225\310\225\341\365.J|Fc+\267\207\327t5\364xs"
- #"\356\334\34k\201\364\266\376\347\332\364\351"
- #"\34\346\215\207\322\32\251\232vUI0"
- #"\261\224\2215\2051VE\226[\330\356"
- #"\300fR\302&\205\375\234\343\314\316'"
- #"\340\354\210w\2<:\374\274\0\362\237"
- #"\331\337\261\273\21YwK.\266\360\241"
- #"\314\361V\273jsFc\360H\346\230"
- #"\222\253d\226\271F\355\251u\246\331o"
- #"\21\243\253I\307\327fS\256#=\276v\363~z\30\273\213\262j8\333\\\213"
- #"\214\331h\366\246\252q\34\215\331lM"
- #"\t8\333\270\312\0173\327\272/\214\345"
- #"T\0j\201\364\266\376\347;$\337}\316x\200\321H\275\227e\355\252\232`b"
- #")#KW\234\252j\374\321\314\265\367"
- #"5\363\323\24\356\227g\366sv\300\316"
- #"'\340\354\210\e\1|8\374\374E\310"
- #"\177\375\312}\35\233\2235Ic\v\372"
- #"\224\235\336\20r\332U\263\3026]\35\250tH\315U\362!s\314\256\205yZ"
- #"\275\247\322\23:\b\3749\214\227D\5k7om\262\2655\243\1\265\5\205O"
- #"\t\363\260\202\216v\374\300p\236\235\331"
- #"\314\320JWT\265T\336Z \275\246\350\v\2\377n\256\251q\250\334w\240F"
- #"J\263\266r\332U%\301\304RF\226M\323>\"\354sQr\316#\30]\204"
- #"'06\252\252\311\2578\307\221\235O"
- #"\300\331!\31^\265[\341g\372>\326"
- #"\312\232\344b\v\352\327\2667\204\222v\2255\6\377c\266\227\\%iFV"
- #"\251c\235jq\351\r{Va\277\331a\374\275\205\361\332\315[5\247\0164"
-) 500
-(
- #"\333\364\251\236\224\252\372\r(\306P\267"
- #"]o~\376\2259\356\251f\273\r\314\203\365T\336\266@zN\3217\267Z,"
- #"\5\332\301h\244t\25\220jW\325\4"
- #"\23\265\226\304\336\364\3234\355\3071\256"
- #"l\326\243$S\250\220\242J\301\200\361a\343t\226\347\352\34Gv>\1g\207"
- #"\244\371\371\26\200\367\367}\254\3069\346\207W]=\350\23lzC(iWY"
- #"c\260\214\22t\237\301\272\314\267fd]\20^s\35\353^By\362^\306X"
- #"\273R\322|\322\336\31\247\24\306k7o\215\203\244Av\333;d^\370\234?"
- #"0\333l\353\334\31\3468\315\212J\3\363\265T^\260\36HO\25}K\253\305"
- #"\\m\217rk3\337\334\323\177\233`"
- #"\242\315\310\312\245i\2031\315{\177\306"
- #"\236\357\232\245\246\373<'l/\265\332"
- #"u\2163;\237\200\263C\322\374\374\332"
- #"\360~\353\276\216\265\262&\271\330\2\30"
- #"o\b\207\261\254]\245\306\340G\224\e8)\251\272\32\210N]%iFVN"
- #"\360p\6\243;\350(\366\327\337[o"
- #"\352\271\361\332\315\333\306A\254\21S\331"
- #"w\225\237\237\307hl\364\306\255?\337"
- #"\302hx\365\270\e\330\f\314\253a\311"
- #"e\203\201\365@\272U\364\315\255\26\333"
- #"j{RW\340\313\222\361Rz\356\333\3151j\234Ji\332`,\302\3248\307"
- #"\375\24\27\233\275\326*\214\17\26\2531"
- #"?_\3478\262\363\t8;\340\223\0\36\17\360\37\311\366E\0/\354\373<z"
- #"s\330\2630\2567\4M\345M\203\335"
- #"\2511\330\210M\271\217\324U\222\313\310"
- #"J\373v\254\302\370t\375\313pL\255\2777\302\270v\367[?8\2e\251\0"
- #"\0 \0IDAT3^K\345\5\233q\20\335fe\337\265O\306\r\224\e"
- #"\255\355\256\230\256R\354q\317fo`\376\312\302\34"
- #"j\201t\255\270\277\313\234\307\256\26\333j{\324\25\250"
-) 500
-(
- #"\201\354\357%\343\245\364\334\317\232\353iFV.M[i\3431\332\34,\367Y"
- #"ue\343\375A\206\200\235O\300\331\1"
- #"o\0\370]\200\233$\333\177\206\221\244"
- #"\363\266\251\331\356\22\306\325\335d\203\270"
- #"9c\0006{\210\244\256\222\\FV\332\267\343k\346\275\rz\317\t\333K\312"
- #"\264\27\207\361\227f\3064\225\267$\314"
- #"\230\213\203\2001=\365`\306\232\0275\32\3526\262\305\224jD\254\4K.0"
- #"\1779{\373\310\253\272\355\5\354UJ"
- #"\266\35\36K\253\305Rm\217u\5\276"
- #"\235\261\247\211fj\225\322sU\306_\215e)M[\231\352n\275\255\360]\203"
- #"b\300\332\366q\216\23;\237\200\263\3"
- #"\236\4\360C\231\355\353A\376\203\337\333"
- #"\327yjO\275\323\331T\263\335;\31/\245\347\332\32\22[GP\313\310R7"
- #"\226>\335>\302(\21\242l\253]9&\214\177\334l\323\346Lz\303*\335\274"
- #"?\36\306R\321B+\245b\305$I1\276\266\310P?\333<\306L5+\301"
- #"b\225~\227\207\257+|\376\334\3673\203MW \330\333\323$\227\236;\235q"
- #"\325u\2\353i\332`\263\200q~x\315\tr*ue\353}\322\207\200\235O"
- #"\300\331\1w\1x#\300)\231\261;"
- #"\1\376\275\257\363\224\322G\2472\312u"
- #"\250\274\272\275!\224\214A\255\216\240V"
- #"\274\246n,}\232\177Of\237\264\277wJ\215\3\\\314zs\2466\326d\337"
- #"7`\354uB\2\257f\\Y,\242\254p\364s\347\204\0035\31\340\363\24\303"
- #"U\352#\377\a\366*%k\233\337t\225\244\334-\214\353*+\347\n\4c\26"
- #"\324\305,\247\347\252*\363m\224d\n"
- #"\e\3739\227\315XQZ\375\276\t\353\202\2340\327\375Ma\3349\216\354|\2"
- #"\316\216x5\300\27f\266\277\3\362\337\276\270\365"
- #"\34\245\364\321\317\204\355\367\22\330\216\2757\204\2221"
-) 500
-(
- #"(\325\21\3242\262@\251\3\321\e\324"
- #"\217\331\233\221\5\366\366\367N\307\337c"
- #"\316\241\3145g\322UG\351\346M\326"
- #"e\33774\373\335\314\246\302\360\t\214\253\224\205\311q`{\260[kM^\224"
- #"\31+e\213)\323\332\236\222+p\r\306~\367\232\216l]\215OcL\34P"
- #"\327\246J\276\220\315\"\311\222tJI"
- #"\220\23\24\343\3741s>\2274\351\230"
- #"\235O\300\331\21\337\17\360\364\302\330\22"
- #"\310\177h\373y\322\364Q\275\21/d\254+\2607\204\2221\250\325\21\250(a"
- #"\256x\r\2147;\262\331\250)\245*"
- #"\304\332\214\255\234J\360\3679\362\346L"
- #"\32\3179\227\355\262\357G\231\361yl"
- #"\272\266\266J\336\333\e~[\260[\333"
- #"\317\276?3V\312\26\263\324\200\275\236"
- #"'\347\n\4\201\23\315\374lz\356\24"
- #"J\237\26\22\370I\330\246\261\231\1771"
- #"\32\305\367\261l<\300^AN\260\254\204\274m\345\367\355\34\av>\1gG"
- #"\\\37\340\334\302\330\34\364k@l "
- #"\375U\24\303\260\224\242\261\244\373\330\e"
- #"\302\234\260\177j\f\332\352\br\305k\240\0242Z\367UM\342Bo\214\2070"
- #"\257\22|]\3709\27hok\316\244i\256\373\260]\366}F\370>4\225\327"
- #"\272\265\256\246\334\\\3556{\223\254\t"
- #"Yj\374\350\233\2059\346\262\305r\307"
- #"\327\\\201`S\324\3600\263]\333\337"
- #".\240<\20\354\314f\21\347[\303\317"
- #"\213\31\343?%\351\24\25\344\374\36\245"
- #"\30\325\256\nOfL4\250\325\2568\307\201\235O\3009\204|2\344?\366\325"
- #"\255\373j \375DF\327\305a\231\375\254\314wj\fJu\4\263\3141\207g"
- #"\316\371TF\367\230\326\26\324$.\364\6w#\363*\301\265UF[s\246\243"
- #"2\327\257\311\276\377&l\273%\274\376\335\354w\6%"
- #"\245Y\337\337\313\376\372\206\354\36\306R9\20e)[L"
-) 500
-(
- #"\371bs\315\237\260\274R\261.)]!m\310X\277q@\370\375\316g\374\333"
- #"\320c\3172\307\336\304\336\264jM\\"
- #"\370\245\331\217l\272\5\301vw\236s"
- #"\234\330\371\4\234C\312\177@\24{\353\373i ]3l\216/\354\367\3520\236"
- #"\273\311\227\352\b>h\216yF26\235\361i\374T\366'q\261\2339\37\331"
- #"\253\22\\[e\2645gzw86W\355\256)\302\266\272\374\320\360\363\357\315"
- #"\347\260\262\"G\228\311\274\357\247o"
- #"\310\306alA\341\363\327\342 ;\263Y'\362\372\3029J.)-\b\2750"
- #"|Wj(\256eL\4x\t\243\256\230\256t>G\211a\325\22\27NfL"
- #"LP\266\271\363\234\343\304\316'\340\34"
- #"R\276\a\362\37\274vu\277'\23\217\375\243\237\317rP3WT\6\226\353\b"
- #"6f\f\326\346\236\2325ew\36E0\260M\342\"\225\3\237\225\331\247m\225"
- #"Qk\316\244\262\360\27d\306\324u\366"
- #"5\306\352\362\a\31o\300;\262\31\367"
- #"PC\363\255\360z\207\331^\353\e\2"
- #"\306\264\333'f\306Jq\220\375\31\215"
- #"\227\326b\344\322hk.)\206\317\263%\243\221y8|\247S)+&\375\\"
- #"\263)E\245\266\32\337\272\2504qA\23\fl6^\356\367Q\352K\343\34\a"
- #"v>\1\347\20s\t\3003[\367\323"
- #"\177\376]\v\343\271\242\2626\231o\225"
- #"\356\320\202;\373\324\274;\345\346\263\210"
- #"Q\321\267&qa\345\3005.\261]f\236m\253\214Zs\246\247\205\261[2"
- #"c66\261\1{\253\313\217eo\235\310\262\360Y\224\a\263\275o\bX\317\304"
- #"\2\233q\220)l\336\330\217\r\237;\227F[rIYw\326\361\24\301Ik"
- #"d\326a\214\223=\32\256\361=\363\373P^\305\336\304\5\e\a\233"
- #"\225\371,m\265=\316q`\347\23p\0161\177\r\351V\230\253\27\211"
-) 500
-(
- #"\324\0\370'2c\245\242\262Y,\327\21l\317h \366\b\373\350S\363\343\31"
- #"o\202i\\$'qq\4\233r\340?\v?\277\226\371\317R[e\324\2323"
- #"\255\304\30\307Y9\31Kc\23Z]n\3355\333R\214\313_\31562>\245"
- #"\357\303\376\372\206\3242\261\300\30\a9"
- #"\210\321u\270\230\2610\20\354M\243\235\302\246Kj-\312\nq{F\243j\215"
- #"s?\\By8\370F\270\376R6\373\262+m6^\272\n\331-\214\225\24"
- #"\2\234\343\300\316'\340\34bn\n\371\217\177gu?-\322\313\375#\247Ee"
- #"m2\337`\f0\177)\274W\203\261"
- #"\r\201\237\207\237\317c\257\34\207\225\270"
- #"(\311\201k?\211R\366Nm\225\321\326\234I{el\236l/\305&T\206"
- #"E\215\350Nf_\262\251\v\366\323pL\3327\344d6\237\334\3332\2614\16"
- #"\242\1\357\a(\261\t\273O\232Fk\343\36\337a4\310c\301\264\322\177/F"
- #"\345^k\344\300|_\32\3478\263\363"
- #"\t8\207\234\367\0\274\v\265\276\351V"
- #"\0\360If{\256\250\254&\363\215\260\37)\305\211zS\324\247f}b\276\223"
- #"\371\e\206J\\|\205e9\360\203\303"
- #"\366R\17\364\332*\243\2559\223\326\253"
- #"\344\236\244K\261\t5hv\256\307\232m\v\315\317\332d\312\366\rQj\354@"
- #"\343&s)\253\232\264\350\321~\367w"
- #"1_\347\1\306\254\271\23\330\324\353\262"
- #"\274\230\342N\273\216\362`\260=\363\256"
- #"?\313\265\331\253\325uI\341\3749\236"
- #"\304\246\301\264}i\272\377_\231\204\354"
- #"|\2\316!\347a\0\227A\376\203\313\373Y\1@0_T\246\234\25\266\223\300"
- #"\a\314\366U(\251\235d\263\6A\237\232U\324/'x\bF\227\230\6\337s"
- #"r\340j\240~V8G\333*#\327\234I\251"
- #"q\233\0032c\245\330\204\256BlO\24\315\276\262"
-) 500
-(
- #"YYj$\364\334\332&\367\6\16.\273b\v*-W\245\30\234t\377\a\303"
- #"g\34+\25\3345\2307z\227e\346\242\6S]k'\215\321\234\234-\354|"
- #"\2\316!\347T\200K\321f@\254p \330[Tf\367\265\351\271\3175\3335"
- #"\265\365*\212\vJ\267\333\336#%\327"
- #"\f\30\3\331dY\16\\\263\265J\262\350m\253\214\2649\223\245f\r}>3"
- #"V\213M\250\30\344Q\214\206@\r\212"
- #"\0267Z\236E\221\277\267\301n\255\237"
- #"H\eY\245\302\217\333\22\370]\30\317"
- #"\5\332_\317^\27\325b\312\312m\335"
- #"\314\376\343\305)\24\345\202R\272\357\262"
- #"\302\357\3139\306\354|\2\316\t\300\v"
- #"!\377\251k\25\367\261\302\2013\330,"
- #"*\263\373\245\351\271\37\315lOW\rV\247*\327VVi]?\273\26\366Y"
- #"7\214?P9Om\225a\2333\245co\bc\271:\222Zl\302\3664I"
- #"\3\345'\261\231\235\245\356\244\2772\n"
- #"V\246\232QG\204\355i\337\16e\316"
- #"\230\245\222.\313\302\274JU\353]\323"
- #"\32L5\370\245\302G\347\30\262\363\t"
- #"8'\0w\204\334Y\16\250\356\247\302"
- #"\201\352\272\272\220\275\201nu\363\250["
- #"\342\242d\373\331\311\376\251Bo.\323"
- #"\v\224\247k{\203\255\371\304\365\311="
- #"'\215\2\326W\31\332\234\351\327\2311"
- #"\355\205\376\247\314\230fb\375.3\226"
- #"\3664\331\231\315\202\273\327\21\370\243y"
- #"\2572 \232\32m5\243\300(\225b\373vXZc6\203\275\222.\357b\276"
- #"\356\302\351\354a\347\23pN\20>\b\351\233^\336\347\277\211\307nrZTf"
- #"\307mz\356\377c\254\333x\241\331\236f0\251B\257\272rr\231^\e1\312"
- #"\306k\226V)H\16\306\264\342\\-\b\230_e\350\23\257>\365/\17"
- #"\317\240\334\244\355\367\223\266\346\335\314\354"
- #"\257q\21+w\362\223\344\234\266)\27"
-) 500
-(
- #"\330\333\267\303R\215\331\355\314K\272t"
- #"\377\267\346\2340\354|\2\316\t\302\257"
- #"@\202\351k\243\224\221e\233\36\345\342"
- #"\0zS\323\364\3349\341\375\265\311v"
- #"\245U\350\335\235\371L/0\326v\374\234Q\317in\345\263h\300\277T\v\242"
- #"\253\214K\271|\275A\372\341\35\4Nc\324~:\316\314cW6\343\0216\255"
- #"\367\21\2_d3\320\376_\214\222\37"
- #"\263\302\266\2133\237o\1776\3470\207MI\27\247\263ov>\1\347\4\341\232"
- #"\20\3r$\344\316\323\273\317\24\342\261"
- #"\233R\252]\225K\317=\314\354o\267+S\205\3364\323\v\4\336\21\266\335K"
- #"iF\2646\353}?\300z-\310J\214\251\276\226VbC\e?\345\202\320\332"
- #"\2051\247\350\373\24306\233b4\356"
- #"\310\\\207l\246\252\236\22\266\375\315\214"
- #"\253QY\312\330[E\251\242\203\317b\214)Y\211\373\317\263i\224J\232WN"
- #"g_\354|\2\316\t\304\371\0\357E\311\200\200\361&ok/J\351\271v\305"
- #"rhr\236\234Bo\232\351\265\5\343"
- #"\n\305\256&\376\34\266\355X\230c\256\26d%\2oaSF\235\224\32\224T"
- #"b\243\226QUS\364\325\353Z\301\305-)\6\361\264\344\272j\264.a\254\5"
- #"\371\fc\177\21\313\v\302\353\203l\256\224T\34\361hJ\214\344\n36\237R"
- #"\325\337\375\337\224sB\263\363\t8'"
- #"\20\367C\274s\345\367\321U\205\315\f"
- #"*\245\347ZW\312\253\222\363\344\24z"
- #"m\246\327:\214\235\0OM\216\235\35\266\277\2670G[\v\262*\305\20X\t"
- #"\221+\330\254~O\217\257eT\325\24"
- #"}\237\e\306J\202\217j|\177\300\262\333\354\n\306FL\226jd\16g\276\27"
- #"\211\345\257\223\337\203\32390;\237"
- #"\200s\202\261\336\255\360\5\224\341?\206\367\245\364\334"
- #"\225\30\3\307dS\375\265\244\320\v\306L/\225-\231"
-) 500
-(
- #"\317\336\352\347\377\fc\247\24\346\250\265"
- #" w\260\327p\354Eq\305\351S}\316MU\353\273QS\364\235\316(\326\230"
- #"\366\301\0{\215\257\6\356O4sl\343?(R.'\260\0313Q~jT"
- #"\376\6\234\316\300\316'\340\234`\374\35j\6d5\306\354\2525YN\317U)"
- #"\360k\330\253\376ZR\350\5c\246\327\322p\215]2\373\250k\354/\2059\276"
- #"0\214+o\240\270\257l\352\252\366\267\230\2259\276\326w\243M\321wN86"
- #"\27#I\215\257\345\266\214\31S'Rd@Nf36\222\243\2121>\314r"
- #"\5\277\32390;\237\200s\202q+"
- #"\310\335\351y\305}\264\306\343\335\314\247"
- #"\347\332\325\307\276l\252\277\226\24z\225"
- #"\317\17\343\244\364\224\310]\177:\345f"
- #"\273\214\322xH\267\253\n\256\315\\:"
- #"\230\371\232\a\3550\370\321\3025j}"
- #"7j\212\2765\t\362\324\370\246\343jt\37\245$\17\364\233!V\323\274r:"
- #"\227\213\235O\3009\1\371 \300?\27"
- #"\307\277B\200\214\352\264iz\256\336\b"
- #"\257\242\334\324\255\372\3535a\254\324\232"
- #"\326V\233\327\252\322\265\v\240>uo"
- #"\316\350\376Z\312\30\214.=\225\253\2"
- #"mZ\345\255\254\365\335\250)\372\252r"
- #"\361\205\205\363\252\361}aflk\346"
- #"\245Ml\206\330v\224\212v+\200\370\2641\373;pNnN\205\3031\0\276"
- #"\6`K\0\253eG/\t\257O\5\360\17\0\2370c+\1\370h\370\3713"
- #"\0\226\1\270\t\300/\0\254\16`[\0\177\3\360\345\314y\367\4p\20\200%"
- #"\341\375K*3\374}x\335\t\300\233\1\\\16\340\271\0\356\4\360R\0?\r"
- #"\343\317,\34\177{x\335\2440~mx\335&3vex}vf\354w\220"
- #"\317\274#\200U2\343s\303\353\363\302\353\272\0\16"
- #"\f\333\257\3\260\265\331\367<\0{\3\330\0\300\256"
-) 500
-(
- #"\0\276\t\340\b\0\a\3\230\26\336\257"
- #"\6\371~\35\216\261A\347V\3149\361"
- #"\250\2\213\337\315\216oN<\366\364\233"
- #"\246\347\246\253\17\335\376Js\314\301\231"
- #"s\332js}\302\2575\22\332'\354"
- #"c\333\330\236\315\30\274\326\372\221\223\v"
- #"\307\357\24\306K\252\274\265L\2546E_]e\345\324p5\213\353\n\2\277b"
- #"s%\241j\270\307\205\367g\232\343\236"
- #"\317\230\20\3600\233i\324N\347\230\261"
- #"\363\t8\207\224\363\0N\257\214_\1"
- #"\360\21\344\272\25\332\202B\233\236\233\306"
- #">\3541\357-\34\243\264\325\346\253\261"
- #"\\\225\256\334\325\234o\21\305\220Y\203"
- #"\245\6\"\27\260F8\257\32\240\334x-\23\253M\321W\353H\0161\3334\343"
- #"\352\207f\336\312\271\224\236\360\32\23z"
- #"|8\367b\212*\357\21\214q\220\253\330,\34t:\307\224\235O\3009\244\274"
- #"\1\340\26\225q\25X|Cv\\\25tmzni\365\221\n&\236\227\234+"
- #"\2556\a\363U\351\312\235\31\213\350H"
- #"\21ZL\367Y\203\365\233\374J\224\247"
- #"\377\245\205\361Z&\26XW\364U\251\373\337\262\36\b?\205e5\3343\302>"
- #"\266&\344\e\224\272\226\356\377v\234\223"
- #"\206\235O\3009\244\374\5\300Wd\266"
- #"o\4\360\326\360\363\203\0\377\212\2346"
- #"\326\232l\246\347\326V\37*\2308\227"
- #"\275)\275\245j\363\264*]\271?c\226\225\32\221\3270\377\31u>\271bA"
- #"0J\215lZ\30\257eb\225\24}\327\242\b\37\326\2\341\263\303\266c*\277"
- #"\2377\230c\0272\337\304\312\351\34s"
- #"v>\1\347\220\3628\200\37\310l\377\2\344\316u\37\300cQk6e\323s"
- #"K\253\17+\230839f:\313\325\346\266*}\r\212\333\354(F\235\247c"
- #"\31\r\323\247\v\237Q\333\336\356S\30\327k\357\\\30"
- #"\257eb\245\212\276[0_!\376#\366J\245\244\362\356"
-) 500
-(
- #"\351\2717`\354'O\226U\205\235\3161g\347\23p\16)\17\202(\360\246\333"
- #"\37\6\270!\344\356\245\2\213\314\236\303"
- #"\246\347jJo\272\372H\5\23\3551\237\rc\363\231/\312\323\264\334\3273>"
- #"\361/f\2240\177U\330\366\213\302g"
- #"\324\225@\311\300\264\251\366\3264\261T"
- #"\321\367\32J\234\304\2564Nf\254t\237U8w*\357\256|\"\243\333\352R"
- #"\346\373}8\235\343\306\316'\340\34R"
- #"\276\34\340\377f\266[\3\2\200W#\32\223\336\363\234C<v\363LW\379"
- #"\301D{L\255\332\34\214U\351\352\252"
- #"z\200\300K\314\270\6\302\357)\34\277"
- #"w\30/\365G\377j\30\317\325s\200\371L\254R\337\20U\311}z\330/'"
- #"\254hi\273\24\35267\36\316\241c\347\23p\16)\237\16\360v\210t\211\335"
- #"\376Y\200\307 \32\220\327BV!\373f\317\243\205s\244\4\303\355XN0\21"
- #"\224\16|zL\251\332\34\249\20\335\257Tm\255i\274O\316\214m\25\306n"
- #".\234\377#a<W5\16\306L\254+Y\17\206\37\306\330\247C\331&\254\230"
- #"\272\261\334x8\207\222\235O\3009\244\\\31b\30vI\266o\4Y\205\320l"
- #"[\4I\353\355=\317T\342\261\e\351,\263\275$\2308\205\321uT\213?\354"
- #"\300f\215G\256\246\2\4\316\r\343\271"
- #"@\3724F\311\223\307e\306\337\22\216"
- #"\315\2112n\315\270B)\5\303\365\206"
- #"\237\213Q\264\t+\202\321\215\265\27\335"
- #"x8\207\224\235O\3009\304de\273"
- #"\35;\v\22L\237\226\335\177\277\260\373"
- #"\215\214\272S%\301\304O\207\355*O"
- #"\236\323\242\332\227\222~K\212\372,)"
- #"+\235\334\265\333\342\34\227\207\361\234\1"
- #"\332#\214i\377\363u)\365\30s\365\343\e\236\302\336`x[\fe"
- #"N\30\317\t+\202\321\215\265 \274"
- #"\272\361p\16\35;\237\200s\210\311\312"
-) 500
-(
- #"v;\266ix\277_v\377\251\4\256\16\207\314bY0qo\312\23\371bJ"
- #"q\34\331[\250w\4c\246\325\t\214\335\5K\332Ym\201\364\331a<\327;"
- #"|\3530v'\313U\341\332(+\355\300\b\326;\37\202uaEP\f\217^"
- #"\357\32\226W*Ngg\354|\2\316!&+\333\323\261\5\220\352\365\374\271\354"
- #"*DSP\355M\377\31\4\36\n\333?Dq)\2512\355z\24w\223\n)"
- #".\243\304\25\300\330\373\373\364\302u\333"
- #"\2\351\377\25\306\2177\3334\20\256\355d-\323\252p\355e\236\23e\314u>"
- #"\264\254\t+\246\305\220\eu\372w\340"
- #"t\26\330\371\4\234C\314k\v\333\27"
- #"\240\327\200\34\a\211\231\344\317eW!"
- #"\32\34^-\214\255\303X\271m\r\301\234\260m\177\306\232\215El\352<is"
- #"\250R0\32\254\a\322_\34\306.g"
- #"=\20\376U\346\253\302\277\35\306\337\231"
- #"\31\263\235\17s\363Z\207\371\376\355\266"
- #"\30\362,\346\245\335\235\226\275\205\254\316"
- #"qb\347\23pN@\316\4x]\262m%\310\335vi\3618\225\360\260n\235"
- #"i\214O\361\2273\32\0250v\350\3238\307\375lv5\4\345\306\253+\225\325"
- #"\n\327-\5\322\327\2424f\252\5\302"
- #"\265\217x\256X\20\214\256\266Od\306"
- #"\324\270]Y\371.\255\260b\256\30\322[\317\366C\16\301\34&#]\316\3351"
- #"\20.D\257\220\371\22\210Xz\371\217"
- #"\3524\363\363\202\360\372\t\0/\206\310"
- #"\276\277\26\300B\263\317\37\302\353\372\0"
- #"\356\2\260;\200_'\347\\\4`\36D\276<'\255\16\210\224;\0l\37^"
- #"\267\0p,D6\376Sf\2773\320\224G?\n\300\245a\254t\356\277\205\327"
- #"'e\306\346\207\327\31\205c\1\340\242\360\272[\270\376a\0\226\2x"
- #"7\200\367\207\237\35\216\341E\347V"
- #"\314\271\342\360\20\310\323\340\343\213\373"
-) 500
-(
- #"\330X\310\276\214A\363\335\223\375R\271"
- #"\216\267U\256\373\275\226}4\220\376'"
- #"\346\253\302U\262$\27\307\250\311\266\203"
- #"R\270H\312**7\256\332^\353\25\306uUv_xM\213!'7k\256"
- #"\251M\1\36\0\360\334\360\v]y\b"
- #"\346;\331\350+\20\307\250\342\e\341\365"
- #"\350\342\36g\0\270\6\300\323\0\314\6"
- #"0\5\300G\0\\`\366y\"\344\311"
- #"\374\231\0n\r\333\366\255\\\365\252\360"
- #"\372\254d\373\226\220'\371\267\206\367\317"
- #"\6\360o\0\36\4p\34dU\261?\244\311\23\220o.Uk\34\5\304\25\310"
- #"\246\205\361\371\341uFa\374\301\360\272"
- #".\200\273!\253\261_\26\366\235|\230"
- #"\236\374\274\ad\355x\23\200_A\276\325\317\206\261G\307{r\16\0C`\305"
- #"\234+\26\257\4\270\260\272\217\215\205\234"
- #"\313\246``Zq\275\t{\25zS\276\324\354\377n\2\2471*\351\246\3740"
- #"{\253\302k\315\245\332d\333\37\27\306"
- #"\37,\214\327jA\16d\254w!\275\365l/\tp\177\200?\0x\27\300_"
- #"\1|?\300\315\206`nN\20C0\1\347\4\342}\201\265}\236\r\371\307\177"
- #"iq\237i\304c7\315\37\232\355%"
- #"\271\16\253\320\233\236\253\24\b'\305\210"
- #"\234F\251\361\320\f\260\\\37\365\266\346R5\331v0*\354\346\4\37s\265 "
- #"\353Q\262\253t\236\336\307#\345\v\0"
- #"\236\32\276\240s!\256\252M\207`^\316\36v>\1\347\4\"!)\274\251\274"
- #"I\312\a \r\251\312\373lK\221\362 E\254\260\246\365d\25z5\226P\222"
- #"G?\227b0\266L\256wZ\30\177Kf.m\315\245j\262\355 pm\30"
- #"\317\25\23\246\265 +v\353\331~\323"
- #"is\373m\n\360(\200\267\1\274\34\340\273\0\2565\4\237\311Ye\347"
- #"\23pN \22\222\302\273\240e\277\217CjBV\251\356\247=B\26S"
-) 500
-(
- #"\352Br\306C\251\n\275\337c>\20\256\256\242R\325\267J\232|\2520^k"
- #".U\223m\a\353\305\204Z\vr\26'C\353Y\216p\277i\0\367\206\270\246"
- #"\356\a\370\r\200\333\17\301\347p\366\315"
- #"\316'\340\234@d\362Z\343R\200'\265\356\247+\3RdAR\271\16\255\n"
- #"\377\245\331O\263\225\254<\372>a{I\262d\3770\376\375\302x\255\271T["
- #"&V\255\230PkA\0364s_q]V\34\301~\276\332\230\370\364,,\307"
- #"\210p?\200]\372\334\367\17\0\336\200"
- #"\266\354\230w\233\237\237\2\340\20H\r"
- #"\306\207\1\374\26\300=\0~\b\311N"
- #"R\234\0\251\273x?\200\e\302\266\363\1,\3\360\2\0\253d\256\243\373m^"
- #"\230\307\325\341uy2\261r\265 \317"
- #"\16\257k\1x\4\300\201\220\317\374H\341\\+.6\5p\0\200s\303\373M"
- #"\0\274\21R\235\363M\0\17u4/\307\362\241s+\346\2348T\367\25\373\330"
- #"w3\304%C}\337U\t|\216M\261\302\\U\270v(<\257p\236K\303"
- #"xZS\2\2\217\17c\17\24\216\2555\227j\313\304\322,\256\357\230m\317a"
- #"\224bQ\256\370\255g\355\357z:\300= m\217o\2x=d\325\261\vD"
- #"\265\240\353\271:G\205\235O\3009\301"
- #"\250\6\344\317h\213qH\306\26\373>\267fCi\214 \225G_\223\365\224\336"
- #"6u[-\326\33303\326\326\\\252\226\211e\213\tgP\32e\251\34\311\335"
- #"\224\240\376J\205\363\256X$<\355v\222\261\363\t8'\30gBn\24\227\1"
- #"\334\261e\337\217\243\2552=\345s(\332VK\t\274 3^K\351\335-\214"
- #"]Q8\267V\234\347Ry\333\232K\3252\261\266\rc\367\206s\220\"\206x"
- #"\24\233r\365\23\227#\251\b\367\264\333I\305"
- #"\316'\340\234\200$$c\346\300\226\375\246B"
-) 500
-(
- #"\202\351g\216\350\374GS.\361(c\35\207\246\345\346Rz\225+S$\341\227"
- #"1\277\312\250\245\362\202\365\346R\245L"
- #"\254\265\b\34\32\306\224s(\206\260\373"
- #"\337\323h\376\276\365gwM9\225\36Dw\f\204\353 \22\205*OxSa"
- #"\277e\209\302=\1\254\326\367\331\377"
- #"\a\"\2668\35\300~\20\201\224\353\1"
- #"\334\1\21?\274\26\300\352\0\336\225\34"
- #"\367(\2009\20y\224=2\347\2751\274\16\22H\277.\274n\e^\255 \343"
- #"\347\314~{C\204\21\377X\270\306\304"
- #"\305\376\0~\0\371\304\207\1\270\31\300"
- #"\213\0l\5\340p\210\370\314\222\316f"
- #"\347\350\n\235[1\347\304\344\313\0\336"
- #"\3\360\32\224\373\206\0\342\346\"\300\17"
- #"\204\367\375\367n\330\222\355\322$\227P"
- #"\272\n~\214\222\202\253\253\227\\\37\363"
- #"\266T\336\\s)\345\356al\36\363u(\333w\376\373\30\v>\3\340\267\341"
- #"\256)g\236S\302\17\16\307\210q9\344Y}+\310\323h\r\367CV#\353"
- #"\207\327)\3]qK\310\323\375n\250"
- #"\213+*\346B\244\336o\204\244\361\256"
- #"\16\340\273\220\325\301v\231\375U\310\360"
- #"\22\0\357\3\360t\310jes\310\312c\a\263\357\203\0201\310\257 \246\bO"
- #"L<\n`e\363~\32\2007\18\b\"l\177\f\200\23\21e\37\35\16\205"
- #"\e\20\307r\3412He\303\37Z\366\373\22\344\226\274'\200_`P\3\222b"
- #"m\310\315\335\336\350\237\16\340\371\243r"
- #"\3662\16\202\30\217\25\243r\201\220\337"
- #"\307\332\220:\215wAt\201\217\1\360"
- #"S\0\213\273\233\232c\310\341\6\304\261"
- #"\\\370\6\200?A\312\377\236V\331oM\310\23\354\345\220\347\370\3211 5,"
- #"\257q\371\35deq\243y\275\21\300\3\243>\323\256A\210\270\375\233!"
- #"\345\230\307!\266\271r8jX\251\353\t8&6.\a\360\\\0\233\265\354"
-) 500
-(
- #"\3670\244kG.<=6x\0002\273\313\333v\234pH]N\203\354\267)"
- #"\200W\0\330+\274_\3\300L\304\232\373A0\23\262bY/\274_`~v"
- #"\254\230\360\25\210c\271\260=\200o\3"
- #"\370\177h_U\274\26\300\217\302~c\277\2Yq\241.\247\221\3547\35\"\20"
- #"\263\27\304\215\270\30r\263?\a\22)"
- #"\32\215\354\251\5\341\374\272z\351w\236"
- #"\216\211\v7 \216\345\302*\220\220\363"
- #"s \201\364\232\e\v\0\376\5I\347}\34V\224\b\302\370c$\6\344-\20"
- #"\203\261+d\5x\16\200\263\321\236\364"
- #"\260\274\363\332\b\222\332\275\346\30\\\307"
- #"1<\360:\20\307ra\21b>\323fh\27Z<\v\300B\0\257\32\313I"
- #"Mb\244\202\205\373\0\3705$\356\364\"H\345\312X\30\17 V\312\0\300\207"
- #"\0|}\214\256\343\30\36\370\n\3041*\270\26\242U{?\244\273w\t\233B"
- #"\272\234\377\6\300\356\3430\257\25\21\343"
- #"\355\232\32)\266\203$Co\v\311\346r\254\270p\3\342\0305<\f\t\306\266"
- #"\271Wn\5\2601\200\r\261\"\3464\215=\306\33355\22<\21\222\322\375^"
- #"\0gv<\27\307\330\303]X\216Q\303bH \265\r\307C\322\377\366j\333"
- #"\321\321\300\v\0\234\32~\36O\327T\277X\31\222$q2\334xL\26\370\n"
- #"\3041j \200\177\"\378\275\6\300Na|*$\305\364*\344\353\301'+"
- #"ri\267\233\2x\17\2442\374nH\335\315\351\30\316\4\204/\1x\26\200#"
- #"\1\274\r\222\262\375\354\352\21\216\211\16"
- #"_\2018F\r\367C\\X9\334\216(o\270\f\222\352\371,\264u+\234\\"
- #"\230\36^\247A$\31\177\5\221w\\"
- #"\27\300\2531\334\235\373\376\3\300\a\0<\3\"\356r\31\200\27v"
- #":#\307x\300W \216Q\303L\0\377\207|\f\344\3\20\315\254"
-) 500
-(
- #"\3\302\373\35!*\275(\354?\31A\210\256\357DXm\244\270\32\242H\360M"
- #"\0\27v<\27\307\370\301\r\210cT"
- #"q-\242\340\271\305\226\20\231\214M\315"
- #"\266\a!\235\302Wt\3\322oE\370\313!1\16\277\t;&\n\334\205\345\30"
- #"U\344\214\a \232\270\213\222\361S\302"
- #"\353\372c:\243\3561=\371y\17H"
- #"\320\373&\210\233j\6\200\317\206\2617"
- #"\303\215\207c\342\300W \216q\303W"
- #"\1\334\2\340\v\341\275\n,~\23\321"
- #"\265\265\"b\230\323n\35\216\345\201\e\20\307\270aO\0\a\243Y@x\3\200"
- #"'A:u\254h\177\210/\200H\243\277\t\300\317!\6\343\\\0\267u9)"
- #"\207c\24\341.,\307\270a\16D\3\353&\0\367\205m\207A\364\264r\rh"
- #"\273B\277\231a\271\3756\5p\24\304H|\t\222T\3608H\234\343\4,\237"
- #"\361\230\t\t\250\23\300\275h\227\215q8\306\3\235\267EtN>.\0\270K"
- #"\370y\21\300\253\206`NJ\216p\277"
- #"i\0\367\6\370+\200\367\3\374\6\300\355\307\370;\233\31\336w\375]9'7"
- #"\335\205\345\350\0043!\302\212\353\2\370"
- #"1\244\316\341\t\30\16\355$\242\177\265"
- #"\333\361J\273\315\251\333\366;O\207c"
- #"\254\340.,G'\270\20\300:\341\347\17@\376\20\17\351n:}#U\273\335"
- #"\4\300\e1\366E~\207C:\5:\34\303\4_\2018:\203}\202\276\23R"
- #"\23\2622\372\353\2667\226\260\363\32\26"
- #"\265\333\207!r\371v\205\346+\20G\327p\3\342\350\f\366\6x\b\200\317c"
- #"8\272\25\22\303\227v\2333\26n@\34]\303\r\210c\3341\37\300S\320\354"
- #"\231\255\2\213\3230v7\305\221T\204"
- #"\17[\332m\332.\326\306\220\34\216\256\3401\20\307\270\3432H\305\365"
- #"zf\3332Hk\\@\\Yc\201\221T\204\217F\332\355h\342\225"
-) 500
-(
- #"\20\203\6\210\3618\3.\207\357\350\36"
- #"\276\2q\214;\366\201\4\236\323\266\266"
- #"*\260x \344\346=\332\30F\327\324Hp\37d\305\361\0\3443\\T\337\335"
- #"\341\30s\270\1q\214;V\207<\331"
- #"o\206\336\216\204\17B\212\344\236:\212"
- #"\327\233\214\25\3413!i\305\333t=\21\307\n\rwa9\306\35\377\202\364D"
- #"\317\271`N\206\304G\326\36\301\371\306"
- #"\273\"|\"\340d\364\366f\231\t1\316^\305\356\30Mt^\315\350\234|\334"
- #"\a\340\3172\333\327\4\270\f\340\221#"
- #"8\27\303\353XU\204\317\4x/\300\373\206\340{[\236\317p\a\244\222}&"
- #"\300\337\r\301\234\234+\4;\237\200s\22r-\200s\vc\363!7\354~\317"
- #"E\200G\1\274\r\340\345\0\337\25\316?\32\363\274\17b\214v\t?O$#"
- #"rSx\335\3\340\337\0n7\4sr\256p\354|\2Ng\203\373A\214\2"
- #"+\373l\n\360\0\200\347\206\375N\201<Y\217\346<R\275\251a\327\237z\n"
- #"\300\313\314{\375\376n1\337'!\306"
- #"y\2271\270\276s\362\321\203\350\216\241"
- #"\304\0224kB\272\250\b\377\35\200C"
- #"\21\263\235\322Z\214a\303\217\1\\\t"
- #"\340\223\341=Qn/\374~\214n\242\202cr\302\r\210c(\361;\0\317\303"
- #"p\245\335\226n\310\343\215\233\0<-\374\254FnU\0\337\6\2605\200\205a"
- #",7\337=\0\314\206\324\225\\1\326\23uL\nt\276\fr:S>\v\342"
- #"n\371\5\304U\265i\307\363\331\16\340"
- #"C\35^_\3\371D\323\265\267\35$\276q#\3007&\307\350~7\231\3434"
- #"\236\323\365\357\327\271\302\260\363\t8\235"
- #"C\315'\2\274\35\340kF\371\274\e\241\31\263(\321fP\1\275\261\241OB"
- #"z\252\354\221lO\367s:G\233^\a\342\230"
- #"\364X\vR\31\177&z\335:+\3\370\21\244\256"
-) 500
-(
- #"\342\314Q\276\356\341\0\316\353c\277\263"
- #"\0\274\1\371\330\313\332\0\336\t\340\255"
- #"\20\327\224m\27|\335r\316\317\341\350"
- #"\a\235[1\247s\274\271!\300\367\3"
- #"\274\b\222\232{2\300\275\0\256\232\354"
- #"\367%\200\27\0\374w\200\247\2\274r9\256y)b]\312&\0\357\6\270~"
- #"\37\307\261\362\376\2500w\300\353;\234"
- #"\343O\17\242;&%\346Bz\220\374\20\22\224\3175\202\372\17\0\247@zp"
- #"\334\vi\30u2b?\367\221\342e\0\276\5\340\371\0\16s\276k\203\0\0"
- #"\2\327IDAT\206\4\273?\322\307qD3\30n\337_\4\221h\271u\300"
- #"99\34\313\0037 \16G\1W\3\370\23\304p\\8J\347<\f\242D\274"
- #"\21\200\255 \206\251\r6}x&D\6f\245Q\232\217\303\261<p\3\342p"
- #"\2143\256\206\304V\266\206\310\330\267a"
- #"&d\225\2646\\\211\3271\\p\3\342p\214#6\1\360G\0007@V\22"
- #"\37\353v:\16\307r\301\263\260\34\216"
- #"q\304!\220\202\277W\1\330\27\22gq8&*|\5\342p\214\23t\365\261"
- #"5$\366\261=\200\257\3xn\227\223r8\226\3n@\34\216q\302\227\320\177"
- #"\346\225\3031\21\340\311\34\16\3078a"
- #"\a\0\257\353z\22\16\307(\302W \16\207\303\341\30\b\36Dw8\34\16\307"
- #"@p\3\342p8\34\216\201\340\6\304\341p8\34\3\301\r\210\303\341p8\6"
- #"\202\e\20\207\303\341p\f\0047 \16"
- #"\207\303\341\30\bn@\34\16\207\3031\20\334\2008\34\16\207c \270\1q8"
- #"\34\16\307@p\3\342p8\34\216\201"
- #"\340\6\304\341p8\34\3\301\r\210\303"
- #"\341p8\6\202\e\20\207\303\341p\f\0047 \16\207\303\341\30\bn@\34\16"
- #"\207\3031\20\334\2008\34\16\207c \270\1q"
- #"8\34\16\307@p\3\342p8\34\216\201\340\6\304"
-) 396
-(
- #"\341p8\34\3\301\r\210\303\341p8\6\202\e\20\207\303\341p\f\0047 \16"
- #"\207\303\341\30\bn@\34\16\207\3031\20\334\2008\34\16\207c \270\1q8"
- #"\34\16\307@p\3\342p8\34\216\201"
- #"\340\6\304\341p8\34\3\301\r\210\303"
- #"\341p8\6\202\e\20\207\303\341p\f\0047 \16\207\303\341\30\bn@\34\16"
- #"\207\3031\20\334\2008\34\16\207c \270\1q8\34\16\307@p\3\342p8"
- #"\34\216\201\340\6\304\341p8\34\3\301"
- #"\r\210\303\341p8\6\202\e\20\207\303"
- #"\361\377\333\253c\1\0\0\0\200A\376"
- #"\326s\330]\22\301\"\20\0\26\201\0\260\b\4\200E \0,\2\1`\21\b"
- #"\0\213@\0X\4\2\300\"\20\0\26\201\0\260\b\4\200E \0,\2\1`"
- #"\21\b\0\213@\0X\4\2\300\"\20\0\26\201\0\260\b\4\200E \0,\2"
- #"\1`\21\b\0\213@\0X\4\2\300\"\20\0\26\201\0\260\b\4\200E \0"
- #",\2\1`\21\b\0\213@\0X\4\2\300\"\20\0\26\201\0\260\b\4\200E"
- #" \0,\2\1`\21\b\0\213@\0X\4\2\300\"\20\0\26\201\0\260\b\4"
- #"\200E \0,\2\1`\21\b\0\213@\0X\4\2\300\"\20\0\26\201\0\260"
- #"\b\4\200E \0,\2\1`\21\b\0\213@\0X\4\2\300\"\20\0\26\201"
- #"\0\260\b\4\200E \0,\2\1`\21\b\0Kp\325"
- #"\3/\336|\270\3\0\0\0\0IEND\256B`\202"
-) 0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 16 #"display-new-plot"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"   "
-0 0 14 3 11 #"module-path"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 6 #"plot3d"
-0 0 24 3 2 #" ("
-0 0 14 3 7 #"surface"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"trig"
-0 0 24 3 1 #" "
-0 0 23 3 9 #"#:samples"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"20"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:width"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"2"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:color"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"blue"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 11 #"           "
-0 0 23 3 7 #"#:x-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-3.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"3.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-3.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"3.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:z-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-1.0"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:z-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"1.5"
-0 0 24 29 1 #"\n"
-0 0 24 3 11 #"           "
-0 0 23 3 9 #"#:bgcolor"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 24 3 1 #"("
-0 0 21 3 1 #"0"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"0"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"0"
-0 0 24 3 2 #") "
-0 0 23 3 9 #"#:fgcolor"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 24 3 1 #"("
-0 0 21 3 3 #"255"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"0"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"0"
-0 0 24 3 2 #") "
-0 0 23 3 4 #"#:az"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"20"
-0 0 24 3 1 #" "
-0 0 23 3 5 #"#:alt"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"60"
-0 0 24 3 2 #"))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 49 #"\"-----------------------------------------------\""
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 1 #"\""
-0 0 19 3 26 #"Testing plot's #:out-file\""
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 9 #"displayln"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 4 #"plot"
-0 0 24 3 2 #" ("
-0 0 14 3 4 #"line"
-0 0 24 3 1 #" "
-0 0 14 3 3 #"sqr"
-0 0 24 3 2 #") "
-0 0 23 3 7 #"#:x-min"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"-2"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"2"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-min"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"0"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"4"
-0 0 24 29 1 #"\n"
-0 0 24 3 9 #"         "
-0 0 23 3 10 #"#:out-file"
-0 0 24 3 2 #" ("
-0 0 14 3 10 #"build-path"
-0 0 24 3 2 #" ("
-0 0 14 3 16 #"find-system-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 8 #"temp-dir"
-0 0 24 3 2 #") "
-0 0 19 3 9 #"\"sqr.png\""
-0 0 24 3 3 #")))"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 49 #"\"-----------------------------------------------\""
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 1 #"\""
-0 0 19 3 28 #"Testing plot3d's #:out-file\""
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 2 #"  "
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  ("
-0 0 14 3 9 #"displayln"
-0 0 24 29 1 #"\n"
-0 0 24 3 4 #"   ("
-0 0 14 3 6 #"plot3d"
-0 0 24 3 2 #" ("
-0 0 14 3 7 #"surface"
-0 0 24 3 1 #" "
-0 0 14 3 4 #"trig"
-0 0 24 3 1 #" "
-0 0 23 3 9 #"#:samples"
-0 0 24 3 1 #" "
-0 0 21 3 2 #"20"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:width"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"2"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:color"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"blue"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 11 #"           "
-0 0 23 3 7 #"#:x-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-3.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:x-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"3.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-3.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:y-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"3.5"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:z-min"
-0 0 24 3 1 #" "
-0 0 21 3 4 #"-1.0"
-0 0 24 3 1 #" "
-0 0 23 3 7 #"#:z-max"
-0 0 24 3 1 #" "
-0 0 21 3 3 #"1.5"
-0 0 24 29 1 #"\n"
-0 0 24 3 11 #"           "
-0 0 23 3 10 #"#:out-file"
-0 0 24 3 2 #" ("
-0 0 14 3 10 #"build-path"
-0 0 24 3 2 #" ("
-0 0 14 3 16 #"find-system-path"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 8 #"temp-dir"
-0 0 24 3 2 #") "
-0 0 19 3 10 #"\"trig.png\""
-0 0 24 3 3 #")))"
-0 0 24 29 1 #"\n"
-0 0 24 3 3 #"  )"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 49 #"\"===============================================\""
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 14 #"\"Testing plot\""
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 14 3 9 #"run-tests"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 4 #"plot"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 49 #"\"===============================================\""
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 14 3 9 #"displayln"
-0 0 24 3 1 #" "
-0 0 19 3 21 #"\"Testing plot/compat\""
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0 0 24 3 1 #"("
-0 0 14 3 9 #"run-tests"
-0 0 24 3 1 #" "
-0 0 21 3 1 #"'"
-0 0 14 3 11 #"plot/compat"
-0 0 24 3 1 #")"
-0 0 24 29 1 #"\n"
-0           0
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/extreme-bounds-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/extreme-bounds-tests.rkt
deleted file mode 100644
index 2f2c1432ef..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/extreme-bounds-tests.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang racket
-
-(require plot plot/utils unstable/flonum)
-
-(module+ test
-  (module config info
-    (define timeout 150)))
-
-(printf "Point at 0,0:~n")
-(plot (points '(#(0 0)))
-      #:x-min +min.0 #:x-max (flstep +min.0 1000)
-      #:y-min 0 #:y-max 1)
-
-(printf "Point at 0,0,0:~n")
-(plot3d (points3d '(#(0 0 0)))
-      #:x-min +min.0 #:x-max (flstep +min.0 1000)
-      #:y-min 0 #:y-max 1 #:z-min 0 #:z-max 1)
-
-(printf "Steps should appear all the way from the bottom to the top:~n")
-(plot (function exact->inexact (flstep 0.0 -1) (flstep 0.0 2)))
-
-(printf "Steps should appear all the way from the bottom to the top:~n")
-(plot3d (surface3d (λ (x y) (exact->inexact x))
-                   (flstep 0.0 -1) (flstep 0.0 2)
-                   (flstep 0.0 -1) (flstep 0.0 2)))
-
-(plot-x-label #f)
-(plot-y-label #f)
-
-(define stops (list (* 2 (inexact->exact -max.0))
-                    -max.0 -min.0 0.0 +min.0 +max.0
-                    (* 2 (inexact->exact +max.0))))
-
-(define (extreme-real->string x)
-  (real->plot-label x (digits-for-range 0 (abs x))))
-
-(define num-2d 0)
-(time
- (for ([x-min  (in-list stops)]
-       [x-max  (in-list (rest stops))]
-       #:when #t
-       [y-min  (in-list stops)]
-       [y-max  (in-list (rest stops))])
-   (displayln
-    (list (format "[~a,~a] × [~a,~a]"
-                  (extreme-real->string x-min) (extreme-real->string x-max)
-                  (extreme-real->string y-min) (extreme-real->string y-max))
-          (time (plot (lines (list (vector x-min y-min)
-                                   (vector x-max y-max)))))))
-   (set! num-2d (+ 1 num-2d))))
-
-(printf "Total 2D plots: ~a~n" num-2d)
-(printf "-----------------------------------------~n")
-
-(define num-3d 0)
-
-(time
- (for ([x-min  (in-list stops)]
-       [x-max  (in-list (rest stops))]
-       #:when #t
-       [y-min  (in-list stops)]
-       [y-max  (in-list (rest stops))]
-       #:when #t
-       [z-min  (in-list stops)]
-       [z-max  (in-list (rest stops))])
-   (displayln
-    (list (format "[~a,~a] × [~a,~a] × [~a,~a]"
-                  (extreme-real->string x-min) (extreme-real->string x-max)
-                  (extreme-real->string y-min) (extreme-real->string y-max)
-                  (extreme-real->string z-min) (extreme-real->string z-max))
-          (time (plot3d (lines3d (list (vector x-min y-min z-min)
-                                       (vector x-max y-max z-max)))))))
-   (set! num-3d (+ 1 num-3d))))
-
-(printf "Total plots: ~a~n" num-3d)
-(printf "-----------------------------------------~n")
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/isosurface-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/isosurface-tests.rkt
deleted file mode 100644
index 0293ba728e..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/isosurface-tests.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang racket
-
-(require plot plot/utils unstable/flonum)
-
-(time
- (plot3d (isosurface3d (λ (x y z) (sqrt (+ (sqr x) (sqr y) (sqr z)))) 1
-                       #:color 2 #:line-style 'transparent
-                       #:label "Sphere")
-         #:x-min -0.8 #:x-max 0.8
-         #:y-min -0.8 #:y-max 0.8
-         #:z-min -0.8 #:z-max 0.8
-         #:altitude 30
-         #:legend-anchor 'center))
-
-(time
- (define saddle (λ (x y z) (- (sqr x) (* 1/2 (+ (sqr y) (sqr z))))))
- (plot3d (isosurfaces3d saddle #:d-min -1 #:d-max 1 #:label "d")
-         #:x-min -2 #:x-max 2
-         #:y-min -2 #:y-max 2
-         #:z-min -2 #:z-max 2
-         #:legend-anchor 'top-left))
-
-(time
- (define saddle (λ (x y z) (- (sqr x) (* 1/2 (+ (sqr y) (sqr z))))))
- (plot3d (isosurfaces3d saddle #:d-min -1 #:d-max 1
-                        #:colors '(1 2 3)
-                        #:line-colors '(1 2 3)
-                        #:line-styles '(solid)
-                        #:alphas '(3/4)
-                        #:label "d")
-         #:x-min -2 #:x-max 2
-         #:y-min -2 #:y-max 2
-         #:z-min -2 #:z-max 2
-         #:legend-anchor 'top-left))
-
-(time
- (define saddle (λ (x y z) (- (sqr x) (* 1/2 (+ (sqr y) (sqr z))))))
- (plot3d (isosurface3d saddle -1/4 #:samples 21
-                       #:color "black" #:style 3
-                       #:alpha 1
-                       #:label "d = -1/4")
-         #:x-min -2 #:x-max 2
-         #:y-min -2 #:y-max 2
-         #:z-min -2 #:z-max 2))
-
-(define 2pi (* 2 pi))
-
-(time
- (define (f1 θ ρ) (+ 1 (/ θ 2pi) (* 1/8 (sin (* 8 ρ)))))
- (define (f2 θ ρ) (+ (/ θ 2pi) (* 1/8 (sin (* 8 ρ)))))
- (plot3d (list (polar3d f1 #:samples 41 #:color "navajowhite" #:line-style 'transparent #:alpha 2/3)
-               (polar3d f2 #:samples 41 #:color "navajowhite" #:line-style 'transparent #:alpha 2/3)
-               (parametric3d (λ (ρ) (3d-polar->3d-cartesian 0 ρ (f1 2pi ρ)))
-                             (* -1/2 pi) (* 1/2 pi)
-                             #:color "navajowhite" #:width 2)
-               (lines3d '(#(0 0 2) #(0 0 -2)) #:color "navajowhite" #:width 2))
-         #:title "A Seashell" #:x-label #f #:y-label #f #:angle 210 #:altitude 30))
-
-(define flepsilon (flnext 0.0))
-
-(time
- (plot3d (isosurface3d (λ (x y z) (+ (sqr x) (sqr y) (sqr z))) (sqr (inexact->exact flepsilon))
-                       (- flepsilon) flepsilon (- flepsilon) flepsilon (- flepsilon) flepsilon)))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/low-level-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/low-level-tests.rkt
deleted file mode 100644
index b8c0c775cf..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/low-level-tests.rkt
+++ /dev/null
@@ -1,361 +0,0 @@
-#lang racket
-
-(require rackunit racket/date
-         plot plot/utils
-         plot/private/common/utils
-         (only-in plot/private/common/math
-                  vector-andmap
-                  vector-ormap)
-         (only-in plot/private/common/date-time
-                  utc-seconds-round-year
-                  utc-seconds-round-month
-                  seconds-per-minute
-                  seconds-per-hour
-                  seconds-per-day
-                  seconds-per-week)
-         (only-in plot/private/common/format
-                  int-str->e-str frac-str->e-str)
-         plot/private/common/worker-thread)
-
-(check-equal? (linear-seq 1 1 2) '(1 1))
-(check-equal? (linear-seq 0 1 2 #:start? #t #:end? #t) '(0 1))
-(check-equal? (linear-seq 0 1 2 #:start? #t #:end? #f) '(0 2/3))
-(check-equal? (linear-seq 0 1 2 #:start? #f #:end? #t) '(1/3 1))
-(check-equal? (linear-seq 0 1 2 #:start? #f #:end? #f) '(1/4 3/4))
-(check-equal? (linear-seq 1 0 2 #:start? #t #:end? #t) '(1 0))
-(check-equal? (linear-seq 1 0 2 #:start? #t #:end? #f) '(1 1/3))
-(check-equal? (linear-seq 1 0 2 #:start? #f #:end? #t) '(2/3 0))
-(check-equal? (linear-seq 1 0 2 #:start? #f #:end? #f) '(3/4 1/4))
-
-(check-exn exn:fail:contract?
-           (λ () (vector-field (λ (v [z 0]) v) -4 4 -4 4))
-           "Exception should be 'two of the clauses in the or/c might both match' or similar")
-
-;; ===================================================================================================
-;; Formatting
-
-(check-equal? (int-str->e-str "") "0")
-(check-equal? (int-str->e-str "0") "0")
-(check-equal? (int-str->e-str "10") "1×10\u00b9")
-
-(check-equal? (frac-str->e-str "") "0")
-(check-equal? (frac-str->e-str "0") "0")
-(check-equal? (frac-str->e-str "00") "0")
-(check-equal? (frac-str->e-str "1") "1×10\u207b\u00b9")
-(check-equal? (frac-str->e-str "01") "1×10\u207b\u00b2")
-
-;; ===================================================================================================
-;; Date rounding
-
-(check-equal? (utc-seconds-round-year (find-seconds 0 0 12 2 7 1970 #f))
-              (find-seconds 0 0 0 1 1 1970 #f))
-(check-equal? (utc-seconds-round-year (find-seconds 0 0 13 2 7 1970 #f))
-              (find-seconds 0 0 0 1 1 1971 #f))
-;; A leap year's middle is a half day earlier on the calendar:
-(check-equal? (utc-seconds-round-year (find-seconds 0 0 0 2 7 1976 #f))
-              (find-seconds 0 0 0 1 1 1976 #f))
-(check-equal? (utc-seconds-round-year (find-seconds 0 0 1 2 7 1976 #f))
-              (find-seconds 0 0 0 1 1 1977 #f))
-
-(check-equal? (utc-seconds-round-month (find-seconds 0 0 0 16 1 2010 #f))
-              (find-seconds 0 0 0 1 1 2010 #f))
-(check-equal? (utc-seconds-round-month (find-seconds 0 0 0 17 1 2010 #f))
-              (find-seconds 0 0 0 1 2 2010 #f))
-(check-equal? (utc-seconds-round-month (find-seconds 0 0 12 16 1 2010 #f))
-              (find-seconds 0 0 0 1 1 2010 #f))
-(check-equal? (utc-seconds-round-month (find-seconds 0 0 13 16 1 2010 #f))
-              (find-seconds 0 0 0 1 2 2010 #f))
-(check-equal? (utc-seconds-round-month (find-seconds 0 0 0 16 12 2010 #f))
-              (find-seconds 0 0 0 1 12 2010 #f))
-(check-equal? (utc-seconds-round-month (find-seconds 0 0 0 17 12 2010 #f))
-              (find-seconds 0 0 0 1 1 2011 #f))
-
-;; ===================================================================================================
-;; Time conversion
-
-(check-equal? (seconds->plot-time 0)                (plot-time 0 0 0 0))
-(check-equal? (seconds->plot-time #e59.999999)      (plot-time #e59.999999 0 0 0))
-(check-equal? (seconds->plot-time 60)               (plot-time 0 1 0 0))
-(check-equal? (seconds->plot-time #e60.000001)      (plot-time #e0.000001 1 0 0))
-(check-equal? (seconds->plot-time #e119.999999)     (plot-time #e59.999999 1 0 0))
-(check-equal? (seconds->plot-time 120)              (plot-time 0 2 0 0))
-(check-equal? (seconds->plot-time #e120.000001)     (plot-time #e0.000001 2 0 0))
-(check-equal? (seconds->plot-time 3599)             (plot-time 59 59 0 0))
-(check-equal? (seconds->plot-time 3600)             (plot-time 0 0 1 0))
-(check-equal? (seconds->plot-time 3601)             (plot-time 1 0 1 0))
-(check-equal? (seconds->plot-time (- seconds-per-day 1))         (plot-time 59 59 23 0))
-(check-equal? (seconds->plot-time seconds-per-day)               (plot-time 0 0 0 1))
-(check-equal? (seconds->plot-time (- seconds-per-day))           (plot-time 0 0 0 -1))
-(check-equal? (seconds->plot-time (- (- seconds-per-day) 1))     (plot-time 59 59 23 -2))
-
-(define sec-secs (sequence->list (in-range -60 61 #e0.571123)))
-(define min-secs (sequence->list (in-range (- seconds-per-hour) (+ seconds-per-hour 1)
-                                           (* #e0.571123 seconds-per-minute))))
-(define hour-secs (sequence->list (in-range (- seconds-per-day) (+ seconds-per-day 1)
-                                            (* #e0.571123 seconds-per-hour))))
-(define day-secs (sequence->list (in-range (- seconds-per-week) (+ seconds-per-week 1)
-                                           (* #e0.571123 seconds-per-day))))
-(check-equal? (map (compose plot-time->seconds seconds->plot-time) sec-secs) sec-secs)
-(check-equal? (map (compose plot-time->seconds seconds->plot-time) min-secs) min-secs)
-(check-equal? (map (compose plot-time->seconds seconds->plot-time) hour-secs) hour-secs)
-(check-equal? (map (compose plot-time->seconds seconds->plot-time) day-secs) day-secs)
-
-;; ===================================================================================================
-;; Intervals
-
-(check-false (ivl-rational? (ivl #f #f)))
-(check-false (ivl-rational? (ivl +nan.0 +nan.0)))
-
-(check-true (ivl-empty? (ivl-meet empty-ivl (ivl 0 3))))
-
-;;; ivl-meet (similar to an intersection)
-
-;; All specified
-(check-true (ivl-empty? (ivl-meet (ivl 0 1) (ivl 2 3))))
-(check-equal? (ivl-meet (ivl 0 2) (ivl 1 3)) (ivl 1 2))
-(check-equal? (ivl-meet (ivl 0 3) (ivl 1 2)) (ivl 1 2))
-
-;; One not specified
-;; <--- 1    2 -- 3
-(check-true (ivl-empty? (ivl-meet (ivl #f 1) (ivl 2 3))))
-;; 0 -- 1    2 --->
-(check-true (ivl-empty? (ivl-meet (ivl 0 1) (ivl 2 #f))))
-;; <-------- 2
-;;      1 ------- 3
-(check-equal? (ivl-meet (ivl #f 2) (ivl 1 3)) (ivl 1 2))
-;;           2 --->
-;; 0 ------------ 3
-(check-equal? (ivl-meet (ivl 2 #f) (ivl 0 3)) (ivl 2 3))
-;; <------------- 3
-;;      1 -- 2
-(check-equal? (ivl-meet (ivl #f 3) (ivl 1 2)) (ivl 1 2))
-;; 0 ------------->
-;;      1 -- 2
-(check-equal? (ivl-meet (ivl 0 #f) (ivl 1 2)) (ivl 1 2))
-
-;; Two not specified
-;; <--- 1    2 --->
-(check-true (ivl-empty? (ivl-meet (ivl #f 1) (ivl 2 #f))))
-;; <-------------->
-;;      1 -- 2
-(check-equal? (ivl-meet (ivl #f #f) (ivl 1 2)) (ivl 1 2))
-;;      1 -------->
-;; <-------- 2
-(check-equal? (ivl-meet (ivl 1 #f) (ivl #f 2)) (ivl 1 2))
-;; <-------- 2
-;; <------------- 3
-(check-equal? (ivl-meet (ivl #f 2) (ivl #f 3)) (ivl #f 2))
-;; 0 ------------->
-;;      1 -------->
-(check-equal? (ivl-meet (ivl 0 #f) (ivl 1 #f)) (ivl 1 #f))
-
-;; Three not specified
-;; <-------------->
-;;      1 -------->
-(check-equal? (ivl-meet (ivl #f #f) (ivl 1 #f)) (ivl 1 #f))
-;; <-------------->
-;; <-------- 2
-(check-equal? (ivl-meet (ivl #f #f) (ivl #f 2)) (ivl #f 2))
-
-;; Four not specified
-(check-equal? (ivl-meet (ivl #f #f) (ivl #f #f)) (ivl #f #f))
-
-;; One infinite
-;; <--- 1    2 -- 3
-(check-true (ivl-empty? (ivl-meet (ivl -inf.0 1) (ivl 2 3))))
-;; 0 -- 1    2 --->
-(check-true (ivl-empty? (ivl-meet (ivl 0 1) (ivl 2 +inf.0))))
-;; <-------- 2
-;;      1 ------- 3
-(check-equal? (ivl-meet (ivl -inf.0 2) (ivl 1 3)) (ivl 1 2))
-;;           2 --->
-;; 0 ------------ 3
-(check-equal? (ivl-meet (ivl 2 +inf.0) (ivl 0 3)) (ivl 2 3))
-;; <------------- 3
-;;      1 -- 2
-(check-equal? (ivl-meet (ivl -inf.0 3) (ivl 1 2)) (ivl 1 2))
-;; 0 ------------->
-;;      1 -- 2
-(check-equal? (ivl-meet (ivl 0 +inf.0) (ivl 1 2)) (ivl 1 2))
-
-;; Two infinite
-;; <--- 1    2 --->
-(check-true (ivl-empty? (ivl-meet (ivl -inf.0 1) (ivl 2 +inf.0))))
-;; <-------------->
-;;      1 -- 2
-(check-equal? (ivl-meet (ivl -inf.0 +inf.0) (ivl 1 2)) (ivl 1 2))
-;;      1 -------->
-;; <-------- 2
-(check-equal? (ivl-meet (ivl 1 +inf.0) (ivl -inf.0 2)) (ivl 1 2))
-;; <-------- 2
-;; <------------- 3
-(check-equal? (ivl-meet (ivl -inf.0 2) (ivl -inf.0 3)) (ivl -inf.0 2))
-;; 0 ------------->
-;;      1 -------->
-(check-equal? (ivl-meet (ivl 0 +inf.0) (ivl 1 +inf.0)) (ivl 1 +inf.0))
-
-;; Three infinite
-;; <-------------->
-;;      1 -------->
-(check-equal? (ivl-meet (ivl -inf.0 +inf.0) (ivl 1 +inf.0)) (ivl 1 +inf.0))
-;; <-------------->
-;; <-------- 2
-(check-equal? (ivl-meet (ivl -inf.0 +inf.0) (ivl -inf.0 2)) (ivl -inf.0 2))
-
-;; Four infinite
-(check-equal? (ivl-meet (ivl -inf.0 +inf.0) (ivl -inf.0 +inf.0)) (ivl -inf.0 +inf.0))
-
-;;; ivl-join (similar to a union)
-
-(check-true (ivl-empty? (ivl-join empty-ivl empty-ivl)))
-(check-equal? (ivl-join empty-ivl (ivl 0 3)) (ivl 0 3))
-
-;; All specified
-(check-equal? (ivl-join (ivl 0 1) (ivl 2 3)) (ivl 0 3))
-(check-equal? (ivl-join (ivl 0 2) (ivl 1 3)) (ivl 0 3))
-(check-equal? (ivl-join (ivl 0 3) (ivl 1 2)) (ivl 0 3))
-
-;; One not specified
-;; <--- 1    2 -- 3
-(check-equal? (ivl-join (ivl #f 1) (ivl 2 3)) (ivl 2 3))
-;; 0 -- 1    2 --->
-(check-equal? (ivl-join (ivl 0 1) (ivl 2 #f)) (ivl 0 1))
-;; <-------- 2
-;;      1 ------- 3
-(check-equal? (ivl-join (ivl #f 2) (ivl 1 3)) (ivl 1 3))
-;;           2 --->
-;; 0 ------------ 3
-(check-equal? (ivl-join (ivl 2 #f) (ivl 0 3)) (ivl 0 3))
-;; <------------- 3
-;;      1 -- 2
-(check-equal? (ivl-join (ivl #f 3) (ivl 1 2)) (ivl 1 3))
-;; 0 ------------->
-;;      1 -- 2
-(check-equal? (ivl-join (ivl 0 #f) (ivl 1 2)) (ivl 0 2))
-
-;; Two not specified
-;; <--- 1    2 --->
-(check-equal? (ivl-join (ivl #f 1) (ivl 2 #f)) (ivl 1 2))
-;; <-------------->
-;;      1 -- 2
-(check-equal? (ivl-join (ivl #f #f) (ivl 1 2)) (ivl 1 2))
-;;      1 -------->
-;; <-------- 2
-(check-equal? (ivl-join (ivl 1 #f) (ivl #f 2)) (ivl 1 2))
-;; <-------- 2
-;; <------------- 3
-(check-equal? (ivl-join (ivl #f 2) (ivl #f 3)) (ivl #f 3))
-;; 0 ------------->
-;;      1 -------->
-(check-equal? (ivl-join (ivl 0 #f) (ivl 1 #f)) (ivl 0 #f))
-
-;; Three not specified
-;; <-------------->
-;;      1 -------->
-(check-equal? (ivl-join (ivl #f #f) (ivl 1 #f)) (ivl 1 #f))
-;; <-------------->
-;; <-------- 2
-(check-equal? (ivl-join (ivl #f #f) (ivl #f 2)) (ivl #f 2))
-
-;; Four not specified
-(check-equal? (ivl-join (ivl #f #f) (ivl #f #f)) (ivl #f #f))
-
-;; One infinite
-;; <--- 1    2 -- 3
-(check-equal? (ivl-join (ivl -inf.0 1) (ivl 2 3)) (ivl -inf.0 3))
-;; 0 -- 1    2 --->
-(check-equal? (ivl-join (ivl 0 1) (ivl 2 +inf.0)) (ivl 0 +inf.0))
-;; <-------- 2
-;;      1 ------- 3
-(check-equal? (ivl-join (ivl -inf.0 2) (ivl 1 3)) (ivl -inf.0 3))
-;;           2 --->
-;; 0 ------------ 3
-(check-equal? (ivl-join (ivl 2 +inf.0) (ivl 0 3)) (ivl 0 +inf.0))
-;; <------------- 3
-;;      1 -- 2
-(check-equal? (ivl-join (ivl -inf.0 3) (ivl 1 2)) (ivl -inf.0 3))
-;; 0 ------------->
-;;      1 -- 2
-(check-equal? (ivl-join (ivl 0 +inf.0) (ivl 1 2)) (ivl 0 +inf.0))
-
-;; Two infinite
-;; <-------------->
-;;      1 -- 2
-(check-equal? (ivl-join (ivl -inf.0 +inf.0) (ivl 1 2)) (ivl -inf.0 +inf.0))
-;;      1 -------->
-;; <-------- 2
-(check-equal? (ivl-join (ivl 1 +inf.0) (ivl -inf.0 2)) (ivl -inf.0 +inf.0))
-;; <--- 1    2 --->
-(check-equal? (ivl-join (ivl -inf.0 1) (ivl 2 +inf.0)) (ivl -inf.0 +inf.0))
-;; <-------- 2
-;; <------------- 3
-(check-equal? (ivl-join (ivl -inf.0 2) (ivl -inf.0 3)) (ivl -inf.0 3))
-;; 0 ------------->
-;;      1 -------->
-(check-equal? (ivl-join (ivl 0 +inf.0) (ivl 1 +inf.0)) (ivl 0 +inf.0))
-
-;; Three infinite
-;; <-------------->
-;;      1 -------->
-(check-equal? (ivl-join (ivl -inf.0 +inf.0) (ivl 1 +inf.0)) (ivl -inf.0 +inf.0))
-;; <-------------->
-;; <-------- 2
-(check-equal? (ivl-join (ivl -inf.0 +inf.0) (ivl -inf.0 2)) (ivl -inf.0 +inf.0))
-
-;; Four infinite
-(check-equal? (ivl-join (ivl -inf.0 +inf.0) (ivl -inf.0 +inf.0)) (ivl -inf.0 +inf.0))
-
-;; ===================================================================================================
-;; Vectors
-
-(check-true (vector-andmap zero? #(0 0 0 0)))
-(check-false (vector-andmap zero? #(0 0 1 0)))
-
-(check-true (vector-andmap (λ (x y) (and (= x 1) (= y 2)))
-                           #(1 1 1 1)
-                           #(2 2 2 2)))
-(check-false (vector-andmap (λ (x y) (and (= x 1) (= y 2)))
-                            #(1 1 1 1)
-                            #(2 1 2 2)))
-
-(check-true (vector-ormap zero? #(0 0 1 0)))
-(check-false (vector-ormap zero? #(1 1 1 1)))
-
-(check-true (vector-ormap (λ (x y) (and (= x 1) (= y 2)))
-                          #(0 0 1 0)
-                          #(0 0 2 0)))
-(check-false (vector-ormap (λ (x y) (and (= x 1) (= y 2)))
-                           #(0 0 1 0)
-                           #(0 2 0 0)))
-
-;; ===================================================================================================
-;; Worker threads
-
-(let ()
-  (define wt (make-worker-thread (match-lambda
-                                   [(list x y z)  (sleep 0.1)
-                                                  (+ x y z)])))
-  
-  (collect-garbage)
-  (collect-garbage)
-  (check-true (worker-thread-waiting? wt))
-  (check-true (worker-thread-put wt (list 1 2 3)))
-  (check-true (worker-thread-working? wt))
-  (check-equal? (worker-thread-get wt) 6)
-  (check-true (worker-thread-put wt (list 1 2 3)))
-  (check-false (worker-thread-try-put wt (list 10 20 30)))
-  (check-exn exn? (λ () (worker-thread-put wt (list 10 20 30))))
-  (check-false (worker-thread-try-get wt))
-  (sleep 0.2)
-  (check-equal? (worker-thread-try-get wt) 6)
-  (check-true (worker-thread-put wt (list 10 20 30)))
-  (check-equal? (worker-thread-send wt (list 1 2 3)) 6)
-  (check-exn exn? (λ () (worker-thread-get wt)))
-  (check-false (worker-thread-try-get wt))
-  (check-true (worker-thread-try-put wt (list 1 2 3)))
-  (sleep 0.2)
-  (check-false (worker-thread-try-put wt (list 10 20 30)))
-  (check-equal? (worker-thread-wait wt) (void))
-  (check-true (worker-thread-put wt (list 1 2)))
-  (check-exn exn? (λ () (worker-thread-get wt)))
-  )
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/out-file-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/out-file-tests.rkt
deleted file mode 100644
index ab334fc5f5..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/out-file-tests.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket
-
-(require plot plot/utils)
-
-(define (norm mx my x y)
-  (exp (* -1/2 (+ (sqr (- x mx)) (sqr (- y my))))))
-
-(define (f x y)
-  (+ (* 1.1 (norm -1.5 -1.5 x y))
-     (* 2 (norm 1 1 x y))
-     (* 1.3 (norm 2 -2 x y))))
-
-(define (dest fn)
-  (build-path (find-system-path 'temp-dir) fn))
-
-(parameterize ([plot-title  "Survival Rate of Torsion Widgets"]
-               [plot-x-label "Torsion"]
-               [plot-y-label "Widgetyness"])
-  (time
-   (plot (contour-intervals f #:alphas '(0.5))
-         #:x-min -5 #:x-max 5 #:y-min -5 #:y-max 5
-         #:out-file (dest "contour-test.png")))
-  
-  (time
-   (plot (contour-intervals f)
-         #:x-min -5 #:x-max 5 #:y-min -5 #:y-max 5
-         #:out-file (dest "contour-test.ps")))
-  
-  (time
-   (plot (contour-intervals f #:alphas '(0.5))
-         #:x-min -5 #:x-max 5 #:y-min -5 #:y-max 5
-         #:out-file (dest "contour-test.pdf")))
-  
-  (time
-   (plot (contour-intervals f)
-         #:x-min -5 #:x-max 5 #:y-min -5 #:y-max 5
-         #:out-file (dest "contour-test.svg"))))
-
-(time
- (plot3d (contour-intervals3d f -5 5 -5 5 #:alphas '(1/4 3/4))
-         #:out-file (dest "contour3d-test.pdf")))
-
-(time
- (plot3d (contour-intervals3d f -5 5 -5 5 #:alphas '(1/4 3/4))
-         #:out-file (dest "contour3d-test.ps")))
-
-(time
- (plot3d (contour-intervals3d f -5 5 -5 5 #:alphas '(1/4 3/4))
-         #:out-file (dest "contour3d-test.svg")))
-
-(time
- (plot3d (contour-intervals3d f -5 5 -5 5 #:alphas '(1/4 3/4))
-         #:out-file (dest "contour3d-test.png")))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/pen-brush-hsv.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/pen-brush-hsv.rkt
deleted file mode 100644
index f8150a6481..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/pen-brush-hsv.rkt
+++ /dev/null
@@ -1,195 +0,0 @@
-#lang racket
-
-(require plot plot/utils)
-
-(define (rgb->hsv rgb)
-  (match-define (list r g b) (map (λ (x) (/ x 255)) rgb))
-  (define mx (max r g b))
-  (define mn (min r g b))
-  (define c (- mx mn))
-  (define h (* 60 (cond [(zero? c)  0]
-                        [(= mx r)   (/ (- g b) c)]
-                        [(= mx g)   (+ (/ (- b r) c) 2)]
-                        [(= mx b)   (+ (/ (- r g) c) 4)])))
-  (list (if (h . < . 0) (+ h 360) h)
-        (if (zero? mx) 0 (/ c mx))
-        mx))
-
-(define (hsv->rgb hsv)
-  (match-define (list h s v) hsv)
-  (define c (* v s))
-  (let ([h  (/ (real-modulo h 360) 60)])
-    (define x (* c (- 1 (abs (- (real-modulo h 2) 1)))))
-    (define-values (r g b)
-      (cond [(and (0 . <= . h) (h . < . 1))  (values c x 0)]
-            [(and (1 . <= . h) (h . < . 2))  (values x c 0)]
-            [(and (2 . <= . h) (h . < . 3))  (values 0 c x)]
-            [(and (3 . <= . h) (h . < . 4))  (values 0 x c)]
-            [(and (4 . <= . h) (h . < . 5))  (values x 0 c)]
-            [(and (5 . <= . h) (h . < . 6))  (values c 0 x)]))
-    (define m (- v c))
-    (list (* 255 (+ r m))
-          (* 255 (+ g m))
-          (* 255 (+ b m)))))
-
-(define pen-colors (sort (for/list ([i  (in-range 1 7)])
-                           (rgb->hsv (->pen-color i)))
-                         < #:key first))
-
-(define brush-colors (sort (for/list ([i  (in-range 1 7)])
-                             (rgb->hsv (->brush-color i)))
-                           < #:key first))
-
-(define (pen-hue-transform h)
-  (define x (/ h 60))
-  (* (- x (* 5/12 (sin (* (/ x 6) (* 3 pi))))) (/ 360 6)))
-
-(define (pen-saturation-transform h) 1)
-
-(define (pen-value-transform h)
-  (define x (/ h 60))
-  (+ 1/2 (* 1/6 (sin (* (/ x 6) (* 3 pi))))))
-
-(plot (list (points (map vector '(0 1 2 3 4 5 6) (append (map first pen-colors) (list 360))))
-            (function (λ (x) (* x 60)))
-            (function (λ (x) (pen-hue-transform (* x 60)))
-                      #:color 3))
-      #:title "Pen Hue")
-
-(plot (list (points (map vector '(0 1 2 3 4 5 6) (append (map second pen-colors)
-                                                         (list (second (first pen-colors))))))
-            (function (λ (x) (pen-saturation-transform (* x 60)))))
-      #:y-min 0 #:y-max 1
-      #:title "Pen Saturation")
-
-(plot (list (points (map vector '(0 1 2 3 4 5 6) (append (map third pen-colors)
-                                                         (list (third (first pen-colors))))))
-            (function (λ (x) (pen-value-transform (* x 60)))))
-      #:y-min 0 #:y-max 1
-      #:title "Pen Value")
-
-(define (integer->hue n)
-  (let ([n  (abs n)])
-    (define i (+ (case (remainder n 6) [(0) 0] [(1) 2] [(2) 4] [(3) 1] [(4) 3] [(5) 5])
-                 (* 6 3 (quotient n 6))))
-    (remainder (* i 59) 360)))
-
-(define (pen-color n)
-  (define h (integer->hue n))
-  (hsv->rgb (list (pen-hue-transform h) (pen-saturation-transform h) (pen-value-transform h))))
-
-(plot (for/list ([n  (in-range 60)])
-        (lines (list (vector 0 n) (vector 1 n))
-               #:color (pen-color n)
-               #:width 6)))
-
-(define (brush-hue-transform h)
-  (define x (/ h 60))
-  (define y (* (/ (- (sqrt (+ x 2)) (sqrt 2))
-                  (- (sqrt 8) (sqrt 2)))
-               6))
-  (* (- x (* 1/4 (sin (* (/ y 6) (* 3 pi))))) (/ 360 6)))
-
-(define (brush-saturation-transform h)
-  (define x (/ h 60))
-  (+ 3/16 (* 3/32 (sin (* (/ x 6) (* 2 pi))))))
-
-(define (brush-value-transform h) 1)
-
-(plot (list (points (map vector '(0 1 2 3 4 5 6) (append (map first brush-colors) (list 360))))
-            (function (λ (x) (* x 60)))
-            (function (λ (x) (brush-hue-transform (* x 60)))
-                      #:color 3))
-      #:title "Brush Hue")
-
-(plot (list (points (map vector '(0 1 2 3 4 5 6) (append (map second brush-colors)
-                                                         (list (second (first brush-colors))))))
-            (function (λ (x) (brush-saturation-transform (* x 60)))))
-      #:y-min 0 #:y-max 1
-      #:title "Brush Saturation")
-
-(plot (list (points (map vector '(0 1 2 3 4 5 6) (append (map third brush-colors)
-                                                         (list (third (first brush-colors))))))
-            (function (λ (x) (brush-value-transform (* x 60)))))
-      #:y-min 0 #:y-max 1
-      #:title "Brush Value")
-
-(define (brush-color n)
-  (define h (integer->hue n))
-  (hsv->rgb (list (brush-hue-transform h) (brush-saturation-transform h) (brush-value-transform h))))
-
-(define (integer->value n)
-  (* 1/7 (remainder (abs n) 8)))
-
-(define (pen-intensity-transform i)
-  (* 128 (expt (integer->value i) 3/4)))
-
-(define (brush-intensity-transform i)
-  (+ 127 (* 128 (expt (- 1 (integer->value i)) 3/4))))
-
-(define (gray-pen-color i)
-  (make-list 3 (pen-intensity-transform i)))
-
-(define (gray-brush-color i)
-  (make-list 3 (brush-intensity-transform i)))
-
-(plot (for/list ([n  (in-range 8)])
-        (function-interval sin (λ (x) (+ 1 (sin x))) n (+ 1 n)
-                           #:color (gray-brush-color n)
-                           #:line1-color (gray-pen-color n)
-                           #:line2-color (gray-pen-color n)
-                           #:line1-width 2 #:line2-width 2 #:alpha 1)))
-
-(define new-brush-colors
-  (append (list (gray-brush-color 0))
-          (build-list 120 brush-color)
-          (build-list 7 (λ (n) (gray-brush-color (- 7 n))))))
-
-(define new-pen-colors
-  (append (list (gray-brush-color 0))
-          (build-list 120 brush-color)
-          (build-list 7 (λ (n) (gray-brush-color (- 7 n))))))
-
-(plot (for/list ([n  (in-range 60)])
-        (lines (list (vector 0 n) (vector 1 n))
-               #:color (brush-color n)
-               #:width 6)))
-
-(plot (for*/list ([i  (in-range 6)] [j  (in-range 20)])
-        (define n (+ i (* j 6)))
-        (rectangles (list (vector (ivl (+ i 0.05) (+ i 0.95))
-                                  (ivl (+ j 0.05) (+ j 0.95))))
-                    #:color (brush-color n)
-                    #:line-color (pen-color n)
-                    #:line-width 3))
-      #:height 1200)
-
-(plot (list (for*/list ([n  (in-range 8)])
-              (rectangles (list (vector (ivl (+ n 0.05) (+ n 0.95))
-                                        (ivl 0 1)))
-                          #:color (->brush-color n)
-                          #:line-color (->pen-color n)
-                          #:line-width 3))
-            (for*/list ([n  (in-range 8)])
-              (rectangles (list (vector (ivl (+ n 0.05) (+ n 0.95))
-                                        (ivl 1.2 2.2)))
-                          #:color (brush-color (- n 1))
-                          #:line-color (pen-color (- n 1))
-                          #:line-width 3)))
-      #:height 200)
-
-(plot (for/list ([n  (in-range 12)])
-        (function-interval (λ (x) (* 1/2 (sqr (+ x (* 2 n)))))
-                           (λ (x) (+ 1/2 (sqr (+ x (* 2 n)))))
-                           0 12 #:color (brush-color n)
-                           #:line1-color (pen-color n)
-                           #:line2-color (pen-color n)
-                           #:line1-width 2 #:line2-width 2)))
-
-(plot (for/list ([n  (in-range 6)])
-        (function-interval (λ (x) (* 1/2 (sin (+ x n))))
-                           (λ (x) (+ 1/2 (sin (+ x n))))
-                           -4 4 #:color (->brush-color (+ n 1))
-                           #:line1-color (->pen-color (+ n 1))
-                           #:line2-color (->pen-color (+ n 1))
-                           #:line1-width 2 #:line2-width 2)))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/plot-bitmap.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/plot-bitmap.rkt
deleted file mode 100644
index 55bfc3076e..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/plot-bitmap.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket
-
-(require rackunit
-         plot/bitmap
-         racket/draw)
-
-(define sin.png (make-temporary-file "plot-bitmap-sin-test~a.png"))
-(check-true (is-a? (plot (function sin -4 4)
-                         #:out-file sin.png)
-                   bitmap%))
-(check-true (is-a? (read-bitmap sin.png) bitmap%))
-(delete-file sin.png)
-
-(define times.png (make-temporary-file "plot-bitmap-times-test~a.png"))
-(check-true (is-a? (plot3d (contour-intervals3d * -4 4 -4 4)
-                           #:out-file times.png)
-                   bitmap%))
-(check-true (is-a? (read-bitmap times.png) bitmap%))
-(delete-file times.png)
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/plot-no-gui.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/plot-no-gui.rkt
deleted file mode 100644
index ad4f2093dd..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/plot-no-gui.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket
-
-(require rackunit
-         plot/no-gui
-         pict
-         racket/draw)
-
-(check-true (pict? (plot-pict (function sin -4 4))))
-(check-true (pict? (plot3d-pict (contour-intervals3d * -4 4 -4 4))))
-
-(check-true (is-a? (plot-bitmap (function sin -4 4)) bitmap%))
-(check-true (is-a? (plot3d-bitmap (contour-intervals3d * -4 4 -4 4)) bitmap%))
-
-(define sin.png (make-temporary-file "plot-bitmap-sin-test~a.png"))
-(check-true (void? (plot-file (function sin -4 4) sin.png)))
-(check-true (is-a? (read-bitmap sin.png) bitmap%))
-(delete-file sin.png)
-
-(define times.png (make-temporary-file "plot-bitmap-times-test~a.png"))
-(check-true (void? (plot3d-file (contour-intervals3d * -4 4 -4 4) times.png)))
-(check-true (is-a? (read-bitmap times.png) bitmap%))
-(delete-file times.png)
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/plot-pict.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/plot-pict.rkt
deleted file mode 100644
index c38bbda683..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/plot-pict.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket
-
-(require rackunit
-         plot/pict
-         pict
-         racket/draw)
-
-(define sin.png (make-temporary-file "plot-bitmap-sin-test~a.png"))
-(check-true (pict? (plot (function sin -4 4)
-                         #:out-file sin.png)))
-(check-true (is-a? (read-bitmap sin.png) bitmap%))
-(delete-file sin.png)
-
-(define times.png (make-temporary-file "plot-bitmap-times-test~a.png"))
-(check-true (pict? (plot3d (contour-intervals3d * -4 4 -4 4)
-                           #:out-file times.png)))
-(check-true (is-a? (read-bitmap times.png) bitmap%))
-(delete-file times.png)
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/plot2d-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/plot2d-tests.rkt
deleted file mode 100644
index e0522a30ec..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/plot2d-tests.rkt
+++ /dev/null
@@ -1,488 +0,0 @@
-#lang racket
-
-(require rackunit plot plot/utils)
-
-;(plot-new-window? #t)
-
-(plot (function / -249 250))
-
-(time
- (define xs (build-list 10000 (λ _ (random))))
- (plot (density xs 1/2)))
-
-(printf "Plot should be empty:~n")
-(time
- (plot empty #:x-min -1 #:x-max 1 #:y-min -1 #:y-max 1))
-
-(printf "Plot should be empty:~n")
-(time
- (plot (points empty) #:x-min -1 #:x-max 1 #:y-min -1 #:y-max 1))
-
-(printf "Plot should be empty:~n")
-(plot (rectangles (list (list (ivl 0 1) (ivl 0 1))))
-      #:x-min 2 #:x-max 3)
-
-(plot (list (function values -4 4) (axes 1 2)))
-
-(time (plot (function values 0 1000)))
-
-(parameterize ([plot-x-transform  log-transform]
-               [plot-x-ticks      (log-ticks #:base 4)]
-               [plot-y-transform  log-transform]
-               [plot-y-ticks      (linear-ticks #:number 10)])
-  (plot (function values 1 243)))
-
-(parameterize ([plot-background  "black"]
-               [plot-foreground  "white"]
-               [plot-background-alpha  1/2]
-               [plot-foreground-alpha  1/2])
-  (plot (function sin -4 4 #:label "y = sin(x)")))
-
-(parameterize ([plot-x-transform  (hand-drawn-transform 200)]
-               [plot-y-transform  (hand-drawn-transform 200)])
-  (plot (function sqr -1 1)))
-
-(parameterize ([plot-x-transform  log-transform]
-               #;[plot-y-transform  log-transform])
-  (time
-   (plot (list (function (λ (x) x) 0.1 10 #:samples 2 #:label "y = x")
-               (polar-axes))
-         #:title "Nonlinear scaling" #:x-label "x axis" #:y-label "y-axis")))
-
-(define (degrees->point θ [r 1])
-  (vector (* r (cos (degrees->radians θ)))
-          (* r (sin (degrees->radians θ)))))
-
-(plot (list (lines (list (degrees->point 0)
-                         (degrees->point 120)
-                         (degrees->point 180 0)
-                         (degrees->point 240)
-                         (degrees->point 0)))
-            (polar (λ (θ) 1) #:color 0)))
-
-;(plot-x-transform cbrt-transform)
-;(plot-y-transform cbrt-transform)
-;(plot-x-transform (hand-drawn-transform 100))
-;(plot-y-transform (hand-drawn-transform 100))
-
-(time
- (plot (vector-field (λ (x y) (vector x y))
-                     -5 5 -5 5 #:scale 'auto)))
-
-(time
- (plot (vector-field (λ (x y) (vector (- y) x))
-                     -2 2 -1 4 #:scale 'normalized)))
-
-(time
- (plot (list (lines (for/list ([i  (in-range 6)])
-                      (degrees->point (* 2 72 i))))
-             (list (polar (λ (θ) 1) #:color 0)
-                   (polar (λ (θ) 0.38) #:color 0)))))
-
-(time
- (plot (list (lines (for/list ([i  (in-range 4)])
-                      (degrees->point (* 120 i))))
-             (lines (for/list ([i  (in-range 4)])
-                      (degrees->point (+ 60 (* 120 i)))))
-             (polar (λ (θ) 1) #:color 0)
-             (polar (λ (θ) 0.5) #:color 0))))
-
-(time
- (define xs (build-list 100 (λ _ (random))))
- (define ys (build-list 100 (λ _ (random))))
- (plot (list (points (map vector ys xs) #:sym 'full6star #:color 1)
-             (points (map vector xs ys) #:sym "B" #:color 3))))
-
-(printf "This plot should be blank:~n")
-(time
- (plot (vector-field (λ (x y) (vector +nan.0 +nan.0)))
-       #:x-min -2 #:x-max 2 #:y-min -2 #:y-max 2))
-
-#;; high-contrast white-on-black:
-(begin
-  (plot-foreground "white")
-  (plot-background "black")
-  (point-color "white")
-  (histogram-line-color "white")
-  (histogram-fill-color "black")
-  (contour-color "white"))
-
-;; an exact rational function and a floating-point function
-;; the plot of the exact rational function's graph should be smooth
-(time
- (parameterize ([plot-x-tick-label-angle 15])
-   (plot (list (function (λ (x) x) #:label "Exact")
-               (function (λ (x) (exact->inexact x)) #:color 2 #:label "Inexact"))
-         #:x-min #e100000000000000.0 #:x-max #e100000000000000.1
-         #:width 450)))
-
-(time
- (plot (function cos 0 0.0000001)
-       #:width 500))
-
-(time
- (plot (list (function sin #:label "Sine"
-                       #:color "Blue" #:style 'long-dash #:width 3)
-             (function sqr #:label "Square"))
-       #:x-min -3 #:x-max 3
-       #:legend-anchor 'top-left))
-
-(time
- (plot (list (axes)
-             (function sqr -2.1 2.1 #:label "x^2")
-             (error-bars (map (λ (x) (vector x (sqr x) (/ 1/2 (+ (abs x) 1))))
-                              (sequence->list (in-range -2 2.1 1/8)))
-                         #:x-min -1))))
-
-(time
- (plot (list (points '(#(1 1) #(2 2) #(3 3)) #:sym "bob" #:size 10
-                     #:x-min 2 #:x-max 3 #:y-min 1 #:y-max 3))
-       #:x-min 0 #:x-max 4 #:y-min 0 #:y-max 4))
-
-(time
- (plot (list (x-axis 1) (y-axis 1)
-             (function sqr #f 2 #:color 1)
-             (inverse sqr #:color 2)
-             (function values #:color 0 #:style 1))
-       #:x-min -2 #:y-min -1))
-
-(time
- (plot (list (polar-axes #:number 4)
-             (polar (λ (θ) (+ 0.5 (cos (* 1/2 θ)))) (* -2 pi) (* 2 pi)))))
-
-; draws both functions with x in [-1,1]
-(plot (list (function sqr #f 1)
-            (function (λ (x) (* 2 (sqr x))) -1 #f
-                      #:color "blue")
-            (axes 1 0 #:y-ticks? #f)))
-
-(printf "Plot should be empty:~n")
-(plot (list (function sqr #f -1)
-            (function sqr 1 #f)))
-
-; draws both functions with x in [-1,2] (meaning nothing is drawn)
-(printf "Plot should be empty:~n")
-(plot (list (function sqr #f -1)
-            (function sqr 2 #f)))
-
-; draws first function with x in [-2,-1]
-(plot (list (function sqr #f -1)
-            (function sqr 1 #f))
-      #:x-min -2)
-
-; draws second function with x in [1,2]
-(plot (list (function sqr #f -1)
-            (function sqr 1 #f))
-      #:x-max 2)
-
-; draws both functions with x in [-2,2]
-(plot (list (function sqr #f -1)
-            (function sqr 1 #f))
-      #:x-min -2 #:x-max 2)
-
-; draws both in full (particularly, without chopping off the top of the parabola), in [-2,2]
-(plot (list (function sqr)
-            (function sin -2 2)))
-
-(time
- (plot (list (discrete-histogram
-              (build-list 10 (λ (n) (vector (string-ref "abcdefghij" n)
-                                            (sqr n))))
-                        #:label "ord(x)^2")
-             (function truncate))))
-
-(time
- (plot (list (x-axis)
-             (discrete-histogram '((a -1) (b 2.6) (c 4) (d 3.1)) #:y-min #f
-                                 #:color 5 #:line-color 5 #:line-style 'long-dash
-                                 #:label "Corrupt")
-             (discrete-histogram '(#(a 1) #(b 2.6) #(c 4) #(d 3.1))
-                                 #:x-min 5
-                                 #:color 1 #:line-color 1 #:line-width 3
-                                 #:label "Clean"))
-       #:title "Widgetyness of Widgets"
-       #:x-label "Widget"
-       #:y-label "Widgetyness"
-       #:legend-anchor 'bottom-right))
-
-(time
- (plot (stacked-histogram '(#(a (1 1 1)) #(b (1.5 3)) #(c ()) #(d (1/2)))
-                          #:labels '("Red" #f "Blue"))))
-
-(time
- (parameterize ([discrete-histogram-gap  0]
-                [discrete-histogram-skip  3]
-                [rectangle-line-width 2])
-   (plot (list (discrete-histogram '(#(a 1) #(b 2.5) #(c 2)) #:label "Blue")
-               (discrete-histogram '(#(a 2) #(b 4) #(c 1)) #:x-min 2/3 #:color 1 #:line-color 1
-                                   #:label "Red")
-               (discrete-histogram '(#(a 3) #(b 3) #(c 2.5)) #:x-min 4/3 #:color 2 #:line-color 2
-                                   #:label "Green")))))
-
-(time
- (parameterize ([discrete-histogram-gap  0]
-                [discrete-histogram-skip  2]
-                [stacked-histogram-line-widths '(3)])
-   (plot (list (stacked-histogram '(#(a (0.2 1)) #(b (2.5 1.2)) #(c (2 0))))
-               (stacked-histogram '((a (2 1)) (b (1.1 0.9)) (c (1 1.1))) #:x-min 7/8
-                                  #:colors '(3 4)
-                                  #:line-colors '(3 4))))))
-
-(time
- (parameterize ([plot-x-ticks  (currency-ticks)])
-   (plot (discrete-histogram (list (vector '(a . a) 1) (vector '(a . b) 2)
-                                   (vector '(b . b) 3) (vector '(b . a) 4))
-                             #:invert? #t #:add-ticks? #f))))
-
-(time
- (parameterize ([plot-x-ticks  (currency-ticks)])
-   (plot (stacked-histogram (list (vector '(a . a) '(1 2 1)) (vector '(a . b) '(2 1 3))
-                                  (vector '(b . b) '()) (vector '(b . a) '(4 4 2)))
-                            #:invert? #t #:add-ticks? #f))))
-
-(time
- (plot (rectangles
-        (map vector
-             (bounds->intervals (map log (linear-seq 10 20 10)))
-             (build-list 9 (λ (n) (ivl (sqr n) (- (sqr n)))))))))
-
-(time
- (define (f x) (* (/ 1 (sqrt (* 2 pi)))
-                  (exp (* -1/2 (sqr x)))))
- (plot (list (area-histogram f (linear-seq -4 4 10))
-             (function f -4 4))))
-
-(time
- (plot (list (area-histogram sqr (map (λ (x) (* (sqrt x) (sqrt 8))) (linear-seq 0 8 10)))
-             (function sqr 0 8))))
-
-(time
- (define xs (build-list 10000 (λ _ (random))))
- (define ys (build-list 10000 (λ _ (random))))
- (plot (list
-        (points (map vector xs ys)
-                #:x-min -1 #:x-max 1 #:y-min 0.5 #:y-max 1
-                #:sym 'fullcircle #:size 6.5 #:alpha 1/8
-                #:label "Dots"))
-       #:y-max 1.5))
-
-(time
- (plot (vector-field (λ (x y) (vector x y)) -0.5 1.85 -5 0.5
-                     #:color "blue" #:line-width 2/3
-                     #:scale 'auto #:label "(vector x y)")
-       #:x-min -1 #:x-max 5))
-
-(time
- (plot (list (function (λ (x) (* 220 (cos (* 4 x)))) -2 2)
-             (function (λ (x) (* 200 (sin (* 3 x)))) 0 #f
-                       #:y-min -150 #:y-max 150
-                       #:color "blue"))
-       #:x-min -1/2 #:x-max 3))
-
-(time
- (plot (lines (reverse
-               (for/fold ([lst (list (vector 0 0))]) ([i  (in-range 1 400)])
-                 (match-define (vector x y) (first lst))
-                 (cons (vector i (+ y (* 1/100 (- (random) 1/2)))) lst)))
-              #:alpha 0.5 #:label "Random walk")))
-
-(time
- (plot (function (λ (x) (/ 1.0 (exact->inexact x))) -2 2)))
-
-(time
- (plot (parametric (λ (t) (vector (sin t) (cos t))) (- pi) pi
-                   #:x-min -0.5 #:y-max 0.5)
-       #:x-min -1))
-
-(time
- (plot (list (function sin -1/2 1)
-             (parametric (λ (t) (vector (cos t) (sin t))) -2 1
-                         #:color "blue" #:style 'short-dash))))
-
-(define (norm mx my x y)
-  (exp (* -1/2 (+ (sqr (- x mx)) (sqr (- y my))))))
-
-(define (f1 x y)
-  (+ (norm -1.5 -1.5 x y)
-     (* 2 (norm 1 1 x y))
-     (* 1.5 (norm 2 -2 x y))))
-
-(define (f2 x y)
-  (- (sqr x) (sqr y)))
-
-(time (plot (list (contours f1 0 5 #:label "Cyan/Redness")
-                  (contours f2 -5 0 #:colors '("blue") #:label "Blueness"
-                            #:widths '(2) #:styles '(dot)))
-            #:x-min -5 #:x-max 5 #:y-min -5 #:y-max 5))
-
-(printf "These two plots should be empty:~n")
-(plot (contours f2 -5 0) #:x-min 1 #:x-max 3 #:y-min 1 #:y-max 3)
-(plot (contour-intervals f2 -5 0) #:x-min 1 #:x-max 3 #:y-min 1 #:y-max 3)
-
-(time (plot (contour-intervals f1 -5 5 -5 5 #:label "z")))
-
-(time (plot (contour-intervals
-             (λ (x y)
-               (define z (- x y))
-               (cond [(< z -1) -1]
-                     [(> z 1)   1]
-                     [else      z]))
-             -2 2 -2 2)))
-
-(time (plot (list (tick-grid)
-                  (contour-intervals f1 -5 2 -5 2
-                                     #:levels 5
-                                     #:contour-styles '(transparent)
-                                     #:label "")
-                  (contours f1 -2 5 -2 5 #:levels 5 #:label ""))
-            #:x-min -5 #:x-max 5 #:y-min -5 #:y-max 5
-            #:legend-anchor 'center))
-
-(time (plot (list (tick-grid)
-                  (contour-intervals f1 -5 2 -5 2
-                                     #:levels '(0.25 0.5 0.75 1.0 1.25 1.5 1.75)
-                                     #:colors (compose default-contour-colors (curry map ivl-center))
-                                     #:styles '(0 1 2 3 4 5 6)
-                                     #:contour-styles '(transparent)
-                                     #:label "z")
-                  (contours f1 -2 5 -2 5 #:levels '(0.25 0.5 0.75 1.0 1.25 1.5 1.75)))
-            #:x-min -5 #:x-max 5 #:y-min -5 #:y-max 5
-            #:legend-anchor 'top-left))
-
-; tests contour 7-sided and 8-sided saddle facets
-; contour shading should line up with contour lines, no matter how weird
-(parameterize ([contour-samples  10])
-  (define (f x y) (sqr (sin (- x y))))
-  (time (plot (contour-intervals f)
-              #:x-min -5 #:x-max 5 #:y-min -5 #:y-max 5)))
-
-(time
- (define (f2 x) (sin (* x pi)))
- (plot (list (x-tick-lines)
-             (function-interval atan (λ (x) (- (atan x)))
-                                #:color 6 #:line1-color 6 #:line2-color 6)
-             (function-interval sqr f2 -1 1 #:alpha 0.5)
-             (function-label f2 -1/4 #:anchor 'top-left))))
-
-(time
- (define amps (linear-seq 1/4 1 8))
- (define colors (color-seq* '("darkred" "white" "darkblue") 7))
- (plot (flatten
-        (list
-         (x-tick-lines)
-         (for/list ([a1     (in-list amps)]
-                    [a2     (in-list (rest amps))]
-                    [color  (in-list colors)])
-           (inverse-interval (λ (y) (* a1 (sin y)))
-                             (λ (y) (* a2 (sin y)))
-                             (- pi) pi #:color color #:alpha 1
-                             #:label (format "f(~a,~a)" a1 a2)))
-         (y-tick-lines)
-         (inverse-label (λ (y) (* 1/4 (sin y))) (* -1/2 pi)
-                        "x = 1/4 sin(y)")))
-       #:legend-anchor 'top-left))
-
-(time
- (define a #(0 0))
- (define b #(1 1/2))
- (define c #(0 1))
- (define d #(1 3/2))
- (plot (list
-        (tick-grid)
-        (lines-interval (list a b) (list c d)
-                        #:color 4 #:line1-color 4 #:line2-color 4
-                        #:label "Parallelogram")
-        (point-label #(1/2 5/4) #:anchor 'bottom-right #:alpha 0.5))
-       #:legend-anchor 'bottom-left))
-
-(time
- (define (fa t) (vector (* 2 (cos (* 4/5 t))) (* 2 (sin (* 4/5 t)))))
- (define (fb t) (vector (cos t) (sin t)))
- (define (fc t) (vector (* 1/2 (cos (* 4/5 t))) (* 1/2 (sin (* 4/5 t)))))
- (define t1 (- pi))
- (define t2 pi)
- (plot (list
-        (x-tick-lines)
-        (lines (list (fa t1) (fb t1) (vector +nan.0 +nan.0) (fb t1) (fc t1))
-               #:color "black" #:style 'dot)
-        (lines (list (fa t2) (fb t2) (vector +nan.0 +nan.0) (fb t2) (fc t2))
-               #:color "black" #:style 'dot)
-        (parametric fa t1 t2 #:color 5 #:label "fa")
-        (parametric-interval fa fb t1 t2 #:color 5 #:label "(fa,fb)"
-                             #:line1-style 'transparent
-                             #:line2-style 'transparent)
-        (parametric fb t1 t2 #:color 1 #:label "fb")
-        (parametric-interval fb fc t1 t2 #:color 2 #:label "(fb,fc)"
-                             #:line1-style 'transparent
-                             #:line2-style 'transparent)
-        (parametric fc t1 t2 #:color 2 #:label "fc")
-        (x-axis #:ticks? #f)
-        (parametric-label fa t1 "fa(-π)"
-                          #:size 14 #:anchor 'left #:point-size 5)
-        (parametric-label fa t2 "fa(π)"
-                          #:size 14 #:anchor 'left #:point-size 5))
-       #:legend-anchor 'top-right))
-
-(time
- (define (f1 θ) (+ 1/2 (* 1/6 (cos (* 5 θ)))))
- (define (f2 θ) (+ 1 (* 1/4 (cos (* 10 θ)))))
- (plot (list (polar-axes #:number 10)
-             (polar-interval f1 f2
-                             #:color 3 #:label "[f1,f2]"
-                             #:line1-color 1 #:line1-width 2 #:line1-style 'dot
-                             #:line2-color 2 #:line2-width 2)
-             (polar-label f1 0 #:anchor 'top-left)
-             (polar-label f2 (degrees->radians 36) #:anchor 'bottom-right)
-             (point-label #(1/2 1/2)))))
-
-(time
- (define (f1 θ) (/ θ pi 2))
- (define (f2 θ) (+ (/ θ pi 2) 1))
- (plot (list (tick-grid)
-             (polar-interval f1 f2 0 (* 5 pi)
-                             #:color 4 #:alpha 3/4
-                             #:line1-color 1 #:line2-color 1
-                             #:label "[f1,f2]"))
-       #:legend-anchor 'center))
-
-(time
- (define ((make-fun y) x)
-   (+ y (sqr x)))
- 
- (values
-  (plot (build-list
-         20 (λ (n) (function (make-fun n) #:color n #:style n #:width 2)))
-        #:x-min -2 #:x-max 2)
-  
-  (plot (list
-         (tick-grid)
-         (function-interval (λ (x) 0) (λ (x) 16) #:color "black" #:alpha 1/20)
-         (build-list
-          12 (λ (n) (function-interval
-                     (make-fun n) (make-fun (add1 n)) -2 0
-                     #:color (->pen-color n) #:style n #:alpha 1
-                     #:line1-style 'transparent #:line2-style 'transparent)))
-         (build-list
-          12 (λ (n) (function-interval
-                     (make-fun n) (make-fun (add1 n)) 0 2
-                     #:color n
-                     #:line1-style 'transparent #:line2-style 'transparent)))
-         (build-list
-          13 (λ (n) (function (make-fun n) -2 0
-                              #:color n #:width 2)))
-         (build-list
-          13 (λ (n) (function (make-fun n) 0 2
-                              #:color n #:width 2 #:style n))))
-        #:x-min -2 #:x-max 2)))
-
-(time
- (define (f x) (/ (sin x) x))
- (parameterize ([plot-x-transform  (stretch-transform -1 1 10)]
-                [plot-x-ticks      (ticks-add (plot-x-ticks) '(-1 1))]
-                [plot-y-ticks      (fraction-ticks)])
-   (plot (list (y-axis -1 #:ticks? #f) (y-axis 1 #:ticks? #f)
-               (function f -1 1 #:width 2 #:color 4)
-               (function f -14 -1 #:color 4 #:label "y = sin(x)/x")
-               (function f 1 14 #:color 4)
-               (point-label (vector 0 1) "y → 1 as x → 0" #:anchor 'bottom-right))
-         #:y-max 1.2)))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/plot3d-bsp-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/plot3d-bsp-tests.rkt
deleted file mode 100644
index 4fbe061bc9..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/plot3d-bsp-tests.rkt
+++ /dev/null
@@ -1,151 +0,0 @@
-#lang racket
-
-(require plot
-         (except-in plot/utils sum flsum sample)
-         math
-         profile
-         contract-profile)
-
-#;; Test under crazy transformation
-(begin
-  (plot-x-transform cbrt-transform)
-  (plot-y-transform cbrt-transform)
-  (plot-z-transform cbrt-transform))
-
-(plot3d (list (contour-intervals3d * -1 1 -1 1 #:samples 2)
-              (isosurface3d (λ (x y z) z)
-                              0 -1 1 -1 1 -1 1
-                              #:samples 2 #:color 3)))
-
-(plot3d (list (parametric3d (λ (t)
-                              (list (* 0.5 (cos (* 2 pi (- t))))
-                                    (* 0.5 (sin (* 2 pi (- t))))
-                                    t))
-                            -1 1
-                            #:samples 53
-                            #:color "green"
-                            #:width 15
-                            #:alpha 0.6)
-              (parametric3d (λ (t)
-                              (list (* 0.75 (cos (* 2 pi t)))
-                                    (* 0.75 (sin (* 2 pi t)))
-                                    t))
-                            -1 1
-                            #:samples 53
-                            #:color "red"
-                            #:width 15
-                            #:alpha 0.6)))
-
-(plot3d (list (isosurface3d (λ (x y z) (+ x y z)) 0 -1 1 -1 1 -1 1
-                            #:samples 2
-                            #:line-width 2)
-              (isosurface3d (λ (x y z) x) 0 #:samples 2
-                            #:color "red"
-                            #:line-width 2)
-              (isosurface3d (λ (x y z) (+ x (- y) z)) 0
-                            #:samples 2
-                            #:line-width 2)
-              (parametric3d (λ (t)
-                              (list (* 0.75 (cos (* 5 pi t)))
-                                    (* 0.75 (sin (* 5 pi t)))
-                                    t))
-                            -1 1 #:width 2 #:color 2)))
-
-(let* ([xs  (sample (uniform-dist -1 1) 10000)]
-       [ys  (sample (uniform-dist -1 1) 10000)]
-       [zs  (sample (uniform-dist -1 1) 10000)]
-       [xyzs  (map list xs ys zs)])
-  (time
-   (plot3d (list (isosurface3d (λ (x y z) (+ x y z)) 0 -1 1 -1 1 -1 1
-                               #:samples 2
-                               #:line-width 2)
-                 (isosurface3d (λ (x y z) x) 0 #:samples 2
-                               #:color "red"
-                               #:line-width 2)
-                 (isosurface3d (λ (x y z) (+ x (- y) z)) 0
-                               #:samples 2
-                               #:line-width 2)
-                 (points3d xyzs #:sym 'dot)))))
-
-(time
- (for/last ([_  (in-range 1)])
-   (plot3d
-    (list (contour-intervals3d
-           (λ (x y)
-             (* x (+ 0.1 y)))
-           -1 1 -1 1
-           #:samples 41
-           #:alphas '(0.85)
-           ;#:alpha 0.75
-           ;#:line-width 2
-           ;#:line-widths '(2)
-           ;#:line-styles '(transparent)
-           #:contour-widths '(2)
-           ;#:color 1
-           ;#:label ""
-           )
-          
-          (surface3d
-           (λ (x y)
-             (* (- (* (flnormal-pdf 0.0 0.2 (fl x) #f)
-                      (flnormal-pdf 0.0 0.2 (fl y) #f))
-                   0.7)
-                0.4))
-           -1 1 -1 1
-           #:samples 40
-           ;#:alphas '(0.75)
-           #:alpha 0.95
-           #:color "plum"
-           #:line-color 6
-           ;#:line-style 'transparent
-           ;#:line-width 2
-           ))
-    #:x-min -1 #:x-max 1
-    #:y-min -1 #:y-max 1
-    ;#:out-file "test.pdf"
-    )))
-
-(define (f2 x y)
-  (let ([x  (fl x)] [y  (fl y)])
-    (- (sqrt (+ (abs y) (abs x))))))
-
-(plot3d (list (surface3d * -1 1 -1 1 #:samples 6 #:alpha 0.75 #:color 1)
-              (surface3d (λ (x y) (+ 0.1 (* x y))) -1 1 -1 1 #:samples 6 #:alpha 0.75 #:color 2)
-              (surface3d (λ (x y) (+ 0.2 (* x y))) -1 1 -1 1 #:samples 6 #:alpha 0.75 #:color 3
-                         #:line-width 2)
-              ))
-
-(plot3d (list
-         (isosurface3d (λ (x y z) (+ (- 1 x) (- 1 y) (- z 1.5))) 0
-                       #:alpha 0.85 #:color 2 #:line-color 2
-                       #:samples 4)
-         (discrete-histogram3d (list (vector 'a 'a 1)
-                                     (vector 'a 'b 2)
-                                     (vector 'b 'b 3))
-                               #:color 4 #:line-color 4 #:line-width 2
-                               #:alpha 0.65)))
-
-(plot3d (list
-         ;(isosurface3d (λ (x y z) (+ x y z)) 0 #:samples 2)
-         (surface3d * -1 1 -1 1)
-         (vector-field3d (λ (x y z) (vector x z y))
-                         #:line-width 2)))
-
-(define (f x y) (* (sin x) (cos y)))
-(time
- (for/last ([_  (in-range 1)])
-   (plot3d (list (contour-intervals3d f -3 3 -3 3)
-                 (point-label3d (list -1 1 (f -1 1)))))))
-
-(parameterize ([plot-x-transform  (hand-drawn-transform 50)]
-               [plot-y-transform  (hand-drawn-transform 50)]
-               [plot-z-transform  (hand-drawn-transform 50)]
-               )
-  (plot3d (contour-intervals3d (λ (x y) (- (sqr x) (sqr y)))
-                               -1 1 -1 1 #:samples 9
-                               #:contour-widths '(2)
-                               #:line-widths '(2))))
-
-(define (saddle x y) (- (sqr x) (sqr y)))
-(plot3d (list (surface3d saddle -1 1 -1 1)
-              (isoline3d saddle 1/4 #:width 2 #:style 'long-dash)))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/plot3d-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/plot3d-tests.rkt
deleted file mode 100644
index 971e461801..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/plot3d-tests.rkt
+++ /dev/null
@@ -1,261 +0,0 @@
-#lang racket
-
-(require plot plot/utils unstable/flonum)
-
-;(plot-new-window? #t)
-
-(printf "The following two plots should be empty:~n")
-(time
- (plot3d empty #:x-min -1 #:x-max 1 #:y-min -1 #:y-max 1 #:z-min -1 #:z-max 1))
-
-(time
- (plot3d (points3d empty) #:x-min -1 #:x-max 1 #:y-min -1 #:y-max 1 #:z-min -1 #:z-max 1))
-
-(printf "This plot should be empty:~n")
-(plot3d (rectangles3d (list (list (ivl 0 1) (ivl 0 1) (ivl 0 1))))
-      #:x-min 2 #:x-max 3)
-
-(parameterize ([plot-background  "black"]
-               [plot-foreground  "white"]
-               [plot-background-alpha  1/2]
-               [plot-foreground-alpha  1/2])
-  (plot3d (surface3d (λ (x y) (* (sin x) (sin y))) -2 2 -2 2 #:label "z = trig(x,y)")))
-
-(time
- (plot3d (points3d '(#(0.1 0.6 0.3)))
-         #:x-min 0 #:x-max 1 #:y-min 0 #:y-max 1 #:z-min 0 #:z-max 1))
-
-(time
- (plot3d (vector-field3d (λ (x y z) (vector x z y)) -2 2 -2 2 -2 2
-                               #:line-width 3)))
-
-(time
- (define x-ivls (bounds->intervals (linear-seq 2 8 10)))
- (define y-ivls (bounds->intervals (linear-seq -5 5 10)))
- (define x-mids (linear-seq 2 8 9 #:start? #f #:end? #f))
- (define y-mids (linear-seq -5 5 9 #:start? #f #:end? #f))
- (plot3d (rectangles3d (append*
-                        (for/list ([y-ivl  (in-list y-ivls)] [y  (in-list y-mids)])
-                          (for/list ([x-ivl  (in-list x-ivls)] [x  (in-list x-mids)])
-                            (vector x-ivl y-ivl (ivl 0 (exp (* -1/2 (+ (sqr (- x 5)) (sqr y)))))))))
-                       #:alpha 3/4
-                       #:label "Approximate 2D Normal")))
-
-(time
- (plot3d (discrete-histogram3d (list (vector 'a 'a 1)
-                                     (vector 'a 'b 2)
-                                     (vector 'b 'b 3))
-                               #:label "Missing (b,a)"
-                               #:color 4 #:line-color 4)))
-
-(time
- (define c1s #(a b c d e))
- (define c2s #(1 2 3 4 5))
- (define cat-vals (build-list 15 (λ (n) (vector (vector-ref c1s (random 5))
-                                                (vector-ref c2s (random 5))
-                                                n))))
- (plot3d (discrete-histogram3d cat-vals)))
-
-(time
- (plot3d (stacked-histogram3d '(#(a a (1 1 1)) #(a b (1.5 3)) #(b b ()) #(b a (1/2)))
-                              #:labels '("Red" #f "Blue") #:alphas '(2/3))))
-
-(time
- (plot3d (stacked-histogram3d '(#(a a (1 1 1)) #(a b (1.5 3)) #(b b ()) #(b a (1/2)))
-                              #:labels '("Red" #f "Blue") #:alphas '(2/3)
-                              #:add-x-ticks? #f #:add-y-ticks? #f)))
-
-(time
- (plot3d (surface3d + 0 10 0 1)
-         #:angle 10 #:z-label "z axis"))
-
-(parameterize ([plot-x-transform  log-transform]
-               [plot-y-transform  log-transform])
-  (time (plot3d (surface3d + .01 3 .01 1))))
-
-;(plot-x-transform cbrt-transform)
-;(plot-y-transform cbrt-transform)
-;(plot-z-transform cbrt-transform)
-
-(time
- (plot3d (surface3d (λ (x y) (+ (/ 1.0 (exact->inexact x))
-                                (/ 1.0 (exact->inexact y))))
-                    -2 2 -2 2
-                    #:color '(255 128 128)
-                    #:line-color '(255 128 128)
-                    #:line-width 1.5
-                    #:label "Inverse")
-         #:title "Here it is!"
-         #:x-label "WannaHockaLoogi"
-         #:y-label "An Impossibly Long Y Axis Label"
-         #:angle 330 #:altitude 0))
-
-(time
- (plot3d (surface3d (λ (x y)
-                      (+ (/ (+ (abs x) 0.01))
-                         (/ (+ (abs y) 0.01))))
-                    -4 4 -4 4 #:color '(128 128 255)
-                    #:label "Z sort test polygons")
-         #:angle 330 #:altitude 41
-         #:z-label #f #:y-label #f #:x-label #f))
-
-(let ()
-  (define xs (build-list 200 (λ (n) (/ 1 (- (random) 0.5)))))
-  (define ys (build-list 200 (λ (n) (/ 1 (- (random) 0.5)))))
-  (define zs (build-list 200 (λ (n) (/ 1 (- (random) 0.5)))))
-  (time
-   (plot3d (points3d (map vector xs ys zs)
-                     #:x-min -20 #:x-max 20
-                     #:y-min -20 #:y-max 20
-                     #:z-min -20 #:z-max 20
-                     #:label "Widget Locations")
-           #:angle 15 #:title "Random Points")))
-
-(let ()
-  (define xs (build-list 10000 (λ (n) (/ 1 (- (random) 0.5)))))
-  (define ys (build-list 10000 (λ (n) (/ 1 (- (random) 0.5)))))
-  (define zs (build-list 10000 (λ (n) (/ 1 (- (random) 0.5)))))
-  (time
-   (plot3d (points3d (map vector xs ys zs)
-                     #:x-min -20 #:x-max 20
-                     #:y-min -20 #:y-max 20
-                     #:z-min -20 #:z-max 20
-                     #:color "blue" #:sym 'dot ;#:size 10
-                     #:alpha 0.5)
-           #:angle 30 #:altitude 30
-           #:title "A Bunch of Random Points Concentrated at the Origin"
-           #:x-label "x" #:y-label "y" #:z-label "z")))
-
-;; tests line clipping: should look like a sphere with six poles chopped off
-(time
- (plot3d (parametric3d (λ (t)
-                         (vector (* (cos (* 80 t)) (cos t))
-                                 (* (sin (* 80 t)) (cos t))
-                                 (sin t)))
-                       (- pi) pi
-                       #:x-min -0.8 #:x-max 0.8
-                       #:y-min -0.8 #:y-max 0.8
-                       #:z-min -0.8 #:z-max 0.8
-                       #:color "blue" #:width 1/2 #:style 'long-dash
-                       #:samples 3000 #:alpha 0.5
-                       #:label "Sphere")
-         #:altitude 22
-         #:x-min -1 #:x-max 1 #:y-min -1 #:y-max 1 #:z-min -1 #:z-max 1))
-
-(time
- (plot3d (surface3d (λ (x y) (+ x y)) -0.81 0.81 -0.81 0.81
-                    #:line-color '(0 0 255) #:line-width 1 #:line-style 'dot)
-         #:x-min -1 #:x-max 1 #:y-min -1 #:y-max 1 #:z-min -1 #:z-max 1))
-
-(time
-  (define xs (build-list 200 (λ (n) (* 2 (- (random) 0.5)))))
-  (define ys (build-list 200 (λ (n) (* 2 (- (random) 0.5)))))
-  (define zs (build-list 200 (λ (n) (* 2 (- (random) 0.5)))))
-  (plot3d (list (surface3d (λ (x y) (+ x y)) -0.81 0.81 -0.81 0.81
-                           #:line-color '(0 0 255) #:line-width 1
-                           #:line-style 'dot)
-                (points3d (map vector xs ys zs)))
-          #:x-min -1 #:x-max 1 #:y-min -1 #:y-max 1 #:z-min -1 #:z-max 1))
-
-(define (norm mx my x y)
-  (exp (* -1/2 (+ (sqr (- x mx)) (sqr (- y my))))))
-
-(define (f1 x y)
-  (- (sqr x) (sqr y)))
-
-(define (f2 x y)
-  (- (sqrt (+ (abs y) (abs x)))))
-
-(define (f3 x y)
-  (define d (* 2 pi (+ (abs x) (abs y))))
-  (+ (* 1/8 (cos d)) (- (sqr x) (sqr y))))
-
-(define (f4 x y)
-  (imag-part (log (make-rectangular (exact->inexact x)
-                                    (exact->inexact y)))))
-
-(define (f5 x y)
-  (+ (* 1.1 (norm -1.5 -1.5 x y))
-     (* 2 (norm 1 1 x y))
-     (* 1.3 (norm 2 -2 x y))))
-
-(define (f6 x y)
-  (define d (sqrt (+ (sqr x) (sqr y))))
-  (if (d . < . 1)
-      (sqrt (- 1 (sqr d)))
-      0))
-
-(parameterize ([plot3d-diffuse-light? #f]
-               [plot3d-specular-light? #f])
-  (time (plot3d (surface3d f5 -5 5 -5 5 #:style 'transparent))))
-
-(time (plot3d (contours3d f5 -4 4 -4 4 #:colors '(0)
-                          #:label "z")))
-
-(time (plot3d (contour-intervals3d f5 -4 4 -4 4 #:label "z")))
-
-(time (plot3d (contour-intervals3d
-               (λ (x y)
-                 (define z (- x y))
-                 (cond [(< z -1) -1]
-                       [(> z 1)   1]
-                       [else      z]))
-               -2 2 -2 2)))
-
-(time
- (plot3d (contour-intervals3d (λ (x y) (+ x y)))
-         #:x-min #e100000000000000.0 #:x-max #e100000000000000.1
-         #:y-min #e100000000000000.0 #:y-max #e100000000000000.1
-         #:width 500))
-
-(time
- (plot3d (list (surface3d f5 0 4 -4 4 #:color '(128 255 160) #:alpha 0.5
-                          #:label "x pos.")
-               (contour-intervals3d f5 -4 0 -4 4
-                                    #:colors '(0 1 5)
-                                    #:line-colors '(0 4 2)
-                                    #:line-widths '(1.5) #:line-styles '(dot)
-                                    #:contour-colors '(0)
-                                    #:contour-widths '(0)
-                                    #:contour-styles '(transparent)
-                                    #:alphas '(0.75)
-                                    #:label "x neg."))
-         #:z-min 0.25 #:z-max 1.1
-         #:legend-anchor 'top))
-
-(time
- (parameterize ([plot3d-samples 81])
-   (plot3d (contour-intervals3d
-            f5 -4 4 -4 4 #:label "z"
-            #:line-styles '(transparent)))))
-
-(time
- (plot3d (list (contours3d f5 -4 4 -4 4)
-               (contour-intervals3d f5 -2.5 2.5 -2.5 2.5
-                                    #:z-min 0.25 #:z-max 1.5 #:label "z"))))
-
-(time
- (plot3d (contour-intervals3d f5 -3 3 -3 3
-                              #:colors '((255 128 128) (128 128 255)))))
-
-(time
- (plot3d (list (surface3d f4 -4 4 -4 4 #:color '(255 224 0))
-               (contours3d f4 -4 4 -4 4))
-         #:angle -30))
-
-(time (plot3d (contour-intervals3d f1 -4 4 -4 4)))
-
-(time (parameterize ([plot3d-samples  101])
-        (plot3d (contour-intervals3d f2 -2 2 -2 2 #:levels 10
-                                     #:line-styles '(transparent)
-                                     #:contour-styles '(long-dash)
-                                     #:alphas '(1 2/3))
-                #:altitude 20)))
-
-(time
- (plot3d (contour-intervals3d (λ (x y) (- (sqr x) (sqr y))) -min.0 +min.0 -min.0 +min.0)))
-
-(time
- (define (f x y) (* (sin x) (cos y)))
- (plot3d (list (contour-intervals3d f -3 3 -3 3)
-               (point-label3d (list -1 1 (f -1 1))))))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/selection-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/selection-tests.rkt
deleted file mode 100644
index 36e97d1698..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/selection-tests.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket
-
-;; These tests aren't meant to be run so much as manipulated after running
-
-(require plot plot/utils unstable/flonum)
-
-(parameterize ([plot-x-transform  log-transform])
-  (plot (function values +min.0 1)))
-
-(define raise-error? #f)
-
-(plot (function (λ (x)
-                  (when raise-error?
-                    (error 'buh "buh buh"))
-                  (sin x))
-                -4 4))
-
-(plot3d (surface3d (λ (x y)
-                     (when raise-error?
-                       (error 'buh "buh buh buh"))
-                     (- (sqr x) (sqr y)))
-                   -1 1 -1 1))
-
-(set! raise-error? #t)
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/slideshow-test.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/slideshow-test.rkt
deleted file mode 100644
index e18acc2f5c..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/slideshow-test.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang slideshow
-
-(require plot plot/utils)
-
-(module test racket/base)
-
-(plot-font-size (current-font-size))
-(plot-title "Untitled")
-(plot-width 600)
-(plot-height 600)
-(plot-background '(192 255 192))
-(plot-foreground '(255 64 255))
-
-(slide
- #:title "Two Small 2D Parabolas"
- (para "A small, aliased parabola:"
-       (scale (bitmap (plot (function sqr -1 1 #:label "y = x^2"))) 1/3))
- (para "A small, smooth parabola:"
-       (rotate (scale (plot-pict (function sqr -1 1 #:label "y = x^2")) 1/3)
-               (degrees->radians 15))))
-
-(slide
- #:title "A 2D Parabola"
- (parameterize ([plot-background  1]
-                [plot-background-alpha 1/2]
-                [plot-foreground  1])
-   ;; This parabola should be pink:
-   (plot-pict (function sqr -1 1 #:label "y = x^2")
-              #:legend-anchor 'center)))
-
-(define (parabola2d x y) (+ (sqr x) (sqr y)))
-
-(slide
- #:title "Two Small 3D Parabolas"
- (para "A small, aliased parabola:"
-       (scale (bitmap (plot3d (surface3d parabola2d -1 1 -1 1 #:label "z = x^2 + y^2"))) 1/3))
- (para "A small, smooth parabola:"
-       (rotate (scale (plot3d-pict (surface3d parabola2d -1 1 -1 1 #:label "z = x^2 + y^2")) 1/3)
-               (degrees->radians 15))))
-
-(slide
- #:title "A 3D Parabola"
- (parameterize ([plot-background  1]
-                [plot-background-alpha 1/2]
-                [plot-foreground  1])
-   (plot3d-pict (list (surface3d parabola2d -1 1 -1 1
-                                 #:label "z = x^2 + y^2" #:color 3)
-                      (contours3d parabola2d -1 1 -1 1))
-                #:legend-anchor 'center)))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/subdivision-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/subdivision-tests.rkt
deleted file mode 100644
index 5bf63e2cf5..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/subdivision-tests.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket
-
-(require plot
-         plot/private/plot2d/plot-area
-         plot/private/plot3d/plot-area)
-
-(parameterize ([plot-x-transform  log-transform]
-               [plot-x-ticks      (log-ticks)])
-  (values
-   (plot (lines '(#(1 1) #(200 200))))
-   (plot3d (lines3d '(#(1 1 1) #(200 200 200))))))
-
-(plot2d-subdivisions)
-(plot3d-subdivisions)
-
-(time
- (parameterize ([plot3d-samples 4]
-                [plot-x-transform  log-transform]
-                [plot-x-ticks      (log-ticks)]
-                [plot-y-transform  log-transform]
-                [plot-y-ticks      (log-ticks)])
-   (values
-    (plot (lines '(#(1 1) #(200 200))))
-    (plot3d (surface3d + 1 200 1 200)))))
-
-(plot2d-subdivisions)
-(plot3d-subdivisions)
-
-(time
- (parameterize ([plot-x-transform  (collapse-transform -1 1)])
-   (values
-    (plot (lines '(#(-2 -2) #(2 2))))
-    (plot3d (surface3d + -2 2 -2 2)))))
-
-(plot2d-subdivisions)
-(plot3d-subdivisions)
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/tick-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/tick-tests.rkt
deleted file mode 100644
index 405fb9bb3b..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/tick-tests.rkt
+++ /dev/null
@@ -1,244 +0,0 @@
-#lang racket
-
-(require plot plot/utils)
-
-(plot-font-family 'swiss)
-
-(define (get-isosurface-ticks z-min z-max)
-  (cond [(z-min . >= . z-max)  empty]
-        [else
-         (map pre-tick-value
-              (filter pre-tick-major?
-                      (contour-ticks (plot-d-ticks) z-min z-max 'auto #f)))]))
-
-;; try to verify that we always get 3-5 isosurfaces from the isosurfaces3d renderer
-(time
- (plot (function (λ (x)
-                   (let ([ts  (get-isosurface-ticks 1/10 (+ 1/10 x))])
-                     (if (empty? ts) +nan.0 (length ts))))
-                 #:samples 10000)
-       #:x-min 0 #:x-max 10
-       #:x-label "bounds size (min = 1/10)"
-       #:y-label "number of ticks"))
-
-;; try to verify that we always get 3-5 isosurfaces from the isosurfaces3d renderer
-(time
- (plot3d (contour-intervals3d (λ (x y)
-                                (let ([ts  (get-isosurface-ticks x (+ x y))])
-                                  (if (empty? ts) +nan.0 (length ts))))
-                              #:samples 101 #:line-styles '(transparent))
-         #:x-min 0 #:x-max 10 #:y-min 0 #:y-max 10
-         #:x-label "bounds min" #:y-label "bounds size"
-         #:z-label "number of ticks"))
-
-(time
- (plot (contour-intervals (λ (x y)
-                            (let ([ts  (get-isosurface-ticks x (+ x y))])
-                              (if (empty? ts) +nan.0 (length ts))))
-                          #:samples 101)
-       #:x-min 0 #:x-max 10 #:y-min 0 #:y-max 10
-       #:x-label "bounds min" #:y-label "bounds size"))
-
-(plot (function (λ (x) (count pre-tick-major? ((linear-ticks) 0 x))) #e0.1 10))
-(plot (function (λ (x) (count pre-tick-major? ((linear-ticks #:number 40) 0 x))) 1 100))
-
-(parameterize ([plot-x-ticks  (linear-ticks #:base 2 #:divisors '(1 2))]
-               #;[plot-y-ticks  (linear-ticks #:base (* 1 2 3 4 5) #:divisors '(1 2 3 4 5))])
-  (plot (function cos 0.013 2.1176)))
-
-(parameterize ([plot-x-transform  log-transform]
-               [plot-x-ticks  (ticks (log-ticks-layout)
-                                     (fraction-ticks-format))]
-               [plot-y-ticks  (fraction-ticks)])
-  (plot (function (λ (x) (+ 1 (cos x))) 0.0001 12)))
-
-(parameterize ([plot-x-ticks  (date-ticks #:number 3)]
-               [plot-y-ticks  (currency-ticks)])
-  (plot (function values -1 1)))
-
-(parameterize* ([currency-ticks-formats uk-currency-formats]
-                [currency-ticks-scales uk-currency-scales]
-                [plot-x-ticks  (date-ticks)]
-                [plot-y-ticks  (currency-ticks #:kind 'GBP)])
-  (plot (function values 101232512 2321236192)))
-
-(parameterize ([plot-x-ticks  (currency-ticks #:kind 'EUR
-                                              #:scales eu-currency-scales
-                                              #:formats eu-currency-formats)]
-               [plot-y-ticks  (currency-ticks)])
-  (plot (function (λ (x) (* x 1.377)) 8000000 10000000)
-        #:title "EUR-USD Conversion, 2011-10-13"
-        #:x-label "Euros"
-        #:y-label "Dollars"))
-
-(parameterize ([plot-x-ticks  no-ticks])
-  (plot (function sin -1 4)))
-
-(parameterize ([plot-x-transform  log-transform]
-               [plot-y-transform  log-transform]
-               [plot-x-ticks      (log-ticks #:base 10)]
-               [plot-y-ticks      (log-ticks #:base 2)])
-  (plot (function values 0.1 10)))
-
-(parameterize ([plot-x-transform  log-transform]
-               [plot-y-transform  (stretch-transform -1 1 4)]
-               [plot-x-ticks      (ticks (linear-ticks-layout)
-                                         (log-ticks-format #:base 10))]
-               [plot-y-ticks      (ticks (linear-ticks-layout)
-                                         (currency-ticks-format #:kind 'USD))])
-  (plot (function log 0.1 10)))
-
-(parameterize ([plot-x-transform  log-transform]
-               [plot-x-ticks      (log-ticks #:base 10)])
-  (plot (function values 10000000000000 1000000000000000)))
-
-(plot (polar-axes) #:x-min -1 #:x-max 1 #:y-min -1 #:y-max 1)
-
-(plot (polar-axes) #:x-min 0 #:x-max 3 #:y-min 0 #:y-max 3)
-
-(plot (polar-axes) #:x-min 1 #:x-max 4 #:y-min 1 #:y-max 4)
-
-(plot (polar-axes #:number 12) #:x-min 10 #:x-max 12 #:y-min 10 #:y-max 12)
-
-(parameterize ([plot-z-transform  log-transform]
-               [plot-z-ticks      (log-ticks)]
-               [contour-samples   (plot3d-samples)])
-  (values
-   (plot (contours (λ (x y) (exp (- (+ (sqr x) (sqr y))))) -2 2 -2 2 #:label "z"))
-   (plot (contour-intervals (λ (x y) (exp (- (+ (sqr x) (sqr y))))) -2 2 -2 2 #:label "z"))
-   (plot3d (contours3d (λ (x y) (exp (- (+ (sqr x) (sqr y))))) -2 2 -2 2 #:label "z"))
-   (plot3d (contour-intervals3d (λ (x y) (exp (- (+ (sqr x) (sqr y))))) -2 2 -2 2 #:label "z"))))
-
-(plot (contours (λ (x y) (* 1/2 (+ (sqr x) (sqr y)))) -1 1 -1 1 #:label "z"))
-(plot3d (contours3d (λ (x y) (* 1/2 (+ (sqr x) (sqr y)))) -1 1 -1 1 #:label "z"))
-
-(parameterize ([plot-y-ticks  (ticks-scale (plot-y-ticks) (linear-scale 2 1))])
-  (plot (list (function sqr -2 2)
-              (function sin -4 4))))
-
-(define exp-scale (invertible-function exp log))
-
-(parameterize ([plot-y-ticks  (ticks-scale (log-ticks) exp-scale)])
-  (plot (function values -10 10)))
-
-(parameterize ([plot-y-ticks  (ticks-add (ticks no-ticks-layout (linear-ticks-format))
-                                         '(1/3 2/3))])
-  (plot (function sin -4 4)))
-
-(plot (list (function sin -4 4)
-            (points '(#(-3.75 -1/4)) #:size 10)
-            (x-ticks (list (tick 1.5 #t "3/2") (tick 3 #t "Three")))
-            (y-ticks (list (tick 1/4 #t "1/4") (tick -1/4 #f "")))))
-
-(parameterize ([plot-z-ticks  (linear-ticks #:number 5)])
-  (plot3d (list (surface3d (λ (x y) (* 2 (+ (sin x) (cos y)))) -4 4 -4 4 #:alpha 1/2)
-                (x-ticks (list (tick 1.5 #t "3/2") (tick 3 #t "Three")))
-                (y-ticks (list (tick 1/3 #t "1/3") (tick -1/3 #f "1/3")))
-                (z-ticks (list (tick pi #f "π") (tick (- pi) #t "-π"))))))
-
-(parameterize ([plot-title  "Money for time in a sine wave"]
-               [plot-x-far-ticks  (time-ticks)]
-               [plot-y-ticks  (currency-ticks #:kind 'USD)]
-               [plot-y-far-ticks  (ticks-scale (currency-ticks #:kind 'EUR) (linear-scale 1.47))]
-               [plot-x-label  #f]
-               [plot-y-label  #f])
-  (values
-   (parameterize ([plot-x-axis?  #f]
-                  [plot-x-far-axis?  #f])
-     (plot (list (function sin -4 4)
-                 (x-axis -0.25 #:ticks? #f #:labels? #t)
-                 (x-axis 0.25 #:ticks? #t #:labels? #t #:far? #t))))
-   
-   (parameterize ([plot-y-axis?  #f]
-                  [plot-y-far-axis?  #f])
-     (plot (list (function sin -4 4)
-                 (y-axis -1 #:ticks? #f #:labels? #t)
-                 (y-axis 1 #:ticks? #t #:labels? #t #:far? #t))))))
-
-(parameterize ([plot-y-ticks  (fraction-ticks)])
-  (plot (function sin (- pi) pi)))
-
-(parameterize ([plot-x-far-label  "x far axis"]
-               [plot-x-ticks      (linear-ticks #:number 10)]
-               [plot-y-far-label  "y far axis"]
-               [plot-y-far-ticks  (date-ticks)]
-               [plot-z-label  "z axis"]
-               [plot-z-far-label  "z far axis"]
-               [plot-z-far-ticks  (currency-ticks #:number 5)])
-  (plot3d (surface3d (λ (x y) (+ (sin x) (cos y))) -2 2 -2 2 #:alpha 1/2)
-          #:angle 60 #:altitude 35))
-
-(parameterize ([plot-title  "Saddle"]
-               [plot-x-axis?  #f]
-               [plot-y-axis?  #f]
-               [plot-z-axis?  #f]
-               [plot-x-far-axis?  #f]
-               [plot-y-far-axis?  #f]
-               [plot-z-far-axis?  #f]
-               [plot-x-label  #f]
-               [plot-y-label  #f]
-               [plot-z-label  #f]
-               [plot-x-far-label  #f]
-               [plot-y-far-label  #f]
-               [plot-z-far-label  #f])
-  (plot3d (contour-intervals3d (λ (x y) (- (sqr x) (sqr y))) -2 2 -2 2
-                               #:label "z")))
-
-(parameterize ([plot-decorations?  #f])
-  (values
-   (plot (function sin -4 4)
-         #:title "Hello")
-   (plot3d (contour-intervals3d (λ (x y) (- (sqr x) (sqr y))) -2 2 -2 2))))
-
-(time
- (define ((degrees-ticks-format suffix) x-min x-max ts)
-   (map (λ (label) (format "~a\ub0~a" label suffix))
-        ((linear-ticks-format) x-min x-max ts)))
- 
- (define C-ticks (ticks (linear-ticks-layout) (degrees-ticks-format 'C)))
- 
- (define F/C-ticks (ticks-scale
-                    (ticks (linear-ticks-layout) (degrees-ticks-format 'F))
-                    (linear-scale 9/5 32)))
- 
- (define data (list #(0 0) #(15 0.6) #(30 9.5) #(45 10.0) #(60 16.6)
-                    #(75 41.6) #(90 42.7) #(105 65.5) #(120 78.9)
-                    #(135 78.9) #(150 131.1) #(165 151.1) #(180 176.2)))
- 
- (define (temp/time-trend x) (/ (sqr x) 180))
-
- (define above-data (filter (λ (v) (match-let ([(vector x y)  v])
-                                     (y . > . (temp/time-trend x))))
-                            data))
-
- (parameterize ([plot-x-ticks      (time-ticks)]
-                [plot-y-ticks      C-ticks]
-                [plot-y-far-ticks  F/C-ticks])
-   (plot (list (function temp/time-trend 0 180 #:style 'long-dash #:color 3
-                         #:label "Trend")
-               (lines data #:color 2 #:width 2)
-               (points data #:color 2 #:line-width 2 #:fill-color 0 #:sym 'fullcircle
-                       #:label "Measurement")
-               (map (λ (d) (point-label d #:anchor 'bottom #:point-color 2 #:point-size 7))
-                    above-data))
-         #:y-min -25 #:x-label "Time" #:y-label "Temp."
-         #:title "Temp./Time With Applied Heat (Measurement and Trend)")))
-
-(parameterize ([plot-x-ticks  (fraction-ticks)]
-               [plot-y-ticks  (currency-ticks)])
-  (plot (list (function sin -4 4)
-              (function-label sin 1/3))))
-
-(parameterize ((plot-x-tick-label-angle 45)
-               (plot-x-tick-label-anchor 'top-right)
-               (plot-y-tick-label-angle 45)
-               (plot-y-tick-label-anchor 'bottom-right)
-               (plot-x-far-tick-label-angle 45)
-               (plot-x-far-tick-label-anchor 'bottom-left)
-               (plot-y-far-tick-label-angle 45)
-               (plot-y-far-tick-label-anchor 'top-left)
-               (plot-x-far-label "x far axis")
-               (plot-y-far-label "y far axis"))
-  (plot (list (discrete-histogram '(#(asdglkj 5399) #(liegjd 5390) #(pqlcxkgfj 3534)))
-              (x-ticks (list (tick 1 #t "asdgwieasdgwefj")) #:far? #t)
-              (y-ticks (list (tick 2500 #t "asdgwegawegfgwiej")) #:far? #t))))
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/typed/parameter-regression-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/typed/parameter-regression-tests.rkt
deleted file mode 100644
index fe864caebd..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/typed/parameter-regression-tests.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang typed/racket
-
-;; This test ensures that the types of plot parameters are
-;; correct and can be set appropriately in TR.
-
-(require plot/typed)
-
-(interval-line1-style 1)
-(interval-line2-style 3)
-(plot (function-interval sub1 add1 0 1))
-
-(rectangle-line-style 2)
-(plot (rectangles (list (list (ivl 0 1) (ivl 0 1))
-                        (list (ivl 1 2) (ivl 1 2)))))
-
-;; ---------------------------------------------------------------------------------------------------
-
-(printf "The following two plots should be the same:~n")
-
-(contour-colors (λ (n) '((255 0 0) (0 0 255))))
-(contour-widths (λ (n) '(.25 .5 .75)))
-(contour-styles (λ (n) '(0 1 2)))
-(contour-interval-colors (λ (n) '(1 2 3)))
-(contour-interval-styles (λ (n) '(0 1 2)))
-(contour-interval-alphas (λ (n) '(0.25 0.5 0.75)))
-(plot (contour-intervals + 0 1 0 1))
-
-(contour-colors '((255 0 0) (0 0 255)))
-(contour-widths '(.25 .5 .75))
-(contour-styles '(0 1 2))
-(contour-interval-colors '(1 2 3))
-(contour-interval-styles '(0 1 2))
-(contour-interval-alphas '(0.25 0.5 0.75))
-(plot (contour-intervals + 0 1 0 1))
-
-;; ---------------------------------------------------------------------------------------------------
-
-(printf "The following two plots should be the same:~n")
-
-(stacked-histogram-alphas (λ (n) '(0.25 0.5 0.75)))
-(stacked-histogram-colors (λ (n) '(1 2 3)))
-(stacked-histogram-line-styles (λ (n) '(0 1 2)))
-(stacked-histogram-styles (λ (n) '(0 1 2)))
-(plot (stacked-histogram (list (list 'a '(1 1 1)) (list 'b '(1.5 3))
-                               (list 'c '()) (list 'd '(1/2)))))
-
-(stacked-histogram-alphas '(0.25 0.5 0.75))
-(stacked-histogram-colors '(1 2 3))
-(stacked-histogram-line-styles '(0 1 2))
-(stacked-histogram-styles '(0 1 2))
-(plot (stacked-histogram (list (list 'a '(1 1 1)) (list 'b '(1.5 3))
-                               (list 'c '()) (list 'd '(1/2)))))
-
-;; ---------------------------------------------------------------------------------------------------
-
-(printf "The following two plots should be the same:~n")
-
-(contour-interval-line-colors (λ (n) '(1 2 3)))
-(contour-interval-line-widths (λ (n) '(0.25 0.5 0.75)))
-(contour-interval-line-styles (λ (n) '(1 2 3)))
-(plot3d (contour-intervals3d + 0 1 0 1))
-
-(contour-interval-line-colors '(1 2 3))
-(contour-interval-line-widths '(0.25 0.5 0.75))
-(contour-interval-line-styles '(1 2 3))
-(plot3d (contour-intervals3d + 0 1 0 1))
-
-;; ---------------------------------------------------------------------------------------------------
-
-(printf "The following two plots should be the same:~n")
-
-(isosurface-colors (λ (n) '(1 2 3)))
-(isosurface-styles (λ (n) '(0 1 2)))
-(isosurface-line-colors (λ (n) '(3 2 1)))
-(isosurface-line-widths (λ (n) '(0.25 0.5 0.75)))
-(isosurface-line-styles (λ (n) '(0 1 2)))
-(isosurface-alphas (λ (n) '(0.25 0.5 0.75)))
-(plot3d (isosurfaces3d - 0 1 0 1 0 1))
-
-(isosurface-colors '(1 2 3))
-(isosurface-styles '(0 1 2))
-(isosurface-line-colors '(3 2 1))
-(isosurface-line-widths '(0.25 0.5 0.75))
-(isosurface-line-styles '(0 1 2))
-(isosurface-alphas '(0.25 0.5 0.75))
-(plot3d (isosurfaces3d - 0 1 0 1 0 1))
-
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-bitmap.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-bitmap.rkt
deleted file mode 100644
index b5aa188a13..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-bitmap.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang typed/racket
-
-(require plot/typed/bitmap)
-
-(define sin.png (make-temporary-file "plot-bitmap-sin-test~a.png"))
-(plot (function sin -4 4)
-      #:out-file sin.png)
-(delete-file sin.png)
-
-(define times.png (make-temporary-file "plot-bitmap-times-test~a.png"))
-(plot3d (contour-intervals3d * -4 4 -4 4)
-        #:out-file times.png)
-(delete-file times.png)
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-no-gui.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-no-gui.rkt
deleted file mode 100644
index 0e097da533..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-no-gui.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang typed/racket
-
-(require typed/rackunit
-         plot/typed/no-gui)
-
-(require/typed
- pict
- [#:opaque Pict pict?])
-
-(check-true (pict? (plot-pict (function sin -4 4))))
-(check-true (pict? (plot3d-pict (contour-intervals3d * -4 4 -4 4))))
-
-(plot-bitmap (function sin -4 4))
-(plot3d-bitmap (contour-intervals3d * -4 4 -4 4))
-
-(define sin.png (make-temporary-file "plot-bitmap-sin-test~a.png"))
-(check-true (void? (plot-file (function sin -4 4) sin.png)))
-(delete-file sin.png)
-
-(define times.png (make-temporary-file "plot-bitmap-times-test~a.png"))
-(check-true (void? (plot3d-file (contour-intervals3d * -4 4 -4 4) times.png)))
-(delete-file times.png)
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-pict.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-pict.rkt
deleted file mode 100644
index 1e24ee360d..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-pict.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed/racket
-
-(require typed/rackunit
-         plot/typed/pict)
-
-(require/typed
- pict
- [#:opaque Pict pict?])
-
-(define sin.png (make-temporary-file "plot-bitmap-sin-test~a.png"))
-(check-true (pict? (plot (function sin -4 4)
-                         #:out-file sin.png)))
-(delete-file sin.png)
-
-(define times.png (make-temporary-file "plot-bitmap-times-test~a.png"))
-(check-true (pict? (plot3d (contour-intervals3d * -4 4 -4 4)
-                           #:out-file times.png)))
-(delete-file times.png)
diff --git a/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-tests.rkt b/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-tests.rkt
deleted file mode 100644
index cf37ad6a40..0000000000
--- a/pkgs/plot-pkgs/plot-test/plot/tests/typed/plot-tests.rkt
+++ /dev/null
@@ -1,179 +0,0 @@
-#lang typed/racket
-
-;; These tests "pass" when they pass the type checker and raise no exceptions
-
-(require plot/typed)
-
-(define xs (build-list 1000 (λ (_) (random))))
-(define ys (build-list 1000 (λ (_) (random))))
-(define zs (build-list 1000 (λ (_) (random))))
-(define xys (map (λ: ([x : Flonum] [y : Flonum]) (vector x y 3.0)) xs ys))
-(define xyzs (map (λ: ([x : Flonum] [y : Flonum] [z : Flonum]) (vector x y z 2.0)) xs ys zs))
-
-(plot (points xys #:x-min 0 #:x-max 1 #:y-min 0 #:y-max 1))
-
-(plot (vector-field (λ: ([x : Real] [y : Real])
-                      (list x y 5.0))
-                    -1 1 -1 1))
-
-(plot (error-bars '(#(1.0 2.0 1.0)
-                    #(2.0 3.0 1.0))
-                  #:x-min 0.75 #:x-max 2.25
-                  #:y-min 0.5 #:y-max 4.5))
-
-(plot (lines (map (λ: ([x : Real] [y : Real]) (list x y 5.0))
-                  (build-list 7 (λ: ([x : Real]) x))
-                  (build-list 7 (λ: ([x : Real]) (sqr x))))))
-
-(plot (list (parametric (λ: ([t : Real])
-                          (list (sin t) (cos t)))
-                        0 (* 2 pi))
-            (polar (λ: ([θ : Real]) 1/2) 0 (* 2 pi) #:color 3)))
-
-(plot (list (function (λ: ([x : Real]) (- (exp x) 1)) -1.5 1.5)
-            (inverse (λ: ([x : Real]) (- (exp x) 1)) -1.5 1.5 #:color 2)
-            (function (λ: ([x : Real]) x) -1.5 (- (exp 1.5) 1) #:color 0 #:style 'dot)))
-
-(plot (density xs 1))
-(plot (density xs 1 (map (λ: ([x : Flonum]) (sqr x)) xs)))
-
-(plot (lines-interval
-       (map (λ: ([x : Real] [y : Real]) (list x y 5.0))
-            (build-list 7 (λ: ([x : Real]) x))
-            (build-list 7 (λ: ([x : Real]) (sqr x))))
-       (map (λ: ([x : Real] [y : Real]) (list x y 5.0))
-            (build-list 7 (λ: ([x : Real]) x))
-            (build-list 7 (λ: ([x : Real]) (* 2 (sqr x)))))))
-
-(plot (parametric-interval
-       (λ: ([t : Real]) (list (sin t) (cos t)))
-       (λ: ([t : Real]) (list (* 0.5 (sin t)) (* 0.5 (cos t))))
-       0 (* 2 pi)))
-
-(plot (polar-interval
-       (λ: ([t : Real]) 1)
-       (λ: ([t : Real]) 0.5)
-       0 (* 2 pi)
-       #:color 2
-       #:style 'cross-hatch
-       #:line1-color 1
-       #:line2-color 5))
-
-(plot (list (function-interval sin cos -3 3)
-            (inverse-interval cos sin -3 3 #:color 1 #:line1-color 1 #:line2-color 1)))
-
-(plot (isoline (λ: ([x : Real] [y : Real]) (* (sin x) (cos y))) 1/2 -6 6 -6 6))
-
-(plot (contours (λ: ([x : Real] [y : Real]) (* (sin x) (cos y))) -6 6 -6 6
-                #:levels '(-2/3 -1/3 0 1/3 2/3)
-                #:colors '(0 1 2)
-                #:alphas '(0.5 1.0)))
-
-(plot (contour-intervals
-       (λ: ([x : Real] [y : Real]) (* (sin x) (cos y))) -6 6 -6 6
-       #:levels '(-2/3 -1/3 0 1/3 2/3)
-       #:colors '(0 1 2)
-       #:alphas '(0.5 1.0)))
-
-(plot (rectangles (list (list (ivl 0 1) (ivl 0 1))))
-      #:x-min -1 #:x-max 2 #:y-min -1 #:y-max 2)
-
-(plot (area-histogram (λ: ([x : Real]) (* x x x)) '(-4 -3 -2 -1 0 1 2 3 4)
-                      #:y-min -44))
-
-(plot (discrete-histogram
-       (list '(a 4)
-             '(b 10)
-             (list 'c (ivl 1 7)))))
-
-(plot (stacked-histogram
-       (list '(a (4 2 1 5))
-             '(b #(10 1 1 2)))
-       #:colors (λ: ([n : Natural]) (build-list n (λ: ([n : Index]) n)))
-       #:styles (λ: ([n : Natural]) (build-list n (λ: ([n : Index]) n)))
-       #:line-colors (λ: ([n : Natural]) (build-list n (λ: ([n : Index]) n)))
-       #:line-widths (λ: ([n : Natural]) (build-list n (λ: ([n : Index]) n)))
-       #:line-styles (λ: ([n : Natural]) (build-list n (λ: ([n : Index]) n)))
-       #:labels '("One" "Two" "Three" "Four")))
-
-(plot (list (function sin -4 4) (x-axis 1) (y-axis -1))
-      #:y-min -4 #:y-max 4)
-
-(plot (list (function sin -4 4) (axes 0 0))
-      #:y-min -4 #:y-max 4)
-
-(plot (list
-       (polar-axes)
-       (polar-interval
-        (λ: ([t : Real]) 1)
-        (λ: ([t : Real]) 0.5)
-        0 (* 2 pi)
-        #:color 2
-        #:style 'cross-hatch
-        #:line1-color 1
-        #:line2-color 5)))
-
-(plot (list (x-tick-lines) (y-tick-lines) (function sin -4 4)))
-
-(plot (list (tick-grid) (function sin -4 4)))
-
-(plot (list (function sin -4 4)
-            (point-label #(1/2 1/2) "one-half, one-half")))
-
-(plot (list (parametric (λ: ([t : Real]) (list (sin t) (cos t))) 0 (* 2 pi))
-            (parametric-label (λ: ([t : Real]) (list (sin t) (cos t))) 0.4)
-            (polar (λ: ([θ : Real]) 1/2) 0 (* 2 pi) #:color 3)
-            (polar-label (λ: ([θ : Real]) 1/2) 0.4 "0.4")))
-
-(plot (list (function-interval sin cos -3 3)
-            (function-label sin -2)
-            (inverse-interval cos sin -3 3 #:color 1 #:line1-color 1 #:line2-color 1)
-            (inverse-label cos -2)))
-
-(plot3d (surface3d (λ: ([x : Real] [y : Real]) (* (sin x) (cos y))) -6 6 -6 6))
-
-(plot3d (for/list: : (Listof renderer3d) ([z  '(-2/3 -1/3 0 1/3 2/3)])
-          (isoline3d (λ: ([x : Real] [y : Real]) (* (sin x) (cos y))) z -6 6 -6 6
-                     #:z-min -1 #:z-max 1)))
-
-(plot3d (contours3d (λ: ([x : Real] [y : Real]) (* (sin x) (cos y))) -6 6 -6 6))
-
-(plot3d (contour-intervals3d (λ: ([x : Real] [y : Real]) (* (sin x) (cos y))) -6 6 -6 6))
-
-(plot3d (lines3d (map (λ: ([x : Real] [y : Real] [z : Real]) (list x y z 2.2))
-                      (build-list 7 (λ: ([x : Real]) x))
-                      (build-list 7 (λ: ([x : Real]) (sqr x)))
-                      (build-list 7 (λ: ([x : Real]) (* x x x))))))
-
-(plot3d (parametric3d (λ: ([t : Real])
-                        (list (sin t) (cos t) t))
-                      0 (* 4 pi)))
-
-(plot3d (points3d xyzs #:x-min 0 #:x-max 1 #:y-min 0 #:y-max 1 #:z-min 0 #:z-max 1))
-
-(plot3d (vector-field3d (λ: ([x : Real] [y : Real] [z : Real])
-                          (list x y z 5.0))
-                        -1 1 -1 1 -1 1))
-
-(plot3d (isosurface3d (λ: ([x : Real] [y : Real] [z : Real])
-                        (* (sin x) (cos y) (sin z)))
-                      1/2 -3 3 -3 3 -3 3))
-
-(plot3d (isosurfaces3d (λ: ([x : Real] [y : Real] [z : Real])
-                         (* (sin x) (cos y) (sin z)))
-                       -3 3 -3 3 -3 3))
-
-(plot3d (polar3d (λ: ([θ : Real] [ρ : Real]) 1)))
-
-(plot3d (rectangles3d (list (list (ivl -1 1) (ivl -1 1) (ivl -1 1)))
-                      #:x-min -2 #:x-max 2 #:y-min -2 #:y-max 2 #:z-min -2 #:z-max 2))
-
-(plot3d (discrete-histogram3d
-         (list (list 'a 'a 4)
-               (list 'a 'b 5)
-               (list 'b 'b (ivl 1 3)))))
-
-(plot3d (stacked-histogram3d
-         (list (list 'a 'a '(4 1 2))
-               (list 'a 'b '(5 2 1))
-               (list 'b 'b '(2 3 2)))))
diff --git a/pkgs/plot-pkgs/plot/info.rkt b/pkgs/plot-pkgs/plot/info.rkt
deleted file mode 100644
index 53ccf22167..0000000000
--- a/pkgs/plot-pkgs/plot/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("plot-lib" "plot-gui-lib" "plot-doc"))
-(define implies '("plot-lib" "plot-gui-lib" "plot-doc"))
-
-(define pkg-desc "Functions (and docs and tests) for plotting")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/plt-services/meta/pkg-index/basic/main.rkt b/pkgs/plt-services/meta/pkg-index/basic/main.rkt
deleted file mode 100644
index 539f64b5cf..0000000000
--- a/pkgs/plt-services/meta/pkg-index/basic/main.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/contract
-         web-server/http
-         web-server/dispatch)
-
-(define (response/sexpr v)
-  (response 200 #"Okay" (current-seconds)
-            #"text/s-expr" empty
-            (λ (op) (write v op))))
-
-(define (request-binding/string req id [fail? #t])
-  (define res
-    (bindings-assq (string->bytes/utf-8 id)
-                   (request-bindings/raw req)))
-  (cond
-    [res
-     (bytes->string/utf-8
-      (binding:form-value
-       res))]
-    [fail?
-     (error 'pnr "Missing field ~e" id)]
-    [else
-     #f]))
-
-(define (pkg-index/basic+versions get-pkgs pkg-name->info)
-  (define (req-version req) (request-binding/string req "version" #f))
-  (define (write-info req pkg-name)
-    (response/sexpr
-     (pkg-name->info pkg-name
-                     #:version (req-version req))))
-  (define (display-info req pkg-name)
-    (define info (pkg-name->info pkg-name #:version (req-version req)))
-    (response/xexpr
-     `(html
-       (body
-        (h1 ,pkg-name)
-        (p (a ([href ,(hash-ref info 'source)]) ,(hash-ref info 'source)))
-        (p ,(hash-ref info 'checksum))))))
-  (define (list-pkgs req)
-    (response/xexpr
-     `(html
-       (body
-        (table
-         (tr (th "Package"))
-         ,@(for/list ([n (in-list (sort (get-pkgs) string<=?))])
-             `(tr
-               (td (a ([href ,(get-url display-info n)]) ,n)))))))))
-  (define (write-pkgs req)
-    (response/sexpr (get-pkgs)))
-  (define (write-pkgs/all req)
-    (response/sexpr
-     (for/hash ([n (in-list (get-pkgs))])
-       (values n (pkg-name->info n #:version (req-version req))))))
-  (define-values (dispatch get-url)
-    (dispatch-rules
-     [() list-pkgs]
-     [("") list-pkgs]
-     [("pkgs") write-pkgs]
-     [("pkgs-all") write-pkgs/all]
-     [("pkg" (string-arg) "display") display-info]
-     [("pkg" (string-arg)) write-info]))
-  dispatch)
-
-(define (pkg-index/basic get-pkgs pkg-name->info)
-  (pkg-index/basic+versions
-   get-pkgs
-   (λ (pkg-name #:version version)
-     (pkg-name->info pkg-name))))
-
-(provide
- (contract-out
-  [response/sexpr
-   (-> any/c
-       response?)]
-  [request-binding/string
-   (->* (request? string?)
-        (boolean?)
-        (or/c string? false/c))]
-  [pkg-index/basic+versions
-   (-> (-> (listof string?))
-       (-> string? #:version (or/c string? false/c)
-           (hash/c symbol? any/c))
-       (-> request? response?))]
-  [pkg-index/basic
-   (-> (-> (listof string?))
-       (-> string? (hash/c symbol? any/c))
-       (-> request? response?))]))
diff --git a/pkgs/plt-services/meta/pkg-index/info.rkt b/pkgs/plt-services/meta/pkg-index/info.rkt
deleted file mode 100644
index 34d81080d6..0000000000
--- a/pkgs/plt-services/meta/pkg-index/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang info
-
-(define name "Package server")
-(define compile-omit-paths 'all)
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/plt-services/meta/pkg-index/official/.gitignore b/pkgs/plt-services/meta/pkg-index/official/.gitignore
deleted file mode 100644
index 00298008dd..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/root
-/static-gen
-/static-gen.gz
diff --git a/pkgs/plt-services/meta/pkg-index/official/build-update.rkt b/pkgs/plt-services/meta/pkg-index/official/build-update.rkt
deleted file mode 100644
index a6a3a077ca..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/build-update.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/match
-         racket/file
-         racket/port
-         net/http-client
-         (prefix-in pkg: pkg/lib)
-         "common.rkt"
-         "notify.rkt")
-
-(define SUMMARY-HOST "pkg-build.racket-lang.org")
-(define SUMMARY-URL (string-append "/" SUMMARY-NAME))
-(define SUMMARY-ETAG-PATH (build-path cache-path (format "~a.etag" SUMMARY-NAME)))
-
-(define (extract-tag hs)
-  (or
-   (for/or ([h (in-list hs)])
-     (match h
-       [(regexp
-         #rx#"^ETag: (.*?)$"
-         (list _ tag-bys))
-        tag-bys]
-       [_
-        #f]))
-   #""))
-
-(define (file->bytes* p d)
-  (if (file-exists? p)
-    (file->bytes p)
-    d))
-
-(define (build-update!)
-  (define cur-version
-    (file->bytes* SUMMARY-ETAG-PATH #""))
-  (printf "Current: ~v\n" cur-version)
-
-  (define-values
-    (_0 head-headers _1)
-    (http-sendrecv
-     SUMMARY-HOST SUMMARY-URL
-     #:method #"HEAD"))
-  (define head-version
-    (extract-tag head-headers))
-  (printf "Head: ~v\n" head-version)
-
-  (unless (bytes=? cur-version head-version)
-    (define-values
-      (_2 get-headers get-ip)
-      (http-sendrecv
-       SUMMARY-HOST SUMMARY-URL
-       #:method #"GET"))
-    (define get-version
-      (extract-tag get-headers))
-    (printf "Get: ~v\n" get-version)
-
-    (define new-file
-      (make-temporary-file "summary-~a.rktd" #f cache-path))
-    (call-with-output-file new-file
-      #:exists 'truncate/replace
-      (λ (new-op)
-        (copy-port get-ip new-op)))
-
-    (with-output-to-file SUMMARY-ETAG-PATH
-      #:exists 'truncate/replace
-      (λ ()
-        (write-bytes get-version)))
-
-    (rename-file-or-directory new-file SUMMARY-PATH #t)))
-
-(define (do-build-update! l)
-  (notify! "package build status being checked for updates")
-  (build-update!)
-  (notify! ""))
-(define (run-build-update!)
-  (run! do-build-update! empty))
-(define (signal-build-update!)
-  (thread (λ () (run-build-update!))))
-
-(provide do-build-update!
-         run-build-update!
-         signal-build-update!)
-
-(module+ main
-  (require racket/cmdline)
-  (command-line
-   #:program "build-update"
-   #:args ()
-   (do-build-update! empty)))
diff --git a/pkgs/plt-services/meta/pkg-index/official/common.rkt b/pkgs/plt-services/meta/pkg-index/official/common.rkt
deleted file mode 100644
index 24233f9eb2..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/common.rkt
+++ /dev/null
@@ -1,108 +0,0 @@
-#lang racket/base
-(require racket/file
-         racket/runtime-path
-         pkg/util
-         racket/match
-         racket/list
-         racket/date
-         racket/system
-         racket/string
-         web-server/http/id-cookie)
-
-(define-runtime-path src ".")
-
-(define-runtime-path root "root")
-(make-directory* root)
-(define secret-key
-  (make-secret-salt/file
-   (build-path root "secret.key")))
-(define users-path (build-path root "users"))
-(make-directory* users-path)
-(define users.new-path (build-path root "users.new"))
-(make-directory* users.new-path)
-
-(github-client_id (file->string (build-path root "client_id")))
-(github-client_secret (file->string (build-path root "client_secret")))
-
-(define cache-path (build-path root "cache"))
-(make-directory* cache-path)
-
-(define SUMMARY-NAME "summary.rktd")
-(define SUMMARY-PATH (build-path cache-path SUMMARY-NAME))
-
-(define pkgs-path (build-path root "pkgs"))
-(make-directory* pkgs-path)
-
-(define static.src-path (build-path src "static"))
-(define static-path (build-path src "static-gen"))
-(define notice-path (format "~a/notice.json" static-path))
-
-(define (package-list)
-  (sort (map path->string (directory-list pkgs-path))
-        string-ci<=?))
-(define (package-info pkg-name #:version [version #f])
-  (define no-version (hash-set (file->value (build-path pkgs-path pkg-name)) 'name pkg-name))
-  (cond
-    [(and version
-          (hash-ref no-version 'versions #f)
-          (hash-ref (hash-ref no-version 'versions) version #f))
-     =>
-     (λ (version-ht)
-       (hash-merge version-ht no-version))]
-    [else
-     no-version]))
-
-(define (package-ref pkg-info key)
-  (hash-ref pkg-info key
-            (λ ()
-              (match key
-                [(or 'author 'source)
-                 (error 'pkg "Package ~e is missing a required field: ~e"
-                        (hash-ref pkg-info 'name) key)]
-                ['checksum
-                 ""]
-                ['ring
-                 2]
-                ['checksum-error
-                 #f]
-                ['tags
-                 empty]
-                ['versions
-                 (hash)]
-                [(or 'last-checked 'last-edit 'last-updated)
-                 -inf.0]))))
-
-(define (package-info-set! pkg-name i)
-  (write-to-file i (build-path pkgs-path pkg-name)
-                 #:exists 'replace))
-
-(define (hash-merge from to)
-  (for/fold ([to to])
-      ([(k v) (in-hash from)])
-    (hash-set to k v)))
-
-(define (author->list as)
-  (string-split as))
-
-(define (valid-name? t)
-  (not (regexp-match #rx"[^a-zA-Z0-9_\\-]" t)))
-
-(define (valid-author? a)
-  (not (regexp-match #rx"[ :]" a)))
-
-(define valid-tag?
-  valid-name?)
-
-(define run-sema (make-semaphore 1))
-(define (run! f args)
-  (parameterize ([date-display-format 'iso-8601])
-    (printf "~a: ~a ~v\n" (date->string (current-date) #t) f args)
-    (f args)
-    (printf "~a: done\n" (date->string (current-date) #t))))
-
-(define s3-config (build-path (find-system-path 'home-dir) ".s3cfg-plt"))
-(define s3-bucket "pkgs.racket-lang.org")
-
-(define s3cmd-path (find-executable-path "s3cmd"))
-
-(provide (all-defined-out))
diff --git a/pkgs/plt-services/meta/pkg-index/official/dynamic.rkt b/pkgs/plt-services/meta/pkg-index/official/dynamic.rkt
deleted file mode 100644
index cc22685891..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/dynamic.rkt
+++ /dev/null
@@ -1,443 +0,0 @@
-#lang racket/base
-(require web-server/http
-         "common.rkt"
-         "update.rkt"
-         "notify.rkt"
-         "static.rkt"
-         "build-update.rkt"
-         "jsonp.rkt"
-         web-server/servlet-env
-         racket/file
-         web-server/dispatch
-         racket/match
-         racket/string
-         net/url
-         racket/list
-         net/sendmail
-         meta/pkg-index/basic/main
-         file/sha1
-         (prefix-in bcrypt- bcrypt)
-         version/utils)
-
-(define (package-remove! pkg-name)
-  (delete-file (build-path pkgs-path pkg-name)))
-
-(define (package-exists? pkg-name)
-  (file-exists? (build-path pkgs-path pkg-name)))
-
-(define (hash-deep-merge ht more-ht)
-  (for/fold ([ht ht])
-      ([(k new-v) (in-hash more-ht)])
-    (hash-update ht k
-                 (λ (old-v)
-                   (cond
-                     [(not old-v)
-                      new-v]
-                     [(hash? old-v)
-                      (hash-deep-merge old-v new-v)]
-                     [else
-                      new-v]))
-                 #f)))
-
-(define (curation-administrator? u)
-  (member u '("jay.mccarthy@gmail.com" "mflatt@cs.utah.edu")))
-
-(define (api/upload req)
-  (define req-data (read (open-input-bytes (or (request-post-data/raw req) #""))))
-  (match-define (list email given-password pis) req-data)
-  (define password-path (build-path users.new-path email))
-  (define expected-password (file->bytes password-path))
-  (cond
-    [(not (and (bcrypt-check expected-password given-password)
-               (curation-administrator? email)))
-     (response/sexpr #f)]
-    [else
-     (for ([(p more-pi) (in-hash pis)])
-       (define pi (if (package-exists? p)
-                    (package-info p)
-                    #hash()))
-       (define new-pi (hash-deep-merge pi more-pi))
-       (define updated-pi
-         (let ([now (current-seconds)])
-           (for/fold ([pi new-pi])
-               ([k (in-list '(last-edit last-checked last-updated))])
-             (hash-set pi k now))))
-       (package-info-set! p updated-pi)
-       (signal-update! (list p)))
-     (response/sexpr #t)]))
-
-(define (redirect-to-static req)
-  (redirect-to
-   (url->string
-    (struct-copy url (request-uri req)
-                 [scheme "http"]
-                 [host "pkgs.racket-lang.org"]
-                 [port 80]))))
-
-(define-syntax-rule (define-jsonp/auth (f . pat) . body)
-  (define-jsonp
-    (f
-     ['email email]
-     ['passwd passwd]
-     . pat)
-    (ensure-authenticate email passwd (λ () . body))))
-
-(define (salty str)
-  (sha1 (open-input-string str)))
-
-(define current-user (make-parameter #f))
-(define (ensure-authenticate email passwd body-fun)
-  (define passwd-path (build-path users.new-path email))
-  (define old-passwd-path (build-path users-path email))
-
-  (define (authenticated!)
-    (parameterize ([current-user email])
-      (body-fun)))
-
-  (cond
-    [(and (not (file-exists? passwd-path))
-          (file-exists? old-passwd-path))
-     (cond
-       [(not (bytes=? (file->bytes old-passwd-path)
-                      (string->bytes/utf-8 (salty passwd))))
-        "failed"]
-       [else
-        (display-to-file (bcrypt-encode (string->bytes/utf-8 passwd))
-                         passwd-path)
-        (delete-file old-passwd-path)
-        (authenticated!)])]
-    [(not (file-exists? passwd-path))
-     "new-user"]
-    [(not (bcrypt-check (file->bytes passwd-path)
-                        (string->bytes/utf-8 passwd)))
-     "failed"]
-    [else
-     (authenticated!)]))
-
-(define email-codes (make-hash))
-(define-jsonp
-  (jsonp/authenticate
-   ['email email]
-   ['passwd passwd]
-   ['code email-code])
-
-  (define passwd-path (build-path users.new-path email))
-  (define (generate-a-code email)
-    (define correct-email-code
-      (number->string (random (expt 10 8))))
-
-    (hash-set! email-codes email correct-email-code)
-
-    correct-email-code)
-  (define (check-code-or true false)
-    (cond
-      [(and (not (string=? "" email-code))
-            (hash-ref email-codes email #f))
-       => (λ (correct-email-code)
-            (cond
-              [(equal? correct-email-code email-code)
-               (display-to-file (bcrypt-encode (string->bytes/utf-8 passwd))
-                                passwd-path
-                                #:exists 'replace)
-
-               (hash-remove! email-codes email)
-
-               (true)]
-              [else
-               "wrong-code"]))]
-      [else
-       (false)
-
-       #f]))
-
-  (match (ensure-authenticate email passwd (λ () #t))
-    ["failed"
-     (check-code-or
-      (λ () (hasheq 'curation (curation-administrator? email)))
-      (λ ()
-        (send-mail-message
-         "pkg@racket-lang.org"
-         "Account password reset for Racket Package Catalog"
-         (list email)
-         empty empty
-         (list
-          "Someone tried to login with your email address for an account on the Racket Package Catalog, but failed."
-          "If you this was you, please use this code to reset your password:"
-          ""
-          (generate-a-code email)
-          ""
-          "This code will expire, so if it is not available, you'll have to try to again."))))]
-    ["new-user"
-     (check-code-or
-      (λ () #t)
-      (λ ()
-        (send-mail-message
-         "pkg@racket-lang.org"
-         "Account confirmation for Racket Package Catalog"
-         (list email)
-         empty empty
-         (list
-          "Someone tried to register your email address for an account on the Racket Package Catalog."
-          "If you want to proceed, use this code:"
-          ""
-          (generate-a-code email)
-          ""
-          "This code will expire, so if it is not available, you'll have to try to register again."))))]
-    [#t
-     (hasheq 'curation (curation-administrator? email))]))
-
-(define-jsonp/auth
-  (jsonp/package/modify
-   ['pkg pkg]
-   ['name mn-name]
-   ['description mn-desc]
-   ['source mn-source])
-  (cond
-    [(equal? pkg "")
-     (cond
-       [(package-exists? mn-name)
-        #f]
-       [else
-        (package-info-set! mn-name
-                           (hasheq 'name mn-name
-                                   'source mn-source
-                                   'author (current-user)
-                                   'description mn-desc
-                                   'last-edit (current-seconds)))
-        (signal-update! (list mn-name))
-        #t])]
-    [else
-     (ensure-package-author
-      pkg
-      (λ ()
-        (cond
-          [(equal? mn-name pkg)
-           (package-info-set! pkg
-                              (hash-set* (package-info pkg)
-                                         'source mn-source
-                                         'description mn-desc
-                                         'last-edit (current-seconds)))
-           (signal-update! (list pkg))
-           #t]
-          [(and (valid-name? mn-name)
-                (not (package-exists? mn-name)))
-           (package-info-set! mn-name
-                              (hash-set* (package-info pkg)
-                                         'name mn-name
-                                         'source mn-source
-                                         'description mn-desc
-                                         'last-edit (current-seconds)))
-           (package-remove! pkg)
-           (signal-update! (list mn-name))
-           #t]
-          [else
-           #f])))]))
-
-(define-jsonp/auth
-  (jsonp/package/version/add
-   ['pkg pkg]
-   ['version version]
-   ['source source])
-  (ensure-package-author
-   pkg
-   (λ ()
-     (cond
-       [(valid-version? version)
-        (package-info-set!
-         pkg
-         (hash-update (package-info pkg) 'versions
-                      (λ (v-ht)
-                        (hash-set v-ht version
-                                  (hasheq 'source source
-                                          'checksum "")))
-                      hash))
-        (signal-update! (list pkg))
-        #t]
-       [else
-        #f]))))
-
-(define-jsonp/auth
-  (jsonp/package/version/del
-   ['pkg pkg]
-   ['version version])
-  (ensure-package-author
-   pkg
-   (λ ()
-     (cond
-       [(valid-version? version)
-        (package-info-set!
-         pkg
-         (hash-update (package-info pkg) 'versions
-                      (λ (v-ht)
-                        (hash-remove v-ht version))
-                      hash))
-        (signal-update! (list pkg))
-        #t]
-       [else
-        #f]))))
-
-(define (tags-normalize ts)
-  (remove-duplicates (sort ts string-ci<?)))
-
-(define-jsonp/auth
-  (jsonp/package/tag/add
-   ['pkg pkg]
-   ['tag tag])
-  (cond
-    [(valid-tag? tag)
-     (define i (package-info pkg))
-     (package-info-set!
-      pkg
-      (hash-set i 'tags (tags-normalize (cons tag (package-ref i 'tags)))))
-     (signal-static! (list pkg))
-     #t]
-    [else
-     #f]))
-
-(define-jsonp/auth
-  (jsonp/package/tag/del
-   ['pkg pkg]
-   ['tag tag])
-  (ensure-package-author
-   pkg
-   (λ ()
-     (define i (package-info pkg))
-     (package-info-set!
-      pkg
-      (hash-set i 'tags
-                (remove tag
-                        (package-ref i 'tags))))
-     (signal-static! (list pkg))
-     #t)))
-
-(define-jsonp/auth
-  (jsonp/package/author/add
-   ['pkg pkg]
-   ['author author])
-  (ensure-package-author
-   pkg
-   (λ ()
-     (cond
-       [(valid-author? author)
-        (define i (package-info pkg))
-        (package-info-set!
-         pkg
-         (hash-set i 'author (format "~a ~a" (package-ref i 'author) author)))
-        (signal-static! (list pkg))
-        #t]
-       [else
-        #f]))))
-
-(define (ensure-package-author pkg f)
-  (cond
-    [(package-author? pkg (current-user))
-     (f)]
-    [else
-     #f]))
-
-(define-jsonp/auth
-  (jsonp/package/author/del
-   ['pkg pkg]
-   ['author author])
-  (ensure-package-author
-   pkg
-   (λ ()
-     (cond
-       [(not (equal? (current-user) author))
-        (define i (package-info pkg))
-        (package-info-set!
-         pkg
-         (hash-set i 'author
-                   (string-join
-                    (remove author
-                            (author->list (package-ref i 'author))))))
-        (signal-static! (list pkg))
-        #t]
-       [else
-        #f]))))
-
-(define-jsonp/auth
-  (jsonp/package/del
-   ['pkg pkg])
-  (ensure-package-author
-   pkg
-   (λ ()
-     (package-remove! pkg)
-     (signal-static! empty)
-     #f)))
-
-(define-jsonp/auth
-  (jsonp/package/curate
-   ['pkg pkg]
-   ['ring ring-s])
-  (cond
-    [(curation-administrator? (current-user))
-     (define i (package-info pkg))
-     (define ring-n (string->number ring-s))
-     (package-info-set!
-      pkg
-      (hash-set i 'ring (min 2 (max 0 ring-n))))
-     (signal-static! (list pkg))
-     #t]
-    [else
-     #f]))
-
-(define (package-author? p u)
-  (define i (package-info p))
-  (member u (author->list (package-ref i 'author))))
-
-(define (packages-of u)
-  (filter (λ (p) (package-author? p u)) (package-list)))
-
-(define-jsonp/auth
-  (jsonp/update)
-  (signal-update! (packages-of (current-user)))
-  #t)
-
-(define jsonp/notice
-  (make-jsonp-responder (λ (args) (file->string notice-path))))
-
-(define-values (main-dispatch main-url)
-  (dispatch-rules
-   [("jsonp" "authenticate") jsonp/authenticate]
-   [("jsonp" "update") jsonp/update]
-   [("jsonp" "package" "del") jsonp/package/del]
-   [("jsonp" "package" "modify") jsonp/package/modify]
-   [("jsonp" "package" "version" "add") jsonp/package/version/add]
-   [("jsonp" "package" "version" "del") jsonp/package/version/del]
-   [("jsonp" "package" "tag" "add") jsonp/package/tag/add]
-   [("jsonp" "package" "tag" "del") jsonp/package/tag/del]
-   [("jsonp" "package" "author" "add") jsonp/package/author/add]
-   [("jsonp" "package" "author" "del") jsonp/package/author/del]
-   [("jsonp" "package" "curate") jsonp/package/curate]
-   [("api" "upload") #:method "post" api/upload]
-   [("jsonp" "notice") jsonp/notice]
-   [else redirect-to-static]))
-
-(define-syntax-rule (forever . body)
-  (let loop () (begin . body) (loop)))
-
-(define (go port)
-  (printf "launching on port ~a\n" port)
-  (signal-static! empty)
-  (thread
-   (λ ()
-     (forever
-      (printf "Running scheduled build update.\n")
-      (signal-build-update!)
-      (printf "Running scheduled update.\n")
-      (signal-update! empty)      
-      (sleep (* 1 60 60)))))
-  (serve/servlet
-   main-dispatch
-   #:command-line? #t
-   #:listen-ip #f
-   #:ssl? #t
-   #:ssl-cert (build-path root "server-cert.pem")
-   #:ssl-key (build-path root "private-key.pem")
-   #:extra-files-paths empty
-   #:servlet-regexp #rx""
-   #:port port))
-
-(module+ main
-  (go 9004))
diff --git a/pkgs/plt-services/meta/pkg-index/official/gravatar.rkt b/pkgs/plt-services/meta/pkg-index/official/gravatar.rkt
deleted file mode 100644
index 30bc99bf44..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/gravatar.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-(require racket/string
-         racket/contract
-         xml
-         xml/path
-         racket/port
-         net/url
-         file/md5
-         pkg/util)
-
-(define (gravatar-hash email)
-  (bytes->string/utf-8
-   (md5
-    (string-downcase
-     (string-trim email)))))
-
-(module+ test
-  (require rackunit)
-  (check-equal? (gravatar-hash "MyEmailAddress@example.com ")
-                "0bc83cb571cd1c50ba6f3e8a78ef1346")
-  (check-equal? (gravatar-hash "MyEmailAddress@example.com ")
-                (gravatar-hash "    MyEmailAddress@example.com     ")))
-
-(define (gravatar-image-url email)
-  (format "https://secure.gravatar.com/avatar/~a.jpg?d=retro"
-          (gravatar-hash email)))
-
-(define (gravatar-profile email)
-  (parameterize ([collapse-whitespace #t]
-                 [xexpr-drop-empty-attributes #t])
-    (call/input-url+200
-     (string->url
-      (format "http://www.gravatar.com/~a.xml"
-              (gravatar-hash email)))
-     (compose string->xexpr port->string))))
-
-(define (gravatar-display-name email)
-  (define profile (gravatar-profile email))
-  (and profile
-       (se-path* '(response entry displayName)
-                 profile)))
-
-(module+ test
-  (check-equal? (gravatar-display-name "jay.mccarthy@gmail.com")
-                "Jay McCarthy")
-  (check-equal? (gravatar-display-name "jay@racket-lang.org")
-                #f))
-
-(provide/contract
- [gravatar-display-name (-> string? (or/c string? false/c))]
- [gravatar-profile (-> string? xexpr?)]
- [gravatar-image-url (-> string? string?)])
diff --git a/pkgs/plt-services/meta/pkg-index/official/jsonp.rkt b/pkgs/plt-services/meta/pkg-index/official/jsonp.rkt
deleted file mode 100644
index 854aa4e0dd..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/jsonp.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-(require json
-         web-server/http
-         racket/match)
-
-(define (response/jsonp callback o)
-  (response/output
-   (λ (op)
-     (fprintf op "~a(" callback)
-     (write-json o op)
-     (fprintf op ");"))
-   #:mime-type #"application/javascript"))
-
-(define (request-jsonp-data req)
-  (for/fold ([ht (hasheq)])
-      ([b (in-list (request-bindings/raw req))])
-    (match b
-      [(binding:form id value)
-       (define p (map string->symbol (parse-jsonp-path (bytes->string/utf-8 id))))
-       (hash*-set ht p
-                  (bytes->string/utf-8 value))]
-      [_ ht])))
-
-(define parse-jsonp-path
-  (match-lambda
-   [(regexp #rx"^([^[]+)\\[([^]]+)\\](.*)$"
-            (list _ fst snd rst))
-    (list* fst (parse-jsonp-path (format "~a~a" snd rst)))]
-   [s
-    (list s)]))
-
-(define (hash*-set ht p v)
-  (match p
-    [(list k)
-     (hash-set ht k v)]
-    [(list-rest f r)
-     (hash-update ht f (λ (fht) (hash*-set fht r v)) (hasheq))]))
-
-(define (make-jsonp-responder f)
-  (λ (req)
-    (define og (request-jsonp-data req))
-    (response/jsonp
-     (hash-ref og 'callback)
-     (f (hash-remove (hash-remove og 'callback) '_)))))
-
-(define-syntax-rule (define-jsonp (f . pat) . body)
-  (define f
-    (make-jsonp-responder
-     (match-lambda [(hash-table . pat) . body]
-                   [x (error 'f "ill formatted request: ~v" x)]))))
-
-(provide define-jsonp
-         make-jsonp-responder)
diff --git a/pkgs/plt-services/meta/pkg-index/official/notify.rkt b/pkgs/plt-services/meta/pkg-index/official/notify.rkt
deleted file mode 100644
index d9575361f9..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/notify.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/file
-         racket/path
-         racket/system
-         racket/match
-         "common.rkt")
-
-(define (upload-notice! m)
-  (display-to-file m notice-path #:exists 'replace))
-
-(module+ main
-  (require racket/cmdline)
-  (command-line
-   #:program "notify"
-   #:args (message)
-   (upload-notice! message)))
-
-(define (do-notify! l)
-  (upload-notice! (first l)))
-(define (notify! m)
-  (run! do-notify! (list m)))
-
-(provide do-notify!
-         notify!)
diff --git a/pkgs/plt-services/meta/pkg-index/official/s3.rkt b/pkgs/plt-services/meta/pkg-index/official/s3.rkt
deleted file mode 100644
index 73a259ccc9..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/s3.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/file
-         racket/path
-         racket/system
-         file/gzip
-         racket/match
-         "common.rkt"
-         "notify.rkt")
-
-(define (upload-all)
-  (gzip (format "~a/pkgs-all.json" static-path)
-        (format "~a/pkgs-all.json.gz" static-path))
-
-  (delete-file (format "~a/pkgs-all.json" static-path))
-
-  (notify! "update upload in progress: there may be inconsistencies below")
-  (system* s3cmd-path
-           "-c" s3-config
-           "sync"
-           "-m" "application/javascript"
-           "--acl-public"
-           "--add-header" "Content-Encoding:gzip"
-           "--delete-removed"
-           (format "~a/pkgs-all.json.gz" static-path)
-           (format "s3://~a/pkgs-all.json.gz" s3-bucket))
-
-  (system* s3cmd-path
-           "-c" s3-config
-           "sync"
-           "-M"
-           "--acl-public"
-           "--delete-removed"
-           (format "~a/" static-path)
-           (format "s3://~a/" s3-bucket))
-  (notify! "")
-
-  (void))
-
-(define (upload-pkgs pkgs)
-  ;; FUTURE make this more efficient
-  (upload-all))
-(define (run-s3! pkgs)
-  (run! upload-pkgs pkgs))
-(define (signal-s3! pkgs)
-  (thread (λ () (run-s3! pkgs))))
-
-(provide upload-pkgs
-         run-s3!
-         signal-s3!)
-
-(module+ main
-  (require racket/cmdline)
-  (command-line
-   #:program "s3"
-   #:args pkgs
-   (cond
-     [(empty? pkgs)
-      (upload-all)]
-     [else
-      (upload-pkgs pkgs)])))
diff --git a/pkgs/plt-services/meta/pkg-index/official/static.rkt b/pkgs/plt-services/meta/pkg-index/official/static.rkt
deleted file mode 100644
index 4cd28520be..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/static.rkt
+++ /dev/null
@@ -1,403 +0,0 @@
-#lang racket/base
-(require web-server/http
-         web-server/dispatch
-         racket/file
-         racket/port
-         racket/system
-         racket/match
-         json
-         racket/date
-         net/url
-         xml
-         racket/list
-         racket/path
-         racket/promise
-         meta/pkg-index/basic/main
-         "common.rkt"
-         "notify.rkt"
-         "s3.rkt")
-
-(define convert-to-json
-  (match-lambda
-   [(? list? l)
-    (map convert-to-json l)]
-   [(? string? s)
-    s]
-   [(? hash? ht)
-    (for/hash ([(k v) (in-hash ht)])
-      (values (convert-to-json-key k)
-              (convert-to-json v)))]
-   [(? number? n)
-    n]
-   [(? boolean? b)
-    b]
-   [(? symbol? s)
-    (symbol->string s)]
-   [(? keyword? s)
-    (hasheq 'kw (keyword->string s))]
-   [x
-    (error 'convert-to-json "~e" x)]))
-(define convert-to-json-key
-  (match-lambda
-   [(? string? s)
-    (string->symbol s)]
-   [(? symbol? s)
-    s]
-   [x
-    (error 'convert-to-json-key "~e" x)]))
-
-(define (file->value* p dv)
-  (if (file-exists? p)
-    (file->value p)
-    dv))
-
-;; From pkg-build/summary
-(struct doc/main (name path) #:prefab)
-(struct doc/extract (name path) #:prefab)
-(struct doc/salvage (name path) #:prefab)
-(struct doc/none (name) #:prefab)
-(struct conflicts/indirect (path) #:prefab)
-
-(define (generate-static)
-  (define pkg-list (package-list))
-  (define pkg-ht (make-hash))
-  (define build-summary (file->value* SUMMARY-PATH (hash)))
-
-  (for ([pkg-name (in-list pkg-list)])
-    (define ht (file->value (build-path pkgs-path pkg-name)))
-
-    (define versions-ht
-      (hash-set (hash-ref ht 'versions (hash))
-                'default
-                (hasheq 'source (hash-ref ht 'source "")
-                        'checksum (hash-ref ht 'checksum ""))))
-
-    (define (hash-ref-or ht ks)
-      (or (for/or ([k (in-list ks)])
-            (hash-ref ht k #f))
-          (error 'hash-ref-or "Keys (~v) not found in ~e" ks ht)))
-
-    (define versions-5.3.6
-      (hash-ref-or versions-ht '("5.3.6" default)))
-    (define source-5.3.6
-      (hash-ref versions-5.3.6 'source))
-    (define checksum-5.3.6
-      (hash-ref versions-5.3.6 'checksum))
-
-    (hash-set!
-     pkg-ht pkg-name
-     (hash-set* ht
-                'name pkg-name
-                'source source-5.3.6
-                'checksum checksum-5.3.6
-                'last-updated (hash-ref ht 'last-updated (current-seconds))
-                'last-checked (hash-ref ht 'last-checked (current-seconds))
-                'last-edit (hash-ref ht 'last-edit (current-seconds))
-                'versions versions-ht
-                'ring (hash-ref ht 'ring 2)
-                'dependencies (hash-ref ht 'dependencies empty)
-                'modules (hash-ref ht 'modules empty)
-                'tags (hash-ref ht 'tags empty)
-                'authors (author->list (hash-ref ht 'author "")))))
-
-  (define (package-info pn)
-    (hash-ref pkg-ht pn))
-
-  (define (format-time s)
-    (if s
-      (with-handlers ([exn:fail? (λ (x) "")])
-        (parameterize ([date-display-format 'iso-8601])
-          (date->string (seconds->date s #f) #t)))
-      ""))
-
-  (define (module-lists-conflict? left right)
-    (define seen? (make-hash))
-    (for ([l (in-list left)])
-      (hash-set! seen? l #t))
-    (for/or ([r (in-list right)])
-      (hash-ref seen? r #f)))
-
-  (define (string-min x y)
-    (if (string<=? x y)
-      x
-      y))
-
-  (define (string-max x y)
-    (if (string<? x y)
-      y
-      x))
-
-  (define (packages-conflict? left right)
-    (define left-i (package-info left))
-    (define right-i (package-info right))
-    (define left-m (and left-i (hash-ref left-i 'modules #f)))
-    (define right-m (and right-i (hash-ref right-i 'modules #f)))
-    (if (and left-m right-m)
-      (module-lists-conflict? left-m right-m)
-      ;; We have to say #t here because otherwise things with no
-      ;; information won't be conflicting.
-      #t))
-
-  (define conflict-cache
-    (make-hash))
-
-  (define (packages-conflict?/cache left right)
-    (define smin (string-min left right))
-    (define smax (string-max left right))
-    (hash-ref! conflict-cache
-               (cons smin smax)
-               (λ ()
-                 (packages-conflict? smin smax))))
-
-  (define ring-01
-    (filter (λ (p) (member (hash-ref (package-info p) 'ring) '(0 1))) pkg-list))
-
-  (define (package-conflicts? pkg)
-    (filter (λ (other-pkg)
-              (if (equal? pkg other-pkg)
-                #f
-                (packages-conflict?/cache pkg other-pkg)))
-            ring-01))
-
-  (define (package-url->useful-url pkg-url-str)
-    (define pkg-url
-      (string->url pkg-url-str))
-    (match (url-scheme pkg-url)
-      ["github"
-       (match (url-path pkg-url)
-         [(list* user repo branch path)
-          (url->string
-           (struct-copy
-            url pkg-url
-            [scheme "http"]
-            [path (list* user repo (path/param "tree" empty) branch path)]))]
-         [_
-          pkg-url-str])]
-      ["git"
-       (match (url-path pkg-url)
-         ;; xxx make this more robust
-         [(list user repo)
-          (url->string
-           (struct-copy
-            url pkg-url
-            [scheme "http"]
-            [path (list user repo (path/param "tree" empty)
-                        (path/param "master" empty))]))]
-         [_
-          pkg-url-str])]
-      [_
-       pkg-url-str]))
-
-  (for ([pkg (in-hash-keys pkg-ht)])
-    (define pb (hash-ref build-summary pkg #f))
-    (define (pbl k)
-      (and pb (hash-ref pb k #f)))
-
-    (hash-update!
-     pkg-ht pkg
-     (λ (ht)
-       (define conflicts (package-conflicts? pkg))
-       (hash-set*
-        ht
-        'build
-        (hash 'success-log (pbl 'success-log)
-              'failure-log (pbl 'failure-log)
-              'dep-failure-log (pbl 'dep-failure-log)
-              'conflicts-log 
-              (match (pbl 'conflicts-log)
-                [#f #f]
-                [(? path-string? f) f]
-                [(conflicts/indirect file)
-                 (list "indirect" file)])
-              'docs
-              (for/list ([d (in-list (or (pbl 'docs) empty))])
-                (match d
-                  [(doc/main n p) (list "main" n p)]
-                  [(doc/extract n p) (list "extract" n p)]
-                  [(doc/salvage n p) (list "salvage" n p)]
-                  [(doc/none n) (list "none" n)])))
-        'conflicts conflicts
-        'versions
-        (for/hash ([(v vht) (in-hash (hash-ref ht 'versions))])
-          (values v
-                  (hash-set vht 'source_url
-                            (package-url->useful-url (hash-ref vht 'source)))))
-        'search-terms
-        (let* ([st (hasheq)]
-               [st (for/fold ([st st])
-                       ([t (in-list (hash-ref ht 'tags))])
-                     (hash-set st (string->symbol t) #t))]
-               [st (hash-set
-                    st
-                    (string->symbol
-                     (format "ring:~a" (hash-ref ht 'ring))) #t)]
-               [st (for/fold ([st st])
-                       ([a (in-list (author->list (hash-ref ht 'author)))])
-                     (hash-set
-                      st (string->symbol (format "author:~a" a)) #t))]
-               [st (if (empty? (hash-ref ht 'tags))
-                     (hash-set st ':no-tag: #t)
-                     st)]
-               [st (if (hash-ref ht 'checksum-error #f)
-                     (hash-set st ':error: #t)
-                     st)]
-               [st (if (equal? "" (hash-ref ht 'description ""))
-                     (hash-set st ':no-desc: #t)
-                     st)]
-               [st (if (empty? conflicts)
-                     st
-                     (hash-set st ':conflicts: #t))]
-               [st (if (pbl 'success-log)                     
-                     (hash-set st ':build-success: #t)
-                     st)]
-               [st (if (pbl 'failure-log)                     
-                     (hash-set st ':build-fail: #t)
-                     st)]
-               [st (if (pbl 'dep-failure-log)                     
-                     (hash-set st ':build-dep-fail: #t)
-                     st)]
-               [st (if (pbl 'conflicts-log)                     
-                     (hash-set st ':build-conflicts: #t)
-                     st)]
-               [pb-docs (pbl 'docs)]
-               [st (if (and pb-docs (cons? pb-docs)
-                            (andmap (λ (d)
-                                      (or (doc/main? d)
-                                          (doc/extract? d)
-                                          (doc/salvage? d)))
-                                    pb-docs))
-                     (hash-set st ':docs: #t)
-                     st)]
-               [st (if (and pb-docs (cons? pb-docs)
-                            (andmap (λ (d)
-                                      (or (doc/extract? d)
-                                          (doc/salvage? d)
-                                          (doc/none? d)))
-                                    pb-docs))
-                     (hash-set st ':docs-error: #t)
-                     st)])
-          st)))))
-
-
-  (define basic-dispatch
-    (pkg-index/basic
-     (λ () pkg-list)
-     (λ (pkg-name) (hash-ref pkg-ht pkg-name))))
-
-  (define (page/atom.xml req)
-    (define ps
-      (sort (map package-info pkg-list)
-            >
-            #:key (λ (i) (hash-ref i 'last-updated))))
-    (define top (hash-ref (first ps) 'last-updated))
-    (define (atom-format-time t)
-      (format "~aZ" (format-time t)))
-    (response/xexpr
-     #:mime-type #"application/atom+xml"
-     `(feed
-       ([xmlns "http://www.w3.org/2005/Atom"])
-       (title ,(cdata #f #f (format "<![CDATA[~a]]>"
-                                    "Racket Package Updates")))
-       (link ([href "https://pkg.racket-lang.org/rss"]
-              [rel "self"]))
-       (link ([href "https://pkg.racket-lang.org/"]))
-       (updated ,(atom-format-time top))
-       (id "https://pkg.racket-lang.org/")
-       ,@(for/list ([i (in-list ps)])
-           (define p (hash-ref i 'name))
-           (define this-url
-             (format "http://pkg.racket-lang.org/#[~a]"
-                     p))
-           (define lu (atom-format-time (hash-ref i 'last-updated)))
-           (define a (first (author->list (hash-ref i 'author))))
-           (match-define (regexp #rx"^([^@]+)" (list _ n)) a)
-           `(entry
-             (title ([type "html"])
-                    ,(cdata #f #f (format "<![CDATA[~a]]>" p)))
-             (link ([href ,this-url]))
-             (updated ,lu)
-             (author (name ,n) (email ,a))
-             (id ,this-url)
-             (content
-              ([type "html"])
-              ,(cdata #f #f
-                      (format "<![CDATA[~a]]>"
-                              (xexpr->string
-                               `(div
-                                 (p ,(format "~a package updated on ~a."
-                                             p lu))
-                                 (p ,(format
-                                      "Checksum: ~a"
-                                      (hash-ref (hash-ref (hash-ref i 'versions (hash)) 
-                                                          'default (hasheq))
-                                                'checksum "")))
-                                 (p ,(hash-ref i 'description))))))))))))
-
-  (define-values (main-dispatch main-url)
-    (dispatch-rules
-     [("atom.xml") page/atom.xml]
-     [else basic-dispatch]))
-
-  (define (url->request u)
-    (make-request #"GET" (string->url u) empty
-                  (delay empty) #f "1.2.3.4" 80 "4.3.2.1"))
-
-  (define (cache url file)
-    (define p (build-path static-path file))
-    (make-directory* (path-only p))
-
-    (define bs
-      (with-output-to-bytes
-       (λ ()
-         ((response-output (main-dispatch (url->request url)))
-          (current-output-port)))))
-    (unless (and (file-exists? p)
-                 (bytes=? bs (file->bytes p)))
-      (with-output-to-file p
-        #:exists 'replace
-        (λ () (display bs)))
-      (with-output-to-file (path-add-suffix p #".json")
-        #:exists 'replace
-        (λ () (write-json (convert-to-json (file->value p))))))
-    (void))
-
-  (system (format "cp -pr ~a/* ~a/"
-                  static.src-path
-                  static-path))
-
-  (cache "/atom.xml" "atom.xml")
-  (cache "/pkgs" "pkgs")
-  (cache "/pkgs-all" "pkgs-all")
-  (for ([p (in-list pkg-list)])
-    (cache (format "/pkg/~a" p) (format "pkg/~a" p)))
-
-  (let ()
-    (define pkg-path (build-path static-path "pkg"))
-    (for ([f (in-list (directory-list pkg-path))]
-          #:unless (regexp-match #"json$" (path->string f))
-          #:unless (member (path->string f) pkg-list))
-      (with-handlers ([exn:fail:filesystem? void])
-        (delete-file (build-path pkg-path f))
-        (delete-file (build-path pkg-path (path-add-suffix f #".json")))))))
-
-(define (do-static pkgs)
-  (notify! "update upload being computed: the information below may not represent all recent changes and updates")
-   ;; FUTURE make this more efficient by looking at pkgs
-  (generate-static)
-  (run-s3! pkgs))
-(define (run-static! pkgs)
-  (run! do-static pkgs))
-(define (signal-static! pkgs)
-  (thread (λ () (run-static! pkgs))))
-
-(provide do-static
-         run-static!
-         signal-static!)
-
-(module+ main
-  (require racket/cmdline)
-
-  (command-line
-   #:program "static"
-   #:args pkgs
-   (do-static pkgs)))
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/entypo.ttf b/pkgs/plt-services/meta/pkg-index/official/static/entypo.ttf
deleted file mode 100644
index 331ea3a1bc..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/entypo.ttf and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/entypo.woff b/pkgs/plt-services/meta/pkg-index/official/static/entypo.woff
deleted file mode 100644
index b0771de821..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/entypo.woff and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/favicon.ico b/pkgs/plt-services/meta/pkg-index/official/static/favicon.ico
deleted file mode 100644
index 70627fc53e..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/favicon.ico and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/gumby.css b/pkgs/plt-services/meta/pkg-index/official/static/gumby.css
deleted file mode 100644
index 3e876769fe..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/static/gumby.css
+++ /dev/null
@@ -1,1886 +0,0 @@
-@charset "UTF-8";
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:500,400,300,600,700);
-@import url(http://fonts.googleapis.com/css?family=Inconsolata);
-/**
-* Gumby Framework
-* ---------------
-*
-* Follow @gumbycss on twitter and spread the love.
-* We worked super hard on making this awesome and released it to the web.
-* All we ask is you leave this intact. #gumbyisawesome
-*
-* Gumby Framework
-* http://gumbyframework.com
-*
-* Built with love by your friends @digitalsurgeons
-* http://www.digitalsurgeons.com
-*
-* Free to use under the MIT license.
-* http://www.opensource.org/licenses/mit-license.php
-*/
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; padding: 0; border: 0; font: inherit; font-size: 100%; vertical-align: baseline; }
-
-tt { margin: 0; padding: 0; border: 0; font-size: 100%; vertical-align: baseline; }
-
-b { font-weight: bold; }
-
-html { line-height: 1; }
-
-ol, ul { list-style: none; }
-
-table { border-collapse: collapse; border-spacing: 0; }
-
-caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; }
-
-q, blockquote { quotes: none; }
-q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; }
-
-a img { border: none; }
-
-article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { display: block; }
-
-* html { font-size: 100%; }
-
-html { font-size: 16px; line-height: 1.625em; }
-
-html * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; }
-
-body { background: white; font-family: "Open Sans"; font-weight: 400; color: #1e1e1e; position: relative; -webkit-font-smoothing: antialiased; }
-@media only screen and (max-width: 767px) { body { -webkit-text-size-adjust: none; -ms-text-size-adjust: none; width: 100%; min-width: 0; } }
-
-html, body { height: 100%; }
-
-.ie9 { font-family: "Open Sans"; }
-.ie9 * { font-family: "Open Sans"; }
-
-.hide { display: none; }
-
-.hide.active, .show { display: block; }
-
-.fixed { position: fixed; }
-.fixed.pinned { position: absolute; }
-@media only screen and (max-width: 768px) { .fixed { position: relative !important; top: auto !important; left: auto !important; } }
-
-.unfixed { position: relative !important; top: auto !important; left: auto !important; }
-
-.text-center { text-align: center; }
-
-.text-left { text-align: left; }
-
-.text-right { text-align: right; }
-
-/* Fonts */
-@font-face { font-family: "entypo"; font-style: normal; font-weight: 400; src: url(./entypo.eot); src: url("./entypo.eot?#iefix") format("ie9-skip-eot"), url("./entypo.woff") format("woff"), url("./entypo.ttf") format("truetype"); }
-
-h1, h2, h3, h4, h5, h6 { font-family: "Open Sans"; font-weight: 500; color: black; text-rendering: optimizeLegibility; padding-top: 0.273em; line-height: 1.15538em; padding-bottom: 0.273em; }
-h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { color: #d04526; }
-
-@media only screen and (max-width: 767px) { h1, h2, h3, h4, h5, h6 { word-wrap: break-word; } }
-h1 { font-size: 68px; font-size: 4.25rem; }
-h1.xlarge { font-size: 110px; font-size: 6.875rem; }
-h1.xxlarge { font-size: 126px; font-size: 7.875rem; }
-h1.absurd { font-size: 177px; font-size: 11.0625rem; }
-
-h2 { font-size: 42px; font-size: 2.625rem; padding-top: 18px; padding-bottom: 16px; }
-
-h3 { font-size: 30px; font-size: 1.875rem; padding-top: 16px; padding-bottom: 16px; }
-
-h4 { font-size: 26px; font-size: 1.625rem; }
-
-h5 { font-size: 18px; font-size: 1.125rem; }
-
-h6 { font-size: 16px; font-size: 1rem; }
-
-@media only screen and (max-width: 767px) { h1 { font-size: 42px; font-size: 2.625rem; }
-  h2 { font-size: 36px; font-size: 2.25rem; } }
-.subhead { color: #777; font-weight: normal; margin-bottom: 20px; }
-
-/*=====================================================  Links & Paragraph styles  ======================================================*/
-p { font-family: "Open Sans"; font-weight: 400; color: black; font-size: 16px; font-size: 1rem; margin-bottom: 13px; line-height: 1.625em; }
-p.lead { font-size: 20px; font-size: 1.25rem; margin-bottom: 18px; }
-@media only screen and (max-width: 768px) { p { font-size: 17.6px; font-size: 1.1rem; line-height: 1.625em; } }
-
-a { color: rgba(44, 33, 206, 1); text-decoration: none; outline: 0; line-height: inherit; }
-a:hover { color: #c03d20; }
-
-/*=====================================================
- Lists  ======================================================*/
-ul, ol { margin-bottom: 0.273em; }
-
-ul { list-style: none outside; }
-
-ol { list-style: decimal; margin-left: 30px; }
-
-ul.square, ul.circle, ul.disc { margin-left: 25px; }
-ul.square { list-style: square outside; }
-ul.circle { list-style: circle outside; }
-ul.disc { list-style: disc outside; }
-ul ul { margin: 4px 0 5px 25px; }
-
-ol ol { margin: 4px 0 5px 30px; }
-
-li { padding-bottom: 0.273em; }
-
-ul.large li { line-height: 21px; }
-
-dl dt { font-weight: bold; font-size: 16px; font-size: 1rem; }
-
-@media only screen and (max-width: 768px) { ul, ol, dl, p { text-align: left; } }
-/* Mobile */
-em { font-style: italic; line-height: inherit; }
-
-strong { font-weight: 700; line-height: inherit; }
-
-small { font-size: 56.4%; line-height: inherit; }
-
-h1 small, h2 small, h3 small, h4 small, h5 small { color: #777; }
-
-/*  Blockquotes  */
-blockquote { line-height: 20px; color: #777; margin: 0 0 18px; padding: 9px 20px 0 19px; border-left: 5px solid #cccccc; }
-blockquote p { line-height: 20px; color: #777; }
-blockquote cite { display: block; font-size: 12px; font-size: 1.2rem; color: #1e1e1e; }
-blockquote cite:before { content: "\2014 \0020"; }
-blockquote cite a { color: #1e1e1e; }
-blockquote cite a:visited { color: #1e1e1e; }
-
-hr { border: 1px solid #cccccc; clear: both; margin: 16px 0 18px; height: 0; }
-
-abbr, acronym { text-transform: uppercase; font-size: 90%; color: #222; border-bottom: 1px solid #cccccc; cursor: help; }
-
-abbr { text-transform: none; }
-
-pre, code { color: black; font-family: 'Inconsolata', monospace; }
-
-/** Print styles.  Inlined to avoid required HTTP connection: www.phpied.com/delay-loading-your-print-css/ Credit to Paul Irish and HTML5 Boilerplate (html5boilerplate.com) */
-@media print { * { background: transparent !important; color: black !important; text-shadow: none !important; filter: none !important; -ms-filter: none !important; }
-  /* Black prints faster: sanbeiji.com/archives/953 */
-  p a { color: #1e1e1e !important; text-decoration: underline; }
-  p a:visited { color: #1e1e1e !important; text-decoration: underline; }
-  p a[href]:after { content: " (" attr(href) ")"; }
-  abbr[title]:after { content: " (" attr(title) ")"; }
-  .ir a:after { content: ""; }
-  a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; }
-  /* Don't show links for images, or javascript/internal links */
-  pre, blockquote { border: 1px solid #999; page-break-inside: avoid; color: black; }
-  thead { display: table-header-group; }
-  /* css-discuss.incutio.com/wiki/Printing_Tables */
-  tr, img { page-break-inside: avoid; }
-  @page { margin: 0.5cm; }
-  p, h2, h3 { orphans: 3; widows: 3; }
-  h2, h3 { page-break-after: avoid; } }
-/*=================================================
- +++ LE GRID +++ A Responsive Grid -- Gumby defaults to a standard 960 grid, but you can change it to whatever you'd like.
- ==================================================*/
-/*.container { padding: 0px $gutter-in-px;
-}*/
-.row { width: 100%; max-width: 940px; min-width: 320px; margin: 0 auto; }
-@media only screen and (max-width: 960px) { .row { padding: 0 20px; } }
-.row .row { min-width: 0px; }
-@media only screen and (max-width: 960px) { .row .row { padding: 0; } }
-
-/* To fix the grid into a different size, set max-width to your desired width */
-.column, .columns { margin-left: 2.12766%; float: left; min-height: 1px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; }
-
-.column:first-child, .columns:first-child, .alpha { margin-left: 0px; }
-
-.column.omega, .columns.omega { float: right; }
-
-/* Column Classes */
-.row .one.column { width: 6.38298%; }
-.row .one.columns { width: 6.38298%; }
-.row .two.columns { width: 14.89362%; }
-.row .three.columns { width: 23.40426%; }
-.row .four.columns { width: 31.91489%; }
-.row .five.columns { width: 40.42553%; }
-.row .six.columns { width: 48.93617%; }
-.row .seven.columns { width: 57.44681%; }
-.row .eight.columns { width: 65.95745%; }
-.row .nine.columns { width: 74.46809%; }
-.row .ten.columns { width: 82.97872%; }
-.row .eleven.columns { width: 91.48936%; }
-.row .twelve.columns { width: 100%; }
-
-/* Push Classes */
-.row .push_one { margin-left: 10.6383%; }
-.row .push_one:first-child { margin-left: 8.51064%; }
-.row .push_two { margin-left: 19.14894%; }
-.row .push_two:first-child { margin-left: 17.02128%; }
-.row .push_three { margin-left: 27.65957%; }
-.row .push_three:first-child { margin-left: 25.53191%; }
-.row .push_four { margin-left: 36.17021%; }
-.row .push_four:first-child { margin-left: 34.04255%; }
-.row .push_five { margin-left: 44.68085%; }
-.row .push_five:first-child { margin-left: 42.55319%; }
-.row .push_six { margin-left: 53.19149%; }
-.row .push_six:first-child { margin-left: 51.06383%; }
-.row .push_seven { margin-left: 61.70213%; }
-.row .push_seven:first-child { margin-left: 59.57447%; }
-.row .push_eight { margin-left: 70.21277%; }
-.row .push_eight:first-child { margin-left: 68.08511%; }
-.row .push_nine { margin-left: 78.7234%; }
-.row .push_nine:first-child { margin-left: 76.59574%; }
-.row .push_ten { margin-left: 87.23404%; }
-.row .push_ten:first-child { margin-left: 85.10638%; }
-.row .push_eleven { margin-left: 95.74468%; }
-.row .push_eleven:first-child { margin-left: 93.61702%; }
-
-/* Centered Classes */
-.row .one.centered { margin-left: 46.80851%; }
-.row .two.centered { margin-left: 42.55319%; }
-.row .three.centered { margin-left: 38.29787%; }
-.row .four.centered { margin-left: 34.04255%; }
-.row .five.centered { margin-left: 29.78723%; }
-.row .six.centered { margin-left: 25.53191%; }
-.row .seven.centered { margin-left: 21.2766%; }
-.row .eight.centered { margin-left: 17.02128%; }
-.row .nine.centered { margin-left: 12.76596%; }
-.row .ten.centered { margin-left: 8.51064%; }
-.row .eleven.centered { margin-left: 4.25532%; }
-
-/* Hybrid Grid Columns */
-.sixteen.colgrid .row .one.column { width: 4.25532%; }
-.sixteen.colgrid .row .one.columns { width: 4.25532%; }
-.sixteen.colgrid .row .two.columns { width: 10.6383%; }
-.sixteen.colgrid .row .three.columns { width: 17.02128%; }
-.sixteen.colgrid .row .four.columns { width: 23.40426%; }
-.sixteen.colgrid .row .five.columns { width: 29.78723%; }
-.sixteen.colgrid .row .six.columns { width: 36.17021%; }
-.sixteen.colgrid .row .seven.columns { width: 42.55319%; }
-.sixteen.colgrid .row .eight.columns { width: 48.93617%; }
-.sixteen.colgrid .row .nine.columns { width: 55.31915%; }
-.sixteen.colgrid .row .ten.columns { width: 61.70213%; }
-.sixteen.colgrid .row .eleven.columns { width: 68.08511%; }
-.sixteen.colgrid .row .twelve.columns { width: 74.46809%; }
-.sixteen.colgrid .row .thirteen.columns { width: 80.85106%; }
-.sixteen.colgrid .row .fourteen.columns { width: 87.23404%; }
-.sixteen.colgrid .row .fifteen.columns { width: 93.61702%; }
-.sixteen.colgrid .row .sixteen.columns { width: 100%; }
-
-/* Hybrid Push Classes */
-.sixteen.colgrid .row .push_one { margin-left: 8.51064%; }
-.sixteen.colgrid .row .push_one:first-child { margin-left: 6.38298%; }
-.sixteen.colgrid .row .push_two { margin-left: 14.89362%; }
-.sixteen.colgrid .row .push_two:first-child { margin-left: 12.76596%; }
-.sixteen.colgrid .row .push_three { margin-left: 21.2766%; }
-.sixteen.colgrid .row .push_three:first-child { margin-left: 19.14894%; }
-.sixteen.colgrid .row .push_four { margin-left: 27.65957%; }
-.sixteen.colgrid .row .push_four:first-child { margin-left: 25.53191%; }
-.sixteen.colgrid .row .push_five { margin-left: 34.04255%; }
-.sixteen.colgrid .row .push_five:first-child { margin-left: 31.91489%; }
-.sixteen.colgrid .row .push_six { margin-left: 40.42553%; }
-.sixteen.colgrid .row .push_six:first-child { margin-left: 38.29787%; }
-.sixteen.colgrid .row .push_seven { margin-left: 46.80851%; }
-.sixteen.colgrid .row .push_seven:first-child { margin-left: 44.68085%; }
-.sixteen.colgrid .row .push_eight { margin-left: 53.19149%; }
-.sixteen.colgrid .row .push_eight:first-child { margin-left: 51.06383%; }
-.sixteen.colgrid .row .push_nine { margin-left: 59.57447%; }
-.sixteen.colgrid .row .push_nine:first-child { margin-left: 57.44681%; }
-.sixteen.colgrid .row .push_ten { margin-left: 65.95745%; }
-.sixteen.colgrid .row .push_ten:first-child { margin-left: 63.82979%; }
-.sixteen.colgrid .row .push_eleven { margin-left: 72.34043%; }
-.sixteen.colgrid .row .push_eleven:first-child { margin-left: 70.21277%; }
-.sixteen.colgrid .row .push_twelve { margin-left: 78.7234%; }
-.sixteen.colgrid .row .push_twelve:first-child { margin-left: 76.59574%; }
-.sixteen.colgrid .row .push_thirteen { margin-left: 85.10638%; }
-.sixteen.colgrid .row .push_thirteen:first-child { margin-left: 82.97872%; }
-.sixteen.colgrid .row .push_fourteen { margin-left: 91.48936%; }
-.sixteen.colgrid .row .push_fourteen:first-child { margin-left: 89.3617%; }
-.sixteen.colgrid .row .push_fifteen { margin-left: 97.87234%; }
-.sixteen.colgrid .row .push_fifteen:first-child { margin-left: 95.74468%; }
-
-/* Hybrid Centered Classes */
-.sixteen.colgrid .row .one.centered { margin-left: 47.87234%; }
-.sixteen.colgrid .row .two.centered { margin-left: 44.68085%; }
-.sixteen.colgrid .row .three.centered { margin-left: 41.48936%; }
-.sixteen.colgrid .row .four.centered { margin-left: 38.29787%; }
-.sixteen.colgrid .row .five.centered { margin-left: 35.10638%; }
-.sixteen.colgrid .row .six.centered { margin-left: 31.91489%; }
-.sixteen.colgrid .row .seven.centered { margin-left: 28.7234%; }
-.sixteen.colgrid .row .eight.centered { margin-left: 25.53191%; }
-.sixteen.colgrid .row .nine.centered { margin-left: 22.34043%; }
-.sixteen.colgrid .row .ten.centered { margin-left: 19.14894%; }
-.sixteen.colgrid .row .eleven.centered { margin-left: 15.95745%; }
-.sixteen.colgrid .row .twelve.centered { margin-left: 12.76596%; }
-.sixteen.colgrid .row .thirteen.centered { margin-left: 9.57447%; }
-.sixteen.colgrid .row .fourteen.centered { margin-left: 6.38298%; }
-.sixteen.colgrid .row .fifteen.centered { margin-left: 3.19149%; }
-
-.pull_right { float: right; }
-
-.pull_left { float: left; }
-
-img, object, embed { max-width: 100%; height: auto; }
-
-img { -ms-interpolation-mode: bicubic; }
-
-#map_canvas img, .map_canvas img { max-width: none !important; }
-
-/* Tile Grid */
-.tiles { display: block; overflow: hidden; }
-.tiles > li { display: block; height: auto; float: left; padding-bottom: 0; }
-.tiles.two_up { margin-left: -4%; }
-.tiles.two_up > li { margin-left: 4%; width: 46%; }
-.tiles.three_up, .tiles.four_up { margin-left: -2%; }
-.tiles.three_up > li { margin-left: 2%; width: 31.3%; }
-.tiles.four_up > li { margin-left: 2%; width: 23%; }
-.tiles.five_up { margin-left: -1.5%; }
-.tiles.five_up > li { margin-left: 1.5%; width: 18.5%; }
-
-/* Nicolas Gallagher's micro clearfix */
-.clearfix { *zoom: 1; }
-.clearfix:before, .clearfix:after { content: ""; display: table; }
-.clearfix:after { clear: both; }
-
-.row { *zoom: 1; }
-.row:before, .row:after { content: ""; display: table; }
-.row:after { clear: both; }
-
-.valign { display: table; width: 100%; }
-.valign > div { display: table-cell; vertical-align: middle; }
-.valign ​ > article { display: table-cell; vertical-align: middle; }
-
-/* Mobile */
-@media only screen and (max-width: 767px) { body { -webkit-text-size-adjust: none; -ms-text-size-adjust: none; width: 100%; min-width: 0; }
-  .container { min-width: 0; margin-left: 0; margin-right: 0; }
-  .row { width: 100%; min-width: 0; margin-left: 0; margin-right: 0; }
-  .row .row .column, .row .row .columns { padding: 0; }
-  .row .centered { margin-left: 0 !important; }
-  .column, .columns { width: auto !important; float: none; margin-left: 0; margin-right: 0; }
-  .column:last-child, .columns:last-child { margin-right: 0; float: none; }
-  [class*="column"] + [class*="column"]:last-child { float: none; }
-  [class*="column"]:before { display: table; }
-  [class*="column"]:after { display: table; clear: both; }
-  [class^="push_"], [class*="push_"] { margin-left: 0 !important; } }
-/*=====================================================
- Navigation (with dropdowns)
- ======================================================*/
-.navbar div ul li a:hover { background: #292929; } /* Racket customization */
-.navbar { width: 100%; min-height: 60px; display: block; margin-bottom: 20px; background: black; }
-@media only screen and (max-width: 767px) { .navbar { position: relative; border: none; }
-  .navbar .column, .navbar .columns { min-height: 0; } }
-.navbar.fixed { top: 0; left: 0; z-index: 99999; }
-.navbar a.toggle { display: none; }
-@media only screen and (max-width: 767px) { .navbar a.toggle { top: 18%; right: 4%; width: 46px; position: absolute; text-align: center; display: inline-block; color: white; background: black; height: 40px; line-height: 38px; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; font-size: 30px; font-size: 1.875rem; }
-  .navbar a.toggle:hover { background: #0d0d0d; }
-  .navbar a.toggle:active, .navbar a.toggle.active { background: black; } }
-.navbar .logo { display: inline-block; margin: 0 2.12766% 0 0; padding: 0; height: 60px; line-height: 58px; }
-.navbar .logo a { display: block; padding: 0 0 0 16px; overflow: hidden; height: 60px; line-height: 58px; }
-.navbar .logo a img { max-height: 95%; }
-@media only screen and (max-width: 767px) { .navbar .logo { float: left; display: inline; }
-  .navbar .logo a { padding: 0; }
-  .navbar .logo a img { width: auto; height: auto; max-width: 100%; } }
-.navbar ul { display: table; vertical-align: middle; margin: 0; float: none; }
-@media only screen and (max-width: 767px) { .navbar ul { position: absolute; display: block; width: 100% !important; height: 0; max-height: 0; top: 60px; left: 0; overflow: hidden; text-align: center; background: black; }
-  .navbar ul.active { height: auto; max-height: 600px; z-index: 999999; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; -webkit-box-shadow: 0 2px 2px #262626; -moz-box-shadow: 0 2px 2px #262626; box-shadow: 0 2px 2px #262626; } }
-.navbar ul li { display: table-cell; text-align: center; padding-bottom: 0; margin: 0; height: 60px; line-height: 58px; }
-@media only screen and (max-width: 767px) { .navbar ul li { display: block; position: relative; min-height: 50px; max-height: 320px; height: auto; width: 100%; border-right: 0 !important; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; } }
-.navbar ul li > a { display: block; padding: 0 16px; white-space: nowrap; color: white; text-shadow: 0 1px 2px black, 0 1px 0 black; height: 60px; line-height: 58px; font-size: 16px; font-size: 1rem; }
-.navbar ul li > a i.icon-popup { position: absolute; }
-.navbar ul li .btn { border-color: black !important; }
-.navbar ul li.field { margin-bottom: 0 !important; margin-right: 0; }
-@media only screen and (max-width: 767px) { .navbar ul li.field { padding: 0 20px; } }
-.navbar ul li.field input.search { background: black; border: none; color: #f2f2f2; }
-.navbar ul li .dropdown { width: auto; min-width: 0px; max-width: 320px; height: 0; position: absolute; background: #fafafa; overflow: hidden; z-index: 999; }
-@media only screen and (max-width: 767px) { .navbar ul li .dropdown { width: 100%; max-width: 100%; position: relative; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; }
-  .navbar ul li.active .dropdown { border-bottom: 1px solid black; }
-  .navbar ul li.active .dropdown ul { position: relative; top: 0; background: black; min-height: 50px; max-height: 250px; height: auto; overflow: auto; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; }
-  .navbar ul li.active .dropdown ul li { min-height: 50px; border-bottom: black; }
-  .navbar ul li.active .dropdown ul li a { color: white; border-bottom: 1px solid black; }
-  .navbar ul li.active .dropdown ul li a:hover { color: #d04526; } }
-@media only screen and (min-width: 768px) and (max-width: 939px) { .navbar > ul > li > .btn a { padding: 0 10px 0 10px !important; }
-  .navbar ul > li .dropdown ul li.active .dropdown { left: -320px; } }
-
-/**** Navbar positioning for Microsoft's browser who deserves not to be mentioned ****/
-.ie7 .navbar > ul { width: auto; }
-
-.ie7 .navbar, .ie7 .navbar > ul > li > a { display: block; }
-
-.ie7 .navbar .logo, .ie7 .navbar ul, .ie7 .navbar ul li { float: left; display: inline-block; }
-
-.ie7 .navbar .logo a { display: block; overflow: hidden; }
-
-.ie7 .navbar > ul > li .field { display: block; padding: 12px 18px 0; width: 80%; }
-
-.pretty.navbar { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #333333), color-stop(100%, #000000)); background-image: -webkit-linear-gradient(#333333, #000000); background-image: -moz-linear-gradient(#333333, #000000); background-image: -o-linear-gradient(#333333, #000000); background-image: linear-gradient(#333333, #000000); -webkit-box-shadow: inset 0 1px 1px #333333, 0 1px 2px rgba(0, 0, 0, 0.8) !important; -moz-box-shadow: inset 0 1px 1px #333333, 0 1px 2px rgba(0, 0, 0, 0.8) !important; box-shadow: inset 0 1px 1px #333333, 0 1px 2px rgba(0, 0, 0, 0.8) !important; /* Remove this line if you dont want a dropshadow on your navigation*/ }
-@media only screen and (max-width: 767px) { .pretty.navbar a.toggle { border: 1px solid black; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #333333), color-stop(100%, #000000)); background-image: -webkit-linear-gradient(#333333, #000000); background-image: -moz-linear-gradient(#333333, #000000); background-image: -o-linear-gradient(#333333, #000000); background-image: linear-gradient(#333333, #000000); -webkit-box-shadow: inset 0 1px 2px #404040, inset 0 -1px 1px #0d0d0d, inset 1px 0 1px #0d0d0d, inset -1px 0 1px #0d0d0d, 0 1px 1px #1a1a1a; -moz-box-shadow: inset 0 1px 2px #404040, inset 0 -1px 1px #0d0d0d, inset 1px 0 1px #0d0d0d, inset -1px 0 1px #0d0d0d, 0 1px 1px #1a1a1a; box-shadow: inset 0 1px 2px #404040, inset 0 -1px 1px #0d0d0d, inset 1px 0 1px #0d0d0d, inset -1px 0 1px #0d0d0d, 0 1px 1px #1a1a1a; }
-  .pretty.navbar a.toggle i { text-shadow: 0 1px 1px black; }
-  .pretty.navbar a.toggle:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #404040), color-stop(100%, #0d0d0d)); background-image: -webkit-linear-gradient(#404040, #0d0d0d); background-image: -moz-linear-gradient(#404040, #0d0d0d); background-image: -o-linear-gradient(#404040, #0d0d0d); background-image: linear-gradient(#404040, #0d0d0d); }
-  .pretty.navbar a.toggle:active, .pretty.navbar a.toggle.active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #000000), color-stop(100%, #000000)); background-image: -webkit-linear-gradient(#000000, #000000); background-image: -moz-linear-gradient(#000000, #000000); background-image: -o-linear-gradient(#000000, #000000); background-image: linear-gradient(#000000, #000000); -webkit-box-shadow: 0 1px 1px #1a1a1a; -moz-box-shadow: 0 1px 1px #1a1a1a; box-shadow: 0 1px 1px #1a1a1a; } }
-.pretty.navbar.row { -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; }
-@media only screen and (max-width: 767px) { .pretty.navbar.row { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; } }
-.pretty.navbar ul li.field input.search { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #000000), color-stop(100%, #050505)); background-image: -webkit-linear-gradient(#000000, #050505); background-image: -moz-linear-gradient(#000000, #050505); background-image: -o-linear-gradient(#000000, #050505); background-image: linear-gradient(#000000, #050505); border: none; -webkit-box-shadow: 0 1px 2px #404040 !important; -moz-box-shadow: 0 1px 2px #404040 !important; box-shadow: 0 1px 2px #404040 !important; /* Remove this line if you dont want a dropshadow on your navigation*/ }
-.pretty.navbar > ul > li:first-child, .pretty.navbar .pretty.navbar > ul > li:first-child a:hover { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
-
-.navbar li .dropdown ul { margin: 0; display: block; }
-.navbar li .dropdown ul > li { position: relative; display: block; width: 100%; float: left; text-align: left; height: auto; -webkit-border-radius: none; -moz-border-radius: none; -ms-border-radius: none; -o-border-radius: none; border-radius: none; }
-@media only screen and (min-width: 768px) and (max-width: 939px) { .navbar li .dropdown ul > li { max-width: 320px; word-wrap: break-word; } }
-.navbar li .dropdown ul > li a { display: block; padding: 0 20px; color: #d04526; border-bottom: 1px solid #cccccc; text-shadow: none; height: 51px; line-height: 49px; }
-@media only screen and (max-width: 767px) { .navbar li .dropdown ul > li a { padding: 0 20px; } }
-.navbar li .dropdown ul > li .dropdown { display: none; background: white; }
-.navbar li .dropdown ul li:first-child a { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; }
-
-.gumby-no-touch .navbar ul li:hover > a, .gumby-touch .navbar ul li.active > a { position: relative; background: #868d92; z-index: 1000; }
-
-.gumby-no-touch .navbar ul li:hover .dropdown, .gumby-touch .navbar ul li.active .dropdown { min-height: 50px; max-height: 561px; overflow: visible; height: auto; width: 100%; padding: 0; border-top: 1px solid black; -webkit-box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.3); box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.3); }
-
-.gumby-no-touch .navbar ul li:hover .dropdown ul { position: relative; top: 0; min-height: 50px; max-height: 250px; height: auto; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; min-height: 50px; max-height: 250px; height: auto; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; }
-.gumby-no-touch .navbar ul li:hover .dropdown ul li { min-height: 50px; }
-@media only screen and (max-width: 767px) { .gumby-no-touch .navbar ul li:hover .dropdown ul { overflow: auto; background: black; }
-  .gumby-no-touch .navbar ul li:hover .dropdown ul li { border-bottom: black; }
-  .gumby-no-touch .navbar ul li:hover .dropdown ul li a { color: white; border-bottom: 1px solid black; }
-  .gumby-no-touch .navbar ul li:hover .dropdown ul li a:hover { color: #d04526; } }
-.gumby-no-touch .navbar ul li:hover .dropdown ul li { min-height: 50px; }
-
-.gumby-no-touch .navbar li .dropdown ul > li:hover .dropdown, .gumby-touch .navbar li .dropdown ul > li.active .dropdown { border-top: none; display: block; position: absolute; z-index: 9999; left: 100%; top: 0px; margin-top: 0; }
-@media only screen and (max-width: 767px) { .gumby-no-touch .navbar li .dropdown ul > li:hover .dropdown, .gumby-touch .navbar li .dropdown ul > li.active .dropdown { position: relative; left: 0; }
-  .gumby-no-touch .navbar li .dropdown ul > li:hover .dropdown ul, .gumby-touch .navbar li .dropdown ul > li.active .dropdown ul { background: black !important; } }
-
-.gumby-no-touch .navbar li .dropdown ul li a:hover { background: #f2f2f2; }
-
-.gumby-touch .navbar a:hover { color: white !important; }
-
-.subnav { display: block; width: auto; overflow: hidden; margin: 0 0 18px 0; padding-top: 4px; }
-.subnav li, .subnav dt, .subnav dd { float: left; display: inline; margin-left: 9px; margin-bottom: 4px; }
-.subnav li:first-child, .subnav dt:first-child, .subnav dd:first-child { margin-left: 0; }
-.subnav dt { color: #999; font-weight: normal; }
-.subnav li a, .subnav dd a { color: #05390a; font-size: 15px; text-decoration: none; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; }
-.subnav li.active a, .subnav dd.active a { background: #5dbb73; padding: 5px 9px; text-shadow: 0 1px 1px #77d58e; }
-
-/* Buttons */
-.btn, .skiplink { display: inline-block; width: auto; background: #f2f2f2; -webkit-appearance: none; font-family: "Open Sans"; font-weight: 600; padding: 0 !important; text-align: center; }
-.btn > a, .btn input, .btn button, .skiplink > a, .skiplink input, .skiplink button { display: block; padding: 0 18px; color: white; height: 100%; }
-.btn input, .btn button, .skiplink input, .skiplink button { background: none; border: none; width: 100%; font-size: 100%; cursor: pointer; font-weight: 400; -webkit-appearance: none; -moz-appearance: none; appearance: none; }
-.btn.xlarge, .skiplink.xlarge { font-size: 30px; font-size: 1.875rem; height: 66px; line-height: 64px; }
-.btn.xlarge a, .skiplink.xlarge a { position: relative; padding: 0 30px; }
-.btn.xlarge.icon-left a, .skiplink.xlarge.icon-left a { padding-left: 66px; }
-.btn.xlarge.icon-left a:before, .skiplink.xlarge.icon-left a:before { left: 20px; }
-.btn.xlarge.icon-right a, .skiplink.xlarge.icon-right a { padding-right: 66px; }
-.btn.xlarge.icon-right a:after, .skiplink.xlarge.icon-right a:after { right: 20px; }
-.btn.large, .skiplink.large { font-size: 26px; font-size: 1.625rem; height: 58px; line-height: 56px; }
-.btn.large a, .skiplink.large a { position: relative; padding: 0 26px; }
-.btn.large.icon-left a, .skiplink.large.icon-left a { padding-left: 58px; }
-.btn.large.icon-left a:before, .skiplink.large.icon-left a:before { left: 17.33333px; }
-.btn.large.icon-right a, .skiplink.large.icon-right a { padding-right: 58px; }
-.btn.large.icon-right a:after, .skiplink.large.icon-right a:after { right: 17.33333px; }
-.btn.medium, .skiplink.medium { font-size: 16px; font-size: 1rem; height: 36px; line-height: 34px; }
-.btn.medium a, .skiplink.medium a { position: relative; padding: 0 16px; }
-.btn.medium.icon-left a, .skiplink.medium.icon-left a { padding-left: 36px; }
-.btn.medium.icon-left a:before, .skiplink.medium.icon-left a:before { left: 10.66667px; }
-.btn.medium.icon-right a, .skiplink.medium.icon-right a { padding-right: 36px; }
-.btn.medium.icon-right a:after, .skiplink.medium.icon-right a:after { right: 10.66667px; }
-.btn.medium a, .skiplink.medium a { padding: 0 18px; }
-.btn.small, .skiplink.small { font-size: 10px; font-size: 0.625rem; height: 23px; line-height: 21px; }
-.btn.small a, .skiplink.small a { position: relative; padding: 0 10px; }
-.btn.small.icon-left a, .skiplink.small.icon-left a { padding-left: 23px; }
-.btn.small.icon-left a:before, .skiplink.small.icon-left a:before { left: 6.66667px; }
-.btn.small.icon-right a, .skiplink.small.icon-right a { padding-right: 23px; }
-.btn.small.icon-right a:after, .skiplink.small.icon-right a:after { right: 6.66667px; }
-.btn.small a, .skiplink.small a { padding: 0 10px; }
-.btn.oval, .skiplink.oval { -webkit-border-radius: 1000px; -moz-border-radius: 1000px; -ms-border-radius: 1000px; -o-border-radius: 1000px; border-radius: 1000px; }
-.btn.pill-left, .skiplink.pill-left { -webkit-border-radius: 500px 0 0 500px; -moz-border-radius: 500px 0 0 500px; -ms-border-radius: 500px 0 0 500px; -o-border-radius: 500px 0 0 500px; border-radius: 500px 0 0 500px; }
-.btn.pill-right, .skiplink.pill-right { -webkit-border-radius: 0 500px 500px 0; -moz-border-radius: 0 500px 500px 0; -ms-border-radius: 0 500px 500px 0; -o-border-radius: 0 500px 500px 0; border-radius: 0 500px 500px 0; }
-.btn.primary, .skiplink.primary { background: #3085d6; border: 1px solid #3085d6; }
-.btn.primary:hover, .skiplink.primary:hover { background: #5b9ede; }
-.btn.primary:active, .skiplink.primary:active { background: #236bb0; }
-.btn.secondary, .skiplink.secondary { background: #42a35a; border: 1px solid #42a35a; }
-.btn.secondary:hover, .skiplink.secondary:hover { background: #5bbd73; }
-.btn.secondary:active, .skiplink.secondary:active { background: #337f46; }
-.btn.default, .skiplink.default { background: #f2f2f2; border: 1px solid #f2f2f2; color: #555555; border: 1px solid #f2f2f2; }
-.btn.default:hover, .skiplink.default:hover { background: white; }
-.btn.default:active, .skiplink.default:active { background: #d8d8d8; }
-.btn.default:hover, .skiplink.default:hover { border: 1px solid #e5e5e5; }
-.btn.default a, .btn.default input, .btn.default button, .skiplink.default a, .skiplink.default input, .skiplink.default button { color: #555555; }
-.btn.info, .skiplink.info { background: #4a4d50; border: 1px solid #4a4d50; }
-.btn.info:hover, .skiplink.info:hover { background: #63676a; }
-.btn.info:active, .skiplink.info:active { background: #313436; }
-.btn.danger, .skiplink.danger { background: #ca3838; border: 1px solid #ca3838; }
-.btn.danger:hover, .skiplink.danger:hover { background: #d56060; }
-.btn.danger:active, .skiplink.danger:active { background: #a32c2c; }
-.btn.warning, .skiplink.warning { background: #f6b83f; border: 1px solid #f6b83f; color: #644405; }
-.btn.warning:hover, .skiplink.warning:hover { background: #f8ca70; }
-.btn.warning:active, .skiplink.warning:active { background: #f4a60e; }
-.btn.warning a, .btn.warning input, .btn.warning button, .skiplink.warning a, .skiplink.warning input, .skiplink.warning button { color: #644405; }
-.btn.success, .skiplink.success { background: #58c026; border: 1px solid #58c026; }
-.btn.success:hover, .skiplink.success:hover { background: #72d940; }
-.btn.success:active, .skiplink.success:active { background: #44951e; }
-.btn.metro, .metro .btn, .metro .skiplink, .btn.metro:hover, .skiplink.metro:hover, .btn.metro:active, .skiplink.metro:active, .skiplink.metro { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; }
-.btn.metro.rounded, .metro .rounded.btn, .metro .rounded.skiplink, .rounded.skiplink.metro:hover, .rounded.skiplink.metro:active, .skiplink.metro.rounded { -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; }
-.btn.pretty, .pretty .btn, .pretty .skiplink, .btn.pretty:hover, .skiplink.pretty:hover, .btn.pretty:active, .skiplink.pretty:active, .skiplink.pretty { -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; }
-.btn.pretty.squared, .pretty .squared.btn, .pretty .squared.skiplink, .squared.skiplink.pretty:hover, .squared.skiplink.pretty:active, .skiplink.pretty.squared { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; }
-.btn.pretty.primary, .pretty .primary.btn, .pretty .primary.skiplink, .primary.skiplink.pretty:hover, .primary.skiplink.pretty:active, .skiplink.pretty.primary { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #85b7e7), color-stop(100%, #2a85dc)); background-image: -webkit-linear-gradient(#85b7e7, #2a85dc); background-image: -moz-linear-gradient(#85b7e7, #2a85dc); background-image: -o-linear-gradient(#85b7e7, #2a85dc); background-image: linear-gradient(#85b7e7, #2a85dc); -webkit-box-shadow: inset 0 0 3px #f0f6fc; -moz-box-shadow: inset 0 0 3px #f0f6fc; box-shadow: inset 0 0 3px #f0f6fc; border: 1px solid #1f5e9b; }
-.pretty .primary.btn:hover, .pretty .primary.skiplink:hover, .primary.btn.pretty:hover, .primary.skiplink.pretty:hover, .skiplink.pretty.primary:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a2d4fc), color-stop(100%, #54b2fe)); background-image: -webkit-linear-gradient(#a2d4fc, #54b2fe); background-image: -moz-linear-gradient(#a2d4fc, #54b2fe); background-image: -o-linear-gradient(#a2d4fc, #54b2fe); background-image: linear-gradient(#a2d4fc, #54b2fe); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #0e90f8; }
-.pretty .primary.btn:active, .pretty .primary.skiplink:active, .primary.btn.pretty:active, .primary.skiplink.pretty:active, .skiplink.pretty.primary:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2a85dc), color-stop(100%, #85b7e7)); background-image: -webkit-linear-gradient(#2a85dc, #85b7e7); background-image: -moz-linear-gradient(#2a85dc, #85b7e7); background-image: -o-linear-gradient(#2a85dc, #85b7e7); background-image: linear-gradient(#2a85dc, #85b7e7); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; }
-.btn.pretty.primary a, .pretty .primary.btn a, .pretty .primary.skiplink a, .primary.skiplink.pretty:hover a, .primary.skiplink.pretty:active a, .btn.pretty.primary input, .pretty .primary.btn input, .pretty .primary.skiplink input, .primary.skiplink.pretty:hover input, .primary.skiplink.pretty:active input, .btn.pretty.primary button, .pretty .primary.btn button, .pretty .primary.skiplink button, .primary.skiplink.pretty:hover button, .primary.skiplink.pretty:active button, .skiplink.pretty.primary a, .skiplink.pretty.primary input, .skiplink.pretty.primary button { text-shadow: 0 1px 1px #1a5186; }
-.btn.pretty.secondary, .pretty .secondary.btn, .pretty .secondary.skiplink, .secondary.skiplink.pretty:hover, .secondary.skiplink.pretty:active, .skiplink.pretty.secondary { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #80cb92), color-stop(100%, #3ca957)); background-image: -webkit-linear-gradient(#80cb92, #3ca957); background-image: -moz-linear-gradient(#80cb92, #3ca957); background-image: -o-linear-gradient(#80cb92, #3ca957); background-image: linear-gradient(#80cb92, #3ca957); -webkit-box-shadow: inset 0 0 3px #daf0e0; -moz-box-shadow: inset 0 0 3px #daf0e0; box-shadow: inset 0 0 3px #daf0e0; border: 1px solid #2c6d3c; }
-.pretty .secondary.btn:hover, .pretty .secondary.skiplink:hover, .secondary.btn.pretty:hover, .secondary.skiplink.pretty:hover, .skiplink.pretty.secondary:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a1d3ad), color-stop(100%, #68c07d)); background-image: -webkit-linear-gradient(#a1d3ad, #68c07d); background-image: -moz-linear-gradient(#a1d3ad, #68c07d); background-image: -o-linear-gradient(#a1d3ad, #68c07d); background-image: linear-gradient(#a1d3ad, #68c07d); -webkit-box-shadow: inset 0 0 3px #f8fcf9; -moz-box-shadow: inset 0 0 3px #f8fcf9; box-shadow: inset 0 0 3px #f8fcf9; border: 1px solid #469659; }
-.pretty .secondary.btn:active, .pretty .secondary.skiplink:active, .secondary.btn.pretty:active, .secondary.skiplink.pretty:active, .skiplink.pretty.secondary:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #3ca957), color-stop(100%, #80cb92)); background-image: -webkit-linear-gradient(#3ca957, #80cb92); background-image: -moz-linear-gradient(#3ca957, #80cb92); background-image: -o-linear-gradient(#3ca957, #80cb92); background-image: linear-gradient(#3ca957, #80cb92); -webkit-box-shadow: inset 0 0 3px #ecf8ef; -moz-box-shadow: inset 0 0 3px #ecf8ef; box-shadow: inset 0 0 3px #ecf8ef; }
-.btn.pretty.secondary a, .pretty .secondary.btn a, .pretty .secondary.skiplink a, .secondary.skiplink.pretty:hover a, .secondary.skiplink.pretty:active a, .btn.pretty.secondary input, .pretty .secondary.btn input, .pretty .secondary.skiplink input, .secondary.skiplink.pretty:hover input, .secondary.skiplink.pretty:active input, .btn.pretty.secondary button, .pretty .secondary.btn button, .pretty .secondary.skiplink button, .secondary.skiplink.pretty:hover button, .secondary.skiplink.pretty:active button, .skiplink.pretty.secondary a, .skiplink.pretty.secondary input, .skiplink.pretty.secondary button { text-shadow: 0 1px 1px #255a32; }
-.btn.pretty.default, .pretty .default.btn, .pretty .default.skiplink, .default.skiplink.pretty:hover, .default.skiplink.pretty:active, .skiplink.pretty.default { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f3f1f1)); background-image: -webkit-linear-gradient(#ffffff, #f3f1f1); background-image: -moz-linear-gradient(#ffffff, #f3f1f1); background-image: -o-linear-gradient(#ffffff, #f3f1f1); background-image: linear-gradient(#ffffff, #f3f1f1); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #cccccc; }
-.pretty .default.btn:hover, .pretty .default.skiplink:hover, .default.btn.pretty:hover, .default.skiplink.pretty:hover, .skiplink.pretty.default:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #ffffff)); background-image: -webkit-linear-gradient(#ffffff, #ffffff); background-image: -moz-linear-gradient(#ffffff, #ffffff); background-image: -o-linear-gradient(#ffffff, #ffffff); background-image: linear-gradient(#ffffff, #ffffff); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #d9d9d9; }
-.pretty .default.btn:active, .pretty .default.skiplink:active, .default.btn.pretty:active, .default.skiplink.pretty:active, .skiplink.pretty.default:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f3f1f1), color-stop(100%, #ffffff)); background-image: -webkit-linear-gradient(#f3f1f1, #ffffff); background-image: -moz-linear-gradient(#f3f1f1, #ffffff); background-image: -o-linear-gradient(#f3f1f1, #ffffff); background-image: linear-gradient(#f3f1f1, #ffffff); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; }
-.btn.pretty.default a, .pretty .default.btn a, .pretty .default.skiplink a, .default.skiplink.pretty:hover a, .default.skiplink.pretty:active a, .btn.pretty.default input, .pretty .default.btn input, .pretty .default.skiplink input, .default.skiplink.pretty:hover input, .default.skiplink.pretty:active input, .btn.pretty.default button, .pretty .default.btn button, .pretty .default.skiplink button, .default.skiplink.pretty:hover button, .default.skiplink.pretty:active button, .skiplink.pretty.default a, .skiplink.pretty.default input, .skiplink.pretty.default button { text-shadow: 0 1px 1px white; }
-.btn.pretty.info, .pretty .info.btn, .pretty .info.skiplink, .info.skiplink.pretty:hover, .info.skiplink.pretty:active, .skiplink.pretty.info { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7b8085), color-stop(100%, #464d54)); background-image: -webkit-linear-gradient(#7b8085, #464d54); background-image: -moz-linear-gradient(#7b8085, #464d54); background-image: -o-linear-gradient(#7b8085, #464d54); background-image: linear-gradient(#7b8085, #464d54); -webkit-box-shadow: inset 0 0 3px #bdc0c2; -moz-box-shadow: inset 0 0 3px #bdc0c2; box-shadow: inset 0 0 3px #bdc0c2; border: 1px solid #252728; }
-.pretty .info.btn:hover, .pretty .info.skiplink:hover, .info.btn.pretty:hover, .info.skiplink.pretty:hover, .skiplink.pretty.info:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #aeb3b6), color-stop(100%, #808e98)); background-image: -webkit-linear-gradient(#aeb3b6, #808e98); background-image: -moz-linear-gradient(#aeb3b6, #808e98); background-image: -o-linear-gradient(#aeb3b6, #808e98); background-image: linear-gradient(#aeb3b6, #808e98); -webkit-box-shadow: inset 0 0 3px #f1f2f3; -moz-box-shadow: inset 0 0 3px #f1f2f3; box-shadow: inset 0 0 3px #f1f2f3; border: 1px solid #60676b; }
-.pretty .info.btn:active, .pretty .info.skiplink:active, .info.btn.pretty:active, .info.skiplink.pretty:active, .skiplink.pretty.info:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #464d54), color-stop(100%, #7b8085)); background-image: -webkit-linear-gradient(#464d54, #7b8085); background-image: -moz-linear-gradient(#464d54, #7b8085); background-image: -o-linear-gradient(#464d54, #7b8085); background-image: linear-gradient(#464d54, #7b8085); -webkit-box-shadow: inset 0 0 3px #cbcdce; -moz-box-shadow: inset 0 0 3px #cbcdce; box-shadow: inset 0 0 3px #cbcdce; }
-.btn.pretty.info a, .pretty .info.btn a, .pretty .info.skiplink a, .info.skiplink.pretty:hover a, .info.skiplink.pretty:active a, .btn.pretty.info input, .pretty .info.btn input, .pretty .info.skiplink input, .info.skiplink.pretty:hover input, .info.skiplink.pretty:active input, .btn.pretty.info button, .pretty .info.btn button, .pretty .info.skiplink button, .info.skiplink.pretty:hover button, .info.skiplink.pretty:active button, .skiplink.pretty.info a, .skiplink.pretty.info input, .skiplink.pretty.info button { text-shadow: 0 1px 1px #191a1b; }
-.btn.pretty.danger, .pretty .danger.btn, .pretty .danger.skiplink, .danger.skiplink.pretty:hover, .danger.skiplink.pretty:active, .skiplink.pretty.danger { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #df8989), color-stop(100%, #d03232)); background-image: -webkit-linear-gradient(#df8989, #d03232); background-image: -moz-linear-gradient(#df8989, #d03232); background-image: -o-linear-gradient(#df8989, #d03232); background-image: linear-gradient(#df8989, #d03232); -webkit-box-shadow: inset 0 0 3px #faeded; -moz-box-shadow: inset 0 0 3px #faeded; box-shadow: inset 0 0 3px #faeded; border: 1px solid #8f2626; }
-.pretty .danger.btn:hover, .pretty .danger.skiplink:hover, .danger.btn.pretty:hover, .danger.skiplink.pretty:hover, .skiplink.pretty.danger:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f79696), color-stop(100%, #f64a4a)); background-image: -webkit-linear-gradient(#f79696, #f64a4a); background-image: -moz-linear-gradient(#f79696, #f64a4a); background-image: -o-linear-gradient(#f79696, #f64a4a); background-image: linear-gradient(#f79696, #f64a4a); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #e21212; }
-.pretty .danger.btn:active, .pretty .danger.skiplink:active, .danger.btn.pretty:active, .danger.skiplink.pretty:active, .skiplink.pretty.danger:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d03232), color-stop(100%, #df8989)); background-image: -webkit-linear-gradient(#d03232, #df8989); background-image: -moz-linear-gradient(#d03232, #df8989); background-image: -o-linear-gradient(#d03232, #df8989); background-image: linear-gradient(#d03232, #df8989); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; }
-.btn.pretty.danger a, .pretty .danger.btn a, .pretty .danger.skiplink a, .danger.skiplink.pretty:hover a, .danger.skiplink.pretty:active a, .btn.pretty.danger input, .pretty .danger.btn input, .pretty .danger.skiplink input, .danger.skiplink.pretty:hover input, .danger.skiplink.pretty:active input, .btn.pretty.danger button, .pretty .danger.btn button, .pretty .danger.skiplink button, .danger.skiplink.pretty:hover button, .danger.skiplink.pretty:active button, .skiplink.pretty.danger a, .skiplink.pretty.danger input, .skiplink.pretty.danger button { text-shadow: 0 1px 1px #7b2121; }
-.btn.pretty.warning, .pretty .warning.btn, .pretty .warning.skiplink, .warning.skiplink.pretty:hover, .warning.skiplink.pretty:active, .skiplink.pretty.warning { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fbdca0), color-stop(100%, #fbba3a)); background-image: -webkit-linear-gradient(#fbdca0, #fbba3a); background-image: -moz-linear-gradient(#fbdca0, #fbba3a); background-image: -o-linear-gradient(#fbdca0, #fbba3a); background-image: linear-gradient(#fbdca0, #fbba3a); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #de960a; color: #644405; }
-.pretty .warning.btn:hover, .pretty .warning.skiplink:hover, .warning.btn.pretty:hover, .warning.skiplink.pretty:hover, .skiplink.pretty.warning:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #feecca), color-stop(100%, #ffd37d)); background-image: -webkit-linear-gradient(#feecca, #ffd37d); background-image: -moz-linear-gradient(#feecca, #ffd37d); background-image: -o-linear-gradient(#feecca, #ffd37d); background-image: linear-gradient(#feecca, #ffd37d); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #fcb834; }
-.pretty .warning.btn:active, .pretty .warning.skiplink:active, .warning.btn.pretty:active, .warning.skiplink.pretty:active, .skiplink.pretty.warning:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fbba3a), color-stop(100%, #fbdca0)); background-image: -webkit-linear-gradient(#fbba3a, #fbdca0); background-image: -moz-linear-gradient(#fbba3a, #fbdca0); background-image: -o-linear-gradient(#fbba3a, #fbdca0); background-image: linear-gradient(#fbba3a, #fbdca0); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; }
-.btn.pretty.warning a, .pretty .warning.btn a, .pretty .warning.skiplink a, .warning.skiplink.pretty:hover a, .warning.skiplink.pretty:active a, .btn.pretty.warning input, .pretty .warning.btn input, .pretty .warning.skiplink input, .warning.skiplink.pretty:hover input, .warning.skiplink.pretty:active input, .btn.pretty.warning button, .pretty .warning.btn button, .pretty .warning.skiplink button, .warning.skiplink.pretty:hover button, .warning.skiplink.pretty:active button, .skiplink.pretty.warning a, .skiplink.pretty.warning input, .skiplink.pretty.warning button { text-shadow: 0 1px 1px #fbdca0; }
-.btn.pretty.success, .pretty .success.btn, .pretty .success.skiplink, .success.skiplink.pretty:hover, .success.skiplink.pretty:active, .skiplink.pretty.success { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #91e26a), color-stop(100%, #56c620)); background-image: -webkit-linear-gradient(#91e26a, #56c620); background-image: -moz-linear-gradient(#91e26a, #56c620); background-image: -o-linear-gradient(#91e26a, #56c620); background-image: linear-gradient(#91e26a, #56c620); -webkit-box-shadow: inset 0 0 3px #e0f7d5; -moz-box-shadow: inset 0 0 3px #e0f7d5; box-shadow: inset 0 0 3px #e0f7d5; border: 1px solid #3b8019; }
-.pretty .success.btn:hover, .pretty .success.skiplink:hover, .success.btn.pretty:hover, .success.skiplink.pretty:hover, .skiplink.pretty.success:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #96e570), color-stop(100%, #64df29)); background-image: -webkit-linear-gradient(#96e570, #64df29); background-image: -moz-linear-gradient(#96e570, #64df29); background-image: -o-linear-gradient(#96e570, #64df29); background-image: linear-gradient(#96e570, #64df29); -webkit-box-shadow: inset 0 0 3px #e5f9db; -moz-box-shadow: inset 0 0 3px #e5f9db; box-shadow: inset 0 0 3px #e5f9db; border: 1px solid #479f1d; }
-.pretty .success.btn:active, .pretty .success.skiplink:active, .success.btn.pretty:active, .success.skiplink.pretty:active, .skiplink.pretty.success:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #56c620), color-stop(100%, #91e26a)); background-image: -webkit-linear-gradient(#56c620, #91e26a); background-image: -moz-linear-gradient(#56c620, #91e26a); background-image: -o-linear-gradient(#56c620, #91e26a); background-image: linear-gradient(#56c620, #91e26a); -webkit-box-shadow: inset 0 0 3px #f0fbea; -moz-box-shadow: inset 0 0 3px #f0fbea; box-shadow: inset 0 0 3px #f0fbea; }
-.btn.pretty.success a, .pretty .success.btn a, .pretty .success.skiplink a, .success.skiplink.pretty:hover a, .success.skiplink.pretty:active a, .btn.pretty.success input, .pretty .success.btn input, .pretty .success.skiplink input, .success.skiplink.pretty:hover input, .success.skiplink.pretty:active input, .btn.pretty.success button, .pretty .success.btn button, .pretty .success.skiplink button, .success.skiplink.pretty:hover button, .success.skiplink.pretty:active button, .skiplink.pretty.success a, .skiplink.pretty.success input, .skiplink.pretty.success button { text-shadow: 0 1px 1px #316b15; }
-
-/* Icons */
-[class^="icon-"] a:before, [class*=" icon-"] a:before, [class^="icon-"] a:after, [class*=" icon-"] a:after, i[class^="icon-"], i[class*=" icon-"] { font-family: "entypo"; position: absolute; text-decoration: none; zoom: 1; }
-
-i[class^="icon-"], i[class*=" icon-"] { display: inline-block; position: static; min-width: 20px; margin: 0 5px; text-align: center; }
-
-.icon-note.icon-left a:before, .icon-note.icon-right a:after { content: "\266a"; height: inherit; }
-
-i.icon-note:before { content: "\266a"; height: inherit; }
-
-.icon-note-beamed.icon-left a:before, .icon-note-beamed.icon-right a:after { content: "\266b"; height: inherit; }
-
-i.icon-note-beamed:before { content: "\266b"; height: inherit; }
-
-.icon-music.icon-left a:before, .icon-music.icon-right a:after { content: "🎵"; height: inherit; }
-
-i.icon-music:before { content: "🎵"; height: inherit; }
-
-.icon-search.icon-left a:before, .icon-search.icon-right a:after { content: "🔍"; height: inherit; }
-
-i.icon-search:before { content: "🔍"; height: inherit; }
-
-.icon-flashlight.icon-left a:before, .icon-flashlight.icon-right a:after { content: "🔦"; height: inherit; }
-
-i.icon-flashlight:before { content: "🔦"; height: inherit; }
-
-.icon-mail.icon-left a:before, .icon-mail.icon-right a:after { content: "\2709"; height: inherit; }
-
-i.icon-mail:before { content: "\2709"; height: inherit; }
-
-.icon-heart.icon-left a:before, .icon-heart.icon-right a:after { content: "\2665"; height: inherit; }
-
-i.icon-heart:before { content: "\2665"; height: inherit; }
-
-.icon-heart-empty.icon-left a:before, .icon-heart-empty.icon-right a:after { content: "\2661"; height: inherit; }
-
-i.icon-heart-empty:before { content: "\2661"; height: inherit; }
-
-.icon-star.icon-left a:before, .icon-star.icon-right a:after { content: "\2605"; height: inherit; }
-
-i.icon-star:before { content: "\2605"; height: inherit; }
-
-.icon-star-empty.icon-left a:before, .icon-star-empty.icon-right a:after { content: "\2606"; height: inherit; }
-
-i.icon-star-empty:before { content: "\2606"; height: inherit; }
-
-.icon-user.icon-left a:before, .icon-user.icon-right a:after { content: "👤"; height: inherit; }
-
-i.icon-user:before { content: "👤"; height: inherit; }
-
-.icon-users.icon-left a:before, .icon-users.icon-right a:after { content: "👥"; height: inherit; }
-
-i.icon-users:before { content: "👥"; height: inherit; }
-
-.icon-user-add.icon-left a:before, .icon-user-add.icon-right a:after { content: "\e700"; height: inherit; }
-
-i.icon-user-add:before { content: "\e700"; height: inherit; }
-
-.icon-video.icon-left a:before, .icon-video.icon-right a:after { content: "🎬"; height: inherit; }
-
-i.icon-video:before { content: "🎬"; height: inherit; }
-
-.icon-picture.icon-left a:before, .icon-picture.icon-right a:after { content: "🌄"; height: inherit; }
-
-i.icon-picture:before { content: "🌄"; height: inherit; }
-
-.icon-camera.icon-left a:before, .icon-camera.icon-right a:after { content: "📷"; height: inherit; }
-
-i.icon-camera:before { content: "📷"; height: inherit; }
-
-.icon-layout.icon-left a:before, .icon-layout.icon-right a:after { content: "\268f"; height: inherit; }
-
-i.icon-layout:before { content: "\268f"; height: inherit; }
-
-.icon-menu.icon-left a:before, .icon-menu.icon-right a:after { content: "\2630"; height: inherit; }
-
-i.icon-menu:before { content: "\2630"; height: inherit; }
-
-.icon-check.icon-left a:before, .icon-check.icon-right a:after { content: "\2713"; height: inherit; }
-
-i.icon-check:before { content: "\2713"; height: inherit; }
-
-.icon-cancel.icon-left a:before, .icon-cancel.icon-right a:after { content: "\2715"; height: inherit; }
-
-i.icon-cancel:before { content: "\2715"; height: inherit; }
-
-.icon-cancel-circled.icon-left a:before, .icon-cancel-circled.icon-right a:after { content: "\2716"; height: inherit; }
-
-i.icon-cancel-circled:before { content: "\2716"; height: inherit; }
-
-.icon-cancel-squared.icon-left a:before, .icon-cancel-squared.icon-right a:after { content: "\274e"; height: inherit; }
-
-i.icon-cancel-squared:before { content: "\274e"; height: inherit; }
-
-.icon-plus.icon-left a:before, .icon-plus.icon-right a:after { content: "\2b"; height: inherit; }
-
-i.icon-plus:before { content: "\2b"; height: inherit; }
-
-.icon-plus-circled.icon-left a:before, .icon-plus-circled.icon-right a:after { content: "\2795"; height: inherit; }
-
-i.icon-plus-circled:before { content: "\2795"; height: inherit; }
-
-.icon-plus-squared.icon-left a:before, .icon-plus-squared.icon-right a:after { content: "\229e"; height: inherit; }
-
-i.icon-plus-squared:before { content: "\229e"; height: inherit; }
-
-.icon-minus.icon-left a:before, .icon-minus.icon-right a:after { content: "\2d"; height: inherit; }
-
-i.icon-minus:before { content: "\2d"; height: inherit; }
-
-.icon-minus-circled.icon-left a:before, .icon-minus-circled.icon-right a:after { content: "\2796"; height: inherit; }
-
-i.icon-minus-circled:before { content: "\2796"; height: inherit; }
-
-.icon-minus-squared.icon-left a:before, .icon-minus-squared.icon-right a:after { content: "\229f"; height: inherit; }
-
-i.icon-minus-squared:before { content: "\229f"; height: inherit; }
-
-.icon-help.icon-left a:before, .icon-help.icon-right a:after { content: "\2753"; height: inherit; }
-
-i.icon-help:before { content: "\2753"; height: inherit; }
-
-.icon-help-circled.icon-left a:before, .icon-help-circled.icon-right a:after { content: "\e704"; height: inherit; }
-
-i.icon-help-circled:before { content: "\e704"; height: inherit; }
-
-.icon-info.icon-left a:before, .icon-info.icon-right a:after { content: "\2139"; height: inherit; }
-
-i.icon-info:before { content: "\2139"; height: inherit; }
-
-.icon-info-circled.icon-left a:before, .icon-info-circled.icon-right a:after { content: "\e705"; height: inherit; }
-
-i.icon-info-circled:before { content: "\e705"; height: inherit; }
-
-.icon-back.icon-left a:before, .icon-back.icon-right a:after { content: "🔙"; height: inherit; }
-
-i.icon-back:before { content: "🔙"; height: inherit; }
-
-.icon-home.icon-left a:before, .icon-home.icon-right a:after { content: "\2302"; height: inherit; }
-
-i.icon-home:before { content: "\2302"; height: inherit; }
-
-.icon-link.icon-left a:before, .icon-link.icon-right a:after { content: "🔗"; height: inherit; }
-
-i.icon-link:before { content: "🔗"; height: inherit; }
-
-.icon-attach.icon-left a:before, .icon-attach.icon-right a:after { content: "📎"; height: inherit; }
-
-i.icon-attach:before { content: "📎"; height: inherit; }
-
-.icon-lock.icon-left a:before, .icon-lock.icon-right a:after { content: "🔒"; height: inherit; }
-
-i.icon-lock:before { content: "🔒"; height: inherit; }
-
-.icon-lock-open.icon-left a:before, .icon-lock-open.icon-right a:after { content: "🔓"; height: inherit; }
-
-i.icon-lock-open:before { content: "🔓"; height: inherit; }
-
-.icon-eye.icon-left a:before, .icon-eye.icon-right a:after { content: "\e70a"; height: inherit; }
-
-i.icon-eye:before { content: "\e70a"; height: inherit; }
-
-.icon-tag.icon-left a:before, .icon-tag.icon-right a:after { content: "\e70c"; height: inherit; }
-
-i.icon-tag:before { content: "\e70c"; height: inherit; }
-
-.icon-bookmark.icon-left a:before, .icon-bookmark.icon-right a:after { content: "🔖"; height: inherit; }
-
-i.icon-bookmark:before { content: "🔖"; height: inherit; }
-
-.icon-bookmarks.icon-left a:before, .icon-bookmarks.icon-right a:after { content: "📑"; height: inherit; }
-
-i.icon-bookmarks:before { content: "📑"; height: inherit; }
-
-.icon-flag.icon-left a:before, .icon-flag.icon-right a:after { content: "\2691"; height: inherit; }
-
-i.icon-flag:before { content: "\2691"; height: inherit; }
-
-.icon-thumbs-up.icon-left a:before, .icon-thumbs-up.icon-right a:after { content: "👍"; height: inherit; }
-
-i.icon-thumbs-up:before { content: "👍"; height: inherit; }
-
-.icon-thumbs-down.icon-left a:before, .icon-thumbs-down.icon-right a:after { content: "👎"; height: inherit; }
-
-i.icon-thumbs-down:before { content: "👎"; height: inherit; }
-
-.icon-download.icon-left a:before, .icon-download.icon-right a:after { content: "📥"; height: inherit; }
-
-i.icon-download:before { content: "📥"; height: inherit; }
-
-.icon-upload.icon-left a:before, .icon-upload.icon-right a:after { content: "📤"; height: inherit; }
-
-i.icon-upload:before { content: "📤"; height: inherit; }
-
-.icon-upload-cloud.icon-left a:before, .icon-upload-cloud.icon-right a:after { content: "\e711"; height: inherit; }
-
-i.icon-upload-cloud:before { content: "\e711"; height: inherit; }
-
-.icon-reply.icon-left a:before, .icon-reply.icon-right a:after { content: "\e712"; height: inherit; }
-
-i.icon-reply:before { content: "\e712"; height: inherit; }
-
-.icon-reply-all.icon-left a:before, .icon-reply-all.icon-right a:after { content: "\e713"; height: inherit; }
-
-i.icon-reply-all:before { content: "\e713"; height: inherit; }
-
-.icon-forward.icon-left a:before, .icon-forward.icon-right a:after { content: "\27a6"; height: inherit; }
-
-i.icon-forward:before { content: "\27a6"; height: inherit; }
-
-.icon-quote.icon-left a:before, .icon-quote.icon-right a:after { content: "\275e"; height: inherit; }
-
-i.icon-quote:before { content: "\275e"; height: inherit; }
-
-.icon-code.icon-left a:before, .icon-code.icon-right a:after { content: "\e714"; height: inherit; }
-
-i.icon-code:before { content: "\e714"; height: inherit; }
-
-.icon-export.icon-left a:before, .icon-export.icon-right a:after { content: "\e715"; height: inherit; }
-
-i.icon-export:before { content: "\e715"; height: inherit; }
-
-.icon-pencil.icon-left a:before, .icon-pencil.icon-right a:after { content: "\270e"; height: inherit; }
-
-i.icon-pencil:before { content: "\270e"; height: inherit; }
-
-.icon-feather.icon-left a:before, .icon-feather.icon-right a:after { content: "\2712"; height: inherit; }
-
-i.icon-feather:before { content: "\2712"; height: inherit; }
-
-.icon-print.icon-left a:before, .icon-print.icon-right a:after { content: "\e716"; height: inherit; }
-
-i.icon-print:before { content: "\e716"; height: inherit; }
-
-.icon-retweet.icon-left a:before, .icon-retweet.icon-right a:after { content: "\e717"; height: inherit; }
-
-i.icon-retweet:before { content: "\e717"; height: inherit; }
-
-.icon-keyboard.icon-left a:before, .icon-keyboard.icon-right a:after { content: "\2328"; height: inherit; }
-
-i.icon-keyboard:before { content: "\2328"; height: inherit; }
-
-.icon-comment.icon-left a:before, .icon-comment.icon-right a:after { content: "\e718"; height: inherit; }
-
-i.icon-comment:before { content: "\e718"; height: inherit; }
-
-.icon-chat.icon-left a:before, .icon-chat.icon-right a:after { content: "\e720"; height: inherit; }
-
-i.icon-chat:before { content: "\e720"; height: inherit; }
-
-.icon-bell.icon-left a:before, .icon-bell.icon-right a:after { content: "🔔"; height: inherit; }
-
-i.icon-bell:before { content: "🔔"; height: inherit; }
-
-.icon-attention.icon-left a:before, .icon-attention.icon-right a:after { content: "\26a0"; height: inherit; }
-
-i.icon-attention:before { content: "\26a0"; height: inherit; }
-
-.icon-alert.icon-left a:before, .icon-alert.icon-right a:after { content: "💥"; height: inherit; }
-
-i.icon-alert:before { content: "💥"; height: inherit; }
-
-.icon-vcard.icon-left a:before, .icon-vcard.icon-right a:after { content: "\e722"; height: inherit; }
-
-i.icon-vcard:before { content: "\e722"; height: inherit; }
-
-.icon-address.icon-left a:before, .icon-address.icon-right a:after { content: "\e723"; height: inherit; }
-
-i.icon-address:before { content: "\e723"; height: inherit; }
-
-.icon-location.icon-left a:before, .icon-location.icon-right a:after { content: "\e724"; height: inherit; }
-
-i.icon-location:before { content: "\e724"; height: inherit; }
-
-.icon-map.icon-left a:before, .icon-map.icon-right a:after { content: "\e727"; height: inherit; }
-
-i.icon-map:before { content: "\e727"; height: inherit; }
-
-.icon-direction.icon-left a:before, .icon-direction.icon-right a:after { content: "\27a2"; height: inherit; }
-
-i.icon-direction:before { content: "\27a2"; height: inherit; }
-
-.icon-compass.icon-left a:before, .icon-compass.icon-right a:after { content: "\e728"; height: inherit; }
-
-i.icon-compass:before { content: "\e728"; height: inherit; }
-
-.icon-cup.icon-left a:before, .icon-cup.icon-right a:after { content: "\2615"; height: inherit; }
-
-i.icon-cup:before { content: "\2615"; height: inherit; }
-
-.icon-trash.icon-left a:before, .icon-trash.icon-right a:after { content: "\e729"; height: inherit; }
-
-i.icon-trash:before { content: "\e729"; height: inherit; }
-
-.icon-doc.icon-left a:before, .icon-doc.icon-right a:after { content: "\e730"; height: inherit; }
-
-i.icon-doc:before { content: "\e730"; height: inherit; }
-
-.icon-docs.icon-left a:before, .icon-docs.icon-right a:after { content: "\e736"; height: inherit; }
-
-i.icon-docs:before { content: "\e736"; height: inherit; }
-
-.icon-doc-landscape.icon-left a:before, .icon-doc-landscape.icon-right a:after { content: "\e737"; height: inherit; }
-
-i.icon-doc-landscape:before { content: "\e737"; height: inherit; }
-
-.icon-doc-text.icon-left a:before, .icon-doc-text.icon-right a:after { content: "📄"; height: inherit; }
-
-i.icon-doc-text:before { content: "📄"; height: inherit; }
-
-.icon-doc-text-inv.icon-left a:before, .icon-doc-text-inv.icon-right a:after { content: "\e731"; height: inherit; }
-
-i.icon-doc-text-inv:before { content: "\e731"; height: inherit; }
-
-.icon-newspaper.icon-left a:before, .icon-newspaper.icon-right a:after { content: "📰"; height: inherit; }
-
-i.icon-newspaper:before { content: "📰"; height: inherit; }
-
-.icon-book-open.icon-left a:before, .icon-book-open.icon-right a:after { content: "📖"; height: inherit; }
-
-i.icon-book-open:before { content: "📖"; height: inherit; }
-
-.icon-book.icon-left a:before, .icon-book.icon-right a:after { content: "📕"; height: inherit; }
-
-i.icon-book:before { content: "📕"; height: inherit; }
-
-.icon-folder.icon-left a:before, .icon-folder.icon-right a:after { content: "📁"; height: inherit; }
-
-i.icon-folder:before { content: "📁"; height: inherit; }
-
-.icon-archive.icon-left a:before, .icon-archive.icon-right a:after { content: "\e738"; height: inherit; }
-
-i.icon-archive:before { content: "\e738"; height: inherit; }
-
-.icon-box.icon-left a:before, .icon-box.icon-right a:after { content: "📦"; height: inherit; }
-
-i.icon-box:before { content: "📦"; height: inherit; }
-
-.icon-rss.icon-left a:before, .icon-rss.icon-right a:after { content: "\e73a"; height: inherit; }
-
-i.icon-rss:before { content: "\e73a"; height: inherit; }
-
-.icon-phone.icon-left a:before, .icon-phone.icon-right a:after { content: "📞"; height: inherit; }
-
-i.icon-phone:before { content: "📞"; height: inherit; }
-
-.icon-cog.icon-left a:before, .icon-cog.icon-right a:after { content: "\2699"; height: inherit; }
-
-i.icon-cog:before { content: "\2699"; height: inherit; }
-
-.icon-tools.icon-left a:before, .icon-tools.icon-right a:after { content: "\2692"; height: inherit; }
-
-i.icon-tools:before { content: "\2692"; height: inherit; }
-
-.icon-share.icon-left a:before, .icon-share.icon-right a:after { content: "\e73c"; height: inherit; }
-
-i.icon-share:before { content: "\e73c"; height: inherit; }
-
-.icon-shareable.icon-left a:before, .icon-shareable.icon-right a:after { content: "\e73e"; height: inherit; }
-
-i.icon-shareable:before { content: "\e73e"; height: inherit; }
-
-.icon-basket.icon-left a:before, .icon-basket.icon-right a:after { content: "\e73d"; height: inherit; }
-
-i.icon-basket:before { content: "\e73d"; height: inherit; }
-
-.icon-bag.icon-left a:before, .icon-bag.icon-right a:after { content: "👜"; height: inherit; }
-
-i.icon-bag:before { content: "👜"; height: inherit; }
-
-.icon-calendar.icon-left a:before, .icon-calendar.icon-right a:after { content: "📅"; height: inherit; }
-
-i.icon-calendar:before { content: "📅"; height: inherit; }
-
-.icon-login.icon-left a:before, .icon-login.icon-right a:after { content: "\e740"; height: inherit; }
-
-i.icon-login:before { content: "\e740"; height: inherit; }
-
-.icon-logout.icon-left a:before, .icon-logout.icon-right a:after { content: "\e741"; height: inherit; }
-
-i.icon-logout:before { content: "\e741"; height: inherit; }
-
-.icon-mic.icon-left a:before, .icon-mic.icon-right a:after { content: "🎤"; height: inherit; }
-
-i.icon-mic:before { content: "🎤"; height: inherit; }
-
-.icon-mute.icon-left a:before, .icon-mute.icon-right a:after { content: "🔇"; height: inherit; }
-
-i.icon-mute:before { content: "🔇"; height: inherit; }
-
-.icon-sound.icon-left a:before, .icon-sound.icon-right a:after { content: "🔊"; height: inherit; }
-
-i.icon-sound:before { content: "🔊"; height: inherit; }
-
-.icon-volume.icon-left a:before, .icon-volume.icon-right a:after { content: "\e742"; height: inherit; }
-
-i.icon-volume:before { content: "\e742"; height: inherit; }
-
-.icon-clock.icon-left a:before, .icon-clock.icon-right a:after { content: "🕔"; height: inherit; }
-
-i.icon-clock:before { content: "🕔"; height: inherit; }
-
-.icon-hourglass.icon-left a:before, .icon-hourglass.icon-right a:after { content: "\23f3"; height: inherit; }
-
-i.icon-hourglass:before { content: "\23f3"; height: inherit; }
-
-.icon-lamp.icon-left a:before, .icon-lamp.icon-right a:after { content: "💡"; height: inherit; }
-
-i.icon-lamp:before { content: "💡"; height: inherit; }
-
-.icon-light-down.icon-left a:before, .icon-light-down.icon-right a:after { content: "🔅"; height: inherit; }
-
-i.icon-light-down:before { content: "🔅"; height: inherit; }
-
-.icon-light-up.icon-left a:before, .icon-light-up.icon-right a:after { content: "🔆"; height: inherit; }
-
-i.icon-light-up:before { content: "🔆"; height: inherit; }
-
-.icon-adjust.icon-left a:before, .icon-adjust.icon-right a:after { content: "\25d1"; height: inherit; }
-
-i.icon-adjust:before { content: "\25d1"; height: inherit; }
-
-.icon-block.icon-left a:before, .icon-block.icon-right a:after { content: "🚫"; height: inherit; }
-
-i.icon-block:before { content: "🚫"; height: inherit; }
-
-.icon-resize-full.icon-left a:before, .icon-resize-full.icon-right a:after { content: "\e744"; height: inherit; }
-
-i.icon-resize-full:before { content: "\e744"; height: inherit; }
-
-.icon-resize-small.icon-left a:before, .icon-resize-small.icon-right a:after { content: "\e746"; height: inherit; }
-
-i.icon-resize-small:before { content: "\e746"; height: inherit; }
-
-.icon-popup.icon-left a:before, .icon-popup.icon-right a:after { content: "\e74c"; height: inherit; }
-
-i.icon-popup:before { content: "\e74c"; height: inherit; }
-
-.icon-publish.icon-left a:before, .icon-publish.icon-right a:after { content: "\e74d"; height: inherit; }
-
-i.icon-publish:before { content: "\e74d"; height: inherit; }
-
-.icon-window.icon-left a:before, .icon-window.icon-right a:after { content: "\e74e"; height: inherit; }
-
-i.icon-window:before { content: "\e74e"; height: inherit; }
-
-.icon-arrow-combo.icon-left a:before, .icon-arrow-combo.icon-right a:after { content: "\e74f"; height: inherit; }
-
-i.icon-arrow-combo:before { content: "\e74f"; height: inherit; }
-
-.icon-down-circled.icon-left a:before, .icon-down-circled.icon-right a:after { content: "\e758"; height: inherit; }
-
-i.icon-down-circled:before { content: "\e758"; height: inherit; }
-
-.icon-left-circled.icon-left a:before, .icon-left-circled.icon-right a:after { content: "\e759"; height: inherit; }
-
-i.icon-left-circled:before { content: "\e759"; height: inherit; }
-
-.icon-right-circled.icon-left a:before, .icon-right-circled.icon-right a:after { content: "\e75a"; height: inherit; }
-
-i.icon-right-circled:before { content: "\e75a"; height: inherit; }
-
-.icon-up-circled.icon-left a:before, .icon-up-circled.icon-right a:after { content: "\e75b"; height: inherit; }
-
-i.icon-up-circled:before { content: "\e75b"; height: inherit; }
-
-.icon-down-open.icon-left a:before, .icon-down-open.icon-right a:after { content: "\e75c"; height: inherit; }
-
-i.icon-down-open:before { content: "\e75c"; height: inherit; }
-
-.icon-left-open.icon-left a:before, .icon-left-open.icon-right a:after { content: "\e75d"; height: inherit; }
-
-i.icon-left-open:before { content: "\e75d"; height: inherit; }
-
-.icon-right-open.icon-left a:before, .icon-right-open.icon-right a:after { content: "\e75e"; height: inherit; }
-
-i.icon-right-open:before { content: "\e75e"; height: inherit; }
-
-.icon-up-open.icon-left a:before, .icon-up-open.icon-right a:after { content: "\e75f"; height: inherit; }
-
-i.icon-up-open:before { content: "\e75f"; height: inherit; }
-
-.icon-down-open-mini.icon-left a:before, .icon-down-open-mini.icon-right a:after { content: "\e760"; height: inherit; }
-
-i.icon-down-open-mini:before { content: "\e760"; height: inherit; }
-
-.icon-left-open-mini.icon-left a:before, .icon-left-open-mini.icon-right a:after { content: "\e761"; height: inherit; }
-
-i.icon-left-open-mini:before { content: "\e761"; height: inherit; }
-
-.icon-right-open-mini.icon-left a:before, .icon-right-open-mini.icon-right a:after { content: "\e762"; height: inherit; }
-
-i.icon-right-open-mini:before { content: "\e762"; height: inherit; }
-
-.icon-up-open-mini.icon-left a:before, .icon-up-open-mini.icon-right a:after { content: "\e763"; height: inherit; }
-
-i.icon-up-open-mini:before { content: "\e763"; height: inherit; }
-
-.icon-down-open-big.icon-left a:before, .icon-down-open-big.icon-right a:after { content: "\e764"; height: inherit; }
-
-i.icon-down-open-big:before { content: "\e764"; height: inherit; }
-
-.icon-left-open-big.icon-left a:before, .icon-left-open-big.icon-right a:after { content: "\e765"; height: inherit; }
-
-i.icon-left-open-big:before { content: "\e765"; height: inherit; }
-
-.icon-right-open-big.icon-left a:before, .icon-right-open-big.icon-right a:after { content: "\e766"; height: inherit; }
-
-i.icon-right-open-big:before { content: "\e766"; height: inherit; }
-
-.icon-up-open-big.icon-left a:before, .icon-up-open-big.icon-right a:after { content: "\e767"; height: inherit; }
-
-i.icon-up-open-big:before { content: "\e767"; height: inherit; }
-
-.icon-down.icon-left a:before, .icon-down.icon-right a:after { content: "\2b07"; height: inherit; }
-
-i.icon-down:before { content: "\2b07"; height: inherit; }
-
-.icon-arrow-left.icon-left a:before, .icon-arrow-left.icon-right a:after { content: "\2b05"; height: inherit; }
-
-i.icon-arrow-left:before { content: "\2b05"; height: inherit; }
-
-.icon-arrow-right.icon-left a:before, .icon-arrow-right.icon-right a:after { content: "\27a1"; height: inherit; }
-
-i.icon-arrow-right:before { content: "\27a1"; height: inherit; }
-
-.icon-up.icon-left a:before, .icon-up.icon-right a:after { content: "\2b06"; height: inherit; }
-
-i.icon-up:before { content: "\2b06"; height: inherit; }
-
-.icon-down-dir.icon-left a:before, .icon-down-dir.icon-right a:after { content: "\25be"; height: inherit; }
-
-i.icon-down-dir:before { content: "\25be"; height: inherit; }
-
-.icon-left-dir.icon-left a:before, .icon-left-dir.icon-right a:after { content: "\25c2"; height: inherit; }
-
-i.icon-left-dir:before { content: "\25c2"; height: inherit; }
-
-.icon-right-dir.icon-left a:before, .icon-right-dir.icon-right a:after { content: "\25b8"; height: inherit; }
-
-i.icon-right-dir:before { content: "\25b8"; height: inherit; }
-
-.icon-up-dir.icon-left a:before, .icon-up-dir.icon-right a:after { content: "\25b4"; height: inherit; }
-
-i.icon-up-dir:before { content: "\25b4"; height: inherit; }
-
-.icon-down-bold.icon-left a:before, .icon-down-bold.icon-right a:after { content: "\e4b0"; height: inherit; }
-
-i.icon-down-bold:before { content: "\e4b0"; height: inherit; }
-
-.icon-left-bold.icon-left a:before, .icon-left-bold.icon-right a:after { content: "\e4ad"; height: inherit; }
-
-i.icon-left-bold:before { content: "\e4ad"; height: inherit; }
-
-.icon-right-bold.icon-left a:before, .icon-right-bold.icon-right a:after { content: "\e4ae"; height: inherit; }
-
-i.icon-right-bold:before { content: "\e4ae"; height: inherit; }
-
-.icon-up-bold.icon-left a:before, .icon-up-bold.icon-right a:after { content: "\e4af"; height: inherit; }
-
-i.icon-up-bold:before { content: "\e4af"; height: inherit; }
-
-.icon-down-thin.icon-left a:before, .icon-down-thin.icon-right a:after { content: "\2193"; height: inherit; }
-
-i.icon-down-thin:before { content: "\2193"; height: inherit; }
-
-.icon-left-thin.icon-left a:before, .icon-left-thin.icon-right a:after { content: "\2190"; height: inherit; }
-
-i.icon-left-thin:before { content: "\2190"; height: inherit; }
-
-.icon-right-thin.icon-left a:before, .icon-right-thin.icon-right a:after { content: "\2192"; height: inherit; }
-
-i.icon-right-thin:before { content: "\2192"; height: inherit; }
-
-.icon-up-thin.icon-left a:before, .icon-up-thin.icon-right a:after { content: "\2191"; height: inherit; }
-
-i.icon-up-thin:before { content: "\2191"; height: inherit; }
-
-.icon-ccw.icon-left a:before, .icon-ccw.icon-right a:after { content: "\27f2"; height: inherit; }
-
-i.icon-ccw:before { content: "\27f2"; height: inherit; }
-
-.icon-cw.icon-left a:before, .icon-cw.icon-right a:after { content: "\27f3"; height: inherit; }
-
-i.icon-cw:before { content: "\27f3"; height: inherit; }
-
-.icon-arrows-ccw.icon-left a:before, .icon-arrows-ccw.icon-right a:after { content: "🔄"; height: inherit; }
-
-i.icon-arrows-ccw:before { content: "🔄"; height: inherit; }
-
-.icon-level-down.icon-left a:before, .icon-level-down.icon-right a:after { content: "\21b3"; height: inherit; }
-
-i.icon-level-down:before { content: "\21b3"; height: inherit; }
-
-.icon-level-up.icon-left a:before, .icon-level-up.icon-right a:after { content: "\21b0"; height: inherit; }
-
-i.icon-level-up:before { content: "\21b0"; height: inherit; }
-
-.icon-shuffle.icon-left a:before, .icon-shuffle.icon-right a:after { content: "🔀"; height: inherit; }
-
-i.icon-shuffle:before { content: "🔀"; height: inherit; }
-
-.icon-loop.icon-left a:before, .icon-loop.icon-right a:after { content: "🔁"; height: inherit; }
-
-i.icon-loop:before { content: "🔁"; height: inherit; }
-
-.icon-switch.icon-left a:before, .icon-switch.icon-right a:after { content: "\21c6"; height: inherit; }
-
-i.icon-switch:before { content: "\21c6"; height: inherit; }
-
-.icon-play.icon-left a:before, .icon-play.icon-right a:after { content: "\25b6"; height: inherit; }
-
-i.icon-play:before { content: "\25b6"; height: inherit; }
-
-.icon-stop.icon-left a:before, .icon-stop.icon-right a:after { content: "\25a0"; height: inherit; }
-
-i.icon-stop:before { content: "\25a0"; height: inherit; }
-
-.icon-pause.icon-left a:before, .icon-pause.icon-right a:after { content: "\2389"; height: inherit; }
-
-i.icon-pause:before { content: "\2389"; height: inherit; }
-
-.icon-record.icon-left a:before, .icon-record.icon-right a:after { content: "\26ab"; height: inherit; }
-
-i.icon-record:before { content: "\26ab"; height: inherit; }
-
-.icon-to-end.icon-left a:before, .icon-to-end.icon-right a:after { content: "\23ed"; height: inherit; }
-
-i.icon-to-end:before { content: "\23ed"; height: inherit; }
-
-.icon-to-start.icon-left a:before, .icon-to-start.icon-right a:after { content: "\23ee"; height: inherit; }
-
-i.icon-to-start:before { content: "\23ee"; height: inherit; }
-
-.icon-fast-forward.icon-left a:before, .icon-fast-forward.icon-right a:after { content: "\23e9"; height: inherit; }
-
-i.icon-fast-forward:before { content: "\23e9"; height: inherit; }
-
-.icon-fast-backward.icon-left a:before, .icon-fast-backward.icon-right a:after { content: "\23ea"; height: inherit; }
-
-i.icon-fast-backward:before { content: "\23ea"; height: inherit; }
-
-.icon-progress-0.icon-left a:before, .icon-progress-0.icon-right a:after { content: "\e768"; height: inherit; }
-
-i.icon-progress-0:before { content: "\e768"; height: inherit; }
-
-.icon-progress-1.icon-left a:before, .icon-progress-1.icon-right a:after { content: "\e769"; height: inherit; }
-
-i.icon-progress-1:before { content: "\e769"; height: inherit; }
-
-.icon-progress-2.icon-left a:before, .icon-progress-2.icon-right a:after { content: "\e76a"; height: inherit; }
-
-i.icon-progress-2:before { content: "\e76a"; height: inherit; }
-
-.icon-progress-3.icon-left a:before, .icon-progress-3.icon-right a:after { content: "\e76b"; height: inherit; }
-
-i.icon-progress-3:before { content: "\e76b"; height: inherit; }
-
-.icon-target.icon-left a:before, .icon-target.icon-right a:after { content: "🎯"; height: inherit; }
-
-i.icon-target:before { content: "🎯"; height: inherit; }
-
-.icon-palette.icon-left a:before, .icon-palette.icon-right a:after { content: "🎨"; height: inherit; }
-
-i.icon-palette:before { content: "🎨"; height: inherit; }
-
-.icon-list.icon-left a:before, .icon-list.icon-right a:after { content: "\e005"; height: inherit; }
-
-i.icon-list:before { content: "\e005"; height: inherit; }
-
-.icon-list-add.icon-left a:before, .icon-list-add.icon-right a:after { content: "\e003"; height: inherit; }
-
-i.icon-list-add:before { content: "\e003"; height: inherit; }
-
-.icon-signal.icon-left a:before, .icon-signal.icon-right a:after { content: "📶"; height: inherit; }
-
-i.icon-signal:before { content: "📶"; height: inherit; }
-
-.icon-trophy.icon-left a:before, .icon-trophy.icon-right a:after { content: "🏆"; height: inherit; }
-
-i.icon-trophy:before { content: "🏆"; height: inherit; }
-
-.icon-battery.icon-left a:before, .icon-battery.icon-right a:after { content: "🔋"; height: inherit; }
-
-i.icon-battery:before { content: "🔋"; height: inherit; }
-
-.icon-back-in-time.icon-left a:before, .icon-back-in-time.icon-right a:after { content: "\e771"; height: inherit; }
-
-i.icon-back-in-time:before { content: "\e771"; height: inherit; }
-
-.icon-monitor.icon-left a:before, .icon-monitor.icon-right a:after { content: "💻"; height: inherit; }
-
-i.icon-monitor:before { content: "💻"; height: inherit; }
-
-.icon-mobile.icon-left a:before, .icon-mobile.icon-right a:after { content: "📱"; height: inherit; }
-
-i.icon-mobile:before { content: "📱"; height: inherit; }
-
-.icon-network.icon-left a:before, .icon-network.icon-right a:after { content: "\e776"; height: inherit; }
-
-i.icon-network:before { content: "\e776"; height: inherit; }
-
-.icon-cd.icon-left a:before, .icon-cd.icon-right a:after { content: "💿"; height: inherit; }
-
-i.icon-cd:before { content: "💿"; height: inherit; }
-
-.icon-inbox.icon-left a:before, .icon-inbox.icon-right a:after { content: "\e777"; height: inherit; }
-
-i.icon-inbox:before { content: "\e777"; height: inherit; }
-
-.icon-install.icon-left a:before, .icon-install.icon-right a:after { content: "\e778"; height: inherit; }
-
-i.icon-install:before { content: "\e778"; height: inherit; }
-
-.icon-globe.icon-left a:before, .icon-globe.icon-right a:after { content: "🌎"; height: inherit; }
-
-i.icon-globe:before { content: "🌎"; height: inherit; }
-
-.icon-cloud.icon-left a:before, .icon-cloud.icon-right a:after { content: "\2601"; height: inherit; }
-
-i.icon-cloud:before { content: "\2601"; height: inherit; }
-
-.icon-cloud-thunder.icon-left a:before, .icon-cloud-thunder.icon-right a:after { content: "\26c8"; height: inherit; }
-
-i.icon-cloud-thunder:before { content: "\26c8"; height: inherit; }
-
-.icon-flash.icon-left a:before, .icon-flash.icon-right a:after { content: "\26a1"; height: inherit; }
-
-i.icon-flash:before { content: "\26a1"; height: inherit; }
-
-.icon-moon.icon-left a:before, .icon-moon.icon-right a:after { content: "\263d"; height: inherit; }
-
-i.icon-moon:before { content: "\263d"; height: inherit; }
-
-.icon-flight.icon-left a:before, .icon-flight.icon-right a:after { content: "\2708"; height: inherit; }
-
-i.icon-flight:before { content: "\2708"; height: inherit; }
-
-.icon-paper-plane.icon-left a:before, .icon-paper-plane.icon-right a:after { content: "\e79b"; height: inherit; }
-
-i.icon-paper-plane:before { content: "\e79b"; height: inherit; }
-
-.icon-leaf.icon-left a:before, .icon-leaf.icon-right a:after { content: "🍂"; height: inherit; }
-
-i.icon-leaf:before { content: "🍂"; height: inherit; }
-
-.icon-lifebuoy.icon-left a:before, .icon-lifebuoy.icon-right a:after { content: "\e788"; height: inherit; }
-
-i.icon-lifebuoy:before { content: "\e788"; height: inherit; }
-
-.icon-mouse.icon-left a:before, .icon-mouse.icon-right a:after { content: "\e789"; height: inherit; }
-
-i.icon-mouse:before { content: "\e789"; height: inherit; }
-
-.icon-briefcase.icon-left a:before, .icon-briefcase.icon-right a:after { content: "💼"; height: inherit; }
-
-i.icon-briefcase:before { content: "💼"; height: inherit; }
-
-.icon-suitcase.icon-left a:before, .icon-suitcase.icon-right a:after { content: "\e78e"; height: inherit; }
-
-i.icon-suitcase:before { content: "\e78e"; height: inherit; }
-
-.icon-dot.icon-left a:before, .icon-dot.icon-right a:after { content: "\e78b"; height: inherit; }
-
-i.icon-dot:before { content: "\e78b"; height: inherit; }
-
-.icon-dot-2.icon-left a:before, .icon-dot-2.icon-right a:after { content: "\e78c"; height: inherit; }
-
-i.icon-dot-2:before { content: "\e78c"; height: inherit; }
-
-.icon-dot-3.icon-left a:before, .icon-dot-3.icon-right a:after { content: "\e78d"; height: inherit; }
-
-i.icon-dot-3:before { content: "\e78d"; height: inherit; }
-
-.icon-brush.icon-left a:before, .icon-brush.icon-right a:after { content: "\e79a"; height: inherit; }
-
-i.icon-brush:before { content: "\e79a"; height: inherit; }
-
-.icon-magnet.icon-left a:before, .icon-magnet.icon-right a:after { content: "\e7a1"; height: inherit; }
-
-i.icon-magnet:before { content: "\e7a1"; height: inherit; }
-
-.icon-infinity.icon-left a:before, .icon-infinity.icon-right a:after { content: "\221e"; height: inherit; }
-
-i.icon-infinity:before { content: "\221e"; height: inherit; }
-
-.icon-erase.icon-left a:before, .icon-erase.icon-right a:after { content: "\232b"; height: inherit; }
-
-i.icon-erase:before { content: "\232b"; height: inherit; }
-
-.icon-chart-pie.icon-left a:before, .icon-chart-pie.icon-right a:after { content: "\e751"; height: inherit; }
-
-i.icon-chart-pie:before { content: "\e751"; height: inherit; }
-
-.icon-chart-line.icon-left a:before, .icon-chart-line.icon-right a:after { content: "📈"; height: inherit; }
-
-i.icon-chart-line:before { content: "📈"; height: inherit; }
-
-.icon-chart-bar.icon-left a:before, .icon-chart-bar.icon-right a:after { content: "📊"; height: inherit; }
-
-i.icon-chart-bar:before { content: "📊"; height: inherit; }
-
-.icon-chart-area.icon-left a:before, .icon-chart-area.icon-right a:after { content: "🔾"; height: inherit; }
-
-i.icon-chart-area:before { content: "🔾"; height: inherit; }
-
-.icon-tape.icon-left a:before, .icon-tape.icon-right a:after { content: "\2707"; height: inherit; }
-
-i.icon-tape:before { content: "\2707"; height: inherit; }
-
-.icon-graduation-cap.icon-left a:before, .icon-graduation-cap.icon-right a:after { content: "🎓"; height: inherit; }
-
-i.icon-graduation-cap:before { content: "🎓"; height: inherit; }
-
-.icon-language.icon-left a:before, .icon-language.icon-right a:after { content: "\e752"; height: inherit; }
-
-i.icon-language:before { content: "\e752"; height: inherit; }
-
-.icon-ticket.icon-left a:before, .icon-ticket.icon-right a:after { content: "🎫"; height: inherit; }
-
-i.icon-ticket:before { content: "🎫"; height: inherit; }
-
-.icon-water.icon-left a:before, .icon-water.icon-right a:after { content: "💦"; height: inherit; }
-
-i.icon-water:before { content: "💦"; height: inherit; }
-
-.icon-droplet.icon-left a:before, .icon-droplet.icon-right a:after { content: "💧"; height: inherit; }
-
-i.icon-droplet:before { content: "💧"; height: inherit; }
-
-.icon-air.icon-left a:before, .icon-air.icon-right a:after { content: "\e753"; height: inherit; }
-
-i.icon-air:before { content: "\e753"; height: inherit; }
-
-.icon-credit-card.icon-left a:before, .icon-credit-card.icon-right a:after { content: "💳"; height: inherit; }
-
-i.icon-credit-card:before { content: "💳"; height: inherit; }
-
-.icon-floppy.icon-left a:before, .icon-floppy.icon-right a:after { content: "💾"; height: inherit; }
-
-i.icon-floppy:before { content: "💾"; height: inherit; }
-
-.icon-clipboard.icon-left a:before, .icon-clipboard.icon-right a:after { content: "📋"; height: inherit; }
-
-i.icon-clipboard:before { content: "📋"; height: inherit; }
-
-.icon-megaphone.icon-left a:before, .icon-megaphone.icon-right a:after { content: "📣"; height: inherit; }
-
-i.icon-megaphone:before { content: "📣"; height: inherit; }
-
-.icon-database.icon-left a:before, .icon-database.icon-right a:after { content: "\e754"; height: inherit; }
-
-i.icon-database:before { content: "\e754"; height: inherit; }
-
-.icon-drive.icon-left a:before, .icon-drive.icon-right a:after { content: "\e755"; height: inherit; }
-
-i.icon-drive:before { content: "\e755"; height: inherit; }
-
-.icon-bucket.icon-left a:before, .icon-bucket.icon-right a:after { content: "\e756"; height: inherit; }
-
-i.icon-bucket:before { content: "\e756"; height: inherit; }
-
-.icon-thermometer.icon-left a:before, .icon-thermometer.icon-right a:after { content: "\e757"; height: inherit; }
-
-i.icon-thermometer:before { content: "\e757"; height: inherit; }
-
-.icon-key.icon-left a:before, .icon-key.icon-right a:after { content: "🔑"; height: inherit; }
-
-i.icon-key:before { content: "🔑"; height: inherit; }
-
-.icon-flow-cascade.icon-left a:before, .icon-flow-cascade.icon-right a:after { content: "\e790"; height: inherit; }
-
-i.icon-flow-cascade:before { content: "\e790"; height: inherit; }
-
-.icon-flow-branch.icon-left a:before, .icon-flow-branch.icon-right a:after { content: "\e791"; height: inherit; }
-
-i.icon-flow-branch:before { content: "\e791"; height: inherit; }
-
-.icon-flow-tree.icon-left a:before, .icon-flow-tree.icon-right a:after { content: "\e792"; height: inherit; }
-
-i.icon-flow-tree:before { content: "\e792"; height: inherit; }
-
-.icon-flow-line.icon-left a:before, .icon-flow-line.icon-right a:after { content: "\e793"; height: inherit; }
-
-i.icon-flow-line:before { content: "\e793"; height: inherit; }
-
-.icon-flow-parallel.icon-left a:before, .icon-flow-parallel.icon-right a:after { content: "\e794"; height: inherit; }
-
-i.icon-flow-parallel:before { content: "\e794"; height: inherit; }
-
-.icon-rocket.icon-left a:before, .icon-rocket.icon-right a:after { content: "🚀"; height: inherit; }
-
-i.icon-rocket:before { content: "🚀"; height: inherit; }
-
-.icon-gauge.icon-left a:before, .icon-gauge.icon-right a:after { content: "\e7a2"; height: inherit; }
-
-i.icon-gauge:before { content: "\e7a2"; height: inherit; }
-
-.icon-traffic-cone.icon-left a:before, .icon-traffic-cone.icon-right a:after { content: "\e7a3"; height: inherit; }
-
-i.icon-traffic-cone:before { content: "\e7a3"; height: inherit; }
-
-.icon-cc.icon-left a:before, .icon-cc.icon-right a:after { content: "\e7a5"; height: inherit; }
-
-i.icon-cc:before { content: "\e7a5"; height: inherit; }
-
-.icon-cc-by.icon-left a:before, .icon-cc-by.icon-right a:after { content: "\e7a6"; height: inherit; }
-
-i.icon-cc-by:before { content: "\e7a6"; height: inherit; }
-
-.icon-cc-nc.icon-left a:before, .icon-cc-nc.icon-right a:after { content: "\e7a7"; height: inherit; }
-
-i.icon-cc-nc:before { content: "\e7a7"; height: inherit; }
-
-.icon-cc-nc-eu.icon-left a:before, .icon-cc-nc-eu.icon-right a:after { content: "\e7a8"; height: inherit; }
-
-i.icon-cc-nc-eu:before { content: "\e7a8"; height: inherit; }
-
-.icon-cc-nc-jp.icon-left a:before, .icon-cc-nc-jp.icon-right a:after { content: "\e7a9"; height: inherit; }
-
-i.icon-cc-nc-jp:before { content: "\e7a9"; height: inherit; }
-
-.icon-cc-sa.icon-left a:before, .icon-cc-sa.icon-right a:after { content: "\e7aa"; height: inherit; }
-
-i.icon-cc-sa:before { content: "\e7aa"; height: inherit; }
-
-.icon-cc-nd.icon-left a:before, .icon-cc-nd.icon-right a:after { content: "\e7ab"; height: inherit; }
-
-i.icon-cc-nd:before { content: "\e7ab"; height: inherit; }
-
-.icon-cc-pd.icon-left a:before, .icon-cc-pd.icon-right a:after { content: "\e7ac"; height: inherit; }
-
-i.icon-cc-pd:before { content: "\e7ac"; height: inherit; }
-
-.icon-cc-zero.icon-left a:before, .icon-cc-zero.icon-right a:after { content: "\e7ad"; height: inherit; }
-
-i.icon-cc-zero:before { content: "\e7ad"; height: inherit; }
-
-.icon-cc-share.icon-left a:before, .icon-cc-share.icon-right a:after { content: "\e7ae"; height: inherit; }
-
-i.icon-cc-share:before { content: "\e7ae"; height: inherit; }
-
-.icon-cc-remix.icon-left a:before, .icon-cc-remix.icon-right a:after { content: "\e7af"; height: inherit; }
-
-i.icon-cc-remix:before { content: "\e7af"; height: inherit; }
-
-.icon-github.icon-left a:before, .icon-github.icon-right a:after { content: "\f300"; height: inherit; }
-
-i.icon-github:before { content: "\f300"; height: inherit; }
-
-.icon-github-circled.icon-left a:before, .icon-github-circled.icon-right a:after { content: "\f301"; height: inherit; }
-
-i.icon-github-circled:before { content: "\f301"; height: inherit; }
-
-.icon-flickr.icon-left a:before, .icon-flickr.icon-right a:after { content: "\f303"; height: inherit; }
-
-i.icon-flickr:before { content: "\f303"; height: inherit; }
-
-.icon-flickr-circled.icon-left a:before, .icon-flickr-circled.icon-right a:after { content: "\f304"; height: inherit; }
-
-i.icon-flickr-circled:before { content: "\f304"; height: inherit; }
-
-.icon-vimeo.icon-left a:before, .icon-vimeo.icon-right a:after { content: "\f306"; height: inherit; }
-
-i.icon-vimeo:before { content: "\f306"; height: inherit; }
-
-.icon-vimeo-circled.icon-left a:before, .icon-vimeo-circled.icon-right a:after { content: "\f307"; height: inherit; }
-
-i.icon-vimeo-circled:before { content: "\f307"; height: inherit; }
-
-.icon-twitter.icon-left a:before, .icon-twitter.icon-right a:after { content: "\f309"; height: inherit; }
-
-i.icon-twitter:before { content: "\f309"; height: inherit; }
-
-.icon-twitter-circled.icon-left a:before, .icon-twitter-circled.icon-right a:after { content: "\f30a"; height: inherit; }
-
-i.icon-twitter-circled:before { content: "\f30a"; height: inherit; }
-
-.icon-facebook.icon-left a:before, .icon-facebook.icon-right a:after { content: "\f30c"; height: inherit; }
-
-i.icon-facebook:before { content: "\f30c"; height: inherit; }
-
-.icon-facebook-circled.icon-left a:before, .icon-facebook-circled.icon-right a:after { content: "\f30d"; height: inherit; }
-
-i.icon-facebook-circled:before { content: "\f30d"; height: inherit; }
-
-.icon-facebook-squared.icon-left a:before, .icon-facebook-squared.icon-right a:after { content: "\f30e"; height: inherit; }
-
-i.icon-facebook-squared:before { content: "\f30e"; height: inherit; }
-
-.icon-gplus.icon-left a:before, .icon-gplus.icon-right a:after { content: "\f30f"; height: inherit; }
-
-i.icon-gplus:before { content: "\f30f"; height: inherit; }
-
-.icon-gplus-circled.icon-left a:before, .icon-gplus-circled.icon-right a:after { content: "\f310"; height: inherit; }
-
-i.icon-gplus-circled:before { content: "\f310"; height: inherit; }
-
-.icon-pinterest.icon-left a:before, .icon-pinterest.icon-right a:after { content: "\f312"; height: inherit; }
-
-i.icon-pinterest:before { content: "\f312"; height: inherit; }
-
-.icon-pinterest-circled.icon-left a:before, .icon-pinterest-circled.icon-right a:after { content: "\f313"; height: inherit; }
-
-i.icon-pinterest-circled:before { content: "\f313"; height: inherit; }
-
-.icon-tumblr.icon-left a:before, .icon-tumblr.icon-right a:after { content: "\f315"; height: inherit; }
-
-i.icon-tumblr:before { content: "\f315"; height: inherit; }
-
-.icon-tumblr-circled.icon-left a:before, .icon-tumblr-circled.icon-right a:after { content: "\f316"; height: inherit; }
-
-i.icon-tumblr-circled:before { content: "\f316"; height: inherit; }
-
-.icon-linkedin.icon-left a:before, .icon-linkedin.icon-right a:after { content: "\f318"; height: inherit; }
-
-i.icon-linkedin:before { content: "\f318"; height: inherit; }
-
-.icon-linkedin-circled.icon-left a:before, .icon-linkedin-circled.icon-right a:after { content: "\f319"; height: inherit; }
-
-i.icon-linkedin-circled:before { content: "\f319"; height: inherit; }
-
-.icon-dribbble.icon-left a:before, .icon-dribbble.icon-right a:after { content: "\f31b"; height: inherit; }
-
-i.icon-dribbble:before { content: "\f31b"; height: inherit; }
-
-.icon-dribbble-circled.icon-left a:before, .icon-dribbble-circled.icon-right a:after { content: "\f31c"; height: inherit; }
-
-i.icon-dribbble-circled:before { content: "\f31c"; height: inherit; }
-
-.icon-stumbleupon.icon-left a:before, .icon-stumbleupon.icon-right a:after { content: "\f31e"; height: inherit; }
-
-i.icon-stumbleupon:before { content: "\f31e"; height: inherit; }
-
-.icon-stumbleupon-circled.icon-left a:before, .icon-stumbleupon-circled.icon-right a:after { content: "\f31f"; height: inherit; }
-
-i.icon-stumbleupon-circled:before { content: "\f31f"; height: inherit; }
-
-.icon-lastfm.icon-left a:before, .icon-lastfm.icon-right a:after { content: "\f321"; height: inherit; }
-
-i.icon-lastfm:before { content: "\f321"; height: inherit; }
-
-.icon-lastfm-circled.icon-left a:before, .icon-lastfm-circled.icon-right a:after { content: "\f322"; height: inherit; }
-
-i.icon-lastfm-circled:before { content: "\f322"; height: inherit; }
-
-.icon-rdio.icon-left a:before, .icon-rdio.icon-right a:after { content: "\f324"; height: inherit; }
-
-i.icon-rdio:before { content: "\f324"; height: inherit; }
-
-.icon-rdio-circled.icon-left a:before, .icon-rdio-circled.icon-right a:after { content: "\f325"; height: inherit; }
-
-i.icon-rdio-circled:before { content: "\f325"; height: inherit; }
-
-.icon-spotify.icon-left a:before, .icon-spotify.icon-right a:after { content: "\f327"; height: inherit; }
-
-i.icon-spotify:before { content: "\f327"; height: inherit; }
-
-.icon-spotify-circled.icon-left a:before, .icon-spotify-circled.icon-right a:after { content: "\f328"; height: inherit; }
-
-i.icon-spotify-circled:before { content: "\f328"; height: inherit; }
-
-.icon-qq.icon-left a:before, .icon-qq.icon-right a:after { content: "\f32a"; height: inherit; }
-
-i.icon-qq:before { content: "\f32a"; height: inherit; }
-
-.icon-instagram.icon-left a:before, .icon-instagram.icon-right a:after { content: "\f32d"; height: inherit; }
-
-i.icon-instagram:before { content: "\f32d"; height: inherit; }
-
-.icon-dropbox.icon-left a:before, .icon-dropbox.icon-right a:after { content: "\f330"; height: inherit; }
-
-i.icon-dropbox:before { content: "\f330"; height: inherit; }
-
-.icon-evernote.icon-left a:before, .icon-evernote.icon-right a:after { content: "\f333"; height: inherit; }
-
-i.icon-evernote:before { content: "\f333"; height: inherit; }
-
-.icon-flattr.icon-left a:before, .icon-flattr.icon-right a:after { content: "\f336"; height: inherit; }
-
-i.icon-flattr:before { content: "\f336"; height: inherit; }
-
-.icon-skype.icon-left a:before, .icon-skype.icon-right a:after { content: "\f339"; height: inherit; }
-
-i.icon-skype:before { content: "\f339"; height: inherit; }
-
-.icon-skype-circled.icon-left a:before, .icon-skype-circled.icon-right a:after { content: "\f33a"; height: inherit; }
-
-i.icon-skype-circled:before { content: "\f33a"; height: inherit; }
-
-.icon-renren.icon-left a:before, .icon-renren.icon-right a:after { content: "\f33c"; height: inherit; }
-
-i.icon-renren:before { content: "\f33c"; height: inherit; }
-
-.icon-sina-weibo.icon-left a:before, .icon-sina-weibo.icon-right a:after { content: "\f33f"; height: inherit; }
-
-i.icon-sina-weibo:before { content: "\f33f"; height: inherit; }
-
-.icon-paypal.icon-left a:before, .icon-paypal.icon-right a:after { content: "\f342"; height: inherit; }
-
-i.icon-paypal:before { content: "\f342"; height: inherit; }
-
-.icon-picasa.icon-left a:before, .icon-picasa.icon-right a:after { content: "\f345"; height: inherit; }
-
-i.icon-picasa:before { content: "\f345"; height: inherit; }
-
-.icon-soundcloud.icon-left a:before, .icon-soundcloud.icon-right a:after { content: "\f348"; height: inherit; }
-
-i.icon-soundcloud:before { content: "\f348"; height: inherit; }
-
-.icon-mixi.icon-left a:before, .icon-mixi.icon-right a:after { content: "\f34b"; height: inherit; }
-
-i.icon-mixi:before { content: "\f34b"; height: inherit; }
-
-.icon-behance.icon-left a:before, .icon-behance.icon-right a:after { content: "\f34e"; height: inherit; }
-
-i.icon-behance:before { content: "\f34e"; height: inherit; }
-
-.icon-google-circles.icon-left a:before, .icon-google-circles.icon-right a:after { content: "\f351"; height: inherit; }
-
-i.icon-google-circles:before { content: "\f351"; height: inherit; }
-
-.icon-vkontakte.icon-left a:before, .icon-vkontakte.icon-right a:after { content: "\f354"; height: inherit; }
-
-i.icon-vkontakte:before { content: "\f354"; height: inherit; }
-
-.icon-smashing.icon-left a:before, .icon-smashing.icon-right a:after { content: "\f357"; height: inherit; }
-
-i.icon-smashing:before { content: "\f357"; height: inherit; }
-
-.icon-sweden.icon-left a:before, .icon-sweden.icon-right a:after { content: "\f601"; height: inherit; }
-
-i.icon-sweden:before { content: "\f601"; height: inherit; }
-
-.icon-db-shape.icon-left a:before, .icon-db-shape.icon-right a:after { content: "\f600"; height: inherit; }
-
-i.icon-db-shape:before { content: "\f600"; height: inherit; }
-
-.icon-logo-db.icon-left a:before, .icon-logo-db.icon-right a:after { content: "\f603"; height: inherit; }
-
-i.icon-logo-db:before { content: "\f603"; height: inherit; }
-
-/* Form Styles */
-form { margin: 0 0 18px; }
-form label { display: block; font-size: 16px; font-size: 1rem; line-height: 1.625em; cursor: pointer; margin-bottom: 9px; }
-form label.inline { display: inline-block; padding-right: 20px; }
-form dt { margin: 0; }
-form textarea { height: 150px; }
-form ul, form ul li { margin-left: 0; list-style-type: none; }
-form fieldset { border-style: solid; border-width: 0.0625em; padding: 1.5625em; border-color: #d8d8d8; margin: 18px 0; }
-form fieldset legend { padding: 5px 10px; }
-
-.field { position: relative; max-width: 100%; margin-bottom: 10px; vertical-align: middle; font-size: 16px; /* remove inline-block white-space — A 0px font-size = 0px of white space */ }
-.field.metro, .field .metro { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; }
-.field input, .field input[type="*"], .field textarea { max-width: 100%; width: 100%; padding: 0; margin: 0; border: none; outline: none; resize: none; -webkit-appearance: none; font-family: "Open Sans"; font-weight: 300; font-size: 16px; font-size: 1rem; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
-.field .radio, .field .checkbox { position: relative; }
-.field .radio input[type="radio"], .field .checkbox input[type="checkbox"] { display: none; }
-.field .input { position: relative; padding: 0 10px; background: #fff; border: 1px solid #d8d8d8; height: 36px; line-height: 34px; font-size: 16px; font-size: 1rem; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; }
-.field .input.search { height: 36px; line-height: 34px; -webkit-border-radius: 1000px; -moz-border-radius: 1000px; -ms-border-radius: 1000px; -o-border-radius: 1000px; border-radius: 1000px; padding-right: 0; }
-.field .input.textarea { height: auto; }
-.field .xnarrow { width: 13.33333%; }
-.field .narrow { width: 30.66667%; }
-.field .normal { width: 48%; }
-.field .wide { width: 65.33333%; }
-.field .xwide { width: 82.66667%; }
-.field .xxwide { width: 100%; }
-.field .xnarrow, .field .narrow, .field .normal, .field .wide, .field .xwide, .field .xxwide { margin: 0; }
-.field .xnarrow:last-child, .field .narrow:last-child, .field .normal:last-child, .field .wide:last-child, .field .xwide:last-child, .field .xxwide:last-child { margin-left: -4px; }
-.field .xnarrow:first-child, .field .narrow:first-child, .field .normal:first-child, .field .wide:first-child, .field .xwide:first-child, .field .xxwide:first-child { margin-right: 3.94%; margin-left: 0; }
-.field .xnarrow:first-child:last-child, .field .narrow:first-child:last-child, .field .normal:first-child:last-child, .field .wide:first-child:last-child, .field .xwide:first-child:last-child, .field .xxwide:first-child:last-child { margin: 0; }
-.field label + .xnarrow:last-child, .field label + .narrow:last-child, .field label + .normal:last-child, .field label + .wide:last-child, .field label + .xwide:last-child, .field label + .xxwide:last-child { margin-left: 0; }
-@media only screen and (max-width: 960px) { .field .xxwide:first-child, .field .xxwide:last-child { margin-right: 0%; } }
-.field.prepend, .field.append { font-size: 0; white-space: nowrap; padding-bottom: 3.5px; }
-.field.prepend input, .field.prepend .input, .field.append input, .field.append .input { display: inline-block; max-width: 100%; }
-.field.prepend input, .field.prepend .input { -webkit-border-radius: 0px 4px 4px 0; -moz-border-radius: 0px 4px 4px 0; -ms-border-radius: 0px 4px 4px 0; -o-border-radius: 0px 4px 4px 0; border-radius: 0px 4px 4px 0; }
-.field.append input, .field.append .input { -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; -ms-border-radius: 4px 0 0 4px; -o-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; }
-.field.prepend.append input { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; }
-.field.prepend.append input:first-child { -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; -ms-border-radius: 4px 0 0 4px; -o-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; }
-.field.prepend.append input:last-child { margin-left: -1px; -webkit-border-radius: 0px 4px 4px 0; -moz-border-radius: 0px 4px 4px 0; -ms-border-radius: 0px 4px 4px 0; -o-border-radius: 0px 4px 4px 0; border-radius: 0px 4px 4px 0; }
-.field.prepend .adjoined, .field.append .adjoined, .field.prepend .btn, .field.append .btn { position: relative; display: inline-block; margin-bottom: 0; z-index: 99; }
-.field.prepend .btn a, .field.prepend .btn input, .field.prepend .btn button, .field.append .btn a, .field.append .btn input, .field.append .btn button { padding: 0 12px; }
-.field.prepend .adjoined, .field.append .adjoined { padding: 0 10px 0 10px; background: #f2f2f2; border: 1px solid #d8d8d8; font-family: "Open Sans"; font-weight: 600; color: #1e1e1e; font-size: 16px; font-size: 1rem; height: 36px; line-height: 34px; }
-.field.prepend *:first-child { -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; -ms-border-radius: 4px 0 0 4px; -o-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; }
-.field.prepend input:first-child { margin-right: 0; }
-.field.prepend .adjoined, .field.prepend .btn { margin-right: -1px; }
-.field .adjoined:first-child { margin-left: 0 !important; }
-.field.append .adjoined, .field.append .btn { margin-left: -1px; }
-.field.append *:last-child { -webkit-border-radius: 0px 4px 4px 0; -moz-border-radius: 0px 4px 4px 0; -ms-border-radius: 0px 4px 4px 0; -o-border-radius: 0px 4px 4px 0; border-radius: 0px 4px 4px 0; }
-.field.append button, .field.prepend button { display: inline-block; }
-.field.append input:first-child { margin-right: 0; }
-.field.double input, .field.double .input { width: 50% !important; }
-.field.double input:last-child, .field.double .input:last-child { margin-left: -1px; }
-.field.danger:after { font-family: "entypo"; content: "\2716"; font-size: 16px; position: absolute; top: 14%; right: 15px; z-index: 999; color: #ca3838; }
-.field.danger.no-icon:after { display: none; }
-.field.danger.append:after, .field.danger.prepend:after { content: ""; }
-.field.danger input, .field.danger .input, .field.danger textarea, .field.danger .textarea, .field.danger .radio span, .field.danger .checkbox span, .field.danger .picker { border-color: #ca3838; color: #ca3838; background: #f0c5c5; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
-.field.danger textarea { color: #ca3838; }
-.field.danger input::-webkit-input-placeholder, .field.danger textarea::-webkit-input-placeholder { color: #ca3838; }
-.field.danger input:-moz-placeholder, .field.danger textarea:-moz-placeholder { color: #ca3838; }
-.field.warning:after { font-family: "entypo"; content: "\26a0"; font-size: 16px; position: absolute; top: 14%; right: 15px; z-index: 999; color: #f6b83f; }
-.field.warning.no-icon:after { display: none; }
-.field.warning.append:after, .field.warning.prepend:after { content: ""; }
-.field.warning input, .field.warning .input, .field.warning textarea, .field.warning .textarea, .field.warning .radio span, .field.warning .checkbox span, .field.warning .picker { border-color: #f6b83f; color: #f6b83f; background: #fef7ea; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
-.field.warning textarea { color: #f6b83f; }
-.field.warning input::-webkit-input-placeholder, .field.warning textarea::-webkit-input-placeholder { color: #f6b83f; }
-.field.warning input:-moz-placeholder, .field.warning textarea:-moz-placeholder { color: #f6b83f; }
-.field.success:after { font-family: "entypo"; content: "\2713"; font-size: 16px; position: absolute; top: 14%; right: 15px; z-index: 999; color: #58c026; }
-.field.success.no-icon:after { display: none; }
-.field.success.append:after, .field.success.prepend:after { content: ""; }
-.field.success input, .field.success .input, .field.success textarea, .field.success .textarea, .field.success .radio span, .field.success .checkbox span, .field.success .picker { border-color: #58c026; color: #58c026; background: #c0eeaa; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
-.field.success textarea { color: #58c026; }
-.field.success input::-webkit-input-placeholder, .field.success textarea::-webkit-input-placeholder { color: #58c026; }
-.field.success input:-moz-placeholder, .field.success textarea:-moz-placeholder { color: #58c026; }
-.field .picker.danger { border-color: #ca3838; color: #ca3838; background: #f0c5c5; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
-.field .picker.danger select, .field .picker.danger:after { color: #ca3838; }
-.field .picker.warning { border-color: #f6b83f; color: #f6b83f; background: #fef7ea; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
-.field .picker.warning select, .field .picker.warning:after { color: #f6b83f; }
-.field .picker.success { border-color: #58c026; color: #58c026; background: #c0eeaa; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
-.field .picker.success select, .field .picker.success:after { color: #58c026; }
-.field .radio.danger, .field .checkbox.danger { color: #ca3838; }
-.field .radio.danger span, .field .checkbox.danger span { border-color: #ca3838; color: #ca3838; background: #f0c5c5; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
-.field .radio.warning, .field .checkbox.warning { color: #f6b83f; }
-.field .radio.warning span, .field .checkbox.warning span { border-color: #f6b83f; color: #f6b83f; background: #fef7ea; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
-.field .radio.success, .field .checkbox.success { color: #58c026; color: #1e1e1e; }
-.field .radio.success i, .field .checkbox.success i { color: #58c026; }
-.field .radio.success span, .field .checkbox.success span { border-color: #58c026; color: #58c026; background: #c0eeaa; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
-.field .radio span, .field .checkbox span { display: inline-block; width: 16px; height: 16px; position: relative; top: 2px; border: solid 1px #ccc; background: #fefefe; }
-.field .radio span { -webkit-border-radius: 8px; -moz-border-radius: 8px; -ms-border-radius: 8px; -o-border-radius: 8px; border-radius: 8px; }
-.field .checkbox span { -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; }
-.field .radio.checked i, .field .checkbox.checked i { position: absolute; top: -1px; left: -8px; line-height: 16px; }
-
-.field .text input[type="search"] { -webkit-appearance: textfield; }
-
-/* Form Picker Element (<select>) */
-.picker { position: relative; width: auto; display: inline-block; margin: 0 0 2px 1.2%; overflow: hidden; border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; font-family: "Open Sans"; font-weight: 600; height: auto; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f2f2f2)); background-image: -webkit-linear-gradient(#ffffff, #f2f2f2); background-image: -moz-linear-gradient(#ffffff, #f2f2f2); background-image: -o-linear-gradient(#ffffff, #f2f2f2); background-image: linear-gradient(#ffffff, #f2f2f2); }
-.picker:after { content: "\25BE"; z-index: 0; position: absolute; right: 8%; top: 50%; margin-top: -12px; color: #1e1e1e; }
-.picker:first-child { margin-left: 0; }
-.picker select { position: relative; display: block; min-width: 100%; width: 135%; height: 34px; padding: 6px 45px 6px 15px; color: #1e1e1e; border: none; background: transparent; outline: none; -webkit-appearance: none; z-index: 99; cursor: pointer; font-size: 16px; font-size: 1rem; }
-
-.ie9 .radio.checked i, .ie9 .checkbox.checked i { top: 0px; }
-
-/* Labels */
-.badge, .label { height: 20px; display: inline-block; font-family: Helvetica, arial, verdana, sans-serif; font-weight: bold; line-height: 20px; text-align: center; color: #fff; }
-.badge a, .label a { color: #fff; }
-.badge.primary, .label.primary { background: #3085d6; }
-.badge.light, .label.light { background: #fff; color: #1e1e1e; border: 1px solid #f2f2f2; }
-.badge.light a, .label.light a { color: #d04526; }
-.badge.dark, .label.dark { background: #212121; }
-.badge.secondary, .label.secondary { background: #42a35a; }
-.badge.light, .label.light { background: #fff; color: #1e1e1e; border: 1px solid #f2f2f2; }
-.badge.light a, .label.light a { color: #d04526; }
-.badge.dark, .label.dark { background: #212121; }
-.badge.default, .label.default { background: #f2f2f2; color: #555555; border: 1px solid #f2f2f2; }
-.badge.default:hover, .label.default:hover { border: 1px solid #e5e5e5; }
-.badge.default a, .label.default a { color: #555555; }
-.badge.light, .label.light { background: #fff; color: #1e1e1e; border: 1px solid #f2f2f2; }
-.badge.light a, .label.light a { color: #d04526; }
-.badge.dark, .label.dark { background: #212121; }
-.badge.info, .label.info { background: #4a4d50; }
-.badge.light, .label.light { background: #fff; color: #1e1e1e; border: 1px solid #f2f2f2; }
-.badge.light a, .label.light a { color: #d04526; }
-.badge.dark, .label.dark { background: #212121; }
-.badge.danger, .label.danger { background: #ca3838; }
-.badge.light, .label.light { background: #fff; color: #1e1e1e; border: 1px solid #f2f2f2; }
-.badge.light a, .label.light a { color: #d04526; }
-.badge.dark, .label.dark { background: #212121; }
-.badge.warning, .label.warning { background: #f6b83f; color: #644405; }
-.badge.warning a, .label.warning a { color: #644405; }
-.badge.light, .label.light { background: #fff; color: #1e1e1e; border: 1px solid #f2f2f2; }
-.badge.light a, .label.light a { color: #d04526; }
-.badge.dark, .label.dark { background: #212121; }
-.badge.success, .label.success { background: #58c026; }
-.badge.light, .label.light { background: #fff; color: #1e1e1e; border: 1px solid #f2f2f2; }
-.badge.light a, .label.light a { color: #d04526; }
-.badge.dark, .label.dark { background: #212121; }
-
-.badge { padding: 0 10px; font-size: 14px; font-size: 0.875rem; -webkit-border-radius: 10px; -moz-border-radius: 10px; -ms-border-radius: 10px; -o-border-radius: 10px; border-radius: 10px; }
-
-.label { padding: 0 10px; font-size: 12px; font-size: 0.75rem; -webkit-border-radius: 2px; -moz-border-radius: 2px; -ms-border-radius: 2px; -o-border-radius: 2px; border-radius: 2px; }
-
-.alert { padding: 0 10px; font-family: "Open Sans"; font-weight: 600; list-style-type: none; word-wrap: break-word; margin-bottom: 8px; font-size: 14px; font-size: 0.875rem; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; }
-.alert.primary { background: #85b7e7; border: 1px solid #3085d6; color: #1a5186; }
-.alert.secondary { background: #80cb92; border: 1px solid #42a35a; color: #255a32; }
-.alert.default { background: white; border: 1px solid #f2f2f2; color: #bfbfbf; color: #555555; border: 1px solid #f2f2f2; }
-.alert.info { background: #7b8085; border: 1px solid #4a4d50; color: #191a1b; color: #f2f2f2; }
-.alert.danger { background: #df8989; border: 1px solid #ca3838; color: #7b2121; }
-.alert.warning { background: #fbdca0; border: 1px solid #f6b83f; color: #c68609; color: #644405; }
-.alert.success { background: #91e26a; border: 1px solid #58c026; color: #316b15; }
-
-/* Tabs */
-.tabs { display: block; }
-.tabs .tab-nav { margin: 0; padding: 0; border-bottom: 1px solid #e5e5e5; }
-.tabs .tab-nav > li { display: inline-block; width: auto; padding: 0; margin: 0 2.12766% 0 0; cursor: default; top: 1px; -webkit-box-shadow: 0 1px 0 white; -moz-box-shadow: 0 1px 0 white; box-shadow: 0 1px 0 white; }
-.tabs .tab-nav > li > a { display: block; width: auto; padding: 0 16px; margin: 0; color: #1e1e1e; font-family: "Open Sans"; font-weight: 600; border: 1px solid #e5e5e5; border-width: 1px 1px 0 1px; text-shadow: 0 1px 1px white; background: #f2f2f2; cursor: pointer; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; -ms-border-radius: 4px 4px 0 0; -o-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; height: 42px; line-height: 40px; }
-.tabs .tab-nav > li > a:hover { text-decoration: none; background: whitesmoke; }
-.tabs .tab-nav > li > a:active { background: #ededed; }
-.tabs .tab-nav > li.active > a { height: 43px; line-height: 41px; background: white; cursor: default; }
-.tabs .tab-nav > li:last-child { margin-right: 0; }
-.tabs .tab-content { display: none; padding: 20px 10px; }
-.tabs .tab-content.active { display: block; }
-.tabs.pill .tab-nav { width: 100%; /* remove if you dont want the tabs to span the full container width */ display: table; overflow: hidden; border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; }
-.tabs.pill .tab-nav > li { display: table-cell; margin: 0; margin-left: -4px; text-align: center; top: 0; }
-.tabs.pill .tab-nav > li:first-child { margin-left: 0; }
-.tabs.pill .tab-nav > li > a { border: none; border-right: 1px solid #e5e5e5; -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; height: 42px; line-height: 40px; }
-.tabs.pill .tab-nav > li:last-child > a { border-right: none; }
-.tabs.vertical .tab-nav { border: none; }
-.tabs.vertical .tab-nav > li { display: block; margin: 0; margin-bottom: 5px; }
-.tabs.vertical .tab-nav > li.active { position: relative; z-index: 99; }
-.tabs.vertical .tab-nav > li.active > a { border-right: 1px solid white; }
-.tabs.vertical .tab-nav > li > a { border: 1px solid #e5e5e5; -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; -ms-border-radius: 4px 0 0 4px; -o-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; }
-.tabs.vertical .tab-content { padding: 10px 0 30px 20px; margin-left: -1px; border-left: 1px solid #e5e5e5; }
-
-.image { line-height: 0; margin-bottom: 20px; }
-.image.circle { -webkit-border-radius: 50% !important; -moz-border-radius: 50% !important; -ms-border-radius: 50% !important; -o-border-radius: 50% !important; border-radius: 50% !important; overflow: hidden; width: auto; }
-.image.rounded { overflow: hidden; -webkit-border-radius: 4px 4px; -moz-border-radius: 4px 4px; -ms-border-radius: 4px 4px; -o-border-radius: 4px 4px; border-radius: 4px 4px; }
-.image.photo { border: 5px solid #fff; -webkit-box-shadow: 0 0 1px #1e1e1e; -moz-box-shadow: 0 0 1px #1e1e1e; box-shadow: 0 0 1px #1e1e1e; }
-.image.photo.polaroid { padding-bottom: 50px; background: #fff; }
-
-body .video { width: 100%; position: relative; height: 0; padding-bottom: 56.25%; }
-body .video.twitch, body .video.youtube.show_controls { padding-top: 30px; }
-
-.video > video, .video > iframe, .video > object, .video > embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-.drawer { position: relative; width: 100%; max-height: 0; background: #3e4144; -webkit-box-shadow: inset 0 -2px 5px #313436, inset 0 2px 5px #313436; -moz-box-shadow: inset 0 -2px 5px #313436, inset 0 2px 5px #313436; box-shadow: inset 0 -2px 5px #313436, inset 0 2px 5px #313436; overflow: hidden; -webkit-transition-duration: 0.3s; -moz-transition-duration: 0.3s; -o-transition-duration: 0.3s; transition-duration: 0.3s; }
-.drawer.active { height: auto; max-height: 800px; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; }
-
-.modal { width: 100%; height: 100%; position: fixed; top: 0; left: 0; z-index: -999999; display: none; background: black; background: rgba(0, 0, 0, 0.8); }
-.modal > .content { position: relative; top: 5%; max-width: 60em; margin: 0 auto; padding-top: 10px; padding-bottom: 10px; background: white; z-index: 2; overflow: auto; }
-@media only screen and (max-width: 768px) { .modal > .content { max-width: 95%; min-height: 80%; max-height: 95%; top: 10%; } }
-@media only screen and (max-width: 767px) { .modal > .content { max-width: 95%; min-height: 92.5%; max-height: 95%; top: 3.75%; } }
-.modal > .content > .close { position: absolute; top: 10px; right: 10px; cursor: pointer; }
-.modal, .modal > .content { filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0); opacity: 0; -webkit-transition-duration: 0.1s; -moz-transition-duration: 0.1s; -o-transition-duration: 0.1s; transition-duration: 0.1s; }
-.modal.active { display: block; z-index: 999999; }
-.modal.active, .modal.active > .content { filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100); opacity: 1; }
-
-table { display: table; background-color: white; border-collapse: collapse; border-spacing: 0; margin-bottom: 20px; width: 100%; border: 1px solid #e5e5e5; }
-table caption { text-align: center; font-size: 30px; padding: .75em; }
-table thead th, table tbody td, table tr td { display: table-cell; padding: 10px; vertical-align: top; text-align: left; border-top: 1px solid #e5e5e5; }
-table tr td, table tbody tr td { font-size: 16px; }
-table tr td:first-child { font-weight: bold; }
-table thead { background-color: #3085d6; color: #fff; }
-table thead tr th { font-size: 16px; font-weight: bold; vertical-align: bottom; }
-table.striped tr:nth-of-type(even), table table tr.stripe, table table tr.striped { background-color: #e5e5e5; }
-table.rounded { border-radius: 4px; border-collapse: separate; }
-table.rounded caption + thead tr:first-child th:first-child, table.rounded caption + tr td:first-child, table.rounded > thead tr:first-child th:first-child, table.rounded > thead tr:first-child td:first-child, table.rounded > tr:first-child td:first-child { border-top-left-radius: 4px; }
-table.rounded caption + thead tr:first-child th:last-child, table.rounded caption + tr td:last-child, table.rounded > thead tr:first-child th:last-child, table.rounded > thead tr:first-child td:last-child, table.rounded > tr:first-child td:last-child { border-top-right-radius: 4px; }
-table.rounded thead ~ tr:last-child td:last-child, table.rounded tbody tr:last-child td:last-child { border-bottom-right-radius: 4px; }
-table.rounded thead ~ tr:last-child td:first-child, table.rounded tbody tr:last-child td:first-child { border-bottom-left-radius: 4px; }
-table.rounded thead th, table.rounded thead td, table.rounded caption + tbody tr:first-child td, table.rounded > tbody:first-child tr:first-child td { border-top: 0; }
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/index.html b/pkgs/plt-services/meta/pkg-index/official/static/index.html
deleted file mode 100644
index b3d59bacdc..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/static/index.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Packages</title>
-    <script src="/sorttable.js"></script>
-    <link rel="stylesheet" href="/plt-theme/jquery-ui-1.10.3.custom.min.css" />
-    <script src="//code.jquery.com/jquery-1.10.1.min.js"></script>
-    <script src="//code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
-    <script src="/index.js"></script>
-
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <link rel="icon" type="image/ico" />
-    <link rel="shortcut icon" type="image/x-icon" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1" />
-    <link rel="stylesheet" href="/gumby.css"></link>
-    <link rel="stylesheet" href="/style.css"></link>
-  </head>
-  <body>
-
-    <div class="navbar gumby-content" style="position: fixed;" gumby-fixed="top" id="nav1"><div class="row"><a class="toggle" gumby-trigger="#nav1 > .row > ul" href="#"><i class="icon-menu"></i></a>
-        <a class="four columns logo" href="http://www.racket-lang.org/"><img class="logo" src="/logo-and-text.png" width="198" height="60" alt="Racket"></a>
-        <span class="one colums"></span> <ul class="five columns"><li><a href="http://pkgs.racket-lang.org/">Packages</a></li>
-          <li><a href="http://docs.racket-lang.org/">Documentation</a></li>
-          <li><a href="http://blog.racket-lang.org/">Blog</a></li>
-          <li><div class="medium metro info btn icon-left entypo
-                          icon-install"><a href="http://download.racket-lang.org/">Download</a></div></li></ul></div></div>
-    <div style="height: 60px;"></div>
-
-    <div class="bodycontent">
-    <div class="breadcrumb">
-      <span><a href="/">&nbsp;</a></span>
-      <span id="logout"></span>
-    </div>
-    <div id="server_notice">
-    </div>
-    <div>
-      <p id="search_help">Search filters are
-      below. <span style="font-weight: bold;">Bold</span> filters are
-      used to select packages and <span style="font-weight: bold;
-      text-decoration: line-through;">strike-through</span> tags are
-      used to omit packages. Clicking a filter will toggle its
-      status.</p>
-      <p id="search_menu"></p>
-    </div>
-
-    <div id="login" class="package">
-      <table>
-        <tr><td>Email Address:</td><td><input id="login_email_text" type="text"></td></tr>
-        <tr><td>Password:</td><td><input id="login_passwd_text" type="password"></td></tr>
-        <tr id="login_confirm_row"><td>Confirm Password:</td><td><input id="login_confirm_text" type="password"></td></tr>
-        <tr id="login_code_row"><td>Email Code:</td><td><input id="login_code_text" type="password"></td></tr>
-        <tr><td colspan="2" id="login_error"></td></tr>
-      </table>
-      <button id="login_button">Log In</button>
-      <p>If you enter an unclaimed email address, then we will email
-        you a code. If you type in that code and confirm the password
-        you typed in, then we will create an account for you with the
-        given password.</p>
-      <p>If you enter an claimed email address, but an incorrect
-        password, then we will email you a code. If you type in that
-        code and confirm the password you typed in, then we will change
-        your password to the one you typed in.</p>
-      <p>Passwords are transferred over an HTTPS connection, but not
-        the same connection you got this page from. The passwords are
-        transferred in plain-text, but stored on the server in the
-        delicious bcrypt format. This means that someone could hack
-        our server and watch you transmit your password live but not
-        be able to use our password database.</p>
-    </div>
-
-    <div id="package_info" class="package">
-      <p id="pi_edit_help">Unfocusing an edit field or pressing enter
-      submits a change update asynchronously.</p>
-      <table>
-        <tr><td>Package Name:</td><td><span id="pi_name"></span></td></tr>
-        <tr><td>Ring:</td><td><span id="pi_ring"></span></td></tr>
-        <tr><td>Authors:</td><td><span id="pi_authors"></span></td></tr>
-        <tr id="pi_add_author_row"><td></td><td><input type="text" id="pi_add_author_text" class="text ui-widget-content ui-corner-all" /><button id="pi_add_author_button">Add Author</button></td></tr>
-        <tr><td>Documentation:</td><td><span id="pi_docs"></span></td></tr>
-        <tr><td>Source:</td><td><span id="pi_source"></span><p id="pi_source_help">Consult
-        the <a href="http://docs.racket-lang.org/pkg/Package_Concepts.html#%28part._concept~3asource%29">documentation</a>
-        for the full list of options.</p></td></tr>
-        <tr><td>Build Status</td><td><span id="pi_build"></span></td></tr>
-        <tr><td>Checksum:</td><td><span id="pi_checksum"></span></td></tr>
-        <tr><td>Last Updated:</td><td><span id="pi_last_updated"></span></td></tr>
-        <tr><td>Last Checked:</td><td><span id="pi_last_checked"></span></td></tr>
-        <tr><td>Last Edit:</td><td><span id="pi_last_edit"></span></td></tr>
-        <tr><td>Description:</td><td><span id="pi_description"></span></td></tr>
-        <tr><td>Tags:</td><td><span id="pi_tags"></span></td></tr>
-        <tr id="pi_add_tag_row"><td></td><td><input type="text" id="pi_add_tag_text" class="text ui-widget-content ui-corner-all" /><button id="pi_add_tag_button">Add Tag</button></td></tr>
-        <tr id="pi_versions_row"><td>Version Exceptions</td><td><table id="pi_versions"></table></td></tr>
-        <tr id="pi_add_version_row"><td></td><td><label>Version:</label> <input type="text" id="pi_add_version_text" class="text ui-widget-content ui-corner-all" /><br /><label>Source:</label> <input type="text" id="pi_add_version_source_text" class="text ui-widget-content ui-corner-all" /><button id="pi_add_version_button">Add Version Exception</button></td></tr>
-        <tr id="pi_dependencies_row"><td>Dependencies</td><td><span id="pi_dependencies"></span></td></tr>
-        <tr id="pi_conflicts_row"><td>Conflicts</td><td><span id="pi_conflicts"></span></td></tr>
-        <tr><td>Modules</td><td><span id="pi_modules"></span></td></tr>
-        <tr id="pi_delete_row"><td colspan="2"><button id="pi_delete_button">Delete
-        Package</button><br />(there is no undo!)</td></tr>
-      </table>
-
-      <div id="pi_install" class="install">Install this package with:<br><br><tt>raco pkg install <span id="pi_name_inst"></span></tt><br><br>or, with the 'File|Install Package...' menu option in DrRacket.</div>
-    </div>
-
-    <p id="packages_loading">Loading...</td></tr>
-    <table class="packages sortable">
-      <thead>
-        <tr id="packages_headers">
-          <th>Updated Recently</th>
-          <th>Package</th>
-          <th>Description</th>
-          <th>Build</th>
-        </tr>
-      </thead>
-      <tbody id="packages_table">        
-      </tbody>
-    </table>
-    <div id="footer">
-      Powered by <a href="http://racket-lang.org">Racket</a> and a
-      mess of ugly JS. Written
-      by <a href="http://jeapostrophe.github.io">Jay McCarthy</a>.
-      <a href="/atom.xml">Atom</a> feed available.
-    </div>
-    </div>
-  </body>
-</html>
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/index.js b/pkgs/plt-services/meta/pkg-index/official/static/index.js
deleted file mode 100644
index 0303c64968..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/static/index.js
+++ /dev/null
@@ -1,684 +0,0 @@
-var build_host = "http://pkg-build.racket-lang.org/";
-var dynamic_host = "pkgd.racket-lang.org";
-var dynamic_port = 443;
-
-function dynamic_url ( u ) {
-    return "https://" + dynamic_host + ":" + dynamic_port + u + "?callback=?"; }
-
-function me () {
-    return localStorage['email']; }
-
-$( document ).ready(function() {
-    var logged_in = false;
-
-    function spanText ( text ) {
-        return $('<span>', { text: text }); }
-    
-    function jslink ( texts, clickf) {
-        return $('<a>', { href: "javascript:void(0)",
-                          click: clickf } ).html(texts); }
-    function jslinki ( texts, clickf) {
-        var i = $('<a>', { href: "javascript:void(0)",
-                           click: function () { clickf(i); } } );
-        return i.html(texts); }
-
-    function dynamic_send ( u, o ) {
-        o['email'] = localStorage['email'];
-        o['passwd'] = localStorage['passwd'];
-        // xxx do a poll
-        $.getJSON( dynamic_url(u), o, function (r) { return; } ); }
-
-    function dynamic_pkgsend ( u, o ) {
-        o['pkg'] = active_info['name'];
-        dynamic_send ( u, o ); }
-
-    $("#package_info").dialog({
-        beforeClose: function ( event, ui ) { evaluate_search(); },
-        autoOpen: false,
-        minWidth: 600,
-        minHeight: 600,
-        position: { my: "center", at: "center", of: "#search_menu" },
-        modal: true });
-
-    function format_time( t ) {
-        var d = new Date( t * 1000 );
-        return d.toLocaleString(); }
-
-    var active_info = false;
-    var target_pkg = false;
-    function update_info( pkgi ) {
-        update_package_on_list ( pkgi );
-        // console.log( pkgi );
-        change_hash( "[" + pkgi['name'] + "]" );
-       
-        var mypkg_p = ($.inArray(me(), pkgi['authors'] ) != -1);
-
-        if ( mypkg_p ) {
-            $("#pi_edit_help").show(); } 
-        else {
-            $("#pi_edit_help").hide(); }
-
-        function make_editbutton ( spot, initv, fun ) {
-            if ( mypkg_p ) {
-                $( "#" + spot ).append( $('<button>')
-                                        .button({ icons: { primary: "ui-icon-pencil" } })
-                                        .click( function (e) {
-                                            $( "#" + spot ).html("").append(
-                                                $('<input id="' + spot + '_text" type="text" class="text ui-widget-content ui-corner-all">') );
-                                            var it = $( "#" + spot + "_text" );
-                                            it.keypress( function (e) {
-                                                if (e.which == 13) { fun (it.val()); } } );
-                                            it.focusout( function (e) {
-                                                fun (it.val()); } );
-                                            it.val(initv).focus(); } ) ); } }
-
-        $( "#pi_name" ).text( pkgi['name'] );
-        make_editbutton ( "pi_name", pkgi['name'], submit_mod_name );
-        if ( mypkg_p ) {
-            $( "#pi_delete_button" ).click( function (e) {
-                dynamic_pkgsend( "/jsonp/package/del", { } );
-                $(pkgi['dom_obj']).remove();
-                $("#package_info").dialog("close"); } );
-            $( "#pi_delete_row" ).show(); }
-        else {
-            $( "#pi_delete_row" ).hide(); }
-
-        $( "#pi_name_inst" ).text( pkgi['name'] );
-        $( "#pi_ring" ).text( pkgi['ring'] );
-        $( "#pi_authors" ).html("")
-            .append( $.map( pkgi['authors'],
-                            function ( author, i ) {
-                                if ( mypkg_p && author != me() ) {
-                                    return [ spanText(author), jslink( "[x]", function () { submit_remove_author(author); }),
-                                             " "]; }
-                                else {
-                                    return [ spanText(author), " "]; }} ) );
-        if ( mypkg_p ) {
-            $( "#pi_add_author_row" ).show(); }
-        else {
-            $( "#pi_add_author_row" ).hide(); }
-
-        $( "#pi_source" ).html( $('<a>', { text: pkgi['versions']['default']['source'],
-                                           href: pkgi['versions']['default']['source_url']  } ));
-        make_editbutton ( "pi_source", pkgi['versions']['default']['source'], submit_mod_source );
-        if ( mypkg_p ) {
-            $( "#pi_source_help" ).show(); }
-        else {
-            $( "#pi_source_help" ).hide(); }
-
-        $( "#pi_checksum" ).html("").text( pkgi['versions']['default']['checksum'] );
-        if ( pkgi['checksum-error'] ) {
-            $( "#pi_checksum" ).append( [ "Error:", $("<pre>").text(pkgi['checksum-error']) ] ); }
-
-        $( "#pi_last_updated" ).text( format_time(pkgi['last-updated']) );
-        $( "#pi_last_checked" ).text( format_time(pkgi['last-checked']) );
-        $( "#pi_last_edit" ).text( format_time(pkgi['last-edit']) );
-
-        // XXX show the doc[0] content?
-        $('#pi_docs').html("").append( $.map( pkgi['build']['docs'], function ( doc, i ) {
-            var dl;
-            if ( doc[2] ) {
-                dl = $('<a>', { href: build_host + doc[2] } ).html(doc[1]); }
-            else {
-                dl = $('<del>').html(doc[1]); }
-            return $('<span>').append(dl, " ") } ) );
-
-        if ( pkgi['build'] && pkgi['build']['failure-log'] ) {
-                $('#pi_build').html("")
-                .append($('<span>')
-                        .append($('<a>', { href: build_host + pkgi['build']['failure-log'] }).html( "fails" )));
-        } else if ( pkgi['build']['success-log'] && pkgi['build']['dep-failure-log'] ) {
-            $('#pi_build').html("")   
-                .append($('<span>')
-                        .append($('<a>', { href: build_host + pkgi['build']['success-log'] }).html( "succeeds" ))
-                        .append(" with ")
-                        .append($('<a>', { href: build_host + pkgi['build']['dep-failure-log'] }).html( "dependency problems" )));
-        } else if ( pkgi['build']['success-log'] ) {
-            $('#pi_build').html("")
-                .append($('<span>')
-                        .append($('<a>', { href: build_host + pkgi['build']['success-log'] }).html( "succeeds" )));
-        }
-
-        $( "#pi_description" ).text( pkgi['description'] );
-        make_editbutton ( "pi_description", pkgi['description'], submit_mod_description );
-
-        ($( "#pi_tags" ).html("").append( $.map( pkgi['tags'], function ( tag, i ) {
-            if ( mypkg_p ) {
-                return [ tag, jslink( "[x]", function () { submit_remove_tag(tag); }),
-                         " "]; }
-            else {
-                return [tag, " "]; } } ) ));
-        if ( logged_in ) {
-            $( "#pi_add_tag_row" ).show(); }
-        else {
-            $( "#pi_add_tag_row" ).hide(); }
-
-        $( "#pi_versions" ).html("").append( $.map( Object.keys(pkgi['versions']).sort(), function ( v, vi ) {
-            var vo = pkgi['versions'][v];
-            if ( v == 'default' ) {
-                return []; }
-            else {
-                return [ $('<tr>').append( $('<td>').html("").append(
-                    v, (mypkg_p ? ["&nbsp;", jslink( "[x]", function () { submit_remove_version(v); }) ] : "") ),
-                                           $('<td>').html( $('<a>', { text: vo['source'],
-                                                                      href: vo['source_url']  } ) ) ),
-                         $('<tr>').append( $('<td>').html(""),
-                                           $('<td>').html(vo['checksum']) ),
-                         " "]; } } ) );
-        if ( mypkg_p ) {
-            $( "#pi_add_version_row" ).show(); }
-        else {
-            $( "#pi_add_version_row" ).hide(); }
-
-        if ( (! mypkg_p) && Object.keys(pkgi['versions']).length == 1 ) {
-            $( "#pi_versions_row" ).hide(); }
-        else {
-            $( "#pi_versions_row" ).show(); }
-
-        ($( "#pi_dependencies" ).html("").append( $.map( pkgi['dependencies'], function ( pkg, i ) {
-            return [jslink(pkg, function () { update_info(pkgdb[pkg]); } ), " "]; } ) ));
-        if ( pkgi['dependencies'].length == 0 ) {
-            $( "#pi_dependencies_row" ).hide(); }
-        else {
-            $( "#pi_dependencies_row" ).show(); }
-        ($( "#pi_conflicts" ).html("").append( $.map( pkgi['conflicts'], function ( pkg, i ) {
-            return [jslink(pkg, function () { update_info(pkgdb[pkg]); } ), " "]; } ) ));
-        if ( pkgi['conflicts'].length == 0 ) {
-            $( "#pi_conflicts_row" ).hide(); }
-        else {
-            $( "#pi_conflicts_row" ).show(); }
-        ($( "#pi_modules" ).html("").append( $.map( pkgi['modules'], function ( m, i ) {
-            return [ $("<code>").text(m[1]), " "]; } ) ));
-
-        $("#pi_install").hide();
-
-        active_info = pkgi; };
-
-    function submit_remove_tag ( tag ) {
-        dynamic_pkgsend( "/jsonp/package/tag/del", { tag: tag } );
-
-        var tag_index = $.inArray(tag, active_info['tags']);
-        active_info['tags'].splice( tag_index, 1 );
-        delete active_info['search-terms'][ tag ];
-        evaluate_search();
-
-        update_info( active_info ); }
-    function submit_add_tag () {
-        var it = $( "#pi_add_tag_text" );
-        var tag = it.val();
-        it.val("");
-
-        dynamic_pkgsend( "/jsonp/package/tag/add", { tag: tag } );
-
-        active_info['tags'].push( tag );
-        active_info['search-terms'][ tag ] = true;
-        evaluate_search();
-
-        update_info( active_info ); }
-    $( "#pi_add_tag_text" ).keypress( function (e) {
-        if (e.which == 13) { submit_add_tag (); } } );
-    $( "#pi_add_tag_button" ).click( function (e) { submit_add_tag (); } );
-
-    function submit_remove_author ( author ) {
-        dynamic_pkgsend( "/jsonp/package/author/del", { author: author } );
-
-        var author_index = $.inArray(author, active_info['authors']);
-        active_info['authors'].splice( author_index, 1 );
-        delete active_info['search-terms'][ "author:" + author ];
-        evaluate_search();
-
-        update_info( active_info ); }
-    function submit_add_author () {
-        var it = $( "#pi_add_author_text" );
-        var author = it.val();
-        it.val("");
-
-        dynamic_pkgsend( "/jsonp/package/author/add", { author: author } );
-
-        active_info['authors'].push( author );
-        active_info['search-terms'][ "author:" + author ] = true;
-        evaluate_search();
-
-        update_info( active_info ); }
-    $( "#pi_add_author_text" ).keypress( function (e) {
-        if (e.which == 13) { submit_add_author (); } } );
-    $( "#pi_add_author_button" ).click( function (e) { submit_add_author (); } );
-
-    function submit_remove_version ( version ) {
-        dynamic_pkgsend( "/jsonp/package/version/del", { version: version } );
-
-        delete active_info['versions'][version];
-
-        update_info( active_info ); }
-    function submit_add_version () {
-        var it = $( "#pi_add_version_text" );
-        var version = it.val();
-        it.val("");
-        it = $( "#pi_add_version_source_text" );
-        var source = it.val();
-        it.val("");
-
-        dynamic_pkgsend( "/jsonp/package/version/add", { version: version, source: source } );
-
-        active_info['versions'][version] = { source: source, checksum: "" };
-
-        update_info( active_info ); }
-    $( "#pi_add_version_source_text" ).keypress( function (e) {
-        if (e.which == 13) { submit_add_version (); } } );
-    $( "#pi_add_version_button" ).click( function (e) { submit_add_version (); } );
-
-    function submit_mod ( new_name, new_description, new_source ) {
-        dynamic_pkgsend( "/jsonp/package/modify",
-                         { name: new_name,
-                           description: new_description,
-                           source: new_source } );
-
-        active_info['name'] = new_name;
-        active_info['description'] = new_description;
-        active_info['versions']['default']['source'] = new_source;
-
-        update_info( active_info ); }
-    function submit_mod_name ( newv ) {
-        submit_mod ( newv, active_info['description'], active_info['versions']['default']['source'] ); }
-    function submit_mod_description ( newv ) {
-        submit_mod ( active_info['name'], newv, active_info['versions']['default']['source'] ); }
-    function submit_mod_source ( newv ) {
-        submit_mod ( active_info['name'], active_info['description'], newv ); }
-
-    var search_terms = { };
-
-    function clear_terms () {
-        $.each(search_terms,
-               function ( term, termv ) {
-                   delete search_terms[term];} ); }
-
-    function parse_hash ( h ) {
-        while ( h != "" ) {
-            if ( h.charAt(0) == "(" ) {
-                var end = 1;
-                while ( h.charAt(end) != ")" ) {
-                    end++;
-                    if ( ! h.charAt(end) ) { break; } }
-                search_terms[ h.substring(1, end) ] = true;
-                h = h.substring(end+1); }
-            else if ( h.charAt(0) == "[" ) {
-                target_pkg = h.substring(1, h.length - 1 );
-                h = ""; }
-            else {
-                h = ""; } } }
-
-    function init_search_terms() {
-        search_terms["!main-tests"] = true;
-        search_terms["!main-distribution"] = true; }
-
-    { var h = window.location.hash;
-      if ( h == "" ) {
-          init_search_terms(); }
-      else {
-          h = h.substring(1);
-          parse_hash(h); } }
-
-    var expected_hash = "";
-    var default_search = "(!main-distribution)(!main-tests)";
-    function change_hash ( v ) {
-        if ( v == default_search && expected_hash != v ) {
-            v = ""; }
-        if ( v != default_search ) {
-            expected_hash = v;
-            window.location.hash = v; } }
-
-    $(window).bind( 'hashchange', function(e) {
-        var actual_hash = window.location.hash;
-        if ( expected_hash != actual_hash ) {
-            // TODO Do something here. It is hard to do the right
-            // thing, particularly with the Back button because we
-            // don't add the tags in the same order the user add them
-            // in. We could do that though.
-            // console.log("hash changed beneath me!");
-            return 42; } });
-
-    function filterlink ( text, tclass, f ) {
-        return [ jslink(text, f).addClass(tclass), " " ]; };
-
-    function addfilterlink ( text, term, tclass ) {
-        return filterlink( text, tclass, function () {
-            search_terms[term] = true;
-            evaluate_search(); } ); };
-    function removefilterlink ( text, term, tclass ) {
-        return filterlink( text, tclass, function () {
-            delete search_terms[term];
-            evaluate_search(); } ); };
-    function changefilterlink ( text, term, nterm, tclass ) {
-        return filterlink( text, tclass, function () {
-            delete search_terms[term];
-            search_terms["!" + term] = true;
-            evaluate_search(); } ); };
-    function resetfilterlink() {
-        return jslink("[reset all filters]", 
-                     function () {
-                         search_terms = {};
-                         init_search_terms(); 
-                         evaluate_search(); } ).addClass("resetlink"); }
-
-    function evaluate_search () {
-        var shown_terms = {};
-        
-        $.each( $('#packages_table tr'), function (key, dom) {
-            var value = $(dom).data("obj");
-            var show = true;
-            var vterms = value['search-terms'];
-
-            $.each(search_terms,
-                   function ( term, termv ) {
-                       if ( term.charAt(0) == "!" ) {
-                           if ( vterms[term.substring(1)] ) {
-                               show = false; } }
-                       else {
-                           if ( ! vterms[term] ) {
-                               show = false; } } });
-
-            if ( show ) {
-                $(dom).show();
-
-                $.each(vterms, function ( term, termv ) {
-                    if ( term.substring(0,7) != "author:") { shown_terms[term]++; } }); }
-            else {
-                $(dom).hide();
-
-                $.each(vterms, function ( term, termv ) {
-                    if ( term.substring(0,7) != "author:") {
-                        if ( ! shown_terms[term] ) { shown_terms[term] = 0; } } });} });
-
-        $.each(search_terms,
-               function ( term, termv ) {
-                   if ( term.charAt(0) == "!" ) {
-                       shown_terms[ term.substring(1) ] = -2; }
-                   else {
-                       shown_terms[ term ] = -1; } });
-
-        var shown_terms_keys = object_keys(shown_terms);
-        var shown_terms_skeys = shown_terms_keys.sort(function(a,b) {
-            return ((a < b) ? -1 : ((a > b) ? 1 : 0)); });
-
-        var new_h = "";
-        $("#search_menu").html("").append( $.map( shown_terms_skeys, function ( term, i ) {
-            if ( shown_terms[term] < 0 ) {
-                if ( shown_terms[term] == -1 ) {
-                    new_h = new_h + "(" + term + ")";
-                    return changefilterlink ( term, term, "!" + term, "active" ); }
-                else {
-                    new_h = new_h + "(" + "!" + term + ")";
-                    return removefilterlink ( term, "!" + term, "inactive" ); } }
-            else if ( shown_terms[term] == 0 ) {
-                return [ term, " " ]; }
-            else {
-                return addfilterlink ( term, term, "possible" ); } } ) )
-            .append( resetfilterlink() );
-        change_hash( new_h );
-
-        $("#packages_table tr:visible:even").removeClass("even");
-        $("#packages_table tr:visible:odd").addClass("even"); };
-
-    function object_keys ( o ) {
-        var names = [];
-        $.each(o, function(key, value) { names.push(key) });
-        return names; }
-
-    function open_info ( i ) {
-        update_info( i );
-        $( "#package_info" ).dialog( "open" ); }
-
-    function curate_link ( curate_span, down_p, value ) {
-        var dr = (down_p ? -1 : +1);
-        var old_ring = value['ring'];
-        var new_ring = Math.min(Math.max(0, old_ring + dr), 2);
-        if ( new_ring == old_ring ) {
-            return ""; }
-        else {
-            return jslink((down_p ? "&blacktriangledown;" : "&blacktriangle;"),
-                          function () {
-                              dynamic_send ( "/jsonp/package/curate",
-                                             { pkg: value['name'],
-                                               ring: new_ring } );
-                              value['ring'] = new_ring;
-                              delete value['search-terms']["ring:" + old_ring];
-                              value['search-terms']["ring:" + new_ring] = true;
-                              evaluate_search();
-                              update_curate_span (curate_span, value); }); } }
-
-    function update_curate_span (curate_span, value) {
-        curate_span.html("").
-            append(curate_link ( curate_span, true, value ),
-                   value['ring'],
-                   curate_link ( curate_span, false, value ),
-                   "&nbsp;"); }
-
-    function add_package_to_list ( value ) {
-        var dom = $('<tr>');
-
-        value['dom_obj'] = dom;
-        dom.appendTo('#packages_table');
-        update_package_on_list ( value ); }
-
-    var now = new Date().getTime() / 1000;
-    function update_package_on_list ( value ) {
-        var curate_span = $('<span>', { class: "curate_link" } ).hide();
-        update_curate_span (curate_span, value);
-
-        var dom = value['dom_obj'];
-
-        var bstatus;
-        if ( value['build'] && value['build']['failure-log'] ) {
-            bstatus = $('<td>', {class: 'build_red'})
-                .append($('<span>')
-                       .append($('<a>', { href: build_host + value['build']['failure-log'] }).html( "fails" )));
-        } else if ( value['build'] && value['build']['success-log'] && value['build']['dep-failure-log'] ) {
-            bstatus = $('<td>', {class: 'build_yellow'})
-                .append($('<span>')
-                        .append($('<a>', { href: build_host + value['build']['success-log'] }).html( "succeeds" ))
-                        .append(" with ")
-                        .append($('<a>', { href: build_host + value['build']['dep-failure-log'] }).html( "dependency problems" )));
-        } else if ( value['build'] && value['build']['success-log'] ) {
-            bstatus = $('<td>', {class: 'build_green'})
-                .append($('<span>')
-                        .append($('<a>', { href: build_host + value['build']['success-log'] }).html( "succeeds" )));
-        } else {
-            bstatus = $('<td>').html("");
-        }
-
-        if (! value['build'] ) { value['build'] = {}; }
-        if (! value['build']['docs'] ) { value['build']['docs'] = []; }
-
-        dom.attr("class", ((now - (60*60*24*2)) < value['last-updated'] ? "recent" : "old"))
-            .data( "obj", value)
-            .html("")
-            .append(
-                $('<td sorttable_customkey="' + value['last-updated'] + '">').html("")
-                    .append( curate_span ),
-                $('<td>').html("")
-                    .append( jslink( value['name'], function () { open_info ( value ); }) )
-                    .append($('<span>').attr("class","authors").html("").append( $.map( value['authors'], function ( author, i ) {
-                        return addfilterlink ( author, "author:" + author, "possible" ); } ) )),
-                $('<td>').text( value['description'] )
-                    .append($('<span>').attr("class","doctags").html(value['build']['docs'].length > 0 ? "Docs: " : "")
-                            .append( $.map( value['build']['docs'], function ( doc, i ) {
-                                var dl;
-                                if ( doc[2] ) {
-                                    dl = $('<a>', { href: build_host + doc[2] } ).html(doc[1]); }
-                                else {
-                                    dl = $('<del>').html(doc[1]); }
-                                return $('<span>').append(dl, " ") } ) ))
-                    .append($('<span>').attr("class","doctags").html(value['tags'].length > 0 ? "Tags: " : "").append( $.map( value['tags'], function ( tag, i ) {
-                        return addfilterlink ( tag, tag, "possible" ); } ) )),
-                bstatus ); }
-
-    function pollNotice(){
-        $.getJSON( dynamic_url("/jsonp/notice"), function( resp ) {
-            $("#server_notice").html(resp);
-            // If there is no notice, update every 5 minutes
-            if ( ! (/\S/.test(resp)) ) {
-                $("#server_notice").hide();
-                setTimeout(pollNotice, 1000*60*5); }
-            // Otherwise, update every 5 seconds
-            else {
-                $("#server_notice").show();
-                setTimeout(pollNotice, 1000*5); } }); }
-    $("#server_notice").hide();
-    pollNotice();
-
-    var pkgdb = {};
-    $.getJSON( "/pkgs-all.json.gz", function( resp ) {
-        pkgdb = resp;
-
-        var names = object_keys(pkgdb);
-        var snames = names.sort(function(a,b) {
-            return ((a < b) ? -1 : ((a > b) ? 1 : 0)); })
-
-        $("#packages_headers").show();
-
-        $.each( snames, function (name_i) {
-            var name = snames[name_i];
-            add_package_to_list ( pkgdb[name] ); });
-
-        $("#packages_loading").hide();
-
-        evaluate_search();
-
-        if ( target_pkg && pkgdb[target_pkg] ) {
-            open_info ( pkgdb[target_pkg] ) } });
-
-    $("#login").dialog({
-        autoOpen: false,
-        minWidth: 600,
-        minHeight: 600,
-        position: { my: "center", at: "center", of: "#search_menu" },
-        modal: true });
-
-    function login_submit () {
-        $( "#login_error" ).html( "" );
-
-        var e = $( "#login_email_text" ).val();
-        var p = $( "#login_passwd_text" ).val();
-        var cp = $( "#login_confirm_text" ).val();
-        var c = $( "#login_code_text" ).val();
-
-        if ( c && p != cp ) {
-            $( "#login_error" ).html( "You did not type in the same password." ); }
-        else {
-            $.getJSON( dynamic_url("/jsonp/authenticate"),
-                       { email: e, passwd: p, code: c },
-                       function( resp ) {
-                           if ( resp == "emailed" ) {
-                               $( "#login_confirm_row" ).show();
-                               $( "#login_code_row" ).show();
-
-                               $( "#login_error" ).html( "Check your email for an email code." ); }
-                           else if ( resp == "wrong-code" ) {
-                               $( "#login_code_text" ).val("");
-                               $( "#login_error" ).html( "That is not the correct code." ); }
-                           else if ( resp ) {
-                               $( "#login_email_text" ).val("");
-                               $( "#login_passwd_text" ).val("");
-                               $( "#login_confirm_text" ).val("");
-                               $( "#login_code_text" ).val("");
-
-                               $( "#login_confirm_row" ).hide();
-                               $( "#login_code_row" ).hide();
-
-                               localStorage['email'] = e;
-                               localStorage['passwd'] = p;
-
-                               $( "#login" ).dialog( "close" );
-
-                               initial_login(); }
-                           else {
-                               $( "#login_confirm_row" ).show();
-                               $( "#login_code_row" ).show();
-
-                               $( "#login_error" ).html( "Incorrect password, please retry or check your email for a change password code." ); }; } ); } }
-    $( "#login_passwd_text" ).keypress( function (e) {
-        if (e.which == 13) { login_submit (); } } );
-    $( "#login_code_text" ).keypress( function (e) {
-        if (e.which == 13) { login_submit (); } } );
-    $( "#login_button" ).click( function (e) { login_submit (); } );
-
-    $( "#login_confirm_row" ).hide();
-    $( "#login_code_row" ).hide();
-    $("#packages_headers").hide();
-
-    function menu_logout () {
-        logged_in = false;
-        $("#logout").html( jslink( "login", function () { $( "#login" ).dialog( "open" ); } ) ); }
-    function menu_logging () {
-        logged_in = false;
-        $("#logout").html( "logging in..." ); }
-    function menu_loggedin ( curate_p ) {
-        logged_in = true;
-        $("#logout").html("")
-            .append( me(),
-                     ( curate_p ? [ " (", jslink( "curator", function () {
-                         $( "span.curate_link" ).show();
-                         clear_terms();
-                         search_terms[ "!:conflicts:" ] = true;
-                         search_terms[ "ring:2" ] = true;
-                         evaluate_search(); }),
-                                    ")" ] : ""),
-                     " | ",
-                     jslink( "upload", function () {
-                         var value = { name: "",
-                                       author: me(),
-                                       authors: [ me() ],
-                                       'checksum-error': false,
-                                       conflicts: [],
-                                       dependencies: [],
-                                       description: "",
-                                       'last-checked': now,
-                                       'last-edit': now,
-                                       'last-updated': now,
-                                       modules: [],
-                                       ring: 2,
-                                       tags: []};
-                         value['search-terms'] = {};
-                         value['search-terms'][("author:" + me())] = true;
-                         value['versions'] = {};
-                         value['versions']['default'] = {};
-                         value['versions']['default']['source'] = "git://github.com/‹user›/‹repo›";
-                         value['versions']['default']['source_url'] = "";
-                         value['versions']['default']['checksum'] = "";
-                         value['build'] = {};
-                         value['build']['success-log'] = false;
-                         value['build']['failure-log'] = false;
-                         value['build']['dep-failure-log'] = false;
-                         value['build']['conflicts-log'] = false;
-                         value['build']['docs'] = [];
-
-                         add_package_to_list(value);
-                         evaluate_search();
-                         open_info(value); }),
-                     " | ",
-                     jslinki( "update", function (i) {
-                         dynamic_send ( "/jsonp/update", {} );
-                         i.text("updating..."); }),
-                     " | ",
-                     jslink( "logout", function () {
-                         localStorage['email'] = "";
-                         localStorage['passwd'] = "";
-
-                         menu_logout (); }) ); }
-
-    function initial_login () {
-        menu_logging();
-        $.getJSON( dynamic_url("/jsonp/authenticate"),
-                   { email: localStorage['email'], passwd: localStorage['passwd'], code: "" },
-                   function( resp ) {
-                       if ( $.isPlainObject(resp) ) {
-                           menu_loggedin( resp['curation'] ); }
-                       else {
-                           menu_logout();
-                           console.log( "login failed" ); } } ); }
-
-
-    if ( localStorage['email'] && localStorage['passwd'] ) {
-        initial_login();
-    } else {
-        menu_logout (); } });
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/logo-and-text.png b/pkgs/plt-services/meta/pkg-index/official/static/logo-and-text.png
deleted file mode 100644
index 117886d387..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/logo-and-text.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/logo.png b/pkgs/plt-services/meta/pkg-index/official/static/logo.png
deleted file mode 100644
index 4e53f00444..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/logo.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/animated-overlay.gif b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/animated-overlay.gif
deleted file mode 100644
index d441f75ebf..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/animated-overlay.gif and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
deleted file mode 100644
index b85d889da2..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_flat_75_ffffff_40x100.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_flat_75_ffffff_40x100.png
deleted file mode 100644
index 2940a86649..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_flat_75_ffffff_40x100.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_55_fbf9ee_1x400.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100644
index b835337749..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_65_ffffff_1x400.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index 3a34b9a809..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_75_dadada_1x400.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100644
index c533dd6f6f..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_75_dadada_1x400.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_75_e6e6e6_1x400.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100644
index c475d61288..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_95_fef1ec_1x400.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100644
index bf439c54a0..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_highlight-soft_75_000000_1x100.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_highlight-soft_75_000000_1x100.png
deleted file mode 100644
index b8bf8d5d7b..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-bg_highlight-soft_75_000000_1x100.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_222222_256x240.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_222222_256x240.png
deleted file mode 100644
index c1cb1170c8..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_2e83ff_256x240.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index 84b601bf0f..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_454545_256x240.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_454545_256x240.png
deleted file mode 100644
index b6db1acdd4..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_888888_256x240.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_888888_256x240.png
deleted file mode 100644
index feea0e2026..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_cd0a0a_256x240.png b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index ed5b6b0930..0000000000
Binary files a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/images/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/jquery-ui-1.10.3.custom.css b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/jquery-ui-1.10.3.custom.css
deleted file mode 100644
index ca2632dcf2..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/jquery-ui-1.10.3.custom.css
+++ /dev/null
@@ -1,1178 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-09-23
-* http://jqueryui.com
-* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Optima%2C%20Arial%2C%20Verdana%2C%20Helvetica%2C%20sans-serif&fwDefault=normal&fsDefault=1.0em&cornerRadius=4px&bgColorHeader=%23000000&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=%23ffffff&fcHeader=%23222222&iconColorHeader=%23222222&bgColorContent=%23ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=%23aaaaaa&fcContent=%23222222&iconColorContent=%23222222&bgColorDefault=%23e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=%23d3d3d3&fcDefault=%23555555&iconColorDefault=%23888888&bgColorHover=%23dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=%23999999&fcHover=%23212121&iconColorHover=%23454545&bgColorActive=%23ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=%23aaaaaa&fcActive=%23212121&iconColorActive=%23454545&bgColorHighlight=%23fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=%23fcefa1&fcHighlight=%23363636&iconColorHighlight=%232e83ff&bgColorError=%23fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=%23cd0a0a&fcError=%23cd0a0a&iconColorError=%23cd0a0a&bgColorOverlay=%23aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=%23aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
-	display: none;
-}
-.ui-helper-hidden-accessible {
-	border: 0;
-	clip: rect(0 0 0 0);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-}
-.ui-helper-reset {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	line-height: 1.3;
-	text-decoration: none;
-	font-size: 100%;
-	list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
-	content: "";
-	display: table;
-	border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
-	clear: both;
-}
-.ui-helper-clearfix {
-	min-height: 0; /* support: IE7 */
-}
-.ui-helper-zfix {
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	position: absolute;
-	opacity: 0;
-	filter:Alpha(Opacity=0);
-}
-
-.ui-front {
-	z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
-	cursor: default !important;
-}
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	display: block;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-}
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.ui-resizable {
-	position: relative;
-}
-.ui-resizable-handle {
-	position: absolute;
-	font-size: 0.1px;
-	display: block;
-}
-.ui-resizable-disabled .ui-resizable-handle,
-.ui-resizable-autohide .ui-resizable-handle {
-	display: none;
-}
-.ui-resizable-n {
-	cursor: n-resize;
-	height: 7px;
-	width: 100%;
-	top: -5px;
-	left: 0;
-}
-.ui-resizable-s {
-	cursor: s-resize;
-	height: 7px;
-	width: 100%;
-	bottom: -5px;
-	left: 0;
-}
-.ui-resizable-e {
-	cursor: e-resize;
-	width: 7px;
-	right: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-w {
-	cursor: w-resize;
-	width: 7px;
-	left: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-se {
-	cursor: se-resize;
-	width: 12px;
-	height: 12px;
-	right: 1px;
-	bottom: 1px;
-}
-.ui-resizable-sw {
-	cursor: sw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	bottom: -5px;
-}
-.ui-resizable-nw {
-	cursor: nw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	top: -5px;
-}
-.ui-resizable-ne {
-	cursor: ne-resize;
-	width: 9px;
-	height: 9px;
-	right: -5px;
-	top: -5px;
-}
-.ui-selectable-helper {
-	position: absolute;
-	z-index: 100;
-	border: 1px dotted black;
-}
-.ui-accordion .ui-accordion-header {
-	display: block;
-	cursor: pointer;
-	position: relative;
-	margin-top: 2px;
-	padding: .5em .5em .5em .7em;
-	min-height: 0; /* support: IE7 */
-}
-.ui-accordion .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-noicons {
-	padding-left: .7em;
-}
-.ui-accordion .ui-accordion-icons .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
-	position: absolute;
-	left: .5em;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-accordion .ui-accordion-content {
-	padding: 1em 2.2em;
-	border-top: 0;
-	overflow: auto;
-}
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-.ui-button {
-	display: inline-block;
-	position: relative;
-	padding: 0;
-	line-height: normal;
-	margin-right: .1em;
-	cursor: pointer;
-	vertical-align: middle;
-	text-align: center;
-	overflow: visible; /* removes extra width in IE */
-}
-.ui-button,
-.ui-button:link,
-.ui-button:visited,
-.ui-button:hover,
-.ui-button:active {
-	text-decoration: none;
-}
-/* to make room for the icon, a width needs to be set here */
-.ui-button-icon-only {
-	width: 2.2em;
-}
-/* button elements seem to need a little more width */
-button.ui-button-icon-only {
-	width: 2.4em;
-}
-.ui-button-icons-only {
-	width: 3.4em;
-}
-button.ui-button-icons-only {
-	width: 3.7em;
-}
-
-/* button text element */
-.ui-button .ui-button-text {
-	display: block;
-	line-height: normal;
-}
-.ui-button-text-only .ui-button-text {
-	padding: .4em 1em;
-}
-.ui-button-icon-only .ui-button-text,
-.ui-button-icons-only .ui-button-text {
-	padding: .4em;
-	text-indent: -9999999px;
-}
-.ui-button-text-icon-primary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 1em .4em 2.1em;
-}
-.ui-button-text-icon-secondary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 2.1em .4em 1em;
-}
-.ui-button-text-icons .ui-button-text {
-	padding-left: 2.1em;
-	padding-right: 2.1em;
-}
-/* no icon support for input elements, provide padding by default */
-input.ui-button {
-	padding: .4em 1em;
-}
-
-/* button icon element(s) */
-.ui-button-icon-only .ui-icon,
-.ui-button-text-icon-primary .ui-icon,
-.ui-button-text-icon-secondary .ui-icon,
-.ui-button-text-icons .ui-icon,
-.ui-button-icons-only .ui-icon {
-	position: absolute;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-button-icon-only .ui-icon {
-	left: 50%;
-	margin-left: -8px;
-}
-.ui-button-text-icon-primary .ui-button-icon-primary,
-.ui-button-text-icons .ui-button-icon-primary,
-.ui-button-icons-only .ui-button-icon-primary {
-	left: .5em;
-}
-.ui-button-text-icon-secondary .ui-button-icon-secondary,
-.ui-button-text-icons .ui-button-icon-secondary,
-.ui-button-icons-only .ui-button-icon-secondary {
-	right: .5em;
-}
-
-/* button sets */
-.ui-buttonset {
-	margin-right: 7px;
-}
-.ui-buttonset .ui-button {
-	margin-left: 0;
-	margin-right: -.3em;
-}
-
-/* workarounds */
-/* reset extra padding in Firefox, see h5bp.com/l */
-input.ui-button::-moz-focus-inner,
-button.ui-button::-moz-focus-inner {
-	border: 0;
-	padding: 0;
-}
-.ui-datepicker {
-	width: 17em;
-	padding: .2em .2em 0;
-	display: none;
-}
-.ui-datepicker .ui-datepicker-header {
-	position: relative;
-	padding: .2em 0;
-}
-.ui-datepicker .ui-datepicker-prev,
-.ui-datepicker .ui-datepicker-next {
-	position: absolute;
-	top: 2px;
-	width: 1.8em;
-	height: 1.8em;
-}
-.ui-datepicker .ui-datepicker-prev-hover,
-.ui-datepicker .ui-datepicker-next-hover {
-	top: 1px;
-}
-.ui-datepicker .ui-datepicker-prev {
-	left: 2px;
-}
-.ui-datepicker .ui-datepicker-next {
-	right: 2px;
-}
-.ui-datepicker .ui-datepicker-prev-hover {
-	left: 1px;
-}
-.ui-datepicker .ui-datepicker-next-hover {
-	right: 1px;
-}
-.ui-datepicker .ui-datepicker-prev span,
-.ui-datepicker .ui-datepicker-next span {
-	display: block;
-	position: absolute;
-	left: 50%;
-	margin-left: -8px;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-datepicker .ui-datepicker-title {
-	margin: 0 2.3em;
-	line-height: 1.8em;
-	text-align: center;
-}
-.ui-datepicker .ui-datepicker-title select {
-	font-size: 1em;
-	margin: 1px 0;
-}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year {
-	width: 49%;
-}
-.ui-datepicker table {
-	width: 100%;
-	font-size: .9em;
-	border-collapse: collapse;
-	margin: 0 0 .4em;
-}
-.ui-datepicker th {
-	padding: .7em .3em;
-	text-align: center;
-	font-weight: bold;
-	border: 0;
-}
-.ui-datepicker td {
-	border: 0;
-	padding: 1px;
-}
-.ui-datepicker td span,
-.ui-datepicker td a {
-	display: block;
-	padding: .2em;
-	text-align: right;
-	text-decoration: none;
-}
-.ui-datepicker .ui-datepicker-buttonpane {
-	background-image: none;
-	margin: .7em 0 0 0;
-	padding: 0 .2em;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 0;
-}
-.ui-datepicker .ui-datepicker-buttonpane button {
-	float: right;
-	margin: .5em .2em .4em;
-	cursor: pointer;
-	padding: .2em .6em .3em .6em;
-	width: auto;
-	overflow: visible;
-}
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
-	float: left;
-}
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi {
-	width: auto;
-}
-.ui-datepicker-multi .ui-datepicker-group {
-	float: left;
-}
-.ui-datepicker-multi .ui-datepicker-group table {
-	width: 95%;
-	margin: 0 auto .4em;
-}
-.ui-datepicker-multi-2 .ui-datepicker-group {
-	width: 50%;
-}
-.ui-datepicker-multi-3 .ui-datepicker-group {
-	width: 33.3%;
-}
-.ui-datepicker-multi-4 .ui-datepicker-group {
-	width: 25%;
-}
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
-	border-left-width: 0;
-}
-.ui-datepicker-multi .ui-datepicker-buttonpane {
-	clear: left;
-}
-.ui-datepicker-row-break {
-	clear: both;
-	width: 100%;
-	font-size: 0;
-}
-
-/* RTL support */
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-rtl .ui-datepicker-prev {
-	right: 2px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next {
-	left: 2px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-prev:hover {
-	right: 1px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next:hover {
-	left: 1px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane {
-	clear: right;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button {
-	float: left;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
-.ui-datepicker-rtl .ui-datepicker-group {
-	float: right;
-}
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
-	border-right-width: 0;
-	border-left-width: 1px;
-}
-.ui-dialog {
-	overflow: hidden;
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: .2em;
-	outline: 0;
-}
-.ui-dialog .ui-dialog-titlebar {
-	padding: .4em 1em;
-	position: relative;
-}
-.ui-dialog .ui-dialog-title {
-	float: left;
-	margin: .1em 0;
-	white-space: nowrap;
-	width: 90%;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-dialog .ui-dialog-titlebar-close {
-	position: absolute;
-	right: .3em;
-	top: 50%;
-	width: 20px;
-	margin: -10px 0 0 0;
-	padding: 1px;
-	height: 20px;
-}
-.ui-dialog .ui-dialog-content {
-	position: relative;
-	border: 0;
-	padding: .5em 1em;
-	background: none;
-	overflow: auto;
-}
-.ui-dialog .ui-dialog-buttonpane {
-	text-align: left;
-	border-width: 1px 0 0 0;
-	background-image: none;
-	margin-top: .5em;
-	padding: .3em 1em .5em .4em;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: right;
-}
-.ui-dialog .ui-dialog-buttonpane button {
-	margin: .5em .4em .5em 0;
-	cursor: pointer;
-}
-.ui-dialog .ui-resizable-se {
-	width: 12px;
-	height: 12px;
-	right: -5px;
-	bottom: -5px;
-	background-position: 16px 16px;
-}
-.ui-draggable .ui-dialog-titlebar {
-	cursor: move;
-}
-.ui-menu {
-	list-style: none;
-	padding: 2px;
-	margin: 0;
-	display: block;
-	outline: none;
-}
-.ui-menu .ui-menu {
-	margin-top: -3px;
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	/* support: IE10, see #8844 */
-	list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px -2px 5px -2px;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-menu-item a {
-	text-decoration: none;
-	display: block;
-	padding: 2px .4em;
-	line-height: 1.5;
-	min-height: 0; /* support: IE7 */
-	font-weight: normal;
-}
-.ui-menu .ui-menu-item a.ui-state-focus,
-.ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
-}
-
-.ui-menu .ui-state-disabled {
-	font-weight: normal;
-	margin: .4em 0 .2em;
-	line-height: 1.5;
-}
-.ui-menu .ui-state-disabled a {
-	cursor: default;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item a {
-	position: relative;
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: .2em;
-	left: .2em;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	position: static;
-	float: right;
-}
-.ui-progressbar {
-	height: 2em;
-	text-align: left;
-	overflow: hidden;
-}
-.ui-progressbar .ui-progressbar-value {
-	margin: -1px;
-	height: 100%;
-}
-.ui-progressbar .ui-progressbar-overlay {
-	background: url("images/animated-overlay.gif");
-	height: 100%;
-	filter: alpha(opacity=25);
-	opacity: 0.25;
-}
-.ui-progressbar-indeterminate .ui-progressbar-value {
-	background-image: none;
-}
-.ui-slider {
-	position: relative;
-	text-align: left;
-}
-.ui-slider .ui-slider-handle {
-	position: absolute;
-	z-index: 2;
-	width: 1.2em;
-	height: 1.2em;
-	cursor: default;
-}
-.ui-slider .ui-slider-range {
-	position: absolute;
-	z-index: 1;
-	font-size: .7em;
-	display: block;
-	border: 0;
-	background-position: 0 0;
-}
-
-/* For IE8 - See #6727 */
-.ui-slider.ui-state-disabled .ui-slider-handle,
-.ui-slider.ui-state-disabled .ui-slider-range {
-	filter: inherit;
-}
-
-.ui-slider-horizontal {
-	height: .8em;
-}
-.ui-slider-horizontal .ui-slider-handle {
-	top: -.3em;
-	margin-left: -.6em;
-}
-.ui-slider-horizontal .ui-slider-range {
-	top: 0;
-	height: 100%;
-}
-.ui-slider-horizontal .ui-slider-range-min {
-	left: 0;
-}
-.ui-slider-horizontal .ui-slider-range-max {
-	right: 0;
-}
-
-.ui-slider-vertical {
-	width: .8em;
-	height: 100px;
-}
-.ui-slider-vertical .ui-slider-handle {
-	left: -.3em;
-	margin-left: 0;
-	margin-bottom: -.6em;
-}
-.ui-slider-vertical .ui-slider-range {
-	left: 0;
-	width: 100%;
-}
-.ui-slider-vertical .ui-slider-range-min {
-	bottom: 0;
-}
-.ui-slider-vertical .ui-slider-range-max {
-	top: 0;
-}
-.ui-spinner {
-	position: relative;
-	display: inline-block;
-	overflow: hidden;
-	padding: 0;
-	vertical-align: middle;
-}
-.ui-spinner-input {
-	border: none;
-	background: none;
-	color: inherit;
-	padding: 0;
-	margin: .2em 0;
-	vertical-align: middle;
-	margin-left: .4em;
-	margin-right: 22px;
-}
-.ui-spinner-button {
-	width: 16px;
-	height: 50%;
-	font-size: .5em;
-	padding: 0;
-	margin: 0;
-	text-align: center;
-	position: absolute;
-	cursor: default;
-	display: block;
-	overflow: hidden;
-	right: 0;
-}
-/* more specificity required here to override default borders */
-.ui-spinner a.ui-spinner-button {
-	border-top: none;
-	border-bottom: none;
-	border-right: none;
-}
-/* vertically center icon */
-.ui-spinner .ui-icon {
-	position: absolute;
-	margin-top: -8px;
-	top: 50%;
-	left: 0;
-}
-.ui-spinner-up {
-	top: 0;
-}
-.ui-spinner-down {
-	bottom: 0;
-}
-
-/* TR overrides */
-.ui-spinner .ui-icon-triangle-1-s {
-	/* need to fix icons sprite */
-	background-position: -65px -16px;
-}
-.ui-tabs {
-	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-	padding: .2em;
-}
-.ui-tabs .ui-tabs-nav {
-	margin: 0;
-	padding: .2em .2em 0;
-}
-.ui-tabs .ui-tabs-nav li {
-	list-style: none;
-	float: left;
-	position: relative;
-	top: 0;
-	margin: 1px .2em 0 0;
-	border-bottom-width: 0;
-	padding: 0;
-	white-space: nowrap;
-}
-.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
-	float: left;
-	padding: .5em 1em;
-	text-decoration: none;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active {
-	margin-bottom: -1px;
-	padding-bottom: 1px;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
-	cursor: text;
-}
-.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
-	cursor: pointer;
-}
-.ui-tabs .ui-tabs-panel {
-	display: block;
-	border-width: 0;
-	padding: 1em 1.4em;
-	background: none;
-}
-.ui-tooltip {
-	padding: 8px;
-	position: absolute;
-	z-index: 9999;
-	max-width: 300px;
-	-webkit-box-shadow: 0 0 5px #aaa;
-	box-shadow: 0 0 5px #aaa;
-}
-body .ui-tooltip {
-	border-width: 2px;
-}
-
-/* Component containers
-----------------------------------*/
-.ui-widget {
-	font-family: Optima, Arial, Verdana, Helvetica, sans-serif;
-	font-size: 1.0em;
-}
-.ui-widget .ui-widget {
-	font-size: 1em;
-}
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button {
-	font-family: Optima, Arial, Verdana, Helvetica, sans-serif;
-	font-size: 1em;
-}
-.ui-widget-content {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;
-	color: #222222;
-}
-.ui-widget-content a {
-	color: #222222;
-}
-.ui-widget-header {
-	border: 1px solid #ffffff;
-	background: #000000 url("images/ui-bg_highlight-soft_75_000000_1x100.png") 50% 50% repeat-x;
-	color: #222222;
-	font-weight: bold;
-}
-.ui-widget-header a {
-	color: #222222;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default {
-	border: 1px solid #d3d3d3;
-	background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #555555;
-}
-.ui-state-default a,
-.ui-state-default a:link,
-.ui-state-default a:visited {
-	color: #555555;
-	text-decoration: none;
-}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus {
-	border: 1px solid #999999;
-	background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited,
-.ui-state-focus a,
-.ui-state-focus a:hover,
-.ui-state-focus a:link,
-.ui-state-focus a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-active a,
-.ui-state-active a:link,
-.ui-state-active a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
-.ui-widget-header .ui-state-highlight {
-	border: 1px solid #fcefa1;
-	background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
-	color: #363636;
-}
-.ui-state-highlight a,
-.ui-widget-content .ui-state-highlight a,
-.ui-widget-header .ui-state-highlight a {
-	color: #363636;
-}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
-.ui-widget-header .ui-state-error {
-	border: 1px solid #cd0a0a;
-	background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
-	color: #cd0a0a;
-}
-.ui-state-error a,
-.ui-widget-content .ui-state-error a,
-.ui-widget-header .ui-state-error a {
-	color: #cd0a0a;
-}
-.ui-state-error-text,
-.ui-widget-content .ui-state-error-text,
-.ui-widget-header .ui-state-error-text {
-	color: #cd0a0a;
-}
-.ui-priority-primary,
-.ui-widget-content .ui-priority-primary,
-.ui-widget-header .ui-priority-primary {
-	font-weight: bold;
-}
-.ui-priority-secondary,
-.ui-widget-content .ui-priority-secondary,
-.ui-widget-header .ui-priority-secondary {
-	opacity: .7;
-	filter:Alpha(Opacity=70);
-	font-weight: normal;
-}
-.ui-state-disabled,
-.ui-widget-content .ui-state-disabled,
-.ui-widget-header .ui-state-disabled {
-	opacity: .35;
-	filter:Alpha(Opacity=35);
-	background-image: none;
-}
-.ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
-}
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	width: 16px;
-	height: 16px;
-}
-.ui-icon,
-.ui-widget-content .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-widget-header .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-state-default .ui-icon {
-	background-image: url("images/ui-icons_888888_256x240.png");
-}
-.ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-active .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-highlight .ui-icon {
-	background-image: url("images/ui-icons_2e83ff_256x240.png");
-}
-.ui-state-error .ui-icon,
-.ui-state-error-text .ui-icon {
-	background-image: url("images/ui-icons_cd0a0a_256x240.png");
-}
-
-/* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-left,
-.ui-corner-tl {
-	border-top-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-right,
-.ui-corner-tr {
-	border-top-right-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-left,
-.ui-corner-bl {
-	border-bottom-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-right,
-.ui-corner-br {
-	border-bottom-right-radius: 4px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
-	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
-	opacity: .3;
-	filter: Alpha(Opacity=30);
-}
-.ui-widget-shadow {
-	margin: -8px 0 0 -8px;
-	padding: 8px;
-	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
-	opacity: .3;
-	filter: Alpha(Opacity=30);
-	border-radius: 8px;
-}
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/jquery-ui-1.10.3.custom.min.css b/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/jquery-ui-1.10.3.custom.min.css
deleted file mode 100644
index 1a6f1450a3..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/static/plt-theme/jquery-ui-1.10.3.custom.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-09-23
-* http://jqueryui.com
-* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Optima%2C%20Arial%2C%20Verdana%2C%20Helvetica%2C%20sans-serif&fwDefault=normal&fsDefault=1.0em&cornerRadius=4px&bgColorHeader=%23000000&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=%23ffffff&fcHeader=%23222222&iconColorHeader=%23222222&bgColorContent=%23ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=%23aaaaaa&fcContent=%23222222&iconColorContent=%23222222&bgColorDefault=%23e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=%23d3d3d3&fcDefault=%23555555&iconColorDefault=%23888888&bgColorHover=%23dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=%23999999&fcHover=%23212121&iconColorHover=%23454545&bgColorActive=%23ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=%23aaaaaa&fcActive=%23212121&iconColorActive=%23454545&bgColorHighlight=%23fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=%23fcefa1&fcHighlight=%23363636&iconColorHighlight=%232e83ff&bgColorError=%23fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=%23cd0a0a&fcError=%23cd0a0a&iconColorError=%23cd0a0a&bgColorOverlay=%23aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=%23aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin-top:2px;padding:.5em .5em .5em .7em;min-height:0}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-noicons{padding-left:.7em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:49%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{overflow:hidden;position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-menu{list-style:none;padding:2px;margin:0;display:block;outline:none}.ui-menu .ui-menu{margin-top:-3px;position:absolute}.ui-menu .ui-menu-item{margin:0;padding:0;width:100%;list-style-image:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}.ui-menu .ui-menu-divider{margin:5px -2px 5px -2px;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:2px .4em;line-height:1.5;min-height:0;font-weight:normal}.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{font-weight:normal;margin:-1px}.ui-menu .ui-state-disabled{font-weight:normal;margin:.4em 0 .2em;line-height:1.5}.ui-menu .ui-state-disabled a{cursor:default}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item a{position:relative;padding-left:2em}.ui-menu .ui-icon{position:absolute;top:.2em;left:.2em}.ui-menu .ui-menu-icon{position:static;float:right}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("images/animated-overlay.gif");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:none;border-bottom:none;border-right:none}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Optima,Arial,Verdana,Helvetica,sans-serif;font-size:1.0em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Optima,Arial,Verdana,Helvetica,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #fff;background:#000 url("images/ui-bg_highlight-soft_75_000000_1x100.png") 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_888888_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_2e83ff_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cd0a0a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px}
\ No newline at end of file
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/sorttable.js b/pkgs/plt-services/meta/pkg-index/official/static/sorttable.js
deleted file mode 100644
index 5826672b44..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/static/sorttable.js
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
-  SortTable
-  version 2
-  7th April 2007
-  Stuart Langridge, http://www.kryogenix.org/code/browser/sorttable/
-
-  Instructions:
-  Download this file
-  Add <script src="sorttable.js"></script> to your HTML
-  Add class="sortable" to any table you'd like to make sortable
-  Click on the headers to sort
-
-  Thanks to many, many people for contributions and suggestions.
-  Licenced as X11: http://www.kryogenix.org/code/browser/licence.html
-  This basically means: do what you want with it.
-*/
-
-
-var stIsIE = /*@cc_on!@*/false;
-
-sorttable = {
-  init: function() {
-    // quit if this function has already been called
-    if (arguments.callee.done) return;
-    // flag this function so we don't do the same thing twice
-    arguments.callee.done = true;
-    // kill the timer
-    if (_timer) clearInterval(_timer);
-
-    if (!document.createElement || !document.getElementsByTagName) return;
-
-    sorttable.DATE_RE = /^(\d\d?)[\/\.-](\d\d?)[\/\.-]((\d\d)?\d\d)$/;
-
-    forEach(document.getElementsByTagName('table'), function(table) {
-      if (table.className.search(/\bsortable\b/) != -1) {
-        sorttable.makeSortable(table);
-      }
-    });
-
-  },
-
-  makeSortable: function(table) {
-    if (table.getElementsByTagName('thead').length == 0) {
-      // table doesn't have a tHead. Since it should have, create one and
-      // put the first table row in it.
-      the = document.createElement('thead');
-      the.appendChild(table.rows[0]);
-      table.insertBefore(the,table.firstChild);
-    }
-    // Safari doesn't support table.tHead, sigh
-    if (table.tHead == null) table.tHead = table.getElementsByTagName('thead')[0];
-
-    if (table.tHead.rows.length != 1) return; // can't cope with two header rows
-
-    // Sorttable v1 put rows with a class of "sortbottom" at the bottom (as
-    // "total" rows, for example). This is B&R, since what you're supposed
-    // to do is put them in a tfoot. So, if there are sortbottom rows,
-    // for backwards compatibility, move them to tfoot (creating it if needed).
-    sortbottomrows = [];
-    for (var i=0; i<table.rows.length; i++) {
-      if (table.rows[i].className.search(/\bsortbottom\b/) != -1) {
-        sortbottomrows[sortbottomrows.length] = table.rows[i];
-      }
-    }
-    if (sortbottomrows) {
-      if (table.tFoot == null) {
-        // table doesn't have a tfoot. Create one.
-        tfo = document.createElement('tfoot');
-        table.appendChild(tfo);
-      }
-      for (var i=0; i<sortbottomrows.length; i++) {
-        tfo.appendChild(sortbottomrows[i]);
-      }
-      delete sortbottomrows;
-    }
-
-    // work through each column and calculate its type
-    headrow = table.tHead.rows[0].cells;
-    for (var i=0; i<headrow.length; i++) {
-      // manually override the type with a sorttable_type attribute
-      if (!headrow[i].className.match(/\bsorttable_nosort\b/)) { // skip this col
-        mtch = headrow[i].className.match(/\bsorttable_([a-z0-9]+)\b/);
-        if (mtch) { override = mtch[1]; }
-	      if (mtch && typeof sorttable["sort_"+override] == 'function') {
-	        headrow[i].sorttable_sortfunction = sorttable["sort_"+override];
-	      } else {
-	        headrow[i].sorttable_sortfunction = sorttable.guessType(table,i);
-	      }
-	      // make it clickable to sort
-	      headrow[i].sorttable_columnindex = i;
-	      headrow[i].sorttable_tbody = table.tBodies[0];
-	      dean_addEvent(headrow[i],"click", sorttable.innerSortFunction = function(e) {
-
-          if (this.className.search(/\bsorttable_sorted\b/) != -1) {
-            // if we're already sorted by this column, just
-            // reverse the table, which is quicker
-            sorttable.reverse(this.sorttable_tbody);
-            this.className = this.className.replace('sorttable_sorted',
-                                                    'sorttable_sorted_reverse');
-            this.removeChild(document.getElementById('sorttable_sortfwdind'));
-            sortrevind = document.createElement('span');
-            sortrevind.id = "sorttable_sortrevind";
-            sortrevind.innerHTML = stIsIE ? '&nbsp<font face="webdings">5</font>' : '&nbsp;&#x25B4;';
-            this.appendChild(sortrevind);
-            return;
-          }
-          if (this.className.search(/\bsorttable_sorted_reverse\b/) != -1) {
-            // if we're already sorted by this column in reverse, just
-            // re-reverse the table, which is quicker
-            sorttable.reverse(this.sorttable_tbody);
-            this.className = this.className.replace('sorttable_sorted_reverse',
-                                                    'sorttable_sorted');
-            this.removeChild(document.getElementById('sorttable_sortrevind'));
-            sortfwdind = document.createElement('span');
-            sortfwdind.id = "sorttable_sortfwdind";
-            sortfwdind.innerHTML = stIsIE ? '&nbsp<font face="webdings">6</font>' : '&nbsp;&#x25BE;';
-            this.appendChild(sortfwdind);
-            return;
-          }
-
-          // remove sorttable_sorted classes
-          theadrow = this.parentNode;
-          forEach(theadrow.childNodes, function(cell) {
-            if (cell.nodeType == 1) { // an element
-              cell.className = cell.className.replace('sorttable_sorted_reverse','');
-              cell.className = cell.className.replace('sorttable_sorted','');
-            }
-          });
-          sortfwdind = document.getElementById('sorttable_sortfwdind');
-          if (sortfwdind) { sortfwdind.parentNode.removeChild(sortfwdind); }
-          sortrevind = document.getElementById('sorttable_sortrevind');
-          if (sortrevind) { sortrevind.parentNode.removeChild(sortrevind); }
-
-          this.className += ' sorttable_sorted';
-          sortfwdind = document.createElement('span');
-          sortfwdind.id = "sorttable_sortfwdind";
-          sortfwdind.innerHTML = stIsIE ? '&nbsp<font face="webdings">6</font>' : '&nbsp;&#x25BE;';
-          this.appendChild(sortfwdind);
-
-	        // build an array to sort. This is a Schwartzian transform thing,
-	        // i.e., we "decorate" each row with the actual sort key,
-	        // sort based on the sort keys, and then put the rows back in order
-	        // which is a lot faster because you only do getInnerText once per row
-	        row_array = [];
-	        col = this.sorttable_columnindex;
-	        rows = this.sorttable_tbody.rows;
-	        for (var j=0; j<rows.length; j++) {
-	          row_array[row_array.length] = [sorttable.getInnerText(rows[j].cells[col]), rows[j]];
-	        }
-	        /* If you want a stable sort, uncomment the following line */
-	        //sorttable.shaker_sort(row_array, this.sorttable_sortfunction);
-	        /* and comment out this one */
-	        row_array.sort(this.sorttable_sortfunction);
-            row_array.reverse();
-
-	        tb = this.sorttable_tbody;
-	        for (var j=0; j<row_array.length; j++) {
-	          tb.appendChild(row_array[j][1]);
-	        }
-
-	        delete row_array;
-	      });
-	    }
-    }
-  },
-
-  guessType: function(table, column) {
-    // guess the type of a column based on its first non-blank row
-    sortfn = sorttable.sort_alpha;
-    for (var i=0; i<table.tBodies[0].rows.length; i++) {
-      text = sorttable.getInnerText(table.tBodies[0].rows[i].cells[column]);
-      if (text != '') {
-        if (text.match(/^-?[�$�]?[\d,.]+%?$/)) {
-          return sorttable.sort_numeric;
-        }
-        // check for a date: dd/mm/yyyy or dd/mm/yy
-        // can have / or . or - as separator
-        // can be mm/dd as well
-        possdate = text.match(sorttable.DATE_RE)
-        if (possdate) {
-          // looks like a date
-          first = parseInt(possdate[1]);
-          second = parseInt(possdate[2]);
-          if (first > 12) {
-            // definitely dd/mm
-            return sorttable.sort_ddmm;
-          } else if (second > 12) {
-            return sorttable.sort_mmdd;
-          } else {
-            // looks like a date, but we can't tell which, so assume
-            // that it's dd/mm (English imperialism!) and keep looking
-            sortfn = sorttable.sort_ddmm;
-          }
-        }
-      }
-    }
-    return sortfn;
-  },
-
-  getInnerText: function(node) {
-    // gets the text we want to use for sorting for a cell.
-    // strips leading and trailing whitespace.
-    // this is *not* a generic getInnerText function; it's special to sorttable.
-    // for example, you can override the cell text with a customkey attribute.
-    // it also gets .value for <input> fields.
-
-    if (!node) return "";
-
-    hasInputs = (typeof node.getElementsByTagName == 'function') &&
-                 node.getElementsByTagName('input').length;
-
-    if (node.getAttribute("sorttable_customkey") != null) {
-      return node.getAttribute("sorttable_customkey");
-    }
-    else if (typeof node.textContent != 'undefined' && !hasInputs) {
-      return node.textContent.replace(/^\s+|\s+$/g, '');
-    }
-    else if (typeof node.innerText != 'undefined' && !hasInputs) {
-      return node.innerText.replace(/^\s+|\s+$/g, '');
-    }
-    else if (typeof node.text != 'undefined' && !hasInputs) {
-      return node.text.replace(/^\s+|\s+$/g, '');
-    }
-    else {
-      switch (node.nodeType) {
-        case 3:
-          if (node.nodeName.toLowerCase() == 'input') {
-            return node.value.replace(/^\s+|\s+$/g, '');
-          }
-        case 4:
-          return node.nodeValue.replace(/^\s+|\s+$/g, '');
-          break;
-        case 1:
-        case 11:
-          var innerText = '';
-          for (var i = 0; i < node.childNodes.length; i++) {
-            innerText += sorttable.getInnerText(node.childNodes[i]);
-          }
-          return innerText.replace(/^\s+|\s+$/g, '');
-          break;
-        default:
-          return '';
-      }
-    }
-  },
-
-  reverse: function(tbody) {
-    // reverse the rows in a tbody
-    newrows = [];
-    for (var i=0; i<tbody.rows.length; i++) {
-      newrows[newrows.length] = tbody.rows[i];
-    }
-    for (var i=newrows.length-1; i>=0; i--) {
-       tbody.appendChild(newrows[i]);
-    }
-    delete newrows;
-  },
-
-  /* sort functions
-     each sort function takes two parameters, a and b
-     you are comparing a[0] and b[0] */
-  sort_numeric: function(a,b) {
-    aa = parseFloat(a[0].replace(/[^0-9.-]/g,''));
-    if (isNaN(aa)) aa = 0;
-    bb = parseFloat(b[0].replace(/[^0-9.-]/g,''));
-    if (isNaN(bb)) bb = 0;
-    return aa-bb;
-  },
-  sort_alpha: function(a,b) {
-    if (a[0]==b[0]) return 0;
-    if (a[0]<b[0]) return -1;
-    return 1;
-  },
-  sort_ddmm: function(a,b) {
-    mtch = a[0].match(sorttable.DATE_RE);
-    y = mtch[3]; m = mtch[2]; d = mtch[1];
-    if (m.length == 1) m = '0'+m;
-    if (d.length == 1) d = '0'+d;
-    dt1 = y+m+d;
-    mtch = b[0].match(sorttable.DATE_RE);
-    y = mtch[3]; m = mtch[2]; d = mtch[1];
-    if (m.length == 1) m = '0'+m;
-    if (d.length == 1) d = '0'+d;
-    dt2 = y+m+d;
-    if (dt1==dt2) return 0;
-    if (dt1<dt2) return -1;
-    return 1;
-  },
-  sort_mmdd: function(a,b) {
-    mtch = a[0].match(sorttable.DATE_RE);
-    y = mtch[3]; d = mtch[2]; m = mtch[1];
-    if (m.length == 1) m = '0'+m;
-    if (d.length == 1) d = '0'+d;
-    dt1 = y+m+d;
-    mtch = b[0].match(sorttable.DATE_RE);
-    y = mtch[3]; d = mtch[2]; m = mtch[1];
-    if (m.length == 1) m = '0'+m;
-    if (d.length == 1) d = '0'+d;
-    dt2 = y+m+d;
-    if (dt1==dt2) return 0;
-    if (dt1<dt2) return -1;
-    return 1;
-  },
-
-  shaker_sort: function(list, comp_func) {
-    // A stable sort function to allow multi-level sorting of data
-    // see: http://en.wikipedia.org/wiki/Cocktail_sort
-    // thanks to Joseph Nahmias
-    var b = 0;
-    var t = list.length - 1;
-    var swap = true;
-
-    while(swap) {
-        swap = false;
-        for(var i = b; i < t; ++i) {
-            if ( comp_func(list[i], list[i+1]) > 0 ) {
-                var q = list[i]; list[i] = list[i+1]; list[i+1] = q;
-                swap = true;
-            }
-        } // for
-        t--;
-
-        if (!swap) break;
-
-        for(var i = t; i > b; --i) {
-            if ( comp_func(list[i], list[i-1]) < 0 ) {
-                var q = list[i]; list[i] = list[i-1]; list[i-1] = q;
-                swap = true;
-            }
-        } // for
-        b++;
-
-    } // while(swap)
-  }
-}
-
-/* ******************************************************************
-   Supporting functions: bundled here to avoid depending on a library
-   ****************************************************************** */
-
-// Dean Edwards/Matthias Miller/John Resig
-
-/* for Mozilla/Opera9 */
-if (document.addEventListener) {
-    document.addEventListener("DOMContentLoaded", sorttable.init, false);
-}
-
-/* for Internet Explorer */
-/*@cc_on @*/
-/*@if (@_win32)
-    document.write("<script id=__ie_onload defer src=javascript:void(0)><\/script>");
-    var script = document.getElementById("__ie_onload");
-    script.onreadystatechange = function() {
-        if (this.readyState == "complete") {
-            sorttable.init(); // call the onload handler
-        }
-    };
-/*@end @*/
-
-/* for Safari */
-if (/WebKit/i.test(navigator.userAgent)) { // sniff
-    var _timer = setInterval(function() {
-        if (/loaded|complete/.test(document.readyState)) {
-            sorttable.init(); // call the onload handler
-        }
-    }, 10);
-}
-
-/* for other browsers */
-window.onload = sorttable.init;
-
-// written by Dean Edwards, 2005
-// with input from Tino Zijdel, Matthias Miller, Diego Perini
-
-// http://dean.edwards.name/weblog/2005/10/add-event/
-
-function dean_addEvent(element, type, handler) {
-	if (element.addEventListener) {
-		element.addEventListener(type, handler, false);
-	} else {
-		// assign each event handler a unique ID
-		if (!handler.$$guid) handler.$$guid = dean_addEvent.guid++;
-		// create a hash table of event types for the element
-		if (!element.events) element.events = {};
-		// create a hash table of event handlers for each element/event pair
-		var handlers = element.events[type];
-		if (!handlers) {
-			handlers = element.events[type] = {};
-			// store the existing event handler (if there is one)
-			if (element["on" + type]) {
-				handlers[0] = element["on" + type];
-			}
-		}
-		// store the event handler in the hash table
-		handlers[handler.$$guid] = handler;
-		// assign a global event handler to do all the work
-		element["on" + type] = handleEvent;
-	}
-};
-// a counter used to create unique IDs
-dean_addEvent.guid = 1;
-
-function removeEvent(element, type, handler) {
-	if (element.removeEventListener) {
-		element.removeEventListener(type, handler, false);
-	} else {
-		// delete the event handler from the hash table
-		if (element.events && element.events[type]) {
-			delete element.events[type][handler.$$guid];
-		}
-	}
-};
-
-function handleEvent(event) {
-	var returnValue = true;
-	// grab the event object (IE uses a global event object)
-	event = event || fixEvent(((this.ownerDocument || this.document || this).parentWindow || window).event);
-	// get a reference to the hash table of event handlers
-	var handlers = this.events[event.type];
-	// execute each event handler
-	for (var i in handlers) {
-		this.$$handleEvent = handlers[i];
-		if (this.$$handleEvent(event) === false) {
-			returnValue = false;
-		}
-	}
-	return returnValue;
-};
-
-function fixEvent(event) {
-	// add W3C standard event methods
-	event.preventDefault = fixEvent.preventDefault;
-	event.stopPropagation = fixEvent.stopPropagation;
-	return event;
-};
-fixEvent.preventDefault = function() {
-	this.returnValue = false;
-};
-fixEvent.stopPropagation = function() {
-  this.cancelBubble = true;
-}
-
-// Dean's forEach: http://dean.edwards.name/base/forEach.js
-/*
-	forEach, version 1.0
-	Copyright 2006, Dean Edwards
-	License: http://www.opensource.org/licenses/mit-license.php
-*/
-
-// array-like enumeration
-if (!Array.forEach) { // mozilla already supports this
-	Array.forEach = function(array, block, context) {
-		for (var i = 0; i < array.length; i++) {
-			block.call(context, array[i], i, array);
-		}
-	};
-}
-
-// generic enumeration
-Function.prototype.forEach = function(object, block, context) {
-	for (var key in object) {
-		if (typeof this.prototype[key] == "undefined") {
-			block.call(context, object[key], key, object);
-		}
-	}
-};
-
-// character enumeration
-String.forEach = function(string, block, context) {
-	Array.forEach(string.split(""), function(chr, index) {
-		block.call(context, chr, index, string);
-	});
-};
-
-// globally resolve forEach enumeration
-var forEach = function(object, block, context) {
-	if (object) {
-		var resolve = Object; // default
-		if (object instanceof Function) {
-			// functions have a "length" property
-			resolve = Function;
-		} else if (object.forEach instanceof Function) {
-			// the object implements a custom forEach method so use that
-			object.forEach(block, context);
-			return;
-		} else if (typeof object == "string") {
-			// the object is a string
-			resolve = String;
-		} else if (typeof object.length == "number") {
-			// the object is array-like
-			resolve = Array;
-		}
-		resolve.forEach(object, block, context);
-	}
-};
-
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/style.css b/pkgs/plt-services/meta/pkg-index/official/static/style.css
deleted file mode 100644
index 5be566b074..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/static/style.css
+++ /dev/null
@@ -1,291 +0,0 @@
-html {
-    overflow-y: scroll;
-}
-
-a img {
-    border: 0;
-}
-
-/*
-body {
-    color: black;
-    background-color: white;
-    font-family: Optima, Arial, Verdana, Helvetica, sans-serif;
-    margin: 0px;
-    padding: 0px;
-}
-*/
-
-.breadcrumb {
-    padding-left: 1em;
-    padding-right: 1em;
-    background: black; /* #FFCC66; */
-    font-size: 120%;
-    font-weight: bold;
-}
-
-.breadcrumb a,span.not-this {
-    color: white;
-    /* text-decoration: none; */
-    font-weight: normal;
-}
-
-.breadcrumb a:hover {
-    color: white;
-    text-decoration: underline;
-}
-
-#packages_loading {
-    text-align: center;
-    font-size: 400%;
-    font-family: Sans-Serif;
-    margin: 1em;
-}
-
-#server_notice {
-    text-align: center;
-    background: #ffffcc;
-    padding-bottom: 0.25em;
-    color: black;
-    font-size: 75%;
-    font-weight: bold;
-}
-
-#logout {
-    float: right;
-    color: white;
-}
-
-.content {
-    margin-left: auto;
-    margin-right: auto;
-    width: 95%;
-}
-
-table.packages {
-    width: 100%;
-}
-
-table.packages thead tr {
-    color: white;
-    background: black; /* #FFCC66; */
-}
-
-/*
-table.packages tbody tr.even {
-    background: #F5F5DC;
-}
-*/
-
-.recent td:nth-child(1):before {
-    content: "*";
-    color: red;
-}
-
-#search_help {
-    text-align: center;
-    font-size: 80%;
-    margin-bottom: 0em;
-}
-#search_menu {
-    text-align: left;
-    width: 95%;
-    margin-left: 1em;
-    margin-right: 1em;
-    margin-top: 0em;
-    margin-bottom: 0.5em;
-}
-a.resetlink {
-    font-weight: bold;
-    font-size: 80%;
-    color: black;
-}
-
-.menu_option {
-    margin-right: 4em;
-}
-
-.package {
-    text-align: center;
-}
-
-.package table {
-}
-.package table tr {
-}
-.package table td {
-    vertical-align: top;
-    height: 2em;
-}
-.package table tr:nth-child(3) td {
-    height: 2.5em;
-}
-.package table tr:nth-child(9) td {
-    height: 3.5em;
-}
-.package table td:nth-child(1) {
-    text-align: right;
-    font-weight: bold;
-    width: 20%;
-}
-.package table td:nth-child(2) {
-    text-align: left;
-    width: 60%;
-}
-.package table td.submit {
-    text-align: center;
-}
-.package input {
-    width: 50%;
-}
-.package textarea {
-    width: 100%;
-    height: 4em;
-}
-
-div.delete {
-    margin-top: 1em;
-}
-
-#footer {
-    width: 100%;
-    text-align: right;
-    color: white;
-    background: black; /* #FFCC66; */
-    padding-right: 3em;
-}
-#footer a {
-    color: white;
-    font-weight: bold;
-}
-
-div.install {
-    width: 50%;
-    margin-left: 25%;
-    margin-right: 25%;
-    padding: 1em;
-    background: #F5F5DC;
-    text-align: left;
-}
-
-.packages tr.proposal, .packages tr.proposal:nth-child(2n) {
-   background: rgb(90%, 70%, 90%);
-}
-.packages tr.problem, .packages tr.problem:nth-child(2n) {
-   background: rgb(90%, 70%, 70%);
-}
-
-a.active {
-    font-weight: bold;
-}
-a.inactive {
-    font-weight: bold;
-    text-decoration: line-through;
-}
-a.possible {
-}
-
-#login table tr:nth-child(5) td {
-    text-align: center;
-    color: red;
-}
-
-#pi_edit_help {
-    text-align: center;
-    font-size: small;
-}
-
-#pi_source_help {
-    text-align: center;
-    font-size: small;
-}
-
-#pi_source_help a {
-    text-decoration: underline;
-}
-
-tr#pi_delete_row td {
-    text-align: center;
-}
-
-.packages thead th:nth-child(1) {
-    font-size: xx-small;
-}
-.packages tr td:nth-child(1) {
-    min-width: 1em;
-}
-.packages .authors a {
-    font-size: small;
-    display: block;
-    color: black;
-}
-.packages .doctags {
-    font-weight: bold;
-    display: block;
-}
-.packages .doctags a {
-    font-weight: normal;
-}
-.packages tr td:nth-child(4) {
-    width: 19em;
-}
-.packages tr td:nth-child(4) a {
-    text-decoration: none;
-}
-
-.build_green { background-color: #ccffcc; }
-.build_yellow { background-color: #ffffcc; }
-.build_red { background-color: #ffcccc; }
-
-/* racket nav */
-.navbar {
-    margin-bottom: 0px;
-}
-
-.racketnav {
-  background-color: #000000;
-  color: #ffffff;
-  margin-bottom: 1em;
-  padding: 0.5em 0em;
-  white-space: nowrap;
-}
-.racketnav a {
-  color: #ffffff;
-  text-decoration: none;
-}
-.racketnav .navcontent {
-  margin-left: auto;
-  margin-right: auto;
-  width: 45em;
-  font-family: Optima, Arial, Verdana, Helvetica, sans-serif;
-}
-.racketnav .navtitle {
-  font-size: xx-large;
-  font-weight: bold;
-}
-.racketnav .navitem {
-  text-decoration: none;
-  font-size: 88%;
-}
-.racketnav .navlink a {
-  padding: 0em 1em;
-}
-.racketnav .navcurlink a {
-  padding: 0em 1em;
-  background-color: #555555;
-}
-.racketnav .navlink    a:hover,
-.racketnav .navcurlink a:hover {
-  background-color: #888888;
-}
-.racketnav .navlinkcell {
-  text-align: center;
-}
-.racketnav .helpiconcell {
-  text-align: right;
-  vertical-align: top;
-}
-.racketnav .helpicon {
-  font-weight: bold;
-  font-size: 88%;
-}
diff --git a/pkgs/plt-services/meta/pkg-index/official/update.rkt b/pkgs/plt-services/meta/pkg-index/official/update.rkt
deleted file mode 100644
index 9c289a41ca..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/update.rkt
+++ /dev/null
@@ -1,109 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/function
-         pkg/util
-         racket/package
-         (prefix-in pkg: pkg/lib)
-         "common.rkt"
-         "notify.rkt"
-         "static.rkt")
-
-(define (update-all)
-  (update-checksums #f (package-list)))
-(define (update-pkgs pkgs)
-  (update-checksums #t pkgs))
-
-(define (update-checksums force? pkgs)
-  (for-each (curry update-checksum force?) pkgs))
-
-(define (update-checksum force? pkg-name)
-  (with-handlers
-      ([exn:fail?
-        (λ (x)
-          (define i (package-info pkg-name))
-          (package-info-set!
-           pkg-name
-           (hash-set i 'checksum-error
-                     (regexp-replace* (regexp (github-client_secret))
-                                      (exn-message x)
-                                      "REDACTED"))))])
-    (define i (package-info pkg-name))
-    (define old-checksum
-      (package-ref i 'checksum))
-    (define now (current-seconds))
-    (define last (hash-ref i 'last-checked -inf.0))
-    (when (or force?
-              (>= (- now last) (* 1 60 60)))
-      (printf "\tupdating ~a\n" pkg-name)
-      (define new-checksum
-        (package-url->checksum
-         (package-ref i 'source)
-         #:pkg-name pkg-name))
-      (package-begin
-       (define* i
-         (hash-set i 'checksum
-                   (or new-checksum
-                       old-checksum)))
-       (define* i
-         (hash-set i 'last-checked now))
-       (define* i
-         (hash-update i 'versions
-                      (λ (v-ht)
-                        (for/hash ([(v vi) (in-hash v-ht)])
-                          (define old-checksum (hash-ref vi 'checksum ""))
-                          (define new-checksum
-                            (package-url->checksum
-                             (hash-ref vi 'source "")
-                             #:pkg-name pkg-name))
-                          (values v
-                                  (hash-set vi 'checksum
-                                            (or new-checksum
-                                                old-checksum)))))
-                      hash))
-       (define* i
-         (if (and new-checksum (equal? new-checksum old-checksum)
-                  ;; update if 'modules was not present:
-                  (hash-ref i 'modules #f))
-           i
-           (hash-set (update-from-content i) 'last-updated now)))
-       (define* i
-         (hash-set i 'checksum-error #f))
-       (package-info-set! pkg-name i)))))
-
-(define (update-from-content i)
-  (define-values (checksum module-paths dependencies)
-    (pkg:get-pkg-content (pkg:pkg-desc (hash-ref i 'source)
-                                       #f
-                                       (hash-ref i 'name)
-                                       (hash-ref i 'checksum)
-                                       #f)))
-  (package-begin
-   (define* i (hash-set i 'modules module-paths))
-   (define* i (hash-set i 'dependencies dependencies))
-   i))
-
-
-(define (do-update! pkgs)
-  (notify! "package sources being checked for updates")
-  (cond
-    [(empty? pkgs)
-     (update-all)
-     (run-static! empty)]
-    [else
-     (update-pkgs pkgs)
-     (run-static! pkgs)]))
-(define (run-update! pkgs)
-  (run! do-update! pkgs))
-(define (signal-update! pkgs)
-  (thread (λ () (run-update! pkgs))))
-
-(provide do-update!
-         run-update!
-         signal-update!)
-
-(module+ main
-  (require racket/cmdline)
-  (command-line
-   #:program "update"
-   #:args pkgs
-   (do-update! pkgs)))
diff --git a/pkgs/plt-services/meta/pkg-index/official/upload-example.rktd b/pkgs/plt-services/meta/pkg-index/official/upload-example.rktd
deleted file mode 100644
index 6b64308284..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/upload-example.rktd
+++ /dev/null
@@ -1,6 +0,0 @@
-#hash(("parenlog"
-       . #hasheq((description
-                  . "A language that is like Prolog, but parenthetical!")
-                 (versions
-                  . #hash(("5.3.4.11"
-                           . #hasheq((source . "github://github.com/jeapostrophe/parenlog/old"))))))))
diff --git a/pkgs/plt-services/meta/pkg-index/official/upload.rkt b/pkgs/plt-services/meta/pkg-index/official/upload.rkt
deleted file mode 100644
index 2913da8f76..0000000000
--- a/pkgs/plt-services/meta/pkg-index/official/upload.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/base
-(require racket/list
-         net/url
-         racket/port)
-
-(define (upload! the-email the-password the-post)
-  (define the-url
-    (url "https" #f "pkgd.racket-lang.org" #f #t
-         (list (path/param "api" empty)
-               (path/param "upload" empty))
-         empty
-         #f))
-  (displayln the-email)
-  (displayln the-post)
-  (define bs
-    (call/input-url the-url
-                    (λ (url)
-                      (post-pure-port the-url
-                                      (with-output-to-bytes
-                                       (λ ()
-                                         (write (list the-email
-                                                      (string->bytes/utf-8 the-password)
-                                                      the-post))))))
-                    port->bytes))
-  (define v (port->string (open-input-bytes bs)))
-  (displayln v)
-  v)
-
-(module+ main
-  (require racket/cmdline)
-  (command-line #:program "upload"
-                #:args (email password)
-                (if (upload! email password
-                             (read (current-input-port)))
-                  (exit 0)
-                  (exit 1))))
diff --git a/pkgs/plt-services/meta/pkg-index/planet-compat/.gitignore b/pkgs/plt-services/meta/pkg-index/planet-compat/.gitignore
deleted file mode 100644
index cd3d01855c..0000000000
--- a/pkgs/plt-services/meta/pkg-index/planet-compat/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/root
diff --git a/pkgs/plt-services/meta/pkg-index/planet-compat/common.rkt b/pkgs/plt-services/meta/pkg-index/planet-compat/common.rkt
deleted file mode 100644
index 8f089c08be..0000000000
--- a/pkgs/plt-services/meta/pkg-index/planet-compat/common.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(require racket/runtime-path
-         racket/file)
-
-(define root (getenv "PC_ROOT"))
-
-(define mins (build-path root "mins"))
-(make-directory* mins)
-(define orig-pkg (build-path root "orig-pkg"))
-(make-directory* orig-pkg)
-(define orig (build-path root "orig"))
-(make-directory* orig)
-(define work (build-path root "work"))
-(make-directory* work)
-(define pkg-depo (build-path root "cache"))
-(make-directory* pkg-depo)
-(define pkg-depo-dir "static")
-(make-directory* (build-path pkg-depo pkg-depo-dir))
-
-(define cache-dir pkg-depo)
-(make-directory* cache-dir)
-
-(provide (all-defined-out))
diff --git a/pkgs/plt-services/meta/pkg-index/planet-compat/info.rkt b/pkgs/plt-services/meta/pkg-index/planet-compat/info.rkt
deleted file mode 100644
index 7b7357e0f6..0000000000
--- a/pkgs/plt-services/meta/pkg-index/planet-compat/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("root"))
diff --git a/pkgs/plt-services/meta/pkg-index/planet-compat/s3.sh b/pkgs/plt-services/meta/pkg-index/planet-compat/s3.sh
deleted file mode 100755
index 309e5c3cc2..0000000000
--- a/pkgs/plt-services/meta/pkg-index/planet-compat/s3.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-
-. ~/.profile
-
-export PC_ROOT=~/Dev/local/pkg.rlo/planet-compat/root/
-
-cd $(dirname $0)
-raco make update.rkt static.rkt
-racket update.rkt
-racket static.rkt
-s3cmd -c ~/.s3cfg-plt sync --recursive --delete-removed ${PC_ROOT}/cache/ s3://planet-compats.racket-lang.org/
diff --git a/pkgs/plt-services/meta/pkg-index/planet-compat/static.rkt b/pkgs/plt-services/meta/pkg-index/planet-compat/static.rkt
deleted file mode 100644
index d88ee4c6e2..0000000000
--- a/pkgs/plt-services/meta/pkg-index/planet-compat/static.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang racket/base
-(require web-server/http
-         racket/file
-         racket/match
-         net/url
-         racket/list
-         racket/path
-         racket/promise
-         meta/pkg-index/basic/main)
-
-(module+ main
-  (require "common.rkt")
-
-  (define pkg-list
-    (for/list ([f (in-list (directory-list (build-path pkg-depo pkg-depo-dir)))]
-               #:when (regexp-match #rx"\\.plt$" (path->string f)))
-      (regexp-replace #rx"\\.plt$" (path->string f) "")))
-
-  (define dispatch
-    (pkg-index/basic
-     (λ () pkg-list)
-     (λ (pkg-name)
-       (hasheq 'checksum
-               (file->string
-                (build-path pkg-depo pkg-depo-dir (format "~a.plt.CHECKSUM" pkg-name)))
-               'source
-               (format "http://planet-compat.racket-lang.org/~a/~a.plt"
-                       pkg-depo-dir pkg-name)
-               'url
-               (let ()
-                 (match-define (regexp #rx"^planet-([^-]+)-(.+)[0-9]+$"
-                                       (list _ user pkg))
-                               pkg-name)
-                 (format "http://planet.racket-lang.org/display.ss?package=~a.plt&owner=~a"
-                         pkg user))))))
-
-  (define (url->request u)
-    (make-request #"GET" (string->url u) empty
-                  (delay empty) #f "1.2.3.4" 80 "4.3.2.1"))
-
-  (define (cache url file)
-    (define p (build-path cache-dir file))
-    (make-directory* (path-only p))
-    (void
-     (with-output-to-file p
-       #:exists 'replace
-       (λ () ((response-output (dispatch (url->request url))) (current-output-port))))))
-
-  (cache "/" "index.html")
-  (cache "/pkgs" "pkgs")
-  (cache "/pkgs-all" "pkgs-all")
-  (for ([p (in-list pkg-list)])
-    (cache (format "/pkg/~a/display" p) (format "pkg/~a/display/index.html" p))
-    (cache (format "/pkg/~a" p) (format "pkg/~a/index.html" p))))
diff --git a/pkgs/plt-services/meta/pkg-index/planet-compat/update.rkt b/pkgs/plt-services/meta/pkg-index/planet-compat/update.rkt
deleted file mode 100644
index 306512ce25..0000000000
--- a/pkgs/plt-services/meta/pkg-index/planet-compat/update.rkt
+++ /dev/null
@@ -1,340 +0,0 @@
-#lang racket/base
-(require net/url
-         racket/file
-         racket/port
-         racket/match
-         racket/runtime-path
-         planet/config
-         racket/system
-         racket/path
-         racket/list
-         setup/unpack)
-
-(module+ main
-  (require "common.rkt"))
-
-(define (delete-directory/files* p)
-  (when (or (file-exists? p) (directory-exists? p))
-    (delete-directory/files p)))
-
-(require (prefix-in p:
-                    (combine-in
-                     planet/private/parsereq
-                     planet/private/data)))
-(define (substring* s st end)
-  (substring s st (+ (string-length s) end)))
-(define (remove-suffix s)
-  (regexp-replace #rx"\\.([^\\.]*?)$" s ""))
-(define (convert-one-planet-req pkgs orig-bs)
-  (define orig-bs-i (open-input-bytes orig-bs))
-  (define-values (new-byte new-dep)
-    (with-handlers ([exn?
-                     (λ (x)
-                       (eprintf "skipping possible planet dep ~e because of exception ~e\n"
-                                orig-bs (exn-message x))
-                       (define here (file-position orig-bs-i))
-                       (file-position orig-bs-i 0)
-                       (values (read-bytes here orig-bs-i)
-                               empty))]
-                    [list?
-                     (λ (x)
-                       (apply error x))])
-      (define orig-v (read orig-bs-i))
-      (define orig-r (p:spec->req orig-v #'error))
-      (define spec (p:request-full-pkg-spec orig-r))
-      (define user (first (p:pkg-spec-path spec)))
-      (define pkg
-        (format "~a~a"
-                (remove-suffix (p:pkg-spec-name spec))
-                (verify-package-exists pkgs spec)))
-      (values
-       (string->bytes/utf-8
-        (format "~a/~a/~a~a"
-                user
-                pkg
-                (if (empty? (p:request-path orig-r))
-                  ""
-                  (string-append
-                   (apply string-append
-                          (add-between (p:request-path orig-r) "/"))
-                   "/"))
-                (remove-suffix (p:request-file orig-r))))
-       (list
-        (format "planet-~a-~a"
-                user pkg)))))
-  (define-values (new-bytes new-deps)
-    (update-planet-reqs pkgs (port->bytes orig-bs-i)))
-  (values (bytes-append
-           new-byte new-bytes)
-          (append
-           new-dep new-deps)))
-
-(define (update-planet-reqs pkgs orig)
-  (match (regexp-match-positions #px#"\\(\\s*planet\\s+.*\\s*\\)" orig)
-    [#f
-     (values orig
-             empty)]
-    [(cons (cons start end) _)
-     (define-values (new-bytes new-deps)
-       (convert-one-planet-req pkgs (subbytes orig start)))
-     (values (bytes-append (subbytes orig 0 start)
-                           new-bytes)
-             new-deps)]))
-
-(module+ test
-  (require rackunit)
-  (define fake-pkgs
-    (list (list "mcdonald" "farm.plt" (list 1 0))
-          (list "mcdonald" "glue-factory.plt" (list 1 0))))
-  (define-syntax-rule (p in exp-bs exp-deps)
-    (let ()
-      (define-values (act-bs act-deps) (update-planet-reqs fake-pkgs in))
-      (check-equal? act-bs exp-bs)
-      (check-equal? act-deps exp-deps)))
-
-  (p #"planet mcdonald/farm"
-     #"planet mcdonald/farm"
-     '())
-  (p #"(planet mcdonald/farm)"
-     #"mcdonald/farm1/main"
-     '("planet-mcdonald-farm1"))
-  (p #"ababab (planet mcdonald/farm) ababab"
-     #"ababab mcdonald/farm1/main ababab"
-     '("planet-mcdonald-farm1"))
-  (p #"(planet mcdonald/farm) (planet mcdonald/farm)"
-     #"mcdonald/farm1/main mcdonald/farm1/main"
-     '("planet-mcdonald-farm1" "planet-mcdonald-farm1"))
-  (p #"(planet mcdonald/farm) (planet mcdonald/glue-factory)"
-     #"mcdonald/farm1/main mcdonald/glue-factory1/main"
-     '("planet-mcdonald-farm1" "planet-mcdonald-glue-factory1"))
-  (p #"(planet mcdonald/farm/duck)"
-     #"mcdonald/farm1/duck"
-     '("planet-mcdonald-farm1"))
-  (p #"(planet mcdonald/farm:1)"
-     #"mcdonald/farm1/main"
-     '("planet-mcdonald-farm1"))
-  (p #"(planet mcdonald/farm:1:5)"
-     #"mcdonald/farm1/main"
-     '("planet-mcdonald-farm1"))
-  (p #"(planet mcdonald/farm:1:5/duck)"
-     #"mcdonald/farm1/duck"
-     '("planet-mcdonald-farm1"))
-  (p #"(planet mcdonald/farm/duck/quack)"
-     #"mcdonald/farm1/duck/quack"
-     '("planet-mcdonald-farm1"))
-  (p #"(planet \"mcdonald/farm/duck/quack\")"
-     #"mcdonald/farm1/duck/quack"
-     '("planet-mcdonald-farm1"))
-  (p #"(planet \"quack.rkt\" (\"mcdonald\" \"farm.plt\") \"duck\")"
-     #"mcdonald/farm1/duck/quack"
-     '("planet-mcdonald-farm1"))
-  (p #"(planet \"quack.rkt\" (\"mcdonald\" \"farm.plt\") \"duck\" \"mallard\")"
-     #"mcdonald/farm1/duck/mallard/quack"
-     '("planet-mcdonald-farm1")))
-
-(module+ main
-  (define pkg-info-url
-    (string->url "http://planet.racket-lang.org/servlets/pkg-info.ss"))
-  (define pkgs
-    (call/input-url pkg-info-url get-pure-port (λ (p) (read p) (read p))))
-  (define planet-download-url
-    (string->url (HTTP-DOWNLOAD-SERVLET-URL))))
-
-(define (verify-package-exists pkgs spec)
-  (or
-   (for/or ([p (in-list pkgs)])
-     (match-define (list user pkg (list max-maj min)) p)
-     (and (equal? (p:pkg-spec-name spec) pkg)
-          (equal? (p:pkg-spec-path spec) (list user))
-          (if (p:pkg-spec-maj spec)
-            (and
-             ;; This is too restrictive given the number of errors in Planet packages
-             (<= (p:pkg-spec-maj spec) max-maj)
-             (p:pkg-spec-maj spec))
-            max-maj)))
-   ;; Hacks
-   (let ()
-     (define hack-v
-       (list (p:pkg-spec-name spec)
-             (p:pkg-spec-path spec)
-             (p:pkg-spec-maj spec)))
-     (cond
-       [(member hack-v
-                (list
-                 ;; These packages straight-up don't exist
-                 '("displayz.plt" ("synx") #f) ;; from synx/xml-writer
-                 '("galore.plt" ("cce") 1) ;; from soegaard/galore (it's in a comment about avoiding collisions)
-                 '("combinators.plt" ("cce") 1) ;; from soegaard/galore (it's in a comment about avoiding collisions)
-                 ;; These are errors in a package's documnetation
-                 '("aspectscheme.plt" ("dutchyn") 4) ;; maj should be 1
-                 '("divascheme.plt" ("dyoo") 1) ;; user should be divascheme
-                 '("diff.plt" ("wmfarr") 1) ;; pkg should be deriv
-                 '("tetris.plt" ("dvanhorn") 5) ;; maj should be 3
-                 '("file-utils.plt" ("erast") #f) ;; pkg should be fileutils
-                 ;; These are from packages about planet features
-                 '("sqld-psql-ffi.plt" ("planet") 1)
-                 '("sqlid.plt" ("planet") 1)
-                 '("package-from-local-filesystem.plt" ("fake-author") 1)
-                 '("package-from-svn.plt" ("fake-author") 1)
-                 '("module.plt" ("package") #f)
-                 '("mcfly-scribble.plt" ("~A") #f)
-                 '("mcfly-expand.plt" ("~A") #f)
-                 '("bar.plt" ("untyped") 1)))
-        (error 'verify-package-exists "hack!")]
-       [else #f]))
-   ;; End Hacks
-   (raise (list 'verify-package-exists "Cannot determine newest major for ~e ~e"
-                spec
-                (list (p:pkg-spec-name spec)
-                      (p:pkg-spec-path spec)
-                      (p:pkg-spec-maj spec))))))
-
-(module+ main
-  (for ([p (in-list pkgs)])
-    (match-define (list user pkg (list max-maj min)) p)
-
-    (define last-min-p (build-path mins (format "~a:~a" user pkg)))
-    (define last-min
-      (if (file-exists? last-min-p)
-        (file->value last-min-p)
-        -inf.0))
-    (define delete?
-      (not (= last-min min)))
-
-    (begin0
-      (for/list ([maj (in-range 1 (add1 max-maj))])
-        (let/ec esc
-          (define dl-url
-            (struct-copy url planet-download-url
-                         [query
-                          (let ([get (lambda (access) (format "~s" access))])
-                            `((lang   . ,(get (DEFAULT-PACKAGE-LANGUAGE)))
-                              (name   . ,(get pkg))
-                              (maj    . ,(get maj))
-                              (min-lo . "0" #;,(get min))
-                              (min-hi . "#f" #;,(get min))
-                              (path   . ,(get (list user)))))]))
-          (define pkg-short
-            (format "~a:~a:~a" user maj pkg))
-
-          (define-syntax-rule (when-delete? e ...)
-            (with-handlers ([exn:fail? void])
-              (when delete?
-                e ...)))
-
-          (define dest
-            (build-path orig-pkg pkg-short))
-          (when-delete?
-           (delete-file dest))
-          (unless (file-exists? dest)
-            (when #f
-              (printf "Downloading ~a\n"
-                      pkg-short))
-            (define pkg-bs
-              (call/input-url dl-url get-impure-port
-                              (λ (in)
-                                (define hs (purify-port in))
-                                (when (string=? "404" (substring hs 9 12))
-                                  (esc #f))
-                                (port->bytes in))))
-            (call-with-output-file dest
-              (λ (out) (write-bytes pkg-bs out))))
-
-          (define dest-dir
-            (build-path orig pkg-short))
-          (when-delete?
-           (delete-directory/files dest-dir))
-          (unless (directory-exists? dest-dir)
-            (printf "Unpacking ~a\n" pkg-short)
-            (make-directory dest-dir)
-            (unpack dest pkg-dir
-                    (lambda (x) (printf "~a\n" x))
-                    (lambda () dest-dir)
-                    #f
-                    (lambda (auto-dir main-dir file) dest-dir)))
-
-          (define pkg/no-plt
-            (format "~a~a"
-                    (regexp-replace* #rx"\\.plt$" pkg "")
-                    maj))
-          (define pkg-name
-            (format "planet-~a-~a" user pkg/no-plt))
-          (define pkg-name.plt
-            (format "~a.plt" pkg-name))
-          (define pkg-dir
-            (build-path work pkg-name))
-
-          (when-delete?
-           (delete-directory/files pkg-dir))
-
-          (with-handlers
-              ([exn? (λ (x)
-                       (delete-directory/files pkg-dir)
-                       (raise x))])
-            (unless (directory-exists? pkg-dir)
-              (printf "Translating ~a\n" pkg-short)
-              (make-directory* pkg-dir)
-              (define files-dir
-                (build-path pkg-dir user pkg/no-plt))
-              (make-directory* files-dir)
-
-              (define all-deps
-                (fold-files
-                 (λ (p ty deps)
-                   (define rp
-                     (find-relative-path dest-dir p))
-                   (define fp
-                     (if (equal? p rp)
-                       files-dir
-                       (build-path files-dir rp)))
-                   (match ty
-                     ['dir
-                      (make-directory* fp)
-                      deps]
-                     ['file
-                      (match (filename-extension rp)
-                        [(or #"ss" #"scrbl" #"rkt" #"scs" #"scm" #"scribl")
-                         (define orig (file->bytes p))
-                         (define-values (changed new-deps)
-                           (update-planet-reqs pkgs orig))
-                         (display-to-file changed fp)
-                         (append new-deps deps)]
-                        [_
-                         (copy-file p fp)
-                         deps])]))
-                 empty
-                 dest-dir
-                 #f))
-              (define deps
-                (remove pkg-name
-                        (remove-duplicates
-                         all-deps)))
-
-              (printf "\tdeps ~a\n" deps)
-              (call-with-output-file*
-                  (build-path pkg-dir "info.rkt")
-                (lambda (o)
-                  (fprintf o "#lang info\n")
-                  (write `(define collection 'multi) o)
-                  (write `(define deps ',deps) o)))))
-
-
-          (define pkg-pth (build-path pkg-depo pkg-depo-dir pkg-name.plt))
-          (when-delete?
-           (delete-file pkg-pth)
-           (delete-file (string-append (path->string pkg-pth) ".CHECKSUM")))
-          (unless (file-exists? pkg-pth)
-            (printf "Packaging ~a\n" pkg-short)
-            (parameterize ([current-directory work])
-              (system (format "raco pkg create --format plt \"~a\"" pkg-name))
-              (rename-file-or-directory
-               (build-path work pkg-name.plt)
-               pkg-pth)
-              (rename-file-or-directory
-               (string-append (path->string (build-path work pkg-name.plt)) ".CHECKSUM")
-               (string-append (path->string pkg-pth) ".CHECKSUM"))))
-
-          pkg-name))
-
-      (write-to-file min last-min-p
-                     #:exists 'replace))))
diff --git a/pkgs/profile-pkgs/profile-doc/LICENSE.txt b/pkgs/profile-pkgs/profile-doc/LICENSE.txt
deleted file mode 100644
index 80bfe4e953..0000000000
--- a/pkgs/profile-pkgs/profile-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-profile-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/profile-pkgs/profile-doc/info.rkt b/pkgs/profile-pkgs/profile-doc/info.rkt
deleted file mode 100644
index adbad3ef26..0000000000
--- a/pkgs/profile-pkgs/profile-doc/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("base"
-                     "scribble-lib"
-                     "profile-lib"
-                     "errortrace-doc"
-                     "errortrace-lib"
-                     "racket-doc"))
-(define update-implies '("profile-lib"))
-
-(define pkg-desc "documentation part of \"profile\"")
-
-(define pkg-authors '(eli))
diff --git a/pkgs/profile-pkgs/profile-doc/profile/scribblings/analyzer.scrbl b/pkgs/profile-pkgs/profile-doc/profile/scribblings/analyzer.scrbl
deleted file mode 100644
index fd32499469..0000000000
--- a/pkgs/profile-pkgs/profile-doc/profile/scribblings/analyzer.scrbl
+++ /dev/null
@@ -1,158 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label racket/base racket/contract profile/analyzer))
-
-@title[#:tag "analyzer"]{Analyzing Profile Data}
-
-@defmodule[profile/analyzer]
-
-Once a profile run is done and the results are collected, the next
-step is to analyze the data.  In this step sample times are computed
-and summed, a call-graph representing observed function calls is
-built, and per-node and per-edge information is created.  This is the
-job of the main function provided by @racket[profile/analyzer].
-
-@defproc[(analyze-samples [raw-sample-data any/c])
-         profile?]{
-
-This function consumes the raw result of the
-@seclink["sampler"]{sampler} (given in an undocumented form), analyzes
-it, and returns a @racket[profile] value holding the analyzed results.
-Without this function, the results of the sampler should be considered
-meaningless.}
-
-
-@defstruct*[profile ([total-time exact-nonnegative-integer?]
-                     [cpu-time   exact-nonnegative-integer?]
-                     [sample-number exact-nonnegative-integer?]
-                     [thread-times  (listof (cons exact-nonnegative-integer?
-                                                  exact-nonnegative-integer?))]
-                     [nodes  (listof node?)]
-                     [*-node node?])]{
-
-Represents an analyzed profile result.
-
-@itemize[
-
-@item{@racket[total-time] is the total observed time (in milliseconds)
-  included in the profile run.  This can be different from the actual
-  time the profiling took, due to unaccounted-for time spent in
-  untracked threads.  (E.g., time spent in the sampler thread
-  itself.)}
-
-@item{@racket[cpu-time] is the actual cpu time consumed by the process
-  during the profiler's work.}
-
-@item{@racket[sample-number] holds the number of samples taken during
-  the profile.  This can be used to compute the average time frame
-  each of the input samples represented.}
-
-@item{@racket[thread-times] holds an association list mapping thread
-  identifiers to cpu time for the corresponding threads.  As samples
-  are collected, each thread that is observed is assigned a small
-  integer identifier.  These identifiers are listed for each function
-  call, and the total time spent in each thread is in this field.}
-
-@item{@racket[nodes] is a list of nodes representing all observed functions
-  (or, when using Errortrace, expressions).  These nodes are the components of
-  the call-graph that the analyzer assembles (see the @racket[edge] field).
-  The nodes are sorted by a topological top-to-bottom sort, and by decreasing
-  total amount of time (time spent either in the function or in its callees) as
-  a secondary key.  It does not include the special @racket[*-node].}
-
-@item{@racket[*-node] holds a ``special'' root node value that is
-  constructed for every call graph.  This node is used as the caller
-  for all top-level function nodes and as the callee for all leaf
-  nodes.  It can therefore be used to start a recursive scan of the
-  call graph.  In addition, the times associated with its ``callers''
-  and ``callees'' actually represent the time these functions spent
-  being the root of the computation or its leaf.  (This can be
-  different from a node's ``self'' time, since it is divided by the
-  number of instances a function had on the stack in each sample---so
-  for recursive functions this value is always different from the
-  ``self'' time.)}
-
-]}
-
-
-@defstruct*[node ([id      (or/c #f symbol? any/c)]
-                  [src     (or/c #f srcloc?)]
-                  [thread-ids (listof exact-nonnegative-integer?)]
-                  [total   exact-nonnegative-integer?]
-                  [self    exact-nonnegative-integer?]
-                  [callers (listof edge?)]
-                  [callees (listof edge?)])]{
-
-Represents a function call (or, when using Errortrace, expression) node in the
-call graph of an analyzed profile result.
-
-@itemize[
-
-@item{The @racket[id] and @racket[src] fields hold a symbol naming the function
-  (in @racket[continuation-mark-set->context] mode) or an S-expression stub (in
-  Errortrace mode), and/or its source location as a @racket[srcloc] value.
-  This is the same as the results of @racket[continuation-mark-set->context],
-  so at most one of these can be @racket[#f], except for the special
-  @racket[*-node] (see the @racket[profile] struct) that can be identified by
-  both being @racket[#f].}
-
-@item{@racket[thread-ids] holds a list of thread identifiers that were
-  observed executing this function.}
-
-@item{@racket[total] holds the total time (in milliseconds) that this function
-  (or expression) was anywhere on the stack.  It is common to see a few
-  toplevel functions that have close to a 100% total time, but otherwise small
-  @racket[self] times---these functions are the ones that initiate the actual
-  work, but they don't do any hard work directly.}
-
-@item{@racket[self] holds the total time (in milliseconds) that this function
-  (or expression) was observed as the leaf of the stack.  It represents the
-  actual work done by this function, rather than the @racket[total] time spent
-  by both the function and its callees.}
-
-@item{@racket[callers] and @racket[callees] hold the list of callers and
-  callees or, in Errortrace modes, expressions that step to or from the current
-  expression.  The nodes are not actually held in these lists, instead,
-  @racket[edge] values are used---and provide information specific to each edge
-  in the call-graph.}
-
-]}
-
-
-@defstruct*[edge ([total       exact-nonnegative-integer?]
-                  [caller      node?]
-                  [caller-time exact-nonnegative-integer?]
-                  [callee      node?]
-                  [callee-time exact-nonnegative-integer?])]{
-
-Represents an edge between two function call nodes in the call graph of an
-analyzed profile result or, in Errortrace mode, an edge corresponding to an
-evaluation step between two expressions.
-
-@itemize[
-
-@item{@racket[total] is analogous to the @racket[total] field of a
-  @racket[node] value: the total time that this edge was anywhere on
-  the stack.}
-
-@item{@racket[caller] and @racket[callee] hold the two nodes that are
-  connected by this edge.}
-
-@item{@racket[caller-time] and @racket[callee-time] hold the time
-  spent on this edge from the caller's or the callee's perspective.
-  These times are different from each other (as well as from the total
-  time) because the sums that make them are each divided by the number
-  of times the caller or the callee was on the stack.
-
-  To understand this difference, consider a stack snapshot holding
-  @tt{A @'rarr B @'rarr B @'rarr B @'rarr A}, and representing a
-  second of observed cpu time.  For this sample, the @tt{A @'rarr B}
-  edge is charged by a whole second for its total time (the same goes
-  for the @tt{A @'rarr A} edge, for example).  Its caller time is
-  charged 1/2 second because @tt{A} appears twice in this stack
-  snapshot (in the other half, @tt{A} is charged for being a leaf ---
-  the caller of the special @racket[*-node]), and its callee time is
-  charged 1/3 respectively.}
-
-]}
diff --git a/pkgs/profile-pkgs/profile-doc/profile/scribblings/info.rkt b/pkgs/profile-pkgs/profile-doc/profile/scribblings/info.rkt
deleted file mode 100644
index f06d481418..0000000000
--- a/pkgs/profile-pkgs/profile-doc/profile/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("profile.scrbl" () (tool-library))))
diff --git a/pkgs/profile-pkgs/profile-doc/profile/scribblings/profile.scrbl b/pkgs/profile-pkgs/profile-doc/profile/scribblings/profile.scrbl
deleted file mode 100644
index edf29b6833..0000000000
--- a/pkgs/profile-pkgs/profile-doc/profile/scribblings/profile.scrbl
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label racket/base))
-
-@title{Profile: Statistical Profiler}
-
-The @racketmodname[profile] collection implements a statistical profiler.  The
-profiling is done by running a background thread that collects stack snapshots
-either via @racket[continuation-mark-set->context] or via @seclink["top" #:doc
-'(lib "errortrace/scribblings/errortrace.scrbl")]{Errortrace}, meaning that the
-result is an estimate of the execution costs.
-
-When using @racket[continuation-mark-set->context], it is limited to the kind
-of information that @racket[continuation-mark-set->context] produces (most
-notably being limited to functions calls, and subject to compiler
-optimizations); but the result is often useful. In practice, since this method
-does not require recompilation of your source and has very little runtime
-overhead, it can be used for longer runs which compensates for these limits.
-
-When using @seclink["top" #:doc '(lib
-"errortrace/scribblings/errortrace.scrbl")]{Errortrace}, profiles are more
-precise and more fine-grained (expression-level instead of function-level) but
-profiling has higher overhead and recompilation may be necessary.
-
-@table-of-contents[]
-
-@include-section["toplevel.scrbl"]
-@include-section["sampler.scrbl"]
-@include-section["analyzer.scrbl"]
-@include-section["renderers.scrbl"]
diff --git a/pkgs/profile-pkgs/profile-doc/profile/scribblings/renderers.scrbl b/pkgs/profile-pkgs/profile-doc/profile/scribblings/renderers.scrbl
deleted file mode 100644
index 8f242c57fb..0000000000
--- a/pkgs/profile-pkgs/profile-doc/profile/scribblings/renderers.scrbl
+++ /dev/null
@@ -1,131 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label racket/base
-                     racket/contract
-                     profile/analyzer
-                     (prefix-in text: profile/render-text)
-                     (prefix-in graphviz: profile/render-graphviz)))
-
-@title[#:tag "renderers"]{Profile Renderers}
-
-After collecting the profile samples and analyzing the data, the last
-step of the profiling process is to render the results.  The profile
-collection provides several renderers, each providing a rendering
-function that consumes a @racket[profile] instance.  See the
-@seclink["analyzer"]{analyzer} section for a description of the
-@racket[profile] struct if you want to implement a new renderer.
-
-@;--------------------------------------------------------------------
-@section{Textual Rendering}
-
-@defmodule[profile/render-text]
-
-@defproc[(render
-          [profile-data profile?]
-          [#:truncate-source truncate-source exact-nonnegative-integer? 50]
-          [#:hide-self hide-self% (between/c 0 1) 1/100]
-          [#:hide-subs hide-subs% (between/c 0 1) 2/100])
-         void?]{
-
-Prints the given @racket[profile] results as a textual table.
-
-The printout begins with general information about the profile,
-followed by a table with an entry for each node in the call graph.
-The entries are displayed in a topological order (roughly, since the
-graph can have cycles).  This means that it is usually easy to find
-the callers and callees of a function in its close environment.
-
-Each row in the table has the following format:
-@verbatim[#:indent 2]{
-                          B [M1] M2%
-  [N1] N2(N3%) N4(N5%)  A ...path/to/source.rkt:12:34
-                          C [M3] M4%}
-with the following meaning of the numbers and labels:
-
-@itemize[
-@item{@tt{A} --- the name of the function (or a stub of the expression) that
-  this node represents, followed by the source location for the function if it
-  is known.  The name can be ``???'' for anonymous functions, which will be
-  identified with their source location.}
-@item{@tt{N1} --- an integer label associated with this node in the
-  printout.  This label is used to mark references to this function/expression,
-  since symbolic names are not unique (and they can be missing or very
-  long).  The labels are assigned from the top.}
-@item{@tt{N2} --- the time (in milliseconds) that this function/expression has
-  been anywhere in a stack snapshot.  This is the total time that the
-  execution was somewhere in this function/expression or in its callees.
-  (Corresponds to the @racket[node-total] field.)}
-@item{@tt{N3} --- this is the percentage of the node's total time
-  (@tt{N2}) from the total observed time of the profile.  An entry
-  with a 100% refers to a function/expression that was active throughout
-  the whole execution.}
-@item{@tt{N4} --- the time (in milliseconds) that this function/expression has
-  been at the top of the stack snapshot.  This is the time that this
-  function/expression was itself doing work rather than calling other
-  functions/expressions. (Corresponds to the @racket[node-self] field.)}
-@item{@tt{N5} --- this is the percentage of @tt{N4} out of the total
-  observed time of the profile.  Functions/expressions with high values here can
-  be good candidates for optimization, But, of course, they can
-  represent doing real work for a caller that needs to be optimized.}
-@item{@tt{B} and @tt{C} --- these are labels for the callers and
-  callees of the function/expression.  Any number of callers and callees can
-  appear here (including 0).  The function/expression itself can also appear in
-  both places if it is (non-tail) recursive.}
-@item{@tt{M1} and @tt{M3} --- the index numbers for @tt{B} and
-  @tt{C}.  They can be used to disambiguate functions with the same
-  name, as well as a quick way to find the corresponding entry in the
-  table.}
-@item{@tt{M2} and @tt{M4} --- the percentages of the time @tt{A} spent
-  being called by @tt{B} and calling @tt{C}.  These percentages
-  represent the time that this edge was found on a stack snapshot,
-  divided by the number of occurrences of @tt{A} on the same snapshot.
-  The number is the percentage of these times out of @tt{N2}, the
-  total time @tt{A} has been active.
-
-  The total percentages for the all caller and for all callees should
-  be close to 100% minus the time @tt{A} was the leaf or the root.
-
-  These values correspond to the @racket[edge-caller-time] and
-  @racket[edge-callee-time] fields; see the documentation for further
-  details.}
-]
-
-The function has a few keyword arguments to customize its output:
-@itemize[
-
-@item{The @racket[truncate-source] argument determines the length that
-  the source string should take (together with its label).}
-
-@item{@racket[hide-self%] and @racket[hide-subs%] control hiding some
-  of the nodes.  A node is hidden if its self time (@tt{N3} in the
-  above example) is smaller than @racket[hide-self%] @emph{and} if all
-  places where it occurs as a caller or a callee have percentages that
-  are smaller than @racket[hide-subs%].  The reason for requiring both
-  conditions is to avoid having ``dangling references'' to hidden
-  nodes.}
-
-]}
-
-
-@;--------------------------------------------------------------------
-@section{Graph Rendering}
-
-@defmodule[profile/render-graphviz]
-
-@defproc[(render
-          [profile-data profile?]
-          [#:hide-self hide-self% (between/c 0 1) 1/100]
-          [#:hide-subs hide-subs% (between/c 0 1) 2/100])
-         void?]{
-
-Prints the given @racket[profile] results as a Graphviz directed
-graph.
-
-This is an experimental module, provided mostly as a proof-of-concept.
-It renders the profile's call-graph as a graph representation for one
-of the Graphviz tools to render.  Nodes are colored according to their
-`self' percentages, and edges.
-
-The keyword arguments control hiding nodes in the same way as with the
-textual renderer.}
diff --git a/pkgs/profile-pkgs/profile-doc/profile/scribblings/sampler.scrbl b/pkgs/profile-pkgs/profile-doc/profile/scribblings/sampler.scrbl
deleted file mode 100644
index b39950c0ba..0000000000
--- a/pkgs/profile-pkgs/profile-doc/profile/scribblings/sampler.scrbl
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label racket/base racket/contract profile/sampler profile/analyzer
-                     errortrace/errortrace-key))
-
-@title[#:tag "sampler"]{Collecting Profile Information}
-
-@defmodule[profile/sampler]
-
-@defproc[(create-sampler [to-track (or/c thread? custodian?
-                                         (listof (or/c thread? custodian?)))]
-                         [delay (>=/c 0.0)]
-                         [super-cust custodian? (current-custodian)]
-                         [custom-keys (listof any/c) '()]
-                         [#:use-errortrace? use-errortrace? any/c #f])
-         ((symbol?) (any/c) . ->* . any/c)]{
-
-Creates a stack-snapshot collector thread, which tracks the given
-@racket[to-track] value every @racket[delay] seconds.  The
-@racket[to-track] value can be either a thread (track just that
-thread), a custodian (track all threads managed by the custodian), or
-a list of threads and/or custodians.  If a custodian is given, it must
-be subordinate to @racket[super-cust], which defaults to the current
-custodian.
-
-When @racket[custom-keys] are provided, the sampler takes snapshots of the
-continuation marks corresponding to the given keys, in addition to taking
-snapshots of the stack.
-
-When @racket[use-errortrace?] is not @racket[#f], the @racket[errortrace-key] is 
-used to sample snapshots instead of the implicit key used by 
-@racket[continuation-mark-set->context].
-
-The resulting value is a controller function, which consumes a message
-consisting of a symbol and an optional argument, and can affect the
-sampler.  The following messages are currently supported:
-@itemize[
-
-@item{@racket['pause] and @racket['resume] will stop or resume
-  snapshot collection.  These messages can be nested.  Note that the
-  thread will continue running---it will just stop collecting
-  snapshots.}
-
-@item{@racket['stop] kills the sampler thread.  It should be called
-  when no additional data should be collected.  (This is currently
-  irreversible: there is no message to start a new sampler thread.)}
-
-@item{@racket['set-tracked!] with a value will change the tracked
-  object(s) which were initially specified as the @racket[to-track]
-  argument.}
-
-@item{@racket['set-tracked!] with a numeric value will change the
-  delay that the sampler is taking between snapshots.  Note that
-  although changing this means that the snapshots are not uniformly
-  distributed, the results will still be correct: the cpu time between
-  samples is taken into account when the collected data is analyzed.}
-
-@item{A @racket['get-snapshots] message will make the controller return
-  the currently collected data.  Note that this can be called multiple
-  times, each call will return the data that is collected up to that
-  point in time.  In addition, it can be (and usually is) called after
-  the sampler was stopped.
-
-  The value that is returned should be considered as an undocumented
-  internal detail of the profiler, intended to be sent to
-  @racket[analyze-samples] for analysis.  The reason this is not done
-  automatically, is that a future extension might allow you to combine
-  several sampler results, making it possible to combine a profile
-  analysis from several individual runs, possibly from different
-  machines.}
-
-@item{Finally, a @racket['get-custom-snapshots] message will make the
-  controller return the currently collected snapshots corresponding to
-  @racket[custom-keys]. This returns a list of samples, where each sample
-  is a list of vectors of marks in the same format as the output of
-  @racket[continuation-mark-set->list*].}
-
-]}
diff --git a/pkgs/profile-pkgs/profile-doc/profile/scribblings/toplevel.scrbl b/pkgs/profile-pkgs/profile-doc/profile/scribblings/toplevel.scrbl
deleted file mode 100644
index 454bb2a0df..0000000000
--- a/pkgs/profile-pkgs/profile-doc/profile/scribblings/toplevel.scrbl
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label racket/base racket/contract profile profile/sampler
-                     errortrace/errortrace-lib
-                     (only-in profile/analyzer analyze-samples profile?)
-                     (prefix-in text: profile/render-text)))
-
-@title{Toplevel Interface}
-
-@defmodule[profile]
-
-This module provides one procedure and one macro that are convenient
-high-level entry points for profiling expressions.  It abstracts over
-details that are available through other parts of the library, and is
-intended as a convenient tool for profiling code.
-
-@defproc[(profile-thunk
-          [thunk (-> any/c)]
-          [#:delay   delay      (>=/c 0.0)        0.05]
-          [#:repeat  iterations exact-nonnegative-integer? 1]
-          [#:threads threads?   any/c                      #f]
-          [#:render  renderer   (profile? . -> . any/c)    text:render]
-          [#:periodic-renderer periodic-renderer
-           (or/c #f (list/c (>=/c 0.0)
-                            (profile? . -> . any/c)))
-           #f]
-          [#:use-errortrace? use-errortrace? any/c #f])
-         any/c]{
-
-Executes the given @racket[thunk] and collect profiling data during
-execution, eventually analyzing and rendering this. Returns the value
-of the profiled expression.
-Keyword arguments can customize the profiling:
-@itemize[
-
-@item{The profiler works by starting a ``sampler'' thread to
-  periodically collect stack snapshots (using
-  @racket[continuation-mark-set->context]).  To determine the
-  frequency of these collections, the sampler thread sleeps
-  @racket[delay] seconds between collections.  Note that this is will
-  be close, but not identical to, the frequency in which data is
-  actually sampled.  (The @racket[delay] value is passed on to
-  @racket[create-sampler], which creates the sampler thread.)}
-
-@item{Due to the statistical nature of the profiler, longer executions
-  result in more accurate analysis.  You can specify a number of
-  @racket[iterations] to repeat the @racket[thunk] to collect more
-  data.}
-
-@item{Normally, the sampler collects only snapshots of the
-  @racket[current-thread]'s stack.  Profiling a computation that
-  creates threads will therefore lead to bad analysis: the timing
-  results will be correct, but because the profiler is unaware of
-  other threads the observed time will be suspiciously small, and work
-  done in other threads will not be included in the results.  To track
-  all threads, specify a non-@racket[#f] value for the
-  @racket[threads?] argument---this will execute the computation in a
-  fresh custodian, and keep track of all threads under this
-  custodian.}
-
-@item{Once the computation is done and the sampler is stopped, the
-  accumulated data is analyzed (by @racket[analyze-samples]) and the
-  resulting profile value is sent to the @racket[renderer] function.
-  See @secref["renderers"] for available renderers.}
-
-@item{To provide feedback information during execution, specify a
-  @racket[periodic-renderer].  This should be a list holding a delay
-  time (in seconds) and a renderer function.  The delay determines the
-  frequency in which the renderer is called, and it should be larger
-  than the sampler delay (usually much larger since it can involve
-  more noticeable overhead, and it is intended for a human observer).}
-
-@item{When @racket[use-errortrace?] is not @racket[#f], more accurate stack
-  snapshots are captured using @seclink["top" #:doc '(lib
-  "errortrace/scribblings/errortrace.scrbl")]{Errortrace}. Note that when this
-  is provided, it will only profile uncompiled files and files compiled while
-  using @racket[errortrace-compile-handler], and the profiled program must be
-  run using @commandline{racket -l errortrace -t program.rkt} Removing compiled
-  files (with extension @tt{.zo}) is sufficient to enable this.}
-]}
-
-@defform[(profile expr keyword-arguments ...)]{
-
-A macro version of @racket[profile-thunk].  Keyword arguments can be
-specified as in a function call: they can appear before and/or after
-the expression to be profiled.}
diff --git a/pkgs/profile-pkgs/profile-lib/HISTORY.txt b/pkgs/profile-pkgs/profile-lib/HISTORY.txt
deleted file mode 100644
index 7a026f7c5c..0000000000
--- a/pkgs/profile-pkgs/profile-lib/HISTORY.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-6.0
-- samplers can now take snapshots of user-specified continuation marks
-- added a mode to use errortrace continuation marks instead of marks
-  from the runtime
diff --git a/pkgs/profile-pkgs/profile-lib/LICENSE.txt b/pkgs/profile-pkgs/profile-lib/LICENSE.txt
deleted file mode 100644
index 58b5924f52..0000000000
--- a/pkgs/profile-pkgs/profile-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-profile-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/profile-pkgs/profile-lib/analyzer.rkt b/pkgs/profile-pkgs/profile-lib/analyzer.rkt
deleted file mode 100644
index fa9d5f7686..0000000000
--- a/pkgs/profile-pkgs/profile-lib/analyzer.rkt
+++ /dev/null
@@ -1,141 +0,0 @@
-#lang racket/base
-
-;; Analyzer for the sampler results
-
-(require "structs.rkt" "utils.rkt" racket/list)
-
-(provide analyze-samples (all-from-out "structs.rkt"))
-
-(define-syntax-rule (with-hash <hash> <key> <expr> ...)
-  (hash-ref! <hash> <key> (λ () <expr> ...)))
-
-;; This function analyzes the output of the sampler.  Returns a `profile'
-;; struct holding a list of `node' values, each one representing a node in the
-;; call graph, with the relevant information filled in.  The results are sorted
-;; using a topological sort from the top, and by the total time for nodes at
-;; the same level.
-(define (analyze-samples cpu-time+samples)
-  (define cpu-time (car cpu-time+samples))
-  (define samples  (cdr cpu-time+samples))
-  (define samples-by-thread
-    (let ([by-thread (split-by-thread samples)])
-      (for ([samples (in-vector by-thread)] [i (in-naturals 0)])
-        (vector-set! by-thread i (get-times samples)))
-      by-thread))
-  (define id+src->node-hash (make-hasheq))
-  (define (id+src->node id+src)
-    (with-hash id+src->node-hash id+src
-      (node (car id+src) (cdr id+src) '() 0 0 '() '())))
-  ;; special node that is the caller of toplevels and callee of leaves
-  (define *-node (id+src->node '(#f . #f)))
-  (define call->edge
-    (let ([t (make-hasheq)])
-      (λ (ler lee)
-        (with-hash (with-hash t ler (make-hasheq)) lee
-          (define e (edge 0 ler 0 lee 0))
-          (set-node-callers! lee (cons e (node-callers lee)))
-          (set-node-callees! ler (cons e (node-callees ler)))
-          e))))
-  (define total-time 0)
-  (define thread-times (make-vector (vector-length samples-by-thread) 0))
-  (for ([thread-samples (in-vector samples-by-thread)]
-        [thread-id (in-naturals 0)]
-        #:when #t
-        [sample (in-list thread-samples)])
-    (define msecs (car sample))
-    (define (connect ler lee ler# lee#)
-      (define edge (call->edge ler lee))
-      (set-edge-caller-time! edge (+ (edge-caller-time edge) (/ msecs lee#)))
-      (set-edge-callee-time! edge (+ (edge-callee-time edge) (/ msecs ler#)))
-      edge)
-    (define stack ; the stack snapshot, translated to `node' values
-      (for/list ([id+src (in-list (cdr sample))])
-        (define node (id+src->node id+src))
-        (define tids (node-thread-ids node))
-        (unless (memq thread-id tids)
-          (set-node-thread-ids! node (cons thread-id tids)))
-        node))
-    (define counts (get-counts stack))
-    (define stack+counts (map (λ (x) (assq x counts)) stack))
-    (define edges
-      (if (null? stack)
-        '()
-        (append (let ([first (car stack+counts)] [last (last stack+counts)])
-                  (list (connect *-node (car last) 1 (cdr last))
-                        (connect (car first) *-node (cdr first) 1)))
-                (for/list ([callee (in-list stack+counts)]
-                           [caller (in-list (cdr stack+counts))])
-                  (connect (car caller) (car callee)
-                           (cdr caller) (cdr callee))))))
-    (set! total-time (+ msecs total-time))
-    (for ([p (in-list counts)])
-      (set-node-total! (car p) (+ msecs (node-total (car p)))))
-    (for ([e (remove-duplicates edges eq?)])
-      (set-edge-total! e (+ msecs (edge-total e))))
-    (vector-set! thread-times thread-id
-                 (+ msecs (vector-ref thread-times thread-id)))
-    (when (pair? stack)
-      (set-node-self! (car stack) (+ (node-self (car stack)) msecs))))
-  (set-node-total! *-node total-time)
-  ;; convert the nodes from the hash to a list, do a topological sort, and then
-  ;; sort by total time (combining both guarantees(?) sensible order)
-  (define nodes (append-map (λ (nodes) (sort nodes > #:key node-total))
-                            (topological-sort *-node)))
-  ;; sort all the edges in the nodes according to total time
-  (for ([n (in-list nodes)])
-    (set-node-callees! n (sort (node-callees n) > #:key edge-callee-time))
-    (set-node-callers! n (sort (node-callers n) > #:key edge-caller-time)))
-  (profile total-time
-           cpu-time
-           (length samples)
-           (for/list ([time (in-vector thread-times)] [n (in-naturals 0)])
-             (cons n time))
-           nodes
-           *-node))
-
-;; Groups raw samples by their thread-id, returns a vector with a field for
-;; each thread id holding the sample data for that thread.  The samples in
-;; these are reversed (so they'll be sorted going forward in time).
-(define (split-by-thread samples)
-  (define threads
-    (make-vector (add1 (for/fold ([n -1]) ([sample (in-list samples)])
-                         (max (car sample) n)))
-                 '()))
-  (for ([sample (in-list samples)])
-    (define id (car sample))
-    (define data (cdr sample))
-    (vector-set! threads id (cons data (vector-ref threads id))))
-  threads)
-
-(module+ test
-  (require rackunit)
-  (check-equal? (split-by-thread '())
-                '#())
-  (check-equal? (split-by-thread '([0 x]))
-                '#([(x)]))
-  (check-equal? (split-by-thread '([0 x] [0 y] [0 z]))
-                '#([(z) (y) (x)]))
-  (check-equal? (split-by-thread '([0 x] [1 y] [2 z]))
-                '#([(x)] [(y)] [(z)]))
-  (check-equal? (split-by-thread '([0 x1] [1 y1] [0 x2] [2 z1] [0 x3] [2 z2]))
-                '#([(x3) (x2) (x1)] [(y1)] [(z2) (z1)])))
-
-;; returns a list of (cons item occurrences) for the items in l
-(define (get-counts l)
-  (let loop ([l l] [r '()])
-    (if (null? l)
-      r
-      (let ([1st (car l)])
-        (let loop* ([l1 '()] [c 1] [l (cdr l)])
-          (cond [(null? l) (loop l1 (cons (cons 1st c) r))]
-                [(eq? 1st (car l)) (loop* l1 (add1 c) (cdr l))]
-                [else (loop* (cons (car l) l1) c (cdr l))]))))))
-
-(module+ test
-  (check-equal? (get-counts '()) '())
-  (check-equal? (get-counts '(1)) '([1 . 1]))
-  (check-equal? (get-counts '(1 1 1)) '([1 . 3]))
-  (define (set=? xs ys) (null? (append (remove* xs ys) (remove* ys xs))))
-  (check set=? (get-counts '(1 2 3)) '([1 . 1] [2 . 1] [3 . 1]))
-  (check set=? (get-counts '(1 2 2 3 3 3)) '([1 . 1] [2 . 2] [3 . 3]))
-  (check set=? (get-counts '(3 1 2 3 2 3)) '([1 . 1] [2 . 2] [3 . 3])))
diff --git a/pkgs/profile-pkgs/profile-lib/info.rkt b/pkgs/profile-pkgs/profile-lib/info.rkt
deleted file mode 100644
index 5334dffa6e..0000000000
--- a/pkgs/profile-pkgs/profile-lib/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection "profile")
-(define deps '("base" "errortrace-lib"))
-(define build-deps '("at-exp-lib"
-                     "rackunit-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"profile\"")
-
-(define pkg-authors '(eli stamourv))
diff --git a/pkgs/profile-pkgs/profile-lib/main.rkt b/pkgs/profile-pkgs/profile-lib/main.rkt
deleted file mode 100644
index c2992e02d9..0000000000
--- a/pkgs/profile-pkgs/profile-lib/main.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang racket/base
-
-(provide profile-thunk profile)
-
-(require "sampler.rkt" (except-in "analyzer.rkt" profile)
-         (prefix-in text: "render-text.rkt")
-         (for-syntax racket/base))
-
-(define (profile-thunk thunk
-                       #:delay   [delay 0.05]
-                       #:repeat  [rpt 1]
-                       #:threads [threads? #f]
-                       #:render  [renderer text:render]
-                       #:periodic-renderer [periodic-renderer #f]
-                       #:use-errortrace? [et? #f])
-  (define cust (and threads? (make-custodian (current-custodian))))
-  (define sampler (create-sampler (if threads?
-                                    (list cust (current-thread))
-                                    (current-thread))
-                                  delay
-                                  #:use-errortrace? et?))
-  (define periodic-thread
-    (and periodic-renderer
-         (let ([delay (car periodic-renderer)]
-               [renderer (cadr periodic-renderer)])
-           (define (loop)
-             (sleep delay)
-             (renderer (analyze-samples (sampler 'get-snapshots)))
-             (loop))
-           (thread loop))))
-  (define (run) (for/last ([i (in-range rpt)]) (thunk)))
-  (begin0 (with-handlers ([void (λ (e) (eprintf "profiled thunk error: ~a\n"
-                                                (if (exn? e)
-                                                    (exn-message e)
-                                                    (format "~e" e))))])
-            (if threads?
-                (parameterize ([current-custodian cust]) (run))
-                (run)))
-    (when periodic-thread (kill-thread periodic-thread))
-    (sampler 'stop)
-    (renderer (analyze-samples (sampler 'get-snapshots)))))
-
-(define-syntax (profile stx)
-  (syntax-case stx ()
-    [(_ x ...)
-     (let loop ([expr #f] [kwds '()] [xs (syntax->list #'(x ...))])
-       (cond
-         [(null? xs)
-          (if expr
-            (with-syntax ([expr expr] [kwds (reverse kwds)])
-              #'(profile-thunk (λ () expr) . kwds))
-            (raise-syntax-error 'profile "missing expression" stx))]
-         [(keyword? (syntax-e (car xs)))
-          (if (pair? (cdr xs))
-            (loop expr (list* (cadr xs) (car xs) kwds) (cddr xs))
-            ;; let #%app throw the error
-            (loop expr (cons (car xs) kwds) (cdr xs)))]
-         [expr (raise-syntax-error 'profile "redundant expresion given"
-                                   stx (car xs))]
-         [else (loop (car xs) kwds (cdr xs))]))]))
-
-#|
-
-(define (fib1 n) (if (<= n 1) n (+ (fib1 (- n 1)) (fib1 (- n 2)))))
-(define (fib22 n) (if (<= n 2) 1 (+ (fib22 (- n 1)) (fib22 (- n 2)))))
-(define (fib3 n)
-  (for ([i (in-range 100000000)]) (* i 3))
-  (if (<= n 2) 1 (+ (fib22 (- n 1)) (fib22 (- n 2)))))
-(define (fibs n) (+ (fib1 n) (fib22 n) (fib3 n)))
-
-(define (foo n)
-  (define ch (make-channel))
-  (define (bg-fib) (channel-put ch (fib1 n)))
-  (thread bg-fib)
-  (list (fibs n) (channel-get ch)))
-
-(require "render-graphviz.rkt")
-
-(profile ;(fibs 40)
-         ;(dynamic-require '(lib "scribblings/reference/reference.scrbl") #f)
-         (foo 40)
-         ;#:render render
-         #:threads #t
-         #:periodic-renderer
-         (list 0.5 text:render)
-         )
-|#
-
-(module+ test
-  (require rackunit racket/string racket/list)
-  ;; `profile' and `profile-thunk' should return the value of the
-  ;; profiled expression
-  (check-equal?
-   (profile (for/last ([i (in-range 1000 5 -1)])
-              (string-join (map number->string (range i)))))
-   "0 1 2 3 4 5")
-  (check-equal?
-   (profile-thunk (lambda () (for/last ([i (in-range 1000 5 -1)])
-                               (string-join (map number->string (range i))))))
-   "0 1 2 3 4 5"))
diff --git a/pkgs/profile-pkgs/profile-lib/render-graphviz.rkt b/pkgs/profile-pkgs/profile-lib/render-graphviz.rkt
deleted file mode 100644
index 2a0935902e..0000000000
--- a/pkgs/profile-pkgs/profile-lib/render-graphviz.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang racket/base
-
-(provide render)
-
-(require "analyzer.rkt" "utils.rkt")
-
-(define (render profile
-                #:hide-self [hide-self% 1/100]
-                #:hide-subs [hide-subs% 2/100])
-  (define *-node (profile-*-node profile))
-  (define hidden (get-hidden profile hide-self% hide-subs%))
-  (define nodes  (remq* hidden (profile-nodes profile)))
-  (define total-time (max 1e-20 (profile-total-time profile)))
-  (define node->
-    (let ([t (make-hasheq)])
-      (for ([node (in-list nodes)] [idx (in-naturals 1)])
-        (define id (node-id node))
-        (define src (node-src node))
-        (hash-set! t node
-                   (list (format "node~a" idx)
-                         (if id
-                           (format "~a" id)
-                           (regexp-replace #rx"^.*/"
-                                           (format-source (node-src node))
-                                           "")))))
-      (λ (mode node)
-        ((case mode [(index) car] [(label) cadr]) (hash-ref t node)))))
-  (define max-self%
-    (/ (for/fold ([m 0]) ([node (in-list nodes)]) (max m (node-self node)))
-       total-time))
-  (printf "digraph Profile {\n")
-  (for ([node (in-list nodes)])
-    (define self% (/ (node-self node) total-time))
-    (printf "~a [" (node-> 'index node))
-    (printf "label=~s, " (node-> 'label node))
-    (printf "fillcolor=\"1,~a,1\", " (exact->inexact (/ self% max-self%)))
-    (printf "style=filled];\n")
-    (for ([edge (in-list (node-callees node))])
-      (define callee (edge-callee edge))
-      (unless (or (eq? *-node callee) (memq callee hidden))
-        (printf "~a -> ~a;\n" (node-> 'index node) (node-> 'index callee)))))
-  (printf "}\n"))
diff --git a/pkgs/profile-pkgs/profile-lib/render-text.rkt b/pkgs/profile-pkgs/profile-lib/render-text.rkt
deleted file mode 100644
index abbc6afc83..0000000000
--- a/pkgs/profile-pkgs/profile-lib/render-text.rkt
+++ /dev/null
@@ -1,139 +0,0 @@
-#lang at-exp racket/base
-
-(provide render)
-
-(require "analyzer.rkt" "utils.rkt" racket/list racket/string)
-
-(define (f:msec msec)
-  (number->string (round (inexact->exact msec))))
-
-(define (f:msec* msec)
-  (string-append (f:msec msec) "ms"))
-
-(define (display-table aligns table)
-  ;; * thunks are used for cells that are ignored when inspecting widths
-  ;; * chars are used for filler cells
-  (define (display-line strings)
-    (printf "~a\n" (regexp-replace #rx" +$" (string-append* strings) "")))
-  (define widths
-    (let loop ([table table])
-      (define table* (filter pair? table))
-      (if (null? table*) '()
-          (cons (apply max
-                       (filter-map
-                        (λ (x) (and (string? (car x)) (string-length (car x))))
-                        table*))
-                (loop (map cdr table*))))))
-  (for ([row (in-list table)])
-    (display-line
-     (for/list ([cell  (in-list row)]
-                [width (in-list widths)]
-                [align (in-list aligns)])
-       (define cell*
-         (cond [(char? cell) (make-string width cell)]
-               [(procedure? cell) (cell)]
-               [else cell]))
-       (define pad
-         (make-string (max 0 (- width (string-length cell*))) #\space))
-       (case align
-         [(l) (string-append cell* pad)]
-         [(r) (string-append pad cell*)]
-         [else (error 'internal-error "poof")])))))
-
-(define (render profile
-                #:truncate-source [truncate-source 50]
-                #:hide-self       [hide-self% 1/100]
-                #:hide-subs       [hide-subs% 2/100])
-  (define (show . xs)
-    (let loop ([x xs])
-      (cond [(or (not x) (null? x) (void? x)) (void)]
-            [(pair? x) (loop (car x)) (loop (cdr x))]
-            [else (display x)]))
-    (newline))
-  (define total-time    (profile-total-time    profile)) ;!! are these two
-  (define cpu-time      (profile-cpu-time      profile)) ;!! swapped?
-  (define sample-number (profile-sample-number profile))
-  (define granularity   (if (zero? sample-number) 0        ;!! this might
-                            (/ total-time sample-number))) ;!! be wrong
-  (define threads+times (profile-thread-times  profile))
-  (define *-node        (profile-*-node profile))
-  (define hidden        (get-hidden profile hide-self% hide-subs%))
-  (define nodes         (remq* hidden (profile-nodes profile)))
-  (define node->
-    (let ([t (make-hasheq)])
-      (for ([node (in-list nodes)] [idx (in-naturals 1)])
-        (define index (format "[~a]" idx))
-        (define label (format "~a" (or (node-id node) '???)))
-        (hash-set! t node (list index label @string-append{@label @index})))
-      (λ (mode node)
-        ((case mode [(index) car] [(label) cadr] [(sub-label) caddr])
-         (hash-ref t node)))))
-  (define (sep ch) (list ch ch ch ch ch ch ch ch ch ch))
-  (define =sep (sep #\=))
-  (define -sep (sep #\-))
-  @show{
-    Profiling results
-    -----------------
-      Total cpu time observed: @f:msec*[total-time] (out of @f:msec*[cpu-time])
-      Number of samples taken: @sample-number (once every @f:msec*[granularity])
-    }
-  (when (> (length threads+times) 1)
-    @show{  Threads observed:        @(length threads+times)})
-  (when (pair? hidden)
-    (define hidden# (length hidden))
-    (define nodes#  (length (profile-nodes profile)))
-    (define self%   @string-append{self<@(format-percent (or hide-self% 0))})
-    (define subs%   @string-append{local<@(format-percent (or hide-subs% 0))})
-    (define %s      (cond [(not hide-self%) subs%]
-                          [(not hide-subs%) self%]
-                          [else @string-append{@self% and @subs%}]))
-    @show{  (Hiding functions with @|%s|: @hidden# of @nodes# hidden)})
-  (newline)
-  (display-table
-   '(r l r l l r l l l r l l)
-   (append*
-    `(,=sep
-      ("   " " " "   ""     " " " "  ""     " " " "  Caller")
-      ("Idx" " " "To""tal   " " " "Se""lf   " " " "Name+src" "Local%")
-      ("   " " " " ms""(pct)" " " "ms""(pct)" " " "  Callee")
-      ,=sep)
-    (for/list ([node (in-list nodes)])
-      (define index  (node-> 'index node))
-      (define name   (node-> 'label node))
-      (define total  (node-total node))
-      (define totalS (f:msec total))
-      (define total% @string-append{(@(format-percent total total-time))})
-      (define self   (node-self node))
-      (define selfS  (f:msec self))
-      (define self%  @string-append{(@(format-percent self total-time))})
-      (define name+src
-        (let* ([src      (format-source (node-src node))]
-               [src-len  (string-length src)]
-               [name-len (string-length name)])
-          (string-append
-           name " "
-           ;; truncate-source only truncates the source
-           (let* ([n (and truncate-source
-                          ((+ src-len name-len 1) . - . truncate-source))]
-                  [n (and n (positive? n) (- src-len n 3))])
-             (cond [(not n) src]
-                   [(n . <= . 0) "..."]
-                   [else (string-append "..."
-                                        (substring src (- src-len n)))])))))
-      (define (sub get-edges get-node get-node-time)
-        (for*/list ([edge (in-list (get-edges node))]
-                    [sub  (in-list (list (get-node edge)))] ; <-- hack...
-                    #:unless (or (eq? *-node sub)           ; <-- ...for this
-                                 (memq sub hidden)))
-          (define name   (node-> 'sub-label sub))
-          (define local% (format-percent (get-node-time edge) total))
-          `("" "" "" "" "" "" "" ""
-            ,(string-append "  " name) ,local%
-            "" "")))
-      `(,@(reverse (sub node-callers edge-caller edge-caller-time))
-        (,(node-> 'index node)
-         " " ,totalS ,total%
-         " " ,selfS  ,self%
-         " " ,(λ () name+src))
-        ,@(sub node-callees edge-callee edge-callee-time)
-        ,-sep)))))
diff --git a/pkgs/profile-pkgs/profile-lib/sampler.rkt b/pkgs/profile-pkgs/profile-lib/sampler.rkt
deleted file mode 100644
index a130a7aeea..0000000000
--- a/pkgs/profile-pkgs/profile-lib/sampler.rkt
+++ /dev/null
@@ -1,179 +0,0 @@
-#lang racket/base
-
-;; The core profiler sample collector
-;; (This module is a private tool for collecting profiling data, and should not
-;; be used as is.)
-
-(provide create-sampler)
-
-(require errortrace/errortrace-key)
-
-;; (cons sexp srcloc) -> (cons sexp srcloc)
-;; abbreviate the expression for concise reports
-;; we take the first symbol we can find, and wrap it in a stub expression
-(define (errortrace-preprocess frame)
-  (cons (and (car frame)
-             (let loop ([e (car frame)])
-               (cond [(symbol? e) (list e '...)]
-                     [(pair? e) (loop (car e))]
-                     [else (error 'errortrace-preprocess
-                                  "unexpected frame: ~a" frame)])))
-        (and (cdr frame)
-             (apply srcloc (cdr frame)))))
-
-;; create-sampler : creates a sample collector thread, which tracks the given
-;; `to-track' value every `delay' seconds.
-;; Uses errortrace annotations when #:use-errortrace? is specified, otherwise
-;;   uses the native stack traces provided by `cms->context`.
-;; * The input value can be either a thread (track just that thread), a
-;;   custodian (track all threads managed by the custodian), or a list of
-;;   threads and/or custodians.  If a custodian is given, it must be
-;;   subordinate to the current custodian or to the given super custodian.
-;;   Also optionally takes a list of continuation mark keys, which will be
-;;   monitored in addition to the stack trace continuation mark key.
-;; * The collected values are (<thread-id> <thread-time> . <stack>), where
-;;   - The <thread-id> is an integer number identifying the thread, starting
-;;     from 0.  If the collected data has thread ids in a 0..N range
-;;     (exclusive) , then there were N threads that were observed.  (This can
-;;     be relevant when tracking a custodian, where threads can change
-;;     dynamically.)
-;;   - The <thread-time> is the result of `current-process-milliseconds' for
-;;     the thread that this sample came from.  Note that these numbers will not
-;;     start at 0, since threads are likely to run before a sample is
-;;     collected.
-;;   - Finally, the <stack> part is a snapshot of the thread's stack, as
-;;     grabbed by `continuation-mark-set->context'.  The values in these
-;;     snapshots are interned to reduce memory load.
-;;   The results are collected sequentially, so they're always sorted from the
-;;   newest to the oldest.  Remember that these results should be considered
-;;   private for the profiler collection, and can change when more information
-;;   needs to be collected.
-;; * Returns a "controller" function that accepts messages to control the
-;;   sampler thread.  The current set of messages that the controller
-;;   understands are:
-;;   - 'pause and 'resume: stops or resumes collecting samples.  These messages
-;;     can be nested.  Note that the thread will continue running it just won't
-;;     collect snapshots.
-;;   - 'stop: kills the collector thread.  Should be called when you have your
-;;     data.  (There is no message to start a new sampler thread, although
-;;     adding one will not be difficult.)
-;;   - 'set-tracked! <new>: changes the thread/s and/or custodian/s to track.
-;;     (Custodians should still be subordinate to the original one or to the
-;;     given argument.)
-;;   - 'set-delay! <new>: changes the sampling delay.  This means that we won't
-;;     have a direct correlation between the number of samples and the time
-;;     they represent -- but the samples are statistical snapshots anyway, and
-;;     the results are not formulated in terms of time spent.  (The time spent
-;;     could be added of course, but it is best to do that in terms of the
-;;     start/stop times)
-;;   - 'get-snapshots: returns the currently collected list of snapshots.  Note
-;;     that this can be called multiple times, each will return the data that
-;;     is collected up to that point in time.
-;;   - 'get-custom-snapshots: returns the currently collected list of custom
-;;     key snapshots. Returns a list of samples, where each sample is in the
-;;     same format as the output of continuation-mark-set->list*.
-(define (create-sampler to-track delay
-                        [super-cust  (current-custodian)]
-                        [custom-keys #f]
-                        #:use-errortrace? [do-errortrace #f])
-  ;; the collected data
-  (define snapshots '())
-  ;; listof (cons continuation-mark-key value/#f)
-  (define custom-snapshots '())
-  ;; intern the entries (which are (cons id/#f srcloc/#f))
-  (define entry-table (make-hash))
-  (define (intern-entry entry)
-    (define key (or (cdr entry) (car entry)))
-    (define en  (hash-ref entry-table key #f))
-    (if en
-      ;; ELI: is this sanity check needed?
-      ;; (if (equal? en entry)
-      ;;   en
-      ;;   (error 'profile "internal error: assumption invalid"))
-      en
-      (begin (hash-set! entry-table key entry) entry)))
-  (define (validate to-track who)
-    (unless (or (not custom-keys) (list? custom-keys))
-      (raise-type-error
-       who "list of continuation mark keys" custom-keys))
-    (let loop ([t to-track])
-      (cond
-        [(thread? t)]
-        [(list? t) (for-each loop t)]
-        [(not (custodian? t))
-         (raise-type-error
-          who "thread, custodian, or a list of threads/custodians" to-track)]
-        ;; test that it's subordinate
-        [(with-handlers ([exn:fail:contract? (λ (_) #t)])
-           (custodian-managed-list t super-cust) #f)
-         (error who "got an insubordinate custodian")])))
-  (define paused 0)
-  (define thread-id
-    (let ([next-id 0] [t (make-weak-hasheq)])
-      (λ (thd)
-        (or (hash-ref t thd #f)
-            (let ([id next-id])
-              (set! next-id (add1 next-id))
-              (hash-set! t thd id)
-              id)))))
-  (define (sampler)
-    (sleep delay)
-    (when (paused . <= . 0)
-      (let loop ([t to-track])
-        (cond [(thread? t)
-               (unless (eq? t sampler-thread)
-                 (when custom-keys
-                   (set! custom-snapshots
-                         (cons (continuation-mark-set->list*
-                                (continuation-marks t)
-                                custom-keys) ; frames
-                               custom-snapshots)))
-                 (set! snapshots
-                       (cons (list* (thread-id t)
-                                    (current-process-milliseconds t)
-                                    (if do-errortrace
-                                        (for/list ([frame (in-list
-                                                           (continuation-mark-set->list
-                                                            (continuation-marks t)
-                                                            errortrace-key))])
-                                            (intern-entry (errortrace-preprocess frame)))
-                                        (map intern-entry
-                                             (continuation-mark-set->context
-                                              (continuation-marks t)))))
-                             snapshots)))]
-              [(custodian? t)
-               (for-each loop (custodian-managed-list t super-cust))]
-              ;; cannot assume that it's a list: we might get other values from
-              ;; a custodian managed list
-              [(list? t) (for-each loop t)])))
-    (sampler))
-  (define cpu-time   0)
-  (define start-time (current-process-milliseconds))
-  (define (add-time)
-    (when (paused . <= . 0)
-      (define cur (current-process-milliseconds))
-      (set! cpu-time (+ cpu-time (- cur start-time)))
-      (set! start-time cur)))
-  (define (ignore-time)
-    (when (paused . <= . 0)
-      (set! start-time (current-process-milliseconds))))
-  (define sampler-thread
-    (begin (validate to-track 'create-sampler)
-           (thread sampler)))
-  ;; use a sema to avoid mutations from different threads, the sampler thread
-  ;; is only reading these values so it doesn't use it.
-  (define sema (make-semaphore 1))
-  (define (sampler-controller msg [arg #f])
-    (define-syntax-rule (w/sema body ...)
-      (call-with-semaphore sema (λ () body ...)))
-    (case msg
-      [(pause)  (w/sema (add-time) (set! paused (add1 paused)))]
-      [(resume) (w/sema (set! paused (sub1 paused)) (ignore-time))]
-      [(stop)   (kill-thread sampler-thread) (add-time) (set! paused +inf.0)]
-      [(set-tracked!) (validate arg 'sampler-controller)
-                      (w/sema (set! to-track arg))]
-      [(set-delay!)   (w/sema (set! delay arg))]
-      [(get-snapshots) (add-time) (cons cpu-time snapshots)]
-      [(get-custom-snapshots) custom-snapshots]
-      [else (error 'sampler-controller "unknown message: ~e" msg)]))
-  sampler-controller)
diff --git a/pkgs/profile-pkgs/profile-lib/structs.rkt b/pkgs/profile-pkgs/profile-lib/structs.rkt
deleted file mode 100644
index 0d0c931368..0000000000
--- a/pkgs/profile-pkgs/profile-lib/structs.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang racket/base
-
-;; Struct definitions for the profiler
-
-;; An encapsulation of an analyzed profile call graph:
-;; - total-time: the total time observed in msec (this is generally different
-;;   than the time it took to run the profile).
-;; - sample-number: the number of samples taken.
-;; - thread-times: a list of (<thread-id> . msec) for the time spent in
-;;   observed threads.
-;; - nodes: the list of call-graph nodes sorted by their total time.
-;; - *-node: a special node that is connected as a "caller" for all toplevel
-;;   functions and a "callee" for all leaf functions.  It will also be
-;;   identifiable by having both id and src fields being #f.  Can be used to
-;;   start a graph traversal from the top or the bottom.
-(provide (struct-out profile))
-(struct profile
-  (total-time cpu-time sample-number thread-times nodes *-node))
-
-;; An entry for a single profiled function:
-;; - id, src: the corresponding values from `continuation-mark-set->context'.
-;; - thread-ids: the list of thread identifiers this function has been seen in.
-;; - total: total msecs it participated in (= time in it, including callees).
-;; - self: msecs where it was at the top of the stack (= time in its own code).
-;; - callers, callees: a list of `edge' values for the time spent while it was
-;;   called by the repective <node>, or it called it, sorted in decreasing msec
-;;   time.
-;; Note that the sum of caller/callee edges including the special `*-node'
-;; should be equal to the `total' time.  So the edge from/to the `*-node' can
-;; be used to get the time spent as a leaf or as a root divided by the number
-;; of time the function appeared on the stack: so this value can be displayed
-;; in the call-graph and the numbers will sum up nicely to a 100%.
-(provide (struct-out node))
-(define-struct node (id src thread-ids total self callers callees)
-  #:mutable
-  #:property prop:custom-write
-  (λ (node o w?)
-    (fprintf o "#<node:~s>"
-             (or (node-id node) (if (node-src node) '??? 'ROOT)))))
-
-;; An edge representing function calls between two nodes:
-;; - total: the total time spent while the call was anywhere on the stack.
-;; - caller, callee: the two relevant `node' values.
-;; - caller-time, callee-time: the time that the caller/callee spent in this
-;;   call relative to the callee/caller (different from the above time because
-;;   each stack sample's time is divided by the number of times the
-;;   caller/callee appears in that slice).
-(provide (struct-out edge))
-(define-struct edge (total caller caller-time callee callee-time)
-  #:mutable
-  #:property prop:custom-write
-  (λ (edge o w?)
-    (fprintf o "#<edge:~s-~s>"
-             (or (node-id (edge-caller edge)) '???)
-             (or (node-id (edge-callee edge)) '???))))
diff --git a/pkgs/profile-pkgs/profile-lib/utils.rkt b/pkgs/profile-pkgs/profile-lib/utils.rkt
deleted file mode 100644
index 8d1b489da2..0000000000
--- a/pkgs/profile-pkgs/profile-lib/utils.rkt
+++ /dev/null
@@ -1,223 +0,0 @@
-#lang racket/base
-
-(require "structs.rkt" racket/list)
-
-;; Format a percent number, possibly doing the division too.  If we do the
-;; division, then be careful: if we're dividing by zero, then make the result
-;; zero.  This is useful if the total time is zero because we didn't see any
-;; activity (for example, the profiled code is just doing a `sleep'), in which
-;; case all times will be 0.
-(provide format-percent)
-(define format-percent
-  (case-lambda
-    [(percent) (define p (inexact->exact (round (* percent 1000))))
-               (format "~a.~a%" (quotient p 10) (modulo p 10))]
-    [(x y) (format-percent (if (zero? y) 0 (/ x y)))]))
-
-(provide format-source)
-(define (format-source src)
-  (if src
-    (format "~a:~a"
-            (srcloc-source src)
-            (if (srcloc-line src)
-              (format "~a:~a" (srcloc-line src) (srcloc-column src))
-              (format "#~a" (srcloc-position src))))
-    "(unknown source)"))
-
-;; Hide a node if its self time is smaller than the self threshold *and* all of
-;; its edges are below the sub-node threshold too -- this avoids confusing
-;; output where a node does not have an entry but appears as a caller/callee.
-(provide get-hidden)
-(define (get-hidden profile hide-self% hide-subs%)
-  (define self% (or hide-self% 0))
-  (define subs% (or hide-subs% 0))
-  (define total-time (profile-total-time profile))
-  (define (hide? node)
-    (define (hide-sub? get-subs edge-sub edge-sub-time)
-      (define %s
-        (map (λ (edge)
-               (define total (node-total (edge-sub edge)))
-               (if (zero? total) 0 (/ (edge-sub-time edge) total)))
-             (get-subs node)))
-      (subs% . >= . (apply max %s)))
-    (and (self% . >= . (/ (node-self node) total-time))
-         (hide-sub? node-callees edge-callee edge-caller-time)
-         (hide-sub? node-callers edge-caller edge-callee-time)))
-  (cond [(and (<= self% 0) (<= subs% 0)) '()]
-        [(zero? total-time) (profile-nodes profile)]
-        [else (filter hide? (profile-nodes profile))]))
-
-;; A topological sort of nodes, starting from node `root' (which will be given
-;; as the special *-node).  The result is a list of node lists, each one
-;; corresponds to one level.  Conceptually, the root node is always the only
-;; item in the first level, so it is not included in the result.  This is done
-;; by assigning layers to nodes in a similar way to section 9.1 of "Graph
-;; Drawing: Algorithms for the Visualization of Graphs" by Tollis, Di Battista,
-;; Eades, and Tamassia.  It uses a technique similar to the one described in
-;; section 9.4 for removing cycles in the input graph, but improved by the fact
-;; that we have weights on input/output edges (this is the only point that is
-;; specific to the fact that it's a profiler graph).  Note that this is useful
-;; for a graphical rendering of the results, but it's also useful to sort the
-;; results in a way that makes more sense.
-(provide topological-sort)
-(define (topological-sort root)
-
-  ;; Make `nodes+io-times' map a node to an mcons of total input and total
-  ;; output times ignoring edges to/from the *-node and self edges, the order
-  ;; is the reverse of how we scan the graph
-  (define (get-node+io node)
-    (define (sum node-callers/lees edge-caller/lee edge-callee/ler-time)
-      (for/fold ([sum 0]) ([e (in-list (node-callers/lees node))])
-        (define n (edge-caller/lee e))
-        (if (or (eq? n node) (eq? n root)) sum
-            (+ sum (edge-callee/ler-time e)))))
-    (cons node (mcons (sum node-callers edge-caller edge-callee-time)
-                      (sum node-callees edge-callee edge-caller-time))))
-  (define nodes+io-times
-    (let loop ([todo (list root)] [r '()])
-      (if (pair? todo)
-        (let* ([cur (car todo)] [todo (cdr todo)]
-               [r (if (eq? cur root) r (cons (get-node+io cur) r))])
-          (loop (append todo ; append new things in the end, so it's a BFS
-                        (filter-map (λ (e)
-                                      (define lee (edge-callee e))
-                                      (and (not (memq lee todo))
-                                           (not (assq lee r))
-                                           lee))
-                                    (node-callees cur)))
-                r))
-        ;; note: the result does not include the root node
-        r)))
-
-  ;; Now create a linear order similar to the way section 9.4 describes, except
-  ;; that this uses the total caller/callee times to get an even better
-  ;; ordering (also, look for sources and sinks in every step).  Note that the
-  ;; list we scan is in reverse order.
-  (define acyclic-order
-    (let loop ([todo nodes+io-times] [rev-left '()] [right '()])
-      ;; heuristic for best sources: the ones with the lowest intime/outtime
-      (define (best-sources)
-        (let loop ([todo todo] [r '()] [best #f])
-          (if (null? todo)
-            r
-            (let* ([1st (car todo)]
-                   [rest (cdr todo)]
-                   [ratio (/ (mcar (cdr 1st)) (mcdr (cdr 1st)))])
-              (if (or (not best) (ratio . < . best))
-                (loop rest (list 1st) ratio)
-                (loop rest (if (ratio . > . best) r (cons 1st r)) best))))))
-      (if (pair? todo)
-        (let* ([sinks   (filter (λ (x) (zero? (mcdr (cdr x)))) todo)]
-               [todo    (remq* sinks todo)]
-               [sources (filter (λ (x) (zero? (mcar (cdr x)))) todo)]
-               ;; if we have no sources and sinks, use the heuristic
-               [sources (if (and (null? sinks) (null? sources))
-                          (best-sources) sources)]
-               [todo    (remq* sources todo)]
-               [sinks   (map car sinks)]
-               [sources (map car sources)])
-          ;; remove the source and sink times from the rest
-          (for* ([nodes (in-list (list sources sinks))]
-                 [n (in-list nodes)])
-            (for ([e (in-list (node-callees n))])
-              (define x (assq (edge-callee e) todo))
-              (when x
-                (set-mcar! (cdr x) (- (mcar (cdr x)) (edge-callee-time e)))))
-            (for ([e (in-list (node-callers n))])
-              (define x (assq (edge-caller e) todo))
-              (when x
-                (set-mcdr! (cdr x) (- (mcdr (cdr x)) (edge-caller-time e))))))
-          (loop todo (append (reverse sources) rev-left) (append sinks right)))
-        ;; all done, get the order
-        (append (reverse rev-left) right))))
-
-  ;; We're done, so make `t' map nodes to their callers with only edges that
-  ;; are consistent with this ordering
-  (define t
-    (let ([t (make-hasheq)])
-      (let loop ([nodes acyclic-order])
-        (when (pair? nodes)
-          (define ler (car nodes))
-          (define rest (cdr nodes))
-          (unless (hash-ref t ler #f) (hash-set! t ler '()))
-          (for ([e (in-list (node-callees ler))])
-            (define lee (edge-callee e))
-            (when (memq lee rest) ; only consistent edges
-              ;; note that we connect each pair of nodes at most once, and
-              ;; never a node with itself
-              (hash-set! t lee (cons ler (hash-ref t lee '())))))
-          (loop rest)))
-      t))
-
-  ;; finally, assign layers using the simple method from section 9.1: sources
-  ;; are at 0, and other nodes are placed at one layer after their parents
-  (define height 0)
-  (for ([node (in-list acyclic-order)])
-    (let loop ([node node])
-      (define x (hash-ref t node))
-      (if (number? x)
-        x
-        (let ([max (add1 (for/fold ([m -1]) ([ler (in-list x)])
-                           (max m (loop ler))))])
-          (when (max . > . height) (set! height max))
-          (hash-set! t node max)
-          max))))
-  (define layers (make-vector (add1 height) '()))
-  (for ([node (in-list acyclic-order)])
-    (unless (eq? node root) ; filter out the root
-      (define l (hash-ref t node))
-      (vector-set! layers l (cons node (vector-ref layers l)))))
-  ;; in almost all cases, the root is the full first layer (in a few cases it
-  ;; can be there with another node, eg (* -> A 2-> B 3-> A)), but be safe and
-  ;; look for any empty layer
-  (filter pair? (vector->list layers)))
-
-;; gets a list of thread-id and data for that thread beginning with the
-;; millisecond count, and returns a similar list where the samples begin with
-;; the time spent for that sample.  The time spent is taken as half of the two
-;; touching ranges; for example, if there are three samples showing snapshot
-;; times of 10, 20, 60, then the middle one is assumed to have a time of 25.
-;; For the first and last samples, the time is twice the half of the single
-;; touching range -- with this example, this would be 10 for the first and 40
-;; for the last.  If there is a thread with just one sample, it is dropped.
-(provide get-times)
-(define (get-times samples)
-  (cond
-    ;; nothing to do
-    [(null? samples) '()]
-    ;; throw out a single sample
-    [(null? (cdr samples)) '()]
-    [else (let loop ([samples samples]
-                     [prevs   (cons #f (map car samples))]
-                     [r       '()])
-            (if (null? samples)
-              (reverse r)
-              (let* ([prev (car prevs)]
-                     [cur  (caar samples)]
-                     [data (cdar samples)]
-                     [prevs (cdr prevs)]
-                     [samples (cdr samples)]
-                     [next (and (pair? samples) (caar samples))])
-                (loop samples prevs
-                      (cons (cons (if next
-                                    ;; not the last: there must be a next
-                                    (if prev (/ (- next prev) 2) (- next cur))
-                                    ;; last one: there must be a prev
-                                    (- cur prev))
-                                  data)
-                            r)))))]))
-
-(module+ test
-  (require rackunit)
-  (check-equal? (get-times '())
-                '())
-  (check-equal? (get-times '([10 a]))
-                '())
-  (check-equal? (get-times '([10 a] [20 b]))
-                '([10 a] [10 b]))
-  (check-equal? (get-times '([10 a] [20 b] [60 c]))
-                '([10 a] [25 b] [40 c]))
-  (check-equal? (get-times '([10 a] [20 b] [30 c] [40 d]))
-                '([10 a] [10 b] [10 c] [10 d]))
-  (check-equal? (get-times '([10 a] [20 b] [60 c] [80 d]))
-                '([10 a] [25 b] [30 c] [20 d])))
diff --git a/pkgs/profile-pkgs/profile-test/LICENSE.txt b/pkgs/profile-pkgs/profile-test/LICENSE.txt
deleted file mode 100644
index 78c7bdb832..0000000000
--- a/pkgs/profile-pkgs/profile-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-profile-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/profile-pkgs/profile-test/info.rkt b/pkgs/profile-pkgs/profile-test/info.rkt
deleted file mode 100644
index 459f4dbf08..0000000000
--- a/pkgs/profile-pkgs/profile-test/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '())
-(define build-deps '("base"
-                     "eli-tester"
-                     "profile-lib"))
-(define update-implies '("profile-lib"))
-
-(define pkg-desc "tests for \"profile\"")
-
-(define pkg-authors '(eli))
diff --git a/pkgs/profile-pkgs/profile-test/tests/profile/analyze.rkt b/pkgs/profile-pkgs/profile-test/tests/profile/analyze.rkt
deleted file mode 100644
index e80b3cb439..0000000000
--- a/pkgs/profile-pkgs/profile-test/tests/profile/analyze.rkt
+++ /dev/null
@@ -1,109 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester profile/structs profile/analyzer
-         racket/match racket/list)
-
-(define A '(A . #f))
-(define B '(B . #f))
-(define C '(C . #f))
-
-(define (analyze cpu+lists)
-  (profile->sexpr
-   (analyze-samples
-    (cons (car cpu+lists)
-          (map (lambda (x) (append (take x 2) (reverse (drop x 2))))
-               (reverse (cdr cpu+lists)))))))
-
-(define (profile->sexpr prof)
-  (define (node-id* node)
-    (or (node-id node) (if (node-src node) '??? '*)))
-  (define (edges->sexprs node get get-time)
-    (for/list ([edge (get node)])
-      `(,(node-id* (edge-caller edge)) -> ,(node-id* (edge-callee edge))
-        time=  ,(get-time edge)
-        total= ,(edge-total edge))))
-  (define (node->sexpr node)
-    `(,(node-id* node)
-          total=   ,(node-total node)
-          self=    ,(node-self node)
-          callers: ,@(edges->sexprs node node-callers edge-caller-time)
-          callees: ,@(edges->sexprs node node-callees edge-callee-time)
-          threads= ,(node-thread-ids node)))
-  `(total=   ,(profile-total-time    prof)
-    samples= ,(profile-sample-number prof)
-    cpu=     ,(profile-cpu-time      prof)
-    thread-times= ,(profile-thread-times prof)
-    ,@(map node->sexpr (cons (profile-*-node prof) (profile-nodes prof)))))
-
-(provide analyze-tests)
-(module+ main (analyze-tests))
-(define (analyze-tests)
-  (test
-
-   (match (analyze `(10
-                     [0 0 ,A]
-                     [0 1 ,A]))
-     [`(total= 2 samples= 2 cpu= 10 thread-times= ([0 . 2])
-        [* total= 2 self= 0
-           callers: [A -> * time= 2 total= 2]
-           callees: [* -> A time= 2 total= 2]
-           threads= ()]
-        [A total= 2 self= 2
-           callers: [* -> A time= 2 total= 2]
-           callees: [A -> * time= 2 total= 2]
-           threads= (0)])
-      'ok]
-     [bad (error 'test ">>> ~s" bad)])
-
-   ;; demonstrates different edge-caller/lee-times
-   (match (analyze `(10
-                     [0 0 ,A ,B ,A]
-                     [0 1 ,A ,B ,A]))
-     [`(total= 2 samples= 2 cpu= 10 thread-times= ([0 . 2])
-        [* total= 2 self= 0
-           callers: [A -> * time= 2 total= 2]
-           callees: [* -> A time= 2 total= 2]
-           threads= ()]
-        [A total= 2 self= 2
-           callers: [B -> A time= 2/2 total= 2]
-                    [* -> A time= 2/2 total= 2]
-           callees: [A -> B time= 2/2 total= 2]
-                    [A -> * time= 2/2 total= 2]
-           threads= (0)]
-        [B total= 2 self= 0
-           callers: [A -> B time= 2 total= 2]
-           callees: [B -> A time= 2 total= 2]
-           threads= (0)])
-      'ok]
-     [bad (error 'test ">>> ~s" bad)])
-
-   (match (analyze `(10
-                     [0 0 ,A ,B ,A]
-                     [0 1 ,A ,C ,A]
-                     [0 2 ,A ,C ,A]
-                     [0 3 ,A ,C ,A]))
-     [`(total= 4 samples= 4 cpu= 10 thread-times= ([0 . 4])
-        [* total= 4 self= 0
-           callers: [A -> * time= 4 total= 4]
-           callees: [* -> A time= 4 total= 4]
-           threads= ()]
-        [A total= 4 self= 4
-           callers: [* -> A time= 4/2 total= 4]
-                    [C -> A time= 3/2 total= 3]
-                    [B -> A time= 1/2 total= 1]
-           callees: [A -> * time= 4/2 total= 4]
-                    [A -> C time= 3/2 total= 3]
-                    [A -> B time= 1/2 total= 1]
-           threads= (0)]
-        [C total= 3 self= 0
-           callers: [A -> C time= 3 total= 3]
-           callees: [C -> A time= 3 total= 3]
-           threads= (0)]
-        [B total= 1 self= 0
-           callers: [A -> B time= 1 total= 1]
-           callees: [B -> A time= 1 total= 1]
-           threads= (0)])
-      'ok]
-     [bad (error 'test ">>> ~s" bad)])
-
-   ))
diff --git a/pkgs/profile-pkgs/profile-test/tests/profile/main.rkt b/pkgs/profile-pkgs/profile-test/tests/profile/main.rkt
deleted file mode 100644
index 3ca589c7b7..0000000000
--- a/pkgs/profile-pkgs/profile-test/tests/profile/main.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester "topsort.rkt" "analyze.rkt")
-
-(test do (topological-sort-tests)
-      do (analyze-tests))
diff --git a/pkgs/profile-pkgs/profile-test/tests/profile/topsort.rkt b/pkgs/profile-pkgs/profile-test/tests/profile/topsort.rkt
deleted file mode 100644
index 3420ce8abf..0000000000
--- a/pkgs/profile-pkgs/profile-test/tests/profile/topsort.rkt
+++ /dev/null
@@ -1,162 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester profile/structs profile/utils
-         racket/list racket/match)
-
-(define arrow-sym->times
-  ;; arrows with caller/callee times
-  ;; `->' defaults to `1->1', and `N->' defaults to `N->N'
-  ;; note: A 1->2 B means that the caller time is 2 and the callee time is one,
-  ;; since the time are wrt the other node.
-  (let ([t (make-hasheq)])
-    (lambda (arr)
-      (hash-ref! t arr
-        (lambda ()
-          (define m
-            (regexp-match #rx"^(?:([0-9]+)|)->(?:([0-9]+)|)$"
-                          (symbol->string arr)))
-          (and m
-               (list (string->number (or (caddr m) (cadr m) "1"))
-                     (string->number (or (cadr m) "1")))))))))
-
-(define (connect! from from-time to to-time)
-  (if (memq from (map edge-caller (node-callers to)))
-    (error (format "bad graph spec in tests, ~s->~s already connected" from to))
-    (let ([edge (make-edge 0 from from-time to to-time)])
-      (set-node-callers! to   (cons edge (node-callers to  )))
-      (set-node-callees! from (cons edge (node-callees from))))))
-
-(define-match-expander arrow
-  (syntax-rules () [(_ ler lee) (app arrow-sym->times (list ler lee))]))
-
-(define (set=? l1 l2) (null? (append (remq* l1 l2) (remq* l2 l1))))
-
-(define (sort-graph . edges)
-  (define names
-    (remove-duplicates (filter (lambda (s) (not (arrow-sym->times s)))
-                               (append* edges))))
-  (define nodes (map (lambda (sym) (make-node sym #f '() 0 0 '() '())) names))
-  (define ->node (make-immutable-hasheq (map cons names nodes)))
-  (for ([edges edges])
-    (let loop ([xs edges])
-      (match xs
-        [(list from (arrow ftime ttime) to (arrow _ _) _ ...)
-         (connect! (hash-ref ->node from) ftime (hash-ref ->node to) ttime)
-         (loop (cddr xs))]
-        [(list from (arrow ftime ttime) to _ ...)
-         (connect! (hash-ref ->node from) ftime (hash-ref ->node to) ttime)
-         (loop (cdddr xs))]
-        ['() (void)])))
-  (let ([sorted (topological-sort (car nodes))])
-    (unless (set=? nodes (cons (car nodes) (append* sorted)))
-      (error 'sort-graph
-             "not all nodes appear in sorted output; expected ~e, got ~e"
-             nodes (cons (car nodes) (append* sorted))))
-    (map (lambda (nodes) (map node-id nodes)) sorted)))
-
-;; `expected' is the desired result, modulo ordering inside the levels
-;; can have more than one if there are several valid outputs
-(define (same-levels graph expected . more-valid)
-  (define sorted (sort-graph graph))
-  (or (ormap (lambda (expected)
-               (and (= (length sorted) (length expected))
-                    (andmap set=? sorted expected)))
-             (cons expected more-valid))
-      (error (format "bad result, got ~s" sorted))))
-
-;; to see a result: (sort-graph '(* -> A)) (exit)
-
-(provide topological-sort-tests)
-(module+ main (topological-sort-tests))
-(define (topological-sort-tests)
-  (test
-
-   ;; sanity check: works with an empty stack
-   ;; actually, this version does get stuck in a loop -- which shouldn't happen
-   ;; in reality since there are no *->* edges
-   ;; (same-levels '(* -> *)
-   ;;              '())
-   ;; instead, just have a single * node:
-   (topological-sort (make-node '* #f '() 0 0 '() '()))
-   => '()
-
-   (same-levels '(* -> A)
-                '((A)))
-
-   (same-levels '(* -> A -> B -> *)
-                '((A) (B)))
-
-   (same-levels '(* -> A -> *
-                  * -> B -> *
-                  A -> A)
-                '((A B)))
-
-   ;; note that ((B) (A)) would also be consistent, but the code organizes for
-   ;; this result
-   (same-levels '(* -> A -> B -> A)
-                '((A) (B)))
-
-   ;; this is an example using the actual times for the A->B->A case that is
-   ;; tested in main.rkt
-   (same-levels '(* 2->1 A 1->2 B 2->1 A 1->2 *)
-                '((A) (B)))
-
-
-   (same-levels '(* -> A 2-> B -> A)
-                '((A) (B)))
-
-   (same-levels '(* -> A 2-> B 3-> A)
-                '((B) (A)))
-
-   (same-levels '(* -> A -> B -> C
-                  * -> C)
-                '((A) (B) (C)))
-
-   (same-levels '(* -> A -> B -> C -> * ; check with *s too
-                  * -> C)
-                '((A) (B) (C)))
-
-   (same-levels '(* -> X -> A -> B -> C
-                       X -> C )
-                '((X) (A) (B) (C)))
-
-   (same-levels '(* -> A  -> B -> C -> *
-                  * -> C 3-> B -> *)
-                '((A C) (B)))
-
-   (same-levels '(* -> A -> B -> A
-                  * -> C)
-                '((A C) (B)))
-
-   (same-levels '(* -> A -> B -> *
-                  * -> B -> A -> *)
-                '((A) (B))
-                '((B) (A)))
-
-   (same-levels '(* -> A
-                  * -> B
-                  B -> B)
-                '((A B)))
-
-   (same-levels '(* -> A
-                  * -> B -> C
-                  * -> C -> B)
-                '((A B) (C))
-                '((A C) (B)))
-
-   ;; Note that X could be pushed to the third level, making it closer to D,
-   ;; but this is not done since for a printout it makes more sense to have all
-   ;; the sources at the top.  (It might make sense to do this compacting in
-   ;; the gui, but even there it might be more convenient to see all roots at
-   ;; the top.)
-   (same-levels '(* -> A -> B -> C -> D -> *
-                  * ->           X -> D)
-                '((X A) (B) (C) (D)))
-
-   (same-levels '(* -> A1 -> A2 -> A3 -> A4 -> A5
-                  * -> B1 -> B2 -> B3
-                  * -> C1
-                  * -> D1 -> D2 -> D3 -> D4)
-                '((A1 B1 C1 D1) (A2 B2 D2) (A3 B3 D3) (A4 D4) (A5)))
-
-    ))
diff --git a/pkgs/profile-pkgs/profile/LICENSE.txt b/pkgs/profile-pkgs/profile/LICENSE.txt
deleted file mode 100644
index ca1cce2e5b..0000000000
--- a/pkgs/profile-pkgs/profile/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-profile
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/profile-pkgs/profile/info.rkt b/pkgs/profile-pkgs/profile/info.rkt
deleted file mode 100644
index 0e4d120dd2..0000000000
--- a/pkgs/profile-pkgs/profile/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("profile-lib"
-               "profile-doc"))
-(define implies '("profile-lib"
-                  "profile-doc"))
-
-(define pkg-desc "Libraries for statistical performance profiling")
-
-(define pkg-authors '(eli))
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/LICENSE.txt b/pkgs/r5rs-pkgs/r5rs-doc/LICENSE.txt
deleted file mode 100644
index 92e6ed8e8c..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-r5rs-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/info.rkt b/pkgs/r5rs-pkgs/r5rs-doc/info.rkt
deleted file mode 100644
index ed582119bb..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/info.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("mzscheme-doc"
-                     "scheme-lib"
-                     "scribble-lib"
-                     "r5rs-lib"
-                     "compatibility-lib"
-                     "racket-doc"))
-(define deps '("base"))
-(define update-implies '("r5rs-lib"))
-
-(define pkg-desc "documentation part of \"r5rs\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/info.rkt b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/info.rkt
deleted file mode 100644
index 2564b3fdce..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("r5rs.scrbl" (multi-page) (legacy 50))))
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/r5rs.scrbl b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/r5rs.scrbl
deleted file mode 100644
index b908910596..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/r5rs.scrbl
+++ /dev/null
@@ -1,435 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          (only-in scribble/core style)
-          scribble/html-properties
-          (for-label (only-meta-in 0 r5rs)
-                     (only-in r5rs syntax-rules ...)
-                     (only-in mzscheme #%plain-module-begin)
-                     (only-in scheme/mpair mmap)
-                     (only-in scheme/contract one-of/c)
-                     (only-in scheme/base
-                              require find-system-path namespace? mcons mcdr
-                              namespace-require namespace-require/copy
-                              read-case-sensitive
-                              read-accept-infix-dot
-                              read-curly-brace-as-paren
-                              read-square-bracket-as-paren
-                              print-vector-length
-                              print-mpair-curly-braces)))
-
-
-@(define r5rs @elem{R@superscript{5}RS})
-@(define drs-doc '(lib "scribblings/drracket/drracket.scrbl"))
-
-@(define r5rs-std (style #f (list (install-resource "scribblings/r5rs-std"))))
-
-@title{R5RS: Legacy Scheme}
-
-The @link[#:style r5rs-std "r5rs-std/index.html"]{The Revised@superscript{5} Report
-on the Algorithmic Language Scheme} defines a dialect of Scheme. We
-use @defterm{@|r5rs|} to refer to both the standard and the language
-defined by the standard.
-
-@margin-note{See @seclink[#:doc '(lib "scribblings/guide/guide.scrbl")
-             "dialects"] for general information about different
-             dialects of Scheme within Racket.}
-
-The default dialect of Lisp provided by @exec{racket} and other
-Racket tools differs from @|r5rs| in many ways, but Racket
-includes tools and libraries for running @|r5rs| programs.
-
-@table-of-contents[]
-
-@redirects[]
-
-@; ----------------------------------------
-
-@section[#:tag "running"]{Running @|r5rs| Programs}
-
-Racket provides several layers of support for programs written
-according to @|r5rs|:
-
-@itemize[
-
- @item{DrRacket provides an @onscreen{R5RS} language, which can be
-       selected via the @menuitem["Language" "Choose Language..."]
-       menu item. See @seclink[#:doc drs-doc "choose-language"
-       #:indirect? #t]{@onscreen{Choose Language...}} in
-       @seclink["top" #:doc drs-doc #:indirect? #t]{the DrRacket
-       documentation} for more information.}
-
- @item{The @exec{plt-r5rs} executable runs an @|r5rs| program or
-       provides a read-eval-print loop for evaluating @|r5rs|
-       expressions and definitions. See @secref["plt-r5rs"] (later in
-       this manual) for more information.}
-
- @item{The @racketmodname[r5rs] library implemented @|r5rs| procedures
-       and syntactic forms. It can also be used with @hash-lang[] to
-       create a module whose body is implemented in an @|r5rs|-like
-       language.  See @secref["r5rs-mod"] (later in this manual) for
-       more information.}
-
- @item{The @racketmodname[r5rs/init] library extends
-       @racketmodname[r5rs] to set parameters (such as
-       case-insensitive symbol reading) for @|r5rs| loading or an
-       @|r5rs| read-eval-print loop. See @secref["r5rs/init-mod"]
-       (later in this manual) for more information.}
-
-]
-
-@; ----------------------------------------
-
-@section[#:tag "plt-r5rs"]{@exec{plt-r5rs}}
-
-The @exec{plt-r5rs} executable runs an @|r5rs| program from a file
-that is supplied on the command line. If no program file is provided
-as a command-line argument, then a read-eval-print loop is started.
-
-Before starting a read-eval-print loop, an initialization file is
-loaded, if it exists. The file is the same as the file reported by
-@racket[(find-system-path 'init-file)], but with the characters
-@litchar{racket} in the filename replaced by @litchar{pltr5rs}. For
-example, on Unix, the file is @filepath{~/.pltr5rsrc}.
-
-By default, @exec{plt-r5rs} departs from @|r5rs| conformance in one
-crucial way: the names of pre-defined functions cannot be redefined at
-the top level. This restriction enables better run-time
-performance. Use the @as-index{@DFlag{no-prim}} command-line
-flag---before a file to load, if any---to obtain the standard behavior
-for primitive bindings (at the cost of performance).
-
-@; ----------------------------------------
-
-@section[#:tag "r5rs-mod"]{@|r5rs| Module Language}
-
-@defmodulelang[r5rs]
-
-As a library, @racketmodname[r5rs] provides the syntactic forms and
-procedures defined by @|r5rs|. When used as a language via
-@hash-lang[], the program is read with the following
-parameterizations:
-
-@racketblock[
-  (read-case-sensitive #f)
-  (read-accept-infix-dot #f)
-  (read-curly-brace-as-paren #f)
-  (read-square-bracket-as-paren #f)
-]
-
-The @racketmodname[r5rs] bindings can be imported into a top-level
-environment, and then evaluation in that top-level environment
-corresponds to @|r5rs|. Use @racket[(namespace-require/copy 'r5rs)]
-with an empty namespace to maximize conformance with @|r5rs|; Using
-@racket[(namespace-require 'r5rs)], in contrast, creates primitive
-bindings as imports, which is the same as using
-@seclink["plt-r5rs"]{@exec{plt-r5rs}} without the @DFlag{no-prim} flag.
-More simply, use @racket[(scheme-report-environment 5)].  See also
-@racketmodname[r5rs/init], which sets reader and printer parameters to
-increase conformance.
-
-Using @racketmodname[r5rs] via @hash-lang[] creates a module whose
-body is implemented with an @|r5rs|-like language. The main difference
-from @|r5rs| is that, as a module language, @racketmodname[r5rs] does
-not allow redefinition of top-level bindings, and expressions
-evaluated through @racket[load] and @racket[eval] cannot automatically
-access bindings defined within the module.
-
-
-@history[#:changed "6.0.1.4" @elem{When an identifier bound by
-                                   @racket[letrec] is referenced
-                                   before it is initialized, an
-                                   exception is raised, instead of
-                                   producing @|undefined-const|.}]
-
-@; --------------------
-
-@subsection{Non-@|r5rs| Bindings from @racketmodname[r5rs]}
-
-In addition to the bindings defined by @|r5rs|, the
-@racketmodname[r5rs] library provides the following bindings from
-@racketmodname[racket/base] (which are not legal identifiers in @|r5rs|
-syntax, so there is no danger of collisions in @|r5rs| programs):
-
-@racketblock[
-#%app #%datum #%top #%top-interaction #%require #%provide
-]
-
-It also provides @racketmodname[racket]'s
-@racket[#%plain-module-begin] as @racket[#%module-begin]. Note that
-@racket[#%require] can be used to import Racket libraries into an
-otherwise @|r5rs| program, and @racket[#%provide] can be used to
-export from a module that is implemented in an @|r5rs|-like language.
-
-@; --------------------
-
-@subsection{Notes on @|r5rs| Functions}
-
-The @racket[cons] of @racketmodname[r5rs] corresponds to
-@racketmodname[racket/base]'s @racket[mcons]. Similarly, @racket[cdr]
-is @racket[mcdr], and @racket[map] is @racketmodname[compatibility/mlist]'s
-@racket[mmap], and so on.
-
-An @|r5rs| @defterm{environment} is implemented as a
-@racket[racket/base] @defterm{namespace}. Also, relative to
-@racket[racket/base], the @racket[expr] passed to @racket[eval] is
-constructed using mutable pairs.
-
-The @racket[scheme-report-environment] function returns a namespace
-containing the bindings of @racketmodname[r5rs].  Procedure values are
-installed into the namespace using @racket[namespace-require/copy], so
-that they can be redefined.
-
-The @racket[null-environment] function returns a namespace
-containing the syntactic forms of @racketmodname[r5rs], not including
-@racket[#%module-begin] (which is not useful outside of a module).
-
-@; ----------------------------------------
-
-@section[#:tag "r5rs/init-mod"]{@|r5rs| Initialization Library}
-
-@defmodule[r5rs/init]
-
-The @racketmodname[r5rs/init] module re-exports @racketmodname[r5rs],
-and also sets parameters as follows:
-
-@racketblock[
-  (read-case-sensitive #f)
-  (read-accept-infix-dot #f)
-  (read-curly-brace-as-paren #f)
-  (read-square-bracket-as-paren #f)
-  (print-mpair-curly-braces #f)
-]
-
-The side-effect of setting these parameters is useful when the module
-is @racket[require]d before loading an @|r5rs| program, so that the
-reader and printer behave more as specified in @|r5rs|. In particular,
-the @seclink["plt-r5rs"]{@exec{plt-r5rs} executable} initializes by
-importing @racketmodname[r5rs/init].
-
-@; ----------------------------------------
-
-@(define (redirects)
-  (make-binding-redirect-elements
-   'r5rs
-   (map (lambda (b)
-          (list (string->symbol (car b))
-                (cadr b)
-                (build-path "r5rs-std" (caddr b))
-                (cadddr b)))
-        bindings)))
-
-@; This list was extracted from the old "keywords" and "hdindex" files:
-@(define bindings
-  '(("lambda" #t "r5rs-Z-H-7.html" "%_idx_96")
-    ("set!" #t "r5rs-Z-H-7.html" "%_idx_104")
-    ("quote" #t "r5rs-Z-H-7.html" "%_idx_86")
-    ("quasiquote" #t "r5rs-Z-H-7.html" "%_idx_154")
-    ("or" #t "r5rs-Z-H-7.html" "%_idx_122")
-    ("and" #t "r5rs-Z-H-7.html" "%_idx_120")
-    ("define" #t "r5rs-Z-H-8.html" "%_idx_194")
-    ("define-syntax" #t "r5rs-Z-H-8.html" "%_idx_202")
-    ("let" #t "r5rs-Z-H-7.html" "%_idx_126")
-    ("let*" #t "r5rs-Z-H-7.html" "%_idx_130")
-    ("let-syntax" #t "r5rs-Z-H-7.html" "%_idx_184")
-    ("letrec" #t "r5rs-Z-H-7.html" "%_idx_134")
-    ("letrec-syntax" #t "r5rs-Z-H-7.html" "%_idx_186")
-    ("cond" #t "r5rs-Z-H-7.html" "%_idx_108")
-    ("delay" #t "r5rs-Z-H-7.html" "%_idx_146")
-    ("do" #t "r5rs-Z-H-7.html" "%_idx_140")
-    ("if" #t "r5rs-Z-H-7.html" "%_idx_98")
-    ("case" #t "r5rs-Z-H-7.html" "%_idx_116")
-    ("begin" #t "r5rs-Z-H-7.html" "%_idx_138")
-
-    ("zero?" #f "r5rs-Z-H-9.html" "%_idx_268")
-    ("write-char" #f "r5rs-Z-H-9.html" "%_idx_666")
-    ;; ("write-char" #f "r5rs-Z-H-9.html" "%_idx_664")
-    ("write" #f "r5rs-Z-H-9.html" "%_idx_654")
-    ;; ("write" #f "r5rs-Z-H-9.html" "%_idx_652")
-    ("with-output-to-file" #f "r5rs-Z-H-9.html" "%_idx_624")
-    ("with-input-from-file" #f "r5rs-Z-H-9.html" "%_idx_622")
-    ("vector?" #f "r5rs-Z-H-9.html" "%_idx_556")
-    ("vector-set!" #f "r5rs-Z-H-9.html" "%_idx_568")
-    ("vector-ref" #f "r5rs-Z-H-9.html" "%_idx_566")
-    ("vector-length" #f "r5rs-Z-H-9.html" "%_idx_564")
-    ("vector-fill!" #f "r5rs-Z-H-9.html" "%_idx_574")
-    ("vector->list" #f "r5rs-Z-H-9.html" "%_idx_570")
-    ("vector" #f "r5rs-Z-H-9.html" "%_idx_562")
-    ("values" #f "r5rs-Z-H-9.html" "%_idx_594")
-    ("truncate" #f "r5rs-Z-H-9.html" "%_idx_318")
-    ("transcript-on" #f "r5rs-Z-H-9.html" "%_idx_670")
-    ("transcript-off" #f "r5rs-Z-H-9.html" "%_idx_672")
-    ("tan" #f "r5rs-Z-H-9.html" "%_idx_334")
-    ("symbol?" #f "r5rs-Z-H-9.html" "%_idx_460")
-    ("symbol->string" #f "r5rs-Z-H-9.html" "%_idx_462")
-    ("substring" #f "r5rs-Z-H-9.html" "%_idx_542")
-    ("string?" #f "r5rs-Z-H-9.html" "%_idx_508")
-    ("string>?" #f "r5rs-Z-H-9.html" "%_idx_528")
-    ("string>=?" #f "r5rs-Z-H-9.html" "%_idx_532")
-    ("string=?" #f "r5rs-Z-H-9.html" "%_idx_522")
-    ("string<?" #f "r5rs-Z-H-9.html" "%_idx_526")
-    ("string<=?" #f "r5rs-Z-H-9.html" "%_idx_530")
-    ("string-set!" #f "r5rs-Z-H-9.html" "%_idx_520")
-    ("string-ref" #f "r5rs-Z-H-9.html" "%_idx_518")
-    ("string-length" #f "r5rs-Z-H-9.html" "%_idx_516")
-    ("string-fill!" #f "r5rs-Z-H-9.html" "%_idx_552")
-    ("string-copy" #f "r5rs-Z-H-9.html" "%_idx_550")
-    ("string-ci>?" #f "r5rs-Z-H-9.html" "%_idx_536")
-    ("string-ci>=?" #f "r5rs-Z-H-9.html" "%_idx_540")
-    ("string-ci=?" #f "r5rs-Z-H-9.html" "%_idx_524")
-    ("string-ci<?" #f "r5rs-Z-H-9.html" "%_idx_534")
-    ("string-ci<=?" #f "r5rs-Z-H-9.html" "%_idx_538")
-    ("string-append" #f "r5rs-Z-H-9.html" "%_idx_544")
-    ("string->symbol" #f "r5rs-Z-H-9.html" "%_idx_464")
-    ("string->number" #f "r5rs-Z-H-9.html" "%_idx_370")
-    ;; ("string->number" #f "r5rs-Z-H-9.html" "%_idx_368")
-    ("string->list" #f "r5rs-Z-H-9.html" "%_idx_546")
-    ("string" #f "r5rs-Z-H-9.html" "%_idx_514")
-    ("sqrt" #f "r5rs-Z-H-9.html" "%_idx_344")
-    ("sin" #f "r5rs-Z-H-9.html" "%_idx_330")
-    ("set-cdr!" #f "r5rs-Z-H-9.html" "%_idx_418")
-    ("set-car!" #f "r5rs-Z-H-9.html" "%_idx_416")
-    ("scheme-report-environment" #f "r5rs-Z-H-9.html" "%_idx_602")
-    ("round" #f "r5rs-Z-H-9.html" "%_idx_320")
-    ("reverse" #f "r5rs-Z-H-9.html" "%_idx_440")
-    ("remainder" #f "r5rs-Z-H-9.html" "%_idx_302")
-    ("real?" #f "r5rs-Z-H-9.html" "%_idx_248")
-    ("real-part" #f "r5rs-Z-H-9.html" "%_idx_352")
-    ("read-char" #f "r5rs-Z-H-9.html" "%_idx_640")
-    ;; ("read-char" #f "r5rs-Z-H-9.html" "%_idx_638")
-    ("read" #f "r5rs-Z-H-9.html" "%_idx_636")
-    ;; ("read" #f "r5rs-Z-H-9.html" "%_idx_634")
-    ("rationalize" #f "r5rs-Z-H-9.html" "%_idx_322")
-    ("rational?" #f "r5rs-Z-H-9.html" "%_idx_250")
-    ("quotient" #f "r5rs-Z-H-9.html" "%_idx_300")
-    ("procedure?" #f "r5rs-Z-H-9.html" "%_idx_576")
-    ("positive?" #f "r5rs-Z-H-9.html" "%_idx_270")
-    ("peek-char" #f "r5rs-Z-H-9.html" "%_idx_644")
-    ;; ("peek-char" #f "r5rs-Z-H-9.html" "%_idx_642")
-    ("pair?" #f "r5rs-Z-H-9.html" "%_idx_406")
-    ("output-port?" #f "r5rs-Z-H-9.html" "%_idx_616")
-    ("open-output-file" #f "r5rs-Z-H-9.html" "%_idx_628")
-    ("open-input-file" #f "r5rs-Z-H-9.html" "%_idx_626")
-    ("odd?" #f "r5rs-Z-H-9.html" "%_idx_274")
-    ("numerator" #f "r5rs-Z-H-9.html" "%_idx_310")
-    ("number?" #f "r5rs-Z-H-9.html" "%_idx_244")
-    ("number->string" #f "r5rs-Z-H-9.html" "%_idx_366")
-    ;; ("number->string" #f "r5rs-Z-H-9.html" "%_idx_364")
-    ("null?" #f "r5rs-Z-H-9.html" "%_idx_428")
-    ("null-environment" #f "r5rs-Z-H-9.html" "%_idx_604")
-    ("not" #f "r5rs-Z-H-9.html" "%_idx_386")
-    ("newline" #f "r5rs-Z-H-9.html" "%_idx_662")
-    ;; ("newline" #f "r5rs-Z-H-9.html" "%_idx_660")
-    ("negative?" #f "r5rs-Z-H-9.html" "%_idx_272")
-    ("modulo" #f "r5rs-Z-H-9.html" "%_idx_304")
-    ("min" #f "r5rs-Z-H-9.html" "%_idx_280")
-    ("memv" #f "r5rs-Z-H-9.html" "%_idx_448")
-    ("memq" #f "r5rs-Z-H-9.html" "%_idx_446")
-    ("member" #f "r5rs-Z-H-9.html" "%_idx_450")
-    ("max" #f "r5rs-Z-H-9.html" "%_idx_278")
-    ("map" #f "r5rs-Z-H-9.html" "%_idx_580")
-    ("make-vector" #f "r5rs-Z-H-9.html" "%_idx_560")
-    ;; ("make-vector" #f "r5rs-Z-H-9.html" "%_idx_558")
-    ("make-string" #f "r5rs-Z-H-9.html" "%_idx_512")
-    ;; ("make-string" #f "r5rs-Z-H-9.html" "%_idx_510")
-    ("make-rectangular" #f "r5rs-Z-H-9.html" "%_idx_348")
-    ("make-polar" #f "r5rs-Z-H-9.html" "%_idx_350")
-    ("magnitude" #f "r5rs-Z-H-9.html" "%_idx_356")
-    ("log" #f "r5rs-Z-H-9.html" "%_idx_328")
-    ("load" #f "r5rs-Z-H-9.html" "%_idx_668")
-    ("list?" #f "r5rs-Z-H-9.html" "%_idx_432")
-    ("list-tail" #f "r5rs-Z-H-9.html" "%_idx_442")
-    ("list-ref" #f "r5rs-Z-H-9.html" "%_idx_444")
-    ("list->vector" #f "r5rs-Z-H-9.html" "%_idx_572")
-    ("list->string" #f "r5rs-Z-H-9.html" "%_idx_548")
-    ("list" #f "r5rs-Z-H-9.html" "%_idx_434")
-    ("length" #f "r5rs-Z-H-9.html" "%_idx_436")
-    ("lcm" #f "r5rs-Z-H-9.html" "%_idx_308")
-    ("interaction-environment" #f "r5rs-Z-H-9.html" "%_idx_606")
-    ("integer?" #f "r5rs-Z-H-9.html" "%_idx_252")
-    ("integer->char" #f "r5rs-Z-H-9.html" "%_idx_500")
-    ("input-port?" #f "r5rs-Z-H-9.html" "%_idx_614")
-    ("inexact?" #f "r5rs-Z-H-9.html" "%_idx_256")
-    ("inexact->exact" #f "r5rs-Z-H-9.html" "%_idx_362")
-    ("imag-part" #f "r5rs-Z-H-9.html" "%_idx_354")
-    ("gcd" #f "r5rs-Z-H-9.html" "%_idx_306")
-    ("force" #f "r5rs-Z-H-9.html" "%_idx_584")
-    ("for-each" #f "r5rs-Z-H-9.html" "%_idx_582")
-    ("floor" #f "r5rs-Z-H-9.html" "%_idx_314")
-    ("expt" #f "r5rs-Z-H-9.html" "%_idx_346")
-    ("exp" #f "r5rs-Z-H-9.html" "%_idx_326")
-    ("exact?" #f "r5rs-Z-H-9.html" "%_idx_254")
-    ("exact->inexact" #f "r5rs-Z-H-9.html" "%_idx_360")
-    ("even?" #f "r5rs-Z-H-9.html" "%_idx_276")
-    ("eval" #f "r5rs-Z-H-9.html" "%_idx_600")
-    ("eqv?" #f "r5rs-Z-H-9.html" "%_idx_214")
-    ("equal?" #f "r5rs-Z-H-9.html" "%_idx_222")
-    ("eq?" #f "r5rs-Z-H-9.html" "%_idx_220")
-    ("eof-object?" #f "r5rs-Z-H-9.html" "%_idx_646")
-    ("dynamic-wind" #f "r5rs-Z-H-9.html" "%_idx_598")
-    ("display" #f "r5rs-Z-H-9.html" "%_idx_658")
-    ;; ("display" #f "r5rs-Z-H-9.html" "%_idx_656")
-    ("denominator" #f "r5rs-Z-H-9.html" "%_idx_312")
-    ("current-output-port" #f "r5rs-Z-H-9.html" "%_idx_620")
-    ("current-input-port" #f "r5rs-Z-H-9.html" "%_idx_618")
-    ("cos" #f "r5rs-Z-H-9.html" "%_idx_332")
-    ("cons" #f "r5rs-Z-H-9.html" "%_idx_408")
-    ("complex?" #f "r5rs-Z-H-9.html" "%_idx_246")
-    ("close-output-port" #f "r5rs-Z-H-9.html" "%_idx_632")
-    ("close-input-port" #f "r5rs-Z-H-9.html" "%_idx_630")
-    ("char?" #f "r5rs-Z-H-9.html" "%_idx_466")
-    ("char>?" #f "r5rs-Z-H-9.html" "%_idx_472")
-    ("char>=?" #f "r5rs-Z-H-9.html" "%_idx_476")
-    ("char=?" #f "r5rs-Z-H-9.html" "%_idx_468")
-    ("char<?" #f "r5rs-Z-H-9.html" "%_idx_470")
-    ("char<=?" #f "r5rs-Z-H-9.html" "%_idx_474")
-    ("char-whitespace?" #f "r5rs-Z-H-9.html" "%_idx_492")
-    ("char-upper-case?" #f "r5rs-Z-H-9.html" "%_idx_494")
-    ("char-upcase" #f "r5rs-Z-H-9.html" "%_idx_502")
-    ("char-ready?" #f "r5rs-Z-H-9.html" "%_idx_650")
-    ;; ("char-ready?" #f "r5rs-Z-H-9.html" "%_idx_648")
-    ("char-numeric?" #f "r5rs-Z-H-9.html" "%_idx_490")
-    ("char-lower-case?" #f "r5rs-Z-H-9.html" "%_idx_496")
-    ("char-downcase" #f "r5rs-Z-H-9.html" "%_idx_504")
-    ("char-ci>?" #f "r5rs-Z-H-9.html" "%_idx_482")
-    ("char-ci>=?" #f "r5rs-Z-H-9.html" "%_idx_486")
-    ("char-ci=?" #f "r5rs-Z-H-9.html" "%_idx_478")
-    ("char-ci<?" #f "r5rs-Z-H-9.html" "%_idx_480")
-    ("char-ci<=?" #f "r5rs-Z-H-9.html" "%_idx_484")
-    ("char-alphabetic?" #f "r5rs-Z-H-9.html" "%_idx_488")
-    ("char->integer" #f "r5rs-Z-H-9.html" "%_idx_498")
-    ("ceiling" #f "r5rs-Z-H-9.html" "%_idx_316")
-    ("cdr" #f "r5rs-Z-H-9.html" "%_idx_414")
-    ("cddddr" #f "r5rs-Z-H-9.html" "%_idx_426")
-    ("cdddar" #f "r5rs-Z-H-9.html" "%_idx_424")
-    ("car" #f "r5rs-Z-H-9.html" "%_idx_410")
-    ("call-with-values" #f "r5rs-Z-H-9.html" "%_idx_596")
-    ("call-with-output-file" #f "r5rs-Z-H-9.html" "%_idx_612")
-    ("call-with-input-file" #f "r5rs-Z-H-9.html" "%_idx_610")
-    ("call-with-current-continuation" #f "r5rs-Z-H-9.html" "%_idx_588")
-    ("cadr" #f "r5rs-Z-H-9.html" "%_idx_422")
-    ("caar" #f "r5rs-Z-H-9.html" "%_idx_420")
-    ("boolean?" #f "r5rs-Z-H-9.html" "%_idx_388")
-    ("atan" #f "r5rs-Z-H-9.html" "%_idx_342")
-    ;; ("atan" #f "r5rs-Z-H-9.html" "%_idx_340")
-    ("assv" #f "r5rs-Z-H-9.html" "%_idx_454")
-    ("assq" #f "r5rs-Z-H-9.html" "%_idx_452")
-    ("assoc" #f "r5rs-Z-H-9.html" "%_idx_456")
-    ("asin" #f "r5rs-Z-H-9.html" "%_idx_336")
-    ("apply" #f "r5rs-Z-H-9.html" "%_idx_578")
-    ("append" #f "r5rs-Z-H-9.html" "%_idx_438")
-    ("angle" #f "r5rs-Z-H-9.html" "%_idx_358")
-    ("acos" #f "r5rs-Z-H-9.html" "%_idx_338")
-    ("abs" #f "r5rs-Z-H-9.html" "%_idx_298")
-    (">=" #f "r5rs-Z-H-9.html" "%_idx_266")
-    (">" #f "r5rs-Z-H-9.html" "%_idx_262")
-    ("=" #f "r5rs-Z-H-9.html" "%_idx_258")
-    ("<=" #f "r5rs-Z-H-9.html" "%_idx_264")
-    ("<" #f "r5rs-Z-H-9.html" "%_idx_260")
-    ("/" #f "r5rs-Z-H-9.html" "%_idx_296")
-    ;;("/" #f "r5rs-Z-H-9.html" "%_idx_294")
-    ;;("/" #f "r5rs-Z-H-9.html" "%_idx_292")
-    ("-" #f "r5rs-Z-H-9.html" "%_idx_290")
-    ;;("-" #f "r5rs-Z-H-9.html" "%_idx_288")
-    ;;("-" #f "r5rs-Z-H-9.html" "%_idx_286")
-    ("+" #f "r5rs-Z-H-9.html" "%_idx_282")
-    ("*" #f "r5rs-Z-H-9.html" "%_idx_284")))
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/index.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/index.html
deleted file mode 100644
index ee76dbee6c..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/index.html
+++ /dev/null
@@ -1,343 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-
-
-
-
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-  
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-  
-
-
-
-
-</p>
-<p>
-  
-
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-
-
-</p>
-<p>
-
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-  
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-                         
-                         
-
-                                                                
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<div align=center>
-<h1><br><br>Revised<sup>5</sup> Report on the Algorithmic Language Scheme</h1>
-<p>
-20 February 1998<br>
-<br>
-Richard Kelsey, William Clinger, and Jonathan Rees (<i>Editors</i>)<br>
-&nbsp;<br>
-<table width=100%>
-<tr><td>H. Abelson </td><td> R. K. Dybvig </td><td> C. T. Haynes </td><td> G. J. Rozas</td></tr>
-<tr><td>N. I. Adams IV </td><td> D. P. Friedman </td><td> E. Kohlbecker </td><td> G. L. Steele Jr.</td></tr>
-<tr><td>D. H. Bartley </td><td> R. Halstead </td><td> D. Oxley </td><td> G. J. Sussman</td></tr>
-<tr><td>G. Brooks </td><td> C. Hanson </td><td> K. M. Pitman </td><td> M. Wand</td></tr>
-</table><br>
-<em>Dedicated to the Memory of Robert Hieb</em>
-</p>
-<p></div>
-</p>
-<p></p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
- 
-
-
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<div class=navigation>[Go to <span class=disable>first, previous</span><span><span class=disable>, </span><a href="r5rs-Z-H-1.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-C.css b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-C.css
deleted file mode 100644
index 0d9d6b57e6..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-C.css
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-body {
-   color: black;
-/*background-color: #e5e5e5; */
-/*background-color: beige;*/
-   margin-top: 2em;
-   margin-left: 8%;
-   margin-right: 8%;
-}
-
-h1,h2,h3,h4,h5,h6 {
-   margin-top: .5em;
-}
-
-.partheading {
-   font-size: 90%;
-}
-
-.chapterheading {
-   font-size: 90%;
-}
-
-pre {
-    margin-left: 2em;
-}
-
-ol {
-   list-style-type: decimal;
-}
-
-ol ol {
-   list-style-type: lower-alpha;
-}
-
-ol ol ol {
-   list-style-type: lower-roman;
-}
-
-ol ol ol ol {
-   list-style-type: upper-alpha;
-}
-
-.scheme {
-   color: brown;
-}
-
-.scheme .keyword {
-   color: #990000;
-   font-weight: bold;
-}
-
-.scheme .builtin {
-   color: #990000;
-}
-
-.scheme .variable {
-   color: navy;
-}
-
-.scheme .global {
-   color: purple;
-}
-
-.scheme .selfeval {
-   color: green;
-}
-
-.scheme .comment {
-   color:  teal;
-}
-
-.schemeresponse {
-   color: green;
-}
-
-.navigation {
-   color: red;
-   text-align: right;
-   font-style: italic;
-}
-
-.disable {
-   /* color: #e5e5e5; */
-color: gray;
-}
-
-.smallcaps {
-font-size: 75%;
-}
-
-.smallprint {
-   color: gray;
-   font-size: 75%;
-   text-align: right;
-}
-
-.smallprint hr {
-   text-align: left;
-   width: 40%;
-}
-
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-1.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-1.gif
deleted file mode 100644
index 8c4cff62f2..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-1.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-10.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-10.gif
deleted file mode 100644
index d4462b0b61..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-10.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-11.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-11.gif
deleted file mode 100644
index 74e03cc2ea..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-11.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-12.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-12.gif
deleted file mode 100644
index 1c5d2181ae..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-12.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-13.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-13.gif
deleted file mode 100644
index 20fee34031..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-13.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-14.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-14.gif
deleted file mode 100644
index 13555c259f..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-14.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-15.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-15.gif
deleted file mode 100644
index 580ed0fbaf..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-15.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-16.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-16.gif
deleted file mode 100644
index 6b3f5780ed..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-16.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-17.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-17.gif
deleted file mode 100644
index f126fec48e..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-17.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-18.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-18.gif
deleted file mode 100644
index 0c9a00b8af..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-18.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-19.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-19.gif
deleted file mode 100644
index 3a3de5f36a..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-19.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-2.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-2.gif
deleted file mode 100644
index ac8aaa3a5d..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-2.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-20.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-20.gif
deleted file mode 100644
index d44b6584a4..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-20.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-21.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-21.gif
deleted file mode 100644
index af77639aac..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-21.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-22.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-22.gif
deleted file mode 100644
index ce50fc766a..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-22.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-23.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-23.gif
deleted file mode 100644
index 22a2c5d9af..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-23.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-24.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-24.gif
deleted file mode 100644
index 131dc6f3af..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-24.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-25.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-25.gif
deleted file mode 100644
index ce30d51177..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-25.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-26.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-26.gif
deleted file mode 100644
index 40c5fb5626..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-26.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-27.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-27.gif
deleted file mode 100644
index d73589b88a..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-27.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-28.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-28.gif
deleted file mode 100644
index 56c3b2906b..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-28.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-29.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-29.gif
deleted file mode 100644
index 98c2fcb371..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-29.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-3.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-3.gif
deleted file mode 100644
index 728e4afa63..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-3.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-30.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-30.gif
deleted file mode 100644
index 1bcc918f40..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-30.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-31.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-31.gif
deleted file mode 100644
index ba6e494787..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-31.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-32.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-32.gif
deleted file mode 100644
index f5b2e6a95c..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-32.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-33.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-33.gif
deleted file mode 100644
index ef2941fac6..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-33.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-34.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-34.gif
deleted file mode 100644
index 6c62bd937f..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-34.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-35.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-35.gif
deleted file mode 100644
index 451eec50b4..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-35.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-36.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-36.gif
deleted file mode 100644
index 1f8b92b390..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-36.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-37.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-37.gif
deleted file mode 100644
index 5bd0331d3c..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-37.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-38.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-38.gif
deleted file mode 100644
index 838e3f8cdc..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-38.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-39.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-39.gif
deleted file mode 100644
index 65ad1b34eb..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-39.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-4.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-4.gif
deleted file mode 100644
index a2d0862b02..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-4.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-40.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-40.gif
deleted file mode 100644
index db540e4a43..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-40.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-41.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-41.gif
deleted file mode 100644
index 9695e63274..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-41.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-42.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-42.gif
deleted file mode 100644
index 43c24a5fb4..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-42.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-43.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-43.gif
deleted file mode 100644
index 4de6d466a3..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-43.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-44.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-44.gif
deleted file mode 100644
index 3397dd644e..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-44.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-45.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-45.gif
deleted file mode 100644
index 6734d5aa4b..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-45.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-46.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-46.gif
deleted file mode 100644
index 026f48df74..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-46.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-47.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-47.gif
deleted file mode 100644
index 62c9e3a603..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-47.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-48.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-48.gif
deleted file mode 100644
index e01b3e4129..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-48.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-49.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-49.gif
deleted file mode 100644
index 1f5ab2c3ba..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-49.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-5.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-5.gif
deleted file mode 100644
index 71537ac25f..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-5.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-50.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-50.gif
deleted file mode 100644
index 5bfede64e9..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-50.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-51.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-51.gif
deleted file mode 100644
index 2e7158eb0d..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-51.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-52.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-52.gif
deleted file mode 100644
index 53c45d922f..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-52.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-53.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-53.gif
deleted file mode 100644
index 86a7d2c07b..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-53.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-54.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-54.gif
deleted file mode 100644
index 532d8899f9..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-54.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-55.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-55.gif
deleted file mode 100644
index e5d941a02f..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-55.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-56.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-56.gif
deleted file mode 100644
index 478f8b2e62..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-56.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-57.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-57.gif
deleted file mode 100644
index 5c25d76696..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-57.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-58.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-58.gif
deleted file mode 100644
index 12482c6806..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-58.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-59.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-59.gif
deleted file mode 100644
index 9fd459d0c4..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-59.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-6.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-6.gif
deleted file mode 100644
index 03aae2afdc..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-6.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-60.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-60.gif
deleted file mode 100644
index 8c288fa2da..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-60.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-61.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-61.gif
deleted file mode 100644
index 47123a5756..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-61.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-62.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-62.gif
deleted file mode 100644
index 8824232221..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-62.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-63.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-63.gif
deleted file mode 100644
index 79910a58af..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-63.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-64.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-64.gif
deleted file mode 100644
index aa2599e7e2..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-64.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-65.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-65.gif
deleted file mode 100644
index 033e220208..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-65.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-7.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-7.gif
deleted file mode 100644
index c115b9e560..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-7.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-8.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-8.gif
deleted file mode 100644
index c937777ee8..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-8.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-9.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-9.gif
deleted file mode 100644
index 7dc94c86f2..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-9.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-1.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-1.gif
deleted file mode 100644
index 8c3df0afb0..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-1.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-2.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-2.gif
deleted file mode 100644
index 9e20c170be..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-2.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-3.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-3.gif
deleted file mode 100644
index 0bff151b05..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-3.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-4.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-4.gif
deleted file mode 100644
index d7f29fd4a1..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-4.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-5.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-5.gif
deleted file mode 100644
index 47ac67a375..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-5.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-6.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-6.gif
deleted file mode 100644
index 45517d59a2..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-6.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-7.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-7.gif
deleted file mode 100644
index ed76e06b0a..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-7.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-8.gif b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-8.gif
deleted file mode 100644
index 1004c1eb1c..0000000000
Binary files a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-G-D-8.gif and /dev/null differ
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-1.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-1.html
deleted file mode 100644
index 7be7246c9b..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-1.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs.html">previous</a></span><span>, <a href="r5rs-Z-H-2.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_Temp_1"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_Temp_1">Summary</a></h1>
-<p>The report gives a defining description of the programming language
-Scheme.  Scheme is a statically scoped and properly tail-recursive
-dialect of the Lisp programming language invented by Guy Lewis
-Steele&nbsp;Jr. and Gerald Jay&nbsp;Sussman.  It was designed to have an
-exceptionally clear and simple semantics and few different ways to
-form expressions.  A wide variety of programming paradigms, including
-imperative, functional, and message passing styles, find convenient
-expression in Scheme.</p>
-<p>
-The introduction offers a brief history of the language and of
-the report.</p>
-<p>
-The first three chapters present the fundamental ideas of the
-language and describe the notational conventions used for describing the
-language and for writing programs in the language.</p>
-<p>
-Chapters&nbsp;<a href="r5rs-Z-H-7.html#%_chap_4">4</a> and&nbsp;<a href="r5rs-Z-H-8.html#%_chap_5">5</a> describe
-the syntax and semantics of expressions, programs, and definitions.</p>
-<p>
-Chapter&nbsp;<a href="r5rs-Z-H-9.html#%_chap_6">6</a> describes Scheme's built-in
-procedures, which include all of the language's data manipulation and
-input/output primitives.</p>
-<p>
-Chapter&nbsp;<a href="r5rs-Z-H-10.html#%_chap_7">7</a> provides a formal syntax for Scheme
-written in extended BNF, along with a formal denotational semantics.
-An example of the use of the language follows the formal syntax and
-semantics.</p>
-<p>
-The report concludes with a list of references and an
-alphabetic index.</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs.html">previous</a></span><span>, <a href="r5rs-Z-H-2.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-10.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-10.html
deleted file mode 100644
index 1b6a642dc3..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-10.html
+++ /dev/null
@@ -1,681 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-9.html">previous</a></span><span>, <a href="r5rs-Z-H-11.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_7"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r5rs-Z-H-2.html#%_toc_%_chap_7">Chapter 7</a></div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_7">Formal syntax and semantics</a></h1>
-<p></p>
-<p>
-This chapter provides formal descriptions of what has already been
-described informally in previous chapters of this report.</p>
-<p>
-</p>
-<p>
-</p>
-<a name="%_sec_7.1"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.1">7.1&nbsp;&nbsp;Formal syntax</a></h2>
-<p></p>
-<p>
-This section provides a formal syntax for Scheme written in an extended
-BNF.</p>
-<p>
-All spaces in the grammar are for legibility.  Case is insignificant;
-for example, <tt>#x1A</tt> and <tt>#X1a</tt> are equivalent.  &lt;empty&gt;
-stands for the empty string.</p>
-<p>
-The following extensions to BNF are used to make the description more
-concise:  &lt;thing&gt;* means zero or more occurrences of
-&lt;thing&gt;; and &lt;thing&gt;<sup>+</sup> means at least one
-&lt;thing&gt;.</p>
-<p>
-</p>
-<a name="%_sec_7.1.1"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.1.1">7.1.1&nbsp;&nbsp;Lexical structure</a></h3>
-<p>This section describes how individual tokens<a name="%_idx_674"></a> (identifiers,
-numbers, etc.) are formed from sequences of characters.  The following
-sections describe how expressions and programs are formed from sequences
-of tokens.</p>
-<p>
-&lt;Intertoken space&gt; may occur on either side of any token, but not
-within a token.</p>
-<p>
-Tokens which require implicit termination (identifiers, numbers,
-characters, and dot) may be terminated by any &lt;delimiter&gt;, but not
-necessarily by anything else.</p>
-<p>
-The following five characters are reserved for future extensions to the
-language: <tt><code class=verbatim>[</code> <code class=verbatim>]</code> <code class=verbatim>{</code> <code class=verbatim>}</code> <code class=verbatim>|</code></tt></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-2.gif" border="0"></div>
-<p></p>
-<p>
-
-</p>
-<p>
-
-</p>
-<div align=left><img src="r5rs-Z-G-3.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-4.gif" border="0"></div>
-<p></p>
-<p>
-The following rules for &lt;num <em>R</em>&gt;, &lt;complex <em>R</em>&gt;, &lt;real
-<em>R</em>&gt;, &lt;ureal <em>R</em>&gt;, &lt;uinteger <em>R</em>&gt;, and &lt;prefix <em>R</em>&gt;
-should be replicated for <em>R</em>  =  2, 8, 10,
-and 16.  There are no rules for &lt;decimal 2&gt;, &lt;decimal
-8&gt;, and &lt;decimal 16&gt;, which means that numbers containing
-decimal points or exponents must be in decimal radix.
-</p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-5.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-6.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<a name="%_sec_7.1.2"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.1.2">7.1.2&nbsp;&nbsp;External representations</a></h3>
-<p></p>
-<p>
-&lt;Datum&gt; is what the <tt>read</tt> procedure (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.6.2">6.6.2</a>)
-successfully parses.  Note that any string that parses as an
-&lt;expression&gt; will also parse as a &lt;datum&gt;.  </p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-7.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<a name="%_sec_7.1.3"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.1.3">7.1.3&nbsp;&nbsp;Expressions</a></h3>
-<p></p>
-<div align=left><img src="r5rs-Z-G-8.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<a name="%_sec_7.1.4"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.1.4">7.1.4&nbsp;&nbsp;Quasiquotations</a></h3>
-<p>The following grammar for quasiquote expressions is not context-free.
-It is presented as a recipe for generating an infinite number of
-production rules.  Imagine a copy of the following rules for <em>D</em>  =  1, 2,
-3, <tt>...</tt>.  <em>D</em> keeps track of the nesting depth.</p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-9.gif" border="0"></div>
-<p></p>
-<p>
-In &lt;quasiquotation&gt;s, a &lt;list qq template <em>D</em>&gt; can sometimes
-be confused with either an &lt;unquotation <em>D</em>&gt; or a &lt;splicing
-unquotation <em>D</em>&gt;.  The interpretation as an
-&lt;unquotation&gt; or &lt;splicing
-unquotation <em>D</em>&gt; takes precedence.</p>
-<p>
-</p>
-<a name="%_sec_7.1.5"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.1.5">7.1.5&nbsp;&nbsp;Transformers</a></h3>
-<p></p>
-<div align=left><img src="r5rs-Z-G-10.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<a name="%_sec_7.1.6"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.1.6">7.1.6&nbsp;&nbsp;Programs and definitions</a></h3>
-<p></p>
-<div align=left><img src="r5rs-Z-G-11.gif" border="0"></div>
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p></p>
-<a name="%_sec_7.2"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.2">7.2&nbsp;&nbsp;Formal semantics</a></h2>
-<p></p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</p>
-<p>
-
-
-
-This section provides a formal denotational semantics for the primitive
-expressions of Scheme and selected built-in procedures.  The concepts
-and notation used here are described in&nbsp;[<a href="r5rs-Z-H-14.html#cite{Stoy77}">29</a>]; the notation is
-summarized below:</p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-12.gif" border="0"></div>
-<p></p>
-<p>
-The reason that expression continuations take sequences of values instead
-of single values is to simplify the formal treatment of procedure calls
-and multiple return values.</p>
-<p>
-The boolean flag associated with pairs, vectors, and strings will be true
-for mutable objects and false for immutable objects.</p>
-<p>
-The order of evaluation within a call is unspecified.  We mimic that
-here by applying arbitrary permutations <i>permute</i> and <i>unpermute</i>, which must be inverses, to the arguments in a call before
-and after they are evaluated.  This is not quite right since it suggests,
-incorrectly, that the order of evaluation is constant throughout a program (for
-any given number of arguments), but it is a closer approximation to the intended
-semantics than a left-to-right evaluation would be.</p>
-<p>
-The storage allocator <i>new</i> is implementation-dependent, but it must
-obey the following axiom:  if <i>new</i> <img src="r5rs-Z-G-D-2.gif" border="0"> <img src="r5rs-Z-G-D-4.gif" border="0"> <tt><em>L</em></tt>, then
-<img src="r5rs-Z-G-D-2.gif" border="0"> (<i>new</i> <img src="r5rs-Z-G-D-2.gif" border="0"> | <tt><em>L</em></tt>)<img src="r5rs-Z-G-D-7.gif" border="0"> 2  =  <i><em>f</em><em>a</em><em>l</em><em>s</em><em>e</em></i>.</p>
-<p>
-
-
-
-</p>
-<p>
-The definition of <img src="r5rs-Z-G-D-5.gif" border="0"> is omitted because an accurate definition of
-<img src="r5rs-Z-G-D-5.gif" border="0"> would complicate the semantics without being very interesting.</p>
-<p>
-If  P is a program in which all variables are defined before being
-referenced or assigned, then the meaning of  P is
-</p>
-<div align=left><img src="r5rs-Z-G-13.gif" border="0"></div>
-<p>
-where  I* is the sequence of variables defined in  P,  P'
-is the sequence of expressions obtained by replacing every definition
-in  P by an assignment, &lt;undefined&gt; is an expression that evaluates
-to <i>undefined</i>, and
-<img src="r5rs-Z-G-D-6.gif" border="0"> is the semantic function that assigns meaning to expressions.</p>
-<p>
-</p>
-<p>
-</p>
-<a name="%_sec_7.2.1"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.2.1">7.2.1&nbsp;&nbsp;Abstract syntax</a></h3>
-<p>
-
-
-
-
-
-
-
-</p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-14.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-15.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<a name="%_sec_7.2.2"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.2.2">7.2.2&nbsp;&nbsp;Domain equations</a></h3>
-<p></p>
-<div align=left><img src="r5rs-Z-G-16.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<a name="%_sec_7.2.3"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.2.3">7.2.3&nbsp;&nbsp;Semantic functions</a></h3>
-<p>
-
-</p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-17.gif" border="0"></div>
-<p></p>
-<p>
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<p></p>
-<p>
-Definition of <img src="r5rs-Z-G-D-5.gif" border="0"> deliberately omitted.</p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-18.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-19.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-20.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-21.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-22.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-23.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-24.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-25.gif" border="0"></div>
-<p></p>
-<p>
-Here and elsewhere, any expressed value other than <i>undefined</i> may
-be used in place of <i>unspecified</i>.</p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-26.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-27.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-28.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-29.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-30.gif" border="0"></div>
-<p></p>
-<p>
-
-</p>
-<a name="%_sec_7.2.4"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.2.4">7.2.4&nbsp;&nbsp;Auxiliary functions</a></h3>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-31.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-32.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-33.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-34.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-35.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-36.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-37.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-38.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-39.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-40.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-41.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-42.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-43.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-44.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-45.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-46.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-47.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-48.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-49.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-50.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-51.gif" border="0"></div>
-<p></p>
-<p>
-<a name="%_idx_676"></a>
-</p>
-<div align=left><img src="r5rs-Z-G-52.gif" border="0"></div>
-<p></p>
-<p>
-<a name="%_idx_678"></a>
-</p>
-<div align=left><img src="r5rs-Z-G-53.gif" border="0"></div>
-<p></p>
-<p>
-<a name="%_idx_680"></a>
-</p>
-<div align=left><img src="r5rs-Z-G-54.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-55.gif" border="0"></div>
-<p></p>
-<p>
-<a name="%_idx_682"></a>
-</p>
-<div align=left><img src="r5rs-Z-G-56.gif" border="0"></div>
-<p></p>
-<p>
-<a name="%_idx_684"></a>
-</p>
-<div align=left><img src="r5rs-Z-G-57.gif" border="0"></div>
-<p></p>
-<p>
-<a name="%_idx_686"></a>
-</p>
-<div align=left><img src="r5rs-Z-G-58.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-59.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-60.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-61.gif" border="0"></div>
-<p></p>
-<p>
-</p>
-<div align=left><img src="r5rs-Z-G-62.gif" border="0"></div>
-<p></p>
-<p>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p></p>
-<a name="%_sec_7.3"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_7.3">7.3&nbsp;&nbsp;Derived expression types</a></h2>
-<p></p>
-<p>
-This section gives macro definitions for the derived expression types in
-terms of the primitive expression types (literal, variable, call, <tt>lambda</tt>,
-<tt>if</tt>, <tt>set!</tt>).  See section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.4">6.4</a> for a possible
-definition of <tt>delay</tt>.</p>
-<p>
-<tt>(define-syntax&nbsp;<tt>cond</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;(else&nbsp;=&gt;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(else&nbsp;result1&nbsp;result2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;result1&nbsp;result2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test&nbsp;=&gt;&nbsp;result))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((temp&nbsp;test))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;temp&nbsp;(result&nbsp;temp))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test&nbsp;=&gt;&nbsp;result)&nbsp;clause1&nbsp;clause2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((temp&nbsp;test))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;temp<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(result&nbsp;temp)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond&nbsp;clause1&nbsp;clause2&nbsp;...))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test))&nbsp;test)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test)&nbsp;clause1&nbsp;clause2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((temp&nbsp;test))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;temp<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;temp<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond&nbsp;clause1&nbsp;clause2&nbsp;...))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test&nbsp;result1&nbsp;result2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;test&nbsp;(begin&nbsp;result1&nbsp;result2&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test&nbsp;result1&nbsp;result2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clause1&nbsp;clause2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;test<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;result1&nbsp;result2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond&nbsp;clause1&nbsp;clause2&nbsp;...)))))<br>
-</p>
-</tt>
-<p>
-<tt>(define-syntax&nbsp;<tt>case</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;(else)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((case&nbsp;(key&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clauses&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((atom-key&nbsp;(key&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(case&nbsp;atom-key&nbsp;clauses&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((case&nbsp;key<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;result1&nbsp;result2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;result1&nbsp;result2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((case&nbsp;key<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((atoms&nbsp;...)&nbsp;result1&nbsp;result2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(memv&nbsp;key&nbsp;'(atoms&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;result1&nbsp;result2&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((case&nbsp;key<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((atoms&nbsp;...)&nbsp;result1&nbsp;result2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clause&nbsp;clauses&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(memv&nbsp;key&nbsp;'(atoms&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;result1&nbsp;result2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(case&nbsp;key&nbsp;clause&nbsp;clauses&nbsp;...)))))<br>
-</p>
-</tt>
-<p>
-<tt>(define-syntax&nbsp;<tt>and</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((and)&nbsp;<tt>#t</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((and&nbsp;test)&nbsp;test)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((and&nbsp;test1&nbsp;test2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;test1&nbsp;(and&nbsp;test2&nbsp;...)&nbsp;<tt>#f</tt>))))<br>
-</p>
-</tt>
-<p>
-<tt>(define-syntax&nbsp;<tt>or</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((or)&nbsp;<tt>#f</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((or&nbsp;test)&nbsp;test)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((or&nbsp;test1&nbsp;test2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((x&nbsp;test1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;x&nbsp;x&nbsp;(or&nbsp;test2&nbsp;...))))))<br>
-</p>
-</tt>
-<p>
-<tt>(define-syntax&nbsp;<tt>let</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let&nbsp;((name&nbsp;val)&nbsp;...)&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((lambda&nbsp;(name&nbsp;...)&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;val&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let&nbsp;tag&nbsp;((name&nbsp;val)&nbsp;...)&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((letrec&nbsp;((tag&nbsp;(lambda&nbsp;(name&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tag)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;val&nbsp;...))))<br>
-</p>
-</tt>
-<p>
-<tt>(define-syntax&nbsp;<tt>let*</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let*&nbsp;()&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;()&nbsp;body1&nbsp;body2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let*&nbsp;((name1&nbsp;val1)&nbsp;(name2&nbsp;val2)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((name1&nbsp;val1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let*&nbsp;((name2&nbsp;val2)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)))))<br>
-</p>
-</tt>
-<p>
-The following <tt>letrec</tt> macro uses the symbol <tt>&lt;undefined&gt;</tt>
-in place of an expression which returns something that when stored in
-a location makes it an error to try to obtain the value stored in the
-location (no such expression is defined in Scheme).
-A trick is used to generate the temporary names needed to avoid
-specifying the order in which the values are evaluated.
-This could also be accomplished by using an auxiliary macro.</p>
-<p>
-<tt>(define-syntax&nbsp;<tt>letrec</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((letrec&nbsp;((var1&nbsp;init1)&nbsp;...)&nbsp;body&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec&nbsp;&quot;generate_temp_names&quot;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(var1&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((var1&nbsp;init1)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((letrec&nbsp;&quot;generate_temp_names&quot;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(temp1&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((var1&nbsp;init1)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((var1&nbsp;&lt;undefined&gt;)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((temp1&nbsp;init1)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;var1&nbsp;temp1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((letrec&nbsp;&quot;generate_temp_names&quot;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(x&nbsp;y&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(temp&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((var1&nbsp;init1)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec&nbsp;&quot;generate_temp_names&quot;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(y&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(newtemp&nbsp;temp&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((var1&nbsp;init1)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body&nbsp;...))))<br>
-</p>
-</tt>
-<p>
-<tt>(define-syntax&nbsp;<tt>begin</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((begin&nbsp;exp&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((lambda&nbsp;()&nbsp;exp&nbsp;...)))))<br>
-</p>
-</tt>
-<p>
-The following alternative expansion for <tt>begin</tt> does not make use of
-the ability to write more than one expression in the body of a lambda
-expression.  In any case, note that these rules apply only if the body
-of the <tt>begin</tt> contains no definitions.</p>
-<p>
-<tt>(define-syntax&nbsp;begin<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((begin&nbsp;exp)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;exp)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((begin&nbsp;exp1&nbsp;exp2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((x&nbsp;exp1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;exp2&nbsp;...)))))<br>
-</p>
-</tt>
-<p>
-The following definition
-of <tt>do</tt> uses a trick to expand the variable clauses.
-As with <tt>letrec</tt> above, an auxiliary macro would also work.
-The expression <tt>(if #f #f)</tt> is used to obtain an unspecific
-value.</p>
-<p>
-<tt>(define-syntax&nbsp;<tt>do</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((do&nbsp;((var&nbsp;init&nbsp;step&nbsp;...)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(test&nbsp;expr&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;command&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((loop<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(var&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;test<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;#f&nbsp;#f)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;expr&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;command<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;(do&nbsp;&quot;step&quot;&nbsp;var&nbsp;step&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;init&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((do&nbsp;&quot;step&quot;&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((do&nbsp;&quot;step&quot;&nbsp;x&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y)))<br>
-</p>
-</tt>
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p>
-  </p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-9.html">previous</a></span><span>, <a href="r5rs-Z-H-11.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-11.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-11.html
deleted file mode 100644
index c0d4067da3..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-11.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-10.html">previous</a></span><span>, <a href="r5rs-Z-H-12.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_Temp_6"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_Temp_6">Notes</a></h1>
-<p>
-</p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<a name="%_sec_Temp_7"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_Temp_7">Language changes</a></h3>
-<p></p>
-<p>
-This section enumerates the changes that have been made to Scheme since
-the ``Revised<sup>4</sup> report''&nbsp;[<a href="r5rs-Z-H-14.html#cite{R4RS}">6</a>] was published.</p>
-<p>
-</p>
-<ul>
-<p>
-</p>
-<li>
-<p>The report is now a superset of the IEEE standard for Scheme
-[<a href="r5rs-Z-H-14.html#cite{IEEEScheme}">13</a>]: implementations that conform to the report will
-also conform to the standard.  This required the following changes:
-</p>
-<ul>
-<p>
-</p>
-<li>
-<p>The empty list is now required to count as true.</p>
-<p>
-</p>
-<li>
-<p>The classification of features as essential or inessential has been
-removed.  There are now three classes of built-in procedures: primitive,
-library, and optional.  The optional procedures are <tt>load</tt>,
-<tt>with-input-from-file</tt>, <tt>with-output-to-file</tt>,
-<tt>transcript-on</tt>, <tt>transcript-off</tt>, and
-<tt>interaction-environment</tt>,
-and <tt>-</tt> and <tt>/</tt> with more than two arguments.
-None of these are in the IEEE standard.</p>
-<p>
-</p>
-<li>
-<p>Programs are allowed to redefine built-in procedures.  Doing so
-will not change the behavior of other built-in procedures.
-</p>
-</ul>
-<p></p>
-<p>
-</p>
-<li>
-<p><em>Port</em> has been added to the list of disjoint types.</p>
-<p>
-</p>
-<li>
-<p>The macro appendix has been removed.  High-level macros are now part
-of the main body of the report.  The rewrite rules for derived expressions
-have been replaced with macro definitions.  There are no reserved identifiers.</p>
-<p>
-</p>
-<li>
-<p><tt>Syntax-rules</tt> now allows vector patterns.</p>
-<p>
-</p>
-<li>
-<p>Multiple-value returns, <tt>eval</tt>, and <tt>dynamic-wind</tt> have
-been added.</p>
-<p>
-</p>
-<li>
-<p>The calls that are required to be implemented in a properly tail-recursive
-fashion are defined explicitly.</p>
-<p>
-</p>
-<li>
-<p>`<tt>@</tt>' can be used within identifiers. `<tt><code class=verbatim>|</code></tt>' is reserved
-for possible future extensions.</p>
-<p>
-</p>
-</ul>
-<p></p>
-<p>
-
-
-</p>
-<p>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p>
-  </p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-10.html">previous</a></span><span>, <a href="r5rs-Z-H-12.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-12.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-12.html
deleted file mode 100644
index 0a8b53c987..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-12.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-11.html">previous</a></span><span>, <a href="r5rs-Z-H-13.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_Temp_8"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_Temp_8">Additional material</a></h1>
-<p>
-</p>
-<p></p>
-<p></p>
-<p>
-The Internet Scheme Repository at
-</p>
-<div align=center><table><tr><td>
-
-<tt>http://www.cs.indiana.edu/scheme-repository/</tt>
-</td></tr></table></div>
-
-contains an extensive Scheme bibliography, as well as papers,
-programs, implementations, and other material related to Scheme.
- 
-<p>
-
-  </p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-11.html">previous</a></span><span>, <a href="r5rs-Z-H-13.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-13.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-13.html
deleted file mode 100644
index ebc6f0bf80..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-13.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-12.html">previous</a></span><span>, <a href="r5rs-Z-H-14.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_Temp_9"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_Temp_9">Example</a></h1>
-<p>
-</p>
-<p></p>
-<p> 
-<tt>Integrate-system</tt> integrates the system 
-</p>
-<div align=left><img src="r5rs-Z-G-63.gif" border="0"></div>
-<p>
-of differential equations with the method of Runge-Kutta.</p>
-<p>
-The parameter <tt>system-derivative</tt> is a function that takes a system
-state (a vector of values for the state variables <em>y</em><sub>1</sub>, <tt>...</tt>, <em>y</em><sub><em>n</em></sub>)
-and produces a system derivative (the values <em>y</em><sub>1</sub><sup>/</sup>, <tt>...</tt>,
-<em>y</em><sub><em>n</em></sub><sup>/</sup>).  The parameter <tt>initial-state</tt> provides an initial
-system state, and <tt>h</tt> is an initial guess for the length of the
-integration step.</p>
-<p>
-The value returned by <tt>integrate-system</tt> is an infinite stream of
-system states.</p>
-<p>
-<tt>(define&nbsp;integrate-system<br>
-&nbsp;&nbsp;(lambda&nbsp;(system-derivative&nbsp;initial-state&nbsp;h)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((next&nbsp;(runge-kutta-4&nbsp;system-derivative&nbsp;h)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec&nbsp;((states<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;initial-state<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(delay&nbsp;(map-streams&nbsp;next<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;states)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;states))))</p>
-</tt>
-<p>
-<tt>Runge-Kutta-4</tt> takes a function, <tt>f</tt>, that produces a
-system derivative from a system state.  <tt>Runge-Kutta-4</tt>
-produces a function that takes a system state and
-produces a new system state.</p>
-<p>
-<tt>(define&nbsp;runge-kutta-4<br>
-&nbsp;&nbsp;(lambda&nbsp;(f&nbsp;h)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((*h&nbsp;(scale-vector&nbsp;h))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*2&nbsp;(scale-vector&nbsp;2))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*1/2&nbsp;(scale-vector&nbsp;(/&nbsp;1&nbsp;2)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*1/6&nbsp;(scale-vector&nbsp;(/&nbsp;1&nbsp;6))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;y&nbsp;is&nbsp;a&nbsp;system&nbsp;state<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let*&nbsp;((k0&nbsp;(*h&nbsp;(f&nbsp;y)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(k1&nbsp;(*h&nbsp;(f&nbsp;(add-vectors&nbsp;y&nbsp;(*1/2&nbsp;k0)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(k2&nbsp;(*h&nbsp;(f&nbsp;(add-vectors&nbsp;y&nbsp;(*1/2&nbsp;k1)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(k3&nbsp;(*h&nbsp;(f&nbsp;(add-vectors&nbsp;y&nbsp;k2)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(add-vectors&nbsp;y<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*1/6&nbsp;(add-vectors&nbsp;k0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*2&nbsp;k1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*2&nbsp;k2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;k3))))))))<br>
-<br>
-(define&nbsp;elementwise<br>
-&nbsp;&nbsp;(lambda&nbsp;(f)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;vectors<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(generate-vector<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(vector-length&nbsp;(car&nbsp;vectors))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(i)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(apply&nbsp;f<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(map&nbsp;(lambda&nbsp;(v)&nbsp;(vector-ref&nbsp;&nbsp;v&nbsp;i))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vectors)))))))<br>
-<br>
-(define&nbsp;generate-vector<br>
-&nbsp;&nbsp;(lambda&nbsp;(size&nbsp;proc)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((ans&nbsp;(make-vector&nbsp;size)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec&nbsp;((loop<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(i)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond&nbsp;((=&nbsp;i&nbsp;size)&nbsp;ans)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(vector-set!&nbsp;ans&nbsp;i&nbsp;(proc&nbsp;i))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;(+&nbsp;i&nbsp;1)))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;0)))))<br>
-<br>
-(define&nbsp;add-vectors&nbsp;(elementwise&nbsp;+))<br>
-<br>
-(define&nbsp;scale-vector<br>
-&nbsp;&nbsp;(lambda&nbsp;(s)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(elementwise&nbsp;(lambda&nbsp;(x)&nbsp;(*&nbsp;x&nbsp;s)))))</p>
-</tt>
-<p>
-<tt>Map-streams</tt> is analogous to <tt>map</tt>: it applies its first
-argument (a procedure) to all the elements of its second argument (a
-stream).</p>
-<p>
-<tt>(define&nbsp;map-streams<br>
-&nbsp;&nbsp;(lambda&nbsp;(f&nbsp;s)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;(f&nbsp;(head&nbsp;s))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(delay&nbsp;(map-streams&nbsp;f&nbsp;(tail&nbsp;s))))))</p>
-</tt>
-<p>
-Infinite streams are implemented as pairs whose car holds the first
-element of the stream and whose cdr holds a promise to deliver the rest
-of the stream.</p>
-<p>
-<tt>(define&nbsp;head&nbsp;car)<br>
-(define&nbsp;tail<br>
-&nbsp;&nbsp;(lambda&nbsp;(stream)&nbsp;(force&nbsp;(cdr&nbsp;stream))))</p>
-</tt>
-<p>
-</p>
-<p><br></p>
-<p><br></p>
-<p>The following illustrates the use of <tt>integrate-system</tt> in
-integrating the system
-</p>
-<div align=left><img src="r5rs-Z-G-64.gif" border="0"></div>
-<p></p>
-<div align=left><img src="r5rs-Z-G-65.gif" border="0"></div>
-<p>
-which models a damped oscillator.</p>
-<p>
-<tt>(define&nbsp;damped-oscillator<br>
-&nbsp;&nbsp;(lambda&nbsp;(R&nbsp;L&nbsp;C)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(state)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((Vc&nbsp;(vector-ref&nbsp;state&nbsp;0))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(Il&nbsp;(vector-ref&nbsp;state&nbsp;1)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(vector&nbsp;(-&nbsp;0&nbsp;(+&nbsp;(/&nbsp;Vc&nbsp;(*&nbsp;R&nbsp;C))&nbsp;(/&nbsp;Il&nbsp;C)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(/&nbsp;Vc&nbsp;L))))))<br>
-<br>
-(define&nbsp;the-states<br>
-&nbsp;&nbsp;(integrate-system<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(damped-oscillator&nbsp;10000&nbsp;1000&nbsp;.001)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'#(1&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.01))</p>
-</tt>
-<p>
-</p>
-<p>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p>
-
-
-
-
-
-</p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-12.html">previous</a></span><span>, <a href="r5rs-Z-H-14.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-14.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-14.html
deleted file mode 100644
index 310359c6ff..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-14.html
+++ /dev/null
@@ -1,277 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-13.html">previous</a></span><span>, <a href="r5rs-Z-H-15.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_Temp_10"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_Temp_10">Bibliography</a></h1>
-<p></p>
-<table>
-
-<p>
-</p>
-<tr><td align=right valign=top><a name="cite{SICP}"></a>[1]&nbsp;&nbsp;</td><td>
-<p>
-Harold Abelson and Gerald Jay Sussman with Julie Sussman.
-<i>Structure and Interpretation of Computer Programs, second edition.</i>
-MIT Press, Cambridge, 1996.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Bawden88}"></a>[2]&nbsp;&nbsp;</td><td>
-<p> Alan Bawden and Jonathan Rees.
-Syntactic closures.
-In <i>Proceedings of the 1988 ACM Symposium on Lisp and
-Functional Programming</i>, pages 86-95.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{howtoprint}"></a>[3]&nbsp;&nbsp;</td><td>
-<p>
-Robert G. Burger&nbsp;and R. Kent Dybvig.
-Printing floating-point numbers quickly and accurately.
-In <i>Proceedings of the ACM SIGPLAN '96 Conference
-on Programming Language Design and Implementation</i>, pages&nbsp;108-116.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{RRRS}"></a>[4]&nbsp;&nbsp;</td><td>
-<p>
-William Clinger, editor.
-The revised revised report on Scheme, or an uncommon Lisp.
-MIT Artificial Intelligence Memo 848, August 1985.
-Also published as Computer Science Department Technical Report 174,
-Indiana University, June 1985.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{howtoread}"></a>[5]&nbsp;&nbsp;</td><td>
-<p> William Clinger.
-How to read floating point numbers accurately.
-In <i>Proceedings of the ACM SIGPLAN '90 Conference
-on Programming Language Design and Implementation</i>, pages 92-101.
-Proceedings published as <i>SIGPLAN Notices</i> 25(6), June 1990.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{R4RS}"></a>[6]&nbsp;&nbsp;</td><td>
-<p>
-William Clinger and Jonathan Rees, editors.
-The revised<sup>4</sup> report on the algorithmic language Scheme.
-In <i>ACM Lisp Pointers</i> 4(3), pages&nbsp;1-55, 1991.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{macrosthatwork}"></a>[7]&nbsp;&nbsp;</td><td>
-<p> William Clinger and Jonathan Rees.
-Macros that work.
-In <i>Proceedings of the 1991 ACM Conference on Principles of
-Programming Languages</i>, pages&nbsp;155-162.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{propertailrecursion}"></a>[8]&nbsp;&nbsp;</td><td>
-<p> William Clinger.
-Proper Tail Recursion and Space Efficiency.
-To appear in <i>Proceedings of the 1998 ACM Conference on Programming
-Language Design and Implementation</i>, June 1998.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{syntacticabstraction}"></a>[9]&nbsp;&nbsp;</td><td>
-<p>
-R.&nbsp;Kent Dybvig, Robert Hieb, and Carl Bruggeman.
-Syntactic abstraction in Scheme.
-<i>Lisp and Symbolic Computation</i> 5(4):295-326, 1993.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Scheme311}"></a>[10]&nbsp;&nbsp;</td><td>
-<p>
-Carol Fessenden, William Clinger, Daniel P.&nbsp;Friedman, and Christopher Haynes.
-Scheme 311 version 4 reference manual.
-Indiana University Computer Science Technical Report 137, February 1983.
-Superseded by&nbsp;[<a href="#cite{Scheme84}">11</a>].</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Scheme84}"></a>[11]&nbsp;&nbsp;</td><td>
-<p>
-D.&nbsp;Friedman, C.&nbsp;Haynes, E.&nbsp;Kohlbecker, and M.&nbsp;Wand.
-Scheme 84 interim reference manual.
-Indiana University Computer Science Technical Report 153, January 1985.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{IEEE}"></a>[12]&nbsp;&nbsp;</td><td>
-<p>
-<i>IEEE Standard 754-1985.  IEEE Standard for Binary Floating-Point
-Arithmetic.</i>  IEEE, New York, 1985.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{IEEEScheme}"></a>[13]&nbsp;&nbsp;</td><td>
-<p>
-<i>IEEE Standard 1178-1990.  IEEE Standard for the Scheme
-Programming Language.</i>  IEEE, New York, 1991.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Kohlbecker86}"></a>[14]&nbsp;&nbsp;</td><td>
-<p>
-Eugene E. Kohlbecker&nbsp;Jr.
-<i>Syntactic Extensions in the Programming Language Lisp.</i>
-PhD thesis, Indiana University, August 1986.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{hygienic}"></a>[15]&nbsp;&nbsp;</td><td>
-<p>
-Eugene E.&nbsp;Kohlbecker&nbsp;Jr., Daniel P.&nbsp;Friedman, Matthias Felleisen, and Bruce Duba.
-Hygienic macro expansion.
-In <i>Proceedings of the 1986 ACM Conference on Lisp
-and Functional Programming</i>, pages 151-161.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Landin65}"></a>[16]&nbsp;&nbsp;</td><td>
-<p>
-Peter Landin.
-A correspondence between Algol 60 and Church's lambda notation: Part I.
-<i>Communications of the ACM</i> 8(2):89-101, February 1965.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{MITScheme}"></a>[17]&nbsp;&nbsp;</td><td>
-<p>
-MIT Department of Electrical Engineering and Computer Science.
-Scheme manual, seventh edition.
-September 1984.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Naur63}"></a>[18]&nbsp;&nbsp;</td><td>
-<p>
-Peter Naur et al.
-Revised report on the algorithmic language Algol 60.
-<i>Communications of the ACM</i> 6(1):1-17, January 1963.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Penfield81}"></a>[19]&nbsp;&nbsp;</td><td>
-<p>
-Paul Penfield, Jr.
-Principal values and branch cuts in complex APL.
-In <i>APL '81 Conference Proceedings,</i> pages 248-256.
-ACM SIGAPL, San Francisco, September 1981.
-Proceedings published as <i>APL Quote Quad</i> 12(1), ACM, September 1981.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Pitman83}"></a>[20]&nbsp;&nbsp;</td><td>
-<p>
-Kent M.&nbsp;Pitman.
-The revised MacLisp manual (Saturday evening edition).
-MIT Laboratory for Computer Science Technical Report 295, May 1983.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Rees82}"></a>[21]&nbsp;&nbsp;</td><td>
-<p>
-Jonathan A.&nbsp;Rees and Norman I.&nbsp;Adams IV.
-T: A dialect of Lisp or, lambda: The ultimate software tool.
-In <i>Conference Record of the 1982 ACM Symposium on Lisp and
-Functional Programming</i>, pages 114-122.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Rees84}"></a>[22]&nbsp;&nbsp;</td><td>
-<p>
-Jonathan A.&nbsp;Rees, Norman I.&nbsp;Adams IV, and James R.&nbsp;Meehan.
-The T manual, fourth edition.
-Yale University Computer Science Department, January 1984.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{R3RS}"></a>[23]&nbsp;&nbsp;</td><td>
-<p>
-Jonathan Rees and William Clinger, editors.
-The revised<sup>3</sup> report on the algorithmic language Scheme.
-In <i>ACM SIGPLAN Notices</i> 21(12), pages&nbsp;37-79, December 1986.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Reynolds72}"></a>[24]&nbsp;&nbsp;</td><td>
-<p>
-John Reynolds.
-Definitional interpreters for higher order programming languages.
-In <i>ACM Conference Proceedings</i>, pages 717-740.
-ACM, &nbsp;1972.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Scheme78}"></a>[25]&nbsp;&nbsp;</td><td>
-<p>
-Guy Lewis Steele Jr.&nbsp;and Gerald Jay Sussman.
-The revised report on Scheme, a dialect of Lisp.
-MIT Artificial Intelligence Memo 452, January 1978.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Rabbit}"></a>[26]&nbsp;&nbsp;</td><td>
-<p>
-Guy Lewis Steele Jr.
-Rabbit: a compiler for Scheme.
-MIT Artificial Intelligence Laboratory Technical Report 474, May 1978.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{CLtL}"></a>[27]&nbsp;&nbsp;</td><td>
-<p>
-Guy Lewis Steele Jr.
-<i>Common Lisp: The Language, second edition.</i>
-Digital Press, Burlington MA, 1990.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Scheme75}"></a>[28]&nbsp;&nbsp;</td><td>
-<p>
-Gerald Jay Sussman and Guy Lewis Steele Jr.
-Scheme: an interpreter for extended lambda calculus.
-MIT Artificial Intelligence Memo 349, December 1975.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{Stoy77}"></a>[29]&nbsp;&nbsp;</td><td>
-<p>
-Joseph E.&nbsp;Stoy.
-<i>Denotational Semantics: The Scott-Strachey Approach to
-Programming Language Theory.</i>
-MIT Press, Cambridge, 1977.</p>
-<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="cite{TImanual85}"></a>[30]&nbsp;&nbsp;</td><td>
-<p>
-Texas Instruments, Inc.
-TI Scheme Language Reference Manual.
-Preliminary version 1.0, November 1985. </p>
-<p>
-</p>
-</table>
-<p></p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-13.html">previous</a></span><span>, <a href="r5rs-Z-H-15.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-15.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-15.html
deleted file mode 100644
index 552358155f..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-15.html
+++ /dev/null
@@ -1,458 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-14.html">previous</a></span><span class=disable>, next</span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span class=disable><span>; &nbsp;&nbsp;</span>index</span>]</div>
-<p></p>
-<a name="%_chap_Temp_11"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_Temp_11">Alphabetic Index of Definitions of Concepts,
-Keywords, and Procedures</a></h1>
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p></p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-<a name="%_index_start"></p>
-<p>
-<br>
-<a href="r5rs-Z-H-7.html#%_idx_88"><tt>'</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_402">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_284"><tt>*</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_282"><tt>+</tt></a>, <a href="r5rs-Z-H-10.html#%_idx_678">[2]</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_160"><tt>,</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_404">[2]</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_162"><tt>,@</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_286"><tt>-</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_288">[2]</a>, 
-<a href="r5rs-Z-H-9.html#%_idx_290">[3]</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_190"><tt>...</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_292"><tt>/</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_294">[2]</a>, 
-<a href="r5rs-Z-H-9.html#%_idx_296">[3]</a><br>
-<a href="r5rs-Z-H-5.html#%_idx_24"><tt>;</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_260"><tt>&lt;</tt></a>, <a href="r5rs-Z-H-10.html#%_idx_676">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_264"><tt>&lt;=</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_258"><tt>=</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_112"><tt>=&gt;</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_262"><tt>&gt;</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_266"><tt>&gt;=</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_164"><tt>`</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_298"><tt>abs</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_338"><tt>acos</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_120"><tt>and</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_358"><tt>angle</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_438"><tt>append</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_578"><tt>apply</tt></a>, <a href="r5rs-Z-H-10.html#%_idx_686">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_336"><tt>asin</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_456"><tt>assoc</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_452"><tt>assq</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_454"><tt>assv</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_340"><tt>atan</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_342">[2]</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_232"><tt>#b</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_156">backquote</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_138"><tt>begin</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_32">binding</a><br>
-<a href="r5rs-Z-H-6.html#%_idx_34">binding construct</a><br>
-<a href="r5rs-Z-H-6.html#%_idx_46"><tt>boolean?</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_388">[2]</a><br>
-<a href="r5rs-Z-H-6.html#%_idx_40">bound</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_420"><tt>caar</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_422"><tt>cadr</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_90">call</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_150">call by need</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_588"><tt>call-with-current-continuation</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_610"><tt>call-with-input-file</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_612"><tt>call-with-output-file</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_596"><tt>call-with-values</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_410"><tt>car</tt></a>, <a href="r5rs-Z-H-10.html#%_idx_680">[2]</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_116"><tt>case</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_424"><tt>cdddar</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_426"><tt>cddddr</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_414"><tt>cdr</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_316"><tt>ceiling</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_498"><tt>char-&gt;integer</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_488"><tt>char-alphabetic?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_484"><tt>char-ci&lt;=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_480"><tt>char-ci&lt;?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_478"><tt>char-ci=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_486"><tt>char-ci&gt;=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_482"><tt>char-ci&gt;?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_504"><tt>char-downcase</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_496"><tt>char-lower-case?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_490"><tt>char-numeric?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_648"><tt>char-ready?</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_650">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_502"><tt>char-upcase</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_494"><tt>char-upper-case?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_492"><tt>char-whitespace?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_474"><tt>char&lt;=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_470"><tt>char&lt;?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_468"><tt>char=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_476"><tt>char&gt;=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_472"><tt>char&gt;?</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_54"><tt>char?</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_466">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_630"><tt>close-input-port</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_632"><tt>close-output-port</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_94">combination</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_158">comma</a><br>
-<a href="r5rs-Z-H-5.html#%_idx_22">comment</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_246"><tt>complex?</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_108"><tt>cond</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_408"><tt>cons</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_72">constant</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_592">continuation</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_332"><tt>cos</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_618"><tt>current-input-port</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_620"><tt>current-output-port</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_236"><tt>#d</tt></a><br>
-<a href="r5rs-Z-H-8.html#%_idx_194"><tt>define</tt></a><br>
-<a href="r5rs-Z-H-8.html#%_idx_202"><tt>define-syntax</tt></a><br>
-<a href="r5rs-Z-H-8.html#%_idx_192">definition</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_146"><tt>delay</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_312"><tt>denominator</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_656"><tt>display</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_658">[2]</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_140"><tt>do</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_392">dotted pair</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_598"><tt>dynamic-wind</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_240"><tt>#e</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_110"><tt>else</tt></a>, <a href="r5rs-Z-H-7.html#%_idx_118">[2]</a><br>
-<a href="r5rs-Z-H-6.html#%_idx_64">empty list</a>, <a href="r5rs-Z-H-9.html#%_idx_384">[2]</a>, 
-<a href="r5rs-Z-H-9.html#%_idx_394">[3]</a>, <a href="r5rs-Z-H-9.html#%_idx_396">[4]</a>, 
-<a href="r5rs-Z-H-9.html#%_idx_398">[5]</a>, <a href="r5rs-Z-H-9.html#%_idx_412">[6]</a>, 
-<a href="r5rs-Z-H-9.html#%_idx_430">[7]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_646"><tt>eof-object?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_220"><tt>eq?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_222"><tt>equal?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_212">equivalence predicate</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_214"><tt>eqv?</tt></a>, <a href="r5rs-Z-H-10.html#%_idx_684">[2]</a><br>
-<a href="r5rs-Z-H-4.html#%_idx_8">error</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_590">escape procedure</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_600"><tt>eval</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_276"><tt>even?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_216">exact</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_360"><tt>exact-&gt;inexact</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_254"><tt>exact?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_228">exactness</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_326"><tt>exp</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_346"><tt>expt</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_374"><tt>#f</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_68">false</a>, <a href="r5rs-Z-H-9.html#%_idx_378">[2]</a>, 
-<a href="r5rs-Z-H-9.html#%_idx_382">[3]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_314"><tt>floor</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_582"><tt>for-each</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_584"><tt>force</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_306"><tt>gcd</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-7.html#%_idx_180">hygienic</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_242"><tt>#i</tt></a><br>
-<a href="r5rs-Z-H-5.html#%_idx_14">identifier</a>, <a href="r5rs-Z-H-6.html#%_idx_26">[2]</a>, 
-<a href="r5rs-Z-H-9.html#%_idx_458">[3]</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_98"><tt>if</tt></a>, <a href="r5rs-Z-H-7.html#%_idx_100">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_354"><tt>imag-part</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_76">immutable</a><br>
-<a href="r5rs-Z-H-4.html#%_idx_10">implementation restriction</a>, 
-<a href="r5rs-Z-H-9.html#%_idx_230">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_400">improper list</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_218">inexact</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_362"><tt>inexact-&gt;exact</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_256"><tt>inexact?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_204">initial environment</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_614"><tt>input-port?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_500"><tt>integer-&gt;char</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_252"><tt>integer?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_606"><tt>interaction-environment</tt></a><br>
-<a href="r5rs-Z-H-8.html#%_idx_198">internal definition</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-7.html#%_idx_170">keyword</a>, <a href="r5rs-Z-H-7.html#%_idx_178">[2]</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-7.html#%_idx_96"><tt>lambda</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_148">lazy evaluation</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_308"><tt>lcm</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_436"><tt>length</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_126"><tt>let</tt></a>, <a href="r5rs-Z-H-7.html#%_idx_144">[2]</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_130"><tt>let*</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_184"><tt>let-syntax</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_134"><tt>letrec</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_186"><tt>letrec-syntax</tt></a><br>
-<a href="r5rs-Z-H-4.html#%_idx_6">library</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_208">library procedure</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_434"><tt>list</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_548"><tt>list-&gt;string</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_572"><tt>list-&gt;vector</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_444"><tt>list-ref</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_442"><tt>list-tail</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_432"><tt>list?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_668"><tt>load</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_70">location</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_328"><tt>log</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-7.html#%_idx_166">macro</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_172">macro keyword</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_176">macro transformer</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_174">macro use</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_356"><tt>magnitude</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_350"><tt>make-polar</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_348"><tt>make-rectangular</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_510"><tt>make-string</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_512">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_558"><tt>make-vector</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_560">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_580"><tt>map</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_278"><tt>max</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_450"><tt>member</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_446"><tt>memq</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_448"><tt>memv</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_280"><tt>min</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_304"><tt>modulo</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_74">mutable</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_272"><tt>negative?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_660"><tt>newline</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_662">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_386"><tt>not</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_604"><tt>null-environment</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_428"><tt>null?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_224">number</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_364"><tt>number-&gt;string</tt></a>, 
-<a href="r5rs-Z-H-9.html#%_idx_366">[2]</a><br>
-<a href="r5rs-Z-H-6.html#%_idx_52"><tt>number?</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_244">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_310"><tt>numerator</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_226">numerical types</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_234"><tt>#o</tt></a><br>
-<a href="r5rs-Z-H-4.html#%_idx_2">object</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_274"><tt>odd?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_626"><tt>open-input-file</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_628"><tt>open-output-file</tt></a><br>
-<a href="r5rs-Z-H-4.html#%_idx_4">optional</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_122"><tt>or</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_616"><tt>output-port?</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_390">pair</a><br>
-<a href="r5rs-Z-H-6.html#%_idx_48"><tt>pair?</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_406">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_642"><tt>peek-char</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_644">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_608">port</a><br>
-<a href="r5rs-Z-H-6.html#%_idx_60"><tt>port?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_270"><tt>positive?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_210">predicate</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_92">procedure call</a><br>
-<a href="r5rs-Z-H-6.html#%_idx_62"><tt>procedure?</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_576">[2]</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_152">promise</a>, <a href="r5rs-Z-H-9.html#%_idx_586">[2]</a><br>
-<a href="r5rs-Z-H-6.html#%_idx_78">proper tail recursion</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-7.html#%_idx_154"><tt>quasiquote</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_86"><tt>quote</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_300"><tt>quotient</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_250"><tt>rational?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_322"><tt>rationalize</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_634"><tt>read</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_636">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_638"><tt>read-char</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_640">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_352"><tt>real-part</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_248"><tt>real?</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_182">referentially transparent</a><br>
-<a href="r5rs-Z-H-6.html#%_idx_36">region</a>, <a href="r5rs-Z-H-7.html#%_idx_106">[2]</a>, 
-<a href="r5rs-Z-H-7.html#%_idx_124">[3]</a>, <a href="r5rs-Z-H-7.html#%_idx_128">[4]</a>, 
-<a href="r5rs-Z-H-7.html#%_idx_132">[5]</a>, <a href="r5rs-Z-H-7.html#%_idx_136">[6]</a>, 
-<a href="r5rs-Z-H-7.html#%_idx_142">[7]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_302"><tt>remainder</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_440"><tt>reverse</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_320"><tt>round</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_602"><tt>scheme-report-environment</tt></a><br>
-<a href="r5rs-Z-H-7.html#%_idx_104"><tt>set!</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_416"><tt>set-car!</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_418"><tt>set-cdr!</tt></a><br>
-<a href="r5rs-Z-H-10.html#%_idx_682"><tt>setcar</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_324">simplest rational</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_330"><tt>sin</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_344"><tt>sqrt</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_514"><tt>string</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_546"><tt>string-&gt;list</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_368"><tt>string-&gt;number</tt></a>, 
-<a href="r5rs-Z-H-9.html#%_idx_370">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_464"><tt>string-&gt;symbol</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_544"><tt>string-append</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_538"><tt>string-ci&lt;=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_534"><tt>string-ci&lt;?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_524"><tt>string-ci=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_540"><tt>string-ci&gt;=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_536"><tt>string-ci&gt;?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_550"><tt>string-copy</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_552"><tt>string-fill!</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_516"><tt>string-length</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_518"><tt>string-ref</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_520"><tt>string-set!</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_530"><tt>string&lt;=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_526"><tt>string&lt;?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_522"><tt>string=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_532"><tt>string&gt;=?</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_528"><tt>string&gt;?</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_56"><tt>string?</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_508">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_542"><tt>substring</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_462"><tt>symbol-&gt;string</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_50"><tt>symbol?</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_460">[2]</a><br>
-<a href="r5rs-Z-H-5.html#%_idx_18">syntactic keyword</a>, 
-<a href="r5rs-Z-H-6.html#%_idx_28">[2]</a>, <a href="r5rs-Z-H-7.html#%_idx_168">[3]</a><br>
-<a href="r5rs-Z-H-8.html#%_idx_200">syntax definition</a><br>
-<a href="r5rs-Z-H-7.html#%_idx_188"><tt>syntax-rules</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_372"><tt>#t</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_80">tail call</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_334"><tt>tan</tt></a><br>
-<a href="r5rs-Z-H-10.html#%_idx_674">token</a><br>
-<a href="r5rs-Z-H-6.html#%_idx_42">top level environment</a>, 
-<a href="r5rs-Z-H-9.html#%_idx_206">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_672"><tt>transcript-off</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_670"><tt>transcript-on</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_66">true</a>, <a href="r5rs-Z-H-7.html#%_idx_102">[2]</a>, 
-<a href="r5rs-Z-H-7.html#%_idx_114">[3]</a>, <a href="r5rs-Z-H-9.html#%_idx_376">[4]</a>, 
-<a href="r5rs-Z-H-9.html#%_idx_380">[5]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_318"><tt>truncate</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_44">type</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-6.html#%_idx_38">unbound</a>, <a href="r5rs-Z-H-7.html#%_idx_84">[2]</a>, 
-<a href="r5rs-Z-H-8.html#%_idx_196">[3]</a><br>
-<a href="r5rs-Z-H-4.html#%_idx_12">unspecified</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_506">valid indexes</a>, 
-<a href="r5rs-Z-H-9.html#%_idx_554">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_594"><tt>values</tt></a><br>
-<a href="r5rs-Z-H-5.html#%_idx_16">variable</a>, <a href="r5rs-Z-H-6.html#%_idx_30">[2]</a>, 
-<a href="r5rs-Z-H-7.html#%_idx_82">[3]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_562"><tt>vector</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_570"><tt>vector-&gt;list</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_574"><tt>vector-fill!</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_564"><tt>vector-length</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_566"><tt>vector-ref</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_568"><tt>vector-set!</tt></a><br>
-<a href="r5rs-Z-H-6.html#%_idx_58"><tt>vector?</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_556">[2]</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-5.html#%_idx_20">Whitespace</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_622"><tt>with-input-from-file</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_624"><tt>with-output-to-file</tt></a><br>
-<a href="r5rs-Z-H-9.html#%_idx_652"><tt>write</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_654">[2]</a><br>
-<a href="r5rs-Z-H-9.html#%_idx_664"><tt>write-char</tt></a>, <a href="r5rs-Z-H-9.html#%_idx_666">[2]</a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_238"><tt>#x</tt></a></p>
-<p>
-</p>
-<p></p>
-<p>
-<br>
-<a href="r5rs-Z-H-9.html#%_idx_268"><tt>zero?</tt></a></p>
-<p>
-</p>
-
-
-<p>
-</p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-14.html">previous</a></span><span class=disable>, next</span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span class=disable><span>; &nbsp;&nbsp;</span>index</span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-2.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-2.html
deleted file mode 100644
index bc873e9b10..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-2.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-1.html">previous</a></span><span>, <a href="r5rs-Z-H-3.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span class=disable>contents</span><span><span class=disable>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_Temp_2"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-Contents</h1>
-<p></p>
-<p></p>
-<p>                    <a name="%_toc_start"></p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_Temp_3" href="r5rs-Z-H-3.html#%_chap_Temp_3">Introduction</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_Temp_4" href="r5rs-Z-H-3.html#%_sec_Temp_4">Background</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_Temp_5" href="r5rs-Z-H-3.html#%_sec_Temp_5">Acknowledgements</a><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_1" href="r5rs-Z-H-4.html#%_chap_1">1&nbsp;&nbsp;Overview of Scheme</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_1.1" href="r5rs-Z-H-4.html#%_sec_1.1">1.1&nbsp;&nbsp;Semantics</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_1.2" href="r5rs-Z-H-4.html#%_sec_1.2">1.2&nbsp;&nbsp;Syntax</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_1.3" href="r5rs-Z-H-4.html#%_sec_1.3">1.3&nbsp;&nbsp;Notation and terminology</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_1.3.1" href="r5rs-Z-H-4.html#%_sec_1.3.1">1.3.1&nbsp;&nbsp;Primitive, library, and optional features</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_1.3.2" href="r5rs-Z-H-4.html#%_sec_1.3.2">1.3.2&nbsp;&nbsp;Error situations and unspecified behavior</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_1.3.3" href="r5rs-Z-H-4.html#%_sec_1.3.3">1.3.3&nbsp;&nbsp;Entry format</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_1.3.4" href="r5rs-Z-H-4.html#%_sec_1.3.4">1.3.4&nbsp;&nbsp;Evaluation examples</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_1.3.5" href="r5rs-Z-H-4.html#%_sec_1.3.5">1.3.5&nbsp;&nbsp;Naming conventions</a><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_2" href="r5rs-Z-H-5.html#%_chap_2">2&nbsp;&nbsp;Lexical conventions</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_2.1" href="r5rs-Z-H-5.html#%_sec_2.1">2.1&nbsp;&nbsp;Identifiers</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_2.2" href="r5rs-Z-H-5.html#%_sec_2.2">2.2&nbsp;&nbsp;Whitespace and comments</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_2.3" href="r5rs-Z-H-5.html#%_sec_2.3">2.3&nbsp;&nbsp;Other notations</a><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_3" href="r5rs-Z-H-6.html#%_chap_3">3&nbsp;&nbsp;Basic concepts</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_3.1" href="r5rs-Z-H-6.html#%_sec_3.1">3.1&nbsp;&nbsp;Variables, syntactic keywords, and regions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_3.2" href="r5rs-Z-H-6.html#%_sec_3.2">3.2&nbsp;&nbsp;Disjointness of types</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_3.3" href="r5rs-Z-H-6.html#%_sec_3.3">3.3&nbsp;&nbsp;External representations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_3.4" href="r5rs-Z-H-6.html#%_sec_3.4">3.4&nbsp;&nbsp;Storage model</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_3.5" href="r5rs-Z-H-6.html#%_sec_3.5">3.5&nbsp;&nbsp;Proper tail recursion</a><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_4" href="r5rs-Z-H-7.html#%_chap_4">4&nbsp;&nbsp;Expressions</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.1" href="r5rs-Z-H-7.html#%_sec_4.1">4.1&nbsp;&nbsp;Primitive expression types</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.1.1" href="r5rs-Z-H-7.html#%_sec_4.1.1">4.1.1&nbsp;&nbsp;Variable references</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.1.2" href="r5rs-Z-H-7.html#%_sec_4.1.2">4.1.2&nbsp;&nbsp;Literal expressions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.1.3" href="r5rs-Z-H-7.html#%_sec_4.1.3">4.1.3&nbsp;&nbsp;Procedure calls</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.1.4" href="r5rs-Z-H-7.html#%_sec_4.1.4">4.1.4&nbsp;&nbsp;Procedures</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.1.5" href="r5rs-Z-H-7.html#%_sec_4.1.5">4.1.5&nbsp;&nbsp;Conditionals</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.1.6" href="r5rs-Z-H-7.html#%_sec_4.1.6">4.1.6&nbsp;&nbsp;Assignments</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.2" href="r5rs-Z-H-7.html#%_sec_4.2">4.2&nbsp;&nbsp;Derived expression types</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.2.1" href="r5rs-Z-H-7.html#%_sec_4.2.1">4.2.1&nbsp;&nbsp;Conditionals</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.2.2" href="r5rs-Z-H-7.html#%_sec_4.2.2">4.2.2&nbsp;&nbsp;Binding constructs</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.2.3" href="r5rs-Z-H-7.html#%_sec_4.2.3">4.2.3&nbsp;&nbsp;Sequencing</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.2.4" href="r5rs-Z-H-7.html#%_sec_4.2.4">4.2.4&nbsp;&nbsp;Iteration</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.2.5" href="r5rs-Z-H-7.html#%_sec_4.2.5">4.2.5&nbsp;&nbsp;Delayed evaluation</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.2.6" href="r5rs-Z-H-7.html#%_sec_4.2.6">4.2.6&nbsp;&nbsp;Quasiquotation</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.3" href="r5rs-Z-H-7.html#%_sec_4.3">4.3&nbsp;&nbsp;Macros</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.3.1" href="r5rs-Z-H-7.html#%_sec_4.3.1">4.3.1&nbsp;&nbsp;Binding constructs for syntactic keywords</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_4.3.2" href="r5rs-Z-H-7.html#%_sec_4.3.2">4.3.2&nbsp;&nbsp;Pattern language</a><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_5" href="r5rs-Z-H-8.html#%_chap_5">5&nbsp;&nbsp;Program structure</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_5.1" href="r5rs-Z-H-8.html#%_sec_5.1">5.1&nbsp;&nbsp;Programs</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_5.2" href="r5rs-Z-H-8.html#%_sec_5.2">5.2&nbsp;&nbsp;Definitions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_5.2.1" href="r5rs-Z-H-8.html#%_sec_5.2.1">5.2.1&nbsp;&nbsp;Top level definitions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_5.2.2" href="r5rs-Z-H-8.html#%_sec_5.2.2">5.2.2&nbsp;&nbsp;Internal definitions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_5.3" href="r5rs-Z-H-8.html#%_sec_5.3">5.3&nbsp;&nbsp;Syntax definitions</a><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_6" href="r5rs-Z-H-9.html#%_chap_6">6&nbsp;&nbsp;Standard procedures</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.1" href="r5rs-Z-H-9.html#%_sec_6.1">6.1&nbsp;&nbsp;Equivalence predicates</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.2" href="r5rs-Z-H-9.html#%_sec_6.2">6.2&nbsp;&nbsp;Numbers</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.2.1" href="r5rs-Z-H-9.html#%_sec_6.2.1">6.2.1&nbsp;&nbsp;Numerical types</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.2.2" href="r5rs-Z-H-9.html#%_sec_6.2.2">6.2.2&nbsp;&nbsp;Exactness</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.2.3" href="r5rs-Z-H-9.html#%_sec_6.2.3">6.2.3&nbsp;&nbsp;Implementation restrictions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.2.4" href="r5rs-Z-H-9.html#%_sec_6.2.4">6.2.4&nbsp;&nbsp;Syntax of numerical constants</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.2.5" href="r5rs-Z-H-9.html#%_sec_6.2.5">6.2.5&nbsp;&nbsp;Numerical operations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.2.6" href="r5rs-Z-H-9.html#%_sec_6.2.6">6.2.6&nbsp;&nbsp;Numerical input and output</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.3" href="r5rs-Z-H-9.html#%_sec_6.3">6.3&nbsp;&nbsp;Other data types</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.3.1" href="r5rs-Z-H-9.html#%_sec_6.3.1">6.3.1&nbsp;&nbsp;Booleans</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.3.2" href="r5rs-Z-H-9.html#%_sec_6.3.2">6.3.2&nbsp;&nbsp;Pairs and lists</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.3.3" href="r5rs-Z-H-9.html#%_sec_6.3.3">6.3.3&nbsp;&nbsp;Symbols</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.3.4" href="r5rs-Z-H-9.html#%_sec_6.3.4">6.3.4&nbsp;&nbsp;Characters</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.3.5" href="r5rs-Z-H-9.html#%_sec_6.3.5">6.3.5&nbsp;&nbsp;Strings</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.3.6" href="r5rs-Z-H-9.html#%_sec_6.3.6">6.3.6&nbsp;&nbsp;Vectors</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.4" href="r5rs-Z-H-9.html#%_sec_6.4">6.4&nbsp;&nbsp;Control features</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.5" href="r5rs-Z-H-9.html#%_sec_6.5">6.5&nbsp;&nbsp;<tt>Eval</tt></a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.6" href="r5rs-Z-H-9.html#%_sec_6.6">6.6&nbsp;&nbsp;Input and output</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.6.1" href="r5rs-Z-H-9.html#%_sec_6.6.1">6.6.1&nbsp;&nbsp;Ports</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.6.2" href="r5rs-Z-H-9.html#%_sec_6.6.2">6.6.2&nbsp;&nbsp;Input</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.6.3" href="r5rs-Z-H-9.html#%_sec_6.6.3">6.6.3&nbsp;&nbsp;Output</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_6.6.4" href="r5rs-Z-H-9.html#%_sec_6.6.4">6.6.4&nbsp;&nbsp;System interface</a><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_7" href="r5rs-Z-H-10.html#%_chap_7">7&nbsp;&nbsp;Formal syntax and semantics</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.1" href="r5rs-Z-H-10.html#%_sec_7.1">7.1&nbsp;&nbsp;Formal syntax</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.1.1" href="r5rs-Z-H-10.html#%_sec_7.1.1">7.1.1&nbsp;&nbsp;Lexical structure</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.1.2" href="r5rs-Z-H-10.html#%_sec_7.1.2">7.1.2&nbsp;&nbsp;External representations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.1.3" href="r5rs-Z-H-10.html#%_sec_7.1.3">7.1.3&nbsp;&nbsp;Expressions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.1.4" href="r5rs-Z-H-10.html#%_sec_7.1.4">7.1.4&nbsp;&nbsp;Quasiquotations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.1.5" href="r5rs-Z-H-10.html#%_sec_7.1.5">7.1.5&nbsp;&nbsp;Transformers</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.1.6" href="r5rs-Z-H-10.html#%_sec_7.1.6">7.1.6&nbsp;&nbsp;Programs and definitions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.2" href="r5rs-Z-H-10.html#%_sec_7.2">7.2&nbsp;&nbsp;Formal semantics</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.2.1" href="r5rs-Z-H-10.html#%_sec_7.2.1">7.2.1&nbsp;&nbsp;Abstract syntax</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.2.2" href="r5rs-Z-H-10.html#%_sec_7.2.2">7.2.2&nbsp;&nbsp;Domain equations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.2.3" href="r5rs-Z-H-10.html#%_sec_7.2.3">7.2.3&nbsp;&nbsp;Semantic functions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.2.4" href="r5rs-Z-H-10.html#%_sec_7.2.4">7.2.4&nbsp;&nbsp;Auxiliary functions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_7.3" href="r5rs-Z-H-10.html#%_sec_7.3">7.3&nbsp;&nbsp;Derived expression types</a><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_Temp_6" href="r5rs-Z-H-11.html#%_chap_Temp_6">Notes</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="%_toc_%_sec_Temp_7" href="r5rs-Z-H-11.html#%_sec_Temp_7">Language changes</a><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_Temp_8" href="r5rs-Z-H-12.html#%_chap_Temp_8">Additional material</a></b><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_Temp_9" href="r5rs-Z-H-13.html#%_chap_Temp_9">Example</a></b><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_Temp_10" href="r5rs-Z-H-14.html#%_chap_Temp_10">Bibliography</a></b><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="%_toc_%_chap_Temp_11" href="r5rs-Z-H-15.html#%_chap_Temp_11">Alphabetic Index of Definitions of Concepts,
-Keywords, and Procedures</a></b><br>
-</p>
-<p>
-   </p>
-<p>
-
-</p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-1.html">previous</a></span><span>, <a href="r5rs-Z-H-3.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span class=disable>contents</span><span><span class=disable>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-3.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-3.html
deleted file mode 100644
index 570e1f4e7f..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-3.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-2.html">previous</a></span><span>, <a href="r5rs-Z-H-4.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_Temp_3"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_Temp_3">Introduction</a></h1>
-<p>
-</p>
-<p>
-</p>
-<p>
-Programming languages should be designed not by piling feature on top of
-feature, but by removing the weaknesses and restrictions that make additional
-features appear necessary.  Scheme demonstrates that a very small number
-of rules for forming expressions, with no restrictions on how they are
-composed, suffice to form a practical and efficient programming language
-that is flexible enough to support most of the major programming
-paradigms in use today.</p>
-<p>
-Scheme
-was one of the first programming languages to incorporate first class
-procedures as in the lambda calculus, thereby proving the usefulness of
-static scope rules and block structure in a dynamically typed language.
-Scheme was the first major dialect of Lisp to distinguish procedures
-from lambda expressions and symbols, to use a single lexical
-environment for all variables, and to evaluate the operator position
-of a procedure call in the same way as an operand position.  By relying
-entirely on procedure calls to express iteration, Scheme emphasized the
-fact that tail-recursive procedure calls are essentially goto's that
-pass arguments.  Scheme was the first widely used programming language to
-embrace first class escape procedures, from which all previously known
-sequential control structures can be synthesized.  A subsequent
-version of Scheme introduced the concept of exact and inexact numbers,
-an extension of Common Lisp's generic arithmetic.
-More recently, Scheme became the first programming language to support
-hygienic macros, which permit the syntax of a block-structured language
-to be extended in a consistent and reliable manner.
-
-</p>
-<p>
-</p>
-<a name="%_sec_Temp_4"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_Temp_4">Background</a></h3>
-<p>The first description of Scheme was written in
-1975&nbsp;[<a href="r5rs-Z-H-14.html#cite{Scheme75}">28</a>].  A revised report&nbsp;[<a href="r5rs-Z-H-14.html#cite{Scheme78}">25</a>]
- appeared in 1978, which described the evolution
-of the language as its MIT implementation was upgraded to support an
-innovative compiler&nbsp;[<a href="r5rs-Z-H-14.html#cite{Rabbit}">26</a>].  Three distinct projects began in
-1981 and 1982 to use variants of Scheme for courses at MIT, Yale, and
-Indiana University&nbsp;[<a href="r5rs-Z-H-14.html#cite{Rees82}">21</a>,&nbsp;<a href="r5rs-Z-H-14.html#cite{MITScheme}">17</a>,&nbsp;<a href="r5rs-Z-H-14.html#cite{Scheme311}">10</a>].  An introductory
-computer science textbook using Scheme was published in
-1984&nbsp;[<a href="r5rs-Z-H-14.html#cite{SICP}">1</a>].</p>
-<p>
-As Scheme became more widespread,
-local dialects began to diverge until students and researchers
-occasionally found it difficult to understand code written at other
-sites.
-Fifteen representatives of the major implementations of Scheme therefore
-met in October 1984 to work toward a better and more widely accepted
-standard for Scheme.
-Their report&nbsp;[<a href="r5rs-Z-H-14.html#cite{RRRS}">4</a>]
-was published at MIT and Indiana University in the summer of 1985.
-Further revision took place in the spring of 1986&nbsp;[<a href="r5rs-Z-H-14.html#cite{R3RS}">23</a>],
-and in the spring of 1988&nbsp;[<a href="r5rs-Z-H-14.html#cite{R4RS}">6</a>].
-The present report reflects further revisions agreed upon in a meeting
-at Xerox PARC in June 1992.</p>
-<p>
-
-</p>
-<p>
-</p>
-<p></p>
-<p></p>
-<p>
-We intend this report to belong to the entire Scheme community, and so
-we grant permission to copy it in whole or in part without fee.  In
-particular, we encourage implementors of Scheme to use this report as
-a starting point for manuals and other documentation, modifying it as
-necessary.</p>
-<p>
-</p>
-<a name="%_sec_Temp_5"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_Temp_5">Acknowledgements</a></h3>
-<p>We would like to thank the following people for their help: Alan Bawden, Michael
-Blair, George Carrette, Andy Cromarty, Pavel Curtis, Jeff Dalton, Olivier Danvy,
-Ken Dickey, Bruce Duba, Marc Feeley,
-Andy Freeman, Richard Gabriel, Yekta G&uuml;rsel, Ken Haase, Robert
-Hieb, Paul Hudak, Morry Katz, Chris Lindblad, Mark Meyer, Jim Miller, Jim Philbin,
-John Ramsdell, Mike Shaff, Jonathan Shapiro, Julie Sussman,
-Perry Wagle, Daniel Weise, Henry Wu, and Ozan Yigit.
-We thank Carol Fessenden, Daniel
-Friedman, and Christopher Haynes for permission to use text from the Scheme 311
-version 4 reference manual.  We thank Texas Instruments, Inc.&nbsp;for permission to
-use text from the <em>TI Scheme Language Reference Manual</em>[<a href="r5rs-Z-H-14.html#cite{TImanual85}">30</a>].
-We gladly acknowledge the influence of manuals for MIT Scheme[<a href="r5rs-Z-H-14.html#cite{MITScheme}">17</a>],
-T[<a href="r5rs-Z-H-14.html#cite{Rees84}">22</a>], Scheme 84[<a href="r5rs-Z-H-14.html#cite{Scheme84}">11</a>],Common Lisp[<a href="r5rs-Z-H-14.html#cite{CLtL}">27</a>],
-and Algol 60[<a href="r5rs-Z-H-14.html#cite{Naur63}">18</a>].</p>
-<p>
-We also thank Betty Dexter for the extreme effort she put into
-setting this report in T<small>E</small>X, and Donald Knuth for designing the program
-that caused her troubles.</p>
-<p>
-The Artificial Intelligence Laboratory of the
-Massachusetts Institute of Technology, the Computer Science
-Department of Indiana University, the Computer and Information
-Sciences Department of the University of Oregon, and the NEC Research
-Institute supported the preparation of this report.  Support for the MIT
-work was provided in part by
-the Advanced Research Projects Agency of the Department of Defense under Office
-of Naval Research contract N00014-80-C-0505.  Support for the Indiana
-University work was provided by NSF grants NCS 83-04567 and NCS
-83-03325.</p>
-<p>
-   </p>
-<p></p>
-<p></p>
-<p>
- 
-</p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-2.html">previous</a></span><span>, <a href="r5rs-Z-H-4.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-4.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-4.html
deleted file mode 100644
index 6797aca6ac..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-4.html
+++ /dev/null
@@ -1,300 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-3.html">previous</a></span><span>, <a href="r5rs-Z-H-5.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_1"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r5rs-Z-H-2.html#%_toc_%_chap_1">Chapter 1</a></div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_1">Overview of Scheme</a></h1>
-<p></p>
-<a name="%_sec_1.1"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_1.1">1.1&nbsp;&nbsp;Semantics</a></h2>
-<p></p>
-<p>
-This section gives an overview of Scheme's semantics.  A
-detailed informal semantics is the subject of
-chapters&nbsp;<a href="r5rs-Z-H-6.html#%_chap_3">3</a> through&nbsp;<a href="r5rs-Z-H-9.html#%_chap_6">6</a>.  For reference
-purposes, section&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.2">7.2</a> provides a formal
-semantics of Scheme.</p>
-<p>
-Following Algol, Scheme is a statically scoped programming
-language.  Each use of a variable is associated with a lexically
-apparent binding of that variable.</p>
-<p>
-Scheme has latent as opposed to manifest types.  Types
-are associated with values (also called objects<a name="%_idx_2"></a>) rather than
-with variables.  (Some authors refer to languages with latent types as
-weakly typed or dynamically typed languages.)  Other languages with
-latent types are APL, Snobol, and other dialects of Lisp.  Languages
-with manifest types (sometimes referred to as strongly typed or
-statically typed languages) include Algol 60, Pascal, and&nbsp;C.</p>
-<p>
-All objects created in the course of a Scheme computation, including
-procedures and continuations, have unlimited extent.
-No Scheme object is ever destroyed.  The reason that
-implementations of Scheme do not (usually!) run out of storage is that
-they are permitted to reclaim the storage occupied by an object if
-they can prove that the object cannot possibly matter to any future
-computation.  Other languages in which most objects have unlimited
-extent include APL and other Lisp dialects.</p>
-<p>
-Implementations of Scheme are required to be properly tail-recursive.
-This allows the execution of an iterative computation in constant space,
-even if the iterative computation is described by a syntactically
-recursive procedure.  Thus with a properly tail-recursive implementation,
-iteration can be expressed using the ordinary procedure-call
-mechanics, so that special iteration constructs are useful only as
-syntactic sugar.  See section&nbsp;<a href="r5rs-Z-H-6.html#%_sec_3.5">3.5</a>.</p>
-<p>
-Scheme procedures are objects in their own right.  Procedures can be
-created dynamically, stored in data structures, returned as results of
-procedures, and so on.  Other languages with these properties include
-Common Lisp and ML. </p>
-<p>
-One distinguishing feature of Scheme is that continuations, which
-in most other languages only operate behind the scenes, also have
-``first-class'' status.  Continuations are useful for implementing a
-wide variety of advanced control constructs, including non-local exits,
-backtracking, and coroutines.  See section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.4">6.4</a>.</p>
-<p>
-Arguments to Scheme procedures are always passed by value, which
-means that the actual argument expressions are evaluated before the
-procedure gains control, whether the procedure needs the result of the
-evaluation or not.  ML, C, and APL are three other languages that always
-pass arguments by value.
-This is distinct from the lazy-evaluation semantics of Haskell,
-or the call-by-name semantics of Algol 60, where an argument
-expression is not evaluated unless its value is needed by the
-procedure.</p>
-<p>
-</p>
-<p>
-Scheme's model of arithmetic is designed to remain as independent as
-possible of the particular ways in which numbers are represented within a
-computer. In Scheme, every integer is a rational number, every rational is a
-real, and every real is a complex number.  Thus the distinction between integer
-and real arithmetic, so important to many programming languages, does not
-appear in Scheme.  In its place is a distinction between exact arithmetic,
-which corresponds to the mathematical ideal, and inexact arithmetic on
-approximations.  As in Common Lisp, exact arithmetic is not limited to
-integers.</p>
-<p>
-</p>
-<a name="%_sec_1.2"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_1.2">1.2&nbsp;&nbsp;Syntax</a></h2>
-<p>Scheme, like most dialects of Lisp, employs a fully parenthesized prefix
-notation for programs and (other) data; the grammar of Scheme generates a
-sublanguage of the language used for data.  An important
-consequence of this simple, uniform representation is the susceptibility of
-Scheme programs and data to uniform treatment by other Scheme programs.
-For example, the <tt>eval</tt> procedure evaluates a Scheme program expressed
-as data.</p>
-<p>
-The <tt>read</tt> procedure performs syntactic as well as lexical decomposition of
-the data it reads.  The <tt>read</tt> procedure parses its input as data
-(section&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.1.2">7.1.2</a>), not as program.</p>
-<p>
-The formal syntax of Scheme is described in section&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.1">7.1</a>.</p>
-<p>
-</p>
-<a name="%_sec_1.3"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_1.3">1.3&nbsp;&nbsp;Notation and terminology</a></h2>
-<p></p>
-<a name="%_sec_1.3.1"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_1.3.1">1.3.1&nbsp;&nbsp;Primitive, library, and optional features</a></h3>
-<p></p>
-<p>
-It is required that every implementation of Scheme support all
-features that are not marked as being <a name="%_idx_4"></a><em>optional</em>.  Implementations are
-free to omit optional features of Scheme or to add extensions,
-provided the extensions are not in conflict with the language reported
-here.  In particular, implementations must support portable code by
-providing a syntactic mode that preempts no lexical conventions of this
-report.</p>
-<p>
-To aid in understanding and implementing Scheme, some features are marked
-as <a name="%_idx_6"></a><em>library</em>. These can be easily implemented in terms of the other,
-primitive, features.  They are redundant in the strict sense of
-the word, but they capture common patterns of usage, and are therefore
-provided as convenient abbreviations.</p>
-<p>
-</p>
-<a name="%_sec_1.3.2"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_1.3.2">1.3.2&nbsp;&nbsp;Error situations and unspecified behavior</a></h3>
-<p><a name="%_idx_8"></a>
-When speaking of an error situation, this report uses the phrase ``an
-error is signalled'' to indicate that implementations must detect and
-report the error.  If such wording does not appear in the discussion of
-an error, then implementations are not required to detect or report the
-error, though they are encouraged to do so.  An error situation that
-implementations are not required to detect is usually referred to simply
-as ``an error.''</p>
-<p>
-For example, it is an error for a procedure to be passed an argument that
-the procedure is not explicitly specified to handle, even though such
-domain errors are seldom mentioned in this report.  Implementations may
-extend a procedure's domain of definition to include such arguments.</p>
-<p>
-This report uses the phrase ``may report a violation of an
-implementation restriction'' to indicate circumstances under which an
-implementation is permitted to report that it is unable to continue
-execution of a correct program because of some restriction imposed by the
-implementation.  Implementation restrictions are of course discouraged,
-but implementations are encouraged to report violations of implementation
-restrictions.<a name="%_idx_10"></a></p>
-<p>
-For example, an implementation may report a violation of an
-implementation restriction if it does not have enough storage to run a
-program.</p>
-<p>
-If the value of an expression is said to be ``unspecified,'' then
-the expression must evaluate to some object without signalling an error,
-but the value depends on the implementation; this report explicitly does
-not say what value should be returned. <a name="%_idx_12"></a></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<a name="%_sec_1.3.3"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_1.3.3">1.3.3&nbsp;&nbsp;Entry format</a></h3>
-<p>Chapters&nbsp;<a href="r5rs-Z-H-7.html#%_chap_4">4</a> and&nbsp;<a href="r5rs-Z-H-9.html#%_chap_6">6</a> are organized
-into entries.  Each entry describes one language feature or a group of
-related features, where a feature is either a syntactic construct or a
-built-in procedure.  An entry begins with one or more header lines of the form</p>
-<p>
-</p>
-<div align=left><u><i>category</i>:</u>&nbsp;&nbsp;<tt><i>template</i></tt>&nbsp;</div>
-
-<p>
-for required, primitive features, or</p>
-<p>
-</p>
-<div align=left><u><i>qualifier</i> <i>category</i>:</u>&nbsp;&nbsp;<tt><i>template</i></tt>&nbsp;</div>
-
-<p>
-where <i>qualifier</i> is either ``library'' or ``optional'' as defined
-in section&nbsp;<a href="#%_sec_1.3.1">1.3.1</a>.</p>
-<p>
-If <i>category</i> is ``syntax'', the entry describes an expression
-type, and the template gives the syntax of the expression type.
-Components of expressions are designated by syntactic variables, which
-are written using angle brackets, for example, &lt;expression&gt;,
-&lt;variable&gt;.  Syntactic variables should be understood to denote segments of
-program text; for example, &lt;expression&gt; stands for any string of
-characters which is a syntactically valid expression.  The notation
-</p>
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;thing<sub>1</sub>&gt; <tt>...</tt>
-</p>
-
-<p>
-indicates zero or more occurrences of a &lt;thing&gt;, and
-</p>
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;thing<sub>1</sub>&gt; &lt;thing<sub>2</sub>&gt; <tt>...</tt>
-</p>
-
-<p>
-indicates one or more occurrences of a &lt;thing&gt;.</p>
-<p>
-If <i>category</i> is ``procedure'', then the entry describes a procedure, and
-the header line gives a template for a call to the procedure.  Argument
-names in the template are <i>italicized</i>.  Thus the header line</p>
-<p>
-</p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(vector-ref <i>vector</i> <i>k</i>)</tt>&nbsp;</div>
-
-<p>
-indicates that the built-in procedure <tt>vector-ref</tt> takes
-two arguments, a vector <i>vector</i> and an exact non-negative integer
-<i>k</i> (see below).  The header lines</p>
-<p>
-</p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(make-vector <i>k</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(make-vector <i>k</i> <i>fill</i>)</tt>&nbsp;</div>
-
-<p>
-indicate that the <tt>make-vector</tt> procedure must be defined to take
-either one or two arguments.</p>
-<p>
-
-It is an error for an operation to be presented with an argument that it
-is not specified to handle.  For succinctness, we follow the convention
-that if an argument name is also the name of a type listed in
-section&nbsp;<a href="r5rs-Z-H-6.html#%_sec_3.2">3.2</a>, then that argument must be of the named type.
-For example, the header line for <tt>vector-ref</tt> given above dictates that the
-first argument to <tt>vector-ref</tt> must be a vector.  The following naming
-conventions also imply type restrictions:
-
-</p>
-<div align=left><table><tr><td>
-
-
-<table border=0><tr><td valign=top ><i>obj</i></td><td valign=top >any object</td></tr>
-<tr><td valign=top ><em>l</em><em>i</em><em>s</em><em>t</em>, <em>l</em><em>i</em><em>s</em><em>t</em><sub>1</sub>, <tt>...</tt> <em>l</em><em>i</em><em>s</em><em>t</em><sub><em>j</em></sub>, <tt>...</tt></td><td valign=top >list (see section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.2">6.3.2</a>)</td></tr>
-<tr><td valign=top ><em>z</em>, <em>z</em><sub>1</sub>, <tt>...</tt> <em>z</em><sub><em>j</em></sub>, <tt>...</tt></td><td valign=top >complex number</td></tr>
-<tr><td valign=top ><em>x</em>, <em>x</em><sub>1</sub>, <tt>...</tt> <em>x</em><sub><em>j</em></sub>, <tt>...</tt></td><td valign=top >real number</td></tr>
-<tr><td valign=top ><em>y</em>, <em>y</em><sub>1</sub>, <tt>...</tt> <em>y</em><sub><em>j</em></sub>, <tt>...</tt></td><td valign=top >real number</td></tr>
-<tr><td valign=top ><em>q</em>, <em>q</em><sub>1</sub>, <tt>...</tt> <em>q</em><sub><em>j</em></sub>, <tt>...</tt></td><td valign=top >rational number</td></tr>
-<tr><td valign=top ><em>n</em>, <em>n</em><sub>1</sub>, <tt>...</tt> <em>n</em><sub><em>j</em></sub>, <tt>...</tt></td><td valign=top >integer</td></tr>
-<tr><td valign=top ><em>k</em>, <em>k</em><sub>1</sub>, <tt>...</tt> <em>k</em><sub><em>j</em></sub>, <tt>...</tt></td><td valign=top >exact non-negative integer</td></tr>
-<tr><td valign=top ></td></tr></table>
-</td></tr></table></div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<a name="%_sec_1.3.4"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_1.3.4">1.3.4&nbsp;&nbsp;Evaluation examples</a></h3>
-<p>The symbol ``===&gt;'' used in program examples should be read
-``evaluates to.''  For example,</p>
-<p>
-<tt>(*&nbsp;5&nbsp;8)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;40</p>
-</tt>
-<p>
-means that the expression <tt>(* 5 8)</tt> evaluates to the object <tt>40</tt>.
-Or, more precisely:  the expression given by the sequence of characters
-``<tt>(* 5 8)</tt>'' evaluates, in the initial environment, to an object
-that may be represented externally by the sequence of characters ``<tt>40</tt>''.  See section&nbsp;<a href="r5rs-Z-H-6.html#%_sec_3.3">3.3</a> for a discussion of external
-representations of objects.</p>
-<p>
-</p>
-<a name="%_sec_1.3.5"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_1.3.5">1.3.5&nbsp;&nbsp;Naming conventions</a></h3>
-<p>By convention, the names of procedures that always return a boolean
-value usually end
-in ``<tt>?</tt>''.  Such procedures are called predicates.</p>
-<p>
-By convention, the names of procedures that store values into previously
-allocated locations (see section&nbsp;<a href="r5rs-Z-H-6.html#%_sec_3.4">3.4</a>) usually end in
-``<tt>!</tt>''.
-Such procedures are called mutation procedures.
-By convention, the value returned by a mutation procedure is unspecified.</p>
-<p>
-By convention, ``<tt>-&gt;</tt>'' appears within the names of procedures that
-take an object of one type and return an analogous object of another type.
-For example, <tt>list-&gt;vector</tt> takes a list and returns a vector whose
-elements are the same as those of the list.</p>
-<p>
-
-  </p>
-<p>
-</p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-3.html">previous</a></span><span>, <a href="r5rs-Z-H-5.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-5.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-5.html
deleted file mode 100644
index c032fa15a7..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-5.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-4.html">previous</a></span><span>, <a href="r5rs-Z-H-6.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_2"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r5rs-Z-H-2.html#%_toc_%_chap_2">Chapter 2</a></div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_2">Lexical conventions</a></h1>
-<p>This section gives an informal account of some of the lexical
-conventions used in writing Scheme programs.  For a formal syntax of
-Scheme, see section&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.1">7.1</a>.</p>
-<p>
-Upper and lower case forms of a letter are never distinguished
-except within character and string constants.  For example, <tt>Foo</tt> is
-the same identifier as <tt>FOO</tt>, and <tt>#x1AB</tt> is the same number as
-<tt>#X1ab</tt>.</p>
-<p>
-</p>
-<a name="%_sec_2.1"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_2.1">2.1&nbsp;&nbsp;Identifiers</a></h2>
-<p></p>
-<p>
-Most identifiers<a name="%_idx_14"></a> allowed by other programming
-languages are also acceptable to Scheme.  The precise rules for forming
-identifiers vary among implementations of Scheme, but in all
-implementations a sequence of letters, digits, and ``extended alphabetic
-characters'' that begins with a character that cannot begin a number is
-an identifier.  In addition, <tt>+</tt>, <tt>-</tt>, and <tt>...</tt> are identifiers. 
-Here are some examples of identifiers:</p>
-<p>
-<tt>lambda&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;q<br>
-list-&gt;vector&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;soup<br>
-+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;V17a<br>
-&lt;=?&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;a34kTMNs<br>
-the-word-recursion-has-many-meanings</p>
-</tt>
-<p>
-Extended alphabetic characters may be used within identifiers as if
-they were letters.  The following are extended alphabetic characters:</p>
-<p>
-<tt>! $&nbsp;%&nbsp;<code class=verbatim>&amp;</code>&nbsp;*&nbsp;+&nbsp;-&nbsp;.&nbsp;/&nbsp;: &lt;&nbsp;=&nbsp;&gt;&nbsp;?&nbsp;@&nbsp;<code class=verbatim>^</code>&nbsp;<code class=verbatim>_</code>&nbsp;<code class=verbatim>~</code>&nbsp;</p>
-</tt>
-<p>
-See section&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.1.1">7.1.1</a> for a formal syntax of identifiers.</p>
-<p>
-Identifiers have two uses within Scheme programs:
-</p>
-<ul>
-<li>
-<p>Any identifier may be used as a variable<a name="%_idx_16"></a>
-or as a syntactic keyword<a name="%_idx_18"></a>
-(see sections&nbsp;<a href="r5rs-Z-H-6.html#%_sec_3.1">3.1</a> and&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.3">4.3</a>).</p>
-<p>
-</p>
-<li>
-<p>When an identifier appears as a literal or within a literal
-(see section&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.1.2">4.1.2</a>), it is being used to denote a <em>symbol</em>
-(see section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.3">6.3.3</a>).</p>
-<p>
-</p>
-</ul>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<a name="%_sec_2.2"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_2.2">2.2&nbsp;&nbsp;Whitespace and comments</a></h2>
-<p><a name="%_idx_20"></a><em>Whitespace</em> characters are spaces and newlines.
-(Implementations typically provide additional whitespace characters such
-as tab or page break.)  Whitespace is used for improved readability and
-as necessary to separate tokens from each other, a token being an
-indivisible lexical unit such as an identifier or number, but is
-otherwise insignificant.  Whitespace may occur between any two tokens,
-but not within a token.  Whitespace may also occur inside a string,
-where it is significant.</p>
-<p>
-A semicolon (<tt>;</tt>) indicates the start of a
-comment.<a name="%_idx_22"></a><a name="%_idx_24"></a>  The comment continues to the
-end of the line on which the semicolon appears.  Comments are invisible
-to Scheme, but the end of the line is visible as whitespace.  This
-prevents a comment from appearing in the middle of an identifier or
-number.</p>
-<p>
-<tt>;;;&nbsp;The&nbsp;FACT&nbsp;procedure&nbsp;computes&nbsp;the&nbsp;factorial<br>
-;;;&nbsp;of&nbsp;a&nbsp;non-negative&nbsp;integer.<br>
-(define&nbsp;fact<br>
-&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(=&nbsp;n&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;Base&nbsp;case:&nbsp;return&nbsp;1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*&nbsp;n&nbsp;(fact&nbsp;(-&nbsp;n&nbsp;1))))))</p>
-</tt>
-<p>
-</p>
-<a name="%_sec_2.3"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_2.3">2.3&nbsp;&nbsp;Other notations</a></h2>
-<p></p>
-<p>
-For a description of the notations used for numbers, see
-section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.2">6.2</a>.</p>
-<p>
-</p>
-<ul>
-<p>
-</p>
-<li>
-<p><b><tt>. + -</tt></b>&nbsp;&nbsp;
-These are used in numbers, and may also occur anywhere in an identifier
-except as the first character.  A delimited plus or minus sign by itself
-is also an identifier.
-A delimited period (not occurring within a number or identifier) is used
-in the notation for pairs (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.2">6.3.2</a>), and to indicate a
-rest-parameter in a  formal parameter list (section&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.1.4">4.1.4</a>).
-A delimited sequence of three successive periods is also an identifier.</p>
-<p>
-</p>
-<li>
-<p><b><tt>( )</tt></b>&nbsp;&nbsp;
-Parentheses are used for grouping and to notate lists
-(section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.2">6.3.2</a>).</p>
-<p>
-</p>
-<li>
-<p><b><tt>'</tt></b>&nbsp;&nbsp;
-The single quote character is used to indicate literal data (section&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.1.2">4.1.2</a>).</p>
-<p>
-</p>
-<li>
-<p><b><tt>`</tt></b>&nbsp;&nbsp;
-The backquote character is used to indicate almost-constant
-data (section&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.2.6">4.2.6</a>).</p>
-<p>
-</p>
-<li>
-<p><b><tt>, ,@</tt></b>&nbsp;&nbsp;
-The character comma and the sequence comma at-sign are used in conjunction
-with backquote (section&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.2.6">4.2.6</a>).</p>
-<p>
-</p>
-<li>
-<p><b><tt>&quot;</tt></b>&nbsp;&nbsp;
-The double quote character is used to delimit strings (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.5">6.3.5</a>).</p>
-<p>
-</p>
-<li>
-<p><b><tt>\</tt></b>&nbsp;&nbsp;
-Backslash is used in the syntax for character constants
-(section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.4">6.3.4</a>) and as an escape character within string
-constants (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.5">6.3.5</a>).</p>
-<p>
-</p>
-<li>
-<p><b><code class=verbatim>[ ] { } |</code></b>&nbsp;&nbsp;
-Left and right square brackets and curly braces and vertical bar
-are reserved for possible future extensions to the language.</p>
-<p>
-</p>
-<li>
-<p><b><tt>#</tt></b>&nbsp;&nbsp; Sharp sign is used for a variety of purposes depending on
-the character that immediately follows it:</p>
-<p>
-</p>
-<li>
-<p><b><tt>#t</tt> <tt>#f</tt></b>&nbsp;&nbsp;
-These are the boolean constants (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.1">6.3.1</a>).</p>
-<p>
-</p>
-<li>
-<p><b><tt>#</tt><tt>\</tt></b>&nbsp;&nbsp;
-This introduces a character constant (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.4">6.3.4</a>).</p>
-<p>
-</p>
-<li>
-<p><b><tt>#</tt><tt>(</tt></b>&nbsp;&nbsp;
-This introduces a vector constant (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.6">6.3.6</a>).  Vector constants
-are terminated by&nbsp;<tt>)</tt>&nbsp;.</p>
-<p>
-</p>
-<li>
-<p><b><tt>#e #i #b #o #d #x</tt></b>&nbsp;&nbsp;
-These are used in the notation for numbers (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.2.4">6.2.4</a>).</p>
-<p>
-</p>
-</ul>
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p></p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-4.html">previous</a></span><span>, <a href="r5rs-Z-H-6.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-6.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-6.html
deleted file mode 100644
index ba9413a7b7..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-6.html
+++ /dev/null
@@ -1,338 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-5.html">previous</a></span><span>, <a href="r5rs-Z-H-7.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_3"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r5rs-Z-H-2.html#%_toc_%_chap_3">Chapter 3</a></div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_3">Basic concepts</a></h1>
-<p></p>
-<p>
-</p>
-<a name="%_sec_3.1"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_3.1">3.1&nbsp;&nbsp;Variables, syntactic keywords, and regions</a></h2>
-<p>
-</p>
-<p>
-An identifier<a name="%_idx_26"></a> may name a type of syntax, or it may name
-a location where a value can be stored.  An identifier that names a type
-of syntax is called a <em>syntactic keyword</em><a name="%_idx_28"></a>
-and is said to be <em>bound</em> to that syntax.  An identifier that names a
-location is called a <em>variable</em><a name="%_idx_30"></a> and is said to be
-<em>bound</em> to that location.  The set of all visible
-bindings<a name="%_idx_32"></a> in effect at some point in a program is
-known as the <em>environment</em> in effect at that point.  The value
-stored in the location to which a variable is bound is called the
-variable's value.  By abuse of terminology, the variable is sometimes
-said to name the value or to be bound to the value.  This is not quite
-accurate, but confusion rarely results from this practice.</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-Certain expression types are used to create new kinds of syntax
-and bind syntactic keywords to those new syntaxes, while other
-expression types create new locations and bind variables to those
-locations.  These expression types are called <em>binding constructs</em>.
-<a name="%_idx_34"></a>
-Those that bind syntactic keywords are listed in section&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.3">4.3</a>.
-The most fundamental of the variable binding constructs is the
-<tt>lambda</tt> expression, because all other variable binding constructs
-can be explained in terms of <tt>lambda</tt> expressions.  The other
-variable binding constructs are <tt>let</tt>, <tt>let*</tt>, <tt>letrec</tt>,
-and <tt>do</tt> expressions (see sections&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.1.4">4.1.4</a>, <a href="r5rs-Z-H-7.html#%_sec_4.2.2">4.2.2</a>, and
-<a href="r5rs-Z-H-7.html#%_sec_4.2.4">4.2.4</a>).</p>
-<p>
-
-Like Algol and Pascal, and unlike most other dialects of Lisp
-except for Common Lisp, Scheme is a statically scoped language with
-block structure.  To each place where an identifier is bound in a program
-there corresponds a <a name="%_idx_36"></a><em>region</em> of the program text within which
-the binding is visible.  The region is determined by the particular
-binding construct that establishes the binding; if the binding is
-established by a <tt>lambda</tt> expression, for example, then its region
-is the entire <tt>lambda</tt> expression.  Every mention of an identifier
-refers to the binding of the identifier that established the
-innermost of the regions containing the use.  If there is no binding of
-the identifier whose region contains the use, then the use refers to the
-binding for the variable in the top level environment, if any
-(chapters&nbsp;<a href="r5rs-Z-H-7.html#%_chap_4">4</a> and <a href="r5rs-Z-H-9.html#%_chap_6">6</a>); if there is no
-binding for the identifier,
-it is said to be <a name="%_idx_38"></a><em>unbound</em>.<a name="%_idx_40"></a><a name="%_idx_42"></a></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<a name="%_sec_3.2"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_3.2">3.2&nbsp;&nbsp;Disjointness of types</a></h2>
-<p></p>
-<p>
-No object satisfies more than one of the following predicates:</p>
-<p>
-<tt>boolean?&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;pair?<br>
-symbol?&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;number?<br>
-char?&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;string?<br>
-vector?&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;port?<br>
-procedure?</p>
-</tt>
-<p>
-These predicates define the types <em>boolean</em>, <em>pair</em>, <em>symbol</em>, <em>number</em>, <em>char</em> (or <em>character</em>), <em>string</em>, <em>vector</em>, <em>port</em>, and <em>procedure</em>.  The empty list is a special
-object of its own type; it satisfies none of the above predicates.
-<a name="%_idx_44"></a><a name="%_idx_46"></a><a name="%_idx_48"></a><a name="%_idx_50"></a>
-<a name="%_idx_52"></a><a name="%_idx_54"></a><a name="%_idx_56"></a><a name="%_idx_58"></a>
-<a name="%_idx_60"></a><a name="%_idx_62"></a><a name="%_idx_64"></a></p>
-<p>
-Although there is a separate boolean type,
-any Scheme value can be used as a boolean value for the purpose of a
-conditional test.  As explained in section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.1">6.3.1</a>, all
-values count as true in such a test except for <tt>#f</tt>.
-This report uses the word ``true'' to refer to any
-Scheme value except <tt>#f</tt>, and the word ``false'' to refer to
-<tt>#f</tt>. <a name="%_idx_66"></a> <a name="%_idx_68"></a></p>
-<p>
-</p>
-<a name="%_sec_3.3"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_3.3">3.3&nbsp;&nbsp;External representations</a></h2>
-<p></p>
-<p>
-An important concept in Scheme (and Lisp) is that of the <em>external
-representation</em> of an object as a sequence of characters.  For example,
-an external representation of the integer 28 is the sequence of
-characters ``<tt>28</tt>'', and an external representation of a list consisting
-of the integers 8 and 13 is the sequence of characters ``<tt>(8 13)</tt>''.</p>
-<p>
-The external representation of an object is not necessarily unique.  The
-integer 28 also has representations ``<tt>#e28.000</tt>'' and ``<tt>#x1c</tt>'', and the
-list in the previous paragraph also has the representations ``<tt>( 08 13
-)</tt>'' and ``<tt>(8 . (13 . ()))</tt>'' (see section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.2">6.3.2</a>).</p>
-<p>
-Many objects have standard external representations, but some, such as
-procedures, do not have standard representations (although particular
-implementations may define representations for them).</p>
-<p>
-An external representation may be written in a program to obtain the
-corresponding object (see <tt>quote</tt>, section&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.1.2">4.1.2</a>).</p>
-<p>
-External representations can also be used for input and output.  The
-procedure <tt>read</tt> (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.6.2">6.6.2</a>) parses external
-representations, and the procedure <tt>write</tt> (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.6.3">6.6.3</a>)
-generates them.  Together, they provide an elegant and powerful
-input/output facility.</p>
-<p>
-Note that the sequence of characters ``<tt>(+ 2 6)</tt>'' is <em>not</em> an
-external representation of the integer 8, even though it <em>is</em> an
-expression evaluating to the integer 8; rather, it is an external
-representation of a three-element list, the elements of which are the symbol
-<tt>+</tt> and the integers 2 and 6.  Scheme's syntax has the property that
-any sequence of characters that is an expression is also the external
-representation of some object.  This can lead to confusion, since it may
-not be obvious out of context whether a given sequence of characters is
-intended to denote data or program, but it is also a source of power,
-since it facilitates writing programs such as interpreters and
-compilers that treat programs as data (or vice versa).</p>
-<p>
-The syntax of external representations of various kinds of objects
-accompanies the description of the primitives for manipulating the
-objects in the appropriate sections of chapter&nbsp;<a href="r5rs-Z-H-9.html#%_chap_6">6</a>.</p>
-<p>
-</p>
-<a name="%_sec_3.4"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_3.4">3.4&nbsp;&nbsp;Storage model</a></h2>
-<p></p>
-<p>
-Variables and objects such as pairs, vectors, and strings implicitly
-denote locations<a name="%_idx_70"></a> or sequences of locations.  A string, for
-example, denotes as many locations as there are characters in the string. 
-(These locations need not correspond to a full machine word.) A new value may be
-stored into one of these locations using the <tt>string-set!</tt> procedure, but
-the string continues to denote the same locations as before.</p>
-<p>
-An object fetched from a location, by a variable reference or by
-a procedure such as <tt>car</tt>, <tt>vector-ref</tt>, or <tt>string-ref</tt>, is
-equivalent in the sense of <tt>eqv?</tt> (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.1">6.1</a>)
-to the object last stored in the location before the fetch.</p>
-<p>
-Every location is marked to show whether it is in use.
-No variable or object ever refers to a location that is not in use.
-Whenever this report speaks of storage being allocated for a variable
-or object, what is meant is that an appropriate number of locations are
-chosen from the set of locations that are not in use, and the chosen
-locations are marked to indicate that they are now in use before the variable
-or object is made to denote them.</p>
-<p>
-In many systems it is desirable for constants<a name="%_idx_72"></a> (i.e. the values of
-literal expressions) to reside in read-only-memory.  To express this, it is
-convenient to imagine that every object that denotes locations is associated
-with a flag telling whether that object is mutable<a name="%_idx_74"></a> or
-immutable<a name="%_idx_76"></a>.  In such systems literal constants and the strings
-returned by <tt>symbol-&gt;string</tt> are immutable objects, while all objects
-created by the other procedures listed in this report are mutable.  It is an
-error to attempt to store a new value into a location that is denoted by an
-immutable object.</p>
-<p>
-</p>
-<a name="%_sec_3.5"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_3.5">3.5&nbsp;&nbsp;Proper tail recursion</a></h2>
-<p></p>
-<p>
-Implementations of Scheme are required to be
-<em>properly tail-recursive</em><a name="%_idx_78"></a>.
-Procedure calls that occur in certain syntactic
-contexts defined below are `tail calls'.  A Scheme implementation is
-properly tail-recursive if it supports an unbounded number of active
-tail calls.  A call is <em>active</em> if the called procedure may still
-return.  Note that this includes calls that may be returned from either
-by the current continuation or by continuations captured earlier by
-<tt>call-with-current-continuation</tt> that are later invoked.
-In the absence of captured continuations, calls could
-return at most once and the active calls would be those that had not
-yet returned.
-A formal definition of proper tail recursion can be found
-in&nbsp;[<a href="r5rs-Z-H-14.html#cite{propertailrecursion}">8</a>].</p>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-<p>
-Intuitively, no space is needed for an active tail call because the
-continuation that is used in the tail call has the same semantics as the
-continuation passed to the procedure containing the call.  Although an improper
-implementation might use a new continuation in the call, a return
-to this new continuation would be followed immediately by a return
-to the continuation passed to the procedure.  A properly tail-recursive
-implementation returns to that continuation directly.</p>
-<p>
-Proper tail recursion was one of the central ideas in Steele and
-Sussman's original version of Scheme.  Their first Scheme interpreter
-implemented both functions and actors.  Control flow was expressed using
-actors, which differed from functions in that they passed their results
-on to another actor instead of returning to a caller.  In the terminology
-of this section, each actor finished with a tail call to another actor.</p>
-<p>
-Steele and Sussman later observed that in their interpreter the code
-for dealing with actors was identical to that for functions and thus
-there was no need to include both in the language.</p>
-<p>
-</p>
-</blockquote>
-<p>
-A <em>tail call</em><a name="%_idx_80"></a> is a procedure call that occurs
-in a <em>tail context</em>.  Tail contexts are defined inductively.  Note
-that a tail context is always determined with respect to a particular lambda
-expression.</p>
-<p>
-</p>
-<ul>
-<li>
-<p>The last expression within the body of a lambda expression,
-shown as &lt;tail expression&gt; below, occurs in a tail context.
-<tt>(lambda&nbsp;&lt;formals&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;definition&gt;*&nbsp;&lt;expression&gt;*&nbsp;&lt;tail&nbsp;expression&gt;)<br>
-</p>
-</tt>
-<li>
-<p>If one of the following expressions is in a tail context,
-then the subexpressions shown as &lt;tail expression&gt; are in a tail context.
-These were derived from rules in the grammar given in
-chapter&nbsp;<a href="r5rs-Z-H-10.html#%_chap_7">7</a> by replacing some occurrences of &lt;expression&gt;
-with &lt;tail expression&gt;.  Only those rules that contain tail contexts
-are shown here.</p>
-<p>
-<tt>(if&nbsp;&lt;expression&gt;&nbsp;&lt;tail&nbsp;expression&gt;&nbsp;&lt;tail&nbsp;expression&gt;)<br>
-(if&nbsp;&lt;expression&gt;&nbsp;&lt;tail&nbsp;expression&gt;)<br>
-<br>
-(cond&nbsp;&lt;cond&nbsp;clause&gt;<sup>+</sup>)<br>
-(cond&nbsp;&lt;cond&nbsp;clause&gt;*&nbsp;(else&nbsp;&lt;tail&nbsp;sequence&gt;))<br>
-<br>
-(case&nbsp;&lt;expression&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;case&nbsp;clause&gt;<sup>+</sup>)<br>
-(case&nbsp;&lt;expression&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;case&nbsp;clause&gt;*<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;&lt;tail&nbsp;sequence&gt;))<br>
-<br>
-(and&nbsp;&lt;expression&gt;*&nbsp;&lt;tail&nbsp;expression&gt;)<br>
-(or&nbsp;&lt;expression&gt;*&nbsp;&lt;tail&nbsp;expression&gt;)<br>
-<br>
-(let&nbsp;(&lt;binding&nbsp;spec&gt;*)&nbsp;&lt;tail&nbsp;body&gt;)<br>
-(let&nbsp;&lt;variable&gt;&nbsp;(&lt;binding&nbsp;spec&gt;*)&nbsp;&lt;tail&nbsp;body&gt;)<br>
-(let*&nbsp;(&lt;binding&nbsp;spec&gt;*)&nbsp;&lt;tail&nbsp;body&gt;)<br>
-(letrec&nbsp;(&lt;binding&nbsp;spec&gt;*)&nbsp;&lt;tail&nbsp;body&gt;)<br>
-<br>
-(let-syntax&nbsp;(&lt;syntax&nbsp;spec&gt;*)&nbsp;&lt;tail&nbsp;body&gt;)<br>
-(letrec-syntax&nbsp;(&lt;syntax&nbsp;spec&gt;*)&nbsp;&lt;tail&nbsp;body&gt;)<br>
-<br>
-(begin&nbsp;&lt;tail&nbsp;sequence&gt;)<br>
-<br>
-(do&nbsp;(&lt;iteration&nbsp;spec&gt;*)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(&lt;test&gt;&nbsp;&lt;tail&nbsp;sequence&gt;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;expression&gt;*)<br>
-<br>
-where<br>
-<br>
-&lt;cond&nbsp;clause&gt;&nbsp;---&gt;&nbsp;(&lt;test&gt;&nbsp;&lt;tail&nbsp;sequence&gt;)<br>
-&lt;case&nbsp;clause&gt;&nbsp;---&gt;&nbsp;((&lt;datum&gt;*)&nbsp;&lt;tail&nbsp;sequence&gt;)<br>
-<br>
-&lt;tail&nbsp;body&gt;&nbsp;---&gt;&nbsp;&lt;definition&gt;*&nbsp;&lt;tail&nbsp;sequence&gt;<br>
-&lt;tail&nbsp;sequence&gt;&nbsp;---&gt;&nbsp;&lt;expression&gt;*&nbsp;&lt;tail&nbsp;expression&gt;<br>
-</p>
-</tt>
-<li>
-<p>If a <tt>cond</tt> expression is in a tail context, and has a clause of
-the form <tt>(&lt;expression<sub>1</sub>&gt; =&gt; &lt;expression<sub>2</sub>&gt;)</tt>
-then the (implied) call to
-the procedure that results from the evaluation of &lt;expression<sub>2</sub>&gt; is in a
-tail context.  &lt;expression<sub>2</sub>&gt; itself is not in a tail context.</p>
-<p>
-</p>
-</ul>
-<p></p>
-<p>
-Certain built-in procedures are also required to perform tail calls.
-The first argument passed to <tt>apply</tt> and to
-<tt>call-with-current-continuation</tt>, and the second argument passed to
-<tt>call-with-values</tt>, must be called via a tail call.
-Similarly, <tt>eval</tt> must evaluate its argument as if it
-were in tail position within the <tt>eval</tt> procedure.</p>
-<p>
-In the following example the only tail call is the call to <tt>f</tt>.
-None of the calls to <tt>g</tt> or <tt>h</tt> are tail calls.  The reference to
-<tt>x</tt> is in a tail context, but it is not a call and thus is not a
-tail call.
-<tt>(lambda&nbsp;()<br>
-&nbsp;&nbsp;(if&nbsp;(g)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((x&nbsp;(h)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(and&nbsp;(g)&nbsp;(f))))<br>
-</p>
-</tt>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Implementations are allowed, but not required, to
-recognize that some non-tail calls, such as the call to <tt>h</tt>
-above, can be evaluated as though they were tail calls.
-In the example above, the <tt>let</tt> expression could be compiled
-as a tail call to <tt>h</tt>. (The possibility of <tt>h</tt> returning
-an unexpected number of values can be ignored, because in that
-case the effect of the <tt>let</tt> is explicitly unspecified and
-implementation-dependent.)
-</blockquote>
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p></p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-5.html">previous</a></span><span>, <a href="r5rs-Z-H-7.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-7.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-7.html
deleted file mode 100644
index 75297f6b79..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-7.html
+++ /dev/null
@@ -1,1201 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-6.html">previous</a></span><span>, <a href="r5rs-Z-H-8.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_4"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r5rs-Z-H-2.html#%_toc_%_chap_4">Chapter 4</a></div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_4">Expressions</a></h1>
-<p></p>
-<p>
-
-</p>
-<p>
-
-Expression types are categorized as <em>primitive</em> or <em>derived</em>.
-Primitive expression types include variables and procedure calls.
-Derived expression types are not semantically primitive, but can instead
-be defined as macros.
-With the exception of <tt>quasiquote</tt>, whose macro definition is complex,
-the derived expressions are classified as library features.
-Suitable definitions are given in section&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.3">7.3</a>.</p>
-<p>
-</p>
-<a name="%_sec_4.1"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.1">4.1&nbsp;&nbsp;Primitive expression types</a></h2>
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.1.1"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.1.1">4.1.1&nbsp;&nbsp;Variable references</a></h3>
-<p></p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>&lt;variable&gt;</tt>&nbsp;</div>
-
-<p>
-An expression consisting of a variable<a name="%_idx_82"></a>
-(section&nbsp;<a href="r5rs-Z-H-6.html#%_sec_3.1">3.1</a>) is a variable reference.  The value of
-the variable reference is the value stored in the location to which the
-variable is bound.  It is an error to reference an
-unbound<a name="%_idx_84"></a> variable.</p>
-<p>
-<tt>(define&nbsp;x&nbsp;28)<br>
-x&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;28</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.1.2"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.1.2">4.1.2&nbsp;&nbsp;Literal expressions</a></h3>
-<p></p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_86"></a>quote<i> &lt;datum&gt;</i>)</tt>&nbsp;</div>
-
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt><tt>'</tt>&lt;datum&gt;</tt>&nbsp;</div>
-
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>&lt;constant&gt;</tt>&nbsp;</div>
-
-<p>
-<tt>(quote &lt;datum&gt;)</tt> evaluates to &lt;datum&gt;.<a name="%_idx_88"></a>
-&lt;Datum&gt;
-may be any external representation of a Scheme object (see
-section&nbsp;<a href="r5rs-Z-H-6.html#%_sec_3.3">3.3</a>).  This notation is used to include literal
-constants in Scheme code.</p>
-<p>
-<tt>(quote&nbsp;a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;a<br>
-(quote&nbsp;<tt>#</tt>(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;#(a&nbsp;b&nbsp;c)<br>
-(quote&nbsp;(+&nbsp;1&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(+&nbsp;1&nbsp;2)</p>
-</tt>
-<p>
-<tt>(quote &lt;datum&gt;)</tt> may be abbreviated as
-<tt>'</tt>&lt;datum&gt;.  The two notations are equivalent in all
-respects.</p>
-<p>
-<tt>'a&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;a<br>
-'#(a&nbsp;b&nbsp;c)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;#(a&nbsp;b&nbsp;c)<br>
-'()&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;()<br>
-'(+&nbsp;1&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(+&nbsp;1&nbsp;2)<br>
-'(quote&nbsp;a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(quote&nbsp;a)<br>
-''a&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(quote&nbsp;a)</p>
-</tt>
-<p>
-Numerical constants, string constants, character constants, and boolean
-constants evaluate ``to themselves''; they need not be quoted.</p>
-<p>
-<tt>'&quot;abc&quot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;&quot;abc&quot;<br>
-&quot;abc&quot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;&quot;abc&quot;<br>
-'145932&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;145932<br>
-145932&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;145932<br>
-'<tt>#t</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-<tt>#t</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-As noted in section&nbsp;<a href="r5rs-Z-H-6.html#%_sec_3.4">3.4</a>, it is an error to alter a constant
-(i.e.&nbsp;the value of a literal expression) using a mutation procedure like
-<tt>set-car!</tt> or <tt>string-set!</tt>.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.1.3"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.1.3">4.1.3&nbsp;&nbsp;Procedure calls</a></h3>
-<p></p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(&lt;operator&gt; &lt;operand<sub>1</sub>&gt; <tt>...</tt>)</tt>&nbsp;</div>
-
-<p>
-A procedure call is written by simply enclosing in parentheses
-expressions for the procedure to be called and the arguments to be
-passed to it.  The operator and operand expressions are evaluated (in an
-unspecified order) and the resulting procedure is passed the resulting
-arguments.<a name="%_idx_90"></a><a name="%_idx_92"></a>
-<tt>(+&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;7<br>
-((if&nbsp;<tt>#f</tt>&nbsp;+&nbsp;*)&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;12</p>
-</tt>
-<p>
-A number of procedures are available as the values of variables in the
-initial environment; for example, the addition and multiplication
-procedures in the above examples are the values of the variables <tt>+</tt>
-and <tt>*</tt>.  New procedures are created by evaluating <tt>lambda</tt> expressions
-(see section&nbsp;<a href="#%_sec_4.1.4">4.1.4</a>).
-
-
-Procedure calls may return any number of values (see <tt>values</tt> in
-section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.4">6.4</a>).  With the exception of <tt>values</tt>
-the procedures available in the initial environment return one
-value or, for procedures such as <tt>apply</tt>, pass on the values returned
-by a call to one of their arguments.</p>
-<p>
-Procedure calls are also called <em>combinations</em>.
-<a name="%_idx_94"></a></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em> In contrast to other dialects of Lisp, the order of
-evaluation is unspecified, and the operator expression and the operand
-expressions are always evaluated with the same evaluation rules.
-</blockquote>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Although the order of evaluation is otherwise unspecified, the effect of
-any concurrent evaluation of the operator and operand expressions is
-constrained to be consistent with some sequential order of evaluation.
-The order of evaluation may be chosen differently for each procedure call.
-</blockquote>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em> In many dialects of Lisp, the empty combination, <tt>()</tt>, is a legitimate expression.  In Scheme, combinations must have at
-least one subexpression, so <tt>()</tt> is not a syntactically valid
-expression.  
-</blockquote>
-<p>
-</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.1.4"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.1.4">4.1.4&nbsp;&nbsp;Procedures</a></h3>
-<p></p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_96"></a>lambda<i> &lt;formals&gt; &lt;body&gt;</i>)</tt>&nbsp;</div>
-
-<p>
-<em>Syntax: </em>&lt;Formals&gt; should be a formal arguments list as described below,
-and &lt;body&gt; should be a sequence of one or more expressions.</p>
-<p>
-<em>Semantics: </em>A <tt>lambda</tt> expression evaluates to a procedure.  The environment in
-effect when the <tt>lambda</tt> expression was evaluated is remembered as part of the
-procedure.  When the procedure is later called with some actual
-arguments, the environment in which the <tt>lambda</tt> expression was evaluated will
-be extended by binding the variables in the formal argument list to
-fresh locations, the corresponding actual argument values will be stored
-in those locations, and the expressions in the body of the <tt>lambda</tt> expression
-will be evaluated sequentially in the extended environment.
-The result(s) of the last expression in the body will be returned as
-the result(s) of the procedure call.</p>
-<p>
-<tt>(lambda&nbsp;(x)&nbsp;(+&nbsp;x&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<em>a&nbsp;procedure</em><br>
-((lambda&nbsp;(x)&nbsp;(+&nbsp;x&nbsp;x))&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;8<br>
-<br>
-(define&nbsp;reverse-subtract<br>
-&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;y)&nbsp;(-&nbsp;y&nbsp;x)))<br>
-(reverse-subtract&nbsp;7&nbsp;10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;3<br>
-<br>
-(define&nbsp;add4<br>
-&nbsp;&nbsp;(let&nbsp;((x&nbsp;4))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(y)&nbsp;(+&nbsp;x&nbsp;y))))<br>
-(add4&nbsp;6)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;10</p>
-</tt>
-<p>
-&lt;Formals&gt; should have one of the following forms:</p>
-<p>
-</p>
-<ul>
-<li>
-<p><tt>(&lt;variable<sub>1</sub>&gt; <tt>...</tt>)</tt>:
-The procedure takes a fixed number of arguments; when the procedure is
-called, the arguments will be stored in the bindings of the
-corresponding variables.</p>
-<p>
-</p>
-<li>
-<p>&lt;variable&gt;:
-The procedure takes any number of arguments; when the procedure is
-called, the sequence of actual arguments is converted into a newly
-allocated list, and the list is stored in the binding of the
-&lt;variable&gt;.</p>
-<p>
-</p>
-<li>
-<p><tt>(&lt;variable<sub>1</sub>&gt; <tt>...</tt> &lt;variable<sub><em>n</em></sub>&gt; <strong>.</strong>
-&lt;variable<sub><em>n</em>+1</sub>&gt;)</tt>:
-If a space-delimited period precedes the last variable, then
-the procedure takes <em>n</em> or more arguments, where <em>n</em> is the
-number of formal arguments before the period (there must
-be at least one).
-The value stored in the binding of the last variable will be a
-newly allocated
-list of the actual arguments left over after all the other actual
-arguments have been matched up against the other formal arguments.
-</p>
-</ul>
-<p></p>
-<p>
-It is an error for a &lt;variable&gt; to appear more than once in
-&lt;formals&gt;.</p>
-<p>
-<tt>((lambda&nbsp;x&nbsp;x)&nbsp;3&nbsp;4&nbsp;5&nbsp;6)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(3&nbsp;4&nbsp;5&nbsp;6)<br>
-((lambda&nbsp;(x&nbsp;y&nbsp;.&nbsp;z)&nbsp;z)<br>
-&nbsp;3&nbsp;4&nbsp;5&nbsp;6)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(5&nbsp;6)</p>
-</tt>
-<p>
-Each procedure created as the result of evaluating a <tt>lambda</tt> expression is
-(conceptually) tagged
-with a storage location, in order to make <tt>eqv?</tt> and
-<tt>eq?</tt> work on procedures (see section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.1">6.1</a>).</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.1.5"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.1.5">4.1.5&nbsp;&nbsp;Conditionals</a></h3>
-<p></p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_98"></a>if<i> &lt;test&gt; &lt;consequent&gt; &lt;alternate&gt;</i>)</tt>&nbsp;</div>
-
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_100"></a>if<i> &lt;test&gt; &lt;consequent&gt;</i>)</tt>&nbsp;</div>
-  
-<em>Syntax: </em>&lt;Test&gt;, &lt;consequent&gt;, and &lt;alternate&gt; may be arbitrary
-expressions.
-<p>
-<em>Semantics: </em>An <tt>if</tt> expression is evaluated as follows: first,
-&lt;test&gt; is evaluated.  If it yields a true value<a name="%_idx_102"></a> (see
-section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.1">6.3.1</a>), then &lt;consequent&gt; is evaluated and
-its value(s) is(are) returned.  Otherwise &lt;alternate&gt; is evaluated and its
-value(s) is(are) returned.  If &lt;test&gt; yields a false value and no
-&lt;alternate&gt; is specified, then the result of the expression is
-unspecified.</p>
-<p>
-<tt>(if&nbsp;(&gt;&nbsp;3&nbsp;2)&nbsp;'yes&nbsp;'no)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;yes<br>
-(if&nbsp;(&gt;&nbsp;2&nbsp;3)&nbsp;'yes&nbsp;'no)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;no<br>
-(if&nbsp;(&gt;&nbsp;3&nbsp;2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(-&nbsp;3&nbsp;2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;3&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.1.6"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.1.6">4.1.6&nbsp;&nbsp;Assignments</a></h3>
-<p></p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_104"></a>set!<i> &lt;variable&gt; &lt;expression&gt;</i>)</tt>&nbsp;</div>
-
-<p>
-&lt;Expression&gt; is evaluated, and the resulting value is stored in
-the location to which &lt;variable&gt; is bound.  &lt;Variable&gt; must
-be bound either in some region<a name="%_idx_106"></a> enclosing the <tt>set!</tt> expression
-or at top level.  The result of the <tt>set!</tt> expression is
-unspecified.</p>
-<p>
-<tt>(define&nbsp;x&nbsp;2)<br>
-(+&nbsp;x&nbsp;1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;3<br>
-(set!&nbsp;x&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(+&nbsp;x&nbsp;1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;5</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.2"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.2">4.2&nbsp;&nbsp;Derived expression types</a></h2>
-<p></p>
-<p>
-The constructs in this section are hygienic, as discussed in
-section&nbsp;<a href="#%_sec_4.3">4.3</a>.
-For reference purposes, section&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.3">7.3</a> gives macro definitions
-that will convert most of the constructs described in this section 
-into the primitive constructs described in the previous section.</p>
-<p>
-</p>
-<p>
-</p>
-<a name="%_sec_4.2.1"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.2.1">4.2.1&nbsp;&nbsp;Conditionals</a></h3>
-<p></p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_108"></a>cond<i> &lt;clause<sub>1</sub>&gt; &lt;clause<sub>2</sub>&gt; <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-<em>Syntax: </em>Each &lt;clause&gt; should be of the form
-<tt>(&lt;test&gt;&nbsp;&lt;expression<sub>1</sub>&gt;&nbsp;<tt>...</tt>)</p>
-</tt>
-where &lt;test&gt; is any expression.  Alternatively, a &lt;clause&gt; may be
-of the form
-<tt>(&lt;test&gt;&nbsp;=&gt;&nbsp;&lt;expression&gt;)</tt>
-The last &lt;clause&gt; may be
-an ``else clause,'' which has the form
-<tt>(else&nbsp;&lt;expression<sub>1</sub>&gt;&nbsp;&lt;expression<sub>2</sub>&gt;&nbsp;<tt>...</tt>).</tt>
-<a name="%_idx_110"></a>
-<a name="%_idx_112"></a>
-<p>
-<em>Semantics: </em>A <tt>cond</tt> expression is evaluated by evaluating the &lt;test&gt;
-expressions of successive &lt;clause&gt;s in order until one of them
-evaluates to a true value<a name="%_idx_114"></a> (see
-section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.1">6.3.1</a>).  When a &lt;test&gt; evaluates to a true
-value, then the remaining &lt;expression&gt;s in its &lt;clause&gt; are
-evaluated in order, and the result(s) of the last &lt;expression&gt; in the
-&lt;clause&gt; is(are) returned as the result(s) of the entire <tt>cond</tt>
-expression.  If the selected &lt;clause&gt; contains only the
-&lt;test&gt; and no &lt;expression&gt;s, then the value of the
-&lt;test&gt; is returned as the result.  If the selected &lt;clause&gt; uses the
-<tt>=&gt;</tt> alternate form, then the &lt;expression&gt; is evaluated.
-Its value must be a procedure that accepts one argument; this procedure is then
-called on the value of the &lt;test&gt; and the value(s) returned by this
-procedure is(are) returned by the <tt>cond</tt> expression.
-If all &lt;test&gt;s evaluate
-to false values, and there is no else clause, then the result of
-the conditional expression is unspecified; if there is an else
-clause, then its &lt;expression&gt;s are evaluated, and the value(s) of
-the last one is(are) returned.</p>
-<p>
-<tt>(cond&nbsp;((&gt;&nbsp;3&nbsp;2)&nbsp;'greater)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((&lt;&nbsp;3&nbsp;2)&nbsp;'less))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;greater<br>
-(cond&nbsp;((&gt;&nbsp;3&nbsp;3)&nbsp;'greater)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((&lt;&nbsp;3&nbsp;3)&nbsp;'less)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;'equal))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;equal<br>
-(cond&nbsp;((assv&nbsp;'b&nbsp;'((a&nbsp;1)&nbsp;(b&nbsp;2)))&nbsp;=&gt;&nbsp;cadr)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;<tt>#f</tt>))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;2</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_116"></a>case<i> &lt;key&gt; &lt;clause<sub>1</sub>&gt; &lt;clause<sub>2</sub>&gt; <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-<em>Syntax: </em>&lt;Key&gt; may be any expression.  Each &lt;clause&gt; should have
-the form
-<tt>((&lt;datum<sub>1</sub>&gt;&nbsp;<tt>...</tt>)&nbsp;&lt;expression<sub>1</sub>&gt;&nbsp;&lt;expression<sub>2</sub>&gt;&nbsp;<tt>...</tt>),</p>
-</tt>
-where each &lt;datum&gt; is an external representation of some object.
-All the &lt;datum&gt;s must be distinct.
-The last &lt;clause&gt; may be an ``else clause,'' which has the form
-<tt>(else&nbsp;&lt;expression<sub>1</sub>&gt;&nbsp;&lt;expression<sub>2</sub>&gt;&nbsp;<tt>...</tt>).</tt>
-<a name="%_idx_118"></a>
-<p>
-<em>Semantics: </em>A <tt>case</tt> expression is evaluated as follows.  &lt;Key&gt; is
-evaluated and its result is compared against each &lt;datum&gt;.  If the
-result of evaluating &lt;key&gt; is equivalent (in the sense of
-<tt>eqv?</tt>; see section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.1">6.1</a>) to a &lt;datum&gt;, then the
-expressions in the corresponding &lt;clause&gt; are evaluated from left
-to right and the result(s) of the last expression in the &lt;clause&gt; is(are)
-returned as the result(s) of the <tt>case</tt> expression.  If the result of
-evaluating &lt;key&gt; is different from every &lt;datum&gt;, then if
-there is an else clause its expressions are evaluated and the
-result(s) of the last is(are) the result(s) of the <tt>case</tt> expression;
-otherwise the result of the <tt>case</tt> expression is unspecified.</p>
-<p>
-<tt>(case&nbsp;(*&nbsp;2&nbsp;3)<br>
-&nbsp;&nbsp;((2&nbsp;3&nbsp;5&nbsp;7)&nbsp;'prime)<br>
-&nbsp;&nbsp;((1&nbsp;4&nbsp;6&nbsp;8&nbsp;9)&nbsp;'composite))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;composite<br>
-(case&nbsp;(car&nbsp;'(c&nbsp;d))<br>
-&nbsp;&nbsp;((a)&nbsp;'a)<br>
-&nbsp;&nbsp;((b)&nbsp;'b))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(case&nbsp;(car&nbsp;'(c&nbsp;d))<br>
-&nbsp;&nbsp;((a&nbsp;e&nbsp;i&nbsp;o&nbsp;u)&nbsp;'vowel)<br>
-&nbsp;&nbsp;((w&nbsp;y)&nbsp;'semivowel)<br>
-&nbsp;&nbsp;(else&nbsp;'consonant))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;consonant</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_120"></a>and<i> &lt;test<sub>1</sub>&gt; <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-The &lt;test&gt; expressions are evaluated from left to right, and the
-value of the first expression that evaluates to a false value (see
-section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.1">6.3.1</a>) is returned.  Any remaining expressions
-are not evaluated.  If all the expressions evaluate to true values, the
-value of the last expression is returned.  If there are no expressions
-then <tt>#t</tt> is returned.</p>
-<p>
-<tt>(and&nbsp;(=&nbsp;2&nbsp;2)&nbsp;(&gt;&nbsp;2&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(and&nbsp;(=&nbsp;2&nbsp;2)&nbsp;(&lt;&nbsp;2&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(and&nbsp;1&nbsp;2&nbsp;'c&nbsp;'(f&nbsp;g))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(f&nbsp;g)<br>
-(and)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_122"></a>or<i> &lt;test<sub>1</sub>&gt; <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-The &lt;test&gt; expressions are evaluated from left to right, and the value of the
-first expression that evaluates to a true value (see
-section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.1">6.3.1</a>) is returned.  Any remaining expressions
-are not evaluated.  If all expressions evaluate to false values, the
-value of the last expression is returned.  If there are no
-expressions then <tt>#f</tt> is returned.</p>
-<p>
-<tt>(or&nbsp;(=&nbsp;2&nbsp;2)&nbsp;(&gt;&nbsp;2&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(or&nbsp;(=&nbsp;2&nbsp;2)&nbsp;(&lt;&nbsp;2&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(or&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(or&nbsp;(memq&nbsp;'b&nbsp;'(a&nbsp;b&nbsp;c))&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(/&nbsp;3&nbsp;0))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(b&nbsp;c)</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.2.2"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.2.2">4.2.2&nbsp;&nbsp;Binding constructs</a></h3>
-<p>The three binding constructs <tt>let</tt>, <tt>let*</tt>, and <tt>letrec</tt>
-give Scheme a block structure, like Algol 60.  The syntax of the three
-constructs is identical, but they differ in the regions<a name="%_idx_124"></a> they establish
-for their variable bindings.  In a <tt>let</tt> expression, the initial
-values are computed before any of the variables become bound; in a
-<tt>let*</tt> expression, the bindings and evaluations are performed
-sequentially; while in a <tt>letrec</tt> expression, all the bindings are in
-effect while their initial values are being computed, thus allowing
-mutually recursive definitions.</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_126"></a>let<i> &lt;bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;</div>
-
-<p>
-<em>Syntax: </em>&lt;Bindings&gt; should have the form
-<tt>((&lt;variable<sub>1</sub>&gt;&nbsp;&lt;init<sub>1</sub>&gt;)&nbsp;<tt>...</tt>),</p>
-</tt>
-where each &lt;init&gt; is an expression, and &lt;body&gt; should be a
-sequence of one or more expressions.  It is
-an error for a &lt;variable&gt; to appear more than once in the list of variables
-being bound.
-<p>
-<em>Semantics: </em>The &lt;init&gt;s are evaluated in the current environment (in some
-unspecified order), the &lt;variable&gt;s are bound to fresh locations
-holding the results, the &lt;body&gt; is evaluated in the extended
-environment, and the value(s) of the last expression of &lt;body&gt;
-is(are) returned.  Each binding of a &lt;variable&gt; has &lt;body&gt; as its
-region.<a name="%_idx_128"></a></p>
-<p>
-<tt>(let&nbsp;((x&nbsp;2)&nbsp;(y&nbsp;3))<br>
-&nbsp;&nbsp;(*&nbsp;x&nbsp;y))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;6<br>
-<br>
-(let&nbsp;((x&nbsp;2)&nbsp;(y&nbsp;3))<br>
-&nbsp;&nbsp;(let&nbsp;((x&nbsp;7)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(z&nbsp;(+&nbsp;x&nbsp;y)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(*&nbsp;z&nbsp;x)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;35</p>
-</tt>
-<p>
-See also named <tt>let</tt>, section <a href="#%_sec_4.2.4">4.2.4</a>.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_130"></a>let*<i> &lt;bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;</div>
-
-<p>
-<em>Syntax: </em>&lt;Bindings&gt; should have the form
-<tt>((&lt;variable<sub>1</sub>&gt;&nbsp;&lt;init<sub>1</sub>&gt;)&nbsp;<tt>...</tt>),</p>
-</tt>
-and &lt;body&gt; should be a sequence of
-one or more expressions.
-<p>
-<em>Semantics: </em><tt>Let*</tt> is similar to <tt>let</tt>, but the bindings are performed
-sequentially from left to right, and the region<a name="%_idx_132"></a> of a binding indicated
-by <tt>(&lt;variable&gt; &lt;init&gt;)</tt> is that part of the <tt>let*</tt>
-expression to the right of the binding.  Thus the second binding is done
-in an environment in which the first binding is visible, and so on.</p>
-<p>
-<tt>(let&nbsp;((x&nbsp;2)&nbsp;(y&nbsp;3))<br>
-&nbsp;&nbsp;(let*&nbsp;((x&nbsp;7)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(z&nbsp;(+&nbsp;x&nbsp;y)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(*&nbsp;z&nbsp;x)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;70</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_134"></a>letrec<i> &lt;bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;</div>
-
-<p>
-<em>Syntax: </em>&lt;Bindings&gt; should have the form
-<tt>((&lt;variable<sub>1</sub>&gt;&nbsp;&lt;init<sub>1</sub>&gt;)&nbsp;<tt>...</tt>),</p>
-</tt>
-and &lt;body&gt; should be a sequence of
-one or more expressions. It is an error for a &lt;variable&gt; to appear more
-than once in the list of variables being bound.
-<p>
-<em>Semantics: </em>The &lt;variable&gt;s are bound to fresh locations holding undefined
-values, the &lt;init&gt;s are evaluated in the resulting environment (in
-some unspecified order), each &lt;variable&gt; is assigned to the result
-of the corresponding &lt;init&gt;, the &lt;body&gt; is evaluated in the
-resulting environment, and the value(s) of the last expression in
-&lt;body&gt; is(are) returned.  Each binding of a &lt;variable&gt; has the
-entire <tt>letrec</tt> expression as its region<a name="%_idx_136"></a>, making it possible to
-define mutually recursive procedures.</p>
-<p>
-<tt>(letrec&nbsp;((even?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(zero?&nbsp;n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#t</tt><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(odd?&nbsp;(-&nbsp;n&nbsp;1)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(odd?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(zero?&nbsp;n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#f</tt><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(even?&nbsp;(-&nbsp;n&nbsp;1))))))<br>
-&nbsp;&nbsp;(even?&nbsp;88))&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-One restriction on <tt>letrec</tt> is very important: it must be possible
-to evaluate each &lt;init&gt; without assigning or referring to the value of any
-&lt;variable&gt;.  If this restriction is violated, then it is an error.  The
-restriction is necessary because Scheme passes arguments by value rather than by
-name.  In the most common uses of <tt>letrec</tt>, all the &lt;init&gt;s are
-<tt>lambda</tt> expressions and the restriction is satisfied automatically.</p>
-<p>
-
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.2.3"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.2.3">4.2.3&nbsp;&nbsp;Sequencing</a></h3>
-<p></p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_138"></a>begin<i> &lt;expression<sub>1</sub>&gt; &lt;expression<sub>2</sub>&gt; <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-The &lt;expression&gt;s are evaluated sequentially from left to right,
-and the value(s) of the last &lt;expression&gt; is(are) returned.  This
-expression type is used to sequence side effects such as input and
-output.</p>
-<p>
-<tt>(define&nbsp;x&nbsp;0)<br>
-<br>
-(begin&nbsp;(set!&nbsp;x&nbsp;5)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;x&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;6<br>
-<br>
-(begin&nbsp;(display&nbsp;&quot;4&nbsp;plus&nbsp;1&nbsp;equals&nbsp;&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;(+&nbsp;4&nbsp;1)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-&nbsp;<em>&nbsp;and&nbsp;prints</em>&nbsp;&nbsp;4&nbsp;plus&nbsp;1&nbsp;equals&nbsp;5</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.2.4"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.2.4">4.2.4&nbsp;&nbsp;Iteration</a></h3>
-<p>
-</p>
-<div align=left><u>library syntax:</u>&nbsp;&nbsp;<tt>(do ((&lt;variable<sub>1</sub>&gt; &lt;init<sub>1</sub>&gt; &lt;step<sub>1</sub>&gt;)</tt>&nbsp;</div>
-
-<a name="%_idx_140"></a><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>...</tt>)<br>
-&nbsp;&nbsp;&nbsp;(&lt;test&gt;&nbsp;&lt;expression&gt;&nbsp;<tt>...</tt>)<br>
-&nbsp;&lt;command&gt;&nbsp;<tt>...</tt>)</tt>
-<p>
-<tt>Do</tt> is an iteration construct.  It specifies a set of variables to
-be bound, how they are to be initialized at the start, and how they are
-to be updated on each iteration.  When a termination condition is met,
-the loop exits after evaluating the &lt;expression&gt;s.</p>
-<p>
-<tt>Do</tt> expressions are evaluated as follows:
-The &lt;init&gt; expressions are evaluated (in some unspecified order),
-the &lt;variable&gt;s are bound to fresh locations, the results of the
-&lt;init&gt; expressions are stored in the bindings of the
-&lt;variable&gt;s, and then the iteration phase begins.</p>
-<p>
-Each iteration begins by evaluating &lt;test&gt;; if the result is
-false (see section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.3.1">6.3.1</a>), then the &lt;command&gt;
-expressions are evaluated in order for effect, the &lt;step&gt;
-expressions are evaluated in some unspecified order, the
-&lt;variable&gt;s are bound to fresh locations, the results of the
-&lt;step&gt;s are stored in the bindings of the
-&lt;variable&gt;s, and the next iteration begins.</p>
-<p>
-If &lt;test&gt; evaluates to a true value, then the
-&lt;expression&gt;s are evaluated from left to right and the value(s) of
-the last &lt;expression&gt; is(are) returned.  If no &lt;expression&gt;s
-are present, then the value of the <tt>do</tt> expression is unspecified.</p>
-<p>
-The region<a name="%_idx_142"></a> of the binding of a &lt;variable&gt;
-consists of the entire <tt>do</tt> expression except for the &lt;init&gt;s.
-It is an error for a &lt;variable&gt; to appear more than once in the
-list of <tt>do</tt> variables.</p>
-<p>
-A &lt;step&gt; may be omitted, in which case the effect is the
-same as if <tt>(&lt;variable&gt; &lt;init&gt; &lt;variable&gt;)</tt> had
-been written instead of <tt>(&lt;variable&gt; &lt;init&gt;)</tt>.</p>
-<p>
-<tt>(do&nbsp;((vec&nbsp;(make-vector&nbsp;5))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(i&nbsp;0&nbsp;(+&nbsp;i&nbsp;1)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((=&nbsp;i&nbsp;5)&nbsp;vec)<br>
-&nbsp;&nbsp;(vector-set!&nbsp;vec&nbsp;i&nbsp;i))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;#(0&nbsp;1&nbsp;2&nbsp;3&nbsp;4)<br>
-<br>
-(let&nbsp;((x&nbsp;'(1&nbsp;3&nbsp;5&nbsp;7&nbsp;9)))<br>
-&nbsp;&nbsp;(do&nbsp;((x&nbsp;x&nbsp;(cdr&nbsp;x))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(sum&nbsp;0&nbsp;(+&nbsp;sum&nbsp;(car&nbsp;x))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((null?&nbsp;x)&nbsp;sum)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;25</p>
-</tt>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_144"></a>let<i> &lt;variable&gt; &lt;bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;</div>
-
-<p>
-
-``Named <tt>let</tt>'' is a variant on the syntax of <tt>let</tt> which provides
-a more general looping construct than <tt>do</tt> and may also be used to express
-recursions.
-It has the same syntax and semantics as ordinary <tt>let</tt>
-except that &lt;variable&gt; is bound within &lt;body&gt; to a procedure
-whose formal arguments are the bound variables and whose body is
-&lt;body&gt;.  Thus the execution of &lt;body&gt; may be repeated by
-invoking the procedure named by &lt;variable&gt;.</p>
-<p>
-<tt>(let&nbsp;loop&nbsp;((numbers&nbsp;'(3&nbsp;-2&nbsp;1&nbsp;6&nbsp;-5))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(nonneg&nbsp;'())<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(neg&nbsp;'()))<br>
-&nbsp;&nbsp;(cond&nbsp;((null?&nbsp;numbers)&nbsp;(list&nbsp;nonneg&nbsp;neg))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((&gt;=&nbsp;(car&nbsp;numbers)&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;(cdr&nbsp;numbers)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;(car&nbsp;numbers)&nbsp;nonneg)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;neg))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((&lt;&nbsp;(car&nbsp;numbers)&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;(cdr&nbsp;numbers)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;nonneg<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;(car&nbsp;numbers)&nbsp;neg)))))&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;((6&nbsp;1&nbsp;3)&nbsp;(-5&nbsp;-2))</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.2.5"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.2.5">4.2.5&nbsp;&nbsp;Delayed evaluation</a></h3>
-<p></p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_146"></a>delay<i> &lt;expression&gt;</i>)</tt>&nbsp;</div>
-
-<p>
-</p>
-<p>
-The <tt>delay</tt> construct is used together with the procedure <tt>force</tt> to
-implement <a name="%_idx_148"></a><em>lazy evaluation</em> or <a name="%_idx_150"></a><em>call by need</em>.
-<tt>(delay&nbsp;&lt;expression&gt;)</tt> returns an object called a
-<a name="%_idx_152"></a><em>promise</em> which at some point in the future may be asked (by
-the <tt>force</tt> procedure)  to evaluate
-&lt;expression&gt;, and deliver the resulting value.
-The effect of &lt;expression&gt; returning multiple values
-is unspecified.</p>
-<p>
-See the description of <tt>force</tt> (section&nbsp;<a href="r5rs-Z-H-9.html#%_sec_6.4">6.4</a>) for a
-more complete description of <tt>delay</tt>.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.2.6"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.2.6">4.2.6&nbsp;&nbsp;Quasiquotation</a></h3>
-<p></p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_154"></a>quasiquote<i> &lt;qq template&gt;</i>)</tt>&nbsp;</div>
- <div align=left><u>syntax:</u>&nbsp;&nbsp;<tt><tt>`</tt>&lt;qq template&gt;</tt>&nbsp;</div>
-
-<p>
-``Backquote'' or ``quasiquote''<a name="%_idx_156"></a> expressions are useful
-for constructing a list or vector structure when most but not all of the
-desired structure is known in advance.  If no
-commas<a name="%_idx_158"></a> appear within the &lt;qq template&gt;, the result of
-evaluating
-<tt>`</tt>&lt;qq template&gt; is equivalent to the result of evaluating
-<tt>'</tt>&lt;qq template&gt;.  If a comma<a name="%_idx_160"></a> appears within the
-&lt;qq template&gt;, however, the expression following the comma is
-evaluated (``unquoted'') and its result is inserted into the structure
-instead of the comma and the expression.  If a comma appears followed
-immediately by an at-sign (<tt>@</tt>),<a name="%_idx_162"></a> then the following
-expression must evaluate to a list; the opening and closing parentheses
-of the list are then ``stripped away'' and the elements of the list are
-inserted in place of the comma at-sign expression sequence.  A comma
-at-sign should only appear within a list or vector &lt;qq template&gt;.</p>
-<p>
-
-<tt>`(list&nbsp;,(+&nbsp;1&nbsp;2)&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(list&nbsp;3&nbsp;4)<br>
-(let&nbsp;((name&nbsp;'a))&nbsp;`(list&nbsp;,name&nbsp;',name))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(list&nbsp;a&nbsp;(quote&nbsp;a))<br>
-`(a&nbsp;,(+&nbsp;1&nbsp;2)&nbsp;,@(map&nbsp;abs&nbsp;'(4&nbsp;-5&nbsp;6))&nbsp;b)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;3&nbsp;4&nbsp;5&nbsp;6&nbsp;b)<br>
-`((<tt>&nbsp;foo</tt>&nbsp;,(-&nbsp;10&nbsp;3))&nbsp;,@(cdr&nbsp;'(c))&nbsp;.&nbsp;,(car&nbsp;'(cons)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;((foo&nbsp;7)&nbsp;.&nbsp;cons)<br>
-`#(10&nbsp;5&nbsp;,(sqrt&nbsp;4)&nbsp;,@(map&nbsp;sqrt&nbsp;'(16&nbsp;9))&nbsp;8)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;#(10&nbsp;5&nbsp;2&nbsp;4&nbsp;3&nbsp;8)</p>
-</tt>
-<p>
-Quasiquote forms may be nested.  Substitutions are made only for
-unquoted components appearing at the same nesting level
-as the outermost backquote.  The nesting level increases by one inside
-each successive quasiquotation, and decreases by one inside each
-unquotation.</p>
-<p>
-<tt>`(a&nbsp;`(b&nbsp;,(+&nbsp;1&nbsp;2)&nbsp;,(foo&nbsp;,(+&nbsp;1&nbsp;3)&nbsp;d)&nbsp;e)&nbsp;f)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;`(b&nbsp;,(+&nbsp;1&nbsp;2)&nbsp;,(foo&nbsp;4&nbsp;d)&nbsp;e)&nbsp;f)<br>
-(let&nbsp;((name1&nbsp;'x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(name2&nbsp;'y))<br>
-&nbsp;&nbsp;`(a&nbsp;`(b&nbsp;,,name1&nbsp;,',name2&nbsp;d)&nbsp;e))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;`(b&nbsp;,x&nbsp;,'y&nbsp;d)&nbsp;e)</p>
-</tt>
-<p>
-The two notations
-<tt>`</tt>&lt;qq template&gt; and <tt>(quasiquote &lt;qq template&gt;)</tt>
-are identical in all respects.
-<tt>,&lt;expression&gt;</tt> is identical to <tt>(unquote &lt;expression&gt;)</tt>,
-and
-<tt>,@&lt;expression&gt;</tt> is identical to <tt>(unquote-splicing &lt;expression&gt;)</tt>.
-The external syntax generated by <tt>write</tt> for two-element lists whose
-car is one of these symbols may vary between implementations.
-<a name="%_idx_164"></a></p>
-<p>
-<tt>(quasiquote&nbsp;(list&nbsp;(unquote&nbsp;(+&nbsp;1&nbsp;2))&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(list&nbsp;3&nbsp;4)<br>
-'(quasiquote&nbsp;(list&nbsp;(unquote&nbsp;(+&nbsp;1&nbsp;2))&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;`(list&nbsp;,(+&nbsp;1&nbsp;2)&nbsp;4)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em>i.e.,</em>&nbsp;(quasiquote&nbsp;(list&nbsp;(unquote&nbsp;(+&nbsp;1&nbsp;2))&nbsp;4))</p>
-</tt>
-<p>
-Unpredictable behavior can result if any of the symbols
-<tt>quasiquote</tt>, <tt>unquote</tt>, or <tt>unquote-splicing</tt> appear in
-positions within a &lt;qq template&gt; otherwise than as described above.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.3"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.3">4.3&nbsp;&nbsp;Macros</a></h2>
-<p></p>
-<p>
-Scheme programs can define and use new derived expression types,
-called <em>macros</em>.<a name="%_idx_166"></a>
-Program-defined expression types have the syntax
-<tt>(&lt;keyword&gt;&nbsp;&lt;datum&gt;&nbsp;...)</p>
-</tt>where &lt;keyword&gt; is an identifier that uniquely determines the
-expression type.  This identifier is called the <em>syntactic
-keyword</em><a name="%_idx_168"></a>, or simply <em>keyword</em><a name="%_idx_170"></a>, of the macro<a name="%_idx_172"></a>.  The
-number of the &lt;datum&gt;s, and their syntax, depends on the
-expression type.
-<p>
-Each instance of a macro is called a <em>use</em><a name="%_idx_174"></a>
-of the macro.
-The set of rules that specifies
-how a use of a macro is transcribed into a more primitive expression
-is called the <em>transformer</em><a name="%_idx_176"></a>
-of the macro.</p>
-<p>
-The macro definition facility consists of two parts:</p>
-<p>
-</p>
-<ul>
-<li>
-<p>A set of expressions used to establish that certain identifiers
-are macro keywords, associate them with macro transformers, and control
-the scope within which a macro is defined, and</p>
-<p>
-</p>
-<li>
-<p>a pattern language for specifying macro transformers.
-</p>
-</ul>
-<p></p>
-<p>
-The syntactic keyword of a macro may shadow variable bindings, and local
-variable bindings may shadow keyword bindings.  <a name="%_idx_178"></a>  All macros
-defined using the pattern language  are ``hygienic'' and ``referentially
-transparent'' and thus preserve Scheme's lexical scoping&nbsp;[<a href="r5rs-Z-H-14.html#cite{Kohlbecker86}">14</a>,&nbsp;<a href="r5rs-Z-H-14.html#cite{hygienic}">15</a>,&nbsp;<a href="r5rs-Z-H-14.html#cite{Bawden88}">2</a>,&nbsp;<a href="r5rs-Z-H-14.html#cite{macrosthatwork}">7</a>,&nbsp;<a href="r5rs-Z-H-14.html#cite{syntacticabstraction}">9</a>]:
-<a name="%_idx_180"></a>
-<a name="%_idx_182"></a></p>
-<p>
-</p>
-<ul>
-<p>
-</p>
-<li>
-<p>If a macro transformer inserts a binding for an identifier
-(variable or keyword), the identifier will in effect be renamed
-throughout its scope to avoid conflicts with other identifiers.
-Note that a <tt>define</tt> at top level may or may not introduce a binding;
-see section&nbsp;<a href="r5rs-Z-H-8.html#%_sec_5.2">5.2</a>.</p>
-<p>
-</p>
-<li>
-<p>If a macro transformer inserts a free reference to an
-identifier, the reference refers to the binding that was visible
-where the transformer was specified, regardless of any local
-bindings that may surround the use of the macro.</p>
-<p>
-</p>
-</ul>
-<p></p>
-<p>
-
-
-</p>
-<a name="%_sec_4.3.1"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.3.1">4.3.1&nbsp;&nbsp;Binding constructs for syntactic keywords</a></h3>
-<p></p>
-<p>
-<tt>Let-syntax</tt> and <tt>letrec-syntax</tt> are
-analogous to <tt>let</tt> and <tt>letrec</tt>, but they bind
-syntactic keywords to macro transformers instead of binding variables
-to locations that contain values.  Syntactic keywords may also be
-bound at top level; see section&nbsp;<a href="r5rs-Z-H-8.html#%_sec_5.3">5.3</a>.</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_184"></a>let-syntax<i> &lt;bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;</div>
-
-<p>
-<em>Syntax: </em>&lt;Bindings&gt; should have the form
-<tt>((&lt;keyword&gt;&nbsp;&lt;transformer&nbsp;spec&gt;)&nbsp;<tt>...</tt>)</p>
-</tt>
-Each &lt;keyword&gt; is an identifier,
-each &lt;transformer spec&gt; is an instance of <tt>syntax-rules</tt>, and
-&lt;body&gt; should be a sequence of one or more expressions.  It is an error
-for a &lt;keyword&gt; to appear more than once in the list of keywords
-being bound.
-<p>
-<em>Semantics: </em>The &lt;body&gt; is expanded in the syntactic environment
-obtained by extending the syntactic environment of the
-<tt>let-syntax</tt> expression with macros whose keywords are
-the &lt;keyword&gt;s, bound to the specified transformers.
-Each binding of a &lt;keyword&gt; has &lt;body&gt; as its region.</p>
-<p>
-<tt>(let-syntax&nbsp;((when&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((when&nbsp;test&nbsp;stmt1&nbsp;stmt2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;test<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;stmt1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stmt2&nbsp;...))))))<br>
-&nbsp;&nbsp;(let&nbsp;((if&nbsp;<tt>#t</tt>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(when&nbsp;if&nbsp;(set!&nbsp;if&nbsp;'now))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;if))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;now<br>
-<br>
-(let&nbsp;((x&nbsp;'outer))<br>
-&nbsp;&nbsp;(let-syntax&nbsp;((m&nbsp;(syntax-rules&nbsp;()&nbsp;((m)&nbsp;x))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((x&nbsp;'inner))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(m))))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;outer</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_186"></a>letrec-syntax<i> &lt;bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;</div>
-
-<p>
-<em>Syntax: </em>Same as for <tt>let-syntax</tt>.</p>
-<p>
-<em>Semantics: </em>The &lt;body&gt; is expanded in the syntactic environment obtained by
-extending the syntactic environment of the <tt>letrec-syntax</tt>
-expression with macros whose keywords are the
-&lt;keyword&gt;s, bound to the specified transformers.
-Each binding of a &lt;keyword&gt; has the &lt;bindings&gt;
-as well as the &lt;body&gt; within its region,
-so the transformers can
-transcribe expressions into uses of the macros
-introduced by the <tt>letrec-syntax</tt> expression.</p>
-<p>
-<tt>(letrec-syntax<br>
-&nbsp;&nbsp;((my-or&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((my-or)&nbsp;<tt>#f</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((my-or&nbsp;e)&nbsp;e)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((my-or&nbsp;e1&nbsp;e2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((temp&nbsp;e1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;temp<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;temp<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(my-or&nbsp;e2&nbsp;...)))))))<br>
-&nbsp;&nbsp;(let&nbsp;((x&nbsp;<tt>#f</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(y&nbsp;7)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(temp&nbsp;8)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;odd?)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;even?))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(my-or&nbsp;x<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;temp)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;7</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_4.3.2"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_4.3.2">4.3.2&nbsp;&nbsp;Pattern language</a></h3>
-<p></p>
-<p>
-A &lt;transformer spec&gt; has the following form:</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_188"></a>syntax-rules<i> &lt;literals&gt; &lt;syntax rule&gt; <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-<em>Syntax: </em>&lt;Literals&gt; is a list of identifiers and each &lt;syntax rule&gt;
-should be of the form
-<tt>(&lt;pattern&gt;&nbsp;&lt;template&gt;)</p>
-</tt>
-The &lt;pattern&gt; in a &lt;syntax rule&gt; is a list &lt;pattern&gt;
-that begins with the keyword for the macro.
-<p>
-A &lt;pattern&gt; is either an identifier, a constant, or one of the
-following
-<tt>(&lt;pattern&gt;&nbsp;<tt>...</tt>)<br>
-(&lt;pattern&gt;&nbsp;&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;.&nbsp;&lt;pattern&gt;)<br>
-(&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;&lt;pattern&gt;&nbsp;&lt;ellipsis&gt;)<br>
-#(&lt;pattern&gt;&nbsp;<tt>...</tt>)<br>
-#(&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;&lt;pattern&gt;&nbsp;&lt;ellipsis&gt;)</p>
-</tt>
-and a template is either an identifier, a constant, or one of the following
-<tt>(&lt;element&gt;&nbsp;<tt>...</tt>)<br>
-(&lt;element&gt;&nbsp;&lt;element&gt;&nbsp;<tt>...</tt>&nbsp;.&nbsp;&lt;template&gt;)<br>
-#(&lt;element&gt;&nbsp;<tt>...</tt>)</tt>
-where an &lt;element&gt; is a &lt;template&gt; optionally
-followed by an &lt;ellipsis&gt; and
-an &lt;ellipsis&gt; is the identifier ``<tt>...</tt>'' (which cannot be used as
-an identifier in either a template or a pattern).<a name="%_idx_190"></a>
-<p>
-<em>Semantics: </em>An instance of <tt>syntax-rules</tt> produces a new macro
-transformer by specifying a sequence of hygienic rewrite rules.  A use
-of a macro whose keyword is associated with a transformer specified by
-<tt>syntax-rules</tt> is matched against the patterns contained in the
-&lt;syntax rule&gt;s, beginning with the leftmost &lt;syntax rule&gt;.
-When a match is found, the macro use is transcribed hygienically
-according to the template.</p>
-<p>
-An identifier that appears in the pattern of a &lt;syntax rule&gt; is
-a <em>pattern variable</em>, unless it is the keyword that begins the pattern,
-is listed in &lt;literals&gt;, or is the identifier ``<tt>...</tt>''.
-Pattern variables match arbitrary input elements and
-are used to refer to elements of the input in the template.  It is an
-error for the same pattern variable to appear more than once in a
-&lt;pattern&gt;.</p>
-<p>
-The keyword at the beginning of the pattern in a
-&lt;syntax rule&gt; is not involved in the matching and
-is not considered a pattern variable or literal identifier.</p>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-The scope of the keyword is determined by the expression or syntax
-definition that binds it to the associated macro transformer.
-If the keyword were a pattern variable or literal
-identifier, then
-the template that follows the pattern would be within its scope
-regardless of whether the keyword were bound by <tt>let-syntax</tt>
-or by <tt>letrec-syntax</tt>.
-</blockquote>
-<p>
-Identifiers that appear in &lt;literals&gt; are interpreted as literal
-identifiers to be matched against corresponding subforms of the input.
-A subform
-in the input matches a literal identifier if and only if it is an
-identifier
-and either both its occurrence in the macro expression and its
-occurrence in the macro definition have the same lexical binding, or
-the two identifiers are equal and both have no lexical binding.</p>
-<p>
-
-A subpattern followed by <tt>...</tt> can match zero or more elements of the
-input.  It is an error for <tt>...</tt> to appear in &lt;literals&gt;.
-Within a pattern the identifier <tt>...</tt> must follow the last element of
-a nonempty sequence of subpatterns.</p>
-<p>
-More formally, an input form <em>F</em> matches a pattern <em>P</em> if and only if:</p>
-<p>
-</p>
-<ul>
-<li>
-<p><em>P</em> is a non-literal identifier; or</p>
-<p>
-</p>
-<li>
-<p><em>P</em> is a literal identifier and <em>F</em> is an identifier with the same
-binding; or</p>
-<p>
-</p>
-<li>
-<p><em>P</em> is a list <tt>(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub>)</tt> and <em>F</em> is a
-list of <em>n</em>
-forms that match <em>P</em><sub>1</sub> through <em>P</em><sub><em>n</em></sub>, respectively; or</p>
-<p>
-</p>
-<li>
-<p><em>P</em> is an improper list
-<tt>(<em>P</em><sub>1</sub> <em>P</em><sub>2</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub> . <em>P</em><sub><em>n</em>+1</sub>)</tt>
-and <em>F</em> is a list or
-improper list of <em>n</em> or more forms that match <em>P</em><sub>1</sub> through <em>P</em><sub><em>n</em></sub>,
-respectively, and whose <em>n</em>th ``cdr'' matches <em>P</em><sub><em>n</em>+1</sub>; or</p>
-<p>
-</p>
-<li>
-<p><em>P</em> is of the form
-<tt>(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub> <em>P</em><sub><em>n</em>+1</sub> &lt;ellipsis&gt;)</tt>
-where &lt;ellipsis&gt; is the identifier <tt>...</tt>
-and <em>F</em> is
-a proper list of at least <em>n</em> forms, the first <em>n</em> of which match
-<em>P</em><sub>1</sub> through <em>P</em><sub><em>n</em></sub>, respectively, and each remaining element of <em>F</em>
-matches <em>P</em><sub><em>n</em>+1</sub>; or</p>
-<p>
-</p>
-<li>
-<p><em>P</em> is a vector of the form <tt>#(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub>)</tt>
-and <em>F</em> is a vector
-of <em>n</em> forms that match <em>P</em><sub>1</sub> through <em>P</em><sub><em>n</em></sub>; or</p>
-<p>
-</p>
-<li>
-<p><em>P</em> is of the form
-<tt>#(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub> <em>P</em><sub><em>n</em>+1</sub> &lt;ellipsis&gt;)</tt>
-where &lt;ellipsis&gt; is the identifier <tt>...</tt>
-and <em>F</em> is a vector of <em>n</em>
-or more forms the first <em>n</em> of which match
-<em>P</em><sub>1</sub> through <em>P</em><sub><em>n</em></sub>, respectively, and each remaining element of <em>F</em>
-matches <em>P</em><sub><em>n</em>+1</sub>; or</p>
-<p>
-</p>
-<li>
-<p><em>P</em> is a datum and <em>F</em> is equal to <em>P</em> in the sense of
-the <tt>equal?</tt> procedure.
-</p>
-</ul>
-<p></p>
-<p>
-It is an error to use a macro keyword, within the scope of its
-binding, in an expression that does not match any of the patterns.</p>
-<p>
-When a macro use is transcribed according to the template of the
-matching &lt;syntax rule&gt;, pattern variables that occur in the
-template are replaced by the subforms they match in the input.
-Pattern variables that occur in subpatterns followed by one or more
-instances of the identifier
-<tt>...</tt> are allowed only in subtemplates that are
-followed by as many instances of <tt>...</tt>.
-They are replaced in the
-output by all of the subforms they match in the input, distributed as
-indicated.  It is an error if the output cannot be built up as
-specified.</p>
-<p>
-
-Identifiers that appear in the template but are not pattern variables
-or the identifier
-<tt>...</tt> are inserted into the output as literal identifiers.  If a
-literal identifier is inserted as a free identifier then it refers to the
-binding of that identifier within whose scope the instance of
-<tt>syntax-rules</tt> appears.
-If a literal identifier is inserted as a bound identifier then it is
-in effect renamed to prevent inadvertent captures of free identifiers.</p>
-<p>
-As an example, if <tt>let</tt> and <tt>cond</tt> are defined as in
-section&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.3">7.3</a> then they are hygienic (as required) and
-the following is not an error.</p>
-<p>
-<tt>(let&nbsp;((=&gt;&nbsp;<tt>#f</tt>))<br>
-&nbsp;&nbsp;(cond&nbsp;(<tt>#t</tt>&nbsp;=&gt;&nbsp;'ok)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;ok</p>
-</tt>
-<p>
-The macro transformer for <tt>cond</tt> recognizes <tt>=&gt;</tt>
-as a local variable, and hence an expression, and not as the
-top-level identifier <tt>=&gt;</tt>, which the macro transformer treats
-as a syntactic keyword.  Thus the example expands into</p>
-<p>
-<tt>(let&nbsp;((=&gt;&nbsp;<tt>#f</tt>))<br>
-&nbsp;&nbsp;(if&nbsp;<tt>#t</tt>&nbsp;(begin&nbsp;=&gt;&nbsp;'ok)))</p>
-</tt>
-<p>
-instead of</p>
-<p>
-<tt>(let&nbsp;((=&gt;&nbsp;<tt>#f</tt>))<br>
-&nbsp;&nbsp;(let&nbsp;((temp&nbsp;<tt>#t</tt>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;temp&nbsp;('ok&nbsp;temp))))</p>
-</tt>
-<p>
-which would result in an invalid procedure call.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p></p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-6.html">previous</a></span><span>, <a href="r5rs-Z-H-8.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-8.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-8.html
deleted file mode 100644
index 05eec2cffc..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-8.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-7.html">previous</a></span><span>, <a href="r5rs-Z-H-9.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_5"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r5rs-Z-H-2.html#%_toc_%_chap_5">Chapter 5</a></div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_5">Program structure</a></h1>
-<p></p>
-<p>
-</p>
-<a name="%_sec_5.1"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_5.1">5.1&nbsp;&nbsp;Programs</a></h2>
-<p>A Scheme program consists of a sequence of expressions, definitions,
-and syntax definitions.
-Expressions are described in chapter&nbsp;<a href="r5rs-Z-H-7.html#%_chap_4">4</a>;
-definitions and syntax definitions are the subject of the rest of the
-present chapter.</p>
-<p>
-Programs are typically stored in files or entered interactively to a
-running Scheme system, although other paradigms are possible;
-questions of user interface lie outside the scope of this report.
-(Indeed, Scheme would still be useful as a notation for expressing
-computational methods even in the absence of a mechanical
-implementation.)</p>
-<p>
-Definitions and syntax definitions occurring at the top level of a program
-can be interpreted
-declaratively.
-They cause bindings to be created in the top level
-environment or modify the value of existing top-level bindings.
-Expressions occurring at the top level of a program are
-interpreted imperatively; they are executed in order when the program is
-invoked or loaded, and typically perform some kind of initialization.</p>
-<p>
-At the top level of a program <tt>(begin &lt;form<sub>1</sub>&gt; <tt>...</tt>)</tt> is
-equivalent to the sequence of expressions, definitions, and syntax definitions
-that form the body of the <tt>begin</tt>.</p>
-<p>
-</p>
-<p>
-</p>
-<a name="%_sec_5.2"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_5.2">5.2&nbsp;&nbsp;Definitions</a></h2>
-<p></p>
-<p>
-Definitions are valid in some, but not all, contexts where expressions
-are allowed.  They are valid only at the top level of a &lt;program&gt;
-and at the beginning of a &lt;body&gt;.
-<a name="%_idx_192"></a></p>
-<p>
-A definition should have one of the following forms:<a name="%_idx_194"></a></p>
-<p>
-</p>
-<ul>
-<p>
-</p>
-<li>
-<p><tt>(define &lt;variable&gt; &lt;expression&gt;)</tt></p>
-<p>
-</p>
-<li>
-<p><tt>(define (&lt;variable&gt; &lt;formals&gt;) &lt;body&gt;)</tt></p>
-<p>
-&lt;Formals&gt; should be either a
-sequence of zero or more variables, or a sequence of one or more
-variables followed by a space-delimited period and another variable (as
-in a lambda expression).  This form is equivalent to
-<tt>(define&nbsp;&lt;variable&gt;<br>
-&nbsp;&nbsp;(lambda&nbsp;(&lt;formals&gt;)&nbsp;&lt;body&gt;)).</p>
-</tt>
-<p>
-</p>
-<li>
-<p><tt>(define (&lt;variable&gt; . &lt;formal&gt;) &lt;body&gt;)</tt></p>
-<p>
-&lt;Formal&gt; should be a single
-variable.  This form is equivalent to
-<tt>(define&nbsp;&lt;variable&gt;<br>
-&nbsp;&nbsp;(lambda&nbsp;&lt;formal&gt;&nbsp;&lt;body&gt;)).</p>
-</tt>
-<p>
-</p>
-</ul>
-<p></p>
-<p>
-</p>
-<a name="%_sec_5.2.1"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_5.2.1">5.2.1&nbsp;&nbsp;Top level definitions</a></h3>
-<p>At the top level of a program, a definition
-<tt>(define&nbsp;&lt;variable&gt;&nbsp;&lt;expression&gt;)</p>
-</tt>
-has essentially the same effect as the assignment expression
-<tt>(<tt>set!</tt> &lt;variable&gt;&nbsp;&lt;expression&gt;)</tt>
-if &lt;variable&gt; is bound.  If &lt;variable&gt; is not bound,
-however, then the definition will bind &lt;variable&gt; to a new
-location before performing the assignment, whereas it would be an error
-to perform a <tt>set!</tt> on an unbound<a name="%_idx_196"></a> variable.
-<p>
-<tt>(define&nbsp;add3<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)&nbsp;(+&nbsp;x&nbsp;3)))<br>
-(add3&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;6<br>
-(define&nbsp;first&nbsp;car)<br>
-(first&nbsp;'(1&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1</p>
-</tt>
-<p>
-Some implementations of Scheme use an initial environment in
-which all possible variables are bound to locations, most of
-which contain undefined values.  Top level definitions in
-such an implementation are truly equivalent to assignments.</p>
-<p>
-</p>
-<p>
-</p>
-<a name="%_sec_5.2.2"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_5.2.2">5.2.2&nbsp;&nbsp;Internal definitions</a></h3>
-<p></p>
-<p>
-Definitions may occur at the
-beginning of a &lt;body&gt; (that is, the body of a <tt>lambda</tt>,
-<tt>let</tt>, <tt>let*</tt>, <tt>letrec</tt>, <tt>let-syntax</tt>, or <tt>letrec-syntax</tt>
-expression or that of a definition of an appropriate form).
-Such definitions are known as <em>internal definitions</em> <a name="%_idx_198"></a> as opposed to the top level definitions described above.
-The variable defined by an internal definition is local to the
-&lt;body&gt;.  That is, &lt;variable&gt; is bound rather than assigned,
-and the region of the binding is the entire &lt;body&gt;.  For example,</p>
-<p>
-<tt>(let&nbsp;((x&nbsp;5))<br>
-&nbsp;&nbsp;(define&nbsp;foo&nbsp;(lambda&nbsp;(y)&nbsp;(bar&nbsp;x&nbsp;y)))<br>
-&nbsp;&nbsp;(define&nbsp;bar&nbsp;(lambda&nbsp;(a&nbsp;b)&nbsp;(+&nbsp;(*&nbsp;a&nbsp;b)&nbsp;a)))<br>
-&nbsp;&nbsp;(foo&nbsp;(+&nbsp;x&nbsp;3)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;45</p>
-</tt>
-<p>
-A &lt;body&gt; containing internal definitions can always be converted
-into a completely equivalent <tt>letrec</tt> expression.  For example, the
-<tt>let</tt> expression in the above example is equivalent to</p>
-<p>
-<tt>(let&nbsp;((x&nbsp;5))<br>
-&nbsp;&nbsp;(letrec&nbsp;((foo&nbsp;(lambda&nbsp;(y)&nbsp;(bar&nbsp;x&nbsp;y)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bar&nbsp;(lambda&nbsp;(a&nbsp;b)&nbsp;(+&nbsp;(*&nbsp;a&nbsp;b)&nbsp;a))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(foo&nbsp;(+&nbsp;x&nbsp;3))))</p>
-</tt>
-<p>
-Just as for the equivalent <tt>letrec</tt> expression, it must be
-possible to evaluate each &lt;expression&gt; of every internal
-definition in a &lt;body&gt; without assigning or referring to
-the value of any &lt;variable&gt; being defined.</p>
-<p>
-Wherever an internal definition may occur
-<tt>(begin &lt;definition<sub>1</sub>&gt; <tt>...</tt>)</tt>
-is equivalent to the sequence of definitions
-that form the body of the <tt>begin</tt>.</p>
-<p>
-</p>
-<a name="%_sec_5.3"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_5.3">5.3&nbsp;&nbsp;Syntax definitions</a></h2>
-<p>Syntax definitions are valid only at the top level of a &lt;program&gt;.
-<a name="%_idx_200"></a>
-They have the following form:<a name="%_idx_202"></a></p>
-<p>
-<tt>(define-syntax &lt;keyword&gt; &lt;transformer spec&gt;)</tt></p>
-<p>
-&lt;Keyword&gt; is an identifier, and
-the &lt;transformer spec&gt; should be an instance of <tt>syntax-rules</tt>.
-The top-level syntactic environment is extended by binding the
-&lt;keyword&gt; to the specified transformer.</p>
-<p>
-There is no <tt>define-syntax</tt> analogue of internal definitions.</p>
-<p>
-
-
-Although macros may expand into definitions and syntax definitions in
-any context that permits them, it is an error for a definition or syntax
-definition to shadow a syntactic keyword whose meaning is needed to
-determine whether some form in the group of forms that contains the
-shadowing definition is in fact a definition, or, for internal definitions,
-is needed to determine the boundary between the group and the expressions
-that follow the group.  For example, the following are errors:</p>
-<p>
-<tt>(define&nbsp;define&nbsp;3)<br>
-<br>
-(begin&nbsp;(define&nbsp;begin&nbsp;list))<br>
-<br>
-(let-syntax<br>
-&nbsp;&nbsp;((foo&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((foo&nbsp;(proc&nbsp;args&nbsp;...)&nbsp;body&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(define&nbsp;proc<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(args&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body&nbsp;...))))))<br>
-&nbsp;&nbsp;(let&nbsp;((x&nbsp;3))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(foo&nbsp;(plus&nbsp;x&nbsp;y)&nbsp;(+&nbsp;x&nbsp;y))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(define&nbsp;foo&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(plus&nbsp;foo&nbsp;x)))<br>
-</p>
-</tt>
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p>
-</p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-7.html">previous</a></span><span>, <a href="r5rs-Z-H-9.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-9.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-9.html
deleted file mode 100644
index 2417bbe836..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs-Z-H-9.html
+++ /dev/null
@@ -1,3484 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="noindex,follow">
-</head>
-<body>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-8.html">previous</a></span><span>, <a href="r5rs-Z-H-10.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-<a name="%_chap_6"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r5rs-Z-H-2.html#%_toc_%_chap_6">Chapter 6</a></div><br>
-<a href="r5rs-Z-H-2.html#%_toc_%_chap_6">Standard procedures</a></h1>
-<p>
-</p>
-<p>
-<a name="%_idx_204"></a>
-<a name="%_idx_206"></a>
-<a name="%_idx_208"></a></p>
-<p>
-This chapter describes Scheme's built-in procedures.  The initial (or
-``top level'') Scheme environment starts out with a number of variables
-bound to locations containing useful values, most of which are primitive
-procedures that manipulate data.  For example, the variable <tt>abs</tt> is
-bound to (a location initially containing) a procedure of one argument
-that computes the absolute value of a number, and the variable <tt>+</tt>
-is bound to a procedure that computes sums.  Built-in procedures that
-can easily be written in terms of other built-in procedures are identified as
-``library procedures''.</p>
-<p>
-A program may use a top-level definition to bind any variable.  It may
-subsequently alter any such binding by an assignment (see <a href="r5rs-Z-H-7.html#%_sec_4.1.6">4.1.6</a>).
-These operations do not modify the behavior of Scheme's built-in
-procedures.  Altering any top-level binding that has not been introduced by a
-definition has an unspecified effect on the behavior of the built-in procedures.</p>
-<p>
-</p>
-<a name="%_sec_6.1"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.1">6.1&nbsp;&nbsp;Equivalence predicates</a></h2>
-<p></p>
-<p>
-A <a name="%_idx_210"></a><em>predicate</em> is a procedure that always returns a boolean
-value (<tt>#t</tt> or <tt>#f</tt>).  An <a name="%_idx_212"></a><em>equivalence predicate</em> is
-the computational analogue of a mathematical equivalence relation (it is
-symmetric, reflexive, and transitive).  Of the equivalence predicates
-described in this section, <tt>eq?</tt> is the finest or most
-discriminating, and <tt>equal?</tt> is the coarsest.  <tt>Eqv?</tt> is
-slightly less discriminating than <tt>eq?</tt>.  </p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_214"></a>eqv?<i> <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<p>
-The <tt>eqv?</tt> procedure defines a useful equivalence relation on objects.
-Briefly, it returns <tt>#t</tt> if <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> should
-normally be regarded as the same object.  This relation is left slightly
-open to interpretation, but the following partial specification of
-<tt>eqv?</tt> holds for all implementations of Scheme.</p>
-<p>
-The <tt>eqv?</tt> procedure returns <tt>#t</tt> if:</p>
-<p>
-</p>
-<ul>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both <tt>#t</tt> or both <tt>#f</tt>.</p>
-<p>
-</p>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both symbols and</p>
-<p>
-<tt>(string=?&nbsp;(symbol-&gt;string&nbsp;obj1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(symbol-&gt;string&nbsp;obj2))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em> 
-This assumes that neither <i>obj<sub>1</sub></i> nor <i>obj<sub>2</sub></i> is an ``uninterned
-symbol'' as alluded to in section&nbsp;<a href="#%_sec_6.3.3">6.3.3</a>.  This report does
-not presume to specify the behavior of <tt>eqv?</tt> on implementation-dependent
-extensions.
-</blockquote>
-<p>
-</p>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both numbers, are numerically
-equal (see <tt>=</tt>, section&nbsp;<a href="#%_sec_6.2">6.2</a>), and are either both
-exact<a name="%_idx_216"></a> or both inexact<a name="%_idx_218"></a>.</p>
-<p>
-</p>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both characters and are the same
-character according to the <tt>char=?</tt> procedure
-(section&nbsp;<a href="#%_sec_6.3.4">6.3.4</a>).</p>
-<p>
-</p>
-<li>
-<p>both <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are the empty list.</p>
-<p>
-</p>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are pairs, vectors, or strings that denote the
-same locations in the store (section&nbsp;<a href="r5rs-Z-H-6.html#%_sec_3.4">3.4</a>).</p>
-<p>
-</p>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are procedures whose location tags are
-equal (section&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.1.4">4.1.4</a>).
-</p>
-</ul>
-<p></p>
-<p>
-The <tt>eqv?</tt> procedure returns <tt>#f</tt> if:</p>
-<p>
-</p>
-<ul>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are of different types
-(section&nbsp;<a href="r5rs-Z-H-6.html#%_sec_3.2">3.2</a>).</p>
-<p>
-</p>
-<li>
-<p>one of <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> is <tt>#t</tt> but the other is
-<tt>#f</tt>.</p>
-<p>
-</p>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are symbols but</p>
-<p>
-<tt>(string=?&nbsp;(symbol-&gt;string&nbsp;<i>obj<sub>1</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(symbol-&gt;string&nbsp;<i>obj<sub>2</sub></i>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt></p>
-</tt>
-<p>
-</p>
-<li>
-<p>one of <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> is an exact number but the other
-is an inexact number.</p>
-<p>
-</p>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are numbers for which the <tt>=</tt>
-procedure returns <tt>#f</tt>.</p>
-<p>
-</p>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are characters for which the <tt>char=?</tt>
-procedure returns <tt>#f</tt>.</p>
-<p>
-</p>
-<li>
-<p>one of <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> is the empty list but the other
-is not.</p>
-<p>
-</p>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are pairs, vectors, or strings that denote
-distinct locations.</p>
-<p>
-</p>
-<li>
-<p><i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are procedures that would behave differently
-(return different value(s) or have different side effects) for some arguments.</p>
-<p>
-</p>
-</ul>
-<p></p>
-<p>
-<tt>(eqv?&nbsp;'a&nbsp;'a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(eqv?&nbsp;'a&nbsp;'b)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(eqv?&nbsp;2&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(eqv?&nbsp;'()&nbsp;'())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(eqv?&nbsp;100000000&nbsp;100000000)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(eqv?&nbsp;(cons&nbsp;1&nbsp;2)&nbsp;(cons&nbsp;1&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(eqv?&nbsp;(lambda&nbsp;()&nbsp;1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(eqv?&nbsp;#f&nbsp;'nil)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(let&nbsp;((p&nbsp;(lambda&nbsp;(x)&nbsp;x)))<br>
-&nbsp;&nbsp;(eqv?&nbsp;p&nbsp;p))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-The following examples illustrate cases in which the above rules do
-not fully specify the behavior of <tt>eqv?</tt>.  All that can be said
-about such cases is that the value returned by <tt>eqv?</tt> must be a
-boolean.</p>
-<p>
-<tt>(eqv?&nbsp;&quot;&quot;&nbsp;&quot;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;'#()&nbsp;'#())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;(lambda&nbsp;(x)&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x)&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;(lambda&nbsp;(x)&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(y)&nbsp;y))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i></p>
-</tt>
-<p>
-The next set of examples shows the use of <tt>eqv?</tt> with procedures
-that have local state.  <tt>Gen-counter</tt> must return a distinct
-procedure every time, since each procedure has its own internal counter.
-<tt>Gen-loser</tt>, however, returns equivalent procedures each time, since
-the local state does not affect the value or side effects of the
-procedures.</p>
-<p>
-<tt>(define&nbsp;gen-counter<br>
-&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((n&nbsp;0))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;(set!&nbsp;n&nbsp;(+&nbsp;n&nbsp;1))&nbsp;n))))<br>
-(let&nbsp;((g&nbsp;(gen-counter)))<br>
-&nbsp;&nbsp;(eqv?&nbsp;g&nbsp;g))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(eqv?&nbsp;(gen-counter)&nbsp;(gen-counter))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(define&nbsp;gen-loser<br>
-&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((n&nbsp;0))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;(set!&nbsp;n&nbsp;(+&nbsp;n&nbsp;1))&nbsp;27))))<br>
-(let&nbsp;((g&nbsp;(gen-loser)))<br>
-&nbsp;&nbsp;(eqv?&nbsp;g&nbsp;g))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(eqv?&nbsp;(gen-loser)&nbsp;(gen-loser))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-<br>
-(letrec&nbsp;((f&nbsp;(lambda&nbsp;()&nbsp;(if&nbsp;(eqv?&nbsp;f&nbsp;g)&nbsp;'both&nbsp;'f)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(g&nbsp;(lambda&nbsp;()&nbsp;(if&nbsp;(eqv?&nbsp;f&nbsp;g)&nbsp;'both&nbsp;'g))))<br>
-&nbsp;&nbsp;(eqv?&nbsp;f&nbsp;g))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-<br>
-(letrec&nbsp;((f&nbsp;(lambda&nbsp;()&nbsp;(if&nbsp;(eqv?&nbsp;f&nbsp;g)&nbsp;'f&nbsp;'both)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(g&nbsp;(lambda&nbsp;()&nbsp;(if&nbsp;(eqv?&nbsp;f&nbsp;g)&nbsp;'g&nbsp;'both))))<br>
-&nbsp;&nbsp;(eqv?&nbsp;f&nbsp;g))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt></p>
-</tt>
-<p>
-
-Since it is an error to modify constant objects (those returned by
-literal expressions), implementations are permitted, though not
-required, to share structure between constants where appropriate.  Thus
-the value of <tt>eqv?</tt> on constants is sometimes
-implementation-dependent.</p>
-<p>
-<tt>(eqv?&nbsp;'(a)&nbsp;'(a))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;&quot;a&quot;&nbsp;&quot;a&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;'(b)&nbsp;(cdr&nbsp;'(a&nbsp;b)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(let&nbsp;((x&nbsp;'(a)))<br>
-&nbsp;&nbsp;(eqv?&nbsp;x&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em> 
-The above definition of <tt>eqv?</tt> allows implementations latitude in
-their treatment of procedures and literals:  implementations are free
-either to detect or to fail to detect that two procedures or two literals
-are equivalent to each other, and can decide whether or not to
-merge representations of equivalent objects by using the same pointer or
-bit pattern to represent both.
-</blockquote>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_220"></a>eq?<i> <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<p>
-<tt>Eq?</tt> is similar to <tt>eqv?</tt> except that in some cases it is
-capable of discerning distinctions finer than those detectable by
-<tt>eqv?</tt>.</p>
-<p>
-<tt>Eq?</tt> and <tt>eqv?</tt> are guaranteed to have the same
-behavior on symbols, booleans, the empty list, pairs, procedures,
-and non-empty
-strings and vectors.  <tt>Eq?</tt>'s behavior on numbers and characters is
-implementation-dependent, but it will always return either true or
-false, and will return true only when <tt>eqv?</tt> would also return
-true.  <tt>Eq?</tt> may also behave differently from <tt>eqv?</tt> on empty
-vectors and empty strings.</p>
-<p>
-<tt>(eq?&nbsp;'a&nbsp;'a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(eq?&nbsp;'(a)&nbsp;'(a))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(eq?&nbsp;(list&nbsp;'a)&nbsp;(list&nbsp;'a))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(eq?&nbsp;&quot;a&quot;&nbsp;&quot;a&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(eq?&nbsp;&quot;&quot;&nbsp;&quot;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(eq?&nbsp;'()&nbsp;'())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(eq?&nbsp;2&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(eq?&nbsp;#<tt>\</tt>A&nbsp;#<tt>\</tt>A)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(eq?&nbsp;car&nbsp;car)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(let&nbsp;((n&nbsp;(+&nbsp;2&nbsp;3)))<br>
-&nbsp;&nbsp;(eq?&nbsp;n&nbsp;n))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(let&nbsp;((x&nbsp;'(a)))<br>
-&nbsp;&nbsp;(eq?&nbsp;x&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(let&nbsp;((x&nbsp;'#()))<br>
-&nbsp;&nbsp;(eq?&nbsp;x&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(let&nbsp;((p&nbsp;(lambda&nbsp;(x)&nbsp;x)))<br>
-&nbsp;&nbsp;(eq?&nbsp;p&nbsp;p))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-</p>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em> It will usually be possible to implement <tt>eq?</tt> much
-more efficiently than <tt>eqv?</tt>, for example, as a simple pointer
-comparison instead of as some more complicated operation.  One reason is
-that it may not be possible to compute <tt>eqv?</tt> of two numbers in
-constant time, whereas <tt>eq?</tt> implemented as pointer comparison will
-always finish in constant time.  <tt>Eq?</tt> may be used like <tt>eqv?</tt>
-in applications using procedures to implement objects with state since
-it obeys the same constraints as <tt>eqv?</tt>.
-</blockquote>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_222"></a>equal?<i> <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<p>
-<tt>Equal?</tt> recursively compares the contents of pairs, vectors, and
-strings, applying <tt>eqv?</tt> on other objects such as numbers and symbols.
-A rule of thumb is that objects are generally <tt>equal?</tt> if they print
-the same.  <tt>Equal?</tt> may fail to terminate if its arguments are
-circular data structures.</p>
-<p>
-<tt>(equal?&nbsp;'a&nbsp;'a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;'(a)&nbsp;'(a))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;'(a&nbsp;(b)&nbsp;c)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'(a&nbsp;(b)&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;&quot;abc&quot;&nbsp;&quot;abc&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;2&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;(make-vector&nbsp;5&nbsp;'a)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-vector&nbsp;5&nbsp;'a))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;(lambda&nbsp;(x)&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(y)&nbsp;y))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i></p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.2"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.2">6.2&nbsp;&nbsp;Numbers</a></h2>
-<p>
-<a name="%_idx_224"></a></p>
-<p>
-
-
-</p>
-<p>
-Numerical computation has traditionally been neglected by the Lisp
-community.  Until Common Lisp there was no carefully thought out
-strategy for organizing numerical computation, and with the exception of
-the MacLisp system [<a href="r5rs-Z-H-14.html#cite{Pitman83}">20</a>] little effort was made to
-execute numerical code efficiently.  This report recognizes the excellent work
-of the Common Lisp committee and accepts many of their recommendations.
-In some ways this report simplifies and generalizes their proposals in a manner
-consistent with the purposes of Scheme.</p>
-<p>
-It is important to distinguish between the mathematical numbers, the
-Scheme numbers that attempt to model them, the machine representations
-used to implement the Scheme numbers, and notations used to write numbers.
-This report uses the types <i>number</i>, <i>complex</i>, <i>real</i>,
-<i>rational</i>, and <i>integer</i> to refer to both mathematical numbers
-and Scheme numbers.  Machine representations such as fixed point and
-floating point are referred to by names such as <i>fixnum</i> and
-<i>flonum</i>.</p>
-<p>
-
-</p>
-<a name="%_sec_6.2.1"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.2.1">6.2.1&nbsp;&nbsp;Numerical types</a></h3>
-<p>
-<a name="%_idx_226"></a></p>
-<p>
-
-
-Mathematically, numbers may be arranged into a tower of subtypes
-in which each level is a subset of the level above it:
-</p>
-<p>
-         number <br>
-&nbsp;&nbsp;&nbsp; complex <br>
-&nbsp;&nbsp;&nbsp; real <br>
-&nbsp;&nbsp;&nbsp; rational <br>
-&nbsp;&nbsp;&nbsp; integer 
-</p>
-
-<p></p>
-<p>
-For example, 3 is an integer.  Therefore 3 is also a rational,
-a real, and a complex.  The same is true of the Scheme numbers
-that model 3.  For Scheme numbers, these types are defined by the
-predicates <tt>number?</tt>, <tt>complex?</tt>, <tt>real?</tt>, <tt>rational?</tt>,
-and <tt>integer?</tt>.</p>
-<p>
-There is no simple relationship between a number's type and its
-representation inside a computer.  Although most implementations of
-Scheme will offer at least two different representations of 3, these
-different representations denote the same integer.</p>
-<p>
-
-Scheme's numerical operations treat numbers as abstract data, as
-independent of their representation as possible.  Although an implementation
-of Scheme may use fixnum, flonum, and perhaps other representations for
-numbers, this should not be apparent to a casual programmer writing
-simple programs.</p>
-<p>
-It is necessary, however, to distinguish between numbers that are
-represented exactly and those that may not be.  For example, indexes
-into data structures must be known exactly, as must some polynomial
-coefficients in a symbolic algebra system.  On the other hand, the
-results of measurements are inherently inexact, and irrational numbers
-may be approximated by rational and therefore inexact approximations.
-In order to catch uses of inexact numbers where exact numbers are
-required, Scheme explicitly distinguishes exact from inexact numbers.
-This distinction is orthogonal to the dimension of type.</p>
-<p>
-</p>
-<a name="%_sec_6.2.2"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.2.2">6.2.2&nbsp;&nbsp;Exactness</a></h3>
-<p>
-<a name="%_idx_228"></a> 
-Scheme numbers are either <i>exact</i> or <i>inexact</i>.  A number is
-exact if it was written as an exact constant or was derived from
-exact numbers using only exact operations.  A number is
-inexact if it was written as an inexact constant,
-if it was
-derived using inexact ingredients, or if it was derived using
-inexact operations. Thus inexactness is a contagious
-property of a number.
-
-If two implementations produce exact results for a
-computation that did not involve inexact intermediate results,
-the two ultimate results will be mathematically equivalent.  This is
-generally not true of computations involving inexact numbers
-since approximate methods such as floating point arithmetic may be used,
-but it is the duty of each implementation to make the result as close as
-practical to the mathematically ideal result.</p>
-<p>
-Rational operations such as <tt>+</tt> should always produce
-exact results when given exact arguments.
-If the operation is unable to produce an exact result,
-then it may either report the violation of an implementation restriction
-or it may silently coerce its
-result to an inexact value.
-See section&nbsp;<a href="#%_sec_6.2.3">6.2.3</a>.</p>
-<p>
-With the exception of <tt>inexact-&gt;exact</tt>, the operations described in
-this section must generally return inexact results when given any inexact
-arguments.  An operation may, however, return an exact result if it can
-prove that the value of the result is unaffected by the inexactness of its
-arguments.  For example, multiplication of any number by an exact zero
-may produce an exact zero result, even if the other argument is
-inexact.</p>
-<p>
-</p>
-<a name="%_sec_6.2.3"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.2.3">6.2.3&nbsp;&nbsp;Implementation restrictions</a></h3>
-<p><a name="%_idx_230"></a></p>
-<p>
-Implementations of Scheme are not required to implement the whole
-tower of subtypes given in section&nbsp;<a href="#%_sec_6.2.1">6.2.1</a>,
-but they must implement a coherent subset consistent with both the
-purposes of the implementation and the spirit of the Scheme language.
-For example, an implementation in which all numbers are real
-may still be quite useful.</p>
-<p>
-Implementations may also support only a limited range of numbers of
-any type, subject to the requirements of this section.  The supported
-range for exact numbers of any type may be different from the
-supported range for inexact numbers of that type.  For example,
-an implementation that uses flonums to represent all its
-inexact real numbers may
-support a practically unbounded range of exact integers
-and rationals
-while limiting the range of inexact reals (and therefore
-the range of inexact integers and rationals)
-to the dynamic range of the flonum format.
-Furthermore
-the gaps between the representable inexact integers and
-rationals are
-likely to be very large in such an implementation as the limits of this
-range are approached.</p>
-<p>
-An implementation of Scheme must support exact integers
-throughout the range of numbers that may be used for indexes of
-lists, vectors, and strings or that may result from computing the length of a
-list, vector, or string.  The <tt>length</tt>, <tt>vector-length</tt>,
-and <tt>string-length</tt> procedures must return an exact
-integer, and it is an error to use anything but an exact integer as an
-index.  Furthermore any integer constant within the index range, if
-expressed by an exact integer syntax, will indeed be read as an exact
-integer, regardless of any implementation restrictions that may apply
-outside this range.  Finally, the procedures listed below will always
-return an exact integer result provided all their arguments are exact integers
-and the mathematically expected result is representable as an exact integer
-within the implementation:</p>
-<p>
-<tt>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*<br>
-quotient&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;remainder&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;modulo<br>
-max&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;min&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;abs<br>
-numerator&nbsp;&nbsp;&nbsp;&nbsp;denominator&nbsp;&nbsp;&nbsp;gcd<br>
-lcm&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;floor&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ceiling<br>
-truncate&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;round&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rationalize<br>
-expt</p>
-</tt>
-<p>
-Implementations are encouraged, but not required, to support
-exact integers and exact rationals of
-practically unlimited size and precision, and to implement the
-above procedures and the <tt>/</tt> procedure in
-such a way that they always return exact results when given exact
-arguments.  If one of these procedures is unable to deliver an exact
-result when given exact arguments, then it may either report a
-violation of an
-implementation restriction or it may silently coerce its result to an
-inexact number.  Such a coercion may cause an error later.</p>
-<p>
-
-An implementation may use floating point and other approximate 
-representation strategies for inexact numbers.
-This report recommends, but does not require, that the IEEE 32-bit
-and 64-bit floating point standards be followed by implementations that use
-flonum representations, and that implementations using
-other representations should match or exceed the precision achievable
-using these floating point standards&nbsp;[<a href="r5rs-Z-H-14.html#cite{IEEE}">12</a>].</p>
-<p>
-In particular, implementations that use flonum representations
-must follow these rules: A flonum result
-must be represented with at least as much precision as is used to express any of
-the inexact arguments to that operation.  It is desirable (but not required) for
-potentially inexact operations such as <tt>sqrt</tt>, when applied to exact
-arguments, to produce exact answers whenever possible (for example the
-square root of an exact 4 ought to be an exact 2).
-If, however, an
-exact number is operated upon so as to produce an inexact result
-(as by <tt>sqrt</tt>), and if the result is represented as a flonum, then
-the most precise flonum format available must be used; but if the result
-is represented in some other way then the representation must have at least as
-much precision as the most precise flonum format available.</p>
-<p>
-Although Scheme allows a variety of written
-notations for
-numbers, any particular implementation may support only some of them.
-For example, an implementation in which all numbers are real
-need not support the rectangular and polar notations for complex
-numbers.  If an implementation encounters an exact numerical constant that
-it cannot represent as an exact number, then it may either report a
-violation of an implementation restriction or it may silently represent the
-constant by an inexact number.</p>
-<p>
-</p>
-<a name="%_sec_6.2.4"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.2.4">6.2.4&nbsp;&nbsp;Syntax of numerical constants</a></h3>
-<p></p>
-<p>
-
-
-The syntax of the written representations for numbers is described formally in
-section&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.1.1">7.1.1</a>.  Note that case is not significant in numerical
-constants.</p>
-<p>
-
-A number may be written in binary, octal, decimal, or
-hexadecimal by the use of a radix prefix.  The radix prefixes are <tt>#b</tt><a name="%_idx_232"></a> (binary), <tt>#o</tt><a name="%_idx_234"></a> (octal), <tt>#d</tt><a name="%_idx_236"></a> (decimal), and <tt>#x</tt><a name="%_idx_238"></a> (hexadecimal).  With
-no radix prefix, a number is assumed to be expressed in decimal.</p>
-<p>
-A
-numerical constant may be specified to be either exact or
-inexact by a prefix.  The prefixes are <tt>#e</tt><a name="%_idx_240"></a>
-for exact, and <tt>#i</tt><a name="%_idx_242"></a> for inexact.  An exactness
-prefix may appear before or after any radix prefix that is used.  If
-the written representation of a number has no exactness prefix, the
-constant may be either inexact or exact.  It is
-inexact if it contains a decimal point, an
-exponent, or a ``<tt>#</tt>'' character in the place of a digit,
-otherwise it is exact.
-
-In systems with inexact numbers
-of varying precisions it may be useful to specify
-the precision of a constant.  For this purpose, numerical constants
-may be written with an exponent marker that indicates the
-desired precision of the inexact
-representation.  The letters <tt>s</tt>, <tt>f</tt>,
-<tt>d</tt>, and <tt>l</tt> specify the use of <i>short</i>, <i>single</i>,
-<i>double</i>, and <i>long</i> precision, respectively.  (When fewer
-than four internal
-inexact
-representations exist, the four size
-specifications are mapped onto those available.  For example, an
-implementation with two internal representations may map short and
-single together and long and double together.)  In addition, the
-exponent marker <tt>e</tt> specifies the default precision for the
-implementation.  The default precision has at least as much precision
-as <i>double</i>, but
-implementations may wish to allow this default to be set by the user.</p>
-<p>
-<tt>3.14159265358979F0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Round&nbsp;to&nbsp;single&nbsp;---&nbsp;3.141593<br>
-0.6L0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Extend&nbsp;to&nbsp;long&nbsp;---&nbsp;.600000000000000</p>
-</tt>
-<p>
-</p>
-<a name="%_sec_6.2.5"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.2.5">6.2.5&nbsp;&nbsp;Numerical operations</a></h3>
-<p>The reader is referred to section&nbsp;<a href="r5rs-Z-H-4.html#%_sec_1.3.3">1.3.3</a> for a summary
-of the naming conventions used to specify restrictions on the types of
-arguments to numerical routines.
-The examples used in this section assume that any numerical constant written
-using an exact notation is indeed represented as an exact
-number.  Some examples also assume that certain numerical constants written
-using an inexact notation can be represented without loss of
-accuracy; the inexact constants were chosen so that this is
-likely to be true in implementations that use flonums to represent
-inexact numbers.</p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_244"></a>number?<i> obj</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_246"></a>complex?<i> obj</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_248"></a>real?<i> obj</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_250"></a>rational?<i> obj</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_252"></a>integer?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-These numerical type predicates can be applied to any kind of
-argument, including non-numbers.  They return <tt>#t</tt> if the object is
-of the named type, and otherwise they return <tt>#f</tt>.
-In general, if a type predicate is true of a number then all higher
-type predicates are also true of that number.  Consequently, if a type
-predicate is false of a number, then all lower type predicates are
-also false of that number.
-
-If <em>z</em> is an inexact complex number, then <tt>(real? <em>z</em>)</tt> is true if
-and only if <tt>(zero? (imag-part <em>z</em>))</tt> is true.  If <em>x</em> is an inexact
-real number, then <tt>(integer? <em>x</em>)</tt> is true if and only if
-<tt>(= <em>x</em> (round <em>x</em>))</tt>.</p>
-<p>
-<tt>(complex?&nbsp;3+4i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(complex?&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(real?&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(real?&nbsp;-2.5+0.0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(real?&nbsp;#e1e10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(rational?&nbsp;6/10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(rational?&nbsp;6/3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(integer?&nbsp;3+0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(integer?&nbsp;3.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(integer?&nbsp;8/4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The behavior of these type predicates on inexact numbers
-is unreliable, since any inaccuracy may affect the result.
-</blockquote>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-In many implementations the <tt>rational?</tt> procedure will be the same
-as <tt>real?</tt>, and the <tt>complex?</tt> procedure will be the same as
-<tt>number?</tt>, but unusual implementations may be able to represent
-some irrational numbers exactly or may extend the number system to
-support some kind of non-complex numbers.
-</blockquote>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_254"></a>exact?<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_256"></a>inexact?<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<p>
-These numerical predicates provide tests for the exactness of a
-quantity.  For any Scheme number, precisely one of these predicates
-is true.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_258"></a>=<i> <em>z</em><sub>1</sub> <em>z</em><sub>2</sub> <em>z</em><sub>3</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_260"></a>&lt;<i> <em>x</em><sub>1</sub> <em>x</em><sub>2</sub> <em>x</em><sub>3</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_262"></a>&gt;<i> <em>x</em><sub>1</sub> <em>x</em><sub>2</sub> <em>x</em><sub>3</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_264"></a>&lt;=<i> <em>x</em><sub>1</sub> <em>x</em><sub>2</sub> <em>x</em><sub>3</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_266"></a>&gt;=<i> <em>x</em><sub>1</sub> <em>x</em><sub>2</sub> <em>x</em><sub>3</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-These procedures return <tt>#t</tt> if their arguments are (respectively):
-equal, monotonically increasing, monotonically decreasing,
-monotonically nondecreasing, or monotonically nonincreasing.</p>
-<p>
-These predicates are required to be transitive.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The traditional implementations of these predicates in Lisp-like
-languages are not transitive.
-</blockquote>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-While it is not an error to compare inexact numbers using these
-predicates, the results may be unreliable because a small inaccuracy
-may affect the result; this is especially true of <tt>=</tt> and <tt>zero?</tt>.
-When in doubt, consult a numerical analyst.
-</blockquote>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_268"></a>zero?<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_270"></a>positive?<i> <em>x</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_272"></a>negative?<i> <em>x</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_274"></a>odd?<i> <em>n</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_276"></a>even?<i> <em>n</em></i>)</tt>&nbsp;</div>
-
-<p>
-These numerical predicates test a number for a particular property,
-returning <tt>#t</tt> or <tt>#f</tt>.  See note above.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_278"></a>max<i> <em>x</em><sub>1</sub> <em>x</em><sub>2</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_280"></a>min<i> <em>x</em><sub>1</sub> <em>x</em><sub>2</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-These procedures return the maximum or minimum of their arguments.</p>
-<p>
-<tt>(max&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;4&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;exact<br>
-(max&nbsp;3.9&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;4.0&nbsp;&nbsp;;&nbsp;inexact</p>
-</tt>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-If any argument is inexact, then the result will also be inexact (unless
-the procedure can prove that the inaccuracy is not large enough to affect the
-result, which is possible only in unusual implementations).  If <tt>min</tt> or
-<tt>max</tt> is used to compare numbers of mixed exactness, and the numerical
-value of the result cannot be represented as an inexact number without loss of
-accuracy, then the procedure may report a violation of an implementation
-restriction.
-</blockquote>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_282"></a>+<i> <em>z</em><sub>1</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_284"></a>*<i> <em>z</em><sub>1</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-These procedures return the sum or product of their arguments.
-
-<tt>(+&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;7<br>
-(+&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;3<br>
-(+)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;0<br>
-(*&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;4<br>
-(*)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1</p>
-</tt> 
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_286"></a>-<i> <em>z</em><sub>1</sub> <em>z</em><sub>2</sub></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_288"></a>-<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>optional procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_290"></a>-<i> <em>z</em><sub>1</sub> <em>z</em><sub>2</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_292"></a>/<i> <em>z</em><sub>1</sub> <em>z</em><sub>2</sub></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_294"></a>/<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>optional procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_296"></a>/<i> <em>z</em><sub>1</sub> <em>z</em><sub>2</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-With two or more arguments, these procedures return the difference or
-quotient of their arguments, associating to the left.  With one argument,
-however, they return the additive or multiplicative inverse of their argument.
-
-<tt>(-&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-1<br>
-(-&nbsp;3&nbsp;4&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-6<br>
-(-&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-3<br>
-(/&nbsp;3&nbsp;4&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;3/20<br>
-(/&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1/3</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_298"></a>abs<i> x</i>)</tt>&nbsp;</div>
-
-<p>
-<tt>Abs</tt> returns the absolute value of its argument.  
-<tt>(abs&nbsp;-7)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;7<br>
-</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_300"></a>quotient<i> <em>n</em><sub>1</sub> <em>n</em><sub>2</sub></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_302"></a>remainder<i> <em>n</em><sub>1</sub> <em>n</em><sub>2</sub></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_304"></a>modulo<i> <em>n</em><sub>1</sub> <em>n</em><sub>2</sub></i>)</tt>&nbsp;</div>
-
-<p>
-These procedures implement number-theoretic (integer)
-division.  <em>n</em><sub>2</sub> should be non-zero.  All three procedures
-return integers.  If <em>n</em><sub>1</sub>/<em>n</em><sub>2</sub> is an integer:
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;(quotient&nbsp;<em>n</em><sub>1</sub>&nbsp;<em>n</em><sub>2</sub>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;<em>n</em><sub>1</sub>/<em>n</em><sub>2</sub><br>
-&nbsp;&nbsp;&nbsp;&nbsp;(remainder&nbsp;<em>n</em><sub>1</sub>&nbsp;<em>n</em><sub>2</sub>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(modulo&nbsp;<em>n</em><sub>1</sub>&nbsp;<em>n</em><sub>2</sub>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;0<br>
-</p>
-</tt>
-If <em>n</em><sub>1</sub>/<em>n</em><sub>2</sub> is not an integer:
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;(quotient&nbsp;<em>n</em><sub>1</sub>&nbsp;<em>n</em><sub>2</sub>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;<em>n</em><sub><em>q</em></sub><br>
-&nbsp;&nbsp;&nbsp;&nbsp;(remainder&nbsp;<em>n</em><sub>1</sub>&nbsp;<em>n</em><sub>2</sub>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;<em>n</em><sub><em>r</em></sub><br>
-&nbsp;&nbsp;&nbsp;&nbsp;(modulo&nbsp;<em>n</em><sub>1</sub>&nbsp;<em>n</em><sub>2</sub>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;<em>n</em><sub><em>m</em></sub><br>
-</tt>
-where <em>n</em><sub><em>q</em></sub> is <em>n</em><sub>1</sub>/<em>n</em><sub>2</sub> rounded towards zero,
-0 &lt; |<em>n</em><sub><em>r</em></sub>| &lt; |<em>n</em><sub>2</sub>|, 0 &lt; |<em>n</em><sub><em>m</em></sub>| &lt; |<em>n</em><sub>2</sub>|,
-<em>n</em><sub><em>r</em></sub> and <em>n</em><sub><em>m</em></sub> differ from <em>n</em><sub>1</sub> by a multiple of <em>n</em><sub>2</sub>,
-<em>n</em><sub><em>r</em></sub> has the same sign as <em>n</em><sub>1</sub>, and
-<em>n</em><sub><em>m</em></sub> has the same sign as <em>n</em><sub>2</sub>.
-<p>
-From this we can conclude that for integers <em>n</em><sub>1</sub> and <em>n</em><sub>2</sub> with
-<em>n</em><sub>2</sub> not equal to 0,
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(=&nbsp;<em>n</em><sub>1</sub>&nbsp;(+&nbsp;(*&nbsp;<em>n</em><sub>2</sub>&nbsp;(quotient&nbsp;<em>n</em><sub>1</sub>&nbsp;<em>n</em><sub>2</sub>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(remainder&nbsp;<em>n</em><sub>1</sub>&nbsp;<em>n</em><sub>2</sub>)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-provided all numbers involved in that computation are exact.
-<p>
-<tt>(modulo&nbsp;13&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1<br>
-(remainder&nbsp;13&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1<br>
-<br>
-(modulo&nbsp;-13&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;3<br>
-(remainder&nbsp;-13&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-1<br>
-<br>
-(modulo&nbsp;13&nbsp;-4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-3<br>
-(remainder&nbsp;13&nbsp;-4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1<br>
-<br>
-(modulo&nbsp;-13&nbsp;-4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-1<br>
-(remainder&nbsp;-13&nbsp;-4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-1<br>
-<br>
-(remainder&nbsp;-13&nbsp;-4.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-1.0&nbsp;&nbsp;;&nbsp;inexact</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_306"></a>gcd<i> <em>n</em><sub>1</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_308"></a>lcm<i> <em>n</em><sub>1</sub> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-These procedures return the greatest common divisor or least common
-multiple of their arguments.  The result is always non-negative.
-
-<tt>(gcd&nbsp;32&nbsp;-36)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;4<br>
-(gcd)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;0<br>
-(lcm&nbsp;32&nbsp;-36)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;288<br>
-(lcm&nbsp;32.0&nbsp;-36)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;288.0&nbsp;&nbsp;;&nbsp;inexact<br>
-(lcm)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_310"></a>numerator<i> <em>q</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_312"></a>denominator<i> <em>q</em></i>)</tt>&nbsp;</div>
-
-<p>
-These procedures return the numerator or denominator of their
-argument; the result is computed as if the argument was represented as
-a fraction in lowest terms.  The denominator is always positive.  The
-denominator of 0 is defined to be 1.
-
-<tt>(numerator&nbsp;(/&nbsp;6&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;3<br>
-(denominator&nbsp;(/&nbsp;6&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;2<br>
-(denominator<br>
-&nbsp;&nbsp;(exact-&gt;inexact&nbsp;(/&nbsp;6&nbsp;4)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;2.0</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_314"></a>floor<i> x</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_316"></a>ceiling<i> x</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_318"></a>truncate<i> x</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_320"></a>round<i> x</i>)</tt>&nbsp;</div>
-
-<p>
-These procedures return integers.
-<tt>Floor</tt> returns the largest integer not larger than <em>x</em>.
-<tt>Ceiling</tt> returns the smallest integer not smaller than&nbsp;<em>x</em>.
-<tt>Truncate</tt> returns the integer closest to <em>x</em> whose absolute
-value is not larger than the absolute value of <em>x</em>.  <tt>Round</tt> returns the
-closest integer to <em>x</em>, rounding to even when <em>x</em> is halfway between two
-integers.</p>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-<tt>Round</tt> rounds to even for consistency with the default rounding
-mode specified by the IEEE floating point standard.
-</blockquote>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-If the argument to one of these procedures is inexact, then the result
-will also be inexact.  If an exact value is needed, the
-result should be passed to the <tt>inexact-&gt;exact</tt> procedure.
-</blockquote>
-<p>
-<tt>(floor&nbsp;-4.3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-5.0<br>
-(ceiling&nbsp;-4.3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-4.0<br>
-(truncate&nbsp;-4.3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-4.0<br>
-(round&nbsp;-4.3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-4.0<br>
-<br>
-(floor&nbsp;3.5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;3.0<br>
-(ceiling&nbsp;3.5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;4.0<br>
-(truncate&nbsp;3.5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;3.0<br>
-(round&nbsp;3.5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;4.0&nbsp;&nbsp;;&nbsp;inexact<br>
-<br>
-(round&nbsp;7/2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;4&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;exact<br>
-(round&nbsp;7)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;7</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_322"></a>rationalize<i> x y</i>)</tt>&nbsp;</div>
-
-
-<p>
-<tt>Rationalize</tt> returns the <em>simplest</em> rational number
-differing from <em>x</em> by no more than <em>y</em>.  A rational number <em>r</em><sub>1</sub> is
-<em>simpler</em> <a name="%_idx_324"></a> than another rational number
-<em>r</em><sub>2</sub> if <em>r</em><sub>1</sub>  =  <em>p</em><sub>1</sub>/<em>q</em><sub>1</sub> and <em>r</em><sub>2</sub>  =  <em>p</em><sub>2</sub>/<em>q</em><sub>2</sub> (in lowest terms) and |<em>p</em><sub>1</sub>|
-<u>&lt;</u> |<em>p</em><sub>2</sub>| and |<em>q</em><sub>1</sub>| <u>&lt;</u> |<em>q</em><sub>2</sub>|.  Thus 3/5 is simpler than 4/7.
-Although not all rationals are comparable in this ordering (consider 2/7
-and 3/5) any interval contains a rational number that is simpler than
-every other rational number in that interval (the simpler 2/5 lies
-between 2/7 and 3/5).  Note that 0  =  0/1 is the simplest rational of
-all.</p>
-<p>
-<tt>(rationalize<br>
-&nbsp;&nbsp;(inexact-&gt;exact&nbsp;.3)&nbsp;1/10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;1/3&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;exact<br>
-(rationalize&nbsp;.3&nbsp;1/10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;#i1/3&nbsp;&nbsp;;&nbsp;inexact</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_326"></a>exp<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_328"></a>log<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_330"></a>sin<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_332"></a>cos<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_334"></a>tan<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_336"></a>asin<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_338"></a>acos<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_340"></a>atan<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_342"></a>atan<i> <em>y</em> <em>x</em></i>)</tt>&nbsp;</div>
-
-<p>
-These procedures are part of every implementation that supports
-general
-real numbers; they compute the usual transcendental functions.  <tt>Log</tt>
-computes the natural logarithm of <em>z</em> (not the base ten logarithm).
-<tt>Asin</tt>, <tt>acos</tt>, and <tt>atan</tt> compute arcsine (sin<sup><tt>-</tt>1</sup>),
-arccosine (cos<sup><tt>-</tt>1</sup>), and arctangent (tan<sup><tt>-</tt>1</sup>), respectively.
-The two-argument variant of <tt>atan</tt> computes <tt>(angle
-(make-rectangular <em>x</em> <em>y</em>))</tt> (see below), even in implementations
-that don't support general complex numbers.</p>
-<p>
-In general, the mathematical functions log, arcsine, arccosine, and
-arctangent are multiply defined.
-The value of log <em>z</em> is defined to be the one whose imaginary
-part lies in the range from  <tt>-</tt> <img src="r5rs-Z-G-D-3.gif" border="0"> (exclusive) to <img src="r5rs-Z-G-D-3.gif" border="0"> (inclusive).
-log 0 is undefined.
-With log defined this way, the values of sin<sup><tt>-</tt>1</sup> <em>z</em>, cos<sup><tt>-</tt>1</sup> <em>z</em>,
-and tan<sup><tt>-</tt>1</sup> <em>z</em> are according to the following formul&aelig;:
-</p>
-<div align=left><table><tr><td>sin<sup><tt>-</tt>1</sup> <em>z</em>  =   <tt>-</tt> <em>i</em> log (<em>i</em> <em>z</em>  +  (1  <tt>-</tt>  <em>z</em><sup>2</sup>)<sup>1/2</sup>)</td></tr></table></div>
-<p>
-</p>
-<div align=left><table><tr><td>cos<sup><tt>-</tt>1</sup> <em>z</em>  =  <img src="r5rs-Z-G-D-3.gif" border="0"> / 2  <tt>-</tt>  sin<sup><tt>-</tt>1</sup> <em>z</em></td></tr></table></div>
-<p>
-</p>
-<div align=left><table><tr><td>tan<sup><tt>-</tt>1</sup> <em>z</em>  =  (log (1  +  <em>i</em> <em>z</em>)  <tt>-</tt>  log (1  <tt>-</tt>  <em>i</em> <em>z</em>)) / (2 <em>i</em>)</td></tr></table></div>
-<p></p>
-<p>
-The above specification follows&nbsp;[<a href="r5rs-Z-H-14.html#cite{CLtL}">27</a>], which in turn
-cites&nbsp;[<a href="r5rs-Z-H-14.html#cite{Penfield81}">19</a>]; refer to these sources for more detailed
-discussion of branch cuts, boundary conditions, and implementation of
-these functions.  When it is possible these procedures produce a real
-result from a real argument.</p>
-<p>
-</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_344"></a>sqrt<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<p>
-Returns the principal square root of <em>z</em>.  The result will have
-either positive real part, or zero real part and non-negative imaginary
-part.
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_346"></a>expt<i> <em>z</em><sub>1</sub> <em>z</em><sub>2</sub></i>)</tt>&nbsp;</div>
-
-<p>
-Returns <em>z</em><sub>1</sub> raised to the power <em>z</em><sub>2</sub>.  For <em>z</em><sub>1</sub> <img src="r5rs-Z-G-D-8.gif" border="0"> 0
-</p>
-<div align=left><table><tr><td><em>z</em><sub>1</sub><sup><em>z</em><sub>2</sub></sup>  =  <em>e</em><sup><em>z</em><sub>2</sub> log <em>z</em><sub>1</sub></sup></td></tr></table></div>
-<p>
-0<sup><em>z</em></sup> is 1 if <em>z</em>  =  0 and 0 otherwise.
-</p>
-
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_348"></a>make-rectangular<i> <em>x</em><sub>1</sub> <em>x</em><sub>2</sub></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_350"></a>make-polar<i> <em>x</em><sub>3</sub> <em>x</em><sub>4</sub></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_352"></a>real-part<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_354"></a>imag-part<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_356"></a>magnitude<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_358"></a>angle<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<p>
-These procedures are part of every implementation that supports
-general
-complex numbers.  Suppose <em>x</em><sub>1</sub>, <em>x</em><sub>2</sub>, <em>x</em><sub>3</sub>, and <em>x</em><sub>4</sub> are
-real numbers and <em>z</em> is a complex number such that
-</p>
-<div align=left><table><tr><td> <em>z</em>  =  <em>x</em><sub>1</sub>  +  <em>x</em><sub>2</sub><em>i</em>
- =  <em>x</em><sub>3</sub>  &middot;  <em>e</em><sup><em>i</em> <em>x</em><sub>4</sub></sup></td></tr></table></div>
-<p>
-Then
-<tt>(make-rectangular&nbsp;<em>x</em><sub>1</sub>&nbsp;<em>x</em><sub>2</sub>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;<em>z</em><br>
-(make-polar&nbsp;<em>x</em><sub>3</sub>&nbsp;<em>x</em><sub>4</sub>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;<em>z</em><br>
-(real-part&nbsp;<em>z</em>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;<em>x</em><sub>1</sub><br>
-(imag-part&nbsp;<em>z</em>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;<em>x</em><sub>2</sub><br>
-(magnitude&nbsp;<em>z</em>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;|<em>x</em><sub>3</sub>|<br>
-(angle&nbsp;<em>z</em>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;<em>x</em><sub><em>a</em><em>n</em><em>g</em><em>l</em><em>e</em></sub><br>
-</p>
-</tt>
-where  <tt>-</tt> <img src="r5rs-Z-G-D-3.gif" border="0"> &lt; <em>x</em><sub><em>a</em><em>n</em><em>g</em><em>l</em><em>e</em></sub> <u>&lt;</u> <img src="r5rs-Z-G-D-3.gif" border="0"> with <em>x</em><sub><em>a</em><em>n</em><em>g</em><em>l</em><em>e</em></sub>  =  <em>x</em><sub>4</sub>  +  2<img src="r5rs-Z-G-D-3.gif" border="0"> <em>n</em>
-for some integer <em>n</em>.
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-<tt>Magnitude</tt> is the same as <tt>abs</tt> for a real argument,
-but <tt>abs</tt> must be present in all implementations, whereas
-<tt>magnitude</tt> need only be present in implementations that support
-general complex numbers.
-</blockquote>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_360"></a>exact-&gt;inexact<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_362"></a>inexact-&gt;exact<i> <em>z</em></i>)</tt>&nbsp;</div>
-
-<p>
-<tt>Exact-&gt;inexact</tt> returns an inexact representation of <em>z</em>.
-The value returned is the
-inexact number that is numerically closest to the argument.  
-If an exact argument has no reasonably close inexact equivalent,
-then a violation of an implementation restriction may be reported.</p>
-<p>
-<tt>Inexact-&gt;exact</tt> returns an exact representation of
-<em>z</em>.  The value returned is the exact number that is numerically
-closest to the argument.
-If an inexact argument has no reasonably close exact equivalent,
-then a violation of an implementation restriction may be reported.</p>
-<p>
-
-These procedures implement the natural one-to-one correspondence between
-exact and inexact integers throughout an
-implementation-dependent range.  See section&nbsp;<a href="#%_sec_6.2.3">6.2.3</a>.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.2.6"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.2.6">6.2.6&nbsp;&nbsp;Numerical input and output</a></h3>
-<p></p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_364"></a>number-&gt;string<i> z</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_366"></a>number-&gt;string<i> z radix</i>)</tt>&nbsp;</div>
-
-<p>
-<em>R</em><em>a</em><em>d</em><em>i</em><em>x</em> must be an exact integer, either 2, 8, 10, or 16.  If omitted,
-<em>r</em><em>a</em><em>d</em><em>i</em><em>x</em> defaults to 10.
-The procedure <tt>number-&gt;string</tt> takes a
-number and a radix and returns as a string an external representation of
-the given number in the given radix such that
-<tt>(let&nbsp;((number&nbsp;<em>n</em><em>u</em><em>m</em><em>b</em><em>e</em><em>r</em>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(radix&nbsp;<em>r</em><em>a</em><em>d</em><em>i</em><em>x</em>))<br>
-&nbsp;&nbsp;(eqv?&nbsp;number<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(string-&gt;number&nbsp;(number-&gt;string&nbsp;number<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;radix)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;radix)))<br>
-</p>
-</tt>
-is true.  It is an error if no possible result makes this expression true.
-<p>
-If <em>z</em> is inexact, the radix is 10, and the above expression
-can be satisfied by a result that contains a decimal point,
-then the result contains a decimal point and is expressed using the
-minimum number of digits (exclusive of exponent and trailing
-zeroes) needed to make the above expression
-true&nbsp;[<a href="r5rs-Z-H-14.html#cite{howtoprint}">3</a>,&nbsp;<a href="r5rs-Z-H-14.html#cite{howtoread}">5</a>];
-otherwise the format of the result is unspecified.</p>
-<p>
-The result returned by <tt>number-&gt;string</tt>
-never contains an explicit radix prefix.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The error case can occur only when <em>z</em> is not a complex number
-or is a complex number with a non-rational real or imaginary part.
-</blockquote>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-If <em>z</em> is an inexact number represented using flonums, and
-the radix is 10, then the above expression is normally satisfied by
-a result containing a decimal point.  The unspecified case
-allows for infinities, NaNs, and non-flonum representations.
-</blockquote>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_368"></a>string-&gt;number<i> string</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_370"></a>string-&gt;number<i> string radix</i>)</tt>&nbsp;</div>
-
-<p>
-
-Returns a number of the maximally precise representation expressed by the
-given <em>s</em><em>t</em><em>r</em><em>i</em><em>n</em><em>g</em>.  <em>R</em><em>a</em><em>d</em><em>i</em><em>x</em> must be an exact integer, either 2, 8, 10,
-or 16.  If supplied, <em>r</em><em>a</em><em>d</em><em>i</em><em>x</em> is a default radix that may be overridden
-by an explicit radix prefix in <em>s</em><em>t</em><em>r</em><em>i</em><em>n</em><em>g</em> (e.g. <tt>&quot;#o177&quot;</tt>).  If <em>r</em><em>a</em><em>d</em><em>i</em><em>x</em>
-is not supplied, then the default radix is 10.  If <em>s</em><em>t</em><em>r</em><em>i</em><em>n</em><em>g</em> is not
-a syntactically valid notation for a number, then <tt>string-&gt;number</tt>
-returns <tt>#f</tt>.</p>
-<p>
-<tt>(string-&gt;number&nbsp;&quot;100&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;100<br>
-(string-&gt;number&nbsp;&quot;100&quot;&nbsp;16)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;256<br>
-(string-&gt;number&nbsp;&quot;1e2&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;100.0<br>
-(string-&gt;number&nbsp;&quot;15##&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1500.0</p>
-</tt>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The domain of <tt>string-&gt;number</tt> may be restricted by implementations
-in the following ways.  <tt>String-&gt;number</tt> is permitted to return
-<tt>#f</tt> whenever <em>s</em><em>t</em><em>r</em><em>i</em><em>n</em><em>g</em> contains an explicit radix prefix.
-If all numbers supported by an implementation are real, then
-<tt>string-&gt;number</tt> is permitted to return <tt>#f</tt> whenever
-<em>s</em><em>t</em><em>r</em><em>i</em><em>n</em><em>g</em> uses the polar or rectangular notations for complex
-numbers.  If all numbers are integers, then
-<tt>string-&gt;number</tt> may return <tt>#f</tt> whenever
-the fractional notation is used.  If all numbers are exact, then
-<tt>string-&gt;number</tt> may return <tt>#f</tt> whenever
-an exponent marker or explicit exactness prefix is used, or if
-a <tt>#</tt> appears in place of a digit.  If all inexact
-numbers are integers, then
-<tt>string-&gt;number</tt> may return <tt>#f</tt> whenever
-a decimal point is used.
-</blockquote>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.3"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.3">6.3&nbsp;&nbsp;Other data types</a></h2>
-<p>This section describes operations on some of Scheme's non-numeric data types:
-booleans, pairs, lists, symbols, characters, strings and vectors.</p>
-<p>
-</p>
-<a name="%_sec_6.3.1"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.3.1">6.3.1&nbsp;&nbsp;Booleans</a></h3>
-<p></p>
-<p>
-The standard boolean objects for true and false are written as
-<tt>#t</tt> and <tt>#f</tt>.<a name="%_idx_372"></a><a name="%_idx_374"></a>  What really
-matters, though, are the objects that the Scheme conditional expressions
-(<tt>if</tt>, <tt>cond</tt>, <tt>and</tt>, <tt>or</tt>, <tt>do</tt>) treat as
-true<a name="%_idx_376"></a> or false<a name="%_idx_378"></a>.  The phrase ``a true value''<a name="%_idx_380"></a>
-(or sometimes just ``true'') means any object treated as true by the
-conditional expressions, and the phrase ``a false value''<a name="%_idx_382"></a> (or
-``false'') means any object treated as false by the conditional expressions.</p>
-<p>
-Of all the standard Scheme values, only <tt>#f</tt>
-counts as false in conditional expressions.
-Except for <tt>#f</tt>,
-all standard Scheme values, including <tt>#t</tt>,
-pairs, the empty list, symbols, numbers, strings, vectors, and procedures,
-count as true.</p>
-<p>
-
-
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Programmers accustomed to other dialects of Lisp should be aware that
-Scheme distinguishes both <tt>#f</tt> and the empty list <a name="%_idx_384"></a>
-from the symbol <tt>nil</tt>.
-</blockquote>
-<p>
-Boolean constants evaluate to themselves, so they do not need to be quoted
-in programs.</p>
-<p>
-<tt><tt>#t</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-<tt>#f</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-'<tt>#f</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt></p>
-</tt>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_386"></a>not<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-<tt>Not</tt> returns <tt>#t</tt> if <i>obj</i> is false, and returns
-<tt>#f</tt> otherwise.</p>
-<p>
-<tt>(not&nbsp;<tt>#t</tt>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(not&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(not&nbsp;(list&nbsp;3))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(not&nbsp;<tt>#f</tt>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(not&nbsp;'())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(not&nbsp;(list))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(not&nbsp;'nil)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt></p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_388"></a>boolean?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-<tt>Boolean?</tt> returns <tt>#t</tt> if <i>obj</i> is either <tt>#t</tt> or
-<tt>#f</tt> and returns <tt>#f</tt> otherwise.</p>
-<p>
-<tt>(boolean?&nbsp;<tt>#f</tt>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(boolean?&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(boolean?&nbsp;'())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt></p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.3.2"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.3.2">6.3.2&nbsp;&nbsp;Pairs and lists</a></h3>
-<p></p>
-<p>
-A <a name="%_idx_390"></a><em>pair</em> (sometimes called a <a name="%_idx_392"></a><em>dotted pair</em>) is a
-record structure with two fields called the car and cdr fields (for
-historical reasons).  Pairs are created by the procedure <tt>cons</tt>.
-The car and cdr fields are accessed by the procedures <tt>car</tt> and
-<tt>cdr</tt>.  The car and cdr fields are assigned by the procedures
-<tt>set-car!</tt> and <tt>set-cdr!</tt>.</p>
-<p>
-Pairs are used primarily to represent lists.  A list can
-be defined recursively as either the empty list<a name="%_idx_394"></a> or a pair whose
-cdr is a list.  More precisely, the set of lists is defined as the smallest
-set <i>X</i> such that</p>
-<p>
-</p>
-<ul>
-<li>
-<p>The empty list is in <i>X</i>.
-</p>
-<li>
-<p>If <i>list</i> is in <i>X</i>, then any pair whose cdr field contains
-<i>list</i> is also in <i>X</i>.
-</p>
-</ul>
-<p></p>
-<p>
-The objects in the car fields of successive pairs of a list are the
-elements of the list.  For example, a two-element list is a pair whose car
-is the first element and whose cdr is a pair whose car is the second element
-and whose cdr is the empty list.  The length of a list is the number of
-elements, which is the same as the number of pairs.</p>
-<p>
-The empty list<a name="%_idx_396"></a> is a special object of its own type
-(it is not a pair); it has no elements and its length is zero.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The above definitions imply that all lists have finite length and are
-terminated by the empty list.
-</blockquote>
-<p>
-The most general notation (external representation) for Scheme pairs is
-the ``dotted'' notation <tt>(<i>c<sub>1</sub></i> . <i>c<sub>2</sub></i>)</tt> where
-<i>c<sub>1</sub></i> is the value of the car field and <i>c<sub>2</sub></i> is the value of the
-cdr field.  For example <tt>(4 . 5)</tt> is a pair whose car is 4 and whose
-cdr is 5.  Note that <tt>(4 . 5)</tt> is the external representation of a
-pair, not an expression that evaluates to a pair.</p>
-<p>
-A more streamlined notation can be used for lists: the elements of the
-list are simply enclosed in parentheses and separated by spaces.  The
-empty list<a name="%_idx_398"></a> is written <tt>()</tt> .  For example,</p>
-<p>
-<tt>(a&nbsp;b&nbsp;c&nbsp;d&nbsp;e)</p>
-</tt>
-<p>
-and</p>
-<p>
-<tt>(a&nbsp;.&nbsp;(b&nbsp;.&nbsp;(c&nbsp;.&nbsp;(d&nbsp;.&nbsp;(e&nbsp;.&nbsp;())))))</p>
-</tt>
-<p>
-are equivalent notations for a list of symbols.</p>
-<p>
-A chain of pairs not ending in the empty list is called an
-<a name="%_idx_400"></a><em>improper list</em>.  Note that an improper list is not a list.
-The list and dotted notations can be combined to represent
-improper lists:</p>
-<p>
-<tt>(a&nbsp;b&nbsp;c&nbsp;.&nbsp;d)</p>
-</tt>
-<p>
-is equivalent to</p>
-<p>
-<tt>(a&nbsp;.&nbsp;(b&nbsp;.&nbsp;(c&nbsp;.&nbsp;d)))</p>
-</tt>
-<p>
-Whether a given pair is a list depends upon what is stored in the cdr
-field.  When the <tt>set-cdr!</tt> procedure is used, an object can be a
-list one moment and not the next:</p>
-<p>
-<tt>(define&nbsp;x&nbsp;(list&nbsp;'a&nbsp;'b&nbsp;'c))<br>
-(define&nbsp;y&nbsp;x)<br>
-y&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;b&nbsp;c)<br>
-(list?&nbsp;y)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(set-cdr!&nbsp;x&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-x&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;.&nbsp;4)<br>
-(eqv?&nbsp;x&nbsp;y)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-y&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;.&nbsp;4)<br>
-(list?&nbsp;y)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(set-cdr!&nbsp;x&nbsp;x)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(list?&nbsp;x)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt></p>
-</tt>
-<p>
-
-Within literal expressions and representations of objects read by the
-<tt>read</tt> procedure, the forms <tt>'</tt>&lt;datum&gt;<a name="%_idx_402"></a>,
-<tt>`</tt>&lt;datum&gt;, <tt>,</tt>&lt;datum&gt;<a name="%_idx_404"></a>, and
-<tt>,@</tt>&lt;datum&gt; denote two-element lists whose first elements are
-the symbols <tt>quote</tt>, <tt>quasiquote</tt>, <tt>unquote</tt>, and
-<tt>unquote-splicing</tt>, respectively.  The second element in each case
-is &lt;datum&gt;.  This convention is supported so that arbitrary Scheme
-programs may be represented as lists.   That is, according to Scheme's grammar, every
-&lt;expression&gt; is also a &lt;datum&gt; (see section&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.1.2">7.1.2</a>).
-Among other things, this permits the use of the <tt>read</tt> procedure to
-parse Scheme programs.  See section&nbsp;<a href="r5rs-Z-H-6.html#%_sec_3.3">3.3</a>. </p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_406"></a>pair?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-<tt>Pair?</tt> returns <tt>#t</tt> if <i>obj</i> is a pair, and otherwise
-returns <tt>#f</tt>.</p>
-<p>
-<tt>(pair?&nbsp;'(a&nbsp;.&nbsp;b))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(pair?&nbsp;'(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(pair?&nbsp;'())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(pair?&nbsp;'#(a&nbsp;b))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt></p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_408"></a>cons<i> <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<p>
-Returns a newly allocated pair whose car is <i>obj<sub>1</sub></i> and whose cdr is
-<i>obj<sub>2</sub></i>.  The pair is guaranteed to be different (in the sense of
-<tt>eqv?</tt>) from every existing object.</p>
-<p>
-<tt>(cons&nbsp;'a&nbsp;'())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a)<br>
-(cons&nbsp;'(a)&nbsp;'(b&nbsp;c&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;((a)&nbsp;b&nbsp;c&nbsp;d)<br>
-(cons&nbsp;&quot;a&quot;&nbsp;'(b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(&quot;a&quot;&nbsp;b&nbsp;c)<br>
-(cons&nbsp;'a&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;.&nbsp;3)<br>
-(cons&nbsp;'(a&nbsp;b)&nbsp;'c)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;((a&nbsp;b)&nbsp;.&nbsp;c)</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_410"></a>car<i> pair</i>)</tt>&nbsp;</div>
-
-<p>
-
-Returns the contents of the car field of <i>pair</i>.  Note that it is an
-error to take the car of the empty list<a name="%_idx_412"></a>.</p>
-<p>
-<tt>(car&nbsp;'(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;a<br>
-(car&nbsp;'((a)&nbsp;b&nbsp;c&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a)<br>
-(car&nbsp;'(1&nbsp;.&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1<br>
-(car&nbsp;'())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>error</i></p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_414"></a>cdr<i> pair</i>)</tt>&nbsp;</div>
-
-<p>
-
-Returns the contents of the cdr field of <i>pair</i>.
-Note that it is an error to take the cdr of the empty list.</p>
-<p>
-<tt>(cdr&nbsp;'((a)&nbsp;b&nbsp;c&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(b&nbsp;c&nbsp;d)<br>
-(cdr&nbsp;'(1&nbsp;.&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;2<br>
-(cdr&nbsp;'())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>error</i></p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_416"></a>set-car!<i> pair obj</i>)</tt>&nbsp;</div>
-
-<p>
-  
-Stores <i>obj</i> in the car field of <i>pair</i>.
-The value returned by <tt>set-car!</tt> is unspecified.  
-<tt>(define&nbsp;(f)&nbsp;(list&nbsp;'not-a-constant-list))<br>
-(define&nbsp;(g)&nbsp;'(constant-list))<br>
-(set-car!&nbsp;(f)&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(set-car!&nbsp;(g)&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>error</i></p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_418"></a>set-cdr!<i> pair obj</i>)</tt>&nbsp;</div>
-
-<p>
-
-Stores <i>obj</i> in the cdr field of <i>pair</i>.
-The value returned by <tt>set-cdr!</tt> is unspecified.  
-</p>
-
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_420"></a>caar<i> pair</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_422"></a>cadr<i> pair</i>)</tt>&nbsp;</div>
-
-<div align=left><u> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="r5rs-Z-G-D-1.gif" border="0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</u>&nbsp;&nbsp;<tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="r5rs-Z-G-D-1.gif" border="0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_424"></a>cdddar<i> pair</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_426"></a>cddddr<i> pair</i>)</tt>&nbsp;</div>
-
-<p>
-These procedures are compositions of <tt>car</tt> and <tt>cdr</tt>, where
-for example <tt>caddr</tt> could be defined by</p>
-<p>
-<tt>(define&nbsp;caddr&nbsp;(lambda&nbsp;(x)&nbsp;(car&nbsp;(cdr&nbsp;(cdr&nbsp;x))))).</p>
-</tt>
-<p>
-Arbitrary compositions, up to four deep, are provided.  There are
-twenty-eight of these procedures in all.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_428"></a>null?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is the empty list<a name="%_idx_430"></a>,
-otherwise returns <tt>#f</tt>.</p>
-<p>
- 
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_432"></a>list?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a list, otherwise returns <tt>#f</tt>.
-By definition, all lists have finite length and are terminated by
-the empty list.</p>
-<p>
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(list?&nbsp;'(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(list?&nbsp;'())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(list?&nbsp;'(a&nbsp;.&nbsp;b))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((x&nbsp;(list&nbsp;'a)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set-cdr!&nbsp;x&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(list?&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt></p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_434"></a>list<i> <i>obj</i> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-Returns a newly allocated list of its arguments.</p>
-<p>
-<tt>(list&nbsp;'a&nbsp;(+&nbsp;3&nbsp;4)&nbsp;'c)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;7&nbsp;c)<br>
-(list)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;()</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_436"></a>length<i> list</i>)</tt>&nbsp;</div>
-
-<p>
-
-Returns the length of <i>list</i>.</p>
-<p>
-<tt>(length&nbsp;'(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;3<br>
-(length&nbsp;'(a&nbsp;(b)&nbsp;(c&nbsp;d&nbsp;e)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;3<br>
-(length&nbsp;'())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;0</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_438"></a>append<i> list <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-
-Returns a list consisting of the elements of the first <i>list</i>
-followed by the elements of the other <i>list</i>s.</p>
-<p>
-<tt>(append&nbsp;'(x)&nbsp;'(y))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(x&nbsp;y)<br>
-(append&nbsp;'(a)&nbsp;'(b&nbsp;c&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;b&nbsp;c&nbsp;d)<br>
-(append&nbsp;'(a&nbsp;(b))&nbsp;'((c)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;(b)&nbsp;(c))</p>
-</tt>
-<p>
-The resulting list is always newly allocated, except that it shares
-structure with the last <i>list</i> argument.  The last argument may
-actually be any object; an improper list results if the last argument is not a
-proper list.  </p>
-<p>
-<tt>(append&nbsp;'(a&nbsp;b)&nbsp;'(c&nbsp;.&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;b&nbsp;c&nbsp;.&nbsp;d)<br>
-(append&nbsp;'()&nbsp;'a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;a</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_440"></a>reverse<i> list</i>)</tt>&nbsp;</div>
-
-<p>
-
-Returns a newly allocated list consisting of the elements of <i>list</i>
-in reverse order.</p>
-<p>
-<tt>(reverse&nbsp;'(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(c&nbsp;b&nbsp;a)<br>
-(reverse&nbsp;'(a&nbsp;(b&nbsp;c)&nbsp;d&nbsp;(e&nbsp;(f))))&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;((e&nbsp;(f))&nbsp;d&nbsp;(b&nbsp;c)&nbsp;a)</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_442"></a>list-tail<i> list <em>k</em></i>)</tt>&nbsp;</div>
-
-<p>
-Returns the sublist of <i>list</i> obtained by omitting the first <em>k</em>
-elements.  It is an error if <i>list</i> has fewer than <em>k</em> elements.
-<tt>List-tail</tt> could be defined by</p>
-<p>
-<tt>(define&nbsp;list-tail<br>
-&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;k)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(zero?&nbsp;k)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(list-tail&nbsp;(cdr&nbsp;x)&nbsp;(-&nbsp;k&nbsp;1)))))</p>
-</tt> 
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_444"></a>list-ref<i> list <em>k</em></i>)</tt>&nbsp;</div>
-
-<p>
-Returns the <em>k</em>th element of <i>list</i>.  (This is the same
-as the car of <tt>(list-tail <i>list</i> <em>k</em>)</tt>.)
-It is an error if <i>list</i> has fewer than <em>k</em> elements.</p>
-<p>
-<tt>(list-ref&nbsp;'(a&nbsp;b&nbsp;c&nbsp;d)&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;c<br>
-(list-ref&nbsp;'(a&nbsp;b&nbsp;c&nbsp;d)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(inexact-&gt;exact&nbsp;(round&nbsp;1.8)))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;c</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_446"></a>memq<i> obj list</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_448"></a>memv<i> obj list</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_450"></a>member<i> obj list</i>)</tt>&nbsp;</div>
-
-<p>
-These procedures return the first sublist of <i>list</i> whose car is
-<i>obj</i>, where the sublists of <i>list</i> are the non-empty lists
-returned by <tt>(list-tail <i>list</i> <i>k</i>)</tt> for <i>k</i> less
-than the length of <i>list</i>.  If
-<i>obj</i> does not occur in <i>list</i>, then <tt>#f</tt> (not the empty list) is
-returned.  <tt>Memq</tt> uses <tt>eq?</tt> to compare <i>obj</i> with the elements of
-<i>list</i>, while <tt>memv</tt> uses <tt>eqv?</tt> and <tt>member</tt> uses <tt>equal?</tt>.</p>
-<p>
-<tt>(memq&nbsp;'a&nbsp;'(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;b&nbsp;c)<br>
-(memq&nbsp;'b&nbsp;'(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(b&nbsp;c)<br>
-(memq&nbsp;'a&nbsp;'(b&nbsp;c&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(memq&nbsp;(list&nbsp;'a)&nbsp;'(b&nbsp;(a)&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(member&nbsp;(list&nbsp;'a)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'(b&nbsp;(a)&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;((a)&nbsp;c)<br>
-(memq&nbsp;101&nbsp;'(100&nbsp;101&nbsp;102))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(memv&nbsp;101&nbsp;'(100&nbsp;101&nbsp;102))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(101&nbsp;102)</p>
-</tt> 
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_452"></a>assq<i> obj alist</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_454"></a>assv<i> obj alist</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_456"></a>assoc<i> obj alist</i>)</tt>&nbsp;</div>
-
-<p>
-<i>Alist</i> (for ``association list'') must be a list of
-pairs.  These procedures find the first pair in <i>alist</i> whose car field is <i>obj</i>,
-and returns that pair.  If no pair in <i>alist</i> has <i>obj</i> as its
-car, then <tt>#f</tt> (not the empty list) is returned.  <tt>Assq</tt> uses
-<tt>eq?</tt> to compare <i>obj</i> with the car fields of the pairs in <i>alist</i>,
-while <tt>assv</tt> uses <tt>eqv?</tt> and <tt>assoc</tt> uses <tt>equal?</tt>.</p>
-<p>
-<tt>(define&nbsp;e&nbsp;'((a&nbsp;1)&nbsp;(b&nbsp;2)&nbsp;(c&nbsp;3)))<br>
-(assq&nbsp;'a&nbsp;e)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(a&nbsp;1)<br>
-(assq&nbsp;'b&nbsp;e)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(b&nbsp;2)<br>
-(assq&nbsp;'d&nbsp;e)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(assq&nbsp;(list&nbsp;'a)&nbsp;'(((a))&nbsp;((b))&nbsp;((c))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(assoc&nbsp;(list&nbsp;'a)&nbsp;'(((a))&nbsp;((b))&nbsp;((c))))&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;((a))<br>
-(assq&nbsp;5&nbsp;'((2&nbsp;3)&nbsp;(5&nbsp;7)&nbsp;(11&nbsp;13)))&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(assv&nbsp;5&nbsp;'((2&nbsp;3)&nbsp;(5&nbsp;7)&nbsp;(11&nbsp;13)))&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(5&nbsp;7)</p>
-</tt>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-Although they are ordinarily used as predicates,
-<tt>memq</tt>, <tt>memv</tt>, <tt>member</tt>, <tt>assq</tt>, <tt>assv</tt>, and <tt>assoc</tt> do not
-have question marks in their names because they return useful values rather
-than just <tt>#t</tt> or <tt>#f</tt>.
-</blockquote>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.3.3"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.3.3">6.3.3&nbsp;&nbsp;Symbols</a></h3>
-<p></p>
-<p>
-Symbols are objects whose usefulness rests on the fact that two
-symbols are identical (in the sense of <tt>eqv?</tt>) if and only if their
-names are spelled the same way.  This is exactly the property needed to
-represent identifiers<a name="%_idx_458"></a> in programs, and so most
-implementations of Scheme use them internally for that purpose.  Symbols
-are useful for many other applications; for instance, they may be used
-the way enumerated values are used in Pascal.</p>
-<p>
-The rules for writing a symbol are exactly the same as the rules for
-writing an identifier; see sections&nbsp;<a href="r5rs-Z-H-5.html#%_sec_2.1">2.1</a>
-and&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.1.1">7.1.1</a>.</p>
-<p>
-It is guaranteed that any symbol that has been returned as part of
-a literal expression, or read using the <tt>read</tt> procedure, and
-subsequently written out using the <tt>write</tt> procedure, will read back
-in as the identical symbol (in the sense of <tt>eqv?</tt>).  The
-<tt>string-&gt;symbol</tt> procedure, however, can create symbols for
-which this write/read invariance may not hold because their names
-contain special characters or letters in the non-standard case.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Some implementations of Scheme have a feature known as ``slashification''
-in order to guarantee write/read invariance for all symbols, but
-historically the most important use of this feature has been to
-compensate for the lack of a string data type.
-<p>
-Some implementations also have ``uninterned symbols'', which
-defeat write/read invariance even in implementations with slashification,
-and also generate exceptions to the rule that two symbols are the same
-if and only if their names are spelled the same.
-</p>
-</blockquote>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_460"></a>symbol?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a symbol, otherwise returns <tt>#f</tt>.</p>
-<p>
-<tt>(symbol?&nbsp;'foo)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(symbol?&nbsp;(car&nbsp;'(a&nbsp;b)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(symbol?&nbsp;&quot;bar&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(symbol?&nbsp;'nil)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(symbol?&nbsp;'())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(symbol?&nbsp;<tt>#f</tt>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt></p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_462"></a>symbol-&gt;string<i> symbol</i>)</tt>&nbsp;</div>
-
-<p>
-Returns the name of <i>symbol</i> as a string.  If the symbol was part of
-an object returned as the value of a literal expression
-(section&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.1.2">4.1.2</a>) or by a call to the <tt>read</tt> procedure,
-and its name contains alphabetic characters, then the string returned
-will contain characters in the implementation's preferred standard
-case -- some implementations will prefer upper case, others lower case.
-If the symbol was returned by <tt>string-&gt;symbol</tt>, the case of
-characters in the string returned will be the same as the case in the
-string that was passed to <tt>string-&gt;symbol</tt>.  It is an error
-to apply mutation procedures like <tt>string-set!</tt> to strings returned
-by this procedure.</p>
-<p>
-The following examples assume that the implementation's standard case is
-lower case:</p>
-<p>
-<tt>(symbol-&gt;string&nbsp;'flying-fish)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;&quot;flying-fish&quot;<br>
-(symbol-&gt;string&nbsp;'Martin)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;&quot;martin&quot;<br>
-(symbol-&gt;string<br>
-&nbsp;&nbsp;&nbsp;(string-&gt;symbol&nbsp;&quot;Malvina&quot;))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;&quot;Malvina&quot;</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_464"></a>string-&gt;symbol<i> string</i>)</tt>&nbsp;</div>
-
-<p>
-Returns the symbol whose name is <i>string</i>.  This procedure can
-create symbols with names containing special characters or letters in
-the non-standard case, but it is usually a bad idea to create such
-symbols because in some implementations of Scheme they cannot be read as
-themselves.  See <tt>symbol-&gt;string</tt>.</p>
-<p>
-The following examples assume that the implementation's standard case is
-lower case:</p>
-<p>
-<tt>(eq?&nbsp;'mISSISSIppi&nbsp;'mississippi)&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(string-&gt;symbol&nbsp;&quot;mISSISSIppi&quot;)&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;the&nbsp;symbol&nbsp;with&nbsp;name&nbsp;&quot;mISSISSIppi&quot;<br>
-(eq?&nbsp;'bitBlt&nbsp;(string-&gt;symbol&nbsp;&quot;bitBlt&quot;))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(eq?&nbsp;'JollyWog<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(string-&gt;symbol<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(symbol-&gt;string&nbsp;'JollyWog)))&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(string=?&nbsp;&quot;K.&nbsp;Harper,&nbsp;M.D.&quot;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(symbol-&gt;string<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(string-&gt;symbol&nbsp;&quot;K.&nbsp;Harper,&nbsp;M.D.&quot;)))&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.3.4"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.3.4">6.3.4&nbsp;&nbsp;Characters</a></h3>
-<p></p>
-<p>
-Characters are objects that represent printed characters such as
-letters and digits.  
-Characters are written using the notation <tt>#</tt><tt>\</tt>&lt;character&gt;
-or <tt>#</tt><tt>\</tt>&lt;character name&gt;.
-For example:</p>
-<p>
-</p>
-<div align=left><table><tr><td>
-
-
-<table border=0><tr><td valign=top ><tt>#<tt>\</tt>a</tt></td><td valign=top >; lower case letter</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>A</tt></td><td valign=top >; upper case letter</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>(</tt></td><td valign=top >; left parenthesis</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt> </tt></td><td valign=top >; the space character</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>space</tt></td><td valign=top >; the preferred way to write a space</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>newline</tt></td><td valign=top >; the newline character</td></tr>
-<tr><td valign=top ></td></tr></table>
-</td></tr></table></div>
-<p></p>
-<p>
-Case is significant in <tt>#</tt><tt>\</tt>&lt;character&gt;, but not in
-<tt>#</tt><tt>\</tt>&lt;character name&gt;.                                                              If &lt;character&gt; in
-<tt>#</tt><tt>\</tt>&lt;character&gt; is alphabetic, then the character
-following &lt;character&gt; must be a delimiter character such as a
-space or parenthesis.  This rule resolves the ambiguous case where, for
-example, the sequence of characters ``<tt><tt>#</tt><tt>\</tt>space</tt>''
-could be taken to be either a representation of the space character or a
-representation of the character ``<tt><tt>#</tt><tt>\</tt>s</tt>'' followed
-by a representation of the symbol ``<tt>pace</tt>.''</p>
-<p>
-
-Characters written in the <tt>#</tt><tt>\</tt> notation are self-evaluating.
-That is, they do not have to be quoted in programs.  
-
-Some of the procedures that operate on characters ignore the
-difference between upper case and lower case.  The procedures that
-ignore case have ``<tt>-ci</tt>'' (for ``case
-insensitive'') embedded in their names.</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_466"></a>char?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a character, otherwise returns <tt>#f</tt>.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_468"></a>char=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_470"></a>char&lt;?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_472"></a>char&gt;?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_474"></a>char&lt;=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_476"></a>char&gt;=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<p>
-
-
-These procedures impose a total ordering on the set of characters.  It
-is guaranteed that under this ordering:</p>
-<p>
-</p>
-<ul>
-<li>
-<p>The upper case characters are in order.  For example, <tt>(char&lt;? #<tt>\</tt>A #<tt>\</tt>B)</tt> returns <tt>#t</tt>.
-</p>
-<li>
-<p>The lower case characters are in order.  For example, <tt>(char&lt;? #<tt>\</tt>a #<tt>\</tt>b)</tt> returns <tt>#t</tt>.
-</p>
-<li>
-<p>The digits are in order.  For example, <tt>(char&lt;? #<tt>\</tt>0 #<tt>\</tt>9)</tt> returns <tt>#t</tt>.
-</p>
-<li>
-<p>Either all the digits precede all the upper case letters, or vice versa.
-</p>
-<li>
-<p>Either all the digits precede all the lower case letters, or vice versa.
-</p>
-</ul>
-<p></p>
-<p>
-Some implementations may generalize these procedures to take more than
-two arguments, as with the corresponding numerical predicates.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_478"></a>char-ci=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_480"></a>char-ci&lt;?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_482"></a>char-ci&gt;?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_484"></a>char-ci&lt;=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_486"></a>char-ci&gt;=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<p>
-
-These procedures are similar to <tt>char=?</tt> et cetera, but they treat
-upper case and lower case letters as the same.  For example, <tt>(char-ci=? #<tt>\</tt>A #<tt>\</tt>a)</tt> returns <tt>#t</tt>.  Some
-implementations may generalize these procedures to take more than two
-arguments, as with the corresponding numerical predicates.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_488"></a>char-alphabetic?<i> char</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_490"></a>char-numeric?<i> char</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_492"></a>char-whitespace?<i> char</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_494"></a>char-upper-case?<i> letter</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_496"></a>char-lower-case?<i> letter</i>)</tt>&nbsp;</div>
-
-<p>
-These procedures return <tt>#t</tt> if their arguments are alphabetic,
-numeric, whitespace, upper case, or lower case characters, respectively,
-otherwise they return <tt>#f</tt>.  The following remarks, which are specific to
-the ASCII character set, are intended only as a guide:  The alphabetic characters
-are the 52 upper and lower case letters.  The numeric characters are the
-ten decimal digits.  The whitespace characters are space, tab, line
-feed, form feed, and carriage return.
-</p>
-
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_498"></a>char-&gt;integer<i> char</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_500"></a>integer-&gt;char<i> <em>n</em></i>)</tt>&nbsp;</div>
-
-<p>
-Given a character, <tt>char-&gt;integer</tt> returns an exact integer
-representation of the character.  Given an exact integer that is the image of
-a character under <tt>char-&gt;integer</tt>, <tt>integer-&gt;char</tt>
-returns that character.  These procedures implement order-preserving isomorphisms
-between the set of characters under the <tt>char&lt;=?</tt> ordering and some
-subset of the integers under the <tt>&lt;=</tt> ordering.  That is, if</p>
-<p>
-<tt>(char&lt;=?&nbsp;<em>a</em>&nbsp;<em>b</em>)&nbsp;===&gt;&nbsp;<tt>#t</tt>&nbsp;&nbsp;and&nbsp;&nbsp;(&lt;=&nbsp;<em>x</em>&nbsp;<em>y</em>)&nbsp;===&gt;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-and <em>x</em> and <em>y</em> are in the domain of
-<tt>integer-&gt;char</tt>, then</p>
-<p>
-<tt>(&lt;=&nbsp;(char-&gt;integer&nbsp;<em>a</em>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(char-&gt;integer&nbsp;<em>b</em>))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-<br>
-(char&lt;=?&nbsp;(integer-&gt;char&nbsp;<em>x</em>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(integer-&gt;char&nbsp;<em>y</em>))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_502"></a>char-upcase<i> char</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_504"></a>char-downcase<i> char</i>)</tt>&nbsp;</div>
-
-<p>
-
-These procedures return a character <i>char<sub>2</sub></i> such that <tt>(char-ci=? <i>char</i> <i>char<sub>2</sub></i>)</tt>.  In addition, if <i>char</i> is
-alphabetic, then the result of <tt>char-upcase</tt> is upper case and the
-result of <tt>char-downcase</tt> is lower case.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.3.5"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.3.5">6.3.5&nbsp;&nbsp;Strings</a></h3>
-<p></p>
-<p>
-Strings are sequences of characters.  
-Strings are written as sequences of characters enclosed within doublequotes
-(<tt>&quot;</tt>).  A doublequote can be written inside a string only by escaping
-it with a backslash (<tt>\</tt>), as in</p>
-<p>
-<tt>&quot;The&nbsp;word&nbsp;<tt>\</tt>&quot;recursion<tt>\</tt>&quot;&nbsp;has&nbsp;many&nbsp;meanings.&quot;</p>
-</tt>
-<p>
-A backslash can be written inside a string only by escaping it with another
-backslash.  Scheme does not specify the effect of a backslash within a
-string that is not followed by a doublequote or backslash.</p>
-<p>
-A string constant may continue from one line to the next, but
-the exact contents of such a string are unspecified.
-
-The <em>length</em> of a string is the number of characters that it
-contains.  This number is an exact, non-negative integer that is fixed when the
-string is created.  The <a name="%_idx_506"></a><em>valid indexes</em> of a string are the
-exact non-negative integers less than the length of the string.  The first
-character of a string has index 0, the second has index 1, and so on.</p>
-<p>
-In phrases such as ``the characters of <i>string</i> beginning with
-index <i>start</i> and ending with index <i>end</i>,'' it is understood
-that the index <i>start</i> is inclusive and the index <i>end</i> is
-exclusive.  Thus if <i>start</i> and <i>end</i> are the same index, a null
-substring is referred to, and if <i>start</i> is zero and <i>end</i> is
-the length of <i>string</i>, then the entire string is referred to.</p>
-<p>
-Some of the procedures that operate on strings ignore the
-difference between upper and lower case.  The versions that ignore case
-have ``<tt>-ci</tt>'' (for ``case insensitive'') embedded in their
-names.</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_508"></a>string?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a string, otherwise returns <tt>#f</tt>.
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_510"></a>make-string<i> <em>k</em></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_512"></a>make-string<i> <em>k</em> char</i>)</tt>&nbsp;</div>
-
-<p>
-<tt>Make-string</tt> returns a newly allocated string of
-length <em>k</em>.  If <i>char</i> is given, then all elements of the string
-are initialized to <i>char</i>, otherwise the contents of the
-<i>string</i> are unspecified.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_514"></a>string<i> char <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-Returns a newly allocated string composed of the arguments.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_516"></a>string-length<i> string</i>)</tt>&nbsp;</div>
-
-<p>
-Returns the number of characters in the given <i>string</i>.
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_518"></a>string-ref<i> string <em>k</em></i>)</tt>&nbsp;</div>
-
-<p>
-<em>k</em> must be a valid index of <i>string</i>.
-<tt>String-ref</tt> returns character <em>k</em> of <i>string</i> using zero-origin indexing.
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_520"></a>string-set!<i> string k char</i>)</tt>&nbsp;</div>
-
-<p>
-<em>k</em> must be a valid index of <i>string</i>.
-<tt>String-set!</tt> stores <i>char</i> in element <em>k</em> of <i>string</i>
-and returns an unspecified value.  
-<tt>(define&nbsp;(f)&nbsp;(make-string&nbsp;3&nbsp;<tt>#</tt><tt>\</tt>*))<br>
-(define&nbsp;(g)&nbsp;&quot;***&quot;)<br>
-(string-set!&nbsp;(f)&nbsp;0&nbsp;<tt>#</tt><tt>\</tt>?)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(string-set!&nbsp;(g)&nbsp;0&nbsp;<tt>#</tt><tt>\</tt>?)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>error</i><br>
-(string-set!&nbsp;(symbol-&gt;string&nbsp;'immutable)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#</tt><tt>\</tt>?)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>error</i></p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_522"></a>string=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_524"></a>string-ci=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<p>
-Returns <tt>#t</tt> if the two strings are the same length and contain the same
-characters in the same positions, otherwise returns <tt>#f</tt>.
-<tt>String-ci=?</tt> treats
-upper and lower case letters as though they were the same character, but
-<tt>string=?</tt> treats upper and lower case as distinct characters.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_526"></a>string&lt;?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_528"></a>string&gt;?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_530"></a>string&lt;=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_532"></a>string&gt;=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_534"></a>string-ci&lt;?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_536"></a>string-ci&gt;?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_538"></a>string-ci&lt;=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_540"></a>string-ci&gt;=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<p>
-These procedures are the lexicographic extensions to strings of the
-corresponding orderings on characters.  For example, <tt>string&lt;?</tt> is
-the lexicographic ordering on strings induced by the ordering
-<tt>char&lt;?</tt> on characters.  If two strings differ in length but
-are the same up to the length of the shorter string, the shorter string
-is considered to be lexicographically less than the longer string.</p>
-<p>
-Implementations may generalize these and the <tt>string=?</tt> and
-<tt>string-ci=?</tt> procedures to take more than two arguments, as with
-the corresponding numerical predicates.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_542"></a>substring<i> string start end</i>)</tt>&nbsp;</div>
-
-<p>
-<i>String</i> must be a string, and <i>start</i> and <i>end</i>
-must be exact integers satisfying
-</p>
-<div align=left><table><tr><td>0 <u>&lt;</u> <i>start</i> <u>&lt;</u> <i>end</i> <u>&lt;</u> <tt>(string-length <i>string</i>).</tt></td></tr></table></div>
-<p>
-<tt>Substring</tt> returns a newly allocated string formed from the characters of
-<i>string</i> beginning with index <i>start</i> (inclusive) and ending with index
-<i>end</i> (exclusive).
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_544"></a>string-append<i> <i>string</i> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-Returns a newly allocated string whose characters form the concatenation of the
-given strings.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_546"></a>string-&gt;list<i> string</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_548"></a>list-&gt;string<i> list</i>)</tt>&nbsp;</div>
-
-<p>
-<tt>String-&gt;list</tt> returns a newly allocated list of the
-characters that make up the given string.  <tt>List-&gt;string</tt>
-returns a newly allocated string formed from the characters in the list
-<i>list</i>, which must be a list of characters. <tt>String-&gt;list</tt>
-and <tt>list-&gt;string</tt> are
-inverses so far as <tt>equal?</tt> is concerned.  
-
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_550"></a>string-copy<i> string</i>)</tt>&nbsp;</div>
-
-<p>
-Returns a newly allocated copy of the given <i>string</i>.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_552"></a>string-fill!<i> string char</i>)</tt>&nbsp;</div>
-
-<p>
-Stores <i>char</i> in every element of the given <i>string</i> and returns an
-unspecified value.  
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.3.6"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.3.6">6.3.6&nbsp;&nbsp;Vectors</a></h3>
-<p></p>
-<p>
-Vectors are heterogenous structures whose elements are indexed
-by integers.  A vector typically occupies less space than a list
-of the same length, and the average time required to access a randomly
-chosen element is typically less for the vector than for the list.</p>
-<p>
-The <em>length</em> of a vector is the number of elements that it
-contains.  This number is a non-negative integer that is fixed when the
-vector is created.  The <em>valid indexes</em><a name="%_idx_554"></a> of a
-vector are the exact non-negative integers less than the length of the
-vector.  The first element in a vector is indexed by zero, and the last
-element is indexed by one less than the length of the vector.</p>
-<p>
-Vectors are written using the notation <tt>#(<i>obj</i> <tt>...</tt>)</tt>.
-For example, a vector of length 3 containing the number zero in element
-0, the list <tt>(2 2 2 2)</tt> in element 1, and the string <tt>&quot;Anna&quot;</tt> in
-element 2 can be written as following:</p>
-<p>
-<tt>#(0&nbsp;(2&nbsp;2&nbsp;2&nbsp;2)&nbsp;&quot;Anna&quot;)</p>
-</tt>
-<p>
-Note that this is the external representation of a vector, not an
-expression evaluating to a vector.  Like list constants, vector
-constants must be quoted:</p>
-<p>
-<tt>'#(0&nbsp;(2&nbsp;2&nbsp;2&nbsp;2)&nbsp;&quot;Anna&quot;)&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;#(0&nbsp;(2&nbsp;2&nbsp;2&nbsp;2)&nbsp;&quot;Anna&quot;)</p>
-</tt>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_556"></a>vector?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a vector, otherwise returns <tt>#f</tt>.
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_558"></a>make-vector<i> k</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_560"></a>make-vector<i> k fill</i>)</tt>&nbsp;</div>
-
-<p>
-Returns a newly allocated vector of <i>k</i> elements.  If a second
-argument is given, then each element is initialized to <i>fill</i>.
-Otherwise the initial contents of each element is unspecified.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_562"></a>vector<i> obj <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-Returns a newly allocated vector whose elements contain the given
-arguments.  Analogous to <tt>list</tt>.</p>
-<p>
-<tt>(vector&nbsp;'a&nbsp;'b&nbsp;'c)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;#(a&nbsp;b&nbsp;c)</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_564"></a>vector-length<i> vector</i>)</tt>&nbsp;</div>
-
-<p>
-Returns the number of elements in <i>vector</i> as an exact integer.
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_566"></a>vector-ref<i> vector k</i>)</tt>&nbsp;</div>
-
-<p>
-<em>k</em> must be a valid index of <i>vector</i>.
-<tt>Vector-ref</tt> returns the contents of element <em>k</em> of
-<i>vector</i>.</p>
-<p>
-<tt>(vector-ref&nbsp;'#(1&nbsp;1&nbsp;2&nbsp;3&nbsp;5&nbsp;8&nbsp;13&nbsp;21)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;5)&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;8<br>
-(vector-ref&nbsp;'#(1&nbsp;1&nbsp;2&nbsp;3&nbsp;5&nbsp;8&nbsp;13&nbsp;21)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((i&nbsp;(round&nbsp;(*&nbsp;2&nbsp;(acos&nbsp;-1)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(inexact?&nbsp;i)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(inexact-&gt;exact&nbsp;i)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;i)))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;13</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_568"></a>vector-set!<i> vector k obj</i>)</tt>&nbsp;</div>
-
-<p>
-<em>k</em> must be a valid index of <i>vector</i>.
-<tt>Vector-set!</tt> stores <i>obj</i> in element <em>k</em> of <i>vector</i>.
-The value returned by <tt>vector-set!</tt> is unspecified.  
-<tt>(let&nbsp;((vec&nbsp;(vector&nbsp;0&nbsp;'(2&nbsp;2&nbsp;2&nbsp;2)&nbsp;&quot;Anna&quot;)))<br>
-&nbsp;&nbsp;(vector-set!&nbsp;vec&nbsp;1&nbsp;'(&quot;Sue&quot;&nbsp;&quot;Sue&quot;))<br>
-&nbsp;&nbsp;vec)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;#(0&nbsp;(&quot;Sue&quot;&nbsp;&quot;Sue&quot;)&nbsp;&quot;Anna&quot;)<br>
-<br>
-(vector-set!&nbsp;'#(0&nbsp;1&nbsp;2)&nbsp;1&nbsp;&quot;doe&quot;)&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>error</i>&nbsp;&nbsp;;&nbsp;constant&nbsp;vector</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_570"></a>vector-&gt;list<i> vector</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_572"></a>list-&gt;vector<i> list</i>)</tt>&nbsp;</div>
-
-<p>
-<tt>Vector-&gt;list</tt> returns a newly allocated list of the objects contained
-in the elements of <i>vector</i>.  <tt>List-&gt;vector</tt> returns a newly
-created vector initialized to the elements of the list <i>list</i>.</p>
-<p>
-<tt>(vector-&gt;list&nbsp;'#(dah&nbsp;dah&nbsp;didah))&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(dah&nbsp;dah&nbsp;didah)<br>
-(list-&gt;vector&nbsp;'(dididit&nbsp;dah))&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;#(dididit&nbsp;dah)</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_574"></a>vector-fill!<i> vector fill</i>)</tt>&nbsp;</div>
-
-<p>
-Stores <i>fill</i> in every element of <i>vector</i>.
-The value returned by <tt>vector-fill!</tt> is unspecified.  
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.4"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.4">6.4&nbsp;&nbsp;Control features</a></h2>
-<p></p>
-<p>
-
-This chapter describes various primitive procedures which control the
-flow of program execution in special ways.
-The <tt>procedure?</tt> predicate is also described here.</p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_576"></a>procedure?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a procedure, otherwise returns <tt>#f</tt>.</p>
-<p>
-<tt>(procedure?&nbsp;car)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(procedure?&nbsp;'car)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(procedure?&nbsp;(lambda&nbsp;(x)&nbsp;(*&nbsp;x&nbsp;x)))&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt><br>
-(procedure?&nbsp;'(lambda&nbsp;(x)&nbsp;(*&nbsp;x&nbsp;x)))&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt><br>
-(call-with-current-continuation&nbsp;procedure?)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#t</tt></p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_578"></a>apply<i> proc <i>arg<sub>1</sub></i> <tt>...</tt> args</i>)</tt>&nbsp;</div>
-
-<p>
-<i>Proc</i> must be a procedure and <i>args</i> must be a list.
-Calls <i>proc</i> with the elements of the list
-<tt>(append (list <i>arg<sub>1</sub></i> <tt>...</tt>) <i>args</i>)</tt> as the actual
-arguments.</p>
-<p>
-<tt>(apply&nbsp;+&nbsp;(list&nbsp;3&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;7<br>
-<br>
-(define&nbsp;compose<br>
-&nbsp;&nbsp;(lambda&nbsp;(f&nbsp;g)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;args<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(f&nbsp;(apply&nbsp;g&nbsp;args)))))<br>
-<br>
-((compose&nbsp;sqrt&nbsp;*)&nbsp;12&nbsp;75)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;30</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_580"></a>map<i> proc <i>list<sub>1</sub></i> <i>list<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-The <i>list</i>s must be lists, and <i>proc</i> must be a
-procedure taking as many arguments as there are <i>list</i>s
-and returning a single value.  If more
-than one <i>list</i> is given, then they must all be the same length.
-<tt>Map</tt> applies <i>proc</i> element-wise to the elements of the
-<i>list</i>s and returns a list of the results, in order.
-The dynamic order in which <i>proc</i> is applied to the elements of the
-<i>list</i>s is unspecified.</p>
-<p>
-<tt>(map&nbsp;cadr&nbsp;'((a&nbsp;b)&nbsp;(d&nbsp;e)&nbsp;(g&nbsp;h)))&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(b&nbsp;e&nbsp;h)<br>
-<br>
-(map&nbsp;(lambda&nbsp;(n)&nbsp;(expt&nbsp;n&nbsp;n))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(1&nbsp;4&nbsp;27&nbsp;256&nbsp;3125)<br>
-<br>
-(map&nbsp;+&nbsp;'(1&nbsp;2&nbsp;3)&nbsp;'(4&nbsp;5&nbsp;6))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(5&nbsp;7&nbsp;9)<br>
-<br>
-(let&nbsp;((count&nbsp;0))<br>
-&nbsp;&nbsp;(map&nbsp;(lambda&nbsp;(ignored)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;count&nbsp;(+&nbsp;count&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;count)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'(a&nbsp;b)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(1&nbsp;2)&nbsp;<i>or</i>&nbsp;(2&nbsp;1)<br>
-</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_582"></a>for-each<i> proc <i>list<sub>1</sub></i> <i>list<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-The arguments to <tt>for-each</tt> are like the arguments to <tt>map</tt>, but
-<tt>for-each</tt> calls <i>proc</i> for its side effects rather than for its
-values.  Unlike <tt>map</tt>, <tt>for-each</tt> is guaranteed to call <i>proc</i> on
-the elements of the <i>list</i>s in order from the first element(s) to the
-last, and the value returned by <tt>for-each</tt> is unspecified.</p>
-<p>
-<tt>(let&nbsp;((v&nbsp;(make-vector&nbsp;5)))<br>
-&nbsp;&nbsp;(for-each&nbsp;(lambda&nbsp;(i)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(vector-set!&nbsp;v&nbsp;i&nbsp;(*&nbsp;i&nbsp;i)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'(0&nbsp;1&nbsp;2&nbsp;3&nbsp;4))<br>
-&nbsp;&nbsp;v)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;#(0&nbsp;1&nbsp;4&nbsp;9&nbsp;16)</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_584"></a>force<i> promise</i>)</tt>&nbsp;</div>
-
-<p>
-Forces the value of <i>promise</i> (see <tt>delay</tt>,
-section&nbsp;<a href="r5rs-Z-H-7.html#%_sec_4.2.5">4.2.5</a>).<a name="%_idx_586"></a>  If no value has been computed for
-the promise, then a value is computed and returned.  The value of the
-promise is cached (or ``memoized'') so that if it is forced a second
-time, the previously computed value is returned.
-
-<tt>(force&nbsp;(delay&nbsp;(+&nbsp;1&nbsp;2)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;3<br>
-(let&nbsp;((p&nbsp;(delay&nbsp;(+&nbsp;1&nbsp;2))))<br>
-&nbsp;&nbsp;(list&nbsp;(force&nbsp;p)&nbsp;(force&nbsp;p)))&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;(3&nbsp;3)<br>
-<br>
-(define&nbsp;a-stream<br>
-&nbsp;&nbsp;(letrec&nbsp;((next<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;n&nbsp;(delay&nbsp;(next&nbsp;(+&nbsp;n&nbsp;1)))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(next&nbsp;0)))<br>
-(define&nbsp;head&nbsp;car)<br>
-(define&nbsp;tail<br>
-&nbsp;&nbsp;(lambda&nbsp;(stream)&nbsp;(force&nbsp;(cdr&nbsp;stream))))<br>
-<br>
-(head&nbsp;(tail&nbsp;(tail&nbsp;a-stream)))&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;2</p>
-</tt>
-<p>
-<tt>Force</tt> and <tt>delay</tt> are mainly intended for programs written in
-functional style.  The following examples should not be considered to
-illustrate good programming style, but they illustrate the property that
-only one value is computed for a promise, no matter how many times it is
-forced.
-
-<tt>(define&nbsp;count&nbsp;0)<br>
-(define&nbsp;p<br>
-&nbsp;&nbsp;(delay&nbsp;(begin&nbsp;(set!&nbsp;count&nbsp;(+&nbsp;count&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(&gt;&nbsp;count&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;count<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(force&nbsp;p)))))<br>
-(define&nbsp;x&nbsp;5)<br>
-p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>a&nbsp;promise</i><br>
-(force&nbsp;p)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;6<br>
-p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>a&nbsp;promise,&nbsp;still</i><br>
-(begin&nbsp;(set!&nbsp;x&nbsp;10)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(force&nbsp;p))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;6</p>
-</tt>
-<p>
-Here is a possible implementation of <tt>delay</tt> and <tt>force</tt>.
-Promises are implemented here as procedures of no arguments,
-and <tt>force</tt> simply calls its argument:</p>
-<p>
-<tt>(define&nbsp;force<br>
-&nbsp;&nbsp;(lambda&nbsp;(object)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(object)))</p>
-</tt>
-<p>
-We define the expression</p>
-<p>
-<tt>(delay&nbsp;&lt;expression&gt;)</p>
-</tt>
-<p>
-to have the same meaning as the procedure call</p>
-<p>
-<tt>(make-promise&nbsp;(lambda&nbsp;()&nbsp;&lt;expression&gt;))<br>
-</p>
-</tt>
-<p>
-as follows</p>
-<p>
-<tt>(define-syntax&nbsp;delay<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((delay&nbsp;expression)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-promise&nbsp;(lambda&nbsp;()&nbsp;expression))))),</p>
-</tt>
-<p>
-where <tt>make-promise</tt> is defined as follows:</p>
-<p>
-
-<tt>(define&nbsp;make-promise<br>
-&nbsp;&nbsp;(lambda&nbsp;(proc)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((result-ready?&nbsp;<tt>#f</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(result&nbsp;<tt>#f</tt>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;result-ready?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((x&nbsp;(proc)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;result-ready?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;(set!&nbsp;result-ready?&nbsp;<tt>#t</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;result&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result))))))))</p>
-</tt>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-A promise may refer to its own value, as in the last example above.
-Forcing such a promise may cause the promise to be forced a second time
-before the value of the first force has been computed.
-This complicates the definition of <tt>make-promise</tt>.
-</blockquote>
-<p>
-Various extensions to this semantics of <tt>delay</tt> and <tt>force</tt>
-are supported in some implementations:</p>
-<p>
-</p>
-<ul>
-<li>
-<p>Calling <tt>force</tt> on an object that is not a promise may simply
-return the object.</p>
-<p>
-</p>
-<li>
-<p>It may be the case that there is no means by which a promise can be
-operationally distinguished from its forced value.  That is, expressions
-like the following may evaluate to either <tt>#t</tt> or to <tt>#f</tt>,
-depending on the implementation:</p>
-<p>
-<tt>(eqv?&nbsp;(delay&nbsp;1)&nbsp;1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i><br>
-(pair?&nbsp;(delay&nbsp;(cons&nbsp;1&nbsp;2)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<i>unspecified</i></p>
-</tt>
-<p>
-</p>
-<li>
-<p>Some implementations may implement ``implicit forcing,'' where
-the value of a promise is forced by primitive procedures like <tt>cdr
-and <tt>+:</p>
-<p>
-<tt>(+&nbsp;(delay&nbsp;(*&nbsp;3&nbsp;7))&nbsp;13)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;34</p>
-</tt>
-</ul>
-<p></tt></tt>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_588"></a>call-with-current-continuation<i> proc</i>)</tt>&nbsp;</div>
-
-<p>
- <i>Proc</i> must be a procedure of one
-argument. The procedure <tt>call-with-current-continuation</tt> packages
-up the current continuation (see the rationale below) as an ``escape
-procedure''<a name="%_idx_590"></a> and passes it as an argument to
-<i>proc</i>.  The escape procedure is a Scheme procedure that, if it is
-later called, will abandon whatever continuation is in effect at that later
-time and will instead use the continuation that was in effect
-when the escape procedure was created.  Calling the escape procedure
-may cause the invocation of <i>before</i> and <i>after</i> thunks installed using
-<tt>dynamic-wind</tt>.</p>
-<p>
-The escape procedure accepts the same number of arguments as the continuation to
-the original call to <tt>call-with-current-continuation</tt>.
-Except for continuations created by the <tt>call-with-values</tt>
-procedure, all continuations take exactly one value.  The
-effect of passing no value or more than one value to continuations
-that were not created by <tt>call-with-values</tt> is unspecified.</p>
-<p>
-The escape procedure that is passed to <i>proc</i> has
-unlimited extent just like any other procedure in Scheme.  It may be stored
-in variables or data structures and may be called as many times as desired.</p>
-<p>
-The following examples show only the most common ways in which
-<tt>call-with-current-continuation</tt> is used.  If all real uses were as
-simple as these examples, there would be no need for a procedure with
-the power of <tt>call-with-current-continuation</tt>.</p>
-<p>
-<tt>(call-with-current-continuation<br>
-&nbsp;&nbsp;(lambda&nbsp;(exit)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(for-each&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(negative?&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(exit&nbsp;x)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'(54&nbsp;0&nbsp;37&nbsp;-3&nbsp;245&nbsp;19))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<tt>#t</tt>))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-3<br>
-<br>
-(define&nbsp;list-length<br>
-&nbsp;&nbsp;(lambda&nbsp;(obj)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(call-with-current-continuation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(return)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec&nbsp;((r<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(obj)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond&nbsp;((null?&nbsp;obj)&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((pair?&nbsp;obj)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;(r&nbsp;(cdr&nbsp;obj))&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;(return&nbsp;<tt>#f</tt>))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(r&nbsp;obj))))))<br>
-<br>
-(list-length&nbsp;'(1&nbsp;2&nbsp;3&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;4<br>
-<br>
-(list-length&nbsp;'(a&nbsp;b&nbsp;.&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;<tt>#f</tt></p>
-</tt>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-<p>
-A common use of <tt>call-with-current-continuation</tt> is for
-structured, non-local exits from loops or procedure bodies, but in fact
-<tt>call-with-current-continuation</tt> is extremely useful for implementing a
-wide variety of advanced control structures.</p>
-<p>
-Whenever a Scheme expression is evaluated there is a
-<a name="%_idx_592"></a><em>continuation</em> wanting the result of the expression.  The continuation
-represents an entire (default) future for the computation.  If the expression is
-evaluated at top level, for example, then the continuation might take the
-result, print it on the screen, prompt for the next input, evaluate it, and
-so on forever.  Most of the time the continuation includes actions
-specified by user code, as in a continuation that will take the result,
-multiply it by the value stored in a local variable, add seven, and give
-the answer to the top level continuation to be printed.  Normally these
-ubiquitous continuations are hidden behind the scenes and programmers do not
-think much about them.  On rare occasions, however, a programmer may
-need to deal with continuations explicitly.
-<tt>Call-with-current-continuation</tt> allows Scheme programmers to do
-that by creating a procedure that acts just like the current
-continuation.</p>
-<p>
-Most programming languages incorporate one or more special-purpose
-escape constructs with names like <tt>exit</tt>, <tt>return</tt>, or
-even <tt>goto</tt>.  In 1965, however, Peter Landin&nbsp;[<a href="r5rs-Z-H-14.html#cite{Landin65}">16</a>]
-invented a general purpose escape operator called the J-operator.  John
-Reynolds&nbsp;[<a href="r5rs-Z-H-14.html#cite{Reynolds72}">24</a>] described a simpler but equally powerful
-construct in 1972.  The <tt>catch</tt> special form described by Sussman
-and Steele in the 1975 report on Scheme is exactly the same as
-Reynolds's construct, though its name came from a less general construct
-in MacLisp.  Several Scheme implementors noticed that the full power of the
-<tt>catch</tt> construct could be provided by a procedure instead of by a
-special syntactic construct, and the name
-<tt>call-with-current-continuation</tt> was coined in 1982.  This name is
-descriptive, but opinions differ on the merits of such a long name, and
-some people use the name <tt>call/cc</tt> instead.
-</p>
-</blockquote>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_594"></a>values<i> obj <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<p>
-Delivers all of its arguments to its continuation.
-Except for continuations created by the <tt>call-with-values</tt>
-procedure, all continuations take exactly one value.
-<tt>Values</tt> might be defined as follows:
-<tt>(define&nbsp;(values&nbsp;.&nbsp;things)<br>
-&nbsp;&nbsp;(call-with-current-continuation&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(cont)&nbsp;(apply&nbsp;cont&nbsp;things))))<br>
-</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_596"></a>call-with-values<i> producer consumer</i>)</tt>&nbsp;</div>
-
-<p>
-Calls its <i>producer</i> argument with no values and
-a continuation that, when passed some values, calls the
-<i>consumer</i> procedure with those values as arguments.
-The continuation for the call to <i>consumer</i> is the
-continuation of the call to <tt>call-with-values</tt>.</p>
-<p>
-<tt>(call-with-values&nbsp;(lambda&nbsp;()&nbsp;(values&nbsp;4&nbsp;5))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(a&nbsp;b)&nbsp;b))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;5<br>
-<br>
-(call-with-values&nbsp;*&nbsp;-)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-1<br>
-</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_598"></a>dynamic-wind<i> before thunk after</i>)</tt>&nbsp;</div>
-
-<p>
-Calls <i>thunk</i> without arguments, returning the result(s) of this call.
-<i>Before</i> and <i>after</i> are called, also without arguments, as required
-by the following rules (note that in the absence of calls to continuations
-captured using <tt>call-with-current-continuation</tt> the three arguments are
-called once each, in order).  <i>Before</i> is called whenever execution
-enters the dynamic extent of the call to <i>thunk</i> and <i>after</i> is called
-whenever it exits that dynamic extent.  The dynamic extent of a procedure
-call is the period between when the call is initiated and when it
-returns.  In Scheme, because of <tt>call-with-current-continuation</tt>, the
-dynamic extent of a call may not be a single, connected time period.
-It is defined as follows:
-</p>
-<ul>
-<li>
-<p>The dynamic extent is entered when execution of the body of the
-called procedure begins.</p>
-<p>
-</p>
-<li>
-<p>The dynamic extent is also entered when execution is not within
-the dynamic extent and a continuation is invoked that was captured
-(using <tt>call-with-current-continuation</tt>) during the dynamic extent.</p>
-<p>
-</p>
-<li>
-<p>It is exited when the called procedure returns.</p>
-<p>
-</p>
-<li>
-<p>It is also exited when execution is within the dynamic extent and
-a continuation is invoked that was captured while not within the
-dynamic extent.
-</p>
-</ul>
-<p></p>
-<p>
-If a second call to <tt>dynamic-wind</tt> occurs within the dynamic extent of the
-call to <i>thunk</i> and then a continuation is invoked in such a way that the
-<i>after</i>s from these two invocations of <tt>dynamic-wind</tt> are both to be
-called, then the <i>after</i> associated with the second (inner) call to
-<tt>dynamic-wind</tt> is called first.</p>
-<p>
-If a second call to <tt>dynamic-wind</tt> occurs within the dynamic extent of the
-call to <i>thunk</i> and then a continuation is invoked in such a way that the
-<i>before</i>s from these two invocations of <tt>dynamic-wind</tt> are both to be
-called, then the <i>before</i> associated with the first (outer) call to
-<tt>dynamic-wind</tt> is called first.</p>
-<p>
-If invoking a continuation requires calling the <i>before</i> from one call
-to <tt>dynamic-wind</tt> and the <i>after</i> from another, then the <i>after</i>
-is called first.</p>
-<p>
-The effect of using a captured continuation to enter or exit the dynamic
-extent of a call to <i>before</i> or <i>after</i> is undefined.</p>
-<p>
-<tt>(let&nbsp;((path&nbsp;'())<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(c&nbsp;#f))<br>
-&nbsp;&nbsp;(let&nbsp;((add&nbsp;(lambda&nbsp;(s)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;path&nbsp;(cons&nbsp;s&nbsp;path)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(dynamic-wind<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;(add&nbsp;'connect))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(add&nbsp;(call-with-current-continuation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(c0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;c&nbsp;c0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'talk1))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;(add&nbsp;'disconnect)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(&lt;&nbsp;(length&nbsp;path)&nbsp;4)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(c&nbsp;'talk2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(reverse&nbsp;path))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;(connect&nbsp;talk1&nbsp;disconnect<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;connect&nbsp;talk2&nbsp;disconnect)<br>
-</p>
-</tt>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.5"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.5">6.5&nbsp;&nbsp;<tt>Eval</tt></a></h2>
-<p></p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_600"></a>eval<i> expression environment-specifier</i>)</tt>&nbsp;</div>
-
-<p>
-Evaluates <i>expression</i> in the specified environment and returns its value.
-<i>Expression</i> must be a valid Scheme expression represented as data,
-and <i>environment-specifier</i> must be a value returned by one of the
-three procedures described below.
-Implementations may extend <tt>eval</tt> to allow non-expression programs
-(definitions) as the first argument and to allow other
-values as environments, with the restriction that <tt>eval</tt> is not
-allowed to create new bindings in the environments associated with
-<tt>null-environment</tt> or <tt>scheme-report-environment</tt>.</p>
-<p>
-<tt>(eval&nbsp;'(*&nbsp;7&nbsp;3)&nbsp;(scheme-report-environment&nbsp;5))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;21<br>
-<br>
-(let&nbsp;((f&nbsp;(eval&nbsp;'(lambda&nbsp;(f&nbsp;x)&nbsp;(f&nbsp;x&nbsp;x))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(null-environment&nbsp;5))))<br>
-&nbsp;&nbsp;(f&nbsp;+&nbsp;10))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;20<br>
-</p>
-</tt>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_602"></a>scheme-report-environment<i> version</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_604"></a>null-environment<i> version</i>)</tt>&nbsp;</div>
-
-<p>
-<i>Version</i> must be the exact integer <tt>5</tt>,
-corresponding to this revision of the Scheme report (the
-Revised<sup>5</sup> Report on Scheme).
-<tt>Scheme-report-environment</tt> returns a specifier for an
-environment that is empty except for all bindings defined in
-this report that are either required or both optional and
-supported by the implementation. <tt>Null-environment</tt> returns
-a specifier for an environment that is empty except for the
-(syntactic) bindings for all syntactic keywords defined in
-this report that are either required or both optional and
-supported by the implementation.</p>
-<p>
-Other values of <i>version</i> can be used to specify environments
-matching past revisions of this report, but their support is not
-required.  An implementation will signal an error if <i>version</i>
-is neither <tt>5</tt> nor another value supported by
-the implementation.</p>
-<p>
-The effect of assigning (through the use of <tt>eval</tt>) a variable
-bound in a <tt>scheme-report-environment</tt>
-(for example <tt>car</tt>) is unspecified.  Thus the environments specified
-by <tt>scheme-report-environment</tt> may be immutable.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>optional procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_606"></a>interaction-environment<i></i>)</tt>&nbsp;</div>
-
-<p>
-This procedure returns a specifier for the environment that
-contains implementation-defined bindings, typically a superset of
-those listed in the report.  The intent is that this procedure
-will return the environment in which the implementation would evaluate
-expressions dynamically typed by the user.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.6"></a>
-<h2><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.6">6.6&nbsp;&nbsp;Input and output</a></h2>
-<p></p>
-<a name="%_sec_6.6.1"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.6.1">6.6.1&nbsp;&nbsp;Ports</a></h3>
-<p></p>
-<p>
-Ports represent input and output devices.  To Scheme, an input port is a
-Scheme object that can deliver characters upon command, while an output port
-is a Scheme object that can accept characters. <a name="%_idx_608"></a></p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_610"></a>call-with-input-file<i> string proc</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_612"></a>call-with-output-file<i> string proc</i>)</tt>&nbsp;</div>
-
-<p>
-<i>String</i> should be a string naming a file, and
-<i>proc</i> should be a procedure that accepts one argument.
-For <tt>call-with-input-file</tt>,
-the file should already exist; for
-<tt>call-with-output-file</tt>,
-the effect is unspecified if the file
-already exists. These procedures call <i>proc</i> with one argument: the
-port obtained by opening the named file for input or output.  If the
-file cannot be opened, an error is signalled.  If <i>proc</i> returns,
-then the port is closed automatically and the value(s) yielded by the
-<i>proc</i> is(are) returned.  If <i>proc</i> does not return, then 
-the port will not be closed automatically unless it is possible to
-prove that the port will never again be used for a read or write
-operation.
-
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-Because Scheme's escape procedures have unlimited extent, it  is
-possible to escape from the current continuation but later to escape back in. 
-If implementations were permitted to close the port on any escape from the
-current continuation, then it would be impossible to write portable code using
-both <tt>call-with-current-continuation</tt> and <tt>call-with-input-file</tt> or
-<tt>call-with-output-file</tt>.
-
-</blockquote> 
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_614"></a>input-port?<i> obj</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_616"></a>output-port?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is an input port or output port
-respectively, otherwise returns <tt>#f</tt>.</p>
-<p>
-</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_618"></a>current-input-port<i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_620"></a>current-output-port<i></i>)</tt>&nbsp;</div>
-
-<p>
-Returns the current default input or output port.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>optional procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_622"></a>with-input-from-file<i> string thunk</i>)</tt>&nbsp;</div>
-
-<div align=left><u>optional procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_624"></a>with-output-to-file<i> string thunk</i>)</tt>&nbsp;</div>
-
-<p>
-<i>String</i> should be a string naming a file, and
-<i>proc</i> should be a procedure of no arguments.
-For <tt>with-input-from-file</tt>,
-the file should already exist; for
-<tt>with-output-to-file</tt>,
-the effect is unspecified if the file
-already exists.
-The file is opened for input or output, an input or output port
-connected to it is made the default value returned by
-<tt>current-input-port</tt> or <tt>current-output-port</tt>
-(and is used by <tt>(read)</tt>, <tt>(write <i>obj</i>)</tt>, and so forth),
-and the
-<i>thunk</i> is called with no arguments.  When the <i>thunk</i> returns,
-the port is closed and the previous default is restored.
-<tt>With-input-from-file</tt> and <tt>with-output-to-file</tt> return(s) the
-value(s) yielded by <i>thunk</i>.
-If an escape procedure
-is used to escape from the continuation of these procedures, their
-behavior is implementation dependent.</p>
-<p>
-
-
-</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_626"></a>open-input-file<i> filename</i>)</tt>&nbsp;</div>
-
-<p>
-Takes a string naming an existing file and returns an input port capable of
-delivering characters from the file.  If the file cannot be opened, an error is
-signalled.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_628"></a>open-output-file<i> filename</i>)</tt>&nbsp;</div>
-
-<p>
-Takes a string naming an output file to be created and returns an output
-port capable of writing characters to a new file by that name.  If the file
-cannot be opened, an error is signalled.  If a file with the given name
-already exists, the effect is unspecified.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_630"></a>close-input-port<i> port</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_632"></a>close-output-port<i> port</i>)</tt>&nbsp;</div>
-
-<p>
-Closes the file associated with <i>port</i>, rendering the <i>port</i>
-incapable of delivering or accepting characters.  
-These routines have no effect if the file has already been closed.
-The value returned is unspecified.</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.6.2"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.6.2">6.6.2&nbsp;&nbsp;Input</a></h3>
-<p></p>
-<p>
-   </p>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_634"></a>read<i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_636"></a>read<i> port</i>)</tt>&nbsp;</div>
-
-<p>
-<tt>Read</tt> converts external representations of Scheme objects into the
-objects themselves.  That is, it is a parser for the nonterminal
-&lt;datum&gt; (see sections&nbsp;<a href="r5rs-Z-H-10.html#%_sec_7.1.2">7.1.2</a> and
-<a href="#%_sec_6.3.2">6.3.2</a>).  <tt>Read</tt> returns the next
-object parsable from the given input <i>port</i>, updating <i>port</i> to point to
-the first character past the end of the external representation of the object.</p>
-<p>
-If an end of file is encountered in the input before any
-characters are found that can begin an object, then an end of file
-object is returned.   The port remains open, and further attempts
-to read will also return an end of file object.  If an end of file is
-encountered after the beginning of an object's external representation,
-but the external representation is incomplete and therefore not parsable,
-an error is signalled.</p>
-<p>
-The <i>port</i> argument may be omitted, in which case it defaults to the
-value returned by <tt>current-input-port</tt>.  It is an error to read from
-a closed port.
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_638"></a>read-char<i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_640"></a>read-char<i> port</i>)</tt>&nbsp;</div>
-
-<p>
-Returns the next character available from the input <i>port</i>, updating
-the <i>port</i> to point to the following character.  If no more characters
-are available, an end of file object is returned.  <i>Port</i> may be
-omitted, in which case it defaults to the value returned by <tt>current-input-port</tt>.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_642"></a>peek-char<i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_644"></a>peek-char<i> port</i>)</tt>&nbsp;</div>
-
-<p>
-Returns the next character available from the input <i>port</i>,
-<em>without</em> updating
-the <i>port</i> to point to the following character.  If no more characters
-are available, an end of file object is returned.  <i>Port</i> may be
-omitted, in which case it defaults to the value returned by <tt>current-input-port</tt>.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The value returned by a call to <tt>peek-char</tt> is the same as the
-value that would have been returned by a call to <tt>read-char</tt> with the
-same <i>port</i>.  The only difference is that the very next call to
-<tt>read-char</tt> or <tt>peek-char</tt> on that <i>port</i> will return the
-value returned by the preceding call to <tt>peek-char</tt>.  In particular, a call
-to <tt>peek-char</tt> on an interactive port will hang waiting for input
-whenever a call to <tt>read-char</tt> would have hung.
-</blockquote>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_646"></a>eof-object?<i> obj</i>)</tt>&nbsp;</div>
-
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is an end of file object, otherwise returns
-<tt>#f</tt>.  The precise set of end of file objects will vary among
-implementations, but in any case no end of file object will ever be an object
-that can be read in using <tt>read</tt>.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_648"></a>char-ready?<i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_650"></a>char-ready?<i> port</i>)</tt>&nbsp;</div>
-
-<p>
-Returns <tt>#t</tt> if a character is ready on the input <i>port</i> and
-returns <tt>#f</tt> otherwise.  If <tt>char-ready</tt> returns <tt>#t</tt> then
-the next <tt>read-char</tt> operation on the given <i>port</i> is guaranteed
-not to hang.  If the <i>port</i> is at end of file then <tt>char-ready?</tt>
-returns <tt>#t</tt>.  <i>Port</i> may be omitted, in which case it defaults to
-the value returned by <tt>current-input-port</tt>.</p>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-<tt>Char-ready?</tt> exists to make it possible for a program to
-accept characters from interactive ports without getting stuck waiting for
-input.  Any input editors associated with such ports must ensure that
-characters whose existence has been asserted by <tt>char-ready?</tt> cannot
-be rubbed out.  If <tt>char-ready?</tt> were to return <tt>#f</tt> at end of
-file, a port at end of file would be indistinguishable from an interactive
-port that has no ready characters.
-</blockquote>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.6.3"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.6.3">6.6.3&nbsp;&nbsp;Output</a></h3>
-<p></p>
-<p>
-
-</p>
-<p></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_652"></a>write<i> obj</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_654"></a>write<i> obj port</i>)</tt>&nbsp;</div>
-
-<p>
-Writes a written representation of <i>obj</i> to the given <i>port</i>.  Strings
-that appear in the written representation are enclosed in doublequotes, and
-within those strings backslash and doublequote characters are
-escaped by backslashes.
-Character objects are written using the <tt>#<tt>\</tt></tt> notation.
-<tt>Write</tt> returns an unspecified value.  The
-<i>port</i> argument may be omitted, in which case it defaults to the value
-returned by <tt>current-output-port</tt>.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_656"></a>display<i> obj</i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_658"></a>display<i> obj port</i>)</tt>&nbsp;</div>
-
-<p>
-Writes a representation of <i>obj</i> to the given <i>port</i>.  Strings
-that appear in the written representation are not enclosed in
-doublequotes, and no characters are escaped within those strings.  Character
-objects appear in the representation as if written by <tt>write-char</tt>
-instead of by <tt>write</tt>.  <tt>Display</tt> returns an unspecified value.
-The <i>port</i> argument may be omitted, in which case it defaults to the
-value returned by <tt>current-output-port</tt>.</p>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-<tt>Write</tt> is intended
-for producing machine-readable output and <tt>display</tt> is for producing
-human-readable output.  Implementations that allow ``slashification''
-within symbols will probably want <tt>write</tt> but not <tt>display</tt> to
-slashify funny characters in symbols.
-</blockquote>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_660"></a>newline<i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>library procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_662"></a>newline<i> port</i>)</tt>&nbsp;</div>
-
-<p>
-Writes an end of line to <i>port</i>.  Exactly how this is done differs
-from one operating system to another.  Returns an unspecified value.
-The <i>port</i> argument may be omitted, in which case it defaults to the
-value returned by <tt>current-output-port</tt>.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_664"></a>write-char<i> char</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_666"></a>write-char<i> char port</i>)</tt>&nbsp;</div>
-
-<p>
-Writes the character <i>char</i> (not an external representation of the
-character) to the given <i>port</i> and returns an unspecified value.  The
-<i>port</i> argument may be omitted, in which case it defaults to the value
-returned by <tt>current-output-port</tt>.</p>
-<p>
-</p>
-
-<p></p>
-<p>
-</p>
-<a name="%_sec_6.6.4"></a>
-<h3><a href="r5rs-Z-H-2.html#%_toc_%_sec_6.6.4">6.6.4&nbsp;&nbsp;System interface</a></h3>
-<p>Questions of system interface generally fall outside of the domain of this
-report.  However, the following operations are important enough to
-deserve description here.</p>
-<p>
-</p>
-<p></p>
-<div align=left><u>optional procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_668"></a>load<i> filename</i>)</tt>&nbsp;</div>
-
-<p>
-</p>
-<p>
-<i>Filename</i> should be a string naming an existing file
-containing Scheme source code.  The <tt>load</tt> procedure reads
-expressions and definitions from the file and evaluates them
-sequentially.  It is unspecified whether the results of the expressions
-are printed.  The <tt>load</tt> procedure does not affect the values
-returned by <tt>current-input-port</tt> and <tt>current-output-port</tt>.
-<tt>Load</tt> returns an unspecified value.</p>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-For portability, <tt>load</tt> must operate on source files.
-Its operation on other kinds of files necessarily varies among
-implementations.
-</blockquote>
-
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><u>optional procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_670"></a>transcript-on<i> filename</i>)</tt>&nbsp;</div>
-
-<div align=left><u>optional procedure:</u>&nbsp;&nbsp;<tt>(<a name="%_idx_672"></a>transcript-off<i></i>)</tt>&nbsp;</div>
-
-<p>
-<i>Filename</i> must be a string naming an output file to be
-created. The effect of <tt>transcript-on</tt> is to open the named file
-for output, and to cause a transcript of subsequent interaction between
-the user and the Scheme system to be written to the file.  The
-transcript is ended by a call to <tt>transcript-off</tt>, which closes the
-transcript file.  Only one transcript may be in progress at any time,
-though some implementations may relax this restriction.  The values
-returned by these procedures are unspecified.</p>
-<p>
-</p>
-
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p></p>
-<div class=navigation>[Go to <span><a href="r5rs.html">first</a>, <a href="r5rs-Z-H-8.html">previous</a></span><span>, <a href="r5rs-Z-H-10.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs.html b/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs.html
deleted file mode 100644
index ee76dbee6c..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-doc/r5rs/scribblings/r5rs-std/r5rs.html
+++ /dev/null
@@ -1,343 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!-- Generated from TeX source by tex2page, v 4p4, 
-     (c) Dorai Sitaram, http://www.cs.rice.edu/~dorai/tex2page -->
-<head>
-<title>
-Revised^5 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r5rs-Z-C.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-
-
-
-
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-  
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-  
-
-
-
-
-</p>
-<p>
-  
-
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-
-
-</p>
-<p>
-
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-  
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-                         
-                         
-
-                                                                
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<div align=center>
-<h1><br><br>Revised<sup>5</sup> Report on the Algorithmic Language Scheme</h1>
-<p>
-20 February 1998<br>
-<br>
-Richard Kelsey, William Clinger, and Jonathan Rees (<i>Editors</i>)<br>
-&nbsp;<br>
-<table width=100%>
-<tr><td>H. Abelson </td><td> R. K. Dybvig </td><td> C. T. Haynes </td><td> G. J. Rozas</td></tr>
-<tr><td>N. I. Adams IV </td><td> D. P. Friedman </td><td> E. Kohlbecker </td><td> G. L. Steele Jr.</td></tr>
-<tr><td>D. H. Bartley </td><td> R. Halstead </td><td> D. Oxley </td><td> G. J. Sussman</td></tr>
-<tr><td>G. Brooks </td><td> C. Hanson </td><td> K. M. Pitman </td><td> M. Wand</td></tr>
-</table><br>
-<em>Dedicated to the Memory of Robert Hieb</em>
-</p>
-<p></div>
-</p>
-<p></p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
- 
-
-
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<div class=navigation>[Go to <span class=disable>first, previous</span><span><span class=disable>, </span><a href="r5rs-Z-H-1.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r5rs-Z-H-2.html#%_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r5rs-Z-H-15.html#%_index_start">index</a></span>]</div>
-<p></p>
-</body>
-</html>
diff --git a/pkgs/r5rs-pkgs/r5rs-lib/LICENSE.txt b/pkgs/r5rs-pkgs/r5rs-lib/LICENSE.txt
deleted file mode 100644
index 3d808c60e2..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-r5rs-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/r5rs-pkgs/r5rs-lib/info.rkt b/pkgs/r5rs-pkgs/r5rs-lib/info.rkt
deleted file mode 100644
index 75b14f835d..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-lib/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("scheme-lib"
-               "base"
-               "compatibility-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"r5rs\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/info.rkt b/pkgs/r5rs-pkgs/r5rs-lib/r5rs/info.rkt
deleted file mode 100644
index 376a62d9ee..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define mzscheme-launcher-names '("PLT R5RS"))
-(define mzscheme-launcher-libraries '("run.rkt"))
diff --git a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/init.rkt b/pkgs/r5rs-pkgs/r5rs-lib/r5rs/init.rkt
deleted file mode 100644
index cb98484197..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/init.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scheme/base
-
-(read-case-sensitive #f)
-(read-accept-infix-dot #f)
-(read-curly-brace-as-paren #f)
-(read-square-bracket-as-paren #f)
-
-(print-mpair-curly-braces #f)
-;; Printing pairs with curly braces is a bad idea, because
-;;  syntax errors then use curly braces!
-
-(define-syntax out
-  (syntax-rules ()
-    [(_) (begin
-           (require "main.rkt")
-           (provide (all-from-out "main.rkt")))]))
-(out)
diff --git a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/lang.rkt b/pkgs/r5rs-pkgs/r5rs-lib/r5rs/lang.rkt
deleted file mode 100644
index eee7f80c00..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/lang.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-;; For backward compatibility. Use "main.rkt", instead.
-
-(module lang r5rs
-  (#%provide (all-from r5rs)))
diff --git a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/lang/reader.rkt b/pkgs/r5rs-pkgs/r5rs-lib/r5rs/lang/reader.rkt
deleted file mode 100644
index 91102a6ff4..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/lang/reader.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang s-exp syntax/module-reader
-
-r5rs
-
-#:wrapper1 (lambda (t)
-             (parameterize ([read-case-sensitive #f]
-                            [read-accept-infix-dot #f]
-                            [read-curly-brace-as-paren #f]
-                            [read-square-bracket-as-paren #f])
-               (t)))
diff --git a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/main.rkt b/pkgs/r5rs-pkgs/r5rs-lib/r5rs/main.rkt
deleted file mode 100644
index 59f3c9524a..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/main.rkt
+++ /dev/null
@@ -1,564 +0,0 @@
-(module main scheme/base
-  (require scheme/mpair
-           racket/undefined
-           (for-syntax scheme/base syntax/kerncase
-                       "private/r5rs-trans.rkt")
-           (only-in mzscheme transcript-on transcript-off))
-
-  (provide (for-syntax syntax-rules ...
-                       (rename-out [syntax-rules-only #%top]
-                                   [syntax-rules-only #%app]
-                                   [syntax-rules-only #%datum]))
-           (rename-out
-            [mcons cons]
-            [mcar car]
-            [mcdr cdr]
-            [set-mcar! set-car!]
-            [set-mcdr! set-cdr!]
-            [mpair? pair?]
-            [mmap map]
-            [mfor-each for-each])
-           = < > <= >= max min + - * / 
-           abs gcd lcm exp log sin cos tan not eq?
-           call-with-current-continuation make-string
-           symbol->string string->symbol make-rectangular 
-           exact->inexact inexact->exact number->string string->number 
-           rationalize output-port? current-input-port current-output-port current-error-port 
-           open-input-file open-output-file close-input-port close-output-port
-           with-output-to-file transcript-on transcript-off flush-output
-           string-length string-ci<=? string-ci>=? string-append 
-           string-fill!
-           (rename-out [string->mlist string->list]
-                       [mlist->string list->string])
-           vector-length vector-fill!
-           (rename-out [vector->mlist vector->list]
-                       [mlist->vector list->vector])
-           char-alphabetic? char-numeric? char-whitespace? 
-           char-upper-case? char-lower-case? char->integer integer->char char-downcase
-           call-with-output-file call-with-input-file with-input-from-file
-           (rename-out [mapply apply]) symbol?
-           null?
-           (rename-out [mlist? list?]
-                       [mlist list]
-                       [mlength length]
-                       [mappend append]
-                       [mreverse reverse]
-                       [mlist-tail list-tail]
-                       [mlist-ref list-ref]
-                       [mmemq memq]
-                       [mmemv memv]
-                       [mmember member]
-                       [massq assq]
-                       [massv assv]
-                       [massoc assoc])
-           procedure?
-           number? complex? real? rational? integer? exact? inexact? zero?
-           positive? negative? odd? even? 
-           quotient remainder modulo floor ceiling truncate round 
-           numerator denominator asin acos atan sqrt
-           expt make-polar real-part imag-part angle magnitude input-port?
-           (rename-out [mread read])
-           read-char peek-char eof-object?
-           char-ready? 
-           (rename-out [mwrite write]
-                       [mdisplay display])
-           newline write-char load 
-           string? string string-ref string-set! string=? substring string-copy
-           string-ci=? string<? string>? string<=? string>=? string-ci<? string-ci>?
-           vector? make-vector vector vector-ref vector-set! 
-           char? char=? char<? char>? char<=? char>=? 
-           char-ci=? char-ci<? char-ci>? char-ci<=? char-ci>=? 
-           char-upcase boolean? eqv? equal? 
-           (rename-out [r5rs:force force])
-           call-with-values values dynamic-wind
-           (rename-out [meval eval])
-           scheme-report-environment null-environment interaction-environment)
-
-  ;; Because mcar and mcdr are inlined by the JIT
-  (define-syntax provide-inlined-combo
-    (syntax-rules ()
-      [(_ id orig mc1r mc2r)
-       (begin
-         (define proc-id
-           (let ([id (lambda (x) (mc1r (mc2r x)))])
-             id))
-         (define-syntax id
-           (syntax-id-rules (set!)
-             [(_ x) (mc1r (mc2r x))]
-             [(set! _ v) (set! orig v)]
-             [(_ . args) (proc-id . args)]
-             [_ proc-id]))
-         (provide (rename-out [id orig])))]))
-
-  (provide-inlined-combo mcaar caar mcar mcar)
-  (provide-inlined-combo mcadr cadr mcar mcdr)
-  (provide-inlined-combo mcdar cdar mcdr mcar)
-  (provide-inlined-combo mcddr cddr mcdr mcdr)
-
-  (define-syntax (provide-combination stx)
-    (syntax-case stx ()
-      [(_ id)
-       (with-syntax ([body
-                      (let loop ([ops (let ([s (symbol->string (syntax-e #'id))])
-                                        (string->list (substring s 1 (sub1 (string-length s)))))])
-                        (if (null? ops)
-                            'x
-                            `(,(if (equal? (car ops) #\a) 'mcar 'mcdr)
-                              ,(loop (cdr ops)))))]
-                     [mid (datum->syntax #'id
-                                         (string->symbol (format "m~a" (syntax-e #'id)))
-                                         #'id)])
-         #'(begin
-             (define mid (lambda (x) body))
-             (provide (rename-out [mid id]))))]
-      [(_ id ...) #'(begin (provide-combination id) ...)]))
-
-  (provide-combination caaar caadr cadar caddr cdaar cdadr cddar cdddr
-                       caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr
-                       cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr)
-
-
-  (define (string->mlist s) (list->mlist (string->list s)))
-  (define (mlist->string s) (list->string (mlist->list s)))
-
-  (define (vector->mlist s) (list->mlist (vector->list s)))
-  (define (mlist->vector s) (list->vector (mlist->list s)))
-
-  (define mapply
-    (case-lambda
-     [(f l) (apply f (mlist->list l))]
-     [(f l0 . l)
-      (apply f (let loop ([l (cons l0 l)])
-                 (if (null? (cdr l))
-                     (mlist->list (car l))
-                     (cons (car l) (loop (cdr l))))))]))
-
-  ;; --------------------------------------------------
-
-  (define mread
-    (case-lambda
-     [() (mread (current-input-port))]
-     [(port) (let loop ([v (read port)])
-               (cond
-                [(pair? v) (mcons (loop (car v)) (loop (cdr v)))]
-                [(vector? v) (list->vector
-                              (map loop (vector->list v)))]
-                [else v]))]))
-
-  (define mwrite
-    (case-lambda
-     [(v) (mwrite v (current-output-port))]
-     [(v port) (parameterize ([print-mpair-curly-braces #f])
-                 (write v port))]))
-
-  (define mdisplay
-    (case-lambda
-     [(v) (mdisplay v (current-output-port))]
-     [(v port) (parameterize ([print-mpair-curly-braces #f])
-                 (display v port))]))
-
-  ;; --------------------------------------------------
-
-  (define (to-mutable v)
-    (cond
-     [(pair? v) (mcons (to-mutable (car v))
-                       (to-mutable (cdr v)))]
-     [(vector? v) (list->vector
-                   (map to-mutable (vector->list v)))]
-     [else v]))
-
-  (define-syntax (r5rs:quote stx)
-    (syntax-case stx ()
-      [(_ form)
-       ;; Look for quoted pairs:
-       (if (let loop ([form #'form])
-             (syntax-case form ()
-               [(a . b) #t]
-               [#(a ...)
-                (ormap loop (syntax->list #'(a ...)))]
-               [_ #f]))
-           ;; quote has to create mpairs:
-           (syntax-local-lift-expression #'(to-mutable 'form))
-           ;; no pairs to worry about:
-           #'(quote form))]))
-
-   (define-syntax (r5rs:quasiquote stx)
-     (syntax-case stx ()
-       [(_ form)
-        ;; Look for unquote or unquote-splicing.
-        ;; This should be improved to discount unquote[-splicing]
-        ;; under a nested quasiquote.
-        (if (let loop ([form #'form])
-              (syntax-case form (unquote unquote-splicing)
-                [unquote #t]
-                [unquote-splicing #t]
-                [(a . b) (or (loop #'a) (loop #'b))]
-                [#(a ...)
-                 (ormap loop (syntax->list #'(a ...)))]
-                [_ #f]))
-            ;; Found an unquote[-splicing], so convert:
-            (let loop ([form #'form][depth 0])
-              (syntax-case form (unquote unquote-splicing r5rs:quasiquote)
-                [(unquote e) 
-                 (if (zero? depth)
-                     #'e
-                     #`(mcons 'unquote
-                              #,(loop (cdr (syntax-e form)) (sub1 depth))))]
-                [unquote
-                 (zero? depth)
-                 (raise-syntax-error
-                  'unquote
-                  "invalid context within quasiquote"
-                  stx
-                  form)]
-                [((unquote-splicing e) . rest)
-                 (if (zero? depth)
-                     (if (null? (syntax-e #'rest))
-                         #'e ;; Note: we're not check for a list
-                         #`(mappend e #,(loop #'rest depth)))
-                     #`(mcons (mcons 'unquote-splicing
-                                     #,(loop #'(e) (sub1 depth)))
-                              #,(loop #'rest depth)))]
-                [unquote-splicing 
-                 (zero? depth)
-                 (raise-syntax-error
-                  'unquote-splicing 
-                  "invalid context within quasiquote"
-                  stx
-                  form)]
-                [(r5rs:quasiquote . e)
-                 #`(mcons 'quasiquote #,(loop #'e (add1 depth)))]
-                [(a . b)
-                 #`(mcons #,(loop #'a depth) #,(loop #'b depth))]
-                [#(unquote a ...)
-                 (raise-syntax-error
-                  'unquote
-                  "invalid context within quasiquote"
-                  stx
-                  form)]
-                [#(a ...)
-                 #`(mlist->vector #,(loop (syntax->list #'(a ...)) depth))]
-                [other #'(r5rs:quote other)]))
-            ;; None, so just use R5RS quote:
-            #'(r5rs:quote form))]))
-
-  ;; The difference between R5RS `letrec` and Racket `letrec` (or
-  ;; R6RS `letrec*`) is that all right-hand sides are evaluated
-  ;; before any binding is initialized. We can get this effect
-  ;; by using `letrec-values` and a single clause:
-  (define-syntax (r5rs:letrec stx)
-    (syntax-case stx (r5rs:lambda)
-      ((r5rs:letrec ((var1 init1) ...) body ...)
-       (syntax/loc stx
-         (letrec-values ([(var1 ...)
-                          (values init1 ...)])
-           (r5rs:body
-            body ...))))))
-
-  (define-syntax (r5rs:lambda stx)
-    ;; Convert rest-arg list to mlist, and use r5rs:body:
-    (syntax-case stx ()
-      [(_ (id ...) . body)
-       (syntax/loc stx (#%plain-lambda (id ...) (r5rs:body . body)))]
-      [(_ (id ... . rest) . body)
-       (syntax/loc stx
-         (#%plain-lambda (id ... . rest)
-                         (let ([rest (list->mlist rest)])
-                           (r5rs:body . body))))]))
-
-  (define-syntax (r5rs:define stx)
-    ;; Use r5rs:lambda
-    (syntax-case stx ()
-      [(_ (id . args) . body)
-       (with-syntax ([proc
-                      (syntax/loc stx
-                        (r5rs:lambda args . body))])
-         (syntax/loc stx
-           (define id proc)))]
-      [(_ . rest)
-       (syntax/loc stx
-         (define . rest))]))
-
-  (define-syntax (r5rs:define-syntax stx)
-    ;; Disallow in internal-definition contexts:
-    (when (pair? (syntax-local-context))
-      (raise-syntax-error
-       #f
-       "disallowed as an internal definition"
-       stx))
-    (syntax-case stx ()
-      [(_ id expr)
-       (identifier? #'id)
-       (syntax/loc stx
-         (define-syntax id expr))]))
-
-  (define-syntax r5rs:if
-    (syntax-rules ()
-      [(_ test then)
-       (if test then (void))]
-      [(_ test then else)
-       (if test then else)]))
-
-  ;; Essentially from Dybvig:
-  (define-syntax r5rs:delay
-    (lambda (x)
-      (syntax-case x ()
-	((delay exp)
-	 (syntax/loc x (make-promise (lambda () exp)))))))
-  
-  (define-struct promise (p) #:mutable)
-  
-  (define (r5rs:force p)
-    (unless (promise? p)
-      (raise-type-error 'force "promise" p))
-    (let ([v (promise-p p)])
-      (if (procedure? v)
-	  (let ([v (call-with-values v list)])
-	    (when (procedure? (promise-p p))
-	      (set-promise-p! p v))
-	    (apply values (promise-p p)))
-	  (apply values v))))
-
-  (define-syntax r5rs:let
-    (syntax-rules ()
-      [(_ (binding ...) . body)
-       (let (binding ...) (r5rs:body . body))]
-      [(_ id (binding ...) . body)
-       (let id (binding ...) (r5rs:body . body))]))
-  (define-syntax-rule (r5rs:let* bindings . body)
-    (let* bindings (r5rs:body . body)))
-  (define-syntax-rule (r5rs:let-syntax bindings . body)
-    (let-syntax bindings (r5rs:body . body)))
-  (define-syntax-rule (r5rs:letrec-syntax bindings . body)
-    (letrec-syntax bindings (r5rs:body . body)))
-
-  (define-syntax (r5rs:body stx)
-    (syntax-case stx (let)
-      [(_ (let () . body))
-       #'(let () . body)]
-      [_
-       ;; Convert internal definitions to `r5rs:letrec', as opposed
-       ;; to `letrec'.
-       (let ([def-ctx (syntax-local-make-definition-context)]
-             [ctx (list (gensym 'intdef))]
-             [kernel-forms (kernel-form-identifier-list)]
-             [init-exprs (let ([v (syntax->list stx)])
-                           (unless v
-                             (raise-syntax-error #f "bad syntax" stx))
-                           (cdr v))])
-         (with-syntax ([(exprs ((id ...) ...) (rhs ...) (stx-ids ...) (stx-rhs ...))
-                        (let loop ([exprs init-exprs]
-                                   [idss null][rhss null]
-                                   [stx-idss null][stx-rhss null])
-                          (if (null? exprs)
-                              (raise-syntax-error
-                               #f
-                               "no expression in body"
-                               stx)
-                              (let ([expr (local-expand (car exprs) ctx kernel-forms def-ctx)])
-                                (syntax-case expr (begin define-syntaxes define-values)
-                                  [(begin . rest)
-                                   (let ([l (syntax->list #'rest)])
-                                     (if l
-                                         (loop (append l (cdr exprs)) idss rhss stx-idss stx-rhss)
-                                         (raise-syntax-error #f expr "bad syntax")))]
-                                  [(define-syntaxes (id ...) rhs)
-                                   (andmap identifier? (syntax->list #'(id ...)))
-                                   (with-syntax ([rhs (local-transformer-expand
-                                                       #'rhs
-                                                       'expression
-                                                       null)])
-                                     (syntax-local-bind-syntaxes
-                                      (syntax->list #'(id ...))
-                                      #'rhs def-ctx)
-                                     (loop (cdr exprs)
-                                           idss rhss
-                                           (cons #'(id ...) stx-idss)
-                                           (cons #'rhs stx-rhss)))]
-                                  [(define-values (id ...) rhs)
-                                   (andmap identifier? (syntax->list #'(id ...)))
-                                   (let ([ids (syntax->list #'(id ...))])
-                                     (syntax-local-bind-syntaxes ids #f def-ctx)
-                                     (loop (cdr exprs)
-                                           (cons #'(id ...) idss)
-                                           (cons #'rhs rhss)
-                                           stx-idss stx-rhss))]
-                                  [else 
-                                   (list (cons expr
-                                               (map (lambda (expr)
-                                                      (local-expand expr ctx kernel-forms def-ctx))
-                                                    (cdr exprs)))
-                                         (reverse idss) (reverse rhss)
-                                         (reverse stx-idss) (reverse stx-rhss))]))))])
-           (internal-definition-context-seal def-ctx)
-           (if (and (null? (syntax-e #'(stx-rhs ...)))
-                    (andmap (lambda (ids)
-                              (= 1 (length (syntax->list ids))))
-                            (syntax->list #'((id ...) ...))))
-               ;; This is the normal case: use `r5rs:letrec':
-               #`(r5rs:letrec ([id ... rhs] ...)
-                              (let () . exprs))
-               ;; Unusual case: need to expand to `set!' manually:
-               (with-syntax ([((tmp-id ...) ...)
-                              (map (lambda (ids)
-                                     (generate-temporaries ids))
-                                   (syntax->list #'((id ...) ...)))])
-                 #`(letrec-syntaxes+values 
-                       ([stx-ids stx-rhs] ...)
-                       ([(id ...) (values (mk-undefined id) ...)] ...)
-                     (let-values ([(tmp-id ...) rhs] ...)
-                       (begin (set! id tmp-id) ...) ...
-                       . exprs))))))]))
-
-  (define-syntax (r5rs:case stx)
-    ;; Racket's `case' uses `equal?' and allows internal definitions,
-    ;; this one uses `eqv?' and allows only expressions in clauses.
-    (define (convert-case stx)
-      (with-syntax ([(clause ...)
-                     (map (lambda (clause)
-                            (syntax-case clause ()
-                              [[datums rhs ...]
-                               (syntax/loc clause
-                                 [datums (#%expression rhs) ...])]
-                              [else 
-                               ;; bad syntax
-                               clause]))
-                          (cddr (syntax->list stx)))]
-                    [(_ expr . _) stx])
-        (syntax/loc stx
-          (case expr clause ...))))
-    (define (eqv-is-equal-datum? e)
-      (define v (syntax-e e))
-      (or (null? v)
-          (number? v)
-          (char? v)
-          (symbol? v)
-          (boolean? v)))
-    (syntax-case stx (else)
-      [(_ expr [(datum ...) . _] ... [else . _])
-       (andmap eqv-is-equal-datum? (syntax->list #'(datum ... ...)))
-       ;; normal `case' with `else'
-       (convert-case stx)]
-      [(_ expr [(datum ...) . _] ...)
-       ;; normal `case' without `else'
-       (andmap eqv-is-equal-datum? (syntax->list #'(datum ... ...)))
-       (convert-case stx)]
-      [(_ expr [datums rhs ...] ...)
-       ;; weird `case' clause
-       (with-syntax ([(clause ...)
-                      (map (lambda (clause)
-                             (syntax-case clause (else)
-                               [[else rhs ...]
-                                (with-syntax ([(els . _) clause])
-                                  (syntax/loc clause
-                                    [els (#%expression rhs) ...]))]
-                               [[datums rhs ...]
-                                (syntax/loc clause
-                                  [(memv v '(datums)) (#%expression rhs) ...])]))
-                           (cddr (syntax->list stx)))])
-         (syntax/loc stx
-           (let ([v expr])
-             (cond clause ...))))]
-      [else
-       ;; let `case' complain about syntax:
-       (with-syntax ([(_ . rest) stx])
-         (syntax/loc stx (case . rest)))]))
-
-  (define-syntax (r5rs:cond stx)
-    ;; Racket's `cond' allows internal definitions,
-    ;; this one allows only expressions in clauses.
-    (syntax-case stx ()
-      [(_ clause ...)
-       (with-syntax ([(new-clause ...)
-                      (map (lambda (clause)
-                             (syntax-case clause (else =>)
-                               [[else rhs ...]
-                                (with-syntax ([(els . _) clause])
-                                  (syntax/loc clause
-                                    [els (#%expression rhs) ...]))]
-                               [[expr => rhs]
-                                clause]
-                               [[expr rhs ...]
-                                (syntax/loc clause
-                                  [expr (#%expression rhs) ...])]))
-                           (syntax->list #'(clause ...)))])
-         (syntax/loc stx
-           (cond new-clause ...)))]
-      [else
-       ;; let `cond' complain about syntax:
-       (with-syntax ([(_ . rest) stx])
-         (syntax/loc stx (cond . rest)))]))
-
-
-  (define-syntax-rule (mk-undefined id) undefined)
-    
-  (provide unquote unquote-splicing 
-	   (rename-out [r5rs:quote quote]
-                       [r5rs:quasiquote quasiquote]
-                       [r5rs:if if]
-                       [r5rs:lambda lambda]
-                       [r5rs:letrec letrec]
-                       [r5rs:define define]
-                       [r5rs:define-syntax define-syntax]
-                       [r5rs:delay delay]
-                       [r5rs:let let]
-                       [r5rs:let* let*]
-                       [r5rs:let-syntax let-syntax]
-                       [r5rs:letrec-syntax letrec-syntax]
-                       [r5rs:case case]
-                       [r5rs:cond cond])
-           and or do
-	   begin set!
-           => else
-
-	   ;; We have to include the following Racket-isms to do anything,
-	   ;; but they're not legal R5RS names, anyway.
-           (rename-out [#%plain-module-begin #%module-begin])
-	   #%app #%datum #%top #%top-interaction 
-           #%require #%provide #%expression)
-  
-  ;; --------------------------------------------------
-
-  (define-namespace-anchor here)
-
-  (define (scheme-report-environment n)
-    (unless (= n 5)
-      (raise-type-error 'scheme-report-environment "5" n))
-    (mk-r5rs #f))
-
-  (define (null-environment n)
-    (unless (= n 5)
-      (raise-type-error 'null-environment "5" n))
-    (mk-r5rs #t))
-
-  (define (mk-r5rs stx-only?)
-    (let ([n (namespace-anchor->empty-namespace here)])
-      (parameterize ([current-namespace n])
-        (if stx-only?
-            (namespace-require '(only r5rs
-                                      quote quasiquote
-                                      if lambda letrec
-                                      let and or cond case define delay do
-                                      let* begin set!
-                                      define-syntax let-syntax letrec-syntax
-                                      => else
-                                      #%app #%datum #%top #%top-interaction
-                                      #%require #%provide #%expression))
-            (begin
-              (namespace-require 'r5rs) ; for syntax
-              (namespace-require/copy 'r5rs))))
-      n))
-
-  (define (interaction-environment)
-    (current-namespace))
-
-  (define (meval expr env)
-    (eval (let loop ([expr expr])
-            (cond
-             [(mpair? expr)
-              (cons (loop (mcar expr))
-                    (loop (mcdr expr)))]
-             [(vector? expr)
-              (list->vector (map loop (vector->list expr)))]
-             [else expr]))
-          env)))
diff --git a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/private/r5rs-trans.rkt b/pkgs/r5rs-pkgs/r5rs-lib/r5rs/private/r5rs-trans.rkt
deleted file mode 100644
index 62fa57ccef..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/private/r5rs-trans.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang scheme/base
-(require (for-syntax scheme/base))
-(provide syntax-rules-only)
-
-(define-syntax (syntax-rules-only stx)
-  (syntax-case stx ()
-    [(_ . form)
-     (raise-syntax-error
-      'macro-transformer
-      "only a `syntax-rules' form is allowed"
-      #'form)]))
diff --git a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/r5rs.rkt b/pkgs/r5rs-pkgs/r5rs-lib/r5rs/r5rs.rkt
deleted file mode 100644
index 39b322bcab..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/r5rs.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-(module r5rs "main.rkt"
-  (#%require (only scheme/base provide all-from-out))
-  (provide (all-from-out "main.rkt")))
diff --git a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/run.rkt b/pkgs/r5rs-pkgs/r5rs-lib/r5rs/run.rkt
deleted file mode 100644
index 57a2056924..0000000000
--- a/pkgs/r5rs-pkgs/r5rs-lib/r5rs/run.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang scheme/base
-(require scheme/cmdline)
-
-(define slow (make-parameter #f))
-
-(define-values (main args)
-  (command-line
-   #:once-each
-   [("--no-prim") "allow redefinition of primitives (implies worse performance)"
-    (slow #t)]
-   #:handlers
-   (case-lambda
-    [(x) (values #f null)]
-    [(x file . args) (values file args)])
-   '("file" "arg")))
-
-(if (slow)
-    (namespace-require/copy 'r5rs/init)
-    (namespace-require/constant 'r5rs/init))
-
-(current-command-line-arguments (apply vector-immutable args))
-(if main
-    ;; File load mode:
-    (load main)
-    ;; REPL mode:
-    (begin
-      (display (banner))
-      (printf "R5RS legacy support loaded\n")
-      ;; Load .pltr5rsrc
-      (let-values ([(base name dir?) (split-path (find-system-path 'init-file))])
-        (let ([f (build-path base (bytes->path-element
-                                   (regexp-replace #rx#"mzscheme"
-                                                   (path-element->bytes name)
-                                                   #"pltr5rs")))])
-          (when (file-exists? f)
-            (load f))))
-      (read-eval-print-loop)))
diff --git a/pkgs/r5rs-pkgs/r5rs/LICENSE.txt b/pkgs/r5rs-pkgs/r5rs/LICENSE.txt
deleted file mode 100644
index c1c78ec00c..0000000000
--- a/pkgs/r5rs-pkgs/r5rs/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-r5rs
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/r5rs-pkgs/r5rs/info.rkt b/pkgs/r5rs-pkgs/r5rs/info.rkt
deleted file mode 100644
index f04c1cc26a..0000000000
--- a/pkgs/r5rs-pkgs/r5rs/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("r5rs-lib"
-               "r5rs-doc"))
-(define implies '("r5rs-lib"
-                  "r5rs-doc"))
-
-(define pkg-desc "Legacy R5RS (Scheme) language")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/LICENSE.txt b/pkgs/r6rs-pkgs/r6rs-doc/LICENSE.txt
deleted file mode 100644
index 43dab97467..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-r6rs-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/info.rkt b/pkgs/r6rs-pkgs/r6rs-doc/info.rkt
deleted file mode 100644
index ca6b88dda4..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("racket-index"
-                     "r5rs-doc"
-                     "base"
-                     "scribble-lib"
-                     "r6rs-lib"
-                     "racket-doc"))
-(define update-implies '("r6rs-lib"))
-
-(define pkg-desc "documentation part of \"r6rs\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/info.rkt b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/info.rkt
deleted file mode 100644
index d6d18b8246..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("r6rs.scrbl" (multi-page) (language 1))))
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/index.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/index.html
deleted file mode 100644
index 53f2ed0d15..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/index.html
+++ /dev/null
@@ -1,456 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span class=disable>first, previous</span><span><span class=disable>, </span><a href="r6rs-lib-Z-H-1.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
- 
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-  
-
-
-
-
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</p>
-<p>
-  
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-  
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<h1 class=title></h1>
-<p></p>
-<div align=center>
-<p></p>
-</div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
- </p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<div align=center><table><tr><td>
-   <span class=huge><strong>Revised<span class=hugecap><sup><span class=tiny>6</span></sup></span> Report on the Algorithmic Language <br>
-<div style="height: 3.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">Scheme<br>
-<div style="height: 6.75pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">&#8212; Standard Libraries &#8212;</strong></span></p>
-</td></tr><tr><td>
-<p>
-<div style="height: 4.5pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<div class=mathdisplay align=left><table><tr><td>
-
-
-<table border=0><tr><td valign=top  colspan=4>M<span class=scriptsize>ICHAEL</span> S<span class=scriptsize>PERBER</span>
-</td></tr>
-<tr><td valign=top  colspan=4>R. K<span class=scriptsize>ENT</span> D<span class=scriptsize>YBVIG</span>,
-M<span class=scriptsize>ATTHEW</span> F<span class=scriptsize>LATT</span>,
-A<span class=scriptsize>NTON</span> <span class=scriptsize>VAN</span> S<span class=scriptsize>TRAATEN</span>
-</td></tr>
-<tr><td valign=top  colspan=4>(<i>Editors</i>) </td></tr>
-<tr><td valign=top  colspan=4>
-R<span class=scriptsize>ICHARD</span> K<span class=scriptsize>ELSEY</span>, W<span class=scriptsize>ILLIAM</span> C<span class=scriptsize>LINGER</span>,
-J<span class=scriptsize>ONATHAN</span> R<span class=scriptsize>EES</span> </td></tr>
-<tr><td valign=top  colspan=4>(<i>Editors, Revised<sup>5</sup> Report on the
-Algorithmic Language Scheme</i>) </td></tr>
-<tr><td valign=top  colspan=4><strong>26 September 2007</strong>
-</td></tr></table>
-</td></tr></table></div>
-<p class=noindent></p>
-</td></tr><tr><td>
-<p>
-</p>
-</td></tr></table></div>
-<p>
-The report gives a defining description of the standard libraries of
-the programming language Scheme.</p>
-<p>
-This report frequently refers back to the <i>Revised<sup>6</sup> Report
-on the Algorithmic Language Scheme</i>&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_11">11</a>]; references to the
-report are identified by designations such as &#8220;report section&#8221; or
-&#8220;report chapter&#8221;.
-</p>
-<p>
-</p>
-<div class=medskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-Parts of the library report are derived from earlier revisions of the
-report&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_8">8</a>].  We gratefully acknowledge their authors for their
-contributions.  More detailed information on authorship can be found
-at the beginning of the <i>Revised<sup>6</sup> Report on the Algorithmic
-Language Scheme</i>.</p>
-<p>
-</p>
-<div class=medskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-We intend this report to belong to the entire Scheme community, and so
-we grant permission to copy it in whole or in part without fee.  In
-particular, we encourage implementors of Scheme to use this report as
-a starting point for manuals and other documentation, modifying it as
-necessary.</p>
-<p>
-</p>
-<div class=bigskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span class=disable>first, previous</span><span><span class=disable>, </span><a href="r6rs-lib-Z-H-1.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-<div align=right class=colophon>Last modified: Wednesday, September 26th, 2007 5:22:26pm MET-1MST-2,M3.5.0,M10.5.0<br></div>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-1.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-1.gif
deleted file mode 100644
index 817d767f81..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-1.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-2.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-2.gif
deleted file mode 100644
index c086bc604e..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-2.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-3.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-3.gif
deleted file mode 100644
index 7f74ebb665..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-3.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-4.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-4.gif
deleted file mode 100644
index 766aa32044..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-G-4.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-1.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-1.html
deleted file mode 100644
index 7d890e20d0..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-1.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-2.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span class=disable>contents</span><span><span class=disable>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_Temp_1"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-Contents</h1>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-                    <a name="node_toc_start"></a></p>
-
-<p class=noindent></p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_1"></a><a href="r6rs-lib-Z-H-2.html#node_chap_1">1&nbsp;&nbsp;Unicode</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.1"></a><a href="r6rs-lib-Z-H-2.html#node_sec_1.1">1.1&nbsp;&nbsp;Characters</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.2"></a><a href="r6rs-lib-Z-H-2.html#node_sec_1.2">1.2&nbsp;&nbsp;Strings</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_2"></a><a href="r6rs-lib-Z-H-3.html#node_chap_2">2&nbsp;&nbsp;Bytevectors</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_2.1"></a><a href="r6rs-lib-Z-H-3.html#node_sec_2.1">2.1&nbsp;&nbsp;Endianness</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_2.2"></a><a href="r6rs-lib-Z-H-3.html#node_sec_2.2">2.2&nbsp;&nbsp;General operations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_2.3"></a><a href="r6rs-lib-Z-H-3.html#node_sec_2.3">2.3&nbsp;&nbsp;Operations on bytes and octets</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_2.4"></a><a href="r6rs-lib-Z-H-3.html#node_sec_2.4">2.4&nbsp;&nbsp;Operations on integers of arbitrary size</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_2.5"></a><a href="r6rs-lib-Z-H-3.html#node_sec_2.5">2.5&nbsp;&nbsp;Operations on 16-bit integers</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_2.6"></a><a href="r6rs-lib-Z-H-3.html#node_sec_2.6">2.6&nbsp;&nbsp;Operations on 32-bit integers</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_2.7"></a><a href="r6rs-lib-Z-H-3.html#node_sec_2.7">2.7&nbsp;&nbsp;Operations on 64-bit integers</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_2.8"></a><a href="r6rs-lib-Z-H-3.html#node_sec_2.8">2.8&nbsp;&nbsp;Operations on IEEE-754 representations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_2.9"></a><a href="r6rs-lib-Z-H-3.html#node_sec_2.9">2.9&nbsp;&nbsp;Operations on strings</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_3"></a><a href="r6rs-lib-Z-H-4.html#node_chap_3">3&nbsp;&nbsp;List utilities</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_4"></a><a href="r6rs-lib-Z-H-5.html#node_chap_4">4&nbsp;&nbsp;Sorting</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_5"></a><a href="r6rs-lib-Z-H-6.html#node_chap_5">5&nbsp;&nbsp;Control structures</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_6"></a><a href="r6rs-lib-Z-H-7.html#node_chap_6">6&nbsp;&nbsp;Records</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_6.1"></a><a href="r6rs-lib-Z-H-7.html#node_sec_6.1">6.1&nbsp;&nbsp;Mutability and equivalence of records</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_6.2"></a><a href="r6rs-lib-Z-H-7.html#node_sec_6.2">6.2&nbsp;&nbsp;Syntactic layer</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_6.3"></a><a href="r6rs-lib-Z-H-7.html#node_sec_6.3">6.3&nbsp;&nbsp;Procedural layer</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_6.4"></a><a href="r6rs-lib-Z-H-7.html#node_sec_6.4">6.4&nbsp;&nbsp;Inspection</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_7"></a><a href="r6rs-lib-Z-H-8.html#node_chap_7">7&nbsp;&nbsp;Exceptions and conditions</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_7.1"></a><a href="r6rs-lib-Z-H-8.html#node_sec_7.1">7.1&nbsp;&nbsp;Exceptions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_7.2"></a><a href="r6rs-lib-Z-H-8.html#node_sec_7.2">7.2&nbsp;&nbsp;Conditions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_7.2.1"></a><a href="r6rs-lib-Z-H-8.html#node_sec_7.2.1">7.2.1&nbsp;&nbsp;Condition objects</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_7.3"></a><a href="r6rs-lib-Z-H-8.html#node_sec_7.3">7.3&nbsp;&nbsp;Standard condition types</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_8"></a><a href="r6rs-lib-Z-H-9.html#node_chap_8">8&nbsp;&nbsp;I/O</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.1"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.1">8.1&nbsp;&nbsp;Condition types</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2">8.2&nbsp;&nbsp;Port I/O</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.1"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.1">8.2.1&nbsp;&nbsp;File names</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.2"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.2">8.2.2&nbsp;&nbsp;File options</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.3"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.3">8.2.3&nbsp;&nbsp;Buffer modes</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.4"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.4">8.2.4&nbsp;&nbsp;Transcoders</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.5"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.5">8.2.5&nbsp;&nbsp;End-of-file object</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.6"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.6">8.2.6&nbsp;&nbsp;Input and output ports</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.7"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.7">8.2.7&nbsp;&nbsp;Input ports</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.8"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.8">8.2.8&nbsp;&nbsp;Binary input</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.9"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.9">8.2.9&nbsp;&nbsp;Textual input</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.10"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.10">8.2.10&nbsp;&nbsp;Output ports</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.11"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.11">8.2.11&nbsp;&nbsp;Binary output</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.12"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.12">8.2.12&nbsp;&nbsp;Textual output</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2.13"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.2.13">8.2.13&nbsp;&nbsp;Input/output ports</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.3"></a><a href="r6rs-lib-Z-H-9.html#node_sec_8.3">8.3&nbsp;&nbsp;Simple I/O</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_9"></a><a href="r6rs-lib-Z-H-10.html#node_chap_9">9&nbsp;&nbsp;File system</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_10"></a><a href="r6rs-lib-Z-H-11.html#node_chap_10">10&nbsp;&nbsp;Command-line access and exit values</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_11"></a><a href="r6rs-lib-Z-H-12.html#node_chap_11">11&nbsp;&nbsp;Arithmetic</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.1"></a><a href="r6rs-lib-Z-H-12.html#node_sec_11.1">11.1&nbsp;&nbsp;Bitwise operations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.2"></a><a href="r6rs-lib-Z-H-12.html#node_sec_11.2">11.2&nbsp;&nbsp;Fixnums</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.3"></a><a href="r6rs-lib-Z-H-12.html#node_sec_11.3">11.3&nbsp;&nbsp;Flonums</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.4"></a><a href="r6rs-lib-Z-H-12.html#node_sec_11.4">11.4&nbsp;&nbsp;Exact bitwise arithmetic</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_12"></a><a href="r6rs-lib-Z-H-13.html#node_chap_12">12&nbsp;&nbsp;<tt>syntax-case</tt></a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_12.1"></a><a href="r6rs-lib-Z-H-13.html#node_sec_12.1">12.1&nbsp;&nbsp;Hygiene</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_12.2"></a><a href="r6rs-lib-Z-H-13.html#node_sec_12.2">12.2&nbsp;&nbsp;Syntax objects</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_12.3"></a><a href="r6rs-lib-Z-H-13.html#node_sec_12.3">12.3&nbsp;&nbsp;Transformers</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_12.4"></a><a href="r6rs-lib-Z-H-13.html#node_sec_12.4">12.4&nbsp;&nbsp;Parsing input and producing output</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_12.5"></a><a href="r6rs-lib-Z-H-13.html#node_sec_12.5">12.5&nbsp;&nbsp;Identifier predicates</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_12.6"></a><a href="r6rs-lib-Z-H-13.html#node_sec_12.6">12.6&nbsp;&nbsp;Syntax-object and datum conversions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_12.7"></a><a href="r6rs-lib-Z-H-13.html#node_sec_12.7">12.7&nbsp;&nbsp;Generating lists of temporaries</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_12.8"></a><a href="r6rs-lib-Z-H-13.html#node_sec_12.8">12.8&nbsp;&nbsp;Derived forms and procedures</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_12.9"></a><a href="r6rs-lib-Z-H-13.html#node_sec_12.9">12.9&nbsp;&nbsp;Syntax violations</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_13"></a><a href="r6rs-lib-Z-H-14.html#node_chap_13">13&nbsp;&nbsp;Hashtables</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_13.1"></a><a href="r6rs-lib-Z-H-14.html#node_sec_13.1">13.1&nbsp;&nbsp;Constructors</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_13.2"></a><a href="r6rs-lib-Z-H-14.html#node_sec_13.2">13.2&nbsp;&nbsp;Procedures</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_13.3"></a><a href="r6rs-lib-Z-H-14.html#node_sec_13.3">13.3&nbsp;&nbsp;Inspection</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_13.4"></a><a href="r6rs-lib-Z-H-14.html#node_sec_13.4">13.4&nbsp;&nbsp;Hash functions</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_14"></a><a href="r6rs-lib-Z-H-15.html#node_chap_14">14&nbsp;&nbsp;Enumerations</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_15"></a><a href="r6rs-lib-Z-H-16.html#node_chap_15">15&nbsp;&nbsp;Composite library</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_16"></a><a href="r6rs-lib-Z-H-17.html#node_chap_16">16&nbsp;&nbsp;<tt>eval</tt></a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_17"></a><a href="r6rs-lib-Z-H-18.html#node_chap_17">17&nbsp;&nbsp;Mutable pairs</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_18"></a><a href="r6rs-lib-Z-H-19.html#node_chap_18">18&nbsp;&nbsp;Mutable strings</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_19"></a><a href="r6rs-lib-Z-H-20.html#node_chap_19">19&nbsp;&nbsp;R<sup>5</sup>RS compatibility</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_Temp_4"></a><a href="r6rs-lib-Z-H-21.html#node_chap_Temp_4">Alphabetic index of definitions of
-concepts, keywords, and procedures</a></b><br>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-2.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span class=disable>contents</span><span><span class=disable>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-10.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-10.html
deleted file mode 100644
index dffa4db745..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-10.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-9.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-11.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_9"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_9">Chapter 9</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_9">File system</a></h1>
-<p></p>
-<p>
-This chapter describes the <tt>(rnrs files (6))</tt><a name="node_idx_836"></a>library for
-operations on the file system.  This library, in addition to the
-procedures described here, also exports the I/O condition types
-described in section&nbsp;<a href="r6rs-lib-Z-H-9.html#node_sec_8.1">8.1</a>.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_838"></a>file-exists?<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Filename</i> must be a file name (see
-section&nbsp;<a href="r6rs-lib-Z-H-9.html#node_sec_8.2.1">8.2.1</a>).  The <tt>file-exists?</tt> procedure
-returns <tt>#t</tt> if the named file exists at the time the procedure
-is called, <tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_840"></a>delete-file<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Filename</i> must be a file name (see
-section&nbsp;<a href="r6rs-lib-Z-H-9.html#node_sec_8.2.1">8.2.1</a>).  The <tt>delete-file</tt> procedure
-deletes the named file if it exists and can be deleted, and returns
-unspecified values.  If the file does not exist or cannot be deleted,
-an exception with condition type <tt>&amp;i/o-filename</tt> is raised.
-</p>
-<p></p>
-<p>
-   </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-9.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-11.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-11.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-11.html
deleted file mode 100644
index b99540d9fe..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-11.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-10.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-12.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_10"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_10">Chapter 10</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_10">Command-line access and exit values</a></h1>
-<p></p>
-<p>
-The procedures described in this section are exported by the
-<tt>(rnrs programs (6))</tt><a name="node_idx_842"></a>library.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_844"></a>command-line<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a nonempty list of strings.
-The first element is an implementation-specific
-name for the running top-level program.  The remaining elements are command-line
-arguments according to the operating system&#8217;s conventions.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_846"></a>exit<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_848"></a>exit<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Exits the running program and communicates an exit value to the 
-operating system.  If no argument is supplied, the <tt>exit</tt>
-procedure should communicate to the operating system that the program 
-exited normally.  If an argument is supplied, the <tt>exit</tt> procedure 
-should translate the argument into an appropriate exit value for the 
-operating system.  If <i>obj</i> is <tt>#f</tt>, the exit is assumed to
-be abnormal.
-</p>
-<p></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-10.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-12.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-12.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-12.html
deleted file mode 100644
index 43905bc187..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-12.html
+++ /dev/null
@@ -1,1200 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-11.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-13.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_11"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_11">Chapter 11</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_11">Arithmetic</a></h1>
-<p>
-<a name="node_idx_850"></a></p>
-<p>
-This chapter describes Scheme&#8217;s libraries for more specialized
-numerical operations: fixnum and flonum arithmetic, as well as bitwise
-operations on exact integer objects.  </p>
-<p>
-</p>
-<a name="node_sec_11.1"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_11.1">11.1&nbsp;&nbsp;Bitwise operations</a></h2>
-<p>A number of procedures operate on the binary two&#8217;s-complement
-representations of exact integer objects: Bit positions within an
-exact integer object are counted from the right, i.e. bit 0 is the
-least significant bit.  Some procedures allow extracting <a name="node_idx_852"></a><em>bit
-fields</em>, i.e., number objects representing subsequences of the
-binary representation of an exact integer object.  Bit fields are
-always positive, and always defined using a finite number of bits.</p>
-<p>
-</p>
-<a name="node_sec_11.2"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_11.2">11.2&nbsp;&nbsp;Fixnums</a></h2>
-<p></p>
-<p>
-Every implementation must define its fixnum range as a closed
-interval
-</p>
-<div align=left><img src="r6rs-lib-Z-G-4.gif" border="0" alt="[r6rs-lib-Z-G-4.gif]"></div><p>
-such that <em>w</em> is a (mathematical) integer <em>w</em> &ge; 24.  Every
-mathematical integer within an implementation&#8217;s fixnum range must
-correspond to an exact integer object that is representable within the
-implementation.
-A fixnum is an exact integer object whose value lies within this
-fixnum range.</p>
-<p>
-This section describes the <tt>(rnrs arithmetic fixnums (6))</tt><a name="node_idx_854"></a>library,
-which defines various operations on fixnums.
-Fixnum operations perform integer arithmetic on their fixnum
-arguments, but raise an exception with condition type
-<tt>&amp;implementation-restriction</tt> if the result is not a fixnum.</p>
-<p>
-This section uses <i>fx</i>, <i>fx<sub>1</sub></i>, <i>fx<sub>2</sub></i>, etc., as parameter
-names for arguments that must be fixnums.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_856"></a>fixnum?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is an exact
-integer object within the fixnum range, <tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_858"></a>fixnum-width<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_860"></a>least-fixnum<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_862"></a>greatest-fixnum<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return <em>w</em>,
- <tt>-</tt> 2<sup><em>w</em><tt>-</tt>1</sup> and 2<sup><em>w</em><tt>-</tt>1</sup>  <tt>-</tt>  1: the
-width, minimum and the maximum value of the fixnum range, respectively.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_864"></a>fx=?<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_866"></a>fx&gt;?<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_868"></a>fx&lt;?<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_870"></a>fx&gt;=?<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_872"></a>fx&lt;=?<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return <tt>#t</tt> if their arguments are (respectively):
-equal, monotonically increasing, monotonically decreasing,
-monotonically nondecreasing, or monotonically nonincreasing,
-<tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_874"></a>fxzero?<i> fx</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_876"></a>fxpositive?<i> fx</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_878"></a>fxnegative?<i> fx</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_880"></a>fxodd?<i> fx</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_882"></a>fxeven?<i> fx</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These numerical predicates test a fixnum for a particular property,
-returning <tt>#t</tt> or <tt>#f</tt>.  The five properties tested by
-these procedures are: whether the number object is zero, greater than zero,
-less than zero, odd, or even.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_884"></a>fxmax<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_886"></a>fxmin<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return the maximum or minimum of their arguments.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_888"></a>fx+<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_890"></a>fx*<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return the sum or product of their arguments,
-provided that sum or product is a fixnum.  An exception with condition
-type <tt>&amp;implementation-restriction</tt> is raised if
-that sum or product is not a fixnum.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_892"></a>fx-<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_894"></a>fx-<i> fx</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-With two arguments, this procedure returns the difference
-<i>fx<sub>1</sub></i> <tt>-</tt> <i>fx<sub>2</sub></i>, provided that difference is a fixnum.</p>
-<p>
-With one argument, this procedure returns the additive
-inverse of its argument, provided that integer object is a
-fixnum.</p>
-<p>
-An exception with condition type <tt>&amp;assertion</tt> is raised if the
-mathematically correct result of this procedure is not a fixnum.</p>
-<p>
-</p>
-
-<tt>(fx-&nbsp;(least-fixnum))&nbsp;&nbsp;&nbsp;&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_896"></a>fxdiv-and-mod<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_898"></a>fxdiv<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_900"></a>fxmod<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_902"></a>fxdiv0-and-mod0<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_904"></a>fxdiv0<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_906"></a>fxmod0<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Fx<sub>2</sub></i> must be nonzero.
-These procedures implement number-theoretic integer division and
-return the results of the corresponding mathematical operations
-specified in report section&nbsp;on &#8220;Integer division&#8221;.</p>
-<p>
-</p>
-
-<tt>(fxdiv&nbsp;<i>fx<sub>1</sub></i>&nbsp;<i>fx<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fx<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em>&nbsp;<i>fx<sub>2</sub></i><br>
-(fxmod&nbsp;<i>fx<sub>1</sub></i>&nbsp;<i>fx<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fx<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em>&nbsp;<i>fx<sub>2</sub></i><br>
-(fxdiv-and-mod&nbsp;<i>fx<sub>1</sub></i>&nbsp;<i>fx<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fx<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em>&nbsp;<i>fx<sub>2</sub></i>,&nbsp;<i>fx<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em>&nbsp;<i>fx<sub>2</sub></i><br>
-;&nbsp;two&nbsp;return&nbsp;values<br>
-(fxdiv0&nbsp;<i>fx<sub>1</sub></i>&nbsp;<i>fx<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fx<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em>sb0&nbsp;<i>fx<sub>2</sub></i><br>
-(fxmod0&nbsp;<i>fx<sub>1</sub></i>&nbsp;<i>fx<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fx<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em>sb0&nbsp;<i>fx<sub>2</sub></i><br>
-(fxdiv0-and-mod0&nbsp;<i>fx<sub>1</sub></i>&nbsp;<i>fx<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fx<sub>1</sub></i>&nbsp;<i>fx<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em>sb0&nbsp;<i>fx<sub>2</sub></i>,&nbsp;<i>fx<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em>sb0&nbsp;<i>fx<sub>2</sub></i><br>
-;&nbsp;two&nbsp;return&nbsp;values<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_908"></a>fx+/carry<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the two fixnum results of the following computation:
-</p>
-
-<tt>(let*&nbsp;((s&nbsp;(+&nbsp;<i>fx<sub>1</sub></i>&nbsp;<i>fx<sub>2</sub></i>&nbsp;<i>fx<sub>3</sub></i>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(s0&nbsp;(mod0&nbsp;s&nbsp;(expt&nbsp;2&nbsp;(fixnum-width))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(s1&nbsp;(div0&nbsp;s&nbsp;(expt&nbsp;2&nbsp;(fixnum-width)))))<br>
-&nbsp;&nbsp;(values&nbsp;s0&nbsp;s1))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_910"></a>fx-/carry<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the two fixnum results of the following computation:
-</p>
-
-<tt>(let*&nbsp;((d&nbsp;(-&nbsp;<i>fx<sub>1</sub></i>&nbsp;<i>fx<sub>2</sub></i>&nbsp;<i>fx<sub>3</sub></i>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(d0&nbsp;(mod0&nbsp;d&nbsp;(expt&nbsp;2&nbsp;(fixnum-width))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(d1&nbsp;(div0&nbsp;d&nbsp;(expt&nbsp;2&nbsp;(fixnum-width)))))<br>
-&nbsp;&nbsp;(values&nbsp;d0&nbsp;d1))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_912"></a>fx*/carry<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the two fixnum results of the following computation:
-</p>
-
-<tt>(let*&nbsp;((s&nbsp;(+&nbsp;(*&nbsp;<i>fx<sub>1</sub></i>&nbsp;<i>fx<sub>2</sub></i>)&nbsp;<i>fx<sub>3</sub></i>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(s0&nbsp;(mod0&nbsp;s&nbsp;(expt&nbsp;2&nbsp;(fixnum-width))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(s1&nbsp;(div0&nbsp;s&nbsp;(expt&nbsp;2&nbsp;(fixnum-width)))))<br>
-&nbsp;&nbsp;(values&nbsp;s0&nbsp;s1))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_914"></a>fxnot<i> <i>fx</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the unique fixnum that is congruent
-mod 2<sup><em>w</em></sup> to the one&#8217;s-complement of <i>fx</i>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_916"></a>fxand<i> <i>fx<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_918"></a>fxior<i> <i>fx<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_920"></a>fxxor<i> <i>fx<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return the fixnum that is the bit-wise &#8220;and&#8221;,
-&#8220;inclusive or&#8221;, or &#8220;exclusive or&#8221; of the two&#8217;s complement
-representations of their arguments.  If they are passed only one
-argument, they return that argument.  If they are passed no arguments,
-they return the fixnum (either  <tt>-</tt> 1 or 0) that acts as identity for the
-operation.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_922"></a>fxif<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the fixnum that is the bit-wise &#8220;if&#8221; of the two&#8217;s complement
-representations of its arguments, i.e. for each bit, if it is 1 in
-<i>fx<sub>1</sub></i>, the corresponding bit in <i>fx<sub>2</sub></i> becomes the value of
-the corresponding bit in the result, and if it is 0, the corresponding
-bit in <i>fx<sub>3</sub></i> becomes the corresponding bit in the value of the
-result.  This is the fixnum result of the following computation:
-</p>
-
-<tt>(fxior&nbsp;(fxand&nbsp;<i>fx<sub>1</sub></i>&nbsp;<i>fx<sub>2</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxand&nbsp;(fxnot&nbsp;<i>fx<sub>1</sub></i>)&nbsp;<i>fx<sub>3</sub></i>))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_924"></a>fxbit-count<i> <i>fx</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-If <i>fx</i> is non-negative, this procedure returns the
-number of 1 bits in the two&#8217;s complement representation of <i>fx</i>.
-Otherwise it returns the result of the following computation:
-</p>
-
-<tt>(fxnot&nbsp;(fxbit-count&nbsp;(fxnot&nbsp;<i>ei</i>)))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_926"></a>fxlength<i> <i>fx</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the number of bits needed to represent <i>fx</i> if it is
-positive, and the number of bits needed to represent <tt>(fxnot
-<i>fx</i>)</tt> if it is negative, which is the fixnum result of the
-following computation:
-</p>
-
-<tt>(do&nbsp;((result&nbsp;0&nbsp;(+&nbsp;result&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bits&nbsp;(if&nbsp;(fxnegative?&nbsp;<i>fx</i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxnot&nbsp;<i>fx</i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>fx</i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxarithmetic-shift-right&nbsp;bits&nbsp;1)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((fxzero?&nbsp;bits)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_928"></a>fxfirst-bit-set<i> <i>fx</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the index of the least significant 1 bit in
-the two&#8217;s complement representation of <i>fx</i>.  If 
-<i>fx</i> is 0, then  <tt>-</tt> 1 is returned.
-</p>
-
-<tt>(fxfirst-bit-set&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-1<br>
-(fxfirst-bit-set&nbsp;1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0<br>
-(fxfirst-bit-set&nbsp;-4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;2<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_930"></a>fxbit-set?<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Fx<sub>2</sub></i> must be non-negative and less than <tt>(fixnum-width)</tt>.  The <tt>fxbit-set?</tt> procedure returns
-<tt>#t</tt> if the <i>fx<sub>2</sub></i>th bit is 1 in the two&#8217;s complement
-representation of <i>fx<sub>1</sub></i>, and <tt>#f</tt> otherwise.  This is the
-fixnum result of the following computation:
-</p>
-
-<tt>(not<br>
-&nbsp;&nbsp;(fxzero?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(fxand&nbsp;<i>fx<sub>1</sub></i><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxarithmetic-shift-left&nbsp;1&nbsp;<i>fx<sub>2</sub></i>))))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_932"></a>fxcopy-bit<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Fx<sub>2</sub></i> must be non-negative and less than <tt>(fixnum-width)</tt>. <i>Fx<sub>3</sub></i> must be 0 or
-1.  The <tt>fxcopy-bit</tt> procedure returns the result of replacing
-the <i>fx<sub>2</sub></i>th bit of <i>fx<sub>1</sub></i> by <i>fx<sub>3</sub></i>, which is
-the result of the following computation:
-</p>
-
-<tt>(let*&nbsp;((mask&nbsp;(fxarithmetic-shift-left&nbsp;1&nbsp;<i>fx<sub>2</sub></i>)))<br>
-&nbsp;&nbsp;(fxif&nbsp;mask<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxarithmetic-shift-left&nbsp;<i>fx<sub>3</sub></i>&nbsp;<i>fx<sub>2</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>fx<sub>1</sub></i>))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_934"></a>fxbit-field<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Fx<sub>2</sub></i> and <i>fx<sub>3</sub></i> must be non-negative and less than
-<tt>(fixnum-width)</tt>.  Moreover, <i>fx<sub>2</sub></i> must be less than or
-equal to <i>fx<sub>3</sub></i>.  The <tt>fxbit-field</tt> procedure returns the
-number represented by the bits at the positions from <i>fx<sub>2</sub></i> (inclusive) to
-<i>fx<sub>3</sub></i> (exclusive), which is
-the fixnum result of the following computation:
-</p>
-
-<tt>(let*&nbsp;((mask&nbsp;(fxnot<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxarithmetic-shift-left&nbsp;-1&nbsp;<i>fx<sub>3</sub></i>))))<br>
-&nbsp;&nbsp;(fxarithmetic-shift-right&nbsp;(fxand&nbsp;<i>fx<sub>1</sub></i>&nbsp;mask)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>fx<sub>2</sub></i>))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_936"></a>fxcopy-bit-field<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i> <i>fx<sub>4</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Fx<sub>2</sub></i> and <i>fx<sub>3</sub></i> must be non-negative and less than
-<tt>(fixnum-width)</tt>.  Moreover, <i>fx<sub>2</sub></i> must be less than or
-equal to <i>fx<sub>3</sub></i>.  The <tt>fxcopy-bit-field</tt> procedure returns
-the result of replacing in <i>fx<sub>1</sub></i> the bits at positions from
-<i>fx<sub>2</sub></i> (inclusive) to <i>fx<sub>3</sub></i> (exclusive) by the corresponding bits in <i>fx<sub>4</sub></i>, which
-is the fixnum result of the following computation:
-</p>
-
-<tt>(let*&nbsp;((to&nbsp;&nbsp;&nbsp;&nbsp;<i>fx<sub>1</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(start&nbsp;<i>fx<sub>2</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(end&nbsp;&nbsp;&nbsp;<i>fx<sub>3</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(from&nbsp;&nbsp;<i>fx<sub>4</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(mask1&nbsp;(fxarithmetic-shift-left&nbsp;-1&nbsp;start))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(mask2&nbsp;(fxnot<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxarithmetic-shift-left&nbsp;-1&nbsp;end)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(mask&nbsp;(fxand&nbsp;mask1&nbsp;mask2)))<br>
-&nbsp;&nbsp;(fxif&nbsp;mask<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxarithmetic-shift-left&nbsp;from&nbsp;start)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;to))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_938"></a>fxarithmetic-shift<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The absolute value of <i>fx<sub>2</sub></i> must be less than 
-<tt>(fixnum-width)</tt>.  If
-</p>
-
-<tt>(floor&nbsp;(*&nbsp;<i>fx<sub>1</sub></i>&nbsp;(expt&nbsp;2&nbsp;<i>fx<sub>2</sub></i>)))<p></tt>
-is a fixnum, then that fixnum is returned.  Otherwise an exception
-with condition type <tt>&amp;implementation-restriction</tt> is
-raised.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_940"></a>fxarithmetic-shift-left<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_942"></a>fxarithmetic-shift-right<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Fx<sub>2</sub></i> must be non-negative, and less than <tt>(fixnum-width)</tt>.
-The <tt>fxarithmetic-shift-left</tt> procedure behaves the same as <tt>fxarithmetic-shift</tt>, and <tt>(fxarithmetic-shift-right <i>fx<sub>1</sub></i>
-<i>fx<sub>2</sub></i>)</tt> behaves the same as <tt>(fxarithmetic-shift <i>fx<sub>1</sub></i>
-(fx- <i>fx<sub>2</sub></i>))</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_944"></a>fxrotate-bit-field<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i> <i>fx<sub>4</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Fx<sub>2</sub></i>, <i>fx<sub>3</sub></i>, and <i>fx<sub>4</sub></i> must be non-negative
-and less than <tt>(fixnum-width)</tt>.  <i>Fx<sub>2</sub></i> must be less than or
-equal to <i>fx<sub>3</sub></i>. <i>Fx<sub>4</sub></i> must be less than the difference
-between <i>fx<sub>3</sub></i> and <i>fx<sub>2</sub></i>.  The <tt>fxrotate-bit-field</tt>
-procedure returns the result of cyclically permuting in <i>fx<sub>1</sub></i> the
-bits at positions from <i>fx<sub>2</sub></i> (inclusive) to <i>fx<sub>3</sub></i>
-(exclusive) by <i>fx<sub>4</sub></i> bits
-towards the more significant bits, which is the result of the
-following computation:
-</p>
-
-<tt>(let*&nbsp;((n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>fx<sub>1</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(start&nbsp;<i>fx<sub>2</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(end&nbsp;&nbsp;&nbsp;<i>fx<sub>3</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(count&nbsp;<i>fx<sub>4</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(width&nbsp;(fx-&nbsp;end&nbsp;start)))<br>
-&nbsp;&nbsp;(if&nbsp;(fxpositive?&nbsp;width)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let*&nbsp;((count&nbsp;(fxmod&nbsp;count&nbsp;width))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(field0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxbit-field&nbsp;n&nbsp;start&nbsp;end))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(field1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxarithmetic-shift-left<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;field0&nbsp;count))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(field2<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxarithmetic-shift-right<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;field0&nbsp;(fx-&nbsp;width&nbsp;count)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(field&nbsp;(fxior&nbsp;field1&nbsp;field2)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fxcopy-bit-field&nbsp;n&nbsp;start&nbsp;end&nbsp;field))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;n))<p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_946"></a>fxreverse-bit-field<i> <i>fx<sub>1</sub></i> <i>fx<sub>2</sub></i> <i>fx<sub>3</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Fx<sub>2</sub></i> and <i>fx<sub>3</sub></i> must be non-negative and less than
-<tt>(fixnum-width)</tt>.  Moreover, <i>fx<sub>2</sub></i> must be less than or
-equal to <i>fx<sub>3</sub></i>.  The <tt>fxreverse-bit-field</tt> procedure
-returns
-the fixnum obtained from <i>fx<sub>1</sub></i> by reversing the
-order of the bits at positions from <i>fx<sub>2</sub></i> (inclusive) to
-<i>fx<sub>3</sub></i> (exclusive).
-</p>
-
-<tt>(fxreverse-bit-field&nbsp;<tt>#</tt>b1010010&nbsp;1&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;88&nbsp;;&nbsp;<tt>#</tt>b1011000<p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.3"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_11.3">11.3&nbsp;&nbsp;Flonums</a></h2>
-<p></p>
-<p>
-This section describes the <tt>(rnrs arithmetic flonums (6))</tt><a name="node_idx_948"></a>library.</p>
-<p>
-This section uses <i>fl</i>, <i>fl<sub>1</sub></i>, <i>fl<sub>2</sub></i>, etc., as
-parameter names for arguments that must be flonums, and <i>ifl</i>
-as a name for arguments that 
-must be integer-valued flonums, i.e., flonums for which the
-<tt>integer-valued?</tt> predicate returns true.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_950"></a>flonum?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a flonum, <tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_952"></a>real-&gt;flonum<i> x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the best flonum representation of
-<i>x</i>.</p>
-<p>
-The value returned is a flonum that is numerically closest to the
-argument.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-If flonums are represented in binary floating point, then
-implementations should break ties by preferring
-the floating-point representation whose least significant bit is
-zero.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_954"></a>fl=?<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i> <i>fl<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_956"></a>fl&lt;?<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i> <i>fl<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_958"></a>fl&lt;=?<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i> <i>fl<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_960"></a>fl&gt;?<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i> <i>fl<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_962"></a>fl&gt;=?<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i> <i>fl<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return <tt>#t</tt> if their arguments are (respectively):
-equal, monotonically increasing, monotonically decreasing,
-monotonically nondecreasing, or monotonically nonincreasing,
-<tt>#f</tt> otherwise.  These
-predicates must be transitive.</p>
-<p>
-</p>
-
-<tt>(fl=&nbsp;+inf.0&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(fl=&nbsp;-inf.0&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(fl=&nbsp;-inf.0&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(fl=&nbsp;0.0&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(fl&lt;&nbsp;0.0&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(fl=&nbsp;+nan.0&nbsp;<i>fl</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(fl&lt;&nbsp;+nan.0&nbsp;<i>fl</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_964"></a>flinteger?<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_966"></a>flzero?<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_968"></a>flpositive?<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_970"></a>flnegative?<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_972"></a>flodd?<i> ifl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_974"></a>fleven?<i> ifl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_976"></a>flfinite?<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_978"></a>flinfinite?<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_980"></a>flnan?<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These numerical predicates test a flonum for a particular property,
-returning <tt>#t</tt> or <tt>#f</tt>.
-The <tt>flinteger?</tt> procedure tests whether the number object is an integer,
-<tt>flzero?</tt> tests whether
-it is <tt>fl=?</tt> to zero, <tt>flpositive?</tt> tests whether it is greater
-than zero, <tt>flnegative?</tt> tests whether it is less
-than zero, <tt>flodd?</tt> tests whether it is odd, 
-<tt>fleven?</tt> tests whether it is even,
-<tt>flfinite?</tt> tests whether it is not an infinity and not a NaN,
-<tt>flinfinite?</tt> tests whether it is an infinity, and
-<tt>flnan?</tt> tests whether it is a NaN.</p>
-<p>
-</p>
-
-<tt>(flnegative?&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(flfinite?&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(flfinite?&nbsp;5.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(flinfinite?&nbsp;5.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(flinfinite?&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-<tt>(flnegative? -0.0)</tt> must return <tt>#f</tt>,
-else it would lose the correspondence with
-<tt>(fl&lt; -0.0 0.0)</tt>, which is <tt>#f</tt>
-according to IEEE 754&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_7">7</a>].
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_982"></a>flmax<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_984"></a>flmin<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return the maximum or minimum of their arguments.
-They always return a NaN when one or more of the arguments is a NaN.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_986"></a>fl+<i> <i>fl<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_988"></a>fl*<i> <i>fl<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return the flonum sum or product of their flonum
-arguments.  In general, they should return the flonum that best
-approximates the mathematical sum or product.  (For implementations
-that represent flonums using IEEE binary floating point, the
-meaning of &#8220;best&#8221; is defined by the IEEE standards.)</p>
-<p>
-</p>
-
-<tt>(fl+&nbsp;+inf.0&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<br>
-(fl+&nbsp;+nan.0&nbsp;<i>fl</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<br>
-(fl*&nbsp;+nan.0&nbsp;<i>fl</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_990"></a>fl-<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_992"></a>fl-<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_994"></a>fl/<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_996"></a>fl/<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-With two or more arguments, these procedures return the flonum
-difference or quotient of their flonum arguments, associating to the
-left.  With one argument, however, they return the additive or
-multiplicative flonum inverse of their argument.  In general, they
-should return the flonum that best approximates the mathematical
-difference or quotient.  (For implementations that represent flonums
-using IEEE binary floating point, the meaning of &#8220;best&#8221; is
-reasonably well-defined by the IEEE standards.)</p>
-<p>
-</p>
-
-<tt>(fl-&nbsp;+inf.0&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<p></tt></p>
-<p>
-For undefined quotients, <tt>fl/</tt> behaves as specified by the
-IEEE standards:</p>
-<p>
-</p>
-
-<tt>(fl/&nbsp;1.0&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;+inf.0<br>
-(fl/&nbsp;-1.0&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-inf.0<br>
-(fl/&nbsp;0.0&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;+nan.0<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_998"></a>flabs<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the absolute value of <i>fl</i>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1000"></a>fldiv-and-mod<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1002"></a>fldiv<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1004"></a>flmod<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1006"></a>fldiv0-and-mod0<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1008"></a>fldiv0<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1010"></a>flmod0<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures implement number-theoretic integer division and
-return the results of the corresponding mathematical operations
-specified in report section&nbsp;on &#8220;Integer division&#8221;.  For zero divisors, these
-procedures may return a NaN or some unspecified flonum.</p>
-<p>
-</p>
-
-<tt>(fldiv&nbsp;<i>fl<sub>1</sub></i>&nbsp;<i>fl<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fl<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em>&nbsp;<i>fl<sub>2</sub></i><br>
-(flmod&nbsp;<i>fl<sub>1</sub></i>&nbsp;<i>fl<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fl<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em>&nbsp;<i>fl<sub>2</sub></i><br>
-(fldiv-and-mod&nbsp;<i>fl<sub>1</sub></i>&nbsp;<i>fl<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fl<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em>&nbsp;<i>fl<sub>2</sub></i>,&nbsp;<i>fl<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em>&nbsp;<i>fl<sub>2</sub></i><br>
-;&nbsp;two&nbsp;return&nbsp;values<br>
-(fldiv0&nbsp;<i>fl<sub>1</sub></i>&nbsp;<i>fl<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fl<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em><sub>0</sub>&nbsp;<i>fl<sub>2</sub></i><br>
-(flmod0&nbsp;<i>fl<sub>1</sub></i>&nbsp;<i>fl<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fl<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em><sub>0</sub>&nbsp;<i>fl<sub>2</sub></i><br>
-(fldiv0-and-mod0&nbsp;<i>fl<sub>1</sub></i>&nbsp;<i>fl<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>fl<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em><sub>0</sub>&nbsp;<i>fl<sub>2</sub></i>,&nbsp;<i>fl<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em><sub>0</sub>&nbsp;<i>fl<sub>2</sub></i><br>
-;&nbsp;two&nbsp;return&nbsp;values<p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1012"></a>flnumerator<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1014"></a>fldenominator<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return the numerator or denominator of <i>fl</i>
-as a flonum; the result is computed as if <i>fl</i> was represented as
-a fraction in lowest terms.  The denominator is always positive.  The
-denominator of 0.0 is defined to be 1.0.
-</p>
-
-<tt>(flnumerator&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(flnumerator&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-inf.0<br>
-(fldenominator&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1.0<br>
-(fldenominator&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1.0<br>
-(flnumerator&nbsp;0.75)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;3.0&nbsp;;&nbsp;probably<br>
-(fldenominator&nbsp;0.75)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;4.0&nbsp;;&nbsp;probably<p></tt></p>
-<p>
-Implementations should implement following behavior:</p>
-<p>
-</p>
-
-<tt>(flnumerator&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-0.0<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1016"></a>flfloor<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1018"></a>flceiling<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1020"></a>fltruncate<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1022"></a>flround<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return integral flonums for flonum arguments that are
-not infinities or NaNs.  For such arguments, <tt>flfloor</tt> returns the
-largest integral flonum not larger than <i>fl</i>.  The <tt>flceiling</tt>
-procedure
-returns the smallest integral flonum not smaller than <i>fl</i>.
-The <tt>fltruncate</tt> procedure returns the integral flonum closest to <i>fl</i> whose
-absolute value is not larger than the absolute value of <i>fl</i>.
-The <tt>flround</tt> procedure returns the closest integral flonum to <i>fl</i>,
-rounding to even when <i>fl</i> represents a number halfway between two integers.</p>
-<p>
-Although infinities and NaNs are not integer objects, these procedures return
-an infinity when given an infinity as an argument, and a NaN when
-given a NaN:</p>
-<p>
-</p>
-
-<tt>(flfloor&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(flceiling&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-inf.0<br>
-(fltruncate&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1024"></a>flexp<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1026"></a>fllog<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1028"></a>fllog<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1030"></a>flsin<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1032"></a>flcos<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1034"></a>fltan<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1036"></a>flasin<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1038"></a>flacos<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1040"></a>flatan<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1042"></a>flatan<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures compute the usual transcendental functions.  
-The <tt>flexp</tt> procedure computes the base-<em>e</em> exponential of <i>fl</i>.
-The <tt>fllog</tt> procedure with a single argument computes the natural logarithm of
-<i>fl</i> (not the base ten logarithm); <tt>(fllog <i>fl<sub>1</sub></i>
-<i>fl<sub>2</sub></i>)</tt> computes the base-<i>fl<sub>2</sub></i> logarithm of <i>fl<sub>1</sub></i>.
-The <tt>flasin</tt>, <tt>flacos</tt>, and <tt>flatan</tt> procedures compute arcsine,
-arccosine, and arctangent, respectively.  <tt>(flatan <i>fl<sub>1</sub></i>
-<i>fl<sub>2</sub></i>)</tt> computes the arc tangent of <i>fl<sub>1</sub></i>/<i>fl<sub>2</sub></i>.</p>
-<p>
-See report
-section&nbsp;on &#8220;Transcendental functions&#8221; for the underlying
-mathematical operations.  In the event that these operations do not
-yield a real result for the given arguments, the result may be a NaN,
-or may be some unspecified flonum.</p>
-<p>
-Implementations that use IEEE binary floating-point arithmetic 
-should follow the relevant standards for these procedures.</p>
-<p>
-</p>
-
-<tt>(flexp&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;+inf.0<br>
-(flexp&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0<br>
-(fllog&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;+inf.0<br>
-(fllog&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-inf.0<br>
-(fllog&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>unspecified</i><br>
-;&nbsp;if&nbsp;-0.0&nbsp;is&nbsp;distinguished<br>
-(fllog&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;+nan.0<br>
-(flatan&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-1.5707963267948965<br>
-;&nbsp;approximately<br>
-(flatan&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1.5707963267948965<br>
-;&nbsp;approximately<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1044"></a>flsqrt<i> fl</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the principal square root of <i>fl</i>. For  <tt>-</tt> 0.0,
-<tt>flsqrt</tt> should return  <tt>-</tt> 0.0; for other negative arguments,
-the result may be a NaN or some unspecified flonum.</p>
-<p>
-</p>
-
-<tt>(flsqrt&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(flsqrt&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-0.0<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1046"></a>flexpt<i> <i>fl<sub>1</sub></i> <i>fl<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Either <i>fl<sub>1</sub></i> should be non-negative, or, if <i>fl<sub>1</sub></i> is
-negative, <i>fl<sub>2</sub></i> should be an integer object.
-The <tt>flexpt</tt> procedure returns <i>fl<sub>1</sub></i> raised to the power <i>fl<sub>2</sub></i>.  If <i>fl<sub>1</sub></i> is
-negative and <i>fl<sub>2</sub></i> is not an integer object, the result may be a
-NaN, or may be some unspecified flonum.  If <i>fl<sub>1</sub></i> is zero, then
-the result is zero.
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_1048"></a></p>
-<div align=left><tt><tt>&amp;no-infinities</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1050"></a>make-no-infinities-violation<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1052"></a>no-infinities-violation?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<a name="node_idx_1054"></a><div align=left><tt><tt>&amp;no-nans</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1056"></a>make-no-nans-violation<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1058"></a>no-nans-violation?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These condition types could be defined by the following code:</p>
-<p>
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;no-infinities<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&amp;implementation-restriction<br>
-&nbsp;&nbsp;make-no-infinities-violation<br>
-&nbsp;&nbsp;no-infinities-violation?)<br>
-<br>
-(define-condition-type&nbsp;&amp;no-nans<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&amp;implementation-restriction<br>
-&nbsp;&nbsp;make-no-nans-violation&nbsp;no-nans-violation?)<p></tt></p>
-<p>
-These types describe that a program has executed an arithmetic
-operations that is specified to return an infinity or a NaN,
-respectively, on a Scheme implementation that is not able to represent
-the infinity or NaN.  (See report section&nbsp;on &#8220;Representability of infinities and NaNs&#8221;.)
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1060"></a>fixnum-&gt;flonum<i> fx</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a flonum that is numerically closest to <i>fx</i>.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The result of this procedure may not be
-numerically equal to <i>fx</i>, because the fixnum precision
-may be greater than the flonum precision.
-</blockquote>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.4"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_11.4">11.4&nbsp;&nbsp;Exact bitwise arithmetic</a></h2>
-<p></p>
-<p>
-This section describes the <tt>(rnrs arithmetic bitwise (6))</tt><a name="node_idx_1062"></a>library.  The exact bitwise arithmetic provides generic operations on
-exact integer objects.  This section uses <i>ei</i>, <i>ei<sub>1</sub></i>, <i>ei<sub>2</sub></i>, etc.,
-as parameter names that must be exact integer objects.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1064"></a>bitwise-not<i> ei</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the exact integer object whose two&#8217;s complement representation is the
-one&#8217;s complement of the two&#8217;s complement representation of <i>ei</i>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1066"></a>bitwise-and<i> <i>ei<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1068"></a>bitwise-ior<i> <i>ei<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1070"></a>bitwise-xor<i> <i>ei<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return the exact integer object that is the bit-wise
-&#8220;and&#8221;, &#8220;inclusive or&#8221;, or &#8220;exclusive or&#8221; of the two&#8217;s complement
-representations of their arguments.  If they are passed only one
-argument, they return that argument.  If they are passed no arguments,
-they return the integer object (either  <tt>-</tt> 1 or 0) that acts as identity for
-the operation.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1072"></a>bitwise-if<i> <i>ei<sub>1</sub></i> <i>ei<sub>2</sub></i> <i>ei<sub>3</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the exact integer object that is the bit-wise &#8220;if&#8221; of the two&#8217;s complement
-representations of its arguments, i.e. for each bit, if it is 1 in
-<i>ei<sub>1</sub></i>, the corresponding bit in <i>ei<sub>2</sub></i> becomes the value of
-the corresponding bit in the result, and if it is 0, the corresponding
-bit in <i>ei<sub>3</sub></i> becomes the corresponding bit in the value of the
-result.
-This is the result of the following computation:
-</p>
-
-<tt>(bitwise-ior&nbsp;(bitwise-and&nbsp;<i>ei<sub>1</sub></i>&nbsp;<i>ei<sub>2</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-and&nbsp;(bitwise-not&nbsp;<i>ei<sub>1</sub></i>)&nbsp;<i>ei<sub>3</sub></i>))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1074"></a>bitwise-bit-count<i> ei</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-If <i>ei</i> is non-negative, this procedure returns the number of
-1 bits in the two&#8217;s complement representation of <i>ei</i>.
-Otherwise it returns the result of the following computation:
-</p>
-
-<tt>(bitwise-not&nbsp;(bitwise-bit-count&nbsp;(bitwise-not&nbsp;<i>ei</i>)))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1076"></a>bitwise-length<i> ei</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the number of bits needed to represent <i>ei</i> if it is
-positive, and the number of bits needed to represent <tt>(bitwise-not
-<i>ei</i>)</tt> if it is negative, which is the exact integer object that
-is the result of the following computation:
-</p>
-
-<tt>(do&nbsp;((result&nbsp;0&nbsp;(+&nbsp;result&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bits&nbsp;(if&nbsp;(negative?&nbsp;<i>ei</i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-not&nbsp;<i>ei</i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>ei</i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-arithmetic-shift&nbsp;bits&nbsp;-1)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((zero?&nbsp;bits)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1078"></a>bitwise-first-bit-set<i> ei</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the index of the least significant 1
-bit in the two&#8217;s complement representation of <i>ei</i>.
-If <i>ei</i> is 0, then  <tt>-</tt> 1 is returned.
-</p>
-
-<tt>(bitwise-first-bit-set&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-1<br>
-(bitwise-first-bit-set&nbsp;1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0<br>
-(bitwise-first-bit-set&nbsp;-4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;2<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1080"></a>bitwise-bit-set?<i> <i>ei<sub>1</sub></i> <i>ei<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Ei<sub>2</sub></i> must be non-negative.
-The <tt>bitwise-bit-set?</tt> procedure returns
-<tt>#t</tt> if the <i>ei<sub>2</sub></i>th bit is 1 in the two&#8217;s complement
-representation of <i>ei<sub>1</sub></i>, and <tt>#f</tt>
-otherwise.  This is the result of the following computation:
-</p>
-
-<tt>(not&nbsp;(zero?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-and<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-arithmetic-shift-left&nbsp;1&nbsp;<i>ei<sub>2</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>ei<sub>1</sub></i>)))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1082"></a>bitwise-copy-bit<i> <i>ei<sub>1</sub></i> <i>ei<sub>2</sub></i> <i>ei<sub>3</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Ei<sub>2</sub></i> must be non-negative, and <i>ei<sub>3</sub></i>
-must be either 0 or 1.
-The <tt>bitwise-copy-bit</tt> procedure returns the result of replacing
-the <i>ei<sub>2</sub></i>th bit of <i>ei<sub>1</sub></i> by the <i>ei<sub>2</sub></i>th bit of <i>ei<sub>3</sub></i>, which is
-the result of the following computation:
-</p>
-
-<tt>(let*&nbsp;((mask&nbsp;(bitwise-arithmetic-shift-left&nbsp;1&nbsp;<i>ei<sub>2</sub></i>)))<br>
-&nbsp;&nbsp;(bitwise-if&nbsp;mask<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-arithmetic-shift-left&nbsp;<i>ei<sub>3</sub></i>&nbsp;<i>ei<sub>2</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>ei<sub>1</sub></i>))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1084"></a>bitwise-bit-field<i> <i>ei<sub>1</sub></i> <i>ei<sub>2</sub></i> <i>ei<sub>3</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Ei<sub>2</sub></i> and <i>ei<sub>3</sub></i> must be non-negative, and
-<i>ei<sub>2</sub></i> must be less than or equal to <i>ei<sub>3</sub></i>.
-The <tt>bitwise-bit-field</tt> procedure returns the
-number represented by the bits at the positions from <i>ei<sub>2</sub></i>
-(inclusive) to <i>ei<sub>3</sub></i> (exclusive), which is
-the result of the following computation:
-</p>
-
-<tt>(let&nbsp;((mask<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-not<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-arithmetic-shift-left&nbsp;-1&nbsp;<i>ei<sub>3</sub></i>))))<br>
-&nbsp;&nbsp;(bitwise-arithmetic-shift-right<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-and&nbsp;<i>ei<sub>1</sub></i>&nbsp;mask)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<i>ei<sub>2</sub></i>))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1086"></a>bitwise-copy-bit-field<i> <i>ei<sub>1</sub></i> <i>ei<sub>2</sub></i> <i>ei<sub>3</sub></i> <i>ei<sub>4</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Ei<sub>2</sub></i> and <i>ei<sub>3</sub></i> must be non-negative,
-and <i>ei<sub>2</sub></i> must be less than or equal to <i>ei<sub>3</sub></i>.
-The <tt>bitwise-copy-bit-field</tt> procedure returns
-the result of replacing in <i>ei<sub>1</sub></i> the bits at positions from
-<i>ei<sub>2</sub></i> (inclusive) to <i>ei<sub>3</sub></i> (exclusive) by the corresponding bits in <i>ei<sub>4</sub></i>, which
-is the fixnum result of the following computation:
-</p>
-
-<tt>(let*&nbsp;((to&nbsp;&nbsp;&nbsp;&nbsp;<i>ei<sub>1</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(start&nbsp;<i>ei<sub>2</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(end&nbsp;&nbsp;&nbsp;<i>ei<sub>3</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(from&nbsp;&nbsp;<i>ei<sub>4</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(mask1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-arithmetic-shift-left&nbsp;-1&nbsp;start))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(mask2<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-not<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-arithmetic-shift-left&nbsp;-1&nbsp;end)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(mask&nbsp;(bitwise-and&nbsp;mask1&nbsp;mask2)))<br>
-&nbsp;&nbsp;(bitwise-if&nbsp;mask<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-arithmetic-shift-left&nbsp;from<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;start)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;to))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1088"></a>bitwise-arithmetic-shift<i> <i>ei<sub>1</sub></i> <i>ei<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the result of the following computation:
-</p>
-
-<tt>(floor&nbsp;(*&nbsp;<i>ei<sub>1</sub></i>&nbsp;(expt&nbsp;2&nbsp;<i>ei<sub>2</sub></i>)))<p></tt></p>
-<p>
-Examples:
-</p>
-
-<tt>(bitwise-arithmetic-shift&nbsp;-6&nbsp;-1)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-3<br>
-(bitwise-arithmetic-shift&nbsp;-5&nbsp;-1)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-3<br>
-(bitwise-arithmetic-shift&nbsp;-4&nbsp;-1)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-2<br>
-(bitwise-arithmetic-shift&nbsp;-3&nbsp;-1)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-2<br>
-(bitwise-arithmetic-shift&nbsp;-2&nbsp;-1)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-1<br>
-(bitwise-arithmetic-shift&nbsp;-1&nbsp;-1)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-1<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1090"></a>bitwise-arithmetic-shift-left<i> <i>ei<sub>1</sub></i> <i>ei<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1092"></a>bitwise-arithmetic-shift-right<i> <i>ei<sub>1</sub></i> <i>ei<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Ei<sub>2</sub></i> must be non-negative.  The <tt>bitwise-arithmetic-shift-left</tt> procedure returns the same result as <tt>bitwise-arithmetic-shift</tt>, and
-</p>
-
-<tt>(bitwise-arithmetic-shift-right&nbsp;<i>ei<sub>1</sub></i>&nbsp;<i>ei<sub>2</sub></i>)<p></tt>
-returns the same result as 
-</p>
-
-<tt>(bitwise-arithmetic-shift&nbsp;<i>ei<sub>1</sub></i>&nbsp;(-&nbsp;<i>ei<sub>2</sub></i>)).<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1094"></a>bitwise-rotate-bit-field<i> <i>ei<sub>1</sub></i> <i>ei<sub>2</sub></i> <i>ei<sub>3</sub></i> <i>ei<sub>4</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Ei<sub>2</sub></i>, <i>ei<sub>3</sub></i>, <i>ei<sub>4</sub></i> must be non-negative, 
-<i>ei<sub>2</sub></i> must be less than or equal to <i>ei<sub>3</sub></i>, and
-<i>ei<sub>4</sub></i> must be non-negative.
-procedure returns the result of cyclically permuting in <i>ei<sub>1</sub></i> the
-bits at positions from <i>ei<sub>2</sub></i> (inclusive) to <i>ei<sub>3</sub></i> (exclusive) by <i>ei<sub>4</sub></i> bits
-towards the more significant bits, which is the result of the
-following computation:
-</p>
-
-<tt>(let*&nbsp;((n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>ei<sub>1</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(start&nbsp;<i>ei<sub>2</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(end&nbsp;&nbsp;&nbsp;<i>ei<sub>3</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(count&nbsp;<i>ei<sub>4</sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(width&nbsp;(-&nbsp;end&nbsp;start)))<br>
-&nbsp;&nbsp;(if&nbsp;(positive?&nbsp;width)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let*&nbsp;((count&nbsp;(mod&nbsp;count&nbsp;width))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(field0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-bit-field&nbsp;n&nbsp;start&nbsp;end))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(field1&nbsp;(bitwise-arithmetic-shift-left<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;field0&nbsp;count))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(field2&nbsp;(bitwise-arithmetic-shift-right<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;field0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(-&nbsp;width&nbsp;count)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(field&nbsp;(bitwise-ior&nbsp;field1&nbsp;field2)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bitwise-copy-bit-field&nbsp;n&nbsp;start&nbsp;end&nbsp;field))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;n))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1096"></a>bitwise-reverse-bit-field<i> <i>ei<sub>1</sub></i> <i>ei<sub>2</sub></i> <i>ei<sub>3</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Ei<sub>2</sub></i> and <i>ei<sub>3</sub></i> must be non-negative, and
-<i>ei<sub>2</sub></i> must be less than or equal to <i>ei<sub>3</sub></i>.  The <tt>bitwise-reverse-bit-field</tt> procedure returns
-the result obtained from <i>ei<sub>1</sub></i> by reversing the
-order of the bits at positions from <i>ei<sub>2</sub></i> (inclusive) to
-<i>ei<sub>3</sub></i> (exclusive).
-</p>
-
-<tt>(bitwise-reverse-bit-field&nbsp;<tt>#</tt>b1010010&nbsp;1&nbsp;4)&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;88&nbsp;;&nbsp;<tt>#</tt>b1011000<p></tt>
-</p>
-<p></p>
-<p>
-   </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-11.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-13.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-13.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-13.html
deleted file mode 100644
index 9f34b8caeb..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-13.html
+++ /dev/null
@@ -1,1222 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-12.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-14.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_12"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_12">Chapter 12</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_12"><tt>syntax-case</tt></a></h1>
-<p></p>
-<p>
-</p>
-<p>
-The <tt>(rnrs syntax-case (6))</tt><a name="node_idx_1098"></a>library
-provides
-support for writing low-level macros
-in a high-level style, with automatic syntax checking, input
-destructuring, output restructuring, maintenance of lexical scoping
-and referential transparency (hygiene), and support for controlled
-identifier capture.</p>
-<p>
-</p>
-<a name="node_sec_12.1"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_12.1">12.1&nbsp;&nbsp;Hygiene</a></h2>
-<p></p>
-<p>
-</p>
-<p>
-Barendregt&#8217;s <em>hygiene condition</em>&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_1">1</a>] for the
-lambda calculus is an informal notion that requires the free variables of
-an expression <em>N</em> that is to be substituted into another expression <em>M</em> not to
-be captured by bindings in <em>M</em> when such capture is not intended.
-Kohlbecker, et al&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_9">9</a>] propose a corresponding
-<em>hygiene condition for macro expansion</em> that applies in all situations
-where capturing is not explicit:
-&#8220;Generated identifiers that become binding instances in
-the completely expanded program must only bind variables that
-are generated at the same transcription step&#8221;.
-In the terminology of this document, the &#8220;generated identifiers&#8221; are
-those introduced by a transformer rather than those present in the form
-passed to the transformer, and a &#8220;macro transcription step&#8221; corresponds
-to a single call by the expander to a transformer.
-Also, the hygiene condition applies to all introduced bindings rather than
-to introduced variable bindings alone.</p>
-<p>
-This leaves open what happens to an introduced identifier that appears
-outside the scope of a binding introduced by the same call.
-Such an identifier refers to the lexical binding in effect where it
-appears (within a <tt>syntax</tt> &lt;template&gt;;
-see section&nbsp;<a href="#node_sec_12.4">12.4</a>) inside the transformer body or one of
-the helpers it calls.
-This is essentially the referential transparency property described
-by Clinger and Rees&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_3">3</a>].
-Thus, the hygiene condition can be restated as follows:</p>
-<p>
-</p>
-<blockquote>
-
-<p class=noindent>A binding for an identifier introduced into the output of a transformer
-call from the expander must capture only references to the identifier
-introduced into the output of the same transformer call.
-A reference to an identifier introduced into the output of a transformer
-refers to the closest enclosing binding for the introduced identifier or,
-if it appears outside of any enclosing binding for the introduced
-identifier, the closest enclosing lexical binding where the identifier
-appears (within a <tt>syntax</tt> &lt;template&gt;)
-inside the transformer body or one of the helpers it calls.
-</p>
-</blockquote><p>
-Explicit captures are handled via <tt>datum-&gt;syntax</tt>; see
-section&nbsp;<a href="#node_sec_12.6">12.6</a>.</p>
-<p>
-Operationally, the expander can maintain hygiene with the help of
-<em>marks<a name="node_idx_1100"></a></em> and <em>substitutions<a name="node_idx_1102"></a></em>.
-Marks are applied selectively by the expander to the output of each
-transformer it invokes, and substitutions are applied to the portions
-of each binding form that are supposed to be within the scope of the bound
-identifiers.
-Marks are used to distinguish like-named identifiers that are
-introduced at different times (either present in the source or introduced
-into the output of a particular transformer call), and substitutions are
-used to map identifiers to their expand-time values.</p>
-<p>
-Each time the expander encounters a macro use, it applies an
-<a name="node_idx_1104"></a><em>antimark</em> to the input form, invokes the associated transformer,
-then applies a fresh mark to the output.
-Marks and antimarks cancel, so the portions of the input that appear in
-the output are effectively left unmarked, while the portions of the output
-that are introduced are marked with the fresh mark.</p>
-<p>
-Each time the expander encounters a binding form it creates a set of
-substitutions, each mapping one of the (possibly marked) bound identifiers
-to information about the binding.
-(For a <tt>lambda</tt> expression, the expander might map each bound
-identifier to a representation of the formal parameter in the output of
-the expander.
-For a <tt>let-syntax</tt> form, the expander might map each bound
-identifier to the associated transformer.)
-These substitutions are applied to the portions of the input form in
-which the binding is supposed to be visible.</p>
-<p>
-Marks and substitutions together form a <a name="node_idx_1106"></a><em>wrap</em> that is layered on the
-form being processed by the expander and pushed down toward the leaves as
-necessary.
-A wrapped form is referred to as a <a name="node_idx_1108"></a><em>wrapped syntax object</em>.
-Ultimately, the wrap may rest on a leaf that represents an identifier, in
-which case the wrapped syntax object is also referred to
-as an <em>identifier</em>.
-An identifier contains a name along with the wrap.
-(Names are typically represented by symbols.)</p>
-<p>
-When a substitution is created to map an identifier to an expand-time
-value, the substitution records the name of the identifier and
-the set of marks that have been applied to that identifier, along
-with the associated expand-time value.
-The expander resolves identifier references by looking for the latest
-matching substitution to be applied to the identifier, i.e., the outermost
-substitution in the wrap whose name and marks match the name and
-marks recorded in the substitution.
-The name matches if it is the same name (if using symbols, then by
-<tt>eq?</tt>), and the marks match if the marks recorded with the
-substitution are the same as those that appear <em>below</em> the
-substitution in the wrap, i.e., those that were applied <em>before</em> the
-substitution.
-Marks applied after a substitution, i.e., appear over the substitution in
-the wrap, are not relevant and are ignored.</p>
-<p>
-An algebra that defines how marks and substitutions work more precisely is
-given in section&nbsp;2.4 of Oscar Waddell&#8217;s PhD thesis&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_13">13</a>].</p>
-<p>
-</p>
-<a name="node_sec_12.2"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_12.2">12.2&nbsp;&nbsp;Syntax objects</a></h2>
-<p></p>
-<p>
-A <a name="node_idx_1110"></a><em>syntax object</em> is a representation of a Scheme form that contains
-contextual information about the form in addition to its structure.
-This contextual information is used by the expander to maintain
-lexical scoping and may also be used by an implementation to maintain
-source-object correlation&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_6">6</a>].</p>
-<p>
-A syntax object may be wrapped, as described in section&nbsp;<a href="#node_sec_12.1">12.1</a>.
-It may also be unwrapped, fully or partially, i.e., consist of list and
-vector structure with wrapped syntax objects or nonsymbol values at the
-leaves.
-More formally, a syntax object is:</p>
-<p>
-</p>
-<ul>
-<li><p>a pair of syntax objects,
-</p>
-<li><p>a vector of syntax objects,
-</p>
-<li><p>a nonpair, nonvector, nonsymbol value, or
-</p>
-<li><p>a wrapped syntax object.
-</p>
-</ul><p></p>
-<p>
-The distinction between the terms &#8220;syntax object&#8221; and &#8220;wrapped syntax
-object&#8221; is important.
-For example, when invoked by the expander, a transformer
-(section&nbsp;<a href="#node_sec_12.3">12.3</a>) must accept a wrapped syntax object but
-may return any syntax object, including an unwrapped syntax object.</p>
-<p>
-Syntax objects representing identifiers are always wrapped and are distinct
-from other types of values.
-Wrapped syntax objects that are not identifiers may or may not be distinct
-from other types of values.</p>
-<p>
-</p>
-<a name="node_sec_12.3"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_12.3">12.3&nbsp;&nbsp;Transformers</a></h2>
-<p></p>
-<p>
-In <tt>define-syntax</tt> (report
-section&nbsp;on &#8220;Syntax definitions&#8221;), <tt>let-syntax</tt>, and <tt>letrec-syntax</tt> forms (report
-section&nbsp;on &#8220;Binding constructs for syntactic
-keywords&#8221;), a binding for a syntactic keyword is an expression
-that evaluates to a <a name="node_idx_1112"></a><em>transformer</em><a name="node_idx_1114"></a>.</p>
-<p>
-A transformer is a <a name="node_idx_1116"></a><em>transformation procedure</em> or a
-<a name="node_idx_1118"></a><em>variable transformer</em>.
-A transformation procedure is a procedure that must accept one
-argument, a wrapped syntax object (section&nbsp;<a href="#node_sec_12.2">12.2</a>)
-representing the input, and return a syntax object
-(section&nbsp;<a href="#node_sec_12.2">12.2</a>) representing the output.
-The transformer is called by the expander whenever a reference to
-a keyword with which it has been associated is found.
-If the keyword appears in the car of a list-structured
-input form, the transformer receives the entire list-structured
-form, and its output replaces the entire form.
-Except with variable transformers (see below),
-if the keyword is found in any other definition or expression
-context, the transformer receives a wrapped syntax object representing
-just the keyword reference, and its output replaces just the reference.
-Except with variable transformers, an exception with condition
-type <tt>&amp;syntax</tt> is raised if the keyword appears on the left-hand side
-of a <tt>set!</tt> expression.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1120"></a>make-variable-transformer<i> proc</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Proc</i> should accept one argument,
-a wrapped syntax object, and return a syntax object.</p>
-<p>
-The <tt>make-variable-transformer</tt> procedure creates a
-<a name="node_idx_1122"></a><em>variable transformer</em>.
-A variable transformer is like an ordinary transformer except
-that, if a keyword associated with a variable transformer appears on
-the left-hand side of a <tt>set!</tt> expression, an exception is
-not raised.
-Instead, <i>proc</i> is called with a
-wrapped syntax object representing the entire <tt>set!</tt> expression as
-its argument, and its return value replaces the entire <tt>set!</tt>
-expression.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the restrictions on <i>proc</i>
-only to the extent performed by applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_12.4"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_12.4">12.4&nbsp;&nbsp;Parsing input and producing output</a></h2>
-<p></p>
-<p>
-Transformers can destructure their input with <tt>syntax-case</tt> and rebuild
-their output with <tt>syntax</tt>.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(syntax-case &lt;expression&gt; (&lt;literal&gt; <tt>...</tt>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<a name="node_idx_1124"></a><tt>&nbsp;&nbsp;&nbsp;&lt;syntax-case&nbsp;clause&gt;&nbsp;<tt>...</tt>)</tt><br>
-<div align=left><tt>_</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<div align=left><tt>...</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-<a name="node_idx_1126"></a><a name="node_idx_1128"></a><p>
-<em>Syntax: </em>Each &lt;literal&gt; must be an identifier.
-Each &lt;syntax-case clause&gt; must take one of the following two forms.</p>
-<p>
-</p>
-
-<tt>(&lt;pattern&gt;&nbsp;&lt;output&nbsp;expression&gt;)<br>
-(&lt;pattern&gt;&nbsp;&lt;fender&gt;&nbsp;&lt;output&nbsp;expression&gt;)<p></tt></p>
-<p>
-&lt;Fender&gt; and &lt;output expression&gt; must be
-&lt;expression&gt;s.</p>
-<p>
-A &lt;pattern&gt; is an identifier, constant, or one of the following.</p>
-<p>
-</p>
-
-<tt>(&lt;pattern&gt;&nbsp;<tt>...</tt>)<br>
-(&lt;pattern&gt;&nbsp;&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;.&nbsp;&lt;pattern&gt;)<br>
-(&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;&lt;pattern&gt;&nbsp;&lt;ellipsis&gt;&nbsp;&lt;pattern&gt;&nbsp;<tt>...</tt>)<br>
-(&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;&lt;pattern&gt;&nbsp;&lt;ellipsis&gt;&nbsp;&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;.&nbsp;&lt;pattern&gt;)<br>
-#(&lt;pattern&gt;&nbsp;<tt>...</tt>)<br>
-#(&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;&lt;pattern&gt;&nbsp;&lt;ellipsis&gt;&nbsp;&lt;pattern&gt;&nbsp;<tt>...</tt>)<p></tt></p>
-<p>
-An &lt;ellipsis&gt; is the identifier &#8220;<tt>...</tt>&#8221; (three periods).<a name="node_idx_1130"></a></p>
-<p>
-An identifier appearing within a &lt;pattern&gt; may be an underscore
-(&nbsp;<tt>_</tt>&nbsp;), a literal identifier listed in the list of literals
-<tt>(&lt;literal&gt; <tt>...</tt>)</tt>, or an ellipsis (&nbsp;<tt>...</tt>&nbsp;).
-All other identifiers appearing within a &lt;pattern&gt; are
-<i>pattern variables<a name="node_idx_1132"></a></i>.
-It is a syntax violation if an ellipsis or underscore appears in <tt>(&lt;literal&gt; <tt>...</tt>)</tt>.</p>
-<p>
-<tt>_</tt> and <tt>...</tt> are the same as in the <tt>(rnrs base (6))</tt> library.</p>
-<p>
-Pattern variables match arbitrary input subforms and
-are used to refer to elements of the input.
-It is a syntax violation if the same pattern variable appears more than once in a
-&lt;pattern&gt;.</p>
-<p>
-Underscores also match arbitrary input subforms but are not pattern variables
-and so cannot be used to refer to those elements.
-Multiple underscores may appear in a &lt;pattern&gt;.</p>
-<p>
-A literal identifier matches an input subform if and only if the input
-subform is an identifier and either both its occurrence in the input
-expression and its occurrence in the list of literals have the same
-lexical binding, or the two identifiers have the same name and both have
-no lexical binding.</p>
-<p>
-A subpattern followed by an ellipsis can match zero or more elements of
-the input.</p>
-<p>
-More formally, an input form <em>F</em> matches a pattern <em>P</em> if and only if
-one of the following holds:</p>
-<p>
-</p>
-<ul>
-<li><p><em>P</em> is an underscore (&nbsp;<tt>_</tt>&nbsp;).</p>
-<p>
-</p>
-<li><p><em>P</em> is a pattern variable.</p>
-<p>
-</p>
-<li><p><em>P</em> is a literal identifier
-and <em>F</em> is an equivalent identifier in the
-sense of <tt>free-identifier=?</tt>
-(section&nbsp;<a href="#node_sec_12.5">12.5</a>).</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub>)</tt>
-and <em>F</em> is a list of <em>n</em> elements that match <em>P</em><sub>1</sub> through
-<em>P</em><sub><em>n</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub> . <em>P</em><sub><em>x</em></sub>)</tt>
-and <em>F</em> is a list or improper list of <em>n</em> or more elements
-whose first <em>n</em> elements match <em>P</em><sub>1</sub> through <em>P</em><sub><em>n</em></sub>
-and
-whose <em>n</em>th cdr matches <em>P</em><sub><em>x</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>k</em></sub> <em>P</em><sub><em>e</em></sub> &lt;ellipsis&gt; <em>P</em><sub><em>m</em>+1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub>)</tt>,
-where &lt;ellipsis&gt; is the identifier <tt>...</tt>
-and <em>F</em> is a proper list of <em>n</em>
-elements whose first <em>k</em> elements match <em>P</em><sub>1</sub> through <em>P</em><sub><em>k</em></sub>,
-whose next <em>m</em> <tt>-</tt> <em>k</em> elements each match <em>P</em><sub><em>e</em></sub>,
-and
-whose remaining <em>n</em> <tt>-</tt> <em>m</em> elements match <em>P</em><sub><em>m</em>+1</sub> through <em>P</em><sub><em>n</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>k</em></sub> <em>P</em><sub><em>e</em></sub> &lt;ellipsis&gt; <em>P</em><sub><em>m</em>+1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub> . <em>P</em><sub><em>x</em></sub>)</tt>,
-where &lt;ellipsis&gt; is the identifier <tt>...</tt>
-and <em>F</em> is a list or improper list of <em>n</em>
-elements whose first <em>k</em> elements match <em>P</em><sub>1</sub> through <em>P</em><sub><em>k</em></sub>,
-whose next <em>m</em> <tt>-</tt> <em>k</em> elements each match <em>P</em><sub><em>e</em></sub>,
-whose next <em>n</em> <tt>-</tt> <em>m</em> elements match <em>P</em><sub><em>m</em>+1</sub> through <em>P</em><sub><em>n</em></sub>,
-and 
-whose <em>n</em>th and final cdr matches <em>P</em><sub><em>x</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>#(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub>)</tt>
-and <em>F</em> is a vector of <em>n</em> elements that match <em>P</em><sub>1</sub> through
-<em>P</em><sub><em>n</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>#(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>k</em></sub> <em>P</em><sub><em>e</em></sub> &lt;ellipsis&gt; <em>P</em><sub><em>m</em>+1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub>)</tt>,
-where &lt;ellipsis&gt; is the identifier <tt>...</tt>
-and <em>F</em> is a vector of <em>n</em> or more elements
-whose first <em>k</em> elements match <em>P</em><sub>1</sub> through <em>P</em><sub><em>k</em></sub>,
-whose next <em>m</em> <tt>-</tt> <em>k</em> elements each match <em>P</em><sub><em>e</em></sub>,
-and
-whose remaining <em>n</em> <tt>-</tt> <em>m</em> elements match <em>P</em><sub><em>m</em>+1</sub> through <em>P</em><sub><em>n</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is a pattern datum (any nonlist, nonvector, nonsymbol
-datum) and <em>F</em> is equal to <em>P</em> in the sense of the
-<tt>equal?</tt> procedure.
-</p>
-</ul><p></p>
-<p>
-<em>Semantics: </em>A <tt>syntax-case</tt> expression first evaluates &lt;expression&gt;.
-It then attempts to match
-the &lt;pattern&gt; from the first &lt;syntax-case clause&gt; against the resulting value,
-which is unwrapped as necessary to perform the match.
-If the pattern matches the value and no
-&lt;fender&gt; is present,
-&lt;output expression&gt; is evaluated and its value returned as the
-value of the <tt>syntax-case</tt> expression.
-If the pattern does not match the value, <tt>syntax-case</tt> tries
-the second &lt;syntax-case clause&gt;, then the third, and so on.
-It is a syntax violation if the value does not match any of the patterns.</p>
-<p>
-If the optional &lt;fender&gt; is present, it serves as an additional
-constraint on acceptance of a clause.
-If the &lt;pattern&gt; of a given &lt;syntax-case clause&gt; matches the input value,
-the corresponding &lt;fender&gt; is evaluated.
-If &lt;fender&gt; evaluates to a true value, the clause is accepted;
-otherwise, the clause is rejected as if the pattern had failed to match
-the value.
-Fenders are logically a part of the matching process, i.e., they
-specify additional matching constraints beyond the basic structure of
-the input.</p>
-<p>
-Pattern variables contained within a clause&#8217;s
-&lt;pattern&gt; are bound to the corresponding pieces of the input
-value within the clause&#8217;s &lt;fender&gt; (if present) and
-&lt;output expression&gt;.
-Pattern variables can be referenced only within <tt>syntax</tt>
-expressions (see below).
-Pattern variables occupy the same name space as program variables and
-keywords.</p>
-<p>
-If the <tt>syntax-case</tt> form is in tail context, the &lt;output
-expression&gt;s are also in tail position.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1134"></a>syntax<i> &lt;template&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-<tt>#&#8217;&lt;template&gt;</tt> is equivalent to <tt>(syntax
-&lt;template&gt;)</tt>.
-</blockquote><p>
-A <tt>syntax</tt> expression is similar to a <tt>quote</tt> expression
-except that (1) the values of pattern variables appearing within
-&lt;template&gt; are inserted into &lt;template&gt;, (2) contextual
-information associated both with the input and with the template is
-retained in the output to support lexical scoping, and (3) the value
-of a <tt>syntax</tt> expression is a syntax object.</p>
-<p>
-A &lt;template&gt; is a pattern variable, an identifier that
-is not a pattern
-variable, a pattern datum, or one of the following.</p>
-<p>
-</p>
-
-<tt>(&lt;subtemplate&gt;&nbsp;<tt>...</tt>)<br>
-(&lt;subtemplate&gt;&nbsp;<tt>...</tt>&nbsp;.&nbsp;&lt;template&gt;)<br>
-#(&lt;subtemplate&gt;&nbsp;<tt>...</tt>)<p></tt></p>
-<p>
-A &lt;subtemplate&gt; is a &lt;template&gt; followed by zero or more ellipses.</p>
-<p>
-The value of a <tt>syntax</tt> form is a copy of &lt;template&gt; in which
-the pattern variables appearing within the template are replaced with
-the input subforms to which they are bound.
-Pattern data and identifiers that are not pattern variables
-or ellipses are copied directly into the output.
-A subtemplate followed by an ellipsis expands
-into zero or more occurrences of the subtemplate.
-Pattern variables that occur in subpatterns followed by one or more
-ellipses may occur only in subtemplates that are
-followed by (at least) as many ellipses.
-These pattern variables are replaced in the output by the input
-subforms to which they are bound, distributed as specified.
-If a pattern variable is followed by more ellipses in the subtemplate
-than in the associated subpattern, the input form is replicated as
-necessary.
-The subtemplate must contain at least one pattern variable from a
-subpattern followed by an ellipsis, and for at least one such pattern
-variable, the subtemplate must be followed by exactly as many ellipses as
-the subpattern in which the pattern variable appears.
-(Otherwise, the expander would not be able to determine how many times the
-subform should be repeated in the output.)
-It is a syntax violation if the constraints of this paragraph are not met.</p>
-<p>
-A template of the form
-<tt>(&lt;ellipsis&gt; &lt;template&gt;)</tt> is identical to &lt;template&gt;, except that
-ellipses within the template have no special meaning.
-That is, any ellipses contained within &lt;template&gt; are
-treated as ordinary identifiers.
-In particular, the template <tt>(... ...)</tt> produces a single
-ellipsis.
-This allows macro uses to expand into forms containing
-ellipses.</p>
-<p>
-
-The output produced by <tt>syntax</tt> is wrapped or unwrapped according to
-the following rules.</p>
-<p>
-</p>
-<ul>
-<li><p>the copy of <tt>(&lt;t<sub>1</sub>&gt; .  &lt;t<sub>2</sub>&gt;)</tt> is a pair if &lt;t<sub>1</sub>&gt;
-or &lt;t<sub>2</sub>&gt; contain any pattern variables,
-</p>
-<li><p>the copy of <tt>(&lt;t&gt; &lt;ellipsis&gt;)</tt> is a list if &lt;t&gt;
-contains any pattern variables,
-</p>
-<li><p>the copy of <tt>#(&lt;t<sub>1</sub>&gt; ... &lt;t<sub><em>n</em></sub>&gt;)</tt> is a vector if any of
-&lt;t<sub>1</sub>&gt;,&nbsp;<tt>...</tt>,&nbsp;&lt;t<sub><em>n</em></sub>&gt; contain any pattern variables, and
-</p>
-<li><p>the copy of any portion of &lt;t&gt; not containing any pattern variables
-is a wrapped syntax object.
-</p>
-</ul><p></p>
-<p>
-The input subforms inserted in place of the pattern variables are wrapped
-if and only if the corresponding input subforms are wrapped.
-</p>
-<p></p>
-<p>
-The following definitions of <tt>or</tt> illustrate <tt>syntax-case</tt>
-and <tt>syntax</tt>.
-The second is equivalent to the first but uses the <tt>#&#8217;</tt>
-prefix instead of the full <tt>syntax</tt> form.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;or<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_)&nbsp;(syntax&nbsp;<tt>#f</tt>)]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;e)&nbsp;(syntax&nbsp;e)]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;e1&nbsp;e2&nbsp;e3&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax&nbsp;(let&nbsp;([t&nbsp;e1])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;t&nbsp;t&nbsp;(or&nbsp;e2&nbsp;e3&nbsp;...))))])))<br>
-<br>
-(define-syntax&nbsp;or<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_)&nbsp;#&#8217;<tt>#f</tt>]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;e)&nbsp;#&#8217;e]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;e1&nbsp;e2&nbsp;e3&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(let&nbsp;([t&nbsp;e1])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;t&nbsp;t&nbsp;(or&nbsp;e2&nbsp;e3&nbsp;...)))])))<p></tt></p>
-<p>
-The examples below define <em>identifier macros<a name="node_idx_1136"></a></em>, macro uses
-supporting keyword references that do not necessarily appear in the first
-position of a list-structured form.
-The second example uses <tt>make-variable-transformer</tt> to handle the case
-where the keyword appears on the left-hand side of a
-<tt>set!</tt> expression.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;p&nbsp;(cons&nbsp;4&nbsp;5))<br>
-(define-syntax&nbsp;p.car<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;.&nbsp;rest)&nbsp;#&#8217;((car&nbsp;p)&nbsp;.&nbsp;rest)]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[_&nbsp;&nbsp;#&#8217;(car&nbsp;p)])))<br>
-p.car&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;4<br>
-(set!&nbsp;p.car&nbsp;15)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>&nbsp;&amp;syntax</tt>&nbsp;<i>exception</i><br>
-<br>
-(define&nbsp;p&nbsp;(cons&nbsp;4&nbsp;5))<br>
-(define-syntax&nbsp;p.car<br>
-&nbsp;&nbsp;(make-variable-transformer<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;(set!)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(set!&nbsp;_&nbsp;e)&nbsp;#&#8217;(set-car!&nbsp;p&nbsp;e)]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;.&nbsp;rest)&nbsp;#&#8217;((car&nbsp;p)&nbsp;.&nbsp;rest)]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[_&nbsp;&nbsp;#&#8217;(car&nbsp;p)]))))<br>
-(set!&nbsp;p.car&nbsp;15)<br>
-p.car&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;15<br>
-p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(15&nbsp;5)<p></tt></p>
-<p>
-</p>
-<a name="node_sec_12.5"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_12.5">12.5&nbsp;&nbsp;Identifier predicates</a></h2>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1138"></a>identifier?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is an identifier, i.e., a
-syntax object representing an identifier, and <tt>#f</tt> otherwise.</p>
-<p>
-The <tt>identifier?</tt> procedure is often used within a fender to verify
-that certain subforms of an input form are identifiers, as in the
-definition of <tt>rec</tt>, which creates self-contained
-recursive objects, below.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;rec<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;x&nbsp;e)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(identifier?&nbsp;#&#8217;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(letrec&nbsp;([x&nbsp;e])&nbsp;x)])))<br>
-<br>
-(map&nbsp;(rec&nbsp;fact<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(=&nbsp;n&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*&nbsp;n&nbsp;(fact&nbsp;(-&nbsp;n&nbsp;1))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;2&nbsp;6&nbsp;24&nbsp;120)<br>
-&nbsp;<br>
-(rec&nbsp;5&nbsp;(lambda&nbsp;(x)&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>&nbsp;&amp;syntax</tt>&nbsp;<i>exception</i><p></tt>
-</p>
-<p></p>
-<p>
-The procedures <tt>bound-identifier=?</tt> and <tt>free-identifier=?</tt>
-each take two identifier arguments and return <tt>#t</tt> if their
-arguments are equivalent and <tt>#f</tt> otherwise.
-These predicates are used to compare identifiers according to their
-<em>intended use</em> as free references or bound identifiers in a given
-context.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1140"></a>bound-identifier=?<i> <i>id<sub>1</sub></i> <i>id<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Id<sub>1</sub></i> and <i>id<sub>2</sub></i> must be identifiers.
-The procedure <tt>bound-identifier=?</tt> returns <tt>#t</tt> if a
-binding for one would capture a reference to the other in the output of
-the transformer, assuming that the reference appears within the scope of
-the binding, and <tt>#f</tt> otherwise.
-In general, two identifiers are <tt>bound-identifier=?</tt> only if
-both are present in the original program or both are introduced by the
-same transformer application
-(perhaps implicitly&#8212;see <tt>datum-&gt;syntax</tt>).
-Operationally, two identifiers are
-considered equivalent by <tt>bound-identifier=?</tt> if and only if they
-have the same name and same marks (section&nbsp;<a href="#node_sec_12.1">12.1</a>).</p>
-<p>
-The <tt>bound-identifier=?</tt> procedure can be used for detecting
-duplicate identifiers in a binding construct or for other
-preprocessing of a binding construct that requires detecting instances
-of the bound identifiers.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1142"></a>free-identifier=?<i> <i>id<sub>1</sub></i> <i>id<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Id<sub>1</sub></i> and <i>id<sub>2</sub></i> must be identifiers.
-The <tt>free-identifier=?</tt> procedure returns <tt>#t</tt> if and
-only if the two identifiers would resolve to the same binding if both were
-to appear in the output of a transformer outside of any bindings inserted
-by the transformer.
-(If neither of two like-named identifiers resolves to a binding, i.e., both
-are unbound, they are considered to resolve to the same binding.)
-Operationally, two identifiers are considered equivalent by
-<tt>free-identifier=?</tt> if and only the topmost matching
-substitution for each maps to the same binding (section&nbsp;<a href="#node_sec_12.1">12.1</a>)
-or the identifiers have the same name and no matching substitution.</p>
-<p>
-The <tt>syntax-case</tt> and <tt>syntax-rules</tt> forms internally use
-<tt>free-identifier=?</tt> to compare identifiers listed in the literals
-list against input identifiers.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;([fred&nbsp;17])<br>
-&nbsp;&nbsp;(define-syntax&nbsp;a<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;id)&nbsp;<tt>#</tt>&#8217;(b&nbsp;id&nbsp;fred)])))<br>
-&nbsp;&nbsp;(define-syntax&nbsp;b<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;id1&nbsp;id2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#</tt>&#8216;(list<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#</tt>,(free-identifier=?&nbsp;<tt>#</tt>&#8217;id1&nbsp;<tt>#</tt>&#8217;id2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#</tt>,(bound-identifier=?&nbsp;<tt>#</tt>&#8217;id1&nbsp;<tt>#</tt>&#8217;id2))])))<br>
-&nbsp;&nbsp;(a&nbsp;fred))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(<tt>#t</tt>&nbsp;<tt>#f</tt>)<p></tt></p>
-<p>
-The following definition of unnamed <tt>let</tt>
-uses <tt>bound-identifier=?</tt> to detect duplicate identifiers.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;let<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(define&nbsp;unique-ids?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(ls)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(or&nbsp;(null?&nbsp;ls)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(and&nbsp;(let&nbsp;notmem?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;([x&nbsp;(car&nbsp;ls)]&nbsp;[ls&nbsp;(cdr&nbsp;ls)])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(or&nbsp;(null?&nbsp;ls)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(and&nbsp;(not&nbsp;(bound-identifier=?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x&nbsp;(car&nbsp;ls)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(notmem?&nbsp;x&nbsp;(cdr&nbsp;ls)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(unique-ids?&nbsp;(cdr&nbsp;ls))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;((i&nbsp;v)&nbsp;...)&nbsp;e1&nbsp;e2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(unique-ids?&nbsp;#&#8217;(i&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;((lambda&nbsp;(i&nbsp;...)&nbsp;e1&nbsp;e2&nbsp;...)&nbsp;v&nbsp;...)])))<p></tt></p>
-<p>
-The argument <tt>#&#8217;(i ...)</tt> to <tt>unique-ids?</tt> is guaranteed
-to be a list by the rules given in the description of <tt>syntax</tt>
-above.</p>
-<p>
-With this definition of <tt>let</tt>:</p>
-<p>
-</p>
-
-<tt>(let&nbsp;([a&nbsp;3]&nbsp;[a&nbsp;4])&nbsp;(+&nbsp;a&nbsp;a))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>&nbsp;&amp;syntax</tt>&nbsp;<i>exception</i><p></tt></p>
-<p>
-However,</p>
-<p>
-</p>
-
-<tt>(let-syntax<br>
-&nbsp;&nbsp;([dolet&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;b)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(let&nbsp;([a&nbsp;3]&nbsp;[b&nbsp;4])&nbsp;(+&nbsp;a&nbsp;b))]))])<br>
-&nbsp;&nbsp;(dolet&nbsp;a))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;7<p></tt></p>
-<p>
-since the identifier <tt>a</tt> introduced by <tt>dolet</tt>
-and the identifier <tt>a</tt> extracted from the input form are not
-<tt>bound-identifier=?</tt>.</p>
-<p>
-The following definition of <tt>case</tt> is equivalent to the one in
-section&nbsp;<a href="#node_sec_12.4">12.4</a>.
-Rather than including <tt>else</tt> in the literals list as before,
-this version explicitly tests for <tt>else</tt> using
-<tt>free-identifier=?</tt>.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;case<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;e0&nbsp;[(k&nbsp;...)&nbsp;e1&nbsp;e2&nbsp;...]&nbsp;...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[else-key&nbsp;else-e1&nbsp;else-e2&nbsp;...])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(and&nbsp;(identifier?&nbsp;#&#8217;else-key)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(free-identifier=?&nbsp;#&#8217;else-key&nbsp;#&#8217;else))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(let&nbsp;([t&nbsp;e0])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(memv&nbsp;t&nbsp;&#8217;(k&nbsp;...))&nbsp;e1&nbsp;e2&nbsp;...]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[else&nbsp;else-e1&nbsp;else-e2&nbsp;...]))]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;e0&nbsp;[(ka&nbsp;...)&nbsp;e1a&nbsp;e2a&nbsp;...]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(kb&nbsp;...)&nbsp;e1b&nbsp;e2b&nbsp;...]&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(let&nbsp;([t&nbsp;e0])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(memv&nbsp;t&nbsp;&#8217;(ka&nbsp;...))&nbsp;e1a&nbsp;e2a&nbsp;...]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(memv&nbsp;t&nbsp;&#8217;(kb&nbsp;...))&nbsp;e1b&nbsp;e2b&nbsp;...]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...))])))<p></tt></p>
-<p>
-With either definition of <tt>case</tt>, <tt>else</tt> is not
-recognized as an auxiliary
-keyword if an enclosing lexical binding for <tt>else</tt> exists.
-For example,</p>
-<p>
-</p>
-
-<tt>(let&nbsp;([else&nbsp;<tt>#f</tt>])<br>
-&nbsp;&nbsp;(case&nbsp;0&nbsp;[else&nbsp;(write&nbsp;&quot;oops&quot;)]))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>&nbsp;&amp;syntax</tt>&nbsp;<i>exception</i><p></tt></p>
-<p>
-since <tt>else</tt> is bound
-lexically and is
-therefore not the same <tt>else</tt> that appears in the definition of
-<tt>case</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_12.6"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_12.6">12.6&nbsp;&nbsp;Syntax-object and datum conversions</a></h2>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1144"></a>syntax-&gt;datum<i> syntax-object</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Strips all syntactic information from a syntax
-object and returns the corresponding Scheme datum.
-</p>
-<p></p>
-<p>
-Identifiers stripped in this manner are converted to their symbolic
-names, which can then be compared with <tt>eq?</tt>.
-Thus, a predicate <tt>symbolic-identifier=?</tt> might be defined as follows.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;symbolic-identifier=?<br>
-&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(eq?&nbsp;(syntax-&gt;datum&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-&gt;datum&nbsp;y))))<p></tt></p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1146"></a>datum-&gt;syntax<i> template-id datum</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<p></p>
-<p>
-<i>Template-id</i> must be a
-template identifier and <i>datum</i> should be a datum value.
-The <tt>datum-&gt;syntax</tt> procedure returns a syntax-object representation of <i>datum</i> that
-contains the same contextual information as
-<i>template-id</i>, with the effect that the
-syntax object behaves
-as if it were introduced into the code when
-<i>template-id</i> was introduced.</p>
-<p>
-The <tt>datum-&gt;syntax</tt> procedure allows a transformer to &#8220;bend&#8221; lexical
-scoping rules by creating <i>implicit
-identifiers<a name="node_idx_1148"></a></i>
-that behave as if they were present in the input form,
-thus permitting the definition of macros
-that introduce visible bindings for or references to
-identifiers that do not appear explicitly in the input form.
-For example, the following defines a <tt>loop</tt> expression that
-uses this controlled form of identifier capture to
-bind the variable <tt>break</tt> to an escape procedure
-within the loop body.
-(The derived <tt>with-syntax</tt> form is like <tt>let</tt> but binds
-pattern variables&#8212;see section&nbsp;<a href="#node_sec_12.8">12.8</a>.)</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;loop<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(k&nbsp;e&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(with-syntax<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;([break&nbsp;(datum-&gt;syntax&nbsp;#&#8217;k&nbsp;&#8217;break)])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(call-with-current-continuation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(break)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;f&nbsp;()&nbsp;e&nbsp;...&nbsp;(f)))))])))<br>
-<br>
-(let&nbsp;((n&nbsp;3)&nbsp;(ls&nbsp;&#8217;()))<br>
-&nbsp;&nbsp;(loop<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(=&nbsp;n&nbsp;0)&nbsp;(break&nbsp;ls))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;ls&nbsp;(cons&nbsp;&#8217;a&nbsp;ls))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;n&nbsp;(-&nbsp;n&nbsp;1))))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(a&nbsp;a&nbsp;a)<p></tt></p>
-<p>
-Were <tt>loop</tt> to be defined as</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;loop<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;e&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(call-with-current-continuation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(break)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;f&nbsp;()&nbsp;e&nbsp;...&nbsp;(f))))])))<p></tt></p>
-<p>
-the variable <tt>break</tt> would not be visible in <tt>e <tt>...</tt></tt>.</p>
-<p>
-The datum argument <i>datum</i> may also represent an arbitrary
-Scheme form, as demonstrated by the following definition of
-<tt>include</tt>.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;include<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(define&nbsp;read-file<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(fn&nbsp;k)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;([p&nbsp;(open-file-input-port&nbsp;fn)])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;f&nbsp;([x&nbsp;(get-datum&nbsp;p)])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(eof-object?&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;(close-port&nbsp;p)&nbsp;&#8217;())<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;(datum-&gt;syntax&nbsp;k&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(f&nbsp;(get-datum&nbsp;p))))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(k&nbsp;filename)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;([fn&nbsp;(syntax-&gt;datum&nbsp;#&#8217;filename)])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(with-syntax&nbsp;([(exp&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(read-file&nbsp;fn&nbsp;#&#8217;k)])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(begin&nbsp;exp&nbsp;...)))])))<p></tt></p>
-<p>
-<tt>(include &quot;filename&quot;)</tt> expands into a <tt>begin</tt> expression
-containing the forms found in the file named by
-<tt>&quot;filename&quot;</tt>.
-For example, if the file <tt>flib.ss</tt> contains
-<tt>(define f (lambda (x) (g (* x x))))</tt>, and the file
-<tt>glib.ss</tt> contains
-<tt>(define g (lambda (x) (+ x x)))</tt>,
-the expression</p>
-<p>
-</p>
-
-<tt>(let&nbsp;()<br>
-&nbsp;&nbsp;(include&nbsp;&quot;flib.ss&quot;)<br>
-&nbsp;&nbsp;(include&nbsp;&quot;glib.ss&quot;)<br>
-&nbsp;&nbsp;(f&nbsp;5))<p></tt></p>
-<p>
-evaluates to <tt>50</tt>.</p>
-<p>
-The definition of <tt>include</tt> uses <tt>datum-&gt;syntax</tt> to convert
-the objects read from the file into syntax objects in the proper
-lexical context, so that identifier references and definitions within
-those expressions are scoped where the <tt>include</tt> form appears.</p>
-<p>
-Using <tt>datum-&gt;syntax</tt>, it is even possible to break hygiene
-entirely and write macros in the style of old Lisp macros.
-The <tt>lisp-transformer</tt> procedure defined below creates a transformer
-that converts its input into a datum, calls the programmer&#8217;s procedure on
-this datum, and converts the result back into a syntax object scoped
-where the original macro use appeared.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;lisp-transformer<br>
-&nbsp;&nbsp;(lambda&nbsp;(p)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(kwd&nbsp;.&nbsp;rest)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(datum-&gt;syntax&nbsp;#&#8217;kwd<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(p&nbsp;(syntax-&gt;datum&nbsp;x)))]))))<p></tt></p>
-<p>
-</p>
-<a name="node_sec_12.7"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_12.7">12.7&nbsp;&nbsp;Generating lists of temporaries</a></h2>
-<p></p>
-<p>
-Transformers can introduce a fixed number of identifiers into their
-output simply by naming each identifier.
-In some cases, however, the number of identifiers to be introduced depends
-upon some characteristic of the input expression.
-A straightforward definition of <tt>letrec</tt>, for example,
-requires as many
-temporary identifiers as there are binding pairs in the
-input expression.
-The procedure <tt>generate-temporaries</tt> is used to construct
-lists of temporary identifiers.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1150"></a>generate-temporaries<i> l</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>L</i> must be be a list or syntax object representing a list-structured
-form; its contents are not important.
-The number of temporaries generated is the number of elements in <i>l</i>.
-Each temporary is guaranteed to be unique, i.e., different from all other
-identifiers.</p>
-<p>
-A definition of <tt>letrec</tt> equivalent to the one using
-<tt>syntax-rules</tt> given in report
-appendix&nbsp;on &#8220;Sample definitions for
-derived forms&#8221; is shown below.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;letrec<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((_&nbsp;((i&nbsp;e)&nbsp;...)&nbsp;b1&nbsp;b2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(with-syntax<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(((t&nbsp;...)&nbsp;(generate-temporaries&nbsp;#&#8217;(i&nbsp;...))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(let&nbsp;((i&nbsp;&lt;undefined&gt;)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((t&nbsp;e)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;i&nbsp;t)&nbsp;...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;()&nbsp;b1&nbsp;b2&nbsp;...))))))))<p></tt></p>
-<p>
-This version uses <tt>generate-temporaries</tt> instead of recursively defined
-helper to generate the necessary temporaries.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_12.8"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_12.8">12.8&nbsp;&nbsp;Derived forms and procedures</a></h2>
-<p></p>
-<p>
-The forms and procedures described in this section can be defined in
-terms of the forms and procedures described in earlier sections of
-this chapter.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(with-syntax ((&lt;pattern&gt; &lt;expression&gt;) <tt>...</tt>) &lt;body&gt;)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<a name="node_idx_1152"></a><p>
-The <tt>with-syntax</tt> form is used to bind pattern variables,
-just as <tt>let</tt> is used to bind variables.
-This allows a transformer to construct its output in separate
-pieces, then put the pieces together.</p>
-<p>
-Each &lt;pattern&gt; is identical in form to a <tt>syntax-case</tt> pattern.
-The value of each &lt;expression&gt; is computed and destructured according
-to the corresponding &lt;pattern&gt;, and pattern variables within
-the &lt;pattern&gt; are bound as with <tt>syntax-case</tt> to the
-corresponding portions of the value within &lt;body&gt;.</p>
-<p>
-The <tt>with-syntax</tt> form may be defined in terms of <tt>syntax-case</tt> as
-follows.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;with-syntax<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((_&nbsp;((p&nbsp;e0)&nbsp;...)&nbsp;e1&nbsp;e2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax&nbsp;(syntax-case&nbsp;(list&nbsp;e0&nbsp;...)&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((p&nbsp;...)&nbsp;(let&nbsp;()&nbsp;e1&nbsp;e2&nbsp;...))))))))<p></tt></p>
-<p>
-The following definition of <tt>cond</tt> demonstrates the use of
-<tt>with-syntax</tt> to support transformers that employ recursion
-internally to construct their output.
-It handles all <tt>cond</tt> clause variations and takes care to produce
-one-armed <tt>if</tt> expressions where appropriate.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;cond<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;c1&nbsp;c2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;f&nbsp;([c1&nbsp;#&#8217;c1]&nbsp;[c2*&nbsp;#&#8217;(c2&nbsp;...)])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;c2*&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;c1&nbsp;(else&nbsp;=&gt;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(else&nbsp;e1&nbsp;e2&nbsp;...)&nbsp;#&#8217;(begin&nbsp;e1&nbsp;e2&nbsp;...)]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(e0)&nbsp;#&#8217;e0]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(e0&nbsp;=&gt;&nbsp;e1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(let&nbsp;([t&nbsp;e0])&nbsp;(if&nbsp;t&nbsp;(e1&nbsp;t)))]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(e0&nbsp;e1&nbsp;e2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(if&nbsp;e0&nbsp;(begin&nbsp;e1&nbsp;e2&nbsp;...))])]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(c2&nbsp;c3&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(with-syntax&nbsp;([rest&nbsp;(f&nbsp;#&#8217;c2&nbsp;#&#8217;(c3&nbsp;...))])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;c1&nbsp;(=&gt;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(e0)&nbsp;#&#8217;(let&nbsp;([t&nbsp;e0])&nbsp;(if&nbsp;t&nbsp;t&nbsp;rest))]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(e0&nbsp;=&gt;&nbsp;e1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(let&nbsp;([t&nbsp;e0])&nbsp;(if&nbsp;t&nbsp;(e1&nbsp;t)&nbsp;rest))]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(e0&nbsp;e1&nbsp;e2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(if&nbsp;e0&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;e1&nbsp;e2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rest)]))]))])))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1154"></a>quasisyntax<i> &lt;template&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<a name="node_idx_1156"></a><div align=left><tt>unsyntax</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_1158"></a><div align=left><tt>unsyntax-splicing</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-<p>
-The <tt>quasisyntax</tt> form is similar to <tt>syntax</tt>, but it allows parts
-of the quoted text to be evaluated, in a manner similar to the operation
-of <tt>quasiquote</tt> (report section&nbsp;on &#8220;Quasiquotation&#8221;).</p>
-<p>
-Within a <tt>quasisyntax</tt> <i>template</i>, subforms of
-<tt>unsyntax</tt> and <tt>unsyntax-splicing</tt> forms are evaluated,
-and everything else is treated as ordinary template material, as
-with <tt>syntax</tt>.
-The value of each <tt>unsyntax</tt> subform is inserted into the output
-in place of the <tt>unsyntax</tt> form, while the value of each
-<tt>unsyntax-splicing</tt> subform is spliced into the surrounding list
-or vector structure.
-Uses of <tt>unsyntax</tt> and <tt>unsyntax-splicing</tt> are valid only within
-<tt>quasisyntax</tt> expressions.</p>
-<p>
-A <tt>quasisyntax</tt> expression may be nested, with each <tt>quasisyntax</tt>
-introducing a new level of syntax quotation and each <tt>unsyntax</tt> or
-<tt>unsyntax-splicing</tt> taking away a level of quotation.
-An expression nested within <em>n</em> <tt>quasisyntax</tt> expressions must
-be within <em>n</em> <tt>unsyntax</tt> or <tt>unsyntax-splicing</tt> expressions to
-be evaluated.</p>
-<p>
-As noted in report section&nbsp;on &#8220;Abbreviations&#8221;,
-<tt>#&#8216;&lt;template&gt;</tt> is equivalent to <tt>(quasisyntax
-&lt;template&gt;)</tt>, <tt>#,&lt;template&gt;</tt> is equivalent to <tt>(unsyntax
-&lt;template&gt;)</tt>, and <tt>#,@&lt;template&gt;</tt> is equivalent to <tt>(unsyntax-splicing
-&lt;template&gt;)</tt>.</p>
-<p>
-The <tt>quasisyntax</tt> keyword can be used in place of <tt>with-syntax</tt> in many
-cases.
-For example, the definition of <tt>case</tt> shown under the description
-of <tt>with-syntax</tt> above can be rewritten using <tt>quasisyntax</tt>
-as follows.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;case<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;e&nbsp;c1&nbsp;c2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8216;(let&nbsp;([t&nbsp;e])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#,(let&nbsp;f&nbsp;([c1&nbsp;#&#8217;c1]&nbsp;[cmore&nbsp;#&#8217;(c2&nbsp;...)])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(null?&nbsp;cmore)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;c1&nbsp;(else)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(else&nbsp;e1&nbsp;e2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(begin&nbsp;e1&nbsp;e2&nbsp;...)]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[((k&nbsp;...)&nbsp;e1&nbsp;e2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8217;(if&nbsp;(memv&nbsp;t&nbsp;&#8217;(k&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;e1&nbsp;e2&nbsp;...))])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;c1&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[((k&nbsp;...)&nbsp;e1&nbsp;e2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#&#8216;(if&nbsp;(memv&nbsp;t&nbsp;&#8217;(k&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;e1&nbsp;e2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#,(f&nbsp;(car&nbsp;cmore)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cdr&nbsp;cmore)))]))))])))<p></tt></p>
-<p>
-Uses of <tt>unsyntax</tt> and <tt>unsyntax-splicing</tt> with zero or more than
-one subform are valid only in splicing (list or vector) contexts.
-<tt>(unsyntax <i>template</i> <tt>...</tt>)</tt> is equivalent to
-<tt>(unsyntax <i>template</i>) <tt>...</tt></tt>, and
-<tt>(unsyntax-splicing <i>template</i> <tt>...</tt>)</tt> is equivalent to
-<tt>(unsyntax-splicing <i>template</i>) <tt>...</tt></tt>.
-These forms are primarily useful as intermediate forms in the output
-of the <tt>quasisyntax</tt> expander.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Uses of <tt>unsyntax</tt> and <tt>unsyntax-splicing</tt> with 
-zero or more than one subform enable certain 
-idioms&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_2">2</a>], such as <tt>#,@#,@</tt>, which has the
-effect of a doubly indirect splicing when used within a doubly nested
-and doubly evaluated <tt>quasisyntax</tt> expression, as with the
-nested <tt>quasiquote</tt> examples shown in
-section&nbsp;on &#8220;Quasiquotation&#8221;.
-</blockquote>
-<p></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Any <tt>syntax-rules</tt> form can be expressed with
-<tt>syntax-case</tt> by making the <tt>lambda</tt> expression and
-<tt>syntax</tt> expressions explicit, and
-<tt>syntax-rules</tt> may be defined in terms of <tt>syntax-case</tt>
-as follows.<p>
-</p>
-
-<tt>(define-syntax&nbsp;syntax-rules<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;(lit&nbsp;...)&nbsp;[(k&nbsp;.&nbsp;p)&nbsp;t]&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(for-all&nbsp;identifier?&nbsp;<tt>#</tt>&#8217;(lit&nbsp;...&nbsp;k&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#</tt>&#8217;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;(lit&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;.&nbsp;p)&nbsp;<tt>#</tt>&#8217;t]&nbsp;...))])))<p></tt>
-</p>
-</blockquote><p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The <tt>identifier-syntax</tt> form of the base library (see
-report section&nbsp;on &#8220;Macro transformers&#8221;) may be defined in terms of <tt>syntax-case</tt>, <tt>syntax</tt>, and <tt>make-variable-transformer</tt> as
-follows.<p>
-</p>
-
-<tt>(define-syntax&nbsp;identifier-syntax<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;(set!)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;e)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[id&nbsp;(identifier?&nbsp;#&#8217;id)&nbsp;#&#8217;e]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;x&nbsp;(...&nbsp;...))&nbsp;#&#8217;(e&nbsp;x&nbsp;(...&nbsp;...))]))]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;(id&nbsp;exp1)&nbsp;((set!&nbsp;var&nbsp;val)&nbsp;exp2))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(and&nbsp;(identifier?&nbsp;#&#8217;id)&nbsp;(identifier?&nbsp;#&#8217;var))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-variable-transformer<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;x&nbsp;(set!)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(set!&nbsp;var&nbsp;val)&nbsp;#&#8217;exp2]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(id&nbsp;x&nbsp;(...&nbsp;...))&nbsp;#&#8217;(exp1&nbsp;x&nbsp;(...&nbsp;...))]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[id&nbsp;(identifier?&nbsp;#&#8217;id)&nbsp;#&#8217;exp1])))]))<p></tt>
-</p>
-</blockquote><p>
-</p>
-<a name="node_sec_12.9"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_12.9">12.9&nbsp;&nbsp;Syntax violations</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1160"></a>syntax-violation<i> who message form</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1162"></a>syntax-violation<i> who message form subform</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Who</i> must be <tt>#f</tt> or a string or a symbol.
-<i>Message</i> must be a string.
-<i>Form</i> must be a syntax object or a datum value.
-<i>Subform</i> must be a syntax object or a datum value.
-The <tt>syntax-violation</tt> procedure raises an exception, reporting 
-a syntax violation.  
-<i>Who</i> should describe the macro transformer that
-detected the exception.  The <i>message</i> argument should describe
-the violation.
-<i>Form</i> should be the erroneous source syntax
-object or a datum value representing a form. The optional
-<i>subform</i> argument should be a syntax
-object or datum value representing a form that more precisely locates the
-violation.</p>
-<p>
-If <i>who</i> is <tt>#f</tt>, <tt>syntax-violation</tt> attempts to
-infer an appropriate value for the condition object (see below) as
-follows:  When <i>form</i> is either an identifier or a
-list-structured syntax object containing an identifier as its first element, then
-the inferred value is the identifier&#8217;s symbol.
-Otherwise, no value for <i>who</i> is provided as part of the
-condition object.</p>
-<p>
-The condition object provided with the exception (see
-chapter&nbsp;<a href="r6rs-lib-Z-H-8.html#node_chap_7">7</a>) has the following condition types:
-</p>
-<ul>
-<li><p>If <i>who</i> is not <tt>#f</tt> or can be inferred, the condition has condition type
-<tt>&amp;who</tt>, with <i>who</i> as the value of its field.  In
-that case, <i>who</i> should identify the procedure or entity that
-detected the exception.  If it is <tt>#f</tt>, the condition does not
-have condition type <tt>&amp;who</tt>.
-</p>
-<li><p>The condition has condition type <tt>&amp;message</tt>, with
-<i>message</i> as the value of its field.
-</p>
-<li><p>The condition has condition type <tt>&amp;syntax</tt> 
-with <i>form</i> and <i>subform</i> as the value of its fields.
-If <i>subform</i> is not provided, the value of the subform
-field is <tt>#f</tt>.
-</p>
-</ul><p>
-</p>
-<p></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-12.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-14.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-14.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-14.html
deleted file mode 100644
index 69a8c7b27a..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-14.html
+++ /dev/null
@@ -1,357 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-13.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-15.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_13"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_13">Chapter 13</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_13">Hashtables</a></h1>
-<p></p>
-<p>
-The <tt>(rnrs hashtables (6))</tt><a name="node_idx_1164"></a>library provides a set of operations on
-hashtables.
-A <a name="node_idx_1166"></a><em>hashtable</em> is a data structure that associates keys with values.
-Any object can be used as a key, provided a <a name="node_idx_1168"></a><em>hash function</em>
-and a suitable <a name="node_idx_1170"></a><em>equivalence function</em> is available.  A hash function is a
-procedure that maps
-keys to exact integer objects.
-It is the programmer&#8217;s responsibility to ensure that the hash function
-is compatible with the equivalence function,
-which is a procedure that accepts two keys and returns true if they
-are equivalent and <tt>#f</tt> otherwise.
-Standard hashtables for arbitrary objects based on the <tt>eq?</tt> and 
-<tt>eqv?</tt> predicates (see report section&nbsp;on &#8220;Equivalence predicates&#8221;) are provided.  
-Also, hash functions for arbitrary objects, strings, and symbols are provided.</p>
-<p>
-This section uses the <i>hashtable</i> parameter name for arguments
-that must be hashtables, and the <i>key</i> parameter name for
-arguments that must be hashtable keys.</p>
-<p>
-</p>
-<a name="node_sec_13.1"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_13.1">13.1&nbsp;&nbsp;Constructors</a></h2>
-<p><a name="node_idx_1172"></a></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1174"></a>make-eq-hashtable<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1176"></a>make-eq-hashtable<i> <i>k</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated mutable hashtable that accepts
-arbitrary objects as keys,
-and compares those keys with <tt>eq?</tt>. If an argument is given, the initial 
-capacity of the hashtable is set to approximately <i>k</i> elements.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1178"></a>make-eqv-hashtable<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1180"></a>make-eqv-hashtable<i> <i>k</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated mutable hashtable that accepts
-arbitrary objects as keys,
-and compares those keys with <tt>eqv?</tt>.
-If an argument is given, the initial 
-capacity of the hashtable is set to approximately <i>k</i> elements.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1182"></a>make-hashtable<i> <i>hash-function</i> <i>equiv</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1184"></a>make-hashtable<i> <i>hash-function</i> <i>equiv</i> <i>k</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Hash-function</i> and <i>equiv</i> must be procedures.
-<i>Hash-function</i> should accept a key as an argument and should return a 
-non-negative exact integer object.
-<i>Equiv</i> should accept two keys as arguments and return a single
-value.
-Neither procedure should mutate the hashtable returned by <tt>make-hashtable</tt>.
-The <tt>make-hashtable</tt> procedure returns a newly allocated mutable
-hashtable using <i>hash-function</i> 
-as the hash function and <i>equiv</i> as the equivalence function used to 
-compare keys.
-If a third argument is given, the 
-initial capacity of the hashtable is set to approximately <i>k</i> elements.</p>
-<p>
-Both <i>hash-function</i> and <i>equiv</i> should behave like pure functions
-on the domain of keys.  For example, the <tt>string-hash</tt>
-and <tt>string=?</tt> procedures are permissible only if all
-keys are strings and the contents of those strings are never
-changed so long as any of them continues to serve as a key in
-the hashtable.  Furthermore, any pair of keys for which
-<i>equiv</i> returns true should
-be hashed to the same exact integer objects by 
-<i>hash-function</i>.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the restrictions on
-<i>hash-function</i> and <i>equiv</i> to the extent performed by
-applying them as described.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Hashtables are allowed to cache the results of calling the
-hash function and equivalence function, so programs cannot
-rely on the hash function being called for every lookup or
-update.  Furthermore any hashtable operation may call the
-hash function more than once.
-</blockquote><p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_13.2"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_13.2">13.2&nbsp;&nbsp;Procedures</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1186"></a>hashtable?<i> <i>hashtable</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>hashtable</i> is a hashtable,
-<tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1188"></a>hashtable-size<i> <i>hashtable</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the number of keys contained in <i>hashtable</i> as an exact
-integer object.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1190"></a>hashtable-ref<i> <i>hashtable</i> <i>key</i> <i>default</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the value in <i>hashtable</i> associated with <i>key</i>.
-If <i>hashtable</i> does not contain an association for <i>key</i>,
-<i>default</i> is returned.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1192"></a>hashtable-set!<i> <i>hashtable</i> <i>key</i> <i>obj</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Changes <i>hashtable</i> to associate <i>key</i> with <i>obj</i>,
-adding a new association or replacing any existing association for <i>key</i>,
-and returns unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1194"></a>hashtable-delete!<i> <i>hashtable</i> <i>key</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Removes any association for <i>key</i> within <i>hashtable</i> and
-returns unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1196"></a>hashtable-contains?<i> <i>hashtable</i> <i>key</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>hashtable</i> contains an association
-for <i>key</i>, <tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1198"></a>hashtable-update!<i> <i>hashtable</i> <i>key</i> <i>proc</i> <i>default</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Proc</i> should accept one argument,
-should return a single value, and should not mutate <i>hashtable</i>.
-The <tt>hashtable-update!</tt> procedure applies <i>proc</i> to the value in <i>hashtable</i>
-associated with <i>key</i>, 
-or to <i>default</i> if <i>hashtable</i> does not contain an
-association for <i>key</i>.
-The <i>hashtable</i> is then changed to associate <i>key</i>
-with the value returned by <i>proc</i>.</p>
-<p>
-The behavior of <tt>hashtable-update!</tt> is equivalent to the
-following code, but may be implemented 
-more efficiently in cases where the implementation can
-avoid multiple lookups of the same key:
-</p>
-
-<tt>(hashtable-set!<br>
-&nbsp;&nbsp;hashtable&nbsp;key<br>
-&nbsp;&nbsp;(proc&nbsp;(hashtable-ref<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;hashtable&nbsp;key&nbsp;default)))<br>
-<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1200"></a>hashtable-copy<i> <i>hashtable</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1202"></a>hashtable-copy<i> <i>hashtable</i> <i>mutable</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a copy of <i>hashtable</i>.  If the
-<i>mutable</i> argument is provided and is true, the returned hashtable is mutable;
-otherwise it is immutable.</p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1204"></a>hashtable-clear!<i> <i>hashtable</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1206"></a>hashtable-clear!<i> <i>hashtable</i> <i>k</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Removes all associations from <i>hashtable</i> and returns unspecified values.</p>
-<p>
-If a second argument is given, the current
-capacity of the hashtable is reset to approximately <i>k</i> elements.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1208"></a>hashtable-keys<i> <i>hashtable</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a vector of all keys in <i>hashtable</i>.
-The order of the vector is unspecified.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1210"></a>hashtable-entries<i> <i>hashtable</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns two values, a vector of the keys in <i>hashtable</i>, and a
-vector of the corresponding values.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((h&nbsp;(make-eqv-hashtable)))<br>
-&nbsp;&nbsp;(hashtable-set!&nbsp;h&nbsp;1&nbsp;&#8217;one)<br>
-&nbsp;&nbsp;(hashtable-set!&nbsp;h&nbsp;2&nbsp;&#8217;two)<br>
-&nbsp;&nbsp;(hashtable-set!&nbsp;h&nbsp;3&nbsp;&#8217;three)<br>
-&nbsp;&nbsp;(hashtable-entries&nbsp;h))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt>(1&nbsp;2&nbsp;3)&nbsp;<tt>#</tt>(one&nbsp;two&nbsp;three)<br>
-;&nbsp;two&nbsp;return&nbsp;values<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_13.3"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_13.3">13.3&nbsp;&nbsp;Inspection</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1212"></a>hashtable-equivalence-function<i> <i>hashtable</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the equivalence function used by
-<i>hashtable</i> to compare keys.  For hashtables
-created with <tt>make-eq-hashtable</tt> and <tt>make-eqv-hashtable</tt>,
-returns <tt>eq?</tt> and <tt>eqv?</tt> respectively.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1214"></a>hashtable-hash-function<i> <i>hashtable</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the hash function used by <i>hashtable</i>.
-For hashtables created by <tt>make-eq-hashtable</tt> 
-or <tt>make-eqv-hashtable</tt>, <tt>#f</tt> is returned.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1216"></a>hashtable-mutable?<i> <i>hashtable</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>hashtable</i> is mutable, otherwise <tt>#f</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_13.4"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_13.4">13.4&nbsp;&nbsp;Hash functions</a></h2>
-<p>The <tt>equal-hash</tt>, <tt>string-hash</tt>, and <tt>string-ci-hash</tt>
-procedures of this section are acceptable as the hash functions of
-a hashtable only if the keys on which they are called are not mutated
-while they remain in use as keys in the hashtable.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1218"></a>equal-hash<i> <i>obj</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns an integer hash value for <i>obj</i>, based on
-its structure and current contents.  This hash function is suitable
-for use with <tt>equal?</tt> as an equivalence function.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Like <tt>equal?</tt>, the <tt>equal-hash</tt> procedure must always
-terminate, even if its arguments contain cycles.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1220"></a>string-hash<i> <i>string</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns an integer hash value for <i>string</i>, based on
-its current contents.
-This hash function is suitable
-for use with <tt>string=?</tt> as an equivalence function.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1222"></a>string-ci-hash<i> <i>string</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns an integer hash value for <i>string</i> based on
-its current contents, ignoring case.
-This hash function is suitable
-for use with <tt>string-ci=?</tt> as an equivalence function.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1224"></a>symbol-hash<i> <i>symbol</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns an integer hash value for <i>symbol</i>.
-</p>
-<p></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-13.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-15.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-15.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-15.html
deleted file mode 100644
index 75d850bda9..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-15.html
+++ /dev/null
@@ -1,322 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-14.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-16.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_14"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_14">Chapter 14</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_14">Enumerations</a></h1>
-<p></p>
-<p>
-This chapter describes the <tt>(rnrs enums (6))</tt><a name="node_idx_1226"></a>library for dealing with enumerated values
-<a name="node_idx_1228"></a>and sets of enumerated values.  Enumerated
-values are represented by ordinary symbols, while finite sets of
-enumerated values form a separate type, known as the
-<a name="node_idx_1230"></a><em>enumeration sets</em>.
-The enumeration sets are further partitioned into sets that
-share the same <a name="node_idx_1232"></a><em>universe</em> and <a name="node_idx_1234"></a><em>enumeration type</em>.
-These universes and enumeration types are created by the
-<tt>make-enumeration</tt> procedure.  Each call to that procedure
-creates a new enumeration type.</p>
-<p>
-This library interprets each enumeration set with respect to
-its specific universe of symbols and enumeration type.
-This facilitates efficient implementation of enumeration sets
-and enables the complement operation.</p>
-<p>
-In the descriptions of the following procedures, <i>enum-set</i>
-ranges over the enumeration sets, which are defined as the subsets
-of the universes that can be defined using <tt>make-enumeration</tt>.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1236"></a>make-enumeration<i> symbol-list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Symbol-list</i> must be a list of symbols.
-The <tt>make-enumeration</tt> procedure
-creates a new enumeration type whose universe consists of
-those symbols (in canonical order of their first appearance
-in the list) and returns that universe as an enumeration
-set whose universe is itself and whose enumeration type is
-the newly created enumeration type.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1238"></a>enum-set-universe<i> enum-set</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the set of all symbols that comprise
-the universe of its argument, as an enumeration set.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1240"></a>enum-set-indexer<i> enum-set</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a unary procedure that, given a symbol
-that is in the universe of <i>enum-set</i>, returns its 0-origin index
-within the canonical ordering of the symbols in the universe; given a
-value not in the universe, the unary procedure returns <tt>#f</tt>.</p>
-<p>
-</p>
-
-<tt>(let*&nbsp;((e&nbsp;(make-enumeration&nbsp;&#8217;(red&nbsp;green&nbsp;blue)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(i&nbsp;(enum-set-indexer&nbsp;e)))<br>
-&nbsp;&nbsp;(list&nbsp;(i&nbsp;&#8217;red)&nbsp;(i&nbsp;&#8217;green)&nbsp;(i&nbsp;&#8217;blue)&nbsp;(i&nbsp;&#8217;yellow)))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(0&nbsp;1&nbsp;2&nbsp;<tt>#f</tt>)<p></tt></p>
-<p>
-The <tt>enum-set-indexer</tt> procedure could be defined as follows using the
-<tt>memq</tt> procedure from the <tt>(rnrs lists (6))</tt> library:</p>
-<p>
-</p>
-
-<tt>(define&nbsp;(enum-set-indexer&nbsp;set)<br>
-&nbsp;&nbsp;(let*&nbsp;((symbols&nbsp;(enum-set-&gt;list<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(enum-set-universe&nbsp;set)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cardinality&nbsp;(length&nbsp;symbols)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((memq&nbsp;x&nbsp;symbols)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&gt;&nbsp;(lambda&nbsp;(probe)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(-&nbsp;cardinality&nbsp;(length&nbsp;probe))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;<tt>#f</tt>)))))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1242"></a>enum-set-constructor<i> enum-set</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a unary procedure that, given a
-list of symbols that belong to the universe of <i>enum-set</i>, returns
-a subset of that universe that contains exactly the symbols in the
-list.  The values in the list must all belong to the universe.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1244"></a>enum-set-&gt;list<i> enum-set</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a list of the symbols that belong to its
-argument, in the canonical order of the universe of <i>enum-set</i>.</p>
-<p>
-</p>
-
-<tt>(let*&nbsp;((e&nbsp;(make-enumeration&nbsp;&#8217;(red&nbsp;green&nbsp;blue)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(c&nbsp;(enum-set-constructor&nbsp;e)))<br>
-&nbsp;&nbsp;(enum-set-&gt;list&nbsp;(c&nbsp;&#8217;(blue&nbsp;red))))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(red&nbsp;blue)<br>
-<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1246"></a>enum-set-member?<i> symbol enum-set</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1248"></a>enum-set-subset?<i> <i>enum-set<sub>1</sub></i> <i>enum-set<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1250"></a>enum-set=?<i> <i>enum-set<sub>1</sub></i> <i>enum-set<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>enum-set-member?</tt> procedure returns <tt>#t</tt> if its first argument is an
-element of its second argument, <tt>#f</tt> otherwise.</p>
-<p>
-The <tt>enum-set-subset?</tt> procedure returns <tt>#t</tt> if the universe of
-<i>enum-set<sub>1</sub></i> is a subset of the universe of <i>enum-set<sub>2</sub></i>
-(considered as sets of symbols) and every element of <i>enum-set<sub>1</sub></i>
-is a member of <i>enum-set<sub>2</sub></i>.  It returns <tt>#f</tt> otherwise.</p>
-<p>
-The <tt>enum-set=?</tt> procedure returns <tt>#t</tt> if <i>enum-set<sub>1</sub></i>  is a
-subset of <i>enum-set<sub>2</sub></i> and vice versa, as determined by the
-<tt>enum-set-subset?</tt> procedure.  This implies that the universes of
-the two sets are equal as sets of symbols, but does not imply
-that they are equal as enumeration types.  Otherwise, <tt>#f</tt> is
-returned.</p>
-<p>
-</p>
-
-<tt>(let*&nbsp;((e&nbsp;(make-enumeration&nbsp;&#8217;(red&nbsp;green&nbsp;blue)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(c&nbsp;(enum-set-constructor&nbsp;e)))<br>
-&nbsp;&nbsp;(list<br>
-&nbsp;&nbsp;&nbsp;(enum-set-member?&nbsp;&#8217;blue&nbsp;(c&nbsp;&#8217;(red&nbsp;blue)))<br>
-&nbsp;&nbsp;&nbsp;(enum-set-member?&nbsp;&#8217;green&nbsp;(c&nbsp;&#8217;(red&nbsp;blue)))<br>
-&nbsp;&nbsp;&nbsp;(enum-set-subset?&nbsp;(c&nbsp;&#8217;(red&nbsp;blue))&nbsp;e)<br>
-&nbsp;&nbsp;&nbsp;(enum-set-subset?&nbsp;(c&nbsp;&#8217;(red&nbsp;blue))&nbsp;(c&nbsp;&#8217;(blue&nbsp;red)))<br>
-&nbsp;&nbsp;&nbsp;(enum-set-subset?&nbsp;(c&nbsp;&#8217;(red&nbsp;blue))&nbsp;(c&nbsp;&#8217;(red)))<br>
-&nbsp;&nbsp;&nbsp;(enum-set=?&nbsp;(c&nbsp;&#8217;(red&nbsp;blue))&nbsp;(c&nbsp;&#8217;(blue&nbsp;red)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(<tt>#t</tt>&nbsp;<tt>#f</tt>&nbsp;<tt>#t</tt>&nbsp;<tt>#t</tt>&nbsp;<tt>#f</tt>&nbsp;<tt>#t</tt>)<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1252"></a>enum-set-union<i> <i>enum-set<sub>1</sub></i> <i>enum-set<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1254"></a>enum-set-intersection<i> <i>enum-set<sub>1</sub></i> <i>enum-set<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1256"></a>enum-set-difference<i> <i>enum-set<sub>1</sub></i> <i>enum-set<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Enum-set<sub>1</sub></i> and <i>enum-set<sub>2</sub></i> must be enumeration sets 
-that have the same enumeration type.</p>
-<p>
-The <tt>enum-set-union</tt> procedure returns the union of <i>enum-set<sub>1</sub></i> and <i>enum-set<sub>2</sub></i>.
-The <tt>enum-set-intersection</tt> procedure returns the intersection of <i>enum-set<sub>1</sub></i> and <i>enum-set<sub>2</sub></i>.
-The <tt>enum-set-difference</tt> procedure returns the difference of <i>enum-set<sub>1</sub></i>
-and <i>enum-set<sub>2</sub></i>.</p>
-<p>
-</p>
-
-<tt>(let*&nbsp;((e&nbsp;(make-enumeration&nbsp;&#8217;(red&nbsp;green&nbsp;blue)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(c&nbsp;(enum-set-constructor&nbsp;e)))<br>
-&nbsp;&nbsp;(list&nbsp;(enum-set-&gt;list<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(enum-set-union&nbsp;(c&nbsp;&#8217;(blue))&nbsp;(c&nbsp;&#8217;(red))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(enum-set-&gt;list<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(enum-set-intersection&nbsp;(c&nbsp;&#8217;(red&nbsp;green))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(c&nbsp;&#8217;(red&nbsp;blue))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(enum-set-&gt;list<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(enum-set-difference&nbsp;(c&nbsp;&#8217;(red&nbsp;green))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(c&nbsp;&#8217;(red&nbsp;blue))))))<br>
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;((red&nbsp;blue)&nbsp;(red)&nbsp;(green))<br>
-<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1258"></a>enum-set-complement<i> enum-set</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <i>enum-set</i>&#8217;s
-complement with respect to its universe.</p>
-<p>
-</p>
-
-<tt>(let*&nbsp;((e&nbsp;(make-enumeration&nbsp;&#8217;(red&nbsp;green&nbsp;blue)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(c&nbsp;(enum-set-constructor&nbsp;e)))<br>
-&nbsp;&nbsp;(enum-set-&gt;list<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(enum-set-complement&nbsp;(c&nbsp;&#8217;(red)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(green&nbsp;blue)<br>
-<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1260"></a>enum-set-projection<i> <i>enum-set<sub>1</sub></i> <i>enum-set<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Projects <i>enum-set<sub>1</sub></i> into the universe
-of <i>enum-set<sub>2</sub></i>, dropping any elements of <i>enum-set<sub>1</sub></i> that do
-not belong to the universe of <i>enum-set<sub>2</sub></i>.  (If <i>enum-set<sub>1</sub></i>
-is a subset of the universe of its second, no elements are
-dropped, and the injection is returned.)</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((e1&nbsp;(make-enumeration<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(red&nbsp;green&nbsp;blue&nbsp;black)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(e2&nbsp;(make-enumeration<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(red&nbsp;black&nbsp;white))))<br>
-&nbsp;&nbsp;(enum-set-&gt;list<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(enum-set-projection&nbsp;e1&nbsp;e2))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(red&nbsp;black)<br>
-<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<div align=left><tt>(define-enumeration &lt;type-name&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<a name="node_idx_1262"></a><tt>(&lt;symbol&gt;&nbsp;<tt>...</tt>)<br>
-
-&lt;constructor-syntax&gt;)</tt><p>
-The <tt>define-enumeration</tt> form defines an enumeration type and
-provides two macros for constructing its members and sets of its
-members.</p>
-<p>
-A <tt>define-enumeration</tt> form is a definition and can appear
-anywhere any other &lt;definition&gt; can appear.</p>
-<p>
-&lt;Type-name&gt; is an identifier that is bound as a syntactic keyword;
-&lt;symbol&gt;&nbsp;<tt>...</tt> are the symbols that comprise the
-universe of the enumeration (in order).</p>
-<p>
-<tt>(&lt;type-name&gt; &lt;symbol&gt;)</tt> checks at macro-expansion
-time whether the name of &lt;symbol&gt; is in the universe associated with
-&lt;type-name&gt;.  If it is, <tt>(&lt;type-name&gt;
-&lt;symbol&gt;)</tt> is equivalent to <tt>&lt;symbol&gt;</tt>.  
-It is a syntax violation if it is not.</p>
-<p>
-&lt;Constructor-syntax&gt; is an identifier that is bound to a
-macro that, given any finite sequence of the symbols in the universe,
-possibly with duplicates, expands into an expression that evaluates
-to the enumeration set of those symbols.</p>
-<p>
-<tt>(&lt;constructor-syntax&gt; &lt;symbol&gt;&nbsp;<tt>...</tt>)</tt> checks at
-macro-expansion time whether every &lt;symbol&gt;&nbsp;<tt>...</tt> is in the
-universe associated with &lt;type-name&gt;.  It is a syntax violation
-if one or more is not.
-Otherwise
-</p>
-
-<tt>(&lt;constructor-syntax&gt;&nbsp;&lt;symbol&gt;&nbsp;<tt>...</tt>)<br>
-<p></tt>
-is equivalent to
-</p>
-
-<tt>((enum-set-constructor&nbsp;(&lt;constructor-syntax&gt;))<br>
-&nbsp;&#8217;(&lt;symbol&gt;&nbsp;<tt>...</tt>)).<br>
-<p></tt></p>
-<p>
-Example:</p>
-<p>
-</p>
-
-<tt>(define-enumeration&nbsp;color<br>
-&nbsp;&nbsp;(black&nbsp;white&nbsp;purple&nbsp;maroon)<br>
-&nbsp;&nbsp;color-set)<br>
-<br>
-(color&nbsp;black)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;black<br>
-(color&nbsp;purpel)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>&nbsp;&amp;syntax</tt>&nbsp;<i>exception</i><br>
-(enum-set-&gt;list&nbsp;(color-set))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;()<br>
-(enum-set-&gt;list<br>
-&nbsp;&nbsp;(color-set&nbsp;maroon&nbsp;white))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(white&nbsp;maroon)<br>
-<p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-In <tt>(&lt;type-name&gt; &lt;symbol&gt;)</tt> and <tt>(&lt;constructor-syntax&gt; &lt;symbol&gt;&nbsp;<tt>...</tt>)</tt> forms,
-only the names of the &lt;symbol&gt;s are significant.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p>
-    </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-14.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-16.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-16.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-16.html
deleted file mode 100644
index 90e6544824..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-16.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-15.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-17.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_15"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_15">Chapter 15</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_15">Composite library</a></h1>
-<p></p>
-<p>
-The <tt>(rnrs (6))</tt><a name="node_idx_1264"></a> library is a composite of most of the libraries
-described in this report.  The only exceptions are:
-</p>
-<ul>
-<li><p><tt>(rnrs eval (6))</tt> (chapter&nbsp;<a href="r6rs-lib-Z-H-17.html#node_chap_16">16</a>)
-</p>
-<li><p><tt>(rnrs mutable-pairs (6))</tt> (chapter&nbsp;<a href="r6rs-lib-Z-H-18.html#node_chap_17">17</a>)
-</p>
-<li><p><tt>(rnrs mutable-strings (6))</tt> (chapter&nbsp;<a href="r6rs-lib-Z-H-19.html#node_chap_18">18</a>)
-</p>
-<li><p><tt>(rnrs r5rs (6))</tt> (chapter&nbsp;<a href="r6rs-lib-Z-H-20.html#node_chap_19">19</a>)
-</p>
-</ul><p>
-The library exports all procedures and syntactic forms provided by the
-component libraries.</p>
-<p>
-All of the bindings exported by <tt>(rnrs (6))</tt> are exported for both <tt>run</tt>
-and <tt>expand</tt>; see report section&nbsp;on &#8220;Import and export levels&#8221;.</p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-15.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-17.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-17.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-17.html
deleted file mode 100644
index d7f5ff8640..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-17.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-16.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-18.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_16"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_16">Chapter 16</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_16"><tt>eval</tt></a></h1>
-<p></p>
-<p>
-The <tt>(rnrs eval (6))</tt><a name="node_idx_1265.5"></a> library allows a program to create Scheme
-expressions as data at run time and evaluate them.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1266"></a>eval<i> expression environment</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Evaluates <i>expression</i> in the specified environment and returns its value.
-<i>Expression</i> must be a syntactically valid Scheme expression represented as a
-datum value, and <i>environment</i> must be an
-<a name="node_idx_1268"></a><em>environment</em>, which can be created using the <tt>environment</tt> procedure described below.</p>
-<p>
-If the first argument to <tt>eval</tt> is determined not to be a syntactically correct
-expression, then <tt>eval</tt> must raise an exception with condition
-type <tt>&amp;syntax</tt>.  Specifically, if the first argument to <tt>eval</tt> is a definition or a splicing <tt>begin</tt> form containing a
-definition, it must raise an exception with condition type <tt>&amp;syntax</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1270"></a>environment<i> import-spec <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Import-spec</i> must be a datum representing an
-&lt;import spec&gt; (see report
-section&nbsp;on &#8220;Library form&#8221;).
-The <tt>environment</tt> procedure returns an environment corresponding
-to <i>import-spec</i>.</p>
-<p>
-The bindings of the environment represented by the specifier are
-immutable: If <tt>eval</tt> is applied to an expression that is
-determined to contain an
-assignment to one of the variables of the environment, then <tt>eval</tt> must
-raise an exception with a condition type <tt>&amp;assertion</tt>.</p>
-<p>
-</p>
-
-<tt>(library&nbsp;(foo)<br>
-&nbsp;&nbsp;(export)<br>
-&nbsp;&nbsp;(import&nbsp;(rnrs))<br>
-&nbsp;&nbsp;(write<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(eval&nbsp;&#8217;(let&nbsp;((x&nbsp;3))&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(environment&nbsp;&#8217;(rnrs)))))&nbsp;<br>
-&nbsp;<i>&nbsp;writes</i>&nbsp;3<br>
-<br>
-(library&nbsp;(foo)<br>
-&nbsp;&nbsp;(export)<br>
-&nbsp;&nbsp;(import&nbsp;(rnrs))<br>
-&nbsp;&nbsp;(write<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(eval<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(eval:car&nbsp;(eval:cons&nbsp;2&nbsp;4))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(environment<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(prefix&nbsp;(only&nbsp;(rnrs)&nbsp;car&nbsp;cdr&nbsp;cons&nbsp;null?)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;eval:)))))&nbsp;<br>
-&nbsp;<i>&nbsp;writes</i>&nbsp;2<br>
-<p></tt>
-</p>
-<p></p>
-<p>
-    </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-16.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-18.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-18.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-18.html
deleted file mode 100644
index ef685f57b8..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-18.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-17.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-19.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_17"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_17">Chapter 17</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_17">Mutable pairs</a></h1>
-<p></p>
-<p>
-The procedures provided by the <tt>(rnrs mutable-pairs (6))</tt><a name="node_idx_1272"></a>library
-allow new values to be assigned to the car and cdr fields of
-previously allocated pairs.  </p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1274"></a>set-car!<i> pair obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Stores <i>obj</i> in the car field of <i>pair</i>.
-The <tt>set-car!</tt> procedure returns unspecified values.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;(f)&nbsp;(list&nbsp;&#8217;not-a-constant-list))<br>
-(define&nbsp;(g)&nbsp;&#8217;(constant-list))<br>
-(set-car!&nbsp;(f)&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<em>unspecified</em><br>
-(set-car!&nbsp;(g)&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-;&nbsp;should&nbsp;raise&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><br>
-<p></tt></p>
-<p>
-If an immutable pair is passed to <tt>set-car!</tt>, an exception
-with condition type <tt>&amp;assertion</tt> should be raised.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1276"></a>set-cdr!<i> pair obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Stores <i>obj</i> in the cdr field of <i>pair</i>.
-The <tt>set-cdr!</tt> procedure returns unspecified values.</p>
-<p>
-If an immutable pair is passed to <tt>set-cdr!</tt>, an exception
-with condition type <tt>&amp;assertion</tt> should be raised.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((x&nbsp;(list&nbsp;&#8217;a&nbsp;&#8217;b&nbsp;&#8217;c&nbsp;&#8217;a))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(y&nbsp;(list&nbsp;&#8217;a&nbsp;&#8217;b&nbsp;&#8217;c&nbsp;&#8217;a&nbsp;&#8217;b&nbsp;&#8217;c&nbsp;&#8217;a)))<br>
-&nbsp;&nbsp;(set-cdr!&nbsp;(list-tail&nbsp;x&nbsp;2)&nbsp;x)<br>
-&nbsp;&nbsp;(set-cdr!&nbsp;(list-tail&nbsp;y&nbsp;5)&nbsp;y)<br>
-&nbsp;&nbsp;(list<br>
-&nbsp;&nbsp;&nbsp;(equal?&nbsp;x&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;(equal?&nbsp;x&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;(equal?&nbsp;(list&nbsp;x&nbsp;y&nbsp;&#8217;a)&nbsp;(list&nbsp;y&nbsp;x&nbsp;&#8217;b))))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(<tt>#t</tt>&nbsp;<tt>#t</tt>&nbsp;<tt>#f</tt>)<br>
-<p></tt>
-</p>
-<p></p>
-<p>
-  </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-17.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-19.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-19.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-19.html
deleted file mode 100644
index c1749a61c7..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-19.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-18.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-20.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_18"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_18">Chapter 18</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_18">Mutable strings</a></h1>
-<p></p>
-<p>
-The <tt>string-set!</tt> procedure provided by the <tt>(rnrs mutable-strings (6))</tt><a name="node_idx_1278"></a>library allows mutating the characters of a string in-place.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1280"></a>string-set!<i> string k char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-</p>
-
-<p class=noindent><em>K</em> must be a valid index of <i>string</i>.
-The <tt>string-set!</tt> procedure stores <i>char</i> in element </p>
-
-<p class=noindent><em>k</em> of <i>string</i>
-and returns unspecified values.  </p>
-<p>
-Passing an immutable string to <tt>string-set!</tt> should cause an exception
-with condition type <tt>&amp;assertion</tt> to be raised.
-</p>
-
-<tt>(define&nbsp;(f)&nbsp;(make-string&nbsp;3&nbsp;<tt>#</tt><tt>\</tt>*))<br>
-(define&nbsp;(g)&nbsp;&quot;***&quot;)<br>
-(string-set!&nbsp;(f)&nbsp;0&nbsp;<tt>#</tt><tt>\</tt>?)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<em>unspecified</em><br>
-(string-set!&nbsp;(g)&nbsp;0&nbsp;<tt>#</tt><tt>\</tt>?)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;should&nbsp;raise&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><br>
-(string-set!&nbsp;(symbol-&gt;string&nbsp;&#8217;immutable)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#</tt><tt>\</tt>?)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;should&nbsp;raise&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Implementors should make <tt>string-set!</tt> run in constant
-time.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1282"></a>string-fill!<i> string char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Stores <i>char</i> in every element of the given <i>string</i> and returns unspecified values.  </p>
-<p>
-</p>
-<p></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-18.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-20.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-2.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-2.html
deleted file mode 100644
index f5af6e1b96..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-2.html
+++ /dev/null
@@ -1,346 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-1.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-3.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_1"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_1">Chapter 1</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_1">Unicode</a></h1>
-<p></p>
-<p>
-</p>
-<p>
-The procedures exported by the <tt>(rnrs unicode (6))</tt><a name="node_idx_2"></a>library provide access to some aspects
-of the Unicode semantics for characters and strings:
-category information, case-independent comparisons,
-case mappings, and normalization&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_12">12</a>].</p>
-<p>
-Some of the procedures that operate on characters or strings ignore the
-difference between upper case and lower case.  These procedures
-have &#8220;<tt>-ci</tt>&#8221; (for &#8220;case
-insensitive&#8221;) embedded in their names.</p>
-<p>
-</p>
-<a name="node_sec_1.1"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_1.1">1.1&nbsp;&nbsp;Characters</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_4"></a>char-upcase<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_6"></a>char-downcase<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_8"></a>char-titlecase<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_10"></a>char-foldcase<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures take a character argument and return a character
-result. If the argument is an upper-case or title-case character, and if
-there is a single character that is its lower-case form, then
-<tt>char-downcase</tt> returns that character. If the argument is a lower-case
-or title-case character, and there is a single character that is
-its upper-case form, then <tt>char-upcase</tt> returns that character.
-If the argument is a lower-case
-or upper-case character, and there is a single character that is
-its title-case form, then <tt>char-titlecase</tt> returns that character.
-If the argument is not a title-case character and there is no single
-character that is its title-case form, then <tt>char-titlecase</tt>
-returns the upper-case form of the argument.
-Finally, if the character has a case-folded character,
-then <tt>char-foldcase</tt> returns that character.
-Otherwise the character returned is the same
-as the argument.
-For Turkic characters <u>I</u> (<tt>#<tt>\</tt>x130</tt>)
-and  (<tt>#<tt>\</tt>x131</tt>),
-<tt>char-foldcase</tt> behaves as the identity function; otherwise 
-<tt>char-foldcase</tt> is the
-same as <tt>char-downcase</tt> composed with <tt>char-upcase</tt>.</p>
-<p>
-</p>
-
-<tt>(char-upcase&nbsp;<tt>#</tt><tt>\</tt>i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>I<br>
-(char-downcase&nbsp;<tt>#</tt><tt>\</tt>i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>i<br>
-(char-titlecase&nbsp;<tt>#</tt><tt>\</tt>i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>I<br>
-(char-foldcase&nbsp;<tt>#</tt><tt>\</tt>i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>i<br>
-<br>
-(char-upcase&nbsp;<tt>#</tt><tt>\</tt>&szlig;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&szlig;<br>
-(char-downcase&nbsp;<tt>#</tt><tt>\</tt>&szlig;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&szlig;<br>
-(char-titlecase&nbsp;<tt>#</tt><tt>\</tt>&szlig;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&szlig;<br>
-(char-foldcase&nbsp;<tt>#</tt><tt>\</tt>&szlig;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&szlig;<br>
-<br>
-(char-upcase&nbsp;<tt>#</tt><tt>\</tt>&Sigma;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&Sigma;<br>
-(char-downcase&nbsp;<tt>#</tt><tt>\</tt>&Sigma;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&sigma;<br>
-(char-titlecase&nbsp;<tt>#</tt><tt>\</tt>&Sigma;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&Sigma;<br>
-(char-foldcase&nbsp;<tt>#</tt><tt>\</tt>&Sigma;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&sigma;<br>
-<br>
-(char-upcase&nbsp;<tt>#</tt><tt>\</tt>&sigmaf;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&Sigma;<br>
-(char-downcase&nbsp;<tt>#</tt><tt>\</tt>&sigmaf;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&sigmaf;<br>
-(char-titlecase&nbsp;<tt>#</tt><tt>\</tt>&sigmaf;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&Sigma;<br>
-(char-foldcase&nbsp;<tt>#</tt><tt>\</tt>&sigmaf;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>&sigma;<br>
-<p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Note that <tt>char-titlecase</tt> does not always return a title-case
-character.
-</blockquote><p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-These procedures are consistent with
-Unicode&#8217;s locale-independent mappings from scalar values to
-scalar values for upcase, downcase, titlecase, and case-folding
-operations.  These mappings can be extracted from <tt>UnicodeData.txt</tt> and <tt>CaseFolding.txt</tt> from the Unicode
-Consortium, ignoring Turkic mappings in the latter.<p>
-Note that these character-based procedures are an incomplete
-approximation to case conversion, even ignoring the user&#8217;s locale.
-In general, case mappings require the context of a string, both in
-arguments and in result. The <tt>string-upcase</tt>, <tt>string-downcase</tt>, <tt>string-titlecase</tt>, and <tt>string-foldcase</tt> procedures (section&nbsp;<a href="#node_sec_1.2">1.2</a>)
-perform more general case conversion.
-</p>
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_12"></a>char-ci=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i> <i>char<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_14"></a>char-ci&lt;?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i> <i>char<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_16"></a>char-ci&gt;?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i> <i>char<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_18"></a>char-ci&lt;=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i> <i>char<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_20"></a>char-ci&gt;=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i> <i>char<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures are similar to <tt>char=?</tt>, etc., but operate
-on the case-folded versions of the characters.</p>
-<p>
-</p>
-
-<tt>(char-ci&lt;?&nbsp;<tt>#</tt><tt>\</tt>z&nbsp;<tt>#</tt><tt>\</tt>Z)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(char-ci=?&nbsp;<tt>#</tt><tt>\</tt>z&nbsp;<tt>#</tt><tt>\</tt>Z)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(char-ci=?&nbsp;<tt>#</tt><tt>\</tt>&sigmaf;&nbsp;<tt>#</tt><tt>\</tt>&sigma;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_22"></a>char-alphabetic?<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_24"></a>char-numeric?<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_26"></a>char-whitespace?<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_28"></a>char-upper-case?<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_30"></a>char-lower-case?<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_32"></a>char-title-case?<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return <tt>#t</tt> if their arguments are alphabetic,
-numeric, whitespace, upper-case, lower-case, or title-case characters,
-respectively; otherwise they return <tt>#f</tt>.</p>
-<p>
-A character is alphabetic if it has the Unicode &#8220;Alphabetic&#8221;
-property.  A character is numeric if it has the Unicode &#8220;Numeric&#8221;
-property.  A character is whitespace if has the Unicode
-&#8220;White_Space&#8221; property.
-A character is upper case if it has the Unicode
-&#8220;Uppercase&#8221; property, lower case if it has the &#8220;Lowercase&#8221;
-property, and title case if it is in the Lt general category.</p>
-<p>
-</p>
-
-<tt>(char-alphabetic?&nbsp;<tt>#</tt><tt>\</tt>a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(char-numeric?&nbsp;<tt>#</tt><tt>\</tt>1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(char-whitespace?&nbsp;<tt>#</tt><tt>\</tt>space)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(char-whitespace?&nbsp;<tt>#</tt><tt>\</tt>x00A0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(char-upper-case?&nbsp;<tt>#</tt><tt>\</tt>&Sigma;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(char-lower-case?&nbsp;<tt>#</tt><tt>\</tt>&sigma;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(char-lower-case?&nbsp;<tt>#</tt><tt>\</tt>x00AA)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(char-title-case?&nbsp;<tt>#</tt><tt>\</tt>I)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(char-title-case?&nbsp;<tt>#</tt><tt>\</tt>x01C5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_34"></a>char-general-category<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a symbol representing the
-Unicode general category of <i>char</i>, one of <tt>Lu</tt>, <tt>Ll</tt>, <tt>Lt</tt>,
-<tt>Lm</tt>, <tt>Lo</tt>, <tt>Mn</tt>, <tt>Mc</tt>, <tt>Me</tt>, <tt>Nd</tt>, <tt>Nl</tt>,
-<tt>No</tt>, <tt>Ps</tt>, <tt>Pe</tt>, <tt>Pi</tt>, <tt>Pf</tt>, <tt>Pd</tt>, <tt>Pc</tt>,
-<tt>Po</tt>, <tt>Sc</tt>, <tt>Sm</tt>, <tt>Sk</tt>, <tt>So</tt>, <tt>Zs</tt>, <tt>Zp</tt>,
-<tt>Zl</tt>, <tt>Cc</tt>, <tt>Cf</tt>, <tt>Cs</tt>, <tt>Co</tt>, or <tt>Cn</tt>.</p>
-<p>
-</p>
-
-<tt>(char-general-category&nbsp;#<tt>\</tt>a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;Ll<br>
-(char-general-category&nbsp;#<tt>\</tt>space)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;Zs<br>
-(char-general-category&nbsp;#<tt>\</tt>x10FFFF)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;Cn&nbsp;&nbsp;<br>
-<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_1.2"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_1.2">1.2&nbsp;&nbsp;Strings</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_36"></a>string-upcase<i> <i>string</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_38"></a>string-downcase<i> <i>string</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_40"></a>string-titlecase<i> <i>string</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_42"></a>string-foldcase<i> <i>string</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures take a string argument and return a string
-result.  They are defined in terms of Unicode&#8217;s locale-independent
-case mappings from Unicode scalar-value sequences to scalar-value sequences.
-In particular, the length of the result string can be different from
-the length of the input string.
-When the specified result is equal in the sense of <tt>string=?</tt> to the
-argument, these procedures may return the argument instead of a newly
-allocated string.</p>
-<p>
-The <tt>string-upcase</tt> procedure converts a string to upper case;
-<tt>string-downcase</tt> converts a string to lower case. The <tt>string-foldcase</tt> procedure converts the string to its case-folded
-counterpart, using the full case-folding mapping, but without the
-special mappings for Turkic languages.  The <tt>string-titlecase</tt>
-procedure converts the first cased character of each word via <tt>char-titlecase</tt>, and downcases all other cased characters.</p>
-<p>
-</p>
-
-<tt>(string-upcase&nbsp;&quot;Hi&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;HI&quot;<br>
-(string-downcase&nbsp;&quot;Hi&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;hi&quot;<br>
-(string-foldcase&nbsp;&quot;Hi&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;hi&quot;<br>
-<br>
-(string-upcase&nbsp;&quot;Stra&szlig;e&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;STRASSE&quot;<br>
-(string-downcase&nbsp;&quot;Stra&szlig;e&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;stra&szlig;e&quot;<br>
-(string-foldcase&nbsp;&quot;Stra&szlig;e&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;strasse&quot;<br>
-(string-downcase&nbsp;&quot;STRASSE&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;strasse&quot;<br>
-<br>
-(string-downcase&nbsp;&quot;&Sigma;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;&sigma;&quot;<br>
-<br>
-;&nbsp;Chi&nbsp;Alpha&nbsp;Omicron&nbsp;Sigma:<br>
-(string-upcase&nbsp;&quot;<i>XAO</i>&Sigma;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;<i>XAO</i>&Sigma;&quot;&nbsp;<br>
-(string-downcase&nbsp;&quot;<i>XAO</i>&Sigma;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;&chi;&alpha;<em>o</em>&sigmaf;&quot;<br>
-(string-downcase&nbsp;&quot;<i>XAO</i>&Sigma;&Sigma;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;&chi;&alpha;<em>o</em>&sigma;&sigmaf;&quot;<br>
-(string-downcase&nbsp;&quot;<i>XAO</i>&Sigma;&nbsp;&Sigma;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;&chi;&alpha;<em>o</em>&sigmaf;&nbsp;&sigma;&quot;<br>
-(string-foldcase&nbsp;&quot;<i>XAO</i>&Sigma;&Sigma;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;&chi;&alpha;<em>o</em>&sigma;&sigma;&quot;<br>
-(string-upcase&nbsp;&quot;&chi;&alpha;<em>o</em>&sigmaf;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;<i>XAO</i>&Sigma;&quot;<br>
-(string-upcase&nbsp;&quot;&chi;&alpha;<em>o</em>&sigma;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;<i>XAO</i>&Sigma;&quot;<br>
-<br>
-(string-titlecase&nbsp;&quot;kNock&nbsp;KNoCK&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;Knock&nbsp;Knock&quot;<br>
-(string-titlecase&nbsp;&quot;who&#8217;s&nbsp;there?&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;Who&#8217;s&nbsp;There?&quot;<br>
-(string-titlecase&nbsp;&quot;r6rs&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;R6Rs&quot;<br>
-(string-titlecase&nbsp;&quot;R6RS&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;R6Rs&quot;<p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The case mappings needed for implementing these procedures
-can be extracted from <tt>UnicodeData.txt</tt>, <tt>SpecialCasing.txt</tt>, <tt>WordBreakProperty.txt</tt> 
-(the &#8220;MidLetter&#8221; property partly defines case-ignorable characters), 
-and <tt>CaseFolding.txt</tt> from the Unicode Consortium.<p>
-Since these procedures are locale-independent, they may not
-be appropriate for some locales.
-</p>
-</blockquote><p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Word breaking, as needed for the correct casing of &Sigma; and for
-<tt>string-titlecase</tt>, is specified in Unicode Standard Annex
-#29&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_5">5</a>].
-</blockquote><p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_44"></a>string-ci=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i> <i>string<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_46"></a>string-ci&lt;?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i> <i>string<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_48"></a>string-ci&gt;?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i> <i>string<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_50"></a>string-ci&lt;=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i> <i>string<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_52"></a>string-ci&gt;=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i> <i>string<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures are similar to <tt>string=?</tt>, etc., but 
-operate on the case-folded versions of the strings.</p>
-<p>
-</p>
-
-<tt>(string-ci&lt;?&nbsp;&quot;z&quot;&nbsp;&quot;Z&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(string-ci=?&nbsp;&quot;z&quot;&nbsp;&quot;Z&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(string-ci=?&nbsp;&quot;Stra&szlig;e&quot;&nbsp;&quot;Strasse&quot;)&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(string-ci=?&nbsp;&quot;Stra&szlig;e&quot;&nbsp;&quot;STRASSE&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(string-ci=?&nbsp;&quot;<i>XAO</i>&Sigma;&quot;&nbsp;&quot;&chi;&alpha;<em>o</em>&sigma;&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_54"></a>string-normalize-nfd<i> <i>string</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_56"></a>string-normalize-nfkd<i> <i>string</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_58"></a>string-normalize-nfc<i> <i>string</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_60"></a>string-normalize-nfkc<i> <i>string</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures take a string argument and return a string
-result, which is the input string normalized
-to Unicode normalization form D, KD, C, or KC, respectively.
-When the specified result is equal in the sense of <tt>string=?</tt> to the
-argument, these procedures may return the argument instead of a newly
-allocated string.</p>
-<p>
-</p>
-
-<tt>(string-normalize-nfd&nbsp;&quot;<tt>\</tt>xE9;&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;<tt>\</tt>x65;<tt>\</tt>x301;&quot;<br>
-(string-normalize-nfc&nbsp;&quot;<tt>\</tt>xE9;&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;<tt>\</tt>xE9;&quot;<br>
-(string-normalize-nfd&nbsp;&quot;<tt>\</tt>x65;<tt>\</tt>x301;&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;<tt>\</tt>x65;<tt>\</tt>x301;&quot;<br>
-(string-normalize-nfc&nbsp;&quot;<tt>\</tt>x65;<tt>\</tt>x301;&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;<tt>\</tt>xE9;&quot;<p></tt>
-</p>
-<p></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-1.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-3.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-20.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-20.html
deleted file mode 100644
index ab219ed832..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-20.html
+++ /dev/null
@@ -1,281 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-19.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-21.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_19"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_19">Chapter 19</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_19">R<sup>5</sup>RS compatibility</a></h1>
-<p></p>
-<p>
-The features described in this chapter are exported from the
-<tt>(rnrs r5rs (6))</tt><a name="node_idx_1284"></a>library and provide some functionality of the
-preceding revision of this report&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_8">8</a>] that was omitted from
-the main part of the current report.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1286"></a>exact-&gt;inexact<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1288"></a>inexact-&gt;exact<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These are the same as the <tt>inexact</tt> and <tt>exact</tt>
-procedures; see report section&nbsp;on &#8220;Generic conversions&#8221;.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1290"></a>quotient<i> <i>n<sub>1</sub></i> <i>n<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1292"></a>remainder<i> <i>n<sub>1</sub></i> <i>n<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_1294"></a>modulo<i> <i>n<sub>1</sub></i> <i>n<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures implement number-theoretic (integer)
-division.  <i>N<sub>2</sub></i> must be non-zero.  All three procedures
-return integer objects.  If <i>n<sub>1</sub></i>/<i>n<sub>2</sub></i> is an integer object:
-</p>
-
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;(quotient&nbsp;<i>n<sub>1</sub></i>&nbsp;<i>n<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>n<sub>1</sub></i>/<i>n<sub>2</sub></i><br>
-&nbsp;&nbsp;&nbsp;&nbsp;(remainder&nbsp;<i>n<sub>1</sub></i>&nbsp;<i>n<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(modulo&nbsp;<i>n<sub>1</sub></i>&nbsp;<i>n<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0<br>
-<p></tt>
-If <i>n<sub>1</sub></i>/<i>n<sub>2</sub></i> is not an integer object:
-</p>
-
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;(quotient&nbsp;<i>n<sub>1</sub></i>&nbsp;<i>n<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>n<sub><em>q</em></sub></i><br>
-&nbsp;&nbsp;&nbsp;&nbsp;(remainder&nbsp;<i>n<sub>1</sub></i>&nbsp;<i>n<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>n<sub><em>r</em></sub></i><br>
-&nbsp;&nbsp;&nbsp;&nbsp;(modulo&nbsp;<i>n<sub>1</sub></i>&nbsp;<i>n<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>n<sub><em>m</em></sub></i><br>
-<p></tt>
-where <i>n<sub><em>q</em></sub></i> is <i>n<sub>1</sub></i>/<i>n<sub>2</sub></i> rounded towards zero,
-0 &lt; |<i>n<sub><em>r</em></sub></i>| &lt; |<i>n<sub>2</sub></i>|, 0 &lt; |<i>n<sub><em>m</em></sub></i>| &lt; |<i>n<sub>2</sub></i>|,
-<i>n<sub><em>r</em></sub></i> and <i>n<sub><em>m</em></sub></i> differ from <i>n<sub>1</sub></i> by a multiple of <i>n<sub>2</sub></i>,
-<i>n<sub><em>r</em></sub></i> has the same sign as <i>n<sub>1</sub></i>, and
-<i>n<sub><em>m</em></sub></i> has the same sign as <i>n<sub>2</sub></i>.</p>
-<p>
-Consequently, for integer objects <i>n<sub>1</sub></i> and <i>n<sub>2</sub></i> with
-<i>n<sub>2</sub></i> not equal to 0,
-</p>
-
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(=&nbsp;<i>n<sub>1</sub></i>&nbsp;(+&nbsp;(*&nbsp;<i>n<sub>2</sub></i>&nbsp;(quotient&nbsp;<i>n<sub>1</sub></i>&nbsp;<i>n<sub>2</sub></i>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(remainder&nbsp;<i>n<sub>1</sub></i>&nbsp;<i>n<sub>2</sub></i>)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt>
-provided all number object involved in that computation are exact.</p>
-<p>
-</p>
-
-<tt>(modulo&nbsp;13&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1<br>
-(remainder&nbsp;13&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1<br>
-<br>
-(modulo&nbsp;-13&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;3<br>
-(remainder&nbsp;-13&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-1<br>
-<br>
-(modulo&nbsp;13&nbsp;-4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-3<br>
-(remainder&nbsp;13&nbsp;-4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1<br>
-<br>
-(modulo&nbsp;-13&nbsp;-4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-1<br>
-(remainder&nbsp;-13&nbsp;-4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-1<br>
-<br>
-(remainder&nbsp;-13&nbsp;-4.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-1.0<p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-These procedures could be defined in terms of <tt>div</tt> and <tt>mod</tt> (see report section&nbsp;on &#8220;Arithmetic operations&#8221;) as follows (without checking of the
-argument types):
-
-<tt>(define&nbsp;(sign&nbsp;n)<br>
-&nbsp;&nbsp;(cond<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((negative?&nbsp;n)&nbsp;-1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((positive?&nbsp;n)&nbsp;1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;0)))<br>
-<br>
-(define&nbsp;(quotient&nbsp;n1&nbsp;n2)<br>
-&nbsp;&nbsp;(*&nbsp;(sign&nbsp;n1)&nbsp;(sign&nbsp;n2)&nbsp;(div&nbsp;(abs&nbsp;n1)&nbsp;(abs&nbsp;n2))))<br>
-<br>
-(define&nbsp;(remainder&nbsp;n1&nbsp;n2)<br>
-&nbsp;&nbsp;(*&nbsp;(sign&nbsp;n1)&nbsp;(mod&nbsp;(abs&nbsp;n1)&nbsp;(abs&nbsp;n2))))<br>
-<br>
-(define&nbsp;(modulo&nbsp;n1&nbsp;n2)<br>
-&nbsp;&nbsp;(*&nbsp;(sign&nbsp;n2)&nbsp;(mod&nbsp;(*&nbsp;(sign&nbsp;n2)&nbsp;n1)&nbsp;(abs&nbsp;n2))))<br>
-<p></tt>
-</p>
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1296"></a>delay<i> &lt;expression&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-The <tt>delay</tt> construct is used together with the procedure <tt>force</tt> to
-implement <a name="node_idx_1298"></a><em>lazy evaluation</em> or <a name="node_idx_1300"></a><em>call by need</em>.
-<tt>(delay&nbsp;&lt;expression&gt;)</tt> returns an object called a
-<a name="node_idx_1302"></a><em>promise</em> which at some point in the future may be asked (by
-the <tt>force</tt> procedure) to evaluate
-&lt;expression&gt;, and deliver the resulting value.
-The effect of &lt;expression&gt; returning multiple values
-is unspecified.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1304"></a>force<i> promise</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Promise</i> must be a promise.
-The <tt>force</tt> procedure forces the value of <i>promise</i>.  If no value has been computed for
-the promise, then a value is computed and returned.  The value of the
-promise is cached (or &#8220;memoized&#8221;) so that if it is forced a second
-time, the previously computed value is returned.</p>
-<p>
-</p>
-
-<tt>(force&nbsp;(delay&nbsp;(+&nbsp;1&nbsp;2)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;3<br>
-(let&nbsp;((p&nbsp;(delay&nbsp;(+&nbsp;1&nbsp;2))))<br>
-&nbsp;&nbsp;(list&nbsp;(force&nbsp;p)&nbsp;(force&nbsp;p)))&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(3&nbsp;3)<br>
-<br>
-(define&nbsp;a-stream<br>
-&nbsp;&nbsp;(letrec&nbsp;((next<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;n&nbsp;(delay&nbsp;(next&nbsp;(+&nbsp;n&nbsp;1)))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(next&nbsp;0)))<br>
-(define&nbsp;head&nbsp;car)<br>
-(define&nbsp;tail<br>
-&nbsp;&nbsp;(lambda&nbsp;(stream)&nbsp;(force&nbsp;(cdr&nbsp;stream))))<br>
-<br>
-(head&nbsp;(tail&nbsp;(tail&nbsp;a-stream)))&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;2<p></tt></p>
-<p>
-Promises are mainly intended for programs written in
-functional style.  The following examples should not be considered to
-illustrate good programming style, but they illustrate the property that
-only one value is computed for a promise, no matter how many times it is
-forced.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;count&nbsp;0)<br>
-(define&nbsp;p<br>
-&nbsp;&nbsp;(delay&nbsp;(begin&nbsp;(set!&nbsp;count&nbsp;(+&nbsp;count&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(&gt;&nbsp;count&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;count<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(force&nbsp;p)))))<br>
-(define&nbsp;x&nbsp;5)<br>
-p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>a&nbsp;promise</i><br>
-(force&nbsp;p)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;6<br>
-p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>a&nbsp;promise,&nbsp;still</i><br>
-(begin&nbsp;(set!&nbsp;x&nbsp;10)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(force&nbsp;p))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;6<p></tt></p>
-<p>
-Here is a possible implementation of <tt>delay</tt> and <tt>force</tt>.
-Promises are implemented here as procedures of no arguments,
-and <tt>force</tt> simply calls its argument:</p>
-<p>
-</p>
-
-<tt>(define&nbsp;force<br>
-&nbsp;&nbsp;(lambda&nbsp;(object)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(object)))<p></tt></p>
-<p>
-The expression</p>
-<p>
-</p>
-
-<tt>(delay&nbsp;&lt;expression&gt;)<p></tt></p>
-<p>
-has the same meaning as the procedure call</p>
-<p>
-</p>
-
-<tt>(make-promise&nbsp;(lambda&nbsp;()&nbsp;&lt;expression&gt;))<p></tt></p>
-<p>
-as follows</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;delay<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((delay&nbsp;expression)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-promise&nbsp;(lambda&nbsp;()&nbsp;expression))))),<p></tt></p>
-<p>
-where <tt>make-promise</tt> is defined as follows:</p>
-<p>
-</p>
-
-<tt>(define&nbsp;make-promise<br>
-&nbsp;&nbsp;(lambda&nbsp;(proc)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((result-ready?&nbsp;<tt>#f</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(result&nbsp;<tt>#f</tt>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;result-ready?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((x&nbsp;(proc)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;result-ready?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;(set!&nbsp;result-ready?&nbsp;<tt>#t</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;result&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;result))))))))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1306"></a>null-environment<i> n</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>N</i> must be the exact integer object 5.  The <tt>null-environment</tt> procedure returns an
-environment specifier suitable for use with <tt>eval</tt> (see
-chapter&nbsp;<a href="r6rs-lib-Z-H-17.html#node_chap_16">16</a>) representing an environment that is empty except
-for the (syntactic) bindings for all keywords described in
-the previous revision of this report&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_8">8</a>], including bindings
-for <tt>=&gt;</tt>, <tt>...</tt>, <tt>else</tt>, and <tt>_</tt> that are the same as those in
-the <tt>(rnrs base (6))</tt> library.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_1308"></a>scheme-report-environment<i> n</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>N</i> must be the exact integer object 5.  The <tt>scheme-report-environment</tt> procedure returns
-an environment specifier for an environment that is empty except for
-the bindings for the identifiers described in the previous
-revision of this report&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_8">8</a>], omitting <tt>load</tt>, <tt>interaction-environment</tt>, <tt>transcript-on</tt>, <tt>transcript-off</tt>, and <tt>char-ready?</tt>.  The
-variable bindings have as values the procedures of the same names described in
-this report, and the keyword bindings, including
-<tt>=&gt;</tt>, <tt>...</tt>, <tt>else</tt>, and <tt>_</tt> are the same as those described
-in this report.
-</p>
-<p></p>
-<p>
- </p>
-<p></p>
-<p>
-
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-19.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-21.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-21.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-21.html
deleted file mode 100644
index b9a0e57e11..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-21.html
+++ /dev/null
@@ -1,870 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-20.html">previous</a></span><span class=disable>, next</span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span class=disable><span>; &nbsp;&nbsp;</span>index</span>]</div>
-<p></p>
-<a name="node_chap_Temp_3"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_Temp_3">References</a></h1>
-<p></p>
-<table>
-<p>
-</p>
-<tr><td align=right valign=top><a name="node_bib_1"></a>[1]&nbsp;&nbsp;</td><td valign=top>
-Henk&nbsp;P. Barendregt.
- Introduction to the lambda calculus.
- <i>Nieuw Archief voor Wisenkunde</i>, 4(2):337&#8211;372, 1984.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_2"></a>[2]&nbsp;&nbsp;</td><td valign=top>
-Alan Bawden.
- Quasiquotation in Lisp.
- In Olivier Danvy, editor, <i>Proc.&nbsp; ACM SIGPLAN Workshop on Partial
-Evaluation and Semantics-Based Program Manipulation PEPM &#8217;99</i>, pages 4&#8211;12,
-San Antonio, Texas, USA, January 1999.
- BRICS Notes Series NS-99-1.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_3"></a>[3]&nbsp;&nbsp;</td><td valign=top>
-William Clinger and Jonathan Rees.
- Macros that work.
- In <i>Proc.&nbsp; 1991 ACM SIGPLAN Symposium on Principles of
-Programming Languages</i>, pages 155&#8211;162, Orlando, Florida, January 1991. ACM
-Press.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_4"></a>[4]&nbsp;&nbsp;</td><td valign=top>
-Danny Cohen.
- On holy wars and a plea for peace.
- <a href="http://www.ietf.org/rfc/ien/ien137.txt">http://www.ietf.org/rfc/ien/ien137.txt</a>, April 1980.
- Internet Engineering Note 137.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_5"></a>[5]&nbsp;&nbsp;</td><td valign=top>
-Mark Davis.
- Unicode Standard Annex #29: Text boundaries.
- <a href="http://www.unicode.org/reports/tr29/">http://www.unicode.org/reports/tr29/</a>, 2006.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_6"></a>[6]&nbsp;&nbsp;</td><td valign=top>
-R.&nbsp;Kent Dybvig, Robert Hieb, and Carl Bruggeman.
- Syntactic abstraction in Scheme.
- <i>Lisp and Symbolic Computation</i>, 1(1):53&#8211;75, 1988.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_7"></a>[7]&nbsp;&nbsp;</td><td valign=top>
-IEEE standard 754-1985. IEEE standard for binary floating-point arithmetic,
-1985.
- Reprinted in SIGPLAN Notices, 22(2):9-25, 1987.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_8"></a>[8]&nbsp;&nbsp;</td><td valign=top>
-Richard Kelsey, William Clinger, and Jonathan Rees.
- Revised<sup>5</sup> report on the algorithmic language Scheme.
- <i>Higher-Order and Symbolic Computation</i>, 11(1):7&#8211;105, 1998.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_9"></a>[9]&nbsp;&nbsp;</td><td valign=top>
-Eugene&nbsp;E. Kohlbecker, Daniel&nbsp;P. Friedman, Matthias Felleisen, and Bruce Duba.
- Hygienic macro expansion.
- In <i>Proceedings of the 1986 ACM Conference on Lisp and
-Functional Programming</i>, pages 151&#8211;161, 1986.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_10"></a>[10]&nbsp;&nbsp;</td><td valign=top>
-P.&nbsp;Leach, M.&nbsp;Mealling, and R.&nbsp;Salz.
- A Universally Unique IDentifier (UUID) URN namespace.
- <a href="http://www.ietf.org/rfc/rfc4122.txt">http://www.ietf.org/rfc/rfc4122.txt</a>, July 2005.
- RFC 4122.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_11"></a>[11]&nbsp;&nbsp;</td><td valign=top>
-Michael Sperber, R.&nbsp;Kent Dybvig, Matthew Flatt, Anton van Straaten, Richard
-Kelsey, William Clinger, and Jonathan Rees.
- Revised<sup>6</sup> report on the algorithmic language Scheme.
- <a href="http://www.r6rs.org/">http://www.r6rs.org/</a>, 2007.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_12"></a>[12]&nbsp;&nbsp;</td><td valign=top>
-The Unicode Consortium.
- The Unicode standard, version 5.0.0.
- defined by: <i>The Unicode Standard, Version 5.0</i> (Boston, MA,
-Addison-Wesley, 2007. ISBN 0-321-48091-0), 2007.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_13"></a>[13]&nbsp;&nbsp;</td><td valign=top>
-Oscar Waddell.
- <i>Extending the Scope of Syntactic Abstraction</i>.
- PhD thesis, Indiana University, August 1999.
- <a href="http://www.cs.indiana.edu/~owaddell/papers/thesis.ps.gz">http://www.cs.indiana.edu/~owaddell/papers/thesis.ps.gz</a>.<p>
-</p>
-</table><p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<a name="node_chap_Temp_4"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_Temp_4">Index</a></h1>
-<p>
-<a name="node_index_start"></a></p>
-
-<div align=center><table><tr><td>
-
-<span class=large><strong>Alphabetic index of definitions of
-concepts, keywords, and procedures
-</strong></span></td></tr></table></div>
-
-<div style="height: 4.5pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<div class=bigskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-
-
-
-</p>
-<p></p>
-<div class=bigskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-<tt>...</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1128">13</a>, <a href="r6rs-lib-Z-H-13.html#node_idx_1130">13ii</a>
-<tt>=&gt;</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_372">8</a>
-<tt>_</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1126">13iii</a></p>
-<p>
-</p>
-<p>
-accessor <a href="r6rs-lib-Z-H-7.html#node_idx_272">7</a>
-antimark <a href="r6rs-lib-Z-H-13.html#node_idx_1104">13iv</a>
-<tt>&amp;assertion</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_438">8ii</a>
-<tt>assertion-violation?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_442">8iii</a>
-<tt>assoc</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_234">4</a>
-<tt>assp</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_232">4ii</a>
-<tt>assq</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_238">4iii</a>
-<tt>assv</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_236">4iv</a></p>
-<p>
-</p>
-<p>
-base record type <a href="r6rs-lib-Z-H-7.html#node_idx_276">7ii</a>
-big-endian <a href="r6rs-lib-Z-H-3.html#node_idx_74">3</a>
-binary port <a href="r6rs-lib-Z-H-9.html#node_idx_568">9</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_586">9ii</a>
-<tt>binary-port?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_648">9iii</a>
-bit fields <a href="r6rs-lib-Z-H-12.html#node_idx_852">12</a>
-<tt>bitwise-and</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1066">12ii</a>
-<tt>bitwise-arithmetic-shift</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1088">12iii</a>
-<tt>bitwise-arithmetic-shift-left</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1090">12iv</a>
-<tt>bitwise-arithmetic-shift-right</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1092">12v</a>
-<tt>bitwise-bit-count</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1074">12vi</a>
-<tt>bitwise-bit-field</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1084">12vii</a>
-<tt>bitwise-bit-set?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1080">12viii</a>
-<tt>bitwise-copy-bit</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1082">12ix</a>
-<tt>bitwise-copy-bit-field</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1086">12x</a>
-<tt>bitwise-first-bit-set</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1078">12xi</a>
-<tt>bitwise-if</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1072">12xii</a>
-<tt>bitwise-ior</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1068">12xiii</a>
-<tt>bitwise-length</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1076">12xiv</a>
-<tt>bitwise-not</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1064">12xv</a>
-<tt>bitwise-reverse-bit-field</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1096">12xvi</a>
-<tt>bitwise-rotate-bit-field</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1094">12xvii</a>
-<tt>bitwise-xor</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1070">12xviii</a>
-<tt>bound-identifier=?</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1140">13v</a>
-<tt>buffer-mode</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_576">9iv</a>
-<tt>buffer-mode?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_578">9v</a>
-byte <a href="r6rs-lib-Z-H-3.html#node_idx_66">3ii</a>
-bytevector <a href="r6rs-lib-Z-H-3.html#node_idx_64">3iii</a>
-<tt>bytevector-&gt;sint-list</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_118">3iv</a>
-<tt>bytevector-&gt;string</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_630">9vi</a>
-<tt>bytevector-&gt;u8-list</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_104">3v</a>
-<tt>bytevector-&gt;uint-list</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_116">3vi</a>
-<tt>bytevector-copy</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_94">3vii</a>
-<tt>bytevector-copy!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_92">3viii</a>
-<tt>bytevector-fill!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_90">3ix</a>
-<tt>bytevector-ieee-double-native-ref</tt> 
-<a href="r6rs-lib-Z-H-3.html#node_idx_176">3x</a>
-<tt>bytevector-ieee-double-native-set!</tt> 
-<a href="r6rs-lib-Z-H-3.html#node_idx_182">3xi</a>
-<tt>bytevector-ieee-double-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_178">3xii</a>
-<tt>bytevector-ieee-single-native-ref</tt> 
-<a href="r6rs-lib-Z-H-3.html#node_idx_172">3xiii</a>
-<tt>bytevector-ieee-single-native-set!</tt> 
-<a href="r6rs-lib-Z-H-3.html#node_idx_180">3xiv</a>
-<tt>bytevector-ieee-single-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_174">3xv</a>
-<tt>bytevector-length</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_86">3xvi</a>
-<tt>bytevector-s16-native-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_130">3xvii</a>
-<tt>bytevector-s16-native-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_138">3xviii</a>
-<tt>bytevector-s16-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_126">3xix</a>
-<tt>bytevector-s16-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_134">3xx</a>
-<tt>bytevector-s32-native-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_146">3xxi</a>
-<tt>bytevector-s32-native-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_154">3xxii</a>
-<tt>bytevector-s32-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_142">3xxiii</a>
-<tt>bytevector-s32-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_150">3xxiv</a>
-<tt>bytevector-s64-native-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_162">3xxv</a>
-<tt>bytevector-s64-native-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_170">3xxvi</a>
-<tt>bytevector-s64-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_158">3xxvii</a>
-<tt>bytevector-s64-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_166">3xxviii</a>
-<tt>bytevector-s8-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_98">3xxix</a>
-<tt>bytevector-s8-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_102">3xxx</a>
-<tt>bytevector-sint-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_110">3xxxi</a>
-<tt>bytevector-sint-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_114">3xxxii</a>
-<tt>bytevector-u16-native-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_128">3xxxiii</a>
-<tt>bytevector-u16-native-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_136">3xxxiv</a>
-<tt>bytevector-u16-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_124">3xxxv</a>
-<tt>bytevector-u16-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_132">3xxxvi</a>
-<tt>bytevector-u32-native-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_144">3xxxvii</a>
-<tt>bytevector-u32-native-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_152">3xxxviii</a>
-<tt>bytevector-u32-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_140">3xxxix</a>
-<tt>bytevector-u32-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_148">3xl</a>
-<tt>bytevector-u64-native-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_160">3xli</a>
-<tt>bytevector-u64-native-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_168">3xlii</a>
-<tt>bytevector-u64-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_156">3xliii</a>
-<tt>bytevector-u64-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_164">3xliv</a>
-<tt>bytevector-u8-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_96">3xlv</a>
-<tt>bytevector-u8-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_100">3xlvi</a>
-<tt>bytevector-uint-ref</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_108">3xlvii</a>
-<tt>bytevector-uint-set!</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_112">3xlviii</a>
-<tt>bytevector=?</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_88">3xlix</a>
-<tt>bytevector?</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_80">3l</a></p>
-<p>
-</p>
-<p>
-call by need <a href="r6rs-lib-Z-H-20.html#node_idx_1300">20</a>
-<tt>call-with-bytevector-output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_724">9vii</a>
-<tt>call-with-input-file</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_776">9viii</a>
-<tt>call-with-output-file</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_778">9ix</a>
-<tt>call-with-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_662">9x</a>
-<tt>call-with-string-output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_728">9xi</a>
-<tt>case-lambda</tt> <a href="r6rs-lib-Z-H-6.html#node_idx_262">6</a>
-<tt>char-alphabetic?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_22">2</a>
-<tt>char-ci&lt;=?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_18">2ii</a>
-<tt>char-ci&lt;?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_14">2iii</a>
-<tt>char-ci=?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_12">2iv</a>
-<tt>char-ci&gt;=?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_20">2v</a>
-<tt>char-ci&gt;?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_16">2vi</a>
-<tt>char-downcase</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_6">2vii</a>
-<tt>char-foldcase</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_10">2viii</a>
-<tt>char-general-category</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_34">2ix</a>
-<tt>char-lower-case?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_30">2x</a>
-<tt>char-numeric?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_24">2xi</a>
-<tt>char-title-case?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_32">2xii</a>
-<tt>char-titlecase</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_8">2xiii</a>
-<tt>char-upcase</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_4">2xiv</a>
-<tt>char-upper-case?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_28">2xv</a>
-<tt>char-whitespace?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_26">2xvi</a>
-<tt>close-input-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_804">9xii</a>
-<tt>close-output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_806">9xiii</a>
-<tt>close-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_660">9xiv</a>
-codec <a href="r6rs-lib-Z-H-9.html#node_idx_580">9xv</a>
-<tt>command-line</tt> <a href="r6rs-lib-Z-H-11.html#node_idx_844">11</a>
-compound condition <a href="r6rs-lib-Z-H-8.html#node_idx_388">8iv</a>
-condition <a href="r6rs-lib-Z-H-8.html#node_idx_390">8v</a>
-<tt>&amp;condition</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_392">8vi</a>
-<tt>condition</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_394">8vii</a>
-<tt>condition-accessor</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_402">8viii</a>
-<tt>condition-irritants</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_450">8ix</a>
-<tt>condition-message</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_412">8x</a>
-<tt>condition-predicate</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_400">8xi</a>
-<tt>condition-who</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_458">8xii</a>
-<tt>condition?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_398">8xiii</a>
-<tt>cons*</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_240">4v</a>, <a href="r6rs-lib-Z-H-4.html#node_idx_242">4vi</a>
-constructor descriptor <a href="r6rs-lib-Z-H-7.html#node_idx_326">7iii</a>
-continuable exception <a href="r6rs-lib-Z-H-8.html#node_idx_380">8xiv</a>
-current exception handler <a href="r6rs-lib-Z-H-8.html#node_idx_366">8xv</a>
-<tt>current-error-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_736">9xvi</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_788">9xvii</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_794">9xviii</a>
-<tt>current-input-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_678">9xix</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_784">9xx</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_790">9xxi</a>
-<tt>current-output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_734">9xxii</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_786">9xxiii</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_792">9xxiv</a></p>
-<p>
-</p>
-<p>
-<tt>datum-&gt;syntax</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1146">13vi</a>
-<tt>define-condition-type</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_404">8xvi</a>
-<tt>define-enumeration</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1262">15</a>
-<tt>define-record-type</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_288">7iv</a>
-<tt>delay</tt> <a href="r6rs-lib-Z-H-20.html#node_idx_1296">20ii</a>
-<tt>delete-file</tt> <a href="r6rs-lib-Z-H-10.html#node_idx_840">10</a>
-<tt>display</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_828">9xxv</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_830">9xxvi</a>
-<tt>do</tt> <a href="r6rs-lib-Z-H-6.html#node_idx_258">6ii</a></p>
-<p>
-</p>
-<p>
-<tt>else</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_374">8xvii</a>
-end-of-file object <a href="r6rs-lib-Z-H-9.html#node_idx_634">9xxvii</a>
-end-of-line style <a href="r6rs-lib-Z-H-9.html#node_idx_582">9xxviii</a>
-endianness <a href="r6rs-lib-Z-H-3.html#node_idx_70">3li</a>
-<tt>endianness</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_76">3lii</a>
-<tt>enum-set-&gt;list</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1244">15ii</a>
-<tt>enum-set-complement</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1258">15iii</a>
-<tt>enum-set-constructor</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1242">15iv</a>
-<tt>enum-set-difference</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1256">15v</a>
-<tt>enum-set-indexer</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1240">15vi</a>
-<tt>enum-set-intersection</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1254">15vii</a>
-<tt>enum-set-member?</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1246">15viii</a>
-<tt>enum-set-projection</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1260">15ix</a>
-<tt>enum-set-subset?</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1248">15x</a>
-<tt>enum-set-union</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1252">15xi</a>
-<tt>enum-set-universe</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1238">15xii</a>
-<tt>enum-set=?</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1250">15xiii</a>
-enumeration <a href="r6rs-lib-Z-H-15.html#node_idx_1228">15xiv</a>
-enumeration sets <a href="r6rs-lib-Z-H-15.html#node_idx_1230">15xv</a>
-enumeration type <a href="r6rs-lib-Z-H-15.html#node_idx_1234">15xvi</a>
-environment <a href="r6rs-lib-Z-H-17.html#node_idx_1268">17</a>
-<tt>environment</tt> <a href="r6rs-lib-Z-H-17.html#node_idx_1270">17ii</a>
-<tt>eof-object</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_636">9xxix</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_768">9xxx</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_772">9xxxi</a>
-<tt>eof-object?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_638">9xxxii</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_770">9xxxiii</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_774">9xxxiv</a>
-<tt>eol-style</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_596">9xxxv</a>
-<tt>equal-hash</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1218">14</a>
-equivalence function <a href="r6rs-lib-Z-H-14.html#node_idx_1170">14ii</a>
-<tt>&amp;error</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_426">8xviii</a>
-<tt>error-handling-mode</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_614">9xxxvi</a>
-<tt>error?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_430">8xix</a>
-<tt>eval</tt> <a href="r6rs-lib-Z-H-17.html#node_idx_1266">17iii</a>
-<tt>exact-&gt;inexact</tt> <a href="r6rs-lib-Z-H-20.html#node_idx_1286">20iii</a>
-exceptional situation <a href="r6rs-lib-Z-H-8.html#node_idx_384">8xx</a>
-exceptions <a href="r6rs-lib-Z-H-8.html#node_idx_362">8xxi</a>
-<tt>exists</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_206">4vii</a>
-<tt>exit</tt> <a href="r6rs-lib-Z-H-11.html#node_idx_846">11ii</a>, <a href="r6rs-lib-Z-H-11.html#node_idx_848">11iii</a></p>
-<p>
-</p>
-<p>
-field <a href="r6rs-lib-Z-H-7.html#node_idx_266">7v</a>
-<tt>fields</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_290">7vi</a>
-file options <a href="r6rs-lib-Z-H-9.html#node_idx_572">9xxxvii</a>
-<tt>file-exists?</tt> <a href="r6rs-lib-Z-H-10.html#node_idx_838">10ii</a>
-<tt>file-options</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_574">9xxxviii</a>
-<tt>filter</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_208">4viii</a>
-<tt>find</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_202">4ix</a>
-<tt>fixnum-&gt;flonum</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1060">12xix</a>
-<tt>fixnum-width</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_858">12xx</a>
-<tt>fixnum?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_856">12xxi</a>
-<tt>fl*</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_988">12xxii</a>
-<tt>fl+</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_986">12xxiii</a>
-<tt>fl-</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_990">12xxiv</a>, <a href="r6rs-lib-Z-H-12.html#node_idx_992">12xxv</a>
-<tt>fl/</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_994">12xxvi</a>, <a href="r6rs-lib-Z-H-12.html#node_idx_996">12xxvii</a>
-<tt>fl&lt;=?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_958">12xxviii</a>
-<tt>fl&lt;?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_956">12xxix</a>
-<tt>fl=?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_954">12xxx</a>
-<tt>fl&gt;=?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_962">12xxxi</a>
-<tt>fl&gt;?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_960">12xxxii</a>
-<tt>flabs</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_998">12xxxiii</a>
-<tt>flacos</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1038">12xxxiv</a>
-<tt>flasin</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1036">12xxxv</a>
-<tt>flatan</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1040">12xxxvi</a>, <a href="r6rs-lib-Z-H-12.html#node_idx_1042">12xxxvii</a>
-<tt>flceiling</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1018">12xxxviii</a>
-<tt>flcos</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1032">12xxxix</a>
-<tt>fldenominator</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1014">12xl</a>
-<tt>fldiv</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1002">12xli</a>
-<tt>fldiv-and-mod</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1000">12xlii</a>
-<tt>fldiv0</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1008">12xliii</a>
-<tt>fldiv0-and-mod0</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1006">12xliv</a>
-<tt>fleven?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_974">12xlv</a>
-<tt>flexp</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1024">12xlvi</a>
-<tt>flexpt</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1046">12xlvii</a>
-<tt>flfinite?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_976">12xlviii</a>
-<tt>flfloor</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1016">12xlix</a>
-<tt>flinfinite?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_978">12l</a>
-<tt>flinteger?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_964">12li</a>
-<tt>fllog</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1026">12lii</a>, <a href="r6rs-lib-Z-H-12.html#node_idx_1028">12liii</a>
-<tt>flmax</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_982">12liv</a>
-<tt>flmin</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_984">12lv</a>
-<tt>flmod</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1004">12lvi</a>
-<tt>flmod0</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1010">12lvii</a>
-<tt>flnan?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_980">12lviii</a>
-<tt>flnegative?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_970">12lix</a>
-<tt>flnumerator</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1012">12lx</a>
-<tt>flodd?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_972">12lxi</a>
-<tt>flonum?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_950">12lxii</a>
-<tt>flpositive?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_968">12lxiii</a>
-<tt>flround</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1022">12lxiv</a>
-<tt>flsin</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1030">12lxv</a>
-<tt>flsqrt</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1044">12lxvi</a>
-<tt>fltan</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1034">12lxvii</a>
-<tt>fltruncate</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1020">12lxviii</a>
-<tt>flush-output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_712">9xxxix</a>
-<tt>flzero?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_966">12lxix</a>
-<tt>fold-left</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_212">4x</a>
-<tt>fold-right</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_214">4xi</a>
-<tt>for-all</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_204">4xii</a>
-<tt>force</tt> <a href="r6rs-lib-Z-H-20.html#node_idx_1304">20iv</a>
-<tt>free-identifier=?</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1142">13vii</a>
-<tt>fx*</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_890">12lxx</a>
-<tt>fx*/carry</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_912">12lxxi</a>
-<tt>fx+</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_888">12lxxii</a>
-<tt>fx+/carry</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_908">12lxxiii</a>
-<tt>fx-</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_892">12lxxiv</a>, <a href="r6rs-lib-Z-H-12.html#node_idx_894">12lxxv</a>
-<tt>fx-/carry</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_910">12lxxvi</a>
-<tt>fx&lt;=?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_872">12lxxvii</a>
-<tt>fx&lt;?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_868">12lxxviii</a>
-<tt>fx=?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_864">12lxxix</a>
-<tt>fx&gt;=?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_870">12lxxx</a>
-<tt>fx&gt;?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_866">12lxxxi</a>
-<tt>fxand</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_916">12lxxxii</a>
-<tt>fxarithmetic-shift</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_938">12lxxxiii</a>
-<tt>fxarithmetic-shift-left</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_940">12lxxxiv</a>
-<tt>fxarithmetic-shift-right</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_942">12lxxxv</a>
-<tt>fxbit-count</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_924">12lxxxvi</a>
-<tt>fxbit-field</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_934">12lxxxvii</a>
-<tt>fxbit-set?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_930">12lxxxviii</a>
-<tt>fxcopy-bit</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_932">12lxxxix</a>
-<tt>fxcopy-bit-field</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_936">12xc</a>
-<tt>fxdiv</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_898">12xci</a>
-<tt>fxdiv-and-mod</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_896">12xcii</a>
-<tt>fxdiv0</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_904">12xciii</a>
-<tt>fxdiv0-and-mod0</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_902">12xciv</a>
-<tt>fxeven?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_882">12xcv</a>
-<tt>fxfirst-bit-set</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_928">12xcvi</a>
-<tt>fxif</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_922">12xcvii</a>
-<tt>fxior</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_918">12xcviii</a>
-<tt>fxlength</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_926">12xcix</a>
-<tt>fxmax</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_884">12c</a>
-<tt>fxmin</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_886">12ci</a>
-<tt>fxmod</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_900">12cii</a>
-<tt>fxmod0</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_906">12ciii</a>
-<tt>fxnegative?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_878">12civ</a>
-<tt>fxnot</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_914">12cv</a>
-<tt>fxodd?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_880">12cvi</a>
-<tt>fxpositive?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_876">12cvii</a>
-<tt>fxreverse-bit-field</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_946">12cviii</a>
-<tt>fxrotate-bit-field</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_944">12cix</a>
-<tt>fxxor</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_920">12cx</a>
-<tt>fxzero?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_874">12cxi</a></p>
-<p>
-</p>
-<p>
-<tt>generate-temporaries</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1150">13viii</a>
-<tt>get-bytevector-all</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_694">9xl</a>
-<tt>get-bytevector-n</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_688">9xli</a>
-<tt>get-bytevector-n!</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_690">9xlii</a>
-<tt>get-bytevector-some</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_692">9xliii</a>
-<tt>get-char</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_696">9xliv</a>
-<tt>get-datum</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_708">9xlv</a>
-<tt>get-line</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_706">9xlvi</a>
-<tt>get-string-all</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_704">9xlvii</a>
-<tt>get-string-n</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_700">9xlviii</a>
-<tt>get-string-n!</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_702">9xlix</a>
-<tt>get-u8</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_684">9l</a>
-<tt>greatest-fixnum</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_862">12cxii</a>
-<tt>guard</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_370">8xxii</a></p>
-<p>
-</p>
-<p>
-hash function <a href="r6rs-lib-Z-H-14.html#node_idx_1168">14iii</a>
-hashtable <a href="r6rs-lib-Z-H-14.html#node_idx_1166">14iv</a>, <a href="r6rs-lib-Z-H-14.html#node_idx_1172">14v</a>
-<tt>hashtable-clear!</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1204">14vi</a>, 
-<a href="r6rs-lib-Z-H-14.html#node_idx_1206">14vii</a>
-<tt>hashtable-contains?</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1196">14viii</a>
-<tt>hashtable-copy</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1200">14ix</a>, 
-<a href="r6rs-lib-Z-H-14.html#node_idx_1202">14x</a>
-<tt>hashtable-delete!</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1194">14xi</a>
-<tt>hashtable-entries</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1210">14xii</a>
-<tt>hashtable-equivalence-function</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1212">14xiii</a>
-<tt>hashtable-hash-function</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1214">14xiv</a>
-<tt>hashtable-keys</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1208">14xv</a>
-<tt>hashtable-mutable?</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1216">14xvi</a>
-<tt>hashtable-ref</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1190">14xvii</a>
-<tt>hashtable-set!</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1192">14xviii</a>
-<tt>hashtable-size</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1188">14xix</a>
-<tt>hashtable-update!</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1198">14xx</a>
-<tt>hashtable?</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1186">14xxi</a></p>
-<p>
-</p>
-<p>
-<tt>&amp;i/o</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_494">9li</a>
-<tt>&amp;i/o-decoding</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_600">9lii</a>
-<tt>i/o-decoding-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_604">9liii</a>
-<tt>&amp;i/o-encoding</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_606">9liv</a>
-<tt>i/o-encoding-error-char</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_612">9lv</a>
-<tt>i/o-encoding-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_610">9lvi</a>
-<tt>i/o-error-filename</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_526">9lvii</a>
-<tt>i/o-error-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_558">9lviii</a>
-<tt>i/o-error-position</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_518">9lix</a>
-<tt>i/o-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_498">9lx</a>
-<tt>&amp;i/o-file-already-exists</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_540">9lxi</a>
-<tt>i/o-file-already-exists-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_544">9lxii</a>
-<tt>&amp;i/o-file-does-not-exist</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_546">9lxiii</a>
-<tt>i/o-file-does-not-exist-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_550">9lxiv</a>
-<tt>&amp;i/o-file-is-read-only</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_534">9lxv</a>
-<tt>i/o-file-is-read-only-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_538">9lxvi</a>
-<tt>&amp;i/o-file-protection</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_528">9lxvii</a>
-<tt>i/o-file-protection-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_532">9lxviii</a>
-<tt>&amp;i/o-filename</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_520">9lxix</a>
-<tt>i/o-filename-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_524">9lxx</a>
-<tt>&amp;i/o-invalid-position</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_512">9lxxi</a>
-<tt>i/o-invalid-position-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_516">9lxxii</a>
-<tt>&amp;i/o-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_552">9lxxiii</a>
-<tt>i/o-port-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_556">9lxxiv</a>
-<tt>&amp;i/o-read</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_500">9lxxv</a>
-<tt>i/o-read-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_504">9lxxvi</a>
-<tt>&amp;i/o-write</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_506">9lxxvii</a>
-<tt>i/o-write-error?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_510">9lxxviii</a>
-identifier macro <a href="r6rs-lib-Z-H-13.html#node_idx_1136">13ix</a>
-<tt>identifier?</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1138">13x</a>
-<tt>immutable</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_294">7vii</a>
-immutable record type <a href="r6rs-lib-Z-H-7.html#node_idx_282">7viii</a>
-<tt>&amp;implementation-restriction</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_466">8xxiii</a>
-<tt>implementation-restriction-violation?</tt> 
-<a href="r6rs-lib-Z-H-8.html#node_idx_470">8xxiv</a>
-implicit identifier <a href="r6rs-lib-Z-H-13.html#node_idx_1148">13xi</a>
-<tt>inexact-&gt;exact</tt> <a href="r6rs-lib-Z-H-20.html#node_idx_1288">20v</a>
-input port <a href="r6rs-lib-Z-H-9.html#node_idx_564">9lxxix</a>
-<tt>input-port?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_664">9lxxx</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_780">9lxxxi</a>
-<tt>&amp;irritants</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_444">8xxv</a>
-<tt>irritants-condition?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_448">8xxvi</a></p>
-<p>
-</p>
-<p>
-<tt>latin-1-codec</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_590">9lxxxii</a>
-lazy evaluation <a href="r6rs-lib-Z-H-20.html#node_idx_1298">20vi</a>
-<tt>least-fixnum</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_860">12cxiii</a>
-<tt>&amp;lexical</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_472">8xxvii</a>
-<tt>lexical-violation?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_476">8xxviii</a>
-<tt>list-sort</tt> <a href="r6rs-lib-Z-H-5.html#node_idx_246">5</a>
-little-endian <a href="r6rs-lib-Z-H-3.html#node_idx_72">3liii</a>
-<tt>lookahead-char</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_698">9lxxxiii</a>
-<tt>lookahead-u8</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_686">9lxxxiv</a></p>
-<p>
-</p>
-<p>
-macro transformer <a href="r6rs-lib-Z-H-13.html#node_idx_1114">13xii</a>
-<tt>make-assertion-violation</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_440">8xxix</a>
-<tt>make-bytevector</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_82">3liv</a>, 
-<a href="r6rs-lib-Z-H-3.html#node_idx_84">3lv</a>
-<tt>make-custom-binary-input-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_680">9lxxxv</a>
-<tt>make-custom-binary-input/output-port</tt> 
-<a href="r6rs-lib-Z-H-9.html#node_idx_762">9lxxxvi</a>
-<tt>make-custom-binary-output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_738">9lxxxvii</a>
-<tt>make-custom-textual-input-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_682">9lxxxviii</a>
-<tt>make-custom-textual-input/output-port</tt> 
-<a href="r6rs-lib-Z-H-9.html#node_idx_764">9lxxxix</a>
-<tt>make-custom-textual-output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_740">9xc</a>
-<tt>make-enumeration</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1236">15xvii</a>
-<tt>make-eq-hashtable</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1174">14xxii</a>, 
-<a href="r6rs-lib-Z-H-14.html#node_idx_1176">14xxiii</a>
-<tt>make-eqv-hashtable</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1178">14xxiv</a>, 
-<a href="r6rs-lib-Z-H-14.html#node_idx_1180">14xxv</a>
-<tt>make-error</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_428">8xxx</a>
-<tt>make-hashtable</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1182">14xxvi</a>, 
-<a href="r6rs-lib-Z-H-14.html#node_idx_1184">14xxvii</a>
-<tt>make-i/o-decoding-error</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_602">9xci</a>
-<tt>make-i/o-encoding-error</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_608">9xcii</a>
-<tt>make-i/o-error</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_496">9xciii</a>
-<tt>make-i/o-file-already-exists-error</tt> 
-<a href="r6rs-lib-Z-H-9.html#node_idx_542">9xciv</a>
-<tt>make-i/o-file-does-not-exist-error</tt> 
-<a href="r6rs-lib-Z-H-9.html#node_idx_548">9xcv</a>
-<tt>make-i/o-file-is-read-only-error</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_536">9xcvi</a>
-<tt>make-i/o-file-protection-error</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_530">9xcvii</a>
-<tt>make-i/o-filename-error</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_522">9xcviii</a>
-<tt>make-i/o-invalid-position-error</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_514">9xcix</a>
-<tt>make-i/o-port-error</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_554">9c</a>
-<tt>make-i/o-read-error</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_502">9ci</a>
-<tt>make-i/o-write-error</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_508">9cii</a>
-<tt>make-implementation-restriction-violation</tt> 
-<a href="r6rs-lib-Z-H-8.html#node_idx_468">8xxxi</a>
-<tt>make-irritants-condition</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_446">8xxxii</a>
-<tt>make-lexical-violation</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_474">8xxxiii</a>
-<tt>make-message-condition</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_408">8xxxiv</a>
-<tt>make-no-infinities-violation</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1050">12cxiv</a>
-<tt>make-no-nans-violation</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1056">12cxv</a>
-<tt>make-non-continuable-violation</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_462">8xxxv</a>
-<tt>make-record-constructor-descriptor</tt> 
-<a href="r6rs-lib-Z-H-7.html#node_idx_322">7ix</a>
-<tt>make-record-type-descriptor</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_314">7x</a>
-<tt>make-serious-condition</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_422">8xxxvi</a>
-<tt>make-syntax-violation</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_480">8xxxvii</a>
-<tt>make-transcoder</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_616">9ciii</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_618">9civ</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_620">9cv</a>
-<tt>make-undefined-violation</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_490">8xxxviii</a>
-<tt>make-variable-transformer</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1120">13xiii</a>
-<tt>make-violation</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_434">8xxxix</a>
-<tt>make-warning</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_416">8xl</a>
-<tt>make-who-condition</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_454">8xli</a>
-mark <a href="r6rs-lib-Z-H-13.html#node_idx_1100">13xiv</a>
-<tt>member</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_226">4xiii</a>
-<tt>memp</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_224">4xiv</a>
-<tt>memq</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_230">4xv</a>
-<tt>memv</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_228">4xvi</a>
-<tt>&amp;message</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_406">8xlii</a>
-<tt>message-condition?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_410">8xliii</a>
-<tt>modulo</tt> <a href="r6rs-lib-Z-H-20.html#node_idx_1294">20vii</a>
-<tt>mutable</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_292">7xi</a>
-mutable record type <a href="r6rs-lib-Z-H-7.html#node_idx_284">7xii</a>
-mutator <a href="r6rs-lib-Z-H-7.html#node_idx_274">7xiii</a></p>
-<p>
-</p>
-<p>
-<tt>native-endianness</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_78">3lvi</a>
-<tt>native-eol-style</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_598">9cvi</a>
-<tt>native-transcoder</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_622">9cvii</a>
-<tt>newline</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_824">9cviii</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_826">9cix</a>
-<tt>&amp;no-infinities</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1048">12cxvi</a>
-<tt>no-infinities-violation?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1052">12cxvii</a>
-<tt>&amp;no-nans</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1054">12cxviii</a>
-<tt>no-nans-violation?</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1058">12cxix</a>
-<tt>&amp;non-continuable</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_460">8xliv</a>
-<tt>non-continuable-violation?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_464">8xlv</a>
-nongenerative <a href="r6rs-lib-Z-H-7.html#node_idx_280">7xiv</a>
-<tt>nongenerative</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_304">7xv</a>
-<tt>null-environment</tt> <a href="r6rs-lib-Z-H-20.html#node_idx_1306">20viii</a>
-number <a href="r6rs-lib-Z-H-12.html#node_idx_850">12cxx</a></p>
-<p>
-</p>
-<p>
-octet <a href="r6rs-lib-Z-H-3.html#node_idx_68">3lvii</a>
-<tt>opaque</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_302">7xvi</a>
-<tt>open-bytevector-input-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_672">9cx</a>
-<tt>open-bytevector-output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_720">9cxi</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_722">9cxii</a>
-<tt>open-file-input-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_668">9cxiii</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_670">9cxiv</a>
-<tt>open-file-input/output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_758">9cxv</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_760">9cxvi</a>
-<tt>open-file-output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_716">9cxvii</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_718">9cxviii</a>
-<tt>open-input-file</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_800">9cxix</a>
-<tt>open-output-file</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_802">9cxx</a>
-<tt>open-string-input-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_674">9cxxi</a>
-<tt>open-string-output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_726">9cxxii</a>
-output ports <a href="r6rs-lib-Z-H-9.html#node_idx_566">9cxxiii</a>
-<tt>output-port-buffer-mode</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_714">9cxxiv</a>
-<tt>output-port?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_710">9cxxv</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_782">9cxxvi</a></p>
-<p>
-</p>
-<p>
-<tt>parent</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_296">7xvii</a>
-<tt>parent-rtd</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_306">7xviii</a>
-<tt>partition</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_210">4xvii</a>
-pattern variable <a href="r6rs-lib-Z-H-13.html#node_idx_1132">13xv</a>
-<tt>peek-char</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_812">9cxxvii</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_814">9cxxviii</a>
-port <a href="r6rs-lib-Z-H-9.html#node_idx_562">9cxxix</a>
-<tt>port-eof?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_666">9cxxx</a>
-<tt>port-has-port-position?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_652">9cxxxi</a>
-<tt>port-has-set-port-position!?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_656">9cxxxii</a>
-<tt>port-position</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_654">9cxxxiii</a>
-<tt>port-transcoder</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_644">9cxxxiv</a>
-<tt>port?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_642">9cxxxv</a>
-position <a href="r6rs-lib-Z-H-9.html#node_idx_640">9cxxxvi</a>
-promise <a href="r6rs-lib-Z-H-20.html#node_idx_1302">20ix</a>
-protocol <a href="r6rs-lib-Z-H-7.html#node_idx_330">7xix</a>
-<tt>protocol</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_298">7xx</a>
-<tt>put-bytevector</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_744">9cxxxvii</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_746">9cxxxviii</a>
-<tt>put-char</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_748">9cxxxix</a>
-<tt>put-datum</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_756">9cxl</a>
-<tt>put-string</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_750">9cxli</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_752">9cxlii</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_754">9cxliii</a>
-<tt>put-u8</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_742">9cxliv</a></p>
-<p>
-</p>
-<p>
-<tt>quasisyntax</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1154">13xvi</a>
-<tt>quotient</tt> <a href="r6rs-lib-Z-H-20.html#node_idx_1290">20x</a></p>
-<p>
-</p>
-<p>
-<tt>raise</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_376">8xlvi</a>
-<tt>raise-continuable</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_378">8xlvii</a>
-<tt>read</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_816">9cxlv</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_818">9cxlvi</a>
-<tt>read-char</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_808">9cxlvii</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_810">9cxlviii</a>
-<tt>real-&gt;flonum</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_952">12cxxi</a>
-record <a href="r6rs-lib-Z-H-7.html#node_idx_264">7xxi</a>
-record constructor <a href="r6rs-lib-Z-H-7.html#node_idx_270">7xxii</a>, <a href="r6rs-lib-Z-H-7.html#node_idx_328">7xxiii</a>
-<tt>record-accessor</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_336">7xxiv</a>
-<tt>record-constructor</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_332">7xxv</a>
-record-constructor descriptor <a href="r6rs-lib-Z-H-7.html#node_idx_324">7xxvi</a>
-<tt>record-constructor-descriptor</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_310">7xxvii</a>
-<tt>record-field-mutable?</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_360">7xxviii</a>
-<tt>record-mutator</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_338">7xxix</a>
-<tt>record-predicate</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_334">7xxx</a>
-<tt>record-rtd</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_344">7xxxi</a>
-record-type descriptor <a href="r6rs-lib-Z-H-7.html#node_idx_268">7xxxii</a>, 
-<a href="r6rs-lib-Z-H-7.html#node_idx_316">7xxxiii</a>
-<tt>record-type-descriptor</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_308">7xxxiv</a>
-<tt>record-type-descriptor?</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_320">7xxxv</a>
-<tt>record-type-field-names</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_358">7xxxvi</a>
-<tt>record-type-generative?</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_352">7xxxvii</a>
-<tt>record-type-name</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_346">7xxxviii</a>
-<tt>record-type-opaque?</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_356">7xxxix</a>
-<tt>record-type-parent</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_348">7xl</a>
-<tt>record-type-sealed?</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_354">7xli</a>
-<tt>record-type-uid</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_350">7xlii</a>
-<tt>record?</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_342">7xliii</a>
-region <a href="r6rs-lib-Z-H-6.html#node_idx_260">6iii</a>
-<tt>remainder</tt> <a href="r6rs-lib-Z-H-20.html#node_idx_1292">20xi</a>
-<tt>remove</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_218">4xviii</a>
-<tt>remp</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_216">4xix</a>
-<tt>remq</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_222">4xx</a>
-<tt>remv</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_220">4xxi</a>
-<tt>(rnrs (6))</tt> <a href="r6rs-lib-Z-H-16.html#node_idx_1264">16</a>
-<tt>(rnrs arithmetic bitwise (6))</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_1062">12cxxii</a>
-<tt>(rnrs arithmetic fixnums (6))</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_854">12cxxiii</a>
-<tt>(rnrs arithmetic flonums (6))</tt> <a href="r6rs-lib-Z-H-12.html#node_idx_948">12cxxiv</a>
-<tt>(rnrs bytevectors (6))</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_62">3lviii</a>
-<tt>(rnrs conditions (6))</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_382">8xlviii</a>
-<tt>(rnrs control (6))</tt> <a href="r6rs-lib-Z-H-6.html#node_idx_252">6iv</a>
-<tt>(rnrs enums (6))</tt> <a href="r6rs-lib-Z-H-15.html#node_idx_1226">15xviii</a>
-<tt>(rnrs exceptions (6))</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_364">8xlix</a>
-<tt>(rnrs files (6))</tt> <a href="r6rs-lib-Z-H-10.html#node_idx_836">10iii</a>
-<tt>(rnrs hashtables (6))</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1164">14xxviii</a>
-<tt>(rnrs io ports (6))</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_560">9cxlix</a>
-<tt>(rnrs io simple (6))</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_766">9cl</a>
-<tt>(rnrs lists (6))</tt> <a href="r6rs-lib-Z-H-4.html#node_idx_200">4xxii</a>
-<tt>(rnrs mutable-pairs (6))</tt> <a href="r6rs-lib-Z-H-18.html#node_idx_1272">18</a>
-<tt>(rnrs mutable-strings (6))</tt> <a href="r6rs-lib-Z-H-19.html#node_idx_1278">19</a>
-<tt>(rnrs programs (6))</tt> <a href="r6rs-lib-Z-H-11.html#node_idx_842">11iv</a>
-<tt>(rnrs r5rs (6))</tt> <a href="r6rs-lib-Z-H-20.html#node_idx_1284">20xii</a>
-<tt>(rnrs records inspection (6))</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_340">7xliv</a>
-<tt>(rnrs records procedural (6))</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_312">7xlv</a>
-<tt>(rnrs records syntactic (6))</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_286">7xlvi</a>
-<tt>(rnrs sorting (6))</tt> <a href="r6rs-lib-Z-H-5.html#node_idx_244">5ii</a>
-<tt>(rnrs syntax-case (6))</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1098">13xvii</a>
-<tt>(rnrs unicode (6))</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_2">2xvii</a>
-rtd <a href="r6rs-lib-Z-H-7.html#node_idx_318">7xlvii</a></p>
-<p>
-</p>
-<p>
-<tt>scheme-report-environment</tt> <a href="r6rs-lib-Z-H-20.html#node_idx_1308">20xiii</a>
-sealed <a href="r6rs-lib-Z-H-7.html#node_idx_278">7xlviii</a>
-<tt>sealed</tt> <a href="r6rs-lib-Z-H-7.html#node_idx_300">7xlix</a>
-<tt>&amp;serious</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_420">8l</a>
-<tt>serious-condition?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_424">8li</a>
-<tt>set-car!</tt> <a href="r6rs-lib-Z-H-18.html#node_idx_1274">18ii</a>
-<tt>set-cdr!</tt> <a href="r6rs-lib-Z-H-18.html#node_idx_1276">18iii</a>
-<tt>set-port-position!</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_658">9cli</a>
-simple condition <a href="r6rs-lib-Z-H-8.html#node_idx_386">8lii</a>
-<tt>simple-conditions</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_396">8liii</a>
-<tt>sint-list-&gt;bytevector</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_122">3lix</a>
-<tt>standard-error-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_732">9clii</a>
-<tt>standard-input-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_676">9cliii</a>
-<tt>standard-output-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_730">9cliv</a>
-<tt>string-&gt;bytevector</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_632">9clv</a>
-<tt>string-&gt;utf16</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_186">3lx</a>, 
-<a href="r6rs-lib-Z-H-3.html#node_idx_188">3lxi</a>
-<tt>string-&gt;utf32</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_190">3lxii</a>, 
-<a href="r6rs-lib-Z-H-3.html#node_idx_192">3lxiii</a>
-<tt>string-&gt;utf8</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_184">3lxiv</a>
-<tt>string-ci-hash</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1222">14xxix</a>
-<tt>string-ci&lt;=?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_50">2xviii</a>
-<tt>string-ci&lt;?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_46">2xix</a>
-<tt>string-ci=?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_44">2xx</a>
-<tt>string-ci&gt;=?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_52">2xxi</a>
-<tt>string-ci&gt;?</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_48">2xxii</a>
-<tt>string-downcase</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_38">2xxiii</a>
-<tt>string-fill!</tt> <a href="r6rs-lib-Z-H-19.html#node_idx_1282">19ii</a>
-<tt>string-foldcase</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_42">2xxiv</a>
-<tt>string-hash</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1220">14xxx</a>
-<tt>string-normalize-nfc</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_58">2xxv</a>
-<tt>string-normalize-nfd</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_54">2xxvi</a>
-<tt>string-normalize-nfkc</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_60">2xxvii</a>
-<tt>string-normalize-nfkd</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_56">2xxviii</a>
-<tt>string-set!</tt> <a href="r6rs-lib-Z-H-19.html#node_idx_1280">19iii</a>
-<tt>string-titlecase</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_40">2xxix</a>
-<tt>string-upcase</tt> <a href="r6rs-lib-Z-H-2.html#node_idx_36">2xxx</a>
-substitution <a href="r6rs-lib-Z-H-13.html#node_idx_1102">13xviii</a>
-<tt>symbol-hash</tt> <a href="r6rs-lib-Z-H-14.html#node_idx_1224">14xxxi</a>
-<tt>&amp;syntax</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_478">8liv</a>
-<tt>syntax</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1134">13xix</a>
-syntax object <a href="r6rs-lib-Z-H-13.html#node_idx_1110">13xx</a>
-<tt>syntax-&gt;datum</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1144">13xxi</a>
-<tt>syntax-case</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1124">13xxii</a>
-<tt>syntax-violation</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1160">13xxiii</a>, 
-<a href="r6rs-lib-Z-H-13.html#node_idx_1162">13xxiv</a>
-<tt>syntax-violation-form</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_484">8lv</a>
-<tt>syntax-violation-subform</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_486">8lvi</a>
-<tt>syntax-violation?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_482">8lvii</a></p>
-<p>
-</p>
-<p>
-textual port <a href="r6rs-lib-Z-H-9.html#node_idx_588">9clvi</a>
-textual ports <a href="r6rs-lib-Z-H-9.html#node_idx_570">9clvii</a>
-<tt>textual-port?</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_646">9clviii</a>
-<tt>transcoded-port</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_650">9clix</a>
-transcoder <a href="r6rs-lib-Z-H-9.html#node_idx_584">9clx</a>
-<tt>transcoder-codec</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_624">9clxi</a>
-<tt>transcoder-eol-style</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_626">9clxii</a>
-<tt>transcoder-error-handling-mode</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_628">9clxiii</a>
-transformation procedure <a href="r6rs-lib-Z-H-13.html#node_idx_1116">13xxv</a>
-transformer <a href="r6rs-lib-Z-H-13.html#node_idx_1112">13xxvi</a></p>
-<p>
-</p>
-<p>
-<tt>u8-list-&gt;bytevector</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_106">3lxv</a>
-<tt>uint-list-&gt;bytevector</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_120">3lxvi</a>
-<tt>&amp;undefined</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_488">8lviii</a>
-<tt>undefined-violation?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_492">8lix</a>
-universe <a href="r6rs-lib-Z-H-15.html#node_idx_1232">15xix</a>
-<tt>unless</tt> <a href="r6rs-lib-Z-H-6.html#node_idx_256">6v</a>
-<tt>unsyntax</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1156">13xxvii</a>
-<tt>unsyntax-splicing</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1158">13xxviii</a>
-<tt>utf-16-codec</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_594">9clxiv</a>
-<tt>utf-8-codec</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_592">9clxv</a>
-<tt>utf16-&gt;string</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_196">3lxvii</a>
-<tt>utf32-&gt;string</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_198">3lxviii</a>
-<tt>utf8-&gt;string</tt> <a href="r6rs-lib-Z-H-3.html#node_idx_194">3lxix</a></p>
-<p>
-</p>
-<p>
-variable transformer <a href="r6rs-lib-Z-H-13.html#node_idx_1118">13xxix</a>, 
-<a href="r6rs-lib-Z-H-13.html#node_idx_1122">13xxx</a>
-<tt>vector-sort</tt> <a href="r6rs-lib-Z-H-5.html#node_idx_248">5iii</a>
-<tt>vector-sort!</tt> <a href="r6rs-lib-Z-H-5.html#node_idx_250">5iv</a>
-<tt>&amp;violation</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_432">8lx</a>
-<tt>violation?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_436">8lxi</a></p>
-<p>
-</p>
-<p>
-<tt>&amp;warning</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_414">8lxii</a>
-<tt>warning?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_418">8lxiii</a>
-<tt>when</tt> <a href="r6rs-lib-Z-H-6.html#node_idx_254">6vi</a>
-<tt>&amp;who</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_452">8lxiv</a>
-<tt>who-condition?</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_456">8lxv</a>
-<tt>with-exception-handler</tt> <a href="r6rs-lib-Z-H-8.html#node_idx_368">8lxvi</a>
-<tt>with-input-from-file</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_796">9clxvi</a>
-<tt>with-output-to-file</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_798">9clxvii</a>
-<tt>with-syntax</tt> <a href="r6rs-lib-Z-H-13.html#node_idx_1152">13xxxi</a>
-wrap <a href="r6rs-lib-Z-H-13.html#node_idx_1106">13xxxii</a>
-wrapped syntax object <a href="r6rs-lib-Z-H-13.html#node_idx_1108">13xxxiii</a>
-<tt>write</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_832">9clxviii</a>, <a href="r6rs-lib-Z-H-9.html#node_idx_834">9clxix</a>
-<tt>write-char</tt> <a href="r6rs-lib-Z-H-9.html#node_idx_820">9clxx</a>, 
-<a href="r6rs-lib-Z-H-9.html#node_idx_822">9clxxi</a></p>
-<p>
-</p>
-
-<p>
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-20.html">previous</a></span><span class=disable>, next</span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span class=disable><span>; &nbsp;&nbsp;</span>index</span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-3.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-3.html
deleted file mode 100644
index 5c7adc06c2..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-3.html
+++ /dev/null
@@ -1,773 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-2.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-4.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_2"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_2">Chapter 2</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_2">Bytevectors</a></h1>
-<p></p>
-<p>
-Many applications deal with blocks of binary data by accessing
-them in various ways&#8212;extracting signed or unsigned numbers of
-various sizes.  Therefore, the <tt>(rnrs bytevectors (6))</tt><a name="node_idx_62"></a>library
-provides a single type for
-blocks of binary data with multiple ways to access that data. It deals
-with integers and floating-point representations 
-in various sizes with specified endianness.</p>
-<p>
-Bytevectors<a name="node_idx_64"></a>are objects of a disjoint
-type. Conceptually, a bytevector represents a sequence of 8-bit
-bytes.  The description of bytevectors uses the term <a name="node_idx_66"></a><em>byte</em>
-for an exact integer object in the interval { <tt>-</tt> 128, <tt>...</tt>, 127} and the
-term <a name="node_idx_68"></a><em>octet</em> for an exact integer object in the interval {0,
-<tt>...</tt>, 255}.  A byte corresponds to its two&#8217;s complement
-representation as an octet.</p>
-<p>
-The length of a bytevector is the number of bytes it contains. This
-number is fixed. A valid index into a bytevector is an exact,
-non-negative integer object less than the length of the bytevector.
-The first byte of a bytevector has index 0;
-the last byte has an index one less than the length of the bytevector.</p>
-<p>
-Generally, the access procedures come in different flavors according
-to the size of the represented integer and the endianness of the
-representation.  The procedures also distinguish signed and unsigned
-representations.
-The signed representations all use two&#8217;s complement.</p>
-<p>
-Like string literals, literals representing bytevectors do not need to
-be quoted:
-</p>
-
-<tt>#vu8(12&nbsp;23&nbsp;123)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;#vu8(12&nbsp;23&nbsp;123)<p></tt></p>
-<p>
-</p>
-<a name="node_sec_2.1"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_2.1">2.1&nbsp;&nbsp;Endianness</a></h2>
-<p>Many operations described in this chapter accept an
-<a name="node_idx_70"></a><em>endianness</em> argument.  Endianness describes the encoding of
-exact integer objects as several contiguous bytes in a bytevector&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_4">4</a>]. 
-For this purpose, the binary representation of the integer object is split into
-consecutive bytes.  <a name="node_idx_72"></a>The little-endian
-encoding places the least significant byte of an integer first, with
-the other bytes following in increasing order of significance.
-<a name="node_idx_74"></a>The big-endian encoding places the most
-significant byte of an integer first, with the other bytes following
-in decreasing order of significance. </p>
-<p>
-This terminology also applies to IEEE-754 numbers: IEEE&nbsp;754 describes
-how to represent a floating-point number as an exact integer object, and
-endianness describes how the bytes of such an integer are laid out in
-a bytevector.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Little- and big-endianness are only the most common kinds of
-endianness.  Some architectures distinguish between the endianness
-at different levels of a binary representation.
-</blockquote><p>
-</p>
-<a name="node_sec_2.2"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_2.2">2.2&nbsp;&nbsp;General operations</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_76"></a>endianness<i> &lt;endianness symbol&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-The name of &lt;endianness symbol&gt; must be a symbol describing an
-endianness.  An implementation must support at least the symbols
-<tt>big</tt> and <tt>little</tt>, but may support other endianness
-symbols.  <tt>(endianness &lt;endianness symbol&gt;)</tt> evaluates to
-the symbol named &lt;endianness symbol&gt;.  Whenever one of the
-procedures operating on bytevectors accepts an endianness as an
-argument, that argument must be one of these symbols.  It is a syntax
-violation for &lt;endianness symbol&gt; to be anything other than an
-endianness symbol supported by the implementation.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Implementors should use widely accepted designations
-for endianness symbols other than <tt>big</tt> and <tt>little</tt>.
-</blockquote><p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Only the name of &lt;endianness symbol&gt; is significant.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_78"></a>native-endianness<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the endianness symbol associated implementation&#8217;s preferred
-endianness (usually that of the underlying machine architecture).
-This may be any &lt;endianness symbol&gt;, including a symbol other
-than <tt>big</tt> and <tt>little</tt>.
-</p>
-<p>   </p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_80"></a>bytevector?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a bytevector,
-otherwise returns <tt>#f</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_82"></a>make-bytevector<i> k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_84"></a>make-bytevector<i> k fill</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated bytevector of <i>k</i> bytes.</p>
-<p>
-If the <i>fill</i> argument is missing, the initial contents of the
-returned bytevector are unspecified.</p>
-<p>
-If the <i>fill</i> argument is present, it must be an exact integer
-object in
-the interval { <tt>-</tt> 128, <tt>...</tt> 255} that specifies the initial value
-for the bytes of the bytevector: If <i>fill</i> is positive, it is
-interpreted as an octet; if it is negative, it is interpreted as a byte.
-</p>
-<p>   </p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_86"></a>bytevector-length<i> bytevector</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns, as an exact integer object, the number of bytes in <i>bytevector</i>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_88"></a>bytevector=?<i> <i>bytevector<sub>1</sub></i> <i>bytevector<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>bytevector<sub>1</sub></i> and <i>bytevector<sub>2</sub></i> are equal&#8212;that
-is, if they have the same length and equal bytes at all valid indices.
-It returns <tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_90"></a>bytevector-fill!<i> bytevector fill</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;</div>
-
-The <i>fill</i> argument is as in the description of the <tt>make-bytevector</tt> procedure.
-The <tt>bytevector-fill!</tt> procedure stores <i>fill</i> in every element of <i>bytevector</i>
-and returns unspecified values.  Analogous to <tt>vector-fill!</tt>.
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(bytevector-copy! <i>source</i> <i>source-start</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<a name="node_idx_92"></a><tt><br>
-
-<i>target</i>&nbsp;<i>target-start</i>&nbsp;<i>k</i>)</tt><p>
-<i>Source</i> and <i>target</i> must be bytevectors.
-<i>Source-start</i>, <i>target-start</i>,
-and <i>k</i> must be non-negative exact integer objects that satisfy</p>
-<p>
-</p>
-<div align=left><img src="r6rs-lib-Z-G-1.gif" border="0" alt="[r6rs-lib-Z-G-1.gif]"></div><p>
-where <em>l</em><sub><i>source</i></sub> is the length of <i>source</i> and
-<em>l</em><sub><i>target</i></sub> is the length of <i>target</i>.</p>
-<p>
-The <tt>bytevector-copy!</tt> procedure copies the bytes from <i>source</i> at indices 
-</p>
-<div align=left><img src="r6rs-lib-Z-G-2.gif" border="0" alt="[r6rs-lib-Z-G-2.gif]"></div><p>
-to consecutive indices in <i>target</i> starting at <i>target-index</i>.</p>
-<p>
-This must work even if the memory regions for the source and the target
-overlap, i.e., the bytes at the target location after the copy must be
-equal to the bytes at the source location before the copy.</p>
-<p>
-This returns unspecified values.
-</p>
-
-<tt>(let&nbsp;((b&nbsp;(u8-list-&gt;bytevector&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5&nbsp;6&nbsp;7&nbsp;8))))<br>
-&nbsp;&nbsp;(bytevector-copy!&nbsp;b&nbsp;0&nbsp;b&nbsp;3&nbsp;4)<br>
-&nbsp;&nbsp;(bytevector-&gt;u8-list&nbsp;b))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;2&nbsp;3&nbsp;1&nbsp;2&nbsp;3&nbsp;4&nbsp;8)<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_94"></a>bytevector-copy<i> bytevector</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated copy of <i>bytevector</i>.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_2.3"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_2.3">2.3&nbsp;&nbsp;Operations on bytes and octets</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_96"></a>bytevector-u8-ref<i> bytevector k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_98"></a>bytevector-s8-ref<i> bytevector k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i> must be a valid index of <i>bytevector</i>.</p>
-<p>
-The <tt>bytevector-u8-ref</tt> procedure returns the byte at index <i>k</i> of <i>bytevector</i>,
-as an octet.</p>
-<p>
-The <tt>bytevector-s8-ref</tt> procedure returns the byte at index <i>k</i> of <i>bytevector</i>,
-as a (signed) byte.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((b1&nbsp;(make-bytevector&nbsp;16&nbsp;-127))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(b2&nbsp;(make-bytevector&nbsp;16&nbsp;255)))<br>
-&nbsp;&nbsp;(list<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(bytevector-s8-ref&nbsp;b1&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(bytevector-u8-ref&nbsp;b1&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(bytevector-s8-ref&nbsp;b2&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(bytevector-u8-ref&nbsp;b2&nbsp;0)))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(-127&nbsp;129&nbsp;-1&nbsp;255)<p></tt>
-</p>
-<p>   </p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_100"></a>bytevector-u8-set!<i> bytevector k octet</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_102"></a>bytevector-s8-set!<i> bytevector k byte</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i> must be a valid index of <i>bytevector</i>.</p>
-<p>
-The <tt>bytevector-u8-set!</tt> procedure stores <i>octet</i> in element <i>k</i> of
-<i>bytevector</i>.</p>
-<p>
-The <tt>bytevector-s8-set!</tt> procedure stores the two&#8217;s-complement representation of
-<i>byte</i> in element <i>k</i> of <i>bytevector</i>.</p>
-<p>
-Both procedures return unspecified values.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((b&nbsp;(make-bytevector&nbsp;16&nbsp;-127)))<br>
-<br>
-&nbsp;&nbsp;(bytevector-s8-set!&nbsp;b&nbsp;0&nbsp;-126)<br>
-&nbsp;&nbsp;(bytevector-u8-set!&nbsp;b&nbsp;1&nbsp;246)<br>
-<br>
-&nbsp;&nbsp;(list<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(bytevector-s8-ref&nbsp;b&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(bytevector-u8-ref&nbsp;b&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(bytevector-s8-ref&nbsp;b&nbsp;1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(bytevector-u8-ref&nbsp;b&nbsp;1)))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(-126&nbsp;130&nbsp;-10&nbsp;246)<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_104"></a>bytevector-&gt;u8-list<i> bytevector</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_106"></a>u8-list-&gt;bytevector<i> list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>List</i> must be a list of octets.</p>
-<p>
-The <tt>bytevector-&gt;u8-list</tt> procedure returns a newly allocated list of the octets of
-<i>bytevector</i> in the same order.</p>
-<p>
-The <tt>u8-list-&gt;bytevector</tt> procedure returns a newly allocated bytevector whose
-elements are the elements of list <i>list</i>, in
-the same order.  It is analogous to <tt>list-&gt;vector</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_2.4"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_2.4">2.4&nbsp;&nbsp;Operations on integers of arbitrary size</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_108"></a>bytevector-uint-ref<i> bytevector k endianness size</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_110"></a>bytevector-sint-ref<i> bytevector k endianness size</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_112"></a>bytevector-uint-set!<i> bytevector k n endianness size</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_114"></a>bytevector-sint-set!<i> bytevector k n endianness size</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Size</i> must be a positive exact integer object. <i>K</i>, <tt>...</tt>,
-<i>k</i>  +  <i>size</i>  <tt>-</tt>  1 must be valid indices of <i>bytevector</i>.</p>
-<p>
-The <tt>bytevector-uint-ref</tt> procedure retrieves the exact integer object corresponding to the
-unsigned representation of size <i>size</i> and specified by <i>endianness</i>
-at indices <i>k</i>, <tt>...</tt>, <i>k</i>  +  <i>size</i>  <tt>-</tt>  1.</p>
-<p>
-The <tt>bytevector-sint-ref</tt> procedure retrieves the exact integer object corresponding to the two&#8217;s-complement representation of size <i>size</i> and specified by <i>endianness</i> at
-indices <i>k</i>, <tt>...</tt>, <i>k</i>  +  <i>size</i>  <tt>-</tt>  1.</p>
-<p>
-For <tt>bytevector-uint-set!</tt>, <i>n</i> must be an exact
-integer object in the interval {0, <tt>...</tt>, 256<sup>mathit<em>s</em><em>i</em><em>z</em><em>e</em></sup> <tt>-</tt> 1}.</p>
-<p>
-The <tt>bytevector-uint-set!</tt> procedure stores the unsigned representation of size <i>size</i>
-and specified by <i>endianness</i> into <i>bytevector</i> at indices
-<i>k</i>, <tt>...</tt>, <i>k</i>  +  <i>size</i>  <tt>-</tt>  1.</p>
-<p>
-For <tt>bytevector-sint-set!</tt>, <i>n</i> must be an exact
-integer object in
-the interval { <tt>-</tt> 256<sup>mathit<em>s</em><em>i</em><em>z</em><em>e</em></sup>/2, <tt>...</tt>,
-256<sup>mathit<em>s</em><em>i</em><em>z</em><em>e</em></sup>/2 <tt>-</tt> 1}.
-<tt>bytevector-sint-set!</tt> stores the two&#8217;s-complement
-representation of size <i>size</i> and specified by <i>endianness</i>
-into <i>bytevector</i> at indices <i>k</i>, <tt>...</tt>, <i>k</i>  +  <i>size</i>  <tt>-</tt>  1.</p>
-<p>
-The <tt>...</tt><tt>-set!</tt> procedures return unspecified values.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;b&nbsp;(make-bytevector&nbsp;16&nbsp;-127))<br>
-<br>
-(bytevector-uint-set!&nbsp;b&nbsp;0&nbsp;(-&nbsp;(expt&nbsp;2&nbsp;128)&nbsp;3)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(endianness&nbsp;little)&nbsp;16)<br>
-<br>
-(bytevector-uint-ref&nbsp;b&nbsp;0&nbsp;(endianness&nbsp;little)&nbsp;16)<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;#xfffffffffffffffffffffffffffffffd<br>
-<br>
-(bytevector-sint-ref&nbsp;b&nbsp;0&nbsp;(endianness&nbsp;little)&nbsp;16)<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-3<br>
-<br>
-(bytevector-&gt;u8-list&nbsp;b)<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(253&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255)<br>
-<br>
-(bytevector-uint-set!&nbsp;b&nbsp;0&nbsp;(-&nbsp;(expt&nbsp;2&nbsp;128)&nbsp;3)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(endianness&nbsp;big)&nbsp;16)<br>
-(bytevector-uint-ref&nbsp;b&nbsp;0&nbsp;(endianness&nbsp;big)&nbsp;16)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;#xfffffffffffffffffffffffffffffffd<br>
-<br>
-(bytevector-sint-ref&nbsp;b&nbsp;0&nbsp;(endianness&nbsp;big)&nbsp;16)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-3<br>
-<br>
-(bytevector-&gt;u8-list&nbsp;b)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;253))<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_116"></a>bytevector-&gt;uint-list<i> bytevector endianness size</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_118"></a>bytevector-&gt;sint-list<i> bytevector endianness size</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_120"></a>uint-list-&gt;bytevector<i> list endianness size</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_122"></a>sint-list-&gt;bytevector<i> list endianness size</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Size</i> must be a positive exact integer object.  For <tt>uint-list-&gt;bytevector</tt>, <i>list</i> must be a list of exact
-integer objects in the interval {0, <tt>...</tt>, 256<sup>mathit<em>s</em><em>i</em><em>z</em><em>e</em></sup> <tt>-</tt> 1}.  For
-<tt>sint-list-&gt;bytevector</tt>, <i>list</i> must be a list of exact
-integer objects in the interval { <tt>-</tt> 256<sup>mathit<em>s</em><em>i</em><em>z</em><em>e</em></sup>/2, <tt>...</tt>,
-256<sup>mathit<em>s</em><em>i</em><em>z</em><em>e</em></sup>/2 <tt>-</tt> 1}.  The length of <i>bytevector</i> or,
-respectively, of <i>list</i> must be divisible by <i>size</i>.</p>
-<p>
-These procedures convert between lists of integer objects and their consecutive
-representations according to <i>size</i> and <i>endianness</i> in the
-<i>bytevector</i> objects in the same way as <tt>bytevector-&gt;u8-list</tt> and <tt>u8-list-&gt;bytevector</tt> do for one-byte representations.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((b&nbsp;(u8-list-&gt;bytevector&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;255&nbsp;1&nbsp;2&nbsp;1&nbsp;2))))<br>
-&nbsp;&nbsp;(bytevector-&gt;sint-list&nbsp;b&nbsp;(endianness&nbsp;little)&nbsp;2))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(513&nbsp;-253&nbsp;513&nbsp;513)<br>
-<br>
-(let&nbsp;((b&nbsp;(u8-list-&gt;bytevector&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;255&nbsp;1&nbsp;2&nbsp;1&nbsp;2))))<br>
-&nbsp;&nbsp;(bytevector-&gt;uint-list&nbsp;b&nbsp;(endianness&nbsp;little)&nbsp;2))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(513&nbsp;65283&nbsp;513&nbsp;513)<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_2.5"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_2.5">2.5&nbsp;&nbsp;Operations on 16-bit integers</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_124"></a>bytevector-u16-ref<i> bytevector k endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_126"></a>bytevector-s16-ref<i> bytevector k endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_128"></a>bytevector-u16-native-ref<i> bytevector k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_130"></a>bytevector-s16-native-ref<i> bytevector k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_132"></a>bytevector-u16-set!<i> bytevector k n endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_134"></a>bytevector-s16-set!<i> bytevector k n endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_136"></a>bytevector-u16-native-set!<i> bytevector k n</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_138"></a>bytevector-s16-native-set!<i> bytevector k n</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i> must be a valid index of <i>bytevector</i>; so must
-<i>k</i>  +  1. For <tt>bytevector-u16-set!</tt> and <tt>bytevector-u16-native-set!</tt>, <i>n</i> must be an exact integer object in
-the interval {0, <tt>...</tt>, 2<sup>16</sup> <tt>-</tt> 1}.  For <tt>bytevector-s16-set!</tt>
-and <tt>bytevector-s16-native-set!</tt>, <i>n</i> must be an exact
-integer object in the interval { <tt>-</tt> 2<sup>15</sup>, <tt>...</tt>, 2<sup>15</sup> <tt>-</tt> 1}.</p>
-<p>
-These retrieve and set two-byte representations of numbers at indices
-<i>k</i> and <i>k</i> + 1, according to the endianness specified by
-<i>endianness</i>. The procedures with <tt>u16</tt> in their names deal with the
-unsigned representation; those with <tt>s16</tt> in their names deal
-with the two&#8217;s-complement representation.</p>
-<p>
-The procedures with <tt>native</tt> in their names employ the native
-endianness, and work only at aligned indices:
-<i>k</i> must be a multiple of 2.</p>
-<p>
-The <tt>...</tt><tt>-set!</tt> procedures return unspecified values.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;b<br>
-&nbsp;&nbsp;(u8-list-&gt;bytevector<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;253)))<br>
-<br>
-(bytevector-u16-ref&nbsp;b&nbsp;14&nbsp;(endianness&nbsp;little))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65023<br>
-(bytevector-s16-ref&nbsp;b&nbsp;14&nbsp;(endianness&nbsp;little))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-513<br>
-(bytevector-u16-ref&nbsp;b&nbsp;14&nbsp;(endianness&nbsp;big))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65533<br>
-(bytevector-s16-ref&nbsp;b&nbsp;14&nbsp;(endianness&nbsp;big))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-3<br>
-<br>
-(bytevector-u16-set!&nbsp;b&nbsp;0&nbsp;12345&nbsp;(endianness&nbsp;little))<br>
-(bytevector-u16-ref&nbsp;b&nbsp;0&nbsp;(endianness&nbsp;little))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;12345<br>
-<br>
-(bytevector-u16-native-set!&nbsp;b&nbsp;0&nbsp;12345)<br>
-(bytevector-u16-native-ref&nbsp;b&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;12345<br>
-<br>
-(bytevector-u16-ref&nbsp;b&nbsp;0&nbsp;(endianness&nbsp;little))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>unspecified</i><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_2.6"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_2.6">2.6&nbsp;&nbsp;Operations on 32-bit integers</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_140"></a>bytevector-u32-ref<i> bytevector k endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_142"></a>bytevector-s32-ref<i> bytevector k endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_144"></a>bytevector-u32-native-ref<i> bytevector k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_146"></a>bytevector-s32-native-ref<i> bytevector k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_148"></a>bytevector-u32-set!<i> bytevector k n endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_150"></a>bytevector-s32-set!<i> bytevector k n endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_152"></a>bytevector-u32-native-set!<i> bytevector k n</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_154"></a>bytevector-s32-native-set!<i> bytevector k n</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i>, <tt>...</tt>, <i>k</i> +  3 must be valid indices of
-<i>bytevector</i>.
-For <tt>bytevector-u32-set!</tt> and <tt>bytevector-u32-native-set!</tt>, <i>n</i> must be an exact integer
-object in
-the interval {0, <tt>...</tt>, 2<sup>32</sup> <tt>-</tt> 1}.  For <tt>bytevector-s32-set!</tt>
-and <tt>bytevector-s32-native-set!</tt>, <i>n</i> must be an exact
-integer object in the interval { <tt>-</tt> 2<sup>31</sup>, <tt>...</tt>, 2<sup>32</sup> <tt>-</tt> 1}.</p>
-<p>
-These retrieve and set four-byte representations of numbers at indices <i>k</i>,
-<tt>...</tt>, <i>k</i> +  3, according to the endianness specified by <i>endianness</i>. The
-procedures with <tt>u32</tt> in their names deal with the unsigned representation;
-those with <tt>s32</tt> with the two&#8217;s-complement representation.</p>
-<p>
-The procedures with <tt>native</tt> in their names employ the native endianness, and
-work only at aligned indices: <i>k</i> must be a multiple of 4.</p>
-<p>
-The <tt>...</tt><tt>-set!</tt> procedures return unspecified values.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;b<br>
-&nbsp;&nbsp;(u8-list-&gt;bytevector<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;253)))<br>
-<br>
-(bytevector-u32-ref&nbsp;b&nbsp;12&nbsp;(endianness&nbsp;little))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;4261412863<br>
-(bytevector-s32-ref&nbsp;b&nbsp;12&nbsp;(endianness&nbsp;little))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-33554433<br>
-(bytevector-u32-ref&nbsp;b&nbsp;12&nbsp;(endianness&nbsp;big))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;4294967293<br>
-(bytevector-s32-ref&nbsp;b&nbsp;12&nbsp;(endianness&nbsp;big))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-3<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_2.7"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_2.7">2.7&nbsp;&nbsp;Operations on 64-bit integers</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_156"></a>bytevector-u64-ref<i> bytevector k endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_158"></a>bytevector-s64-ref<i> bytevector k endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_160"></a>bytevector-u64-native-ref<i> bytevector k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_162"></a>bytevector-s64-native-ref<i> bytevector k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_164"></a>bytevector-u64-set!<i> bytevector k n endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_166"></a>bytevector-s64-set!<i> bytevector k n endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_168"></a>bytevector-u64-native-set!<i> bytevector k n</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_170"></a>bytevector-s64-native-set!<i> bytevector k n</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i>, <tt>...</tt>, <i>k</i> +  7 must be valid indices of
-<i>bytevector</i>.
-For <tt>bytevector-u64-set!</tt> and <tt>bytevector-u64-native-set!</tt>, <i>n</i> must be an exact integer
-object in
-the interval {0, <tt>...</tt>, 2<sup>64</sup> <tt>-</tt> 1}.  For <tt>bytevector-s64-set!</tt>
-and <tt>bytevector-s64-native-set!</tt>, <i>n</i> must be an exact
-integer object in the interval { <tt>-</tt> 2<sup>63</sup>, <tt>...</tt>, 2<sup>64</sup> <tt>-</tt> 1}.</p>
-<p>
-These retrieve and set eight-byte representations of numbers at
-indices <i>k</i>, <tt>...</tt>, <i>k</i> +  7, according to the endianness
-specified by <i>endianness</i>. The procedures with <tt>u64</tt> in their names deal
-with the unsigned representation; those with <tt>s64</tt> with the
-two&#8217;s-complement representation.</p>
-<p>
-The procedures with <tt>native</tt> in their names employ the native endianness, and
-work only at aligned indices: <i>k</i> must be a multiple of 8.</p>
-<p>
-The <tt>...</tt><tt>-set!</tt> procedures return unspecified values.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;b<br>
-&nbsp;&nbsp;(u8-list-&gt;bytevector<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;255&nbsp;253)))<br>
-<br>
-(bytevector-u64-ref&nbsp;b&nbsp;8&nbsp;(endianness&nbsp;little))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;18302628885633695743<br>
-(bytevector-s64-ref&nbsp;b&nbsp;8&nbsp;(endianness&nbsp;little))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-144115188075855873<br>
-(bytevector-u64-ref&nbsp;b&nbsp;8&nbsp;(endianness&nbsp;big))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;18446744073709551613<br>
-(bytevector-s64-ref&nbsp;b&nbsp;8&nbsp;(endianness&nbsp;big))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-3<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_2.8"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_2.8">2.8&nbsp;&nbsp;Operations on IEEE-754 representations</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_172"></a>bytevector-ieee-single-native-ref<i> bytevector k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_174"></a>bytevector-ieee-single-ref<i> bytevector k endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i>, <tt>...</tt>, <i>k</i> + 3 must be valid indices of
-<i>bytevector</i>.  For <tt>bytevector-ieee-single-native-ref</tt>, <i>k</i> must
-be a multiple of 4.</p>
-<p>
-These procedures return the inexact real number object that best
-represents the IEEE-754 single-precision number represented by the
-four bytes beginning at index
-<i>k</i>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_176"></a>bytevector-ieee-double-native-ref<i> bytevector k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_178"></a>bytevector-ieee-double-ref<i> bytevector k endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i>, <tt>...</tt>, <i>k</i> + 7 must be valid indices of
-<i>bytevector</i>.  For <tt>bytevector-ieee-double-native-ref</tt>, <i>k</i> must
-be a multiple of 8.</p>
-<p>
-These procedures return the inexact real number object that best
-represents the IEEE-754 double-precision number represented by the
-eight bytes beginning at index <i>k</i>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_180"></a>bytevector-ieee-single-native-set!<i> bytevector k x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(bytevector-ieee-single-set! <i>bytevector</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<tt><br>
-
-<i>k</i>&nbsp;<i>x</i>&nbsp;<i>endianness</i>)</tt><p>
-<i>K</i>, <tt>...</tt>, <i>k</i> + 3 must be valid indices of
-<i>bytevector</i>.  For <tt>bytevector-ieee-single-native-set!</tt>, <i>k</i> must
-be a multiple of 4.</p>
-<p>
-These procedures store an IEEE-754 single-precision representation of <i>x</i> into
-elements <i>k</i> through <i>k</i> + 3 of <i>bytevector</i>, and return
-unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_182"></a>bytevector-ieee-double-native-set!<i> bytevector k x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(bytevector-ieee-double-set! <i>bytevector</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<tt><br>
-
-<i>k</i>&nbsp;<i>x</i>&nbsp;<i>endianness</i>)</tt><p>
-<i>K</i>, <tt>...</tt>, <i>k</i> + 7 must be valid indices of
-<i>bytevector</i>.  For <tt>bytevector-ieee-double-native-set!</tt>, <i>k</i> must
-be a multiple of 8.</p>
-<p>
-These procedures store an IEEE-754 double-precision representation of <i>x</i> into
-elements <i>k</i> through <i>k</i> + 7 of <i>bytevector</i>, and return
-unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_2.9"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_2.9">2.9&nbsp;&nbsp;Operations on strings</a></h2>
-<p>This section describes procedures that convert between strings and
-bytevectors containing Unicode encodings of those strings.  When
-decoding bytevectors, encoding errors are handled as with the <tt>replace</tt> semantics of textual I/O (see
-section&nbsp;<a href="r6rs-lib-Z-H-9.html#node_sec_8.2.4">8.2.4</a>): If an invalid or incomplete
-character encoding is encountered, then the replacement character
-U+FFFD is appended to the string being generated, an appropriate
-number of bytes are ignored, and decoding continues with the following
-bytes.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_184"></a>string-&gt;utf8<i> string</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated (unless empty) bytevector that
-contains the UTF-8 encoding of the given string.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_186"></a>string-&gt;utf16<i> string</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_188"></a>string-&gt;utf16<i> string endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-If <i>endianness</i> is specified, it must be the symbol <tt>big</tt> or the symbol <tt>little</tt>.  The <tt>string-&gt;utf16</tt>
-procedure returns a newly allocated (unless empty) bytevector that
-contains the UTF-16BE or UTF-16LE encoding of the given string (with
-no byte-order mark).  If endianness is not specified or is <tt>big</tt>,
-then UTF-16BE is used.  If endianness is <tt>little</tt>, then UTF-16LE
-is used.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_190"></a>string-&gt;utf32<i> string</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_192"></a>string-&gt;utf32<i> string endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-If <i>endianness</i> is specified, it must be the symbol <tt>big</tt> or the symbol <tt>little</tt>.  The <tt>string-&gt;utf32</tt>
-procedure returns
-a newly allocated (unless empty) bytevector that contains the UTF-32BE
-or UTF-32LE encoding of the given string (with no byte mark).  If
-endianness is not specified or is <tt>big</tt>, then UTF-32BE is used.
-If endianness is <tt>little</tt>, then UTF-32LE is used.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_194"></a>utf8-&gt;string<i> bytevector</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated (unless empty) string whose character
-sequence is encoded by the given bytevector.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_196"></a>utf16-&gt;string<i> bytevector endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(utf16-&gt;string <i>bytevector</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<tt><br>
-
-<i>endianness</i>&nbsp;<i>endianness-mandatory</i>)</tt><p>
-<i>Endianness</i> must be the symbol <tt>big</tt> or
-the symbol <tt>little</tt>. The <tt>utf16-&gt;string</tt> procedure returns
-a newly allocated (unless empty) string whose character sequence is
-encoded by the given bytevector.  <i>Bytevector</i> is decoded
-according to UTF-16BE or UTF-16LE: If <i>endianness-mandatory?</i> is
-absent or <tt>#f</tt>, <tt>utf16-&gt;string</tt> determines the endianness
-according to a UTF-16 BOM at the beginning of <i>bytevector</i> if a
-BOM is present; in this case, the BOM is not decoded as a character.
-Also in this case, if no UTF-16 BOM is present, <i>endianness</i>
-specifies the endianness of the encoding.  If
-<i>endianness-mandatory?</i> is a true value, <i>endianness</i>
-specifies the endianness of the encoding, and any UTF-16 BOM in the
-encoding is decoded as a regular character.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-A UTF-16 BOM is either a sequence of bytes <tt>#</tt>xFE,
-<tt>#</tt>xFF specifying <tt>big</tt> and UTF-16BE, or <tt>#</tt>xFF,
-<tt>#</tt>xFE specifying <tt>little</tt> and UTF-16LE.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_198"></a>utf32-&gt;string<i> bytevector endianness</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(utf32-&gt;string <i>bytevector</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<tt><br>
-
-<i>endianness</i>&nbsp;<i>endianness-mandatory</i>)</tt><p>
-<i>Endianness</i> must be the symbol <tt>big</tt> or
-the symbol <tt>little</tt>. The <tt>utf32-&gt;string</tt> procedure returns
-a newly allocated (unless empty) string whose character sequence is
-encoded by the given bytevector.  <i>Bytevector</i> is decoded
-according to UTF-32BE or UTF-32LE: If <i>endianness-mandatory?</i> is
-absent or <tt>#f</tt>, <tt>utf32-&gt;string</tt> determines the endianness
-according to a UTF-32 BOM at the beginning of <i>bytevector</i> if a
-BOM is present; in this case, the BOM is not decoded as a character.
-Also in this case, if no UTF-32 BOM is present, <i>endianness</i>
-specifies the endianness of the encoding.  If
-<i>endianness-mandatory?</i> is a true value, <i>endianness</i>
-specifies the endianness of the encoding, and any UTF-32 BOM in the
-encoding is decoded as a regular character.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-A UTF-32 BOM is either a sequence of bytes <tt>#</tt>x00,
-<tt>#</tt>x00, <tt>#</tt>xFE, <tt>#</tt>xFF specifying <tt>big</tt> and UTF-32BE, or <tt>#</tt>xFF, <tt>#</tt>xFE,
-<tt>#</tt>x00, <tt>#</tt>x00, specifying <tt>little</tt> and
-UTF-32LE.
-</blockquote>
-<p></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-2.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-4.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-4.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-4.html
deleted file mode 100644
index ae461098c3..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-4.html
+++ /dev/null
@@ -1,456 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-3.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-5.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_3"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_3">Chapter 3</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_3">List utilities</a></h1>
-<p></p>
-<p>
-This chapter describes the <tt>(rnrs lists (6))</tt><a name="node_idx_200"></a>library, which
-contains various useful procedures that operate on lists.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_202"></a>find<i> proc list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Proc</i> should accept one argument
-and return a single value.  <i>Proc</i> should not mutate <i>list</i>.
-The <tt>find</tt> procedure applies <i>proc</i> to the elements of
-<i>list</i> in order.  If <i>proc</i> returns a true value for an
-element, <tt>find</tt> immediately returns that element.  If <i>proc</i>
-returns <tt>#f</tt> for all elements of the list, <tt>find</tt> returns
-<tt>#f</tt>.  <i>Proc</i> is always called in the same dynamic environment
-as <tt>find</tt> itself.</p>
-<p>
-</p>
-
-<tt>(find&nbsp;even?&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;4<br>
-(find&nbsp;even?&nbsp;&#8217;(3&nbsp;1&nbsp;5&nbsp;1&nbsp;5&nbsp;9))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-<p></tt></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check that <i>list</i> is a chain of
-pairs up to the found element, or that it is indeed a list if no
-element is found.  It should not check that it is a chain of pairs
-beyond the found element.  The implementation must check the restrictions on
-<i>proc</i> to the extent performed by applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_204"></a>for-all<i> proc <i>list<sub>1</sub></i> <i>list<sub>2</sub></i> <tt>...</tt> <i>list<sub><em>n</em></sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_206"></a>exists<i> proc <i>list<sub>1</sub></i> <i>list<sub>2</sub></i> <tt>...</tt> <i>list<sub><em>n</em></sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <i>list</i>s should all have the same length, and
-<i>proc</i> should accept <em>n</em> arguments and
-return a single value.
-<i>Proc</i> should not mutate the <i>list</i> arguments.</p>
-<p>
-For natural numbers <em>i</em>  =  0, 1, <tt>...</tt>, the <tt>for-all</tt> procedure
-successively applies <i>proc</i> to arguments <em>x</em><sub><em>i</em></sub><sup>1</sup> <tt>...</tt> <em>x</em><sub><em>i</em></sub><sup><em>n</em></sup>,
-where <em>x</em><sub><em>i</em></sub><sup><em>j</em></sup> is the <em>i</em>th element of <i>list<sub><em>j</em></sub></i>, until <tt>#f</tt> is
-returned.  If <i>proc</i> returns true values for all but the last
-element of <i>list<sub>1</sub></i>, <tt>for-all</tt> performs a tail call of <i>proc</i>
-on the <em>k</em>th elements, where <em>k</em> is the length of <i>list<sub>1</sub></i>.  If <i>proc</i>
-returns <tt>#f</tt> on any set of elements, <tt>for-all</tt> returns
-<tt>#f</tt> after the first such application of <i>proc</i>.
-If the <i>list</i>s are all empty, <tt>for-all</tt> returns <tt>#t</tt>.</p>
-<p>
-For natural numbers <em>i</em>  =  0, 1, <tt>...</tt>, the <tt>exists</tt> procedure
-applies <i>proc</i> successively to arguments <em>x</em><sub><em>i</em></sub><sup>1</sup> <tt>...</tt> <em>x</em><sub><em>i</em></sub><sup><em>n</em></sup>,
-where <em>x</em><sub><em>i</em></sub><sup><em>j</em></sup> is the <em>i</em>th element of <i>list<sub><em>j</em></sub></i>, until a true value is
-returned.  If <i>proc</i> returns <tt>#f</tt> for all but the last
-elements of the <i>list</i>s, <tt>exists</tt> performs a tail call of
-<i>proc</i> on the <em>k</em>th elements, where <em>k</em> is the length of
-<i>list<sub>1</sub></i>.
-If <i>proc</i> returns a true value on any set of elements, <tt>exists</tt> returns that value after the first such application of
-<i>proc</i>.  If the <i>list</i>s
-are all empty, <tt>exists</tt> returns <tt>#f</tt>.</p>
-<p>
-<i>Proc</i> is always called in the same dynamic environment 
-as <tt>for-all</tt> or, respectively, <tt>exists</tt> itself.</p>
-<p>
-</p>
-
-<tt>(for-all&nbsp;even?&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(for-all&nbsp;even?&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9&nbsp;.&nbsp;2))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(for-all&nbsp;even?&nbsp;&#8217;(2&nbsp;4&nbsp;14))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(for-all&nbsp;even?&nbsp;&#8217;(2&nbsp;4&nbsp;14&nbsp;.&nbsp;9))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>&nbsp;<tt>&amp;assertion</tt></tt>&nbsp;<i>exception</i><br>
-(for-all&nbsp;(lambda&nbsp;(n)&nbsp;(and&nbsp;(even?&nbsp;n)&nbsp;n))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(2&nbsp;4&nbsp;14))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;14<br>
-(for-all&nbsp;&lt;&nbsp;&#8217;(1&nbsp;2&nbsp;3)&nbsp;&#8217;(2&nbsp;3&nbsp;4))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(for-all&nbsp;&lt;&nbsp;&#8217;(1&nbsp;2&nbsp;4)&nbsp;&#8217;(2&nbsp;3&nbsp;4))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-<br>
-(exists&nbsp;even?&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(exists&nbsp;even?&nbsp;&#8217;(3&nbsp;1&nbsp;1&nbsp;5&nbsp;9))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(exists&nbsp;even?&nbsp;&#8217;(3&nbsp;1&nbsp;1&nbsp;5&nbsp;9&nbsp;.&nbsp;2))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>&nbsp;<tt>&amp;assertion</tt></tt>&nbsp;<i>exception</i><br>
-(exists&nbsp;(lambda&nbsp;(n)&nbsp;(and&nbsp;(even?&nbsp;n)&nbsp;n))&nbsp;&#8217;(2&nbsp;1&nbsp;4&nbsp;14))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;2<br>
-(exists&nbsp;&lt;&nbsp;&#8217;(1&nbsp;2&nbsp;4)&nbsp;&#8217;(2&nbsp;3&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(exists&nbsp;&gt;&nbsp;&#8217;(1&nbsp;2&nbsp;3)&nbsp;&#8217;(2&nbsp;3&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-<p></tt></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check that the <i>list</i>s are
-chains of pairs to the extent necessary to determine the return value.
-If this requires traversing the lists entirely, the implementation
-should check that the <i>list</i>s all have the same length.  If not,
-it should not check that the <i>list</i>s are chains of pairs beyond
-the traversal.  The implementation must check the restrictions on
-<i>proc</i> to the extent performed by applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_208"></a>filter<i> proc list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_210"></a>partition<i> proc list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Proc</i> should accept one argument
-and return a single value. <i>Proc</i> should not mutate <i>list</i>.</p>
-<p>
-The <tt>filter</tt> procedure applies
-<i>proc</i> to each element of <i>list</i> and returns a list of
-the elements of <i>list</i> for which <i>proc</i> returned a true
-value.  The <tt>partition</tt> procedure also applies <i>proc</i> to
-each element of <i>list</i>, but returns two values, the first one a
-list of the elements of <i>list</i> for which <i>proc</i> returned a
-true value, and the second a list of the elements of <i>list</i> for
-which <i>proc</i> returned <tt>#f</tt>.
-In both cases, the elements of the result list(s) are in the same
-order as they appear in the input list.
-<i>Proc</i> is always called in the same dynamic environment 
-as <tt>filter</tt> or, respectively, <tt>partition</tt> itself.
-If multiple returns occur from <tt>filter</tt> or <tt>partitions</tt>, the return
-values returned by earlier returns are not mutated.</p>
-<p>
-</p>
-
-<tt>(filter&nbsp;even?&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9&nbsp;2&nbsp;6))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(4&nbsp;2&nbsp;6)<br>
-<br>
-(partition&nbsp;even?&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9&nbsp;2&nbsp;6))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(4&nbsp;2&nbsp;6)&nbsp;(3&nbsp;1&nbsp;1&nbsp;5&nbsp;9)&nbsp;;&nbsp;two&nbsp;values<br>
-<p></tt></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the restrictions on <i>proc</i>
-to the extent performed by applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_212"></a>fold-left<i> combine nil <i>list<sub>1</sub></i> <i>list<sub>2</sub></i> <tt>...</tt><i>list<sub><em>n</em></sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <i>list</i>s should all have the same
-length.  <i>Combine</i> must be a procedure.  It should accept one more
-argument than there are <i>list</i>s and return a single value.
-It should not mutate the <i>list</i> arguments.
-The <tt>fold-left</tt> procedure iterates the <i>combine</i> procedure over an
-accumulator value and the elements of the <i>list</i>s from left to
-right, starting with an accumulator value of <i>nil</i>.  More
-specifically, <tt>fold-left</tt> returns <i>nil</i> if the <i>list</i>s are
-empty.  If they are not empty, <i>combine</i> is first applied to
-<i>nil</i> and the respective first elements of the <i>list</i>s in
-order.  The result becomes the new accumulator value, and <i>combine</i>
-is applied to the new accumulator value and the respective next elements
-of the <i>list</i>.  This step is repeated until the end of the list is
-reached; then the accumulator value is returned.
-<i>Combine</i> is always called in the same dynamic environment 
-as <tt>fold-left</tt> itself.</p>
-<p>
-</p>
-
-<tt>(fold-left&nbsp;+&nbsp;0&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;15<br>
-<br>
-(fold-left&nbsp;(lambda&nbsp;(a&nbsp;e)&nbsp;(cons&nbsp;e&nbsp;a))&nbsp;&#8217;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(5&nbsp;4&nbsp;3&nbsp;2&nbsp;1)<br>
-<br>
-(fold-left&nbsp;(lambda&nbsp;(count&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(odd?&nbsp;x)&nbsp;(+&nbsp;count&nbsp;1)&nbsp;count))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9&nbsp;2&nbsp;6&nbsp;5&nbsp;3))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;7<br>
-<br>
-(fold-left&nbsp;(lambda&nbsp;(max-len&nbsp;s)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(max&nbsp;max-len&nbsp;(string-length&nbsp;s)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(&quot;longest&quot;&nbsp;&quot;long&quot;&nbsp;&quot;longer&quot;))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;7<br>
-<br>
-(fold-left&nbsp;cons&nbsp;&#8217;(q)&nbsp;&#8217;(a&nbsp;b&nbsp;c))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;((((q)&nbsp;.&nbsp;a)&nbsp;.&nbsp;b)&nbsp;.&nbsp;c)<br>
-<br>
-(fold-left&nbsp;+&nbsp;0&nbsp;&#8217;(1&nbsp;2&nbsp;3)&nbsp;&#8217;(4&nbsp;5&nbsp;6))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;21<br>
-<p></tt></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation should check that the <i>list</i>s all
-have the same length.  The implementation must check the restrictions
-on <i>combine</i> to the extent performed by applying it as described.
-An
-implementation may check whether <i>combine</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_214"></a>fold-right<i> combine nil <i>list<sub>1</sub></i> <i>list<sub>2</sub></i> <tt>...</tt><i>list<sub><em>n</em></sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <i>list</i>s should all have the same
-length.  <i>Combine</i> must be a procedure.  It should accept one more
-argument than there are <i>list</i>s and return a single value.
-<i>Combine</i> should not mutate the <i>list</i> arguments.
-The <tt>fold-right</tt> procedure iterates the <i>combine</i> procedure over
-the elements of the <i>list</i>s from right to left and an accumulator
-value, starting with an accumulator value of <i>nil</i>.  More
-specifically, <tt>fold-right</tt> returns <i>nil</i> if the <i>list</i>s
-are empty.  If they are not empty, <i>combine</i> is first applied to the
-respective last elements of the <i>list</i>s in order and <i>nil</i>.
-The result becomes the new accumulator value, and <i>combine</i> is
-applied to the respective previous elements of the <i>list</i>s and the
-new accumulator value.  This step is repeated until the beginning of the
-list is reached; then the accumulator value is returned.
-<i>Proc</i> is always called in the same dynamic environment 
-as <tt>fold-right</tt> itself.</p>
-<p>
-</p>
-
-<tt>(fold-right&nbsp;+&nbsp;0&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;15<br>
-<br>
-(fold-right&nbsp;cons&nbsp;&#8217;()&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5)<br>
-<br>
-(fold-right&nbsp;(lambda&nbsp;(x&nbsp;l)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(odd?&nbsp;x)&nbsp;(cons&nbsp;x&nbsp;l)&nbsp;l))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9&nbsp;2&nbsp;6&nbsp;5))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(3&nbsp;1&nbsp;1&nbsp;5&nbsp;9&nbsp;5)<br>
-<br>
-(fold-right&nbsp;cons&nbsp;&#8217;(q)&nbsp;&#8217;(a&nbsp;b&nbsp;c))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(a&nbsp;b&nbsp;c&nbsp;q)<br>
-<br>
-(fold-right&nbsp;+&nbsp;0&nbsp;&#8217;(1&nbsp;2&nbsp;3)&nbsp;&#8217;(4&nbsp;5&nbsp;6))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;21<br>
-<p></tt></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation should check that the <i>list</i>s all
-have the same length.  The implementation must check the restrictions
-on <i>combine</i> to the extent performed by applying it as described.
-An
-implementation may check whether <i>combine</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_216"></a>remp<i> proc list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_218"></a>remove<i> obj list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_220"></a>remv<i> obj list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_222"></a>remq<i> obj list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Proc</i> should accept one argument
-and return a single value.
-<i>Proc</i> should not mutate <i>list</i>.</p>
-<p>
-Each of these procedures returns a list of the elements of <i>list</i>
-that do not satisfy a given condition.  The <tt>remp</tt> procedure
-applies <i>proc</i> to each element of <i>list</i> and returns a
-list of the elements of <i>list</i> for which <i>proc</i> returned
-<tt>#f</tt>.  <i>Proc</i> is always called in the same dynamic environment 
-as <tt>remp</tt> itself.
-The <tt>remove</tt>, <tt>remv</tt>, and <tt>remq</tt> procedures return a list of
-the elements that are not <i>obj</i>.  The <tt>remq</tt> procedure uses <tt>eq?</tt> to
-compare <i>obj</i> with the elements of <i>list</i>, while <tt>remv</tt>
-uses <tt>eqv?</tt> and <tt>remove</tt> uses <tt>equal?</tt>.
-The elements of the result list are in the same
-order as they appear in the input list.
-If multiple returns occur from <tt>remp</tt>, the return
-values returned by earlier returns are not mutated.</p>
-<p>
-</p>
-
-<tt>(remp&nbsp;even?&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9&nbsp;2&nbsp;6&nbsp;5))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(3&nbsp;1&nbsp;1&nbsp;5&nbsp;9&nbsp;5)<br>
-<br>
-(remove&nbsp;1&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9&nbsp;2&nbsp;6&nbsp;5))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(3&nbsp;4&nbsp;5&nbsp;9&nbsp;2&nbsp;6&nbsp;5)<br>
-<br>
-(remv&nbsp;1&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9&nbsp;2&nbsp;6&nbsp;5))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(3&nbsp;4&nbsp;5&nbsp;9&nbsp;2&nbsp;6&nbsp;5)<br>
-<br>
-(remq&nbsp;&#8217;foo&nbsp;&#8217;(bar&nbsp;foo&nbsp;baz))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(bar&nbsp;baz)<br>
-<p></tt></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the restrictions on <i>proc</i>
-to the extent performed by applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_224"></a>memp<i> proc list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_226"></a>member<i> obj list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_228"></a>memv<i> obj list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_230"></a>memq<i> obj list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Proc</i> should accept one argument
-and return a single value.  <i>Proc</i> should not mutate <i>list</i>.</p>
-<p>
-These procedures return the first sublist of <i>list</i> whose car
-satisfies a given condition, where the sublists of <i>lists</i> are the
-lists returned by <tt>(list-tail <i>list</i> <i>k</i>)</tt> for
-<i>k</i> less than the length of <i>list</i>.  The <tt>memp</tt> procedure applies
-<i>proc</i> to the cars of the sublists of <i>list</i> until it
-finds one for which <i>proc</i> returns a true value.
-<i>Proc</i> is always called in the same dynamic environment 
-as <tt>memp</tt> itself.  The <tt>member</tt>, <tt>memv</tt>, and <tt>memq</tt> procedures look for the first occurrence of
-<i>obj</i>.  If <i>list</i> does not contain an element satisfying the
-condition, then <tt>#f</tt> (not the empty list) is returned.  The <tt>member</tt> procedure uses <tt>equal?</tt> to compare <i>obj</i> with the elements of
-<i>list</i>, while <tt>memv</tt> uses <tt>eqv?</tt> and <tt>memq</tt> uses
-<tt>eq?</tt>.</p>
-<p>
-</p>
-
-<tt>(memp&nbsp;even?&nbsp;&#8217;(3&nbsp;1&nbsp;4&nbsp;1&nbsp;5&nbsp;9&nbsp;2&nbsp;6&nbsp;5))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(4&nbsp;1&nbsp;5&nbsp;9&nbsp;2&nbsp;6&nbsp;5)<br>
-<br>
-(memq&nbsp;&#8217;a&nbsp;&#8217;(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a&nbsp;b&nbsp;c)<br>
-(memq&nbsp;&#8217;b&nbsp;&#8217;(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(b&nbsp;c)<br>
-(memq&nbsp;&#8217;a&nbsp;&#8217;(b&nbsp;c&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(memq&nbsp;(list&nbsp;&#8217;a)&nbsp;&#8217;(b&nbsp;(a)&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(member&nbsp;(list&nbsp;&#8217;a)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(b&nbsp;(a)&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;((a)&nbsp;c)<br>
-(memq&nbsp;101&nbsp;&#8217;(100&nbsp;101&nbsp;102))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(memv&nbsp;101&nbsp;&#8217;(100&nbsp;101&nbsp;102))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(101&nbsp;102)<p></tt> </p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check that <i>list</i> is a chain of
-pairs up to the found element, or that it is indeed a list if no
-element is found.  It should not check that it is a chain of pairs
-beyond the found element.  The implementation must check the restrictions on
-<i>proc</i> to the extent performed by applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_232"></a>assp<i> proc alist</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_234"></a>assoc<i> obj alist</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_236"></a>assv<i> obj alist</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_238"></a>assq<i> obj alist</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Alist</i> (for &#8220;association list&#8221;) should be a list of pairs.
-<i>Proc</i> should accept one argument
-and return a single value.  <i>Proc</i> should not mutate <i>alist</i>.</p>
-<p>
-These procedures find the first pair in <i>alist</i>
-whose car field satisfies a given condition, and returns that pair
-without traversing <i>alist</i> further.
-If no pair in <i>alist</i> satisfies the condition, then <tt>#f</tt>
-is returned.  The <tt>assp</tt> procedure successively applies
-<i>proc</i> to the car fields of <i>alist</i> and looks for a pair
-for which it returns a true value.
-<i>Proc</i> is always called in the same dynamic environment 
-as <tt>assp</tt> itself.  The <tt>assoc</tt>, <tt>assv</tt>, and <tt>assq</tt> procedures look for a pair that has <i>obj</i> as its car.  The
-<tt>assoc</tt> procedure uses 
-<tt>equal?</tt> to compare <i>obj</i> with the car fields of the pairs in
-<i>alist</i>, while <tt>assv</tt> uses <tt>eqv?</tt> and <tt>assq</tt> uses
-<tt>eq?</tt>.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check that <i>alist</i> is a chain of
-pairs containing pairs up to the found pair, or that it is indeed a
-list of pairs if no element is found.  It should not check that it is
-a chain of pairs beyond the found element.  The implementation must
-check the restrictions on <i>proc</i> to the extent performed by
-applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;d&nbsp;&#8217;((3&nbsp;a)&nbsp;(1&nbsp;b)&nbsp;(4&nbsp;c)))<br>
-<br>
-(assp&nbsp;even?&nbsp;d)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(4&nbsp;c)<br>
-(assp&nbsp;odd?&nbsp;d)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(3&nbsp;a)<br>
-<br>
-(define&nbsp;e&nbsp;&#8217;((a&nbsp;1)&nbsp;(b&nbsp;2)&nbsp;(c&nbsp;3)))<br>
-(assq&nbsp;&#8217;a&nbsp;e)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a&nbsp;1)<br>
-(assq&nbsp;&#8217;b&nbsp;e)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(b&nbsp;2)<br>
-(assq&nbsp;&#8217;d&nbsp;e)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(assq&nbsp;(list&nbsp;&#8217;a)&nbsp;&#8217;(((a))&nbsp;((b))&nbsp;((c))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(assoc&nbsp;(list&nbsp;&#8217;a)&nbsp;&#8217;(((a))&nbsp;((b))&nbsp;((c))))&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;((a))<br>
-(assq&nbsp;5&nbsp;&#8217;((2&nbsp;3)&nbsp;(5&nbsp;7)&nbsp;(11&nbsp;13)))&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(assv&nbsp;5&nbsp;&#8217;((2&nbsp;3)&nbsp;(5&nbsp;7)&nbsp;(11&nbsp;13)))&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(5&nbsp;7)<p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_240"></a>cons*<i> <i>obj<sub>1</sub></i> <tt>...</tt> <i>obj<sub><em>n</em></sub></i> <i>obj</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_242"></a>cons*<i> <i>obj</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-If called with at least two arguments, <tt>cons*</tt> returns a freshly
-allocated chain of pairs whose cars are <i>obj<sub>1</sub></i>, <tt>...</tt>,
-<i>obj<sub><em>n</em></sub></i>, and whose last cdr is <i>obj</i>.  If called with only one
-argument, <tt>cons*</tt> returns that argument.</p>
-<p>
-</p>
-
-<tt>(cons*&nbsp;1&nbsp;2&nbsp;&#8217;(3&nbsp;4&nbsp;5))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5)<br>
-(cons*&nbsp;1&nbsp;2&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;2&nbsp;.&nbsp;3)<br>
-(cons*&nbsp;1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1<p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p>
-    </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-3.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-5.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-5.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-5.html
deleted file mode 100644
index b2bef2fed0..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-5.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-4.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-6.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_4"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_4">Chapter 4</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_4">Sorting</a></h1>
-<p></p>
-<p>
-This chapter describes the <tt>(rnrs sorting (6))</tt><a name="node_idx_244"></a>library for
-sorting lists and vectors.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_246"></a>list-sort<i> proc list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_248"></a>vector-sort<i> proc vector</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Proc</i> should accept any two elements
-of <i>list</i> or <i>vector</i>, and should not have any side
-effects.  <i>Proc</i> should return a true value when its first argument
-is strictly less than its second, and <tt>#f</tt> otherwise.</p>
-<p>
-The <tt>list-sort</tt> and <tt>vector-sort</tt> procedures perform a stable
-sort of <i>list</i> or <i>vector</i> in ascending order according to
-<i>proc</i>, without changing <i>list</i> or
-<i>vector</i> in any way.  The <tt>list-sort</tt> procedure returns a
-list, and <tt>vector-sort</tt> returns a vector.  The results may be <tt>eq?</tt> to the argument when the argument is already sorted, and the
-result of <tt>list-sort</tt> may share structure with a tail of the
-original list.  The sorting algorithm performs <em>O</em>(<em>n</em> lg <em>n</em>) calls to
-<i>proc</i> where <em>n</em> is the length of <i>list</i> or <i>vector</i>,
-and all arguments passed to <i>proc</i> are elements of the list or
-vector being sorted, but the pairing of arguments and the sequencing
-of calls to <i>proc</i> are not specified.
-If multiple returns occur from <tt>list-sort</tt> or <tt>vector-sort</tt>, the return
-values returned by earlier returns are not mutated.</p>
-<p>
-</p>
-
-<tt>(list-sort&nbsp;&lt;&nbsp;&#8217;(3&nbsp;5&nbsp;2&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;2&nbsp;3&nbsp;5)<br>
-(vector-sort&nbsp;&lt;&nbsp;&#8217;<tt>#</tt>(3&nbsp;5&nbsp;2&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt>(1&nbsp;2&nbsp;3&nbsp;5)<p></tt></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the restrictions
-on <i>proc</i> to the extent performed by applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_250"></a>vector-sort!<i> proc vector</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Proc</i> should accept any two elements
-of the vector, and should not have any side
-effects.  <i>Proc</i> should return a true value when its first
-argument is strictly less than its second, and <tt>#f</tt> otherwise.
-The <tt>vector-sort!</tt> procedure destructively sorts <i>vector</i> in
-ascending order according to <i>proc</i>.  The sorting algorithm
-performs <em>O</em>(<em>n</em><sup>2</sup>) calls to <i>proc</i> where <em>n</em> is the length of
-<i>vector</i>, and all arguments passed to <i>proc</i> are elements
-of the vector being sorted, but the pairing of arguments and the
-sequencing of calls to <i>proc</i> are not specified.  The sorting
-algorithm may be unstable.  The procedure returns unspecified values.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;v&nbsp;(vector&nbsp;3&nbsp;5&nbsp;2&nbsp;1))<br>
-(vector-sort!&nbsp;v)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<em>unspecified</em><br>
-v&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt>(1&nbsp;2&nbsp;3&nbsp;5)<br>
-<p></tt>
-<em>Implementation responsibilities: </em>The implementation must check the restrictions
-on <i>proc</i> to the extent performed by applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-    </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-4.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-6.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-6.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-6.html
deleted file mode 100644
index 4c9cc9674d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-6.html
+++ /dev/null
@@ -1,273 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-5.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-7.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_5"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_5">Chapter 5</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_5">Control structures</a></h1>
-<p></p>
-<p>
-This chapter describes the <tt>(rnrs control (6))</tt><a name="node_idx_252"></a>library, which
-provides useful control structures.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_254"></a>when<i> &lt;test&gt; &lt;expression<sub>1</sub>&gt; &lt;expression<sub>2</sub>&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_256"></a>unless<i> &lt;test&gt; &lt;expression<sub>1</sub>&gt; &lt;expression<sub>2</sub>&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>&lt;Test&gt; must be an expression.</p>
-<p>
-<em>Semantics: </em>A <tt>when</tt> expression is evaluated by evaluating the
-&lt;test&gt; expression.  If &lt;test&gt; evaluates to a true value,
-the remaining &lt;expression&gt;s are evaluated in order, and the
-results of the last &lt;expression&gt; are returned as the
-results of the entire <tt>when</tt> expression.  Otherwise, the <tt>when</tt> expression returns unspecified values.  An <tt>unless</tt>
-expression is evaluated by evaluating the &lt;test&gt; expression.
-If &lt;test&gt; evaluates to <tt>#f</tt>, the remaining
-&lt;expression&gt;s are evaluated in order, and the results of the
-last &lt;expression&gt; are returned as the results of the
-entire <tt>unless</tt> expression.  Otherwise, the <tt>unless</tt> expression
-returns unspecified values.</p>
-<p>
-The final &lt;expression&gt; is in tail context if the <tt>when</tt> or
-<tt>unless</tt> form is itself in tail context.</p>
-<p>
-</p>
-
-<tt>(when&nbsp;(&gt;&nbsp;3&nbsp;2)&nbsp;&#8217;greater)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;greater<br>
-(when&nbsp;(&lt;&nbsp;3&nbsp;2)&nbsp;&#8217;greater)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<em>unspecified</em><br>
-(unless&nbsp;(&gt;&nbsp;3&nbsp;2)&nbsp;&#8217;less)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<em>unspecified</em><br>
-(unless&nbsp;(&lt;&nbsp;3&nbsp;2)&nbsp;&#8217;less)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;less<br>
-<p></tt></p>
-<p>
-The <tt>when</tt> and <tt>unless</tt> expressions are derived forms.  They
-could be defined by the following macros:</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;<tt>when</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((when&nbsp;test&nbsp;result1&nbsp;result2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;test<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;result1&nbsp;result2&nbsp;...)))))<br>
-<br>
-(define-syntax&nbsp;<tt>unless</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((unless&nbsp;test&nbsp;result1&nbsp;result2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(not&nbsp;test)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;result1&nbsp;result2&nbsp;...)))))<br>
-<p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-
-<p class=noindent></p>
-<div align=left><tt>(do ((&lt;variable<sub>1</sub>&gt; &lt;init<sub>1</sub>&gt; &lt;step<sub>1</sub>&gt;)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<a name="node_idx_258"></a><tt><tt>...</tt>)<br>
-
-(&lt;test&gt;&nbsp;&lt;expression&gt;&nbsp;<tt>...</tt>)<br>
-
-&lt;command&gt;&nbsp;<tt>...</tt>)</tt><p>
-<em>Syntax: </em>The &lt;init&gt;s, &lt;step&gt;s, &lt;test&gt;s, and &lt;command&gt;s must be
-expressions.  The &lt;variable&gt;s must be pairwise distinct variables.</p>
-<p>
-<em>Semantics: </em>The <tt>do</tt> expression is an iteration construct.  It specifies a set of variables to
-be bound, how they are to be initialized at the start, and how they are
-to be updated on each iteration.</p>
-<p>
-A <tt>do</tt> expression is evaluated as follows:
-The &lt;init&gt; expressions are evaluated (in some unspecified order),
-the &lt;variable&gt;s are bound to fresh locations, the results of the
-&lt;init&gt; expressions are stored in the bindings of the
-&lt;variable&gt;s, and then the iteration phase begins.</p>
-<p>
-Each iteration begins by evaluating &lt;test&gt;; if the result is
-<tt>#f</tt>, then the &lt;command&gt;s
-are evaluated in order for effect, the &lt;step&gt;
-expressions are evaluated in some unspecified order, the
-&lt;variable&gt;s are bound to fresh locations holding the results,
-and the next iteration begins.</p>
-<p>
-If &lt;test&gt; evaluates to a true value, the
-&lt;expression&gt;s are evaluated from left to right and the values of
-the last &lt;expression&gt; are returned.  If no &lt;expression&gt;s
-are present, then the <tt>do</tt> expression returns unspecified values.</p>
-<p>
-The region<a name="node_idx_260"></a>of the binding of a &lt;variable&gt;
-consists of the entire <tt>do</tt> expression except for the &lt;init&gt;s.</p>
-<p>
-A &lt;step&gt; may be omitted, in which case the effect is the
-same as if <tt>(&lt;variable&gt; &lt;init&gt; &lt;variable&gt;)</tt> had
-been written instead of <tt>(&lt;variable&gt; &lt;init&gt;)</tt>.</p>
-<p>
-If a <tt>do</tt> expression appears in a tail context, the
-&lt;expression&gt;s are a &lt;tail sequence&gt; in the sense of report
-section&nbsp;on &#8220;Tail calls and tail contexts&#8221;,
-i.e., the last &lt;expression&gt; is also in a tail context.</p>
-<p>
-</p>
-
-<tt>(do&nbsp;((vec&nbsp;(make-vector&nbsp;5))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(i&nbsp;0&nbsp;(+&nbsp;i&nbsp;1)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((=&nbsp;i&nbsp;5)&nbsp;vec)<br>
-&nbsp;&nbsp;(vector-set!&nbsp;vec&nbsp;i&nbsp;i))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;#(0&nbsp;1&nbsp;2&nbsp;3&nbsp;4)<br>
-<br>
-(let&nbsp;((x&nbsp;&#8217;(1&nbsp;3&nbsp;5&nbsp;7&nbsp;9)))<br>
-&nbsp;&nbsp;(do&nbsp;((x&nbsp;x&nbsp;(cdr&nbsp;x))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(sum&nbsp;0&nbsp;(+&nbsp;sum&nbsp;(car&nbsp;x))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((null?&nbsp;x)&nbsp;sum)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;25<p></tt></p>
-<p>
-The following definition
-of <tt>do</tt> uses a trick to expand the variable clauses.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;<tt>do</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((do&nbsp;((var&nbsp;init&nbsp;step&nbsp;...)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(test&nbsp;expr&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;command&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((loop<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(var&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;test<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#f</tt>&nbsp;;&nbsp;avoid&nbsp;empty&nbsp;begin<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;expr&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;command<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;(do&nbsp;&quot;step&quot;&nbsp;var&nbsp;step&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;init&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((do&nbsp;&quot;step&quot;&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((do&nbsp;&quot;step&quot;&nbsp;x&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y)))<p></tt></p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_262"></a>case-lambda<i> &lt;case-lambda clause&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>Each &lt;case-lambda clause&gt; must be of the form
-</p>
-
-<tt>(&lt;formals&gt;&nbsp;&lt;body&gt;)<p></tt></p>
-<p>
-&lt;Formals&gt; must be as in a <tt>lambda</tt> form
-(report section&nbsp;on &#8220;Procedures&#8221;), and &lt;body&gt; is as described in
-report section&nbsp;on &#8220;Bodies and sequences&#8221;.</p>
-<p>
-<em>Semantics: </em>A <tt>case-lambda</tt> expression evaluates to a procedure.
-This procedure, when applied, tries to match its arguments to the
-&lt;case-lambda clause&gt;s in order.  The arguments match a clause if one of the
-following conditions is fulfilled:
-</p>
-<ul>
-<li><p>&lt;Formals&gt; has the form <tt>(&lt;variable&gt; <tt>...</tt>)</tt>
-and the number of arguments is the same as the number of formal
-parameters in &lt;formals&gt;.
-</p>
-<li><p>&lt;Formals&gt; has the form<br>
-<tt>(&lt;variable<sub>1</sub>&gt; <tt>...</tt>&lt;variable<sub><em>n</em></sub>&gt; . &lt;variable<sub><em>n</em>+1</sub>)&gt;
-</tt><br>
-and the number of arguments is at least <em>n</em>.
-</p>
-<li><p>&lt;Formals&gt; has the form <tt>&lt;variable&gt;</tt>.
-</p>
-</ul><p>
-For the first clause matched by the arguments, the variables of the
-&lt;formals&gt; are bound to fresh locations containing the
-argument values in the same arrangement as with <tt>lambda</tt>.</p>
-<p>
-The last expression of a &lt;body&gt; in a <tt>case-lambda
-expression</tt> is in tail context.</p>
-<p>
-If the arguments match none of the clauses, an exception with condition 
-type <tt>&amp;assertion</tt> is raised.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;foo<br>
-&nbsp;&nbsp;(case-lambda&nbsp;<br>
-&nbsp;&nbsp;&nbsp;(()&nbsp;&#8217;zero)<br>
-&nbsp;&nbsp;&nbsp;((x)&nbsp;(list&nbsp;&#8217;one&nbsp;x))<br>
-&nbsp;&nbsp;&nbsp;((x&nbsp;y)&nbsp;(list&nbsp;&#8217;two&nbsp;x&nbsp;y))<br>
-&nbsp;&nbsp;&nbsp;((a&nbsp;b&nbsp;c&nbsp;d&nbsp;.&nbsp;e)&nbsp;(list&nbsp;&#8217;four&nbsp;a&nbsp;b&nbsp;c&nbsp;d&nbsp;e))<br>
-&nbsp;&nbsp;&nbsp;(rest&nbsp;(list&nbsp;&#8217;rest&nbsp;rest))))<br>
-<br>
-(foo)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;zero<br>
-(foo&nbsp;1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(one&nbsp;1)<br>
-(foo&nbsp;1&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(two&nbsp;1&nbsp;2)<br>
-(foo&nbsp;1&nbsp;2&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(rest&nbsp;(1&nbsp;2&nbsp;3))<br>
-(foo&nbsp;1&nbsp;2&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(four&nbsp;1&nbsp;2&nbsp;3&nbsp;4&nbsp;())<br>
-<p></tt></p>
-<p>
-The <tt>case-lambda</tt> keyword
-can be defined in terms of <tt>lambda</tt> by the following macros:
-</p>
-
-<tt>(define-syntax&nbsp;<tt>case-lambda</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((_&nbsp;(fmls&nbsp;b1&nbsp;b2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;fmls&nbsp;b1&nbsp;b2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((_&nbsp;(fmls&nbsp;b1&nbsp;b2&nbsp;...)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;args<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((n&nbsp;(length&nbsp;args)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(case-lambda-help&nbsp;args&nbsp;n<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fmls&nbsp;b1&nbsp;b2&nbsp;...)&nbsp;...))))))<br>
-<br>
-(define-syntax&nbsp;case-lambda-help<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((_&nbsp;args&nbsp;n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(assertion-violation&nbsp;<tt>#f</tt><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&quot;unexpected&nbsp;number&nbsp;of&nbsp;arguments&quot;))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((_&nbsp;args&nbsp;n&nbsp;((x&nbsp;...)&nbsp;b1&nbsp;b2&nbsp;...)&nbsp;more&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(=&nbsp;n&nbsp;(length&nbsp;&#8217;(x&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(apply&nbsp;(lambda&nbsp;(x&nbsp;...)&nbsp;b1&nbsp;b2&nbsp;...)&nbsp;args)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(case-lambda-help&nbsp;args&nbsp;n&nbsp;more&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((_&nbsp;args&nbsp;n&nbsp;((x1&nbsp;x2&nbsp;...&nbsp;.&nbsp;r)&nbsp;b1&nbsp;b2&nbsp;...)&nbsp;more&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(&gt;=&nbsp;n&nbsp;(length&nbsp;&#8217;(x1&nbsp;x2&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(apply&nbsp;(lambda&nbsp;(x1&nbsp;x2&nbsp;...&nbsp;.&nbsp;r)&nbsp;b1&nbsp;b2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;args)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(case-lambda-help&nbsp;args&nbsp;n&nbsp;more&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((_&nbsp;args&nbsp;n&nbsp;(r&nbsp;b1&nbsp;b2&nbsp;...)&nbsp;more&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(apply&nbsp;(lambda&nbsp;r&nbsp;b1&nbsp;b2&nbsp;...)&nbsp;args))))<br>
-<p></tt>
-</p>
-<p></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-5.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-7.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-7.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-7.html
deleted file mode 100644
index f591b86418..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-7.html
+++ /dev/null
@@ -1,1175 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-6.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-8.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_6"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_6">Chapter 6</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_6">Records</a></h1>
-<p>
-<a name="node_idx_264"></a>This section describes abstractions for creating new data types
-representing records.</p>
-<p>
-A record is a compound data structure with a fixed number of
-components, called <i>fields</i><a name="node_idx_266"></a>.  Each record has
-an associated type specified by a <a name="node_idx_268"></a><em>record-type descriptor</em>,
-which is an object that specifies the fields of the record and various
-other properties that all records of that type share.  Record objects
-are created by a <a name="node_idx_270"></a><em>record constructor</em>, a procedure that
-creates a fresh record object and initializes its fields to values.
-Records of different types can be distinguished from each other and
-from other types of objects by <i>record predicates</i>. A record predicate
-returns <tt>#t</tt> when passed a record of the type specified by the
-record-type descriptor and <tt>#f</tt> otherwise.
-An <a name="node_idx_272"></a><em>accessor</em> extracts from a record
-the component associated with a field, and a <a name="node_idx_274"></a><em>mutator</em>
-changes the component to a different value.</p>
-<p>
-Record types can be extended via single inheritance, allowing record
-types to model hierarchies that occur in applications like algebraic
-data types as well as single-inheritance class systems.  If a record
-type <i>t</i> extends another record type <i>p</i>, each record of type
-<i>t</i> is also a record of type <i>p</i>, and the predicate,
-accessors, and mutators applicable to a record of type <i>p</i> are
-also applicable to a record of type <i>t</i>.  The extension
-relationship is transitive in the sense that a type extends its
-parent&#8217;s parent, if any, and so on.  A record type that does not
-extend another record type is called a <a name="node_idx_276"></a><em>base record type</em>.</p>
-<p>
-A
-record type can be <a name="node_idx_278"></a><em>sealed</em> to prevent it from being
-extended.  Moreover, a record type can be <a name="node_idx_280"></a><em>nongenerative</em>,
-i.e., it is globally identified by a &#8220;uid&#8221;, and new, compatible
-definitions of a nongenerative record type with the same uid as a
-previous always yield the same record type.</p>
-<p>
-The record mechanism spans three libraries:</p>
-<p>
-</p>
-<ul>
-<li><p>the <tt>(rnrs records syntactic (6))</tt> library,
-a syntactic layer for defining a record type and
-associated constructor, predicate, accessor, and mutators,
-</p>
-<li><p>the <tt>(rnrs records procedural (6))</tt> library,
-a procedural layer for creating and manipulating record types and creating
-constructors, predicates, accessors, and mutators;
-</p>
-<li><p>the <tt>(rnrs records inspection (6))</tt> library,
-a set of inspection procedures.
-</p>
-</ul><p>
-The inspection procedures allow programs to obtain from a record
-instance a descriptor for the type and from there obtain access to the
-fields of the record instance. This facility allows the creation of
-portable printers and inspectors.  A program may prevent access to a
-record&#8217;s type&#8212;and thereby protect the information stored in the
-record from the inspection mechanism&#8212;by declaring the type opaque.
-Thus, opacity as presented here can be used to enforce abstraction
-barriers.</p>
-<p>
-Any of the standard types mentioned in this report may or may not be
-implemented as an opaque record type.  Thus, it may be possible to use
-inspection on objects of the standard types.</p>
-<p>
-The procedural layer is particularly useful for writing interpreters
-that construct host-compatible record types.  It may also serve as a
-target for expansion of the syntactic layers.  The
-record operations provided through the procedural layer may, however, be
-less efficient than the operations provided through the
-syntactic layer, which is designed to allow expand-time determination
-of record-instance sizes and field offsets.  Therefore, alternative implementations
-of syntactic record-type definition should, when possible, expand into
-the syntactic layer rather than the procedural layer.</p>
-<p>
-The syntactic layer is used more commonly and therefore described
-first.  This chapter uses the <i>rtd</i> and
-<i>constructor-descriptor</i> parameter names for arguments that must
-be record-type descriptors and constructor descriptors, respectively
-(see section&nbsp;<a href="#node_sec_6.3">6.3</a>).</p>
-<p>
-</p>
-<a name="node_sec_6.1"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_6.1">6.1&nbsp;&nbsp;Mutability and equivalence of records</a></h2>
-<p></p>
-<p>
-The fields of a record type are designated <i>mutable</i> or
-<i>immutable</i>.  Correspondingly, a record type with no mutable
-field is called <i>immutable</i><a name="node_idx_282"></a><a name="node_idx_284"></a>, and all records of that type
-are immutable objects.  All other record types are <i>mutable</i>,
-and so are their records.</p>
-<p>
-Each call to a record constructor returns a new record with a fresh
-location (see report section&nbsp;on &#8220;Storage
-model&#8221;).  Consequently, for two records <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i>,
-the return value of <tt>(eqv? <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i>)</tt>, as well as the
-return value of <tt>(eq? <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i>)</tt>, adheres to
-the following criteria (see report
-section&nbsp;on &#8220;Equivalence predicates&#8221;):</p>
-<p>
-</p>
-<ul>
-<li><p>If <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> have different record types (i.e.,
-their record-type descriptors are not <tt>eqv?</tt>), <tt>eqv?</tt>
-returns <tt>#f</tt>.
-</p>
-<li><p>If <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both records of the
-same record type, and are the results of two separate calls to
-record constructors, then <tt>eqv?</tt> returns <tt>#f</tt>.
-</p>
-<li><p>If <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both the result of a single call to a
-record constructor, then <tt>eqv?</tt> returns <tt>#t</tt>.
-</p>
-<li><p>If <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both records of the same
-record type, where applying an accessor to both yields results
-for which <tt>eqv?</tt> returns <tt>#f</tt>, then <tt>eqv?</tt> returns <tt>#f</tt>.
-</p>
-</ul><p></p>
-<p>
-</p>
-<a name="node_sec_6.2"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_6.2">6.2&nbsp;&nbsp;Syntactic layer</a></h2>
-<p></p>
-<p>
-The syntactic layer is provided by the <tt>(rnrs records
-syntactic (6))</tt><a name="node_idx_286"></a>library.  Some details of the specification are
-explained in terms of the specification of the procedural layer below.</p>
-<p>
-The record-type-defining form <tt>define-record-type</tt> is a definition and
-can appear anywhere any other &lt;definition&gt; can appear.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_288"></a>define-record-type<i> &lt;name spec&gt; &lt;record clause&gt;*</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<a name="node_idx_290"></a><div align=left><tt>fields</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_292"></a><div align=left><tt>mutable</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_294"></a><div align=left><tt>immutable</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_296"></a><div align=left><tt>parent</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_298"></a><div align=left><tt>protocol</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_300"></a><div align=left><tt>sealed</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_302"></a><div align=left><tt>opaque</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_304"></a><div align=left><tt>nongenerative</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_306"></a><div align=left><tt>parent-rtd</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-<p>
-A <tt>define-record-type</tt> form defines a record type along with
-associated constructor descriptor and constructor, predicate, field
-accessors, and field mutators. The <tt>define-record-type</tt> form expands into
-a set of definitions in the environment where <tt>define-record-type</tt>
-appears; hence, it is possible to refer to the bindings (except for
-that of the record type itself) recursively.</p>
-<p>
-The &lt;name spec&gt; specifies the names of the record type,
-constructor, and predicate. It must take one of the following
-forms:</p>
-<p>
-</p>
-
-<tt>(&lt;record&nbsp;name&gt;&nbsp;&lt;constructor&nbsp;name&gt;&nbsp;&lt;predicate&nbsp;name&gt;)<br>
-&lt;record&nbsp;name&gt;<p></tt></p>
-<p>
-&lt;Record name&gt;, &lt;constructor name&gt;, and &lt;predicate
-name&gt; must all be identifiers.</p>
-<p>
-&lt;Record name&gt;, taken as a symbol, becomes the name of the record
-type. (See the description of <tt>make-record-type-descriptor</tt>
-below.)
-Additionally, it is bound by this definition to an expand-time or run-time
-representation of the record type and can be used as parent name in
-syntactic record-type definitions that extend this definition. It can
-also be used as a handle to gain access to the underlying record-type
-descriptor and constructor descriptor (see <tt>record-type-descriptor</tt> and <tt>record-constructor-descriptor</tt>
-below).</p>
-<p>
-&lt;Constructor name&gt; is defined by this definition to be a
-constructor for the defined record type, with a protocol specified by
-the <tt>protocol</tt> clause, or, in its absence, using a default protocol. For
-details, see the description of the <tt>protocol</tt> clause below.</p>
-<p>
-&lt;Predicate name&gt; is defined by this definition to a predicate
-for the defined record type.</p>
-<p>
-The second form of &lt;name spec&gt; is an abbreviation for the first
-form, where the name of the constructor is generated by prefixing the
-record name with <tt>make-</tt>, and the predicate name is generated by
-adding a question mark (<tt>?</tt>) to the end of the record name. For
-example, if the record name is <tt>frob</tt>, the name of the
-constructor is <tt>make-frob</tt>, and the predicate name is
-<tt>frob?</tt>.</p>
-<p>
-Each &lt;record clause&gt; must take one of the following forms; it is
-a syntax violation if multiple &lt;record clause&gt;s of the same kind appear in a
-<tt>define-record-type</tt> form.</p>
-<p>
-<tt>(fields &lt;field spec&gt;*)</tt></p>
-<p>
-Each &lt;field spec&gt; has one of the following forms</p>
-<p>
-</p>
-
-<tt>(immutable&nbsp;&lt;field&nbsp;name&gt;&nbsp;&lt;accessor&nbsp;name&gt;)<br>
-(mutable&nbsp;&lt;field&nbsp;name&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;accessor&nbsp;name&gt;&nbsp;&lt;mutator&nbsp;name&gt;)<br>
-(immutable&nbsp;&lt;field&nbsp;name&gt;)<br>
-(mutable&nbsp;&lt;field&nbsp;name&gt;)<br>
-&lt;field&nbsp;name&gt;<p></tt></p>
-<p>
-&lt;Field name&gt;, &lt;accessor name&gt;, and &lt;mutator name&gt;
-must all be identifiers. The first form declares an immutable field
-called &lt;field name&gt;, with the corresponding accessor named
-&lt;accessor name&gt;. The second form declares a mutable field called
-&lt;field name&gt;, with the corresponding accessor named
-&lt;accessor name&gt;, and with the corresponding mutator named
-&lt;mutator name&gt;.</p>
-<p>
-If &lt;field spec&gt; takes the third or fourth form, the accessor
-name is generated by appending the record name and field name with a
-hyphen separator, and the mutator name (for a mutable field) is
-generated by adding a <tt>-set!</tt> suffix to the accessor name. For
-example, if the record name is <tt>frob</tt> and the field name is <tt>widget</tt>, the accessor name is <tt>frob-widget</tt> and the mutator name
-is <tt>frob-widget-set!</tt>.</p>
-<p>
-If &lt;field spec&gt; is just a &lt;field name&gt; form, it is an
-abbreviation for <tt>(immutable &lt;field name&gt;)</tt>.</p>
-<p>
-The &lt;field name&gt;s become, as symbols, the names of the fields in
-the record-type descriptor being created, in the same order.</p>
-<p>
-The <tt>fields</tt> clause may be absent; this is equivalent to an empty
-<tt>fields</tt> clause.</p>
-<p>
-<tt>(parent &lt;parent name&gt;)</tt></p>
-<p>
-Specifies that the record type is to have parent type &lt;parent
-name&gt;, where &lt;parent name&gt; is the &lt;record name&gt; of a
-record type previously defined using <tt>define-record-type</tt>. 
-The record-type definition
-associated with &lt;parent name&gt; must not be sealed.
-If
-no <tt>parent</tt> clause and no <tt>parent-rtd</tt> (see below) clause
-is present, the record type is a base type.  </p>
-<p>
-<tt>(protocol &lt;expression&gt;)</tt></p>
-<p>
-&lt;Expression&gt; is evaluated in the same environment as the
-<tt>define-record-type</tt> form, and must evaluate to a protocol appropriate
-for the record type being defined.</p>
-<p>
-The protocol is used to create a record-constructor descriptor as
-described below.  If no <tt>protocol</tt> clause is specified, a
-constructor descriptor is still created using a default protocol.  The
-clause can be absent only if the record type being defined has no parent
-type, or if the parent definition does not specify a protocol.</p>
-<p>
-<tt>(sealed <tt>#t</tt>)</tt><br>
-<tt>(sealed <tt>#f</tt>)</tt></p>
-<p>
-If this option is specified with operand <tt>#t</tt>, the defined record
-type is sealed, i.e., no extensions of the record type can be created.
-If this option is specified with operand <tt>#f</tt>, or is absent, the
-defined record type is not sealed.</p>
-<p>
-<tt>(opaque <tt>#t</tt>)</tt><br>
-<tt>(opaque <tt>#f</tt>)</tt></p>
-<p>
-If this option is specified with operand <tt>#t</tt>, or if an opaque
-parent record type is specified, the defined record type is opaque.
-Otherwise, the defined record type is not opaque.  See the
-specification of <tt>record-rtd</tt> below for details.</p>
-<p>
-<tt>(nongenerative &lt;uid&gt;)</tt><br>
-<tt>(nongenerative)</tt></p>
-<p>
-This specifies that the record type is nongenerative with uid
-&lt;uid&gt;, which must be an &lt;identifier&gt;.
-If &lt;uid&gt; is absent, a unique uid is generated at macro-expansion time.
-If two record-type definitions specify the same <i>uid</i>, then
-the record-type definitions should be equivalent, i.e.,
-the implied arguments to <tt>make-record-type-descriptor</tt>
-must be equivalent as described under <tt>make-record-type-descriptor</tt>.  See section&nbsp;<a href="#node_sec_6.3">6.3</a>.
-If this condition is not met, it is either considered a syntax violation or
-an exception with condition type <tt>&amp;assertion</tt> is raised.
-If the condition is met, a single record type is generated for both
-definitions.</p>
-<p>
-In the absence of a <tt>nongenerative</tt> clause, a new record type is
-generated every time a <tt>define-record-type</tt> form is evaluated:</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((f&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(define-record-type&nbsp;r&nbsp;<tt>...</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;x&nbsp;r?&nbsp;(make-r&nbsp;<tt>...</tt>)))))<br>
-&nbsp;&nbsp;((f&nbsp;<tt>#t</tt>)&nbsp;(f&nbsp;<tt>#f</tt>)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-<p></tt></p>
-<p>
-<tt>(parent-rtd &lt;parent rtd&gt; &lt;parent cd&gt;)</tt></p>
-<p>
-Specifies that the record type is to have its parent type specified by
-&lt;parent rtd&gt;, which should be an expression evaluating to a
-record-type descriptor, and &lt;parent cd&gt;, which should be an
-expression evaluating to a constructor descriptor (see below).  The
-record-type definition associated with the value of &lt;parent rtd&gt;
-must not be sealed.  Moreover, a record-type definition must not have
-both a <tt>parent</tt> and a <tt>parent-rtd</tt> clause.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The syntactic layer is designed to allow record-instance sizes and field
-offsets to be determined at expand time, i.e., by a macro definition of
-<tt>define-record-type</tt>, as long as the parent (if any) is known.
-Implementations that take advantage of this may generate less
-efficient constructor, accessor, and mutator code when the
-<tt>parent-rtd</tt> clause is used, since the type of the parent is
-generally not known until run time.
-The <tt>parent</tt> clause should therefore be used instead when possible.
-</blockquote><p>
-All bindings created by <tt>define-record-type</tt> (for the record type,
-the constructor, the predicate, the accessors, and the
-mutators) must have names that are pairwise distinct.</p>
-<p>
-The constructor created by a <tt>define-record-type</tt> form is a
-procedure as follows:
-</p>
-<ul>
-<li><p>If there is no <tt>parent</tt> clause and no <tt>protocol</tt> clause,
-the constructor accepts as many arguments as there are fields, in
-the same order as they appear in the <tt>fields</tt> clause, and
-returns a record object with the fields initialized to the
-corresponding arguments.
-</p>
-<li><p>If there is no <tt>parent</tt> or <tt>parent-rtd</tt> clause and a
-<tt>protocol</tt> clause,
-the protocol expression must evaluate to a procedure that accepts a
-single argument.  The protocol procedure is called once during the
-evaluation of the <tt>define-record-type</tt> form with a
-procedure <i>p</i> as its argument.  It should return a procedure,
-which will become the constructor bound to &lt;constructor name&gt;.
-The procedure <i>p</i> accepts as many arguments as there are fields,
-in the same order as they appear in the <tt>fields</tt> clause, and
-returns a record object with the fields initialized to the
-corresponding arguments.</p>
-<p>
-The constructor returned by the protocol procedure can accept an
-arbitrary number of arguments, and should call <i>p</i> once to
-construct a record object, and return that record object.</p>
-<p>
-For example, the following protocol expression for a record-type
-definition with three fields creates a constructor that accepts 
-values for all fields, and initialized them in the reverse order of
-the arguments:
-</p>
-
-<tt>&nbsp;<br>
-(lambda&nbsp;(p)<br>
-&nbsp;&nbsp;(lambda&nbsp;(v1&nbsp;v2&nbsp;v3)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(p&nbsp;v3&nbsp;v2&nbsp;v1)))<p></tt></p>
-<p>
-</p>
-<li><p>If there is both a <tt>parent</tt> clause and a <tt>protocol</tt>
-clause, then the protocol procedure is called once with a procedure
-<i>n</i> as its argument.  As in the previous case, the protocol
-procedure should return a procedure, which will become the
-constructor bound to &lt;constructor name&gt;.  However, <i>n</i> is
-different from <i>p</i> in the previous case: It accepts arguments
-corresponding to the arguments of the constructor of the parent
-type.  It then returns a procedure <i>p</i> that accepts as many
-arguments as there are (additional) fields in this type, in the same order as in
-the <tt>fields</tt> clause, and returns a record object with the fields
-of the parent record types initialized according to their
-constructors and the arguments to <i>n</i>, and the fields of
-this record type initialized to its arguments of <i>p</i>.</p>
-<p>
-The constructor returned by the protocol procedure can accept an
-arbitrary number of arguments, and should call <i>n</i> once to
-construct the procedure <i>p</i>, and call <i>p</i> once to create the
-record object, and finally return that record object.</p>
-<p>
-For example, the following protocol expression assumes that the
-constructor of the parent type takes three arguments:
-</p>
-
-<tt>(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;(lambda&nbsp;(v1&nbsp;v2&nbsp;v3&nbsp;x1&nbsp;x2&nbsp;x3&nbsp;x4)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((p&nbsp;(n&nbsp;v1&nbsp;v2&nbsp;v3)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(p&nbsp;x1&nbsp;x2&nbsp;x3&nbsp;x4))))<p></tt>
-The resulting constructor accepts seven arguments, and initializes
-the fields of the parent types according to the constructor of the
-parent type, with <tt>v1</tt>, <tt>v2</tt>, and <tt>v3</tt> as arguments.  It
-also initializes the fields of this record type to the values of <tt>x1</tt>, <tt>...</tt>, <tt>x4</tt>.</p>
-<p>
-</p>
-<li><p>If there is a <tt>parent</tt> clause, but no <tt>protocol</tt> clause,
-then the parent type must not have a
-<tt>protocol</tt> clause itself.  The constructor bound to
-&lt;constructor name&gt; is a procedure that accepts arguments corresponding to the 
-parent types&#8217; constructor first, and then one argument for each field in the same
-order as in the <tt>fields</tt> clause. The constructor
-returns a record object with the fields initialized to the corresponding
-arguments.
-</p>
-<li><p>If there is a <tt>parent-rtd</tt> clause, then the constructor is
-as with a <tt>parent</tt> clause, except that the constructor of the
-parent type is determined by the constructor descriptor of the <tt>parent-rtd</tt> clause.
-</p>
-</ul><p></p>
-<p>
-A protocol may perform other actions consistent with the requirements
-described above, including mutation of the new record or other side
-effects, before returning the record.
-</p>
-<p></p>
-<p>
-Any definition that takes advantage of implicit naming for the
-constructor, predicate, accessor, and mutator names can be rewritten
-trivially to a definition that specifies all names explicitly. For
-example, the implicit-naming record definition:</p>
-<p>
-</p>
-
-<tt>(define-record-type&nbsp;frob<br>
-&nbsp;&nbsp;(fields&nbsp;(mutable&nbsp;widget))<br>
-&nbsp;&nbsp;(protocol<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(p)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)&nbsp;(p&nbsp;(make-widget&nbsp;n))))))<p></tt></p>
-<p>
-is equivalent to the following explicit-naming record definition.</p>
-<p>
-</p>
-
-<tt>(define-record-type&nbsp;(frob&nbsp;make-frob&nbsp;frob?)<br>
-&nbsp;&nbsp;(fields&nbsp;(mutable&nbsp;widget<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;frob-widget<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;frob-widget-set!))<br>
-&nbsp;&nbsp;(protocol<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(p)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)&nbsp;(p&nbsp;(make-widget&nbsp;n))))))<p></tt></p>
-<p>
-Also, the implicit-naming record definition:</p>
-<p>
-</p>
-
-<tt>(define-record-type&nbsp;point&nbsp;(fields&nbsp;x&nbsp;y))<p></tt></p>
-<p>
-is equivalent to the following explicit-naming record
-definition:</p>
-<p>
-</p>
-
-<tt>(define-record-type&nbsp;(point&nbsp;make-point&nbsp;point?)<br>
-&nbsp;&nbsp;(fields&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(immutable&nbsp;x&nbsp;point-x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(immutable&nbsp;y&nbsp;point-y)))<p></tt></p>
-<p>
-With implicit naming, it is still possible to specify some of
-the names explicitly; for example, the following overrides the choice
-of accessor and mutator names for the widget field.</p>
-<p>
-</p>
-
-<tt>(define-record-type&nbsp;frob<br>
-&nbsp;&nbsp;(fields&nbsp;(mutable&nbsp;widget&nbsp;getwid&nbsp;setwid!))<br>
-&nbsp;&nbsp;(protocol<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(p)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)&nbsp;(p&nbsp;(make-widget&nbsp;n))))))<p></tt></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_308"></a>record-type-descriptor<i> &lt;record name&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-Evaluates to the record-type descriptor (see below) associated with the type
-specified by &lt;record name&gt;.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>   
-The <tt>record-type-descriptor</tt> procedure works on both opaque and non-opaque record
-types.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_310"></a>record-constructor-descriptor<i> &lt;record name&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-Evaluates to the record-constructor descriptor (see below) associated with
-&lt;record name&gt;.
-</p>
-<p></p>
-<p>
-The following example uses the <tt>record?</tt> procedure from the 
-<tt>(rnrs records inspection (6))</tt> library (section
-<a href="#node_sec_6.4">6.4</a>):</p>
-<p>
-</p>
-
-<tt>(define-record-type&nbsp;(point&nbsp;make-point&nbsp;point?)<br>
-&nbsp;&nbsp;(fields&nbsp;(immutable&nbsp;x&nbsp;point-x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(mutable&nbsp;y&nbsp;point-y&nbsp;set-point-y!))<br>
-&nbsp;&nbsp;(nongenerative<br>
-&nbsp;&nbsp;&nbsp;&nbsp;point-4893d957-e00b-11d9-817f-00111175eb9e))<br>
-<br>
-(define-record-type&nbsp;(cpoint&nbsp;make-cpoint&nbsp;cpoint?)<br>
-&nbsp;&nbsp;(parent&nbsp;point)<br>
-&nbsp;&nbsp;(protocol<br>
-&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;y&nbsp;c)&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((n&nbsp;x&nbsp;y)&nbsp;(color-&gt;rgb&nbsp;c)))))<br>
-&nbsp;&nbsp;(fields<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(mutable&nbsp;rgb&nbsp;cpoint-rgb&nbsp;cpoint-rgb-set!)))<br>
-<br>
-(define&nbsp;(color-&gt;rgb&nbsp;c)<br>
-&nbsp;&nbsp;(cons&nbsp;&#8217;rgb&nbsp;c))<br>
-<br>
-(define&nbsp;p1&nbsp;(make-point&nbsp;1&nbsp;2))<br>
-(define&nbsp;p2&nbsp;(make-cpoint&nbsp;3&nbsp;4&nbsp;&#8217;red))<br>
-<br>
-(point?&nbsp;p1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(point?&nbsp;p2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(point?&nbsp;(vector))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(point?&nbsp;(cons&nbsp;&#8217;a&nbsp;&#8217;b))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(cpoint?&nbsp;p1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(cpoint?&nbsp;p2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(point-x&nbsp;p1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1<br>
-(point-y&nbsp;p1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;2<br>
-(point-x&nbsp;p2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;3<br>
-(point-y&nbsp;p2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;4<br>
-(cpoint-rgb&nbsp;p2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(rgb&nbsp;.&nbsp;red)<br>
-<br>
-(set-point-y!&nbsp;p1&nbsp;17)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>unspecified</i><br>
-(point-y&nbsp;p1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;17)<br>
-<br>
-(record-rtd&nbsp;p1)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(record-type-descriptor&nbsp;point)<br>
-<br>
-(define-record-type&nbsp;(ex1&nbsp;make-ex1&nbsp;ex1?)<br>
-&nbsp;&nbsp;(protocol&nbsp;(lambda&nbsp;(p)&nbsp;(lambda&nbsp;a&nbsp;(p&nbsp;a))))<br>
-&nbsp;&nbsp;(fields&nbsp;(immutable&nbsp;f&nbsp;ex1-f)))<br>
-<br>
-(define&nbsp;ex1-i1&nbsp;(make-ex1&nbsp;1&nbsp;2&nbsp;3))<br>
-(ex1-f&nbsp;ex1-i1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;2&nbsp;3)<br>
-<br>
-(define-record-type&nbsp;(ex2&nbsp;make-ex2&nbsp;ex2?)<br>
-&nbsp;&nbsp;(protocol<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(p)&nbsp;(lambda&nbsp;(a&nbsp;.&nbsp;b)&nbsp;(p&nbsp;a&nbsp;b))))<br>
-&nbsp;&nbsp;(fields&nbsp;(immutable&nbsp;a&nbsp;ex2-a)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(immutable&nbsp;b&nbsp;ex2-b)))<br>
-<br>
-(define&nbsp;ex2-i1&nbsp;(make-ex2&nbsp;1&nbsp;2&nbsp;3))<br>
-(ex2-a&nbsp;ex2-i1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1<br>
-(ex2-b&nbsp;ex2-i1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(2&nbsp;3)<br>
-<br>
-(define-record-type&nbsp;(unit-vector<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;make-unit-vector<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;unit-vector?)<br>
-&nbsp;&nbsp;(protocol<br>
-&nbsp;&nbsp;&nbsp;(lambda&nbsp;(p)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;y&nbsp;z)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((length&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(sqrt&nbsp;(+&nbsp;(*&nbsp;x&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*&nbsp;y&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*&nbsp;z&nbsp;z)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(p&nbsp;(/&nbsp;x&nbsp;length)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(/&nbsp;y&nbsp;length)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(/&nbsp;z&nbsp;length))))))<br>
-&nbsp;&nbsp;(fields&nbsp;(immutable&nbsp;x&nbsp;unit-vector-x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(immutable&nbsp;y&nbsp;unit-vector-y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(immutable&nbsp;z&nbsp;unit-vector-z)))<br>
-<br>
-(define&nbsp;*ex3-instance*&nbsp;<tt>#f</tt>)<br>
-<br>
-(define-record-type&nbsp;ex3<br>
-&nbsp;&nbsp;(parent&nbsp;cpoint)<br>
-&nbsp;&nbsp;(protocol<br>
-&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;y&nbsp;t)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((r&nbsp;((n&nbsp;x&nbsp;y&nbsp;&#8217;red)&nbsp;t)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;*ex3-instance*&nbsp;r)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;r))))<br>
-&nbsp;&nbsp;(fields&nbsp;<br>
-&nbsp;&nbsp;&nbsp;(mutable&nbsp;thickness))<br>
-&nbsp;&nbsp;(sealed&nbsp;<tt>#t</tt>)&nbsp;(opaque&nbsp;<tt>#t</tt>))<br>
-<br>
-(define&nbsp;ex3-i1&nbsp;(make-ex3&nbsp;1&nbsp;2&nbsp;17))<br>
-(ex3?&nbsp;ex3-i1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(cpoint-rgb&nbsp;ex3-i1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(rgb&nbsp;.&nbsp;red)<br>
-(ex3-thickness&nbsp;ex3-i1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;17<br>
-(ex3-thickness-set!&nbsp;ex3-i1&nbsp;18)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>unspecified</i><br>
-(ex3-thickness&nbsp;ex3-i1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;18<br>
-*ex3-instance*&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;ex3-i1<br>
-<br>
-(record?&nbsp;ex3-i1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><p></tt></p>
-<p>
-</p>
-<a name="node_sec_6.3"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_6.3">6.3&nbsp;&nbsp;Procedural layer</a></h2>
-<p></p>
-<p>
-The procedural layer is provided by the <tt>(rnrs records
-procedural (6))</tt><a name="node_idx_312"></a>library.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(make-record-type-descriptor <i>name</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<a name="node_idx_314"></a><tt><br>
-
-<i>parent</i>&nbsp;<i>uid</i>&nbsp;<i>sealed?</i>&nbsp;<i>opaque?</i>&nbsp;<i>fields</i>)</tt><p>
-Returns a <a name="node_idx_316"></a><em>record-type descriptor</em>, or <a name="node_idx_318"></a><em>rtd</em>,
-representing a record type distinct from all built-in types and
-other record types.</p>
-<p>
-The <i>name</i> argument must be a symbol. It names the record type,
-and is intended purely for informational purposes and may be used for printing by
-the underlying Scheme system.</p>
-<p>
-The <i>parent</i> argument must be either <tt>#f</tt> or an rtd. If it is an
-rtd, the returned record type, <i>t</i>, extends the record type
-<i>p</i> represented by <i>parent</i>.  An exception with
-condition type <tt>&amp;assertion</tt> is raised if <i>parent</i> is sealed (see below).</p>
-<p>
-The <i>uid</i> argument must be either <tt>#f</tt> or a symbol.
-If <i>uid</i> is a symbol, the record-creation operation is
-<em>nongenerative</em> i.e., a new record type is created only
-if no previous call to <tt>make-record-type-descriptor</tt>
-was made with the <i>uid</i>.
-If <i>uid</i> is <tt>#f</tt>, the record-creation operation is
-<em>generative</em>, i.e., a new record type is created even if
-a previous call to <tt>make-record-type-descriptor</tt> was
-made with the same arguments.</p>
-<p>
-If <tt>make-record-type-descriptor</tt> is
-called twice with the same <i>uid</i> symbol, the parent
-arguments in the two calls must be <tt>eqv?</tt>, the <i>fields</i>
-arguments <tt>equal?</tt>, the <i>sealed?</i> arguments boolean-equivalent
-(both <tt>#f</tt> or both true), and the <i>opaque?</i> arguments
-boolean-equivalent.
-If these conditions are not met, an exception with condition type
-<tt>&amp;assertion</tt> is raised when the second call occurs.
-If they are met, the second call returns, without creating a new
-record type, the same record-type descriptor
-(in the sense of <tt>eqv?</tt>) as the first call.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>   
-Users are encouraged to use symbol names
-constructed using the UUID namespace&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_10">10</a>] (for example, using the
-record-type name as a prefix) for the uid argument.
-</blockquote><p>
-The <i>sealed?</i> flag must be a boolean. If true, the returned record type
-is sealed, i.e., it cannot be extended.</p>
-<p>
-The <i>opaque?</i> flag must be a boolean. If true, the record type
-is opaque.
-If passed an instance of the record type,
-<tt>record?</tt> returns
-<tt>#f</tt>.  Moreover, if <tt>record-rtd</tt> (see &#8220;Inspection&#8221; below)
-is called with an instance of the record type, 
-an exception with condition type <tt>&amp;assertion</tt> is raised.
-The record type is also opaque if an opaque parent is
-supplied.  If <i>opaque?</i> is <tt>#f</tt> and an opaque parent is not
-supplied, the record is not opaque.</p>
-<p>
-The <i>fields</i> argument must be a vector of field specifiers. Each
-field specifier must be a list of the form <tt>(mutable <i>name</i>)</tt>
-or a list of the form <tt>(immutable <i>name</i>)</tt>.
-Each name must be a symbol and names the corresponding field of the record
-type; the names need not be distinct.  A field identified as mutable may
-be modified, whereas, when a program attempts to obtain a mutator for a field identified
-as immutable, an exception with condition type <tt>&amp;assertion</tt> is raised.
-Where field order is relevant, e.g., for record construction and field
-access, the fields are considered to be ordered as specified, although
-no particular order is required for the actual representation of a
-record instance.</p>
-<p>
-The specified fields are added to the parent fields, if any, to determine
-the complete set of fields of the returned record type.
-If <i>fields</i> is modified after <tt>make-record-type-descriptor</tt>
-has been called, the effect on the returned
-rtd is unspecified.</p>
-<p>
-A generative record-type descriptor created by a call to <tt>make-record-type-descriptor</tt> is not <tt>eqv?</tt> to any record-type
-descriptor (generative or nongenerative) created by another call to
-<tt>make-record-type-descriptor</tt>. A generative record-type descriptor
-is <tt>eqv?</tt>  only to itself, i.e., <tt>(eqv? <i>rtd<sub>1</sub></i> <i>rtd<sub>2</sub></i>)</tt> iff
-<tt>(eq? <i>rtd<sub>1</sub></i> <i>rtd<sub>2</sub></i>)</tt>.
-Also, two nongenerative record-type descriptors are <tt>eqv?</tt> iff they were
-created by calls to <tt>make-record-type-descriptor</tt> with the same
-uid arguments.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_320"></a>record-type-descriptor?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if the argument is a record-type descriptor,
-<tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(make-record-constructor-descriptor <i>rtd</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<a name="node_idx_322"></a><tt><br>
-
-<i>parent-constructor-descriptor</i>&nbsp;<i>protocol</i>)</tt><p>
-Returns a <a name="node_idx_324"></a><em>record-constructor descriptor</em> (or
-<a name="node_idx_326"></a><em>constructor descriptor</em> for short) that specifies a <a name="node_idx_328"></a><em>record
-constructor</em> (or <i>constructor</i> for short),
-that can be used to construct record values of the type
-specified by <i>rtd</i>, and which can be obtained
-via <tt>record-constructor</tt>.   A constructor descriptor can
-also be used to create other constructor descriptors for subtypes of
-its own record type.  <i>Rtd</i> must be a record-type
-descriptor.  <i>Protocol</i><a name="node_idx_330"></a>must be a procedure or <tt>#f</tt>.
-If it is <tt>#f</tt>, a default <i>protocol</i> procedure is supplied.</p>
-<p>
-If <i>protocol</i> is a procedure, it is handled analogously to the
-protocol expression in a <tt>define-record-type</tt> form.</p>
-<p>
-If <i>rtd</i> is a base record type and <i>protocol</i> is a procedure,
-<i>parent-constructor-descriptor</i> must be <tt>#f</tt>.  In this case,
-<i>protocol</i> is called by <tt>record-constructor</tt> with a single
-argument <i>p</i>.  <i>P</i> is a procedure that expects one argument
-for every field of <i>rtd</i> and returns a record with the fields of
-<i>rtd</i> initialized to these arguments.  The procedure returned by
-<i>protocol</i> should call <i>p</i> once with the number of arguments
-<i>p</i> expects and return the resulting record as shown in the simple
-example below:
-</p>
-
-<tt>(lambda&nbsp;(p)<br>
-&nbsp;&nbsp;(lambda&nbsp;(v1&nbsp;v2&nbsp;v3)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(p&nbsp;v1&nbsp;v2&nbsp;v3)))<p></tt>
-Here, the call to <tt>p</tt> returns a record whose fields are
-initialized with the values of <tt>v1</tt>, <tt>v2</tt>, and <tt>v3</tt>.  The
-expression above is equivalent to <tt>(lambda (p) p)</tt>.  Note that the
-procedure returned by <i>protocol</i> is otherwise unconstrained;
-specifically, it can take any number of arguments.</p>
-<p>
-</p>
-<div class=medskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-If <i>rtd</i> is an extension of another record type <i>parent-rtd</i>
-and <i>protocol</i> is a procedure, <i>parent-constructor-descriptor</i>
-must be a constructor descriptor of <i>parent-rtd</i> or <tt>#f</tt>.  If
-<i>parent-constructor-descriptor</i> is a constructor descriptor,
-<i>protocol</i> it is called by <tt>record-constructor</tt> with a single
-argument <i>n</i>, which is a procedure that accepts the same number of
-arguments as the constructor of <i>parent-constructor-descriptor</i>
-and returns a procedure <i>p</i> that, when called, constructs the
-record itself. The <i>p</i> procedure expects one argument for every
-field of <i>rtd</i> (not including parent fields) and returns a record
-with the fields of <i>rtd</i> initialized to these arguments, and the
-fields of <i>parent-rtd</i> and its parents initialized as specified by
-<i>parent-constructor-descriptor</i>.</p>
-<p>
-The procedure returned by <i>protocol</i> should call <i>n</i> once with
-the number of arguments <i>n</i> expects, call the procedure <i>p</i> it
-returns once with the number of arguments <i>p</i> expects and return the
-resulting record.  A simple <i>protocol</i> in this case might be
-written as follows:
-</p>
-
-<tt>(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;(lambda&nbsp;(v1&nbsp;v2&nbsp;v3&nbsp;x1&nbsp;x2&nbsp;x3&nbsp;x4)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((p&nbsp;(n&nbsp;v1&nbsp;v2&nbsp;v3)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(p&nbsp;x1&nbsp;x2&nbsp;x3&nbsp;x4))))<p></tt>
-This passes arguments <tt>v1</tt>, <tt>v2</tt>, <tt>v3</tt> to <i>n</i> for 
-<i>parent-constructor-descriptor</i> and calls <tt>p</tt>
-with <tt>x1</tt>, <tt>...</tt>, <tt>x4</tt> to initialize the fields of <i>rtd</i> itself.</p>
-<p>
-Thus, the constructor descriptors for a record type form a sequence of
-protocols parallel to the sequence of record-type parents. Each
-constructor descriptor in the chain determines the field values for the
-associated record type.
-Child record constructors need not know the number or contents of parent
-fields, only the number of arguments accepted by the parent constructor.</p>
-<p>
-<i>Protocol</i> may be <tt>#f</tt>, specifying a default constructor that
-accepts one argument for each field of <i>rtd</i> (including the
-fields of its parent type, if any).  Specifically, if <i>rtd</i> is a
-base type, the default <i>protocol</i> procedure behaves as if it were
-<tt>(lambda (p) p)</tt>.  If <i>rtd</i> is an extension of another type,
-then <i>parent-constructor-descriptor</i> must be either <tt>#f</tt> or
-itself specify a default constructor, and the default
-<i>protocol</i> procedure behaves as if it were:
-</p>
-
-<tt>(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;(lambda&nbsp;(<i>v<sub>1</sub></i>&nbsp;<tt>...</tt>&nbsp;<i>v<sub><em>j</em></sub></i>&nbsp;<i>x<sub>1</sub></i>&nbsp;<tt>...</tt>&nbsp;<i>x<sub><em>k</em></sub></i>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((p&nbsp;(n&nbsp;<i>v<sub>1</sub></i>&nbsp;<tt>...</tt>&nbsp;<i>v<sub><em>j</em></sub></i>)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(p&nbsp;<i>x<sub>1</sub></i>&nbsp;<tt>...</tt>&nbsp;<i>x<sub><em>k</em></sub></i>))))<p></tt>
-The resulting constructor accepts one argument for each of the record
-type&#8217;s complete set of fields (including those of the parent record
-type, the parent&#8217;s parent record type, etc.) and returns a record with
-the fields initialized to those arguments, with the field values for
-the parent coming before those of the extension in the argument list.
-(In the example, <em>j</em> is the complete number of fields of the parent
-type, and <em>k</em> is the number of fields of <i>rtd</i> itself.)</p>
-<p>
-If <i>rtd</i> is an extension of another record type, and
-<i>parent-constructor-descriptor</i> or the <i>protocol</i> of
-<i>parent-constructor-descriptor</i> is <tt>#f</tt>, <i>protocol</i> must
-also be <tt>#f</tt>, and a default constructor descriptor as
-described above is also assumed.</p>
-<p>
-<em>Implementation responsibilities: </em>If <i>protocol</i> is a procedure, the implementation must
-check the restrictions on it to the extent performed by applying it as
-described when the constructor is called.
-An
-implementation may check whether <i>protocol</i> is an appropriate argument
-before applying it.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;rtd1<br>
-&nbsp;&nbsp;(make-record-type-descriptor<br>
-&nbsp;&nbsp;&nbsp;&#8217;rtd1&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt><br>
-&nbsp;&nbsp;&nbsp;&#8217;<tt>#</tt>((immutable&nbsp;x1)&nbsp;(immutable&nbsp;x2))))<br>
-<br>
-(define&nbsp;rtd2<br>
-&nbsp;&nbsp;(make-record-type-descriptor<br>
-&nbsp;&nbsp;&nbsp;&#8217;rtd2&nbsp;rtd1&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt><br>
-&nbsp;&nbsp;&nbsp;&#8217;<tt>#</tt>((immutable&nbsp;x3)&nbsp;(immutable&nbsp;x4))))<br>
-<br>
-(define&nbsp;rtd3<br>
-&nbsp;&nbsp;(make-record-type-descriptor<br>
-&nbsp;&nbsp;&nbsp;&#8217;rtd3&nbsp;rtd2&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt><br>
-&nbsp;&nbsp;&nbsp;&#8217;<tt>#</tt>((immutable&nbsp;x5)&nbsp;(immutable&nbsp;x6))))<br>
-<br>
-(define&nbsp;protocol1<br>
-&nbsp;&nbsp;(lambda&nbsp;(p)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(a&nbsp;b&nbsp;c)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(p&nbsp;(+&nbsp;a&nbsp;b)&nbsp;(+&nbsp;b&nbsp;c)))))<br>
-<br>
-(define&nbsp;protocol2<br>
-&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(a&nbsp;b&nbsp;c&nbsp;d&nbsp;e&nbsp;f)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((p&nbsp;(n&nbsp;a&nbsp;b&nbsp;c)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(p&nbsp;(+&nbsp;d&nbsp;e)&nbsp;(+&nbsp;e&nbsp;f))))))<br>
-<br>
-(define&nbsp;protocol3<br>
-&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(a&nbsp;b&nbsp;c&nbsp;d&nbsp;e&nbsp;f&nbsp;g&nbsp;h&nbsp;i)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((p&nbsp;(n&nbsp;a&nbsp;b&nbsp;c&nbsp;d&nbsp;e&nbsp;f)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(p&nbsp;(+&nbsp;g&nbsp;h)&nbsp;(+&nbsp;h&nbsp;i))))))<br>
-<br>
-(define&nbsp;cd1<br>
-&nbsp;&nbsp;(make-record-constructor-descriptor<br>
-&nbsp;&nbsp;&nbsp;&nbsp;rtd1&nbsp;<tt>#f</tt>&nbsp;protocol1))<br>
-<br>
-(define&nbsp;cd2<br>
-&nbsp;&nbsp;(make-record-constructor-descriptor<br>
-&nbsp;&nbsp;&nbsp;&nbsp;rtd2&nbsp;cd1&nbsp;protocol2))<br>
-<br>
-(define&nbsp;cd3<br>
-&nbsp;&nbsp;(make-record-constructor-descriptor<br>
-&nbsp;&nbsp;&nbsp;&nbsp;rtd3&nbsp;cd2&nbsp;protocol3))<br>
-<br>
-(define&nbsp;make-rtd1&nbsp;(record-constructor&nbsp;cd1))<br>
-<br>
-(define&nbsp;make-rtd2&nbsp;(record-constructor&nbsp;cd2))<br>
-<br>
-(define&nbsp;make-rtd3&nbsp;(record-constructor&nbsp;cd3))<br>
-<br>
-(make-rtd3&nbsp;1&nbsp;2&nbsp;3&nbsp;4&nbsp;5&nbsp;6&nbsp;7&nbsp;8&nbsp;9)<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;<br>
-&nbsp;&nbsp;&lang;record&nbsp;with&nbsp;fields&nbsp;initialized&nbsp;to&nbsp;3,&nbsp;5,&nbsp;9,&nbsp;11,&nbsp;15,&nbsp;17&rang;<br>
-<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_332"></a>record-constructor<i> constructor-descriptor</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Calls the <i>protocol</i> of <i>constructor-descriptor</i> (as described for
-<tt>make-record-constructor-descriptor</tt>) and returns the resulting
-constructor <i>constructor</i> for records of the record type
-associated with <i>constructor-descriptor</i>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_334"></a>record-predicate<i> rtd</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a procedure that, given an object <i>obj</i>, returns
-<tt>#t</tt>
-if <i>obj</i> is a record of the type represented by
-<i>rtd</i>, and <tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_336"></a>record-accessor<i> rtd k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i> must be a valid field index of <i>rtd</i>.  The <tt>record-accessor</tt> procedure returns a one-argument procedure whose
-argument must be a record of the type represented by <i>rtd</i>.  This
-procedure returns the value of the selected field of that record.</p>
-<p>
-The field selected corresponds to the <i>k</i>th element
-(0-based) of the <i>fields</i> argument to the invocation of <tt>make-record-type-descriptor</tt> that created <i>rtd</i>. Note that
-<i>k</i> cannot be used to specify a field of any type <i>rtd</i> extends.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_338"></a>record-mutator<i> rtd k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i> must be a valid field index of <i>rtd</i>.  The <tt>record-mutator</tt> procedure returns a two-argument procedure whose
-arguments must be a record record <i>r</i> of the type represented by
-<i>rtd</i> and an object <i>obj</i>.  This procedure stores <i>obj</i>
-within the field of <i>r</i> specified by <i>k</i>. The <i>k</i> argument
-is as in <tt>record-accessor</tt>. If <i>k</i> specifies an immutable
-field, an exception with condition type <tt>&amp;assertion</tt> is raised.
-The mutator returns unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-
-<tt>(define&nbsp;:point<br>
-&nbsp;&nbsp;(make-record-type-descriptor<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&#8217;point&nbsp;<tt>#f</tt><br>
-&nbsp;&nbsp;&nbsp;&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&#8217;<tt>#</tt>((mutable&nbsp;x)&nbsp;(mutable&nbsp;y))))<br>
-<br>
-(define&nbsp;:point-cd<br>
-&nbsp;&nbsp;(make-record-constructor-descriptor&nbsp;:point&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>))<br>
-<br>
-(define&nbsp;make-point&nbsp;(record-constructor&nbsp;:point-cd))<br>
-<br>
-(define&nbsp;point?&nbsp;(record-predicate&nbsp;:point))<br>
-(define&nbsp;point-x&nbsp;(record-accessor&nbsp;:point&nbsp;0))<br>
-(define&nbsp;point-y&nbsp;(record-accessor&nbsp;:point&nbsp;1))<br>
-(define&nbsp;point-x-set!&nbsp;(record-mutator&nbsp;:point&nbsp;0))<br>
-(define&nbsp;point-y-set!&nbsp;(record-mutator&nbsp;:point&nbsp;1))<br>
-<br>
-(define&nbsp;p1&nbsp;(make-point&nbsp;1&nbsp;2))<br>
-(point?&nbsp;p1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(point-x&nbsp;p1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1<br>
-(point-y&nbsp;p1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;2<br>
-(point-x-set!&nbsp;p1&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<em>unspecified</em><br>
-(point-x&nbsp;p1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;5<br>
-<br>
-(define&nbsp;:point2<br>
-&nbsp;&nbsp;(make-record-type-descriptor<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&#8217;point2&nbsp;:point&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>&nbsp;&#8217;<tt>#</tt>((mutable&nbsp;x)&nbsp;(mutable&nbsp;y))))<br>
-<br>
-(define&nbsp;make-point2<br>
-&nbsp;&nbsp;(record-constructor<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(make-record-constructor-descriptor&nbsp;:point2<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>)))<br>
-(define&nbsp;point2?&nbsp;(record-predicate&nbsp;:point2))<br>
-(define&nbsp;point2-xx&nbsp;(record-accessor&nbsp;:point2&nbsp;0))<br>
-(define&nbsp;point2-yy&nbsp;(record-accessor&nbsp;:point2&nbsp;1))<br>
-<br>
-(define&nbsp;p2&nbsp;(make-point2&nbsp;1&nbsp;2&nbsp;3&nbsp;4))<br>
-(point?&nbsp;p2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(point-x&nbsp;p2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1<br>
-(point-y&nbsp;p2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;2<br>
-(point2-xx&nbsp;p2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;3<br>
-(point2-yy&nbsp;p2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;4<br>
-<br>
-(define&nbsp;:point-cd/abs<br>
-&nbsp;&nbsp;(make-record-constructor-descriptor<br>
-&nbsp;&nbsp;&nbsp;:point&nbsp;<tt>#f</tt><br>
-&nbsp;&nbsp;&nbsp;(lambda&nbsp;(new)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(new&nbsp;(abs&nbsp;x)&nbsp;(abs&nbsp;y))))))<br>
-<br>
-(define&nbsp;make-point/abs<br>
-&nbsp;&nbsp;(record-constructor&nbsp;:point-cd/abs))<br>
-<br>
-(point-x&nbsp;(make-point/abs&nbsp;-1&nbsp;-2)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1<br>
-(point-y&nbsp;(make-point/abs&nbsp;-1&nbsp;-2)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;2<br>
-<br>
-(define&nbsp;:cpoint<br>
-&nbsp;&nbsp;(make-record-type-descriptor<br>
-&nbsp;&nbsp;&nbsp;&#8217;cpoint&nbsp;:point<br>
-&nbsp;&nbsp;&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt><br>
-&nbsp;&nbsp;&nbsp;&#8217;<tt>#</tt>((mutable&nbsp;rgb))))<br>
-<br>
-(define&nbsp;make-cpoint<br>
-&nbsp;&nbsp;(record-constructor<br>
-&nbsp;&nbsp;&nbsp;(make-record-constructor-descriptor<br>
-&nbsp;&nbsp;&nbsp;&nbsp;:cpoint&nbsp;:point-cd<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(p)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;y&nbsp;c)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((p&nbsp;x&nbsp;y)&nbsp;(color-&gt;rgb&nbsp;c)))))))<br>
-<br>
-(define&nbsp;make-cpoint/abs<br>
-&nbsp;&nbsp;(record-constructor<br>
-&nbsp;&nbsp;&nbsp;(make-record-constructor-descriptor<br>
-&nbsp;&nbsp;&nbsp;&nbsp;:cpoint&nbsp;:point-cd/abs<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(p)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;y&nbsp;c)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((p&nbsp;x&nbsp;y)&nbsp;(color-&gt;rgb&nbsp;c)))))))<br>
-<br>
-(define&nbsp;cpoint-rgb<br>
-&nbsp;&nbsp;(record-accessor&nbsp;:cpoint&nbsp;0))<br>
-<br>
-(define&nbsp;(color-&gt;rgb&nbsp;c)<br>
-&nbsp;&nbsp;(cons&nbsp;&#8217;rgb&nbsp;c))<br>
-<br>
-(cpoint-rgb&nbsp;(make-cpoint&nbsp;-1&nbsp;-3&nbsp;&#8217;red)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(rgb&nbsp;.&nbsp;red)<br>
-(point-x&nbsp;(make-cpoint&nbsp;-1&nbsp;-3&nbsp;&#8217;red))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-1<br>
-(point-x&nbsp;(make-cpoint/abs&nbsp;-1&nbsp;-3&nbsp;&#8217;red))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1<p></tt></p>
-<p>
-</p>
-<a name="node_sec_6.4"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_6.4">6.4&nbsp;&nbsp;Inspection</a></h2>
-<p></p>
-<p>
-The <tt>(rnrs records inspection (6))</tt><a name="node_idx_340"></a>library
-provides procedures for inspecting records and their
-record-type descriptors. These procedures are designed to allow the
-writing of portable printers and inspectors.</p>
-<p>
-On the one hand, <tt>record?</tt> and <tt>record-rtd</tt> treat records of opaque
-record types as if they were not records. On the other hand, the
-inspection procedures that operate on record-type descriptors
-themselves are not affected by opacity. In other words, opacity
-controls whether a program can obtain an rtd from a record. If the
-program has access to the original rtd via <tt>make-record-type-descriptor</tt> or <tt>record-type-descriptor</tt>, it can
-still make use of the inspection procedures.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_342"></a>record?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a record, and its record type is
-not opaque, and returns <tt>#f</tt> otherwise.  
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_344"></a>record-rtd<i> record</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the rtd representing the type of <i>record</i> if the type is not
-opaque. The rtd of the most precise type is returned; that is, the
-type <i>t</i> such that <i>record</i> is of type <i>t</i> but not of any
-type that extends <i>t</i>.  If the type is opaque, an exception is
-raised with condition type <tt>&amp;assertion</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_346"></a>record-type-name<i> rtd</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the name of the record-type descriptor <i>rtd</i>.
-</p>
-<p>   </p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_348"></a>record-type-parent<i> rtd</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the parent of the record-type descriptor <i>rtd</i>, or
-<tt>#f</tt> if it has none.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_350"></a>record-type-uid<i> rtd</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the uid of the record-type descriptor rtd, or <tt>#f</tt> if it has none.
-(An implementation may assign a generated uid to a record type even if the
-type is generative, so the return of a uid does not necessarily imply that
-the type is nongenerative.)
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_352"></a>record-type-generative?<i> rtd</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>rtd</i> is generative, and <tt>#f</tt> if not.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_354"></a>record-type-sealed?<i> rtd</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if the record-type descriptor is
-sealed, and <tt>#f</tt> if not.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_356"></a>record-type-opaque?<i> rtd</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if the the record-type descriptor is
-opaque, and <tt>#f</tt> if not.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_358"></a>record-type-field-names<i> rtd</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a vector of symbols naming the fields of the type represented by <i>rtd</i>
-(not including the fields of parent types) where the fields are ordered as
-described under <tt>make-record-type-descriptor</tt>.  The returned
-vector may be immutable.
-If the returned vector is modified, the effect on 
-<i>rtd</i> is unspecified.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_360"></a>record-field-mutable?<i> rtd k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if the field specified by
-<i>k</i> of the type represented by <i>rtd</i> is mutable, and
-<tt>#f</tt> if not.  <i>K</i> is as in <tt>record-accessor</tt>.
-</p>
-<p></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-6.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-8.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-8.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-8.html
deleted file mode 100644
index 7a49d343f9..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-8.html
+++ /dev/null
@@ -1,804 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-7.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-9.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_7"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_7">Chapter 7</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_7">Exceptions and conditions</a></h1>
-<p></p>
-<p>
-Scheme allows programs to deal with exceptional situations using two
-cooperating facilities: The exception system for raising and handling
-exceptional situations, and the condition system for describing these
-situations.</p>
-<p>
-The exception system allows the program, when it detects an
-exceptional situation, to pass control to an exception handler, and
-to dynamically establish such exception handlers.  Exception
-handlers are always invoked with an object describing the exceptional
-situation.  Scheme&#8217;s condition system provides a standardized taxonomy
-of such descriptive objects, as well as a facility for extending the
-taxonomy.</p>
-<p>
-</p>
-<a name="node_sec_7.1"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_7.1">7.1&nbsp;&nbsp;Exceptions</a></h2>
-<p>
-<a name="node_idx_362"></a></p>
-<p>
-This section describes Scheme&#8217;s exception-handling and
-exception-raising constructs provided by the <tt>(rnrs exceptions (6))</tt><a name="node_idx_364"></a>library.</p>
-<p>
-Exception handlers are one-argument procedures that determine the
-action the program takes when an exceptional situation is signalled.
-The system implicitly maintains a current exception handler.</p>
-<p>
-<a name="node_idx_366"></a>The program raises an exception
-by invoking the current exception handler, passing it an object
-encapsulating information about the exception. Any procedure accepting
-one argument may serve as an exception handler and any object may be
-used to represent an exception.</p>
-<p>
-The system maintains the current exception handler as part of the
-dynamic environment of the program; see report
-section&nbsp;on &#8220;Dynamic extent and
-dynamic environment&#8221;.</p>
-<p>
-When a program begins its execution, the current
-exception handler is expected to handle all <tt>&amp;serious</tt>
-conditions by interrupting execution, reporting that an
-exception has been raised, and displaying information
-about the condition object that was provided.  The handler
-may then exit, or may provide a choice of other options.
-Moreover, the exception handler is expected to return when
-passed any other non-<tt>&amp;serious</tt> condition.
-Interpretation of these expectations necessarily depends
-upon the nature of the system in which programs are executed,
-but the intent is that users perceive the raising of an
-exception as a controlled escape from the situation that
-raised the exception, not as a crash.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_368"></a>with-exception-handler<i> <i>handler</i> <i>thunk</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Handler</i> must be a procedure and should accept one argument.
-<i>Thunk</i> must be a procedure that accepts zero arguments.  The <tt>with-exception-handler</tt> procedure returns the results of invoking
-<i>thunk</i>.  <i>Handler</i> is installed as the current
-exception handler for the dynamic extent (as determined by <tt>dynamic-wind</tt>) of the invocation of <i>thunk</i>.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the restrictions on
-<i>handler</i> to the extent performed by applying it as described
-when it is called as a result of a call to <tt>raise</tt> or <tt>raise-continuable</tt>.
-An
-implementation may check whether <i>handler</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(guard (&lt;variable&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<tt>&nbsp;&nbsp;&nbsp;&lt;cond&nbsp;clause<sub>1</sub>&gt;&nbsp;&lt;cond&nbsp;clause<sub>2</sub>&gt;&nbsp;<tt>...</tt>)<br>
-
-&nbsp;&nbsp;&nbsp;&lt;body&gt;)</tt><br>
-<div align=left><tt>=&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<div align=left><tt>else</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_370"></a><a name="node_idx_372"></a><a name="node_idx_374"></a><p>
-<em>Syntax: </em>Each &lt;cond clause&gt; is as in the specification of <tt>cond</tt>.
-(See report section&nbsp;on &#8220;Derived conditionals&#8221;.)
-<tt>>^</tt> and <tt>else</tt> are the same as in the <tt>(rnrs base (6))</tt> library.</p>
-<p>
-<em>Semantics: </em>Evaluating a <tt>guard</tt> form evaluates &lt;body&gt; with an exception
-handler that binds the raised object to &lt;variable&gt; and within the scope of
-that binding evaluates the clauses as if they were the clauses of a
-<tt>cond</tt> expression. That implicit <tt>cond</tt> expression is evaluated with the
-continuation and dynamic environment of the <tt>guard</tt> expression. If every
-&lt;cond clause&gt;&#8217;s &lt;test&gt; evaluates to <tt>#f</tt> and there
-is no <tt>else</tt> clause, then
-<tt>raise</tt> is re-invoked on the raised object within the dynamic
-environment of the original call to <tt>raise</tt> except that the current
-exception handler is that of the <tt>guard</tt> expression.  </p>
-<p>
-The final expression in a &lt;cond&gt; clause is in a tail context if
-the <tt>guard</tt> expression itself is.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_376"></a>raise<i> <i>obj</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Raises a non-continuable exception by invoking the current exception
-handler on <i>obj</i>. The handler is called with a continuation whose
-dynamic environment is that of the call to <tt>raise</tt>, except that
-the current exception handler is the one that was in place when the handler being
-called was installed.  When the handler returns, a non-continuable
-exception with condition type <tt>&amp;non-continuable</tt> is raised in the
-same dynamic environment as the handler.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_378"></a>raise-continuable<i> <i>obj</i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Raises a <a name="node_idx_380"></a><em>continuable exception</em> by invoking the current exception
-handler on <i>obj</i>. The handler is called with a continuation that
-is equivalent to the continuation of the call to <tt>raise-continuable</tt>, with these two exceptions: (1) the current
-exception handler is the one that was in place 
-when the handler being called was installed, and
-(2) if the handler being called returns, then it will again become the
-current exception handler.  If the handler returns, the values it
-returns become the values returned by the call to
-<tt>raise-continuable</tt>.
-</p>
-<p></p>
-<p>
-</p>
-
-<tt>(guard&nbsp;(con<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((error?&nbsp;con)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(message-condition?&nbsp;con)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;(condition-message&nbsp;con))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;&quot;an&nbsp;error&nbsp;has&nbsp;occurred&quot;))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;error)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((violation?&nbsp;con)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(message-condition?&nbsp;con)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;(condition-message&nbsp;con))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;&quot;the&nbsp;program&nbsp;has&nbsp;a&nbsp;bug&quot;))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;violation))<br>
-&nbsp;&nbsp;(raise<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(condition<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-error)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-message-condition&nbsp;&quot;I&nbsp;am&nbsp;an&nbsp;error&quot;))))<br>
-&nbsp;&nbsp;&nbsp;<i>&nbsp;prints:</i>&nbsp;I&nbsp;am&nbsp;an&nbsp;error<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;error<br>
-<br>
-(guard&nbsp;(con<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((error?&nbsp;con)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(message-condition?&nbsp;con)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;(condition-message&nbsp;con))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;&quot;an&nbsp;error&nbsp;has&nbsp;occurred&quot;))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;error))<br>
-&nbsp;&nbsp;(raise<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(condition<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-violation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-message-condition&nbsp;&quot;I&nbsp;am&nbsp;an&nbsp;error&quot;))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>&nbsp;&amp;violation</tt>&nbsp;<i>exception</i><br>
-<br>
-(guard&nbsp;(con<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((error?&nbsp;con)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;&quot;error&nbsp;opening&nbsp;file&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#f</tt>))<br>
-&nbsp;&nbsp;(call-with-input-file&nbsp;&quot;foo.scm&quot;&nbsp;read))<br>
-&nbsp;&nbsp;&nbsp;<i>&nbsp;prints:</i>&nbsp;error&nbsp;opening&nbsp;file<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-<br>
-(with-exception-handler<br>
-&nbsp;&nbsp;(lambda&nbsp;(con)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(cond<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((not&nbsp;(warning?&nbsp;con))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(raise&nbsp;con))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((message-condition?&nbsp;con)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;(condition-message&nbsp;con)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;&quot;a&nbsp;warning&nbsp;has&nbsp;been&nbsp;issued&quot;)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;42)<br>
-&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;(raise-continuable<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(condition<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-warning)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-message-condition<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&quot;should&nbsp;be&nbsp;a&nbsp;number&quot;)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;23)))<br>
-&nbsp;&nbsp;&nbsp;<i>&nbsp;prints:</i>&nbsp;should&nbsp;be&nbsp;a&nbsp;number<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65<br>
-<p></tt></p>
-<p>
-</p>
-<a name="node_sec_7.2"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_7.2">7.2&nbsp;&nbsp;Conditions</a></h2>
-<p></p>
-<p>
-The section describes Scheme&#8217;s <tt>(rnrs conditions (6))</tt><a name="node_idx_382"></a>library 
-for creating and inspecting
-condition types and values. A condition value encapsulates information
-about an exceptional situation<a name="node_idx_384"></a>.
-Scheme also defines a
-number of basic condition types.</p>
-<p>
-Scheme conditions provides two mechanisms to enable communication
-about an exceptional situation: subtyping among condition types allows
-handling code to determine the general nature of an exception even
-though it does not anticipate its exact nature, and compound
-conditions allow an exceptional situation to be described in multiple
-ways.</p>
-<p>
-</p>
-<a name="node_sec_7.2.1"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_7.2.1">7.2.1&nbsp;&nbsp;Condition objects</a></h3>
-<p>Conceptually, there are two different kinds of condition objects:
-<i>simple conditions</i><a name="node_idx_386"></a>and
-<i>compound conditions</i><a name="node_idx_388"></a>.  An object
-that is either a simple condition or a compound condition is 
-simply a <a name="node_idx_390"></a><em>condition</em>.  Compound conditions form a type disjoint
-from the base types described in report
-section&nbsp;on &#8220;Base types&#8221;.  A simple condition
-describes a single aspect of an exceptional situation.  A compound
-condition represents multiple aspects of an exceptional situation as a
-list of simple conditions, its <i>components</i>.  Most of the
-operations described in this section treat a simple condition
-identically to a compound condition with itself as its own sole component.  For a
-subtype <i>t</i> of <tt>&amp;condition</tt>, a <i>condition of type
-<i>t</i></i> is either a record of type <i>t</i> or a compound condition
-containing a component of type <i>t</i>.</p>
-<p>
-</p>
-<p><a name="node_idx_392"></a></p>
-<div align=left><tt><tt>&amp;condition</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-<p>
-Simple conditions are records of subtypes of the <tt>&amp;condition</tt>
-record type.  The <tt>&amp;condition</tt> type has no fields and is neither sealed nor opaque.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_394"></a>condition<i> <i>condition<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>condition</tt>
-procedure returns a condition object with the components of the
-<i>condition</i>s as its components, in the same order, i.e., with the
-components of <i>condition<sub>1</sub></i> appearing first in the same order as in
-<i>condition<sub>1</sub></i>, then with the components of <i>condition<sub>2</sub></i>, and so on.  The
-returned condition is compound if the total number of components is
-zero or greater than one.  Otherwise, it may be compound or simple.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_396"></a>simple-conditions<i> condition</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>simple-conditions</tt>
-procedure returns a list of the components of <i>condition</i>, in the same
-order as they appeared in the construction of <i>condition</i>.  The
-returned list is immutable.  If the returned list is modified, the
-effect on <i>condition</i> is unspecified.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Because <tt>condition</tt> decomposes its arguments into simple
-conditions, <tt>simple-conditions</tt> always returns a &#8220;flattened&#8221;
-list of simple conditions.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_398"></a>condition?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a (simple or compound) condition,
-otherwise returns <tt>#f</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_400"></a>condition-predicate<i> rtd</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Rtd</i> must be a record-type descriptor of a subtype of
-<tt>&amp;condition</tt>.  The <tt>condition-predicate</tt> procedure returns
-a procedure that takes one argument.  This procedure returns
-<tt>#t</tt> if its argument is a condition of the condition type
-represented by <i>rtd</i>, i.e., if it is either a simple condition of
-that record type (or one of its subtypes) or a compound conditition
-with such a simple condition as one of its components, and <tt>#f</tt>
-otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_402"></a>condition-accessor<i> rtd proc</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Rtd</i> must be a record-type descriptor of a subtype of
-<tt>&amp;condition</tt>.  <i>Proc</i> should accept
-one argument, a record of the record type of <i>rtd</i>.  The <tt>condition-accessor</tt> procedure returns a procedure that accepts a
-single argument, which must be a condition of the type represented by
-<i>rtd</i>.  This procedure extracts the first component of the
-condition of the type represented by <i>rtd</i>, and returns the result
-of applying <i>proc</i> to that component.
-</p>
-<p></p>
-<p>
-</p>
-
-<tt>(define-record-type&nbsp;(&amp;cond1&nbsp;make-cond1&nbsp;real-cond1?)<br>
-&nbsp;&nbsp;(parent&nbsp;&amp;condition)<br>
-&nbsp;&nbsp;(fields<br>
-&nbsp;&nbsp;&nbsp;(immutable&nbsp;x&nbsp;real-cond1-x)))<br>
-<br>
-(define&nbsp;cond1?<br>
-&nbsp;&nbsp;(condition-predicate<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(record-type-descriptor&nbsp;&amp;cond1)))<br>
-(define&nbsp;cond1-x<br>
-&nbsp;&nbsp;(condition-accessor<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(record-type-descriptor&nbsp;&amp;cond1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;real-cond1-x))<br>
-<br>
-(define&nbsp;foo&nbsp;(make-cond1&nbsp;&#8217;foo))<br>
-<br>
-(condition?&nbsp;foo)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(cond1?&nbsp;foo)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(cond1-x&nbsp;foo)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;foo<br>
-<br>
-(define-record-type&nbsp;(&amp;cond2&nbsp;make-cond2&nbsp;real-cond2?)<br>
-&nbsp;&nbsp;(parent&nbsp;&amp;condition)<br>
-&nbsp;&nbsp;(fields<br>
-&nbsp;&nbsp;&nbsp;(immutable&nbsp;y&nbsp;real-cond2-y)))<br>
-<br>
-(define&nbsp;cond2?<br>
-&nbsp;&nbsp;(condition-predicate<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(record-type-descriptor&nbsp;&amp;cond2)))<br>
-(define&nbsp;cond2-y<br>
-&nbsp;&nbsp;(condition-accessor<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(record-type-descriptor&nbsp;&amp;cond2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;real-cond2-y))<br>
-<br>
-(define&nbsp;bar&nbsp;(make-cond2&nbsp;&#8217;bar))<br>
-<br>
-(condition?&nbsp;(condition&nbsp;foo&nbsp;bar))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(cond1?&nbsp;(condition&nbsp;foo&nbsp;bar))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(cond2?&nbsp;(condition&nbsp;foo&nbsp;bar))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(cond1?&nbsp;(condition&nbsp;foo))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(real-cond1?&nbsp;(condition&nbsp;foo))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>unspecified</i><br>
-(real-cond1?&nbsp;(condition&nbsp;foo&nbsp;bar))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(cond1-x&nbsp;(condition&nbsp;foo&nbsp;bar)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;foo<br>
-(cond2-y&nbsp;(condition&nbsp;foo&nbsp;bar)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;bar<br>
-&nbsp;<br>
-(equal?&nbsp;(simple-conditions&nbsp;(condition&nbsp;foo&nbsp;bar))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(list&nbsp;foo&nbsp;bar))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-<br>
-(equal?&nbsp;(simple-conditions<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(condition&nbsp;foo&nbsp;(condition&nbsp;bar)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(list&nbsp;foo&nbsp;bar))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(define-condition-type &lt;condition-type&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<tt><br>
-
-&lt;supertype&gt;<br>
-
-&lt;constructor&gt;&nbsp;&lt;predicate&gt;<br>
-
-&lt;field-spec<sub>1</sub>&gt;&nbsp;<tt>...</tt>)</tt>
-<a name="node_idx_404"></a><p>
-<em>Syntax: </em>&lt;Condition-type&gt;, &lt;supertypes&gt;,
-&lt;constructor&gt;, and &lt;predicate&gt; must all be identifiers.
-Each &lt;field-spec&gt; must be of the form
-</p>
-
-<tt>(&lt;field&gt;&nbsp;&lt;accessor&gt;)<p></tt>
-where both &lt;field&gt; and &lt;accessor&gt; must be identifiers.</p>
-<p>
-<em>Semantics: </em>The <tt>define-condition-type</tt> form expands into a record-type
-definition for a record type &lt;condition-type&gt; (see
-section&nbsp;<a href="r6rs-lib-Z-H-7.html#node_sec_6.2">6.2</a>).  The record type will be
-non-opaque, non-sealed, and its fields will be immutable.
-It will have &lt;supertype&gt; has its parent type.  The remaining
-identifiers will be bound as follows:
-</p>
-<p>
-</p>
-<ul><p>
-</p>
-<li><p>&lt;Constructor&gt; is bound to a default constructor for the
-type (see section&nbsp;<a href="r6rs-lib-Z-H-7.html#node_sec_6.3">6.3</a>): It accepts one
-argument for each of the record type&#8217;s complete set of fields
-(including parent types, with the fields of the parent coming before
-those of the extension in the arguments) and returns a condition
-object initialized to those arguments.</p>
-<p>
-</p>
-<li><p>&lt;Predicate&gt; is bound to a predicate that identifies
-conditions of type &lt;condition-type&gt; or any of its
-subtypes.</p>
-<p>
-</p>
-<li><p>Each &lt;accessor&gt; is bound to a procedure that extracts the
-corresponding field from a condition of type &lt;condition-type&gt;.
-</p>
-</ul><p>
-</p>
-<p></p>
-<p>
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;c&nbsp;&amp;condition<br>
-&nbsp;&nbsp;make-c&nbsp;c?<br>
-&nbsp;&nbsp;(x&nbsp;c-x))<br>
-<br>
-(define-condition-type&nbsp;&amp;c1&nbsp;&amp;c<br>
-&nbsp;&nbsp;make-c1&nbsp;c1?<br>
-&nbsp;&nbsp;(a&nbsp;c1-a))<br>
-<br>
-(define-condition-type&nbsp;&amp;c2&nbsp;&amp;c<br>
-&nbsp;&nbsp;make-c2&nbsp;c2?<br>
-&nbsp;&nbsp;(b&nbsp;c2-b))<p></tt></p>
-<p>
-</p>
-
-<tt>(define&nbsp;v1&nbsp;(make-c1&nbsp;&quot;V1&quot;&nbsp;&quot;a1&quot;))<br>
-<br>
-(c?&nbsp;v1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c1?&nbsp;v1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c2?&nbsp;v1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(c-x&nbsp;v1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;V1&quot;<br>
-(c1-a&nbsp;v1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;a1&quot;<p></tt></p>
-<p>
-</p>
-
-<tt>(define&nbsp;v2&nbsp;(make-c2&nbsp;&quot;V2&quot;&nbsp;&quot;b2&quot;))<br>
-<br>
-(c?&nbsp;v2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c1?&nbsp;v2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><br>
-(c2?&nbsp;v2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c-x&nbsp;v2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;V2&quot;<br>
-(c2-b&nbsp;v2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;b2&quot;<p></tt></p>
-<p>
-</p>
-
-<tt>(define&nbsp;v3&nbsp;(condition<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-c1&nbsp;&quot;V3/1&quot;&nbsp;&quot;a3&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-c2&nbsp;&quot;V3/2&quot;&nbsp;&quot;b3&quot;)))<br>
-<br>
-(c?&nbsp;v3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c1?&nbsp;v3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c2?&nbsp;v3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c-x&nbsp;v3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;V3/1&quot;<br>
-(c1-a&nbsp;v3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;a3&quot;<br>
-(c2-b&nbsp;v3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;b3&quot;<p></tt></p>
-<p>
-</p>
-
-<tt>(define&nbsp;v4&nbsp;(condition&nbsp;v1&nbsp;v2))<br>
-<br>
-(c?&nbsp;v4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c1?&nbsp;v4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c2?&nbsp;v4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c-x&nbsp;v4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;V1&quot;<br>
-(c1-a&nbsp;v4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;a1&quot;<br>
-(c2-b&nbsp;v4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;b2&quot;<p></tt></p>
-<p>
-</p>
-
-<tt>(define&nbsp;v5&nbsp;(condition&nbsp;v2&nbsp;v3))<br>
-<br>
-(c?&nbsp;v5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c1?&nbsp;v5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c2?&nbsp;v5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(c-x&nbsp;v5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;V2&quot;<br>
-(c1-a&nbsp;v5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;a3&quot;<br>
-(c2-b&nbsp;v5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&quot;b2&quot;<p></tt></p>
-<p>
-</p>
-<a name="node_sec_7.3"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_7.3">7.3&nbsp;&nbsp;Standard condition types</a></h2>
-<p></p>
-<a name="node_fig_Temp_2"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-
-
-<img src="r6rs-lib-Z-G-3.gif" border="0" alt="[r6rs-lib-Z-G-3.gif]">
-
-</td></tr>
-<tr><td align=left><b>Figure 1:</b>&nbsp;&nbsp;Hierarchy of standard condition types</td></tr>
-<tr><td>
-
-</td></tr></table></div><p></p>
-<p>
-</p>
-<p><a name="node_idx_406"></a></p>
-<div align=left><tt><tt>&amp;message</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_408"></a>make-message-condition<i> message</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_410"></a>message-condition?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_412"></a>condition-message<i> condition</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;message&nbsp;&amp;condition<br>
-&nbsp;&nbsp;make-message-condition&nbsp;message-condition?<br>
-&nbsp;&nbsp;(message&nbsp;condition-message))<p></tt>
-It carries a message further describing the nature of the condition to
-humans.  
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_414"></a></p>
-<div align=left><tt><tt>&amp;warning</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_416"></a>make-warning<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_418"></a>warning?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;warning&nbsp;&amp;condition<br>
-&nbsp;&nbsp;make-warning&nbsp;warning?)<p></tt>
-This type describes conditions that do not, in
-principle, prohibit immediate continued execution of the program, but
-may interfere with the program&#8217;s execution later.
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_420"></a></p>
-<div align=left><tt><tt>&amp;serious</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_422"></a>make-serious-condition<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_424"></a>serious-condition?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;serious&nbsp;&amp;condition<br>
-&nbsp;&nbsp;make-serious-condition&nbsp;serious-condition?)<p></tt></p>
-<p>
-This type describes conditions serious enough that they cannot safely
-be ignored. This condition type is primarily intended as a supertype
-of other condition types. 
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_426"></a></p>
-<div align=left><tt><tt>&amp;error</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_428"></a>make-error<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_430"></a>error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;error&nbsp;&amp;serious<br>
-&nbsp;&nbsp;make-error&nbsp;error?)<p></tt>
-This type describes errors, typically caused by something that
-has gone wrong in the interaction of the program with the external
-world or the user.
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_432"></a></p>
-<div align=left><tt><tt>&amp;violation</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_434"></a>make-violation<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_436"></a>violation?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;violation&nbsp;&amp;serious<br>
-&nbsp;&nbsp;make-violation&nbsp;violation?)<p></tt>
-This type describes violations of the language standard or a
-library standard, typically caused by a programming error.
-</p>
-<p>  </p>
-<p>
-</p>
-<p><a name="node_idx_438"></a></p>
-<div align=left><tt><tt>&amp;assertion</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_440"></a>make-assertion-violation<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_442"></a>assertion-violation?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;assertion&nbsp;&amp;violation<br>
-&nbsp;&nbsp;make-assertion-violation&nbsp;assertion-violation?)<p></tt>
-This type describes an invalid call to a procedure, either passing an
-invalid number of arguments, or passing an argument of the wrong type.
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_444"></a></p>
-<div align=left><tt><tt>&amp;irritants</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_446"></a>make-irritants-condition<i> irritants</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_448"></a>irritants-condition?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_450"></a>condition-irritants<i> condition</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;irritants&nbsp;&amp;condition<br>
-&nbsp;&nbsp;make-irritants-condition&nbsp;irritants-condition?<br>
-&nbsp;&nbsp;(irritants&nbsp;condition-irritants))<p></tt>
-<i>Irritants</i> should be a list of objects.  This
-condition provides additional information about a condition, typically
-the argument list of a procedure that detected an exception.
-Conditions of this type are created by the <tt>error</tt> and <tt>assertion-violation</tt> procedures of report
-section&nbsp;on &#8220;Errors and violations&#8221;.
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_452"></a></p>
-<div align=left><tt><tt>&amp;who</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_454"></a>make-who-condition<i> who</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_456"></a>who-condition?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_458"></a>condition-who<i> condition</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;who&nbsp;&amp;condition<br>
-&nbsp;&nbsp;make-who-condition&nbsp;who-condition?<br>
-&nbsp;&nbsp;(who&nbsp;condition-who))<p></tt>
-<i>Who</i> should be a symbol or string identifying the
-entity reporting the exception.
-Conditions of this type are created by the <tt>error</tt> and <tt>assertion-violation</tt> procedures (report
-section&nbsp;on &#8220;Errors and violations&#8221;), and
-the <tt>syntax-violation</tt> procedure
-(section&nbsp;on &#8220;Syntax violations&#8221;).
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_460"></a></p>
-<div align=left><tt><tt>&amp;non-continuable</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_462"></a>make-non-continuable-violation<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_464"></a>non-continuable-violation?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;non-continuable&nbsp;&amp;violation<br>
-&nbsp;&nbsp;make-non-continuable-violation<br>
-&nbsp;&nbsp;non-continuable-violation?)<p></tt>
-This type indicates that an exception handler invoked via
-<tt>raise</tt> has returned.
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_466"></a></p>
-<div align=left><tt><tt>&amp;implementation-restriction</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_468"></a>make-implementation-restriction-violation<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_470"></a>implementation-restriction-violation?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;implementation-restriction<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&amp;violation<br>
-&nbsp;&nbsp;make-implementation-restriction-violation<br>
-&nbsp;&nbsp;implementation-restriction-violation?)<p></tt>
-This type describes a violation of an implementation restriction
-allowed by the specification, such as the absence of representations
-for NaNs and infinities.  (See section&nbsp;<a href="r6rs-lib-Z-H-12.html#node_sec_11.3">11.3</a>.)
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_472"></a></p>
-<div align=left><tt><tt>&amp;lexical</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_474"></a>make-lexical-violation<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_476"></a>lexical-violation?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;lexical&nbsp;&amp;violation<br>
-&nbsp;&nbsp;make-lexical-violation&nbsp;lexical-violation?)<p></tt>
-This type describes syntax violations at the level of the datum syntax.
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_478"></a></p>
-<div align=left><tt><tt>&amp;syntax</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_480"></a>make-syntax-violation<i> form subform</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_482"></a>syntax-violation?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_484"></a>syntax-violation-form<i> condition</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_486"></a>syntax-violation-subform<i> condition</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;syntax&nbsp;&amp;violation<br>
-&nbsp;&nbsp;make-syntax-violation&nbsp;syntax-violation?<br>
-&nbsp;&nbsp;(form&nbsp;syntax-violation-form)<br>
-&nbsp;&nbsp;(subform&nbsp;syntax-violation-subform))<p></tt></p>
-<p>
-This type describes syntax violations.
-<i>Form</i> should be the erroneous syntax object or a
-datum representing the code of the erroneous form.  <i>Subform</i>
-should be an optional syntax object or
-datum within the erroneous form that more precisely locates the
-violation.  It can be <tt>#f</tt> to indicate the absence of more precise
-information.
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_488"></a></p>
-<div align=left><tt><tt>&amp;undefined</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_490"></a>make-undefined-violation<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_492"></a>undefined-violation?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;undefined&nbsp;&amp;violation<br>
-&nbsp;&nbsp;make-undefined-violation&nbsp;undefined-violation?)<p></tt>
-This type describes unbound identifiers in the program.
-</p>
-<p></p>
-<p>
-</p>
-<p>
-     </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-7.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-9.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-9.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-9.html
deleted file mode 100644
index c218ec5e1a..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-H-9.html
+++ /dev/null
@@ -1,2090 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-8.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-10.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_8"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_8">Chapter 8</a></div><br>
-<a href="r6rs-lib-Z-H-1.html#node_toc_node_chap_8">I/O</a></h1>
-<p></p>
-<p>
-This chapter describes Scheme&#8217;s libraries for performing input and output:</p>
-<p>
-</p>
-<ul>
-<li><p>The <tt>(rnrs io ports (6))</tt> library
-(section&nbsp;<a href="#node_sec_8.2">8.2</a>) is an I/O layer for conventional,
-imperative buffered input and output with text and binary
-data.
-</p>
-<li><p>The <tt>(rnrs io simple (6))</tt> library
-(section&nbsp;<a href="#node_sec_8.3">8.3</a>) is a convenience library atop the
-<tt>(rnrs io ports (6))</tt> library for textual I/O, compatible with 
-the traditional Scheme I/O procedures&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_8">8</a>].
-</p>
-</ul><p></p>
-<p>
-Section&nbsp;<a href="#node_sec_8.1">8.1</a> defines a condition-type hierarchy that
-is exported by both the <tt>(rnrs io ports (6))</tt> and
-<tt>(rnrs io simple (6))</tt> libraries.</p>
-<p>
-</p>
-<a name="node_sec_8.1"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.1">8.1&nbsp;&nbsp;Condition types</a></h2>
-<p></p>
-<p>
-The procedures described in this chapter, when they detect an
-exceptional situation that arises from an &#8220;I/O errors&#8221;, raise an
-exception with condition type <tt>&amp;i/o</tt>.</p>
-<p>
-The condition types and corresponding predicates and accessors are
-exported by both the <tt>(rnrs io ports (6))</tt> and <tt>(rnrs io
-simple (6))</tt> libraries.  They are also exported by the <tt>(rnrs files (6))</tt>
-library described in chapter&nbsp;<a href="r6rs-lib-Z-H-10.html#node_chap_9">9</a>.</p>
-<p>
-</p>
-<p><a name="node_idx_494"></a></p>
-<div align=left><tt><tt>&amp;i/o</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_496"></a>make-i/o-error<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_498"></a>i/o-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o&nbsp;&amp;error<br>
-&nbsp;&nbsp;make-i/o-error&nbsp;i/o-error?)<p></tt>        </p>
-<p>
-This is a supertype for a set of more specific I/O errors.
-</p>
-<p>   </p>
-<p>
-</p>
-<p><a name="node_idx_500"></a></p>
-<div align=left><tt><tt>&amp;i/o-read</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_502"></a>make-i/o-read-error<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_504"></a>i/o-read-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o-read&nbsp;&amp;i/o<br>
-&nbsp;&nbsp;make-i/o-read-error&nbsp;i/o-read-error?)<p></tt></p>
-<p>
-This condition type describes read errors that occurred during an I/O
-operation.
-</p>
-<p>   </p>
-<p>
-</p>
-<p><a name="node_idx_506"></a></p>
-<div align=left><tt><tt>&amp;i/o-write</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_508"></a>make-i/o-write-error<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_510"></a>i/o-write-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o-write&nbsp;&amp;i/o<br>
-&nbsp;&nbsp;make-i/o-write-error&nbsp;i/o-write-error?)<p></tt>
-This condition type describes write errors that occurred during an I/O
-operation.
-</p>
-<p>   </p>
-<p>
-</p>
-<p><a name="node_idx_512"></a></p>
-<div align=left><tt><tt>&amp;i/o-invalid-position</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_514"></a>make-i/o-invalid-position-error<i> position</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_516"></a>i/o-invalid-position-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_518"></a>i/o-error-position<i> condition</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o-invalid-position&nbsp;&amp;i/o<br>
-&nbsp;&nbsp;make-i/o-invalid-position-error<br>
-&nbsp;&nbsp;i/o-invalid-position-error?<br>
-&nbsp;&nbsp;(position&nbsp;i/o-error-position))<p></tt></p>
-<p>
-This condition type describes attempts to set the file position to an
-invalid position. <i>Position</i> should be the file position that
-the program intended to set. This condition describes a range error, but
-not an assertion violation.
-</p>
-<p>   </p>
-<p>
-</p>
-<p><a name="node_idx_520"></a></p>
-<div align=left><tt><tt>&amp;i/o-filename</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_522"></a>make-i/o-filename-error<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_524"></a>i/o-filename-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_526"></a>i/o-error-filename<i> condition</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o-filename&nbsp;&amp;i/o<br>
-&nbsp;&nbsp;make-i/o-filename-error&nbsp;i/o-filename-error?<br>
-&nbsp;&nbsp;(filename&nbsp;i/o-error-filename))<p></tt></p>
-<p>
-This condition type describes an I/O error that occurred during an
-operation on a named file.  <i>Filename</i> should be the name of the file.
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_528"></a></p>
-<div align=left><tt><tt>&amp;i/o-file-protection</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_530"></a>make-i/o-file-protection-error<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_532"></a>i/o-file-protection-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o-file-protection<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&amp;i/o-filename<br>
-&nbsp;&nbsp;make-i/o-file-protection-error<br>
-&nbsp;&nbsp;i/o-file-protection-error?)<p></tt></p>
-<p>
-A condition of this type specifies that an operation tried to operate on a
-named file with insufficient access rights.
-</p>
-<p>   </p>
-<p>
-</p>
-<p><a name="node_idx_534"></a></p>
-<div align=left><tt><tt>&amp;i/o-file-is-read-only</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_536"></a>make-i/o-file-is-read-only-error<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_538"></a>i/o-file-is-read-only-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o-file-is-read-only<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&amp;i/o-file-protection<br>
-&nbsp;&nbsp;make-i/o-file-is-read-only-error<br>
-&nbsp;&nbsp;i/o-file-is-read-only-error?)<p></tt></p>
-<p>
-A condition of this type specifies that an operation tried to operate on a
-named read-only file under the assumption that it is writeable.
-</p>
-<p>   </p>
-<p>
-</p>
-<p><a name="node_idx_540"></a></p>
-<div align=left><tt><tt>&amp;i/o-file-already-exists</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_542"></a>make-i/o-file-already-exists-error<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_544"></a>i/o-file-already-exists-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o-file-already-exists<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&amp;i/o-filename<br>
-&nbsp;&nbsp;make-i/o-file-already-exists-error<br>
-&nbsp;&nbsp;i/o-file-already-exists-error?)<p></tt>
-A condition of this type specifies that an operation tried to operate on an
-existing named file under the assumption that it did not exist.
-</p>
-<p>   </p>
-<p>
-</p>
-<p><a name="node_idx_546"></a></p>
-<div align=left><tt><tt>&amp;i/o-file-does-not-exist</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_548"></a>make-i/o-file-does-not-exist-error<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_550"></a>i/o-file-does-not-exist-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o-file-does-not-exist<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&amp;i/o-filename<br>
-&nbsp;&nbsp;make-i/o-file-does-not-exist-error<br>
-&nbsp;&nbsp;i/o-file-does-not-exist-error?)<p></tt></p>
-<p>
-A condition of this type specifies that an operation tried to operate on an
-non-existent named file under the assumption that it existed.
-</p>
-<p>   </p>
-<p>
-</p>
-<p><a name="node_idx_552"></a></p>
-<div align=left><tt><tt>&amp;i/o-port</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_554"></a>make-i/o-port-error<i> port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_556"></a>i/o-port-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_558"></a>i/o-error-port<i> condition</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o-port&nbsp;&amp;i/o<br>
-&nbsp;&nbsp;make-i/o-port-error&nbsp;i/o-port-error?<br>
-&nbsp;&nbsp;(port&nbsp;i/o-error-port))<p></tt></p>
-<p>
-This condition type specifies the port with which an I/O
-error is associated. 
-<i>Port</i> should be the port.
-Conditions raised by procedures accepting a port as an argument should
-include an <tt>&amp;i/o-port-error</tt> condition.
-</p>
-<p></p>
-<p>
-
-</p>
-<a name="node_sec_8.2"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2">8.2&nbsp;&nbsp;Port I/O</a></h2>
-<p></p>
-<p>
-The <tt>(rnrs io ports (6))</tt><a name="node_idx_560"></a>library defines an I/O layer for
-conventional, imperative buffered input and output.
-A <a name="node_idx_562"></a><em>port</em> represents a buffered access object
-for a data sink or source or both simultaneously.
-The library allows ports to be created from arbitrary data sources
-and sinks.</p>
-<p>
-The <tt>(rnrs io ports (6))</tt> library distinguishes between <i>input
-ports<a name="node_idx_564"></a></i> and <i>output
-ports<a name="node_idx_566"></a></i>.  An input port is a source for data,
-whereas an output port is a sink for data.  A port may be both an
-input port and an output port; such a port typically provides
-simultaneous read and write access to a file or other data.</p>
-<p>
-The <tt>(rnrs io ports (6))</tt> library also distinguishes between
-<i>binary ports<a name="node_idx_568"></a></i>, which are sources
-or sinks for uninterpreted bytes, and
-<i>textual ports<a name="node_idx_570"></a></i>, which are sources
-or sinks for characters and strings.</p>
-<p>
-This section uses <i>input-port</i>, <i>output-port</i>,
-<i>binary-port</i>, <i>textual-port</i>,
-<i>binary-input-port</i>, <i>textual-input-port</i>,
-<i>binary-output-port</i>, <i>textual-output-port</i>,
-and <i>port</i> as
-parameter names for arguments that must be input ports (or combined
-input/output ports), output ports (or combined input/output ports),
-binary ports, textual ports, binary input ports, textual input ports,
-binary output ports, textual output ports, or any kind of port,
-respectively.</p>
-<p>
-</p>
-<a name="node_sec_8.2.1"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.1">8.2.1&nbsp;&nbsp;File names</a></h3>
-<p></p>
-<p>
-Some of the procedures described in this chapter accept a file name as an
-argument. Valid values for such a file name include strings that name a file
-using the native notation of filesystem paths on an implementation&#8217;s
-underlying operating system, and may include implementation-dependent
-values as well.</p>
-<p>
-A <i>filename</i> parameter name means that the
-corresponding argument must be a file name.</p>
-<p>
-</p>
-<a name="node_sec_8.2.2"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.2">8.2.2&nbsp;&nbsp;File options</a></h3>
-<p></p>
-<p>
-<a name="node_idx_572"></a>When opening a file, the various procedures in this library accept a
-<tt>file-options</tt> object that encapsulates flags to specify how
-the file is to be opened. A <tt>file-options</tt> object is an enum-set
-(see chapter&nbsp;<a href="r6rs-lib-Z-H-15.html#node_chap_14">14</a>) over the symbols constituting
-valid file options.
-A <i>file-options</i> parameter name means that the
-corresponding argument must be a file-options object.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_574"></a>file-options<i> &lt;file-options symbol&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-Each &lt;file-options symbol&gt; must be a symbol.
-The <tt>file-options</tt> syntax returns a file-options object that 
-encapsulates the
-specified options.</p>
-<p>
-When supplied to an operation that opens a file for output, the
-file-options object returned by <tt>(file-options)</tt> specifies that the
-file is created if it does not exist and an exception with condition type
-<tt>&amp;i/o-file-already-exists</tt> is raised if it does exist.
-The following standard options can be included to modify the default behavior.</p>
-<p>
-</p>
-<ul>   
-<li><p><tt>no-create</tt>
-If the file does not already exist, it is not created;
-instead, an exception with condition type <tt>&amp;i/o-file-does-not-exist</tt>
-is raised.
-If the file already exists, the exception with condition type
-<tt>&amp;i/o-file-already-exists</tt> is not raised
-and the file is truncated to zero length.
-</p>
-<li><p><tt>no-fail</tt>
-If the file already exists, the exception with condition type
-<tt>&amp;i/o-file-already-exists</tt> is not raised,
-even if <tt>no-create</tt> is not included,
-and the file is truncated to zero length.
-</p>
-<li><p><tt>no-truncate</tt>
-If the file already exists and the exception with condition type
-<tt>&amp;i/o-file-already-exists</tt> has been inhibited by inclusion of
-<tt>no-create</tt> or <tt>no-fail</tt>, the file is not truncated, but
-the port&#8217;s current position is still set to the beginning of the
-file.
-</p>
-</ul><p></p>
-<p>
-These options have no effect when a file is opened only for input.
-Symbols
-other than those listed above may be used as &lt;file-options symbol&gt;s;
-they have implementation-specific meaning, if any.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Only the name of &lt;file-options symbol&gt; is significant.
-</blockquote>
-<p>   </p>
-<p>
-</p>
-<a name="node_sec_8.2.3"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.3">8.2.3&nbsp;&nbsp;Buffer modes</a></h3>
-<p>Each port has an associated buffer mode.  For an output port, the
-buffer mode defines when an output operation flushes the buffer
-associated with the output port.  For an input port, the buffer mode
-defines how much data will be read to satisfy read operations.  The
-possible buffer modes are the symbols <tt>none</tt> for no buffering,
-<tt>line</tt> for flushing upon line endings and reading up to line
-endings, or other implementation-dependent behavior,
-and <tt>block</tt> for arbitrary buffering.  This section uses
-the parameter name <i>buffer-mode</i> for arguments that must be
-buffer-mode symbols.</p>
-<p>
-If two ports are connected to the same mutable source, both ports
-are unbuffered, and reading a byte or character from that shared
-source via one of the two ports would change the bytes or characters
-seen via the other port, a lookahead operation on one port will
-render the peeked byte or character inaccessible via the other port,
-while a subsequent read operation on the peeked port will see the
-peeked byte or character even though the port is otherwise unbuffered.</p>
-<p>
-In other words, the semantics of buffering is defined in terms of side
-effects on shared mutable sources, and a lookahead operation has the
-same side effect on the shared source as a read operation.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_576"></a>buffer-mode<i> &lt;buffer-mode symbol&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-&lt;Buffer-mode symbol&gt; must be a symbol whose name is one
-of <tt>none</tt>, <tt>line</tt>, and <tt>block</tt>. The result is the
-corresponding symbol, and specifies the associated buffer mode.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Only the name of &lt;buffer-mode symbol&gt; is significant.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_578"></a>buffer-mode?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if the argument is a valid buffer-mode symbol,
-and returns <tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_8.2.4"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.4">8.2.4&nbsp;&nbsp;Transcoders</a></h3>
-<p></p>
-<p>
-Several different Unicode encoding schemes describe standard ways to
-encode characters and strings as byte sequences and to decode those
-sequences&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_12">12</a>].
-Within this document, a <a name="node_idx_580"></a><em>codec</em> is an immutable Scheme
-object that represents a Unicode or similar encoding scheme.</p>
-<p>
-An <a name="node_idx_582"></a><em>end-of-line style</em> is a symbol that, if it is not <tt>none</tt>, describes how a textual port transcodes representations of
-line endings.</p>
-<p>
-A <a name="node_idx_584"></a><em>transcoder</em> is an immutable Scheme object that combines
-a codec with an end-of-line style and a method for handling
-decoding errors.
-Each transcoder represents some specific bidirectional (but not
-necessarily lossless), possibly stateful translation between byte
-sequences and Unicode characters and strings.
-Every transcoder can operate in the input direction (bytes to characters)
-or in the output direction (characters to bytes). 
-A <i>transcoder</i> parameter name means that the corresponding
-argument must be a transcoder.</p>
-<p>
-A <a name="node_idx_586"></a><em>binary port</em> is a port that supports binary I/O, does not
-have an associated transcoder and does not support textual I/O.  A
-<a name="node_idx_588"></a><em>textual port</em> is a port that supports textual I/O, and does
-not support binary I/O.  A textual port may or may not have an
-associated transcoder.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_590"></a>latin-1-codec<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_592"></a>utf-8-codec<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_594"></a>utf-16-codec<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These are predefined codecs for the ISO 8859-1, UTF-8,
-and UTF-16 encoding schemes [<a href="r6rs-lib-Z-H-21.html#node_bib_12">12</a>].</p>
-<p>
-A call to any of these procedures returns a value that is equal in the
-sense of <tt>eqv?</tt> to the result of any other call to the same
-procedure.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_596"></a>eol-style<i> &lt;eol-style symbol&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-&lt;Eol-style symbol&gt; should be a symbol whose name is one
-of <tt>lf</tt>, <tt>cr</tt>, <tt>crlf</tt>, <tt>nel</tt>,
-<tt>crnel</tt>, <tt>ls</tt>, and <tt>none</tt>.  The form evaluates to the
-corresponding symbol.  If the name of <i>eol-style symbol</i> is not
-one of these symbols, the effect and result are
-implementation-dependent; in particular, the result may be an
-eol-style symbol acceptable as an <i>eol-style</i> argument to <tt>make-transcoder</tt>.  Otherwise, an exception is raised.</p>
-<p>
-All eol-style symbols except <tt>none</tt> describe a specific
-line-ending encoding:</p>
-<p>
-</p>
-
-<p class=noindent></p>
-<table border=0><tr><td valign=top ><tt>lf</tt> </td><td valign=top >&lt;linefeed&gt;</td></tr>
-<tr><td valign=top ><tt>cr</tt> </td><td valign=top >&lt;carriage return&gt;</td></tr>
-<tr><td valign=top ><tt>crlf</tt> </td><td valign=top >&lt;carriage return&gt; &lt;linefeed&gt;</td></tr>
-<tr><td valign=top ><tt>nel</tt> </td><td valign=top >&lt;next line&gt;</td></tr>
-<tr><td valign=top ><tt>crnel</tt> </td><td valign=top >&lt;carriage return&gt; &lt;next line&gt;</td></tr>
-<tr><td valign=top ><tt>ls</tt> </td><td valign=top >&lt;line separator&gt;
-</td></tr></table><p>
-For a textual port with a transcoder, and whose transcoder has an eol-style symbol <tt>none</tt>, no conversion occurs.  For a textual input port, any
-eol-style symbol other than <tt>none</tt> means that all of the above
-line-ending encodings are recognized and are translated into a single
-linefeed.  For a textual output port, <tt>none</tt> and <tt>lf</tt> are
-equivalent.  Linefeed characters are encoded according to the
-specified eol-style symbol, and all other characters that participate
-in possible line endings are encoded as is.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Only the name of &lt;eol-style symbol&gt; is significant.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_598"></a>native-eol-style<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the default end-of-line style of the underlying platform, e.g.,
-<tt>lf</tt> on Unix and <tt>crlf</tt> on Windows.
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_600"></a></p>
-<div align=left><tt><tt>&amp;i/o-decoding</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_602"></a>make-i/o-decoding-error<i> port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_604"></a>i/o-decoding-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o-decoding&nbsp;&amp;i/o-port<br>
-&nbsp;&nbsp;make-i/o-decoding-error&nbsp;i/o-decoding-error?)<p></tt></p>
-<p>
-An exception with this type is raised when one of the operations for
-textual input from a port encounters a sequence of bytes that cannot
-be translated into a character or string by the input direction of the
-port&#8217;s transcoder.</p>
-<p>
-When such an exception is raised, the port&#8217;s position is past
-the invalid encoding.
-</p>
-<p></p>
-<p>
-</p>
-<p><a name="node_idx_606"></a></p>
-<div align=left><tt><tt>&amp;i/o-encoding</tt></tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_608"></a>make-i/o-encoding-error<i> port char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_610"></a>i/o-encoding-error?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_612"></a>i/o-encoding-error-char<i> condition</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This condition type could be defined by
-</p>
-
-<tt>(define-condition-type&nbsp;&amp;i/o-encoding&nbsp;&amp;i/o-port<br>
-&nbsp;&nbsp;make-i/o-encoding-error&nbsp;i/o-encoding-error?<br>
-&nbsp;&nbsp;(char&nbsp;i/o-encoding-error-char))<p></tt></p>
-<p>
-An exception with this type is raised when one of the operations for
-textual output to a port encounters a character that cannot be
-translated into bytes by the output direction of the port&#8217;s transcoder.
-<i>Char</i> is the character that could not be encoded.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_614"></a>error-handling-mode<i> &lt;error-handling-mode symbol&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-&lt;Error-handling-mode symbol&gt; should be a symbol whose
-name is one of <tt>ignore</tt>, <tt>raise</tt>, and <tt>replace</tt>. The
-form evaluates to the corresponding symbol.  If
-<i>error-handling-mode symbol</i> is not one of these identifiers,
-effect and result are implementation-dependent: The result may be an
-error-handling-mode symbol acceptable as a <i>handling-mode</i>
-argument to <tt>make-transcoder</tt>.  If it is not acceptable as a
-<i>handling-mode</i> argument to <tt>make-transcoder</tt>, an exception is
-raised.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Only the name of &lt;error-handling-style symbol&gt; is significant.
-</blockquote><p>
-The error-handling mode of a transcoder specifies the behavior
-of textual I/O operations in the presence of encoding or decoding
-errors.</p>
-<p>
-If a textual input operation encounters an invalid or incomplete
-character encoding, and the error-handling mode is <tt>ignore</tt>,
-an appropriate number of bytes of the
-invalid encoding are ignored and decoding continues with the
-following bytes.
-If the error-handling mode is <tt>replace</tt>, the replacement
-character U+FFFD is injected into the data stream, an appropriate
-number of bytes are ignored, and decoding
-continues with the following bytes.
-If the error-handling mode is <tt>raise</tt>, an 
-exception with condition type <tt>&amp;i/o-decoding</tt> is raised.</p>
-<p>
-If a textual output operation encounters a character it cannot encode,
-and the error-handling mode is <tt>ignore</tt>, the character is
-ignored and encoding continues with the next character.
-If the error-handling mode is <tt>replace</tt>, a codec-specific
-replacement character is emitted by the transcoder, and encoding
-continues with the next character.
-The replacement character is U+FFFD for transcoders whose codec
-is one of the Unicode encodings, but is the <tt>?</tt>
-character for the Latin-1 encoding.
-If the error-handling mode is <tt>raise</tt>, an
-exception with condition type <tt>&amp;i/o-encoding</tt> is raised.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_616"></a>make-transcoder<i> codec</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_618"></a>make-transcoder<i> codec eol-style</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_620"></a>make-transcoder<i> codec eol-style handling-mode</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Codec</i> must be a codec; <i>eol-style</i>, if present, an
-eol-style symbol; and <i>handling-mode</i>, if present, an
-error-handling-mode symbol.  <i>Eol-style</i> may be omitted, in
-which case it defaults to the native end-of-line style of the
-underlying platform.  <i>Handling-mode</i> may be omitted, in which
-case it defaults to <tt>replace</tt>.  The result is a transcoder with the
-behavior specified by its arguments.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_622"></a>native-transcoder<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns an implementation-dependent transcoder that represents a
-possibly locale-dependent &#8220;native&#8221; transcoding.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_624"></a>transcoder-codec<i> transcoder</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_626"></a>transcoder-eol-style<i> transcoder</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_628"></a>transcoder-error-handling-mode<i> transcoder</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These are accessors for transcoder objects; when applied to a
-transcoder returned by <tt>make-transcoder</tt>, they return the
-<i>codec</i>, <i>eol-style</i>, and <i>handling-mode</i> arguments,
-respectively.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_630"></a>bytevector-&gt;string<i> bytevector transcoder</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the string that results from transcoding the
-<i>bytevector</i> according to the input direction of the transcoder.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_632"></a>string-&gt;bytevector<i> string transcoder</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the bytevector that results from transcoding the
-<i>string</i> according to the output direction of the transcoder.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_8.2.5"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.5">8.2.5&nbsp;&nbsp;End-of-file object</a></h3>
-<p></p>
-<p>
-The end-of-file object is returned by various I/O procedures when they
-reach end of file.<a name="node_idx_634"></a></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_636"></a>eof-object<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the end-of-file object.
-</p>
-
-<tt>(eqv?&nbsp;(eof-object)&nbsp;(eof-object))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(eq?&nbsp;(eof-object)&nbsp;(eof-object))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The end-of-file object  is not a datum value, and thus has no external
-representation.
-</blockquote><p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_638"></a>eof-object?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is the end-of-file object, <tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_8.2.6"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.6">8.2.6&nbsp;&nbsp;Input and output ports</a></h3>
-<p>The operations described in this section are common to input and
-output ports, both binary and textual.  A port may also have an
-associated <a name="node_idx_640"></a><em>position</em> that specifies a particular place
-within its data sink or source, and may also provide operations for
-inspecting and setting that place.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_642"></a>port?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if the argument is a port, and returns <tt>#f</tt>
-otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_644"></a>port-transcoder<i> port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the transcoder associated with <i>port</i> if <i>port</i> is
-textual and has an associated transcoder, and returns <tt>#f</tt> if
-<i>port</i> is binary or does not have an associated transcoder.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_646"></a>textual-port?<i> port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_648"></a>binary-port?<i> port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>textual-port?</tt> procedure returns <tt>#t</tt> if <i>port</i> is
-textual, and returns <tt>#f</tt> otherwise.
-The <tt>binary-port?</tt> procedure returns <tt>#t</tt> if <i>port</i> is
-binary, and returns <tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_650"></a>transcoded-port<i> binary-port transcoder</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>transcoded-port</tt> procedure
-returns a new textual port with the specified <i>transcoder</i>.
-Otherwise the new textual port&#8217;s state is largely the same as
-that of <i>binary-port</i>.
-If <i>binary-port</i> is an input port, the new textual
-port will be an input port and
-will transcode the bytes that have not yet been read from
-<i>binary-port</i>.
-If <i>binary-port</i> is an output port, the new textual
-port will be an output port and
-will transcode output characters into bytes that are
-written to the byte sink represented by <i>binary-port</i>.</p>
-<p>
-As a side effect, however, <tt>transcoded-port</tt>
-closes <i>binary-port</i> in
-a special way that allows the new textual port to continue to
-use the byte source or sink represented by <i>binary-port</i>,
-even though <i>binary-port</i> itself is closed and cannot
-be used by the input and output operations described in this
-chapter.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_652"></a>port-has-port-position?<i> port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_654"></a>port-position<i> port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>port-has-port-position?</tt> procedure returns <tt>#t</tt> if the
-port supports the <tt>port-position</tt> operation, and <tt>#f</tt>
-otherwise.</p>
-<p>
-For a binary port, the <tt>port-position</tt> procedure returns the index
-of the position at which the next byte would be read from or written
-to the port as an exact non-negative integer object.  For a textual
-port, <tt>port-position</tt> returns a value of some implementation-dependent
-type representing the port&#8217;s position; this value may be useful only as
-the <i>pos</i> argument to <tt>set-port-position!</tt>, if the latter is
-supported on the port (see below).</p>
-<p>
-If the port does not support the operation, <tt>port-position</tt> raises
-an exception with condition type <tt>&amp;assertion</tt>.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-For a textual port, the port position may or may not be an integer
-object.  If it is an integer object, the integer object does not
-necessarily correspond to a byte or character position.
-</blockquote>
-<p>   </p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_656"></a>port-has-set-port-position!?<i> port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_658"></a>set-port-position!<i> port pos</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-If <i>port</i> is a binary port, <i>pos</i> should be a
-non-negative exact integer object.  If <i>port</i> is a textual port,
-<i>pos</i> should be the return value of a call to <tt>port-position</tt> on <i>port</i>.</p>
-<p>
-The <tt>port-has-set-port-position!?</tt> procedure returns <tt>#t</tt> if the port
-supports the <tt>set-port-position!</tt> operation, and <tt>#f</tt>
-otherwise.</p>
-<p>
-The <tt>set-port-position!</tt> procedure raises an
-exception with condition type <tt>&amp;assertion</tt>
-if the port does not support the operation, 
-and an exception with condition type <tt>&amp;i/o-invalid-position</tt> if
-<i>pos</i> is not in the range of valid positions of <i>port</i>.
-Otherwise, it sets the current position
-of the port to <i>pos</i>.  If <i>port</i> is an output
-port, <tt>set-port-position!</tt> first flushes <i>port</i>.  (See <tt>flush-output-port</tt>, section&nbsp;<a href="#node_sec_8.2.10">8.2.10</a>.)</p>
-<p>
-If <i>port</i> is a binary output port and the current position is set
-beyond the current end of the data in the underlying data sink, the object is
-not extended until new data is written at that position.
-The contents of any intervening positions are unspecified.
-Binary ports created by <tt>open-file-output-port</tt> and
-<tt>open-file-input/output-port</tt> can always be extended in this manner
-within the limits of the underlying operating system.
-In other cases, attempts to set the port beyond the current end of data
-in the underlying object may result in an exception with condition
-type <tt>&amp;i/o-invalid-position</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_660"></a>close-port<i> port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Closes the port, rendering the port incapable of delivering or
-accepting data. If <i>port</i> is an output port, it is flushed before
-being closed.  This has no effect if the port has already been closed.
-A closed port is still a port.  The <tt>close-port</tt> procedure returns
-unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_662"></a>call-with-port<i> port proc</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Proc</i> must accept one argument.
-The <tt>call-with-port</tt> procedure
-calls <i>proc</i> with <i>port</i> as an argument. If
-<i>proc</i> returns, <i>port</i> is closed automatically and
-the values returned by <i>proc</i> are returned. If <i>proc</i> does not
-return, <i>port</i> is not closed automatically, except perhaps when it is
-possible to prove that <i>port</i> will never again be used for an
-input or output operation.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_8.2.7"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.7">8.2.7&nbsp;&nbsp;Input ports</a></h3>
-<p>An input port allows the reading of an infinite sequence of bytes
-or characters punctuated
-by end-of-file objects. An input port connected to a finite data
-source ends in an infinite sequence of end-of-file objects.</p>
-<p>
-It is unspecified whether a character encoding consisting of several
-bytes may have an end of file between the bytes.  If, for example,
-<tt>get-char</tt> raises an <tt>&amp;i/o-decoding</tt> exception because the
-character encoding at the port&#8217;s position is incomplete up to the next
-end of file, a subsequent call to <tt>get-char</tt> may successfully
-decode a character if bytes completing the encoding are available
-after the end of file.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_664"></a>input-port?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if the argument is an input port (or a combined input
-and output port), and returns <tt>#f</tt> otherwise.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_666"></a>port-eof?<i> input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt>
-if the <tt>lookahead-u8</tt> procedure (if <i>input-port</i> is a binary port)
-or the <tt>lookahead-char</tt> procedure (if <i>input-port</i> is a textual port)
-would return
-the end-of-file object, and <tt>#f</tt> otherwise.
-The operation may block indefinitely if no data is available
-but the port cannot be determined to be at end of file.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_668"></a>open-file-input-port<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_670"></a>open-file-input-port<i> filename file-options</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(open-file-input-port <i>filename</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<tt>&nbsp;&nbsp;&nbsp;<i>file-options</i>&nbsp;<i>buffer-mode</i>)</tt><br>
-<div align=left><tt>(open-file-input-port <i>filename</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<tt>&nbsp;&nbsp;&nbsp;<i>file-options</i>&nbsp;<i>buffer-mode</i>&nbsp;<i>maybe-transcoder</i>)</tt><p>
-<i>Maybe-transcoder</i> must be either a transcoder or <tt>#f</tt>.</p>
-<p>
-The <tt>open-file-input-port</tt> procedure returns an
-input port for the named file. The <i>file-options</i> and
-<i>maybe-transcoder</i> arguments are optional.</p>
-<p>
-The <i>file-options</i> argument, which may determine
-various aspects of the returned port (see section&nbsp;<a href="#node_sec_8.2.2">8.2.2</a>),
-defaults to the value of <tt>(file-options)</tt>.</p>
-<p>
-The <i>buffer-mode</i> argument, if supplied,
-must be one of the symbols that name a buffer mode.
-The <i>buffer-mode</i> argument defaults to <tt>block</tt>.</p>
-<p>
-If <i>maybe-transcoder</i> is a transcoder, it becomes the transcoder associated
-with the returned port.</p>
-<p>
-If <i>maybe-transcoder</i> is <tt>#f</tt> or absent,
-the port will be a binary port and will support the
-<tt>port-position</tt> and <tt>set-port-position!</tt>  operations.
-Otherwise the port will be a textual port, and whether it supports
-the <tt>port-position</tt> and <tt>set-port-position!</tt> operations
-is implementation-dependent (and possibly transcoder-dependent).
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_672"></a>open-bytevector-input-port<i> bytevector</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(open-bytevector-input-port <i>bytevector</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<tt>&nbsp;&nbsp;&nbsp;<i>maybe-transcoder</i>)</tt><p>
-<i>Maybe-transcoder</i> must be either a transcoder or <tt>#f</tt>.</p>
-<p>
-The <tt>open-bytevector-input-port</tt> procedure returns an input port whose bytes are drawn from 
-<i>bytevector</i>.
-If <i>transcoder</i> is specified, it becomes the transcoder associated
-with the returned port.</p>
-<p>
-If <i>maybe-transcoder</i> is <tt>#f</tt> or absent,
-the port will be a binary port and will support the
-<tt>port-position</tt> and <tt>set-port-position!</tt>  operations.
-Otherwise the port will be a textual port, and whether it supports
-the <tt>port-position</tt> and <tt>set-port-position!</tt> operations
-will be implementation-dependent (and possibly transcoder-dependent).</p>
-<p>
-If <i>bytevector</i> is modified after <tt>open-bytevector-input-port</tt>
-has been called, the effect on the returned
-port is unspecified.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_674"></a>open-string-input-port<i> string</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a textual input port whose characters are drawn from
-<i>string</i>.  The port may or may not have an associated transcoder;
-if it does, the transcoder is implementation-dependent.
-The port should support the
-<tt>port-position</tt> and <tt>set-port-position!</tt> operations.</p>
-<p>
-If <i>string</i> is modified after <tt>open-string-input-port</tt>
-has been called, the effect on the returned port is unspecified.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_676"></a>standard-input-port<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a fresh binary input port connected to standard input.
-Whether the port supports the <tt>port-position</tt> and <tt>set-port-position!</tt> operations is implementation-dependent.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_678"></a>current-input-port<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This returns a default textual port for input.  Normally, this default port
-is associated with standard input, but can be dynamically re-assigned
-using the <tt>with-input-from-file</tt> procedure from the
-<tt>(rnrs io simple (6))</tt> library (see section&nbsp;<a href="#node_sec_8.3">8.3</a>).
-The port may or may not have an associated transcoder; if it does, the
-transcoder is implementation-dependent.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(make-custom-binary-input-port <i>id</i> <i>read!</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<a name="node_idx_680"></a><tt><br>
-
-<i>get-position</i>&nbsp;<i>set-position!</i>&nbsp;<i>close</i>)</tt><p>
-Returns a newly created binary input port whose byte source is
-an arbitrary algorithm represented by the <i>read!</i> procedure.
-<i>Id</i> must be a string naming the new port,
-provided for informational purposes only.
-<i>Read!</i> must be a procedure and should behave as specified
-below; it will be called by operations that perform binary input.</p>
-<p>
-Each of the remaining arguments may be <tt>#f</tt>; if any of
-those arguments is not <tt>#f</tt>, it must be a procedure and
-should behave as specified below.</p>
-<p>
-</p>
-<ul>
-<li><p><tt>(<i>read!</i> <i>bytevector</i> <i>start</i> <i>count</i>)</tt></p>
-<p>
-<i>Start</i> will be a non-negative exact integer object,
-<i>count</i> will be a positive exact integer object,
-and <i>bytevector</i> will be a bytevector whose length is at least
-<i>start</i>  +  <i>count</i>.
-The <i>read!</i> procedure should obtain up to <i>count</i> bytes
-from the byte source, and should write those bytes
-into <i>bytevector</i> starting at index <i>start</i>.
-The <i>read!</i> procedure should return an exact integer object.  This
-integer object should represent the number of bytes that it has read.
-To indicate an end of file, the <i>read!</i>
-procedure should write no bytes and return 0.</p>
-<p>
-</p>
-<li><p><tt>(<i>get-position</i>)</tt></p>
-<p>
-The <i>get-position</i> procedure (if supplied) should return an exact
-integer object representing the current position of
-the input port.  If not supplied, the custom port will not support
-the <tt>port-position</tt> operation.</p>
-<p>
-</p>
-<li><p><tt>(<i>set-position!</i> <i>pos</i>)</tt></p>
-<p>
-<i>Pos</i> will be a non-negative exact integer object.
-The <i>set-position!</i> procedure (if supplied) should set the
-position of the input port to <i>pos</i>.  If not supplied, the custom
-port will not support the <tt>set-port-position!</tt> operation.</p>
-<p>
-</p>
-<li><p><tt>(<i>close</i>)</tt></p>
-<p>
-The <i>close</i> procedure (if supplied) should perform any actions
-that are necessary when the input port is closed.
-</p>
-</ul><p></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the return
-values of <i>read!</i> and <i>get-position</i> only when it actually calls
-them as part of an I/O operation requested by the program.  The
-implementation is not required to check that these procedures
-otherwise behave as described.  If they do not, however, the behavior
-of the resulting port is unspecified.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(make-custom-textual-input-port <i>id</i> <i>read!</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<a name="node_idx_682"></a><tt><br>
-
-<i>get-position</i>&nbsp;<i>set-position!</i>&nbsp;<i>close</i>)</tt><p>
-Returns a newly created textual input port whose character source is
-an arbitrary algorithm represented by the <i>read!</i> procedure.
-<i>Id</i> must be a string naming the new port,
-provided for informational purposes only.
-<i>Read!</i> must be a procedure and should behave as specified
-below; it will be called by operations that perform textual input.</p>
-<p>
-Each of the remaining arguments may be <tt>#f</tt>; if any of
-those arguments is not <tt>#f</tt>, it must be a procedure and
-should behave as specified below.</p>
-<p>
-</p>
-<ul>
-<li><p><tt>(<i>read!</i> <i>string</i> <i>start</i> <i>count</i>)</tt></p>
-<p>
-<i>Start</i> will be a non-negative exact integer object,
-<i>count</i> will be a positive exact integer object,
-and <i>string</i> will be a string whose length is at least
-<i>start</i>  +  <i>count</i>.
-The <i>read!</i> procedure should obtain up to <i>count</i> characters
-from the character source, and should write those characters
-into <i>string</i> starting at index <i>start</i>.
-The <i>read!</i> procedure should return an exact integer object
-representing the number of characters that it has written.
-To indicate an end of file, the <i>read!</i>
-procedure should write no bytes and return 0.</p>
-<p>
-</p>
-<li><p><tt>(<i>get-position</i>)</tt></p>
-<p>
-The <i>get-position</i> procedure (if supplied) should return a single
-value.  The return value should represent the current position of
-the input port.  If not supplied, the custom port will not support
-the <tt>port-position</tt> operation.</p>
-<p>
-</p>
-<li><p><tt>(<i>set-position!</i> <i>pos</i>)</tt></p>
-<p>
-The <i>set-position!</i> procedure (if supplied) should set the
-position of the input port to <i>pos</i> if <i>pos</i> is the return
-value of a call to <i>get-position</i>.  If not supplied, the custom
-port will not support the <tt>set-port-position!</tt> operation.</p>
-<p>
-</p>
-<li><p><tt>(<i>close</i>)</tt></p>
-<p>
-The <i>close</i> procedure (if supplied) should perform any actions
-that are necessary when the input port is closed.
-</p>
-</ul><p></p>
-<p>
-The port may or may not have an an associated transcoder; if it does,
-the transcoder is implementation-dependent.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the return
-values of <i>read!</i> and <i>get-position</i> only when it actually calls
-them as part of an I/O operation requested by the program.  The
-implementation is not required to check that these procedures
-otherwise behave as described.  If they do not, however, the behavior
-of the resulting port is unspecified.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_8.2.8"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.8">8.2.8&nbsp;&nbsp;Binary input</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_684"></a>get-u8<i> binary-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Reads from <i>binary-input-port</i>, blocking as necessary, until a
-byte is available from <i>binary-input-port</i> or until an end of file is reached.
-If a byte becomes available, <tt>get-u8</tt> returns the byte as an octet and
-updates <i>binary-input-port</i> to point just past that byte. If no input
-byte is seen before an end of file is reached, the end-of-file
-object is returned.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_686"></a>lookahead-u8<i> binary-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>lookahead-u8</tt> procedure is like <tt>get-u8</tt>, but it does not 
-update <i>binary-input-port</i> to point past the byte.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_688"></a>get-bytevector-n<i> binary-input-port count</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Count</i> must be an exact, non-negative integer object representing
-the number of bytes to be read.
-The <tt>get-bytevector-n</tt> procedure reads
-from <i>binary-input-port</i>, blocking as necessary, until <i>count</i>
-bytes are available from <i>binary-input-port</i> or until an end of file is
-reached. If <i>count</i> bytes are available before an end
-of file, <tt>get-bytevector-n</tt> returns a bytevector of size <i>count</i>.
-If fewer bytes are available before an end of file, <tt>get-bytevector-n</tt>
-returns a bytevector
-containing those bytes. In either case, the input port is updated to
-point just past the bytes read.  If an end of file is reached before
-any bytes are available, <tt>get-bytevector-n</tt> returns the end-of-file object.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(get-bytevector-n! <i>binary-input-port</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<a name="node_idx_690"></a><tt><br>
-
-<i>bytevector</i>&nbsp;<i>start</i>&nbsp;<i>count</i>)</tt><p>
-<i>Count</i> must be an exact, non-negative integer object, representing
-the number of bytes to be read. <i>bytevector</i> must be a bytevector
-with at
-least <i>start</i>  +  <i>count</i> elements.</p>
-<p>
-The <tt>get-bytevector-n!</tt> procedure reads from <i>binary-input-port</i>,
-blocking as necessary, until
-<i>count</i> bytes are available from <i>binary-input-port</i> or until
-an end of file is
-reached. If <i>count</i> bytes are available before an end of file,
-they are written into <i>bytevector</i> starting at index <i>start</i>, and
-the result is <i>count</i>. If fewer bytes are available before
-the next end of file, the available bytes are written into <i>bytevector</i>
-starting at index <i>start</i>, and the result is a number object
-representing the number of bytes actually
-read. In either case, the input port is updated to point just past the
-bytes read. If an end of file is reached before any bytes
-are available, <tt>get-bytevector-n!</tt> returns the end-of-file object.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_692"></a>get-bytevector-some<i> binary-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Reads from <i>binary-input-port</i>, blocking as necessary, until bytes are
-available from <i>binary-input-port</i> or until an end of file is reached.
-If bytes become available,
-<tt>get-bytevector-some</tt> returns a freshly allocated
-bytevector containing the initial available bytes (at least one),
-and it updates <i>binary-input-port</i> to point just past these bytes.
-If no input bytes are seen before an end
-of file is reached, the end-of-file object is returned.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_694"></a>get-bytevector-all<i> binary-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Attempts to read all bytes until the next end of file, blocking as
-necessary. If one or more bytes are read, <tt>get-bytevector-all</tt> returns
-a bytevector
-containing all bytes up to the next end of file.  Otherwise, <tt>get-bytevector-all</tt> returns the end-of-file object.
-The operation may block indefinitely waiting to see if more bytes
-will become available, even if some bytes are already available.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_8.2.9"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.9">8.2.9&nbsp;&nbsp;Textual input</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_696"></a>get-char<i> textual-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Reads from <i>textual-input-port</i>, blocking as necessary, until a
-complete character is available from <i>textual-input-port</i>,
-or until an end of file is reached.</p>
-<p>
-If a complete character is available before the next end of file, <tt>get-char</tt> returns that character and updates the input port to
-point past the character. If an end of file is
-reached before any character is read, <tt>get-char</tt> returns the
-end-of-file object.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_698"></a>lookahead-char<i> textual-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>lookahead-char</tt> procedure is like <tt>get-char</tt>, but it does not 
-update <i>textual-input-port</i> to point past the 
-character.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-With some of the standard transcoders
-described in this document, up to four bytes of lookahead are
-needed. Nonstandard transcoders may need even more lookahead.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_700"></a>get-string-n<i> textual-input-port count</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Count</i> must be an exact, non-negative integer object, representing
-the number of characters to be read.</p>
-<p>
-The <tt>get-string-n</tt> procedure reads
-from <i>textual-input-port</i>, blocking as necessary, until 
-<i>count</i> characters are available, or until an end of
-file is reached.</p>
-<p>
-If <i>count</i> characters are available before end of file, <tt>get-string-n</tt> returns a string consisting of those <i>count</i>
-characters. If fewer characters are available before an end of file,
-but one or more characters can be read,
-<tt>get-string-n</tt> returns a string containing
-those characters. In either case, the input port is updated to point
-just past the characters read. If no characters can be read before an 
-end of file, the end-of-file object is returned.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_702"></a>get-string-n!<i> textual-input-port string start count</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Start</i> and <i>count</i> must be exact, non-negative
-integer objects, with <i>count</i> representing the number of characters to be read.
-<i>String</i> must be a string with at least <i>start</i>  + 
-<i>count</i> characters.</p>
-<p>
-The <tt>get-string-n!</tt> procedure reads from <i>textual-input-port</i> in the same manner as <tt>get-string-n</tt>.  If <i>count</i> characters are available
-before an end of file, they are written into <i>string</i>
-starting at index <i>start</i>, and <i>count</i> is returned. If fewer
-characters are available before an end of file, but one
-or more can be read, those characters are written into <i>string</i>
-starting at index <i>start</i> and the number of characters actually read is
-returned as an exact integer object. If no characters can be read before an end of file,
-the end-of-file object is returned.
-</p>
-<p>   </p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_704"></a>get-string-all<i> textual-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Reads from <i>textual-input-port</i> until an end of file, decoding
-characters in the same manner as <tt>get-string-n</tt> and <tt>get-string-n!</tt>.</p>
-<p>
-If characters are available before the end of file, a string
-containing all the characters decoded from that data are returned. If no character
-precedes the end of file, the end-of-file object is
-returned.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_706"></a>get-line<i> textual-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Reads from <i>textual-input-port</i> up to and including the linefeed
-character or end of file, decoding characters in the same manner as
-<tt>get-string-n</tt> and <tt>get-string-n!</tt>.</p>
-<p>
-If a linefeed character is read, a string
-containing all of the text up to (but not including) the linefeed
-character is returned, and the port is updated to point just past the
-linefeed character. If an end of file is
-encountered before any linefeed character is read, but some characters
-have been read and decoded as characters, a string containing
-those characters is returned. If an end of file is encountered before
-any characters are read, the end-of-file object is
-returned.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The end-of-line style, if not <tt>none</tt>, will cause all line
-endings to be read as linefeed characters.  See
-section&nbsp;<a href="#node_sec_8.2.4">8.2.4</a>.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_708"></a>get-datum<i> textual-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Reads an external representation from <i>textual-input-port</i> and returns the
-datum it represents.  The <tt>get-datum</tt> procedure returns the next
-datum that can be parsed from the given <i>textual-input-port</i>, updating
-<i>textual-input-port</i> to point exactly past the end of the external
-representation of the object.</p>
-<p>
-Any &lt;interlexeme space&gt;
-(see report section&nbsp;on &#8220;Lexical syntax&#8221;) in
-the input is first skipped.  If an end of file occurs after the
-&lt;interlexeme space&gt;, the end-of-file object (see
-section&nbsp;<a href="#node_sec_8.2.5">8.2.5</a>) is returned.</p>
-<p>
-If a character inconsistent with an external representation is
-encountered in the input, an exception with condition types
-<tt>&amp;lexical</tt> and <tt>&amp;i/o-read</tt> is raised.
-Also, if the end of file is encountered
-after the beginning of an external representation, but the external
-representation is incomplete and therefore cannot be parsed, an exception
-with condition types <tt>&amp;lexical</tt> and <tt>&amp;i/o-read</tt> is raised.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_8.2.10"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.10">8.2.10&nbsp;&nbsp;Output ports</a></h3>
-<p>An output port is a sink to which bytes or characters are written.
-The written data may control
-external devices or may produce files and other objects that may
-subsequently be opened for input.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_710"></a>output-port?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if the argument is an output port (or a
-combined input and output port), <tt>#f</tt> otherwise.
-</p>
-<p>   </p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_712"></a>flush-output-port<i> output-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Flushes any buffered output from the buffer of <i>output-port</i> to the
-underlying file, device, or object. The <tt>flush-output-port</tt>
-procedure returns unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_714"></a>output-port-buffer-mode<i> output-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the symbol that represents the buffer mode of
-<i>output-port</i>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_716"></a>open-file-output-port<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_718"></a>open-file-output-port<i> filename file-options</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(open-file-output-port <i>filename</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<tt>&nbsp;&nbsp;&nbsp;<i>file-options</i>&nbsp;<i>buffer-mode</i>)</tt><br>
-<div align=left><tt>(open-file-output-port <i>filename</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<tt>&nbsp;&nbsp;&nbsp;<i>file-options</i>&nbsp;<i>buffer-mode</i>&nbsp;<i>maybe-transcoder</i>)</tt><p>
-<i>Maybe-transcoder</i> must be either a transcoder or <tt>#f</tt>.</p>
-<p>
-The <tt>open-file-output-port</tt> procedure returns an output port for the named file.</p>
-<p>
-The <i>file-options</i> argument, which may determine
-various aspects of the returned port (see section&nbsp;<a href="#node_sec_8.2.2">8.2.2</a>),
-defaults to the value of <tt>(file-options)</tt>.</p>
-<p>
-The <i>buffer-mode</i> argument, if supplied,
-must be one of the symbols that name a buffer mode.
-The <i>buffer-mode</i> argument defaults to <tt>block</tt>.</p>
-<p>
-If <i>maybe-transcoder</i> is a transcoder, it becomes the transcoder
-associated with the port.</p>
-<p>
-If <i>maybe-transcoder</i> is <tt>#f</tt> or absent,
-the port will be a binary port and will support the
-<tt>port-position</tt> and <tt>set-port-position!</tt>  operations.
-Otherwise the port will be a textual port, and whether it supports
-the <tt>port-position</tt> and <tt>set-port-position!</tt> operations
-is implementation-dependent (and possibly transcoder-dependent).
-</p>
-<p>   </p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_720"></a>open-bytevector-output-port<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_722"></a>open-bytevector-output-port<i> maybe-transcoder</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Maybe-transcoder</i> must be either a transcoder or <tt>#f</tt>.</p>
-<p>
-The <tt>open-bytevector-output-port</tt> procedure returns 
-two values: an output port and an extraction procedure.
-The output port accumulates the bytes written to it for
-later extraction by the procedure.</p>
-<p>
-If <i>maybe-transcoder</i> is a transcoder, it becomes
-the transcoder associated with the port.
-If <i>maybe-transcoder</i> is <tt>#f</tt> or absent,
-the port will be a binary port and will support the
-<tt>port-position</tt> and <tt>set-port-position!</tt>  operations.
-Otherwise the port will be a textual port, and whether it supports
-the <tt>port-position</tt> and <tt>set-port-position!</tt> operations
-is implementation-dependent (and possibly transcoder-dependent).</p>
-<p>
-The extraction procedure takes no arguments.
-When called, it returns a
-bytevector consisting of all the port&#8217;s accumulated bytes (regardless
-of the port&#8217;s current position), removes
-the accumulated bytes from the port, and resets the port&#8217;s position.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_724"></a>call-with-bytevector-output-port<i> proc</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(call-with-bytevector-output-port <i>proc</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<tt>&nbsp;&nbsp;&nbsp;<i>maybe-transcoder</i>)</tt><p>
-<i>Proc</i> must accept one argument.
-<i>Maybe-transcoder</i> must be either a transcoder or <tt>#f</tt>.</p>
-<p>
-The <tt>call-with-bytevector-output-port</tt> procedure creates an output
-port that accumulates the bytes written to it and calls <i>proc</i> with
-that output port as an argument. Whenever <i>proc</i> returns, a
-bytevector consisting of all of the port&#8217;s accumulated bytes (regardless
-of the port&#8217;s current position) is returned and
-the port is closed.</p>
-<p>
-The transcoder associated with the output port is determined
-as for a call to <tt>open-bytevector-output-port</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_726"></a>open-string-output-port<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns two values: a textual output port and an extraction procedure.
-The output port accumulates the characters written to it for
-later extraction by the procedure.</p>
-<p>
-The port may or may not have an associated transcoder; if it does, the
-transcoder is implementation-dependent.  The port should support the <tt>port-position</tt> and <tt>set-port-position!</tt> operations.</p>
-<p>
-The extraction procedure takes no arguments.
-When called, it returns a string consisting of all of the port&#8217;s
-accumulated characters (regardless of the current position),
-removes the accumulated characters from the port, and resets
-the port&#8217;s position.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_728"></a>call-with-string-output-port<i> proc</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Proc</i> must accept one argument.
-The <tt>call-with-string-output-port</tt> procedure creates a textual output port that accumulates the
-characters written to it and calls <i>proc</i> with that output port
-as an argument.  Whenever <i>proc</i> returns, a string consisting of all
-of the port&#8217;s accumulated characters (regardless of the port&#8217;s current
-position) is returned and the port is closed.</p>
-<p>
-The port may or may not have an associated transcoder; if it does, the
-transcoder is implementation-dependent.  The port should support the
-<tt>port-position</tt> and <tt>set-port-position!</tt> operations.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_730"></a>standard-output-port<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_732"></a>standard-error-port<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a fresh binary output port connected to the standard output or
-standard error respectively.  Whether the port supports the <tt>port-position</tt> and <tt>set-port-position!</tt> operations is
-implementation-dependent.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_734"></a>current-output-port<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_736"></a>current-error-port<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These return default textual ports for regular output and error
-output.  Normally, these default ports are associated with standard
-output, and standard error, respectively.  The return value of <tt>current-output-port</tt> can be dynamically re-assigned using the <tt>with-output-to-file</tt> procedure from the <tt>(rnrs io simple (6))</tt>
-library (see section&nbsp;<a href="#node_sec_8.3">8.3</a>).  A port returned by
-one of these procedures may or may not have an associated transcoder;
-if it does, the transcoder is implementation-dependent.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(make-custom-binary-output-port <i>id</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<a name="node_idx_738"></a><tt><br>
-
-<i>write!</i>&nbsp;<i>get-position</i>&nbsp;<i>set-position!</i>&nbsp;<i>close</i>)</tt><p>
-Returns a newly created binary output port whose byte sink is
-an arbitrary algorithm represented by the <i>write!</i> procedure.
-<i>Id</i> must be a string naming the new port,
-provided for informational purposes only.
-<i>Write!</i> must be a procedure and should behave as specified
-below; it will be called by operations that perform binary output.</p>
-<p>
-Each of the remaining arguments may be <tt>#f</tt>; if any of
-those arguments is not <tt>#f</tt>, it must be a procedure and
-should behave as specified in the description of
-<tt>make-custom-binary-input-port</tt>.</p>
-<p>
-</p>
-<ul>
-<li><p><tt>(<i>write!</i> <i>bytevector</i> <i>start</i> <i>count</i>)</tt></p>
-<p>
-<i>Start</i> and <i>count</i> will be non-negative exact
-integer objects,
-and <i>bytevector</i> will be a bytevector whose length is at least
-<i>start</i>  +  <i>count</i>.
-The <i>write!</i> procedure should write up to <i>count</i> bytes
-from <i>bytevector</i> starting at index <i>start</i> 
-to the byte sink.
-If <i>count</i> is 0, the <i>write!</i> procedure should
-have the effect of passing an end-of-file object to the byte sink.
-In any case, the <i>write!</i> procedure should return the number of
-bytes that it wrote, as an exact integer object.
-</p>
-</ul><p></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the return
-values of <i>write!</i> only when it actually calls <i>write!</i> as part of
-an I/O operation requested by the program.  The implementation is not
-required to check that <i>write!</i> otherwise behaves as described.
-If it does not, however, the behavior of the resulting port is
-unspecified.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(make-custom-textual-output-port <i>id</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<a name="node_idx_740"></a><tt><br>
-
-<i>write!</i>&nbsp;<i>get-position</i>&nbsp;<i>set-position!</i>&nbsp;<i>close</i>)</tt><p>
-Returns a newly created textual output port whose byte sink is
-an arbitrary algorithm represented by the <i>write!</i> procedure.
-<i>Id</i> must be a string naming the new port,
-provided for informational purposes only.
-<i>Write!</i> must be a procedure and should behave as specified
-below; it will be called by operations that perform textual output.</p>
-<p>
-Each of the remaining arguments may be <tt>#f</tt>; if any of
-those arguments is not <tt>#f</tt>, it must be a procedure and
-should behave as specified in the description of
-<tt>make-custom-textual-input-port</tt>.</p>
-<p>
-</p>
-<ul>
-<li><p><tt>(<i>write!</i> <i>string</i> <i>start</i> <i>count</i>)</tt></p>
-<p>
-<i>Start</i> and <i>count</i> will be non-negative exact
-integer objects,
-and <i>string</i> will be a string whose length is at least
-<i>start</i>  +  <i>count</i>.
-The <i>write!</i> procedure should write up to <i>count</i> characters
-from <i>string</i> starting at index <i>start</i> 
-to the character sink.
-If <i>count</i> is 0, the <i>write!</i> procedure should
-have the effect of passing an end-of-file object to the character sink.
-In any case, the <i>write!</i> procedure should return the number of
-characters that it wrote, as an exact integer object.
-</p>
-</ul><p></p>
-<p>
-The port may or may not have an associated transcoder; if it does, the
-transcoder is implementation-dependent.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the return
-values of <i>write!</i> only when it actually calls <i>write!</i> as part of
-an I/O operation requested by the program.  The implementation is not
-required to check that <i>write!</i> otherwise behaves as described.
-If it does not, however, the behavior of the resulting port is
-unspecified.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_8.2.11"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.11">8.2.11&nbsp;&nbsp;Binary output</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_742"></a>put-u8<i> binary-output-port octet</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Writes <i>octet</i> to the output port and returns unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_744"></a>put-bytevector<i> binary-output-port bytevector</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_746"></a>put-bytevector<i> binary-output-port bytevector start</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(put-bytevector <i>binary-output-port</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<tt><br>
-
-<i>bytevector</i>&nbsp;<i>start</i>&nbsp;<i>count</i>)</tt><p>
-<i>Start</i> and <i>count</i> must be non-negative exact
-integer objects that default to 0 and <tt>(bytevector-length <i>bytevector</i>)</tt>
- <tt>-</tt>  <i>start</i>, respectively. <i>Bytevector</i> must have a length of at
-least <i>start</i>  +  <i>count</i>.  The <tt>put-bytevector</tt> procedure writes
-the <i>count</i> bytes of the bytevector <i>bytevector</i> starting at index
-<i>start</i> to the output port.  The <tt>put-bytevector</tt> procedure
-returns unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_8.2.12"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.12">8.2.12&nbsp;&nbsp;Textual output</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_748"></a>put-char<i> textual-output-port char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Writes <i>char</i> to the port. The <tt>put-char</tt> procedure returns
-unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_750"></a>put-string<i> textual-output-port string</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_752"></a>put-string<i> textual-output-port string start</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_754"></a>put-string<i> textual-output-port string start count</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Start</i> and <i>count</i> must be non-negative exact
-integer objects.  <i>String</i> must have a length of at least <i>start</i>  + 
-<i>count</i>.  <i>Start</i> defaults to 0.  <i>Count</i> defaults to
-<tt>(string-length <i>string</i>)</tt>  <tt>-</tt>  <i>start</i>.  The <tt>put-string</tt> procedure writes the
-<i>count</i> characters of <i>string</i> starting at
-index <i>start</i> to the port.  The <tt>put-string</tt> procedure
-returns unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_756"></a>put-datum<i> textual-output-port datum</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Datum</i> should be a datum value.  The <tt>put-datum</tt>
-procedure writes an external representation of <i>datum</i> to
-<i>textual-output-port</i>.  The specific external representation is
-implementation-dependent.  However, whenever possible, an
-implementation should produce a representation for which <tt>get-datum</tt>, when reading the representation, will return an object
-equal (in the sense of <tt>equal?</tt>) to <i>datum</i>.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Not all datums may allow producing an external representation for which
-<tt>get-datum</tt> will produce an object that is equal to the
-original.  Specifically, NaNs contained in <i>datum</i> may make
-this impossible.
-</blockquote><p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The <tt>put-datum</tt> procedure merely writes the external
-representation, but no trailing delimiter.  If <tt>put-datum</tt> is
-used to write several subsequent external representations to an
-output port, care should be taken to delimit them properly so they can
-be read back in by subsequent calls to <tt>get-datum</tt>.
-</blockquote>
-<p></p>
-<p>
-</p>
-<a name="node_sec_8.2.13"></a>
-<h3 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.2.13">8.2.13&nbsp;&nbsp;Input/output ports</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_758"></a>open-file-input/output-port<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_760"></a>open-file-input/output-port<i> filename file-options</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(open-file-input/output-port <i>filename</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<tt>&nbsp;&nbsp;&nbsp;<i>file-options</i>&nbsp;<i>buffer-mode</i>)</tt><br>
-<div align=left><tt>(open-file-input/output-port <i>filename</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<tt>&nbsp;&nbsp;&nbsp;<i>file-options</i>&nbsp;<i>buffer-mode</i>&nbsp;<i>transcoder</i>)</tt><p>
-Returns a single port that is both an input port and an
-output port for the named file.
-The optional arguments default as described in the specification
-of <tt>open-file-output-port</tt>.
-If the input/output port supports <tt>port-position</tt> and/or
-<tt>set-port-position!</tt>, the same port position is used
-for both input and output.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(make-custom-binary-input/output-port</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<a name="node_idx_762"></a><tt><br>
-
-<i>id</i>&nbsp;<i>read!</i>&nbsp;<i>write!</i>&nbsp;<i>get-position</i>&nbsp;<i>set-position!</i>&nbsp;<i>close</i>)</tt><p>
-Returns a newly created binary input/output port whose
-byte source and sink are
-arbitrary algorithms represented by the <i>read!</i> and <i>write!</i>
-procedures.
-<i>Id</i> must be a string naming the new port,
-provided for informational purposes only.
-<i>Read!</i> and <i>write!</i> must be procedures,
-and should behave as specified for the
-<tt>make-custom-binary-input-port</tt> and
-<tt>make-custom-binary-output-port</tt> procedures.</p>
-<p>
-Each of the remaining arguments may be <tt>#f</tt>; if any of
-those arguments is not <tt>#f</tt>, it must be a procedure and
-should behave as specified in the description of
-<tt>make-custom-binary-input-port</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(make-custom-textual-input/output-port</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<a name="node_idx_764"></a><tt><br>
-
-<i>id</i>&nbsp;<i>read!</i>&nbsp;<i>write!</i>&nbsp;<i>get-position</i>&nbsp;<i>set-position!</i>&nbsp;<i>close</i>)</tt><p>
-Returns a newly created textual input/output port whose
-textual source and sink are
-arbitrary algorithms represented by the <i>read!</i> and <i>write!</i>
-procedures.
-<i>Id</i> must be a string naming the new port,
-provided for informational purposes only.
-<i>Read!</i> and <i>write!</i> must be procedures,
-and should behave as specified for the
-<tt>make-custom-textual-input-port</tt> and
-<tt>make-custom-textual-output-port</tt> procedures.</p>
-<p>
-Each of the remaining arguments may be <tt>#f</tt>; if any of
-those arguments is not <tt>#f</tt>, it must be a procedure and
-should behave as specified in the description of
-<tt>make-custom-textual-input-port</tt>.
-</p>
-<p></p>
-<p>
-
-</p>
-<a name="node_sec_8.3"></a>
-<h2 class=section><a href="r6rs-lib-Z-H-1.html#node_toc_node_sec_8.3">8.3&nbsp;&nbsp;Simple I/O</a></h2>
-<p></p>
-<p>
-This section describes the <tt>(rnrs io simple (6))</tt><a name="node_idx_766"></a>library, which
-provides a somewhat more convenient interface for performing textual
-I/O on ports.  This library implements most of the 
-I/O procedures of the previous revision of this report&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_8">8</a>].</p>
-<p>
-The ports created by the procedures of this library are textual ports
-associated implementation-dependent transcoders.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_768"></a>eof-object<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_770"></a>eof-object?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These are the same as <tt>eof-object</tt> and <tt>eof-object?</tt> from the
-<tt>(rnrs ports (6))</tt> library.<a name="node_idx_772"></a><a name="node_idx_774"></a></p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_776"></a>call-with-input-file<i> filename proc</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_778"></a>call-with-output-file<i> filename proc</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Proc</i> should accept one argument.
-These procedures open the file named by <i>filename</i> for input or
-for output, with no specified file options, and call <i>proc</i> with
-the obtained port as an argument.  If <i>proc</i> returns, the
-port is closed automatically and the values returned by <i>proc</i> are
-returned. If <i>proc</i> does not return, the port is not
-closed automatically, unless it is possible to prove that the port
-will never again be used for an I/O operation.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_780"></a>input-port?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_782"></a>output-port?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These are the same as the <tt>input-port?</tt> and <tt>output-port?</tt>
-procedures in the <tt>(rnrs io ports (6))</tt> library.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_784"></a>current-input-port<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_786"></a>current-output-port<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_788"></a>current-error-port<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These are the same as the <tt>current-input-port</tt><a name="node_idx_790"></a>, <tt>current-output-port</tt><a name="node_idx_792"></a>, and <tt>current-error-port</tt><a name="node_idx_794"></a>procedures from
-the <tt>(rnrs io ports (6))</tt> library.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_796"></a>with-input-from-file<i> filename thunk</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_798"></a>with-output-to-file<i> filename thunk</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Thunk</i> must be a procedure and must accept zero arguments.  The
-file is opened for input or output using empty file options, and
-<i>thunk</i> is called with no arguments.  During the dynamic extent of
-the call to <i>thunk</i>, the obtained port is made the value returned
-by <tt>current-input-port</tt> or <tt>current-output-port</tt> procedures;
-the previous default values are reinstated when the dynamic extent is
-exited.  When <i>thunk</i> returns, the port is closed automatically.
-The values
-returned by <i>thunk</i> are returned.  If an escape procedure is used
-to escape back into the call to <i>thunk</i> after <i>thunk</i> is
-returned, the behavior is unspecified.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_800"></a>open-input-file<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Opens <i>filename</i> for input, with empty file options, and returns
-the obtained port.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_802"></a>open-output-file<i> filename</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Opens <i>filename</i> for output, with empty file options, and
-returns the obtained port.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_804"></a>close-input-port<i> input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_806"></a>close-output-port<i> output-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Closes <i>input-port</i> or <i>output-port</i>, respectively.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_808"></a>read-char<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_810"></a>read-char<i> textual-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Reads from <i>textual-input-port</i>,
-blocking as necessary until a character
-is available from <i>textual-input-port</i>,
-or the data that are available cannot
-be the prefix of any valid encoding, or an end of file is reached.</p>
-<p>
-If a complete character is available before the next end of file, <tt>read-char</tt> returns that character, and updates the input port to
-point past that character. If an end of file is
-reached before any data are read, <tt>read-char</tt> returns the
-end-of-file object.</p>
-<p>
-If <i>textual-input-port</i> is omitted, it defaults to the value returned by
-<tt>current-input-port</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_812"></a>peek-char<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_814"></a>peek-char<i> textual-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This is the same as <tt>read-char</tt>, but does not consume any data
-from the port.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_816"></a>read<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_818"></a>read<i> textual-input-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Reads an external representation from <i>textual-input-port</i>
-and returns the datum it
-represents.  The <tt>read</tt> procedure operates in the same way as 
-<tt>get-datum</tt>, see section&nbsp;<a href="#node_sec_8.2.9">8.2.9</a>.</p>
-<p>
-If <i>textual-input-port</i> is omitted, it defaults to the value returned by
-<tt>current-input-port</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_820"></a>write-char<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_822"></a>write-char<i> char textual-output-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Writes an encoding of the character <i>char</i> to the
-<i>textual-output-port</i>, and returns unspecified values.</p>
-<p>
-If <i>textual-output-port</i> is omitted, it defaults to the value returned by
-<tt>current-output-port</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_824"></a>newline<i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_826"></a>newline<i> textual-output-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-This is equivalent to using <tt>write-char</tt> to write
-<tt>#<tt>\</tt>linefeed</tt>
-to <i>textual-output-port</i>.</p>
-<p>
-If <i>textual-output-port</i> is omitted, it defaults to the value returned by
-<tt>current-output-port</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_828"></a>display<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_830"></a>display<i> obj textual-output-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Writes a representation of <i>obj</i> to the given <i>textual-output-port</i>.
-Strings that appear in
-the written representation are not enclosed in doublequotes, and no
-characters are escaped within those strings.  Character objects appear
-in the representation as if written by <tt>write-char</tt> instead of by
-<tt>write</tt>.  The <tt>display</tt> procedure returns unspecified values.  The
-<i>textual-output-port</i> argument may be omitted, in which case it defaults
-to the value returned by <tt>current-output-port</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_832"></a>write<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_834"></a>write<i> obj textual-output-port</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Writes the external representation of <i>obj</i> to <i>textual-output-port</i>.
-The <tt>write</tt>
-procedure operates in the same way as <tt>put-datum</tt>; see
-section&nbsp;<a href="#node_sec_8.2.12">8.2.12</a>.</p>
-<p>
-If <i>textual-output-port</i> is omitted, it defaults to the value returned by
-<tt>current-output-port</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p>
-      </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs-lib.html">first</a>, <a href="r6rs-lib-Z-H-8.html">previous</a></span><span>, <a href="r6rs-lib-Z-H-10.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-S.css b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-S.css
deleted file mode 100644
index a5d5a049c6..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib-Z-S.css
+++ /dev/null
@@ -1,257 +0,0 @@
-
-               body {
-               color: black;
-               /*   background-color: #e5e5e5;*/
-               background-color: #ffffff;
-               /*background-color: beige;*/
-               margin-top: 2em;
-               margin-bottom: 2em;
-               /* margin-left: 8%;
-               margin-right: 8%; */
-               }
-
-               @media screen {
-               body {
-               margin-left: 8%;
-               margin-right: 8%;
-               }
-               }
-
-               @media print {
-               body {
-               text-align: justify;
-               }
-               }
-
-               @media print {
-               a:link, a:visited {
-               text-decoration: none;
-               color: black;
-               }
-               }
-
-               @media print {
-               p {
-               text-indent: 2em;
-               margin-top: 1ex;
-               margin-bottom: 0;
-               }
-
-               }
-
-               h1,h2,h3,h4,h5,h6 {
-               margin-top: .8em;
-               margin-bottom: .2em;  /* ?? */
-               }
-               
-
-               .title {
-               font-size: 200%;
-               font-weight: normal;
-               margin-top: 2.8em;
-               text-align: center;
-               }
-
-               .partheading {
-               font-size: 100%;
-               }
-
-               .chapterheading {
-               font-size: 100%;
-               }
-
-               .beginsection {
-               margin-top: 1.8em;
-               font-size: 100%;
-               }
-
-               .tiny {
-               font-size: 40%;
-               }
-
-               .scriptsize {
-               font-size: 60%;
-               }
-
-               .footnotesize {
-               font-size: 75%;
-               }
-
-               .small {
-               font-size: 90%;
-               }
-
-               .normalsize {
-               font-size: 100%;
-               }
-
-               .large {
-               font-size: 120%;
-               }
-
-               .largecap {
-               font-size: 150%;
-               }
-
-               .largeup {
-               font-size: 200%;
-               }
-
-               .huge {
-               font-size: 300%;
-               }
-
-               .hugecap {
-               font-size: 350%;
-               }
-
-               p.noindent {
-               text-indent: 0;
-               }
-
-               pre {
-               margin-left: 2em;
-               }
-
-               blockquote {
-               margin-left: 2em;
-               }
-
-               .smallskip {
-               margin-top: 2pt;
-               margin-bottom: 2pt;
-               min-height: 4pt;
-               }
-
-               .medskip {
-               margin-top: 3pt;
-               margin-bottom: 3pt;
-               min-height: 7pt; 
-               /*margin-top: 1.6em;  
-               margin-bottom: 2.4em;  
-               margin-top: 1em;
-               margin-bottom: 1.5em; */
-               /* top and bottom have to be different so successive \...skips cause more spacing? */
-               }
-
-               .bigskip {
-               margin-top: 4pt;
-               margin-bottom: 4pt;
-               min-height: 13pt;
-               /*margin-top: 2.8em; 
-               margin-bottom: 3.4em; 
-               margin-top: 2.4em;
-               margin-bottom: 1.6em; */
-               }
-
-
-               ol {
-               list-style-type: decimal;
-               }
-
-               ol ol {
-               list-style-type: lower-alpha;
-               }
-
-               ol ol ol {
-               list-style-type: lower-roman;
-               }
-
-               ol ol ol ol {
-               list-style-type: upper-alpha;
-               }
-
-               tt i {
-               font-family: serif;
-               }
-
-               .verbatim em {
-               font-family: serif;
-               }
-
-               /*
-               .verbatim {
-               color: #4d0000;
-               }
-               */
-
-               .scheme em {
-               color: black;
-               font-family: serif;
-               }
-
-               .scheme             {color: #993333} /* background punctuation */
-               .scheme  .selfeval  {color: #006600}
-               .scheme  .keyword   {color: #660000; font-weight: bold}
-               .scheme  .builtin   {color: #660000}
-               .scheme  .global    {color: #660066}
-               .scheme  .variable  {color: #000066}
-               .scheme  .comment   {color: #006666; font-style: oblique}
-
-               .schemeresponse {
-               color: #006600;
-               }
-
-               .navigation {
-               color: #993300;
-               text-align: right;
-               font-size: medium;
-               font-style: italic;
-               }
-
-               @media print {
-               .navigation {
-               display: none;
-               }
-               }
-
-               .disable {
-               /* color: #e5e5e5; */
-               color: gray;
-               }
-
-               .smallcaps {
-               font-size: 75%;
-               }
-
-               .smallprint {
-               color: gray;
-               font-size: 75%;
-               text-align: right;
-               }
-
-               /*
-               .smallprint hr {
-               text-align: left;
-               width: 40%;
-               }
-               */
-
-               .footnoterule {
-               text-align: left;
-               width: 40%;
-               }
-
-               @media print {
-               .footnoterule {
-               margin-top: 2em;
-               }
-               }
-
-               .colophon {
-               color: gray;
-               font-size: 80%;
-               font-style: italic;
-               text-align: right;
-               margin-top: 1em;
-               }
-
-               @media print {
-               .colophon .advertisement {
-               display: none;
-               }
-               }
-
-               .colophon a {
-               color: gray;
-               }
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib.html
deleted file mode 100644
index 53f2ed0d15..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-lib-std/r6rs-lib.html
+++ /dev/null
@@ -1,456 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs-lib.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-r6rs-lib
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-lib-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span class=disable>first, previous</span><span><span class=disable>, </span><a href="r6rs-lib-Z-H-1.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
- 
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-  
-
-
-
-
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</p>
-<p>
-  
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-  
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<h1 class=title></h1>
-<p></p>
-<div align=center>
-<p></p>
-</div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
- </p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<div align=center><table><tr><td>
-   <span class=huge><strong>Revised<span class=hugecap><sup><span class=tiny>6</span></sup></span> Report on the Algorithmic Language <br>
-<div style="height: 3.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">Scheme<br>
-<div style="height: 6.75pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">&#8212; Standard Libraries &#8212;</strong></span></p>
-</td></tr><tr><td>
-<p>
-<div style="height: 4.5pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<div class=mathdisplay align=left><table><tr><td>
-
-
-<table border=0><tr><td valign=top  colspan=4>M<span class=scriptsize>ICHAEL</span> S<span class=scriptsize>PERBER</span>
-</td></tr>
-<tr><td valign=top  colspan=4>R. K<span class=scriptsize>ENT</span> D<span class=scriptsize>YBVIG</span>,
-M<span class=scriptsize>ATTHEW</span> F<span class=scriptsize>LATT</span>,
-A<span class=scriptsize>NTON</span> <span class=scriptsize>VAN</span> S<span class=scriptsize>TRAATEN</span>
-</td></tr>
-<tr><td valign=top  colspan=4>(<i>Editors</i>) </td></tr>
-<tr><td valign=top  colspan=4>
-R<span class=scriptsize>ICHARD</span> K<span class=scriptsize>ELSEY</span>, W<span class=scriptsize>ILLIAM</span> C<span class=scriptsize>LINGER</span>,
-J<span class=scriptsize>ONATHAN</span> R<span class=scriptsize>EES</span> </td></tr>
-<tr><td valign=top  colspan=4>(<i>Editors, Revised<sup>5</sup> Report on the
-Algorithmic Language Scheme</i>) </td></tr>
-<tr><td valign=top  colspan=4><strong>26 September 2007</strong>
-</td></tr></table>
-</td></tr></table></div>
-<p class=noindent></p>
-</td></tr><tr><td>
-<p>
-</p>
-</td></tr></table></div>
-<p>
-The report gives a defining description of the standard libraries of
-the programming language Scheme.</p>
-<p>
-This report frequently refers back to the <i>Revised<sup>6</sup> Report
-on the Algorithmic Language Scheme</i>&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_11">11</a>]; references to the
-report are identified by designations such as &#8220;report section&#8221; or
-&#8220;report chapter&#8221;.
-</p>
-<p>
-</p>
-<div class=medskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-Parts of the library report are derived from earlier revisions of the
-report&nbsp;[<a href="r6rs-lib-Z-H-21.html#node_bib_8">8</a>].  We gratefully acknowledge their authors for their
-contributions.  More detailed information on authorship can be found
-at the beginning of the <i>Revised<sup>6</sup> Report on the Algorithmic
-Language Scheme</i>.</p>
-<p>
-</p>
-<div class=medskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-We intend this report to belong to the entire Scheme community, and so
-we grant permission to copy it in whole or in part without fee.  In
-particular, we encourage implementors of Scheme to use this report as
-a starting point for manuals and other documentation, modifying it as
-necessary.</p>
-<p>
-</p>
-<div class=bigskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span class=disable>first, previous</span><span><span class=disable>, </span><a href="r6rs-lib-Z-H-1.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-lib-Z-H-1.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-lib-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-<div align=right class=colophon>Last modified: Wednesday, September 26th, 2007 5:22:26pm MET-1MST-2,M3.5.0,M10.5.0<br></div>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/index.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/index.html
deleted file mode 100644
index 008beaee0f..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/index.html
+++ /dev/null
@@ -1,525 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidetitle>
-<div align=right class=navigation>[Go to <span class=disable>first, previous</span><span><span class=disable>, </span><a href="r6rs-Z-H-1.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-  
-
-
-
-
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</p>
-<p>
-  
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-  
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-</p>
-<p>
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-
-
-
-
-</p>
-<p>
-
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<h1 class=title></h1>
-<p></p>
-<div align=center>
-<p></p>
-</div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
- </p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<div align=center><table><tr><td>
-   <span class=huge><strong>Revised<span class=hugecap><sup><span class=tiny>6</span></sup></span> Report on the Algorithmic Language <br>
-<div style="height: 3.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">Scheme</strong></span></p>
-</td></tr><tr><td>
-<p>
-<div style="height: 4.5pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<div class=mathdisplay align=left><table><tr><td>
-
-
-<table border=0><tr><td valign=top  colspan=4>M<span class=scriptsize>ICHAEL</span> S<span class=scriptsize>PERBER</span>
-</td></tr>
-<tr><td valign=top  colspan=4>R. K<span class=scriptsize>ENT</span> D<span class=scriptsize>YBVIG</span>,
-M<span class=scriptsize>ATTHEW</span> F<span class=scriptsize>LATT</span>,
-A<span class=scriptsize>NTON</span> <span class=scriptsize>VAN</span> S<span class=scriptsize>TRAATEN</span>
-</td></tr>
-<tr><td valign=top  colspan=4>(<i>Editors</i>) </td></tr>
-<tr><td valign=top  colspan=4>
-R<span class=scriptsize>ICHARD</span> K<span class=scriptsize>ELSEY</span>, W<span class=scriptsize>ILLIAM</span> C<span class=scriptsize>LINGER</span>,
-J<span class=scriptsize>ONATHAN</span> R<span class=scriptsize>EES</span> </td></tr>
-<tr><td valign=top  colspan=4>(<i>Editors, Revised<sup>5</sup> Report on the
-Algorithmic Language Scheme</i>) </td></tr>
-<tr><td valign=top  colspan=4>
-R<span class=scriptsize>OBERT</span> B<span class=scriptsize>RUCE</span> F<span class=scriptsize>INDLER</span>, J<span class=scriptsize>ACOB</span> M<span class=scriptsize>ATTHEWS</span> </td></tr>
-<tr><td valign=top  colspan=4>(<i>Authors, formal semantics</i>) </td></tr>
-<tr><td valign=top  colspan=4><strong>26 September 2007</strong>
-</td></tr></table>
-</td></tr></table></div>
-<p class=noindent></p>
-</td></tr><tr><td>
-<p>
-</p>
-</td></tr></table></div>
-<p>
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span class=disable>first, previous</span><span><span class=disable>, </span><a href="r6rs-Z-H-1.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-<div align=right class=colophon>Last modified: Wednesday, September 26th, 2007 5:34:54pm MET-1MST-2,M3.5.0,M10.5.0<br></div>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-1.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-1.gif
deleted file mode 100644
index fe261fdfeb..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-1.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-10.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-10.gif
deleted file mode 100644
index f2214112c6..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-10.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-11.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-11.gif
deleted file mode 100644
index 0bda5a840e..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-11.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-12.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-12.gif
deleted file mode 100644
index f7f812c839..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-12.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-13.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-13.gif
deleted file mode 100644
index 6416db52a6..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-13.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-14.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-14.gif
deleted file mode 100644
index 916dad189f..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-14.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-15.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-15.gif
deleted file mode 100644
index c743990132..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-15.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-16.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-16.gif
deleted file mode 100644
index 1d58a69e0b..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-16.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-17.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-17.gif
deleted file mode 100644
index 462b19ec38..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-17.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-18.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-18.gif
deleted file mode 100644
index 91ad3a1bf4..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-18.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-19.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-19.gif
deleted file mode 100644
index 451714000a..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-19.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-2.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-2.gif
deleted file mode 100644
index a175037933..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-2.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-20.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-20.gif
deleted file mode 100644
index d4f737f3da..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-20.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-21.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-21.gif
deleted file mode 100644
index dd191a4429..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-21.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-22.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-22.gif
deleted file mode 100644
index 59b5784dec..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-22.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-23.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-23.gif
deleted file mode 100644
index 228172a5d4..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-23.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-24.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-24.gif
deleted file mode 100644
index 97e43c9b80..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-24.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-25.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-25.gif
deleted file mode 100644
index aec5364c1c..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-25.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-26.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-26.gif
deleted file mode 100644
index d48ba18f92..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-26.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-27.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-27.gif
deleted file mode 100644
index b3666b8119..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-27.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-28.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-28.gif
deleted file mode 100644
index 8d31aeaa2e..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-28.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-3.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-3.gif
deleted file mode 100644
index 7331d9364e..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-3.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-4.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-4.gif
deleted file mode 100644
index 34902e72c5..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-4.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-5.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-5.gif
deleted file mode 100644
index 9c10c502f1..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-5.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-6.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-6.gif
deleted file mode 100644
index f51ae6c63d..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-6.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-7.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-7.gif
deleted file mode 100644
index 85da395204..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-7.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-8.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-8.gif
deleted file mode 100644
index 91c5014799..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-8.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-9.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-9.gif
deleted file mode 100644
index f046174a2c..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-9.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-1.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-1.gif
deleted file mode 100644
index 96d71b64c7..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-1.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-10.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-10.gif
deleted file mode 100644
index 692792a391..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-10.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-11.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-11.gif
deleted file mode 100644
index 06aca0f0af..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-11.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-12.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-12.gif
deleted file mode 100644
index 2b3b7e2d7a..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-12.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-13.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-13.gif
deleted file mode 100644
index 0e409b7bff..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-13.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-14.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-14.gif
deleted file mode 100644
index 1d01901805..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-14.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-15.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-15.gif
deleted file mode 100644
index f6e7b42211..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-15.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-2.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-2.gif
deleted file mode 100644
index c2968560da..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-2.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-3.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-3.gif
deleted file mode 100644
index bb9dd5bf23..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-3.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-4.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-4.gif
deleted file mode 100644
index 1d86361259..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-4.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-5.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-5.gif
deleted file mode 100644
index 4862ef1cbe..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-5.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-6.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-6.gif
deleted file mode 100644
index 4fa7356c77..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-6.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-7.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-7.gif
deleted file mode 100644
index 06aca0f0af..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-7.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-8.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-8.gif
deleted file mode 100644
index 4e613110d4..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-8.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-9.gif b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-9.gif
deleted file mode 100644
index 6376f30002..0000000000
Binary files a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-G-D-9.gif and /dev/null differ
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-1.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-1.html
deleted file mode 100644
index e0a24ef202..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-1.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs.html">previous</a></span><span>, <a href="r6rs-Z-H-2.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_Temp_1"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_Temp_1">Summary</a></h1>
-<p></p>
-<div class=medskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-The report gives a defining description of the programming language
-Scheme.  Scheme is a statically scoped and properly tail-recursive
-dialect of the Lisp programming language invented by Guy Lewis
-Steele&nbsp;Jr. and Gerald Jay&nbsp;Sussman.  It was designed to have an
-exceptionally clear and simple semantics and few different ways to
-form expressions.  A wide variety of programming paradigms, including
-functional, imperative, and message passing styles, find convenient
-expression in Scheme.</p>
-<p>
-This report is accompanied by a report describing standard
-libraries&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_24">24</a>]; references to this document are
-identified by designations such as &#8220;library section&#8221; or &#8220;library
-chapter&#8221;.  It is also accompanied by a report containing
-non-normative appendices&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_22">22</a>].  A fourth report gives
-some historical background and rationales for many aspects of the
-language and its libraries&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_23">23</a>].</p>
-<p>
-</p>
-<div class=medskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-The individuals listed above are not the sole authors of the text of
-the report.  Over the years, the following individuals were involved
-in discussions contributing to the design of the Scheme language, and
-were listed as authors of prior reports:</p>
-<p>
-Hal Abelson, Norman Adams, David Bartley, Gary Brooks, William
-Clinger, R. Kent Dybvig, Daniel Friedman, Robert Halstead, Chris
-Hanson, Christopher Haynes, Eugene Kohlbecker, Don Oxley, Kent Pitman,
-Jonathan Rees, Guillermo Rozas, Guy L. Steele Jr., Gerald Jay Sussman, and
-Mitchell Wand.</p>
-<p>
-In order to highlight recent contributions, they are not listed as
-authors of this version of the report.  However, their contribution
-and service is gratefully acknowledged.</p>
-<p>
-</p>
-<div class=medskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-We intend this report to belong to the entire Scheme community, and so
-we grant permission to copy it in whole or in part without fee.  In
-particular, we encourage implementors of Scheme to use this report as
-a starting point for manuals and other documentation, modifying it as
-necessary.
-</p>
-<p>
-</p>
-<div class=bigskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs.html">previous</a></span><span>, <a href="r6rs-Z-H-2.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-10.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-10.html
deleted file mode 100644
index 66457c850e..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-10.html
+++ /dev/null
@@ -1,597 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-9.html">previous</a></span><span>, <a href="r6rs-Z-H-11.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_7"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_7">Chapter 7</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_7">Libraries</a></h1>
-<p>
-<a name="node_idx_264"></a>Libraries are parts of a program that can be distributed
-independently.
-The library system supports macro definitions within libraries,
-macro exports, and distinguishes the phases in which definitions
-and imports are needed.  This chapter defines the notation for
-libraries and a semantics for library expansion and execution.</p>
-<p>
-</p>
-<a name="node_sec_7.1"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_7.1">7.1&nbsp;&nbsp;Library form</a></h2>
-<p></p>
-<p>
-A library definition must have the following form:<a name="node_idx_266"></a><a name="node_idx_268"></a><a name="node_idx_270"></a></p>
-<p>
-</p>
-
-<tt>(library&nbsp;&lt;library&nbsp;name&gt;<br>
-&nbsp;&nbsp;(export&nbsp;&lt;export&nbsp;spec&gt;&nbsp;<tt>...</tt>)<br>
-&nbsp;&nbsp;(import&nbsp;&lt;import&nbsp;spec&gt;&nbsp;<tt>...</tt>)<br>
-&nbsp;&nbsp;&lt;library&nbsp;body&gt;)<p></tt></p>
-<p>
-A library declaration contains the following elements:</p>
-<p>
-</p>
-<ul>
-<li><p>The &lt;library&nbsp;name&gt; specifies the name of the library
-(possibly with version).
-</p>
-<li><p>The <tt>export</tt> subform specifies a list of exports, which name
-a subset of the bindings defined within or imported into the
-library.
-</p>
-<li><p>The <tt>import</tt> subform specifies the imported bindings as a
-list of import dependencies, where each dependency specifies:
-</p>
-<ul>
-<li><p>the imported library&#8217;s name, and, optionally, constraints on its
-version,
-</p>
-<li><p>the relevant levels, e.g., expand or run time (see
-section&nbsp;<a href="#node_sec_7.2">7.2</a>, and
-</p>
-<li><p>the subset of the library&#8217;s exports to make available within the
-importing library, and the local names to use within the importing
-library for each of the library&#8217;s exports.
-</p>
-</ul><p>
-</p>
-<li><p>The &lt;library body&gt; is the library body, consisting of a
-sequence of definitions followed by a sequence of expressions.  The
-definitions may be both for local (unexported) and exported
-bindings, and the expressions are initialization expressions to be evaluated
-for their effects.
-</p>
-</ul><p></p>
-<p>
-An identifier can be imported with the same local name from two or
-more libraries or for two levels from the same library only if the
-binding exported by each library is the same (i.e., the binding is
-defined in one library, and it arrives through the imports only by
-exporting and re-exporting).  Otherwise, no identifier can be imported
-multiple times, defined multiple times, or both defined and imported.
-No identifiers are visible within a library except for those
-explicitly imported into the library or defined within the library.</p>
-<p>
-A &lt;library name&gt; uniquely identifies a library within an
-implementation, and is globally visible in the <tt>import</tt> clauses
-(see below) of all other libraries within an implementation.
-A &lt;library name&gt; has the following form:</p>
-<p>
-</p>
-
-<tt>(&lt;identifier<sub>1</sub>&gt;&nbsp;&lt;identifier<sub>2</sub>&gt;&nbsp;<tt>...</tt>&nbsp;&lt;version&gt;)<p></tt></p>
-<p>
-where &lt;version&gt; is empty or has the following form:
-</p>
-
-<tt>(&lt;sub-version&gt;&nbsp;<tt>...</tt>)<p></tt></p>
-<p>
-Each &lt;sub-version&gt; must represent an exact nonnegative integer object.
-An empty &lt;version&gt; is equivalent to <tt>()</tt>.</p>
-<p>
-An &lt;export&nbsp;spec&gt; names a set of imported and locally defined bindings to
-be exported, possibly with different
-external names.  An &lt;export&nbsp;spec&gt; must have one of the
-following forms:</p>
-<p>
-</p>
-
-<tt>&lt;identifier&gt;<br>
-(rename&nbsp;(&lt;identifier<sub>1</sub>&gt;&nbsp;&lt;identifier<sub>2</sub>&gt;)&nbsp;<tt>...</tt>)<p></tt></p>
-<p>
-In an &lt;export&nbsp;spec&gt;, an &lt;identifier&gt; names a single binding defined
-within or imported into the library, where the external name for the export is
-the same as the name of the binding within the library. 
-A <tt>rename</tt> spec exports the binding named by 
-&lt;identifier<sub>1</sub>&gt; in each <tt>(&lt;identifier<sub>1</sub>&gt;
-&lt;identifier<sub>2</sub>&gt;)</tt> pairing, using &lt;identifier<sub>2</sub>&gt; as the
-external name.</p>
-<p>
-Each &lt;import&nbsp;spec&gt; specifies a set of bindings to be imported into
-the library, the levels at which they are to be available, and the local
-names by which they are to be known.  An &lt;import spec&gt; must
-be one of the following:
-</p>
-
-<tt>&lt;import&nbsp;set&gt;<br>
-(for&nbsp;&lt;import&nbsp;set&gt;&nbsp;&lt;import&nbsp;level&gt;&nbsp;<tt>...</tt>)<p></tt></p>
-<p>
-An &lt;import level&gt;  is one of the following:
-</p>
-
-<tt>run<br>
-expand<br>
-(meta&nbsp;&lt;level&gt;)<p></tt></p>
-<p>
-where &lt;level&gt; represents an exact integer object.</p>
-<p>
-As an &lt;import level&gt;, <tt>run</tt> is an abbreviation for <tt>(meta 0)</tt>, and <tt>expand</tt> is an abbreviation for <tt>(meta 1)</tt>.
-Levels and phases are discussed in section&nbsp;<a href="#node_sec_7.2">7.2</a>.</p>
-<p>
-An &lt;import&nbsp;set&gt; names a set of bindings from another library and
-possibly specifies local names for the imported bindings.  It must be
-one of the following:</p>
-<p>
-</p>
-
-<tt>&lt;library&nbsp;reference&gt;<br>
-(library&nbsp;&lt;library&nbsp;reference&gt;)<br>
-(only&nbsp;&lt;import&nbsp;set&gt;&nbsp;&lt;identifier&gt;&nbsp;<tt>...</tt>)<br>
-(except&nbsp;&lt;import&nbsp;set&gt;&nbsp;&lt;identifier&gt;&nbsp;<tt>...</tt>)<br>
-(prefix&nbsp;&lt;import&nbsp;set&gt;&nbsp;&lt;identifier&gt;)<br>
-(rename&nbsp;&lt;import&nbsp;set&gt;&nbsp;(&lt;identifier<sub>1</sub>&gt;&nbsp;&lt;identifier<sub>2</sub>&gt;)&nbsp;<tt>...</tt>)<p></tt></p>
-<p>
-A &lt;library&nbsp;reference&gt; identifies a library by its 
-name and optionally by its version.  It has one of the following forms:</p>
-<p>
-</p>
-
-<tt>(&lt;identifier<sub>1</sub>&gt;&nbsp;&lt;identifier<sub>2</sub>&gt;&nbsp;<tt>...</tt>)<br>
-(&lt;identifier<sub>1</sub>&gt;&nbsp;&lt;identifier<sub>2</sub>&gt;&nbsp;<tt>...</tt>&nbsp;&lt;version&nbsp;reference&gt;)<p></tt></p>
-<p>
-A &lt;library&nbsp;reference&gt; whose first &lt;identifier&gt; is
-<tt>for</tt>, <tt>library</tt>, <tt>only</tt>, <tt>except</tt>, <tt>prefix</tt>, or <tt>rename</tt> is
-permitted only within a <tt>library</tt> &lt;import&nbsp;set&gt;.
-The &lt;import&nbsp;set&gt; <tt>(library &lt;library&nbsp;reference&gt;)</tt> is
-otherwise equivalent to &lt;library&nbsp;reference&gt;.</p>
-<p>
-A &lt;library&nbsp;reference&gt; with no &lt;version&nbsp;reference&gt;
-(first form above) is equivalent to a &lt;library&nbsp;reference&gt; with a
-&lt;version&nbsp;reference&gt; of <tt>()</tt>.</p>
-<p>
-A &lt;version&nbsp;reference&gt; specifies a set of &lt;version&gt;s that
-it matches.  The &lt;library&nbsp;reference&gt; identifies all libraries of
-the same name and whose version is matched by the
-&lt;version&nbsp;reference&gt;.  A &lt;version&nbsp;reference&gt; has
-the following form:
-</p>
-
-<tt>(&lt;sub-version&nbsp;reference<sub>1</sub>&gt;&nbsp;<tt>...</tt>&nbsp;&lt;sub-version&nbsp;reference<sub><em>n</em></sub>&gt;)<br>
-(and&nbsp;&lt;version&nbsp;reference&gt;&nbsp;<tt>...</tt>)<br>
-(or&nbsp;&lt;version&nbsp;reference&gt;&nbsp;<tt>...</tt>)<br>
-(not&nbsp;&lt;version&nbsp;reference&gt;)<p></tt>
-A &lt;version reference&gt; of the first form matches a &lt;version&gt;
-with at least <em>n</em> elements, whose &lt;sub-version reference&gt;s match
-the corresponding &lt;sub-version&gt;s.  An <tt>and</tt> &lt;version
-reference&gt; matches a version if all &lt;version references&gt;
-following the <tt>and</tt> match it.  Correspondingly, an <tt>or</tt> &lt;version reference&gt; matches a version if one of
-&lt;version references&gt; following the <tt>or</tt> matches it,
-and a <tt>not</tt> &lt;version reference&gt; matches a version if the
-&lt;version reference&gt; following it does not match it.</p>
-<p>
-A &lt;sub-version reference&gt; has one of the following forms:</p>
-<p>
-</p>
-
-<tt>&lt;sub-version&gt;<br>
-(&gt;=&nbsp;&lt;sub-version&gt;)<br>
-(&lt;=&nbsp;&lt;sub-version&gt;)<br>
-(and&nbsp;&lt;sub-version&nbsp;reference&gt;&nbsp;<tt>...</tt>)<br>
-(or&nbsp;&lt;sub-version&nbsp;reference&gt;&nbsp;<tt>...</tt>)<br>
-(not&nbsp;&lt;sub-version&nbsp;reference&gt;)<p></tt></p>
-<p>
-A &lt;sub-version reference&gt; of the first form matches a
-&lt;sub-version&gt; if it is equal to it.  A <tt>&gt;=</tt>
-&lt;sub-version reference&gt; of the first form matches a sub-version
-if it is greater or equal to the &lt;sub-version&gt; following it;
-analogously for <tt>&lt;=</tt>.  An <tt>and</tt> &lt;sub-version reference&gt;
-matches a sub-version if all of the subsequent &lt;sub-version
-reference&gt;s match it.  Correspondingly, an <tt>or</tt>
-&lt;sub-version reference&gt; matches a sub-version if one of the
-subsequent &lt;sub-version reference&gt;s matches it, and a <tt>not</tt>
-&lt;sub-version reference&gt; matches a sub-version if the subsequent
-&lt;sub-version reference&gt; does not match it.</p>
-<p>
-Examples:</p>
-<p>
-</p>
-<div align=left><img src="r6rs-Z-G-1.gif" border="0" alt="[r6rs-Z-G-1.gif]"></div><p>
-</p>
-<p>
-When more than one library is identified by a library reference, the
-choice of libraries is determined in some implementation-dependent manner.</p>
-<p>
-To avoid problems such as incompatible types and replicated state,
-implementations should prohibit the two libraries whose library names
-consist of the same sequence of identifiers but whose versions do not
-match to co-exist in the same program.</p>
-<p>
-By default, all of an imported library&#8217;s exported bindings are made
-visible within an importing library using the names given to the bindings
-by the imported library.
-The precise set of bindings to be imported and the names of those
-bindings can be adjusted with the <tt>only</tt>, <tt>except</tt>,
-<tt>prefix</tt>, and <tt>rename</tt> forms as described below.</p>
-<p>
-</p>
-<ul>
-<li><p>An <tt>only</tt> form produces a subset of the bindings from another
-&lt;import&nbsp;set&gt;, including only the listed
-&lt;identifier&gt;s.
-The included &lt;identifier&gt;s must be in
-the original &lt;import&nbsp;set&gt;.
-</p>
-<li><p>An <tt>except</tt> form produces a subset of the bindings from another
-&lt;import&nbsp;set&gt;, including all but the listed
-&lt;identifier&gt;s.
-All of the excluded &lt;identifier&gt;s must be in
-the original &lt;import&nbsp;set&gt;.
-</p>
-<li><p>A <tt>prefix</tt> form adds the &lt;identifier&gt; prefix to each
-name from another &lt;import&nbsp;set&gt;.
-</p>
-<li><p>A <tt>rename</tt> form, <tt>(rename (&lt;identifier<sub>1</sub>&gt; &lt;identifier<sub>2</sub>&gt;) <tt>...</tt>)</tt>,
-removes the bindings for <tt>&lt;identifier<sub>1</sub>&gt; <tt>...</tt></tt> to form an
-intermediate &lt;import&nbsp;set&gt;, then adds the bindings back for the
-corresponding <tt>&lt;identifier<sub>2</sub>&gt; <tt>...</tt></tt> to form the final
-&lt;import&nbsp;set&gt;.
-Each &lt;identifier<sub>1</sub>&gt; must be in the original &lt;import&nbsp;set&gt;,
-each &lt;identifier<sub>2</sub>&gt; must not be in the intermediate &lt;import&nbsp;set&gt;,
-and the &lt;identifier<sub>2</sub>&gt;s must be distinct.
-</p>
-</ul><p>
-It is a syntax violation if a constraint given above is not met.</p>
-<p>
-
-The &lt;library&nbsp;body&gt; of a <tt>library</tt> form consists of forms
-that are classified as 
-<i>definitions</i><a name="node_idx_272"></a>or
-<i>expressions</i><a name="node_idx_274"></a>.  Which forms belong to
-which class depends on the imported libraries and the result of
-expansion&#8212;see chapter&nbsp;<a href="r6rs-Z-H-13.html#node_chap_10">10</a>.  Generally, forms that
-are not 
-definitions (see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.2">11.2</a> for definitions available
-through the base library) are expressions.</p>
-<p>
-A &lt;library&nbsp;body&gt; is like a &lt;body&gt; (see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.3">11.3</a>) except that
-a &lt;library&nbsp;body&gt;s need not include any expressions.  It must
-have the following form:</p>
-<p>
-</p>
-
-<tt>&lt;definition&gt;&nbsp;<tt>...</tt>&nbsp;&lt;expression&gt;&nbsp;<tt>...</tt><p></tt></p>
-<p>
-When <tt>begin</tt>, <tt>let-syntax</tt>, or <tt>letrec-syntax</tt> forms
-occur in a top-level body prior to the first
-expression, they are spliced into the body; see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.4.7">11.4.7</a>.
-Some or all of the body, including portions wrapped in <tt>begin</tt>,
-<tt>let-syntax</tt>, or <tt>letrec-syntax</tt>
-forms, may be specified by a syntactic abstraction
-(see section&nbsp;<a href="r6rs-Z-H-12.html#node_sec_9.2">9.2</a>).</p>
-<p>
-The transformer expressions and bindings are evaluated and created
-from left to right, as described in chapter&nbsp;<a href="r6rs-Z-H-13.html#node_chap_10">10</a>.
-The expressions of variable definitions are evaluated
-from left to right, as if in an implicit <tt>letrec*</tt>,
-and the body expressions are also evaluated from left to right
-after the expressions of the variable definitions.
-A fresh location is created for each exported variable and initialized
-to the value of its local counterpart.
-The effect of returning twice to the continuation of the last body
-expression is unspecified.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The names <tt>library</tt>, <tt>export</tt>, <tt>import</tt>,
-<tt>for</tt>, <tt>run</tt>, <tt>expand</tt>, <tt>meta</tt>,
-<tt>import</tt>, <tt>export</tt>, <tt>only</tt>, <tt>except</tt>, <tt>prefix</tt>, <tt>rename</tt>, <tt>and</tt>, <tt>or</tt>, <tt>not</tt>, <tt>&gt;=</tt>, and <tt>&lt;=</tt>
-appearing in the library syntax are part of the
-syntax and are not reserved, i.e., the same names can be used for other
-purposes within the library or even exported from or imported 
-into a library with different meanings, without affecting their
-use in the <tt>library</tt> form.
-</blockquote><p>
-Bindings defined with a library are not visible in code
-outside of the library, unless the bindings are explicitly exported from the
-library. 
-An exported macro may, however, <em>implicitly export</em> an otherwise
-unexported identifier defined within or imported into the library.
-That is, it may insert a reference to that identifier into the output code
-it produces.</p>
-<p>
- 
-All explicitly exported variables are immutable in both the
-exporting and importing libraries. 
-It is thus a syntax violation if an
-explicitly exported variable appears on the left-hand side of a <tt>set!</tt>
-expression, either in the exporting or importing libraries.</p>
-<p>
-All implicitly exported variables are also immutable in both the
-exporting and importing libraries.
-It is thus a syntax violation if a
-variable appears on the left-hand side of a <tt>set!</tt>
-expression in any code produced by an exported macro outside of the
-library in which the variable is defined.
-It is also a syntax violation if a
-reference to an assigned variable appears in any code produced by
-an exported macro outside of the library in which the variable is defined,
-where an assigned variable is one that appears on the left-hand
-side of a <tt>set!</tt> expression in the exporting library.</p>
-<p>
-All other variables defined within a library are mutable.</p>
-<p>
-</p>
-<a name="node_sec_7.2"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_7.2">7.2&nbsp;&nbsp;Import and export levels</a></h2>
-<p></p>
-<p>
-Expanding a library may require run-time information from another
-library.  For example, if a macro transformer calls a
-procedure from library <em>A</em>, then the library <em>A</em> must be
-instantiated before expanding any use of the macro in library <em>B</em>.  Library <em>A</em> may
-not be
-needed when library <em>B</em> is eventually run as part of a program, or it
-may be needed for run time of library <em>B</em>, too.  The library
-mechanism distinguishes these times by phases, which are explained in
-this section.</p>
-<p>
-Every library can be characterized by expand-time information (minimally,
-its imported libraries, a list of the exported keywords, a list of the
-exported variables, and code to evaluate the transformer expressions) and
-run-time information (minimally, code to evaluate the variable definition
-right-hand-side expressions, and code to evaluate the body expressions).
-The expand-time information must be available to expand references to
-any exported binding, and the run-time information must be available to
-evaluate references to any exported variable binding.</p>
-<p>
-<a name="node_idx_276"></a>A <em>phase</em> is a time at which the expressions within a library are
-evaluated.
-Within a library body, top-level expressions and
-the right-hand sides of <tt>define</tt> forms are evaluated at run time,
-i.e., phase 0, and the right-hand
-sides of <tt>define-syntax</tt> forms are evaluated at expand time, i.e.,
-phase 1.
-When <tt>define-syntax</tt>,
-<tt>let-syntax</tt>, or <tt>letrec-syntax</tt>
-forms appear within code evaluated at phase <em>n</em>, the right-hand sides
-are evaluated at phase <em>n</em> + 1.</p>
-<p>
-These phases are relative to the phase in which the library itself is
-used.
-An <a name="node_idx_278"></a><em>instance</em> of a library corresponds to an evaluation of its
-variable definitions and expressions in a particular phase relative to another
-library&#8212;a process called <a name="node_idx_280"></a><em>instantiation</em>.
-For example, if a top-level expression in a library <em>B</em> refers to
-a variable export from another library <em>A</em>, then it refers to the export from an
-instance of <em>A</em> at phase 0 (relative to the phase of <em>B</em>).
-But if a phase 1 expression within <em>B</em> refers to the same binding from
-<em>A</em>, then it refers to the export from an instance of <em>A</em> at phase 1
-(relative to the phase of <em>B</em>).</p>
-<p>
-A <a name="node_idx_282"></a><em>visit</em> of a library corresponds to the evaluation of its syntax
-definitions in a particular phase relative to another
-library&#8212;a process called <a name="node_idx_284"></a><em>visiting</em>. 
-For example, if a top-level expression in a library <em>B</em> refers to
-a macro export from another library <em>A</em>, then it refers to the export from a
-visit of <em>A</em> at phase 0 (relative to the phase of <em>B</em>), which corresponds
-to the evaluation of the macro&#8217;s transformer expression at phase 1.</p>
-<p>
-<a name="node_idx_286"></a><a name="node_idx_288"></a>A <em>level</em> is a lexical property of an identifier that determines
-in which phases it can be referenced. The level for each identifier
-bound by a definition within a library is 0; that is, the identifier
-can be referenced only at phase 0 within the library.
-The level for each imported binding is determined by the enclosing <tt>for</tt> form of the <tt>import</tt> in the importing library, in
-addition to the levels of the identifier in the exporting
-library. Import and export levels are combined by pairwise addition of
-all level combinations.  For example, references to an imported
-identifier exported for levels <em>p</em><sub><em>a</em></sub> and <em>p</em><sub><em>b</em></sub> and imported for levels
-<em>q</em><sub><em>a</em></sub>, <em>q</em><sub><em>b</em></sub>, and <em>q</em><sub><em>c</em></sub> are valid at levels <em>p</em><sub><em>a</em></sub> + <em>q</em><sub><em>a</em></sub>, <em>p</em><sub><em>a</em></sub> + <em>q</em><sub><em>b</em></sub>,
-<em>p</em><sub><em>a</em></sub> + <em>q</em><sub><em>c</em></sub>, <em>p</em><sub><em>b</em></sub> + <em>q</em><sub><em>a</em></sub>, <em>p</em><sub><em>b</em></sub> + <em>q</em><sub><em>b</em></sub>, and <em>p</em><sub><em>b</em></sub> + <em>q</em><sub><em>c</em></sub>. An &lt;import&nbsp;set&gt;
-without an enclosing <tt>for</tt> is equivalent to <tt>(for
-&lt;import&nbsp;set&gt; run)</tt>, which is the same as <tt>(for
-&lt;import&nbsp;set&gt; (meta 0))</tt>.</p>
-<p>
-The export level of an exported binding is 0 for all bindings
-that are defined within the exporting library. The export levels of a
-reexported binding, i.e., an export imported from another library, are the
-same as the effective import levels of that binding within the reexporting
-library.</p>
-<p>
-For the libraries defined in the library report, the export level is
-0 for nearly all bindings. The exceptions are <tt>syntax-rules</tt>,
-<tt>identifier-syntax</tt>, <tt>...</tt>, and <tt>_</tt> from the
-<tt>(rnrs base (6))</tt> library, which are exported with level 1, <tt>set!</tt> from the <tt>(rnrs base (6))</tt> library, which is exported with
-levels 0 and 1, and all bindings from the composite
-<tt>(rnrs (6))</tt> library (see library
-chapter&nbsp;on &#8220;Composite library&#8221;), which are
-exported with levels 0 and 1.</p>
-<p>
-Macro expansion within a library can introduce a reference to an
-identifier that is not explicitly imported into the library. In that
-case, the phase of the reference must match the identifier&#8217;s level as
-shifted by the difference between the phase of the source library
-(i.e., the library that supplied the identifier&#8217;s lexical context) and
-the library that encloses the reference. For example, suppose that
-expanding a library invokes a macro transformer, and the evaluation of
-the macro transformer refers to an identifier that is exported from
-another library (so the phase-1 instance of the library is used);
-suppose further that the value of the binding is a syntax object
-representing an identifier with only a level-<em>n</em> binding; then, the
-identifier must be used only at phase <em>n</em> + 1 in the
-library being expanded. This combination of levels and phases is why
-negative levels on identifiers can be useful, even though libraries
-exist only at non-negative phases.</p>
-<p>
-If any of a library&#8217;s definitions are referenced at phase 0 in the
-expanded form of a program, then an instance of the referenced library
-is created for phase 0 before the program&#8217;s definitions and
-expressions are evaluated. This rule applies transitively: if the
-expanded form of one library references at phase 0 an identifier
-from another library, then before the referencing library is
-instantiated at phase <em>n</em>, the referenced library must be instantiated
-at phase <em>n</em>. When an identifier is referenced at any phase <em>n</em>
-greater than 0, in contrast, then the defining library is
-instantiated at phase <em>n</em> at some unspecified time before the
-reference is evaluated. Similarly, when a macro keyword is referenced at
-phase <em>n</em> during the expansion of a library, then the
-defining library is visited at phase <em>n</em> at some unspecified time
-before the reference is evaluated.</p>
-<p>
-An implementation may distinguish instances/visits of a library for
-different phases or to use an instance/visit at any phase as an instance/visit at
-any other phase. An implementation may further
-expand each <tt>library</tt> form with distinct
-visits of libraries in any phase and/or instances of
-libraries in phases above 0. An implementation may
-create instances/visits of more libraries at more phases than required to
-satisfy references. When an identifier appears as an expression in a
-phase that is inconsistent with the identifier&#8217;s level, then an
-implementation may raise an exception either at expand time or run
-time, or it may allow the reference. Thus, a library whose meaning depends on whether the
-instances of a library are distinguished or shared across phases or
-<tt>library</tt> expansions may be unportable.</p>
-<p>
-</p>
-<a name="node_sec_7.3"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_7.3">7.3&nbsp;&nbsp;Examples</a></h2>
-<p>Examples for various &lt;import&nbsp;spec&gt;s and &lt;export&nbsp;spec&gt;s:</p>
-<p>
-</p>
-
-<tt>(library&nbsp;(stack)<br>
-&nbsp;&nbsp;(export&nbsp;make&nbsp;push!&nbsp;pop!&nbsp;empty!)<br>
-&nbsp;&nbsp;(import&nbsp;(rnrs))<br>
-<br>
-&nbsp;&nbsp;(define&nbsp;(make)&nbsp;(list&nbsp;&#8217;()))<br>
-&nbsp;&nbsp;(define&nbsp;(push!&nbsp;s&nbsp;v)&nbsp;(set-car!&nbsp;s&nbsp;(cons&nbsp;v&nbsp;(car&nbsp;s))))<br>
-&nbsp;&nbsp;(define&nbsp;(pop!&nbsp;s)&nbsp;(let&nbsp;([v&nbsp;(caar&nbsp;s)])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set-car!&nbsp;s&nbsp;(cdar&nbsp;s))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;v))<br>
-&nbsp;&nbsp;(define&nbsp;(empty!&nbsp;s)&nbsp;(set-car!&nbsp;s&nbsp;&#8217;())))<br>
-<br>
-(library&nbsp;(balloons)<br>
-&nbsp;&nbsp;(export&nbsp;make&nbsp;push&nbsp;pop)<br>
-&nbsp;&nbsp;(import&nbsp;(rnrs))<br>
-<br>
-&nbsp;&nbsp;(define&nbsp;(make&nbsp;w&nbsp;h)&nbsp;(cons&nbsp;w&nbsp;h))<br>
-&nbsp;&nbsp;(define&nbsp;(push&nbsp;b&nbsp;amt)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;(-&nbsp;(car&nbsp;b)&nbsp;amt)&nbsp;(+&nbsp;(cdr&nbsp;b)&nbsp;amt)))<br>
-&nbsp;&nbsp;(define&nbsp;(pop&nbsp;b)&nbsp;(display&nbsp;&quot;Boom!&nbsp;&quot;)&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;(*&nbsp;(car&nbsp;b)&nbsp;(cdr&nbsp;b)))&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(newline)))<br>
-<br>
-(library&nbsp;(party)<br>
-&nbsp;&nbsp;;;&nbsp;Total&nbsp;exports:<br>
-&nbsp;&nbsp;;;&nbsp;make,&nbsp;push,&nbsp;push!,&nbsp;make-party,&nbsp;pop!<br>
-&nbsp;&nbsp;(export&nbsp;(rename&nbsp;(balloon:make&nbsp;make)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(balloon:push&nbsp;push))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;push!<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;make-party<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(rename&nbsp;(party-pop!&nbsp;pop!)))<br>
-&nbsp;&nbsp;(import&nbsp;(rnrs)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(only&nbsp;(stack)&nbsp;make&nbsp;push!&nbsp;pop!)&nbsp;;&nbsp;not&nbsp;empty!<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(prefix&nbsp;(balloons)&nbsp;balloon:))<br>
-<br>
-&nbsp;&nbsp;;;&nbsp;Creates&nbsp;a&nbsp;party&nbsp;as&nbsp;a&nbsp;stack&nbsp;of&nbsp;balloons,<br>
-&nbsp;&nbsp;;;&nbsp;starting&nbsp;with&nbsp;two&nbsp;balloons<br>
-&nbsp;&nbsp;(define&nbsp;(make-party)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;([s&nbsp;(make)])&nbsp;;&nbsp;from&nbsp;stack<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(push!&nbsp;s&nbsp;(balloon:make&nbsp;10&nbsp;10))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(push!&nbsp;s&nbsp;(balloon:make&nbsp;12&nbsp;9))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;s))<br>
-&nbsp;&nbsp;(define&nbsp;(party-pop!&nbsp;p)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(balloon:pop&nbsp;(pop!&nbsp;p))))<br>
-<br>
-<br>
-(library&nbsp;(main)<br>
-&nbsp;&nbsp;(export)<br>
-&nbsp;&nbsp;(import&nbsp;(rnrs)&nbsp;(party))<br>
-<br>
-&nbsp;&nbsp;(define&nbsp;p&nbsp;(make-party))<br>
-&nbsp;&nbsp;(pop!&nbsp;p)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;displays&nbsp;&quot;Boom!&nbsp;108&quot;<br>
-&nbsp;&nbsp;(push!&nbsp;p&nbsp;(push&nbsp;(make&nbsp;5&nbsp;5)&nbsp;1))<br>
-&nbsp;&nbsp;(pop!&nbsp;p))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;displays&nbsp;&quot;Boom!&nbsp;24&quot;<p></tt></p>
-<p>
-Examples for macros and phases:</p>
-<p>
-</p>
-
-<tt>(library&nbsp;(my-helpers&nbsp;id-stuff)<br>
-&nbsp;&nbsp;(export&nbsp;find-dup)<br>
-&nbsp;&nbsp;(import&nbsp;(rnrs))<br>
-<br>
-&nbsp;&nbsp;(define&nbsp;(find-dup&nbsp;l)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(and&nbsp;(pair?&nbsp;l)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;loop&nbsp;((rest&nbsp;(cdr&nbsp;l)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(null?&nbsp;rest)&nbsp;(find-dup&nbsp;(cdr&nbsp;l))]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(bound-identifier=?&nbsp;(car&nbsp;l)&nbsp;(car&nbsp;rest))&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(car&nbsp;rest)]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[else&nbsp;(loop&nbsp;(cdr&nbsp;rest))])))))<br>
-<br>
-(library&nbsp;(my-helpers&nbsp;values-stuff)<br>
-&nbsp;&nbsp;(export&nbsp;mvlet)<br>
-&nbsp;&nbsp;(import&nbsp;(rnrs)&nbsp;(for&nbsp;(my-helpers&nbsp;id-stuff)&nbsp;expand))<br>
-<br>
-&nbsp;&nbsp;(define-syntax&nbsp;mvlet<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(stx)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-case&nbsp;stx&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;[(id&nbsp;...)&nbsp;expr]&nbsp;body0&nbsp;body&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(not&nbsp;(find-dup&nbsp;(syntax&nbsp;(id&nbsp;...))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(call-with-values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;expr)&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(id&nbsp;...)&nbsp;body0&nbsp;body&nbsp;...)))]))))<br>
-<br>
-(library&nbsp;(let-div)<br>
-&nbsp;&nbsp;(export&nbsp;let-div)<br>
-&nbsp;&nbsp;(import&nbsp;(rnrs)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(my-helpers&nbsp;values-stuff)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(rnrs&nbsp;r5rs))<br>
-<br>
-&nbsp;&nbsp;(define&nbsp;(quotient+remainder&nbsp;n&nbsp;d)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;([q&nbsp;(quotient&nbsp;n&nbsp;d)])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(values&nbsp;q&nbsp;(-&nbsp;n&nbsp;(*&nbsp;q&nbsp;d)))))<br>
-&nbsp;&nbsp;(define-syntax&nbsp;let-div<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;n&nbsp;d&nbsp;(q&nbsp;r)&nbsp;body0&nbsp;body&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(mvlet&nbsp;[(q&nbsp;r)&nbsp;(quotient+remainder&nbsp;n&nbsp;d)]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body0&nbsp;body&nbsp;...)])))<p></tt></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-9.html">previous</a></span><span>, <a href="r6rs-Z-H-11.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-11.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-11.html
deleted file mode 100644
index e86e83a15d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-11.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-10.html">previous</a></span><span>, <a href="r6rs-Z-H-12.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_8"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_8">Chapter 8</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_8">Top-level programs</a></h1>
-<p></p>
-<p>
-A <a name="node_idx_290"></a><em>top-level program</em> specifies an entry point for defining and running
-a Scheme program.  A top-level program specifies a set of libraries to import and
-code to run.  Through the imported libraries, whether directly or through the
-transitive closure of importing, a top-level program defines a complete Scheme
-program.</p>
-<p>
-</p>
-<a name="node_sec_8.1"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_8.1">8.1&nbsp;&nbsp;Top-level program syntax</a></h2>
-<p></p>
-<p>
-A top-level program is a delimited piece of text, typically a file, that 
-has the following form:
-</p>
-
-<tt>&lt;import&nbsp;form&gt;&nbsp;&lt;top-level&nbsp;body&gt;<p></tt>
-An &lt;import form&gt; has the following form:
-</p>
-
-<tt>(import&nbsp;&lt;import&nbsp;spec&gt;&nbsp;<tt>...</tt>)<p></tt>
-A &lt;top-level body&gt; has the following form:
-</p>
-
-<tt>&lt;top-level&nbsp;body&nbsp;form&gt;&nbsp;<tt>...</tt><p></tt>
-A &lt;top-level body form&gt; is either a &lt;definition&gt; or an
-&lt;expression&gt;.</p>
-<p>
-The &lt;import form&gt; is identical to the import clause in
-libraries (see section&nbsp;<a href="r6rs-Z-H-10.html#node_sec_7.1">7.1</a>), 
-and specifies a set of libraries to import.  A &lt;top-level 
-body&gt; is like a &lt;library body&gt; (see
-section&nbsp;<a href="r6rs-Z-H-10.html#node_sec_7.1">7.1</a>), except that 
-definitions and expressions may occur in any order.  Thus, the syntax
-specified by &lt;top-level body form&gt; refers to the result of macro
-expansion.</p>
-<p>
-When uses of <tt>begin</tt>, <tt>let-syntax</tt>, or <tt>letrec-syntax</tt>
-from the <tt>(rnrs base (6))</tt> library
-occur in a top-level body prior to the first
-expression, they are spliced into the body; see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.4.7">11.4.7</a>.
-Some or all of the body, including portions wrapped in <tt>begin</tt>,
-<tt>let-syntax</tt>, or <tt>letrec-syntax</tt>
-forms, may be specified by a syntactic abstraction
-(see section&nbsp;<a href="r6rs-Z-H-12.html#node_sec_9.2">9.2</a>).</p>
-<p>
-</p>
-<a name="node_sec_8.2"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_8.2">8.2&nbsp;&nbsp;Top-level program semantics</a></h2>
-<p>A top-level program is executed by treating the program similarly to a library, and
-evaluating its definitions and expressions.
-The semantics of a top-level body may be roughly explained by
-a simple translation into a library body: 
-Each &lt;expression&gt; that appears before a
-definition in
-the top-level body is converted into a dummy definition 
-</p>
-
-<tt>(define&nbsp;&lt;variable&gt;&nbsp;(begin&nbsp;&lt;expression&gt;&nbsp;&lt;unspecified&gt;))<p></tt>
-where &lt;variable&gt; is a fresh identifier and &lt;unspecified&gt;
-is a side-effect-free expression returning an unspecified value.
-(It is generally impossible to determine which forms are 
-definitions and expressions without concurrently expanding the body, so
-the actual translation is somewhat more complicated; see
-chapter&nbsp;<a href="r6rs-Z-H-13.html#node_chap_10">10</a>.)</p>
-<p>
-On platforms that support it, a top-level program may access its command line 
-by calling the <tt>command-line</tt> procedure (see library 
-section&nbsp;on &#8220;Command-line access and exit values&#8221;).</p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-10.html">previous</a></span><span>, <a href="r6rs-Z-H-12.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-12.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-12.html
deleted file mode 100644
index 452665356e..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-12.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-11.html">previous</a></span><span>, <a href="r6rs-Z-H-13.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_9"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_9">Chapter 9</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_9">Primitive syntax</a></h1>
-<p>After the <tt>import</tt> form within a <tt>library</tt> form or a top-level
-program, the forms
-that constitute the body of the library or the top-level program
-depend on the libraries that are
-imported. In particular, imported syntactic keywords determine 
-the available syntactic abstractions and whether each form is a 
-definition or expression. A few form types are
-always available independent of imported libraries, however,
-including constant literals, variable references, procedure calls,
-and macro uses.</p>
-<p>
-</p>
-<a name="node_sec_9.1"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_9.1">9.1&nbsp;&nbsp;Primitive expression types</a></h2>
-<p></p>
-<p>
-The entries in this section all describe expressions, which may occur
-in the place of &lt;expression&gt; syntactic variables.  See
-also section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.4">11.4</a>.</p>
-<p>
-</p>
-<a name="node_sec_Temp_14"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_14">Constant literals</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>&lt;number&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<div align=left><tt>&lt;boolean&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<div align=left><tt>&lt;character&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<div align=left><tt>&lt;string&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<div align=left><tt>&lt;bytevector&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<a name="node_idx_292"></a><p>
-An expression consisting of a representation of a number object, a
-boolean, a character, a string, or a bytevector, evaluates &#8220;to
-itself&#8221;.</p>
-<p>
-</p>
-
-<tt>145932&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;145932<br>
-<tt>#t</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-&quot;abc&quot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&quot;abc&quot;<br>
-#vu8(2&nbsp;24&nbsp;123)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;#vu8(2&nbsp;24&nbsp;123)<p></tt></p>
-<p>
-As noted in section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.10">5.10</a>, the value of a literal
-expression is immutable.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_Temp_15"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_15">Variable references</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p></p>
-<div align=left><tt>&lt;variable&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-An expression consisting of a variable<a name="node_idx_294"></a>(section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.2">5.2</a>) is a variable reference if it is not a
-macro use (see below).  The value of
-the variable reference is the value stored in the location to which the
-variable is bound.  It is a syntax violation to reference
-an unbound<a name="node_idx_296"></a>variable.</p>
-<p>
-The following example examples assumes the base library
-has been imported:
-</p>
-
-<tt>(define&nbsp;x&nbsp;28)<br>
-x&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;28<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_Temp_16"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_16">Procedure calls</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(&lt;operator&gt; &lt;operand<sub>1</sub>&gt; <tt>...</tt>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-A procedure call consists of expressions for the procedure to be
-called and the arguments to be passed to it, with enclosing
-parentheses.  A form in an expression context is a procedure call if
-&lt;operator&gt; is not an identifier bound as a syntactic keyword
-(see section&nbsp;<a href="#node_sec_9.2">9.2</a> below).</p>
-<p>
-When a procedure call is evaluated, the operator and operand
-expressions are evaluated (in an unspecified order) and the resulting
-procedure is passed the resulting
-arguments.<a name="node_idx_298"></a><a name="node_idx_300"></a></p>
-<p>
-The following examples assume the <tt>(rnrs base (6))</tt> library
-has been imported:
-</p>
-
-<tt>(+&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;7<br>
-((if&nbsp;<tt>#f</tt>&nbsp;+&nbsp;*)&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;12<p></tt>
-If the value of &lt;operator&gt; is not a procedure, an exception with
-condition type <tt>&amp;assertion</tt> is raised.  Also, if &lt;operator&gt;
-does not accept as many arguments as there are &lt;operand&gt;s, an
-exception with condition type <tt>&amp;assertion</tt> is raised.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em> In contrast to other dialects of Lisp, the order of
-evaluation is unspecified, and the operator expression and the operand
-expressions are always evaluated with the same evaluation rules.<p>
-Although the order of evaluation is otherwise unspecified, the effect of
-any concurrent evaluation of the operator and operand expressions is
-constrained to be consistent with some sequential order of evaluation.
-The order of evaluation may be chosen differently for each procedure call.
-</p>
-</blockquote><p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em> In many dialects of Lisp, the form <tt>()</tt> is a legitimate expression.  In Scheme, expressions written as
-list/pair forms must have at
-least one subexpression, so <tt>()</tt> is not a syntactically valid
-expression.
-</blockquote><p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_9.2"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_9.2">9.2&nbsp;&nbsp;Macros</a></h2>
-<p></p>
-<p>
-Libraries and top-level programs can define and use new kinds of derived expressions and
-definitions called <em>syntactic abstractions</em> or
-<em>macros</em>.<a name="node_idx_302"></a><a name="node_idx_304"></a>A syntactic abstraction is created by binding a keyword to a
-<em>macro transformer</em> or, simply, <em>transformer</em>.
-<a name="node_idx_306"></a><a name="node_idx_308"></a>The transformer determines
-how a use of the macro (called a <a name="node_idx_310"></a><em>macro use</em>)
-is transcribed into a more primitive form.</p>
-<p>
-Most macro uses have the form:
-</p>
-
-<tt>(&lt;keyword&gt;&nbsp;&lt;datum&gt;&nbsp;<tt>...</tt>)<p></tt>where &lt;keyword&gt; is an identifier that uniquely determines the
-kind of form.  This identifier is called the <em>syntactic
-keyword</em><a name="node_idx_312"></a>, or simply <em>keyword</em><a name="node_idx_314"></a>, of the macro<a name="node_idx_316"></a>.
-The number of &lt;datum&gt;s and the syntax
-of each depends on the syntactic abstraction.</p>
-<p>
-Macro uses can also take the form of improper lists, singleton
-identifiers, or <tt>set!</tt> forms, where the second subform of the
-<tt>set!</tt> is the keyword (see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.19">11.19</a>)
-library section&nbsp;on &#8220;<tt>make-variable-transformer</tt>&#8221;):
-</p>
-
-<tt>(&lt;keyword&gt;&nbsp;&lt;datum&gt;&nbsp;<tt>...</tt>&nbsp;.&nbsp;&lt;datum&gt;)<br>
-&lt;keyword&gt;<br>
-(set!&nbsp;&lt;keyword&gt;&nbsp;&lt;datum&gt;)<p></tt></p>
-<p>
-The <tt>define-syntax</tt>, <tt>let-syntax</tt> and <tt>letrec-syntax</tt>
-forms, described in sections&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.2.2">11.2.2</a> and <a href="r6rs-Z-H-14.html#node_sec_11.18">11.18</a>,
-create bindings for keywords, associate them with macro transformers,
-and control the scope within which they are visible.</p>
-<p>
-The <tt>syntax-rules</tt> and <tt>identifier-syntax</tt> forms, described in
-section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.19">11.19</a>, create transformers via a pattern
-language.  Moreover, the <tt>syntax-case</tt> form, described in library
-chapter&nbsp;on &#8220;<tt>syntax-case</tt>&#8221;, 
-allows creating transformers via arbitrary Scheme code.</p>
-<p>
-Keywords occupy the same name space as variables.
-That is, within the same
-scope, an identifier can be bound as a variable or keyword, or neither, but
-not both, and local bindings of either kind may shadow other bindings of
-either kind.</p>
-<p>
-Macros defined using <tt>syntax-rules</tt> and <tt>identifier-syntax</tt>
-are &#8220;hygienic&#8221; and &#8220;referentially transparent&#8221; and thus preserve
-Scheme&#8217;s lexical scoping&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_16">16</a>,&nbsp;<a href="r6rs-Z-H-21.html#node_bib_15">15</a>,&nbsp;<a href="r6rs-Z-H-21.html#node_bib_2">2</a>,&nbsp;<a href="r6rs-Z-H-21.html#node_bib_6">6</a>,&nbsp;<a href="r6rs-Z-H-21.html#node_bib_9">9</a>]:
-<a name="node_idx_318"></a><a name="node_idx_320"></a></p>
-<p>
-</p>
-<ul>
-<li><p>If a macro transformer inserts a binding for an identifier
-(variable or keyword) not appearing in the macro use, the identifier is in effect renamed
-throughout its scope to avoid conflicts with other identifiers.</p>
-<p>
-</p>
-<li><p>If a macro transformer inserts a free reference to an
-identifier, the reference refers to the binding that was visible
-where the transformer was specified, regardless of any local
-bindings that may surround the use of the macro.
-</p>
-</ul><p></p>
-<p>
-Macros defined using the <tt>syntax-case</tt> facility are also
-hygienic unless <tt>datum-&gt;syntax</tt>
-(see library section&nbsp;on &#8220;Syntax-object and datum conversions&#8221;) is used.</p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-11.html">previous</a></span><span>, <a href="r6rs-Z-H-13.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-13.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-13.html
deleted file mode 100644
index d45e1fb94f..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-13.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-12.html">previous</a></span><span>, <a href="r6rs-Z-H-14.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_10"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_10">Chapter 10</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_10">Expansion process</a></h1>
-<p></p>
-<p>
-Macro uses (see section&nbsp;<a href="r6rs-Z-H-12.html#node_sec_9.2">9.2</a>) are expanded into <i>core
-forms</i><a name="node_idx_322"></a>at the start of evaluation (before compilation or interpretation)
-by a syntax <em>expander</em>.
-The set of core forms is implementation-dependent, as is the
-representation of these forms in the expander&#8217;s output.
-If the expander encounters a syntactic abstraction, it invokes
-the associated transformer to expand the syntactic abstraction, then
-repeats the expansion process for the form returned by the transformer.
-If the expander encounters a core form, it recursively
-processes its subforms that are in expression or definition context,
-if any, and reconstructs the form from the
-expanded subforms.
-Information about identifier bindings is maintained during expansion
-to enforce lexical scoping for variables and keywords.</p>
-<p>
-To handle definitions, the expander processes the initial
-forms in a &lt;body&gt; (see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.3">11.3</a>) or
-&lt;library body&gt; (see section&nbsp;<a href="r6rs-Z-H-10.html#node_sec_7.1">7.1</a>)
-from left to
-right.  How the expander processes each form encountered 
-depends upon the kind of form.</p>
-<p>
-</p>
-<dl><dt></dt><dd>
-</dd><dt><b>macro use</b></dt><dd>
-The expander invokes the associated transformer to transform the macro
-use, then recursively performs whichever of these actions are appropriate
-for the resulting form.<p>
-</p>
-</dd><dt><b><tt>define-syntax</tt> form</b></dt><dd>
-The expander expands and evaluates the right-hand-side expression and binds the
-keyword to the resulting transformer.<p>
-</p>
-</dd><dt><b><tt>define</tt> form</b></dt><dd>
-The expander records the fact that the defined identifier is a variable but defers
-expansion of the right-hand-side expression until after all of the
-definitions have been processed.<p>
-</p>
-</dd><dt><b><tt>begin</tt> form</b></dt><dd>
-The expander splices the subforms into the list of body forms it is
-processing.  (See section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.4.7">11.4.7</a>.)<p>
-</p>
-</dd><dt><b><tt>let-syntax</tt> or <tt>letrec-syntax</tt> form</b></dt><dd>
-The expander splices the inner body forms into the list of (outer) body forms it is
-processing, arranging for the keywords bound by the <tt>let-syntax</tt>
-and <tt>letrec-syntax</tt> to be visible only in the inner body forms.<p>
-</p>
-</dd><dt><b>expression, i.e., nondefinition</b></dt><dd>
-The expander completes the expansion of the deferred right-hand-side expressions
-and the current and remaining expressions in the body, and then
-creates the equivalent of a <tt>letrec*</tt> form from the defined variables,
-expanded right-hand-side expressions, and expanded body expressions.
-</dd></dl><p></p>
-<p>
-For the right-hand side of the definition of a variable, expansion is
-deferred until after all of the definitions have been seen.  Consequently,
-each keyword and variable reference within the right-hand side
-resolves to the local binding, if any.</p>
-<p>
-A definition in the sequence of forms must not define any identifier whose
-binding is used to determine the meaning of the undeferred portions of the
-definition or any definition that precedes it in the sequence of forms.
-For example, the bodies of the following expressions violate this
-restriction.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;()<br>
-&nbsp;&nbsp;(define&nbsp;define&nbsp;17)<br>
-&nbsp;&nbsp;(list&nbsp;define))<br>
-<br>
-(let-syntax&nbsp;([def0&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;x)&nbsp;(define&nbsp;x&nbsp;0)])])<br>
-&nbsp;&nbsp;(let&nbsp;([z&nbsp;3])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(def0&nbsp;z)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(define&nbsp;def0&nbsp;list)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(list&nbsp;z)))<br>
-<br>
-(let&nbsp;()<br>
-&nbsp;&nbsp;(define-syntax&nbsp;foo<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(e)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;1&nbsp;2)))<br>
-&nbsp;&nbsp;(define&nbsp;+&nbsp;2)<br>
-&nbsp;&nbsp;(foo))<p></tt></p>
-<p>
-The following do not violate the restriction.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;([x&nbsp;5])<br>
-&nbsp;&nbsp;(define&nbsp;lambda&nbsp;list)<br>
-&nbsp;&nbsp;(lambda&nbsp;x&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(5&nbsp;5)<br>
-<br>
-(let-syntax&nbsp;([def0&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;x)&nbsp;(define&nbsp;x&nbsp;0)])])<br>
-&nbsp;&nbsp;(let&nbsp;([z&nbsp;3])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(define&nbsp;def0&nbsp;list)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(def0&nbsp;z)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(list&nbsp;z)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(3)<br>
-<br>
-(let&nbsp;()<br>
-&nbsp;&nbsp;(define-syntax&nbsp;foo<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(e)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;([+&nbsp;-])&nbsp;(+&nbsp;1&nbsp;2))))<br>
-&nbsp;&nbsp;(define&nbsp;+&nbsp;2)<br>
-&nbsp;&nbsp;(foo))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-1<p></tt></p>
-<p>
-The implementation should treat a violation of the restriction as a
-syntax violation.</p>
-<p>
-</p>
-<p>
-Note that this algorithm does not directly reprocess any form.
-It requires a single left-to-right pass over the definitions followed by a
-single pass (in any order) over the body expressions and deferred
-right-hand sides.</p>
-<p>
-Example:</p>
-<p>
-</p>
-
-<tt>(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;(define-syntax&nbsp;defun<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[(_&nbsp;x&nbsp;a&nbsp;e)&nbsp;(define&nbsp;x&nbsp;(lambda&nbsp;a&nbsp;e))]))<br>
-&nbsp;&nbsp;(defun&nbsp;even?&nbsp;(n)&nbsp;(or&nbsp;(=&nbsp;n&nbsp;0)&nbsp;(odd?&nbsp;(-&nbsp;n&nbsp;1))))<br>
-&nbsp;&nbsp;(define-syntax&nbsp;odd?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-rules&nbsp;()&nbsp;[(_&nbsp;n)&nbsp;(not&nbsp;(even?&nbsp;n))]))<br>
-&nbsp;&nbsp;(odd?&nbsp;(if&nbsp;(odd?&nbsp;x)&nbsp;(*&nbsp;x&nbsp;x)&nbsp;x)))<p></tt></p>
-<p>
-In the example, the definition of <tt>defun</tt> is encountered first, and the keyword
-<tt>defun</tt> is associated with the transformer resulting from
-the expansion and evaluation of the corresponding right-hand side.
-A use of <tt>defun</tt> is encountered next and expands into a
-<tt>define</tt> form.
-Expansion of the right-hand side of this define form is deferred.
-The definition of <tt>odd?</tt> is next and results in the association
-of the keyword <tt>odd?</tt> with the transformer resulting from
-expanding and evaluating the corresponding right-hand side.
-A use of <tt>odd?</tt> appears next and is expanded; the resulting
-call to <tt>not</tt> is recognized as an expression
-because <tt>not</tt> is bound as a variable.
-At this point, the expander completes the expansion of the current
-expression (the call to <tt>not</tt>) and the deferred right-hand side of the
-<tt>even?</tt> definition;
-the uses of <tt>odd?</tt> appearing in these expressions are expanded
-using the transformer associated with the keyword <tt>odd?</tt>.
-The final output is the equivalent of</p>
-<p>
-</p>
-
-<tt>(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;(letrec*&nbsp;([even?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(or&nbsp;(=&nbsp;n&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(not&nbsp;(even?&nbsp;(-&nbsp;n&nbsp;1)))))])<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(not&nbsp;(even?&nbsp;(if&nbsp;(not&nbsp;(even?&nbsp;x))&nbsp;(*&nbsp;x&nbsp;x)&nbsp;x)))))<p></tt></p>
-<p>
-although the structure of the output is implementation-dependent.</p>
-<p>
-Because definitions and expressions can be interleaved in a
-&lt;top-level body&gt; (see chapter&nbsp;<a href="r6rs-Z-H-11.html#node_chap_8">8</a>),
-the expander&#8217;s processing of a &lt;top-level body&gt; is somewhat
-more complicated.
-It behaves as described above for a &lt;body&gt; or
-&lt;library body&gt; with the following exceptions:
-When the expander finds a nondefinition,
-it defers its expansion and continues scanning for definitions.
-Once it reaches the end of the set of forms, it processes the
-deferred right-hand-side and body expressions, then
-generates the equivalent of a <tt>letrec*</tt> form from the defined variables,
-expanded right-hand-side expressions, and expanded body expressions.
-For each body expression &lt;expression&gt; that appears before a variable definition
-in the body, a dummy binding is created at the corresponding place within
-the set of <tt>letrec*</tt> bindings, with a fresh temporary variable on the
-left-hand side and the equivalent of <tt>(begin &lt;expression&gt;
-&lt;unspecified&gt;)</tt>,
-where &lt;unspecified&gt; is a side-effect-free expression returning
-an unspecified value,
-on the right-hand side, so that
-left-to-right evaluation order is preserved.
-The <tt>begin</tt> wrapper allows &lt;expression&gt; to evaluate to an
-arbitrary number of values.</p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-12.html">previous</a></span><span>, <a href="r6rs-Z-H-14.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-14.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-14.html
deleted file mode 100644
index 66e635b570..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-14.html
+++ /dev/null
@@ -1,4523 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-13.html">previous</a></span><span>, <a href="r6rs-Z-H-15.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_11"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_11">Chapter 11</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_11">Base library</a></h1>
-<p></p>
-<p>
-This chapter describes Scheme&#8217;s <tt>(rnrs base (6))</tt><a name="node_idx_324"></a>library, which exports many of
-the procedure and syntax bindings that are traditionally associated
-with Scheme.</p>
-<p>
-Section&nbsp;<a href="#node_sec_11.20">11.20</a> defines the rules that identify
-tail calls and tail contexts in constructs from the <tt>(rnrs base (6))</tt>
-library.</p>
-<p>
-</p>
-<a name="node_sec_11.1"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.1">11.1&nbsp;&nbsp;Base types</a></h2>
-<p></p>
-<p>
-No object satisfies more than one of the following predicates:</p>
-<p>
-</p>
-
-<tt>boolean?&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;pair?<br>
-symbol?&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;number?<br>
-char?&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;string?<br>
-vector?&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;procedure?<br>
-null?<p></tt></p>
-<p>
-These predicates define the base types <em>boolean</em>, <em>pair</em>, <em>symbol</em>, <em>number</em>, <em>char</em> (or <em>character</em>), <em>string</em>, <em>vector</em>, and <em>procedure</em>.  Moreover, the empty list is a special
-object of its own type.
-<a name="node_idx_326"></a><a name="node_idx_328"></a><a name="node_idx_330"></a><a name="node_idx_332"></a><a name="node_idx_334"></a><a name="node_idx_336"></a><a name="node_idx_338"></a><a name="node_idx_340"></a><a name="node_idx_342"></a><a name="node_idx_344"></a><a name="node_idx_346"></a></p>
-<p>
-Note that, although there is a separate boolean type, any Scheme value
-can be used as a boolean value for the purpose of a conditional test;
-see section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.7">5.7</a>.</p>
-<p>
-</p>
-<a name="node_sec_11.2"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.2">11.2&nbsp;&nbsp;Definitions</a></h2>
-<p></p>
-<p>
-Definitions<a name="node_idx_348"></a>may appear within a
-&lt;top-level body&gt; (section&nbsp;<a href="r6rs-Z-H-11.html#node_sec_8.1">8.1</a>),
-at the top of a &lt;library body&gt; (section&nbsp;<a href="r6rs-Z-H-10.html#node_sec_7.1">7.1</a>),
-or at the top of a &lt;body&gt; (section&nbsp;<a href="#node_sec_11.3">11.3</a>).</p>
-<p>
-A &lt;definition&gt; may be a variable definition
-(section&nbsp;<a href="#node_sec_11.2.1">11.2.1</a>) or
-keyword definition
-(section&nbsp;<a href="#node_sec_11.2.1">11.2.1</a>).
-Macro uses that expand into definitions or groups of
-definitions (packaged in a <tt>begin</tt>, <tt>let-syntax</tt>, or
-<tt>letrec-syntax</tt> form; see section&nbsp;<a href="#node_sec_11.4.7">11.4.7</a>) may also appear
-wherever other definitions may appear.</p>
-<p>
-</p>
-<a name="node_sec_11.2.1"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.2.1">11.2.1&nbsp;&nbsp;Variable definitions</a></h3>
-<p></p>
-<p>
-The <tt>define</tt> form described in this section is a
-&lt;definition&gt;<a name="node_idx_350"></a>used to create variable bindings
-and may appear anywhere other definitions may appear.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_352"></a>define<i> &lt;variable&gt; &lt;expression&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_354"></a>define<i> &lt;variable&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<div align=left><tt>(define (&lt;variable&gt; &lt;formals&gt;) &lt;body&gt;)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<div align=left><tt>(define (&lt;variable&gt; . &lt;formal&gt;) &lt;body&gt;)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-The first from of <tt>define</tt> binds &lt;variable&gt; to a new
-location before assigning the value of &lt;expression&gt; to it.
-</p>
-
-<tt>(define&nbsp;add3<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)&nbsp;(+&nbsp;x&nbsp;3)))<br>
-(add3&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;6<br>
-(define&nbsp;first&nbsp;car)<br>
-(first&nbsp;&#8217;(1&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1<p></tt>
-The continuation of &lt;expression&gt; should not be invoked more than
-once.</p>
-<p>
-<em>Implementation responsibilities: </em>Implementations should detect that the
-continuation of &lt;expression&gt; is invoked more than once.
-If the implementation detects this, it must raise an
-exception with condition type <tt>&amp;assertion</tt>.</p>
-<p>
-The second form of <tt>define</tt> is equivalent to
-</p>
-
-<tt>(define&nbsp;&lt;variable&gt;&nbsp;&lt;unspecified&gt;)<p></tt>
-where &lt;unspecified&gt; is a side-effect-free expression returning
-an unspecified value.</p>
-<p>
-In the third form of <tt>define</tt>, &lt;formals&gt; must be either a
-sequence of zero or more variables, or a sequence of one or more
-variables followed by a dot <tt>.</tt> and another variable (as
-in a lambda expression, see section&nbsp;<a href="#node_sec_11.4.2">11.4.2</a>).  This form is equivalent to
-</p>
-
-<tt>(define&nbsp;&lt;variable&gt;<br>
-&nbsp;&nbsp;(lambda&nbsp;(&lt;formals&gt;)&nbsp;&lt;body&gt;)).<p></tt></p>
-<p>
-In the fourth form of <tt>define</tt>, 
-&lt;formal&gt; must be a single
-variable.  This form is equivalent to
-</p>
-
-<tt>(define&nbsp;&lt;variable&gt;<br>
-&nbsp;&nbsp;(lambda&nbsp;&lt;formal&gt;&nbsp;&lt;body&gt;)).<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.2.2"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.2.2">11.2.2&nbsp;&nbsp;Syntax definitions</a></h3>
-<p></p>
-<p>
-The <tt>define-syntax</tt> form described in this section is a
-&lt;definition&gt;<a name="node_idx_356"></a>used to create keyword bindings
-and may appear anywhere other definitions may appear.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_358"></a>define-syntax<i> &lt;keyword&gt; &lt;expression&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-Binds &lt;keyword&gt; to the value of
-&lt;expression&gt;, which must evaluate, at macro-expansion
-time, to a transformer.  Macro transformers can be created using the
-<tt>syntax-rules</tt> and <tt>identifier-syntax</tt> forms described in
-section&nbsp;<a href="#node_sec_11.19">11.19</a>.  See library
-section&nbsp;on &#8220;Transformers&#8221; for a more
-complete description of transformers.</p>
-<p>
-Keyword bindings established by <tt>define-syntax</tt> are visible
-throughout the body in which they appear, except where shadowed by
-other bindings, and nowhere else, just like variable bindings established
-by <tt>define</tt>.
-All bindings established by a set of definitions, whether
-keyword or variable definitions, are visible within the definitions
-themselves.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation should detect if the value of
-&lt;expression&gt; cannot possibly be a transformer.</p>
-<p>
-Example:</p>
-<p>
-</p>
-
-<tt>(let&nbsp;()<br>
-&nbsp;&nbsp;(define&nbsp;even?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(or&nbsp;(=&nbsp;x&nbsp;0)&nbsp;(odd?&nbsp;(-&nbsp;x&nbsp;1)))))<br>
-&nbsp;&nbsp;(define-syntax&nbsp;odd?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((odd?&nbsp;&nbsp;x)&nbsp;(not&nbsp;(even?&nbsp;x)))))<br>
-&nbsp;&nbsp;(even?&nbsp;10))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-An implication of the left-to-right processing order
-(section&nbsp;<a href="r6rs-Z-H-13.html#node_chap_10">10</a>) is that one definition can
-affect whether a subsequent form is also a definition.  </p>
-<p>
-Example:</p>
-<p>
-</p>
-
-<tt>(let&nbsp;()<br>
-&nbsp;&nbsp;(define-syntax&nbsp;bind-to-zero<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((bind-to-zero&nbsp;id)&nbsp;(define&nbsp;id&nbsp;0))))<br>
-&nbsp;&nbsp;(bind-to-zero&nbsp;x)<br>
-&nbsp;&nbsp;x)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0<p></tt></p>
-<p>
-The behavior is unaffected by any binding for
-<tt>bind-to-zero</tt> that might appear outside of the <tt>let</tt>
-expression.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.3"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.3">11.3&nbsp;&nbsp;Bodies</a></h2>
-<p></p>
-<p>
-<a name="node_idx_360"></a>The &lt;body&gt; of a <tt>lambda</tt>, <tt>let</tt>, <tt>let*</tt>,
-<tt>let-values</tt>, <tt>let*-values</tt>, <tt>letrec</tt>, or <tt>letrec*</tt>
-expression, or that of a definition with a body
-consists of zero or more definitions followed by one or more
-expressions.</p>
-<p>
-<tt>&lt;definition&gt; <tt>...</tt> &lt;expression<sub>1</sub>&gt; &lt;expression<sub>2</sub>&gt; <tt>...</tt></tt></p>
-<p>
-Each identifier defined by a
-definition is local to the &lt;body&gt;.  That is, the identifier is
-bound, and the region of the binding is the
-entire &lt;body&gt; (see section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.2">5.2</a>).</p>
-<p>
-Example:
-</p>
-
-<tt>(let&nbsp;((x&nbsp;5))<br>
-&nbsp;&nbsp;(define&nbsp;foo&nbsp;(lambda&nbsp;(y)&nbsp;(bar&nbsp;x&nbsp;y)))<br>
-&nbsp;&nbsp;(define&nbsp;bar&nbsp;(lambda&nbsp;(a&nbsp;b)&nbsp;(+&nbsp;(*&nbsp;a&nbsp;b)&nbsp;a)))<br>
-&nbsp;&nbsp;(foo&nbsp;(+&nbsp;x&nbsp;3)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;45<p></tt>
-When <tt>begin</tt>, <tt>let-syntax</tt>, or <tt>letrec-syntax</tt> forms
-occur in a body prior to the first
-expression, they are spliced into the body; see section&nbsp;<a href="#node_sec_11.4.7">11.4.7</a>.
-Some or all of the body, including portions wrapped in <tt>begin</tt>,
-<tt>let-syntax</tt>, or <tt>letrec-syntax</tt>
-forms, may be specified by a macro use
-(see section&nbsp;<a href="r6rs-Z-H-12.html#node_sec_9.2">9.2</a>).</p>
-<p>
-An expanded &lt;body&gt; (see chapter&nbsp;<a href="r6rs-Z-H-13.html#node_chap_10">10</a>)
-containing variable definitions can
-always be converted into an equivalent <tt>letrec*</tt>
-expression.  For example, the <tt>let</tt> expression in the above
-example is equivalent to</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((x&nbsp;5))<br>
-&nbsp;&nbsp;(letrec*&nbsp;((foo&nbsp;(lambda&nbsp;(y)&nbsp;(bar&nbsp;x&nbsp;y)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(bar&nbsp;(lambda&nbsp;(a&nbsp;b)&nbsp;(+&nbsp;(*&nbsp;a&nbsp;b)&nbsp;a))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(foo&nbsp;(+&nbsp;x&nbsp;3))))<p></tt></p>
-<p>
-</p>
-<a name="node_sec_11.4"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.4">11.4&nbsp;&nbsp;Expressions</a></h2>
-<p></p>
-<p>
-The entries in this section describe the expressions of the <tt>(rnrs base (6))</tt>
-library, which may occur in the position of the &lt;expression&gt;
-syntactic variable in addition to the primitive
-expression types as described in
-section&nbsp;<a href="r6rs-Z-H-12.html#node_sec_9.1">9.1</a>.</p>
-<p>
-</p>
-<a name="node_sec_11.4.1"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.4.1">11.4.1&nbsp;&nbsp;Quotation</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_362"></a>quote<i> &lt;datum&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>&lt;Datum&gt; should be a syntactic datum.</p>
-<p>
-<em>Semantics: </em><tt>(quote &lt;datum&gt;)</tt> evaluates to the datum value
-represented by &lt;datum&gt;
-(see
-section&nbsp;<a href="r6rs-Z-H-7.html#node_sec_4.3">4.3</a>).  This notation is used to include
-constants.</p>
-<p>
-</p>
-
-<tt>(quote&nbsp;a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;a<br>
-(quote&nbsp;<tt>#</tt>(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;#(a&nbsp;b&nbsp;c)<br>
-(quote&nbsp;(+&nbsp;1&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(+&nbsp;1&nbsp;2)<p></tt></p>
-<p>
-As noted in section&nbsp;<a href="r6rs-Z-H-7.html#node_sec_4.3.5">4.3.5</a>, <tt>(quote &lt;datum&gt;)</tt>
-may be abbreviated as <tt>&#8217;</tt>&lt;datum&gt;:</p>
-<p>
-</p>
-
-<tt>&#8217;&quot;abc&quot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&quot;abc&quot;<br>
-&#8217;145932&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;145932<br>
-&#8217;a&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;a<br>
-&#8217;#(a&nbsp;b&nbsp;c)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;#(a&nbsp;b&nbsp;c)<br>
-&#8217;()&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;()<br>
-&#8217;(+&nbsp;1&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(+&nbsp;1&nbsp;2)<br>
-&#8217;(quote&nbsp;a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(quote&nbsp;a)<br>
-&#8217;&#8217;a&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(quote&nbsp;a)<p></tt></p>
-<p>
-As noted in section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.10">5.10</a>, constants are immutable.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Different constants that are the value of a <tt>quote</tt> expression may
-share the same locations.
-</blockquote>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.4.2"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.4.2">11.4.2&nbsp;&nbsp;Procedures</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_364"></a>lambda<i> &lt;formals&gt; &lt;body&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>&lt;Formals&gt; must be a formal parameter list as described below,
-and &lt;body&gt; must be as described in section&nbsp;<a href="#node_sec_11.3">11.3</a>.</p>
-<p>
-<em>Semantics: </em>A <tt>lambda</tt> expression evaluates to a procedure.  The environment in
-effect when the <tt>lambda</tt> expression is evaluated is remembered as part of the
-procedure.  When the procedure is later called with some 
-arguments, the environment in which the <tt>lambda</tt> expression was evaluated is
-extended by binding the variables in the parameter list to
-fresh locations, and the resulting argument values are stored
-in those locations.  Then, the expressions in the body of the <tt>lambda</tt> expression
-(which may contain definitions and thus represent a <tt>letrec*</tt> form, see section&nbsp;<a href="#node_sec_11.3">11.3</a>) are evaluated
-sequentially in the extended environment.
-The results of the last expression in the body are returned as
-the results of the procedure call.</p>
-<p>
-</p>
-
-<tt>(lambda&nbsp;(x)&nbsp;(+&nbsp;x&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<em>a&nbsp;procedure</em><br>
-((lambda&nbsp;(x)&nbsp;(+&nbsp;x&nbsp;x))&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;8<br>
-<br>
-((lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;(define&nbsp;(p&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;y&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;(+&nbsp;(p&nbsp;x)&nbsp;x))<br>
-&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;11<br>
-<br>
-(define&nbsp;reverse-subtract<br>
-&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;y)&nbsp;(-&nbsp;y&nbsp;x)))<br>
-(reverse-subtract&nbsp;7&nbsp;10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;3<br>
-<br>
-(define&nbsp;add4<br>
-&nbsp;&nbsp;(let&nbsp;((x&nbsp;4))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(y)&nbsp;(+&nbsp;x&nbsp;y))))<br>
-(add4&nbsp;6)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;10<p></tt></p>
-<p>
-&lt;Formals&gt; must have one of the following forms:</p>
-<p>
-</p>
-<ul>
-<li><p><tt>(&lt;variable<sub>1</sub>&gt; <tt>...</tt>)</tt>:
-The procedure takes a fixed number of arguments; when the procedure is
-called, the arguments are stored in the bindings of the
-corresponding variables.</p>
-<p>
-</p>
-<li><p>&lt;variable&gt;:
-The procedure takes any number of arguments; when the procedure is
-called, the sequence of arguments is converted into a newly
-allocated list, and the list is stored in the binding of the
-&lt;variable&gt;.</p>
-<p>
-</p>
-<li><p><tt>(&lt;variable<sub>1</sub>&gt; <tt>...</tt> &lt;variable<sub><em>n</em></sub>&gt; <strong>.</strong>
-&lt;variable<sub><em>n</em>+1</sub>&gt;)</tt>:
-If a period <tt>.</tt> precedes the last variable, then
-the procedure takes <em>n</em> or more arguments, where <em>n</em> is the
-number of parameters before the period (there must
-be at least one).
-The value stored in the binding of the last variable is a
-newly allocated
-list of the arguments left over after all the other 
-arguments have been matched up against the other parameters.
-</p>
-</ul><p></p>
-<p>
-</p>
-
-<tt>((lambda&nbsp;x&nbsp;x)&nbsp;3&nbsp;4&nbsp;5&nbsp;6)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(3&nbsp;4&nbsp;5&nbsp;6)<br>
-((lambda&nbsp;(x&nbsp;y&nbsp;.&nbsp;z)&nbsp;z)<br>
-&nbsp;3&nbsp;4&nbsp;5&nbsp;6)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(5&nbsp;6)<p></tt></p>
-<p>
-Any &lt;variable&gt; must not appear more than once in
-&lt;formals&gt;.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.4.3"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.4.3">11.4.3&nbsp;&nbsp;Conditionals</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_366"></a>if<i> &lt;test&gt; &lt;consequent&gt; &lt;alternate&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_368"></a>if<i> &lt;test&gt; &lt;consequent&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-  <p>
-<em>Syntax: </em>&lt;Test&gt;, &lt;consequent&gt;, and &lt;alternate&gt; must be 
-expressions.</p>
-<p>
-<em>Semantics: </em>An <tt>if</tt> expression is evaluated as follows: first,
-&lt;test&gt; is evaluated.  If it yields a true value<a name="node_idx_370"></a>(see
-section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.7">5.7</a>), then &lt;consequent&gt; is evaluated and
-its values are returned.  Otherwise &lt;alternate&gt; is evaluated and its
-values are returned.  If &lt;test&gt; yields <tt>#f</tt> and no
-&lt;alternate&gt; is specified, then the result of the expression is unspecified.</p>
-<p>
-</p>
-
-<tt>(if&nbsp;(&gt;&nbsp;3&nbsp;2)&nbsp;&#8217;yes&nbsp;&#8217;no)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;yes<br>
-(if&nbsp;(&gt;&nbsp;2&nbsp;3)&nbsp;&#8217;yes&nbsp;&#8217;no)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;no<br>
-(if&nbsp;(&gt;&nbsp;3&nbsp;2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(-&nbsp;3&nbsp;2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;3&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1<br>
-(if&nbsp;#f&nbsp;#f)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<em>unspecified</em><p></tt></p>
-<p>
-The &lt;consequent&gt; and &lt;alternate&gt; expressions are in
-tail context if the <tt>if</tt> expression itself is; see
-section&nbsp;<a href="#node_sec_11.20">11.20</a>.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.4.4"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.4.4">11.4.4&nbsp;&nbsp;Assignments</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_372"></a>set!<i> &lt;variable&gt; &lt;expression&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-&lt;Expression&gt; is evaluated, and the resulting value is stored in
-the location to which &lt;variable&gt; is bound.  &lt;Variable&gt; must
-be bound either in some region<a name="node_idx_374"></a>enclosing the <tt>set!</tt> expression
-or at the top level.  The result of the <tt>set!</tt>
-expression is unspecified.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((x&nbsp;2))<br>
-&nbsp;&nbsp;(+&nbsp;x&nbsp;1)<br>
-&nbsp;&nbsp;(set!&nbsp;x&nbsp;4)<br>
-&nbsp;&nbsp;(+&nbsp;x&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;5<p></tt></p>
-<p>
-It is a syntax violation if &lt;variable&gt; refers to an
-immutable binding.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The identifier <tt>set!</tt> is exported with level 1 as well.  See
-section&nbsp;<a href="#node_sec_11.19">11.19</a>.
-</blockquote>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.4.5"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.4.5">11.4.5&nbsp;&nbsp;Derived conditionals</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_376"></a>cond<i> &lt;cond clause<sub>1</sub>&gt; &lt;cond clause<sub>2</sub>&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<a name="node_idx_378"></a><div align=left><tt>=&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_380"></a><div align=left><tt>else</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>Each &lt;cond clause&gt; must be of the form
-</p>
-
-<tt>(&lt;test&gt;&nbsp;&lt;expression<sub>1</sub>&gt;&nbsp;<tt>...</tt>)<p></tt>
-where &lt;test&gt; is an expression.  Alternatively, a &lt;cond clause&gt; may be
-of the form
-</p>
-
-<tt>(&lt;test&gt;&nbsp;=&gt;&nbsp;&lt;expression&gt;)<p></tt>
-The last &lt;cond clause&gt; may be
-an &#8220;<tt>else</tt> clause&#8221;, which has the form
-</p>
-
-<tt>(else&nbsp;&lt;expression<sub>1</sub>&gt;&nbsp;&lt;expression<sub>2</sub>&gt;&nbsp;<tt>...</tt>).<p></tt></p>
-<p>
-<em>Semantics: </em>A <tt>cond</tt> expression is evaluated by evaluating the &lt;test&gt;
-expressions of successive &lt;cond clause&gt;s in order until one of them
-evaluates to a true value<a name="node_idx_382"></a>(see
-section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.7">5.7</a>).  When a &lt;test&gt; evaluates to a true
-value, then the remaining &lt;expression&gt;s in its &lt;cond clause&gt; are
-evaluated in order, and the results of the last &lt;expression&gt; in the
-&lt;cond clause&gt; are returned as the results of the entire <tt>cond</tt>
-expression.  If the selected &lt;cond clause&gt; contains only the
-&lt;test&gt; and no &lt;expression&gt;s, then the value of the
-&lt;test&gt; is returned as the result.  If the selected &lt;cond clause&gt; uses the
-<tt>=&gt;</tt> alternate form, then the &lt;expression&gt; is evaluated.
-Its value must be a procedure.  This procedure should accept one argument; it is
-called on the value of the &lt;test&gt; and the values returned by this
-procedure are returned by the <tt>cond</tt> expression.
-If all &lt;test&gt;s evaluate
-to <tt>#f</tt>, and there is no <tt>else</tt> clause, then 
-the conditional expression returns unspecified values; if there is an <tt>else</tt>
-clause, then its &lt;expression&gt;s are evaluated, and the values of
-the last one are returned.</p>
-<p>
-</p>
-
-<tt>(cond&nbsp;((&gt;&nbsp;3&nbsp;2)&nbsp;&#8217;greater)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((&lt;&nbsp;3&nbsp;2)&nbsp;&#8217;less))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;greater<br>
-<br>
-(cond&nbsp;((&gt;&nbsp;3&nbsp;3)&nbsp;&#8217;greater)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((&lt;&nbsp;3&nbsp;3)&nbsp;&#8217;less)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;&#8217;equal))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;equal<br>
-<br>
-(cond&nbsp;(&#8217;(1&nbsp;2&nbsp;3)&nbsp;=&gt;&nbsp;cadr)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;<tt>#f</tt>))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;2<p></tt></p>
-<p>
-For a &lt;cond clause&gt; of one of the following forms
-</p>
-
-<tt>(&lt;test&gt;&nbsp;&lt;expression<sub>1</sub>&gt;&nbsp;<tt>...</tt>)<br>
-(else&nbsp;&lt;expression<sub>1</sub>&gt;&nbsp;&lt;expression<sub>2</sub>&gt;&nbsp;<tt>...</tt>)<p></tt>
-the last &lt;expression&gt; is in tail context if the <tt>cond</tt> form
-itself is.  For a &lt;cond clause&gt; of the form
-</p>
-
-<tt>(&lt;test&gt;&nbsp;=&gt;&nbsp;&lt;expression&gt;)<p></tt>
-the (implied) call to the procedure that results from the evaluation
-of &lt;expression&gt; is in a tail context if the <tt>cond</tt> form
-itself is. See section&nbsp;<a href="#node_sec_11.20">11.20</a>.</p>
-<p>
-A sample definition of <tt>cond</tt> in terms of simpler forms is in
-appendix&nbsp;<a href="r6rs-Z-H-16.html#node_chap_B">B</a>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_384"></a>case<i> &lt;key&gt; &lt;case clause<sub>1</sub>&gt; &lt;case clause<sub>2</sub>&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>&lt;Key&gt; must be an expression.  Each &lt;case clause&gt; must have one of
-the following forms:
-</p>
-
-<tt>((&lt;datum<sub>1</sub>&gt;&nbsp;<tt>...</tt>)&nbsp;&lt;expression<sub>1</sub>&gt;&nbsp;&lt;expression<sub>2</sub>&gt;&nbsp;<tt>...</tt>)<br>
-(else&nbsp;&lt;expression<sub>1</sub>&gt;&nbsp;&lt;expression<sub>2</sub>&gt;&nbsp;<tt>...</tt>)<p></tt>
-<a name="node_idx_386"></a>The second form, which specifies an &#8220;<tt>else</tt> clause&#8221;,
-may only appear as the last &lt;case clause&gt;.
-Each &lt;datum&gt; is an external representation of some object.
-The data represented by the &lt;datum&gt;s need not be distinct.</p>
-<p>
-<em>Semantics: </em>A <tt>case</tt> expression is evaluated as follows.  &lt;Key&gt; is
-evaluated and its result is compared using <tt>eqv?</tt> (see
-section&nbsp;<a href="#node_sec_11.5">11.5</a>) against the data
-represented by the &lt;datum&gt;s of each &lt;case clause&gt; in turn, proceeding
-in order from left to right through the set of clauses.  If the
-result of evaluating &lt;key&gt; is equivalent to a datum of a &lt;case clause&gt;, the
-corresponding &lt;expression&gt;s are evaluated from left
-to right and the results of the last expression in the &lt;case clause&gt; are
-returned as the results of the <tt>case</tt> expression.  Otherwise, the
-comparison process continues.  If the result of
-evaluating &lt;key&gt; is different from every datum in each set, then if
-there is an <tt>else</tt> clause its expressions are evaluated and the
-results of the last are the results of the <tt>case</tt> expression;
-otherwise the <tt>case</tt> expression returns unspecified values.</p>
-<p>
-</p>
-
-<tt>(case&nbsp;(*&nbsp;2&nbsp;3)<br>
-&nbsp;&nbsp;((2&nbsp;3&nbsp;5&nbsp;7)&nbsp;&#8217;prime)<br>
-&nbsp;&nbsp;((1&nbsp;4&nbsp;6&nbsp;8&nbsp;9)&nbsp;&#8217;composite))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;composite<br>
-(case&nbsp;(car&nbsp;&#8217;(c&nbsp;d))<br>
-&nbsp;&nbsp;((a)&nbsp;&#8217;a)<br>
-&nbsp;&nbsp;((b)&nbsp;&#8217;b))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<em>unspecified</em><br>
-(case&nbsp;(car&nbsp;&#8217;(c&nbsp;d))<br>
-&nbsp;&nbsp;((a&nbsp;e&nbsp;i&nbsp;o&nbsp;u)&nbsp;&#8217;vowel)<br>
-&nbsp;&nbsp;((w&nbsp;y)&nbsp;&#8217;semivowel)<br>
-&nbsp;&nbsp;(else&nbsp;&#8217;consonant))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;consonant<p></tt></p>
-<p>
-The last &lt;expression&gt; of a &lt;case clause&gt; is in tail
-context if the <tt>case</tt> expression itself is; see
-section&nbsp;<a href="#node_sec_11.20">11.20</a>.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_388"></a>and<i> &lt;test<sub>1</sub>&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>The &lt;test&gt;s must be expressions.</p>
-<p>
-<em>Semantics: </em>If there are no &lt;test&gt;s, <tt>#t</tt> is returned.
-Otherwise, the &lt;test&gt; expressions are evaluated from left to
-right until a &lt;test&gt; returns <tt>#f</tt> or the last
-&lt;test&gt; is reached.  In the former case, the <tt>and</tt> expression
-returns <tt>#f</tt> without evaluating the remaining expressions.
-In the latter case, the last expression is evaluated and its values
-are returned.</p>
-<p>
-</p>
-
-<tt>(and&nbsp;(=&nbsp;2&nbsp;2)&nbsp;(&gt;&nbsp;2&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(and&nbsp;(=&nbsp;2&nbsp;2)&nbsp;(&lt;&nbsp;2&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(and&nbsp;1&nbsp;2&nbsp;&#8217;c&nbsp;&#8217;(f&nbsp;g))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(f&nbsp;g)<br>
-(and)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-The <tt>and</tt> keyword could be defined in terms of <tt>if</tt> using <tt>syntax-rules</tt> (see section&nbsp;<a href="#node_sec_11.19">11.19</a>) as follows:</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;<tt>and</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((and)&nbsp;<tt>#t</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((and&nbsp;test)&nbsp;test)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((and&nbsp;test1&nbsp;test2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;test1&nbsp;(and&nbsp;test2&nbsp;...)&nbsp;<tt>#f</tt>))))<p></tt></p>
-<p>
-The last &lt;test&gt; expression is in tail context if the <tt>and</tt>
-expression itself is; see section&nbsp;<a href="#node_sec_11.20">11.20</a>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_390"></a>or<i> &lt;test<sub>1</sub>&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>The &lt;test&gt;s must be expressions.</p>
-<p>
-<em>Semantics: </em>If there are no &lt;test&gt;s, <tt>#f</tt> is returned.
-Otherwise, the &lt;test&gt; expressions are evaluated from left to
-right until a &lt;test&gt; returns a true value <i>val</i>
-(see section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.7">5.7</a>) or the last
-&lt;test&gt; is reached.  In the former case, the <tt>or</tt> expression
-returns <i>val</i> without evaluating the remaining expressions.
-In the latter case, the last expression is evaluated and its values
-are returned.</p>
-<p>
-</p>
-
-<tt>(or&nbsp;(=&nbsp;2&nbsp;2)&nbsp;(&gt;&nbsp;2&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(or&nbsp;(=&nbsp;2&nbsp;2)&nbsp;(&lt;&nbsp;2&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(or&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>&nbsp;<tt>#f</tt>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(or&nbsp;&#8217;(b&nbsp;c)&nbsp;(/&nbsp;3&nbsp;0))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(b&nbsp;c)<p></tt></p>
-<p>
-The <tt>or</tt> keyword could be defined in terms of <tt>if</tt> using <tt>syntax-rules</tt> (see section&nbsp;<a href="#node_sec_11.19">11.19</a>) as follows:</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;<tt>or</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((or)&nbsp;<tt>#f</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((or&nbsp;test)&nbsp;test)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((or&nbsp;test1&nbsp;test2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((x&nbsp;test1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;x&nbsp;x&nbsp;(or&nbsp;test2&nbsp;...))))))<p></tt></p>
-<p>
-The last &lt;test&gt; expression is in tail context if the <tt>or</tt>
-expression itself is; see section&nbsp;<a href="#node_sec_11.20">11.20</a>.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.4.6"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.4.6">11.4.6&nbsp;&nbsp;Binding constructs</a></h3>
-<p>The binding constructs described in this section
-create local bindings for variables that are visible only in a
-delimited region.  The syntax of the 
-constructs
-<tt>let</tt>, <tt>let*</tt>, <tt>letrec</tt>, and <tt>letrec*</tt>
-is identical, but they differ in the regions<a name="node_idx_392"></a>(see section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.2">5.2</a>) they establish
-for their variable bindings and in the order in which the values for
-the bindings are computed.  In a <tt>let</tt> expression, the initial
-values are computed before any of the variables become bound; in a
-<tt>let*</tt> expression, the bindings and evaluations are performed
-sequentially.  In a <tt>letrec</tt> or <tt>letrec*</tt>
-expression, all the bindings are in
-effect while their initial values are being computed, thus allowing
-mutually recursive definitions.  In a <tt>letrec</tt> expression, the
-initial values are computed before being assigned to the variables;
-in a <tt>letrec*</tt>, the evaluations and assignments are performed
-sequentially.</p>
-<p>
-In addition, the binding constructs <tt>let-values</tt> and <tt>let*-values</tt> generalize <tt>let</tt> and <tt>let*</tt> to allow multiple
-variables to be bound to the results of expressions that evaluate to
-multiple values.
-They are analogous to <tt>let</tt> and <tt>let*</tt> in the
-way they establish regions: in a <tt>let-values</tt> expression, the
-initial values are computed before any of the variables become bound;
-in a <tt>let*-values</tt> expression, the bindings are performed
-sequentially. </p>
-<p>
-Sample definitions of all the binding forms of this section in terms
-of simpler forms are in appendix&nbsp;<a href="r6rs-Z-H-16.html#node_chap_B">B</a>.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_394"></a>let<i> &lt;bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>&lt;Bindings&gt; must have the form
-</p>
-
-<tt>((&lt;variable<sub>1</sub>&gt;&nbsp;&lt;init<sub>1</sub>&gt;)&nbsp;<tt>...</tt>),<p></tt>
-where each &lt;init&gt; is an expression, and &lt;body&gt; 
-is as described in section&nbsp;<a href="#node_sec_11.3">11.3</a>.  
-Any variable must not appear more than once in the &lt;variable&gt;s.</p>
-<p>
-<em>Semantics: </em>The &lt;init&gt;s are evaluated in the current environment (in some
-unspecified order), the &lt;variable&gt;s are bound to fresh locations
-holding the results, the &lt;body&gt; is evaluated in the extended
-environment, and the values of the last expression of &lt;body&gt;
-are returned.  Each binding of a &lt;variable&gt; has &lt;body&gt; as its
-region.<a name="node_idx_396"></a></p>
-<p>
-</p>
-
-<tt>(let&nbsp;((x&nbsp;2)&nbsp;(y&nbsp;3))<br>
-&nbsp;&nbsp;(*&nbsp;x&nbsp;y))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;6<br>
-<br>
-(let&nbsp;((x&nbsp;2)&nbsp;(y&nbsp;3))<br>
-&nbsp;&nbsp;(let&nbsp;((x&nbsp;7)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(z&nbsp;(+&nbsp;x&nbsp;y)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(*&nbsp;z&nbsp;x)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;35<p></tt></p>
-<p>
-See also named <tt>let</tt>, section <a href="#node_sec_11.16">11.16</a>.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_398"></a>let*<i> &lt;bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>&lt;Bindings&gt; must have the form
-</p>
-
-<tt>((&lt;variable<sub>1</sub>&gt;&nbsp;&lt;init<sub>1</sub>&gt;)&nbsp;<tt>...</tt>),<p></tt>
-where each &lt;init&gt; is an expression, and &lt;body&gt; 
-is as described in section&nbsp;<a href="#node_sec_11.3">11.3</a>.</p>
-<p>
-<em>Semantics: </em>The <tt>let*</tt> form is similar to <tt>let</tt>, but the &lt;init&gt;s are
-evaluated and bindings created sequentially from left to right, with
-the region<a name="node_idx_400"></a>of each binding including the bindings to
-its right as well as &lt;body&gt;.  Thus the second &lt;init&gt; is evaluated
-in an environment in which the first binding is visible and initialized,
-and so on.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((x&nbsp;2)&nbsp;(y&nbsp;3))<br>
-&nbsp;&nbsp;(let*&nbsp;((x&nbsp;7)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(z&nbsp;(+&nbsp;x&nbsp;y)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(*&nbsp;z&nbsp;x)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;70<p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-While the variables bound by a <tt>let</tt> expression must be distinct,
-the variables bound by a <tt>let*</tt> expression need not be distinct.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_402"></a>letrec<i> &lt;bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>&lt;Bindings&gt; must have the form
-</p>
-
-<tt>((&lt;variable<sub>1</sub>&gt;&nbsp;&lt;init<sub>1</sub>&gt;)&nbsp;<tt>...</tt>),<p></tt>
-where each &lt;init&gt; is an expression, and &lt;body&gt; 
-is as described in section&nbsp;<a href="#node_sec_11.3">11.3</a>.  Any
-variable must not appear more than once in the
-&lt;variable&gt;s.</p>
-<p>
-<em>Semantics: </em>The &lt;variable&gt;s are bound to fresh locations, the &lt;init&gt;s
-are evaluated in the resulting environment (in
-some unspecified order), each &lt;variable&gt; is assigned to the result
-of the corresponding &lt;init&gt;, the &lt;body&gt; is evaluated in the
-resulting environment, and the values of the last expression in
-&lt;body&gt; are returned.  Each binding of a &lt;variable&gt; has the
-entire <tt>letrec</tt> expression as its region<a name="node_idx_404"></a>, making it possible to
-define mutually recursive procedures.</p>
-<p>
-</p>
-
-<tt>(letrec&nbsp;((even?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(zero?&nbsp;n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#t</tt><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(odd?&nbsp;(-&nbsp;n&nbsp;1)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(odd?<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(zero?&nbsp;n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>#f</tt><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(even?&nbsp;(-&nbsp;n&nbsp;1))))))<br>
-&nbsp;&nbsp;(even?&nbsp;88))&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-It should be possible
-to evaluate each &lt;init&gt; without assigning or referring to the
-value of any &lt;variable&gt;.  In the most
-common uses of <tt>letrec</tt>, all the &lt;init&gt;s are <tt>lambda</tt> expressions
-and the restriction is satisfied automatically.
-Another restriction is that the continuation of each &lt;init&gt; should not be invoked
-more than once.</p>
-<p>
-<em>Implementation responsibilities: </em>Implementations must detect references to a &lt;variable&gt; during the
-evaluation of the &lt;init&gt; expressions (using one particular
-evaluation order and order of evaluating the &lt;init&gt; expressions).
-If an implementation detects such a violation of the
-restriction, it must raise an exception with condition type
-<tt>&amp;assertion</tt>.
-Implementations may or may not detect that the continuation of each
-&lt;init&gt; is invoked more than once.  However, if the
-implementation detects this, it must raise an exception with condition
-type <tt>&amp;assertion</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_406"></a>letrec*<i> &lt;bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>&lt;Bindings&gt; must have the form
-</p>
-
-<tt>((&lt;variable<sub>1</sub>&gt;&nbsp;&lt;init<sub>1</sub>&gt;)&nbsp;<tt>...</tt>),<p></tt>
-where each &lt;init&gt; is an expression, and &lt;body&gt; 
-is as described in section&nbsp;<a href="#node_sec_11.3">11.3</a>. 
-Any variable must not appear more than once in the
-&lt;variable&gt;s.</p>
-<p>
-<em>Semantics: </em>The &lt;variable&gt;s are bound to fresh locations,
-each &lt;variable&gt; is assigned in left-to-right order to the
-result of evaluating the corresponding &lt;init&gt;, the &lt;body&gt; is
-evaluated in the resulting environment, and the values of the last
-expression in &lt;body&gt; are returned. 
-Despite the left-to-right evaluation and assignment order, each binding of
-a &lt;variable&gt; has the entire <tt>letrec*</tt> expression as its
-region<a name="node_idx_408"></a>, making it possible to define mutually recursive
-procedures.</p>
-<p>
-</p>
-
-<tt>(letrec*&nbsp;((p<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;1&nbsp;(q&nbsp;(-&nbsp;x&nbsp;1)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(q<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(zero?&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;1&nbsp;(p&nbsp;(-&nbsp;y&nbsp;1))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(x&nbsp;(p&nbsp;5))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(y&nbsp;x))<br>
-&nbsp;&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;5<p></tt></p>
-<p>
-It must be possible
-to evaluate each &lt;init&gt; without assigning or referring to the value
-of the corresponding &lt;variable&gt; or the &lt;variable&gt; of any of
-the bindings that follow it in &lt;bindings&gt;.
-Another restriction is that the continuation of each &lt;init&gt; should not be invoked
-more than once.</p>
-<p>
-<em>Implementation responsibilities: </em>Implementations must, during the evaluation of an
-&lt;init&gt; expression, detect references to the
-value of the corresponding &lt;variable&gt; or the &lt;variable&gt; of
-any of the bindings that follow it in &lt;bindings&gt;.
-If an implementation detects such a
-violation of the restriction, it must raise an exception with
-condition type <tt>&amp;assertion</tt>.  Implementations may or may not
-detect that the continuation of each &lt;init&gt; is invoked more than
-once.  However, if the implementation detects this, it must raise an
-exception with condition type <tt>&amp;assertion</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_410"></a>let-values<i> &lt;mv-bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>&lt;Mv-bindings&gt; must have the form
-</p>
-
-<tt>((&lt;formals<sub>1</sub>&gt;&nbsp;&lt;init<sub>1</sub>&gt;)&nbsp;<tt>...</tt>),<p></tt>
-where each &lt;init&gt; is an expression, and &lt;body&gt; 
-is as described in section&nbsp;<a href="#node_sec_11.3">11.3</a>.  
-Any variable must not appear more
-than once in the set of &lt;formals&gt;.</p>
-<p>
-<em>Semantics: </em>The &lt;init&gt;s are evaluated in the current environment
-(in some unspecified order), and the variables occurring in the
-&lt;formals&gt; are bound to fresh locations containing the values
-returned by the &lt;init&gt;s, where the &lt;formals&gt; are matched
-to the return values in the same way that the &lt;formals&gt; in a
-<tt>lambda</tt> expression are matched to the arguments in a procedure call.
-Then, the &lt;body&gt; is evaluated in the extended environment, and the
-values of the last expression of &lt;body&gt; are returned.
-Each binding of a variable has &lt;body&gt; as its
-region.<a name="node_idx_412"></a>If the &lt;formals&gt; do not match, an exception with condition type
-<tt>&amp;assertion</tt> is raised.</p>
-<p>
-</p>
-
-<tt>(let-values&nbsp;(((a&nbsp;b)&nbsp;(values&nbsp;1&nbsp;2))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((c&nbsp;d)&nbsp;(values&nbsp;3&nbsp;4)))<br>
-&nbsp;&nbsp;(list&nbsp;a&nbsp;b&nbsp;c&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;2&nbsp;3&nbsp;4)<br>
-<br>
-(let-values&nbsp;(((a&nbsp;b&nbsp;.&nbsp;c)&nbsp;(values&nbsp;1&nbsp;2&nbsp;3&nbsp;4)))<br>
-&nbsp;&nbsp;(list&nbsp;a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;2&nbsp;(3&nbsp;4))<br>
-<br>
-(let&nbsp;((a&nbsp;&#8217;a)&nbsp;(b&nbsp;&#8217;b)&nbsp;(x&nbsp;&#8217;x)&nbsp;(y&nbsp;&#8217;y))<br>
-&nbsp;&nbsp;(let-values&nbsp;(((a&nbsp;b)&nbsp;(values&nbsp;x&nbsp;y))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((x&nbsp;y)&nbsp;(values&nbsp;a&nbsp;b)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(list&nbsp;a&nbsp;b&nbsp;x&nbsp;y)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(x&nbsp;y&nbsp;a&nbsp;b)<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_414"></a>let*-values<i> &lt;mv-bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>&lt;Mv-bindings&gt; must have the form
-</p>
-
-<tt>((&lt;formals<sub>1</sub>&gt;&nbsp;&lt;init<sub>1</sub>&gt;)&nbsp;<tt>...</tt>),<p></tt>
-where each &lt;init&gt; is an expression, and &lt;body&gt; 
-is as described in section&nbsp;<a href="#node_sec_11.3">11.3</a>.
-In each &lt;formals&gt;, any variable must not appear more than once.</p>
-<p>
-<em>Semantics: </em>The <tt>let*-values</tt> form is similar to <tt>let-values</tt>, but the &lt;init&gt;s are
-evaluated and bindings created sequentially from left to right, with
-the region<a name="node_idx_416"></a>of the bindings of each &lt;formals&gt; including
-the bindings to its right as well as &lt;body&gt;. 
-Thus the second &lt;init&gt; is evaluated in an environment in which the
-bindings of the first &lt;formals&gt; is visible and initialized, and so
-on.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((a&nbsp;&#8217;a)&nbsp;(b&nbsp;&#8217;b)&nbsp;(x&nbsp;&#8217;x)&nbsp;(y&nbsp;&#8217;y))<br>
-&nbsp;&nbsp;(let*-values&nbsp;(((a&nbsp;b)&nbsp;(values&nbsp;x&nbsp;y))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((x&nbsp;y)&nbsp;(values&nbsp;a&nbsp;b)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(list&nbsp;a&nbsp;b&nbsp;x&nbsp;y)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(x&nbsp;y&nbsp;x&nbsp;y)<p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-While all of the variables bound by a <tt>let-values</tt> expression
-must be distinct, the variables bound by different &lt;formals&gt; of a
-<tt>let*-values</tt> expression need not be distinct.
-</blockquote><p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.4.7"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.4.7">11.4.7&nbsp;&nbsp;Sequencing</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_418"></a>begin<i> &lt;form&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_420"></a>begin<i> &lt;expression&gt; &lt;expression&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-The &lt;begin&gt; keyword has two different roles, depending on its
-context:
-</p>
-<ul>
-<li><p>It may appear as a form in a &lt;body&gt; (see
-section&nbsp;<a href="#node_sec_11.3">11.3</a>), &lt;library body&gt; (see
-section&nbsp;<a href="r6rs-Z-H-10.html#node_sec_7.1">7.1</a>), or &lt;top-level body&gt; (see
-chapter&nbsp;<a href="r6rs-Z-H-11.html#node_chap_8">8</a>), or directly nested in a <tt>begin</tt>
-form that appears in a body.  In this case, the <tt>begin</tt> form
-must have the shape specified in the first header line.  This use of
-<tt>begin</tt> acts as a <a name="node_idx_422"></a><em>splicing</em> form&#8212;the forms inside
-the &lt;body&gt; are spliced into the surrounding body, as if the
-<tt>begin</tt> wrapper were not actually present.</p>
-<p>
-A <tt>begin</tt> form in a &lt;body&gt; or &lt;library body&gt; must
-be non-empty if it appears after the first &lt;expression&gt;
-within the body.
-</p>
-<li><p>It may appear as an ordinary expression and must have the shape
-specified in the second header line.  In this case, the
-&lt;expression&gt;s are evaluated sequentially from left to right,
-and the values of the last &lt;expression&gt; are returned.
-This expression type is used to sequence side effects such as
-assignments or input
-and output.
-</p>
-</ul><p></p>
-<p>
-</p>
-
-<tt>(define&nbsp;x&nbsp;0)<br>
-<br>
-(begin&nbsp;(set!&nbsp;x&nbsp;5)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;x&nbsp;1))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;6<br>
-<br>
-(begin&nbsp;(display&nbsp;&quot;4&nbsp;plus&nbsp;1&nbsp;equals&nbsp;&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;(+&nbsp;4&nbsp;1)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-&nbsp;<em>&nbsp;and&nbsp;prints</em>&nbsp;&nbsp;4&nbsp;plus&nbsp;1&nbsp;equals&nbsp;5<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.5"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.5">11.5&nbsp;&nbsp;Equivalence predicates</a></h2>
-<p></p>
-<p>
-A <a name="node_idx_424"></a><em>predicate</em> is a procedure that always returns a boolean
-value (<tt>#t</tt> or <tt>#f</tt>).  An <a name="node_idx_426"></a><em>equivalence predicate</em> is
-the computational analogue of a mathematical equivalence relation (it is
-symmetric, reflexive, and transitive).  Of the equivalence predicates
-described in this section, <tt>eq?</tt> is the finest or most
-discriminating, and <tt>equal?</tt> is the coarsest.  The <tt>eqv?</tt> predicate is
-slightly less discriminating than <tt>eq?</tt>.  </p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_428"></a>eqv?<i> <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>eqv?</tt> procedure defines a useful equivalence relation on objects.
-Briefly, it returns <tt>#t</tt> if <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> should
-normally be regarded as the same object and <tt>#f</tt> otherwise.  This relation is left slightly
-open to interpretation, but the following partial specification of
-<tt>eqv?</tt> must hold for all implementations.</p>
-<p>
-The <tt>eqv?</tt> procedure returns <tt>#t</tt> if one of the following holds:</p>
-<p>
-</p>
-<ul>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both booleans and are the same
-according to the <tt>boolean=?</tt> procedure (section&nbsp;<a href="#node_sec_11.8">11.8</a>).</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both symbols and are the same
-according to the <tt>symbol=?</tt> procedure (section&nbsp;<a href="#node_sec_11.10">11.10</a>).</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both exact<a name="node_idx_430"></a>number objects
-and are numerically equal (see <tt>=</tt>, 
-section&nbsp;<a href="#node_sec_11.7">11.7</a>).</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both inexact<a name="node_idx_432"></a>number objects, are numerically
-equal (see <tt>=</tt>, section&nbsp;<a href="#node_sec_11.7">11.7</a>), and
-yield the same results (in the sense of <tt>eqv?</tt>) when passed
-as arguments to any other procedure that can be defined
-as a finite composition of Scheme&#8217;s standard arithmetic
-procedures.</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are both characters and are the same
-character according to the <tt>char=?</tt> procedure
-(section&nbsp;<a href="#node_sec_11.11">11.11</a>).</p>
-<p>
-</p>
-<li><p>Both <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are the empty list.</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are objects such as pairs, vectors, bytevectors
-(library chapter&nbsp;on &#8220;Bytevectors&#8221;),
-strings, hashtables, records (library
-chapter&nbsp;on &#8220;Records&#8221;), ports (library
-section&nbsp;on &#8220;Port I/O&#8221;), or hashtables
-(library chapter&nbsp;on &#8220;Hash tables&#8221;) that
-refer to the same locations in the store (section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.10">5.10</a>).</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are record-type descriptors that are
-specified to be <tt>eqv?</tt> in library
-section&nbsp;on &#8220;Procedural layer&#8221;.
-</p>
-</ul><p></p>
-<p>
-The <tt>eqv?</tt> procedure returns <tt>#f</tt> if one of the following holds:</p>
-<p>
-</p>
-<ul>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are of different types
-(section&nbsp;<a href="#node_sec_11.1">11.1</a>).</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are booleans for which the <tt>boolean=?</tt> procedure returns <tt>#f</tt>.</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are symbols for which the <tt>symbol=?</tt> procedure returns <tt>#f</tt>.</p>
-<p>
-</p>
-<li><p>One of <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> is an exact number object but the other is
-an inexact number object.</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are rational number objects for which the <tt>=</tt> procedure
-returns <tt>#f</tt>.</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> yield different results (in the sense of
-<tt>eqv?</tt>) when passed as arguments to any other procedure
-that can be defined as a finite composition of Scheme&#8217;s
-standard arithmetic procedures.</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are characters for which the <tt>char=?</tt>
-procedure returns <tt>#f</tt>.</p>
-<p>
-</p>
-<li><p>One of <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> is the empty list, but the other is not.</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are objects such as pairs, vectors,
-bytevectors (library
-chapter&nbsp;on &#8220;Bytevectors&#8221;), strings,
-records (library
-chapter&nbsp;on &#8220;Records&#8221;), ports (library
-section&nbsp;on &#8220;Port I/O&#8221;), or hashtables
-(library chapter&nbsp;on &#8220;Hashtables&#8221;) that
-refer to distinct locations.</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are pairs, vectors, strings, or
-records, or hashtables, where the applying the same accessor (i.e.
-  <tt>car</tt>, <tt>cdr</tt>, <tt>vector-ref</tt>, <tt>string-ref</tt>, or record
-accessors) to both yields results for which <tt>eqv?</tt> returns
-<tt>#f</tt>.</p>
-<p>
-</p>
-<li><p><i>Obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> are procedures that would behave differently
-(return different values or have different side effects) for some arguments.</p>
-<p>
-</p>
-</ul><p></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The <tt>eqv?</tt> procedure returning <tt>#t</tt> when <i>obj<sub>1</sub></i> and
-<i>obj<sub>2</sub></i> are number objects does not imply that <tt>=</tt> would also
-return <tt>#t</tt> when called with <i>obj<sub>1</sub></i> and <i>obj<sub>2</sub></i> as
-arguments.
-</blockquote><p>
-</p>
-
-<tt>(eqv?&nbsp;&#8217;a&nbsp;&#8217;a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(eqv?&nbsp;&#8217;a&nbsp;&#8217;b)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(eqv?&nbsp;2&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(eqv?&nbsp;&#8217;()&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(eqv?&nbsp;100000000&nbsp;100000000)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(eqv?&nbsp;(cons&nbsp;1&nbsp;2)&nbsp;(cons&nbsp;1&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(eqv?&nbsp;(lambda&nbsp;()&nbsp;1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(eqv?&nbsp;#f&nbsp;&#8217;nil)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt></p>
-<p>
-The following examples illustrate cases in which the above rules do
-not fully specify the behavior of <tt>eqv?</tt>.  All that can be said
-about such cases is that the value returned by <tt>eqv?</tt> must be a
-boolean.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((p&nbsp;(lambda&nbsp;(x)&nbsp;x)))<br>
-&nbsp;&nbsp;(eqv?&nbsp;p&nbsp;p))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;&quot;&quot;&nbsp;&quot;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;&#8217;#()&nbsp;&#8217;#())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;(lambda&nbsp;(x)&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x)&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;(lambda&nbsp;(x)&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(y)&nbsp;y))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;+nan.0&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>unspecified</i><p></tt></p>
-<p>
-The next set of examples shows the use of <tt>eqv?</tt> with procedures
-that have local state.  Calls to <tt>gen-counter</tt> must return a
-distinct procedure every time, since each procedure has its own
-internal counter.  Calls to <tt>gen-loser</tt> return procedures that
-behave equivalently when called.  However, <tt>eqv?</tt> may
-not detect this equivalence.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;gen-counter<br>
-&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((n&nbsp;0))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;(set!&nbsp;n&nbsp;(+&nbsp;n&nbsp;1))&nbsp;n))))<br>
-(let&nbsp;((g&nbsp;(gen-counter)))<br>
-&nbsp;&nbsp;(eqv?&nbsp;g&nbsp;g))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;(gen-counter)&nbsp;(gen-counter))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(define&nbsp;gen-loser<br>
-&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((n&nbsp;0))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;(set!&nbsp;n&nbsp;(+&nbsp;n&nbsp;1))&nbsp;27))))<br>
-(let&nbsp;((g&nbsp;(gen-loser)))<br>
-&nbsp;&nbsp;(eqv?&nbsp;g&nbsp;g))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;(gen-loser)&nbsp;(gen-loser))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-<br>
-(letrec&nbsp;((f&nbsp;(lambda&nbsp;()&nbsp;(if&nbsp;(eqv?&nbsp;f&nbsp;g)&nbsp;&#8217;both&nbsp;&#8217;f)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(g&nbsp;(lambda&nbsp;()&nbsp;(if&nbsp;(eqv?&nbsp;f&nbsp;g)&nbsp;&#8217;both&nbsp;&#8217;g))))<br>
-&nbsp;&nbsp;(eqv?&nbsp;f&nbsp;g))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-<br>
-(letrec&nbsp;((f&nbsp;(lambda&nbsp;()&nbsp;(if&nbsp;(eqv?&nbsp;f&nbsp;g)&nbsp;&#8217;f&nbsp;&#8217;both)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(g&nbsp;(lambda&nbsp;()&nbsp;(if&nbsp;(eqv?&nbsp;f&nbsp;g)&nbsp;&#8217;g&nbsp;&#8217;both))))<br>
-&nbsp;&nbsp;(eqv?&nbsp;f&nbsp;g))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt></p>
-<p>
-Implementations may
-share structure between constants where appropriate.
-Furthermore, a constant may be copied at any time by the implementation so
-as to exist simultaneously in different sets of locations, as noted in
-section&nbsp;<a href="#node_sec_11.4.1">11.4.1</a>.
-Thus the value of <tt>eqv?</tt> on constants is sometimes
-implementation-dependent.</p>
-<p>
-</p>
-
-<tt>(eqv?&nbsp;&#8217;(a)&nbsp;&#8217;(a))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;&quot;a&quot;&nbsp;&quot;a&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eqv?&nbsp;&#8217;(b)&nbsp;(cdr&nbsp;&#8217;(a&nbsp;b)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(let&nbsp;((x&nbsp;&#8217;(a)))<br>
-&nbsp;&nbsp;(eqv?&nbsp;x&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_434"></a>eq?<i> <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>eq?</tt> predicate is similar to <tt>eqv?</tt> except that in some cases it is
-capable of discerning distinctions finer than those detectable by
-<tt>eqv?</tt>.</p>
-<p>
-The <tt>eq?</tt> and <tt>eqv?</tt> predicates are guaranteed to have the
-same behavior on symbols, booleans, the empty list, pairs, procedures,
-non-empty strings, bytevectors, and vectors, and records.  The
-behavior of <tt>eq?</tt> on number objects and characters is
-implementation-dependent, but it always returns either <tt>#t</tt> or
-<tt>#f</tt>, and returns <tt>#t</tt> only when <tt>eqv?</tt> would also
-return <tt>#t</tt>.  The <tt>eq?</tt> predicate may also behave differently
-from <tt>eqv?</tt> on empty vectors, empty bytevectors, and empty strings.</p>
-<p>
-</p>
-
-<tt>(eq?&nbsp;&#8217;a&nbsp;&#8217;a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(eq?&nbsp;&#8217;(a)&nbsp;&#8217;(a))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eq?&nbsp;(list&nbsp;&#8217;a)&nbsp;(list&nbsp;&#8217;a))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(eq?&nbsp;&quot;a&quot;&nbsp;&quot;a&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eq?&nbsp;&quot;&quot;&nbsp;&quot;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eq?&nbsp;&#8217;()&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(eq?&nbsp;2&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eq?&nbsp;#<tt>\</tt>A&nbsp;#<tt>\</tt>A)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(eq?&nbsp;car&nbsp;car)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(let&nbsp;((n&nbsp;(+&nbsp;2&nbsp;3)))<br>
-&nbsp;&nbsp;(eq?&nbsp;n&nbsp;n))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(let&nbsp;((x&nbsp;&#8217;(a)))<br>
-&nbsp;&nbsp;(eq?&nbsp;x&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(let&nbsp;((x&nbsp;&#8217;#()))<br>
-&nbsp;&nbsp;(eq?&nbsp;x&nbsp;x))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(let&nbsp;((p&nbsp;(lambda&nbsp;(x)&nbsp;x)))<br>
-&nbsp;&nbsp;(eq?&nbsp;p&nbsp;p))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><p></tt></p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_436"></a>equal?<i> <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>equal?</tt>  predicate returns <tt>#t</tt> if and only if the
-(possibly infinite) unfoldings of its arguments into regular trees are
-equal as ordered trees.</p>
-<p>
-The <tt>equal?</tt> predicate treats pairs and vectors
-as nodes with outgoing edges, uses <tt>string=?</tt> to compare strings, uses <tt>bytevector=?</tt> to compare bytevectors (see library chapter&nbsp;on &#8220;Bytevectors&#8221;),
-and uses <tt>eqv?</tt> to compare other nodes.</p>
-<p>
-</p>
-
-<tt>(equal?&nbsp;&#8217;a&nbsp;&#8217;a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;&#8217;(a)&nbsp;&#8217;(a))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;&#8217;(a&nbsp;(b)&nbsp;c)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(a&nbsp;(b)&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;&quot;abc&quot;&nbsp;&quot;abc&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;2&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;(make-vector&nbsp;5&nbsp;&#8217;a)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-vector&nbsp;5&nbsp;&#8217;a))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;&#8217;#vu8(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(u8-list-&gt;bytevector<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(equal?&nbsp;(lambda&nbsp;(x)&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(y)&nbsp;y))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-<br>
-(let*&nbsp;((x&nbsp;(list&nbsp;&#8217;a))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(y&nbsp;(list&nbsp;&#8217;a))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(z&nbsp;(list&nbsp;x&nbsp;y)))<br>
-&nbsp;&nbsp;(list&nbsp;(equal?&nbsp;z&nbsp;(list&nbsp;y&nbsp;x))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(equal?&nbsp;z&nbsp;(list&nbsp;x&nbsp;x))))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(<tt>#t</tt>&nbsp;<tt>#t</tt>)<p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The <tt>equal?</tt> procedure must always terminate, even if its
-arguments contain cycles.
-</blockquote><p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.6"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.6">11.6&nbsp;&nbsp;Procedure predicate</a></h2>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_438"></a>procedure?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a procedure, otherwise returns <tt>#f</tt>.</p>
-<p>
-</p>
-
-<tt>(procedure?&nbsp;car)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(procedure?&nbsp;&#8217;car)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(procedure?&nbsp;(lambda&nbsp;(x)&nbsp;(*&nbsp;x&nbsp;x)))&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(procedure?&nbsp;&#8217;(lambda&nbsp;(x)&nbsp;(*&nbsp;x&nbsp;x)))&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.7"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.7">11.7&nbsp;&nbsp;Arithmetic</a></h2>
-<p></p>
-<p>
-The procedures described here implement arithmetic that is
-generic over
-the numerical tower described in chapter&nbsp;<a href="r6rs-Z-H-6.html#node_chap_3">3</a>.
-The generic procedures described in this section
-accept both exact and inexact number objects as arguments,
-performing coercions and selecting the appropriate operations
-as determined by the numeric subtypes of their arguments.</p>
-<p>
-Library chapter&nbsp;on &#8220;Arithmetic&#8221; describes
-libraries that define other numerical procedures.</p>
-<p>
-</p>
-<a name="node_sec_11.7.1"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.7.1">11.7.1&nbsp;&nbsp;Propagation of exactness and inexactness</a></h3>
-<p></p>
-<p>
-The procedures listed below must return the mathematically correct exact result
-provided all their arguments are exact:</p>
-<p>
-</p>
-
-<tt>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*<br>
-max&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;min&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;abs<br>
-numerator&nbsp;&nbsp;&nbsp;&nbsp;denominator&nbsp;&nbsp;gcd<br>
-lcm&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;floor&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ceiling<br>
-truncate&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;round&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rationalize<br>
-real-part&nbsp;&nbsp;&nbsp;&nbsp;imag-part&nbsp;&nbsp;&nbsp;&nbsp;make-rectangular<p></tt></p>
-<p>
-The procedures listed below must return the correct exact result
-provided all their arguments are exact, and no divisors are zero:</p>
-<p>
-</p>
-
-<tt>/<br>
-div&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mod&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;div-and-mod<br>
-div0&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mod0&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;div0-and-mod0<p></tt></p>
-<p>
-Moreover, the procedure <tt>expt</tt> must return the correct exact
-result provided its first argument is an exact real number object and
-its second argument is an exact integer object.</p>
-<p>
-The general rule is that the generic operations return the correct
-exact result when all of their arguments are exact and the result is
-mathematically well-defined, but return an inexact result when any
-argument is inexact.  Exceptions to this rule include
-<tt>sqrt</tt>, <tt>exp</tt>, <tt>log</tt>,
-<tt>sin</tt>, <tt>cos</tt>, <tt>tan</tt>,
-<tt>asin</tt>, <tt>acos</tt>, <tt>atan</tt>,
-<tt>expt</tt>, <tt>make-polar</tt>, <tt>magnitude</tt>, and <tt>angle</tt>, which
-may (but are not required to) return inexact results even when
-given exact arguments, as indicated in the specification of these
-procedures.</p>
-<p>
-One general exception to the rule above is that an implementation may
-return an exact result despite inexact arguments if that exact result
-would be the correct result for all possible substitutions of exact
-arguments for the inexact ones.  An example is <tt>(* 1.0 0)</tt> which
-may return either <tt>0</tt> (exact) or <tt>0.0</tt> (inexact).</p>
-<p>
-</p>
-<a name="node_sec_11.7.2"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.7.2">11.7.2&nbsp;&nbsp;Representability of infinities and NaNs</a></h3>
-<p></p>
-<p>
-The specification of the numerical operations is written as though
-infinities and NaNs are representable, and specifies many operations
-with respect to these number objects in ways that are consistent with the
-IEEE-754 standard for binary floating-point arithmetic.  
-An implementation of Scheme may or may not represent infinities and
-NaNs; however,
-an implementation must raise a continuable exception with
-condition type <tt>&amp;no-infinities</tt> or <tt>&amp;no-nans</tt> (respectively;
-see library section&nbsp;on &#8220;Flonums&#8221;)
-whenever it is unable to represent an infinity or NaN as specified. 
-In this case, the continuation of the exception
-handler is the continuation that otherwise would have received
-the infinity or NaN value.  This requirement also applies to
-conversions between number objects and external representations, including
-the reading of program source code.</p>
-<p>
-</p>
-<a name="node_sec_11.7.3"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.7.3">11.7.3&nbsp;&nbsp;Semantics of common operations</a></h3>
-<p>Some operations are the semantic basis for several arithmetic
-procedures.  The behavior of these operations is described in this
-section for later reference.</p>
-<p>
-</p>
-<a name="node_sec_11.7.3.1"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.7.3.1">11.7.3.1&nbsp;&nbsp;Integer division</a></h4>
-<p></p>
-<p>
-Scheme&#8217;s operations for performing integer
-division rely on mathematical operations <em>d</em><em>i</em><em>v</em>,
-<em>m</em><em>o</em><em>d</em>, <em>d</em><em>i</em><em>v</em><sub>0</sub>, and
-<em>m</em><em>o</em><em>d</em><sub>0</sub>, that are defined as follows:</p>
-<p>
-<em>d</em><em>i</em><em>v</em>, <em>m</em><em>o</em><em>d</em>, <em>d</em><em>i</em><em>v</em><sub>0</sub>, and <em>m</em><em>o</em><em>d</em><sub>0</sub>
-each accept two real numbers <em>x</em><sub>1</sub> and <em>x</em><sub>2</sub> as operands, where
-<em>x</em><sub>2</sub> must be nonzero.</p>
-<p>
-<em>d</em><em>i</em><em>v</em> returns an integer, and <em>m</em><em>o</em><em>d</em> returns a real.
-Their results are specified by
-</p>
-<a name="node_eqn_Temp_17"></a>
-<div align=left><table width=100%>
-<tr><td align=right>
-<em>x</em><sub>1</sub>&nbsp;<em>d</em><em>i</em><em>v</em>&nbsp;<em>x</em><sub>2</sub> </td><td align=center width=2%> = </td><td> <em>n</em><sub><em>d</em></sub></td></tr>
-<tr><td align=right><em>x</em><sub>1</sub>&nbsp;<em>m</em><em>o</em><em>d</em>&nbsp;<em>x</em><sub>2</sub> </td><td align=center width=2%> = </td><td> <em>x</em><sub><em>m</em></sub>
-</td></tr>
-</table></div><p>*
-where
-</p>
-<div align=left><img src="r6rs-Z-G-2.gif" border="0" alt="[r6rs-Z-G-2.gif]"></div><p>
-Examples:
-</p>
-<a name="node_eqn_Temp_18"></a>
-<div align=left><table width=100%>
-<tr><td align=right>
-123&nbsp;<em>d</em><em>i</em><em>v</em>&nbsp;10    </td><td align=center width=2%> = </td><td>  12</td></tr>
-<tr><td align=right>123&nbsp;<em>m</em><em>o</em><em>d</em>&nbsp;10    </td><td align=center width=2%> = </td><td>  3</td></tr>
-<tr><td align=right>123&nbsp;<em>d</em><em>i</em><em>v</em>&nbsp; <tt>-</tt> 10   </td><td align=center width=2%> = </td><td>   <tt>-</tt> 12</td></tr>
-<tr><td align=right>123&nbsp;<em>m</em><em>o</em><em>d</em>&nbsp; <tt>-</tt> 10   </td><td align=center width=2%> = </td><td>  3</td></tr>
-<tr><td align=right> <tt>-</tt> 123&nbsp;<em>d</em><em>i</em><em>v</em>&nbsp;10    </td><td align=center width=2%> = </td><td>   <tt>-</tt> 13</td></tr>
-<tr><td align=right> <tt>-</tt> 123&nbsp;<em>m</em><em>o</em><em>d</em>&nbsp;10    </td><td align=center width=2%> = </td><td>  7</td></tr>
-<tr><td align=right> <tt>-</tt> 123&nbsp;<em>d</em><em>i</em><em>v</em>&nbsp; <tt>-</tt> 10   </td><td align=center width=2%> = </td><td>  13</td></tr>
-<tr><td align=right> <tt>-</tt> 123&nbsp;<em>m</em><em>o</em><em>d</em>&nbsp; <tt>-</tt> 10   </td><td align=center width=2%> = </td><td>  7
-</td></tr>
-</table></div><p>*
-<em>d</em><em>i</em><em>v</em><sub>0</sub> and <em>m</em><em>o</em><em>d</em><sub>0</sub> are like <em>d</em><em>i</em><em>v</em> and
-<em>m</em><em>o</em><em>d</em>, except the result of <em>m</em><em>o</em><em>d</em><sub>0</sub> lies within a
-half-open interval centered on zero.  The results are specified by
-</p>
-<a name="node_eqn_Temp_19"></a>
-<div align=left><table width=100%>
-<tr><td align=right>
-<em>x</em><sub>1</sub>&nbsp;<em>d</em><em>i</em><em>v</em><sub>0</sub>&nbsp;<em>x</em><sub>2</sub> </td><td align=center width=2%> = </td><td> <em>n</em><sub><em>d</em></sub></td></tr>
-<tr><td align=right><em>x</em><sub>1</sub>&nbsp;<em>m</em><em>o</em><em>d</em><sub>0</sub>&nbsp;<em>x</em><sub>2</sub> </td><td align=center width=2%> = </td><td> <em>x</em><sub><em>m</em></sub>
-</td></tr>
-</table></div><p>*
-where:
-</p>
-<div align=left><img src="r6rs-Z-G-3.gif" border="0" alt="[r6rs-Z-G-3.gif]"></div><p>
-Examples:
-</p>
-<a name="node_eqn_Temp_20"></a>
-<div align=left><table width=100%>
-<tr><td align=right>
-123&nbsp;<em>d</em><em>i</em><em>v</em><sub>0</sub>&nbsp;10    </td><td align=center width=2%> = </td><td>  12</td></tr>
-<tr><td align=right>123&nbsp;<em>m</em><em>o</em><em>d</em><sub>0</sub>&nbsp;10    </td><td align=center width=2%> = </td><td>  3</td></tr>
-<tr><td align=right>123&nbsp;<em>d</em><em>i</em><em>v</em><sub>0</sub>&nbsp; <tt>-</tt> 10   </td><td align=center width=2%> = </td><td>   <tt>-</tt> 12</td></tr>
-<tr><td align=right>123&nbsp;<em>m</em><em>o</em><em>d</em><sub>0</sub>&nbsp; <tt>-</tt> 10   </td><td align=center width=2%> = </td><td>  3</td></tr>
-<tr><td align=right> <tt>-</tt> 123&nbsp;<em>d</em><em>i</em><em>v</em><sub>0</sub>&nbsp;10    </td><td align=center width=2%> = </td><td>   <tt>-</tt> 12</td></tr>
-<tr><td align=right> <tt>-</tt> 123&nbsp;<em>m</em><em>o</em><em>d</em><sub>0</sub>&nbsp;10    </td><td align=center width=2%> = </td><td>   <tt>-</tt> 3</td></tr>
-<tr><td align=right> <tt>-</tt> 123&nbsp;<em>d</em><em>i</em><em>v</em><sub>0</sub>&nbsp; <tt>-</tt> 10   </td><td align=center width=2%> = </td><td>  12</td></tr>
-<tr><td align=right> <tt>-</tt> 123&nbsp;<em>m</em><em>o</em><em>d</em><sub>0</sub>&nbsp; <tt>-</tt> 10   </td><td align=center width=2%> = </td><td>   <tt>-</tt> 3
-</td></tr>
-</table></div><p>*</p>
-<p>
-</p>
-<a name="node_sec_11.7.3.2"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.7.3.2">11.7.3.2&nbsp;&nbsp;Transcendental functions</a></h4>
-<p></p>
-<p>
-In general, the transcendental functions log, sin<sup><tt>-</tt>1</sup>
-(arcsine), cos<sup><tt>-</tt>1</sup> (arccosine), and tan<sup><tt>-</tt>1</sup> are multiply
-defined.  The value of log <em>z</em> is defined to be the one whose
-imaginary part lies in the range from  <tt>-</tt> <img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"> (inclusive if  <tt>-</tt> 0.0 is
-distinguished, exclusive otherwise) to <img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"> (inclusive).  log 0 is
-undefined.</p>
-<p>
-The value of log <em>z</em> for non-real <em>z</em> is defined in terms of log on real numbers as </p>
-<p>
-</p>
-<div align=left><img src="r6rs-Z-G-4.gif" border="0" alt="[r6rs-Z-G-4.gif]"></div><p>
-where <em>a</em><em>n</em><em>g</em><em>l</em><em>e</em>&nbsp;<em>z</em> is the angle of <em>z</em>  =  <em>a</em> &middot;  <em>e</em><sup><em>i</em><em>b</em></sup> specified
-as:
-</p>
-<div class=mathdisplay align=left><table><tr><td><em>a</em><em>n</em><em>g</em><em>l</em><em>e</em>&nbsp;<em>z</em>  =  <em>b</em> + 2<img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"> <em>n</em></td></tr></table></div>
-<p class=noindent>
-with  <tt>-</tt> <img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"> &le; <em>a</em><em>n</em><em>g</em><em>l</em><em>e</em>&nbsp;<em>z</em>&le; <img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"> and <em>a</em><em>n</em><em>g</em><em>l</em><em>e</em>&nbsp;<em>z</em>  = 
-<em>b</em> + 2<img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"> <em>n</em> for some integer <em>n</em>.</p>
-<p>
-With the one-argument version of log defined this way, the values
-of the two-argument-version of log, sin<sup><tt>-</tt>1</sup> <em>z</em>, cos<sup><tt>-</tt>1</sup> <em>z</em>,
-tan<sup><tt>-</tt>1</sup> <em>z</em>, and the two-argument version of tan<sup><tt>-</tt>1</sup> are
-according to the following formul&aelig;:
-</p>
-<a name="node_eqn_Temp_21"></a>
-<div align=left><table width=100%>
-<tr><td align=right>
-log <em>z</em>&nbsp;<em>b</em> </td><td align=center width=2%> = </td><td> (log <em>z</em>/log <em>b</em>)</td></tr>
-<tr><td align=right>sin<sup><tt>-</tt>1</sup> <em>z</em> </td><td align=center width=2%> = </td><td>  <tt>-</tt> <em>i</em> log (<em>i</em> <em>z</em>  +  (1  <tt>-</tt>  <em>z</em><sup>2</sup>)<sup>1/2</sup>)</td></tr>
-<tr><td align=right>cos<sup><tt>-</tt>1</sup> <em>z</em> </td><td align=center width=2%> = </td><td> <img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"> / 2  <tt>-</tt>  sin<sup><tt>-</tt>1</sup> <em>z</em></td></tr>
-<tr><td align=right>tan<sup><tt>-</tt>1</sup> <em>z</em> </td><td align=center width=2%> = </td><td> (log (1  +  <em>i</em> <em>z</em>)  <tt>-</tt>  log (1  <tt>-</tt>  <em>i</em> <em>z</em>)) / (2 <em>i</em>)</td></tr>
-<tr><td align=right>tan<sup><tt>-</tt>1</sup> <em>x</em>&nbsp;<em>y</em> </td><td align=center width=2%> = </td><td> <em>a</em><em>n</em><em>g</em><em>l</em><em>e</em>(<em>x</em> +  <em>y</em><em>i</em>)
-</td></tr>
-</table></div><p>*</p>
-<p>
-The range of tan<sup><tt>-</tt>1</sup> <em>x</em>&nbsp;<em>y</em> is as in the following table. The
-asterisk (*) indicates that the entry applies to implementations that
-distinguish minus zero.</p>
-<p>
-</p>
-<div align=center><table><tr><td>
-
-<table border=0><tr><td valign=top ></td><td valign=top ><em>y</em> condition </td><td valign=top ><em>x</em> condition </td><td valign=top >range of result <em>r</em></td></tr>
-<tr><td valign=top ></td><td valign=top ><em>y</em>  =  0.0 </td><td valign=top ><em>x</em> &gt; 0.0 </td><td valign=top >0.0</td></tr>
-<tr><td valign=top >&lowast; </td><td valign=top ><em>y</em>  =   + 0.0  </td><td valign=top ><em>x</em> &gt; 0.0 </td><td valign=top > + 0.0</td></tr>
-<tr><td valign=top >&lowast; </td><td valign=top ><em>y</em>  =   <tt>-</tt> 0.0 </td><td valign=top ><em>x</em> &gt; 0.0 </td><td valign=top > <tt>-</tt> 0.0</td></tr>
-<tr><td valign=top ></td><td valign=top ><em>y</em> &gt; 0.0 </td><td valign=top ><em>x</em> &gt; 0.0 </td><td valign=top >0.0 &lt; <em>r</em> &lt; (<img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]">/2)</td></tr>
-<tr><td valign=top ></td><td valign=top ><em>y</em> &gt; 0.0 </td><td valign=top ><em>x</em>  =  0.0 </td><td valign=top >(<img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]">/2)</td></tr>
-<tr><td valign=top ></td><td valign=top ><em>y</em> &gt; 0.0 </td><td valign=top ><em>x</em> &lt; 0.0 </td><td valign=top >(<img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]">/2) &lt; <em>r</em> &lt; <img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"></td></tr>
-<tr><td valign=top ></td><td valign=top ><em>y</em>  =  0.0 </td><td valign=top ><em>x</em> &lt; 0 </td><td valign=top ><img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"></td></tr>
-<tr><td valign=top >&lowast; </td><td valign=top ><em>y</em>  =   + 0.0 </td><td valign=top ><em>x</em> &lt; 0.0 </td><td valign=top ><img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"></td></tr>
-<tr><td valign=top >&lowast; </td><td valign=top ><em>y</em>  =   <tt>-</tt> 0.0 </td><td valign=top ><em>x</em> &lt; 0.0 </td><td valign=top > <tt>-</tt> <img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"></td></tr>
-<tr><td valign=top ></td><td valign=top ><em>y</em> &lt; 0.0 </td><td valign=top ><em>x</em> &lt; 0.0 </td><td valign=top > <tt>-</tt> <img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]">&lt; <em>r</em>&lt;  <tt>-</tt> (<img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]">/2)</td></tr>
-<tr><td valign=top ></td><td valign=top ><em>y</em> &lt; 0.0 </td><td valign=top ><em>x</em>  =  0.0 </td><td valign=top > <tt>-</tt> (<img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]">/2)</td></tr>
-<tr><td valign=top ></td><td valign=top ><em>y</em> &lt; 0.0 </td><td valign=top ><em>x</em> &gt; 0.0 </td><td valign=top > <tt>-</tt> (<img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]">/2) &lt; <em>r</em>&lt; 0.0</td></tr>
-<tr><td valign=top ></td><td valign=top ><em>y</em>  =  0.0 </td><td valign=top ><em>x</em>  =  0.0 </td><td valign=top >undefined</td></tr>
-<tr><td valign=top >&lowast;</td><td valign=top ><em>y</em>  =   + 0.0 </td><td valign=top ><em>x</em>  =   + 0.0 </td><td valign=top > + 0.0</td></tr>
-<tr><td valign=top >&lowast;</td><td valign=top ><em>y</em>  =   <tt>-</tt> 0.0 </td><td valign=top ><em>x</em>  =   + 0.0</td><td valign=top > <tt>-</tt> 0.0</td></tr>
-<tr><td valign=top >&lowast;</td><td valign=top ><em>y</em>  =   + 0.0 </td><td valign=top ><em>x</em>  =   <tt>-</tt> 0.0 </td><td valign=top ><img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"></td></tr>
-<tr><td valign=top >&lowast;</td><td valign=top ><em>y</em>  =   <tt>-</tt> 0.0 </td><td valign=top ><em>x</em>  =   <tt>-</tt> 0.0 </td><td valign=top > <tt>-</tt> <img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"></td></tr>
-<tr><td valign=top >&lowast;</td><td valign=top ><em>y</em>  =   + 0.0 </td><td valign=top ><em>x</em>  =  0 </td><td valign=top >(<img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]">/2)</td></tr>
-<tr><td valign=top >&lowast;</td><td valign=top ><em>y</em>  =   <tt>-</tt> 0.0 </td><td valign=top ><em>x</em>  =  0    </td><td valign=top > <tt>-</tt> (<img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]">/2)
-</td></tr></table>
-</td></tr></table></div>
-<p>
-</p>
-<a name="node_sec_11.7.4"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.7.4">11.7.4&nbsp;&nbsp;Numerical operations</a></h3>
-<p></p>
-<a name="node_sec_11.7.4.1"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.7.4.1">11.7.4.1&nbsp;&nbsp;Numerical type predicates</a></h4>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_440"></a>number?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_442"></a>complex?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_444"></a>real?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_446"></a>rational?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_448"></a>integer?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These numerical type predicates can be applied to any kind of
-argument.  They return <tt>#t</tt> if the object is a number object
-of the named type, and <tt>#f</tt> otherwise.
-In general, if a type predicate is true of a number object then all higher
-type predicates are also true of that number object.  Consequently, if a type
-predicate is false of a number object, then all lower type predicates are
-also false of that number object.</p>
-<p>
-If <i>z</i> is a complex number object, then <tt>(real? <i>z</i>)</tt> is true if
-and only if <tt>(zero? (imag-part <i>z</i>))</tt> and <tt>(exact?
-(imag-part <i>z</i>))</tt> are both true.</p>
-<p>
-If <i>x</i> is a real number object, then <tt>(rational? <i>x</i>)</tt> is true if
-and only if there exist exact integer objects <i>k<sub>1</sub></i> and <i>k<sub>2</sub></i> such that
-<tt>(= <i>x</i> (/ <i>k<sub>1</sub></i> <i>k<sub>2</sub></i>))</tt> and <tt>(= (numerator
-<i>x</i>) <i>k<sub>1</sub></i>)</tt> and <tt>(= (denominator <i>x</i>) <i>k<sub>2</sub></i>)</tt> are
-all true.  Thus infinities and NaNs are not rational number objects.</p>
-<p>
-If <i>q</i> is a rational number objects, then <tt>(integer?
-<i>q</i>)</tt> is true if and only if <tt>(= (denominator
-<i>q</i>) 1)</tt> is true.  If <i>q</i> is not a rational number object,
-then <tt>(integer? <i>q</i>)</tt> is <tt>#f</tt>.</p>
-<p>
-</p>
-
-<tt>(complex?&nbsp;3+4i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(complex?&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real?&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real?&nbsp;-2.5+0.0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(real?&nbsp;-2.5+0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real?&nbsp;-2.5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real?&nbsp;<tt>#</tt>e1e10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(rational?&nbsp;6/10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(rational?&nbsp;6/3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(rational?&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(integer?&nbsp;3+0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(integer?&nbsp;3.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(integer?&nbsp;8/4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-<br>
-(number?&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(complex?&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real?&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(rational?&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(complex?&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real?&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(rational?&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(integer?&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Except for <tt>number?</tt>, the behavior of these type predicates
-on inexact number objects is
-unreliable, because any inaccuracy may
-affect the result.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_450"></a>real-valued?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_452"></a>rational-valued?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_454"></a>integer-valued?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These numerical type predicates can be applied to any kind of
-argument.  The <tt>real-valued?</tt> procedure
-returns <tt>#t</tt> if the object is a number object and is equal in the
-sense of <tt>=</tt> to some real number object, or if the object is a NaN, or a
-complex number object whose real part is a NaN and whose imaginary
-part is zero
-in the sense of <tt>zero?</tt>.  The <tt>rational-valued?</tt> and <tt>integer-valued?</tt> procedures return <tt>#t</tt> if the object is a
-number object and is equal in the sense of <tt>=</tt> to some object of the
-named type, and otherwise they return <tt>#f</tt>.</p>
-<p>
-</p>
-
-<tt>(real-valued?&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real-valued?&nbsp;+nan.0+0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real-valued?&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real-valued?&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real-valued?&nbsp;-2.5+0.0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real-valued?&nbsp;-2.5+0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real-valued?&nbsp;-2.5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(real-valued?&nbsp;<tt>#</tt>e1e10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-<br>
-(rational-valued?&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(rational-valued?&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(rational-valued?&nbsp;6/10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(rational-valued?&nbsp;6/10+0.0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(rational-valued?&nbsp;6/10+0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(rational-valued?&nbsp;6/3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-<br>
-(integer-valued?&nbsp;3+0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(integer-valued?&nbsp;3+0.0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(integer-valued?&nbsp;3.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(integer-valued?&nbsp;3.0+0.0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(integer-valued?&nbsp;8/4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-These procedures test whether a given number object can be coerced
-to the specified type without loss of numerical accuracy.
-Specifically, the behavior of these predicates differs from the
-behavior of <tt>real?</tt>, <tt>rational?</tt>, and <tt>integer?</tt> on
-complex number objects whose imaginary part is inexact zero.
-</blockquote><p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The behavior of these type predicates on inexact number objects is
-unreliable, because any inaccuracy may
-affect the result.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_456"></a>exact?<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_458"></a>inexact?<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These numerical predicates provide tests for the exactness of a
-quantity.  For any number object, precisely one of these predicates is
-true.</p>
-<p>
-</p>
-
-<tt>(exact?&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(inexact?&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.7.4.2"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.7.4.2">11.7.4.2&nbsp;&nbsp;Generic conversions</a></h4>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_460"></a>inexact<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_462"></a>exact<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>inexact</tt> procedure returns an inexact representation of <i>z</i>.  If
-inexact number objects of the appropriate type have bounded precision, then
-the value returned is an inexact number object that is nearest to the
-argument.  If an exact argument has no reasonably close inexact
-equivalent, an exception with condition type
-<tt>&amp;implementation-violation</tt> may be
-raised.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-For a real number object whose magnitude is finite but so large that it has
-no reasonable finite approximation as an inexact number, a
-reasonably close inexact equivalent may be <tt>+inf.0</tt> or <tt>-inf.0</tt>.  Similarly, the inexact representation of a complex
-number object whose components are finite may have infinite components.
-</blockquote><p>
-The <tt>exact</tt> procedure returns an exact representation of <i>z</i>.  The value
-returned is the exact number object that is numerically closest to the
-argument; in most cases, the result of this procedure should be
-numerically equal to its argument.  If an inexact argument has no
-reasonably close exact equivalent, an exception with condition type
-<tt>&amp;implementation-violation</tt> may be
-raised.</p>
-<p>
-These procedures implement the natural one-to-one correspondence
-between exact and inexact integer objects throughout an
-implementation-dependent range.</p>
-<p>
-The <tt>inexact</tt> and <tt>exact</tt> procedures are idempotent.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.7.4.3"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.7.4.3">11.7.4.3&nbsp;&nbsp;Arithmetic operations</a></h4>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_464"></a>=<i> <i>z<sub>1</sub></i> <i>z<sub>2</sub></i> <i>z<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_466"></a>&lt;<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i> <i>x<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_468"></a>&gt;<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i> <i>x<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_470"></a>&lt;=<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i> <i>x<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_472"></a>&gt;=<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i> <i>x<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return <tt>#t</tt> if their arguments are
-(respectively): equal, monotonically increasing, monotonically
-decreasing, monotonically nondecreasing, or monotonically
-nonincreasing, and <tt>#f</tt> otherwise.</p>
-<p>
-</p>
-
-<tt>(=&nbsp;+inf.0&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(=&nbsp;-inf.0&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(=&nbsp;-inf.0&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-For any real number object <i>x</i> that is neither infinite nor NaN:</p>
-<p>
-</p>
-
-<tt>(&lt;&nbsp;-inf.0&nbsp;<i>x</i>&nbsp;+inf.0))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(&gt;&nbsp;+inf.0&nbsp;<i>x</i>&nbsp;-inf.0))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-For any number object <i>z</i>:
-</p>
-
-<tt>(=&nbsp;+nan.0&nbsp;<i>z</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt>
-For any real number object <i>x</i>:
-</p>
-
-<tt>(&lt;&nbsp;+nan.0&nbsp;<i>x</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(&gt;&nbsp;+nan.0&nbsp;<i>x</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt></p>
-<p>
-These predicates must be transitive.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The traditional implementations of these predicates in Lisp-like
-languages are not transitive.
-</blockquote><p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-While it is possible to compare inexact number objects using these
-predicates, the results may be unreliable because a small inaccuracy
-may affect the result; this is especially true of <tt>=</tt> and <tt>zero?</tt> (below).<p>
-When in doubt, consult a numerical analyst.
-</p>
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_474"></a>zero?<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_476"></a>positive?<i> x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_478"></a>negative?<i> x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_480"></a>odd?<i> n</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_482"></a>even?<i> n</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_484"></a>finite?<i> x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_486"></a>infinite?<i> x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_488"></a>nan?<i> x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These numerical predicates test a number object for a particular property,
-returning <tt>#t</tt> or <tt>#f</tt>.  The <tt>zero?</tt>
-procedure
-tests if the number object is <tt>=</tt> to zero, <tt>positive?</tt> tests whether it is
-greater than zero, <tt>negative?</tt> tests whether it is less than zero, <tt>odd?</tt> tests whether it is odd, <tt>even?</tt> tests whether it is even, <tt>finite?</tt> tests whether it is not an infinity and not a NaN, <tt>infinite?</tt> tests whether it is an infinity, <tt>nan?</tt> tests whether it is a
-NaN.</p>
-<p>
-</p>
-
-<tt>(zero?&nbsp;+0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(zero?&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(zero?&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(positive?&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(negative?&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(positive?&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(negative?&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(finite?&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(finite?&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(finite?&nbsp;5.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(infinite?&nbsp;5.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(infinite?&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-As with the predicates above, the results may be unreliable because
-a small inaccuracy may affect the result.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_490"></a>max<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_492"></a>min<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return the maximum or minimum of their arguments.</p>
-<p>
-</p>
-
-<tt>(max&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;4<br>
-(max&nbsp;3.9&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;4.0<p></tt></p>
-<p>
-For any real number object <i>x</i>:</p>
-<p>
-</p>
-
-<tt>(max&nbsp;+inf.0&nbsp;<i>x</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(min&nbsp;-inf.0&nbsp;<i>x</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-inf.0<p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-If any argument is inexact, then the result is also inexact (unless
-the procedure can prove that the inaccuracy is not large enough to affect the
-result, which is possible only in unusual implementations).  If <tt>min</tt> or
-<tt>max</tt> is used to compare number objects of mixed exactness, and the numerical
-value of the result cannot be represented as an inexact number object without loss of
-accuracy, then the procedure may raise an exception with condition
-type <tt>&amp;implementation-restriction</tt>.
-</blockquote><p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_494"></a>+<i> <i>z<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_496"></a>*<i> <i>z<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return the sum or product of their arguments.</p>
-<p>
-</p>
-
-<tt>(+&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;7<br>
-(+&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;3<br>
-(+)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0<br>
-(+&nbsp;+inf.0&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(+&nbsp;+inf.0&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<br>
-<br>
-(*&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;4<br>
-(*)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1<br>
-(*&nbsp;5&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(*&nbsp;-5&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-inf.0<br>
-(*&nbsp;+inf.0&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(*&nbsp;+inf.0&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-inf.0<br>
-(*&nbsp;0&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0&nbsp;<i>or</i>&nbsp;+nan.0<br>
-(*&nbsp;0&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0&nbsp;<i>or</i>&nbsp;+nan.0<br>
-(*&nbsp;1.0&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0&nbsp;<i>or</i>&nbsp;0.0<p></tt></p>
-<p>
-For any real number object <i>x</i> that is neither infinite nor NaN:</p>
-<p>
-</p>
-
-<tt>(+&nbsp;+inf.0&nbsp;<i>x</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(+&nbsp;-inf.0&nbsp;<i>x</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-inf.0<p></tt></p>
-<p>
-For any real number object <i>x</i>:</p>
-<p>
-</p>
-
-<tt>(+&nbsp;+nan.0&nbsp;<i>x</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<p></tt></p>
-<p>
-For any real number object <i>x</i> that is not an exact 0:</p>
-<p>
-</p>
-
-<tt>(*&nbsp;+nan.0&nbsp;<i>x</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<p></tt></p>
-<p>
-If any of these procedures are applied to mixed non-rational real and
-non-real complex arguments, they either raise an exception with
-condition type <tt>&amp;implementation-restriction</tt> or return an
-unspecified number object.</p>
-<p>
-Implementations that distinguish  <tt>-</tt> 0.0 should adopt behavior
-consistent with the following examples:</p>
-<p>
-</p>
-
-<tt>(+&nbsp;0.0&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0<br>
-(+&nbsp;-0.0&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0<br>
-(+&nbsp;0.0&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0<br>
-(+&nbsp;-0.0&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-0.0<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_498"></a>-<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_500"></a>-<i> <i>z<sub>1</sub></i> <i>z<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-With two or more arguments, this procedures returns the difference of
-its arguments, associating to the left.  With one argument, however,
-it returns the additive inverse of its argument.</p>
-<p>
-</p>
-
-<tt>(-&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-1<br>
-(-&nbsp;3&nbsp;4&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-6<br>
-(-&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-3<br>
-(-&nbsp;+inf.0&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<p></tt></p>
-<p>
-If this procedure is applied to mixed non-rational real and
-non-real complex arguments, it either raises an exception with
-condition type <tt>&amp;implementation-restriction</tt> or returns an
-unspecified number object.</p>
-<p>
-Implementations that distinguish  <tt>-</tt> 0.0 should adopt behavior
-consistent with the following examples:</p>
-<p>
-</p>
-
-<tt>(-&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-0.0<br>
-(-&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0<br>
-(-&nbsp;0.0&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0<br>
-(-&nbsp;-0.0&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-0.0<br>
-(-&nbsp;0.0&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0<br>
-(-&nbsp;-0.0&nbsp;-0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_502"></a>/<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_504"></a>/<i> <i>z<sub>1</sub></i> <i>z<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-If all of the arguments are exact, then the divisors must all
-be nonzero.
-With two or more arguments, this procedure returns the 
-quotient of its arguments, associating to the left.  With one
-argument, however, it returns the multiplicative inverse
-of its argument.</p>
-<p>
-</p>
-
-<tt>(/&nbsp;3&nbsp;4&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;3/20<br>
-(/&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1/3<br>
-(/&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(/&nbsp;1.0&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(/&nbsp;-1&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-inf.0<br>
-(/&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0.0<br>
-(/&nbsp;0&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><br>
-(/&nbsp;3&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><br>
-(/&nbsp;0&nbsp;3.5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0.0<br>
-(/&nbsp;0&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<br>
-(/&nbsp;0.0&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<br>
-(/&nbsp;0.0&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<p></tt></p>
-<p>
-If this procedure is applied to mixed non-rational real and
-non-real complex arguments, it either raises an exception with
-condition type <tt>&amp;implementation-restriction</tt> or returns an
-unspecified number object.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_506"></a>abs<i> x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the absolute value of its argument.</p>
-<p>
-</p>
-
-<tt>(abs&nbsp;-7)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;7<br>
-(abs&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_508"></a>div-and-mod<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_510"></a>div<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_512"></a>mod<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_514"></a>div0-and-mod0<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_516"></a>div0<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_518"></a>mod0<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures implement number-theoretic integer division and
-return the results of the corresponding mathematical operations
-specified in section&nbsp;<a href="#node_sec_11.7.3.1">11.7.3.1</a>.  In each case, <i>x<sub>1</sub></i>
-must be neither infinite nor a NaN, and <i>x<sub>2</sub></i> must be nonzero;
-otherwise, an exception with condition type <tt>&amp;assertion</tt> is raised.</p>
-<p>
-</p>
-
-<tt>(div&nbsp;<i>x<sub>1</sub></i>&nbsp;<i>x<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>x<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em>&nbsp;<i>x<sub>2</sub></i><br>
-(mod&nbsp;<i>x<sub>1</sub></i>&nbsp;<i>x<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>x<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em>&nbsp;<i>x<sub>2</sub></i><br>
-(div-and-mod&nbsp;<i>x<sub>1</sub></i>&nbsp;<i>x<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>x<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em>&nbsp;<i>x<sub>2</sub></i>,&nbsp;<i>x<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em>&nbsp;<i>x<sub>2</sub></i><br>
-;&nbsp;two&nbsp;return&nbsp;values<br>
-(div0&nbsp;<i>x<sub>1</sub></i>&nbsp;<i>x<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>x<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em><sub>0</sub>&nbsp;<i>x<sub>2</sub></i><br>
-(mod0&nbsp;<i>x<sub>1</sub></i>&nbsp;<i>x<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>x<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em><sub>0</sub>&nbsp;<i>x<sub>2</sub></i><br>
-(div0-and-mod0&nbsp;<i>x<sub>1</sub></i>&nbsp;<i>x<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>x<sub>1</sub></i>&nbsp;<em>d</em><em>i</em><em>v</em><sub>0</sub>&nbsp;<i>x<sub>2</sub></i>,&nbsp;<i>x<sub>1</sub></i>&nbsp;<em>m</em><em>o</em><em>d</em><sub>0</sub>&nbsp;<i>x<sub>2</sub></i><br>
-;&nbsp;two&nbsp;return&nbsp;values<p></tt></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_520"></a>gcd<i> <i>n<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_522"></a>lcm<i> <i>n<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return the greatest common divisor or least common
-multiple of their arguments.  The result is always non-negative.</p>
-<p>
-</p>
-
-<tt>(gcd&nbsp;32&nbsp;-36)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;4<br>
-(gcd)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0<br>
-(lcm&nbsp;32&nbsp;-36)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;288<br>
-(lcm&nbsp;32.0&nbsp;-36)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;288.0<br>
-(lcm)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_524"></a>numerator<i> q</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_526"></a>denominator<i> q</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return the numerator or denominator of their
-argument; the result is computed as if the argument was represented as
-a fraction in lowest terms.  The denominator is always positive.  The
-denominator of 0 is defined to be 1.</p>
-<p>
-</p>
-
-<tt>(numerator&nbsp;(/&nbsp;6&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;3<br>
-(denominator&nbsp;(/&nbsp;6&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;2<br>
-(denominator<br>
-&nbsp;&nbsp;(inexact&nbsp;(/&nbsp;6&nbsp;4)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;2.0<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_528"></a>floor<i> x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_530"></a>ceiling<i> x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_532"></a>truncate<i> x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_534"></a>round<i> x</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures return inexact integer objects for inexact arguments that are
-not infinities or NaNs, and exact integer objects for exact rational
-arguments.  For such arguments, <tt>floor</tt> returns the largest
-integer object not larger than <i>x</i>.  The <tt>ceiling</tt> procedure returns the smallest
-integer object not smaller than <i>x</i>.  The <tt>truncate</tt> procedure returns the integer
-object closest to <i>x</i> whose absolute value is not larger than the
-absolute value of <i>x</i>.  The <tt>round</tt> procedure returns the
-closest integer object to
-<i>x</i>, rounding to even when <i>x</i> represents a number halfway between two
-integers.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-If the argument to one of these procedures is inexact, then the result
-is also inexact.  If an exact value is needed, the
-result should be passed to the <tt>exact</tt> procedure.
-</blockquote><p>
-Although infinities and NaNs are not integer objects, these procedures return
-an infinity when given an infinity as an argument, and a NaN when
-given a NaN.</p>
-<p>
-</p>
-
-<tt>(floor&nbsp;-4.3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-5.0<br>
-(ceiling&nbsp;-4.3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-4.0<br>
-(truncate&nbsp;-4.3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-4.0<br>
-(round&nbsp;-4.3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-4.0<br>
-<br>
-(floor&nbsp;3.5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;3.0<br>
-(ceiling&nbsp;3.5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;4.0<br>
-(truncate&nbsp;3.5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;3.0<br>
-(round&nbsp;3.5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;4.0<br>
-<br>
-(round&nbsp;7/2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;4<br>
-(round&nbsp;7)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;7<br>
-<br>
-(floor&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(ceiling&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-inf.0<br>
-(round&nbsp;+nan.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_536"></a>rationalize<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>rationalize</tt> procedure returns the a number object
-representing the <em>simplest</em> rational
-number differing from <i>x<sub>1</sub></i> by no more than <i>x<sub>2</sub></i>.    A rational number <em>r</em><sub>1</sub> is
-<em>simpler</em> <a name="node_idx_538"></a>than another rational number
-<em>r</em><sub>2</sub> if <em>r</em><sub>1</sub>  =  <em>p</em><sub>1</sub>/<em>q</em><sub>1</sub> and <em>r</em><sub>2</sub>  =  <em>p</em><sub>2</sub>/<em>q</em><sub>2</sub> (in lowest terms) and |<em>p</em><sub>1</sub>|
-&le; |<em>p</em><sub>2</sub>| and |<em>q</em><sub>1</sub>| &le; |<em>q</em><sub>2</sub>|.  Thus 3/5 is simpler than 4/7.
-Although not all rationals are comparable in this ordering (consider 2/7
-and 3/5) any interval contains a rational number that is simpler than
-every other rational number in that interval (the simpler 2/5 lies
-between 2/7 and 3/5).  Note that 0  =  0/1 is the simplest rational of
-all.
-</p>
-
-<tt>(rationalize&nbsp;(exact&nbsp;.3)&nbsp;1/10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1/3<br>
-(rationalize&nbsp;.3&nbsp;1/10)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt>i1/3&nbsp;&nbsp;;&nbsp;approximately<br>
-<br>
-(rationalize&nbsp;+inf.0&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(rationalize&nbsp;+inf.0&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<br>
-(rationalize&nbsp;3&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0.0<p></tt>
-The first two examples hold only in implementations whose inexact real
-number objects have sufficient precision.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_540"></a>exp<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_542"></a>log<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_544"></a>log<i> <i>z<sub>1</sub></i> <i>z<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_546"></a>sin<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_548"></a>cos<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_550"></a>tan<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_552"></a>asin<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_554"></a>acos<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_556"></a>atan<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_558"></a>atan<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures compute the usual transcendental functions.  The <tt>exp</tt> procedure computes the base-<em>e</em> exponential of <i>z</i>. 
-The <tt>log</tt> procedure with a single argument computes the natural logarithm of
-<i>z</i> (not the base-ten logarithm); <tt>(log <i>z<sub>1</sub></i>
-<i>z<sub>2</sub></i>)</tt> computes the base-<i>z<sub>2</sub></i> logarithm of <i>z<sub>1</sub></i>.
-The <tt>asin</tt>, <tt>acos</tt>, and <tt>atan</tt> procedures compute arcsine,
-arccosine, and arctangent, respectively.  The two-argument variant of
-<tt>atan</tt> computes <tt>(angle (make-rectangular <i>x<sub>2</sub></i>
-<i>x<sub>1</sub></i>))</tt>.</p>
-<p>
-See section&nbsp;<a href="#node_sec_11.7.3.2">11.7.3.2</a> for the underlying
-mathematical operations. These procedures may return inexact results
-even when given exact arguments.</p>
-<p>
-</p>
-
-<tt>(exp&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;+inf.0<br>
-(exp&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0<br>
-(log&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;+inf.0<br>
-(log&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-inf.0<br>
-(log&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><br>
-(log&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;+inf.0+3.141592653589793i<br>
-&nbsp;;&nbsp;approximately<br>
-(atan&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-1.5707963267948965&nbsp;;&nbsp;approximately<br>
-(atan&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1.5707963267948965&nbsp;;&nbsp;approximately<br>
-(log&nbsp;-1.0+0.0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0+3.141592653589793i&nbsp;;&nbsp;approximately<br>
-(log&nbsp;-1.0-0.0i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0-3.141592653589793i&nbsp;;&nbsp;approximately<br>
-;&nbsp;if&nbsp;-0.0&nbsp;is&nbsp;distinguished<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_560"></a>sqrt<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the principal square root of <i>z</i>.  For rational <i>z</i>,
-the result has either positive real part, or zero real part and
-non-negative imaginary part.  With log defined as in
-section&nbsp;<a href="#node_sec_11.7.3.2">11.7.3.2</a>, the value of <tt>(sqrt
-<i>z</i>)</tt> could be expressed as <em>e</em><sup>(log <em>z</em>/2)</sup>.</p>
-<p>
-The <tt>sqrt</tt> procedure may return an inexact result even when given an exact
-argument.</p>
-<p>
-</p>
-
-<tt>(sqrt&nbsp;-5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0.0+2.23606797749979i&nbsp;;&nbsp;approximately<br>
-(sqrt&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(sqrt&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0i<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_562"></a>exact-integer-sqrt<i> k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>exact-integer-sqrt</tt> procedure returns two non-negative exact
-integer objects <em>s</em> and <em>r</em> where <i>k</i>  =  <em>s</em><sup>2</sup>  + 
-<em>r</em> and <i>k</i> &lt; (<em>s</em> + 1)<sup>2</sup>.</p>
-<p>
-</p>
-
-<tt>(exact-integer-sqrt&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;2&nbsp;0<br>
-;&nbsp;two&nbsp;return&nbsp;values<br>
-(exact-integer-sqrt&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;2&nbsp;1<br>
-;&nbsp;two&nbsp;return&nbsp;values<br>
-<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_564"></a>expt<i> <i>z<sub>1</sub></i> <i>z<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <i>z<sub>1</sub></i> raised to the power <i>z<sub>2</sub></i>.  For nonzero <i>z<sub>1</sub></i>,
-this is <em>e</em><sup><em>z</em><sub>2</sub> log <em>z</em><sub>1</sub></sup>.
-0.0<sup><em>z</em></sup> is 1.0 if <i>z</i>  =  0.0, and 0.0 if <tt>(real-part <i>z</i>)</tt> is positive.  For other cases in which
-the first argument is zero, either an exception is raised with
-condition type <tt>&amp;implementation-restriction</tt>, or an unspecified
-number object is returned.</p>
-<p>
-For an exact real number object <i>z<sub>1</sub></i> and an exact
-integer object <i>z<sub>2</sub></i>, <tt>(expt <i>z<sub>1</sub></i>
-<i>z<sub>2</sub></i>)</tt> must return an exact result.  For all other
-values of <i>z<sub>1</sub></i> and <i>z<sub>2</sub></i>, <tt>(expt <i>z<sub>1</sub></i>
-<i>z<sub>2</sub></i>)</tt> may return an inexact result, even when both
-<i>z<sub>1</sub></i> and <i>z<sub>2</sub></i> are exact.</p>
-<p>
-</p>
-
-<tt>(expt&nbsp;5&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;125<br>
-(expt&nbsp;5&nbsp;-3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1/125<br>
-(expt&nbsp;5&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1<br>
-(expt&nbsp;0&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0<br>
-(expt&nbsp;0&nbsp;5+.0000312i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0<br>
-(expt&nbsp;0&nbsp;-5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(expt&nbsp;0&nbsp;-5+.0000312i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-(expt&nbsp;0&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1<br>
-(expt&nbsp;0.0&nbsp;0.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1.0<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_566"></a>make-rectangular<i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_568"></a>make-polar<i> <i>x<sub>3</sub></i> <i>x<sub>4</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_570"></a>real-part<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_572"></a>imag-part<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_574"></a>magnitude<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_576"></a>angle<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Suppose <em>a</em><sub>1</sub>, <em>a</em><sub>2</sub>, <em>a</em><sub>3</sub>, and <em>a</em><sub>4</sub> are real
-numbers, and <em>c</em> is a complex number such that the
-following holds:
-</p>
-<div align=left><img src="r6rs-Z-G-5.gif" border="0" alt="[r6rs-Z-G-5.gif]"></div><p></p>
-<p>
-Then, if <i>x<sub>1</sub></i>, <i>x<sub>2</sub></i>, <i>x<sub>3</sub></i>, and <i>x<sub>4</sub></i> are number
-objects representing <em>a</em><sub>1</sub>, <em>a</em><sub>2</sub>, <em>a</em><sub>3</sub>, and <em>a</em><sub>4</sub>, respectively,
-<tt>(make-rectangular <i>x<sub>1</sub></i> <i>x<sub>2</sub></i>)</tt> returns <em>c</em>, and <tt>(make-polar <i>x<sub>3</sub></i> <i>x<sub>4</sub></i>)</tt> returns <em>c</em>.
-</p>
-
-<tt>(make-rectangular&nbsp;1.1&nbsp;2.2)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1.1+2.2i&nbsp;;&nbsp;approximately<br>
-(make-polar&nbsp;1.1&nbsp;2.2)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1.1@2.2&nbsp;;&nbsp;approximately<br>
-<p></tt>
-Conversely, if  <tt>-</tt> <img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]"> &le; <em>a</em><sub>4</sub> &le; <img src="r6rs-Z-G-D-3.gif" border="0" alt="[r6rs-Z-G-D-3.gif]">, and if <em>z</em> is a number object
-representing <em>c</em>, then <tt>(real-part <i>z</i>)</tt> returns <em>a</em><sub>1</sub> <tt>(imag-part <i>z</i>)</tt> returns <em>a</em><sub>2</sub>, <tt>(magnitude <i>z</i>)</tt>
-returns <em>a</em><sub>3</sub>, and <tt>(angle <i>z</i>)</tt> returns <em>a</em><sub>4</sub>.</p>
-<p>
-</p>
-
-<tt>(real-part&nbsp;1.1+2.2i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1.1&nbsp;;&nbsp;approximately<br>
-(imag-part&nbsp;1.1+2.2i)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;2.2i&nbsp;;&nbsp;approximately<br>
-(magnitude&nbsp;1.1@2.2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1.1&nbsp;;&nbsp;approximately<br>
-(angle&nbsp;1.1@2.2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;2.2&nbsp;;&nbsp;approximately<br>
-<br>
-(angle&nbsp;-1.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;3.141592653589793&nbsp;;&nbsp;approximately<br>
-(angle&nbsp;-1.0+0.0i)&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;3.141592653589793&nbsp;;&nbsp;approximately<br>
-(angle&nbsp;-1.0-0.0i)&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-3.141592653589793&nbsp;;&nbsp;approximately<br>
-;&nbsp;if&nbsp;-0.0&nbsp;is&nbsp;distinguished<br>
-(angle&nbsp;+inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;0.0<br>
-(angle&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;3.141592653589793&nbsp;;&nbsp;approximately<p></tt></p>
-<p>
-Moreover, suppose <i>x<sub>1</sub></i>, <i>x<sub>2</sub></i> are such that either <i>x<sub>1</sub></i>
-or <i>x<sub>2</sub></i> is an infinity, then
-</p>
-
-<tt>(make-rectangular&nbsp;<i>x<sub>1</sub></i>&nbsp;<i>x<sub>2</sub></i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<i>z</i><br>
-(magnitude&nbsp;<i>z</i>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;+inf.0<p></tt>
-</p>
-<p></p>
-<p>
-The <tt>make-polar</tt>, <tt>magnitude</tt>, and
-<tt>angle</tt> procedures may return inexact results even when given exact
-arguments.</p>
-<p>
-</p>
-
-<tt>(angle&nbsp;-1)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;3.141592653589793&nbsp;;&nbsp;approximately<br>
-<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.7.4.4"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.7.4.4">11.7.4.4&nbsp;&nbsp;Numerical Input and Output</a></h4>
-<p></p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_578"></a>number-&gt;string<i> z</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_580"></a>number-&gt;string<i> z radix</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_582"></a>number-&gt;string<i> z radix precision</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Radix</i> must be an exact integer object, either 2, 8, 10, or 16.  If
-omitted, <i>radix</i> defaults to 10.  If a <i>precision</i> is
-specified, then <i>z</i> must be an inexact complex number object,
-<i>precision</i> must be an exact positive integer object, and <i>radix</i>
-must be 10.  The <tt>number-&gt;string</tt> procedure takes a number object and a
-radix and returns as a string an external representation of the given
-number object in the given radix such that
-</p>
-
-<tt>(let&nbsp;((number&nbsp;<i>z</i>)&nbsp;(radix&nbsp;<i>radix</i>))<br>
-&nbsp;&nbsp;(eqv?&nbsp;(string-&gt;number<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(number-&gt;string&nbsp;number&nbsp;radix)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;radix)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;number))<p></tt>
-is true.  If no possible result makes this expression
-true, an exception with condition type
-<tt>&amp;implementation-restriction</tt> is raised.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The error case can occur only when <i>z</i> is not a complex number object
-or is a complex number object with a non-rational real or imaginary part.
-</blockquote><p>
-If a <i>precision</i> is specified, then the representations of the
-inexact real components of the result, unless they are infinite or
-NaN, specify an explicit &lt;mantissa width&gt; <i>p</i>, and <i>p</i> is the
-least <i>p</i> &ge; <i>precision</i> for which the above expression is
-true.</p>
-<p>
-If <i>z</i> is inexact, the radix is 10, and the above expression and
-condition can be satisfied by a result that contains a decimal point,
-then the result contains a decimal point and is expressed using the
-minimum number of digits (exclusive of exponent, trailing zeroes, and
-mantissa width) needed to make the above expression and condition
-true&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_4">4</a>,&nbsp;<a href="r6rs-Z-H-21.html#node_bib_7">7</a>]; otherwise the format of the result
-is unspecified.</p>
-<p>
-The result returned by <tt>number-&gt;string</tt> never contains an explicit
-radix prefix.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_584"></a>string-&gt;number<i> string</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_586"></a>string-&gt;number<i> string radix</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a number object with maximally precise representation expressed by the
-given <i>string</i>.  <i>Radix</i> must be an exact integer object, either 2, 8, 10,
-or 16.  If supplied, <i>radix</i> is a default radix that may be overridden
-by an explicit radix prefix in <i>string</i> (e.g., <tt>&quot;#o177&quot;</tt>).  If <i>radix</i>
-is not supplied, then the default radix is 10.  If <i>string</i> is not
-a syntactically valid notation for a number object or a notation for a
-rational number object with a zero denominator, then <tt>string-&gt;number</tt>
-returns <tt>#f</tt>.
-</p>
-
-<tt>(string-&gt;number&nbsp;&quot;100&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;100<br>
-(string-&gt;number&nbsp;&quot;100&quot;&nbsp;16)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;256<br>
-(string-&gt;number&nbsp;&quot;1e2&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;100.0<br>
-(string-&gt;number&nbsp;&quot;0/0&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(string-&gt;number&nbsp;&quot;+inf.0&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+inf.0<br>
-(string-&gt;number&nbsp;&quot;-inf.0&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-inf.0<br>
-(string-&gt;number&nbsp;&quot;+nan.0&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;+nan.0<p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The <tt>string-&gt;number</tt> procedure always returns a number object or
-<tt>#f</tt>; it never raises an exception.
-</blockquote>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.8"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.8">11.8&nbsp;&nbsp;Booleans</a></h2>
-<p></p>
-<p>
-The standard boolean objects for true and false have external representations
-<tt>#t</tt> and <tt>#f</tt>.<a name="node_idx_588"></a><a name="node_idx_590"></a>However, of all
-objects, only <tt>#f</tt> counts as false in
-conditional expressions.  See section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.7">5.7</a>.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Programmers accustomed to other dialects of Lisp should be aware that
-Scheme distinguishes both <tt>#f</tt> and the empty list <a name="node_idx_592"></a>from each other and from the symbol <tt>nil</tt>.
-</blockquote><p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_594"></a>not<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is <tt>#f</tt>, and returns
-<tt>#f</tt> otherwise.</p>
-<p>
-</p>
-
-<tt>(not&nbsp;<tt>#t</tt>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(not&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(not&nbsp;(list&nbsp;3))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(not&nbsp;<tt>#f</tt>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(not&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(not&nbsp;(list))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(not&nbsp;&#8217;nil)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_596"></a>boolean?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is either <tt>#t</tt> or
-<tt>#f</tt> and returns <tt>#f</tt> otherwise.</p>
-<p>
-</p>
-
-<tt>(boolean?&nbsp;<tt>#f</tt>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(boolean?&nbsp;0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(boolean?&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_598"></a>boolean=?<i> <i>bool<sub>1</sub></i> <i>bool<sub>2</sub></i> <i>bool<sub>3</sub></i>
-<tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if the booleans are the same.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.9"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.9">11.9&nbsp;&nbsp;Pairs and lists</a></h2>
-<p></p>
-<p>
-A <a name="node_idx_600"></a><em>pair</em> is a
-compound structure with two fields called the car and cdr fields (for
-historical reasons).  Pairs are created by the procedure <tt>cons</tt>.
-The car and cdr fields are accessed by the procedures <tt>car</tt> and
-<tt>cdr</tt>.</p>
-<p>
-Pairs are used primarily to represent lists.  A list can
-be defined recursively as either the empty list<a name="node_idx_602"></a>or a pair whose
-cdr is a list.  More precisely, the set of lists is defined as the smallest
-set <i>X</i> such that</p>
-<p>
-</p>
-<ul>
-<li><p>The empty list is in <i>X</i>.
-</p>
-<li><p>If <i>list</i> is in <i>X</i>, then any pair whose cdr field contains
-<i>list</i> is also in <i>X</i>.
-</p>
-</ul><p></p>
-<p>
-The objects in the car fields of successive pairs of a list are the
-elements of the list.  For example, a two-element list is a pair whose car
-is the first element and whose cdr is a pair whose car is the second element
-and whose cdr is the empty list.  The length of a list is the number of
-elements, which is the same as the number of pairs.</p>
-<p>
-The empty list<a name="node_idx_604"></a>is a special object of its own type.
-It is not a pair.  It has no elements and its length is zero.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The above definitions imply that all lists have finite length and are
-terminated by the empty list.
-</blockquote><p>
-A chain of pairs not ending in the empty list is called an
-<a name="node_idx_606"></a><em>improper list</em>.  Note that an improper list is not a list.
-The list and dotted notations can be combined to represent
-improper lists:</p>
-<p>
-</p>
-
-<tt>(a&nbsp;b&nbsp;c&nbsp;.&nbsp;d)<p></tt></p>
-<p>
-is equivalent to</p>
-<p>
-</p>
-
-<tt>(a&nbsp;.&nbsp;(b&nbsp;.&nbsp;(c&nbsp;.&nbsp;d)))<p></tt></p>
-<p>
-Whether a given pair is a list depends upon what is stored in the cdr
-field.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_608"></a>pair?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a pair, and otherwise
-returns <tt>#f</tt>.</p>
-<p>
-</p>
-
-<tt>(pair?&nbsp;&#8217;(a&nbsp;.&nbsp;b))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(pair?&nbsp;&#8217;(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(pair?&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(pair?&nbsp;&#8217;#(a&nbsp;b))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_610"></a>cons<i> <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated pair whose car is <i>obj<sub>1</sub></i> and whose cdr is
-<i>obj<sub>2</sub></i>.  The pair is guaranteed to be different (in the sense of
-<tt>eqv?</tt>) from every existing object.</p>
-<p>
-</p>
-
-<tt>(cons&nbsp;&#8217;a&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a)<br>
-(cons&nbsp;&#8217;(a)&nbsp;&#8217;(b&nbsp;c&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;((a)&nbsp;b&nbsp;c&nbsp;d)<br>
-(cons&nbsp;&quot;a&quot;&nbsp;&#8217;(b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(&quot;a&quot;&nbsp;b&nbsp;c)<br>
-(cons&nbsp;&#8217;a&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a&nbsp;.&nbsp;3)<br>
-(cons&nbsp;&#8217;(a&nbsp;b)&nbsp;&#8217;c)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;((a&nbsp;b)&nbsp;.&nbsp;c)<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_612"></a>car<i> pair</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the contents of the car field of <i>pair</i>.</p>
-<p>
-</p>
-
-<tt>(car&nbsp;&#8217;(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;a<br>
-(car&nbsp;&#8217;((a)&nbsp;b&nbsp;c&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a)<br>
-(car&nbsp;&#8217;(1&nbsp;.&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;1<br>
-(car&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_614"></a>cdr<i> pair</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the contents of the cdr field of <i>pair</i>.</p>
-<p>
-</p>
-
-<tt>(cdr&nbsp;&#8217;((a)&nbsp;b&nbsp;c&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(b&nbsp;c&nbsp;d)<br>
-(cdr&nbsp;&#8217;(1&nbsp;.&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;2<br>
-(cdr&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_616"></a>caar<i> pair</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_618"></a>cadr<i> pair</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<img src="r6rs-Z-G-D-1.gif" border="0" alt="[r6rs-Z-G-D-1.gif]"> <div align=left><tt>(<a name="node_idx_620"></a>cdddar<i> pair</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_622"></a>cddddr<i> pair</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures are compositions of <tt>car</tt> and <tt>cdr</tt>, where
-for example <tt>caddr</tt> could be defined by</p>
-<p>
-</p>
-
-<tt>(define&nbsp;caddr&nbsp;(lambda&nbsp;(x)&nbsp;(car&nbsp;(cdr&nbsp;(cdr&nbsp;x))))).<p></tt></p>
-<p>
-Arbitrary compositions, up to four deep, are provided.  There are
-twenty-eight of these procedures in all.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_624"></a>null?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is the empty list<a name="node_idx_626"></a>,
-<tt>#f</tt>otherwise.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_628"></a>list?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a list, <tt>#f</tt> otherwise.
-By definition, all lists are chains of pairs that have finite length and are terminated by
-the empty list.</p>
-<p>
-</p>
-
-<tt>(list?&nbsp;&#8217;(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(list?&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(list?&nbsp;&#8217;(a&nbsp;.&nbsp;b))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_630"></a>list<i> <i>obj</i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated list of its arguments.</p>
-<p>
-</p>
-
-<tt>(list&nbsp;&#8217;a&nbsp;(+&nbsp;3&nbsp;4)&nbsp;&#8217;c)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a&nbsp;7&nbsp;c)<br>
-(list)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;()<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_632"></a>length<i> list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the length of <i>list</i>.</p>
-<p>
-</p>
-
-<tt>(length&nbsp;&#8217;(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;3<br>
-(length&nbsp;&#8217;(a&nbsp;(b)&nbsp;(c&nbsp;d&nbsp;e)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;3<br>
-(length&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;0<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_634"></a>append<i> list <tt>...</tt> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a possibly improper list consisting of the elements of the first <i>list</i>
-followed by the elements of the other <i>list</i>s, with <i>obj</i> as
-the cdr of the final pair.
-An improper list results if <i>obj</i> is not a
-list.</p>
-<p>
-</p>
-
-<tt>(append&nbsp;&#8217;(x)&nbsp;&#8217;(y))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(x&nbsp;y)<br>
-(append&nbsp;&#8217;(a)&nbsp;&#8217;(b&nbsp;c&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a&nbsp;b&nbsp;c&nbsp;d)<br>
-(append&nbsp;&#8217;(a&nbsp;(b))&nbsp;&#8217;((c)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a&nbsp;(b)&nbsp;(c))<br>
-(append&nbsp;&#8217;(a&nbsp;b)&nbsp;&#8217;(c&nbsp;.&nbsp;d))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a&nbsp;b&nbsp;c&nbsp;.&nbsp;d)<br>
-(append&nbsp;&#8217;()&nbsp;&#8217;a)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;a<p></tt></p>
-<p>
-If <tt>append</tt> constructs a nonempty chain of pairs, it is always
-newly allocated.  If no pairs are allocated, <i>obj</i> is returned.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_636"></a>reverse<i> list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated list consisting of the elements of <i>list</i>
-in reverse order.</p>
-<p>
-</p>
-
-<tt>(reverse&nbsp;&#8217;(a&nbsp;b&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(c&nbsp;b&nbsp;a)<br>
-(reverse&nbsp;&#8217;(a&nbsp;(b&nbsp;c)&nbsp;d&nbsp;(e&nbsp;(f))))&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;((e&nbsp;(f))&nbsp;d&nbsp;(b&nbsp;c)&nbsp;a)<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_638"></a>list-tail<i> list k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>List</i> should be a list of size at least <i>k</i>.
-The <tt>list-tail</tt> procedure returns the subchain of pairs of <i>list</i>
-obtained by omitting the first <i>k</i> elements.</p>
-<p>
-</p>
-
-<tt>(list-tail&nbsp;&#8217;(a&nbsp;b&nbsp;c&nbsp;d)&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(c&nbsp;d)<p></tt></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check that <i>list</i> is a chain of
-pairs whose length is at least <i>k</i>.  It should not check that it is a chain
-of pairs beyond this length.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_640"></a>list-ref<i> list k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>List</i> must be a list whose length is at least <i>k</i> + 1.
-The <tt>list-tail</tt> procedure returns the <i>k</i>th element of <i>list</i>.</p>
-<p>
-</p>
-
-<tt>(list-ref&nbsp;&#8217;(a&nbsp;b&nbsp;c&nbsp;d)&nbsp;2)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;c<p></tt></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check that <i>list</i> is a chain of
-pairs whose length is at least <i>k</i> + 1.  It should not check that it is a list
-of pairs beyond this length.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_642"></a>map<i> proc <i>list<sub>1</sub></i> <i>list<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <i>list</i>s should all have the same length.  <i>Proc</i>
-should accept as many arguments as there are
-<i>list</i>s and return a single value.  <i>Proc</i> should not mutate
-any of the <i>list</i>s.</p>
-<p>
-The <tt>map</tt> procedure applies <i>proc</i> element-wise to the elements of the
-<i>list</i>s and returns a list of the results, in order.
-<i>Proc</i> is always called in the same dynamic environment 
-as <tt>map</tt> itself.
-The order in which <i>proc</i> is applied to the elements of the
-<i>list</i>s is unspecified.
-If multiple returns occur from <tt>map</tt>, the 
-values returned by earlier returns are not mutated.</p>
-<p>
-</p>
-
-<tt>(map&nbsp;cadr&nbsp;&#8217;((a&nbsp;b)&nbsp;(d&nbsp;e)&nbsp;(g&nbsp;h)))&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(b&nbsp;e&nbsp;h)<br>
-<br>
-(map&nbsp;(lambda&nbsp;(n)&nbsp;(expt&nbsp;n&nbsp;n))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;4&nbsp;5))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(1&nbsp;4&nbsp;27&nbsp;256&nbsp;3125)<br>
-<br>
-(map&nbsp;+&nbsp;&#8217;(1&nbsp;2&nbsp;3)&nbsp;&#8217;(4&nbsp;5&nbsp;6))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(5&nbsp;7&nbsp;9)<br>
-<br>
-(let&nbsp;((count&nbsp;0))<br>
-&nbsp;&nbsp;(map&nbsp;(lambda&nbsp;(ignored)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;count&nbsp;(+&nbsp;count&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;count)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(a&nbsp;b)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(1&nbsp;2)&nbsp;<i>or</i>&nbsp;(2&nbsp;1)<p></tt></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation should check that the <i>list</i>s all
-have the same length.  The implementation must check the restrictions
-on <i>proc</i> to the extent performed by applying it as described.  An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_644"></a>for-each<i> proc <i>list<sub>1</sub></i> <i>list<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <i>list</i>s should all have the same length.  <i>Proc</i>
-should accept as many arguments as there are
-<i>list</i>s.  <i>Proc</i> should not mutate
-any of the <i>list</i>s.</p>
-<p>
-The <tt>for-each</tt> procedure applies <i>proc</i>
-element-wise to the elements of the
-<i>list</i>s for its side effects,  in order from the first elements to the
-last.
-<i>Proc</i> is always called in the same dynamic environment 
-as <tt>for-each</tt> itself.
-The return values of <tt>for-each</tt> are unspecified.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((v&nbsp;(make-vector&nbsp;5)))<br>
-&nbsp;&nbsp;(for-each&nbsp;(lambda&nbsp;(i)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(vector-set!&nbsp;v&nbsp;i&nbsp;(*&nbsp;i&nbsp;i)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(0&nbsp;1&nbsp;2&nbsp;3&nbsp;4))<br>
-&nbsp;&nbsp;v)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;#(0&nbsp;1&nbsp;4&nbsp;9&nbsp;16)<br>
-<br>
-(for-each&nbsp;(lambda&nbsp;(x)&nbsp;x)&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;4))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<em>unspecified</em><br>
-<br>
-(for-each&nbsp;even?&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<em>unspecified</em><p></tt></p>
-<p>
-<em>Implementation responsibilities: </em>The implementation should check that the <i>list</i>s all
-have the same length.  The implementation must check the restrictions
-on <i>proc</i> to the extent performed by applying it as described.
-An implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Implementations of <tt>for-each</tt> may or may not tail-call
-<i>proc</i> on the last elements.
-</blockquote><p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.10"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.10">11.10&nbsp;&nbsp;Symbols</a></h2>
-<p></p>
-<p>
-Symbols are objects whose usefulness rests on the fact that two
-symbols are identical (in the sense of <tt>eq?</tt>, <tt>eqv?</tt> and <tt>equal?</tt>) if and only if their
-names are spelled the same way. 
-A symbol literal is formed using <tt>quote</tt>.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_646"></a>symbol?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a symbol, otherwise returns <tt>#f</tt>.</p>
-<p>
-</p>
-
-<tt>(symbol?&nbsp;&#8217;foo)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(symbol?&nbsp;(car&nbsp;&#8217;(a&nbsp;b)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(symbol?&nbsp;&quot;bar&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(symbol?&nbsp;&#8217;nil)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(symbol?&nbsp;&#8217;())&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(symbol?&nbsp;<tt>#f</tt>)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_648"></a>symbol-&gt;string<i> symbol</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the name of <i>symbol</i> as an immutable string.  </p>
-<p>
-</p>
-
-<tt>(symbol-&gt;string&nbsp;&#8217;flying-fish)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&quot;flying-fish&quot;<br>
-(symbol-&gt;string&nbsp;&#8217;Martin)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&quot;Martin&quot;<br>
-(symbol-&gt;string<br>
-&nbsp;&nbsp;&nbsp;(string-&gt;symbol&nbsp;&quot;Malvina&quot;))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;&quot;Malvina&quot;<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_650"></a>symbol=?<i> <i>symbol<sub>1</sub></i> <i>symbol<sub>2</sub></i> <i>symbol<sub>3</sub></i>
-<tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if the symbols are the same, i.e., if their names
-are spelled the same.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_652"></a>string-&gt;symbol<i> string</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the symbol whose name is <i>string</i>. </p>
-<p>
-</p>
-
-<tt>(eq?&nbsp;&#8217;mISSISSIppi&nbsp;&#8217;mississippi)&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-(string-&gt;symbol&nbsp;&quot;mISSISSIppi&quot;)&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;the&nbsp;symbol&nbsp;with&nbsp;name&nbsp;&quot;mISSISSIppi&quot;<br>
-(eq?&nbsp;&#8217;bitBlt&nbsp;(string-&gt;symbol&nbsp;&quot;bitBlt&quot;))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(eq?&nbsp;&#8217;JollyWog<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(string-&gt;symbol<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(symbol-&gt;string&nbsp;&#8217;JollyWog)))&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><br>
-(string=?&nbsp;&quot;K.&nbsp;Harper,&nbsp;M.D.&quot;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(symbol-&gt;string<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(string-&gt;symbol&nbsp;&quot;K.&nbsp;Harper,&nbsp;M.D.&quot;)))&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.11"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.11">11.11&nbsp;&nbsp;Characters</a></h2>
-<p></p>
-<p>
-<a name="node_idx_654"></a><a name="node_idx_656"></a></p>
-<p>
-<a name="node_idx_658"></a><em>Characters</em> are objects that represent Unicode scalar
-values&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_27">27</a>].</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Unicode defines a standard mapping between sequences of
-<i>Unicode scalar values</i><a name="node_idx_660"></a><a name="node_idx_662"></a>(integers in the range 0 to
-#x10FFFF, excluding the range #xD800 to #xDFFF) in the latest
-version of the standard and human-readable &#8220;characters&#8221;. More
-precisely, Unicode distinguishes between glyphs, which are printed
-for humans to read, and characters, which are abstract entities that
-map to glyphs (sometimes in a way that&#8217;s sensitive to surrounding
-characters).  Furthermore, different sequences of scalar values
-sometimes correspond to the same character.  The relationships among
-scalar, characters, and glyphs are subtle and complex.<p>
-Despite this complexity, most things that a literate human would
-call a &#8220;character&#8221; can be represented by a single Unicode scalar
-value (although several sequences of Unicode scalar values may
-represent that same character). For example, Roman letters, Cyrillic
-letters, Hebrew consonants, and most Chinese characters fall into
-this category.</p>
-<p>
-Unicode scalar values exclude the range #xD800 to #xDFFF, which
-are part of the range of Unicode <i>code points</i><a name="node_idx_664"></a>.  However, the Unicode code points in this range,
-the so-called <i>surrogates</i><a name="node_idx_666"></a>, are an
-artifact of the UTF-16 encoding, and can only appear in specific
-Unicode encodings, and even then only in pairs that encode scalar
-values.  Consequently, all characters represent code points, but the
-surrogate code points do not have representations as characters.
-</p>
-</blockquote><p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_668"></a>char?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a character, otherwise returns <tt>#f</tt>.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_670"></a>char-&gt;integer<i> char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_672"></a>integer-&gt;char<i> 
-<p class=noindent><em>s</em><em>v</em></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure</p>
-&nbsp;</div>
-<p>
-<i>Sv</i> must be a Unicode scalar value, i.e., a non-negative exact
-integer object in [0, #<em>x</em>D7FF] &cup;
-[#<em>x</em>E000, #<em>x</em>10FFFF].</p>
-<p>
-Given a character, <tt>char-&gt;integer</tt> returns its Unicode scalar value
-as an exact integer object.  
-For a Unicode scalar value <i>sv</i>, <tt>integer-&gt;char</tt>
-returns its associated character.</p>
-<p>
-</p>
-
-<tt>(integer-&gt;char&nbsp;32)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#</tt><tt>\</tt>space<br>
-(char-&gt;integer&nbsp;(integer-&gt;char&nbsp;5000))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;5000<br>
-(integer-&gt;char&nbsp;<tt>#</tt><tt>\</tt>xD800)&nbsp;&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_674"></a>char=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i> <i>char<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_676"></a>char&lt;?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i> <i>char<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_678"></a>char&gt;?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i> <i>char<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_680"></a>char&lt;=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i> <i>char<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_682"></a>char&gt;=?<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i> <i>char<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-
-These procedures impose a total ordering on the set of characters
-according to their Unicode scalar values.</p>
-<p>
-</p>
-
-<tt>(char&lt;?&nbsp;<tt>#</tt><tt>\</tt>z&nbsp;<tt>#</tt><tt>\</tt>&szlig;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(char&lt;?&nbsp;<tt>#</tt><tt>\</tt>z&nbsp;<tt>#</tt><tt>\</tt>Z)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.12"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.12">11.12&nbsp;&nbsp;Strings</a></h2>
-<p></p>
-<p>
-Strings are sequences of characters.  </p>
-<p>
-The <em>length</em> of a string is the number of characters that it
-contains.  This number is fixed when the
-string is created.  The <a name="node_idx_684"></a><em>valid indices</em> of a string are the
-integers less than the length of the string.  The first
-character of a string has index 0, the second has index 1, and so on.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_686"></a>string?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a string, otherwise returns <tt>#f</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_688"></a>make-string<i> k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_690"></a>make-string<i> k char</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated string of
-length <i>k</i>.  If <i>char</i> is given, then all elements of the string
-are initialized to <i>char</i>, otherwise the contents of the
-<i>string</i> are unspecified.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_692"></a>string<i> char <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated string composed of the arguments.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_694"></a>string-length<i> string</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the number of characters in the given <i>string</i> as an exact
-integer object.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_696"></a>string-ref<i> string k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i> must be a valid index of <i>string</i>.
-The <tt>string-ref</tt> procedure returns character </p>
-
-<p class=noindent><em>k</em> of <i>string</i> using zero-origin indexing.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Implementors should make <tt>string-ref</tt> run in constant
-time.
-</blockquote>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_698"></a>string=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i> <i>string<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if the strings are the same length and contain the same
-characters in the same positions.  Otherwise, the <tt>string=?</tt>
-procedure returns <tt>#f</tt>.</p>
-<p>
-</p>
-
-<tt>(string=?&nbsp;&quot;Stra&szlig;e&quot;&nbsp;&quot;Strasse&quot;)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_700"></a>string&lt;?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i> <i>string<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_702"></a>string&gt;?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i> <i>string<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_704"></a>string&lt;=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i> <i>string<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_706"></a>string&gt;=?<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i> <i>string<sub>3</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-These procedures are the lexicographic extensions to strings of the
-corresponding orderings on characters.  For example, <tt>string&lt;?</tt> is
-the lexicographic ordering on strings induced by the ordering
-<tt>char&lt;?</tt> on characters.  If two strings differ in length but
-are the same up to the length of the shorter string, the shorter string
-is considered to be lexicographically less than the longer string.</p>
-<p>
-</p>
-
-<tt>(string&lt;?&nbsp;&quot;z&quot;&nbsp;&quot;&szlig;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(string&lt;?&nbsp;&quot;z&quot;&nbsp;&quot;zz&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-(string&lt;?&nbsp;&quot;z&quot;&nbsp;&quot;Z&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#f</tt><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_708"></a>substring<i> string start end</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>String</i> must be a string, and <i>start</i> and <i>end</i>
-must be exact integer objects satisfying
-</p>
-<div class=mathdisplay align=left><table><tr><td>0 &le; <i>start</i> &le; <i>end</i> &le; <tt>(string-length <i>string</i>).</tt></td></tr></table></div>
-<p class=noindent>
-The <tt>substring</tt> procedure returns a newly allocated string formed from the characters of
-<i>string</i> beginning with index <i>start</i> (inclusive) and ending with index
-<i>end</i> (exclusive).
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_710"></a>string-append<i> <i>string</i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated string whose characters form the concatenation of the
-given strings.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_712"></a>string-&gt;list<i> string</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_714"></a>list-&gt;string<i> list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>List</i> must be a list of characters.
-The <tt>string-&gt;list</tt> procedure returns a newly allocated list of the
-characters that make up the given string.  The <tt>list-&gt;string</tt> procedure
-returns a newly allocated string formed from the characters in 
-<i>list</i>. The <tt>string-&gt;list</tt>
-and <tt>list-&gt;string</tt> procedures are
-inverses so far as <tt>equal?</tt> is concerned.  
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_716"></a>string-for-each<i> proc <i>string<sub>1</sub></i> <i>string<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <i>string</i>s must all have the same length.  <i>Proc</i>
-should accept as many arguments as there are <i>string</i>s.
-The <tt>string-for-each</tt> procedure applies <i>proc</i>
-element-wise to the characters of the
-<i>string</i>s for its side effects,  in order from the first characters to the
-last.
-<i>Proc</i> is always called in the same dynamic environment 
-as <tt>string-for-each</tt> itself.
-The return values of <tt>string-for-each</tt> are unspecified.</p>
-<p>
-Analogous to <tt>for-each</tt>.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the restrictions
-on <i>proc</i> to the extent performed by applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_718"></a>string-copy<i> string</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated copy of the given <i>string</i>.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.13"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.13">11.13&nbsp;&nbsp;Vectors</a></h2>
-<p></p>
-<p>
-Vectors are heterogeneous structures whose elements are indexed
-by integers.  A vector typically occupies less space than a list
-of the same length, and the average time needed to access a randomly
-chosen element is typically less for the vector than for the list.</p>
-<p>
-The <em>length</em> of a vector is the number of elements that it
-contains.  This number is a non-negative integer that is fixed when the
-vector is created.
-The <em>valid indices</em><a name="node_idx_720"></a>of a
-vector are the exact non-negative integer objects less than the length of the
-vector.  The first element in a vector is indexed by zero, and the last
-element is indexed by one less than the length of the vector.</p>
-<p>
-Like list constants, vector constants must be quoted:</p>
-<p>
-</p>
-
-<tt>&#8217;#(0&nbsp;(2&nbsp;2&nbsp;2&nbsp;2)&nbsp;&quot;Anna&quot;)&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;#(0&nbsp;(2&nbsp;2&nbsp;2&nbsp;2)&nbsp;&quot;Anna&quot;)<p></tt></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_722"></a>vector?<i> obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns <tt>#t</tt> if <i>obj</i> is a vector.  Otherwise the procedure
-returns <tt>#f</tt>.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_724"></a>make-vector<i> k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_726"></a>make-vector<i> k fill</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated vector of <i>k</i> elements.  If a second
-argument is given, then each element is initialized to <i>fill</i>.
-Otherwise the initial contents of each element is unspecified.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_728"></a>vector<i> obj <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns a newly allocated vector whose elements contain the given
-arguments.  Analogous to <tt>list</tt>.</p>
-<p>
-</p>
-
-<tt>(vector&nbsp;&#8217;a&nbsp;&#8217;b&nbsp;&#8217;c)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;#(a&nbsp;b&nbsp;c)<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_730"></a>vector-length<i> vector</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Returns the number of elements in <i>vector</i> as an exact integer object.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_732"></a>vector-ref<i> vector k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i> must be a valid index of <i>vector</i>.
-The <tt>vector-ref</tt> procedure returns the contents of element </p>
-
-<p class=noindent><em>k</em> of
-<i>vector</i>.</p>
-<p>
-</p>
-
-<tt>(vector-ref&nbsp;&#8217;#(1&nbsp;1&nbsp;2&nbsp;3&nbsp;5&nbsp;8&nbsp;13&nbsp;21)&nbsp;5)&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;8<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_734"></a>vector-set!<i> vector k obj</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>K</i> must be a valid index of <i>vector</i>.
-The <tt>vector-set!</tt> procedure stores <i>obj</i> in element </p>
-
-<p class=noindent><em>k</em> of
-<i>vector</i>, and returns unspecified values.</p>
-<p>
-Passing an immutable vector to <tt>vector-set!</tt> should cause an exception
-with condition type <tt>&amp;assertion</tt> to be raised.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((vec&nbsp;(vector&nbsp;0&nbsp;&#8217;(2&nbsp;2&nbsp;2&nbsp;2)&nbsp;&quot;Anna&quot;)))<br>
-&nbsp;&nbsp;(vector-set!&nbsp;vec&nbsp;1&nbsp;&#8217;(&quot;Sue&quot;&nbsp;&quot;Sue&quot;))<br>
-&nbsp;&nbsp;vec)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;#(0&nbsp;(&quot;Sue&quot;&nbsp;&quot;Sue&quot;)&nbsp;&quot;Anna&quot;)<br>
-<br>
-(vector-set!&nbsp;&#8217;#(0&nbsp;1&nbsp;2)&nbsp;1&nbsp;&quot;doe&quot;)&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;constant&nbsp;vector<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;should&nbsp;raise&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_736"></a>vector-&gt;list<i> vector</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_738"></a>list-&gt;vector<i> list</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <tt>vector-&gt;list</tt> procedure returns a newly allocated list of the objects contained
-in the elements of <i>vector</i>.  The <tt>list-&gt;vector</tt> procedure returns a newly
-created vector initialized to the elements of the list <i>list</i>.</p>
-<p>
-</p>
-
-<tt>(vector-&gt;list&nbsp;&#8217;#(dah&nbsp;dah&nbsp;didah))&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(dah&nbsp;dah&nbsp;didah)<br>
-(list-&gt;vector&nbsp;&#8217;(dididit&nbsp;dah))&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;#(dididit&nbsp;dah)<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_740"></a>vector-fill!<i> vector fill</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Stores <i>fill</i> in every element of <i>vector</i>
-and returns unspecified values.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_742"></a>vector-map<i> proc <i>vector<sub>1</sub></i> <i>vector<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <i>vector</i>s must all have the same length.  <i>Proc</i>
-should accept as many arguments as there are <i>vector</i>s and return a
-single value.</p>
-<p>
-The <tt>vector-map</tt> procedure applies <i>proc</i> element-wise to the elements of the
-<i>vector</i>s and returns a vector of the results, in order.
-<i>Proc</i> is always called in the same dynamic environment 
-as <tt>vector-map</tt> itself.
-The order in which <i>proc</i> is applied to the elements of the
-<i>vector</i>s is unspecified.
-If multiple returns occur from <tt>vector-map</tt>, the return
-values returned by earlier returns are not mutated.</p>
-<p>
-Analogous to <tt>map</tt>.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the restrictions
-on <i>proc</i> to the extent performed by applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_744"></a>vector-for-each<i> proc <i>vector<sub>1</sub></i> <i>vector<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-The <i>vector</i>s must all have the same length.  <i>Proc</i>
-should accept as many arguments as there are <i>vector</i>s.
-The <tt>vector-for-each</tt> procedure applies <i>proc</i>
-element-wise to the elements of the
-<i>vector</i>s for its side effects,  in order from the first elements to the
-last.
-<i>Proc</i> is always called in the same dynamic environment 
-as <tt>vector-for-each</tt> itself.
-The return values of <tt>vector-for-each</tt> are unspecified.</p>
-<p>
-Analogous to <tt>for-each</tt>.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the restrictions
-on <i>proc</i> to the extent performed by applying it as described.
-An
-implementation may check whether <i>proc</i> is an appropriate argument
-before applying it.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.14"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.14">11.14&nbsp;&nbsp;Errors and violations</a></h2>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_746"></a>error<i> who message <i>irritant<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_748"></a>assertion-violation<i> who message <i>irritant<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Who</i> must be a string or a symbol or <tt>#f</tt>.
-<i>Message</i> must be a string.
-The <i>irritant</i>s are arbitrary objects.</p>
-<p>
-These procedures raise an exception.  The <tt>error</tt>
-procedure should be called when an error has occurred, typically caused by
-something that has gone wrong in the interaction of the program with the
-external world or the user.  The <tt>assertion-violation</tt> procedure
-should be called when an invalid call to a procedure was made, either passing an
-invalid number of arguments, or passing an argument that it is not
-specified to handle.</p>
-<p>
-The <i>who</i> argument should describe the procedure or operation that
-detected the exception.  The <i>message</i> argument should describe
-the exceptional situation.  The <i>irritant</i>s should be the arguments
-to the operation that detected the operation.</p>
-<p>
-The condition object provided with the exception (see
-library chapter&nbsp;on &#8220;Exceptions
-and conditions&#8221;) has the following condition types:
-</p>
-<ul>
-<li><p>If <i>who</i> is not <tt>#f</tt>, the condition has condition type
-<tt>&amp;who</tt>, with <i>who</i> as the value of its field.  In
-that case, <i>who</i> should be the name of the procedure or entity that
-detected the exception.  If it is <tt>#f</tt>, the condition does not
-have condition type <tt>&amp;who</tt>.
-</p>
-<li><p>The condition has condition type <tt>&amp;message</tt>, with
-<i>message</i> as the value of its field.
-</p>
-<li><p>The condition has condition type <tt>&amp;irritants</tt>, and its
-field has as its value a list of the <i>irritant</i>s.
-</p>
-</ul><p>
-Moreover, the condition created by <tt>error</tt> has condition type 
-<tt>&amp;error</tt>, and the condition created by <tt>assertion-violation</tt> has
-condition type <tt>&amp;assertion</tt>.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;(fac&nbsp;n)<br>
-&nbsp;&nbsp;(if&nbsp;(not&nbsp;(integer-valued?&nbsp;n))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(assertion-violation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;fac&nbsp;&quot;non-integral&nbsp;argument&quot;&nbsp;n))<br>
-&nbsp;&nbsp;(if&nbsp;(negative?&nbsp;n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(assertion-violation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;fac&nbsp;&quot;negative&nbsp;argument&quot;&nbsp;n))<br>
-&nbsp;&nbsp;(letrec<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((loop&nbsp;(lambda&nbsp;(n&nbsp;r)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(zero?&nbsp;n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;r<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;(-&nbsp;n&nbsp;1)&nbsp;(*&nbsp;r&nbsp;n))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;n&nbsp;1)))<br>
-<br>
-(fac&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;120<br>
-(fac&nbsp;4.5)&nbsp;&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><br>
-(fac&nbsp;-3)&nbsp;&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_750"></a>assert<i> &lt;expression&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-An <tt>assert</tt> form is evaluated by evaluating &lt;expression&gt;.
-If &lt;expression&gt; returns a true value, that value is returned
-from the <tt>assert</tt> expression.  If &lt;expression&gt; returns
-<tt>#f</tt>, an exception with condition types <tt>&amp;assertion</tt> and
-<tt>&amp;message</tt> is raised.  The message provided in the condition
-object is implementation-dependent.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Implementations should exploit the fact that
-<tt>assert</tt> is syntax to provide as much information as possible
-about the location of the assertion failure.
-</blockquote>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.15"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.15">11.15&nbsp;&nbsp;Control features</a></h2>
-<p>
-</p>
-<p>
-This chapter describes various primitive procedures which control the
-flow of program execution in special ways.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_752"></a>apply<i> proc <i>arg<sub>1</sub></i> <tt>...</tt> rest-args</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Rest-args</i> must be a list.
-<i>Proc</i> should accept <em>n</em> arguments, where <em>n</em> is
-number of <i>arg</i>s plus the length of <i>rest-args</i>.
-The <tt>apply</tt> procedure calls <i>proc</i> with the elements of the list
-<tt>(append (list <i>arg<sub>1</sub></i> <tt>...</tt>) <i>rest-args</i>)</tt> as the actual
-arguments.</p>
-<p>
-If a call to <tt>apply</tt> occurs in a tail context, the call
-to <i>proc</i> is also in a tail context.</p>
-<p>
-</p>
-
-<tt>(apply&nbsp;+&nbsp;(list&nbsp;3&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;7<br>
-<br>
-(define&nbsp;compose<br>
-&nbsp;&nbsp;(lambda&nbsp;(f&nbsp;g)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;args<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(f&nbsp;(apply&nbsp;g&nbsp;args)))))<br>
-<br>
-((compose&nbsp;sqrt&nbsp;*)&nbsp;12&nbsp;75)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;30<p></tt>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_754"></a>call-with-current-continuation<i> proc</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(<a name="node_idx_756"></a>call/cc<i> proc</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
- <i>Proc</i> should accept one
-argument. The procedure <tt>call-with-current-continuation</tt> 
-(which is the same as the procedure <tt>call/cc</tt>) packages
-the current continuation as an &#8220;escape
-procedure&#8221;<a name="node_idx_758"></a>and passes it as an argument to
-<i>proc</i>.  The escape procedure is a Scheme procedure that, if it is
-later called, will abandon whatever continuation is in effect at that later
-time and will instead reinstate the continuation that was in effect
-when the escape procedure was created.  Calling the escape procedure
-may cause the invocation of <i>before</i> and <i>after</i> procedures installed using
-<tt>dynamic-wind</tt>.</p>
-<p>
-The escape procedure accepts the same number of arguments as the
-continuation of the original call to <tt>call-with-current-continuation</tt>.</p>
-<p>
-The escape procedure that is passed to <i>proc</i> has
-unlimited extent just like any other procedure in Scheme.  It may be stored
-in variables or data structures and may be called as many times as desired.</p>
-<p>
-If a call to <tt>call-with-current-continuation</tt> occurs in a tail
-context, the call to <i>proc</i> is also in a tail context.</p>
-<p>
-The following examples show only some ways in which
-<tt>call-with-current-continuation</tt> is used.  If all real uses were as
-simple as these examples, there would be no need for a procedure with
-the power of <tt>call-with-current-continuation</tt>.</p>
-<p>
-</p>
-
-<tt>(call-with-current-continuation<br>
-&nbsp;&nbsp;(lambda&nbsp;(exit)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(for-each&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(negative?&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(exit&nbsp;x)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;(54&nbsp;0&nbsp;37&nbsp;-3&nbsp;245&nbsp;19))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<tt>#t</tt>))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-3<br>
-<br>
-(define&nbsp;list-length<br>
-&nbsp;&nbsp;(lambda&nbsp;(obj)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(call-with-current-continuation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(return)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec&nbsp;((r<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(obj)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond&nbsp;((null?&nbsp;obj)&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((pair?&nbsp;obj)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;(r&nbsp;(cdr&nbsp;obj))&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;(return&nbsp;<tt>#f</tt>))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(r&nbsp;obj))))))<br>
-<br>
-(list-length&nbsp;&#8217;(1&nbsp;2&nbsp;3&nbsp;4))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;4<br>
-<br>
-(list-length&nbsp;&#8217;(a&nbsp;b&nbsp;.&nbsp;c))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#f</tt><br>
-<br>
-(call-with-current-continuation&nbsp;procedure?)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<tt>#t</tt><p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Calling an escape procedure reenters the dynamic extent of the call
-to <tt>call-with-current-continuation</tt>, and thus restores its
-dynamic environment; see section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.12">5.12</a>.
-</blockquote><p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_760"></a>values<i> obj <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-Delivers all of its arguments to its continuation.
-The <tt>values</tt> procedure might be defined as follows:
-</p>
-
-<tt>(define&nbsp;(values&nbsp;.&nbsp;things)<br>
-&nbsp;&nbsp;(call-with-current-continuation&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(cont)&nbsp;(apply&nbsp;cont&nbsp;things))))<p></tt></p>
-<p>
-The continuations of all non-final expressions within a sequence of
-expressions, such as in <tt>lambda</tt>, <tt>begin</tt>, <tt>let</tt>, <tt>let*</tt>, <tt>letrec</tt>, <tt>letrec*</tt>, <tt>let-values</tt>, <tt>let*-values</tt>, <tt>case</tt>, and <tt>cond</tt> forms, usually take an
-arbitrary number of values.</p>
-<p>
-Except for these and the continuations created by <tt>call-with-values</tt>, <tt>let-values</tt>, and <tt>let*-values</tt>,
-continuations implicitly accepting a single value, such as the
-continuations of &lt;operator&gt; and &lt;operand&gt;s of procedure
-calls or the &lt;test&gt; expressions in conditionals, take exactly
-one value.  The effect of passing an inappropriate number of values to
-such a continuation is undefined.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_762"></a>call-with-values<i> producer consumer</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Producer</i> must be a procedure and should accept zero
-arguments.  <i>Consumer</i> must be a procedure and should accept as many
-values as <i>producer</i> returns.
-The <tt>call-with-values</tt> procedure calls <i>producer</i> with no arguments and
-a continuation that, when passed some values, calls the
-<i>consumer</i> procedure with those values as arguments.
-The continuation for the call to <i>consumer</i> is the
-continuation of the call to <tt>call-with-values</tt>.</p>
-<p>
-</p>
-
-<tt>(call-with-values&nbsp;(lambda&nbsp;()&nbsp;(values&nbsp;4&nbsp;5))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(a&nbsp;b)&nbsp;b))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;5<br>
-<br>
-(call-with-values&nbsp;*&nbsp;-)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;-1<p></tt></p>
-<p>
-If a call to <tt>call-with-values</tt> occurs in a tail context, the call
-to <i>consumer</i> is also in a tail context.</p>
-<p>
-<em>Implementation responsibilities: </em>After <i>producer</i> returns, the implementation must check
-that <i>consumer</i> accepts as many values as <i>consumer</i> has
-returned.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_764"></a>dynamic-wind<i> before thunk after</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-<i>Before</i>, <i>thunk</i>, and <i>after</i> must be procedures,
-and each should accept zero arguments.  These procedures may return
-any number of values.  The <tt>dynamic-wind</tt> procedure calls
-<i>thunk</i> without arguments, returning the results of this call.
-Moreover, <tt>dynamic-wind</tt> calls <i>before</i> without arguments
-whenever the dynamic extent of the call to <i>thunk</i> is entered, and
-<i>after</i> without arguments whenever the dynamic extent of the call
-to <i>thunk</i> is exited.  Thus, in the absence of calls to escape
-procedures created by <tt>call-with-current-continuation</tt>, <tt>dynamic-wind</tt> calls <i>before</i>, <i>thunk</i>, and <i>after</i>, in
-that order.</p>
-<p>
-While the calls to <i>before</i> and <i>after</i> are not considered to be
-within the dynamic extent of the call to <i>thunk</i>, calls to the <i>before</i>
-and <i>after</i> procedures of any other calls to <tt>dynamic-wind</tt> that occur
-within the dynamic extent of the call to <i>thunk</i> are considered to be
-within the dynamic extent of the call to <i>thunk</i>.</p>
-<p>
-More precisely, an escape procedure transfers control out of the
-dynamic extent of a set of zero or more active <tt>dynamic-wind</tt>
-calls <em>x</em> <tt>...</tt> and transfer control into the dynamic extent
-of a set of zero or more active <tt>dynamic-wind</tt> calls
-<em>y</em> <tt>...</tt>.  
-It leaves the dynamic extent of the most recent <em>x</em> and calls without
-arguments the corresponding <i>after</i> procedure.
-If the <i>after</i> procedure returns, the escape procedure proceeds to
-the next most recent <em>x</em>, and so on.
-Once each <em>x</em> has been handled in this manner,
-the escape procedure calls without arguments the <i>before</i> procedure
-corresponding to the least recent <em>y</em>.
-If the <i>before</i> procedure returns, the escape procedure reenters the
-dynamic extent of the least recent <em>y</em> and proceeds with the next least
-recent <em>y</em>, and so on.
-Once each <em>y</em> has been handled in this manner, control is transferred to
-the continuation packaged in the escape procedure.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation must check the restrictions on
-<i>thunk</i> and <i>after</i> only if they are actually called.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((path&nbsp;&#8217;())<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(c&nbsp;#f))<br>
-&nbsp;&nbsp;(let&nbsp;((add&nbsp;(lambda&nbsp;(s)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;path&nbsp;(cons&nbsp;s&nbsp;path)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(dynamic-wind<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;(add&nbsp;&#8217;connect))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(add&nbsp;(call-with-current-continuation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(c0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;c&nbsp;c0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;talk1))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;(add&nbsp;&#8217;disconnect)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(&lt;&nbsp;(length&nbsp;path)&nbsp;4)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(c&nbsp;&#8217;talk2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(reverse&nbsp;path))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(connect&nbsp;talk1&nbsp;disconnect<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;connect&nbsp;talk2&nbsp;disconnect)<br>
-<br>
-(let&nbsp;((n&nbsp;0))<br>
-&nbsp;&nbsp;(call-with-current-continuation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(k)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(dynamic-wind<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;n&nbsp;(+&nbsp;n&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(k))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;n&nbsp;(+&nbsp;n&nbsp;2)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;n&nbsp;(+&nbsp;n&nbsp;4))))))<br>
-&nbsp;&nbsp;n)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;1<br>
-<br>
-(let&nbsp;((n&nbsp;0))<br>
-&nbsp;&nbsp;(call-with-current-continuation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(k)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(dynamic-wind<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(dynamic-wind<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;n&nbsp;(+&nbsp;n&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(k))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;n&nbsp;(+&nbsp;n&nbsp;2))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(k))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;n&nbsp;(+&nbsp;n&nbsp;4))))))<br>
-&nbsp;&nbsp;n)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;7<p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Entering a dynamic extent restores its dynamic environment; see
-section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.12">5.12</a>.
-</blockquote>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.16"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.16">11.16&nbsp;&nbsp;Iteration</a></h2>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_766"></a>let<i> &lt;variable&gt; &lt;bindings&gt; &lt;body&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-
-&#8220;Named <tt>let</tt>&#8221; is a variant on the syntax of <tt>let</tt> that provides
-a general looping construct and may also be used to express
-recursion.
-It has the same syntax and semantics as ordinary <tt>let</tt>
-except that &lt;variable&gt; is bound within &lt;body&gt; to a procedure
-whose parameters are the bound variables and whose body is
-&lt;body&gt;.  Thus the execution of &lt;body&gt; may be repeated by
-invoking the procedure named by &lt;variable&gt;.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;loop&nbsp;((numbers&nbsp;&#8217;(3&nbsp;-2&nbsp;1&nbsp;6&nbsp;-5))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(nonneg&nbsp;&#8217;())<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(neg&nbsp;&#8217;()))<br>
-&nbsp;&nbsp;(cond&nbsp;((null?&nbsp;numbers)&nbsp;(list&nbsp;nonneg&nbsp;neg))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((&gt;=&nbsp;(car&nbsp;numbers)&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;(cdr&nbsp;numbers)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;(car&nbsp;numbers)&nbsp;nonneg)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;neg))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((&lt;&nbsp;(car&nbsp;numbers)&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;(cdr&nbsp;numbers)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;nonneg<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;(car&nbsp;numbers)&nbsp;neg)))))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;((6&nbsp;1&nbsp;3)&nbsp;(-5&nbsp;-2))<p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.17"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.17">11.17&nbsp;&nbsp;Quasiquotation</a></h2>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_768"></a>quasiquote<i> &lt;qq template&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-
-<a name="node_idx_770"></a><div align=left><tt>unquote</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-
-<a name="node_idx_772"></a><div align=left><tt>unquote-splicing</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-<p>
-&#8220;Backquote&#8221; or &#8220;quasiquote&#8221;<a name="node_idx_774"></a>expressions are useful
-for constructing a list or vector structure when some but not all of the
-desired structure is known in advance.  </p>
-<p>
-<em>Syntax: </em>&lt;Qq template&gt; should be as specified by the grammar at
-the end of this entry.</p>
-<p>
-<em>Semantics: </em>If no
-<tt>unquote</tt> or <tt>unquote-splicing</tt> forms
-appear within the &lt;qq template&gt;, the result of
-evaluating
-<tt>(quasiquote &lt;qq template&gt;)</tt> is equivalent to the result of evaluating
-<tt>(quote &lt;qq template&gt;)</tt>.</p>
-<p>
-If an <tt>(unquote &lt;expression&gt; <tt>...</tt>)</tt> form appears inside a
-&lt;qq template&gt;, however, the &lt;expression&gt;s are evaluated
-(&#8220;unquoted&#8221;) and their results are inserted into the structure instead
-of the <tt>unquote</tt> form.</p>
-<p>
-If an <tt>(unquote-splicing &lt;expression&gt; <tt>...</tt>)</tt> form
-appears inside a &lt;qq template&gt;, then the &lt;expression&gt;s must
-evaluate to lists; the opening and closing parentheses of the lists are
-then &#8220;stripped away&#8221; and the elements of the lists are inserted in
-place of the <tt>unquote-splicing</tt> form.</p>
-<p>
-Any <tt>unquote-splicing</tt> or multi-operand <tt>unquote</tt> form must
-appear only within a list or vector &lt;qq template&gt;.</p>
-<p>
-As noted in section&nbsp;<a href="r6rs-Z-H-7.html#node_sec_4.3.5">4.3.5</a>,
-<tt>(quasiquote &lt;qq template&gt;)</tt> may be abbreviated
-<tt>&#8216;</tt>&lt;qq template&gt;,
-<tt>(unquote &lt;expression&gt;)</tt> may be abbreviated
-<tt>,</tt>&lt;expression&gt;, and
-<tt>(unquote-splicing &lt;expression&gt;)</tt> may be abbreviated
-<tt>,</tt><tt>@</tt>&lt;expression&gt;.</p>
-<p>
-</p>
-
-<tt>&#8216;(list&nbsp;,(+&nbsp;1&nbsp;2)&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(list&nbsp;3&nbsp;4)<br>
-(let&nbsp;((name&nbsp;&#8217;a))&nbsp;&#8216;(list&nbsp;,name&nbsp;&#8217;,name))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(list&nbsp;a&nbsp;(quote&nbsp;a))<br>
-&#8216;(a&nbsp;,(+&nbsp;1&nbsp;2)&nbsp;,@(map&nbsp;abs&nbsp;&#8217;(4&nbsp;-5&nbsp;6))&nbsp;b)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a&nbsp;3&nbsp;4&nbsp;5&nbsp;6&nbsp;b)<br>
-&#8216;((<tt>&nbsp;foo</tt>&nbsp;,(-&nbsp;10&nbsp;3))&nbsp;,@(cdr&nbsp;&#8217;(c))&nbsp;.&nbsp;,(car&nbsp;&#8217;(cons)))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;((foo&nbsp;7)&nbsp;.&nbsp;cons)<br>
-&#8216;#(10&nbsp;5&nbsp;,(sqrt&nbsp;4)&nbsp;,@(map&nbsp;sqrt&nbsp;&#8217;(16&nbsp;9))&nbsp;8)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;#(10&nbsp;5&nbsp;2&nbsp;4&nbsp;3&nbsp;8)<br>
-(let&nbsp;((name&nbsp;&#8217;foo))<br>
-&nbsp;&nbsp;&#8216;((unquote&nbsp;name&nbsp;name&nbsp;name)))<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(foo&nbsp;foo&nbsp;foo)<br>
-(let&nbsp;((name&nbsp;&#8217;(foo)))<br>
-&nbsp;&nbsp;&#8216;((unquote-splicing&nbsp;name&nbsp;name&nbsp;name)))<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(foo&nbsp;foo&nbsp;foo)<br>
-(let&nbsp;((q&nbsp;&#8217;((append&nbsp;x&nbsp;y)&nbsp;(sqrt&nbsp;9))))<br>
-&nbsp;&nbsp;&#8216;&#8216;(foo&nbsp;,,@q))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&#8216;(foo<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(unquote&nbsp;(append&nbsp;x&nbsp;y)&nbsp;(sqrt&nbsp;9)))<br>
-(let&nbsp;((x&nbsp;&#8217;(2&nbsp;3))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(y&nbsp;&#8217;(4&nbsp;5)))<br>
-&nbsp;&nbsp;&#8216;(foo&nbsp;(unquote&nbsp;(append&nbsp;x&nbsp;y)&nbsp;(sqrt&nbsp;9))))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(foo&nbsp;(2&nbsp;3&nbsp;4&nbsp;5)&nbsp;3)<p></tt></p>
-<p>
-Quasiquote forms may be nested.  Substitutions are made only for
-unquoted components appearing at the same nesting level
-as the outermost <tt>quasiquote</tt>.  The nesting level increases by one inside
-each successive quasiquotation, and decreases by one inside each
-unquotation.</p>
-<p>
-</p>
-
-<tt>&#8216;(a&nbsp;&#8216;(b&nbsp;,(+&nbsp;1&nbsp;2)&nbsp;,(foo&nbsp;,(+&nbsp;1&nbsp;3)&nbsp;d)&nbsp;e)&nbsp;f)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a&nbsp;&#8216;(b&nbsp;,(+&nbsp;1&nbsp;2)&nbsp;,(foo&nbsp;4&nbsp;d)&nbsp;e)&nbsp;f)<br>
-(let&nbsp;((name1&nbsp;&#8217;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(name2&nbsp;&#8217;y))<br>
-&nbsp;&nbsp;&#8216;(a&nbsp;&#8216;(b&nbsp;,,name1&nbsp;,&#8217;,name2&nbsp;d)&nbsp;e))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;(a&nbsp;&#8216;(b&nbsp;,x&nbsp;,&#8217;y&nbsp;d)&nbsp;e)<p></tt></p>
-<p>
-A <tt>quasiquote</tt> expression may return either fresh, mutable objects
-or literal structure for any structure that is constructed at run time
-during the evaluation of the expression.  Portions that do not need to
-be rebuilt are always literal.  Thus,
-</p>
-
-<tt>(let&nbsp;((a&nbsp;3))&nbsp;&#8216;((1&nbsp;2)&nbsp;,a&nbsp;,4&nbsp;,&#8217;five&nbsp;6))<p></tt>
-may be equivalent to either of the following expressions:
-</p>
-
-<tt>&#8217;((1&nbsp;2)&nbsp;3&nbsp;4&nbsp;five&nbsp;6)<br>
-(let&nbsp;((a&nbsp;3))&nbsp;<br>
-&nbsp;&nbsp;(cons&nbsp;&#8217;(1&nbsp;2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;a&nbsp;(cons&nbsp;4&nbsp;(cons&nbsp;&#8217;five&nbsp;&#8217;(6))))))<p></tt>
-However, it is not equivalent to this expression:
-</p>
-
-<tt>(let&nbsp;((a&nbsp;3))&nbsp;(list&nbsp;(list&nbsp;1&nbsp;2)&nbsp;a&nbsp;4&nbsp;&#8217;five&nbsp;6))<br>
-<p></tt>
-It is a syntax violation if any of the identifiers
-<tt>quasiquote</tt>, <tt>unquote</tt>, or <tt>unquote-splicing</tt> appear in
-positions within a &lt;qq template&gt; otherwise than as described above.</p>
-<p>
-The following grammar for quasiquote expressions is not context-free.
-It is presented as a recipe for generating an infinite number of
-production rules.  Imagine a copy of the following rules for <em>D</em>  =  1, 2,
-3, <tt>...</tt>.  <em>D</em> keeps track of the nesting depth.</p>
-<p>
-</p>
-<tt>&lt;qq template&gt; &rarr; &lt;qq template 1&gt;<br>
-&lt;qq template 0&gt; &rarr; &lt;expression&gt;<br>
-&lt;quasiquotation <em>D</em>&gt; &rarr; (quasiquote &lt;qq template <em>D</em>&gt;)<br>
-&lt;qq template <em>D</em>&gt; &rarr; &lt;lexeme datum&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    | &lt;list qq template <em>D</em>&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    | &lt;vector qq template <em>D</em>&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    | &lt;unquotation <em>D</em>&gt;<br>
-&lt;list qq template <em>D</em>&gt; &rarr; (&lt;qq template or splice <em>D</em>&gt;*)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    | (&lt;qq template or splice <em>D</em>&gt;<sup>+</sup> . &lt;qq template <em>D</em>&gt;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    | &lt;quasiquotation <em>D</em> + 1&gt;<br>
-&lt;vector qq template <em>D</em>&gt; &rarr; #(&lt;qq template or splice <em>D</em>&gt;*)<br>
-&lt;unquotation <em>D</em>&gt; &rarr; (unquote &lt;qq template <em>D</em> <tt>-</tt> 1&gt;)<br>
-&lt;qq template or splice <em>D</em>&gt; &rarr; &lt;qq template <em>D</em>&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    | &lt;splicing unquotation <em>D</em>&gt;<br>
-&lt;splicing unquotation <em>D</em>&gt; &rarr;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (unquote-splicing &lt;qq template <em>D</em> <tt>-</tt> 1&gt;*)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    | (unquote &lt;qq template <em>D</em> <tt>-</tt> 1&gt;*) </tt><p>
-In &lt;quasiquotation&gt;s, a &lt;list qq template <em>D</em>&gt; can sometimes
-be confused with either an &lt;unquotation <em>D</em>&gt; or a &lt;splicing
-unquotation <em>D</em>&gt;.  The interpretation as an
-&lt;unquotation&gt; or &lt;splicing
-unquotation <em>D</em>&gt; takes precedence.</p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.18"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.18">11.18&nbsp;&nbsp;Binding constructs for syntactic keywords</a></h2>
-<p></p>
-<p>
-The <tt>let-syntax</tt> and <tt>letrec-syntax</tt> forms 
-bind keywords.
-Like a <tt>begin</tt> form, a <tt>let-syntax</tt> or <tt>letrec-syntax</tt> form
-may appear in a definition context, in which case it is treated as a
-definition, and the forms in the body must also be
-definitions.
-A <tt>let-syntax</tt> or <tt>letrec-syntax</tt> form may also appear in an
-expression context, in which case the forms within their bodies must be
-expressions.</p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_776"></a>let-syntax<i> &lt;bindings&gt; &lt;form&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>&lt;Bindings&gt; must have the form
-</p>
-
-<tt>((&lt;keyword&gt;&nbsp;&lt;expression&gt;)&nbsp;<tt>...</tt>)<p></tt>
-Each &lt;keyword&gt; is an identifier,
-and each &lt;expression&gt; is 
-an expression that evaluates, at macro-expansion
-time, to a <i>transformer</i><a name="node_idx_778"></a><a name="node_idx_780"></a>.
-Transformers may be created by <tt>syntax-rules</tt> or <tt>identifier-syntax</tt>
-(see section&nbsp;<a href="#node_sec_11.19">11.19</a>) or by one of the other mechanisms
-described in library chapter&nbsp;on &#8220;<tt>syntax-case</tt>&#8221;.  It is a
-syntax violation for &lt;keyword&gt; to appear more than once in the list of keywords
-being bound.</p>
-<p>
-<em>Semantics: </em>The &lt;form&gt;s are expanded in the syntactic environment
-obtained by extending the syntactic environment of the
-<tt>let-syntax</tt> form with macros whose keywords are
-the &lt;keyword&gt;s, bound to the specified transformers.
-Each binding of a &lt;keyword&gt; has the &lt;form&gt;s as its region.</p>
-<p>
-The &lt;form&gt;s of a <tt>let-syntax</tt>
-form are treated, whether in definition or expression context, as if
-wrapped in an implicit <tt>begin</tt>; see section&nbsp;<a href="#node_sec_11.4.7">11.4.7</a>.
-Thus definitions in the result of expanding the &lt;form&gt;s have
-the same region as any definition appearing in place of the <tt>let-syntax</tt> form would have.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation should detect if the value of
-&lt;expression&gt; cannot possibly be a transformer.</p>
-<p>
-</p>
-
-<tt>(let-syntax&nbsp;((when&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((when&nbsp;test&nbsp;stmt1&nbsp;stmt2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;test<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;stmt1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stmt2&nbsp;...))))))<br>
-&nbsp;&nbsp;(let&nbsp;((if&nbsp;<tt>#t</tt>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(when&nbsp;if&nbsp;(set!&nbsp;if&nbsp;&#8217;now))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;if))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;now<br>
-<br>
-(let&nbsp;((x&nbsp;&#8217;outer))<br>
-&nbsp;&nbsp;(let-syntax&nbsp;((m&nbsp;(syntax-rules&nbsp;()&nbsp;((m)&nbsp;x))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((x&nbsp;&#8217;inner))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(m))))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;outer<br>
-<br>
-(let&nbsp;()<br>
-&nbsp;&nbsp;(let-syntax<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((def&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((def&nbsp;stuff&nbsp;...)&nbsp;(define&nbsp;stuff&nbsp;...)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(def&nbsp;foo&nbsp;42))<br>
-&nbsp;&nbsp;foo)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;42<br>
-<br>
-(let&nbsp;()<br>
-&nbsp;&nbsp;(let-syntax&nbsp;())<br>
-&nbsp;&nbsp;5)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;5<p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_782"></a>letrec-syntax<i> &lt;bindings&gt; &lt;form&gt; <tt>...</tt></i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;</div>
-<p>
-<em>Syntax: </em>Same as for <tt>let-syntax</tt>.</p>
-<p>
-<em>Semantics: </em>The &lt;form&gt;s are
-expanded in the syntactic environment obtained by
-extending the syntactic environment of the <tt>letrec-syntax</tt>
-form with macros whose keywords are the
-&lt;keyword&gt;s, bound to the specified transformers.
-Each binding of a &lt;keyword&gt; has the &lt;bindings&gt;
-as well as the &lt;form&gt;s within its region,
-so the transformers can
-transcribe forms into uses of the macros
-introduced by the <tt>letrec-syntax</tt> form.</p>
-<p>
-The &lt;form&gt;s of a <tt>letrec-syntax</tt>
-form are treated, whether in definition or expression context, as if
-wrapped in an implicit <tt>begin</tt>; see section&nbsp;<a href="#node_sec_11.4.7">11.4.7</a>.
-Thus definitions in the result of expanding the &lt;form&gt;s have
-the same region as any definition appearing in place of the <tt>letrec-syntax</tt> form would have.</p>
-<p>
-<em>Implementation responsibilities: </em>The implementation should detect if the value of
-&lt;expression&gt; cannot possibly be a transformer.</p>
-<p>
-</p>
-
-<tt>(letrec-syntax<br>
-&nbsp;&nbsp;((my-or&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((my-or)&nbsp;<tt>#f</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((my-or&nbsp;e)&nbsp;e)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((my-or&nbsp;e1&nbsp;e2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((temp&nbsp;e1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;temp<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;temp<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(my-or&nbsp;e2&nbsp;...)))))))<br>
-&nbsp;&nbsp;(let&nbsp;((x&nbsp;<tt>#f</tt>)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(y&nbsp;7)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(temp&nbsp;8)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;odd?)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;even?))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(my-or&nbsp;x<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;temp)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;7<p></tt></p>
-<p>
-The following example highlights how <tt>let-syntax</tt>
-and <tt>letrec-syntax</tt> differ.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((f&nbsp;(lambda&nbsp;(x)&nbsp;(+&nbsp;x&nbsp;1))))<br>
-&nbsp;&nbsp;(let-syntax&nbsp;((f&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((f&nbsp;x)&nbsp;x)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(g&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((g&nbsp;x)&nbsp;(f&nbsp;x)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(list&nbsp;(f&nbsp;1)&nbsp;(g&nbsp;1))))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;2)<br>
-<br>
-(let&nbsp;((f&nbsp;(lambda&nbsp;(x)&nbsp;(+&nbsp;x&nbsp;1))))<br>
-&nbsp;&nbsp;(letrec-syntax&nbsp;((f&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((f&nbsp;x)&nbsp;x)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(g&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((g&nbsp;x)&nbsp;(f&nbsp;x)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(list&nbsp;(f&nbsp;1)&nbsp;(g&nbsp;1))))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;1)<p></tt></p>
-<p>
-The two expressions are identical except that the <tt>let-syntax</tt> form
-in the first expression is a <tt>letrec-syntax</tt> form in the second.
-In the first expression, the <tt>f</tt> occurring in <tt>g</tt> refers to
-the <tt>let</tt>-bound variable <tt>f</tt>, whereas in the second it refers
-to the keyword <tt>f</tt> whose binding is established by the
-<tt>letrec-syntax</tt> form.
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.19"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.19">11.19&nbsp;&nbsp;Macro transformers</a></h2>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(syntax-rules (&lt;literal&gt; <tt>...</tt>) &lt;syntax rule&gt; <tt>...</tt>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;(<tt>expand</tt>)&nbsp;</div>
-
-<div align=left><tt>_</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax (<tt>expand)</tt>&nbsp;</div>
-
-<a name="node_idx_784"></a><div align=left><tt>...</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax (<tt>expand)</tt>&nbsp;</div>
-
-<a name="node_idx_786"></a><a name="node_idx_788"></a><p>
-<em>Syntax: </em>Each &lt;literal&gt; must be an identifier.
-Each &lt;syntax rule&gt; must have the following form:</p>
-<p>
-</p>
-
-<tt>(&lt;srpattern&gt;&nbsp;&lt;template&gt;)<p></tt></p>
-<p>
-An &lt;srpattern&gt; is a restricted form of &lt;pattern&gt;,
-namely, a nonempty &lt;pattern&gt; in one of four parenthesized forms below
-whose first subform is an identifier or an underscore <tt>_</tt><a name="node_idx_790"></a>.
-A &lt;pattern&gt; is an identifier, constant, or one of the following.</p>
-<p>
-</p>
-
-<tt>(&lt;pattern&gt;&nbsp;<tt>...</tt>)<br>
-(&lt;pattern&gt;&nbsp;&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;.&nbsp;&lt;pattern&gt;)<br>
-(&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;&lt;pattern&gt;&nbsp;&lt;ellipsis&gt;&nbsp;&lt;pattern&gt;&nbsp;<tt>...</tt>)<br>
-(&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;&lt;pattern&gt;&nbsp;&lt;ellipsis&gt;&nbsp;&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;.&nbsp;&lt;pattern&gt;)<br>
-#(&lt;pattern&gt;&nbsp;<tt>...</tt>)<br>
-#(&lt;pattern&gt;&nbsp;<tt>...</tt>&nbsp;&lt;pattern&gt;&nbsp;&lt;ellipsis&gt;&nbsp;&lt;pattern&gt;&nbsp;<tt>...</tt>)<p></tt></p>
-<p>
-An &lt;ellipsis&gt; is the identifier &#8220;<tt>...</tt>&#8221; (three periods).<a name="node_idx_792"></a></p>
-<p>
-A &lt;template&gt; is a pattern variable, an identifier that
-is not a pattern
-variable, a pattern datum, or one of the following.</p>
-<p>
-</p>
-
-<tt>(&lt;subtemplate&gt;&nbsp;<tt>...</tt>)<br>
-(&lt;subtemplate&gt;&nbsp;<tt>...</tt>&nbsp;.&nbsp;&lt;template&gt;)<br>
-#(&lt;subtemplate&gt;&nbsp;<tt>...</tt>)<p></tt></p>
-<p>
-A &lt;subtemplate&gt; is a &lt;template&gt; followed by zero or more ellipses.</p>
-<p>
-<em>Semantics: </em>An instance of <tt>syntax-rules</tt> evaluates, at
-macro-expansion time, to a new macro
-transformer by specifying a sequence of hygienic rewrite rules.  A use
-of a macro whose keyword is associated with a transformer specified by
-<tt>syntax-rules</tt> is matched against the patterns contained in the
-&lt;syntax rule&gt;s, beginning with the leftmost &lt;syntax rule&gt;.
-When a match is found, the macro use is transcribed hygienically
-according to the template.  It is a syntax violation when no match is found.</p>
-<p>
-An identifier appearing within a &lt;pattern&gt; may be an underscore
-(&nbsp;<tt>_</tt>&nbsp;), a literal identifier listed in the list of literals
-<tt>(&lt;literal&gt; <tt>...</tt>)</tt>, or an ellipsis (&nbsp;<tt>...</tt>&nbsp;).
-All other identifiers appearing within a &lt;pattern&gt; are
-<i>pattern variables<a name="node_idx_794"></a></i>.
-It is a syntax violation if an ellipsis or underscore appears in <tt>(&lt;literal&gt; <tt>...</tt>)</tt>.</p>
-<p>
-While the first subform of &lt;srpattern&gt; may be an identifier, the
-identifier is not involved in the matching and
-is not considered a pattern variable or literal identifier.</p>
-<p>
-Pattern variables match arbitrary input subforms and
-are used to refer to elements of the input.
-It is a syntax violation if the same pattern variable appears more than once in a
-&lt;pattern&gt;.</p>
-<p>
-Underscores also match arbitrary input subforms but are not pattern variables
-and so cannot be used to refer to those elements.
-Multiple underscores may appear in a &lt;pattern&gt;.</p>
-<p>
-A literal identifier matches an input subform if and only if the input
-subform is an identifier and either both its occurrence in the input
-expression and its occurrence in the list of literals have the same
-lexical binding, or the two identifiers have the same name and both have
-no lexical binding.</p>
-<p>
-A subpattern followed by an ellipsis can match zero or more elements of
-the input.</p>
-<p>
-More formally, an input form <em>F</em> matches a pattern <em>P</em> if and only if
-one of the following holds:</p>
-<p>
-</p>
-<ul>
-<li><p><em>P</em> is an underscore (&nbsp;<tt>_</tt>&nbsp;).</p>
-<p>
-</p>
-<li><p><em>P</em> is a pattern variable.</p>
-<p>
-</p>
-<li><p><em>P</em> is a literal identifier
-and <em>F</em> is an identifier such that both <em>P</em> and <em>F</em> would refer to the
-same binding if both were to appear in the output of the macro outside
-of any bindings inserted into the output of the macro.
-(If neither of two like-named identifiers refers to any binding, i.e., both
-are undefined, they are considered to refer to the same binding.)</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub>)</tt>
-and <em>F</em> is a list of <em>n</em> elements that match <em>P</em><sub>1</sub> through
-<em>P</em><sub><em>n</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub> . <em>P</em><sub><em>x</em></sub>)</tt>
-and <em>F</em> is a list or improper list of <em>n</em> or more elements
-whose first <em>n</em> elements match <em>P</em><sub>1</sub> through <em>P</em><sub><em>n</em></sub>
-and
-whose <em>n</em>th cdr matches <em>P</em><sub><em>x</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>k</em></sub> <em>P</em><sub><em>e</em></sub> &lt;ellipsis&gt; <em>P</em><sub><em>m</em>+1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub>)</tt>,
-where &lt;ellipsis&gt; is the identifier <tt>...</tt>
-and <em>F</em> is a list of <em>n</em>
-elements whose first <em>k</em> elements match <em>P</em><sub>1</sub> through <em>P</em><sub><em>k</em></sub>,
-whose next <em>m</em> <tt>-</tt> <em>k</em> elements each match <em>P</em><sub><em>e</em></sub>,
-and
-whose remaining <em>n</em> <tt>-</tt> <em>m</em> elements match <em>P</em><sub><em>m</em>+1</sub> through <em>P</em><sub><em>n</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>k</em></sub> <em>P</em><sub><em>e</em></sub> &lt;ellipsis&gt; <em>P</em><sub><em>m</em>+1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub> . <em>P</em><sub><em>x</em></sub>)</tt>,
-where &lt;ellipsis&gt; is the identifier <tt>...</tt>
-and <em>F</em> is a list or improper list of <em>n</em>
-elements whose first <em>k</em> elements match <em>P</em><sub>1</sub> through <em>P</em><sub><em>k</em></sub>,
-whose next <em>m</em> <tt>-</tt> <em>k</em> elements each match <em>P</em><sub><em>e</em></sub>,
-whose next <em>n</em> <tt>-</tt> <em>m</em> elements match <em>P</em><sub><em>m</em>+1</sub> through <em>P</em><sub><em>n</em></sub>,
-and 
-whose <em>n</em>th and final cdr matches <em>P</em><sub><em>x</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>#(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub>)</tt>
-and <em>F</em> is a vector of <em>n</em> elements that match <em>P</em><sub>1</sub> through
-<em>P</em><sub><em>n</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is of the form
-<tt>#(<em>P</em><sub>1</sub> <tt>...</tt> <em>P</em><sub><em>k</em></sub> <em>P</em><sub><em>e</em></sub> &lt;ellipsis&gt; <em>P</em><sub><em>m</em>+1</sub> <tt>...</tt> <em>P</em><sub><em>n</em></sub>)</tt>,
-where &lt;ellipsis&gt; is the identifier <tt>...</tt>
-and <em>F</em> is a vector of <em>n</em> or more elements
-whose first <em>k</em> elements match <em>P</em><sub>1</sub> through <em>P</em><sub><em>k</em></sub>,
-whose next <em>m</em> <tt>-</tt> <em>k</em> elements each match <em>P</em><sub><em>e</em></sub>,
-and
-whose remaining <em>n</em> <tt>-</tt> <em>m</em> elements match <em>P</em><sub><em>m</em>+1</sub> through <em>P</em><sub><em>n</em></sub>.</p>
-<p>
-</p>
-<li><p><em>P</em> is a pattern datum (any nonlist, nonvector, nonsymbol
-datum) and <em>F</em> is equal to <em>P</em> in the sense of the
-<tt>equal?</tt> procedure.
-</p>
-</ul><p></p>
-<p>
-When a macro use is transcribed according to the template of the
-matching &lt;syntax rule&gt;, pattern variables that occur in the
-template are replaced by the subforms they match in the input.</p>
-<p>
-Pattern data and identifiers that are not pattern variables
-or ellipses are copied into the output.
-A subtemplate followed by an ellipsis expands
-into zero or more occurrences of the subtemplate.
-Pattern variables that occur in subpatterns followed by one or more
-ellipses may occur only in subtemplates that are
-followed by (at least) as many ellipses.
-These pattern variables are replaced in the output by the input
-subforms to which they are bound, distributed as specified.
-If a pattern variable is followed by more ellipses in the subtemplate
-than in the associated subpattern, the input form is replicated as
-necessary.
-The subtemplate must contain at least one pattern variable from a
-subpattern followed by an ellipsis, and for at least one such pattern
-variable, the subtemplate must be followed by exactly as many ellipses as
-the subpattern in which the pattern variable appears.
-(Otherwise, the expander would not be able to determine how many times the
-subform should be repeated in the output.)
-It is a syntax violation if the constraints of this paragraph are not met.</p>
-<p>
-A template of the form
-<tt>(&lt;ellipsis&gt; &lt;template&gt;)</tt> is identical to &lt;template&gt;, except that
-ellipses within the template have no special meaning.
-That is, any ellipses contained within &lt;template&gt; are
-treated as ordinary identifiers.
-In particular, the template <tt>(... ...)</tt> produces a single
-ellipsis, <tt>...</tt>.
-This allows syntactic abstractions to expand into forms containing
-ellipses.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;be-like-begin<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((be-like-begin&nbsp;name)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(define-syntax&nbsp;name<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((name&nbsp;expr&nbsp;(...&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;expr&nbsp;(...&nbsp;...))))))))<br>
-<br>
-(be-like-begin&nbsp;sequence)<br>
-(sequence&nbsp;1&nbsp;2&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;4<p></tt></p>
-<p>
-As an example for hygienic use of auxiliary identifier,
-if <tt>let</tt> and <tt>cond</tt> are defined as in
-section&nbsp;<a href="#node_sec_11.16">11.16</a> and appendix&nbsp;<a href="r6rs-Z-H-16.html#node_chap_B">B</a> then they
-are hygienic (as required) and the following is not an error.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((=&gt;&nbsp;<tt>#f</tt>))<br>
-&nbsp;&nbsp;(cond&nbsp;(<tt>#t</tt>&nbsp;=&gt;&nbsp;&#8217;ok)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;ok<p></tt></p>
-<p>
-The macro transformer for <tt>cond</tt> recognizes <tt>=&gt;</tt>
-as a local variable, and hence an expression, and not as the
-identifier <tt>=&gt;</tt>, which the macro transformer treats
-as a syntactic keyword.  Thus the example expands into</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((=&gt;&nbsp;<tt>#f</tt>))<br>
-&nbsp;&nbsp;(if&nbsp;<tt>#t</tt>&nbsp;(begin&nbsp;=&gt;&nbsp;&#8217;ok)))<p></tt></p>
-<p>
-instead of</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((=&gt;&nbsp;<tt>#f</tt>))<br>
-&nbsp;&nbsp;(let&nbsp;((temp&nbsp;<tt>#t</tt>))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;temp&nbsp;(&#8217;ok&nbsp;temp))))<p></tt></p>
-<p>
-which would result in an assertion violation.
-</p>
-<p></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt>(<a name="node_idx_796"></a>identifier-syntax<i> &lt;template&gt;</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;(<tt>expand</tt>)&nbsp;</div>
-
-<div align=left><tt>(identifier-syntax</tt>&nbsp;&nbsp;&nbsp;&nbsp;syntax&nbsp;(<tt>expand</tt>)&nbsp;</div>
-<br>
-<tt>(&lt;id<sub>1</sub>&gt;&nbsp;&lt;template<sub>1</sub>&gt;)<br>
-
-((set!&nbsp;&lt;id<sub>2</sub>&gt;&nbsp;&lt;pattern&gt;)<br>
-
-&lt;template<sub>2</sub>&gt;))<br>
-
-<div align=left><tt>set!</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary&nbsp;syntax&nbsp;(<tt>&nbsp;expand)</tt>&nbsp;</div>
-</tt><p>
-<em>Syntax: </em>The &lt;id&gt;s must be identifiers.  The &lt;template&gt;s
-must be as for <tt>syntax-rules</tt>.</p>
-<p>
-<em>Semantics: </em>When a keyword is bound to a transformer produced by the first form of
-<tt>identifier-syntax</tt>, references to the keyword within the scope
-of the binding are replaced by &lt;template&gt;.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;p&nbsp;(cons&nbsp;4&nbsp;5))<br>
-(define-syntax&nbsp;p.car&nbsp;(identifier-syntax&nbsp;(car&nbsp;p)))<br>
-p.car&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;4<br>
-(set!&nbsp;p.car&nbsp;15)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>&nbsp;&amp;syntax</tt>&nbsp;<i>exception</i><p></tt></p>
-<p>
-The second, more general, form of <tt>identifier-syntax</tt> permits
-the transformer to determine what happens when <tt>set!</tt> is used.
-In this case, uses of the identifier by itself are replaced by
-&lt;template<sub>1</sub>&gt;, and uses of <tt>set!</tt> with the identifier are
-replaced by &lt;template<sub>2</sub>&gt;.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;p&nbsp;(cons&nbsp;4&nbsp;5))<br>
-(define-syntax&nbsp;p.car<br>
-&nbsp;&nbsp;(identifier-syntax<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(_&nbsp;(car&nbsp;p))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((set!&nbsp;_&nbsp;e)&nbsp;(set-car!&nbsp;p&nbsp;e))))<br>
-(set!&nbsp;p.car&nbsp;15)<br>
-p.car&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;15<br>
-p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(15&nbsp;5)<p></tt></p>
-<p>
-</p>
-<p></p>
-<p>
-</p>
-<a name="node_sec_11.20"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_11.20">11.20&nbsp;&nbsp;Tail calls and tail contexts</a></h2>
-<p></p>
-<p>
-A <em>tail call</em><a name="node_idx_798"></a>is a procedure call that occurs
-in a <em>tail context</em>.  Tail contexts are defined inductively.  Note
-that a tail context is always determined with respect to a particular lambda
-expression.</p>
-<p>
-</p>
-<ul>
-<li><p>The last expression within the body of a lambda expression,
-shown as &lt;tail expression&gt; below, occurs in a tail context.
-</p>
-
-<tt>(l&acirc;mbda&nbsp;&lt;formals&gt;<br>
-&nbsp;&nbsp;&lt;definition&gt;*&nbsp;<br>
-&nbsp;&nbsp;&lt;expression&gt;*&nbsp;&lt;tail&nbsp;expression&gt;)<p></tt>
-</p>
-<li><p>If one of the following expressions is in a tail context,
-then the subexpressions shown as &lt;tail expression&gt; are in a tail context.
-These were derived from specifications of the syntax of the forms described in
-this chapter by replacing some occurrences of &lt;expression&gt;
-with &lt;tail expression&gt;.  Only those rules that contain tail contexts
-are shown here.
-</p>
-
-<tt>(if&nbsp;&lt;expression&gt;&nbsp;&lt;tail&nbsp;expression&gt;&nbsp;&lt;tail&nbsp;expression&gt;)<br>
-(if&nbsp;&lt;expression&gt;&nbsp;&lt;tail&nbsp;expression&gt;)<br>
-<br>
-(cond&nbsp;&lt;cond&nbsp;clause&gt;<sup>+</sup>)<br>
-(cond&nbsp;&lt;cond&nbsp;clause&gt;*&nbsp;(else&nbsp;&lt;tail&nbsp;sequence&gt;))<br>
-<br>
-(c&acirc;se&nbsp;&lt;expression&gt;<br>
-&nbsp;&nbsp;&lt;case&nbsp;clause&gt;<sup>+</sup>)<br>
-(c&acirc;se&nbsp;&lt;expression&gt;<br>
-&nbsp;&nbsp;&lt;case&nbsp;clause&gt;*<br>
-&nbsp;&nbsp;(else&nbsp;&lt;tail&nbsp;sequence&gt;))<br>
-<br>
-(and&nbsp;&lt;expression&gt;*&nbsp;&lt;tail&nbsp;expression&gt;)<br>
-(or&nbsp;&lt;expression&gt;*&nbsp;&lt;tail&nbsp;expression&gt;)<br>
-<br>
-(let&nbsp;&lt;bindings&gt;&nbsp;&lt;tail&nbsp;body&gt;)<br>
-(let&nbsp;&lt;variable&gt;&nbsp;&lt;bindings&gt;&nbsp;&lt;tail&nbsp;body&gt;)<br>
-(let*&nbsp;&lt;bindings&gt;&nbsp;&lt;tail&nbsp;body&gt;)<br>
-(letrec*&nbsp;&lt;bindings&gt;&nbsp;&lt;tail&nbsp;body&gt;)<br>
-(letrec&nbsp;&lt;bindings&gt;&nbsp;&lt;tail&nbsp;body&gt;)<br>
-(let-values&nbsp;&lt;mv-bindings&gt;&nbsp;&lt;tail&nbsp;body&gt;)<br>
-(let*-values&nbsp;&lt;mv-bindings&gt;&nbsp;&lt;tail&nbsp;body&gt;)<br>
-<br>
-(let-syntax&nbsp;&lt;bindings&gt;&nbsp;&lt;tail&nbsp;body&gt;)<br>
-(letrec-syntax&nbsp;&lt;bindings&gt;&nbsp;&lt;tail&nbsp;body&gt;)<br>
-<br>
-(begin&nbsp;&lt;tail&nbsp;sequence&gt;)<p></tt>
-A &lt;cond clause&gt; is 
-</p>
-
-<tt>(&lt;test&gt;&nbsp;&lt;tail&nbsp;sequence&gt;),<p></tt>
-a &lt;case clause&gt; is
-</p>
-
-<tt>((&lt;datum&gt;*)&nbsp;&lt;tail&nbsp;sequence&gt;),<p></tt>
-a &lt;tail body&gt; is
-</p>
-
-<tt>&lt;definition&gt;*&nbsp;&lt;tail&nbsp;sequence&gt;,<p></tt>
-and a &lt;tail sequence&gt; is
-</p>
-
-<tt>&lt;expression&gt;*&nbsp;&lt;tail&nbsp;expression&gt;.<p></tt></p>
-<p>
-</p>
-<li><p>If a <tt>cond</tt> expression is in a tail context, and has a clause of
-the form <tt>(&lt;expression<sub>1</sub>&gt; =&gt; &lt;expression<sub>2</sub>&gt;)</tt>
-then the (implied) call to
-the procedure that results from the evaluation of &lt;expression<sub>2</sub>&gt; is in a
-tail context.  &lt;Expression<sub>2</sub>&gt; itself is not in a tail context.</p>
-<p>
-</p>
-</ul><p></p>
-<p>
-Certain built-in procedures must also perform tail calls.
-The first argument passed to <tt>apply</tt> and to
-<tt>call-with-current-continuation</tt>, and the second argument passed to
-<tt>call-with-values</tt>, must be called via a tail call.</p>
-<p>
-In the following example the only tail call is the call to <tt>f</tt>.
-None of the calls to <tt>g</tt> or <tt>h</tt> are tail calls.  The reference to
-<tt>x</tt> is in a tail context, but it is not a call and thus is not a
-tail call.
-</p>
-
-<tt>(lambda&nbsp;()<br>
-&nbsp;&nbsp;(if&nbsp;(g)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((x&nbsp;(h)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(and&nbsp;(g)&nbsp;(f))))<p></tt></p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Implementations may
-recognize that some non-tail calls, such as the call to <tt>h</tt>
-above, can be evaluated as though they were tail calls.
-In the example above, the <tt>let</tt> expression could be compiled
-as a tail call to <tt>h</tt>. (The possibility of <tt>h</tt> returning
-an unexpected number of values can be ignored, because in that
-case the effect of the <tt>let</tt> is explicitly unspecified and
-implementation-dependent.)
-</blockquote><p>
-</p>
-<p>
-    </p>
-<p>
-
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-13.html">previous</a></span><span>, <a href="r6rs-Z-H-15.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-15.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-15.html
deleted file mode 100644
index c6329781b5..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-15.html
+++ /dev/null
@@ -1,962 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-14.html">previous</a></span><span>, <a href="r6rs-Z-H-16.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_A"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_A">Appendix A</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_A">Formal semantics</a></h1>
-<p>
-</p>
-<p>
-This appendix presents a non-normative, formal, operational semantics for Scheme, that is based on an earlier semantics&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_18">18</a>]. It does not cover the entire language. The notable missing features are the macro system, I/O, and the numerical tower. The precise list of features included is given in section&nbsp;<a href="#node_sec_A.2">A.2</a>.</p>
-<p>
-The core of the specification is a single-step term rewriting relation that indicates how an (abstract) machine behaves. In general, the report is not a complete specification, giving implementations freedom to behave differently, typically to allow optimizations. This underspecification shows up in two ways in the semantics. </p>
-<p>
-The first is reduction rules that reduce to special &#8220;<b>unknown:</b> <i>string</i>&#8221; states (where the string provides a description of the unknown state). The intention is that rules that reduce to such states can be replaced with arbitrary reduction rules. The precise specification of how to replace those rules is given in section&nbsp;<a href="#node_sec_A.12">A.12</a>.</p>
-<p>
-The other is that the single-step relation relates one program to
-multiple different programs, each corresponding to a legal transition
-that an abstract machine might take. Accordingly we use the transitive
-closure of the single step relation &rarr;<sup>*</sup> to define the
-semantics, <img src="r6rs-Z-G-D-11.gif" border="0" alt="[r6rs-Z-G-D-11.gif]">, as a function from programs (<img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]">)
-to sets of observable results (<img src="r6rs-Z-G-D-12.gif" border="0" alt="[r6rs-Z-G-D-12.gif]">):
-</p>
-<div align=center><table><tr><td>
-
-<table border=0><tr><td valign=top ><img src="r6rs-Z-G-D-11.gif" border="0" alt="[r6rs-Z-G-D-11.gif]"> : <img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]"> ---&rarr; 2<sup><img src="r6rs-Z-G-D-12.gif" border="0" alt="[r6rs-Z-G-D-12.gif]"></sup> </td></tr>
-<tr><td valign=top ><img src="r6rs-Z-G-D-11.gif" border="0" alt="[r6rs-Z-G-D-11.gif]">(<img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]">)  =  { <img src="r6rs-Z-G-D-15.gif" border="0" alt="[r6rs-Z-G-D-15.gif]">(<img src="r6rs-Z-G-D-14.gif" border="0" alt="[r6rs-Z-G-D-14.gif]">) | <img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]"> &rarr;<sup>*</sup> <img src="r6rs-Z-G-D-14.gif" border="0" alt="[r6rs-Z-G-D-14.gif]"> }
-</td></tr></table>
-</td></tr></table></div>
-
-where the function <img src="r6rs-Z-G-D-15.gif" border="0" alt="[r6rs-Z-G-D-15.gif]"> turns an answer (<img src="r6rs-Z-G-D-14.gif" border="0" alt="[r6rs-Z-G-D-14.gif]">) from the semantics into an observable result. Roughly, <img src="r6rs-Z-G-D-15.gif" border="0" alt="[r6rs-Z-G-D-15.gif]"> is the identity function on simple base values, and returns a special tag for more complex values, like procedure and pairs.<p>
-So, an implementation conforms to the semantics if, for every program <img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]">, the implementation produces one of the results in <img src="r6rs-Z-G-D-11.gif" border="0" alt="[r6rs-Z-G-D-11.gif]">(<img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]">) or, if the implementation loops forever, then there is an infinite reduction sequence starting at <img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]">, assuming that the reduction relation &rarr; has been adjusted to replace the <b>unknown:</b> states.</p>
-<p>
-The precise definitions of <img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]">, <img src="r6rs-Z-G-D-14.gif" border="0" alt="[r6rs-Z-G-D-14.gif]">, <img src="r6rs-Z-G-D-12.gif" border="0" alt="[r6rs-Z-G-D-12.gif]">, and <img src="r6rs-Z-G-D-15.gif" border="0" alt="[r6rs-Z-G-D-15.gif]"> are also given in section&nbsp;<a href="#node_sec_A.2">A.2</a>.</p>
-<p>
-To help understand the semantics and how it behaves, we have
-implemented it in PLT Redex. The implementation is available at the
-report&#8217;s website: <a href="http://www.r6rs.org/">http://www.r6rs.org/</a>. All of the reduction
-rules and the metafunctions shown in the figures in this semantics
-were generated automatically from the source code.</p>
-<p>
-</p>
-<a name="node_sec_A.1"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.1">A.1&nbsp;&nbsp;Background</a></h2>
-<p>We assume the reader has a basic familiarity with context-sensitive
-reduction semantics. Readers unfamiliar with this system may wish to
-consult Felleisen and Flatt&#8217;s monograph&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_10">10</a>] or Wright
-and Felleisen&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_29">29</a>] for a thorough introduction,
-including the relevant technical background, or an introduction to PLT
-Redex&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_19">19</a>] for a somewhat lighter one.</p>
-<p>
-As a rough guide, we define the operational semantics of a language
-via a relation on program terms, where the relation corresponds to a
-single step of an abstract machine. The relation is defined using
-evaluation contexts, namely terms with a distinguished place in them,
-called <em>holes</em><a name="node_idx_800"></a>, where the next step of evaluation
-occurs. We say that a term <em>e</em> decomposes into an evaluation
-context <em>E</em> and another term <em>e</em>&prime; if <em>e</em> is the
-same as <em>E</em> but with the hole replaced by <em>e</em>&prime;. We write
-<em>E</em>[<em>e</em>&prime;] to indicate the term obtained by replacing the hole in
-<em>E</em> with <em>e</em>&prime;.</p>
-<p>
-For example, assuming that we have defined a grammar containing
-non-terminals for evaluation contexts (<em>E</em>), expressions
-(<em>e</em>), variables (<em>x</em>), and values (<em>v</em>), we
-would write:
-</p>
-<div align=left><img src="r6rs-Z-G-6.gif" border="0" alt="[r6rs-Z-G-6.gif]"></div><p>
-to define the &beta;<sub><em>v</em></sub> rewriting rule (as a part of the &rarr;
-single step relation). We use the names of the non-terminals (possibly
-with subscripts) in a rewriting rule to restrict the application of
-the rule, so it applies only when some term produced by that grammar
-appears in the corresponding position in the term. If the same
-non-terminal with an identical subscript appears multiple times, the
-rule only applies when the corresponding terms are structurally
-identical (nonterminals without subscripts are not constrained to
-match each other). Thus, the occurrence of <em>E</em><sub>1</sub> on both the
-left-hand and right-hand side of the rule above means that the context
-of the application expression does not change when using this rule.
-The ellipses are a form of Kleene star, meaning that zero or more
-occurrences of terms matching the pattern proceeding the ellipsis may
-appear in place of the the ellipsis and the pattern preceding it. We
-use the notation { <em>x</em><sub>1</sub> <tt>&middot;&middot;&middot;</tt> mapsto <em>v</em><sub>1</sub> <tt>&middot;&middot;&middot;</tt> } <em>e</em><sub>1</sub> for
-capture-avoiding substitution; in this case it means that each
-<em>x</em><sub>1</sub> is replaced with the corresponding <em>v</em><sub>1</sub> in
-<em>e</em><sub>1</sub>. Finally, we write side-conditions in parentheses beside
-a rule; the side-condition in the above rule indicates that the number
-of <em>x</em><sub>1</sub>s must be the same as the number of <em>v</em><sub>1</sub>s.
-Sometimes we use equality in the side-conditions; when we do it merely
-means simple term equality, i.e., the two terms must have the
-same syntactic shape.</p>
-<p>
- 
-</p>
-<a name="node_fig_Temp_22"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p></p>
-<div align=center><table><tr><td>
-
-<div align=left><img src="r6rs-Z-G-7.gif" border="0" alt="[r6rs-Z-G-7.gif]"></div></td></tr><tr><td>
-<p>
-</p>
-</td></tr></table></div>
-
-
-</td></tr>
-<tr><td align=left><b>Figure 2:</b>&nbsp;&nbsp;Grammar for programs and observables</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-Making the evaluation context <em>E</em> explicit in the rule allows
-us to define relations that manipulate their context. As a simple
-example, we can add another rule that signals a violation when a
-procedure is applied to the wrong number of arguments by discarding
-the evaluation context on the right-hand side of a rule:
-</p>
-<div align=left><img src="r6rs-Z-G-8.gif" border="0" alt="[r6rs-Z-G-8.gif]"></div><p>
-Later we take advantage of the explicit evaluation context in more
-sophisticated ways.</p>
-<p>
-</p>
-<a name="node_sec_A.2"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.2">A.2&nbsp;&nbsp;Grammar</a></h2>
-<p></p>
-<p>
-</p>
-<a name="node_fig_Temp_23"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p>
-</p>
-<div align=center><table><tr><td>
-
-<div align=left><img src="r6rs-Z-G-9.gif" border="0" alt="[r6rs-Z-G-9.gif]"></div></td></tr><tr><td>
-<p>
-</p>
-</td></tr></table></div>
-
-
-</td></tr>
-<tr><td align=left><b>Figure 2:</b>&nbsp;&nbsp;Grammar for evaluation contexts</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-Figure&nbsp;<a href="#node_fig_Temp_22">2</a> shows the grammar for the subset of the
-report this semantics models. Non-terminals are written in
-<i>italics</i> or in a calligraphic font (<img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]">
-<img src="r6rs-Z-G-D-14.gif" border="0" alt="[r6rs-Z-G-D-14.gif]">, <img src="r6rs-Z-G-D-12.gif" border="0" alt="[r6rs-Z-G-D-12.gif]">, and <img src="r6rs-Z-G-D-13.gif" border="0" alt="[r6rs-Z-G-D-13.gif]">) and literals are 
-written in a <tt>monospaced</tt> font.</p>
-<p>
-The <img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]"> non-terminal represents possible program states. The
-first alternative is a program with a store and an expression. 
-The second alternative is an uncaught exception, and the third is
-used to indicate a place where the model does not completely specify
-the behavior of the primitives it models (see section&nbsp;<a href="#node_sec_A.12">A.12</a> for details of those situations). 
-The <img src="r6rs-Z-G-D-14.gif" border="0" alt="[r6rs-Z-G-D-14.gif]"> non-terminal
-represents a final result of a program. It is just like <img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]">
-except that expression has been reduced to some sequence of values.</p>
-<p>
-The <img src="r6rs-Z-G-D-12.gif" border="0" alt="[r6rs-Z-G-D-12.gif]"> and <img src="r6rs-Z-G-D-13.gif" border="0" alt="[r6rs-Z-G-D-13.gif]"> non-terminals specify the observable results of a program. Each <img src="r6rs-Z-G-D-12.gif" border="0" alt="[r6rs-Z-G-D-12.gif]"> is either a sequence of values that correspond to the values produced by the program that terminates normally, or a tag indicating an uncaught exception was raised, or <tt>unknown</tt> if the program encounters a situation the semantics does not cover. The <img src="r6rs-Z-G-D-13.gif" border="0" alt="[r6rs-Z-G-D-13.gif]"> non-terminal specifies what the observable results are for a particular value: a pair, the empty list, a symbol, a self-quoting value (<tt>#t</tt>, <tt>#f</tt>, and numbers), a condition, or a procedure.</p>
-<p>
-The <i>sf</i> non-terminal generates individual elements of the
-store. The store holds all of the mutable state of a program. It is
-explained in more detail along with the rules that manipulate it.</p>
-<p>
-Expressions (mathit<em>e</em><em>s</em>) include quoted data, <tt>begin</tt> expressions, <tt>begin0</tt> expressions<a name="node_call_footnote_Temp_24"></a><sup><small><a href="#node_footnote_Temp_24">1</a></small></sup>, application expressions, <tt>if</tt> expressions, <tt>set!</tt>
-expressions, variables, non-procedure values (<i>nonproc</i>), primitive
-procedures (<i>pproc</i>), lambda expressions, <tt>letrec</tt> and <tt>letrec*</tt> expressions. </p>
-<p>
-The last few expression forms are only generated for intermediate states (<tt>dw</tt> for <tt>dynamic-wind</tt>, <tt>throw</tt> for continuations, <tt>unspecified</tt> for the result of the assignment operators, <tt>handlers</tt> for exception handlers, and <tt>l!</tt> and <tt>reinit</tt> for <tt>letrec</tt>), and should not appear in an initial program. Their use is described in the relevant sections of this appendix.</p>
-<p>
-The <i>f</i> non-terminal describes the formals for <tt>lambda</tt> expressions. (The <tt>dot</tt> is used instead of a period for procedures that accept an arbitrary number of arguments, in order to avoid meta-circular confusion in our PLT Redex model.) </p>
-<p>
-The <i>s</i> non-terminal covers all datums, which can be either non-empty sequences (<i>seq</i>), the empty sequence, self-quoting values (<i>sqv</i>), or symbols. Non-empty sequences are either just a sequence of datums, or they are terminated with a dot followed by either a symbol or a self-quoting value. Finally the self-quoting values are numbers and the booleans <tt>#t</tt> and <tt>#f</tt>.</p>
-<p>
-The <i>p</i> non-terminal represents programs that have no quoted
-data. Most of the reduction rules rewrite <i>p</i> to <i>p</i>,
-rather than <img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]"> to <img src="r6rs-Z-G-D-10.gif" border="0" alt="[r6rs-Z-G-D-10.gif]">, since quoted data is first
-rewritten into calls to the list construction functions before
-ordinary evaluation proceeds. In parallel to <i>es</i>, <i>e</i> represents
-expressions that have no quoted expressions.</p>
-<p>
-</p>
-<a name="node_fig_Temp_25"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p></p>
-<div align=center><table><tr><td>
-
-<div align=left><img src="r6rs-Z-G-11.gif" border="0" alt="[r6rs-Z-G-11.gif]"></div></td></tr><tr><td>
-<p>
-</p>
-</td></tr><tr><td>
-<p>
-</p>
-<div align=left><img src="r6rs-Z-G-12.gif" border="0" alt="[r6rs-Z-G-12.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 3:</b>&nbsp;&nbsp;Quote</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-The values (<em>v</em>) are divided into four categories:
-</p>
-<ul>
-<li><p>Non-procedures (<i>nonproc</i>) include pair pointers
-(<tt>pp</tt>), the empty list (<tt>null</tt>), symbols, self-quoting values
-(<i>sqv</i>), and conditions. Conditions represent
-the report&#8217;s condition values, but here just contain a message and
-are otherwise inert.
-</p>
-<li><p>User procedures (<tt>(</tt><tt>lambda</tt> <i>f</i> <i>e</i> <i>e</i> <tt>&middot;&middot;&middot;</tt><tt>)</tt>) include multi-arity lambda expressions and lambda expressions with dotted parameter lists,
-</p>
-<li><p>Primitive procedures (<i>pproc</i>) include</p>
-<p>
-</p>
-<ul>
-<li><p>arithmetic procedures
-(<i>aproc</i>): <tt>+</tt>, <tt>-</tt>, <tt>/</tt>, and <tt>*</tt>, 
-</p>
-<li><p>procedures of one
-argument (<i>proc1</i>): <tt>null?</tt>, <tt>pair?</tt>, <tt>car</tt>, <tt>cdr</tt>,
-<tt>call/cc</tt>, <tt>procedure?</tt>, <tt>condition?</tt>, <tt>unspecified?</tt>, <tt>raise</tt>, and <tt>raise-continuable</tt>, 
-</p>
-<li><p>procedures of
-two arguments (<i>proc2</i>): <tt>cons</tt>, <tt>set-car!</tt>, <tt>set-cdr!</tt>, <tt>eqv?</tt>,
-and <tt>call-with-values</tt>, 
-</p>
-<li><p>as well as <tt>list</tt>, <tt>dynamic-wind</tt>,
-<tt>apply</tt>, <tt>values</tt>, and <tt>with-exception-handler</tt>.
-</p>
-</ul><p>
-</p>
-<li><p>Finally, continuations are represented as <tt>throw</tt> expressions
-whose body consists of the context where the continuation was
-grabbed.
-</p>
-</ul><p>
-The next three set of non-terminals in figure&nbsp;<a href="#node_fig_Temp_22">2</a> represent pairs (<i>pp</i>), which are divided into immutable pairs (<i>ip</i>) and mutable pairs (<i>mp</i>). The final set of non-terminals in figure&nbsp;<a href="#node_fig_Temp_22">2</a>, <i>sym</i>,
-<i>x</i>, and <em>n</em> represent symbols, variables, and
-numbers respectively. The non-terminals <i>ip</i>, <i>mp</i>, and <i>sym</i> are all assumed to all be disjoint. Additionally, the variables <em>x</em> are assumed not to include any keywords or primitive operations, so any program variables whose names coincide with them must be renamed before the semantics can give the meaning of that program.</p>
-<p>
-</p>
-<a name="node_fig_Temp_26"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p></p>
-<div align=center><table><tr><td>
-
-<a name="node_idx_802"></a><a name="node_idx_804"></a><a name="node_idx_806"></a><a name="node_idx_808"></a><a name="node_idx_810"></a><div align=left><img src="r6rs-Z-G-13.gif" border="0" alt="[r6rs-Z-G-13.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 4:</b>&nbsp;&nbsp;Multiple values and call-with-values</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-The set of non-terminals for evaluation contexts is shown in
-figure&nbsp;<a href="#node_fig_Temp_23">2</a>. The <i>P</i> non-terminal controls where
-evaluation happens in a program that does not contain any quoted data.
-The <em>E</em> and <em>F</em> evaluation contexts are for expressions.  They are factored in
-that manner so that the <i>PG</i>, <i>G</i>, and <i>H</i> evaluation contexts can
-re-use <i>F</i> and have fine-grained control over the context to support
-exceptions and <tt>dynamic-wind</tt>. The starred and circled variants,
-<em>E</em><sup>&lowast;</sup>, <em>E</em><sup><small>o</small></sup>, <em>F</em><sup>&lowast;</sup>, and <em>F</em><sup><small>o</small></sup> dictate where a single value is
-promoted to multiple values and where multiple values are demoted to a
-single value. The <i>U</i> context is used to manage the report&#8217;s underspecification of the results of <tt>set!</tt>, <tt>set-car!</tt>, and <tt>set-cdr!</tt> (see section&nbsp;<a href="#node_sec_A.12">A.12</a> for details). Finally, the <i>S</i> context is where quoted expressions can be simplified. The precise use of the evaluation contexts is explained along with the relevant rules.</p>
-<p>
-To convert the answers (<img src="r6rs-Z-G-D-14.gif" border="0" alt="[r6rs-Z-G-D-14.gif]">)  of the semantics into observable results, we use these two functions:
-</p>
-<div align=left><img src="r6rs-Z-G-14.gif" border="0" alt="[r6rs-Z-G-14.gif]"></div><p>
-
-</p>
-<div align=left><img src="r6rs-Z-G-15.gif" border="0" alt="[r6rs-Z-G-15.gif]"></div><p>
-
-They eliminate the store, and replace complex values with simple tags that indicate only the kind of value that was produced or, if no values were produced, indicates that either an uncaught exception was raised, or that the program reached a state that is not specified by the semantics.</p>
-<p>
-</p>
-<a name="node_sec_A.3"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.3">A.3&nbsp;&nbsp;Quote</a></h2>
-<p></p>
-<p>
-The first reduction rules that apply to any program is the 
-rules in figure&nbsp;<a href="#node_fig_Temp_25">3</a> that eliminate quoted expressions. 
-The first two rules erase the quote for quoted expressions that do not introduce any pairs.
-The last two rules lift quoted datums to the top of the expression so
-they are evaluated only once, and turn the datums into calls to either <tt>cons</tt> or <tt>consi</tt>, via the metafunctions mathscr<em>Q</em><sub><em>i</em></sub> and mathscr<em>Q</em><sub><em>m</em></sub>.</p>
-<p>
-Note that the left-hand side of the [6qcons] and [6qconsi] rules are identical, meaning that if one rule applies to a term, so does the other rule. 
-Accordingly, a quoted expression may be lifted out into a sequence of <tt>cons</tt> expressions, which create mutable pairs, or into a sequence of <tt>consi</tt> expressions, which create immutable pairs (see section&nbsp;<a href="#node_sec_A.7">A.7</a> for the rules on how that happens).</p>
-<p>
-These rules apply before any other because of the contexts in which they, and all of the other rules, apply. In particular, these rule applies in the
-<i>S</i> context. Figure&nbsp;<a href="#node_fig_Temp_23">2</a> shows that the
-<i>S</i> context allows this reduction to apply in
-any subexpression of an <i>e</i>, as long as all of the
-subexpressions to the left have no quoted expressions in them,
-although expressions to the right may have quoted expressions.
-Accordingly, this rule applies once for each quoted expression in the
-program, moving out to the beginning of the program.
-The rest of the rules apply in contexts that do not contain any quoted
-expressions, ensuring that these rules convert all quoted data
-into lists before those rules apply.</p>
-<p>
-Although the identifier <i>qp</i> does not have a subscript, the semantics of PLT Redex&#8217;s &#8220;fresh&#8221; declaration takes special care to ensures that the <i>qp</i> on the right-hand side of the rule is indeed the same as the one in the side-condition.</p>
-<p>
-</p>
-<a name="node_fig_Temp_27"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p></p>
-<div align=center><table><tr><td>
-
-<a name="node_idx_812"></a><a name="node_idx_814"></a><a name="node_idx_816"></a><a name="node_idx_818"></a><a name="node_idx_820"></a><a name="node_idx_822"></a><a name="node_idx_824"></a><a name="node_idx_826"></a><a name="node_idx_828"></a><div align=left><img src="r6rs-Z-G-16.gif" border="0" alt="[r6rs-Z-G-16.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 5:</b>&nbsp;&nbsp;Exceptions</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-</p>
-<a name="node_sec_A.4"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.4">A.4&nbsp;&nbsp;Multiple values</a></h2>
-<p>The basic strategy for multiple values is to add a rule that demotes
-(<tt> <em>v</em><em>a</em><em>l</em><em>u</em><em>e</em><em>s</em></tt>&nbsp;<em>v</em>) to <em>v</em> and another rule that promotes
-<em>v</em> to (<tt> <em>v</em><em>a</em><em>l</em><em>u</em><em>e</em><em>s</em></tt>&nbsp;<em>v</em>). If we allowed these rules to apply
-in an arbitrary evaluation context, however, we would get infinite
-reduction sequences of endless alternation between promotion and
-demotion. So, the semantics allows demotion only in a context
-expecting a single value and allows promotion only in a context
-expecting multiple values. We obtain this behavior with a small
-extension to the Felleisen-Hieb framework (also present in the
-operational model for R<sup>5</sup>RS&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_17">17</a>]).
-We extend the notation so that
-holes have names (written with a subscript), and the context-matching
-syntax may also demand a hole of a particular name (also written with
-a subscript, for instance <em>E</em>[<em>e</em>]<sub>&lowast;</sub>).  The extension
-allows us to give different names to the holes in which multiple
-values are expected and those in which single values are expected, and
-structure the grammar of contexts accordingly.</p>
-<p>
-To exploit this extension, we use three kinds of holes in the
-evaluation context grammar in figure&nbsp;<a href="#node_fig_Temp_23">2</a>. The
-ordinary hole [&nbsp;] appears where the usual kinds of
-evaluation can occur. The hole [&nbsp;]<sub>&lowast;</sub> appears in contexts that
-allow multiple values and [&nbsp;]<sub><small>o</small></sub> appears in
-contexts that expect a single value. Accordingly, the rule
-[6promote] only applies in [&nbsp;]<sub>&lowast;</sub> contexts, and 
-[6demote] only applies in [&nbsp;]<sub><small>o</small></sub> contexts.</p>
-<p>
-To see how the evaluation contexts are organized to ensure that
-promotion and demotion occur in the right places, consider the <i>F</i>,
-<em>F</em><sup>&lowast;</sup> and <em>F</em><sup><small>o</small></sup> evaluation contexts. The <em>F</em><sup>&lowast;</sup> and <em>F</em><sup><small>o</small></sup>
-evaluation contexts are just the same as <i>F</i>, except that they allow
-promotion to multiple values and demotion to a single value,
-respectively. So, the <i>F</i> evaluation context, rather than being
-defined in terms of itself, exploits <em>F</em><sup>&lowast;</sup> and <em>F</em><sup><small>o</small></sup> to dictate
-where promotion and demotion can occur. For example, <i>F</i> can be
-<tt>(</tt><tt> <em>i</em><em>f</em></tt>&nbsp;<em>F</em><sup><small>o</small></sup>&nbsp;<em>e</em>&nbsp;<em>e</em><tt>)</tt> meaning that demotion from
-<tt>(</tt><tt> <em>v</em><em>a</em><em>l</em><em>u</em><em>e</em><em>s</em></tt>&nbsp;<em>v</em><tt>)</tt> to
-<em>v</em> can occur in the test of an <tt>if</tt> expression.
-Similarly, <em>F</em> can be <tt>(</tt><tt> <em>b</em><em>e</em><em>g</em><em>i</em><em>n</em></tt>&nbsp;<em>F</em><sup>&lowast;</sup>&nbsp;<em>e</em>&nbsp;<em>e</em>&nbsp;<tt>&middot;&middot;&middot;</tt><tt>)</tt> meaning that
-<em>v</em> can be promoted to <tt>(</tt><tt> <em>v</em><em>a</em><em>l</em><em>u</em><em>e</em><em>s</em></tt>&nbsp;<em>v</em><tt>)</tt> in the first subexpression of a <tt>begin</tt>.</p>
-<p>
-In general, the promotion and demotion rules simplify the definitions
-of the other rules. For instance, the rule for <tt>if</tt> does not
-need to consider multiple values in its first subexpression.
-Similarly, the rule for <tt>begin</tt> does not need to consider the
-case of a single value as its first subexpression.</p>
-<p>
-</p>
-<a name="node_fig_Temp_28"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p></p>
-<div align=center><table><tr><td>
-
-<a name="node_idx_830"></a><a name="node_idx_832"></a><a name="node_idx_834"></a><a name="node_idx_836"></a><a name="node_idx_838"></a><a name="node_idx_840"></a><a name="node_idx_842"></a><a name="node_idx_844"></a><a name="node_idx_846"></a><a name="node_idx_848"></a><a name="node_idx_850"></a><div align=left><img src="r6rs-Z-G-17.gif" border="0" alt="[r6rs-Z-G-17.gif]"></div></td></tr><tr><td>
-<p>
-
-<a name="node_idx_852"></a><a name="node_idx_854"></a><a name="node_idx_856"></a><a name="node_idx_858"></a><a name="node_idx_860"></a><a name="node_idx_862"></a><a name="node_idx_864"></a><a name="node_idx_866"></a></p>
-<div align=left><img src="r6rs-Z-G-18.gif" border="0" alt="[r6rs-Z-G-18.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 6:</b>&nbsp;&nbsp;Arithmetic and basic forms</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-The other two rules in
-figure&nbsp;<a href="#node_fig_Temp_26">4</a> handle
-<tt>call-with-values</tt>. The evaluation contexts for
-<tt>call-with-values</tt> (in the <em>F</em> non-terminal) allow
-evaluation in the body of a procedure that has been passed as the first
-argument to <tt>call-with-values</tt>, as long as the second argument
-has been reduced to a value. Once evaluation inside that procedure
-completes, it will produce multiple values (since it is an <em>F</em><sup>&lowast;</sup>
-position), and the entire <tt>call-with-values</tt> expression reduces
-to an application of its second argument to those values, via the rule
-[6cwvd]. Finally, in the
-case that the first argument to <tt>call-with-values</tt> is a value,
-but is not of the form <tt>(</tt><tt> <em>l</em><em>a</em><em>m</em><em>b</em><em>d</em><em>a</em></tt>&nbsp;<tt>()</tt>&nbsp;<em>e</em><tt>)</tt>, the rule
-[6cwvw] wraps it in a thunk to trigger evaluation.</p>
-<p>
-</p>
-<a name="node_fig_Temp_29"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p></p>
-<div align=center><table><tr><td>
-
-<a name="node_idx_868"></a><a name="node_idx_870"></a><a name="node_idx_872"></a><a name="node_idx_874"></a><a name="node_idx_876"></a><a name="node_idx_878"></a><a name="node_idx_880"></a><a name="node_idx_882"></a><a name="node_idx_884"></a><a name="node_idx_886"></a><a name="node_idx_888"></a><a name="node_idx_890"></a><a name="node_idx_892"></a><a name="node_idx_894"></a><a name="node_idx_896"></a><a name="node_idx_898"></a><a name="node_idx_900"></a><div align=left><img src="r6rs-Z-G-19.gif" border="0" alt="[r6rs-Z-G-19.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 7:</b>&nbsp;&nbsp;Lists</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-</p>
-<a name="node_sec_A.5"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.5">A.5&nbsp;&nbsp;Exceptions</a></h2>
-<p>The workhorses for the exception system are </p>
-<div class=mathdisplay align=left><table><tr><td><tt>(</tt><tt> <em>h</em><em>a</em><em>n</em><em>d</em><em>l</em><em>e</em><em>r</em><em>s</em></tt>&nbsp;<i>proc</i>&nbsp;<tt>&middot;&middot;&middot;</tt>&nbsp;<i>e</i><tt>)</tt></td></tr></table></div>
-<p class=noindent> expressions and the <i>G</i> and <i>PG</i> evaluation contexts (shown in figure&nbsp;<a href="#node_fig_Temp_23">2</a>). 
-The <tt>handlers</tt> expression records the
-active exception handlers (<i>proc</i> <tt>&middot;&middot;&middot;</tt>) in some expression (<i>e</i>). The
-intention is that only the nearest enclosing <tt>handlers</tt> expression
-is relevant to raised exceptions, and the <em>G</em> and <i>PG</i> evaluation
-contexts help achieve that goal. They are just like their counterparts
-<i>E</i> and <i>P</i>, except that <tt>handlers</tt> expressions cannot occur on the
-path to the hole, and the exception system rules take advantage of
-that context to find the closest enclosing handler.</p>
-<p>
-To see how the contexts work together with <tt>handler</tt>
-expressions, consider the left-hand side of the [6xunee]
-rule in figure&nbsp;<a href="#node_fig_Temp_27">5</a>.
-It matches expressions that have a call to <tt>raise</tt> or
-<tt>raise-continuable</tt> (the non-terminal <i>raise*</i> matches
-both exception-raising procedures) in a <i>PG</i>
-evaluation context. Since the <i>PG</i> context does not contain any
-<tt>handlers</tt> expressions, this exception cannot be caught, so
-this expression reduces to a final state indicating the uncaught
-exception. The rule [6xuneh] also signals an uncaught
-exception, but it covers the case where a <tt>handlers</tt> expression
-has exhausted all of the handlers available to it. The rule applies to
-expressions that have a <tt>handlers</tt> expression (with no
-exception handlers) in an arbitrary evaluation context where a call to
-one of the exception-raising functions is nested in the
-<tt>handlers</tt> expression. The use of the <i>G</i> evaluation
-context ensures that there are no other <tt>handler</tt> expressions
-between this one and the raise.</p>
-<p>
-The next two rules cover call to the procedure <tt>with-exception-handler</tt>.
-The [6xwh1] rule applies when there are no <tt>handler</tt>
-expressions. It constructs a new one and applies <i>v</i><sub>2</sub> as a
-thunk in the <tt>handler</tt> body. If there already is a handler
-expression, the [6xwhn] applies. It collects the current
-handlers and adds the new one into a new <tt>handlers</tt> expression
-and, as with the previous rule, invokes the second argument to
-<tt>with-exception-handlers</tt>.</p>
-<p>
-The next two rules cover exceptions that are raised in the context of
-a <tt>handlers</tt> expression. If a continuable exception is raised,
-[6xrc] applies. It takes the most recently installed
-handler from the nearest enclosing <tt>handlers</tt> expression and
-applies it to the argument to <tt>raise-continuable</tt>, but in a
-context where the exception handlers do not include that latest
-handler. The [6xr] rule behaves similarly, except it
-raises a new exception if the handler returns. The new exception is
-created with the <tt>make-cond</tt> special form.</p>
-<p>
-</p>
-<a name="node_fig_Temp_30"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p></p>
-<div align=center><table><tr><td>
-
-<a name="node_idx_902"></a><a name="node_idx_904"></a><a name="node_idx_906"></a><a name="node_idx_908"></a><div align=left><img src="r6rs-Z-G-20.gif" border="0" alt="[r6rs-Z-G-20.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 8:</b>&nbsp;&nbsp;Eqv</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-The <tt>make-cond</tt> special form is a stand-in for the report&#8217;s
-conditions. It does not evaluate its argument (note its absence from
-the <em>E</em> grammar in figure&nbsp;<a href="#node_fig_Temp_23">2</a>). That argument
-is just a literal string describing the context in which the exception
-was raised. The only operation on conditions is <tt>condition?</tt>,
-whose semantics are given by the two rules [6ct] and
-[6cf].</p>
-<p>
-Finally, the rule [6xdone] drops a <tt>handlers</tt> expression
-when its body is fully evaluated, and the rule [6weherr]
-raises an exception when <tt>with-exception-handler</tt> is supplied with
-incorrect arguments.</p>
-<p>
-</p>
-<a name="node_sec_A.6"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.6">A.6&nbsp;&nbsp;Arithmetic and basic forms</a></h2>
-<p>This model does not include the report&#8217;s arithmetic, but does include
-an idealized form in order to make experimentation with other features
-and writing test suites for the model simpler.
-Figure&nbsp;<a href="#node_fig_Temp_28">6</a> shows the reduction rules for the
-primitive procedures that implement addition, subtraction,
-multiplication, and division. They defer to their mathematical
-analogues. In addition, when the subtraction or divison operator are
-applied to no arguments, or when division receives a zero as a
-divisor, or when any of the arithmetic operations receive a
-non-number, an exception is raised.</p>
-<p>
-The bottom half of figure&nbsp;<a href="#node_fig_Temp_28">6</a> shows the rules for
-<tt>if</tt>, <tt>begin</tt>, and <tt>begin0</tt>. The relevant
-evaluation contexts are given by the <em>F</em> non-terminal.</p>
-<p>
-The evaluation contexts for <tt>if</tt> only allow evaluation in its
-test expression. Once that is a value, the rules reduce
-an <tt>if</tt> expression to its consequent if the test is not
-<tt>#f</tt>, and to its alternative if it is <tt>#f</tt>.</p>
-<p>
-The <tt>begin</tt> evaluation contexts allow evaluation in the first
-subexpression of a begin, but only if there are two or more
-subexpressions. In that case, once the first expression has been fully
-simplified, the reduction rules drop its value. If there is only a
-single subexpression, the <tt>begin</tt> itself is dropped.</p>
-<p>
-
-</p>
-<a name="node_fig_Temp_31"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p></p>
-<div align=center><table><tr><td>
-
-<a name="node_idx_910"></a><a name="node_idx_912"></a><a name="node_idx_914"></a><a name="node_idx_916"></a><a name="node_idx_918"></a><a name="node_idx_920"></a><a name="node_idx_922"></a><a name="node_idx_924"></a><a name="node_idx_926"></a><a name="node_idx_928"></a><a name="node_idx_930"></a><a name="node_idx_932"></a><div align=left><img src="r6rs-Z-G-21.gif" border="0" alt="[r6rs-Z-G-21.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 9:</b>&nbsp;&nbsp;Procedures &amp; application</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-Like the <tt>begin</tt> evaluation contexts, the <tt>begin0</tt>
-evaluation contexts allow evaluation of the first subexpression of a
-<tt>begin0</tt> expression when there are two or more subexpressions.
-The <tt>begin0</tt> evaluation contexts also allow evaluation in the
-second subexpression of a <tt>begin0</tt> expression, as long as the first
-subexpression has been fully simplified. The [6begin0n] rule for
-<tt>begin0</tt> then drops a fully simplified second subexpression.
-Eventually, there is only a single expression in the <tt>begin0</tt>,
-at which point the [begin01] rule fires, and removes the
-<tt>begin0</tt> expression.</p>
-<p>
-</p>
-<a name="node_sec_A.7"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.7">A.7&nbsp;&nbsp;Lists</a></h2>
-<p></p>
-<p>
-The rules in figure&nbsp;<a href="#node_fig_Temp_29">7</a> handle lists. The first two rules handle <tt>list</tt> by reducing it to a succession of calls to <tt>cons</tt>, followed by <tt>null</tt>.</p>
-<p>
-The next two rules, [6cons] and [6consi], allocate new <tt>cons</tt> cells.
-They both move <tt>(</tt><tt> <em>c</em><em>o</em><em>n</em><em>s</em></tt>&nbsp;<em>v</em><sub>1</sub>&nbsp;<em>v</em><sub>2</sub><tt>)</tt> into the store, bound to a fresh
-pair pointer (see also section&nbsp;<a href="#node_sec_A.3">A.3</a> for a description of &#8220;fresh&#8221;). 
-The [6cons] uses a <i>mp</i> variable, to indicate the pair is mutable, and the [6consi] uses a <i>ip</i> variable to indicate the pair is immutable.</p>
-<p>
-The rules [6car] and [6cdr] extract the components of a pair from the store when presented with a pair pointer (the <i>pp</i> can be either <i>mp</i> or <i>ip</i>, as shown in figure&nbsp;<a href="#node_fig_Temp_22">2</a>).</p>
-<p>
-The rules [6setcar] and [6setcdr] handle assignment of mutable pairs. 
-They replace the contents of the appropriate location in the store with the new value, and reduce to <tt>unspecified</tt>. See section&nbsp;<a href="#node_sec_A.12">A.12</a> for an explanation of how <tt>unspecified</tt> reduces.</p>
-<p>
-</p>
-<a name="node_fig_Temp_32"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p>
-</p>
-<div align=center><table><tr><td>
-
-<div align=left><img src="r6rs-Z-G-22.gif" border="0" alt="[r6rs-Z-G-22.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 9:</b>&nbsp;&nbsp;Variable-assignment relation</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-The next four rules handle the <tt>null?</tt> predicate and the <tt>pair?</tt> predicate, and the final four rules raise exceptions when <tt>car</tt>, <tt>cdr</tt>, <tt>set-car!</tt> or <tt>set-cdr!</tt> receive non pairs.</p>
-<p>
-</p>
-<a name="node_sec_A.8"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.8">A.8&nbsp;&nbsp;Eqv</a></h2>
-<p>The rules for <tt>eqv?</tt> are shown in figure&nbsp;<a href="#node_fig_Temp_30">8</a>. The first two rules cover most of the behavior of <tt>eqv?</tt>. 
-The first says that when the two arguments to <tt>eqv?</tt> are syntactically identical, then <tt>eqv?</tt> produces <tt>#t</tt> and the second says that when the arguments are not syntactically identical, then <tt>eqv?</tt> produces <tt>#f</tt>. 
-The structure of <i>v</i> has been carefully designed so that simple term equality corresponds closely to <tt>eqv?</tt>&#8217;s behavior. 
-For example, pairs are represented as pointers into the store and <tt>eqv?</tt> only compares those pointers.</p>
-<p>
-The side-conditions on those first two rules ensure that they do not apply when simple term equality does not match the behavior of <tt>eqv?</tt>. There are two situations where it does not match: comparing two conditions and comparing two procedures. For the first, the report does not specify <tt>eqv?</tt>&#8217;s behavior, except to say that it must return a boolean, so the remaining two rules ([6eqct], and [6eqcf]) allow such comparisons to return <tt>#t</tt> or <tt>#f</tt>. Comparing two procedures is covered in section&nbsp;<a href="#node_sec_A.12">A.12</a>. </p>
-<p>
-</p>
-<a name="node_sec_A.9"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.9">A.9&nbsp;&nbsp;Procedures and application</a></h2>
-<p>In evaluating a procedure call, the report leaves
-unspecified the order in which arguments are evaluated. So, our reduction system allows multiple, different reductions to occur, one for each possible order of evaluation.</p>
-<p>
-To capture unspecified evaluation order but allow only evaluation that
-is consistent with some sequential ordering of the evaluation of an
-application&#8217;s subexpressions, we use non-deterministic choice to first pick
-a subexpression to reduce only when we have not already committed to
-reducing some other subexpression. To achieve that effect, we limit
-the evaluation of application expressions to only those that have a
-single expression that is not fully reduced, as shown in the
-non-terminal <em>F</em>, in figure&nbsp;<a href="#node_fig_Temp_23">2</a>. To evaluate
-application expressions that have more than two arguments to evaluate,
-the rule [6mark] picks one of the subexpressions of an
-application that is not fully simplified and lifts it out in its own
-application, allowing it to be evaluated. Once one of the lifted
-expressions is evaluated, the [6appN] substitutes its value
-back into the original application.</p>
-<p>
-The [6appN] rule also handles other applications whose
-arguments are finished by substituting the first argument for
-the first formal parameter in the expression. Its side-condition uses
-the relation in figure&nbsp;<a href="#node_fig_Temp_32">9</a> to ensure that there are no
-<tt>set!</tt> expressions with the parameter <em>x</em><sub>1</sub> as a target.
-If there is such an assignment, the [6appN!] rule applies (see also section&nbsp;<a href="#node_sec_A.3">A.3</a> for a description of &#8220;fresh&#8221;).
-Instead of directly substituting the actual parameter for the formal
-parameter, it creates a new location in the store, initially bound the
-actual parameter, and substitutes a variable standing for that
-location in place of the formal parameter. The store, then, handles
-any eventual assignment to the parameter. Once all of the parameters
-have been substituted away, the rule [6app0] applies and
-evaluation of the body of the procedure begins.</p>
-<p>
-At first glance, the rule [6appN] appears superfluous, since it seems like the rules could just reduce first by [6appN!] and then look up the variable when it is evaluated. 
-There are two reasons why we keep the [6appN], however. 
-The first is purely conventional: reducing applications via substitution is taught to us at an early age and is commonly used in rewriting systems in the literature.
-The second reason is more technical:  the
-[6mark] rule requires that [6appN] be applied once <i>e</i><sub><em>i</em></sub> has been reduced to a value. [6appN!] would
-lift the value into the store and put a variable reference into the application, leading to another use of [6mark], and another use of [6appN!], which continues forever.</p>
-<p>
-The rule [6&mu;app] handles a well-formed application of a function with a dotted parameter lists. 
-It such an application into an application of an
-ordinary procedure by constructing a list of the extra arguments. Similarly, the rule [6&mu;app1] handles an application of a procedure that has a single variable as its parameter list.</p>
-<p>
-The rule [6var] handles variable lookup in the store and [6set] handles variable assignment.</p>
-<p>
-The next two rules [6proct] and [6procf] handle applications of <tt>procedure?</tt>, and the remaining rules cover applications of non-procedures and arity violations.</p>
-<p>
-</p>
-<a name="node_fig_Temp_33"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p>
-</p>
-<div align=center><table><tr><td>
-
-<a name="node_idx_934"></a><a name="node_idx_936"></a><a name="node_idx_938"></a><a name="node_idx_940"></a><a name="node_idx_942"></a><a name="node_idx_944"></a><a name="node_idx_946"></a><a name="node_idx_948"></a><div align=left><img src="r6rs-Z-G-23.gif" border="0" alt="[r6rs-Z-G-23.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-<div align=left><img src="r6rs-Z-G-24.gif" border="0" alt="[r6rs-Z-G-24.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 9:</b>&nbsp;&nbsp;Apply</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-The rules in figure&nbsp;<a href="#node_fig_Temp_33">9</a> 
-cover <tt>apply</tt>. 
-The first rule, [6applyf], covers the case where the last argument to
-<tt>apply</tt> is the empty list, and simply reduces by erasing the
-empty list and the <tt>apply</tt>. The second rule, [6applyc]
-covers a well-formed application of <tt>apply</tt> where <tt>apply</tt>&#8217;s final argument is a pair. It
-reduces by extracting the components of the pair from the store and
-putting them into the application of <tt>apply</tt>. Repeated
-application of this rule thus extracts all of the list elements passed
-to <tt>apply</tt> out of the store. </p>
-<p>
-The remaining five rules cover the
-various violations that can occur when using <tt>apply</tt>. The first one covers the case where <tt>apply</tt> is supplied with a cyclic list. The next four cover applying a
-non-procedure, passing a non-list as the last argument, and supplying
-too few arguments to <tt>apply</tt>.</p>
-<p>
-</p>
-<a name="node_sec_A.10"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.10">A.10&nbsp;&nbsp;Call/cc and dynamic wind</a></h2>
-<p></p>
-<a name="node_fig_Temp_34"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p></p>
-<div align=center><table><tr><td>
-
-<a name="node_idx_950"></a><a name="node_idx_952"></a><a name="node_idx_954"></a><a name="node_idx_956"></a><a name="node_idx_958"></a><a name="node_idx_960"></a><a name="node_idx_962"></a><div align=left><img src="r6rs-Z-G-25.gif" border="0" alt="[r6rs-Z-G-25.gif]"></div></td></tr><tr><td>
-<p>
- <br>
-</p>
-<div align=left><img src="r6rs-Z-G-26.gif" border="0" alt="[r6rs-Z-G-26.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 10:</b>&nbsp;&nbsp;Call/cc and dynamic wind</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-The specification of <tt>dynamic-wind</tt> uses 
-<tt>(</tt><tt> <em>d</em><em>w</em></tt>&nbsp;<em>x</em>&nbsp;<em>e</em>&nbsp;<em>e</em>&nbsp;<em>e</em><tt>)</tt>
-expressions to record which dynamic-wind <i>thunk</i>s are active at
-each point in the computation. Its first argument is an identifier
-that is globally unique and serves to identify invocations of
-<tt>dynamic-wind</tt>, in order to avoid exiting and re-entering the
-same dynamic context during a continuation switch. The second, third,
-and fourth arguments are calls to some <i>before</i>, <i>thunk</i>, and
-<i>after</i> procedures from a call to <tt>dynamic-wind</tt>. Evaluation only
-occurs in the middle expression; the <tt>dw</tt> expression only
-serves to record which <i>before</i> and <i>after</i> procedures need to be run during a
-continuation switch. Accordingly, the reduction rule for an
-application of <tt>dynamic-wind</tt> reduces to a call to the
-<i>before</i> procedure, a <tt>dw</tt> expression and a call to the
-<i>after</i> procedure, as
-shown in rule [6wind] in
-figure&nbsp;<a href="#node_fig_Temp_34">10</a>. The next two rules cover
-abuses of the <tt>dynamic-wind</tt> procedure: calling it with
-non-procedures, and calling it with the wrong number of arguments. The
-[6dwdone] rule erases a <tt>dw</tt> expression when its second
-argument has finished evaluating.</p>
-<p>
-The next two rules cover <tt>call/cc</tt>. The rule
-[6call/cc] creates a new continuation. It takes the context
-of the <tt>call/cc</tt> expression and packages it up into a
-<tt>throw</tt> expression that represents the continuation. The
-<tt>throw</tt> expression uses the fresh variable <em>x</em> to record
-where the application of <tt>call/cc</tt> occurred in the context for
-use in the [6throw] rule when the continuation is applied.
-That rule takes the arguments of the continuation, wraps them with a
-call to <tt>values</tt>, and puts them back into the place where the
-original call to <tt>call/cc</tt> occurred, replacing the current
-context with the context returned by the mathscr<em>T</em> metafunction.</p>
-<p>
-The mathscr<em>T</em> (for &#8220;trim&#8221;) metafunction accepts two <em>D</em> contexts and
-builds a context that matches its second argument, the destination
-context, except that additional calls to the <i>before</i> and
-<i>after</i> procedures
-from <tt>dw</tt> expressions in the context have been added.</p>
-<p>
-The first clause of the mathscr<em>T</em> metafunction exploits the
-<em>H</em> context, a context that contains everything except
-<tt>dw</tt> expressions. It ensures that shared parts of the
-<tt>dynamic-wind</tt> context are ignored, recurring deeper into the
-two expression contexts as long as the first <tt>dw</tt> expression in
-each have matching identifiers (<em>x</em><sub>1</sub>). The final rule is a
-catchall; it only applies when all the others fail and thus applies
-either when there are no <tt>dw</tt>s in the context, or when the
-<tt>dw</tt> expressions do not match. It calls the two other
-metafunctions defined in figure&nbsp;<a href="#node_fig_Temp_34">10</a> and
-puts their results together into a <tt>begin</tt> expression.</p>
-<p>
-The mathscr<em>R</em> metafunction extracts all of the <i>before</i>
-procedures from its argument and the mathscr<em>S</em> metafunction extracts all of the <i>after</i> procedures from its argument. They each construct new contexts and exploit
-<em>H</em> to work through their arguments, one <tt>dw</tt> at a time.
-In each case, the metafunctions are careful to keep the right
-<tt>dw</tt> context around each of the procedures in case a continuation
-jump occurs during one of their evaluations. 
-Since mathscr<em>R</em>,
-receives the destination context, it keeps the intermediate
-parts of the context in its result.
-In contrast
-mathscr<em>S</em> discards all of the context except the <tt>dw</tt>s,
-since that was the context where the call to the
-continuation occurred.</p>
-<p>
-</p>
-<a name="node_sec_A.11"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.11">A.11&nbsp;&nbsp;Letrec</a></h2>
-<p></p>
-<a name="node_fig_Temp_35"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p></p>
-<div align=center><table><tr><td>
-
-<a name="node_idx_964"></a><a name="node_idx_966"></a><a name="node_idx_968"></a><a name="node_idx_970"></a><div align=left><img src="r6rs-Z-G-27.gif" border="0" alt="[r6rs-Z-G-27.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 11:</b>&nbsp;&nbsp;Letrec and letrec*</td></tr>
-<tr><td>
-
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-Figre&nbsp;<a href="#node_fig_Temp_35">11</a> shows the rules that handle <tt>letrec</tt> and <tt>letrec*</tt> and the supplementary expressions that they produce, <tt>l!</tt> and <tt>reinit</tt>. As a first approximation, both <tt>letrec</tt> and <tt>letrec*</tt> reduce by allocating locations in the store to hold the values of the init expressions, initializing those locations to <tt>bh</tt> (for &#8220;black hole&#8221;), evaluating the init expressions, and then using <tt>l!</tt> to update the locations in the store with the value of the init expressions. They also use <tt>reinit</tt> to detect when an init expression in a letrec is reentered via a continuation.</p>
-<p>
-Before considering how <tt>letrec</tt> and <tt>letrec*</tt> use <tt>l!</tt> and <tt>reinit</tt>, first consider how <tt>l!</tt> and <tt>reinit</tt> behave. The first two rules in figure&nbsp;<a href="#node_fig_Temp_35">11</a> cover <tt>l!</tt>. It behaves very much like <tt>set!</tt>, but it initializes both ordinary variables, and variables that are current bound to the black hole (<tt>bh</tt>).</p>
-<p>
-The next two rules cover ordinary <tt>set!</tt> when applied to a variable
-that is currently bound to a black hole. This situation can arise when
-the program assigns to a variable before letrec initializes it, eg
-<code class=verbatim>(letrec ((x (set! x 5))) x)</code>. The report specifies that either
-an implementation should perform the assignment, as reflected in the
-[6setdt] rule or it raise an exception, as reflected in the [6setdte] rule.</p>
-<p>
-The [6dt] rule covers the case where a variable is referred
-to before the value of a init expression is filled in, which must
-always raise an exception.</p>
-<p>
-A <tt>reinit</tt> expression is used to detect a program that captures a continuation in an initialization expression and returns to it, as shown in the three rules [6init], [6reinit], and [6reinite]. The <tt>reinit</tt> form accepts an identifier that is bound in the store to a boolean as its argument. Those are identifiers are initially <tt>#f</tt>. When <tt>reinit</tt> is evaluated, it checks the value of the variable and, if it is still <tt>#f</tt>, it changes it to <tt>#t</tt>. If it is already <tt>#t</tt>, then <tt>reinit</tt> either just does nothing, or it raises an exception, in keeping with the two legal behaviors of <tt>letrec</tt> and <tt>letrec*</tt>. </p>
-<p>
-The last two rules in figure&nbsp;<a href="#node_fig_Temp_35">11</a> put together <tt>l!</tt> and <tt>reinit</tt>. The [6letrec] rule reduces a <tt>letrec</tt> expression to an application expression, in order to capture the unspecified order of evaluation of the init expressions. Each init expression is wrapped in a <tt>begin0</tt> that records the value of the init and then uses <tt>reinit</tt> to detect continuations that return to the init expression. Once all of the init expressions have been evaluated, the procedure on the right-hand side of the rule is invoked, causing the value of the init expression to be filled in the store, and evaluation continues with the body of the original <tt>letrec</tt> expression.</p>
-<p>
-The [6letrec*] rule behaves similarly, but uses a <tt>begin</tt> expression rather than an application, since the init expressions are evaluated from left to right. Moreover, each init expression is filled into the store as it is evaluated, so that subsequent init expressions can refer to its value.</p>
-<p>
-</p>
-<a name="node_sec_A.12"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_A.12">A.12&nbsp;&nbsp;Underspecification</a></h2>
-<p></p>
-<p>
-</p>
-<a name="node_fig_Temp_36"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<p class=noindent></p>
-<p></p>
-<div align=center><table><tr><td>
-
-<a name="node_idx_972"></a><a name="node_idx_974"></a><a name="node_idx_976"></a><a name="node_idx_978"></a><a name="node_idx_980"></a><a name="node_idx_982"></a><a name="node_idx_984"></a><a name="node_idx_986"></a><a name="node_idx_988"></a><div align=left><img src="r6rs-Z-G-28.gif" border="0" alt="[r6rs-Z-G-28.gif]"></div></td></tr><tr><td>
-<p>
-
-</p>
-</td></tr></table></div>
-
-</td></tr>
-<tr><td align=left><b>Figure 12:</b>&nbsp;&nbsp;Explicitly unspecified behavior</td></tr>
-<tr><td>
-
-<p class=noindent></p>
-<p></p>
-</td></tr></table></div><p></p>
-<p>
-The rules in figure&nbsp;<a href="#node_fig_Temp_36">12</a> cover aspects of the
-semantics that are explicitly unspecified. Implementations can replace
-the rules [6ueqv], [6uval] and with different rules that cover the left-hand sides and, as long as they follow the informal specification, any replacement is valid. Those three situations correspond to the case when <tt>eqv?</tt> applied to two procedures and when multiple values are used in a single-value context.</p>
-<p>
-The remaining rules in figure&nbsp;<a href="#node_fig_Temp_36">12</a> cover the results from the assignment operations, <tt>set!</tt>, <tt>set-car!</tt>, and <tt>set-cdr!</tt>. An implementation does not adjust those rules, but instead renders them useless by adjusting the rules that insert <tt>unspecified</tt>: [6setcar], [6setcdr], [6set], and [6setd]. Those rules can be adjusted by replacing <tt>unspecified</tt> with any number of values in those rules.</p>
-<p>
-So, the remaining rules just specify the minimal behavior that we know that a value or values must have and otherwise reduce to an <b>unknown:</b> state. The rule [6udemand] drops <tt>unspecified</tt> in the <tt>U</tt> context. See figure&nbsp;<a href="#node_fig_Temp_23">2</a> for the precise definition of <tt>U</tt>, but intuitively it is a context that is only a single expression layer deep that contains expressions whose value depends on the value of their subexpressions, like the first subexpression of a <tt>if</tt>. Following that are rules that discard <tt>unspecified</tt> in expressions that discard the results of some of their subexpressions. The [6ubegin] shows how <tt>begin</tt> discards its first expression when there are more expressions to evaluate. The next two rules, [6uhandlers] and [6udw] propagate <tt>unspecified</tt> to their context, since they also return any number of values to their context. Finally, the two <tt>begin0</tt> rules preserve <tt>unspecified</tt> until the rule [6begin01] can return it to its context.</p>
-<p>
-</p>
-<p>
- </p>
-<p></p>
-<div class=footnoterule><hr></div><p></p>
-<div class=footnote><p><a name="node_footnote_Temp_24"></a><sup><small><a href="#node_call_footnote_Temp_24">1</a></small></sup>  <tt>begin0</tt> is not part of the standard, but we include it
-to make the rules for <tt>dynamic-wind</tt> and <tt>letrec</tt> easier to read. Although
-we model it directly, it can be defined in terms of other forms we
-model here that do come from the standard:
-</p>
-<div align=left><img src="r6rs-Z-G-10.gif" border="0" alt="[r6rs-Z-G-10.gif]"></div><p>
-</p>
-</div>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-14.html">previous</a></span><span>, <a href="r6rs-Z-H-16.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-16.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-16.html
deleted file mode 100644
index 57704836c8..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-16.html
+++ /dev/null
@@ -1,317 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-15.html">previous</a></span><span>, <a href="r6rs-Z-H-17.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_B"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_B">Appendix B</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_B">Sample definitions for derived forms</a></h1>
-<p></p>
-<p>
-This appendix contains sample definitions for some of the keywords
-described in this report in terms of simpler forms:</p>
-<p>
-</p>
-<a name="node_sec_Temp_37"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_37"><tt>cond</tt></a></h4>
-<p>The <tt>cond</tt> keyword (section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.4.5">11.4.5</a>) 
-could be defined in terms of <tt>if</tt>, <tt>let</tt> and <tt>begin</tt> using <tt>syntax-rules</tt> as follows:</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;<tt>cond</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;(else&nbsp;=&gt;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(else&nbsp;result1&nbsp;result2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;result1&nbsp;result2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test&nbsp;=&gt;&nbsp;result))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((temp&nbsp;test))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;temp&nbsp;(result&nbsp;temp))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test&nbsp;=&gt;&nbsp;result)&nbsp;clause1&nbsp;clause2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((temp&nbsp;test))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;temp<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(result&nbsp;temp)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond&nbsp;clause1&nbsp;clause2&nbsp;...))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test))&nbsp;test)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test)&nbsp;clause1&nbsp;clause2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((temp&nbsp;test))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;temp<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;temp<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond&nbsp;clause1&nbsp;clause2&nbsp;...))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test&nbsp;result1&nbsp;result2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;test&nbsp;(begin&nbsp;result1&nbsp;result2&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((cond&nbsp;(test&nbsp;result1&nbsp;result2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clause1&nbsp;clause2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;test<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(begin&nbsp;result1&nbsp;result2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond&nbsp;clause1&nbsp;clause2&nbsp;...)))))<p></tt>
-</p>
-<a name="node_sec_Temp_38"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_38"><tt>case</tt></a></h4>
-<p>The <tt>case</tt> keyword (section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.4.5">11.4.5</a>) could be defined in terms of <tt>let</tt>, <tt>cond</tt>, and
-<tt>memv</tt> (see library chapter&nbsp;on &#8220;List utilities&#8221;) using <tt>syntax-rules</tt> as follows:</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;<tt>case</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;(else)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((case&nbsp;expr0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((key&nbsp;...)&nbsp;res1&nbsp;res2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;else-res1&nbsp;else-res2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((tmp&nbsp;expr0))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((memv&nbsp;tmp&nbsp;&#8217;(key&nbsp;...))&nbsp;res1&nbsp;res2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;else-res1&nbsp;else-res2&nbsp;...))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((case&nbsp;expr0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((keya&nbsp;...)&nbsp;res1a&nbsp;res2a&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((keyb&nbsp;...)&nbsp;res1b&nbsp;res2b&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((tmp&nbsp;expr0))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((memv&nbsp;tmp&nbsp;&#8217;(keya&nbsp;...))&nbsp;res1a&nbsp;res2a&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((memv&nbsp;tmp&nbsp;&#8217;(keyb&nbsp;...))&nbsp;res1b&nbsp;res2b&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...)))))<p></tt></p>
-<p>
-</p>
-<a name="node_sec_Temp_39"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_39"><tt>let*</tt></a></h4>
-<p>The <tt>let*</tt> keyword (section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.4.6">11.4.6</a>)
-could be defined in terms of <tt>let</tt>
-using <tt>syntax-rules</tt> as follows:</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;<tt>let*</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let*&nbsp;()&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;()&nbsp;body1&nbsp;body2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let*&nbsp;((name1&nbsp;expr1)&nbsp;(name2&nbsp;expr2)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((name1&nbsp;expr1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let*&nbsp;((name2&nbsp;expr2)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)))))<p></tt></p>
-<p>
-</p>
-<a name="node_sec_Temp_40"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_40"><tt>letrec</tt></a></h4>
-<p>The <tt>letrec</tt> keyword (section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.4.6">11.4.6</a>)
-could be defined approximately in terms of <tt>let</tt>
-and <tt>set!</tt> using <tt>syntax-rules</tt>, using a helper
-to generate the temporary variables
-needed to hold the values before the assignments are made,
-as follows:</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;<tt>letrec</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((letrec&nbsp;()&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;()&nbsp;body1&nbsp;body2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((letrec&nbsp;((var&nbsp;init)&nbsp;...)&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec-helper<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(var&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((var&nbsp;init)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...))))<br>
-<br>
-(define-syntax&nbsp;letrec-helper<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((letrec-helper<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(temp&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((var&nbsp;init)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((var&nbsp;&lt;undefined&gt;)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((temp&nbsp;init)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;var&nbsp;temp)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;()&nbsp;body1&nbsp;body2&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((letrec-helper<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(x&nbsp;y&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(temp&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((var&nbsp;init)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec-helper<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(y&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(newtemp&nbsp;temp&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((var&nbsp;init)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...))))<p></tt></p>
-<p>
-The syntax <tt>&lt;undefined&gt;</tt> represents an expression that
-returns something that, when stored in a location, causes an exception
-with condition type <tt>&amp;assertion</tt> to
-be raised if an attempt to read from or write to the location occurs before the
-assignments generated by the <tt>letrec</tt> transformation take place.
-(No such expression is defined in Scheme.)</p>
-<p>
-A simpler definition using <tt>syntax-case</tt> and <tt>generate-temporaries</tt> is given in library
-chapter&nbsp;on &#8220;<tt>syntax-case</tt>&#8221;.</p>
-<p>
-</p>
-<a name="node_sec_Temp_41"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_41"><tt>letrec*</tt></a></h4>
-<p>The <tt>letrec*</tt> keyword could be defined approximately in terms of
-<tt>let</tt> and <tt>set!</tt>  using <tt>syntax-rules</tt> as follows:</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;<tt>letrec*</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((letrec*&nbsp;((var1&nbsp;init1)&nbsp;...)&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((var1&nbsp;&lt;undefined&gt;)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;var1&nbsp;init1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;()&nbsp;body1&nbsp;body2&nbsp;...)))))<p></tt></p>
-<p>
-The syntax <tt>&lt;undefined&gt;</tt> is as in the definition of <tt>letrec</tt> above.</p>
-<p>
-</p>
-<a name="node_sec_Temp_42"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_42"><tt>let-values</tt></a></h4>
-<p>The following definition of <tt>let-values</tt> (section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.4.6">11.4.6</a>)
-using <tt>syntax-rules</tt>
-employs a pair of helpers to
-create temporary names for the formals.</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;let-values<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let-values&nbsp;(binding&nbsp;...)&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let-values-helper1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(binding&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...))))<br>
-<br>
-(define-syntax&nbsp;let-values-helper1<br>
-&nbsp;&nbsp;;;&nbsp;map&nbsp;over&nbsp;the&nbsp;bindings<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let-values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((id&nbsp;temp)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((id&nbsp;temp)&nbsp;...)&nbsp;body1&nbsp;body2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let-values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;assocs<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((formals1&nbsp;expr1)&nbsp;(formals2&nbsp;expr2)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let-values-helper2<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;formals1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;expr1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;assocs<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((formals2&nbsp;expr2)&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...))))<br>
-<br>
-(define-syntax&nbsp;let-values-helper2<br>
-&nbsp;&nbsp;;;&nbsp;create&nbsp;temporaries&nbsp;for&nbsp;the&nbsp;formals<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let-values-helper2<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;temp-formals<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;expr1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;assocs<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bindings<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(call-with-values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;expr1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;temp-formals<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let-values-helper1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;assocs<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bindings<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let-values-helper2<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(first&nbsp;.&nbsp;rest)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(temp&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;expr1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(assoc&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bindings<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let-values-helper2<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rest<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(temp&nbsp;...&nbsp;newtemp)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;expr1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(assoc&nbsp;...&nbsp;(first&nbsp;newtemp))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bindings<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let-values-helper2<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rest-formal<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(temp&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;expr1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(assoc&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bindings<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(call-with-values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;expr1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(temp&nbsp;...&nbsp;.&nbsp;newtemp)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let-values-helper1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(assoc&nbsp;...&nbsp;(rest-formal&nbsp;newtemp))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bindings<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...))))))<p></tt></p>
-<p>
-</p>
-<a name="node_sec_Temp_43"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_43"><tt>let*-values</tt></a></h4>
-<p>The following macro defines <tt>let*-values</tt> in terms of <tt>let</tt>
-and <tt>let-values</tt> using <tt>syntax-rules</tt>:</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;let*-values<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let*-values&nbsp;()&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;()&nbsp;body1&nbsp;body2&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let*-values&nbsp;(binding1&nbsp;binding2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let-values&nbsp;(binding1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let*-values&nbsp;(binding2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)))))<p></tt></p>
-<p>
-</p>
-<a name="node_sec_Temp_44"></a>
-<h4 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_44"><tt>let</tt></a></h4>
-<p>The <tt>let</tt> keyword could be defined in terms of <tt>lambda</tt> and <tt>letrec</tt>
-using <tt>syntax-rules</tt> as
-follows:</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;<tt>let</tt><br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let&nbsp;((name&nbsp;val)&nbsp;...)&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((lambda&nbsp;(name&nbsp;...)&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;val&nbsp;...))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((let&nbsp;tag&nbsp;((name&nbsp;val)&nbsp;...)&nbsp;body1&nbsp;body2&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;((letrec&nbsp;((tag&nbsp;(lambda&nbsp;(name&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body1&nbsp;body2&nbsp;...)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tag)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;val&nbsp;...))))<p></tt></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-15.html">previous</a></span><span>, <a href="r6rs-Z-H-17.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-17.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-17.html
deleted file mode 100644
index db3a681dfd..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-17.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-16.html">previous</a></span><span>, <a href="r6rs-Z-H-18.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_C"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_C">Appendix C</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_C">Additional material</a></h1>
-<p></p>
-<p>
-This report itself, as well as more material related to this report
-such as reference implementations of some parts of Scheme and archives of
-mailing lists discussing this report is at
-</p>
-<div align=center><table><tr><td>
-
-<a href="http://www.r6rs.org/">http://www.r6rs.org/</a>
-</td></tr></table></div>
-<p>
-The Schemers web site at
-</p>
-<div align=center><table><tr><td>
-
-<a href="http://www.schemers.org/">http://www.schemers.org/</a>
-</td></tr></table></div>
-
-as well as the Readscheme site at
-<div align=center><table><tr><td>
-
-<a href="http://library.readscheme.org/">http://library.readscheme.org/</a>
-</td></tr></table></div>
-
-contain extensive Scheme bibliographies, as well as papers,
-programs, implementations, and other material related to Scheme.<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-16.html">previous</a></span><span>, <a href="r6rs-Z-H-18.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-18.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-18.html
deleted file mode 100644
index 49049681de..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-18.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-17.html">previous</a></span><span>, <a href="r6rs-Z-H-19.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_D"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_D">Appendix D</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_D">Example </a></h1>
-<p></p>
-<p>
-This section describes an example consisting of the
-<tt>(runge-kutta)</tt> library, which provides an <tt>integrate-system</tt>
-procedure that integrates the system 
-</p>
-<div class=mathdisplay align=left><table><tr><td><em>y</em><sub><em>k</em></sub><sup>&frasl;</sup>  =  <em>f</em><sub><em>k</em></sub>(<em>y</em><sub>1</sub>, <em>y</em><sub>2</sub>, <tt>...</tt>, <em>y</em><sub><em>n</em></sub>),   <em>k</em>  =  1, <tt>...</tt>, <em>n</em></td></tr></table></div>
-<p class=noindent>
-of differential equations with the method of Runge-Kutta.</p>
-<p>
-As the <tt>(runge-kutta)</tt> library makes use of the <tt>(rnrs base (6))</tt>
-library, its skeleton is as follows:</p>
-<p>
-</p>
-
-<tt>#!r6rs<br>
-(library&nbsp;(runge-kutta)<br>
-&nbsp;&nbsp;(export&nbsp;integrate-system<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;head&nbsp;tail)<br>
-&nbsp;&nbsp;(import&nbsp;(rnrs&nbsp;base))<br>
-&nbsp;&nbsp;&lt;library&nbsp;body&gt;)<br>
-<p></tt></p>
-<p>
-The procedure definitions described below go in the place of &lt;library body&gt;.</p>
-<p>
-The parameter <tt>system-derivative</tt> is a function that takes a system
-state (a vector of values for the state variables <em>y</em><sub>1</sub>, <tt>...</tt>, <em>y</em><sub><em>n</em></sub>)
-and produces a system derivative (the values <em>y</em><sub>1</sub><sup>&frasl;</sup>, <tt>...</tt>,
-<em>y</em><sub><em>n</em></sub><sup>&frasl;</sup>).  The parameter <tt>initial-state</tt> provides an initial
-system state, and <tt>h</tt> is an initial guess for the length of the
-integration step.</p>
-<p>
-The value returned by <tt>integrate-system</tt> is an infinite stream of
-system states.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;integrate-system<br>
-&nbsp;&nbsp;(lambda&nbsp;(system-derivative&nbsp;initial-state&nbsp;h)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((next&nbsp;(runge-kutta-4&nbsp;system-derivative&nbsp;h)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec&nbsp;((states<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;initial-state<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(map-streams&nbsp;next&nbsp;states)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;states))))<p></tt></p>
-<p>
-The <tt>runge-kutta-4</tt> procedure takes a function, <tt>f</tt>, that produces a
-system derivative from a system state.  The <tt>runge-kutta-4</tt> procedure
-produces a function that takes a system state and
-produces a new system state.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;runge-kutta-4<br>
-&nbsp;&nbsp;(lambda&nbsp;(f&nbsp;h)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((*h&nbsp;(scale-vector&nbsp;h))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*2&nbsp;(scale-vector&nbsp;2))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*1/2&nbsp;(scale-vector&nbsp;(/&nbsp;1&nbsp;2)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*1/6&nbsp;(scale-vector&nbsp;(/&nbsp;1&nbsp;6))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;y&nbsp;is&nbsp;a&nbsp;system&nbsp;state<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let*&nbsp;((k0&nbsp;(*h&nbsp;(f&nbsp;y)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(k1&nbsp;(*h&nbsp;(f&nbsp;(add-vectors&nbsp;y&nbsp;(*1/2&nbsp;k0)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(k2&nbsp;(*h&nbsp;(f&nbsp;(add-vectors&nbsp;y&nbsp;(*1/2&nbsp;k1)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(k3&nbsp;(*h&nbsp;(f&nbsp;(add-vectors&nbsp;y&nbsp;k2)))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(add-vectors&nbsp;y<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*1/6&nbsp;(add-vectors&nbsp;k0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*2&nbsp;k1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*2&nbsp;k2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;k3))))))))<br>
-<br>
-<br>
-(define&nbsp;elementwise<br>
-&nbsp;&nbsp;(lambda&nbsp;(f)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;vectors<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(generate-vector<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(vector-length&nbsp;(car&nbsp;vectors))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(i)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(apply&nbsp;f<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(map&nbsp;(lambda&nbsp;(v)&nbsp;(vector-ref&nbsp;&nbsp;v&nbsp;i))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vectors)))))))<br>
-<br>
-(define&nbsp;generate-vector<br>
-&nbsp;&nbsp;(lambda&nbsp;(size&nbsp;proc)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((ans&nbsp;(make-vector&nbsp;size)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(letrec&nbsp;((loop<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(i)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond&nbsp;((=&nbsp;i&nbsp;size)&nbsp;ans)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(vector-set!&nbsp;ans&nbsp;i&nbsp;(proc&nbsp;i))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;(+&nbsp;i&nbsp;1)))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;0)))))<br>
-<br>
-(define&nbsp;add-vectors&nbsp;(elementwise&nbsp;+))<br>
-<br>
-(define&nbsp;scale-vector<br>
-&nbsp;&nbsp;(lambda&nbsp;(s)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(elementwise&nbsp;(lambda&nbsp;(x)&nbsp;(*&nbsp;x&nbsp;s)))))<p></tt></p>
-<p>
-The <tt>map-streams</tt> procedure is analogous to <tt>map</tt>: it applies its first
-argument (a procedure) to all the elements of its second argument (a
-stream).</p>
-<p>
-</p>
-
-<tt>(define&nbsp;map-streams<br>
-&nbsp;&nbsp;(lambda&nbsp;(f&nbsp;s)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;(f&nbsp;(head&nbsp;s))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;()&nbsp;(map-streams&nbsp;f&nbsp;(tail&nbsp;s))))))<p></tt></p>
-<p>
-Infinite streams are implemented as pairs whose car holds the first
-element of the stream and whose cdr holds a procedure that delivers the rest
-of the stream.</p>
-<p>
-</p>
-
-<tt>(define&nbsp;head&nbsp;car)<br>
-(define&nbsp;tail<br>
-&nbsp;&nbsp;(lambda&nbsp;(stream)&nbsp;((cdr&nbsp;stream))))<p></tt></p>
-<p>
-</p>
-<div class=bigskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-The following program illustrates the use of <tt>integrate-system</tt> in
-integrating the system
-</p>
-<div class=mathdisplay align=left><table><tr><td> <em>C</em> <em>d</em><em>v</em><sub><em>C</em></sub> / <em>d</em><em>t</em>  =   <tt>-</tt> <em>i</em><sub><em>L</em></sub>  <tt>-</tt>  <em>v</em><sub><em>C</em></sub> / <em>R</em></td></tr></table></div>
-<p class=noindent></p>
-<div class=mathdisplay align=left><table><tr><td> <em>L</em> <em>d</em><em>i</em><sub><em>L</em></sub> / <em>d</em><em>t</em>  =  <em>v</em><sub><em>C</em></sub></td></tr></table></div>
-<p class=noindent>
-which models a damped oscillator.</p>
-<p>
-</p>
-
-<tt>#!r6rs<br>
-(import&nbsp;(rnrs&nbsp;base)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(rnrs&nbsp;io&nbsp;simple)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(runge-kutta))<br>
-<br>
-(define&nbsp;damped-oscillator<br>
-&nbsp;&nbsp;(lambda&nbsp;(R&nbsp;L&nbsp;C)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(state)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((Vc&nbsp;(vector-ref&nbsp;state&nbsp;0))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(Il&nbsp;(vector-ref&nbsp;state&nbsp;1)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(vector&nbsp;(-&nbsp;0&nbsp;(+&nbsp;(/&nbsp;Vc&nbsp;(*&nbsp;R&nbsp;C))&nbsp;(/&nbsp;Il&nbsp;C)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(/&nbsp;Vc&nbsp;L))))))<br>
-<br>
-(define&nbsp;the-states<br>
-&nbsp;&nbsp;(integrate-system<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(damped-oscillator&nbsp;10000&nbsp;1000&nbsp;.001)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&#8217;#(1&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.01))<br>
-<br>
-(letrec&nbsp;((loop&nbsp;(lambda&nbsp;(s)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(newline)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(write&nbsp;(head&nbsp;s))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;(tail&nbsp;s)))))<br>
-&nbsp;&nbsp;(loop&nbsp;the-states))<p></tt></p>
-<p>
-This prints output like the following:</p>
-<p>
-</p>
-
-<tt>#(1&nbsp;0)<br>
-#(0.99895054&nbsp;9.994835e-6)<br>
-#(0.99780226&nbsp;1.9978681e-5)<br>
-#(0.9965554&nbsp;2.9950552e-5)<br>
-#(0.9952102&nbsp;3.990946e-5)<br>
-#(0.99376684&nbsp;4.985443e-5)<br>
-#(0.99222565&nbsp;5.9784474e-5)<br>
-#(0.9905868&nbsp;6.969862e-5)<br>
-#(0.9888506&nbsp;7.9595884e-5)<br>
-#(0.9870173&nbsp;8.94753e-5)<br>
-<p></tt></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-17.html">previous</a></span><span>, <a href="r6rs-Z-H-19.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-19.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-19.html
deleted file mode 100644
index d222b93074..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-19.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-18.html">previous</a></span><span>, <a href="r6rs-Z-H-20.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_E"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_E">Appendix E</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_E">Language changes</a></h1>
-<p></p>
-<p>
-This chapter describes most of the changes that have been made to
-Scheme since the &#8220;Revised<sup>5</sup> Report&#8221;&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_14">14</a>] was published:</p>
-<p>
-</p>
-<ul>
-<li><p>Scheme source code now uses the Unicode character set.
-Specifically, the character set that can be used for identifiers has
-been greatly expanded.
-</p>
-<li><p>Identifiers can now start with the characters <tt>-&gt;</tt>.
-</p>
-<li><p>Identifiers and symbol literals are now case-sensitive.
-</p>
-<li><p>Identifiers and representations of characters, booleans,
-number objects, and <tt>.</tt> must be explicitly delimited.
-</p>
-<li><p><tt><tt>#</tt></tt> is now a delimiter.
-</p>
-<li><p>Bytevector literal syntax has been added.
-</p>
-<li><p>Matched square brackets can be used synonymously with parentheses.
-</p>
-<li><p>The read-syntax abbreviations <tt><tt>#</tt>&#8217;</tt> (for <tt>syntax</tt>), <tt><tt>#</tt><tt>&#8216;</tt></tt> (for <tt>quasisyntax</tt>), <tt><tt>#</tt>,</tt> (for <tt>unsyntax</tt>), and <tt><tt>#</tt>,@</tt>
-(for <tt>unsyntax-splicing</tt> have been added; see section&nbsp;<a href="r6rs-Z-H-7.html#node_sec_4.3.5">4.3.5</a>.)
-</p>
-<li><p><tt><tt>#</tt></tt> can no longer be used in place of digits in number
-representations.
-</p>
-<li><p>The external representation of number objects can now include a
-mantissa width.
-</p>
-<li><p>Literals for NaNs and infinities were added.
-</p>
-<li><p>String and character literals can now use a variety of escape
-sequences.
-</p>
-<li><p>Block and datum comments have been added.
-</p>
-<li><p>The <tt><tt>#</tt>!r6rs</tt> comment for marking report-compliant
-lexical syntax has been added.
-</p>
-<li><p>Characters are now specified to correspond to Unicode scalar
-values.
-</p>
-<li><p>Many of the procedures and syntactic forms of the language are
-now part of the <tt>(rnrs base (6))</tt> library.  Some procedures and
-syntactic forms have been moved to other libraries; see figure&nbsp;<a href="#node_fig_Temp_45">13</a>.</p>
-<p>
-</p>
-<a name="node_fig_Temp_45"></a>
-<div class=figure align=left><table width=100%><tr><td align=left>
-<table border=0><tr><td valign=top >identifier </td><td valign=top >moved to </td></tr>
-<tr><td valign=top ><tt>assoc</tt> </td><td valign=top ><tt>(rnrs lists (6))</tt> </td></tr>
-<tr><td valign=top ><tt>assv</tt> </td><td valign=top ><tt>(rnrs lists (6))</tt> </td></tr>
-<tr><td valign=top ><tt>assq</tt> </td><td valign=top ><tt>(rnrs lists (6))</tt> </td></tr>
-<tr><td valign=top ><tt>call-with-input-file</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>call-with-output-file</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-upcase</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-downcase</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-ci=?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-ci&lt;?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-ci&gt;?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-ci&lt;=?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-ci&gt;=?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-alphabetic?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-numeric?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-whitespace?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-upper-case?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>char-lower-case?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>close-input-port</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>close-output-port</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>current-input-port</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>current-output-port</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>display</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>do</tt> </td><td valign=top ><tt>(rnrs control (6))</tt> </td></tr>
-<tr><td valign=top ><tt>eof-object?</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>eval</tt> </td><td valign=top ><tt>(rnrs eval (6))</tt> </td></tr>
-<tr><td valign=top ><tt>delay</tt> </td><td valign=top ><tt>(rnrs r5rs (6))</tt></td></tr>
-<tr><td valign=top ><tt>exact-&gt;inexact</tt> </td><td valign=top ><tt>(rnrs r5rs (6))</tt></td></tr>
-<tr><td valign=top ><tt>force</tt> </td><td valign=top ><tt>(rnrs r5rs (6))</tt>
-</td></tr>
-<tr><td valign=top ><tt>inexact-&gt;exact</tt> </td><td valign=top ><tt>(rnrs r5rs (6))</tt></td></tr>
-<tr><td valign=top ><tt>member</tt> </td><td valign=top ><tt>(rnrs lists (6))</tt> </td></tr>
-<tr><td valign=top ><tt>memv</tt> </td><td valign=top ><tt>(rnrs lists (6))</tt> </td></tr>
-<tr><td valign=top ><tt>memq</tt> </td><td valign=top ><tt>(rnrs lists (6))</tt> </td></tr>
-<tr><td valign=top ><tt>modulo</tt> </td><td valign=top ><tt>(rnrs r5rs (6))</tt> </td></tr>
-<tr><td valign=top ><tt>newline</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>null-environment</tt> </td><td valign=top ><tt>(rnrs r5rs (6))</tt> </td></tr>
-<tr><td valign=top ><tt>open-input-file</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>open-output-file</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>peek-char</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>quotient</tt> </td><td valign=top ><tt>(rnrs r5rs (6))</tt> </td></tr>
-<tr><td valign=top ><tt>read</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>read-char</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>remainder</tt> </td><td valign=top ><tt>(rnrs r5rs (6))</tt> </td></tr>
-<tr><td valign=top ><tt>scheme-report-environment</tt> </td><td valign=top ><tt>(rnrs r5rs (6))</tt> </td></tr>
-<tr><td valign=top ><tt>set-car!</tt> </td><td valign=top ><tt>(rnrs mutable-pairs (6))</tt> </td></tr>
-<tr><td valign=top ><tt>set-cdr!</tt> </td><td valign=top ><tt>(rnrs mutable-pairs (6))</tt> </td></tr>
-<tr><td valign=top ><tt>string-ci=?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>string-ci&lt;?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>string-ci&gt;?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>string-ci&lt;=?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>string-ci&gt;=?</tt> </td><td valign=top ><tt>(rnrs unicode (6))</tt> </td></tr>
-<tr><td valign=top ><tt>string-set!</tt> </td><td valign=top ><tt>(rnrs mutable-strings (6))</tt> </td></tr>
-<tr><td valign=top ><tt>string-fill!</tt> </td><td valign=top ><tt>(rnrs mutable-strings (6))</tt> </td></tr>
-<tr><td valign=top ><tt>with-input-from-file</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>with-output-to-file</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>write</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt> </td></tr>
-<tr><td valign=top ><tt>write-char</tt> </td><td valign=top ><tt>(rnrs io simple (6))</tt>
-</td></tr></table>
-</td></tr>
-<tr><td align=left><b>Figure 13:</b>&nbsp;&nbsp;Identifiers moved to libraries</td></tr>
-<tr><td>
-
-</td></tr></table></div><p>
-</p>
-<li><p>The base language has the following new procedures and syntactic
-forms: <tt>letrec*</tt>, <tt>let-values</tt>, <tt>let*-values</tt>, <tt>real-valued?</tt>, <tt>rational-valued?</tt>, <tt>integer-valued?</tt>, <tt>exact</tt>, <tt>inexact</tt>, <tt>finite?</tt>, <tt>infinite?</tt>, <tt>nan?</tt>,
-<tt>div</tt>, <tt>mod</tt>, <tt>div-and-mod</tt>, <tt>div0</tt>, <tt>mod0</tt>, <tt>div0-and-mod0</tt>, <tt>exact-integer-sqrt</tt>, <tt>boolean=?</tt>, <tt>symbol=?</tt>, <tt>string-for-each</tt>, <tt>vector-map</tt>, <tt>vector-for-each</tt>, <tt>error</tt>, <tt>assertion-violation</tt>, <tt>assert</tt>, <tt>call/cc</tt>,
-<tt>identifier-syntax</tt>.
-</p>
-<li><p>The following procedures have been removed: <tt>char-ready?</tt>, <tt>transcript-on</tt>, <tt>transcript-off</tt>,
-<tt>load</tt>.
-</p>
-<li><p>The case-insensitive string comparisons (<tt>string-ci=?</tt>, <tt>string-ci&lt;?</tt>, <tt>string-ci&gt;?</tt>, <tt>string-ci&lt;=?</tt>, <tt>string-ci&gt;=?</tt>) operate on the case-folded versions of the strings
-rather than as the simple lexicographic ordering induced by the
-corresponding character comparison procedures.
-</p>
-<li><p>Libraries have been added to the language.
-</p>
-<li><p>A number of standard libraries are described in a separate
-report&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_24">24</a>].
-</p>
-<li><p>Many situations that &#8220;were an error&#8221; now have defined or
-constrained behavior.  In particular, many are now specified in
-terms of the exception system.
-</p>
-<li><p>The full numerical tower is now required.
-</p>
-<li><p>The semantics for the transcendental functions has been
-specified more fully.
-</p>
-<li><p>The semantics of <tt>expt</tt> for zero bases has been refined.
-</p>
-<li><p>In <tt>syntax-rules</tt> forms, a <tt>_</tt> may be used in place of
-the keyword.
-</p>
-<li><p>The <tt>let-syntax</tt> and <tt>letrec-syntax</tt> no longer introduce a
-new environment for their bodies.
-</p>
-<li><p>For implementations that support NaNs or infinities,
-many arithmetic operations have been specified on
-these values consistently with IEEE&nbsp;754.
-</p>
-<li><p>For implementations that support a distinct -0.0, the semantics
-of many arithmetic operations with regard to -0.0 has been specified
-consistently with IEEE&nbsp;754.
-</p>
-<li><p>Scheme&#8217;s real number objects now have an exact zero as their imaginary part.
-</p>
-<li><p>The specification of <tt>quasiquote</tt> has been extended.  Nested
-quasiquotations work correctly now, and <tt>unquote</tt> and <tt>unquote-splicing</tt> have been extended to several operands.
-</p>
-<li><p>Procedures now may or may not refer to
-locations.  Consequently, <tt>eqv?</tt> is now unspecified in a few
-cases where it was specified before.
-</p>
-<li><p>The mutability of the values of <tt>quasiquote</tt> structures has
-been specified to some degree.
-</p>
-<li><p>The dynamic environment of the <i>before</i> and <i>after</i>
-procedures of <tt>dynamic-wind</tt> is now specified.
-</p>
-<li><p>Various expressions that have only side effects are now allowed
-to return an arbitrary number of values.
-</p>
-<li><p>The order and semantics for macro expansion has been more fully
-specified.
-</p>
-<li><p>Internal definitions are now defined in terms of <tt>letrec*</tt>.
-</p>
-<li><p>The old notion of program structure and Scheme&#8217;s top-level
-environment has been replaced by top-level programs and libraries.
-</p>
-<li><p>The denotational semantics has been replaced by an operational
-semantics based on an earlier semantics for the language of the
-&#8220;Revised<sup>5</sup> Report&#8221;&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_14">14</a>,&nbsp;<a href="r6rs-Z-H-21.html#node_bib_18">18</a>].
-</p>
-</ul><p></p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-18.html">previous</a></span><span>, <a href="r6rs-Z-H-20.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-2.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-2.html
deleted file mode 100644
index 9abdd5b1dd..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-2.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-1.html">previous</a></span><span>, <a href="r6rs-Z-H-3.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span class=disable>contents</span><span><span class=disable>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_Temp_2"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-Contents</h1>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-                    
-<a name="node_toc_start"></a></p>
-
-<p class=noindent></p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_Temp_3"></a><a href="r6rs-Z-H-3.html#node_chap_Temp_3">Introduction</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_1"></a><a href="r6rs-Z-H-4.html#node_chap_1">1&nbsp;&nbsp;Overview of Scheme</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.1"></a><a href="r6rs-Z-H-4.html#node_sec_1.1">1.1&nbsp;&nbsp;Basic types</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_Temp_6"></a><a href="r6rs-Z-H-4.html#node_sec_Temp_6">Booleans</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_Temp_7"></a><a href="r6rs-Z-H-4.html#node_sec_Temp_7">Numbers</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_Temp_8"></a><a href="r6rs-Z-H-4.html#node_sec_Temp_8">Characters</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_Temp_9"></a><a href="r6rs-Z-H-4.html#node_sec_Temp_9">Strings</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_Temp_10"></a><a href="r6rs-Z-H-4.html#node_sec_Temp_10">Symbols</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_Temp_11"></a><a href="r6rs-Z-H-4.html#node_sec_Temp_11">Pairs and lists</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_Temp_12"></a><a href="r6rs-Z-H-4.html#node_sec_Temp_12">Vectors</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_Temp_13"></a><a href="r6rs-Z-H-4.html#node_sec_Temp_13">Procedures</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.2"></a><a href="r6rs-Z-H-4.html#node_sec_1.2">1.2&nbsp;&nbsp;Expressions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.3"></a><a href="r6rs-Z-H-4.html#node_sec_1.3">1.3&nbsp;&nbsp;Variables and binding</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.4"></a><a href="r6rs-Z-H-4.html#node_sec_1.4">1.4&nbsp;&nbsp;Definitions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.5"></a><a href="r6rs-Z-H-4.html#node_sec_1.5">1.5&nbsp;&nbsp;Forms</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.6"></a><a href="r6rs-Z-H-4.html#node_sec_1.6">1.6&nbsp;&nbsp;Procedures</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.7"></a><a href="r6rs-Z-H-4.html#node_sec_1.7">1.7&nbsp;&nbsp;Procedure calls and syntactic keywords</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.8"></a><a href="r6rs-Z-H-4.html#node_sec_1.8">1.8&nbsp;&nbsp;Assignment</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.9"></a><a href="r6rs-Z-H-4.html#node_sec_1.9">1.9&nbsp;&nbsp;Derived forms and macros</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.10"></a><a href="r6rs-Z-H-4.html#node_sec_1.10">1.10&nbsp;&nbsp;Syntactic data and datum values</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.11"></a><a href="r6rs-Z-H-4.html#node_sec_1.11">1.11&nbsp;&nbsp;Continuations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.12"></a><a href="r6rs-Z-H-4.html#node_sec_1.12">1.12&nbsp;&nbsp;Libraries</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_1.13"></a><a href="r6rs-Z-H-4.html#node_sec_1.13">1.13&nbsp;&nbsp;Top-level programs</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_2"></a><a href="r6rs-Z-H-5.html#node_chap_2">2&nbsp;&nbsp;Requirement levels</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_3"></a><a href="r6rs-Z-H-6.html#node_chap_3">3&nbsp;&nbsp;Numbers</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_3.1"></a><a href="r6rs-Z-H-6.html#node_sec_3.1">3.1&nbsp;&nbsp;Numerical tower</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_3.2"></a><a href="r6rs-Z-H-6.html#node_sec_3.2">3.2&nbsp;&nbsp;Exactness</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_3.3"></a><a href="r6rs-Z-H-6.html#node_sec_3.3">3.3&nbsp;&nbsp;Fixnums and flonums</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_3.4"></a><a href="r6rs-Z-H-6.html#node_sec_3.4">3.4&nbsp;&nbsp;Implementation requirements</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_3.5"></a><a href="r6rs-Z-H-6.html#node_sec_3.5">3.5&nbsp;&nbsp;Infinities and NaNs</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_3.6"></a><a href="r6rs-Z-H-6.html#node_sec_3.6">3.6&nbsp;&nbsp;Distinguished -0.0</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_4"></a><a href="r6rs-Z-H-7.html#node_chap_4">4&nbsp;&nbsp;Lexical syntax and datum syntax</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.1"></a><a href="r6rs-Z-H-7.html#node_sec_4.1">4.1&nbsp;&nbsp;Notation</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.2"></a><a href="r6rs-Z-H-7.html#node_sec_4.2">4.2&nbsp;&nbsp;Lexical syntax</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.2.1"></a><a href="r6rs-Z-H-7.html#node_sec_4.2.1">4.2.1&nbsp;&nbsp;Formal account</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.2.2"></a><a href="r6rs-Z-H-7.html#node_sec_4.2.2">4.2.2&nbsp;&nbsp;Line endings</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.2.3"></a><a href="r6rs-Z-H-7.html#node_sec_4.2.3">4.2.3&nbsp;&nbsp;Whitespace and comments</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.2.4"></a><a href="r6rs-Z-H-7.html#node_sec_4.2.4">4.2.4&nbsp;&nbsp;Identifiers</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.2.5"></a><a href="r6rs-Z-H-7.html#node_sec_4.2.5">4.2.5&nbsp;&nbsp;Booleans</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.2.6"></a><a href="r6rs-Z-H-7.html#node_sec_4.2.6">4.2.6&nbsp;&nbsp;Characters</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.2.7"></a><a href="r6rs-Z-H-7.html#node_sec_4.2.7">4.2.7&nbsp;&nbsp;Strings</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.2.8"></a><a href="r6rs-Z-H-7.html#node_sec_4.2.8">4.2.8&nbsp;&nbsp;Numbers</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.3"></a><a href="r6rs-Z-H-7.html#node_sec_4.3">4.3&nbsp;&nbsp;Datum syntax</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.3.1"></a><a href="r6rs-Z-H-7.html#node_sec_4.3.1">4.3.1&nbsp;&nbsp;Formal account</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.3.2"></a><a href="r6rs-Z-H-7.html#node_sec_4.3.2">4.3.2&nbsp;&nbsp;Pairs and lists</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.3.3"></a><a href="r6rs-Z-H-7.html#node_sec_4.3.3">4.3.3&nbsp;&nbsp;Vectors</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.3.4"></a><a href="r6rs-Z-H-7.html#node_sec_4.3.4">4.3.4&nbsp;&nbsp;Bytevectors</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.3.5"></a><a href="r6rs-Z-H-7.html#node_sec_4.3.5">4.3.5&nbsp;&nbsp;Abbreviations</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_5"></a><a href="r6rs-Z-H-8.html#node_chap_5">5&nbsp;&nbsp;Semantic concepts</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.1"></a><a href="r6rs-Z-H-8.html#node_sec_5.1">5.1&nbsp;&nbsp;Programs and libraries</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.2"></a><a href="r6rs-Z-H-8.html#node_sec_5.2">5.2&nbsp;&nbsp;Variables, keywords, and regions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.3"></a><a href="r6rs-Z-H-8.html#node_sec_5.3">5.3&nbsp;&nbsp;Exceptional situations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.4"></a><a href="r6rs-Z-H-8.html#node_sec_5.4">5.4&nbsp;&nbsp;Argument checking</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.5"></a><a href="r6rs-Z-H-8.html#node_sec_5.5">5.5&nbsp;&nbsp;Syntax violations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.6"></a><a href="r6rs-Z-H-8.html#node_sec_5.6">5.6&nbsp;&nbsp;Safety</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.7"></a><a href="r6rs-Z-H-8.html#node_sec_5.7">5.7&nbsp;&nbsp;Boolean values</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.8"></a><a href="r6rs-Z-H-8.html#node_sec_5.8">5.8&nbsp;&nbsp;Multiple return values</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.9"></a><a href="r6rs-Z-H-8.html#node_sec_5.9">5.9&nbsp;&nbsp;Unspecified behavior</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.10"></a><a href="r6rs-Z-H-8.html#node_sec_5.10">5.10&nbsp;&nbsp;Storage model</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.11"></a><a href="r6rs-Z-H-8.html#node_sec_5.11">5.11&nbsp;&nbsp;Proper tail recursion</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_5.12"></a><a href="r6rs-Z-H-8.html#node_sec_5.12">5.12&nbsp;&nbsp;Dynamic extent and the dynamic environment</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_6"></a><a href="r6rs-Z-H-9.html#node_chap_6">6&nbsp;&nbsp;Entry format</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_6.1"></a><a href="r6rs-Z-H-9.html#node_sec_6.1">6.1&nbsp;&nbsp;Syntax entries</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_6.2"></a><a href="r6rs-Z-H-9.html#node_sec_6.2">6.2&nbsp;&nbsp;Procedure entries</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_6.3"></a><a href="r6rs-Z-H-9.html#node_sec_6.3">6.3&nbsp;&nbsp;Implementation responsibilities</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_6.4"></a><a href="r6rs-Z-H-9.html#node_sec_6.4">6.4&nbsp;&nbsp;Other kinds of entries</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_6.5"></a><a href="r6rs-Z-H-9.html#node_sec_6.5">6.5&nbsp;&nbsp;Equivalent entries</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_6.6"></a><a href="r6rs-Z-H-9.html#node_sec_6.6">6.6&nbsp;&nbsp;Evaluation examples</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_6.7"></a><a href="r6rs-Z-H-9.html#node_sec_6.7">6.7&nbsp;&nbsp;Naming conventions</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_7"></a><a href="r6rs-Z-H-10.html#node_chap_7">7&nbsp;&nbsp;Libraries</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_7.1"></a><a href="r6rs-Z-H-10.html#node_sec_7.1">7.1&nbsp;&nbsp;Library form</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_7.2"></a><a href="r6rs-Z-H-10.html#node_sec_7.2">7.2&nbsp;&nbsp;Import and export levels</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_7.3"></a><a href="r6rs-Z-H-10.html#node_sec_7.3">7.3&nbsp;&nbsp;Examples</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_8"></a><a href="r6rs-Z-H-11.html#node_chap_8">8&nbsp;&nbsp;Top-level programs</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.1"></a><a href="r6rs-Z-H-11.html#node_sec_8.1">8.1&nbsp;&nbsp;Top-level program syntax</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_8.2"></a><a href="r6rs-Z-H-11.html#node_sec_8.2">8.2&nbsp;&nbsp;Top-level program semantics</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_9"></a><a href="r6rs-Z-H-12.html#node_chap_9">9&nbsp;&nbsp;Primitive syntax</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_9.1"></a><a href="r6rs-Z-H-12.html#node_sec_9.1">9.1&nbsp;&nbsp;Primitive expression types</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_9.2"></a><a href="r6rs-Z-H-12.html#node_sec_9.2">9.2&nbsp;&nbsp;Macros</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_10"></a><a href="r6rs-Z-H-13.html#node_chap_10">10&nbsp;&nbsp;Expansion process</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_11"></a><a href="r6rs-Z-H-14.html#node_chap_11">11&nbsp;&nbsp;Base library</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.1"></a><a href="r6rs-Z-H-14.html#node_sec_11.1">11.1&nbsp;&nbsp;Base types</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.2"></a><a href="r6rs-Z-H-14.html#node_sec_11.2">11.2&nbsp;&nbsp;Definitions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.2.1"></a><a href="r6rs-Z-H-14.html#node_sec_11.2.1">11.2.1&nbsp;&nbsp;Variable definitions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.2.2"></a><a href="r6rs-Z-H-14.html#node_sec_11.2.2">11.2.2&nbsp;&nbsp;Syntax definitions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.3"></a><a href="r6rs-Z-H-14.html#node_sec_11.3">11.3&nbsp;&nbsp;Bodies</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.4"></a><a href="r6rs-Z-H-14.html#node_sec_11.4">11.4&nbsp;&nbsp;Expressions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.4.1"></a><a href="r6rs-Z-H-14.html#node_sec_11.4.1">11.4.1&nbsp;&nbsp;Quotation</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.4.2"></a><a href="r6rs-Z-H-14.html#node_sec_11.4.2">11.4.2&nbsp;&nbsp;Procedures</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.4.3"></a><a href="r6rs-Z-H-14.html#node_sec_11.4.3">11.4.3&nbsp;&nbsp;Conditionals</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.4.4"></a><a href="r6rs-Z-H-14.html#node_sec_11.4.4">11.4.4&nbsp;&nbsp;Assignments</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.4.5"></a><a href="r6rs-Z-H-14.html#node_sec_11.4.5">11.4.5&nbsp;&nbsp;Derived conditionals</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.4.6"></a><a href="r6rs-Z-H-14.html#node_sec_11.4.6">11.4.6&nbsp;&nbsp;Binding constructs</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.4.7"></a><a href="r6rs-Z-H-14.html#node_sec_11.4.7">11.4.7&nbsp;&nbsp;Sequencing</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.5"></a><a href="r6rs-Z-H-14.html#node_sec_11.5">11.5&nbsp;&nbsp;Equivalence predicates</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.6"></a><a href="r6rs-Z-H-14.html#node_sec_11.6">11.6&nbsp;&nbsp;Procedure predicate</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.7"></a><a href="r6rs-Z-H-14.html#node_sec_11.7">11.7&nbsp;&nbsp;Arithmetic</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.7.1"></a><a href="r6rs-Z-H-14.html#node_sec_11.7.1">11.7.1&nbsp;&nbsp;Propagation of exactness and inexactness</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.7.2"></a><a href="r6rs-Z-H-14.html#node_sec_11.7.2">11.7.2&nbsp;&nbsp;Representability of infinities and NaNs</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.7.3"></a><a href="r6rs-Z-H-14.html#node_sec_11.7.3">11.7.3&nbsp;&nbsp;Semantics of common operations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.7.3.1"></a><a href="r6rs-Z-H-14.html#node_sec_11.7.3.1">11.7.3.1&nbsp;&nbsp;Integer division</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.7.3.2"></a><a href="r6rs-Z-H-14.html#node_sec_11.7.3.2">11.7.3.2&nbsp;&nbsp;Transcendental functions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.7.4"></a><a href="r6rs-Z-H-14.html#node_sec_11.7.4">11.7.4&nbsp;&nbsp;Numerical operations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.7.4.1"></a><a href="r6rs-Z-H-14.html#node_sec_11.7.4.1">11.7.4.1&nbsp;&nbsp;Numerical type predicates</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.7.4.2"></a><a href="r6rs-Z-H-14.html#node_sec_11.7.4.2">11.7.4.2&nbsp;&nbsp;Generic conversions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.7.4.3"></a><a href="r6rs-Z-H-14.html#node_sec_11.7.4.3">11.7.4.3&nbsp;&nbsp;Arithmetic operations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.7.4.4"></a><a href="r6rs-Z-H-14.html#node_sec_11.7.4.4">11.7.4.4&nbsp;&nbsp;Numerical Input and Output</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.8"></a><a href="r6rs-Z-H-14.html#node_sec_11.8">11.8&nbsp;&nbsp;Booleans</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.9"></a><a href="r6rs-Z-H-14.html#node_sec_11.9">11.9&nbsp;&nbsp;Pairs and lists</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.10"></a><a href="r6rs-Z-H-14.html#node_sec_11.10">11.10&nbsp;&nbsp;Symbols</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.11"></a><a href="r6rs-Z-H-14.html#node_sec_11.11">11.11&nbsp;&nbsp;Characters</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.12"></a><a href="r6rs-Z-H-14.html#node_sec_11.12">11.12&nbsp;&nbsp;Strings</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.13"></a><a href="r6rs-Z-H-14.html#node_sec_11.13">11.13&nbsp;&nbsp;Vectors</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.14"></a><a href="r6rs-Z-H-14.html#node_sec_11.14">11.14&nbsp;&nbsp;Errors and violations</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.15"></a><a href="r6rs-Z-H-14.html#node_sec_11.15">11.15&nbsp;&nbsp;Control features</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.16"></a><a href="r6rs-Z-H-14.html#node_sec_11.16">11.16&nbsp;&nbsp;Iteration</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.17"></a><a href="r6rs-Z-H-14.html#node_sec_11.17">11.17&nbsp;&nbsp;Quasiquotation</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.18"></a><a href="r6rs-Z-H-14.html#node_sec_11.18">11.18&nbsp;&nbsp;Binding constructs for syntactic keywords</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.19"></a><a href="r6rs-Z-H-14.html#node_sec_11.19">11.19&nbsp;&nbsp;Macro transformers</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_11.20"></a><a href="r6rs-Z-H-14.html#node_sec_11.20">11.20&nbsp;&nbsp;Tail calls and tail contexts</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_A"></a><a href="r6rs-Z-H-15.html#node_chap_A">A&nbsp;&nbsp;Formal semantics</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.1"></a><a href="r6rs-Z-H-15.html#node_sec_A.1">A.1&nbsp;&nbsp;Background</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.2"></a><a href="r6rs-Z-H-15.html#node_sec_A.2">A.2&nbsp;&nbsp;Grammar</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.3"></a><a href="r6rs-Z-H-15.html#node_sec_A.3">A.3&nbsp;&nbsp;Quote</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.4"></a><a href="r6rs-Z-H-15.html#node_sec_A.4">A.4&nbsp;&nbsp;Multiple values</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.5"></a><a href="r6rs-Z-H-15.html#node_sec_A.5">A.5&nbsp;&nbsp;Exceptions</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.6"></a><a href="r6rs-Z-H-15.html#node_sec_A.6">A.6&nbsp;&nbsp;Arithmetic and basic forms</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.7"></a><a href="r6rs-Z-H-15.html#node_sec_A.7">A.7&nbsp;&nbsp;Lists</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.8"></a><a href="r6rs-Z-H-15.html#node_sec_A.8">A.8&nbsp;&nbsp;Eqv</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.9"></a><a href="r6rs-Z-H-15.html#node_sec_A.9">A.9&nbsp;&nbsp;Procedures and application</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.10"></a><a href="r6rs-Z-H-15.html#node_sec_A.10">A.10&nbsp;&nbsp;Call/cc and dynamic wind</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.11"></a><a href="r6rs-Z-H-15.html#node_sec_A.11">A.11&nbsp;&nbsp;Letrec</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_A.12"></a><a href="r6rs-Z-H-15.html#node_sec_A.12">A.12&nbsp;&nbsp;Underspecification</a><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_B"></a><a href="r6rs-Z-H-16.html#node_chap_B">B&nbsp;&nbsp;Sample definitions for derived forms</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_C"></a><a href="r6rs-Z-H-17.html#node_chap_C">C&nbsp;&nbsp;Additional material</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_D"></a><a href="r6rs-Z-H-18.html#node_chap_D">D&nbsp;&nbsp;Example </a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_E"></a><a href="r6rs-Z-H-19.html#node_chap_E">E&nbsp;&nbsp;Language changes</a></b><br>
-</p>
-<p></p>
-
-<p class=noindent><b>
-&nbsp; &nbsp; <a name="node_toc_node_chap_Temp_47"></a><a href="r6rs-Z-H-21.html#node_chap_Temp_47">Alphabetic index of definitions of
-concepts, keywords, and procedures</a></b><br>
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-1.html">previous</a></span><span>, <a href="r6rs-Z-H-3.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span class=disable>contents</span><span><span class=disable>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-20.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-20.html
deleted file mode 100644
index 25be8ac54f..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-20.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-19.html">previous</a></span><span>, <a href="r6rs-Z-H-21.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<p>
-
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-19.html">previous</a></span><span>, <a href="r6rs-Z-H-21.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-21.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-21.html
deleted file mode 100644
index d616eb7f8e..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-21.html
+++ /dev/null
@@ -1,759 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-20.html">previous</a></span><span class=disable>, next</span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span class=disable><span>; &nbsp;&nbsp;</span>index</span>]</div>
-<p></p>
-<a name="node_chap_Temp_46"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_Temp_46">References</a></h1>
-<p></p>
-<table>
-<p>
-</p>
-<tr><td align=right valign=top><a name="node_bib_1"></a>[1]&nbsp;&nbsp;</td><td valign=top>
-J.&nbsp;W. Backus, F.L. Bauer, J.Green, C.&nbsp;Katz, J.&nbsp;McCarthy&nbsp;P. Naur, A.&nbsp;J. Perlis,
-H.&nbsp;Rutishauser, K.&nbsp;Samuelson, B.&nbsp;Vauquois J.&nbsp;H. Wegstein, A.&nbsp;van Wijngaarden,
-and M.&nbsp;Woodger.
- Revised report on the algorithmic language Algol 60.
- <i>Communications of the ACM</i>, 6(1):1&#8211;17, 1963.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_2"></a>[2]&nbsp;&nbsp;</td><td valign=top>
-Alan Bawden and Jonathan Rees.
- Syntactic closures.
- In <i>ACM Conference on Lisp and Functional Programming</i>, pages
-86&#8211;95, Snowbird, Utah, 1988. ACM Press.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_3"></a>[3]&nbsp;&nbsp;</td><td valign=top>
-Scott Bradner.
- Key words for use in RFCs to indicate requirement levels.
- <a href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a>, March 1997.
- RFC 2119.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_4"></a>[4]&nbsp;&nbsp;</td><td valign=top>
-Robert&nbsp;G. Burger and R.&nbsp;Kent Dybvig.
- Printing floating-point numbers quickly and accurately.
- In <i>Proc.&nbsp;of the ACM SIGPLAN &#8217;96 Conference on Programming
-Language Design and Implementation</i>, pages 108&#8211;116, Philadelphia, PA, USA,
-May 1996. ACM Press.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_5"></a>[5]&nbsp;&nbsp;</td><td valign=top>
-William Clinger.
- Proper tail recursion and space efficiency.
- In Keith Cooper, editor, <i>Proceedings of the 1998 Conference on
-Programming Language Design and Implementation</i>, pages 174&#8211;185, Montreal,
-Canada, June 1998. ACM Press.
- Volume 33(5) of SIGPLAN Notices.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_6"></a>[6]&nbsp;&nbsp;</td><td valign=top>
-William Clinger and Jonathan Rees.
- Macros that work.
- In <i>Proc.&nbsp; 1991 ACM SIGPLAN Symposium on Principles of
-Programming Languages</i>, pages 155&#8211;162, Orlando, Florida, January 1991. ACM
-Press.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_7"></a>[7]&nbsp;&nbsp;</td><td valign=top>
-William&nbsp;D. Clinger.
- How to read floating point numbers accurately.
- In <i>Proc.&nbsp;Conference on Programming Language Design and
-Implementation &#8217;90</i>, pages 92&#8211;101, White Plains, New York, USA, June 1990.
-ACM.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_8"></a>[8]&nbsp;&nbsp;</td><td valign=top>
-R.&nbsp;Kent Dybvig.
- <i>Chez Scheme Version 7 User&#8217;s Guide</i>.
- Cadence Research Systems, 2005.
- <a href="http://www.scheme.com/csug7/">http://www.scheme.com/csug7/</a>.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_9"></a>[9]&nbsp;&nbsp;</td><td valign=top>
-R.&nbsp;Kent Dybvig, Robert Hieb, and Carl Bruggeman.
- Syntactic abstraction in Scheme.
- <i>Lisp and Symbolic Computation</i>, 1(1):53&#8211;75, 1988.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_10"></a>[10]&nbsp;&nbsp;</td><td valign=top>
-Matthias Felleisen and Matthew Flatt.
- Programming languages and lambda calculi.
- <a href="http://www.cs.utah.edu/plt/publications/pllc.pdf">http://www.cs.utah.edu/plt/publications/pllc.pdf</a>, 2003.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_11"></a>[11]&nbsp;&nbsp;</td><td valign=top>
-Matthew Flatt.
- <i>PLT MzScheme: Language Manual</i>.
- Rice University, University of Utah, July 2006.
- <a href="http://download.plt-scheme.org/doc/352/html/mzscheme/">http://download.plt-scheme.org/doc/352/html/mzscheme/</a>.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_12"></a>[12]&nbsp;&nbsp;</td><td valign=top>
-Daniel&nbsp;P. Friedman, Christopher Haynes, Eugene Kohlbecker, and Mitchell Wand.
- <i>Scheme 84 interim reference manual</i>.
- Indiana University, January 1985.
- Indiana University Computer Science Technical Report 153.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_13"></a>[13]&nbsp;&nbsp;</td><td valign=top>
-IEEE standard 754-1985. IEEE standard for binary floating-point arithmetic,
-1985.
- Reprinted in SIGPLAN Notices, 22(2):9-25, 1987.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_14"></a>[14]&nbsp;&nbsp;</td><td valign=top>
-Richard Kelsey, William Clinger, and Jonathan Rees.
- Revised<sup>5</sup> report on the algorithmic language Scheme.
- <i>Higher-Order and Symbolic Computation</i>, 11(1):7&#8211;105, 1998.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_15"></a>[15]&nbsp;&nbsp;</td><td valign=top>
-Eugene&nbsp;E. Kohlbecker, Daniel&nbsp;P. Friedman, Matthias Felleisen, and Bruce Duba.
- Hygienic macro expansion.
- In <i>Proceedings of the 1986 ACM Conference on Lisp and
-Functional Programming</i>, pages 151&#8211;161, 1986.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_16"></a>[16]&nbsp;&nbsp;</td><td valign=top>
-Eugene&nbsp;E. Kohlbecker Jr.
- <i>Syntactic Extensions in the Programming Language Lisp</i>.
- PhD thesis, Indiana University, August 1986.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_17"></a>[17]&nbsp;&nbsp;</td><td valign=top>
-Jacob Matthews and Robert&nbsp;Bruce Findler.
- An operational semantics for R5RS Scheme.
- In J.&nbsp;Michael Ashley and Michael Sperber, editors, <i>Proceedings
-of the Sixth Workshop on Scheme and Functional Programming</i>, pages 41&#8211;54,
-Tallin, Estonia, September 2005.
- Indiana University Technical Report TR619.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_18"></a>[18]&nbsp;&nbsp;</td><td valign=top>
-Jacob Matthews and Robert&nbsp;Bruce Findler.
- An operational semantics for Scheme.
- <i>Journal of Functional Programming</i>, 2007.
- <a href="http://journals.cambridge.org/action/displayAbstract?fromPage=online&aid=1268564&fulltextType=RA&fileId=S0956796807006478">From
-<a href="http://www.cambridge.org/journals/JFP/">http://www.cambridge.org/journals/JFP/</a></a>.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_19"></a>[19]&nbsp;&nbsp;</td><td valign=top>
-Jacob Matthews, Robert&nbsp;Bruce Findler, Matthew Flatt, and Matthias Felleisen.
- A visual environment for developing context-sensitive term rewriting
-systems.
- In <i>Proc.&nbsp;15th Conference on Rewriting Techniques and
-Applications</i>, Aachen, June 2004. Springer-Verlag.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_20"></a>[20]&nbsp;&nbsp;</td><td valign=top>
-MIT Department of Electrical Engineering and Computer Science.
- <i>Scheme manual, seventh edition</i>, September 1984.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_21"></a>[21]&nbsp;&nbsp;</td><td valign=top>
-Jonathan&nbsp;A. Rees, Norman I.&nbsp;Adams IV, and James&nbsp;R. Meehan.
- <i>The T manual</i>.
- Yale University Computer Science Department, fourth edition, January
-1984.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_22"></a>[22]&nbsp;&nbsp;</td><td valign=top>
-Michael Sperber, R.&nbsp;Kent Dybvig, Matthew Flatt, and Anton van Straaten.
- Revised<sup>6</sup> report on the algorithmic language Scheme
-(Non-Normative appendices).
- <a href="http://www.r6rs.org/">http://www.r6rs.org/</a>, 2007.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_23"></a>[23]&nbsp;&nbsp;</td><td valign=top>
-Michael Sperber, R.&nbsp;Kent Dybvig, Matthew Flatt, and Anton van Straaten.
- Revised<sup>6</sup> report on the algorithmic language Scheme
-(Rationale).
- <a href="http://www.r6rs.org/">http://www.r6rs.org/</a>, 2007.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_24"></a>[24]&nbsp;&nbsp;</td><td valign=top>
-Michael Sperber, R.&nbsp;Kent Dybvig, Matthew Flatt, Anton van Straaten, Richard
-Kelsey, William Clinger, and Jonathan Rees.
- Revised<sup>6</sup> report on the algorithmic language Scheme
-(Libraries).
- <a href="http://www.r6rs.org/">http://www.r6rs.org/</a>, 2007.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_25"></a>[25]&nbsp;&nbsp;</td><td valign=top>
-Guy&nbsp;Lewis Steele Jr.
- <i>Common Lisp: The Language</i>.
- Digital Press, Burlington, MA, second edition, 1990.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_26"></a>[26]&nbsp;&nbsp;</td><td valign=top>
-Texas Instruments, Inc.
- <i>TI Scheme Language Reference Manual</i>, November 1985.
- Preliminary version 1.0.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_27"></a>[27]&nbsp;&nbsp;</td><td valign=top>
-The Unicode Consortium.
- The Unicode standard, version 5.0.0.
- defined by: <i>The Unicode Standard, Version 5.0</i> (Boston, MA,
-Addison-Wesley, 2007. ISBN 0-321-48091-0), 2007.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_28"></a>[28]&nbsp;&nbsp;</td><td valign=top>
-William&nbsp;M. Waite and Gerhard Goos.
- <i>Compiler Construction</i>.
- Springer-Verlag, 1984.<p>
-</p>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_29"></a>[29]&nbsp;&nbsp;</td><td valign=top>
-Andrew Wright and Matthias Felleisen.
- A syntactic approach to type soundness.
- <i>Information and Computation</i>, 115(1):38&#8211;94, 1994.
- First appeared as Technical Report TR160, Rice University, 1991.<p>
-</p>
-</table><p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<a name="node_chap_Temp_47"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_Temp_47">Index</a></h1>
-<p>
-<a name="node_index_start"></a></p>
-
-<div align=center><table><tr><td>
-
-<span class=large><strong>Alphabetic index of definitions of
-concepts, keywords, and procedures
-</strong></span></td></tr></table></div>
-
-<div style="height: 4.5pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<div class=bigskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-
-
-
-</p>
-<p></p>
-<div class=bigskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-</p>
-<p>
-<tt>#,<tt>@</tt></tt> <a href="r6rs-Z-H-7.html#node_idx_190">7</a>
-<tt><tt>#</tt><tt>\</tt></tt> <a href="r6rs-Z-H-7.html#node_idx_156">7ii</a>
-<tt><tt>#</tt><tt>|</tt></tt> <a href="r6rs-Z-H-7.html#node_idx_140">7iii</a>
-<tt>&amp;</tt> <a href="r6rs-Z-H-9.html#node_idx_262">9</a>
-<tt>&#8217;</tt> <a href="r6rs-Z-H-7.html#node_idx_176">7iv</a>
-<tt>#&#8217;</tt> <a href="r6rs-Z-H-7.html#node_idx_184">7v</a>
-<tt>*</tt> <a href="r6rs-Z-H-14.html#node_idx_496">14</a>
-<tt>*</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_840">15</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_842">15ii</a>
-<tt>+</tt> <a href="r6rs-Z-H-14.html#node_idx_494">14ii</a>
-<tt>+</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_830">15iii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_832">15iv</a>
-<tt>,<tt>@</tt></tt> <a href="r6rs-Z-H-7.html#node_idx_182">7vi</a>
-<tt>,</tt> <a href="r6rs-Z-H-7.html#node_idx_180">7vii</a>
-<tt>#,</tt> <a href="r6rs-Z-H-7.html#node_idx_188">7viii</a>
-<tt>-</tt> <a href="r6rs-Z-H-14.html#node_idx_498">14iii</a>, <a href="r6rs-Z-H-14.html#node_idx_500">14iv</a>
-<tt>-</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_834">15v</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_836">15vi</a>, <a href="r6rs-Z-H-15.html#node_idx_838">15vii</a>
--0.0 <a href="r6rs-Z-H-6.html#node_idx_100">6</a>
-<tt>...</tt> <a href="r6rs-Z-H-14.html#node_idx_784">14v</a>, <a href="r6rs-Z-H-14.html#node_idx_792">14vi</a>
-<tt>/</tt> <a href="r6rs-Z-H-14.html#node_idx_502">14vii</a>, <a href="r6rs-Z-H-14.html#node_idx_504">14viii</a>
-<tt>/</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_844">15viii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_846">15ix</a>, <a href="r6rs-Z-H-15.html#node_idx_848">15x</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_850">15xi</a>
-<tt>;</tt> <a href="r6rs-Z-H-7.html#node_idx_136">7ix</a>
-<tt>#;</tt> <a href="r6rs-Z-H-7.html#node_idx_138">7x</a>
-<tt>&lt;</tt> <a href="r6rs-Z-H-14.html#node_idx_466">14ix</a>
-<tt>&lt;=</tt> <a href="r6rs-Z-H-14.html#node_idx_470">14x</a>
-<tt>=</tt> <a href="r6rs-Z-H-14.html#node_idx_464">14xi</a>
-<tt>=&gt;</tt> <a href="r6rs-Z-H-14.html#node_idx_378">14xii</a>
-<tt>&gt;</tt> <a href="r6rs-Z-H-14.html#node_idx_468">14xiii</a>
-<tt>&gt;=</tt> <a href="r6rs-Z-H-14.html#node_idx_472">14xiv</a>
-<tt>_</tt> <a href="r6rs-Z-H-14.html#node_idx_788">14xv</a>, <a href="r6rs-Z-H-14.html#node_idx_790">14xvi</a>
-<tt>#&#8216;</tt> <a href="r6rs-Z-H-7.html#node_idx_186">7xi</a>
-<tt>&#8216;</tt> <a href="r6rs-Z-H-7.html#node_idx_178">7xii</a>
-<tt><tt>|</tt><tt>#</tt></tt> <a href="r6rs-Z-H-7.html#node_idx_142">7xiii</a></p>
-<p>
-</p>
-<p>
-<tt>abs</tt> <a href="r6rs-Z-H-14.html#node_idx_506">14xvii</a>
-<tt>acos</tt> <a href="r6rs-Z-H-14.html#node_idx_554">14xviii</a>
-<tt>and</tt> <a href="r6rs-Z-H-14.html#node_idx_388">14xix</a>
-<tt>angle</tt> <a href="r6rs-Z-H-14.html#node_idx_576">14xx</a>
-<tt>append</tt> <a href="r6rs-Z-H-14.html#node_idx_634">14xxi</a>
-<tt>apply</tt> <a href="r6rs-Z-H-14.html#node_idx_752">14xxii</a>
-<tt>apply</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_936">15xii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_938">15xiii</a>, <a href="r6rs-Z-H-15.html#node_idx_940">15xiv</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_942">15xv</a>, <a href="r6rs-Z-H-15.html#node_idx_944">15xvi</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_946">15xvii</a>, <a href="r6rs-Z-H-15.html#node_idx_948">15xviii</a>
-argument checking <a href="r6rs-Z-H-8.html#node_idx_226">8</a>
-<tt>asin</tt> <a href="r6rs-Z-H-14.html#node_idx_552">14xxiii</a>
-<tt>assert</tt> <a href="r6rs-Z-H-14.html#node_idx_750">14xxiv</a>
-<tt>assertion-violation</tt> <a href="r6rs-Z-H-14.html#node_idx_748">14xxv</a>
-assignment <a href="r6rs-Z-H-4.html#node_idx_46">4</a>
-<tt>atan</tt> <a href="r6rs-Z-H-14.html#node_idx_556">14xxvi</a>, <a href="r6rs-Z-H-14.html#node_idx_558">14xxvii</a></p>
-<p>
-</p>
-<p>
-<tt>#b</tt> <a href="r6rs-Z-H-7.html#node_idx_126">7xiv</a>, <a href="r6rs-Z-H-7.html#node_idx_160">7xv</a>
-backquote <a href="r6rs-Z-H-14.html#node_idx_774">14xxviii</a>
-<tt>begin</tt> <a href="r6rs-Z-H-14.html#node_idx_418">14xxix</a>, <a href="r6rs-Z-H-14.html#node_idx_420">14xxx</a>
-<tt>begin</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_856">15xix</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_860">15xx</a>, <a href="r6rs-Z-H-15.html#node_idx_976">15xxi</a>
-<tt>begin0</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_862">15xxii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_866">15xxiii</a>, <a href="r6rs-Z-H-15.html#node_idx_980">15xxiv</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_984">15xxv</a>, <a href="r6rs-Z-H-15.html#node_idx_988">15xxvi</a>
-binding <a href="r6rs-Z-H-4.html#node_idx_28">4ii</a>, <a href="r6rs-Z-H-8.html#node_idx_206">8ii</a>
-binding construct <a href="r6rs-Z-H-8.html#node_idx_208">8iii</a>
-body <a href="r6rs-Z-H-14.html#node_idx_360">14xxxi</a>
-boolean <a href="r6rs-Z-H-4.html#node_idx_4">4iii</a>
-<tt>boolean=?</tt> <a href="r6rs-Z-H-14.html#node_idx_598">14xxxii</a>
-<tt>boolean?</tt> <a href="r6rs-Z-H-14.html#node_idx_328">14xxxiii</a>, <a href="r6rs-Z-H-14.html#node_idx_596">14xxxiv</a>
-bound <a href="r6rs-Z-H-8.html#node_idx_216">8iv</a></p>
-<p>
-</p>
-<p>
-<tt>caar</tt> <a href="r6rs-Z-H-14.html#node_idx_616">14xxxv</a>
-<tt>cadr</tt> <a href="r6rs-Z-H-14.html#node_idx_618">14xxxvi</a>
-call <a href="r6rs-Z-H-12.html#node_idx_298">12</a>
-<tt>call-with-current-continuation</tt> <a href="r6rs-Z-H-14.html#node_idx_754">14xxxvii</a>
-<tt>call-with-values</tt> <a href="r6rs-Z-H-14.html#node_idx_762">14xxxviii</a>
-<tt>call-with-values</tt> (formal semantics) 
-<a href="r6rs-Z-H-15.html#node_idx_808">15xxvii</a>, <a href="r6rs-Z-H-15.html#node_idx_810">15xxviii</a>
-<tt>call/cc</tt> <a href="r6rs-Z-H-14.html#node_idx_756">14xxxix</a>
-<tt>call/cc</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_960">15xxix</a>
-<tt>car</tt> <a href="r6rs-Z-H-14.html#node_idx_612">14xl</a>
-<tt>car</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_876">15xxx</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_894">15xxxi</a>
-<tt>case</tt> <a href="r6rs-Z-H-14.html#node_idx_384">14xli</a>
-<tt>cdddar</tt> <a href="r6rs-Z-H-14.html#node_idx_620">14xlii</a>
-<tt>cddddr</tt> <a href="r6rs-Z-H-14.html#node_idx_622">14xliii</a>
-<tt>cdr</tt> <a href="r6rs-Z-H-14.html#node_idx_614">14xliv</a>
-<tt>cdr</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_878">15xxxii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_896">15xxxiii</a>
-<tt>ceiling</tt> <a href="r6rs-Z-H-14.html#node_idx_530">14xlv</a>
-<tt>char-&gt;integer</tt> <a href="r6rs-Z-H-14.html#node_idx_670">14xlvi</a>
-<tt>char&lt;=?</tt> <a href="r6rs-Z-H-14.html#node_idx_680">14xlvii</a>
-<tt>char&lt;?</tt> <a href="r6rs-Z-H-14.html#node_idx_676">14xlviii</a>
-<tt>char=?</tt> <a href="r6rs-Z-H-14.html#node_idx_674">14xlix</a>
-<tt>char&gt;=?</tt> <a href="r6rs-Z-H-14.html#node_idx_682">14l</a>
-<tt>char&gt;?</tt> <a href="r6rs-Z-H-14.html#node_idx_678">14li</a>
-<tt>char?</tt> <a href="r6rs-Z-H-14.html#node_idx_336">14lii</a>, <a href="r6rs-Z-H-14.html#node_idx_668">14liii</a>
-character <a href="r6rs-Z-H-4.html#node_idx_8">4iv</a>
-Characters <a href="r6rs-Z-H-14.html#node_idx_658">14liv</a>
-code point <a href="r6rs-Z-H-14.html#node_idx_664">14lv</a>
-comment <a href="r6rs-Z-H-7.html#node_idx_120">7xvi</a>, <a href="r6rs-Z-H-7.html#node_idx_134">7xvii</a>
-<tt>complex?</tt> <a href="r6rs-Z-H-14.html#node_idx_442">14lvi</a>
-<tt>cond</tt> <a href="r6rs-Z-H-14.html#node_idx_376">14lvii</a>
-<tt>condition?</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_822">15xxxiv</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_824">15xxxv</a>
-<tt>cons</tt> <a href="r6rs-Z-H-14.html#node_idx_610">14lviii</a>
-<tt>cons</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_872">15xxxvi</a>
-<tt>consi</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_874">15xxxvii</a>
-constant <a href="r6rs-Z-H-8.html#node_idx_244">8v</a>
-continuable exception <a href="r6rs-Z-H-8.html#node_idx_222">8vi</a>
-continuation <a href="r6rs-Z-H-4.html#node_idx_56">4v</a>
-core form <a href="r6rs-Z-H-13.html#node_idx_322">13</a>
-<tt>cos</tt> <a href="r6rs-Z-H-14.html#node_idx_548">14lix</a></p>
-<p>
-</p>
-<p>
-<tt>#d</tt> <a href="r6rs-Z-H-7.html#node_idx_164">7xviii</a>
-datum <a href="r6rs-Z-H-7.html#node_idx_102">7xix</a>, <a href="r6rs-Z-H-7.html#node_idx_114">7xx</a>
-datum value <a href="r6rs-Z-H-4.html#node_idx_52">4vi</a>, <a href="r6rs-Z-H-7.html#node_idx_108">7xxi</a>
-<tt>define</tt> <a href="r6rs-Z-H-14.html#node_idx_352">14lx</a>, <a href="r6rs-Z-H-14.html#node_idx_354">14lxi</a>
-<tt>define-syntax</tt> <a href="r6rs-Z-H-14.html#node_idx_358">14lxii</a>
-definition <a href="r6rs-Z-H-4.html#node_idx_32">4vii</a>, <a href="r6rs-Z-H-8.html#node_idx_210">8vii</a>, 
-<a href="r6rs-Z-H-10.html#node_idx_272">10</a>, <a href="r6rs-Z-H-14.html#node_idx_348">14lxiii</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_350">14lxiv</a>, <a href="r6rs-Z-H-14.html#node_idx_356">14lxv</a>
-<tt>denominator</tt> <a href="r6rs-Z-H-14.html#node_idx_526">14lxvi</a>
-derived form <a href="r6rs-Z-H-4.html#node_idx_48">4viii</a>
-<tt>div</tt> <a href="r6rs-Z-H-14.html#node_idx_510">14lxvii</a>
-<tt>div-and-mod</tt> <a href="r6rs-Z-H-14.html#node_idx_508">14lxviii</a>
-<tt>div0</tt> <a href="r6rs-Z-H-14.html#node_idx_516">14lxix</a>
-<tt>div0-and-mod0</tt> <a href="r6rs-Z-H-14.html#node_idx_514">14lxx</a>
-<tt>dot</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_916">15xxxviii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_930">15xxxix</a>
-<tt>dw</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_956">15xl</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_978">15xli</a>
-dynamic environment <a href="r6rs-Z-H-8.html#node_idx_258">8viii</a>
-dynamic extent <a href="r6rs-Z-H-8.html#node_idx_256">8ix</a>
-<tt>dynamic-wind</tt> <a href="r6rs-Z-H-14.html#node_idx_764">14lxxi</a>
-<tt>dynamic-wind</tt> (formal semantics) 
-<a href="r6rs-Z-H-15.html#node_idx_950">15xlii</a>, <a href="r6rs-Z-H-15.html#node_idx_952">15xliii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_954">15xliv</a></p>
-<p>
-</p>
-<p>
-<tt>#e</tt> <a href="r6rs-Z-H-7.html#node_idx_124">7xxii</a>, <a href="r6rs-Z-H-7.html#node_idx_168">7xxiii</a>
-<tt>else</tt> <a href="r6rs-Z-H-14.html#node_idx_380">14lxxii</a>, <a href="r6rs-Z-H-14.html#node_idx_386">14lxxiii</a>
-empty list <a href="r6rs-Z-H-7.html#node_idx_174">7xxiv</a>, <a href="r6rs-Z-H-14.html#node_idx_344">14lxxiv</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_592">14lxxv</a>, <a href="r6rs-Z-H-14.html#node_idx_602">14lxxvi</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_604">14lxxvii</a>, <a href="r6rs-Z-H-14.html#node_idx_626">14lxxviii</a>
-<tt>eq?</tt> <a href="r6rs-Z-H-14.html#node_idx_434">14lxxix</a>
-<tt>equal?</tt> <a href="r6rs-Z-H-14.html#node_idx_436">14lxxx</a>
-equivalence predicate <a href="r6rs-Z-H-14.html#node_idx_426">14lxxxi</a>
-<tt>eqv?</tt> <a href="r6rs-Z-H-14.html#node_idx_428">14lxxxii</a>
-<tt>eqv?</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_902">15xlv</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_904">15xlvi</a>, <a href="r6rs-Z-H-15.html#node_idx_906">15xlvii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_908">15xlviii</a>, <a href="r6rs-Z-H-15.html#node_idx_972">15xlix</a>
-<tt>error</tt> <a href="r6rs-Z-H-14.html#node_idx_746">14lxxxiii</a>
-escape procedure <a href="r6rs-Z-H-4.html#node_idx_58">4ix</a>, <a href="r6rs-Z-H-14.html#node_idx_758">14lxxxiv</a>
-escape sequence <a href="r6rs-Z-H-7.html#node_idx_158">7xxv</a>
-<tt>even?</tt> <a href="r6rs-Z-H-14.html#node_idx_482">14lxxxv</a>
-exact <a href="r6rs-Z-H-6.html#node_idx_82">6ii</a>, <a href="r6rs-Z-H-14.html#node_idx_430">14lxxxvi</a>
-<tt>exact</tt> <a href="r6rs-Z-H-14.html#node_idx_462">14lxxxvii</a>
-<tt>exact-integer-sqrt</tt> <a href="r6rs-Z-H-14.html#node_idx_562">14lxxxviii</a>
-<tt>exact?</tt> <a href="r6rs-Z-H-14.html#node_idx_456">14lxxxix</a>
-exactness <a href="r6rs-Z-H-6.html#node_idx_80">6iii</a>
-exceptional situation <a href="r6rs-Z-H-8.html#node_idx_218">8x</a>
-<tt>exp</tt> <a href="r6rs-Z-H-14.html#node_idx_540">14xc</a>
-<tt>export</tt> <a href="r6rs-Z-H-10.html#node_idx_270">10ii</a>
-expression <a href="r6rs-Z-H-4.html#node_idx_22">4x</a>, <a href="r6rs-Z-H-10.html#node_idx_274">10iii</a>
-<tt>expt</tt> <a href="r6rs-Z-H-14.html#node_idx_564">14xci</a>
-external representation <a href="r6rs-Z-H-7.html#node_idx_106">7xxvi</a></p>
-<p>
-</p>
-<p>
-<tt>#f</tt> <a href="r6rs-Z-H-7.html#node_idx_154">7xxvii</a>, <a href="r6rs-Z-H-14.html#node_idx_590">14xcii</a>
-false <a href="r6rs-Z-H-8.html#node_idx_236">8xi</a>
-<tt>finite?</tt> <a href="r6rs-Z-H-14.html#node_idx_484">14xciii</a>
-fixnum <a href="r6rs-Z-H-6.html#node_idx_86">6iv</a>
-flonum <a href="r6rs-Z-H-6.html#node_idx_88">6v</a>
-<tt>floor</tt> <a href="r6rs-Z-H-14.html#node_idx_528">14xciv</a>
-<tt>for-each</tt> <a href="r6rs-Z-H-14.html#node_idx_644">14xcv</a>
-form <a href="r6rs-Z-H-4.html#node_idx_34">4xi</a>, <a href="r6rs-Z-H-7.html#node_idx_110">7xxviii</a></p>
-<p>
-</p>
-<p>
-<tt>gcd</tt> <a href="r6rs-Z-H-14.html#node_idx_520">14xcvi</a></p>
-<p>
-</p>
-<p>
-hole <a href="r6rs-Z-H-15.html#node_idx_800">15l</a>
-hygienic <a href="r6rs-Z-H-12.html#node_idx_318">12ii</a></p>
-<p>
-</p>
-<p>
-<tt>#i</tt> <a href="r6rs-Z-H-7.html#node_idx_122">7xxix</a>, <a href="r6rs-Z-H-7.html#node_idx_170">7xxx</a>
-identifier <a href="r6rs-Z-H-4.html#node_idx_30">4xii</a>, <a href="r6rs-Z-H-7.html#node_idx_118">7xxxi</a>, 
-<a href="r6rs-Z-H-7.html#node_idx_144">7xxxii</a>, <a href="r6rs-Z-H-8.html#node_idx_198">8xii</a>
-<tt>identifier-syntax</tt> <a href="r6rs-Z-H-14.html#node_idx_796">14xcvii</a>
-<tt>if</tt> <a href="r6rs-Z-H-14.html#node_idx_366">14xcviii</a>, <a href="r6rs-Z-H-14.html#node_idx_368">14xcix</a>
-<tt>if</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_852">15li</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_854">15lii</a>
-<tt>imag-part</tt> <a href="r6rs-Z-H-14.html#node_idx_572">14c</a>
-immutable <a href="r6rs-Z-H-8.html#node_idx_248">8xiii</a>
-implementation restriction <a href="r6rs-Z-H-6.html#node_idx_90">6vi</a>, 
-<a href="r6rs-Z-H-8.html#node_idx_224">8xiv</a>
-<tt>import</tt> <a href="r6rs-Z-H-10.html#node_idx_268">10iv</a>
-import level <a href="r6rs-Z-H-10.html#node_idx_288">10v</a>
-improper list <a href="r6rs-Z-H-14.html#node_idx_606">14ci</a>
-inexact <a href="r6rs-Z-H-6.html#node_idx_84">6vii</a>, <a href="r6rs-Z-H-14.html#node_idx_432">14cii</a>
-<tt>inexact</tt> <a href="r6rs-Z-H-14.html#node_idx_460">14ciii</a>
-<tt>inexact?</tt> <a href="r6rs-Z-H-14.html#node_idx_458">14civ</a>
-<tt>infinite?</tt> <a href="r6rs-Z-H-14.html#node_idx_486">14cv</a>
-infinity <a href="r6rs-Z-H-6.html#node_idx_92">6viii</a>
-instance <a href="r6rs-Z-H-10.html#node_idx_278">10vi</a>
-instantiation <a href="r6rs-Z-H-10.html#node_idx_280">10vii</a>
-integer object <a href="r6rs-Z-H-6.html#node_idx_78">6ix</a>
-<tt>integer-&gt;char</tt> <a href="r6rs-Z-H-14.html#node_idx_672">14cvi</a>
-<tt>integer-valued?</tt> <a href="r6rs-Z-H-14.html#node_idx_454">14cvii</a>
-<tt>integer?</tt> <a href="r6rs-Z-H-14.html#node_idx_448">14cviii</a></p>
-<p>
-</p>
-<p>
-keyword <a href="r6rs-Z-H-8.html#node_idx_200">8xv</a>, <a href="r6rs-Z-H-12.html#node_idx_314">12iii</a></p>
-<p>
-</p>
-<p>
-<tt>lambda</tt> <a href="r6rs-Z-H-14.html#node_idx_364">14cix</a>
-<tt>lambda</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_806">15liii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_910">15liv</a>, <a href="r6rs-Z-H-15.html#node_idx_912">15lv</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_914">15lvi</a>, <a href="r6rs-Z-H-15.html#node_idx_918">15lvii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_920">15lviii</a>, <a href="r6rs-Z-H-15.html#node_idx_928">15lix</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_932">15lx</a>
-<tt>lcm</tt> <a href="r6rs-Z-H-14.html#node_idx_522">14cx</a>
-<tt>length</tt> <a href="r6rs-Z-H-14.html#node_idx_632">14cxi</a>
-<tt>let</tt> <a href="r6rs-Z-H-14.html#node_idx_394">14cxii</a>, <a href="r6rs-Z-H-14.html#node_idx_766">14cxiii</a>
-<tt>let*</tt> <a href="r6rs-Z-H-14.html#node_idx_398">14cxiv</a>
-<tt>let*-values</tt> <a href="r6rs-Z-H-14.html#node_idx_414">14cxv</a>
-<tt>let-syntax</tt> <a href="r6rs-Z-H-14.html#node_idx_776">14cxvi</a>
-<tt>let-values</tt> <a href="r6rs-Z-H-14.html#node_idx_410">14cxvii</a>
-<tt>letrec</tt> <a href="r6rs-Z-H-14.html#node_idx_402">14cxviii</a>
-<tt>letrec</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_968">15lxi</a>
-<tt>letrec*</tt> <a href="r6rs-Z-H-14.html#node_idx_406">14cxix</a>
-<tt>letrec*</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_970">15lxii</a>
-<tt>letrec-syntax</tt> <a href="r6rs-Z-H-14.html#node_idx_782">14cxx</a>
-level <a href="r6rs-Z-H-10.html#node_idx_286">10viii</a>
-lexeme <a href="r6rs-Z-H-7.html#node_idx_116">7xxxiii</a>
-library <a href="r6rs-Z-H-4.html#node_idx_60">4xiii</a>, <a href="r6rs-Z-H-8.html#node_idx_194">8xvi</a>, 
-<a href="r6rs-Z-H-10.html#node_idx_264">10ix</a>
-<tt>library</tt> <a href="r6rs-Z-H-10.html#node_idx_266">10x</a>
-list <a href="r6rs-Z-H-4.html#node_idx_16">4xiv</a>
-<tt>list</tt> <a href="r6rs-Z-H-14.html#node_idx_630">14cxxi</a>
-<tt>list</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_868">15lxiii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_870">15lxiv</a>
-<tt>list-&gt;string</tt> <a href="r6rs-Z-H-14.html#node_idx_714">14cxxii</a>
-<tt>list-&gt;vector</tt> <a href="r6rs-Z-H-14.html#node_idx_738">14cxxiii</a>
-<tt>list-ref</tt> <a href="r6rs-Z-H-14.html#node_idx_640">14cxxiv</a>
-<tt>list-tail</tt> <a href="r6rs-Z-H-14.html#node_idx_638">14cxxv</a>
-<tt>list?</tt> <a href="r6rs-Z-H-14.html#node_idx_628">14cxxvi</a>
-literal <a href="r6rs-Z-H-12.html#node_idx_292">12iv</a>
-location <a href="r6rs-Z-H-8.html#node_idx_242">8xvii</a>
-<tt>log</tt> <a href="r6rs-Z-H-14.html#node_idx_542">14cxxvii</a>, <a href="r6rs-Z-H-14.html#node_idx_544">14cxxviii</a></p>
-<p>
-</p>
-<p>
-macro <a href="r6rs-Z-H-4.html#node_idx_50">4xv</a>, <a href="r6rs-Z-H-12.html#node_idx_304">12v</a>
-macro keyword <a href="r6rs-Z-H-12.html#node_idx_316">12vi</a>
-macro transformer <a href="r6rs-Z-H-12.html#node_idx_306">12vii</a>, <a href="r6rs-Z-H-14.html#node_idx_780">14cxxix</a>
-macro use <a href="r6rs-Z-H-12.html#node_idx_310">12viii</a>
-<tt>magnitude</tt> <a href="r6rs-Z-H-14.html#node_idx_574">14cxxx</a>
-<tt>make-polar</tt> <a href="r6rs-Z-H-14.html#node_idx_568">14cxxxi</a>
-<tt>make-rectangular</tt> <a href="r6rs-Z-H-14.html#node_idx_566">14cxxxii</a>
-<tt>make-string</tt> <a href="r6rs-Z-H-14.html#node_idx_688">14cxxxiii</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_690">14cxxxiv</a>
-<tt>make-vector</tt> <a href="r6rs-Z-H-14.html#node_idx_724">14cxxxv</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_726">14cxxxvi</a>
-<tt>map</tt> <a href="r6rs-Z-H-14.html#node_idx_642">14cxxxvii</a>
-<tt>max</tt> <a href="r6rs-Z-H-14.html#node_idx_490">14cxxxviii</a>
-may <a href="r6rs-Z-H-5.html#node_idx_72">5</a>
-<tt>min</tt> <a href="r6rs-Z-H-14.html#node_idx_492">14cxxxix</a>
-<tt>mod</tt> <a href="r6rs-Z-H-14.html#node_idx_512">14cxl</a>
-<tt>mod0</tt> <a href="r6rs-Z-H-14.html#node_idx_518">14cxli</a>
-must <a href="r6rs-Z-H-5.html#node_idx_64">5ii</a>
-must be <a href="r6rs-Z-H-9.html#node_idx_260">9ii</a>
-must not <a href="r6rs-Z-H-5.html#node_idx_66">5iii</a>
-mutable <a href="r6rs-Z-H-8.html#node_idx_246">8xviii</a></p>
-<p>
-</p>
-<p>
-NaN <a href="r6rs-Z-H-6.html#node_idx_98">6x</a>
-<tt>nan?</tt> <a href="r6rs-Z-H-14.html#node_idx_488">14cxlii</a>
-negative infinity <a href="r6rs-Z-H-6.html#node_idx_96">6xi</a>
-<tt>negative?</tt> <a href="r6rs-Z-H-14.html#node_idx_478">14cxliii</a>
-<tt>not</tt> <a href="r6rs-Z-H-14.html#node_idx_594">14cxliv</a>
-<tt>null</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_884">15lxv</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_934">15lxvi</a>
-<tt>null?</tt> <a href="r6rs-Z-H-14.html#node_idx_346">14cxlv</a>, <a href="r6rs-Z-H-14.html#node_idx_624">14cxlvi</a>
-<tt>null?</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_886">15lxvii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_888">15lxviii</a>
-number <a href="r6rs-Z-H-4.html#node_idx_6">4xvi</a>, <a href="r6rs-Z-H-6.html#node_idx_74">6xii</a>
-<tt>number-&gt;string</tt> <a href="r6rs-Z-H-14.html#node_idx_578">14cxlvii</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_580">14cxlviii</a>, <a href="r6rs-Z-H-14.html#node_idx_582">14cxlix</a>
-<tt>number?</tt> <a href="r6rs-Z-H-14.html#node_idx_334">14cl</a>, <a href="r6rs-Z-H-14.html#node_idx_440">14cli</a>
-<tt>numerator</tt> <a href="r6rs-Z-H-14.html#node_idx_524">14clii</a>
-numerical types <a href="r6rs-Z-H-6.html#node_idx_76">6xiii</a></p>
-<p>
-</p>
-<p>
-<tt>#o</tt> <a href="r6rs-Z-H-7.html#node_idx_128">7xxxiv</a>, <a href="r6rs-Z-H-7.html#node_idx_162">7xxxv</a>
-object <a href="r6rs-Z-H-4.html#node_idx_2">4xvii</a>
-<tt>odd?</tt> <a href="r6rs-Z-H-14.html#node_idx_480">14cliii</a>
-<tt>or</tt> <a href="r6rs-Z-H-14.html#node_idx_390">14cliv</a></p>
-<p>
-</p>
-<p>
-pair <a href="r6rs-Z-H-4.html#node_idx_14">4xviii</a>, <a href="r6rs-Z-H-14.html#node_idx_600">14clv</a>
-<tt>pair?</tt> <a href="r6rs-Z-H-14.html#node_idx_330">14clvi</a>, <a href="r6rs-Z-H-14.html#node_idx_608">14clvii</a>
-<tt>pair?</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_890">15lxix</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_892">15lxx</a>
-pattern variable <a href="r6rs-Z-H-14.html#node_idx_794">14clviii</a>
-phase <a href="r6rs-Z-H-10.html#node_idx_276">10xi</a>
-positive infinity <a href="r6rs-Z-H-6.html#node_idx_94">6xiv</a>
-<tt>positive?</tt> <a href="r6rs-Z-H-14.html#node_idx_476">14clix</a>
-predicate <a href="r6rs-Z-H-14.html#node_idx_424">14clx</a>
-prefix notation <a href="r6rs-Z-H-4.html#node_idx_24">4xix</a>
-procedure <a href="r6rs-Z-H-4.html#node_idx_20">4xx</a>, <a href="r6rs-Z-H-4.html#node_idx_38">4xxi</a>
-procedure call <a href="r6rs-Z-H-4.html#node_idx_40">4xxii</a>, <a href="r6rs-Z-H-12.html#node_idx_300">12ix</a>
-<tt>procedure?</tt> <a href="r6rs-Z-H-14.html#node_idx_342">14clxi</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_438">14clxii</a>
-<tt>procedure?</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_924">15lxxi</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_926">15lxxii</a>
-proper tail recursion <a href="r6rs-Z-H-8.html#node_idx_250">8xix</a></p>
-<p>
-</p>
-<p>
-<tt>quasiquote</tt> <a href="r6rs-Z-H-14.html#node_idx_768">14clxiii</a>
-<tt>quote</tt> <a href="r6rs-Z-H-14.html#node_idx_362">14clxiv</a></p>
-<p>
-</p>
-<p>
-raise <a href="r6rs-Z-H-8.html#node_idx_220">8xx</a>
-<tt>raise</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_820">15lxxiii</a>
-<tt>raise-continuable</tt> (formal semantics) 
-<a href="r6rs-Z-H-15.html#node_idx_818">15lxxiv</a>
-<tt>rational-valued?</tt> <a href="r6rs-Z-H-14.html#node_idx_452">14clxv</a>
-<tt>rational?</tt> <a href="r6rs-Z-H-14.html#node_idx_446">14clxvi</a>
-<tt>rationalize</tt> <a href="r6rs-Z-H-14.html#node_idx_536">14clxvii</a>
-<tt>real-part</tt> <a href="r6rs-Z-H-14.html#node_idx_570">14clxviii</a>
-<tt>real-valued?</tt> <a href="r6rs-Z-H-14.html#node_idx_450">14clxix</a>
-<tt>real?</tt> <a href="r6rs-Z-H-14.html#node_idx_444">14clxx</a>
-referentially transparent <a href="r6rs-Z-H-12.html#node_idx_320">12x</a>
-region <a href="r6rs-Z-H-8.html#node_idx_212">8xxi</a>, <a href="r6rs-Z-H-14.html#node_idx_374">14clxxi</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_392">14clxxii</a>, <a href="r6rs-Z-H-14.html#node_idx_396">14clxxiii</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_400">14clxxiv</a>, <a href="r6rs-Z-H-14.html#node_idx_404">14clxxv</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_408">14clxxvi</a>, <a href="r6rs-Z-H-14.html#node_idx_412">14clxxvii</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_416">14clxxviii</a>
-responsibility <a href="r6rs-Z-H-8.html#node_idx_228">8xxii</a>
-<tt>reverse</tt> <a href="r6rs-Z-H-14.html#node_idx_636">14clxxix</a>
-<tt>(rnrs base (6))</tt> <a href="r6rs-Z-H-14.html#node_idx_324">14clxxx</a>
-<tt>round</tt> <a href="r6rs-Z-H-14.html#node_idx_534">14clxxxi</a></p>
-<p>
-</p>
-<p>
-safe libraries <a href="r6rs-Z-H-8.html#node_idx_232">8xxiii</a>
-scalar value <a href="r6rs-Z-H-14.html#node_idx_656">14clxxxii</a>, <a href="r6rs-Z-H-14.html#node_idx_662">14clxxxiii</a>
-<tt>set!</tt> <a href="r6rs-Z-H-14.html#node_idx_372">14clxxxiv</a>
-<tt>set!</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_922">15lxxv</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_964">15lxxvi</a>, <a href="r6rs-Z-H-15.html#node_idx_966">15lxxvii</a>
-<tt>set-car!</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_880">15lxxviii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_898">15lxxix</a>
-<tt>set-cdr!</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_882">15lxxx</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_900">15lxxxi</a>
-should <a href="r6rs-Z-H-5.html#node_idx_68">5iv</a>
-should not <a href="r6rs-Z-H-5.html#node_idx_70">5v</a>
-simplest rational <a href="r6rs-Z-H-14.html#node_idx_538">14clxxxv</a>
-<tt>sin</tt> <a href="r6rs-Z-H-14.html#node_idx_546">14clxxxvi</a>
-special form <a href="r6rs-Z-H-4.html#node_idx_44">4xxiii</a>
-splicing <a href="r6rs-Z-H-14.html#node_idx_422">14clxxxvii</a>
-<tt>sqrt</tt> <a href="r6rs-Z-H-14.html#node_idx_560">14clxxxviii</a>
-standard library <a href="r6rs-Z-H-8.html#node_idx_196">8xxiv</a>
-string <a href="r6rs-Z-H-4.html#node_idx_10">4xxiv</a>
-<tt>string</tt> <a href="r6rs-Z-H-14.html#node_idx_692">14clxxxix</a>
-<tt>string-&gt;list</tt> <a href="r6rs-Z-H-14.html#node_idx_712">14cxc</a>
-<tt>string-&gt;number</tt> <a href="r6rs-Z-H-14.html#node_idx_584">14cxci</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_586">14cxcii</a>
-<tt>string-&gt;symbol</tt> <a href="r6rs-Z-H-14.html#node_idx_652">14cxciii</a>
-<tt>string-append</tt> <a href="r6rs-Z-H-14.html#node_idx_710">14cxciv</a>
-<tt>string-copy</tt> <a href="r6rs-Z-H-14.html#node_idx_718">14cxcv</a>
-<tt>string-for-each</tt> <a href="r6rs-Z-H-14.html#node_idx_716">14cxcvi</a>
-<tt>string-length</tt> <a href="r6rs-Z-H-14.html#node_idx_694">14cxcvii</a>
-<tt>string-ref</tt> <a href="r6rs-Z-H-14.html#node_idx_696">14cxcviii</a>
-<tt>string&lt;=?</tt> <a href="r6rs-Z-H-14.html#node_idx_704">14cxcix</a>
-<tt>string&lt;?</tt> <a href="r6rs-Z-H-14.html#node_idx_700">14cc</a>
-<tt>string=?</tt> <a href="r6rs-Z-H-14.html#node_idx_698">14cci</a>
-<tt>string&gt;=?</tt> <a href="r6rs-Z-H-14.html#node_idx_706">14ccii</a>
-<tt>string&gt;?</tt> <a href="r6rs-Z-H-14.html#node_idx_702">14cciii</a>
-<tt>string?</tt> <a href="r6rs-Z-H-14.html#node_idx_338">14cciv</a>, <a href="r6rs-Z-H-14.html#node_idx_686">14ccv</a>
-subform <a href="r6rs-Z-H-4.html#node_idx_36">4xxv</a>, <a href="r6rs-Z-H-7.html#node_idx_112">7xxxvi</a>
-<tt>substring</tt> <a href="r6rs-Z-H-14.html#node_idx_708">14ccvi</a>
-surrogate <a href="r6rs-Z-H-14.html#node_idx_666">14ccvii</a>
-symbol <a href="r6rs-Z-H-4.html#node_idx_12">4xxvi</a>, <a href="r6rs-Z-H-7.html#node_idx_150">7xxxvii</a>
-<tt>symbol-&gt;string</tt> <a href="r6rs-Z-H-14.html#node_idx_648">14ccviii</a>
-<tt>symbol=?</tt> <a href="r6rs-Z-H-14.html#node_idx_650">14ccix</a>
-<tt>symbol?</tt> <a href="r6rs-Z-H-14.html#node_idx_332">14ccx</a>, <a href="r6rs-Z-H-14.html#node_idx_646">14ccxi</a>
-syntactic abstraction <a href="r6rs-Z-H-12.html#node_idx_302">12xi</a>
-syntactic datum <a href="r6rs-Z-H-4.html#node_idx_54">4xxvii</a>, <a href="r6rs-Z-H-7.html#node_idx_104">7xxxviii</a>, 
-<a href="r6rs-Z-H-7.html#node_idx_172">7xxxix</a>
-syntactic keyword <a href="r6rs-Z-H-4.html#node_idx_42">4xxviii</a>, <a href="r6rs-Z-H-7.html#node_idx_148">7xl</a>, 
-<a href="r6rs-Z-H-8.html#node_idx_202">8xxv</a>, <a href="r6rs-Z-H-12.html#node_idx_312">12xii</a>
-syntax violation <a href="r6rs-Z-H-8.html#node_idx_230">8xxvi</a>
-<tt>syntax-rules</tt> <a href="r6rs-Z-H-14.html#node_idx_786">14ccxii</a></p>
-<p>
-</p>
-<p>
-<tt>#t</tt> <a href="r6rs-Z-H-7.html#node_idx_152">7xli</a>, <a href="r6rs-Z-H-14.html#node_idx_588">14ccxiii</a>
-tail call <a href="r6rs-Z-H-8.html#node_idx_254">8xxvii</a>, <a href="r6rs-Z-H-14.html#node_idx_798">14ccxiv</a>
-tail context <a href="r6rs-Z-H-8.html#node_idx_252">8xxviii</a>
-<tt>tan</tt> <a href="r6rs-Z-H-14.html#node_idx_550">14ccxv</a>
-<tt>throw</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_962">15lxxxii</a>
-top-level program <a href="r6rs-Z-H-4.html#node_idx_62">4xxix</a>, <a href="r6rs-Z-H-8.html#node_idx_192">8xxix</a>, 
-<a href="r6rs-Z-H-11.html#node_idx_290">11</a>
-transformer <a href="r6rs-Z-H-12.html#node_idx_308">12xiii</a>, <a href="r6rs-Z-H-14.html#node_idx_778">14ccxvi</a>
-true <a href="r6rs-Z-H-8.html#node_idx_234">8xxx</a>, <a href="r6rs-Z-H-14.html#node_idx_370">14ccxvii</a>, 
-<a href="r6rs-Z-H-14.html#node_idx_382">14ccxviii</a>
-<tt>truncate</tt> <a href="r6rs-Z-H-14.html#node_idx_532">14ccxix</a>
-type <a href="r6rs-Z-H-14.html#node_idx_326">14ccxx</a></p>
-<p>
-</p>
-<p>
-unbound <a href="r6rs-Z-H-8.html#node_idx_214">8xxxi</a>, <a href="r6rs-Z-H-12.html#node_idx_296">12xiv</a>
-Unicode <a href="r6rs-Z-H-14.html#node_idx_654">14ccxxi</a>
-Unicode scalar value <a href="r6rs-Z-H-14.html#node_idx_660">14ccxxii</a>
-<tt>unquote</tt> <a href="r6rs-Z-H-14.html#node_idx_770">14ccxxiii</a>
-<tt>unquote-splicing</tt> <a href="r6rs-Z-H-14.html#node_idx_772">14ccxxiv</a>
-unspecified behavior <a href="r6rs-Z-H-8.html#node_idx_238">8xxxii</a>
-unspecified values <a href="r6rs-Z-H-8.html#node_idx_240">8xxxiii</a></p>
-<p>
-</p>
-<p>
-valid indices <a href="r6rs-Z-H-14.html#node_idx_684">14ccxxv</a>, <a href="r6rs-Z-H-14.html#node_idx_720">14ccxxvi</a>
-<tt>values</tt> <a href="r6rs-Z-H-14.html#node_idx_760">14ccxxvii</a>
-<tt>values</tt> (formal semantics) <a href="r6rs-Z-H-15.html#node_idx_802">15lxxxiii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_804">15lxxxiv</a>, <a href="r6rs-Z-H-15.html#node_idx_826">15lxxxv</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_858">15lxxxvi</a>, <a href="r6rs-Z-H-15.html#node_idx_864">15lxxxvii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_958">15lxxxviii</a>, <a href="r6rs-Z-H-15.html#node_idx_974">15lxxxix</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_982">15xc</a>, <a href="r6rs-Z-H-15.html#node_idx_986">15xci</a>
-variable <a href="r6rs-Z-H-4.html#node_idx_26">4xxx</a>, <a href="r6rs-Z-H-7.html#node_idx_146">7xlii</a>, 
-<a href="r6rs-Z-H-8.html#node_idx_204">8xxxiv</a>, <a href="r6rs-Z-H-12.html#node_idx_294">12xv</a>
-vector <a href="r6rs-Z-H-4.html#node_idx_18">4xxxi</a>
-<tt>vector</tt> <a href="r6rs-Z-H-14.html#node_idx_728">14ccxxviii</a>
-<tt>vector-&gt;list</tt> <a href="r6rs-Z-H-14.html#node_idx_736">14ccxxix</a>
-<tt>vector-fill!</tt> <a href="r6rs-Z-H-14.html#node_idx_740">14ccxxx</a>
-<tt>vector-for-each</tt> <a href="r6rs-Z-H-14.html#node_idx_744">14ccxxxi</a>
-<tt>vector-length</tt> <a href="r6rs-Z-H-14.html#node_idx_730">14ccxxxii</a>
-<tt>vector-map</tt> <a href="r6rs-Z-H-14.html#node_idx_742">14ccxxxiii</a>
-<tt>vector-ref</tt> <a href="r6rs-Z-H-14.html#node_idx_732">14ccxxxiv</a>
-<tt>vector-set!</tt> <a href="r6rs-Z-H-14.html#node_idx_734">14ccxxxv</a>
-<tt>vector?</tt> <a href="r6rs-Z-H-14.html#node_idx_340">14ccxxxvi</a>, <a href="r6rs-Z-H-14.html#node_idx_722">14ccxxxvii</a>
-visit <a href="r6rs-Z-H-10.html#node_idx_282">10xii</a>
-visiting <a href="r6rs-Z-H-10.html#node_idx_284">10xiii</a></p>
-<p>
-</p>
-<p>
-Whitespace <a href="r6rs-Z-H-7.html#node_idx_132">7xliii</a>
-<tt>with-exception-handler</tt> (formal semantics) 
-<a href="r6rs-Z-H-15.html#node_idx_812">15xcii</a>, <a href="r6rs-Z-H-15.html#node_idx_814">15xciii</a>, 
-<a href="r6rs-Z-H-15.html#node_idx_816">15xciv</a>, <a href="r6rs-Z-H-15.html#node_idx_828">15xcv</a></p>
-<p>
-</p>
-<p>
-<tt>#x</tt> <a href="r6rs-Z-H-7.html#node_idx_130">7xliv</a>, <a href="r6rs-Z-H-7.html#node_idx_166">7xlv</a></p>
-<p>
-</p>
-<p>
-<tt>zero?</tt> <a href="r6rs-Z-H-14.html#node_idx_474">14ccxxxviii</a></p>
-<p>
-</p>
-
-<p>
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-20.html">previous</a></span><span class=disable>, next</span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span class=disable><span>; &nbsp;&nbsp;</span>index</span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-3.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-3.html
deleted file mode 100644
index d03afd051c..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-3.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-2.html">previous</a></span><span>, <a href="r6rs-Z-H-4.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_Temp_3"></a>
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_Temp_3">Introduction</a></h1>
-<p>
-</p>
-<p>
-</p>
-<p>
-Programming languages should be designed not by piling feature on top of
-feature, but by removing the weaknesses and restrictions that make additional
-features appear necessary.  Scheme demonstrates that a very small number
-of rules for forming expressions, with no restrictions on how they are
-composed, suffice to form a practical and efficient programming language
-that is flexible enough to support most of the major programming
-paradigms in use today.</p>
-<p>
-Scheme
-was one of the first programming languages to incorporate first-class
-procedures as in the lambda calculus, thereby proving the usefulness of
-static scope rules and block structure in a dynamically typed language.
-Scheme was the first major dialect of Lisp to distinguish procedures
-from lambda expressions and symbols, to use a single lexical
-environment for all variables, and to evaluate the operator position
-of a procedure call in the same way as an operand position.  By relying
-entirely on procedure calls to express iteration, Scheme emphasized the
-fact that tail-recursive procedure calls are essentially gotos that
-pass arguments.  Scheme was the first widely used programming language to
-embrace first-class escape procedures, from which all previously known
-sequential control structures can be synthesized.  A subsequent
-version of Scheme introduced the concept of exact and inexact number objects,
-an extension of Common Lisp&#8217;s generic arithmetic.
-More recently, Scheme became the first programming language to support
-hygienic macros, which permit the syntax of a block-structured language
-to be extended in a consistent and reliable manner.</p>
-<p>
-</p>
-<a name="node_sec_Temp_4"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_4">Guiding principles</a></h3>
-<p>To help guide the standardization effort, the editors have adopted a
-set of principles, presented below.
-Like the Scheme language defined in <i>Revised<sup>5</sup> Report on the Algorithmic Language Scheme</i>&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_14">14</a>], the language described
-in this report is intended to:</p>
-<p>
-</p>
-<ul>
-<li><p>allow programmers to read each other&#8217;s code, and allow
-development of portable programs that can be executed in any
-conforming implementation of Scheme;</p>
-<p>
-</p>
-<li><p>derive its power from simplicity, a small number of generally
-useful core syntactic forms and procedures, and no unnecessary
-restrictions on how they are composed;</p>
-<p>
-</p>
-<li><p>allow programs to define new procedures and new hygienic
-syntactic forms;</p>
-<p>
-</p>
-<li><p>support the representation of program source code as data;</p>
-<p>
-</p>
-<li><p>make procedure calls powerful enough to express any form of
-sequential control, and allow programs to perform non-local control
-operations without the use of global program transformations;</p>
-<p>
-</p>
-<li><p>allow interesting, purely functional programs to run indefinitely
-without terminating or running out of memory on finite-memory
-machines;</p>
-<p>
-</p>
-<li><p>allow educators to use the language to teach programming
-effectively, at various levels and with a variety of pedagogical
-approaches; and</p>
-<p>
-</p>
-<li><p>allow researchers to use the language to explore the design,
-implementation, and semantics of programming languages.
-</p>
-</ul><p></p>
-<p>
-In addition, this report is intended to:</p>
-<p>
-</p>
-<ul>
-<li><p>allow programmers to create and distribute substantial programs
-and libraries, e.g., implementations of Scheme Requests for
-Implementation, that run without
-modification in a variety of Scheme implementations;</p>
-<p>
-</p>
-<li><p>support procedural, syntactic, and data abstraction more fully
-by allowing programs to define hygiene-bending and hygiene-breaking
-syntactic abstractions and new unique datatypes along with
-procedures and hygienic macros in any scope;</p>
-<p>
-</p>
-<li><p>allow programmers to rely on a level of automatic run-time type
-and bounds checking sufficient to ensure type safety; and</p>
-<p>
-</p>
-<li><p>allow implementations to generate efficient code, without
-requiring programmers to use implementation-specific operators or
-declarations.
-</p>
-</ul><p></p>
-<p>
-While it was possible to write portable programs in Scheme as
-described in <i>Revised<sup>5</sup> Report on the Algorithmic Language Scheme</i>, and indeed portable Scheme programs were written
-prior to this report, many Scheme programs were not, primarily because
-of the lack of substantial standardized libraries and the
-proliferation of implementation-specific language additions.</p>
-<p>
-In general, Scheme should include building blocks that allow a wide
-variety of libraries to be written, include commonly used user-level
-features to enhance portability and readability of library and
-application code, and exclude features that are less commonly used and
-easily implemented in separate libraries.</p>
-<p>
-The language described in this report is intended to also be backward
-compatible with programs written in Scheme as described in <i>Revised<sup>5</sup> Report on the Algorithmic Language Scheme</i> to
-the extent possible without compromising the above principles and
-future viability of the language.  With respect to future viability,
-the editors have operated under the assumption that many more Scheme
-programs will be written in the future than exist in the present, so
-the future programs are those with which we should be most concerned.</p>
-<p>
-</p>
-<a name="node_sec_Temp_5"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_5">Acknowledgements</a></h3>
-<p>Many people contributed significant help to this revision of the
-report.  Specifically, we thank Aziz Ghuloum and Andr&eacute; van Tonder for
-contributing reference implementations of the library system.  We
-thank Alan Bawden, John Cowan, Sebastian Egner, Aubrey Jaffer, Shiro
-Kawai, Bradley Lucier, and Andr&eacute; van Tonder for contributing insights on
-language design.  Marc Feeley, Martin Gasbichler, Aubrey Jaffer, Lars T Hansen,
-Richard Kelsey, Olin Shivers, and Andr&eacute; van Tonder wrote SRFIs that
-served as direct input to the report.  Marcus Crestani, David Frese, 
-Aziz Ghuloum, Arthur A. Gleckler, Eric Knauel, Jonathan Rees, and Andr&eacute;
-van Tonder thoroughly proofread early versions of the report.</p>
-<p>
-We would also like to thank the following people for their
-help in creating this report: Lauri Alanko,
-Eli Barzilay, Alan Bawden, Brian C. Barnes, Per Bothner, Trent Buck,
-Thomas Bushnell, Taylor Campbell, Ludovic Court&egrave;s, Pascal Costanza,
-John Cowan, Ray Dillinger, Jed Davis, J.A. &#8220;Biep&#8221; Durieux, Carl Eastlund,
-Sebastian Egner, Tom Emerson, Marc Feeley, Matthias Felleisen, Andy
-Freeman, Ken Friedenbach, Martin Gasbichler, Arthur A. Gleckler, Aziz
-Ghuloum, Dave Gurnell, Lars T Hansen, Ben Harris, Sven Hartrumpf, Dave
-Herman, Nils M. Holm, Stanislav Ievlev, James Jackson, Aubrey Jaffer,
-Shiro Kawai, Alexander Kjeldaas, Eric Knauel, Michael Lenaghan, Felix Klock,
-Donovan Kolbly, Marcin Kowalczyk, Thomas Lord, Bradley Lucier, Paulo
-J. Matos, Dan Muresan, Ryan Newton, Jason Orendorff, Erich Rast, Jeff
-Read, Jonathan Rees, Jorgen Sch&auml;fer, Paul Schlie, Manuel Serrano,
-Olin Shivers, Jonathan Shapiro, Jens Axel S&oslash;gaard, Jay Sulzberger,
-Pinku Surana, Mikael Tillenius, Sam Tobin-Hochstadt, David Van Horn,
-Andr&eacute; van Tonder, Reinder Verlinde, Alan Watson, Andrew Wilcox, Jon
-Wilson, Lynn Winebarger, Keith Wright, and Chongkai Zhu.</p>
-<p>
-We would like to thank the following people for their help in creating
-the previous revisions of this report: Alan Bawden, Michael
-Blair, George Carrette, Andy Cromarty, Pavel Curtis, Jeff Dalton, Olivier Danvy,
-Ken Dickey, Bruce Duba, Marc Feeley,
-Andy Freeman, Richard Gabriel, Yekta G&uuml;rsel, Ken Haase, Robert
-Hieb, Paul Hudak, Morry Katz, Chris Lindblad, Mark Meyer, Jim Miller, Jim Philbin,
-John Ramsdell, Mike Shaff, Jonathan Shapiro, Julie Sussman,
-Perry Wagle, Daniel Weise, Henry Wu, and Ozan Yigit.</p>
-<p>
-We thank Carol Fessenden, Daniel
-Friedman, and Christopher Haynes for permission to use text from the Scheme 311
-version 4 reference manual.  We thank Texas Instruments, Inc.&nbsp;for permission to
-use text from the <em>TI Scheme Language Reference Manual</em>&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_26">26</a>].
-We gladly acknowledge the influence of manuals for MIT Scheme&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_20">20</a>],
-T&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_21">21</a>], Scheme 84&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_12">12</a>], Common Lisp&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_25">25</a>],
-Chez Scheme&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_8">8</a>], PLT&nbsp;Scheme&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_11">11</a>],
-and Algol 60&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_1">1</a>].</p>
-<p>
-We also thank Betty Dexter for the extreme effort she put into
-setting this report in T<small>E</small>X, and Donald Knuth for designing the program
-that caused her troubles.</p>
-<p>
-The Artificial Intelligence Laboratory of the
-Massachusetts Institute of Technology, the Computer Science
-Department of Indiana University, the Computer and Information
-Sciences Department of the University of Oregon, and the NEC Research
-Institute supported the preparation of this report.  Support for the MIT
-work was provided in part by
-the Advanced Research Projects Agency of the Department of Defense under Office
-of Naval Research contract N00014-80-C-0505.  Support for the Indiana
-University work was provided by NSF grants NCS 83-04567 and NCS
-83-03325.</p>
-<p>
-   </p>
-<p><div style="height: 9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
- </p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-2.html">previous</a></span><span>, <a href="r6rs-Z-H-4.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-4.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-4.html
deleted file mode 100644
index 2c380e47db..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-4.html
+++ /dev/null
@@ -1,620 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-3.html">previous</a></span><span>, <a href="r6rs-Z-H-5.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_1"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_1">Chapter 1</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_1">Overview of Scheme</a></h1>
-<p></p>
-<p>
-This chapter gives an overview of Scheme&#8217;s semantics.
-The purpose of this overview is to explain
-enough about the basic concepts of the language to facilitate
-understanding of the subsequent chapters of the report, which are
-organized as a reference manual.  Consequently, this overview is
-not a complete introduction to the language, nor is it precise
-in all respects or normative in any way.</p>
-<p>
-Following Algol, Scheme is a statically scoped programming
-language.  Each use of a variable is associated with a lexically
-apparent binding of that variable.</p>
-<p>
-Scheme has latent as opposed to manifest types
-[<a href="r6rs-Z-H-21.html#node_bib_28">28</a>].  Types
-are associated with objects<a name="node_idx_2"></a>(also called values) rather than
-with variables.  (Some authors refer to languages with latent types as
-untyped, weakly typed or dynamically typed languages.)  Other languages with
-latent types are Python, Ruby, Smalltalk, and other dialects of Lisp.  Languages
-with manifest types (sometimes referred to as strongly typed or
-statically typed languages) include Algol 60, C, C#, Java, Haskell, and ML.</p>
-<p>
-All objects created in the course of a Scheme computation, including
-procedures and continuations, have unlimited extent.
-No Scheme object is ever destroyed.  The reason that
-implementations of Scheme do not (usually!) run out of storage is that
-they are permitted to reclaim the storage occupied by an object if
-they can prove that the object cannot possibly matter to any future
-computation.  Other languages in which most objects have unlimited
-extent include C#, Java, Haskell, most Lisp dialects, ML, Python,
-Ruby, and Smalltalk.</p>
-<p>
-Implementations of Scheme must be properly tail-recursive.
-This allows the execution of an iterative computation in constant space,
-even if the iterative computation is described by a syntactically
-recursive procedure.  Thus with a properly tail-recursive implementation,
-iteration can be expressed using the ordinary procedure-call
-mechanics, so that special iteration constructs are useful only as
-syntactic sugar.</p>
-<p>
-Scheme was one of the first languages to support procedures as
-objects in their own right.  Procedures can be created dynamically,
-stored in data structures, returned as results of procedures, and so
-on.  Other languages with these properties include Common Lisp,
-Haskell, ML, Ruby, and Smalltalk.</p>
-<p>
-One distinguishing feature of Scheme is that continuations, which
-in most other languages only operate behind the scenes, also have
-&#8220;first-class&#8221; status.  First-class continuations are useful for implementing a
-wide variety of advanced control constructs, including non-local exits,
-backtracking, and coroutines.</p>
-<p>
-In Scheme, the argument expressions of a procedure call are evaluated
-before the procedure gains control, whether the procedure needs the
-result of the evaluation or not.  C, C#, Common Lisp, Python,
-Ruby, and Smalltalk are other languages that always evaluate argument
-expressions before invoking a procedure.  This is distinct from the
-lazy-evaluation semantics of Haskell, or the call-by-name semantics of
-Algol 60, where an argument expression is not evaluated unless its
-value is needed by the procedure.</p>
-<p>
-Scheme&#8217;s model of arithmetic provides a rich set of numerical types
-and operations on them.  Furthermore, it distinguishes <i>exact</i>
-and <i>inexact</i> number objects: Essentially, an exact number
-object corresponds to a number exactly, and an inexact number object
-is the result of a computation that involved rounding or other errors.</p>
-<p>
-</p>
-<a name="node_sec_1.1"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.1">1.1&nbsp;&nbsp;Basic types</a></h2>
-<p>Scheme programs manipulate <i>objects</i>, which are also referred
-to as <i>values</i>.
-Scheme objects are organized into sets of values called <i>types</i>.
-This section gives an overview of the fundamentally important types of the
-Scheme language.  More types are described in later chapters.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-As Scheme is latently typed, the use of the term <i>type</i> in
-this report differs from the use of the term in the context of other
-languages, particularly those with manifest typing.
-</blockquote><p>
-</p>
-<a name="node_sec_Temp_6"></a>
-<h5 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_6">Booleans</a></h5>
-<p><a name="node_idx_4"></a>A boolean is a truth value, and can be either
-true or false.  In Scheme, the object for &#8220;false&#8221; is written
-<tt>#f</tt>.  The object for &#8220;true&#8221; is written <tt>#t</tt>.  In
-most places where a truth value is expected, however, any object different from
-<tt>#f</tt> counts as true.</p>
-<p>
-</p>
-<a name="node_sec_Temp_7"></a>
-<h5 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_7">Numbers</a></h5>
-<p><a name="node_idx_6"></a>Scheme supports a rich variety of numerical data types, including
-objects representing integers of arbitrary precision, rational numbers, complex numbers, and
-inexact numbers of various kinds.  Chapter&nbsp;<a href="r6rs-Z-H-6.html#node_chap_3">3</a> gives an
-overview of the structure of Scheme&#8217;s numerical tower.</p>
-<p>
-</p>
-<a name="node_sec_Temp_8"></a>
-<h5 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_8">Characters</a></h5>
-<p><a name="node_idx_8"></a>Scheme characters mostly correspond to textual characters.
-More precisely, they are isomorphic to the <i>scalar values</i> of
-the Unicode standard.</p>
-<p>
-</p>
-<a name="node_sec_Temp_9"></a>
-<h5 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_9">Strings</a></h5>
-<p><a name="node_idx_10"></a>Strings are finite sequences of characters with fixed length and thus
-represent arbitrary Unicode texts.</p>
-<p>
-</p>
-<a name="node_sec_Temp_10"></a>
-<h5 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_10">Symbols</a></h5>
-<p><a name="node_idx_12"></a>A symbol is an object representing a string,
-the symbol&#8217;s <i>name</i>.
-Unlike strings, two symbols whose names are spelled the same
-way are never distinguishable.  Symbols are useful for many applications;
-for instance, they may be used the way enumerated values are used in
-other languages.</p>
-<p>
-</p>
-<a name="node_sec_Temp_11"></a>
-<h5 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_11">Pairs and lists</a></h5>
-<p><a name="node_idx_14"></a><a name="node_idx_16"></a>A pair is a data structure with two components.  The most common use
-of pairs is to represent (singly linked) lists, where the first
-component (the &#8220;car&#8221;) represents the first element of the list, and
-the second component (the &#8220;cdr&#8221;) the rest of the list.  Scheme also
-has a distinguished empty list, which is the last cdr in a chain of
-pairs that form a list.</p>
-<p>
-</p>
-<a name="node_sec_Temp_12"></a>
-<h5 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_12">Vectors</a></h5>
-<p><a name="node_idx_18"></a>Vectors, like lists, are linear data structures
-representing finite sequences of arbitrary objects.
-Whereas the elements of a list are accessed
-sequentially through the chain of pairs representing it,
-the elements of a vector are addressed by integer indices.
-Thus, vectors are more appropriate than
-lists for random access to elements.</p>
-<p>
-</p>
-<a name="node_sec_Temp_13"></a>
-<h5 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_Temp_13">Procedures</a></h5>
-<p><a name="node_idx_20"></a>Procedures are values in Scheme.</p>
-<p>
-</p>
-<a name="node_sec_1.2"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.2">1.2&nbsp;&nbsp;Expressions</a></h2>
-<p>The most important elements of Scheme code are
-<a name="node_idx_22"></a><i>expressions</i>.  Expressions can be
-<i>evaluated</i>, producing a <i>value</i>.  (Actually, any number
-of values&#8212;see section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.8">5.8</a>.)  The most
-fundamental expressions are literal expressions:</p>
-<p>
-</p>
-
-<tt><tt>#t</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-23&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;23<p></tt></p>
-<p>
-This notation means that the expression <tt>#t</tt> evaluates to
-<tt>#t</tt>, that is, the value for &#8220;true&#8221;,  and that the expression
-<tt>23</tt> evaluates to a number object representing the number 23.</p>
-<p>
-Compound expressions are formed by placing parentheses around their
-subexpressions.  The first subexpression identifies an operation; the
-remaining subexpressions are operands to the operation:
-</p>
-
-<tt>(+&nbsp;23&nbsp;42)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65<br>
-(+&nbsp;14&nbsp;(*&nbsp;23&nbsp;42))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;980<p></tt>
-In the first of these examples, <tt>+</tt> is the name of
-the built-in operation for addition, and <tt>23</tt> and <tt>42</tt> are the
-operands.  The expression <tt>(+ 23 42)</tt> reads as &#8220;the sum of 23 and
-42&#8221;.  Compound expressions can be nested&#8212;the second example reads
-as &#8220;the sum of 14 and the product of 23 and 42&#8221;.</p>
-<p>
-As these examples indicate, compound expressions in Scheme are always
-written using the same prefix notation<a name="node_idx_24"></a>.  As
-a consequence, the parentheses are needed to indicate structure.
-Consequently, &#8220;superfluous&#8221; parentheses, which are often permissible in
-mathematical notation and also in many programming languages, are not
-allowed in Scheme.</p>
-<p>
-As in many other languages, whitespace (including line endings) is not
-significant when it separates subexpressions of an expression, and
-can be used to indicate structure.</p>
-<p>
-</p>
-<a name="node_sec_1.3"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.3">1.3&nbsp;&nbsp;Variables and binding</a></h2>
-<p><a name="node_idx_26"></a><a name="node_idx_28"></a><a name="node_idx_30"></a>Scheme
-allows identifiers to stand for locations containing values.
-These identifiers are called variables.  In many cases, specifically
-when the location&#8217;s value is never modified after its creation, it is
-useful to think of the variable as standing for the value directly.</p>
-<p>
-</p>
-
-<tt>(let&nbsp;((x&nbsp;23)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(y&nbsp;42))<br>
-&nbsp;&nbsp;(+&nbsp;x&nbsp;y))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65<p></tt></p>
-<p>
-In this case, the expression starting with <tt>let</tt> is a binding
-construct.  The parenthesized structure following the <tt>let</tt> lists
-variables alongside expressions: the variable <tt>x</tt> alongside <tt>23</tt>, and the variable <tt>y</tt> alongside <tt>42</tt>.  The <tt>let</tt>
-expression binds <tt>x</tt> to 23, and <tt>y</tt> to 42.  These bindings are
-available in the <i>body</i> of the <tt>let</tt> expression, <tt>(+ x
-y)</tt>, and only there.</p>
-<p>
-</p>
-<a name="node_sec_1.4"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.4">1.4&nbsp;&nbsp;Definitions</a></h2>
-<p><a name="node_idx_32"></a>The variables bound by a <tt>let</tt> expression
-are <i>local</i>, because their bindings are visible only in the
-<tt>let</tt>&#8217;s body.  Scheme also allows creating top-level bindings for
-identifiers as follows:</p>
-<p>
-</p>
-
-<tt>(define&nbsp;x&nbsp;23)<br>
-(define&nbsp;y&nbsp;42)<br>
-(+&nbsp;x&nbsp;y)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65<p></tt></p>
-<p>
-(These are actually &#8220;top-level&#8221; in the body of a top-level program or library;
-see section&nbsp;<a href="#node_sec_1.12">1.12</a> below.)</p>
-<p>
-The first two parenthesized structures are <i>definitions</i>; they
-create top-level bindings, binding <tt>x</tt> to 23 and <tt>y</tt> to 42.
-Definitions are not expressions, and cannot appear in all places
-where an expression can occur.  Moreover, a definition has no value.</p>
-<p>
-Bindings follow the lexical structure of the program:  When several
-bindings with the same name exist, a variable refers to the binding
-that is closest to it, starting with its occurrence in the program
-and going from inside to outside, and referring to a top-level
-binding if no
-local binding can be found along the way:</p>
-<p>
-</p>
-
-<tt>(define&nbsp;x&nbsp;23)<br>
-(define&nbsp;y&nbsp;42)<br>
-(let&nbsp;((y&nbsp;43))<br>
-&nbsp;&nbsp;(+&nbsp;x&nbsp;y))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;66<br>
-<br>
-(let&nbsp;((y&nbsp;43))<br>
-&nbsp;&nbsp;(let&nbsp;((y&nbsp;44))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;x&nbsp;y)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;67<p></tt></p>
-<p>
-</p>
-<a name="node_sec_1.5"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.5">1.5&nbsp;&nbsp;Forms</a></h2>
-<p>While definitions are not expressions, compound expressions and
-definitions exhibit similar syntactic structure:
-</p>
-
-<tt>(define&nbsp;x&nbsp;23)<br>
-(*&nbsp;x&nbsp;2)<p></tt>
-While the first line contains a definition, and the second an
-expression, this distinction depends on the bindings for <tt>define</tt>
-and <tt>*</tt>.  At the purely syntactical level, both are
-<i>forms</i><a name="node_idx_34"></a>, and <i>form</i> is the general name for
-a syntactic part of a Scheme program.  In particular, <tt>23</tt> is a
-<i>subform</i><a name="node_idx_36"></a>of the form <tt>(define x 23)</tt>.</p>
-<p>
-</p>
-<a name="node_sec_1.6"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.6">1.6&nbsp;&nbsp;Procedures</a></h2>
-<p></p>
-<p>
-<a name="node_idx_38"></a>Definitions can also be used to define
-procedures:</p>
-<p>
-</p>
-
-<tt>(define&nbsp;(f&nbsp;x)<br>
-&nbsp;&nbsp;(+&nbsp;x&nbsp;42))<br>
-<br>
-(f&nbsp;23)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65<p></tt></p>
-<p>
-A procedure is, slightly simplified, an abstraction of an
-expression over objects.  In the example, the first definition defines a procedure
-called <tt>f</tt>.  (Note the parentheses around <tt>f x</tt>, which
-indicate that this is a procedure definition.)  The expression <tt>(f
-23)</tt> is a <a name="node_idx_40"></a>procedure call, meaning,
-roughly, &#8220;evaluate <tt>(+ x 42)</tt> (the body of the procedure) with
-<tt>x</tt> bound to 23&#8221;.</p>
-<p>
-As procedures are objects, they can be passed to other
-procedures:
-</p>
-
-<tt>(define&nbsp;(f&nbsp;x)<br>
-&nbsp;&nbsp;(+&nbsp;x&nbsp;42))<br>
-<br>
-(define&nbsp;(g&nbsp;p&nbsp;x)<br>
-&nbsp;&nbsp;(p&nbsp;x))<br>
-<br>
-(g&nbsp;f&nbsp;23)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65<p></tt></p>
-<p>
-In this example, the body of <tt>g</tt> is evaluated with <tt>p</tt>
-bound to <tt>f</tt> and <tt>x</tt> bound to 23, which is equivalent
-to <tt>(f 23)</tt>, which evaluates to 65.</p>
-<p>
-In fact, many predefined operations of Scheme are provided not by
-syntax, but by variables whose values are procedures.
-The <tt>+</tt> operation, for example, which receives
-special syntactic treatment in many other languages, is just a regular
-identifier in Scheme, bound to a procedure that adds number objects.  The
-same holds for <tt>*</tt> and many others:</p>
-<p>
-</p>
-
-<tt>(define&nbsp;(h&nbsp;op&nbsp;x&nbsp;y)<br>
-&nbsp;&nbsp;(op&nbsp;x&nbsp;y))<br>
-<br>
-(h&nbsp;+&nbsp;23&nbsp;42)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65<br>
-(h&nbsp;*&nbsp;23&nbsp;42)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;966<p></tt></p>
-<p>
-Procedure definitions are not the only way to create procedures.  A
-<tt>lambda</tt> expression creates a new procedure as an object, with no
-need to specify a name:</p>
-<p>
-</p>
-
-<tt>((lambda&nbsp;(x)&nbsp;(+&nbsp;x&nbsp;42))&nbsp;23)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65<p></tt></p>
-<p>
-The entire expression in this example is a procedure call; <tt>(lambda (x) (+ x 42))</tt>, evaluates to a procedure that takes a single
-number object and adds 42 to it.</p>
-<p>
-</p>
-<a name="node_sec_1.7"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.7">1.7&nbsp;&nbsp;Procedure calls and syntactic keywords</a></h2>
-<p>Whereas <tt>(+ 23 42)</tt>, <tt>(f 23)</tt>, and <tt>((lambda (x) (+ x 42))
-23)</tt> are all examples of procedure calls, <tt>lambda</tt> and <tt>let</tt> expressions are not.  This is because <tt>let</tt>, even though
-it is an identifier, is not a variable, but is instead a <i>syntactic
-keyword</i><a name="node_idx_42"></a>.  A form that has a
-syntactic keyword as its first subexpression obeys special rules determined by
-the keyword.  The <tt>define</tt> identifier in a definition is also a
-syntactic keyword.  Hence, definitions are also not procedure calls.</p>
-<p>
-The rules for the <tt>lambda</tt> keyword specify that the first
-subform is a list of parameters, and the remaining subforms are the body of
-the procedure.  In <tt>let</tt> expressions, the first subform is a list
-of binding specifications, and the remaining subforms constitute a body of
-expressions.</p>
-<p>
-Procedure calls can generally be distinguished from these
-<i>special forms</i><a name="node_idx_44"></a>by
-looking for a syntactic keyword in the first position of an
-form: if the first position does not contain a syntactic keyword, the expression
-is a procedure call.  
-(So-called <i>identifier macros</i> allow creating other kinds of
-special forms, but are comparatively rare.)
-The set of syntactic keywords of Scheme is
-fairly small, which usually makes this task fairly simple.
-It is possible, however, to create new bindings for syntactic keywords; see
-section&nbsp;<a href="#node_sec_1.9">1.9</a> below.</p>
-<p>
-</p>
-<a name="node_sec_1.8"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.8">1.8&nbsp;&nbsp;Assignment</a></h2>
-<p>Scheme variables bound by definitions or <tt>let</tt> or <tt>lambda</tt>
-expressions are not actually bound directly to the objects specified in the
-respective bindings, but to locations containing these objects.  The
-contents of these locations can subsequently be modified destructively
-via <i>assignment</i><a name="node_idx_46"></a>:
-</p>
-
-<tt>(let&nbsp;((x&nbsp;23))<br>
-&nbsp;&nbsp;(set!&nbsp;x&nbsp;42)<br>
-&nbsp;&nbsp;x)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;42<p></tt></p>
-<p>
-In this case, the body of the <tt>let</tt> expression consists of two
-expressions which are evaluated sequentially, with the value of the
-final expression becoming the value of the entire <tt>let</tt>
-expression.  The expression <tt>(set! x 42)</tt> is an assignment, saying
-&#8220;replace the object in the location referenced by <tt>x</tt> with 42&#8221;.
-Thus, the previous value of <tt>x</tt>, 23, is replaced by 42.</p>
-<p>
-</p>
-<a name="node_sec_1.9"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.9">1.9&nbsp;&nbsp;Derived forms and macros</a></h2>
-<p></p>
-<p>
-Many of the special forms specified in this report
-can be translated into more basic special forms.
-For example, a <tt>let</tt> expression can be translated
-into a procedure call and a <tt>lambda</tt> expression.  The following two
-expressions are equivalent:
-</p>
-
-<tt>(let&nbsp;((x&nbsp;23)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(y&nbsp;42))<br>
-&nbsp;&nbsp;(+&nbsp;x&nbsp;y))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65<br>
-<br>
-((lambda&nbsp;(x&nbsp;y)&nbsp;(+&nbsp;x&nbsp;y))&nbsp;23&nbsp;42)&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;65<p></tt></p>
-<p>
-Special forms like <tt>let</tt> expressions are called <i>derived
-forms</i><a name="node_idx_48"></a>because their semantics can be
-derived from that of other kinds of forms by a syntactic
-transformation.  Some procedure definitions are also derived forms.  The
-following two definitions are equivalent:</p>
-<p>
-</p>
-
-<tt>(define&nbsp;(f&nbsp;x)<br>
-&nbsp;&nbsp;(+&nbsp;x&nbsp;42))<br>
-<br>
-(define&nbsp;f<br>
-&nbsp;&nbsp;(lambda&nbsp;(x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;x&nbsp;42)))<p></tt></p>
-<p>
-In Scheme, it is possible for a program to create its own derived
-forms by binding syntactic keywords to macros<a name="node_idx_50"></a>:</p>
-<p>
-</p>
-
-<tt>(define-syntax&nbsp;def<br>
-&nbsp;&nbsp;(syntax-rules&nbsp;()<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((def&nbsp;f&nbsp;(p&nbsp;...)&nbsp;body)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(define&nbsp;(f&nbsp;p&nbsp;...)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;body))))<br>
-<br>
-(def&nbsp;f&nbsp;(x)<br>
-&nbsp;&nbsp;(+&nbsp;x&nbsp;42))<p></tt></p>
-<p>
-The <tt>define-syntax</tt> construct specifies that a parenthesized
-structure matching the pattern <tt>(def f (p ...) body)</tt>, where <tt>f</tt>, <tt>p</tt>, and <tt>body</tt> are pattern variables, is translated to
-<tt>(define (f p ...) body)</tt>.  Thus, the <tt>def</tt> form appearing in
-the example gets translated to:</p>
-<p>
-</p>
-
-<tt>(define&nbsp;(f&nbsp;x)<br>
-&nbsp;&nbsp;(+&nbsp;x&nbsp;42))<p></tt></p>
-<p>
-The ability to create new syntactic keywords makes Scheme extremely
-flexible and expressive, allowing many of the features
-built into other languages to be derived forms in Scheme.</p>
-<p>
-</p>
-<a name="node_sec_1.10"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.10">1.10&nbsp;&nbsp;Syntactic data and datum values</a></h2>
-<p>A subset of the Scheme objects is called <i>datum
-values</i><a name="node_idx_52"></a>. 
-These include booleans, number objects, characters, symbols,
-and strings as well as lists and vectors whose elements are data.  Each
-datum value may be represented in textual form as a
-<i>syntactic datum</i><a name="node_idx_54"></a>, which can be written out
-and read back in without loss of information.
-A datum value may be represented by several different syntactic data.
-Moreover, each datum value
-can be trivially translated to a literal expression in a program by
-prepending a <tt><tt>&#8217;</tt></tt> to a corresponding syntactic datum:</p>
-<p>
-</p>
-
-<tt>&#8217;23&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;23<br>
-&#8217;<tt>#t</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;<tt>#t</tt><br>
-&#8217;foo&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;foo<br>
-&#8217;(1&nbsp;2&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(1&nbsp;2&nbsp;3)<br>
-&#8217;#(1&nbsp;2&nbsp;3)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;#(1&nbsp;2&nbsp;3)<p></tt></p>
-<p>
-The <tt><tt>&#8217;</tt></tt> shown in the previous examples
-is not needed for representations of number objects or booleans.
-The syntactic datum <tt>foo</tt> represents a
-symbol with name &#8220;foo&#8221;, and <tt>&#8217;foo</tt> is a literal expression with
-that symbol as its value.  <tt>(1 2 3)</tt> is a syntactic datum that 
-represents a list with elements 1, 2, and 3, and <tt>&#8217;(1 2 3)</tt> is a literal
-expression with this list as its value.  Likewise, <tt>#(1 2 3)</tt>
-is a syntactic datum that represents a vector with elements 1, 2 and 3, and
-<tt>&#8217;#(1 2 3)</tt> is the corresponding literal.</p>
-<p>
-The syntactic data are a superset of the Scheme forms.  Thus, data
-can be used to represent Scheme forms as data objects.  In
-particular, symbols can be used to represent identifiers.</p>
-<p>
-</p>
-
-<tt>&#8217;(+&nbsp;23&nbsp;42)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(+&nbsp;23&nbsp;42)<br>
-&#8217;(define&nbsp;(f&nbsp;x)&nbsp;(+&nbsp;x&nbsp;42))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;(define&nbsp;(f&nbsp;x)&nbsp;(+&nbsp;x&nbsp;42))<p></tt></p>
-<p>
-This facilitates writing programs that operate on Scheme source code,
-in particular interpreters and program transformers.</p>
-<p>
-</p>
-<a name="node_sec_1.11"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.11">1.11&nbsp;&nbsp;Continuations</a></h2>
-<p>Whenever a Scheme expression is evaluated there is a
-<i>continuation</i><a name="node_idx_56"></a>wanting the result of the
-expression.  The continuation represents an entire (default) future
-for the computation.  For example, informally the continuation of <tt>3</tt>
-in the expression
-</p>
-
-<tt>(+&nbsp;1&nbsp;3)<p></tt>
-adds 1 to it.  Normally these ubiquitous continuations are hidden
-behind the scenes and programmers do not think much about them.  On
-rare occasions, however, a programmer may need to deal with
-continuations explicitly.  The <tt>call-with-current-continuation</tt>
-procedure (see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.15">11.15</a>) allows
-Scheme programmers to do that by creating a procedure that reinstates
-the current continuation.  The <tt>call-with-current-continuation</tt>
-procedure accepts a procedure, calls it immediately with an argument
-that is an <i>escape procedure</i><a name="node_idx_58"></a>.  This
-escape procedure can then be called with an argument that becomes the
-result of the call to <tt>call-with-current-continuation</tt>.  That is,
-the escape procedure abandons its own continuation, and reinstates the
-continuation of the call to <tt>call-with-current-continuation</tt>.</p>
-<p>
-In the following example, an escape procedure representing the
-continuation that adds 1 to its argument is bound to <tt>escape</tt>, and
-then called with 3 as an argument.  The continuation of the call to
-<tt>escape</tt> is abandoned, and instead the 3 is passed to the
-continuation that adds 1:
-</p>
-
-<tt>(+&nbsp;1&nbsp;(call-with-current-continuation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(escape)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(+&nbsp;2&nbsp;(escape&nbsp;3)))))&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;4<p></tt>
-An escape procedure has unlimited extent: It can be called after the
-continuation it captured has been invoked, and it can be called
-multiple times.  This makes <tt>call-with-current-continuation</tt>
-significantly more powerful than typical non-local control constructs
-such as exceptions in other languages.</p>
-<p>
-</p>
-<a name="node_sec_1.12"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.12">1.12&nbsp;&nbsp;Libraries</a></h2>
-<p></p>
-<p>
-Scheme code can be organized in components called
-<i>libraries</i><a name="node_idx_60"></a>.  Each library contains 
-definitions and expressions.  It can import definitions
-from other libraries and export definitions to other libraries.</p>
-<p>
-The following library called <tt>(hello)</tt> exports a definition called
-<tt>hello-world</tt>,  and imports the base library (see
-chapter&nbsp;<a href="r6rs-Z-H-14.html#node_chap_11">11</a>) and the simple I/O library (see
-library section&nbsp;on &#8220;Simple I/O&#8221;).  The <tt>hello-world</tt> export is a procedure that displays <tt>Hello World</tt>
-on a separate line:
-</p>
-
-<tt>(library&nbsp;(hello)<br>
-&nbsp;&nbsp;(export&nbsp;hello-world)<br>
-&nbsp;&nbsp;(import&nbsp;(rnrs&nbsp;base)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(rnrs&nbsp;io&nbsp;simple))<br>
-&nbsp;&nbsp;(define&nbsp;(hello-world)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(display&nbsp;&quot;Hello&nbsp;World&quot;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(newline)))<p></tt></p>
-<p>
-</p>
-<a name="node_sec_1.13"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_1.13">1.13&nbsp;&nbsp;Top-level programs</a></h2>
-<p>A Scheme program is invoked via a <i>top-level
-program</i><a name="node_idx_62"></a>.  Like a library, a top-level
-program contains imports, definitions and expressions, and specifies
-an entry point for execution.  Thus a top-level program defines, via
-the transitive closure of the libraries it imports, a Scheme program.</p>
-<p>
-The following top-level program obtains the first argument from the command line
-via the <tt>command-line</tt> procedure from the <tt>(rnrs programs (6))</tt>
-library (see library chapter&nbsp;on &#8220;Command-line
-access and exit values&#8221;).  It then opens the file using <tt>open-file-input-port</tt> (see library section&nbsp;on &#8220;)&#8221;,
-yielding a <i>port</i>, i.e. a connection to the file as a data
-source, and calls the <tt>get-bytes-all</tt> procedure to obtain the
-contents of the file as binary data.  It then uses <tt>put-bytes</tt> to
-output the contents of the file to standard output:
-</p>
-
-<tt>#!r6rs<br>
-(import&nbsp;(rnrs&nbsp;base)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(rnrs&nbsp;io&nbsp;ports)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(rnrs&nbsp;programs))<br>
-(put-bytes&nbsp;(standard-output-port)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(call-with-port<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(open-file-input-port<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cadr&nbsp;(command-line)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;get-bytes-all))<p></tt></p>
-<p>
-  </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-3.html">previous</a></span><span>, <a href="r6rs-Z-H-5.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-5.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-5.html
deleted file mode 100644
index 97f21bab9f..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-5.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-4.html">previous</a></span><span>, <a href="r6rs-Z-H-6.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_2"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_2">Chapter 2</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_2">Requirement levels</a></h1>
-<p></p>
-<p>
-The key words &#8220;must&#8221;, &#8220;must not&#8221;, &#8220;should&#8221;,
-&#8220;should not&#8221;, &#8220;recommended&#8221;, &#8220;may&#8221;, and &#8220;optional&#8221; in this
-report are to be interpreted as described in RFC&nbsp;2119&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_3">3</a>].
-Specifically:</p>
-<p>
-</p>
-<dl><dt></dt><dd>
-</dd><dt><b>must</b></dt><dd><a name="node_idx_64"></a>This word means that a statement is an absolute
-requirement of the specification.
-</dd><dt><b>must not</b></dt><dd><a name="node_idx_66"></a>This phrase means that a statement is an absolute
-prohibition of the specification.
-</dd><dt><b>should</b></dt><dd><a name="node_idx_68"></a>This word, or the adjective &#8220;recommended&#8221;, means that
-valid reasons may exist in particular circumstances to ignore a
-statement, but that the implications must be understood and weighed
-before choosing a different course.
-</dd><dt><b>should not</b></dt><dd><a name="node_idx_70"></a>This phrase, or the phrase &#8220;not recommended&#8221;, means
-that valid reasons may exist in particular circumstances when the
-behavior of a statement is acceptable, but that the implications
-should be understood and weighed before choosing the course described
-by the statement.
-</dd><dt><b>may</b></dt><dd><a name="node_idx_72"></a>This word, or the adjective &#8220;optional&#8221;, means that an item
-is truly optional.
-</dd></dl><p></p>
-<p>
-In particular, this report occasionally uses &#8220;should&#8221; to designate
-circumstances that are outside the specification of this report, but
-cannot be practically detected by an implementation; see
-section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.4">5.4</a>.  In such circumstances, a
-particular implementation may allow the programmer to ignore the
-recommendation of the report and even exhibit reasonable behavior.
-However, as the report does not specify the behavior,
-these programs may be unportable, that is, their execution might
-produce different results on different implementations.</p>
-<p>
-Moreover, this report occasionally uses the phrase &#8220;not required&#8221; to note the
-absence of an absolute requirement.</p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-4.html">previous</a></span><span>, <a href="r6rs-Z-H-6.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-6.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-6.html
deleted file mode 100644
index 7206f28437..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-6.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-5.html">previous</a></span><span>, <a href="r6rs-Z-H-7.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_3"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_3">Chapter 3</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_3">Numbers</a></h1>
-<p>
-<a name="node_idx_74"></a></p>
-<p>
-This chapter describes Scheme&#8217;s model for numbers.  It is important to
-distinguish between the mathematical numbers, the Scheme objects that
-attempt to model them, the machine representations used to implement
-the numbers, and notations used to write numbers.  In this report, the
-term <i>number</i> refers to a mathematical number, and the term
-<i>number object</i> refers to a Scheme object representing a
-number.  This report uses the types <i>complex</i>, <i>real</i>,
-<i>rational</i>, and <i>integer</i> to refer to both mathematical
-numbers and number objects.  The <i>fixnum</i> and <i>flonum</i> types
-refer to special subsets of the number objects, as determined by
-common machine representations, as explained below.</p>
-<p>
-</p>
-<a name="node_sec_3.1"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_3.1">3.1&nbsp;&nbsp;Numerical tower</a></h2>
-<p>
-<a name="node_idx_76"></a></p>
-<p>
-Numbers may be arranged into a tower of subsets in which each level
-is a subset of the level above it:
-</p>
-<p>
-         number <br>
-&nbsp;&nbsp;&nbsp; complex <br>
-&nbsp;&nbsp;&nbsp; real <br>
-&nbsp;&nbsp;&nbsp; rational <br>
-&nbsp;&nbsp;&nbsp; integer 
-</p>
-<p></p>
-<p>
-For example, 5 is an integer.  Therefore 5 is also a rational,
-a real, and a complex.  The same is true of the number objects
-that model 5.  </p>
-<p>
-Number objects are organized as a corresponding tower of subtypes
-defined by the predicates <tt>number?</tt>, <tt>complex?</tt>, <tt>real?</tt>,
-<tt>rational?</tt>, and <tt>integer?</tt>; see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.7.4.1">11.7.4.1</a>.
-Integer number objects are also called <i>integer
-objects</i><a name="node_idx_78"></a>.</p>
-<p>
-There is no simple relationship between the subset that contains a
-number and its representation inside a computer.  For example, the
-integer 5 may have several representations.  Scheme&#8217;s numerical
-operations treat number objects as abstract data, as independent of
-their representation as possible.  Although an implementation of
-Scheme may use many different representations for numbers, this should
-not be apparent to a casual programmer writing simple programs.</p>
-<p>
-</p>
-<a name="node_sec_3.2"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_3.2">3.2&nbsp;&nbsp;Exactness</a></h2>
-<p></p>
-<p>
-<a name="node_idx_80"></a>It is useful to distinguish between number objects
-that are known to correspond to a number exactly, and those number
-objects whose computation involved rounding or other errors.  For
-example, index operations into data structures may need to know the index
-exactly, as may some operations on polynomial coefficients in a symbolic algebra
-system.  On the other hand, the results of measurements are inherently
-inexact, and irrational numbers may be approximated by rational and
-therefore inexact approximations.  In order to catch uses of numbers
-known only inexactly where exact numbers are required, Scheme
-explicitly distinguishes <a name="node_idx_82"></a><em>exact</em> from <a name="node_idx_84"></a><em>inexact</em> number objects.  This
-distinction is orthogonal to the dimension of type.</p>
-<p>
-A
-number object is exact if it is the value of an exact numerical
-literal or was derived from exact number objects using only exact
-operations.  Exact number objects correspond to mathematical numbers
-in the obvious way.</p>
-<p>
-Conversely, a number object is inexact if it is the value of an
-inexact numerical literal, or was derived from inexact number objects,
-or was derived using inexact operations.  Thus inexactness is
-contagious.</p>
-<p>
-Exact arithmetic is reliable in the following sense: If exact number
-objects are passed to any of the arithmetic procedures described in
-section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.7.1">11.7.1</a>, and an exact number object is
-returned, then the result is mathematically correct.  This is
-generally not true of computations involving inexact number objects
-because approximate methods such as floating-point arithmetic may be
-used, but it is the duty of each implementation to make the result as
-close as practical to the mathematically ideal result.</p>
-<p>
-</p>
-<a name="node_sec_3.3"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_3.3">3.3&nbsp;&nbsp;Fixnums and flonums</a></h2>
-<p>A <a name="node_idx_86"></a><em>fixnum</em> is an exact integer object that lies
-within a certain implementation-dependent subrange of the
-exact integer objects. (Library section on &#8220;Fixnums&#8221; describes a
-library for computing with fixnums.)
-Likewise, every implementation must
-designate a subset of its inexact real number objects as <a name="node_idx_88"></a><em>flonum</em>s, and
-to convert certain external representations into flonums.  
-(Library section on &#8220;Flonums&#8221; describes a library for
-computing with flonums.)  Note that
-this does not imply that an implementation must use
-floating-point representations.</p>
-<p>
-</p>
-<a name="node_sec_3.4"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_3.4">3.4&nbsp;&nbsp;Implementation requirements</a></h2>
-<p><a name="node_idx_90"></a></p>
-<p>
-Implementations of Scheme must support number objects for
-the entire tower of subtypes given in section&nbsp;<a href="#node_sec_3.1">3.1</a>.
-Moreover, implementations must support exact integer 
-objects and exact rational number objects of practically unlimited
-size and precision, and to implement certain procedures (listed in
-<a href="r6rs-Z-H-14.html#node_sec_11.7.1">11.7.1</a>) so they always return exact results when
-given exact arguments.  (&#8220;Practically unlimited&#8221; means that the size
-and precision of these numbers should only be limited by the size of
-the available memory.)</p>
-<p>
-Implementations may support only a limited range of inexact number
-objects of any type, subject to the requirements of this section.  For
-example, an implementation may limit the range of the inexact real
-number objects (and therefore the range of inexact integer and
-rational number objects) to the dynamic range of the flonum format.
-Furthermore the gaps between the inexact integer objects and
-rationals are likely to be very large in such an implementation as the
-limits of this range are approached.</p>
-<p>
-An implementation may use floating point and other approximate 
-representation strategies for inexact numbers.
-This report recommends, but does not require, that the IEEE 
-floating-point standards be followed by implementations that use
-floating-point representations, and that implementations using
-other representations should match or exceed the precision achievable
-using these floating-point standards&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_13">13</a>].</p>
-<p>
-In particular, implementations that use floating-point representations
-must follow these rules: A floating-point result must be represented
-with at least as much precision as is used to express any of the
-inexact arguments to that operation.
-Potentially inexact operations such as <tt>sqrt</tt>, when
-applied to exact arguments, should produce exact answers whenever possible
-(for example the square root of an exact 4 ought to be an exact 2).
-However, this is not required.
-If, on the other hand, an exact number object is operated upon so as to produce an
-inexact result (as by <tt>sqrt</tt>), and if the result is represented in
-floating point, then the most precise floating-point format available
-must be used; but if the result is represented in some other way then
-the representation must have at least as much precision as the most
-precise floating-point format available.</p>
-<p>
-It is the programmer&#8217;s responsibility to avoid using inexact number
-objects with magnitude or significand too large to be represented in
-the implementation.</p>
-<p>
-</p>
-<a name="node_sec_3.5"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_3.5">3.5&nbsp;&nbsp;Infinities and NaNs</a></h2>
-<p>Some Scheme implementations, specifically those that follow the IEEE
-floating-point standards, distinguish special number objects called
-<a name="node_idx_92"></a><a name="node_idx_94"></a><em>positive infinity</em>, <a name="node_idx_96"></a><em>negative
-infinity</em>, and <a name="node_idx_98"></a><em>NaN</em>.</p>
-<p>
-Positive infinity is regarded as an inexact real (but not rational) number
-object that represents an indeterminate number greater than the
-numbers represented by all rational number objects.  Negative infinity
-is regarded as an inexact real (but not rational) number object that represents
-an indeterminate number less than the numbers represented by all
-rational numbers.</p>
-<p>
-A NaN is regarded as an inexact real (but not rational) number object so
-indeterminate that it might represent any real number, including
-positive or negative infinity, and might even be greater than positive
-infinity or less than negative infinity.</p>
-<p>
-</p>
-<a name="node_sec_3.6"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_3.6">3.6&nbsp;&nbsp;Distinguished -0.0</a></h2>
-<p><a name="node_idx_100"></a>Some Scheme implementations, specifically those that follow the IEEE
-floating-point standards, distinguish between number objects for 0.0
-and  <tt>-</tt> 0.0, i.e., positive and negative inexact zero.  This report
-will sometimes specify the behavior of certain arithmetic operations
-on these number objects.  These specifications are marked with &#8220;if
- <tt>-</tt> 0.0 is distinguished&#8221; or &#8220;implementations that distinguish
- <tt>-</tt> 0.0&#8221;.</p>
-<p>
- </p>
-<p>
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-5.html">previous</a></span><span>, <a href="r6rs-Z-H-7.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-7.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-7.html
deleted file mode 100644
index 39f7a89a08..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-7.html
+++ /dev/null
@@ -1,851 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-6.html">previous</a></span><span>, <a href="r6rs-Z-H-8.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_4"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_4">Chapter 4</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_4">Lexical syntax and datum syntax</a></h1>
-<p></p>
-<p>
-The syntax of Scheme code is organized in three levels:
-</p>
-<ol>
-<li><p>the <i>lexical syntax</i> that describes how a program text is split
-into a sequence of lexemes,
-</p>
-<li><p>the <i>datum syntax</i>, formulated in terms of the lexical
-syntax, that structures the lexeme sequence as a sequence of
-<i>syntactic data<a name="node_idx_102"></a><a name="node_idx_104"></a></i>, where a syntactic datum is
-a recursively structured entity,
-</p>
-<li><p>the <i>program syntax</i> formulated in terms of the read
-syntax, imposing further structure and assigning meaning to
-syntactic data.
-</p>
-</ol><p>
-Syntactic data (also called <i>external
-representations<a name="node_idx_106"></a></i>) double
-as a notation for objects, and Scheme&#8217;s <tt>(rnrs io ports (6))</tt> library
-(library section&nbsp;on &#8220;Port I/O&#8221;)
-provides the <tt>get-datum</tt> and <tt>put-datum</tt> procedures
-for reading and writing syntactic data, converting between their
-textual representation and the corresponding objects. 
-Each syntactic datum represents a corresponding <a name="node_idx_108"></a><em>datum value</em>.
-A syntactic datum can be used in a program to obtain the corresponding
-datum value using <tt>quote</tt> (see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.4.1">11.4.1</a>).</p>
-<p>
-Scheme source code consists of syntactic data and (non-significant) comments.
-Syntactic data in Scheme source code are called
-<i>forms</i><a name="node_idx_110"></a>.
-(A form nested inside another form is
-called a <a name="node_idx_112"></a><em>subform</em>.)
-Consequently, Scheme&#8217;s syntax has the property that any sequence of
-characters that is a form is also a syntactic datum representing
-some object.  This can lead to confusion, since it may not be obvious
-out of context whether a given sequence of characters is intended to
-be a representation of objects or the text of a program.
-It is also a source of power, since it
-facilitates writing programs such as interpreters or compilers that
-treat programs as objects (or vice versa).</p>
-<p>
-A datum value may have several different external representations.
-For example, both &#8220;<tt>#e28.000</tt>&#8221; and
-&#8220;<tt>#x1c</tt>&#8221; are syntactic data representing the exact integer
-object 28, and the syntactic data &#8220;<tt>(8 13)</tt>&#8221;, &#8220;<tt>( 08 13 )</tt>&#8221;, &#8220;<tt>(8 .
-  (13 . ()))</tt>&#8221;
-all represent a list containing the exact integer objects 8 and 13. 
-Syntactic data that represent equal objects (in the sense of <tt>equal?</tt>; see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.5">11.5</a>) are always equivalent 
-as forms of a program.</p>
-<p>
-Because of the close correspondence between syntactic data and datum
-values, this report sometimes uses the term <a name="node_idx_114"></a><em>datum</em> for
-either a syntactic datum or a datum value when the exact meaning
-is apparent from the context.</p>
-<p>
-An implementation must not extend the lexical or datum syntax in
-any way, with one exception: it need not treat the syntax
-<tt><tt>#</tt>!&lt;identifier&gt;</tt>, for any &lt;identifier&gt; (see
-section&nbsp;<a href="#node_sec_4.2.4">4.2.4</a>) that is not <tt>r6rs</tt>, as a syntax
-violation, and it may use specific <tt><tt>#</tt>!</tt>-prefixed
-identifiers as flags indicating that subsequent input contains extensions
-to the standard lexical or datum syntax. 
-The syntax <tt><tt>#</tt>!r6rs</tt> may be used to signify that
-the input afterward is written with the lexical syntax and
-datum syntax described by
-this report.
-<tt><tt>#</tt>!r6rs</tt> is otherwise treated as a comment; see section&nbsp;<a href="#node_sec_4.2.3">4.2.3</a>.</p>
-<p>
-</p>
-<a name="node_sec_4.1"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.1">4.1&nbsp;&nbsp;Notation</a></h2>
-<p></p>
-<p>
-The formal syntax for Scheme is written in an extended BNF.
-Non-terminals are written using angle brackets.  Case is insignificant
-for non-terminal names.</p>
-<p>
-All spaces in the grammar are for legibility.
-&lt;Empty&gt; stands for the empty string.</p>
-<p>
-The following extensions to BNF are used to make the description more
-concise:  &lt;thing&gt;* means zero or more occurrences of
-&lt;thing&gt;, and &lt;thing&gt;<sup>+</sup> means at least one
-&lt;thing&gt;.</p>
-<p>
-Some non-terminal names refer to the Unicode scalar values of the same
-name: &lt;character tabulation&gt; (U+0009), &lt;linefeed&gt; (U+000A),
-&lt;carriage return&gt; (U+000D), &lt;line tabulation&gt; (U+000B),
-&lt;form feed&gt; (U+000C), &lt;carriage return&gt; (U+000D),
-&lt;space&gt; (U+0020), &lt;next line&gt; (U+0085), &lt;line
-separator&gt; (U+2028), and &lt;paragraph separator&gt; (U+2029).</p>
-<p>
-</p>
-<a name="node_sec_4.2"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.2">4.2&nbsp;&nbsp;Lexical syntax</a></h2>
-<p></p>
-<p>
-The lexical syntax determines how a character sequence is split into a
-sequence of lexemes<a name="node_idx_116"></a>, omitting non-significant portions
-such as comments and whitespace.  The character sequence is assumed to
-be text according to the Unicode standard&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_27">27</a>].  Some of
-the lexemes, such as identifiers, representations of number objects, strings etc., of the lexical
-syntax are syntactic data in the datum syntax, and thus represent objects.
-Besides the formal account of the syntax, this section also describes
-what datum values are represented by these syntactic data.</p>
-<p>
-The lexical syntax, in the description of comments, contains
-a forward reference to &lt;datum&gt;, which is described as part of the
-datum syntax.  Being comments, however, these &lt;datum&gt;s do not play
-a significant role in the syntax.</p>
-<p>
-Case is significant except in representations of booleans, number objects, and
-in hexadecimal numbers specifying Unicode scalar values.  For example, <tt>#x1A</tt>
-and <tt>#X1a</tt> are equivalent.  The identifier <tt>Foo</tt> is, however,
-distinct from the identifier <tt>FOO</tt>.</p>
-<p>
-</p>
-<a name="node_sec_4.2.1"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.2.1">4.2.1&nbsp;&nbsp;Formal account</a></h3>
-<p></p>
-<p>
-&lt;Interlexeme space&gt; may occur on either side of any lexeme, but not
-within a lexeme.</p>
-<p>
-&lt;Identifier&gt;s, <tt>.</tt>, &lt;number&gt;s, &lt;character&gt;s, and
-&lt;boolean&gt;s, must be terminated by a &lt;delimiter&gt; or by the
-end of the input.</p>
-<p>
-The following two characters are reserved for future extensions to the
-language: <tt><code class=verbatim>{</code> <code class=verbatim>}</code></tt></p>
-<p>
-</p>
-<tt>&lt;lexeme&gt; &rarr; &lt;identifier&gt; | &lt;boolean&gt; | &lt;number&gt;<a name="node_idx_118"></a><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | &lt;character&gt; | &lt;string&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | ( | ) | <tt>[</tt> | <tt>]</tt> | <tt>#</tt>( | <tt>#</tt>vu8( | <tt>&#8217;</tt> | <tt>&#8216;</tt> | , | ,@ | <strong>.</strong><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | <tt>#</tt><tt>&#8217;</tt> | <tt>#</tt><tt>&#8216;</tt> | <tt>#</tt>, | <tt>#</tt>,@<br>
-&lt;delimiter&gt; &rarr; ( | ) | <tt>[</tt> | <tt>]</tt> | &quot; | ; | <tt>#</tt><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | &lt;whitespace&gt;<br>
-&lt;whitespace&gt; &rarr; &lt;character tabulation&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;linefeed&gt; | &lt;line tabulation&gt; | &lt;form feed&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;carriage return&gt; | &lt;next line&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;any character whose category is Zs, Zl, or Zp&gt;<br>
-&lt;line ending&gt; &rarr; &lt;linefeed&gt; | &lt;carriage return&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;carriage return&gt; &lt;linefeed&gt; | &lt;next line&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;carriage return&gt; &lt;next line&gt; | &lt;line separator&gt;<br>
-&lt;comment&gt; &rarr; ;  &lang;all subsequent characters up to a<br>
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;line ending&gt; or &lt;paragraph separator&gt;&rang;<a name="node_idx_120"></a><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;nested comment&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | #; &lt;interlexeme space&gt; &lt;datum&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | #!r6rs<br>
-&lt;nested comment&gt; &rarr; #|  &lt;comment text&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;comment cont&gt;* |#<br>
-&lt;comment text&gt; &rarr;  &lang;character sequence not containing<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <tt>#|</tt> or <tt>|#</tt>&rang;<br>
-&lt;comment cont&gt; &rarr; &lt;nested comment&gt; &lt;comment text&gt;<br>
-&lt;atmosphere&gt; &rarr; &lt;whitespace&gt; | &lt;comment&gt;<br>
-&lt;interlexeme space&gt; &rarr; &lt;atmosphere&gt;*</tt><p>
-
-</p>
-<p>
-
-</p>
-<tt>&lt;identifier&gt; &rarr; &lt;initial&gt; &lt;subsequent&gt;*<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | &lt;peculiar identifier&gt;<br>
-&lt;initial&gt; &rarr; &lt;constituent&gt; | &lt;special initial&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;inline hex escape&gt;<br>
-&lt;letter&gt; &rarr;  a | b | c | ... | z<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | A | B | C | ... | Z<br>
-&lt;constituent&gt; &rarr; &lt;letter&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lang;any character whose Unicode scalar value is greater than<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;127, and whose category is Lu, Ll, Lt, Lm, Lo, Mn,<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;Nl, No, Pd, Pc, Po, Sc, Sm, Sk, So, or Co&rang;<br>
-&lt;special initial&gt; &rarr; ! | $ | % | <code class=verbatim>&amp;</code> | * | / | : | &lt; | =<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | &gt; | ? | <code class=verbatim>^</code> | <code class=verbatim>_</code> | <code class=verbatim>~</code><br>
-&lt;subsequent&gt; &rarr; &lt;initial&gt; | &lt;digit&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | &lt;any character whose category is Nd, Mc, or Me&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | &lt;special subsequent&gt;<br>
-&lt;digit&gt; &rarr; 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9<br>
-&lt;hex digit&gt; &rarr; &lt;digit&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | a | A | b | B | c | C | d | D | e | E | f | F<br>
-&lt;special subsequent&gt; &rarr; + | - | . | @<br>
-&lt;inline hex escape&gt; &rarr; <tt>\</tt>x&lt;hex scalar value&gt;;<br>
-&lt;hex scalar value&gt; &rarr; &lt;hex digit&gt;<sup>+</sup><br>
-&lt;peculiar identifier&gt; &rarr; + | - | ... | -&gt; &lt;subsequent&gt;*<br>
-&lt;boolean&gt; &rarr; <tt>#t</tt> | #T | <tt>#f</tt> | #F<br>
-&lt;character&gt; &rarr; #<tt>\</tt>&lt;any character&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | #<tt>\</tt>&lt;character name&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | #<tt>\</tt>x&lt;hex scalar value&gt;<br>
-&lt;character name&gt; &rarr; nul | alarm | backspace | tab<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | linefeed | newline | vtab | page | return<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | esc | space | delete<br>
-&lt;string&gt; &rarr; &quot; &lt;string element&gt;* &quot;<br>
-&lt;string element&gt; &rarr; &lt;any character other than <tt>&quot;</tt> or <tt>\</tt>&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | <tt>\</tt>a | <tt>\</tt>b | <tt>\</tt>t | <tt>\</tt>n | <tt>\</tt>v | <tt>\</tt>f | <tt>\</tt>r<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | <tt>\</tt><tt>&quot;</tt> | <tt>\</tt><tt>\</tt><br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | <tt>\</tt>&lt;intraline whitespace&gt;&lt;line ending&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  &nbsp;&nbsp;&nbsp;&lt;intraline whitespace&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | &lt;inline hex escape&gt;<br>
-&lt;intraline whitespace&gt; &rarr; &lt;character tabulation&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;any character whose category is Zs&gt;</tt><p>
-A &lt;hex scalar value&gt; represents a Unicode scalar value
-between 0 and <tt>#</tt>x10FFFF, excluding the range
-[<tt>#</tt><em>x</em>D800, <tt>#</tt><em>x</em>DFFF].</p>
-<p>
-The rules for &lt;num <em>R</em>&gt;, &lt;complex <em>R</em>&gt;, &lt;real
-<em>R</em>&gt;, &lt;ureal <em>R</em>&gt;, &lt;uinteger <em>R</em>&gt;, and &lt;prefix <em>R</em>&gt; below
-should be replicated for <em>R</em>  =  2, 8, 10,
-and 16.  There are no rules for &lt;decimal 2&gt;, &lt;decimal
-8&gt;, and &lt;decimal 16&gt;, which means that number representations containing
-decimal points or exponents must be in decimal radix.</p>
-<p>
-</p>
-<tt>&lt;number&gt; &rarr; &lt;num 2&gt; | &lt;num 8&gt;<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | &lt;num 10&gt; | &lt;num 16&gt;<br>
-&lt;num <em>R</em>&gt; &rarr; &lt;prefix <em>R</em>&gt; &lt;complex <em>R</em>&gt;<br>
-&lt;complex <em>R</em>&gt; &rarr; &lt;real <em>R</em>&gt; | &lt;real <em>R</em>&gt; @ &lt;real <em>R</em>&gt;<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;real <em>R</em>&gt; + &lt;ureal <em>R</em>&gt; i | &lt;real <em>R</em>&gt; - &lt;ureal <em>R</em>&gt; i<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;real <em>R</em>&gt; + &lt;naninf&gt; i | &lt;real <em>R</em>&gt; - &lt;naninf&gt; i<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;real <em>R</em>&gt; + i | &lt;real <em>R</em>&gt; - i<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | + &lt;ureal <em>R</em>&gt; i | - &lt;ureal <em>R</em>&gt; i <br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | + &lt;naninf&gt; i | - &lt;naninf&gt; i<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | + i | - i<br>
-&lt;real <em>R</em>&gt; &rarr; &lt;sign&gt; &lt;ureal <em>R</em>&gt;<br>
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | + &lt;naninf&gt; | - &lt;naninf&gt;<br>
-&lt;naninf&gt; &rarr; nan.0 | inf.0<br>
-&lt;ureal <em>R</em>&gt; &rarr; &lt;uinteger <em>R</em>&gt;<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;uinteger <em>R</em>&gt; / &lt;uinteger <em>R</em>&gt;<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;decimal <em>R</em>&gt; &lt;mantissa width&gt;<br>
-&lt;decimal 10&gt; &rarr; &lt;uinteger 10&gt; &lt;suffix&gt;<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | . &lt;digit 10&gt;<sup>+</sup> &lt;suffix&gt;<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;digit 10&gt;<sup>+</sup> . &lt;digit 10&gt;* &lt;suffix&gt;<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;digit 10&gt;<sup>+</sup> . &lt;suffix&gt;<br>
-&lt;uinteger <em>R</em>&gt; &rarr; &lt;digit <em>R</em>&gt;<sup>+</sup><br>
-&lt;prefix <em>R</em>&gt; &rarr; &lt;radix <em>R</em>&gt; &lt;exactness&gt;<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;exactness&gt; &lt;radix <em>R</em>&gt;<br>
-</tt><p>
-</p>
-<tt>&lt;suffix&gt; &rarr; &lt;empty&gt; <br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &lt;exponent marker&gt; &lt;sign&gt; &lt;digit 10&gt;<sup>+</sup><br>
-&lt;exponent marker&gt; &rarr; e | E | s | S | f | F<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | d | D | l | L<br>
-&lt;mantissa width&gt; &rarr; &lt;empty&gt;<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | | &lt;digit 10&gt;<sup>+</sup><br>
-&lt;sign&gt; &rarr; &lt;empty&gt;  | + |  -<br>
-&lt;exactness&gt; &rarr; &lt;empty&gt;<br>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | #i<a name="node_idx_122"></a>| #I | #e<a name="node_idx_124"></a>| #E<br>
-&lt;radix 2&gt; &rarr; #b<a name="node_idx_126"></a>| #B<br>
-&lt;radix 8&gt; &rarr; #o<a name="node_idx_128"></a>| #O<br>
-&lt;radix 10&gt; &rarr; &lt;empty&gt; | #d | #D<br>
-&lt;radix 16&gt; &rarr; #x<a name="node_idx_130"></a>| #X<br>
-&lt;digit 2&gt; &rarr; 0 | 1<br>
-&lt;digit 8&gt; &rarr; 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7<br>
-&lt;digit 10&gt; &rarr; &lt;digit&gt;<br>
-&lt;digit 16&gt; &rarr; &lt;hex digit&gt;<br>
-</tt><p>
-</p>
-<a name="node_sec_4.2.2"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.2.2">4.2.2&nbsp;&nbsp;Line endings</a></h3>
-<p></p>
-<p>
-Line endings are significant in Scheme in single-line comments (see
-section&nbsp;<a href="#node_sec_4.2.3">4.2.3</a>) and within string literals.  In
-Scheme source code, any of the line endings in &lt;line ending&gt;
-marks the end of a line.  Moreover, the two-character line endings
-&lt;carriage return&gt; &lt;linefeed&gt; and &lt;carriage return&gt;
-&lt;next line&gt; each count as a single line ending.</p>
-<p>
-In a string literal, a &lt;line ending&gt; not preceded by a <tt><tt>\</tt></tt>
-stands for a linefeed character, which is the standard line-ending
-character of Scheme.</p>
-<p>
-</p>
-<a name="node_sec_4.2.3"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.2.3">4.2.3&nbsp;&nbsp;Whitespace and comments</a></h3>
-<p></p>
-<p>
-<a name="node_idx_132"></a><em>Whitespace</em> characters are spaces, linefeeds,
-carriage returns, character tabulations, form feeds, line tabulations,
-and any other character whose category is Zs, Zl, or Zp.
-Whitespace is used for improved readability and
-as necessary to separate lexemes from each other.  Whitespace may
-occur between any two lexemes,
-but not within a lexeme.  Whitespace may also occur inside a string,
-where it is significant.</p>
-<p>
-The lexical syntax includes several comment forms. In all cases,
-comments are invisible to Scheme, except that they act as delimiters,
-so, for example, a comment cannot appear in the middle of an
-identifier or representation of a number object.</p>
-<p>
-A semicolon (<tt>;</tt>) indicates the start of a line
-comment.<a name="node_idx_134"></a><a name="node_idx_136"></a>The comment continues to
-the end of the line on which the semicolon appears.</p>
-<p>
-Another way to indicate a comment is to prefix a &lt;datum&gt;
-(cf. section&nbsp;<a href="#node_sec_4.3.1">4.3.1</a>) with <tt>#;</tt><a name="node_idx_138"></a>, possibly with
-&lt;interlexeme space&gt; before the &lt;datum&gt;.  The comment consists of
-the comment prefix <tt>#;</tt> and the &lt;datum&gt; together.  This
-notation is useful for &#8220;commenting out&#8221; sections of code.</p>
-<p>
-Block comments may be indicated with properly nested <tt>#|</tt><a name="node_idx_140"></a><a name="node_idx_142"></a>and <tt>|#</tt> pairs.</p>
-<p>
-</p>
-
-<tt>#|<br>
-&nbsp;&nbsp;&nbsp;The&nbsp;FACT&nbsp;procedure&nbsp;computes&nbsp;the&nbsp;factorial<br>
-&nbsp;&nbsp;&nbsp;of&nbsp;a&nbsp;non-negative&nbsp;integer.<br>
-|#<br>
-(define&nbsp;fact<br>
-&nbsp;&nbsp;(lambda&nbsp;(n)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;base&nbsp;case<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(=&nbsp;n&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#;(=&nbsp;n&nbsp;1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;identity&nbsp;of&nbsp;*<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(*&nbsp;n&nbsp;(fact&nbsp;(-&nbsp;n&nbsp;1))))))<p></tt></p>
-<p>
-The lexeme <tt><tt>#</tt>!r6rs</tt>, which signifies that the program text
-that follows is written with the lexical and datum syntax described in this
-report, is also otherwise treated as a comment.</p>
-<p>
-</p>
-<a name="node_sec_4.2.4"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.2.4">4.2.4&nbsp;&nbsp;Identifiers</a></h3>
-<p></p>
-<p>
-Most identifiers<a name="node_idx_144"></a>allowed by other programming
-languages are also acceptable to Scheme.  In general,
-a sequence of letters, digits, and &#8220;extended alphabetic
-characters&#8221; is
-an identifier when it begins with a character that cannot begin a
-representation of a number object.
-In addition, <tt>+</tt>, <tt>-</tt>, and <tt>...</tt> are identifiers, as is
-a sequence of letters, digits, and extended alphabetic
-characters that begins with the two-character sequence <tt>-&gt;</tt>.
-Here are some examples of identifiers:</p>
-<p>
-</p>
-
-<tt>lambda&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;q&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;soup<br>
-list-&gt;vector&nbsp;&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;V17a<br>
-&lt;=&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;a34kTMNs&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&gt;-<br>
-the-word-recursion-has-many-meanings<p></tt></p>
-<p>
-Extended alphabetic characters may be used within identifiers as if
-they were letters.  The following are extended alphabetic characters:</p>
-<p>
-</p>
-
-<tt>! $&nbsp;%&nbsp;<code class=verbatim>&amp;</code>&nbsp;*&nbsp;+&nbsp;-&nbsp;.&nbsp;/&nbsp;: &lt;&nbsp;=&nbsp;&gt;&nbsp;?&nbsp;@&nbsp;<code class=verbatim>^</code>&nbsp;<code class=verbatim>_</code>&nbsp;<code class=verbatim>~</code>&nbsp;<p></tt></p>
-<p>
-Moreover, all characters whose Unicode scalar values are greater than 127 and
-whose Unicode category is Lu, Ll, Lt, Lm, Lo, Mn, Mc, Me, Nd, Nl, No, Pd,
-Pc, Po, Sc, Sm, Sk, So, or Co can be used within identifiers.
-In addition, any character can be used within an identifier
-when specified via an &lt;inline hex escape&gt;.  For example, the
-identifier <code class=verbatim>H\x65;llo</code> is the same as the identifier
-<code class=verbatim>Hello</code>, and the identifier <code class=verbatim>\x3BB;</code> is the same as the
-identifier &lambda;.</p>
-<p>
-Any identifier may be used as a variable<a name="node_idx_146"></a>or as a
-syntactic keyword<a name="node_idx_148"></a>(see
-sections&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.2">5.2</a> and&nbsp;<a href="r6rs-Z-H-12.html#node_sec_9.2">9.2</a>) in a Scheme
-program.
-Any identifier may also be used as a syntactic datum, in which case it
-represents a <i>symbol</i><a name="node_idx_150"></a>(see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.10">11.10</a>).</p>
-<p>
-</p>
-<a name="node_sec_4.2.5"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.2.5">4.2.5&nbsp;&nbsp;Booleans</a></h3>
-<p>The standard boolean objects for true and false have external representations
-<tt>#t</tt> and <tt>#f</tt>.<a name="node_idx_152"></a><a name="node_idx_154"></a></p>
-<p>
-</p>
-<a name="node_sec_4.2.6"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.2.6">4.2.6&nbsp;&nbsp;Characters</a></h3>
-<p>Characters are represented using the notation
-<tt>#</tt><tt>\</tt>&lt;character&gt;<a name="node_idx_156"></a>or
-<tt>#</tt><tt>\</tt>&lt;character name&gt; or
-<tt>#</tt><tt>\</tt>x&lt;hex scalar value&gt;.</p>
-<p>
-For example:</p>
-<p>
-
-</p>
-<table border=0><tr><td valign=top ><tt>#<tt>\</tt>a</tt>          </td><td valign=top >lower case letter a</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>A</tt>          </td><td valign=top >upper case letter A</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>(</tt>          </td><td valign=top >left parenthesis</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt></tt>           </td><td valign=top >space character</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>nul</tt>        </td><td valign=top >U+0000</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>alarm</tt>      </td><td valign=top >U+0007</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>backspace</tt>  </td><td valign=top >U+0008</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>tab</tt>        </td><td valign=top >U+0009</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>linefeed</tt>   </td><td valign=top >U+000A</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>newline</tt>   </td><td valign=top >U+000A</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>vtab</tt>       </td><td valign=top >U+000B</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>page</tt>       </td><td valign=top >U+000C</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>return</tt>     </td><td valign=top >U+000D</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>esc</tt>        </td><td valign=top >U+001B</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>space</tt>      </td><td valign=top >U+0020</td></tr>
-<tr><td valign=top ></td><td valign=top >preferred way to write a space</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>delete</tt>     </td><td valign=top >U+007F</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>xFF</tt>        </td><td valign=top >U+00FF</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>x03BB</tt>      </td><td valign=top >U+03BB</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>x00006587</tt>  </td><td valign=top >U+6587</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>&lambda;</tt> </td><td valign=top >U+03BB</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>x0001z</tt>     </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>&lambda;x</tt>         </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>alarmx</tt>     </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>alarm x</tt>    </td><td valign=top >U+0007</td></tr>
-<tr><td valign=top ></td><td valign=top >followed by <tt>x</tt></td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>Alarm</tt>      </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>alert</tt>      </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>xA</tt>         </td><td valign=top >U+000A</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>xFF</tt>        </td><td valign=top >U+00FF</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>xff</tt>        </td><td valign=top >U+00FF</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>x ff</tt>       </td><td valign=top >U+0078</td></tr>
-<tr><td valign=top ></td><td valign=top >followed by another datum, <tt>ff</tt></td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>x(ff)</tt>      </td><td valign=top >U+0078</td></tr>
-<tr><td valign=top ></td><td valign=top >followed by another datum,</td></tr>
-<tr><td valign=top ></td><td valign=top >a parenthesized <tt>ff</tt></td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>(x)</tt>        </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>(x</tt>         </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>((x)</tt>       </td><td valign=top >U+0028</td></tr>
-<tr><td valign=top ></td><td valign=top >followed by another datum,</td></tr>
-<tr><td valign=top ></td><td valign=top >parenthesized <tt>x</tt></td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>x00110000</tt>  </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ></td><td valign=top >out of range</td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>x000000001</tt> </td><td valign=top >U+0001  </td></tr>
-<tr><td valign=top ><tt>#<tt>\</tt>xD800</tt>      </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ></td><td valign=top >in excluded range
-</td></tr></table>
-<p>
-(The notation <tt>&amp;lexical</tt> <i>exception</i> means that the line in question is
-a lexical syntax violation.)</p>
-<p>
-Case is significant in <tt>#</tt><tt>\</tt>&lt;character&gt;, and in
-<tt>#</tt><tt>\</tt>&lang;character name&rang;, but not in <tt><tt>#</tt><tt>\</tt>x</tt>&lt;hex scalar value&gt;.  
-A &lt;character&gt; must be followed by a &lt;delimiter&gt; or by the end of the input.
-This rule resolves various ambiguous cases involving named characters,
-requiring, for
-example, the sequence of characters &#8220;<tt><tt>#</tt><tt>\</tt>space</tt>&#8221;
-to be interpreted as the space character rather than as
-the character &#8220;<tt><tt>#</tt><tt>\</tt>s</tt>&#8221; followed
-by the identifier &#8220;<tt>pace</tt>&#8221;.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The <tt><tt>#</tt><tt>\</tt>newline</tt> notation is retained for
-backward compatibility.  Its use is deprecated;
-<tt><tt>#</tt><tt>\</tt>linefeed</tt> should be used instead.
-</blockquote><p>
-</p>
-<a name="node_sec_4.2.7"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.2.7">4.2.7&nbsp;&nbsp;Strings</a></h3>
-<p>String are represented by sequences of characters enclosed within doublequotes
-(<tt>&quot;</tt>).  Within a string literal, various escape
-sequences<a name="node_idx_158"></a>represent characters other than
-themselves.  Escape sequences always start with a backslash (<tt>\</tt>):</p>
-<p>
-</p>
-<ul>
-<li><p><tt><tt>\</tt>a</tt> : alarm, U+0007
-</p>
-<li><p><tt><tt>\</tt>b</tt> : backspace, U+0008 
-</p>
-<li><p><tt><tt>\</tt>t</tt> : character tabulation, U+0009 
-</p>
-<li><p><tt><tt>\</tt>n</tt> : linefeed, U+000A 
-</p>
-<li><p><tt><tt>\</tt>v</tt> : line tabulation, U+000B 
-</p>
-<li><p><tt><tt>\</tt>f</tt> : formfeed, U+000C 
-</p>
-<li><p><tt><tt>\</tt>r</tt> : return, U+000D 
-</p>
-<li><p><tt><tt>\</tt></tt><code class=verbatim>&quot;</code> : doublequote, U+0022 
-</p>
-<li><p><tt><tt>\</tt><tt>\</tt></tt> : backslash, U+005C 
-</p>
-<li><p><tt><tt>\</tt></tt>&lt;intraline whitespace&gt;&lt;line ending&gt;<br>
-&nbsp;&nbsp;&nbsp;&lt;intraline whitespace&gt; : nothing
-</p>
-<li><p><tt><tt>\</tt>x&lt;hex scalar value&gt;;</tt> : specified character (note the
-terminating semi-colon).
-</p>
-</ul><p></p>
-<p>
-These escape sequences are case-sensitive, except that the alphabetic
-digits of a &lt;hex scalar value&gt; can be uppercase or lowercase.</p>
-<p>
-Any other character in a string after a backslash is a syntax violation. Except
-for a line ending, any
-character outside of an escape sequence and not a doublequote stands
-for itself in the string literal. For example the single-character
-string literal <tt>&quot;&lambda;&quot;</tt> (doublequote, a lower case lambda, doublequote)
-represents the same string as <tt>&quot;<tt>\</tt>x03bb;&quot;</tt>.
-A line ending that does not follow a backslash stands for a linefeed character.</p>
-<p>
-Examples:</p>
-<p>
-</p>
-<table border=0><tr><td valign=top ><tt>&quot;abc&quot;</tt> </td><td valign=top >U+0061, U+0062, U+0063</td></tr>
-<tr><td valign=top ><tt>&quot;<tt>\</tt>x41;bc&quot;</tt> </td><td valign=top ><tt>&quot;Abc&quot;</tt> ; U+0041, U+0062, U+0063</td></tr>
-<tr><td valign=top ><tt>&quot;<tt>\</tt>x41; bc&quot;</tt> </td><td valign=top ><tt>&quot;A bc&quot;</tt></td></tr>
-<tr><td valign=top ></td><td valign=top >U+0041, U+0020, U+0062, U+0063</td></tr>
-<tr><td valign=top ><tt>&quot;<tt>\</tt>x41bc;&quot;</tt> </td><td valign=top >U+41BC</td></tr>
-<tr><td valign=top ><tt>&quot;<tt>\</tt>x41&quot;</tt> </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ><tt>&quot;<tt>\</tt>x;&quot;</tt> </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ><tt>&quot;<tt>\</tt>x41bx;&quot;</tt> </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ><tt>&quot;<tt>\</tt>x00000041;&quot;</tt> </td><td valign=top ><tt>&quot;A&quot;</tt> ; U+0041</td></tr>
-<tr><td valign=top ><tt>&quot;<tt>\</tt>x0010FFFF;&quot;</tt> </td><td valign=top >U+10FFFF</td></tr>
-<tr><td valign=top ><tt>&quot;<tt>\</tt>x00110000;&quot;</tt> </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ></td><td valign=top >out of range</td></tr>
-<tr><td valign=top ><tt>&quot;<tt>\</tt>x000000001;&quot;</tt> </td><td valign=top >U+0001</td></tr>
-<tr><td valign=top ><tt>&quot;<tt>\</tt>xD800;&quot;</tt> </td><td valign=top ><tt>&amp;lexical</tt> <i>exception</i></td></tr>
-<tr><td valign=top ></td><td valign=top >in excluded range</td></tr>
-<tr><td valign=top ><tt>&quot;A</tt></td></tr>
-<tr><td valign=top ><tt>bc&quot;</tt> </td><td valign=top >U+0041, U+000A, U+0062, U+0063</td></tr>
-<tr><td valign=top ></td><td valign=top >if no space occurs after the <tt>A</tt>
-</td></tr></table>
-<p>
-</p>
-<a name="node_sec_4.2.8"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.2.8">4.2.8&nbsp;&nbsp;Numbers</a></h3>
-<p></p>
-<p>
-The syntax of external representations for number objects is described
-formally by the &lt;number&gt; rule in the formal grammar.
-Case is not significant in external representations of number objects.</p>
-<p>
-A representation of a number object may be written in binary, octal, decimal, or
-hexadecimal by the use of a radix prefix.  The radix prefixes are <tt>#b</tt><a name="node_idx_160"></a>(binary), <tt>#o</tt><a name="node_idx_162"></a>(octal), <tt>#d</tt><a name="node_idx_164"></a>(decimal), and <tt>#x</tt><a name="node_idx_166"></a>(hexadecimal).  With
-no radix prefix, a representation of a number object is assumed to be expressed in decimal.</p>
-<p>
-A representation of a number object may be specified to be either exact or
-inexact by a prefix.  The prefixes are <tt>#e</tt><a name="node_idx_168"></a>for exact, and <tt>#i</tt><a name="node_idx_170"></a>for inexact.  An exactness
-prefix may appear before or after any radix prefix that is used.  If
-the representation of a number object has no exactness prefix, the
-constant is
-inexact if it contains a decimal point, an
-exponent, or
-a nonempty mantissa width;
-otherwise it is exact.</p>
-<p>
-In systems with inexact number objects
-of varying precisions, it may be useful to specify
-the precision of a constant.  For this purpose, representations of
-number objects
-may be written with an exponent marker that indicates the
-desired precision of the inexact
-representation.  The letters <tt>s</tt>, <tt>f</tt>,
-<tt>d</tt>, and <tt>l</tt> specify the use of <i>short</i>, <i>single</i>,
-<i>double</i>, and <i>long</i> precision, respectively.  (When fewer
-than four internal
-inexact
-representations exist, the four size
-specifications are mapped onto those available.  For example, an
-implementation with two internal representations may map short and
-single together and long and double together.)  In addition, the
-exponent marker <tt>e</tt> specifies the default precision for the
-implementation.  The default precision has at least as much precision
-as <i>double</i>, but
-implementations may wish to allow this default to be set by the user.</p>
-<p>
-</p>
-
-<tt>3.1415926535898F0&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Round&nbsp;to&nbsp;single,&nbsp;perhaps&nbsp;3.141593<br>
-0.6L0<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Extend&nbsp;to&nbsp;long,&nbsp;perhaps&nbsp;.600000000000000<p></tt></p>
-<p>
-A representation of a number object with nonempty mantissa width,
-<tt><i>x</i>|<i>p</i></tt>, represents the best binary
-floating-point approximation of <i>x</i> using a <i>p</i>-bit significand. 
-For example, <tt>1.1|53</tt> is a
-representation of the best approximation of 1.1 in IEEE double
-precision.
-If <i>x</i> is an external representation of an inexact real number object
-that contains no vertical bar, then its numerical value should be computed
-as though it had a mantissa width of 53 or more.</p>
-<p>
-Implementations that use binary floating-point representations
-of real number objects should represent <tt><i>x</i>|<i>p</i></tt>
-using a <i>p</i>-bit significand if practical, or by a greater
-precision if a <i>p</i>-bit significand is not practical, or
-by the largest available precision if <i>p</i> or more bits
-of significand are not practical within the implementation.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The precision of a significand should not be confused with the
-number of bits used to represent the significand.  In the IEEE
-floating-point standards, for example, the significand&#8217;s most
-significant bit is implicit in single and double precision but
-is explicit in extended precision.  Whether that bit is implicit
-or explicit does not affect the mathematical precision.
-In implementations that use binary floating point, the default
-precision can be calculated by calling the following procedure:<p>
-</p>
-
-<tt>(define&nbsp;(precision)<br>
-&nbsp;&nbsp;(do&nbsp;((n&nbsp;0&nbsp;(+&nbsp;n&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(x&nbsp;1.0&nbsp;(/&nbsp;x&nbsp;2.0)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;((=&nbsp;1.0&nbsp;(+&nbsp;1.0&nbsp;x))&nbsp;n)))<br>
-<p></tt>
-</p>
-</blockquote>      <p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-When the underlying floating-point representation is IEEE double
-precision, the <tt>|<i>p</i></tt> suffix should not always be omitted:
-Denormalized floating-point numbers have diminished precision,
-and therefore their external representations should
-carry a <tt>|<i>p</i></tt> suffix with the actual width of the
-significand.
-</blockquote><p>
-The literals <tt>+inf.0</tt> and <tt>-inf.0</tt> represent positive and
-negative infinity, respectively.  The <tt>+nan.0</tt>
-literal represents the NaN that is the result of <tt>(/ 0.0 0.0)</tt>,
-and may represent other NaNs as well.</p>
-<p>
-If <i>x</i> is an external representation of an inexact real number
-object and
-contains no vertical bar and no exponent marker
-other than <tt>e</tt>, the inexact real number object it represents is a flonum
-(see library section&nbsp;on &#8220;Flonums&#8221;).
-Some or all of the other external representations of
-inexact real number objects may also represent flonums, but that is not required by
-this report.</p>
-<p>
-</p>
-<a name="node_sec_4.3"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.3">4.3&nbsp;&nbsp;Datum syntax</a></h2>
-<p></p>
-<p>
-The datum syntax describes the syntax of
-syntactic data<a name="node_idx_172"></a>in terms of a sequence of
-&lt;lexeme&gt;s, as defined in the lexical syntax.</p>
-<p>
-Syntactic data include the lexeme data described in the
-previous section as well as the following constructs for forming
-compound data:
-</p>
-<ul>
-<li><p>pairs and lists, enclosed by <code class=verbatim>( )</code> or <code class=verbatim>[ ]</code> (see
-section&nbsp;<a href="#node_sec_4.3.2">4.3.2</a>)
-</p>
-<li><p>vectors (see section&nbsp;<a href="#node_sec_4.3.3">4.3.3</a>)
-</p>
-<li><p>bytevectors (see section&nbsp;<a href="#node_sec_4.3.4">4.3.4</a>)
-</p>
-</ul><p></p>
-<p>
-</p>
-<a name="node_sec_4.3.1"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.3.1">4.3.1&nbsp;&nbsp;Formal account</a></h3>
-<p></p>
-<p>
-The following grammar describes the syntax of syntactic data in terms
-of various kinds of lexemes defined in the grammar in
-section&nbsp;<a href="#node_sec_4.2">4.2</a>:</p>
-<p>
-</p>
-<tt>&lt;datum&gt; &rarr; &lt;lexeme datum&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | &lt;compound datum&gt;<br>
-&lt;lexeme datum&gt; &rarr; &lt;boolean&gt; | &lt;number&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  | &lt;character&gt; | &lt;string&gt; |  &lt;symbol&gt;<br>
-&lt;symbol&gt; &rarr; &lt;identifier&gt;<br>
-&lt;compound datum&gt; &rarr; &lt;list&gt; | &lt;vector&gt; | &lt;bytevector&gt;<br>
-&lt;list&gt; &rarr; (&lt;datum&gt;*) | [&lt;datum&gt;*]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    | (&lt;datum&gt;<sup>+</sup> . &lt;datum&gt;) | [&lt;datum&gt;<sup>+</sup> . &lt;datum&gt;]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    | &lt;abbreviation&gt;<br>
-&lt;abbreviation&gt; &rarr; &lt;abbrev prefix&gt; &lt;datum&gt;<br>
-&lt;abbrev prefix&gt; &rarr; &#8217; | &#8216; | , | ,@<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    | #&#8217; | #&#8216; | #, | #,@<br>
-&lt;vector&gt; &rarr; #(&lt;datum&gt;*)<br>
-&lt;bytevector&gt; &rarr; #vu8(&lt;u8&gt;*)<br>
-&lt;u8&gt; &rarr; &lang;any &lt;number&gt; representing an exact<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;integer in {0, <tt>...</tt>, 255}&rang;</tt><p>
-</p>
-<a name="node_sec_4.3.2"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.3.2">4.3.2&nbsp;&nbsp;Pairs and lists</a></h3>
-<p></p>
-<p>
-List and pair data, representing pairs and lists of values
-(see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.9">11.9</a>) are represented using parentheses or brackets.
-Matching pairs of brackets that occur in the rules of &lt;list&gt; are
-equivalent to matching pairs of parentheses.</p>
-<p>
-The most general notation for Scheme pairs as syntactic data is
-the &#8220;dotted&#8221; notation <tt>(&lt;datum<sub>1</sub>&gt; . &lt;datum<sub>2</sub>&gt;)</tt> where
-&lt;datum<sub>1</sub>&gt; is the representation of the value of the car field and
-&lt;datum<sub>2</sub>&gt; is the representation of the value of the
-cdr field.  For example <tt>(4 . 5)</tt> is a pair whose car is 4 and whose
-cdr is 5.</p>
-<p>
-A more streamlined notation can be used for lists: the elements of the
-list are simply enclosed in parentheses and separated by spaces.  The
-empty list<a name="node_idx_174"></a>is represented by <tt>()</tt> .  For example,</p>
-<p>
-</p>
-
-<tt>(a&nbsp;b&nbsp;c&nbsp;d&nbsp;e)<p></tt></p>
-<p>
-and</p>
-<p>
-</p>
-
-<tt>(a&nbsp;.&nbsp;(b&nbsp;.&nbsp;(c&nbsp;.&nbsp;(d&nbsp;.&nbsp;(e&nbsp;.&nbsp;())))))<p></tt></p>
-<p>
-are equivalent notations for a list of symbols.</p>
-<p>
-The general rule is that, if a dot is followed by an open parenthesis,
-the dot, open parenthesis, and matching closing parenthesis
-can be omitted in the external representation.</p>
-<p>
-The sequence of characters &#8220;<tt>(4 . 5)</tt>&#8221; is the external representation of a
-pair, not an expression that evaluates to a pair.
-Similarly, the sequence of characters &#8220;<tt>(+ 2 6)</tt>&#8221; is <em>not</em> an
-external representation of the integer 8, even though it <em>is</em> an
-expression (in the language of the <tt>(rnrs base (6))</tt> library)
-evaluating to the integer 8; rather, it is a
-syntactic datum representing a three-element list, the elements of which
-are the symbol <tt>+</tt> and the integers 2 and 6.</p>
-<p>
-</p>
-<a name="node_sec_4.3.3"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.3.3">4.3.3&nbsp;&nbsp;Vectors</a></h3>
-<p></p>
-<p>
-Vector data, representing vectors of objects (see
-section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.13">11.13</a>), are represented using the notation
-<tt>#(&lt;datum&gt; <tt>...</tt>)</tt>.  For example, a vector of length 3
-containing the number object for zero in element 0, the list <tt>(2 2 2 2)</tt> in
-element 1, and the string <tt>&quot;Anna&quot;</tt> in element 2 can be represented as
-follows:</p>
-<p>
-</p>
-
-<tt>#(0&nbsp;(2&nbsp;2&nbsp;2&nbsp;2)&nbsp;&quot;Anna&quot;)<p></tt></p>
-<p>
-This is the external representation of a vector, not an
-expression that evaluates to a vector.</p>
-<p>
-</p>
-<a name="node_sec_4.3.4"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.3.4">4.3.4&nbsp;&nbsp;Bytevectors</a></h3>
-<p></p>
-<p>
-Bytevector data, representing bytevectors (see
-library chapter&nbsp;on &#8220;Bytevectors&#8221;), are represented using the notation
-<tt>#vu8(&lt;u8&gt; <tt>...</tt>)</tt>, where the &lt;u8&gt;s represent the octets of
-the bytevector.  For example, a bytevector of length 3 containing the
-octets 2, 24, and 123 can be represented as follows:</p>
-<p>
-</p>
-
-<tt>#vu8(2&nbsp;24&nbsp;123)<p></tt></p>
-<p>
-This is the external representation of a bytevector, and also an
-expression that evaluates to a bytevector.</p>
-<p>
-</p>
-<a name="node_sec_4.3.5"></a>
-<h3 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_4.3.5">4.3.5&nbsp;&nbsp;Abbreviations</a></h3>
-<p><div style="height: -9.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<p>
-</p>
-<p></p>
-<div align=left><tt><tt>&#8217;</tt>&lt;datum&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-
-<div align=left><tt><tt>&#8216;</tt>&lt;datum&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-
-<div align=left><tt>,&lt;datum&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-
-<div align=left><tt>,<tt>@</tt>&lt;datum&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-
-<div align=left><tt>#&#8217;&lt;datum&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-
-<div align=left><tt>#<tt>&#8216;</tt>&lt;datum&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-
-<div align=left><tt>#,&lt;datum&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-
-<div align=left><tt>#,@&lt;datum&gt;</tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-<p>
-Each of these is an abbreviation:
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a name="node_idx_176"></a><tt>&#8217;</tt>&lt;datum&gt;
-for <tt>(quote &lt;datum&gt;)</tt>,
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a name="node_idx_178"></a><tt>&#8216;</tt>&lt;datum&gt;
-for <tt>(quasiquote &lt;datum&gt;)</tt>,
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a name="node_idx_180"></a><tt>,</tt>&lt;datum&gt;
-for <tt>(unquote &lt;datum&gt;)</tt>,
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a name="node_idx_182"></a><tt>,</tt><tt>@</tt>&lt;datum&gt;
-for <tt>(unquote-splicing &lt;datum&gt;)</tt>,
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a name="node_idx_184"></a><tt>#&#8217;</tt>&lt;datum&gt;
-for <tt>(syntax &lt;datum&gt;)</tt>,
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a name="node_idx_186"></a><tt>#&#8216;</tt>&lt;datum&gt;
-for <tt>(quasisyntax &lt;datum&gt;)</tt>,
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a name="node_idx_188"></a><tt>#,</tt>&lt;datum&gt;
-for <tt>(unsyntax &lt;datum&gt;)</tt>, and
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a name="node_idx_190"></a><tt>#,@</tt>&lt;datum&gt;
-for <tt>(unsyntax-splicing &lt;datum&gt;)</tt>.
-</p>
-<p></p>
-<p>
-     </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-6.html">previous</a></span><span>, <a href="r6rs-Z-H-8.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-8.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-8.html
deleted file mode 100644
index 48479a4192..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-8.html
+++ /dev/null
@@ -1,428 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-7.html">previous</a></span><span>, <a href="r6rs-Z-H-9.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_5"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_5">Chapter 5</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_5">Semantic concepts</a></h1>
-<p></p>
-<p>
-</p>
-<a name="node_sec_5.1"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.1">5.1&nbsp;&nbsp;Programs and libraries</a></h2>
-<p>A Scheme program consists of a <i>top-level program<a name="node_idx_192"></a></i>
-together with a set of <i>libraries<a name="node_idx_194"></a></i>, each
-of which defines a part of the program connected to the others through
-explicitly specified exports and imports.  A library consists of a set
-of export and import specifications and a body, which consists of
-definitions, and expressions.
-A top-level program is similar to a library, but
-has no export specifications.
-Chapters&nbsp;<a href="r6rs-Z-H-10.html#node_chap_7">7</a> and <a href="r6rs-Z-H-11.html#node_chap_8">8</a>
-describe the syntax and semantics of libraries and top-level programs,
-respectively. 
-Chapter&nbsp;<a href="r6rs-Z-H-14.html#node_chap_11">11</a> describes a base
-library that defines many of the constructs traditionally associated with
-Scheme.
-A separate report&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_24">24</a>]
-describes the various <i>standard libraries</i><a name="node_idx_196"></a>provided by a Scheme system.</p>
-<p>
-The division between the base library and the other standard libraries is
-based on use, not on construction.  In particular, some facilities
-that are typically implemented as &#8220;primitives&#8221; by a compiler or the
-run-time system rather than in terms of other standard procedures
-or syntactic forms are not part of the base library, but are defined in
-separate libraries.  Examples include the fixnums and flonums libraries,
-the exceptions and conditions libraries, and the libraries for
-records.</p>
-<p>
-</p>
-<a name="node_sec_5.2"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.2">5.2&nbsp;&nbsp;Variables, keywords, and regions</a></h2>
-<p>
-</p>
-<p>
-Within the body of a library or top-level program,
-an identifier<a name="node_idx_198"></a>may name a kind of syntax, or it may name
-a location where a value can be stored.  An identifier that names a kind
-of syntax is called a <em>keyword</em><a name="node_idx_200"></a>, or <em>syntactic keyword</em><a name="node_idx_202"></a>,
-and is said to be <em>bound</em> to that kind of syntax (or, in the case of a
-syntactic abstraction, a <em>transformer</em> that translates the syntax into more
-primitive forms; see section&nbsp;<a href="r6rs-Z-H-12.html#node_sec_9.2">9.2</a>).  An identifier that names a
-location is called a <em>variable</em><a name="node_idx_204"></a>and is said to be
-<em>bound</em> to that location.  
-At each point within a top-level program or a library, a specific, fixed set
-of identifiers is bound.  The set of these identifiers, the set of <i>visible
-bindings</i><a name="node_idx_206"></a>, is
-known as the <em>environment</em> in effect at that point.</p>
-<p>
-Certain forms are used to create syntactic abstractions
-and to bind keywords to transformers for those new syntactic abstractions, while other
-forms create new locations and bind variables to those
-locations.  Collectively, these forms are called <em>binding
-constructs</em>.<a name="node_idx_208"></a>Some binding constructs take the form of
-<i>definitions</i><a name="node_idx_210"></a>, while others are
-expressions.
-With the exception of exported library bindings, a binding created
-by a definition is visible only within the body in which the
-definition appears, e.g., the body of a library, top-level program,
-or <tt>lambda</tt> expression.
-Exported library bindings are also visible within the bodies of
-the libraries and top-level programs that import them (see
-chapter&nbsp;<a href="r6rs-Z-H-10.html#node_chap_7">7</a>).</p>
-<p>
-Expressions that bind variables include the <tt>lambda</tt>,
-<tt>let</tt>, <tt>let*</tt>, <tt>letrec</tt>, <tt>letrec*</tt>, <tt>let-values</tt>,
-and <tt>let*-values</tt> forms from the base library (see
-sections&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.4.2">11.4.2</a>, <a href="r6rs-Z-H-14.html#node_sec_11.4.6">11.4.6</a>).
-Of these, <tt>lambda</tt> is the most fundamental.
-Variable definitions appearing within the body of 
-such an expression, or within the bodies of a library or top-level
-program, are treated as a set of
-<tt>letrec*</tt> bindings.
-In addition, for library bodies, 
-the variables exported from the library can be referenced by
-importing libraries and top-level programs.</p>
-<p>
-Expressions that bind keywords include the <tt>let-syntax</tt> and <tt>letrec-syntax</tt> forms (see
-section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.18">11.18</a>).  A <tt>define</tt> form (see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.2.1">11.2.1</a>) is a
-definition that creates a variable binding (see 
-section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.2">11.2</a>), and a <tt>define-syntax</tt> form is
-a definition that creates a keyword binding (see
-section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.2.2">11.2.2</a>).</p>
-<p>
-Scheme is a statically scoped language with
-block structure.  To each place in a top-level program or library body where an identifier is bound 
-there corresponds a <a name="node_idx_212"></a><em>region</em> of code within which
-the binding is visible.  The region is determined by the particular
-binding construct that establishes the binding; if the binding is
-established by a <tt>lambda</tt> expression, for example, then its region
-is the entire <tt>lambda</tt> expression.  Every mention of an identifier
-refers to the binding of the identifier that establishes the
-innermost of the regions containing the use.  If a use of an
-identifier appears in a place where none of the surrounding expressions
-contains a binding for the identifier, the use may refer to a
-binding established by a definition or import at the top of the
-enclosing library or top-level program
-(see chapter&nbsp;<a href="r6rs-Z-H-10.html#node_chap_7">7</a>).
-If there is no binding for the identifier,
-it is said to be <a name="node_idx_214"></a><em>unbound</em>.<a name="node_idx_216"></a></p>
-<p>
-</p>
-<a name="node_sec_5.3"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.3">5.3&nbsp;&nbsp;Exceptional situations</a></h2>
-<p></p>
-<p>
-<a name="node_idx_218"></a>A variety of exceptional situations
-are distinguished in this report, among them violations of syntax,
-violations of a procedure&#8217;s specification, violations of
-implementation restrictions, and exceptional situations in the
-environment.  When an exceptional situation is detected by the
-implementation, an <i>exception is raised</i><a name="node_idx_220"></a>,
-which means that a special procedure called the <i>current
-exception handler</i> is called.  A program can also raise an
-exception, and override the current exception handler; see
-library section&nbsp;on &#8220;Exceptions&#8221;.</p>
-<p>
-When an exception is raised, an object is provided that
-describes the nature of the exceptional situation.  The report uses
-the condition system described in library section&nbsp;on &#8220;Conditions&#8221; to
-describe exceptional situations, classifying them by condition types.</p>
-<p>
-Some exceptional situations allow continuing the program if the
-exception handler takes appropriate action.  The corresponding
-exceptions are called <i>continuable</i><a name="node_idx_222"></a>.
-For most of the exceptional situations described in this report,
-portable programs cannot rely upon the exception being continuable
-at the place where the situation was detected.
-For those exceptions, the exception handler that is invoked by the
-exception should not return.
-In some cases, however, continuing is permissible, and the
-handler may return.  See library section&nbsp;on &#8220;Exceptions&#8221;.</p>
-<p>
-Implementations must raise an exception
-when they are unable to continue correct execution
-of a correct program due to some <a name="node_idx_224"></a><em>implementation restriction</em>.  For
-example, an implementation that does not support infinities
-must raise an exception with condition type
-<tt>&amp;implementation-restriction</tt> when it evaluates an expression
-whose result would be an infinity.</p>
-<p>
-Some possible implementation restrictions such as the lack of
-representations for NaNs and infinities (see
-section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.7.2">11.7.2</a>) are anticipated by this report,
-and implementations typically must raise an exception of the
-appropriate condition type if they encounter such a situation.</p>
-<p>
-This report uses the phrase &#8220;an exception is raised&#8221; synonymously
-with &#8220;an exception must be raised&#8221;.
-This report uses the phrase &#8220;an exception with condition type <i>t</i>&#8221;
-to indicate that the object provided with the
-exception is a condition object of the specified type.
-The phrase &#8220;a continuable exception is raised&#8221; indicates an
-exceptional situation that permits the exception handler to return.</p>
-<p>
-</p>
-<a name="node_sec_5.4"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.4">5.4&nbsp;&nbsp;Argument checking</a></h2>
-<p></p>
-<p>
-<a name="node_idx_226"></a>Many procedures specified in this report or as part of a
-standard library restrict the arguments they accept.
-Typically, a procedure accepts only specific numbers and types of arguments.
-Many syntactic forms similarly restrict the values to which one or
-more of their subforms can evaluate.
-These restrictions imply responsibilities<a name="node_idx_228"></a>for
-both the programmer and the implementation.
-Specifically, the programmer is responsible for ensuring
-that the values indeed adhere to the restrictions described
-in the specification.  The implementation must check
-that the restrictions in the specification are indeed met, to the
-extent that it is reasonable, possible, and necessary to allow the
-specified operation to complete successfully.  The implementation&#8217;s
-responsibilities are specified in more detail in
-chapter&nbsp;<a href="r6rs-Z-H-9.html#node_chap_6">6</a> and throughout the report.</p>
-<p>
-Note that it is not always possible for an implementation to completely check
-the restrictions set forth in a specification.  For example, if an
-operation is specified to accept a procedure with specific properties,
-checking of these properties is undecidable in general.  Similarly,
-some operations accept both lists and procedures that are
-called by these operations.  Since lists can be mutated by the procedures
-through the <tt>(rnrs mutable-pairs (6))</tt> library (see library
-chapter&nbsp;on &#8220;Mutable pairs&#8221;), an argument that is a list
-when the operation starts may become a non-list during the execution of the operation.
-Also, the procedure might escape to a different continuation,
-preventing the operation from performing more checks.
-Requiring the operation to check that the argument is a list after
-each call to such a procedure would be impractical.  Furthermore, some
-operations that accept lists only need to traverse these lists
-partially to perform their function; requiring the implementation to
-traverse the remainder of the list to verify that all specified
-restrictions have been met might
-violate reasonable performance assumptions.  For these reasons, the
-programmer&#8217;s obligations may exceed the checking obligations of the
-implementation.</p>
-<p>
-When an implementation detects a violation of a restriction for an
-argument, it must raise an exception with condition type
-<tt>&amp;assertion</tt> in a way consistent with the safety of execution as
-described in section&nbsp;<a href="#node_sec_5.6">5.6</a>.</p>
-<p>
-</p>
-<a name="node_sec_5.5"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.5">5.5&nbsp;&nbsp;Syntax violations</a></h2>
-<p>The subforms of a special form usually need to obey certain syntactic
-restrictions.  As forms may be subject to macro expansion, which may
-not terminate, the question of whether they obey the specified
-restrictions is undecidable in general.</p>
-<p>
-When macro expansion terminates, however, implementations must detect
-violations of the syntax.  A <a name="node_idx_230"></a><em>syntax violation</em> is an error
-with respect to the syntax of library bodies, top-level bodies,
-or the &#8220;syntax&#8221; entries in the
-specification of the base library or the standard libraries.
-Moreover, attempting to assign to an immutable variable (i.e., the
-variables exported by a library; see
-section&nbsp;<a href="r6rs-Z-H-10.html#node_sec_7.1">7.1</a>) is also
-considered a syntax violation.</p>
-<p>
-If a top-level or library form in a program is not syntactically
-correct, then the implementation must raise an exception with
-condition type <tt>&amp;syntax</tt>, and execution of that top-level program
-or library must not be allowed to begin.</p>
-<p>
-</p>
-<a name="node_sec_5.6"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.6">5.6&nbsp;&nbsp;Safety</a></h2>
-<p></p>
-<p>
-The standard libraries whose exports are described by this document
-are said to be <a name="node_idx_232"></a><em>safe libraries</em>.  Libraries and top-level
-programs that import only from safe libraries are also said to be safe.</p>
-<p>
-As defined by this document, the Scheme programming language
-is safe in the following sense:
-The execution of a safe top-level program
-cannot go so badly wrong as to crash or to continue to
-execute while behaving in ways that are
-inconsistent with the semantics described in this document,
-unless an exception is raised.</p>
-<p>
-Violations of an implementation restriction must raise an
-exception with condition type <tt>&amp;implementation-restriction</tt>,
-as must all
-violations and errors that would otherwise threaten system
-integrity in ways that might result in execution that is
-inconsistent with the semantics described in this document.</p>
-<p>
-The above safety properties are guaranteed only for top-level programs
-and libraries that are said to be safe.  In particular,
-implementations may provide access to unsafe libraries in ways that
-cannot guarantee safety.</p>
-<p>
-</p>
-<a name="node_sec_5.7"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.7">5.7&nbsp;&nbsp;Boolean values</a></h2>
-<p></p>
-<p>
-Although there is a separate boolean type, any Scheme value can be
-used as a boolean value for the purpose of a conditional test.  In a
-conditional test, all values count as true in such a test except for
-<tt>#f</tt>.  This report uses the word &#8220;true&#8221; to refer to any
-Scheme value except <tt>#f</tt>, and the word &#8220;false&#8221; to refer to
-<tt>#f</tt>. <a name="node_idx_234"></a><a name="node_idx_236"></a></p>
-<p>
-</p>
-<a name="node_sec_5.8"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.8">5.8&nbsp;&nbsp;Multiple return values</a></h2>
-<p></p>
-<p>
-A Scheme expression can evaluate to an arbitrary finite number of
-values.  These values are passed to the expression&#8217;s continuation.</p>
-<p>
-Not all continuations accept any number of values. For example, a continuation that
-accepts the argument to a procedure call is guaranteed to accept
-exactly one value.  The effect of passing some other number of values
-to such a continuation is unspecified.  The <tt>call-with-values</tt>
-procedure
-described in section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.15">11.15</a> makes it possible to create
-continuations that accept specified numbers of return values.
-If the number of
-return values passed to a continuation created by a call to
-<tt>call-with-values</tt> is not accepted by its consumer
-that was passed in that call, then an exception is raised.
-A more complete description of the number of values accepted by
-different continuations and the consequences of passing an unexpected
-number of values is given in the description of the <tt>values</tt>
-procedure in section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.15">11.15</a>.</p>
-<p>
-A number of forms in the base library have sequences of expressions
-as subforms that are evaluated sequentially, with the return values of
-all but the last expression being discarded.  The continuations
-discarding these values accept any number of values.</p>
-<p>
-</p>
-<a name="node_sec_5.9"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.9">5.9&nbsp;&nbsp;Unspecified behavior</a></h2>
-<p>If an expression is said to &#8220;return unspecified values&#8221;,
-then the expression must evaluate without raising an exception, but
-the values returned depend on the implementation; this report
-explicitly does not say how many or what values should be returned.
-Programmers should not rely on a specific number of return values or
-the specific values themselves.
-<a name="node_idx_238"></a><a name="node_idx_240"></a></p>
-<p>
-</p>
-<a name="node_sec_5.10"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.10">5.10&nbsp;&nbsp;Storage model</a></h2>
-<p></p>
-<p>
-Variables and objects such as pairs, vectors, bytevectors, strings,
-hashtables, and records implicitly
-refer to locations<a name="node_idx_242"></a>or sequences of locations.  A string, for
-example, contains as many locations as there are characters in the string. 
-(These locations need not correspond to a full machine word.) A new value may be
-stored into one of these locations using the <tt>string-set!</tt> procedure, but
-the string contains the same locations as before.</p>
-<p>
-An object fetched from a location, by a variable reference or by
-a procedure such as <tt>car</tt>, <tt>vector-ref</tt>, or <tt>string-ref</tt>, is
-equivalent in the sense of <tt>eqv?</tt> (section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.5">11.5</a>)
-to the object last stored in the location before the fetch.</p>
-<p>
-Every location is marked to show whether it is in use.
-No variable or object ever refers to a location that is not in use.
-Whenever this report speaks of storage being allocated for a variable
-or object, what is meant is that an appropriate number of locations are
-chosen from the set of locations that are not in use, and the chosen
-locations are marked to indicate that they are now in use before the variable
-or object is made to refer to them.</p>
-<p>
-It is desirable for constants<a name="node_idx_244"></a>(i.e. the values of
-literal expressions) to reside in read-only memory.  To express this,
-it is convenient to imagine that every object that refers to locations
-is associated with a flag telling whether that object is
-mutable<a name="node_idx_246"></a>or immutable<a name="node_idx_248"></a>.  Literal
-constants, the strings returned by <tt>symbol-&gt;string</tt>, records with
-no mutable fields, and other values explicitly designated as immutable
-are immutable objects, while all objects created by the other
-procedures listed in this report are mutable.  An attempt to store a
-new value into a location referred to by an immutable object
-should raise an exception with condition type <tt>&amp;assertion</tt>.</p>
-<p>
-</p>
-<a name="node_sec_5.11"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.11">5.11&nbsp;&nbsp;Proper tail recursion</a></h2>
-<p></p>
-<p>
-Implementations of Scheme must be
-<em>properly tail-recursive</em><a name="node_idx_250"></a>.
-Procedure calls that occur in certain syntactic
-contexts called <i>tail contexts</i><a name="node_idx_252"></a>are <i>tail calls</i><a name="node_idx_254"></a>.  A Scheme implementation is
-properly tail-recursive if it supports an unbounded number of active
-tail calls.  A call is <em>active</em> if the called procedure may still
-return.  Note that this includes regular returns as well as returns
-through continuations captured earlier by
-<tt>call-with-current-continuation</tt> that are later invoked.
-In the absence of captured continuations, calls could
-return at most once and the active calls would be those that had not
-yet returned.
-A formal definition of proper tail recursion can be found
-in Clinger&#8217;s paper&nbsp;[<a href="r6rs-Z-H-21.html#node_bib_5">5</a>].  The rules for identifying tail calls
-in constructs from the <tt>(rnrs base (6))</tt> library are described in
-section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.20">11.20</a>.</p>
-<p>
-</p>
-<a name="node_sec_5.12"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_5.12">5.12&nbsp;&nbsp;Dynamic extent and the dynamic environment</a></h2>
-<p></p>
-<p>
-For a procedure call, the time between when it is initiated and when
-it returns is called its <a name="node_idx_256"></a><em>dynamic extent</em>.  In Scheme, <tt>call-with-current-continuation</tt>
-(section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.15">11.15</a>) allows reentering a
-dynamic extent after its procedure call has returned.  Thus, the
-dynamic extent of a call may not be a single, connected time period.</p>
-<p>
-Some operations described in the report acquire information in
-addition to their explicit arguments from the <a name="node_idx_258"></a><em>dynamic
-environment</em>.  For example, <tt>call-with-current-continuation</tt>
-accesses an implicit context established
-by <tt>dynamic-wind</tt> (section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.15">11.15</a>), and the <tt>raise</tt> procedure (library
-section&nbsp;on &#8220;Exceptions&#8221;) accesses the
-current exception handler.  The operations that modify the dynamic
-environment do so dynamically, for the dynamic extent of a call to a
-procedure like <tt>dynamic-wind</tt> or <tt>with-exception-handler</tt>.
-When such a call returns, the previous dynamic environment is
-restored.  The dynamic environment can be thought of as part of the
-dynamic extent of a call.  Consequently, it is captured by <tt>call-with-current-continuation</tt>, and restored by invoking the escape
-procedure it creates.</p>
-<p>
-   </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-7.html">previous</a></span><span>, <a href="r6rs-Z-H-9.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-9.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-9.html
deleted file mode 100644
index 7881c68d4a..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-H-9.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidecontent>
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-8.html">previous</a></span><span>, <a href="r6rs-Z-H-10.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<a name="node_chap_6"></a>
-<h1 class=chapter>
-<div class=chapterheading><a href="r6rs-Z-H-2.html#node_toc_node_chap_6">Chapter 6</a></div><br>
-<a href="r6rs-Z-H-2.html#node_toc_node_chap_6">Entry format</a></h1>
-<p></p>
-<p>
-The chapters that describe bindings in the base library and the standard
-libraries are organized
-into entries.  Each entry describes one language feature or a group of
-related features, where a feature is either a syntactic construct or a
-built-in procedure.  An entry begins with one or more header lines of the form</p>
-<p>
-</p>
-
-<p class=noindent></p>
-<div align=left><tt><i>template</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;<i>category</i>&nbsp;</div>
-<p>
-The <i>category</i> defines the kind of binding described by the entry,
-typically either &#8220;syntax&#8221; or &#8220;procedure&#8221;.
-An entry may specify various restrictions on subforms or arguments.
-For background on this, see section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.4">5.4</a>.</p>
-<p>
-</p>
-<a name="node_sec_6.1"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_6.1">6.1&nbsp;&nbsp;Syntax entries</a></h2>
-<p>If <i>category</i> is &#8220;syntax&#8221;, the entry describes a 
-special syntactic construct, and the template gives the syntax of the
-forms of the construct.  
-The template is written in a notation similar to a right-hand
-side of the BNF rules in chapter&nbsp;<a href="r6rs-Z-H-7.html#node_chap_4">4</a>, and describes
-the set of forms equivalent to the forms matching the
-template as syntactic data.  Some &#8220;syntax&#8221; entries carry a
-suffix (<tt>expand</tt>), specifying that the syntactic keyword of the
-construct is exported with level
-1.  Otherwise, the syntactic keyword is exported with level 0; see
-section&nbsp;<a href="r6rs-Z-H-10.html#node_sec_7.2">7.2</a>.</p>
-<p>
-Components of the form described by a template are designated
-by syntactic variables, which are written using angle brackets, for
-example, &lt;expression&gt;, &lt;variable&gt;.  Case is insignificant
-in syntactic variables.  Syntactic variables
-stand for other forms, or
-sequences of them.  A syntactic variable may refer to a non-terminal
-in the grammar for syntactic data (see section&nbsp;<a href="r6rs-Z-H-7.html#node_sec_4.3.1">4.3.1</a>),
-in which case only forms matching
-that non-terminal are permissible in that position.
-For example, &lt;identifier&gt; stands for a form which must be an
-identifier.
-Also,
-&lt;expression&gt; stands for any form which is a
-syntactically valid expression.  Other non-terminals that are used in
-templates are defined as part of the specification.</p>
-<p>
-The notation
-</p>
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;thing<sub>1</sub>&gt; <tt>...</tt>
-</p>
-<p>
-indicates zero or more occurrences of a &lt;thing&gt;, and
-</p>
-<p>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;thing<sub>1</sub>&gt; &lt;thing<sub>2</sub>&gt; <tt>...</tt>
-</p>
-<p>
-indicates one or more occurrences of a &lt;thing&gt;.</p>
-<p>
-It is the programmer&#8217;s responsibility to ensure that each component of
-a form has the shape specified by a template.  Descriptions of syntax
-may express other restrictions on the components of a form.
-Typically, such a restriction is formulated as a phrase of the form
-&#8220;&lt;x&gt; must be<a name="node_idx_260"></a>a <tt>...</tt>&#8221;.  Again, these
-specify the programmer&#8217;s responsibility.  It is the implementation&#8217;s
-responsibility to check that these restrictions are satisfied, as long
-as the macro transformers involved in expanding the form terminate.
-If the implementation detects that a component does not meet the
-restriction, an exception with condition type <tt>&amp;syntax</tt> is raised.</p>
-<p>
-</p>
-<a name="node_sec_6.2"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_6.2">6.2&nbsp;&nbsp;Procedure entries</a></h2>
-<p>If <i>category</i> is &#8220;procedure&#8221;, then the entry describes a procedure, and
-the header line gives a template for a call to the procedure.  Parameter
-names in the template are <i>italicized</i>.  Thus the header line</p>
-<p>
-</p>
-
-<p class=noindent></p>
-<div align=left><tt>(vector-ref <i>vector</i> <i>k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-indicates that the built-in procedure <tt>vector-ref</tt> takes
-two arguments, a vector <i>vector</i> and an exact non-negative integer
-object <i>k</i> (see below).  The header lines</p>
-<p>
-</p>
-
-<p class=noindent></p>
-<div align=left><tt>(make-vector <i>k</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-
-<div align=left><tt>(make-vector <i>k</i> <i>fill</i>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-indicate that the <tt>make-vector</tt> procedure takes
-either one or two arguments.  The parameter names are
-case-insensitive: <i>Vector</i> is the same as <i>vector</i>.</p>
-<p>
-As with syntax templates, an ellipsis <tt>...</tt> at the end of a header
-line, as in</p>
-<p>
-</p>
-
-<p class=noindent></p>
-<div align=left><tt>(= <i>z<sub>1</sub></i> <i>z<sub>2</sub></i> <i>z<sub>3</sub></i> <tt>...</tt>)</tt>&nbsp;&nbsp;&nbsp;&nbsp;procedure&nbsp;</div>
-<p>
-indicates that the procedure takes arbitrarily many arguments of the
-same type as specified for the last parameter name.  In this case,
-<tt>=</tt> accepts two or more arguments that must all be complex
-number objects.</p>
-<p>
-
-A procedure that detects an argument that it is not specified to
-handle must raise an exception with condition type
-<tt>&amp;assertion</tt>.  Also, the argument specifications are exhaustive: if the
-number of arguments provided in a procedure call does not match 
-any number of arguments accepted by the procedure, an exception with
-condition type <tt>&amp;assertion</tt> must be raised.</p>
-<p>
-For succinctness, the report follows the convention
-that if a parameter name is also the name of a type, then the corresponding argument must be of the named type.
-For example, the header line for <tt>vector-ref</tt> given above dictates that the
-first argument to <tt>vector-ref</tt> must be a vector.  The following naming
-conventions imply type restrictions:</p>
-<p>
-</p>
-<table border=0><tr><td valign=top ><i>obj</i></td><td valign=top >any object</td></tr>
-<tr><td valign=top ><i>z</i></td><td valign=top >complex number object</td></tr>
-<tr><td valign=top ><i>x</i></td><td valign=top >real number object</td></tr>
-<tr><td valign=top ><i>y</i></td><td valign=top >real number object</td></tr>
-<tr><td valign=top ><i>q</i></td><td valign=top >rational number object</td></tr>
-<tr><td valign=top ><i>n</i></td><td valign=top >integer object</td></tr>
-<tr><td valign=top ><i>k</i></td><td valign=top >exact non-negative integer object</td></tr>
-<tr><td valign=top ><i>bool</i></td><td valign=top >boolean (<tt>#f</tt> or <tt>#t</tt>)</td></tr>
-<tr><td valign=top ><i>octet</i></td><td valign=top >exact integer object in {0, <tt>...</tt>, 255}</td></tr>
-<tr><td valign=top ><i>byte</i></td><td valign=top >exact integer object in { <tt>-</tt> 128, <tt>...</tt>, 127}</td></tr>
-<tr><td valign=top ><i>char</i></td><td valign=top >character (see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.11">11.11</a>)</td></tr>
-<tr><td valign=top ><i>pair</i></td><td valign=top >pair (see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.9">11.9</a>)</td></tr>
-<tr><td valign=top ><i>vector</i></td><td valign=top >vector (see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.13">11.13</a>)</td></tr>
-<tr><td valign=top ><i>string</i></td><td valign=top >string (see section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.12">11.12</a>)</td></tr>
-<tr><td valign=top ><i>condition</i></td><td valign=top >condition (see library section&nbsp;on &#8220;Conditions&#8221;)</td></tr>
-<tr><td valign=top ><i>bytevector</i></td><td valign=top >bytevector (see library chapter&nbsp;on &#8220;Bytevectors&#8221;)</td></tr>
-<tr><td valign=top ><i>proc</i></td><td valign=top >procedure (see section&nbsp;<a href="r6rs-Z-H-4.html#node_sec_1.6">1.6</a>)
-</td></tr></table>
-<p>
-Other type restrictions are expressed through parameter-naming
-conventions that are described in specific chapters.  For example,
-library chapter&nbsp;on &#8220;Arithmetic&#8221; uses a number of special
-parameter variables for the various subsets of the numbers.</p>
-<p>
-With the listed type restrictions, it is the programmer&#8217;s responsibility to
-ensure that the corresponding argument is of the specified type.
-It is the implementation&#8217;s responsibility to check for
-that type.</p>
-<p>
-A parameter called <i>list</i> means that it is the
-programmer&#8217;s responsibility to pass an argument that is a list (see
-section&nbsp;<a href="r6rs-Z-H-14.html#node_sec_11.9">11.9</a>).  It is the implementation&#8217;s responsibility
-to check that the argument is appropriately structured for the
-operation to perform its function, to the extent that this is possible
-and reasonable.  The implementation must at least check that the
-argument is either an empty list or a pair.</p>
-<p>
-Descriptions of procedures may express other restrictions on the
-arguments of a procedure.  Typically, such a restriction is formulated
-as a phrase of the form &#8220;<i>x</i> must be a <tt>...</tt>&#8221; (or otherwise
-using the word &#8220;must&#8221;).</p>
-<p>
-</p>
-<a name="node_sec_6.3"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_6.3">6.3&nbsp;&nbsp;Implementation responsibilities</a></h2>
-<p>In addition to the restrictions implied by naming conventions, an
-entry may list additional explicit restrictions.
-These explicit restrictions usually describe both the
-programmer&#8217;s responsibilities, who must ensure that the subforms of a
-form are appropriate, or that an appropriate
-argument is passed, and the implementation&#8217;s responsibilities, which
-must check that subform adheres to the specified restrictions (if
-macro expansion terminates), or if the argument is appropriate.  A description
-may explicitly list the implementation&#8217;s responsibilities for some
-arguments or subforms in a paragraph labeled &#8220;<i>Implementation
-responsibilities</i>&#8221;.  In this case, the responsibilities specified
-for these subforms or arguments in the rest of the description are only for the
-programmer.  A paragraph describing implementation responsibility does not
-affect the implementation&#8217;s responsibilities for checking subforms or arguments not
-mentioned in the paragraph.</p>
-<p>
-</p>
-<a name="node_sec_6.4"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_6.4">6.4&nbsp;&nbsp;Other kinds of entries</a></h2>
-<p>If <i>category</i> is something other than &#8220;syntax&#8221; and
-&#8220;procedure&#8221;, then the entry describes a non-procedural value, and
-the <i>category</i> describes the type of that value.  The header line</p>
-<p>
-</p>
-
-<p class=noindent></p>
-<div align=left><tt>&amp;who</tt>&nbsp;&nbsp;&nbsp;&nbsp;condition type&nbsp;</div>
-<br>
-indicates that <tt>&amp;who</tt> is a condition type.  The header line<p>
-</p>
-
-<p class=noindent></p>
-<div align=left><tt>unquote</tt>&nbsp;&nbsp;&nbsp;&nbsp;auxiliary syntax&nbsp;</div>
-<br>
-indicates that <tt>unquote</tt> is a syntax binding that may occur
-only as part of specific surrounding expressions.  Any use as an
-independent syntactic construct or identifier is a syntax violation.
-As with &#8220;syntax&#8221; entries, some &#8220;auxiliary syntax&#8221; entries  carry a
-suffix (<tt>expand</tt>), specifying that the syntactic keyword of the
-construct is exported with level 1.
-<a name="node_sec_6.5"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_6.5">6.5&nbsp;&nbsp;Equivalent entries</a></h2>
-<p>The description of an entry occasionally states that it is <i>the
-same</i> as another entry.  This means that both entries are
-equivalent.  Specifically, it means that if both entries have the same
-name and are thus exported from different libraries, the entries from
-both libraries can be imported under the same name without conflict.</p>
-<p>
-</p>
-<a name="node_sec_6.6"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_6.6">6.6&nbsp;&nbsp;Evaluation examples</a></h2>
-<p>The symbol &#8220;&rArr;&#8221; used in program examples can be read
-&#8220;evaluates to&#8221;.  For example,</p>
-<p>
-</p>
-
-<tt>(*&nbsp;5&nbsp;8)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;40<p></tt></p>
-<p>
-means that the expression <tt>(* 5 8)</tt> evaluates to the object <tt>40</tt>.
-Or, more precisely:  the expression given by the sequence of characters
-&#8220;<tt>(* 5 8)</tt>&#8221; evaluates, in an environment that imports the relevant library, to an object
-that may be represented externally by the sequence of characters &#8220;<tt>40</tt>&#8221;.  See section&nbsp;<a href="r6rs-Z-H-7.html#node_sec_4.3">4.3</a> for a discussion of external
-representations of objects.</p>
-<p>
-The &#8220;&rArr;&#8221; symbol is also used when the evaluation of an
-expression causes a violation.  For example,</p>
-<p>
-</p>
-
-<tt>(integer-&gt;char&nbsp;<tt>#</tt>xD800)&nbsp;&nbsp;<tt>&nbsp;&amp;assertion</tt>&nbsp;<i>exception</i><p></tt>
-means that the evaluation of the expression <tt>(integer-&gt;char
-<tt>#</tt>xD800)</tt> must raise an exception with condition type
-<tt>&amp;assertion</tt>.</p>
-<p>
-Moreover, the &#8220;&rArr;&#8221; symbol is also used to explicitly say that
-the value of an expression in unspecified.  For example:
-</p>
-
-<tt>(eqv?&nbsp;&quot;&quot;&nbsp;&quot;&quot;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;&nbsp;<i>unspecified</i><p></tt></p>
-<p>
-Mostly, examples merely illustrate the behavior specified in the
-entry.  In some cases, however, they disambiguate otherwise ambiguous
-specifications and are thus normative.  Note that, in some cases,
-specifically in the case of inexact number objects, the return value is only
-specified conditionally or approximately.  For example:
-</p>
-
-<tt>(atan&nbsp;-inf.0)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rArr;&nbsp;-1.5707963267948965&nbsp;;&nbsp;approximately<p></tt></p>
-<p>
-</p>
-<a name="node_sec_6.7"></a>
-<h2 class=section><a href="r6rs-Z-H-2.html#node_toc_node_sec_6.7">6.7&nbsp;&nbsp;Naming conventions</a></h2>
-<p>By convention, the names of procedures that store values into previously
-allocated locations (see section&nbsp;<a href="r6rs-Z-H-8.html#node_sec_5.10">5.10</a>) usually end in
-&#8220;<tt>!</tt>&#8221;.</p>
-<p>
-By convention, &#8220;<tt>-&gt;</tt>&#8221; appears within the names of procedures that
-take an object of one type and return an analogous object of another type.
-For example, <tt>list-&gt;vector</tt> takes a list and returns a vector whose
-elements are the same as those of the list.</p>
-<p>
-By convention, the names of predicates&#8212;procedures that always return
-a boolean value&#8212;end in &#8220;<tt>?</tt>&#8221; when the name contains any
-letters; otherwise, the predicate&#8217;s name does not end with a question
-mark.</p>
-<p>
-By convention, the components of compound names are separated by &#8220;<tt>-</tt>&#8221;
-In particular, prefixes that are actual words or can be pronounced as
-though they were actual words are followed by a hyphen, except when
-the first character following the hyphen would be something other than
-a letter, in which case the hyphen is omitted.  Short,
-unpronounceable prefixes (&#8220;<tt>fx</tt>&#8221; and &#8220;<tt>fl</tt>&#8221;) are not
-followed by a hyphen.</p>
-<p>
-By convention, the names of condition types start with
-&#8220;<tt>&amp;</tt>&#8221;<a name="node_idx_262"></a>.</p>
-<p>
- </p>
-<p></p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span><a href="r6rs.html">first</a>, <a href="r6rs-Z-H-8.html">previous</a></span><span>, <a href="r6rs-Z-H-10.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-S.css b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-S.css
deleted file mode 100644
index a5d5a049c6..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs-Z-S.css
+++ /dev/null
@@ -1,257 +0,0 @@
-
-               body {
-               color: black;
-               /*   background-color: #e5e5e5;*/
-               background-color: #ffffff;
-               /*background-color: beige;*/
-               margin-top: 2em;
-               margin-bottom: 2em;
-               /* margin-left: 8%;
-               margin-right: 8%; */
-               }
-
-               @media screen {
-               body {
-               margin-left: 8%;
-               margin-right: 8%;
-               }
-               }
-
-               @media print {
-               body {
-               text-align: justify;
-               }
-               }
-
-               @media print {
-               a:link, a:visited {
-               text-decoration: none;
-               color: black;
-               }
-               }
-
-               @media print {
-               p {
-               text-indent: 2em;
-               margin-top: 1ex;
-               margin-bottom: 0;
-               }
-
-               }
-
-               h1,h2,h3,h4,h5,h6 {
-               margin-top: .8em;
-               margin-bottom: .2em;  /* ?? */
-               }
-               
-
-               .title {
-               font-size: 200%;
-               font-weight: normal;
-               margin-top: 2.8em;
-               text-align: center;
-               }
-
-               .partheading {
-               font-size: 100%;
-               }
-
-               .chapterheading {
-               font-size: 100%;
-               }
-
-               .beginsection {
-               margin-top: 1.8em;
-               font-size: 100%;
-               }
-
-               .tiny {
-               font-size: 40%;
-               }
-
-               .scriptsize {
-               font-size: 60%;
-               }
-
-               .footnotesize {
-               font-size: 75%;
-               }
-
-               .small {
-               font-size: 90%;
-               }
-
-               .normalsize {
-               font-size: 100%;
-               }
-
-               .large {
-               font-size: 120%;
-               }
-
-               .largecap {
-               font-size: 150%;
-               }
-
-               .largeup {
-               font-size: 200%;
-               }
-
-               .huge {
-               font-size: 300%;
-               }
-
-               .hugecap {
-               font-size: 350%;
-               }
-
-               p.noindent {
-               text-indent: 0;
-               }
-
-               pre {
-               margin-left: 2em;
-               }
-
-               blockquote {
-               margin-left: 2em;
-               }
-
-               .smallskip {
-               margin-top: 2pt;
-               margin-bottom: 2pt;
-               min-height: 4pt;
-               }
-
-               .medskip {
-               margin-top: 3pt;
-               margin-bottom: 3pt;
-               min-height: 7pt; 
-               /*margin-top: 1.6em;  
-               margin-bottom: 2.4em;  
-               margin-top: 1em;
-               margin-bottom: 1.5em; */
-               /* top and bottom have to be different so successive \...skips cause more spacing? */
-               }
-
-               .bigskip {
-               margin-top: 4pt;
-               margin-bottom: 4pt;
-               min-height: 13pt;
-               /*margin-top: 2.8em; 
-               margin-bottom: 3.4em; 
-               margin-top: 2.4em;
-               margin-bottom: 1.6em; */
-               }
-
-
-               ol {
-               list-style-type: decimal;
-               }
-
-               ol ol {
-               list-style-type: lower-alpha;
-               }
-
-               ol ol ol {
-               list-style-type: lower-roman;
-               }
-
-               ol ol ol ol {
-               list-style-type: upper-alpha;
-               }
-
-               tt i {
-               font-family: serif;
-               }
-
-               .verbatim em {
-               font-family: serif;
-               }
-
-               /*
-               .verbatim {
-               color: #4d0000;
-               }
-               */
-
-               .scheme em {
-               color: black;
-               font-family: serif;
-               }
-
-               .scheme             {color: #993333} /* background punctuation */
-               .scheme  .selfeval  {color: #006600}
-               .scheme  .keyword   {color: #660000; font-weight: bold}
-               .scheme  .builtin   {color: #660000}
-               .scheme  .global    {color: #660066}
-               .scheme  .variable  {color: #000066}
-               .scheme  .comment   {color: #006666; font-style: oblique}
-
-               .schemeresponse {
-               color: #006600;
-               }
-
-               .navigation {
-               color: #993300;
-               text-align: right;
-               font-size: medium;
-               font-style: italic;
-               }
-
-               @media print {
-               .navigation {
-               display: none;
-               }
-               }
-
-               .disable {
-               /* color: #e5e5e5; */
-               color: gray;
-               }
-
-               .smallcaps {
-               font-size: 75%;
-               }
-
-               .smallprint {
-               color: gray;
-               font-size: 75%;
-               text-align: right;
-               }
-
-               /*
-               .smallprint hr {
-               text-align: left;
-               width: 40%;
-               }
-               */
-
-               .footnoterule {
-               text-align: left;
-               width: 40%;
-               }
-
-               @media print {
-               .footnoterule {
-               margin-top: 2em;
-               }
-               }
-
-               .colophon {
-               color: gray;
-               font-size: 80%;
-               font-style: italic;
-               text-align: right;
-               margin-top: 1em;
-               }
-
-               @media print {
-               .colophon .advertisement {
-               display: none;
-               }
-               }
-
-               .colophon a {
-               color: gray;
-               }
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs.html b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs.html
deleted file mode 100644
index 008beaee0f..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs-std/r6rs.html
+++ /dev/null
@@ -1,525 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from r6rs.tex by tex2page, v 20070803
-(running on MzScheme 371, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-Revised^6 Report on the Algorithmic Language Scheme
-</title>
-<link rel="stylesheet" type="text/css" href="r6rs-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div id=slidetitle>
-<div align=right class=navigation>[Go to <span class=disable>first, previous</span><span><span class=disable>, </span><a href="r6rs-Z-H-1.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-  
-
-
-
-
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</p>
-<p>
-  
-
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-  
-</p>
-<p>
-
-</p>
-<p>
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-</p>
-<p>
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-
-
-
-
-
-</p>
-<p>
-
-
-
-
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<h1 class=title></h1>
-<p></p>
-<div align=center>
-<p></p>
-</div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
- </p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<div align=center><table><tr><td>
-   <span class=huge><strong>Revised<span class=hugecap><sup><span class=tiny>6</span></sup></span> Report on the Algorithmic Language <br>
-<div style="height: 3.0pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">Scheme</strong></span></p>
-</td></tr><tr><td>
-<p>
-<div style="height: 4.5pt"></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt"></p>
-<div class=mathdisplay align=left><table><tr><td>
-
-
-<table border=0><tr><td valign=top  colspan=4>M<span class=scriptsize>ICHAEL</span> S<span class=scriptsize>PERBER</span>
-</td></tr>
-<tr><td valign=top  colspan=4>R. K<span class=scriptsize>ENT</span> D<span class=scriptsize>YBVIG</span>,
-M<span class=scriptsize>ATTHEW</span> F<span class=scriptsize>LATT</span>,
-A<span class=scriptsize>NTON</span> <span class=scriptsize>VAN</span> S<span class=scriptsize>TRAATEN</span>
-</td></tr>
-<tr><td valign=top  colspan=4>(<i>Editors</i>) </td></tr>
-<tr><td valign=top  colspan=4>
-R<span class=scriptsize>ICHARD</span> K<span class=scriptsize>ELSEY</span>, W<span class=scriptsize>ILLIAM</span> C<span class=scriptsize>LINGER</span>,
-J<span class=scriptsize>ONATHAN</span> R<span class=scriptsize>EES</span> </td></tr>
-<tr><td valign=top  colspan=4>(<i>Editors, Revised<sup>5</sup> Report on the
-Algorithmic Language Scheme</i>) </td></tr>
-<tr><td valign=top  colspan=4>
-R<span class=scriptsize>OBERT</span> B<span class=scriptsize>RUCE</span> F<span class=scriptsize>INDLER</span>, J<span class=scriptsize>ACOB</span> M<span class=scriptsize>ATTHEWS</span> </td></tr>
-<tr><td valign=top  colspan=4>(<i>Authors, formal semantics</i>) </td></tr>
-<tr><td valign=top  colspan=4><strong>26 September 2007</strong>
-</td></tr></table>
-</td></tr></table></div>
-<p class=noindent></p>
-</td></tr><tr><td>
-<p>
-</p>
-</td></tr></table></div>
-<p>
-</p>
-<div class=smallskip></div>
-<p style="margin-top: 0pt; margin-bottom: 0pt">
-<div align=right class=navigation>[Go to <span class=disable>first, previous</span><span><span class=disable>, </span><a href="r6rs-Z-H-1.html">next</a></span> page<span>; &nbsp;&nbsp;</span><span><a href="r6rs-Z-H-2.html#node_toc_start">contents</a></span><span><span>; &nbsp;&nbsp;</span><a href="r6rs-Z-H-21.html#node_index_start">index</a></span>]</div>
-</p>
-<p></p>
-<div align=right class=colophon>Last modified: Wednesday, September 26th, 2007 5:34:54pm MET-1MST-2,M3.5.0,M10.5.0<br></div>
-</div>
-</body>
-</html>
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs.scrbl b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs.scrbl
deleted file mode 100644
index c8463470a2..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/scribblings/r6rs.scrbl
+++ /dev/null
@@ -1,1216 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/bnf
-          (only-in scribble/core style)
-          scribble/html-properties
-          (for-label setup/dirs
-                     rnrs/programs-6
-                     rnrs/base-6
-                     rnrs/unicode-6
-                     rnrs/exceptions-6
-                     rnrs/conditions-6
-                     rnrs/io/simple-6
-                     rnrs/r5rs-6
-                     rnrs/hashtables-6
-                     r6rs
-                     (only-in racket/base
-                              module lib
-                              current-library-collection-paths
-                              parameterize
-                              uncaught-exception-handler
-                              make-hash)))
-
-@(define guide-src '(lib "scribblings/guide/guide.scrbl"))
-
-@(define r6rs @elem{R@superscript{6}RS})
-@(define r5rs @elem{R@superscript{5}RS})
-
-@(define r6rs-std (style #f (list (install-resource "r6rs-std")
-                                  (install-resource "r6rs-lib-std"))))
-
-@title{R6RS: Scheme}
-
-The @link[#:style r6rs-std "r6rs-std/index.html"]{The Revised@superscript{6} Report
-on the Algorithmic Language Scheme} defines a dialect of Scheme. We
-use @defterm{@|r6rs|} to refer to both the standard and the language
-defined by the standard.
-
-@margin-note{See @seclink[#:doc '(lib "scribblings/guide/guide.scrbl")
-             "dialects"] for general information about different
-             dialects of Scheme within Racket.}
-
-@|r6rs| defines both @defterm{libraries} and @defterm{top-level
-programs}. Both correspond to Racket @defterm{modules} (see
-@secref[#:doc guide-src "modules"]). That is, although @|r6rs| defines
-top-level programs as entry points, you can just as easily treat a
-library as an entry point when using Racket. The only difference
-is that an @|r6rs| top-level program cannot export any bindings to
-other modules.
-
-@table-of-contents[]
-
-@; ----------------------------------------
-
-@section[#:tag "Using R6RS with DrRacket"]{Using @|r6rs| with DrRacket}
-
-To run an @|r6rs| program with DrRacket choose @onscreen{Use language declared in source}
-from the language dialog box and add the following line to the top of your program.
-@racketmetafont{#!r6rs}.
-
-Here is a small example @|r6rs| program that will work in DrRacket.
-@racketblock[
-#,(racketmetafont "#!r6rs")
-(import (rnrs lists (6))
-        (rnrs base (6))
-        (rnrs io simple (6)))
-(display (find even? '(3 1 4 1 5 9)))]
-
-@section[#:tag "Running Top-Level Programs"]{Running Top-Level Programs}
-
-To run a top-level program, either:
-
-@itemize[
-
- @item{Use the @exec{plt-r6rs} executable, supplying the file that
-       contains the program on the command line:
-
-       @commandline{plt-r6rs @nonterm{program-file}}
-
-       Additional command-line arguments are propagated as
-       command-line arguments to the program (accessed via 
-       @racket[command-line]).
-
-       To compile the file to bytecode (to speed future runs of the
-       program), use @exec{plt-r6rs} with the @DFlag{compile} flag:
-
-       @commandline{plt-r6rs --compile @nonterm{program-file}}
-  
-       The bytecode file is written in a @filepath{compiled}
-       sub-directory next to @nonterm{program-file}.
-
-       For example, if @filepath{hi.sps} contains
-
-       @racketblock[
-       (import (rnrs))
-       (display "hello\n")
-       ]
-
-       then
-
-       @commandline{plt-r6rs hi.sps}
-
-       prints ``hello.''}
-
- @item{Prefix the program with @racketmetafont{#!r6rs}, which counts
-       as a comment from the @|r6rs| perspective, but is a synonym for
-       @racket[#,(hash-lang) r6rs] from the Racket perspective.
-       Such files can be run like any other Racket module, such as
-       using @exec{racket}:
-
-       @commandline{racket @nonterm{program-file}}
-
-       or using DrRacket. The file can also be compiled to bytecode
-       using @exec{raco make}:
-
-       @commandline{raco make @nonterm{program-file}}
-
-       For example, if @filepath{hi.sps} contains
-
-       @racketblock[
-       #,(racketmetafont "#!r6rs")
-       (import (rnrs))
-       (display "hello\n")
-       ]
-
-       then
-
-       @commandline{racket hi.sps}
-
-       prints ``hello.'' Similarly, opening @filepath{hi.sps} in
-       DrRacket and clicking @onscreen{Run} prints ``hello'' within
-       the DrRacket interactions window.}
-
-]
-
-@; ----------------------------------------
-
-@section[#:tag "Installing Libraries"]{Installing Libraries}
-       
-To reference an @|r6rs| library from a top-level program or another
-library, it must be installed as a collection-based library in
-Racket.
-
-One way to produce an @|r6rs| installed library is to create in
-a @techlink[#:doc guide-src]{collection} a file that starts with
-@racketmetafont{#!r6rs} and that contains a @racket[library] form. For
-example, the following file might be created in a @filepath{hello.sls}
-file within a @filepath{examples} collection directory:
-
-       @racketblock[
-       #,(racketmetafont "#!r6rs")
-       (library (examples hello)
-         (export greet)
-         (import (rnrs))
-         
-         (define (greet)
-           (display "hello\n")))
-       ]
-
-Alternately, the @exec{plt-r6rs} executable with the @DFlag{install}
-flag accepts a sequence of @racket[library] declarations and installs
-them into separate files in a collection directory, based on the
-declared name of each library:
-
- @commandline{plt-r6rs --install @nonterm{libraries-file}}
-
-By default, libraries are installed into the user-specific collection
-directory (see @racket[find-user-collects-dir]). The @DFlag{all-users}
-flag causes the libraries to be installed into the main installation,
-instead (see @racket[find-collects-dir]):
-
- @commandline{plt-r6rs --install --all-users @nonterm{libraries-file}}
-
-You may as well specify an arbitrary collections directory by using
-the @DFlag{collections} flag:
-
- @commandline{plt-r6rs --install --collections @nonterm{directory} @nonterm{libraries-file}}
-
-See @secref["libpaths"] for information on how @|r6rs| library names
-are turned into collection-based module paths, which determines where
-the files are written. Libraries installed by @exec{plt-r6rs
-@DFlag{install}} are automatically compiled to bytecode form.
-
-One final option is to supply a @as-index{@DPFlag{path}} flag to
-@exec{plt-r6rs}. A path added with @DPFlag{path} extends the set of
-directories that are searched to find a collection (i.e., it sets
-@racket[current-library-collection-paths]). If @nonterm{dir} contains
-@filepath{duck} and @filepath{cow} sub-directories with
-@filepath{duck/feather.sls} and @filepath{cow/bell.sls}, and if each
-file is an @|r6rs| library prefixed with @racketmetafont{#!r6rs}, then
-@exec{plt-r6rs ++path @nonterm{dir}} directs the @|r6rs| library
-references @racket[(duck feather)] and @racket[(cow bell)] to the
-files. Note that this technique does not support accessing
-@filepath{duck.sls} directly within @nonterm{dir}, since the library
-reference @racket[(duck)] is treated like @racket[(duck main)] for
-finding the library, as explained in @secref["libpaths"]. Multiple
-paths can be provided with multiple uses of @DPFlag{path}; the paths
-are searched in order, and before the installation's collections.
-
-@; ----------------------------------------
-
-@section[#:tag "r6rs-mod"]{@|r6rs| Module Language}
-
-@defmodulelang[r6rs]
-
-The @racketmodname[r6rs] language is usually used in the form
-@racketmetafont{#!}@racketmodname[r6rs], which is equivalent to
-@racket[@#,hash-lang[] @#,racketmodname[r6rs]] and is also valid
-@|r6rs| syntax. 
-
-@subsection[#:tag "using-r6rs"]{Using @|r6rs|}
-
-See @secref["Using\x20R6RS\x20with\x20DrRacket"],
-@secref["Running\x20Top-Level\x20Programs"], and
-@secref["Installing\x20Libraries"] for more information on writing and
-running @|r6rs| programs with Racket.
-
-@subsection{The Implementation of @|r6rs|}
-
-The @|r6rs| language is itself implemented as a module within
-Racket. The details of that implementation, as provided in this
-section, are not normally relevant to programmers using @|r6rs|; see
-the links in @secref["using-r6rs"], instead. The details may be
-relevant to programmers who are developing new tools or deriving
-variants of @|r6rs| within Racket.
-
-As a Racket module, the @racketmodname[r6rs] module language provides
-only a @racket[#%module-begin] binding, which is used to process the
-entire body of a Racket module (see @racket[module]). The
-@racket[#%module-begin] binding from @racketmodname[r6rs] allows the
-body of a module to use the syntax of either a @|r6rs| library or a
-@|r6rs| top-level program.
-
-@defform*[#:literals (library import export)
-          [(#%module-begin 
-            (library library-name 
-              (export export-spec ...)
-              (import import-spec ...)
-              library-body ...))
-           (#%module-begin
-            (import import-spec ...)
-            program-body ...)]]{
-
-An @racketmodname[r6rs] module that contains a single @racket[library]
-form defines an @|r6rs| library, while a module body that starts with
-an @racket[import] form defined an @|r6rs| top-level program.
-
-The @racket[library], @racket[export], and @racket[import] identifiers
-are not exported by the @racketmodname[r6rs] library; they are
-recognized through equivalence to unbound identifiers.}
-
-@; ----------------------------------------
-
-@section[#:tag "libpaths"]{Libraries and Collections}
-
-An @|r6rs| library name is sequence of symbols, optionally followed by
-a version as a sequence of exact, non-negative integers. Roughly, such
-a name is converted to a Racket module pathname (see @secref[#:doc
-guide-src "module-paths"]) by concatenating the symbols with a
-@litchar{/} separator, and then appending the version integers each
-with a preceding @litchar{-}. As a special case, when an @|r6rs| path
-contains a single symbol (optionally followed by a version), a
-@racketidfont{main} symbol is effectively inserted after the initial
-symbol. See below for further encoding considerations.
-
-When an @|r6rs| library or top-level program refers to another
-library, it can supply version constraints rather than naming a
-specific version. Version constraints are always resolved at compile
-time by searching the set of installed files.
-
-In addition, when an @|r6rs| library path is converted, a file
-extension is selected at compile time based on installed files. The
-search order for file extensions is @filepath{.mzscheme.ss},
-@filepath{.mzscheme.sls}, @filepath{.ss}, @filepath{.sls}, and
-@filepath{.rkt}.  When resolving version constraints, these extensions
-are all tried when looking for matches.
-
-
-
-To ensure that all @|r6rs| library names can be converted to a unique
-and distinct library module path, the following conversions are
-applied to each symbol before concatenating them:
-
-@itemize[
-
- @item{The symbol is encoded using UTF-8, and the resulting bytes are
- treated as Latin-1 encoded characters. ASCII letters, digits,
- @litchar{+}, @litchar{-}, and @litchar{_} are left as-is; other
- characters are replaced by @litchar{%} followed by two lowercase
- hexadecimal digits. Note that UTF-8 encodes ASCII letters, digits,
- @|etc| as themselves, so typical library names correspond to readable
- module paths.}
-
- @item{If the @|r6rs| library reference has two symbol elements and
- the second one is @racketidfont{main} followed by any number of
- underscores, then an extra underscore is added to that symbol. This
- conversion avoids a collision between an explicit @racketidfont{main}
- and the implicit @racketidfont{main} when a library path has a single
- symbol element.}
-
-]
-
-Examples (assuming a typical Racket installation):
-
-@racketblock[
-(rnrs io simple (6))  @#,elem{means}  (lib "rnrs/io/simple-6.rkt")
-(rnrs)                @#,elem{means}  (lib "rnrs/main-6.rkt")
-(rnrs main)           @#,elem{means}  (lib "rnrs/main_.rkt")
-(rnrs (6))            @#,elem{means}  (lib "rnrs/main-6.rkt")
-(racket base)         @#,elem{means}  (lib "racket/base.rkt")
-(achtung!)            @#,elem{means}  (lib "achtung%21/main.rkt")
-(funco new-λ)         @#,elem{means}  (lib "funco/new-%ce%bb.rkt")
-]
-
-
-@; ----------------------------------------
-
-@section{Language Interoperability}
-
-Using the conversion rules in @secref["libpaths"], and @r6rs library
-can refer to modules that are implemented in other dialects supported
-by Racket, and other Racket modules can refer to libraries
-that are implemented in @|r6rs|.
-
-Beware that a @defterm{pair} in @|r6rs| corresponds to a
-@defterm{mutable pair} in @racketmodname[racket/base]. Otherwise,
-@|r6rs| libraries and @racketmodname[racket/base] share the same
-datatype for numbers, characters, strings, bytevectors (a.k.a. byte
-strings), vectors, and so on. Hash tables are different. Input and
-output ports from @racketmodname[racket/base] can be used directly as
-binary ports with @|r6rs| libraries, and all @|r6rs| ports can be used
-as ports in @racketmodname[racket/base] programs, but only textual
-ports created via @|r6rs| libraries can be used by other @|r6rs|
-operations that expect textual ports.
-
-@; ----------------------------------------------------------------------
-
-@section[#:tag "conformance"]{@|r6rs| Conformance}
-
-Racket's @|r6rs| support does not conform with the standard in
-several known ways:
-
-@itemize[
-
- @item{When @racket[guard] catches an exception that no clause
-       matches, the exception is re-@racket[raise]ed without restoring
-       the continuation to the one that raised the exception.
-
-       This difference can be made visible using
-       @racket[dynamic-wind]. According to @|r6rs|, the following
-       program should print ``in'' and ``out'' twice, but each prints
-       once using Racket:
-
-      @racketblock[
-        (guard (exn [(equal? exn 5) 'five])
-           (guard (exn [(equal? exn 6) 'six])
-             (dynamic-wind
-               (lambda () (display "in") (newline))
-               (lambda () (raise 5))
-               (lambda () (display "out") (newline)))))
-
-       ]
-
-       Along similar lines, continuation capture and invocation within
-       an exception handler is restricted. Unless the exception is
-       raised through @racket[raise-continuable], a handler can escape
-       only through a continuation that is a tail of the current
-       continuation, and a continuation captured within the handler
-       cannot be invoked after control escapes from the raise.
-
-       The initial exception handler does not return for
-       non-@racket[&serious] conditions, but @racket[raise] and
-       @racket[raise-continuable] both install an uncaught-exception
-       handler (via @racket[parameterize] and
-       @racket[uncaught-exception-handler]) to one that returns for
-       non-@racket[&serious] conditions.}
-
- @item{Inexact numbers are printed without a precision indicator, and
-       precision indicators are ignored on input (e.g.,
-       @racketvalfont{0.5|7} is read the same as @racket[0.5]).}
-
- @item{Word boundaries for @racket[string-downcase],
-       @racket[string-upcase], and @racket[string-titlecase] are not
-       determined as specified by Unicode Standard Annex #29.}
-
- @item{A custom textual port must represent positions using integers,
-       and the positions must correspond to bytes in a UTF-8 encoding
-       of the port's data. For custom ports (byte or character) that
-       support both input and output, beware that buffered input can
-       create a mismatch between the position implemented by the
-       custom procedures and the port's current position; the result
-       from a custom position procedure is automatically adjusted to
-       account for buffering, and setting the port's position flushes
-       all buffered bytes, but writing after a read does @emph{not}
-       automatically reset the port's position to counteract the
-       effects of buffering.}
-
- @item{The bindings in a namespace produced by @racket[null-environment]
-       or @racket[scheme-report-environment] correspond to @|r5rs| bindings
-       instead of @|r6rs| bindings. In particular, @racket[=>], @racket[else],
-       @racket[_], and @racket[...] are not bound.}
-
- @item{Bindings for @racketidfont{#%datum}, @racketidfont{#%app},
-       @racketidfont{#%top}, and @racketidfont{#%top-interaction} are
-       imported into every library and program, and at every phase
-       level for which the library or program has imports.}
-]
-
-@history[#:changed "6.0.1.4" @elem{When an identifier bound by
-                                   @racket[letrec] or @racket[letrec*]
-                                   is referenced before it is initialized,
-                                   an exception is raised, instead of
-                                   producing @|undefined-const|.}]
-
-@; ----------------------------------------------------------------------
-
-@section{@|r6rs| Libraries}
-
-@(define (dir-of s)
-   (string-append (cadr (regexp-match "^(.*)-Z-H" s)) "-std"))
-
-@(define (cvt-elem i)
-   (list (car i)
-         (cadr i)
-         (build-path (dir-of (caddr i))
-                     (caddr i))
-         (cadddr i)))
-
-@(define-syntax-rule (r6rs-module mod-path lib html anchor title elem ...)
-  (begin
-    (subsection #:tag (format "~a" 'mod-path) 
-             (racket lib) ": " title)
-    (defmodule mod-path)
-    "Original specification: " (link (format "~a/~a#~a" (dir-of html) html anchor)
-                                     title)
-    (make-binding-redirect-elements
-     'mod-path
-     (map cvt-elem '(elem ...)))))
-
-@r6rs-module[rnrs/base-6 (rnrs base (6))
-             "r6rs-Z-H-14.html" "node_sec_11.4" "Base"
-       ;; Generated with makeindex.rkt --r6rs, then further converted and 
-       ;; filtered by hand
-         (* #f "r6rs-Z-H-14.html" "node_idx_496")
-         (+ #f "r6rs-Z-H-14.html" "node_idx_494")
-         (- #f "r6rs-Z-H-14.html" "node_idx_498")
-         (/ #f "r6rs-Z-H-14.html" "node_idx_502")
-         (< #f "r6rs-Z-H-14.html" "node_idx_466")
-         (<= #f "r6rs-Z-H-14.html" "node_idx_470")
-         (= #f "r6rs-Z-H-14.html" "node_idx_464")
-         (=> #t "r6rs-Z-H-14.html" "node_idx_378")
-         (> #f "r6rs-Z-H-14.html" "node_idx_468")
-         (>= #f "r6rs-Z-H-14.html" "node_idx_472")
-         (abs #f "r6rs-Z-H-14.html" "node_idx_506")
-         (acos #f "r6rs-Z-H-14.html" "node_idx_554")
-         (and #t "r6rs-Z-H-14.html" "node_idx_388")
-         (angle #f "r6rs-Z-H-14.html" "node_idx_576")
-         (append #f "r6rs-Z-H-14.html" "node_idx_634")
-         (apply #f "r6rs-Z-H-14.html" "node_idx_752")
-         (asin #f "r6rs-Z-H-14.html" "node_idx_552")
-         (assert #t "r6rs-Z-H-14.html" "node_idx_750")
-         (assertion-violation #f "r6rs-Z-H-14.html" "node_idx_748")
-         (atan #f "r6rs-Z-H-14.html" "node_idx_556")
-         (begin #t "r6rs-Z-H-14.html" "node_idx_418")
-         (boolean=? #f "r6rs-Z-H-14.html" "node_idx_598")
-         (boolean? #f "r6rs-Z-H-14.html" "node_idx_596")
-         (caar #f "r6rs-Z-H-14.html" "node_idx_616")
-         (cadr #f "r6rs-Z-H-14.html" "node_idx_618")
-         (call-with-current-continuation #f "r6rs-Z-H-14.html" "node_idx_754")
-         (call-with-values #f "r6rs-Z-H-14.html" "node_idx_762")
-         (call/cc #f "r6rs-Z-H-14.html" "node_idx_756")
-         (car #f "r6rs-Z-H-14.html" "node_idx_612")
-         (case #f "r6rs-Z-H-14.html" "node_idx_384")
-         (cdddar #f "r6rs-Z-H-14.html" "node_idx_620")
-         (cddddr #f "r6rs-Z-H-14.html" "node_idx_622")
-         (cdr #f "r6rs-Z-H-14.html" "node_idx_614")
-         (ceiling #f "r6rs-Z-H-14.html" "node_idx_530")
-         (char->integer #f "r6rs-Z-H-14.html" "node_idx_670")
-         (char<=? #f "r6rs-Z-H-14.html" "node_idx_680")
-         (char<? #f "r6rs-Z-H-14.html" "node_idx_676")
-         (char=? #f "r6rs-Z-H-14.html" "node_idx_674")
-         (char>=? #f "r6rs-Z-H-14.html" "node_idx_682")
-         (char>? #f "r6rs-Z-H-14.html" "node_idx_678")
-         (char? #f "r6rs-Z-H-14.html" "node_idx_668")
-         (complex? #f "r6rs-Z-H-14.html" "node_idx_442")
-         (cond #f "r6rs-Z-H-14.html" "node_idx_376")
-         (cons #f "r6rs-Z-H-14.html" "node_idx_610")
-         (cos #f "r6rs-Z-H-14.html" "node_idx_548")
-         (define #t "r6rs-Z-H-14.html" "node_idx_352")
-         (define-syntax #t "r6rs-Z-H-14.html" "node_idx_358")
-         (denominator #f "r6rs-Z-H-14.html" "node_idx_526")
-         (div #f "r6rs-Z-H-14.html" "node_idx_510")
-         (div-and-mod #f "r6rs-Z-H-14.html" "node_idx_508")
-         (div0 #f "r6rs-Z-H-14.html" "node_idx_516")
-         (div0-and-mod0 #f "r6rs-Z-H-14.html" "node_idx_514")
-         (dynamic-wind #f "r6rs-Z-H-14.html" "node_idx_764")
-         (else #t "r6rs-Z-H-14.html" "node_idx_380")
-         (eq? #f "r6rs-Z-H-14.html" "node_idx_434")
-         (equal? #f "r6rs-Z-H-14.html" "node_idx_436")
-         (eqv? #f "r6rs-Z-H-14.html" "node_idx_428")
-         (error #f "r6rs-Z-H-14.html" "node_idx_746")
-         (even? #f "r6rs-Z-H-14.html" "node_idx_482")
-         (exact #f "r6rs-Z-H-14.html" "node_idx_462")
-         (exact-integer-sqrt #f "r6rs-Z-H-14.html" "node_idx_562")
-         (exact? #f "r6rs-Z-H-14.html" "node_idx_456")
-         (exp #f "r6rs-Z-H-14.html" "node_idx_540")
-         ;; (export #t "r6rs-Z-H-10.html" "node_idx_270")
-         (expt #f "r6rs-Z-H-14.html" "node_idx_564")
-         (finite? #f "r6rs-Z-H-14.html" "node_idx_484")
-         (floor #f "r6rs-Z-H-14.html" "node_idx_528")
-         (for-each #f "r6rs-Z-H-14.html" "node_idx_644")
-         (gcd #f "r6rs-Z-H-14.html" "node_idx_520")
-         (if #t "r6rs-Z-H-14.html" "node_idx_366")
-         (imag-part #f "r6rs-Z-H-14.html" "node_idx_572")
-         ;; (import #t "r6rs-Z-H-10.html" "node_idx_268")
-         (inexact #f "r6rs-Z-H-14.html" "node_idx_460")
-         (inexact? #f "r6rs-Z-H-14.html" "node_idx_458")
-         (infinite? #f "r6rs-Z-H-14.html" "node_idx_486")
-         (integer->char #f "r6rs-Z-H-14.html" "node_idx_672")
-         (integer-valued? #f "r6rs-Z-H-14.html" "node_idx_454")
-         (integer? #f "r6rs-Z-H-14.html" "node_idx_448")
-         (lambda #t "r6rs-Z-H-14.html" "node_idx_364")
-         (lcm #f "r6rs-Z-H-14.html" "node_idx_522")
-         (length #f "r6rs-Z-H-14.html" "node_idx_632")
-         (let #t "r6rs-Z-H-14.html" "node_idx_394")
-         (let* #t "r6rs-Z-H-14.html" "node_idx_398")
-         (let*-values #t "r6rs-Z-H-14.html" "node_idx_414")
-         (let-syntax #t "r6rs-Z-H-14.html" "node_idx_776")
-         (let-values #t "r6rs-Z-H-14.html" "node_idx_410")
-         (letrec #t "r6rs-Z-H-14.html" "node_idx_402")
-         (letrec* #t "r6rs-Z-H-14.html" "node_idx_406")
-         (letrec-syntax #t "r6rs-Z-H-14.html" "node_idx_782")
-         ;; (library #t "r6rs-Z-H-10.html" "node_idx_266")
-         (list #f "r6rs-Z-H-14.html" "node_idx_630")
-         (list->string #f "r6rs-Z-H-14.html" "node_idx_714")
-         (list->vector #f "r6rs-Z-H-14.html" "node_idx_738")
-         (list-ref #f "r6rs-Z-H-14.html" "node_idx_640")
-         (list-tail #f "r6rs-Z-H-14.html" "node_idx_638")
-         (list? #f "r6rs-Z-H-14.html" "node_idx_628")
-         (log #f "r6rs-Z-H-14.html" "node_idx_542")
-         (magnitude #f "r6rs-Z-H-14.html" "node_idx_574")
-         (make-polar #f "r6rs-Z-H-14.html" "node_idx_568")
-         (make-rectangular #f "r6rs-Z-H-14.html" "node_idx_566")
-         (make-string #f "r6rs-Z-H-14.html" "node_idx_688")
-         (make-vector #f "r6rs-Z-H-14.html" "node_idx_724")
-         (map #f "r6rs-Z-H-14.html" "node_idx_642")
-         (max #f "r6rs-Z-H-14.html" "node_idx_490")
-         (min #f "r6rs-Z-H-14.html" "node_idx_492")
-         (mod #f "r6rs-Z-H-14.html" "node_idx_512")
-         (mod0 #f "r6rs-Z-H-14.html" "node_idx_518")
-         (nan? #f "r6rs-Z-H-14.html" "node_idx_488")
-         (negative? #f "r6rs-Z-H-14.html" "node_idx_478")
-         (not #f "r6rs-Z-H-14.html" "node_idx_594")
-         (null? #f "r6rs-Z-H-14.html" "node_idx_624")
-         (number->string #f "r6rs-Z-H-14.html" "node_idx_578")
-         (number? #f "r6rs-Z-H-14.html" "node_idx_440")
-         (numerator #f "r6rs-Z-H-14.html" "node_idx_524")
-         (odd? #f "r6rs-Z-H-14.html" "node_idx_480")
-         (or #t "r6rs-Z-H-14.html" "node_idx_390")
-         (pair? #f "r6rs-Z-H-14.html" "node_idx_608")
-         (positive? #f "r6rs-Z-H-14.html" "node_idx_476")
-         (procedure? #f "r6rs-Z-H-14.html" "node_idx_342")
-         (quasiquote #t "r6rs-Z-H-14.html" "node_idx_768")
-         (quote #t "r6rs-Z-H-14.html" "node_idx_362")
-         (rational-valued? #f "r6rs-Z-H-14.html" "node_idx_452")
-         (rational? #f "r6rs-Z-H-14.html" "node_idx_446")
-         (rationalize #f "r6rs-Z-H-14.html" "node_idx_536")
-         (real-part #f "r6rs-Z-H-14.html" "node_idx_570")
-         (real-valued? #f "r6rs-Z-H-14.html" "node_idx_450")
-         (real? #f "r6rs-Z-H-14.html" "node_idx_444")
-         (reverse #f "r6rs-Z-H-14.html" "node_idx_636")
-         (round #f "r6rs-Z-H-14.html" "node_idx_534")
-         (set! #f "r6rs-Z-H-14.html" "node_idx_372")
-         (sin #f "r6rs-Z-H-14.html" "node_idx_546")
-         (sqrt #f "r6rs-Z-H-14.html" "node_idx_560")
-         (string #f "r6rs-Z-H-14.html" "node_idx_692")
-         (string->list #f "r6rs-Z-H-14.html" "node_idx_712")
-         (string->number #f "r6rs-Z-H-14.html" "node_idx_584")
-         (string->symbol #f "r6rs-Z-H-14.html" "node_idx_652")
-         (string-append #f "r6rs-Z-H-14.html" "node_idx_710")
-         (string-copy #f "r6rs-Z-H-14.html" "node_idx_718")
-         (string-for-each #f "r6rs-Z-H-14.html" "node_idx_716")
-         (string-length #f "r6rs-Z-H-14.html" "node_idx_694")
-         (string-ref #f "r6rs-Z-H-14.html" "node_idx_696")
-         (string<=? #f "r6rs-Z-H-14.html" "node_idx_704")
-         (string<? #f "r6rs-Z-H-14.html" "node_idx_700")
-         (string=? #f "r6rs-Z-H-14.html" "node_idx_698")
-         (string>=? #f "r6rs-Z-H-14.html" "node_idx_706")
-         (string>? #f "r6rs-Z-H-14.html" "node_idx_702")
-         (string? #f "r6rs-Z-H-14.html" "node_idx_686")
-         (substring #f "r6rs-Z-H-14.html" "node_idx_708")
-         (symbol->string #f "r6rs-Z-H-14.html" "node_idx_648")
-         (symbol=? #f "r6rs-Z-H-14.html" "node_idx_650")
-         (symbol? #f "r6rs-Z-H-14.html" "node_idx_646")
-         (tan #f "r6rs-Z-H-14.html" "node_idx_550")
-         (truncate #f "r6rs-Z-H-14.html" "node_idx_532")
-         (unquote #t "r6rs-Z-H-14.html" "node_idx_770")
-         (unquote-splicing #t "r6rs-Z-H-14.html" "node_idx_772")
-         (values #f "r6rs-Z-H-14.html" "node_idx_760")
-         (vector #f "r6rs-Z-H-14.html" "node_idx_728")
-         (vector->list #f "r6rs-Z-H-14.html" "node_idx_736")
-         (vector-fill! #f "r6rs-Z-H-14.html" "node_idx_740")
-         (vector-for-each #f "r6rs-Z-H-14.html" "node_idx_744")
-         (vector-length #f "r6rs-Z-H-14.html" "node_idx_730")
-         (vector-map #f "r6rs-Z-H-14.html" "node_idx_742")
-         (vector-ref #f "r6rs-Z-H-14.html" "node_idx_732")
-         (vector-set! #f "r6rs-Z-H-14.html" "node_idx_734")
-         (vector? #f "r6rs-Z-H-14.html" "node_idx_722")
-         (zero? #f "r6rs-Z-H-14.html" "node_idx_474")]
-
-@(make-binding-redirect-elements
-  'r6rs/private/base-for-syntax
-  (map cvt-elem
-       '((identifier-syntax ! "r6rs-Z-H-14.html" "node_idx_796")
-         (... ! "r6rs-Z-H-14.html" "node_idx_784")
-         (_ ! "r6rs-Z-H-14.html" "node_idx_788")
-         (syntax-rules ! "r6rs-Z-H-14.html" "node_idx_786"))))
-
-@r6rs-module[rnrs/unicode-6 (rnrs unicode (6))
-             "r6rs-lib-Z-H-2.html" "node_idx_2" "Unicode"
-             (string-upcase #f "r6rs-lib-Z-H-2.html" "node_idx_36")
-             (string-titlecase #f "r6rs-lib-Z-H-2.html" "node_idx_40")
-             (string-normalize-nfkd #f "r6rs-lib-Z-H-2.html" "node_idx_56")
-             (string-normalize-nfkc #f "r6rs-lib-Z-H-2.html" "node_idx_60")
-             (string-normalize-nfd #f "r6rs-lib-Z-H-2.html" "node_idx_54")
-             (string-normalize-nfc #f "r6rs-lib-Z-H-2.html" "node_idx_58")
-             (string-foldcase #f "r6rs-lib-Z-H-2.html" "node_idx_42")
-             (string-downcase #f "r6rs-lib-Z-H-2.html" "node_idx_38")
-             (string-ci>? #f "r6rs-lib-Z-H-2.html" "node_idx_48")
-             (string-ci>=? #f "r6rs-lib-Z-H-2.html" "node_idx_52")
-             (string-ci=? #f "r6rs-lib-Z-H-2.html" "node_idx_44")
-             (string-ci<? #f "r6rs-lib-Z-H-2.html" "node_idx_46")
-             (string-ci<=? #f "r6rs-lib-Z-H-2.html" "node_idx_50")
-             (char-whitespace? #f "r6rs-lib-Z-H-2.html" "node_idx_26")
-             (char-upper-case? #f "r6rs-lib-Z-H-2.html" "node_idx_28")
-             (char-upcase #f "r6rs-lib-Z-H-2.html" "node_idx_4")
-             (char-titlecase #f "r6rs-lib-Z-H-2.html" "node_idx_8")
-             (char-title-case? #f "r6rs-lib-Z-H-2.html" "node_idx_32")
-             (char-numeric? #f "r6rs-lib-Z-H-2.html" "node_idx_24")
-             (char-lower-case? #f "r6rs-lib-Z-H-2.html" "node_idx_30")
-             (char-general-category #f "r6rs-lib-Z-H-2.html" "node_idx_34")
-             (char-foldcase #f "r6rs-lib-Z-H-2.html" "node_idx_10")
-             (char-downcase #f "r6rs-lib-Z-H-2.html" "node_idx_6")
-             (char-ci>? #f "r6rs-lib-Z-H-2.html" "node_idx_16")
-             (char-ci>=? #f "r6rs-lib-Z-H-2.html" "node_idx_20")
-             (char-ci=? #f "r6rs-lib-Z-H-2.html" "node_idx_12")
-             (char-ci<? #f "r6rs-lib-Z-H-2.html" "node_idx_14")
-             (char-ci<=? #f "r6rs-lib-Z-H-2.html" "node_idx_18")
-             (char-alphabetic? #f "r6rs-lib-Z-H-2.html" "node_idx_22")]
-
-@r6rs-module[rnrs/bytevectors-6 (rnrs bytevectors (6))
-             "r6rs-lib-Z-H-3.html" "node_idx_62" "Bytevectors"
-             (utf8->string #f "r6rs-lib-Z-H-3.html" "node_idx_194")
-             (utf32->string #f "r6rs-lib-Z-H-3.html" "node_idx_198")
-             (utf16->string #f "r6rs-lib-Z-H-3.html" "node_idx_196")
-             (uint-list->bytevector #f "r6rs-lib-Z-H-3.html" "node_idx_120")
-             (u8-list->bytevector #f "r6rs-lib-Z-H-3.html" "node_idx_106")
-             (string->utf8 #f "r6rs-lib-Z-H-3.html" "node_idx_184")
-             (string->utf32 #f "r6rs-lib-Z-H-3.html" "node_idx_190")
-             (string->utf16 #f "r6rs-lib-Z-H-3.html" "node_idx_186")
-             (sint-list->bytevector #f "r6rs-lib-Z-H-3.html" "node_idx_122")
-             (native-endianness #f "r6rs-lib-Z-H-3.html" "node_idx_78")
-             (make-bytevector #f "r6rs-lib-Z-H-3.html" "node_idx_82")
-             (endianness #t "r6rs-lib-Z-H-3.html" "node_idx_76")
-             (bytevector? #f "r6rs-lib-Z-H-3.html" "node_idx_80")
-             (bytevector=? #f "r6rs-lib-Z-H-3.html" "node_idx_88")
-             (bytevector-uint-set! #f "r6rs-lib-Z-H-3.html" "node_idx_112")
-             (bytevector-uint-ref #f "r6rs-lib-Z-H-3.html" "node_idx_108")
-             (bytevector-u8-set! #f "r6rs-lib-Z-H-3.html" "node_idx_100")
-             (bytevector-u8-ref #f "r6rs-lib-Z-H-3.html" "node_idx_96")
-             (bytevector-u64-set! #f "r6rs-lib-Z-H-3.html" "node_idx_164")
-             (bytevector-u64-ref #f "r6rs-lib-Z-H-3.html" "node_idx_156")
-             (bytevector-u64-native-set! #f "r6rs-lib-Z-H-3.html" "node_idx_168")
-             (bytevector-u64-native-ref #f "r6rs-lib-Z-H-3.html" "node_idx_160")
-             (bytevector-u32-set! #f "r6rs-lib-Z-H-3.html" "node_idx_148")
-             (bytevector-u32-ref #f "r6rs-lib-Z-H-3.html" "node_idx_140")
-             (bytevector-u32-native-set! #f "r6rs-lib-Z-H-3.html" "node_idx_152")
-             (bytevector-u32-native-ref #f "r6rs-lib-Z-H-3.html" "node_idx_144")
-             (bytevector-u16-set! #f "r6rs-lib-Z-H-3.html" "node_idx_132")
-             (bytevector-u16-ref #f "r6rs-lib-Z-H-3.html" "node_idx_124")
-             (bytevector-u16-native-set! #f "r6rs-lib-Z-H-3.html" "node_idx_136")
-             (bytevector-u16-native-ref #f "r6rs-lib-Z-H-3.html" "node_idx_128")
-             (bytevector-sint-set! #f "r6rs-lib-Z-H-3.html" "node_idx_114")
-             (bytevector-sint-ref #f "r6rs-lib-Z-H-3.html" "node_idx_110")
-             (bytevector-s8-set! #f "r6rs-lib-Z-H-3.html" "node_idx_102")
-             (bytevector-s8-ref #f "r6rs-lib-Z-H-3.html" "node_idx_98")
-             (bytevector-s64-set! #f "r6rs-lib-Z-H-3.html" "node_idx_166")
-             (bytevector-s64-ref #f "r6rs-lib-Z-H-3.html" "node_idx_158")
-             (bytevector-s64-native-set! #f "r6rs-lib-Z-H-3.html" "node_idx_170")
-             (bytevector-s64-native-ref #f "r6rs-lib-Z-H-3.html" "node_idx_162")
-             (bytevector-s32-set! #f "r6rs-lib-Z-H-3.html" "node_idx_150")
-             (bytevector-s32-ref #f "r6rs-lib-Z-H-3.html" "node_idx_142")
-             (bytevector-s32-native-set! #f "r6rs-lib-Z-H-3.html" "node_idx_154")
-             (bytevector-s32-native-ref #f "r6rs-lib-Z-H-3.html" "node_idx_146")
-             (bytevector-s16-set! #f "r6rs-lib-Z-H-3.html" "node_idx_134")
-             (bytevector-s16-ref #f "r6rs-lib-Z-H-3.html" "node_idx_126")
-             (bytevector-s16-native-set! #f "r6rs-lib-Z-H-3.html" "node_idx_138")
-             (bytevector-s16-native-ref #f "r6rs-lib-Z-H-3.html" "node_idx_130")
-             (bytevector-length #f "r6rs-lib-Z-H-3.html" "node_idx_86")
-             (bytevector-ieee-single-ref #f "r6rs-lib-Z-H-3.html" "node_idx_174")
-             (bytevector-ieee-single-native-set! #f "r6rs-lib-Z-H-3.html" "node_idx_180")
-             (bytevector-ieee-single-native-ref #f "r6rs-lib-Z-H-3.html" "node_idx_172")
-             (bytevector-ieee-double-ref #f "r6rs-lib-Z-H-3.html" "node_idx_178")
-             (bytevector-ieee-double-native-set! #f "r6rs-lib-Z-H-3.html" "node_idx_182")
-             (bytevector-ieee-double-native-ref #f "r6rs-lib-Z-H-3.html" "node_idx_176")
-             (bytevector-fill! #f "r6rs-lib-Z-H-3.html" "node_idx_90")
-             (bytevector-copy! #f "r6rs-lib-Z-H-3.html" "node_idx_92")
-             (bytevector-copy #f "r6rs-lib-Z-H-3.html" "node_idx_94")
-             (bytevector->uint-list #f "r6rs-lib-Z-H-3.html" "node_idx_116")
-             (bytevector->u8-list #f "r6rs-lib-Z-H-3.html" "node_idx_104")
-             (bytevector->sint-list #f "r6rs-lib-Z-H-3.html" "node_idx_118")]
-
-@r6rs-module[rnrs/lists-6 (rnrs lists (6))
-             "r6rs-lib-Z-H-4.html" "node_idx_200" "List utilities"
-             (remv #f "r6rs-lib-Z-H-4.html" "node_idx_220")
-             (remq #f "r6rs-lib-Z-H-4.html" "node_idx_222")
-             (remp #f "r6rs-lib-Z-H-4.html" "node_idx_216")
-             (remove #f "r6rs-lib-Z-H-4.html" "node_idx_218")
-             (partition #f "r6rs-lib-Z-H-4.html" "node_idx_210")
-             (memv #f "r6rs-lib-Z-H-4.html" "node_idx_228")
-             (memq #f "r6rs-lib-Z-H-4.html" "node_idx_230")
-             (memp #f "r6rs-lib-Z-H-4.html" "node_idx_224")
-             (member #f "r6rs-lib-Z-H-4.html" "node_idx_226")
-             (for-all #f "r6rs-lib-Z-H-4.html" "node_idx_204")
-             (fold-right #f "r6rs-lib-Z-H-4.html" "node_idx_214")
-             (fold-left #f "r6rs-lib-Z-H-4.html" "node_idx_212")
-             (find #f "r6rs-lib-Z-H-4.html" "node_idx_202")
-             (filter #f "r6rs-lib-Z-H-4.html" "node_idx_208")
-             (exists #f "r6rs-lib-Z-H-4.html" "node_idx_206")
-             (cons* #f "r6rs-lib-Z-H-4.html" "node_idx_240")
-             (assv #f "r6rs-lib-Z-H-4.html" "node_idx_236")
-             (assq #f "r6rs-lib-Z-H-4.html" "node_idx_238")
-             (assp #f "r6rs-lib-Z-H-4.html" "node_idx_232")
-             (assoc #f "r6rs-lib-Z-H-4.html" "node_idx_234")]
-
-@r6rs-module[rnrs/sorting-6 (rnrs sorting (6))
-             "r6rs-lib-Z-H-5.html" "node_idx_244" "Sorting"
-             (vector-sort! #f "r6rs-lib-Z-H-5.html" "node_idx_250")
-             (vector-sort #f "r6rs-lib-Z-H-5.html" "node_idx_248")
-             (list-sort #f "r6rs-lib-Z-H-5.html" "node_idx_246")]
-
-@r6rs-module[rnrs/control-6 (rnrs control (6))
-             "r6rs-lib-Z-H-6.html" "node_idx_252" "Control Structures"
-             (when #t "r6rs-lib-Z-H-6.html" "node_idx_254")
-             (unless #t "r6rs-lib-Z-H-6.html" "node_idx_256")
-             (do #t "r6rs-lib-Z-H-6.html" "node_idx_258")
-             (case-lambda #t "r6rs-lib-Z-H-6.html" "node_idx_262")]
-
-@r6rs-module[rnrs/records/syntactic-6 (rnrs records syntactic (6))
-             "r6rs-lib-Z-H-7.html" "node_idx_286" "Records: Syntactic"
-             (sealed #t "r6rs-lib-Z-H-7.html" "node_idx_300")
-             (record-type-descriptor #t "r6rs-lib-Z-H-7.html" "node_idx_308")
-             (record-constructor-descriptor #t "r6rs-lib-Z-H-7.html" "node_idx_310")
-             (protocol #t "r6rs-lib-Z-H-7.html" "node_idx_298")
-             (parent-rtd #t "r6rs-lib-Z-H-7.html" "node_idx_306")
-             (parent #t "r6rs-lib-Z-H-7.html" "node_idx_296")
-             (opaque #t "r6rs-lib-Z-H-7.html" "node_idx_302")
-             (nongenerative #t "r6rs-lib-Z-H-7.html" "node_idx_304")
-             (mutable #t "r6rs-lib-Z-H-7.html" "node_idx_292")
-             (immutable #t "r6rs-lib-Z-H-7.html" "node_idx_294")
-             (fields #t "r6rs-lib-Z-H-7.html" "node_idx_290")
-             (define-record-type #t "r6rs-lib-Z-H-7.html" "node_idx_288")]
-
-@r6rs-module[rnrs/records/procedural-6 (rnrs records procedural (6))
-             "r6rs-lib-Z-H-7.html" "node_idx_312" "Records: Procedural"
-             (record-type-descriptor? #f "r6rs-lib-Z-H-7.html" "node_idx_320")
-             (record-predicate #f "r6rs-lib-Z-H-7.html" "node_idx_334")
-             (record-mutator #f "r6rs-lib-Z-H-7.html" "node_idx_338")
-             (record-constructor #f "r6rs-lib-Z-H-7.html" "node_idx_332")
-             (record-accessor #f "r6rs-lib-Z-H-7.html" "node_idx_336")
-             (make-record-type-descriptor #f "r6rs-lib-Z-H-7.html" "node_idx_314")
-             (make-record-constructor-descriptor #f "r6rs-lib-Z-H-7.html" "node_idx_322")]
-
-@r6rs-module[rnrs/records/inspection-6 (rnrs records inspection (6))
-             "r6rs-lib-Z-H-7.html" "node_idx_340" "Records: Inspection"
-             (record? #f "r6rs-lib-Z-H-7.html" "node_idx_342")
-             (record-type-uid #f "r6rs-lib-Z-H-7.html" "node_idx_350")
-             (record-type-sealed? #f "r6rs-lib-Z-H-7.html" "node_idx_354")
-             (record-type-parent #f "r6rs-lib-Z-H-7.html" "node_idx_348")
-             (record-type-opaque? #f "r6rs-lib-Z-H-7.html" "node_idx_356")
-             (record-type-name #f "r6rs-lib-Z-H-7.html" "node_idx_346")
-             (record-type-generative? #f "r6rs-lib-Z-H-7.html" "node_idx_352")
-             (record-type-field-names #f "r6rs-lib-Z-H-7.html" "node_idx_358")
-             (record-rtd #f "r6rs-lib-Z-H-7.html" "node_idx_344")
-             (record-field-mutable? #f "r6rs-lib-Z-H-7.html" "node_idx_360")]
-
-@r6rs-module[rnrs/exceptions-6 (rnrs exceptions (6))
-             "r6rs-lib-Z-H-8.html" "node_idx_364" "Exceptions"
-             (with-exception-handler #f "r6rs-lib-Z-H-8.html" "node_idx_368")
-             (raise-continuable #f "r6rs-lib-Z-H-8.html" "node_idx_378")
-             (raise #f "r6rs-lib-Z-H-8.html" "node_idx_376")
-             (guard #t "r6rs-lib-Z-H-8.html" "node_idx_370")
-             (else #t "r6rs-lib-Z-H-8.html" "node_idx_374")
-             (=> #t "r6rs-lib-Z-H-8.html" "node_idx_372")]
-
-See also @secref["conformance"].
-
-@r6rs-module[rnrs/conditions-6 (rnrs conditions (6))
-             "r6rs-lib-Z-H-8.html" "node_idx_382" "Conditions"
-             (who-condition? #f "r6rs-lib-Z-H-8.html" "node_idx_456")
-             (warning? #f "r6rs-lib-Z-H-8.html" "node_idx_418")
-             (violation? #f "r6rs-lib-Z-H-8.html" "node_idx_436")
-             (undefined-violation? #f "r6rs-lib-Z-H-8.html" "node_idx_492")
-             (syntax-violation? #f "r6rs-lib-Z-H-8.html" "node_idx_482")
-             (syntax-violation-subform #f "r6rs-lib-Z-H-8.html" "node_idx_486")
-             (syntax-violation-form #f "r6rs-lib-Z-H-8.html" "node_idx_484")
-             (simple-conditions #f "r6rs-lib-Z-H-8.html" "node_idx_396")
-             (serious-condition? #f "r6rs-lib-Z-H-8.html" "node_idx_424")
-             (non-continuable-violation? #f "r6rs-lib-Z-H-8.html" "node_idx_464")
-             (message-condition? #f "r6rs-lib-Z-H-8.html" "node_idx_410")
-             (make-who-condition #f "r6rs-lib-Z-H-8.html" "node_idx_454")
-             (make-warning #f "r6rs-lib-Z-H-8.html" "node_idx_416")
-             (make-violation #f "r6rs-lib-Z-H-8.html" "node_idx_434")
-             (make-undefined-violation #f "r6rs-lib-Z-H-8.html" "node_idx_490")
-             (make-syntax-violation #f "r6rs-lib-Z-H-8.html" "node_idx_480")
-             (make-serious-condition #f "r6rs-lib-Z-H-8.html" "node_idx_422")
-             (make-non-continuable-violation #f "r6rs-lib-Z-H-8.html" "node_idx_462")
-             (make-message-condition #f "r6rs-lib-Z-H-8.html" "node_idx_408")
-             (make-lexical-violation #f "r6rs-lib-Z-H-8.html" "node_idx_474")
-             (make-irritants-condition #f "r6rs-lib-Z-H-8.html" "node_idx_446")
-             (make-implementation-restriction-violation #f "r6rs-lib-Z-H-8.html" "node_idx_468")
-             (make-error #f "r6rs-lib-Z-H-8.html" "node_idx_428")
-             (make-assertion-violation #f "r6rs-lib-Z-H-8.html" "node_idx_440")
-             (lexical-violation? #f "r6rs-lib-Z-H-8.html" "node_idx_476")
-             (irritants-condition? #f "r6rs-lib-Z-H-8.html" "node_idx_448")
-             (implementation-restriction-violation? #f "r6rs-lib-Z-H-8.html" "node_idx_470")
-             (error? #f "r6rs-lib-Z-H-8.html" "node_idx_430")
-             (define-condition-type #t "r6rs-lib-Z-H-8.html" "node_idx_404")
-             (condition? #f "r6rs-lib-Z-H-8.html" "node_idx_398")
-             (condition-who #f "r6rs-lib-Z-H-8.html" "node_idx_458")
-             (condition-predicate #f "r6rs-lib-Z-H-8.html" "node_idx_400")
-             (condition-message #f "r6rs-lib-Z-H-8.html" "node_idx_412")
-             (condition-irritants #f "r6rs-lib-Z-H-8.html" "node_idx_450")
-             (condition-accessor #f "r6rs-lib-Z-H-8.html" "node_idx_402")
-             (condition #f "r6rs-lib-Z-H-8.html" "node_idx_394")
-             (assertion-violation? #f "r6rs-lib-Z-H-8.html" "node_idx_442")
-             (&who #f "r6rs-lib-Z-H-8.html" "node_idx_452")
-             (&warning #f "r6rs-lib-Z-H-8.html" "node_idx_414")
-             (&violation #f "r6rs-lib-Z-H-8.html" "node_idx_432")
-             (&undefined #f "r6rs-lib-Z-H-8.html" "node_idx_488")
-             (&syntax #f "r6rs-lib-Z-H-8.html" "node_idx_478")
-             (&serious #f "r6rs-lib-Z-H-8.html" "node_idx_420")
-             (&non-continuable #f "r6rs-lib-Z-H-8.html" "node_idx_460")
-             (&message #f "r6rs-lib-Z-H-8.html" "node_idx_406")
-             (&lexical #f "r6rs-lib-Z-H-8.html" "node_idx_472")
-             (&irritants #f "r6rs-lib-Z-H-8.html" "node_idx_444")
-             (&implementation-restriction #f "r6rs-lib-Z-H-8.html" "node_idx_466")
-             (&error #f "r6rs-lib-Z-H-8.html" "node_idx_426")
-             (&condition #f "r6rs-lib-Z-H-8.html" "node_idx_392")
-             (&assertion #f "r6rs-lib-Z-H-8.html" "node_idx_438")]
-
-@r6rs-module[rnrs/io/ports-6 (rnrs io ports (6))
-             "r6rs-lib-Z-H-9.html" "node_idx_560" "I/O: Ports"
-             (utf-8-codec #f "r6rs-lib-Z-H-9.html" "node_idx_592")
-             (utf-16-codec #f "r6rs-lib-Z-H-9.html" "node_idx_594")
-             (transcoder-error-handling-mode #f "r6rs-lib-Z-H-9.html" "node_idx_628")
-             (transcoder-eol-style #f "r6rs-lib-Z-H-9.html" "node_idx_626")
-             (transcoder-codec #f "r6rs-lib-Z-H-9.html" "node_idx_624")
-             (transcoded-port #f "r6rs-lib-Z-H-9.html" "node_idx_650")
-             (textual-port? #f "r6rs-lib-Z-H-9.html" "node_idx_646")
-             (string->bytevector #f "r6rs-lib-Z-H-9.html" "node_idx_632")
-             (standard-output-port #f "r6rs-lib-Z-H-9.html" "node_idx_730")
-             (standard-input-port #f "r6rs-lib-Z-H-9.html" "node_idx_676")
-             (standard-error-port #f "r6rs-lib-Z-H-9.html" "node_idx_732")
-             (set-port-position! #f "r6rs-lib-Z-H-9.html" "node_idx_658")
-             (put-u8 #f "r6rs-lib-Z-H-9.html" "node_idx_742")
-             (put-string #f "r6rs-lib-Z-H-9.html" "node_idx_750")
-             (put-datum #f "r6rs-lib-Z-H-9.html" "node_idx_756")
-             (put-char #f "r6rs-lib-Z-H-9.html" "node_idx_748")
-             (put-bytevector #f "r6rs-lib-Z-H-9.html" "node_idx_744")
-             (port? #f "r6rs-lib-Z-H-9.html" "node_idx_642")
-             (port-transcoder #f "r6rs-lib-Z-H-9.html" "node_idx_644")
-             (port-position #f "r6rs-lib-Z-H-9.html" "node_idx_654")
-             (port-has-set-port-position!? #f "r6rs-lib-Z-H-9.html" "node_idx_656")
-             (port-has-port-position? #f "r6rs-lib-Z-H-9.html" "node_idx_652")
-             (port-eof? #f "r6rs-lib-Z-H-9.html" "node_idx_666")
-             (output-port? #f "r6rs-lib-Z-H-9.html" "node_idx_710")
-             (output-port-buffer-mode #f "r6rs-lib-Z-H-9.html" "node_idx_714")
-             (open-string-output-port #f "r6rs-lib-Z-H-9.html" "node_idx_726")
-             (open-string-input-port #f "r6rs-lib-Z-H-9.html" "node_idx_674")
-             (open-file-output-port #f "r6rs-lib-Z-H-9.html" "node_idx_716")
-             (open-file-input/output-port #f "r6rs-lib-Z-H-9.html" "node_idx_758")
-             (open-file-input-port #f "r6rs-lib-Z-H-9.html" "node_idx_668")
-             (open-bytevector-output-port #f "r6rs-lib-Z-H-9.html" "node_idx_720")
-             (open-bytevector-input-port #f "r6rs-lib-Z-H-9.html" "node_idx_672")
-             (native-transcoder #f "r6rs-lib-Z-H-9.html" "node_idx_622")
-             (native-eol-style #f "r6rs-lib-Z-H-9.html" "node_idx_598")
-             (make-transcoder #f "r6rs-lib-Z-H-9.html" "node_idx_616")
-             (make-i/o-write-error #f "r6rs-lib-Z-H-9.html" "node_idx_508")
-             (make-i/o-read-error #f "r6rs-lib-Z-H-9.html" "node_idx_502")
-             (make-i/o-port-error #f "r6rs-lib-Z-H-9.html" "node_idx_554")
-             (make-i/o-invalid-position-error #f "r6rs-lib-Z-H-9.html" "node_idx_514")
-             (make-i/o-filename-error #f "r6rs-lib-Z-H-9.html" "node_idx_522")
-             (make-i/o-file-protection-error #f "r6rs-lib-Z-H-9.html" "node_idx_530")
-             (make-i/o-file-is-read-only-error #f "r6rs-lib-Z-H-9.html" "node_idx_536")
-             (make-i/o-file-does-not-exist-error #f "r6rs-lib-Z-H-9.html" "node_idx_548")
-             (make-i/o-file-already-exists-error #f "r6rs-lib-Z-H-9.html" "node_idx_542")
-             (make-i/o-error #f "r6rs-lib-Z-H-9.html" "node_idx_496")
-             (make-i/o-encoding-error #f "r6rs-lib-Z-H-9.html" "node_idx_608")
-             (make-i/o-decoding-error #f "r6rs-lib-Z-H-9.html" "node_idx_602")
-             (make-custom-textual-output-port #f "r6rs-lib-Z-H-9.html" "node_idx_740")
-             (make-custom-textual-input/output-port #f "r6rs-lib-Z-H-9.html" "node_idx_764")
-             (make-custom-textual-input-port #f "r6rs-lib-Z-H-9.html" "node_idx_682")
-             (make-custom-binary-output-port #f "r6rs-lib-Z-H-9.html" "node_idx_738")
-             (make-custom-binary-input/output-port #f "r6rs-lib-Z-H-9.html" "node_idx_762")
-             (make-custom-binary-input-port #f "r6rs-lib-Z-H-9.html" "node_idx_680")
-             (lookahead-u8 #f "r6rs-lib-Z-H-9.html" "node_idx_686")
-             (lookahead-char #f "r6rs-lib-Z-H-9.html" "node_idx_698")
-             (latin-1-codec #f "r6rs-lib-Z-H-9.html" "node_idx_590")
-             (input-port? #f "r6rs-lib-Z-H-9.html" "node_idx_664")
-             (i/o-write-error? #f "r6rs-lib-Z-H-9.html" "node_idx_510")
-             (i/o-read-error? #f "r6rs-lib-Z-H-9.html" "node_idx_504")
-             (i/o-port-error? #f "r6rs-lib-Z-H-9.html" "node_idx_556")
-             (i/o-invalid-position-error? #f "r6rs-lib-Z-H-9.html" "node_idx_516")
-             (i/o-filename-error? #f "r6rs-lib-Z-H-9.html" "node_idx_524")
-             (i/o-file-protection-error? #f "r6rs-lib-Z-H-9.html" "node_idx_532")
-             (i/o-file-is-read-only-error? #f "r6rs-lib-Z-H-9.html" "node_idx_538")
-             (i/o-file-does-not-exist-error? #f "r6rs-lib-Z-H-9.html" "node_idx_550")
-             (i/o-file-already-exists-error? #f "r6rs-lib-Z-H-9.html" "node_idx_544")
-             (i/o-error? #f "r6rs-lib-Z-H-9.html" "node_idx_498")
-             (i/o-error-position #f "r6rs-lib-Z-H-9.html" "node_idx_518")
-             (i/o-error-port #f "r6rs-lib-Z-H-9.html" "node_idx_558")
-             (i/o-error-filename #f "r6rs-lib-Z-H-9.html" "node_idx_526")
-             (i/o-encoding-error? #f "r6rs-lib-Z-H-9.html" "node_idx_610")
-             (i/o-encoding-error-char #f "r6rs-lib-Z-H-9.html" "node_idx_612")
-             (i/o-decoding-error? #f "r6rs-lib-Z-H-9.html" "node_idx_604")
-             (get-u8 #f "r6rs-lib-Z-H-9.html" "node_idx_684")
-             (get-string-n! #f "r6rs-lib-Z-H-9.html" "node_idx_702")
-             (get-string-n #f "r6rs-lib-Z-H-9.html" "node_idx_700")
-             (get-string-all #f "r6rs-lib-Z-H-9.html" "node_idx_704")
-             (get-line #f "r6rs-lib-Z-H-9.html" "node_idx_706")
-             (get-datum #f "r6rs-lib-Z-H-9.html" "node_idx_708")
-             (get-char #f "r6rs-lib-Z-H-9.html" "node_idx_696")
-             (get-bytevector-some #f "r6rs-lib-Z-H-9.html" "node_idx_692")
-             (get-bytevector-n! #f "r6rs-lib-Z-H-9.html" "node_idx_690")
-             (get-bytevector-n #f "r6rs-lib-Z-H-9.html" "node_idx_688")
-             (get-bytevector-all #f "r6rs-lib-Z-H-9.html" "node_idx_694")
-             (flush-output-port #f "r6rs-lib-Z-H-9.html" "node_idx_712")
-             (file-options #t "r6rs-lib-Z-H-9.html" "node_idx_574")
-             (error-handling-mode #t "r6rs-lib-Z-H-9.html" "node_idx_614")
-             (eol-style #t "r6rs-lib-Z-H-9.html" "node_idx_596")
-             (eof-object? #f "r6rs-lib-Z-H-9.html" "node_idx_638")
-             (eof-object #f "r6rs-lib-Z-H-9.html" "node_idx_636")
-             (current-output-port #f "r6rs-lib-Z-H-9.html" "node_idx_734")
-             (current-input-port #f "r6rs-lib-Z-H-9.html" "node_idx_678")
-             (current-error-port #f "r6rs-lib-Z-H-9.html" "node_idx_736")
-             (close-port #f "r6rs-lib-Z-H-9.html" "node_idx_660")
-             (call-with-string-output-port #f "r6rs-lib-Z-H-9.html" "node_idx_728")
-             (call-with-port #f "r6rs-lib-Z-H-9.html" "node_idx_662")
-             (call-with-bytevector-output-port #f "r6rs-lib-Z-H-9.html" "node_idx_724")
-             (bytevector->string #f "r6rs-lib-Z-H-9.html" "node_idx_630")
-             (buffer-mode? #f "r6rs-lib-Z-H-9.html" "node_idx_578")
-             (buffer-mode #t "r6rs-lib-Z-H-9.html" "node_idx_576")
-             (binary-port? #f "r6rs-lib-Z-H-9.html" "node_idx_648")
-             (&i/o-write #f "r6rs-lib-Z-H-9.html" "node_idx_506")
-             (&i/o-read #f "r6rs-lib-Z-H-9.html" "node_idx_500")
-             (&i/o-port #f "r6rs-lib-Z-H-9.html" "node_idx_552")
-             (&i/o-invalid-position #f "r6rs-lib-Z-H-9.html" "node_idx_512")
-             (&i/o-filename #f "r6rs-lib-Z-H-9.html" "node_idx_520")
-             (&i/o-file-protection #f "r6rs-lib-Z-H-9.html" "node_idx_528")
-             (&i/o-file-is-read-only #f "r6rs-lib-Z-H-9.html" "node_idx_534")
-             (&i/o-file-does-not-exist #f "r6rs-lib-Z-H-9.html" "node_idx_546")
-             (&i/o-file-already-exists #f "r6rs-lib-Z-H-9.html" "node_idx_540")
-             (&i/o-encoding #f "r6rs-lib-Z-H-9.html" "node_idx_606")
-             (&i/o-decoding #f "r6rs-lib-Z-H-9.html" "node_idx_600")
-             (&i/o #f "r6rs-lib-Z-H-9.html" "node_idx_494")]
-
-@r6rs-module[rnrs/io/simple-6 (rnrs io simple (6))
-             "r6rs-lib-Z-H-9.html" "node_idx_766" "I/O: Simple"
-             (write-char #f "r6rs-lib-Z-H-9.html" "node_idx_820")
-             (write #f "r6rs-lib-Z-H-9.html" "node_idx_832")
-             (with-output-to-file #f "r6rs-lib-Z-H-9.html" "node_idx_798")
-             (with-input-from-file #f "r6rs-lib-Z-H-9.html" "node_idx_796")
-             (read-char #f "r6rs-lib-Z-H-9.html" "node_idx_808")
-             (read #f "r6rs-lib-Z-H-9.html" "node_idx_816")
-             (peek-char #f "r6rs-lib-Z-H-9.html" "node_idx_814")
-             (open-output-file #f "r6rs-lib-Z-H-9.html" "node_idx_802")
-             (open-input-file #f "r6rs-lib-Z-H-9.html" "node_idx_800")
-             (newline #f "r6rs-lib-Z-H-9.html" "node_idx_824")
-             (display #f "r6rs-lib-Z-H-9.html" "node_idx_828")
-             (close-output-port #f "r6rs-lib-Z-H-9.html" "node_idx_806")
-             (close-input-port #f "r6rs-lib-Z-H-9.html" "node_idx_804")
-             (call-with-output-file #f "r6rs-lib-Z-H-9.html" "node_idx_778")
-             (call-with-input-file #f "r6rs-lib-Z-H-9.html" "node_idx_776")]
-
-@r6rs-module[rnrs/files-6 (rnrs files (6))
-             "r6rs-lib-Z-H-10.html" "node_idx_836" "File System"
-             (file-exists? #f "r6rs-lib-Z-H-10.html" "node_idx_838")
-             (delete-file #f "r6rs-lib-Z-H-10.html" "node_idx_840")]
-
-@r6rs-module[rnrs/programs-6 (rnrs programs (6))
-             "r6rs-lib-Z-H-11.html" "node_idx_842" "Command-line Access and Exit Values"
-             (exit #f "r6rs-lib-Z-H-11.html" "node_idx_846")
-             (command-line #f "r6rs-lib-Z-H-11.html" "node_idx_844")]
-
-@r6rs-module[rnrs/arithmetic/fixnums-6 (rnrs arithmetic fixnums (6))
-             "r6rs-lib-Z-H-12.html" "node_idx_854" "Arithmetic: Fixnums"
-             (least-fixnum #f "r6rs-lib-Z-H-12.html" "node_idx_860")
-             (greatest-fixnum #f "r6rs-lib-Z-H-12.html" "node_idx_862")
-             (fxzero? #f "r6rs-lib-Z-H-12.html" "node_idx_874")
-             (fxxor #f "r6rs-lib-Z-H-12.html" "node_idx_920")
-             (fxrotate-bit-field #f "r6rs-lib-Z-H-12.html" "node_idx_944")
-             (fxreverse-bit-field #f "r6rs-lib-Z-H-12.html" "node_idx_946")
-             (fxpositive? #f "r6rs-lib-Z-H-12.html" "node_idx_876")
-             (fxodd? #f "r6rs-lib-Z-H-12.html" "node_idx_880")
-             (fxnot #f "r6rs-lib-Z-H-12.html" "node_idx_914")
-             (fxnegative? #f "r6rs-lib-Z-H-12.html" "node_idx_878")
-             (fxmod0 #f "r6rs-lib-Z-H-12.html" "node_idx_906")
-             (fxmod #f "r6rs-lib-Z-H-12.html" "node_idx_900")
-             (fxmin #f "r6rs-lib-Z-H-12.html" "node_idx_886")
-             (fxmax #f "r6rs-lib-Z-H-12.html" "node_idx_884")
-             (fxlength #f "r6rs-lib-Z-H-12.html" "node_idx_926")
-             (fxior #f "r6rs-lib-Z-H-12.html" "node_idx_918")
-             (fxif #f "r6rs-lib-Z-H-12.html" "node_idx_922")
-             (fxfirst-bit-set #f "r6rs-lib-Z-H-12.html" "node_idx_928")
-             (fxeven? #f "r6rs-lib-Z-H-12.html" "node_idx_882")
-             (fxdiv0-and-mod0 #f "r6rs-lib-Z-H-12.html" "node_idx_902")
-             (fxdiv0 #f "r6rs-lib-Z-H-12.html" "node_idx_904")
-             (fxdiv-and-mod #f "r6rs-lib-Z-H-12.html" "node_idx_896")
-             (fxdiv #f "r6rs-lib-Z-H-12.html" "node_idx_898")
-             (fxcopy-bit-field #f "r6rs-lib-Z-H-12.html" "node_idx_936")
-             (fxcopy-bit #f "r6rs-lib-Z-H-12.html" "node_idx_932")
-             (fxbit-set? #f "r6rs-lib-Z-H-12.html" "node_idx_930")
-             (fxbit-field #f "r6rs-lib-Z-H-12.html" "node_idx_934")
-             (fxbit-count #f "r6rs-lib-Z-H-12.html" "node_idx_924")
-             (fxarithmetic-shift-right #f "r6rs-lib-Z-H-12.html" "node_idx_942")
-             (fxarithmetic-shift-left #f "r6rs-lib-Z-H-12.html" "node_idx_940")
-             (fxarithmetic-shift #f "r6rs-lib-Z-H-12.html" "node_idx_938")
-             (fxand #f "r6rs-lib-Z-H-12.html" "node_idx_916")
-             (fx>? #f "r6rs-lib-Z-H-12.html" "node_idx_866")
-             (fx>=? #f "r6rs-lib-Z-H-12.html" "node_idx_870")
-             (fx=? #f "r6rs-lib-Z-H-12.html" "node_idx_864")
-             (fx<? #f "r6rs-lib-Z-H-12.html" "node_idx_868")
-             (fx<=? #f "r6rs-lib-Z-H-12.html" "node_idx_872")
-             (fx-/carry #f "r6rs-lib-Z-H-12.html" "node_idx_910")
-             (fx- #f "r6rs-lib-Z-H-12.html" "node_idx_892")
-             (fx+/carry #f "r6rs-lib-Z-H-12.html" "node_idx_908")
-             (fx+ #f "r6rs-lib-Z-H-12.html" "node_idx_888")
-             (fx*/carry #f "r6rs-lib-Z-H-12.html" "node_idx_912")
-             (fx* #f "r6rs-lib-Z-H-12.html" "node_idx_890")
-             (fixnum? #f "r6rs-lib-Z-H-12.html" "node_idx_856")
-             (fixnum-width #f "r6rs-lib-Z-H-12.html" "node_idx_858")]
-
-@r6rs-module[rnrs/arithmetic/flonums-6 (rnrs arithmetic flonums (6))
-             "r6rs-lib-Z-H-12.html" "node_idx_948" "Arithmetic: Flonums"
-             (real->flonum #f "r6rs-lib-Z-H-12.html" "node_idx_952")
-             (no-nans-violation? #f "r6rs-lib-Z-H-12.html" "node_idx_1058")
-             (no-infinities-violation? #f "r6rs-lib-Z-H-12.html" "node_idx_1052")
-             (make-no-nans-violation #f "r6rs-lib-Z-H-12.html" "node_idx_1056")
-             (make-no-infinities-violation #f "r6rs-lib-Z-H-12.html" "node_idx_1050")
-             (flzero? #f "r6rs-lib-Z-H-12.html" "node_idx_966")
-             (fltruncate #f "r6rs-lib-Z-H-12.html" "node_idx_1020")
-             (fltan #f "r6rs-lib-Z-H-12.html" "node_idx_1034")
-             (flsqrt #f "r6rs-lib-Z-H-12.html" "node_idx_1044")
-             (flsin #f "r6rs-lib-Z-H-12.html" "node_idx_1030")
-             (flround #f "r6rs-lib-Z-H-12.html" "node_idx_1022")
-             (flpositive? #f "r6rs-lib-Z-H-12.html" "node_idx_968")
-             (flonum? #f "r6rs-lib-Z-H-12.html" "node_idx_950")
-             (flodd? #f "r6rs-lib-Z-H-12.html" "node_idx_972")
-             (flnumerator #f "r6rs-lib-Z-H-12.html" "node_idx_1012")
-             (flnegative? #f "r6rs-lib-Z-H-12.html" "node_idx_970")
-             (flnan? #f "r6rs-lib-Z-H-12.html" "node_idx_980")
-             (flmod0 #f "r6rs-lib-Z-H-12.html" "node_idx_1010")
-             (flmod #f "r6rs-lib-Z-H-12.html" "node_idx_1004")
-             (flmin #f "r6rs-lib-Z-H-12.html" "node_idx_984")
-             (flmax #f "r6rs-lib-Z-H-12.html" "node_idx_982")
-             (fllog #f "r6rs-lib-Z-H-12.html" "node_idx_1026")
-             (flinteger? #f "r6rs-lib-Z-H-12.html" "node_idx_964")
-             (flinfinite? #f "r6rs-lib-Z-H-12.html" "node_idx_978")
-             (flfloor #f "r6rs-lib-Z-H-12.html" "node_idx_1016")
-             (flfinite? #f "r6rs-lib-Z-H-12.html" "node_idx_976")
-             (flexpt #f "r6rs-lib-Z-H-12.html" "node_idx_1046")
-             (flexp #f "r6rs-lib-Z-H-12.html" "node_idx_1024")
-             (fleven? #f "r6rs-lib-Z-H-12.html" "node_idx_974")
-             (fldiv0-and-mod0 #f "r6rs-lib-Z-H-12.html" "node_idx_1006")
-             (fldiv0 #f "r6rs-lib-Z-H-12.html" "node_idx_1008")
-             (fldiv-and-mod #f "r6rs-lib-Z-H-12.html" "node_idx_1000")
-             (fldiv #f "r6rs-lib-Z-H-12.html" "node_idx_1002")
-             (fldenominator #f "r6rs-lib-Z-H-12.html" "node_idx_1014")
-             (flcos #f "r6rs-lib-Z-H-12.html" "node_idx_1032")
-             (flceiling #f "r6rs-lib-Z-H-12.html" "node_idx_1018")
-             (flatan #f "r6rs-lib-Z-H-12.html" "node_idx_1040")
-             (flasin #f "r6rs-lib-Z-H-12.html" "node_idx_1036")
-             (flacos #f "r6rs-lib-Z-H-12.html" "node_idx_1038")
-             (flabs #f "r6rs-lib-Z-H-12.html" "node_idx_998")
-             (fl>? #f "r6rs-lib-Z-H-12.html" "node_idx_960")
-             (fl>=? #f "r6rs-lib-Z-H-12.html" "node_idx_962")
-             (fl=? #f "r6rs-lib-Z-H-12.html" "node_idx_954")
-             (fl<? #f "r6rs-lib-Z-H-12.html" "node_idx_956")
-             (fl<=? #f "r6rs-lib-Z-H-12.html" "node_idx_958")
-             (fl/ #f "r6rs-lib-Z-H-12.html" "node_idx_994")
-             (fl- #f "r6rs-lib-Z-H-12.html" "node_idx_990")
-             (fl+ #f "r6rs-lib-Z-H-12.html" "node_idx_986")
-             (fl* #f "r6rs-lib-Z-H-12.html" "node_idx_988")
-             (fixnum->flonum #f "r6rs-lib-Z-H-12.html" "node_idx_1060")
-             (&no-nans #f "r6rs-lib-Z-H-12.html" "node_idx_1054")
-             (&no-infinities #f "r6rs-lib-Z-H-12.html" "node_idx_1048")]
-
-@r6rs-module[rnrs/arithmetic/bitwise-6 (rnrs arithmetic bitwise (6))
-             "r6rs-lib-Z-H-12.html" "node_idx_1062" "Arithmetic: Bitwise"
-             (bitwise-xor #f "r6rs-lib-Z-H-12.html" "node_idx_1070")
-             (bitwise-rotate-bit-field #f "r6rs-lib-Z-H-12.html" "node_idx_1094")
-             (bitwise-reverse-bit-field #f "r6rs-lib-Z-H-12.html" "node_idx_1096")
-             (bitwise-not #f "r6rs-lib-Z-H-12.html" "node_idx_1064")
-             (bitwise-length #f "r6rs-lib-Z-H-12.html" "node_idx_1076")
-             (bitwise-ior #f "r6rs-lib-Z-H-12.html" "node_idx_1068")
-             (bitwise-if #f "r6rs-lib-Z-H-12.html" "node_idx_1072")
-             (bitwise-first-bit-set #f "r6rs-lib-Z-H-12.html" "node_idx_1078")
-             (bitwise-copy-bit-field #f "r6rs-lib-Z-H-12.html" "node_idx_1086")
-             (bitwise-copy-bit #f "r6rs-lib-Z-H-12.html" "node_idx_1082")
-             (bitwise-bit-set? #f "r6rs-lib-Z-H-12.html" "node_idx_1080")
-             (bitwise-bit-field #f "r6rs-lib-Z-H-12.html" "node_idx_1084")
-             (bitwise-bit-count #f "r6rs-lib-Z-H-12.html" "node_idx_1074")
-             (bitwise-arithmetic-shift-right #f "r6rs-lib-Z-H-12.html" "node_idx_1092")
-             (bitwise-arithmetic-shift-left #f "r6rs-lib-Z-H-12.html" "node_idx_1090")
-             (bitwise-arithmetic-shift #f "r6rs-lib-Z-H-12.html" "node_idx_1088")
-             (bitwise-and #f "r6rs-lib-Z-H-12.html" "node_idx_1066")]
-
-@r6rs-module[rnrs/syntax-case-6 (rnrs syntax-case (6))
-             "r6rs-lib-Z-H-13.html" "node_idx_1098" "Syntax-Case"
-             (with-syntax #t "r6rs-lib-Z-H-13.html" "node_idx_1152")
-             (unsyntax-splicing #t "r6rs-lib-Z-H-13.html" "node_idx_1158")
-             (unsyntax #t "r6rs-lib-Z-H-13.html" "node_idx_1156")
-             (syntax-violation #f "r6rs-lib-Z-H-13.html" "node_idx_1160")
-             (syntax-case #t "r6rs-lib-Z-H-13.html" "node_idx_1124")
-             (syntax->datum #f "r6rs-lib-Z-H-13.html" "node_idx_1144")
-             (syntax #t "r6rs-lib-Z-H-13.html" "node_idx_1134")
-             (quasisyntax #t "r6rs-lib-Z-H-13.html" "node_idx_1154")
-             (make-variable-transformer #f "r6rs-lib-Z-H-13.html" "node_idx_1120")
-             (identifier? #f "r6rs-lib-Z-H-13.html" "node_idx_1138")
-             (generate-temporaries #f "r6rs-lib-Z-H-13.html" "node_idx_1150")
-             (free-identifier=? #f "r6rs-lib-Z-H-13.html" "node_idx_1142")
-             (datum->syntax #f "r6rs-lib-Z-H-13.html" "node_idx_1146")
-             (bound-identifier=? #f "r6rs-lib-Z-H-13.html" "node_idx_1140")
-             (_ #t "r6rs-lib-Z-H-13.html" "node_idx_1126")
-             (... #t "r6rs-lib-Z-H-13.html" "node_idx_1128")]
-
-@r6rs-module[rnrs/hashtables-6 (rnrs hashtables (6))
-             "r6rs-lib-Z-H-14.html" "node_idx_1164" "Hashtables"
-             (symbol-hash #f "r6rs-lib-Z-H-14.html" "node_idx_1224")
-             (string-hash #f "r6rs-lib-Z-H-14.html" "node_idx_1220")
-             (string-ci-hash #f "r6rs-lib-Z-H-14.html" "node_idx_1222")
-             (make-hashtable #f "r6rs-lib-Z-H-14.html" "node_idx_1182")
-             (make-eqv-hashtable #f "r6rs-lib-Z-H-14.html" "node_idx_1178")
-             (make-eq-hashtable #f "r6rs-lib-Z-H-14.html" "node_idx_1174")
-             (hashtable? #f "r6rs-lib-Z-H-14.html" "node_idx_1186")
-             (hashtable-update! #f "r6rs-lib-Z-H-14.html" "node_idx_1198")
-             (hashtable-size #f "r6rs-lib-Z-H-14.html" "node_idx_1188")
-             (hashtable-set! #f "r6rs-lib-Z-H-14.html" "node_idx_1192")
-             (hashtable-ref #f "r6rs-lib-Z-H-14.html" "node_idx_1190")
-             (hashtable-mutable? #f "r6rs-lib-Z-H-14.html" "node_idx_1216")
-             (hashtable-keys #f "r6rs-lib-Z-H-14.html" "node_idx_1208")
-             (hashtable-hash-function #f "r6rs-lib-Z-H-14.html" "node_idx_1214")
-             (hashtable-equivalence-function #f "r6rs-lib-Z-H-14.html" "node_idx_1212")
-             (hashtable-entries #f "r6rs-lib-Z-H-14.html" "node_idx_1210")
-             (hashtable-delete! #f "r6rs-lib-Z-H-14.html" "node_idx_1194")
-             (hashtable-copy #f "r6rs-lib-Z-H-14.html" "node_idx_1200")
-             (hashtable-contains? #f "r6rs-lib-Z-H-14.html" "node_idx_1196")
-             (hashtable-clear! #f "r6rs-lib-Z-H-14.html" "node_idx_1204")
-             (equal-hash #f "r6rs-lib-Z-H-14.html" "node_idx_1218")]
-
-A hashtable is a dictionary in the sense of
-@racketmodname[racket/dict], and hash table operations interact with
-threads in the same way for hash tables created with
-@racket[make-hash] (e.g., @racket[hashtable-ref] and
-@racket[hashtable-set!] are thread-safe).
-
-@r6rs-module[rnrs/enums-6 (rnrs enums (6))
-             "r6rs-lib-Z-H-15.html" "node_idx_1226" "Enumerations"
-             (make-enumeration #f "r6rs-lib-Z-H-15.html" "node_idx_1236")
-             (enum-set=? #f "r6rs-lib-Z-H-15.html" "node_idx_1250")
-             (enum-set-universe #f "r6rs-lib-Z-H-15.html" "node_idx_1238")
-             (enum-set-union #f "r6rs-lib-Z-H-15.html" "node_idx_1252")
-             (enum-set-subset? #f "r6rs-lib-Z-H-15.html" "node_idx_1248")
-             (enum-set-projection #f "r6rs-lib-Z-H-15.html" "node_idx_1260")
-             (enum-set-member? #f "r6rs-lib-Z-H-15.html" "node_idx_1246")
-             (enum-set-intersection #f "r6rs-lib-Z-H-15.html" "node_idx_1254")
-             (enum-set-indexer #f "r6rs-lib-Z-H-15.html" "node_idx_1240")
-             (enum-set-difference #f "r6rs-lib-Z-H-15.html" "node_idx_1256")
-             (enum-set-constructor #f "r6rs-lib-Z-H-15.html" "node_idx_1242")
-             (enum-set-complement #f "r6rs-lib-Z-H-15.html" "node_idx_1258")
-             (enum-set->list #f "r6rs-lib-Z-H-15.html" "node_idx_1244")
-             (define-enumeration #t "r6rs-lib-Z-H-15.html" "node_idx_1262")]
-
-@r6rs-module[rnrs/eval-6 (rnrs eval (6))
-             "r6rs-lib-Z-H-17.html" "node_idx_1265.5" "Eval"
-             (eval #f "r6rs-lib-Z-H-17.html" "node_idx_1266")
-             (environment #f "r6rs-lib-Z-H-17.html" "node_idx_1270")]
-
-@r6rs-module[rnrs/mutable-pairs-6 (rnrs mutable-pairs (6))
-             "r6rs-lib-Z-H-18.html" "node_idx_1272" "Mutable Pairs"
-             (set-cdr! #f "r6rs-lib-Z-H-18.html" "node_idx_1276")
-             (set-car! #f "r6rs-lib-Z-H-18.html" "node_idx_1274")]
-
-@r6rs-module[rnrs/mutable-strings-6 (rnrs mutable-strings (6))
-             "r6rs-lib-Z-H-19.html" "node_idx_1278" "Mutable Strings"
-             (string-set! #f "r6rs-lib-Z-H-19.html" "node_idx_1280")
-             (string-fill! #f "r6rs-lib-Z-H-19.html" "node_idx_1282")]
-
-@r6rs-module[rnrs/r5rs-6 (rnrs r5rs (6))
-             "r6rs-lib-Z-H-20.html" "node_idx_1284" "R5RS Compatibility"
-             (scheme-report-environment #f "r6rs-lib-Z-H-20.html" "node_idx_1308")
-             (remainder #f "r6rs-lib-Z-H-20.html" "node_idx_1292")
-             (quotient #f "r6rs-lib-Z-H-20.html" "node_idx_1290")
-             (null-environment #f "r6rs-lib-Z-H-20.html" "node_idx_1306")
-             (modulo #f "r6rs-lib-Z-H-20.html" "node_idx_1294")
-             (inexact->exact #f "r6rs-lib-Z-H-20.html" "node_idx_1288")
-             (force #f "r6rs-lib-Z-H-20.html" "node_idx_1304")
-             (exact->inexact #f "r6rs-lib-Z-H-20.html" "node_idx_1286")
-             (delay #t "r6rs-lib-Z-H-20.html" "node_idx_1296")]
-
-See also @secref["conformance"].
-
-@; ----------------------------------------
-
-@index-section[]
-
diff --git a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/tests/test-docs-complete.rkt b/pkgs/r6rs-pkgs/r6rs-doc/r6rs/tests/test-docs-complete.rkt
deleted file mode 100644
index fa11dfd3a9..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-doc/r6rs/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote r6rs/run))
-(check-docs (quote r6rs))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/LICENSE.txt b/pkgs/r6rs-pkgs/r6rs-lib/LICENSE.txt
deleted file mode 100644
index cfb69a4488..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-r6rs-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/info.rkt b/pkgs/r6rs-pkgs/r6rs-lib/info.rkt
deleted file mode 100644
index 14afd3766d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base"
-               "r5rs-lib"
-               "compatibility-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"r6rs\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/info.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/info.rkt
deleted file mode 100644
index 9623974283..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define mzscheme-launcher-names '("PLT R6RS"))
-(define mzscheme-launcher-libraries '("run.rkt"))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/lang/reader.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/lang/reader.rkt
deleted file mode 100644
index 06222a0f24..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/lang/reader.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang s-exp syntax/module-reader
-
-r6rs
-
-#:wrapper1 with-r6rs-reader-parameters
-#:language-info '#(scheme/language-info get-info #f)
-
-(require "../private/readtable.rkt")
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/main.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/main.rkt
deleted file mode 100644
index b5cc3f3a60..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/main.rkt
+++ /dev/null
@@ -1,305 +0,0 @@
-#lang scheme/base
-
-#|
-FIXME:
- * Check that exported identifiers are defined in some phase.
- * Check that each identifier is imported only once across phases.
-|#
-
-(require (for-syntax scheme/base
-                     syntax/kerncase
-                     "private/parse-ref.rkt"
-                     scheme/provide-transform)
-         "private/no-set.rkt")
-
-(provide (rename-out [module-begin #%module-begin]))
-
-;; ----------------------------------------
-;; Library and top-level forms
-
-(define-for-syntax (syntax-list? stx)
-  (syntax->list stx))
-
-(define-syntax (module-begin stx)
-  (syntax-case stx (library)
-    [(_ (library . rest))
-     ;; A library
-     (with-syntax ([(_ orig) stx])
-       #'(#%plain-module-begin 
-          (library-body orig . rest)))]
-    [(_ (library . rest) . _)
-     (raise-syntax-error 
-      #f
-      "allowed only in as a top-level module by itself"
-      (syntax-case stx ()
-        [(_ lib . _) #'lib]))]
-    [(_  decl . rest)
-     (syntax-list? #'rest)
-     ;; A top-level program
-     #'(#%plain-module-begin 
-        (top-level-body decl . rest))]
-    [(_)
-     (raise-syntax-error 'r6rs
-                         (string-append
-                          "must contain a `library' form (for a library)"
-                          " or start with `import' (for a top-level program)")
-                         stx)]
-    [_
-     (raise-syntax-error #f "ill-formed module (misuse of `.')" stx)]))
-
-(define-syntax (top-level-body stx)
-  (syntax-case stx (import)
-    [(_ (import . im) . rest)
-     (syntax-list? #'im)
-     (with-syntax ([(_ im . _) stx])
-       #'(begin
-           (r6rs-import im)
-           . rest))]
-    [(_ (import . im) . rest)
-     (raise-syntax-error #f
-                         "ill-formed imports (misuse of `.')"
-                         (syntax-case stx ()
-                           [(_ im . _) #'im]))]
-    [(_ thing . _)
-     (raise-syntax-error 'top-level-program
-                         "expected an `import' declaration, found something else"
-                         #'thing)]))
-
-(define-for-syntax (symbolic-identifier=? a b)
-  (eq? (syntax-e a) (syntax-e b)))
-
-(define-for-syntax (valid-library-name? n)
-  (syntax-case n ()
-    [(id id2 ... (vers ...))
-     (and (identifier? #'id)
-          (andmap identifier? (syntax->list #'(id2 ...)))
-          (andmap (lambda (v)
-                    (exact-nonnegative-integer? (syntax-e v)))
-                  (syntax->list #'(vers ...))))]
-    [(id id2 ...)
-     (valid-library-name? #'(id id2 ... ()))]
-    [_ #f]))
-
-(define-syntax (library-body stx)
-  (syntax-case* stx (export import) symbolic-identifier=?
-    [(_ orig name 
-        (export . ex)
-        (import . im)
-        . body)
-     (and (valid-library-name? #'name)
-          (syntax-list? #'ex)
-          (syntax-list? #'im)
-          (syntax-list? #'body))
-     (with-syntax ([(_ _ _ ex im . _) stx])
-       #'(begin
-           (r6rs-import im)
-           (r6rs-export ex)
-           (library-body/defns . body)))]
-    [(_ orig name . _)
-     (not (valid-library-name? #'name))
-     (raise-syntax-error #f
-                         "invalid library name"
-                         #'orig
-                         #'name)]
-    [(_ orig name (export . ex) . _)
-     (not (syntax-list? #'ex))
-     (raise-syntax-error #f
-                         "ill-formed export sequence (misuse of `.')"
-                         #'orig
-                         (syntax-case stx ()
-                           [(_ _ _ ex . _) #'ex]))]
-    [(_ orig name (export . ex) (import . im) . _)
-     (not (syntax-list? #'im))
-     (raise-syntax-error #f
-                         "ill-formed import sequence (misuse of `.')"
-                         #'orig
-                         (syntax-case stx ()
-                           [(_ _ _ _ im . _) #'im]))]
-    [(_ orig name (export . ex) (import . im) . _)
-     (raise-syntax-error #f
-                         "ill-formed body (misuse of `.')"
-                         #'orig)]
-    [(_ orig name (export . ex))
-     (raise-syntax-error #f
-                         "missing `import' clause"
-                         #'orig)]
-    [(_ orig name (export . ex) im . _)
-     (raise-syntax-error #f
-                         "expected `import' clause, found something else"
-                         #'orig
-                         #'im)]
-    [(_ orig name)
-     (raise-syntax-error #f
-                         "missing `export' and `import' clauses"
-                         #'orig)]
-    [(_ orig name ex . _)
-     (raise-syntax-error #f
-                         "expected `export' clause, found something else"
-                         #'orig
-                         #'ex)]
-    [(_ orig)
-     (raise-syntax-error #f
-                         "missing name, `export' clauses, and `import' clause"
-                         #'orig)]
-    [(_ orig . _)
-     (raise-syntax-error #f
-                         "ill-formed library"
-                         #'orig)]))
-
-(define-syntax (library-body/defns stx)
-  (syntax-case stx ()
-    [(_ thing . more)
-     (let ([a (local-expand
-               #'thing
-               'module
-               (cons #'#%require 
-                     (kernel-form-identifier-list)))])
-       (syntax-case a (begin #%require)
-         [(def . _)
-          (ormap (lambda (id)
-                   (and (identifier? #'def)
-                        (free-identifier=? id #'def)))
-                 (list #'define-values
-                       #'define-syntaxes
-                       #'begin-for-syntax))
-          #`(begin #,a (library-body/defns . more))]
-         [(#%require . _)
-          ;; We allow `require' mixed with definitions, because it
-          ;; might reasonably be introduced by a macro.
-          #`(begin #,a (library-body/defns . more))]
-         [(begin sub ...)
-          #`(library-body/defns sub ... . more)]
-         [else
-          #`(begin (let () #,a . more))]))]
-    [(_) #'(begin)]))
-
-;; ----------------------------------------
-;; Imports and exports
-
-(define-syntax (r6rs-import stx)
-  (let ([orig (syntax-case stx ()
-                [(_ orig) #'orig])])
-    (syntax-case stx (import)
-      [(_ (import im ...))
-       (with-syntax ([((im ...) ...)
-                      (map (lambda (im)
-                             (parse-import
-                              orig
-                              im
-                              (lambda (msg orig stx)
-                                (raise-syntax-error #f
-                                                    msg
-                                                    orig
-                                                    stx))))
-                           (syntax->list #'(im ...)))]
-                     [prelims (datum->syntax orig
-                                             'r6rs/private/prelims)])
-         #'(require prelims im ... ...))])))
-
-(define-syntax (r6rs-export stx)
-  (let ([orig (syntax-case stx ()
-                [(_ orig) #'orig])])
-    (syntax-case stx (export)
-      [(_ (export ex ...))
-       (let ([exs (syntax->list #'(ex ...))])
-         (for-each (lambda (ex)
-                     (unless (identifier? ex)
-                       (syntax-case ex (rename)
-                         [(rename thing ...)
-                          (for-each (lambda (thing)
-                                      (syntax-case thing ()
-                                        [(id1 id2)
-                                         (unless (and (identifier? #'id1)
-                                                      (identifier? #'id2))
-                                           (raise-syntax-error #f
-                                                               "not an identifier"
-                                                               orig
-                                                               (if (identifier? #'id1)
-                                                                   #'id2
-                                                                   #'id1)))]
-                                        [_ (raise-syntax-error 
-                                            #f
-                                            "expected `(<id> <id>)' for rename, but found something else"
-                                            orig
-                                            thing)]))
-                                    (syntax->list #'(thing ...)))]
-                         [(rename . _)
-                          (raise-syntax-error #f
-                                              "bad syntax (misuse of `.')"
-                                              orig
-                                              ex)]
-                         [_
-                          (raise-syntax-error #f
-                                              "not an identifier or `rename' clause"
-                                              orig
-                                              ex)])))
-                   exs)
-         (add-no-set!-identifiers (apply 
-                                   append
-                                   (map (lambda (ex)
-                                          (syntax-case ex (rename)
-                                            [(rename (id ex-id) ...)
-                                             (syntax->list #'(id ...))]
-                                            [id (list ex)]))
-                                        exs)))
-         (with-syntax ([((ex ...) ...)
-                        (map (lambda (ex)
-                               (syntax-case ex ()
-                                 [(rename . rest)
-                                  #'rest]
-                                 [one #'((one one))]))
-                             exs)]
-                       [orig orig])
-           #'(provide (all-levels-out orig ex ... ...))))])))
-
-(define-syntax all-levels-out
-  (make-provide-transformer
-   (lambda (stx mode)
-     (syntax-case stx ()
-       [(_ orig (local-id ext-id) ...)
-        (let* ([table (make-hasheq)]
-               [map-id (lambda (phase)
-                         (lambda (id)
-                           (let ([l (hash-ref table (syntax-e id) null)])
-                             (unless (ormap (lambda (e)
-                                              (and (equal? (cdr e) phase)
-                                                   (free-identifier=? (car e) id phase)))
-                                            l)
-                               (hash-set! table
-                                          (syntax-e id)
-                                          (cons (cons id phase) l))))))])
-          (for ([(phase ids) (in-hash (syntax-local-module-defined-identifiers))])
-            (for-each (map-id phase) ids))
-          (for-each (lambda (l)
-                      (if (car l)
-                          (for-each (map-id (car l)) (cdr l))
-                          null))
-                    (syntax-local-module-required-identifiers #f #t))
-          (apply
-           append
-           (map (lambda (local-id ext-id)
-                  (let* ([l (hash-ref table (syntax-e local-id)
-                                      (lambda ()
-                                        (raise-syntax-error
-                                         #f
-                                         "no binding for exported identifier"
-                                         #'orig
-                                         local-id)))]
-                         [l (filter (lambda (e)
-                                      (free-identifier=? (car e) local-id (cdr e)))
-                                    l)])
-                    (unless l
-                      (raise-syntax-error
-                       #f
-                       "identifier not defined or imported"
-                       #'orig
-                       local-id))
-                    (map (lambda (e)
-                           (make-export local-id
-                                        (syntax-e ext-id)
-                                        (cdr e)
-                                        #f
-                                        local-id))
-                         l)))
-                (syntax->list #'(local-id ...))
-                (syntax->list #'(ext-id ...)))))]))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/base-for-syntax.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/base-for-syntax.rkt
deleted file mode 100644
index 1708e4d41c..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/base-for-syntax.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang scheme/base
-
-;; This module exists for documentaiton purposes: the
-;; for-syntax exports of `rnrs/base-6' are exported
-;; from here in phase 0
-
-(require r6rs/private/identifier-syntax
-         (for-syntax scheme/base
-                     "check-pattern.rkt"))
-
-(provide (rename-out [r6rs:syntax-rules syntax-rules])
-         identifier-syntax
-         ...
-         _)
-
-(define-syntax (r6rs:syntax-rules stx)
-  (syntax-case stx ()
-    [(_ (lit ...) [pat tmpl] ...)
-     (let ([lits (syntax->list #'(lit ...))])
-       (for-each
-        (lambda (lit)
-          (unless (identifier? lit)
-            (raise-syntax-error #f
-                                "literal is not an identifier"
-                                stx
-                                lit))
-          (when (or (free-identifier=? lit (quote-syntax ...))
-                    (free-identifier=? lit #'_))
-            (raise-syntax-error #f
-                                "not allowed as a literal"
-                                stx
-                                lit)))
-        lits)
-       (for-each (check-pat-ellipses stx) (syntax->list #'(pat ...)))
-       (syntax-case stx ()
-         [(_ . rest)
-          (syntax/loc stx (syntax-rules . rest))]))]
-    [(_ . rest)
-     (syntax/loc stx (syntax-rules . rest))]))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/check-pattern.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/check-pattern.rkt
deleted file mode 100644
index 02b20c183a..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/check-pattern.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang scheme/base
-
-(require (for-template (only-in scheme/base ...)))
-
-(provide check-pat-ellipses)
-
-(define ((check-pat-ellipses orig-stx) stx)
-  (let loop ([stx stx][car-ok? #f])
-    (cond
-     [(syntax? stx) (loop (syntax-e stx) car-ok?)]
-     [(pair? stx)
-      (if (and (not car-ok?)
-               (identifier? (car stx))
-               (free-identifier=? (car stx) (quote-syntax ...)))
-          (raise-syntax-error #f
-                              "ellipsis without preceding form"
-                              orig-stx
-                              (car stx))
-          (begin (loop (car stx) #f)
-                 (loop (cdr stx) #t)))]
-     [(vector? stx)
-      (for-each (lambda (stx) (loop stx #f)) (vector->list stx))]
-     [else (void)])))
-
-
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/conds.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/conds.rkt
deleted file mode 100644
index c2ef7a3244..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/conds.rkt
+++ /dev/null
@@ -1,290 +0,0 @@
-#lang scheme/base
-
-(require rnrs/records/syntactic-6
-         rnrs/records/procedural-6
-         scheme/mpair
-         "exns.rkt"
-         (for-syntax scheme/base))
-
-(provide &condition
-         condition?
-         condition
-         simple-conditions
-         condition-predicate
-         condition-accessor
-         define-condition-type
-
-         &message make-message-condition message-condition? condition-message
-         &warning make-warning warning?
-         &serious make-serious-condition serious-condition?
-         &error make-error error?
-         &violation make-violation violation?
-         &assertion make-assertion-violation assertion-violation?
-         &irritants make-irritants-condition irritants-condition? condition-irritants
-         &who make-who-condition who-condition? condition-who
-         &non-continuable make-non-continuable-violation non-continuable-violation?
-         &implementation-restriction make-implementation-restriction-violation implementation-restriction-violation?
-         &lexical make-lexical-violation lexical-violation?
-         &syntax make-syntax-violation syntax-violation? syntax-violation-form syntax-violation-subform
-         &undefined make-undefined-violation undefined-violation?
-
-         &i/o make-i/o-error i/o-error?
-         &i/o-read make-i/o-read-error i/o-read-error?
-         &i/o-write make-i/o-write-error i/o-write-error?
-         &i/o-invalid-position make-i/o-invalid-position-error i/o-invalid-position-error? i/o-error-position
-         &i/o-filename make-i/o-filename-error i/o-filename-error? i/o-error-filename
-         &i/o-file-protection make-i/o-file-protection-error i/o-file-protection-error?
-         &i/o-file-is-read-only make-i/o-file-is-read-only-error i/o-file-is-read-only-error?
-         &i/o-file-already-exists make-i/o-file-already-exists-error i/o-file-already-exists-error?
-         &i/o-file-does-not-exist make-i/o-file-does-not-exist-error i/o-file-does-not-exist-error?
-         &i/o-port make-i/o-port-error i/o-port-error? i/o-error-port)
-
-(define-record-type &condition (fields))
-
-(define-struct (compound-condition exn) (conditions) #:transparent)
-(define-struct (compound-condition:fail exn:fail) (conditions) #:transparent)
-
-(define (condition? v)
-  (or (&condition? v)
-      (compound-condition? v)
-      (compound-condition:fail? v)
-      (exn? v)))
-
-(define (condition . conds)
-  (for-each (lambda (c)
-              (unless (condition? c)
-                (raise-type-error 'condition "condition" c)))
-            conds)
-  (let ([conditions
-         (apply append
-                (map simple-conditions/list conds))])
-    ((if (ormap serious-condition? conditions)
-         make-compound-condition:fail
-         make-compound-condition)
-     (or (ormap (lambda (c)
-                  (and (message-condition? c)
-                       (condition-message c)))
-                conditions)
-         "exception")
-     (or (ormap (lambda (c)
-                  (and (has-continuation-marks? c)
-                       (has-continuation-marks-marks c)))
-                conditions)
-         (current-continuation-marks))
-     conditions)))
-
-(define (condition-predicate rtd)
-  (let ([pred (record-predicate rtd)])
-    (lambda (v)
-      (and (condition? v)
-           (ormap pred (simple-conditions/list v))))))
-
-(define (condition-accessor rtd proc)
-  (let ([pred (record-predicate rtd)])
-    (unless (and (procedure? proc)
-                 (procedure-arity-includes? proc 1))
-      (raise-type-error 'condition-accessor "procedure (arity 1)" proc))
-    (lambda (v)
-      (let ([v (ormap (lambda (x) 
-                        (and (pred x) x))
-                      (simple-conditions/list v))])
-        (if v
-            (proc v)
-            (raise-type-error 'a-condition-accessor "specific kind of condition" v))))))
-
-(define (simple-conditions/list c)
-  (cond
-   [(&condition? c) (list c)]
-   [(compound-condition? c)
-    (compound-condition-conditions c)]
-   [(compound-condition:fail? c)
-    (compound-condition:fail-conditions c)]
-   [(exn? c)
-    (append
-     (list
-      (make-message-condition (cond
-                               [(exn:fail:r6rs? c)
-                                (exn:fail:r6rs-message c)]
-                               [(exn:fail:contract:r6rs? c)
-                                (exn:fail:contract:r6rs-message c)]
-                               [(exn:fail:syntax:r6rs? c)
-                                (exn:fail:syntax:r6rs-message c)]
-                               [else (exn-message c)]))
-      (make-has-continuation-marks (exn-continuation-marks c)))
-     (if (and (exn:fail? c)
-              (not (exn:fail:contract? c)))
-         (list (make-error))
-         null)     
-     (if (exn:fail:contract? c)
-         (list (make-assertion-violation))
-         null)
-     (if (exn:fail:r6rs? c)
-         (append
-          (if (exn:fail:r6rs-who c)
-              (list (make-who-condition (exn:fail:r6rs-who c)))
-              null)
-          (list (make-irritants-condition (list->mlist (exn:fail:r6rs-irritants c)))))
-         null)
-     (if (exn:fail:contract:r6rs? c)
-         (append
-          (if (exn:fail:contract:r6rs-who c)
-              (list (make-who-condition (exn:fail:contract:r6rs-who c)))
-              null)
-          (list (make-irritants-condition (list->mlist (exn:fail:contract:r6rs-irritants c)))))
-         null)
-     (if (or (exn:fail:unsupported? c)
-             (exn:fail:contract:divide-by-zero? c)
-             (exn:fail:contract:non-fixnum-result? c))
-         (list (make-implementation-restriction-violation))
-         null)
-     (if (exn:fail:read? c)
-         (list (make-lexical-violation))
-         null)
-     (if (exn:fail:syntax? c)
-         (if (exn:fail:syntax:r6rs? c)
-             (append
-              (list (make-syntax-violation
-                     (exn:fail:syntax:r6rs-form c)
-                     (exn:fail:syntax:r6rs-subform c)))
-              (if (exn:fail:syntax:r6rs-who c)
-                  (list (make-who-condition (exn:fail:syntax:r6rs-who c)))
-                  null))
-             (let ([forms (exn:fail:syntax-exprs c)])
-               (list (make-syntax-violation
-                      (if (pair? forms)
-                          (car forms)
-                          #f)
-                      (if (and (pair? forms)
-                               (pair? (cdr forms)))
-                          (cadr forms)
-                          #f)))))
-         null)
-     (if (exn:fail:contract:variable? c)
-         (list (make-undefined-violation))
-         null)
-     (if (exn:fail:filesystem:exists? c)
-         (list (make-i/o-file-already-exists-error "???"))
-         null)
-     (if (exn:fail:filesystem:exists-not? c)
-         (list (make-i/o-file-does-not-exist-error 
-                (exn:fail:filesystem:exists-not-filename
-                 c)))
-         null)
-     (if (exn:fail:contract:non-continuable? c)
-         (list (make-non-continuable-violation))
-         null))]
-   [else (raise-type-error 'simple-conditions
-                           "condition"
-                           c)]))
-
-(define (simple-conditions c)
-  (list->mlist (simple-conditions/list c)))
-
-(define-syntax (define-condition-type stx)
-  (syntax-case stx ()
-    [(_ type supertype
-        constructor predicate
-        (field accessor) ...)
-     (with-syntax ([(tmp-acc ...) (generate-temporaries #'(field ...))])
-       #'(begin
-           (define-record-type (type constructor base-predicate)
-             (fields (immutable field tmp-acc) ...)
-             (parent supertype))
-           (define predicate (condition-predicate type))
-           (define accessor (condition-accessor type tmp-acc)) ...))]))
-
-(define-condition-type &message &condition
-  make-message-condition message-condition?
-  (message condition-message))
-
-(define-condition-type &cont-marks &condition
-  make-has-continuation-marks has-continuation-marks?
-  (marks has-continuation-marks-marks))
-
-(define-condition-type &warning &condition
-  make-warning warning?)
-
-(define-condition-type &serious &condition
-  make-serious-condition serious-condition?)
-
-(define-condition-type &error &serious
-  make-error error?)
-
-(define-condition-type &violation &serious
-  make-violation violation?)
-
-(define-condition-type &assertion &violation
-  make-assertion-violation assertion-violation?)
-
-(define-condition-type &irritants &condition
-  make-irritants-condition irritants-condition?
-  (irritants condition-irritants))
-
-(define-condition-type &who &condition
-  make-who-condition who-condition?
-  (who condition-who))
-
-(define-condition-type &non-continuable &violation
-  make-non-continuable-violation
-  non-continuable-violation?)
-
-(define-condition-type &implementation-restriction
-    &violation
-  make-implementation-restriction-violation
-  implementation-restriction-violation?)
-
-(define-condition-type &lexical &violation
-  make-lexical-violation lexical-violation?)
-
-(define-condition-type &syntax &violation
-  make-syntax-violation syntax-violation?
-  (form syntax-violation-form)
-  (subform syntax-violation-subform))
-
-;; ----------------------------------------
-;; i/o
-
-(define-condition-type &undefined &violation
-  make-undefined-violation undefined-violation?)
-
-(define-condition-type &i/o &error
-  make-i/o-error i/o-error?)
-
-(define-condition-type &i/o-read &i/o
-  make-i/o-read-error i/o-read-error?)
-
-(define-condition-type &i/o-write &i/o
-  make-i/o-write-error i/o-write-error?)
-
-(define-condition-type &i/o-invalid-position &i/o
-  make-i/o-invalid-position-error
-  i/o-invalid-position-error?
-  (position i/o-error-position))
-
-(define-condition-type &i/o-filename &i/o
-  make-i/o-filename-error i/o-filename-error?
-  (filename i/o-error-filename))
-
-(define-condition-type &i/o-file-protection
-  &i/o-filename
-  make-i/o-file-protection-error
-  i/o-file-protection-error?)
-
-(define-condition-type &i/o-file-is-read-only
-  &i/o-file-protection
-  make-i/o-file-is-read-only-error
-  i/o-file-is-read-only-error?)
-
-(define-condition-type &i/o-file-already-exists
-  &i/o-filename
-  make-i/o-file-already-exists-error
-  i/o-file-already-exists-error?)
-
-(define-condition-type &i/o-file-does-not-exist
-  &i/o-filename
-  make-i/o-file-does-not-exist-error
-  i/o-file-does-not-exist-error?)
-
-(define-condition-type &i/o-port &i/o
-  make-i/o-port-error i/o-port-error?
-  (port i/o-error-port))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/encode-name.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/encode-name.rkt
deleted file mode 100644
index 71f36d210e..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/encode-name.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang scheme/base
-
-(provide encode-name)
-
-(define (encode-name s)
-  (let ([s (if (symbol? s)
-               (symbol->string s)
-               s)])
-    (cond
-     [(regexp-match #rx"(.*?)([^a-zA-Z0-9_+-]+)(.*)" s)
-      => (lambda (m)
-           (string-append
-            (cadr m)
-            (apply
-             string-append
-             (map (lambda (c)
-                    (let ([s (format "0~x" c)])
-                      (string-append
-                       "%"
-                       (substring s (- (string-length s) 2)))))
-                  (bytes->list (string->bytes/utf-8 (caddr m)))))
-            (encode-name (cadddr m))))]
-     [else s])))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/exns.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/exns.rkt
deleted file mode 100644
index 9458260dfa..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/exns.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scheme
-
-(provide (struct-out exn:fail:r6rs)
-         (struct-out exn:fail:contract:r6rs)
-         (struct-out exn:fail:contract:non-continuable)
-         (struct-out exn:fail:syntax:r6rs)
-         (struct-out exn:fail:filesystem:exists-not))
-
-(define-struct (exn:fail:r6rs exn:fail) (message who irritants))
-(define-struct (exn:fail:contract:r6rs exn:fail:contract) (message who irritants))
-(define-struct (exn:fail:contract:non-continuable exn:fail:contract) ())
-(define-struct (exn:fail:syntax:r6rs exn:fail:syntax) (message who form subform))
-
-(define-struct (exn:fail:filesystem:exists-not exn:fail:filesystem) (filename))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/find-version.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/find-version.rkt
deleted file mode 100644
index b3cee647e7..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/find-version.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang scheme/base
-
-(provide find-version)
-
-(define (find-version base-path vers)
-  (let-values ([(dir name _) (split-path (bytes->path base-path))])
-    (let ([files (with-handlers ([exn:fail:filesystem? (lambda (exn) null)])
-                   (directory-list dir))])
-      (and files
-           (let* ([p (path-element->bytes name)]
-                  [len (bytes-length p)]
-                  [candidate-versions
-                   (filter
-                    values
-                    (map
-                     (lambda (file)
-                       (let ([s (path-element->bytes file)])
-                         (and 
-                          (and (len . < . (bytes-length s))
-                               (bytes=? p (subbytes s 0 len))) 
-                          (let ([ext (let ([m (regexp-match #rx#"([.][a-z]+)?[.](rkt|ss|sls)$" 
-                                                            (subbytes s len))])
-                                       (and m 
-                                            (or (not (cadr m))
-                                                (bytes=? (cadr m) #".mzscheme"))
-                                            (car m)))])
-                            (and ext
-                                 (or (and (= (bytes-length s) (+ len (bytes-length ext)))
-                                          (cons null ext))
-                                     (let ([vers (subbytes s len (- (bytes-length s) (bytes-length ext)))])
-                                       (and (regexp-match #rx#"^(-[0-9]+)+$" vers)
-                                            (cons 
-                                             (map string->number
-                                                  (cdr
-                                                   (map bytes->string/latin-1
-                                                        (regexp-split #rx#"-" vers))))
-                                             ext)))))))))
-                     files))]
-                  [versions
-                   (let* ([eo '(#".mzscheme.ss" #".mzscheme.sls" #".ss" #".sls" #".rkt")]
-                          [ext< (lambda (a b)
-                                  (> (length (member a eo)) (length (member b eo))))])
-                     (sort candidate-versions
-                           (lambda (a b)
-                             (if (equal? (car a) (car b))
-                               (ext< (cdr a) (cdr b))
-                               (let loop ([a (car a)] [b (car b)])
-                                 (cond
-                                   [(null? a) #t]
-                                   [(null? b) #f]
-                                   [(> (car a) (car b)) #t]
-                                   [(< (car a) (car b)) #f]
-                                   [else (loop (cdr a) (cdr b))]))))))])
-             (ormap (lambda (candidate-version)
-                      (and (version-match? (car candidate-version) vers)
-                           (cons (car candidate-version)
-                                 (bytes->string/latin-1 (cdr candidate-version)))))
-                    versions))))))
-
-(define (version-match? cand vers)
-  (cond
-   [(null? vers) #t]
-   [(null? cand) #f]
-   [(eq? (car vers) 'and)
-    (andmap (lambda (v)
-              (version-match? cand v))
-            (cdr vers))]
-   [(eq? (car vers) 'or)
-    (ormap (lambda (v)
-             (version-match? cand v))
-           (cdr vers))]
-   [(eq? (car vers) 'not)
-    (not (version-match? cand (cadr vers)))]
-   [(sub-version-match? (car cand) (car vers))
-    (version-match? (cdr cand) (cdr vers))]
-   [else #f]))
-
-(define (sub-version-match? cand subvers)
-  (cond
-   [(number? subvers) (= cand subvers)]
-   [else (case (car subvers)
-           [(>=) (>= cand (cadr subvers))]
-           [(<=) (<= cand (cadr subvers))]
-           [(and) (andmap (lambda (sv)
-                            (sub-version-match? cand sv))
-                          (cdr subvers))]
-           [(or) (ormap (lambda (sv)
-                          (sub-version-match? cand sv))
-                        (cdr subvers))]
-           [(not) (not (sub-version-match? cand (cadr subvers)))]
-           [else (error "bad subversion")])]))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/identifier-syntax.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/identifier-syntax.rkt
deleted file mode 100644
index 8680c30adb..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/identifier-syntax.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang scheme/base
-(require (for-syntax scheme/base)
-         (for-template "no-set.rkt"
-                       (only-in scheme/base #%app set!)))
-
-(provide identifier-syntax)
-
-(define-syntax (identifier-syntax stx)
-  (syntax-case* stx (r6rs:set!) (lambda (a b)
-                                  (free-template-identifier=? a b))
-    [(identifier-syntax template)
-     #'(...
-        (make-set!-transformer
-         (lambda (stx)
-           (syntax-case stx (set!)
-             [(set! . _) (raise-syntax-error
-                               #f
-                               "cannot assign to identifier macro"
-                               stx)]
-             [(_ arg ...) #'(template arg ...)]
-             [_ #'template]))))]
-    [(identifier-syntax
-      [id1 template1]
-      [(r6rs:set! id2 pat) template2])
-     (and (identifier? #'id1)
-          (identifier? #'id2))
-     #'(...
-        (make-set!-transformer
-         (lambda (stx)
-           (syntax-case stx (set!)
-             [(set! id2 pat) #'template2]
-             [(_ arg ...) #'(template1 arg ...)]
-             [_ #'template1]))))]))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/inline-rules.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/inline-rules.rkt
deleted file mode 100644
index 02cc275d8a..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/inline-rules.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang scheme/base
-
-(require (for-syntax scheme/base)
-         (for-template scheme/base))
-
-(provide inline-rules)
-
-(define-syntax-rule (inline-rules orig-id [pat result] ...)
-  (make-set!-transformer
-   (lambda (stx)
-     (syntax-case stx (set!)
-       [(set! . _)
-        (raise-syntax-error #f
-                            "cannot mutate"
-                            stx)]
-       [pat #'result] ...
-       [(id . args) #'(orig-id . args)]
-       [id #'orig-id]))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/io-conds.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/io-conds.rkt
deleted file mode 100644
index e288e05f0d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/io-conds.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#!r6rs
-
-(library (r6rs private io-conds)
-  (export &i/o make-i/o-error i/o-error?
-          &i/o-read make-i/o-read-error i/o-read-error?
-          &i/o-write make-i/o-write-error i/o-write-error?
-          &i/o-invalid-position make-i/o-invalid-position-error i/o-invalid-position-error? i/o-error-position
-          &i/o-filename make-i/o-filename-error i/o-filename-error? i/o-error-filename
-          &i/o-file-protection make-i/o-file-protection-error i/o-file-protection-error?
-          &i/o-file-is-read-only make-i/o-file-is-read-only-error i/o-file-is-read-only-error?
-          &i/o-file-already-exists make-i/o-file-already-exists-error i/o-file-already-exists-error?
-          &i/o-file-does-not-exist make-i/o-file-does-not-exist-error i/o-file-does-not-exist-error?
-          &i/o-port make-i/o-port-error i/o-port-error? i/o-error-port)
-  (import (r6rs private conds)))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/no-set.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/no-set.rkt
deleted file mode 100644
index fe3b43b567..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/no-set.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang scheme/base
-(require (for-syntax scheme/base
-                     syntax/boundmap))
-
-(provide (for-syntax add-no-set!-identifiers)
-         r6rs:set!)
-
-;; Provided identifier cannot be `set!'ed. The list
-;; is relevant only within the module being compiled.
-(define-for-syntax no-set!-identifiers (make-free-identifier-mapping))
-
-(define-for-syntax (add-no-set!-identifiers ids)
-  (for ([id (in-list ids)])
-    (free-identifier-mapping-put! no-set!-identifiers id #t)))
-
-(define-for-syntax (no-set!-identifier? id)
-  (free-identifier-mapping-get no-set!-identifiers id (lambda () #f)))
-
-;; ----------------------------------------
-
-(define-syntax (r6rs:set! stx)
-  (syntax-case stx ()
-    [(_ id rhs)
-     (identifier? #'id)
-     (if (no-set!-identifier? #'id)
-         (raise-syntax-error
-          #f
-          "cannot mutate exported identifier"
-          stx
-          #'id)
-         (syntax/loc stx (set! id rhs)))]
-    [(_ . rest)
-     (syntax/loc stx (set! . rest))]))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/num-inline.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/num-inline.rkt
deleted file mode 100644
index bbcf262700..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/num-inline.rkt
+++ /dev/null
@@ -1,103 +0,0 @@
-#lang scheme/base
-
-(require (for-syntax scheme/base
-                     r6rs/private/inline-rules))
-
-(provide define-inliner
-         nocheck
-         implementation-restriction)
-
-(define-syntax-rule (nocheck v . _)
-  v)
-
-(define (implementation-restriction who what)
-  (raise
-   (make-exn:fail:unsupported
-    (format "~a: result is out of range: ~e" who what)
-    (current-continuation-marks))))
-
-(define-syntax-rule (define-inliner define-fx numtype? numtype-str)
-  (...
-   (begin
-     (define-syntax (define-an-fx stx)
-       (syntax-case stx ()
-         [(_ orig fx binary-op check-result base-body ([(arg ...) (tmp ...)] ...) . rest)
-          (with-syntax ([(extra-clauses ...)
-                         (if (syntax-e #'binary-op)
-                             #'([(_ arg1 arg2) (binary-op arg1 arg2)])
-                             #'())]
-                        [(base-clause ...)
-                         (if (syntax-e #'base-body)
-                             #'([() . base-body])
-                             #'())])
-            #'(begin
-                (provide fx)
-                (define fx-proc
-                  (let ([fx (case-lambda
-                             base-clause ...
-                             [(arg ...)
-                              (unless (numtype? arg)
-                                (raise-type-error 'fx numtype-str arg))
-                              ...
-                              (let ([r (orig arg ...)])
-                                (check-result r (implementation-restriction 'fx r)))]
-                             ...
-                             . rest)])
-                    fx))
-                (define-syntax fx
-                  (inline-rules
-                   fx-proc
-                   extra-clauses ...
-                   [(_ arg ...)
-                    (let ([tmp arg] ...)
-                      (if (and (numtype? tmp) ...)
-                          (let ([v (orig tmp ...)])
-                            (check-result v (fx-proc tmp ...)))
-                          (fx-proc tmp ...)))]
-                   ...))))]))
-
-     (define-syntax define-an-fx+rest
-       (syntax-rules ()
-         [(_ orig fx binary-op check base-body clauses)
-          (define-an-fx orig fx binary-op check base-body clauses
-            [args (for-each (lambda (arg)
-                              (unless (numtype? arg)
-                                (raise-type-error 'fx numtype-str arg)))
-                            args)
-                  (let ([r (apply orig args)])
-                    (check r (implementation-restriction 'fx r))
-                    r)])]))
-
-
-     (define-syntax define-fx
-       (syntax-rules (...)
-         [(_ orig fx binary-op [(a) (b c)] check)
-          (define-an-fx orig fx binary-op check #f
-            ([(a) (t1)]
-             [(b c) (t1 t2)]))]
-         [(_ orig fx binary-op [(a) (b c (... ...))] check)
-          (define-an-fx+rest orig fx binary-op check #f
-            ([(a) (t1)]
-             [(b c) (t1 t2)]))]
-         [(_ orig fx binary-op (a b c (... ...)) check)
-          (define-an-fx+rest orig fx binary-op check #f
-            ([(a b) (t1 t2)]))]
-         [(_ orig fx binary-op (a b (... ...)) check)
-          (define-an-fx+rest orig fx binary-op check #f
-            ([(a) (t1)]
-             [(a b) (t1 t2)]
-             [(a b c) (t1 t2 t3)]))]
-         [(_ orig fx binary-op #:base base (a b (... ...)) check)
-          (define-an-fx+rest orig fx binary-op check (base)
-            ([(a) (t1)]
-             [(a b) (t1 t2)]
-             [(a b c) (t1 t2 t3)]))]
-         [(_ orig fx binary-op (a) check)
-          (define-an-fx+rest orig fx binary-op check #f
-            ([(a) (t1)]))]
-         [(_ orig fx binary-op (a b) check)
-          (define-an-fx orig fx binary-op check #f
-            ([(a b) (t1 t2)]))]
-         [(_ orig fx binary-op (a b c) check)
-          (define-an-fx orig fx binary-op check #f
-            ([(a b c) (t1 t2 t3)]))])))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/parse-ref.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/parse-ref.rkt
deleted file mode 100644
index 255513e78f..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/parse-ref.rkt
+++ /dev/null
@@ -1,171 +0,0 @@
-#lang scheme/base
-
-(require "find-version.rkt"
-         "encode-name.rkt"
-         (for-template scheme/base))
-
-(provide parse-import)
-
-(define (symbolic-identifier=? a b)
-  (eq? (syntax-e a) (syntax-e b)))
-
-(define (is-sub-version-reference? stx)
-  (syntax-case* stx (<= >= and or not) symbolic-identifier=?
-    [n (exact-nonnegative-integer? (syntax-e #'n)) #t]
-    [(>= n) (exact-nonnegative-integer? (syntax-e #'n))]
-    [(<= n) (exact-nonnegative-integer? (syntax-e #'n))]
-    [(and sv ...) (andmap is-sub-version-reference? (syntax->list #'(sv ...)))]
-    [(or sv ...) (andmap is-sub-version-reference? (syntax->list #'(sv ...)))]
-    [(not sv) (is-sub-version-reference? #'sv)]
-    [_ #f]))
-
-(define (is-version-reference? stx)
-  (syntax-case* stx (and or not) symbolic-identifier=?
-    [(and vr ...)
-     (andmap is-version-reference? (syntax->list #'(vr ...)))]
-    [(or vr ...)
-     (andmap is-version-reference? (syntax->list #'(vr ...)))]
-    [(not vr)
-     (is-version-reference? #'vr)]
-    [(sv ...)
-     (andmap is-sub-version-reference? (syntax->list #'(sv ...)))]
-    [_ #f]))
-
-(define (parse-library-reference stx err)
-  (syntax-case stx ()
-    [(id1 id2 ... (vers ...))
-     (and (identifier? #'id1)
-          (andmap identifier? (syntax->list #'(id2 ...)))
-          (is-version-reference? #'(vers ...)))
-     (let-values ([(coll file)
-                   (let* ([strs (map (lambda (id)
-                                       (symbol->string (syntax-e id)))
-                                     (syntax->list #'(id1 id2 ...)))]
-                          [len (length strs)]
-                          [strs (map
-                                 encode-name
-                                 (if (and (= 2 len) (regexp-match? #rx"^main_*$" (cadr strs)))
-                                     ;; rename (X main_*) => (X main__*)
-                                     (list (car strs)
-                                           (string-append (cadr strs) "_"))
-                                     ;; no rename
-                                     strs))])
-                     (if (= 1 len) 
-                         (values (list (car strs)) "main")
-                         (values (reverse (cdr (reverse strs)))
-                                 (car (reverse strs)))))])
-       (let ([base (with-handlers ([exn:fail?
-                                    (lambda (exn)
-                                      (err
-                                       (format 
-                                        "cannot find suitable library installed (exception: ~a)"
-                                        (if (exn? exn)
-                                            (exn-message exn)
-                                            exn))))])
-                     (with-handlers ([exn:fail?
-                                      (lambda (exn)
-                                        ;; Next, try collection (hopefully not spliced):
-                                        (build-path (apply collection-path coll)
-                                                    file))])
-                       ;; First, try specific file in collection, which works
-                       ;; when the relevant collection is spliced:
-                       (path-replace-suffix
-                        (apply collection-file-path (path-add-suffix file #".rkt") coll)
-                        #"")))])
-         (let ([vers.ext (find-version (path->bytes base) (syntax->datum #'(vers ...)))])
-           (if vers.ext
-               (apply string-append
-                      (car coll)
-                      (append
-                       (map (lambda (s)
-                              (string-append "/" s))
-                            (append (cdr coll) (list file)))
-                       (map (lambda (v)
-                              (format "-~a" v))
-                            (car vers.ext))
-                       (list (cdr vers.ext))))
-               (err "cannot find suitable installed library")))))]
-    [(id1 id2 ...)
-     (and (identifier? #'id1)
-          (andmap identifier? (syntax->list #'(id2 ...))))
-     (parse-library-reference #'(id1 id2 ... ()) err)]
-    [_
-     (err "ill-formed library reference")]))
-
-(define (convert-library-reference orig stx stx-err)
-  (datum->syntax
-   orig
-   `(,#'lib
-     ,(parse-library-reference stx
-                               (lambda (msg)
-                                 (stx-err msg orig stx))))
-   orig))
-
-(define (parse-import-set orig stx stx-err)
-  (define (bad)
-    (stx-err (format "bad `~a' form" 
-                     (syntax-e (car (syntax-e stx))))
-             orig
-             stx))
-  (define (check-id id)
-    (unless (identifier? id)
-      (stx-err (format "not an identifier in `~a' form"
-                       (syntax-e (car (syntax-e stx))))
-               orig
-               id)))
-  (syntax-case* stx (library only except prefix rename) symbolic-identifier=?
-    [(library lib)
-     (convert-library-reference orig #'lib stx-err)]
-    [(library . _) (bad)]
-    [(only im id ...)
-     (for-each check-id (syntax->list #'(id ...)))
-     #`(only-in #,(parse-import-set orig #'im stx-err) id ...)]
-    [(only . _) (bad)]
-    [(except im id ...)
-     (for-each check-id (syntax->list #'(id ...)))
-     #`(except-in #,(parse-import-set orig #'im stx-err) id ...)]
-    [(except . _) (bad)]
-    [(prefix im id)
-     (check-id #'id)
-     #`(prefix-in id #,(parse-import-set orig #'im stx-err))]
-    [(prefix . _) (bad)]
-    [(rename im (id id2) ...)
-     (for-each check-id 
-               (apply
-                append
-                (map syntax->list
-                     (syntax->list #'((id id2) ...)))))
-     #`(rename-in #,(parse-import-set orig #'im stx-err) [id id2] ...)]
-    [(rename . _) (bad)]
-    [_ (convert-library-reference orig stx stx-err)]))
-
-(define (parse-import orig im stx-err)
-  (syntax-case* im (for) symbolic-identifier=?
-    [(for base-im level ...)
-     (let* ([levels
-             (cons
-              #f
-              (map (lambda (level)
-                     (syntax-case* level (run expand meta) symbolic-identifier=?
-                       [run #'0]
-                       [expand #'1]
-                       [(meta 0) #'0]
-                       [(meta n) #'n]
-                       [_
-                        (stx-err
-                         "bad `for' level"
-                         orig
-                         level)]))
-                   (syntax->list #'(level ...))))])
-       (with-syntax ([is (parse-import-set orig #'base-im stx-err)])
-         (with-syntax ([(level ...) levels]
-                       [prelims (datum->syntax orig
-                                               'r6rs/private/prelims)])
-           #`((for-meta level is prelims) ...))))]
-    [(for . _)
-     (stx-err
-      "bad `for' import form"
-      orig
-      im)]
-    [_ (let ([m (parse-import-set orig im stx-err)])
-         (list m `(for-label ,m)))]))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/ports.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/ports.rkt
deleted file mode 100644
index a693e7fa96..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/ports.rkt
+++ /dev/null
@@ -1,1141 +0,0 @@
-#lang scheme/base
-
-;; FIXME: newline decoding
-
-(require rnrs/enums-6
-         rnrs/conditions-6
-         r6rs/private/io-conds
-         r6rs/private/readtable
-         r6rs/private/exns
-         scheme/port
-         scheme/pretty
-         scheme/promise)
-
-(provide (all-from-out r6rs/private/io-conds)
-         file-options
-         buffer-mode buffer-mode?
-         latin-1-codec utf-8-codec utf-16-codec
-         eol-style native-eol-style
-         &i/o-decoding make-i/o-decoding-error i/o-decoding-error?
-         &i/o-encoding make-i/o-encoding-error i/o-encoding-error? i/o-encoding-error-char
-         error-handling-mode
-         (rename-out [r6rs:make-transcoder make-transcoder])
-         transcoder-codec
-         transcoder-eol-style
-         transcoder-error-handling-mode
-         native-transcoder
-         bytevector->string
-         string->bytevector
-         eof-object
-         eof-object?
-         port?
-         port-transcoder
-         textual-port?
-         binary-port?
-         transcoded-port
-         port-has-port-position?
-         port-position
-         port-has-set-port-position!?
-         set-port-position!
-         close-port
-         call-with-port
-         input-port?
-         port-eof?
-         open-file-input-port
-         open-bytevector-input-port
-         open-string-input-port
-         standard-input-port
-         (rename-out [r6rs:current-input-port current-input-port])
-         make-custom-binary-input-port
-         make-custom-textual-input-port
-         get-u8
-         lookahead-u8
-         get-bytevector-n
-         get-bytevector-n!
-         get-bytevector-some
-         get-bytevector-all
-         get-char
-         lookahead-char
-         get-string-n
-         get-string-n!
-         get-string-all
-         get-line
-         get-datum
-         output-port?
-         flush-output-port
-         output-port-buffer-mode
-         open-file-output-port
-         open-bytevector-output-port
-         call-with-bytevector-output-port
-         open-string-output-port
-         call-with-string-output-port
-         standard-output-port
-         standard-error-port
-         (rename-out [r6rs:current-output-port current-output-port]
-                     [r6rs:current-error-port current-error-port])
-         make-custom-binary-output-port
-         make-custom-textual-output-port
-         put-u8
-         put-bytevector
-         put-char
-         put-string
-         put-datum
-         open-file-input/output-port
-         make-custom-binary-input/output-port
-         make-custom-textual-input/output-port
-
-         ;; Non-standard
-         r6rs-port->port)
-
-;; ----------------------------------------
-
-(define-enumeration -file-option (no-create no-fail no-truncate)
-  file-options)
-
-(define-enumeration buffer-mode (none line block)
-  -buffer-modes)
-
-(define (buffer-mode? m)
-  (enum-set-member? m (-buffer-modes none line block)))
-
-(define-enumeration eol-style (lf cr crlf nel crnel ls none)
-  -eol-styles)
-
-(define-struct codec (enc))
-(define latin-1 (make-codec "latin1"))
-(define utf-8 (make-codec "utf-8"))
-(define utf-16 (make-codec "utf-16"))
-
-(define (latin-1-codec) latin-1)
-(define (utf-8-codec) utf-8)
-(define (utf-16-codec) utf-16)
-
-(define (native-eol-style)
-  (if (eq? (system-type) 'windows)
-      'crlf
-      'lf))
-
-(define-condition-type &i/o-decoding &i/o-port
-  make-i/o-decoding-error i/o-decoding-error?)
-
-(define-condition-type &i/o-encoding &i/o-port
-  make-i/o-encoding-error i/o-encoding-error?
-  (char i/o-encoding-error-char))
-
-(define-enumeration error-handling-mode (ignore raise replace)
-  -handling-modes)
-
-(define-struct transcoder (codec eol-style error-handling-mode))
-
-(define (r6rs:make-transcoder codec 
-                              [eol-style (native-eol-style)]
-                              [handling-mode 'replace])
-  (unless (codec? codec)
-    (raise-type-error 'make-transcoder "codec" codec))
-  (unless (enum-set-member? eol-style (-eol-styles lf cr crlf nel crnel ls none))
-    (raise-type-error 'make-transcoder "'lf, 'cr, 'crlf, 'nel, 'crnel, 'ls, or 'none" eol-style))
-  (unless (enum-set-member? handling-mode (-handling-modes ignore raise replace))
-    (raise-type-error 'make-transcoder "'ignore, 'raise, or 'replace" eol-style))
-  (make-transcoder codec eol-style handling-mode))
-
-(define utf8-transcoder 
-  (make-transcoder utf-8 'none '?))
-
-(define (native-transcoder)
-  utf8-transcoder)
-
-(define (eof-object) eof)
-
-;; ----------------------------------------
-
-(define (make-disconnectable-input-port port close?)
-  (define disconnected? #f)
-  (define (check-disconnect)
-    (when disconnected?
-      (error 'read-byte "cannot read for transcoded binary port")))
-  (values
-   (make-input-port
-    (object-name port)
-    (lambda (bytes)
-      (check-disconnect)
-      (let ([n (read-bytes-avail!* bytes port)])
-        (if (eq? n 0)
-            (wrap-evt port (lambda (v) 0))
-            n)))
-    (lambda (bytes skip evt)
-      (check-disconnect)
-      (let ([n (peek-bytes-avail!* bytes skip evt port)])
-        (if (eq? n 0)
-            (wrap-evt port (lambda (v) 0))
-            n)))
-    (lambda ()
-      (unless disconnected?
-        (when close?
-          (close-input-port port))))
-    (and (port-provides-progress-evts? port)
-         (lambda ()
-           (check-disconnect)
-           (port-progress-evt port)))
-    (and (port-provides-progress-evts? port)
-         (lambda (k evt done)
-           (port-commit-peeked k evt done port)))
-    (lambda ()
-      (check-disconnect)
-      (port-next-location port))
-    (lambda ()
-      (check-disconnect)
-      (port-count-lines! port))
-    1
-    (case-lambda
-     [() (check-disconnect) (file-stream-buffer-mode port)]
-     [(mode) (check-disconnect) (file-stream-buffer-mode port 
-                                                         (if (eq? mode 'line) 'block mode))]))
-   (lambda ()
-     (set! disconnected? #t)
-     port)))
-
-(define (make-disconnectable-output-port port close?)
-  (define disconnected? #f)
-  (define (check-disconnect)
-    (when disconnected?
-      (error 'read-byte "cannot read for transcoded binary port")))
-  (values
-   (make-output-port
-    (object-name port)
-    port
-    (lambda (bytes start end can-buffer/block? enable-breaks?)
-      (check-disconnect)
-      (if (= start end)
-          (begin
-            (flush-output port)
-            0)
-          (cond
-           [enable-breaks?
-            (parameterize-break #t (write-bytes (subbytes bytes start end) port))]
-           [can-buffer/block?
-            (write-bytes (subbytes bytes start end) port)]
-           [else
-            (write-bytes-avail* (subbytes bytes start end) port)])))
-    (lambda ()
-      (unless disconnected?
-        (when close?
-          (close-output-port port))))
-    (and (port-writes-special? port)
-         (lambda (v can-buffer/block? enable-breaks?)
-           (check-disconnect)
-           (cond
-            [enable-breaks?
-             (parameterize-break #t (write-special v port))]
-            [can-buffer/block?
-             (write-special v port)]
-            [else
-             (write-special-avail* v port)])))
-    (and (port-writes-atomic? port)
-         (lambda (bytes start end)
-           (check-disconnect)
-           (write-bytes-avail-evt bytes port start end)))
-    (and (port-writes-special? port)
-         (port-writes-atomic? port)
-         (lambda (v)
-           (check-disconnect)
-           (write-special-evt v port)))
-    (lambda ()
-      (check-disconnect)
-      (port-next-location port))
-    (lambda ()
-      (check-disconnect)
-      (port-count-lines! port))
-    1
-    (case-lambda
-     [() (check-disconnect) (file-stream-buffer-mode port)]
-     [(mode) (check-disconnect) (file-stream-buffer-mode port mode)]))
-   (lambda ()
-     (set! disconnected? #t)
-     port)))
-
-;; For merging two kinds of ports:
-(define-struct dual-port (in out)
-  #:property prop:input-port 0
-  #:property prop:output-port 1)
-
-;; R6RS functions that generate binary ports wrap them with `binary-...-port'
-;; structures, so that the binary ports can be "closed" by `transcoded-port'.
-(define-struct binary-input-port (port disconnect get-pos set-pos!)
-  #:property prop:input-port 0)
-(define-struct binary-output-port (port disconnect get-pos set-pos!)
-  #:property prop:output-port 0)
-(define-struct (binary-input/output-port binary-input-port) (out-port out-disconnect)
-  #:property prop:output-port 0)
-
-;; Textual ports are transcoded
-(define-struct textual-input-port (port transcoder)
-  #:property prop:input-port 0)
-(define-struct textual-output-port (port transcoder)
-  #:property prop:output-port 0)
-(define-struct (textual-input/output-port textual-input-port) (out-port)
-  #:property prop:output-port 0)
-
-(define (port-transcoder port)
-  (cond
-   [(dual-port? port) (port-transcoder (dual-port-in port))]
-   [(textual-input-port? port) (textual-input-port-transcoder port)]
-   [(textual-output-port? port) (textual-output-port-transcoder port)]
-   [(input-port? port) #f]
-   [(output-port? port) #f]
-   [else (raise-type-error 'port-transcoder "port" port)]))
-
-(define (textual-port? v)
-  (if (port? v)
-      (or (textual-input-port? v)
-          (textual-output-port? v)
-          (and (dual-port? v) 
-               (textual-port? (dual-port-in v))))
-      (raise-type-error 'textual-port? "port" v)))
-
-(define (binary-port? v)
-  (if (port? v)
-      (not (or (textual-input-port? v)
-               (textual-output-port? v)
-               (and (dual-port? v) 
-                    (textual-port? (dual-port-in v)))))
-      (raise-type-error 'binary-port? "port" v)))
-
-(define (wrap-binary-input-port p get-pos set-pos! close?)
-  (let-values ([(p disconnect) (make-disconnectable-input-port p close?)])
-    (make-binary-input-port p disconnect get-pos set-pos!)))
-
-(define (wrap-binary-output-port p get-pos set-pos! close?)
-  (let-values ([(p disconnect) (make-disconnectable-output-port p close?)])
-    (make-binary-output-port p disconnect get-pos set-pos!)))
-
-(define (wrap-binary-input/output-port p get-pos set-pos! close?)
-  (let-values ([(p disconnect) (make-disconnectable-input-port p #t)]
-               [(out-p out-disconnect) (make-disconnectable-output-port p #t)])
-    (make-binary-input/output-port p disconnect get-pos set-pos!
-                                   out-p out-disconnect)))
-
-(define (no-op-transcoder? t)
-  (or (eq? t utf8-transcoder)
-      (and (eq? utf-8 (transcoder-codec t))
-           (eq? (transcoder-eol-style t) 'none)
-           (eq? 'replace (transcoder-error-handling-mode t)))))
-
-(define (transcode-input p t)
-  (let ([p (if (binary-input-port? p)
-               ((binary-input-port-disconnect p))
-               p)])
-    (if (no-op-transcoder? t)
-        p
-        (letrec ([self
-                  (reencode-input-port p 
-                                       (codec-enc (transcoder-codec t))
-                                       (case (transcoder-error-handling-mode t)
-                                         [(raise) #f]
-                                         [(ignore) #""]
-                                         [(replace) (string->bytes/utf-8 "\uFFFD")])
-                                       #t
-                                       (object-name p)
-                                       (not (eq? (transcoder-eol-style t) 'none))
-                                       (lambda (msg port)
-                                         (raise
-                                          (condition
-                                           (make-message-condition 
-                                            (format "~a: ~e" msg port))
-                                           (make-i/o-decoding-error
-                                            self)))))])
-          self))))
-
-(define (transcode-output p t)
-  (let ([p (cond
-            [(binary-output-port? p)
-             ((binary-output-port-disconnect p))]
-            [(binary-input/output-port? p)
-             ((binary-input/output-port-out-disconnect p))]
-            [else p])])
-    (if (no-op-transcoder? t)
-        p
-        (letrec ([self
-                  (reencode-output-port p 
-                                        (codec-enc (transcoder-codec t))
-                                        (case (transcoder-error-handling-mode t)
-                                          [(raise) #f]
-                                          [(ignore) #""]
-                                          [(replace) (string->bytes/utf-8 "\uFFFD")])
-                                        #t
-                                        (object-name p)
-                                        (case (transcoder-eol-style t)
-                                          [(lf none) #f]
-                                          [(cr) #"\r"]
-                                          [(crlf) #"\r\n"]
-                                          [(nel) (string->bytes/utf-8 "\u85")]
-                                          [(crnel) (string->bytes/utf-8 "\r\u85")]
-                                          [(ls) (string->bytes/utf-8 "\u2028")]
-                                          [else (error 'transcoded-port "unknown eol style: ~e" 
-                                                       (transcoder-eol-style t))])
-                                        (lambda (msg port)
-                                          (raise
-                                           (condition
-                                            (make-message-condition 
-                                             (format "~a: ~e" msg port))
-                                            (make-i/o-encoding-error
-                                             self
-                                             #\?)))))])
-          self))))
-
-(define (transcoded-port p t)
-  (unless (and (port? p)
-               (binary-port? p))
-    (raise-type-error 'transcoded-port "binary port" p))
-  (unless (transcoder? t)
-    (raise-type-error 'transcoded-port "transcoder" t))
-  (cond
-   [(and (input-port? p) (output-port? p))
-    (make-textual-input/output-port (transcode-input p t)
-                                    t 
-                                    (transcode-output p t))]
-   [(input-port? p)
-    (make-textual-input-port (transcode-input p t) t)]
-   [(output-port? p)
-    (make-textual-output-port (transcode-output p t) t)]))
-
-(define (port-has-port-position? p)
-  (unless (port? p)
-    (raise-type-error 'port-has-port-position? "port" p))
-  (cond
-   [(binary-input-port? p)
-    (and (binary-input-port-get-pos p) #t)]
-   [(binary-output-port? p)
-    (and (binary-output-port-get-pos p) #t)]
-   [(textual-input-port? p)
-    (port-has-port-position? (textual-input-port-port p))]
-   [(textual-output-port? p)
-    (port-has-port-position? (textual-output-port-port p))]
-   [(dual-port? p)
-    (port-has-port-position? (dual-port-in p))]
-   [else #t]))
-
-(define (port-position p)
-  (cond 
-   [(binary-input-port? p)
-    ((binary-input-port-get-pos p))]
-   [(binary-output-port? p)
-    ((binary-output-port-get-pos p))]
-   [(textual-input-port? p)
-    (port-position (textual-input-port-port p))]
-   [(textual-output-port? p)
-    (port-position (textual-output-port-port p))]
-   [(dual-port? p)
-    (port-position (dual-port-in p))]
-   [else (file-position p)]))
-
-(define (port-has-set-port-position!? p)
-  (unless (port? p)
-    (raise-type-error 'port-has-port-set-position!? "port" p))
-  (cond 
-   [(binary-input-port? p)
-    (and (binary-input-port-set-pos! p) #t)]
-   [(binary-output-port? p)
-    (and (binary-output-port-set-pos! p) #t)]
-   [(textual-input-port? p)
-    (port-has-set-port-position!? (textual-input-port-port p))]
-   [(textual-output-port? p)
-    (port-has-set-port-position!? (textual-output-port-port p))]
-   [(dual-port? p)
-    (port-has-set-port-position!? (dual-port-in p))]
-   [else
-    ;; we could also allow string ports here
-    (file-stream-port? p)]))
-
-(define (set-port-position! p pos)
-  (unless (and (port? p)
-               (port-has-set-port-position!? p))
-    (raise-type-error 'set-port-position! "port with settable position" p))
-  (cond 
-   [(binary-input-port? p)
-    ((binary-input-port-set-pos! p) pos)]
-   [(binary-output-port? p)
-    ((binary-output-port-set-pos! p) pos)]
-   [(textual-input-port? p)
-    (set-port-position! (textual-input-port-port p) pos)]
-   [(textual-output-port? p)
-    (set-port-position! (textual-output-port-port p) pos)]
-   [(dual-port? p)
-    (set-port-position! (dual-port-in p) pos)]
-   [else
-    (file-position p pos)]))
-
-(define (call-with-port port proc)
-  (unless (port? port)
-    (raise-type-error 'call-with-port "port" port))
-  (begin0
-   (proc port)
-   (close-port port)))
-
-(define (close-port port)
-  (when (input-port? port)
-    (close-input-port port))
-  (when (output-port? port)
-    (close-output-port port)))
-
-;; ----------------------------------------
-
-(define (port-eof? p)
-  (eof-object? (peek-byte p)))
-
-(define (open-file-input-port filename 
-                              [options (file-options)]
-                              [buffer-mode 'block]
-                              [maybe-transcoder #f])
-  (unless (enum-set=? (enum-set-universe options)
-                      (enum-set-universe (file-options)))
-    (raise-type-error 'open-file-input-port "file-options enum set" options))
-  (unless (enum-set-member? buffer-mode (-buffer-modes none line block))
-    (raise-type-error 'open-file-input-port "'none, 'line, or 'block" buffer-mode))
-  (when maybe-transcoder
-    (unless (transcoder? maybe-transcoder)
-      (raise-type-error 'open-file-input-port "transcoder or #f" maybe-transcoder)))
-  (let ([p (open-input-file filename)])
-    (file-stream-buffer-mode p (if (eq? buffer-mode 'line)
-                                   'block
-                                   buffer-mode))
-    (if maybe-transcoder
-        (transcoded-port p maybe-transcoder)
-        (wrap-binary-input-port p 
-                                (lambda () (file-position p)) 
-                                (lambda (pos) (file-position p pos))
-                                #t))))
-
-(define (open-bytevector-input-port bytes [maybe-transcoder #f])
-  (unless (bytes? bytes)
-    (raise-type-error 'open-bytevector-input-port "bytevector" bytes))
-  (when maybe-transcoder
-    (unless (transcoder? maybe-transcoder)
-      (raise-type-error 'open-bytevector-input-port "transcoder or #f" maybe-transcoder)))
-  (let ([p (open-input-bytes bytes)])
-    (if maybe-transcoder
-        (transcoded-port p maybe-transcoder)
-        (wrap-binary-input-port p
-                                (lambda () (file-position p)) 
-                                (lambda (pos) (file-position p pos))
-                                #t))))
-
-(define (open-string-input-port str)
-  (unless (string? str)
-    (raise-type-error 'open-bytevector-input-port "string" str))
-  (let ([p (open-input-string str)])
-    (transcoded-port
-     (wrap-binary-input-port p
-                             (lambda () (file-position p)) 
-                             (lambda (pos) (file-position p pos))
-                             #t)
-     utf8-transcoder)))
-
-(define standard-input-port
-  (let ([p (current-input-port)])
-    (lambda ()
-      (wrap-binary-input-port p
-                              (lambda () (file-position p)) 
-                              (lambda (pos) (file-position p pos))
-                              #f))))
-
-(define input-ports (make-weak-hasheq))
-
-(define (r6rs:current-input-port)
-  (let ([p (current-input-port)])
-    (cond
-     [(textual-port? p) p]
-     [(hash-ref input-ports p #f)
-      => ephemeron-value]
-     [else
-      (let ([p2 (transcoded-port p utf8-transcoder)])
-        (hash-set! input-ports p (make-ephemeron p p2))
-        p2)])))
-
-(define (make-custom-binary-input-port id read! get-position set-position! close)
-  (let* ([peeked 0]
-         [p (make-input-port/read-to-peek
-             id
-             (lambda (bytes)
-               (let ([v (read! bytes 0 (bytes-length bytes))])
-                 (set! peeked (+ peeked v))
-                 (if (zero? v)
-                     eof
-                     v)))
-             #f
-             (or close void)
-             #f void 1
-             #f #f
-             (lambda (consumed-n)
-               (unless (eof-object? consumed-n)
-                 (set! peeked (- consumed-n 1)))))])
-    (wrap-binary-input-port p
-                            (and get-position
-                                 (lambda ()
-                                   (let ([v (get-position)])
-                                     (- v peeked))))
-                            (and set-position!
-                                 (lambda (pos)
-                                   ;; flush peeked
-                                   (let loop ()
-                                     (unless (zero? peeked)
-                                       (read-byte-or-special p)
-                                       (loop)))
-                                   ;; set position
-                                   (set-position! pos)))
-                            #t)))
-
-
-(define (make-custom-textual-input-port id read! get-position set-position! close)
-  (make-textual-input-port
-   (make-custom-binary-input-port
-    id 
-    (let-values ([(in out) (make-pipe)])
-      (lambda (bstr offset len)
-        (let loop ()
-          (let ([n (read-bytes-avail!* bstr in offset len)])
-            (if (zero? n)
-                (let ([str (make-string (bytes-length bstr))])
-                  (let ([len (read! str 0 (bytes-length bstr))])
-                    (if (zero? len)
-                        0
-                        (begin
-                          (write-string (substring str 0 len) out)
-                          (loop)))))
-                n)))))
-    get-position
-    set-position!
-    (or close void))
-   #f))
-
-;; ----------------------------------------
-
-(define (get-u8 p)
-  (unless (binary-port? p)
-    (raise-type-error 'get-u8 "binary port" p))
-  (read-byte p))
-
-(define (lookahead-u8 p)
-  (unless (binary-port? p)
-    (raise-type-error 'lookahead-u8 "binary port" p))
-  (peek-byte p 0))
-
-(define (get-bytevector-n p cnt)
-  (unless (binary-port? p)
-    (raise-type-error 'get-bytevector-n "binary port" p))
-  (read-bytes cnt p))
-
-(define (get-bytevector-n! p bytes start end)
-  (unless (binary-port? p)
-    (raise-type-error 'get-bytevector-n! "binary port" p))
-  (read-bytes! bytes p start end))
-
-(define (get-bytevector-some p)
-  (unless (binary-port? p)
-    (raise-type-error 'get-bytevector-some "binary port" p))
-  (let ([bytes (make-bytes 4096)])
-    (let ([n (read-bytes-avail! bytes p)])
-      (if (eof-object? n)
-          n
-          (subbytes bytes 0 n)))))
-
-(define (get-bytevector-all p)
-  (unless (binary-port? p)
-    (raise-type-error 'get-bytevector-all "binary port" p))
-  (let ([p2 (open-output-bytes)])
-    (copy-port p p2)
-    (let ([s (get-output-bytes p2 #t)])
-      (if (zero? (bytes-length s))
-          eof
-          s))))
-
-;; ----------------------------------------
-
-(define (get-char p)
-  (unless (textual-port? p)
-    (raise-type-error 'get-char "textual port" p))
-  (read-char p))
-
-(define (lookahead-char p)
-  (unless (textual-port? p)
-    (raise-type-error 'lookahead-char "textual port" p))
-  (peek-char p))
-
-(define (get-string-n p cnt)
-  (unless (textual-port? p)
-    (raise-type-error 'get-string-n "textual port" p))
-  (read-string cnt p))
-
-(define (get-string-n! p str start end)
-  (unless (textual-port? p)
-    (raise-type-error 'get-string-n! "textual port" p))
-  (read-string! str p start end))
-
-(define (get-string-all p)
-  (unless (textual-port? p)
-    (raise-type-error 'get-string-all "textual port" p))
-  (let ([p2 (open-output-bytes)])
-    (copy-port p p2)
-    (get-output-string p2)))
-
-(define (get-line p)
-  (unless (textual-port? p)
-    (raise-type-error 'get-line "textual port" p))
-  (read-line p 'linefeed))
-
-(define (get-datum p)
-  (unless (textual-port? p)
-    (raise-type-error 'get-datum "textual port" p))
-  (let loop ([v (with-r6rs-reader-parameters (lambda () (read p)))])
-    (cond
-     [(pair? v) (mcons (loop (car v))
-                       (loop (cdr v)))]
-     [(vector? v) (list->vector
-                   (map loop (vector->list v)))]
-     [else v])))
-
-;; ----------------------------------------
-
-(define (flush-output-port p)
-  (flush-output p))
-
-(define (output-port-buffer-mode p)
-  (file-stream-buffer-mode p))
-
-(define (do-open-file-output-port who
-                                  filename 
-                                  options
-                                  buffer-mode
-                                  maybe-transcoder
-                                  open-output-file
-                                  file-position
-                                  wrap-binary-port)
-  (unless (enum-set=? (enum-set-universe options)
-                      (enum-set-universe (file-options)))
-    (raise-type-error who "file-options enum set" options))
-  (unless (enum-set-member? buffer-mode (-buffer-modes none line block))
-    (raise-type-error who "'none, 'line, or 'block" buffer-mode))
-  (when maybe-transcoder
-    (unless (transcoder? maybe-transcoder)
-      (raise-type-error who "transcoder or #f" maybe-transcoder)))
-  (let ([exists-mode (cond
-                      [(or (enum-set=? options (file-options no-create no-fail no-truncate))
-                           (enum-set=? options (file-options no-create no-truncate)))
-                       'update]
-                      [(enum-set=? options (file-options no-fail no-truncate))
-                       'can-update]
-                      [(enum-set-member? 'no-create options) ; no-create, no-create + no-fail
-                       'must-truncate]
-                      [(enum-set-member? 'no-fail options) ; no-fail
-                       'truncate]
-                      [else ; no-truncate, <empty>
-                       'error])])
-    (let ([p (with-handlers ([exn:fail:filesystem?
-                              (lambda (exn)
-                                (if (and (or (eq? exists-mode 'update)
-                                             (eq? exists-mode 'must-truncate))
-                                         (not (file-exists? filename)))
-                                    (raise
-                                     (make-exn:fail:filesystem:exists-not
-                                      (exn-message exn)
-                                      (exn-continuation-marks exn)
-                                      filename))
-                                    (raise exn)))])
-               (open-output-file filename #:exists exists-mode))])
-      (file-stream-buffer-mode p buffer-mode)
-      (if maybe-transcoder
-          (transcoded-port p maybe-transcoder)
-          (wrap-binary-port p 
-                            (and file-position (lambda () (file-position p)))
-                            (and file-position (lambda (pos) (file-position p pos)))
-                            #t)))))
-
-(define (open-file-output-port filename 
-                               [options (file-options)]
-                               [buffer-mode 'block]
-                               [maybe-transcoder #f])
-  (do-open-file-output-port 'open-file-output-port
-                            filename 
-                            options
-                            buffer-mode
-                            maybe-transcoder
-                            open-output-file
-                            file-position
-                            wrap-binary-output-port))
-
-(define (open-bytevector-output-port [maybe-transcoder #f])
-  (when maybe-transcoder
-    (unless (transcoder? maybe-transcoder)
-      (raise-type-error 'open-bytevector-output-port "transcoder or #f" maybe-transcoder)))
-  (let* ([p (open-output-bytes)]
-         [p2 (if maybe-transcoder
-                 (transcoded-port p maybe-transcoder)
-                 (wrap-binary-output-port p
-                                          (lambda () (file-position p)) 
-                                          (lambda (pos) (file-position p pos))
-                                          #t))])
-    (values
-     p2
-     (lambda () 
-       (unless (port-closed? p2)
-         (flush-output p2))
-       (get-output-bytes p #t)))))
-
-(define (call-with-bytevector-output-port proc [maybe-transcoder #f])
-  (let-values ([(p get) (open-bytevector-output-port maybe-transcoder)])
-    (proc p)
-    (close-output-port p)
-    (get)))
-
-(define (open-string-output-port)
-  (let ([p (open-output-string)])
-    (values
-     (transcoded-port p utf8-transcoder)
-     (lambda ()
-       (bytes->string/utf-8 (get-output-bytes p #t))))))
-
-(define (call-with-string-output-port proc)
-  (let-values ([(p get) (open-string-output-port)])
-    (proc p)
-    (close-output-port p)
-    (get)))
-
-(define standard-output-port
-  (let ([p (current-output-port)])
-    (lambda ()
-      (wrap-binary-output-port p
-                               (lambda () (file-position p)) 
-                               (lambda (pos) (file-position p pos))
-                               #f))))
-
-
-(define standard-error-port
-  (let ([p (current-error-port)])
-    (lambda ()
-      (wrap-binary-output-port p
-                               (lambda () (file-position p)) 
-                               (lambda (pos) (file-position p pos))
-                               #f))))
-
-(define output-ports (make-weak-hasheq))
-
-(define (r6rs:current-output-port)
-  (convert-output-port (current-output-port)))
-
-(define (r6rs:current-error-port)
-  (convert-output-port (current-error-port)))
-
-(define (convert-output-port p)
-  (cond
-   [(textual-port? p) p]
-   [(hash-ref output-ports p #f)
-    => ephemeron-value]
-   [else
-    (let ([p2 (transcoded-port p utf8-transcoder)])
-      (hash-set! output-ports p (make-ephemeron p p2))
-      p2)]))
-
-(define (make-custom-binary-output-port id write! get-position set-position! close)
-  (wrap-binary-output-port
-   (make-output-port
-    id
-    always-evt ;; assuming that it never blocks!
-    (lambda (bytes start end can-block/buffer? enable-break?)
-      (if (= start end)
-          0
-          (write! bytes start end)))
-    (or close void)
-    #f
-    #f
-    #f
-    #f
-    void
-    1
-    #f)
-   get-position
-   set-position!
-   #t))
-   
-(define (make-custom-textual-output-port id write! get-position set-position! close)
-  (make-textual-output-port
-   (wrap-binary-output-port
-    (make-output-port
-     id
-     always-evt ;; assuming that it never blocks!
-     (let-values ([(in out) (make-pipe)]
-                  [(c) #f]
-                  [(cvt-buffer) #f]
-                  [(buffer) #f])
-       (lambda (bytes start end can-block/buffer? enable-break?)
-         (let ([direct? (zero? (pipe-content-length in))])
-           (if (and direct?
-                    (bytes-utf-8-length bytes #f start end))
-               ;; No old bytes saved, and bytes to write form a complete
-               ;; UTF-8 encoding, so we can write directly:
-               (let* ([s (bytes->string/utf-8 bytes #f start end)]
-                      [len (string-length s)])
-                 (when (positive? len)
-                   (write! s 0 len)))
-               ;; Partial or need to use existing bytes, so use pipe
-               (begin
-                 (write-bytes bytes out start end)
-                 (unless buffer
-                   (set! c (bytes-open-converter "UTF-8-permissive" "UTF-8"))
-                   (set! buffer (make-bytes 4096))
-                   (set! cvt-buffer (make-bytes 4096)))
-                 (let loop ()
-                   (let ([n (peek-bytes-avail!* buffer 0 in)])
-                     (let ([more? ((pipe-content-length in) . > . n)])
-                       (let-values ([(amt used status) (bytes-convert c buffer 0 n cvt-buffer)])
-                         (when (positive? amt)
-                           (read-bytes! buffer in 0 amt)
-                           (let* ([s (bytes->string/utf-8 buffer #f 0 amt)]
-                                  [len (string-length s)])
-                             (when (positive? len)
-                               (write! s 0 (string-length s)))))
-                         (when (eq? status 'error)
-                           ;; Discard an erroneous byte
-                           (read-byte in))
-                         ;; Loop 
-                         (unless (and (eq? status 'complete)
-                                      (not more?))
-                           (loop)))))))))
-         (- end start)))
-     (or close void)
-     #f
-     #f
-     #f
-     #f
-     void
-     1
-     #f)
-    get-position
-    set-position!
-    #t)
-   #f))
-
-;; ----------------------------------------
-
-(define (put-u8 port b)
-  (unless (binary-port? port)
-    (raise-type-error 'put-u8 "binary port" port))
-  (write-byte b port))
-
-(define (put-bytevector port bytes [start 0] [count (- (bytes-length bytes) start)])
-  (unless (binary-port? port)
-    (raise-type-error 'put-bytevector "binary port" port))
-  (write-bytes bytes port start (+ start count)))
-
-(define (put-char port ch)
-  (unless (textual-port? port)
-    (raise-type-error 'put-u8 "textual port" port))
-  (write-char ch port))
-
-(define (put-string port str [start 0] [count (- (string-length str) start)])
-  (unless (textual-port? port)
-    (raise-type-error 'put-string "textual port" port))
-  (write-string (substring str start (+ start count)) port))
-
-(define (put-datum port v)
-  (unless (textual-port? port)
-    (raise-type-error 'put-datum "textual port" port))
-  (parameterize ([print-mpair-curly-braces #f]
-                 [pretty-print-columns 'infinity]
-                 [pretty-print-size-hook
-                  (lambda (v write? p)
-                    (cond
-                     [(symbol? v)
-                      (let ([s (symbol->string v)])
-                        (and (not (regexp-match (force rx:id) s))
-                             (for/fold ([len 0])
-                                 ([c (in-string s)]
-                                  [pos (in-naturals)])
-                               (+ len 
-                                  (if (or (char-alphabetic? c)
-                                          (and (char-numeric? c)
-                                               (positive? pos)))
-                                      1
-                                      (+ 3 (string-length 
-                                            (number->string (char->integer c) 16))))))))]
-                     [(string? v) 
-                      (and (for/or ([c (in-string v)])
-                                   (not (or (char-graphic? c)
-                                            (char-blank? c))))
-                           (for/fold ([w 2])
-                               ([c (in-string v)])
-                             (cond
-                              [(eq? c #\") 2]
-                              [(eq? c #\\) 2]
-                              [(char-graphic? c) 1]
-                              [(char-blank? c) 1]
-                              [(eq? c #\newline) 2]
-                              [(eq? c #\return) 2]
-                              [else 9])))]
-                     [(char? v)
-                      (case v
-                        [(#\u7) 7] ; #\alarm
-                        [(#\u1B) 5] ; #\esc
-                        [(#\u7F) 8] ; #\delete
-                        [else (and (not (char-graphic? v))
-                                   (+ 3
-                                      (if ((char->integer v) . < . #x10000)
-                                          4
-                                          6)))])]
-                     [(bytes? v) (+ 5
-                                    (sub1 (bytes-length v))
-                                    (for/fold ([len 0])
-                                        ([b (in-bytes v)])
-                                      (+ len (cond
-                                              [(b . < . 10) 1]
-                                              [(b . < . 100) 2]
-                                              [else 3]))))]
-                     [else #f]))]
-                 [pretty-print-print-hook
-                  (lambda (v write? p)
-                    (cond
-                     [(symbol? v)
-                      (for ([c (in-string (symbol->string v))]
-                            [pos (in-naturals)])
-                        (if (or (char-alphabetic? c)
-                                (and (char-numeric? c)
-                                     (positive? pos)))
-                            (display c p)
-                            (begin
-                              (display "\\x" p)
-                              (display (number->string (char->integer c) 16) p)
-                              (display ";" p))))]
-                     [(string? v) 
-                      (write-char #\" p)
-                      (for ([c (in-string v)])
-                        (cond
-                         [(eq? c #\") (display "\\\"" p)]
-                         [(eq? c #\\) (display "\\\\" p)]
-                         [(char-graphic? c) (write-char c p)]
-                         [(char-blank? c) (write-char c p)]
-                         [(eq? c #\newline) (display "\\n" p)]
-                         [(eq? c #\return) (display "\\r" p)]
-                         [else
-                          (display "\\x" p)
-                          (let ([s (format "00000~x" (char->integer c))])
-                            (display (substring s (- (string-length s) 6)) p)
-                            (write-char #\; p))]))
-                      (write-char #\" p)]
-                     [(char? v)
-                      (case v
-                        [(#\u7) (display "#\\alarm" p)]
-                        [(#\u1B) (display "#\\esc" p)]
-                        [(#\u7F) (display "#\\delete" p)]
-                        [else 
-                         (display "#\\x" p)
-                         (let ([n (number->string (char->integer v) 16)])
-                           (display (make-string
-                                     (- (if ((string-length n) . <= . 4)
-                                            4
-                                            6)
-                                        (string-length n))
-                                     #\0)
-                                    p)
-                           (display n p))])]
-                     [(bytes? v)
-                      (display "#vu8(" p)
-                      (if (zero? (bytes-length v))
-                          (display ")" p)
-                          (begin
-                            (display (bytes-ref v 0) p)
-                            (for ([b (in-bytes v)]
-                                  [i (in-naturals)])
-                              (unless (zero? i)
-                                (display " " p)
-                                (display b p)))
-                            (display ")" p)))]))])
-    (pretty-write v port)))
-
-;; ----------------------------------------
-
-(define (open-file-input/output-port filename 
-                                     [options (file-options)]
-                                     [buffer-mode 'block]
-                                     [maybe-transcoder #f])
-  (do-open-file-output-port 'open-file-input/output-port
-                            filename 
-                            options
-                            (if (eq? buffer-mode 'line)
-                                'block
-                                buffer-mode)
-                            maybe-transcoder
-                            (lambda (name #:exists mode)
-                              (let-values ([(in out) (open-input-output-file name #:exists mode)])
-                                (file-stream-buffer-mode out buffer-mode)
-                                (make-dual-port in out)))
-                            ;; Input and output buffering make `file-position' iffy.
-                            (if (eq? buffer-mode 'none)
-                                (case-lambda
-                                 [(p) (file-position (dual-port-in p))]
-                                 [(p pos) 
-                                  (flush-output p)
-                                  (file-position (dual-port-in p) pos)])
-                                #f)
-                            wrap-binary-input/output-port))
-
-(define (make-make-custom-input/output-port
-         make-custom-input-port
-         make-custom-output-port)
-  (lambda (id read! write! get-pos set-pos! close)
-    (let* ([closed-one? #f]
-           [close (and close
-                       (lambda ()
-                         (if closed-one?
-                             (close)
-                             (set! closed-one? #t))))])
-      (let ([in (make-custom-input-port id read! get-pos set-pos! close)]
-            [out (make-custom-output-port id write! get-pos set-pos! close)])
-        (make-dual-port in out)))))
-
-(define make-custom-binary-input/output-port
-  (make-make-custom-input/output-port
-   make-custom-binary-input-port
-   make-custom-binary-output-port))
-
-(define make-custom-textual-input/output-port
-  (make-make-custom-input/output-port
-   make-custom-textual-input-port
-   make-custom-textual-output-port))
-
-(define (bytevector->string bv t)
-  (unless (transcoder? t)
-    (raise-type-error 'bytevector->string "transcoder" t))
-  (let ([p #f])
-    (dynamic-wind
-     (lambda () 
-       (set! p (open-bytevector-input-port bv t)))
-     (lambda ()
-       (apply
-        string-append
-        (let loop ()
-          (let ([s (get-string-n p 4096)])
-            (if (eof-object? s)
-                null
-                (cons s (loop)))))))
-     (lambda () (close-input-port p)))))
-                   
-(define (string->bytevector s t)
-  (unless (transcoder? t)
-    (raise-type-error 'string->bytevector "transcoder" t))
-  (let ([p #f]
-        [result #f])
-    (dynamic-wind
-     (lambda () 
-       (set!-values (p result) (open-bytevector-output-port t)))
-     (lambda ()
-       (put-string p s)
-       (result))
-     (lambda () (close-output-port p)))))
-
-;; ----------------------------------------
-
-(define (r6rs-port->port p)
-  (cond [(binary-input-port? p)
-         ((binary-input-port-disconnect p))]
-        [(binary-output-port? p)
-         ((binary-output-port-disconnect p))]
-        [else
-         (raise-type-error 'r6rs-port->port "binary input or output port" p)]))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/prelims.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/prelims.rkt
deleted file mode 100644
index 555c8c2463..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/prelims.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang scheme/base
-
-;; PLT Scheme pre-requisites for any phase
-
-(require (for-syntax scheme/base))
-
-(provide
- (rename-out [datum #%datum])
- (rename-out [#%plain-app #%app])
- #%top #%top-interaction)
-
-;; ----------------------------------------
-;; Datum
-
-(define-syntax (datum stx)
-  (syntax-case stx ()
-    [(_ . thing)
-     (if (vector? (syntax-e #'thing))
-         (raise-syntax-error 'r6rs
-                             "a vector is not an expression"
-                             #'thing)
-         #`(quote thing))]))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/qq-gen.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/qq-gen.rkt
deleted file mode 100644
index 583562740e..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/qq-gen.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang scheme/base
-
-;; used for quasiquote and quasisyntax
-
-(require (for-syntax scheme/base))
-
-(provide define-generalized-qq)
-
-(define-syntax-rule (define-generalized-qq r6rs:quasiquote 
-                      quasiquote unquote unquote-splicing uq-wrap)
-  (...
-   (define-syntax (r6rs:quasiquote stx)
-     ;; Replace (unquote expr ...) with (unquote expr) ...
-     (syntax-case stx ()
-       [(_ tmpl)
-        (let ([new-tmpl
-               (let loop ([tmpl #'tmpl][level 0])
-                 (syntax-case tmpl (r6rs:quasiquote)
-                   [((u expr ...) . rest)
-                    (and (identifier? #'u)
-                         (or (free-identifier=? #'u #'unquote)
-                             (free-identifier=? #'u #'unquote-splicing)))
-                    (let ([new-rest (loop #'rest level)])
-                      (if (zero? level)
-                          (if (and (eq? new-rest #'rest)
-                                   (= 1 (length (syntax->list #'(expr ...))))
-                                   (free-identifier=? #'uq-wrap #'values))
-                              tmpl
-                              (datum->syntax
-                               tmpl
-                               (append (let ([a (car (syntax-e tmpl))])
-                                         (map (lambda (expr)
-                                                (datum->syntax
-                                                 a
-                                                 (list (car (syntax-e a))
-                                                       (list (syntax uq-wrap)
-                                                             expr))
-                                                 a a a))
-                                              (syntax->list #'(expr ...))))
-                                       new-rest)
-                               tmpl tmpl tmpl))
-                          (let* ([first (car (syntax-e tmpl))]
-                                 [new-first (loop first (sub1 level))])
-                            (if (and (eq? new-first first)
-                                     (eq? new-rest #'rest))
-                                tmpl
-                                (datum->syntax
-                                 tmpl
-                                 (cons new-first new-rest)
-                                 tmpl tmpl tmpl)))))]
-                   [(r6rs:quasiquote expr)
-                    (let ([new-expr (loop #'(expr) (add1 level))])
-                      ;; We have to replace the old qq with the new one:
-                      (datum->syntax
-                       tmpl
-                       (cons (datum->syntax #'quasiquote
-                                            'quasiquote
-                                            (car (syntax-e tmpl)))
-                             new-expr)
-                       tmpl tmpl tmpl))]
-                   [(a . b)
-                    (let ([new-a (loop #'a level)]
-                          [new-b (loop #'b level)])
-                      (if (and (eq? new-a #'a)
-                               (eq? new-b #'b))
-                          tmpl
-                          (datum->syntax
-                           tmpl
-                           (cons new-a new-b)
-                           tmpl tmpl tmpl)))]
-                   [#(a ...)
-                    (let* ([as (syntax->list #'(a ...))]
-                           [new-as (loop as level)])
-                      (if (eq? as new-as)
-                          tmpl
-                          (datum->syntax
-                           tmpl
-                           (list->vector new-as)
-                           tmpl tmpl tmpl)))]
-                   [_ tmpl]))])
-          (datum->syntax
-           stx
-           (list #'quasiquote new-tmpl)
-           stx stx stx))]))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/readtable.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/readtable.rkt
deleted file mode 100644
index 70d988e3a7..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/readtable.rkt
+++ /dev/null
@@ -1,561 +0,0 @@
-#lang scheme/base
-
-;; Readtable-based R6RS reading
-
-(require syntax/readerr
-         scheme/promise
-         (for-syntax scheme/base))
-
-(provide with-r6rs-reader-parameters
-         rx:id
-         rx:number)
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (generic-not-allowed where ch port src line col pos)
-  (raise-read-error 
-   (format "illegal character~a in input: `~a'" 
-           where
-           (let ([s (format "~s" (string ch))])
-             (substring s 1 (- (string-length s) 1))))
-   src line col pos 1))
-
-(define (not-allowed ch port src line col pos)
-  (generic-not-allowed "" ch port src line col pos))
-
-(define (dispatch-not-allowed ch port src line col pos)
-  (generic-not-allowed " after `#'" ch port src line col pos))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  #!r6rs as a comment
-
-(define (read-hash-bang ch port src line col pos)
-  (if (regexp-try-match #rx"^r6rs" port)
-      (make-special-comment #f)
-      (let* ([s (regexp-match #rx"^(r6r|r6|r|)(.|)" port)]
-             [len (+ 2 (bytes-length (cadr s)))]
-             [next (caddr s)])
-        (if (bytes=? next #"")
-            (raise-read-eof-error
-             (format "unexpected end-of-file after `#!~a'"
-                     (cadr s))
-             src line (and col (+ col len)) (and pos (+ pos len)) 1)
-            (generic-not-allowed (format " after `#!~a'" (cadr s))
-                                 (string-ref (bytes->string/utf-8 (caddr s)) 0)
-                                 port
-                                 src
-                                 line
-                                 (and col (+ col len))
-                                 (and pos (+ pos len)))))))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  delimiter helpers
-
-(define (delimiter? delim)
-  (or (eof-object? delim)
-      (char-whitespace? delim)
-      (char=? delim #\()
-      (char=? delim #\))
-      (char=? delim #\[)
-      (char=? delim #\])
-      (char=? delim #\")
-      (char=? delim #\;)
-      (char=? delim #\#)))
-
-(define (check-delimiter result prefix ch port src line col pos len)
-  (let ([delim (peek-char port)])
-    (if (delimiter? delim)
-        result
-        (generic-not-allowed (format " after ~a~a (need a delimiter)"
-                                     prefix ch)
-                             (read-char port)
-                             port src line 
-                             (and col (+ col len))
-                             (and pos (+ pos len))))))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  booleans (delimiter required)
-
-(define (read-boolean ch port src line col pos)
-  (check-delimiter (case ch
-                     [(#\t #\T) #t]
-                     [else #f])
-                   "#" ch
-                   port src line col pos 2))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  characters
-
-(define (read-character ch port src line col pos)
-  ;; #\ has been consumed
-  (let ([ch (read-char port)])
-    (if (eof-object? ch)
-        (raise-read-eof-error
-         "unexpected end-of-file after `#\\'"
-         src line (and col (+ col 1)) (and pos (+ pos 1)) 
-         2)
-        (let ([next (peek-char port)])
-          (if (delimiter? next)
-              ch
-              (let ([r+str
-                     (ormap (lambda (d)
-                              (and (eq? ch (car d))
-                                   (regexp-try-match (cadr d) port)
-                                   (values (cddr d))))
-                            (let-syntax ([char-names
-                                          (lambda (stx)
-                                            (syntax-case stx ()
-                                              [(_ str ...)
-                                               (let ([strs (map syntax-e (syntax->list #'(str ...)))])
-                                                 (with-syntax ([(init-char ...)
-                                                                (map (lambda (s) (string-ref s 0))
-                                                                     strs)]
-                                                               [(rx ...)
-                                                                (map (lambda (s)
-                                                                       (regexp (string-append "^" (substring s 1))))
-                                                                     strs)]
-                                                               [(result-char ...)
-                                                                (map (lambda (s)
-                                                                       (cond
-                                                                        [(string=? s "alarm") #\u07]
-                                                                        [(string=? s "esc") #\u1B]
-                                                                        [(string=? s "delete") #\u7F]
-                                                                        [else
-                                                                         (read (open-input-string (string-append "#\\" s)))]))
-                                                                     strs)])
-                                                   #`(quote ((init-char rx result-char . str) ...))))]))])
-                              (char-names
-                               "nul"
-                               "space"
-                               "newline"
-                               "alarm"
-                               "backspace"
-                               "tab"
-                               "linefeed"
-                               "newline"
-                               "vtab"
-                               "page"
-                               "return"
-                               "esc"
-                               "space"
-                               "delete")))])
-                (if r+str
-                    (check-delimiter
-                     (car r+str)
-                     "#\\" (cdr r+str)
-                     port src line col pos 
-                     (+ 2 (string-length (cdr r+str))))
-                    (let ([hex (and (eq? ch #\x)
-                                    (regexp-try-match #rx"^[0-9a-fA-F]+" port))])
-                      (if hex
-                          (let ([hex-val (string->number
-                                          (bytes->string/latin-1 (car hex))
-                                          16)])
-                            (if (or (<= 0 hex-val #xD7FF)
-                                    (<= #xE000 hex-val #x10FFFF))
-                                (check-delimiter
-                                 (integer->char hex-val)
-                                 "#\\" (car hex)
-                                 port src line col pos
-                                 (+ 3 (bytes-length (car hex))))
-                                (raise-read-error
-                                 (format "out of range character constant `#\\x~a'"
-                                         (car hex))
-                                 src line 
-                                 col
-                                 pos
-                                 (and pos (+ 3 (bytes-length (car hex)))))))
-                          (let ([more (bytes->string/utf-8
-                                       (car (regexp-match #px"^.([a-z]{0,20})" port)))])
-                            (raise-read-error
-                             (format "unknown character constant `#\\~a~a'"
-                                     ch more)
-                             src line 
-                             col
-                             pos
-                             (and pos (+ 2 (string-length more))))))))))))))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;   byte vectors
-
-(define (do-read-byte-string stx? ch port src line col pos)
-  ;; #v has been read
-  (if (and (regexp-try-match #rx"^u8" port)
-           (eq? #\( (peek-char port)))
-      (let* ([l (if stx?
-                    (read-syntax/recursive src port)
-                    (read/recursive port))]
-             [lst (if stx?
-                      (syntax->list l)
-                      l)])
-        (unless (list? lst)
-          (raise-read-error
-           (format "expected a parenthesized sequence without `.' after `#vu8'")
-           src line col pos (and pos 4)))
-        (for-each (lambda (e)
-                    (let ([elem (if stx?
-                                    (syntax-e e)
-                                    e)])
-                      (unless (byte? elem)
-                        (let ([msg (format "invalid byte-vector element (not an octet): ~e"
-                                           elem)])
-                          (if stx?
-                              (raise-read-error
-                               msg
-                               (syntax-source e)
-                               (syntax-line e)
-                               (syntax-column e)
-                               (syntax-position e)
-                               (syntax-span e))
-                              (raise-read-error
-                               msg
-                               #f #f #f #f #f))))))
-                  lst)
-        (list->bytes (if stx? (map syntax-e lst) lst)))
-      (raise-read-error
-       "`#v' to continue `#vu8('"
-       src line
-       col pos
-       2)))
-
-(define read-byte-string
-  (case-lambda
-   [(ch port)
-    (do-read-byte-string #f ch port #f #f #f #f)]
-   [(ch port src line col pos)
-    (do-read-byte-string #t ch port src line col pos)]))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  strings
-
-(define (read-a-string ch port src line col pos)
-  (let ([content (regexp-match #rx"^(?:[^\"\\\\]|\\\\.)*(?:\"|\\\\?$)" port)])
-    (let* ([bytes (car content)]
-           [len (bytes-utf-8-length bytes)])
-      ;; Check/convert escapes and <line ending>s
-      (let ([pieces
-             (let loop ([bpos 0])
-               (let ([m (regexp-match-positions #rx"(?:\r\n|\r\u85|[\r\u85\u2028])|\\\\." bytes bpos)])
-                 (if m
-                     (if (= (bytes-ref bytes (caar m)) (char->integer #\\))
-                         (let ([char (string-ref
-                                      (bytes->string/utf-8 (subbytes bytes (add1 (caar m)) (cdar m)))
-                                      0)])
-                           (cond
-                            [(memq char '(#\a #\b #\t #\n #\v #\f #\r #\\ #\"))
-                             (list* (subbytes bytes bpos (caar m))
-                                    (case char
-                                      [(#\n) #"\n"]
-                                      [(#\r) #"\r"]
-                                      [(#\t) #"\t"]
-                                      [(#\a) #"\a"]
-                                      [(#\b) #"\b"]
-                                      [(#\v) #"\v"]
-                                      [(#\f) #"\f"]
-                                      [(#\\) #"\\"]
-                                      [(#\") #"\""])
-                                    (loop (cdar m)))]
-                            [(eq? char #\x)
-                             (let ([hm (regexp-match-positions #px"^[a-zA-Z0-9]*;"
-                                                               bytes 
-                                                               (+ 2 (caar m)))])
-                               (if hm
-                                   (let* ([hex-bytes (subbytes bytes (+ 2 (caar m)) (sub1 (cdar hm)))]
-                                          [v (string->number (bytes->string/utf-8 hex-bytes) 16)])
-                                     (if (or (<= 0 v #xD7FF)
-                                             (<= #xE000 v #x10FFFF))
-                                         (list* (subbytes bytes bpos (caar m))
-                                                (string->bytes/utf-8 (string (integer->char v)))
-                                                (loop (cdar hm)))
-                                         (raise-read-error
-                                          (format "out-of-range `\\x~a;' escape in string" hex-bytes)
-                                          src line
-                                          col pos
-                                          (and pos (+ 1 len)))))
-                                   (raise-read-error
-                                    (format "bad escape `\\x~a' in string"
-                                            (car (regexp-match #px"^[a-zA-Z0-9]*." bytes (+ 2 (caar m)))))
-                                    src line
-                                    col pos
-                                    (and pos (+ 1 len)))))]
-                            [(or (eq? char #\tab)
-                                 (eq? char #\newline)
-                                 (eq? char #\return)
-                                 (eq? char #\u85)
-                                 (eqv? char #\u2028)
-                                 (eq? (char-general-category char) 'zs))
-                             (let ([wm (regexp-match-positions #px"^(?:\t|\\p{Zs})*(?:\r\n|\r\u85|[\r\n\u85\u2028])(?:\t|\\p{Zs})*"
-                                                               bytes 
-                                                               (add1 (caar m)))])
-                               (if wm
-                                   (cons (subbytes bytes bpos (caar m)) ; drop matched part
-                                         (loop (cdar wm)))
-                                   ;; This is an eof error if there's only intraline whitespace
-                                   ((if (regexp-match? #px"^(?:\t|\\p{Zs})*$" bytes (+ 1 bpos))
-                                        raise-read-eof-error
-                                        raise-read-error)
-                                    "missing <line ending> after `\\<intraline-whitespace>'"
-                                    src line
-                                    col pos
-                                    (and pos (+ 1 len)))))]
-                            [else
-                             (raise-read-error
-                              (format "bad escape `\\~a' in string" char)
-                              src line
-                              col pos
-                              (and pos (+ 1 len)))]))
-                         ;; found a <line ending> that isn't just a newline:
-                         (list* (subbytes bytes bpos (caar m))
-                                #"\n"
-                                (loop (cdar m))))
-                     (let ([end (sub1 (bytes-length bytes))])
-                       (if (or (= end -1)
-                               (not (= (char->integer #\")
-                                       (bytes-ref bytes end))))
-                           (raise-read-error
-                            "unexpected end-of-file within string"
-                            src line col pos (and pos (+ 1 len)))
-                           ;; Ok:
-                           (list (subbytes bytes bpos end)))))))])
-        (bytes->string/utf-8
-         (if (= 1 (length pieces))
-             (car pieces)
-             (apply bytes-append pieces)))))))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  numbers and symbols
-
-(define-values (rx:id rx:number)
-  ;; Build regexp versions of the R6RS grammar productions for
-  ;; <identifier> and <number>.
-  (let ([or (lambda args
-              (and (ormap values args)
-                   (apply
-                    string-append
-                    (append
-                     (list "(?:")
-                     (cdr (apply append
-                                 (map (lambda (a) (list "|" a))
-                                      (filter values args))))
-                     (list ")")))))]
-        [seq (lambda args
-               (and (andmap values args)
-                    (apply string-append args)))]
-        [+ (lambda (s) (and s (string-append s "+")))]
-        [* (lambda (s) (and s (string-append s "*")))])
-
-    (define letter "[a-zA-Z]")
-    (define constituent (or letter
-                            (string-append
-                             "(?:(?=[^\0-\177])(?:"
-                             (substring
-                              (apply
-                               string-append
-                               (map
-                                (lambda (s)
-                                  (format "|\\p{~a}" s))
-                                '(Ll Lu Lt Lm Lo Mn Nl No Pd Pc Po Sc Sm Sk So Co)))
-                              1)
-                             "))")))
-    (define special-initial "[!$%&*/:<=>?^_~]")
-    (define special-subsequent "[-+.@]")
-    (define inline-hex-escape "\\\\x[0-9a-fA-F]+;")
-    (define initial (or constituent
-                        special-initial
-                        inline-hex-escape))
-    (define subsequent (or initial
-                           "[0-9]"
-                           special-subsequent
-                           "(?:\\p{Nd}|\\p{Mc}|\\p{Me})"))
-    (define peculiar-identifier (or "[+]" 
-                                    "-" 
-                                    "[.][.][.]"
-                                    (seq "->" (* subsequent))))
-    (define identifier (or (seq initial (* subsequent))
-                           peculiar-identifier))
-
-    (define digit-16  "[0-9a-fA-F]")
-    (define digit-10  "[0-9]")
-    (define digit-8   "[0-7]")
-    (define digit-2   "[01]")
-    (define (digit R)
-      (case R
-        [(2) digit-2]
-        [(8) digit-8]
-        [(10) digit-10]
-        [(16) digit-16]))
-    (define radix-16  "#[xX]")
-    (define radix-10  "(?:#[dD]|)")
-    (define radix-8   "#[oO]")
-    (define radix-2   "#[bB]")
-    (define (radix R)
-      (case R
-        [(2) radix-2]
-        [(8) radix-8]
-        [(10) radix-10]
-        [(16) radix-16]))
-    (define exactness "(?:#[iIeE]|)")
-    (define sign      "(?:[+-]|)")
-    (define mantissa-width (or "" (seq "[|]" (+ digit-10))))
-    (define exponent-marker "[eEsSfFdDlL]")
-    (define suffix (or "" (seq exponent-marker sign (+ digit-10))))
-
-    (define (prefix R) (or (seq (radix R) exactness)
-                           (seq exactness (radix R))))
-    (define (uinteger R) (+ (digit R)))
-    (define decimal-10 (or (seq (uinteger 10) suffix)
-                           (seq "[.]" (+ (digit 10)) suffix)
-                           (seq (+ (digit 10)) "[.]" (* (digit 10)) suffix))) ; removed redundant last production
-    (define (decimal R)
-      (case R
-        [(10) decimal-10]
-        [else #f])) ; <<--- using #f to mean "can't match", and combinators propagate #f appropriately
-    (define (ureal R) (or (uinteger R)
-                          (seq (uinteger R) "/" (uinteger R))
-                          (seq (decimal R) mantissa-width)))
-    (define naninf (or "[nN][aA][nN][.]0" "[iI][nN][fF][.]0"))
-    (define (real R) (or (seq sign (ureal R))
-                         (seq "[+]" naninf)
-                         (seq "-" naninf)))
-    (define (complex R) (or (real R)
-                            (seq (real R) "@" (real R))
-                            (seq (real R) "[+]" (ureal R) "[iI]")
-                            (seq (real R) "-" (ureal R) "[iI]")
-                            (seq (real R) "[+]" naninf "[iI]")
-                            (seq (real R) "-" naninf "[iI]")
-                            (seq (real R) "[+][iI]")
-                            (seq (real R) "-[iI]")
-                            (seq "[+]" (ureal R) "[iI]")
-                            (seq "-" (ureal R) "[iI]")
-                            (seq "[+]" naninf "[iI]")
-                            (seq "-" naninf "[iI]")
-                            "[+][iI]"
-                            "-[iI]"))
-    (define (num R) (seq (prefix R) (complex R)))
-    (define number (or (num 10)
-                       (num 16)
-                       (num 8)
-                       (num 2)))
-
-    (values (delay (pregexp (string-append "^" identifier "$")))
-            (delay (pregexp (string-append "^" number "$"))))))
-
-(define (do-read-symbol-or-number num? prefix port src line col pos)
-  ;; Read a delimited sequence (using an extended notion of delimiter),
-  ;; then make sure it's a number or identifier.
-  (let ([thing (string-append
-                prefix
-                (bytes->string/utf-8
-                 (car (or (if (string=? prefix "\\")
-                              (regexp-match #px"^x[0-9a-fA-F]+;(?:\\\\x[0-9a-fA-F]+;|[^\\\\\\s\\[\\]()#\";,'`])*" port)
-                              (regexp-match #px"^(?:#[xXdDbBoOeEiI])*(?:\\\\x[0-9a-fA-F]+;|[^\\\\\\s\\[\\]()#\";,'`])*" port))
-                          '(#"")))))])
-    (cond
-     [(regexp-match? #rx"^[a-zA-Z!$%&*/:<=>?^_~][a-zA-Z0-9+!$%&*/:<=>?^_~.@-]*$" thing)
-      ;; Simple symbol:
-      (string->symbol thing)]
-     [(regexp-match? (force rx:number) thing)
-      (let ([n (string->number 
-                ;; Racket doesn't handle mantissa widths, yet, so strip them out:
-                (regexp-replace* #rx"[|][0-9]+" thing ""))])
-        (unless n
-          (error 'r6rs-parser "number didn't convert: ~e" thing))
-        n)]
-     [(and (not num?)
-           (regexp-match? (force rx:id) thing))
-      (string->symbol
-       (bytes->string/utf-8 
-        (let loop ([t (string->bytes/utf-8 thing)])
-          (let ([m (regexp-match #rx#"^(.*)\\\\x([0-9a-fA-F]+);(.*)$" t)])
-            (if m
-                (loop (bytes-append
-                       (loop (cadr m))
-                       (let ([v (string->number
-                                 (bytes->string/latin-1 (caddr m))
-                                 16)])
-                         (unless (or (<= 0 v #xD7FF)
-                                     (<= #xE000 v #x10FFFF))
-                           (let ([str (bytes->string/utf-8 thing)])
-                             (raise-read-error
-                              (format "out of range escape: `\\x~a;'" (cadr m))
-                              src line col pos (and pos (string-length str)))))
-                         (string->bytes/utf-8 (string (integer->char v))))
-                       (loop (cadddr m))))
-                t)))))]
-     [else
-      (raise-read-error
-       (format "not a number or identifier: `~a'" thing)
-       src line col pos (and pos (string-length thing)))])))
-
-
-(define (read-symbol-or-number ch port src line col pos)
-  (do-read-symbol-or-number #f
-                            (string ch)
-                            port src line col pos))
-
-(define (read-number ch port src line col pos)
-  (do-read-symbol-or-number #t
-                            (string #\# ch)
-                            port src line col pos))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define r6rs-readtable
-  (make-readtable 
-   #f
-   #\{ 'terminating-macro not-allowed
-   #\} 'terminating-macro not-allowed
-   #\| 'terminating-macro not-allowed
-   #\" 'terminating-macro read-a-string
-   #\{ 'dispatch-macro dispatch-not-allowed
-   #\\ 'dispatch-macro read-character
-   #\" 'dispatch-macro dispatch-not-allowed
-   #\% 'dispatch-macro dispatch-not-allowed
-   #\: 'dispatch-macro dispatch-not-allowed
-   #\& 'dispatch-macro dispatch-not-allowed
-   #\! 'dispatch-macro read-hash-bang
-   #\~ 'dispatch-macro dispatch-not-allowed
-   #\< 'dispatch-macro dispatch-not-allowed
-   #\r 'dispatch-macro dispatch-not-allowed
-   #\p 'dispatch-macro dispatch-not-allowed
-   #\c 'dispatch-macro dispatch-not-allowed
-   #\C 'dispatch-macro dispatch-not-allowed
-   #\s 'dispatch-macro dispatch-not-allowed
-   #\S 'dispatch-macro dispatch-not-allowed
-   #\h 'dispatch-macro dispatch-not-allowed
-   #\r 'dispatch-macro dispatch-not-allowed
-   #\l 'dispatch-macro dispatch-not-allowed
-   #\0 'dispatch-macro dispatch-not-allowed
-   #\1 'dispatch-macro dispatch-not-allowed
-   #\2 'dispatch-macro dispatch-not-allowed
-   #\3 'dispatch-macro dispatch-not-allowed
-   #\4 'dispatch-macro dispatch-not-allowed
-   #\5 'dispatch-macro dispatch-not-allowed
-   #\6 'dispatch-macro dispatch-not-allowed
-   #\8 'dispatch-macro dispatch-not-allowed
-   #\9 'dispatch-macro dispatch-not-allowed
-   #\t 'dispatch-macro read-boolean
-   #\T 'dispatch-macro read-boolean
-   #\f 'dispatch-macro read-boolean
-   #\F 'dispatch-macro read-boolean
-   #\v 'dispatch-macro read-byte-string
-   #\i 'dispatch-macro read-number
-   #\I 'dispatch-macro read-number
-   #\e 'dispatch-macro read-number
-   #\E 'dispatch-macro read-number
-   #\b 'dispatch-macro read-number
-   #\B 'dispatch-macro read-number
-   #\d 'dispatch-macro read-number
-   #\D 'dispatch-macro read-number
-   #\o 'dispatch-macro read-number
-   #\O 'dispatch-macro read-number
-   #\x 'dispatch-macro read-number
-   #\X 'dispatch-macro read-number
-   #\\ 'terminating-macro read-symbol-or-number
-   #f 'non-terminating-macro read-symbol-or-number
-   ))
-
-(define (with-r6rs-reader-parameters thunk)
-  (parameterize ([current-readtable r6rs-readtable]
-                 [read-accept-infix-dot #f])
-    (thunk)))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/reconstruct.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/reconstruct.rkt
deleted file mode 100644
index 81556242e4..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/reconstruct.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang scheme/base
-
-(provide reconstruction-memory wrap)
-
-(define reconstruction-memory (make-weak-hasheq))
-
-(define (wrap r stx srcloc no-symbols?)
-  (let wrap ([r r])
-    (cond
-     [(syntax? r) r]
-     [(and (symbol? r)
-           no-symbols?)
-      (error 'macro
-             "transformer result included a raw symbol: ~e"
-             r)]
-     [(mpair? r) 
-      (let ([istx (or (hash-ref reconstruction-memory r #f)
-                      stx)])
-        (datum->syntax
-         istx
-         (cons (wrap (mcar r))
-               (wrap (mcdr r)))
-         (if (eq? istx stx)
-             srcloc
-             istx)))]
-     [(vector? r) (datum->syntax
-                   stx
-                   (list->vector
-                    (map (lambda (r) (wrap r))
-                         (vector->list r)))
-                   srcloc)]
-     [else (datum->syntax stx r srcloc)])))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/records-core.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/records-core.rkt
deleted file mode 100644
index 334b9a20ab..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/records-core.rkt
+++ /dev/null
@@ -1,368 +0,0 @@
-#!r6rs
-
-;; Implementation of procedural layer for R6RS Records
-
-;; Based on the SRFI implementation:
-; Copyright (C) Michael Sperber (2005). All Rights Reserved. 
-; 
-; Permission is hereby granted, free of charge, to any person
-; obtaining a copy of this software and associated documentation files
-; (the "Software"), to deal in the Software without restriction,
-; including without limitation the rights to use, copy, modify, merge,
-; publish, distribute, sublicense, and/or sell copies of the Software,
-; and to permit persons to whom the Software is furnished to do so,
-; subject to the following conditions:
-; 
-; The above copyright notice and this permission notice shall be
-; included in all copies or substantial portions of the Software.
-; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
-
-(library (r6rs private records-core)
-  (export make-record-type-descriptor
-	  record-type-descriptor?
-	  record-type-name
-	  record-type-parent
-	  record-type-sealed?
-	  record-type-uid
-	  record-type-field-names
-	  record-type-opaque?
-	  make-record-constructor-descriptor record-constructor
-	  record-predicate
-	  record-accessor record-mutator
-	  record-field-mutable? record-type-generative?
-	  record? record-rtd)
-  (import (rnrs base (6))
-          (rnrs lists (6))
-	  (r6rs private vector-types))
-  
-  (define make-field-spec cons)
-
-  (define field-spec-mutable? car)
-  (define field-spec-name cdr)
-
-  (define (field-spec=? spec-1 spec-2)
-    (and (eq? (field-spec-mutable? spec-1)
-	      (field-spec-mutable? spec-2))
-	 (eq? (field-spec-name spec-1)
-	      (field-spec-name spec-2))))
-
-  (define :record-type-data (make-vector-type 'record-type-descriptor 
-					      #f ; no supertype
-					      #f ; no per-type data
-					      '(#f #f #f #f #f #f) ; all fields immutable
-					      #t)) ; opaque
-
-  (define (make-record-type-data name uid sealed? opaque? field-specs parent)
-    ((typed-vector-constructor :record-type-data)
-     name uid sealed? opaque? field-specs parent))
-
-  (define (record-type-data? thing)
-    ((vector-type-predicate :record-type-data) thing))
-
-  (define (typed-vector-ref t v pos)
-    ((typed-vector-accessor t pos) v))
-
-  (define (record-type-name rtd)
-    (typed-vector-ref :record-type-data (vector-type-data rtd) 0))
-  (define (record-type-uid rtd)
-    ;; this is #f in the generative case
-    (typed-vector-ref :record-type-data (vector-type-data rtd) 1))
-  (define (record-type-sealed? rtd)
-    (typed-vector-ref :record-type-data (vector-type-data rtd) 2))
-  (define (record-type-opaque? rtd)
-    (typed-vector-ref :record-type-data (vector-type-data rtd) 3))
-  (define (record-type-field-specs rtd)
-    (typed-vector-ref :record-type-data (vector-type-data rtd) 4))
-  (define (record-type-parent rtd)
-    (typed-vector-ref :record-type-data (vector-type-data rtd) 5))
-
-  (define (record-type-descriptor=? rtd-1 rtd-2)
-    (and (eq? (record-type-parent rtd-1) (record-type-parent rtd-2))
-	 (eq? (record-type-uid rtd-1) (record-type-uid rtd-2))
-	 (for-all field-spec=?
-		  (record-type-field-specs rtd-1)
-		  (record-type-field-specs rtd-2))))
-
-  (define (uid->record-type-descriptor uid)
-    (find (lambda (rtd)
-	    (eq? (record-type-uid rtd) uid))
-	  *nongenerative-record-types*))
-
-  (define (record-type-generative? rtd)
-    (not (record-type-uid rtd)))
-
-  (define *nongenerative-record-types* '())
-
-  (define (append-field-mutable-specs parent)
-    (if parent
-	(append (append-field-mutable-specs (record-type-parent parent))
-		(map field-spec-mutable? (record-type-field-specs parent)))
-	'()))
-
-  (define (make-record-type-descriptor name parent uid sealed? opaque? field-specs)
-    (if (not (symbol? name))
-        (assertion-violation 'make-record-type-descriptor "not a symbol for record type name" name))
-    (if (not (or (not parent)
-                 (record-type-descriptor? parent)))
-	(assertion-violation 'make-record-type-descriptor "parent not #f or a record type descriptor" parent))             
-    (if (not (or (not uid)
-                 (symbol? uid)))
-	(assertion-violation 'make-record-type-descriptor "uid must be #f or a symbol" parent))
-    (if (and parent
-	     (record-type-sealed? parent))
-	(assertion-violation 'make-record-type-descriptor "can't extend a sealed parent type" parent))
-    (if (not (vector? field-specs))
-        (assertion-violation 'make-record-type-descriptor "field specification must be a vector" field-specs))
-    (let ([field-specs (vector->list field-specs)])
-      (let ((opaque? (if parent
-                         (or (record-type-opaque? parent)
-                             opaque?)
-                         opaque?))
-            (field-specs (map parse-field-spec field-specs)))
-        (let ((rtd 
-               (make-vector-type name
-                                 parent
-                                 (make-record-type-data name uid (and sealed? #t) (and opaque? #t) field-specs parent)
-                                 (append (append-field-mutable-specs parent)
-                                         (map field-spec-mutable? field-specs))
-                                 opaque?)))
-          (if uid
-              (cond
-               ((uid->record-type-descriptor uid)
-                => (lambda (old-rtd)
-                     (if (record-type-descriptor=? rtd old-rtd)
-                         old-rtd
-                         (assertion-violation 'make-record-type
-                                              "mismatched nongenerative record types with identical uids"
-                                              old-rtd rtd))))
-               (else
-                (set! *nongenerative-record-types* 
-                      (cons rtd *nongenerative-record-types*))
-                rtd))
-              rtd)))))
-
-  (define (record-type-descriptor? thing)
-    (and (vector-type? thing)
-	 (record-type-data? (vector-type-data thing))))
-
-  (define (ensure-rtd thing)
-    (if (not (record-type-descriptor? thing))
-	(assertion-violation 'make-record-type "not a record-type descriptor" thing)))
-
-  (define (parse-field-spec spec)
-    (if (not (and (list? spec)
-                  (= 2 (length spec))))
-        (assertion-violation 'make-record-type
-                             "field spec list element is not a list of two elements"
-                             spec))
-    (apply (lambda (mutability name)
-             (if (not (symbol? name))
-                 (assertion-violation 'make-record-type
-                                      "field spec name is not a symbol"
-                                      name))
-	     (make-field-spec
-	      (case mutability
-		((mutable) #t)
-		((immutable) #f)
-		(else (assertion-violation 'make-record-type
-                                           "field spec with invalid mutability specification" spec)))
-	      name))
-	   spec))
-
-  (define (record-type-field-names rtd)
-    (list->vector (map field-spec-name (record-type-field-specs rtd))))
-
-  (define (field-count rtd)
-    (let loop ((rtd rtd)
-	       (count 0))
-      (if (not rtd)
-	  count
-	  (loop (record-type-parent rtd)
-		(+ count (length (record-type-field-specs rtd)))))))
-  
-  (define (record? thing)
-    (and (typed-vector? thing)
-	 (let ((rtd (typed-vector-type thing)))
-	   (and (record-type-descriptor? rtd)
-		(not (record-type-opaque? rtd))))))
-
-  (define (record-rtd rec)
-    (if (record? rec)
-	(typed-vector-type rec)
-	(assertion-violation 'record-rtd "cannot extract rtd of a non-record or opaque record" rec)))
-
-  ;; Constructing constructors
-
-  (define :record-constructor-descriptor (make-vector-type 'record-constructor-descriptor #f #f '(#f #f #f #f) #t))
-
-  (define record-type-constrctor-descriptor?
-    (vector-type-predicate :record-constructor-descriptor))
-
-  (define (make-record-constructor-descriptor rtd previous protocol)
-    (if (not (record-type-descriptor? rtd))
-        (assertion-violation 'make-record-constructor-descriptor
-                             "not a record type descriptor" rtd))
-    (if (not (or (not previous)
-                 (record-type-constrctor-descriptor? previous)))
-        (assertion-violation 'make-record-constructor-descriptor
-                             "not #f or a parent record type constructor descriptor" previous))
-    (if (not (or (not protocol)
-                 (procedure? protocol)))
-        (assertion-violation 'make-record-constructor-descriptor
-                             "not #f or procedure for protocol" protocol))
-    (let ((parent (record-type-parent rtd)))
-      (if (and previous (not parent))
-	  (assertion-violation 'make-record-constructor-descriptor
-                               "mismatch between rtd and constructor descriptor" rtd previous))
-      (if (and protocol parent (not previous))
-          (assertion-violation 'make-record-constructor-descriptor
-                               "non-default protocol requested, but no parent constrcutor descriptor given" rtd previous))
-      (if (and previous
-	       (not protocol)
-	       (record-constructor-descriptor-custom-protocol? previous))
-	  (assertion-violation 'make-record-constructor-descriptor
-                               "default protocol requested when parent constructor descriptor has custom one"
-                               protocol previous)) 
-      
-      (let ((custom-protocol? (and protocol #t))
-	    (protocol (or protocol (default-protocol rtd)))
-	    (previous
-	     (if (or previous
-		     (not parent))
-		 previous
-		 (make-record-constructor-descriptor parent #f #f))))
-	
-	((typed-vector-constructor :record-constructor-descriptor)
-	 rtd protocol custom-protocol? previous))))
-
-  (define (split-at l n)
-    (if (zero? n)
-	(values '() l)
-	(let-values (((a b) (split-at (cdr l) (- n 1))))
-	  (values (cons (car l) a) b))))
-
-  (define (default-protocol rtd)
-    (let ((parent (record-type-parent rtd)))
-      (if (not parent)
-	  (lambda (p) p)
-	  (let ((parent-field-count (field-count parent))
-                (count (field-count rtd)))
-            (lambda (p)
-              (lambda all-field-values
-                (if (= (length all-field-values) count)
-                    (call-with-values
-                        (lambda () (split-at all-field-values parent-field-count))
-                      (lambda (parent-field-values this-field-values)
-                        (apply (apply p parent-field-values) this-field-values)))
-                    (assertion-violation (string->symbol
-                                          (string-append  
-                                           (symbol->string (record-type-name rtd))
-                                           " constructor"))
-                                         (string-append
-                                          "wrong number of arguments (given "
-                                          (number->string (length all-field-values))
-                                          ", expected "
-                                          (number->string count)
-                                          ")")
-                                         all-field-values))))))))
-
-  (define (record-constructor-descriptor-rtd desc)
-    (typed-vector-ref :record-constructor-descriptor desc 0))
-  (define (record-constructor-descriptor-protocol desc)
-    (typed-vector-ref :record-constructor-descriptor desc 1))
-  ;; this field is for error checking
-  (define (record-constructor-descriptor-custom-protocol? desc)
-    (typed-vector-ref :record-constructor-descriptor desc 2))
-  (define (record-constructor-descriptor-previous desc)
-    (typed-vector-ref :record-constructor-descriptor desc 3))
-
-  ;; A "seeder" is the procedure passed to the cons conser, used to seed
-  ;; the initial field values.
-
-  (define (make-make-seeder real-rtd wrap for-desc)
-    (let recur ((for-desc for-desc))
-      (let* ((for-rtd (record-constructor-descriptor-rtd for-desc))
-	     (for-rtd-field-count (length (record-type-field-specs for-rtd))))
-	(cond
-	 ((record-constructor-descriptor-previous for-desc)
-	  => (lambda (parent-desc)
-	       (let ((parent-protocol (record-constructor-descriptor-protocol parent-desc))
-		     (parent-make-seeder (recur parent-desc)))
-		 (lambda extension-field-values
-		   (lambda parent-protocol-args
-		     (lambda for-rtd-field-values
-		       (if (not (= (length for-rtd-field-values) for-rtd-field-count))
-			   (assertion-violation 'make-record-constructor
-                                                "wrong number of arguments to record constructor"
-                                                for-rtd for-rtd-field-values))
-		       (apply (parent-protocol
-			       (apply parent-make-seeder
-				      (append for-rtd-field-values extension-field-values)))
-			      parent-protocol-args)))))))
-	 (else
-	  (lambda extension-field-values
-	    (lambda for-rtd-field-values
-	      (if (not (= (length for-rtd-field-values) for-rtd-field-count))
-		  (assertion-violation 'make-record-constructor
-                                       "wrong number of arguments to record constructor"
-                                       for-rtd for-rtd-field-values))
-	      (wrap
-	       (apply (typed-vector-constructor real-rtd)
-		      (append for-rtd-field-values extension-field-values))))))))))
-
-  ;; does RTD-1 represent an ancestor of RTD-2?
-
-  ;; This suggests the corresponding procedure in VECTOR-TYPES should be
-  ;; abstracted out.
-
-  (define (rtd-ancestor? rtd-1 rtd-2)
-    (let loop ((rtd-2 rtd-2))
-      (or (eq? rtd-1 rtd-2)
-	  (and rtd-2
-	       (loop (record-type-parent rtd-2))))))
-
-  (define (record-constructor desc)
-    (let* ((rtd (record-constructor-descriptor-rtd desc)))
-      ((record-constructor-descriptor-protocol desc)
-       ((make-make-seeder rtd (lambda (r) r) desc)))))
-
-  (define (record-predicate rtd)
-    (vector-type-predicate rtd))
-
-  (define (check-field-id who rtd field-id)
-    (if (not (record-type-descriptor? rtd))
-        (assertion-violation who
-                             "not a record type descriptor" rtd))
-    (if (not (and (integer? field-id)
-                  (exact? field-id)
-                  (>= field-id 0)
-                  (< field-id (length (record-type-field-specs rtd)))))
-        (assertion-violation who
-                             "invalid index (not a non-negative exact integer less than the field count)" field-id)))
-
-  (define (record-accessor rtd field-id)
-    (check-field-id 'record-accessor rtd field-id)
-    (typed-vector-accessor rtd (field-id-index rtd field-id)))
-
-  (define (record-mutator rtd field-id)
-    (check-field-id 'record-mutator rtd field-id)
-    (if (not (record-field-mutable? rtd field-id))
-	(assertion-violation 'record-mutator
-                             "record-mutator called on immutable field" rtd field-id))
-    (typed-vector-mutator rtd (field-id-index rtd field-id)))
-
-  ;; A FIELD-ID is an index, which refers to a field in RTD itself.
-  (define (field-id-index rtd field-id)
-    (+ (field-count (record-type-parent rtd))
-       field-id))
-
-  (define (record-field-mutable? rtd field-id)
-    (field-spec-mutable? (list-ref (record-type-field-specs rtd) field-id))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/records-explicit.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/records-explicit.rkt
deleted file mode 100644
index b2aec4f4c5..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/records-explicit.rkt
+++ /dev/null
@@ -1,292 +0,0 @@
-#!r6rs
-
-;; Implementation of explicit-naming layer for R6RS Records
-
-;; Based on the SRFI implementation:
-; Copyright (C) Michael Sperber (2005). All Rights Reserved. 
-; 
-; Permission is hereby granted, free of charge, to any person
-; obtaining a copy of this software and associated documentation files
-; (the "Software"), to deal in the Software without restriction,
-; including without limitation the rights to use, copy, modify, merge,
-; publish, distribute, sublicense, and/or sell copies of the Software,
-; and to permit persons to whom the Software is furnished to do so,
-; subject to the following conditions:
-; 
-; The above copyright notice and this permission notice shall be
-; included in all copies or substantial portions of the Software.
-; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
-
-(library (r6rs private records-explicit)
-  (export define-record-type
-	  record-type-descriptor
-	  record-constructor-descriptor
-          fields mutable immutable parent parent-rtd protocol 
-          sealed opaque nongenerative)
-  (import (for (rnrs base) run expand)
-	  (rnrs records procedural)
-          (for (rnrs syntax-case) expand))
-
-  (define-syntax define-aux
-    (syntax-rules ()
-      [(_ id) (define-syntax id (syntax-rules ()))]
-      [(_ id ...) (begin (define-aux id) ...)]))
-
-  (define-aux
-    fields mutable immutable parent parent-rtd protocol sealed opaque nongenerative)
-
-  ;; ASSQ at the syntax level
-  (define-syntax define-alist-extractor
-    (syntax-rules ()
-      ((define-alist-extractor ?name ?name/cps ?tag ?default)
-       (begin
-
-	 (define-syntax ?name/cps
-	   (syntax-rules (?tag)
-	     ((?name/cps () ?k . ?rands)
-	      (?k ?default . ?rands))
-	     ((?name/cps ((?tag ?val) . ?rest) ?k . ?rands)
-	      (?k ?val . ?rands))
-	     ((?name/cps ((?another-tag . ?vals) . ?rest) ?k . ?rands)
-	      (?name/cps ?rest ?k . ?rands))))
-	 (define-syntax ?name
-	   (syntax-rules (?tag)
-	     ((?name ())
-	      ?default)
-	     ((?name ((?tag ?val) . ?rest))
-	      ?val)
-	     ((?name ((?another-tag . ?vals) . ?rest))
-	      (?name ?rest))))))))
-
-  (define-syntax extract-parent/sel 
-    (syntax-rules (parent parent-rtd)
-      ((_ () ?sel) #f)
-      ((_ ((parent ?val) . ?rest) ?sel)
-       (?sel (record-type-descriptor ?val)
-             (record-constructor-descriptor ?val)))
-      ((_ ((parent-rtd ?rtd ?cons) . ?rest) ?sel)
-       (?sel ?rtd ?cons))
-      ((_ ((?another-tag . ?vals) . ?rest) ?sel)
-       (extract-parent/sel ?rest ?sel))))
-  (define-syntax sel-record-type-descriptor
-    (syntax-rules ()
-      [(_ ?rtd ?cons) ?rtd]))
-  (define-syntax sel-record-constructor-descriptor
-    (syntax-rules ()
-      [(_ ?rtd ?cons) ?cons]))
-
-  (define-alist-extractor extract-sealed extract-sealed/cps sealed #f)
-  (define-alist-extractor extract-opaque extract-opaque/cps opaque #f)
-  (define-alist-extractor extract-protocol extract-protocol/cps
-    protocol #f)
-  (define-alist-extractor extract-nongenerative extract-nongenerative/cps nongenerative #f)
-
-  (define-alist-extractor extract-record-name extract-record-name/cps record-name cant-happen)
-  (define-alist-extractor extract-constructor-name extract-constructor-name/cps
-    constructor-name cant-happen)
-  (define-alist-extractor extract-predicate-name extract-predicate-name/cps
-    predicate-name cant-happen)
-
-
-  (define-syntax define-record-type
-    (syntax-rules ()
-      ((define-record-type (?record-name ?constructor-name ?predicate-name)
-         ?clause ...)
-       (define-record-type-1
-         ((record-name ?record-name)            ; prop alist
-          (constructor-name ?constructor-name)
-          (predicate-name ?predicate-name))
-         ()                             ; fields
-         ?clause ...))))
-
-  (define-syntax define-record-type-1
-    (syntax-rules (parent parent-rtd protocol sealed nongenerative opaque fields mutable immutable)
-      ;; find PARENT clause
-      ((define-record-type-1 ?props
-	 ?field-specs
-	 (parent ?parent)
-	 ?clause ...)
-       (define-record-type-1 ((parent ?parent) . ?props)
-	 ?field-specs
-	 ?clause ...))
-      ((define-record-type-1 ?props
-	 ?field-specs
-	 (parent-rtd ?parent ?cons)
-	 ?clause ...)
-       (define-record-type-1 ((parent-rtd ?parent ?cons) . ?props)
-	 ?field-specs
-	 ?clause ...))
-
-      ;; find PROTOCOL clause
-      ((define-record-type-1 ?props
-	 ?field-specs
-	 (protocol ?protocol)
-	 ?clause ...)
-       (define-record-type-1 ((protocol ?protocol) . ?props)
-	 ?field-specs
-	 ?clause ...))
-
-      ;; find SEALED clause
-      ((define-record-type-1 ?props
-	 ?field-specs
-	 (sealed #t)
-	 ?clause ...)
-       (define-record-type-1 ((sealed #t) . ?props)
-	 ?field-specs
-	 ?clause ...))
-      ((define-record-type-1 ?props
-	 ?field-specs
-	 (sealed #f)
-	 ?clause ...)
-       (define-record-type-1 ((sealed #f) . ?props)
-	 ?field-specs
-	 ?clause ...))
-
-      ;; find OPAQUE clause
-      ((define-record-type-1 ?props
-	 ?field-specs
-	 (opaque #t)
-	 ?clause ...)
-       (define-record-type-1 ((opaque #t) . ?props)
-	 ?field-specs
-	 ?clause ...))
-      ((define-record-type-1 ?props
-	 ?field-specs
-	 (opaque #f)
-	 ?clause ...)
-       (define-record-type-1 ((opaque #f) . ?props)
-	 ?field-specs
-	 ?clause ...))
-
-      ;; parse FIELDS clause
-
-      ;; base case
-      ((define-record-type-1 ?props
-	 (?field-spec ...)
-	 (fields)
-	 ?clause ...)
-       (define-record-type-1 ?props
-	 (?field-spec ...)
-	 ?clause ...))
-
-      ;; complete spec
-      ((define-record-type-1 ?props
-	 (?field-spec ...)
-	 (fields (immutable ?field-name ?accessor) ?rest ...)
-	 ?clause ...)
-       (define-record-type-1 ?props
-	 (?field-spec ... (immutable ?field-name (?accessor))) 
-	 (fields ?rest ...)
-	 ?clause ...))
-
-      ((define-record-type-1 ?props
-	 (?field-spec ...)
-	 (fields (mutable ?field-name ?accessor ?mutator) ?rest ...)
-	 ?clause ...)
-       (define-record-type-1 ?props
-	 (?field-spec ... (mutable ?field-name (?accessor ?mutator)))
-	 (fields ?rest ...)
-	 ?clause ...))
-
-      ;; find NONGENERATIVE clause
-      ((define-record-type-1 ?props
-	 ?field-specs
-	 (nongenerative ?uid)
-	 ?clause ...)
-       (define-record-type-1 ((nongenerative '?uid) . ?props)
-	 ?field-specs
-	 ?clause ...))
-
-      ;; generate code
-      ((define-record-type-1 ?props
-	 ((?mutability ?field-name ?procs) ...))
-
-       (begin
-	 ;; where we need LETREC* semantics if this is to work internally
-
-	 (define $rtd
-	   (make-record-type-descriptor (extract-record-name/cps ?props quote)
-					(extract-parent/sel ?props sel-record-type-descriptor)
-					(extract-nongenerative ?props)
-					(extract-sealed ?props)
-					(extract-opaque ?props)
-					'#((?mutability ?field-name) ...)))
-
-	 (define $constructor-descriptor
-	   (make-record-constructor-descriptor
-	    $rtd
-	    (extract-parent/sel ?props sel-record-constructor-descriptor)
-	    (extract-protocol ?props)))
-
-	 (extract-record-name/cps
-	  ?props
-	  define-record-type-name $rtd $constructor-descriptor)
-
-	 (extract-constructor-name/cps
-	  ?props
-	  define
-	  (record-constructor $constructor-descriptor))
-	 
-	 (extract-predicate-name/cps ?props
-				     define (record-predicate $rtd))
-
-	 (define-record-fields $rtd
-	   0 (?field-name ?procs) ...)))))
-
-  (define-syntax define-record-type-name
-    (syntax-rules ()
-      ((define-record-type-name ?name ?rtd ?constructor-descriptor)
-       (define-syntax ?name
-         (make-variable-transformer
-          (lambda (stx)
-            (syntax-case stx (descriptor constructor-descriptor set!)
-              (?name (identifier? #'?name) #'?rtd)
-              ((set! ?name . rest) (syntax-violation #f "cannot mutate record-type descriptor binding" stx #'name))
-              ((?name descriptor) #'?rtd)
-              ((?name constructor-descriptor) #'?constructor-descriptor))))))))
-
-  (define-syntax no-record-type
-    (syntax-rules (descriptor constructor-descriptor)
-      ((?name descriptor) #f)
-      ((?name constructor-descriptor) #f)))
-
-  (define-syntax record-type-descriptor
-    (syntax-rules ()
-      ((record-type-descriptor ?record-type)
-       (?record-type descriptor))))
-
-  (define-syntax record-constructor-descriptor
-    (syntax-rules ()
-      ((record-constructor-descriptor ?record-type)
-       (?record-type constructor-descriptor))))
-
-  (define-syntax define-record-fields
-    (syntax-rules ()
-      ((define-record-fields ?rtd ?index)
-       (begin))
-      ((define-record-fields ?rtd ?index (?field-name ?procs) . ?rest)
-       (begin
-	 (define-record-field ?rtd ?field-name ?index ?procs)
-	 (define-record-fields ?rtd (+ 1 ?index) . ?rest)))))
-
-  (define-syntax define-record-field
-    (syntax-rules ()
-      ((define-record-field ?rtd
-	 ?field-name ?index (?accessor-name))
-       (define ?accessor-name
-	 (record-accessor ?rtd ?index)))
-      ((define-record-field ?rtd
-	 ?field-name ?index (?accessor-name ?mutator-name))
-       (begin
-	 (define ?accessor-name
-	   (record-accessor ?rtd ?index))
-	 (define ?mutator-name
-	   (record-mutator ?rtd ?index)))))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/vector-types.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/vector-types.rkt
deleted file mode 100644
index 12b4016c23..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/private/vector-types.rkt
+++ /dev/null
@@ -1,102 +0,0 @@
-#lang scheme/base
-
-; PLT module definition for vector types for R6RS Records
-
-; Copyright (C) Matthew Flatt (2006). All Rights Reserved. 
-; 
-; Permission is hereby granted, free of charge, to any person
-; obtaining a copy of this software and associated documentation files
-; (the "Software"), to deal in the Software without restriction,
-; including without limitation the rights to use, copy, modify, merge,
-; publish, distribute, sublicense, and/or sell copies of the Software,
-; and to permit persons to whom the Software is furnished to do so,
-; subject to the following conditions:
-; 
-; The above copyright notice and this permission notice shall be
-; included in all copies or substantial portions of the Software.
-; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
-
-(require scheme/mpair)
-
-(provide (rename-out [make-a-vector-type make-vector-type])
-         vector-type?
-         vector-type-data
-         vector-type-predicate
-         typed-vector-constructor
-         typed-vector-accessor typed-vector-mutator
-         typed-vector?
-         typed-vector-type)
-
-(define-struct vector-type (data field-count supertype
-                                 struct-type constructor predicate accessor mutator))
-
-(define-values (prop:typed-vector typed-vector? typed-vector-ref)
-  (make-struct-type-property 'typed-vector))
-
-(define (make-a-vector-type name supertype data field-mutability opaque?)
-  (let* ([super-field-count (if supertype
-                                (vector-type-field-count supertype)
-                                0)]
-         [field-mutability (list-tail (mlist->list field-mutability) super-field-count)]
-         [bx (box #f)])
-    (let-values ([(struct: make-s s? s-ref s-set!)
-                  (make-struct-type name 
-                                    (and supertype
-                                         (vector-type-struct-type supertype))
-                                    (length field-mutability) 0 #f
-                                    (append (list (cons prop:typed-vector bx))
-                                            (if opaque?
-                                                null
-                                                ;; `equal?' shouldn't work on transparent structs:
-                                                (list
-                                                 (cons prop:equal+hash
-                                                       (list 
-                                                        (lambda (a b equal?) (eqv? a b))
-                                                        (lambda (a hash-code) (hash-code a))
-                                                        (lambda (a hash-code) (hash-code a)))))))
-                                    (and opaque? (current-inspector))
-                                    #f ; not a procedure
-                                    (let loop ([field-mutability field-mutability]
-                                               [index 0])
-                                      (cond
-                                       [(null? field-mutability) null]
-                                       [(not (car field-mutability)) (cons index
-                                                                           (loop (cdr field-mutability)
-                                                                                 (add1 index)))]
-                                       [else (loop (cdr field-mutability) (add1 index))])))])
-      (let ([vt (make-vector-type data 
-                                  (+ (length field-mutability) super-field-count)
-                                  supertype
-                                  struct: make-s s? 
-                                  s-ref s-set!)])
-        (set-box! bx vt)
-        vt))))
-
-(define (vector-type-index t pos)
-  (let* ([supertype (vector-type-supertype t)]
-         [super-field-count (if supertype
-                                (vector-type-field-count supertype)
-                                0)])
-    (if (pos . < . super-field-count)
-        (vector-type-index supertype pos)
-        (- pos super-field-count))))
-
-(define (typed-vector-constructor t)
-  (vector-type-constructor t))
-
-(define (typed-vector-type v)
-  (unbox (typed-vector-ref v)))
-
-(define (typed-vector-accessor t pos)
-  (make-struct-field-accessor (vector-type-accessor t) (vector-type-index t pos)))
-
-(define (typed-vector-mutator t pos)
-  (make-struct-field-mutator (vector-type-mutator t) (vector-type-index t pos)))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/run.rkt b/pkgs/r6rs-pkgs/r6rs-lib/r6rs/run.rkt
deleted file mode 100644
index 7fada3b03b..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/r6rs/run.rkt
+++ /dev/null
@@ -1,218 +0,0 @@
-#lang scheme/base
-(require scheme/cmdline
-         compiler/cm
-         (prefix-in r6rs: "lang/reader.rkt")
-         syntax/modcode
-         setup/dirs
-         scheme/port
-         scheme/file
-         "private/readtable.rkt"
-         "private/encode-name.rkt")
-
-(module test racket/base)
-
-(define install-mode (make-parameter #f))
-(define compile-mode (make-parameter #f))
-(define install-all-users (make-parameter #f))
-(define install-dir (make-parameter #f))
-(define install-force (make-parameter #f))
-(define extra-collection-dirs (make-parameter null))
-
-(define-values (main args)
-  (command-line
-   #:once-any
-   [("--install") "install libraries from <file>, or stdin if no <file> provided"
-    (install-mode #t)]
-   [("--compile") "compile <file> and all dependencies"
-    (compile-mode #t)]
-   #:once-any
-   [("--all-users") "install into main installation"
-    (install-all-users #t)]
-   [("--collections") dir "install into <dir>"
-    (install-dir (path->complete-path dir))]
-   [("--force") "overwrite existing libraries"
-    (install-force #t)]
-   #:multi
-   [("++path") dir "use <dir> as a container of library dirs (i.e., collections)"
-    (extra-collection-dirs (append (extra-collection-dirs)
-                                   (list (path->complete-path dir))))]
-   #:handlers
-   (case-lambda
-    [(x) (values #f null)]
-    [(x file . args) (values file args)])
-   '("file" "arg")))
-
-(current-command-line-arguments (apply vector-immutable args))
-
-(current-library-collection-paths (append (extra-collection-dirs)
-                                          (if (install-dir)
-                                              (list (install-dir))
-                                              '())
-                                          (current-library-collection-paths)))
-
-(define r6rs-read-syntax
-  (case-lambda
-   [() (r6rs-read-syntax (object-name (current-input-port)))]
-   [(name) (r6rs-read-syntax name (current-input-port))]
-   [(name port)
-    (datum->syntax #f (r6rs:read-syntax name port #'r6rs 1 0 1))]))
-
-(define (extract-libraries orig)
-  (let loop ([last-pos 0])
-    (let ([peeker (let-values ([(line col pos) (port-next-location orig)])
-                    (let ([p (peeking-input-port orig)])
-                      (port-count-lines! p)
-                      (relocate-input-port p line col pos)))])
-      (port-count-lines! peeker)
-      (let ([lib-stx (with-r6rs-reader-parameters
-                      (lambda ()
-                        (read-syntax (object-name orig) peeker)))])
-        (if (eof-object? lib-stx)
-            null
-            (let ([lib (syntax->datum lib-stx)])
-              (unless (and (list? lib)
-                           ((length lib) . >= . 2)
-                           (eq? 'library (car lib)))
-                (raise-syntax-error
-                 'library
-                 "not an R6RS library form"
-                 lib-stx))
-              (let ([name (cadr lib)])
-                (unless (valid-name? name)
-                  (error (format
-                          "~a: invalid library name: ~e"
-                          (find-system-path 'run-file)
-                          name)))
-                (let ([path (name->path name)])
-                  (unless (install-force)
-                    (when (file-exists? path)
-                      (error (format "~a: file already exists: ~a for library: ~e"
-                                     (find-system-path 'run-file)
-                                     path
-                                     name))))
-                  (let ([code (open-output-bytes)])
-                    (let ([pos (file-position peeker)])
-                      (copy-port (make-limited-input-port orig (- pos last-pos)) code)
-                      (cons (cons path (get-output-bytes code #t))
-                            (loop pos))))))))))))
-
-(define (install-libraries orig)
-  (port-count-lines! orig)
-  (let ([libs (extract-libraries orig)])
-    (for-each (lambda (lib)
-                (let ([path (car lib)]
-                      [code (cdr lib)])
-                  (printf " [installing ~a]\n" path)
-                  (let-values ([(base name dir?) (split-path path)])
-                    (make-directory* base))
-                  (call-with-output-file* 
-                   path
-                   #:exists (if (install-force) 'truncate/replace 'error)
-                   (lambda (out)
-                     (display "#!r6rs\n" out)
-                     (display code out)
-                     (display "\n" out)))))
-              libs)
-    (for-each (lambda (lib)
-                (compile-file (car lib)))
-              libs)))
-            
-(define (valid-name? name)
-  (and (list? name)
-       (pair? name)
-       (symbol? (car name))
-       (let loop ([name name])
-         (cond
-          [(null? (cdr name))
-           (or (symbol? (car name))
-               (and (list? (car name))
-                    (andmap exact-nonnegative-integer? (car name))))]
-          [else (and (symbol? (car name))
-                     (loop (cdr name)))]))))
-
-(define (name->path name)
-  (let* ([name (let ([len (length name)])
-                 (cond
-                  [(or (= len 1)
-                       (and (= len 2)
-                            (not (symbol? (cadr name)))))
-                   ;; Add implicit "main":
-                   (list* (car name) 'main (cdr name))]
-                  [(and (or (= len 2)
-                            (and (= len 3)
-                                 (not (symbol? (caddr name)))))
-                        (regexp-match #rx"^main_*$" (symbol->string (cadr name))))
-                   ;; Rename (X main_*) => (X main__*)
-                   (list* (car name)
-                          (string->symbol
-                           (string-append (symbol->string (cadr name)) "_"))
-                          (cddr name))]
-                  [else name]))])
-    (apply build-path
-           (cond [(install-dir)
-                  => values]
-                 [(install-all-users)
-                  (find-collects-dir)]
-                 [else
-                  (find-user-collects-dir)])
-           (let loop ([name name])
-             (cond
-              [(and (pair? (cdr name))
-                    (null? (cddr name))
-                    (not (symbol? (cadr name))))
-               ;; versioned:
-               (list
-                (format "~a~a.ss"
-                        (encode-name (car name))
-                        (apply
-                         string-append
-                         (map (lambda (v)
-                                (format "-~a" v))
-                              (cadr name)))))]
-              [(null? (cdr name))
-               ;; unversioned:
-               (list (format "~a.ss" (encode-name (car name))))]
-              [else
-               (cons (encode-name (car name))
-                     (loop (cdr name)))])))))
-
-;; ----------------------------------------
-
-(define (compile-file src)
-  (parameterize ([manager-compile-notify-handler
-                  (lambda (p)
-                    (printf " [Compiling ~a]\n" p))])
-    (managed-compile-zo src r6rs-read-syntax)))
-
-;; ----------------------------------------
-
-(cond
- [(install-mode)
-  (if main
-      (call-with-input-file* main install-libraries)
-      (install-libraries (current-input-port)))]
- [(compile-mode)
-  (unless main
-    (error (format "~a: need a file to compile" (find-system-path 'run-file))))
-  (compile-file main)]
- [else
-  (unless main
-    (error (format "~a: need a file to run" (find-system-path 'run-file))))
-  (let* ([main (path->complete-path main)]
-         [zo (let-values ([(base name dir?) (split-path main)])
-               (build-path base 
-                           "compiled"
-                           (path-add-suffix name #".zo")))])
-    (if ((file-or-directory-modify-seconds zo #f (lambda () -inf.0))
-         . > . 
-         (file-or-directory-modify-seconds main #f (lambda () -inf.0)))
-        ;; .zo will be used; no need to set reader:
-        (dynamic-require main #f)
-        ;; need to read with R6RS reader
-        (let ([code (get-module-code main #:source-reader r6rs-read-syntax)]
-              [rpath (module-path-index-resolve
-                      (module-path-index-join main #f))])
-          (parameterize ([current-module-declare-name rpath]
-                         [current-module-declare-source main])
-            (eval code))
-          (dynamic-require rpath #f))))])
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/arithmetic/bitwise-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/arithmetic/bitwise-6.rkt
deleted file mode 100644
index 6014d2e403..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/arithmetic/bitwise-6.rkt
+++ /dev/null
@@ -1,104 +0,0 @@
-#lang scheme/base
-
-(provide bitwise-and
-         bitwise-ior
-         bitwise-xor
-         bitwise-not
-         bitwise-if
-         (rename-out [integer-length bitwise-length])
-         bitwise-bit-count
-         bitwise-first-bit-set
-         bitwise-bit-set?
-         bitwise-copy-bit
-         bitwise-bit-field
-         (rename-out [arithmetic-shift bitwise-arithmetic-shift])
-         bitwise-arithmetic-shift-left
-         bitwise-arithmetic-shift-right
-         bitwise-copy-bit-field
-         bitwise-rotate-bit-field
-         bitwise-reverse-bit-field)
-
-
-(define (bitwise-if a b c)
-  (bitwise-ior (bitwise-and a b)
-               (bitwise-and (bitwise-not a) c)))
-
-(define (bitwise-bit-count i)
-  (if (negative? i)
-      (bitwise-not (bitwise-bit-count (bitwise-not i)))
-      (let loop ([i i][cnt 0])
-        (if (zero? i)
-            cnt
-            (loop (arithmetic-shift i -1)
-                  (+ cnt (if (eq? 1 (bitwise-and i 1)) 1 0)))))))
-
-(define (bitwise-first-bit-set b)
-  (if (zero? b)
-      -1
-      (let loop ([b b][pos 0])
-        (if (zero? (bitwise-and b 1))
-            (loop (arithmetic-shift b -1) (add1 pos))
-            pos))))
-
-(define (bitwise-copy-bit b n bit)
-  (unless (exact-nonnegative-integer? n)
-    (raise-type-error 'bitwise-copy-bit "exact nonnegative integer" n))
-  (unless (or (eq? bit 1)
-              (eq? bit 0))
-    (raise-type-error 'bitwise-copy-bit "0 or 1" bit))
-  (if (eq? bit 1)
-      (bitwise-ior b (arithmetic-shift 1 n))
-      (bitwise-and b (bitwise-not (arithmetic-shift 1 n)))))
-
-(define (bitwise-copy-bit-field to start end from)
-  (unless (exact-nonnegative-integer? start)
-    (raise-type-error 'bitwise-copy-bit-field "exact nonnegative integer" start))
-  (unless (exact-nonnegative-integer? end)
-    (raise-type-error 'bitwise-copy-bit-field "exact nonnegative integer" end))
-  (unless (start . <= . end)
-    (error 'bitwise-copy-bit-field "ending position ~e is not as big a starting position ~e" start end))
-  (let* ([mask1 (arithmetic-shift -1 start)]
-         [mask2 (bitwise-not (arithmetic-shift -1 end))]
-         [mask (bitwise-and mask1 mask2)])
-    (bitwise-if mask
-                (arithmetic-shift from start)
-                to)))
-
-(define (bitwise-arithmetic-shift-left v s)
-  (arithmetic-shift v s))
-(define (bitwise-arithmetic-shift-right v s)
-  (arithmetic-shift v (- s)))
-
-(define (bitwise-rotate-bit-field n start end count)
-  (unless (exact-nonnegative-integer? start)
-    (raise-type-error 'bitwise-rotate-bit-field "exact nonnegative integer" start))
-  (unless (exact-nonnegative-integer? end)
-    (raise-type-error 'bitwise-rotate-bit-field "exact nonnegative integer" end))
-  (unless (start . <= . end)
-    (error 'bitwise-rotate-bit-field "ending position ~e is not as big a starting position ~e" start end))
-  (unless (exact-nonnegative-integer? count)
-    (raise-type-error 'bitwise-rotate-bit-field "exact nonnegative integer" count))
-  (let* ([width (- end start)]
-         [count (modulo count width)]
-         [field0 (bitwise-bit-field n start end)]
-         [field1 (arithmetic-shift field0 count)]
-         [field2 (arithmetic-shift field0 (- count width))]
-         [field (bitwise-ior field1 field2)])
-    (bitwise-copy-bit-field n start end field)))
-
-(define (bitwise-reverse-bit-field n start end)
-  (unless (exact-nonnegative-integer? start)
-    (raise-type-error 'bitwise-rotate-bit-field "exact nonnegative integer" start))
-  (unless (exact-nonnegative-integer? end)
-    (raise-type-error 'bitwise-rotate-bit-field "exact nonnegative integer" end))
-  (unless (start . <= . end)
-    (error 'bitwise-rotate-bit-field "ending position ~e is not as big a starting position ~e" start end))
-  (let ([field (bitwise-bit-field n start end)]
-        [width (- end start)])
-    (let loop ([old field][new 0][width width])
-      (cond
-       [(zero? width) (bitwise-copy-bit-field n start end new)]
-       [else (loop (arithmetic-shift old -1)
-                   (bitwise-ior (arithmetic-shift new 1)
-                                (bitwise-and old 1))
-                   (sub1 width))]))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/arithmetic/fixnums-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/arithmetic/fixnums-6.rkt
deleted file mode 100644
index f8153ea7fd..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/arithmetic/fixnums-6.rkt
+++ /dev/null
@@ -1,203 +0,0 @@
-#lang scheme/base
-
-(require (only-in rnrs/base-6
-                  div-and-mod div mod
-                  div0-and-mod0 div0 mod0)
-         (prefix-in core: scheme/fixnum)
-         rnrs/arithmetic/bitwise-6
-         r6rs/private/num-inline
-         (for-syntax r6rs/private/inline-rules))
-
-(provide fixnum?
-         fixnum-width
-         least-fixnum
-         greatest-fixnum
-         fxbit-set?
-         fxcopy-bit
-         fxcopy-bit-field
-         fxbit-field
-         fxbit-count
-         fxarithmetic-shift
-         fxrotate-bit-field
-         fxreverse-bit-field)
-         ;; Many other provides from macros below
-
-(define 64-bit? (fixnum? (expt 2 33)))
-
-(define (fixnum-width) (if 64-bit? 63 31))
-(define (least-fixnum) (if 64-bit? (- (expt 2 62)) -1073741824))
-(define (greatest-fixnum) (if 64-bit? (- (expt 2 62) 1) +1073741823))
-
-(define-syntax-rule (check v alt)
-  (if (fixnum? v)
-      v
-      alt))
-
-(define-inliner define-fx fixnum? "fixnum")
-
-(define-fx = fx=? core:fx= (a b c ...) nocheck)
-(define-fx > fx>? core:fx> (a b c ...) nocheck)
-(define-fx < fx<? core:fx< (a b c ...) nocheck)
-(define-fx <= fx<=? core:fx<= (a b c ...) nocheck)
-(define-fx >= fx>=? core:fx>= (a b c ...) nocheck)
-
-(define-fx zero? fxzero? #f (a) nocheck)
-(define-fx positive? fxpositive? #f (a) nocheck)
-(define-fx negative? fxnegative? #f (a) nocheck)
-(define-fx odd? fxodd? #f (a) nocheck)
-(define-fx even? fxeven? #f (a) nocheck)
-
-(define-fx max fxmax core:fxmax (a b ...) nocheck)
-(define-fx min fxmin core:fxmin (a b ...) nocheck)
-
-(define-fx + fx+ core:fx+ (a b) check)
-(define-fx * fx* core:fx* (a b) check)
-(define-fx - fx- core:fx- [(a) (a b)] check)
-
-(provide fxdiv-and-mod
-         fxdiv0-and-mod0)
-(define (fxdiv-and-mod a b)
-  (unless (fixnum? a)
-    (raise-type-error 'fxdiv-and-mod "fixnum" a))
-  (unless (fixnum? b)
-    (raise-type-error 'fxdiv-and-mod "fixnum" b))
-  (let-values ([(d m) (div-and-mod a b)])
-    (check d (implementation-restriction 'div-and-mod d))
-    (values d m)))
-(define-fx div fxdiv #f (a b) check)
-(define-fx mod fxmod #f (a b) nocheck)
-(define (fxdiv0-and-mod0 a b)
-  (unless (fixnum? a)
-    (raise-type-error 'fxdiv0-and-mod0 "fixnum" a))
-  (unless (fixnum? b)
-    (raise-type-error 'fxdiv0-and-mod0 "fixnum" b))
-  (let-values ([(d m) (div0-and-mod0 a b)])
-    (check d (implementation-restriction 'div0-and-mod0 d))
-    (values d m)))
-(define-fx div0 fxdiv0 #f (a b) check)
-(define-fx mod0 fxmod0 #f (a b) nocheck)
-
-(define-syntax-rule (define-carry fx/carry (a b c) expr)
-  (begin
-    (provide fx/carry)
-    (define (fx/carry a b c)
-      (unless (fixnum? a)
-        (raise-type-error 'fx/carry "fixnum" a))
-      (unless (fixnum? a)
-        (raise-type-error 'fx/carry "fixnum" b))
-      (unless (fixnum? a)
-        (raise-type-error 'fx/carry "fixnum" b))
-      (let-values ([(d m) (div0-and-mod0 expr
-                                         (arithmetic-shift 1 (fixnum-width)))])
-        (values m d)))))
-
-(define-carry fx+/carry (a b c) (+ a b c))
-(define-carry fx-/carry (a b c) (- a b c))
-(define-carry fx*/carry (a b c) (+ (* a b) c))
-
-(provide (rename-out [core:fxnot fxnot]))
-(define-fx bitwise-and fxand core:fxand (a b ...) nocheck)
-(define-fx bitwise-ior fxior core:fxior (a b ...) nocheck)
-(define-fx bitwise-xor fxxor core:fxxor (a b ...) nocheck)
-
-(define-syntax-rule (fixnum-bitwise-if a b c)
-  (bitwise-ior (bitwise-and a b)
-               (bitwise-and (bitwise-not a) c)))
-(define-fx fixnum-bitwise-if fxif #f (a b c) nocheck)
-
-(define-fx bitwise-length fxlength #f (a) nocheck)
-(define-fx bitwise-first-bit-set fxfirst-bit-set #f (a) nocheck)
-
-(define positive-fixnum-width-bounds
-  (string-append "exact integer in [0, " (number->string (- (fixnum-width) 1)) "]"))
-
-(define fixnum-width-bounds
-  (string-append "exact integer in [ " (number->string (- 1 (fixnum-width)))
-                 ", " (number->string (- (fixnum-width) 1)) "]"))
-
-(define (fxbit-set? n bit)
-  (unless (fixnum? n)
-    (raise-type-error 'fxbit-set? "fixnum" n))
-  (bitwise-bit-set? n bit))
-
-(define (fxbit-count n)
-  (unless (fixnum? n)
-    (raise-type-error 'fxbit-count "fixnum" n))
-  (bitwise-bit-count n))
-
-(define (fxcopy-bit n pos bit)
-  (unless (fixnum? n)
-    (raise-type-error 'fxcopy-bit "fixnum" n))
-  (unless (and (exact-nonnegative-integer? pos)
-               (< pos (fixnum-width)))
-    (raise-type-error 'fxcopy-bit positive-fixnum-width-bounds pos))
-  (bitwise-copy-bit n pos bit))
-
-(define (fxcopy-bit-field n start end m)
-  (unless (fixnum? n)
-    (raise-type-error 'fxcopy-bit-field "fixnum" n))
-  (unless (and (exact-nonnegative-integer? end)
-               (< end (fixnum-width)))
-    (raise-type-error 'fxcopy-bit-field positive-fixnum-width-bounds end))
-  (unless (fixnum? m)
-    (raise-type-error 'fxcopy-bit-field "fixnum" m))
-  (bitwise-copy-bit-field n start end m))
-
-(define (fxbit-field n start end)
-  (unless (fixnum? n)
-    (raise-type-error 'fxbit-field "fixnum" n))
-  (unless (and (exact-nonnegative-integer? end)
-               (< end (fixnum-width)))
-    (raise-type-error 'fxbit-field positive-fixnum-width-bounds end))
-  (bitwise-bit-field n start end))
-
-(define-syntax-rule (define-shifter fxarithmetic-shift r6rs:fxarithmetic-shift
-                      lower-bound bounds adjust)
-  (begin
-    (provide fxarithmetic-shift)
-    (define-syntax fxarithmetic-shift
-      (inline-rules
-       r6rs:fxarithmetic-shift
-       [(_ a b)
-        (let ([t1 a]
-              [t2 b])
-          (if (and (fixnum? t1)
-                   (and (exact-integer? t2) (<= lower-bound t2 (- (fixnum-width) 1))))
-              (let ([v (arithmetic-shift t1 (adjust t2))])
-                (if (fixnum? v)
-                    v
-                    (r6rs:fxarithmetic-shift t1 t2)))
-              (r6rs:fxarithmetic-shift t1 t2)))]))
-    (define (r6rs:fxarithmetic-shift a b)
-      (unless (fixnum? a)
-        (raise-type-error 'fxarithmetic-shift "fixnum" a))
-      (unless (and (exact-integer? b) (<= lower-bound b (- (fixnum-width) 1)))
-        (raise-type-error 'fxarithmetic-shift bounds b))
-      (let ([v (arithmetic-shift a (adjust b))])
-        (if (fixnum? v)
-            v
-            (implementation-restriction 'fxarithmetic-shift v))))))
-
-(define-shifter fxarithmetic-shift r6rs:fxarithmetic-shift
-  (- 1 (fixnum-width)) fixnum-width-bounds values)
-(provide (rename-out [core:fxlshift fxarithmetic-shift-left]
-                     [core:fxrshift fxarithmetic-shift-right]))
-
-(define (fxrotate-bit-field n start end count)
-  (unless (fixnum? n)
-    (raise-type-error 'fxrotate-bit-field "fixnum" n))
-  (unless (and (exact-nonnegative-integer? end)
-               (< end (fixnum-width)))
-    (raise-type-error 'fxrotate-bit-field positive-fixnum-width-bounds end))
-  (unless (and (exact-nonnegative-integer? count)
-               (< count (fixnum-width)))
-    (raise-type-error 'fxrotate-bit-field positive-fixnum-width-bounds count))
-  (bitwise-rotate-bit-field n start end count))
-
-(define (fxreverse-bit-field n start end)
-  (unless (fixnum? n)
-    (raise-type-error 'fxrotate-bit-field "fixnum" n))
-  (unless (and (exact-nonnegative-integer? end)
-               (< end (fixnum-width)))
-    (raise-type-error 'fxrotate-bit-field positive-fixnum-width-bounds end))
-  (bitwise-reverse-bit-field n start end))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/arithmetic/flonums-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/arithmetic/flonums-6.rkt
deleted file mode 100644
index b2f23826db..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/arithmetic/flonums-6.rkt
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang scheme/base
-
-(require (only-in rnrs/base-6
-                  div-and-mod div mod
-                  div0-and-mod0 div0 mod0
-                  [integer? r6rs:integer?]
-                  finite? infinite? nan?)
-         (prefix-in core: scheme/flonum)
-         scheme/fixnum
-         (only-in rnrs/arithmetic/fixnums-6
-                  fixnum?)
-         rnrs/conditions-6
-         r6rs/private/num-inline)
-
-(provide (rename-out [inexact-real? flonum?])
-         real->flonum
-         flnumerator
-         fldenominator
-         fllog (rename-out [core:flsqrt flsqrt]) flexpt
-         &no-infinities make-no-infinities-violation no-infinities-violation?
-         &no-nans make-no-nans-violation no-nans-violation?)
-;; More provided via macros
-
-(define-inliner define-fl inexact-real? "flonum")
-
-(define-fl = fl=? core:fl= (a b c ...) nocheck)
-(define-fl > fl>? core:fl> (a b c ...) nocheck)
-(define-fl < fl<? core:fl< (a b c ...) nocheck)
-(define-fl <= fl<=? core:fl<= (a b c ...) nocheck)
-(define-fl >= fl>=? core:fl>= (a b c ...) nocheck)
-
-(define-fl integer? flinteger? #f (a) nocheck)
-(define-fl zero? flzero? #f (a) nocheck)
-(define-fl positive? flpositive? #f (a) nocheck)
-(define-fl negative? flnegative? #f (a) nocheck)
-(define-fl odd? flodd? #f (a) nocheck)
-(define-fl even? fleven? #f (a) nocheck)
-(define-fl finite? flfinite? #f (a) nocheck)
-(define-fl infinite? flinfinite? #f (a) nocheck)
-(define-fl nan? flnan? #f (a) nocheck)
-
-(define-fl max flmax core:flmax (a b ...) nocheck)
-(define-fl min flmin core:flmin (a b ...) nocheck)
-
-(define-fl + fl+ core:fl+ #:base 0.0 (a b ...) nocheck)
-(define-fl * fl* core:fl* #:base 1.0 (a b ...) nocheck)
-(define-fl - fl- core:fl- [(a) (a b ...)] nocheck)
-(define-fl / fl/ core:fl/ [(a) (a b ...)] nocheck)
-
-(define-fl abs flabs core:flabs (a) nocheck)
-
-(provide fldiv-and-mod
-         fldiv0-and-mod0)
-(define (fldiv-and-mod a b)
-  (unless (inexact-real? a)
-    (raise-type-error 'fldiv-and-mod "flonum" a))
-  (unless (inexact-real? b)
-    (raise-type-error 'fldiv-and-mod "flonum" b))
-  (div-and-mod a b))
-(define-fl div fldiv #f (a b) nocheck)
-(define-fl mod flmod #f (a b) nocheck)
-(define (fldiv0-and-mod0 a b)
-  (unless (inexact-real? a)
-    (raise-type-error 'fldiv0-and-mod0 "flonum" a))
-  (unless (inexact-real? b)
-    (raise-type-error 'fldiv0-and-mod0 "flonum" b))
-  (div0-and-mod0 a b))
-(define-fl div0 fldiv0 #f (a b) nocheck)
-(define-fl mod0 flmod0 #f (a b) nocheck)
-
-(define (flnumerator c)
-  (if (inexact-real? c)
-      (if (and (rational? c)
-               (not (equal? c -0.0)))
-          (numerator c)
-          c)
-      (raise-type-error 'flnumerator "flonum" c)))
-
-(define (fldenominator c)
-  (if (inexact-real? c)
-      (if (rational? c)
-          (denominator c)
-          1.0)
-      (raise-type-error 'fldenominator "flonum" c)))
-
-(provide (rename-out [core:flfloor flfloor]
-                     [core:flceiling flceiling]
-                     [core:flround flround]
-                     [core:fltruncate fltruncate]
-                     [core:flexp flexp]))
-
-(define fllog
-  (case-lambda
-   [(v) (core:fllog v)]
-   [(v1 v2)
-    (/ (fllog v1) (fllog v2))]))
-
-(provide (rename-out [core:flsin flsin]
-                     [core:flcos flcos]
-                     [core:fltan fltan]
-                     [core:flasin flasin]
-                     [core:flacos flacos]))
-
-(define-fl atan flatan #f [(a) (a b)] nocheck)
-
-(define (flexpt a b)
-  (unless (inexact-real? a)
-    (raise-type-error 'flexpt "flonum" a))
-  (unless (inexact-real? b)
-    (raise-type-error 'flexpt "flonum" b))
-  (let ([v (expt a b)])
-    (if (inexact-real? v)
-        v
-        +nan.0)))
-
-(define-condition-type &no-infinities
-  &implementation-restriction
-  make-no-infinities-violation
-  no-infinities-violation?)
-
-(define-condition-type &no-nans
-  &implementation-restriction
-  make-no-nans-violation no-nans-violation?)
-
-(define (real->flonum r)
-  (unless (real? r)
-    (raise-type-error 'real->flonum "real" r))
-  (exact->inexact r))
-
-(provide (rename-out [fx->fl fixnum->flonum]))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/base-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/base-6.rkt
deleted file mode 100644
index 0b5f4dc049..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/base-6.rkt
+++ /dev/null
@@ -1,601 +0,0 @@
-#lang scheme/base
-
-(require (for-syntax (rename-in r6rs/private/base-for-syntax
-                                [syntax-rules r6rs:syntax-rules])
-                     scheme/base)
-         scheme/promise
-         scheme/splicing
-         r6rs/private/qq-gen
-         r6rs/private/exns
-         r6rs/private/no-set
-         (for-syntax r6rs/private/reconstruct)
-         (prefix-in r5rs: r5rs)
-         (only-in r6rs/private/readtable rx:number)
-         scheme/bool)
-
-(provide 
-
- ;; 11.2
- (rename-out [r6rs:define define]
-             [r6rs:define-syntax define-syntax])
-
- ;; 11.4.1
- (rename-out [r5rs:quote quote])
-
- ;; 11.4.2
- (rename-out [r6rs:lambda lambda])
-
- ;; 11.4.3
- (rename-out [r5rs:if if])
-
- ;; 11.4.4
- (rename-out [r6rs:set! set!])
-
- ;; 11.4.5
- (rename-out [r5rs:cond cond]
-             [r5rs:case case])
- else => 
- and or
- 
- ;; 11.4.6
- let let*
- (rename-out [r6rs:letrec letrec]
-             [r6rs:letrec* letrec*]
-             [r6rs:let-values let-values]
-             [r6rs:let*-values let*-values])
- 
- ;; 11.4.7
- begin
-
- ;; 11.5
- eqv? eq? equal?
-
- ;; 11.6
- procedure?
- 
- ;; 11.7.4
- number? complex? real? rational? integer?
- real-valued? rational-valued? integer-valued?
- exact? inexact?
- (rename-out [inexact->exact exact]
-             [exact->inexact inexact])
- = < > <= >=
- zero? positive? negative? odd?
- even? finite? infinite? nan?
- min max
- + * - 
- (rename-out [r6rs:/ /])
- abs 
- div-and-mod div mod
- div0-and-mod0 div0 mod0
- gcd lcm
- numerator denominator
- floor ceiling truncate round
- rationalize
- exp (rename-out [r6rs:log log]) sin cos tan asin acos atan
- sqrt (rename-out [integer-sqrt/remainder exact-integer-sqrt])
- (rename-out [r6rs:expt expt])
- make-rectangular make-polar real-part imag-part magnitude 
- (rename-out [r6rs:angle angle]
-             [r6rs:number->string number->string]
-             [r6rs:string->number string->number])
-
- ;; 11.8
- not boolean? (rename-out [r6rs:boolean=? boolean=?])
-
- ;; 11.9
- (rename-out [r5rs:pair? pair?]
-             [r5rs:cons cons]
-             [r5rs:car car]
-             [r5rs:cdr cdr]
-             [r5rs:caar caar]
-             [r5rs:cadr cadr]
-             [r5rs:cdar cdar]
-             [r5rs:cddr cddr]
-             [r5rs:caaar caaar]
-             [r5rs:caadr caadr]
-             [r5rs:cadar cadar]
-             [r5rs:caddr caddr]
-             [r5rs:cdaar cdaar]
-             [r5rs:cdadr cdadr]
-             [r5rs:cddar cddar]
-             [r5rs:cdddr cdddr]
-             [r5rs:caaaar caaaar]
-             [r5rs:caaadr caaadr]
-             [r5rs:caadar caadar]
-             [r5rs:caaddr caaddr]
-             [r5rs:cadaar cadaar]
-             [r5rs:cadadr cadadr]
-             [r5rs:caddar caddar]
-             [r5rs:cadddr cadddr]
-             [r5rs:cdaaar cdaaar]
-             [r5rs:cdaadr cdaadr]
-             [r5rs:cdadar cdadar]
-             [r5rs:cdaddr cdaddr]
-             [r5rs:cddaar cddaar]
-             [r5rs:cddadr cddadr]
-             [r5rs:cdddar cdddar]
-             [r5rs:cddddr cddddr]
-             [r5rs:null? null?]
-             [r5rs:list? list?]
-             [r5rs:list list]
-             [r5rs:length length]
-             [r5rs:append append]
-             [r5rs:reverse reverse]
-             [r5rs:list-tail list-tail]
-             [r5rs:list-ref list-ref]
-             [r5rs:map map]
-             [r5rs:for-each for-each])
-
- ;; 11.10
- symbol? (rename-out [r6rs:symbol=? symbol=?])
- string->symbol symbol->string
- 
- ;; 11.11
- char? char=? char<? char>? char<=? char>=?
- integer->char char->integer
-
- ;; 11.12
- string?
- make-string string
- string-length string-ref
- string=? string<? string>? string<=? string>=?
- substring string-append
- (rename-out [r5rs:string->list string->list]
-             [r5rs:list->string list->string])
- string-for-each string-copy
-
- ;; 11.13
- vector? make-vector vector
- vector-length vector-ref vector-set!
- (rename-out [r5rs:vector->list vector->list]
-             [r5rs:list->vector list->vector])
- vector-fill! 
- vector-map
- vector-for-each
-
- ;; 11.14
- (rename-out [r6rs:error error])
- assertion-violation assert
-
- ;; 11.15
- (rename-out [r5rs:apply apply]
-             [call-with-current-continuation call/cc])
- call-with-current-continuation
- values call-with-values
- dynamic-wind
-
- ;; 11.17
- (rename-out [r6rs:quasiquote quasiquote])
- unquote unquote-splicing
-
- ;; 11.18
- (rename-out [r6rs:let-syntax let-syntax]
-             [r6rs:letrec-syntax letrec-syntax])
-
- ;; 11.19
- (for-syntax (rename-out [r6rs:syntax-rules syntax-rules])
-             identifier-syntax
-             ...
-             _)
-
- )
-
-;; ----------------------------------------
-
-(define (real-valued? o)
-  (or (real? o)
-      (and (complex? o)
-           (zero? (imag-part o)))))
-
-(define (rational-valued? o)
-  (or (rational? o)
-      (and (complex? o)
-           (zero? (imag-part o))
-           (rational? (real-part o)))))
-
-(define (integer-valued? o)
-  (or (integer? o)
-      (and (complex? o)
-           (zero? (imag-part o))
-           (integer? (real-part o)))))
-
-(define (finite? n)
-  (if (real? n)
-      (not (or (eqv? n +inf.0)
-               (eqv? n -inf.0)
-               (eqv? n +nan.0)))
-      (raise-type-error 'infinite? "real" n)))
-  
-(define (infinite? n)
-  (if (real? n)
-      (or (eqv? n +inf.0)
-          (eqv? n -inf.0))
-      (raise-type-error 'infinite? "real" n)))
-
-(define (nan? n)
-  (if (real? n)
-      (eqv? n +nan.0)
-      (raise-type-error 'nan? "real" n)))
-
-;; Someone needs to look more closely at div and mod.
-
-(define (div x y)
-  (cond
-   [(rational? y)
-    (cond
-     [(x . >= . 0)
-      (truncate (/ x y))]
-     [(y . > . 0)
-      (floor (/ x y))]
-     [else
-      (ceiling (/ x y))])]
-   [(real? y)
-    ;; infinity or nan
-    (if (equal? y +nan.0)
-        +nan.0
-        1.0)]
-   [else
-    (raise-type-error 'div "real number" y)]))
-
-(define (mod x y)
-  (- x (* (div x y) y)))
-
-(define (div-and-mod x y)
-  (let ([d (div x y)])
-    (values d (- x (* d y)))))
-
-(define (div0-and-mod0 x y)
-  (let-values ([(d m) (div-and-mod x y)])
-    (if (>= m (/ (abs y) 2))
-        (if (negative? y)
-            (values (sub1 d) (+ m y))
-            (values (add1 d) (- m y)))
-        (values d m))))
-
-(define (div0 x y)
-  (let-values ([(d m) (div0-and-mod0 x y)])
-    d))
-
-(define (mod0 x y)
-  (let-values ([(d m) (div0-and-mod0 x y)])
-    m))
-
-(define-syntax r6rs:/
-  ;; R6RS says that division with exact zero is treated like 
-  ;; division by inexact zero if any of the other arguments are inexact.
-  ;; We use a macro to inline tests in binary mode, since the JIT
-  ;; can inline for flonum arithmetic.
-  (make-set!-transformer
-   (lambda (stx)
-     (if (identifier? stx)
-         (syntax/loc stx r6rs-/)
-         (syntax-case stx (r6rs:set!)
-           [(r6rs:set! . _)
-            (raise-syntax-error #f
-                                "cannot mutate imported identifier"
-                                stx)]
-           [(_ expr) #'(/ expr)]
-           [(_ expr1 expr2)
-            #'(let ([a expr1]
-                    [b expr2])
-                (cond
-                 [(and (eq? b 0) (number? a) (inexact? a))
-                  (/ a 0.0)]
-                 [(and (eq? a 0) (number? b) (inexact? b))
-                  (/ 0.0 b)]
-                 [else (/ a b)]))]
-           [(_ . args) 
-            #'(r6rs-/ . args)])))))
-
-(define r6rs-/
-  (case-lambda
-   [(n) (/ n)]
-   [(a b) (r6rs:/ a b)]
-   [args (if (ormap (lambda (x) (and (number? x) (inexact? x))) args)
-             (apply /
-                    (map (lambda (v) (if (eq? v 0)
-                                         0.0
-                                         v))
-                         args))
-             (apply / args))]))
-
-(define r6rs:log
-  (case-lambda
-   [(n) (log n)]
-   [(n m) (/ (log n) (log m))]))
-
-(define (r6rs:expt base power)
-  (cond
-   [(and (number? base)
-         (zero? base)
-         (number? power))
-    (if (zero? power)
-        (if (and (eq? base 0)
-                 (exact? power))
-            1
-            1.0)
-        (if (positive? (real-part power))
-            (if (and (eq? base 0)
-                     (exact? power))
-                0
-                0.0)
-            (expt base power)))]
-   [(and (eq? base 1)
-         (number? power) 
-         (inexact? power))
-    (expt (exact->inexact base) power)]
-   [else (expt base power)]))
-
-(define (r6rs:angle n)
-  ; because `angle' produces exact 0 for reals:
-  (if (and (inexact-real? n) (positive? n))
-      0.0 
-      (angle n)))
-
-(define (r6rs:number->string z [radix 10] [precision #f])
-  (number->string z radix))
-
-(define (r6rs:string->number s [radix 10])
-  (let* ([prefix (case radix
-                   [(10) "#d"]
-                   [(16) "#x"]
-                   [(8) "#o"]
-                   [(2) "#b"]
-                   [else (raise-type-error
-                          'string->number
-                          "2, 8, 10, or 16"
-                          radix)])]
-         [s (if (regexp-match? #rx"#[dDxXoObB]" s)
-                s
-                (string-append prefix s))])
-    (and (regexp-match? (force rx:number) s)
-         (string->number (regexp-replace* #rx"[|][0-9]+" s "")))))
-
-(define r6rs:symbol=?
-  (case-lambda
-   [(a b) (symbol=? a b)]
-   [(a b . rest) (and (symbol=? a b)
-                      (andmap (lambda (s)
-                                (symbol=? a s))
-                              rest))]))
-
-(define r6rs:boolean=?
-  (case-lambda
-   [(a b) (boolean=? a b)]
-   [(a b . rest) (and (boolean=? a b)
-                      (andmap (lambda (s)
-                                (boolean=? a s))
-                              rest))]))
-
-(define-syntax-rule (make-mapper what for for-each in-val val-length val->list list->result)
-  (case-lambda
-   [(proc val) (list->result
-                (for ([c (in-val val)])
-                  (proc c)))]
-   [(proc val1 val2) 
-    (if (= (val-length val1)
-           (val-length val2))
-        (list->result
-         (for ([c1 (in-val val1)]
-               [c2 (in-val val2)])
-           (proc c1 c2)))
-        (error 'val-for-each "~as have different lengths: ~e and: ~e"
-               what
-               val1 val2))]
-   [(proc val1 . vals)
-    (let ([len (val-length val1)])
-      (for-each (lambda (s)
-                  (unless (= (val-length s) len)
-                    (error 'val-for-each "~a have different lengths: ~e and: ~e"
-                           what
-                           val1 s)))
-                vals)
-      (list->result
-       (apply for-each
-              proc 
-              (val->list val1)
-              (map val->list vals))))]))
-
-(define string-for-each
-  (make-mapper "string" for for-each in-string string-length string->list void))
-
-(define vector-for-each
-  (make-mapper "vector" for for-each in-vector vector-length vector->list void))
-
-(define vector-map
-  (make-mapper "vector" for/list map in-vector vector-length vector->list list->vector))
-
-(define (add-irritants msg irritants)
-  (if (null? irritants)
-      msg
-      (apply
-       string-append
-       msg
-       "\n irritants:"
-       (map (lambda (s)
-              (format "\n  ~e" s))
-            irritants))))
-
-(define (r6rs:error who msg . irritants)
-  (raise
-   (make-exn:fail:r6rs
-    (add-irritants
-     (if who
-         (format "~a: ~a" who msg)
-         msg)
-     irritants)
-    (current-continuation-marks)
-    msg
-    who
-    irritants)))
-
-(define (assertion-violation who msg . irritants)
-  (raise
-   (make-exn:fail:contract:r6rs
-    (add-irritants
-     (if who
-         (format "~a: ~a" who msg)
-         msg)
-     irritants)
-    (current-continuation-marks)
-    msg
-    who
-    irritants)))
-
-(define-syntax-rule (assert expr)
-  (unless expr
-    (assertion-violation #f "assertion failed")))
-
-;; ----------------------------------------
-;; quasiquote generalization
-
-(define-generalized-qq r6rs:quasiquote 
-  r5rs:quasiquote unquote unquote-splicing values)
-
-;; ----------------------------------------
-;; letrec
-;;   Need bindings like R5RS, but int-def body like Racket
-
-(define-syntax (r6rs:letrec stx)
-  (syntax-case stx (r6rs:lambda)
-    [(_ ([id (r6rs:lambda . rest)] ...) . body)
-     #'(letrec ([id (r6rs:lambda . rest)] ...) (let () (#%stratified-body . body)))]
-    [(_ bindings . body)
-     #'(r5rs:letrec bindings (let () (#%stratified-body . body)))]))
-
-(define-syntax-rule (r6rs:letrec* bindings . body)
-  (letrec bindings (#%stratified-body . body)))
-
-;; ----------------------------------------
-;; let[*]-values
-
-(define-syntax (r6rs:let-values stx)
-  #`(letX-values let-values #,stx))
-
-(define-syntax (r6rs:let*-values stx)
-  #`(letX-values let*-values #,stx))
-
-(define-syntax (letX-values stx)
-  (syntax-case stx ()
-    [(_ dest:let-values orig)
-     (let ([orig #'orig])
-       (syntax-case orig ()
-         [(_ ([formals expr] ...) body0 body ...)
-          (with-syntax ([bindings
-                         (map (lambda (formals expr)
-                                (if (syntax->list formals)
-                                    (list formals expr)
-                                    (let ([ids (let loop ([formals formals])
-                                                 (cond
-                                                  [(identifier? formals)
-                                                   (list formals)]
-                                                  [(and (syntax? formals)
-                                                        (pair? (syntax-e formals)))
-                                                   (loop (syntax-e formals))]
-                                                  [(pair? formals)
-                                                   (unless (identifier? (car formals))
-                                                     (raise-syntax-error
-                                                      #f
-                                                      "not an identifier for binding"
-                                                      orig
-                                                      (car formals)))
-                                                   (cons (car formals) (loop (cdr formals)))]
-                                                  [else
-                                                   (unless (identifier? (car formals))
-                                                     (raise-syntax-error
-                                                      #f
-                                                      "not an identifier for binding"
-                                                      orig
-                                                      formals))]))])
-                                      #`[#,ids
-                                         (call-with-values
-                                             (lambda () #,expr)
-                                           (r6rs:lambda #,formals
-                                             (values . #,ids)))])))
-                              (syntax->list #'(formals ...))
-                              (syntax->list #'(expr ...)))])
-            #'(dest:let-values bindings (#%stratified-body body0 body ...)))]))]))
-
-;; ----------------------------------------
-;; lambda & define
-;;   Need rest-arg conversion like R5RS, but int-def handlign like Racket
-
-(define-syntax (r6rs:lambda stx)
-  (syntax-case stx ()
-    [(_ (id ...) . body)
-     (andmap identifier? (syntax->list #'(id ...)))
-     (syntax/loc stx (lambda (id ...) (#%stratified-body . body)))]
-    [(_ args . body)
-     (syntax/loc stx (r5rs:lambda args (let () (#%stratified-body . body))))]))
-
-(define-for-syntax (check-label id orig-stx def)
-  ;; This test shouldn't be needed, and it interferes
-  ;;  with macro-introduced bindings:
-  #;
-  (when (eq? 'module (syntax-local-context))
-    (when (identifier-binding id #f)
-      (raise-syntax-error
-       #f
-       "cannot define imported identifier"
-       orig-stx
-       id)))
-  def)
-
-(define-syntax (r6rs:define stx)
-  (syntax-case stx ()
-    [(_ id) 
-     (identifier? #'id)
-     (check-label #'id stx (syntax/loc stx (define id (void))))]
-    [(_ (name . args) . body)
-     (check-label #'name
-                  stx
-                  (syntax/loc stx (r5rs:define (name . args) (let () (#%stratified-body . body)))))]
-    [(_ . rest) #'(define . rest)]))
-
-;; ----------------------------------------
-;; define-syntax: wrap a transformer to
-;;  ensure that the result of an expansion is
-;;  a wrapped syntax object.
-
-(define-syntax (r6rs:define-syntax stx)
-  (syntax-case stx ()
-    [(_ id expr)
-     (identifier? #'id)
-     (check-label #'id
-                  stx
-                  (syntax/loc stx
-                    (define-syntax id (wrap-as-needed expr))))]))
-
-(define-for-syntax (wrap-as-needed v)
-  (cond
-   [(and (procedure? v)
-         (procedure-arity-includes? v 1))
-    (procedure-reduce-arity
-     (case-lambda 
-      [(stx) (if (syntax? stx)
-                 (let ([r (v stx)])
-                   (wrap r stx stx #t))
-                 (v stx))]
-      [args (apply v args)])
-     (procedure-arity v))]
-   [(set!-transformer? v)
-    (make-set!-transformer (wrap-as-needed (set!-transformer-procedure v)))]
-   [else v]))
-
-;; ----------------------------------------
-
-;; let[rec]-syntax needs to be splicing, and it needs the
-;; same transformer wrapper as in `define-syntax'
-
-(define-syntax (r6rs:let-syntax stx)
-  (syntax-case stx ()
-    [(_ ([id expr] ...) body ...)
-     (syntax/loc stx
-       (splicing-let-syntax ([id (wrap-as-needed expr)] ...) body ...))]))
-
-(define-syntax (r6rs:letrec-syntax stx)
-  (syntax-case stx ()
-    [(_ ([id expr] ...) body ...)
-     (syntax/loc stx
-       (splicing-letrec-syntax ([id (wrap-as-needed expr)] ...) body ...))]))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/bytevectors-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/bytevectors-6.rkt
deleted file mode 100644
index d3944e9380..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/bytevectors-6.rkt
+++ /dev/null
@@ -1,508 +0,0 @@
-#lang scheme/base
-
-(require rnrs/enums-6
-         scheme/mpair)
-
-(provide endianness
-         native-endianness
-         (rename-out [bytes? bytevector?]
-                     [bytes-length bytevector-length]
-                     [bytes=? bytevector=?]
-                     [bytes-copy bytevector-copy]
-                     [bytes-ref bytevector-u8-ref]
-                     [bytes-set! bytevector-u8-set!])
-         bytevector-copy!
-         bytevector->u8-list
-         u8-list->bytevector
-         make-bytevector 
-         bytevector-fill!
-         bytevector-s8-ref
-         bytevector-s8-set!
-
-         bytevector-u16-ref
-         bytevector-s16-ref
-         bytevector-u16-native-ref
-         bytevector-s16-native-ref
-         bytevector-u16-set!
-         bytevector-s16-set!
-         bytevector-u16-native-set!
-         bytevector-s16-native-set!
-
-         bytevector-u32-ref
-         bytevector-s32-ref
-         bytevector-u32-native-ref
-         bytevector-s32-native-ref
-         bytevector-u32-set!
-         bytevector-s32-set!
-         bytevector-u32-native-set!
-         bytevector-s32-native-set!
-
-         bytevector-u64-ref
-         bytevector-s64-ref
-         bytevector-u64-native-ref
-         bytevector-s64-native-ref
-         bytevector-u64-set!
-         bytevector-s64-set!
-         bytevector-u64-native-set!
-         bytevector-s64-native-set!
-
-         bytevector-uint-ref
-         bytevector-sint-ref
-         bytevector-uint-set!
-         bytevector-sint-set!
-
-         bytevector-ieee-single-ref
-         bytevector-ieee-single-native-ref
-         bytevector-ieee-single-set!
-         bytevector-ieee-single-native-set!
-         bytevector-ieee-double-ref
-         bytevector-ieee-double-native-ref
-         bytevector-ieee-double-set!
-         bytevector-ieee-double-native-set!
-
-         bytevector->uint-list
-         bytevector->sint-list
-         uint-list->bytevector
-         sint-list->bytevector
-
-         string->utf8
-         string->utf16
-         string->utf32
-         utf8->string
-         utf16->string
-         utf32->string)
-
-(define-enumeration endianness (big little) endianness-set)
-
-(define (native-endianness)
-  (if (system-big-endian?)
-      (endianness big)
-      (endianness little)))
-
-(define (bytevector-copy! src src-start target target-start k)
-  (bytes-copy! target target-start src src-start (+ src-start k)))
-
-(define (bytevector->u8-list bv)
-  (list->mlist (bytes->list bv)))
-
-(define (u8-list->bytevector l)
-  (list->bytes (mlist->list l)))
-
-(define (make-bytevector k [fill 0])
-  (make-bytes k (convert-fill 'make-bytevector fill)))
-
-(define (convert-fill who fill)
-  (cond
-   [(byte? fill) fill]
-   [(and (exact-integer? fill)
-         (<= -128 fill -1))
-    (+ fill 256)]
-   [else (raise-type-error who
-                           "exact integer in [128, 255]"
-                           fill)]))
-
-
-(define (bytevector-fill! bytes [fill 0])
-  (bytes-fill! bytes (convert-fill 'bytevector-fill! fill)))
-
-;; ----------------------------------------
-
-(define (bytevector-s8-ref bytes k)
-  (let ([v (bytes-ref bytes k)])
-    (if (v . > . 127)
-        (- v 256)
-        v)))
-
-(define (bytevector-s8-set! bytes k v)
-  (bytes-set! bytes k (convert-fill 'bytevector-s8-set! v)))
-
-(define (check-endian endianness)
-  (unless (or (eq? endianness 'little)
-              (eq? endianness 'big))
-    (raise-type-error 'bytevector-operation "'big or 'little" endianness)))
-
-(define (make-integer-ops size)
-  (values
-   ;; uXX-ref
-   (lambda (bytes k endianness)
-     (check-endian endianness)
-     (integer-bytes->integer bytes #f (eq? endianness 'big) k (+ k size)))
-   ;; sXX-ref
-   (lambda (bytes k endianness)
-     (check-endian endianness)
-     (integer-bytes->integer bytes #t (eq? endianness 'big) k (+ k size)))
-   ;; uXX-native-ref
-   (lambda (bytes k)
-     (integer-bytes->integer bytes #f (system-big-endian?) k (+ k size)))
-   ;; sXX-native-ref
-   (lambda (bytes k)
-     (integer-bytes->integer bytes #t (system-big-endian?) k (+ k size)))
-   ;; uXX-set!
-   (lambda (bytes k n endianness)
-     (check-endian endianness)
-     (integer->integer-bytes n size #f (eq? endianness 'big) bytes k)
-     (void))
-   ;; sXX-set!
-   (lambda (bytes k n endianness)
-     (check-endian endianness)
-     (integer->integer-bytes n size #t (eq? endianness 'big) bytes k)
-     (void))
-   ;; uXX-native-set!
-   (lambda (bytes k n)
-     (integer->integer-bytes n size #f (system-big-endian?) bytes k)
-     (void))
-   ;; sXX-native-set!
-   (lambda (bytes k n)
-     (integer->integer-bytes n size #t (system-big-endian?) bytes k)
-     (void))))
-
-(define-values (bytevector-u16-ref
-                bytevector-s16-ref
-                bytevector-u16-native-ref
-                bytevector-s16-native-ref
-                bytevector-u16-set!
-                bytevector-s16-set!
-                bytevector-u16-native-set!
-                bytevector-s16-native-set!)
-  (make-integer-ops 2))
-
-(define-values (bytevector-u32-ref
-                bytevector-s32-ref
-                bytevector-u32-native-ref
-                bytevector-s32-native-ref
-                bytevector-u32-set!
-                bytevector-s32-set!
-                bytevector-u32-native-set!
-                bytevector-s32-native-set!)
-  (make-integer-ops 4))
-   
-(define-values (bytevector-u64-ref
-                bytevector-s64-ref
-                bytevector-u64-native-ref
-                bytevector-s64-native-ref
-                bytevector-u64-set!
-                bytevector-s64-set!
-                bytevector-u64-native-set!
-                bytevector-s64-native-set!)
-  (make-integer-ops 8))
-
-(define (check-offset size k)
-  (unless (and (exact-nonnegative-integer? k)
-               (zero? (bitwise-and (sub1 size) k)))
-    (raise-type-error 'bytevector-operation 
-                      (format "exact nonnegative integer multiple of ~a" size)
-                      k)))
-
-(define (make-ieee-ops size)
-  (values
-   ;; -ref
-   (lambda (bytes k endianness)
-     (check-endian endianness)
-     (floating-point-bytes->real bytes (eq? endianness 'big) k (+ k size)))
-   ;; -native-ref
-   (lambda (bytes k)
-     (check-offset size k)
-     (floating-point-bytes->real bytes (system-big-endian?) k (+ k size)))
-   ;; -set!
-   (lambda (bytes k n endianness)
-     (check-endian endianness)
-     (real->floating-point-bytes n size (eq? endianness 'big) bytes k))
-   ;; -native-set!
-   (lambda (bytes k n)
-     (check-offset size k)
-     (real->floating-point-bytes n size (system-big-endian?) bytes k)
-     (void))))
-
-(define-values (bytevector-ieee-single-ref
-                bytevector-ieee-single-native-ref
-                bytevector-ieee-single-set!
-                bytevector-ieee-single-native-set!)
-  (make-ieee-ops 4))
-
-(define-values (bytevector-ieee-double-ref
-                bytevector-ieee-double-native-ref
-                bytevector-ieee-double-set!
-                bytevector-ieee-double-native-set!)
-  (make-ieee-ops 8))
-
-;; ----------------------------------------
-
-(define (bytevector-int-ref who bstr k endianness size)
-  (unless (bytes? bstr)
-    (raise-type-error who "bytevector" bstr))
-  (unless (exact-nonnegative-integer? k)
-    (raise-type-error who "exact nonnegative integer" k))
-  (check-endian endianness)
-  (unless (exact-positive-integer? size)
-    (raise-type-error who "exact positive integer" size))
-  (unless (<= (+ k size) (bytes-length bstr))
-    (error who "specified range [~a, ~a) beyond string range [0, ~a)"
-           k (+ k size) (bytes-length bstr)))
-  (for/fold ([r 0])
-      ([i (in-range size)])
-    (+ (arithmetic-shift r 8)
-       (bytes-ref bstr (+ (if (eq? endianness 'big)
-                              i 
-                              (- size i 1))
-                          k)))))
-
-(define (bytevector-uint-ref bstr k endianness size)
-  (bytevector-int-ref 'bytevector-uint-ref bstr k endianness size))
-           
-(define (bytevector-sint-ref bstr k endianness size)
-  (let ([v (bytevector-int-ref 'bytevector-sint-ref bstr k endianness size)]
-        [max (sub1 (arithmetic-shift 1 (sub1 (* size 8))))])
-    (if (v . > . max)
-        (- v (* 2 (add1 max)))
-        v)))
-
-
-(define (bytevector-int-set! who bstr k n orig-n endianness size bit-size)
-  (unless (bytes? bstr)
-    (raise-type-error who "bytevector" bstr))
-  (unless (exact-nonnegative-integer? k)
-    (raise-type-error who "exact nonnegative integer" k))
-  (check-endian endianness)
-  (unless (exact-positive-integer? size)
-    (raise-type-error who "exact positive integer" size))
-  (unless (<= (+ k size) (bytes-length bstr))
-    (error who "specified target range [~a, ~a) beyond string range [0, ~a)"
-           k (+ k size) (bytes-length bstr)))
-  (unless ((integer-length orig-n) . <= . bit-size)
-    (error who "integer does not fit into ~a bytes: ~e"
-           size orig-n))
-  (for/fold ([n n])
-      ([i (in-range size)])
-    (bytes-set! bstr (+ (if (eq? endianness 'little)
-                            i 
-                            (- size i 1))
-                        k)
-                (bitwise-and n 255))
-    (arithmetic-shift n -8))
-  (void))
-
-(define (bytevector-uint-set! bstr k n endianness size)
-  (unless (exact-nonnegative-integer? n)
-    (raise-type-error 'bytevector-uint-set! "exact nonnegative integer" n))
-  (bytevector-int-set! 'bytevector-uint-set! bstr k n n endianness size (* size 8)))
-
-(define (bytevector-sint-set! bstr k n endianness size)
-  (let ([pos-n (if (negative? n)
-                   (+ n (arithmetic-shift 1 (* 8 size)))
-                   n)])
-    (bytevector-int-set! 'bytevector-sint-set! bstr k pos-n n endianness size (sub1 (* size 8)))))
-
-(define (bytevector->int-list who ref bv endianness size)
-  (unless (bytes? bv)
-    (raise-type-error who "bytevector" bv))
-  (check-endian endianness)
-  (unless (exact-positive-integer? size)
-    (raise-type-error who "exact positive integer" size))
-  (unless (zero? (modulo (bytes-length bv) size))
-    (raise-mismatch-error who "bytevector length is not a mulitple of given size: " size))
-  (list->mlist
-   (for/list ([k (in-range 0 (bytes-length bv) size)])
-     (ref bv k endianness size))))
-
-(define (bytevector->uint-list bv endianness size)
-  (bytevector->int-list 'bytevector->uint-list bytevector-uint-ref bv endianness size))
-
-(define (bytevector->sint-list bv endianness size)
-  (bytevector->int-list 'bytevector->sint-list bytevector-sint-ref bv endianness size))
-
-(define (int-list->bytevector who signed? set l endianness size)
-  (unless (mlist? l)
-    (raise-type-error who "list" l))
-  (check-endian endianness)
-  (unless (exact-positive-integer? size)
-    (raise-type-error who "exact positive integer" size))
-  (let* ([l (mlist->list l)]
-         [len (length l)]
-         [bv (make-bytes (* size len))])
-    (for ([v (in-list l)]
-          [k (in-naturals)])
-      (set bv (* k size) v endianness size))
-    bv))
-
-(define (uint-list->bytevector l endianness size)
-  (int-list->bytevector 'uint-list->bytevector #f bytevector-uint-set! l endianness size))
-
-(define (sint-list->bytevector l endianness size)
-  (int-list->bytevector 'sint-list->bytevector #f bytevector-sint-set! l endianness size))
-
-;; ----------------------------------------
-
-(define (string->utf8 str)
-  (string->bytes/utf-8 str))
-
-(define (string->utf16 str [endianness 'big])
-  (check-endian endianness)
-  (let ([big? (eq? endianness 'big)])
-    (let loop ([pos (string-length str)]
-               [accum null])
-      (if (zero? pos)
-          (list->bytes accum)
-          (let* ([pos (sub1 pos)]
-                 [c (string-ref str pos)]
-                 [v (char->integer c)])
-            (if (v . >= . #x10000)
-                (let ([v2 (- v #x10000)])
-                  (let-values ([(a b c d)
-                                (values (bitwise-ior #xD8
-                                                     (arithmetic-shift v2 -18))
-                                        (bitwise-and #xFF
-                                                     (arithmetic-shift v2 -10))
-                                        (bitwise-ior #xDC
-                                                     (bitwise-and #x3
-                                                                  (arithmetic-shift v2 -8)))
-                                        (bitwise-and v2 #xFF))])
-                    (if big?
-                        (loop pos (list* a b c d accum))
-                        (loop pos (list* b a d c accum)))))
-                (let-values ([(hi lo)
-                              (values (arithmetic-shift v -8)
-                                      (bitwise-and v 255))])
-                  (if big?
-                      (loop pos (list* hi lo accum))
-                      (loop pos (list* lo hi accum))))))))))
-
-(define (string->utf32 str [endianness 'big])
-  (check-endian endianness)
-  (let ([bstr (make-bytes (* 4 (string-length str)))]
-        [big? (eq? endianness 'big)])
-    (for ([c (in-string str)]
-          [i (in-naturals)])
-      (let* ([v (char->integer c)]
-             [a (arithmetic-shift v -24)]
-             [b (bitwise-and #xFF (arithmetic-shift v -16))]
-             [c (bitwise-and #xFF (arithmetic-shift v -8))]
-             [d (bitwise-and #xFF v)]
-             [pos (* i 4)])
-        (if big?
-            (begin
-              (bytes-set! bstr pos a)
-              (bytes-set! bstr (+ 1 pos) b)
-              (bytes-set! bstr (+ 2 pos) c)
-              (bytes-set! bstr (+ 3 pos) d))
-            (begin
-              (bytes-set! bstr pos d)
-              (bytes-set! bstr (+ 1 pos) c)
-              (bytes-set! bstr (+ 2 pos) b)
-              (bytes-set! bstr (+ 3 pos) a)))))
-    bstr))
-
-(define (utf8->string bstr)
-  (bytes->string/utf-8 bstr #\uFFFD))
-
-(define (utf16->string bstr endianness [skip-bom? #f])
-  ;; This version skips a two bytes for decoding errors,
-  ;; except those that correspond to a trailing single byte.
-  (check-endian endianness)
-  (let ([len (bytes-length bstr)])
-    (let-values ([(big? offset)
-                  (cond
-                   [skip-bom?
-                    (values (eq? endianness 'big) 0)]
-                   [(len . >= . 2)
-                    (cond
-                     [(and (eq? #xFE (bytes-ref bstr 0))
-                           (eq? #xFF (bytes-ref bstr 1)))
-                      (values #t 2)]
-                     [(and (eq? #xFF (bytes-ref bstr 0))
-                           (eq? #xFE (bytes-ref bstr 1)))
-                      (values #f 2)]
-                     [else (values (eq? endianness 'big) 0)])]
-                   [else (values (eq? endianness 'big) 0)])])
-      (list->string
-       (let loop ([pos offset])
-         (cond
-          [(= pos len) null]
-          [(= (add1 pos) len)
-           ;; decoding error
-           '(#\uFFFD)]
-          [else
-           (let ([a (bytes-ref bstr pos)]
-                 [b (bytes-ref bstr (add1 pos))])
-             (let ([a (if big? a b)]
-                   [b (if big? b a)])
-               (cond
-                [(= (bitwise-and a #xFC) #xD8)
-                 (if (len . < . (+ pos 4))
-                     ;; decoding error
-                     (cons #\uFFFD (loop (+ pos 2)))
-                     ;; Surrogate...
-                     (let ([c (bytes-ref bstr (+ pos 2))]
-                           [d (bytes-ref bstr (+ pos 3))])
-                       (let ([c (if big? c d)]
-                             [d (if big? d c)])
-                         (cond
-                          [(= (bitwise-and c #xFC) #xDC)
-                           ;; A valid surrogate
-                           (let ([v (+ #x10000
-                                       (bitwise-ior
-                                        (arithmetic-shift (bitwise-and #x3 a) 18)
-                                        (arithmetic-shift b 10)
-                                        (arithmetic-shift (bitwise-and #x3 c) 8)
-                                        d))])
-                             (cons (integer->char v) (loop (+ pos 4))))]
-                          [else
-                           ;; Invalid surrogate.
-                           (cons #\uFFFD (loop (+ pos 2)))]))))]
-                [(= (bitwise-and a #xFC) #xDC)
-                 ;; invalid surrogate code
-                 (cons #\uFFFD (loop (+ pos 2)))]
-                [else
-                 (let ([v (bitwise-ior (arithmetic-shift a 8)
-                                       b)])
-                   (cons (integer->char v)
-                         (loop (+ pos 2))))])))]))))))
-
-(define (utf32->string bstr endianness [skip-bom? #f])
-  ;; Skips 4 bytes for each dcoding error (except too-few-bytes-at-end
-  ;; errors, obviously).
-  (check-endian endianness)
-  (let ([len (bytes-length bstr)])
-    (let-values ([(big? offset)
-                  (cond
-                   [skip-bom?
-                    (values (eq? endianness 'big) 0)]
-                   [(len . >= . 4)
-                    (cond
-                     [(and (eq? #x00 (bytes-ref bstr 0))
-                           (eq? #x00 (bytes-ref bstr 1))
-                           (eq? #xFE (bytes-ref bstr 2))
-                           (eq? #xFF (bytes-ref bstr 3)))
-                      (values #t 4)]
-                     [(and (eq? #xFF (bytes-ref bstr 0))
-                           (eq? #xFE (bytes-ref bstr 1))
-                           (eq? #x00 (bytes-ref bstr 2))
-                           (eq? #x00 (bytes-ref bstr 3)))
-                      (values #f 4)]
-                     [else (values (eq? endianness 'big) 0)])]
-                   [else (values (eq? endianness 'big) 0)])])
-      (list->string
-       (let loop ([pos offset])
-         (cond
-          [(= pos len) null]
-          [((+ pos 4) . > . len)
-           ;; decoding error
-           '(#\uFFFD)]
-          [else
-           (let ([a (bytes-ref bstr pos)]
-                 [b (bytes-ref bstr (+ pos 1))]
-                 [c (bytes-ref bstr (+ pos 2))]
-                 [d (bytes-ref bstr (+ pos 3))])
-             (let ([a (if big? a d)]
-                   [b (if big? b c)]
-                   [c (if big? c b)]
-                   [d (if big? d a)])
-               (let ([v (bitwise-ior
-                         (arithmetic-shift a 24)
-                         (arithmetic-shift b 16)
-                         (arithmetic-shift c 8)
-                         d)])
-                 (if (or (and (v . >= . #xD800)
-                              (v . <= . #xDFFF))
-                         (v . > . #x10FFFF))
-                     (cons #\uFFFD (loop (+ pos 4)))
-                     (cons (integer->char v) (loop (+ pos 4)))))))]))))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/conditions-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/conditions-6.rkt
deleted file mode 100644
index f956cd0fec..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/conditions-6.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang scheme/base
-
-(require r6rs/private/conds)
-
-(provide &condition
-         condition?
-         condition
-         simple-conditions
-         condition-predicate
-         condition-accessor
-         define-condition-type
-
-         &message make-message-condition message-condition? condition-message
-         &warning make-warning warning?
-         &serious make-serious-condition serious-condition?
-         &error make-error error?
-         &violation make-violation violation?
-         &assertion make-assertion-violation assertion-violation?
-         &irritants make-irritants-condition irritants-condition? condition-irritants
-         &who make-who-condition who-condition? condition-who
-         &non-continuable make-non-continuable-violation non-continuable-violation?
-         &implementation-restriction make-implementation-restriction-violation implementation-restriction-violation?
-         &lexical make-lexical-violation lexical-violation?
-         &syntax make-syntax-violation syntax-violation? syntax-violation-form syntax-violation-subform
-         &undefined make-undefined-violation undefined-violation?)
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/control-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/control-6.rkt
deleted file mode 100644
index a87228971c..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/control-6.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang scheme/base
-
-(require (for-syntax scheme/base)
-         scheme/mpair)
-
-(provide when unless do 
-         (rename-out [r6rs:case-lambda case-lambda]))
-
-(define-syntax (r6rs:case-lambda stx)
-  (syntax-case stx ()
-    [(_ clause ...)
-     (quasisyntax/loc stx
-       (case-lambda
-        . #,(map (lambda (clause)
-                   (syntax-case clause ()
-                     [[formals body1 body ...]
-                      (syntax-case #'formals ()
-                        [(id ...)
-                         (andmap identifier? (syntax->list #'(id ...)))
-                         clause]
-                        [(id ... . rest)
-                         (and (identifier? #'rest)
-                              (andmap identifier? (syntax->list #'(id ...))))
-                         #`[formals 
-                            (let ([rest (list->mlist rest)])
-                              (#%stratified-body body1 body ...))]]
-                        [rest
-                         (identifier? #'rest)
-                         #`[formals 
-                            (let ([rest (list->mlist rest)])
-                              (#%stratified-body body1 body ...))]]
-                        [_
-                         (raise-syntax-error
-                          #f
-                          "ill-formed argument sequence"
-                          stx
-                          #'formals)])]
-                     [else
-                      (raise-syntax-error
-                       #f
-                       "ill-formed clause"
-                       stx
-                       clause)]))
-                 (syntax->list #'(clause ...)))))]))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/enums-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/enums-6.rkt
deleted file mode 100644
index d8d44fcc7d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/enums-6.rkt
+++ /dev/null
@@ -1,261 +0,0 @@
-#lang scheme/base
-
-(require scheme/mpair
-         rnrs/arithmetic/bitwise-6
-         (for-syntax scheme/base))
-
-(provide make-enumeration
-         enum-set-universe
-         enum-set-indexer
-         enum-set-constructor
-         enum-set->list
-         enum-set-member?
-         enum-set-subset?
-         enum-set=?
-         enum-set-union
-         enum-set-intersection
-         enum-set-difference
-         enum-set-complement
-         enum-set-projection
-         define-enumeration)
-
-(define-struct universe (ht syms))
-(define-struct enum-set (val uni))
-
-(define (make-enumeration-universe enum)
-  (let ([bad (lambda ()
-               (raise-type-error
-                'make-enumeration
-                "list of symbols"
-                enum))])
-    (unless (mlist? enum) (bad))
-    (let ([enum (mlist->list enum)])
-      (unless (andmap symbol? enum) (bad))
-      (let ([ht (make-hasheq)])
-        (make-universe
-         ht
-         (for/list ([s (in-list enum)]
-                    #:when (not (hash-ref ht s #f)))
-           (hash-set! ht s (arithmetic-shift 1 (hash-count ht)))
-           s))))))
-
-(define (make-enumeration enum)
-  (let ([uni (make-enumeration-universe enum)])
-    (make-enum-set (sub1 (arithmetic-shift 1 (hash-count (universe-ht uni))))
-                   uni)))
-
-(define (enum-set-universe enum)
-  (unless (enum-set? enum)
-    (raise-type-error 'enum-set-universe
-                      "enumeration set"
-                      enum))
-  (let ([uni (enum-set-uni enum)])
-    (make-enum-set (sub1 (arithmetic-shift 1 (hash-count 
-                                              (universe-ht uni))))
-                   uni)))
-
-(define (enum-set-indexer enum)
-  (unless (enum-set? enum)
-    (raise-type-error 'enum-set-indexer
-                      "enumeration set"
-                      enum))
-  (let ([ht (universe-ht (enum-set-uni enum))])
-    (lambda (sym)
-      (let ([v (hash-ref ht sym #f)])
-        (if v
-            (bitwise-first-bit-set v)
-            (if (symbol? sym)
-                #f
-                (error 'generated-enum-set-indexer
-                       "not a symbol: ~e"
-                       sym)))))))
-
-(define (enum-set-constructor enum)
-  (unless (enum-set? enum)
-    (raise-type-error 'enum-set-constructor
-                      "enumeration set"
-                      enum))
-  (let* ([uni (enum-set-uni enum)]
-         [ht (universe-ht uni)])
-    (lambda (orig-syms)
-      (let loop ([syms orig-syms][val 0])
-        (cond
-         [(null? syms) (make-enum-set val uni)]
-         [(not (mpair? syms))
-          (raise-type-error 'make-enum-set
-                            "list of symbols"
-                            orig-syms)]
-         [(hash-ref ht (mcar syms) #f)
-          => (lambda (n)
-               (loop (mcdr syms) (bitwise-ior val n)))]
-         [else
-          (error 'make-enum-set
-                 (if (symbol? (mcar syms))
-                     "symbol not in universe: ~e"
-                     "not a symbol: ~e")
-                 (mcar syms))])))))
-
-(define (enum-set->list enum)
-  (unless (enum-set? enum)
-    (raise-type-error 'enum-set->list
-                      "enumeration set"
-                      enum))
-  (let ([v (enum-set-val enum)])
-    (list->mlist
-     (for/list ([sym (in-list (universe-syms (enum-set-uni enum)))]
-                [i (in-naturals)]
-                #:when (not (zero? (bitwise-and (arithmetic-shift 1 i) v))))
-       sym))))
-
-(define (enum-set-member? sym enum)
-  (unless (symbol? sym)
-    (raise-type-error 'enum-set-member?
-                      "symbol"
-                      sym))
-  (unless (enum-set? enum)
-    (raise-type-error 'enum-set-member?
-                      "enumeration set"
-                      enum))
-  (let ([v (hash-ref (universe-ht (enum-set-uni enum)) sym #f)])
-    (and v
-         (not (zero? (bitwise-and v (enum-set-val enum)))))))
-
-(define (check-2-enums who enum1 enum2)
-  (unless (and (enum-set? enum1)
-               (enum-set? enum2))
-    (raise-type-error who
-                      "enumeration set"
-                      (if (enum-set? enum1)
-                          enum2
-                          enum1))))
-
-(define (enum-set-subset? enum1 enum2)
-  (check-2-enums 'enum-set-subset? enum1 enum2)
-  (if (eq? (enum-set-uni enum1) (enum-set-uni enum2))
-      (= (enum-set-val enum1) 
-         (bitwise-and (enum-set-val enum1) (enum-set-val enum2)))
-      (let ([ht2 (universe-ht (enum-set-uni enum2))]
-            [v1 (enum-set-val enum1)]
-            [v2 (enum-set-val enum2)])
-        (for/fold ([sub? #t])
-            ([(key1 val1) (in-hash (universe-ht (enum-set-uni enum1)))]
-             #:when sub?)
-          (let ([val2 (hash-ref ht2 key1 #f)])
-            (and val2
-                 (or (zero? (bitwise-and v1 val1))
-                     (not (zero? (bitwise-and v2 val2))))))))))
-
-(define (enum-set=? enum1 enum2)
-  (check-2-enums 'enum-set=? enum1 enum2)
-  (if (eq? (enum-set-uni enum1) (enum-set-uni enum2))
-      (= (enum-set-val enum1) (enum-set-val enum2))
-      (and (enum-set-subset? enum1 enum2)
-           (enum-set-subset? enum2 enum1))))
-
-(define (check-2-enums/same who enum1 enum2)
-  (check-2-enums who enum1 enum2)
-  (unless (eq? (enum-set-uni enum1)
-               (enum-set-uni enum2))
-    (error who
-           "enumeration sets are not the same enumeration type: ~e ~e"
-           enum1 enum2)))
-
-(define (enum-set-union enum1 enum2)
-  (check-2-enums/same 'enum-set-union enum1 enum2)
-  (make-enum-set (bitwise-ior (enum-set-val enum1)
-                              (enum-set-val enum2))
-                 (enum-set-uni enum1)))
-
-(define (enum-set-intersection enum1 enum2)
-  (check-2-enums/same 'enum-set-intersection enum1 enum2)
-  (make-enum-set (bitwise-and (enum-set-val enum1)
-                              (enum-set-val enum2))
-                 (enum-set-uni enum1)))
-
-(define (enum-set-difference enum1 enum2)
-  (check-2-enums/same 'enum-set-intersection enum1 enum2)
-  (make-enum-set (- (enum-set-val enum1)
-                    (bitwise-and (enum-set-val enum1)
-                                 (enum-set-val enum2)))
-                 (enum-set-uni enum1)))
-
-(define (enum-set-complement enum1)
-  (unless (enum-set? enum1)
-    (raise-type-error 'enum-set-complement
-                      "enumeration set"
-                      enum1))
-  (make-enum-set (bitwise-xor (sub1 (arithmetic-shift 
-                                     1 
-                                     (hash-count 
-                                      (universe-ht (enum-set-uni enum1)))))
-                              (enum-set-val enum1))
-                 (enum-set-uni enum1)))
-
-(define (enum-set-projection enum1 enum2)
-  (check-2-enums 'enum-set-projection enum1 enum2)
-  (let* ([uni2 (enum-set-uni enum2)]
-         [ht2 (universe-ht uni2)]
-         [v1 (enum-set-val enum1)]
-         [v2 (enum-set-val enum2)])
-    (make-enum-set
-     (for/fold ([val 0])
-         ([(key1 val1) (in-hash (universe-ht (enum-set-uni enum1)))])
-       (if (zero? (bitwise-and v1 val1))
-           val
-           (let ([val2 (hash-ref ht2 key1 #f)])
-             (if val2
-                 (bitwise-ior val val2)
-                 val))))
-     uni2)))
-  
-(define-syntax (define-enumeration stx)
-  (syntax-case stx ()
-    [(_ type-name (sym ...) constructor)
-     (let ([syms (syntax->list #'(sym ...))]
-           [ht (make-hasheq)])
-       (unless (identifier? #'type-name)
-         (raise-syntax-error #f
-                             "not an identifier for type name"
-                             stx
-                             #'type-name))
-       (for-each (lambda (sym)
-                   (unless (identifier? sym)
-                     (raise-syntax-error #f
-                                         "not an identifier (to be used as a symbol)"
-                                         stx
-                                         sym)))
-                 syms)
-       (unless (identifier? #'constructor)
-         (raise-syntax-error #f
-                             "not an identifier for type name"
-                             stx
-                             #'constructor))
-       (for ([s (in-list syms)])
-         (unless (hash-ref ht (syntax-e s) #f)
-           (hash-set! ht (syntax-e s)
-                      (arithmetic-shift 1 (hash-count ht)))))
-       (with-syntax ([(val ...)
-                      (map (lambda (s) (hash-ref ht (syntax-e s))) syms)])
-         #'(begin
-             (define enum-universe (make-enumeration-universe (mlist 'sym ...)))
-             (define-syntax (type-name stx)
-               (syntax-case* stx (sym ...) (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
-                 [(_ sym) #''sym]
-                 ...
-                 [(_ other)
-                  (identifier? #'other)
-                  (raise-syntax-error #f "not in enumeration" stx #'other)]))
-             (define-syntax (bit-value stx)
-               (syntax-case* stx (sym ...) (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
-                 [(_ orig sym) #'val]
-                 ...
-                 [(_ orig s)
-                  (raise-syntax-error #f "not in enumeration" #'orig #'s)]))
-             (...
-              (define-syntax (constructor stx)
-                (syntax-case stx ()
-                  [(_ s ...)
-                   (andmap identifier? (syntax->list #'(s ...)))
-                   (with-syntax ([orig stx])
-                     #'(make-enum-set (bitwise-ior (bit-value orig s) ...)
-                                      enum-universe))]))))))]))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/eval-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/eval-6.rkt
deleted file mode 100644
index 80336eb417..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/eval-6.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang scheme/base
-
-(require (only-in r6rs)
-         (only-in r6rs/private/prelims)
-         scheme/mpair
-         r6rs/private/parse-ref)
-
-(provide (rename-out [r6rs:eval eval])
-         environment)
-
-(define-namespace-anchor anchor)
-
-(define (mpair->pair p)
-  (cond
-   [(mpair? p) (cons (mpair->pair (mcar p))
-                     (mpair->pair (mcdr p)))]
-   [(vector? p) (list->vector
-                 (map mpair->pair
-                      (vector->list p)))]
-   [else p]))
-
-(define (show v)
-  (printf "~s\n" v)
-  v)
-
-(define (r6rs:eval expr env)
-  (eval (datum->syntax #f `(#%expression ,(mpair->pair expr))) env))
-
-(define (environment . specs)
-  (let ([reqs
-         (map (lambda (spec)
-                (syntax->datum
-                 (datum->syntax
-                  #f
-                  (parse-import
-                   #'here
-                   (mpair->pair spec)
-                   (lambda (msg orig stx)
-                     (error 'environment "~a: ~e" msg spec))))))
-              specs)])
-    (let ([ns (namespace-anchor->empty-namespace anchor)])
-      ;; Make sure all modules are instantiated here:
-      (parameterize ([current-namespace ns])
-        (namespace-require '(rename scheme/base #%base-require require))
-        (namespace-require '(only scheme/base #%expression))
-        (eval `(#%base-require r6rs/private/prelims 
-                               . ,(datum->syntax #'here (apply append reqs)))))
-      ns)))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/exceptions-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/exceptions-6.rkt
deleted file mode 100644
index ae6baa99ca..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/exceptions-6.rkt
+++ /dev/null
@@ -1,120 +0,0 @@
-#lang scheme/base
-
-(require r6rs/private/exns
-         (only-in r6rs/private/conds serious-condition? simple-conditions condition?)
-         (only-in rnrs/io/ports-6 standard-error-port))
-
-(provide with-exception-handler
-         guard else =>
-         (rename-out [r6rs:raise raise])
-         raise-continuable)
-
-(define-struct (exn:continuable exn:fail) (base continuation))
-
-(define (with-exception-handler proc thunk)
-  (unless (and (procedure? proc)
-               (procedure-arity-includes? proc 1))
-    (raise-type-error 'with-exception-handler "procedure (arity 1)" proc))
-  (unless (and (procedure? thunk)
-               (procedure-arity-includes? thunk 0))
-    (raise-type-error 'with-exception-handler "procedure (arity 0)" thunk))
-  (call-with-exception-handler
-   (lambda (exn)
-     (let/ec esc
-       (call-with-exception-handler
-        (lambda (new-exn) 
-          ;; Chain to enclosing handler by returning:
-          (esc new-exn))
-        (lambda () 
-          (call-with-values (lambda () (proc (if (exn:continuable? exn)
-                                                 (exn:continuable-base exn)
-                                                 exn)))
-            (if (continuable? exn)
-                (lambda args
-                  ((continuable-continuation exn) (lambda () (apply values args))))
-                (lambda args
-                  (make-exn:fail:contract:non-continuable
-                   (format "raise: when handling a non-continuable exception, exception handler returned~a"
-                          (if (null? args)
-                              " (no values)"
-                             (apply
-                              string-append
-                              ":"
-                              (let loop ([args args][n 10])
-                                (cond
-                                 [(null? args) null]
-                                 [(zero? n)
-                                  (list " ...")]
-                                 [else
-                                  (cons (format " ~e" (car args))
-                                        (loop (cdr args) (sub1 n)))])))))
-                   (current-continuation-marks)))))))))
-   thunk))
-
-(define (continuable? exn)
-  (or (exn:break? exn)
-      (exn:continuable? exn)))
-
-(define (continuable-continuation exn)
-  (if (exn:break? exn)
-      (exn:break-continuation exn)
-      (exn:continuable-continuation exn)))
-
-(define-syntax-rule (guard (id cond-clause ...) body0 body ...)
-  (with-handlers* ([(lambda (x) #t)
-                    (lambda (id)
-                      (let ([id (if (exn:continuable? id)
-                                    (exn:continuable-base id)
-                                    id)])
-                        (exn-cond id
-                         cond-clause ...)))])
-    body0 body ...))
-
-(define-syntax exn-cond
-  (syntax-rules (else)
-    [(_ id [else . rhs])
-     (cond [else . rhs])]
-    [(_ id clause . more)
-     (cond clause
-           [else (exn-cond id . more)])]
-    [(_ id)
-     (raise id)]))
-
-(define (r6rs:raise exn)
-  (parameterize ([uncaught-exception-handler
-                  ;; Simulate an initial exception handler that
-                  ;; behaves as specified in R6RS for non-&serious
-                  ;; exceptions:
-                  (let ([ueh (uncaught-exception-handler)])
-                    (lambda (exn)
-                      (let ([base (if (exn:continuable? exn)
-                                      (exn:continuable-base exn)
-                                      exn)])
-                        (if (serious-condition? base)
-                            (ueh base)
-                            ;; Not &serious, so try to "continue":
-                            (begin
-                              ((error-display-handler)
-                               (if (exn? base)
-                                   (exn-message base)
-                                   (format "uncaught exception: ~s"
-                                           base))
-                               base)
-                              ;; If it's continuable, then continue
-                              ;; by resuming the old continuation.
-                              ;; (Otherwise, let the a handler-
-                              ;; didn't-escape error get reported.)
-                              (when (exn:continuable? exn)
-                                ((exn:continuable-continuation exn) 
-                                 (lambda () (values)))))))))])
-    ;; No barrier:
-    (raise exn #f)))
-
-(define (raise-continuable exn)
-  ((let/cc cont
-     (r6rs:raise
-      (make-exn:continuable
-       (if (exn? exn) (exn-message exn) "continuable exception")
-       (if (exn? exn) (exn-continuation-marks exn) (current-continuation-marks))
-       exn
-       cont)))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/files-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/files-6.rkt
deleted file mode 100644
index 1541fd49f0..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/files-6.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scheme/base
-
-(provide file-exists?
-         delete-file)
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/hashtables-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/hashtables-6.rkt
deleted file mode 100644
index c137e596c8..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/hashtables-6.rkt
+++ /dev/null
@@ -1,162 +0,0 @@
-#lang scheme/base
-
-(require scheme/dict)
-
-(provide make-eq-hashtable
-         make-eqv-hashtable
-         (rename-out [r6rs:make-hashtable make-hashtable])
-         hashtable?
-         hashtable-size
-         hashtable-ref
-         hashtable-set!
-         hashtable-delete!
-         hashtable-contains?
-         hashtable-update!
-         hashtable-copy
-         hashtable-clear!
-         hashtable-keys
-         hashtable-entries
-         hashtable-equivalence-function
-         hashtable-hash-function
-         hashtable-mutable?
-         equal-hash
-         string-hash
-         string-ci-hash
-         symbol-hash)
-
-(define-struct hashtable ([ht #:mutable] 
-                          wrap
-                          unwrap
-                          mutable? 
-                          equivalence-function
-                          hash-function)
-  #:property prop:dict
-  (vector (case-lambda
-           [(ht key)
-            (hash-ref (hashtable-ht ht) ((hashtable-wrap ht) key))]
-           [(ht key default)
-            (hash-ref (hashtable-ht ht) ((hashtable-wrap ht) key) default)])
-          (lambda (ht key val) (hashtable-set! ht key val))
-          #f
-          (lambda (ht key) (hashtable-delete! ht key))
-          #f
-          (lambda (ht) (hashtable-size ht))
-          (lambda (ht) (hash-iterate-first (hashtable-ht ht)))
-          (lambda (ht pos) (hash-iterate-next (hashtable-ht ht) pos))
-          (lambda (ht pos) ((hashtable-unwrap ht)
-                            (hash-iterate-key (hashtable-ht ht) pos)))
-          (lambda (ht pos) (hash-iterate-value (hashtable-ht ht) pos))))
-
-(define-struct eqv-box (val)
-  #:property prop:equal+hash (list
-                              (lambda (a b recur) (eqv? (eqv-box-val a)
-                                                        (eqv-box-val b)))
-                              (lambda (v recur) (equal-hash-code (eqv-box-val v)))
-                              (lambda (v recur) (equal-secondary-hash-code (eqv-box-val v)))))
-                              
-
-(define (make-eq-hashtable [k 0])
-  (unless (exact-nonnegative-integer? k)
-    (raise-type-error 'make-eq-hashtable "exact, nonnegative integer" k))
-  (make-hashtable (make-hasheq) values values #t eq? #f))
-
-(define (make-eqv-hashtable [k 0])
-  (unless (exact-nonnegative-integer? k)
-    (raise-type-error 'make-eqv-hashtable "exact, nonnegative integer" k))
-  (make-hashtable (make-hash) make-eqv-box eqv-box-val #t eqv? #f))
-
-(define r6rs:make-hashtable
-  (let ([make-hashtable
-         (lambda (hash =? [k 0])
-           (unless (and (procedure? hash)
-                        (procedure-arity-includes? hash 1))
-             (raise-type-error 'make-hashtable "procedure (arity 1)" hash))
-           (unless (and (procedure? =?)
-                        (procedure-arity-includes? =? 2))
-             (raise-type-error 'make-hashtable "procedure (arity 2)" =?))
-           (unless (exact-nonnegative-integer? k)
-             (raise-type-error 'make-hashtable "exact, nonnegative integer" k))
-           (let ()
-             (define-struct hash-box (val)
-               #:property prop:equal+hash (list
-                                           (lambda (a b recur) (=? (hash-box-val a)
-                                                                   (hash-box-val b)))
-                                           (lambda (v recur) (hash (hash-box-val v)))
-                                           (lambda (v recur) 10001)))
-             (make-hashtable (make-hash) make-hash-box hash-box-val #t =? hash)))])
-    make-hashtable))
-
-(define (hashtable-size ht)
-  (hash-count (hashtable-ht ht)))
-
-(define tag (gensym))
-
-(define (hashtable-ref ht key default)
-  (let ([v (hash-ref (hashtable-ht ht) ((hashtable-wrap ht) key) tag)])
-    (if (eq? v tag)
-        default
-        v)))
-
-(define (hashtable-set! ht key val)
-  (if (hashtable-mutable? ht)
-      (hash-set! (hashtable-ht ht) ((hashtable-wrap ht) key) val)
-      (raise-type-error 'hashtable-set! "mutable hashtable" ht)))
-
-(define (hashtable-delete! ht key)
-  (if (hashtable-mutable? ht)
-      (hash-remove! (hashtable-ht ht) ((hashtable-wrap ht) key))
-      (raise-type-error 'hashtable-delete! "mutable hashtable" ht)))
-
-(define (hashtable-contains? ht key)
-  (not (eq? (hash-ref (hashtable-ht ht) ((hashtable-wrap ht) key) tag)
-            tag)))
-
-(define (hashtable-update! ht key proc default)
-  (if (hashtable-mutable? ht)
-      (hashtable-set! ht key (proc (hashtable-ref ht key default)))
-      (raise-type-error 'hashtable-update! "mutable hashtable" ht)))
-
-(define (hashtable-copy ht [mutable? #f])
-  (make-hashtable (hash-copy (hashtable-ht ht))
-                  (hashtable-wrap ht)
-                  (hashtable-unwrap ht)
-                  mutable?
-                  (hashtable-equivalence-function ht)
-                  (hashtable-hash-function ht)))
-
-(define (hashtable-clear! ht [k 0])
-  (unless (exact-nonnegative-integer? k)
-    (raise-type-error 'hashtable-clear! "exact, nonnegative integer" k))
-  (if (hashtable-mutable? ht)
-      (set-hashtable-ht! ht (if (eq? values (hashtable-wrap ht))
-                                (make-hasheq)
-                                (make-hash)))
-      (raise-type-error 'hashtable-clear! "mutable hashtable" ht)))
-
-(define (hashtable-keys ht)
-  (let ([unwrap (hashtable-unwrap ht)])
-    (list->vector (hash-map (hashtable-ht ht) (lambda (a b) (unwrap a))))))
-
-(define (hashtable-entries ht)
-  (let ([ps (hash-map (hashtable-ht ht) cons)]
-        [unwrap (hashtable-unwrap ht)])
-    (values (list->vector (map (lambda (p) (unwrap (car p))) ps))
-            (list->vector (map cdr ps)))))
-
-(define (equal-hash v)
-  (abs (equal-hash-code v)))
-
-(define (string-hash s)
-  (unless (string? s)
-    (raise-type-error 'string-hash "string" s))
-  (abs (equal-hash-code s)))
-
-(define (string-ci-hash s)
-  (unless (string? s)
-    (raise-type-error 'string-ci-hash "string" s))
-  (abs (equal-hash-code (string-foldcase s))))
-
-(define (symbol-hash s)
-  (unless (symbol? s)
-    (raise-type-error 'symbol-hash "symbol" s))
-  (abs (eq-hash-code s)))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/io/ports-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/io/ports-6.rkt
deleted file mode 100644
index eab55d3f07..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/io/ports-6.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scheme/base
-
-(require r6rs/private/ports)
-(provide (except-out (all-from-out r6rs/private/ports)
-                     r6rs-port->port))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/io/simple-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/io/simple-6.rkt
deleted file mode 100644
index 7328c1a115..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/io/simple-6.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang scheme/base
-
-(require (prefix-in r6rs: rnrs/io/ports-6))
-
-(provide (rename-out [r6rs:eof-object eof-object])
-         eof-object?
-         (rename-out [r6rs:call-with-input-file call-with-input-file]
-                     [r6rs:call-with-output-file call-with-output-file])
-         input-port?
-         output-port?
-         (rename-out [r6rs:current-input-port current-input-port]
-                     [r6rs:current-output-port current-output-port]
-                     [r6rs:current-error-port current-error-port]
-                     [r6rs:with-input-from-file with-input-from-file]
-                     [r6rs:with-output-to-file with-output-to-file]
-                     [r6rs:open-input-file open-input-file]
-                     [r6rs:open-output-file open-output-file])
-         close-input-port
-         close-output-port
-         (rename-out [r6rs:read-char read-char]
-                     [r6rs:peek-char peek-char]
-                     [r6rs:read read]
-                     [r6rs:write-char write-char]
-                     [r6rs:newline newline]
-                     [r6rs:display display]
-                     [r6rs:write write]))
-
-(define (r6rs:call-with-input-file file proc)
-  (r6rs:call-with-port
-   (r6rs:open-input-file file)
-   proc))
-
-(define (r6rs:call-with-output-file file proc)
-  (r6rs:call-with-port
-   (r6rs:open-output-file file)
-   proc))
-
-(define (r6rs:with-input-from-file file proc)
-  (let ([p (r6rs:open-input-file file)])
-    (begin0
-     (parameterize ([current-input-port p])
-       (proc))
-     (close-input-port p))))
-
-(define (r6rs:with-output-to-file file proc)
-  (let ([p (r6rs:open-output-file file)])
-    (begin0
-     (parameterize ([current-output-port p])
-       (proc))
-     (close-output-port p))))
-
-(define (r6rs:open-input-file file)
-  (r6rs:transcoded-port (r6rs:open-file-input-port file) (r6rs:native-transcoder)))
-
-(define (r6rs:open-output-file file)
-  (r6rs:transcoded-port (r6rs:open-file-output-port file) (r6rs:native-transcoder)))
-
-(define (r6rs:read-char [in (r6rs:current-input-port)])
-  (r6rs:get-char in))
-
-(define (r6rs:peek-char [in (r6rs:current-input-port)])
-  (r6rs:lookahead-char in))
-
-(define (r6rs:read [in (r6rs:current-input-port)])
-  (r6rs:get-datum in))
-
-(define (r6rs:write-char ch [out (r6rs:current-output-port)])
-  (r6rs:put-char out ch))
-
-(define (r6rs:newline [out (r6rs:current-output-port)])
-  (r6rs:put-char out #\newline))
-
-(define (r6rs:display v [out (r6rs:current-output-port)])
-  (unless (r6rs:textual-port? out)
-    (raise-type-error 'display "textual port" out))
-  ;; Should we make mpairs print with parens?
-  (display v out))
-
-(define (r6rs:write v [out (r6rs:current-output-port)])
-  (r6rs:put-datum out v))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/lists-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/lists-6.rkt
deleted file mode 100644
index fb99fa6ade..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/lists-6.rkt
+++ /dev/null
@@ -1,245 +0,0 @@
-#!r6rs
-
-;; implementation mostly from Mike Sperber
-; The (rnrs lists (6)) library.
-
-(library (rnrs lists (6))
-  (export find
-          for-all exists
- 
-          filter
-          partition
-          fold-left
-          fold-right
-          remp remove remv remq
-          memp member memv memq
-          assp assoc assv assq
-          cons*)
-  (import (rnrs base (6))
-          (rnrs control (6)))
-
-  (define (assert-procedure who obj)
-    (if (not (procedure? obj))
-        (assertion-violation who "not a procedure" obj)))
-
-  (define (find proc list)
-    (assert-procedure 'find proc)
-    (let loop ((list list))
-      (cond
-       ((null? list) #f)
-       ((proc (car list)) (car list))
-       (else (loop (cdr list))))))
-
-  (define (check-nulls who the-list the-lists lists)
-    (for-each (lambda (list)
-                (if (not (null? list))
-                    (apply assertion-violation who
-                           "argument lists don't have the same size"
-                           list lists)))
-              lists))
-
-  (define for-all 
-    (case-lambda
-     [(proc list)
-      (assert-procedure 'for-all proc)
-      (for-all1 proc list)]
-     [(proc list . lists)
-      (assert-procedure 'for-all proc)
-      (cond
-       ((null? list)
-        (check-nulls 'for-all list lists lists)
-        #t)
-       (else
-        (let loop ((list list) (lists lists))
-          (let ((next (cdr list)))
-            (cond
-             ((null? next)
-              (apply proc (car list) (map car lists))) 
-             ((apply proc (car list) (map car lists))
-              (loop next (map cdr lists)))
-             (else #f))))))]))
-
-  (define (for-all1 proc list)
-    (if (null? list)
-        #t
-        (let loop ((list list))
-          (let ((next (cdr list)))
-            (cond
-             ((null? next) (proc (car list))) 
-             ((proc (car list)) (loop next))
-             (else #f))))))
-
-  (define exists
-    (case-lambda
-     [(proc list)
-      (assert-procedure 'exists proc)
-      (exists1 proc list)]
-     [(proc list . lists)
-      (assert-procedure 'exists proc)
-      (cond
-       ((null? list)
-        (check-nulls 'exists list lists lists)
-        #f)
-       (else
-        (let loop ((list list) (lists lists))
-          (let ((next (cdr list)))
-            (if (null? next)
-                (apply proc (car list) (map car lists))
-                (or (apply proc (car list) (map car lists))
-                    (loop next (map cdr lists))))))))]))
-
-  (define (exists1 proc list)
-    (if (null? list)
-        #f
-        (let loop ((list list))
-          (let ((next (cdr list)))
-            (if (null? next)
-                (proc (car list))
-                (or (proc (car list))
-                    (loop next)))))))
-
-  (define (filter proc list)
-    (assert-procedure 'filter proc)
-    (let loop ((list list))
-      (cond ((null? list) '())
-            ((proc (car list))
-             (let ([r (loop (cdr list))])
-               (if (eq? r (cdr list))
-                   list
-                   (cons (car list) r))))
-            (else
-             (loop (cdr list))))))
-
-  (define (partition proc list)
-    (assert-procedure 'partition proc)
-    (let loop ((list list) (yes '()) (no '()))
-      (cond ((null? list)
-             (values (reverse yes) (reverse no)))
-            ((proc (car list))
-             (loop (cdr list) (cons (car list) yes) no))
-            (else
-             (loop (cdr list) yes (cons (car list) no))))))
-
-  (define (fold-left combine nil the-list . the-lists)
-    (assert-procedure 'fold-left combine)
-    (if (null? the-lists)
-        (fold-left1 combine nil the-list)
-        (let loop ((accum nil) (list the-list) (lists the-lists))
-          (if (null? list)
-              (begin
-                (check-nulls 'fold-left the-list the-lists lists)
-                accum)
-              (loop (apply combine accum (car list) (map car lists))
-                    (cdr list)
-                    (map cdr lists))))))
-
-  (define (fold-left1 combine nil list)
-    (let loop ((accum nil) (list list))
-      (if (null? list)
-          accum
-          (loop (combine accum (car list))
-                (cdr list)))))
-
-
-  (define (fold-right combine nil the-list . the-lists)
-    (assert-procedure 'fold-right combine)
-    (if (null? the-lists)
-        (fold-right1 combine nil the-list)
-        (let recur ((list the-list) (lists the-lists))
-          (if (null? list)
-              (begin
-                (check-nulls 'fold-right the-list the-lists lists)
-                nil)
-              (apply combine
-                     (car list)
-                     (append (map car lists)
-                             (cons (recur (cdr list) (map cdr lists))
-                                   '())))))))
-
-  (define (fold-right1 combine nil list)
-    (let recur ((list list))
-      (if (null? list)
-          nil
-          (combine (car list) (recur (cdr list))))))
-
-  (define (remp proc list)
-    (assert-procedure 'remp proc)
-    (let recur ((list list))
-      (cond ((null? list) '())
-            ((proc (car list))
-             (recur (cdr list)))
-            (else
-             (let ([r (recur (cdr list))])
-               (if (eq? r (cdr list))
-                   list
-                   (cons (car list) r)))))))
-
-  ;; Poor man's inliner
-  (define-syntax define-remove-like
-    (syntax-rules ()
-      ((define-remove-like ?name ?equal?)
-       (define (?name obj list)
-         (let recur ((list list))
-           (cond ((null? list) '())
-                 ((?equal? obj (car list))
-                  (recur (cdr list)))
-                 (else
-                  (let ([r (recur (cdr list))])
-                    (if (eq? r (cdr list))
-                        list
-                        (cons (car list) r))))))))))
-
-  (define-remove-like remove equal?)
-  (define-remove-like remv eqv?)
-  (define-remove-like remq eq?)
-
-  (define (memp proc list)
-    (assert-procedure 'member proc)
-    (let loop ((list list))
-      (cond ((null? list) #f)
-            ((proc (car list)) list)
-            (else (loop (cdr list))))))
-
-  (define-syntax define-member-like
-    (syntax-rules ()
-      ((define-member-like ?name ?equal?)
-       (define (?name obj list)
-         (let loop ((list list))
-           (cond ((null? list) #f)
-                 ((?equal? obj (car list)) list)
-                 (else (loop (cdr list)))))))))
-
-  (define-member-like member equal?)
-  (define-member-like memv eqv?)
-  (define-member-like memq eq?)
-
-  (define (assp proc alist)
-    (assert-procedure 'assp proc)
-    (let loop ((alist alist))
-      (if (null? alist)
-          #f
-          (let ((p (car alist)))
-            (if (proc (car p))
-                p
-                (loop (cdr alist)))))))
-
-  (define-syntax define-assoc-like
-    (syntax-rules ()
-      ((define-assoc-like ?name ?equal?)
-       (define (?name obj alist)
-         (let loop ((alist alist))
-           (if (null? alist)
-               #f
-               (let ((p (car alist)))
-                 (if (?equal? obj (car p))
-                     p
-                     (loop (cdr alist))))))))))
-
-  (define-assoc-like assoc equal?)
-  (define-assoc-like assq eq?)
-  (define-assoc-like assv eqv?)
-
-  (define (cons* obj . objs)
-    (if (null? objs)
-        obj
-        (cons obj (apply cons* objs)))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/main-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/main-6.rkt
deleted file mode 100644
index fe54042f84..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/main-6.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scheme/base
-
-(define-syntax re-export
-  (syntax-rules ()
-    [(_) (re-export rnrs/base-6
-                    rnrs/exceptions-6
-                    rnrs/programs-6
-                    rnrs/files-6
-                    rnrs/bytevectors-6
-                    rnrs/hashtables-6
-                    rnrs/sorting-6
-                    rnrs/syntax-case-6
-                    rnrs/conditions-6
-                    rnrs/unicode-6
-                    rnrs/control-6
-                    rnrs/lists-6
-                    rnrs/enums-6
-                    rnrs/arithmetic/bitwise-6
-                    rnrs/arithmetic/fixnums-6
-                    rnrs/arithmetic/flonums-6
-                    rnrs/io/ports-6
-                    rnrs/io/simple-6
-                    rnrs/records/inspection-6
-                    rnrs/records/syntactic-6
-                    rnrs/records/procedural-6)]
-    [(_ id) (begin
-              (require id
-                       ;; Shift any run time exports to for-syntax:
-                       (for-syntax (only-meta-in 0 id))
-                       ;; Shift any for-syntax exports for run time:
-                       (for-template (only-meta-in 1 id)))
-              (provide (all-from-out id)
-                       (for-template (all-from-out id))
-                       (for-syntax (all-from-out id))))]
-    [(_ id ...)
-     (begin (re-export id) ...)]))
-
-(re-export)
-
-;; Also need to export prelims for syntax, since there will
-;;  not be a for-syntax import when this module is imported:
-(require (for-syntax r6rs/private/prelims))
-(provide (for-syntax (all-from-out r6rs/private/prelims)))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/main.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/main.rkt
deleted file mode 100644
index b1e11082d8..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/main.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scheme/base
-
-(define-syntax-rule (bounce)
-  (begin
-    (require rnrs/main-6)
-    (provide (all-from-out rnrs/main-6))))
-(bounce)
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/mutable-pairs-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/mutable-pairs-6.rkt
deleted file mode 100644
index 41af02ff1d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/mutable-pairs-6.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scheme/base
-
-(require scheme/mpair)
-
-(provide (rename-out [set-mcdr! set-cdr!]
-                     [set-mcar! set-car!]))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/mutable-strings-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/mutable-strings-6.rkt
deleted file mode 100644
index 5994ad87ba..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/mutable-strings-6.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang scheme/base
-
-(provide string-set! string-fill!)
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/programs-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/programs-6.rkt
deleted file mode 100644
index fbc2554043..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/programs-6.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang scheme/base
-
-(require scheme/mpair)
-
-(provide command-line exit)
-
-(define (command-line)
-  (mcons (path->string (find-system-path 'run-file))
-         (list->mlist (vector->list (current-command-line-arguments)))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/r5rs-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/r5rs-6.rkt
deleted file mode 100644
index c5799de829..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/r5rs-6.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scheme/base
-
-(require (prefix-in r5rs: r5rs))
-
-(provide exact->inexact
-         inexact->exact
-         quotient
-         remainder
-         modulo
-         (rename-out [r5rs:delay delay]
-                     [r5rs:force force]
-                     [r5rs:null-environment null-environment]
-                     [r5rs:scheme-report-environment scheme-report-environment]))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/records/inspection-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/records/inspection-6.rkt
deleted file mode 100644
index 172657c7a6..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/records/inspection-6.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#!r6rs
-
-(library (rnrs records inspection (6))
-  (export record-type-name
-	  record-type-parent
-	  record-type-sealed?
-	  record-type-uid
-	  record-type-generative?
-	  record-type-field-names
-	  record-type-opaque?
-	  record-field-mutable?
-	  record? record-rtd)
-  (import (r6rs private records-core)))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/records/procedural-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/records/procedural-6.rkt
deleted file mode 100644
index b901cdf4fa..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/records/procedural-6.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#!r6rs
-
-(library (rnrs records procedural (6))
-  (export make-record-type-descriptor
-	  record-type-descriptor?
-	  make-record-constructor-descriptor record-constructor
-	  record-predicate
-	  record-accessor record-mutator)
-  (import (r6rs private records-core)))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/records/syntactic-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/records/syntactic-6.rkt
deleted file mode 100644
index 62d86616cf..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/records/syntactic-6.rkt
+++ /dev/null
@@ -1,346 +0,0 @@
-#!r6rs
-
-;; Implementation of implicit-naming layer for R6RS Records
-
-;; Based on the SRFI implementation:
-; Copyright (C) Michael Sperber (2005). All Rights Reserved. 
-; 
-; Permission is hereby granted, free of charge, to any person
-; obtaining a copy of this software and associated documentation files
-; (the "Software"), to deal in the Software without restriction,
-; including without limitation the rights to use, copy, modify, merge,
-; publish, distribute, sublicense, and/or sell copies of the Software,
-; and to permit persons to whom the Software is furnished to do so,
-; subject to the following conditions:
-; 
-; The above copyright notice and this permission notice shall be
-; included in all copies or substantial portions of the Software.
-; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
-
-(library (rnrs records syntactic (6))
-  (export define-record-type
-	  record-type-descriptor
-	  record-constructor-descriptor
-          fields mutable immutable parent parent-rtd protocol 
-          sealed opaque nongenerative)
-  (import (for (rnrs base (6)) run expand)
-          (for (rnrs syntax-case (6)) expand)
-	  (rename (r6rs private records-explicit)
-		  (define-record-type define-record-type/explicit)))
-
-  (define-syntax define-record-type
-    ;; Just check syntax, then send off to reference implementation
-    (lambda (stx)
-      (syntax-case stx ()
-        [(_ name-spec clause ...)
-         (with-syntax ([(name parts)
-                        (syntax-case #'name-spec ()
-                          [(name cname pname)
-                           (begin
-                             (if (not (identifier? #'name))
-                                 (syntax-violation #f
-                                                   "expected an identifier for the record type name"
-                                                   stx
-                                                   #'name))
-                             (if (not (identifier? #'cname))
-                                 (syntax-violation #f
-                                                   "expected an identifier for the record type constructor name"
-                                                   stx
-                                                   #'cname))
-                             (if (not (identifier? #'pname))
-                                 (syntax-violation #f
-                                                   "expected an identifier for the record type predicate name"
-                                                   stx
-                                                   #'pname))
-                             #'(name (name cname pname)))]
-                          [name
-                           (identifier? #'name)
-                           #'(name name)]
-                          [_
-                           (syntax-violation #f
-                                             (string-append
-                                              "expected either an identifier for the record type name"
-                                              " or a form (<name-id> <constructor-id> <predicate-id>)")
-                                             stx
-                                             #'name-spec)])])
-           (let* ([clauses #'(clause ...)]
-                  [extract (lambda (id)
-                             (let loop ([clauses clauses][found #f])
-                               (cond
-                                [(null? clauses) found]
-                                [(syntax-case (car clauses) ()
-                                   [(tag . body)
-                                    (free-identifier=? #'tag id)])
-                                 (if found
-                                     (syntax-violation #f
-                                                       (string-append "duplicate "
-                                                                      (symbol->string (syntax->datum id))
-                                                                      " clause")
-                                                       stx
-                                                       (car clauses))
-                                     (loop (cdr clauses) (car clauses)))]
-                                [else
-                                 (loop (cdr clauses) found)])))]
-                  [kws (with-syntax ([(kw ...)
-                                      #'(fields mutable immutable parent 
-                                                protocol sealed opaque nongenerative
-                                                parent-rtd)])
-                         #'(kw ...))])
-             (for-each (lambda (clause)
-                         (syntax-case clause ()
-                           [(id . _)
-                            (and (identifier? #'id)
-                                 (let loop ([kws kws])
-                                   (and (not (null? kws))
-                                        (or (free-identifier=? #'id (car kws))
-                                            (loop (cdr kws))))))
-                            'ok]
-                           [_
-                            (syntax-violation #f
-                                              (string-append
-                                               "expected a `mutable', `immutable', `parent',"
-                                               " `protocol', `sealed', `opaque', `nongenerative',"
-                                               " or `parent-rtd' clause")
-                                              stx
-                                              clause)]))
-                       clauses)
-             (if (and (extract #'parent) (extract #'parent-rtd))
-                 (syntax-violation #f
-                                   "cannot specify both `parent' and `parent-rtd'"
-                                   stx))
-             (syntax-case (extract #'fields) ()
-               [#f 'ok]
-               [(_ spec ...)
-                (for-each (lambda (spec)
-                            (syntax-case spec (immutable mutable)
-                              [(immutable id acc-id)
-                               (begin
-                                 (if (not (identifier? #'id))
-                                     (syntax-violation #f
-                                                       "expected a field-name identifier"
-                                                       spec
-                                                       #'id))
-                                 (if (not (identifier? #'acc-id))
-                                     (syntax-violation #f
-                                                       "expected a field-accessor identifier"
-                                                       spec
-                                                       #'acc-id)))]
-                              [(immutable id)
-                               (if (not (identifier? #'id))
-                                   (syntax-violation #f
-                                                     "expected a field-name identifier"
-                                                     spec
-                                                     #'id))]
-                              [(immutable . _)
-                               (syntax-violation #f
-                                                 "expected one or two identifiers"
-                                                 spec)]
-                              [(mutable id acc-id set-id)
-                               (begin
-                                 (if (not (identifier? #'id))
-                                     (syntax-violation #f
-                                                       "expected a field-name identifier"
-                                                       spec
-                                                       #'id))
-                                 (if (not (identifier? #'acc-id))
-                                     (syntax-violation #f
-                                                       "expected a field-accessor identifier"
-                                                       spec
-                                                       #'acc-id))
-                                 (if (not (identifier? #'set-id))
-                                     (syntax-violation #f
-                                                       "expected a field-mutator identifier"
-                                                       spec
-                                                       #'set-id)))]
-                              [(mutable id)
-                               (if (not (identifier? #'id))
-                                   (syntax-violation #f
-                                                     "expected a field-name identifier"
-                                                     spec
-                                                     #'id))]
-                              [(mutable . _)
-                               (syntax-violation #f
-                                                 "expected one or three identifiers"
-                                                 spec)]
-                              [id (identifier? #'id) 'ok]
-                              [_ (syntax-violation #f
-                                                   "expected an identifier, `immutable' form, or `mutable' form for field"
-                                                   stx
-                                                   spec)]))
-                          #'(spec ...))])
-
-             (let ([p (extract #'parent)])
-               (syntax-case p ()
-                 [#f 'ok]
-                 [(_ id) (identifier? #'id) 'ok]
-                 [_ (syntax-violation #f
-                                      "expected a single identifier for the parent record type"
-                                      p)]))
-
-             (let ([p (extract #'parent-rtd)])
-               (syntax-case p ()
-                 [#f 'ok]
-                 [(_ id cons-id) 'ok]
-                 [_ (syntax-violation #f
-                                      "expected two expressions for the parent record type and constructor"
-                                      p)]))
-
-             (syntax-case (extract #'protocol) ()
-               [#f 'ok]
-               [(_ expr) 'ok])
-
-             (syntax-case (extract #'sealed) ()
-               [#f 'ok]
-               [(_ #f) 'ok]
-               [(_ #t) 'ok])
-
-             (syntax-case (extract #'opaque) ()
-               [#f 'ok]
-               [(_ #f) 'ok]
-               [(_ #t) 'ok])
-
-             (syntax-case (extract #'nongenerative) ()
-               [#f 'ok]
-               [(_) 'ok]
-               [(_ id) (identifier? #'id) 'ok])
-
-             #'(define-record-type-1 name parts
-                 () clause ...)))])))
-
-  (define-syntax define-record-type-1
-    (syntax-rules (fields)
-
-      ;; find FIELDS clause
-      ((define-record-type-1 ?record-name ?record-name-spec
-	 (?simple-clause ...)
-	 (fields ?field-spec ...)
-	 ?clause ...)
-       (process-fields-clause (fields ?field-spec ...)
-			      ?record-name ?record-name-spec
-			      (?simple-clause ...)
-			      ?clause ...))
-
-      ;; collect all other clauses
-      ((define-record-type-1 ?record-name ?record-name-spec
-	 (?simple-clause ...)
-	 ?clause0
-	 ?clause ...)
-       (define-record-type-1 ?record-name ?record-name-spec
-	 (?simple-clause ... ?clause0)
-	 ?clause ...))
-
-      ;; pass it on
-      ((define-record-type-1 ?record-name ?record-name-spec
-	 (?simple-clause ...))
-
-       (define-record-type-2 ?record-name ?record-name-spec
-	 (?simple-clause ...)))))
-
-  ;; syntax-rules part
-
-  (define-syntax define-record-type-2
-    (lambda (form)
-      (syntax-case form ()
-	((_ ?record-name (?record-name-2 ?constructor-name ?predicate-name)
-	    (?simple-clause ...))
-
-	 (syntax
-	  (begin
-	    (define-record-type/explicit (?record-name ?constructor-name ?predicate-name)
-	      ?simple-clause ...))))
-
-	((_ ?record-name ?record-name-2
-	    (?simple-clause ...))
-
-	 (with-syntax ((?constructor-name
-			(datum->syntax (syntax ?record-name)
-					      (string->symbol
-					       (string-append "make-"
-							      (symbol->string
-							       (syntax->datum
-								(syntax ?record-name)))))))
-		       (?predicate-name
-			(datum->syntax (syntax ?record-name)
-					      (string->symbol
-					       (string-append (symbol->string
-							       (syntax->datum
-								(syntax ?record-name)))
-							      "?")))))
-	   
-	   
-	   (syntax
-	    (define-record-type-2 ?record-name (?record-name ?constructor-name ?predicate-name)
-	      (?simple-clause ...))))))))
-
-  (define-syntax process-fields-clause
-    (lambda (form)
-      (syntax-case form (fields mutable immutable)
-	((_ (fields ?field-clause ...)
-	    ?record-name ?record-name-spec
-	    (?simple-clause ...)
-	    ?clause ...)
-
-	 (let ((record-name (symbol->string (syntax->datum (syntax ?record-name)))))
-	   (with-syntax
-	       (((?simple-field ...)
-		 (map (lambda (clause)
-			(syntax-case clause (mutable immutable)
-			  ((immutable ?field-name)
-			   (with-syntax ((?accessor-name
-					  (datum->syntax
-					   (syntax ?field-name)
-					   (string->symbol
-					    (string-append record-name "-"
-							   (symbol->string
-							    (syntax->datum
-							     (syntax ?field-name))))))))
-			     (syntax
-			      (immutable ?field-name ?accessor-name))))
-			  ((mutable ?field-name)
-			   (with-syntax ((?accessor-name
-					  (datum->syntax
-					   (syntax ?field-name)
-					   (string->symbol
-					    (string-append record-name "-"
-							   (symbol->string
-							    (syntax->datum
-							     (syntax ?field-name)))))))
-					 (?mutator-name
-					  (datum->syntax
-					   (syntax ?field-name)
-					   (string->symbol
-					    (string-append record-name "-"
-							   (symbol->string
-							    (syntax->datum
-							     (syntax ?field-name)))
-							   "-set!")))))
-			     (syntax
-			      (mutable ?field-name ?accessor-name ?mutator-name))))
-                          (?field-name
-                           (identifier? (syntax ?field-name))
-                           (with-syntax ((?accessor-name
-					  (datum->syntax
-					   (syntax ?field-name)
-					   (string->symbol
-					    (string-append record-name "-"
-							   (symbol->string
-							    (syntax->datum
-							     (syntax ?field-name))))))))
-			     (syntax
-			      (immutable ?field-name ?accessor-name))))
-			  (?clause
-			   clause)))
-		      (syntax (?field-clause ...)))))
-	     (syntax
-	      (define-record-type-1 
-		?record-name ?record-name-spec
-		(?simple-clause ... (fields ?simple-field ...))
-		?clause ...)))))))))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/sorting-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/sorting-6.rkt
deleted file mode 100644
index 02e5ec6bbc..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/sorting-6.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scheme/base
-
-(require scheme/mpair)
-
-(provide list-sort
-         vector-sort
-         vector-sort!)
-
-(define (list-sort < l)
-  ;; FIXME (performance): `sort' internally converts 
-  ;; a list to an mlist!
-  (list->mlist (sort (mlist->list l) <)))
-
-(define (vector-sort < v)
-  (list->vector (sort (vector->list v) <)))
-
-(define (vector-sort! < v)
-  (let ([v2 (vector-sort < v)])
-    (vector-copy! v 0 v2)))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/syntax-case-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/syntax-case-6.rkt
deleted file mode 100644
index f6825fb4c0..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/syntax-case-6.rkt
+++ /dev/null
@@ -1,379 +0,0 @@
-#lang scheme/base
-
-(require (for-syntax scheme/base)
-         r6rs/private/qq-gen
-         r6rs/private/reconstruct
-         scheme/mpair
-         r6rs/private/exns
-         (for-syntax syntax/template
-                     r6rs/private/check-pattern)
-         (for-template (only-in scheme/base set!)
-                       r6rs/private/no-set))
-
-(provide make-variable-transformer
-         (rename-out [r6rs:syntax-case syntax-case]
-                     [r6rs:syntax syntax])
-         _ ...
-         identifier?
-         bound-identifier=?
-         (rename-out [r6rs:free-identifier=? free-identifier=?]
-                     [r6rs:datum->syntax datum->syntax]
-                     [r6rs:syntax->datum syntax->datum]
-                     [r6rs:generate-temporaries generate-temporaries]
-                     [r6rs:with-syntax with-syntax]
-                     [r6rs:quasisyntax quasisyntax])
-         unsyntax unsyntax-splicing
-         syntax-violation)
-
-(define syntax-violation 
-  (let ([go (lambda (who message form subforms)
-              (let ([exn (with-handlers ([exn:fail:syntax? (lambda (x) x)])
-                           (apply raise-syntax-error 
-                                  (if (string? who)
-                                      (string->symbol who)
-                                      who)
-                                  message
-                                  (convert-mpairs form)
-                                  (map convert-mpairs subforms)))])
-                (raise
-                 (make-exn:fail:syntax:r6rs
-                  (exn-message exn)
-                  (exn-continuation-marks exn)
-                  (exn:fail:syntax-exprs exn)
-                  message
-                  (or who
-                      (cond
-                       [(identifier? form) (syntax-e form)]
-                       [(and (pair? form) (identifier? (car form)))
-                        (syntax-e (car form))]
-                       [(and (syntax? form) (pair? (syntax-e form))
-                             (identifier? (car (syntax-e form))))
-                        (syntax-e (car (syntax-e form)))]
-                       [else #f]))
-                  form
-                  (and (pair? subforms) (car subforms))))))])
-    (case-lambda
-     [(who message form subform)
-      (go who message form (list subform))]
-     [(who message form)
-      (go who message form null)])))
-
-(define (r6rs:free-identifier=? a b)
-  (free-identifier=? a b))
-
-(define (r6rs:datum->syntax id datum)
-  (unless (identifier? id)
-    (raise-type-error 'datum->syntax "identifier?" id))
-  (let loop ([d datum])
-    (cond
-     [(syntax? d) (raise-type-error
-                   'datum->syntax
-                   "datum"
-                   datum)]
-     [(pair? d) (loop (car d)) (loop (cdr d))]
-     [(mpair? d) (loop (mcar d)) (loop (mcdr d))]
-     [(vector? d) (for-each loop (vector->list d))]))
-  (datum->syntax id (convert-mpairs datum)))
-
-(define (r6rs:syntax->datum orig-stx)
-  (let loop ([stx orig-stx])
-    (cond
-     [(syntax? stx)
-      (convert-pairs (syntax->datum stx))]
-     [(mpair? stx) (mcons (loop (mcar stx))
-                          (loop (mcdr stx)))]
-     [(vector? stx) (list->vector
-                     (map loop (vector->list stx)))]
-     [(symbol? stx) (raise-type-error 
-                     'syntax->datum 
-                     (format "syntax (symbol '~s disallowed)" stx)
-                     orig-stx)]
-     [else stx])))
-
-(define (r6rs:generate-temporaries l)
-  (list->mlist
-   (generate-temporaries (let loop ([l l])
-                           (cond
-                            [(null? l) null]
-                            [(mpair? l) (cons (mcar l)
-                                              (loop (mcdr l)))]
-                            [(syntax? l) (loop (syntax-e l))]
-                            [(pair? l) (cons (car l)
-                                             (loop (cdr l)))]
-                            [else
-                             (raise-type-error
-                              'generate-temporaries
-                              "list or list-structured syntax object"
-                              l)])))))
-
-(define (make-variable-transformer proc)
-  (make-set!-transformer
-   (lambda (stx)
-     (syntax-case* stx (set!) free-template-identifier=?
-       [(set! . rest)
-        (proc (syntax/loc stx (r6rs:set! . rest)))]
-       [else (proc stx)]))))
-
-(define unwrapped-tag (gensym))
-(define unwrapped-srcloc (list unwrapped-tag #f #f #f #f))
-
-(define (convert-mpairs expr)
-  (cond
-   [(mpair? expr)
-    (cons (convert-mpairs (mcar expr))
-          (convert-mpairs (mcdr expr)))]
-   [(vector? expr)
-    (list->vector (map convert-mpairs (vector->list expr)))]
-   [else expr]))
-
-(define (convert-pairs expr)
-  (cond
-   [(pair? expr)
-    (mcons (convert-pairs (car expr))
-           (convert-pairs (cdr expr)))]
-   [(vector? expr)
-    (list->vector (map convert-pairs (vector->list expr)))]
-   [else expr]))
-
-;; R6RS syntax-case has different wrapping rules than PLT Scheme for
-;; the result of `syntax'. We have to recognize pattern variables
-;; to unwrap appropriately.
-
-;; Also, R6RS doesn't have (... <tmpl>) quoting in patterns --- only
-;; in templates. <<<< FIXME
-
-(define-syntax (r6rs:syntax-case stx)
-  (syntax-case stx ()
-    [(_ expr (lit ...) clause ...)
-     (let ([lits (syntax->list #'(lit ...))])
-       (for-each (lambda (lit)
-                   (unless (identifier? lit)
-                     (raise-syntax-error #f
-                                         "bad literal"
-                                         stx
-                                         lit))
-                   (when (free-identifier=? lit #'(... ...))
-                     (raise-syntax-error #f
-                                         "ellipses cannot be literal"
-                                         stx
-                                         lit))
-                   
-                   (when (free-identifier=? lit #'_)
-                     (raise-syntax-error #f
-                                         "underscore cannot be literal"
-                                         stx
-                                         lit)))
-                 lits)
-       (quasisyntax/loc stx
-         (syntax-case (add-wrap expr) (lit ...)
-           . #,(map (lambda (clause)
-                      (syntax-case clause ()
-                        [(pat val)
-                         (begin
-                           ((check-pat-ellipses stx) #'pat)
-                           #`(pat val))]
-                        [(pat fender val)
-                         (begin
-                           ((check-pat-ellipses stx) #'pat)
-                           #`(pat fender val))]
-                        [else clause]))
-                    (syntax->list #'(clause ...))))))]
-    [(_ . rest) (syntax/loc stx (syntax-case . rest))]))
-
-(define-syntax (add-wrap stx)
-  (syntax-case stx ()
-    [(_ expr)
-     #`(wrap expr (quote-syntax #,(datum->syntax #'expr 'ctx)) unwrapped-srcloc #f)]))
-
-;; ----------------------------------------
-
-(define (unwrap-reconstructed data stx datum)
-  (when (mpair? datum)
-    (hash-set! reconstruction-memory datum (datum->syntax stx 'memory stx)))
-  datum)
-
-(define (unwrap-pvar data stx)
-  ;; unwrap based on srcloc:
-  (let loop ([v stx])
-    (cond
-     [(syntax? v)
-      (if (eq? (syntax-source v) unwrapped-tag)
-          (let ([r (loop (syntax-e v))])
-            (when (mpair? r)
-              (hash-set! reconstruction-memory r (datum->syntax v 'memory v)))
-            r)
-          v)]
-     [(pair? v) (mcons (loop (car v))
-                       (loop (cdr v)))]
-     [(vector? v) (list->vector
-                   (map loop (vector->list v)))]
-     [else v])))
-
-(define (leaf-to-syntax datum)
-  (datum->syntax #f datum))
-
-(define (ellipses-end stx)
-  ;; R6RS says that (x ...) must be a list, so we need a special rule
-  (if (and (syntax? stx) (null? (syntax-e stx)))
-      null
-      stx))
-
-(define-for-syntax (no-data x) #f)
-
-(define-syntax (r6rs:syntax stx)
-  (syntax-case stx ()
-    [(_ template)
-     (transform-template #'template
-                         #:constant-as-leaf? #t
-                         #:save (lambda (x) #f)
-                         #:restore-stx #'unwrap-reconstructed
-                         #:leaf-datum-stx #'leaf-to-syntax
-                         #:pvar-restore-stx #'unwrap-pvar
-                         #:cons-stx #'mcons
-                         #:ellipses-end-stx #'ellipses-end)]))
-
-;; ----------------------------------------
-
-;; Implementation from R6RS --- which gives the following
-;; strange behavior:
-;;
-;;  > (with-syntax ([a 10][... 11]) #'(a ...))
-;;  (10 11)
-
-(define-syntax r6rs:with-syntax
-  (syntax-rules ()
-    [(_ [(p e0) ...] e1 e2 ...)
-     (r6rs:syntax-case (mlist (add-wrap e0) ...) ()
-       [(p ...) (let () e1 e2 ...)])]))
-
-(define-syntax (r6rs:quasisyntax stx)
-  (syntax-case stx ()
-    [(_ tmpl)
-     (let loop ([stx #'tmpl]
-                [src stx]
-                [depth 0]
-                [to-splice? #f]
-                [k (lambda (template pats exprs)
-                     (with-syntax ([(pat ...) pats]
-                                   [(expr ...) exprs]
-                                   [template template])
-                       (syntax/loc stx
-                         (r6rs:with-syntax ([pat expr] ...)
-                                           (r6rs:syntax template)))))])
-       (cond
-        [(and (identifier? stx)
-              (or (free-identifier=? #'unsyntax stx)
-                  (free-identifier=? #'unsyntax-splicing stx)))
-         (raise-syntax-error #f
-                             "misplaced within quasitemplate"
-                             stx)]
-        [(syntax? stx)
-         (loop (syntax-e stx)
-               stx
-               depth
-               to-splice?
-               (lambda (t pats exprs)
-                 (k (if to-splice?
-                        (map (lambda (t)
-                               (datum->syntax stx t stx stx))
-                             t)
-                        (datum->syntax stx t stx stx))
-                    pats
-                    exprs)))]
-        [(pair? stx)
-         (cond
-          [(and (identifier? (car stx))
-                (or (free-identifier=? #'unsyntax (car stx))
-                    (free-identifier=? #'unsyntax-splicing (car stx))))
-           (let ([l (syntax->list (datum->syntax #f (cdr stx)))]
-                 [splice? (free-identifier=? #'unsyntax-splicing (car stx))])
-             (unless l
-               (raise-syntax-error #f
-                                   "bad syntax"
-                                   (datum->syntax src stx src src)))
-             (if (zero? depth)
-                 ;; Escape:
-                 (let ([id (car (generate-temporaries '(un)))])
-                   (when (or splice? (not (= 1 (length l))))
-                     (unless to-splice?
-                       (raise-syntax-error #f
-                                           "not in a splicing context"
-                                           (datum->syntax src stx src src))))
-                   (if (= (length l) 1)
-                       ;; Normal substitution:
-                       (k (if to-splice? 
-                              (if splice?
-                                  (list id (quote-syntax ...))
-                                  (list id))
-                              id)
-                          (list (if splice?
-                                    (list id (quote-syntax ...))
-                                    id))
-                          (list (car l)))
-                       ;; Splicing (or double-splicing) substitution:
-                       (k (if splice?
-                              (list id (quote-syntax ...) (quote-syntax ...))
-                              (list id (quote-syntax ...)))
-                          (list
-                           (if splice?
-                               (list (list id (quote-syntax ...)) (quote-syntax ...))
-                               (list id (quote-syntax ...))))
-                          (list (if splice?
-                                    #`(map convert-mpairs (list . #,(cdr stx)))
-                                    #`(list . #,(cdr stx)))))))
-                 ;; Not an escape -- just decrement depth:
-                 (loop (cdr stx)
-                       src
-                       (sub1 depth)
-                       #f
-                       (lambda (t pats exprs)
-                         (k (let ([v (cons (car stx) t)])
-                              (if to-splice?
-                                  (list v)
-                                  v))
-                            pats
-                            exprs)))))]
-          [(and (identifier? (car stx))
-                (free-identifier=? #'r6rs:quasisyntax (car stx)))
-           (loop (cdr stx)
-                 src
-                 (add1 depth)
-                 #f
-                 (lambda (t pats exprs)
-                   (k (let ([v (cons (car stx) t)])
-                        (if to-splice?
-                            (list v)
-                            v))
-                      pats
-                      exprs)))]
-          [else
-           ;; a pair
-           (loop (car stx)
-                 src
-                 depth
-                 #t
-                 (lambda (a a-pats a-exprs)
-                   (loop (cdr stx)
-                         src
-                         depth
-                         #f
-                         (lambda (b b-pats b-exprs)
-                           (k (let ([v (append a b)])
-                                (if to-splice?
-                                    (list v)
-                                    v))
-                              (append a-pats b-pats)
-                              (append a-exprs b-exprs))))))])]
-        [(vector? stx)
-         (loop (vector->list stx)
-               src
-               depth
-               #f
-               (lambda (t pats exprs)
-                 (k (let ([v (list->vector t)])
-                      (if to-splice?
-                          (list v)
-                          v))
-                    pats
-                    exprs)))]
-        [else (k (if to-splice? (list stx) stx) null null)]))]))
diff --git a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/unicode-6.rkt b/pkgs/r6rs-pkgs/r6rs-lib/rnrs/unicode-6.rkt
deleted file mode 100644
index d9bdeaf356..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-lib/rnrs/unicode-6.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang scheme/base
-
-;; FIXME: there could be all sorts of mismatches between the R6RS
-;;  definitions and those in `scheme/base'.
-
-(provide
- char-upcase
- char-downcase
- char-titlecase
- char-foldcase
- char-ci=?
- char-ci<?
- char-ci>?
- char-ci<=?
- char-ci>=?
- char-alphabetic?
- char-numeric?
- char-whitespace?
- char-upper-case?
- char-lower-case?
- char-title-case?
- (rename-out [r6rs:char-general-category char-general-category])
- 
- string-upcase
- string-downcase
- string-titlecase
- string-foldcase
- string-ci=?
- string-ci<?
- string-ci>?
- string-ci<=?
- string-ci>=?
- 
- string-normalize-nfd
- string-normalize-nfkd
- string-normalize-nfc
- string-normalize-nfkc)
-
-(define (r6rs:char-general-category ch)
-  (hash-ref #hasheq((ll . Ll)
-                    (lu . Lu)
-                    (lt . Lt)
-                    (lm . Lm)
-                    (lo . Lo)
-                    (mn . Mn)
-                    (mc . Mc)
-                    (me . Me)
-                    (nl . Nl)
-                    (no . No)
-                    (nd . Nd)
-                    (zl . Zl)
-                    (zs . Zs)
-                    (zp . Zp)
-                    (pc . Pc)
-                    (pd . Pd)
-                    (ps . Ps)
-                    (pe . Pe)
-                    (pi . Pi)
-                    (pf . Pf)
-                    (po . Po)
-                    (sm . Sm)
-                    (sc . Sc)
-                    (sk . Sk)
-                    (so . So)
-                    (cf . Cf)
-                    (cn . Cn)
-                    (co . Co)
-                    (cc . Cc))
-            (char-general-category ch)))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/LICENSE.txt b/pkgs/r6rs-pkgs/r6rs-test/LICENSE.txt
deleted file mode 100644
index ba5febfadd..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-r6rs-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/r6rs-pkgs/r6rs-test/info.rkt b/pkgs/r6rs-pkgs/r6rs-test/info.rkt
deleted file mode 100644
index f210ca946f..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-(define build-deps '("r6rs-lib"))
-
-(define pkg-desc "tests for \"r6rs\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/README.txt b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/README.txt
deleted file mode 100644
index 4bfd04f6dc..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/README.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-
-------------------------- An R6RS Test Suite -------------------------
-
-======================================================================
-Files and libraries
-======================================================================
-
-Files that end ".sps" are R6RS programs. The main one is "run.sps",
-which runs all the tests.
-
-Files that end ".sls" are R6RS libraries. For example, "base.sls" is a
-library that implements `(tests r6rs base)', which is a set of tests
-for `(rnrs base)'. Many R6RS implementations will auto-load ".sls"
-files if you put the directory of tests in the right place.
-
-In general, for each `(rnrs <id> ... <id>)' in the standard:
-
- * There's a library of tests "<id>/.../<id>.sls". It defines and
-   exports a function `run-<id>-...<id>-tests'.
-
- * There's a program "run/<id>/.../<id>.sps" that imports
-   "<id>/.../<id>.sls", runs the tests, and reports the results.
-
-And then there's 
-
- * "run.sps", which runs all the tests (as noted above)
-
- * "run-via-eval.sps", which is similar to "run.ss" but runs each set
-    of tests via `eval'
-
- * "test.sls", containing `(tests r6rs test)', which implements the
-   testing utilities that are used by all the other libraries
-
- * "contrib.sls" and "run/contrib.sps", which implement and run
-   contributed tests; these tests might be contributed when someone
-   finds a bug in an implementation that seems worth testing in other
-   implementations; also, they may be difficult to pin to a particular
-   R6RS library; finally, they may use extra libraries from the
-   "contrib" sub-directory
-
-======================================================================
-Limitations and feedback
-======================================================================
-
-The test suite tries to cover all of the bindings of R6RS, and it
-tries to check a variety of uses
-
-One goal of this test suite is to avoid using `eval' (except when
-specifcally testing `eval'). Avoiding `eval' makes the test suite as
-useful as possible to ahead-of-time compilers that implement `eval'
-with a separate interpreter. A drawback of the current approach,
-however, is that if an R6RS implementation doesn't supply one binding
-or does not support a bit of syntax used in a set of tests, then the
-whole set of tests fails to load.
-
-A related problem is that each set of tests is placed into one
-function that runs all the tests. This format creates a block of code
-that is much larger than in a typical program, which might give some
-compilers trouble.
-
-In any case, reports of bugs (in the tests) and new tests would be
-very much appreciated. File either as a Racket bug report at
-
-   http://bugs.racket-lang.org
-
-======================================================================
-Hints on running the tests
-======================================================================
-
-Ikarus (version 0.0.3+)
-------
-
-Put this directory at "<somewhere>/tests/r6rs" and run with "run.sps"
-
-  cd <somewhere>
-  ikarus --r6rs-script tests/r6rs/run.sps
-
-or run an individual library's test, such as "run/program.sps" as
-
-  cd <somewhere>
-  ikarus --r6rs-script tests/r6rs/run/program.sps
-
-Larceny (version 0.962)
--------
-
-Put this directory at "<somewhere>/tests/r6rs" and run with "run.sps"
-
-  larceny -path <somewhere> -r6rs -program run.sps
-
-or run an individual library's test, such as "run/program.sps" as
-
-  larceny -path <somewhere> -r6rs -program run/program.sps
-
-PLT Scheme (version 4.0.2.5)
-----------
-
-If you get an SVN-based or the "Full" nightly build, then these tests are
-in a `tests/r6rs' collection already. You can run all of the tests using
-
-   mzscheme -l tests/r6rs/run.sps
-
-and so on.
-
-Otherwise, install this directory as a `tests/r6rs' collection,
-perhaps in the location reported by
-
-  (build-path (find-system-path 'addon-dir) 
-              (version) "collects"
-              "tests" "r6rs")
-
-Four tests fail; they correspond to documented non-conformance with
-R6RS.
-
-Ypsilon (version 0.9.6)
--------
-
-Put this directory at "<somewhere>/tests/r6rs" and run with "run.sps":
-
-  cd <somewhere>
-  ypsilon --sitelib=. --clean-acc tests/r6rs/run.sps
-
-or run an individual library's test, such as "run/program.sps" as
-
-  cd <somewhere>
-  ypsilon --sitelib=. --clean-acc tests/r6rs/run/program.sps 
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/arithmetic/bitwise.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/arithmetic/bitwise.sls
deleted file mode 100644
index 6cebbbf3f7..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/arithmetic/bitwise.sls
+++ /dev/null
@@ -1,311 +0,0 @@
-#!r6rs
-
-(library (tests r6rs arithmetic bitwise)
-  (export run-arithmetic-bitwise-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  ;; Helpers originally from Ikarus test suite:
-  (define (ref ei)
-    (do ((result 0 (+ result 1)) 
-         (bits (if (negative? ei) 
-                   (bitwise-not ei) 
-                   ei) 
-               (bitwise-arithmetic-shift bits -1))) 
-        ((zero? bits)
-         result)))
-  (define-syntax len-test
-    (syntax-rules ()
-      [(_ n) (test (bitwise-length n)
-                   (ref n))]))
-  (define (pos-count-bits n)
-    (if (zero? n) 
-        0
-        (let ([c (count-bits (bitwise-arithmetic-shift-right n 1))])
-          (if (even? n) c (+ c 1)))))
-  (define (count-bits n)
-    (if (>= n 0)
-        (pos-count-bits n)
-        (bitwise-not (pos-count-bits (bitwise-not n)))))
-  (define-syntax count-test
-    (syntax-rules ()
-      [(_ n)
-       (test (bitwise-bit-count n) (count-bits n))]))
-      
-  (define (run-arithmetic-bitwise-tests)
-
-    (test (bitwise-first-bit-set 0)         -1)
-    (test (bitwise-first-bit-set 1)         0)
-    (test (bitwise-first-bit-set -4)        2)
-    
-    (test (bitwise-arithmetic-shift -6 -1) -3)
-    (test (bitwise-arithmetic-shift -5 -1) -3)
-    (test (bitwise-arithmetic-shift -4 -1) -2)
-    (test (bitwise-arithmetic-shift -3 -1) -2)
-    (test (bitwise-arithmetic-shift -2 -1) -1)
-    (test (bitwise-arithmetic-shift -1 -1) -1)
-
-    (test (bitwise-arithmetic-shift-right 42 (greatest-fixnum)) 0)
-    (test (bitwise-arithmetic-shift-right 42 (+ 1 (greatest-fixnum))) 0)
-    (test (bitwise-arithmetic-shift-right 42 (+ 2 (greatest-fixnum))) 0)
-    
-    (test (bitwise-reverse-bit-field #b1010010 1 4)    88) ; #b1011000
-
-    ;; Originally from Ikarus test suite:
-    (len-test #xF)
-    (len-test #xFF)
-    (len-test #xFFF)
-    (len-test #xFFFF)
-    (len-test #xFFFFF)
-    (len-test #xFFFFFF)
-    (len-test #xFFFFFFF)
-    (len-test #xFFFFFFFF)
-    (len-test #xFFFFFFFFF)
-    (len-test #xFFFFFFFFFF)
-    (len-test #xFFFFFFFFFFF)
-    (len-test #xFFFFFFFFFFFF)
-    (len-test #xFFFFFFFFFFFFF)
-    (len-test #xFFFFFFFFFFFFFF)
-    (len-test #xFFFFFFFFFFFFFFF)
-    (len-test #xFFFFFFFFFFFFFFFF)
-    (len-test #x-F)
-    (len-test #x-FF)
-    (len-test #x-FFF)
-    (len-test #x-FFFF)
-    (len-test #x-FFFFF)
-    (len-test #x-FFFFFF)
-    (len-test #x-FFFFFFF)
-    (len-test #x-FFFFFFFF)
-    (len-test #x-FFFFFFFFF)
-    (len-test #x-FFFFFFFFFF)
-    (len-test #x-FFFFFFFFFFF)
-    (len-test #x-FFFFFFFFFFFF)
-    (len-test #x-FFFFFFFFFFFFF)
-    (len-test #x-FFFFFFFFFFFFFF)
-    (len-test #x-FFFFFFFFFFFFFFF)
-    (len-test #x-FFFFFFFFFFFFFFFF)
-
-    (len-test #xE)
-    (len-test #xFE)
-    (len-test #xFFE)
-    (len-test #xFFFE)
-    (len-test #xFFFFE)
-    (len-test #xFFFFFE)
-    (len-test #xFFFFFFE)
-    (len-test #xFFFFFFFE)
-    (len-test #xFFFFFFFFE)
-    (len-test #xFFFFFFFFFE)
-    (len-test #xFFFFFFFFFFE)
-    (len-test #xFFFFFFFFFFFE)
-    (len-test #xFFFFFFFFFFFFE)
-    (len-test #xFFFFFFFFFFFFFE)
-    (len-test #xFFFFFFFFFFFFFFE)
-    (len-test #xFFFFFFFFFFFFFFFE)
-    (len-test #x-E)
-    (len-test #x-FE)
-    (len-test #x-FFE)
-    (len-test #x-FFFE)
-    (len-test #x-FFFFE)
-    (len-test #x-FFFFFE)
-    (len-test #x-FFFFFFE)
-    (len-test #x-FFFFFFFE)
-    (len-test #x-FFFFFFFFE)
-    (len-test #x-FFFFFFFFFE)
-    (len-test #x-FFFFFFFFFFE)
-    (len-test #x-FFFFFFFFFFFE)
-    (len-test #x-FFFFFFFFFFFFE)
-    (len-test #x-FFFFFFFFFFFFFE)
-    (len-test #x-FFFFFFFFFFFFFFE)
-    (len-test #x-FFFFFFFFFFFFFFFE)
-
-    (len-test #x1)
-    (len-test #x1F)
-    (len-test #x1FF)
-    (len-test #x1FFF)
-    (len-test #x1FFFF)
-    (len-test #x1FFFFF)
-    (len-test #x1FFFFFF)
-    (len-test #x1FFFFFFF)
-    (len-test #x1FFFFFFFF)
-    (len-test #x1FFFFFFFFF)
-    (len-test #x1FFFFFFFFFF)
-    (len-test #x1FFFFFFFFFFF)
-    (len-test #x1FFFFFFFFFFFF)
-    (len-test #x1FFFFFFFFFFFFF)
-    (len-test #x1FFFFFFFFFFFFFF)
-    (len-test #x1FFFFFFFFFFFFFFF)
-    (len-test #x-1)
-    (len-test #x-1F)
-    (len-test #x-1FF)
-    (len-test #x-1FFF)
-    (len-test #x-1FFFF)
-    (len-test #x-1FFFFF)
-    (len-test #x-1FFFFFF)
-    (len-test #x-1FFFFFFF)
-    (len-test #x-1FFFFFFFF)
-    (len-test #x-1FFFFFFFFF)
-    (len-test #x-1FFFFFFFFFF)
-    (len-test #x-1FFFFFFFFFFF)
-    (len-test #x-1FFFFFFFFFFFF)
-    (len-test #x-1FFFFFFFFFFFFF)
-    (len-test #x-1FFFFFFFFFFFFFF)
-    (len-test #x-1FFFFFFFFFFFFFFF)
-
-    (len-test #x1)
-    (len-test #x10)
-    (len-test #x100)
-    (len-test #x1000)
-    (len-test #x10000)
-    (len-test #x100000)
-    (len-test #x1000000)
-    (len-test #x10000000)
-    (len-test #x100000000)
-    (len-test #x1000000000)
-    (len-test #x10000000000)
-    (len-test #x100000000000)
-    (len-test #x1000000000000)
-    (len-test #x10000000000000)
-    (len-test #x100000000000000)
-    (len-test #x1000000000000000)
-    (len-test #x-1)
-    (len-test #x-10)
-    (len-test #x-100)
-    (len-test #x-1000)
-    (len-test #x-10000)
-    (len-test #x-100000)
-    (len-test #x-1000000)
-    (len-test #x-10000000)
-    (len-test #x-100000000)
-    (len-test #x-1000000000)
-    (len-test #x-10000000000)
-    (len-test #x-100000000000)
-    (len-test #x-1000000000000)
-    (len-test #x-10000000000000)
-    (len-test #x-100000000000000)
-    (len-test #x-1000000000000000)
-
-    (len-test #x1)
-    (len-test #x11)
-    (len-test #x101)
-    (len-test #x1001)
-    (len-test #x10001)
-    (len-test #x100001)
-    (len-test #x1000001)
-    (len-test #x10000001)
-    (len-test #x100000001)
-    (len-test #x1000000001)
-    (len-test #x10000000001)
-    (len-test #x100000000001)
-    (len-test #x1000000000001)
-    (len-test #x10000000000001)
-    (len-test #x100000000000001)
-    (len-test #x1000000000000001)
-    (len-test #x-1)
-    (len-test #x-11)
-    (len-test #x-101)
-    (len-test #x-1001)
-    (len-test #x-10001)
-    (len-test #x-100001)
-    (len-test #x-1000001)
-    (len-test #x-10000001)
-    (len-test #x-100000001)
-    (len-test #x-1000000001)
-    (len-test #x-10000000001)
-    (len-test #x-100000000001)
-    (len-test #x-1000000000001)
-    (len-test #x-10000000000001)
-    (len-test #x-100000000000001)
-    (len-test #x-1000000000000001)
-
-    (len-test (greatest-fixnum))
-    (len-test (least-fixnum))
-
-    (count-test 1)
-    (count-test 28472347823493290482390849023840928390482309480923840923840983)
-    (count-test -847234234903290482390849023840928390482309480923840923840983)
-    (count-test (greatest-fixnum))
-    (count-test (least-fixnum))
-    
-    (test (bitwise-not 12) -13)
-    (test (bitwise-not -12) 11)
-    (test (bitwise-not -1) 0)
-    (test (bitwise-not 0) -1)
-    (test (least-fixnum) (bitwise-not (greatest-fixnum)))
-    (test (greatest-fixnum) (bitwise-not (least-fixnum)))
-
-    (test (bitwise-not 38947389478348937489374)
-          -38947389478348937489375)
-    (test (bitwise-not #xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-          -22300745198530623141535718272648361505980416)
-    (test (bitwise-not -38947389478348937489375)
-          38947389478348937489374)
-    (test (bitwise-not #x-FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-          22300745198530623141535718272648361505980414)
-    (test (bitwise-not #xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-          -340282366920938463463374607431768211456)
-    (test (bitwise-not #x-FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-          340282366920938463463374607431768211454)
-    (test (bitwise-not #x1000000000000000000000000)
-          -79228162514264337593543950337)
-    (test (bitwise-not #x-1000000000000000000000000)
-          79228162514264337593543950335)
-
-    ;; ----------------------------------------
-
-    (test (bitwise-and (expt 2 100) 17) 0)
-    (test (bitwise-and (- (expt 2 100) 1) 17) 17)
-    (test (bitwise-and (- (expt 2 100) 1) (expt 2 90)) (expt 2 90))
-
-    (test (bitwise-xor (expt 2 100) 17) (bitwise-ior (expt 2 100) 17))
-    (test (bitwise-xor (- (expt 2 100) 1) 17) (- (expt 2 100) 18))
-    (test (bitwise-xor (- (expt 2 100) 1) (expt 2 90)) (- (expt 2 100) (expt 2 90) 1))
-
-    (test (bitwise-if (expt 2 100) -1 1) (+ (expt 2 100) 1))
-    (test (bitwise-if (expt 2 100) 1 1) 1)
-    (test (bitwise-if (expt 2 100) (- (expt 2 200) 1) 1) (+ (expt 2 100) 1))
-
-    (test (bitwise-bit-count (expt 2 300)) 1)
-    (test (bitwise-bit-count (- (expt 2 300) 1)) 300)
-    (test (bitwise-bit-count (- (expt 2 300))) -301)
-    
-    (test (bitwise-length (expt 2 300)) 301)
-    (test (bitwise-length (- (expt 2 300) 1)) 300)
-    (test (bitwise-length (- (expt 2 300))) 300)
-
-    (test (bitwise-first-bit-set (expt 2 300)) 300)
-    (test (bitwise-first-bit-set (- (expt 2 300) 1)) 0)
-
-    (test (bitwise-bit-set? (expt 2 300) 300) #t)
-    (test (bitwise-bit-set? (expt 2 300) 0) #f)
-    (test (bitwise-bit-set? (- (expt 2 300) 1) 300) #f)
-    (test (bitwise-bit-set? (- (expt 2 300) 1) 299) #t)
-    (test (bitwise-bit-set? (- (expt 2 300) 1) 298) #t)
-    (test (bitwise-bit-set? (- (expt 2 300) 2) 0) #f)
-    (test (bitwise-bit-set? -1 300) #t)
-    (test (bitwise-bit-set? -1 0) #t)
-    (test (bitwise-bit-set? -2 0) #f)
-
-    (test (bitwise-copy-bit-field (expt 2 300) 300 302 0) 0)
-    (test (bitwise-copy-bit-field (expt 2 300) 300 302 1) (expt 2 300))
-    (test (bitwise-copy-bit-field (expt 2 300) 300 302 2) (expt 2 301))
-    (test (bitwise-copy-bit-field (expt 2 300) 300 302 3) (+ (expt 2 300)
-                                                             (expt 2 301)))
-
-    (test (bitwise-arithmetic-shift (expt 2 300) 1) (expt 2 301))
-    (test (bitwise-arithmetic-shift (expt 2 300) -1) (expt 2 299))
-    (test (bitwise-arithmetic-shift (expt 2 300) 300) (expt 2 600))
-    (test (bitwise-arithmetic-shift (expt 2 300) -300) 1)
-
-    (test (bitwise-arithmetic-shift-left (expt 2 300) 1) (expt 2 301))
-    (test (bitwise-arithmetic-shift-right (expt 2 300) 1) (expt 2 299))
-    (test (bitwise-arithmetic-shift-left (expt 2 300) 300) (expt 2 600))
-    (test (bitwise-arithmetic-shift-right (expt 2 300) 300) 1)
-
-    (test (bitwise-rotate-bit-field (expt 2 300) 299 304 2) (expt 2 302))
-    (test (bitwise-rotate-bit-field (expt 2 300) 299 304 4) (expt 2 299))
-
-    (test (bitwise-reverse-bit-field (expt 2 300) 299 304) (expt 2 302))
-
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/arithmetic/fixnums.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/arithmetic/fixnums.sls
deleted file mode 100644
index 51c38979f8..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/arithmetic/fixnums.sls
+++ /dev/null
@@ -1,340 +0,0 @@
-#!r6rs
-
-(library (tests r6rs arithmetic fixnums)
-  (export run-arithmetic-fixnums-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  ;; Originally from Ikarus test suite:
-  (define (fx*/carry-reference fx1 fx2 fx3)
-    (let* ([s (+ (* fx1 fx2) fx3)]
-           [s0 (mod0 s (expt 2 (fixnum-width)))]
-           [s1 (div0 s (expt 2 (fixnum-width)))])
-      (values s0 s1)))
-  (define (fx+/carry-reference fx1 fx2 fx3)
-    (let* ([s (+ (+ fx1 fx2) fx3)]
-           [s0 (mod0 s (expt 2 (fixnum-width)))]
-           [s1 (div0 s (expt 2 (fixnum-width)))])
-      (values s0 s1)))
-  (define (fx-/carry-reference fx1 fx2 fx3)
-    (let* ([s (- (- fx1 fx2) fx3)]
-           [s0 (mod0 s (expt 2 (fixnum-width)))]
-           [s1 (div0 s (expt 2 (fixnum-width)))])
-      (values s0 s1)))
-
-  (define (vals->list f a b c)
-    (call-with-values (lambda () (f a b c)) list))
-
-  (define-syntax carry-test
-    (syntax-rules ()
-      [(_ fxop/carry fxop/carry-reference fx1 fx2 fx3)
-       (run-test `(fxop/carry ,fx1 ,fx2 ,fx3)
-                 (vals->list fxop/carry fx1 fx2 fx3)
-                 (vals->list fxop/carry-reference fx1 fx2 fx3))]))
-
-  (define (carry-tests l)
-    (for-each 
-     (lambda (n)
-       (for-each 
-        (lambda (m)
-          (for-each 
-           (lambda (p)
-             (carry-test fx*/carry fx*/carry-reference n m p)
-             (carry-test fx+/carry fx+/carry-reference n m p)
-             (carry-test fx-/carry fx-/carry-reference n m p))
-           l))
-        l))
-     l))
-
-  (define (run-arithmetic-fixnums-tests)
-
-    (test (fxfirst-bit-set 0)         -1)
-    (test (fxfirst-bit-set 1)         0)
-    (test (fxfirst-bit-set -4)        2)
-
-    (test (fxreverse-bit-field #b1010010 1 4)     88) ; #b1011000
-
-    ;; ----------------------------------------
-
-    (test (least-fixnum) (- (expt 2 (- (fixnum-width) 1))))
-    (test (greatest-fixnum) (- (expt 2 (- (fixnum-width) 1)) 1))
-
-    (test (fixnum? 1.0) #f)
-    (test (fixnum? 1+1i) #f)
-
-    (test (fixnum? 0) #t)
-    (test (fixnum? 1) #t)
-    (test (fixnum? -1) #t)
-    (test (fixnum? (- (expt 2 23))) #t)
-    (test (fixnum? (- (expt 2 23) 1)) #t)
-
-    (test (fixnum? (least-fixnum)) #t)
-    (test (fixnum? (- (least-fixnum) 1)) #f)
-    (test (fixnum? (greatest-fixnum)) #t)
-    (test (fixnum? (+ 1 (greatest-fixnum))) #f)
-
-    (let ([test-ordered
-           (lambda (a b c)
-             (test (fx=? a a) #t)
-             (test (fx=? b b) #t)
-             (test (fx=? c c) #t)
-
-             (test (fx=? a b) #f)
-             (test (fx=? b a) #f)
-             (test (fx=? b c) #f)
-             (test (fx=? c b) #f)
-
-             (test (fx=? a c b) #f)
-             (test (fx=? a a b) #f)
-             (test (fx=? a b b) #f)
-
-             (let ([test-lt
-                    (lambda (fx<? fx<=? a b c)
-                      (test (fx<? a b) #t)
-                      (test (fx<? b c) #t)
-                      (test (fx<? a c) #t)
-                      (test (fx<? a b c) #t)
-
-                      (test (fx<? b a) #f)
-                      (test (fx<? c b) #f)
-                      (test (fx<? a c b) #f)
-                      
-                      (test (fx<=? a a) #t)
-                      (test (fx<=? a b) #t)
-                      (test (fx<=? a c) #t)
-                      (test (fx<=? b b) #t)
-                      (test (fx<=? b c) #t)
-                      (test (fx<=? c c) #t)
-                      (test (fx<=? a c c) #t)
-                      (test (fx<=? a b c) #t)
-                      (test (fx<=? b b c) #t)
-
-                      (test (fx<=? c a) #f)
-                      (test (fx<=? b a) #f)
-                      (test (fx<=? a c b) #f)
-                      (test (fx<=? b c a) #f))])
-               (test-lt fx<? fx<=? a b c)
-               (test-lt fx>? fx>=? c b a))
-             
-             ;; Since b is between a and c, we can add or subtract 1:
-             (test (fx=? (+ b 1) (+ b 1)) #t)
-             (test (fx<? b (+ b 1)) #t)
-             (test (fx<=? b (+ b 1)) #t)
-             (test (fx>? b (+ b 1)) #f)
-             (test (fx>=? b (+ b 1)) #f)
-             (test (fx=? (- b 1) (- b 1)) #t)
-             (test (fx<? b (- b 1)) #f)
-             (test (fx<=? b (- b 1)) #f)
-             (test (fx>? b (- b 1)) #t)
-             (test (fx>=? b (- b 1)) #t)
-             
-             ;; Check min & max while we have ordered values:
-             (test (fxmin a b) a)
-             (test (fxmin b c) b)
-             (test (fxmin a c) a)
-             (test (fxmin b a c) a)
-             (test (fxmax a b) b)
-             (test (fxmax b c) c)
-             (test (fxmax a c) c)
-             (test (fxmax b c a) c))])
-      (test-ordered 1 2 3)
-      (test-ordered -1 0 1)
-      (test-ordered (least-fixnum) 1 (greatest-fixnum)))
-
-    (test (fxzero? 0) #t)
-    (test (fxzero? 1) #f)
-    (test (fxzero? (greatest-fixnum)) #f)
-    (test (fxzero? (least-fixnum)) #f)
-
-    (test (fxpositive? 0) #f)
-    (test (fxpositive? (least-fixnum)) #f)
-    (test (fxpositive? (greatest-fixnum)) #t)
-
-    (test (fxnegative? 0) #f)
-    (test (fxnegative? (least-fixnum)) #t)
-    (test (fxnegative? (greatest-fixnum)) #f)
-
-    (test (fxodd? 0) #f)
-    (test (fxodd? 2) #f)
-    (test (fxodd? 1) #t)
-    (test (fxodd? -1) #t)
-    (test (fxodd? (greatest-fixnum)) #t)
-    (test (fxodd? (least-fixnum)) #f)
-
-    (test (fxeven? 0) #t)
-    (test (fxeven? 2) #t)
-    (test (fxeven? 1) #f)
-    (test (fxeven? -1) #f)
-    (test (fxeven? (greatest-fixnum)) #f)
-    (test (fxeven? (least-fixnum)) #t)
-
-    (test (fx+ 3 17) 20)
-    (test (fx+ (greatest-fixnum) (least-fixnum)) -1)
-    (test (fx+ 0 (greatest-fixnum)) (greatest-fixnum))
-    (test (fx+ 0 (least-fixnum)) (least-fixnum))
-    (test/exn (fx+ (greatest-fixnum) 1) &implementation-restriction)
-    (test/exn (fx+ (least-fixnum) -1) &implementation-restriction)
-
-    (test (fx* 3 17) 51)
-    (test (fx* 1 (least-fixnum)) (least-fixnum))
-    (test (fx* 1 (greatest-fixnum)) (greatest-fixnum))
-    (test (fx* -1 (greatest-fixnum)) (+ (least-fixnum) 1))
-    (test/exn (fx* (greatest-fixnum) 2) &implementation-restriction)
-    (test/exn (fx* (least-fixnum) -1) &implementation-restriction)
-    
-    (test (fx- 1) -1)
-    (test (fx- -1) 1)
-    (test (fx- 0) 0)
-    (test (fx- (greatest-fixnum)) (+ 1 (least-fixnum)))
-
-    (test (fx- (greatest-fixnum) 1) (- (greatest-fixnum) 1))
-    (test (fx- (greatest-fixnum) (greatest-fixnum)) 0)
-    (test (fx- (least-fixnum) (least-fixnum)) 0)
-
-    (test/exn (fx- (least-fixnum)) &implementation-restriction)
-    (test/exn (fx- (least-fixnum) 1) &implementation-restriction)
-
-    ;; If you put N numbers here, it runs to O(N^3) tests!
-    (carry-tests (list 0 1 2 -1 -2 38734 -3843 2484598 -348732487 
-                       (greatest-fixnum) (least-fixnum)))
-
-    (test (fxdiv 123 10) 12)
-    (test (fxmod 123 10) 3)
-    (test (fxdiv 123 -10) -12)
-    (test (fxmod 123 -10) 3)
-    (test (fxdiv -123 10) -13)
-    (test (fxmod -123 10) 7)
-    (test (fxdiv -123 -10) 13)
-    (test (fxmod -123 -10) 7)
-
-    (test/values (fxdiv-and-mod -123 10) -13 7)
-
-    (test (fxdiv0 123 10) 12)
-    (test (fxmod0 123 10) 3)
-    (test (fxdiv0 123 -10) -12)
-    (test (fxmod0 123 -10) 3)
-    (test (fxdiv0 -123 10) -12)
-    (test (fxmod0 -123 10) -3)
-    (test (fxdiv0 -123 -10) 12)
-    (test (fxmod0 -123 -10) -3)
-
-    (test/values (fxdiv0-and-mod0 -123 10) -12 -3)
-
-    (test/exn (fxdiv 1 0) &assertion)
-    (test/exn (fxmod 1 0) &assertion)
-    (test/exn (fxdiv-and-mod 1 0) &assertion)
-    (test/exn (fxdiv0 1 0) &assertion)
-    (test/exn (fxmod0 1 0) &assertion)
-    (test/exn (fxdiv0-and-mod0 1 0) &assertion)
-
-    (test/exn (fxdiv (least-fixnum) -1) &implementation-restriction)
-    (test/exn (fxdiv-and-mod (least-fixnum) -1) &implementation-restriction)
-    (test/exn (fxdiv0 (least-fixnum) -1) &implementation-restriction)
-    (test/exn (fxdiv0-and-mod0 (least-fixnum) -1) &implementation-restriction)
-
-    (test (fxnot 0) -1)
-    (test (fxnot -2) 1)
-    (test (fxnot 1) -2)
-
-    (test (fxand 7) 7)
-    (test (fxand 7 0) 0)
-    (test (fxand 7 1) 1)
-    (test (fxand 7 5) 5)
-    (test (fxand 7 4 5) 4)
-    (test (fxand 7 5 4) 4)
-
-    (test (fxior 7) 7)
-    (test (fxior 7 0) 7)
-    (test (fxior 5 4) 5)
-    (test (fxior 5 3) 7)
-    (test (fxior 5 3 32) 39)
-
-    (test (fxxor 7) 7)
-    (test (fxxor 7 0) 7)
-    (test (fxxor 5 4) 1)
-    (test (fxxor 5 3) 6)
-    (test (fxxor 5 1 32) 36)
-
-    (test (fxif 5 15 0) 5)
-    (test (fxif 5 0 15) 10)
-    (test (fxif 5 0 1) 0)
-    (test (fxif 5 0 3) 2)
-    (test (fxif 5 3 0) 1)
-
-    (test (fxbit-count 5) 2)
-    (test (fxbit-count 6) 2)
-    (test (fxbit-count 7) 3)
-    (test (fxbit-count -7) -3)
-
-    (test (fxlength 1) 1)
-    (test (fxlength 255) 8)
-    (test (fxlength 0) 0)
-    (test (fxlength -2) 1)
-    (test (fxlength -255) 8)
-
-    (test (fxfirst-bit-set 0) -1)
-    (test (fxfirst-bit-set 1) 0)
-    (test (fxfirst-bit-set 16) 4)
-    (test (fxfirst-bit-set -2) 1)
-    (test (fxfirst-bit-set (expt 2 17)) 17)
-
-    (test (fxbit-set? 15 0) #t)
-    (test (fxbit-set? 14 0) #f)
-    (test (fxbit-set? 14 3) #t)
-    (test (fxbit-set? 14 10) #f)
-    (test (fxbit-set? -1 10) #t)
-
-    (test (fxcopy-bit 0 0 1) 1)
-    (test (fxcopy-bit 0 1 1) 2)
-    (test (fxcopy-bit 0 4 1) 16)
-    (test (fxcopy-bit 0 4 0) 0)
-    (test (fxcopy-bit 31 4 0) 15)
-
-    (test (fxbit-field 30 1 3) 3)
-    (test (fxbit-field 30 1 4) 7)
-    (test (fxbit-field 30 1 5) 15)
-    (test (fxbit-field 30 1 6) 15)
-    (test (fxbit-field 30 0 3) 6)
-
-    (test (fxcopy-bit-field 0 0 3 30) 6)
-    (test (fxcopy-bit-field 7 0 3 30) 6)
-    (test (fxcopy-bit-field 15 0 3 30) 14)
-    (test (fxcopy-bit-field 0 2 5 30) 24)
-    (test (fxcopy-bit-field 1 2 5 30) 25)
-    (test (fxcopy-bit-field 7 2 5 30) 27)
-    (test (fxcopy-bit-field 15 2 5 30) 27)
-    (test (fxcopy-bit-field 0 2 5 120) 0)
-    (test (fxcopy-bit-field 1 2 5 120) 1)
-
-    (test (fxarithmetic-shift 1 1) 2)
-    (test (fxarithmetic-shift 1 -1) 0)
-    (test (fxarithmetic-shift 10 2) 40)
-    (test (fxarithmetic-shift 40 -2) 10)
-    (test (fxarithmetic-shift -1 1) -2)
-    (test (fxarithmetic-shift -1 -1) -1)
-    (test (fxarithmetic-shift -10 2) -40)
-    (test (fxarithmetic-shift -40 -2) -10)
-    (test/exn (fxarithmetic-shift (greatest-fixnum) 1) &implementation-restriction)
-
-    (test (fxarithmetic-shift-left 1 1) 2)
-    (test (fxarithmetic-shift-right 1 1) 0)
-    (test (fxarithmetic-shift-left 10 2) 40)
-    (test (fxarithmetic-shift-right 40 2) 10)
-    (test (fxarithmetic-shift-left -1 1) -2)
-    (test (fxarithmetic-shift-right -1 1) -1)
-    (test (fxarithmetic-shift-left -10 2) -40)
-    (test (fxarithmetic-shift-right -40 2) -10)
-    (test/exn (fxarithmetic-shift-left (greatest-fixnum) 1) &implementation-restriction)
-
-    (test (fxrotate-bit-field 10 0 2 0) 10)
-    (test (fxrotate-bit-field 10 0 2 1) 9)
-
-    (test (fxrotate-bit-field 10 2 4 0) 10)
-    (test (fxrotate-bit-field 10 2 4 1) 6)
-    (test (fxrotate-bit-field 10 1 4 2) 12)
-    (test (fxrotate-bit-field 10 1 4 1) 6)
-    (test (fxrotate-bit-field 10 2 4 1) 6)
-
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/arithmetic/flonums.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/arithmetic/flonums.sls
deleted file mode 100644
index 8d0aac3b4b..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/arithmetic/flonums.sls
+++ /dev/null
@@ -1,295 +0,0 @@
-#!r6rs
-
-(library (tests r6rs arithmetic flonums)
-  (export run-arithmetic-flonums-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define (try-flonums proc)
-    (proc 0.0)
-    (proc 1.0)
-    (proc -1.0)
-    (proc +inf.0)
-    (proc -inf.0)
-    (proc +nan.0))
-
-  (define-syntax try-bad-divs
-    (syntax-rules ()
-      [(_ op)
-       'nothing
-       ;; The spec is unclear whether the following
-       ;; are allowed to raise exceptions.
-       #;
-       (begin
-         (test/unspec (op 1.0 0.0))
-         (test/unspec (op +inf.0 1.0))
-         (test/unspec (op -inf.0 1.0))
-         (test/unspec (op +nan.0 1.0)))]))
-
-  (define (run-arithmetic-flonums-tests)
-
-    (test (fl=? +inf.0 +inf.0)            #t)
-    (test (fl=? -inf.0 +inf.0)            #f)
-    (test (fl=? -inf.0 -inf.0)            #t)
-    (test (fl=? 0.0 -0.0)                 #t)
-    (test (fl<? 0.0 -0.0)                 #f)
-    (try-flonums
-     (lambda (fl)
-       (test (fl=? +nan.0 fl)                #f)
-       (test (fl<? +nan.0 fl)                #f)))
-    
-    (test (flnegative? -0.0)   #f)
-    (test (flfinite? +inf.0)   #f)
-    (test (flfinite? 5.0)      #t)
-    (test (flinfinite? 5.0)    #f)
-    (test (flinfinite? +inf.0) #t)
-    (test (flinfinite? -inf.0) #t)
-    (test (flinfinite? +nan.0) #f)
-    
-    (test (fl+ +inf.0 -inf.0)       +nan.0)
-    (try-flonums 
-     (lambda (fl)
-       (test (fl+ +nan.0 fl)           +nan.0)
-       (test (fl* +nan.0 fl)           +nan.0)))
-
-    (test (fl- +inf.0 +inf.0)       +nan.0)
-    
-    (test (fl/ 1.0 0.0)  +inf.0)
-    (test (fl/ -1.0 0.0) -inf.0)
-    (test (fl/ 0.0 0.0)  +nan.0)
-
-    (test (flnumerator +inf.0)            +inf.0)
-    (test (flnumerator -inf.0)            -inf.0)
-    (test (fldenominator +inf.0)          1.0)
-    (test (fldenominator -inf.0)          1.0)
-    
-    ;; (test (flnumerator 0.75)              3.0) ; probably
-    ;; (test (fldenominator 0.75)            4.0) ; probably
-
-    (test (flnumerator -0.0)             -0.0)
-    
-    (test (flfloor +inf.0)                        +inf.0)
-    (test (flceiling -inf.0)                      -inf.0)
-    (test (fltruncate +nan.0)                     +nan.0)
-    
-    (test (flexp +inf.0)                +inf.0)
-    (test (flexp -inf.0)                0.0)
-    (test (fllog +inf.0)                +inf.0)
-    (test (fllog 0.0)                   -inf.0)
-    (test/unspec (fllog -0.0)) ; if -0.0 is distinguished
-    (test (fllog -inf.0)                +nan.0)
-    (test/approx (flatan -inf.0)               -1.5707963267948965)
-    (test/approx (flatan +inf.0)               1.5707963267948965)
-
-    (test (flsqrt +inf.0)                +inf.0)
-    (test (flsqrt -0.0)                  -0.0)
-
-    ;; ----------------------------------------
-    
-    (let ([test-ordered
-           (lambda (a b c)
-             (test (fl=? a a) #t)
-             (test (fl=? b b) #t)
-             (test (fl=? c c) #t)
-
-             (test (fl=? a b) #f)
-             (test (fl=? b a) #f)
-             (test (fl=? b c) #f)
-             (test (fl=? c b) #f)
-
-             (test (fl=? a c b) #f)
-             (test (fl=? a a b) #f)
-             (test (fl=? a b b) #f)
-
-             (let ([test-lt
-                    (lambda (fl<? fl<=? a b c)
-                      (test (fl<? a b) #t)
-                      (test (fl<? b c) #t)
-                      (test (fl<? a c) #t)
-                      (test (fl<? a b c) #t)
-
-                      (test (fl<? b a) #f)
-                      (test (fl<? c b) #f)
-                      (test (fl<? a c b) #f)
-                      
-                      (test (fl<=? a a) #t)
-                      (test (fl<=? a b) #t)
-                      (test (fl<=? a c) #t)
-                      (test (fl<=? b b) #t)
-                      (test (fl<=? b c) #t)
-                      (test (fl<=? c c) #t)
-                      (test (fl<=? a c c) #t)
-                      (test (fl<=? a b c) #t)
-                      (test (fl<=? b b c) #t)
-
-                      (test (fl<=? c a) #f)
-                      (test (fl<=? b a) #f)
-                      (test (fl<=? a c b) #f)
-                      (test (fl<=? b c a) #f))])
-               (test-lt fl<? fl<=? a b c)
-               (test-lt fl>? fl>=? c b a))
-             
-             ;; Since b is between a and c, we can add or subtract 1:
-             (test (fl=? (+ b 1) (+ b 1)) #t)
-             (test (fl<? b (+ b 1)) #t)
-             (test (fl<=? b (+ b 1)) #t)
-             (test (fl>? b (+ b 1)) #f)
-             (test (fl>=? b (+ b 1)) #f)
-             (test (fl=? (- b 1) (- b 1)) #t)
-             (test (fl<? b (- b 1)) #f)
-             (test (fl<=? b (- b 1)) #f)
-             (test (fl>? b (- b 1)) #t)
-             (test (fl>=? b (- b 1)) #t)
-             
-             ;; Check min & max while we have ordered values:
-             (test (flmin a b) a)
-             (test (flmin b c) b)
-             (test (flmin a c) a)
-             (test (flmin b a c) a)
-             (test (flmax a b) b)
-             (test (flmax b c) c)
-             (test (flmax a c) c)
-             (test (flmax b c a) c))])
-      (test-ordered 1.0 2.0 3.0)
-      (test-ordered -1.0 0.0 1.0)
-      (test-ordered -1.0e5 0.0 1.0e-5))
-    
-    (test (flinteger? 4.0) #t)
-    (test (flinteger? 4.1) #f)
-    (test (flzero? 4.1) #f)
-    (test (flzero? 0.0) #t)
-    (test (flzero? -4.1) #f)
-    (test (flpositive? 4.1) #t)
-    (test (flpositive? 0.0) #f)
-    (test (flpositive? -4.1) #f)
-    (test (flnegative? 4.1) #f)
-    (test (flnegative? 0.0) #f)
-    (test (flnegative? -4.1) #t)
-    
-    (test (fleven? 2.0) #t)
-    (test (fleven? -2.0) #t)
-    (test (fleven? 0.0) #t)
-    (test (fleven? -0.0) #t)
-    (test (fleven? 3.0) #f)
-    (test (fleven? -3.0) #f)
-
-    (test (flodd? 3.0) #t)
-    (test (flodd? -3.0) #t)
-    (test (flodd? 0.0) #f)
-    (test (flodd? -0.0) #f)
-    (test (flodd? 2.0) #f)
-    (test (flodd? -2.0) #f)
-
-    (test (flnan? +inf.0) #f)
-    (test (flnan? 0.0) #f)
-    (test (flnan? -0.0) #f)
-    (test (flnan? -inf.0) #f)
-    (test (flnan? +nan.0) #t)
-
-    (test (fl+) +0.0)
-    (test (fl+ 2.3) 2.3)
-    (test/approx (fl+ 2.3 3.1) 5.4)
-    (test/approx (fl+ 2.3 3.1 -1.1) 4.3)
-    (test/approx (fl+ 2.3e2 3.1e1) 261)
-
-    (test (fl*) 1.0)
-    (test (fl* 2.3) 2.3)
-    (test/approx (fl* 2.3 2.1) 4.83)
-    (test/approx (fl* 2.3 2.1 1.1) 5.313)
-    (test/approx (fl* 2.3 2.1 -1.1) -5.313)
-
-    (test/approx (fl- 0.0 2.3) -2.3)
-    (test/approx (fl- 0.0 2.3 -1.1) -1.2)
-    (test/approx (fl- 2.3) -2.3)
-    (test (fl- 0.0) -0.0)
-
-    (test/approx (fl/ 5.0 2.0) 2.5)
-    (test/approx (fl/ 5.0 2.0 2.5) 1.0)
-    (test/approx (fl/ 2.0) 0.5)
-    (test/approx (fl/ -2.0) -0.5)
-
-    (test (flabs 0.0) 0.0)
-    (test/approx (flabs 1.0) 1.0)
-    (test/approx (flabs -1.0) 1.0)
-    (test/approx (flabs -0.1) 0.1)
-
-    (test (fldiv 123.0 10.0) 12.0)
-    (test (flmod 123.0 10.0) 3.0)
-    (test (fldiv 123.0 -10.0) -12.0)
-    (test (flmod 123.0 -10.0) 3.0)
-    (test (fldiv -123.0 10.0) -13.0)
-    (test (flmod -123.0 10.0) 7.0)
-    (test (fldiv -123.0 -10.0) 13.0)
-    (test (flmod -123.0 -10.0) 7.0)
-
-    (test/values (fldiv-and-mod -123.0 10.0) -13.0 7.0)
-
-    (try-bad-divs fldiv)
-    (try-bad-divs flmod)
-    (try-bad-divs fldiv-and-mod)
-
-    (test (fldiv0 123.0 10.0) 12.0)
-    (test (flmod0 123.0 10.0) 3.0)
-    (test (fldiv0 123.0 -10.0) -12.0)
-    (test (flmod0 123.0 -10.0) 3.0)
-    (test (fldiv0 -123.0 10.0) -12.0)
-    (test (flmod0 -123.0 10.0) -3.0)
-    (test (fldiv0 -123.0 -10.0) 12.0)
-    (test (flmod0 -123.0 -10.0) -3.0)
-
-    (test/values (fldiv0-and-mod0 -123.0 10.0) -12.0 -3.0)
-
-    (try-bad-divs fldiv0)
-    (try-bad-divs flmod0)
-    (try-bad-divs fldiv0-and-mod0)
-
-    (test (flfloor 3.1) 3.0)
-    (test (flfloor -3.1) -4.0)
-    (test (flceiling 3.1) 4.0)
-    (test (flceiling -3.1) -3.0)
-    (test (fltruncate 3.1) 3.0)
-    (test (fltruncate -3.1) -3.0)
-    (test (flround 3.1) 3.0)
-    (test (flround -3.1) -3.0)
-    (test (flround 3.8) 4.0)
-    (test (flround -3.8) -4.0)
-    ;; (test (flround 3.5) 4.0) ; probably
-    ;; (test (flround -3.5) -4.0) ; probably
-    ;; (test (flround 2.5) 2.0) ; probably
-    ;; (test (flround -2.5) -2.0) ; probably
-
-    (test/approx (flexp 2.0) 7.389)
-    (test/approx (fllog 7.389) 2.0)
-    (test/approx (fllog 1024.0 2.0) 10.0)
-
-    (test/approx (flsin 0.0) 0.0)
-    (test/approx (flsin 1.570796) 1.0)
-    (test/approx (flcos 1.570796) 0.0)
-    (test/approx (flcos 0.0) 1.0)
-    (test/approx (flatan 0.0 1.0) 0.0)
-    (test/approx (flatan 0.0 -1.0) (* 1.570796 2.0))
-    (test/approx (flatan 1.0 0.0) 1.570796)
-    (test/approx (flatan -1.0 0.0) -1.570796)
-    (test/approx (flatan 1.0 1.0) (/ 1.570796 2.0))
-    (test/approx (flatan -1.0 1.0) (/ -1.570796 2.0))
-    (test/approx (flatan 0.0) 0.0)
-    (test/approx (flatan 1.0) (/ 1.570796 2.0))
-    (test/approx (flatan 10.0) 1.47113)
-    (test/approx (flatan 0.1) 0.0996687)
-
-    (test/approx (flsqrt 4.0) 2.0)
-    (test/approx (flsqrt 5.0) 2.23607)
-
-    (test/approx (flexpt 2.0 3.0) 8.0)
-    (test/approx (flexpt 10.0 3.0) 1000.0)
-
-    (test (no-infinities-violation? (make-no-infinities-violation)) #t)
-    (test ((record-predicate (record-type-descriptor &no-infinities)) (make-no-infinities-violation)) #t)
-    (test (no-nans-violation? (make-no-nans-violation)) #t)
-    (test ((record-predicate (record-type-descriptor &no-nans)) (make-no-nans-violation)) #t)
-
-    (test/approx (fixnum->flonum 2) 2.0)
-
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/base.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/base.sls
deleted file mode 100644
index e5bb04199d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/base.sls
+++ /dev/null
@@ -1,1584 +0,0 @@
-#!r6rs
-
-(library (tests r6rs base)
-  (export run-base-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define (try-reals f but-not)
-    (if (not (member 0 but-not))
-        (f 0))
-    (f -1.0)
-    (f 0.0)
-    (f 1.0)
-    (f 1/2)
-    (f (expt 2 30))
-    (f (expt 2 60))
-    (f (expt 2 90))
-    (f (- (expt 2 90)))
-    (if (not (member +inf.0 but-not))
-        (f +inf.0))
-    (if (not (member -inf.0 but-not))
-        (f -inf.0))
-    (if (not (exists nan? but-not))
-        (f +nan.0)))
-
-  (define (try-complexes f but-not)
-    (try-reals f but-not)
-    (f 1+2i))
-
-  (define (zero-or-nan? v)
-    (or (equal? v 0)
-        (nan? v)))
-
-  (define (one-two-or-two-one? v)
-    (or (equal? v '(1 2))
-        (equal? v '(2 1))))
-
-  ;; Based on tests from Ikarus:
-  (define-syntax divmod-test/?
-    (syntax-rules ()
-      [(_ x1 x2)
-       (begin
-         (test/values (div-and-mod x1 x2)
-                      (div x1 x2)
-                      (mod x1 x2))
-         (test/values (div0-and-mod0 x1 x2)
-                      (div0 x1 x2)
-                      (mod0 x1 x2)))]))
-  (define-syntax divmod-test
-    (syntax-rules ()
-      [(_ x1 x2)
-       (begin
-         (divmod-test/? x1 x2)
-         (test (<= 0 (mod x1 x2)) #t)
-         (test (< (mod x1 x2) (abs x2)) #t)
-         (test (+ (* (div x1 x2) x2) (mod x1 x2)) x1)
-         (test (<= (- (abs (/ x2 2))) (mod0 x1 x2)) #t)
-         (test (< (mod0 x1 x2) (abs (/ x2 2))) #t)
-         (test (+ (* (div0 x1 x2) x2) (mod0 x1 x2)) x1))]))
-
-  (define-syntax try-bad-divs
-    (syntax-rules ()
-      [(_ op)
-       (begin
-         (test/unspec-flonum-or-exn (op 1 0) &assertion)
-         (test/unspec-flonum-or-exn (op 1 0.0) &assertion)
-         (test/unspec-flonum-or-exn (op +inf.0 1) &assertion)
-         (test/unspec-flonum-or-exn (op -inf.0 1) &assertion)
-         (test/unspec-flonum-or-exn (op +nan.0 1) &assertion))]))
-
-  (define-syntax test-string-to-number
-    (syntax-rules ()
-      [(_ [str num] ...) (begin (test (string->number str) num) ...)]))
-
-  (define-syntax test/approx-string-to-number
-    (syntax-rules ()
-      [(_ [str num] ...) (begin (test/approx (string->number str) num) ...)]))
-
-  ;; Definitions ----------------------------------------
-
-  (define add3
-    (lambda (x) (+ x 3)))
-  (define first car)
-
-  (define reverse-subtract
-    (lambda (x y) (- y x)))
-
-  (define add4
-    (let ((x 4))
-      (lambda (y) (+ x y))))
-
-  (define x 0)
-
-  (define gen-counter
-    (lambda ()
-      (let ((n 0))
-        (lambda () (set! n (+ n 1)) n))))
-
-  (define gen-loser
-    (lambda ()
-      (let ((n 0))
-        (lambda () (set! n (+ n 1)) 27))))
-  
-  (define (fac n)
-    (if (not (integer-valued? n))
-        (assertion-violation
-         'fac "non-integral argument" n))
-    (if (negative? n)
-        (assertion-violation
-         'fac "negative argument" n))
-    (letrec
-        ((loop (lambda (n r)
-                 (if (zero? n)
-                     r
-                     (loop (- n 1) (* r n))))))
-      (loop n 1)))
-
-  (define compose
-    (lambda (f g)
-      (lambda args
-        (f (apply g args)))))
-
-  (define list-length
-    (lambda (obj)
-      (call-with-current-continuation
-       (lambda (return)
-         (letrec ((r
-                   (lambda (obj)
-                     (cond ((null? obj) 0)
-                           ((pair? obj)
-                            (+ (r (cdr obj)) 1))
-                           (else (return #f))))))
-           (r obj))))))
-
-  (define-syntax be-like-begin
-    (syntax-rules ()
-      ((be-like-begin name)
-       (define-syntax name
-         (syntax-rules ()
-           ((name expr (... ...))
-            (begin expr (... ...))))))))
-  (be-like-begin sequence)
-
-  (define p (cons 4 5))
-  (define-syntax p.car 
-    (identifier-syntax (car p)))
-
-  (define-syntax kons
-    (identifier-syntax cons))
-
-  ;; Not the same as in the report, because we avoid `set-car!':
-  (define-syntax p2.car
-    (identifier-syntax
-     (_ (car p))
-     ((set! _ e) (set! p (cons e (cdr p))))))
-
-  ;; Expressions ----------------------------------------
-
-  (define (run-base-tests)
-    ;; 11.2.1
-    (test (add3 3) 6)
-    (test (first '(1 2)) 1)
-
-    ;; 11.2.2
-    (test (let ()
-            (define even?
-              (lambda (x)
-                (or (= x 0) (odd? (- x 1)))))
-            (define-syntax odd?
-              (syntax-rules ()
-                ((odd?  x) (not (even? x)))))
-            (even? 10))
-          #t)
-    (test (let ()
-            (define-syntax bind-to-zero
-              (syntax-rules ()
-                ((bind-to-zero id) (define id 0))))
-            (bind-to-zero x)
-            x)
-          0)
-
-    ;; 11.3
-    (test (let ((x 5))
-            (define foo (lambda (y) (bar x y)))
-            (define bar (lambda (a b) (+ (* a b) a)))
-            (foo (+ x 3)))
-          45)
-    (test (let ((x 5))
-            (letrec* ((foo (lambda (y) (bar x y)))
-                      (bar (lambda (a b) (+ (* a b) a))))
-                     (foo (+ x 3))))
-          45)
-
-    (test/exn (letrec ([x y]
-                       [y x])
-                'should-not-get-here)
-              &assertion)
-
-    (test (letrec ([x (if (eq? (cons 1 2) (cons 1 2))
-                          x
-                          1)]) 
-            x)
-          1)
-
-    ;; 11.4.1
-    ;; (These tests are especially silly, since they really
-    ;;  have to work to get this far.)
-    (test (quote a) 'a)
-    (test (quote #(a b c)) (vector 'a 'b 'c))
-    (test (quote (+ 1 2)) '(+ 1 2))
-    (test '"abc" "abc")
-    (test '145932 145932)
-    (test 'a 'a)
-    (test '#(a b c) (vector 'a 'b 'c))
-    (test '() (list))
-    (test '(+ 1 2) '(+ 1 2))
-    (test '(quote a) '(quote a))
-    (test ''a '(quote a))
-
-    ;; 11.4.2
-    ;; (test (lambda (x) (+ x x)) {a procedure})
-    (test ((lambda (x) (+ x x)) 4) 8)
-    (test ((lambda (x)
-             (define (p y)
-               (+ y 1))
-             (+ (p x) x))
-           5) 
-          11)
-    (test (reverse-subtract 7 10) 3)
-    (test (add4 6) 10)
-    (test ((lambda x x) 3 4 5 6) '(3 4 5 6))
-    (test ((lambda (x y . z) z) 3 4 5 6)
-          '(5 6))
-    
-    ;; 11.4.3
-    (test (if (> 3 2) 'yes 'no) 'yes)
-    (test (if (> 2 3) 'yes 'no) 'no)
-    (test (if (> 3 2)
-              (- 3 2)
-              (+ 3 2))
-          1)
-    (test/unspec (if #f #f))
-
-    ;; 11.4.4
-    (test (let ((x 2))
-            (+ x 1)
-            (set! x 4)
-            (+ x 1)) 
-          5)
-
-    ;; 11.4.5
-    (test (cond ((> 3 2) 'greater)
-                ((< 3 2) 'less))          
-          'greater)
-
-    (test (cond ((> 3 3) 'greater)
-                ((< 3 3) 'less)
-                (else 'equal))
-          'equal)
-    (test (cond ('(1 2 3) => cadr)
-                (else #t))          
-          2)
-
-    (test (case (* 2 3)
-            ((2 3 5 7) 'prime)
-            ((1 4 6 8 9) 'composite))
-          'composite)
-    (test/unspec (case (car '(c d))
-                   ((a) 'a)
-                   ((b) 'b)))
-    (test (case (car '(c d))
-            ((a e i o u) 'vowel)
-            ((w y) 'semivowel)
-            (else 'consonant))
-          'consonant)
-    (test (case (list 1 2) ; newly allocated => not `eqv?'
-            (((1 2)) 'two)
-            (else 'other))
-          'other)
-
-    (test (and (= 2 2) (> 2 1)) #t)
-    (test (and (= 2 2) (< 2 1)) #f)
-    (test (and 1 2 'c '(f g)) '(f g))
-    (test (and) #t)
-
-    (test (or (= 2 2) (> 2 1)) #t)
-    (test (or (= 2 2) (< 2 1)) #t)
-    (test (or #f #f #f) #f)
-    (test (or '(b c) (/ 3 0)) '(b c))
-
-    ;; 11.4.6
-    (test (let ((x 2) (y 3))
-            (* x y))
-          6)
-
-    (test (let ((x 2) (y 3))
-            (let ((x 7)
-                  (z (+ x y)))
-              (* z x)))
-          35)
-    (test (let ((x 2) (y 3))
-            (let* ((x 7)
-                   (z (+ x y)))
-              (* z x)))
-          70)
-    (test (letrec ((even?
-                    (lambda (n)
-                      (if (zero? n)
-                          #t
-                          (odd? (- n 1)))))
-                   (odd?
-                    (lambda (n)
-                      (if (zero? n)
-                          #f
-                          (even? (- n 1))))))
-            (even? 88))   
-          #t)
-    (test (letrec* ((p
-                     (lambda (x)
-                       (+ 1 (q (- x 1)))))
-                    (q
-                     (lambda (y)
-                       (if (zero? y)
-                           0
-                           (+ 1 (p (- y 1))))))
-                    (x (p 5))
-                    (y x))
-                   y)
-          5)
-    (test (let-values (((a b) (values 1 2))
-                       ((c d) (values 3 4)))
-            (list a b c d))
-          '(1 2 3 4))
-    (test (let-values (((a b . c) (values 1 2 3 4)))
-            (list a b c))
-          '(1 2 (3 4)))
-    (test (let ((a 'a) (b 'b) (x 'x) (y 'y))
-            (let-values (((a b) (values x y))
-                         ((x y) (values a b)))
-              (list a b x y)))
-          '(x y a b))
-    (test (let ((a 'a) (b 'b) (x 'x) (y 'y))
-            (let*-values (((a b) (values x y))
-                          ((x y) (values a b)))
-              (list a b x y)))
-          '(x y x y))
-
-    ;; 11.4.7
-    (test (begin (set! x 5)
-                 (+ x 1))
-          6)
-    (test/output/unspec
-     (begin (display "4 plus 1 equals ")
-            (display (+ 4 1)))
-     "4 plus 1 equals 5")
-
-    ;; 11.5
-    (test (eqv? 'a 'a) #t)
-    (test (eqv? 'a 'b) #f)
-    (test (eqv? 2 2) #t)
-    (test (eqv? '() '()) #t)
-    (test (eqv? 100000000 100000000) #t)
-    (test (eqv? (cons 1 2) (cons 1 2)) #f)
-    (test (eqv? (lambda () 1) (lambda () 2)) #f)
-    (test (eqv? #f 'nil) #f)
-    (test/unspec (let ((p (lambda (x) x)))
-                   (eqv? p p)))
-    (test/unspec (eqv? "" ""))
-    (test/unspec (eqv? '#() '#()))
-    (test/unspec (eqv? (lambda (x) x)
-                       (lambda (x) x)))
-    (test/unspec (eqv? (lambda (x) x) (lambda (y) y)))
-    (test/unspec (eqv? +nan.0 +nan.0))
-
-    (test/unspec (let ((g (gen-counter)))
-                   (eqv? g g)))
-    (test (eqv? (gen-counter) (gen-counter)) #f)
-
-    (test/unspec (let ((g (gen-loser)))
-                   (eqv? g g)))
-    (test/unspec (eqv? (gen-loser) (gen-loser)))
-
-    (test/unspec (letrec ((f (lambda () (if (eqv? f g) 'both 'f)))
-                          (g (lambda () (if (eqv? f g) 'both 'g))))
-                   (eqv? f g)))
-
-    (test (letrec ((f (lambda () (if (eqv? f g) 'f 'both)))
-                   (g (lambda () (if (eqv? f g) 'g 'both))))
-            (eqv? f g))
-          #f)
-    
-    (test/unspec (eqv? '(a) '(a)))
-    (test/unspec (eqv? "a" "a"))
-    (test/unspec (eqv? '(b) (cdr '(a b))))
-    (test (let ((x '(a)))
-            (eqv? x x))
-          #t)
-
-    (test (eq? 'a 'a) #t)
-    (test/unspec (eq? '(a) '(a)))
-    (test (eq? (list 'a) (list 'a)) #f)
-    (test/unspec (eq? "a" "a"))
-    (test/unspec (eq? "" ""))
-    (test (eq? '() '()) #t)
-    (test/unspec (eq? 2 2))
-    (test/unspec (eq? #\A #\A))
-    (test (eq? car car) #t)
-    (test/unspec (let ((n (+ 2 3)))
-                   (eq? n n)))
-    (test (let ((x '(a)))
-            (eq? x x)) 
-          #t)
-    (test/unspec (let ((x '#()))
-                   (eq? x x)))
-    (test/unspec (let ((p (lambda (x) x)))
-                   (eq? p p)))
-
-    (test (equal? 'a 'a) #t)
-    (test (equal? '(a) '(a)) #t)
-    (test (equal? '(a (b) c) '(a (b) c)) #t)
-    (test (equal? "abc" "abc") #t)
-    (test (equal? 2 2) #t)
-    (test (equal? (make-vector 5 'a)
-                  (make-vector 5 'a)) 
-          #t)
-    (test (equal? '#vu8(1 2 3 4 5)
-                  (u8-list->bytevector
-                   '(1 2 3 4 5)))
-          #t)
-    (test/unspec (equal? (lambda (x) x)
-                         (lambda (y) y)))
-
-    (test (let* ((x (list 'a))
-                 (y (list 'a))
-                 (z (list x y)))
-            (list (equal? z (list y x))
-                  (equal? z (list x x))))
-          '(#t #t))
-
-    ;; 11.6
-    (test (procedure? car) #t)
-    (test (procedure? 'car) #f)
-    (test (procedure? (lambda (x) (* x x))) #t)
-    (test (procedure? '(lambda (x) (* x x))) #f)
-
-    ;; 11.7.4
-    (test (complex? 3+4i)                         #t)
-    (test (complex? 3)                            #t)
-    (test (real? 3)                               #t)
-    (test (real? -2.5+0.0i)                       #f)
-    (test (real? -2.5+0i)                         #t)
-    (test (real? -2.5)                            #t)
-    (test (real? #e1e10)                          #t)
-    (test (rational? 6/10)                        #t)
-    (test (rational? 6/3)                         #t)
-    (test (rational? 2)                           #t)
-    (test (integer? 3+0i)                         #t)
-    (test (integer? 3.0)                          #t)
-    (test (integer? 8/4)                          #t)
-
-    (test (number? +nan.0)                        #t)
-    (test (complex? +nan.0)                       #t)
-    (test (real? +nan.0)                          #t)
-    (test (rational? +nan.0)                      #f)
-    (test (complex? +inf.0)                       #t)
-    (test (real? -inf.0)                          #t)
-    (test (rational? -inf.0)                      #f)
-    (test (integer? -inf.0)                       #f)
-
-    (test (real-valued? +nan.0)                   #t)
-    (test (real-valued? +nan.0+0i)                   #t)
-    (test (real-valued? -inf.0)                   #t)
-    (test (real-valued? 3)                        #t)
-    (test (real-valued? -2.5+0.0i)                #t)
-    (test (real-valued? -2.5+0i)                  #t)
-    (test (real-valued? -2.5)                     #t)
-    (test (real-valued? #e1e10)                   #t)
-
-    (test (rational-valued? +nan.0)               #f)
-    (test (rational-valued? -inf.0)               #f)
-    (test (rational-valued? 6/10)                 #t)
-    (test (rational-valued? 6/10+0.0i)            #t)
-    (test (rational-valued? 6/10+0i)              #t)
-    (test (rational-valued? 6/3)                  #t)
-
-    (test (integer-valued? 3+0i)                  #t)
-    (test (integer-valued? 3+0.0i)                #t)
-    (test (integer-valued? 3.0)                   #t)
-    (test (integer-valued? 3.0+0.0i)              #t)
-    (test (integer-valued? 8/4)                   #t)
-
-    (test (exact? 5)                    #t)
-    (test (inexact? +inf.0)             #t)
-
-    (test (inexact 2) 2.0)
-    (test (inexact 2.0) 2.0)
-    (test (exact 2) 2)
-    (test (exact 2.0) 2)
-
-    (for-each
-     (lambda (x y)
-       (let ([try-one
-              (lambda (x y)
-                (let ([try-x
-                       (lambda (x x2)
-                         (test (= x x2) #t)
-                         (test (< x x2) #f)
-                         (test (> x x2) #f)
-                         (test (<= x x2) #t)
-                         (test (>= x x2) #t))])
-                  (try-x x x)
-                  (when (exact? x)
-                    (try-x x (inexact x))
-                    (try-x (inexact x) x)))
-                (test (< x y) #t)
-                (test (<= x y) #t)
-                (test (> x y) #f)
-                (test (>= x y) #f)
-                (test (< y x) #f)
-                (test (<= y x) #f)
-                (test (> y x) #t)
-                (test (>= y x) #t))])
-         (try-one x y)
-         (try-one (inexact x) y)
-         (try-one x (inexact y))
-         (try-one (inexact x) (inexact y))))
-     (list 1/2 1 3/2 (expt 2 100) (expt 2 100))
-     (list 1 2 51/20 (expt 2 102) (/ (* 4 (expt 2 100)) 3)))
-
-    (test (= +inf.0 +inf.0)            #t)
-    (test (= -inf.0 +inf.0)            #f)
-    (test (= -inf.0 -inf.0)            #t)
-    (test (= +nan.0 +nan.0)            #f)
-
-    (try-reals
-     (lambda (x)
-       (test (< -inf.0 x +inf.0)         #t)
-       (test (> +inf.0 x -inf.0)         #t))
-     '(+inf.0 -inf.0 +nan.0))
-
-    (try-complexes
-     (lambda (z)
-       (test (= +nan.0 x)                #f))
-     '())
-
-    (try-reals
-     (lambda (x)
-       (test (< +nan.0 x)                #f)
-       (test (> +nan.0 x)                #f))
-     '())
-
-    (test (zero? +0.0)                   #t)
-    (test (zero? -0.0)                   #t)
-    (test (zero? 2.0)                    #f)
-    (test (zero? -2.0)                   #f)
-    (test (zero? +nan.0)                 #f)
-    (test (positive? 10)                 #t)
-    (test (positive? -10)                #f)
-    (test (positive? +inf.0)             #t)
-    (test (negative? -inf.0)             #t)
-    (test (positive? +nan.0)             #f)
-    (test (negative? 10)                 #f)
-    (test (negative? -10)                #t)
-    (test (negative? +nan.0)             #f)
-    (test (finite? +inf.0)               #f)
-    (test (finite? 5)                    #t)
-    (test (finite? 5.0)                  #t)
-    (test (infinite? 5.0)                #f)
-    (test (infinite? +inf.0)             #t)
-    (test (nan? +nan.0)                  #t)
-    (test (nan? +inf.0)                  #f)
-    (test (nan? 1020.0)                  #f)
-    (test (nan? 1020/3)                  #f)
-
-    (test (odd? 5) #t)
-    (test (odd? 50) #f)
-    (test (odd? 5.0) #t)
-    (test (odd? 50.0) #f)
-    (test (even? 5) #f)
-    (test (even? 50) #t)
-    (test (even? 5.0) #f)
-    (test (even? 50.0) #t)
-
-    (test (max 3 4)                               4)
-    (test (max 3.9 4)                             4.0)
-
-    (try-reals
-     (lambda (x)
-       (test (max +inf.0 x)                          +inf.0)
-       (test (min -inf.0 x)                          -inf.0))
-     '(+nan.0))
-
-    (test (+ 3 4)                                 7)
-    (test (+ 3)                                   3)
-    (test (+)                                     0)
-    (test (+ 3.0 4)                               7.0)
-    (test (+ +inf.0 +inf.0)                       +inf.0)
-    (test (+ +inf.0 -inf.0)                       +nan.0)
-
-    (test (* 4)                                   4)
-    (test (* 4 3)                                 12)
-    (test (* 4 3.0)                               12.0)
-    (test (*)                                     1)
-    (test (* 5 +inf.0)                            +inf.0)
-    (test (* -5 +inf.0)                           -inf.0)
-    (test (* +inf.0 +inf.0)                       +inf.0)
-    (test (* +inf.0 -inf.0)                       -inf.0)
-    (test (zero-or-nan? (* 0 +inf.0)) #t)
-    (test (zero-or-nan? (* 0 +nan.0)) #t)
-    (test (zero? (* 1.0 0)) #t)
-    
-    (try-reals 
-     (lambda (x)
-       (test (+ +inf.0 x)                            +inf.0)
-       (test (+ -inf.0 x)                            -inf.0))
-     '(+inf.0 -inf.0 +nan.0))
-    
-    (try-reals 
-     (lambda (x)
-       (test (+ +nan.0 x)                            +nan.0))
-     '())
-
-    (try-reals 
-     (lambda (x)
-       (test (* +nan.0 x)                            +nan.0))
-     '(0))
-    
-    (test (+ 0.0 -0.0)  0.0)
-    (test (+ -0.0 0.0)  0.0)
-    (test (+ 0.0 0.0)   0.0)
-    (test (+ -0.0 -0.0) -0.0)
-    
-    (test (- 3 4)                                 -1)
-    (test (- 3 4 5)                               -6)
-    (test (- 3)                                   -3)
-    (test (- +inf.0 +inf.0)                       +nan.0)
-    
-    (test (- 0.0)       -0.0)
-    (test (- -0.0)      0.0)
-    (test (- 0.0 -0.0)  0.0)
-    (test (- -0.0 0.0)  -0.0)
-    (test (- 0.0 0.0)   0.0)
-    (test (- -0.0 -0.0) 0.0)
-    
-    (test (/ 3 4 5)                               3/20)
-    (test (/ 2 3)                                 2/3)
-    (test (/ 3 2.0)                               1.5)
-    (test (/ 3)                                   1/3)
-    (test (/ 0.0)                                 +inf.0)
-    (test (/ 1.0 0)                               +inf.0)
-    (test (/ -1 0.0)                              -inf.0)
-    (test (/ +inf.0)                              0.0)
-
-    (test/exn (/ 0 0) &assertion)
-    (test/exn (/ 3 0) &assertion)
-    (test (/ 0 3.5)                               0.0)
-    (test (/ 0 0.0)                               +nan.0)
-    (test (/ 0.0 0)                               +nan.0)
-    (test (/ 0.0 0.0)                             +nan.0)
-
-    (test (abs 7)                                 7)
-    (test (abs -7)                                7)
-    (test (abs (- (expt 2 100)))                  (expt 2 100))
-    (test (abs -inf.0)                            +inf.0)
-
-    (test (div 123 10) 12)
-    (test (mod 123 10) 3)
-    (test (div 123 -10) -12)
-    (test (mod 123 -10) 3)
-    (test (div -123 10) -13)
-    (test (mod -123 10) 7)
-    (test (div -123 -10) 13)
-    (test (mod -123 -10) 7)
-
-    (test (div0 123 10) 12)
-    (test (mod0 123 10) 3)
-    (test (div0 123 -10) -12)
-    (test (mod0 123 -10) 3)
-    (test (div0 -123 10) -12)
-    (test (mod0 -123 10) -3)
-    (test (div0 -123 -10) 12)
-    (test (mod0 -123 -10) -3)
-
-    ;; `divmod-test' cases originally from Ikarus:
-
-    (divmod-test +17 +3)
-    (divmod-test +17 -3)
-    (divmod-test -17 +3)
-    (divmod-test -17 -3)
-    (divmod-test +16 +3)
-    (divmod-test +16 -3)
-    (divmod-test -16 +3)
-    (divmod-test -16 -3)
-    (divmod-test +15 +3)
-    (divmod-test +15 -3)
-    (divmod-test -15 +3)
-    (divmod-test -15 -3)
-    (divmod-test +10 +4)
-    (divmod-test +10 -4)
-    (divmod-test -10 +4)
-    (divmod-test -10 -4)
-
-    (divmod-test +3 +5/6)
-    (divmod-test -3 +5/6)
-    (divmod-test +3 -5/6)
-    (divmod-test -3 -5/6)
-
-    (divmod-test +3 +7/11)
-    (divmod-test -3 +7/11)
-    (divmod-test +3 -7/11)
-    (divmod-test -3 -7/11)
-
-    (divmod-test (least-fixnum)    +1)
-    (divmod-test (least-fixnum)    -1)
-    (divmod-test (greatest-fixnum) +1)
-    (divmod-test (greatest-fixnum) -1)
-    (divmod-test (least-fixnum)    +2)
-    (divmod-test (least-fixnum)    -2)
-    (divmod-test (greatest-fixnum) +2)
-    (divmod-test (greatest-fixnum) -2)
-
-    (divmod-test 0 (least-fixnum))
-    (divmod-test 0 (greatest-fixnum))
-    (divmod-test +1 (least-fixnum))
-    (divmod-test +1 (greatest-fixnum))
-    (divmod-test -1 (least-fixnum))
-    (divmod-test -1 (greatest-fixnum))
-    (divmod-test +2 (least-fixnum))
-    (divmod-test +2 (greatest-fixnum))
-    (divmod-test -2 (least-fixnum))
-    (divmod-test -2 (greatest-fixnum))
-
-    (divmod-test (least-fixnum) (least-fixnum))
-    (divmod-test (greatest-fixnum) (least-fixnum))
-    (divmod-test (least-fixnum) (greatest-fixnum))
-    (divmod-test (greatest-fixnum) (greatest-fixnum))    
-
-    (divmod-test +17.0 +3.0)
-    (divmod-test +17.0 -3.0)
-    (divmod-test -17.0 +3.0)
-    (divmod-test -17.0 -3.0)
-    (divmod-test +16.0 +3.0)
-    (divmod-test +16.0 -3.0)
-    (divmod-test -16.0 +3.0)
-    (divmod-test -16.0 -3.0)
-    (divmod-test +15.0 +3.0)
-    (divmod-test +15.0 -3.0)
-    (divmod-test -15.0 +3.0)
-    (divmod-test -15.0 -3.0)
-    (divmod-test +17.0 +3.5)
-    (divmod-test +17.0 -3.5)
-    (divmod-test -17.0 +3.5)
-    (divmod-test -17.0 -3.5)
-    (divmod-test +16.0 +3.5)
-    (divmod-test +16.0 -3.5)
-    (divmod-test -16.0 +3.5)
-    (divmod-test -16.0 -3.5)
-    (divmod-test +15.0 +3.5)
-    (divmod-test +15.0 -3.5)
-    (divmod-test -15.0 +3.5)
-    (divmod-test -15.0 -3.5)
-    (divmod-test/? +17.0 +nan.0)
-    (divmod-test/? -17.0 +nan.0)
-    (divmod-test/? +17.0 +inf.0)
-    (divmod-test/? +17.0 -inf.0)
-    (divmod-test/? -17.0 +inf.0)
-    (divmod-test/? -17.0 -inf.0)
-
-    (divmod-test +17.0 +3.0)
-    (divmod-test +17.0 -3.0)
-    (divmod-test -17.0 +3.0)
-    (divmod-test -17.0 -3.0)
-    (divmod-test +16.0 +3.0)
-    (divmod-test +16.0 -3.0)
-    (divmod-test -16.0 +3.0)
-    (divmod-test -16.0 -3.0)
-    (divmod-test +15.0 +3.0)
-    (divmod-test +15.0 -3.0)
-    (divmod-test -15.0 +3.0)
-    (divmod-test -15.0 -3.0)
-    (divmod-test +17.0 +3.5)
-    (divmod-test +17.0 -3.5)
-    (divmod-test -17.0 +3.5)
-    (divmod-test -17.0 -3.5)
-    (divmod-test +16.0 +3.5)
-    (divmod-test +16.0 -3.5)
-    (divmod-test -16.0 +3.5)
-    (divmod-test -16.0 -3.5)
-    (divmod-test +15.0 +3.5)
-    (divmod-test +15.0 -3.5)
-    (divmod-test -15.0 +3.5)
-    (divmod-test -15.0 -3.5)
-    (divmod-test +10.0 +4.0)
-    (divmod-test +10.0 -4.0)
-    (divmod-test -10.0 +4.0)
-    (divmod-test -10.0 -4.0)
-    (divmod-test/? +17.0 +nan.0)
-    (divmod-test/? -17.0 +nan.0)
-    (divmod-test/? +17.0 +inf.0)
-    (divmod-test/? +17.0 -inf.0)
-    (divmod-test/? -17.0 +inf.0)
-    (divmod-test/? -17.0 -inf.0)
-
-    (try-bad-divs div)
-    (try-bad-divs mod)
-    (try-bad-divs div-and-mod)
-    (try-bad-divs div0)
-    (try-bad-divs mod0)
-    (try-bad-divs div0-and-mod0)
-
-    (test (gcd 32 -36)                            4)
-    (test (gcd)                                   0)
-    (test (lcm 32 -36)                            288)
-    (test (lcm 32.0 -36)                          288.0)
-    (test (lcm)                                   1)
-    
-    (test (numerator 6)                           6)
-    (test (numerator (/ 6 4))                     3)
-    (test (denominator (/ 6 4))                   2)
-    (test (denominator 6)                         1)
-    (test (denominator (inexact (/ 6 4))) 2.0)
-
-    (test (floor -4.3)                            -5.0)
-    (test (ceiling -4.3)                          -4.0)
-    (test (truncate -4.3)                         -4.0)
-    (test (round -4.3)                            -4.0)
-
-    (test (floor 3.5)                             3.0)
-    (test (ceiling 3.5)                           4.0)
-    (test (truncate 3.5)                          3.0)
-    (test (round 3.5)                             4.0)
-    
-    (test (round 7/2)                             4)
-    (test (round 7)                               7)
-    
-    (test (floor +inf.0)                          +inf.0)
-    (test (ceiling -inf.0)                        -inf.0)
-    (test (round +nan.0)                          +nan.0)
-    
-    (test (rationalize (exact .3) 1/10)          1/3)
-    (test/approx (rationalize .3 1/10) #i1/3)
-    
-    (test (rationalize +inf.0 3)                  +inf.0)
-    (test (rationalize +inf.0 +inf.0)             +nan.0)
-    (test (rationalize 3 +inf.0)                  0.0)
-
-    (test/approx (exp 1)    2.718281828459045)
-    (test (exp +inf.0)                   +inf.0)
-    (test (exp -inf.0)                   0.0)
-    (test/approx (log 2.718281828459045) 1.0)
-    (test (log +inf.0)                   +inf.0)
-    (test (log 0.0)                      -inf.0)
-    (test/approx (log 100 10) 2.0)
-    (test/approx (log 1125899906842624 2) 50.0)
-
-    (test/exn (log 0) &assertion)
-
-    (test/approx (log -inf.0) +inf.0+3.141592653589793i)
-    (test/approx (atan -inf.0) -1.5707963267948965)
-    (test/approx (atan +inf.0) 1.5707963267948965)
-    (test/approx (log -1.0+0.0i) 0.0+3.141592653589793i)
-    (unless (eqv? 0.0 -0.0)
-      (test/approx (log -1.0-0.0i) 0.0-3.141592653589793i))
-
-    (test/approx (sqrt 5) 2.23606797749979)
-    (test/approx (sqrt -5) 0.0+2.23606797749979i)
-
-    (test (sqrt +inf.0)                +inf.0)
-    (test (sqrt -inf.0)                +inf.0i)
-
-    (test/values (exact-integer-sqrt 0) 0 0)
-    (test/values (exact-integer-sqrt 4) 2 0)
-    (test/values (exact-integer-sqrt 5) 2 1)
-    
-    (test (expt 5 3)                   125)
-    (test (expt 5 -3)                  1/125)
-    (test (expt 5 0)                   1)
-    (test (expt 0 5)                   0)
-    (test/approx (expt 0 5+.0000312i)  0.0) ; R6RS (Sept 2007) appears to be wrong; also, test that result is inexact?
-    (test/approx (expt 0.0 5+.0000312i) 0.0)
-    (test/approx (expt 0 0.0) 1.0)
-    (test/approx (expt 0.0 0.0) 1.0)
-    (test/unspec-or-exn (expt 0 -5) &implementation-restriction)
-    (test/unspec-or-exn (expt 0 -5+.0000312i) &implementation-restriction)
-    (test (expt 0 0)                   1)
-    (test (expt 0.0 0.0)               1.0)
-    
-    
-    (test/approx (make-rectangular 1.1 0.0) 1.1+0.0i)
-    (test/approx (make-rectangular 1.1 2.2) 1.1+2.2i)
-    (test/approx (make-polar 1.1 0.0) 1.1+0.0i)
-    (test/approx (make-polar 1.1 2.2) 1.1@2.2)
-
-    (test/approx (real-part 1.1+2.2i)              1.1)
-    (test/approx (imag-part 1.1+2.2i)              2.2)
-    (test/approx (magnitude 1.1@2.2)              1.1)
-
-    (test (exact? (imag-part 0.0)) #t)
-    (test (exact? (imag-part 1.0)) #t)
-    (test (exact? (imag-part 1.1)) #t)
-    (test (exact? (imag-part +nan.0)) #t)
-    (test (exact? (imag-part +inf.0)) #t)
-    (test (exact? (imag-part -inf.0)) #t)
-
-    (test (zero? (imag-part 0.0)) #t)
-    (test (zero? (imag-part 1.0)) #t)
-    (test (zero? (imag-part 1.1)) #t)
-    (test (zero? (imag-part +nan.0)) #t)
-    (test (zero? (imag-part +inf.0)) #t)
-    (test (zero? (imag-part -inf.0)) #t) 
-
-    (test/approx (angle 1.1@2.2)                  2.2)
-
-    (test/approx (angle -1.0)         3.141592653589793)
-    (test/approx (angle -1.0+0.0i)    3.141592653589793)
-    (unless (eqv? 0.0 -0.0)
-      (test/approx (angle -1.0-0.0i)    -3.141592653589793))
-    (test (angle +inf.0)       0.0)
-    (test/approx (angle -inf.0)       3.141592653589793)
-
-    (test (magnitude (make-rectangular +inf.0 1)) +inf.0)
-    (test (magnitude (make-rectangular -inf.0 1)) +inf.0)
-    (test (magnitude (make-rectangular 1 +inf.0)) +inf.0)
-    (test (magnitude (make-rectangular 1 -inf.0)) +inf.0)
-
-    (test/approx (angle -1)   3.141592653589793)
-
-    (for-each 
-     (lambda (n)
-       (test (string->number (number->string n)) n)
-       (test (string->number (number->string (inexact n) 10 5)) (inexact n))
-       (when (exact? n)
-         (test (string->number (number->string n 16) 16) n)
-         (test (string->number (string-append "#x" (number->string n 16))) n)
-         (test (string->number (number->string n 8) 8) n)
-         (test (string->number (string-append "#o" (number->string n 8))) n)
-         (test (string->number (number->string n 2) 2) n)
-         (test (string->number (string-append "#b" (number->string n 2))) n)
-         (test (string->number (number->string n 10) 10) n)
-         (test (string->number (string-append "#d" (number->string n 10))) n)))
-     '(1 15 1023 -5 2.0 1/2 2e200 1+2i))
-    (test (string->number "nope") #f)
-
-    (test (string->number "100")                  100)
-    (test (string->number "100" 16)               256)
-    (test (string->number "1e2")                  100.0)
-    (test (string->number "0/0")                  #f)
-    (test (string->number "+inf.0")               +inf.0)
-    (test (string->number "-inf.0")               -inf.0)
-    (test (string->number "+nan.0")               +nan.0)
-
-    ;; Originally from Ikarus:
-    (test-string-to-number
-     ("10" 10)
-     ("1" 1)
-     ("-17" -17)
-     ("+13476238746782364786237846872346782364876238477" 
-      13476238746782364786237846872346782364876238477)
-     ("1/2" (/ 1 2))
-     ("-1/2" (/ 1 -2))
-     ("#x24" 36)
-     ("#x-24" -36)
-     ("#b+00000110110" 54)
-     ("#b-00000110110/10" -27)
-     ("#e10" 10)
-     ("#e1" 1)
-     ("#e-17" -17)
-     ("#e#x24" 36)
-     ("#e#x-24" -36)
-     ("#e#b+00000110110" 54)
-     ("#e#b-00000110110/10" -27)
-     ("#x#e24" 36)
-     ("#x#e-24" -36)
-     ("#b#e+00000110110" 54)
-     ("#b#e-00000110110/10" -27)
-     ("#e1e1000" (expt 10 1000))
-     ("#e-1e1000" (- (expt 10 1000)))
-     ("#e1e-1000" (expt 10 -1000))
-     ("#e-1e-1000" (- (expt 10 -1000))))
-
-    (test/approx-string-to-number
-     ("#i1e100" (inexact (expt 10 100)))
-     ("#i1e1000" (inexact (expt 10 1000)))
-     ("#i-1e1000" (inexact (- (expt 10 1000))))
-     ("1e100" (inexact (expt 10 100)))
-     ("1.0e100" (inexact (expt 10 100)))
-     ("1.e100" (inexact (expt 10 100)))
-     ("0.1e100" (inexact (expt 10 99)))
-     (".1e100" (inexact (expt 10 99)))
-     ("+1e100" (inexact (expt 10 100)))
-     ("+1.0e100" (inexact (expt 10 100)))
-     ("+1.e100" (inexact (expt 10 100)))
-     ("+0.1e100" (inexact (expt 10 99)))
-     ("+.1e100" (inexact (expt 10 99)))
-     ("-1e100" (inexact (- (expt 10 100))))
-     ("-1.0e100" (inexact (- (expt 10 100))))
-     ("-1.e100" (inexact (- (expt 10 100))))
-     ("-0.1e100" (inexact (- (expt 10 99))))
-     ("-.1e100" (inexact (- (expt 10 99)))))
-
-    ;; 11.8
-    (test (not #t)    #f)
-    (test (not 3)           #f)
-    (test (not (list 3))    #f)
-    (test (not #f)   #t)
-    (test (not '())         #f)
-    (test (not (list))      #f)
-    (test (not 'nil)        #f)
-    
-    (test (boolean? #f)   #t)
-    (test (boolean? 0)           #f)
-    (test (boolean? '())         #f)
-
-    (test (boolean=? #f #f) #t)
-    (test (boolean=? #t #t) #t)
-    (test (boolean=? #t #f) #f)
-    (test (boolean=? #f #t) #f)
-    (test (boolean=? #t #t #f) #f)
-    (test (boolean=? #t #t #t #t) #t)
-
-    ;; 11.9
-    (test (pair? '(a . b))         #t)
-    (test (pair? '(a b c))         #t)
-    (test (pair? '())              #f)
-    (test (pair? '#(a b))          #f)
-
-    (test (cons 'a '())            '(a))
-    (test (cons '(a) '(b c d))     '((a) b c d))
-    (test (cons "a" '(b c))        '("a" b c))
-    (test (cons 'a 3)              '(a . 3))
-    (test (cons '(a b) 'c)         '((a b) . c))
-
-    (test (car '(a b c))           'a)
-    (test (car '((a) b c d))       '(a))
-    (test (car '(1 . 2))           1)
-    (test/exn (car '()) &assertion)
-    
-    (test (cdr '((a) b c d))       '(b c d))
-    (test (cdr '(1 . 2))           2)
-    (test/exn (cdr '()) &assertion)
-
-    (test (cadr '(1 2)) 2)
-    (test (cddr '(1 2)) '())
-    (test (cdar '((1) 2)) '())
-    (test (caar '((1) 2)) 1)
-
-    (test (cadar '((1 2))) 2)
-    (test (cddar '((1 2))) '())
-    (test (cdaar '(((1) 2))) '())
-    (test (caaar '(((1) 2))) 1)
-    (test (caddr '(0 1 2)) 2)
-    (test (cdddr '(0 1 2)) '())
-    (test (cdadr '(0 (1) 2)) '())
-    (test (caadr '(0 (1) 2)) 1)
-
-    (test (cadaar '(((1 2)))) 2)
-    (test (cddaar '(((1 2)))) '())
-    (test (cdaaar '((((1) 2)))) '())
-    (test (caaaar '((((1) 2)))) 1)
-    (test (caddar '((0 1 2))) 2)
-    (test (cdddar '((0 1 2))) '())
-    (test (cdadar '((0 (1) 2))) '())
-    (test (caadar '((0 (1) 2))) 1)
-    (test (cadadr '(- (1 2))) 2)
-    (test (cddadr '(- (1 2))) '())
-    (test (cdaadr '(- ((1) 2))) '())
-    (test (caaadr '(- ((1) 2))) 1)
-    (test (cadddr '(- 0 1 2)) 2)
-    (test (cddddr '(- 0 1 2)) '())
-    (test (cdaddr '(- 0 (1) 2)) '())
-    (test (caaddr '(- 0 (1) 2)) 1)
-
-    (test (null? '())           #t)
-    (test (null? '(1))          #f)
-    (test (null? #f)            #f)
-
-    (test (list? '(a b c))      #t)
-    (test (list? '())           #t)
-    (test (list? '(a . b))      #f)
-    
-    (test (list 'a (+ 3 4) 'c)             '(a 7 c))
-    (test (list)                           '())
-
-    (test (length '(a b c))                3)
-    (test (length '(a (b) (c d e)))        3)
-    (test (length '())                     0)
-
-    (test (append '(x) '(y))               '(x y))
-    (test (append '(a) '(b c d))           '(a b c d))
-    (test (append '(a (b)) '((c)))         '(a (b) (c)))
-    (test (append '(a b) '(c . d))         '(a b c . d))
-    (test (append '() 'a)                  'a)
-
-    (test (reverse '(a b c))               '(c b a))
-    (test (reverse '(a (b c) d (e (f))))   '((e (f)) d (b c) a))
-
-    (test (list-tail '(a b c d) 2)                  '(c d))
-    (test (list-tail '(a b . c) 2)                  'c)
-
-    (test (list-ref '(a b c d) 2)                 'c)
-    (test (list-ref '(a b c . d) 2)                 'c)
-
-    (test (map cadr '((a b) (d e) (g h)))    '(b e h))
-
-    (test (map (lambda (n) (expt n n))
-               '(1 2 3 4 5))
-          '(1 4 27 256 3125))
-
-    (test (map + '(1 2 3) '(4 5 6))          '(5 7 9))
-
-    (test (one-two-or-two-one?
-           (let ((count 0))
-             (map (lambda (ignored)
-                    (set! count (+ count 1))
-                    count)
-                  '(a b))))
-          #t)
-
-    (test (let ((v (make-vector 5)))
-            (for-each (lambda (i)
-                        (vector-set! v i (* i i)))
-                      '(0 1 2 3 4))
-            v) 
-          '#(0 1 4 9 16))
-
-    (test/unspec (for-each (lambda (x) x) '(1 2 3 4)))
-
-    (test/unspec (for-each even? '()))
-
-    ;; 11.10
-    (test (symbol? 'foo)           #t)
-    (test (symbol? (car '(a b)))   #t)
-    (test (symbol? "bar")          #f)
-    (test (symbol? 'nil)           #t)
-    (test (symbol? '())            #f)
-    (test (symbol? #f)      #f)
-
-    (test (symbol=? 'a 'a)         #t)
-    (test (symbol=? 'a 'A)         #f)
-    (test (symbol=? 'a 'b)         #f)
-    (test (symbol=? 'a 'a 'b)      #f)
-    (test (symbol=? 'a 'a 'a 'a)   #t)
-    
-    (test (symbol->string 'flying-fish)     
-          "flying-fish")
-    (test (symbol->string 'Martin)           "Martin")
-    (test (symbol->string
-           (string->symbol "Malvina"))     
-          "Malvina")
-
-    (test (eq? 'mISSISSIppi 'mississippi)   #f)
-    (test (string->symbol "mISSISSIppi")
-          'mISSISSIppi)
-    (test (eq? 'bitBlt (string->symbol "bitBlt"))      #t)
-    (test (eq? 'JollyWog
-               (string->symbol
-                (symbol->string 'JollyWog)))   #t)
-    (test (string=? "K. Harper, M.D."
-                    (symbol->string
-                     (string->symbol "K. Harper, M.D.")))   
-          #t)
-
-    ;; 11.11
-    (test (char? #\a) #t)
-    (test (char? 'a) #f)
-    (test (char? 65) #f)
-    
-    (test (integer->char 32) #\space)
-    (test (integer->char #xDF) #\xDF)
-    (test (integer->char #x10AAAA) #\x10AAAA)
-    (test (char->integer (integer->char 5000))
-          5000)
-    (test/exn (integer->char #xD800) &assertion)
-    (test (char=? #\z #\xDF) #f)
-    (test (char=? #\z #\z) #t)
-    (test (char<? #\z #\z) #f)
-    (test (char<? #\z #\xDF) #t)
-    (test (char<? #\xDF #\z) #f)
-    (test (char<? #\z #\Z) #f)
-    (test (char<=? #\z #\z) #t)
-    (test (char<=? #\z #\xDF) #t)
-    (test (char<=? #\xDF #\z) #f)
-    (test (char<=? #\z #\Z) #f)
-    (test (char>? #\z #\z) #f)
-    (test (char>? #\z #\xDF) #f)
-    (test (char>? #\xDF #\z) #t)
-    (test (char>? #\z #\Z) #t)
-    (test (char>=? #\z #\z) #t)
-    (test (char>=? #\z #\xDF) #f)
-    (test (char>=? #\xDF #\z) #t)
-    (test (char>=? #\z #\Z) #t)
-
-    ;; 11.12
-    (test (string? "apple") #t)
-    (test (string? #vu8(1 2)) #f)
-    (test (string? #\a) #f)
-    (test (string? 77) #f)
-
-    (test (string-length (make-string 10)) 10)
-    (test (string-length (make-string 10 #\a)) 10)
-    (test (string-ref (make-string 10 #\a) 0) #\a)
-    (test (string-ref (make-string 10 #\a) 5) #\a)
-    (test (string-ref (make-string 10 #\a) 9) #\a)
-
-    (test (string=? "Strasse" "Strasse") #t)
-    (test (string=? "Stra\xDF;e" "Strasse") #f)
-    (test (string=? "Strasse" "Strasse" "Stra\xDF;e") #f)
-    (test (string=? "Strasse" "Stra\xDF;e" "Strasse") #f)
-    (test (string=? "Stra\xDF;e" "Strasse" "Strasse") #f)
-    (test (string=? "Strasse" "Strasse" "Strasse") #t)
-
-    (test (string<? "z" "z") #f)
-    (test (string<? "z" "\xDF;") #t)
-    (test (string<? "\xDF;" "z") #f)
-    (test (string<? "z" "zz") #t)
-    (test (string<? "z" "Z") #f)
-    (test (string<=? "z" "\xDF;") #t)
-    (test (string<=? "\xDF;" "z") #f)
-    (test (string<=? "z" "zz") #t)
-    (test (string<=? "z" "Z") #f)
-    (test (string<=? "z" "z") #t)
-
-    (test (string<? "z" "z") #f)
-    (test (string>? "z" "\xDF;") #f)
-    (test (string>? "\xDF;" "z") #t)
-    (test (string>? "z" "zz") #f)
-    (test (string>? "z" "Z") #t)
-    (test (string>=? "z" "\xDF;") #f)
-    (test (string>=? "\xDF;" "z") #t)
-    (test (string>=? "z" "zz") #f)
-    (test (string>=? "z" "Z") #t)
-    (test (string>=? "z" "z") #t)
-
-    (test (substring "apple" 0 3) "app")
-    (test (substring "apple" 1 3) "pp")
-    (test (substring "apple" 3 5) "le")
-
-    (test (string-append "apple") "apple")
-    (test (string-append "apple" "banana") "applebanana")
-    (test (string-append "apple" "banana" "cherry") "applebananacherry")
-
-    (test (string->list "apple") (list #\a #\p #\p #\l #\e))
-    (test (list->string (list #\a #\p #\p #\l #\e)) "apple")
-
-    (let ([accum '()])
-      (test/unspec (string-for-each (lambda (a) (set! accum (cons a accum)))
-                                    "elppa"))
-      (test accum '(#\a #\p #\p #\l #\e))
-      (test/unspec (string-for-each (lambda (a b) (set! accum (cons (list a b) accum)))
-                                    "elppa"
-                                    "ananb"))
-      (test accum '((#\a #\b) (#\p #\n) (#\p #\a) (#\l #\n) (#\e #\a)
-                    #\a #\p #\p #\l #\e))
-      (test/unspec (string-for-each (lambda (a b c) (set! accum c))
-                                    "elppa"
-                                    "ananb"
-                                    "chery"))
-      (test accum #\y))
-
-    (test "apple" (string-copy "apple"))
-    (let ([s "apple"])
-      (test (eq? s (string-copy s)) #f))
-
-    ;; 11.13
-    (test (vector? '#(1 2 3)) #t)
-    (test (vector? "apple") #f)
-
-    (test (vector-length (make-vector 10)) 10)
-    (test (vector-length (make-vector 10 'x)) 10)
-    (test (vector-ref (make-vector 10 'x) 0) 'x)
-    (test (vector-ref (make-vector 10 'x) 5) 'x)
-    (test (vector-ref (make-vector 10 'x) 9) 'x)
-
-    (test '#(0 (2 2 2 2) "Anna")  (vector 0 '(2 2 2 2) "Anna"))
-    (test (vector 'a 'b 'c)       '#(a b c))
-    (test (vector-ref '#(1 1 2 3 5 8 13 21) 5)   8)
-
-    (test (let ((vec (vector 0 '(2 2 2 2) "Anna")))
-            (vector-set! vec 1 '("Sue" "Sue"))
-            vec)
-          '#(0 ("Sue" "Sue") "Anna"))
-
-    (test/unspec-or-exn (vector-set! '#(0 1 2) 1 "doe") &assertion)
-
-    (test (vector->list '#(dah dah didah))  '(dah dah didah))
-    (test (list->vector '(dididit dah))     '#(dididit dah))
-
-    (let ([vec (vector 'x 'y 'z)])
-      (vector-fill! vec 10.1)
-      (test vec '#(10.1 10.1 10.1)))
-
-    (test (vector-map (lambda (x) (+ 1 x)) 
-                      '#(1 2 3))
-          '#(2 3 4))
-    (test (vector-map (lambda (x y) (- x y)) 
-                      '#(3 4 5) 
-                      '#(0 -1 2))
-          '#(3 5 3))
-    (test (vector-map (lambda (x y f) (f (- x y)))
-                      '#(3 4 5) 
-                      '#(0 -1 2)
-                      (vector - * /))
-          '#(-3 5 1/3))
-
-    (let ([accum '()])
-      (test/unspec (vector-for-each (lambda (a) (set! accum (cons a accum)))
-                                    '#(e l p p a)))
-      (test accum '(a p p l e))
-      (test/unspec (vector-for-each (lambda (a b) (set! accum (cons (list a b) accum)))
-                                    '#(e l p p a)
-                                    '#(a n a n b)))
-      (test accum '((a b) (p n) (p a) (l n) (e a)
-                    a p p l e))
-      (test/unspec (vector-for-each (lambda (a b c) (set! accum c))
-                                    '#(e l p p a)
-                                    '#(a n a n b)
-                                    '#(c h e r y)))
-      (test accum 'y))
-
-    ;; 11.14
-    (for-each
-     (lambda (error)
-       (test/exn (error 'apple "bad" 'worm) &who)
-       (test/exn (error #f "bad" 'worm) &message)
-       (test/exn (error 'apple "bad" 'worm) &irritants)
-       (test/exn (error 'apple "bad") &irritants))
-     (list error assertion-violation))
-    (test/exn (error 'apple "bad" 'worm) &error)
-    (test/exn (assertion-violation 'apple "bad" 'worm) &assertion)
-    
-    (test (condition-message
-           (guard (v [#t v])
-                  (assertion-violation 'apple "bad" 'worm)))
-          "bad")
-    (test (condition-who
-           (guard (v [#t v])
-                  (assertion-violation 'apple "bad" 'worm)))
-          'apple)
-    (test (condition-irritants
-           (guard (v [#t v])
-                  (assertion-violation 'apple "bad" 'worm)))
-          '(worm))
-    (test (who-condition?
-           (guard (v [#t v])
-                  (assertion-violation #f "bad" 'worm)))
-          #f)
-    (test (error?
-           (guard (v [#t v])
-                  (assertion-violation #f "bad" 'worm)))
-          #f)
-    (test (error?
-           (guard (v [#t v])
-                  (error #f "bad" 'worm)))
-          #t)
-
-    (test (fac 5) 120)
-    (test/exn (fac 4.5) &assertion)
-    (test/exn (fac -3) &assertion)
-    (test/exn (fac -3) &message)
-
-    ;; 11.15
-    (test (apply + (list 3 4))               7)
-    (test/approx ((compose sqrt *) 12 75)    30)
-    
-    (test (call-with-current-continuation
-           (lambda (exit)
-             (for-each (lambda (x)
-                         (if (negative? x)
-                             (exit x)))
-                       '(54 0 37 -3 245 19))
-             #t))
-          -3)
-    (test (call/cc
-           (lambda (exit)
-             (for-each (lambda (x)
-                         (if (negative? x)
-                             (exit x)))
-                       '(54 0 37 -3 245 19))
-             #t))
-          -3)
-
-    (test (list-length '(1 2 3 4))             4)
-
-    (test (list-length '(a b . c))             #f)
-
-    (test/values (values))
-    (test (values 1) 1)
-    (test/values (values 1 2 3) 1 2 3)
-
-    (test (call-with-current-continuation procedure?) #t)
-
-    (test (call-with-values (lambda () (values 4 5))
-            (lambda (a b) b))
-          5)
-
-    (test (call-with-values * -) -1)
-
-    (test (let ((path '())
-                (c #f))
-            (let ((add (lambda (s)
-                         (set! path (cons s path)))))
-              (dynamic-wind
-                  (lambda () (add 'connect))
-                  (lambda ()
-                    (add (call-with-current-continuation
-                          (lambda (c0)
-                            (set! c c0)
-                            'talk1))))
-                  (lambda () (add 'disconnect)))
-              (if (< (length path) 4)
-                  (c 'talk2)
-                  (reverse path))))
-          '(connect talk1 disconnect
-                    connect talk2 disconnect))
-    
-    (test (let ((n 0))
-            (call-with-current-continuation
-             (lambda (k)
-               (dynamic-wind
-                   (lambda ()
-                     (set! n (+ n 1))
-                     (k))
-                   (lambda ()
-                     (set! n (+ n 2)))
-                   (lambda ()
-                     (set! n (+ n 4))))))
-            n) 
-          1)
-
-    (test (let ((n 0))
-            (call-with-current-continuation
-             (lambda (k)
-               (dynamic-wind
-                   values
-                   (lambda ()
-                     (dynamic-wind
-                         values
-                         (lambda ()
-                           (set! n (+ n 1))
-                           (k))
-                         (lambda ()
-                           (set! n (+ n 2))
-                           (k))))
-                   (lambda ()
-                     (set! n (+ n 4))))))
-            n) 
-          7)
-
-    ;; 11.16
-    (test (let loop ((numbers '(3 -2 1 6 -5))
-                     (nonneg '())
-                     (neg '()))
-            (cond ((null? numbers) (list nonneg neg))
-                  ((>= (car numbers) 0)
-                   (loop (cdr numbers)
-                         (cons (car numbers) nonneg)
-                         neg))
-                  ((< (car numbers) 0)
-                   (loop (cdr numbers)
-                         nonneg
-                         (cons (car numbers) neg)))))
-          '((6 1 3) (-5 -2)))
-
-    ;; 11.17
-    (test `(list ,(+ 1 2) 4)  '(list 3 4))
-    (test (let ((name 'a)) `(list ,name ',name)) 
-          '(list a (quote a)))
-    (test `(a ,(+ 1 2) ,@(map abs '(4 -5 6)) b)
-          '(a 3 4 5 6 b))
-
-    (test `((foo ,(- 10 3)) ,@(cdr '(c)) . ,(car '(cons)))
-          '((foo 7) . cons))
-    (test `#(10 5 ,(- 4) ,@(map - '(16 9)) 8)
-          '#(10 5 -4 -16 -9 8))
-    (test (let ((name 'foo))
-            `((unquote name name name)))
-          '(foo foo foo))
-    (test (let ((name '(foo)))
-            `((unquote-splicing name name name)))
-          '(foo foo foo))
-    (test (let ((q '((append x y) (sqrt 9))))
-            ``(foo ,,@q)) 
-          '`(foo (unquote (append x y) (sqrt 9))))
-    (test (let ((x '(2 3))
-                (y '(4 5)))
-            `(foo (unquote (append x y) (- 9))))
-          '(foo (2 3 4 5) -9))
-
-    (test `(a `(b ,(+ 1 2) ,(foo ,(+ 1 3) d) e) f) 
-          '(a `(b ,(+ 1 2) ,(foo 4 d) e) f))
-    (test (let ((name1 'x)
-                (name2 'y))
-            `(a `(b ,,name1 ,',name2 d) e))
-          '(a `(b ,x ,'y d) e))
-
-    (test (let ((a 3)) `((1 2) ,a ,4 ,'five 6))
-          '((1 2) 3 4 five 6))
-    (test (let ((a 3)) `((1 2) ,a ,4 ,'five 6))
-          (let ((a 3)) 
-            (cons '(1 2)
-                  (cons a (cons 4 (cons 'five '(6)))))))
-    
-    ;; 11.18
-    (test (let-syntax ((when (syntax-rules ()
-                               ((when test stmt1 stmt2 ...)
-                                (if test
-                                    (begin stmt1
-                                           stmt2 ...))))))
-            (let ((if #t))
-              (when if (set! if 'now))
-              if))
-          'now)
-
-    (test (let ((x 'outer))
-            (let-syntax ((m (syntax-rules () ((m) x))))
-              (let ((x 'inner))
-                (m))))
-          'outer)
-
-    (test (let ()
-            (let-syntax ((def (syntax-rules ()
-                                ((def stuff ...) (define stuff ...)))))
-              (def foo 42))
-            foo)
-          42)
-
-    (test (let ()
-            (let-syntax ())
-            5) 
-          5)
-
-    (test (letrec-syntax
-              ((my-or (syntax-rules ()
-                        ((my-or) #f)
-                        ((my-or e) e)
-                        ((my-or e1 e2 ...)
-                         (let ((temp e1))
-                           (if temp
-                               temp
-                               (my-or e2 ...)))))))
-            (let ((x #f)
-                  (y 7)
-                  (temp 8)
-                  (let odd?)
-                  (if even?))
-              (my-or x
-                     (let temp)
-                     (if y)
-                     y)))
-          7)
-
-    (test (let ((f (lambda (x) (+ x 1))))
-            (let-syntax ((f (syntax-rules ()
-                              ((f x) x)))
-                         (g (syntax-rules ()
-                              ((g x) (f x)))))
-              (list (f 1) (g 1)))) 
-          '(1 2))
-    
-    (test (let ((f (lambda (x) (+ x 1))))
-            (letrec-syntax ((f (syntax-rules ()
-                                 ((f x) x)))
-                            (g (syntax-rules ()
-                                 ((g x) (f x)))))
-              (list (f 1) (g 1)))) 
-          '(1 1))
-
-    (test (sequence 1 2 3 4) 4)
-
-    (test (let ((=> #f))
-            (cond (#t => 'ok)))
-          'ok)
-    
-    (test p.car 4)
-    ; (test/exn (set! p.car 15) &syntax) - not a runtime test
-
-    (test/unspec (set! p2.car 15))
-    (test p2.car 15)
-    (test p '(15 . 5))
-
-    (test (kons 1 2) '(1 . 2))
-
-    ;;;
-    ))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/bytevectors.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/bytevectors.sls
deleted file mode 100644
index 87fc507a1b..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/bytevectors.sls
+++ /dev/null
@@ -1,422 +0,0 @@
-#!r6rs
-
-(library (tests r6rs bytevectors)
-  (export run-bytevectors-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define (run-bytevectors-tests)
-    
-    ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; Tests originally from R6RS, plus added
-
-    (test (endianness little) 'little)
-    (test (endianness big) 'big)
-    (test (symbol? (native-endianness)) #t)
-
-    (test (bytevector? #vu8(1 2 3)) #t)
-    (test (bytevector? "123") #f)
-
-    (test (bytevector-length #vu8(1 2 3)) 3)
-    (test (bytevector-length (make-bytevector 10)) 10)
-    (test (bytevector-length (make-bytevector 10 3)) 10)
-    (test (bytevector-u8-ref (make-bytevector 10 3) 0) 3)
-    (test (bytevector-u8-ref (make-bytevector 10 3) 5) 3)
-    (test (bytevector-u8-ref (make-bytevector 10 3) 9) 3)
-    (test (bytevector-u8-ref (make-bytevector 10 255) 9) 255)
-    (test (bytevector-u8-ref (make-bytevector 10 -1) 9) 255)
-    (test (bytevector-u8-ref (make-bytevector 10 -128) 9) 128)
-
-    (let ([v (make-bytevector 5 2)])
-      (test/unspec (bytevector-fill! v -1))
-      (test v #vu8(255 255 255 255 255))
-      (test/unspec (bytevector-fill! v 17))
-      (test v #vu8(17 17 17 17 17))
-      (test/unspec (bytevector-fill! v 255))
-      (test v #vu8(255 255 255 255 255)))
-    
-    (test (let ((b (u8-list->bytevector '(1 2 3 4 5 6 7 8))))
-            (bytevector-copy! b 0 b 3 4)
-            (bytevector->u8-list b)) 
-          '(1 2 3 1 2 3 4 8))
-
-    (test (bytevector-copy #vu8(1 2 3)) #vu8(1 2 3))
-
-    (test (let ((b1 (make-bytevector 16 -127))
-                (b2 (make-bytevector 16 255)))
-            (list
-             (bytevector-s8-ref b1 0)
-             (bytevector-u8-ref b1 0)
-             (bytevector-s8-ref b2 0)
-             (bytevector-u8-ref b2 0)))
-          '(-127 129 -1 255))
-
-    (test (let ((b (make-bytevector 16 -127)))
-            
-            (bytevector-s8-set! b 0 -126)
-            (bytevector-u8-set! b 1 246)
-            
-            (list
-             (bytevector-s8-ref b 0)
-             (bytevector-u8-ref b 0)
-             (bytevector-s8-ref b 1)
-             (bytevector-u8-ref b 1)))
-          '(-126 130 -10 246))
-
-    (test (bytevector->u8-list #vu8(1 2 3)) '(1 2 3))
-    (test (bytevector->u8-list #vu8(255 255 255)) '(255 255 255))
-    (test (u8-list->bytevector '(1 2 3)) #vu8(1 2 3))
-    (test (u8-list->bytevector '()) #vu8())
-
-    (let ([b (make-bytevector 16 -127)])
-      (test/unspec
-       (bytevector-uint-set! b 0 (- (expt 2 128) 3)
-                             (endianness little) 16))
-       
-      (test (bytevector-uint-ref b 0 (endianness little) 16)
-            #xfffffffffffffffffffffffffffffffd)
-
-      (test (bytevector-sint-ref b 0 (endianness little) 16)
-            -3)
-
-      (test (bytevector->u8-list b)
-            '(253 255 255 255 255 255 255 255
-                  255 255 255 255 255 255 255 255))
-
-      (test/unspec (bytevector-uint-set! b 0 (- (expt 2 128) 3)
-                                         (endianness big) 16))
-      (test (bytevector-uint-ref b 0 (endianness big) 16)
-            #xfffffffffffffffffffffffffffffffd)
-
-      (test (bytevector-sint-ref b 0 (endianness big) 16) -3)
-
-      (test (bytevector->u8-list b) 
-            '(255 255 255 255 255 255 255 255
-                  255 255 255 255 255 255 255 253))
-
-      (test
-       (let ((b (u8-list->bytevector '(1 2 3 255 1 2 1 2))))
-         (bytevector->sint-list b (endianness little) 2)) 
-       '(513 -253 513 513))
-
-      (test (let ((b (u8-list->bytevector '(1 2 3 255 1 2 1 2))))
-              (bytevector->uint-list b (endianness little) 2)) 
-            '(513 65283 513 513)))
-
-    (let ([b (u8-list->bytevector
-              '(255 255 255 255 255 255 255 255
-                    255 255 255 255 255 255 255 253))])
-      
-      (test (bytevector-u16-ref b 14 (endianness little)) 65023)
-      (test (bytevector-s16-ref b 14 (endianness little)) -513)
-      (test (bytevector-u16-ref b 14 (endianness big)) 65533)
-      (test (bytevector-s16-ref b 14 (endianness big)) -3)
-
-      (test/unspec (bytevector-u16-set! b 0 12345 (endianness little)))
-      (test (bytevector-u16-ref b 0 (endianness little)) 12345)
-      
-      (test/unspec (bytevector-u16-native-set! b 0 12345))
-      (test (bytevector-u16-native-ref b 0) 12345)
-
-      (test/unspec (bytevector-u16-ref b 0 (endianness little))))
-
-    (let ([b (u8-list->bytevector
-              '(255 255 255 255 255 255 255 255
-                    255 255 255 255 255 255 255 253))])
-
-      (test (bytevector-u32-ref b 12 (endianness little)) 4261412863)
-      (test (bytevector-s32-ref b 12 (endianness little)) -33554433)
-      (test (bytevector-u32-ref b 12 (endianness big)) 4294967293)
-      (test (bytevector-s32-ref b 12 (endianness big)) -3))
-
-    (let ([b (u8-list->bytevector
-              '(255 255 255 255 255 255 255 255
-                    255 255 255 255 255 255 255 253))])
-      (test (bytevector-u64-ref b 8 (endianness little)) 18302628885633695743)
-      (test (bytevector-s64-ref b 8 (endianness little)) -144115188075855873)
-      (test (bytevector-u64-ref b 8 (endianness big)) 18446744073709551613)
-      (test (bytevector-s64-ref b 8 (endianness big)) -3))
-      
-    (for-each
-     (lambda (k)
-       (for-each
-        (lambda (n)
-          (if (zero? (fxand k 3))
-              (let ([b (make-bytevector 12)])
-                (test/unspec (bytevector-ieee-single-native-set! b k n))
-                (test/approx (bytevector-ieee-single-native-ref b k) n))
-              (let ([b (make-bytevector 12)])
-                (test/exn (bytevector-ieee-single-native-set! b k n) &assertion)
-                (test/exn (bytevector-ieee-single-native-ref b k) &assertion)))
-          (let ([b (make-bytevector 12)])
-            (test/unspec (bytevector-ieee-single-set! b k n 'big))
-            (test/approx (bytevector-ieee-single-ref b k 'big) n))
-          (let ([b (make-bytevector 12)])
-            (test/unspec (bytevector-ieee-single-set! b k n 'little))
-            (test/approx (bytevector-ieee-single-ref b k 'little) n))
-          (if (zero? (fxand k 7))
-              (let ([b (make-bytevector 12)])
-                (test/unspec (bytevector-ieee-double-native-set! b k n))
-                (test/approx (bytevector-ieee-double-native-ref b k) n))
-              (let ([b (make-bytevector 12)])
-                (test/exn (bytevector-ieee-double-native-set! b k n) &assertion)
-                (test/exn (bytevector-ieee-double-native-ref b k) &assertion)))
-          (let ([b (make-bytevector 12)])
-            (test/unspec (bytevector-ieee-double-set! b k n 'big))
-            (test/approx (bytevector-ieee-double-ref b k 'big) n))
-          (let ([b (make-bytevector 12)])
-            (test/unspec (bytevector-ieee-double-set! b k n 'little))
-            (test/approx (bytevector-ieee-double-ref b k 'little) n)))
-        '(1.0 25.78 +inf.0 -inf.0 +nan.0)))
-     '(0 1 2 3 4))
-
-    (test (string->utf8 "apple") #vu8(97 112 112 108 101))
-    (test (string->utf8 "app\x3BB;e") #vu8(97 112 112 206 187 101))
-    (test (string->utf16 "app\x3BB;e" 'little) #vu8(97 0 112 0 112 0 #xBB #x3 101 0))
-    (test (string->utf16 "app\x3BB;e" 'big) #vu8(0 97 0 112 0 112 #x3 #xBB 0 101))
-    (test (string->utf16 "app\x3BB;e") #vu8(0 97 0 112 0 112 #x3 #xBB 0 101))
-    (test (string->utf32 "app\x3BB;e" 'little) #vu8(97 0 0 0 112 0 0 0 112 0 0 0 #xBB #x3 0 0 101 0 0 0))
-    (test (string->utf32 "app\x3BB;e" 'big) #vu8(0 0 0 97 0 0 0 112 0 0 0 112 0 0 #x3 #xBB 0 0 0 101))
-    (test (string->utf32 "app\x3BB;e") #vu8(0 0 0 97 0 0 0 112 0 0 0 112 0 0 #x3 #xBB 0 0 0 101))
-
-    (let ([bv-append
-           (lambda (bv1 bv2)
-             (let ([bv (make-bytevector (+ (bytevector-length bv1)
-                                           (bytevector-length bv2)))])
-               (bytevector-copy! bv1 0 bv 0  (bytevector-length bv1))
-               (bytevector-copy! bv2 0 bv (bytevector-length bv1) (bytevector-length bv2))
-               bv))])
-      (for-each
-       (lambda (str)
-         (test (utf8->string (string->utf8 str)) str)
-         (test (utf16->string (string->utf16 str 'big) 'big) str)
-         (test (utf16->string (string->utf16 str 'little) 'little) str)
-         (test (utf16->string (bv-append #vu8(#xFF #xFE) (string->utf16 str 'little)) 'big) str)
-         (test (utf16->string (bv-append #vu8(#xFE #xFF) (string->utf16 str 'big)) 'little) str)
-         (test (utf16->string (bv-append #vu8(#xFF #xFE) (string->utf16 str 'little)) 'little #t) 
-               (string-append "\xFEFF;" str))
-         (test (utf16->string (bv-append #vu8(#xFE #xFF) (string->utf16 str 'little)) 'little #t) 
-               (string-append "\xFFFE;" str))
-         (test (utf16->string (bv-append #vu8(#xFE #xFF) (string->utf16 str 'big)) 'big #t) 
-               (string-append "\xFEFF;" str))
-         (test (utf16->string (bv-append #vu8(#xFF #xFE) (string->utf16 str 'big)) 'big #t) 
-               (string-append "\xFFFE;" str))
-         (test (utf32->string (string->utf32 str 'big) 'big) str)
-         (test (utf32->string (string->utf32 str 'little) 'little) str)
-         (test (utf32->string (bv-append #vu8(#xFF #xFE 0 0) (string->utf32 str 'little)) 'big) str)
-         (test (utf32->string (bv-append #vu8(0 0 #xFE #xFF) (string->utf32 str 'big)) 'little) str)
-         (test (utf32->string (bv-append #vu8(#xFF #xFE 0 0) (string->utf32 str 'little)) 'little #t) 
-               (string-append "\xFEFF;" str))
-         (test (utf32->string (bv-append #vu8(#xFE #xFF 0 0) (string->utf32 str 'little)) 'little #t) 
-               (string-append "\xFFFE;" str))
-         (test (utf32->string (bv-append #vu8(0 0 #xFE #xFF) (string->utf32 str 'big)) 'big #t) 
-               (string-append "\xFEFF;" str))
-         (test (utf32->string (bv-append #vu8(0 0 #xFF #xFE) (string->utf32 str 'big)) 'big #t) 
-               (string-append "\xFFFE;" str)))
-       (list "apple"
-             "app\x3BB;e"
-             "\x0;\x1;\x80;\xFF;\xD7FF;\xE000;\x10FFFF;")))
-
-    ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; Tests originally from Ikarus
-
-    (test (bytevector? (make-bytevector 1)) #t)
-    (test (bytevector? (make-bytevector 1 17)) #t)
-    (test (bytevector? (make-bytevector 10 -17)) #t)
-    (test (bytevector? 'foo) #f)
-    (test (bytevector? "hey") #f)
-    (test (bytevector? '#(2837 2398 239)) #f)
-    (test (bytevector-length (make-bytevector 0)) 0)
-    (test (bytevector-length (make-bytevector 100 -30)) 100)
-    (test (let ((b (u8-list->bytevector '(1 2 3 4 5 6 7 8))))
-            (bytevector-copy! b 0 b 3 4)
-            (bytevector->u8-list b))
-          '(1 2 3 1 2 3 4 8))
-    (test (bytevector-uint-ref 
-           (u8-list->bytevector '(17))
-           0 'little 1)
-          17)
-    (test (bytevector-uint-ref 
-           (u8-list->bytevector '(17))
-           0 'big 1)
-          17)
-    (test (bytevector-uint-ref 
-           (u8-list->bytevector '(17 54))
-           0 'little 2)
-          (+ 17 (* 54 256)))
-    (test (bytevector-uint-ref 
-           (u8-list->bytevector (reverse '(17 54)))
-           0 'big 2)
-          (+ 17 (* 54 256)))
-    (test (bytevector-uint-ref 
-           (u8-list->bytevector '(17 54 98))
-           0 'little 3)
-          (+ 17 (* 54 256) (* 98 256 256)))
-    (test (bytevector-uint-ref 
-           (u8-list->bytevector (reverse '(17 54 98)))
-           0 'big 3)
-          (+ 17 (* 54 256) (* 98 256 256)))
-    (test (bytevector-uint-ref 
-           (u8-list->bytevector '(17 54 98 120))
-           0 'little 4)
-          (+ 17 (* 54 256) (* 98 256 256) (* 120 256 256 256)))
-
-    (test (bytevector-uint-ref 
-           (u8-list->bytevector
-            '(#x89 #x04 #x39 #x82 #x49 #x20 #x93 #x48 #x17
-                   #x83 #x79 #x94 #x38 #x87 #x34 #x97 #x38 #x12))
-           0 'little 18)
-          #x123897348738947983174893204982390489)
-    (test (bytevector-uint-ref 
-           (u8-list->bytevector
-            (reverse
-             '(#x89 #x04 #x39 #x82 #x49 #x20 #x93 #x48 #x17
-                    #x83 #x79 #x94 #x38 #x87 #x34 #x97 #x38 #x12)))
-           0 'big 18)
-          #x123897348738947983174893204982390489)
-    (test (let ((b (u8-list->bytevector '(1 2 3 255 1 2 1 2))))
-            (bytevector->uint-list b 'little 2))
-          '(513 65283 513 513))
-    (test (bytevector->u8-list
-           (uint-list->bytevector '(513 65283 513 513) 'little 2))
-          '(1 2 3 255 1 2 1 2))
-    (test (bytevector->u8-list
-           (uint-list->bytevector '(513 65283 513 513) 'big 2))
-          '(2 1 255 3 2 1 2 1))
-    (test (let ((b (u8-list->bytevector '(1 2 3 255 1 2 1 2))))
-            (bytevector->sint-list b 'little 2))
-          '(513 -253 513 513))
-    (test (let ((b (u8-list->bytevector '(2 1 255 3 2 1 2 1))))
-            (bytevector->sint-list b 'big 2))
-          '(513 -253 513 513))
-    (test (bytevector->u8-list
-           (sint-list->bytevector '(513 -253 513 513) 'little 2))
-          '(1 2 3 255 1 2 1 2))
-    (test (let ((b (u8-list->bytevector '(1 2 3 255 1 2 1 2))))
-            (bytevector->sint-list b 'little 2))
-          '(513 -253 513 513))
-    (test (let ((b (make-bytevector 16 -127)))
-            (bytevector-uint-set! b 0 (- (expt 2 128) 3) 'little 16)
-            (list 
-             (bytevector-uint-ref b 0 'little 16)
-             (bytevector-sint-ref b 0 'little 16)
-             (bytevector->u8-list b)))
-          '(#xfffffffffffffffffffffffffffffffd
-            -3
-            (253 255 255 255 255 255 255 255
-                 255 255 255 255 255 255 255 255)))
-    (test (let ((b (make-bytevector 16 -127)))
-            (bytevector-uint-set! b 0 (- (expt 2 128) 3) 'big 16)
-            (list 
-             (bytevector-uint-ref b 0 'big 16)
-             (bytevector-sint-ref b 0 'big 16)
-             (bytevector->u8-list b)))
-          '(#xfffffffffffffffffffffffffffffffd
-            -3
-            (255 255 255 255 255 255 255 255
-                 255 255 255 255 255 255 255 253)))
-    (test (bytevector->u8-list '#vu8(1 2 3 4))
-          '(1 2 3 4))
-    (test (let ((b (make-bytevector 4 0)))
-            (bytevector-sint-set! b 0 -1 'little 4)
-            (bytevector-uint-ref b 0 'little 4))
-          #xFFFFFFFF)
-    (test (let ((b (make-bytevector 4 0)))
-            (bytevector-sint-set! b 0 -256 'little 4)
-            (bytevector-uint-ref b 0 'little 4))
-          #xFFFFFF00)
-    (test (let ((b (make-bytevector 4 0)))
-            (bytevector-sint-set! b 0 (- (expt 256 2)) 'little 4)
-            (bytevector-uint-ref b 0 'little 4))
-          #xFFFF0000)
-    (test (let ((b (make-bytevector 8 0)))
-            (bytevector-sint-set! b 0 (- (expt 256 2)) 'little 8)
-            (bytevector-uint-ref b 0 'little 8))
-          #xFFFFFFFFFFFF0000)
-    (test (let ((b (make-bytevector 8 0)))
-            (bytevector-sint-set! b 0 (- (expt 256 4)) 'little 8)
-            (bytevector-uint-ref b 0 'little 8))
-          #xFFFFFFFF00000000)
-    (test (let ((b (make-bytevector 8 0)))
-            (bytevector-sint-set! b 0 (- (expt 256 7)) 'little 8)
-            (bytevector-uint-ref b 0 'little 8))
-          #xFF00000000000000)
-    (test (let ((b (make-bytevector 8 0)))
-            (bytevector-sint-set! b 0 (- 1 (expt 2 63)) 'little 8)
-            (bytevector-sint-ref b 0 'little 8))
-          (- 1 (expt 2 63)))
-    (test (let ((b (make-bytevector 4 38)))
-            (bytevector-sint-set! b 0 (- (expt 2 31) 1) 'little 4)
-            (bytevector-sint-ref b 0 'little 4))
-          #x7FFFFFFF)
-    (test (let ((b (make-bytevector 4 38)))
-            (bytevector-sint-set! b 0 (- (expt 2 31)) 'little 4)
-            (bytevector-sint-ref b 0 'little 4))
-          #x-80000000)
-    (test (let ((b (make-bytevector 5 38)))
-            (bytevector-sint-set! b 0 (- (expt 2 32)) 'little 5)
-            (bytevector-sint-ref b 0 'little 5))
-          #x-100000000)
-    (test (let ((b (make-bytevector 4 0)))
-            (bytevector-sint-set! b 0 -1 'big 4)
-            (bytevector-uint-ref b 0 'big 4))
-          #xFFFFFFFF)
-    (test (let ((b (make-bytevector 4 0)))
-            (bytevector-sint-set! b 0 -256 'big 4)
-            (bytevector-uint-ref b 0 'big 4))
-          #xFFFFFF00)
-    (test (let ((b (make-bytevector 4 0)))
-            (bytevector-sint-set! b 0 (- (expt 256 2)) 'big 4)
-            (bytevector-uint-ref b 0 'big 4))
-          #xFFFF0000)
-    (test (let ((b (make-bytevector 8 0)))
-            (bytevector-sint-set! b 0 (- (expt 256 2)) 'big 8)
-            (bytevector-uint-ref b 0 'big 8))
-          #xFFFFFFFFFFFF0000)
-    (test (let ((b (make-bytevector 8 0)))
-            (bytevector-sint-set! b 0 (- (expt 256 4)) 'big 8)
-            (bytevector-uint-ref b 0 'big 8))
-          #xFFFFFFFF00000000)
-    (test (let ((b (make-bytevector 8 0)))
-            (bytevector-sint-set! b 0 (- (expt 256 7)) 'big 8)
-            (bytevector-uint-ref b 0 'big 8))
-          #xFF00000000000000)
-    (test (let ((b (make-bytevector 8 0)))
-            (bytevector-sint-set! b 0 (- 1 (expt 2 63)) 'big 8)
-            (bytevector-sint-ref b 0 'big 8))
-          (- 1 (expt 2 63)))
-    (test (let ((b (make-bytevector 4 38)))
-            (bytevector-sint-set! b 0 (- (expt 2 31) 1) 'big 4)
-            (bytevector-sint-ref b 0 'big 4))
-          #x7FFFFFFF)
-    (test (let ((b (make-bytevector 4 38)))
-            (bytevector-sint-set! b 0 (- (expt 2 31)) 'big 4)
-            (bytevector-sint-ref b 0 'big 4))
-          #x-80000000)
-    (test (let ((b (make-bytevector 5 38)))
-            (bytevector-sint-set! b 0 (- (expt 2 32)) 'big 5)
-            (bytevector-sint-ref b 0 'big 5))
-          #x-100000000)
-    (test (bytevector-u16-ref '#vu8(255 253) 0 'little)
-          65023)
-    (test (bytevector-u16-ref '#vu8(255 253) 0 'big)
-          65533)
-    (test (bytevector-s16-ref '#vu8(255 253) 0 'little)
-          -513)
-    (test (bytevector-s16-ref '#vu8(255 253) 0 'big)
-          -3)
-    (test (let ((v (make-bytevector 2)))
-            (bytevector-u16-native-set! v 0 12345)
-            (bytevector-u16-native-ref v 0))
-          12345)
-    (test (let ((v (make-bytevector 2)))
-            (bytevector-u16-set! v 0 12345 'little)
-            (bytevector-u16-ref v 0 'little))
-          12345)
-    (test (let ((v (make-bytevector 2)))
-            (bytevector-u16-set! v 0 12345 'big)
-            (bytevector-u16-ref v 0 'big))
-          12345)
-
-    ;;
-    ))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/conditions.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/conditions.sls
deleted file mode 100644
index 2c8152068d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/conditions.sls
+++ /dev/null
@@ -1,253 +0,0 @@
-#!r6rs
-
-(library (tests r6rs conditions)
-  (export run-conditions-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-
-  (define-syntax test-cond
-    (syntax-rules ()
-      [(_ &c &parent (make arg ...) pred sel ...)
-       (begin
-         (test (pred (make arg ...)) #t)
-         (let ([v (make arg ...)])
-           (test (sel v) arg) ...
-           'ok)
-         (test ((record-predicate (record-type-descriptor &parent)) (make arg ...)) #t)
-         (test (record-type-parent (record-type-descriptor &c)) (record-type-descriptor &parent)))]))
-
-  ;; ----------------------------------------
-
-  (define-record-type (&cond1 make-cond1 real-cond1?)
-    (parent &condition)
-    (fields
-     (immutable x real-cond1-x)))
-  
-  (define cond1?
-    (condition-predicate
-     (record-type-descriptor &cond1)))
-  (define cond1-x
-    (condition-accessor
-     (record-type-descriptor &cond1)
-     real-cond1-x))
-  
-  (define foo (make-cond1 'foo))
-  
-  (define-record-type (&cond2 make-cond2 real-cond2?)
-    (parent &condition)
-    (fields
-     (immutable y real-cond2-y)))
-
-  (define cond2?
-    (condition-predicate
-     (record-type-descriptor &cond2)))
-  (define cond2-y
-    (condition-accessor
-     (record-type-descriptor &cond2)
-     real-cond2-y))
-
-  (define bar (make-cond2 'bar))
-
-  (define-condition-type &c &condition
-    make-c c?
-    (x c-x))
-
-  (define-condition-type &c1 &c
-    make-c1 c1?
-    (a c1-a))
-
-  (define-condition-type &c2 &c
-    make-c2 c2?
-    (b c2-b))
-
-  (define v1 (make-c1 "V1" "a1"))
-
-  (define v2 (make-c2 "V2" "b2"))
-
-  (define v3 (condition
-              (make-c1 "V3/1" "a3")
-              (make-c2 "V3/2" "b3")))
-
-  (define v4 (condition v1 v2))
-
-  (define v5 (condition v2 v3))
-
-  ;; ----------------------------------------
-
-  (define (run-conditions-tests)
-
-    (test (condition? foo) #t)
-    (test (cond1? foo) #t)
-    (test (cond1-x foo) 'foo)
-
-    (test (condition? (condition foo bar)) #t)
-    (test (cond1? (condition foo bar)) #t)
-    (test (cond2? (condition foo bar)) #t)
-    (test (cond1? (condition foo)) #t)
-    (test/unspec (real-cond1? (condition foo)))
-    (test (real-cond1? (condition foo bar)) #f)
-    (test (cond1-x (condition foo bar)) 'foo)
-    (test (cond2-y (condition foo bar)) 'bar)
-                
-    (test (simple-conditions (condition foo bar))
-          (list foo bar))
-
-    (test (simple-conditions
-           (condition foo (condition bar)))
-          (list foo bar))
-    
-    (test (c? v1)        #t)
-    (test (c1? v1)       #t)
-    (test (c2? v1)       #f)
-    (test (c-x v1)       "V1")
-    (test (c1-a v1)      "a1")
-
-    (test (c? v2)        #t)
-    (test (c1? v2)       #f)
-    (test (c2? v2)       #t)
-    (test (c-x v2)       "V2")
-    (test (c2-b v2)      "b2")
-
-    (test (c? v3)        #t)
-    (test (c1? v3)       #t)
-    (test (c2? v3)       #t)
-    (test (c-x v3)       "V3/1")
-    (test (c1-a v3)      "a3")
-    (test (c2-b v3)      "b3")
-
-    (test (c? v4)        #t)
-    (test (c1? v4)       #t)
-    (test (c2? v4)       #t)
-    (test (c-x v4)       "V1")
-    (test (c1-a v4)      "a1")
-    (test (c2-b v4)      "b2")
-
-    (test (c? v5)        #t)
-    (test (c1? v5)       #t)
-    (test (c2? v5)       #t)
-    (test (c-x v5)       "V2")
-    (test (c1-a v5)      "a3")
-    (test (c2-b v5)      "b2")
-
-    (test-cond &message &condition
-               (make-message-condition "message")
-               message-condition?
-               condition-message)
-    
-    (test-cond &warning &condition
-               (make-warning)
-               warning?)
-    
-    (test-cond &serious &condition
-               (make-serious-condition)
-               serious-condition?)
-
-    (test-cond &error &serious
-               (make-error)
-               error?)
-
-    (test-cond &violation &serious
-               (make-violation)
-               violation?)
-
-    (test-cond &assertion &violation
-               (make-assertion-violation)
-               assertion-violation?)
-
-    (test-cond &irritants &condition
-               (make-irritants-condition (list 'sand 'salt 'acid))
-               irritants-condition?
-               condition-irritants)
-
-    (test-cond &who &condition
-               (make-who-condition 'new-boss)
-               who-condition?
-               condition-who)
-
-    (test-cond &non-continuable &violation
-               (make-non-continuable-violation)
-               non-continuable-violation?)
-
-    (test-cond &implementation-restriction &violation
-              (make-implementation-restriction-violation)
-              implementation-restriction-violation?)
-
-    (test-cond &lexical &violation
-               (make-lexical-violation)
-               lexical-violation?)
-    
-    (test-cond &syntax &violation
-               (make-syntax-violation '(lambda (x) case) 'case)
-               syntax-violation?
-               syntax-violation-form
-               syntax-violation-subform)
-
-    (test-cond &undefined &violation
-               (make-undefined-violation)
-               undefined-violation?)
-
-    ;; These tests really belong in io/ports.ss:
-
-    (test-cond &i/o &error
-               (make-i/o-error)
-               i/o-error?)
-
-    (test-cond &i/o-read &i/o
-               (make-i/o-read-error)
-               i/o-read-error?)
-
-    (test-cond &i/o-write &i/o
-               (make-i/o-write-error)
-               i/o-write-error?)
-
-
-    (test-cond &i/o-invalid-position &i/o
-               (make-i/o-invalid-position-error 10)
-               i/o-invalid-position-error?
-               i/o-error-position)
-
-    (test-cond &i/o-filename &i/o
-               (make-i/o-filename-error "bad.txt")
-               i/o-filename-error?
-               i/o-error-filename)
-
-    (test-cond &i/o-file-protection &i/o-filename
-               (make-i/o-file-protection-error "private.txt")
-               i/o-file-protection-error?
-               i/o-error-filename)
-
-    (test-cond &i/o-file-is-read-only  &i/o-file-protection
-               (make-i/o-file-is-read-only-error "const.txt")
-               i/o-file-is-read-only-error?
-               i/o-error-filename)
-
-    (test-cond &i/o-file-already-exists &i/o-filename
-               (make-i/o-file-already-exists-error "x.txt")
-               i/o-file-already-exists-error?
-               i/o-error-filename)
-
-    (test-cond &i/o-file-does-not-exist &i/o-filename
-               (make-i/o-file-does-not-exist-error "unicorn.txt")
-               i/o-file-does-not-exist-error?
-               i/o-error-filename)
-
-    (test-cond &i/o-port &i/o
-               (make-i/o-port-error "Hong Kong")
-               i/o-port-error?
-               i/o-error-port)
-
-    (test-cond &i/o-decoding &i/o-port
-               (make-i/o-decoding-error "Hong Kong")
-               i/o-decoding-error?
-               i/o-error-port)
-
-    (test-cond &i/o-encoding &i/o-port
-               (make-i/o-encoding-error "Hong Kong" #\$)
-               i/o-encoding-error?
-               i/o-error-port
-               i/o-encoding-error-char)
-    
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/contrib.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/contrib.sls
deleted file mode 100644
index a85197c065..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/contrib.sls
+++ /dev/null
@@ -1,35 +0,0 @@
-#!r6rs
-
-(library (tests r6rs contrib)
-  (export run-contrib-tests)
-  (import (rnrs)
-          (tests r6rs test)
-          (prefix (tests r6rs contrib helper1) L:))
-
-  ;; Definitions ----------------------------------------
-
-  ;; from Derick Eddington:
-  (define-syntax my-letrec
-    (syntax-rules ()
-      [(_ ([v e] ...) . b)
-       (let ()
-         (define t (list e ...))
-         (define v (let ([v (car t)]) (set! t (cdr t)) v))
-         ...
-         . b)]))
-
-  ;; Expressions ----------------------------------------
-
-  (define (run-contrib-tests)
-
-    ;; from Derick Eddington:
-    (test (my-letrec ([f (lambda (x) (g x 2))]
-                      [g (lambda (x y) (+ x y))])
-            (f 1))
-          3)
-
-    ;; from Derick Eddington:
-    (test (L:s L:x) 'ok)
-
-    ;;;
-    ))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/contrib/helper1.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/contrib/helper1.sls
deleted file mode 100644
index c8d349761a..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/contrib/helper1.sls
+++ /dev/null
@@ -1,15 +0,0 @@
-#!r6rs
-
-;; from Derick Eddington
-
-(library (tests r6rs contrib helper1)
-  (export x s)
-  (import (rnrs))
-  
-  (define-syntax x (lambda (_) #f))
-  
-  (define-syntax s
-    (syntax-rules (x)  ;; This x refers only to the one in scope above.
-      [(_ x)  ;; This pattern matches only if the 2nd subform is an
-              ;; identifier that is free-identifier=? to the x in the literals list.
-       'ok])))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/control.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/control.sls
deleted file mode 100644
index 9f4212d470..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/control.sls
+++ /dev/null
@@ -1,43 +0,0 @@
-#!r6rs
-
-(library (tests r6rs control)
-  (export run-control-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define (run-control-tests)
-
-    (test (when (> 3 2) 'greater) 'greater)
-    (test/unspec (when (< 3 2) 'greater))
-    (test/unspec (unless (> 3 2) 'less))
-    (test (unless (< 3 2) 'less) 'less)
-
-    (test (do ((vec (make-vector 5))
-               (i 0 (+ i 1)))
-              ((= i 5) vec)
-            (vector-set! vec i i))
-          '#(0 1 2 3 4))
-
-    (test (let ((x '(1 3 5 7 9)))
-            (do ((x x (cdr x))
-                 (sum 0 (+ sum (car x))))
-                ((null? x) sum)))
-          25)
-
-    (let ([foo
-           (case-lambda 
-            (() 'zero)
-            ((x) (list 'one x))
-            ((x y) (list 'two x y))
-            ((a b c d . e) (list 'four a b c d e))
-            (rest (list 'rest rest)))])
-
-      (test (foo) 'zero)
-      (test (foo 1) '(one 1))
-      (test (foo 1 2) '(two 1 2))
-      (test (foo 1 2 3) '(rest (1 2 3)))
-      (test (foo 1 2 3 4) '(four 1 2 3 4 ())))
-      
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/enums.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/enums.sls
deleted file mode 100644
index 364954d332..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/enums.sls
+++ /dev/null
@@ -1,105 +0,0 @@
-#!r6rs
-
-(library (tests r6rs enums)
-  (export run-enums-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  ;; ----------------------------------------
-
-  (define-enumeration color
-    (black white purple maroon)
-    color-set)
-  
-  ;; ----------------------------------------
-
-  (define (run-enums-tests)
-    
-    (test (let* ((e (make-enumeration '(red green blue)))
-                 (i (enum-set-indexer e)))
-            (list (i 'red) (i 'green) (i 'blue) (i 'yellow)))
-          '(0 1 2 #f))
-
-    (let* ((e (make-enumeration '(red green blue)))
-           (r ((enum-set-constructor e) '(red))))
-      (test (enum-set->list (enum-set-universe e))
-            '(red green blue))
-      (test (enum-set->list (enum-set-universe r))
-            '(red green blue))
-      (test ((enum-set-indexer
-              ((enum-set-constructor e) '(red)))
-             'green)
-            1)
-      (test (enum-set-member? 'red e) #t)
-      (test (enum-set-member? 'black e) #f)
-      (test (enum-set-subset? e e) #t)
-      (test (enum-set-subset? r e) #t)
-      (test (enum-set-subset? e r) #f)
-      (test (enum-set-subset? e (make-enumeration '(blue green red))) #t)
-      (test (enum-set-subset? e (make-enumeration '(blue green red black))) #t)
-      (test (enum-set-subset? (make-enumeration '(blue green red black)) e) #f)
-      (test (enum-set-subset? ((enum-set-constructor
-                                (make-enumeration '(blue green red black)))
-                               '(red))
-                              e) #f)
-      (test (enum-set-subset? ((enum-set-constructor
-                                (make-enumeration '(green red)))
-                               '(red))
-                              e) #t)
-      (test (enum-set=? e e) #t)
-      (test (enum-set=? r e) #f)
-      (test (enum-set=? e r) #f)
-      (test (enum-set=? e (make-enumeration '(blue green red))) #t))
-
-    (test (let* ((e (make-enumeration '(red green blue)))
-                 (c (enum-set-constructor e)))
-            (list
-             (enum-set-member? 'blue (c '(red blue)))
-             (enum-set-member? 'green (c '(red blue)))
-             (enum-set-subset? (c '(red blue)) e)
-             (enum-set-subset? (c '(red blue)) (c '(blue red)))
-             (enum-set-subset? (c '(red blue)) (c '(red)))
-             (enum-set=? (c '(red blue)) (c '(blue red)))))
-          (list #t #f #t #t #f #t))
-
-    (test (let* ((e (make-enumeration '(red green blue)))
-                 (c (enum-set-constructor e)))
-            (enum-set->list (c '(blue red)))) 
-          '(red blue))
-
-    (test (let* ((e (make-enumeration '(red green blue)))
-                 (c (enum-set-constructor e)))
-            (list (enum-set->list
-                   (enum-set-union (c '(blue)) (c '(red))))
-                  (enum-set->list
-                   (enum-set-intersection (c '(red green))
-                                          (c '(red blue))))
-                  (enum-set->list
-                   (enum-set-difference (c '(red green))
-                                        (c '(red blue))))))
-          '((red blue) (red) (green)))
-
-    (test (let* ((e (make-enumeration '(red green blue)))
-                 (c (enum-set-constructor e)))
-            (enum-set->list
-             (enum-set-complement (c '(red)))))
-          '(green blue))
-
-    (test (let ((e1 (make-enumeration
-                     '(red green blue black)))
-                (e2 (make-enumeration
-                     '(red black white))))
-            (enum-set->list
-             (enum-set-projection e1 e2)))
-          '(red black))
-
-    (test (color black)                      'black)
-    ; (test/exn (color purpel) &syntax) ; not a runtime exception
-    (test (enum-set->list (color-set))       '())
-    (test (enum-set->list
-           (color-set maroon white)) 
-          '(white maroon))
-
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/eval.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/eval.sls
deleted file mode 100644
index dc395f117b..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/eval.sls
+++ /dev/null
@@ -1,44 +0,0 @@
-#!r6rs
-
-(library (tests r6rs eval)
-  (export run-eval-tests)
-  (import (rnrs)
-          (rnrs eval)
-          (tests r6rs test))
-
-  (define (run-eval-tests)
-
-    (test (eval '(let ((x 3)) x)
-                (environment '(rnrs)))
-          3)
-
-    (test (eval
-           '(eval:car (eval:cons 2 4))
-           (environment
-            '(prefix (only (rnrs) car cdr cons null?)
-                     eval:)))
-          2)
-
-    ;; Check that `eval' at compile-time produces values (such as conditions)
-    ;; that make sense at compile time (i.e., no phase crossing):
-    (test (eval
-           '(let-syntax ([x (lambda (stx)
-                              (datum->syntax
-                               #'here
-                               (condition-message
-                                (call/cc
-                                 (lambda (esc)
-                                   (with-exception-handler
-                                    (lambda (exn) (esc exn))
-                                    (lambda ()
-                                      (eval '(assertion-violation 'exptime "ok")
-                                            (environment
-                                             '(rnrs)
-                                             '(rnrs eval))))))))))])
-              x)
-           (environment '(rnrs) '(for (rnrs eval) expand)))
-          "ok")
-
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/exceptions.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/exceptions.sls
deleted file mode 100644
index 2e7646caa1..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/exceptions.sls
+++ /dev/null
@@ -1,92 +0,0 @@
-#!r6rs
-
-(library (tests r6rs exceptions)
-  (export run-exceptions-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define (run-exceptions-tests)
-
-    (test/output
-     (guard (con
-             ((error? con)
-              (if (message-condition? con)
-                  (display (condition-message con))
-                  (display "an error has occurred"))
-              'error)
-             ((violation? con)
-              (if (message-condition? con)
-                  (display (condition-message con))
-                  (display "the program has a bug"))
-              'violation))
-            (raise
-             (condition
-              (make-error)
-              (make-message-condition "I am an error"))))
-     'error
-     "I am an error")
-
-    (test/exn
-     (guard (con
-             ((error? con)
-              (if (message-condition? con)
-                  (display (condition-message con))
-                  (display "an error has occurred"))
-              'error))
-            (raise
-             (condition
-              (make-violation)
-              (make-message-condition "I am an error"))))
-     &violation)
-
-    (test/output
-     (guard (con
-             ((error? con)
-              (display "error opening file")
-              #f))
-            (call-with-input-file "foo-must-not-exist.scm" read))
-     #f
-     "error opening file")
-
-    (test/output
-     (with-exception-handler
-      (lambda (con)
-        (cond
-         ((not (warning? con))
-          (raise con))
-         ((message-condition? con)
-          (display (condition-message con)))
-         (else
-          (display "a warning has been issued")))
-        42)
-      (lambda ()
-        (+ (raise-continuable
-            (condition
-             (make-warning)
-             (make-message-condition
-              "should be a number")))
-           23)))
-     65
-     "should be a number")
-
-    (test/exn (with-exception-handler (lambda (x) 0)
-                                      (lambda () (error #f "bad")))
-              &non-continuable)
-
-    
-    (let ([v '()])
-      (test (guard (exn [(equal? exn 5) 'five])
-                   ;; `guard' should jump back in before re-raising
-                   (guard (exn [(equal? exn 6) 'six])
-                          (dynamic-wind
-                              (lambda () (set! v (cons 'in v)))
-                              (lambda () (raise 5))
-                              (lambda () (set! v (cons 'out v))))))
-            'five)
-      (test v '(out in out in)))
-      
-
-      
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/hashtables.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/hashtables.sls
deleted file mode 100644
index 606e8508fb..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/hashtables.sls
+++ /dev/null
@@ -1,163 +0,0 @@
-#!r6rs
-
-(library (tests r6rs hashtables)
-  (export run-hashtables-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define-syntax test-ht
-    (syntax-rules ()
-      [(_ mk key=? ([key val] ...)
-          key/r orig-val new-val
-          key/a a-val
-          key/rm)
-       (let ([h mk])
-         (test (hashtable? h) #t)
-         (test (hashtable-size h) 0)
-         (test (hashtable-ref h key/r 'nope) 'nope)
-         (test/unspec (hashtable-delete! h key)) ...
-         (test (hashtable-size h) 0)
-
-         (test (hashtable-ref h key/r 'nope) 'nope)
-         (test (hashtable-contains? h key/r) #f)
-         (test/unspec (hashtable-set! h key/r orig-val))
-         (test (hashtable-ref h key/r 'nope) orig-val)
-         (test (hashtable-contains? h key/r) #t)
-         (test (hashtable-size h) 1)
-
-         (test/unspec (hashtable-set! h key val)) ...
-         (test (hashtable-size h) (length '(key ...)))
-         (test (hashtable-ref h key/r 'nope) orig-val)
-         (test (hashtable-ref h key 'nope) val) ...
-
-         (let ([h1 (hashtable-copy h #t)]
-               [h1i (hashtable-copy h)])
-           (test (hashtable-mutable? h) #t)
-           (test (hashtable-mutable? h1) #t)
-           (test (hashtable-mutable? h1i) #f)
-           
-           (test (vector-length (hashtable-keys h))
-                 (hashtable-size h))
-           (test (vector-length (let-values ([(k e) (hashtable-entries h)])
-                                  e))
-                 (hashtable-size h))
-           (test (exists (lambda (v) (key=? v key/r))
-                         (vector->list (hashtable-keys h)))
-                 #t)
-
-           (test/unspec (hashtable-set! h key/r new-val))
-           (test (hashtable-contains? h key/r) #t)
-           (test (hashtable-ref h key/r 'nope) new-val)
-
-           (test/unspec (hashtable-update! h key/r (lambda (v)
-                                                     (test v new-val)
-                                                     orig-val)
-                                           'nope))
-           (test (hashtable-ref h key/r 'nope) orig-val)
-           (test/unspec (hashtable-update! h key/r (lambda (v)
-                                                     (test v orig-val)
-                                                     new-val)
-                                           'nope))
-           (test (hashtable-ref h key/r 'nope) new-val)
-
-           (test/unspec (hashtable-update! h key/a (lambda (v)
-                                                     (test v 'nope)
-                                                     a-val)
-                                           'nope))
-           (test (hashtable-ref h key/a 'nope) a-val)
-           (test/unspec (hashtable-delete! h key/a))
-
-           (test (hashtable-contains? h key/rm) #t)
-           (hashtable-delete! h key/rm)
-           (test (hashtable-contains? h key/rm) #f)
-           (test (hashtable-ref h key/rm 'nope) 'nope)
-
-           (test (hashtable-ref h1 key 'nope) val) ...
-           (test (hashtable-ref h1i key 'nope) val) ...
-           (test (hashtable-contains? h1 key/rm) #t)
-           (test (hashtable-contains? h1i key/rm) #t)
-
-           (hashtable-clear! h)
-           (test (hashtable-contains? h key) #f) ...
-           (test (hashtable-contains? h1 key) #t) ...
-           (test (hashtable-contains? h1i key) #t) ...
-
-           (test/unspec (hashtable-clear! h1))
-           
-           (test/exn (hashtable-set! h1i key/r #f) &violation)
-           (test/exn (hashtable-delete! h1i key/r) &violation)
-           (test/exn (hashtable-update! h1i key/r (lambda (q) q) 'none) &violation)
-           (test/exn (hashtable-clear! h1i) &violation)))]))
-  
-  ;; ----------------------------------------
-
-  (define (run-hashtables-tests)
-
-    (let-values ([(kv vv)
-                  (let ((h (make-eqv-hashtable)))
-                    (hashtable-set! h 1 'one)
-                    (hashtable-set! h 2 'two)
-                    (hashtable-set! h 3 'three)
-                    (hashtable-entries h))])
-      (test/alts (cons kv vv)
-                 '(#(1 2 3)  . #(one two three))
-                 '(#(1 3 2)  . #(one three two))
-                 '(#(2 1 3)  . #(two one three))
-                 '(#(2 3 1)  . #(two three one))
-                 '(#(3 1 2)  . #(three one two))
-                 '(#(3 2 1)  . #(three two one))))
-    
-    (test-ht (make-eq-hashtable) eq?
-             (['a 7] ['b "bee"]
-              [#t 8] [#f 9]
-              ['c 123456789101112])
-             'b "bee" "bumble"
-             'd 12
-             'c)
-    
-    (test-ht (make-eqv-hashtable) eqv?
-             (['a 7] [#\b "bee"]
-              [#t 8] [0.0 85]
-              [123456789101112 'c])
-             #\b "bee" "bumble"
-             'd 12
-             123456789101112)
-
-    (let ([val-of (lambda (a)
-                    (if (number? a) 
-                        a 
-                        (string->number a)))])
-      (test-ht (make-hashtable val-of
-                               (lambda (a b)
-                                 (= (val-of a) (val-of b)))) 
-               equal?
-               ([1 'one]["2" 'two]
-                [3 'three]["4" 'four])
-               2 'two 'er
-               5 'five
-               4))
-
-    (test (hashtable? (make-eq-hashtable 10)) #t)
-    (test (hashtable? (make-eqv-hashtable 10)) #t)
-    (test (hashtable? (make-hashtable (lambda (x) 0) equal? 10)) #t)
-    
-    (let ([zero (lambda (a) 0)]
-          [same? (lambda (a b) #t)])
-      (let ([ht (make-hashtable zero same?)])
-        (test (hashtable-equivalence-function ht) same?)
-        (test (hashtable-hash-function ht) zero)))
-
-    (test (equal-hash "a") (equal-hash (make-string 1 #\a)))
-    (test (equal-hash 1024) (equal-hash (expt 2 10)))
-    (test (equal-hash '(1 2 3)) (equal-hash (list 1 2 3)))
-
-    (test (string-hash "a") (string-hash (make-string 1 #\a)))
-    (test (string-hash "aaaaa") (string-hash (make-string 5 #\a)))
-    (test (string-ci-hash "aAaAA") (string-ci-hash (make-string 5 #\a)))
-    (test (string-ci-hash "aAaAA") (string-ci-hash (make-string 5 #\A)))
-
-    (test (symbol-hash 'a) (symbol-hash 'a))
-
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/info.rkt b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/info.rkt
deleted file mode 100644
index c06ab04806..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-command-line-arguments '(("run.sps" ())))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/io/ports.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/io/ports.sls
deleted file mode 100644
index c2b1f2f691..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/io/ports.sls
+++ /dev/null
@@ -1,776 +0,0 @@
-#!r6rs
-
-(library (tests r6rs io ports)
-  (export run-io-ports-tests)
-  (import (rnrs)
-          (rnrs mutable-strings (6))
-          (tests r6rs test))
-
-  (define-syntax test-transcoders
-    (syntax-rules ()
-      [(_ bytevector->string string->bytevector)
-       (begin
-         (test (bytevector->string #vu8(97 112 112 206 187 101)
-                                   (make-transcoder (utf-8-codec)))
-               "app\x03BB;e")
-         (test (bytevector->string #vu8(97 112 112 206 187 101)
-                                   (make-transcoder (latin-1-codec)))
-               "app\xCE;\xBB;e")
-         (test (bytevector->string #vu8(#xFE #xFF 0 97 0 112 0 112 #x3 #xBB 0 101)
-                                   (make-transcoder (utf-16-codec)))
-               "app\x03BB;e")
-         (test (bytevector->string #vu8(97 10 98 13 99 13 10 100 #o302 #o205 101 
-                                           #o342 #o200 #o250 102 13 #o302 #o205 103)
-                                   (make-transcoder (utf-8-codec) 'none))
-               "a\nb\rc\r\nd\x85;e\x2028;f\r\x85;g")
-         (test (bytevector->string #vu8(97 10 98 13 99 13 10 100 #o302 #o205 101 #o342 
-                                           #o200 #o250 102 13 #o302 #o205 103)
-                                   (make-transcoder (utf-8-codec) 'lf))
-               "a\nb\nc\nd\ne\nf\ng")
-         (test/exn (bytevector->string #vu8(97 112 112 206 101)
-                                       (make-transcoder (utf-8-codec) 'lf 'raise))
-                   &i/o-decoding)
-
-         (test (string->bytevector "app\x03BB;e"
-                                   (make-transcoder (utf-8-codec)))
-               #vu8(97 112 112 206 187 101))
-         (test (string->bytevector "apple\x85;"
-                                   (make-transcoder (latin-1-codec)))
-               #vu8(97 112 112 108 101 #x85))
-         (test/alts (string->bytevector "app\x03BB;e"
-                                        (make-transcoder (utf-16-codec)))
-                    ;; Could be LE or BE (where BE is with or without BOM):
-                    #vu8(#xFF #xFE 97 0 112 0 112 0 #xBB #x3 101 0)
-                    #vu8(#xFE #xFF 0 97 0 112 0 112 #x3 #xBB 0 101)
-                    #vu8(0 97 0 112 0 112 #x3 #xBB 0 101))
-         (test (string->bytevector "a\nb"
-                                   (make-transcoder (utf-8-codec) 'lf))
-               #vu8(97 10 98))
-         (test (string->bytevector "a\nb"
-                                   (make-transcoder (utf-8-codec) 'cr))
-               #vu8(97 13 98))
-         (test (string->bytevector "a\nb"
-                                   (make-transcoder (utf-8-codec) 'crlf))
-               #vu8(97 13 10 98))
-         (test (string->bytevector "a\nb"
-                                   (make-transcoder (utf-8-codec) 'nel))
-               #vu8(97 #o302 #o205 98))
-         (test (string->bytevector "a\nb"
-                                   (make-transcoder (utf-8-codec) 'ls))
-               #vu8(97 #o342 #o200 #o250 98))
-         (test (string->bytevector "a\nb"
-                                   (make-transcoder (utf-8-codec) 'crnel))
-               #vu8(97 13 #o302 #o205 98))
-         (test/exn (string->bytevector "a\x185;b" (make-transcoder (latin-1-codec) 'lf 'raise))
-                   &i/o-encoding))]))
-
-  (define-syntax test-positions
-    (syntax-rules ()
-      [(_ make)
-       (begin
-         (let* ([p (make "custom"
-                     (lambda (? start count) 0)
-                     (lambda () 0)
-                     #f
-                     (lambda () 'ok))])
-           (test (port-has-port-position? p) #t)
-           (test (port-has-set-port-position!? p) #f)
-           (test (port-position p) 0)
-           (test/unspec (close-port p)))
-         (let* ([p (make "custom"
-                     (lambda (? start count) 0)
-                     #f
-                     (lambda (pos) 'ok)
-                     (lambda () 'ok))])
-           (test (port-has-port-position? p) #f)
-           (test (port-has-set-port-position!? p) #t)
-           (test/unspec (set-port-position! p 0))
-           (test/unspec (close-port p)))
-         (let* ([p (make "custom"
-                     (lambda (? start count) 0)
-                     #f
-                     #f
-                     (lambda () 'ok))])
-           (test (port-has-port-position? p) #f)
-           (test (port-has-set-port-position!? p) #f)
-           (test/unspec (close-port p))))]))
-
-  (define-syntax test-rw
-    (syntax-rules ()
-      [(_ v)
-       (test (let ([p (open-string-input-port
-                       (call-with-string-output-port
-                        (lambda (p) (put-datum p v))))])
-               (dynamic-wind
-                   (lambda () 'ok)
-                   (lambda () (get-datum p))
-                   (lambda () (close-port p))))
-             v)]))
-
-  ;; ----------------------------------------
-
-  (define (run-io-ports-tests)
-
-    (test (enum-set->list (file-options)) '())
-    (test (enum-set-member? 'no-create (file-options)) #f)
-    (test (enum-set-member? 'no-create (file-options no-create)) #t)
-    (test (enum-set-member? 'no-create (file-options no-fail)) #f)
-    (test (enum-set-member? 'no-fail (file-options no-fail)) #t)
-    (test (enum-set-member? 'no-truncate (file-options no-truncate)) #t)
-    (test (enum-set-member? 'no-truncate (file-options no-create no-fail no-truncate)) #t)
-    (test (enum-set-member? 'no-fail (file-options no-create no-fail no-truncate)) #t)
-    (test (enum-set-member? 'no-create (file-options no-create no-fail no-truncate)) #t)
-
-    (test (buffer-mode none) 'none)
-    (test (buffer-mode line) 'line)
-    (test (buffer-mode block) 'block)
-    (test (buffer-mode? 'none) #t)
-    (test (buffer-mode? 'line) #t)
-    (test (buffer-mode? 'block) #t)
-    (test (buffer-mode? 'point) #f)
-
-    (test/unspec (latin-1-codec))
-    (test/unspec (utf-8-codec))
-    (test/unspec (utf-16-codec))
-
-    (test (eol-style lf) 'lf)
-    (test (eol-style cr) 'cr)
-    (test (eol-style crlf) 'crlf)
-    (test (eol-style nel) 'nel)
-    (test (eol-style crnel) 'crnel)
-    (test (eol-style ls) 'ls)
-    (test (eol-style none) 'none)
-    (test (symbol? (native-eol-style)) #t)
-
-    (test (error-handling-mode ignore) 'ignore)
-    (test (error-handling-mode raise) 'raise)
-    (test (error-handling-mode replace) 'replace)
-
-    (test (transcoder-codec (make-transcoder (latin-1-codec))) (latin-1-codec))
-    (test (transcoder-codec (make-transcoder (utf-8-codec))) (utf-8-codec))
-    (test (transcoder-codec (make-transcoder (utf-16-codec))) (utf-16-codec))
-    (test (transcoder-eol-style (make-transcoder (utf-16-codec))) (native-eol-style))
-    (test (transcoder-error-handling-mode (make-transcoder (utf-16-codec))) 'replace)
-
-    (test (transcoder-codec (make-transcoder (utf-8-codec) 'nel)) (utf-8-codec))
-    (test (transcoder-eol-style (make-transcoder (utf-8-codec) 'nel)) 'nel)
-    (test (transcoder-error-handling-mode (make-transcoder (utf-8-codec) 'nel)) 'replace)
-    (test (transcoder-codec (make-transcoder (utf-8-codec) 'nel 'raise)) (utf-8-codec))
-    (test (transcoder-eol-style (make-transcoder (utf-8-codec) 'nel 'raise)) 'nel)
-    (test (transcoder-error-handling-mode (make-transcoder (utf-8-codec) 'nel 'raise)) 'raise)
-
-    (test/unspec (native-transcoder))
-
-    (test-transcoders bytevector->string
-                      string->bytevector)
-
-    (test (eqv? (eof-object) (eof-object)) #t)
-    (test (eq? (eof-object) (eof-object)) #t)
-
-    ;; ----------------------------------------
-    ;; Check file creation and truncation:
-
-    (test/unspec
-     (if (file-exists? "io-tmp1")
-         (delete-file "io-tmp1")))
-
-    ;; Don't create if 'no-create:
-    (test/exn (open-file-output-port "io-tmp1"
-                                     (file-options no-create))
-              &i/o-file-does-not-exist)
-    (test/exn (open-file-output-port "io-tmp1"
-                                     (file-options no-create no-fail))
-              &i/o-file-does-not-exist)
-    (test/exn (open-file-output-port "io-tmp1"
-                                     (file-options no-create no-truncate))
-              &i/o-file-does-not-exist)
-    (test/exn (open-file-output-port "io-tmp1"
-                                     (file-options no-create no-fail no-truncate))
-              &i/o-file-does-not-exist)
-
-    ;; Create:
-    (let ([p (open-file-output-port "io-tmp1")])
-      (test (file-exists? "io-tmp1") #t)
-      (test (port? p) #t)
-      (test (binary-port? p) #t)
-      (test (textual-port? p) #f)
-      (test (output-port? p) #t)
-      (test (input-port? p) #f)
-      (test/unspec (flush-output-port p))
-      (test/unspec (close-port p)))
-
-    ;; Don't re-create:
-    (test/exn (open-file-output-port "io-tmp1")
-              &i/o-file-already-exists)
-    (test/exn (open-file-output-port "io-tmp1" (file-options no-truncate))
-              &i/o-file-already-exists)
-
-    ;; Re-open if 'no-create is specified:
-    (let ([p (open-file-output-port "io-tmp1"
-                                    (file-options no-create))])
-      (test/unspec (close-port p)))
-    
-    ;; Re-open if 'no-fail is specified:
-    (let ([p (open-file-output-port "io-tmp1"
-                                    (file-options no-fail))])
-      (test/unspec (close-port p)))
-
-    ;; Create if 'no-fail is specified and it doesn't exist:
-    (test/unspec (delete-file "io-tmp1"))
-    (let ([p (open-file-output-port "io-tmp1"
-                                    (file-options no-fail no-truncate))])
-      (test/unspec (close-port p)))
-    (test/unspec (delete-file "io-tmp1"))
-    (let ([p (open-file-output-port "io-tmp1"
-                                    (file-options no-fail))])
-      (test/unspec (put-bytevector p #vu8(99 101 98 100)))
-      (test/unspec (close-port p)))
-
-    ;; Check content:
-    (let ([p (open-file-input-port "io-tmp1")])
-      (test (port? p) #t)
-      (test (binary-port? p) #t)
-      (test (textual-port? p) #f)
-      (test (input-port? p) #t)
-      (test (output-port? p) #f)
-      (test (get-bytevector-n p 5) #vu8(99 101 98 100))
-      (test (port-eof? p) #t)
-      (test/unspec (close-port p)))
-
-    ;; Check that 'no-truncate doesn't truncate:
-    (let ([p (open-file-output-port "io-tmp1"
-                                    (file-options no-fail no-truncate))])
-      (test/unspec (put-bytevector p #vu8(97)))
-      (test/unspec (close-port p)))
-    (let ([p (open-file-input-port "io-tmp1")])
-      (test (get-bytevector-n p 5) #vu8(97 101 98 100))
-      (test/unspec (close-port p)))
-    (let ([p (open-file-output-port "io-tmp1"
-                                    (file-options no-create no-truncate))])
-      (test/unspec (put-bytevector p #vu8(96)))
-      (test/unspec (close-port p)))
-    (let ([p (open-file-input-port "io-tmp1")])
-      (test (get-bytevector-n p 5) #vu8(96 101 98 100))
-      (test/unspec (close-port p)))
-    (let ([p (open-file-output-port "io-tmp1"
-                                    (file-options no-create no-truncate))])
-      (test (port-has-port-position? p) #t)
-      (test (port-has-set-port-position!? p) #t)
-      (test (port-position p) 0)
-      (test/unspec (set-port-position! p 6))
-      (test (port-position p) 6)
-      (test/unspec (put-bytevector p #vu8(102)))
-      (test/unspec (close-port p)))
-    (let ([p (open-file-input-port "io-tmp1")])
-      (test (get-bytevector-n p 4) #vu8(96 101 98 100))
-      (test/unspec (get-bytevector-n p 2))
-      (test (get-bytevector-n p 2) #vu8(102))
-      (test/unspec (close-port p)))
-
-    ;; Otherwise, truncate:
-    (let ([p (open-file-output-port "io-tmp1"
-                                    (file-options no-fail))])
-      (test/unspec (close-port p)))
-    (let ([p (open-file-input-port "io-tmp1")])
-      (test (port-eof? p) #t)
-      (test/unspec (close-port p)))
-
-    ;; ----------------------------------------
-    ;; Check buffer modes? Just make sure they're accepted:
-
-    (let ([p (open-file-output-port "io-tmp1" (file-options no-create) 'line)])
-      (test (output-port-buffer-mode p) 'line)
-      (close-port p))
-    (let ([p (open-file-output-port "io-tmp1" (file-options no-create) 'block)])
-      (test (output-port-buffer-mode p) 'block)
-      (close-port p))
-    (let ([p (open-file-output-port "io-tmp1" (file-options no-create) 'none)])
-      (test (output-port-buffer-mode p) 'none)
-      (close-port p))
-
-    (let ([p (open-file-input-port "io-tmp1" (file-options) 'line)])
-      (close-port p))
-    (let ([p (open-file-input-port "io-tmp1" (file-options) 'block)])
-      (close-port p))
-    (let ([p (open-file-input-port "io-tmp1" (file-options) 'none)])
-      (close-port p))
-    
-    ;; ----------------------------------------
-    ;; Transcoders
-
-    (let ([p (open-file-output-port "io-tmp1" (file-options no-create) 
-                                    'block (make-transcoder (latin-1-codec)))])
-      (when (port-has-port-position? p)
-        (test/unspec (port-position p))
-        (when (port-has-set-port-position!? p)
-          (let ([pos (port-position p)])
-            (test/unspec (set-port-position! p pos)))))
-      (test (binary-port? p) #f)
-      (test (textual-port? p) #t)
-      (test/unspec (put-string p "apple"))
-      (test/unspec (put-string p "berry" 3))
-      (test/unspec (put-string p "berry" 1 1))
-      (close-port p))
-
-    (let ([p (open-file-input-port "io-tmp1" (file-options)
-                                   'block (make-transcoder (latin-1-codec)))])
-      (test (binary-port? p) #f)
-      (test (textual-port? p) #t)
-      (test (lookahead-char p) #\a)
-      (test (get-char p) #\a)
-      (test (get-string-n p 20) "pplerye")
-      (test (lookahead-char p) (eof-object))
-      (test (get-char p) (eof-object))
-      (close-port p))
-
-    (let ([p (open-file-output-port "io-tmp1" (file-options no-create) 
-                                    'block (make-transcoder (utf-8-codec)))])
-      (test/unspec (put-string p "app\x3BB;e"))
-      (close-port p))
-    (let ([p (open-file-input-port "io-tmp1" (file-options)
-                                   'block (make-transcoder (latin-1-codec)))])
-      (test (get-string-n p 20) "app\xCE;\xBB;e")
-      (close-port p))
-    
-    (let ([p (open-file-output-port "io-tmp1" (file-options no-create) 
-                                    'block (make-transcoder (utf-16-codec)))])
-      (test/unspec (put-string p "app\x3BB;e"))
-      (close-port p))
-    (let ([p (open-file-input-port "io-tmp1" (file-options)
-                                   'block (make-transcoder (utf-16-codec)))])
-      (test (get-string-n p 20) "app\x3BB;e")
-      (close-port p))
-    (let ([p (open-file-input-port "io-tmp1")])
-      (let ([b1 (get-u8 p)])
-        (cond
-        [(equal? b1 #xFE)
-         (test (get-u8 p) #xFF)
-         (test (get-u8 p) 0)
-         (test (get-u8 p) 97)]
-        [(equal? b1 #xFF)
-         (test (get-u8 p) #xFE)
-         (test (get-u8 p) 97)
-         (test (get-u8 p) 0)]
-        [else
-         ;; Must be big-endian
-         (test b1 0)
-         (test (get-u8 p) 97)]))
-      (test/unspec (close-port p)))
-
-    (let ([bytevector->string-via-file
-           (lambda (bv tr)
-             (let ([p (open-file-output-port "io-tmp1" (file-options no-create))])
-               (put-bytevector p bv)
-               (close-port p))
-             (let ([p (open-file-input-port "io-tmp1" (file-options) 'block tr)])
-               (dynamic-wind
-                   (lambda () 'ok)
-                   (lambda () (get-string-all p))
-                   (lambda () (close-port p)))))]
-          [string->bytevector-via-file
-           (lambda (str tr)
-             (let ([p (open-file-output-port "io-tmp1" (file-options no-create)
-                                             'block tr)])
-               (dynamic-wind
-                   (lambda () 'ok)
-                   (lambda () (put-string p str) (flush-output-port p))
-                   (lambda () (close-port p))))
-             (let ([p (open-file-input-port "io-tmp1")])
-               (let ([v (get-bytevector-all p)])
-                 (close-port p)
-                 v)))])
-      (test-transcoders bytevector->string-via-file
-                        string->bytevector-via-file))
-
-    (let ((port (open-bytevector-input-port #vu8())))
-      (test (eof-object? (get-bytevector-all port)) #t)
-      (test (eof-object? (get-bytevector-n port 10)) #t))
-
-    (let ([test-i+o
-           (lambda (buf)
-             (let ([p (open-file-input/output-port "io-tmp1"
-                                                   (file-options no-fail)
-                                                   buf)])
-               (if (and (port-has-port-position? p)
-                        (port-has-set-port-position!? p))
-                   (begin
-                     (port-position p)
-                     (test (port-position p) 0)
-                     (test/unspec (put-bytevector p #vu8(7 9 11)))
-                     (unless (eq? buf 'none)
-                       (test/unspec (flush-output-port p)))
-                     (test (port-position p) 3)
-                     (test/unspec (set-port-position! p 0))
-                     (test (get-bytevector-n p 2) #vu8(7 9))
-                     (test/unspec (put-bytevector p #vu8(13 15 17)))
-                     (unless (eq? buf 'none)
-                       (test/unspec (flush-output-port p)))
-                     (test/unspec (set-port-position! p 3))
-                     (test (get-bytevector-n p 2) #vu8(15 17)))
-                   (begin
-                     (test/unspec (put-bytevector p #vu8(7 9 11)))
-                     (test (get-u8 p) (eof-object))))
-               (test/unspec (close-port p))))])
-      (test-i+o 'line)
-      (test-i+o 'block)
-      (test-i+o 'none))
-
-    (let ([p (open-file-input/output-port "io-tmp1"
-                                          (file-options no-fail)
-                                          'none
-                                          (make-transcoder (latin-1-codec)))])
-      (test/unspec (put-string p "berry"))
-      (test/unspec (close-port p)))
-    (let ([p (open-file-input/output-port "io-tmp1"
-                                          (file-options no-fail no-truncate)
-                                          'none
-                                          (make-transcoder (latin-1-codec)))])
-      (test (get-string-n p 4) "berr")
-      (test/unspec (put-string p "apple"))
-      (test/unspec (close-port p)))
-    (let ([p (open-file-input/output-port "io-tmp1"
-                                          (file-options no-fail no-truncate)
-                                          'none
-                                          (make-transcoder (latin-1-codec)))])
-      (test (get-string-n p 10) "berrapple")
-      (test/unspec (close-port p)))
-
-    (test/unspec (delete-file "io-tmp1"))
-    
-    ;; ----------------------------------------
-    ;; bytevector ports
-
-    (let ([p (open-bytevector-input-port #vu8(0 1 2 3))])
-      (test (input-port? p) #t)
-      (test (binary-port? p) #t)
-      (test (textual-port? p) #f)
-      (test (get-u8 p) 0)
-      (test (lookahead-u8 p) 1)
-      (test (get-u8 p) 1)
-      (let ([bv (make-bytevector 10 0)])
-        (test (get-bytevector-n! p bv 1 7) 2)
-        (test bv #vu8(0 2 3 0 0 0 0 0 0 0)))
-      (test (get-bytevector-some p) (eof-object))
-      (close-port p))
-
-    (let-values ([(p get) (open-bytevector-output-port)])
-      (test (output-port? p) #t)
-      (test (binary-port? p) #t)
-      (test (textual-port? p) #f)
-      (test/unspec (put-u8 p 10))
-      (test/unspec (put-bytevector p #vu8(11 12 13)))
-      (test/unspec (put-bytevector p #vu8(14 15 16 17 18) 4))
-      (test/unspec (put-bytevector p #vu8(14 15 16 17 18) 2 1))
-      (test (get) #vu8(10 11 12 13 18 16))
-      (test (get) #vu8())
-      (close-port p))
-
-    (test (call-with-bytevector-output-port
-           (lambda (p)
-             (put-bytevector p #vu8(1 2 3))))
-          #vu8(1 2 3))
-
-    (test (call-with-bytevector-output-port
-           (lambda (p)
-             (put-string p "app\x3BB;e"))
-           (make-transcoder (utf-8-codec)))
-          #vu8(97 112 112 206 187 101))
-
-    (let ([bytevector->string-via-port
-           (lambda (bv tr)
-             (let ([p (open-bytevector-input-port bv tr)])
-               (dynamic-wind
-                   (lambda () 'ok)
-                   (lambda () (get-string-all p))
-                   (lambda () (close-port p)))))]
-          [string->bytevector-via-port
-           (lambda (str tr)
-             (let-values ([(p get) (open-bytevector-output-port tr)])
-               (dynamic-wind
-                   (lambda () 'ok)
-                   (lambda ()
-                     (put-string p str)
-                     (get))
-                   (lambda ()
-                     (close-port p)))))])
-      (test-transcoders bytevector->string-via-port
-                        string->bytevector-via-port))
-
-    ;; ----------------------------------------
-    ;; string ports
-
-    (let ([p (open-string-input-port "app\x3BB;e\r\nban")])
-      (test (input-port? p) #t)
-      (test (binary-port? p) #f)
-      (test (textual-port? p) #t)
-      (test (get-char p) #\a)
-      (test (lookahead-char p) #\p)
-      (test (get-line p) "pp\x3BB;e\r")
-      (let ([s (make-string 10 #\_)])
-        (test (get-string-n! p s 1 9) 3)
-        (test s "_ban______")))
-
-    (let ([p (open-string-input-port "(1 2 3) 4")])
-      (test (get-datum p) '(1 2 3))
-      (close-port p))
-
-    (let-values ([(p get) (open-string-output-port)])
-      (test/unspec (put-string p "app\x3BB;e"))
-      (test (get) "app\x3BB;e")
-      (test (get) "")
-      (close-port p))
-
-    (test (call-with-string-output-port
-           (lambda (p)
-             (test/unspec (put-string p "app\x3BB;y"))))
-          "app\x3BB;y")
-    
-    ;; ----------------------------------------
-    ;; custom ports
-
-    (let* ([pos 0]
-           [p (make-custom-binary-input-port
-               "custom in"
-               (lambda (bv start count)
-                 (if (= pos 16)
-                     0
-                     (begin
-                       (set! pos (+ 1 pos))
-                       (bytevector-u8-set! bv start pos)
-                       1)))
-               (lambda () pos)
-               (lambda (p) (set! pos p))
-               (lambda () 'ok))])
-      (test (port-has-port-position? p) #t)
-      (test (port-has-set-port-position!? p) #t)
-      (test (port-position p) 0)
-      (test (get-bytevector-n p 3) #vu8(1 2 3))
-      (test (port-position p) 3)
-      (test (lookahead-u8 p) 4)
-      (test (lookahead-u8 p) 4)
-      (test (port-position p) 3)
-      (test/unspec (set-port-position! p 10))
-      (get-bytevector-n p 2)
-      (test (get-bytevector-n p 2) #vu8(13 14))
-      (test (get-bytevector-n p 2) #vu8(15 16))
-      (test (get-bytevector-n p 2) (eof-object))
-      (test/unspec (set-port-position! p 2))
-      (test (get-bytevector-n p 3) #vu8(3 4 5))
-      (test/unspec (close-port p)))
-
-    (test-positions make-custom-binary-input-port)
-
-    (let* ([pos 0]
-           [p (make-custom-textual-input-port
-               "custom in"
-               (lambda (bv start count)
-                 (if (= pos 16)
-                     0
-                     (begin
-                       (set! pos (+ 1 pos))
-                       (string-set! bv start (integer->char (+ 96 pos)))
-                       1)))
-               (lambda () pos)
-               (lambda (p) (set! pos p))
-               (lambda () 'ok))])
-      (test/unspec (port-position p))
-      (test (get-string-n p 3) "abc")
-      (test (lookahead-char p) #\d)
-      (test (lookahead-char p) #\d)
-      (test (get-string-n p 7) "defghij")
-      (get-string-n p 2)
-      (test (get-string-n p 2) "mn")
-      (test (get-string-n p 2) "op")
-      (test (get-string-n p 2) (eof-object))
-      (test/unspec (close-port p)))
-
-    ;; textual port positions are hopelessly broken in R6RS
-    #;(test-positions make-custom-textual-input-port)
-    
-    (let* ([accum '()]
-           [p (make-custom-binary-output-port
-               "custom out"
-               (lambda (bv start count)
-                 (let ([bv2 (make-bytevector count)])
-                   (bytevector-copy! bv start bv2 0 count)
-                   (set! accum (append
-                                (reverse (bytevector->u8-list bv2))
-                                accum))
-                   count))
-               (lambda () (length accum))
-               (lambda (pos) (set! accum (list-tail accum (- (length accum) pos))))
-               (lambda () 'ok))])
-      (test (port-has-port-position? p) #t)
-      (test (port-has-set-port-position!? p) #t)
-      (test (port-position p) 0)
-      (test/unspec (put-bytevector p #vu8(2 4 6)))
-      (flush-output-port p)
-      (test accum '(6 4 2))
-      (test (port-position p) 3)
-      (test/unspec (set-port-position! p 2))
-      (test (port-position p) 2)
-      (test accum '(4 2))
-      (test/unspec (put-bytevector p #vu8(3 7 9 11) 2 1))
-      (flush-output-port p)
-      (test accum '(9 4 2))
-      (test/unspec (close-port p)))
-
-    (test-positions make-custom-binary-output-port)
-
-    (let* ([accum '()]
-           [p (make-custom-textual-output-port
-               "custom out"
-               (lambda (str start count)
-                 (let ([str (substring str start count)])
-                   (set! accum (append
-                                (reverse (string->list str))
-                                accum))
-                   count))
-               (lambda () (length accum))
-               (lambda (pos) (set! accum (list-tail accum (- (length accum) pos))))
-               (lambda () 'ok))])
-      (test (port-has-port-position? p) #t)
-      (test (port-has-set-port-position!? p) #t)
-      (test (port-position p) 0)
-      (test/unspec (put-string p "ab"))
-      (test (port-position p) 2)
-      (test/unspec (put-string p "c"))
-      (flush-output-port p)
-      (test accum '(#\c #\b #\a))
-      (test (port-position p) 3)
-      (test/unspec (set-port-position! p 2))
-      (test (port-position p) 2)
-      (test accum '(#\b #\a))
-      (test/unspec (put-string p "xyzw" 2 1))
-      (flush-output-port p)
-      (test accum '(#\z #\b #\a))
-      (test/unspec (close-port p)))
-
-    ;; textual port positions are hopelessly broken in R6RS
-    #;(test-positions make-custom-textual-output-port)
-
-    (let* ([save #f]
-           [p (make-custom-binary-input/output-port
-               "custom in"
-               (lambda (bv start end)
-                 (bytevector-u8-set! bv start 7)
-                 1)
-               (lambda (bv start end)
-                 (set! save (bytevector-u8-ref bv start))
-                 1)
-               #f #f #f)])
-      (test/unspec (put-u8 p 10))
-      (flush-output-port p)
-      (test save 10)
-      (test (get-u8 p) 7)
-      (close-port p))
-    
-    (test-positions (lambda (id r/w get set close)
-                      (make-custom-binary-input/output-port
-                       id r/w r/w get set close)))
-
-    (let* ([save #f]
-           [p (make-custom-textual-input/output-port
-               "custom in"
-               (lambda (str start end)
-                 (string-set! str start #\!)
-                 1)
-               (lambda (str start end)
-                 (set! save (string-ref str start))
-                 1)
-               #f #f #f)])
-      (test/unspec (put-char p #\q))
-      (flush-output-port p)
-      (test save #\q)
-      (test (get-char p) #\!)
-      (close-port p))
-    
-    ;; textual port positions are hopelessly broken in R6RS
-    #;(test-positions (lambda (id r/w get set close)
-                        (make-custom-textual-input/output-port
-                         id r/w r/w get set close)))
-
-    ;; ----------------------------------------
-    ;; stdin, stderr, stdout
-
-    (let ([p (standard-input-port)])
-      (test (input-port? p) #t)
-      (test (output-port? p) #f)
-      (test (binary-port? p) #t)
-      (test (textual-port? p) #f)
-      (test/unspec (close-port p)))
-
-    (let ([p (standard-output-port)])
-      (test (input-port? p) #f)
-      (test (output-port? p) #t)
-      (test (binary-port? p) #t)
-      (test (textual-port? p) #f)
-      (test/unspec (close-port p)))
-
-    (let ([p (standard-error-port)])
-      (test (input-port? p) #f)
-      (test (output-port? p) #t)
-      (test (binary-port? p) #t)
-      (test (textual-port? p) #f)
-      (test/unspec (close-port p)))
-
-    (test (input-port? (current-input-port)) #t)
-    (test (output-port? (current-input-port)) #f)
-    (test (binary-port? (current-input-port)) #f)
-    (test (textual-port? (current-input-port)) #t)
-
-    (test (input-port? (current-output-port)) #f)
-    (test (output-port? (current-output-port)) #t)
-    (test (binary-port? (current-output-port)) #f)
-    (test (textual-port? (current-output-port)) #t)
-
-    ;; ----------------------------------------
-
-    (test-rw 10)
-    (test-rw 10.0)
-    (test-rw 1/2)
-    (test-rw 1+2i)
-    (test-rw 1+2.0i)
-    (test-rw #t)
-    (test-rw #f)
-    (test-rw 'apple)
-    (test-rw (string->number "app\x3BB;e"))
-    (test-rw (string->symbol " "))
-    (test-rw (string->symbol "+"))
-    (test-rw (string->symbol "0"))
-    (test-rw (string->symbol "app\x1678;e"))
-    (test-rw 'a1)
-    (test-rw '->)
-    (test-rw '...)
-    (test-rw "apple")
-    (test-rw "app\x3BB;e")
-    (test-rw "app\x1678;e")
-    (test-rw "\r\n")
-    (test-rw #\a)
-    (test-rw #\x3BB)
-    (test-rw #\nul)
-    (test-rw #\alarm)
-    (test-rw #\backspace)
-    (test-rw #\tab)
-    (test-rw #\linefeed)
-    (test-rw #\newline)
-    (test-rw #\vtab)
-    (test-rw #\page)
-    (test-rw #\return)
-    (test-rw #\esc)
-    (test-rw #\space)
-    (test-rw #\delete)
-    (test-rw #\xFF)
-    (test-rw #\x00006587)
-    (test-rw #\x10FFFF)
-    (test-rw #\x1678)
-    (test-rw #vu8())
-    (test-rw #vu8(1 2 3))
-    (test-rw '#(a))
-    (test-rw '#())
-    (test-rw '#(a 1/2 "str" #vu8(1 2 7)))
-
-    ;; ----------------------------------------
-    
-    ;;
-    ))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/io/simple.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/io/simple.sls
deleted file mode 100644
index 3e4d193337..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/io/simple.sls
+++ /dev/null
@@ -1,98 +0,0 @@
-#!r6rs
-
-(library (tests r6rs io simple)
-  (export run-io-simple-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define (run-io-simple-tests)
-
-    (test/unspec
-     (when (file-exists? "io-tmp2")
-       (delete-file "io-tmp2")))
-
-    (test/values (call-with-output-file "io-tmp2"
-                   (lambda (p)
-                     (test (output-port? p) #t)
-                     (test (binary-port? p) #f)
-                     (test (textual-port? p) #t)
-                     (test/unspec (write-char #\q p))
-                     (test/unspec (newline p))
-                     (test/unspec (display "more" p))
-                     (test/unspec (write "last" p))
-                     (values 3 4)))
-                 3 4)
-
-    (test/values (call-with-input-file "io-tmp2"
-                   (lambda (p)
-                     (test (input-port? p) #t)
-                     (test (binary-port? p) #f)
-                     (test (textual-port? p) #t)
-                     (test (peek-char p) #\q)
-                     (test (read-char p) #\q)
-                     (test (read-char p) #\newline)
-                     (test (read-char p) #\m)
-                     (test (read-char p) #\o)
-                     (test (peek-char p) #\r)
-                     (test (read-char p) #\r)
-                     (test (read-char p) #\e)
-                     (test (read p) "last")
-                     (test (read p) (eof-object))
-                     (values 7 8 9)))
-                 7 8 9)
-
-    (test/unspec (delete-file "io-tmp2"))
-
-    (let ([p (open-output-file "io-tmp2")])
-      (test (output-port? p) #t)
-      (test (binary-port? p) #f)
-      (test (textual-port? p) #t)
-      (test/unspec (write-char #\! p))
-      (test/unspec (close-output-port p)))
-
-    (let ([p (open-input-file "io-tmp2")])
-      (test (input-port? p) #t)
-      (test (binary-port? p) #f)
-      (test (textual-port? p) #t)
-      (test (read-char p) #\!)
-      (test/unspec (close-input-port p)))
-
-    (test/unspec (delete-file "io-tmp2"))
-
-    (test/values (with-output-to-file "io-tmp2"
-                   (lambda ()
-                     (test/unspec (write-char #\z))
-                     (test/unspec (newline))
-                     (test/unspec (display "a"))
-                     (test/unspec (write "a"))
-                     (values 30 40)))
-                 30 40)
-
-    (test/values (with-input-from-file "io-tmp2"
-                   (lambda ()
-                     (test (peek-char) #\z)
-                     (test (read-char) #\z)
-                     (test (read) 'a)
-                     (test (read) "a")
-                     (test (read) (eof-object))
-                     (values 70 80 90)))
-                 70 80 90)
-
-    (test/unspec
-     (when (file-exists? "io-tmp2")
-       (delete-file "io-tmp2")))
-    
-    (test (input-port? (current-input-port)) #t)
-    (test (binary-port? (current-input-port)) #f)
-    (test (textual-port? (current-input-port)) #t)
-
-    (test (output-port? (current-output-port)) #t)
-    (test (binary-port? (current-output-port)) #f)
-    (test (textual-port? (current-output-port)) #t)
-
-    (test (output-port? (current-error-port)) #t)
-    (test (binary-port? (current-error-port)) #f)
-    (test (textual-port? (current-error-port)) #t)
-
-    ;;
-    ))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/io/sync.rkt b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/io/sync.rkt
deleted file mode 100644
index 1be9917aa5..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/io/sync.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket
-(require rnrs/io/ports-6)
-
-;; Make sure that an R6RS port plays ok with sync,
-;; particularly when no input is available.
-(void (sync/timeout 0 (standard-input-port)))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/lists.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/lists.sls
deleted file mode 100644
index 91a3b602d5..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/lists.sls
+++ /dev/null
@@ -1,154 +0,0 @@
-#!r6rs
-
-(library (tests r6rs lists)
-  (export run-lists-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define (run-lists-tests)
-    
-    ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;;  Tests originally from R6RS
-
-    (test (find even? '(3 1 4 1 5 9)) 4)
-    (test (find even? '(3 1 5 1 5 9)) #f)
-    
-    (test (for-all even? '()) #t)
-    (test (for-all even? '(3 1 4 1 5 9)) #f)
-    ;; (test (for-all even? '(3 1 4 1 5 9 . 2)) #f) ; removed from R6RS
-    (test (for-all even? '(2 4 14)) #t)
-    (test/exn (for-all even? '(2 4 14 . 9)) &assertion)
-    (test (for-all (lambda (n) (and (even? n) n))
-                   '(2 4 14)) 
-          14)
-    (test (for-all < '(1 2 3) '(2 3 4)) #t)
-    (test (for-all < '(1 2 4) '(2 3 4)) #f)
-    
-    (test (exists even? '(3 1 4 1 5 9)) #t)
-    (test (exists even? '(3 1 1 5 9)) #f)
-    (test (exists even? '()) #f)
-    (test/exn (exists even? '(3 1 1 5 9 . 2)) &assertion)
-    (test (exists (lambda (n) (and (even? n) n)) '(2 1 4 14)) 2)
-    (test (exists < '(1 2 4) '(2 3 4)) #t)
-    (test (exists > '(1 2 3) '(2 3 4)) #f)
-
-    (test (filter even? '(3 1 4 1 5 9 2 6)) '(4 2 6))
-
-    (test/values (partition even? '(3 1 4 1 5 9 2 6)) '(4 2 6) '(3 1 1 5 9))
-
-    (test (fold-left + 0 '(1 2 3 4 5)) 15)
-
-    (test (fold-left (lambda (a e) (cons e a)) '()
-                     '(1 2 3 4 5)) 
-          '(5 4 3 2 1))
-
-    (test (fold-left (lambda (count x)
-                       (if (odd? x) (+ count 1) count))
-                     0
-                     '(3 1 4 1 5 9 2 6 5 3)) 
-          7)
-    (test (fold-left (lambda (max-len s)
-                       (max max-len (string-length s)))
-                     0
-                     '("longest" "long" "longer")) 
-          7)
-
-    (test (fold-left cons '(q) '(a b c)) '((((q) . a) . b) . c))
-    
-    (test (fold-left + 0 '(1 2 3) '(4 5 6)) 21)
-    
-    (test (fold-right + 0 '(1 2 3 4 5)) 15)
-    
-    (test (fold-right cons '() '(1 2 3 4 5)) '(1 2 3 4 5))
-    
-    (test (fold-right (lambda (x l)
-                        (if (odd? x) (cons x l) l))
-                      '()
-                      '(3 1 4 1 5 9 2 6 5))
-          '(3 1 1 5 9 5))
-
-    (test (fold-right cons '(q) '(a b c)) '(a b c q))
-
-    (test (fold-right + 0 '(1 2 3) '(4 5 6)) 21)
-    
-    (test (remp even? '(3 1 4 1 5 9 2 6 5)) '(3 1 1 5 9 5))
-
-    (test (remove 1 '(3 1 4 1 5 9 2 6 5)) '(3 4 5 9 2 6 5))
-    
-    (test (remv 1 '(3 1 4 1 5 9 2 6 5)) '(3 4 5 9 2 6 5))
-    
-    (test (remq 'foo '(bar foo baz)) '(bar baz))
-    
-    (test (memp even? '(3 1 4 1 5 9 2 6 5)) '(4 1 5 9 2 6 5))
-    
-    (test (memq 'a '(a b c))               '(a b c))
-    (test (memq 'b '(a b c))               '(b c))
-    (test (memq 'a '(b c d))               #f)
-    (test (memq (list 'a) '(b (a) c))      #f)
-    (test (member (list 'a) '(b (a) c))   '((a) c))
-    (test/unspec (memq 101 '(100 101 102)))
-    (test (memv 101 '(100 101 102)) '(101 102))
-
-    (let ([d '((3 a) (1 b) (4 c))])
-      (test (assp even? d) '(4 c))
-      (test (assp odd? d) '(3 a)))
-
-    (let ([e '((a 1) (b 2) (c 3))])
-      (test (assq 'a e)      '(a 1))
-      (test (assq 'b e)      '(b 2))
-      (test (assq 'd e)      #f))
-
-
-    (test (assq (list 'a) '(((a)) ((b)) ((c))))
-          #f)
-    (test (assoc (list 'a) '(((a)) ((b)) ((c))))   
-          '((a)))
-    (test/unspec (assq 5 '((2 3) (5 7) (11 13))))
-    (test (assv 5 '((2 3) (5 7) (11 13))) '(5 7))
-
-    (test (cons* 1 2 '(3 4 5)) '(1 2 3 4 5))
-    (test (cons* 1 2 3) '(1 2 . 3))
-    (test (cons* 1) 1)
-
-    ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; Tests originally from Ikarus
-
-    (test (for-all even? '(1 2 3 4)) #f)
-    (test (for-all even? '(10 12 14 16)) #t)
-    (test (for-all even? '(2 3 4)) #f)
-    (test (for-all even? '(12 14 16)) #t)
-    (test (for-all (lambda (x) x) '(12 14 16)) 16)
-    (test (for-all (lambda (x) x) '(12 14)) 14)
-    (test (for-all (lambda (x) x) '(12)) 12)
-    (test (for-all (lambda (x) x) '()) #t)
-    ;; (test (for-all even? '(13 . 14)) #f) ; removed from R6RS
-    (test (for-all cons '(1 2 3) '(a b c)) '(3 . c))
-    (test (for-all (lambda (a b) (= a 1)) '(1 2 3) '(a b c)) #f)
-    ;; R6RS merely says that this *should* work, but not must:
-    ;; (test (for-all (lambda (a b) (= a 1)) '(1 2) '(a b c)) #f)
-    (test (fold-left + 0 '(1 2 3 4 5)) 15)
-    (test (fold-left (lambda (a b) (cons b a)) '() '(1 2 3 4 5))
-          '(5 4 3 2 1))
-    (test (fold-left (lambda (count x)
-                       (if (odd? x) 
-                           (+ count 1) 
-                           count))
-                     0 
-                     '(3 1 4 1 5 9 2 6 5 3))
-          7)
-    (test (fold-left cons '(q) '(a b c)) '((((q) . a) . b) . c))
-    (test (fold-left + 0 '(1 2 3) '(4 5 6)) 21)
-    (test (fold-right + 0 '(1 2 3 4 5)) 15)
-    (test (fold-right cons '() '(1 2 3 4 5))
-          '(1 2 3 4 5))
-    (test (fold-right (lambda (x l)
-                        (if (odd? x) 
-                            (cons x l)
-                            l))
-                      '()
-                      '(3 1 4 1 5 9 2 6 5 3))
-          '(3 1 1 5 9 5 3))
-    (test (fold-right + 0 '(1 2 3) '(4 5 6)) 21)
-
-    ;;
-    ))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/mutable-pairs.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/mutable-pairs.sls
deleted file mode 100644
index b827de0bed..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/mutable-pairs.sls
+++ /dev/null
@@ -1,30 +0,0 @@
-#!r6rs
-
-(library (tests r6rs mutable-pairs)
-  (export run-mutable-pairs-tests)
-  (import (rnrs)
-          (rnrs mutable-pairs)
-          (tests r6rs test))
-
-  (define (f) (list 'not-a-constant-list))
-  (define (g) '(constant-list))
-  
-  (define (run-mutable-pairs-tests)
-
-    (test/unspec (set-car! (f) 3))
-    (test/unspec-or-exn (set-car! (g) 3)
-                        &assertion)
-
-    (test (let ((x (list 'a 'b 'c 'a))
-                (y (list 'a 'b 'c 'a 'b 'c 'a)))
-            (set-cdr! (list-tail x 2) x)
-            (set-cdr! (list-tail y 5) y)
-            (list
-             (equal? x x)
-             (equal? x y)
-             (equal? (list x y 'a) (list y x 'b))))
-          '(#t #t #f))
-      
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/mutable-strings.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/mutable-strings.sls
deleted file mode 100644
index 2829e63f64..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/mutable-strings.sls
+++ /dev/null
@@ -1,24 +0,0 @@
-#!r6rs
-
-(library (tests r6rs mutable-strings)
-  (export run-mutable-strings-tests)
-  (import (rnrs)
-          (rnrs mutable-strings)
-          (tests r6rs test))
-
-  (define (f) (make-string 3 #\*))
-  (define (g) "***")
-  
-  (define (run-mutable-strings-tests)
-
-    (test/unspec (string-set! (f) 0 #\?))
-    (test/unspec-or-exn (string-set! (g) 0 #\?)
-                        &assertion)
-    (test/unspec-or-exn (string-set! (symbol->string 'immutable)
-                                     0
-                                     #\?)
-                        &assertion)
-      
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/programs.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/programs.sls
deleted file mode 100644
index e36b9cff37..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/programs.sls
+++ /dev/null
@@ -1,15 +0,0 @@
-#!r6rs
-
-(library (tests r6rs programs)
-  (export run-programs-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define (run-programs-tests)
-
-    (test (list? (command-line)) #t)
-    (test (string? (car (command-line))) #t)
-      
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/r5rs.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/r5rs.sls
deleted file mode 100644
index 712f7ad226..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/r5rs.sls
+++ /dev/null
@@ -1,181 +0,0 @@
-#!r6rs
-
-(library (tests r6rs r5rs)
-  (export run-r5rs-tests)
-  (import (rnrs)
-          (rnrs r5rs)
-          (rnrs eval)
-          (tests r6rs test))
-
-  ;; ----------------------------------------
-
-  (define a-stream
-    (letrec ((next
-              (lambda (n)
-                (cons n (delay (next (+ n 1)))))))
-      (next 0)))
-  (define head car)
-  (define tail
-    (lambda (stream) (force (cdr stream))))
-
-  (define count 0)
-  (define p
-    (delay (begin (set! count (+ count 1))
-                  (if (> count x)
-                      count
-                      (force p)))))
-  (define x 5)
-
-  ;; ----------------------------------------
-
-  (define (run-r5rs-tests)
-
-    (test (modulo 13 4)            1)
-    (test (remainder 13 4)         1)
-
-    (test (modulo -13 4)           3)
-    (test (remainder -13 4)        -1)
-    
-    (test (modulo 13 -4)           -3)
-    (test (remainder 13 -4)        1)
-
-    (test (modulo -13 -4)          -1)
-    (test (remainder -13 -4)       -1)
-
-    (test (remainder -13 -4.0)     -1.0)
-
-    (test (force (delay (+ 1 2)))    3)
-    
-    (test (let ((p (delay (+ 1 2))))
-            (list (force p) (force p)))  
-          '(3 3))
-    
-
-    (test (head (tail (tail a-stream))) 2)
-
-    (test/unspec p)
-    (test (force p) 6)
-    (test/unspec p)
-    (test (begin (set! x 10)
-                 (force p))      
-          6)
-
-    ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;;  quotient, remainder, and modulo tests from Ikarus's
-    ;;  "bignums" test suite
-
-    (test (quotient 348972 3434)
-          101)
-    (test (quotient -348972 3434)
-          -101)
-    (test (quotient 348972 -3434)
-          -101)
-    (test (quotient -348972 -3434)
-          101)
-    (test (quotient 536870912 238)
-          2255760)
-    (test (quotient -536870912 238)
-          -2255760)
-    (test (quotient 536870912 -238)
-          -2255760)
-    (test (quotient -536870912 -238)
-          2255760)
-    (test (quotient 536870912238479837489374 324873)
-          1652556267336712615)
-    (test (quotient -536870912238479837489374 324873)
-          -1652556267336712615)
-    (test (quotient 536870912238479837489374 -324873)
-          -1652556267336712615)
-    (test (quotient -536870912238479837489374 -324873)
-          1652556267336712615)
-    (test (quotient 536870912238479837489374 3248732398479823749283)
-          165)
-    (test (quotient -536870912238479837489374 3248732398479823749283)
-          -165)
-    (test (quotient 536870912238479837489374 -3248732398479823749283)
-          -165)
-    (test (quotient -536870912238479837489374 -3248732398479823749283)
-          165)
-    (test (quotient 5368709122384798374893743894798327498234 3248732398479823749283)
-          1652555047284588078)
-    (test (quotient -5368709122384798374893743894798327498234 3248732398479823749283)
-          -1652555047284588078)
-    (test (quotient 5368709122384798374893743894798327498234 -3248732398479823749283)
-          -1652555047284588078)
-    (test (quotient -5368709122384798374893743894798327498234 -3248732398479823749283)
-          1652555047284588078)
-    (test (remainder 23 349839489348)
-          23)
-    (test (remainder -23 349839489348)
-          -23)
-    (test (remainder 23 -349839489348)
-          23)
-    (test (remainder -23 -349839489348)
-          -23)
-    (test (modulo 348972 3434)
-          2138)
-    (test (modulo -348972 3434)
-          1296)
-    (test (modulo 348972 -3434)
-          -1296)
-    (test (modulo -348972 -3434)
-          -2138)
-    (test (modulo -23 349839489348)
-          349839489325)
-    (test (modulo -23 -349839489348)
-          -23)
-    (test (modulo 23 349839489348)
-          23)
-    (test (modulo 23 -349839489348)
-          -349839489325)
-    (test (remainder 536870912 238)
-          32)
-    (test (remainder -536870912 238)
-          -32)
-    (test (remainder 536870912 -238)
-          32)
-    (test (remainder -536870912 -238)
-          -32)
-    (test (modulo 536870912 238)
-          32)
-    (test (modulo -536870912 238)
-          206)
-    (test (modulo 536870912 -238)
-          -206)
-    (test (modulo -536870912 -238)
-          -32)
-    (test (modulo 536870912238479837489374 324873)
-          116479)
-    (test (modulo -536870912238479837489374 324873)
-          208394)
-    (test (modulo 536870912238479837489374 -324873)
-          -208394)
-    (test (modulo -536870912238479837489374 -324873)
-          -116479)
-    (test (modulo 536870912238479837489374 3248732398479823749283)
-          830066489308918857679)
-    (test (modulo 536870912238479837489374 -3248732398479823749283)
-          -2418665909170904891604)
-    (test (modulo -536870912238479837489374 3248732398479823749283)
-          2418665909170904891604)
-    (test (modulo -536870912238479837489374 -3248732398479823749283)
-          -830066489308918857679)
-
-    ;; ----------------------------------------
-
-    (test (exact->inexact 1) 1.0)
-    (test (exact->inexact 1.0) 1.0)
-    (test (inexact->exact 1) 1)
-    (test (inexact->exact 1.0) 1)
-
-    ;; ----------------------------------------
-
-    (test (eval '(cond [#t 1]) (null-environment 5)) 1)
-    (test (eval '(cond [#t => (lambda (x) x)]) (null-environment 5)) #t)
-
-
-    (test (eval '(cons 1 2) (scheme-report-environment 5)) '(1 . 2))
-
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/reader.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/reader.sls
deleted file mode 100644
index 12c550164e..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/reader.sls
+++ /dev/null
@@ -1,104 +0,0 @@
-#!r6rs
-
-(library (tests r6rs reader)
-  (export run-reader-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define-syntax number-test
-    (syntax-rules ()
-      [(_ str ...)
-       (begin
-         (test (read (open-string-input-port str))
-               (string->number str))
-         ...)]))
-
-  (define (run-reader-tests)
-    (number-test
-     "12"
-     "+12"
-     "3427384783264876238746784234"
-     "0"
-     "+0"
-     "-12"
-     "-3498738947983748939478347834"
-     "-0"
-     "#x-238973897AAAAAFFFFbb00bbdddcc"
-     "#x238973897AAAAA000FFFFbbbbdddcc"
-     "#x+07edf387"
-     "#x+0"
-     "#x-0"
-     "#x0"
-     "#b01010101010000000111111111110000"
-     "#b-01010101010000000111111111110000"
-     "#b+01010101010000000111111111110000"
-     "#b+0"
-     "#b-0"
-     "#b0"
-     "#d2398128321308912830912830912839"
-     "#d-2398128321308912830912830912839"
-     "#d+2398128321308912830912830912839"
-     "#d+0"
-     "#d-0"
-     "#d0"
-     "#o237612036721631263126371263712"
-     "#o-2376120036721631263126371263712"
-     "#o+23761236721631263126371263712"
-     "#o+0"
-     "#o-0"
-     "#o0"
-     
-     "#X-238973897AAAAAFFFFbb00bbdddcc"
-     "#X238973897AAAAA000FFFFbbbbdddcc"
-     "#X+07edf387"
-     "#X+0"
-     "#X-0"
-     "#X0"
-     "#B01010101010000000111111111110000"
-     "#B-01010101010000000111111111110000"
-     "#B+01010101010000000111111111110000"
-     "#B+0"
-     "#B-0"
-     "#B0"
-     "#D2398128321308912830912830912839"
-     "#D-2398128321308912830912830912839"
-     "#D+2398128321308912830912830912839"
-     "#D+0"
-     "#D-0"
-     "#D0"
-     "#O237612036721631263126371263712"
-     "#O-2376120036721631263126371263712"
-     "#O+23761236721631263126371263712"
-     "#O+0"
-     "#O-0"
-     "#O0"
-     "#i#xf/e"
-     "#x#if/e")
-    
-    (test (read (open-string-input-port "#\\nul")) 
-          (integer->char #x0))
-    (test (read (open-string-input-port "#\\alarm")) 
-          (integer->char #x7))
-    (test (read (open-string-input-port "#\\backspace")) 
-          (integer->char #x8))
-    (test (read (open-string-input-port "#\\tab")) 
-          (integer->char #x9))
-    (test (read (open-string-input-port "#\\linefeed")) 
-          (integer->char #xA))
-    (test (read (open-string-input-port "#\\newline")) 
-          (integer->char #xA))
-    (test (read (open-string-input-port "#\\vtab")) 
-          (integer->char #xB))
-    (test (read (open-string-input-port "#\\page")) 
-          (integer->char #xC))
-    (test (read (open-string-input-port "#\\return")) 
-          (integer->char #xD))
-    (test (read (open-string-input-port "#\\esc")) 
-          (integer->char #x1B))
-    (test (read (open-string-input-port "#\\space")) 
-          (integer->char #x20))
-    (test (read (open-string-input-port "#\\delete")) 
-          (integer->char #x7F))
-
-    ;;
-    ))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/records/procedural.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/records/procedural.sls
deleted file mode 100644
index b1e68c3e55..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/records/procedural.sls
+++ /dev/null
@@ -1,166 +0,0 @@
-#!r6rs
-
-(library (tests r6rs records procedural)
-  (export run-records-procedural-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  ;; ----------------------------------------
-
-  (define rtd1
-    (make-record-type-descriptor
-     'rtd1 #f #f #f #f
-     '#((immutable x1) (immutable x2))))
-  
-  (define rtd2
-    (make-record-type-descriptor
-     'rtd2 rtd1 #f #f #f
-     '#((immutable x3) (immutable x4))))
-  
-  (define rtd3
-    (make-record-type-descriptor
-     'rtd3 rtd2 #f #f #f
-     '#((immutable x5) (immutable x6))))
-  
-  (define protocol1
-    (lambda (p)
-      (lambda (a b c)
-        (p (+ a b) (+ b c)))))
-  
-  (define protocol2
-    (lambda (n)
-      (lambda (a b c d e f)
-        (let ((p (n a b c)))
-          (p (+ d e) (+ e f))))))
-  
-  (define protocol3
-    (lambda (n)
-      (lambda (a b c d e f g h i)
-        (let ((p (n a b c d e f)))
-          (p (+ g h) (+ h i))))))
-  
-  (define cd1
-    (make-record-constructor-descriptor
-     rtd1 #f protocol1))
-  
-  (define cd2
-    (make-record-constructor-descriptor
-     rtd2 cd1 protocol2))
-  
-  (define cd3
-    (make-record-constructor-descriptor
-     rtd3 cd2 protocol3))
-  
-  (define make-rtd1 (record-constructor cd1))
-  
-  (define make-rtd2 (record-constructor cd2))
-  
-  (define make-rtd3 (record-constructor cd3))
-  
-  
-  (define :point
-    (make-record-type-descriptor
-     'point #f
-     #f #f #f 
-     '#((mutable x) (mutable y))))
-
-  (define :point-cd
-    (make-record-constructor-descriptor :point #f #f))
-  
-  (define make-point (record-constructor :point-cd))
-  
-  (define point? (record-predicate :point))
-  (define point-x (record-accessor :point 0))
-  (define point-y (record-accessor :point 1))
-  (define point-x-set! (record-mutator :point 0))
-  (define point-y-set! (record-mutator :point 1))
-  
-  (define p1 (make-point 1 2))
-
-  (define :point2
-    (make-record-type-descriptor
-     'point2 :point 
-     #f #f #f '#((mutable x) (mutable y))))
-  
-  (define make-point2
-    (record-constructor
-     (make-record-constructor-descriptor :point2
-                                         #f #f)))
-  (define point2? (record-predicate :point2))
-  (define point2-xx (record-accessor :point2 0))
-  (define point2-yy (record-accessor :point2 1))
-
-  (define p2 (make-point2 1 2 3 4))
-
-  (define :point-cd/abs
-    (make-record-constructor-descriptor
-     :point #f
-     (lambda (new)
-       (lambda (x y)
-         (new (abs x) (abs y))))))
-  
-  (define make-point/abs
-    (record-constructor :point-cd/abs))
-  
-  (define :cpoint
-    (make-record-type-descriptor
-     'cpoint :point
-     #f #f #f
-     '#((mutable rgb))))
-  
-  (define make-cpoint
-    (record-constructor
-     (make-record-constructor-descriptor
-      :cpoint :point-cd
-      (lambda (p)
-        (lambda (x y c)
-          ((p x y) (color->rgb c)))))))
-
-  (define make-cpoint/abs
-    (record-constructor
-     (make-record-constructor-descriptor
-      :cpoint :point-cd/abs
-      (lambda (p)
-        (lambda (x y c)
-          ((p x y) (color->rgb c)))))))
-  
-  (define cpoint-rgb
-    (record-accessor :cpoint 0))
-  
-  (define (color->rgb c)
-    (cons 'rgb c))
-  
-  ;; ----------------------------------------
-
-  (define (run-records-procedural-tests)
-
-    (let ([r (make-rtd3 1 2 3 4 5 6 7 8 9)])
-      (test ((record-accessor rtd1 0) r) 3)
-      (test ((record-accessor rtd1 1) r) 5)
-      (test ((record-accessor rtd2 0) r) 9)
-      (test ((record-accessor rtd2 1) r) 11)
-      (test ((record-accessor rtd3 0) r) 15)
-      (test ((record-accessor rtd3 1) r) 17))
-    
-    (test (point? p1) #t)
-    (test (point-x p1) 1)
-    (test (point-y p1) 2)
-    (test/unspec (point-x-set! p1 5))
-    (test (point-x p1) 5)
-    
-    (test (point? p2) #t)
-    (test (point-x p2) 1)
-    (test (point-y p2) 2)
-    (test (point2-xx p2) 3)
-    (test (point2-yy p2) 4)
-    
-    (test (point-x (make-point/abs -1 -2)) 1)
-    (test (point-y (make-point/abs -1 -2)) 2)
-    
-    (test (cpoint-rgb (make-cpoint -1 -3 'red)) '(rgb . red))
-    (test (point-x (make-cpoint -1 -3 'red)) -1)
-    (test (point-x (make-cpoint/abs -1 -3 'red)) 1)
-    
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/records/syntactic.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/records/syntactic.sls
deleted file mode 100644
index 9af103fb4c..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/records/syntactic.sls
+++ /dev/null
@@ -1,176 +0,0 @@
-#!r6rs
-
-(library (tests r6rs records syntactic)
-  (export run-records-syntactic-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  ;; ----------------------------------------
-
-  (define-record-type (point make-point point?)
-    (fields (immutable x point-x)
-            (mutable y point-y set-point-y!))
-    (nongenerative
-     point-4893d957-e00b-11d9-817f-00111175eb9e))
-  
-  (define-record-type (cpoint make-cpoint cpoint?)
-    (parent point)
-    (protocol
-     (lambda (n)
-       (lambda (x y c) 
-         ((n x y) (color->rgb c)))))
-    (fields
-     (mutable rgb cpoint-rgb cpoint-rgb-set!)))
-  
-  (define-record-type (cpoint2 make-cpoint2 cpoint2?)
-    (parent-rtd (record-type-descriptor point)
-                (record-constructor-descriptor point))
-    (fields rgb)
-    (opaque #f) (sealed #f))
-  
-  (define (color->rgb c)
-    (cons 'rgb c))
-  
-  (define p1 (make-point 1 2))
-  (define p2 (make-cpoint 3 4 'red))
-
-  (define-record-type (ex1 make-ex1 ex1?)
-    (protocol (lambda (p) (lambda a (p a))))
-    (fields (immutable f ex1-f)))
-  
-  (define ex1-i1 (make-ex1 1 2 3))
-
-  (define-record-type (ex2 make-ex2 ex2?)
-    (protocol
-     (lambda (p) (lambda (a . b) (p a b))))
-    (fields (immutable a ex2-a)
-            (immutable b ex2-b)))
-  
-  (define ex2-i1 (make-ex2 1 2 3))
-
-  (define-record-type (unit-vector
-                       make-unit-vector
-                       unit-vector?)
-    (protocol
-     (lambda (p)
-       (lambda (x y z)
-         (let ((length 
-                (sqrt (+ (* x x)
-                         (* y y)
-                         (* z z)))))
-           (p (/ x length)
-              (/ y length)
-              (/ z length))))))
-    (fields (immutable x unit-vector-x)
-            (immutable y unit-vector-y)
-            (immutable z unit-vector-z)))
-  
-  (define *ex3-instance* #f)
-  
-  (define-record-type ex3
-    (parent cpoint)
-    (protocol
-     (lambda (n)
-       (lambda (x y t)
-         (let ((r ((n x y 'red) t)))
-           (set! *ex3-instance* r)
-           r))))
-    (fields 
-     (mutable thickness))
-    (sealed #t) (opaque #t))
-  
-  (define ex3-i1 (make-ex3 1 2 17))
-
-  (define-record-type (tag make-tag tag?))
-  (define-record-type (otag make-otag otag?) (opaque #t))
-  (define-record-type (stag make-stag stag?) (sealed #t))
-  (define-record-type (ostag make-ostag ostag?) (opaque #t) (sealed #t))
-  
-  ;; ----------------------------------------
-
-  (define (run-records-syntactic-tests)
-    (test (point? p1) #t)
-    (test (point? p2) #t)
-    (test (point? (vector)) #f)
-    (test (point? (cons 'a 'b)) #f)
-    (test (cpoint? p1) #f)
-    (test (cpoint? p2) #t)
-    (test (point-x p1) 1)
-    (test (point-y p1) 2)
-    (test (point-x p2) 3)
-    (test (point-y p2) 4)
-    (test (cpoint-rgb p2) '(rgb . red))
-
-    (test/unspec (set-point-y! p1 17))
-    (test (point-y p1) 17)
-
-    (test (record-rtd p1) (record-type-descriptor point))
-    
-    (test (ex1-f ex1-i1) '(1 2 3))
-
-    (test (ex2-a ex2-i1) 1)
-    (test (ex2-b ex2-i1) '(2 3))
-
-    (test (ex3? ex3-i1) #t)
-    (test (cpoint-rgb ex3-i1) '(rgb . red))
-    (test (ex3-thickness ex3-i1) 17)
-    (test/unspec (ex3-thickness-set! ex3-i1 18))
-    (test (ex3-thickness ex3-i1) 18)
-    (test *ex3-instance* ex3-i1)
-
-    (test (record? p1) #t)
-    (test (record? ex3-i1) #f)
-
-    (test (record-type-name (record-type-descriptor point)) 'point)
-    (test (record-type-name (record-type-descriptor cpoint2)) 'cpoint2)
-    (test (record-type-name (record-type-descriptor ex1)) 'ex1)
-
-    (test (record-type-parent (record-type-descriptor point)) #f)
-    (test (record-type-parent (record-type-descriptor cpoint2)) (record-type-descriptor point))
-
-    (test (record-type-uid (record-type-descriptor point)) 'point-4893d957-e00b-11d9-817f-00111175eb9e)
-    (test/unspec (record-type-uid (record-type-descriptor cpoint2)))
-    (test/unspec (record-type-uid (record-type-descriptor ex1)))
-
-    (test (record-type-generative? (record-type-descriptor point)) #f)
-    (test (record-type-generative? (record-type-descriptor cpoint2)) #t)
-    (test (record-type-generative? (record-type-descriptor ex1)) #t)
-
-    (test (record-type-sealed? (record-type-descriptor point)) #f)
-    (test (record-type-sealed? (record-type-descriptor ex3)) #t)
-      
-    (test (record-type-opaque? (record-type-descriptor point)) #f)
-    (test (record-type-opaque? (record-type-descriptor ex3)) #t)
-      
-    (test (record-type-field-names (record-type-descriptor point)) '#(x y))
-    (test (record-type-field-names (record-type-descriptor cpoint2)) '#(rgb))
-    
-    (test (record-field-mutable? (record-type-descriptor point) 0) #f)
-    (test (record-field-mutable? (record-type-descriptor point) 1) #t)
-    (test (record-field-mutable? (record-type-descriptor cpoint) 0) #t)
-
-    ;; Tests from Alan Watson:
-    (test (eqv? (equal? (make-tag) (make-tag)) (eqv? (make-tag) (make-tag)))
-          #t)
-    (test (eqv? (equal? (make-otag) (make-otag)) (eqv? (make-otag) (make-otag)))
-          #t)
-    (test (eqv? (equal? (make-stag) (make-stag)) (eqv? (make-stag) (make-stag)))
-          #t)
-    (test (eqv? (equal? (make-ostag) (make-ostag)) (eqv? (make-ostag) (make-ostag)))
-          #t)
-    (test (let ([t (make-tag)])
-            (eqv? (equal? t t) (eqv? t t)))
-          #t)
-    (test (let ([t (make-otag)])
-            (eqv? (equal? t t) (eqv? t t)))
-          #t)
-    (test (let ([t (make-stag)])
-            (eqv? (equal? t t) (eqv? t t)))
-          #t)
-    (test (let ([t (make-ostag)])
-            (eqv? (equal? t t) (eqv? t t)))
-          #t)
-
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run-via-eval.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run-via-eval.sps
deleted file mode 100644
index e3dafb2a39..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run-via-eval.sps
+++ /dev/null
@@ -1,37 +0,0 @@
-#!r6rs
-
-(import (rnrs) (rnrs eval) (tests r6rs test))
-
-(define-syntax test-library
-   (syntax-rules ()
-     [(_ test-proc library-name)
-      (test/unspec (eval '(test-proc) (environment 'library-name)))]))
-
-(test-library run-base-tests               (tests r6rs base))
-(test-library run-reader-tests             (tests r6rs reader))
-(test-library run-unicode-tests            (tests r6rs unicode))
-(test-library run-bytevectors-tests        (tests r6rs bytevectors))
-(test-library run-lists-tests              (tests r6rs lists))
-(test-library run-sorting-tests            (tests r6rs sorting))
-(test-library run-control-tests            (tests r6rs control))
-(test-library run-records-syntactic-tests  (tests r6rs records syntactic))
-(test-library run-records-procedural-tests (tests r6rs records procedural))
-(test-library run-exceptions-tests         (tests r6rs exceptions))
-(test-library run-conditions-tests         (tests r6rs conditions))
-(test-library run-io-ports-tests           (tests r6rs io ports))
-(test-library run-io-simple-tests          (tests r6rs io simple))
-(test-library run-programs-tests           (tests r6rs programs))
-(test-library run-arithmetic-fixnums-tests (tests r6rs arithmetic fixnums))
-(test-library run-arithmetic-flonums-tests (tests r6rs arithmetic flonums))
-(test-library run-arithmetic-bitwise-tests (tests r6rs arithmetic bitwise))
-(test-library run-syntax-case-tests        (tests r6rs syntax-case))
-(test-library run-hashtables-tests         (tests r6rs hashtables))
-(test-library run-enums-tests              (tests r6rs enums))
-(test-library run-eval-tests               (tests r6rs eval))
-(test-library run-mutable-pairs-tests      (tests r6rs mutable-pairs))
-(test-library run-mutable-strings-tests    (tests r6rs mutable-strings))
-(test-library run-r5rs-tests               (tests r6rs r5rs))
-(test-library run-contrib-tests            (tests r6rs contrib))
-
-(report-test-results)
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run.sps
deleted file mode 100644
index eee861a155..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run.sps
+++ /dev/null
@@ -1,59 +0,0 @@
-#!r6rs
-
-(import (rnrs)
-        (tests r6rs test)
-        (tests r6rs base)
-        (tests r6rs reader)
-        (tests r6rs unicode)
-        (tests r6rs bytevectors)
-        (tests r6rs lists)
-        (tests r6rs sorting)
-        (tests r6rs control)
-        (tests r6rs records syntactic)
-        (tests r6rs records procedural)
-        (tests r6rs exceptions)
-        (tests r6rs conditions)
-        (tests r6rs io ports)
-        (tests r6rs io simple)
-        (tests r6rs programs)
-        (tests r6rs arithmetic fixnums)
-        (tests r6rs arithmetic flonums)
-        (tests r6rs arithmetic bitwise)
-        (tests r6rs syntax-case)
-        (tests r6rs hashtables)
-        (tests r6rs enums)
-        (tests r6rs eval)
-        (tests r6rs mutable-pairs)
-        (tests r6rs mutable-strings)
-        (tests r6rs r5rs)
-        (tests r6rs contrib))
-
-(run-base-tests)
-
-(run-reader-tests)
-(run-unicode-tests)
-(run-bytevectors-tests)
-(run-lists-tests)
-(run-sorting-tests)
-(run-control-tests)
-(run-records-syntactic-tests)
-(run-records-procedural-tests)
-(run-exceptions-tests)
-(run-conditions-tests)
-(run-io-ports-tests)
-(run-io-simple-tests)
-(run-programs-tests)
-(run-arithmetic-fixnums-tests)
-(run-arithmetic-flonums-tests)
-(run-arithmetic-bitwise-tests)
-(run-syntax-case-tests)
-(run-hashtables-tests)
-(run-enums-tests)
-(run-eval-tests)
-(run-mutable-pairs-tests)
-(run-mutable-strings-tests)
-(run-r5rs-tests)
-(run-contrib-tests)
-
-(report-test-results)
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/arithmetic/bitwise.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/arithmetic/bitwise.sps
deleted file mode 100644
index e3cdc63f1e..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/arithmetic/bitwise.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs arithmetic bitwise)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs arithmetic bitwise)\n")
-(run-arithmetic-bitwise-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/arithmetic/fixnums.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/arithmetic/fixnums.sps
deleted file mode 100644
index 45d9a032f2..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/arithmetic/fixnums.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs arithmetic fixnums)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs arithmetic fixnums)\n")
-(run-arithmetic-fixnums-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/arithmetic/flonums.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/arithmetic/flonums.sps
deleted file mode 100644
index 8e0fe068b4..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/arithmetic/flonums.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs arithmetic flonums)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs arithmetic flonums)\n")
-(run-arithmetic-flonums-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/base.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/base.sps
deleted file mode 100644
index a3b6ac387f..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/base.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs base)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs base)\n")
-(run-base-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/bytevectors.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/bytevectors.sps
deleted file mode 100644
index a471fd425a..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/bytevectors.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs bytevectors)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs bytevectors)\n")
-(run-bytevectors-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/conditions.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/conditions.sps
deleted file mode 100644
index 2cdbae6752..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/conditions.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs conditions)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs conditions)\n")
-(run-conditions-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/contrib.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/contrib.sps
deleted file mode 100644
index 585d9de683..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/contrib.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs contrib)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running contributed tests\n")
-(run-contrib-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/control.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/control.sps
deleted file mode 100644
index f4f6c1ff8d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/control.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs control)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs control)\n")
-(run-control-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/enums.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/enums.sps
deleted file mode 100644
index 652d36eb67..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/enums.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs enums)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs enums)\n")
-(run-enums-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/eval.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/eval.sps
deleted file mode 100644
index 95cd380d3d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/eval.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs eval)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs eval)\n")
-(run-eval-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/exceptions.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/exceptions.sps
deleted file mode 100644
index a5216ca3d5..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/exceptions.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs exceptions)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs exceptions)\n")
-(run-exceptions-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/hashtables.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/hashtables.sps
deleted file mode 100644
index d80a005784..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/hashtables.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs hashtables)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs hashtables)\n")
-(run-hashtables-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/io/ports.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/io/ports.sps
deleted file mode 100644
index de87c4c012..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/io/ports.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs io ports)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs io ports)\n")
-(run-io-ports-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/io/simple.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/io/simple.sps
deleted file mode 100644
index e479e80db2..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/io/simple.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs io simple)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs io simple)\n")
-(run-io-simple-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/lists.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/lists.sps
deleted file mode 100644
index a82cf8c737..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/lists.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs lists)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs lists)\n")
-(run-lists-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/mutable-pairs.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/mutable-pairs.sps
deleted file mode 100644
index 7f0c4dd7b7..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/mutable-pairs.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs mutable-pairs)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs mutable-pairs)\n")
-(run-mutable-pairs-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/mutable-strings.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/mutable-strings.sps
deleted file mode 100644
index fa781d8cfe..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/mutable-strings.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs mutable-strings)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs mutable-strings)\n")
-(run-mutable-strings-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/programs.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/programs.sps
deleted file mode 100644
index 1caf219ced..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/programs.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs programs)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs programs)\n")
-(run-programs-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/r5rs.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/r5rs.sps
deleted file mode 100644
index d63a4f18c0..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/r5rs.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs r5rs)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs r5rs)\n")
-(run-r5rs-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/reader.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/reader.sps
deleted file mode 100644
index 812fae6ef5..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/reader.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs reader)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs reader)\n")
-(run-reader-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/records/procedural.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/records/procedural.sps
deleted file mode 100644
index 8f50172fdc..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/records/procedural.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs records procedural)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs records procedural)\n")
-(run-records-procedural-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/records/syntactic.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/records/syntactic.sps
deleted file mode 100644
index 8b3ac2a710..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/records/syntactic.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs records syntactic)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs records syntactic)\n")
-(run-records-syntactic-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/run.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/run.sps
deleted file mode 100644
index dc393128ba..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/run.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs run)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs run)\n")
-(run-run-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/sorting.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/sorting.sps
deleted file mode 100644
index 57dd297752..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/sorting.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs sorting)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs sorting)\n")
-(run-sorting-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/syntax-case.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/syntax-case.sps
deleted file mode 100644
index 687fe86339..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/syntax-case.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs syntax-case)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs syntax-case)\n")
-(run-syntax-case-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/test.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/test.sps
deleted file mode 100644
index c54e040f3d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/test.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs test)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs test)\n")
-(run-test-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/unicode.sps b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/unicode.sps
deleted file mode 100644
index 53c4296e6b..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/run/unicode.sps
+++ /dev/null
@@ -1,7 +0,0 @@
-#!r6rs
-(import (tests r6rs unicode)
-        (tests r6rs test)
-        (rnrs io simple))
-(display "Running tests for (rnrs unicode)\n")
-(run-unicode-tests)
-(report-test-results)
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/sorting.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/sorting.sls
deleted file mode 100644
index e5fdc0db1d..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/sorting.sls
+++ /dev/null
@@ -1,19 +0,0 @@
-#!r6rs
-
-(library (tests r6rs sorting)
-  (export run-sorting-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define (run-sorting-tests)
-
-    (test (list-sort < '(3 5 2 1)) '(1 2 3 5))
-    (test (vector-sort < '#(3 5 2 1)) '#(1 2 3 5))
-
-    (let ([v (vector 3 5 2 1)])
-      (test/unspec (vector-sort! < v))
-      (test v '#(1 2 3 5)))
-
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/syntax-case.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/syntax-case.sls
deleted file mode 100644
index 4241905ce6..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/syntax-case.sls
+++ /dev/null
@@ -1,366 +0,0 @@
-#!r6rs
-
-(library (tests r6rs syntax-case)
-  (export run-syntax-case-tests)
-  (import (for (rnrs) run expand)
-          (rename (only (rnrs base) cons) (cons kons)) ; for free-identifier=?
-          (tests r6rs test))
-
-  (define (unwrap s)
-    (cond
-     [(pair? s) (cons (unwrap (car s)) (unwrap (cdr s)))]
-     [(vector? s) (list->vector (map unwrap (vector->list s)))]
-     [(null? s) s]
-     [(number? s) s]
-     [(string? s) s]
-     [(boolean? s) s]
-     [else (syntax->datum s)]))
-
-  ;; ----------------------------------------
-  
-  (define p (cons 4 5))
-  (define-syntax p.car
-    (lambda (x)
-      (syntax-case x ()
-        [(_ . rest) #'((car p) . rest)]
-        [_  #'(car p)])))
-
-  ;; Different frmo the report to avoid set-car!
-  (define p2 (cons 4 5))
-  (define-syntax p2.car
-    (make-variable-transformer
-     (lambda (x)
-       (syntax-case x (set!)
-         [(set! _ e) #'(set! p2 (cons e (cdr p2)))]
-         [(_ . rest) #'((car p2) . rest)]
-         [_  #'(car p2)]))))
-  
-  (define-syntax rec
-    (lambda (x)
-      (syntax-case x ()
-        [(_ x e)
-         (identifier? #'x)
-         #'(letrec ([x e]) x)])))
-
-  (define-syntax loop
-    (lambda (x)
-      (syntax-case x ()
-        [(k e ...)
-         (with-syntax
-             ([break (datum->syntax #'k 'break)])
-           #'(call-with-current-continuation
-              (lambda (break)
-                (let f () e ... (f)))))])))
-
-  ;; ----------------------------------------
-  
-  (define (run-syntax-case-tests)
-
-    (test p.car 4)
-    ;; (test/exn (set! p.car 15) &syntax) ; not a runtime exception
-
-    (set! p2.car 15)
-    (test p2.car 15)
-    (test p2 '(15 . 5))
-    
-    (test (map (rec fact
-                    (lambda (n)
-                      (if (= n 0)                 
-                          1
-                          (* n (fact (- n 1))))))
-               '(1 2 3 4 5))
-          '(1 2 6 24 120))
-    
-    ; (test/exn (rec 5 (lambda (x) x)) &syntax) ; not a runtime exception
-    
-    (test
-     (let ([fred 17])
-       (define-syntax a
-         (lambda (x)
-           (syntax-case x ()
-             [(_ id) #'(b id fred)])))
-       (define-syntax b
-         (lambda (x)
-           (syntax-case x ()
-             [(_ id1 id2)
-              #`(list
-                   #,(free-identifier=? #'id1 #'id2)
-                   #,(bound-identifier=? #'id1 #'id2))])))
-       (a fred)) 
-     '(#t #f))
-
-    ; (test/exn (let ([a 3] [a 4]) (+ a a)) &syntax)
-
-    (test (let-syntax
-              ([dolet (lambda (x)
-                        (syntax-case x ()
-                          [(_ b)
-                           #'(let ([a 3] [b 4]) (+ a b))]))])
-            (dolet a)) 
-          7)
-
-    ;; check that it's ok as an expression:
-    (test 6
-          (let-syntax ([foo
-                        (syntax-rules ()
-                          [(_)
-                           (let-syntax ([bar
-                                         (syntax-rules ()
-                                           [(_) 5])])
-                             (bar))])])
-            (+ 1 (foo))))
-
-    #;
-    (test/exn (let ([else #f])
-                (case 0 [else (write "oops")])) 
-              &syntax)
-
-    (test (let ((n 3) (ls '()))
-            (loop
-             (if (= n 0) (break ls))
-             (set! ls (cons 'a ls))
-             (set! n (- n 1)))) 
-          '(a a a))
-
-    ;; ----------------------------------------
-
-    (test (syntax-case #'1 () [1 'one])  'one)
-    (test (syntax-case #'(1) () [(1) 'one])  'one)
-    (test (syntax-case '(1) () [(x) #'x]) 1)
-    (test (syntax-case #'(1) () [(x) (syntax->datum #'x)]) 1)
-    (test (syntax-case '("a") () [(x) #'x]) "a")
-    (test (syntax-case #'("a") () [(x) (syntax->datum #'x)]) "a")
-    (test (syntax-case '(1 #f "s" #vu8(9) #(5 7)) () 
-            [(x ...) #'(x ...)]) 
-          '(1 #f "s" #vu8(9) #(5 7)))
-    (test (syntax-case #'(1 #f "s" #vu8(9) #(5 7)) () 
-            [(x ...) (map syntax->datum #'(x ...))]) 
-          '(1 #f "s" #vu8(9) #(5 7)))
-    (test (syntax-case '(1 2 3 4) () [(x y . z) #'z]) '(3 4))
-    (test (syntax-case #'(a b c d) () [(x y . z) (syntax->datum #'z)]) 
-          '(c d))
-    (test (syntax-case #'(nonesuch 12) (nonesuch) 
-            [(nonesuch x) (syntax->datum #'x)])
-          12)
-    (test (syntax-case #'(different 12) (nonesuch) 
-            [(nonesuch x) #'x]
-            [_ 'other])
-          'other)
-    (test (syntax-case '(1 2 3 4) ()
-            [(1 x ...) #'(x ...)])
-          '(2 3 4))
-    (test (syntax-case '(1 2 3 4) ()
-            [(1 x ... 3 4) #'(x ...)])
-          '(2))
-    (test (syntax-case '(1 2 3 4) ()
-            [(1 x ... 2 3 4) #'(x ...)])
-          '())
-    (test (syntax-case '(1 2 3 4) ()
-            [(1 x ... . y) #'y])
-          '())
-    (test (syntax-case '(1 2 3 4 . 5) ()
-            [(1 x ... . y) #'y])
-          '5)
-    (test (syntax-case '(1 2 3 4 . 5) ()
-            [(1 x ... 4 . y) #'y])
-          '5)
-    (test (syntax-case '(1 2 3 4 . 5) ()
-            [(1 x ... 5 . y) #'y]
-            [_ 'no])
-          'no)
-    (test (syntax-case '#(1 2 3 4) ()
-            [#(1 x y 4) (car #'(x y))])
-          '2)
-    (test (syntax-case '#(1 2 3 4) ()
-            [#(1 x y 4) (cadr #'(x y))])
-          '3)
-    (test (syntax-case '#(1 2 3 4) ()
-            [#(1 x y 4) (syntax->datum (cddr #'(x y)))])
-          '())
-    (test (syntax-case '#(1 2 3 4) ()
-            [#(1 2 3 4) 'match])
-          'match)
-    (test (syntax-case '#(1 2 3 4) ()
-            [#(1 x y 4) #'y])
-          '3)
-    (test (syntax-case '#(1 2 3 4) ()
-            [#(1 x ...) #'(x ...)])
-          '(2 3 4))
-    (test (syntax-case '#(1 2 3 4) ()
-            [#(1 x ... 4) #'(x ...)])
-          '(2 3))
-    (test (syntax-case '#(1 2 3 4) ()
-            [#(1 x ... 2 3 4) #'(x ...)])
-          '())
-    (test (syntax-case #'() ()
-            [(x ...)
-             (let ([v #'#(x ...)])
-               (list (syntax->datum v) (vector? v)))])
-          '(#() #t))
-    (test (syntax-case #'(1) ()
-            [(_) (syntax->datum #'_)])
-          '_)
-    (test (syntax-case '((a) (b c)) ()
-            [((x ...) ...)
-             #'(x ... ...)])
-          '(a b c))
-    (test (syntax-case #'((a) (b c)) ()
-            [((x ...) ...)
-             (map syntax->datum #'(x ... ...))])
-          '(a b c))
-
-    (test (syntax-case #'(... x) ()
-            [a (syntax->datum #'a)])
-          'x)
-    (test (syntax-case #'(... ...) ()
-            [a (syntax->datum #'a)])
-          '...)
-    (test (syntax-case #'(... (other ...)) ()
-            [a (syntax->datum #'a)])
-          '(other ...))
-    (test (syntax-case #'(1 2 3) ()
-            [(a ...) (syntax->datum #'((a (... ...)) ...))])
-          '((1 ...) (2 ...) (3 ...)))
-    (test (syntax-case #'(1 2 3) ()
-            [(a b c) (syntax->datum #'(... (a ...)))])
-          '(1 ...))
-    (test (syntax-case #'(1 2 3) ()
-            [(a b c) (syntax->datum #'(... (... (a) b)))])
-          '(... (1) 2))
-
-    (test (identifier? 'x) #f)
-    (test (identifier? #'x) #t)
-    (test (bound-identifier=? #'x #'x) #t)
-    (test (bound-identifier=? #'x #'y) #f)
-    (test (bound-identifier=? #'cons #'kons) #f)
-    (test (free-identifier=? #'x #'x) #t)
-    (test (free-identifier=? #'x #'y) #f)
-    ;; (test (free-identifier=? #'cons #'kons) #t) ;; see PLT bug report #10210
-
-    (test (syntax->datum #'1) 1)
-    (test (syntax->datum #'a) 'a)
-    (test (syntax->datum #'(a b)) '(a b))
-    (test (syntax->datum #'(a . b)) '(a . b))
-
-    (test (syntax->datum '1) 1)
-    (test (syntax->datum '(1 . 2)) '(1 . 2))
-    (test (syntax->datum '(1 2)) '(1 2))
-    (test (syntax->datum (cons #'a #'b)) '(a . b))
-    (test (syntax->datum (vector #'a #'b)) '#(a b))
-    (test (syntax->datum '#(1 2)) '#(1 2))
-
-    (test (syntax->datum (datum->syntax #'x 1)) 1)
-    (test (syntax->datum (datum->syntax #'x 'a)) 'a)
-    (test (syntax->datum (datum->syntax #'x '(a b))) '(a b))
-    (test (syntax->datum (datum->syntax #'x '(a . b))) '(a . b))
-
-    (test (number? (car (syntax->datum (datum->syntax #'x (list 1))))) #t)
-
-    (test (map identifier? (generate-temporaries '(1 2 3))) '(#t #t #t))
-    (test (map identifier? (generate-temporaries #'(1 2 3))) '(#t #t #t))
-    (test (map identifier? (generate-temporaries (cons 1 #'(2 3)))) '(#t #t #t))
-
-    (test (cadr (with-syntax ([x 1]
-                              [y 2])
-                  #'(x y)))
-          2)
-
-    (test (syntax->datum #`(1 2 3)) '(1 2 3))
-    (test (syntax->datum #`1) 1)
-    
-    ;; Check wrapping:
-    (test (let ([v #`(1 #,(+ 1 1) 3)])
-            (list (pair? v)
-                  (syntax->datum (car v))
-                  (cadr v)
-                  (syntax->datum (cddr v))))
-          '(#t 1 2 (3)))
-    (test (let ([v #`(1 #,@(list (+ 1 1)) 3)])
-            (list (pair? v)
-                  (syntax->datum (car v))
-                  (cadr v)
-                  (syntax->datum (cddr v))))
-          '(#t 1 2 (3)))
-    (test (let ([v #`(1 #,@(list (+ 1 1) (- 8 1)) 3)])
-            (list (pair? v)
-                  (syntax->datum (car v))
-                  (cadr v)
-                  (caddr v)
-                  (syntax->datum (cdddr v))))
-          '(#t 1 2 7 (3)))
-    (test (syntax-case '(1 2 3) ()
-            [(x ...) #`(x ...)])
-          '(1 2 3))
-
-    (test (unwrap
-           #`(1 2 (unsyntax 3 4 5) 6))
-          '(1 2 3 4 5 6))
-    (test (unwrap
-           #`(1 2 (unsyntax-splicing '(3 4) '(5)) 6))
-          '(1 2 3 4 5 6))
-
-    (test (unwrap
-           #`#(1 2 (unsyntax-splicing '(3 4) '(5)) 6))
-          '#(1 2 3 4 5 6))
-    (test (unwrap
-           #`(1 #`(#,(+ 3 4) #,#,(+ 1 1))))
-          '(1 #`(#,(+ 3 4) #,2)))
-
-    (test (unwrap
-           (syntax-case #'(weird-letrec ([x 1][y 7]) x) ()
-             [(_ ([v e] ...) . b)
-              #'(let ()
-                  (define v) ...
-                  . b)]))
-          '(let () (define x) (define y) x))
-
-    (test/exn (syntax-violation #f "bad" 7) &syntax)
-    (test/exn (syntax-violation 'form "bad" 7) &syntax)
-    (test/exn (syntax-violation #f "bad" #'7) &syntax)
-    (test/exn (syntax-violation #f "bad" #'7 8) &syntax)
-    (test/exn (syntax-violation #f "bad" #'7 #'8) &syntax)
-    (test/exn (syntax-violation #f "bad" 7 #'8) &syntax)
-    (test/exn (syntax-violation 'form "bad" #'7 #'8) &syntax)
-    (test/exn (syntax-violation 'form "bad" 7 #'8) &syntax)
-    (test/exn (syntax-violation 'form "bad" #'7 8) &syntax)
-    (test/exn (syntax-violation 'form "bad" 7 8) &syntax)
-    (test/exn (syntax-violation "form" "bad" 7) &syntax)
-    (test/exn (syntax-violation "form" "bad" 7 8) &syntax)
-
-    (test (condition-message
-           (guard (v [#t v])
-                  (syntax-violation 'apple "bad" 'worm)))
-          "bad")
-    (test (condition-who
-           (guard (v [#t v])
-                  (syntax-violation 'apple "bad" 'worm)))
-          'apple)
-    (test (condition-who
-           (guard (v [#t v])
-                  (syntax-violation "apple" "bad" 'worm)))
-          "apple")
-    (test (who-condition?
-           (guard (v [#t v])
-                  (syntax-violation #f "bad" 'worm)))
-          #f)
-    (test (condition-who
-           (guard (v [#t v])
-                  (syntax-violation #f "bad" #'worm)))
-          'worm)
-    (test (syntax-violation-form
-           (guard (v [#t v])
-                  (syntax-violation 'apple "bad" '(worm))))
-          '(worm))
-    (test (syntax-violation-subform
-           (guard (v [#t v])
-                  (syntax-violation 'apple "bad" '(worm))))
-          #f)
-    (test (syntax-violation-subform
-           (guard (v [#t v])
-                  (syntax-violation 'apple "bad" '(worm) '((another)))))
-          '((another)))
-
-
-    ;;
-    ))
-
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/test.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/test.sls
deleted file mode 100644
index fc1fb1a7c0..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/test.sls
+++ /dev/null
@@ -1,233 +0,0 @@
-#!r6rs
-
-(library (tests r6rs test)
-  (export test
-          test/approx
-          test/alts
-          test/exn
-          test/values
-          test/output
-          test/unspec
-          test/unspec-or-exn
-          test/unspec-flonum-or-exn
-          test/output/unspec
-          run-test
-          report-test-results)
-  (import (rnrs))
-
-  (define-record-type err
-    (fields err-c))
-
-  (define-record-type expected-exception
-    (fields))
-
-  (define-record-type multiple-results
-    (fields values))
-
-  (define-record-type approx
-    (fields value))
-
-  (define-record-type alts
-    (fields values))
-
-  (define-syntax test
-    (syntax-rules ()
-      [(_ expr expected)
-       (begin
-         ;; (write 'expr) (newline)
-         (run-test 'expr
-                   (catch-exns (lambda () expr))
-                   expected))]))
-
-   (define (catch-exns thunk)
-      (guard (c [#t (make-err c)])
-        (call-with-values thunk
-          (lambda x
-            (if (= 1 (length x))
-                (car x)
-                (make-multiple-results x))))))
-
-  (define-syntax test/approx
-    (syntax-rules ()
-      [(_ expr expected)
-       (run-test 'expr
-                 (make-approx expr)
-                 (make-approx expected))]))
-
-  (define-syntax test/alts
-    (syntax-rules ()
-      [(_ expr expected0 expected ...)
-       (run-test 'expr
-                 expr
-                 (make-alts (list expected0 expected ...)))]))
-
-  (define (good-enough? x y)
-    ;; relative error should be with 0.1%, but greater
-    ;; relative error is allowed when the expected value
-    ;; is near zero.
-    (cond ((not (number? x)) #f)
-          ((not (number? y)) #f)
-          ((or (not (real? x))
-               (not (real? y)))
-           (and (good-enough? (real-part x) (real-part y))
-                (good-enough? (imag-part x) (imag-part y))))
-          ((infinite? x)
-           (= x (* 2.0 y)))
-          ((infinite? y)
-           (= (* 2.0 x) y))
-          ((nan? y)
-           (nan? x))
-          ((> (magnitude y) 1e-6)
-           (< (/ (magnitude (- x y))
-                 (magnitude y))
-              1e-3))
-          (else
-           (< (magnitude (- x y)) 1e-6))))
-
-  (define-syntax test/exn
-    (syntax-rules ()
-      [(_ expr condition)
-       (test (guard (c [((condition-predicate (record-type-descriptor condition)) c)
-                        (make-expected-exception)])
-                    expr)
-             (make-expected-exception))]))
-
-  (define-syntax test/values
-    (syntax-rules ()
-      [(_ expr val ...)
-       (run-test 'expr
-                 (catch-exns (lambda () expr))
-                 (make-multiple-results (list val ...)))]))
-
-  (define-syntax test/output
-    (syntax-rules ()
-      [(_ expr expected str)
-       (run-test 'expr
-                 (capture-output
-                  (lambda ()
-                    (run-test 'expr
-                              (guard (c [#t (make-err c)])
-                                     expr)
-                              expected)))
-                 str)]))
-
-  (define-syntax test/unspec
-    (syntax-rules ()
-      [(_ expr)
-       (test (begin expr 'unspec) 'unspec)]))
-
-  (define-syntax test/unspec-or-exn
-    (syntax-rules ()
-      [(_ expr condition)
-       (test (guard (c [((condition-predicate (record-type-descriptor condition)) c)
-                        'unspec])
-                    (begin expr 'unspec))
-             'unspec)]))
-
-  (define-syntax test/unspec-flonum-or-exn
-    (syntax-rules ()
-      [(_ expr condition)
-       (test (guard (c [((condition-predicate (record-type-descriptor condition)) c)
-                        'unspec-or-flonum])
-                    (let ([v expr])
-                      (if (flonum? v)
-                          'unspec-or-flonum
-                          (if (eq? v 'unspec-or-flonum)
-                              (list v)
-                              v))))
-             'unspec-or-flonum)]))
-
-  (define-syntax test/output/unspec
-    (syntax-rules ()
-      [(_ expr str)
-       (test/output (begin expr 'unspec) 'unspec str)]))
-
-  (define checked 0)
-  (define failures '())
-
-  (define (capture-output thunk)
-    (if (file-exists? "tmp-catch-out")
-        (delete-file "tmp-catch-out"))
-    (dynamic-wind
-        (lambda () 'nothing)
-        (lambda ()
-          (with-output-to-file "tmp-catch-out"
-            thunk)
-          (call-with-input-file "tmp-catch-out"
-            (lambda (p)
-              (get-string-n p 1024))))
-        (lambda ()
-          (if (file-exists? "tmp-catch-out")
-              (delete-file "tmp-catch-out")))))
-  
-  (define (same-result? got expected)
-    (cond
-     [(and (real? expected) (nan? expected))
-      (and (real? got) (nan? got))]
-     [(expected-exception? expected)
-      (expected-exception? got)]
-     [(approx? expected)
-      (and (approx? got)
-           (good-enough? (approx-value expected)
-                         (approx-value got)))]
-     [(multiple-results? expected)
-      (and (multiple-results? got)
-           (= (length (multiple-results-values expected))
-              (length (multiple-results-values got)))
-           (for-all same-result?
-                    (multiple-results-values expected)
-                    (multiple-results-values got)))]
-     [(alts? expected)
-      (exists (lambda (e) (same-result? got e))
-              (alts-values expected))]
-     [else (equal? got expected)]))
-    
-  (define (run-test expr got expected)
-    (set! checked (+ 1 checked))
-    (unless (same-result? got expected)
-      (set! failures
-            (cons (list expr got expected)
-                  failures))))
-
-  (define (write-result prefix v)
-    (cond
-     [(multiple-results? v)
-      (for-each (lambda (v)
-                  (write-result prefix v))
-                (multiple-results-values v))]
-     [(approx? v)
-      (display prefix)
-      (display "approximately ")
-      (write (approx-value v))]
-     [(alts? v)
-      (write-result (string-append prefix "   ")
-                    (car (alts-values v)))
-      (for-each (lambda (v)
-                  (write-result (string-append prefix "OR ")
-                                v))
-                (cdr (alts-values v)))]
-     [else
-      (display prefix)
-      (write v)]))
-
-  (define (report-test-results)
-    (if (null? failures)
-        (begin
-          (display checked)
-          (display " tests passed\n"))
-        (begin
-          (display (length failures))
-          (display " tests failed:\n\n")
-          (for-each (lambda (t)
-                      (display "Expression:\n ")
-                      (write (car t))
-                      (display "\nResult:")
-                      (write-result "\n " (cadr t))
-                      (display "\nExpected:")
-                      (write-result "\n " (caddr t))
-                      (display "\n\n"))
-                    (reverse failures))
-          (display (length failures))
-          (display " of ")
-          (display checked)
-          (display " tests failed.\n")))))
diff --git a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/unicode.sls b/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/unicode.sls
deleted file mode 100644
index 208cb55739..0000000000
--- a/pkgs/r6rs-pkgs/r6rs-test/tests/r6rs/unicode.sls
+++ /dev/null
@@ -1,145 +0,0 @@
-#!r6rs
-
-(library (tests r6rs unicode)
-  (export run-unicode-tests)
-  (import (rnrs)
-          (tests r6rs test))
-
-  (define (run-unicode-tests)
-
-    (test (char-upcase #\i) #\I)
-    (test (char-downcase #\i) #\i)
-    (test (char-titlecase #\i) #\I)
-    (test (char-foldcase #\i) #\i)
-    
-    (test (char-upcase #\xDF) #\xDF)
-    (test (char-downcase #\xDF) #\xDF)
-    (test (char-titlecase #\xDF) #\xDF)
-    (test (char-foldcase #\xDF) #\xDF)
-    
-    (test (char-upcase #\x3A3) #\x3A3)
-    (test (char-downcase #\x3A3) #\x3C3)
-    (test (char-titlecase #\x3A3) #\x3A3)
-    (test (char-foldcase #\x3A3) #\x3C3)
-
-    (test (char-upcase #\x3C2) #\x3A3)
-    (test (char-downcase #\x3C2) #\x3C2)
-    (test (char-titlecase #\x3C2) #\x3A3)
-    (test (char-foldcase #\x3C2) #\x3C3)
-
-    (test (char-ci<? #\z #\Z) #f)
-    (test (char-ci<? #\Z #\z) #f)
-    (test (char-ci<? #\a #\Z) #t)
-    (test (char-ci<? #\Z #\a) #f)
-    (test (char-ci<=? #\z #\Z) #t)
-    (test (char-ci<=? #\Z #\z) #t)
-    (test (char-ci<=? #\a #\Z) #t)
-    (test (char-ci<=? #\Z #\a) #f)
-    (test (char-ci=? #\z #\a) #f)
-    (test (char-ci=? #\z #\Z) #t)
-    (test (char-ci=? #\x3C2 #\x3C3) #t)
-    (test (char-ci>? #\z #\Z) #f)
-    (test (char-ci>? #\Z #\z) #f)
-    (test (char-ci>? #\a #\Z) #f)
-    (test (char-ci>? #\Z #\a) #t)
-    (test (char-ci>=? #\Z #\z) #t)
-    (test (char-ci>=? #\z #\Z) #t)
-    (test (char-ci>=? #\z #\Z) #t)
-    (test (char-ci>=? #\a #\z) #f)
-
-    (test (char-alphabetic? #\a) #t)
-    (test (char-alphabetic? #\1) #f)
-    (test (char-numeric? #\1) #t)
-    (test (char-numeric? #\a) #f)
-    (test (char-whitespace? #\space) #t)
-    (test (char-whitespace? #\x00A0) #t)
-    (test (char-whitespace? #\a) #f)
-    (test (char-upper-case? #\a) #f)
-    (test (char-upper-case? #\A) #t)
-    (test (char-upper-case? #\x3A3) #t)
-    (test (char-lower-case? #\a) #t)
-    (test (char-lower-case? #\A) #f)
-    (test (char-lower-case? #\x3C3) #t)
-    (test (char-lower-case? #\x00AA) #t)
-    (test (char-title-case? #\a) #f)
-    (test (char-title-case? #\A) #f)
-    (test (char-title-case? #\I) #f)
-    (test (char-title-case? #\x01C5) #t)
-
-    (test (char-general-category #\a) 'Ll)
-    (test (char-general-category #\space) 'Zs)
-    (test (char-general-category #\x10FFFF) 'Cn)
-
-    (test (string-upcase "Hi") "HI")
-    (test (string-upcase "HI") "HI")
-    (test (string-downcase "Hi") "hi")
-    (test (string-downcase "hi") "hi")
-    (test (string-foldcase "Hi") "hi")
-    (test (string-foldcase "HI") "hi")
-    (test (string-foldcase "hi") "hi")
-
-    (test (string-upcase "Stra\xDF;e") "STRASSE")
-    (test (string-downcase "Stra\xDF;e") "stra\xDF;e")
-    (test (string-foldcase "Stra\xDF;e") "strasse")
-    (test (string-downcase "STRASSE")  "strasse")
-    
-    (test (string-downcase "\x3A3;") "\x3C3;")
-
-    (test (string-upcase "\x39E;\x391;\x39F;\x3A3;") "\x39E;\x391;\x39F;\x3A3;")
-    (test (string-downcase "\x39E;\x391;\x39F;\x3A3;") "\x3BE;\x3B1;\x3BF;\x3C2;")
-    (test (string-downcase "\x39E;\x391;\x39F;\x3A3;\x3A3;") "\x3BE;\x3B1;\x3BF;\x3C3;\x3C2;")
-    (test (string-downcase "\x39E;\x391;\x39F;\x3A3; \x3A3;") "\x3BE;\x3B1;\x3BF;\x3C2; \x3C3;")
-    (test (string-foldcase "\x39E;\x391;\x39F;\x3A3;") "\x3BE;\x3B1;\x3BF;\x3C3;")
-    (test (string-upcase "\x3BE;\x3B1;\x3BF;\x3C3;") "\x39E;\x391;\x39F;\x3A3;") 
-    (test (string-upcase "\x3BE;\x3B1;\x3BF;\x3C2;") "\x39E;\x391;\x39F;\x3A3;") 
-
-    (test (string-titlecase "kNock KNoCK") "Knock Knock")
-    (test (string-titlecase "who's there?") "Who's There?")
-    (test (string-titlecase "r6rs") "R6rs") ; this example appears to be wrong in R6RS (Sept 2007 version)
-    (test (string-titlecase "R6RS") "R6rs") ; this one, too
-
-    (test (string-downcase "A\x3A3;'x") "a\x3C3;'x") ; ' is a MidLetter
-
-    (test (string-ci<? "a" "Z") #t)
-    (test (string-ci<? "A" "z") #t)
-    (test (string-ci<? "Z" "a") #f)
-    (test (string-ci<? "z" "A") #f)
-    (test (string-ci<? "z" "Z") #f)
-    (test (string-ci<? "Z" "z") #f)
-    (test (string-ci>? "a" "Z") #f)
-    (test (string-ci>? "A" "z") #f)
-    (test (string-ci>? "Z" "a") #t)
-    (test (string-ci>? "z" "A") #t)
-    (test (string-ci>? "z" "Z") #f)
-    (test (string-ci>? "Z" "z") #f)
-    (test (string-ci=? "z" "Z") #t)
-    (test (string-ci=? "z" "a") #f)
-    (test (string-ci=? "Stra\xDF;e" "Strasse") #t)
-    (test (string-ci=? "Stra\xDF;e" "STRASSE") #t)
-    (test (string-ci=? "\x39E;\x391;\x39F;\x3A3;" "\x3BE;\x3B1;\x3BF;\x3C2;") #t)
-    (test (string-ci=? "\x39E;\x391;\x39F;\x3A3;" "\x3BE;\x3B1;\x3BF;\x3C3;") #t)
-    (test (string-ci<=? "a" "Z") #t)
-    (test (string-ci<=? "A" "z") #t)
-    (test (string-ci<=? "Z" "a") #f)
-    (test (string-ci<=? "z" "A") #f)
-    (test (string-ci<=? "z" "Z") #t)
-    (test (string-ci<=? "Z" "z") #t)
-    (test (string-ci>=? "a" "Z") #f)
-    (test (string-ci>=? "A" "z") #f)
-    (test (string-ci>=? "Z" "a") #t)
-    (test (string-ci>=? "z" "A") #t)
-    (test (string-ci>=? "z" "Z") #t)
-    (test (string-ci>=? "Z" "z") #t)
-
-    (test (string-normalize-nfd "\xE9;") "\x65;\x301;")
-    (test (string-normalize-nfc "\xE9;") "\xE9;")
-    (test (string-normalize-nfd "\x65;\x301;") "\x65;\x301;")
-    (test (string-normalize-nfc "\x65;\x301;") "\xE9;")
-
-    (test (string-normalize-nfkd "\xE9;") "\x65;\x301;")
-    (test (string-normalize-nfkc "\xE9;") "\xE9;")
-    (test (string-normalize-nfkd "\x65;\x301;") "\x65;\x301;")
-    (test (string-normalize-nfkc "\x65;\x301;") "\xE9;")
-
-    ;;
-    ))
diff --git a/pkgs/r6rs-pkgs/r6rs/LICENSE.txt b/pkgs/r6rs-pkgs/r6rs/LICENSE.txt
deleted file mode 100644
index 45131ed1ad..0000000000
--- a/pkgs/r6rs-pkgs/r6rs/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-r6rs
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/r6rs-pkgs/r6rs/info.rkt b/pkgs/r6rs-pkgs/r6rs/info.rkt
deleted file mode 100644
index e8382019f6..0000000000
--- a/pkgs/r6rs-pkgs/r6rs/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("r6rs-lib"
-               "r6rs-doc"))
-(define implies '("r6rs-lib"
-                  "r6rs-doc"))
-
-(define pkg-desc "Legacy R6RS (Scheme) language")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/racklog/COPYING b/pkgs/racklog/COPYING
deleted file mode 100644
index 227bc058d1..0000000000
--- a/pkgs/racklog/COPYING
+++ /dev/null
@@ -1,4 +0,0 @@
-Copyright (c) 1993-2001, Dorai Sitaram.
-All rights reserved.
-
-Distributed under the same terms as Racket, by permission.
diff --git a/pkgs/racklog/LICENSE.txt b/pkgs/racklog/LICENSE.txt
deleted file mode 100644
index 90f00d21f0..0000000000
--- a/pkgs/racklog/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-racklog
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/racklog/history b/pkgs/racklog/history
deleted file mode 100644
index e5796f988f..0000000000
--- a/pkgs/racklog/history
+++ /dev/null
@@ -1,109 +0,0 @@
-June 1, 2003
-
-Include Gauche as a target dialect.  Alex Shinn 
-provided Gauche recognition to scmxlate (q.v.).
-
-3h5
-
-Mar 25, 2003
-
-%assert documentation bugfix.  From Steve Pothier.
-
-3h4
-
-15 Jul 2001
-
-Added optional Occurs Check, suggested by Brad Lucier.
-Brad also points out that the examples/houses.scm
-puzzle, as written, needs the Occurs Check.  ("as
-written"...?  Well, Prolog doesn't have the Occurs
-Check, and this famous puzzle is offered as an exercise
-in the Prolog textbook _The Art of Prolog_ (Sterling &
-Shapiro).  So I'm thinking perhaps there is a
-less naive solution that doesn't rely on the Occurs
-Check.)
-
-3h3
-
-Feb 28, 2000
-
-Gambit port improvement from Brad Lucier: eval
-define-macro explicitly to make macros usable after
-loading
-
-Sep 20, 1999
-
-3h
-
-Ported to Pocket Scheme (Ben Goetter) and Petite Chez Scheme.
-
-Jan 31, 1999
-
-3g1
-
-Minor bugfix for Gambit install
-
-May 2, 1998
-
-3g
-
-Ported to STk
-
-April 19, 1998
-
-3f
-
-Porting mechanism refined: ports to mzscheme, scm,
-guile, gambit, mitscheme, bigloo.
-
-April 1997
-
-3e
-
-Extensible mechanism added for porting to various
-Scheme dialects
-
-3d
-
-maybeini4gambit.scm (Brad Lucier)
-
-Corrected () in evaluable positions to '(), as Gambit
-won't accept unquoted ()s.  (Brad Lucier)
-
-3c
-
-maybeini4mzscheme.scm.
-
-Equal strings unify (Paul Prescod).
-
-HTML version of doc included.
-
-v. 3b
-
-Fixed bug in %and and %or.  (Using macros for now -- these were
-procedures in v. 3, 3a.)
-
-v. 3a
-
-Added maybeini4mitscheme.scm (for Tore Amble).
-
-March 1997
-
-v. 3
-
-Added syntax for asserting additional clauses to an existing
-relation.
-
-Set-predicates rewritten.  (Free variables given choice of
-treatment as in Prolog.  Previously they had all been
-assumed to be existentially quantified.)
-
-Improved tutorial documentation.
-
-Feb 1993
-
-Second release.
-
-1989
-
-First release.
diff --git a/pkgs/racklog/info.rkt b/pkgs/racklog/info.rkt
deleted file mode 100644
index 9db3f3e471..0000000000
--- a/pkgs/racklog/info.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang info
-
-(define collection "racklog")
-
-(define scribblings
-  '(("racklog.scrbl" (multi-page) (tool))))
-(define deps '("base"
-               "datalog"))
-(define build-deps '("eli-tester"
-                     "rackunit-lib"
-                     "racket-doc"
-                     "scribble-lib"))
-
-(define pkg-desc "The implementation of the Racklog (embedded Prolog) language")
-
-(define pkg-authors '(jay))
diff --git a/pkgs/racklog/lang/compiler.rkt b/pkgs/racklog/lang/compiler.rkt
deleted file mode 100644
index 4c1126c216..0000000000
--- a/pkgs/racklog/lang/compiler.rkt
+++ /dev/null
@@ -1,127 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         racket/set
-         datalog/ast
-         datalog/eval
-         racklog
-         (only-in racklog/lang/lang
-                  racklog-answers->literals))
-(require (for-template racklog
-                       datalog/eval
-                       (only-in racklog/lang/lang
-                                racklog-answers->literals)))
-
-(provide/contract
- [compile-program (program/c . -> . syntax?)]
- [compile-statement (statement/c . -> . syntax?)])
-
-(define (compile-program p)
-  (with-syntax ([(pred ...)
-                 (map pred->stx
-                      (set->list
-                       (for/seteq ([s (in-list p)]
-                                   #:when (assertion? s))
-                                  (coerce-sym 
-                                   (clause-predicate (assertion-clause s))))))])
-    (quasisyntax
-     (#%module-begin 
-      (require racklog
-               datalog/eval) 
-      (define pred %empty-rel)
-      ...
-      (provide pred ...)
-      #,@(map compile-statement p)))))
-
-(define coerce-sym
-  (match-lambda
-   [(predicate-sym _ s)
-    s]
-   [(? symbol? s)
-    s]))
-
-(define pred-cache (make-hasheq))
-(define (pred->stx maybe-p)
-  (define p (coerce-sym maybe-p))
-  (hash-ref! pred-cache p
-             (λ ()
-               (datum->syntax #f p))))
-
-(define compile-statement
-  (match-lambda
-    [(assertion srcloc c)
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (quasisyntax/loc srcstx
-       (%assert! #,(pred->stx (clause-predicate c))
-                 #,(set->list (clause-variables c))
-                 [#,(compile-clause-head c)
-                  #,@(compile-clause-body c)]))]
-    [(retraction srcloc c)
-     (define srcstx (datum->syntax #f 'x srcloc))
-     ; XXX implement
-     (raise-syntax-error 'racklog "Retraction is not yet supported in racklog" srcstx)]
-    [(query srcloc l)
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (quasisyntax/loc srcstx
-       (print-questions
-        (racklog-answers->literals
-         #,l
-         (%find-all #,(set->list (literal-variables l))
-                    #,(compile-literal l)))))]))
-
-(define (clause-predicate c)
-  (literal-predicate (clause-head c)))
-
-(define literal-variables
-  (match-lambda
-    [(literal _ _ ts)
-     (for/seteq ([t (in-list ts)]
-                 #:when (variable? t))
-                (coerce-sym (variable-sym t)))]))
-
-(define clause-variables
-  (match-lambda
-    [(clause _ h bs)
-     (for/fold ([s (seteq)])
-       ([l (in-list (list* h bs))])
-       (set-union s (literal-variables l)))]))
-
-(define compile-clause-head
-  (match-lambda
-    [(clause srcloc head _)
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (quasisyntax/loc srcstx
-       #,(compile-literal-terms head))]))
-
-(define compile-clause-body
-  (match-lambda
-    [(clause _ _ body)
-     (map compile-literal body)]))
-
-(define compile-literal
-  (match-lambda
-    [(literal srcloc '= (and ts (app length 2)))
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (quasisyntax/loc srcstx
-       (%= #,@(compile-terms ts)))]
-    [(literal srcloc pred ts)
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (quasisyntax/loc srcstx
-       (#,(pred->stx pred) #,@(compile-terms ts)))]))
-
-(define (compile-literal-terms l)
-  (compile-terms (literal-terms l)))
-
-(define (compile-terms ts)
-  (map compile-term ts))
-
-(define compile-term
-  (match-lambda
-    [(variable srcloc sym)
-     (datum->syntax #f (coerce-sym sym) srcloc)]
-    [(constant srcloc (? string? str))
-     (datum->syntax #f str srcloc)]
-    [(constant srcloc (? symbol? sym))
-     (define srcstx (datum->syntax #f 'x srcloc))
-     (quasisyntax/loc srcstx
-       '#,sym)]))
diff --git a/pkgs/racklog/lang/configure-runtime.rkt b/pkgs/racklog/lang/configure-runtime.rkt
deleted file mode 100644
index 8b3de8e3dd..0000000000
--- a/pkgs/racklog/lang/configure-runtime.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/base
-
-(define (configure data)
-  (current-read-interaction the-read))
-(provide configure)
-
-(require datalog/parse
-         racklog/lang/compiler)
-
-(define (the-read src ip)
-  (cond
-    [(or (not (char-ready? ip))
-         (eof-object? (peek-char ip)))
-     eof]
-    [else
-     (compile-statement
-      (parameterize ([current-source-name src])
-        (parse-statement ip)))]))
diff --git a/pkgs/racklog/lang/lang-info.rkt b/pkgs/racklog/lang/lang-info.rkt
deleted file mode 100644
index ebde9a2927..0000000000
--- a/pkgs/racklog/lang/lang-info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-
-(define (get-info data)
-  (λ (key default)
-    (case key
-      [(configure-runtime)
-       '(#(racklog/lang/configure-runtime configure #f))]
-      [else
-       default])))
-(provide get-info)
diff --git a/pkgs/racklog/lang/lang.rkt b/pkgs/racklog/lang/lang.rkt
deleted file mode 100644
index 8bf1d26169..0000000000
--- a/pkgs/racklog/lang/lang.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-(require racket/dict
-         racket/match
-         racket/function
-         datalog/ast)
-
-(define (racklog-answers->literals t as)
-  (for/list ([a (in-list as)]
-             #:when a)
-    (literal-subst a t)))
-
-(define (literal-subst a t)
-  (struct-copy literal t
-               [terms (map (curry term-subst a)
-                           (literal-terms t))]))
-
-(define (term-subst a t)
-  (match t
-    [(? constant?) t]
-    [(variable srcloc sym)
-     (constant srcloc (dict-ref a sym))]))
-
-(provide #%module-begin
-         #%top
-         #%top-interaction
-         racklog-answers->literals)
diff --git a/pkgs/racklog/lang/reader.rkt b/pkgs/racklog/lang/reader.rkt
deleted file mode 100644
index c1858dbec6..0000000000
--- a/pkgs/racklog/lang/reader.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-(module reader syntax/module-reader
-  ; XXX Copied shamelessly from datalog/lang/reader (some things should be better designed to share
-  #:language 'racklog/lang/lang
-  #:read (lambda ([in (current-input-port)]) (this-read-syntax #f in))
-  #:read-syntax this-read-syntax
-  #:whole-body-readers? #t  
-  #:language-info
-  '#(racklog/lang/lang-info get-info #f)
-  #:info (lambda (key defval default)
-           ; XXX Should have different comment character key
-           (case key
-             [(drracket:submit-predicate)
-              (dynamic-require 'datalog/tool/submit 'repl-submit?)]
-             [(color-lexer)
-              (dynamic-require 'datalog/tool/syntax-color 'get-syntax-token)]
-             [else (default key defval)]))
-  (require datalog/parse
-           racklog/lang/compiler)
-  
-  (define (this-read-syntax [src #f] [in (current-input-port)])
-    (list
-     (compile-program
-      (parameterize ([current-source-name src])
-        (parse-program in))))))
diff --git a/pkgs/racklog/main.rkt b/pkgs/racklog/main.rkt
deleted file mode 100644
index dcaa64ca69..0000000000
--- a/pkgs/racklog/main.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "racklog.rkt")
-(provide (all-from-out "racklog.rkt"))
diff --git a/pkgs/racklog/racklog.rkt b/pkgs/racklog/racklog.rkt
deleted file mode 100644
index 28bc6a4b21..0000000000
--- a/pkgs/racklog/racklog.rkt
+++ /dev/null
@@ -1,418 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     racket/list
-                     syntax/kerncase)
-         racket/list
-         racket/contract
-         racket/stxparam
-         "unify.rkt")
-
-;Dorai Sitaram
-;1989, revised Feb. 1993, Mar. 1997
-
-(define-syntax %let
-  (syntax-rules ()
-    ((%let (x ...) . e)
-     (let ((x (_)) ...)
-       . e))))
-
-(define %= unify)
-
-(define-syntax %or
-  (syntax-rules ()
-    ((%or g ...)
-     (lambda (__fk)
-       (let/racklog-cc __sk
-         (let/racklog-cc __fk
-           (__sk ((logic-var-val* g) __fk)))
-         ...
-         (__fk 'fail))))))
-
-(define-syntax %and
-  (syntax-rules ()
-    ((%and g ...)
-     (lambda (__fk)
-       (let* ((__fk ((logic-var-val* g) __fk))
-              ...)
-         __fk)))))
-
-(define-syntax-parameter !
-  (λ (stx) (raise-syntax-error '! "May only be used syntactically inside %rel or %cut-delimiter expression." stx)))
-
-(define-syntax %cut-delimiter
-  (syntax-rules ()
-    ((%cut-delimiter g)
-     (lambda (__fk)
-       (let ((this-! (lambda (__fk2) __fk)))
-         (syntax-parameterize 
-          ([! (make-rename-transformer #'this-!)])
-          ((logic-var-val* g) __fk)))))))
-
-(define-syntax %rel
-  (syntax-rules ()
-    ((%rel (v ...) ((a ...) subgoal ...) ...)
-     (lambda __fmls
-       (lambda (fail-relation)
-         (let/racklog-cc 
-          __sk
-          (%let (v ...)
-                (let/racklog-cc 
-                 fail-case
-                 (define-values
-                   (unify-cleanup fail-unify)
-                   ((inner-unify __fmls (list a ...))
-                    fail-case))
-                 (define this-! 
-                   (lambda (fk1) 
-                     (λ (fk2)
-                       (unify-cleanup)
-                       (fail-relation 'fail))))
-                 (syntax-parameterize 
-                     ([! (make-rename-transformer #'this-!)])
-                   (__sk 
-                    ((%and subgoal ...) 
-                     fail-unify))))
-                ...
-                (fail-relation 'fail))))))))
-
-(define %fail
-  (lambda (fk) (fk 'fail)))
-
-(define %true
-  (lambda (fk) fk))
-
-(define-for-syntax orig-insp (variable-reference->module-declaration-inspector
-                              (#%variable-reference)))
-
-(define-syntax (%is stx)
-  (syntax-case stx ()
-    [(%is v e)
-     (with-syntax ([fe (syntax-disarm 
-                        (local-expand #'e 'expression empty)
-                        orig-insp)])
-       (syntax/loc stx
-         (lambda (__fk)
-           ((%= v (%is/fk fe __fk)) __fk))))]))
-(define-syntax (%is/fk stx)
-  (kernel-syntax-case stx #f
-    [(_ (#%plain-lambda fmls e ...) fk)
-     (syntax/loc stx (#%plain-lambda fmls (%is/fk e fk) ...))]
-    [(_ (case-lambda [fmls e ...] ...) fk)
-     (syntax/loc stx (case-lambda [fmls (%is/fk e fk) ...] ...))]
-    [(_ (if e1 e2 e3) fk)
-     (syntax/loc stx (if (%is/fk e1 fk)
-                         (%is/fk e2 fk) 
-                         (%is/fk e3 fk)))]
-    [(_ (begin e ...) fk)
-     (syntax/loc stx (begin (%is/fk e fk) ...))]
-    [(_ (begin0 e ...) fk)
-     (syntax/loc stx (begin0 (%is/fk e fk) ...))]
-    [(_ (let-values ([(v ...) ve] ...)
-          be ...) fk)
-     (syntax/loc stx
-       (let-values ([(v ...) (%is/fk ve fk)] ...) 
-         (%is/fk be fk) ...))]
-    [(_ (letrec-values ([(v ...) ve] ...)
-          be ...) fk)
-     (syntax/loc stx
-       (letrec-values ([(v ...) (%is/fk ve fk)] ...) 
-         (%is/fk be fk) ...))]
-    [(_ (set! i e) fk)
-     (syntax/loc stx (set! i (%is/fk e fk)))]
-    [(_ (quote d) fk)
-     (syntax/loc stx (quote d))]
-    [(_ (quote-syntax d) fk)
-     (syntax/loc stx (quote-syntax d))]
-    [(_ (with-continuation-mark e1 e2 e3) fk)
-     (syntax/loc stx (with-continuation-mark
-                         (%is/fk e1 fk)
-                       (%is/fk e2 fk) 
-                       (%is/fk e3 fk)))]
-    [(_ (#%plain-app e ...) fk)
-     (syntax/loc stx (#%plain-app (%is/fk e fk) ...))]
-    [(_ x fk)
-     (syntax/loc stx
-       (if (and (logic-var? x) (unbound-logic-var? x))
-           (fk 'fail) (logic-var-val* x)))]
-    
-    ))
-
-#;(define-syntax %is/fk
-  (syntax-rules (quote)
-    ((%is/fk (quote x) fk) (quote x))
-    ((%is/fk (x ...) fk)
-     ((%is/fk x fk) ...))
-    ((%is/fk x fk)
-     (if (and (logic-var? x) (unbound-logic-var? x))
-         (fk 'fail) (logic-var-val* x)))))
-
-(define ((make-binary-arithmetic-relation f) x y)
-  (%and (%is #t (number? x))
-        (%is #t (number? y))
-        (%is #t (f x y))))
-
-(define %=:= (make-binary-arithmetic-relation =))
-(define %> (make-binary-arithmetic-relation >))
-(define %>= (make-binary-arithmetic-relation >=))
-(define %< (make-binary-arithmetic-relation <))
-(define %<= (make-binary-arithmetic-relation <=))
-(define %=/= (make-binary-arithmetic-relation (compose not =)))
-
-(define (%constant x)
-  (lambda (fk)
-    (if (constant? x) fk (fk 'fail))))
-
-(define (%compound x)
-  (lambda (fk)
-    (if (is-compound? x) fk (fk 'fail))))
-
-(define (%var x)
-  (lambda (fk) (if (var? x) fk (fk 'fail))))
-
-(define (%nonvar x)
-  (lambda (fk) (if (var? x) (fk 'fail) fk)))
-
-(define ((make-negation p) . args) 
-  ;basically inlined cut-fail
-  (lambda (fk)
-    (if (let/racklog-cc k
-          ((apply p args) (lambda (d) (k #f))))
-        (fk 'fail)
-        fk)))
-
-(define %/=
-  (make-negation %=))
-
-(define (%== x y)
-  (lambda (fk) (if (ident? x y) fk (fk 'fail))))
-
-(define (%/== x y)
-  (lambda (fk) (if (ident? x y) (fk 'fail) fk)))
-
-(define (%freeze s f)
-  (lambda (fk)
-    ((%= (freeze s) f) fk)))
-
-(define (%melt f s)
-  (lambda (fk)
-    ((%= (melt f) s) fk)))
-
-(define (%melt-new f s)
-  (lambda (fk)
-    ((%= (melt-new f) s) fk)))
-
-(define (%copy s c)
-  (lambda (fk)
-    ((%= (copy s) c) fk)))
-
-(define (%not g)
-  (lambda (fk)
-    (if (let/racklog-cc k
-          ((logic-var-val* g) (lambda (d) (k #f))))
-        (fk 'fail) fk)))
-
-(define (%empty-rel . args)
-  %fail)
-
-(define-syntax %assert!
-  (syntax-rules ()
-    ((_ rel-name (v ...) ((a ...) subgoal ...) ...)
-     (set! rel-name
-           (let ((__old-rel rel-name)
-                 (__new-addition (%rel (v ...) ((a ...) subgoal ...) ...)))
-             (lambda __fmls
-               (%or (apply __old-rel __fmls)
-                    (apply __new-addition __fmls))))))))
-
-(define-syntax %assert-after!
-  (syntax-rules ()
-    ((_ rel-name (v ...) ((a ...) subgoal ...) ...)
-     (set! rel-name
-           (let ((__old-rel rel-name)
-                 (__new-addition (%rel (v ...) ((a ...) subgoal ...) ...)))
-             (lambda __fmls
-               (%or (apply __new-addition __fmls)
-                    (apply __old-rel __fmls))))))))
-
-(define (set-cons e s)
-  (if (member e s) s (cons e s)))
-
-(define-struct goal-with-free-vars (vars subgoal))
-
-(define-syntax %free-vars
-  (syntax-rules ()
-    ((%free-vars (v ...) g)
-     (make-goal-with-free-vars
-      (list v ...) 
-      g))))
-
-(define ((make-bag-of kons) lv goal bag)
-  (let ((fvv '()))
-    (when (goal-with-free-vars? goal)
-      (set! fvv (goal-with-free-vars-vars goal))
-      (set! goal (goal-with-free-vars-subgoal goal)))
-    (make-bag-of-aux kons fvv lv goal bag)))
-
-(define (make-bag-of-aux kons fvv lv goal bag)
-  (lambda (fk)
-    (let/racklog-cc sk
-      (let ((lv2 (cons fvv lv)))
-        (let* ((acc '())
-               (fk-final
-                (lambda (d)
-                  (sk ((separate-bags fvv bag acc) fk))))
-               (fk-retry (goal fk-final)))
-          (set! acc (kons (logic-var-val* lv2) acc))
-          (fk-retry 'retry))))))
-
-(define (separate-bags fvv bag acc)
-  (let ((bags (let loop ((acc acc)
-                         (current-fvv #f) (current-bag '())
-                         (bags '()))
-                (if (null? acc)
-                    (cons (cons current-fvv current-bag) bags)
-                    (let ((x (car acc)))
-                      (let ((x-fvv (car x)) (x-lv (cdr x)))
-                        (if (or (not current-fvv) (equal? x-fvv current-fvv))
-                            (loop (cdr acc) x-fvv (cons x-lv current-bag) bags)
-                            (loop (cdr acc) x-fvv (list x-lv)
-                                  (cons (cons current-fvv current-bag) bags)))))))))
-    (if (null? bags) (%= bag '())
-        (let ((fvv-bag (cons fvv bag)))
-          (let loop ((bags bags))
-            (if (null? bags) %fail
-                (%or (%= fvv-bag (car bags))
-                     (loop (cdr bags)))))))))
-
-(define %bag-of (make-bag-of cons))
-(define %set-of (make-bag-of set-cons))
-
-(define (%bag-of-1 x g b)
-  (%and (%bag-of x g b)
-        (%= b (cons (_) (_)))))
-
-(define (%set-of-1 x g s)
-  (%and (%set-of x g s)
-        (%= s (cons (_) (_)))))
-
-(define *more-fk* (box (λ (d) (error '%more "No active %which"))))
-
-(define-syntax %which
-  (syntax-rules ()
-    ((%which (v ...) g)
-     (with-racklog-prompt
-       (%let (v ...)
-         (set-box! *more-fk*
-                   ((logic-var-val* g)
-                    (lambda (d)
-                      (set-box! *more-fk* #f)
-                      (abort-to-racklog-prompt #f))))
-         (abort-to-racklog-prompt
-          (list (cons 'v (logic-var-val* v))
-                ...)))))
-    [(%which (v ...) g ...)
-     (%which (v ...) (%and g ...))]))
-
-(define (%more)
-  (with-racklog-prompt
-    (if (unbox *more-fk*)
-        ((unbox *more-fk*) 'more)
-        #f)))
-
-(define-syntax %find-all
-  (syntax-rules ()
-    [(_ (v ...) g)
-     (list* (%which (v ...) g)
-            (%more-list))]))
-
-(define (%more-list)
-  (define a (%more))
-  (if a
-      (list* a (%more-list))
-      empty))
-
-(define racklog-prompt-tag (make-continuation-prompt-tag 'racklog))
-(define (abort-to-racklog-prompt a)
-  (abort-current-continuation racklog-prompt-tag (λ () a)))
-(define-syntax-rule (with-racklog-prompt e ...)
-  (call-with-continuation-prompt (λ () e ...) racklog-prompt-tag))
-(define-syntax-rule (let/racklog-cc k e ...)
-  (call-with-current-continuation (λ (k) e ...) racklog-prompt-tag))
-
-(define (%member x y)
-  (%let (xs z zs)
-        (%or
-         (%= y (cons x xs))
-         (%and (%= y (cons z zs))
-               (%member x zs)))))
-
-(define (%if-then-else p q r)
-  (%cut-delimiter
-   (%or
-    (%and p ! q)
-    r)))
-
-(define %append
-  (%rel (x xs ys zs)
-        (('() ys ys))
-        (((cons x xs) ys (cons x zs))
-         (%append xs ys zs))))
-
-(define %repeat
-  (%rel ()
-        (())
-        (() (%repeat))))
-
-(define fk? (symbol? . -> . any))
-(define goal/c 
-  (or/c goal-with-free-vars?
-        (fk? . -> . fk?)))
-(define relation/c
-  (->* () () #:rest (listof unifiable?) goal/c))
-
-; XXX Add contracts in theses macro expansions
-(provide %and %assert! %assert-after! %cut-delimiter %free-vars %is %let
-         %or %rel %which %find-all !)
-(provide/contract
- [goal/c contract?]
- [logic-var? (any/c . -> . boolean?)]
- [atom? (any/c . -> . boolean?)]
- [atomic-struct? (any/c . -> . boolean?)]
- [compound-struct? (any/c . -> . boolean?)]
- [compound? (any/c . -> . boolean?)]
- [unifiable? (any/c . -> . boolean?)]
- [answer-value? (any/c . -> . boolean?)]
- [answer? (any/c . -> . boolean?)]
- [%/= (unifiable? unifiable? . -> . goal/c)]
- [%/== (unifiable? unifiable? . -> . goal/c)]
- [%< (unifiable? unifiable? . -> . goal/c)]
- [%<= (unifiable? unifiable? . -> . goal/c)]
- [%= (unifiable? unifiable? . -> . goal/c)]
- [%=/= (unifiable? unifiable? . -> . goal/c)]
- [%=:= (unifiable? unifiable? . -> . goal/c)]
- [%== (unifiable? unifiable? . -> . goal/c)]
- [%> (unifiable? unifiable? . -> . goal/c)]
- [%>= (unifiable? unifiable? . -> . goal/c)]
- [%append (unifiable? unifiable? unifiable? . -> . goal/c)]
- [%bag-of (unifiable? goal/c unifiable? . -> . goal/c)]
- [%bag-of-1 (unifiable? goal/c unifiable? . -> . goal/c)]
- [%compound (unifiable? . -> . goal/c)]
- [%constant (unifiable? . -> . goal/c)]
- [%copy (unifiable? unifiable? . -> . goal/c)]
- [%empty-rel relation/c]
- [%fail goal/c]
- [%freeze (unifiable? unifiable? . -> . goal/c)]
- [%if-then-else (goal/c goal/c goal/c . -> . goal/c)]
- [%melt (unifiable? unifiable? . -> . goal/c)]
- [%melt-new (unifiable? unifiable? . -> . goal/c)]
- [%member (unifiable? unifiable? . -> . goal/c)]
- [%nonvar (unifiable? . -> . goal/c)]
- [%not (goal/c . -> . goal/c)]
- [%more (-> answer?)]
- [%repeat (-> goal/c)]
- [use-occurs-check? (parameter/c boolean?)]
- [%set-of (unifiable? goal/c unifiable? . -> . goal/c)]
- [%set-of-1 (unifiable? goal/c unifiable? . -> . goal/c)]
- [%true goal/c]
- [%var (unifiable? . -> . goal/c)]
- [_ (-> logic-var?)]) 
diff --git a/pkgs/racklog/racklog.scrbl b/pkgs/racklog/racklog.scrbl
deleted file mode 100644
index f8f2a6c291..0000000000
--- a/pkgs/racklog/racklog.scrbl
+++ /dev/null
@@ -1,1462 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          (for-syntax racket)
-          (for-label racklog
-                     (except-in racket _)))
-
-@(define racklog-eval (make-base-eval))
-@(racklog-eval '(require racklog))
-
-@title{Racklog: Prolog-Style Logic Programming}
-
-@author{Dorai Sitaram}
-
-@margin-note{Adapted from Schelog by Dorai Sitaram for Racket by Dorai Sitaram,
-  John Clements, and Jay McCarthy.}
-
-@defmodule[racklog]
-
-Racklog is an @emph{embedding} of
-Prolog-style logic programming in Racket.  ``Embedding''
-means you don't lose Racket: You can use Prolog-style and
-conventional Racket code fragments alongside each other.
-Racklog contains the full repertoire of Prolog features,
-including meta-logical and second-order (``set'')
-predicates, leaving out only those features that could more
-easily and more efficiently be done with Racket
-subexpressions.
-
-The Racklog implementation uses the approach to logic
-programming for Scheme described in Felleisen @cite{mf:prolog} and
-Haynes @cite{logick}.  In contrast to earlier Lisp simulations of
-Prolog @cite{campbell},
-which used explicit continuation
-arguments to store failure (backtrack) information, the
-Felleisen and Haynes model uses the implicit reified
-continuations of Scheme. In Racket these are provided by the operator
-@racket[call-with-current-continuation] (aka @racket[call/cc]).  This
-allows Racklog to be an @emph{embedding}, ie, logic
-programming is not built as a new language on top of Racket,
-but is used alongside Racket's other features.  Both styles
-of programming may be mixed to any extent that a project
-needs.
-
-The Racklog user does not need to know about the
-implementation mechanism or about @racket[call/cc] and
-continuations to get on with the business of
-doing logic programming with Racklog.
-
-This text is a gentle introduction to Racklog syntax
-and programming.  It assumes a working knowledge of
-Racket and an awareness of, if not actual programming
-experience with, Prolog.  If you need assistance for Prolog,
-you may consult @cite["bratko" "ok:prolog" "aop"] or 
-many other excellent books and
-online documents available.
-
-@table-of-contents[]
-
-@section[#:tag "simple"]{Simple Goals and Queries}
-
-Racklog objects are the same as Racket objects.  However, there
-are two subsets of these objects that are of special
-interest to Racklog: @emph{goals} and @emph{predicates}.  We
-will first look at some simple goals.
-@secref{predicates} will introduce predicates and ways
-of making  complex goals using predicates.
-
-A goal is an object whose truth or falsity we can check.  A
-goal that turns out to be true is said to succeed.
-A goal that turns out to be false is said to
-fail.
-
-Two simple goals that are provided in Racklog are:
-@racketblock[
-%true
-%fail
-]
-
-The  goal @racket[%true] succeeds.  The goal @racket[%fail]
-always fails.
-
-(The names of all Racklog primitive objects
-start with @litchar{%}.  This is to avoid clashes with the names
-of conventional Racket objects of related meaning.
-User-created objects in Racklog are not required to
-follow this convention.)
-
-A Racklog user can @emph{query} a goal by wrapping it in a
-@racket[%which]-form.
-
-@racketblock[
-(%which () %true)
-]
-
-evaluates to @racketresult[()], indicating success, whereas:
-
-@racketblock[
-(%which () %fail)
-]
-
-evaluates to @racket[#f], indicating failure.
-
-Note 1: The second subexpression of the @racket[%which]-form
-is the empty list @racketresult[()].  Later (@secref{solving-goals}),
-we will see @racket[%which]es
-with other lists as the second subform.
-
-Henceforth, we will use the notation:
-
-@interaction[(eval:alts E 'F)]
-
-to say that @racket[E] @emph{evaluates to} @racket[F]. Thus,
-
-@interaction[#:eval racklog-eval (%which () %true)]
-
-@section[#:tag "predicates"]{Predicates}
-
-More interesting goals are created by applying a special
-kind of Racklog object called a @emph{predicate} (or
-@emph{relation}) to other
-Racklog objects.  Racklog comes with some primitive
-predicates, such as the arithmetic operators
-@racket[%=:=] and @racket[%<],
-standing for arithmetic ``equal'' and ``less than''
-respectively.  For example, the following are some goals
-involving these predicates:
-
-@interaction[
- #:eval racklog-eval
- (%which () (%=:= 1 1))
- (%which () (%< 1 2))
- (%which () (%=:= 1 2))
- (%which () (%< 1 1))
- ]
-
-Other arithmetic predicates are
-@racket[%>] (``greater than''),
-@racket[%<=] (``less than or equal''),
-@racket[%>=] (``greater than or equal''), and
-@racket[%=/=] (``not equal'').
-
-Racklog predicates are not to be confused with conventional
-Racket predicates (such as @racket[<] and @racket[=]).  Racklog
-predicates, when applied to arguments, produce goals
-that
-may either succeed or fail.  Racket predicates, when applied
-to arguments, yield a boolean value.  Henceforth, we will
-use the term ``predicate'' to mean Racklog predicates.
-Conventional predicates will be explicitly called ``Racket
-predicates''.
-
-@subsection[#:tag "facts"]{Predicates Introducing Facts}
-
-Users can create their own predicates using the Racklog form
-@racket[%rel].  For example, let's
-define the predicate @racket[%knows]:
-
-@racketblock+eval[#:eval racklog-eval
-(define %knows
-  (%rel ()
-    [('Odysseus 'TeX)]
-    [('Odysseus 'Racket)]
-    [('Odysseus 'Prolog)]
-    [('Odysseus 'Penelope)]
-    [('Penelope 'TeX)]
-    [('Penelope 'Prolog)]
-    [('Penelope 'Odysseus)]
-    [('Telemachus 'TeX)]
-    [('Telemachus 'calculus)]))
-]
-
-The expression has the expected meaning.  Each
-@emph{clause} in the @racket[%rel] establishes a @emph{fact}:
-Odysseus
-knows TeX, Telemachus knows calculus, &c.  In general, if we
-apply the predicate to the arguments in any one of its
-clauses, we will get a successful goal.  Thus, since
-@racket[%knows] has a clause that reads
-@racket[[('Odysseus 'TeX)]], the goal
-@racket[(%knows 'Odysseus 'TeX)]
-will be true.
-
-We can now get answers for the following types of queries:
-
-@interaction[#:eval racklog-eval
-(%which ()
-  (%knows 'Odysseus 'TeX))
-(%which ()
-  (%knows 'Telemachus 'Racket))
-]
-
-@subsection[#:tag "rules"]{Predicates with Rules}
-
-Predicates can be more complicated than the above bald
-recitation of facts.  The predicate clauses can be @emph{rules}, eg,
-
-@racketblock+eval[#:eval racklog-eval
-(define %computer-literate
-  (%rel (person)
-    [(person)
-      (%knows person 'TeX)
-      (%knows person 'Racket)]
-    [(person)
-      (%knows person 'TeX)
-      (%knows person 'Prolog)]))
-]
-
-This defines the predicate
-@racket[%computer-literate] in
-terms of the predicate @racket[%knows].  In effect, a person is
-defined as computer-literate if they know TeX and
-Racket, @emph{or} TeX and Prolog.
-
-Note that this use of
-@racket[%rel] employs a local @emph{logic variable} called @racket[_person].
-In general, a @racket[%rel]-expression can have a list of symbols
-as its second subform.  These name new logic variables that
-can be used within the body of the @racket[%rel].
-
-The following query can now be answered:
-
-@interaction[#:eval racklog-eval
-(%which ()
-  (%computer-literate 'Penelope))
-]
-
-Since Penelope knows TeX and Prolog, she is computer-literate.
-
-@subsection[#:tag "solving-goals"]{Solving Goals}
-
-The above queries are yes/no questions.  Racklog programming
-allows more: We can formulate a goal with @emph{uninstantiated}
-logic variables and then ask the querying process to
-provide, if possible, values for these variables that cause
-the goal to succeed.  For instance, the query:
-
-@interaction[#:eval racklog-eval
-(%which (what)
-  (%knows 'Odysseus what))
-]
-
-asks for an instantiation of the logic variable @racket[_what]
-that satisfies the goal @racket[(%knows 'Odysseus what)].
-In other words, we are asking, ``What does Odysseus know?''
-
-Note that this use of @racket[%which] --- like @racket[%rel]
-in the definition of @racket[%computer-literate] ---
-uses a local logic
-variable, @racket[_what].  In general, the second subform of
-@racket[%which] can be a list of local logic variables.  The
-@racket[%which]-query returns an answer that is a list of
-bindings, one for each logic variable mentioned in its
-second subform.  Thus,
-
-@interaction[#:eval racklog-eval
-(%which (what)
-  (%knows 'Odysseus what))
-]
-
-But that is not all that wily Odysseus knows.  Racklog
-provides a zero-argument procedure (``thunk'') called
-@racket[%more]
-that @emph{retries} the goal in the last
-@racket[%which]-query for a different solution.
-
-@interaction[#:eval racklog-eval
-(%more)
-]
-
-We can keep pumping for more solutions:
-
-@interaction[#:eval racklog-eval
-(%more)
-(%more)
-(%more)
-]
-
-The final @racket[#f] shows that there are no more
-solutions.  This is because there are no more clauses in the
-@racket[%knows] predicate that list Odysseus as knowing anything
-else.
-
-@subsection[#:tag "assert"]{Asserting Extra Clauses}
-
-We can add more clauses to a predicate after it has already
-been defined with a @racket[%rel].  Racklog provides the
-@racket[%assert!] form for this purpose.  Eg,
-
-@racketblock+eval[#:eval racklog-eval
-(%assert! %knows ()
-  [('Odysseus 'archery)])
-]
-
-tacks on a new clause at the end of the existing clauses
-of the @racket[%knows]
-predicate.  Now, the query:
-
-@interaction[#:eval racklog-eval
-(%which (what)
-  (%knows 'Odysseus what))
-]
-
-gives TeX, Racket, Prolog, and Penelope, as before, but
-a subsequent @racket[(%more)] yields a new result:
-@interaction-eval[#:eval racklog-eval (begin (%more) (%more) (%more))]
-@interaction[#:eval racklog-eval
-(%more)
-]
-
-The Racklog form @racket[%assert-after!] is similar to @racket[%assert!] but
-adds clauses @emph{before} any of the current clauses.
-
-Both @racket[%assert!] and @racket[%assert-after!] assume that the variable
-they are adding to already names a predicate (presumably
-defined using @racket[%rel]).
-In order to allow defining a predicate entirely through
-@racket[%assert!]s,  Racklog provides an empty predicate value
-@racket[%empty-rel].  @racket[%empty-rel] takes any number of arguments
-and always fails.  A typical use of the
-@racket[%empty-rel] and @racket[%assert!] combination:
-
-@racketblock+eval[#:eval racklog-eval
-(define %parent %empty-rel)
-
-(%assert! %parent ()
-  [('Laertes 'Odysseus)])
-
-(%assert! %parent ()
-  [('Odysseus 'Telemachus)]
-  [('Penelope 'Telemachus)])
-]
-
-(Racklog does not provide a predicate for @emph{retracting}
-assertions, since we can keep track of older versions of
-predicates using conventional Racket features (@racket[let] and @racket[set!]).)
-
-@subsection[#:tag "local-vars"]{Local Variables}
-
-The local logic variables of @racket[%rel]- and
-@racket[%which]-expressions are in reality introduced by the
-Racklog syntactic form called @racket[%let].  (@racket[%rel] and
-@racket[%which] are macros written using @racket[%let].)
-
-@racket[%let] introduces new lexically scoped logic variables.
-Supposing, instead of
-
-@interaction[#:eval racklog-eval
-(%which (what)
-  (%knows 'Odysseus what))
-]
-
-we had asked
-
-@interaction[#:eval racklog-eval
-(%let (what)
-  (%which ()
-    (%knows 'Odysseus what)))
-]
-
-This query, too, succeeds five times, since
-Odysseus knows five things.  However, @racket[%which] emits
-bindings only for the local variables that @emph{it}
-introduces.  Thus, this query emits @racketresult[()] five times before
-@racket[(%more)] finally returns @racket[#f].
-
-@section[#:tag "racket-w-logic"]{Using Conventional Racket Expressions in Racklog}
-
-The arguments of Racklog predicates can be any Racket
-objects.  In particular, composite structures such as lists,
-vectors, strings, hash tables, etc can be used, as also Racket expressions
-using the full array of Racket's construction and
-decomposition operators.  For instance, consider the
-following goal:
-
-@racketblock[
-(%member x '(1 2 3))
-]
-
-Here, @racket[%member] is a predicate, @racket[x] is a logic
-variable, and @racket['(1 2 3)] is a structure.  Given a suitably
-intuitive definition for @racket[%member], the above goal
-succeeds for @racket[x] = @racketresult[1], @racketresult[2], and @racketresult[3].
-
-Now to defining predicates like @racket[%member]:
-
-@racketblock[
-(define %member
-  (%rel (x y xs)
-    [(x (cons x xs))]
-    [(x (cons y xs))
-      (%member x xs)]))
-]
-
-Ie, @racket[%member] is defined with three local variables:
-@racket[x],  @racket[y], @racket[xs].  It  has two
-clauses, identifying the two ways of determining membership.
-
-The first clause of @racket[%member] states a fact: For any
-@racket[x], @racket[x] is a member of a list whose head is also @racket[x].
-
-The second clause of @racket[%member] is a rule: @racket[x] is a
-member of a list if we can show that it is a member of the
-@emph{tail} of that list.  In other words, the original
-@racket[%member] goal is translated into a @emph{sub}goal, which is also
-a @racket[%member] goal.
-
-Note that the variable @racket[y] in the definition of
-@racket[%member] occurs only once in the second clause.  As such,
-it doesn't need you to make the effort of naming it.  (Names
-help only in matching a second occurrence to a first.)  Racklog
-lets you use the expression @racket[(_)] to denote an anonymous
-variable.  (Ie, @racket[_] is a thunk that generates a fresh
-anonymous variable at each call.)  The predicate @racket[%member] can be
-rewritten as
-
-@racketblock[
-(define %member
-  (%rel (x xs)
-    [(x (cons x (_)))]
-    [(x (cons (_) xs))
-      (%member x xs)]))
-]
-
-@subsection[#:tag "constructors"]{Constructors}
-
-We can use constructors --- Racket procedures for creating
-structures --- to simulate data types in Racklog.  For
-instance, let's define a natural-number data-type where
-@racket[0] denotes zero, and @racket[(succ x)] denotes the natural number
-whose immediate predecessor is @racket[x].   The constructor
-@racket[succ] can
-be defined in Racket as:
-
-@racketblock+eval[#:eval racklog-eval
-(define succ
-  (lambda (x)
-    (vector 'succ x)))
-]
-
-Addition and multiplication can be defined as:
-
-@racketblock+eval[#:eval racklog-eval
-(define %add
-  (%rel (x y z)
-    [(0 y y)]
-    [((succ x) y (succ z))
-      (%add x y z)]))
-
-(define %times
-  (%rel (x y z z1)
-    [(0 y 0)]
-    [((succ x) y z)
-     (%times x y z1)
-     (%add y z1 z)]))
-]
-
-We can do a lot of arithmetic with this in place.  For
-instance, the factorial predicate looks like:
-
-@racketblock+eval[#:eval racklog-eval
-(define %factorial
-  (%rel (x y y1)
-    [(0 (succ 0))]
-    [((succ x) y)
-      (%factorial x y1)
-      (%times (succ x) y1 y)]))
-]
-
-@subsection[#:tag "is"]{@racket[\%is]}
-
-The above is a very inefficient way to do arithmetic,
-especially when the underlying language Racket offers
-excellent arithmetic facilities (including a comprehensive
-number ``tower'' and exact rational arithmetic).  One
-problem with using Racket calculations directly in Racklog
-clauses is that the expressions used may contain logic
-variables that need to be dereferenced.  Racklog provides
-the predicate @racket[%is] that takes care of this.  The goal
-
-@racketblock[
-(%is _X _E)
-]
-
-unifies @racket[_X] with the value of @racket[_E] considered as a
-Racket expression.  @racket[_E] can have logic variables, but
-usually they should at least be bound, as unbound variables
-may not be palatable values to the Racket operators used in
-@racket[_E].
-
-We can now directly use the numbers of Racket to write a
-more efficient @racket[%factorial] predicate:
-
-@racketblock+eval[#:eval racklog-eval
-(define %factorial
-  (%rel (x y x1 y1)
-    [(0 1)]
-    [(x y) (%is x1 (- x 1))
-           (%factorial x1 y1)
-           (%is y (* y1 x))]))
-]
-
-A price that this efficiency comes with is that we can
-use @racket[%factorial] only with its first argument already
-instantiated.  In many cases, this is not an unreasonable
-constraint.  In fact, given this limitation, there is
-nothing to prevent us from using Racket's factorial
-directly:
-
-@racketblock+eval[#:eval racklog-eval
-(define %factorial
-  (%rel (x y)
-    [(x y)
-     (%is y (racket-factorial
-	      x))]))
-]
-
-or better yet, ``in-line'' any calls to @racket[%factorial] with
-@racket[%is]-expressions calling @racket[racket-factorial], where the
-latter is defined in the usual manner:
-
-@racketblock+eval[#:eval racklog-eval
-(define racket-factorial
-  (lambda (n)
-    (if (= n 0) 1
-        (* n (factorial
-	       (- n 1))))))
-]
-
-@subsection[#:tag "lexical-scoping"]{Lexical Scoping}
-
-One can use Racket's lexical scoping to enhance predicate
-definition.  Here is a list-reversal predicate defined using
-a hidden auxiliary predicate:
-
-@racketblock+eval[#:eval racklog-eval
-(define %reverse
-  (letrec
-    ([revaux
-       (%rel (x y z w)
-	 [('() y y)]
-	 [((cons x y) z w)
-	   (revaux y
-	     (cons x z) w)])])
-    (%rel (x y)
-      [(x y) (revaux x '() y)])))
-]
-
-@racket[(revaux _X _Y _Z)] uses @racket[_Y] as an accumulator for
-reversing @racket[_X] into @racket[_Z].  (@racket[_Y] starts out as @racketresult[()].
-Each head of @racket[_X] is @racket[cons]ed on to @racket[_Y].  Finally, when
-@racket[_X] has wound down to @racketresult[()], @racket[_Y] contains the reversed
-list and can be returned as @racket[_Z].)
-
-@racket[revaux] is used purely as a helper predicate for
-@racket[%reverse], and so it can be concealed within a lexical
-contour.  We use @racket[letrec] instead of @racket[let] because
-@racket[revaux] is a recursive procedure.
-
-@subsection[#:tag "type-predicates"]{Type Predicates}
-
-Racklog provides a couple of predicates that let the user
-probe the type of objects.
-
-The goal
-@racketblock[
-(%constant _X)
-]
-
-succeeds if @racket[_X] is an @emph{atomic} object.
-
-The predicate @racket[%compound], the negation of @racket[%constant],
-checks if its argument is not an atomic object.
-
-The above are merely the logic-programming equivalents of
-corresponding Racket predicates.  Users can use the
-predicate @racket[%is] and Racket predicates to write more type
-checks in Racklog.  Thus, to test if @racket[_X] is a string, the
-following goal could be used:
-
-@racketblock[
-(%is #t (string? _X))
-]
-
-User-defined Racket predicates, in addition to primitive Racket
-predicates, can be thus imported.
-
-@section[#:tag "backtracking"]{Backtracking}
-
-It is helpful to go into the following evaluation (@secref{rules})
-in a
-little detail:
-
-@racketblock+eval[#:eval racklog-eval
-(%which ()
-  (%computer-literate 'Penelope))
-]
-
-The starting goal
-is:
-
-@(define goal litchar)
-@racketblock[
-G0 = (%computer-literate Penelope)
-]
-
-(I've taken out the quote because @racketresult[Penelope] is the result
-of evaluating @racket['Penelope].)
-
-Racklog tries to match this with the head of the first
-clause of @racket[%computer-literate].  It succeeds, generating a
-binding  @racket[[person . Penelope]].
-
-But this means it now has two new goals --- @emph{subgoals}
---- to solve.  These are the goals in the body of the
-matching clause, with the logic variables substituted by
-their instantiations:
-
-@racketblock[
-G1 = (%knows Penelope TeX)
-G2 = (%knows Penelope Racket)
-]
-
-For @goal{G1}, Racklog attempts matches with the clauses of
-@racket[%knows], and succeeds at the fifth try.  (There are no
-subgoals in this case, because the bodies of these ``fact''
-clauses are empty, in contrast to the ``rule'' clauses of
-@racket[%computer-literate].)
-Racklog then tries to solve @goal{G2} against the clauses of
-@racket[%knows], and since there is no clause stating that
-Penelope knows Racket, it fails.
-
-All is not lost though.  Racklog now @emph{backtracks} to the
-goal that was solved just before, viz., @goal{G1}.  It
-@emph{retries} @goal{G1}, ie, tries to solve it in a
-different way.
-This entails searching down the previously unconsidered
-@racket[%knows]
-clauses for @goal{G1}, ie, the sixth onwards.  Obviously,
-Racklog fails again, because the fact that Penelope knows
-TeX occurs only once.
-
-Racklog now backtracks to the goal before @goal{G1}, ie,
-@goal{G0}.  We abandon the current successful match with the
-first clause-head of @racket[%computer-literate], and try the
-next clause-head.  Racklog succeeds, again producing a binding
-@racket[[person . Penelope]], and two new subgoals:
-
-@racketblock[
-G3 = (%knows Penelope TeX)
-G4 = (%knows Penelope Prolog)
-]
-
-It is now easy to trace that Racklog finds both @goal{G3} and @goal{G4} to be
-true.  Since both of @goal{G0}'s subgoals are true, @goal{G0} is
-itself considered true.  And this is what Racklog reports.  The
-interested reader can now trace  why the
-following query has a different denouement:
-
-@interaction[#:eval racklog-eval
-(%which ()
-  (%computer-literate 'Telemachus))
-]
-
-@section[#:tag "unification"]{Unification}
-
-When we say that a goal matches with a clause-head, we mean
-that the predicate and argument positions line up.  Before
-making this comparison, Racklog dereferences all already
-bound logic variables.  The resulting structures are then
-compared to see if they are recursively identical.  Thus,
-@racket[1] unifies with @racket[1], and @racket[(list 1 2)] with @racket['(1 2)]; but @racket[1] and
-@racket[2] do not unify, and neither do @racket['(1 2)] and @racket['(1 3)].
-
-In general, there could be quite a few uninstantiated logic
-variables in the compared objects.  Unification will then
-endeavor to find the most natural way of binding these
-variables so that we arrive at structurally identical
-objects.  Thus, @racket[(list _x 1)], where @racket[_x] is an unbound logic
-variable, unifies with @racket['(0 1)], producing the
-binding
-@racket[[_x 0]].
-
-Unification is thus a goal, and Racklog makes the unification predicate
-available  to the user as @racket[%=].   Eg,
-
-@interaction[#:eval racklog-eval
-(%which (x)
-  (%= (list x 1) '(0 1)))
-]
-
-Racklog also provides the predicate @racket[%/=], the @emph{negation} of
-@racket[%=].  @racket[(%/= _X _Y)] succeeds if and only if @racket[_X] does
-@emph{not} unify with @racket[_Y].
-
-Unification goals constitute the basic subgoals that all
-Racklog goals devolve to.  A goal succeeds because all the
-eventual unification subgoals that it decomposes to in at
-least one of its subgoal-branching succeeded.  It fails
-because every possible subgoal-branching was thwarted by the
-failure of a crucial unification subgoal.
-
-Going back to the example in @secref{backtracking}, the goal
-@racket[(%computer-literate 'Penelope)] succeeds because
-(a) it unified with
-@racket[(%computer-literate person)]; and then (b) with the binding
-@racket[[person . Penelope]] in place, @racket[(%knows person 'TeX)]
-unified with @racket[(%knows 'Penelope 'TeX)] and
-@racket[(%knows person 'Prolog)] unified with @racket[(%knows 'Penelope 'Prolog)].
-
-In contrast, the goal @racket[(%computer-literate 'Telemachus)]
-fails because, with @racket[[person . Telemachus]],
-the subgoals @racket[(%knows person 'Racket)] and
-@racket[(%knows person 'Prolog)] have no facts they can
-unify with.
-
-@subsection{The Occurs Check}
-
-A robust unification algorithm uses the @deftech{occurs check}, which ensures that a logic variable
-isn't bound to a structure that contains itself.  
-Not performing the check can cause the unification
-to go into an infinite loop in some cases.  On the
-other hand, performing the occurs check greatly
-increases the time taken by unification, even in cases
-that wouldn't require the check.
-
-Racklog uses the global parameter
-@racket[use-occurs-check?] to decide whether to
-use the occurs check.  By default, this variable is 
-@racket[#f], ie, Racklog disables the occurs check.  To
-enable the check, 
-
-@racketblock[
-(use-occurs-check? #t)
-]
-
-@section[#:tag "and-or"]{Conjuctions and Disjunctions}
-
-Goals may be combined using the forms @racket[%and]
-and @racket[%or]
-to form compound goals.  (For @racket[%not], see @secref{not}.)
-Eg,
-
-@interaction[#:eval racklog-eval
-(%which (x)
-  (%and (%member x '(1 2 3))
-        (%< x 3)))
-]
-
-gives solutions for @racket[_x] that satisfy both the
-argument goals of the @racket[%and].
-Ie, @racket[_x] should both be a member of @racket['(1 2 3)]
-@emph{and}  be less than @racket[3]. Typing @racket[(%more)] gives another solution:
-
-@interaction[#:eval racklog-eval
-(%more)
-(%more)
-]
-
-There are no more solutions, because @racket[[x 3]] satisfies
-the first but not the second goal.
-
-Similarly, the query
-
-@interaction[#:eval racklog-eval
-(%which (x)
-  (%or (%member x '(1 2 3))
-       (%member x '(3 4 5))))
-]
-
-lists all @racket[_x] that are members of either list.
-
-@interaction[#:eval racklog-eval
-(%more)
-(%more)
-(%more)
-(%more)
-(%more)
-]
-
-(Yes, @racket[([x 3])] is listed twice.)
-
-We can rewrite the predicate @racket[%computer-literate]
-from @secref{rules} using @racket[%and] and @racket[%or]:
-
-@racketblock+eval[#:eval racklog-eval
-(define %computer-literate
-  (%rel (person)
-    [(person)
-     (%or
-       (%and (%knows person
-	       'TeX)
-	     (%knows person
-	       'Racket))
-       (%and (%knows person
-	       'TeX)
-	     (%knows person
-	       'Prolog)))]))
-]
-
-Or,  more succinctly:
-
-@racketblock+eval[#:eval racklog-eval
-(define %computer-literate
-  (%rel (person)
-    [(person)
-      (%and (%knows person
-	      'TeX)
-        (%or (%knows person
-	       'Racket)
-	     (%knows person
-	       'Prolog)))]))
-]
-
-We can even dispense with the @racket[%rel] altogether:
-
-@racketblock+eval[#:eval racklog-eval
-(define %computer-literate
-  (lambda (person)
-    (%and (%knows person
-	    'TeX)
-      (%or (%knows person
-	     'Racket)
-	(%knows person
-	  'Prolog)))))
-]
-
-This last looks like a conventional Racket predicate
-definition, and is arguably
-the most readable format for a Racket programmer.
-
-@section[#:tag "lv-manip"]{Manipulating Racklog Variables}
-
-Racklog provides special predicates for probing logic
-variables, without risking their getting bound.
-
-@subsection[#:tag "var"]{Checking for Variables}
-
-The goal
-
-@racketblock[
-(%== _X _Y)
-]
-
-succeeds if @racket[_X] and @racket[_Y] are @emph{identical} objects.  This
-is not quite the unification predicate @racket[%=], for @racket[%==]
-doesn't touch unbound objects the way @racket[%=] does.  Eg,
-@racket[%==] will not equate an unbound logic variable with a
-bound one, nor will it equate two unbound logic variables
-unless they are the @emph{same} variable.
-
-The predicate @racket[%/==] is the negation of @racket[%==].
-
-The goal
-
-@racketblock[
-(%var _X)
-]
-
-succeeds if @racket[_X] isn't completely bound --- ie, it has at
-least one unbound logic variable in its innards.
-
-The predicate @racket[%nonvar] is the negation of @racket[%var].
-
-@subsection[#:tag "freeze"]{Preserving Variables}
-
-Racklog lets the user protect a term with variables from
-unification by allowing that term to be treated as a
-(completely) bound object.  The predicates provided for this
-purpose are
-@racket[%freeze],
-@racket[%melt], @racket[%melt-new], and @racket[%copy].
-
-The goal
-
-@racketblock[
-(%freeze _S _F)
-]
-
-unifies @racket[_F] to the frozen version of @racket[_S].  Any lack
-of bindings in @racket[_S] are preserved no matter how much you
-toss @racket[_F] about.
-
-The goal
-
-@racketblock[
-(%melt _F _S)
-]
-
-retrieves the object frozen in @racket[_F] into @racket[_S].
-
-The goal
-
-@racketblock[
-(%melt-new _F _S)
-]
-
-is similar to @racket[%melt],
-except that when @racket[_S] is made,  the unbound variables in
-@racket[_F] are replaced by brand-new unbound variables.
-
-The goal
-
-@racketblock[
-(%copy _S _C)
-]
-
-is an abbreviation for @racket[(%freeze _S _F)]
-followed by @racket[(%melt-new _F _C)].
-
-@section[#:tag "cut"]{The Cut (@racket[!])}
-
-The cut (called @racket[!]) is a special goal that is used to
-prune backtracking options.  Like the @racket[%true] goal, the
-cut goal too succeeds, when accosted by the Racklog
-subgoaling engine.  However, when a further subgoal down the
-line fails, and time comes to retry the cut goal, Racklog
-will refuse to try alternate clauses for the predicate in
-whose definition the cut occurs.  In other words, the cut
-causes Racklog to commit to all the decisions made from the
-time that the predicate was selected to match a subgoal till
-the time the cut was satisfied.
-
-For example, consider again the @racket[%factorial]
-predicate, as defined in @secref{is}:
-
-@racketblock+eval[#:eval racklog-eval
-(define %factorial
-  (%rel (x y x1 y1)
-    [(0 1)]
-    [(x y) (%is x1 (- x 1))
-           (%factorial x1 y1)
-           (%is y (* y1 x))]))
-]
-
-Clearly,
-
-@interaction[#:eval racklog-eval
-(%which ()
-  (%factorial 0 1))
-(%which (n)
-  (%factorial 0 n))
-]
-
-But what if we asked for @racket[(%more)] for either query?
-Backtracking will try
-the second clause of @racket[%factorial], and sure enough the
-clause-head unifies, producing binding @racket[[x . 0]].
-We now get three subgoals.  Solving the first, we get @racket[[x1 . -1]], and then we have to solve @racket[(%factorial -1 y1)].  It
-is easy to see there is no end to this, as we fruitlessly
-try to get the factorials of numbers that get more and more
-negative.
-
-If we placed a cut at the first clause:
-
-@racketblock[
-...
-[(0 1) !]
-...
-]
-
-the attempt to find more solutions for @racket[(%factorial 0 1)] is nipped in the bud.
-
-Calling @racket[%factorial] with a @emph{negative} number would still cause an
-infinite loop.   To take care of that problem as well, we
-use another cut:
-
-@racketblock+eval[#:eval racklog-eval
-(define %factorial
-  (%rel (x y x1 y1)
-    [(0 1) !]
-    [(x y) (%< x 0) ! %fail]
-    [(x y) (%is x1 (- x 1))
-           (%factorial x1 y1)
-           (%is y (* y1 x))]))
-]
-
-@interaction[#:eval racklog-eval
-(%which ()
-  (%factorial 0 1))
-(%more)
-(%which ()
-  (%factorial -1 1))
-]
-
-Using @emph{raw} cuts as above can get very confusing.  For this
-reason, it is advisable to use it hidden away in
-well-understood abstractions.  Two such common abstractions
-are the conditional and negation.
-
-@subsection[#:tag "if-then-else"]{Conditional Goals}
-
-An ``if ... then ... else ...'' predicate can be defined
-as follows
-
-@racketblock+eval[#:eval racklog-eval
-(define %if-then-else
-  (%rel (p q r)
-    [(p q r) p ! q]
-    [(p q r) r]))
-]
-
-(Note that for the first time we have predicate arguments that
-are themselves goals.)
-
-Consider the goal
-
-@racketblock[
-G0 = (%if-then-else Gbool Gthen Gelse)
-]
-
-We first unify @goal{G0} with the first clause-head,
-giving
-@racket[[p . Gbool]], @racket[[q . Gthen]], @racket[[r . Gelse]].  @goal{Gbool} can
-now either succeed or fail.
-
-Case 1:  If @goal{Gbool} fails, backtracking will cause the
-@goal{G0} to unify with the second clause-head.  @racket[r] is bound
-to @goal{Gelse}, and so @goal{Gelse} is tried, as expected.
-
-Case 2: If @goal{Gbool} succeeds, the cut commits to this
-clause of the @racket[%if-then-else].  We now try @goal{Gthen}.  If
-@goal{Gthen} should now fail --- or even if we simply retry for
-more solutions --- we are guaranteed that the second
-clause-head will not be tried.  If it were not for the cut,
-@goal{G0} would attempt to unify with the second clause-head, which will
-of course succeed, and @goal{Gelse} @emph{will} be tried.
-
-@subsection[#:tag "not"]{Negation as Failure}
-
-Another common abstraction using the cut is @emph{negation}.
-The negation of goal @goal{G} is defined as @racket[(%not G)], where
-the predicate @racket[%not] is defined as follows:
-
-@racketblock+eval[#:eval racklog-eval
-(define %not
-  (%rel ()
-    [(g) g ! %fail]
-    [(g) %true]))
-]
-
-Thus, @racket[g]'s negation is deemed a failure if @racket[g]
-succeeds, and a success if @racket[g] fails.  This is of course
-confusing goal failure with falsity.  In some cases, this
-view of negation is actually helpful.
-
-@section[#:tag "set-of"]{Set Predicates}
-
-The goal
-
-@racketblock[
-(%bag-of _X _G _Bag)
-]
-
-unifies with @racket[_Bag] the list of all instantiations of
-@racket[_X] for which @racket[_G] succeeds.  Thus, the following query
-asks for all the things known --- ie, the collection of things
-such that someone knows them:
-
-@interaction[#:eval racklog-eval
-(%which (things-known)
-  (%let (someone x)
-    (%bag-of x (%knows someone x)
-      things-known)))
-]
-
-This is the only solution for this goal:
-
-@interaction[#:eval racklog-eval
-(%more)
-]
-
-Note that some things --- eg, TeX --- are enumerated
-more than once.  This is because more than one person knows
-TeX.  To remove duplicates, use the predicate
-@racket[%set-of]
-instead of @racket[%bag-of]:
-
-@interaction[#:eval racklog-eval
-(%which (things-known)
-  (%let (someone x)
-    (%set-of x (%knows someone x)
-      things-known)))
-]
-
-In the above, the free variable @racket[_someone] in the
-@racket[%knows]-goal is used as if it
-were existentially quantified.  In contrast, Prolog's
-versions of
-@racket[%bag-of] and @racket[%set-of] fix it for each solution of the
-set-predicate goal.  We can do it too with some additional
-syntax that identifies the free variable.
-Eg,
-
-@interaction[#:eval racklog-eval
-(%which (someone things-known)
-  (%let (x)
-    (%bag-of x
-      (%free-vars (someone)
-        (%knows someone x))
-      things-known)))
-]
-
-The bag of things known by @emph{one} someone is
-returned.  That someone is Odysseus.  The query can be
-retried for more solutions, each listing the things known by
-a different someone:
-
-@interaction[#:eval racklog-eval
-(%more)
-(%more)
-(%more)
-(%more)
-]
-
-Racklog also provides two variants of these set predicates,
-viz., @racket[%bag-of-1] and @racket[%set-of-1].  These act like @racket[%bag-of]
-and @racket[%set-of] but fail if the resulting bag or set is empty.
-
-@section{Racklog Module Language}
-
-@defmodulelang[@racketmodname[racklog] #:module-paths (racklog/lang/lang)]
-
-This module language accepts the syntax of Datalog (except clauses need not be safe) and compiles each predicate to a relation.
-
-The accepted syntax is available in the @secref[#:doc '(lib "datalog/scribblings/datalog.scrbl")]{datalog} documentation.
-
-@section[#:tag "glossary"]{Glossary of Racklog Primitives}
-
-@(define-syntax (defpred stx)
-   (syntax-case stx ()
-     [(_ (id arg ...) pre ...)
-        (syntax/loc stx
-          (defproc (id arg ...)
-            goal/c
-            pre ...))]))
-@(define-syntax-rule (defgoal id pre ...)
-   (defthing id goal/c pre ...))
-
-@subsection{Racket Predicates}
-
-@defproc[(logic-var? [x any/c]) boolean?]{Identifies a logic variable.}
-
-@defproc[(atomic-struct? [x any/c]) boolean?]{
-  Identifies structures that the @racket[(current-inspector)] cannot inspect.}
-
-@defproc[(atom? [x any/c]) boolean?]{
-  Identifies atomic values that may appear in Racklog programs. Equivalent to
-  the contract @racket[(or/c boolean? number? string? bytes? char? symbol?
-  regexp? pregexp? byte-regexp? byte-pregexp? keyword? null? procedure? void?
-  set? atomic-struct?)].}
-
-@defproc[(compound-struct? [x any/c]) boolean?]{
-  Identifies structures that the @racket[(current-inspector)] can inspect.}
-
-@defproc[(compound? [x any/c]) boolean?]{
-  Identifies compound values that may appear in Racklog programs. Equivalent to
-  the contract
-  @racket[(or/c pair? vector? mpair? box? hash? compound-struct?)].}
-
-@defproc[(unifiable? [x any/c]) boolean?]{
-  Identifies values that may appear in Racklog programs. Essentialy either an
-  @racket[atom?], @racket[logic-var?], or @racket[compound?] that contains
-  @racket[unifiable?]s.}
-
-@defproc[(answer-value? [x any/c]) boolean?]{
-  Identifies values that may appear in @racket[answer?]. Essentially
-  @racket[unifiable?]s that do not contain @racket[logic-var?]s.}
-
-@defproc[(answer? [x any/c]) boolean?]{
-  Identifies answers returned by @racket[%more] and @racket[%which]. Equivalent
-  to the contract
-  @racket[(or/c false/c (listof (cons/c symbol? answer-value?)))].}
-
-@defthing[goal/c contract?]{A contract for goals.}
-
-@subsection{User Interface}
-
-@defform[(%which (V ...) G ...)
-         #:contracts ([V identifier?]
-                      [G goal/c])]{
-Returns an @racket[answer?]
-of the variables @racket[V], ..., that satisfies all of @racket[G],
-...  If @racket[G], ..., cannot be satisfied, returns @racket[#f].
-Calling the thunk @racket[%more] produces more
-instantiations, if available.}
-
-@defproc[(%more) answer?]{
-The thunk @racket[%more] produces more instantiations of the
-variables in the most recent @racket[%which]-form that satisfy the
-goals in that @racket[%which]-form.  If no more solutions can
-be found, @racket[%more] returns @racket[#f].}
-
-@defform[(%find-all (V ...) G ...)
-         #:contracts ([V identifier?]
-                      [G goal/c])]{
-Like @racket[(list (%which (V ...) G ...) (%more) ...)] with as many @racket[(%more)]s as there are answers. (This will not terminate if there are an infinite number of answers.)
-}
-
-@subsection{Relations}
-
-@defform/subs[(%rel (V ...) clause ...)
-              ([clause [(E ...) G ...]])
-              #:contracts ([V identifier?]
-                           [E expression?]
-                           [G goal/c])]{
-Returns a predicate function.  Each clause @racket[C] signifies that
-the goal created by applying the predicate object to anything that
-matches @racket[(E ...)] is deemed to succeed if all the goals
-@racket[G], ..., can, in their turn, be shown to succeed. The
-variables @racket[V], ..., are local logic variables for
-@racket[clause], ....}
-
-@defpred[(%empty-rel [E unifiable?] ...)]{
-The goal @racket[(%empty-rel E ...)] always fails.  The @emph{value}
-@racket[%empty-rel] is used as a starting value for predicates
-that can later be enhanced with @racket[%assert!] and @racket[%assert-after!].}
-
-@defform[(%assert! Pname (V ...) clause ...)
-         #:contracts ([Pname identifier?]
-                      [V identifier?])]{
-Adds the clauses
-@racket[clauses], ..., to the @emph{end} of the predicate that is the value of
-the Racket variable @racket[Pname].  The variables @racket[V], ..., are
-local logic variables for @racket[clause], ....}
-
-@defform[(%assert-after! Pname (V ...) clause ...)
-         #:contracts ([Pname identifier?]
-                      [V identifier?])]{
-Like @racket[%assert!], but adds the new clauses to the @emph{front}
-of the existing predicate.}
-
-@subsection{Racklog Variables}
-
-@defproc[(_) logic-var?]{
-A thunk that produces a new logic variable.  Can be
-used in situations where we want a logic variable but
-don't want to name it.  (@racket[%let], in contrast, introduces new
-lexical names for the logic variables it creates.)
-}
-
-@defform[(%let (V ...) expr ...)
-         #:contracts ([V identifier?])]{
-Introduces @racket[V], ..., as
-lexically scoped logic variables to be used in @racket[expr], ...}
-
-@subsection{Cut}
-
-@defform[(%cut-delimiter . any)]{
-Introduces a cut point. See @secref{cut}.}
-
-@defidform[!]{
-The cut goal, see @secref{cut}.
-
-May only be used syntactically inside @racket[%cut-delimiter] or @racket[%rel].}
-
-@subsection{Racklog Operators}
-
-@defgoal[%fail]{
-The goal @racket[%fail] always fails.}
-
-@defgoal[%true]{
-The goal @racket[%true] succeeds.  Fails on retry.}
-
-@defpred[(%repeat)]{
-The goal @racket[(%repeat)] always succeeds (even on retries).
-Useful for failure-driven loops.}
-
-@defform[(%and G ...) #:contracts ([G goal/c])]{
-The goal @racket[(%and G ...)] succeeds if all the goals
-@racket[G], ..., succeed.}
-
-@defform[(%or G ...) #:contracts ([G goal/c])]{
-The goal @racket[(%or G ...)] succeeds if one of @racket[G], ..., tried
-in that order, succeeds.}
-
-@defpred[(%not [G goal/c])]{
-The goal @racket[(%not G)] succeeds if @racket[G] fails.}
-
-@defpred[(%if-then-else [G1 goal/c] [G2 goal/c] [G3 goal/c])]{
-The goal @racket[(%if-then-else G1 G2 G3)] tries @racket[G1] first: if it
-succeeds, tries @racket[G2]; if not, tries @racket[G3].}
-
-@subsection{Unification}
-
-@defpred[(%= [E1 unifiable?] [E2 unifiable?])]{
-The goal @racket[(%= E1 E2)] succeeds if @racket[E1] can be unified with
-@racket[E2].  Any resulting bindings for logic variables are kept.}
-
-@defpred[(%/= [E1 unifiable?] [E2 unifiable?])]{@racket[%/=] is the negation of @racket[%=].
-The goal @racket[(%/= E1 E2)] succeeds if @racket[E1] can not be unified
-with @racket[E2].}
-
-@defpred[(%== [E1 unifiable?] [E2 unifiable?])]{
-The goal @racket[(%== E1 E2)] succeeds if @racket[E1] is @emph{identical}
-to @racket[E2].  They should be structurally equal.  If containing
-logic variables, they should have the same variables in the
-same position.  Unlike a @racket[%=]-call, this goal will not bind
-any logic variables.}
-
-@defpred[(%/== [E1 unifiable?] [E2 unifiable?])]{
-@racket[%/==] is the negation of @racket[%==].
-The goal @racket[(%/== E1 E2)] succeeds if @racket[E1] and @racket[E2] are not
-identical.}
-
-@defform[(%is E1 E2)]{
-The goal @racket[(%is E1 E2)] unifies with @racket[E1] the result of
-evaluating @racket[E2] as a Racket expression.  @racket[E2] may contain
-logic variables, which are dereferenced automatically.
-Fails if @racket[E2] contains unbound logic variables.}
-
-@defparam[use-occurs-check? on? boolean?]{
-If this is false (the default), 
-Racklog's unification will not use the occurs check.
-If it is true, the occurs check is enabled.}
-
-@subsection{Numeric Predicates}
-
-@defpred[(%< [E1 unifiable?] [E2 unifiable?])]{
-The goal @racket[(%< E1 E2)] succeeds if @racket[E1] and @racket[E2] are bound to
-numbers and @racket[E1] is less than @racket[E2].}
-
-@defpred[(%<= [E1 unifiable?] [E2 unifiable?])]{
-The goal @racket[(%<= E1 E2)] succeeds if @racket[E1] and @racket[E2] are bound to
-numbers and @racket[E1] is less than or equal to @racket[E2].}
-
-@defpred[(%=/= [E1 unifiable?] [E2 unifiable?])]{
-The goal @racket[(%=/= E1 E2)] succeeds if @racket[E1] and @racket[E2] are bound to
-numbers and @racket[E1] is not equal to @racket[E2].}
-
-@defpred[(%=:= [E1 unifiable?] [E2 unifiable?])]{
-The goal @racket[(%=:= E1 E2)] succeeds if @racket[E1] and @racket[E2] are bound to
-numbers and @racket[E1] is equal to @racket[E2].}
-
-@defpred[(%> [E1 unifiable?] [E2 unifiable?])]{
-The goal @racket[(%> E1 E2)] succeeds if @racket[E1] and @racket[E2] are bound to
-numbers and @racket[E1] is greater than @racket[E2].}
-
-@defpred[(%>= [E1 unifiable?] [E2 unifiable?])]{
-The goal @racket[(%>= E1 E2)] succeeds if @racket[E1] and @racket[E2] are bound to
-numbers and @racket[E1] is greater than or equal to @racket[E2].}
-
-@subsection{List Predicates}
-
-@defpred[(%append [E1 unifiable?] [E2 unifiable?] [E3 unifiable?])]{
-The goal @racket[(%append E1 E2 E3)] succeeds if @racket[E3] is unifiable
-with the list obtained by appending @racket[E1] and @racket[E2].}
-
-@defpred[(%member [E1 unifiable?] [E2 unifiable?])]{
-The goal @racket[(%member E1 E2)] succeeds if @racket[E1] is a member
-of the list in @racket[E2].}
-
-@subsection{Set Predicates}
-
-@defpred[(%set-of [E1 unifiable?] [G goal/c] [E2 unifiable?])]{
-The goal @racket[(%set-of E1 G E2)] unifies with @racket[E2] the @emph{set}
-of all the
-instantiations of @racket[E1] for which goal @racket[G] succeeds.}
-
-@defpred[(%set-of-1 [E1 unifiable?] [G goal/c] [E2 unifiable?])]{
-Similar to @racket[%set-of], but fails if the set is empty.}
-
-@defpred[(%bag-of [E1 unifiable?] [G goal/c] [E2 unifiable?])]{
-The goal @racket[(%bag-of E1 G E2)] unifies with @racket[E2] the @emph{bag}
-(multiset)
-of all the
-instantiations of @racket[E1] for which goal @racket[G] succeeds.}
-
-@defpred[(%bag-of-1 [E1 unifiable?] [G goal/c] [E2 unifiable?])]{
-Similar to @racket[%bag-of], but fails if the bag is empty.}
-
-@defform[(%free-vars (V ...) G)
-         #:contracts ([V identifier?]
-                      [G goal/c])]{
-Identifies
-the occurrences of the variables @racket[V], ..., in goal
-@racket[G] as free.  It is used to avoid existential quantification
-in calls to set predicates (@racket[%bag-of], @racket[%set-of], &c.).}
-
-@subsection{Racklog Predicates}
-
-@defpred[(%compound [E unifiable?])]{
-The goal @racket[(%compound E)] succeeds if @racket[E] is a compound
-value.}
-
-@defpred[(%constant [E unifiable?])]{
-The goal @racket[(%constant E)] succeeds if @racket[E] is an atomic
-value.}
-
-@defpred[(%var [E unifiable?])]{
-The goal @racket[(%var E)] succeeds if @racket[E] is not completely
-instantiated, ie, it has at least one unbound variable in
-it.}
-
-@defpred[(%nonvar [E unifiable?])]{
-@racket[%nonvar] is the negation of @racket[%var].
-The goal @racket[(%nonvar E)] succeeds if @racket[E] is completely
-instantiated, ie, it has no unbound variable in it.}
-
-@subsection{Racklog Variable Manipulation}
-
-@defpred[(%freeze [S unifiable?] [F unifiable?])]{
-The goal @racket[(%freeze S F)] unifies with @racket[F] a new frozen
-version of the structure in @racket[S].  Freezing implies that all
-the unbound variables are preserved.  @racket[F] can henceforth be
-used as @emph{bound} object with no fear of its variables
-getting bound by unification.}
-
-@defpred[(%melt [F unifiable?] [S unifiable?])]{
-The goal @racket[(%melt F S)] unifies @racket[S] with the thawed
-(original) form of the frozen structure in @racket[F].}
-
-@defpred[(%melt-new [F unifiable?] [S unifiable?])]{
-The goal @racket[(%melt-new F S)] unifies @racket[S] with a thawed
-@emph{copy} of the frozen structure in @racket[F].  This means
-new logic variables are used for unbound logic variables in
-@racket[F].}
-
-@defpred[(%copy [F unifiable?] [S unifiable?])]{
-The goal @racket[(%copy F S)] unifies with @racket[S] a copy of the
-frozen structure in @racket[F].}
-
-@bibliography[
- @bib-entry[#:key "aop" 
-                  #:author "Leon Sterling and Ehud Shapiro"
-                  #:url "http://mitpress.mit.edu/books/art-prolog"
-                  #:title "The Art of Prolog, 2nd Edition"
-                  #:location "MIT Press"
-                  #:date "1994"
-                  #:is-book? #t]
- @bib-entry[#:key "bratko"
-                  #:author "Ivan Bratko"
-                  #:title "Prolog Programming for Artificial Intelligence"
-                  #:location "Addison-Wesley"
-                  #:date "1986"
-                  #:is-book? #t]
- @bib-entry[#:key "campbell"
-    #:author "J A Campbell (editor)"
-    #:title "Implementations of Prolog"
-    #:location "Ellis Horwood"
-    #:date "1984"
-    #:is-book? #t]
- @bib-entry[#:key "ok:prolog"
-    #:author "Richard A O'Keefe"
-    #:url "http://mitpress.mit.edu/books/craft-prolog"
-    #:title "The Craft of Prolog"
-    #:location "MIT Press"
-    #:date "1990"
-    #:is-book? #t]
- @bib-entry[#:key "logick"
-    #:author "Christopher T Haynes"
-    #:title "Logic continuations"
-    #:location "J Logic Program, vol 4, 157--176"
-    #:date "1987"]
- @bib-entry[#:key "mf:prolog"
-    #:author "Matthias Felleisen"
-    #:title "Transliterating Prolog into Scheme"
-    #:location "Indiana U Comp Sci Dept Tech Report #182"
-    #:date "1985"]
- ]
-
-
-@close-eval[racklog-eval]
diff --git a/pkgs/racklog/tests/bible.rkt b/pkgs/racklog/tests/bible.rkt
deleted file mode 100644
index 08be619a6f..0000000000
--- a/pkgs/racklog/tests/bible.rkt
+++ /dev/null
@@ -1,145 +0,0 @@
-#lang racket
-
-(require racklog
-         rackunit)
-
-;The following is the "Biblical" database from "The Art of
-;Prolog", Sterling & Shapiro, ch. 1.
-
-;(%father X Y) :- X is the father of Y.
-
-(define %father
-  (%rel ()
-    (('terach 'abraham)) (('terach 'nachor)) (('terach 'haran))
-    (('abraham 'isaac)) (('haran 'lot)) (('haran 'milcah))
-    (('haran 'yiscah))))
-
-;(%mother X Y) :- X is the mother of Y.
-
-(define %mother
-  (%rel () (('sarah 'isaac))))
-
-(define %male
-  (%rel ()
-    (('terach)) (('abraham)) (('isaac)) (('lot)) (('haran)) (('nachor))))
-
-(define %female
-  (%rel ()
-    (('sarah)) (('milcah)) (('yiscah))))
-
-;AoP, ch. 17.  Finding all the children of a particular
-;father.  (%children F CC) :- CC is the list of children
-;whose father is F.  First approach: %children-1 uses an
-;auxiliary predicate %children-aux, which uses an
-;accumulator.
-
-(define %children-1
-
-  (letrec ((children-aux
-	     (%rel (x a cc c)
-	       ((x a cc)
-                 (%father x c) (%not (%member c a)) !
-                 (children-aux x (cons c a) cc))
-	       ((x cc cc)))))
-
-    (%rel (x cc)
-      ((x cc) (children-aux x '() cc)))))
-
-(define terachs-kids-test
-  ;find all the children of Terach.  Returns
-  ;cc = (abraham nachor haran)
-  (lambda ()
-    (%which (cc)
-      (%children-1 'terach cc))))
-
-(check-equal? (terachs-kids-test)
-              `((cc . (haran nachor abraham))))
-
-(define dad-kids-test
-  ;find a father and all his children.  Returns
-  ;f = terach, cc = (haran nachor abraham).
-  ;(%more) fails, showing flaw in %children-1.
-  ;see AoP, ch. 17, p. 267
-  (lambda ()
-    (%which (f cc)
-      (%children-1 f cc))))
-
-(check-equal? (dad-kids-test)
-              `((f . terach) (cc . (haran nachor abraham))))
-
-(define terachs-kids-test-2
-  ;find all the kids of Terach, using %set-of.
-  ;returns kk = (abraham nachor haran)
-  (lambda ()
-    (%let (k)
-      (%which (kk)
-        (%set-of k (%father 'terach k) kk)))))
-
-(check-equal? (terachs-kids-test-2)
-              `((kk . (abraham nachor haran))))
-
-;This is a better definition of the %children predicate.
-;Uses set predicate %bag-of
-
-(define %children
-  (%rel (x kids c)
-    ((kids) (%set-of c (%father x c) kids))))
-
-(define dad-kids-test-2
-  ;find each dad-kids combo.
-  ;1st soln: dad = terach, kids = (abraham nachor haran)
-  ;(%more) gives additional solutions.
-  (lambda ()
-    (%let (x)
-      (%which (dad kids)
-        (%set-of x (%free-vars (dad)
-                     (%father dad x))
-          kids)))))
-
-(check-equal? (dad-kids-test-2)
-              `((dad . terach) (kids . (abraham nachor haran))))
-
-(define dad-kids-test-3
-  ;looks like dad-kids-test-2, but dad is now
-  ;existentially quantified.  returns a set of
-  ;kids (i.e., anything with a father)
-  (lambda ()
-    (%let (x)
-      (%which (dad kids)
-        (%set-of x (%father dad x)
-          kids)))))
-
-(check-equal? (dad-kids-test-3)
-              `((dad . _) (kids . (abraham nachor haran isaac lot milcah yiscah))))
-
-(define dad-kids-test-4
-  ;find the set of dad-kids.
-  ;since dad is existentially quantified,
-  ;this gives the wrong answer: it gives
-  ;one set containing all the kids
-  (lambda ()
-    (%let (dad kids x)
-      (%which (dad-kids)
-	(%set-of (list dad kids)
-	  (%set-of x (%father dad x) kids)
-	  dad-kids)))))
-
-(check-equal? (dad-kids-test-4)
-              `((dad-kids . ((_ (abraham nachor haran isaac lot milcah yiscah))))))
-
-(define dad-kids-test-5
-  ;the correct solution.  dad is
-  ;identified as a free var.
-  ;returns a set of dad-kids, one for
-  ;each dad
-  (lambda ()
-    (%let (dad kids x)
-      (%which (dad-kids)
-	(%set-of (list dad kids)
-	  (%set-of x (%free-vars (dad)
-                       (%father dad x))
-            kids)
-	  dad-kids)))))
-
-(check-equal? (dad-kids-test-5)
-              `((dad-kids . ((terach (abraham nachor haran)) (abraham (isaac)) (haran (lot milcah yiscah))))))
diff --git a/pkgs/racklog/tests/england.rkt b/pkgs/racklog/tests/england.rkt
deleted file mode 100644
index 4580f88f4f..0000000000
--- a/pkgs/racklog/tests/england.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket
-
-(require racklog
-         rackunit)
-
-;The following is a simple database about a certain family in England.
-;Should be a piece of cake, but given here so that you can hone
-;your ability to read the syntax.
-
-;This file is written using `%rel' for a more Prolog-like syntax.
-;The file england2.scm uses a Scheme-like syntax.
-
-(define %male
-  (%rel ()
-    (('philip)) (('charles)) (('andrew)) (('edward))
-    (('mark)) (('william)) (('harry)) (('peter))))
-
-(define %female
-  (%rel ()
-    (('elizabeth)) (('anne)) (('diana)) (('sarah)) (('zara))))
-
-(define %husband-of
-  (%rel ()
-    (('philip 'elizabeth)) (('charles 'diana))
-    (('mark 'anne)) (('andrew 'sarah))))
-
-(define %wife-of
-  (%rel (w h)
-    ((w h) (%husband-of h w))))
-
-(define %married-to
-  (%rel (x y)
-    ((x y) (%husband-of x y))
-    ((x y) (%wife-of x y))))
-
-(define %father-of
-  (%rel ()
-   (('philip 'charles)) (('philip 'anne)) (('philip 'andrew))
-   (('philip 'edward)) (('charles 'william)) (('charles 'harry))
-   (('mark 'peter)) (('mark 'zara))))
-
-(define %mother-of
-  (%rel (m c f)
-    ((m c) (%wife-of m f) (%father-of f c))))
-
-(define %child-of
-  (%rel (c p)
-    ((c p) (%father-of p c))
-    ((c p) (%mother-of p c))))
-
-(define %parent-of
-  (%rel (p c)
-    ((p c) (%child-of c p))))
-
-(define %brother-of
-  (%rel (b x f)
-    ((b x) (%male b) (%father-of f b) (%father-of f x) (%/= b x))))
diff --git a/pkgs/racklog/tests/england2.rkt b/pkgs/racklog/tests/england2.rkt
deleted file mode 100644
index efe83286ea..0000000000
--- a/pkgs/racklog/tests/england2.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang racket
-
-(require racklog)
-
-;The following is a simple database about a certain family in England.
-;Should be a piece of cake, but given here so that you can hone
-;your ability to read the syntax.
-
-;This file is written using goal combinations like %or, %and
-;like you would use Scheme procedures.  For a more Prolog-like
-;syntax of the same program, see england.scm.
-
-(define %male
-  (lambda (x)
-    (%or (%= x 'philip)
-	 (%= x 'charles)
-	 (%= x 'andrew)
-	 (%= x 'edward)
-	 (%= x 'mark)
-	 (%= x 'william)
-	 (%= x 'harry)
-	 (%= x 'peter))))
-
-(define %female
-  (lambda (x)
-    (%or (%= x 'elizabeth)
-	 (%= x 'anne)
-	 (%= x 'diana)
-	 (%= x 'sarah)
-	 (%= x 'zara))))
-
-(define %husband-of
-  (lambda (h w)
-    (%or (%and (%= h 'philip) (%= w 'elizabeth))
-	 (%and (%= h 'charles) (%= w 'diana))
-	 (%and (%= h 'mark) (%= w 'anne))
-	 (%and (%= h 'andrew) (%= w 'sarah)))))
-
-(define %wife-of
-  (lambda (w h)
-    (%husband-of h w)))
-
-(define %married-to
-  (lambda (x y)
-    (%or (%husband-of x y) (%wife-of x y))))
-
-(define %father-of
-  (lambda (x y)
-    (%or (%and (%= x 'philip) (%= y 'charles))
-	 (%and (%= x 'philip) (%= y 'anne))
-	 (%and (%= x 'philip) (%= y 'andrew))
-	 (%and (%= x 'philip) (%= y 'edward))
-	 (%and (%= x 'charles) (%= y 'william))
-	 (%and (%= x 'charles) (%= y 'harry))
-	 (%and (%= x 'mark) (%= y 'peter))
-	 (%and (%= x 'mark) (%= y 'zara)))))
-
-(define %mother-of
-  (lambda (m c)
-    (%let (f)
-      (%and (%wife-of m f) (%father-of f c)))))
-
-(define %child-of
-  (lambda (c p)
-    (%or (%father-of p c) (%mother-of p c))))
-
-(define %parent-of
-  (lambda (p c)
-    (%child-of c p)))
-
-(define %brother-of
-  (lambda (b x)
-    (%let (f)
-      (%and (%male b)
-	    (%father-of f b)
-	    (%father-of f x)
-	    (%/= b x)))))
-
diff --git a/pkgs/racklog/tests/fac.rkt b/pkgs/racklog/tests/fac.rkt
deleted file mode 100644
index 545d7a8af4..0000000000
--- a/pkgs/racklog/tests/fac.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket
-(require racklog tests/eli-tester)
-
-(define %factorial
-  (%rel (x y x1 y1)
-        [(0 1) !]
-        [(x y) (%< x 0) ! %fail]
-        [(x y) (%is x1 (- x 1))
-               (%factorial x1 y1)
-               (%is y (* y1 x))]))
-
-(test
- (%which ()
-         (%factorial 0 1))
- => empty
- (%more)
- => #f
- 
- (%which ()
-         (%factorial -1 1))
- => #f
- (%which (x)
-         (%factorial 3 x))
- => `((x . 6))
- (%more)
- => #f)
diff --git a/pkgs/racklog/tests/games.rkt b/pkgs/racklog/tests/games.rkt
deleted file mode 100644
index 4697404ff7..0000000000
--- a/pkgs/racklog/tests/games.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang racket
-
-(require racklog
-         "./puzzle.rkt"
-         rackunit)
-
-;;This example is from Sterling & Shapiro, p. 214.
-;;
-;;The problem reads: Three friends came first, second and
-;;third in a competition.  Each had a different name, liked a
-;;different sport, and had a different nationality.  Michael
-;;likes basketball, and did better than the American.  Simon,
-;;the Israeli, did better than the tennis player.  The
-;;cricket player came first.  Who's the Australian?  What
-;;sport does Richard play?
-
-(define person
-  ;;a structure-builder for persons
-  (lambda (name country sport)
-    (list 'person name country sport)))
-
-(define %games
-  (%rel (clues queries solution the-men
-	 n1 n2 n3 c1 c2 c3 s1 s2 s3)
-    ((clues queries solution)
-     (%= the-men
-       (list (person n1 c1 s1) (person n2 c2 s2) (person n3 c3 s3)))
-     (%games-clues the-men clues)
-     (%games-queries the-men queries solution))))
-    
-(define %games-clues
-  (%rel (the-men clue1-man1 clue1-man2 clue2-man1 clue2-man2 clue3-man)
-    ((the-men
-       (list
-	 (%did-better clue1-man1 clue1-man2 the-men)
-	 (%name clue1-man1 'michael)
-	 (%sport clue1-man1 'basketball)
-	 (%country clue1-man2 'usa)
-
-	 (%did-better clue2-man1 clue2-man2 the-men)
-	 (%name clue2-man1 'simon)
-	 (%country clue2-man1 'israel)
-	 (%sport clue2-man2 'tennis)
-
-	 (%first the-men clue3-man)
-	 (%sport clue3-man 'cricket))))))
-
-(define %games-queries
-  (%rel (the-men man1 man2 aussies-name dicks-sport)
-    ((the-men
-       (list
-	 (%member man1 the-men)
-	 (%country man1 'australia)
-	 (%name man1 aussies-name)
-
-	 (%member man2 the-men)
-	 (%name man2 'richard)
-	 (%sport man2 dicks-sport))
-       (list
-	 (list aussies-name 'is 'the 'australian)
-	 (list 'richard 'plays dicks-sport))))))
-	 
-(define %did-better
-  (%rel (a b c)
-    ((a b (list a b c)))
-    ((a c (list a b c)))
-    ((b c (list a b c)))))
-
-(define %name
-  (%rel (name country sport)
-    (((person name country sport) name))))
-
-(define %country
-  (%rel (name country sport)
-    (((person name country sport) country))))
-
-(define %sport
-  (%rel (name country sport)
-    (((person name country sport) sport))))
-
-(define %first
-  (%rel (car cdr)
-    (((cons car cdr) car))))
-
-;;With the above as the database, and also loading the file
-;;puzzle.scm containing the puzzle solver, we merely need to
-;;ask (solve-puzzle %games) to get the solution, which is
-;;
-;;((michael is the australian) (richard plays tennis))
-
-(check-equal? (solve-puzzle %games)
-              '((solution= . ((michael is the australian) (richard plays tennis)))))
diff --git a/pkgs/racklog/tests/holland.rkt b/pkgs/racklog/tests/holland.rkt
deleted file mode 100644
index 239a48eddf..0000000000
--- a/pkgs/racklog/tests/holland.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket
-
-(require racklog
-         tests/eli-tester)
-
-;This is a very trivial program.  In Prolog, it would be:
-;
-;    city(amsterdam).
-;    city(brussels).
-;    country(holland).
-;    country(belgium).
-
-(define %city
-  (lambda (x)
-    (%or (%= x 'amsterdam)
-         (%= x 'brussels))))
-
-(define %country
-  (lambda (x)
-    (%or (%= x 'holland)
-         (%= x 'belgium))))
-
-;For a more Prolog-style syntax, you can rewrite the same thing,
-;using the `%rel' macro, as the following:
-
-(define %city*
-  (%rel ()
-        (('amsterdam))
-        (('brussels))))
-
-(define %country*
-  (%rel ()
-        (('holland))
-        (('belgium))))
-
-;Typical easy queries:
-(test 
- (%which (x) (%city x)) 
- (%more)  
- (%more) => #f
- (%which (x) (%country x))
- (%more) 
- (%more) => #f
- (%which () (%city 'amsterdam))
- (%more) => #f
- (%which () (%country 'amsterdam)) => #f)
diff --git a/pkgs/racklog/tests/houses.rkt b/pkgs/racklog/tests/houses.rkt
deleted file mode 100644
index 54a369318e..0000000000
--- a/pkgs/racklog/tests/houses.rkt
+++ /dev/null
@@ -1,148 +0,0 @@
-#lang racket
-
-(require racklog)
-
-;Exercise 14.1 (iv) from Sterling & Shapiro, p. 217-8  
-
-;There are 5 houses, each of a different color and inhabited
-;by a man of a different nationality, with a different pet,
-;drink and cigarette choice.
-;
-;1. The Englishman lives in the red house
-;2. The Spaniard owns the dog
-;3. Coffee is drunk in the green house
-;4. The Ukrainian drinks tea
-;5. The green house is to the immediate right of the ivory house
-;6. The Winston smoker owns snails
-;7. Kools are smoked in the yellow house
-;8. Milk is drunk in the middle house
-;9. The Norwegian lives in the first house on the left
-;10. The Chesterfield smoker lives next to the man with the fox
-;11. Kools are smoked in the house adjacent to the horse's place
-;12. The Lucky Strike smoker drinks orange juice
-;13. The Japanese smokes Parliaments
-;14. The Norwegian lives next to the blue house
-
-;Who owns the zebra?  Who drinks water?
-
-(define house
-  (lambda (hue nation pet drink cigarette)
-    (list 'house hue nation pet drink cigarette)))
-
-(define %hue (%rel (h) (((house h (_) (_) (_) (_)) h))))
-(define %nation (%rel (n) (((house (_) n (_) (_) (_)) n))))
-(define %pet (%rel (p) (((house (_) (_) p (_) (_)) p))))
-(define %drink (%rel (d) (((house (_) (_) (_) d (_)) d))))
-(define %cigarette (%rel (c) (((house (_) (_) (_) (_) c) c))))
-
-(define %adjacent
-  (%rel (a b)
-    ((a b (list a b (_) (_) (_))))
-    ((a b (list (_) a b (_) (_))))
-    ((a b (list (_) (_) a b (_))))
-    ((a b (list (_) (_) (_) a b)))))
-
-(define %middle
-  (%rel (a)
-    ((a (list (_) (_) a (_) (_))))))
-
-(define %houses
-  (%rel (row-of-houses clues queries solution
-	 h1 h2 h3 h4 h5 n1 n2 n3 n4 n5 p1 p2 p3 p4 p5
-	 d1 d2 d3 d4 d5 c1 c2 c3 c4 c5)
-    ((clues queries solution)
-     (%= row-of-houses
-       (list
-	 (house h1 n1 p1 d1 c1)
-	 (house h2 n2 p2 d2 c2)
-	 (house h3 n3 p3 d3 c3)
-	 (house h4 n4 p4 d4 c4)
-	 (house h5 n5 p5 d5 c5)))
-     (%houses-clues row-of-houses clues)
-     (%houses-queries row-of-houses queries solution))))
-
-(define %houses-clues
-  (%rel (row-of-houses abode1 abode2 abode3 abode4 abode5 abode6 abode7
-	 abode8 abode9 abode10 abode11 abode12 abode13 abode14 abode15)
-    ((row-of-houses
-       (list
-	 (%member abode1 row-of-houses)
-	 (%nation abode1 'english)
-	 (%hue abode1 'red)
-
-	 (%member abode2 row-of-houses)
-	 (%nation abode2 'spain)
-	 (%pet abode2 'dog)
-
-	 (%member abode3 row-of-houses)
-	 (%drink abode3 'coffee)
-	 (%hue abode3 'green)
-
-	 (%member abode4 row-of-houses)
-	 (%nation abode4 'ukraine)
-	 (%drink abode4 'tea)
-
-	 (%member abode5 row-of-houses)
-	 (%adjacent abode5 abode3 row-of-houses)
-	 (%hue abode5 'ivory)
-
-	 (%member abode6 row-of-houses)
-	 (%cigarette abode6 'winston)
-	 (%pet abode6 'snail)
-
-	 (%member abode7 row-of-houses)
-	 (%cigarette abode7 'kool)
-	 (%hue abode7 'yellow)
-
-	 (%= (list (_) (_) abode8 (_) (_)) row-of-houses)
-	 (%drink abode8 'milk)
-
-	 (%= (list abode9 (_) (_) (_) (_)) row-of-houses)
-	 (%nation abode9 'norway)
-
-	 (%member abode10 row-of-houses)
-	 (%member abode11 row-of-houses)
-	 (%or (%adjacent abode10 abode11 row-of-houses)
-	   (%adjacent abode11 abode10 row-of-houses))
-	 (%cigarette abode10 'chesterfield)
-	 (%pet abode11 'fox)
-
-	 (%member abode12 row-of-houses)
-	 (%or (%adjacent abode7 abode12 row-of-houses) 
-	   (%adjacent abode12 abode7 row-of-houses))
-	 (%pet abode12 'horse)
-
-	 (%member abode13 row-of-houses)
-	 (%cigarette abode13 'lucky-strike)
-	 (%drink abode13 'oj)
-
-	 (%member abode14 row-of-houses)
-	 (%nation abode14 'japan)
-	 (%cigarette abode14 'parliament)
-
-	 (%member abode15 row-of-houses)
-	 (%or (%adjacent abode9 abode15 row-of-houses) 
-	   (%adjacent abode15 abode9 row-of-houses))
-	 (%hue abode15 'blue))))))
-
-(define %houses-queries
-  (%rel (row-of-houses abode1 abode2 zebra-owner water-drinker)
-    ((row-of-houses
-       (list
-	 (%member abode1 row-of-houses)
-	 (%pet abode1 'zebra)
-	 (%nation abode1 zebra-owner)
-
-	 (%member abode2 row-of-houses)
-	 (%drink abode2 'water)
-	 (%nation abode2 water-drinker))
-
-       (list (list zebra-owner 'owns 'the 'zebra)
-	 (list water-drinker 'drinks 'water))))))
-
-;Note: Perhaps there is a way to rewrite the 
-;program so that it doesn't rely on the occurs check.
-
-(require "puzzle.rkt" tests/eli-tester)
-(use-occurs-check? #t)
-(test (solve-puzzle %houses))
diff --git a/pkgs/racklog/tests/is.rkt b/pkgs/racklog/tests/is.rkt
deleted file mode 100644
index c9797ddcd4..0000000000
--- a/pkgs/racklog/tests/is.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang racket
-(require racklog
-         racket/stxparam
-         tests/eli-tester)
-
-(define-syntax-parameter Y 
-  (λ (stx)
-    (raise-syntax-error stx 'Y "not allowed outside test-%is")))
-(define-syntax (test-%is stx)
-  (syntax-case stx ()
-    [(_ e)
-     (with-syntax ([the-y #'y])
-       #`(test #:failure-prefix (format "~a" 'e)
-               (test
-                (%which (x)
-                        (syntax-parameterize
-                         ([Y (λ (stx) #'1)])
-                         (%is x e))) => `([x . 1])
-                                     (%more) => #f)
-               #:failure-prefix (format "~a (let)" 'e)
-               (test
-                (%which (x) 
-                        (%let (the-y) 
-                              (%and (%= the-y 1) 
-                                    (syntax-parameterize
-                                     ([Y (make-rename-transformer #'the-y)])
-                                     (%is x e)))))
-                => `([x . 1])
-                (%more) => #f)))]))
-
-(define top-z 1)
-
-(test
- (test-%is Y)
- (let ([z 1]) (test-%is z))
- (test-%is ((λ (x) x) Y))
- (test-%is ((λ (x) Y) 2))
- (test-%is ((case-lambda [(x) x]) Y))
- (test-%is ((case-lambda [(x) Y]) 2))
- (test-%is (+ 0 Y))
- (test-%is (if #t Y 2))
- (test-%is (if #f 2 Y))
- (test-%is (begin Y))
- (test-%is (begin0 Y 2))
- (test-%is (let ([z Y]) z))
- (test-%is (let ([z 2]) Y))
- (test-%is (letrec ([z Y]) z))
- (test-%is (letrec ([z 2]) Y))
- (let ([z 2])
-   (test-%is (begin (set! z Y) z)))
- (test-%is '1)
- (%which (x) (%let (y) (%and (%= y 1) (%is x 'y)))) => `([x . y])
- (%more) => #f
- (%which (x) (%let (y) (%and (%= y 1) (%is x #'1)))) 
- ;=> `([x . ,#'1])
- (%more) => #f
- (%which (x) (%let (y) (%and (%= y 1) (%is x #'y))))
- ;=> `([x . ,#'y])
- (%more) => #f
- (test-%is (with-continuation-mark 'k 'v Y))
- (test-%is (with-continuation-mark 'k Y
-             (first
-              (continuation-mark-set->list
-               (current-continuation-marks)
-               'k))))
- (test-%is (with-continuation-mark Y Y
-             (first
-              (continuation-mark-set->list
-               (current-continuation-marks)
-               Y))))
- (test-%is (#%top . top-z))
- 
- #;(test
-    (test-%is (#%variable-reference Y))
-    (let ([z 1]) (test-%is (#%variable-reference z)))
-    (test-%is (#%variable-reference (#%top . top-z)))
-    (%which (x) (%let (y) (%and (%= y 1) (%is x (#%variable-reference))))) => `([x . ,(#%variable-reference)])
-    (%more) => #f)
- 
- )
diff --git a/pkgs/racklog/tests/lang.rkt b/pkgs/racklog/tests/lang.rkt
deleted file mode 100644
index 628c13ab60..0000000000
--- a/pkgs/racklog/tests/lang.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket
-(require racket/runtime-path tests/eli-tester)
-(define-runtime-path lang "lang")
-
-(test
- (for ([p (in-list (directory-list lang))]
-       #:when (regexp-match #rx"rkt$" (path->bytes p)))
-   (define test-rkt (build-path lang p))
-   (define test-txt (build-path lang (path-replace-suffix p #".txt")))
-   (test #:failure-prefix (path->string p)
-         (filter (lambda (l)
-                   (not (string=? l "")))
-                 (with-input-from-string
-                     (with-output-to-string
-                         (lambda () (dynamic-require test-rkt #f)))
-                   port->lines))
-         =>
-         (filter (lambda (l)
-                   (not (string=? l "")))
-                 (file->lines test-txt)))))
diff --git a/pkgs/racklog/tests/lang/ancestor.rkt b/pkgs/racklog/tests/lang/ancestor.rkt
deleted file mode 100644
index 2411c4bbdc..0000000000
--- a/pkgs/racklog/tests/lang/ancestor.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racklog
-% Equality test
-ancestor(A, B) :-
-    parent(A, B).
-ancestor(A, B) :-
-    parent(A, C),
-    D = C,      % Unification required
-    ancestor(D, B).
-parent(john, douglas).
-parent(bob, john).
-parent(ebbon, bob).
-ancestor(A, B)?
diff --git a/pkgs/racklog/tests/lang/ancestor.txt b/pkgs/racklog/tests/lang/ancestor.txt
deleted file mode 100644
index 17c5a92c3e..0000000000
--- a/pkgs/racklog/tests/lang/ancestor.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ancestor(john, douglas).
-ancestor(bob, john).
-ancestor(ebbon, bob).
-ancestor(bob, douglas).
-ancestor(ebbon, john).
-ancestor(ebbon, douglas).
diff --git a/pkgs/racklog/tests/lang/laps.rkt b/pkgs/racklog/tests/lang/laps.rkt
deleted file mode 100644
index 237b4e57fb..0000000000
--- a/pkgs/racklog/tests/lang/laps.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racklog
-% Laps Test
-contains(ca, store, rams_couch, rams).
-contains(rams, fetch, rams_couch, will).
-contains(ca, fetch, Name, Watcher) :-
-    contains(ca, store, Name, Owner),
-    contains(Owner, fetch, Name, Watcher).
-trusted(ca).
-permit(User, Priv, Name) :-
-    contains(Auth, Priv, Name, User),
-    trusted(Auth).
-permit(User, Priv, Name)?
diff --git a/pkgs/racklog/tests/lang/laps.txt b/pkgs/racklog/tests/lang/laps.txt
deleted file mode 100644
index d87ea5fb54..0000000000
--- a/pkgs/racklog/tests/lang/laps.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-permit(rams, store, rams_couch).
-permit(will, fetch, rams_couch).
diff --git a/pkgs/racklog/tests/lang/long.rkt b/pkgs/racklog/tests/lang/long.rkt
deleted file mode 100644
index c7ac2ac653..0000000000
--- a/pkgs/racklog/tests/lang/long.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racklog
-abcdefghi(z123456789,
-z1234567890123456789,
-z123456789012345678901234567890123456789,
-z1234567890123456789012345678901234567890123456789012345678901234567890123456789).
-
-this_is_a_long_identifier_and_tests_the_scanners_concat_when_read_with_a_small_buffer.
-this_is_a_long_identifier_and_tests_the_scanners_concat_when_read_with_a_small_buffer?
diff --git a/pkgs/racklog/tests/lang/long.txt b/pkgs/racklog/tests/lang/long.txt
deleted file mode 100644
index ebf5669da9..0000000000
--- a/pkgs/racklog/tests/lang/long.txt
+++ /dev/null
@@ -1 +0,0 @@
-this_is_a_long_identifier_and_tests_the_scanners_concat_when_read_with_a_small_buffer.
diff --git a/pkgs/racklog/tests/lang/says.rkt b/pkgs/racklog/tests/lang/says.rkt
deleted file mode 100644
index bfbc76e001..0000000000
--- a/pkgs/racklog/tests/lang/says.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racklog
-tpme(tpme1).
-ms(m1,'TPME',tpme1,ek,tp).
-says(TPME,M) :- tpme(TPME),ms(M,'TPME',TPME,A,B).
-says(A,B)?
diff --git a/pkgs/racklog/tests/lang/says.txt b/pkgs/racklog/tests/lang/says.txt
deleted file mode 100644
index 473484aa10..0000000000
--- a/pkgs/racklog/tests/lang/says.txt
+++ /dev/null
@@ -1 +0,0 @@
-says(tpme1, m1).
diff --git a/pkgs/racklog/tests/lang/true.rkt b/pkgs/racklog/tests/lang/true.rkt
deleted file mode 100644
index 7bf7cf5e3e..0000000000
--- a/pkgs/racklog/tests/lang/true.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racklog
-true.
-true?
diff --git a/pkgs/racklog/tests/lang/true.txt b/pkgs/racklog/tests/lang/true.txt
deleted file mode 100644
index 48eb7ed1a0..0000000000
--- a/pkgs/racklog/tests/lang/true.txt
+++ /dev/null
@@ -1 +0,0 @@
-true.
diff --git a/pkgs/racklog/tests/lang/tutorial.rkt b/pkgs/racklog/tests/lang/tutorial.rkt
deleted file mode 100644
index aeffad36e4..0000000000
--- a/pkgs/racklog/tests/lang/tutorial.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang racklog
-
-parent(john,douglas).
-parent(john,douglas)?
-% parent(john, douglas).
-
-parent(john,ebbon)?
-
-parent(bob,john).
-parent(ebbon,bob).
-parent(A,B)?
-% parent(john, douglas).
-% parent(bob, john).
-% parent(ebbon, bob).
-
-parent(john,B)?
-% parent(john, douglas).
-
-parent(A,A)?
-
-ancestor(A,B) :- parent(A,B).
-ancestor(A,B) :- parent(A,C), ancestor(C, B).
-ancestor(A, B)?
-% ancestor(ebbon, bob).
-% ancestor(bob, john).
-% ancestor(john, douglas).
-% ancestor(bob, douglas).
-% ancestor(ebbon, john).
-% ancestor(ebbon, douglas).
-
-ancestor(X,john)?
-% ancestor(bob, john).
-% ancestor(ebbon, john).
-
-% XXX parent(bob, john)~
-% XXX parent(A,B)?
-% parent(john, douglas).
-% parent(ebbon, bob).
-
-% XXX ancestor(A,B)?
-% ancestor(john, douglas).
-% ancestor(ebbon, bob).
diff --git a/pkgs/racklog/tests/lang/tutorial.txt b/pkgs/racklog/tests/lang/tutorial.txt
deleted file mode 100644
index c7c5706986..0000000000
--- a/pkgs/racklog/tests/lang/tutorial.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-parent(john, douglas).
-
-
-parent(john, douglas).
-parent(bob, john).
-parent(ebbon, bob).
-
-parent(john, douglas).
-
-
-ancestor(john, douglas).
-ancestor(bob, john).
-ancestor(ebbon, bob).
-ancestor(bob, douglas).
-ancestor(ebbon, john).
-ancestor(ebbon, douglas).
-
-ancestor(bob, john).
-ancestor(ebbon, john).
-
-
diff --git a/pkgs/racklog/tests/mapcol.rkt b/pkgs/racklog/tests/mapcol.rkt
deleted file mode 100644
index a17501f8b4..0000000000
--- a/pkgs/racklog/tests/mapcol.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang racket
-
-(require (except-in racklog %member))
-
-;map coloring, example from Sterling & Shapiro, p. 212
-
-;(%member x y) holds if x is in y
-
-;; is this different from the %member provided by racklog? fencing that one out.
-
-(define %member
-  (%rel (X Xs Y Ys)
-    ((X (cons X Xs)))
-    ((X (cons Y Ys)) (%member X Ys))))
-
-;(%members x y) holds if x is a subset of y
-
-(define %members
-  (%rel (X Xs Ys)
-    (((cons X Xs) Ys) (%member X Ys) (%members Xs Ys))
-    (('() Ys))))
-
-;(%select x y z) holds if z is y with one less occurrence of x
-
-(define %select
-  (%rel (X Xs Y Ys Zs)
-    ((X (cons X Xs) Xs))
-    ((X (cons Y Ys) (cons Y Zs))
-     (%select X Ys Zs))))
-
-;region is a structure-builder
-
-(define region
-  (lambda (name color neighbors)
-    (list 'region name color neighbors)))
-
-(define %color-map
-  (%rel (Region Regions Colors)
-    (((cons Region Regions) Colors)
-     (%color-region Region Colors) (%color-map Regions Colors))
-    (('() Colors))))
-
-(define %color-region
-  (%rel (Name Color Neighbors Colors Colors1)
-    (((region Name Color Neighbors) Colors)
-     (%select Color Colors Colors1)
-     (%members Neighbors Colors1))))
-
-(define %test-color
-  (%rel (Name Map Colors)
-    ((Name Map)
-     (%map Name Map)
-     (%colors Colors)
-     (%color-map Map Colors))))
-
-(define %map
-  (%rel (A B C D E F G H I L P S)
-    (('test (list
-	      (region 'a A (list B C D))
-	      (region 'b B (list A C E))
-	      (region 'c C (list A B D E F))
-	      (region 'd D (list A C F))
-	      (region 'e E (list B C F))
-	      (region 'f F (list C D E)))))
-    (('western-europe
-       (list
-	 (region 'portugal P (list E))
-	 (region 'spain E (list F P))
-	 (region 'france F (list E I S B G L))
-	 (region 'belgium B (list F H L G))
-	 (region 'holland H (list B G))
-	 (region 'germany G (list F A S H B L))
-	 (region 'luxembourg L (list F B G))
-	 (region 'italy I (list F A S))
-	 (region 'switzerland S (list F I A G))
-	 (region 'austria A (list I S G)))))))
-
-(define %colors
-  (%rel ()
-    (('(red yellow blue white)))))
-
-(require tests/eli-tester)
-(test (%which (M) (%test-color 'test M))
-      (%which (M) (%test-color 'western-europe M)))
diff --git a/pkgs/racklog/tests/pr/pr-ed.rkt b/pkgs/racklog/tests/pr/pr-ed.rkt
deleted file mode 100644
index d80addf522..0000000000
--- a/pkgs/racklog/tests/pr/pr-ed.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket
-(require racklog)
-
-(define %a
-  (%rel (x)
-        ((x) (%b x))
-        ((x) (%c x))
-        ))
-
-(define %b
-  (%rel ()
-        ((1) !)
-        ((2))))
-
-(define %c
-  (%rel ()
-        ((2))))
-
-(%find-all (x) (%a x))
diff --git a/pkgs/racklog/tests/pr/pr12085.rkt b/pkgs/racklog/tests/pr/pr12085.rkt
deleted file mode 100644
index 28037022d4..0000000000
--- a/pkgs/racklog/tests/pr/pr12085.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racklog
-
-% Run parent_child(P,C)? 
-
-mother_child(trude, sally).
-
-father_child(tom, sally).
-father_child(tom, erica).
-father_child(mike, tom).
-
-sibling(X, Y)      :- parent_child(Z, X), parent_child(Z, Y).
-
-parent_child(X, Y) :- father_child(X, Y).
-parent_child(X, Y) :- mother_child(X, Y).
-
diff --git a/pkgs/racklog/tests/puzzle.rkt b/pkgs/racklog/tests/puzzle.rkt
deleted file mode 100644
index 01dfa705ea..0000000000
--- a/pkgs/racklog/tests/puzzle.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket
-
-(require racklog)
-
-(provide (all-defined-out))
-
-;This is the puzzle solver described in Sterling & Shapiro, p. 214
-
-;As S & S say, it is a "trivial" piece of code
-;that successively solves each clue and query, which are expressed
-;as Prolog goals and are executed with the meta-variable facility.
-
-;The code in "real" Prolog, for comparison, is:
-;
-;  solve_puzzle(Clues, Queries, Solution) 
-;                 :- solve(Clues), solve(Queries).
-;
-;  solve([Clue|Clues]) :- Clue, solve(Clues).
-;  solve([]).
-
-(define %solve-puzzle
-  (%rel (clues queries solution)
-    ((clues queries solution)
-      (%solve clues)
-      (%solve queries))))
-
-(define %solve
-  (%rel (clue clues)
-    (((cons clue clues))
-      clue 
-      (%solve clues))
-    (('()))))
-
-;evaluate (solve-puzzle %puzzle) to get the solution to
-;%puzzle.  Here %puzzle is a relation that is defined to
-;hold for the three arguments clues, queries and solution=,
-;iff they satisfy the constraints imposed by the puzzle.
-;solve-puzzle finds an (the?) instantiation for the solution=
-;variable.
-
-(define solve-puzzle
-  (lambda (%puzzle)
-    (%let (clues queries)
-      (%which (solution=)
-	(%and
-	  (%puzzle clues queries solution=)
-	  (%solve-puzzle clues queries solution=))))))
diff --git a/pkgs/racklog/tests/require.rkt b/pkgs/racklog/tests/require.rkt
deleted file mode 100644
index 0dd8ee7bb7..0000000000
--- a/pkgs/racklog/tests/require.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket
-(require racklog
-         "lang/tutorial.rkt")
-
-(module+ test
-  (require rackunit)
-
-  (check-equal? (%which () (parent 'john 'douglas))
-                '())
-  (check-equal? (%which () (parent 'john 'max))
-                #f))
diff --git a/pkgs/racklog/tests/run-all.rkt b/pkgs/racklog/tests/run-all.rkt
deleted file mode 100644
index 3d4d5b3177..0000000000
--- a/pkgs/racklog/tests/run-all.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket
-(require racket/runtime-path tests/eli-tester)
-(define-runtime-path here ".")
-
-(test
- (for ([p (in-list (directory-list here))])
-   (define s (path->string p))
-   (when (regexp-match #rx"rkt$" s)
-     (unless (or (directory-exists? s)
-                 (string=? "run-all.rkt" s))
-       (dynamic-require (build-path here p) #f)))))
diff --git a/pkgs/racklog/tests/toys.rkt b/pkgs/racklog/tests/toys.rkt
deleted file mode 100644
index b3c94aeede..0000000000
--- a/pkgs/racklog/tests/toys.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang racket
-
-(require (except-in racklog %append))
-
-;A list of trivial programs in Prolog, just so you can get used
-;to racklog syntax.
-
-;(%length l n) holds if length(l) = n
-
-(define %length
-  (%rel (h t n m)
-    (('() 0))
-    (((cons h t) n) (%length t m) (%is n (+ m 1)))))
-
-;(%delete x y z) holds if z is y with all x's removed
-
-(define %delete
-  (%rel (x y z w)
-    ((x '() '()))
-    ((x (cons x w) y) (%delete x w y))
-    ((x (cons z w) (cons z y)) (%not (%= x z)) (%delete x w y))))
-
-;(%remdup x y) holds if y is x without duplicates
-
-(define %remdup
-  (%rel (x y z w)
-    (('() '()))
-    (((cons x y) (cons x z)) (%delete x y w) (%remdup w z))))
-
-;(%count x n) holds if n is the number of elements in x without
-;counting duplicates
-
-(define %count*
-  (%rel (x n y)
-    ((x n) (%remdup x y) (%length y n))))
-
-;same thing
-
-(define %count
-  (letrec ((countaux
-	     (%rel (m n m+1 x y z)
-	       (('() m m))
-	       (((cons x y) m n)
-		(%delete x y z) (%is m+1 (+ m 1)) (countaux z m+1 n)))))
-    (%rel (x n)
-      ((x n) (countaux x 0 n)))))
-
-;(%append x y z) holds if z is the concatenation of x and y
-
-(define %append
-  (%rel (x y z w)
-    (('() x x))
-    (((cons x y) z (cons x w)) (%append y z w))))
-
-;(%reverse x y) holds if the y is the reversal of x
-
-(define %reverse*
-  (%rel (x y z yy)
-    (('() '()))
-    (((cons x y) z) (%reverse y yy) (%append yy (list x) z))))
-
-;same thing, but tailcall optimizing
-
-(define %reverse
-  (letrec ((revaux
-	     (%rel (x y z w)
-	       (('() y y))
-	       (((cons x y) z w) (revaux y (cons x z) w)))))
-    (%rel (x y)
-      ((x y) (revaux x '() y)))))
-
-;(%fact n m) holds if m = n!
-
-(define %fact*
-  (%rel (n n! n-1 n-1!)
-    ((0 1))
-    ((n n!) (%is n-1 (- n 1)) (%fact n-1 n-1!) (%is n! (* n n-1!)))))
-
-;same thing, but tailcall optimizing
-
-(define %fact
-  (letrec ((factaux
-	     (%rel (n! m x m-1 xx)
-	       ((0 n! n!))
-	       ((m x n!) (%is m-1 (- m 1)) (%is xx (* x m))
-		(factaux m-1 xx n!)))))
-    (%rel (n n!)
-      ((n n!) (factaux n 1 n!)))))
diff --git a/pkgs/racklog/tests/unit.rkt b/pkgs/racklog/tests/unit.rkt
deleted file mode 100644
index 4c2506fcf8..0000000000
--- a/pkgs/racklog/tests/unit.rkt
+++ /dev/null
@@ -1,563 +0,0 @@
-#lang racket
-(require racklog
-         tests/eli-tester)
-
-(test
- ; Unification tests
- (test 
-  #:failure-prefix "unify"
-  (local [(define-syntax-rule (once t1 t2)
-            (test (%which () (%= t1 t2)) => empty
-                  (%more) => #f
-                  (let ([tmp t1]) (%which () (%== tmp tmp))) => empty
-                  (%more) => #f
-                  (%which () (%let (f s) (%and (%freeze t1 f) (%melt f s) (%= s t2)))) => empty
-                  (%more) => #f
-                  (%which () (%let (f s) (%and (%freeze t1 f) (%melt-new f s) (%= s t2)))) => empty
-                  (%more) => #f
-                  (%which () (%let (s) (%and (%copy t1 s) (%= s t2)))) => empty
-                  (%more) => #f))
-          (define-syntax-rule (constant t1)
-            (test (%which () (%constant t1)) => empty
-                  (%more) => #f
-                  (%which () (%compound t1)) => #f))
-          (define-syntax-rule (compound t1)
-            (test (%which () (%compound t1)) => empty
-                  (%more) => #f
-                  (%which () (%constant t1)) => #f))
-          (define-syntax-rule (never t1 t2)
-            (test (%which () (%= t1 t2)) => #f
-                  (%which () (%== t1 t2)) => #f
-                  (%which () (%let (f s) (%and (%freeze t1 f) (%melt f s) (%= s t2)))) => #f
-                  (%which () (%let (f s) (%and (%freeze t1 f) (%melt-new f s) (%= s t2)))) => #f
-                  (%which () (%let (s) (%and (%copy t1 s) (%= s t2)))) => #f))]
-    (once #t #t)
-    (once #f #f)
-    (never #f #t)
-    (never #t #f)
-    (constant #t)
-    (constant #f)
-    
-    (once 1 1)
-    (never 1 2)
-    (constant 1)
-    
-    (once "foo" "foo")
-    (never "foo" "bar")
-    (constant "foo")
-    
-    (once #"foo" #"foo")
-    (never #"foo" #"bar")
-    (constant #"foo")
-    
-    (once #\a #\a)
-    (never #\a #\b)
-    (constant #\a)
-    
-    (once 'a 'a)
-    (never 'a 'b)
-    (constant 'a)
-    
-    (let ([rx #rx"a"]) (once rx rx))
-    (never #rx"a" #rx"b")
-    (let ([rx #px"a"]) (once rx rx))
-    (never #px"a" #rx"b")
-    (let ([rx #rx#"a"]) (once rx rx))
-    (never #rx#"a" #rx#"b")
-    (let ([rx #px#"a"]) (once rx rx))
-    (never #px#"a" #px#"b")
-    
-    (constant #rx"a")
-    (constant #px"a")
-    (constant #rx#"a")
-    (constant #px#"a")
-    
-    (let ([a (string->keyword "a")]
-          [b (string->keyword "b")])
-      (once a a)
-      (never a b)
-      (constant a))
-    
-    (once empty empty)
-    (never empty #f)
-    (constant empty)
-    
-    (let ([a add1]
-          [b sub1])
-      (once a a)
-      (never a b)
-      (constant a))
-    
-    (once (void) (void))
-    (never (void) #f)
-    (constant (void))
-    
-    (once (cons 1 1) (cons 1 1))
-    (never (cons 1 2) (cons 1 1))
-    (never (cons 2 1) (cons 1 1))
-    (compound (cons 1 1))
-    
-    (once (vector 1 1) (vector 1 1))
-    (never (vector 1) (vector 1 1))
-    (never (vector 1 2) (vector 1 1))
-    (never (vector 2 1) (vector 1 1))
-    (compound (vector 1 1))
-    
-    (once (mcons 1 1) (mcons 1 1))
-    (never (mcons 1 2) (mcons 1 1))
-    (never (mcons 2 1) (mcons 1 1))
-    (compound (mcons 1 1))
-    
-    (once (box 1) (box 1))
-    (never (box 2) (box 1))
-    (compound (box 1))
-    
-    (local [(define-syntax-rule (hash-test hash)
-              (test
-               (once (hash 1 2) (hash 1 2))
-               (never (hash 2 2) (hash 1 2))
-               (never (hash 1 1) (hash 1 2))
-               (never (hash 1 1) (hash 2 2))
-               (compound (hash 1 2))))]
-      (hash-test (λ (k v) (make-hash (list (cons k v)))))
-      (hash-test (λ (k v) (make-hasheq (list (cons k v)))))
-      (hash-test (λ (k v) (make-hasheqv (list (cons k v)))))
-      (hash-test (λ (k v) (make-weak-hash (list (cons k v)))))
-      (hash-test (λ (k v) (make-weak-hasheq (list (cons k v)))))
-      (hash-test (λ (k v) (make-weak-hasheqv (list (cons k v)))))
-      (hash-test (λ (k v) (make-immutable-hash (list (cons k v)))))
-      (hash-test (λ (k v) (make-immutable-hasheq (list (cons k v)))))
-      (hash-test (λ (k v) (make-immutable-hasheqv (list (cons k v))))))
-    
-    (local [(define-syntax-rule (set-test set)
-              (test
-               (once (set 1 2) (set 1 2))
-               (never (set 2 2) (set 1 2))
-               (never (set 1 1) (set 1 2))
-               (never (set 1 1) (set 2 2))
-               (constant (set 1 2))))]
-      (set-test set)
-      (set-test seteqv)
-      (set-test seteq))
-    
-    (local [(define (cs-struct-test make-foo)
-              (once (make-foo 1 1) (make-foo 1 1))
-              (never (make-foo 2 1) (make-foo 1 1))
-              (never (make-foo 1 2) (make-foo 1 1))
-              (never (make-foo 2 2) (make-foo 1 1))
-              (compound (make-foo 1 1)))
-            (define (a-struct-test make-foo)
-              (never (make-foo 1 1) (make-foo 1 1))
-              (never (make-foo 2 1) (make-foo 1 1))
-              (never (make-foo 1 2) (make-foo 1 1))
-              (never (make-foo 2 2) (make-foo 1 1))
-              (constant (make-foo 1 1)))]
-      (local [(define-struct foo (x y))]
-        (test #:failure-prefix "default"
-              (a-struct-test make-foo)))
-      (local [(define-struct foo (x y) #:prefab)]
-        (test #:failure-prefix "prefab"
-              (cs-struct-test make-foo)))
-      (local [(define-struct foo (x y) #:transparent)] 
-        (test #:failure-prefix "transparent"
-              (cs-struct-test make-foo)))
-      (local [(define another-inspector (make-inspector))
-              (define-struct foo (x y) #:inspector another-inspector)]
-        (test #:failure-prefix "child"
-              (cs-struct-test make-foo)))
-      (local [(define some-inspector (make-sibling-inspector))
-              (define another-inspector (make-inspector some-inspector))
-              (define-struct foo (x y) #:inspector another-inspector)]
-        (test #:failure-prefix "sibling -> child"
-              (a-struct-test make-foo))))))
- 
- (test
-  #:failure-prefix "unify + logic var"
-  (local [(define-syntax-rule (uni x v has-x has-v)
-            (test (%which (x) (%= has-x has-v)) => (list (cons 'x v))
-                  (%more) => #f
-                  (%which () (%let (x) (%var has-x))) => empty
-                  (%more) => #f
-                  (%which () (%var has-v)) => #f))
-          (define-syntax-rule (iduni ve)
-            (let ([v ve])
-              (uni x v x v)))
-          (define-syntax-rule (nouni x v has-x has-v)
-            (test (%which (x) (%= has-x has-v)) => #f
-                  (%which () (%let (x) (%var has-x))) => #f
-                  (%which () (%var has-v)) => #f))]
-
-    (iduni #t)
-    (iduni #f)
-    (iduni 1)
-    (iduni "foo")
-    (iduni #"foo")
-    (iduni #\a)
-    (iduni 'a)    
-    (iduni #rx"a")
-    (iduni #px"a")
-    (iduni #rx#"a")
-    (iduni #px#"a")
-      (iduni (string->keyword "a"))
-    (iduni empty)
-    (iduni add1)
-    (iduni (void))
-    
-    (uni x 1 (cons x 2) (cons 1 2))
-    (uni x 2 (cons 1 x) (cons 1 2))
-    
-    (uni x 1 (vector x 2) (vector 1 2))
-    (uni x 2 (vector 1 x) (vector 1 2))
-    
-    (uni x 1 (mcons x 2) (mcons 1 2))
-    (uni x 2 (mcons 1 x) (mcons 1 2))
-    
-    (uni x 1 (box x) (box 1))
-    
-    (local [(define-syntax-rule (hash-test hash)
-              (test
-               ; Logic variables not allowed as hash keys
-               (nouni x 1 (hash x 2) (hash 1 2))
-               (uni x 2 (hash 1 x) (hash 1 2))))]
-      (hash-test (λ (k v) (make-hash (list (cons k v)))))
-      (hash-test (λ (k v) (make-hasheq (list (cons k v)))))
-      (hash-test (λ (k v) (make-hasheqv (list (cons k v)))))
-      (hash-test (λ (k v) (make-weak-hash (list (cons k v)))))
-      (hash-test (λ (k v) (make-weak-hasheq (list (cons k v)))))
-      (hash-test (λ (k v) (make-weak-hasheqv (list (cons k v)))))
-      (hash-test (λ (k v) (make-immutable-hash (list (cons k v)))))
-      (hash-test (λ (k v) (make-immutable-hasheq (list (cons k v)))))
-      (hash-test (λ (k v) (make-immutable-hasheqv (list (cons k v))))))
-    
-    (nouni x 1 (set x) (set 1))
-    
-    (local [(define (cs-struct-test make-foo)
-              (test (uni x 1 (make-foo x 2) (make-foo 1 2))
-                    (uni x 2 (make-foo 1 x) (make-foo 1 2))))
-            (define (a-struct-test make-foo)
-              (test (nouni x 1 (make-foo x 2) (make-foo 1 2))
-                    (nouni x 2 (make-foo 1 x) (make-foo 1 2))))]
-      (local [(define-struct foo (x y))]
-        (test #:failure-prefix "default"
-              (a-struct-test make-foo)))
-      (local [(define-struct foo (x y) #:prefab)]
-        (test #:failure-prefix "prefab"
-              (cs-struct-test make-foo)))
-      (local [(define-struct foo (x y) #:transparent)] 
-        (test #:failure-prefix "transparent"
-              (cs-struct-test make-foo)))
-      (local [(define another-inspector (make-inspector))
-              (define-struct foo (x y) #:inspector another-inspector)]
-        (test #:failure-prefix "child"
-              (cs-struct-test make-foo)))
-      (local [(define some-inspector (make-sibling-inspector))
-              (define another-inspector (make-inspector some-inspector))
-              (define-struct foo (x y) #:inspector another-inspector)]
-        (test #:failure-prefix "sibling -> child"
-              (a-struct-test make-foo))))))
- 
- ; Unit tests
- (logic-var? (_))
- 
- (%which () (%/= 1 1)) => #f
- (%which () (%/= 1 2)) => empty
- (%more) => #f
- 
- (%which (x) (%/== x x)) => #f
- (%which (x y) (%/== x y)) => `((x . _) (y . _))
- (%more) => #f
- 
- (%which () (%/== 1 1)) => #f
- (%which () (%/== 1 2)) => empty
- (%more) => #f
- 
- (%which () (%< 1 2)) => empty
- (%more) => #f
- (%which () (%< 1 1)) => #f
- (%which () (%< 2 1)) => #f
- (%which () (%< 'a 2)) => #f
- (%which () (%< 1 'b)) => #f
- (%which () (%< 'a 'b)) => #f
- 
- (%which () (%<= 1 2)) => empty
- (%more) => #f
- (%which () (%<= 1 1)) => empty
- (%more) => #f
- (%which () (%<= 2 1)) => #f
- (%which () (%<= 'a 2)) => #f
- (%which () (%<= 1 'b)) => #f
- (%which () (%<= 'a 'b)) => #f
- 
- (%which () (%= 1 1)) => empty
- (%more) => #f
- (%which () (%= 'a 'a)) => empty
- (%more) => #f
- (%which () (%= (cons 1 2) (cons 1 2))) => empty
- (%more) => #f
- (%which () (%= (vector 1 2) (vector 1 2))) => empty
- (%more) => #f
- (%which (x) (%= x 1)) => `((x . 1))
- (%more) => #f
- (%which (x) (%= (cons x 2) (cons 1 2))) => `((x . 1))
- (%more) => #f
- (%which (x) (%= (vector x 2) (vector 1 2))) => `((x . 1))
- (%more) => #f
- (%which (x) (%and (%= x 1) (%= x 2))) => #f
- (%which () (%= 1 2)) => #f
- 
- (%which () (%=/= 1 1)) => #f
- (%which () (%=/= 'a 'a)) => #f
- (%which () (%=/= 1 2)) => empty
- (%more) => #f
- 
- (%which () (%=:= 1 1)) => empty
- (%more) => #f
- (%which () (%=:= 'a 'a)) => #f
- (%which () (%=:= 1 2)) => #f
- 
- (%which () (%== 1 1)) => empty
- (%more) => #f
- (%which (x) (%== x x)) => `((x . _))
- (%more) => #f
- (%which (x) (%== (cons 1 x) (cons 1 x))) => `((x . _))
- (%more) => #f
- ; XXX This answer seems wrong
- (%which (x) (%and (%= x 1) (%== x 1))) => `((x . 1))
- (%more) => #f
- ; XXX This answer seems wrong
- (%which (x y) (%and (%= x 1) (%= y 1) (%== x y))) => `((x . 1) (y . 1))
- (%more) => #f
- (%which (x y) (%== x y)) => #f
- (%which (x y) (%== (cons 1 x) (cons y 2))) => #f
- 
- (%which () (%> 2 1)) => empty
- (%more) => #f
- (%which () (%> 1 1)) => #f
- (%which () (%> 1 2)) => #f
- (%which () (%> 'a 2)) => #f
- (%which () (%> 1 'b)) => #f
- (%which () (%> 'a 'b)) => #f
- 
- (%which () (%>= 2 1)) => empty
- (%more) => #f
- (%which () (%>= 1 1)) => empty
- (%more) => #f
- (%which () (%>= 1 2)) => #f
- (%which () (%>= 'a 2)) => #f
- (%which () (%>= 1 'b)) => #f
- (%which () (%>= 'a 'b)) => #f 
- 
- (%which () (%and %true %true)) => empty
- (%more) => #f
- (%which () (%and %fail %true)) => #f
- (%more) => #f
- 
- (%which () (%append empty empty empty)) => empty
- (%more) => #f
- (%which () (%append (list 1) empty (list 1))) => empty
- (%more) => #f
- (%which () (%append empty (list 2) (list 2))) => empty
- (%more) => #f
- (%which () (%append (list 1) (list 2) (list 1 2))) => empty
- (%more) => #f
- 
- (let ([rel %empty-rel])
-   (test (%which (y) (rel 'x y)) => #f
-         (%assert! rel () [('x 1)])
-         (%which (y) (rel 'x y)) => `([y . 1])
-         (%more) => #f
-         (%assert-after! rel () [('x 2)])
-         (%which (y) (rel 'x y)) => `([y . 2])
-         (%more) => `([y . 1])
-         (%more) => #f
-         (%assert! rel () [('x 3)])
-         (%which (y) (rel 'x y)) => `([y . 2])
-         (%more) => `([y . 1])
-         (%more) => `([y . 3])
-         (%more) => #f))
- 
- (%which (y) (%let (x) (%bag-of x (%or (%= x 1) (%= x 1) (%= x 2)) y))) => `([y . (1 1 2)])
- (%more) => #f
- ; XXX I don't know a program that would get these outputs
- ;(%which (y) (%let (x) (%bag-of x XXX y))) => `([y . ()])
- (%more) => #f
- (%which (y) (%let (x) (%bag-of-1 x (%or (%= x 1) (%= x 1) (%= x 2)) y))) => `([y . (1 1 2)])
- (%more) => #f
- ; XXX I don't know a program that would get these outputs
- ;(%which (y) (%let (x) (%bag-of-1 x XXX y))) => #f
- 
- (%which () (%compound (cons 1 1))) => empty
- (%more) => #f
- (%which () (%compound (vector 1 1))) => empty
- (%more) => #f
- (%which () (%let (x) (%and (%= x (cons 1 1)) (%compound x)))) => empty
- (%more) => #f
- (%which () (%compound 1)) => #f 
- (%which () (%compound "1")) => #f 
- (%which () (%compound '1)) => #f 
- (%which () (%compound empty)) => #f 
- 
- (%which () (%constant (cons 1 1))) => #f
- (%which () (%constant (vector 1 1))) => #f
- (%which () (%let (x) (%and (%= x 1) (%constant x)))) => empty
- (%more) => #f
- (%which () (%constant 1)) => empty
- (%more) => #f
- (%which () (%constant "1")) => empty
- (%more) => #f
- (%which () (%constant '1)) => empty
- (%more) => #f
- (%which () (%constant empty)) => empty
- (%more) => #f
- 
- (%which (x) (%let (y) (%and (%copy x y) (%= y 1)))) => `([x . _])
- (%more) => #f
- 
- ! =error> "syntactically"
- 
- (%which () (%cut-delimiter %true)) => empty
- (%more) => #f
- (%which () (%cut-delimiter !)) => empty
- (%more) => #f
- (%which () (%cut-delimiter %fail)) => #f
- (%which () (%or %true %true)) => empty
- (%more) => empty
- (%more) => #f
- (%which () (%cut-delimiter (%or (%and ! %true) %true))) => empty
- (%more) => #f
- 
- (%which () (%empty-rel 1 1)) => #f
- 
- (%which () %fail) => #f
- 
- ; %free-vars example from documentation
- (local [(define %knows
-           (%rel ()
-                 [('Odysseus 'TeX)]
-                 [('Odysseus 'Scheme)]
-                 [('Odysseus 'Prolog)]
-                 [('Odysseus 'Penelope)]
-                 [('Penelope 'TeX)]
-                 [('Penelope 'Prolog)]
-                 [('Penelope 'Odysseus)]
-                 [('Telemachus 'TeX)]
-                 [('Telemachus 'calculus)]))]
-   (test (%which (someone things-known)
-                 (%let (x)
-                       (%set-of x (%knows someone x)
-                                things-known)))
-         =>
-         `((someone . _) (things-known TeX Scheme Prolog Penelope Odysseus calculus))
-         (%more) => #f
-         (%which (someone things-known)
-                 (%let (x)
-                       (%bag-of x
-                                (%free-vars (someone)
-                                            (%knows someone x))
-                                things-known)))
-         =>
-         `((someone . Odysseus) (things-known TeX Scheme Prolog Penelope))
-         (%more) =>
-         `((someone . Penelope) (things-known TeX Prolog Odysseus))
-         (%more) =>
-         `((someone . Telemachus) (things-known TeX calculus))
-         (%more) =>
-         #f))
- 
- (%which (x) (%let (y) (%and (%freeze x y) (%nonvar y)))) => `([x . _])
- 
- (%which () (%if-then-else %true %true %true)) => empty
- (%more) => #f
- (%which () (%if-then-else %true %fail %true)) => #f
- (%which () (%if-then-else %fail %true %true)) => empty
- (%more) => #f
- 
- (%which (x) (%is x (* 6 7))) => `([x . 42])
- (%more) => #f
- (%which (x) (%let (y) (%and (%= y 7) (%is x (* 6 y))))) => `([x . 42])
- (%more) => #f
- 
- (%which () (%let (x) (%= x x))) => empty
- (%more) => #f
- 
- (%which (x) (%let (y z) (%and (%freeze x y) (%melt y z) (%= z 1)))) => `([x . 1])
- (%more) => #f
- 
- (%which (x) (%let (y z) (%and (%freeze x y) (%melt-new y z) (%= z 1)))) => `([x . _])
- (%more) => #f
- 
- (%which () (%member 3 (list 1 2 3))) => empty
- (%more) => #f
- (%which () (%member 3 (list 1 2 3 3))) => empty
- (%more) => empty
- (%more) => #f
- (%which () (%member 3 (list 1 2))) => #f
- 
- (%which () (%let (x) (%nonvar x))) => #f
- (%which () (%let (x) (%nonvar (cons 1 x)))) => #f
- (%which () (%let (x) (%nonvar (vector x)))) => #f
- (%which () (%let (x) (%nonvar 1))) => empty
- (%more) => #f
- (%which () (%let (x) (%and (%= x 1) (%nonvar x)))) => empty
- (%more) => #f
- 
- (%which () (%not %true)) => #f
- (%which () (%not %fail)) => empty
- (%more) => #f
- 
- (%which () (%or %true %true)) => empty
- (%more) => empty
- (%more) => #f
- (%which () (%or %true %fail %true)) => empty
- (%more) => empty
- (%more) => #f
- 
- (let ([rel (%rel () [(1)] [(2) %fail])])
-   (test (%which () (rel 1)) => empty
-         (%more) => #f
-         (%which () (rel 2)) => #f))
- (let ([rel (%rel () [(1) !] [(1) (%repeat)])])
-   (test (%which () (rel 1)) => empty
-         (%more) => #f))
- 
- (local [(define (many-%more n)
-           (if (zero? n)
-               empty
-               (and (%more)
-                    (many-%more (sub1 n)))))]
-   (test (%which () (%repeat)) => empty
-         (many-%more (random 50)) => empty))
- 
- (parameterize ([use-occurs-check? #f])
-   (%which () (%let (x) (%= x (cons 1 x))))) 
- => empty
- (parameterize ([use-occurs-check? #t])
-   (%which () (%let (x) (%= x (cons 1 x)))))
- => #f
- 
- (%which (y) (%let (x) (%set-of x (%or (%= x 1) (%= x 1) (%= x 2)) y))) => `([y . (1 2)])
- (%more) => #f
- ; XXX I don't know a program that would get these outputs
- ;(%which (y) (%let (x) (%set-of x XXX y))) => `([y . ()])
- (%more) => #f
- (%which (y) (%let (x) (%set-of-1 x (%or (%= x 1) (%= x 1) (%= x 2)) y))) => `([y . (1 2)])
- (%more) => #f
- ; XXX I don't know a program that would get these outputs
- ;(%which (y) (%let (x) (%set-of-1 x XXX y))) => #f
- 
- (%which () %true) => empty
- (%more) => #f
- 
- (%which () (%let (x) (%var x))) => empty
- (%more) => #f
- (%which () (%let (x) (%var (cons 1 x)))) => empty
- (%more) => #f
- (%which () (%let (x) (%var (vector x)))) => empty
- (%more) => #f
- (%which () (%let (x) (%var 1))) => #f
- (%which () (%let (x) (%and (%= x 1) (%var x)))) => #f
-
- (%which () %true %true) => empty
- (%more) => #f
- 
- )
diff --git a/pkgs/racklog/unify.rkt b/pkgs/racklog/unify.rkt
deleted file mode 100644
index 88ca8f8b20..0000000000
--- a/pkgs/racklog/unify.rkt
+++ /dev/null
@@ -1,553 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/list
-         racket/match
-         racket/function
-         racket/vector
-         racket/set)
-(provide (all-defined-out))
-
-; same hash
-(define (make-immutable-hash*) (make-immutable-hash empty))
-(define (make-immutable-hasheqv*) (make-immutable-hasheqv empty))
-(define (make-immutable-hasheq*) (make-immutable-hasheq empty))
-(define (same-hash-make ht)
-  (match ht
-    [(? immutable?)
-     (match ht
-       [(? hash-equal?) make-immutable-hash*]
-       [(? hash-eqv?) make-immutable-hasheqv*]
-       [(? hash-eq?) make-immutable-hasheq*])]
-    [(? hash-weak?)
-     (match ht
-       [(? hash-equal?) make-weak-hash]
-       [(? hash-eqv?) make-weak-hasheqv]
-       [(? hash-eq?) make-weak-hasheq])]
-    [_
-     (match ht
-       [(? hash-equal?) make-hash]
-       [(? hash-eqv?) make-hasheqv]
-       [(? hash-eq?) make-hasheq])]))
-(define (same-hash-kind? x y)
-  (eq? (same-hash-make x) (same-hash-make y)))
-(define (same-hash-map f ht)
-  (define new-ht ((same-hash-make ht)))
-  (if (immutable? ht)
-      (for/fold ([new-ht new-ht])
-        ([(k v) (in-hash ht)])
-        (hash-set new-ht k (f v)))
-      (begin 
-        (for ([(k v) (in-hash ht)])
-          (hash-set! new-ht k (f v)))
-        new-ht)))
-
-; compound structs
-(require unstable/sequence)
-(define (in-compound-struct s)
-  (define-values (stype _) (struct-info s))
-  (define-values (name init-field-cnt auto-field-cnt accessor-proc mutator-proc immutable-k-list super-type skipped?) (struct-type-info stype))
-  (define total-field-cnt (+ init-field-cnt)
-    #;(compound-struct-type-field-cnt stype))
-  (sequence-lift (curry accessor-proc s) (in-range total-field-cnt)))
-
-(define (compound-struct-map f s)
-  (define-values (stype _) (struct-info s))
-  (define make (struct-type-make-constructor stype))
-  (apply make 
-         (for/list ([e (in-compound-struct s)])
-           (f e))))
-(define (compound-struct-ormap f s)
-  (for/or ([e (in-compound-struct s)])
-    (f e)))
-(define (compound-struct-andmap f s)
-  (for/and ([e (in-compound-struct s)])
-    (f e)))
-(define (compound-struct-same? x y)
-  (define-values (xtype _) (struct-info x))
-  ((struct-type-make-predicate xtype) y))  
-(define (compound-struct-cmp x y =)
-  (and (compound-struct-same? x y)
-       (for/and ([ex (in-compound-struct x)]
-                 [ey (in-compound-struct y)])
-         (= ex ey))))
-
-(define-struct logic-var (val) #:mutable)
-
-(define *unbound* '_)
-
-;;unbound refs point to themselves
-(define (make-ref [val *unbound*])
-  (make-logic-var val))
-
-(define _ make-ref)
-(define (unbound-logic-var? r)
-  (and (logic-var? r) (eq? (logic-var-val r) *unbound*)))
-(define (unbind-ref! r)
-  (set-logic-var-val! r *unbound*))
-
-(define-struct frozen (val))
-(define (freeze-ref r)
-  (make-ref (make-frozen r)))
-(define (thaw-frozen-ref r)
-  (frozen-val (logic-var-val r)))
-(define (frozen-logic-var? r)
-  (frozen? (logic-var-val r)))
-
-(define-syntax (uni-match stx)
-  (syntax-case
-      stx (? logic-var? cons mcons box vector? hash? compound-struct? atom? else)
-    [(_ v
-        [(? logic-var? lv) logic-var-expr ...]
-        [(cons cl cr) cons-expr ...]
-        [(mcons mcl mcr) mcons-expr ...]
-        [(box bv) box-expr ...]
-        [(? vector? vec) vector-expr ...]
-        [(? hash? hash) hash-expr ...]
-        [(? compound-struct? cs) cs-expr ...]
-        [(? atom? x) atom-expr ...])
-     (syntax/loc stx
-       (match v
-         [(? logic-var? lv) logic-var-expr ...]
-         [(cons cl cr) cons-expr ...]
-         [(mcons mcl mcr) mcons-expr ...]
-         [(box bv) box-expr ...]
-         [(? vector? vec) vector-expr ...]
-         [(? hash? hash) hash-expr ...]
-         [(? compound-struct? cs) cs-expr ...]
-         [(? atom? x) atom-expr ...]))]
-    [(_ v
-        [(? logic-var? lv) logic-var-expr ...]
-        [(cons cl cr) cons-expr ...]
-        [(mcons mcl mcr) mcons-expr ...]
-        [(box bv) box-expr ...]
-        [(? vector? vec) vector-expr ...]
-        [(? hash? hash) hash-expr ...]
-        [(? compound-struct? cs) cs-expr ...]
-        [(? atom? x) atom-expr ...]
-        [else else-expr ...])
-     (syntax/loc stx
-       (match v
-         [(? logic-var? lv) logic-var-expr ...]
-         [(cons cl cr) cons-expr ...]
-         [(mcons mcl mcr) mcons-expr ...]
-         [(box bv) box-expr ...]
-         [(? vector? vec) vector-expr ...]
-         [(? hash? hash) hash-expr ...]
-         [(? compound-struct? cs) cs-expr ...]
-         [(? atom? x) atom-expr ...]
-         [else else-expr ...]))]))
-
-(define (logic-var-val* v)
-  (uni-match 
-   v
-   [(? logic-var? s)
-    (if (frozen-logic-var? s) s
-        (logic-var-val* (logic-var-val s)))]
-   [(cons l r)
-    (cons (logic-var-val* l) (logic-var-val* r))]
-   [(mcons l r)
-    (mcons (logic-var-val* l) (logic-var-val* r))]
-   [(box v) (box (logic-var-val* v))]
-   [(? vector? v)
-    (vector-map logic-var-val* v)]
-   [(? hash? v) (same-hash-map logic-var-val* v)]
-   [(? compound-struct? v) (compound-struct-map logic-var-val* v)]
-   [(? atom? s) s]))
-
-(define use-occurs-check? (make-parameter #f))
-
-(define (occurs-in? var term)
-  (and (use-occurs-check?)
-       (let loop ([term term])
-         (or (eqv? var term)
-             (uni-match 
-              term
-              [(? logic-var? term)
-               (cond [(unbound-logic-var? term) #f]
-                     [(frozen-logic-var? term) #f]
-                     [else (loop (logic-var-val term))])]
-              [(cons l r)
-               (or (loop l) (loop r))]
-              [(mcons l r)
-               (or (loop l) (loop r))]
-              [(box v) (loop v)]
-              [(? vector? v)
-               (for/or ([e (in-vector v)]) (loop e))]
-              [(? hash? ht)
-               (for/or ([(k v) (in-hash ht)]) (or (loop k) (loop v)))]
-              [(? compound-struct? cs) (compound-struct-ormap loop cs)]
-              [(? atom? x) #f])))))
-
-(define (constant? x)
-  (uni-match 
-   x
-   [(? logic-var? x)
-    (cond [(unbound-logic-var? x) #f]
-          [(frozen-logic-var? x) #t]
-          [else (constant? (logic-var-val x))])]
-   [(cons l r) #f]
-   [(mcons l r) #f]
-   [(box v) #f]
-   [(? vector? v) #f]
-   [(? hash? v) #f]
-   [(? compound-struct? v) #f]
-   [(? atom? x) #t]))
-
-(define (is-compound? x)
-  (uni-match 
-   x
-   [(? logic-var? x)
-    (cond [(unbound-logic-var? x) #f]
-          [(frozen-logic-var? x) #f]
-          [else (is-compound? (logic-var-val x))])]
-   [(cons l r) #t]
-   [(mcons l r) #t]
-   [(box v) #t]
-   [(? vector? v) #t]
-   [(? hash? v) #t]
-   [(? compound-struct? v) #t]
-   [(? atom? x) #f]))
-
-(define (var? x)
-  (uni-match 
-   x
-   [(? logic-var? x)
-    (cond [(unbound-logic-var? x) #t]
-          [(frozen-logic-var? x) #f]
-          [else (var? (logic-var-val x))])]
-   [(cons l r) (or (var? l) (var? r))]
-   [(mcons l r) (or (var? l) (var? r))]
-   [(box v) (var? v)]
-   [(? vector? v)
-    (for/or ([e (in-vector v)]) (var? e))]
-   [(? hash? ht)
-    (for/or ([(k v) (in-hash ht)]) (var? v))]
-   [(? compound-struct? cs) (compound-struct-ormap var? cs)]
-   [(? atom? x) #f]))
-
-(define (freeze v)
-  (define dict (make-hasheq))
-  (define (loop s)
-    (uni-match 
-     s
-     [(? logic-var? s)
-      (if (or (unbound-logic-var? s) (frozen-logic-var? s))
-          (hash-ref! dict s
-                     (lambda ()
-                       (freeze-ref s)))
-          (loop (logic-var-val s)))]
-     [(cons l r)
-      (cons (loop l) (loop r))]
-     [(mcons l r)
-      (mcons (loop l) (loop r))]
-     [(box v) (box (loop v))]
-     [(? vector? v)
-      (vector-map loop v)]
-     [(? hash? v)
-      (same-hash-map loop v)]
-     [(? compound-struct? cs) (compound-struct-map loop cs)]
-     [(? atom? s) s]))
-  (loop v))
-
-(define (melt f)
-  (uni-match 
-   f
-   [(? logic-var? f)
-    (cond [(unbound-logic-var? f) f]
-          [(frozen-logic-var? f) (thaw-frozen-ref f)]
-          [else (melt (logic-var-val f))])]
-   [(cons l r)
-    (cons (melt l) (melt r))]
-   [(mcons l r)
-    (mcons (melt l) (melt r))]
-   [(box v) (box (melt v))]
-   [(? vector? v)
-    (vector-map melt v)]
-   [(? hash? v)
-    (same-hash-map melt v)]
-   [(? compound-struct? cs) (compound-struct-map melt cs)]
-   [(? atom? s) s]))
-
-(define (melt-new f)
-  (define dict (make-hasheq))
-  (define (loop s)
-    (uni-match 
-     s
-     [(? logic-var? f)
-      (cond [(unbound-logic-var? f) f]
-            [(frozen-logic-var? f)
-             (hash-ref! dict f _)]
-            [else (loop (logic-var-val f))])]
-     [(cons l r)
-      (cons (loop l) (loop r))]
-     [(mcons l r)
-      (mcons (loop l) (loop r))]
-     [(box v) (box (loop v))]
-     [(? vector? v)
-      (vector-map loop v)]
-     [(? hash? v)
-      (same-hash-map loop v)]
-     [(? compound-struct? cs)
-      (compound-struct-map loop cs)]
-     [(? atom? s) s]))
-  (loop f))
-
-(define (copy s)
-  (melt-new (freeze s)))
-
-(define (ident? x y)
-  (uni-match 
-   x
-   [(? logic-var? x) 
-    (cond [(unbound-logic-var? x)
-           (cond [(logic-var? y)
-                  (cond [(unbound-logic-var? y) (eq? x y)]
-                        [(frozen-logic-var? y) #f]
-                        [else (ident? x (logic-var-val y))])]
-                 [else #f])]
-          [(frozen-logic-var? x)
-           (cond [(logic-var? y)
-                  (cond [(unbound-logic-var? y) #f]
-                        [(frozen-logic-var? y) (eq? x y)]
-                        [else (ident? x (logic-var-val y))])]
-                 [else #f])]
-          [else (ident? (logic-var-val x) y)])]
-   [(cons xl xr)
-    (uni-match 
-     y
-     [(? logic-var? y)
-      (cond [(unbound-logic-var? y) #f]
-            [(frozen-logic-var? y) #f]
-            [else (ident? x (logic-var-val y))])]
-     [(cons yl yr) 
-      (and (ident? xl yl) (ident? xr yr))]
-     [(mcons yl yr) #f]
-     [(box v) #f]
-     [(? vector? y) #f]
-     [(? hash? y) #f]
-     [(? compound-struct? y) #f]
-     [(? atom? y) #f])]
-   [(mcons xl xr)
-    (uni-match 
-     y
-     [(? logic-var? y)
-      (cond [(unbound-logic-var? y) #f]
-            [(frozen-logic-var? y) #f]
-            [else (ident? x (logic-var-val y))])]
-     [(cons yl yr) #f]
-     [(mcons yl yr) 
-      (and (ident? xl yl) (ident? xr yr))]
-     [(box v) #f]
-     [(? vector? y) #f]
-     [(? hash? y) #f]
-     [(? compound-struct? y) #f]
-     [(? atom? y) #f])]
-   [(box xv)
-    (uni-match 
-     y
-     [(? logic-var? y)
-      (cond [(unbound-logic-var? y) #f]
-            [(frozen-logic-var? y) #f]
-            [else (ident? x (logic-var-val y))])]
-     [(cons yl yr) #f]
-     [(mcons yl yr) #f]
-     [(box yv) (ident? xv yv)]
-     [(? vector? y) #f]
-     [(? hash? y) #f]
-     [(? compound-struct? y) #f]
-     [(? atom? y) #f])]
-   [(? vector? x)
-    (uni-match 
-     y
-     [(? logic-var? y)
-      (cond [(unbound-logic-var? y) #f]
-            [(frozen-logic-var? y) #f]
-            [else (ident? x (logic-var-val y))])]
-     [(cons yl yr) #f]
-     [(mcons yl yr) #f]
-     [(box v) #f]
-     [(? vector? y)
-      (if (= (vector-length x)
-             (vector-length y))
-          (for/and ([xe (in-vector x)]
-                    [ye (in-vector y)])
-            (ident? xe ye))
-          #f)]
-     [(? hash? y) #f]
-     [(? compound-struct? y) #f]
-     [(? atom? y) #f])]
-   [(? hash? x)
-    (uni-match 
-     y
-     [(? logic-var? y)
-      (cond [(unbound-logic-var? y) #f]
-            [(frozen-logic-var? y) #f]
-            [else (ident? x (logic-var-val y))])]
-     [(cons yl yr) #f]
-     [(mcons yl yr) #f]
-     [(box v) #f]
-     [(? vector? y) #f]
-     [(? hash? y)
-      (and (same-hash-kind? x y)
-           (= (hash-count x) (hash-count y))
-           (for/and ([(xk xv) (in-hash x)])
-             ; XXX not using ident? for key comparison
-             (and (hash-has-key? y xk)
-                  (ident? xv (hash-ref y xk)))))]
-     [(? compound-struct? y) #f]
-     [(? atom? y) #f])]
-   [(? compound-struct? x)
-    (uni-match 
-     y
-     [(? logic-var? y)
-      (cond [(unbound-logic-var? y) #f]
-            [(frozen-logic-var? y) #f]
-            [else (ident? x (logic-var-val y))])]
-     [(cons yl yr) #f]
-     [(mcons yl yr) #f]
-     [(box v) #f]
-     [(? vector? y) #f]
-     [(? hash? y) #f]
-     [(? compound-struct? y) 
-      (compound-struct-cmp x y ident?)]
-     [(? atom? y) #f])]
-   [(? atom? x)
-    (uni-match 
-     y
-     [(? logic-var? y)
-      (cond [(unbound-logic-var? y) #f]
-            [(frozen-logic-var? y) #f]
-            [else (ident? x (logic-var-val y))])]
-     [(cons yl yr) #f]
-     [(mcons yl yr) #f]
-     [(box v) #f]
-     [(? vector? y) #f]
-     [(? hash? y) #f]
-     [(? compound-struct? y) #f]
-     [(? atom? y) (eqv? x y)])]))
-
-(define (unify t1 t2)
-  (define iu (inner-unify t1 t2))
-  (λ (fk)
-    (define-values (cleanup k)
-      (iu fk))
-    k))
-
-(define (inner-unify t1 t2)
-  (lambda (fk)
-    (define (cleanup s)
-      (for-each unbind-ref! s))
-    (define (cleanup-n-fail s)
-      (cleanup s)
-      (fk 'fail))
-    (define (unify1 t1 t2 s)
-      (cond [(eqv? t1 t2) s]
-            [(logic-var? t1)
-             (cond [(unbound-logic-var? t1)
-                    (cond [(occurs-in? t1 t2)
-                           (cleanup-n-fail s)]
-                          [else 
-                           (set-logic-var-val! t1 t2)
-                           (list* t1 s)])]
-                   [(frozen-logic-var? t1)
-                    (cond [(logic-var? t2)
-                           (cond [(unbound-logic-var? t2)
-                                  (unify1 t2 t1 s)]
-                                 [(frozen-logic-var? t2)
-                                  (cleanup-n-fail s)]
-                                 [else
-                                  (unify1 t1 (logic-var-val t2) s)])]
-                          [else (cleanup-n-fail s)])]
-                   [else 
-                    (unify1 (logic-var-val t1) t2 s)])]
-            [(logic-var? t2) (unify1 t2 t1 s)]
-            [(and (pair? t1) (pair? t2))
-             (unify1 (cdr t1) (cdr t2)
-                     (unify1 (car t1) (car t2) s))]
-            [(and (mpair? t1) (mpair? t2))
-             (unify1 (mcdr t1) (mcdr t2)
-                     (unify1 (mcar t1) (mcar t2) s))]
-            [(and (box? t1) (box? t2))
-             (unify1 (unbox t1) (unbox t2) s)]
-            [(and (vector? t1) (vector? t2))
-             (if (= (vector-length t1)
-                    (vector-length t2))
-                 (for/fold ([s s])
-                   ([v1 (in-vector t1)]
-                    [v2 (in-vector t2)])
-                   (unify1 v1 v2 s))
-                 (cleanup-n-fail s))]
-            [(and (hash? t1) (hash? t2))
-             (if (and (same-hash-kind? t1 t2)
-                      (= (hash-count t1) (hash-count t2)))
-                 (for/fold ([s s])
-                   ([(xk xv) (in-hash t1)])
-                   (if (hash-has-key? t2 xk)
-                       (unify1 xv (hash-ref t2 xk) s)
-                       (cleanup-n-fail s)))
-                 (cleanup-n-fail s))]
-            [(and (compound-struct? t1) (compound-struct? t2))
-             (if (compound-struct-same? t1 t2)
-                 (for/fold ([s s])
-                   ([e1 (in-compound-struct t1)]
-                    [e2 (in-compound-struct t2)])
-                   (unify1 e1 e2 s))
-                 (cleanup-n-fail s))]
-            [(and (atom? t1) (atom? t2))
-             (if (equal? t1 t2) s
-                 (cleanup-n-fail s))]
-            [else
-             (cleanup-n-fail s)]))
-    (define s (unify1 t1 t2 empty))
-    (values
-     (λ () (cleanup s))
-     (lambda (d)
-       (cleanup-n-fail s)))))
-
-(define-syntax-rule (or* x f ...)
-  (or (f x) ...))
-
-(define (atomic-struct? v)
-  (not (compound-struct? v)))
-(define (compound-struct? v)
-  (let-values ([(stype skipped?) (struct-info v)])
-    (and stype (not skipped?))))
-
-(define (atom? x)
-  (or* x boolean? number? string? bytes? char? symbol?
-       regexp? pregexp? byte-regexp? byte-pregexp?
-       keyword? null? procedure? void? generic-set?
-       atomic-struct?))
-(define (compound? x)
-  (or* x pair? vector? mpair? box? hash? compound-struct?))
-
-(define (answer-value? x)
-  (uni-match 
-   x
-   [(? logic-var? x) #f]
-   [(cons l r) (and (answer-value? l) (answer-value? r))]
-   [(mcons l r) (and (answer-value? l) (answer-value? r))]
-   [(box v) (answer-value? v)]
-   [(? vector? v) (for/and ([e (in-vector v)]) (answer-value? e))]
-   [(? hash? ht) (for/and ([(k v) (in-hash ht)]) (and (answer-value? k) (answer-value? v)))]
-   [(? compound-struct? cs) (compound-struct-andmap answer-value? cs)]
-   [(? atom? x) #t]
-   [else #f]))
-(define answer?
-  (match-lambda
-    [#f #t]
-    [(list (cons (? symbol?) (? answer-value?)) ...) #t]
-    [_ #f]))
-(define (unifiable? x)
-  (uni-match 
-   x
-   [(? logic-var? x) #t]
-   [(cons l r) (and (unifiable? l) (unifiable? r))]
-   [(mcons l r) (and (unifiable? l) (unifiable? r))]
-   [(box v) (unifiable? v)]
-   [(? vector? v) (for/and ([e (in-vector v)]) (unifiable? e))]
-   [(? hash? ht) (for/and ([(k v) (in-hash ht)]) (and #;(answer-value? k) ; No constraint, but won't be used XXX
-                                                      (unifiable? v)))]
-   [(? compound-struct? cs) (compound-struct-andmap unifiable? cs)]
-   [(? atom? x) #t]
-   [else #f]))
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/info.rkt b/pkgs/rackunit-pkgs/rackunit-doc/info.rkt
deleted file mode 100644
index 8384e54dcd..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "RackUnit documentation")
-
-(define pkg-authors '(noel ryanc))
-(define build-deps '("racket-index"
-                     "racket-doc"
-                     "rackunit-gui"
-                     "rackunit-lib"
-                     "scribble-lib"))
-(define update-implies '("rackunit-lib"))
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/info.rkt b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/info.rkt
deleted file mode 100644
index d269e34c70..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define scribblings '(("scribblings/rackunit.scrbl" (multi-page) (tool))))
-
-(define test-responsibles '((all (jay noel ryanc))))
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/acknowledgements.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/acknowledgements.scrbl
deleted file mode 100644
index cda409d1c4..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/acknowledgements.scrbl
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@title{Acknowlegements}
-
-The following people have contributed to RackUnit:
-
-@itemize[
-  @item{Robby Findler pushed me to release version 3}
-
-  @item{Matt Jadud and his students at Olin College
-  suggested renaming @racket[test/text-ui]}
-
-  @item{Dave Gurnell reported a bug in check-not-exn and
-  suggested improvements to RackUnit}
-
-  @item{Danny Yoo reported a bug in and provided a fix for
-    trim-current-directory}
-
-  @item{Jacob Matthews and Guillaume Marceau for bug reports
-    and fixes}
-
-  @item{Eric Hanchrow suggested test/text-ui return a useful
-    result}
-
-  @item{Ray Racine and Richard Cobbe provided require/expose}
-
-  @item{John Clements suggested several new checks}
-
-  @item{Jose A. Ortega Ruiz alerted me a problem in the
-    packaging system and helped fix it.}
-
-  @item{Sebastian H. Seidel provided help packaging RackUnit
-    into a .plt}
-
-  @item{Don Blaheta provided the method for grabbing line number
-    and file name in checks}
-
-  @item{Patrick Logan ported example.rkt to version 1.3}
-
-  @item{The PLT team made Racket}
-
-  @item{The Extreme Programming community started the whole
-    testing framework thing}
-]
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/api.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/api.scrbl
deleted file mode 100644
index 32665de09c..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/api.scrbl
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@title[#:tag "api"]{RackUnit API}
-
-@defmodule[rackunit
-  #:use-sources (rackunit)]
-
-@include-section["overview.scrbl"]
-@include-section["check.scrbl"]
-@include-section["compound-testing.scrbl"]
-@include-section["control-flow.scrbl"]
-@include-section["misc.scrbl"]
-@include-section["ui.scrbl"]
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/base.rkt b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/base.rkt
deleted file mode 100644
index b33b3ec346..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/base.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-
-(require
- scribble/eval
- scribble/manual
-
- (for-label racket/base
-            racket/contract
-            rackunit
-            rackunit/text-ui
-            rackunit/gui))
-
-(provide
- (all-from-out scribble/eval
-               scribble/manual)
- (for-label (all-from-out racket/base
-                          racket/contract
-                          rackunit
-                          rackunit/text-ui
-                          rackunit/gui)))
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/check.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/check.scrbl
deleted file mode 100644
index e868fa344c..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/check.scrbl
+++ /dev/null
@@ -1,432 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@(require (for-label racket/match))
-
-@(define rackunit-eval (make-base-eval))
-@(interaction-eval #:eval rackunit-eval (require rackunit))
-@(interaction-eval #:eval rackunit-eval (error-print-context-length 0))
-
-@title{Checks}
-
-Checks are the basic building block of RackUnit.  A check
-checks some condition.  If the condition holds the check
-evaluates to @racket[(void)].  If the condition doesn't hold the
-check raises an instance of @racket[exn:test:check] with
-information detailing the failure.
-
-Although checks are implemented as macros, which is
-necessary to grab source location, they are conceptually
-functions (with the exception of @racket[check-match] below).
-This means, for instance, checks always evaluate
-their arguments.  You can use checks as first class
-functions, though you will lose precision in the reported
-source locations if you do so.
-
-The following are the basic checks RackUnit provides.  You
-can create your own checks using @racket[define-check].
-
-@defproc*[([(check-eq? (v1 any) (v2 any) (message string? "")) void?]
-           [(check-not-eq? (v1 any) (v2 any) (message string? "")) void?]
-           [(check-eqv? (v1 any) (v2 any) (message string? "")) void?]
-           [(check-not-eqv? (v1 any) (v2 any) (message string? "")) void?]
-           [(check-equal? (v1 any) (v2 any) (message string? "")) void?]
-           [(check-not-equal? (v1 any) (v2 any) (message string? "")) void?])]{
-
-Checks that @racket[v1] is equal (or not equal) to @racket[v2], using
-@racket[eq?], @racket[eqv?], or @racket[equal?], respectively. The
-optional @racket[message] is included in the output if the check
-fails.
-
-For example, the following checks all fail:
-
-@interaction[#:eval rackunit-eval
-  (check-eq? (list 1) (list 1) "allocated data not eq?")
-  (check-not-eq? 1 1 "fixnums are eq?")
-  (check-eqv? 1 1.0 "not eqv?")
-  (check-not-eqv? 1 1 "integers are eqv?")
-  (check-equal? 1 1.0 "not equal?")
-  (check-not-equal? (list 1) (list 1) "equal?")
-]
-}
-
-@defproc[(check-pred (pred (-> any any)) (v any) (message string? ""))
-         void?]{
-
-Checks that @racket[pred] returns a value that is not @racket[#f] when
-applied to @racket[v].  The optional @racket[message] is included in
-the output if the check fails. The value returned by a successful
-check is the value returned by @racket[pred].
-
-For example, the following check passes:
-@interaction[#:eval rackunit-eval
-  (check-pred string? "I work")
-]
-The following check fails:
-@interaction[#:eval rackunit-eval
-  (check-pred number? "I fail")
-]
-}
-
-@defproc[(check-= (v1 any) (v2 any) (epsilon number?) (message string? ""))
-         void?]{
-
-Checks that @racket[v1] and @racket[v2] are numbers within
-@racket[epsilon] of one another.  The optional
-@racket[message] is included in the output if the check
-fails.
-
-For example, the following check passes:
-
-@interaction[#:eval rackunit-eval
-  (check-= 1.0 1.01 0.02 "I work")
-]
-The following check fails:
-@interaction[#:eval rackunit-eval
-  (check-= 1.0 1.01 0.005 "I fail")
-]
-}
-
-@defproc*[([(check-true (v any) (message string? "")) void?]
-           [(check-false (v any) (message string? "")) void?]
-           [(check-not-false (v any) (message string? "")) void?])]{
-
-Checks that @racket[v] is @racket[#t], is @racket[#f], or is not
-@racket[#f], respectively.  The optional @racket[message] is included
-in the output if the check fails.
-
-For example, the following checks all fail:
-
-@interaction[#:eval rackunit-eval
-  (check-true 1)
-  (check-false 1)
-  (check-not-false #f)
-]
-}
-
-@defproc[(check-exn (exn-predicate (or/c (-> any any/c) regexp?))
-                    (thunk (-> any)) (message string? ""))
-         void?]{
-
-Checks that @racket[thunk] raises an exception and that either
-@racket[exn-predicate] returns @racket[#t] if it is a function, or
-that it matches the message in the exception if @racket[exn-predicate]
-is a regexp. In the latter case, the exception raised must be an
-@racket[exn:fail?].  The optional @racket[message] is included in the
-output if the check fails.  A common error is to use an expression
-instead of a function of no arguments for @racket[thunk].  Remember
-that checks are conceptually functions.
-
-For example, the following checks succeed:
-
-@interaction[#:eval rackunit-eval
-  (check-exn 
-   exn:fail? 
-   (lambda ()
-     (raise (make-exn:fail "Hi there"
-                           (current-continuation-marks)))))
-  (check-exn 
-   exn:fail? 
-   (lambda ()
-     (error 'hi "there")))
-]
-
-The following check fails:
-
-@interaction[#:eval rackunit-eval
-  (check-exn exn:fail?
-             (lambda ()
-               (break-thread (current-thread))))
-]
-
-The following example is a common mistake. The call to @racket[error]
-is not within a @racket[lambda], so it bypasses @racket[check-exn]
-entirely.
-
-@interaction[#:eval rackunit-eval
-  (code:comment "Forgot to wrap the expression in a thunk.  Don't do this!")
-  (check-exn exn:fail?
-             (error 'hi "there"))
-]
-}
-
-@defproc[(check-not-exn (thunk (-> any)) (message string? "")) void?]{
-
-Checks that @racket[thunk] does not raise any exceptions.
-The optional @racket[message] is included in the output if
-the check fails.
-
-@interaction[#:eval rackunit-eval
-                    (check-not-exn (λ () 1))
-                    (check-not-exn (λ () (car '())))
-                    (check-not-exn (λ () (/ 1 0)) "don't divide by 0")]
-
-}
-
-@defproc[(check-regexp-match (regexp regexp?)
-                             (string string?))
-         void?]{
-
-Checks that @racket[regexp] matches the @racket[string].
-
-
-For example, the following check succeeds:
-
-@interaction[#:eval rackunit-eval
-  (check-regexp-match "a+bba" "aaaaaabba")
-]
-
-The following check fails:
-
-@interaction[#:eval rackunit-eval
-  (check-regexp-match "a+bba" "aaaabbba")
-]
-}
-
-@defform*[((check-match v pattern)
-           (check-match v pattern pred))]{
-
-A check that pattern matches on the test value.  Matches the test value
-@racket[v] against @racket[pattern] as a @racket[match] clause.  If no
-@racket[pred] is provided, then if the match succeeds, the entire check
-succeeds.  For example, this use succeeds:
-
-@interaction[#:eval rackunit-eval
-  (check-match (list 1 2 3) (list _ _ 3))
-]
-
-This check fails to match:
-
-@interaction[#:eval rackunit-eval
-  (check-match (list 1 2 3) (list _ _ 4))
-]
-
-If @racket[pred] is provided, it is evaluated with the bindings from the
-match pattern.  If it produces @racket[#t], the entire check succeeds,
-otherwise it fails.  For example, this use succeeds, binding @racket[x]
-in the predicate:
-
-@interaction[#:eval rackunit-eval
-  (check-match (list 1 (list 3)) (list x (list _)) (odd? x))
-]
-
-This check fails because the @racket[pred] fails:
-
-@interaction[#:eval rackunit-eval
-  (check-match 6 x (odd? x))
-]
-
-This check fails because of a failure to match:
-
-@interaction[#:eval rackunit-eval
-  (check-match (list 1 2) (list x) (odd? x))
-]
-
-}
-
-
-@defproc[(check (op (-> any any any))
-                (v1 any)
-                (v2 any)
-                (message string? ""))
-         void?]{
-
-The most generic check.  Succeeds if @racket[op] applied to
-@racket[v1] and @racket[v2] is not @racket[#f], otherwise raises an
-exception of type @racket[exn:test:check].  The optional
-@racket[message] is included in the output if the check fails.
-
-For example, the following check succeeds:
-
-@interaction[#:eval rackunit-eval
-  (check < 2 3)
-]
-
-The following check fails:
-
-@interaction[#:eval rackunit-eval
-  (check memq 'pine '(apple orange pear))
-]
-}
-
-@defproc[(fail (message string? ""))
-         void?]{
-
-This check fails unconditionally.  Good for creating test stubs that
-you intend to fill out later.  The optional @racket[message] is
-included in the output.
-}
-
-@section{Augmenting Information on Check Failure}
-
-When a check fails it stores information including the name
-of the check, the location and message (if available), the
-expression the check is called with, and the parameters to
-the check.  Additional information can be stored by using
-the @racket[with-check-info*] function, and the
-@racket[with-check-info] macro.
-
-@defstruct[check-info ([name symbol?] [value any])]{
-
-A check-info structure stores information associated
-with the context of execution of a check.}
-
-The are several predefined functions that create check
-information structures with predefined names.  This avoids
-misspelling errors:
-
-@defproc*[([(make-check-name (name string?)) check-info?]
-           [(make-check-params (params (listof any))) check-info?]
-           [(make-check-location (loc (list/c any (or/c number? #f) (or/c number? #f) 
-                                                  (or/c number? #f) (or/c number? #f))))
-            check-info?]
-           [(make-check-expression (msg any)) check-info?]
-           [(make-check-message (msg string?)) check-info?]
-           [(make-check-actual (param any)) check-info?]
-           [(make-check-expected (param any)) check-info?])]{}
-
-@defproc[(with-check-info* (info (listof check-info?)) (thunk (-> any))) any]{
-
-Stores the given @racket[info] on the check-info stack for
-the duration (the dynamic extent) of the execution of
-@racket[thunk]}
-
-@interaction[#:eval rackunit-eval
-  (with-check-info*
-   (list (make-check-info 'time (current-seconds)))
-   (lambda () (check = 1 2)))
-]
-
-When this check fails the message
-
-@verbatim{time: <current-seconds-at-time-of-running-check>}
-
-is printed along with the usual information on an check failure.
-
-@defform[(with-check-info ((name val) ...) body ...)]{
-
-The @racket[with-check-info] macro stores the given
-information in the check information stack for the duration
-of the execution of the body expressions.  @racket[Name] is
-a quoted symbol and @racket[val] is any value.}
-
-@interaction[#:eval rackunit-eval
- (for-each
-  (lambda (elt)
-    (with-check-info
-     (('current-element elt))
-     (check-pred odd? elt)))
-  (list 1 3 5 7 8))
-]
-
-When this test fails the message
-
-@verbatim{current-element: 8}
-
-is displayed along with the usual information on an check failure.
-
-
-
-@section{Custom Checks}
-
-Custom checks can be defined using @racket[define-check] and
-its variants.  To effectively use these macros it is useful
-to understand a few details about a check's evaluation
-model.
-
-Firstly, a check should be considered a function, even
-though most uses are actually macros.  In particular, checks
-always evaluate their arguments exactly once before
-executing any expressions in the body of the checks.  Hence
-if you wish to write checks that evaluate user defined code
-that code must be wrapped in a thunk (a function of no
-arguments) by the user.  The predefined @racket[check-exn]
-is an example of this type of check.
-
-It is also useful to understand how the check information stack
-operates.  The stack is stored in a parameter and the
-@racket[with-check-info] forms evaluate to calls to
-@racket[parameterize].  For this reason simple checks (see below)
-cannot usefully contain calls to @racket[with-check-info] to report
-additional information.  All checks created using
-@racket[define-simple-check] or @racket[define-check] grab some
-information by default: the name of the checks and the values of the
-parameters.  Additionally the macro forms of checks grab location
-information and the expressions passed as parameters.
-
-@defform[(define-simple-check (name param ...) expr ...)]{
-
-The @racket[define-simple-check] macro constructs a check
-called @racket[name] that takes the params and an optional
-message as arguments and evaluates the @racket[expr]s.  The
-check fails if the result of the @racket[expr]s is
-@racket[#f].  Otherwise the check succeeds.  Note that
-simple checks cannot report extra information using
-@racket[with-check-info].}
-
-For example, the following code defines a check @racket[check-odd?]
-
-@interaction[#:eval rackunit-eval
-  (define-simple-check (check-odd? number)
-    (odd? number))
-]
-
-We can use these checks in the usual way:
-
-@interaction[#:eval rackunit-eval
-  (check-odd? 3)
-  (check-odd? 2) 
-]
-
-@defform*[[(define-binary-check (name pred actual expected))
-          (define-binary-check (name actual expected) expr ...)]]{
-
-The @racket[define-binary-check] macro constructs a check
-that tests a binary predicate.  It's benefit over
-@racket[define-simple-check] is in better reporting on check
-failure.  The first form of the macro accepts a binary
-predicate and tests if the predicate holds for the given
-values.  The second form tests if @racket[expr] non-false.
-}
-
-Here's the first form, where we use a predefined predicate
-to construct a binary check:
-
-@interaction[#:eval rackunit-eval
-  (define-binary-check (check-char=? char=? actual expected))
-]
-
-In use:
-
-@interaction[#:eval rackunit-eval
-  (check-char=? (read-char (open-input-string "a")) #\a)
-]
-
-If the expression is more complicated the second form should
-be used.  For example, below we define a binary check that
-tests a number if within 0.01 of the expected value:
-
-@interaction[#:eval rackunit-eval
-  (define-binary-check (check-in-tolerance actual expected)
-    (< (abs (- actual expected)) 0.01))
-]
-
-@defform[(define-check (name param ...) expr ...)]{
-
-The @racket[define-check] macro acts in exactly the same way
-as @racket[define-simple-check], except the check only fails
-if the macro @racket[fail-check] is called in the body of
-the check.  This allows more flexible checks, and in
-particular more flexible reporting options.}
-
-@defform*[[(fail-check)
-           (fail-check message-expr)]]{
-
-The @racket[fail-check] macro raises an @racket[exn:test:check] with
-the contents of the check information stack. The optional message
-is used as the exception's message.
-
-}
-
-
-@close-eval[rackunit-eval]
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/compound-testing.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/compound-testing.scrbl
deleted file mode 100644
index 8aad4ba8d8..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/compound-testing.scrbl
+++ /dev/null
@@ -1,179 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@title{Compound Testing Forms}
-
-@section{Test Cases}
-
-As programs increase in complexity the unit of testing
-grows beyond a single check. For example, it may be the case
-that if one check fails it doesn't make sense to run
-another.  To solve this problem compound testing forms can
-be used to group expressions.  If any expression in a group
-fails (by raising an exception) the remaining expressions
-will not be evaluated.
-
-@defform[(test-begin expr ...)]{
-
-A @racket[test-begin] form groups the @racket[expr]s into a
-single unit.  If any @racket[expr] fails the following ones
-are not evaluated.  }
-
-For example, in the following code the world is not
-destroyed as the preceding check fails:
-
-@racketblock[
-(test-begin
-  (check-eq? 'a 'b)
-  (code:comment "This line won't be run")
-  (destroy-the-world))
-]
-
-@defform[(test-case name body ...+)]{
-
-Like a @racket[test-begin] except a name is associated with
-the @racket[body]s.  The name will be reported if
-the test fails.  }
-
-Here's the above example rewritten to use @racket[test-case]
-so the test can be named.
-
-@racketblock[
-(test-case
-  "Example test"
-  (check-eq? 'a 'b)
-  (code:comment "This line won't be run")
-  (destroy-the-world))
-]
-
-
-@defproc[(test-case? (obj any)) boolean?]{
- True if @racket[obj] is a test case, and false otherwise.
-}
-
-@subsection{Shortcuts for Defining Test Cases}
-
-@defproc*[([(test-check [name string?]
-                        [operator (-> any/c any/c any/c)]
-                        [v1 any/c]
-                        [v2 any/c])
-            void?]
-           [(test-pred [name string?]
-                       [pred (-> any/c any/c)]
-                       [v any/c])
-            void?]
-           [(test-equal? [name string?] [v1 any/c] [v2 any/c]) (void?)]
-           [(test-eq? [name string?] [v1 any/c] [v2 any/c]) void?]
-           [(test-eqv? [name string?] [v1 any/c] [v2 any/c]) void?]
-           [(test-= [name string?] [v1 real?] [v2 real?] [epsilon real?]) void?]
-           [(test-true [name string?] [v any/c]) void?]
-           [(test-false [name string?] [v any/c]) void?]
-           [(test-not-false [name string?] [v any/c]) void?]
-           [(test-exn [name string?] [pred (or/c (-> any any/c) regexp?)] [thunk (-> any)]) void?]
-           [(test-not-exn [name string?] [thunk (-> any)]) void?])]{
-
-Creates a test case with the given @racket[name] that performs the
-corresponding check. For example,
-
-@racketblock[(test-equal? "Fruit test" "apple" "pear")]
-is equivalent to
-@racketblock[(test-case "Fruit test" (check-equal? "apple" "pear"))]
-}
-
-
-@section{Test Suites}
-
-Test cases can themselves be grouped into test suites.  A
-test suite can contain both test cases and test suites.
-Unlike a check or test case, a test suite is not immediately
-run.  Instead use one of the functions described in
-@secref["ui"] or @secref["running"].
-
-@defform/subs[(test-suite name-expr maybe-before maybe-after test ...)
-              ([maybe-before (code:line)
-                             (code:line #:before before-thunk)]
-               [maybe-after (code:line)
-                            (code:line #:after after-thunk)])
-              #:contracts ([name-expr string?])]{
-
-Constructs a test suite with the given name and tests.  The tests may
-be checks, test cases, constructed using @racket[test-begin] or
-@racket[test-case], or other test suites.
-
-The @racket[before-thunk] and @racket[after-thunk] are
-optional thunks (functions with no argument).  They are run
-before and after the tests are run, respectively. 
-
-Unlike a check or test case, a test suite is not immediately
-run.  Instead use one of the functions described in
-@secref["ui"] or @secref["running"].}
-
-For example, here is a test suite that displays @tt{Before}
-before any tests are run, and @tt{After} when the tests have
-finished.
-
-@racketblock[
-(test-suite
-  "An example suite"
-  #:before (lambda () (display "Before"))
-  #:after  (lambda () (display "After"))
-  (test-case
-    "An example test"
-    (check-eq? 1 1))
-  (test-suite "A nested test suite"
-    (test-case "Another test"
-      (check-< 1 2))))
-]
-
-@defproc[(make-test-suite [name string?]
-                          [tests (listof (or/c test-case? test-suite?))]
-                          [#:before before-thunk (-> any) void]
-                          [#:after after-thunk (-> any) void])
-         test-suite?]{
-
-Constructs a test suite with the given @racket[name] containing the
-given @racket[tests]. Unlike the @racket[test-suite] form, the tests
-are represented as a list of test values.
-}
-
-@defproc[(test-suite? (obj any)) boolean?]{ True if
-@racket[obj] is a test suite, and false otherwise}
-
-
-
-@subsection{Utilities for Defining Test Suites}
-
-There are some macros that simplify the common cases of
-defining test suites:
-
-@defform[(define-test-suite name test ...)]{ The
-@racket[define-test-suite] form creates a test suite with
-the given name (converted to a string) and tests, and binds
-it to the same name.}
-
-For example, this code creates a binding for the name
-@racket[example-suite] as well as creating a test suite with
-the name @racket["example-suite"]:
-
-@racketblock[
-(define-test-suite example-suite
-  (check = 1 1))
-]
-
-@defform[(define/provide-test-suite name test ...)]{ This
-form is just like @racket[define-test-suite], and in addition
-it @racket[provide]s the test suite.}
-
-@;{
-Finally, there is the @racket[test-suite*] macro, which
-defines a test suite and test cases using a shorthand
-syntax:
-
-@defform[(test-suite* name (test-case-name test-case-body
-...) ...)]{ Defines a test suite with the given name, and
-creates test cases within the suite, with the given names and
-body expressions.
-
-As far I know no-one uses this macro, so it might disappear
-in future versions of RackUnit.}
-}
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/control-flow.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/control-flow.scrbl
deleted file mode 100644
index 56a73077f3..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/control-flow.scrbl
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@title{Test Control Flow}
-
-The @racket[before], @racket[after], and @racket[around]
-macros allow you to specify code that is always run before,
-after, or around expressions in a test case.
-
-@defform[(before before-expr expr1 expr2 ...)]{
-
-Whenever control enters the scope execute the @racket[before-expr]
-before executing @racket[expr-1], and @racket[expr-2 ...]}
-
-@defform[(after expr-1 expr-2 ... after-expr)]{
-
-Whenever control exits the scope execute the @racket[after-expr]
-after executing @racket[expr-1], and @racket[expr-2 ...]  The @racket[after-expr] is
-executed even if control exits via an exception or other means.}
-
-@defform[(around before-expr expr-1 expr-2 ... after-expr)]{
-
-Whenever control enters the scope execute the
-@racket[before-expr] before executing @racket[expr-1 expr-2
-...], and execute @racket[after-expr] whenever control
-leaves the scope.}
-
-Example:
-
-The test below checks that the file @tt{test.dat} contains
-the string @tt{"foo"}.  The before action writes to this
-file.  The after action deletes it.
-
-@racketblock[
- (around
-   (with-output-to-file "test.dat"
-      (lambda ()
-        (write "foo")))
-   (with-input-from-file "test.dat"
-     (lambda ()
-       (check-equal? "foo" (read))))
-   (delete-file "test.dat"))
-]
-
-
-@defform[(delay-test test1 test2 ...)]{
-
-This somewhat curious macro evaluates the given tests in a
-context where @racket[current-test-case-around] is
-parameterized to @racket[test-suite-test-case-around].  This
-has been useful in testing RackUnit.  It might be useful
-for you if you create test cases that create test cases.}
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/file-test.rkt b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/file-test.rkt
deleted file mode 100644
index 1a54c72362..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/file-test.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require rackunit
-         "file.rkt")
-
-(check-equal? (my-+ 1 1) 2)
-(check-equal? (my-* 1 2) 2)
-
-(test-begin
- (let ((lst (list 2 4 6 9)))
-   (check = (length lst) 4)
-   (for-each
-    (lambda (elt)
-      (check-pred even? elt))
-    lst)))
-
-(test-case
-  "List has length 4 and all elements even"
-  (let ((lst (list 2 4 6 9)))
-    (check = (length lst) 4)
-    (for-each
-     (lambda (elt)
-       (check-pred even? elt))
-     lst)))
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/file.rkt b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/file.rkt
deleted file mode 100644
index 0db010ece0..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/file.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(define (my-+ a b)
-  (if (zero? a)
-      b
-      (my-+ (sub1 a) (add1 b))))
-
-(define (my-* a b)
-  (if (zero? a)
-      b
-      (my-* (sub1 a) (my-+ b b))))
-
-(provide my-+
-         my-*)
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/info.rkt b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/info.rkt
deleted file mode 100644
index 42edee6f51..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-omit-paths '("file-test.rkt"))
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/internals.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/internals.scrbl
deleted file mode 100644
index 2d901a97c9..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/internals.scrbl
+++ /dev/null
@@ -1,271 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@declare-exporting[rackunit #:use-sources (rackunit)]
-
-@title[#:tag "internals"]{RackUnit Internals and Extension API}
-
-This section describes RackUnit's facilities for customizing the
-behavior of checks and tests and for creating new kinds of test
-runners.
-
-@section{Customizing Check Evaluation}
-
-The semantics of checks are determined by the parameters
-@racket[current-check-around] and
-@racket[current-check-handler].  Other testing form such as
-@racket[test-begin] and @racket[test-suite] change the value
-of these parameters.
-
-@defparam[current-check-handler handler (-> any/c any)]{
-
-Parameter containing the function that handles exceptions
-raised by check failures.  The default value is @racket[raise].
-}
-
-@defparam[current-check-around check (-> (-> any) any)]{
-
-Parameter containing the function that handles the execution
-of checks.  The default value wraps the evaluation of
-@racket[thunk] in a @racket[with-handlers] call that calls
-@racket[current-check-handler] if an exception is raised and then
-(when an exception is not raised) discards the result, returning
-@racket[(void)]. 
-}
-
-@section{Customizing Test Evaluation}
-
-Just like with checks, there are several parameters that
-control the semantics of compound testing forms.
-
-@defparam[current-test-name name (or/c string? false/c)]{
-
-This parameter stores the name of the current test case.  A
-value of @racket[#f] indicates a test case with no name,
-such as one constructed by @racket[test-begin].
-}
-
-@defparam[current-test-case-around handler (-> (-> any) any)]{
-
-This parameter handles evaluation of test cases.  The value
-of the parameter is a function that is passed a thunk (a
-function of no arguments). The function, when applied,
-evaluates the expressions within a test case.  The default
-value of the @racket[current-test-case-around] parameters
-evaluates the thunk in a context that catches exceptions and
-prints an appropriate message indicating test case failure.
-}
-
-@defproc[(test-suite-test-case-around [thunk (-> any)]) any]{
-
-The @racket[current-test-case-around] parameter is
-parameterized to this value within the scope of a
-@racket[test-suite].  This function creates a test case
-structure instead of immediately evaluating the thunk.
-}
-
-@defproc[(test-suite-check-around [thunk (-> any/c)]) any/c]{
-
-The @racket[current-check-around] parameter is parameterized
-to this value within the scope of a @racket[test-suite].
-This function creates a test case structure instead of
-immediately evaluating a check.
-}
-
-@;{--------}
-
-@section[#:tag "running"]{Programmatically Running Tests and Inspecting Results}
-
-RackUnit provides an API for running tests, from which
-custom UIs can be created.
-
-@subsection{Result Types}
-
-@defstruct[(exn:test exn:fail) ()]{
-
-The base structure for RackUnit exceptions.  You should
-never catch instances of this type, only the subtypes
-documented below.}
-
-@defstruct[(exn:test:check exn:test) ([stack (listof check-info)])]{
-
-A @racket[exn:test:check] is raised when an check fails, and
-contains the contents of the check-info stack at the
-time of failure.}
-
-@defstruct[test-result ([test-case-name (or/c string #f)])]{
-
-A test-result is the result of running the test with
-the given name (with @racket[#f] indicating no name is available).}
-
-@defstruct[(test-failure test-result) ([result any])]{
-
-Subtype of test-result representing a test failure.}
-
-@defstruct[(test-error test-result) ([result exn])]{
-
-Subtype of test-result representing a test error.}
-
-@defstruct[(test-success test-result) ([result any])]{
-
-Subtype of test-result representing a test success.}
-
-
-@subsection{Functions to Run Tests}
-
-@defproc[(run-test-case (name (or/c string #f)) (action (-> any)))
-         test-result]{
-
-Runs the given test case, returning a result representing success,
-failure, or error.
-}
-
-
-@defproc[(run-test (test (or/c test-case? test-suite?)))
-         (flat-murec-contract ([R (listof (or/c test-result? R))]) R)]{
-
-Runs the given test (test case or test suite) returning a
-tree (list of lists) of results}
-
-Example:
-
-@racketblock[
-  (run-test
-     (test-suite
-      "Dummy"
-      (test-case "Dummy" (check-equal? 1 2))))
-]
-
-@defproc[(fold-test-results [result-fn ('b 'c ... 'a . -> . 'a)]
-                            [seed 'a]
-			    [test (or/c test-case? test-suite?)]
-			    [#:run run (string (() -> any) . -> . 'b 'c ...)]
- 			    [#:fdown fdown (string 'a . -> . 'a)] 
-			    [#:fup fup (string 'a . -> . 'a)])
-          'a]{
-
-Fold @racket[result-fn] pre-order left-to-right depth-first
-over the results of @racket[run].  By default @racket[run]
-is @racket[run-test-case] and @racket[fdown] and
-@racket[fup] just return the seed, so @racket[result-fn] is
-folded over the test results.
-
-This function is useful for writing custom folds (and hence UIs) over
-test results without you having to take care of all the expected setup
-and teardown.  For example, @racket[fold-test-results] will run test
-suite before and after actions for you.  However it is still flexible
-enough, via its keyword arguments, to do almost anything that
-@racket[foldts-test-suite] can.  Hence it should be used in preference to @racket[foldts-test-suite].
-
-The @racket[result-fn] argument is a function from the results of
-@racket[run] (defaults to a @racket[test-result]) and the seed to a
-new seed.
-
-The @racket[seed] argument is any value.
-
-The @racket[test] argument is a test case or test suite.
-
-The @racket[run] argument is a function from a test case name (string)
-and action (thunk) to any values. The values produced by @racket[run]
-are fed into the @racket[result-fn].
-
-The @racket[fdown] argument is a function from a test suite name
-(string) and the seed, to a new seed.
-
-The @racket[fup] argument is a function from a test suite name
-(string) and the seed, to a new seed.
-}
-
-Examples:
-
-The following code counts the number of successes:
-
-@racketblock[
-(define (count-successes test)
-  (fold-test-results
-   (lambda (result seed)
-     (if (test-success? result)
-         (add1 seed)
-         seed))
-   0
-   test))]
-
-The following code returns the symbol @racket['burp] instead
-of running test cases.  Note how the @racket[result-fn] receives the
-value of @racket[run].
-
-@racketblock[
-(define (burp test)
-  (fold-test-results
-   (lambda (result seed) (cons result seed))
-   null
-   test
-   #:run (lambda (name action) 'burp)))]
-
-
-@defproc[(foldts-test-suite [fdown (test-suite string thunk thunk 'a -> 'a)]
-		 [fup (test-suite string thunk thunk 'a 'a -> 'a)]
-		 [fhere(test-case string thunk 'a -> 'a)]
-		 [seed 'a]
-		 [test (or/c test-case? test-suite?)])
-    		 'a]{
-
-The @racket[foldts-test-suite] function is a nifty tree fold (created by Oleg
-Kiselyov) that folds over a test in a useful way
-(@racket[fold-test-results] isn't that useful as you can't specify
-actions around test cases).
-
-The @racket[fdown] argument is a function of test suite, test suite
-name, before action, after action, and the seed.  It is run when a
-test suite is encountered on the way down the tree (pre-order).
-
-The @racket[fup] argument is a function of test suite, test suite
-name, before action, after action, the seed at the current level, and
-the seed returned by the children.  It is run on the way up the tree
-(post-order).
-
-The @racket[fhere] argument is a function of the test case, test case
-name, the test case action, and the seed. (Note that this might change
-in the near future to just the test case.  This change would be to
-allow @racket[fhere] to discriminate subtypes of test-case, which in
-turn would allow test cases that are, for example, ignored).
-}
-
-Example:
-
-Here's the implementation of @racket[fold-test-results] in terms of
-@racket[foldts-test-suite]:
-
-@racketblock[
-(define (fold-test-results suite-fn case-fn seed test)
-  (foldts-test-suite
-   (lambda (suite name before after seed)
-     (before)
-     (suite-fn name seed))
-   (lambda (suite name before after seed kid-seed)
-     (after)
-     kid-seed)
-   (lambda (case name action seed)
-     (case-fn
-       (run-test-case name action)
-       seed))
-   seed
-   test))
-]
-
-If you're used to folds you'll probably be a bit surprised that the
-functions you pass to @racket[foldts-test-suite] receive both the structure they
-operate on, and the contents of that structure.  This is indeed
-unusual.  It is done to allow subtypes of test-case and test-suite to
-be run in customised ways.  For example, you might define subtypes of
-test case that are ignored (not run), or have their execution time
-recorded, and so on.  To do so the functions that run the test cases
-need to know what type the test case has, and hence is is necessary to
-provide this information.
-
-If you've made it this far you truly are a master RackUnit hacker.  As
-a bonus prize we'll just mention that the code in
-@racketfont{hash-monad.rkt} and @racketfont{monad.rkt} might be of
-interest for constructing user interfaces.  The API is still in flux,
-so isn't documented here.  However, do look at the implementation of
-@racket[run-tests] for examples of use.
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/misc.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/misc.scrbl
deleted file mode 100644
index d7239c0bc4..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/misc.scrbl
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@title{Miscellaneous Utilities}
-
-The @racket[require/expose] macro allows you to access
-bindings that a module does not provide.  It is useful for
-testing the private functions of modules.
-
-@defform[(require/expose module (id ...))]{
-
-Requires @racket[id] from @racket[module] into the current module.  It
-doesn't matter if the source module provides the bindings or not;
-@racket[require/expose] can still get at them.
-
-Note that @racket[require/expose] can be a bit fragile,
-especially when mixed with compiled code.  Use at your own risk!
-}
-
-This example gets @racket[make-failure-test], which is defined in a RackUnit test:
-
-@racketblock[
-(require/expose rackunit/private/check-test (make-failure-test))
-]
-
-@defproc[(dynamic-require/expose [mod (or/c module-path?
-                                            module-path-index?
-                                            resolved-module-path?)]
-                                 [name symbol?])
-         any]{
-
-Like @racket[dynamic-require], but gets internal bindings like
-@racket[require/expose].
-}
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/overview.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/overview.scrbl
deleted file mode 100644
index 6c05a19c83..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/overview.scrbl
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@title{Overview of RackUnit}
-
-There are three basic concepts in RackUnit:
-
-@itemize[
-
-@item{A @italic{check} is the basic unit of a test.  As the name
-suggests, it checks some condition is true.}
-
-@item{A @italic{test case} is a group of checks that form one
-conceptual unit.  If any check within the case fails, the entire case
-fails.}
-
-@item{A @italic{test suite} is a group of test cases and test suites
-that has a name.}
-]
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/philosophy.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/philosophy.scrbl
deleted file mode 100644
index de659850d3..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/philosophy.scrbl
+++ /dev/null
@@ -1,118 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@title[#:tag "philosophy"]{The Philosophy of RackUnit}
-
-RackUnit is designed to allow tests to evolve in step with
-the evolution of the program under testing.  RackUnit
-scales from the unstructured checks suitable for simple
-programs to the complex structure necessary for large
-projects.
-
-Simple programs, such as those in How to Design Programs,
-are generally purely functional with no setup required to
-obtain a context in which the function may operate.
-Therefore the tests for these programs are extremely simple:
-the test expressions are single checks, usually for
-equality, and there are no dependencies between expressions.
-For example, a HtDP student may be writing simple list
-functions such as length, and the properties they are
-checking are of the form:
-
-@racketblock[
-  (equal? (length null) 0)
-  (equal? (length '(a)) 1)
-  (equal? (length '(a b)) 2)
-]
-
-RackUnit directly supports this style of testing.  A check
-on its own is a valid test.  So the above examples may be
-written in RackUnit as:
-
-@racketblock[
-  (check-equal? (length null) 0)
-  (check-equal? (length '(a)) 1)
-  (check-equal? (length '(a b)) 2)
-]
-
-Simple programs now get all the benefits of RackUnit with
-very little overhead.
-
-There are limitations to this style of testing that more
-complex programs will expose.  For example, there might be
-dependencies between expressions, caused by state, so that
-it does not make sense to evaluate some expressions if
-earlier ones have failed.  This type of program needs a way
-to group expressions so that a failure in one group causes
-evaluation of that group to stop and immediately proceed to
-the next group.  In RackUnit all that is required is to
-wrap a @racket[test-begin] expression around a group of
-expressions:
-
-@racketblock[
-  (test-begin
-    (setup-some-state!)
-    (check-equal? (foo! 1) 'expected-value-1)
-    (check-equal? (foo! 2) 'expected-value-2))
-]
-
-Now if any expression within the @racket[test-begin]
-expression fails no further expressions in that group will
-be evaluated.
-
-Notice that all the previous tests written in the simple
-style are still valid.  Introducing grouping is a local
-change only.  This is a key feature of RackUnit's support
-for the evolution of the program.
-
-The programmer may wish to name a group of tests.  This is
-done using the @racket[test-case] expression, a simple
-variant on test-begin:
-
-@racketblock[
-  (test-case
-    "The name"
-    ... test expressions ...)
-]
-
-Most programs will stick with this style. However,
-programmers writing very complex programs may wish to
-maintain separate groups of tests for different parts of the
-program, or run their tests in different ways to the normal
-RackUnit manner (for example, test results may be logged
-for the purpose of improving software quality, or they may
-be displayed on a website to indicate service quality). For
-these programmers it is necessary to delay the execution of
-tests so they can be processed in the programmer's chosen
-manner. To do this, the programmer simply wraps a test-suite
-around their tests:
-
-@racketblock[
-  (test-suite
-    "Suite name"
-    (check ...)
-    (test-begin ...)
-    (test-case ...))
-]
-
-The tests now change from expressions that are immediately
-evaluated to objects that may be programmatically
-manipulated. Note again this is a local change. Tests
-outside the suite continue to evaluate as before.  
-  
-
-@section{Historical Context}
-
-Most testing frameworks, including earlier versions of
-RackUnit, support only the final form of testing. This is
-likely due to the influence of the SUnit testing framework,
-which is the ancestor of RackUnit and the most widely used
-frameworks in Java, .Net, Python, and Ruby, and many other
-languages. That this is insufficient for all users is
-apparent if one considers the proliferation of ``simpler''
-testing frameworks in Scheme such as SRFI-78, or the
-practice of beginner programmers. Unfortunately these
-simpler methods are inadequate for testing larger
-systems. To the best of my knowledge RackUnit is the only
-testing framework that makes a conscious effort to support
-the testing style of all levels of programmer.
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/quick-start.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/quick-start.scrbl
deleted file mode 100644
index fefa721068..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/quick-start.scrbl
+++ /dev/null
@@ -1,166 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@title[#:tag "quick-start"]{Quick Start Guide for RackUnit}
-
-Suppose we have code contained in @tt{file.rkt}, which
-implements buggy versions of @racket[+] and @racket[*]
-called @racket[my-+] and @racket[my-*]:
-
-@racketmod[
-racket/base
-
-(define (my-+ a b)
-  (if (zero? a)
-      b
-      (my-+ (sub1 a) (add1 b))))
-
-(define (my-* a b)
-  (if (zero? a)
-      b
-      (my-* (sub1 a) (my-+ b b))))
-
-(provide my-+
-         my-*)
-]
-
-We want to test this code with RackUnit.  We start by
-creating a file called @tt{file-test.rkt} to contain our
-tests.  At the top of @tt{file-test.rkt} we import
-RackUnit and @tt{file.rkt}:
-
-@racketmod[
-racket/base
-
-(require rackunit
-         "file.rkt")
-]
-
-Now we add some tests to check our library:
-
-@racketblock[
-(check-equal? (my-+ 1 1) 2 "Simple addition")
-(check-equal? (my-* 1 2) 2 "Simple multiplication")
-]
-
-This is all it takes to define tests in RackUnit.  Now
-evaluate this file and see if the library is correct.
-Here's the result I get:
-
-@verbatim{
---------------------
-FAILURE
-name:       check-equal?
-location:   (file-test.rkt 7 0 117 27)
-expression: (check-equal? (my-* 1 2) 2)
-params:     (4 2)
-message:    "Simple multiplication"
-actual:     4
-expected:   2
-
---------------------}
-
-The first test passed and so prints nothing.  The
-second test failed, as shown by the message.
-
-Requiring RackUnit and writing checks is all you need to
-get started testing, but let's take a little bit more time
-to look at some features beyond the essentials.
-
-Let's say we want to check that a number of properties hold.
-How do we do this?  So far we've only seen checks of a
-single expression.  In RackUnit a check is always a single
-expression, but we can group checks into units called test
-cases.  Here's a simple test case written using the
-@racket[test-begin] form:
-
-@racketblock[
-(test-begin
- (let ([lst (list 2 4 6 9)])
-   (check = (length lst) 4)
-   (for-each
-    (lambda (elt)
-      (check-pred even? elt))
-    lst)))
-]
-
-Evalute this and you should see an error message like:
-
-@verbatim{
---------------------
-A test 
-... has a FAILURE
-name:       check-pred
-location:   (#<path:/Users/noel/programming/schematics/rackunit/branches/v3/doc/file-test.rkt> 14 6 252 22)
-expression: (check-pred even? elt)
-params:     (#<procedure:even?> 9)
---------------------
-}
-
-This tells us that the expression @racket[(check-pred even?
-elt)] failed.  The arguments of this check were
-@racket[even?] and @racket[9], and as 9 is not even the
-check failed.  A test case fails as soon as any check within
-it fails, and no further checks are evaluated once this
-takes place.
-
-Naming our test cases is useful as it helps remind us what
-we're testing.  We can give a test case a name with the
-@racket[test-case] form:
-
-@racketblock[
-(test-case
- "List has length 4 and all elements even"
- (let ([lst (list 2 4 6 9)])
-   (check = (length lst) 4)
-   (for-each
-    (lambda (elt)
-      (check-pred even? elt))
-    lst)))
-]
-
-Now if we want to structure our tests a bit more we can
-group them into a test suite:
-
-@racketblock[
-  (define file-tests
-    (test-suite
-     "Tests for file.rkt"
-
-     (check-equal? (my-+ 1 1) 2 "Simple addition")
-
-     (check-equal? (my-* 1 2) 2 "Simple multiplication")
-
-     (test-case
-      "List has length 4 and all elements even"
-      (let ([lst (list 2 4 6 9)])
-        (check = (length lst) 4)
-        (for-each
-          (lambda (elt)
-            (check-pred even? elt))
-        lst)))))
-]
-
-Evaluate the module now and you'll see the tests no longer
-run.  This is because test suites delay execution of their
-tests, allowing you to choose how you run your tests.  You
-might, for example, print the results to the screen or log
-them to a file.
-
-Let's run our tests, using RackUnit's simple textual user
-interface (there are fancier interfaces available but this
-will do for our example).  In @tt{file-test.rkt} add the
-following lines:
-
-@racketblock[
-  (require rackunit/text-ui)
-
-  (run-tests file-tests)
-]
-
-Now evaluate the file and you should see similar output
-again.
-
-These are the basics of RackUnit.  Refer to the
-documentation below for more advanced topics, such as
-defining your own checks.  Have fun!
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/rackunit.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/rackunit.scrbl
deleted file mode 100644
index b4758e1766..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/rackunit.scrbl
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@title{RackUnit: Unit Testing}
-
-@author[(author+email "Noel Welsh" "noelwelsh@gmail.com")
-        (author+email "Ryan Culpepper" "ryanc@racket-lang.org")]
-
-RackUnit is a unit-testing framework for Racket.  It
-is designed to handle the needs of all Racket programmers,
-from novices to experts.
-
-@table-of-contents[]
-
-@include-section["quick-start.scrbl"]
-@include-section["philosophy.scrbl"]
-@include-section["api.scrbl"]
-@include-section["utils.scrbl"]
-@include-section["internals.scrbl"]
-@include-section["release-notes.scrbl"]
-@include-section["acknowledgements.scrbl"]
-
-@index-section[]
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/release-notes.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/release-notes.scrbl
deleted file mode 100644
index a4f0bed673..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/release-notes.scrbl
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@title{Release Notes}
-
-@section{Version 3.4}
-
-This version allows arbitrary expressions within test
-suites, fixing the semantics issue below.
-
-There are also miscellaneous Scribble fixes.
-
-@section{Version 3}
-
-This version of RackUnit is largely backwards compatible
-with version 2 but there are significant changes to the
-underlying model, justifying incrementing the major version
-number.  These changes are best explained in
-@secref["philosophy"].
-
-There are a few omissions in this release, that will
-hopefully be corrected in later minor version releases:
-
-@itemize[
-
-@item{There is no graphical UI, and in particular no
-integration with DrRacket.}
-
-@item{The semantics of @racket[test-suite] are not the
-desired ones.  In particular, only checks and test cases
-have their evaluation delayed by a test suite; other
-expressions will be evaluated before the suite is
-constructed.  This won't affect tests written in the version
-2 style.  In particular this doesn't effect test suites that
-contain other test suites; they continue to work in the
-expected way.  However people incrementally developing tests
-from plain checks to test suites might be surprised.  I'm
-hoping that few enough people will do this that no-one will
-notice before it's fixed.}
-
-]
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/ui.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/ui.scrbl
deleted file mode 100644
index ececf6f7ef..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/ui.scrbl
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang scribble/doc
-@(require "base.rkt")
-
-@title[#:tag  "ui"]{User Interfaces}
-
-RackUnit provides a textual and a graphical user interface
-
-@section{Textual User Interface}
-
-@defmodule[rackunit/text-ui]
-
-The textual UI is in the @racketmodname[rackunit/text-ui] module.
-It is run via the @racket[run-tests] function.
-
-@defproc[(run-tests (test (or/c test-case? test-suite?))
-                    (verbosity (symbols 'quiet 'normal 'verbose) 'normal))
-         natural-number/c]{
-
-The given @racket[test] is run and the result of running it
-output to the @racket[current-output-port].  The output is
-compatable with the (X)Emacs next-error command (as used,
-for example, by (X)Emacs's compile function)
-
-The optional @racket[verbosity] is one of @racket['quiet],
-@racket['normal], or @racket['verbose].  Quiet output
-displays only the number of successes, failures, and errors.
-Normal reporting suppresses some extraneous check
-information (such as the expression).  Verbose reports all
-information.
-
-@racket[run-tests] returns the number of unsuccessful tests.}
-
-
-@section{Graphical User Interface}
-
-@defmodule[rackunit/gui]
-
-RackUnit also provides a GUI test runner, available from the
-@racketmodname[rackunit/gui] module.
-
-@defproc[(test/gui [test (or/c test-case? test-suite?)] ...
-                   [#:wait? wait? boolean? #f])
-         void?]{
-
-Creates a new RackUnit GUI window and runs each @racket[test]. The
-GUI is updated as tests complete.
-
-When @racket[wait?] is true, @racket[test/gui] does not return until
-the test runner window has been closed.
-}
-
-@defproc[(make-gui-runner)
-         (-> (or/c test-case? test-suite?) ... any)]{
-
-Creates a new RackUnit GUI window and returns a procedure that, when
-applied, runs the given tests and displays the results in the GUI.
-
-}
diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/utils.scrbl b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/utils.scrbl
deleted file mode 100644
index e9309ab2d7..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/utils.scrbl
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label racket
-                     rackunit/log
-                     rackunit/docs-complete))
-
-@title{Testing Utilities} 
-
-@section{Checking documentation completeness}
-@defmodule[rackunit/docs-complete]
-
-@defproc[(check-docs [lib symbol?]
-                     [#:skip skip 
-                             (or/c regexp? 
-                                   symbol?
-                                   (listof (or/c regexp? symbol?))
-                                   (-> symbol? any)
-                                   #f)
-                             #f])
-         any]{
-              
-Checks to see if the module path named by @racket[lib] (e.g. @racket['racket/list])
-has documented all of its exports and prints an error message to
-@racket[(current-error-port)] if not.
-
-If @racket[skip] is a regexp, then exporting matching that regexp
-are ignored. If it is a symbol, then that export is ignored. If
-it is a list of symbols and regexps, then any exporting matching any of the 
-symbols or regexps are ignored. If it is a function, the function is treated
-as a predicate and passed each export of the module. If @racket[skip] is
-@racket[#f], no exports are skipped.
-}
-
-@section{Logging Test Results}
-@defmodule[rackunit/log]
-
-Rackunit provides a general purpose library for tracking test results
-and displaying a summary message.
-
-@defproc[(test-log! [result any/c])
-         void?]{
-
-Adds a test result to the running log. If @racket[result] is false,
-then the test is considered a failure.
-
-}
-
-@defproc[(test-log [#:display? display? boolean? #t]
-                   [#:exit? exit? boolean? #t])
-         void?]{
-
-Processes the running test log. If @racket[display?] is true, then a
-message is displayed. If there were failures, the message is printed
-on @racket[(current-error-port)]. If @racket[exit?] is true, then if
-there were failures, calls @racket[(exit 1)].
-
-}
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/info.rkt b/pkgs/rackunit-pkgs/rackunit-gui/info.rkt
deleted file mode 100644
index b0175a64ba..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/info.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("rackunit-lib"
-               "data-lib"
-               "gui-lib"
-               "unstable-list-lib" ; for class-iop
-               "base"))
-
-(define pkg-desc "RackUnit test runner GUI")
-
-(define pkg-authors '(ryanc))
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/gui.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/gui.rkt
deleted file mode 100644
index 811625e969..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/gui.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         racket/gui/base
-         rackunit/private/base
-         rackunit/private/gui/gui)
-
-(define (test/gui #:wait? [wait? #f]
-                  . tests)
-  (let* ([es (make-eventspace)]
-         [runner
-          (parameterize ((current-eventspace es))
-            (make-gui-runner))])
-    (sleep/yield 0.1) ;; give the gui a chance to initialize
-    (apply runner tests)
-    (when wait? (void (sync es)))))
-
-(define test/c (or/c rackunit-test-case? rackunit-test-suite?))
-
-(provide/contract
- [test/gui
-  (->* ()
-       (#:wait? any/c)
-       #:rest (listof test/c)
-       any)]
- [make-gui-runner
-  (->* ()
-       ()
-       (->* () () #:rest (listof test/c)
-            any))])
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/cache-box.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/cache-box.rkt
deleted file mode 100644
index 9d141db3c3..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/cache-box.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang racket/base
-(require racket/contract/base)
-
-;; Add a new kind of promise instead?
-
-;; FIXME: handle exceptions like promises?
-
-(define (make-cache* thunk)
-  (make-cache thunk #f))
-
-(define (cache-ref cb)
-  (let ([result (cache-result cb)])
-    (if result
-        (apply values result)
-        (call-with-values (cache-thunk cb)
-          (lambda result
-            (set-cache-result! cb result)
-            (apply values result))))))
-
-(define (cache-invalidate! cb)
-  (set-cache-result! cb #f))
-
-(define (cache-printer cb port write?)
-  (let ([result (cache-result cb)])
-    (if result
-        (fprintf port
-                 (if write? "#<cache!~s>" "#<cache!~a>")
-                 (if (and (pair? result) (null? (cdr result)))
-                     (car result)
-                     (cons 'values result)))
-        (fprintf port "#<cache>"))))
-
-(define-struct cache (thunk [result #:mutable])
-  #:property prop:custom-write cache-printer)
-
-(define-syntax-rule (cache* expr)
-  (make-cache* (lambda () expr)))
-
-(provide (rename-out [cache* cache]))
-(provide/contract
- [rename make-cache* make-cache
-  (-> (-> any) cache?)]
- [cache?
-  (-> any/c boolean?)]
- [cache-ref
-  (-> cache? any)]
- [cache-invalidate!
-  (-> cache? any)])
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/config.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/config.rkt
deleted file mode 100644
index dbfee0fdf4..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/config.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-(require framework/preferences
-         unstable/gui/prefs)
-(provide (all-defined-out))
-
-;; Frame size preferences
-
-(preferences:set-default 'rackunit:frame:width 400 exact-positive-integer?)
-(preferences:set-default 'rackunit:frame:height 400 exact-positive-integer?)
-(define pref:width (pref:get/set 'rackunit:frame:width))
-(define pref:height (pref:get/set 'rackunit:frame:height))
-
-;; CONSTANTS
-;; Some of these are obsolete, given the preferences above.
-
-(define DETAILS-CANVAS-INIT-WIDTH 400)
-(define FRAME-LABEL "RackUnit")
-(define FRAME-INIT-HEIGHT 400)
-(define TREE-INIT-WIDTH 240)
-(define TREE-COLORIZE-CASES #t)
-(define DIALOG-ERROR-TITLE "RackUnit: Error")
-(define STATUS-SUCCESS 'success)
-(define STATUS-FAILURE 'failure)
-(define STATUS-ERROR 'error)
-(define STATUS-UNEXECUTED 'unexecuted)
-(define VIEW-PANE-PERCENTS 
-  (let [(total (+ DETAILS-CANVAS-INIT-WIDTH TREE-INIT-WIDTH))]
-    (list (/ TREE-INIT-WIDTH total) (/ DETAILS-CANVAS-INIT-WIDTH total))))
-
-;; Conventional assertion-info keys.
-;; These must be kept in sync with assert-base.rkt.
-(define prop:failure-assertion 'name)
-(define prop:failure-parameters 'params)
-(define prop:failure-location 'location)
-(define prop:failure-message 'message)
-(define prop:test-case-location 'test-case-location)
-
-;; / CONSTANTS
-
-(define (known-property? s)
-  (case s
-    ((name params location message test-case-location) #t)
-    ((actual expected) #t)
-    ((expression) #t)
-    (else #f)))
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/controller.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/controller.rkt
deleted file mode 100644
index 10542d4273..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/controller.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang racket/base
-(require racket/class
-         unstable/class-iop
-         unstable/gui/notify
-         rackunit/private/base
-         "interfaces.rkt"
-         "model.rkt")
-(provide controller%)
-
-(define controller%
-  (class* object% (controller<%>)
-    (super-new)
-
-    ;; model-shown : (notify-box (U model<%> #f))
-    ;; The model currently displayed in the Details view, of #f is none.
-    (define-notify selected-model (new notify-box% (value #f)))
-
-    ;; locked? : (notify-box boolean)
-    (define-notify locked? (new notify-box% (value #f)))
-
-    ;; view : #f or view<%>
-    (define view #f)
-
-    ;; check-ready : -> void
-    (define/private (check-ready)
-      (unless view
-        (error 'rackunit "The RackUnit GUI is no longer running."))
-      (when (get-locked?)
-        (error 'rackunit "The RackUnit GUI is locked and not accepting tests.")))
-
-    ;; create-model : test suite<%>/#f -> result<%>
-    (define/public (create-model test parent)
-      (define _ (check-ready))
-      (define result
-        (cond [(rackunit-test-case? test)
-               (new case-result%
-                    (controller this)
-                    (test test)
-                    (name (or (rackunit-test-case-name test)
-                              "<unnamed test-case>"))
-                    (parent parent))]
-              [(rackunit-test-suite? test)
-               (new suite-result%
-                    (controller this)
-                    (test test)
-                    (name (or (rackunit-test-suite-name test)
-                              "<unnamed test-suite>"))
-                    (parent parent))]))
-      (send/i view view<%> create-view-link result parent)
-      result)
-
-    ;; on-model-status-change : model<%> -> void
-    (define/public (on-model-status-change model)
-      (let ([view view]) ;; view field is async. mutable!
-        (when view (send view queue-for-update model)))
-      (let [(parent (send model get-parent))]
-        (when parent (send parent on-child-status-change model))))
-
-    ;; register-view : view<%> -> void
-    (define/public (register-view v)
-      (set! view v))
-
-    ;; on-view-shutdown : -> void
-    (define/public (on-view-shutdown)
-      (set! view #f))
-    ))
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/drracket-link.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/drracket-link.rkt
deleted file mode 100644
index e247e9af6f..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/drracket-link.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-;; Written in #%kernel to avoid adding any module-attachment
-;; dependencies. Initialized by the DrRacket integration tool.
-
-(module drracket-link '#%kernel
-  (#%provide link)
-
-  #|
-
-  If initialized (has non-#f value), the box should contain a vector
-  of the following procedures:
-  
-  (vector get-errortrace-backtrace
-          show-backtrace
-          show-source)
-  |#
-
-  (define-values (link) (box #f)))
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/drracket-ui.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/drracket-ui.rkt
deleted file mode 100644
index 35c7efc26e..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/drracket-ui.rkt
+++ /dev/null
@@ -1,94 +0,0 @@
-#lang racket/base
-(require "drracket-link.rkt")
-
-;; Procedures which *may* be overridden by DrRacket to do useful things.
-;; Or they may not be.
-
-(provide has-backtrace?
-         has-errortrace-backtrace?
-         has-primitive-backtrace?
-         show-errortrace-backtrace
-         show-primitive-backtrace
-         can-show-source?
-         show-source)
-
-;; A Backtrace is one of
-;;   - exn
-;;   - (listof srcloc)
-
-(define USE-PRIMITIVE-STACKTRACE? #f)
-
-;; has-backtrace? : exn -> boolean
-(define (has-backtrace? exn)
-  (or (has-errortrace-backtrace? exn)
-      (has-primitive-backtrace? exn)))
-
-;; has-errortrace-backtrace? : exn -> boolean
-(define (has-errortrace-backtrace? exn)
-  (not (null? (get-errortrace-backtrace exn))))
-
-;; has-primitive-backtrace? : exn -> boolean
-(define (has-primitive-backtrace? exn)
-  (and USE-PRIMITIVE-STACKTRACE?
-       (pair? (get-primitive-backtrace exn))))
-
-;; get-errortrace-backtrace : exn -> Backtrace
-(define (get-errortrace-backtrace exn)
-  ((get-errortrace-backtrace*) exn))
-
-;; get-primitive-backtrace : exn -> Backtrace
-(define (get-primitive-backtrace exn)
-  (let* ([ctx (continuation-mark-set->context
-               (exn-continuation-marks exn))]
-         [srclocs (map cdr ctx)])
-    (filter (lambda (s)
-              (and (srcloc? s)
-                   (let ([src (srcloc-source s)])
-                     (and (path? src)
-                          (not (regexp-match?
-                                (regexp-quote
-                                 (path->string
-                                  (collection-path "rackunit" "private" "gui")))
-                                (path->string src)))))))
-            srclocs)))
-
-;; show-errortrace-backtrace : exn -> void
-(define (show-errortrace-backtrace exn)
-  ((show-backtrace*)
-   (exn-message exn)
-   (get-errortrace-backtrace exn)))
-
-;; show-primitive-backtrace : exn -> void
-(define (show-primitive-backtrace exn)
-  ((show-backtrace*)
-   (exn-message exn)
-   (get-primitive-backtrace exn)))
-
-;; can-show-source? : -> boolean
-(define (can-show-source?)
-  (can-show-source?*))
-
-;; show-source : source number number -> void
-(define (show-source src pos span)
-  ((show-source*) src pos span))
-
-;; ----
-
-(define (get-link n)
-  (let ([v (unbox link)])
-    (and (vector? v) (vector-ref v n))))
-
-(define (get-errortrace-backtrace*)
-  (or (get-link 0)
-      (lambda (exn) null)))
-
-(define (show-backtrace*)
-  (or (get-link 1)
-      void))
-
-(define (show-source*)
-  (or (get-link 2)
-      void))
-
-(define (can-show-source?*)
-  (vector? (unbox link)))
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/gui.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/gui.rkt
deleted file mode 100644
index 79be3e456a..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/gui.rkt
+++ /dev/null
@@ -1,145 +0,0 @@
-#lang racket/base
-(require racket/class
-         unstable/class-iop
-         rackunit/private/base
-         rackunit/private/result
-         rackunit/private/check-info
-         "interfaces.rkt"
-         "controller.rkt"
-         "view.rkt")
-(provide make-gui-runner)
-
-(define (make-gui-runner)
-  (define controller
-    (new controller%))
-  (define frame
-    (make-view-frame controller))
-  (lambda tests
-    (for ([test (in-list tests)])
-      (run test controller))))
-
-(define (run test controller)
-  ;; state = parent result<%>
-
-  (define (for-suite-entry suite name before after state)
-    (define model
-      (send/i controller controller<%> create-model suite state))
-    (before)
-    model)
-
-  (define (for-suite-exit suite name before after state kid-state)
-    (after)
-    (send/i kid-state suite<%> finish!)
-    state)
-
-  (define (for-case case name action state)
-    (define model
-      (send/i controller controller<%> create-model case state))
-    (run-case case model)
-    state)
-
-  (foldts-test-suite for-suite-entry for-suite-exit for-case
-                     #f test))
-
-;; From old suite-runner:
-#|
-(define/public (run)
-  (let ([custodian (make-custodian)]
-        [before (rackunit-test-suite-before test)]
-        [after (rackunit-test-suite-after test)])
-    (parameterize [(current-custodian custodian)]
-      (dynamic-wind
-        before
-        (lambda ()
-          (for-each (lambda (c) (send c run)) (get-children))
-          (custodian-shutdown-all custodian))
-        after)))
-  (on-child-status-change #f))
-|#
-
-;; ----
-
-(define (run-case test model)
-  (define primerr (current-error-port))
-  (define iport (open-input-string ""))
-  (define super-cust (current-custodian))
-  (define cust (make-custodian))
-  (define-values (oport errport get-output)
-    (make-output-ports))
-  (let-values ([(test-result timing)
-                (parameterize [(current-input-port iport)
-                               (current-output-port oport)
-                               (current-error-port errport)
-                               (current-custodian cust)]
-                  (run/time-test test))])
-    ;;(set! timing times)
-    (define trash
-      (map (lambda (x) (format "~s" x))
-           (custodian-managed-list cust super-cust)))
-    (cond [(test-success? test-result)
-           (send/i model case<%> update
-                   test-result
-                   (test-success-result test-result)
-                   null
-                   timing
-                   (get-output)
-                   trash)]
-          [(test-failure? test-result)
-           (let* ([exn (test-failure-result test-result)]
-                  [property-stack (exn:test:check-stack exn)])
-             (send/i model case<%> update
-                     test-result
-                     (test-failure-result test-result)
-                     (for/list ([pp property-stack])
-                       (cons (check-info-name pp) (check-info-value pp)))
-                     timing
-                     (get-output)
-                     trash))]
-          [(test-error? test-result)
-           (send/i model case<%> update
-                   test-result
-                   (test-error-result test-result)
-                   null
-                   timing
-                   (get-output)
-                   trash)])))
-
-(define (run/time-test test)
-  (let-values ([(results cputime realtime gctime)
-                (call-with-continuation-prompt
-                 (lambda ()
-                   (time-apply run-test-case 
-                               (list (rackunit-test-case-name test)
-                                     (rackunit-test-case-action test)))))])
-    (values (car results) (list cputime realtime gctime))))
-
-(define (make-output-ports)
-  (define output null)
-  (define output-sema (make-semaphore 1))
-  (define (make-output-collector tag)
-    (define (do-write-out buf start end)
-      (define subbuf (subbytes buf start end))
-      (if (and (pair? output)
-               (eq? (car (car output)) tag))
-          ;; Coalesce
-          (let ([prev (cdr (car output))])
-            (set! output
-                  (cons (cons tag (cons subbuf prev)) (cdr output))))
-          (set! output (cons (list tag subbuf) output)))
-      (- end start))
-    (define name #f)
-    (define evt output-sema)
-    (define (write-out buf start end buffer? enable-break?)
-      ((if enable-break? sync/enable-break sync) output-sema)
-      (begin0 (do-write-out buf start end) (semaphore-post output-sema)))
-    (define (close) (void))
-    (define (get-write-evt buf start end)
-      (wrap-evt output-sema
-                (lambda (_)
-                  (begin0 (write-out buf start end #f #f)
-                    (semaphore-post output-sema)))))
-    (make-output-port name evt write-out close #f
-                      get-write-evt #f))
-  (values (make-output-collector 'output)
-          (make-output-collector 'error)
-          (lambda () output)))
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/interfaces.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/interfaces.rkt
deleted file mode 100644
index 6120703b4f..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/interfaces.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket/base
-(require unstable/class-iop)
-(provide (all-defined-out))
-
-;; controller
-;; Manages the model and view.
-;; Propagates status changes from model to view.
-(define-interface controller<%> ()
-  (get-selected-model
-   set-selected-model
-   listen-selected-model
-
-   create-model
-   on-model-status-change
-   register-view
-   on-view-shutdown
-
-   ;; field: locked?
-   ))
-
-;; result
-;; Represents a test (case or suite) together with the state associated
-;; with the last run of that test.
-(define-interface result<%> ()
-  (get-test
-   get-parent
-   get-name
-   get-controller
-
-   finished?
-   success?
-   failure?
-   error?
-   has-output?
-   has-trash?
-   get-timing
-
-   get-total-cases
-   get-total-successes
-   get-total-failures))
-
-(define-interface case<%> (result<%>)
-  (update
-   get-result
-   get-output
-   get-trash
-   get-property
-   get-property-set
-   get-all-properties))
-
-(define-interface suite<%> (result<%>)
-  (get-children
-   add-child
-   finish!
-   on-child-status-change))
-
-
-;; view
-;; Presents a graphical interface for inspecting and running tests.
-(define-interface view<%> ()
-  (create-view-link
-   queue-for-update
-   shutdown))
-
-;; style-map
-;; Maps symbolic style names ('bold, 'red) to GRacket styles.
-(define-interface style-map<%> ()
-  (get-style))
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/model.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/model.rkt
deleted file mode 100644
index 761a203bf2..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/model.rkt
+++ /dev/null
@@ -1,154 +0,0 @@
-#lang racket/base
-(require racket/class
-         unstable/class-iop
-         data/gvector
-         rackunit/private/base
-         "interfaces.rkt"
-         "cache-box.rkt")
-(provide case-result%
-         suite-result%)
-
-(define result%
-  (class* object% ()
-    (super-new)
-
-    (init-field parent
-                controller
-                name
-                test)
-
-    (when parent
-      (send/i parent suite<%> add-child this))
-
-    (define/public (get-parent) parent)
-    (define/public (get-name) name)
-    (define/public (get-controller) controller)
-    (define/public (get-test) test)
-    ))
-
-;; case-result%
-(define case-result%
-  (class* result% (case<%>)
-    (super-new)
-
-    (inherit get-name
-             get-parent
-             get-controller)
-
-    ;; *result : #f or test-result
-    ;; #f means not finished executing
-    (define *result #f)
-
-    (define result #f)
-    (define properties #f)
-    (define timing #f)
-    (define output null)
-    (define trash null)
-
-    (define/public (update *result* result* properties* timing* output* trash*)
-      (set! *result *result*)
-      (set! result result*)
-      (set! properties properties*)
-      (set! timing timing*)
-      (set! output output*)
-      (set! trash trash*)
-      (send/i (get-controller) controller<%> on-model-status-change this))
-
-    (define/public (finished?) (and *result #t))
-    (define/public (success?) (test-success? *result))
-    (define/public (failure?) (test-failure? *result))
-    (define/public (error?) (test-error? *result))
-
-    (define/public (get-total-cases) 1)
-    (define/public (get-total-successes)
-      (if (success?) 1 0))
-    (define/public (get-total-failures)
-      (if (or (failure?) (error?)) 1 0))
-
-    (define/public (get-result) result)
-    (define/public (get-timing) timing)
-    (define/public (get-trash) trash)
-    (define/public (has-trash?) (pair? trash))
-    (define/public (get-property p)
-      (let [(v (assq p properties))]
-        (and v (cdr v))))
-    (define/public (get-property-set p)
-      (map cdr (filter (lambda (kv) (eq? (car kv) p)) properties)))
-    (define/public (get-all-properties)
-      properties)
-
-    (define/public (get-output) (reverse output))
-    (define/public (has-output?) (pair? output))))
-
-;; An aggr contains aggregate information about a suite's children.
-(struct aggr (cases successes failures has-output? has-trash? tcpu treal tgc)
-        #:transparent)
-
-;; suite-result%
-(define suite-result%
-  (class* result% (suite<%>)
-    (super-new)
-    (inherit get-name
-             get-parent
-             get-controller)
-
-    (define done? #f)
-    (define children (make-gvector))
-
-    ;; get-children : -> (listof result<%>)
-    (define/public (get-children)
-      (for/list ([x (in-gvector children)]) x))
-
-    (define/public (add-child c)
-      (gvector-add! children c))
-
-    (define/public (finish!)
-      (set! done? #t)
-      (send/i (get-controller) controller<%> on-model-status-change this))
-
-    (define children-cache
-      (cache (call-with-values
-                 (lambda ()
-                   (for/fold ([cs 0] [ss 0] [fs 0] [out? #f] [trash? #f]
-                              [tcpu 0] [treal 0] [tgc 0])
-                       ([c (in-gvector children)])
-                     (let ([timing (or (send/i c result<%> get-timing) '(0 0 0))])
-                       (values (+ cs (send/i c result<%> get-total-cases))
-                               (+ ss (send/i c result<%> get-total-successes))
-                               (+ fs (send/i c result<%> get-total-failures))
-                               (or out? (send/i c result<%> has-output?))
-                               (or trash? (send/i c result<%> has-trash?))
-                               (+ tcpu (car timing))
-                               (+ treal (cadr timing))
-                               (+ tgc (caddr timing))))))
-               aggr)))
-
-    (define/public (finished?)
-      done?)
-    (define/public (get-total-cases)
-      (aggr-cases (cache-ref children-cache)))
-    (define/public (get-total-successes)
-      (aggr-successes (cache-ref children-cache)))
-    (define/public (get-total-failures)
-      (aggr-failures (cache-ref children-cache)))
-    (define/public (has-output?)
-      (aggr-has-output? (cache-ref children-cache)))
-    (define/public (has-trash?)
-      (aggr-has-trash? (cache-ref children-cache)))
-    (define/public (get-timing)
-      (let ([a (cache-ref children-cache)])
-        (list (aggr-tcpu a) (aggr-treal a) (aggr-tgc a))))
-
-    (define/public (success?)
-      (and (finished?) (zero? (get-total-failures))))
-    (define/public (failure?)
-      (positive? (get-total-failures)))
-    (define/public (error?) #f)
-
-    ;; on-child-status-change : model<%> -> void
-    (define/public (on-child-status-change child)
-      (let ([result (cache-ref children-cache)])
-        (cache-invalidate! children-cache)
-        (let ([new-result (cache-ref children-cache)])
-          (unless (equal? new-result result)
-            (send/i (get-controller) controller<%> on-model-status-change this)))))))
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/model2rml.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/model2rml.rkt
deleted file mode 100644
index c6c9a87f12..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/model2rml.rkt
+++ /dev/null
@@ -1,458 +0,0 @@
-#lang racket/base
-(require racket/class
-         unstable/class-iop
-         racket/gui/base
-         racket/match
-         racket/path
-         mrlib/include-bitmap
-         (prefix-in drlink: "drracket-ui.rkt")
-         "interfaces.rkt"
-         "config.rkt")
-(provide model-renderer%
-         output-icon)
-
-(define (output-icon)
-  (make-object image-snip% (include-bitmap "output-icon.png")))
-
-(define top-align (make-object style-delta% 'change-alignment 'top))
-
-(define model-renderer%
-  (class object%
-    (init-field controller)
-    (init-field editor)
-    (super-new)
-
-    (define/public (render-model/short model)
-      (cond [(is-a? model suite<%>) ;; (test-suite? test)
-             (render-suite-short-form model)]
-            [(is-a? model case<%>) ;; (test-case? test)
-             (render-case-short-form model)]))
-
-    (define/public (render-model/long model)
-      (cond [(is-a? model suite<%>) ;; (test-suite? test)
-             (render-suite-long-form model)]
-            [(is-a? model case<%>) ;; (test-case? test)
-             (render-case-long-form model)]))
-
-    (define/private (put styles . texts)
-      (send/apply editor insert/styles styles texts))
-
-    (define/private (put+click styles clickback . texts)
-      (send/apply editor insert/styles+click styles clickback texts))
-
-    (define/private (blank)
-      (send editor newline))
-
-    (define/private (n-things number singular plural)
-      (if (= 1 number)
-          (format "~a ~a" number singular)
-          (format "~a ~a" number plural)))
-    
-    (define/private (render-suite-long-form model)
-      (let [(suite (send/i model suite<%> get-test))
-            (children (send/i model suite<%> get-children))
-            (parent (send/i model suite<%> get-parent))]
-        (let* [(successes
-                (filter (lambda (c) (send/i c result<%> success?)) children))
-               (failures
-                (filter (lambda (c) (send/i c result<%> failure?)) children))
-               (errors
-                (filter (lambda (c) (send/i c result<%> error?)) children))
-               (unexecuted
-                (filter (lambda (c) (not (send/i c result<%> finished?))) children))
-               (finished? (send/i model suite<%> finished?))
-               (num-tests (length children))
-               (count-successes (length successes))
-               (count-failures (length failures))
-               (count-errors (length errors))
-               (count-unexecuted (length unexecuted))
-               (total-successes (send/i model suite<%> get-total-successes))
-               (total-failures (send/i model suite<%> get-total-failures))
-               (total-cases (send/i model suite<%> get-total-cases))
-               (output? (send/i model suite<%> has-output?))
-               (trash? (send/i model suite<%> has-trash?))]
-          (put '(large italic bold) (send/i model suite<%> get-name) "\n")
-          (when parent
-            (put '() " (in ")
-            (put+click '(clickback bold)
-                       (lambda _ (send/i controller controller<%> set-selected-model parent))
-                       (send/i parent result<%> get-name))
-            (put '() ")\n"))
-          (blank)
-          (if (positive? total-cases)
-              (begin (put '() (format "Total: ~a"
-                                      (n-things total-successes "success" "successes")))
-                     (when (positive? total-failures)
-                       (put '() (format ", ~a"
-                                        (n-things total-failures "failure" "failures"))))
-                     (blank)
-                     (blank)
-                     (when trash?
-                       (put (list top-align) (output-icon))
-                       (put '() "Tests did not clean up resources.\n"))
-                     (when output?
-                       (put (list top-align) (output-icon))
-                       (put '() "Tests produced output.\n"))
-                     (when (or trash? output?)
-                       (blank))
-                     (when (positive? count-failures)
-                       (put '(large)
-                            (format "Failures (~a/~a)\n"
-                                    count-failures
-                                    num-tests))
-                       (for-each (lambda (m) (render-model/short m)) failures)
-                       (blank))
-                     (when (positive? count-errors)
-                       (put '(large)
-                            (format "Errors (~a/~a)\n"
-                                    count-errors
-                                    num-tests))
-                       (for-each (lambda (m) (render-model/short m)) errors)
-                       (blank))
-                     (when (positive? count-unexecuted)
-                       (put '(large)
-                            (format "Unexecuted (~a/~a)\n"
-                                    (length unexecuted)
-                                    num-tests))
-                       (for-each (lambda (m) (render-model/short m)) unexecuted)
-                       (blank))
-                     (when (positive? count-successes)
-                       (put '(large)
-                            (format "Successes (~a/~a)\n"
-                                    count-successes
-                                    num-tests))
-                       (for-each (lambda (m) (render-model/short m)) successes)
-                       (blank))
-                     (render-timing model))
-              (if finished?
-                  (put '()
-                       "This test suite is empty.")
-                  (put '(test-unexecuted)
-                       "This test suite has not been executed."))))))
-
-    (define/private (render-model-link model suite?)
-      (let ([styles (if suite? '(clickback bold) '(clickback))])
-        (put+click styles
-                   (lambda _ (send/i controller controller<%> set-selected-model model))
-                   (send/i model result<%> get-name))
-        (when (or (send/i model result<%> has-output?)
-                  (send/i model result<%> has-trash?))
-          (put styles (output-icon)))))
-
-    (define/private (render-suite-short-form model)
-      (let [(suite (send/i model suite<%> get-test))]
-        (let* [(children (send/i model suite<%> get-children))
-               (successes
-                (filter (lambda (c) (send/i c result<%> success?)) children))
-               (failures
-                (filter (lambda (c) (send/i c result<%> failure?)) children))
-               (errors
-                (filter (lambda (c) (send/i c result<%> error?)) children))
-               (unexecuted
-                (filter (lambda (c) (not (send/i c result<%> finished?))) children))
-               (num-tests (length children))
-               (total-failures (send/i model suite<%> get-total-failures))]
-          (let [(style (if (and (null? failures) (null? errors)) 'normal 'red))]
-            (render-model-link model #t)
-            (if (send/i model suite<%> finished?)
-                (when (positive? total-failures)
-                  (put `(,style)
-                       (format " (~a)"
-                               (n-things total-failures "failure" "failures"))))
-                (put '(test-unexecuted) " not yet finished"))
-            (blank)))))
-
-    (define/private (render-case-short-form model)
-      (cond [(send/i model case<%> success?)
-             (render-success-short-form model)]
-            [(send/i model case<%> failure?)
-             (render-failure-short-form model)]
-            [(send/i model case<%> error?)
-             (render-error-short-form model)]
-            [(not (send/i model case<%> finished?))
-             (render-not-executed-short-form model)]))
-
-    (define/private (render-success-short-form model)
-      (render-model-link model #f)
-      (put '() " succeeded\n"))
-
-    (define/private (render-failure-short-form model)
-      (let* [(exn (send/i model case<%> get-result))
-             (exnmsg (send/i model case<%> get-property prop:failure-message))
-             (exnname (send/i model case<%> get-property prop:failure-assertion))]
-        (render-model-link model #f)
-        (put '() " failed")
-        (when exnname
-          (put '() " on ")
-          (put '(fail-type) (format "~a" exnname)))
-        (when exnmsg
-          (put '() " with message: ")
-          (put '(exn-message) exnmsg))
-        (blank)))
-
-    (define/private (render-error-short-form model)
-      (let [(exn (send/i model case<%> get-result))]
-        (render-model-link model #f)
-        (cond [(exn? exn)
-               (put '() " threw an exception of type ")
-               (put '(exn-type) (format "~a" (object-name exn)))
-               (put '() " with message: ")
-               (put '(exn-message) (exn-message exn))]
-              [else
-               (put '() (format " raised the value ~e" exn))])
-        (blank)))
-
-    (define/private (render-not-executed-short-form model)
-      (render-model-link model #f)
-      (put '(test-unexecuted) " has not been executed\n"))
-
-    (define/private (render-case-long-form model)
-      (cond [(send/i model case<%> success?)
-             (render-success-long-form model)]
-            [(send/i model case<%> failure?)
-             (render-failure-long-form model)]
-            [(send/i model case<%> error?)
-             (render-error-long-form model)]
-            [(not (send/i model case<%> finished?))
-             (render-not-executed-long-form model)])
-      (when (send/i model case<%> finished?)
-        (render-timing model)
-        (render-trash model)
-        (render-output model)))
-
-    (define/private (render-model-link* model suite?)
-      (let [(parent (send/i model result<%> get-parent))]
-        (let ([styles (if suite? '(bold) '())])
-          (put `(large italic ,@styles)
-               (send/i model result<%> get-name))
-          (blank)
-          (when parent
-            (put '() "  in ")
-            (put+click `(clickback bold)
-                       (lambda _ (send/i controller controller<%> set-selected-model parent))
-                       (send/i parent result<%> get-name))
-            (blank))
-          (blank))))
-
-    (define/private (render-success-long-form model)
-      (render-model-link* model #f)
-      (put '() "The test case succeeded.\n\n"))
-
-    (define/private (render-failure-long-form model)
-      (render-model-link* model #f)
-      (let* [(exn (send/i model case<%> get-result))
-             (failure-msgs (send/i model case<%> get-property-set prop:failure-message))
-             (messages
-              (if (string? (exn-message exn))
-                  (cons (exn-message exn) failure-msgs)
-                  failure-msgs))
-             (exnname (send/i model case<%> get-property prop:failure-assertion))
-             (exnlocs
-              (send/i model case<%> get-property-set prop:failure-location))
-             (expecteds (send/i model case<%> get-property-set 'expected))
-             (actuals (send/i model case<%> get-property-set 'actual))
-             (params (send/i model case<%> get-property prop:failure-parameters))
-             (other-properties
-              (filter (lambda (p) (not (known-property? (car p))))
-                      (send/i model case<%> get-all-properties)))
-             (exn2 (send/i model case<%> get-property 'exception))]
-        (put '() "The test case failed on ")
-        (put '(fail-type) (format "~a" exnname))
-        (put '() ".\n\n")
-        (render-source-location "Check location" exnlocs)
-        (render-backtrace-link "Backtrace of check failure:" exn)
-        (render-messages messages)
-        (if (and (pair? expecteds) (pair? actuals))
-            (render-expected+actual (car expecteds) (car actuals))
-            (render-parameters params))
-        (render-embedded-exception exn2)
-        (render-other-properties other-properties)
-        ))
-    
-    (define/private (render-error-long-form model)
-      (render-model-link* model #f)
-      (let [(exn (send/i model case<%> get-result))]
-        (cond [(exn? exn)
-               (put '() "The test case threw an exception of type ")
-               (put '(exn-type) (format "~a" (object-name exn)))
-               (put '() ".\n\n")
-               (render-backtrace-link "Exception backtrace:" exn)
-               (render-messages (list (exn-message exn)))
-               (render-value "Exception value:\n" exn)]
-              [else
-               (put '() "The test raised a value that was not "
-                    "an instance of an exception struct.\n\n")
-               (render-value "Raised value:\n" exn)])))
-
-    (define/private (render-not-executed-long-form model)
-      (render-model-link* model #f)
-      (put '(test-unexecuted)
-           "The test case has not been executed."))
-
-    (define/private (render-value text value)
-      (put '() text)
-      (render-value-box value)
-      (blank))
-
-    (define/private (render-value-box value)
-      (send editor insert-wide-box
-            (lambda (editor)
-              (send editor insert/styles '(value) (format "~v" value)))))
-
-    (define/private (render-value-box/display value)
-      (send editor insert-wide-box
-            (lambda (editor)
-              (send editor insert/styles '(value) (format "~a" value)))))
-
-    (define/private (render-messages messages)
-      (when (pair? messages)
-        (put '() "Message:\n")
-        (for-each
-         (lambda (message)
-           (send editor insert-wide-box
-                 (lambda (editor)
-                   (send editor insert/styles '(exn-message) message))))
-         messages)
-        (blank)))
-
-    (define/private (render-expected+actual expected actual)
-      (put '() "Actual:\n")
-      (render-value-box actual)
-      (put '() "Expected:\n")
-      (render-value-box expected)
-      (blank))
-    
-    (define/private (render-parameters parameters)
-      (when (and parameters (pair? parameters))
-        (put '() "Parameters:\n")
-        (for-each (lambda (parameter) (render-value-box parameter))
-                  parameters)
-        (blank)))
-
-    (define/private (render-other-properties properties)
-      (when (pair? properties)
-        (put '() "Additional information:\n")
-        (for-each (lambda (p) (render-other-property (car p) (cdr p)))
-                  properties)
-        (blank)))
-
-    (define/private (render-other-property key value)
-      (put '() (format "key ~s:" key))
-      (when (exn? value)
-        (inline-backtrace-link "" value))
-      (put '() "\n")
-      (render-value-box value))
-
-    (define/private (render-embedded-exception exn)
-      (when (exn? exn)
-        (put '() "Received exception")
-        (inline-backtrace-link "" exn)
-        (put '() ":\n")
-        (render-value-box exn)
-        (blank)))
-
-    (define/private (render-source-location label location-reps)
-      (when (pair? location-reps)
-        (let* ([location-reps (reverse location-reps)]
-               [rep0 (car location-reps)]
-               [reps (cdr location-reps)])
-          (put '() label ": ")
-          (inline-source-location/1 rep0)
-          (blank)
-          (when (pair? reps)
-            (put '() "Inner locations: ")
-            (for-each (lambda (r) (inline-source-location/1 r)) reps)
-            (blank))
-          (blank)))
-      (unless (pair? location-reps)
-        (put '() label " is not available.")
-        (blank)
-        (blank)))
-
-    (define/private (inline-source-location/1 location)
-      (match location
-        [(list src line col pos span)
-         (let* ([file-name (resolve-source-file src)]
-                [short-file-name
-                 (if (or (path? file-name) (string? file-name))
-                     (path->string (file-name-from-path file-name))
-                     file-name)]
-                [source-location (format "~a:~a:~a" short-file-name line col)])
-           (inline-source-location/h source-location src pos span))]
-        [_ (put '() "not usable")]))
-
-    (define/private (inline-source-location/h source-location src pos span)
-      (if (and src (drlink:can-show-source?))
-          (put+click '(clickback)
-                     (lambda _ (drlink:show-source src pos span))
-                     source-location)
-          (put '() source-location)))
-
-    (define/private (render-backtrace-link text exn)
-      (when (exn? exn)
-        (if (drlink:has-backtrace? exn)
-            (inline-backtrace-link text exn)
-            (begin (put '() text)
-                   (put '() " not available")))
-        (blank)
-        (blank)))
-
-    (define/private (inline-backtrace-link text exn)
-      (when (drlink:has-backtrace? exn)
-        (put '() text))
-      (when (drlink:has-errortrace-backtrace? exn)
-        (put '() " ")
-        (put+click '(clickback)
-                   (lambda _ (drlink:show-errortrace-backtrace exn))
-                   "[from DrRacket]"))
-      (when (drlink:has-primitive-backtrace? exn)
-        (put '() " ")
-        (put+click '(clickback)
-                   (lambda _ (drlink:show-primitive-backtrace exn))
-                   "[from racket]")))
-
-    (define/private (render-output model)
-      (let [(output (send/i model case<%> get-output))]
-        (when (pair? output)
-          (put '() "Output:\n")
-          (send editor insert-wide-box
-                (lambda (editor)
-                  (for ([mode+text output])
-                    (let ([styles
-                           (if (eq? (car mode+text) 'error)
-                               '(red italic)
-                               '(darkblue))]
-                          [buf (apply bytes-append
-                                      (reverse (cdr mode+text)))])
-                      (send editor insert/styles styles
-                            (bytes->string/utf-8 buf #\?))))))
-          (blank))))
-
-    (define/private (render-timing model)
-      (let [(timing (send/i model result<%> get-timing))]
-        (when timing
-          (let ([cpu (car timing)]
-                [real (cadr timing)]
-                [gc (caddr timing)])
-            (put '() "Timing:\n")
-            (put '() (format "cpu: ~a; real: ~a; gc: ~a\n\n"
-                             cpu real gc))))))
-
-    (define/private (render-trash model)
-      (let ([trash (send/i model case<%> get-trash)])
-        (when (pair? trash)
-          (put '() "Test did not clean up resources:\n")
-          (for-each (lambda (t) (render-value-box/display t)) trash)
-          (blank))))
-
-    (define/private (resolve-source-file src)
-      (or (and (is-a? src editor<%>)
-               (let* [(tmp?-box (box #t))
-                      (filename (send src get-filename tmp?-box))]
-                 (if (and filename (not (unbox tmp?-box)))
-                     filename
-                     #f)))
-          (cond [(path? src) (path->string src)]
-                [(string? src) src]
-                [else 'unknown])))
-    ))
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/output-icon.png b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/output-icon.png
deleted file mode 100644
index 9d26abeb8d..0000000000
Binary files a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/output-icon.png and /dev/null differ
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/rml.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/rml.rkt
deleted file mode 100644
index 3525db010b..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/rml.rkt
+++ /dev/null
@@ -1,186 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         framework
-         "interfaces.rkt")
-
-(provide insert-text
-         ext:text%
-         rackunit-style-map)
-
-;; insert-text : text% string style-delta% -> void
-(define (insert-text e text style)
-  (let ([a (send e last-position)])
-    (send e insert text)
-    (let ([b (send e last-position)])
-      (send e change-style style a b))))
-
-(define text<%> (class->interface text%))
-
-(define ext:text-mixin
-  (mixin (text<%>) ()
-    (init-field (style-map rackunit-style-map))
-    (inherit last-position
-             change-style
-             set-clickback
-             insert
-             get-canvas
-             set-styles-sticky
-             set-autowrap-bitmap)
-
-    (super-new (auto-wrap #t))
-    (set-styles-sticky #f)
-    (set-autowrap-bitmap #f)
-
-    ;; insert/styles : (list-of style-delta%) string ... -> void
-    ;; A list of styles to be applied. The first style is the last applied.
-    (define/public (insert/styles styles . texts)
-      (unless (andmap (lambda (x) (or (string? x) (is-a? x snip%))) texts)
-        (raise-type-error 'insert/styles "list of strings" texts))
-      (let-values ([(a b) (put texts)])
-        (for-each (lambda (style) (change-style (resolve style) a b))
-                  (reverse styles))))
-
-    ;; insert/styles+click : (list-of style-delta%) (?? -> void) string ...-> void
-    (define/public (insert/styles+click styles clickback . texts)
-      (unless (andmap (lambda (x) (or (string? x) (is-a? x snip%))) texts)
-        (raise-type-error 'insert/styles+click "list of strings" texts))
-      (let-values ([(a b) (put texts)])
-        (for-each (lambda (style) (change-style (resolve style) a b))
-                  (reverse styles))
-        (set-clickback a b clickback)))
-
-    ;; put : (list-of string) -> int int
-    (define/private (put texts)
-      (let ([a (last-position)])
-        (let loop ([texts texts] [where a])
-          (if (pair? texts)
-              (begin (insert (car texts) where 'same #f)
-                     (loop (cdr texts) (last-position)))
-              (values a where)))))
-
-    (define/private (resolve style)
-      (if (symbol? style)
-          (send style-map get-style style)
-          style))
-
-    ;; newline : -> void
-    (define/public (newline)
-      (insert/styles '() "\n"))
-
-    ;; insert-wide-box : (ext:text<%> -> void) -> void
-    (define/public (insert-wide-box p)
-      (internal-insert-box p #t)
-      (newline))
-
-    ;; internal-insert-box : (ext:text<%> -> void) boolean? -> void
-    (define/private (internal-insert-box p wide?)
-      (let* ([seditor (new ext:text%)]
-             [snip (new editor-snip% (editor seditor))])
-        (p seditor)
-        (let [(canvas (get-canvas))]
-          (when (and (is-a? canvas canvas:wide-snip<%>) wide?)
-            (send canvas add-wide-snip snip)))
-        (insert snip)
-        (send seditor lock #t)))
-
-    ))
-
-(define ext:text%
-  (text:wide-snip-mixin
-   (ext:text-mixin
-    text:hide-caret/selection%)))
-
-(define style:no-change (make-object style-delta% 'change-nothing))
-(define style:normal (make-object style-delta% 'change-normal))
-(define style:large (make-object style-delta% 'change-nothing))
-(void (send style:large set-size-mult 1.5))
-
-(define style:blue (make-object style-delta% 'change-nothing))
-(void (send style:blue set-delta-foreground "Blue"))
-
-(define style:red (make-object style-delta% 'change-nothing))
-(void (send style:red set-delta-foreground "Red"))
-
-(define style:green (make-object style-delta% 'change-nothing))
-(void (send style:green set-delta-foreground "ForestGreen"))
-
-(define style:purple (make-object style-delta% 'change-nothing))
-(void (send style:purple set-delta-foreground "Purple"))
-
-(define style:gray (make-object style-delta% 'change-nothing))
-(void (send style:gray set-delta-foreground "DimGray"))
-
-(define style:darkblue (make-object style-delta% 'change-nothing))
-(void (send style:darkblue set-delta-foreground "DarkBlue"))
-
-(define style:clickback (make-object style-delta% 'change-underline #t))
-(void (send style:clickback set-delta-foreground "blue"))
-
-(define style:bold (make-object style-delta% 'change-nothing))
-(void (send style:bold set-delta 'change-weight 'bold))
-
-(define style:italic (make-object style-delta% 'change-nothing))
-(void (send style:italic set-delta 'change-style 'italic))
-
-(define basic-styles
-  `([no-change . ,style:no-change]
-    [normal    . ,style:normal]
-    [large     . ,style:large]
-    [clickback . ,style:clickback]
-    [red       . ,style:red]
-    [blue      . ,style:blue]
-    [green     . ,style:green]
-    [purple    . ,style:purple]
-    [darkblue  . ,style:darkblue]
-    [bold      . ,style:bold]
-    [italic    . ,style:italic]
-    [error     . ,style:red]
-    [value     . ,style:darkblue]))
-
-(define rackunit-styles
-  `([test-unexecuted . ,style:gray]
-    [test-success    . ,style:green]
-    [test-failure    . ,style:red]
-    [test-error      . ,style:red]
-    
-    [exn-type        . ,style:darkblue]
-    [exn-message     . ,style:red]
-    [exn-value       . ,style:darkblue]
-    [fail-type       . ,style:darkblue]))
-
-
-;; -- style-map classes
-
-(define extended-style-map%
-  (class* object% (style-map<%>)
-    (init-field styles
-                base)
-    (define/public (get-style sym)
-      (cond [(assq sym styles) => cdr]
-            [else (send base get-style sym)]))
-    (super-new)))
-
-(define empty-style-map%
-  (class* object% (style-map<%>)
-    (define/public (get-style sym)
-      (error 'get-style "unknown style: ~s" sym))
-    (super-new)))
-
-;; extend-style-map : style-map<%> styles -> style-map<%>
-(define (extend-style-map base styles)
-  (new extended-style-map% (base base) (styles styles)))
-
-;; empty-style-map : style-map<%>
-(define empty-style-map
-  (new empty-style-map%))
-
-;; basic-style-map : style-map<%>
-(define basic-style-map
-  (extend-style-map empty-style-map
-                    basic-styles))
-
-;; rackunit-style-map : style-map<%>
-(define rackunit-style-map
-  (extend-style-map basic-style-map 
-                    rackunit-styles))
diff --git a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/view.rkt b/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/view.rkt
deleted file mode 100644
index fecc679baf..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-gui/rackunit/private/gui/view.rkt
+++ /dev/null
@@ -1,346 +0,0 @@
-#lang racket/base
-(require racket/class
-         unstable/class-iop
-         unstable/gui/notify
-         racket/gui/base
-         framework
-         mrlib/hierlist
-         "interfaces.rkt"
-         "config.rkt"
-         "model2rml.rkt"
-         "rml.rkt")
-
-(provide make-view-frame)
-
-(define style-map rackunit-style-map)
-
-#|
-
-To avoid getting sequence contract violations from editors, all editor
-mutations should be done in the eventspace thread.
-
-Can an update to a result<%> occur before its view link has been
-created? Answer = yes, quite easily it seems (I tried it.)
-
-See 'do-model-update': we yield if the view-link hasn't been created
-yet, since there should be a callback queued waiting to create it.
-
-With the 'queue-callback' calls and the one 'yield' call in place, I'm
-no longer able to trigger the race condition.
-
-----
-
-FIXME:
-
-Another problem: If tests are still running and a gui element "goes
-away", then get errors. Eg, run (test/gui success-and-failure-tests)
-and then immediately close the window.
-
-Why are these things actually disappearing, though? Shouldn't they
-still be there, just not visible?
-
-|#
-
-
-;; View
-(define view%
-  (class* object% (view<%>)
-    (init-field parent
-                controller)
-    (super-new)
-
-    (define editor (new ext:text% (style-map rackunit-style-map)))
-    (define renderer
-      (new model-renderer%
-           (controller controller)
-           (editor editor)))
-
-    (define eventspace
-      (send (send parent get-top-level-window) get-eventspace))
-
-    (define -hpane (new panel:horizontal-dragable% (parent parent)))
-    (define -lpane (new vertical-pane% (parent -hpane)))
-    (define -rpane (new vertical-pane% (parent -hpane)))
-    (define -details-canvas 
-      (new canvas:wide-snip% (parent -rpane) (editor editor)))
-
-    (define tree-view
-      (new model-tree-view%
-           (parent -lpane) ;; tree-panel
-           (view this)
-           (controller controller)))
-
-    ;; Update management
-    ;; Do adds in order, then updates in any order (hash).
-
-    ;; add-queue : (listof (-> void))
-    (define add-queue null)
-
-    ;; update-queue : (imm-hashof model<%> #t)
-    (define update-queue '#hasheq())
-
-    ;; update-lock : semaphore
-    (define update-lock (make-semaphore 1))
-
-    ;; update-timer : timer%
-    (define update-timer
-      (new timer% (notify-callback (lambda () (process-updates)))))
-
-    (send editor lock #t)
-    (with-handlers ([exn:fail? void])
-      (send -hpane set-percentages VIEW-PANE-PERCENTS))
-
-    (send/i controller controller<%> register-view this)
-
-    ;; View Links
-
-    (define/private (get-view-link model)
-      (send tree-view get-view-link model))
-
-    ;; Methods
-
-    (define/private (get-selected-model)
-      (send/i controller controller<%> get-selected-model))
-
-    (send/i controller controller<%> listen-selected-model
-            (lambda (model)
-              (parameterize ((current-eventspace eventspace))
-                (queue-callback
-                 (lambda ()
-                   (let ([view-link (get-view-link model)])
-                     (send view-link select #t))
-                   (show-model model))))))
-
-    ;; Update Management
-
-    ;; create-view-link : model suite-result<%>/#f -> void
-    (define/public (create-view-link model parent)
-      (let ([proc (lambda () (send tree-view create-view-link model parent))])
-        (semaphore-wait update-lock)
-        (set! add-queue (cons proc add-queue))
-        (updates-pending!)
-        (semaphore-post update-lock)))
-
-    ;; queue-for-update : model -> void
-    (define/public (queue-for-update model)
-      (semaphore-wait update-lock)
-      (set! update-queue (hash-set update-queue model #t))
-      (updates-pending!)
-      (semaphore-post update-lock))
-
-    ;; updates-pending! : -> void
-    (define/private (updates-pending!)
-      (send update-timer start 50 #t))
-
-    ;; process-updates : -> void
-    ;; ** Must be called from eventspace thread.
-    (define/private (process-updates)
-      (let-values ([(adds updates) (grab+clear-update-queue)])
-        (send (send tree-view get-editor) begin-edit-sequence #f)
-        (for ([add (in-list adds)])
-          (add))
-        (for ([model (in-hash-keys updates)])
-          (do-model-update model))
-        (send (send tree-view get-editor) end-edit-sequence)))
-
-    ;; grab+clear-update-queue : -> (values list hash)
-    ;; ** Must be called from eventspace thread.
-    (define/private (grab+clear-update-queue)
-      (semaphore-wait update-lock)
-      (begin0
-          (values (reverse add-queue)
-                  update-queue)
-        (set! add-queue null)
-        (set! update-queue '#hasheq())
-        (semaphore-post update-lock)))
-
-    ;; do-model-update : model<%> -> void
-    ;; ** Must be called from eventspace thread.
-    (define/private (do-model-update model)
-      (let ([view-link (get-view-link model)])
-        (unless view-link
-          ;; should not be possible
-          (error 'rackunit-gui "internal error: no view-link"))
-        (send tree-view update-item view-link)
-        (when (eq? model (get-selected-model))
-          (show-model model))))
-
-    ;; Update display
-
-    ;; show-model : result<%> -> void
-    ;; Displays the result in the Details area.
-    ;; ** Must be called from eventspace thread.
-    (define/private (show-model model)
-      (send* editor
-        (begin-edit-sequence)
-        (lock #f)
-        (erase))
-      (send renderer render-model/long model)
-      (send* editor
-        (lock #t)
-        (end-edit-sequence)
-        (scroll-to-position 0)))
-
-    ;; Shutdown
-
-    ;; shutdown : -> void
-    ;; Notifies the controller that the view has hung up.
-    (define/public (shutdown)
-      (send/i controller controller<%> on-view-shutdown))
-    ))
-
-
-;; tree-view% <: hierarchical-list%
-(define model-tree-view%
-  (class* hierarchical-list% ()
-    (init-field view
-                controller)
-    (super-new (style '(auto-hscroll)))
-
-    (inherit get-items)
-
-    ;; View Link
-
-    (define model=>view-link (make-hasheq))
-
-    (define/public (set-view-link model item)
-      (hash-set! model=>view-link model item))
-    (define/public (get-view-link model)
-      (hash-ref model=>view-link model #f))
-
-    ;; Behavior
-
-    (define/override (on-select item)
-      (let [(model (send item user-data))]
-        (send/i controller controller<%> set-selected-model model)))
-
-    (define/override (on-double-select item)
-      (when (is-a? item hierarchical-list-compound-item<%>)
-        (if (send item is-open?)
-            (send item close)
-            (send item open))))
-
-    (define/private (ensure-tree-visible model)
-      (let* [(parent (send model get-parent))
-             (parent-view-link (and parent (get-view-link parent)))]
-        (when (and parent (not (send parent-view-link is-open?)))
-          (ensure-tree-visible parent)
-          (send parent-view-link open))))
-
-    ;; Construction
-
-    ;; create-view-link : result<%> suite-result<%>/#f-> void
-    (define/public (create-view-link model parent)
-      (let* ([parent-link
-              (if parent
-                  (get-view-link parent)
-                  this)]
-             [view-link
-              (cond [(is-a? model suite<%>)
-                     (send parent-link new-list)]
-                    [(is-a? model case<%>)
-                     (send parent-link new-item)])])
-        (initialize-view-link view-link model)
-        (when (and (is-a? model suite<%>) (not parent))
-          (send view-link open))))
-
-    ;; initialize-view-link : result<%> (U compound-item% item%) -> void
-    (define/private (initialize-view-link item model)
-      (set-view-link model item)
-      (send item user-data model)
-      (insert-text (send item get-editor)
-                   (send model get-name)
-                   (send style-map get-style
-                         (if (is-a? model suite<%>)
-                             'bold
-                             'normal))))
-
-    ;; update-item : item% -> void
-    (define/public (update-item view-link)
-      (let* ([editor (send view-link get-editor)]
-             [model (send view-link user-data)]
-             [name (send/i model result<%> get-name)]
-             [style-name
-              (cond [(not (send/i model result<%> finished?)) 'test-unexecuted]
-                    [(send/i model result<%> success?) 'test-success]
-                    [(send/i model result<%> failure?) 'test-failure]
-                    [(send/i model result<%> error?) 'test-error])]
-             [style (send/i style-map style-map<%> get-style style-name)]
-             [output? (send/i model result<%> has-output?)]
-             [trash? (send/i model result<%> has-trash?)])
-        (send editor begin-edit-sequence #f)
-        (send editor delete (string-length name) (send editor last-position) #f)
-        (when (or output? trash?)
-          (send editor insert
-                (output-icon)
-                (string-length name)
-                'same
-                #f))
-        (send editor change-style style 0 (send editor last-position) #f)
-        (send editor end-edit-sequence)))))
-
-
-;; view-frame% <: frame%
-(define view-frame%
-  (class (frame:standard-menus-mixin 
-           (frame:basic-mixin frame%))
-
-    (init-field controller)
-    (init [width (pref:width)]
-          [height (pref:height)])
-
-    (inherit get-help-menu
-             get-width
-             get-height
-             get-menu-bar
-             get-area-container)
-
-    (define-syntax override-false
-      (syntax-rules ()
-        [(override-false name ...)
-         (begin (define/override (name . _) #f) ...)]))
-
-    (override-false file-menu:create-new?
-                    file-menu:create-open?
-                    file-menu:create-open-recent?
-                    file-menu:create-revert?
-                    file-menu:create-save?
-                    file-menu:create-save-as?
-                    file-menu:create-print?
-                    edit-menu:create-undo?
-                    edit-menu:create-redo?
-                    edit-menu:create-cut?
-                    edit-menu:create-paste?
-                    edit-menu:create-clear?
-                    edit-menu:create-find?
-                    edit-menu:create-preferences?)
-
-    (define/augment (on-close)
-      (pref:width (get-width))
-      (pref:height (get-height))
-      (send view shutdown)
-      (inner (void) on-close))
-
-    (super-new (width width) (height height))
-    (send (get-help-menu) delete)
-    (let ([rackunit-menu
-           (new menu%
-                (label "RackUnit")
-                (parent (get-menu-bar)))])
-      (menu-option/notify-box rackunit-menu
-                              "Lock"
-                              (get-field locked? controller)))
-
-    (define view
-      (new view%
-           (controller controller)
-           (parent (get-area-container))))))
-
-;; make-view-frame : controller -> frame%
-(define (make-view-frame controller)
-  (let ([frame 
-         (new view-frame%
-              (label FRAME-LABEL)
-              (controller controller))])
-    (send frame show #t)
-    frame))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/LICENSE.txt b/pkgs/rackunit-pkgs/rackunit-lib/LICENSE.txt
deleted file mode 100644
index 061fd1de3e..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-rackunit-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/info.rkt b/pkgs/rackunit-pkgs/rackunit-lib/info.rkt
deleted file mode 100644
index 0a65efc308..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("srfi-lite-lib"
-               "base"
-               "data-lib"))
-
-(define pkg-desc "RackUnit testing framework")
-
-(define pkg-authors '(ryanc noel))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/HISTORY.txt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/HISTORY.txt
deleted file mode 100644
index 0f4c38f918..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/HISTORY.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-6.0
-- Improvements/Bugfixes to the Text UI.
-- Added an optional message argument to fail-check.
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/log.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/log.rkt
deleted file mode 100644
index 785d45dabd..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/log.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-(require racket/contract)
-
-(define TOTAL 0)
-(define FAILED 0)
-
-(define-syntax-rule (inc! id)
-  (set! id (add1 id)))
-
-(define (test-log! result)
-  (inc! TOTAL)
-  (unless result
-    (inc! FAILED)))
-
-(define (test-log #:display? [display? #f]
-                  #:exit? [exit? #f])
-  (when display?
-    (unless (zero? TOTAL)
-      (cond
-        [(zero? FAILED)
-         (printf "~a test~a passed\n"
-                 TOTAL
-                 (if (= TOTAL 1) "" "s"))]
-        [else
-         (eprintf "~a/~a test failures\n"
-                  FAILED TOTAL)])))
-  (when exit?
-    (unless (zero? FAILED)
-      (exit 1)))
-  (cons FAILED TOTAL))
-
-(provide
- (contract-out
-  [test-log!
-   (-> any/c void?)]
-  [test-log
-   (->* () (#:display? boolean? #:exit? boolean?)
-        (cons/c exact-nonnegative-integer?
-                exact-nonnegative-integer?))]))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/main.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/main.rkt
deleted file mode 100644
index 5eaa42c10b..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/main.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-;;;
-;;; Time-stamp: <2008-07-30 10:46:00 nhw>
-;;;
-;;; Copyright (C) by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-(require "private/test.rkt")
-(provide (all-from-out "private/test.rkt"))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/base.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/base.rkt
deleted file mode 100644
index 1d66dd7831..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/base.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         "check-info.rkt"
-         "location.rkt")
-
-;; struct test : 
-(define-struct test ())
-;; struct (rackunit-test-case test) : (U string #f) thunk
-(define-struct (rackunit-test-case test) (name action) #:transparent)
-;; struct (rackunit-test-suite test) : string (fdown fup fhere seed -> (listof test-result)) thunk thunk
-(define-struct (rackunit-test-suite test) (name tests before after) #:transparent)
-
-;; struct exn:test exn : ()
-;;
-;; The exception throw by test failures
-(define-struct (exn:test exn:fail) ())
-;; struct (exn:test:check struct:exn:test) : (list-of check-info)
-;;
-;; The exception thrown to indicate a check has failed
-(define-struct (exn:test:check exn:test) (stack)
-  #:property prop:exn:srclocs
-  (lambda (self)
-    ;; Try to get a location from the stack.
-    (define maybe-location (for/or ([check-info (exn:test:check-stack self)])
-                             (and (check-location? check-info) check-info)))
-    (cond [maybe-location
-           (list (location->srcloc (check-info-value maybe-location)))]
-          [else
-           (list)])))
-;; struct (exn:test:check:internal exn:test:check) : ()
-;;
-;; Exception thrown to indicate an internal failure in an
-;; check, distinguished from a failure in user code.
-(define-struct (exn:test:check:internal exn:test:check) ())
-
-;; struct test-result : (U string #f)
-(define-struct test-result (test-case-name))
-;; struct (test-failure test-result) : exn:test
-(define-struct (test-failure test-result)  (result))
-;; struct (test-error test-result) : any
-(define-struct (test-error test-result) (result))
-;; struct (test-success test-result) : any
-(define-struct (test-success test-result) (result))
-
-(provide/contract
- (struct (rackunit-test-case test)
-         ((name (or/c string? false/c))
-          (action (-> any))))
- (struct (rackunit-test-suite test)
-         ((name string?)
-          (tests procedure?)
-          (before (-> any))
-          (after (-> any)))))
-
-(provide (struct-out test)
-         (struct-out exn:test)
-         (struct-out exn:test:check)
-         (struct-out exn:test:check:internal)
-         (struct-out test-result)
-         (struct-out test-failure)
-         (struct-out test-error)
-         (struct-out test-success))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/check-info.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/check-info.rkt
deleted file mode 100644
index 563ed0b7cf..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/check-info.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         "location.rkt"
-         (for-syntax racket/base
-                     racket/syntax))
-
-;; Structures --------------------------------------------------
-
-;; struct check-info : symbol any
-(define-struct check-info (name value))
-
-(provide/contract
- [struct check-info ([name symbol?]
-                     [value any/c])]
- [check-info-mark symbol?]
- [check-info-stack (continuation-mark-set? . -> . (listof check-info?))]
- [with-check-info* ((listof check-info?) (-> any) . -> . any)])
-(provide with-check-info)
-
-;; Infrastructure ----------------------------------------------
-
-;; The continuation mark under which all check-info is keyed
-(define check-info-mark (gensym 'rackunit))
-
-;; (continuation-mark-set -> (listof check-info))
-(define (check-info-stack marks)
-  (let ([ht (make-hash)])
-    (for ([x (in-list (apply append (continuation-mark-set->list marks check-info-mark)))]
-          [i (in-naturals)])
-      (hash-set! ht (check-info-name x) (cons i x)))
-    (map cdr (sort (hash-map ht (λ (k v) v)) < #:key car))))
-
-;; with-check-info* : (list-of check-info) thunk -> any
-(define (with-check-info* info thunk)
-  (define current-marks
-    (continuation-mark-set-first #f check-info-mark))
-  (with-continuation-mark
-      check-info-mark
-    (append (if current-marks current-marks null) info)
-    (thunk)))
-
-(define-syntax with-check-info
-  (syntax-rules ()
-    [(_ ((name val) ...) body ...)
-     (with-check-info*
-         (list (make-check-info name val) ...)
-       (lambda () body ...))]))
-
-(define-syntax (define-check-type stx)
-  (syntax-case stx ()
-    [(_ id contract)
-     (with-syntax
-         ([make-check-id (format-id #'id "make-check-~a" #'id)]
-          [check-id? (format-id #'id "check-~a?" #'id)])
-       (syntax/loc stx
-         (begin (define (make-check-id a) (make-check-info 'id a))
-                (define (check-id? info) (eq? (check-info-name info) 'id))
-                (provide/contract
-                 [make-check-id (contract . -> . check-info?)]
-                 [check-id? (check-info? . -> . boolean?)]))))]))
-
-(define-check-type name any/c)
-(define-check-type params any/c)
-(define-check-type location location/c)
-(define-check-type expression any/c)
-(define-check-type message any/c)
-(define-check-type actual any/c)
-(define-check-type expected any/c)
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/check.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/check.rkt
deleted file mode 100644
index 62b23a25ac..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/check.rkt
+++ /dev/null
@@ -1,324 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         (for-syntax racket/base
-                     "location.rkt")
-         rackunit/log
-         "base.rkt"
-         "check-info.rkt"
-         "format.rkt"
-         "location.rkt")
-
-(provide current-check-handler
-         check-around
-         current-check-around
-
-         fail-check
-
-         define-check
-         define-binary-check
-         define-simple-check
-
-         check
-         check-exn
-         check-not-exn
-         check-true
-         check-false
-         check-pred
-         check-eq?
-         check-eqv?
-         check-equal?
-         check-=
-         check-not-false
-         check-not-eq?
-         check-not-eqv?
-         check-not-equal?
-         check-match
-         fail)
-
-;; default-check-handler : any -> any
-(define (default-check-handler e)
-  (display-test-failure/error e))
-
-;; parameter current-check-handler : (-> any any)
-(define current-check-handler
-  (make-parameter
-   default-check-handler
-   (lambda (v)
-     (if (procedure? v)
-         v
-         (raise-type-error 'current-check-handler "procedure" v)))))
-
-;; check-around : ( -> a) -> a
-(define (check-around thunk)
-  (with-handlers ([(lambda (e) #t) (current-check-handler)])
-    (thunk)))
-
-;; top-level-check-around : ( -> a) -> a
-(define (top-level-check-around thunk)
-  (check-around thunk)
-  (void))
-
-;; parameter current-check-around : (( -> a) -> a)
-(define current-check-around
-  (make-parameter
-   top-level-check-around
-   (lambda (v)
-     (if (procedure? v)
-         v
-         (raise-type-error 'current-check-around "procedure" v)))))
-
-(define-syntax fail-check
-  (syntax-rules ()
-    ((_ message*)
-     (let ([message message*]
-           [marks (current-continuation-marks)])
-       (unless (string? message)
-         (raise-type-error 'fail-check "string" message))
-       (test-log! #f)
-       (raise
-        (make-exn:test:check
-         message
-         marks
-         (check-info-stack marks)))))
-    ((_)
-     (fail-check "Check failure"))))
-
-(define-syntax fail-internal
-  (syntax-rules ()
-    ((_)
-     (let ([marks (current-continuation-marks)])
-       (test-log! #f)
-       (raise
-        (make-exn:test:check:internal
-         "Internal failure"
-         marks
-         (check-info-stack marks)))))))
-
-;; refail-check : exn:test:check -> (exception raised)
-;;
-;; Raises an exn:test:check with the contents of the
-;; given exception.  Useful for propogating internal
-;; errors to the outside world.
-(define (refail-check exn)
-  (test-log! #f)
-  (raise
-   (make-exn:test:check (exn-message exn)
-                        (exn-continuation-marks exn)
-                        (exn:test:check-stack exn))))
-
-(define-syntax (define-check stx)
-  (syntax-case stx ()
-    ((define-check (name formal ...) expr ...)
-     (with-syntax ([reported-name
-                    (symbol->string (syntax->datum (syntax name)))]
-                   [(actual ...)
-                    (generate-temporaries (syntax (formal ...)))]
-                   [check-fn
-                    (syntax
-                     (lambda (formal ...
-                                     [message #f]
-                                     #:location [location (list 'unknown #f #f #f #f)]
-                                     #:expression [expression 'unknown])
-                       ((current-check-around)
-                        (lambda ()
-                          (with-check-info*
-                           (list* (make-check-name (quote name))
-                                  (make-check-location location)
-                                  (make-check-expression expression)
-                                  (make-check-params (list formal ...))
-                                  (if message
-                                      (list (make-check-message message))
-                                      null))
-                             (lambda () (begin0 (begin expr ...) (test-log! #t))))))
-                       
-                       ;; All checks should return (void).
-                       (void)))]
-                   [check-secret-name (datum->syntax stx (gensym (syntax->datum (syntax name))))])
-       (syntax/loc stx
-         (begin
-           ;; The distinction between formal and actual parameters
-           ;; is made to avoid evaluating the check arguments
-           ;; more than once.  This technique is based on advice
-           ;; received from Ryan Culpepper.
-
-           (define check-secret-name check-fn)
-           
-           (define-syntax (name stx)
-             (with-syntax
-                 ([loc (syntax->location stx)])
-               (syntax-case stx ()
-                 ((name actual ...)
-                  (syntax/loc stx
-                    (check-secret-name actual ...
-                                       #:location (quote loc)
-                                       #:expression (quote (name actual ...)))))
-
-                 ((name actual ... msg)
-                  (syntax/loc stx
-                    (check-secret-name actual ... msg
-                                       #:location (quote loc)
-                                       #:expression (quote (name actual ...)))))
-                    
-                 (name
-                  (identifier? #'name)
-                  (syntax/loc stx
-                    (case-lambda
-                      [(formal ...)
-                       (check-secret-name formal ... 
-                                          #:location (quote loc) 
-                                          #:expression (quote (name actual ...)))]
-                      [(formal ... msg)
-                       (check-secret-name formal ... msg
-                                          #:location (quote loc) 
-                                          #:expression (quote (name actual ...)))]))))))
-           ))))))
-
-(define-syntax define-simple-check
-  (syntax-rules ()
-    ((_ (name param ...) expr ...)
-     (define-check (name param ...)
-       (let ((result (begin expr ...)))
-         (if result
-             result
-             (fail-check)))))))
-
-(define-syntax define-binary-check
-  (syntax-rules ()
-    [(_ (name expr1 expr2) expr ...)
-     (define-check (name expr1 expr2)
-       (with-check-info*
-        (list (make-check-actual expr1)
-              (make-check-expected expr2))
-        (lambda ()
-          (let ((result (begin expr ...)))
-            (if result
-                result
-                (fail-check))))))]
-    [(_ (name pred expr1 expr2))
-     (define-check (name expr1 expr2)
-       (with-check-info*
-        (list (make-check-actual expr1)
-              (make-check-expected expr2))
-        (lambda ()
-          (if (pred expr1 expr2)
-              #t
-              (fail-check)))))]))
-
-(define (raise-error-if-not-thunk name thunk)
-  (unless (and (procedure? thunk)
-               (procedure-arity-includes? thunk 0))
-    (raise-arguments-error name "thunk must be a procedure that accepts 0 arguments" "thunk" thunk)))
-
-(define-check (check-exn raw-pred thunk)
-  (let ([pred
-         (cond [(regexp? raw-pred)
-                (λ (x) (and (exn:fail? x) (regexp-match raw-pred (exn-message x))))]
-               [(and (procedure? raw-pred) (procedure-arity-includes? raw-pred 1))
-                raw-pred]
-               [else
-                (raise-argument-error 'check-exn "(-> any/c any/c)" raw-pred)])])
-    (raise-error-if-not-thunk 'check-exn thunk)
-    (let/ec succeed
-      (with-handlers
-          (;; catch the exception we are looking for and
-           ;; succeed
-           [pred
-            (lambda (exn) (succeed #t))]
-           ;; rethrow check failures if we aren't looking
-           ;; for them
-           [exn:test:check?
-            (lambda (exn)
-              (refail-check exn))]
-           ;; catch any other exception and raise an check
-           ;; failure
-           [exn:fail?
-            (lambda (exn)
-              (with-check-info*
-               (list
-                (make-check-message "Wrong exception raised")
-                (make-check-info 'exn-message (exn-message exn))
-                (make-check-info 'exn exn))
-               (lambda () (fail-check))))])
-        (thunk))
-      (with-check-info*
-       (list (make-check-message "No exception raised"))
-       (lambda () (fail-check))))))
-
-(define-check (check-not-exn thunk)
-  (raise-error-if-not-thunk 'check-not-exn thunk)
-  (with-handlers
-      ([exn:test:check?
-        (lambda (exn) (refail-check exn))]
-       [exn?
-        (lambda (exn)
-          (with-check-info*
-           (list
-            (make-check-message "Exception raised")
-            (make-check-info 'exception-message (exn-message exn))
-            (make-check-info 'exception exn))
-           (lambda () (fail-check))))])
-    (thunk)))
-
-(define-simple-check (check operator expr1 expr2)
-  (operator expr1 expr2))
-
-(define-simple-check (check-pred predicate expr)
-  (predicate expr))
-
-(define-binary-check (check-eq? eq? expr1 expr2))
-
-(define-binary-check (check-eqv? eqv? expr1 expr2))
-
-(define-binary-check (check-equal? expr1 expr2)
-  (equal? expr1 expr2))
-
-(define-simple-check (check-= expr1 expr2 epsilon)
-  (<= (magnitude (- expr1 expr2)) epsilon))
-
-(define-simple-check (check-true expr)
-  (eq? expr #t))
-
-(define-simple-check (check-false expr)
-  (eq? expr #f))
-
-(define-simple-check (check-not-false expr)
-  expr)
-
-(define-simple-check (check-not-eq? expr1 expr2)
-  (not (eq? expr1 expr2)))
-
-(define-simple-check (check-not-eqv? expr1 expr2)
-  (not (eqv? expr1 expr2)))
-
-(define-simple-check (check-not-equal? expr1 expr2)
-  (not (equal? expr1 expr2)))
-
-(define-simple-check (fail)
-  #f)
-
-;; NOTE(jpolitz): This match form isn't eager like the others, hence the
-;; define-syntax and the need to carry around location information
-(define-syntax (check-match stx)
-  (syntax-case stx ()
-    [(_ actual expected pred)
-     (quasisyntax
-      (let ([actual-val actual])
-       (with-check-info*
-        (list (make-check-name 'check-match)
-              (make-check-location
-               (list '(unsyntax (syntax-source stx))
-                     '(unsyntax (syntax-line stx))
-                     '(unsyntax (syntax-column stx))
-                     '(unsyntax (syntax-position stx))
-                     '(unsyntax (syntax-span stx))))
-              (make-check-expression '#,(syntax->datum stx))
-              (make-check-actual actual-val)
-              (make-check-expected 'expected))
-        (lambda ()
-         (check-true (match actual-val
-                       [expected pred]
-                       [_ #f]))))))]
-    [(_ actual expected)
-     (syntax/loc stx (check-match actual expected #t))]))
-
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/counter.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/counter.rkt
deleted file mode 100644
index 265fb58cff..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/counter.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-;;;
-;;; Time-stamp: <2008-06-19 21:14:02 noel>
-;;;
-;;; Copyright (C) 2005 by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(require "base.rkt"
-         "monad.rkt"
-         "hash-monad.rkt")
-
-(provide display-counter
-         update-counter!
-         put-initial-counter
-         counter->vector)
-
-(define key (gensym))
-
-;; struct counter : integer integer integer
-(define-struct counter (successes failures errors) #:mutable)
-
-;; display-counter : () -> (hash-monad-of ())
-(define (display-counter)
-  (compose
-   (get key)
-   (lambda (counter)
-     (let ((s (counter-successes counter))
-           (f (counter-failures counter))
-           (e (counter-errors counter)))
-       (display s) (display " success(es) ")
-       (display f) (display " failure(s) ")
-       (display e) (display " error(s) ")
-       (display (+ s f e)) (display " test(s) run")
-       (newline)
-       (return-hash (void))))))
-
-;; counter->vector : () -> (hash-monad-of vector)
-(define (counter->vector)
-  (compose
-   (get key)
-   (lambda (counter)
-     (return-hash
-      (vector (counter-successes counter)
-              (counter-failures counter)
-              (counter-errors counter))))))
-
-;; update-counter! : test-result -> (hash-monad-of ())
-(define (update-counter! result)
-  (define (add-success! counter)
-    (set-counter-successes! counter
-                            (add1 (counter-successes counter))))
-  (define (add-failure! counter)
-    (set-counter-failures! counter
-                           (add1 (counter-failures counter))))
-  (define (add-error! counter)
-    (set-counter-errors! counter
-                         (add1 (counter-errors counter))))
-  (compose
-   (get key)
-   (lambda (counter)
-     (cond
-      ((test-error? result)
-       (add-error! counter))
-      ((test-failure? result)
-       (add-failure! counter))
-      (else
-       (add-success! counter)))
-     (put key counter))))
-
-;; put-initial-counter : () -> (hash-monad-of ())
-(define (put-initial-counter)
-  (put key (make-counter 0 0 0)))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/format.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/format.rkt
deleted file mode 100644
index d6102a4f99..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/format.rkt
+++ /dev/null
@@ -1,119 +0,0 @@
-#lang racket/base
-(require racket/match
-         "base.rkt"
-         "check-info.rkt")
-
-(provide display-check-info-name-value
-         display-check-info
-         display-check-info-stack
-         display-test-name
-         display-exn
-
-         display-delimiter
-         display-failure
-         display-error
-
-         display-test-failure/error
-         strip-redundant-params)
-
-;; name-width : integer
-;;
-;; Number of characters we reserve for the check-info name column
-(define name-width 12)
-
-(define (display-delimiter)
-  (display "--------------------") (newline))
-
-(define (display-failure)
-  (display "FAILURE"))
-
-(define (display-error)
-  (display "ERROR"))
-
-(define (string-pad-right s n)
-  (define m (string-length s))
-  (cond
-   [(= m n) s]
-   [(m . < . n)
-    (string-append s (make-string (- n m) #\space))]
-   [else
-    (substring s 0 n)]))
-
-(define (display-check-info-name-value name value [value-printer (lambda (x) (write x) (newline))])
-  (display (string-pad-right
-            (string-append (symbol->string name) ": ")
-            name-width))
-  (value-printer value))
-
-(define display-check-info
-  (match-lambda [(struct check-info (name value))
-                 (display-check-info-name-value name value)]))
-
-;; display-check-info-stack : (listof check-info) -> void
-(define (display-check-info-stack check-info-stack)
-  (for-each
-   display-check-info
-   (strip-redundant-params check-info-stack))
-  (newline))
-
-;; display-test-name : (U string #f) -> void
-(define (display-test-name name)
-  (if name
-      (begin
-        (display name) (newline))
-      (begin
-        (display "Unnamed test ")(newline))))
-
-;; display-exn : any -> void
-;;
-;; Outputs a printed representation of the exception to
-;; the current-output-port
-;; If given non-exn value, says so.
-(define (display-exn v)
-  (parameterize ((current-error-port (current-output-port)))
-    (if (exn? v)
-        ((error-display-handler) (exn-message v) v)
-        (printf "A value other than an exception was raised: ~e\n" v))
-    (newline)))
-
-;; ----
-
-;; strip-redundant-parms : (list-of check-info) -> (list-of check-info)
-;;
-;; Strip any check-params? is there is an
-;; actual/expected check-info in the same stack frame.  A
-;; stack frame is delimited by occurrence of a check-name?
-(define (strip-redundant-params start-stack)
-  (define (binary-check-this-frame? stack)
-    (let loop ([stack stack])
-      (cond
-        [(null? stack) #f]
-        [(check-name? (car stack)) #f]
-        [(check-actual? (car stack)) #t]
-        [else (loop (cdr stack))])))
-  (let loop ([stack start-stack])
-    (cond
-      [(null? stack) null]
-      [(check-params? (car stack))
-       (if (binary-check-this-frame? start-stack)
-           (loop (cdr stack))
-           (cons (car stack) (loop (cdr stack))))]
-      [else (cons (car stack) (loop (cdr stack)))])))
-
-;; ----
-
-;; display-test-failure/error : any string/#f -> void
-(define (display-test-failure/error e [name #f])
-  (parameterize ((current-output-port (current-error-port)))
-    (display-delimiter)
-    (when name (display-test-name name))
-    (cond [(exn:test:check? e)
-           (display-failure) (newline)
-           (display-check-info-stack (exn:test:check-stack e))
-           (when #t
-             (parameterize ((error-print-context-length 0))
-               ((error-display-handler) (exn-message e) e)))]
-          [else
-           (display-error) (newline)
-           (display-exn e)])
-    (display-delimiter)))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/hash-monad.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/hash-monad.rkt
deleted file mode 100644
index 1cfa803e50..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/hash-monad.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-;;;
-;;; Time-stamp: <2008-06-19 21:13:49 noel>
-;;;
-;;; Copyright (C) 2005 by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(require "monad.rkt")
-
-(provide (all-defined-out))
-
-(define (make-empty-hash)
-  (make-monad (void) (make-hash)))
-
-(define (return-hash value)
-  (lambda (hash)
-    (set-monad-value! hash value)
-    hash))
-
-(define (put key val)
-  (lambda (hash)
-    (hash-set! (monad-state hash) key val)
-    hash))
-
-(define (get key)
-  (lambda (hash)
-    (let ((val (hash-ref (monad-state hash) key)))
-      (set-monad-value! hash val)
-      hash)))
-
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/location.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/location.rkt
deleted file mode 100644
index eba1a7ac51..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/location.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/contract/base)
-
-;; type location = (list any number/#f number/#f number/#f number/#f)
-;; location : source line column position span
-(define location/c (list/c any/c (or/c number? false/c) (or/c number? false/c) (or/c number? false/c) (or/c number? false/c)))
-
-(define location-source first)
-(define location-line second)
-(define location-column third)
-(define location-position fourth)
-(define location-span fifth)
-
-(provide/contract
- [location/c contract?]
- [location-source (location/c . -> . any/c)]
- [location-line (location/c . -> . (or/c number? false/c))]
- [location-column (location/c . -> . (or/c number? false/c))]
- [location-position (location/c . -> . (or/c number? false/c))]
- [location-span (location/c . -> . (or/c number? false/c))]
- [syntax->location (syntax? . -> . location/c)]
- [location->string (location/c . -> . string?)]
- [location->srcloc (location/c . -> . srcloc?)])
-
-;; syntax->location : syntax -> location
-(define (syntax->location stx)
-  (list (syntax-source stx)
-        (syntax-line stx)
-        (syntax-column stx)
-        (syntax-position stx)
-        (syntax-span stx)))
-
-;; location->string : (list-of string) -> string
-(define (location->string location)
-  (string-append (source->string (location-source location))
-                 ":"
-                 (maybe-number->string (location-line location))
-                 ":"
-                 (maybe-number->string (location-column location))))
-
-;; location->srcloc: location -> srcloc
-(define (location->srcloc location)
-  (srcloc (location-source location)
-          (location-line location)
-          (location-column location)
-          (location-position location)
-          (location-span location)))
-
-(define (source->string source)
-  (cond
-   ((string? source) source)
-   ((path? source) (path->string source))
-   ((not source) "unknown")
-   (else (format "~a" source))))
-
-(define (maybe-number->string number)
-  (if (number? number)
-      (number->string number)
-      "?"))
-
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/monad.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/monad.rkt
deleted file mode 100644
index aa847ad55a..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/monad.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-;;;
-;;; Time-stamp: <2008-06-19 21:11:59 noel>
-;;;
-;;; Copyright (C) 2005 by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(provide (all-defined-out))
-
-;; struct monad : any any 
-(define-struct monad (value state) #:mutable)
-
-;; compose : (monad-of 'a) ('a -> (monad-of 'b)) -> (monad-of 'b)
-(define (compose comp build-comp)
-  (lambda (seed0)
-    (let* ((seed1 (comp seed0))
-           (value (monad-value seed1)))
-      ((build-comp value) seed1))))
-
-;; compose*: (monad-of 'a) ('a -> (monad-of 'b)) ... -> (monad-of 'b)
-(define (compose* monad . actions)
-  (if (null? actions)
-      monad
-      (compose monad
-               (lambda (value)
-                 (apply
-                  compose*
-                  ((car actions) value)
-                  (cdr actions))))))
-
-;; sequence : (monad-of 'a) (monad-of 'b) -> (monad-of 'b)
-(define (sequence monad-a monad-b)
-  (compose monad-a (lambda (v) monad-b)))
-
-(define (sequence* monad . monads)
-  (if (null? monads)
-      monad
-      (sequence monad
-                (apply
-                 sequence*
-                 (car monads)
-                 (cdr monads)))))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/name-collector.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/name-collector.rkt
deleted file mode 100644
index bcd89735fe..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/name-collector.rkt
+++ /dev/null
@@ -1,77 +0,0 @@
-;;;
-;;; Time-stamp: <2008-06-19 22:16:19 noel>
-;;;
-;;; Copyright (C) 2005 by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(require "base.rkt"
-         "monad.rkt"
-         "hash-monad.rkt"
-         srfi/1)
-
-(provide display-test-case-name
-         push-suite-name!
-         pop-suite-name!
-         put-initial-name)
-
-(define key (gensym))
-
-;; put-initial-name : () -> (hash-monad-of void)
-(define (put-initial-name)
-  (put key null))
-
-;; display-test-case-name : test-result -> (hash-monad-of void)
-(define (display-test-case-name result)
-  (compose
-   (get key)
-   (lambda (names)
-     (cond
-      ((test-success? result) (return-hash (void)))
-      (else
-       (fold-right
-        (lambda (name seed)
-          (printf "~a > " name))
-        (void)
-        names)
-       (display (test-result-test-case-name result))
-       (newline)
-       (return-hash (void)))))))
-
-;; push-suite-name! : string -> (hash-monad-of void)
-(define (push-suite-name! name)
-  (compose
-   (get key)
-   (lambda (names)
-     (put key (cons name names)))))
-
-;; pop-suite-name! :  -> (hash-monad-of void)
-(define (pop-suite-name!)
-  (compose
-   (get key)
-   (lambda (names)
-     (put key (cdr names)))))
-
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/result.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/result.rkt
deleted file mode 100644
index 54daab4353..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/result.rkt
+++ /dev/null
@@ -1,134 +0,0 @@
-;;;
-;;; Time-stamp: <2008-08-11 21:10:24 noel>
-;;;
-;;; Copyright (C) by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(require "base.rkt"
-         "test-suite.rkt")
-
-(provide (all-defined-out))
-
-;; foldts-test-suite :
-;;   (test-suite string thunk thunk 'a -> 'a)
-;;   (test-suite string thunk thunk 'a 'a -> 'a)
-;;   (test-case string thunk 'a -> 'a)
-;;   'a
-;;   test
-;;  ->
-;;   'a
-;;
-;; Extended tree fold ala SSAX for tests.  Note that the
-;; test-case/test-suite is passed to the functions so that
-;; subtypes of test-case/test-suite can be differentiated,
-;; allowing extensibility [This is an interesting difference
-;; between OO and FP.  FP gives up extensibility on
-;; functions, OO on data.  Here we want extensibility on
-;; data so FP is a bit ugly].
-(define (foldts-test-suite fdown fup fhere seed test)
-  (cond
-   ((rackunit-test-case? test)
-    (fhere test
-           (rackunit-test-case-name test)
-           (rackunit-test-case-action test)
-           seed))
-   ((rackunit-test-suite? test)
-    (apply-test-suite test fdown fup fhere seed))
-   (else
-    (raise
-     (make-exn:test
-      (format "foldts-test-suite: Don't know what to do with ~a.  It isn't a test case or test suite." test)
-      (current-continuation-marks))))))
-
-
-;; Useful in fold-test-results below
-(define 2nd-arg (lambda (a b) b))
-
-;; fold-test-results :
-;;   ('b 'c ... 'a -> 'a)
-;;   'a
-;;   test
-;;   #:run   (string (() -> any) -> 'b 'c ...)
-;;   #:fdown (string 'a -> 'a)
-;;   #:fup   (string 'a -> 'a)
-;; ->
-;;   'a
-;;
-;; Fold collector pre-order L-to-R depth-first over the
-;; result of run.  By default these are test results, and
-;; hence by default result-fn is
-;;
-;;   test-result 'a -> 'a
-(define (fold-test-results result-fn seed test
-                           #:run   [run run-test-case]
-                           #:fdown [fdown 2nd-arg]
-                           #:fup   [fup 2nd-arg])
-  (foldts-test-suite
-   (lambda (suite name before after seed)
-     '(printf "into ~a\n" name)
-     (before)
-     (fdown name seed))
-   (lambda (suite name before after seed kid-seed)
-     '(printf "out of ~a\n" name)
-     (after)
-     (fup name kid-seed))
-   (lambda (case name action seed)
-     '(printf "running ~a\n" name)
-     (apply result-fn
-            ;; Get the values returned by run-fn into a
-            ;; list and append the seed
-            (append (call-with-values
-                        (lambda () (run name action))
-                      list)
-                    (list seed))))
-   seed
-   test))
-
-;; run-test-case : string thunk -> test-result
-(define (run-test-case name action)
-  '(printf "run-test-case running ~a ~a\n" name action)
-  (with-handlers
-      ([exn:test:check?
-        (lambda (exn)
-          (make-test-failure name exn))]
-       [(lambda _ #t)
-        (lambda (exn)
-          (make-test-error name exn))])
-    (let ((value (action)))
-      (make-test-success name value))))
-
-;; run-test : test -> (list-of test-result)
-;;
-;; Run test returning a tree of test-results.  Results are
-;; ordered L-to-R as they occur in the tree.
-(define (run-test test)
-  (reverse
-   (fold-test-results
-    (lambda (result seed) (cons result seed))
-    (list)
-    test)))
-
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/test-case.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/test-case.rkt
deleted file mode 100644
index f314e057fa..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/test-case.rkt
+++ /dev/null
@@ -1,122 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/contract/base
-         "format.rkt"
-         "check.rkt")
-
-(provide current-test-name
-         current-test-case-around
-
-         test-begin
-         test-case
-
-         before
-         after
-         around)
-
-(define current-test-name
-  (make-parameter
-   #f
-   (lambda (v)
-     (if (string? v)
-         v
-         (raise-type-error 'current-test-name "string" v)))))
-
-;; test-case-around : ( -> a) -> a
-;;
-;; Run a test-case immediately, printing information on failure
-(define (default-test-case-around thunk)
-  (with-handlers ([(lambda (e) #t) default-test-case-handler])
-    (parameterize ((current-custodian (make-custodian)))
-      (thunk))))
-
-;; default-test-case-handler : any -> any
-(define (default-test-case-handler e)
-  (display-test-failure/error e (current-test-name)))
-
-(define current-test-case-around
-  (make-parameter
-   default-test-case-around
-   (lambda (v)
-     (if (procedure? v)
-         v
-         (raise-type-error 'current-test-case-around "procedure" v)))))
-
-(define-syntax (test-begin stx)
-  (syntax-case stx ()
-    [(_ expr ...)
-     (syntax/loc stx
-       ((current-test-case-around)
-        (lambda ()
-          (parameterize
-              ([current-check-handler raise]
-               [current-check-around  check-around])
-            (void)
-            expr ...))))]
-    [_
-     (raise-syntax-error
-      #f
-      "Correct form is (test-begin expr ...)"
-      stx)]))
-
-(define-syntax (test-case stx)
-  (syntax-case stx ()
-    [(_ name expr ...)
-     (quasisyntax/loc stx
-       (parameterize
-           ([current-test-name 
-             (contract string? name 
-                       '#,(syntax-source-module #'name #t)
-                       '#,(syntax-source-module #'test-case #t))])
-         (test-begin expr ...)))]))
-
-(define-syntax before
-  (syntax-rules ()
-    ((_ before-e expr1 expr2 ...)
-     (dynamic-wind
-       (lambda ()
-         before-e)
-       (lambda ()
-         expr1 expr2 ...)
-       (lambda ()
-         (void))))
-    ((before error ...)
-     (raise-syntax-error
-      'before
-      "Incorrect use of before macro.  Correct format is (before before-expr expr1 expr2 ...)"
-      'before
-      '(error ...)))))
-
-(define-syntax after
-  (syntax-rules ()
-    ((_ expr1 expr2 ... after-e)
-     (dynamic-wind
-       (lambda ()
-         (void))
-       (lambda ()
-         expr1 expr2 ...)
-       (lambda ()
-         after-e)))
-    ((after error ...)
-     (raise-syntax-error
-      'before
-      "Incorrect use of after macro.  Correct format is (after expr1 expr2 ... after-expr)"
-      'after
-      '(error ...)))))
-
-(define-syntax around
-  (syntax-rules ()
-    ((_ before-e expr1 expr2 ... after-e)
-     (dynamic-wind
-       (lambda ()
-         before-e)
-       (lambda ()
-         expr1 expr2 ...)
-       (lambda ()
-         after-e)))
-    ((around error ...)
-     (raise-syntax-error
-      'around
-      "Incorrect use of around macro.  Correct format is (around before-expr expr1 expr2 ... after-expr)"
-      'around
-      '(error ...)))))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/test-suite.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/test-suite.rkt
deleted file mode 100644
index 1e3295436c..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/test-suite.rkt
+++ /dev/null
@@ -1,181 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         "base.rkt"
-         "test-case.rkt"
-         "check.rkt")
-
-(provide test-suite
-         test-suite-test-case-around
-         test-suite-check-around
-         delay-test
-         make-test-suite
-
-         apply-test-suite
-
-         define-test-suite
-         define/provide-test-suite)
-
-(define (void-thunk) (void))
-
-(define current-seed
-  (make-parameter
-   #f
-   ;; Anything goes for the seed
-   (lambda (v) v)))
-
-(define (test-suite-test-case-around fhere)
-  (lambda (thunk)
-    (let* ([name (current-test-name)]
-           [test (make-rackunit-test-case name thunk)]
-           [seed (current-seed)])
-      (current-seed (fhere test name thunk seed)))))
-
-(define (test-suite-check-around fhere)
-  (lambda (thunk)
-    (let* ([name #f]
-           [test (make-rackunit-test-case name thunk)]
-           [seed (current-seed)])
-      (current-seed (fhere test name thunk seed)))))
-
-
-(define delayed-test-case-around
-  (lambda (thunk)
-    (let ([name (current-test-name)])
-      (make-rackunit-test-case name thunk))))
-
-(define delayed-check-around
-  (lambda (thunk)
-    (let ([name #f])
-      (make-rackunit-test-case name thunk))))
-
-(define-syntax delay-test
-  (syntax-rules ()
-    [(delay-test test test1 ...)
-     (parameterize
-                 ([current-test-case-around delayed-test-case-around]
-                  [current-check-around delayed-check-around])
-               test test1 ...)]))
-
-(define (apply-test-suite suite fdown fup fhere seed)
-  (let* ([name   (rackunit-test-suite-name   suite)]
-         [tests  (rackunit-test-suite-tests  suite)]
-         [before (rackunit-test-suite-before suite)]
-         [after  (rackunit-test-suite-after  suite)]
-         [kid-seed (fdown suite name before after seed)]
-         [kid-seed ((rackunit-test-suite-tests suite) fdown fup fhere kid-seed)])
-    (fup suite name before after seed kid-seed)))
-
-;; test-suite : name [#:before thunk] [#:after thunk] test ...
-;;                     -> test-suite
-;;
-;; Creates a test-suite with the given name and tests.
-;; Setup and teardown actions (thunks) may be specified by
-;; preceding the actions with the keyword #:before or
-;; #:after.
-(define-syntax (test-suite stx)
-  (syntax-case stx ()
-    [(test-suite name
-                 #:before before-thunk
-                 #:after  after-thunk
-                 test ...)
-     (syntax
-      (let ([the-name name]
-            [the-tests
-             (lambda (fdown fup fhere seed)
-               (define (run/inner x)
-                 (cond [(rackunit-test-suite? x)
-                        (current-seed
-                         (apply-test-suite x fdown fup fhere (current-seed)))]
-                       [(list? x)
-                        (for-each run/inner x)]
-                       [else
-                        (void)]))
-               (parameterize
-                   ([current-seed seed]
-                    [current-test-case-around (test-suite-test-case-around fhere)]
-                    [current-check-around (test-suite-check-around fhere)])
-                 (let ([t test])
-                   (run/inner t))
-                 ...
-                 (current-seed)))])
-        (cond
-         [(not (string? the-name))
-          (raise-type-error 'test-suite "test-suite name as string" the-name)]
-         [else
-          (make-rackunit-test-suite
-           the-name
-           the-tests
-           before-thunk
-           after-thunk)])))]
-    [(test-suite name
-                 #:before before-thunk
-                 test ...)
-     (syntax
-      (test-suite name
-                  #:before before-thunk
-                  #:after  void-thunk
-                  test ...))]
-    [(test-suite name
-                 #:after after-thunk
-                 test ...)
-     (syntax
-      (test-suite name
-                  #:before void-thunk
-                  #:after  after-thunk
-                  test ...))]
-    [(test-suite name test ...)
-     (syntax
-      (test-suite name
-                  #:before void-thunk
-                  #:after  void-thunk
-                  test ...))]))
-
-(define (tests->test-suite-action tests)
-  (lambda (fdown fup fhere seed)
-    (parameterize ([current-seed seed])
-      (for-each
-       (lambda (t)
-         (cond
-          [(rackunit-test-suite? t)
-           (current-seed (apply-test-suite t fdown fup fhere (current-seed)))]
-          [(rackunit-test-case? t)
-           (current-seed
-            (fhere t
-                   (rackunit-test-case-name t)
-                   (rackunit-test-case-action t)
-                   (current-seed)))]
-          [else
-           (raise
-            (make-exn:test
-             (format "tests->test-suite-action received ~a in list of tests ~a, which is not a test." t tests)
-             (current-continuation-marks)))]))
-       tests)
-      (current-seed))))
-
-;; make-test-suite : string [#:before thunk] [#:after thunk] (listof test?) -> test-suite?
-;;
-;; Construct a test suite from a list of tests
-(define (make-test-suite name #:before [before void-thunk] #:after [after void-thunk] tests)
-  (make-rackunit-test-suite name
-                            (tests->test-suite-action tests)
-                            before
-                            after))
-
-;;
-;; Shortcut helpers
-;;
-
-(define-syntax define-test-suite
-  (syntax-rules ()
-    [(define-test-suite name test ...)
-     (define name
-       (test-suite (symbol->string (quote name))
-                   test ...))]))
-
-(define-syntax define/provide-test-suite
-  (syntax-rules ()
-    [(define/provide-test-suite name test ...)
-     (begin
-       (define-test-suite name test ...)
-       (provide name))]))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/test.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/test.rkt
deleted file mode 100644
index 787ce67d59..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/test.rkt
+++ /dev/null
@@ -1,170 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         "base.rkt"
-         "check.rkt"
-         "check-info.rkt"
-         "result.rkt"
-         "test-case.rkt"
-         "test-suite.rkt"
-         "util.rkt")
-
-(provide (struct-out exn:test)
-         (struct-out exn:test:check)
-         (struct-out check-info)
-         (struct-out test-result)
-         (struct-out test-failure)
-         (struct-out test-error)
-         (struct-out test-success)
-         (struct-out rackunit-test-case)
-         (struct-out rackunit-test-suite)
-
-         with-check-info
-         with-check-info*
-
-         make-check-name
-         make-check-params
-         make-check-location
-         make-check-expression
-         make-check-message
-         make-check-actual
-         make-check-expected
-
-         check-name?
-         check-params?
-         check-location?
-         check-expression?
-         check-message?
-         check-actual?
-         check-expected?
-
-         test-begin
-         test-case
-         test-suite
-         make-test-suite
-         delay-test
-         (rename-out [make-rackunit-test-case make-test-case]
-                     [rackunit-test-case? test-case?]
-                     [rackunit-test-suite? test-suite?])
-         current-test-name
-         current-test-case-around
-         test-suite-test-case-around
-         test-suite-check-around
-         
-         define-test-suite
-         define/provide-test-suite
-         test-suite*
-
-         before
-         after
-         around
-
-         require/expose
-         dynamic-require/expose
-
-         define-shortcut
-
-         test-check
-         test-pred
-         test-equal?
-         test-eq?
-         test-eqv?
-         test-=
-         test-true
-         test-false
-         test-not-false
-         test-exn
-         test-not-exn
-
-         foldts-test-suite
-         fold-test-results
-         run-test-case
-         run-test
-
-         fail-check
-
-         define-check
-         define-simple-check
-         define-binary-check
-         
-         current-check-handler
-         current-check-around
-
-         check
-         check-exn
-         check-not-exn
-         check-true
-         check-false
-         check-pred
-         check-eq?
-         check-eqv?
-         check-equal?
-         check-=
-         check-not-false
-         check-not-eq?
-         check-not-eqv?
-         check-not-equal?
-         check-regexp-match
-         check-match
-         fail)
-
-(define (void-thunk) (void))
-
-
-(define-syntax (define-shortcut stx)
-  (syntax-case stx ()
-    [(_ (name param ...) expr)
-     (with-syntax ([expected-form (syntax->datum
-                                   #`(#,(syntax name)
-                                      test-desc
-                                      #,@(syntax (param ...))))])
-       (syntax/loc stx
-         (define-syntax (name name-stx)
-           (syntax-case name-stx ()
-             [(name test-desc param ...)
-              (with-syntax ([name-expr (syntax/loc name-stx expr)])
-                (syntax/loc name-stx
-                  (test-case test-desc name-expr)))]
-             [_
-              (raise-syntax-error
-               #f
-               (format "Correct form is ~a" (quote expected-form))
-               name-stx)]))))]
-    [_
-     (raise-syntax-error
-      #f
-      "Correct form is (define-shortcut (name param ...) expr)"
-      stx)]))
-
-(define-shortcut (test-check operator expr1 expr2)
-  (check operator expr1 expr2))
-
-(define-shortcut (test-pred pred expr)
-  (check-pred pred expr))
-
-(define-shortcut (test-equal? expr1 expr2)
-  (check-equal? expr1 expr2))
-
-(define-shortcut (test-eq? expr1 expr2)
-  (check-eq? expr1 expr2))
-
-(define-shortcut (test-eqv? expr1 expr2)
-  (check-eqv? expr1 expr2))
-
-(define-shortcut (test-= expr1 expr2 epsilon)
-  (check-= expr1 expr2 epsilon))
-
-(define-shortcut (test-true expr)
-  (check-true expr))
-
-(define-shortcut (test-false expr)
-  (check-false expr))
-
-(define-shortcut (test-not-false expr)
-  (check-not-false expr))
-
-(define-shortcut (test-exn pred thunk)
-  (check-exn pred thunk))
-
-(define-shortcut (test-not-exn thunk)
-  (check-not-exn thunk))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/text-ui-util.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/text-ui-util.rkt
deleted file mode 100644
index deb4e4d896..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/text-ui-util.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-;;;
-;;; Time-stamp: <2008-06-19 21:14:36 noel>
-;;;
-;;; Copyright (C) by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-(provide trim-current-directory)
-
-;; trim-current-directory : string -> string
-(define (trim-current-directory path)
-  (let ((cd (path->string (current-directory))))
-    (regexp-replace (regexp-quote cd) path "")))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/util.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/util.rkt
deleted file mode 100644
index b8a5aa737b..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/private/util.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-;;;
-;;; Time-stamp: <2008-07-28 12:51:11 nhw>
-;;;
-;;; Copyright (C) 2004 by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; Web testingis distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with Web testing; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(require (for-syntax racket/base)
-         racket/runtime-path
-         "check.rkt"
-         "test-suite.rkt"
-         "test-case.rkt")
-
-(provide require/expose
-         dynamic-require/expose
-         test-suite*
-         check-regexp-match)
-
-;; Requires a module and exposes some of its unprovided identifiers.
-;; USAGE: (require/expose MODULE-NAME (IDS ...))
-;;   where MODULE-NAME is as in the MzRacket manual (i.e.,
-;;   a standard module spec) and IDS are the un-provided
-;;   identifiers that you wish to expose in the current
-;;   module.
-(define-syntax require/expose
-  (syntax-rules ()
-    [(_ mod (id ...))
-     (begin
-       (require (only-in mod))
-       (define-runtime-module-path the-resolved-mod mod)
-       (define-values (id ...)
-         ;; Use the correct module-registry
-         (parameterize ((current-namespace
-                         (variable-reference->namespace (#%variable-reference))))
-           (dynamic-require/expose* the-resolved-mod '(id ...)))))]))
-
-(define (dynamic-require/expose mod name)
-  (unless (or (path? mod)
-              (module-path? mod)
-              (module-path-index? mod)
-              (resolved-module-path? mod))
-    (raise-argument-error 'dynamic-require/expose
-                          "(or/c module-path? module-path-index? resolved-module-path?)"
-                          0 mod name))
-  (unless (symbol? name)
-    (raise-argument-error 'dynamic-require/expose "symbol?" 1 mod name))
-  (dynamic-require/expose* mod (list name)))
-
-(define (dynamic-require/expose* mod names)
-  ;; Make sure module the module is instantiated
-  (dynamic-require mod #f)
-  ;; Get the module namespace
-  (parameterize ((current-namespace (module->namespace mod)))
-    (apply values (map eval names))))
-
-(define-syntax test-suite*
-  (syntax-rules ()
-    ((test-suite* name (case-name case-body ...) ...)
-     (test-suite
-      name
-      (test-case case-name case-body ...) ...))))
-
-(define-simple-check (check-regexp-match regex string)
-  (and (string? string) 
-       (regexp-match regex string)))
diff --git a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/text-ui.rkt b/pkgs/rackunit-pkgs/rackunit-lib/rackunit/text-ui.rkt
deleted file mode 100644
index b1f1493827..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-lib/rackunit/text-ui.rkt
+++ /dev/null
@@ -1,267 +0,0 @@
-;;;
-;;; Time-stamp: <2009-06-11 17:11:22 noel>
-;;;
-;;; Copyright (C) 2005 by Noel Welsh.
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(require racket/match
-         racket/pretty
-         "private/base.rkt"
-         "private/counter.rkt"
-         "private/format.rkt"
-         "private/location.rkt"
-         "private/result.rkt"
-         "private/check-info.rkt"
-         "private/monad.rkt"
-         "private/hash-monad.rkt"
-         "private/name-collector.rkt"
-         "private/test.rkt"
-         "private/text-ui-util.rkt")
-
-(provide run-tests
-         display-context
-         display-exn
-         display-summary+return
-         display-ticker
-         display-result)
-
-
-;; display-ticker : test-result -> void
-;;
-;; Prints a summary of the test result
-(define (display-ticker result)
-  (cond
-    ((test-error? result)
-     (display "!"))
-    ((test-failure? result)
-     (display "-"))
-    (else
-     (display "."))))
-
-;; display-test-preamble : test-result -> (hash-monad-of void)
-(define (display-test-preamble result)
-  (lambda (hash)
-    (if (test-success? result)
-        hash
-        (begin
-          (display-delimiter)
-          hash))))
-
-;; display-test-postamble : test-result -> (hash-monad-of void)
-(define (display-test-postamble result)
-  (lambda (hash)
-    (if (test-success? result)
-        hash
-        (begin
-          (display-delimiter)
-          hash))))
-
-
-;; display-result : test-result -> void
-(define (display-result result)
-  (cond
-    ((test-error? result)
-     (display-test-name (test-result-test-case-name result))
-     (display-error)
-     (newline))
-    ((test-failure? result)
-     (display-test-name (test-result-test-case-name result))
-     (display-failure)
-     (newline))
-    (else
-     (void))))
-
-;; display-context : test-result [(U #t #f)] -> void
-(define (display-context result [verbose? #f])
-  (cond
-    [(test-failure? result)
-     (let* ([exn (test-failure-result result)]
-            [stack (exn:test:check-stack exn)])
-       (textui-display-check-info-stack stack verbose?)
-       (parameterize ([error-print-context-length 0])
-         ((error-display-handler) (exn-message exn) exn)))]
-    [(test-error? result)
-     (let ([exn (test-error-result result)])
-       (when (exn? exn)
-         (textui-display-check-info-stack (check-info-stack (exn-continuation-marks exn))))
-       (display-exn exn))]
-    [else (void)]))
-
-(define (sort-stack l)
-  (sort l < 
-        #:key 
-        (λ (info)
-          (cond
-            [(check-name? info)
-             0]
-            [(check-location? info)
-             1]
-            [(check-params? info)
-             2]
-            [(check-actual? info)
-             3]
-            [(check-expected? info)
-             4]            
-            [else
-             5]))))
-
-(define (textui-display-check-info-stack stack [verbose? #f])
-  (for-each
-   (lambda (info)
-     (cond
-       [(check-name? info)
-        (display-check-info info)]
-       [(check-location? info)
-        (display-check-info-name-value
-         'location
-         (trim-current-directory
-          (location->string
-           (check-info-value info)))
-         displayln)]
-       [(check-params? info)
-        (display-check-info-name-value
-         'params
-         (check-info-value info)
-         (lambda (v) (map pretty-print v)))]
-       [(check-actual? info)
-        (display-check-info-name-value
-         'actual
-         (check-info-value info)
-         pretty-print)]
-       [(check-expected? info)
-        (display-check-info-name-value
-         'expected
-         (check-info-value info)
-         pretty-print)]
-       [(and (check-expression? info)
-             (not verbose?))
-        (void)]
-       [else
-        (display-check-info info)]))
-   (sort-stack
-    (if verbose?
-      stack
-      (strip-redundant-params stack)))))
-
-;; display-verbose-check-info : test-result -> void
-(define (display-verbose-check-info result)
-  (cond
-    ((test-failure? result)
-     (let* ((exn (test-failure-result result))
-            (stack (exn:test:check-stack exn)))
-       (for-each
-        (lambda (info)
-          (cond
-            ((check-location? info)
-             (display "location: ")
-             (display (trim-current-directory
-                       (location->string
-                        (check-info-value info)))))
-            (else
-             (display (check-info-name info))
-             (display ": ")
-             (write (check-info-value info))))
-          (newline))
-        (sort-stack stack))))
-    ((test-error? result)
-     (display-exn (test-error-result result)))
-    (else
-     (void))))
-
-(define (std-test/text-ui display-context test)
-  (parameterize ([current-output-port (current-error-port)])
-    (fold-test-results
-     (lambda (result seed)
-       ((sequence* (update-counter! result)
-                   (display-test-preamble result)
-                   (display-test-case-name result)
-                   (lambda (hash)
-                     (display-result result)
-                     (display-context result)
-                     hash)
-                   (display-test-postamble result))
-        seed))
-     ((sequence
-        (put-initial-counter)
-        (put-initial-name))
-      (make-empty-hash))
-     test
-     #:fdown (lambda (name seed) ((push-suite-name! name) seed))
-     #:fup (lambda (name kid-seed) ((pop-suite-name!) kid-seed)))))
-
-(define (display-summary+return monad)
-  (monad-value
-   ((compose
-     (sequence*
-      (display-counter*)
-      (counter->vector))
-     (match-lambda
-       ((vector s f e)
-        (return-hash (+ f e)))))
-    monad)))
-
-(define (display-counter*)
-  (compose (counter->vector)
-           (match-lambda
-             [(vector s f e)
-              (if (and (zero? f) (zero? e))
-                  (display-counter)
-                  (lambda args
-                    (parameterize ([current-output-port (current-error-port)])
-                      (apply (display-counter) args))))])))
-
-;; run-tests : test [(U 'quiet 'normal 'verbose)] -> integer
-(define (run-tests test [mode 'normal])
-  (unless (or (test-case? test) (test-suite? test))
-    (raise-argument-error 'run-tests "(or/c test-case? test-suite?)" test))
-  (unless (memq mode '(quiet normal verbose))
-    (raise-argument-error 'run-tests "(or/c 'quiet 'normal 'verbose)" mode))
-  (parameterize ((current-custodian (make-custodian)))
-    (monad-value
-     ((compose
-       (sequence*
-        (case mode
-          [(normal verbose)
-           (display-counter*)]
-          [(quiet)
-           (lambda (a) a)])
-        (counter->vector))
-       (match-lambda
-        ((vector s f e)
-         (return-hash (+ f e)))))
-      (case mode
-        ((quiet)
-         (fold-test-results
-          (lambda (result seed)
-            ((update-counter! result) seed))
-          ((put-initial-counter)
-           (make-empty-hash))
-          test))
-        ((normal) (std-test/text-ui display-context test))
-        ((verbose) (std-test/text-ui
-                    (lambda (x) (display-context x #t))
-                    test)))))))
diff --git a/pkgs/rackunit-pkgs/rackunit-plugin-lib/LICENSE.txt b/pkgs/rackunit-pkgs/rackunit-plugin-lib/LICENSE.txt
deleted file mode 100644
index 129e4f8dba..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-plugin-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-rackunit-plugin-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/rackunit-pkgs/rackunit-plugin-lib/info.rkt b/pkgs/rackunit-pkgs/rackunit-plugin-lib/info.rkt
deleted file mode 100644
index 2be9a70c94..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-plugin-lib/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "data-lib"
-               "rackunit-lib"
-               "rackunit-gui"
-               "gui-lib"
-               "drracket-plugin-lib"))
-
-(define pkg-desc "RackUnit testing framework DrRacket plugin")
-
-(define pkg-authors '(ryanc noel))
diff --git a/pkgs/rackunit-pkgs/rackunit-plugin-lib/rackunit/info.rkt b/pkgs/rackunit-pkgs/rackunit-plugin-lib/rackunit/info.rkt
deleted file mode 100644
index 50a1cf54ca..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-plugin-lib/rackunit/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define tools '(("tool.rkt")))
-(define tool-names '("RackUnit DrRacket integration"))
diff --git a/pkgs/rackunit-pkgs/rackunit-plugin-lib/rackunit/tool.rkt b/pkgs/rackunit-pkgs/rackunit-plugin-lib/rackunit/tool.rkt
deleted file mode 100644
index 31a078cc25..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-plugin-lib/rackunit/tool.rkt
+++ /dev/null
@@ -1,83 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         drscheme/tool
-         racket/unit)
-
-(provide tool@)
-
-;; CONSTANTS
-
-(define BACKTRACE-NO-MESSAGE "No message.")
-(define LINK-MODULE-SPEC 'rackunit/private/gui/drracket-link)
-
-;; ----
-
-;; close/eventspace : (a* -> b) -> (a* -> b)
-;; Returns a procedure that executes the procedure in the 
-;; eventspace current when close/eventspace was executed.
-;; Effectively, "close" the procedure in the current eventspace.
-(define (close-eventspace f)
-  (let ([es (current-eventspace)])
-    (lambda args
-      (parameterize [(current-eventspace es)]
-        (apply f args)))))
-
-(define (close-eventspace/async f)
-  (let ([es (current-eventspace)])
-    (lambda args
-      (parameterize ((current-eventspace es))
-        (queue-callback (lambda () (apply f args)))))))
-
-(define tool@
-  (unit
-    (import drscheme:tool^)
-    (export drscheme:tool-exports^)
-
-    ;; show-backtrace : exn -> void
-    (define show-backtrace
-      (close-eventspace/async
-       (lambda (msg bt)
-         (drscheme:debug:show-backtrace-window
-          (or msg BACKTRACE-NO-MESSAGE)
-          bt))))
-
-    (define (list->srcloc x)
-      (make-srcloc (list-ref x 0)
-                   (list-ref x 1)
-                   (list-ref x 2)
-                   (list-ref x 3)
-                   (list-ref x 4)))
-
-    (define (get-errortrace-backtrace exn)
-      exn)
-
-    ;; show-source : value number number -> void
-    (define show-source
-      (close-eventspace/async
-       (lambda (src pos span)
-         (drscheme:debug:open-and-highlight-in-file
-          (list (make-srcloc src #f #f pos span))))))
-
-    (define interactions-text-mixin
-      (mixin ((class->interface drscheme:rep:text%)) ()
-        (inherit get-user-namespace)
-        (super-new)
-
-        (define/private (setup-helper-module)
-          (let ([link (parameterize ((current-namespace (get-user-namespace)))
-                        (dynamic-require LINK-MODULE-SPEC 'link))])
-            (set-box! link (vector get-errortrace-backtrace
-                                   show-backtrace
-                                   show-source))))
-
-        (define/override (reset-console)
-          (super reset-console)
-          (setup-helper-module))))
-
-    (drscheme:get/extend:extend-interactions-text interactions-text-mixin)
-
-    (define (phase1) (void))
-    (define (phase2) (void))
-
-    ))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/info.rkt b/pkgs/rackunit-pkgs/rackunit-test/info.rkt
deleted file mode 100644
index 3566a85ede..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '())
-
-(define pkg-desc "RackUnit documentation")
-
-(define pkg-authors '(noel ryanc))
-(define build-deps '("base"
-                     "eli-tester"
-                     "rackunit-lib"
-                     "srfi-lite-lib"))
-(define update-implies '("rackunit-lib"))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/all-rackunit-tests.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/all-rackunit-tests.rkt
deleted file mode 100644
index 86fe329c28..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/all-rackunit-tests.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-
-(require rackunit
-         "check-test.rkt"
-         "check-info-test.rkt"
-         "format-test.rkt"
-         "test-case-test.rkt"
-         "test-suite-test.rkt"
-         "base-test.rkt"
-         "location-test.rkt"
-         "result-test.rkt"
-         "test-test.rkt"
-         "util-test.rkt"
-         "text-ui-test.rkt"
-         "monad-test.rkt"
-         "hash-monad-test.rkt"
-         "counter-test.rkt"
-         "text-ui-util-test.rkt")
-
-(provide all-rackunit-tests
-         failure-tests)
-
-(define all-rackunit-tests
-  (test-suite
-   "All RackUnit Tests"
-   check-tests
-   base-tests
-   check-info-tests
-   test-case-tests
-   test-suite-tests
-   test-suite-define-provide-test
-   location-tests
-   result-tests
-   test-tests
-   util-tests
-   text-ui-tests
-   monad-tests
-   hash-monad-tests
-   counter-tests
-   text-ui-util-tests
-   format-tests
-   ))
-
-(define failure-tests
-  (test-suite
-   "Failures"
-   (test-case "Intended to fail" (fail))
-   (test-case "Also intended to fail" (check-eq? 'apples 'orange))
-   (test-equal? "Yet again intended to fail" "apples" "oranges")
-   (test-case "Intended to throw error" (error 'testing "<<This is an error message>>"))
-   (test-case "Error within a check" (check error 'foo 'bar))
-   ))
-
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/base-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/base-test.rkt
deleted file mode 100644
index 78fbce689e..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/base-test.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-;;;
-;;; Time-stamp: <2008-06-19 21:03:50 noel>
-;;;
-;;; Copyright (C) 2005 by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(require rackunit
-         rackunit/private/base)
-
-(provide base-tests)
-
-(define base-tests
-  (test-suite
-   "All tests for base"
-   (test-case
-    "rackunit-test-case structure has a contract on name"
-    (check-exn exn:fail?
-               (lambda ()
-                 (make-rackunit-test-case
-                  'foo
-                  (lambda () #t)))))
-   (test-case
-    "rackunit-test-case structure has a contract on action"
-    (check-exn exn:fail?
-               (lambda ()
-                 (make-rackunit-test-case
-                  "Name"
-                  #f))))
-   (test-case
-    "rackunit-test-suite has a contract on its fields"
-    (check-exn exn:fail?
-               (lambda ()
-                 (make-rackunit-test-suite
-                  #f
-                  (list)
-                  (lambda () 3)
-                  (lambda () 2))))
-    (check-exn exn:fail?
-               (lambda ()
-                 (make-rackunit-test-suite
-                  "Name"
-                  #f
-                  (lambda () 3)
-                  (lambda () 2))))
-    (check-exn exn:fail?
-               (lambda ()
-                 (make-rackunit-test-suite
-                  "Name"
-                  (list)
-                  #f
-                  (lambda () 2))))
-    (check-exn exn:fail?
-               (lambda ()
-                 (make-rackunit-test-suite
-                  "Name"
-                  (list)
-                  (lambda () 3)
-                  #f))))
-   ))
-
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/check-info-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/check-info-test.rkt
deleted file mode 100644
index dcec9ff8b6..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/check-info-test.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-;;;
-;;; <check-util-test.rkt> ---- Tests for check-util
-;;; Time-stamp: <2009-06-11 17:03:21 noel>
-;;;
-;;; Copyright (C) 2003 by Noel Welsh.
-;;;
-;;; This file is part of RackUnit.
-
-;;; RackUnit is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; RackUnit is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with RackUnit; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(require rackunit
-         rackunit/private/check-info)
-
-(provide check-info-tests)
-
-(define check-info-tests
-  (test-suite "All check-info tests"
-              (test-case
-               "with-check-info stores value in lexical order"
-               (let ((stack (with-check-info
-                             (('a 1)
-                              ('b 2)
-                              ('c 3))
-                             (check-info-stack (current-continuation-marks)))))
-                 (for-each (lambda (actual expected)
-                             (check-eq? (check-info-name actual)
-                                        expected))
-                           stack
-                           (list 'a 'b 'c))))
-              
-              (test-case
-               "Nested uses of with-check-info store values in lexical order"
-               (let ((stack (with-check-info
-                             (('a 1)
-                              ('b 2)
-                              ('c 3))
-                             (with-check-info
-                              (('d 4)
-                               ('e 5)
-                               ('f 6))
-                              (check-info-stack (current-continuation-marks))))))
-                 (for-each (lambda (actual expected)
-                             (check-eq? (check-info-name actual)
-                                        expected))
-                           stack
-                           (list 'a 'b 'c 'd 'e 'f))))
-              
-              (test-case
-               "check-actual? and check-expected? work"
-               (check-true (check-actual? (make-check-actual 1)))
-               (check-true (check-expected? (make-check-expected 1)))
-               (check-false (check-expected? (make-check-actual 1)))
-               (check-false (check-expected? (make-check-actual 1))))
-              
-              (test-case
-               "make-check-actual and make-check-expected store param"
-               (check-equal? (check-info-value (make-check-actual 1)) 1)
-               (check-equal? (check-info-value (make-check-expected 2)) 2))
-              
-              ))
-
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/check-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/check-test.rkt
deleted file mode 100644
index 848afed8ab..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/check-test.rkt
+++ /dev/null
@@ -1,417 +0,0 @@
-;;;
-;;; Time-stamp: <2009-03-25 12:32:55 noel>
-;;;
-;;; Copyright (C) by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(require racket/runtime-path
-         srfi/1
-         rackunit
-         rackunit/private/check
-         rackunit/private/result
-         rackunit/private/test-suite)
-
-(provide check-tests)
-
-(define (make-failure-test name pred . args)
-  (test-case
-   name
-   (check-exn exn:test:check?
-              (lambda ()
-                (apply pred args)))))
-
-;; NOTE(jpolitz): Not generalizing make-failure-test above because (at
-;; least) util-test expects it to be present, not exported, and a
-;; 2-argument procedure to test require/expose
-(define-syntax make-failure-test/stx
-  (syntax-rules ()
-    [(_ name pred arg ...)
-     (test-case
-      name
-      (check-exn exn:test:check?
-                 (lambda ()
-                   (pred arg ...))))]))
-
-(define-check (good)
-  #t)
-
-(define-check (bad)
-  (fail-check))
-
-(define check-tests
-  (test-suite
-   "Check tests"
-   ;; Successes
-   (test-case "Simple check-equal? test"
-              (check-equal? 1 1))
-   (test-case "Simple check-eq? test"
-              (check-eq? 'a 'a))
-   (test-case "Simple check-eqv? test"
-              (check-eqv? 'a 'a))
-   (test-case "Simple check test"
-              (check string=? "hello" "hello"))
-   (test-case "Simple check-true test"
-              (check-true (eq? 'a 'a)))
-   (test-case "Simple check-pred test"
-              (check-pred null? (list)))
-   (test-case "Simple check-exn test"
-              (check-exn exn:test:check?
-                         (lambda ()
-                           (check = 1 2))))
-   (test-case "Simple check-not-exn test"
-              (check-not-exn
-               (lambda ()
-                 (check = 1 1))))
-   (test-case "Simple check-not-eq?"
-              (check-not-eq? (cons 'a 'a) (cons 'a 'a)))
-   (test-case "Simple check-not-equal?"
-              (check-not-equal? 1 2))
-   (test-case "Defined check succeeds"
-              (good))
-   (test-case "Simple check-not-false test"
-              (check-not-false 3))
-   (test-case "Simple check-= test"
-              (check-= 1.0 1.0 0.0001))
-   
-   (test-case "Use of check as expression"
-              (for-each check-false '(#f #f #f)))
-   (test-case "Use of local check as expression"
-              (let ()
-                (define-simple-check (check-symbol? x)
-                  (symbol? x))
-                (for-each check-symbol? '(a b c))))
-
-   (test-case "Trivial check-match test"
-              (check-match "dirigible" _))
-
-   (test-case "Simple check-match test"
-              (check-match (list 1 2 3) (list _ _ 3)))
-
-   (test-case "check-match with a nested struct"
-              (let ()
-                (struct data (f1 f2 f3))
-                (check-match (data 1 2 (data 1 2 3))
-                             (data _ 2 (data _ _ _)))))
-
-   (test-case "Simple check-match test with a binding pred"
-              (check-match 3 x (odd? x)))
-
-   (test-case "check-match with a nested struct and a binding pred"
-              (let ()
-                (struct data (f1 f2 f3))
-                (check-match (data 1 2 (data 1 2 3))
-                             (data _ _ (data x y z))
-                             (equal? (+ x y z) 6))))
-   
-   ;; Failures
-   (make-failure-test "check-equal? failure"
-                      check-equal? 1 2)
-   (make-failure-test "check-eq? failure"
-                      check-eq? 'a 'b)
-   (make-failure-test "check-eqv? failure"
-                      check-eqv? 'a 'b)
-   (make-failure-test "check failure"
-                      check string=? "hello" "bye")
-   (make-failure-test "check-true failure"
-                      check-true (eq? 'a 'b))
-   (make-failure-test "check-pred failure"
-                      check-pred null? (list 1 2 3))
-   (make-failure-test "check-exn failure"
-                      check-exn exn:test:check? (lambda () (check = 1 1)))
-   (make-failure-test "check-exn wrong exception"
-                      check-exn exn:fail:contract:arity? (lambda () (+ 1 2)))
-   (make-failure-test "check-not-exn"
-                      check-not-exn (lambda () (/ 1 0)))
-   (make-failure-test "fail with message failure"
-                      fail "With message")
-   (make-failure-test "fail without message failure"
-                      fail)
-   (make-failure-test "Defined check fails"
-                      bad)
-   (make-failure-test "check-not-false failure"
-                      check-not-false #f)
-   (make-failure-test "check-= failure"
-                      check-= 1.0 2.0 0.0)
-
-   (make-failure-test/stx "check-match failure pred"
-                          check-match 5 x (even? x))
-
-   (make-failure-test/stx "check-match failure match"
-                           check-match (list 4 5) (list _))
-   
-   (test-case "check-= allows differences within epsilon"
-              (check-= 1.0 1.09 1.1))
-   
-   (make-failure-test "check-= failure > epsilon"
-                      check-= 1 12/10 1/10)
-   
-   (test-case "check-as-expression failure"
-              (check-exn exn:test:check?
-                         (lambda ()
-                           (for-each check-false '(#f not-false)))))
-   
-   (test-case
-    "Check allows optional message"
-    (begin
-      (check = 1 1 "message")))
-   
-   ;; Some necessary semantics
-   (test-case
-    "Check macro parameters evaluated once (simple-check)"
-    (let ((counter 0))
-      (check-true (begin (set! counter (add1 counter))
-                         #t))
-      (check = counter 1)))
-   (test-case
-    "Check macro parameters evaluated once (binary-check)"
-    (let ((counter 0))
-      (check-equal? (begin (set! counter (add1 counter))
-                           1)
-                    (begin (set! counter (add1 counter))
-                           1))
-      (check = counter 2)))
-   (test-case
-    "Check function parameters evaluated once (simple-check)"
-    (let ((counter 0))
-      (check-true (begin (set! counter (add1 counter))
-                         #t))
-      (check = counter 1)))
-   (test-case
-    "Check function parameters evaluated once (binary-check)"
-    (let ((counter 0))
-      (check-equal? (begin (set! counter (add1 counter))
-                           1)
-                    (begin (set! counter (add1 counter))
-                           1))
-      (check = counter 2)))
-   
-   ;; Exceptions have the correct types
-   (test-case
-    "Macro w/ no message, message is a string"
-    (let ((exn (with-handlers ([exn? (lambda (exn)
-                                       exn)])
-                 (check-true #f))))
-      (check-pred string? (exn-message exn))))
-   (test-case
-    "Function w/ no message, message is a string"
-    (let ((exn (with-handlers ([exn? (lambda (exn)
-                                       exn)])
-                 (check-true #f))))
-      (check-pred string? (exn-message exn))))
-   
-   ;; The check construction language
-   (test-case
-    "with-check-info* captures information"
-    (let ((name (make-check-info 'name "name"))
-          (info (make-check-info 'info "info")))
-      (with-handlers
-          [(exn:test:check?
-            (lambda (exn)
-              (let ((stack (exn:test:check-stack exn)))
-                (check = (length stack) 2)
-                (let ((actual-name (first stack))
-                      (actual-info (second stack)))
-                  (check-equal? name actual-name)
-                  (check-equal? info actual-info)))))]
-        (with-check-info*
-         (list name info)
-         (lambda ()
-           (fail-check))))))
-   (test-case
-    "with-check-info captures information"
-    (with-handlers
-        [(exn:test:check?
-          (lambda (exn)
-            (let ((stack (exn:test:check-stack exn)))
-              (check = (length stack) 2)
-              (let ((name (first stack))
-                    (info (second stack)))
-                (check-eq? (check-info-name name) 'name)
-                (check string=? (check-info-value name) "name")
-                (check-eq? (check-info-name info) 'info)
-                (check string=? (check-info-value info) "info")))))]
-      (with-check-info
-       (('name "name") ('info "info"))
-       (fail-check))))
-   (test-case
-    "check information stack unwinds"
-    (with-handlers
-        [(exn:test:check?
-          (lambda (exn)
-            (let ((stack (exn:test:check-stack exn)))
-              (check = (length stack) 2)
-              (let ((name (first stack))
-                    (info (second stack)))
-                (check-eq? (check-info-name name) 'name)
-                (check string=? (check-info-value name) "name")
-                (check-eq? (check-info-name info) 'info)
-                (check string=? (check-info-value info) "info")))))]
-      (with-check-info
-       (('name "name") ('info "info"))
-       (with-check-info
-        (('name "name") ('info "info"))
-        #t)
-       (fail-check))))
-   
-   ;; If check-exn isn't working correctly many tests above will
-   ;; silently fail.  Here we test check-exn is working.
-   (test-case
-    "check-exn traps exception"
-    (with-handlers
-        ((exn?
-          (lambda (exn) (fail "Received exception"))))
-      (check-exn exn:fail:contract:arity?
-                 (lambda () (= 1)))))
-   (test-case
-    "check-exn fails if no exception raised"
-    (with-handlers
-        ((exn:test:check?
-          (lambda (exn) #t))
-         (exn:fail:contract:arity?
-          (lambda (exn) (fail "check-exn didn't fail"))))
-      (check-exn exn? (lambda () (= 1 1)))
-      (= 1)))
-   
-   (test-case
-    "check-not-exn captures exception information if one raised"
-    (let* ([case (delay-test
-                  (test-case "check-not-exn"
-                             (check-not-exn
-                              (lambda () (error "Oh dear!")))))]
-           [result (test-failure-result (car (run-test case)))]
-           [names (map check-info-name
-                       (exn:test:check-stack result))])
-      (check-true
-       (fold (lambda (name found?)
-               (if (eq? name 'exception)
-                   #t
-                   found?))
-             #f names))
-      (check-true
-       (fold (lambda (name found?)
-               (if (eq? name 'exception-message)
-                   #t
-                   found?))
-             #f names))))
-
-   (test-case
-    "check-exn has check failure message"
-    (let* ([case (delay-test
-                  (test-case "check-exn"
-                             (check-exn #rx"ZZZZZ"
-                              (lambda () (fail-check "The Message")))))]
-           [result (test-failure-result (car (run-test case)))]
-           [names (map check-info-name
-                       (exn:test:check-stack result))])
-      (check-equal?
-        "The Message"
-        (exn-message result))))
-
-   (test-case
-    "check-not-exn has check failure message"
-    (let* ([case (delay-test
-                  (test-case "check-not-exn"
-                             (check-not-exn
-                              (lambda () (fail-check "The Message")))))]
-           [result (test-failure-result (car (run-test case)))]
-           [names (map check-info-name
-                       (exn:test:check-stack result))])
-      (check-equal?
-        "The Message"
-        (exn-message result))))
-   
-   ;; Verify that check-exn and check-not-exn raise errors (not check
-   ;; failures) if not given thunks.
-   (test-case
-    "check-exn raises contract exception if not given a procedure"
-    (check-exn exn:fail:contract?
-               (lambda ()
-                 (check-exn exn:fail? 'not-a-procedure))))
-
-   (test-case
-    "check-exn raises contract exception if given a procedure with incorrect arity"
-    (check-exn exn:fail:contract?
-               (lambda ()
-                 (check-exn exn:fail? (lambda (x) x)))))
-
-   (test-case
-    "check-not-exn raises contract exception if not given a procedure"
-    (check-exn exn:fail:contract?
-               (lambda ()
-                 (check-not-exn 'not-a-procedure))))
-
-   (test-case
-    "check-not-exn raises contract exception if given a procedure with incorrect arity"
-    (check-exn exn:fail:contract?
-               (lambda ()
-                 (check-not-exn (lambda (x) x)))))
-
-   ;; Regression test
-   ;; Uses of check (and derived forms) used to be un-compilable!
-   ;; We check that (write (compile --code-using-check--)) works.
-   ;; That involves some namespace hacking.
-   (test-case
-    "Checks are compilable"
-    (let ((destns (make-base-namespace))
-          (cns (current-namespace)))
-      (parameterize ((current-namespace destns))
-        (namespace-require '(for-syntax racket/base))
-        (namespace-require 'rackunit/private/check)
-        ;; First check that the right check macro got
-        ;; used: ie that it didn't just compile the thing
-        ;; as an application.
-        (let ((ecode
-               (syntax->datum (expand '(check = 1 2)))))
-          (check-false (and (pair? ecode)
-                            (eq? (car ecode) '#%app)
-                            (pair? (cdr ecode))
-                            (equal? (cadr ecode)
-                                    '(#%top . check)))))
-        ;; Then check to make sure that the compiled code
-        ;; is writable
-        (let ((stx-string "(check = 1 2)"))
-          (write (compile (read-syntax
-                           "check-test"
-                           (open-input-string stx-string)))
-                 (open-output-string))))))
-   
-   ;; Check evaluation contexts
-   (test-case
-    "current-check-around is used by checks"
-    (let ([x #f])
-      (parameterize ([current-check-around (lambda (t) (set! x 'foo))])
-                 (check-eq? 'a 'b))
-      (check-eq? x
-                 'foo)))
-
-   (test-case
-    "current-check-handler is used by checks"
-    (check-eq? (let/ec escape
-                 (parameterize ([current-check-handler (lambda (e) (escape 'foo))])
-                   (check-eq? 'a 'b)))
-               'foo))
-   ))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/counter-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/counter-test.rkt
deleted file mode 100644
index 6dd58e2855..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/counter-test.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-;;;
-;;; Time-stamp: <2008-06-19 21:05:15 noel>
-;;;
-;;; Copyright (C) 2005 by Noel Welsh.
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-#lang racket/base
-
-(require racket/match
-         rackunit
-         rackunit/private/counter
-         rackunit/private/monad
-         rackunit/private/hash-monad)
-
-(provide counter-tests)
-
-(define a-success (make-test-success "success" #t))
-(define an-error (make-test-error "error" #f))
-(define a-failure (make-test-failure "failure" #f))
-
-(define counter-tests
-  (test-suite
-   "All tests for counter"
-   (test-case
-    "counter->vector is correct"
-    (let ((monad ((put-initial-counter) (make-empty-hash))))
-      ((compose
-        (sequence* (update-counter! a-success)
-                   (update-counter! a-failure)
-                   (update-counter! an-error)
-                   (counter->vector))
-        (match-lambda
-         ((vector s f e)
-          (check = s 1)
-          (check = f 1)
-          (check = e 1)
-          (return-hash (void)))))
-       monad)))
-   ))
-
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/format-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/format-test.rkt
deleted file mode 100644
index 27bae183ee..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/format-test.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require rackunit
-         rackunit/private/check-info
-         rackunit/private/format)
-
-(provide format-tests)
-
-(define format-tests
-  (test-suite
-   "All tests for format"
-   
-   (test-case
-    "display-check-info-stack"
-    (let ([p (open-output-string)])
-      (parameterize ([current-output-port p])
-        (check string=?
-               (begin (display-check-info-stack
-                       (list (make-check-name "foo")
-                             (make-check-actual 1)
-                             (make-check-expected 2)))
-                      (get-output-string p))
-               "name:       \"foo\"\nactual:     1\nexpected:   2\n\n"))))
-   ))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/hash-monad-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/hash-monad-test.rkt
deleted file mode 100644
index 05779623d0..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/hash-monad-test.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-;;;
-;;; Time-stamp: <2008-06-19 21:06:21 noel>
-;;;
-;;; Copyright (C) 2005 by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(require rackunit
-         rackunit/private/monad
-         rackunit/private/hash-monad)
-
-(provide hash-monad-tests)
-
-(define hash-monad-tests
-  (test-suite
-   "All tests for hash-monad"
-   
-   (test-case
-    "Gets retrieves puts"
-    ((compose*
-      (put 'foo 10)
-      (lambda (v)
-        (get 'foo))
-      (lambda (v)
-        (check = v 10)
-        (return-hash #t)))
-     (make-empty-hash)))
-   
-   (test-case
-    "Get raises exception when no value exists"
-    (check-exn
-     exn:fail:contract?
-     (lambda ()
-       ((compose
-         (get 'foo)
-         (lambda (v)
-           (fail "Should not be executed")))
-        (make-empty-hash)))))
-   
-   (test-case
-    "Put overwrites existing entries"
-    ((compose*
-      (put 'foo 10)
-      (lambda (v)
-        (get 'foo))
-      (lambda (v)
-        (check = v 10)
-        (put 'foo 20))
-      (lambda (v)
-        (get 'foo))
-      (lambda (v)
-        (check = v 20)
-        (get 'foo)))
-     (make-empty-hash)))
-   
-   ))
-
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/info.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/info.rkt
deleted file mode 100644
index 08159a078e..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all (jay noel))))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/location-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/location-test.rkt
deleted file mode 100644
index 47fdc7295f..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/location-test.rkt
+++ /dev/null
@@ -1,97 +0,0 @@
-;;;
-;;; Time-stamp: <2008-07-28 11:14:22 nhw>
-;;;
-;;; Copyright (C) 2005 by Noel Welsh.
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-#lang racket/base
-
-(require rackunit
-         rackunit/private/location)
-
-(provide location-tests)
-
-(define (read-syntax/lang name port)
-  (parameterize ([read-accept-reader #t])
-    (read-syntax name port)))
-
-(define location-tests
-  (test-suite
-   "All tests for location"
-
-   (test-case
-    "syntax->location ok"
-    (around
-     (with-output-to-file "test-file.rkt"
-       (lambda () (display "#lang racket\n'foo\n")))
-     (let* ([stx (read-syntax/lang (string->path "test-file.rkt")
-                                   (open-input-file "test-file.rkt"))]
-            [rep (syntax->location stx)])
-       (check-equal? (location-source rep)
-                     (syntax-source stx))
-       (check-equal? (location-position rep)
-                     (syntax-position stx))
-       (check-equal? (location-span rep)
-                     (syntax-span stx)))
-     (delete-file "test-file.rkt")))
-
-   (test-case
-    "Emacs compatible location strings"
-    (check string=?
-           (location->string
-            (syntax->location
-             (datum->syntax
-              #f #f
-              (list "file.rkt" 42 38 1240 2))))
-           "file.rkt:42:38")
-    (check string=?
-           (location->string
-            (syntax->location
-             (datum->syntax
-              #f #f
-              (list (string->path "file.rkt") 42 38 1240 2))))
-           "file.rkt:42:38")
-    (check string=?
-           (location->string
-            (syntax->location
-             (datum->syntax
-              #f #f
-              (list #f 42 38 1240 2))))
-           "unknown:42:38")
-    (check string=?
-           (location->string
-            (syntax->location
-             (datum->syntax
-              #f #f
-              (list 'foo.rkt 42 38 1240 2))))
-           "foo.rkt:42:38")
-    (check string=?
-           (location->string
-            (syntax->location
-             (datum->syntax
-              #f #f
-              (list "foo.rkt" #f #f #f #f))))
-           "foo.rkt:?:?"))
-   ))
-  
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/log.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/log.rkt
deleted file mode 100644
index 3176846018..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/log.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-(require rackunit
-         rackunit/log)
-
-(module test racket/base
-  (require syntax/location)
-  ;; Use a separate namespace to avoid logging results
-  ;; in this namespace (where `raco test` would see errors).
-  (parameterize ([current-namespace (make-base-namespace)])
-    (dynamic-require (quote-module-path "..") #f)))
-
-(define-syntax-rule (&& label stdout-e stdout-p)
-  (let ()
-    (define stdout-ev stdout-e)
-    (define stdout-av stdout-p)
-    (unless (equal? stdout-ev stdout-av)
-      (error 'log "Bad ~a: ~v vs ~v" label stdout-ev stdout-av))))
-
-(define-syntax-rule (& test-e stdout-e stderr-e exit-e)
-  (let ()
-    (define stdout-p (open-output-string))
-    (define stderr-p (open-output-string))
-    (define exit-av 0)
-    (parameterize ([current-output-port stdout-p]
-                   [current-error-port stderr-p]
-                   [exit-handler (λ (ec) (set! exit-av ec))])
-      test-e)
-    (&& 'stdout stdout-e (get-output-string stdout-p))
-    (&& 'stderr stderr-e (get-output-string stderr-p))
-    (&& 'exit-code exit-e exit-av)))
-
-(& (test-log) "" "" 0)
-(& (test-log #:display? #t) "" "" 0)
-(& (test-log #:exit? #t) "" "" 0)
-(& (test-log #:display? #t #:exit? #t) "" "" 0)
-
-(check-true #t)
-
-(& (test-log) "" "" 0)
-(& (test-log #:display? #t) "1 test passed\n" "" 0)
-(& (test-log #:exit? #t) "" "" 0)
-(& (test-log #:display? #t #:exit? #t) "1 test passed\n" "" 0)
-
-(parameterize ([current-error-port (current-output-port)])
-  (check-true #f))
-
-(& (test-log) "" "" 0)
-(& (test-log #:display? #t) "" "1/2 test failures\n" 0)
-(& (test-log #:exit? #t) "" "" 1)
-(& (test-log #:display? #t #:exit? #t) "" "1/2 test failures\n" 1)
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/monad-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/monad-test.rkt
deleted file mode 100644
index 5e43d4ba84..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/monad-test.rkt
+++ /dev/null
@@ -1,128 +0,0 @@
-;;;
-;;; Time-stamp: <2008-06-19 21:07:07 noel>
-;;;
-;;; Copyright (C) 2005 by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-
-#lang racket/base
-
-(require rackunit
-         rackunit/private/monad)
-
-(provide monad-tests)
-
-;; A simple monad we'll use to thread a counter through
-;; code
-(define (counter-monad v s)
-  (make-monad v s))
-
-(define (return-counter value)
-  (lambda (counter)
-    (counter-monad value
-                   (monad-state counter))))
-
-(define (increment-counter)
-  (lambda (counter)
-    (set-monad-state! counter
-                      (add1 (monad-state counter)))
-    (set-monad-value! counter (void))
-    counter))
-
-(define (set-counter s)
-  (lambda (counter)
-    (set-monad-state! counter s)
-    (set-monad-value! counter (void))
-    counter))
-
-(define (get-counter)
-  (lambda (counter)
-    (set-monad-value! counter
-                      (monad-state counter))
-    counter))
-
-(define monad-tests
-  (test-suite
-   "All tests for monad"
-   
-   (test-case
-    "compose threads state"
-    (let ((m ((compose (get-counter)
-                       (lambda (c)
-                         (check = c 0)
-                         (increment-counter)))
-              (counter-monad (void) 0))))
-      (check = (monad-state m) 1)))
-   
-   (test-case
-    "compose* threads state"
-    (let ((m
-           ((compose* (get-counter)
-                      (lambda (c)
-                        (check = c 0)
-                        (increment-counter))
-                      (lambda (r)
-                        (check-pred void? r)
-                        (increment-counter))
-                      (lambda (r)
-                        (check-pred void? r)
-                        (get-counter))
-                      (lambda (c)
-                        (check = c 2)
-                        (return-counter #t)))
-            (counter-monad (void) 0))))
-      (check = 2 (monad-state m))
-      (check-true (monad-value m))))
-   
-   (test-case
-    "sequence threads state"
-    (let ((m ((sequence (increment-counter)
-                        (increment-counter))
-              (counter-monad (void) 0))))
-      (check = 2 (monad-state m))
-      (check-pred void? (monad-value m))))
-   
-   (test-case
-    "sequence* threads state"
-    (let ((m ((sequence* (increment-counter)
-                         (increment-counter)
-                         (increment-counter)
-                         (increment-counter))
-              (counter-monad (void) 0))))
-      (check = 4 (monad-state m))
-      (check-pred void? (monad-value m))))
-   
-   (test-case
-    "sequence* executes in correct order"
-    (let ((m ((sequence* (set-counter 0)
-                         (set-counter 1)
-                         (set-counter 2)
-                         (set-counter 4))
-              (counter-monad (void) 0))))
-      (check = 4 (monad-state m))
-      (check-pred void? (monad-value m))))
-   
-   ))
-
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/pr10950.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/pr10950.rkt
deleted file mode 100644
index 5dc237e369..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/pr10950.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-(require rackunit
-         rackunit/text-ui
-         racket/port
-         tests/eli-tester)
-
-(define output
-  (with-output-to-string
-     (lambda ()
-       (parameterize ([current-error-port (current-output-port)])
-         (define-check (check3)
-           (fail-check))
-         
-         (run-tests (test-suite "tests" (let ((foo check3)) (foo))))))))
-
-(test
- (regexp-match
-  (regexp (format "~a.*~a.*~a"
-                 (regexp-quote "--------------------\ntests > #f\nUnnamed test \nFAILURE\nname:       check3\nlocation:   ")                 
-                 (regexp-quote "pr10950.rkt:14:51")
-                 (regexp-quote "0 success(es) 1 failure(s) 0 error(s) 1 test(s) run\n")))
-  output))
-
-(module test racket/base
-  (require syntax/location)
-  ;; Use a separate namespace to avoid logging results
-  ;; in this namespace (where `raco test` would see errors).
-  (parameterize ([current-namespace (make-base-namespace)])
-    (dynamic-require (quote-module-path "..") #f)))
\ No newline at end of file
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/result-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/result-test.rkt
deleted file mode 100644
index f9bd3f8e46..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/result-test.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-
-(require rackunit
-         rackunit/private/result)
-
-(provide result-tests)
-  
-(define result-tests
-  (test-suite
-   "All tests for result"
-
-   (test-equal?
-    "fold-test-results returns seed"
-    (fold-test-results
-     (lambda (result seed) seed)
-     'hello
-     (delay-test (test-case "Demo" (check = 1 1)))
-     #:fdown (lambda (name seed) seed)
-     #:run run-test-case)
-    'hello)
-
-   (test-equal?
-    "fold-test-results return values of run to result-fn"
-    (fold-test-results
-     (lambda (v1 v2 seed)
-       (check-equal? v1 'v1)
-       (check-equal? v2 'v2)
-       seed)
-     'hello
-     (delay-test (test-case "Demo" (check = 1 1)))
-     #:run (lambda (name action) (values 'v1 'v2)))
-    'hello)
-
-   (test-equal?
-    "fold-test-results calls run with name and action"
-    (fold-test-results
-     (lambda (result seed) seed)
-     'hello
-     (delay-test (test-case "Demo" 'boo))
-     #:run (lambda (name action)
-             (check string=? name "Demo")
-             (check-equal? (action) 'boo)))
-    'hello)
-   ))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/run-tests.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/run-tests.rkt
deleted file mode 100644
index b8329f827e..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/run-tests.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-
-(require rackunit
-         rackunit/text-ui
-         "all-rackunit-tests.rkt")
-
-(run-tests all-rackunit-tests)
-
-;; These tests should all error, so we switch the meaning of correct and incorrect. If the error display changes significantly, DrDr will catch it
-(parameterize ([current-error-port (current-output-port)]
-               [current-output-port (current-error-port)])
-  (run-tests failure-tests))
-
-(module test racket/base
-  (require syntax/location)
-  ;; Use a separate namespace to avoid logging results
-  ;; in this namespace (where `raco test` would see errors).
-  (parameterize ([current-namespace (make-base-namespace)])
-    (dynamic-require (quote-module-path "..") #f)))
\ No newline at end of file
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-check-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-check-test.rkt
deleted file mode 100644
index 0570e8b4b4..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-check-test.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-;;;
-;;; Time-stamp: <2008-06-06 15:32:49 noel>
-;;;
-;;; Copyright (C) by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-
-;; Here we check the standalone (not within a test-case or
-;; test-suite) semantics of checks.  These tests are not
-;; part of the standard test suite and must be run
-;; separately.
-
-#lang racket/base
-
-(require rackunit/private/check)
-
-;; Don't run this test automatically:
-(module test racket/base
-  (displayln "run as program for tests"))
-
-;; This check should succeed
-(check = 1 1 0.0)
-
-;; This check should display an error including the message "Outta here!"
-(check-pred (lambda (x) (error "Outta here!")) 'foo)
-
-
-;; This check should display a failure
-(check = 1 2 0.0)
-
-;; This check should display "Oh HAI!"
-(parameterize
-    ([current-check-handler (lambda (e) (display "Oh HAI!\n"))])
-  (check = 1 2 0.0))
-
-;; This check should display "I didn't run"
-(parameterize
-    ([current-check-around (lambda (t) (display "I didn't run\n"))])
-  (check = 1 1 0.0))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-test-case-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-test-case-test.rkt
deleted file mode 100644
index 36540c5ab2..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-test-case-test.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-;; Here we check the standalone (not within a test-suite)
-;; semantics of checks.  These tests are not part of the
-;; standard test suite and must be run separately.
-
-#lang racket/base
-
-(require rackunit/private/check
-         rackunit/private/test-case)
-
-;; Don't run this test automatically:
-(module test racket/base
-  (displayln "run as program for tests"))
-
-;; These tests should succeeds
-(test-begin (check-eq? 1 1))
-(test-case "succeed" (check-eq? 1 1))
-
-;; These should raise errors
-(test-begin (error "First Outta here!"))
-(test-case "error" (error "Second Outta here!"))
-
-;; Thesse should raise failures
-(test-begin (check-eq? 1 2))
-(test-case "failure" (check-eq? 1 2))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone.rkt
deleted file mode 100644
index b3f6d63c3d..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang racket/base
-(require racket/runtime-path
-         rackunit
-         racket/path)
-
-(module test racket/base
-  (require syntax/location)
-  ;; Use a separate namespace to avoid logging results
-  ;; in this namespace (where `raco test` would see errors).
-  (parameterize ([current-namespace (make-base-namespace)])
-    (dynamic-require (quote-module-path "..") #f)))
-
-(define-runtime-path here ".")
-(define collects 
-  (normalize-path (build-path here ".." "..")))
-(define (collect-trim bs)
-  (regexp-replace* (regexp-quote (path->bytes collects)) bs #"PLTHOME/collects"))
-
-(define (require&catch path)
-  (define out-bs (open-output-bytes))
-  (define err-bs (open-output-bytes))
-  (parameterize ([current-output-port out-bs]
-                 [current-error-port err-bs]
-                 ;; Don't test context output; it's too fragile.
-                 [error-print-context-length 0])
-    (dynamic-require path #f))
-  (close-output-port out-bs)
-  (close-output-port err-bs)
-  (values (collect-trim (get-output-bytes out-bs))
-          (collect-trim (get-output-bytes err-bs))))
-
-(define-syntax-rule (test-file pth out err)
-  (begin
-    (define-runtime-module-path mod (file pth))
-    (define-values (cout cerr) (require&catch mod))
-    (check-equal? cout out)
-    (check-equal? cerr err)))
-
-(test-file "standalone-check-test.rkt"
-           #"Oh HAI!\nI didn't run\n"
-           #"\
---------------------
-ERROR
-Outta here!
-
---------------------
---------------------
-FAILURE
-name:       check
-location:   (#<path:PLTHOME/collects/tests/rackunit/standalone-check-test.rkt> 48 0 1450 17)
-expression: (check = 1 2)
-params:     (#<procedure:=> 1 2)\nmessage:    0.0
-
-Check failure
---------------------
-")
-
-(test-file "standalone-test-case-test.rkt"
-           #""
-           #"\
---------------------
-ERROR
-First Outta here!
-
---------------------
---------------------
-error
-ERROR
-Second Outta here!
-
---------------------
---------------------
-FAILURE
-actual:     1
-expected:   2
-name:       check-eq?
-location:   (#<path:PLTHOME/collects/tests/rackunit/standalone-test-case-test.rkt> 23 12 626 15)
-expression: (check-eq? 1 2)
-
-Check failure
---------------------
---------------------
-failure
-FAILURE
-actual:     1
-expected:   2
-name:       check-eq?
-location:   (#<path:PLTHOME/collects/tests/rackunit/standalone-test-case-test.rkt> 24 21 664 15)
-expression: (check-eq? 1 2)
-
-Check failure
---------------------
-")
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/test-case-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/test-case-test.rkt
deleted file mode 100644
index c726d6bafb..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/test-case-test.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-
-(require rackunit/private/base
-         rackunit/private/check
-         rackunit/private/test-case
-         rackunit/private/test-suite
-         rackunit/private/result)
-
-(provide test-case-tests)
-
-(define test-case-tests
-  (test-suite
-   "test-case-tests"
-
-   (check-exn #rx"contract" (λ () (test-case 'foo)))
-
-   (test-case
-    "test-begin terminates when sub-expression fails"
-    (let ([fail? #f])
-      (delay-test
-       (run-test
-        (test-begin
-         (check-eq? 'a 'b)
-         (set! fail? #t)))
-       (check-false fail?))))
-
-   (test-case
-    "test-case terminates when sub-expression fails"
-    (let ([fail? #f])
-      (delay-test
-       (run-test
-        (test-case
-         "foo"
-         (check-eq? 'a 'b)
-         (set! fail? #t)))
-       (check-false fail?))))
-
-   (test-case
-    "define allowed within test-begin"
-    (check-pred
-     test-success?
-     (delay-test
-      (car (run-test
-            (test-begin
-             (define yes #t)
-             (check-true yes)))))))
-
-   (test-case
-    "define allowed within test-case"
-    (check-pred
-     test-success?
-     (delay-test
-      (car (run-test
-            (test-case
-             "dummy"
-             (define yes #t)
-             (check-true yes)))))))))
-
-(module+ not-test
-  (require rackunit/text-ui)
-  (run-tests test-case-tests))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/test-suite-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/test-suite-test.rkt
deleted file mode 100644
index 62a47983f2..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/test-suite-test.rkt
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang racket/base
-
-(require rackunit
-         rackunit/private/check)
-
-(define run? #f)
-
-(define-test-suite define-test
-  (check = 1 1))
-
-(define/provide-test-suite test-suite-define-provide-test
-  (check = 1 1))
-
-(define test-suite-tests
-  (test-suite
-   "test-suite-tests"
-
-   ;; We rely on order of evaluation to test that checks are
-   ;; converted to test cases
-   
-   (test-begin
-    (check-false run?))
-   
-   (check-not-exn (lambda () (begin (set! run? #t) run?)))
-
-   (test-begin
-    (check-true run?))
-
-   ;; Reset state so tests can be run again.
-   (set! run? #f)
-
-   (test-case
-    "define-test"
-    (check-pred test-suite? define-test))
-
-   (test-case
-    "test-suite name must be string"
-    (check-exn exn:fail:contract?
-               (lambda ()
-                 (test-suite (check = 1 1)))))
-
-   (test-case
-    "make-test-suite"
-    (let* ([before? #f]
-           [after? #f]
-           [ran? #f]
-           [results
-            (run-test
-             (make-test-suite
-              "dummy1"
-              (list
-               (make-test-case
-                "dummy-test-1"
-                (lambda () (check-true #t)))
-               (make-test-suite
-                "dummy2"
-                #:before (lambda () (set! before? #t))
-                #:after  (lambda () (set! after? #t))
-                (list
-                 (make-test-case
-                  "dummy-test-2"
-                  (lambda ()
-                    (set! ran? #t)
-                    (check-true #t))))))))])
-      (check-equal? (length results) 2)
-      (map (lambda (r) (check-pred test-success? r)) results)
-      (check-true before?)
-      (check-true after?)
-      (check-true ran?)))
-   ))
-
-
-
-(provide test-suite-tests)
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/test-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/test-test.rkt
deleted file mode 100644
index 3449108185..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/test-test.rkt
+++ /dev/null
@@ -1,291 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         racket/runtime-path
-         srfi/1
-         srfi/13
-         rackunit
-         rackunit/private/util
-         rackunit/private/location)
-
-(provide test-tests)
-
-(define successful-suite
-  (test-suite
-   "Example A"
-   (test-case
-    "Example 1"
-    #t)
-   (test-case
-    "Example 2"
-    #t)
-   (test-case
-    "Example 3"
-    #t)))
-
-(define-check (check-test-results test successes failures errors)
-  (let ((results (run-test test)))
-    (check = (length results) (+ successes failures errors))
-    (check =
-           (length (filter test-success? results))
-           successes
-           "Successes not the expected number")
-    (check =
-           (length (filter test-failure? results))
-           failures
-           "Failures not the expected number")
-    (check =
-           (length (filter test-error? results))
-           errors
-           "Errors not the expected number")))
-
-(define-check (check-syntax-error msg sexp)
-  (let ((destns (make-base-namespace))
-        (cns (current-namespace)))
-    (parameterize ((current-namespace destns))
-      (namespace-require 'rackunit)
-      (check-exn (lambda (e)
-                   (check-pred exn:fail:syntax? e)
-                   (check string-contains (exn-message e) msg))
-                 (lambda ()
-                   (eval sexp))))))
-
-(define test-tests
-  (test-suite
-   "Test tests"
-   (test-case "Empty test" #t)
-
-   (test-case 
-    "After action is executed"
-    (let ((foo 1))
-      (after (check = foo 1) (set! foo 2))
-      (check = foo 2)))
-
-   (test-case
-    "Before action is executed"
-    (let ((foo 1))
-      (before (set! foo 2) (check = foo 2))
-      (check = foo 2)))
-
-   (test-case
-    "After action is executed in presence of exception"
-    (let ((foo 1))
-      (check-exn exn?
-                 (lambda ()
-                   (after (error "quit") (set! foo 2))))
-      (check = foo 2)))
-
-   (test-case
-    "Around action is executed in presence of exception"
-    (let ((foo 1))
-      (check-exn exn?
-                 (lambda ()
-                   (around
-                    (set! foo 0)
-                    (check = foo 0)
-                    (error "quit")
-                    (set! foo 2))))
-      (check = foo 2)))
-
-   (test-case
-    "Before macro catches badly formed syntax w/ helpful message"
-    (check-syntax-error
-     "Incorrect use of before macro.  Correct format is (before before-expr expr1 expr2 ...)"
-     '(before 1))
-    (check-syntax-error
-     "Incorrect use of before macro.  Correct format is (before before-expr expr1 expr2 ...)"
-     '(before)))
-
-   (test-case
-    "After macro catches badly formed syntax w/ helpful message"
-    (check-syntax-error
-     "Incorrect use of after macro.  Correct format is (after expr1 expr2 ... after-expr)"
-     '(after 1))
-    (check-syntax-error
-     "Incorrect use of after macro.  Correct format is (after expr1 expr2 ... after-expr)"
-     '(after)))
-
-   (test-case
-    "Around macro catches badly formed syntax w/ helpful message"
-    (check-syntax-error
-     "Incorrect use of around macro.  Correct format is (around before-expr expr1 expr2 ... after-expr)"
-     '(around))
-    (check-syntax-error
-     "Incorrect use of around macro.  Correct format is (around before-expr expr1 expr2 ... after-expr)"
-     '(around 1))
-    (check-syntax-error
-     "Incorrect use of around macro.  Correct format is (around before-expr expr1 expr2 ... after-expr)"
-     '(around 1 2)))
-     
-   (test-case
-    "Test around action"
-    (around (with-output-to-file "test.dat"
-              (lambda () (display "hello")))
-            (check-true (file-exists? "test.dat"))
-            (delete-file "test.dat")))
-
-   (test-case
-    "Before and after on test suite are run"
-    (let ((foo 1))
-      (check-equal? foo 1)
-      (run-test
-       (test-suite
-        "Dummy suite"
-        #:before (lambda () (set! foo 2))
-        #:after (lambda () (set! foo 3))
-        (test-case
-         "Test foo"
-         (check-equal? foo 2))))
-      (check-equal? foo 3)))
-
-   (test-case
-    "Before on test suite is run"
-    (let ((foo 1))
-      (check-equal? foo 1)
-      (run-test
-       (test-suite
-        "Dummy suite"
-        #:before (lambda () (set! foo 2))
-        (test-case
-         "Test foo"
-         (check-equal? foo 2))))
-      (check-equal? foo 2)))
-
-   (test-case
-    "After on test suite is run"
-    (let ((foo 1))
-      (check-equal? foo 1)
-      (run-test
-       (test-suite
-        "Dummy suite"
-        #:after (lambda () (set! foo 3))
-        (test-case
-         "Test foo"
-         (check-equal? foo 2))))
-      (check-equal? foo 3)))
-     
-   (test-case
-    "Test simple foldts-test-suite"
-    (check-equal?
-     '(S (C C C))
-     (foldts-test-suite
-      (lambda (suite name before after seed)
-        seed)
-      (lambda (suite name before after seed kid-seed)
-        (list 'S kid-seed))
-      (lambda (case name action seed)
-        (cons 'C seed))
-      (list)
-      successful-suite)))
-
-   (test-case
-    "Test fold-test-results"
-    (andmap
-     (lambda (result)
-       (check-pred test-success? result))
-     (fold-test-results
-      (lambda (result seed)
-        (cons result null))
-      null
-      successful-suite
-      #:fdown (lambda (name seed) (check-equal? name "Example A") seed))))
-
-   (test-case
-    "Test run-test"
-    (let ((result (run-test successful-suite)))
-      (check = (length result) 3)
-      (check-true (test-success? (car result)))
-      (check-true (test-success? (cadr result)))
-      (check-true (test-success? (caddr result)))))
-
-   (test-case
-    "Shortcuts work as expected"
-
-    (delay-test
-     (check-test-results (test-check "dummy" = 1 1) 1 0 0)
-     (check-test-results (test-check "dummy" string=? "foo" "bar") 0 1 0)
-     (check-test-results (test-check "dummy" string=? 'a 'b) 0 0 1)
-      
-     (check-test-results (test-pred "dummy" number? 1) 1 0 0)
-     (check-test-results (test-pred "dummy" number? #t) 0 1 0)
-     (check-test-results (test-pred "dummy" number? (error 'a)) 0 0 1)
-     (check-test-results (test-equal? "dummy" 1 1) 1 0 0)
-     (check-test-results (test-equal? "dummy" 1 2) 0 1 0)
-     (check-test-results (test-equal? "dummy" (error 'a) 2) 0 0 1)
-
-     (check-test-results (test-eq? "dummy" 'a 'a) 1 0 0)
-     (check-test-results (test-eq? "dummy" 'a 'b) 0 1 0)
-     (check-test-results (test-eq? "dummy" (error 'a) 'a) 0 0 1)
-
-     (check-test-results (test-eqv? "dummy" 'a 'a) 1 0 0)
-     (check-test-results (test-eqv? "dummy" 'a 'b) 0 1 0)
-     (check-test-results (test-eqv? "dummy" (error 'a) 'a) 0 0 1)
-
-     (check-test-results (test-= "dummy" 1.0 1.0 0.001) 1 0 0)
-     (check-test-results (test-= "dummy" '1.0 1.0 0.0) 0 1 0)
-     (check-test-results (test-= "dummy" (error 'a) 'a 0.01) 0 0 1)
-
-     (check-test-results (test-true "dummy" #t) 1 0 0)
-     (check-test-results (test-true "dummy" #f) 0 1 0)
-     (check-test-results (test-true "dummy" (error 'a)) 0 0 1)
-
-     (check-test-results (test-false "dummy" #f) 1 0 0)
-     (check-test-results (test-false "dummy" #t) 0 1 0)
-     (check-test-results (test-false "dummy" (error 'a)) 0 0 1)
-
-     (check-test-results (test-not-false "dummy" 1) 1 0 0)
-     (check-test-results (test-not-false "dummy" #f) 0 1 0)
-     (check-test-results (test-not-false "dummy" (error 'a)) 0 0 1)
-      
-     (check-test-results
-      (test-exn "dummy" exn? (lambda () (error 'a))) 1 0 0)
-     (check-test-results
-      (test-exn "dummy" exn? (lambda () 1)) 0 1 0)
-     (check-test-results
-      (test-exn "dummy" (lambda (exn) (error 'a)) (lambda () (error 'a))) 0 0 1)
-
-     (check-test-results
-      (test-not-exn "dummy" (lambda () 2)) 1 0 0)
-     (check-test-results
-      (test-not-exn "dummy" (lambda () (error 'a))) 0 1 0)))
-
-   (test-case
-    "test-case captures location"
-    (let ([failure
-           (car
-            (run-test
-             (delay-test (test-case "dummy" (check-equal? 1 2)))))])
-      (check-pred test-failure? failure)
-      (let* ([stack (exn:test:check-stack
-                     (test-failure-result failure))]
-             [loc (check-info-value
-                   (car (filter check-location? stack)))])
-        (check-regexp-match #rx"test-test\\.rkt" (location->string loc)))))
-     
-   (test-case
-    "Shortcuts capture location"
-    (let ((failure
-           (car
-            (run-test
-             (delay-test (test-equal? "dummy" 1 2))))))
-      (check-pred test-failure? failure)
-      (let* ((stack (exn:test:check-stack
-                     (test-failure-result failure)))
-             (loc (check-info-value
-                   (car (filter check-location? stack)))))
-        (check-regexp-match #rx"test-test\\.rkt" (location->string loc)))))
-            
-   (test-case
-    "All names that should be exported are exported"
-    check-info?
-    check-info-name
-    check-info-value)
-
-   (test-case
-    "make-test-case constructs a test case"
-    (check-pred
-     test-success?
-     (car
-      (run-test
-       (make-test-case "dummy" (lambda () (check-true #t)))))))
-   ))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/text-ui-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/text-ui-test.rkt
deleted file mode 100644
index 751deb1a90..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/text-ui-test.rkt
+++ /dev/null
@@ -1,238 +0,0 @@
-;;;
-;;; Time-stamp: <2010-03-29 13:56:54 noel>
-;;;
-;;; Copyright (C) 2005 by Noel Welsh.
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-#lang racket/base
-
-(require racket/runtime-path
-         racket/pretty
-         racket/port
-         srfi/1
-         srfi/13
-         rackunit
-         rackunit/text-ui)
-
-(provide text-ui-tests)
-
-(define-syntax-rule (with-all-output-to-string e ...)
-  (with-all-output-to-string* (lambda () e ...)))
-
-(define (with-all-output-to-string* thnk)
-  (with-output-to-string
-      (lambda ()
-        (parameterize ([current-error-port (current-output-port)])
-          (thnk)))))
-
-(define-runtime-path here ".")
-
-;; with-silent-output (() -> any) -> any
-(define (with-silent-output thunk)
-  (parameterize ([current-output-port (open-output-nowhere)]
-                 [current-error-port (open-output-nowhere)])
-    (thunk)))
-
-(define (failing-test)
-  (run-tests
-   (test-suite
-    "Dummy"
-    (test-case "Dummy" (check-equal? 1 2)))))
-
-(define (failing-binary-test/complex-params)
-  (run-tests
-   (test-suite
-    "Dummy"
-    (test-case "Dummy"
-               (check-equal?
-                (list (iota 15) (iota 15) (iota 15))
-                1)))))
-
-(define (failing-test/complex-params)
-  (run-tests
-   (test-suite
-    "Dummy"
-    (test-case "Dummy"
-               (check-false
-                (list (iota 15) (iota 15) (iota 15)))))))
-
-(define (quiet-failing-test)
-  (run-tests
-   (test-suite
-    "Dummy"
-    (test-case "Dummy" (check-equal? 1 2)))
-   'quiet))
-
-(define (quiet-error-test)
-  (run-tests
-   (test-suite
-    "Dummy"
-    (test-case "Dummy" (error "kabloom!")))
-   'quiet))
-
-(define text-ui-tests
-  (test-suite
-   "All tests for text-ui"
-   
-   (test-case
-    "Binary check displays actual and expected in failure error message"
-    (let ((op (with-all-output-to-string (failing-test))))
-      (check string-contains
-             op
-             "expected")
-      (check string-contains
-             op
-             "actual")))
-   
-   (test-case
-    "Binary check doesn't display params"
-    (let ((op (with-all-output-to-string (failing-test))))
-      (check (lambda (out str) (not (string-contains out str)))
-             op
-             "params")))
-   
-   (test-case
-    "Binary check output is pretty printed"
-    (let ([op (parameterize ([pretty-print-columns 80])
-                (with-all-output-to-string (failing-binary-test/complex-params)))])
-      (check string-contains
-             op
-             "'((0 1 2 3 4 5 6 7 8 9 10 11 12 13 14)
-  (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14)
-  (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14))")))
-   
-   (test-case
-    "Non-binary check output is pretty printed"
-    (let ([op (parameterize ([pretty-print-columns 80])
-                (with-all-output-to-string (failing-test/complex-params)))])
-      (check string-contains
-             op
-             "'((0 1 2 3 4 5 6 7 8 9 10 11 12 13 14)
-  (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14)
-  (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14))")))
-   
-   (test-case
-    "Location trimmed when file is under current directory"
-    (parameterize ((current-directory here))
-      (let ((op (with-all-output-to-string (failing-test))))
-        (check string-contains
-               op
-               "location:   text-ui-test.rkt"))))
-   
-   (test-case
-    "Name and location displayed before actual/expected"
-    (let ((op (with-all-output-to-string (failing-test))))
-      (let ((name-idx (string-contains op "name:"))
-            (loc-idx (string-contains op "location:"))
-            (actual-idx (string-contains op "actual:"))
-            (expected-idx (string-contains op "expected:")))
-        (check < name-idx loc-idx)
-        (check < loc-idx actual-idx)
-        (check < actual-idx expected-idx))))
-   
-   (test-case
-    "Quiet mode is quiet"
-    (let ((op1 (with-all-output-to-string (quiet-failing-test)))
-          (op2 (with-all-output-to-string (quiet-error-test))))
-      (check string=? op1 "")
-      (check string=? op2 "")))
-   
-   (test-case
-    "Number of unsuccessful tests returned"
-    (check-equal? (with-silent-output failing-test) 1)
-    (check-equal? (with-silent-output quiet-failing-test) 1)
-    (check-equal? (with-silent-output quiet-error-test) 1)
-    (check-equal? (with-silent-output
-                      (lambda ()
-                        (run-tests
-                         (test-suite
-                          "Dummy"
-                          (test-case "Dummy" (check-equal? 1 1)))
-                         'quiet)))
-                  0))
-   
-   (test-case
-    "run-tests runs suite before/after actions in quiet mode"
-    (with-silent-output
-        (λ ()
-          (let ([foo 1])
-            (run-tests
-             (test-suite
-              "Foo"
-              #:before (lambda () (set! foo 2))
-              #:after (lambda () (set! foo 3))
-              (test-case
-               "Foo check"
-               (check = foo 2)))
-             'quiet)
-            (check = foo 3)))))
-   
-   (test-case
-    "run-tests runs suite before/after actions in normal mode"
-    (with-silent-output
-        (λ ()
-          (let ([foo 1])
-            (run-tests
-             (test-suite
-              "Foo"
-              #:before (lambda () (set! foo 2))
-              #:after (lambda () (set! foo 3))
-              (test-case
-               "Foo check"
-               (check = foo 2)))
-             'normal)
-            (check = foo 3)))))
-   
-   (test-case
-    "run-tests runs suite before/after actions in verbose mode"
-    (with-silent-output
-        (λ ()
-          (let ([foo 1])
-            (run-tests
-             (test-suite
-              "Foo"
-              #:before (lambda () (set! foo 2))
-              #:after (lambda () (set! foo 3))
-              (test-case
-               "Foo check"
-               (check = foo 2)))
-             'verbose)
-            (check = foo 3)))))
-
-   (test-case
-    "cannot kill current thread in test case"
-    (check-equal? (call-in-nested-thread
-                   (lambda ()
-                     (with-silent-output
-                      (lambda ()
-                        (run-tests
-                         (test-suite "tests"
-                           (test-case "kill-thread"
-                             (kill-thread (current-thread)))))))))
-                  ;; If the kill-thread were successful, call-in-nested-thread
-                  ;; would raise error. We expect kill-thread to raise error,
-                  ;; caught by run-tests.
-                  1))
-   ))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/text-ui-util-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/text-ui-util-test.rkt
deleted file mode 100644
index 901f6eecf7..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/text-ui-util-test.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-;;;
-;;; Time-stamp: <2008-06-19 21:08:18 noel>
-;;;
-;;; Copyright (C) by Noel Welsh. 
-;;;
-
-;;; This library is free software; you can redistribute it
-;;; and/or modify it under the terms of the GNU Lesser
-;;; General Public License as published by the Free Software
-;;; Foundation; either version 2.1 of the License, or (at
-;;; your option) any later version.
-
-;;; This library is distributed in the hope that it will be
-;;; useful, but WITHOUT ANY WARRANTY; without even the
-;;; implied warranty of MERCHANTABILITY or FITNESS FOR A
-;;; PARTICULAR PURPOSE.  See the GNU Lesser General Public
-;;; License for more details.
-
-;;; You should have received a copy of the GNU Lesser
-;;; General Public License along with this library; if not,
-;;; write to the Free Software Foundation, Inc., 59 Temple
-;;; Place, Suite 330, Boston, MA 02111-1307 USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-#lang racket/base
-
-(require rackunit
-         rackunit/private/text-ui-util)
-
-(provide text-ui-util-tests)
-
-(define text-ui-util-tests
-  (test-suite
-   "All tests for text-ui-util"
-   
-   (test-equal?
-    "trim-current-directory leaves directories outside the current directory alone"
-    (trim-current-directory "/foo/bar/")
-    "/foo/bar/")
-   
-   (test-equal?
-    "trim-current-directory strips directory from files in current directory"
-    (trim-current-directory
-     (path->string (build-path (current-directory) "foo.rkt")))
-    "foo.rkt")
-   
-   (test-equal?
-    "trim-current-directory leaves subdirectories alone"
-    (trim-current-directory
-     (path->string (build-path (current-directory) "foo" "bar.rkt")))
-    "foo/bar.rkt")
-   ))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/tl.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/tl.rkt
deleted file mode 100644
index 5a88d0d665..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/tl.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-(require rackunit)
-
-;; test to make sure that the various check functions
-;; return what they are promised to at the top-level
-
-;; make drdr notice when a check prints something.
-(current-output-port (current-error-port))
-
-(check-equal? (check + 1 2) (void))
-
-(check-equal? (check-eq? 1 1) (void))
-(check-equal? (check-not-eq? #f #t) (void))
-(check-equal? (check-eqv? (expt 2 100) (expt 2 100)) (void))
-(check-equal? (check-not-eqv? (expt 2 100) 1) (void))
-(check-equal? (check-equal? (list 1 2) (list 1 2)) (void))
-(check-equal? (check-not-equal? (list 1 2) (list 2 1)) (void))
-
-(check-equal? (check-pred not #f) (void))
-(check-equal? (check-= 1.1 1.2 0.5) (void))
-(check-equal? (check-true #t) (void))
-(check-equal? (check-false #f) (void))
-(check-equal? (check-not-false 3) (void))
-
-(check-equal? (check-exn #rx"car" (λ () (car 1))) (void))
-(check-equal? (check-not-exn (λ () 1)) (void))
-
-(check-equal? (check-regexp-match #rx"a*b" "aaaaaaab") (void))
diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/util-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/util-test.rkt
deleted file mode 100644
index eefedb7804..0000000000
--- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/util-test.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-
-(require rackunit
-         rackunit/private/util)
-
-(provide util-tests)
-
-;; FIXME: Two problems
-;; 1 - This is not the way to test require/expose: if this fails, it 
-;;     prevents the tests from loading.
-;; 2 - For whatever reason, it *does* fail when loaded via PLaneT. 
-;;     Still waiting for resolution on a bug report.
-(require/expose "check-test.rkt" (make-failure-test))
-
-(define util-tests
-  (test-suite
-   "Util tests"
-   (test-case
-    "make-failure-test required from check-test.rkt"
-    (begin
-      (check-true (procedure? make-failure-test))
-      (check-equal? (make-arity-at-least 2)
-                    (procedure-arity make-failure-test))
-      (check-pred rackunit-test-case?
-                  (delay-test (make-failure-test "foo" string?)))))
-   
-   (test-case
-    "Test test-suite*"
-    (let ((result
-           (run-test
-            (test-suite*
-             "Test test-suite*"
-             ("Test 1" (check = 1 1))
-             ("Test 2" (check = 1 1) (check = 2 4))))))
-      (check = (length result) 2)
-      (check-true (test-success? (car result)))
-      (check-true (test-failure? (cadr result)))))
-   
-   (test-case
-    "Simple check-regexp test"
-    (check-regexp-match "a*bba"
-                        "aaaaaabba"))
-   
-   (test-case
-    "check-regexp-match failure"
-    (check-exn
-     exn:test:check?
-     (lambda ()
-       (check-regexp-match "a+bba" "aaaabbba"))))
-   ))
diff --git a/pkgs/rackunit-pkgs/rackunit/LICENSE.txt b/pkgs/rackunit-pkgs/rackunit/LICENSE.txt
deleted file mode 100644
index 5fd50562bd..0000000000
--- a/pkgs/rackunit-pkgs/rackunit/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-rackunit
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/rackunit-pkgs/rackunit/info.rkt b/pkgs/rackunit-pkgs/rackunit/info.rkt
deleted file mode 100644
index 242245c789..0000000000
--- a/pkgs/rackunit-pkgs/rackunit/info.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("rackunit-lib"
-               "rackunit-doc"
-               "rackunit-gui"
-               "rackunit-plugin-lib"))
-(define implies '("rackunit-lib"
-                  "rackunit-doc"
-                  "rackunit-gui"
-                  "rackunit-plugin-lib"))
-
-(define pkg-desc "RackUnit testing framework")
-
-(define pkg-authors '(ryanc noel))
diff --git a/pkgs/readline-pkgs/readline-doc/LICENSE.txt b/pkgs/readline-pkgs/readline-doc/LICENSE.txt
deleted file mode 100644
index 72820d32cd..0000000000
--- a/pkgs/readline-pkgs/readline-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-readline-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/readline-pkgs/readline-doc/info.rkt b/pkgs/readline-pkgs/readline-doc/info.rkt
deleted file mode 100644
index 7b1b1b081f..0000000000
--- a/pkgs/readline-pkgs/readline-doc/info.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("scribble-lib"
-                     "readline-lib"
-                     "racket-doc"))
-(define deps '("base"))
-(define update-implies '("readline-lib"))
-
-(define pkg-desc "documentation part of \"readline\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/readline-pkgs/readline-doc/readline/info.rkt b/pkgs/readline-pkgs/readline-doc/readline/info.rkt
deleted file mode 100644
index d07724b49e..0000000000
--- a/pkgs/readline-pkgs/readline-doc/readline/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("readline.scrbl" () (tool-library))))
diff --git a/pkgs/readline-pkgs/readline-doc/readline/readline.scrbl b/pkgs/readline-pkgs/readline-doc/readline/readline.scrbl
deleted file mode 100644
index f4ea232895..0000000000
--- a/pkgs/readline-pkgs/readline-doc/readline/readline.scrbl
+++ /dev/null
@@ -1,278 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          (for-label racket/base
-                     readline
-                     readline/pread
-                     readline/readline
-                     racket/contract
-                     ffi/unsafe/atomic
-                     (except-in ffi/unsafe ->)))
-
-@(define readline "Readline")
-@(define Readline "Readline")
-
-@title{Readline: Terminal Interaction}
-
-The @filepath{readline} collection (not to be confused with Racket's
-@racket[read-line] function) provides glue for using GNU's @|readline|
-library with the Racket @racket[read-eval-print-loop].
-
-@section{Normal Use of @|Readline|}
-
-@defmodule*[(readline readline/rep-start)]
-
-The @racketmodname[readline] library installs a @|readline|-based
-input port (whose name is @racket['readline-input]) and hooks the
-prompt-and-read part of Racket's @racket[read-eval-print-loop] to
-interact with it.
-
-You can start Racket with
-
-@commandline{racket -il readline}
-
-or evaluate
-
-@racketblock[
-(require readline)
-]
-
-in the Racket @racket[read-eval-print-loop] to load @|readline|
-manually.  You can also put (require readline) in your
-@filepath{~/.racketrc}, so that Racket automatically loads
-@|readline| support in interactive mode.
-
-If you want to enable @|readline| support only sometimes---such as
-only when you use an @exec{xterm}, and not when you use an Emacs
-shell---then you can use @racket[dynamic-require], as in the following
-example:
-
-@racketblock[
-(when (regexp-match? #rx"xterm"
-                     (getenv "TERM"))
-  (dynamic-require 'readline #f))
-]
-
-The @racketmodname[readline] library automatically checks whether the
-current input port is a terminal, as determined by
-@racket[terminal-port?], and it installs @|readline| only to replace
-terminal ports.  The @racketmodname[readline/rep-start] module
-installs @|readline| without a terminal check.
-
-By default, @|readline|'s completion is set to use the visible
-bindings in the current namespace. This is far from ideal, but it's
-better than @|readline|'s default filename completion which is rarely
-useful.  In addition, the @|readline| history is stored across
-invocations in Racket's preferences file, assuming that Racket
-exits normally.
-
-The @racketmodname[readline] library adjusts
-@racket[read-eval-print-loop] by setting the prompt read handler as
-determined by @racket[current-prompt-read]. The call to the read
-interaction handler (as determined by
-@racket[current-read-interaction]) is parameterized to set
-@racket[readline-prompt], so that a prompt will be printed when
-reading starts. To compensate for the prompt printed via
-@racket[readline-prompt], when the interaction input port's name (as
-produced by function in the
-@racket[current-get-interaction-input-port] parameter) is
-@racket['readline-input], the prompt read handler skips printing a
-prompt; otherwise, it displays a prompt as determined by
-@racket[current-prompt].
-
-@defproc[(install-readline!) void?]{
-
-Adds @racket[(require readline/rep)] to the result of
-@racket[(find-system-path 'init-file)], which is
-@filepath{~/.racketrc} on Unix. Consequently, @|readline| will be
-loaded whenever Racket is started in interactive mode. The
-declaration is added only if it is not already present, as determined
-by @racket[read]ing and checking all top-level expressions in the
-file.
-
-For more fine-grained control, such as conditionally loading
-@|readline| based on an environment variable, edit
-@filepath{~/.racketrc} manually.}
-
-@section{Interacting with the @|Readline|-Enabled Input Port }
-
-@defmodule[readline/pread]{ The @racketmodname[readline/pread] library
-provides customization, and support for prompt-reading after
-@racketmodname[readline] installs the new input port.}
-
-The reading facility that the new input port provides can be
-customized with the following parameters.
-
-
-@defparam[current-prompt bstr bytes?]{
-
-A parameter that determines the prompt that is used, as a byte string.
-Defaults to @racket[#"> "].}
-
-
-@;{
-@defboolparam[show-all-prompts on?]{
-
-A parameter. If @racket[#f], no prompt is shown until you write input
-that is completely readable.  For example, when you type
-
-@racketblock[
-(foo bar) (+ 1
-             2)
-]
-
-you will see a single prompt in the beginning.
-
-The problem is that the first expression can be @racket[(read-line)],
-which normally consumes the rest of the text on the @emph{same} line.
-The default value of this parameter is therefore @racket[#t], making
-it mimic plain I/O interactions.}
-}
-
-@defparam[max-history n exact-nonnegative-integer?]{
-
-A parameter that determines the number of history entries to save,
-defaults to @racket[100].}
-
-
-@defparam[keep-duplicates keep? (one-of/c #f 'unconsecutive #t)]{
-
-A parameter. If @racket[#f] (the default), then when a line is equal
-to a previous one, the previous one is removed.  If it set to
-@racket['unconsecutive] then this happens only for an line that
-duplicates the previous one, and if it is @racket[#f] then all
-duplicates are kept.}
-
-
-@defboolparam[keep-blanks keep?]{
-
-A parameter. If @racket[#f] (the default), blank input lines are not
-kept in history.}
-
-
-@defparam[readline-prompt status (or/c false/c bytes? (one-of/c 'space))]{
-
-The new input port that you get when you require
-@racketmodname[readline] is a custom port that uses @|readline| for
-all inputs.  The problem is when you want to display a prompt and then
-read some input, @|readline| will get confused if it is not used when the
-cursor is at the beginning of the line (which is why it has a
-@racket[_prompt] argument.)  To use this prompt:
-
-@racketblock[
-(parameterize ([readline-prompt some-byte-string])
-  ...code-that-reads...)
-]
-
-This expression makes the first call to @|readline| use the prompt, and
-subsequent calls will use an all-spaces prompt of the same length (for
-example, when you're reading an S-expression).  The normal value of
-@racket[readline-prompt] is @racket[#f] for an empty prompt (and
-spaces after the prompt is used, which is why you should use
-@racket[parameterize] to restore it to @racket[#f]).
-
-A proper solution would be to install a custom output port, too, which
-keeps track of text that is displayed without a trailing newline.  As
-a cheaper solution, if line-counting is enabled for the terminal's
-output-port, then a newline is printed before reading if the column is
-not 0. (The @racketmodname[readline] library enables line-counting
-for the output port.)
-
-@bold{Warning:} The @|readline| library uses the output port directly.
-You should not use it when @racket[current-input-port] has been
-modified, or when it was not a terminal port when Racket was started
-(eg, when reading input from a pipe).  Expect some problems if you
-ignore this warning (not too bad, mostly problems with detecting an
-EOF).}
-
-
-
-@section{Direct Bindings for @|Readline| Hackers}
-
-@defmodule[readline/readline]
-
-@defproc[(readline [prompt string?]) string?]{
-
-Prints the given prompt string and reads a line.}
-
-
-@defproc[(readline-bytes [prompt bytes?]) bytes?]{
-
-Like @racket[readline], but using raw byte-strings for the prompt and
-returning a byte string.}
-
-
-@defproc[(add-history [str string?]) void?]{
-
-Adds the given string to the @|readline| history, which is accessible to
-the user via the up-arrow key.}
-
-
-@defproc[(add-history-bytes [str bytes?]) void?]{
-
-Adds the given byte string to the @|readline| history, which is
-accessible to the user via the up-arrow key.}
-
-@defproc[(history-length) exact-nonnegative-integer?]{
-
-Returns the length of the history list.}
-
-
-@defproc[(history-get [idx integer?]) string?]{
-
-Returns the history string at the @racket[idx] position.  @racket[idx]
-can be negative, which will make it count from the last (i.e,
-@racket[-1] returns the last item, @racket[-2] returns the
-second-to-last, etc.)}
-
-
-@defproc[(history-delete [idx integer?]) string?]{
-
-Deletes the history string at the @racket[idx] position.  The position
-is specified in the same way as the argument for @racket[history-get].}
-
-
-@defproc[(set-completion-function! [proc ((or/c string? bytes?)
-                                          . -> . (listof (or/c string? bytes?)))]
-                                   [type (one-of/c _string _bytes) _string])
-         void?]{
-
-Sets @|readline|'s @tt{rl_completion_entry_function} to
-@racket[proc]. The @racket[type] argument, whose possible values are
-from @racketmodname[ffi/unsafe], determines the type of value supplied
-to the @racket[proc].}
-
-@defproc[(readline-newline) void?]{
-
-Sets the cursor to the start of a new line.}
-
-
-@defproc[(readline-redisplay) void?]{
-
-Forces a redisplay of the @|readline| prompt and current user input.
-
-The @racket[readline-redisplay] function can be used together with
-@racket[readline-newline] to prevent a background thread from
-cluttering up the user input by interleaving its output.  For example,
-an unsafe wrapper function for the thread's output might look like the
-following:
-
-@racketblock[
-(define (with-thread-safe-output output-thunk)
-  (dynamic-wind
-    (lambda ()
-      (start-atomic)
-      (readline-newline))
-    output-thunk
-    (lambda ()
-      (readline-redisplay)
-      (end-atomic))))]}
-
-
-@section[#:tag "readline-license"]{License Issues}
-
-GNU's @|readline| library is covered by the GPL, and that applies to
-code that links with it.  Racket is licensed with the LGPL, so the
-@|readline| code is not used by default; you should explicitly enable
-it if you want to.  Also, be aware that if you write code that uses
-this library, it will make your code link to the @|readline| library
-when invoked, with the usual GPL implications.
diff --git a/pkgs/readline-pkgs/readline-lib/LICENSE.txt b/pkgs/readline-pkgs/readline-lib/LICENSE.txt
deleted file mode 100644
index 24b7cddab1..0000000000
--- a/pkgs/readline-pkgs/readline-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-readline-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/readline-pkgs/readline-lib/info.rkt b/pkgs/readline-pkgs/readline-lib/info.rkt
deleted file mode 100644
index 821d3aa5c1..0000000000
--- a/pkgs/readline-pkgs/readline-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "implementation (no documentation) part of \"readline\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/readline-pkgs/readline-lib/readline/main.rkt b/pkgs/readline-pkgs/readline-lib/readline/main.rkt
deleted file mode 100644
index f10d51ea61..0000000000
--- a/pkgs/readline-pkgs/readline-lib/readline/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket
-
-(require "rep.rkt")
-(provide (all-from-out "rep.rkt"))
diff --git a/pkgs/readline-pkgs/readline-lib/readline/pread.rkt b/pkgs/readline-pkgs/readline-lib/readline/pread.rkt
deleted file mode 100644
index 88815dff0b..0000000000
--- a/pkgs/readline-pkgs/readline-lib/readline/pread.rkt
+++ /dev/null
@@ -1,242 +0,0 @@
-#lang racket/base
-
-(require "rktrl.rkt" racket/list racket/file)
-
-;; --------------------------------------------------------------------------
-;; Configuration
-
-(define current-prompt   (make-parameter #"> "))
-(define max-history      (make-parameter 100))
-(define keep-duplicates  (make-parameter #f))
-(define keep-blanks      (make-parameter #f))
-(provide current-prompt max-history keep-duplicates keep-blanks)
-
-;; --------------------------------------------------------------------------
-;; Simple namespace-based completion
-
-;; efficiently convert symbols to byte strings
-(define symbol->bstring
-  (let ([t (make-weak-hash)])
-    (lambda (sym)
-      (or (hash-ref t sym #f)
-          (let ([bstr (string->bytes/utf-8 (symbol->string sym))])
-            (hash-set! t sym bstr)
-            bstr)))))
-
-;; get a list of byte strings for current bindings, cache last result
-(define get-namespace-bstrings
-  (let ([last-syms #f] [last-bstrs #f])
-    (lambda ()
-      (define syms (namespace-mapped-symbols))
-      (unless (equal? syms last-syms)
-        (set! last-syms syms)
-        (set! last-bstrs (sort (map symbol->bstring syms) bytes<?)))
-      last-bstrs)))
-
-(define (namespace-completion pat)
-  (let* ([pat (if (string? pat) (string->bytes/utf-8 pat) pat)]
-         [pat (regexp-quote pat)]
-         [pat (regexp-replace* #px#"(\\w)\\b" pat #"\\1\\\\w*")]
-         [pat (byte-pregexp (bytes-append #"^" pat))])
-    (filter (lambda (bstr) (regexp-match pat bstr))
-            (get-namespace-bstrings))))
-
-(set-completion-function! namespace-completion)
-
-;; --------------------------------------------------------------------------
-;; History management
-;; (Note: local-history, and the preference are in reverse order, from
-;; the newest to the oldest.)
-
-(define local-history '())
-
-(define (trim-local-history)
-  (when ((length local-history) . > . (max-history))
-    (set! local-history (take local-history (max-history)))))
-
-(define (load-history)
-  (set! local-history (get-preference 'readline-input-history (lambda () null)))
-  (trim-local-history)
-  (for-each add-history (reverse local-history)))
-;; add it now to the actual history
-(load-history)
-
-(define (save-history)
-  (put-preferences '(readline-input-history) (list local-history)))
-
-(define (add-to-history s force-keep?)
-  (define keep (or force-keep? (keep-duplicates)))
-  (when (and (bytes? s) (or (keep-blanks) (not (zero? (bytes-length s)))))
-    ;; remove duplicate (keep-blanks determines how we search)
-    (unless (or (null? local-history) (eq? #t keep))
-      (define dup (let loop ([n -1] [h local-history] [r '()])
-                    (cond [(null? h) #f]
-                          [(equal? (car h) s) `(,n ,@(reverse r) ,@(cdr h))]
-                          [(eq? keep 'unconsecutive) #f] ; no loop
-                          [else (loop (sub1 n) (cdr h) (cons (car h) r))])))
-      (when dup
-        (set! local-history (cdr dup))
-        (history-delete (car dup))))
-    (add-history-bytes s)
-    (let loop ()
-      (when ((history-length) . > . (max-history)) (history-delete 0) (loop)))
-    (set! local-history (cons s local-history))
-    (trim-local-history)))
-
-;; remove `l' items from `local-history', ignoring ones that are not
-;; in the front of the history (in the eq? sense)
-(define (drop-from-history l)
-  (let loop ([l l] [h local-history])
-    (if (and (pair? l) (pair? h))
-      (if (eq? (car l) (car h))
-        (begin (history-delete -1) (loop (cdr l) (cdr h)))
-        (loop (cdr l) h))
-      (set! local-history h))))
-
-;; captured now so we don't flush some other output port
-(define readline-output-port (current-output-port))
-(port-count-lines! readline-output-port)
-
-(define (readline-bytes/hist p force-keep?)
-  (when (eq? readline-output-port (current-output-port))
-    (define-values [line col pos] (port-next-location readline-output-port))
-    (when (and col (positive? col)) (newline readline-output-port)))
-  (let ([s (readline-bytes p)]) (add-to-history s force-keep?) s))
-
-(exit-handler
- (let ([old (exit-handler)])
-   (lambda (v) (save-history) (old v))))
-
-;; --------------------------------------------------------------------------
-;; An input port that goes through readline
-
-;; readline-prompt can be
-;;   #f: no prompt (normal state),
-;;   <bytes>: a prompt to use
-;;   'space: a prompt has been used, now use spaces instead
-;;           (from readline-prompt-spaces)
-;; this also controls saving multi-line histories: when the prompt is #f we
-;; collect history as usual; otherwise, we accumulate the lines in a chunk (and
-;; add them to the history without removing duplicates) and at the beginning of
-;; each new chunk (when we read a line with a prompt that is not 'space) we
-;; throw away the intermediate history lines that were added and add the whole
-;; chunk as one big multiline string.
-(provide readline-prompt)
-(define readline-prompt (make-parameter #f))
-
-(define-struct readline-state (prompt-spaces multiline-chunk)
-  #:mutable)
-
-(define readline-state-cell (make-thread-cell #f))
-(define (get-readline-state)
-  (or (thread-cell-ref readline-state-cell)
-      (let ([state (readline-state #"  " '())])
-        (thread-cell-set! readline-state-cell state)
-        state)))
-
-(define (do-multiline-chunk state)
-  (define chunk (readline-state-multiline-chunk state))
-  (when (pair? chunk)
-    (drop-from-history chunk)
-    (add-to-history (apply bytes-append (reverse chunk)) #f)
-    (set-readline-state-multiline-chunk! state '())))
-
-(define (readline-bytes/multiline-chunk prompt state)
-  (define line (readline-bytes/hist prompt #t))
-  (when (and (bytes? line) (not (zero? (bytes-length line))))
-    (define c (readline-state-multiline-chunk state))
-    (set-readline-state-multiline-chunk!
-     state
-     (if (pair? c)
-       (list* line (readline-state-prompt-spaces state) #"\n" c)
-       (cons line c))))
-  line)
-
-(define (do-one-line state k)
-  (define p (readline-prompt))
-  (case p
-    [(#f) (thread (lambda ()
-                    (do-multiline-chunk state)
-                    (k (readline-bytes/hist #"" #f))))]
-    [(space) (thread
-              (lambda ()
-                (k (readline-bytes/multiline-chunk
-                    (readline-state-prompt-spaces state)
-                    state))))]
-    [else (readline-prompt 'space) ; use spaces next time
-          (thread
-           (lambda ()
-             (do-multiline-chunk state)
-             (unless (= (bytes-length (readline-state-prompt-spaces state))
-                        (bytes-length p))
-               (set-readline-state-prompt-spaces!
-                state
-                (make-bytes (bytes-length p) 32)))
-             (k (readline-bytes/multiline-chunk p state))))]))
-
-(provide readline-input)
-(define readline-input
-  (let ([buffer  #f]
-        [evt     #f]
-        [skip    #f]
-        [blen    #f]
-        [closed? #f]
-        [LF      (bytes-ref #"\n" 0)])
-    (define (close!) (set! closed? #t) (save-history))
-    (define (reader tgt)
-      (let loop ()
-        (cond [closed? eof]
-              [(eof-object? buffer) (set! buffer #f) eof]
-              [evt evt]
-              [(not buffer)
-               (set! evt
-                     (wrap-evt
-                      (do-one-line
-                       (get-readline-state)
-                       (lambda (buf)
-                         (if (eof-object? buf)
-                             (save-history)
-                             (begin (set! skip 0)
-                                    (set! blen (bytes-length buf))))
-                         (set! buffer buf)
-                         (set! evt #f)))
-                      (lambda (v) 0)))
-               evt]
-              [else
-               ;; copy bytes
-               (define tgtlen (bytes-length tgt))
-               (define left   (- blen skip))
-               (cond [(< tgtlen left) ; not enough target space
-                      (let ([end (+ skip tgtlen)])
-                        (bytes-copy! tgt 0 buffer skip end)
-                        (set! skip end)
-                        tgtlen)]
-                     [(= tgtlen left) ; enough room for text but no newline
-                      (bytes-copy! tgt 0 buffer skip blen)
-                      (set! skip blen)
-                      left]
-                     [else ; enough room for text with newline
-                      (bytes-copy! tgt 0 buffer skip blen)
-                      (bytes-set! tgt left LF)
-                      (set! buffer #f)
-                      (add1 left)])])))
-    (make-input-port 'readline-input reader #f close!)))
-
-;; --------------------------------------------------------------------------
-;; Reading functions
-
-;; a function that can be used for current-prompt-read
-(provide read-cmdline-syntax)
-(define (read-cmdline-syntax)
-  (define prompt (current-prompt))
-  (flush-output)
-  ;; needs to set `readline-prompt' to get a prompt when reading
-  (parameterize ([readline-prompt prompt])
-    (define in ((current-get-interaction-input-port)))
-    (unless (eq? 'readline-input (object-name in))
-      ;; not the readline port -- print the prompt (changing the
-      ;; readline-prompt and using read-complete-syntax below should still
-      ;; work fine)
-      (display prompt) (flush-output))
-    (begin0 ((current-read-interaction) (object-name in) in)
-      (do-multiline-chunk (get-readline-state)))))
diff --git a/pkgs/readline-pkgs/readline-lib/readline/readline.rkt b/pkgs/readline-pkgs/readline-lib/readline/readline.rkt
deleted file mode 100644
index 84f48cf078..0000000000
--- a/pkgs/readline-pkgs/readline-lib/readline/readline.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "rktrl.rkt")
-(provide (all-from-out "rktrl.rkt"))
diff --git a/pkgs/readline-pkgs/readline-lib/readline/rep-start.rkt b/pkgs/readline-pkgs/readline-lib/readline/rep-start.rkt
deleted file mode 100644
index b9b318606c..0000000000
--- a/pkgs/readline-pkgs/readline-lib/readline/rep-start.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-;; This module initializes readline unconditionally, "rep.rkt" uses it if we're
-;; using a `terminal-port?' for input.
-
-#lang racket/base
-
-(require "pread.rkt")
-
-;; Change the input port and readline-prompt hook
-(current-input-port readline-input)
-(current-prompt-read read-cmdline-syntax)
diff --git a/pkgs/readline-pkgs/readline-lib/readline/rep.rkt b/pkgs/readline-pkgs/readline-lib/readline/rep.rkt
deleted file mode 100644
index 7e1b23eab0..0000000000
--- a/pkgs/readline-pkgs/readline-lib/readline/rep.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-;; This is a wrapper around "rep-start.rkt" -- use it if we're using a terminal
-#lang racket/base
-
-(require racket/runtime-path racket/file)
-
-(define-runtime-path rep-start "rep-start.rkt")
-
-(provide install-readline!)
-
-(let ([inp (current-input-port)] [outp (current-output-port)])
-  (when (and (eq? 'stdin (object-name inp)) (terminal-port? inp))
-    (dynamic-require rep-start #f)))
-
-(define readline-init-expr
-  '(require readline/rep))
-
-(define (install-readline!)
-  (define file (find-system-path 'init-file))
-  (define (add! msg)
-    (call-with-output-file* file #:exists 'append
-      (lambda (o)
-        (fprintf o "\n;; load readline support ~a\n~s\n"
-                 "(added by `install-readline!')"
-                 readline-init-expr)))
-    (printf msg file))
-  (cond [(not (file-exists? file))
-         (add! "\"~a\" created and readline initialization added.\n")]
-        [(with-handlers ([exn:fail?
-                          (lambda (exn)
-                            (error 'install-readline!
-                                   "trouble reading existing ~e: ~a"
-                                   file
-                                   (exn-message exn)))])
-           (not (member readline-init-expr (file->list file))))
-         (add! "Readline initialization added to \"~a\".\n")]
-        [else (printf "Readline already installed in \"~a\".\n" file)]))
diff --git a/pkgs/readline-pkgs/readline-lib/readline/rktrl.rkt b/pkgs/readline-pkgs/readline-lib/readline/rktrl.rkt
deleted file mode 100644
index b343d3ea09..0000000000
--- a/pkgs/readline-pkgs/readline-lib/readline/rktrl.rkt
+++ /dev/null
@@ -1,142 +0,0 @@
-#lang racket/base
-
-(require ffi/unsafe (only-in '#%foreign ffi-obj))
-(provide readline readline-bytes
-         add-history add-history-bytes
-         history-length history-get history-delete
-         set-completion-function!
-         readline-newline readline-redisplay)
-
-;; libncurses and/or libtermcap needed on some platforms
-(void (ffi-lib "libcurses" #:fail (lambda () #f)))
-(void (ffi-lib "libtermcap" #:fail (lambda () #f)))
-
-(define libreadline (ffi-lib "libreadline" '("5" "6" "4" "")))
-
-(define make-byte-string ; helper for the two types below
-  (get-ffi-obj "scheme_make_byte_string" #f (_fun _pointer -> _scheme)))
-
-(define _bytes/eof/free ; register a finalizer on the resulting bytes
-  (make-ctype _pointer
-    (lambda (x) (and (not (eof-object? x)) x))
-    (lambda (x)
-      (if x
-        (let ([b (make-byte-string x)])
-          (register-finalizer b (lambda (_) (free x)))
-          b)
-        eof))))
-
-(define _string/eof/free ; make a Scheme str from C str & free immediately
-  (make-ctype _pointer
-    (lambda (x) (and (not (eof-object? x)) (string->bytes/utf-8 x)))
-    (lambda (x)
-      (if x
-        (let ([s (bytes->string/utf-8 (make-byte-string x))]) (free x) s)
-        eof))))
-
-(define readline
-  (get-ffi-obj "readline" libreadline (_fun _string -> _string/eof/free)))
-
-(define readline-bytes
-  (get-ffi-obj "readline" libreadline (_fun _bytes -> _bytes/eof/free)))
-
-(define add-history
-  (get-ffi-obj "add_history" libreadline (_fun _string -> _void)))
-
-(define add-history-bytes
-  (get-ffi-obj "add_history" libreadline (_fun _bytes -> _void)))
-
-(define history-length
-  (let ([hl (ffi-obj #"history_length" libreadline)])
-    (lambda () (ptr-ref hl _int))))
-(define history-base
-  (let ([hb (ffi-obj #"history_base" libreadline)])
-    (lambda () (ptr-ref hb _int))))
-
-;; The history library has this great feature: *some* function consume
-;; an index that is relative to history_base, and *some* get a plain
-;; offset.  Someone just had so much fun they had to share.  This
-;; deals with this absurdity, checks the range of the index, and deals
-;; with negative offsets.
-(define (hist-idx who idx base?)
-  (let* ([len (history-length)]
-         [idx (cond [(<= 0 idx (sub1 len)) idx]
-                    [(<= (- len) idx -1)   (+ len idx)]
-                    [else (error who "index out of history range, -~a - ~a"
-                                 len (sub1 len))])])
-    (if base? (+ idx (history-base)) idx)))
-
-;; actually, returns a pointer to a struct with the string, but all we
-;; care about is the string...
-(define history-get
-  (get-ffi-obj "history_get" libreadline
-    (_fun (i) :: (_int = (hist-idx 'history-get i #t)) -> (_ptr o _string))))
-
-(define history-remove ; returns HIST_ENTRY* that history_free() frees
-  (get-ffi-obj "remove_history" libreadline
-    (_fun (i) :: (_int = (hist-idx 'history-delete i #f)) -> _pointer)))
-(define history-free ; ignore histdata_t return value
-  (get-ffi-obj "free_history_entry" libreadline (_fun _pointer -> _void)
-               ;; if not available, use free
-               (lambda () free)))
-
-(define (history-delete idx)
-  (history-free (history-remove idx)))
-
-;; Simple completion: use this with a (string -> (list-of string)) function
-;; that returns the completions for a given string (can be used with other
-;; input string types too, depending on the `type' argument).  Use #f to remove
-;; a completion function that was previously set.
-(define set-completion-function!
-  (case-lambda
-    [(func) (set-completion-function! func _string)]
-    [(func type)
-     (if func
-       (set-ffi-obj! "rl_completion_entry_function" libreadline
-                     (_fun type _int -> _pointer)
-                     (completion-function func))
-       (set-ffi-obj! "rl_completion_entry_function" libreadline _pointer #f))]))
-
-(define (completion-function func)
-  (let ([cur '()])
-    (define (complete str state)
-      (if (zero? state)
-        (begin (set! cur (func str)) (complete #f 1))
-        (and (pair? cur)
-             (let* ([cur (begin0 (car cur) (set! cur (cdr cur)))]
-                    [cur (if (string? cur) (string->bytes/utf-8 cur) cur)])
-               (malloc (add1 (bytes-length cur)) cur 'raw)))))
-    complete))
-
-(set-ffi-obj! "rl_readline_name" libreadline _pointer
-              (let ([s #"mzscheme"])
-                (define m (malloc (add1 (bytes-length s)) 'atomic-interior))
-                (memcpy m s (add1 (bytes-length s)))
-                m))
-
-;; need to capture the real input port below
-(define real-input-port (current-input-port))
-(unless (eq? 'stdin (object-name real-input-port))
-  (log-warning "mzrl warning: could not capture the real input port\n"))
-(unless (terminal-port? real-input-port)
-  (log-warning "mzrl warning: input port is not a terminal\n"))
-
-
-;; We need to tell readline to pull content through our own function,
-;; to avoid buffering issues between C and Racket, and to allow
-;; racket threads to run while waiting for input.
-(set-ffi-obj! "rl_getc_function" libreadline (_fun _pointer -> _int)
-              (lambda (_)
-                (define next-byte (read-byte real-input-port))
-                (if (eof-object? next-byte) -1 next-byte)))
-
-
-;; force cursor on a new line
-(define readline-newline
-  (get-ffi-obj "rl_crlf" libreadline (_fun -> _void)
-               (lambda ()
-                 (get-ffi-obj "rl_newline" libreadline (_fun -> _void)))))
-
-;; force redisplay of prompt and current user input
-(define readline-redisplay
-  (get-ffi-obj "rl_forced_update_display" libreadline (_fun -> _void)))
diff --git a/pkgs/readline-pkgs/readline/LICENSE.txt b/pkgs/readline-pkgs/readline/LICENSE.txt
deleted file mode 100644
index 11a66c041c..0000000000
--- a/pkgs/readline-pkgs/readline/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-readline
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/readline-pkgs/readline/info.rkt b/pkgs/readline-pkgs/readline/info.rkt
deleted file mode 100644
index 18710a0ad9..0000000000
--- a/pkgs/readline-pkgs/readline/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("readline-lib"
-               "readline-doc"))
-(define implies '("readline-lib"
-                  "readline-doc"))
-
-(define pkg-desc "GNU Readline access from Racket")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/realm/LICENSE.txt b/pkgs/realm/LICENSE.txt
deleted file mode 100644
index 6fea10e403..0000000000
--- a/pkgs/realm/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-realm
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/realm/chapter10/graphics/dice1.png b/pkgs/realm/chapter10/graphics/dice1.png
deleted file mode 100644
index 3f4899cca9..0000000000
Binary files a/pkgs/realm/chapter10/graphics/dice1.png and /dev/null differ
diff --git a/pkgs/realm/chapter10/graphics/dice2.png b/pkgs/realm/chapter10/graphics/dice2.png
deleted file mode 100644
index 2fa32ea035..0000000000
Binary files a/pkgs/realm/chapter10/graphics/dice2.png and /dev/null differ
diff --git a/pkgs/realm/chapter10/graphics/dice3.png b/pkgs/realm/chapter10/graphics/dice3.png
deleted file mode 100644
index 005ee75cc9..0000000000
Binary files a/pkgs/realm/chapter10/graphics/dice3.png and /dev/null differ
diff --git a/pkgs/realm/chapter10/graphics/dice4.png b/pkgs/realm/chapter10/graphics/dice4.png
deleted file mode 100644
index 47bb2913ec..0000000000
Binary files a/pkgs/realm/chapter10/graphics/dice4.png and /dev/null differ
diff --git a/pkgs/realm/chapter10/readme.txt b/pkgs/realm/chapter10/readme.txt
deleted file mode 100644
index 6d4ca80ebf..0000000000
--- a/pkgs/realm/chapter10/readme.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-This chapter implements a GUI version of the "dice of doom" game from
-Barski's "Land of Lisp". To play or to experiment, open the file 
-
-	 source.rkt 
-
-in DrRacket. The instructions for playing are at the top of the file. 
-Our tests are at the bottom of the file in a separate 'test' submodule. 
-
diff --git a/pkgs/realm/chapter10/source.rkt b/pkgs/realm/chapter10/source.rkt
deleted file mode 100644
index b64a57768f..0000000000
--- a/pkgs/realm/chapter10/source.rkt
+++ /dev/null
@@ -1,1085 +0,0 @@
-#lang racket
-
-#| 
-   The Dice of Doom game, the eager version  
-   ----------------------------------------
-
-   The Dice of Doom game is a turn-based game for two players sharing one keyboard. 
-   Since this implementation employs an eager strategy to build the complete game 
-   tree of all possible moves, it is only a step in the right direction. 
-
-   Each player owns hexagonal territories, which are arranged into a planar game
-   board. A territory comes with a number of dice. When it is a player's turn, 
-   she marks one of her territories as a launching pad for an attack at a 
-   neigboring territory of the other player. Such an attack is enabled only if 
-   her chosen territory has more dice than the territory of the other player. 
-   The effect of the attack is that the territory changes ownership and that all
-   but one of the attack dice are moved to the newly conquered territory. A 
-   player may continue her turn as long as she can launch attacks. Optionally, 
-   she may choose to pass after her first attack is executed, meaning she ends 
-   her turn. At the end of a turn, a number of dices are distributed across the 
-   players' territories. The game is over when a player whose turn it is cannot
-   attack on her first move. 
-
-   A player can use the following five keys to play the game:
-    -- with ← and → (arrow keys), the player changes the territory focus 
-    -- with enter, the player marks a territory the launching pad for an attack
-    -- with the "d" key, the player unmarks a territory 
-    -- with the "p" key the player passes. 
-   Once a player passes, the game announces whose turn it is next. 
-
-   Play
-   ----
- 
-   Run and evaluate 
-     (roll-the-dice)
-   This will pop up a window that the game board, and instructions. 
-|#
-
-(require 2htdp/image (except-in 2htdp/universe left right)) 
-
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;   ;;;;       ;                            ;;; ;;;                   ;;        ;; 
-;    ;  ;                                    ;   ;                     ;         ; 
-;    ;   ;   ;;;     ;;; ;   ;;;;            ;   ;   ;;;;   ;; ;;;     ;     ;;; ; 
-;    ;   ;     ;    ;   ;;  ;    ;           ; ; ;  ;    ;   ;;        ;    ;   ;; 
-;    ;   ;     ;    ;       ;;;;;;           ; ; ;  ;    ;   ;         ;    ;    ; 
-;    ;   ;     ;    ;       ;                ; ; ;  ;    ;   ;         ;    ;    ; 
-;    ;  ;      ;    ;    ;  ;                ; ; ;  ;    ;   ;         ;    ;   ;; 
-;   ;;;;     ;;;;;   ;;;;    ;;;;;            ; ;    ;;;;   ;;;;;    ;;;;;   ;;; ;;
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;                                                                                  
-
-;; ---------------------------------------------------------------------------------------------------
-;; Data
-
-(struct dice-world (src board gt) #:transparent)
-;; DiceWorld = (dice-world (U #false Natural) Board GameTree)
-;; in (dice-world i b gt)
-;; -- if i is a Natural, it is an index for the territory that the player has marked for an attack
-;; -- if i is #f, no territory has been marked yet 
-;; b is the current board
-;; gt is the game-tree for the given i and b 
-
-(struct game (board player moves) #:transparent)
-;; GameTree = (game Board Player [Listof Move]) 
-;; in (game-tree b p lm)
-;; -- b is the current board 
-;; -- p is the current player 
-;; -- lm is the list of moves that that player may execute 
-
-;; Board = [List-of Territory]
-;; the first field in the list is the currently marked  territory
-
-;; Player ∈ [0, PLAYER#) | Natural 
-
-(struct move (action gt) #:transparent)
-;; Move = (move Action GameTree)
-;; in (move a gt)
-;; -- a represents the actione to be takem 
-;; -- gt is the game-tree resulting from that action 
-
-;; Action is one of:
-;; -- '()                      a passing move
-;; -- (list Natural Natural)   the move where the first attacks the second
-
-(struct territory (index player dice x y) #:transparent)
-;; Territory = (territory Natural Player Dice Integer Integer)
-;; in (territory i p d x y)
-;; -- i is a unique identifier for the territory; it also determines its initial location
-;; -- p is the player who owns this territory
-;; -- d is the number of dice on this board
-;; -- x is the x coordiate of this territory in pixels
-;; -- y is the y coordiate of this territory in pixels
-
-;; Territory Natural -> Territory 
-;; updates number of dice on territory 
-(define (territory-set-dice t d)
-  (territory (territory-index t) (territory-player t) d (territory-x t) (territory-y t)))
-
-;; Territory Player -> Territory 
-;; updates owner of territory 
-(define (territory-set-player t p)
-  (territory (territory-index t) p (territory-dice t) (territory-x t) (territory-y t)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; sample game tree for BOOK 
-
-(define b1
-  (list (territory 1 0 1 'a 'b)
-        (territory 0 0 1 'x 'y)))
-
-(define b1-alternative 
-  (list (territory 0 0 1 'x 'y)
-        (territory 1 0 1 'a 'b)))
-
-(define b3
-  (list (territory 0 0 2 'x 'y)
-        (territory 1 1 1 'a 'b)))
-
-(define gt1 (game b1 1 '()))
-
-(define mv2 (move '() gt1))
-
-(define gt2 (game b1-alternative 0 (list mv2)))
-
-(define mv3 (move '(0 1) gt2))
-
-(define gt3 (game b3 0 (list mv3)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Constants
-
-; initalization constants
-(define PLAYER# 2)
-(define DICE# 3)
-(define BOARD 2)
-(define GRID (* BOARD BOARD))
-(define INIT-PLAYER 0)
-(define INIT-SPARE-DICE 10)
-; The depth at which to limit the gametree
-(define AI-DEPTH 4)
-(define AI 1)
-
-; graphical constants: territories
-(define DICE-OFFSET 6)
-(define SIDE 75)
-(define OFFSET0 (* 2 SIDE))
-(define ROTATION 30)
-(define HEX 6)
-(define (hexagon color)
-  (rotate ROTATION (regular-polygon SIDE HEX "solid" color)))
-(define X-OFFSET (image-width (hexagon "black")))
-(define Y-OFFSET (* (image-height (hexagon "black")) 3/4))
-
-; graphical constants
-(define COLORS 
-  (list (make-color 255 0 0 100) 
-        (make-color 0 255 0 100) 
-        (make-color 0 0 255 100)))
-(define FOCUS (rotate ROTATION (regular-polygon SIDE 6 "outline" "black")))
-(define D1 (bitmap "graphics/dice1.png"))
-(define D2 (bitmap "graphics/dice2.png"))
-(define D3 (bitmap "graphics/dice3.png"))
-(define D4 (bitmap "graphics/dice4.png"))
-(define IMG-LIST (list D1 D2 D3 D4)) 
-
-(define TEXT-SIZE 25)
-(define TEXT-COLOR "black")
-(define INSTRUCT 
-  "← and → to move among territories, <enter> to mark, <d> to unmark, and <p> to pass")
-(define AI-TURN "It's the Mighty AI's turn")
-(define YOUR-TURN "It's your turn")
-(define INFO-X-OFFSET 100)
-(define INFO-Y-OFFSET 50)
-
-(define INSTRUCTIONS (text INSTRUCT TEXT-SIZE TEXT-COLOR))
-(define WIDTH (+ (image-width INSTRUCTIONS) 50))
-(define HEIGHT 600)
-(define (PLAIN)
-  (define iw (image-width INSTRUCTIONS))
-  (define bw (* SIDE 2 BOARD))
-  (set! WIDTH  (+ (max iw bw) 50))
-  (set! HEIGHT (+ (* SIDE 2 BOARD) 50))
-  (empty-scene WIDTH HEIGHT))
-(define (ISCENE)
-  (define mt (PLAIN))
-  (when (or (> (image-width mt) 1280) (> (image-height mt) 800))
-    (error 'scene "it is impossible to draw a ~s x ~s game scene for a 1280 x 800 laptop screen" (image-width mt) (image-height mt)))
-  (place-image INSTRUCTIONS (* .5 WIDTH) (* .9 HEIGHT) mt))
-
-;                                  
-;                                  
-;                                  
-;                                  
-;   ;;; ;;;            ;           
-;    ;; ;;                         
-;    ;; ;;   ;;;;    ;;;    ;; ;;  
-;    ; ; ;  ;    ;     ;     ;;  ; 
-;    ; ; ;   ;;;;;     ;     ;   ; 
-;    ;   ;  ;    ;     ;     ;   ; 
-;    ;   ;  ;   ;;     ;     ;   ; 
-;   ;;; ;;;  ;;; ;;  ;;;;;  ;;; ;;;
-;                                  
-;                                  
-;                                  
-;                                  
-
-;; ---------------------------------------------------------------------------------------------------
-
-;; start the game 
-(define (roll-the-dice)
-  (big-bang (create-world-of-dice-and-doom)             
-            (on-key interact-with-board)
-            (to-draw draw-dice-world)
-            (stop-when no-more-moves-in-world? 
-                       draw-end-of-dice-world)))
-
-;;  -> DiceWorld
-;; Returns a randomly generated world. If the world that
-;; has been generated starts as a tie, the world is regenerated.
-;; property: world is not in endgame state (no-more-moves? returns false)
-(define (create-world-of-dice-and-doom)
-  (define board (territory-build))
-  (define gamet (game-tree board INIT-PLAYER INIT-SPARE-DICE))
-  (define new-world (dice-world #f board gamet))
-  (if (no-more-moves-in-world? new-world) 
-      (create-world-of-dice-and-doom)
-      new-world))
-
-;; DiceWorld Key -> DiceWorld
-;; Handles key events from a player
-(define (interact-with-board w k)
-  (cond [(key=? "left" k)
-         (refocus-board w left)]
-        [(key=? "right" k)
-         (refocus-board w right)]
-        [(key=? "p" k)
-         (pass w)]
-        [(key=? "\r" k)
-         (mark w)]
-        [(key=? "d" k)
-         (unmark w)]
-        [else w]))
-
-;; Diceworld -> Scene
-;; draws the world
-(define (draw-dice-world w)
-  (add-player-info 
-   (game-player (dice-world-gt w)) 
-   (add-board-to-scene w (ISCENE))))
-
-;; DiceWorld -> Boolean
-;; is it possible to play any moves from this world state? 
-(define (no-more-moves-in-world? w)
-  (define tree (dice-world-gt w))
-  (define board (dice-world-board w))
-  (define player (game-player tree))
-  (or (no-more-moves? tree)
-      (for/and ((t board)) (= (territory-player t) player))))
-
-;; DiceWorld -> Image
-;; render the endgame screen
-(define (draw-end-of-dice-world w)
-  (define board (dice-world-board w))
-  (define message (text (won board) TEXT-SIZE TEXT-COLOR))
-  (define background (add-board-to-scene w (PLAIN)))
-  (overlay message background))
-
-;; Board -> String
-;; Which player has won the game -- eager is for N human players 
-(define (won board)
-  (define-values (best-score w) (winners board))
-  (if (cons? (rest w)) "It's a tie." "You won."))
-
-;                                  
-;                                  
-;                                  
-;                                  
-;    ;;;;;             ;           
-;      ;                     ;     
-;      ;    ;; ;;    ;;;    ;;;;;  
-;      ;     ;;  ;     ;     ;     
-;      ;     ;   ;     ;     ;     
-;      ;     ;   ;     ;     ;     
-;      ;     ;   ;     ;     ;   ; 
-;    ;;;;;  ;;; ;;;  ;;;;;    ;;;  
-;                                  
-;                                  
-;                                  
-;                                  
-
-;; ---------------------------------------------------------------------------------------------------
-;; Making A Board
-
-;; -> Board
-;; Creates a list of territories the size of GRID with given x and y coordinates
-;; properties: dice is (0,MAX-DICE]
-;;             returns list of size GRID
-(define (territory-build)
-  (for/list ([n (in-range GRID)])
-    (territory n (modulo n PLAYER#) (dice) (get-x n) (get-y n))))
-
-;; -> Natural
-;; the number of initial die on a territory
-(define (dice)
-  (add1 (random DICE#)))
-
-;; Natural -> Number
-;; the x coordinate for territory n of a board 
-(define (get-x n)
-  (+ OFFSET0
-     (if (odd? (get-row n)) 0 (/ X-OFFSET 2))
-     (* X-OFFSET (modulo n BOARD))))
-
-;; Natural -> Number 
-;; the y coordinate for territory n of a board 
-(define (get-y n)
-  (+ OFFSET0 (* Y-OFFSET (get-row n))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Making a Game Tree
-
-;; Board Player Natural -> GameTree
-;; creates a complete game-tree from the given board, player, and spare dice
-(define (game-tree board player dice)
-  ;; create tree of attacks from this position; add passing move
-  (define (attacks board) 
-    (for*/list ([src board] 
-                [dst (neighbors (territory-index src))]
-                #:when (attackable? board player src dst))
-      (define from (territory-index src))
-      (define dice (territory-dice src))
-      (define newb (execute board player from dst dice))
-      (define attacks-from-newb 
-        (game newb player (cons (passes newb) (attacks newb))))
-      (move (list from dst) attacks-from-newb)))
-  ;; create a passing move , distribute dice, continue
-  (define (passes board)
-    (define-values (new-dice newb) (distribute board player dice))
-    (move '() (game-tree newb (switch player) new-dice)))
-  ;; -- START: -- 
-  (game board player (attacks board)))
-
-;; Player -> Player
-;; switches from one player to the next
-(define (switch player)
-  (modulo (+ player 1) PLAYER#))
-
-;; Board Player Natural -> Natural Board
-;; adds reinforcements to the game board
-;; > (add-new-dice (list (territory 0 2 2 9 0)) 2 2))
-;; (list (territory 0 2 2 9 0))
-(define (distribute board player spare-dice)
-  (for/fold ([dice spare-dice] [new-board '()]) ([t board])
-    (if (and (= (territory-player t) player)
-             (< (territory-dice t) DICE#)
-             (not (zero? dice)))
-        (values (- dice 1) (cons (add-dice-to t) new-board))
-        (values dice (cons t new-board)))))
-
-;; Territory -> Territory 
-;; adds one dice to the given territory
-(define (add-dice-to t)
-  (territory-set-dice t (add1 (territory-dice t))))
-
-;; Board Player Territory Natural -> Boolean
-;; can player attack dst from src?
-(define (attackable? board player src dst)
-  (define dst-t 
-    (findf (lambda (t) (= (territory-index t) dst)) board))
-  (and dst-t
-       (= (territory-player src) player)
-       (not (= (territory-player dst-t) player))
-       (> (territory-dice src) (territory-dice dst-t))))
-
-;; Board Natural Natural Natural Natural -> Board
-;; Creates a new board after an attack
-;; updates only src and dst
-(define (execute board player src dst dice)
-  (for/list ([t board])
-    (define idx (territory-index t))
-    (cond [(= idx src) (territory-set-dice t 1)]
-          [(= idx dst) 
-           (define s (territory-set-dice t (- dice 1)))
-           (territory-set-player s player)]
-          [else t])))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Getting Neigbors
-
-;; Natural -> [List-of Natural]
-;; returns the neighbors of the current spot
-;; > (neighbors 0)
-;; '(1 2 3)
-(define (neighbors pos)  
-  (define top?      (< pos BOARD))
-  (define bottom?   (= (get-row pos) (sub1 BOARD)))
-  (define even-row? (zero? (modulo (get-row pos) 2)))
-  (define right?    (zero? (modulo (add1 pos) BOARD)))
-  (define left?     (zero? (modulo pos BOARD)))
-  (if even-row?
-      (even-row pos top? bottom? right? left?)
-      (odd-row  pos top? bottom? right? left?)))
-
-;; Natural Boolean Boolean Boolean Boolean -> [Listof Naturals]
-;; gets the neighbors for a territory on an even row
-(define (even-row pos top? bottom? right? left?)
-  (append (add (or top? right?)    (add1 (- pos BOARD)))
-          (add (or bottom? right?) (add1 (+ pos BOARD)))
-          (add top?                (- pos BOARD))
-          (add bottom?             (+ pos BOARD))
-          (add right?              (add1 pos))
-          (add left?               (sub1 pos))))
-
-;; Natural Boolean Boolean Boolean Boolean -> [Listof Naturals]
-;; gets the neighbors for a territory on an even odd
-(define (odd-row pos top? bottom? right? left?)
-  (append (add top?               (- pos BOARD))
-          (add bottom?            (+ pos BOARD))
-          (add (or top? left?)    (sub1 (- pos BOARD)))
-          (add (or bottom? left?) (sub1 (+ pos BOARD)))
-          (add right?             (add1 pos))
-          (add left?              (sub1 pos))))
-
-;; Boolean X -> [Listof X]
-;; returns (list x) if (not b) else empty
-(define (add b x)
-  (if b '() (list x)))
-
-;                                                                          
-;                                                                          
-;                                                                          
-;                                                                          
-;   ;;; ;;;                 ;;;;;;                                         
-;    ;   ;                   ;   ;                           ;             
-;    ;  ;    ;;;;   ;;; ;;;  ; ;   ;;;  ;;;  ;;;;   ;; ;;   ;;;;;    ;;;;; 
-;    ; ;    ;    ;   ;   ;   ;;;    ;    ;  ;    ;   ;;  ;   ;      ;    ; 
-;    ;;;    ;;;;;;   ;   ;   ; ;     ;  ;   ;;;;;;   ;   ;   ;       ;;;;  
-;    ;  ;   ;         ; ;    ;       ;  ;   ;        ;   ;   ;           ; 
-;    ;   ;  ;         ; ;    ;   ;    ;;    ;        ;   ;   ;   ;  ;    ; 
-;   ;;;  ;;  ;;;;;     ;    ;;;;;;    ;;     ;;;;;  ;;; ;;;   ;;;   ;;;;;  
-;                      ;                                                   
-;                    ;;;                                                   
-;                                                                          
-;                                                                          
-
-;; ---------------------------------------------------------------------------------------------------
-;; Territory Focusing and Marking 
-
-;; DiceWorld [Board -> Board] -> World
-;; Creates a new World that has a rotated territory list
-;; > (define lterritory (territory 0 0 1 9 2))
-;; > (define rterritory (territory 0 0 1 9 0))
-;; > (refocus-board-action (dice-world -1 (list rterritory lterritory ...) GT) left)
-;; (dice-world -1 (list lterritory ... rterritory) GT)
-;; > (refocus-board-action (dice-world -1 (list lterritory ... rterritory) GT) left)
-;; (dice-world -1 (list rterritory lterritory ...) GT)
-(define (refocus-board w direction)
-  (define source (dice-world-src w))
-  (define board  (dice-world-board w))
-  (define tree   (dice-world-gt w))
-  (define player (game-player tree))
-  (define (owner? tid)
-    (if source (not (= tid player)) (= tid player)))
-  (define new-board (rotate-until owner? board direction))
-  (dice-world source new-board tree))
-
-;; [Player -> Boolean] Board (Board -> Board) -> Board 
-;; rotate until the first element of the list satisfies owned-by 
-(define (rotate-until owned-by board rotate)
-  (define next-list (rotate board))
-  (if (owned-by (territory-player (first next-list))) 
-      next-list
-      (rotate-until owned-by next-list rotate)))
-
-;; Board -> Board
-;; rotate a list to the left 
-(define (left l)
-  (append (rest l) (list (first l))))
-
-;; Board -> Board
-;; rotate a list to the right
-(define (right l)
-  (reverse (left (reverse l))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Handling Moves
-
-;; DiceWorld -> DiceWorld
-;; executes a passing move on the world state
-;; THIS DEFINITION IS NOT USED FOR THE ABSTRACT VERSION OF THE MODULE. 
-(define (pass.10 w)
-  (define m (find-move (game-moves (dice-world-gt w)) '()))
-  (cond [(not m) w]
-        [else ;; (no-more-moves? m)
-         (dice-world #f (game-board m) m)]))
-
-;; DiceWorld -> DiceWorld
-;; unmarks a marked territory
-(define (unmark w)
-  (dice-world #f (dice-world-board w) (dice-world-gt w)))
-
-;; DiceWorld -> DiceWorld
-;; marks a territory as the launching pad for an attack or launches the attack 
-(define (mark w)
-  (define tree   (dice-world-gt w))
-  (define board  (dice-world-board w))
-  (define source (dice-world-src w))
-  (define focus  (territory-index (first board)))
-  (if source 
-      (attacking w source focus)
-      (dice-world focus board tree)))
-
-;; DiceWorld Natural Natural -> DiceWorld
-(define (attacking w source target)
-  (define feasible (game-moves (dice-world-gt w)))
-  (define attack   (list source target))
-  (define next     (find-move feasible attack))
-  (if next (dice-world #f (game-board next) next) w))
-
-;; [List-of Moves] [or '() [List Natural Natural]] -> [or #f Game-tree] 
-;; find the move from the current list of moves
-(define (find-move moves a)
-  (define m (findf (lambda (m) (equal? (move-action m) a)) moves))
-  (and m (move-gt m)))
-
-;; Game -> Boolean 
-;; are there any moves in this game record? 
-(define (no-more-moves? g)
-  (empty? (game-moves g)))
-
-;                                                                          
-;                                                                          
-;                                                                          
-;                                                                          
-;   ;;;;;                       ;;                     ;                   
-;    ;   ;                       ;                                         
-;    ;   ;   ;;;;   ;; ;;    ;;; ;   ;;;;   ;; ;;;   ;;;    ;; ;;    ;;; ;;
-;    ;   ;  ;    ;   ;;  ;  ;   ;;  ;    ;   ;;        ;     ;;  ;  ;   ;; 
-;    ;;;;   ;;;;;;   ;   ;  ;    ;  ;;;;;;   ;         ;     ;   ;  ;    ; 
-;    ;  ;   ;        ;   ;  ;    ;  ;        ;         ;     ;   ;  ;    ; 
-;    ;   ;  ;        ;   ;  ;   ;;  ;        ;         ;     ;   ;  ;   ;; 
-;   ;;;   ;  ;;;;;  ;;; ;;;  ;;; ;;  ;;;;;  ;;;;;    ;;;;;  ;;; ;;;  ;;; ; 
-;                                                                        ; 
-;                                                                    ;;;;  
-;                                                                          
-;                                            
-
-;; Player Scene-> Scene
-;; Draws the world
-(define (add-player-info player s)
-  (define str (whose-turn player))
-  (define txt (text str TEXT-SIZE TEXT-COLOR))
-  (place-image txt (- WIDTH INFO-X-OFFSET) INFO-Y-OFFSET s))
-
-;; DiceWorld Scene -> Scene
-;; folds through the board and creates an image representation of it
-(define (add-board-to-scene w s)
-  (define board   (dice-world-board w))
-  (define player  (game-player (dice-world-gt w)))
-  (define focus?  (dice-world-src w))
-  (define trtry1  (first board))
-  (define p-focus (territory-player trtry1))
-  (define t-image (draw-territory trtry1))
-  (define image (draw-focus focus? p-focus player t-image))
-  (define base-s  (add-territory trtry1 image s))
-  (for/fold ([s base-s]) ([t (rest board)])
-    (add-territory t (draw-territory t) s)))
-
-;; Nat Player Player Image -> Image 
-;; add focus marker to territory if needed 
-(define (draw-focus marked? p-in-focus p t-image)
-  (if (or (and (not marked?) (= p-in-focus p))
-          (and marked? (not (= p-in-focus p))))
-      (overlay FOCUS t-image)
-      t-image))
-
-;; Image Territory Image -> Image 
-(define (add-territory t image scene)
-  (place-image image (territory-x t) (territory-y t) scene))
-
-;; Territory -> Image
-;; renders a single territory
-(define (draw-territory t)
-  (define color (color-chooser (territory-player t)))
-  (overlay (hexagon color) (draw-dice (territory-dice t))))
-
-;; Natural -> Image
-;; renders all n >= 1 dice as a stack of dice 
-(define (draw-dice n)
-  (define first-die  (get-dice-image 0))
-  (define height-die (image-height first-die))
-  (for/fold ([s first-die]) ([i (- n 1)])
-    (define dice-image (get-dice-image (+ i 1)))
-    (define y-offset  (* height-die (+ .5 (* i .25))))
-    (overlay/offset s 0 y-offset dice-image)))
-
-;; Player -> Color
-;; Determines a color for each player
-(define (color-chooser p)
-  (list-ref COLORS p))
-
-;; -> Image
-;; returns an image from the list of dice images 
-(define (get-dice-image i)
-  (list-ref IMG-LIST (modulo i (length IMG-LIST))))
-
-;                                                  
-;                                                  
-;                                                  
-;                                                  
-;   ;;;;;;              ;;     ;                   
-;    ;   ;               ;                         
-;    ; ;    ;; ;;    ;;; ;   ;;;    ;; ;;    ;;; ;;
-;    ;;;     ;;  ;  ;   ;;     ;     ;;  ;  ;   ;; 
-;    ; ;     ;   ;  ;    ;     ;     ;   ;  ;    ; 
-;    ;       ;   ;  ;    ;     ;     ;   ;  ;    ; 
-;    ;   ;   ;   ;  ;   ;;     ;     ;   ;  ;   ;; 
-;   ;;;;;;  ;;; ;;;  ;;; ;;  ;;;;;  ;;; ;;;  ;;; ; 
-;                                                ; 
-;                                            ;;;;  
-;                                                  
-;                                                  
-
-;; Board ->* Natural [non-empty-listof Player]
-;; gives the number of winning territories and the players(s) who have them
-;; > (winners (list (territory 0 0 1 9 0) (territory 0 0 1 9 1)))
-;; (values 2 '(0))
-;; > (winners (list (territory 0 1 1 9 0) (territory 0 0 1 9 1)))
-;; (values 1 '(0 1))
-(define (winners board)
-  (for/fold ([best 0][winners '()]) ([p PLAYER#])
-    (define p-score (sum-territory board p))
-    (cond [(> p-score best) (values p-score (list p))]
-          [(< p-score best) (values best winners)]
-          [(= p-score best) (values best (cons p winners))])))
-
-;; Board Player -> Natural
-;; counts the number of territorys the player owns
-;; > (sum-territory (list (territory 0 1 1 9 0) (territory 0 1 1 9 1)) 1)
-;; 2
-(define (sum-territory board player)
-  (for/fold ([result 0]) ([t board])
-    (if (= (territory-player t) player) (+ result 1) result)))
-
-
-;                      
-;                      
-;                      
-;                      
-;                      
-;     ;;;     ;;;;;;;  
-;      ;;        ;     
-;     ;  ;       ;     
-;     ;  ;       ;     
-;     ;  ;       ;     
-;    ;;;;;;      ;     
-;    ;    ;      ;     
-;   ;      ;     ;     
-;  ;;;    ;;; ;;;;;;;  
-;                      
-;                      
-;                      
-;                      
-
-;; Player -> {AI-TURN, YOUR-TURN}
-;; THIS REQUIRES A DIFFERENT DEFINITION FOR PLAIN CHAPTER 10. 
-(define (whose-turn player)
-  (if (= player AI) AI-TURN YOUR-TURN))
-
-;; DiceWorld -> DiceWorld
-;; executes a passing move on the world state
-;; THIS REQUIRES A DIFFERENT DEFINITION FOR PLAIN CHAPTER 10.
-(define (pass w)
-  (define m (find-move (game-moves (dice-world-gt w)) '()))
-  (cond [(not m) w]
-        [(or (no-more-moves? m) (not (= (game-player m) AI)))
-         (dice-world #f (game-board m) m)]
-        [else
-         (define ai (the-ai-plays m))
-         (dice-world #f (game-board ai) ai)]))
-
-;; GameTree -> GameTree
-;; Computer calls this function until it is no longer the player
-(define (the-ai-plays tree)
-  (define ratings  (rate-moves tree AI-DEPTH))
-  (define the-move (first (argmax second ratings)))
-  (define new-tree (move-gt the-move))
-  (if (= (game-player new-tree) AI)
-      (the-ai-plays new-tree)
-      new-tree))
-
-;; GameTree Natural -> [List-of (List Move Number)]
-;; assigns a value to each move that is being considered
-;; and return those values in a list
-(define (rate-moves tree depth)
-  (for/list ((move (game-moves tree)))
-    (list move (rate-position (move-gt move) (- depth 1)))))
-
-;; GameTree Natural -> Number
-;; Returns a number that is the best move for the given player.
-(define (rate-position tree depth)
-  (cond [(or (= depth 0) (no-more-moves? tree))
-         (define-values (best w) (winners (game-board tree)))
-         (if (member AI w) (/ 1 (length w)) 0)]
-        [else 
-         (define ratings (rate-moves tree depth))
-         (apply (if (= (game-player tree) AI) max min)
-                (map second ratings))]))
-
-;                                  
-;                                  
-;                                  
-;                                  
-;     ;;                           
-;      ;                           
-;     ; ;   ;;  ;;  ;;  ;;   ;;;;; 
-;     ; ;    ;   ;   ;  ;   ;    ; 
-;     ; ;    ;   ;    ;;     ;;;;  
-;     ;;;    ;   ;    ;;         ; 
-;    ;   ;   ;  ;;   ;  ;   ;    ; 
-;   ;;; ;;;   ;; ;; ;;  ;;  ;;;;;  
-;                                  
-;                                  
-;                                  
-;                                  
-
-;; Natural -> Natural
-;; gets the row that territory is on, indexed from 0
-;; [test vary on current board-size]
-(define (get-row pos)
-  (quotient pos BOARD))
-
-
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;   ;;;;;;;                        ;                 
-;   ;  ;  ;                        ;                 
-;   ;  ;  ;     ;;;      ;;;; ;   ;;;;;;     ;;;; ;  
-;   ;  ;  ;    ;   ;    ;    ;;    ;        ;    ;;  
-;      ;      ;     ;   ;          ;        ;        
-;      ;      ;;;;;;;    ;;;;;     ;         ;;;;;   
-;      ;      ;               ;    ;              ;  
-;      ;       ;    ;   ;     ;    ;    ;   ;     ;  
-;    ;;;;;      ;;;;    ;;;;;;      ;;;;    ;;;;;;   
-;                                                    
-;                                                    
-;                                                    
-;                                 
-
-;; ---------------------------------------------------------------------------------------------------
-
-;; Natural -> Void 
-;; make the board larger 
-(define (set-grid n)
-  (set! BOARD n)
-  (set! GRID (* n n)))
-
-(module+ test 
-  
-  (require rackunit rackunit/text-ui)
-  
-  ;; (-> any) -> void
-  ;; runs the thunk PROP-NUM times
-  (define (check-property t)
-    (test-begin (for ((i 50)) (t))))
-  
-  ;; Properties
-  (define (property:starting-world-playable)
-    (unless (and (= BOARD 2) (= PLAYER# 2))
-      (error 'starting-world-playable "BOARD-SIZE != 2 or PLAYERS# != 2"))
-    (check-false (no-more-moves-in-world? (create-world-of-dice-and-doom))))
-  
-  (define (property:dice-in-range)
-    (check-true (andmap (λ (b) (>= DICE# (territory-dice b) 1)) (territory-build))
-                "dice out of range"))
-  
-  (define (property:board-correct-size)
-    (check-equal? (length (territory-build)) GRID
-                  "board incorrect-size"))
-  
-  (define (property:no-pass-on-first-move)
-    (define (move-action? m) (equal? (move-action m) '()))
-    (check-true (not (memf move-action? (game-moves (game-tree (territory-build) 0 0))))
-                "no pass on first move"))
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  
-  
-  ;; testing game initialization
-  
-  (check-equal? (territory-index (first (territory-build))) 0)
-  (check-equal? (territory-player (first (territory-build))) 0)
-  (check-equal? (territory-index (second (territory-build))) 1)
-  (check-equal? (territory-player (second (territory-build))) 1)
-  (check-equal? (territory-index (third (territory-build))) 2)
-  (check-equal? (territory-player (third (territory-build))) 0)
-  (check-equal? (territory-index (fourth (territory-build))) 3)
-  (check-equal? (territory-player (fourth (territory-build))) 1)
-  
-  (check-property property:starting-world-playable)
-  (check-property property:board-correct-size)
-  (check-property property:dice-in-range)
-  (check-property property:no-pass-on-first-move)
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  ;; testing territory manipulation
-  
-  ;; legal?
-  (check-true 
-   (and (attackable? (list (territory 0 0 2 9 0) (territory 3 1 1 9 0)) 0 (territory 0 0 2 9 0) 3) #t))
-  (check-false
-   (attackable? (list (territory 0 0 2 9 0) (territory 3 1 1 9 0)) 0 (territory 0 0 2 9 0) 0))
-  (check-false
-   (attackable? (list (territory 0 0 2 9 0) (territory 5 1 1 9 0)) 1 (territory 0 0 2 9 0) 5))
-  
-  ;; get-row
-  (check-equal? (get-row 0) 0)
-  (check-equal? (get-row 1) 0)
-  (check-equal? (get-row 2) 1)
-  (check-equal? (get-row 3) 1)
-  (check-equal? (get-row 12) 6) ;; checks math. actually invalid on board of size 2
-  (check-equal? (get-row 11) 5) ;; checks math. actually invalid on board of size 2
-  (check-equal? (get-row 13) 6) ;; checks math. actually invalid on board of size 2
-  (check-equal? (get-row 14) 7) ;; checks math. actually invalid on board of size 2
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  (define board3 
-    (list (territory 0 1 1 9 0) (territory 1 1 1 8 0) (territory 2 1 3 43.5 5) (territory 3 1 1 6 5)))
-  (define b1+0+3
-    (list (territory 0 0 2 9 0) (territory 1 1 1 8 0) (territory 2 0 2 43.5 5) (territory 3 1 1 6 5)))
-  (define b2+1+2
-    (list (territory 0 0 1 9 0) (territory 1 1 3 8 0) (territory 2 0 2 43.5 5) (territory 3 1 2 6 5)))
-  (define board6
-    (list (territory 0 0 1 9 0) (territory 1 1 2 8 0) (territory 2 0 3 43.5 5) (territory 3 1 2 6 5)))
-  (define bard6+
-    (list (territory 0 0 1 9 0) (territory 1 1 2 8 0) (territory 2 0 3 43.5 5) (territory 3 1 2 6 5)))
-  
-  (define (distribute/list a b c)
-    (define-values (x y) (distribute a b c))
-    (list x y))
-  
-  (define board0 
-    (list (territory 0 0 1 9 0) (territory 1 1 2 8 0) (territory 2 0 2 43.5 5) (territory 3 1 1 6 5)))
-  (define board1 
-    (list (territory 0 0 1 9 0) (territory 1 1 1 8 0) (territory 2 0 1 43.5 5) (territory 3 1 1 6 5)))
-  (define b1+1+2 
-    (list (territory 0 0 1 9 0) (territory 1 1 2 8 0) (territory 2 0 1 43.5 5) (territory 3 1 2 6 5)))
-  (define board2 
-    (list (territory 0 0 1 9 0) (territory 1 1 1 8 0) (territory 2 0 3 43.5 5) (territory 3 1 1 6 5)))
-  
-  (define g-tree1 (game board1 0 '()))
-  (define g-tree2 (game-tree board0 0 0))
-  
-  ; (define world31 (dice-world #f board1 g-tree1))
-  (define world2 (dice-world #f board2 g-tree2))
-  
-  ;; testing book tree
-  
-  (check-equal? (game-tree (list (territory 0 0 2 'x 'y)
-                                 (territory 1 1 1 'a 'b))
-                           0
-                           0)
-                gt3)
-  
-  
-  ;; testing tree generation
-  
-  (define (property:attack-location-valid)
-    (define moves (game-moves (game-tree (territory-build) 0 0)))
-    (check-true (and (for/and ([m moves])
-                       (define m1 (move-action m))
-                       (member (second m1) (neighbors (first m1))))
-                     #t)
-                "invalid attack location"))
-  
-  (define (property:add-to-territory-always-up-one)
-    (define r (random 10000))
-    (check-equal? (add-dice-to (territory 0 0 r 0 0))
-                  (territory 0 0 (add1 r) 0 0)
-                  "add to territory always up one"))
-  
-  (define (property:attackable?-does-not-need-neighbores-check)
-    (define (check-attackable? gt)
-      (for/and ([move (game-moves gt)]
-                #:when (not (empty? (move-action move))))
-        (define action (move-action move))
-        (define gt (move-gt move))
-        (and (member (second action) (neighbors (first action)))
-             (check-attackable? gt))))
-    
-    ;;start
-    (define old-size BOARD)
-    (set-grid 2)
-    (define testing-gt (dice-world-gt (create-world-of-dice-and-doom)))
-    (check-true (check-attackable? testing-gt) "An attack move between non-neighbores was created")
-    (set-grid old-size))
-  
-  
-  ;; game-tree
-  (check-equal? (game-tree board1 0 0) g-tree1)
-  (check-equal? (game-tree board3 1 0) (game board3 1 '()))
-  (check-equal? (game-tree board3 0 0) (game board3 0 '()))
-  (check-property property:attackable?-does-not-need-neighbores-check)
-  
-  ;; find-move
-  (check-false (find-move '() '()))
-  (check-equal? (find-move (list (move '() (game '() 0 '()))) '()) (game '() 0 '()))
-  ;; Attacking-Moves
-  (check-property property:attack-location-valid)
-  
-  ;; switch-players
-  (check-equal? (switch 0) 1)
-  (check-equal? (switch 1) 0)
-  
-  ;; Add-New-Dice
-  (check-equal? (distribute/list (game-board g-tree1) 0 3) (list 1 (reverse b1+0+3)))
-  (check-equal? (distribute/list (game-board g-tree1) 1 2) (list 0 (reverse b1+1+2)))
-  (check-equal? (distribute/list (game-board g-tree2) 1 2) (list 0 (reverse b2+1+2)))
-  (check-equal? (distribute/list board6 0 0) (list 0 (reverse bard6+)))
-  
-  ;; add-to-territory
-  (check-equal? (add-dice-to (territory 0 1 2 9 0)) (territory 0 1 3 9 0))
-  (check-equal? (add-dice-to (territory 0 1 1 9 0)) (territory 0 1 2 9 0))
-  (check-equal? (add-dice-to (territory 0 1 5 9 0)) (territory 0 1 6 9 0))
-  (check-property property:add-to-territory-always-up-one)
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  (define board7
-    (list (territory 0 0 1 9 0) (territory 1 1 1 8 0) (territory 2 0 2 43.5 5) (territory 3 1 1 6 5)))
-  (define board8
-    (list (territory 0 1 1 9 0) (territory 1 1 1 8 0) (territory 2 0 3 43.5 5) (territory 3 1 1 6 5)))
-  (define board9
-    (list (territory 0 0 1 9 0) (territory 1 1 1 8 0) (territory 2 0 2 43.5 5) (territory 3 0 1 6 5)))
-  (define board10
-    (list (territory 0 0 1 9 0) (territory 1 1 3 8 0) (territory 2 0 2 43.5 5) (territory 3 1 1 6 5)))
-  
-  ;; testing attacks
-  
-  (check-equal? 
-   (execute board7 0 2 1 2)
-   (list (territory 0 0 1 9 0) (territory 1 0 1 8 0) (territory 2 0 1 43.5 5) (territory 3 1 1 6 5)))
-  
-  (check-equal? 
-   (execute board8 0 2 1 3)
-   (list (territory 0 1 1 9 0) (territory 1 0 2 8 0) (territory 2 0 1 43.5 5) (territory 3 1 1 6 5)))
-  
-  (check-equal? 
-   (execute board9 0 2 1 2)
-   (list (territory 0 0 1 9 0) (territory 1 0 1 8 0) (territory 2 0 1 43.5 5) (territory 3 0 1 6 5)))
-  
-  (check-equal?
-   (execute board10 1 1 0 3)
-   (list(territory 0 1 2 9 0) (territory 1 1 1 8 0) (territory 2 0 2 43.5 5) (territory 3 1 1 6 5)))
-  
-  ;; Neighbors
-  (check-equal? (neighbors 2) '(0 3))
-  (check-equal? (neighbors 0) '(3 2 1))
-  (check-equal? (neighbors 1) '(3 0)) 
-  (check-equal? (neighbors 3) '(1 0 2))
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  (define board20
-    (list (territory 0 0 1 9 2) (territory 1 0 1 9 0) (territory 2 2 1 9 0)))
-  (define board21 
-    (list (territory 0 1 1 9 0) (territory 1 1 1 8 0) (territory 2 1 1 43.5 5) (territory 3 1 1 6 5)))
-  
-  ;; testing focus manipulation 
-  ;; interact-with-board
-  (check-equal? 
-   (interact-with-board world2 "\r")
-   (dice-world (territory-index (car (dice-world-board world2))) (dice-world-board world2) g-tree2))
-  
-  (check-equal? (interact-with-board world2 "p") world2)
-  
-  ;; refocus-board-action
-  (check-equal? 
-   (refocus-board (dice-world #f (list (territory 0 0 1 9 0) (territory 0 0 1 9 2)) g-tree1) left)
-   (dice-world #f (list (territory 0 0 1 9 2) (territory 0 0 1 9 0)) g-tree1))
-  
-  (check-equal? 
-   (refocus-board (dice-world #f (list (territory 0 0 1 9 2) (territory 0 1 1 9 0)) g-tree1) right)
-   (dice-world #f (list (territory 0 0 1 9 2) (territory 0 1 1 9 0)) g-tree1))
-  
-  (check-equal? 
-   (refocus-board (dice-world 0 board20 g-tree1) left)
-   (dice-world 0 (list (territory 2 2 1 9 0) (territory 0 0 1 9 2) (territory 1 0 1 9 0)) g-tree1))
-  
-  (check-equal? 
-   (refocus-board (dice-world 0 (list (territory 0 0 1 9 2) (territory 0 1 1 9 0)) g-tree1) left)
-   (dice-world 0 (list  (territory 0 1 1 9 0) (territory 0 0 1 9 2)) g-tree1))
-  
-  (check-equal? 
-   (refocus-board (dice-world 0 (list(territory 0 0 1 9 2) (territory 0 1 1 9 0)) g-tree1) right)
-   (dice-world 0 (list  (territory 0 1 1 9 0) (territory 0 0 1 9 2)) g-tree1))
-  
-  ;;unmark
-  (check-equal? (unmark (dice-world 1 board21 g-tree1)) (dice-world #f board21 g-tree1))
-  
-  (check-equal? (unmark (dice-world 1 (list (territory 0 1 1 9 0) (territory 1 1 1 8 0)) g-tree1))
-                (dice-world #f (list (territory 0 1 1 9 0) (territory 1 1 1 8 0)) g-tree1))
-  (check-equal? (unmark (dice-world 0 (list (territory 0 1 1 9 0)) g-tree1))
-                (dice-world #f (list (territory 0 1 1 9 0)) g-tree1))
-  (check-equal? (unmark (dice-world #f (list (territory 0 1 1 9 0)) g-tree1))
-                (dice-world #f (list (territory 0 1 1 9 0)) g-tree1))
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  (define (winners/list w)
-    (define-values (a b) (winners w))
-    (cons a b))
-  
-  ;; testing functions that determine 'winning' and declare the winner
-  
-  ;; winners
-  (check-equal? (winners/list (list (territory 0 0 1 9 0) (territory 0 0 1 9 1))) (list 2 0))
-  (check-equal? (winners/list (list (territory 0 1 1 9 0) (territory 0 0 1 9 1))) (list 1 1 0))
-  
-  ;; sum-territory
-  (check-equal? (sum-territory (list (territory 0 0 1 9 0) (territory 0 0 1 9 1)) 0) 2)
-  (check-equal? (sum-territory (list (territory 0 0 1 9 0) (territory 0 0 1 9 1)) 1) 0)
-  (check-equal? (sum-territory (list (territory 0 0 1 9 0) (territory 0 0 1 9 1)) 2) 0)
-  (check-equal? (sum-territory (list (territory 0 1 1 9 0) (territory 0 0 1 9 1)) 1) 1)
-  (check-equal? (sum-territory (list (territory 0 1 1 9 0) (territory 0 0 1 9 1)) 0) 1)
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  ;; testing the AI 
-  
-  (define tree0
-    (game-tree (list (territory 0 1 3 0 0)
-                     (territory 1 0 2 0 0)
-                     (territory 2 0 2 0 0) 
-                     (territory 3 0 2 0 0))
-               1 15))
-  
-  (define territory1 (territory 3 0 3 280 262.5))
-  
-  (define board31 
-    (list territory1
-          (territory 2 0 3 150 262.5)
-          (territory 1 1 2 345 150)
-          (territory 0 0 2 215 150)))
-  
-  (define world1 
-    (dice-world #f board31 (game board31 1 '())))
-  
-  ;; testing the AI functions 
-  
-  ;; MF: one of these two tests should fail! 
-  (check-true (and (attackable? board31 0 territory1 1) #t))
-  (check-true (no-more-moves-in-world? world1))
-  
-  (check-equal? (interact-with-board (dice-world 3 '() '()) "d")
-                (dice-world #f '() '()))
-  
-  (check-equal? (game-board (the-ai-plays tree0))
-                (list (territory 3 1 3 0 0)
-                      (territory 2 0 2 0 0)
-                      (territory 1 0 2 0 0) 
-                      (territory 0 1 2 0 0)))
-  
-  (check-equal? (game-player (the-ai-plays tree0))
-                0)
-  
-  (check-equal? (game-board (move-gt (first (game-moves tree0))))
-                (list (territory 0 1 1 0 0)
-                      (territory 1 0 2 0 0)
-                      (territory 2 0 2 0 0)
-                      (territory 3 1 2 0 0)))
-  
-  (check-equal? (game-player (move-gt (first (game-moves tree0))))
-                1)
-  
-  (check-equal? (rate-position tree0 AI-DEPTH) 1/2)
-  (check-equal? (rate-position (move-gt (first (game-moves tree0))) AI-DEPTH)
-                1/2)
-  
-  "all tests run")
diff --git a/pkgs/realm/chapter12/readme.txt b/pkgs/realm/chapter12/readme.txt
deleted file mode 100644
index f88f08e619..0000000000
--- a/pkgs/realm/chapter12/readme.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-This chapter implements a GUI version of the "dice of doom" game from
-Barski's "Land of Lisp". This implementation uses a lazy game tree and 
-adds an AI player. 
-
-To play or to experiment, open the file 
-
-	 source.rkt 
-
-in DrRacket. The instructions for playing are at the top of the file. 
-Our tests are at the bottom of the file in a separate 'test' submodule. 
-
-
diff --git a/pkgs/realm/chapter12/source.rkt b/pkgs/realm/chapter12/source.rkt
deleted file mode 100644
index fc925e99fe..0000000000
--- a/pkgs/realm/chapter12/source.rkt
+++ /dev/null
@@ -1,1115 +0,0 @@
-#lang racket
-
-#| 
-   The Dice of Doom game, the lazy version  
-   ----------------------------------------
-
-   The Dice of Doom game is a turn-based game for two players sharing one keyboard. 
-   This implementation employs a lazy strategy to build the complete game 
-   tree of all possible moves. If you have a large enough monitor, you can play 
-   it for pretty large boards. The defauly is a 3x3 board. 
-
-   Each player owns hexagonal territories, which are arranged into a planar game
-   board. A territory comes with a number of dice. When it is a player's turn, 
-   she marks one of her territories as a launching pad for an attack at a 
-   neigboring territory of the other player. Such an attack is enabled only if 
-   her chosen territory has more dice than the territory of the other player. 
-   The effect of the attack is that the territory changes ownership and that all
-   but one of the attack dice are moved to the newly conquered territory. A 
-   player may continue her turn as long as she can launch attacks. Optionally, 
-   she may choose to pass after her first attack is executed, meaning she ends 
-   her turn. At the end of a turn, a number of dices are distributed across the 
-   players' territories. The game is over when a player whose turn it is cannot
-   attack on her first move. 
-
-   A player can use the following five keys to play the game:
-    -- with ← and → (arrow keys), the player changes the territory focus 
-    -- with enter, the player marks a territory the launching pad for an attack
-    -- with the "d" key, the player unmarks a territory 
-    -- with the "p" key the player passes. 
-   Once a player passes, the game announces whose turn it is next. 
-
-   Play
-   ----
- 
-   Run and evaluate 
-     (roll-the-dice)
-   This will pop up a window that the game board, and instructions. 
-
-   If you wish to play with a larger or smaller board than the defauly, evaluate 
-     (set-grid <n>)
-   for the desired size <n> before you roll the dice. 
-
-   Good luck. 
-|#
-
-(require 2htdp/image (except-in 2htdp/universe left right)) 
-
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;   ;;;;       ;                            ;;; ;;;                   ;;        ;; 
-;    ;  ;                                    ;   ;                     ;         ; 
-;    ;   ;   ;;;     ;;; ;   ;;;;            ;   ;   ;;;;   ;; ;;;     ;     ;;; ; 
-;    ;   ;     ;    ;   ;;  ;    ;           ; ; ;  ;    ;   ;;        ;    ;   ;; 
-;    ;   ;     ;    ;       ;;;;;;           ; ; ;  ;    ;   ;         ;    ;    ; 
-;    ;   ;     ;    ;       ;                ; ; ;  ;    ;   ;         ;    ;    ; 
-;    ;  ;      ;    ;    ;  ;                ; ; ;  ;    ;   ;         ;    ;   ;; 
-;   ;;;;     ;;;;;   ;;;;    ;;;;;            ; ;    ;;;;   ;;;;;    ;;;;;   ;;; ;;
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;                                                                                  
-
-;; ---------------------------------------------------------------------------------------------------
-;; Data
-
-(struct dice-world (src board gt) #:transparent)
-;; DiceWorld = (dice-world (U #false Natural) Board GameTree)
-;; in (dice-world i b gt)
-;; -- if i is a Natural, it is an index for the territory that the player has marked for an attack
-;; -- if i is #f, no territory has been marked yet 
-;; b is the current board
-;; gt is the game-tree for the given i and b 
-
-(define-values (game game? game-board game-player game-moves)
-  (let ()
-    (struct game (board player delayed-moves) #:transparent)
-    (values game
-            game? 
-            game-board 
-            game-player 
-            (lambda (g) (force (game-delayed-moves g))))))
-;; GameTree = (game Board Player [Delay [Listof Move]])
-;; in (game-tree b p lm)
-;; -- b is the current board 
-;; -- p is the current player 
-;; -- lm is the delayed list of moves that that player may execute 
-;; NOTE: access to the structure automatically forces the list computation 
-
-;; Board = [List-of Territory]
-;; the first field in the list is the currently marked  territory
-
-;; Player ∈ [0, PLAYER#) | Natural 
-
-(struct move (action gt) #:transparent)
-;; Move = (move Action GameTree)
-;; in (move a gt)
-;; -- a represents the actione to be takem 
-;; -- gt is the game-tree resulting from that action 
-
-;; Action is one of:
-;; -- '()                      a passing move
-;; -- (list Natural Natural)   the move where the first attacks the second
-
-(struct territory (index player dice x y) #:transparent)
-;; Territory = (territory Natural Player Dice Integer Integer)
-;; in (territory i p d x y)
-;; -- i is a unique identifier for the territory; it also determines its initial location
-;; -- p is the player who owns this territory
-;; -- d is the number of dice on this board
-;; -- x is the x coordiate of this territory in pixels
-;; -- y is the y coordiate of this territory in pixels
-
-;; some functions on data 
-
-;; GameTree GameTree -> Boolean 
-;; comparing game tree completely would force them all the way 
-;; this function implements a compromise that forces them one level 
-(define (game-tree=? gt1 gt2)
-  (and (equal? (game-player gt1) (game-player gt2))
-       (equal? (game-board gt1) (game-board gt2))
-       (= (length (game-moves gt1)) (length (game-moves gt2)))))
-
-;; Territory Natural -> Territory 
-;; updates number of dice on territory 
-(define (territory-set-dice t d)
-  (territory (territory-index t) (territory-player t) d (territory-x t) (territory-y t)))
-
-;; Territory Player -> Territory 
-;; updates owner of territory 
-(define (territory-set-player t p)
-  (territory (territory-index t) p (territory-dice t) (territory-x t) (territory-y t)))
-
-;; ---------------------------------------------------------------------------------------------------
-;; sample game tree for BOOK 
-
-(define b1
-  (list (territory 1 0 1 'a 'b)
-        (territory 0 0 1 'x 'y)))
-
-(define b1-alternative 
-  (list (territory 0 0 1 'x 'y)
-        (territory 1 0 1 'a 'b)))
-
-(define b3
-  (list (territory 0 0 2 'x 'y)
-        (territory 1 1 1 'a 'b)))
-
-(define gt1 (game b1 1 (delay '())))
-
-(define mv2 (move '() gt1))
-
-(define gt2 (game b1-alternative 0 (delay (list mv2))))
-
-(define mv3 (move '(0 1) gt2))
-
-(define gt3 (game b3 0 (delay (list mv3))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Constants
-
-;; assumed display dimensions 
-(define DISPLAY-WIDTH 2560)
-(define DISPLAY-HEIGHT 1440)
-
-; initalization constants
-(define PLAYER# 2)
-(define DICE# 3)
-(define BOARD 4)
-(define GRID (* BOARD BOARD))
-(define INIT-PLAYER 0)
-(define INIT-SPARE-DICE 10)
-; The depth at which to limit the gametree
-(define AI-DEPTH 4)
-(define AI 1)
-
-; graphical constants: territories
-(define DICE-OFFSET 6)
-(define SIDE 75)
-(define OFFSET0 (* 2 SIDE))
-(define ROTATION 30)
-(define HEX 6)
-(define (hexagon color)
-  (rotate ROTATION (regular-polygon SIDE HEX "solid" color)))
-(define X-OFFSET (image-width (hexagon "black")))
-(define Y-OFFSET (* (image-height (hexagon "black")) 3/4))
-
-; graphical constants
-(define COLORS 
-  (list (make-color 255 0 0 100) 
-        (make-color 0 255 0 100) 
-        (make-color 0 0 255 100)))
-(define FOCUS (rotate ROTATION (regular-polygon SIDE 6 "outline" "black")))
-(define D1 (bitmap "../chapter10/graphics/dice1.png"))
-(define D2 (bitmap "../chapter10/graphics/dice2.png"))
-(define D3 (bitmap "../chapter10/graphics/dice3.png"))
-(define D4 (bitmap "../chapter10/graphics/dice4.png"))
-(define IMG-LIST (list D1 D2 D3 D4)) 
-
-(define TEXT-SIZE 25)
-(define TEXT-COLOR "black")
-(define INSTRUCT 
-  "← and → to move among territories, <enter> to mark, <d> to unmark, and <p> to pass")
-(define AI-TURN "It's the Mighty AI's turn")
-(define YOUR-TURN "It's your turn")
-(define INFO-X-OFFSET 100)
-(define INFO-Y-OFFSET 50)
-
-(define INSTRUCTIONS (text INSTRUCT TEXT-SIZE TEXT-COLOR))
-(define WIDTH (+ (image-width INSTRUCTIONS) 50))
-(define HEIGHT 600)
-(define (PLAIN)
-  (define iw (image-width INSTRUCTIONS))
-  (define bw (* SIDE 2 BOARD))
-  (set! WIDTH  (+ (max iw bw) 50))
-  (set! HEIGHT (+ (* SIDE 2 BOARD) 50))
-  (empty-scene WIDTH HEIGHT))
-(define (ISCENE)
-  (define mt (PLAIN))
-  (when (or (> (image-width mt) DISPLAY-WIDTH) (> (image-height mt) DISPLAY-HEIGHT))
-    (error 'scene "it is impossible to draw a ~s x ~s game scene for a 1280 x 800 laptop screen" (image-width mt) (image-height mt)))
-  (place-image INSTRUCTIONS (* .5 WIDTH) (* .9 HEIGHT) mt))
-
-;                                  
-;                                  
-;                                  
-;                                  
-;   ;;; ;;;            ;           
-;    ;; ;;                         
-;    ;; ;;   ;;;;    ;;;    ;; ;;  
-;    ; ; ;  ;    ;     ;     ;;  ; 
-;    ; ; ;   ;;;;;     ;     ;   ; 
-;    ;   ;  ;    ;     ;     ;   ; 
-;    ;   ;  ;   ;;     ;     ;   ; 
-;   ;;; ;;;  ;;; ;;  ;;;;;  ;;; ;;;
-;                                  
-;                                  
-;                                  
-;                                  
-
-;; ---------------------------------------------------------------------------------------------------
-
-;; start the game 
-(define (roll-the-dice)
-  (big-bang (create-world-of-dice-and-doom)             
-            (on-key interact-with-board)
-            (to-draw draw-dice-world)
-            (stop-when no-more-moves-in-world? 
-                       draw-end-of-dice-world)))
-
-;;  -> DiceWorld
-;; Returns a randomly generated world. If the world that
-;; has been generated starts as a tie, the world is regenerated.
-;; property: world is not in endgame state (no-more-moves? returns false)
-(define (create-world-of-dice-and-doom)
-  (define board (territory-build))
-  (define gamet (game-tree board INIT-PLAYER INIT-SPARE-DICE))
-  (define new-world (dice-world #f board gamet))
-  (if (no-more-moves-in-world? new-world) 
-      (create-world-of-dice-and-doom)
-      new-world))
-
-;; DiceWorld Key -> DiceWorld
-;; Handles key events from a player
-(define (interact-with-board w k)
-  (cond [(key=? "left" k)
-         (refocus-board w left)]
-        [(key=? "right" k)
-         (refocus-board w right)]
-        [(key=? "p" k)
-         (pass w)]
-        [(key=? "\r" k)
-         (mark w)]
-        [(key=? "d" k)
-         (unmark w)]
-        [else w]))
-
-;; Diceworld -> Scene
-;; draws the world
-(define (draw-dice-world w)
-  (add-player-info 
-   (game-player (dice-world-gt w)) 
-   (add-board-to-scene w (ISCENE))))
-
-;; DiceWorld -> Boolean
-;; is it possible to play any moves from this world state? 
-(define (no-more-moves-in-world? w)
-  (define tree (dice-world-gt w))
-  (define board (dice-world-board w))
-  (define player (game-player tree))
-  (or (no-more-moves? tree)
-      (for/and ((t board)) (= (territory-player t) player))))
-
-;; DiceWorld -> Image
-;; render the endgame screen
-(define (draw-end-of-dice-world w)
-  (define board (dice-world-board w))
-  (define message (text (won board) TEXT-SIZE TEXT-COLOR))
-  (define background (add-board-to-scene w (PLAIN)))
-  (overlay message background))
-
-;; Board -> String
-;; Which player has won the game -- eager is for N human players 
-(define (won board)
-  (define-values (best-score w) (winners board))
-  (if (cons? (rest w)) "It's a tie." "You won."))
-
-;                                  
-;                                  
-;                                  
-;                                  
-;    ;;;;;             ;           
-;      ;                     ;     
-;      ;    ;; ;;    ;;;    ;;;;;  
-;      ;     ;;  ;     ;     ;     
-;      ;     ;   ;     ;     ;     
-;      ;     ;   ;     ;     ;     
-;      ;     ;   ;     ;     ;   ; 
-;    ;;;;;  ;;; ;;;  ;;;;;    ;;;  
-;                                  
-;                                  
-;                                  
-;                                  
-
-;; ---------------------------------------------------------------------------------------------------
-;; Making A Board
-
-;; -> Board
-;; Creates a list of territories the size of GRID with given x and y coordinates
-;; properties: dice is (0,MAX-DICE]
-;;             returns list of size GRID
-(define (territory-build)
-  (for/list ([n (in-range GRID)])
-    (territory n (modulo n PLAYER#) (dice) (get-x n) (get-y n))))
-
-;; -> Natural
-;; the number of initial die on a territory
-(define (dice)
-  (add1 (random DICE#)))
-
-;; Natural -> Number
-;; the x coordinate for territory n of a board 
-(define (get-x n)
-  (+ OFFSET0
-     (if (odd? (get-row n)) 0 (/ X-OFFSET 2))
-     (* X-OFFSET (modulo n BOARD))))
-
-;; Natural -> Number 
-;; the y coordinate for territory n of a board 
-(define (get-y n)
-  (+ OFFSET0 (* Y-OFFSET (get-row n))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Making a Game Tree
-
-;; Board Player Natural -> GameTree
-;; creates a complete game-tree from the given board, player, and spare dice
-(define (game-tree board player dice)
-  ;; create tree of attacks from this position; add passing move
-  (define (attacks board) 
-    (for*/list ([src board] 
-                [dst (neighbors (territory-index src))]
-                #:when (attackable? board player src dst))
-      (define from (territory-index src))
-      (define dice (territory-dice src))
-      (define newb (execute board player from dst dice))
-      (define attacks-from-newb 
-        (game newb player (delay (cons (passes newb) (attacks newb)))))
-      (move (list from dst) attacks-from-newb)))
-  ;; create a passing move , distribute dice, continue
-  (define (passes board)
-    (define-values (new-dice newb) (distribute board player dice))
-    (move '() (game-tree newb (switch player) new-dice)))
-  ;; -- START: -- 
-  (game board player (delay (attacks board))))
-
-;; Player -> Player
-;; switches from one player to the next
-(define (switch player)
-  (modulo (+ player 1) PLAYER#))
-
-;; Board Player Natural -> Natural Board
-;; adds reinforcements to the game board
-;; > (add-new-dice (list (territory 0 2 2 9 0)) 2 2))
-;; (list (territory 0 2 2 9 0))
-(define (distribute board player spare-dice)
-  (for/fold ([dice spare-dice] [new-board '()]) ([t board])
-    (if (and (= (territory-player t) player)
-             (< (territory-dice t) DICE#)
-             (not (zero? dice)))
-        (values (- dice 1) (cons (add-dice-to t) new-board))
-        (values dice (cons t new-board)))))
-
-;; Territory -> Territory 
-;; adds one dice to the given territory
-(define (add-dice-to t)
-  (territory-set-dice t (add1 (territory-dice t))))
-
-;; Board Player Territory Natural -> Boolean
-;; can player attack dst from src?
-(define (attackable? board player src dst)
-  (define dst-t 
-    (findf (lambda (t) (= (territory-index t) dst)) board))
-  (and dst-t
-       (= (territory-player src) player)
-       (not (= (territory-player dst-t) player))
-       (> (territory-dice src) (territory-dice dst-t))))
-
-;; Board Natural Natural Natural Natural -> Board
-;; Creates a new board after an attack
-;; updates only src and dst
-(define (execute board player src dst dice)
-  (for/list ([t board])
-    (define idx (territory-index t))
-    (cond [(= idx src) (territory-set-dice t 1)]
-          [(= idx dst) 
-           (define s (territory-set-dice t (- dice 1)))
-           (territory-set-player s player)]
-          [else t])))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Getting Neigbors
-
-;; Natural -> [List-of Natural]
-;; returns the neighbors of the current spot
-;; > (neighbors 0)
-;; '(1 2 3)
-(define (neighbors pos)  
-  (define top?      (< pos BOARD))
-  (define bottom?   (= (get-row pos) (sub1 BOARD)))
-  (define even-row? (zero? (modulo (get-row pos) 2)))
-  (define right?    (zero? (modulo (add1 pos) BOARD)))
-  (define left?     (zero? (modulo pos BOARD)))
-  (if even-row?
-      (even-row pos top? bottom? right? left?)
-      (odd-row  pos top? bottom? right? left?)))
-
-;; Natural Boolean Boolean Boolean Boolean -> [Listof Naturals]
-;; gets the neighbors for a territory on an even row
-(define (even-row pos top? bottom? right? left?)
-  (append (add (or top? right?)    (add1 (- pos BOARD)))
-          (add (or bottom? right?) (add1 (+ pos BOARD)))
-          (add top?                (- pos BOARD))
-          (add bottom?             (+ pos BOARD))
-          (add right?              (add1 pos))
-          (add left?               (sub1 pos))))
-
-;; Natural Boolean Boolean Boolean Boolean -> [Listof Naturals]
-;; gets the neighbors for a territory on an even odd
-(define (odd-row pos top? bottom? right? left?)
-  (append (add top?               (- pos BOARD))
-          (add bottom?            (+ pos BOARD))
-          (add (or top? left?)    (sub1 (- pos BOARD)))
-          (add (or bottom? left?) (sub1 (+ pos BOARD)))
-          (add right?             (add1 pos))
-          (add left?              (sub1 pos))))
-
-;; Boolean X -> [Listof X]
-;; returns (list x) if (not b) else empty
-(define (add b x)
-  (if b '() (list x)))
-
-;                                                                          
-;                                                                          
-;                                                                          
-;                                                                          
-;   ;;; ;;;                 ;;;;;;                                         
-;    ;   ;                   ;   ;                           ;             
-;    ;  ;    ;;;;   ;;; ;;;  ; ;   ;;;  ;;;  ;;;;   ;; ;;   ;;;;;    ;;;;; 
-;    ; ;    ;    ;   ;   ;   ;;;    ;    ;  ;    ;   ;;  ;   ;      ;    ; 
-;    ;;;    ;;;;;;   ;   ;   ; ;     ;  ;   ;;;;;;   ;   ;   ;       ;;;;  
-;    ;  ;   ;         ; ;    ;       ;  ;   ;        ;   ;   ;           ; 
-;    ;   ;  ;         ; ;    ;   ;    ;;    ;        ;   ;   ;   ;  ;    ; 
-;   ;;;  ;;  ;;;;;     ;    ;;;;;;    ;;     ;;;;;  ;;; ;;;   ;;;   ;;;;;  
-;                      ;                                                   
-;                    ;;;                                                   
-;                                                                          
-;                                                                          
-
-;; ---------------------------------------------------------------------------------------------------
-;; Territory Focusing and Marking 
-
-;; DiceWorld [Board -> Board] -> World
-;; Creates a new World that has a rotated territory list
-;; > (define lterritory (territory 0 0 1 9 2))
-;; > (define rterritory (territory 0 0 1 9 0))
-;; > (refocus-board-action (dice-world -1 (list rterritory lterritory ...) GT) left)
-;; (dice-world -1 (list lterritory ... rterritory) GT)
-;; > (refocus-board-action (dice-world -1 (list lterritory ... rterritory) GT) left)
-;; (dice-world -1 (list rterritory lterritory ...) GT)
-(define (refocus-board w direction)
-  (define source (dice-world-src w))
-  (define board  (dice-world-board w))
-  (define tree   (dice-world-gt w))
-  (define player (game-player tree))
-  (define (owner? tid)
-    (if source (not (= tid player)) (= tid player)))
-  (define new-board (rotate-until owner? board direction))
-  (dice-world source new-board tree))
-
-;; [Player -> Boolean] Board (Board -> Board) -> Board 
-;; rotate until the first element of the list satisfies owned-by 
-(define (rotate-until owned-by board rotate)
-  (define next-list (rotate board))
-  (if (owned-by (territory-player (first next-list))) 
-      next-list
-      (rotate-until owned-by next-list rotate)))
-
-;; Board -> Board
-;; rotate a list to the left 
-(define (left l)
-  (append (rest l) (list (first l))))
-
-;; Board -> Board
-;; rotate a list to the right
-(define (right l)
-  (reverse (left (reverse l))))
-
-;; ---------------------------------------------------------------------------------------------------
-;; Handling Moves
-
-;; DiceWorld -> DiceWorld
-;; executes a passing move on the world state
-;; THIS DEFINITION IS NOT USED FOR THE ABSTRACT VERSION OF THE MODULE. 
-(define (pass.10 w)
-  (define m (find-move (game-moves (dice-world-gt w)) '()))
-  (cond [(not m) w]
-        [else ;; (no-more-moves? m)
-         (dice-world #f (game-board m) m)]))
-
-;; DiceWorld -> DiceWorld
-;; unmarks a marked territory
-(define (unmark w)
-  (dice-world #f (dice-world-board w) (dice-world-gt w)))
-
-;; DiceWorld -> DiceWorld
-;; marks a territory as the launching pad for an attack or launches the attack 
-(define (mark w)
-  (define tree   (dice-world-gt w))
-  (define board  (dice-world-board w))
-  (define source (dice-world-src w))
-  (define focus  (territory-index (first board)))
-  (if source 
-      (attacking w source focus)
-      (dice-world focus board tree)))
-
-;; DiceWorld Natural Natural -> DiceWorld
-(define (attacking w source target)
-  (define feasible (game-moves (dice-world-gt w)))
-  (define attack   (list source target))
-  (define next     (find-move feasible attack))
-  (if next (dice-world #f (game-board next) next) w))
-
-;; [List-of Moves] [or '() [List Natural Natural]] -> [or #f Game-tree] 
-;; find the move from the current list of moves
-(define (find-move moves a)
-  (define m (findf (lambda (m) (equal? (move-action m) a)) moves))
-  (and m (move-gt m)))
-
-;; Game -> Boolean 
-;; are there any moves in this game record? 
-(define (no-more-moves? g)
-  (empty? (game-moves g)))
-
-;                                                                          
-;                                                                          
-;                                                                          
-;                                                                          
-;   ;;;;;                       ;;                     ;                   
-;    ;   ;                       ;                                         
-;    ;   ;   ;;;;   ;; ;;    ;;; ;   ;;;;   ;; ;;;   ;;;    ;; ;;    ;;; ;;
-;    ;   ;  ;    ;   ;;  ;  ;   ;;  ;    ;   ;;        ;     ;;  ;  ;   ;; 
-;    ;;;;   ;;;;;;   ;   ;  ;    ;  ;;;;;;   ;         ;     ;   ;  ;    ; 
-;    ;  ;   ;        ;   ;  ;    ;  ;        ;         ;     ;   ;  ;    ; 
-;    ;   ;  ;        ;   ;  ;   ;;  ;        ;         ;     ;   ;  ;   ;; 
-;   ;;;   ;  ;;;;;  ;;; ;;;  ;;; ;;  ;;;;;  ;;;;;    ;;;;;  ;;; ;;;  ;;; ; 
-;                                                                        ; 
-;                                                                    ;;;;  
-;                                                                          
-;                                            
-
-;; Player Scene-> Scene
-;; Draws the world
-(define (add-player-info player s)
-  (define str (whose-turn player))
-  (define txt (text str TEXT-SIZE TEXT-COLOR))
-  (place-image txt (- WIDTH INFO-X-OFFSET) INFO-Y-OFFSET s))
-
-;; DiceWorld Scene -> Scene
-;; folds through the board and creates an image representation of it
-(define (add-board-to-scene w s)
-  (define board   (dice-world-board w))
-  (define player  (game-player (dice-world-gt w)))
-  (define focus?  (dice-world-src w))
-  (define trtry1  (first board))
-  (define p-focus (territory-player trtry1))
-  (define t-image (draw-territory trtry1))
-  (define image (draw-focus focus? p-focus player t-image))
-  (define base-s  (add-territory trtry1 image s))
-  (for/fold ([s base-s]) ([t (rest board)])
-    (add-territory t (draw-territory t) s)))
-
-;; Nat Player Player Image -> Image 
-;; add focus marker to territory if needed 
-(define (draw-focus marked? p-in-focus p t-image)
-  (if (or (and (not marked?) (= p-in-focus p))
-          (and marked? (not (= p-in-focus p))))
-      (overlay FOCUS t-image)
-      t-image))
-
-;; Image Territory Image -> Image 
-(define (add-territory t image scene)
-  (place-image image (territory-x t) (territory-y t) scene))
-
-;; Territory -> Image
-;; renders a single territory
-(define (draw-territory t)
-  (define color (color-chooser (territory-player t)))
-  (overlay (hexagon color) (draw-dice (territory-dice t))))
-
-;; Natural -> Image
-;; renders all n >= 1 dice as a stack of dice 
-(define (draw-dice n)
-  (define first-die  (get-dice-image 0))
-  (define height-die (image-height first-die))
-  (for/fold ([s first-die]) ([i (- n 1)])
-    (define dice-image (get-dice-image (+ i 1)))
-    (define y-offset  (* height-die (+ .5 (* i .25))))
-    (overlay/offset s 0 y-offset dice-image)))
-
-;; Player -> Color
-;; Determines a color for each player
-(define (color-chooser p)
-  (list-ref COLORS p))
-
-;; -> Image
-;; returns an image from the list of dice images 
-(define (get-dice-image i)
-  (list-ref IMG-LIST (modulo i (length IMG-LIST))))
-
-;                                                  
-;                                                  
-;                                                  
-;                                                  
-;   ;;;;;;              ;;     ;                   
-;    ;   ;               ;                         
-;    ; ;    ;; ;;    ;;; ;   ;;;    ;; ;;    ;;; ;;
-;    ;;;     ;;  ;  ;   ;;     ;     ;;  ;  ;   ;; 
-;    ; ;     ;   ;  ;    ;     ;     ;   ;  ;    ; 
-;    ;       ;   ;  ;    ;     ;     ;   ;  ;    ; 
-;    ;   ;   ;   ;  ;   ;;     ;     ;   ;  ;   ;; 
-;   ;;;;;;  ;;; ;;;  ;;; ;;  ;;;;;  ;;; ;;;  ;;; ; 
-;                                                ; 
-;                                            ;;;;  
-;                                                  
-;                                                  
-
-;; Board ->* Natural [non-empty-listof Player]
-;; gives the number of winning territories and the players(s) who have them
-;; > (winners (list (territory 0 0 1 9 0) (territory 0 0 1 9 1)))
-;; (values 2 '(0))
-;; > (winners (list (territory 0 1 1 9 0) (territory 0 0 1 9 1)))
-;; (values 1 '(0 1))
-(define (winners board)
-  (for/fold ([best 0][winners '()]) ([p PLAYER#])
-    (define p-score (sum-territory board p))
-    (cond [(> p-score best) (values p-score (list p))]
-          [(< p-score best) (values best winners)]
-          [(= p-score best) (values best (cons p winners))])))
-
-;; Board Player -> Natural
-;; counts the number of territorys the player owns
-;; > (sum-territory (list (territory 0 1 1 9 0) (territory 0 1 1 9 1)) 1)
-;; 2
-(define (sum-territory board player)
-  (for/fold ([result 0]) ([t board])
-    (if (= (territory-player t) player) (+ result 1) result)))
-
-
-;                      
-;                      
-;                      
-;                      
-;                      
-;     ;;;     ;;;;;;;  
-;      ;;        ;     
-;     ;  ;       ;     
-;     ;  ;       ;     
-;     ;  ;       ;     
-;    ;;;;;;      ;     
-;    ;    ;      ;     
-;   ;      ;     ;     
-;  ;;;    ;;; ;;;;;;;  
-;                      
-;                      
-;                      
-;                      
-
-;; Player -> {AI-TURN, YOUR-TURN}
-;; THIS REQUIRES A DIFFERENT DEFINITION FOR PLAIN CHAPTER 10. 
-(define (whose-turn player)
-  (if (= player AI) AI-TURN YOUR-TURN))
-
-;; DiceWorld -> DiceWorld
-;; executes a passing move on the world state
-;; THIS REQUIRES A DIFFERENT DEFINITION FOR PLAIN CHAPTER 10.
-(define (pass w)
-  (define m (find-move (game-moves (dice-world-gt w)) '()))
-  (cond [(not m) w]
-        [(or (no-more-moves? m) (not (= (game-player m) AI)))
-         (dice-world #f (game-board m) m)]
-        [else
-         (define ai (the-ai-plays m))
-         (dice-world #f (game-board ai) ai)]))
-
-;; GameTree -> GameTree
-;; Computer calls this function until it is no longer the player
-(define (the-ai-plays tree)
-  (define ratings  (rate-moves tree AI-DEPTH))
-  (define the-move (first (argmax second ratings)))
-  (define new-tree (move-gt the-move))
-  (if (= (game-player new-tree) AI)
-      (the-ai-plays new-tree)
-      new-tree))
-
-;; GameTree Natural -> [List-of (List Move Number)]
-;; assigns a value to each move that is being considered
-;; and return those values in a list
-(define (rate-moves tree depth)
-  (for/list ((move (game-moves tree)))
-    (list move (rate-position (move-gt move) (- depth 1)))))
-
-;; GameTree Natural -> Number
-;; Returns a number that is the best move for the given player.
-(define (rate-position tree depth)
-  (cond [(or (= depth 0) (no-more-moves? tree))
-         (define-values (best w) (winners (game-board tree)))
-         (if (member AI w) (/ 1 (length w)) 0)]
-        [else 
-         (define ratings (rate-moves tree depth))
-         (apply (if (= (game-player tree) AI) max min)
-                (map second ratings))]))
-
-;                                  
-;                                  
-;                                  
-;                                  
-;     ;;                           
-;      ;                           
-;     ; ;   ;;  ;;  ;;  ;;   ;;;;; 
-;     ; ;    ;   ;   ;  ;   ;    ; 
-;     ; ;    ;   ;    ;;     ;;;;  
-;     ;;;    ;   ;    ;;         ; 
-;    ;   ;   ;  ;;   ;  ;   ;    ; 
-;   ;;; ;;;   ;; ;; ;;  ;;  ;;;;;  
-;                                  
-;                                  
-;                                  
-;                                  
-
-;; Natural -> Natural
-;; gets the row that territory is on, indexed from 0
-;; [test vary on current board-size]
-(define (get-row pos)
-  (quotient pos BOARD))
-
-
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;   ;;;;;;;                        ;                 
-;   ;  ;  ;                        ;                 
-;   ;  ;  ;     ;;;      ;;;; ;   ;;;;;;     ;;;; ;  
-;   ;  ;  ;    ;   ;    ;    ;;    ;        ;    ;;  
-;      ;      ;     ;   ;          ;        ;        
-;      ;      ;;;;;;;    ;;;;;     ;         ;;;;;   
-;      ;      ;               ;    ;              ;  
-;      ;       ;    ;   ;     ;    ;    ;   ;     ;  
-;    ;;;;;      ;;;;    ;;;;;;      ;;;;    ;;;;;;   
-;                                                    
-;                                                    
-;                                                    
-;                                 
-
-;; ---------------------------------------------------------------------------------------------------
-
-;; Natural -> Void 
-;; make the board larger 
-(define (set-grid n)
-  (set! BOARD n)
-  (set! GRID (* n n)))
-
-(module+ test 
-  
-  (require rackunit rackunit/text-ui)
-  
-  (define old-size BOARD)
-  (set-grid 2)
-  
-  ;; (-> any) -> void
-  ;; runs the thunk PROP-NUM times
-  (define (check-property t)
-    (test-begin (for ((i 50)) (t))))
-  
-  ;; Properties
-  (define (property:starting-world-playable)
-    (unless (and (<= BOARD 5) (= PLAYER# 2))
-      (error 'starting-world-playable "BOARD-SIZE != 2 or PLAYERS# != 2"))
-    (check-false (no-more-moves-in-world? (create-world-of-dice-and-doom))))
-  
-  (define (property:dice-in-range)
-    (check-true (andmap (λ (b) (>= DICE# (territory-dice b) 1)) (territory-build))
-                "dice out of range"))
-  
-  (define (property:board-correct-size)
-    (check-equal? (length (territory-build)) GRID
-                  "board incorrect-size"))
-  
-  (define (property:no-pass-on-first-move)
-    (define (move-action? m) (equal? (move-action m) '()))
-    (check-true (not (memf move-action? (game-moves (game-tree (territory-build) 0 0))))
-                "no pass on first move"))
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  
-  
-  ;; testing game initialization
-  
-  (check-equal? (territory-index (first (territory-build))) 0)
-  (check-equal? (territory-player (first (territory-build))) 0)
-  (check-equal? (territory-index (second (territory-build))) 1)
-  (check-equal? (territory-player (second (territory-build))) 1)
-  (check-equal? (territory-index (third (territory-build))) 2)
-  (check-equal? (territory-player (third (territory-build))) 0)
-  (check-equal? (territory-index (fourth (territory-build))) 3)
-  (check-equal? (territory-player (fourth (territory-build))) 1)
-  
-  (check-property property:starting-world-playable)
-  (check-property property:board-correct-size)
-  (check-property property:dice-in-range)
-  (check-property property:no-pass-on-first-move)
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  ;; testing territory manipulation
-  
-  ;; legal?
-  (check-true 
-   (and (attackable? (list (territory 0 0 2 9 0) (territory 3 1 1 9 0)) 0 (territory 0 0 2 9 0) 3) #t))
-  (check-false
-   (attackable? (list (territory 0 0 2 9 0) (territory 3 1 1 9 0)) 0 (territory 0 0 2 9 0) 0))
-  (check-false
-   (attackable? (list (territory 0 0 2 9 0) (territory 5 1 1 9 0)) 1 (territory 0 0 2 9 0) 5))
-  
-  ;; get-row
-  (check-equal? (get-row 0) 0)
-  (check-equal? (get-row 1) 0)
-  (check-equal? (get-row 2) 1)
-  (check-equal? (get-row 3) 1)
-  (check-equal? (get-row 12) 6) ;; checks math. actually invalid on board of size 2
-  (check-equal? (get-row 11) 5) ;; checks math. actually invalid on board of size 2
-  (check-equal? (get-row 13) 6) ;; checks math. actually invalid on board of size 2
-  (check-equal? (get-row 14) 7) ;; checks math. actually invalid on board of size 2
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  (define board3 
-    (list (territory 0 1 1 9 0) (territory 1 1 1 8 0) (territory 2 1 3 43.5 5) (territory 3 1 1 6 5)))
-  (define b1+0+3
-    (list (territory 0 0 2 9 0) (territory 1 1 1 8 0) (territory 2 0 2 43.5 5) (territory 3 1 1 6 5)))
-  (define b2+1+2
-    (list (territory 0 0 1 9 0) (territory 1 1 3 8 0) (territory 2 0 2 43.5 5) (territory 3 1 2 6 5)))
-  (define board6
-    (list (territory 0 0 1 9 0) (territory 1 1 2 8 0) (territory 2 0 3 43.5 5) (territory 3 1 2 6 5)))
-  (define bard6+
-    (list (territory 0 0 1 9 0) (territory 1 1 2 8 0) (territory 2 0 3 43.5 5) (territory 3 1 2 6 5)))
-  
-  (define (distribute/list a b c)
-    (define-values (x y) (distribute a b c))
-    (list x y))
-  
-  (define board0 
-    (list (territory 0 0 1 9 0) (territory 1 1 2 8 0) (territory 2 0 2 43.5 5) (territory 3 1 1 6 5)))
-  (define board1 
-    (list (territory 0 0 1 9 0) (territory 1 1 1 8 0) (territory 2 0 1 43.5 5) (territory 3 1 1 6 5)))
-  (define b1+1+2 
-    (list (territory 0 0 1 9 0) (territory 1 1 2 8 0) (territory 2 0 1 43.5 5) (territory 3 1 2 6 5)))
-  (define board2 
-    (list (territory 0 0 1 9 0) (territory 1 1 1 8 0) (territory 2 0 3 43.5 5) (territory 3 1 1 6 5)))
-  
-  (define g-tree1 (game board1 0 (delay '())))
-  (define g-tree2 (game-tree board0 0 0))
-  
-  ; (define world31 (dice-world #f board1 g-tree1))
-  (define world2 (dice-world #f board2 g-tree2))
-  
-  ;; testing book tree
-  
-  (check game-tree=?
-         (game-tree (list (territory 0 0 2 'x 'y) (territory 1 1 1 'a 'b)) 0 0)
-         gt3)
-  
-  ;; testing tree generation
-  
-  (define (property:attack-location-valid)
-    (define moves (game-moves (game-tree (territory-build) 0 0)))
-    (check-true (and (for/and ([m moves])
-                       (define m1 (move-action m))
-                       (member (second m1) (neighbors (first m1))))
-                     #t)
-                "invalid attack location"))
-  
-  (define (property:add-to-territory-always-up-one)
-    (define r (random 10000))
-    (check-equal? (add-dice-to (territory 0 0 r 0 0))
-                  (territory 0 0 (add1 r) 0 0)
-                  "add to territory always up one"))
-  
-  (define (property:attackable?-does-not-need-neighbores-check)
-    (define (check-attackable? gt)
-      (for/and ([move (game-moves gt)]
-                #:when (not (empty? (move-action move))))
-        (define action (move-action move))
-        (define gt (move-gt move))
-        (and (member (second action) (neighbors (first action)))
-             (check-attackable? gt))))
-    
-    ;;start
-    (define testing-gt (dice-world-gt (create-world-of-dice-and-doom)))
-    (check-true (check-attackable? testing-gt) "An attack move between non-neighbores was created")
-    )
-  
-  
-  ;; game-tree
-  (check game-tree=? (game-tree board1 0 0) g-tree1)
-  (check game-tree=? (game-tree board3 1 0) (game board3 1 (delay '())))
-  (check game-tree=? (game-tree board3 0 0) (game board3 0 (delay '())))
-  (check-property property:attackable?-does-not-need-neighbores-check)
-  
-  ;; find-move
-  (define gt0 (game '() 0 (delay '())))
-
-  (check-false (find-move '() '()))
-  (check game-tree=? (find-move (list (move '() gt0)) '()) gt0)
-  ;; Attacking-Moves
-  (check-property property:attack-location-valid)
-  
-  ;; switch-players
-  (check-equal? (switch 0) 1)
-  (check-equal? (switch 1) 0)
-  
-  ;; Add-New-Dice
-  (check-equal? (distribute/list (game-board g-tree1) 0 3) (list 1 (reverse b1+0+3)))
-  (check-equal? (distribute/list (game-board g-tree1) 1 2) (list 0 (reverse b1+1+2)))
-  (check-equal? (distribute/list (game-board g-tree2) 1 2) (list 0 (reverse b2+1+2)))
-  (check-equal? (distribute/list board6 0 0) (list 0 (reverse bard6+)))
-  
-  ;; add-to-territory
-  (check-equal? (add-dice-to (territory 0 1 2 9 0)) (territory 0 1 3 9 0))
-  (check-equal? (add-dice-to (territory 0 1 1 9 0)) (territory 0 1 2 9 0))
-  (check-equal? (add-dice-to (territory 0 1 5 9 0)) (territory 0 1 6 9 0))
-  (check-property property:add-to-territory-always-up-one)
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  (define board7
-    (list (territory 0 0 1 9 0) (territory 1 1 1 8 0) (territory 2 0 2 43.5 5) (territory 3 1 1 6 5)))
-  (define board8
-    (list (territory 0 1 1 9 0) (territory 1 1 1 8 0) (territory 2 0 3 43.5 5) (territory 3 1 1 6 5)))
-  (define board9
-    (list (territory 0 0 1 9 0) (territory 1 1 1 8 0) (territory 2 0 2 43.5 5) (territory 3 0 1 6 5)))
-  (define board10
-    (list (territory 0 0 1 9 0) (territory 1 1 3 8 0) (territory 2 0 2 43.5 5) (territory 3 1 1 6 5)))
-  
-  ;; testing attacks
-  
-  (check-equal? 
-   (execute board7 0 2 1 2)
-   (list (territory 0 0 1 9 0) (territory 1 0 1 8 0) (territory 2 0 1 43.5 5) (territory 3 1 1 6 5)))
-  
-  (check-equal? 
-   (execute board8 0 2 1 3)
-   (list (territory 0 1 1 9 0) (territory 1 0 2 8 0) (territory 2 0 1 43.5 5) (territory 3 1 1 6 5)))
-  
-  (check-equal? 
-   (execute board9 0 2 1 2)
-   (list (territory 0 0 1 9 0) (territory 1 0 1 8 0) (territory 2 0 1 43.5 5) (territory 3 0 1 6 5)))
-  
-  (check-equal?
-   (execute board10 1 1 0 3)
-   (list(territory 0 1 2 9 0) (territory 1 1 1 8 0) (territory 2 0 2 43.5 5) (territory 3 1 1 6 5)))
-  
-  ;; Neighbors
-  (check-equal? (neighbors 2) '(0 3))
-  (check-equal? (neighbors 0) '(3 2 1))
-  (check-equal? (neighbors 1) '(3 0)) 
-  (check-equal? (neighbors 3) '(1 0 2))
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  (define board20
-    (list (territory 0 0 1 9 2) (territory 1 0 1 9 0) (territory 2 2 1 9 0)))
-  (define board21 
-    (list (territory 0 1 1 9 0) (territory 1 1 1 8 0) (territory 2 1 1 43.5 5) (territory 3 1 1 6 5)))
-  
-  ;; testing focus manipulation 
-  ;; interact-with-board
-  (check-equal? 
-   (interact-with-board world2 "\r")
-   (dice-world (territory-index (car (dice-world-board world2))) (dice-world-board world2) g-tree2))
-  
-  (check-equal? (interact-with-board world2 "p") world2)
-  
-  ;; refocus-board-action
-  (check-equal? 
-   (refocus-board (dice-world #f (list (territory 0 0 1 9 0) (territory 0 0 1 9 2)) g-tree1) left)
-   (dice-world #f (list (territory 0 0 1 9 2) (territory 0 0 1 9 0)) g-tree1))
-  
-  (check-equal? 
-   (refocus-board (dice-world #f (list (territory 0 0 1 9 2) (territory 0 1 1 9 0)) g-tree1) right)
-   (dice-world #f (list (territory 0 0 1 9 2) (territory 0 1 1 9 0)) g-tree1))
-  
-  (check-equal? 
-   (refocus-board (dice-world 0 board20 g-tree1) left)
-   (dice-world 0 (list (territory 2 2 1 9 0) (territory 0 0 1 9 2) (territory 1 0 1 9 0)) g-tree1))
-  
-  (check-equal? 
-   (refocus-board (dice-world 0 (list (territory 0 0 1 9 2) (territory 0 1 1 9 0)) g-tree1) left)
-   (dice-world 0 (list  (territory 0 1 1 9 0) (territory 0 0 1 9 2)) g-tree1))
-  
-  (check-equal? 
-   (refocus-board (dice-world 0 (list(territory 0 0 1 9 2) (territory 0 1 1 9 0)) g-tree1) right)
-   (dice-world 0 (list  (territory 0 1 1 9 0) (territory 0 0 1 9 2)) g-tree1))
-  
-  ;;unmark
-  (check-equal? (unmark (dice-world 1 board21 g-tree1)) (dice-world #f board21 g-tree1))
-  
-  (check-equal? (unmark (dice-world 1 (list (territory 0 1 1 9 0) (territory 1 1 1 8 0)) g-tree1))
-                (dice-world #f (list (territory 0 1 1 9 0) (territory 1 1 1 8 0)) g-tree1))
-  (check-equal? (unmark (dice-world 0 (list (territory 0 1 1 9 0)) g-tree1))
-                (dice-world #f (list (territory 0 1 1 9 0)) g-tree1))
-  (check-equal? (unmark (dice-world #f (list (territory 0 1 1 9 0)) g-tree1))
-                (dice-world #f (list (territory 0 1 1 9 0)) g-tree1))
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  (define (winners/list w)
-    (define-values (a b) (winners w))
-    (cons a b))
-  
-  ;; testing functions that determine 'winning' and declare the winner
-  
-  ;; winners
-  (check-equal? (winners/list (list (territory 0 0 1 9 0) (territory 0 0 1 9 1))) (list 2 0))
-  (check-equal? (winners/list (list (territory 0 1 1 9 0) (territory 0 0 1 9 1))) (list 1 1 0))
-  
-  ;; sum-territory
-  (check-equal? (sum-territory (list (territory 0 0 1 9 0) (territory 0 0 1 9 1)) 0) 2)
-  (check-equal? (sum-territory (list (territory 0 0 1 9 0) (territory 0 0 1 9 1)) 1) 0)
-  (check-equal? (sum-territory (list (territory 0 0 1 9 0) (territory 0 0 1 9 1)) 2) 0)
-  (check-equal? (sum-territory (list (territory 0 1 1 9 0) (territory 0 0 1 9 1)) 1) 1)
-  (check-equal? (sum-territory (list (territory 0 1 1 9 0) (territory 0 0 1 9 1)) 0) 1)
-  
-  ;; ---------------------------------------------------------------------------------------------------
-  ;; testing the AI 
-  
-  (define tree0
-    (game-tree (list (territory 0 1 3 0 0)
-                     (territory 1 0 2 0 0)
-                     (territory 2 0 2 0 0) 
-                     (territory 3 0 2 0 0))
-               1 15))
-  
-  (define territory1 (territory 3 0 3 280 262.5))
-  
-  (define board31 
-    (list territory1
-          (territory 2 0 3 150 262.5)
-          (territory 1 1 2 345 150)
-          (territory 0 0 2 215 150)))
-  
-  (define world1 
-    (dice-world #f board31 (game board31 1 (delay '()))))
-  
-  ;; testing the AI functions 
-  
-  ;; MF: one of these two tests should fail! 
-  (check-true (and (attackable? board31 0 territory1 1) #t))
-  (check-true (no-more-moves-in-world? world1))
-  
-  (check-equal? (interact-with-board (dice-world 3 '() '()) "d")
-                (dice-world #f '() '()))
-  
-  (check-equal? (game-board (the-ai-plays tree0))
-                (list (territory 3 1 3 0 0)
-                      (territory 2 0 2 0 0)
-                      (territory 1 0 2 0 0) 
-                      (territory 0 1 2 0 0)))
-  
-  (check-equal? (game-player (the-ai-plays tree0))
-                0)
-  
-  (check-equal? (game-board (move-gt (first (game-moves tree0))))
-                (list (territory 0 1 1 0 0)
-                      (territory 1 0 2 0 0)
-                      (territory 2 0 2 0 0)
-                      (territory 3 1 2 0 0)))
-  
-  (check-equal? (game-player (move-gt (first (game-moves tree0))))
-                1)
-  
-  (check-equal? (rate-position tree0 AI-DEPTH) 1/2)
-  (check-equal? (rate-position (move-gt (first (game-moves tree0))) AI-DEPTH)
-                1/2)
-  
-  (set-grid old-size)
-  "all tests run")
diff --git a/pkgs/realm/chapter13/client.rkt b/pkgs/realm/chapter13/client.rkt
deleted file mode 100644
index e2018886a1..0000000000
--- a/pkgs/realm/chapter13/client.rkt
+++ /dev/null
@@ -1,148 +0,0 @@
-#lang racket
-
-;; the client for distributed Guess my Number
-(require 2htdp/image 2htdp/universe "shared.rkt")
-
-(provide launch-guess-client)
-
-;                                          
-;                                          
-;                                          
-;                                          
-;                                          
-;   ;;;;;;               ;                 
-;    ;    ;              ;                 
-;    ;     ;    ;;;;    ;;;;;;      ;;;;   
-;    ;     ;   ;    ;    ;         ;    ;  
-;    ;     ;        ;    ;              ;  
-;    ;     ;   ;;;;;;    ;         ;;;;;;  
-;    ;     ;  ;     ;    ;        ;     ;  
-;    ;    ;   ;    ;;    ;    ;   ;    ;;  
-;   ;;;;;;     ;;;; ;;    ;;;;     ;;;; ;; 
-;                                          
-;                                          
-;                                          
-;                                          
-
-;; ClientState = String 
-(define ClientState0  "no guess available")
-
-;; Constants
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define TEXT-SIZE 11)
-(define HELP-TEXT 
-  (text "↑ for larger numbers, ↓ for smaller ones" 
-        TEXT-SIZE 
-        "blue"))
-(define HELP-TEXT2 
-  (text "Press = when your number is guessed; q to quit." 
-        TEXT-SIZE 
-        "blue"))
-(define WIDTH (+ (image-width HELP-TEXT2) 10))
-(define HEIGHT 150)
-(define COLOR "red")
-(define SIZE 72)
-(define TEXT-X 3)
-(define TEXT-UPPER-Y 10)
-(define TEXT-LOWER-Y 135)
-(define MT-SC 
-  (place-image/align 
-   HELP-TEXT TEXT-X TEXT-UPPER-Y 
-   "left" "top" 
-   (place-image/align 
-    HELP-TEXT2 
-    TEXT-X TEXT-LOWER-Y "left" "bottom"
-    (empty-scene WIDTH HEIGHT))))
-
-
-;                                          
-;                                          
-;                                          
-;                          ;               
-;                          ;               
-;  ;;;   ;;;                               
-;   ;;   ;;                                
-;   ; ; ; ;     ;;;;     ;;;      ;; ;;;   
-;   ; ; ; ;    ;    ;      ;       ;;   ;  
-;   ; ; ; ;         ;      ;       ;    ;  
-;   ;  ;  ;    ;;;;;;      ;       ;    ;  
-;   ;     ;   ;     ;      ;       ;    ;  
-;   ;     ;   ;    ;;      ;       ;    ;  
-;  ;;;   ;;;   ;;;; ;;  ;;;;;;;   ;;;  ;;; 
-;                                          
-;                                          
-;                                          
-;                                          
-
-
-;; String -> ClientState 
-;; Launch the Client.
-(define (launch-guess-client n host)
-  (big-bang ClientState0
-            (on-draw draw-guess)
-            (on-key handle-keys)
-            (name n)
-            (register host)
-            (on-receive handle-msg)))
-
-;; handle-keys: ClientState Key -> [Package ClientState CtoSMessage] or ClientState 
-;; if the key is "up" or "down", ask the server for a different guess 
-(define (handle-keys w key)
-  (cond [(key=? key "up")   (make-package w "up")]
-        [(key=? key "down") (make-package w "down")]
-        [(key=? key "q")    (stop-with w)]
-        [(key=? key "=")    (stop-with w)]
-        [else w]))
-
-;; handle-msg: ClientState StoCMessage -> ClientState 
-;; if the message is a number, you got a new guess
-(define (handle-msg c msg)
-  (number->string msg))
-
-;; draw-guess: ClientState -> Scene
-;; renders the state as an image 
-(define (draw-guess c)
-  (overlay (text c SIZE COLOR) MT-SC))
-
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;   ;;;;;;;                        ;                 
-;   ;  ;  ;                        ;                 
-;   ;  ;  ;     ;;;      ;;;; ;   ;;;;;;     ;;;; ;  
-;   ;  ;  ;    ;   ;    ;    ;;    ;        ;    ;;  
-;      ;      ;     ;   ;          ;        ;        
-;      ;      ;;;;;;;    ;;;;;     ;         ;;;;;   
-;      ;      ;               ;    ;              ;  
-;      ;       ;    ;   ;     ;    ;    ;   ;     ;  
-;    ;;;;;      ;;;;    ;;;;;;      ;;;;    ;;;;;;   
-;                                                    
-;                                                    
-;                                                    
-;     
-
-(module+ test
-  
-  (require rackunit rackunit/text-ui)
-  
-  ;; testing the client's key-handling
-  
-  (check-equal? (handle-keys "55" "up")   (make-package "55" "up"))
-  (check-equal? (handle-keys "47" "down") (make-package "47" "down"))
-  (check-equal? (handle-keys "10" "=")    (stop-with "10"))
-  (check-equal? (handle-keys "66" "k")    "66")
-  
-  ;; testing the client's message handling
-  
-  (check-equal? (handle-msg "100" 99) "99")
-  (check-equal? (handle-msg "30" -34) "-34")
-  
-  ;; testing the client's rendering function 
-  
-  (check-equal? (draw-guess ClientState0) (overlay (text ClientState0 SIZE COLOR) MT-SC))
-  (check-equal? (draw-guess "50") (overlay (text "50" SIZE COLOR) MT-SC))
-  (check-equal? (draw-guess "25") (overlay (text "25" SIZE COLOR) MT-SC))
-  
-  "client: all tests run")
diff --git a/pkgs/realm/chapter13/readme.txt b/pkgs/realm/chapter13/readme.txt
deleted file mode 100644
index d7055b12a3..0000000000
--- a/pkgs/realm/chapter13/readme.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-
-This chapter implements a distributed version of the "guess my number" game. 
-
-TO PLAY, open the file
-
-	 run.rkt 
-
-in DrRacket. The instructions for playing are at the top of the file. 
-
-TO EXPERIMENT, open the files 
-
-	 -- run.rkt 
-	 -- server.rkt 
-	 -- client.rkt 
-	 -- shared.rkt 
-
-in four different tabs or windows in DrRacket. Switch to the 'run.rkt'
-tab and select 
-
-  View | Show Module browser
-
-to see how these files are related. To switch to one of these four files, 
-you may click the boxes in the module browsers. Alternatively click the 
-tab you wish to work on. It is also possible to select tabs via key
-strokes. 
-
-Each file except for 'run.rkt' comes with test submodules at the bottom of
-the file. 
-
-
diff --git a/pkgs/realm/chapter13/run.rkt b/pkgs/realm/chapter13/run.rkt
deleted file mode 100644
index 2afbe6bcb0..0000000000
--- a/pkgs/realm/chapter13/run.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket
-
-#|
-   The Guess My Number game, a distributed version with a GUI
-   -----------------------------------------------------------
-   
-   You pick a number. The program guesses the nunber, 
-   by asking you questions. Your responses are "too 
-   small" "too large" or "you guessed it". 
-
-   In the Distributed Guess My Number game a player uses a client to connect 
-   to the server. The Server attempts to guess what number the client is thinking
-   of. Each time the server guesses, the client must use the arrow keys to tell
-   the server if it is right, too small, or too large.
-
-   Play
-   ----
-
-   Click Run. Pick a number X between <n> and <m>. 
-   Evaluate 
-     (run)
-   This will pop up three windows: 
- 
-    -- Adam: with instructions for interacting with the program
-
-    -- Universe: the console for the central server 
-        it displays the messages that it receives and sends 
-
-    -- your server's state: a window that displays the server's internal state. 
-
-   Play and watch the two latter window to understand how the server and client 
-   interact in response to your actions. 
-
-   To run the game on two distinct computers: 
-
-     -- copy this folder to another computer, determine its IP number "12.345.67.98"
-     -- open run.rkt 
-     -- evaluate 
-          (launch-guess-server) 
-     
-     -- on your own computer, open run.rkt and run 
-     -- evaluate 
-          (launch-guess-client "12.345.67.98")
-|#
-
-(require 2htdp/universe "client.rkt" "server.rkt")
-
-;; play the game as "Adam" 
-(define (run)
-  (launch-many-worlds (launch-guess-client "Adam" LOCALHOST)
-                      (launch-guess-server)))
-
-;; what happens if two players sign up with the server simultaneously 
-(define (bad)
-  (launch-many-worlds (launch-guess-client "Adam" LOCALHOST) 
-                      (launch-guess-server)
-                      (launch-guess-client "Beatrice" LOCALHOST)))
diff --git a/pkgs/realm/chapter13/server.rkt b/pkgs/realm/chapter13/server.rkt
deleted file mode 100644
index 40735e4612..0000000000
--- a/pkgs/realm/chapter13/server.rkt
+++ /dev/null
@@ -1,182 +0,0 @@
-#lang racket
-
-;; the server for distributed Guess my Number
-
-(provide
- ;; starts the distributed guess my number game
- ;; -> GmNState
- launch-guess-server)
-
-(require 2htdp/image 2htdp/universe "shared.rkt")
-
-;                                          
-;                                          
-;                                          
-;                                          
-;                                          
-;   ;;;;;;               ;                 
-;    ;    ;              ;                 
-;    ;     ;    ;;;;    ;;;;;;      ;;;;   
-;    ;     ;   ;    ;    ;         ;    ;  
-;    ;     ;        ;    ;              ;  
-;    ;     ;   ;;;;;;    ;         ;;;;;;  
-;    ;     ;  ;     ;    ;        ;     ;  
-;    ;    ;   ;    ;;    ;    ;   ;    ;;  
-;   ;;;;;;     ;;;; ;;    ;;;;     ;;;; ;; 
-;                                          
-;                                          
-;                                          
-;                                         
-
-;; A GmNState is one of: 
-;;  -- #f 
-;;  -- GuessRange 
-
-(struct interval (small big) #:transparent)
-;; A GuessRange is (interval Number Number)
-;; always true: (interval l u) means (<= l u)
-
-(define u0 (interval LOWER UPPER))
-
-;                                          
-;                                          
-;                                          
-;                          ;               
-;                          ;               
-;  ;;;   ;;;                               
-;   ;;   ;;                                
-;   ; ; ; ;     ;;;;     ;;;      ;; ;;;   
-;   ; ; ; ;    ;    ;      ;       ;;   ;  
-;   ; ; ; ;         ;      ;       ;    ;  
-;   ;  ;  ;    ;;;;;;      ;       ;    ;  
-;   ;     ;   ;     ;      ;       ;    ;  
-;   ;     ;   ;    ;;      ;       ;    ;  
-;  ;;;   ;;;   ;;;; ;;  ;;;;;;;   ;;;  ;;; 
-;                                          
-;                                          
-;                                          
-;                                          
-
-(define (launch-guess-server)
-  (universe #f
-            (state #t)
-            (on-new connect)
-            (on-msg handle-msg)))
-
-;; GmNState IWorld -> [Bundle GmNState [Listof [Mail IWorld Nat]] [Listof IWorld]]
-;; handles all new connections. It only accepts one connection.
-(define (connect u client)
-  (if (false? u)
-      (make-bundle u0 (list (make-mail client (guess u0))) '())
-      (make-bundle u empty (list client))))
-
-;; GmNState IWorld CtoSMessage -> [Bundle GmNState [List [Mail IWorld Nat]] Empty]
-;; handles a message from the client.
-(define (handle-msg u client msg)
-  (define w (next-interval u msg))
-  (make-bundle w (list (make-mail client (guess w))) '()))
-
-;; GmNState CtoSMessage -> GmNState 
-;; creates the new universe for a responce
-(define (next-interval u msg)
-  (cond [(not (string? msg))   u]
-        [(string=? "up" msg)   (bigger u)]
-        [(string=? "down" msg) (smaller u)]
-        [else u]))
-
-;                                          
-;                                          
-;                                          
-;                                          
-;     ;; ;                                 
-;    ;  ;;                                 
-;   ;       ;;  ;;   ;;;;    ;;;;;   ;;;;; 
-;   ;        ;   ;  ;    ;  ;    ;  ;    ; 
-;   ;  ;;;;  ;   ;  ;;;;;;   ;;;;    ;;;;  
-;   ;    ;   ;   ;  ;            ;       ; 
-;    ;   ;   ;  ;;  ;       ;    ;  ;    ; 
-;     ;;;     ;; ;;  ;;;;;  ;;;;;   ;;;;;  
-;                                          
-;                                          
-;                                          
-;                                          
-
-;; GuessRange -> Boolean
-;; Does the interval represent a single number?
-;; > (single? (interval 1 1))
-;; #t
-(define (single? w)
-  (= (interval-small w) (interval-big w)))
-
-;; GuessRange -> Number
-;; Calculates a guess based on the given interval
-;; > (guess (interval 0 100))
-;; 50
-(define (guess w)
-  (quotient (+ (interval-small w) (interval-big w)) 2))
-
-;; GuessRange -> GuessRange
-;; Recreates a GuessRange that lowers the upper bound
-;; > (smaller (interval 0 100))
-;; (interval 0 50)
-(define (smaller w)
-  (interval (interval-small w) (max (interval-small w) (sub1 (guess w)))))
-
-;; GuessRange -> GuessRange
-;; Recreates a interval that raises the lower bound
-;; > (bigger (0 100)
-;; (interval 51 100)
-(define (bigger w)
-  (interval (min (interval-big w) (add1 (guess w))) (interval-big w)))
-
-
-;                                     
-;                                     
-;                                     
-;                                     
-;    ;                    ;           
-;   ;;;;;   ;;;    ;;;;  ;;;;;   ;;;; 
-;    ;     ;   ;  ;       ;     ;     
-;    ;     ;;;;;   ;;     ;      ;;   
-;    ;     ;         ;    ;        ;  
-;    ;     ;          ;   ;         ; 
-;     ;;;   ;;;;  ;;;;     ;;;  ;;;;  
-;                                     
-;                  
-
-(module+ test 
-  
-  (require rackunit rackunit/text-ui)
-  
-  (define 51-100 (interval 51 100))
-  
-  ;; testing the server's main function 
-  (check-equal? (connect #f iworld1)
-                (make-bundle (interval 0 100) `(,(make-mail iworld1 50)) '()))
-  (check-equal? (handle-msg (interval 0 100) iworld1 "up")
-                (make-bundle 51-100 `(,(make-mail iworld1 (guess 51-100))) '()))
-  
-  
-  ;; testing the server's handlers
-  
-  (check-true (single? (interval 50 50)))
-  (check-false (single? (interval 50 51)))
-  
-  (check-equal? (guess (interval 0 100)) 50)
-  (check-equal? (guess (interval 50 100)) 75)
-  (check-equal? (guess (interval 0 50)) 25)
-  
-  (check-equal? (smaller (interval 0 100)) (interval 0 49))
-  (check-equal? (smaller (interval 0 000)) (interval 0 0))
-  (check-equal? (smaller (interval 0 50)) (interval 0 24))
-  (check-equal? (smaller (interval 50 100)) (interval 50 74))
-  (check-equal? (smaller (bigger (bigger (interval 0 100))))
-                (interval 76 87))
-  
-  (check-equal? (bigger (interval 0 100)) (interval 51 100))
-  (check-equal? (bigger (interval 0 000)) (interval 0 0))
-  (check-equal? (bigger (interval 0 100)) (interval 51 100))
-  (check-equal? (bigger (interval 51 100)) (interval 76 100))
-  (check-equal? (bigger (interval 0 50)) (interval 26 50))
-  
-  "server: all tests run")
diff --git a/pkgs/realm/chapter13/shared.rkt b/pkgs/realm/chapter13/shared.rkt
deleted file mode 100644
index fd2db90dbc..0000000000
--- a/pkgs/realm/chapter13/shared.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket
-
-;; This module describes the shared vocabulary and knowledge for the server 
-;; and client modules of the distributed Guess My Number game. 
-
-#|
- Message Formats 
- ---------------
-
- StoCMessage is the set of numbers between LOWER and UPPER (inclusive). 
- The numbers represent the guess. 
-
- CtoSMessage is one of the following two strings: 
-   -- "up"
-   -- "down" 
- with the obvious meaning. 
-
-
- Message Exchanges
- -----------------
-
-  server      client 
-    |             |    
-    | register    |    
-    |<------------|    
-    |             | 
-    |             | <----- guess ("up", "down")
-    | CtoSMessage | 
-    |<------------|
-    |             | 
-    | StoCMessage | 
-    |------------>|
-    |             | 
-    |             |
-|#
-
-
-(provide
- ;; the to-be-guessed number must be in [LOWER,UPPER]
- UPPER
- LOWER)
-
-;                                          
-;                                          
-;                                          
-;                                          
-;                                          
-;   ;;;;;;               ;                 
-;    ;    ;              ;                 
-;    ;     ;    ;;;;    ;;;;;;      ;;;;   
-;    ;     ;   ;    ;    ;         ;    ;  
-;    ;     ;        ;    ;              ;  
-;    ;     ;   ;;;;;;    ;         ;;;;;;  
-;    ;     ;  ;     ;    ;        ;     ;  
-;    ;    ;   ;    ;;    ;    ;   ;    ;;  
-;   ;;;;;;     ;;;; ;;    ;;;;     ;;;; ;; 
-;                                          
-;                                          
-;                                          
-;                                          
-
-;; prefined upper and lower limits for a game.
-(define UPPER 100)
-(define LOWER 0)
diff --git a/pkgs/realm/chapter14/client.rkt b/pkgs/realm/chapter14/client.rkt
deleted file mode 100644
index 52305a1382..0000000000
--- a/pkgs/realm/chapter14/client.rkt
+++ /dev/null
@@ -1,611 +0,0 @@
-#lang racket
-
-;; This module implements the client for the Hungry Henry game
-
-(provide 
- lets-eat ;; String String[IP Address] -> Meal
- ;; launch single client and register at specified host 
- )
-
-(require "shared.rkt" 2htdp/universe 2htdp/image)
-
-;                                     
-;                                     
-;                                     
-;   ;   ;                             
-;   ;   ;                             
-;   ;   ;   ;;;   ; ;;   ; ;;;  ;   ; 
-;   ;   ;  ;   ;  ;;  ;  ;;  ;  ;   ; 
-;   ;;;;;  ;   ;  ;   ;  ;       ;  ; 
-;   ;   ;  ;;;;;  ;   ;  ;       ; ;  
-;   ;   ;  ;      ;   ;  ;       ; ;  
-;   ;   ;  ;      ;   ;  ;        ;   
-;   ;   ;   ;;;;  ;   ;  ;        ;   
-;                                 ;   
-;                               ;;    
-;                                     
-
-
-;; Image Constants
-(define FOOD-IMG (bitmap "graphics/cupcake.gif"))
-(define PLAYER-IMG (bitmap "graphics/hungry-henry.gif"))
-(define BASE (empty-scene WIDTH HEIGHT))
-(define WAYPOINT-NODE (circle 3 'solid 'black))
-;; Color Constants
-(define PLAYER-COLOR "red")
-(define MY-COLOR "blue")
-(define WAYPOINT-COLOR "green")
-;; Text Constants
-(define LOADING... "Waiting For Server")
-(define TEXT-SIZE 20)
-(define SCORE-SIZE 20)
-(define TEXT-COLOR "black")
-(define END-OPEN-TEXT "your score was: ")
-(define END-CLOSE-TEXT ", the winner was player ")
-(define LOADING-OPEN-TEXT "\nYou are ")
-(define SEPERATOR ": ")
-;; PBAR constants
-(define PBAR-HEIGHT 35)
-(define PBAR-LOC (- HEIGHT PBAR-HEIGHT))
-(define PBAR-COLOR "red")
-(define PBAR-TEXT (text "loading..." 20 "black"))
-;; Message ID Constants
-(define UPDATE-LENGTH 3)
-(define SPLAYER-LENGTH 3)
-(define SBODY-LENGTH 2)
-(define END-LENGTH 2)
-(define SCORE-LIST-LENGTH 2)
-;; Init Constants
-(define ZERO% 0)
-(define LOADING (text LOADING... 20 "black"))
-
-;; -----------------------------------------------------------------------------
-;; State of Client 
-
-(struct app (id img countdown) #:transparent)
-(struct entree (id players food) #:transparent)
-
-;; Meal is one of
-;; - Appetizer
-;; - Entree
-;; Appetizer = (app [or Id #f] Image Number∈[0,1])
-;; interpretation: 
-;; -- the first field is this players id, #f if it hasnt been sent yet
-;; -- the second is the loading image
-;; -- the third is the %%% of loading time passed, represents the loading state
-;; Entree     = (entree Id [Listof Feaster] [Listof Food])
-;; interpretation: 
-;; -- the first field is this player's id
-;; -- the second field represents complete information about all players
-;; -- the third field specifies the location of the cupcakes 
-
-(define INITIAL (app #f LOADING ZERO%))
-
-;                                          
-;                                          
-;                                          
-;                           ;              
-;                           ;              
-;  ;;;    ;;;                              
-;   ;;    ;;                               
-;   ; ;  ; ;    ;;;;      ;;;     ;; ;;;   
-;   ; ;  ; ;   ;    ;       ;      ;;   ;  
-;   ; ;  ; ;        ;       ;      ;    ;  
-;   ;  ;;  ;   ;;;;;;       ;      ;    ;  
-;   ;  ;;  ;  ;     ;       ;      ;    ;  
-;   ;      ;  ;     ;       ;      ;    ;  
-;   ;      ;  ;    ;;       ;      ;    ;  
-;  ;;;    ;;;  ;;;; ;;   ;;;;;;;  ;;;  ;;; 
-;                                          
-;                                          
-;                                          
-;                                          
-;                                          
-
-(define (lets-eat label server)
-  (big-bang INITIAL
-            (to-draw render-the-meal)
-            (on-mouse set-waypoint)
-            (on-receive handle-server-messages)
-            (register server)
-            (name label)))
-
-;; Meal Message -> Meal
-;; handles incomming messages
-(define (handle-server-messages meal msg)
-  (cond [(app? meal) (handle-appetizer-message meal msg)]
-        [(entree? meal) (handle-entree-message meal msg)]))
-
-;; Meal Number Number MouseEvent -> Meal
-;; handles what happends on a click
-(define (set-waypoint meal x y event)
-  (if (and (entree? meal) (string=? event "button-down"))
-      (make-package meal (list GOTO x y))
-      meal))
-
-;; Meal -> Image
-;; deals with draw some kind of meal
-(define (render-the-meal meal)
-  (cond [(app? meal)   (render-appetizer meal)]
-        [(entree? meal) (render-entree meal)]))
-
-;                                                   
-;                                                   
-;                                                   
-;   ;;;;                          ;                 
-;   ;   ;                                           
-;   ;   ;   ;;;    ;;;;   ;;;   ;;;   ;     ;  ;;;  
-;   ;   ;  ;   ;  ;      ;   ;    ;    ;   ;  ;   ; 
-;   ;;;;   ;   ;  ;      ;   ;    ;    ;   ;  ;   ; 
-;   ;  ;   ;;;;;  ;      ;;;;;    ;    ;; ;;  ;;;;; 
-;   ;  ;   ;      ;      ;        ;     ; ;   ;     
-;   ;   ;  ;      ;      ;        ;     ; ;   ;     
-;   ;   ;   ;;;;   ;;;;   ;;;;    ;      ;     ;;;; 
-;                                                   
-;                                                   
-;                                                   
-
-;; -----------------------------------------------------------------------------
-;; Appetizer
-
-;; Appetizer Message -> Meal
-;; starts the game if the message is valid
-(define (handle-appetizer-message s msg)
-  (cond [(id? msg)    (app msg (app-img s) (app-countdown s))]
-        [(time? msg)  (app (app-id s) (app-img s) msg)]
-        [(state? msg) (switch-to-entree s msg)]
-        ;; fault tolerant 
-        [else s]))
-
-;; Appetizer State -> Meal 
-(define (switch-to-entree s m)
-  (apply entree (app-id s) (rest m)))
-
-;; -----------------------------------------------------------------------------
-;; Appetizer
-
-;; Entree Message -> Meal
-;; either updates the world or ends the game
-(define (handle-entree-message s msg)
-  (cond [(state? msg) (update-entree s msg)]
-        [(score? msg) (restart s msg)]
-        [else s]))
-
-;; Entree State -> Entree
-;; creates a new entree based on the update mesg
-(define (update-entree s state-msg)
-  (apply entree (entree-id s) (rest state-msg)))
-
-;; Entree EndMessage -> Appetizer
-;; Tranistion to start state
-(define (restart s end-msg)
-  (define score-image (render-scores end-msg))
-  (app (entree-id s) (above LOADING score-image) ZERO%))
-
-;; -----------------------------------------------------------------------------
-;; predicates for recognizing network messages 
-
-;; Message -> Boolean
-;; checks if message is a valid update message
-(define (state? msg)
-  (and (list? msg)
-       (= UPDATE-LENGTH (length msg))
-       (symbol? (first msg))
-       (list? (second msg))
-       (list? (third msg))
-       (symbol=? SERIALIZE (first msg))
-       (andmap player? (second msg))
-       (andmap body? (third msg))))
-
-;; Message -> Boolean
-;; checks if message is a valid time message
-(define (time? msg)
-  (and (real? msg) (<= 0 msg 1)))
-
-;; Message -> Boolean
-;; checks if is end game message
-(define (score? msg)
-  (and (list? msg)
-       (= END-LENGTH (length msg))
-       (symbol? (first msg))
-       (list? (second msg))
-       (symbol=? SCORE (first msg))
-       (score-list? (second msg))))
-
-;; List -> Boolean
-;; is this a list binding names to scores?
-(define (score-list? l)
-  (for/and ([s l])
-    (and (list? s)
-         (= SCORE-LIST-LENGTH (length s))
-         (id? (first s))
-         (number? (second s)))))
-
-;                                                                        
-;                                                                        
-;                                                                        
-;                                               ;                        
-;                                               ;                        
-;   ;;;;;;                                                               
-;    ;    ;                                                              
-;    ;     ;   ;;  ;;     ;;;;   ;;;     ;;   ;;;     ;; ;;;      ;;; ;; 
-;    ;     ;    ;;;  ;   ;    ;   ;       ;     ;      ;;   ;    ;   ;;  
-;    ;     ;    ;             ;   ;   ;   ;     ;      ;    ;   ;     ;  
-;    ;     ;    ;        ;;;;;;    ;  ;  ;      ;      ;    ;   ;     ;  
-;    ;     ;    ;       ;     ;    ; ; ; ;      ;      ;    ;   ;     ;  
-;    ;     ;    ;       ;     ;    ; ; ; ;      ;      ;    ;   ;     ;  
-;    ;    ;     ;       ;    ;;    ; ; ; ;      ;      ;    ;    ;   ;;  
-;   ;;;;;;     ;;;;;;    ;;;; ;;    ;   ;    ;;;;;;;  ;;;  ;;;    ;;; ;  
-;                                                                     ;  
-;                                                                    ;;  
-;                                                                ;;;;    
-;                                                                        
-;                                                                        
-
-;; -----------------------------------------------------------------------------
-;; Appetizer Drawing
-
-;; Appetizer -> Image
-;; tells the player that we're waiting for the server. shows id
-(define (render-appetizer app)
-  (add-progress-bar (render-id+image app) (app-countdown app)))
-
-;; Image Number∈[0,1] -> Image
-;; draws the progress bar 
-(define (add-progress-bar base count)
-  (place-image (render-progress count) (/ WIDTH 2) PBAR-LOC base))
-
-;; Number∈[0,1] -> Image
-;; draw a progress bar that is count percent complete
-(define (render-progress count)
-  (overlay PBAR-TEXT (rectangle (* count WIDTH) PBAR-HEIGHT "solid" PBAR-COLOR)))
-
-;; Appetizer -> Image
-;; gets the text to display on the loading screen
-(define (render-id+image app)
-  (define id (app-id app))
-  (define base-image (app-img app))
-  (overlay
-   (cond
-     [(boolean? id) base-image]
-     [else (define s (string-append LOADING-OPEN-TEXT id))
-           (above base-image (text s TEXT-SIZE TEXT-COLOR))])
-   BASE))
-
-;; -----------------------------------------------------------------------------
-;; Entree Drawing
-
-;; Entree -> Image
-;; draws a Entree
-(define (render-entree entree)
-  (define id (entree-id entree))
-  (define pl (entree-players entree))
-  (define fd (entree-food entree))
-  (add-path id pl (add-players id pl (add-food fd BASE))))
-
-;; [Listof Food] Image -> Image
-;; draws all the food
-(define (add-food foods base-scene)
-  (for/fold ([scn base-scene]) ([f foods])
-    (place-image FOOD-IMG (body-x f) (body-y f) scn)))
-
-;; Id [Listof Feaster] Image -> Image
-;; draws all players
-(define (add-players id lof base-scene)
-  (for/fold ([scn base-scene]) ([feaster lof])
-    (place-image (render-avatar id feaster)
-                 (feaster-x feaster) (feaster-y feaster)
-                 scn)))
-
-;; Id Feaster -> Image
-;; gets an image for the player
-(define (render-avatar id player)
-  (define size (body-size (player-body player)))
-  (define color
-    (if (id=? id (player-id player)) MY-COLOR PLAYER-COLOR))
-  (above
-   (render-text (player-id player))
-   (overlay (render-player-score player) 
-            PLAYER-IMG
-            (circle size 'outline color))))
-
-;; Feaster -> Image
-;; Draw the players score
-(define (render-player-score player)
-  (render-text (number->string (get-score (body-size (player-body player)))))) 
-
-;; Id [Listof Feaster] Image -> Image
-;; draws the path of the player whose id is passed in
-(define (add-path id players base-scene)
-  (define player 
-    (findf (lambda (x) (id=? id (player-id x))) players))
-  (if (boolean? player)
-      base-scene
-      (add-waypoint* player base-scene)))
-
-;; Feaster Image -> Image
-;; draws the list of way points to the scene
-(define (add-waypoint* player base-scene)
-  (define loc  (body-loc (player-body player)))
-  (define ways (player-waypoints player))
-  (define-values (resulting-scene _)
-    (for/fold ([scn base-scene][from loc]) ([to ways])
-      (values (add-waypoint from to scn) to)))
-  resulting-scene)
-
-;; Complex Complex Image -> Image
-;; Add a waypoint to the scene at those coordinates
-(define (add-waypoint from to s)
-  (define x-from (real-part from))
-  (define y-from (imag-part from))
-  (define x-to (real-part to))
-  (define y-to (imag-part to))
-  (define with-line (add-line s x-to y-to x-from y-from WAYPOINT-COLOR))
-  (place-image WAYPOINT-NODE x-to y-to with-line))
-
-;; -----------------------------------------------------------------------------
-;; render the end 
-
-;; Score -> Image
-;; draws the end of the game
-(define (render-scores msg)
-  (define scores (sort (second msg) < #:key second))
-  (for/fold ([img empty-image]) ([name-score scores])
-    (define txt (get-text name-score))
-    (above (render-text txt) img)))
-
-;; (list ID Natural) -> string
-;; builds a string for that winning pair
-(define (get-text name-score)
-  (define-values (name score) (apply values name-score))
-  (string-append name SEPERATOR (number->string score)))
-
-
-;                                
-;                                
-;                                
-;                                
-;                                
-;   ;;;;;                        
-;      ;;                        
-;     ;  ;    ;;   ;;   ;;;  ;;; 
-;     ;  ;     ;    ;    ;    ;  
-;     ;  ;     ;    ;     ;  ;   
-;    ;    ;    ;    ;      ;;    
-;    ;;;;;;    ;    ;      ;;    
-;    ;    ;    ;    ;     ;  ;   
-;   ;      ;   ;   ;;    ;    ;  
-;  ;;;    ;;;   ;;; ;;  ;;;  ;;; 
-;                                
-;                                
-;                                
-;                                
-;                                
-
-;; String -> Image
-;; draws the text
-(define (render-text txt)
-  (text txt TEXT-SIZE TEXT-COLOR))
-
-;; player -> Number 
-;; Gets the X coord of a entrees
-(define (feaster-x feaster)
-  (body-x (player-body feaster)))
-
-;; player -> Number 
-;; Gets the Y coord of a entrees
-(define (feaster-y feaster)
-  (body-y (player-body feaster)))
-
-;; body -> Number
-;; gets the X coord of a body
-(define (body-x body)
-  (real-part (body-loc body)))
-
-;; body -> Number
-;; gets the Y coord of a body
-(define (body-y body)
-  (imag-part (body-loc body)))
-
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;   ;;;;;;;;;                       ;                
-;   ;   ;   ;                       ;                
-;   ;   ;   ;   ;;;;     ;;;; ;   ;;;;;;;    ;;;; ;  
-;   ;   ;   ;  ;    ;   ;    ;;     ;       ;    ;;  
-;       ;     ;      ;  ;           ;       ;        
-;       ;     ;;;;;;;;   ;;;;;      ;        ;;;;;   
-;       ;     ;               ;     ;             ;  
-;       ;     ;               ;     ;             ;  
-;       ;      ;     ;  ;     ;     ;    ;  ;     ;  
-;     ;;;;;     ;;;;;   ;;;;;;       ;;;;   ;;;;;;   
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-
-(module+ test 
-  
-  (require rackunit rackunit/text-ui)
-  
-  ;; testing main client
-  (check-equal? (switch-to-entree (app "foo" 'blah 1) '(STATE () ()))
-                (entree "foo" '()'()))
-  (check-equal? (handle-server-messages (app #f 'ksajfhsdkjhfr 1) .5) 
-                (handle-appetizer-message (app #f 'ksajfhsdkjhfr 1) .5))
-  ;;dispatch-mouse
-  (check-equal? (set-waypoint (app 1 LOADING 0) 1 1 "button-down")
-                (app 1 LOADING 0))
-  (check-equal? (set-waypoint (app 1 LOADING 0) 1 1 "button-up")
-                (app 1 LOADING 0))
-  (check-equal? (set-waypoint (app #f LOADING 0) 1 1 "button-down")
-                (app #f LOADING 0))
-  (check-equal? (set-waypoint (app #f LOADING 0) 1 1 "button-up")
-                (app #f LOADING 0))
-  (check-equal? (set-waypoint (entree "player1" (list (player "player1" (body 1 1+1i) empty)) empty) 1 1 "button-up")
-                (entree "player1" (list (player "player1" (body 1 1+1i) empty)) empty))
-  (check-equal? (set-waypoint (entree "player1" (list (player "player1" (body 1 1+1i) empty)) empty)
-                              1 1 "button-down")
-                (make-package (entree "player1" (list (player "player1" (body 1 1+1i) empty)) empty)
-                              (list 'goto 1 1)))
-  ;;render-the-meal
-  
-  ;; testing message receipt
-  ;; app-may-start
-  ;; entree-msg
-  ;; update-msg?
-  
-  (check-true (state? `(,SERIALIZE (,(player "player1" (body 1+4i 234) `()) ,(player "player1" (body 3 3) `()))
-                                   (,(body 1+i 2) ,(body 2 2)))))
-  (check-true (state? `(,SERIALIZE (,(player "player1" (body 1+4i 234) `()))
-                                   (,(body 1+i 2) ,(body 2 2)))))
-  (check-true (state? `(,SERIALIZE ()
-                                   (,(body 1+i 2) ,(body 2 2)))))
-  (check-true (state? `(,SERIALIZE (,(player "player1" (body 1+4i 234) `()) ,(player "player1" (body 3 3) `()))
-                                   ())))
-  
-  (check-false (state? `(,SERIALIZE (("player1" (1+4i 234) ()) ("player1" (3 3) ()))
-                                    ((1+i 2) (2 2)))))
-  (check-false (state? `(,SERIALIZE (("player1" (1+4i 234) ()))
-                                    ((1+i 2) (2 2)))))
-  (check-false (state? `(,SERIALIZE ()
-                                    ((1+i 2) (2 2)))))
-  (check-false (state? `(,SERIALIZE (("player1" (1+4i 234) ()) ("player1" (3 3) ()))
-                                    ())))
-  (check-true (state? `(,SERIALIZE ()
-                                   ())))
-  (check-false (state? `(,SERIALIZE (("player1" (1+4i 234) ()) ("player1" (3 3) ()))
-                                    ((1+i 2) (2 2)))))
-  (check-false (state? `(,SERIALIZE (("player1" (1+4i 234) ()))
-                                    ((1+i 2) (2 2)))))
-  (check-false (state? `(,SERIALIZE ()
-                                    ((1+i 2) (2 2)))))
-  (check-false (state? `(,SERIALIZE (("player1" (1+4i 234) ()) ("player1" (3 3) ()))
-                                    ())))
-  
-  (check-false (state? '(u ((1 1+4i 234))
-                           ((1+i 2) (2 2)))))
-  (check-false (state? '(((1 1+4i 234))
-                         ((1+i 2) (2 2)))))
-  (check-false (state? '(u ((1 1+4i))
-                           ((1+i 2) (2 2)))))
-  (check-false (state? '(u ((1 1+4i 234))
-                           ((1+i 2) (2 b)))))
-  (check-false (state? '(u ((1 1+4i 234)))))
-  (check-false (state? '(u ((1+i 2) (2 2)))))
-  (check-false (state? '(((1+i 2) (2 2)))))
-  (check-false (state? 4))
-  (check-false (state? 'f))
-  ;; score-list?
-  (check-true (score-list? '(("s" 0) ("l" 0) ("sdf" 0))))
-  (check-true (score-list? empty))
-  (check-true (score-list? '(("s" 0) ("l" 0))))
-  (check-false (score-list? '(('s 0) ('l 0) ('sdf 0))))
-  (check-false (score-list? '((s 0) (l 0))))
-  (check-false (score-list? '((s) (l))))
-  (check-false (score-list? '((s 0) (l 0))))
-  ;; update-entree
-  (check-equal? (update-entree (entree "player10" '() '())
-                               `(s (,(player "player1" (body 10 10) `(3 4+9i))
-                                    ,(player "player10" (body 103 10+4i) `(3 5+78i)))
-                                   (,(body 5 10) ,(body 30 30))))
-                (entree "player10" (list (player "player1" (body 10 10) (list 3 4+9i))
-                                         (player "player10" (body 103 10+4i) (list 3 5+78i)))
-                        (list (body 5 10) (body 30 30))))
-  
-  
-  ;; testing rendering the client 
-  
-  ;; draw-app
-  (check-equal? (render-appetizer (app #f LOADING 0))
-                (add-progress-bar (overlay LOADING
-                                           BASE)
-                                  0))
-  ;; draw-entree
-  
-  
-  ;; draw-players
-  
-  (check-equal? (add-players "player0" 
-                             (list (player "player1" (body 40 23+34i) empty)
-                                   (player "player0" (body 50 1+3i) empty))
-                             BASE)
-                (place-image (render-avatar "player0" (player "player0" (body 50 1+3i) empty))
-                             1 3
-                             (place-image (render-avatar "player0" (player "player1" (body 40 23+34i) empty))
-                                          23 34
-                                          BASE)))
-  (check-equal? (add-players "player0"
-                             (list (player "player1" (body 40 23+34i) empty))
-                             BASE)
-                (place-image (render-avatar "player0" (player "player1" (body 40 23+34i) empty))
-                             23 34
-                             BASE))
-  
-  ;; draw-player
-  
-  ;; get-player-image
-  (check-equal? (render-avatar "player0" (player "player0" (body 30 1+3i) empty))
-                (above (render-text "player0")
-                       (overlay (text (number->string (get-score 30)) 20 'black)
-                                PLAYER-IMG (circle 30 "outline" MY-COLOR))))
-  (check-equal? (render-avatar "player0" (player "player1" (body 30 1+3i) empty))
-                (above (render-text "player1")
-                       (overlay (text (number->string (get-score 30)) 20 'black)
-                                PLAYER-IMG (circle 30 "outline" PLAYER-COLOR))))
-  
-  ;; draw-food
-  (check-equal? (add-food (list (body 34 54+3i)
-                                (body 9 45+23i))
-                          BASE)
-                (place-image FOOD-IMG
-                             45 23
-                             (place-image 
-                              FOOD-IMG
-                              54 3
-                              BASE)))
-  (check-equal? (add-food (list (body 34 54+3i))
-                          BASE)
-                (place-image 
-                 FOOD-IMG
-                 54 3
-                 BASE))
-  
-  
-  ;; testing auxiliary functions 
-  ;; player-x
-  (check-equal? (feaster-x (player 20 (body 3 1+3i) empty))
-                1)
-  (check-equal? (feaster-x (player 20 (body 3 4+3i) empty))
-                4)
-  (check-equal? (feaster-x (player 20 (body 3 4+67i) empty))
-                4)
-  ;; player-y
-  (check-equal? (feaster-y (player 20 (body 3 1+3i) empty))
-                3)
-  (check-equal? (feaster-y (player 20 (body 3 4+3i) empty))
-                3)
-  (check-equal? (feaster-y (player 20 (body 3 4+67i) empty))
-                67)
-  
-  ;; body-x
-  (check-equal? (body-x (body 20  1+2i))
-                1)
-  (check-equal? (body-x (body 20  4+2i))
-                4)
-  (check-equal? (body-x (body 20  3+2i))
-                3)
-  ;; body-y
-  (check-equal? (body-y (body 20  4+1i))
-                1)
-  (check-equal? (body-y (body 20  1+4i))
-                4)
-  (check-equal? (body-y (body 20  3))
-                0)
-  
-  "client: all tests run")
-
diff --git a/pkgs/realm/chapter14/graphics/cupcake.gif b/pkgs/realm/chapter14/graphics/cupcake.gif
deleted file mode 100644
index 20b1bef49d..0000000000
Binary files a/pkgs/realm/chapter14/graphics/cupcake.gif and /dev/null differ
diff --git a/pkgs/realm/chapter14/graphics/hungry-henry.gif b/pkgs/realm/chapter14/graphics/hungry-henry.gif
deleted file mode 100644
index cce694858f..0000000000
Binary files a/pkgs/realm/chapter14/graphics/hungry-henry.gif and /dev/null differ
diff --git a/pkgs/realm/chapter14/readme.txt b/pkgs/realm/chapter14/readme.txt
deleted file mode 100644
index 042b0f45e7..0000000000
--- a/pkgs/realm/chapter14/readme.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-This chapter implements a distributed game, dubbed "Hungry Henry." 
-
-TO PLAY, open the file
-
-	 run.rkt 
-
-in DrRacket. The instructions for playing are at the top of the file. 
-
-TO EXPERIMENT, open the files 
-
-	 -- run.rkt 
-	 -- server.rkt 
-	 -- client.rkt 
-	 -- shared.rkt 
-
-in four different tabs or windows in DrRacket. Switch to the 'run.rkt'
-tab and select 
-
-  View | Show Module browser
-
-to see how these files are related. To switch to one of these four files, 
-you may click the boxes in the module browsers. Alternatively click the 
-tab you wish to work on. It is also possible to select tabs via key
-strokes. 
-
-Each file except for 'run.rkt' comes with test submodules at the bottom of
-the file. 
-
-
diff --git a/pkgs/realm/chapter14/run.rkt b/pkgs/realm/chapter14/run.rkt
deleted file mode 100644
index 4a244b75a1..0000000000
--- a/pkgs/realm/chapter14/run.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket
-
-#|
-   Hungry Henry, a multi-player, distributed game 
-   -----------------------------------------------
-
-   This game is a multi-player competition for cupcakes. Each player owns an 
-   avatar, called a "Henry", and competes for a limited number of cupcakes,
-   distributed over a rectangular space. A player launches her Henry via 
-   a series of mouse clicks, so-called waypoints. Her Henry moves from waypoint
-   to waypoint. If it gets close enough to a cupcake, he eats the cupcake and 
-   fattens up. As a Henry fattens up, he slows down. When all cupcakes are 
-   consumed, the fattest Henry wins. 
-
-   Notes: 
-   1. The cupcakes remain in place until they are eaten. 
-   2. Once a waypoiny is recorded, it cannot be removed. 
-   3. Waypoints are visited in a first-come, first-serve order. 
-
-   Play
-   ----
-
-   Click Run. Evaluate 
-
-     (serve-dinner)
-
-   in the Interactions Panel. This will pop up three windows: 
-    -- Matthias, a game window 
-    -- David, another game window 
-    -- Universe, the game server's console
-
-   Play. You can play the part of both participants. Alternatively, click 
-   the David or Matthias window (to obtain focus) and click again to choose
-   a way point for David's or Matthias's "hungry henry". Watch the hungry 
-   henries go for the cup cake and eat them up. You can make either one of them 
-   win or you can force a tie. 
-
-   To run the game on two distinct computers: 
-
-     -- copy this folder to another computer, determine its IP number "12.345.67.98"
-     -- open run.rkt 
-     -- evaluate 
-          (bon-appetit)
-     
-     -- on your own computer, open run.rkt and run 
-     -- evaluate 
-          (lets-eat SomeNameAsAString "12.345.67.98")
-|#
-
-(require (only-in "server.rkt" bon-appetit)
-         (only-in "client.rkt" lets-eat)
-         2htdp/universe)
-
-;; launch server worlds for playtesting
-(define (serve-dinner)
-  (launch-many-worlds
-   (bon-appetit)
-   (lets-eat "Matthias" LOCALHOST)
-   (lets-eat "David"    LOCALHOST)))
diff --git a/pkgs/realm/chapter14/server.rkt b/pkgs/realm/chapter14/server.rkt
deleted file mode 100644
index c1d1e92e6f..0000000000
--- a/pkgs/realm/chapter14/server.rkt
+++ /dev/null
@@ -1,990 +0,0 @@
-#lang racket
-
-;; This module implements the server for the Hungry Henry game
-
-(provide 
- bon-appetit ;; -> Void 
- ;; launch the server for Hungry Henry 
- )
-
-(require "shared.rkt" 2htdp/universe) 
-
-#| -----------------------------------------------------------------------------
-The server is responsible for: 
--- starting the game 
--- moving Henrys 
--- have Henrys eat, remove food on collision 
--- collecting and broadcasting information about the movement of players
--- ending games
-|#
-
-;                                                                                      
-;                                                                                      
-;                                                                                      
-;   ;   ;                                            ;   ;                             
-;   ;   ;                                            ;   ;                             
-;   ;   ;  ;   ;  ; ;;    ;; ;  ; ;;;  ;   ;         ;   ;   ;;;   ; ;;   ; ;;;  ;   ; 
-;   ;   ;  ;   ;  ;;  ;  ;  ;;  ;;  ;  ;   ;         ;   ;  ;   ;  ;;  ;  ;;  ;  ;   ; 
-;   ;;;;;  ;   ;  ;   ;  ;   ;  ;       ;  ;         ;;;;;  ;   ;  ;   ;  ;       ;  ; 
-;   ;   ;  ;   ;  ;   ;  ;   ;  ;       ; ;          ;   ;  ;;;;;  ;   ;  ;       ; ;  
-;   ;   ;  ;   ;  ;   ;  ;   ;  ;       ; ;          ;   ;  ;      ;   ;  ;       ; ;  
-;   ;   ;  ;  ;;  ;   ;  ;  ;;  ;        ;           ;   ;  ;      ;   ;  ;        ;   
-;   ;   ;   ;; ;  ;   ;   ;; ;  ;        ;           ;   ;   ;;;;  ;   ;  ;        ;   
-;                            ;           ;                                         ;   
-;                         ;;;          ;;                                        ;;    
-;                                                                                      
-
-
-;; Init Constants
-(define TICK .1)
-(define PLAYER-LIMIT 2)
-(define START-TIME 0)
-(define WAIT-TIME 250)
-
-(define FOOD*PLAYERS 5)
-
-(define WEIGHT-FACTOR 2.1)
-(define BASE-SPEED (/ (expt PLAYER-SIZE 2) WEIGHT-FACTOR))
-
-;; Data Definitions 
-(struct join (clients [time #:mutable]) #:transparent)
-(struct play (players food spectators) #:transparent #:mutable)
-
-;; plus some update primitives: 
-
-;; JoinUniverse Player -> JoinUniverse
-(define (join-add-player j new-p)
-  (join (cons new-p (join-clients j)) (join-time j)))
-
-;; PlayUniverse IP -> PlayUniverse
-(define (play-add-spectator pu new-s)
-  (define players (play-players pu))
-  (define spectators (play-spectators pu))
-  (play players (play-food pu) (cons new-s spectators)))
-
-;; PlayUniverse IWorld -> PlayUniverse
-;; removes player that uses iworld
-(define (play-remove p iw)
-  (define players (play-players p))
-  (define spectators (play-spectators p))
-  (play (rip iw players) (play-food p) (rip iw spectators)))
-
-;; JoinUniverse IWorld -> JoinUniverse 
-;; removes players and spectators that use iw from this world 
-(define (join-remove j iw)
-  (join (rip iw (join-clients j)) (join-time j)))
-
-;; IWorld [Listof Player] -> [Listof Player]
-;; remove player that contains the given IWorld 
-(define (rip iw players)
-  (remove iw players (lambda (iw p) (iworld=? iw (ip-iw p)))))
-
-;; LIKE: 
-;; (struct ip ip? ip-id ip-iw ip-body ip-waypoints ip-player)
-(define-values 
-  (ip ip? ip-id ip-iw ip-body ip-waypoints ip-player)
-  (let ()
-    (struct ip (id iw body waypoints player) #:transparent)
-    (define (create iw id body waypoints)
-      (ip id iw body waypoints (player id body waypoints)))
-    (values 
-     create ip? ip-id ip-iw ip-body ip-waypoints ip-player)))
-
-;; ServerState is one of
-;; -- JoinUniverse
-;; -- PlayUniverse
-;; JoinUniververse = (join [Listof IPs] Nat)
-;; interpretation: 
-;; -- the first field lists the currently connected client-player
-;; -- the second field is the number of ticks since the server started
-;; PlayUniverse    = (play [Listof IPs] [Listof Food] [Listof IP])
-;; interpretation: 
-;; -- the first field lists all participating players
-;; -- the second field lists the cupcakes 
-;; --- the third field enumerates the spectating players 
-;; IP              = (ip Id IWorld Body [Listof Complex] Feaster)
-;; interpretation: 
-;; the struct represents the Universe's perspective of a connected player 
-;; -- the first field is the assigned unique Id 
-;; -- the second field is the IWorld representing the remote connection to the client 
-;; -- the third field is the Body of the player 
-;; -- the fourth field is the list of player-chosen Waypoints, 
-;;     ordered from oldest click to most-recent
-;;     meaning the first one has to be visited first by the Henry 
-;; -- the fifth field is the serialized representation of the first four fields 
-
-(define JOIN0 (join empty START-TIME))
-
-;                                  
-;                                  
-;                                  
-;                                  
-;   ;;; ;;;            ;           
-;    ;; ;;                         
-;    ;; ;;   ;;;;    ;;;    ;; ;;  
-;    ; ; ;  ;    ;     ;     ;;  ; 
-;    ; ; ;   ;;;;;     ;     ;   ; 
-;    ;   ;  ;    ;     ;     ;   ; 
-;    ;   ;  ;   ;;     ;     ;   ; 
-;   ;;; ;;;  ;;; ;;  ;;;;;  ;;; ;;;
-;                                  
-;                                  
-;                                  
-;                                  
-
-(define (bon-appetit) 
-  (universe JOIN0 
-            (on-new connect)
-            (on-msg handle-goto-message)
-            (on-tick tick-tock TICK)
-            (on-disconnect disconnect)))
-
-;; ServerState IWorld -> Bundle
-;; adds a new connection to a JoinUniverse and ticks. Ignores otherwise
-(define (connect s iw)
-  (cond [(join? s) (add-player s iw)]
-        [(play? s)   (add-spectator s iw)]))
-
-;; ServerState IWorld Sexpr -> Bundle
-;; accepts goto messages from clients
-(define (handle-goto-message s iw msg)
-  (cond [(and (play? s) (goto? msg)) (goto s iw msg)]
-        [else                        (empty-bundle s)]))
-
-;; ServerState -> Bundle
-;; handle a tick event
-(define (tick-tock s)
-  (cond [(join? s) (wait-or-play s)]
-        [(play? s) (move-and-eat s)]))
-
-;; ServerState IWorld -> Bundle
-;; handles loss of a client
-(define (disconnect s iw)
-  (cond [(join? s) (drop-client s iw)]
-        [(play? s) (drop-player s iw)]))
-
-;                                                   
-;                                                   
-;                                                   
-;  ;     ;          ;             ;                 
-;  ;     ;                ;                         
-;  ;     ; ;;;;   ;;;    ;;;;;  ;;;    ; ;;    ;; ; 
-;  ;  ;  ;     ;    ;     ;       ;    ;;  ;  ;  ;; 
-;  ;  ;  ;     ;    ;     ;       ;    ;   ;  ;   ; 
-;   ;; ;;   ;;;;    ;     ;       ;    ;   ;  ;   ; 
-;   ;; ;;  ;   ;    ;     ;       ;    ;   ;  ;   ; 
-;   ;   ;  ;  ;;    ;     ;       ;    ;   ;  ;  ;; 
-;   ;   ;   ;;  ;   ;      ;;;    ;    ;   ;   ;; ; 
-;                                                 ; 
-;                                              ;;;  
-;                                                   
-
-;; JoinUniverse -> Bundle
-;; count down and might transition
-(define (wait-or-play j)
-  (cond [(keep-waiting? j) (keep-waiting j)]
-        [else              (start-game j)]))
-
-;; JoinUniverse -> Boolean
-;; is it time to start?
-(define (keep-waiting? j)
-  (or (> PLAYER-LIMIT (length (join-clients j)))
-      (> WAIT-TIME (join-time j))))
-
-;; JoinUniverse -> [Bundle JoinUniverse]
-(define (keep-waiting j)
-  (set-join-time! j (+ (join-time j) 1))
-  (time-broadcast j))
-
-;; JoinUniverse -> [Bundle JoinUniverse]
-;; broadcasts the new load time fraction to the players
-(define (time-broadcast j)
-  (define iworlds (map ip-iw (join-clients j)))
-  (define load%   (min 1 (/ (join-time j) WAIT-TIME)))
-  (make-bundle j (broadcast iworlds load%) empty))
-
-;; JoinUniverse -> [Bundle PlayUniverse]
-;; starts the game
-(define (start-game j)
-  (define clients  (join-clients j))
-  (define cupcakes (bake-cupcakes (length clients)))
-  (broadcast-universe (play clients cupcakes empty)))
-
-;; Number -> [Listof Food]
-;; creates the amount of food for that number of players
-(define (bake-cupcakes player#)
-  (for/list ([i (in-range (* player# FOOD*PLAYERS))])
-    (create-a-body CUPCAKE)))
-
-;                                                   
-;                                                   
-;          ;;;                                      
-;   ;;;;     ;                    ;                 
-;   ;   ;    ;                                      
-;   ;   ;    ;    ;;;;   ;   ;  ;;;    ; ;;    ;; ; 
-;   ;  ;     ;        ;  ;   ;    ;    ;;  ;  ;  ;; 
-;   ;;;      ;        ;   ;  ;    ;    ;   ;  ;   ; 
-;   ;        ;     ;;;;   ; ;     ;    ;   ;  ;   ; 
-;   ;        ;    ;   ;   ; ;     ;    ;   ;  ;   ; 
-;   ;        ;    ;  ;;    ;      ;    ;   ;  ;  ;; 
-;   ;        ;     ;;  ;   ;      ;    ;   ;   ;; ; 
-;                          ;                      ; 
-;                        ;;                    ;;;  
-;                                                   
-
-;; PlayUniverse -> Bundle
-;; moves everything. eats. may end game
-(define (move-and-eat pu)
-  (define nplayers  (move-player* (play-players pu)))
-  (define nfood (feed-em-all nplayers (play-food pu)))
-  (progress nplayers nfood (play-spectators pu)))
-
-;; [Listof IP] -> [Listof IP]
-;; moves all players
-(define (move-player* players)
-  (for/list ([p players])
-    (define waypoints (ip-waypoints p))
-    (cond [(empty? waypoints) p]
-          [else (define body  (ip-body p))
-                (define nwpts 
-                  (move-toward-waypoint body waypoints))
-                (ip (ip-iw p) (ip-id p) body nwpts)])))
-
-;; Body [Listof Complex] -> [Listof Complex]
-;; effect: set body's location 
-;; determine new waypoints for player 
-;; pre: (cons? waypoints)
-(define (move-toward-waypoint body waypoints)
-  (define goal  (first waypoints))
-  (define bloc  (body-loc body))
-  (define line  (- goal bloc))
-  (define dist  (magnitude line))
-  (define speed (/ BASE-SPEED (body-size body)))
-  (cond
-    [(<= dist speed) 
-     (set-body-loc! body goal)
-     (rest waypoints)]
-    [else ; (> distance speed 0)
-     (set-body-loc! body (+ bloc (* (/ line dist) speed)))
-     waypoints]))
-
-;; [Listof Player] [Listof Food] -> [Listof Food]
-;; feeds all players and removes food
-(define (feed-em-all players foods)
-  (for/fold ([foods foods]) ([p players])
-    (eat-all-the-things p foods)))
-
-;; IP [Listof Food] -> [Listof Food]
-;; effect: fatten player as he eats 
-;; determine left-over foods 
-(define (eat-all-the-things player foods)
-  (define b (ip-body player))
-  (for/fold ([foods '()]) ([f foods])
-    (cond
-      [(body-collide? f b)
-       (set-body-size! b (+ PLAYER-FATTEN-DELTA (body-size b)))
-       foods]
-      [else (cons f foods)])))
-
-;; body body -> Boolean
-;; Have two bodys collided?
-(define (body-collide? s1 s2)
-  (<= (magnitude (- (body-loc s1) (body-loc s2)))
-      (+ (body-size s1) (body-size s2))))
-
-;; [Listof Ip] [Listof Food] [Listof IP] -> Bundle
-;; moves all objects. may end game
-(define (progress pls foods spectators)
-  (define p (play pls foods spectators))
-  (cond [(empty? foods) (end-game-broadcast p)]
-        [else (broadcast-universe p)]))
-
-;; PlayUniverse -> [Bundle JoinUniverse]
-;; ends the game, and restarts it
-(define (end-game-broadcast p)
-  (define iws (get-iws p))
-  (define msg (list SCORE (score (play-players p))))
-  (define mls (broadcast iws msg)) 
-  (make-bundle (remake-join p) mls empty))
-
-;; Play-Universe -> JoinUniverse
-;; Readies the ServerState for a new game
-(define (remake-join p)
-  (define players (refresh (play-players p)))
-  (define spectators (play-spectators p))
-  (join (append players spectators) START-TIME))
-
-;; [Listof Players] -> [Listof Players]
-;; creates new players for new game
-(define (refresh players)
-  (for/list ([p players])
-    (create-player (ip-iw p) (ip-id p))))
-
-;; [Listof IP] -> [Listof (list Id Score)]
-;; makes the endgame message informing clients of all the size
-(define (score ps)
-  (for/list ([p ps])
-    (list (ip-id p) (get-score (body-size (ip-body p))))))
-
-;                                                                  
-;                                                                  
-;                                                                  
-;                                                                  
-;   ;;; ;;;                                                        
-;    ;; ;;                                                         
-;    ;; ;;   ;;;;    ;;;;;   ;;;;;   ;;;;    ;;; ;;  ;;;;    ;;;;; 
-;    ; ; ;  ;    ;  ;    ;  ;    ;  ;    ;  ;   ;;  ;    ;  ;    ; 
-;    ; ; ;  ;;;;;;   ;;;;    ;;;;    ;;;;;  ;    ;  ;;;;;;   ;;;;  
-;    ;   ;  ;            ;       ;  ;    ;  ;    ;  ;            ; 
-;    ;   ;  ;       ;    ;  ;    ;  ;   ;;  ;   ;;  ;       ;    ; 
-;   ;;; ;;;  ;;;;;  ;;;;;   ;;;;;    ;;; ;;  ;;; ;   ;;;;;  ;;;;;  
-;                                                ;                 
-;                                            ;;;;                  
-;                                                                  
-;                                                                  
-
-;; -----------------------------------------------------------------------------
-;; Play Universe
-
-;; Message -> Boolean
-;; checks if message is a drag
-(define (goto? msg)
-  (and (list? msg)
-       (= GOTO-LENGTH (length msg))
-       (symbol? (first msg))
-       (number? (second msg))
-       (number? (third msg))
-       (symbol=? GOTO (first msg))
-       (<= 0 (second msg) WIDTH)
-       (<= 0 (third msg) HEIGHT)))
-
-;; PlayUniverse IWorld GotoMessage -> PlayUniverse
-;; handles a player clicking. checks for collisions, updates score, removes food
-;; Effect: changes a player's waypoints
-(define (goto p iw msg)
-  (define c (make-rectangular (second msg) (third msg)))
-  (set-play-players! p (add-waypoint (play-players p) c iw))
-  (broadcast-universe p))
-
-;; [Listof IPs] Complex IWorld -> [Listof IPs]
-;; adds that complex to the waypoints of the given players
-(define (add-waypoint ps c iw)
-  (for/list ([p ps])
-    (cond [(iworld=? (ip-iw p) iw)
-           (ip (ip-iw p)
-               (ip-id p) 
-               (ip-body p) 
-               (append (ip-waypoints p) (list c)))]
-          [else p])))
-
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;     ;;;;                                                     ;                   
-;    ;   ;                                           ;                             
-;   ;        ;;;;   ;; ;;   ;; ;;    ;;;;    ;;; ;  ;;;;;    ;;;     ;;;;   ;; ;;  
-;   ;       ;    ;   ;;  ;   ;;  ;  ;    ;  ;   ;;   ;         ;    ;    ;   ;;  ; 
-;   ;       ;    ;   ;   ;   ;   ;  ;;;;;;  ;        ;         ;    ;    ;   ;   ; 
-;   ;       ;    ;   ;   ;   ;   ;  ;       ;        ;         ;    ;    ;   ;   ; 
-;    ;   ;  ;    ;   ;   ;   ;   ;  ;       ;    ;   ;   ;     ;    ;    ;   ;   ; 
-;     ;;;    ;;;;   ;;; ;;; ;;; ;;;  ;;;;;   ;;;;     ;;;    ;;;;;   ;;;;   ;;; ;;;
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;                                                                                  
-
-
-;; -----------------------------------------------------------------------------
-;; Join Universe
-
-;; [Universe Player -> Universe] -> [Universe IWorld -> [Bundle Universe]]
-;; creates a function that deals with a new connection during join or play phase 
-(define (make-connection adder)
-  (lambda (u iw)
-    (define player (named-player iw))
-    (define mails  (list (make-mail iw (ip-id player))))
-    (make-bundle (adder u player) mails empty)))
-
-;; JoinUniverse IWorld ID -> [Bundle JoinUniverse]
-;; creates an internal player for the IWorld, adds it to Universe as waiting player 
-(define add-player (make-connection join-add-player))
-
-;; PlayUniverse IWorld -> [Bundle PlayUniverse]
-;; creates an internal player for the IWorld, adds it to Universe as spectator 
-(define add-spectator (make-connection play-add-spectator))
-
-;; [Listof IP] IWorld ->* Player 
-(define (named-player iw)
-  (create-player iw (symbol->string (gensym (iworld-name iw)))))
-
-;                                                                          
-;                                                                          
-;                                                                          
-;                                                                          
-;    ;;; ;                     ;              ;;       ;                   
-;   ;   ;;                                     ;                           
-;   ;        ;;;;   ;; ;;;   ;;;     ;;;;      ;     ;;;     ;;;;;   ;;;;  
-;    ;;;;   ;    ;   ;;        ;    ;    ;     ;       ;     ;  ;   ;    ; 
-;        ;  ;;;;;;   ;         ;     ;;;;;     ;       ;       ;    ;;;;;; 
-;        ;  ;        ;         ;    ;    ;     ;       ;      ;     ;      
-;   ;;   ;  ;        ;         ;    ;   ;;     ;       ;     ;   ;  ;      
-;   ; ;;;    ;;;;;  ;;;;;    ;;;;;   ;;; ;;  ;;;;;   ;;;;;   ;;;;;   ;;;;; 
-;                                                                          
-;                                                                          
-;                                                                          
-;                                                                          
-
-;; PlayUniverse -> [Bundle PlayUniverse [Listof [Mail StateMessage]]]
-;; bundle this universe, serialize it, broadcast it, and drop noone
-(define (broadcast-universe p)
-  (define mails (broadcast (get-iws p) (serialize-universe p)))
-  (make-bundle p mails empty))
-
-;; [Listof IWorlds] Message -> [Listof Mail]
-;; sends mail to all clients
-(define (broadcast iws msgs)
-  (map (lambda (iw) (make-mail iw msgs)) iws))
-
-;; PlayUniverse -> (list s [Listof SerializedPlayer] [Listof SerializedFood])
-;; prepairs a message for an update world/ServerState state
-(define (serialize-universe p)
-  (define serialized-players (map ip-player (play-players p)))
-  (list SERIALIZE serialized-players (play-food p)))
-
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;   ;;;;       ;                                                                   
-;    ;  ;                                                                    ;     
-;    ;   ;   ;;;     ;;;;;   ;;; ;   ;;;;   ;; ;;   ;; ;;    ;;;;    ;;; ;  ;;;;;  
-;    ;   ;     ;    ;    ;  ;   ;;  ;    ;   ;;  ;   ;;  ;  ;    ;  ;   ;;   ;     
-;    ;   ;     ;     ;;;;   ;       ;    ;   ;   ;   ;   ;  ;;;;;;  ;        ;     
-;    ;   ;     ;         ;  ;       ;    ;   ;   ;   ;   ;  ;       ;        ;     
-;    ;  ;      ;    ;    ;  ;    ;  ;    ;   ;   ;   ;   ;  ;       ;    ;   ;   ; 
-;   ;;;;     ;;;;;  ;;;;;    ;;;;    ;;;;   ;;; ;;; ;;; ;;;  ;;;;;   ;;;;     ;;;  
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;                                                                                  
-
-;; JoinUniverse IWorld -> Bundle
-;; remove that iworld from list of clients
-(define (drop-client j iw)
-  (empty-bundle (join-remove j iw)))
-
-;; PlayUniverse IWorld -> Bundle
-;; removes a player from the ServerState and tells the players
-(define (drop-player p iw)
-  (broadcast-universe (play-remove p iw)))
-
-;                          
-;                          
-;                          
-;                          
-;     ;;                   
-;      ;                   
-;     ; ;   ;;  ;;  ;;  ;; 
-;     ; ;    ;   ;   ;  ;  
-;     ; ;    ;   ;    ;;   
-;     ;;;    ;   ;    ;;   
-;    ;   ;   ;  ;;   ;  ;  
-;   ;;; ;;;   ;; ;; ;;  ;; 
-;                          
-;                          
-;                          
-;                          
-
-;; Number -> Body
-;; creates a random body, that does not touch the edge
-(define (create-a-body size)
-  (define x (+ size (random (- WIDTH size))))
-  (define y (+ size (random (- HEIGHT size))))
-  (body size (make-rectangular x y)))
-
-;; PlayUniverse -> [Listof IWorlds]
-;; gets the iworlds of all players
-(define (get-iws p)
-  (map ip-iw (append (play-players p) (play-spectators p))))
-
-;; ServerState -> Bundle
-;; makes a bundle that sends no messages and disconnects noone
-(define (empty-bundle s)
-  (make-bundle s empty empty))  
-
-;; IWorld Id -> IP
-;; creates a player with that idnumber
-(define (create-player iw n)
-  (ip iw n (create-a-body PLAYER-SIZE) empty))
-
-;                                          
-;                                          
-;                                          
-;                                          
-;   ;;;;;;;                                
-;   ;  ;  ;                  ;             
-;      ;     ;;;;    ;;;;;  ;;;;;    ;;;;; 
-;      ;    ;    ;  ;    ;   ;      ;    ; 
-;      ;    ;;;;;;   ;;;;    ;       ;;;;  
-;      ;    ;            ;   ;           ; 
-;      ;    ;       ;    ;   ;   ;  ;    ; 
-;     ;;;    ;;;;;  ;;;;;     ;;;   ;;;;;  
-;                                          
-;                                          
-;                                          
-;           
-
-(module+ test 
-  (require rackunit rackunit/text-ui)
-  
-  (define PROP-NUM 500)
-  (define do-prop (make-parameter #t))
-  (do-prop #f)
-  
-  ;; thunk -> void
-  ;; runs the thunk PROP-NUM times
-  (define (check-property t)
-    (when (do-prop) (test-begin (doo PROP-NUM t))))
-  
-  ;; doo : number thunk ->
-  ;; does the thunk n times
-  (define (doo n l)
-    (l)
-    (unless (zero? n)
-      (doo (sub1 n) l)))
-  
-  ;; testing main server
-  
-  ;; new-connection
-  
-  ;; drop-client
-  (check-equal? (drop-client (join (list (ip iworld1 "player1" (body 10 1+10i) empty)
-                                         (ip iworld2 "player2" (body 10 1+10i) empty)
-                                         (ip iworld3 "player3" (body 10 1+10i) empty)) 100)
-                             iworld1)
-                (empty-bundle (join (list (ip iworld2 "player2" (body 10 1+10i) empty)
-                                          (ip iworld3 "player3" (body 10 1+10i) empty))
-                                    100)))
-  (check-equal? (drop-client (join (list (ip iworld1 "player1" (body 10 1+10i) empty)
-                                         (ip iworld2 "player2" (body 10 1+10i) empty)
-                                         (ip iworld3 "player3" (body 10 1+10i) empty)) 100)
-                             iworld2)
-                (empty-bundle (join (list (ip iworld1 "player1" (body 10 1+10i) empty)
-                                          (ip iworld3 "player3" (body 10 1+10i) empty)) 100)))
-  (check-equal? (drop-client (join (list (ip iworld1 "player1" (body 10 1+10i) empty)
-                                         (ip iworld2 "player2" (body 10 1+10i) empty)
-                                         (ip iworld3 "player3" (body 10 1+10i) empty)) 100)
-                             iworld3)
-                (empty-bundle (join (list (ip iworld1 "player1" (body 10 1+10i) empty)
-                                          (ip iworld2 "player2" (body 10 1+10i) empty)) 100)))
-  
-  ;; remove-player
-  (check-equal? (drop-player
-                 (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                             (ip iworld2 "player345" (body 56 3+45i) empty))
-                       (list (body 87 67+23i)
-                             (body 5 3+4i))
-                       empty)
-                 iworld1)
-                (let ([remd (play-remove 
-                             (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                                         (ip iworld2 "player345" (body 56 3+45i) empty))
-                                   (list (body 87 67+23i)
-                                         (body 5 3+4i))
-                                   empty)
-                             iworld1)])
-                  (broadcast-universe remd)
-                  #;
-                  (make-bundle remd (serial/broadcast-univ remd) empty)))
-  
-  (check-equal? (drop-player 
-                 (play (list (ip iworld2 "player345" (body 56 3+45i) empty))
-                       (list (body 87 67+23i)
-                             (body 5 3+4i))
-                       (list (ip iworld1 "player10" (body 10 1+10i) empty)))
-                 iworld1)
-                (let ([remd (play-remove
-                             (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                                         (ip iworld2 "player345" (body 56 3+45i) empty))
-                                   (list (body 87 67+23i)
-                                         (body 5 3+4i))
-                                   empty)
-                             iworld1)])
-                  (broadcast-universe remd)
-                  #;
-                  (make-bundle remd (serial/broadcast-univ remd) empty)))
-  
-  ;; ready-to-go
-  (check-false (keep-waiting? (join (list (create-player iworld1 "player")
-                                          (create-player iworld2 "player"))
-                                    250)))
-  (check-false (keep-waiting? (join (list (create-player iworld1 "player")
-                                          (create-player iworld1 "player")
-                                          (create-player iworld2 "player"))
-                                    456345132135213))) 
-  (check-true  (keep-waiting? (join (list (create-player iworld2 "player")) -234)))
-  (check-true  (keep-waiting? (join (list  (create-player iworld2 "player")) 10)))
-  
-  
-  
-  ;; handle-join
-  ;; name
-  ;; update-player
-  
-  ;; remove-player-by-iworld
-  (check-equal? (play-remove
-                 (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                             (ip iworld2 "player324" (body 56 3+45i) empty))
-                       (list (body 87 67+23i)
-                             (body 5 3+4i))
-                       empty)
-                 iworld1)
-                (play (list (ip iworld2 "player324" (body 56 3+45i) empty))
-                      (list (body 87 67+23i)
-                            (body 5 3+4i))
-                      empty)
-                empty)
-  (check-equal? (play-remove
-                 (play (list (ip iworld2 "player324" (body 56 3+45i) empty))
-                       (list (body 87 67+23i)
-                             (body 5 3+4i))
-                       empty)
-                 iworld2)
-                (play (list)
-                      (list (body 87 67+23i)
-                            (body 5 3+4i))
-                      empty))
-  
-  ;; testing messaging
-  
-  ;; goto?
-  
-  (check-true (goto? '(goto 3 2)))
-  (check-true (goto? '(goto 3 2)))
-  (check-true (goto? '(goto 0 2)))
-  (check-true (goto? '(goto 6 2)))
-  (check-false (goto? `(goto ,(add1 WIDTH) 0)))
-  (check-false (goto? `(goto 0 ,(add1 HEIGHT))))
-  (check-false (goto? '(goto -1 0)))
-  (check-false (goto? '(goto 0 -1)))
-  (check-false (goto? '(goto 1)))
-  (check-false (goto? '(drag 6+2i)))
-  (check-false (goto? '(drag 1)))
-  (check-false (goto? '(6+1i)))
-  (check-false (goto? '(1 2)))
-  (check-false (goto? '(goto 6+2i)))
-  (check-false (goto? '(drag 1 2)))
-  (check-false (goto? 'click))
-  (check-false (goto? "click"))
-  (check-false (goto? #t))
-  
-  ;;add-waypoint
-  
-  (check-equal? (add-waypoint `(,(ip iworld1 "player10" (body 10 1+10i) empty)) 8+9i iworld1)
-                (list (ip iworld1 "player10" (body 10 1+10i) '(8+9i))))
-  (check-equal? (add-waypoint `(,(ip iworld1 "player10" (body 10 1+10i) '(23+45i))) 8+9i iworld1)
-                (list (ip iworld1 "player10" (body 10 1+10i) '(23+45i 8+9i))))
-  
-  ;; goto
-  
-  (check-equal? (goto (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                                  (ip iworld2 "player345" (body 56 3+45i) empty))
-                            (list (body 87 67+23i)
-                                  (body 5 3+4i))
-                            empty)
-                      iworld1 '(goto 1 1))
-                (let ([state (play (list (ip iworld1 "player10" (body 10 1+10i)'(1+1i))
-                                         (ip iworld2 "player345" (body 56 3+45i) empty))
-                                   (list (body 87 67+23i)
-                                         (body 5 3+4i))
-                                   empty)])
-                  (broadcast-universe state)
-                  #;
-                  (make-bundle state (serial/broadcast-univ state) empty)))
-  
-  (check-equal? (goto (play (list (ip iworld1 "player10" (body 10 1+10i) '(1+4i))
-                                  (ip iworld2 "player345" (body 56 3+45i) empty))
-                            (list (body 87 67+23i)
-                                  (body 5 3+4i))
-                            empty)
-                      iworld1 '(goto 1 1))
-                (let ([state (play (list (ip iworld1 "player10" (body 10 1+10i) '(1+4i 1+1i))
-                                         (ip iworld2 "player345" (body 56 3+45i) empty))
-                                   (list (body 87 67+23i)
-                                         (body 5 3+4i))
-                                   empty)])
-                  (broadcast-universe state)
-                  #;
-                  (make-bundle state (serial/broadcast-univ state) empty)))
-  
-  ;; eat-all-the-things
-  (check-equal? (eat-all-the-things  (ip iworld1 "player10" (body 11 0) '(1+10i)) (list (body 10 0)))
-                empty)
-  (check-equal? (eat-all-the-things  (ip iworld1 "player10" (body 10 0) '(1+10i)) (list (body 10 40+5i)))
-                (list (body 10 40+5i)))
-  
-  ;; testing initialization
-  
-  ;; property of no motion to same point in move-body
-  ;; also checks for divide by zero error in move-player*
-  (define (property:no-same-point)
-    (define (random-near n)
-      (define ε 1/1000000)
-      (+ n (* (random 10) ε (sub1 (* 2 (random 2))))))
-    
-    (define test-body (create-a-body 1))
-    
-    (define waypoints
-      (for/list ([r (in-range (add1 (random 100)))])
-        (define x (real-part (body-loc test-body)))
-        (define y (imag-part (body-loc test-body)))
-        (make-rectangular (random-near x) (random-near y))))
-    
-    (define random-p (ip iworld1 "nope" test-body waypoints))
-    
-    (define (test p)
-      (cond [(empty? (ip-waypoints p))
-             #t]
-            [(= (first (ip-waypoints p)) 
-                (body-loc (ip-body p)))
-             #f]
-            [else (test (move-player* (list p)))]))
-    
-    (check-true (test random-p)))
-  
-  ;; does spawn food create the nessecary amount of food?
-  (define (property:player/food-number-correct)
-    (define players (random 50))
-    (check-equal? (length (bake-cupcakes players))
-                  (* FOOD*PLAYERS players)))
-  
-  ;; is random-body on the board?
-  (define (test-body-in-bounds)
-    (define size 10)
-    (define body (create-a-body size))
-    (check-true (and (< size (real-part (body-loc body)) (- WIDTH size))
-                     (< size (imag-part (body-loc body)) (- HEIGHT size)))
-                "body out of bounds"))
-  
-  
-  
-  
-  ;;create-name
-  ;; (check-equal? (create-name empty "john") "john")
-  ;; (check-equal? (create-name (list (ip iworld1 "player10" (body 10 0) '(1+10i))) "player10") "player10*")
-  #;
-  (check-equal? (create-name (list (ip iworld1 "player10" (body 10 0) '(1+10i))
-                                   (ip iworld1 "player10*" (body 10 0) '(1+10i)))
-                             "player10")
-                "player10**")
-  #;
-  (check-property property:unique-name)
-  
-  ;; spawn-food
-  (check-property property:player/food-number-correct)
-  
-  ;; random-body
-  (check-property test-body-in-bounds)
-  
-  ;; testing clock tick handling
-  
-  (define tbody1 (body 100 1+3i))
-  (define tbody2 (body 100 1))
-  (define tbody3 (body 100 0+3i))
-  (define tbody4 (body 100 101))
-  
-  (define waypoints1 '(1+3i 1 0+3i 10+10i))
-  (define waypoints2 '(100))
-  
-  ;; move-player*
-  (check-equal? (move-player*
-                 (list (ip iworld1 "player10" (body 10 1+10i) '(1+10.01i))))
-                (list (ip iworld1 "player10" (body 10 1+10.01i) empty)))
-  (check-property property:no-same-point)
-  ;; move-twards-waypoint
-  
-  
-  (test-begin
-   (check-equal? (move-toward-waypoint tbody1 waypoints1)
-                 (rest waypoints1)
-                 "waypoint removal failed")
-   (check-equal? tbody1 (body 100 1+3i) "movement failed")
-   (set! tbody1 (body 100 1+3i)))
-  
-  (test-begin
-   ;; test dependent on (< BASE-SPEED 100)
-   (check-equal? (move-toward-waypoint tbody2 waypoints2)
-                 waypoints2
-                 "waypoint removal failed")
-   (check-equal? tbody2 (body 100 (+ 1 (make-rectangular (/ BASE-SPEED 100) 0)))
-                 "movement failed")
-   (set! tbody2 (body 100 1)))
-  
-  (test-begin
-   (check-equal? (move-toward-waypoint tbody4 waypoints2)
-                 '())
-   (check-equal? tbody4 (body 100 100))
-   (set! tbody4 (body 100 101)))
-  
-  ;; countdown
-  (check-equal? (wait-or-play (join (list (ip iworld1 "player10" (body 10 1+10i) empty))  0))
-                (make-bundle
-                 (join (list (ip iworld1 "player10" (body 10 1+10i) empty)) 1)
-                 (broadcast (list iworld1) (/ 1 WAIT-TIME))
-                 empty))
-  (check-equal? (wait-or-play (join empty  0))
-                (empty-bundle (join empty 1)))
-  
-  ;;countdown
-  (check-equal? (wait-or-play (join (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                                          (ip iworld1 "player345" (body 56 3+45i) empty))
-                                    100))
-                (make-bundle (join (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                                         (ip iworld1 "player345" (body 56 3+45i) empty))
-                                   101)
-                             (broadcast (list iworld1 iworld1) (/ 101 WAIT-TIME))
-                             empty))
-  (check-equal? (wait-or-play (join (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                                          (ip iworld1 "player345" (body 56 3+45i) empty))
-                                    1))
-                (make-bundle (join (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                                         (ip iworld1 "player345" (body 56 3+45i) empty))
-                                   2)
-                             (broadcast (list iworld1 iworld1) (/ 2 WAIT-TIME))
-                             empty))
-  ;; progress
-  (check-equal? (progress 
-                 (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                       (ip iworld1 "player345" (body 56 3+45i) empty))
-                 (list (body 87 67+23i)
-                       (body 5 3+4i))
-                 empty)
-                (broadcast-universe 
-                 (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                             (ip iworld1 "player345" (body 56 3+45i) empty))
-                       (list (body 87 67+23i)
-                             (body 5 3+4i))
-                       empty))
-                #;
-                (make-bundle
-                 (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                             (ip iworld1 "player345" (body 56 3+45i) empty))
-                       (list (body 87 67+23i)
-                             (body 5 3+4i))
-                       empty)
-                 (serial/broadcast-univ (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                                                    (ip iworld1 "player345" (body 56 3+45i) empty))
-                                              (list (body 87 67+23i)
-                                                    (body 5 3+4i))
-                                              empty))
-                 empty))
-  
-  ;; body-collide?
-  (check-true (body-collide? (body 10 10+10i) (body 10 10+10i)))
-  (check-true (body-collide? (body 10 10+10i) (body 10 0+10i)))
-  (check-true (body-collide? (body 10 10+10i) (body 10 10)))
-  (check-true (body-collide? (body 10 10+10i) (body 10 20)))
-  (check-true (body-collide? (body 10 10+10i) (body 10 0+20i)))
-  
-  (check-false (body-collide? (body 1 10+10i) (body 1 10+13i)))
-  (check-false (body-collide? (body 1 10+10i) (body 1 0+10i)))
-  (check-false (body-collide? (body 1 10+10i) (body 1 10)))
-  (check-false (body-collide? (body 1 10+10i) (body 1 20)))
-  (check-false (body-collide? (body 1 10+10i) (body 1 0+20i)))
-  
-  ;; serial/broadcast-univ
-  #;
-  (check-equal? (serial/broadcast-univ 
-                 (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                             (ip iworld2 "player345" (body 56 3+45i) empty))
-                       (list (body 87 67+23i)
-                             (body 5 3+4i))
-                       empty))
-                (let ([serialized (serialize-universe (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                                                                  (ip iworld2 "player345" (body 56 3+45i) empty))
-                                                            (list (body 87 67+23i)
-                                                                  (body 5 3+4i))
-                                                            empty))])
-                  (list (make-mail iworld1 serialized)
-                        (make-mail iworld2 serialized))))
-  
-  ;; time-broadcast
-  (let ([j (join '() 100)])
-    (check-equal? (time-broadcast j)
-                  (make-bundle j '() '())))
-  (let ([j (join `(,(ip iworld1 "sallyjoe" (body 0 0+0i) '())) 100)])
-    (check-equal? (time-broadcast j)
-                  (make-bundle j `(,(make-mail iworld1 (/ 100 WAIT-TIME))) '())))
-  
-  ;; testing auxiliary functions 
-  (check-equal? (score `(,(ip iworld1 "foo" (body 1000 +inf.0) '())
-                         ,(ip iworld1 "bar" (body 0 +inf.0) '())))
-                `(("foo" ,(get-score 1000))
-                  ("bar" ,(get-score 0))))
-  ;; get-iws
-  ;; empty-bundle
-  (check-equal? (empty-bundle (join (list (ip iworld1 "player10" (body 10 1+10i) empty) 
-                                          (ip iworld2 "player345" (body 56 3+45i) empty)) 132))
-                (make-bundle (join (list (ip iworld1 "player10" (body 10 1+10i) empty) 
-                                         (ip iworld2 "player345" (body 56 3+45i) empty)) 132) empty empty))
-  (check-equal? (empty-bundle (join (list (ip iworld1 "player10" (body 10 1+10i) empty) 
-                                          (ip iworld2 "player345" (body 56 3+45i) empty)) 345))
-                (make-bundle (join (list (ip iworld1 "player10" (body 10 1+10i) empty) 
-                                         (ip iworld2 "player345" (body 56 3+45i) empty)) 345) empty empty))
-  (check-equal? (empty-bundle (play (list (ip iworld1 "player1" (body 87 67+23i) empty))
-                                    (list (body 87 67+23i)
-                                          (body 89 32+345i))
-                                    empty))
-                (make-bundle
-                 (play (list (ip iworld1 "player1" (body 87 67+23i) empty))
-                       (list (body 87 67+23i)
-                             (body 89 32+345i))
-                       empty)
-                 empty
-                 empty))
-  
-  ;; get-iws
-  (check-equal? (get-iws (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                                     (ip iworld2 "player345" (body 56 3+45i) empty))
-                               (list (body 87 67+23i)
-                                     (body 5 3+4i))
-                               empty))
-                (list iworld1 iworld2))
-  (check-equal? (get-iws (play (list (ip iworld1 "player10" (body 10 1+10i) empty))
-                               empty
-                               empty))
-                (list iworld1))
-  ;; broadcast
-  (check-equal? (broadcast (list iworld1 iworld3 iworld2)
-                           '(testing testing 1 2 3))
-                (let ([message '(testing testing 1 2 3)])
-                  (list (make-mail iworld1
-                                   message)
-                        (make-mail iworld3
-                                   message)
-                        (make-mail iworld2
-                                   message))))
-  (check-equal? (broadcast (list iworld1)
-                           '(testing testing 1 2 3))
-                (let ([message '(testing testing 1 2 3)])
-                  (list (make-mail iworld1
-                                   message))))
-  (check-equal? (broadcast (list iworld1 iworld3)
-                           9)
-                (let ([message 9])
-                  (list (make-mail iworld1
-                                   message)
-                        (make-mail iworld3
-                                   message))))
-  
-  ;; broadcast-state
-  (let ([state (play (list (ip iworld1 "player10" (body 10 1+10i) empty)
-                           (ip iworld2 "player345" (body 56 3+45i) empty))
-                     (list (body 87 67+23i)
-                           (body 5 3+4i))
-                     empty)])
-    (check-equal? (broadcast-universe state)
-                  (broadcast-universe state)))
-  
-  "server: all tests run")
diff --git a/pkgs/realm/chapter14/shared.rkt b/pkgs/realm/chapter14/shared.rkt
deleted file mode 100644
index 7f3a549965..0000000000
--- a/pkgs/realm/chapter14/shared.rkt
+++ /dev/null
@@ -1,156 +0,0 @@
-#lang racket
-
-;; This module describes the shared vocabulary and knowledge for the server 
-;; and client modules of the Hungry Henry game. 
-
-(provide ;; type Id 
-         id?   ;; Any -> Boolean : Id 
-         id=?  ;; Id Id -> Boolean 
-         ;; type GOTO 
-         ;; type SOTO = Time | Ackn | State | Score 
-         ;; type Food 
-         ;; type Feaster 
-         ;; type Body 
-         (struct-out player) ;; 
-         (struct-out body)   ;; 
-         get-score ;; Nat -> Nat 
-         PLAYER-FATTEN-DELTA
-         WIDTH HEIGHT CUPCAKE PLAYER-SIZE 
-         SCORE GOTO SERIALIZE
-         GOTO-LENGTH)
-
-#|  -----------------------------------------------------------------------------
-
-;; --- Tasks --------------------------------------------------------------------
-
-The game server keeps track of the entire game state [to avoid cheating by 
-lients]. It collects waypoints, moves the avatars on behalf of the clients, 
-detects collisions with cupcakes, has avatars eat and grow, and discovers the
-end of the game. As events occur, it informs all clients about all actions and,
-at the end of the game, tallies the scores. 
-
-Each client displays the current state of the game as broadcast by the server. 
-It also records and sends all mouse clicks to the server. 
-
-;; --- Messages and Protocol ---------------------------------------------------
-
-The server and the client exchange messages to inform each other about 
-the events in the game. 
-
-Client To Server Message: 
-------------------------
-
- GOTO = (list GOTO PositiveNumber PositiveNumber)
- represents the coordinates of player's latest waypoint, 
- obtained via a mouse click.
- Constraint: in (list GOTO x y), (and (<= 0 x WIDTH) (<= 0 y HEIGHT))
- 
-Server to Client Message:
--------------------------
-
- SOTO is one of: 
- -- Number ∈ [0,1]
-    called a Time message 
-    repreents the percentage of loading time left
- -- ID
-    called an Ackn message 
-    represents the unique id that the server assigns to the client, 
-    based on the client's name 
- -- (list SERIALIZE [Listof Feaster] [Listof Food])
-    called a State message
-    represents the complete current state of the game 
- -- (list SCORE [Listof (list Id Natural)])
-    called a Score message 
-    informs clients that the game is over and the sizes of each player. 
-|#
-;; Shared Data Definitions for Messages 
-
-(struct player (id body waypoints) #:prefab)
-(struct body (size loc) #:prefab #:mutable)
-;; Food     = Body
-;; Feaster  = (player Id Body [Listof Complex])
-;; interpretation: 
-;; -- id is the player's id
-;; -- body is the player's size and location
-;; -- loc are the player's waypoints, ordered from first to last
-;; Body     = (body PositiveNumber Complex)
-;; interpretation: any 'body' on the playing field, both players and cupcakes 
-;; -- the postive number specifies the body's size
-;; -- the complex number represents the body's location
-;; PlayerId = String
-(define id? string?)
-(define id=? string=?)
-
-;; Message ID Constants
-(define SCORE 'score)
-(define SERIALIZE 'state)
-(define GOTO 'goto)
-(define GOTO-LENGTH 3)
-
-#| --- Protocol ----------------------------------------------------------------
-
-     Client1        Client2         Server
-       |               |              |
-       | register(name1)              |   [universe protocol]
-       |----------------------------->|
-       |               |              |  
-       |               |       ID     |    an identifier message 
-       |<-----------------------------|
-       |               |       t      |    percentage of wait time 
-       |<-----------------------------|
-       |<-----------------------------|
-       |<-----------------------------|
-       |               |              |    
-       |               | register(name2) 
-       |               |------------->|
-       |               |              |  
-       |               |       ID     |  
-       |               |<-------------|
-       |               |       t      |    percentage of wait time 
-       |<-----------------------------|
-       |               |<-------------|
-       |<-----------------------------|
-       |               |<-------------|
-       |               |              |  <==== end of wait time [clock, players]
-       |             state msg        |  
-       |<-----------------------------|    `(state (,feaster1 ,feaster2) ,foods)
-       |               |<-------------|
-       |               |              |  
- click |  GOTO 	       |	      |    `(goto ,x ,y)
- ====> |----------------------------->|    new state 
-       |               |              |  
-       |             state msg        |     
-       |<-----------------------------|    `(state (,feaster1 ,feaster2) ,foods)
-       |               |<-------------|
-       |               |              |  
-       |               |              |    move, eat:
-       |<-----------------------------|    `(state (,feaster1 ,feaster2) ,foods)
-       |               |<-------------|
-       |               |              |    
-       |        click  | GOTO	      |   `(goto ,x ,y)
-       |	====>  |------------->|  
-       |               |              |  
-       |             state msg        |     
-       |<-----------------------------|    `(state (,feaster1 ,feaster2) ,foods)
-       |               |<-------------|
-       |               |              |
-       |             score msg        |    all food is eaten: 
-       |<-----------------------------|    `(score ((,id ,score) ...))
-       |               |<-------------|
-       |               |              |
-      ---             ---            ---
-
-|#
-
-;; Shared Logical Constants
-(define WIDTH 1000)
-(define HEIGHT 700)
-(define CUPCAKE 15)
-(define PLAYER-SIZE (* 3 CUPCAKE)) 
-(define PLAYER-FATTEN-DELTA 5)
-
-;; Number -> Number ;; move to serer 
-;; gets aplayers score given its fatness
-(define (get-score f)
-  (/ (- f PLAYER-SIZE) PLAYER-FATTEN-DELTA))
-
diff --git a/pkgs/realm/chapter2/readme.txt b/pkgs/realm/chapter2/readme.txt
deleted file mode 100644
index a231f09879..0000000000
--- a/pkgs/realm/chapter2/readme.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-This chapter implements a primitive, Lisp-style version of the "guess my
-numbers" game. Open the file
-
-	 source.rkt 
-
-in DrRacket. The instructions for playing are at the top of the file. 
-Our tests are at the bottom of the file in a separate 'test' submodule. 
-
diff --git a/pkgs/realm/chapter2/source.rkt b/pkgs/realm/chapter2/source.rkt
deleted file mode 100644
index 6dc5e8dd5e..0000000000
--- a/pkgs/realm/chapter2/source.rkt
+++ /dev/null
@@ -1,215 +0,0 @@
-#lang racket
-
-#|
-   The Guess My Number game, played at DrRacket's REPL
-   ---------------------------------------------------
-   
-   You pick a number. The program guesses the nunber, 
-   by asking you questions. Your responses are "too 
-   small" "too large" or "you guessed it". 
-
-   Play
-   ----
-
-   Click Run. Pick a number X between <n> and <m>. 
-   Evaluate 
-     (start <n> <m>)
-   The program will respond with a number.
-   Use
-     (bigger)
-   and
-     (smaller)
-    to let it know what you think of its guess.
-|#
-
-;                                          
-;                                          
-;                                          
-;                          ;               
-;                          ;               
-;  ;;;   ;;;                               
-;   ;;   ;;                                
-;   ; ; ; ;     ;;;;     ;;;      ;; ;;;   
-;   ; ; ; ;    ;    ;      ;       ;;   ;  
-;   ; ; ; ;         ;      ;       ;    ;  
-;   ;  ;  ;    ;;;;;;      ;       ;    ;  
-;   ;     ;   ;     ;      ;       ;    ;  
-;   ;     ;   ;    ;;      ;       ;    ;  
-;  ;;;   ;;;   ;;;; ;;  ;;;;;;;   ;;;  ;;; 
-;                                          
-;                                          
-;                                          
-;                                          
-
-;; Example:
-;; > (start 0 100)       ; [0,100]
-;; 50
-;; > (bigger)            ; [51,100]
-;; 75
-;; > (bigger)            ; [76,100]
-;; 88
-;; > (smaller)           ; [76,87]
-;; 82
-
-;; Number Number -> Number
-;; Start a new game in [n,m] and make a guess.
-;; > (start 0 100)
-;; 50
-(define (start n m)
-  (set! lower (min n m))
-  (set! upper (max n m))
-  (guess))
-
-;; Lower and upper bounds on the number
-(define lower 1)
-(define upper 100)
-
-;; -> Nuber Number
-;; Guess half-way between lower and upper bounds.
-;; > (begin (start 0 100) (guess))
-;; 50
-(define (guess) 
-  (quotient (+ lower upper) 2))
-
-;; -> Number
-;; Lower the upper bound and guess again.
-;; > (begin (start 0 100) (smaller))
-;; 24
-(define (smaller)
-  (set! upper (max lower (sub1 (guess))))
-  (guess))
-
-;; -> Number
-;; Raise the lower bound and guess again.
-;; > (begin (start 0 100) (bigger))
-;; 75
-(define (bigger) 
-  (set! lower (min upper (add1 (guess))))
-  (guess))
-
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;   ;;;;;;;                        ;                 
-;   ;  ;  ;                        ;                 
-;   ;  ;  ;     ;;;      ;;;; ;  ;;;;;;;     ;;;; ;  
-;   ;  ;  ;    ;   ;    ;    ;;    ;        ;    ;;  
-;      ;      ;     ;   ;          ;        ;        
-;      ;      ;;;;;;;    ;;;;;     ;         ;;;;;   
-;      ;      ;               ;    ;              ;  
-;      ;       ;    ;   ;     ;    ;    ;   ;     ;  
-;    ;;;;;      ;;;;    ;;;;;;      ;;;;    ;;;;;;   
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-
-
-(module+ test 
-  
-  (require rackunit rackunit/text-ui)
-  
-  ;; basic guesses 
-  
-  (check-equal? (guess) 50)
-  
-  (check-equal? (start 0 100) 50)
-  
-  (check-equal? (begin (start 0 100) lower) 0)
-  (check-equal? (begin (start 0 100) upper) 100)
-  (check-equal? (begin (start 0 100) (smaller)) 24)
-  (check-equal? (begin (start 0 000) (smaller)) 0)
-  (check-equal? (begin (start 0 100) (smaller) lower) 0)
-  (check-equal? (begin (start 0 100) (smaller) upper) 49)
-  (check-equal? (begin (start 0 100) (bigger)) 75)
-  (check-equal? (begin (start 0 000) (bigger)) 0)
-  
-  ;; testing a sequence of interactions with expected intermediate states 
-  
-  (test-begin (start 0 100)        
-              (bigger)
-              (check-equal? lower 51)
-              (check-equal? upper 100)
-              (bigger)
-              (check-equal? lower 76)
-              (check-equal? upper 100)
-              (smaller)
-              (check-equal? lower 76)
-              (check-equal? upper 87))
-  
-  ;; doing it all over for negative numbers 
-  
-  (check-equal? (start -100 0) -50)
-  
-  (check-equal? (begin (start -100 0) lower) -100)
-  (check-equal? (begin (start -100 0) upper) 0)
-  (check-equal? (begin (start -100 0) (smaller)) -75)
-  (check-equal? (begin (start -100 0) (smaller)) -75)
-  (check-equal? (begin (start -100 0) (smaller) lower) -100)
-  (check-equal? (begin (start -100 0) (smaller) upper) -51)
-  (check-equal? (begin (start -100 0) (bigger)) -24)
-  (check-equal? (begin (start -100 0) (bigger)) -24)  
-  
-  (test-begin (start -100 0)        
-              (bigger)
-              (check-equal? lower -49)
-              (check-equal? upper 0)
-              (bigger)
-              (check-equal? lower -23)
-              (check-equal? upper 0)
-              (smaller)
-              (check-equal? lower -23)
-              (check-equal? upper -12))
-  
-  
-  ;; ---------------------------------------------------------------------------
-  ;; testing random properties of our functions 
-  
-  ;; Property:
-  ;; For all games starting in [n,m] after any number of moves,
-  ;; lower <= upper.
-  (define (prop:ordered n m i)
-    (check-true 
-     (begin (start n m)
-            (random-moves i)
-            (<= lower upper))))
-  
-  ;; Property:
-  ;; For all games starting in [n,m], for any number of moves,
-  ;; lower grows up, upper grows down, or they are equal.
-  (define (prop:monotonic n m i)
-    (check-true
-     (begin (start n m)
-            (for/and ([i (in-range i)])
-              (define l lower)
-              (define u upper)
-              (random-move)
-              (or (and (< l lower) (= u upper))
-                  (and (= l lower) (> u upper))
-                  (and (= l lower) (= u upper)))))))
-  
-  ;; Number -> Void
-  ;; Move randomly n times.
-  (define (random-moves i)
-    (unless (zero? i)
-      (random-move)
-      (random-moves (sub1 i))))
-  
-  ;; -> Void
-  ;; Move randomly once.
-  (define (random-move)
-    (if (zero? (random 2))
-        (smaller) 
-        (bigger)))
-  
-  ;; property tests
-  (for ([i (in-range 1000)])
-    (prop:ordered (random 1000) (random 1000) (random 100))
-    (prop:monotonic (random 1000) (random 1000) (random 100)))
-  
-  ;; reset the boundaries to defaults 
-  (start 1 100)
-
-  "all tests run")
diff --git a/pkgs/realm/chapter5/info.rkt b/pkgs/realm/chapter5/info.rkt
deleted file mode 100644
index 9dcaf25040..0000000000
--- a/pkgs/realm/chapter5/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("ufo-source.rkt"))
diff --git a/pkgs/realm/chapter5/readme.txt b/pkgs/realm/chapter5/readme.txt
deleted file mode 100644
index e95f41f8ec..0000000000
--- a/pkgs/realm/chapter5/readme.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-This chapter implements an interactive, graphical version of the "guess my
-numbers" game. Open the file
-
-	 source.rkt 
-
-in DrRacket. The instructions for starting are at the top of the file. 
-Our tests are at the bottom of the file in a separate 'test' submodule. 
-
-;; -----------------------------------------------------------------------------
-
-If you wish to experiment with a small world program, open 
-
-         ufo-source.rkt
-
-The file runs a UFO from the top of the screen to the bottom. 
-
-
diff --git a/pkgs/realm/chapter5/source.rkt b/pkgs/realm/chapter5/source.rkt
deleted file mode 100644
index 5217dfee1f..0000000000
--- a/pkgs/realm/chapter5/source.rkt
+++ /dev/null
@@ -1,257 +0,0 @@
-#lang racket
-
-#|
-   The Guess My Number game, with a simple graphical user interface (GUI)
-   ----------------------------------------------------------------------
-   
-   You pick a number. The program guesses the nunber, 
-   by asking you questions. Your responses are "too 
-   small" "too large" or "you guessed it". 
-
-   Play
-   ----
-
-   Click Run. Pick a number X between <n> and <m>. 
-   Evaluate 
-     (start <n> <m>)
-   This will pop up a window with instructions for interacting with the program. 
-|#
-
-(require 2htdp/image 2htdp/universe)
-
-;                              
-;                              
-;                              
-;                    ;         
-;                              
-;  ; ;; ;; ;;;;    ;;;   ; ;;  
-;  ;; ;; ;     ;     ;   ;;  ; 
-;  ;  ;  ;  ;;;;     ;   ;   ; 
-;  ;  ;  ; ;   ;     ;   ;   ; 
-;  ;  ;  ; ;  ;;     ;   ;   ; 
-;  ;  ;  ;  ;;  ;    ;   ;   ; 
-;                              
-;                              
-
-;; Number Number -> GuessRange
-;; Start playing a new game in [n,m]
-;; > (start 0 100)  ; Press up, up, down, q.
-;; (interval 76 87)
-(define (start lower upper) 
-  (big-bang (interval lower upper)
-            (on-key deal-with-guess)
-            (to-draw render)
-            (stop-when single? render)))
-
-;                                     
-;                                     
-;                                     
-;                                     
-;           ;             ;           
-;    ;;;;  ;;;;;  ;;;;   ;;;;;   ;;;  
-;   ;       ;         ;   ;     ;   ; 
-;    ;;     ;      ;;;;   ;     ;;;;; 
-;      ;    ;     ;   ;   ;     ;     
-;       ;   ;     ;  ;;   ;     ;     
-;   ;;;;     ;;;   ;;  ;   ;;;   ;;;; 
-;                                     
-;                                     
-
-(struct interval (small big) #:transparent)
-;; A GuessRange is a (interval Number Number)
-;; Always true: (interval l u) means (<= l u).
-
-;                                                                 
-;                                                                 
-;                                                                 
-;                                                                 
-;                                ;                    ;           
-;    ;;;;   ;;;   ; ;;    ;;;;  ;;;;;  ;;;;   ; ;;   ;;;;;   ;;;; 
-;   ;      ;   ;  ;;  ;  ;       ;         ;  ;;  ;   ;     ;     
-;   ;      ;   ;  ;   ;   ;;     ;      ;;;;  ;   ;   ;      ;;   
-;   ;      ;   ;  ;   ;     ;    ;     ;   ;  ;   ;   ;        ;  
-;   ;      ;   ;  ;   ;      ;   ;     ;  ;;  ;   ;   ;         ; 
-;    ;;;;   ;;;   ;   ;  ;;;;     ;;;   ;;  ; ;   ;    ;;;  ;;;;  
-;                                                                 
-;                                                                 
-
-(define TEXT-SIZE 11)
-(define HELP-TEXT 
-  (text "↑ for larger numbers, ↓ for smaller ones" 
-        TEXT-SIZE 
-        "blue"))
-(define HELP-TEXT2 
-  (text "Press = when your number is guessed; q to quit." 
-        TEXT-SIZE 
-        "blue"))
-(define WIDTH (+ (image-width HELP-TEXT2) 10))
-(define HEIGHT 150)
-(define COLOR "red")
-(define SIZE 72)
-(define TEXT-X 3)
-(define TEXT-UPPER-Y 10)
-(define TEXT-LOWER-Y 135)
-(define MT-SC 
-  (place-image/align 
-   HELP-TEXT TEXT-X TEXT-UPPER-Y 
-   "left" "top" 
-   (place-image/align 
-    HELP-TEXT2 
-    TEXT-X TEXT-LOWER-Y "left" "bottom"
-    (empty-scene WIDTH HEIGHT))))
-
-;                                                          
-;                                                          
-;   ;                        ;  ;;;                        
-;   ;                        ;    ;                        
-;   ;                        ;    ;                        
-;   ; ;;   ;;;;   ; ;;    ;; ;    ;     ;;;   ; ;;;   ;;;; 
-;   ;;  ;      ;  ;;  ;  ;  ;;    ;    ;   ;  ;;  ;  ;     
-;   ;   ;   ;;;;  ;   ;  ;   ;    ;    ;;;;;  ;       ;;   
-;   ;   ;  ;   ;  ;   ;  ;   ;    ;    ;      ;         ;  
-;   ;   ;  ;  ;;  ;   ;  ;  ;;    ;    ;      ;          ; 
-;   ;   ;   ;;  ; ;   ;   ;; ;    ;     ;;;;  ;      ;;;;  
-;                                                          
-;                                                          
-
-;; GuessRange -> Boolean
-;; Does the interval represent a single number?
-;; > (single? (interval 1 1))
-;; #t
-(define (single? w)
-  (= (interval-small w) (interval-big w)))
-
-;; GuessRange -> Number
-;; Calculates a guess based on the given interval
-;; > (guess (interval 0 100))
-;; 50
-(define (guess w)
-  (quotient (+ (interval-small w) (interval-big w)) 2))
-
-;; GuessRange -> GuessRange
-;; Recreates a GuessRange that lowers the upper bound
-;; > (smaller (interval 0 100))
-;; (interval 0 50)
-(define (smaller w)
-  (interval (interval-small w)
-            (max (interval-small w) 
-                 (sub1 (guess w)))))
-
-;; GuessRange -> GuessRange
-;; Recreates a interval that raises the lower bound
-;; > (bigger (0 100)
-;; (interval 51 100)
-(define (bigger w)
-  (interval (min (interval-big w) 
-                 (add1 (guess w)))
-            (interval-big w)))
-
-;; GuessRange Key -> GuessRange
-;; Handles key input
-;; > (key-handler (interval 0 100) "up")
-;; (interval 51 100)
-;; > (key-handler (interval 0 100) "q")
-;; (stop-with (interval 0 100))
-(define (deal-with-guess w key)
-  (cond [(key=? key "up") (bigger w)]
-        [(key=? key "down") (smaller w)]
-        [(key=? key "q") (stop-with w)]
-        [(key=? key "=") (stop-with w)]
-        [else w]))
-
-;                                                                 
-;                                                                 
-;                            ;                                    
-;                            ;                   ;                
-;                            ;                                    
-;   ; ;;;   ;;;   ; ;;    ;; ;   ;;;   ; ;;;   ;;;   ; ;;    ;; ; 
-;   ;;  ;  ;   ;  ;;  ;  ;  ;;  ;   ;  ;;  ;     ;   ;;  ;  ;  ;; 
-;   ;      ;;;;;  ;   ;  ;   ;  ;;;;;  ;         ;   ;   ;  ;   ; 
-;   ;      ;      ;   ;  ;   ;  ;      ;         ;   ;   ;  ;   ; 
-;   ;      ;      ;   ;  ;  ;;  ;      ;         ;   ;   ;  ;  ;; 
-;   ;       ;;;;  ;   ;   ;; ;   ;;;;  ;         ;   ;   ;   ;; ; 
-;                                                               ; 
-;                                                           ;;;;  
-
-;; GuessRange -> Scene
-;; Visualize given interval as a scene
-;; > (render (interval 0 100))
-;; (overlay (text "50" 72 "red") MT-SC)
-(define (render w)
-  (overlay (text (number->string (guess w)) SIZE COLOR) MT-SC))
-
-;                                     
-;                                     
-;                                     
-;                                     
-;    ;                    ;           
-;   ;;;;;   ;;;    ;;;;  ;;;;;   ;;;; 
-;    ;     ;   ;  ;       ;     ;     
-;    ;     ;;;;;   ;;     ;      ;;   
-;    ;     ;         ;    ;        ;  
-;    ;     ;          ;   ;         ; 
-;     ;;;   ;;;;  ;;;;     ;;;  ;;;;  
-;                                     
-;                                     
-
-(module+ test
-  
-  (require rackunit rackunit/text-ui)
-  
-  ;; testing the 'model' functions for basic guesses 
-  
-  (check-true (single? (interval 50 50)))
-  (check-false (single? (interval 50 51)))
-  
-  (check-equal? (guess (interval 0 100)) 50)
-  (check-equal? (guess (interval 50 100)) 75)
-  (check-equal? (guess (interval 0 50)) 25)
-  
-  (check-equal? (smaller (interval 0 100)) (interval 0 49))
-  (check-equal? (smaller (interval 0 000)) (interval 0 0))
-  (check-equal? (smaller (interval 0 50)) (interval 0 24))
-  (check-equal? (smaller (interval 50 100)) (interval 50 74))
-  (check-equal? (smaller (bigger (bigger (interval 0 100))))
-                (interval 76 87))
-  
-  (check-equal? (bigger (interval 0 100)) (interval 51 100))
-  (check-equal? (bigger (interval 0 000)) (interval 0 0))
-  (check-equal? (bigger (interval 0 100)) (interval 51 100))
-  (check-equal? (bigger (interval 51 100)) (interval 76 100))
-  (check-equal? (bigger (interval 0 50)) (interval 26 50))
-  
-  (check-equal? (deal-with-guess (interval 0 100) "up") (interval 51 100))
-  (check-equal? (deal-with-guess (interval 0 100) "down") (interval 0 49))
-  (check-equal? (deal-with-guess (interval 0 100) "=") 
-                (stop-with (interval 0 100)))
-  (check-equal? (deal-with-guess (interval 0 100) "q") 
-                (stop-with (interval 0 100)))
-  (check-equal? (deal-with-guess (interval 0 100) "up") 
-                (interval 51 100))
-  (check-equal? (deal-with-guess (interval 50 100) "up") 
-                (interval 76 100))
-  (check-equal? (deal-with-guess (interval 0 100) "down")
-                (interval 0 49))
-  (check-equal? (deal-with-guess (interval 0 50) "down") 
-                (interval 0 24))
-  (check-equal? (deal-with-guess (interval 50 100) "e") 
-                (interval 50 100))
-  (check-equal? (deal-with-guess (interval 0 100) "f") 
-                (interval 0 100))
-  (check-equal? (deal-with-guess (deal-with-guess (interval 1 10) "up") 
-                                 "down")
-                (interval 6 7))
-
-  ;; testing the view functions 
-  
-  (check-equal? (render (interval 0 100))
-                (overlay (text "50" 72 "red") MT-SC))  
-  (check-equal? (render (interval 0 100))
-                (overlay (text "50" SIZE COLOR) MT-SC))
-  (check-equal? (render (interval 0 50))
-                (overlay (text "25" SIZE COLOR) MT-SC))
-  (check-equal? (render (interval 50 100))
-                (overlay (text "75" SIZE COLOR) MT-SC))
-  
-  "all tests run")
-
diff --git a/pkgs/realm/chapter5/ufo-source.rkt b/pkgs/realm/chapter5/ufo-source.rkt
deleted file mode 100644
index fdc8333583..0000000000
--- a/pkgs/realm/chapter5/ufo-source.rkt
+++ /dev/null
@@ -1,565 +0,0 @@
-#reader(lib"read.ss""wxme")WXME0108 ## 
-#|
-   This file uses the GRacket editor format.
-   Open this file in DrRacket version 5.3.4.12 or later to read it.
-
-   Most likely, it was created by saving a program in DrRacket,
-   and it probably contains a program with non-text elements
-   (such as images or comment boxes).
-
-            http://racket-lang.org/
-|#
- 30 7 #"wxtext\0"
-3 1 6 #"wxtab\0"
-1 1 8 #"wximage\0"
-2 0 8 #"wxmedia\0"
-4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
-1 0 16 #"drscheme:number\0"
-3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
-1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
-1 0 93
-(
- #"((lib \"collapsed-snipclass.ss\" \"framework\") (lib \"collapsed-sni"
- #"pclass-wxme.ss\" \"framework\"))\0"
-) 0 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
-0 0 19 #"drscheme:sexp-snip\0"
-0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
-1 0 68
-(
- #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
- #"lib\"))\0"
-) 1 0 29 #"drscheme:bindings-snipclass%\0"
-1 0 88
-(
- #"((lib \"pict-snip.rkt\" \"drracket\" \"private\") (lib \"pict-snip.r"
- #"kt\" \"drracket\" \"private\"))\0"
-) 0 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0"
-0 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
-1 0 22 #"drscheme:lambda-snip%\0"
-1 0 26 #"drracket:spacer-snipclass\0"
-0 0 57
-#"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
-1 0 26 #"drscheme:pict-value-snip%\0"
-0 0 45 #"(lib \"image-snipr.ss\" \"slideshow\" \"private\")\0"
-1 0 38 #"(lib \"pict-snipclass.ss\" \"slideshow\")\0"
-2 0 55 #"(lib \"vertical-separator-snip.ss\" \"stepper\" \"private\")\0"
-1 0 18 #"drscheme:xml-snip\0"
-1 0 31 #"(lib \"xml-snipclass.ss\" \"xml\")\0"
-1 0 21 #"drscheme:scheme-snip\0"
-2 0 34 #"(lib \"scheme-snipclass.ss\" \"xml\")\0"
-1 0 10 #"text-box%\0"
-1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
-1 0 1 6 #"wxloc\0"
-          0 0 67 0 1 #"\0"
-0 75 1 #"\0"
-0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
-#"Standard\0"
-0 75 23 #"Lucida Sans Typewriter\0"
-0 12 90 -1 90 -1 1 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
-#"framework:default-color\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
-#"text:ports out\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 15 #"text:ports err\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
-#"text:ports value\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 27 #"Matching Parenthesis Style\0"
-0 -1 1 #"\0"
-1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
--1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:symbol\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 38
-#"framework:syntax-color:scheme:keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
-38 #"framework:syntax-color:scheme:comment\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 37
-#"framework:syntax-color:scheme:string\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 39
-#"framework:syntax-color:scheme:constant\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 49
-#"framework:syntax-color:scheme:hash-colon-keyword\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 42
-#"framework:syntax-color:scheme:parenthesis\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:error\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 36
-#"framework:syntax-color:scheme:other\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 16
-#"Misspelled Text\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
-38 #"drracket:check-syntax:lexically-bound\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
-#"drracket:check-syntax:set!d\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 37
-#"drracket:check-syntax:unused-require\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
-#"drracket:check-syntax:free-variable\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31
-#"drracket:check-syntax:imported\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 47
-#"drracket:check-syntax:my-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 50
-#"drracket:check-syntax:their-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 48
-#"drracket:check-syntax:unk-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-49 #"drracket:check-syntax:both-obligation-style-pref\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
-26 #"plt:htdp:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 255 56 81 0 0 0 -1 -1 2 27
-#"plt:htdp:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 255 56 81 0 0 0 -1 -1 4 1
-#"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 4 #"XML\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 37
-#"plt:module-language:test-coverage-on\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 139 34 0 0 0 -1 -1 2 1
-#"\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 2 38
-#"plt:module-language:test-coverage-off\0"
-0 -1 1 #"\0"
-1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 176 48 96 0 0 0 -1 -1 0 1
-#"\0"
-0 75 23 #"Lucida Sans Typewriter\0"
-0.0 12 90 -1 90 -1 1 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0.0 0.0 0.0 0.0 0.0 0.0 255 165 0 0
-0 0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 4 1 #"\0"
-0 -1 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 100 0 0 0
-0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-0.0 13 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-0.0 13 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 0 1 #"\0"
-0 75 1 #"\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 0 1 #"\0"
-0 75 12 #"Courier New\0"
-0.0 10 90 -1 90 -1 3 -1 0 1 0 1 0 0 0.0 0.0 0.0 0.0 0.0 0.0 0 0 0 255
-255 255 1 -1 4 1 #"\0"
-0 71 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 255 0 0 0 0
-0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 148 0 211 0
-0 0 -1 -1 2 1 #"\0"
-0 70 1 #"\0"
-1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0.0 0.0 0.0 1.0 1.0 1.0 0 0 255 0 0
-0 -1 -1 0 1 #"\0"
-0 -1 1 #"\0"
-0.0 12 -1 -1 -1 -1 -1 -1 0 0 1 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1 2 1 #"\0"
-0 -1 1 #"\0"
-0.0 12 -1 -1 -1 -1 -1 -1 0 0 1 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
--1 -1           0 147 0 27 3 12 #"#lang racket"
-0 0 23 29 1 #"\n"
-0 0 23 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 14 3 7 #"require"
-0 0 23 3 1 #" "
-0 0 14 3 14 #"2htdp/universe"
-0 0 23 3 1 #" "
-0 0 14 3 11 #"2htdp/image"
-0 0 23 3 1 #")"
-0 0 23 29 1 #"\n"
-0 0 23 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 23 3 1 #" "
-0 0 14 3 5 #"WIDTH"
-0 0 23 3 1 #" "
-0 0 20 3 3 #"200"
-0 0 23 3 1 #")"
-0 0 23 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 23 3 1 #" "
-0 0 14 3 6 #"HEIGHT"
-0 0 23 3 1 #" "
-0 0 20 3 3 #"300"
-0 0 23 3 1 #")"
-0 0 23 29 1 #"\n"
-0 0 23 29 1 #"\n"
-0 0 17 3 86
-(
- #";; depending on your settings, drracket may claim that the image cau"
- #"ses a syntax error"
-) 0 0 23 29 1 #"\n"
-0 0 17 3 50 #";; please ignore this warning and click RUN anyway"
-0 0 23 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 23 3 1 #" "
-0 0 14 3 12 #"IMAGE-of-UFO"
-0 0 23 3 1 #" "
-0 2          23 4 1 #"\0"
-2 -1.0 -1.0 0.0 0.0 0           6 500
-(
- #"\211PNG\r\n\32\n\0\0\0\rIHDR\0\0\0Q\0\0\0F\b"
- #"\6\0\0\0\264\\x\25\0\0\nvIDATx\234\355\\\353q\333\274\22"
- #"=\360\334\377\202R@L7\20Q\5d\fU *\r\210j \246\322\0\351"
- #"\n(7`\321\25P\223\2L\272\201\220J\1\241\234\2>\322.@{\177\330"
- #"@\370\322\233\262\235\214\317\f\306\326\203"
- #"\300\362`\261\330\a(FD\204W\4"
- #"\21\2011\246\376\376\215`\257M\342\277"
- #"\200\223\327\34\374_\231\277W!Q\222"
- #"\367\267.\3372^\205\304\177\205<\211"
- #"\377\275\304 D\204\307\307GDQT\371L\327up\316_B\214\343\201\216\210"
- #"(\212\3104M\3224\215\0\20c\214\0T\232\246id\232&\371\276\177Lq"
- #"\216\206\243\220\30\4\1\t!j\t\253kyr[\255\26\331\266Mi\232\36C"
- #"\264\243\240q\27g<\36c2\231\0"
- #"\200\362\377\6\203\1:\235\16\204\20R\373\1\0wwwX,\26\b\303\20\213"
- #"\305\242\320\17\347\34\266m\303\262\254&"
- #"\305;\16\232\232\2154M\3110\214\212v\t!\266\272^.}\2244\3230\f"
- #"\312\262\254\366\232\345r\331\224\370\a\241"
- #"1\22%\1\0\250\333\355\252\377\267%Qb\261X\320p8,\220\251\353\372\233"
- #"^\336\215\220h\333\266\272i\3030\210"
- #"s\256Ht\34g\355\265\253\264)\212\"\3224\355\257 \362`\22\223$),"
- #"=\271\241\350\272N\0\310u]\"\372"
- #"C\326.K\260l\"\272\335\356\241\342\36\5\a\223(\2271\347\234|\337WK"
- #"\330q\34\2@A\20\250\357\356k\303"
- #"\206\303\241\322H\333\266\337\214-\224\330"
- #"H\342:\201\363Z\350y\36\365\373}b\214Q\24E\324\353\365\b\0%I\322"
- #"\210\240y\227i\261X4\322gS\330J\23W"
- #"\219\231L\224\26\246iZ\330H\344\r7\2054"
-) 500
-(
- #"M\225\323n\232fc\3756\201\203\356Rj\207i\232\24\4\201\322\3104M\325"
- #"\362k\22r\214\267\246\215\a% \3020\4\0\364\373}DQ\4\306\30NO"
- #"O\245\377\t]\327\17\351\276\2!\4"
- #"\204\20`\214\301\367\375F\373>\4{"
- #"\223\230\2170t]\307\343\343#\210\b"
- #"\275^\17\343\361\30\0\320n\267\17\26"
- #"\260\f\333\266AD\270\271\271i\274\357"
- #"\275\261\257\n\347\227\26\21\221\3438\265"
- #"\t\206c@\332\306\267\202\275Sa2'\250i\32\0\340\342\342\2\235N\a?"
- #"\177\376\4\21\325\306\303M\3010\fL"
- #"&\23\204a\250\342q\340O\275\346\245"
- #"\2617\211\364\234D\2206\260\325j\301"
- #"0\f\30\206\1\340i\331\35\v\253l\355k%{\17\316lK\301\217y\3T"
- #"J4\311\211{+vq/\22\211H-\325\207\207\207&\345\251Ey\202\244\t"
- #"\361<\17wwwG\37\177#v1\240y\247;\37\323\266\333m2M\223f"
- #"\263Y\223\366\272\2028\216\3114\315B"
- #"\202C:\372\257\211\275\2668\231\265\221"
- #"\255\274+\313\3309\b\202\203n\360\376"
- #"\376\236<\317+\224\30\352\332kgx"
- #"v\316l{\236\207\321h\264\263\306\313]T\b\261r\27e\214!\212\"dY"
- #"\246\34\371:0\306\320j\265\360\360\360"
- #"\240\372\32\16\207\230N\247;\313\325\b"
- #"va<\212\242\302R\3224\215\204\20"
- #"*\355\205\32\255\224\257W\25\251\266i\362ZM\323h0\30P\267\333-\310!"
- #"\333k\305\324[\2738Y\226a4\32"
- #"!\3132\365\236\334\\\204\20\30\16\207\350\365z\350t:\210\343X}/o\370"
- #"\3030Tu\227,\313\20\307qe\34\316\271ra4M\203\246i\350t:\340"
- #"\234\343\356\356\16\223\311\244 \3\0X\226\205,\313\340y\36\0`:\235"
- #"\276\254\317\270-\333\371\364\177\273\335"
- #"^\2531B\b\262,\213\\\327=\310"
-) 500
-(
- #".\6A@\216\343\0244=\337\316\317"
- #"\317U\276\362\277\377\376S\337{i\215\334\312&\316f3\f\6\3\0O\2322"
- #"\36\217\361\361\343G0\306\20\3071\302"
- #"0\254\325\2522d\241\2361\206\363\363"
- #"\363\312\347R\203\27\213\205\322r\251\271"
- #"r\354^\257\207\317\237?\343\313\227/"
- #"\205d\207\224\245\327\353!\3132X\226"
- #"\5\327u7\312\324\b6\261\234\246i\305\245\360}\237|\337'M\323T\r%"
- #"MS\362}\237\34\307\241\363\363\363\225"
- #"\332Zn\333\330J\327u)\212\"%\323\272D\361t:U\327M\247\323\303T"
- #"lKl$\261\337\357\27n(\fCJ\222\204\242(R\2\327-\237\321h\244"
- #"\352.\216\343\220a\30+\227e\236L"
- #"!\4\231\246I\236\347\25\222\30\273\324"
- #"h,\313R\375\275\4\221\25\22\363B\6AP\2709M\323\210\210T\25N\326"
- #"T\312\n}}}M\214\261\332J\37\347\234\6\203\301v\302m\231\t\252#6"
- #"?a777[\215\267/\na\37\225v\264\361x\254\222\253\375~\37\246i"
- #"\2x\262MD\244\302/\371>=\333\256\337\277\177\203\2100\34\16\341y\36."
- #"//\225\337\327n\267\221\246ia\314"
- #"U(\357\256i\232\242\327\353\2011\6\306X\301n\226\341\373\276:(uqq"
- #"\241l\366\272\361\366\306*v\363\266%\212\"r]\227\272\335.EQDY\226"
- #"Q\232\246\224$\tq\316+'\24\344\265D\244\nV\262t\212\347\bc\e\240"
- #"\244\211\262\202(\333\252\232\266\324\314\374"
- #"Ji\267\333\312Kh\272Z\250$,w,\227\254\0244\212\"%\220\264s\246"
- #"i\256\254\346\351\272NA\20\220\353\272$\204\240$IT\"\267|*b\325M"
- #"\225\3534\345CR\206al\274A\313\262\n\341\3411P\253\211r"
- #"\6\363\301\375r\271\244\351tJB\b\352\365z\25\203]&\"\216c"
-) 500
-(
- #"2\f\203\202 \240 \bh6\233Q\253\325\"\306\30Y\226\265\235p%M\314"
- #"\23X7\31u\310W\t\1l=\366.\250%q0\30\324.\227]\227A\222"
- #"$J{\244V\265\333\355\255k\321e\22\313}I\23\261\t\371R\6P<P"
- #"\320\4\330r\271\244\274a\316\262\f\37"
- #">|@\253\325B\222$\215\234b\215\343\30\337\277\177\307r\271\304h4RN"
- #"\362&H\271(\267\31\204a\2100\fqrr\202\257_\277n-\337\267o\337"
- #"\224\363}vv\206_\277~\355x\27kPfUn\nuj\177\250A\336\344"
- #"\353\225\337\307\226.\316\246~\210\236\226"
- #"u>\0h\322\177\254H(c\344|\204p(\366%\177_\22W\215-ww"
- #"\306\230\362y\233@EB]\327\211s\336\330\0\207\240\t\22\363(\207\260Me"
- #"\342+5\226\371|\16\3169<\317\253"
- #"\244\234\3362\350\331nR\2153\375\360"
- #"\360\0\317\3630\30\f\n\367\264.\361\273\v*Y\34\31\r\310\267;\235\16z"
- #"\275\36t]\307\247O\237\320\355v\e"
- #"\31x\e\234\234\234\200\236V\313\316\327"
- #"\206a\210\273\273;\4A\260\262\230%\204@\20\4\207\212Y_w\316\v=\237"
- #"\3171\237\317\325k\231\306\322u\35\247"
- #"\247\247\350v\2738==U!`\271\237}\23\243Y\226mE\236L\233\311C"
- #"\364q\34o\225\226k\22\265$Z\226"
- #"\5\3169\34\307Q\357I\355\244\347\323"
- #"\rr)\224\265\266\335n\253\274\241\314"
- #"R\23Q!c\275\16\222\370\374\203CR\253\200\3659\307\362_M\323\260X,"
- #"\320j\265\20\3071F\243QcK\270,t\1x\16\217\362!\232\357\373j\327"
- #"\326u\235|\337/\224L\367mB\210\225m]\332,\337\362N\274m\333*:"
- #"\271\275\275\255\204\231\371\335\31\rF/\265$\2"
- #"P'\370\245\0\223\311\204\30c\364\343\307\17\""
-) 500
-(
- #"\372S6\235\315f\344\272.u:\35\25\345\f\6\203\332BR\23\244\313~M"
- #"\323,\220\26\4\1-\227K\25\325\4A@\213\305B]\233$I\345\311\256\246"
- #"\334\270\n\211\345 \377\354\354\214\202 "
- #"P\232'C6\333\266\2111\246\234V"
- #"y\203\371~\344\347I\222\220\353\272J"
- #"\233e\342u\25Y\234\363\312\1\322\262"
- #"|R\16\371\272\374\271\357\373\24\4\301"
- #"\312\311<\252\237\350\272na\251\224\323"
- #"\367ggg4\34\16\25\t\266m\257\275\231|\234\\>\f/\307\220\310gm"
- #"\344R,\307\357\345q\344\344\372\276_ylc\335\362?j\304\222?\314\276m"
- #"\343\234\253\31\17\202\200\242(RI\214<\362$.\227Ku\275\22&\367Z\206"
- #"\237\345t\227\324\360\262\335\344\234\257$"
- #"\217s^\260\341M\247\304@T\r\313\362K\3154M\262,\253\326\340\357R\220"
- #"\3274\255pp=\257\3612/)\373t]\227\306\343q\201\204:mZ7\276"
- #"\264\231\262d\233O27\235\305\251\255"
- #"\261$I\242\226\262\256\353*<\212\242\210\f\303(<Sr\214\rd\23a\371"
- #"\t\311\267\351t\252\226\363\365\365\265\272"
- #"\247\274m\224\346\247I\324\326\235\211\b"
- #"\227\227\227\270\274\274,\177\4\340\251\306"
- #"r{{\213n\267\v\307qpyy\251\316\307\270\256\vM\323\n\376#\200\202"
- #"_)\307\220\276_\371\273\371q:\235"
- #"\16\200\247\323\20\247\247\2478;;\303"
- #"\325\325\25\256\256\256\n\327L\247S\f"
- #"\207C%7\347\34\246i\26j\342\246"
- #"i\342\372\372\272\371\223\21\353\30\256\363"
- #"\59\347\25\327\240l\233\216U\246\234N\247\25\315\3274M\271]DOI\6"
- #"\351n\345\233,\353\36\343i\254Z\22"
- #"\345@i\232\222m\333$\204\240\363\363s2M\263\366HH\232\246\244\353"
- #"za\311\t!\32\261=i\232\222\353\272\265\313\327\262\254\212<\313\345R"
-) 235
-(
- #"=\23(\204 \3030\216~nr\347<\323\252\231\224D\242d\277t]W\276"
- #"\342\266\220\247)L\323\254\335<\204\20"
- #"\215\346;\17\305\332\2638\264G\2\301q\34\\]]\325\246\321t]W\211\213"
- #"|,=\237\317\221\246)\356\357\357\21\3071\346\363y\255\2154M\23\226e)"
- #";\371fp\214\231\221f\240\34f\355sF\3210\f\362<\217\262,\333\353q"
- #"\337\227\300V\247\302\350\200\224V\34\307"
- #"\230\315f\230\317\347*U%Q\336\225"
- #"\205\20\352<\242\256\353\205gTv\205"
- #"\354\367%\316(\36\365\267\3026\221\277"
- #"\353\344\344\211i\272\357C\360\376\203k"
- #"\r\340\305\177\346\352XsV\356w\325"
- #"8\307\30\377]\23\e\300\253\376\364\337"
- #"\277\202w\22\e\300;\211\r\340\235\304\6\360Nb\3\370?"
- #"R\3460\324\254\223\240\300\0\0\0\0IEND\256B`\202"
-) 0 0 23 3 1 #")"
-0 0 23 29 1 #"\n"
-0 0 23 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 23 3 2 #" ("
-0 0 14 3 14 #"add-3-to-state"
-0 0 23 3 1 #" "
-0 0 14 3 13 #"current-state"
-0 0 23 3 1 #")"
-0 0 23 29 1 #"\n"
-0 0 23 3 3 #"  ("
-0 0 14 3 1 #"+"
-0 0 23 3 1 #" "
-0 0 14 3 13 #"current-state"
-0 0 23 3 1 #" "
-0 0 20 3 1 #"3"
-0 0 23 3 2 #"))"
-0 0 23 29 1 #"\n"
-0 0 23 29 1 #"\n"
-0 0 23 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 23 3 2 #" ("
-0 0 14 3 30 #"draw-a-ufo-onto-an-empty-scene"
-0 0 23 3 1 #" "
-0 0 14 3 13 #"current-state"
-0 0 23 3 1 #")"
-0 0 23 29 1 #"\n"
-0 0 23 3 3 #"  ("
-0 0 14 3 11 #"place-image"
-0 0 23 3 1 #" "
-0 0 14 3 12 #"IMAGE-of-UFO"
-0 0 23 3 2 #" ("
-0 0 14 3 1 #"/"
-0 0 23 3 1 #" "
-0 0 14 3 5 #"WIDTH"
-0 0 23 3 1 #" "
-0 0 20 3 1 #"2"
-0 0 23 3 2 #") "
-0 0 14 3 13 #"current-state"
-0 0 23 29 1 #"\n"
-0 0 23 3 16 #"               ("
-0 0 14 3 11 #"empty-scene"
-0 0 23 3 1 #" "
-0 0 14 3 5 #"WIDTH"
-0 0 23 3 1 #" "
-0 0 14 3 6 #"HEIGHT"
-0 0 23 3 3 #")))"
-0 0 23 29 1 #"\n"
-0 0 23 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 23 3 2 #" ("
-0 0 14 3 12 #"state-is-300"
-0 0 23 3 1 #" "
-0 0 14 3 13 #"current-state"
-0 0 23 3 1 #")"
-0 0 23 29 1 #"\n"
-0 0 23 3 3 #"  ("
-0 0 14 3 2 #">="
-0 0 23 3 1 #" "
-0 0 14 3 13 #"current-state"
-0 0 23 3 1 #" "
-0 0 20 3 3 #"300"
-0 0 23 3 2 #"))"
-0 0 23 29 1 #"\n"
-0 0 23 29 1 #"\n"
-0 0 23 3 1 #"("
-0 0 15 3 6 #"define"
-0 0 23 3 2 #" ("
-0 0 14 3 4 #"main"
-0 0 23 3 1 #")"
-0 0 23 29 1 #"\n"
-0 0 23 3 3 #"  ("
-0 0 14 3 8 #"big-bang"
-0 0 23 3 1 #" "
-0 0 20 3 1 #"0"
-0 0 23 3 40 #"                                        "
-0 0 17 3 17 #";; initial state "
-0 0 23 29 1 #"\n"
-0 0 23 3 13 #"            ("
-0 0 14 3 7 #"on-tick"
-0 0 23 3 1 #" "
-0 0 14 3 14 #"add-3-to-state"
-0 0 23 3 18 #")                 "
-0 0 17 3 32 #";; when the clock ticks, add ..."
-0 0 23 29 1 #"\n"
-0 0 23 3 13 #"            ("
-0 0 14 3 7 #"to-draw"
-0 0 23 3 1 #" "
-0 0 14 3 30 #"draw-a-ufo-onto-an-empty-scene"
-0 0 23 3 2 #") "
-0 0 17 3 36 #";; when the state changes, draw ... "
-0 0 23 29 1 #"\n"
-0 0 23 3 13 #"            ("
-0 0 14 3 9 #"stop-when"
-0 0 23 3 1 #" "
-0 0 14 3 12 #"state-is-300"
-0 0 23 3 18 #")))               "
-0 0 17 3 45 #";; when the UFO's y coordinate is 300, stop. "
-0 0 23 29 1 #"\n"
-0 0 23 29 1 #"\n"
-0 0 17 3 43 #";; to run the program, click run and enter "
-0 0 23 29 1 #"\n"
-0 0 17 3 14 #";;   > (main) "
-0 0 23 29 1 #"\n"
-0 0 17 3 18 #";; at the prompt. "
-0           0
diff --git a/pkgs/realm/chapter6/graphics/body.gif b/pkgs/realm/chapter6/graphics/body.gif
deleted file mode 100644
index 94a0956456..0000000000
Binary files a/pkgs/realm/chapter6/graphics/body.gif and /dev/null differ
diff --git a/pkgs/realm/chapter6/graphics/goo.gif b/pkgs/realm/chapter6/graphics/goo.gif
deleted file mode 100644
index cb0d98b887..0000000000
Binary files a/pkgs/realm/chapter6/graphics/goo.gif and /dev/null differ
diff --git a/pkgs/realm/chapter6/graphics/head.gif b/pkgs/realm/chapter6/graphics/head.gif
deleted file mode 100644
index 664f6795e0..0000000000
Binary files a/pkgs/realm/chapter6/graphics/head.gif and /dev/null differ
diff --git a/pkgs/realm/chapter6/graphics/tail.gif b/pkgs/realm/chapter6/graphics/tail.gif
deleted file mode 100644
index 6fbd3170c6..0000000000
Binary files a/pkgs/realm/chapter6/graphics/tail.gif and /dev/null differ
diff --git a/pkgs/realm/chapter6/readme.txt b/pkgs/realm/chapter6/readme.txt
deleted file mode 100644
index de7648f177..0000000000
--- a/pkgs/realm/chapter6/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-This chapter implements the old "snake" game with a small twist. 
-
-To play or to experiment, open the file
-
-	 source.rkt 
-
-in DrRacket. The instructions for playing are at the top of the file. 
-Our tests are at the bottom of the file in a separate 'test' submodule. 
-
diff --git a/pkgs/realm/chapter6/source.rkt b/pkgs/realm/chapter6/source.rkt
deleted file mode 100644
index f991a1f4cf..0000000000
--- a/pkgs/realm/chapter6/source.rkt
+++ /dev/null
@@ -1,863 +0,0 @@
-#lang racket
-
-#|
-   The Snake game 
-   --------------
-
-   The Snake game revolves around a room filled with pieces of radioactive goo
-   and a snake that can remove this goo. 
-
-   When the snake eats the goo, it grows and new goo appears. Like all 
-   radioactive material, goo decays over time. Eventually it expires, but 
-   fortunately for the snake, a new piece of goo appears elsewhere.
-
-   The player is in control of a snake, and the objective is to grow the snake as 
-   large as possible. She may change the direction of the snake by pressing one of 
-   the four arrow keys. When the snake gets close to a piece of goo, it eats the 
-   goo and grows a new segment. If the snake runs into itself or one of the four 
-   walls, the game is over. The length of the snake is the player's score. 
-
-   Play
-   ----
- 
-   Run and evaluate 
-     (start-snake)
-   This will pop up a window with instructions for interacting with the program. 
-   Watch how qiuckly the program guesses X. 
-|#
-
-;
-;
-;
-;
-;                                 ;;
-;     ;;; ;                        ;
-;    ;   ;;                        ;
-;    ;    ;   ;; ;;;      ;;;;     ;  ;;;     ;;;
-;    ;         ;;   ;    ;    ;    ;  ;      ;   ;
-;     ;;;;     ;    ;         ;    ; ;      ;     ;
-;         ;    ;    ;    ;;;;;;    ;;;      ;;;;;;;
-;    ;    ;    ;    ;   ;     ;    ;  ;     ;  
-;    ;;   ;    ;    ;   ;    ;;    ;   ;     ;    ;
-;    ; ;;;    ;;;  ;;;   ;;;; ;;  ;;  ;;;;    ;;;;
-;
-;
-;
-;
-
-(require 2htdp/image 2htdp/universe)
-;; -----------------------------------------------------------------------------
-;; Data Definitions
-
-;; A Pit is a (pit Snake (Listof Goo))
-(struct pit (snake goos) #:transparent)
-
-;; A Snake is a (make-snake Direction (cons Seg [Listof Seg]))
-(struct snake (dir segs) #:transparent)
-;; The head of the snake is the first element in the list of segs.
-;; Each segment of a snake is located with:
-;;  - x in (0,SIZE),
-;;  - y in (0,SIZE).
-;; And is SEG-SIZE aligned (x and y are multiples of SEG-SIZE).
-
-;; A Seg is a (posn Number Number)
-
-;; A Goo is a (goo Posn Number)
-(struct goo (loc expire) #:transparent)
-;; The expire field is a Natural Number that represents the number
-;; of ticks until the goo expires. A goo is expired when this field is 1
-
-;; A Direction is one of "up" "down" "left" "right"
-
-;; A Posn is (posn number number)
-(struct posn (x y) #:transparent)
-;; Represents a two dimensional point.
-
-;; -----------------------------------------------------------------------------
-;; Constants
-
-;; Tick Rate 
-(define TICK-RATE 1/10)
-
-;; Board Size Constants
-(define SIZE 30)
-
-;; Snake Constants
-(define SEG-SIZE 15)
-
-;; Goo Constants
-(define MAX-GOO 5)
-(define EXPIRATION-TIME 150)
-
-;; GRAPHICAL BOARD
-(define WIDTH-PX  (* SEG-SIZE 30))
-(define HEIGHT-PX (* SEG-SIZE 30))
-
-;; Visual constants
-(define MT-SCENE (empty-scene WIDTH-PX HEIGHT-PX))
-(define GOO-IMG (bitmap "graphics/goo.gif"))
-(define SEG-IMG  (bitmap "graphics/body.gif"))
-(define HEAD-IMG (bitmap "graphics/head.gif"))
-
-(define HEAD-LEFT-IMG HEAD-IMG)
-(define HEAD-DOWN-IMG (rotate 90 HEAD-LEFT-IMG))
-(define HEAD-RIGHT-IMG (flip-horizontal HEAD-LEFT-IMG))
-(define HEAD-UP-IMG (flip-vertical HEAD-DOWN-IMG))
-
-(define ENDGAME-TEXT-SIZE 15)
-
-
-;                                          
-;                                          
-;                                          
-;                          ;               
-;                          ;               
-;  ;;;   ;;;                               
-;   ;;   ;;                                
-;   ; ; ; ;     ;;;;     ;;;      ;; ;;;   
-;   ; ; ; ;    ;    ;      ;       ;;   ;  
-;   ; ; ; ;         ;      ;       ;    ;  
-;   ;  ;  ;    ;;;;;;      ;       ;    ;  
-;   ;     ;   ;     ;      ;       ;    ;  
-;   ;     ;   ;    ;;      ;       ;    ;  
-;  ;;;   ;;;   ;;;; ;;  ;;;;;;;   ;;;  ;;; 
-;                                          
-;                                          
-;                                          
-;                                          
-;; -----------------------------------------------------------------------------
-
-;; Start the Game
-(define (start-snake)
-  (big-bang (pit (snake "right" (list (posn 1 1)))
-                 (list (fresh-goo)
-                       (fresh-goo)
-                       (fresh-goo)
-                       (fresh-goo)
-                       (fresh-goo)
-                       (fresh-goo)))
-            (on-tick next-pit TICK-RATE)
-            (on-key direct-snake)
-            (to-draw render-pit)
-            (stop-when dead? render-end)))
-
-;; Pit -> Pit
-;; Take one step: eat or slither
-(define (next-pit w)
-  (define snake (pit-snake w))
-  (define goos  (pit-goos w))
-  (define goo-to-eat (can-eat snake goos))
-  (if goo-to-eat
-      (pit (grow snake) (age-goo (eat goos goo-to-eat)))
-      (pit (slither snake) (age-goo goos))))
-
-;; Pit KeyEvent -> Pit
-;; Handle a key event
-(define (direct-snake w ke)
-  (cond [(dir? ke) (world-change-dir w ke)]
-        [else w]))
-
-;; Pit -> Scene
-;; Render the world as a scene
-(define (render-pit w)
-  (snake+scene (pit-snake w)
-               (goo-list+scene (pit-goos w) MT-SCENE)))
-
-;; Pit -> Boolean
-;; Is the snake dead?
-(define (dead? w)
-  (define snake (pit-snake w))
-  (or (self-colliding? snake) (wall-colliding? snake)))
-
-;; Pit -> Scene
-;; produces a gameover image
-(define (render-end w)
-  (overlay (text "Game over" ENDGAME-TEXT-SIZE "black")
-           (render-pit w)))
-
-;                                                                                          
-;                                                                                          
-;                                                                                          
-;     ;;;;    ;;                    ;;              ;;;;;;     ;            ;;             
-;    ;   ;     ;                     ;              ;  ;                     ;             
-;   ;          ;     ;;;;    ;;; ;   ; ;;;;            ;     ;;;     ;;; ;   ; ;;;;  ;;;;; 
-;   ;          ;    ;    ;  ;;  ;;   ;  ;              ;       ;    ;;  ;;   ;  ;   ;    ; 
-;   ;          ;    ;    ;  ;        ;;;               ;       ;    ;        ;;;     ;;;;  
-;   ;          ;    ;    ;  ;        ; ;               ;       ;    ;        ; ;         ; 
-;    ;   ;     ;    ;    ;  ;    ;   ;  ;              ;       ;    ;    ;   ;  ;   ;    ; 
-;     ;;;    ;;;;;   ;;;;    ;;;;   ;;  ;;;           ;;;    ;;;;;   ;;;;   ;;  ;;; ;;;;;  
-;                                                                                          
-;                                                                                          
-;                                                                                          
-;                                                                                          
-
-;; -----------------------------------------------------------------------------
-;; Movement and Eating
-
-;; -----------------------------------------------------------------------------
-;; Eating and Growth
-
-;; Snake [Listof Goo] -> Goo or #f
-;; Can the snake eat any of the goos?
-;; > (can-eat (snake "right" `(,(posn 3 3))) `(,(goo (posn 3 3) 130)))
-;; (goo (posn 3 3) 130)
-(define (can-eat snake goos)
-  (cond [(empty? goos) #f]
-        [else (if (close? (snake-head snake) (first goos))
-                  (first goos)
-                  (can-eat snake (rest goos)))]))
-
-;; [Listof Goo] Goo -> [Listof Goo]
-;; Eat and replenish a goo.
-;; > (eat (list (goo (posn 5 5) 5)) (goo (posn 5 5) 5))
-;; (list (new-goo))
-(define (eat goos goo-to-eat)
-  (cons (fresh-goo) (remove goo-to-eat goos)))
-
-;; Seg Goo -> Boolean
-;; Is the segment close to the goo?
-;; > (close? (posn 1 2) (goo (posn 1 2) 4))
-;; #t
-(define (close? s g)
-  (posn=? s (goo-loc g)))
-
-;; Grow the snake one segment.
-;; Snake -> Snake
-;; > (grow snake0)
-;; (snake "right" `(,(posn 2 1) ,(posn 1 1)))
-(define (grow sn)
-  (snake (snake-dir sn) (cons (next-head sn) (snake-segs sn))))
-
-;; -----------------------------------------------------------------------------
-;; Movement
-
-;; Snake -> Snake
-;; Slither the snake forward one segment.
-;; > (slither snake0)
-;; (snake "right" (posn 2 1))
-(define (slither sn)
-  (snake (snake-dir sn)
-         (cons (next-head sn) (all-but-last (snake-segs sn)))))
-
-;; Snake -> Seg
-;; Compute the next head position of the snake.
-;; > (next-head snake0)
-;; (snake "right" (list (posn 2 1)))
-(define (next-head sn)
-  (define head (snake-head sn))
-  (define dir (snake-dir sn))
-  (cond [(string=? dir "up") (posn-move head 0 -1)]
-        [(string=? dir "down") (posn-move head 0 1)]
-        [(string=? dir "left") (posn-move head -1 0)]
-        [(string=? dir "right") (posn-move head 1 0)]))
-
-;; Posn Number Number -> Posn
-;; Move the position by dx, dy.
-;; > (posn-move (posn 1 1) 2 3)
-;; (posn 3 4)
-(define (posn-move p dx dy)
-  (posn (+ (posn-x p) dx)
-        (+ (posn-y p) dy)))
-
-;; (cons X [Listof X]) -> [Listof X]
-;; Returns a List that is does not contain the last element of the given list.
-;; > (all-but-last '(1 2 3 4))
-;; '(1 2 3)
-(define (all-but-last segs)
-  (cond [(empty? (rest segs)) empty]
-        [else (cons (first segs) 
-                    (all-but-last (rest segs)))]))
-
-;; -----------------------------------------------------------------------------
-;; Rotting Goo
-
-;; [Listof Goo] -> [Listof Goo]
-;; Renew and rot goos.
-(define (age-goo goos)
-  (rot (renew goos)))
-
-;; [Listof Goo] -> [Listof Goo]
-;; Renew any rotten goos.
-(define (renew goos)
-  (cond [(empty? goos) empty]
-        [(rotten? (first goos))
-         (cons (fresh-goo) (renew (rest goos)))]
-        [else
-         (cons (first goos) (renew (rest goos)))]))
-
-;; [Listof Goo] -> [Listof Goo]
-;; Rot all of the goos.
-(define (rot goos)
-  (cond [(empty? goos) empty]
-        [else (cons (decay (first goos))
-                    (rot (rest goos)))]))
-
-;; Goo -> Boolean
-;; has the goo expired?
-;; > (rotten? (goo 1 2) 0)
-;; #t
-(define (rotten? g)
-  (zero? (goo-expire g)))
-
-;; Goo -> Goo
-;; decreases the expire field of goo by one
-;; > (decay (goo (posn 1 2) 2))
-;; (goo (posn 1 2) 1)
-(define (decay g)
-  (goo (goo-loc g) (sub1 (goo-expire g))))
-
-;; -> Goo
-;; Create random goo with fresh expiration.
-;; Property: The position of the goo is:
-;;  - x in (0,WIDTH),
-;;  - y in (0,HEIGHT).
-(define (fresh-goo)
-  (goo (posn (add1 (random (sub1 SIZE)))
-             (add1 (random (sub1 SIZE))))
-       EXPIRATION-TIME))
-
-;                                                                                                      
-;                                                                                                      
-;                                                                                                      
-;                                                                                                      
-;                                                                                                      
-;   ;;; ;;;;
-;    ;   ;
-;    ;  ;       ;;;    ;;;   ;;;   ;;;; ;
-;    ; ;       ;   ;    ;     ;   ;    ;;
-;    ;;;;     ;     ;    ;   ;    ;
-;    ;   ;    ;;;;;;;    ;   ;     ;;;;;
-;    ;   ;    ;           ; ;           ;
-;    ;    ;    ;    ;     ; ;     ;     ;
-;   ;;;   ;;    ;;;;       ;      ;;;;;;
-;                          ;
-;                         ;
-;                      ;;;;;
-;                                                                                                      
-;; -----------------------------------------------------------------------------
-
-;; String -> Boolean
-;; Is the given value a direction?
-;; > (dir? "up")
-;; #t
-(define (dir? x)
-  (or (string=? x "up") 
-      (string=? x "down") 
-      (string=? x "left") 
-      (string=? x "right")))
-
-;; Pit Direction-> Pit
-;; Change the direction (if not opposite current snake dir)
-;; > (world-change-dir world0 "up")
-;; (pit snake1 (list goo0)) 
-(define (world-change-dir w d)
-  (define the-snake (pit-snake w))
-  (cond [(and (opposite-dir? (snake-dir the-snake) d) 
-              ;; consists of the head and at least one segment:
-              (cons? (rest (snake-segs the-snake))))
-         (stop-with w)]
-        [else 
-         (pit (snake-change-dir the-snake d) 
-              (pit-goos w))]))
-
-;; Direction Direction -> Boolean
-;; Are d1 and d2 opposites?
-;; > (opposite-dir? "up" "down")
-;; #t
-(define (opposite-dir? d1 d2)
-  (cond [(string=? d1 "up")    (string=? d2 "down")]
-        [(string=? d1 "down")  (string=? d2 "up")]
-        [(string=? d1 "left")  (string=? d2 "right")]
-        [(string=? d1 "right") (string=? d2 "left")]))
-
-
-;
-;
-;
-; 
-;                                      ;;
-;   ;;;;;;                              ;
-;    ;    ;                             ;
-;    ;    ;     ;;;     ;; ;;;      ;;; ;     ;;;      ;;  ;;;
-;    ;    ;    ;   ;     ;;   ;    ;   ;;    ;   ;      ;;;
-;    ;;;;;    ;     ;    ;    ;   ;     ;   ;     ;     ;
-;    ;  ;     ;;;;;;;    ;    ;   ;     ;   ;;;;;;;     ;
-;    ;   ;    ;          ;    ;   ;     ;   ;           ;
-;    ;    ;    ;    ;    ;    ;    ;   ;;    ;    ;     ;
-;   ;;;   ;;    ;;;;    ;;;  ;;;    ;;; ;;    ;;;;     ;;;;;
-; 
-; 
-; 
-;                                                                                            
-;; -----------------------------------------------------------------------------
-
-;; Snake Scene -> Scene
-;; Draws the snake onto the scene
-;; > (snake+scene snake0 MT-SCENE)
-;; (place-image SEG-IMG 8 8 MT-SCENE)
-(define (snake+scene snake scene)
-  (define snake-body-scene
-    (img-list+scene  (snake-body snake) SEG-IMG scene))
-  (define dir (snake-dir snake))
-  (img+scene (snake-head snake) 
-             (cond [(string=? "up" dir) HEAD-UP-IMG]
-                   [(string=? "down" dir) HEAD-DOWN-IMG]
-                   [(string=? "left" dir) HEAD-LEFT-IMG]
-                   [(string=? "right" dir) HEAD-RIGHT-IMG])
-             snake-body-scene))
-
-;; [Listof Goo] Scene -> Scene
-;; draws all of the goo to a scene
-;; > (goo-list+scene (list goo0) MT-SCENE)
-;; (place-image GOO-IMG 32 32 MT-SCENE)
-(define (goo-list+scene goos scene)
-  ;; [Listof Goo] -> [Listof Posn]
-  ;; gets the posns of all the goo 
-  ;; > (get-posns-from-goo (list (goo (posn 2 2) 1) (goo (posn 3 3) 1))
-  ;; (list (posn 2 2) (posn 3 3))
-  (define (get-posns-from-goo goos)
-    (cond [(empty? goos) empty]
-          [else (cons (goo-loc (first goos))
-                      (get-posns-from-goo (rest goos)))]))
-  (img-list+scene (get-posns-from-goo goos) GOO-IMG scene))
-
-;; [Listof Posn] Image Scene -> Scene
-;; Draws a the image to each posn in the list
-;; > (img-list+scene (list (posn 1 1)) GOO-IMG MT-SCENE)
-;; (place-image GOO-IMG 8 8
-;;              (img-list+scene empty GOO-IMG MT-SCENE))
-(define (img-list+scene posns img scene)
-  (cond [(empty? posns) scene]
-        [else (img+scene (first posns)
-                         img 
-                         (img-list+scene (rest posns) img scene))]))
-
-;; Posn Image Scene -> Scene
-;; Draws a the given image onto the scene at the posn.
-;; > (img+scene (posn 2 2) GOO-IMG MT-SCENE)
-;; (place-image GOO-IMG 32 32 MT-SCENE)
-(define (img+scene posn img scene)
-  (place-image img 
-               (* (posn-x posn) SEG-SIZE)
-               (* (posn-y posn) SEG-SIZE)
-               scene))
-
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;                            ;;                                                    
-;   ;;;;;;;                   ;               ;;;; ;                               
-;    ;    ;                   ;              ;    ;;                               
-;    ;    ;   ;; ;;;      ;;; ;             ;           ;;;;   ;; ;  ;      ;;;    
-;    ;  ;      ;;   ;    ;   ;;             ;          ;    ;   ;; ;; ;    ;   ;   
-;    ;;;;      ;    ;   ;     ;             ;               ;   ;  ;  ;   ;     ;  
-;    ;  ;      ;    ;   ;     ;             ;   ;;;;;  ;;;;;;   ;  ;  ;   ;;;;;;;  
-;    ;    ;    ;    ;   ;     ;             ;      ;  ;     ;   ;  ;  ;   ;        
-;    ;    ;    ;    ;    ;   ;;              ;     ;  ;    ;;   ;  ;  ;    ;    ;  
-;   ;;;;;;;   ;;;  ;;;    ;;; ;;              ;;;;;    ;;;; ;; ;;; ;; ;;    ;;;;   
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;                                                                                  
-;; -----------------------------------------------------------------------------
-
-;; Snake -> Boolean
-;; Determine if the snake is colliding with itself.
-;; > (self-colliding? (snake "up" (list (posn 1 1) (posn 2 1)
-;;                                      (posn 2 2) (posn 1 2)
-;;                                      (posn 1 1))))
-;; #t
-(define (self-colliding? sn)
-  (cons? (member (snake-head sn) (snake-body sn))))
-
-;; Snake -> Boolean
-;; Determine if the snake is colliding with any of the walls.
-;; > (wall-colliding? (snake "up" (list (posn 0 1))))
-;; #t
-(define (wall-colliding? sn)
-  (define x (posn-x (snake-head sn)))
-  (define y (posn-y (snake-head sn)))
-  (or (= 0 x) (= x SIZE)
-      (= 0 y) (= y SIZE)))
-
-
-
-;                                                                                            
-;                                                                                            
-;                                                                                            
-;                                                                                            
-;                                                                                            
-;     ;;;     ;;;  ;;; ;;;   ;;;  ;;;;;;;   ;;;;;     ;;;;;;;     ;;;     ;;;;;;   ;;;   ;;; 
-;      ;;      ;    ;   ;     ;      ;        ;          ;         ;;      ;    ;   ;     ;  
-;     ;  ;     ;    ;    ;   ;       ;        ;          ;        ;  ;     ;    ;    ;   ;   
-;     ;  ;     ;    ;     ; ;        ;        ;          ;        ;  ;     ;    ;     ; ;    
-;     ;  ;     ;    ;      ;         ;        ;          ;        ;  ;     ;;;;;       ;     
-;    ;;;;;;    ;    ;     ; ;        ;        ;    ;     ;       ;;;;;;    ;  ;        ;     
-;    ;    ;    ;    ;    ;   ;       ;        ;    ;     ;       ;    ;    ;   ;       ;     
-;   ;      ;   ;    ;   ;     ;      ;        ;    ;     ;      ;      ;   ;    ;      ;     
-;  ;;;    ;;;   ;;;;   ;;;   ;;;  ;;;;;;;   ;;;;;;;;  ;;;;;;;  ;;;    ;;; ;;;   ;;   ;;;;;   
-;                                                                                            
-;                                                                                            
-;                                                                                            
-;
-;; -----------------------------------------------------------------------------
-;; Posn Posn -> Boolean
-;; Are the two posns are equal?
-;; > (posn=? (posn 1 1) (posn 1 1))
-;; true
-(define (posn=? p1 p2)
-  (and (= (posn-x p1) (posn-x p2))
-       (= (posn-y p1) (posn-y p2))))
-
-;; Access the head position of the snake.
-;; snake-head : Snake -> Seg
-;; > (snake-head (snake "right" (list (posn 1 1) (posn 2 1)))
-;; (posn 1 1)
-(define (snake-head sn)
-  (first (snake-segs sn)))
-
-;; Snake -> [Listof Segs]
-;; returns the snake's body.
-;; That is everyting that isn't the snake's head.
-(define (snake-body sn)
-  (rest (snake-segs sn)))
-
-;; Snake Direction -> Snake 
-(define (snake-change-dir sn d)
-  (snake d (snake-segs sn)))
-
-
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;   ;;;;;;;                        ;                 
-;   ;  ;  ;                        ;                 
-;   ;  ;  ;     ;;;      ;;;; ;  ;;;;;;;     ;;;; ;  
-;   ;  ;  ;    ;   ;    ;    ;;    ;        ;    ;;  
-;      ;      ;     ;   ;          ;        ;        
-;      ;      ;;;;;;;    ;;;;;     ;         ;;;;;   
-;      ;      ;               ;    ;              ;  
-;      ;       ;    ;   ;     ;    ;    ;   ;     ;  
-;    ;;;;;      ;;;;    ;;;;;;      ;;;;    ;;;;;;   
-;                                                    
-;                                                    
-;                                                    
-;                                                    
-;; -----------------------------------------------------------------------------
-
-;; Initial Structures
-
-(define goo-list (build-list MAX-GOO (lambda (x) (fresh-goo))))
-(define snake0 (snake "right" (list (posn 1 1)))) ;; BUG? << -- moving this define into the test module blows up
-(define world0 (pit snake0 goo-list))
-
-(define left-snake0 (snake "left" (list (posn 1 1))))
-(define left-world0 (pit left-snake0 goo-list))
-
-;; Test Constants
-
-(define snake1 (snake "left" (list (posn 5 5))))
-(define snake2 (snake "up" (list (posn 2 2) (posn 2 3) (posn 2 4))))
-(define wall-snake (snake "right" (list (posn 0 1) (posn 1 1))))
-(define self-eating-snake (snake "up" (list
-                                       (posn 19 3)
-                                       (posn 19 4)
-                                       (posn 20 4)
-                                       (posn 21 4)
-                                       (posn 22 4)
-                                       (posn 22 3)
-                                       (posn 21 3)
-                                       (posn 20 3)
-                                       (posn 19 3)
-                                       (posn 18 3))))
-(define goo1 (goo (posn 5 5) 45))
-(define goo2 (goo (posn 4 8) 1))
-(define goo3 (goo (posn 6 9) 40))
-(define goo4 (goo (posn 1 1) 120))
-(define goo5 (goo (posn 1 9) 58))
-(define goo-list1 (list goo1 goo2 goo3 goo4 goo5))
-(define world1 (pit snake1 goo-list1))
-(define world2 (pit snake2 goo-list1))
-
-(define right-snake1 (snake "right" (list (posn 5 5))))
-(define right-world1 (pit right-snake1 goo-list1))
-
-(module+ test 
-  
-  (require rackunit rackunit/text-ui)
-  
-  ;; test the major basic snake functions
-  (check-equal? (pit-snake (next-pit world2))
-                (snake "up" (list (posn 2 1) (posn 2 2) (posn 2 3))))
-  (check-equal? (pit-snake (next-pit world1))
-                (snake "left" (list (posn 4 5) (posn 5 5))))
-  (check-true (let ([f (pit-goos (next-pit world1))])
-                (= (length f) MAX-GOO)))
-  (check-equal? (pit-snake (next-pit world0))
-                (snake "right" (list (posn 2 1))))
-  (check-equal? (pit-snake (next-pit (pit snake0 (list (goo (posn 1 1) 130)))))
-                (snake "right" (list (posn 2 1) (posn 1 1))))
-  
-  (check-equal? (direct-snake world0 "down") 
-                (world-change-dir world0 "down"))
-  (check-equal? (direct-snake world0 "a")
-                world0)
-  
-  (check-equal? (render-pit world0)
-                (snake+scene snake0
-                             (goo-list+scene goo-list MT-SCENE)))
-  (check-equal? (render-pit world1)
-                (snake+scene snake1 (goo-list+scene goo-list1 MT-SCENE)))
-  (check-equal? (render-pit world2)
-                (snake+scene snake2 (goo-list+scene goo-list1 MT-SCENE)))
-  
-  (check-true (dead? (pit wall-snake '())))
-  (check-true (dead? (pit self-eating-snake  '())))
-  (check-false (dead? (pit snake1  '())))
-  (check-false (dead? (pit snake2  '())))
-  (check-false (dead? world0))
-  
-  (check-equal? (render-end world1)
-                (overlay (text "Game over" 15 "black")
-                         (render-pit world1)))
-  (check-equal? (render-end world2)
-                (overlay (text "Game over" 15 "black")
-                         (render-pit world2)))
-  
-  ;; Properties
-  ;; -----------------------------------------------------------------------------
-  
-  ;; Property: each goo in the list has its 'expire' field decremented by 1
-  (define (prop:goo-rot-- i)
-    (test-begin 
-     (for ([i (in-range i)])
-       (define goos (list-of-n-goo MAX-GOO))
-       (define goo-initial-expire (map goo-expire goos))
-       (check-equal? (map sub1 goo-initial-expire)
-                     (map goo-expire (age-goo goos))))))
-  
-  ;; Property: The position of the goo is:
-  ;;  - x in (0,WIDTH-SEGS),
-  ;;  - y in (0,HEIGHT-SEGS).
-  (define (prop:new-goo-range i)
-    (test-begin 
-     (for ([i (in-range i)])
-       (define f (fresh-goo))
-       (check-true (and (< 0 (posn-x (goo-loc f)) SIZE)
-                        (< 0 (posn-y (goo-loc f)) SIZE))))))
-  
-  ;; Number -> [Listof Goo]
-  ;; creates a list of randomly selected goo that is n long.
-  (define (list-of-n-goo n)
-    (cond [(zero? n) empty]
-          [else (define rand (random 5))
-                (cons (list-ref goo-list1 rand) (list-of-n-goo (sub1 n)))]))
-  
-  ;; testing pit-snake event handling 
-  
-  (check-equal? (pit-snake (world-change-dir (pit snake1 "foobar") "down"))
-                (snake "down" (list (posn 5 5))))
-  (check-equal? (pit-snake (world-change-dir (pit snake2 "left") "left"))
-                (snake "left" (list (posn 2 2) (posn 2 3) (posn 2 4))))
-  
-  (prop:goo-rot-- 1000)
-  
-  (check-equal? (grow snake0)
-                (snake "right" (list (posn 2 1) (posn 1 1))))
-  (check-equal? (grow snake1)
-                (snake "left" (list (posn 4 5) (posn 5 5))))
-  (check-equal? (grow snake0)
-                (snake "right" (list (posn 2 1) 
-                                     (posn 1 1))))
-  
-  (prop:new-goo-range 1000)
-  
-  (check-equal? (can-eat (snake "right" `(,(posn 3 3))) `(,(goo (posn 3 3) 130)))
-                (goo (posn 3 3) 130))
-  (check-false (can-eat (snake "right" `(,(posn 3 3))) `(,(goo (posn 3 4) 130)
-                                                         ,(goo (posn 2 2) 0))))
-  (check-equal? (can-eat snake0 (list (goo (posn 1 1) 1)))
-                (goo (posn 1 1) 1))
-  (check-false (can-eat snake0 (list (goo (posn 2 1) 1))))
-  
-  (check-equal? (slither snake0) (snake "right" (list (posn 2 1))))
-  (check-equal? (slither (snake "right" (list (posn 4 4) 
-                                              (posn 4 5)
-                                              (posn 4 6))))
-                (snake "right" (list (posn 5 4) (posn 4 4) (posn 4 5))))
-  (check-equal? (slither snake0)
-                (snake "right" (list (posn 2 1))))
-  
-  (check-equal? (length (eat (list (goo (posn 1 1) 130)) (goo (posn 1 1) 130)))
-                1)
-  (check-equal? (grow (snake "left" (list (posn 1 1))))
-                (snake "left" (list (posn 0 1) (posn 1 1))))
-  
-  (check-equal? (next-head snake0) (posn 2 1))
-  (check-equal? (next-head (snake "left" (list (posn 1 1))))
-                (posn 0 1))
-  (check-equal? (next-head (snake "up" (list (posn 1 1))))
-                (posn 1 0))
-  (check-equal? (next-head (snake "down" (list (posn 1 1)))) 
-                (posn 1 2))
-  (check-equal? (next-head snake0) (posn 2 1))
-  
-  (check-equal? (posn-move (posn 1 1) 2 3) (posn 3 4))
-  (check-equal? (posn-move (posn 3 4) 6 0) (posn 9 4))
-  (check-equal? (posn-move (posn 2 8) 0 5) (posn 2 13))
-  (check-equal? (posn-move (posn 2 3) 0 0) (posn 2 3))
-  
-  (check-equal? (all-but-last '(1 2 3 4 5 6))
-                '(1 2 3 4 5))
-  (check-equal? (all-but-last (snake-segs snake2))
-                `(,(posn 2 2) ,(posn 2 3)))
-  (check-equal? (all-but-last (list 0)) empty)
-  (check-equal? (all-but-last (list 0 1 2)) (list 0 1))
-  
-  ;; testing snake-key-handling
-  
-  (check-true (dir? "up"))
-  (check-true (dir? "down"))
-  (check-true (dir? "left"))
-  (check-true (dir? "right"))
-  (check-false (dir? "f"))
-  (check-true (dir? "right"))
-  
-  (check-equal? (world-change-dir world1 "left") world1)
-  (check-equal? (world-change-dir world1 "right") right-world1)
-  (check-equal? (world-change-dir world0 "left") left-world0)
-  (check-equal? (world-change-dir world0 "right") 
-                (pit (snake "right" (snake-segs (pit-snake world0)))
-                     (pit-goos world0)))
-  (check-equal? (world-change-dir world0 "down")
-                (pit (snake "down" (snake-segs (pit-snake world0)))
-                     (pit-goos world0)))
-  
-  (check-true (opposite-dir? "up" "down"))
-  (check-true (opposite-dir? "left" "right"))
-  (check-true (opposite-dir? "right" "left"))
-  (check-true (opposite-dir? "down" "up"))
-  (check-false (opposite-dir? "left" "down"))
-  (check-false (opposite-dir? "right" "down"))
-  (check-false (opposite-dir? "down" "left"))
-  (check-false (opposite-dir? "up" "right"))
-  (check-true (opposite-dir? "up" "down"))
-  (check-true (opposite-dir? "down" "up"))
-  (check-false (opposite-dir? "up" "up") false)
-  (check-equal? (opposite-dir? "right" "left") true)
-  (check-equal? (opposite-dir? "left" "right") true)
-  
-  ;; testing snake rendering
-  
-  (check-equal? (snake+scene snake1 MT-SCENE)
-                (place-image HEAD-LEFT-IMG (* 5 SEG-SIZE)
-                             (* 5 SEG-SIZE) MT-SCENE))
-  (check-equal? (snake+scene snake2 MT-SCENE)
-                (img+scene (posn 2 2) HEAD-UP-IMG 
-                           (img+scene (posn 2 3) SEG-IMG 
-                                      (img+scene (posn 2 4) SEG-IMG MT-SCENE))))
-  (check-equal? (snake+scene (snake "up" (list (posn 1 1))) MT-SCENE)
-                (img+scene (posn 1 1) HEAD-UP-IMG MT-SCENE))
-  
-  (check-equal? (goo-list+scene (list goo1) MT-SCENE)
-                (place-image GOO-IMG (* 5 SEG-SIZE)
-                             (* 5 SEG-SIZE) MT-SCENE))
-  (check-equal? (goo-list+scene goo-list1 MT-SCENE)
-                (img-list+scene (list (posn 5 5) (posn 4 8) (posn 6 9) (posn 1 1) (posn 1 9))
-                                GOO-IMG MT-SCENE))
-  
-  (check-equal? (img-list+scene (list (posn 3 3) (posn 4 4)) SEG-IMG MT-SCENE)
-                (place-image SEG-IMG (* 3 SEG-SIZE) (* 3 SEG-SIZE) 
-                             (place-image SEG-IMG (* 4 SEG-SIZE) (* 4 SEG-SIZE) MT-SCENE)))
-  (check-equal? (img-list+scene (list (posn 1 1) (posn 10 10)) SEG-IMG MT-SCENE)
-                (place-image SEG-IMG (* 1 SEG-SIZE) (* 1 SEG-SIZE)  
-                             (place-image SEG-IMG (* 10 SEG-SIZE) (* 10 SEG-SIZE) MT-SCENE)))
-  (check-equal? (img-list+scene (list (posn 1 1)) GOO-IMG MT-SCENE)
-                (place-image GOO-IMG SEG-SIZE SEG-SIZE
-                             (img-list+scene empty GOO-IMG MT-SCENE)))
-  
-  (check-equal? (img+scene (posn 4 3) SEG-IMG MT-SCENE)
-                (place-image SEG-IMG (* 4 SEG-SIZE) (* 3 SEG-SIZE)  MT-SCENE))
-  (check-equal? (img+scene (posn 5 2) GOO-IMG MT-SCENE)
-                (place-image GOO-IMG (* 5 SEG-SIZE) (* 2 SEG-SIZE)  MT-SCENE))
-  (check-equal? (img+scene (posn 1 1) SEG-IMG MT-SCENE)
-                (place-image SEG-IMG SEG-SIZE SEG-SIZE MT-SCENE))
-  
-  ;; testing the endgame
-  (check-false (self-colliding? snake1))
-  (check-false (self-colliding? snake2))
-  (check-false (self-colliding? wall-snake))
-  (check-true (self-colliding? self-eating-snake))
-  (check-false (self-colliding? snake0))
-  (check-true (self-colliding? (snake (snake-dir snake0)
-                                      (cons (posn 1 1) 
-                                            (snake-segs snake0)))))
-  
-  (check-false (wall-colliding? snake1))
-  (check-false (wall-colliding? snake2))
-  (check-false (wall-colliding? self-eating-snake))
-  (check-true (wall-colliding? wall-snake))
-  (check-true 
-   (wall-colliding? (snake "right" (list (posn (/ WIDTH-PX SEG-SIZE) 0)))))
-  (check-true 
-   (wall-colliding? (snake "down" (list (posn 0 (/ HEIGHT-PX SEG-SIZE))))))
-  (check-true 
-   (wall-colliding? (snake "up" (list (posn 1 0)))))
-  (check-equal? (wall-colliding? (snake "right" 
-                                        (list (posn 0 1))))
-                true)
-  (check-equal? (wall-colliding? (snake "right" 
-                                        (list (posn 1 0))))
-                true)
-  (check-equal? (wall-colliding? (snake "right" 
-                                        (list (posn 1 1))))
-                false)
-  (check-true (wall-colliding? (snake "right" (list (posn 1 SIZE)))))
-  
-  
-  ;; testing utilities functions 
-  
-  (check-false (posn=? (posn 1 1) (posn 2 2)))
-  (check-false (posn=? (posn 1 2) (posn 2 1)))
-  (check-true (posn=? (posn 3 4) (posn 3 4)))
-  (check-true (posn=? (posn 2 2) (posn 2 2)))
-  (check-equal? (posn=? (posn 1 2) (posn 1 1)) false)
-  (check-equal? (posn=? (posn 1 2) (posn 1 2)) true)
-  (check-equal? (posn-move (posn 0 0) 2 3) (posn 2 3))    
-  
-  (check-equal? (snake-head snake1) (posn 5 5))
-  (check-equal? (snake-head snake2) (posn 2 2))
-  (check-equal? (snake-head snake0) (posn 1 1))
-  
-  (check-equal? (snake-body snake1) empty)
-  (check-equal? (snake-body snake0) empty)
-  (check-equal? (snake-body snake2) (list (posn 2 3) (posn 2 4)))
-  
-  (check-equal? (snake-change-dir snake0 "up") 
-                (snake "up" (list (posn 1 1))))
-  (check-equal? (snake-change-dir snake1 "down") 
-                (snake "down" (list (posn 5 5))))
-  (check-equal? (snake-change-dir snake2 "left") 
-                (snake "left" (list (posn 2 2) (posn 2 3) (posn 2 4))))
-  
-  (check-true (rotten? (goo (posn 1 2) 0)))
-  (check-true (rotten? (goo (posn 6 9) 0)))
-  (check-true (rotten? (goo (posn 23 2) 0)))
-  
-  (check-false (rotten? (goo (posn 1 2) 2)))
-  (check-false (rotten? (goo (posn 3 45) 45334534)))
-  (check-false (rotten? (goo (posn 2 4) 9)))
-  
-  (check-equal? (decay (goo (posn 1 2) 2))
-                (goo (posn 1 2) 1))
-  (check-equal? (decay (goo (posn 132 0) 2))
-                (goo (posn 132 0) 1))
-  (check-equal? (decay (goo (posn 1 2) 10))
-                (goo (posn 1 2) 9))
-  (check-equal? (decay (goo (posn 3 5) 8))
-                (goo (posn 3 5) 7))
-  
-  "all tests run")
diff --git a/pkgs/realm/chapter8/graphics/brigand.bmp b/pkgs/realm/chapter8/graphics/brigand.bmp
deleted file mode 100644
index 7bbd3c06d0..0000000000
Binary files a/pkgs/realm/chapter8/graphics/brigand.bmp and /dev/null differ
diff --git a/pkgs/realm/chapter8/graphics/hydra.png b/pkgs/realm/chapter8/graphics/hydra.png
deleted file mode 100644
index b495920011..0000000000
Binary files a/pkgs/realm/chapter8/graphics/hydra.png and /dev/null differ
diff --git a/pkgs/realm/chapter8/graphics/orc.gif b/pkgs/realm/chapter8/graphics/orc.gif
deleted file mode 100644
index 55533222f1..0000000000
Binary files a/pkgs/realm/chapter8/graphics/orc.gif and /dev/null differ
diff --git a/pkgs/realm/chapter8/graphics/orc.png b/pkgs/realm/chapter8/graphics/orc.png
deleted file mode 100644
index d269b6a953..0000000000
Binary files a/pkgs/realm/chapter8/graphics/orc.png and /dev/null differ
diff --git a/pkgs/realm/chapter8/graphics/orcSprite.png b/pkgs/realm/chapter8/graphics/orcSprite.png
deleted file mode 100644
index cdc223c6f9..0000000000
Binary files a/pkgs/realm/chapter8/graphics/orcSprite.png and /dev/null differ
diff --git a/pkgs/realm/chapter8/graphics/player.bmp b/pkgs/realm/chapter8/graphics/player.bmp
deleted file mode 100644
index c6a04a0a42..0000000000
Binary files a/pkgs/realm/chapter8/graphics/player.bmp and /dev/null differ
diff --git a/pkgs/realm/chapter8/graphics/slime.bmp b/pkgs/realm/chapter8/graphics/slime.bmp
deleted file mode 100644
index 208c188db4..0000000000
Binary files a/pkgs/realm/chapter8/graphics/slime.bmp and /dev/null differ
diff --git a/pkgs/realm/chapter8/readme.txt b/pkgs/realm/chapter8/readme.txt
deleted file mode 100644
index 7e1ef4b541..0000000000
--- a/pkgs/realm/chapter8/readme.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-This chapter implements a graphical version of the "orc" game from Barski's
-"Land of Lisp". To play or to experiment, open the file 
-
-	 source.rkt 
-
-in DrRacket. The instructions for playing are at the top of the file. 
-Our tests are at the bottom of the file in a separate 'test' submodule. 
-
diff --git a/pkgs/realm/chapter8/source.rkt b/pkgs/realm/chapter8/source.rkt
deleted file mode 100644
index 9f47c5291c..0000000000
--- a/pkgs/realm/chapter8/source.rkt
+++ /dev/null
@@ -1,882 +0,0 @@
-#lang racket
-
-#| 
-   The Orc game 
-   -------------
-
-   The Orc game is a turn-based battle game between monsters and the player. 
-
-   The player encounters a room full of monsters of all kinds, including 
-   orcs, hydras, slimes, and brigands. They are ready to attack. It is
-   the player's task to get rid of the monsters. 
-
-   When the game starts up, it is the player's turn, meaning she is given 
-   permission to attack a (randomly chosen number) of times. The player uses
-   nine keys to play
-    -- With the four arrow keys the player navigates among the twelve monsters.
-    -- With "s", "f", and "h", 
-    -- the player can 's'tab a specific monster, 
-    -- the player may 'f'lail at several monsters; 
-    -- the player may 'h'eal herself. 
-   When the player runs out of attacks, all live monsters attack the player. 
-   After that, it is the player's turn again. 
- 
-   Just in case, the player can end a turn prematurely with "e". 
-
-   Play
-   ----
- 
-   Run and evaluate 
-     (start-game)
-   This will pop up a window that displays the player's vitals, the orcs and
-   their basic state, and the game instructions. 
-|#
-
-
-(require 2htdp/image 2htdp/universe)
-
-;                                                                          
-;                                                                          
-;                                                                          
-;     ;;;                           ;;; ;;;                   ;;        ;; 
-;    ;   ;                           ;   ;                     ;         ; 
-;   ;     ; ;; ;;;   ;;; ;           ;   ;   ;;;;   ;; ;;;     ;     ;;; ; 
-;   ;     ;  ;;     ;;  ;;           ; ; ;  ;    ;   ;;        ;    ;   ;; 
-;   ;     ;  ;      ;                ; ; ;  ;    ;   ;         ;    ;    ; 
-;   ;     ;  ;      ;                ; ; ;  ;    ;   ;         ;    ;    ; 
-;    ;   ;   ;      ;    ;           ; ; ;  ;    ;   ;         ;    ;   ;; 
-;     ;;;   ;;;;;    ;;;;             ; ;    ;;;;   ;;;;;    ;;;;;   ;;; ;;
-;                                                                          
-;                                                                          
-;                                                                          
-;                                                                          
-
-;; The OrcWorld as Data:
-(struct orc-world (player lom attack# target) #:transparent #:mutable)
-;; A OrcWorld is a (orc-world Player [listof Monster] Nat Nat)
-;; The third field of the world refers to the number of attacks left.
-;; The fourth field refers to the position of the next attack target.
-
-(struct player (health agility strength) #:transparent #:mutable)
-;; A Player is a (player Nat Nat Nat)
-;; The player's fields correspond to hit points, strength, agility. 
-
-(struct monster (image [health #:mutable]) #:transparent)
-(struct orc monster (club) #:transparent)
-(struct hydra monster () #:transparent)
-(struct slime monster (sliminess) #:transparent)
-(struct brigand monster () #:transparent)
-;; A Monster is a (monster Image Nat)
-;;    (moster i h) is a monster at position i in the list with health h
-;; Each monster is equipped with the index number, 
-;; which is used to identify the current target.
-;; 
-;; An Orc is an (orc Nat Nat Nat)
-;; A Slime is a (slime Nat Nat Nat)
-;; A Brigrand is a (brigand Nat Nat)
-;; A Hydra is a (hydra Nat Nat)    
-;; 
-;; The four monster types all inherit the id and health fields from monster. 
-;; Two have additional attributes: 
-;; -- (orc i h c) means the orc's club has strength c
-;; -- (slime i h a) means the slime can reduce the player's agility by a 
-
-;; -----------------------------------------------------------------------------
-;; THE CONSTANTS IN THE WORLD 
-
-;; player attributes 
-(define MAX-HEALTH 35)
-(define MAX-AGILITY 35)
-(define MAX-STRENGTH 35)
-
-;; depending on other player attributes, 
-;; the game picks the number of attacks, flailing and stabbing damage 
-(define ATTACKS# 4)
-(define STAB-DAMAGE 2)
-(define FLAIL-DAMAGE 3)
-(define HEALING 8)
-
-;; monster attributes 
-(define MONSTER# 12)
-(define PER-ROW 4)
-(unless (zero? (remainder MONSTER# PER-ROW))
-  (error 'constraint "PER-ROW must divide MONSTER# evenly into rows"))
-
-(define MONSTER-HEALTH0 9)
-(define CLUB-STRENGTH 8)
-(define SLIMINESS 5)
-
-(define HEALTH-DAMAGE -2)
-(define AGILITY-DAMAGE -3)
-(define STRENGTH-DAMAGE -4)
-
-;; string constants 
-(define STRENGTH "strength")
-(define AGILITY "agility")
-(define HEALTH "health")
-(define LOSE  "YOU LOSE")
-(define WIN "YOU WIN")
-(define DEAD "DEAD")
-(define REMAINING "Remaining attacks ")
-(define INSTRUCTIONS-2 "Select a monster using the arrow keys")
-(define INSTRUCTIONS-1
-  "Press S to stab a monster | Press F to Flail wildly | Press H to Heal")
-
-;; graphical constants 
-(define HEALTH-BAR-HEIGHT 12)
-(define HEALTH-BAR-WIDTH  50)
-
-;; compute constants for image frames 
-(define ORC     (bitmap "graphics/orc.png"))
-(define HYDRA   (bitmap "graphics/hydra.png"))
-(define SLIME   (bitmap "graphics/slime.bmp"))
-(define BRIGAND (bitmap "graphics/brigand.bmp"))
-
-(define PIC-LIST (list ORC HYDRA SLIME BRIGAND))
-(define w (apply max (map image-width PIC-LIST)))
-(define h (apply max (map image-height PIC-LIST)))
-
-;; images: player, monsters, constant texts
-(define PLAYER-IMAGE  (bitmap "graphics/player.bmp"))
-
-(define FRAME (rectangle w h 'outline 'white))
-(define TARGET (circle (- (/ w 2) 2) 'outline 'blue))
-
-(define ORC-IMAGE     (overlay ORC FRAME))
-(define HYDRA-IMAGE   (overlay HYDRA FRAME))
-(define SLIME-IMAGE   (overlay SLIME FRAME))
-(define BRIGAND-IMAGE (overlay BRIGAND FRAME))
-
-(define V-SPACER (rectangle 0 10 "solid" "white"))
-(define H-SPACER (rectangle 10 0 "solid" "white"))
-
-;; fonts & texts & colors
-(define AGILITY-COLOR "blue")
-(define HEALTH-COLOR "crimson")
-(define STRENGTH-COLOR "forest green") 
-(define MONSTER-COLOR "crimson")
-(define MESSAGE-COLOR "black")
-(define ATTACK-COLOR "crimson")
-
-(define HEALTH-SIZE (- HEALTH-BAR-HEIGHT 4))
-(define DEAD-TEXT-SIZE (- HEALTH-BAR-HEIGHT 2))
-(define INSTRUCTION-TEXT-SIZE 16)
-(define MESSAGES-SIZE 40)
-
-(define INSTRUCTION-TEXT
-  (above 
-   (text INSTRUCTIONS-2 (- INSTRUCTION-TEXT-SIZE 2) "blue")
-   (text INSTRUCTIONS-1 (- INSTRUCTION-TEXT-SIZE 4) "blue")))
-
-(define DEAD-TEXT (text DEAD DEAD-TEXT-SIZE "crimson"))
-
-;                                  
-;                                  
-;                                  
-;   ;;; ;;;            ;           
-;    ;; ;;                         
-;    ;; ;;   ;;;;    ;;;    ;; ;;  
-;    ; ; ;  ;    ;     ;     ;;  ; 
-;    ; ; ;   ;;;;;     ;     ;   ; 
-;    ;   ;  ;    ;     ;     ;   ; 
-;    ;   ;  ;   ;;     ;     ;   ; 
-;   ;;; ;;;  ;;; ;;  ;;;;;  ;;; ;;;
-;                                  
-;                                  
-;                                  
-;                                  
-
-;; Start the game
-(define (start-game) 
-  (big-bang (initialize-orc-world)
-            (on-key player-acts-on-monsters) 
-            (to-draw render-orc-battle)
-            (stop-when end-of-orc-battle? render-the-end)))
-
-;; -> OrcWorld  
-;; creates an orc-world ready for battling orcs 
-(define (initialize-orc-world)
-  (define player0 (initialize-player))
-  (define lom0 (initialize-monsters))
-  (orc-world player0 lom0 (random-number-of-attacks player0) 0))
-
-;; OrcWorld Key-Event -> OrcWorld
-;; act on key events by the player, if the player has attacks left
-(define (player-acts-on-monsters w k)
-  (cond 
-    [(zero? (orc-world-attack# w)) w]
-    
-    [(key=? "s" k) (stab w)]
-    [(key=? "h" k) (heal w)]
-    [(key=? "f" k) (flail w)]
-    
-    [(key=? "right" k) (move-target w +1)]
-    [(key=? "left" k)  (move-target w -1)]
-    [(key=? "down" k)  (move-target w (+ PER-ROW))]
-    [(key=? "up" k)    (move-target w (- PER-ROW))]
-    
-    [(key=? "e" k) (end-turn w)]
-;;    [(key=? "n" k) (initialize-orc-world)]
-    
-    [else w])
-  (give-monster-turn-if-attack#=0 w)
-  w)
-
-;; OrcWorld -> Image 
-;; renders the orc world
-(define (render-orc-battle w)
-  (render-orc-world w (orc-world-target w) (instructions w)))
-
-;; OrcWorld -> Boolean
-;; is the battle over? i.e., the player lost or all monsters are dead 
-(define (end-of-orc-battle? w)
-  (or (win? w) (lose? w)))
-
-;; OrcWorld -> Image 
-;; render the final orc world 
-(define (render-the-end w)
-  (render-orc-world w #f (message (if (lose? w) LOSE WIN))))
-
-;; -----------------------------------------------------------------------------
-
-;; WORLD MANAGEMENT
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;                                  
-;                                  
-;                                  
-;    ;;;;;             ;           
-;      ;                     ;     
-;      ;    ;; ;;    ;;;    ;;;;;  
-;      ;     ;;  ;     ;     ;     
-;      ;     ;   ;     ;     ;     
-;      ;     ;   ;     ;     ;     
-;      ;     ;   ;     ;     ;   ; 
-;    ;;;;;  ;;; ;;;  ;;;;;    ;;;  
-;                                  
-;                                  
-;                                  
-;                                  
-
-;; -> Player 
-;; create a player with maximal capabilities 
-(define (initialize-player) 
-  (player MAX-HEALTH MAX-AGILITY MAX-STRENGTH))
-
-;; -> [Listof Monster]
-;; create a list of random monsters of length MONSTER-NUM, 
-(define (initialize-monsters)
-  ;; Nat -> Monster
-  ;; makes a random monster 
-  (define (create-monster _)
-    (define health (random+ MONSTER-HEALTH0))
-    (case (random 4)
-      [(0) (orc ORC-IMAGE health (random+ CLUB-STRENGTH))]
-      [(1) (hydra HYDRA-IMAGE health)]
-      [(2) (slime SLIME-IMAGE health (random+ SLIMINESS))]
-      [(3) (brigand BRIGAND-IMAGE health)]
-      [else (error "can't happen")]))
-  (build-list MONSTER# create-monster))
-
-;; Player -> Nat
-;; compute a feasible number of attacks the player may execute 
-(define (random-number-of-attacks p)
-  (random-quotient (player-agility p)
-                   ATTACKS#))
-
-;                                                                          
-;                                                                          
-;                                                                          
-;   ;;; ;;;                 ;;;;;;                                         
-;    ;   ;                   ;   ;                           ;             
-;    ;  ;    ;;;;   ;;; ;;;  ; ;   ;;;  ;;;  ;;;;   ;; ;;   ;;;;;    ;;;;; 
-;    ; ;    ;    ;   ;   ;   ;;;    ;    ;  ;    ;   ;;  ;   ;      ;    ; 
-;    ;;;    ;;;;;;   ;   ;   ; ;     ;  ;   ;;;;;;   ;   ;   ;       ;;;;  
-;    ;  ;   ;         ; ;    ;       ;  ;   ;        ;   ;   ;           ; 
-;    ;   ;  ;         ; ;    ;   ;    ;;    ;        ;   ;   ;   ;  ;    ; 
-;   ;;;  ;;  ;;;;;     ;    ;;;;;;    ;;     ;;;;;  ;;; ;;;   ;;;   ;;;;;  
-;                      ;                                                   
-;                    ;;;                                                   
-;                                                                          
-;                                                                          
-
-;; -----------------------------------------------------------------------------
-;; player actions 
-
-;; OrcWorld Nat -> Void
-;; Effect: reduces the target by a given amount
-;; > (move-target 
-;;     (orc-world (player 5 5 5) (list (monster 0 2) (monster 1 3)) 1 0)
-;;     1)
-;; (orc-world (player 5 5 5) (list (monster 0 2) (monster 1 3)) 1 1)
-(define (move-target w n) 
-  (set-orc-world-target! w (modulo (+ n (orc-world-target w)) MONSTER#)))
-
-;; OrcWorld -> Void 
-;; Effect: ends the player's turn by setting the number of attacks to 0
-(define (end-turn w)
-  (set-orc-world-attack#! w 0))
-
-;; OrcWorld -> Void 
-;; Effect: reduces the number of remaining attacks for this turn 
-;;   and increases the player's health level 
-(define (heal w)
-  (decrease-attack# w)
-  (player-health+ (orc-world-player w) HEALING))
-
-;; OrcWorld -> Void 
-;; Effect: reduces a targeted monster's health
-(define (stab w)
-  (decrease-attack# w)
-  (define target (current-target w))
-  (define damage 
-    (random-quotient (player-strength (orc-world-player w)) 
-                     STAB-DAMAGE))
-  (damage-monster target damage))
-
-;; OrcWorld -> Void
-;; Effect: damages a random number of live monsters, 
-;;   determined by strength of the player
-;;   starting with the currently targeted monster 
-(define (flail w)
-  (decrease-attack# w)
-  (define target (current-target w))
-  (define alive (filter monster-alive? (orc-world-lom w)))
-  (define pick# 
-    (min
-     (random-quotient (player-strength (orc-world-player w)) 
-                      FLAIL-DAMAGE)
-     (length alive)))
-  (define getem (cons target (take alive pick#)))
-  (for-each (lambda (m) (damage-monster m 1)) getem))
-
-;; OrcWorld -> Void
-;; Effect: decrease number of remaining attacks 
-(define (decrease-attack# w)
-  (set-orc-world-attack#! w (sub1 (orc-world-attack# w))))
-
-;; Monster Nat -> Void
-;; Effect: reduces the hit-strength of a monster
-(define (damage-monster m delta)
-  (set-monster-health! m (interval- (monster-health m) delta)))
-
-;; World -> Monster 
-(define (current-target w)
-  (list-ref (orc-world-lom w) (orc-world-target w)))
-
-;; -----------------------------------------------------------------------------
-;; monster action
-
-;; OrcWorld -> Void
-;; if it is the monsters turn, they attack
-;; > (orc-world (player 4 4 4) empty 3 3)
-;; (orc-world (player 4 4 4) empty 3 3)
-(define (give-monster-turn-if-attack#=0 w)
-  (when (zero? (orc-world-attack# w))
-    (define player (orc-world-player w))
-    (all-monsters-attack-player player (orc-world-lom w))
-    (set-orc-world-attack#! w (random-number-of-attacks player))))
-
-;; Player [Listof Monster] -> Void 
-;; Each monster attacks the player
-(define (all-monsters-attack-player player lom) 
-  ;; Monster -> Void
-  (define (one-monster-attacks-player monster)
-    (cond
-      [(orc? monster)
-       (player-health+ player (random- (orc-club monster)))]
-      [(hydra? monster)
-       (player-health+ player (random- (monster-health monster)))]
-      [(slime? monster) 
-       (player-health+ player -1)
-       (player-agility+ player (random- (slime-sliminess monster)))]
-      [(brigand? monster) 
-       (case (random 3)
-         [(0) (player-health+ player HEALTH-DAMAGE)]
-         [(1) (player-agility+ player AGILITY-DAMAGE)]
-         [(2) (player-strength+ player STRENGTH-DAMAGE)])]))
-  ;; -- IN -- 
-  (for-each one-monster-attacks-player (filter monster-alive? lom)))
-
-;; -----------------------------------------------------------------------------
-;; actions on player 
-
-;; [Player -> Nat] [Player Nat -> Void] Nat -> Player Nat -> Void 
-;; effect: change player's selector attribute by adding delta, but max out
-(define (player-update! setter selector max-value)
-  (lambda (player delta)
-    (setter player 
-            (interval+ (selector player) delta max-value))))
-
-;; Player Nat -> Void
-(define player-health+ 
-  (player-update! set-player-health! player-health MAX-HEALTH))
-
-;; Player Nat -> Void 
-(define player-agility+ 
-  (player-update! set-player-agility! player-agility MAX-AGILITY))
-
-;; Player Nat -> Void 
-(define player-strength+ 
-  (player-update! set-player-strength! player-strength MAX-STRENGTH))
-
-;                                                                          
-;                                                                          
-;                                                                          
-;   ;;;;;                       ;;                     ;                   
-;    ;   ;                       ;                                         
-;    ;   ;   ;;;;   ;; ;;    ;;; ;   ;;;;   ;; ;;;   ;;;    ;; ;;    ;;; ;;
-;    ;   ;  ;    ;   ;;  ;  ;   ;;  ;    ;   ;;        ;     ;;  ;  ;   ;; 
-;    ;;;;   ;;;;;;   ;   ;  ;    ;  ;;;;;;   ;         ;     ;   ;  ;    ; 
-;    ;  ;   ;        ;   ;  ;    ;  ;        ;         ;     ;   ;  ;    ; 
-;    ;   ;  ;        ;   ;  ;   ;;  ;        ;         ;     ;   ;  ;   ;; 
-;   ;;;   ;  ;;;;;  ;;; ;;;  ;;; ;;  ;;;;;  ;;;;;    ;;;;;  ;;; ;;;  ;;; ; 
-;                                                                        ; 
-;                                                                    ;;;;  
-;                                                                          
-;                                                                          
-
-;; OrcWorld Boolean Image -> Image
-;; draws all the monsters and the player, then adds message 
-(define (render-orc-world w with-target additional-text)
-  (define i-player  (render-player (orc-world-player w)))
-  (define i-monster (render-monsters (orc-world-lom w) with-target))
-  (above V-SPACER
-         (beside H-SPACER
-                 i-player
-                 H-SPACER H-SPACER H-SPACER 
-                 (above i-monster
-                        V-SPACER V-SPACER V-SPACER 
-                        additional-text)
-                 H-SPACER)
-         V-SPACER))
-
-;; Player -> Image
-;; render player with three status bars
-(define (render-player p)
-  (above/align 
-   "left"
-   (status-bar (player-strength p) MAX-STRENGTH STRENGTH-COLOR STRENGTH)
-   V-SPACER
-   (status-bar (player-agility p) MAX-AGILITY AGILITY-COLOR AGILITY)
-   V-SPACER
-   (status-bar (player-health p) MAX-HEALTH HEALTH-COLOR HEALTH)
-   V-SPACER V-SPACER V-SPACER
-   PLAYER-IMAGE))
-
-;; Nat Nat Color String -> Image
-;; creates a labeled rectangle of width/max proportions
-;; assume: (<= width max)
-(define (status-bar v-current v-max color label)
-  (define w (* (/ v-current v-max) HEALTH-BAR-WIDTH))
-  (define f (rectangle w HEALTH-BAR-HEIGHT 'solid color))
-  (define b (rectangle HEALTH-BAR-WIDTH HEALTH-BAR-HEIGHT 'outline color))
-  (define bar (overlay/align 'left 'top f b))
-  (beside bar H-SPACER (text label HEALTH-SIZE color)))
-
-;; String -> Image 
-(define (message str)
-  (text str MESSAGES-SIZE MESSAGE-COLOR))
-
-;; OrcWorld -> Image
-(define (instructions w)
-  (define na (number->string (orc-world-attack# w)))
-  (define ra (string-append REMAINING na))
-  (above (text ra INSTRUCTION-TEXT-SIZE ATTACK-COLOR) INSTRUCTION-TEXT))
-
-;; [Listof Monster] [Opt Nat] -> Image
-;; add all monsters on lom, including status bar
-;; label the target unless it isn't called for 
-(define (render-monsters lom with-target)
-  ;; the currently targeted monster (if needed) 
-  (define target
-    (if (number? with-target) 
-        (list-ref lom with-target)
-        'a-silly-symbol-that-cannot-be-eq-to-an-orc))
-  
-  ;; Monster -> Image 
-  (define (render-one-monster m)
-    (define image
-      (if (eq? m target)
-          (overlay TARGET (monster-image m))
-          (monster-image m)))
-    (define health (monster-health m))
-    (define health-bar
-      (if (= health 0)
-          (overlay DEAD-TEXT (status-bar 0 1 'white ""))
-          (status-bar health MONSTER-HEALTH0 MONSTER-COLOR "")))
-    (above health-bar image))
-  
-  (arrange (map render-one-monster lom)))
-
-;; [Listof Image] -> Image 
-;; break a list of images into rows of PER-ROW 
-(define (arrange lom)
-  (cond
-    [(empty? lom) empty-image]
-    [else (define row-image (apply beside (take lom PER-ROW)))
-          (above row-image (arrange (drop lom PER-ROW)))]))
-
-
-;                                  
-;                                  
-;                                  
-;   ;;;;;;              ;;    ;;;  
-;    ;   ;               ;   ;   ; 
-;    ; ;    ;; ;;    ;;; ;       ; 
-;    ;;;     ;;  ;  ;   ;;       ; 
-;    ; ;     ;   ;  ;    ;      ;  
-;    ;       ;   ;  ;    ;     ;   
-;    ;   ;   ;   ;  ;   ;;         
-;   ;;;;;;  ;;; ;;;  ;;; ;;   ;;   
-;                                  
-;                                  
-;                                  
-;                                  
-
-;; OrcWorld -> Boolean
-;; Has the player won?
-;; > (orc-world (player 1 1 1) (list (monster 0 0)) 0 0)
-;; #t
-(define (win? w)
-  (all-dead? (orc-world-lom w)))
-
-;; OrcWorld -> Boolean
-;; Has the player lost?
-;; > (lose? (orc-world (player 0 2 2) empty 0 0))
-;; #t
-(define (lose? w) 
-  (player-dead? (orc-world-player w)))
-
-;; Player -> Boolean
-;; Is the player dead?
-;; > (orc-world (player 1 0 1) empty 0 0)
-;; #t
-(define (player-dead? p)
-  (or (= (player-health p) 0) 
-      (= (player-agility p) 0)
-      (= (player-strength p) 0)))
-
-;; [Listof Monster] -> Boolean
-;; Are all the monsters in the list dead?s
-;; > (all-dead? (orc-world (player 5 5 5) (list (monster 1 0)) 0 1))
-;; #t
-(define (all-dead? lom)
-  (not (ormap monster-alive? lom)))
-
-;; Monster -> Boolean
-;; Is the monster alive?
-(define (monster-alive? m)
-  (> (monster-health m) 0))
-
-
-;                                  
-;                                  
-;                                  
-;     ;;                           
-;      ;                           
-;     ; ;   ;;  ;;  ;;  ;;   ;;;;; 
-;     ; ;    ;   ;   ;  ;   ;    ; 
-;     ; ;    ;   ;    ;;     ;;;;  
-;     ;;;    ;   ;    ;;         ; 
-;    ;   ;   ;  ;;   ;  ;   ;    ; 
-;   ;;; ;;;   ;; ;; ;;  ;;  ;;;;;  
-;                                  
-;                                  
-;                                  
-;                                  
-
-;; Nat Nat -> Nat
-;; a random number between 1 and the (quotient x y)
-(define (random-quotient x y)
-  (define div (quotient x y))
-  (if (> 0 div) 0 (random+ (add1 div))))
-
-;; Nat -> Nat 
-;; (random+ n) creates a random number in [1,n]
-(define (random+ n)
-  (add1 (random n)))
-
-;; Nat -> Nat 
-;; (random+ n) creates a random number in [-n,-1]
-(define (random- n)
-  (- (add1 (random n))))
-
-;; Nat Nat [Nat] -> Nat 
-;; subtract n from m but stay in [0,max-value]
-(define (interval- n m (max-value 100))
-  (min (max 0 (- n m)) max-value))
-
-;; Nat Nat [Nat] -> Nat 
-;; subtract n from m but stay in [0,max-value]
-(define (interval+ n m (max-value 100))
-  (interval- n (- m) max-value))
-
-;                                          
-;                                          
-;                                          
-;   ;;;;;;                                 
-;   ;  ;                     ;             
-;      ;     ;;;;    ;;;;;  ;;;;;    ;;;;; 
-;      ;    ;    ;  ;    ;   ;      ;    ; 
-;      ;    ;;;;;;   ;;;;    ;       ;;;;  
-;      ;    ;            ;   ;           ; 
-;      ;    ;       ;    ;   ;   ;  ;    ; 
-;     ;;;    ;;;;;  ;;;;;     ;;;   ;;;;;  
-;                                          
-;                                          
-;                                          
-;                                          
-
-(module+ test
-  
-  (require rackunit rackunit/text-ui)
-  
-  ;; Test structs
-  (define WORLD0 (orc-world (initialize-player) empty 0 0))
-  (define WORLD1 (struct-copy orc-world (initialize-orc-world) [attack# 5]))
-  (define (WORLD2) (struct-copy orc-world (initialize-orc-world) [attack# 0]))
-  ;; these are random worlds
-  (define AN-ORC (orc 'image 0 5))
-  (define A-SLIME (slime 'image 1 6))
-  (define A-HYDRA (hydra 'image 2))
-  (define A-BRIGAND (brigand 'image 3))
-  
-  ;; testing move-target 
-  
-  (check-equal? (let ([w (orc-world 'dummy 'dummy 'dummy 0)])
-                  (move-target w +1)
-                  w)
-                (orc-world 'dummy 'dummy 'dummy 1))
-  (check-equal? (let ([w (orc-world 'dummy 'dummy 'dummy 0)])
-                  (move-target w -1)
-                  w)
-                (orc-world 'dummy 'dummy 'dummy (- MONSTER# 1)))
-  (check-equal? (let ([w (orc-world 'dummy 'dummy 'dummy 0)])
-                  (move-target w (- PER-ROW))
-                  w)
-                (orc-world 'dummy 'dummy 'dummy (- MONSTER# PER-ROW)))
-  (check-equal? (let ([w (orc-world 'dummy 'dummy 'dummy 1)])
-                  (move-target w (+ PER-ROW))
-                  w)
-                (orc-world 'dummy 'dummy 'dummy (+ PER-ROW 1)))
-  (check-equal? (begin
-                  (move-target WORLD1 0)
-                  WORLD1)
-                WORLD1)
-  (check-equal? (let ()
-                  (define w (struct-copy orc-world WORLD1))
-                  (move-target w 4)
-                  w)
-                (struct-copy orc-world WORLD1 [target (+ 4 (orc-world-target WORLD1))]))
-  (check-equal? (current-target WORLD1) 
-                (first (orc-world-lom WORLD1)))
-  
-  ;; testing basic player manipulations
-  
-  (check-equal? (let ([p (player 1 0 0)])
-                  (player-health+ p 5)
-                  p)
-                (player 6 0 0))
-  (check-equal? (let ([p (player 0 1 0)])
-                  (player-agility+ p 5)
-                  p)
-                (player 0 6 0))
-  
-  (check-equal? (let ([p (player 0 0 1)])
-                  (player-strength+ p 5)
-                  p)
-                (player 0 0 6))
-  
-  (check-equal? (let ([p (player 5 5 5)])
-                  (all-monsters-attack-player p (list (orc 'image 1 1)))
-                  p)
-                (player 4 5 5))
-  
-  (check-equal? (let ([p (player 5 5 5)])
-                  (all-monsters-attack-player p (list (hydra 'image 1)))
-                  p)
-                (player 4 5 5))
-  
-  (check-equal? (let ([p (player 5 5 5)])
-                  (all-monsters-attack-player p (list (slime 'image 1 1)))
-                  p)
-                (player 4 4 5))
-  
-  (check member 
-         (let ([p (player 5 5 5)]) 
-           (all-monsters-attack-player p (list (brigand 'image 1)))
-           p)
-         (list (player 3 5 5)
-               (player 5 2 5)
-               (player 5 5 1)))
-  
-  ;; Properties
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  
-  ;; Property:
-  ;; the output will always be in [1, (/ X Y)]
-  (define (prop:rand-frac-range i)
-    (test-begin 
-     (for ([i (in-range i)])
-       (define x (random 4294967087))
-       (define y (random 4294967087))
-       (check-true (<= 1 (random-quotient x y) (add1 (/ x y)))))))
-  
-  ;; Property: 
-  ;; The number of the monsters in the list is equal to
-  ;; MONSTER-NUM
-  (define (prop:monster-init-length i)
-    (test-begin
-     (for ([i (in-range i)])
-       (check-true (= MONSTER#
-                      (length (initialize-monsters)))))))
-  
-  ;; Property: 
-  ;; the player will have less points in at least one of its
-  ;; fields
-  (define (prop:monster-attack-player-dec i)
-    (test-begin
-     (for ([i (in-range i)])
-       (define pl (player MAX-HEALTH MAX-AGILITY MAX-STRENGTH))
-       (define mon (first (initialize-monsters)))
-       (begin 
-         (all-monsters-attack-player pl (list mon))
-         (check-true (or (< (player-health pl) MAX-HEALTH)
-                         (< (player-agility pl) MAX-AGILITY)
-                         (< (player-strength pl) MAX-STRENGTH)))))))
-  
-  ;; Property: 
-  ;; If there are monster, then the player will 
-  ;; have less points in at least one of its fields
-  (define (prop:monsters-attack-player-dec i)
-    (test-begin 
-     (for ([i (in-range i)])
-       (define pl (player MAX-HEALTH MAX-AGILITY MAX-STRENGTH))
-       (define monsters (initialize-monsters))
-       (define wor (orc-world pl monsters 0 0))
-       (begin 
-         (all-monsters-attack-player pl monsters)
-         (check-true (or (< (player-health pl) MAX-HEALTH)
-                         (< (player-agility pl) MAX-AGILITY)
-                         (< (player-strength pl) MAX-STRENGTH)))))))
-  
-  ;; Property: The health of the targeted monster, m, 
-  ;; is less than what it was. and
-  ;; [(sub1 (monster-health m)), 
-  ;; (- (monster-health m) 
-  ;;    (/ (player-strength (orc-world-player w)) 2))]
-  (define (prop:stab!-health i)
-    (test-begin
-     (for ([i (in-range i)])
-       (begin (define mon (first(initialize-monsters)))
-              (define ht (monster-health mon))
-              (define pl (random-player))
-              (define w (orc-world pl (list mon) 2 0))
-              (stab w)
-              (check-true (> ht (monster-health (first (orc-world-lom w)))))))))
-  
-  ;; random-player: -> Player
-  ;; creates a random player
-  (define (random-player)
-    (player (add1 (random MAX-HEALTH))
-            (add1 (random MAX-AGILITY))
-            (add1 (random MAX-STRENGTH))))
-  
-  ;; testing initializers
-  (prop:monster-init-length 1000)
-  (check-true (monster? (first (initialize-monsters))))
-  (check-true (> 10 (monster-health (first (initialize-monsters)))))
-  (check-equal? (length (initialize-monsters)) MONSTER#)
-  (check-equal? (length (orc-world-lom WORLD1)) MONSTER#)
-  (check-true (>= (let ([p (initialize-player)])
-                    (player-health p))
-                  (let ([p (initialize-player)])
-                    (all-monsters-attack-player p (list AN-ORC))
-                    (player-health p))))
-  (check-true (> (player-health (initialize-player)) 
-                 (let ([p (initialize-player)])
-                   (all-monsters-attack-player p (list A-HYDRA))
-                   (player-health p))))
-  (check-true (< (let ([p (initialize-player)])
-                   (all-monsters-attack-player p (list A-SLIME))
-                   (player-agility p))
-                 (let ([p (initialize-player)])
-                   (player-agility p))))
-  (check-true (let ([p (initialize-player)])
-                (all-monsters-attack-player p (list A-BRIGAND))
-                (or (= (player-health p)
-                       (- (player-health (initialize-player)) 2))
-                    (= (player-agility p)
-                       (- (player-agility (initialize-player)) 3))
-                    (= (player-strength p)
-                       (- (player-strength (initialize-player)) 4)))))
-  (check-equal? (length (orc-world-lom WORLD1)) MONSTER#)
-  (check-equal? (orc-world-player WORLD1) (orc-world-player WORLD1))
-  
-  ;; testing the-monster's attacks
-  
-  (prop:monster-attack-player-dec 1000)
-  (prop:monsters-attack-player-dec 1000)
-  (check-true (or (> (player-health (orc-world-player (WORLD2)))
-                     (player-health (orc-world-player 
-                                     (let ([w (WORLD2)])
-                                       (all-monsters-attack-player (orc-world-player w) (orc-world-lom w))
-                                       w))))
-                  (> (player-strength (orc-world-player (WORLD2)))
-                     (player-strength (orc-world-player
-                                       (let ([w (WORLD2)])
-                                         (all-monsters-attack-player (orc-world-player w) (orc-world-lom w))
-                                         w))))
-                  (> (player-agility (orc-world-player (WORLD2)))
-                     (player-agility (orc-world-player
-                                      (let ([w (WORLD2)])
-                                        (all-monsters-attack-player (orc-world-player w) (orc-world-lom w))
-                                        w))))))
-  
-  ;; testing the player's actions
-  
-  (prop:stab!-health 1000)
-  (test-begin (define o (orc 'image 0 5))
-              (damage-monster o 5)
-              (check-equal? o (orc 'image 0 5)))
-  (test-begin (define o (orc 'image 0 5))
-              (damage-monster o 0)
-              (check-equal? o (orc 'image 0 5)))
-  (check-equal? (player-health (orc-world-player
-                                (let () 
-                                  (define w (struct-copy orc-world WORLD1))
-                                  (heal w)
-                                  w)))
-                (min MAX-HEALTH
-                     (+ 8 (player-health (orc-world-player WORLD1)))))
-  
-  (check-equal? (length (orc-world-lom 
-                         (let ()
-                           (define w (struct-copy orc-world WORLD1))
-                           (stab w)
-                           w)))
-                MONSTER#)
-  
-  ;; testing game predicates
-  
-  (check-false (lose? WORLD0))
-  (check-true (lose? (orc-world (player 0 30 30) empty 0 0)))
-  (check-true (all-dead? (list (orc 'image 0 0) (hydra 'image 0))))
-  (check-true (all-dead? (list AN-ORC)))
-  (check-true (win? (orc-world (initialize-player) (list (orc 'image 0 0)) 0 0)))
-  (check-true (win? (orc-world (initialize-player) (list AN-ORC) 0 0)))
-  (check-true (end-of-orc-battle? (orc-world (initialize-player) (list (orc 'image 0 0)) 0 0)))
-  (check-true (end-of-orc-battle? (orc-world (initialize-player) (list AN-ORC) 0 0)))
-  (check-true (end-of-orc-battle? (orc-world (player 0 30 30) empty 0 0)))
-  (check-true (player-dead? (player 0 2 5)))
-  (check-false (player-dead? (initialize-player)))
-  (check-false (not (monster-alive? A-HYDRA)))
-  (check-true (monster-alive? (monster 'image 1)))
-  (check-false (monster-alive? (orc 'image 0 0)))
-  
-  ;; testing utilities 
-  
-  (prop:rand-frac-range 1000)
-  
-  "all tests run")
diff --git a/pkgs/realm/info.rkt b/pkgs/realm/info.rkt
deleted file mode 100644
index 5ec329c6e0..0000000000
--- a/pkgs/realm/info.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang info
-
-(define collection "realm")
-
-(define name "Realm of Racket Source Code")
-
-(define compile-omit-paths
-  '(
-    "chapter5/ufo-source.rkt"
-;    "chapter6"
-;    "chapter8"
-;    "chapter10"
-;    "chapter12"
-;    "chapter13"
-;    "chapter14"
-    ))
-
-; (define scribblings '(("htdp.scrbl")))
-(define deps '("base"
-               "htdp-lib"))
-(define build-deps '("rackunit-lib"))
-
-(define pkg-desc "Sample code for _Realm of Racket_")
-
-(define pkg-authors '(matthias))
diff --git a/pkgs/realm/readme.txt b/pkgs/realm/readme.txt
deleted file mode 100644
index dfaa7cf025..0000000000
--- a/pkgs/realm/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
-This folder contains the source code for the games from Realm of Racket. 
-It is organized into sub-folders labeled 'chapters'. Each 'chapter' folder
-contains the code and the graphics needed to run the examples from the 
-corresponding book chapter. 
diff --git a/pkgs/realm/todo.txt b/pkgs/realm/todo.txt
deleted file mode 100644
index f7f315a7bf..0000000000
--- a/pkgs/realm/todo.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-This is the first complete draft of the Realm of Racket code. 
-------------------------------------------------------------
-
-1. need to eliminate the AI from chapter 10 
-
-2. the game in 12 does not correctly advertise whose turn it is 
-   same bug may exist in chapter 10 
-
-3. we should offer a way to link the chapter 12 game to the AI 
-   XOR to allow a second human player 
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/info.rkt b/pkgs/redex-pkgs/redex-benchmark/info.rkt
deleted file mode 100644
index 41d15e0d9f..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "compiler-lib"
-               "rackunit-lib"
-               "redex-lib"
-               "redex-examples"
-               "math-lib"
-               "plot-lib"))
-
-(define build-deps '())
-
-(define pkg-desc "PLT Redex Benchmark")
-
-(define pkg-authors '(robby bfetscher))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark.rkt
deleted file mode 100644
index 0900095ac4..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-
-(require "benchmark/private/rw-defs.rkt"
-         "benchmark/private/logging.rkt"
-         "benchmark/private/gen-run.rkt")
-
-(provide define-rewrite
-         define-rewrite/compose
-         include/rewrite
-         run-gen-and-check
-         run-gen-and-check/mods
-         bmark-log-directory
-         benchmark-logging-to
-         bmark-log
-         (struct-out run-results))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/all-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/all-info.rkt
deleted file mode 100644
index e1d855759e..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/all-info.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         racket/list
-         racket/path)
-
-(provide all-mods)
-
-(define-runtime-path here ".")
-
-(define (all-info-files)
-  (for/list ([f (in-directory here)]
-             #:when (and (file-exists? f)
-                         (regexp-match #rx"^.*info\\.rkt$"
-                                       (path->string f)))
-             #:unless (regexp-match #rx".*all-info.*"
-                                    (path->string f)))
-    (path->string 
-     (find-relative-path (simplify-path (current-directory))
-                         (simplify-path f)))))
-
-(define (all-mods)
-  (append-map (λ (f)
-                ((dynamic-require f 'all-mods)))
-              (all-info-files)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-1.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-1.rkt
deleted file mode 100644
index 8bbabe1b70..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-1.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "guarded mark reduction doesn't wrap results with a list/c")
-
-;; note: this bug was found and fixed during the development of this model
-;; with commit: 4b848777d12a2e5b59b43c8e77f9f68b747d1151
-
-(define-rewrite bug1
-  (monitor (list/c ctc) (ccm mk t) k l j)
-  ==> 
-  (monitor ctc (ccm mk t) k l j)
-  #:context (reduction-relation)
-  #:once-only)
-
-(include/rewrite (lib "redex/benchmark/models/delim-cont/delim-cont.rkt") delim-cont bug1)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example 
-  '(<> (ccm 
-        (monitor 
-         (mark/c 
-          (mark/c (flat (λ (var:p : Num) #t)) 
-                  Num)
-          (Mark Num)) 
-         (make-cm-key (Mark Num))
-         "" "" "") 
-        (Mark Num))
-       (keymT : (→ Num Unit) (call/cm : Bool ·))))
-  
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-2.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-2.rkt
deleted file mode 100644
index b588fdb215..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-2.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "list/c contracts aren't applied properly in the cons case")
-
-(define-rewrite bug2
-  (monitor (list/c ctc) (cons v_1 v_2) k l j)
-  ==> 
-  (monitor ctc (cons v_1 v_2) k l j)
-  #:context (reduction-relation)
-  #:once-only)
-
-(include/rewrite (lib "redex/benchmark/models/delim-cont/delim-cont.rkt") delim-cont bug2)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  '(<> (monitor (list/c (flat (λ (var:k : Bool) #t))) 
-            (cons #t (null Bool)) 
-            "" "" "")
-       ·))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-3.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-3.rkt
deleted file mode 100644
index 64c6d77b8f..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-3.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "the function argument to call/comp has the wrong type")
-
-(define-rewrite bug3
-  (tc Γ Σ e_1 (→ (→ t_3 t_2) t_3))
-  ==> 
-  (tc Γ Σ e_1 (→ t_2 t_3))
-  #:context (define-judgment-form)
-  #:once-only)
-
-(include/rewrite (lib "redex/benchmark/models/delim-cont/delim-cont.rkt") delim-cont bug3)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term (<> ((λ (var:tg : (Prompt Num Bool))
-               (% (call/comp (λ (var:x : Bool) (if var:x #f #t))
-                             var:tg)
-                  var:tg
-                  (λ (var:x : Num) #t)))
-             (make-prompt-tag Num Bool))
-            (call/comp : (→ Num Bool) (call/comp : Num ·)))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-info.rkt
deleted file mode 100644
index 7bdf6dcee1..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont-info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide all-mods)
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (make-all-mods here "delim-cont" (make-path-root 'delim-cont)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont.rkt
deleted file mode 100644
index 4d99c08627..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/delim-cont.rkt
+++ /dev/null
@@ -1,928 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics
-         (only-in redex/private/generate-term pick-an-index))
-
-(provide (all-defined-out))
-
-(define-language abort-core-lang
-
-  ;; programs
-  (P (<> e σ))
-
-  ;; store
-  (σ · (key σ) (tag σ))
-
-  ;; expressions
-  (e x v (e e) (if e e e) (μ (x : t) e)
-     (unop e) (binop e e) (cons e e)
-     (case e (null = e) ((cons x x) = e))
-     (make-prompt-tag t t) (make-cm-key t)
-     (% e e v) (abort t e e) ; again with the type
-     (wcm w e) (ccm e t)
-     (call/comp e e) (call/cm e e e)
-     (seq (update mk e) e) ; for doing wcm updates -- should track label
-     (error))
-
-  (v b (λ (x : t) e) pt mk
-     (cons v v) (null t)
-     call/comp call/cm)
-
-  (w ((mk v) w)
-     ·)
-  
-  (W ((mk v) W)
-     hole)
-
-  (t B (→ t t) (Prompt t t)
-     (Mark t) (List t))
-  (B Num Bool Unit)
-
-  ;(x variable-not-otherwise-mentioned)
-  (x (variable-prefix var:))
-
-  (b n s bool unit)
-  (n number)
-  (bool #t #f)
-
-  ;; using variables for allocated tags/keys
-  (pt tag)
-  (mk key)
-  (tag (variable-prefix tag))
-  (key (variable-prefix key))
-
-  (binop + - *)
-  (unop - not zero? number? unit? boolean?)
-
-  ;; still need this wcm non-adjacency here
-  (E M (wcm w M))
-  (M hole (if E e e) (E e) (v E)
-     (unop E) (binop E e) (binop v E)
-     (case E (null = e) ((cons x x) = e))
-     (cons E e) (cons v E)
-     (seq (update mk E) e)
-     (% e E v) (% E pt v)
-     (abort t E e) (abort t v E)
-     (ccm E t)
-     (call/comp E e) (call/comp v E)
-     (call/cm E e e) (call/cm v E e)))
-
-;; define this in two stages for paper typesetting
-(define-extended-language abort-lang abort-core-lang
-  (e ....
-     (monitor ctc e l l l)
-     (ctc-error l l)
-     (check e v l l))
-  (pt ....
-      (PG ctc ctc v l l l))
-  (mk ....
-      (MG ctc mk l l l))
-  (ctc (flat (λ (x : t) e))
-       (-> ctc ctc)
-       (prompt-tag/c ctc ctc t t)
-       (mark/c ctc t)
-       (list/c ctc))
-  (t ....
-     (Con t))
-  ;; blame labels
-  ((l k j) string)
-  (M ....
-     (monitor ctc E l l l)
-     (check E v l l)))
-
-
-(define-extended-language abort+Γ-lang abort-lang
-  (Γ · (x : t Γ))
-  (Σ · (v : t Σ))
-  
-  (Pt (<> e Σ)))
-
-
-(define abort-red
-  (reduction-relation abort+Γ-lang
-   ;; domain changed to any for the test suite so we catch errors
-   ;; with type soundness, not a contract exception
-   #:domain any #:arrow ==>
-
-   ;; primitives
-   (--> (binop v_1 v_2) (delta_bin binop v_1 v_2) binop)
-   (--> (unop v) (delta_un unop v) unop)
-
-   ;; lists
-   (--> (case (cons v_1 v_2)
-          (null = e_1)
-          ((cons x_1 x_2) = e_2))
-        (subst (subst e_2 x_1 v_1) x_2 v_2)
-        case/cons)
-   (--> (case (null t)
-          (null = e_1)
-          ((cons x_1 x_2) = e_2))
-        e_1
-        case/null)
-
-   ;; conditional
-   (--> (if #t e_1 e_2) e_1 if-true)
-   (--> (if #f e_1 e_2) e_2 if-false)
-
-   ;; lambda application
-   (--> ((λ (x : t) e) v)
-        (subst e x v)
-        β)
-
-   ;; recursion
-   (--> (μ (x : t) e)
-        (subst e x (μ (x : t) e))
-        μ)
-
-   ;; call/comp
-   (--> (% (in-hole E_pt (wcm w (call/comp v pt)))
-           pt_1 v_h)
-        (% (in-hole E_pt (wcm w (v (λ (x : t) e_k))))
-           pt_1 v_h)
-        (where/hidden (λ (x : t) e) v)
-        (where e_k (wrap-c- pt (wrap-c+ pt_1 (in-hole E_pt x))))
-        (side-condition/hidden (term (no-match E_pt pt)))
-        (side-condition (term (same-prompt-tag? pt pt_1)))
-        call/comp)
-
-   ;; prompt & prompt tags
-   ;; E[(make-prompt-tag)]  |-->  E[x]  where x \not\in FV(E)
-   (==> (<> (in-hole E (make-prompt-tag t_1 t_2)) Σ)
-        (<> (in-hole E tag) (tag : (Prompt t_1 t_2) Σ))
-        (where/hidden tag ,(variable-not-in (term Σ) 'tag))
-        (side-condition (variable-not-in (term Σ) 'tag))
-        prompt-tag)
-
-   ;; cont mark key
-   (==> (<> (in-hole E (make-cm-key t)) Σ)
-        (<> (in-hole E key) (key : (Mark t) Σ))
-        (where/hidden key ,(variable-not-in (term Σ) 'key))
-        (side-condition (variable-not-in (term Σ) 'key))
-        mark-key)
-
-   ;; no control effect
-   (--> (% v_1 pt v_2) v_1
-        prompt)
-
-   ;; abort (everything in one!)
-   (--> (% (in-hole E_pt (abort t pt v)) pt_1 v_h)
-        (v_h (in-hole E_+ (in-hole E_- v)))
-        (where E_+ (wrap+ pt_1))
-        (where E_- (wrap- pt hole))
-        (side-condition/hidden (term (no-match E_pt pt)))
-        (side-condition (term (same-prompt-tag? pt pt_1)))
-        abort)
-
-   ;; flat contracts
-   ;; MF: your flat syntax allows only a value i.e. (flat v)
-   ;; which is good !!!
-   ;; and this suggests that you meant 'monitor' not 'contract' here
-   ;; 
-   ;; Rule #14 (had to remove names for typesetting)
-   (--> (monitor (flat v_f) v k l j)
-        (check (v_f v) v k j))
-
-   (--> (check #t v l j) v)
-   (--> (check #f v l j) (ctc-error l j))
-
-   ;; ->
-   (--> (monitor (-> ctc_a ctc_r) (name v (λ (x : t) e)) k l j)
-        (λ (x_1 : t)
-           ((λ (x_2 : t) (monitor ctc_r (v x_2) k l j))
-            (monitor ctc_a x_1 l k j)))
-        ;;added this (10/7/14):
-        (where/hidden (x_1 x_2) 
-                      ,(variables-not-in (term (ctc_a ctc_r v))
-                                         '(var: var:))))
-   ;; prompt-tag/c
-   (--> (monitor (prompt-tag/c ctc_1 ctc_2 t_1 t_2) v_p k l j)
-        (PG ctc_1 ctc_2 v_p k l j))
-
-   ;; mark/c
-   (--> (monitor (mark/c ctc t) v_m k l j)
-        (MG ctc v_m k l j))
-
-   ;; list/c
-   (--> (monitor (list/c ctc) (null t) k l j)
-        (null t))
-   (--> (monitor (list/c ctc) (cons v_1 v_2) k l j)
-        (cons (monitor ctc v_1 k l j) (monitor (list/c ctc) v_2 k l j)))
-
-   ;; just a value
-   (--> (wcm w v) v wcm/v)
-
-   ;; wcm merging
-   (--> (wcm w_1 (wcm w_2 e))
-        (wcm (merge w_1 w_2) e)
-        wcm/merge)
-
-   ;; get a mark
-   (==> (<> (in-hole E (ccm key t)) Σ)
-        (<> (in-hole E (marks E key (null t))) Σ)
-        ccm)
-
-   ;; get mark values with a guarded key
-   (--> (ccm (MG ctc mk k l j) t)
-        (monitor (list/c ctc) (ccm mk t) k l j)
-        ccm/guard)
-
-   ;; turn a call/cm into an update
-   (--> (wcm w (call/cm mk v e))
-        (wcm w (seq (update mk_1 e_1) e))
-        (where (mk_1 e_1) (push mk v))
-        call/cm)
-
-   ;; special mark update
-   (--> (wcm (in-hole W ((key v_1) w))
-             (seq (update key v_2) e))
-        (wcm (in-hole W ((key v_2) w))
-             e)
-        wcm/set)
-
-   ;; add a mark
-   (--> (wcm (in-hole W ·)
-             (seq (update key v) e))
-        (wcm (in-hole W ((key v) ·))
-             e)
-        (side-condition (term (not-in-W key W)))
-        wcm/add)
-
-   ;; introduce mark environment
-   (==> (<> (in-hole E (call/cm v_1 v_2 e)) Σ)
-        (<> (in-hole E (wcm · (call/cm v_1 v_2 e))) Σ)
-        (side-condition (term (not-wcm E)))
-        wcm/intro/cm)
-
-   (==> (<> (in-hole E (call/comp v_1 v_2)) Σ)
-        (<> (in-hole E (wcm · (call/comp v_1 v_2))) Σ)
-        (side-condition (term (not-wcm E)))
-        wcm/intro/comp)
-
-   ;; propagate error
-   (==> (<> (in-hole E (ctc-error l j)) Σ)
-        (<> (ctc-error l j) Σ)
-        (side-condition/hidden (not (equal? (term E) (term hole))))
-        ctc-error)
-
-   (==> (<> (in-hole E (error)) Σ)
-        (<> (error) Σ)
-        (side-condition (not (equal? (term E) (term hole)))))
-
-   with
-   [(==> (<> (in-hole E a) Σ) (<> (in-hole E b) Σ))
-    (--> a b)]))
-
-;; wrapping contracts
-(define-metafunction abort-lang
-  wrap+ : pt -> E
-  [(wrap+ (PG ctc_1 ctc_2 pt k l j))
-   (monitor ctc_1 (wrap+ pt) k l j)]
-  [(wrap+ tag) hole])
-
-(define-metafunction abort-lang
-  wrap- : pt E -> E
-  [(wrap- (PG ctc_1 ctc_2 pt k l j) E)
-   (wrap- pt (monitor ctc_1 E l k j))]
-  [(wrap- tag E) E])
-
-(define-metafunction abort-lang
-  wrap-c+ : pt e -> e
-  [(wrap-c+ (PG ctc_1 ctc_2 pt k l j) e)
-   (monitor ctc_2 (wrap-c+ pt e) l k j) ]
-  [(wrap-c+ tag e) e])
-
-(define-metafunction abort-lang
-  wrap-c- : pt e -> e
-  [(wrap-c- (PG ctc_1 ctc_2 pt k l j) e)
-   (wrap-c- pt (monitor ctc_2 e k l j))]
-  [(wrap-c- tag e) e])
-
-;; extract true prompt tag out
-(define-metafunction abort-lang
-  extract : pt -> pt
-  [(extract (PG ctc_1 ctc_2 pt k l j)) (extract pt)]
-  [(extract tag) tag])
-
-;; push value into mark guards
-(define-metafunction abort-lang
-  push : mk e -> (mk e)
-  [(push (MG ctc mk k l j) e)
-   (push mk (monitor ctc e l k j))]
-  [(push key e) (key e)])
-
-;; check if this mark key is in the current w
-(define-metafunction abort-lang
-  not-in-W : mk W -> #t or #f
-  [(not-in-W mk_1 ((mk_1 v_1) W))
-   #f]
-  [(not-in-W mk_1 ((mk_2 v_1) W))
-   (not-in-W mk_1 W)]
-  [(not-in-W mk_1 hole)
-   #t])
-
-;; check that wcm doesn't wrap the hole
-(define-metafunction abort-lang
-  not-wcm : E -> #t or #f
-  [(not-wcm (in-hole E (wcm w hole))) #f]
-  [(not-wcm E) #t])
-
-;; wcm merging, second takes precedence
-(define-metafunction abort-lang
-  merge : w w -> w
-  [(merge · w)
-   w]
-  [(merge ((v_1 v_2) w_1)
-          (in-hole W ((v_1 v_3) w_2)))
-   (merge w_1
-          (in-hole W ((v_1 v_3) w_2)))]
-  [(merge ((v_1 v_2) w_1)
-          (in-hole W ·))
-   (merge w_1
-          (in-hole W ((v_1 v_2) ·)))])
-
-
-;; just for convenience
-(define-metafunction abort-lang
-  [(let ([(x : t) e_1]) e_2) ((λ (x : t) e_2) e_1)])
-
-;; type checking
-(define-judgment-form
-  abort+Γ-lang
-  #:mode (tc I I I O)
-  #:contract (tc Γ Σ any t)
-
-  [(tc Γ Σ e_1 (→ t_2 t_3))
-   (tc Γ Σ e_2 t_2)
-   ------------------------ TApp
-   (tc Γ Σ (e_1 e_2) t_3)]
-
-  [(tc (x : t_1 Γ) Σ e t_2)
-   ------------------------------------ TLam
-   (tc Γ Σ (λ (x : t_1) e) (→ t_1 t_2))]
-
-  [(tc (x : t Γ) Σ e t)
-   ------------------------ TMu
-   (tc Γ Σ (μ (x : t) e) t)]
-
-  [(tc Γ Σ e_1 (List t_1))
-   (tc Γ Σ e_2 t_2)
-   (tc (x_2 : (List t_1) (x_1 : t_1 Γ)) Σ e_3 t_2)
-   ----------------------------------------------------------- TCase
-   (tc Γ Σ (case e_1 (null = e_2) ((cons x_1 x_2) = e_3)) t_2)]
-
-  [-------------------------- TNull
-   (tc Γ Σ (null t) (List t))]
-
-  [(tc Γ Σ v_1 t)
-   (tc Γ Σ v_2 (List t))
-   -------------------------------- TCons
-   (tc Γ Σ (cons v_1 v_2) (List t))]
-
-  [(where t (∈-Γ x Γ))
-   ----------------- TVar
-   (tc Γ Σ x t)]
-
-  [(tc Γ Σ e_1 Num)
-   (tc Γ Σ e_2 Num)
-   ------------------------------------ TBinOp
-   (tc Γ Σ (binop e_1 e_2) Num)]
-  
-  [(tc Γ Σ e Num)
-   ---------------------------------- TUnOp-
-   (tc Γ Σ (- e) Num)]
-  
-  [(tc Γ Σ e Bool)
-   ---------------------------------- TUnOp-not
-   (tc Γ Σ (not e) Bool)]
-  
-  [(tc Γ Σ e Num)
-   ---------------------------------- TUnOp-zero?
-   (tc Γ Σ (zero? e) Bool)]
-  
-  [(tc Γ Σ e t)
-   ---------------------------------- TUnOp-number?
-   (tc Γ Σ (number? e) Bool)]
-  
-  [(tc Γ Σ e t)
-   ---------------------------------- TUnOp-unit?
-   (tc Γ Σ (unit? e) Bool)]
-  
-  [(tc Γ Σ e t)
-   ---------------------------------- TUnOp-boolean?
-   (tc Γ Σ (boolean? e) Bool)]
-
-  [-------------- TNum
-   (tc Γ Σ n Num)]
-
-  [---------------- TTrue
-   (tc Γ Σ #t Bool)]
-
-  [---------------- TFalse
-   (tc Γ Σ #f Bool)]
-
-  [------------------ TUnit
-   (tc Γ Σ unit Unit)]
-
-  [(tc Γ Σ e_1 Bool)
-   (tc Γ Σ e_2 t)
-   (tc Γ Σ e_3 t)
-   --------------------------- TIf
-   (tc Γ Σ (if e_1 e_2 e_3) t)]
-
-  ;; Control
-  [--------------------------------------------------- TMakePrompt
-   (tc Γ Σ (make-prompt-tag t_1 t_2) (Prompt t_1 t_2))]
-
-  [(where (Prompt t_1 t_2) (∈-Σ tag Σ))
-   ---------------------------------- TPromptTag
-   (tc Γ Σ tag (Prompt t_1 t_2))]
-
-  ;; ???
-  ;; should this be:
-  ;; (this version satisfies type soundness)
-  [(tc Γ Σ v (Prompt t_1 t_2))
-   (tcc Γ Σ ctc_1 (Con t_1))
-   (tcc Γ Σ ctc_2 (Con t_2))
-   -------------------------------------------------- TPromptGuard
-   (tc Γ Σ (PG ctc_1 ctc_2 v k l j) (Prompt t_1 t_2))]
-  
-#| previous version:
-  [(tc Γ Σ v (Prompt t_1 t_2))
-   (tcc Γ Σ ctc_1 (Con (Prompt t_1 t_2)))
-   -------------------------------------------------- TPromptGuard
-   (tc Γ Σ (PG ctc_1 ctc_2 v k l j) (Prompt t_1 t_2))]|#
-  
-  [(tc Γ Σ e_1 t_2)
-   (tc Γ Σ v (→ t_1 t_2))
-   (tc Γ Σ e_2 (Prompt t_1 t_2))
-   ----------------------------- TPrompt
-   (tc Γ Σ (% e_1 e_2 v) t_2)]
-
-  [(tc Γ Σ e_2 t_1)
-   (tc Γ Σ e_1 (Prompt t_1 t_2))
-   ----------------------------- TAbort
-   (tc Γ Σ (abort t e_1 e_2) t)]
-
-  [(tc Γ Σ e_1 (→ (→ t_3 t_2) t_3))
-   (tc Γ Σ e_2 (Prompt t_1 t_2))
-   -------------------------------- TCallComp
-   (tc Γ Σ (call/comp e_1 e_2) t_3)]
-
-  ;; Marks
-  [(tc Γ Σ e_1 (Mark t_1))
-   (tc Γ Σ e_2 t_1) (tc Γ Σ e_3 t_2)
-   ---------------------------------- TCallCM
-   (tc Γ Σ (call/cm e_1 e_2 e_3) t_2)]
-  
-  [(tc Γ Σ e t)
-   (tc-w Γ Σ w)
-   --------------------------------------------- TWCM
-   (tc Γ Σ (wcm w e) t)]
-
-  [(tc Γ Σ e (Mark t))
-   --------------------------- TCCM
-   (tc Γ Σ (ccm e t) (List t))]
-
-  [--------------------------------- TMakeKey
-   (tc Γ Σ (make-cm-key t) (Mark t))]
-
-  [(where (Mark t) (∈-Σ key Σ))
-   -------------------------- TKey
-   (tc Γ Σ key (Mark t))]  
-
-  [(tcc Γ Σ ctc (Con t))
-   (tc Γ Σ v (Mark t))
-   ---------------------------------- TKeyGuard
-   (tc Γ Σ (MG ctc v k l j) (Mark t))]
-
-  [(tcc Γ Σ ctc (Con t)) (tc Γ Σ e t)
-   --------------------------------- TMon
-   (tc Γ Σ (monitor ctc e k l j) t)])
-
-;; pulled out to tighten the tc contract
-(define-judgment-form abort+Γ-lang
-  #:mode (tcc I I I O)
-  [(tc Γ Σ (λ (x : B) e) (→ B Bool))
-   ---------------------------------------- TConFlat
-   (tcc Γ Σ (flat (λ (x : B) e)) (Con B))]
-
-  [(tcc Γ Σ ctc_1 (Con t_1)) (tcc Γ Σ ctc_2 (Con t_2))
-   ------------------------------------------------- TConFun
-   (tcc Γ Σ (-> ctc_1 ctc_2) (Con (→ t_1 t_2)))]
-
-  [(tcc Γ Σ ctc_1 (Con t_1)) (tcc Γ Σ ctc_2 (Con t_2))
-   ----------------------------------------------------------------- TConPrompt
-   (tcc Γ Σ (prompt-tag/c ctc_1 ctc_2 t_1 t_2) (Con (Prompt t_1 t_2)))]
-
-  [(tcc Γ Σ ctc (Con t))
-   -------------------------------------- TConMark
-   (tcc Γ Σ (mark/c ctc t) (Con (Mark t)))]
-
-  [(tcc Γ Σ ctc (Con t))
-   ------------------------------------ TConList
-   (tcc Γ Σ (list/c ctc) (Con (List t)))])
-
-(define-judgment-form abort+Γ-lang
-  #:mode (tc-w I I I)
-  [(tc Γ Σ v t)
-   (tc Γ Σ mk (Mark t))
-   (tc-w Γ Σ w)
-   --------------------------------- TCW-cons
-   (tc-w Γ Σ ((mk v) w))]
-  [--------------------------------- TCW-nil
-   (tc-w Γ Σ ·)]) 
-
-(define-metafunction abort+Γ-lang
-  ∈-Γ : any any -> t or #f
-  [(∈-Γ x (x : t Γ)) t]
-  [(∈-Γ x_2 (x_1 : t_1 Γ))
-   (∈-Γ x_2 Γ)]
-  [(∈-Γ any ·) #f])
-
-(define-metafunction abort+Γ-lang
-  ∈-Σ : any any -> t or #f
-  [(∈-Σ v (v : t Σ)) t]
-  [(∈-Σ v_2 (v_1 : t_1 Σ))
-   (∈-Σ v_2 Σ)]
-  [(∈-Σ any ·) #f])
-
-(define-metafunction abort+Γ-lang
-  [(different any_1 any_1) #f]
-  [(different any_1 any_2) #t])
-
-
-;; encoding for the paper
-(define-metafunction abort-lang
-  [(call/cc (name v (λ (x_1 : (→ t_1 t_2)) e_1)) e)
-   (call/comp
-    (λ (var:kont : (→ t_1 t_2))
-      (v (λ (var:x : t_1)
-           (abort t_2 e (λ (var:y : Unit) (var:kont var:x))))))
-    e)])
-
-(define-metafunction abort-lang
-  subst-n : e (x ...) (e ...) -> e
-  [(subst-n e () ()) e]
-  [(subst-n e (x_1 x_2 ...) (e_1 e_2 ...))
-   (subst-n (subst e x_1 e_1) (x_2 ...) (e_2 ...))])
-
-(define-metafunction abort-lang
-  subst : e x e -> e
-  ;; base cases
-  [(subst n x e) n]
-  [(subst b x e) b]
-  [(subst s x e) s]
-  [(subst unit x e) unit]
-  [(subst call/comp x e) call/comp]
-  [(subst call/cm x e) call/cm]
-  [(subst binop x e) binop]
-  [(subst unop x e) unop]
-  ;; expressions
-  [(subst (binop e_1 e_2) x e_3)
-   (binop (subst e_1 x e_3) (subst e_2 x e_3))]
-  [(subst (unop e) x e_1)
-   (unop (subst e x e_1))]
-  [(subst (e_1 e_2 ...) x e_3)
-   ((subst e_1 x e_3) (subst e_2 x e_3) ...)]
-  [(subst (if e_1 e_2 e_3) x e_4)
-   (if (subst e_1 x e_4) (subst e_2 x e_4) (subst e_3 x e_4))]
-  ;; this might be simplifiable
-  [(subst (case e_1 (null = e_2) ((cons x x_2) = e_3)) x e_4)
-   (case (subst e_1 x e_4)
-     (null = (subst e_2 x e_4))
-     ((cons x x_2) = e_3))]
-  [(subst (case e_1 (null = e_2) ((cons x_1 x) = e_3)) x e_4)
-   (case (subst e_1 x e_4)
-     (null = (subst e_2 x e_4))
-     ((cons x_1 x) = e_3))]
-  [(subst (case e_1 (null = e_2) ((cons x_1 x_2) = e_3)) x e_4)
-   (case (subst e_1 x e_4)
-     (null = (subst e_2 x e_4))
-     ((cons x_1 x_2) = (subst e_3 x e_4)))]
-  [(subst (cons e_1 e_2) x e)
-   (cons (subst e_1 x e) (subst e_2 x e))]
-  [(subst (% e_1 e_2 e_3) x e_4)
-   (% (subst e_1 x e_4) (subst e_2 x e_4) (subst e_3 x e_4))]
-  [(subst (abort t e_1 e_2) x e_4)
-   (abort t (subst e_1 x e_4) (subst e_2 x e_4))]
-  [(subst (make-prompt-tag t_1 t_2) x e)
-   (make-prompt-tag t_1 t_2)]
-  [(subst (call/comp v_1 e_1) x e_2)
-   (call/comp (subst v_1 x e_2) (subst e_1 x e_2))]
-  [(subst (ccm e t) x e_1) (ccm (subst e x e_1) t)]
-  [(subst (wcm w e) x e_1) (wcm w (subst e x e_1))]
-  [(subst (error) x e) (error)]
-  [(subst (ctc-error l j) x e) (ctc-error l j)]
-  ;; variables
-  [(subst x x e) e]
-  [(subst x_1 x_2 e) x_1]
-  ;; prompt tags (this has to be after var cases)
-  [(subst (PG ctc_1 ctc_2 pt k l j) x e)
-   (PG (subst-ctc ctc_1 x e)
-       (subst-ctc ctc_2 x e)
-       (subst pt x e) k l j)]
-  [(subst tag x e) tag]
-  ;; mark keys
-  [(subst (MG ctc mk k l j) x e)
-   (MG (subst-ctc ctc x e) (subst mk x e) k l j)]
-  [(subst key x e) key]
-  ;; lambda
-  [(subst (λ (x : t) e) x e_1)
-   (λ (x : t) e)]
-  [(subst (λ (x_1 : t_1) e) x_2 e_1)
-   (λ (x_1 : t_1) (subst e x_2 e_1))]
-  ;; mu
-  [(subst (μ (x : t) e) x e_1)
-   (μ (x : t) e)]
-  [(subst (μ (x_1 : t_1) e) x_2 e_1)
-   (μ (x_1 : t_1) (subst e x_2 e_1))]
-  ;; contracts
-  [(subst (monitor ctc e k l j) x e_1)
-   (monitor (subst-ctc ctc x e_1) (subst e x e_1) k l j)]
-  [(subst ctc x e_1)
-   (subst-ctc ctc x e_1)]
-  ;; additional ...
-  [(subst (make-cm-key t) x e)
-   (make-cm-key t)]
-  [(subst (null t) x e)
-   (null t)])
-
-(define-metafunction abort-lang
-  subst-ctc : ctc x e -> ctc
-  [(subst-ctc (flat e) x e_1)
-   (flat (subst e x e_1))]
-  [(subst-ctc (-> ctc_a ctc_r) x e)
-   (-> (subst-ctc ctc_a x e) (subst-ctc ctc_r x e))]
-  [(subst-ctc (prompt-tag/c ctc_1 ctc_2 t_1 t_2) x e)
-   (prompt-tag/c (subst-ctc ctc_1 x e)
-                 (subst-ctc ctc_2 x e)
-                 t_1 t_2)]
-  [(subst-ctc (mark/c ctc t) x e)
-   (mark/c (subst-ctc ctc x e) t)]
-  [(subst-ctc (list/c ctc) x e)
-   (list/c (subst-ctc ctc x e))])
-
-;; MF: you do keep the rest of the language total. Cmp above with 'stuck'.
-(define-metafunction abort-lang
-  delta_bin : binop v v -> e
-  [(delta_bin + n_1 n_2)
-   ,(+ (term n_1) (term n_2))]
-  [(delta_bin - n_1 n_2)
-   ,(- (term n_1) (term n_2))]
-  [(delta_bin * n_1 n_2)
-   ,(* (term n_1) (term n_2))]
-  [(delta_bin binop v_1 v_2) (error)])
-
-(define-metafunction abort-lang
-  delta_un : unop v -> e
-  [(delta_un - n_1)
-   ,(- (term n_1))]
-  [(delta_un not v_1)
-   ,(not (term v_1))]
-  [(delta_un zero? n_1)
-   ,(zero? (term n_1))]
-  [(delta_un number? v_1)
-   ,(number? (term v_1))]
-  [(delta_un boolean? v_1)
-   ,(boolean? (term v_1))]
-  [(delta_un unit? v_1)
-   ,(eq? 'unit (term v_1))]
-  [(delta_un procedure? (λ ([x : t] ...) e)) #t]
-  [(delta_un procedure? (flat v)) #t]
-  [(delta_un procedure? v) #f]
-  [(delta_un prompt-tag? pt) #t]
-  [(delta_un prompt-tag? v) #f]
-  [(delta_un unop v) (error)])
-
-;; used to make sure a given context is the closest one with the
-;; matching prompt tag
-(define-metafunction abort-lang
-  no-match : E pt -> #t or #f
-  [(no-match hole pt) #t]
-  [(no-match (% e E v) pt) (no-match E pt)]
-  [(no-match (% E pt_0 v) pt_1)
-   #f
-   (side-condition (term (same-prompt-tag? pt_0 pt_1)))]
-  [(no-match (% E pt_0 v) pt_1)
-   (no-match E pt_1)
-   (side-condition (not (term (same-prompt-tag? pt_0 pt_1))))]
-  [(no-match (binop E e) pt) (no-match E pt)]
-  [(no-match (binop v E) pt) (no-match E pt)]
-  [(no-match (unop E) pt) (no-match E pt)]
-  [(no-match (E e) pt) (no-match E pt)]
-  [(no-match (v E) pt) (no-match E pt)]
-  [(no-match (if E e_1 e_2) pt) (no-match E pt)]
-  [(no-match (case E (null = e_1) ((cons x_1 x_2) = e_2)) pt)
-   (no-match E pt)]
-  [(no-match (abort t E e) pt) (no-match E pt)]
-  [(no-match (abort t v E) pt) (no-match E pt)]
-  [(no-match (wcm w E) pt) (no-match E pt)]
-  [(no-match (monitor ctc E k l j) pt) (no-match E pt)]
-  [(no-match (call/comp E e) pt) (no-match E pt)]
-  [(no-match (call/comp v E) pt) (no-match E pt)]
-  [(no-match (call/cm E e_1 e_2) pt) (no-match E pt)]
-  [(no-match (call/cm v E e) pt) (no-match E pt)]
-  [(no-match (ccm E t) pt) (no-match E pt)]
-  [(no-match (check E v l_1 l_2) pt) (no-match E pt)])
-
-(define-metafunction abort-lang
-  same-prompt-tag? : pt pt -> #t or #f
-  [(same-prompt-tag? pt pt) #t]
-  [(same-prompt-tag? (PG ctc_1 ctc_2 pt_1 k l j) pt_2)
-   (same-prompt-tag? pt_1 pt_2)]
-  [(same-prompt-tag? pt_1 (PG ctc_1 ctc_2 pt_2 k l j))
-   (same-prompt-tag? pt_1 pt_2)]
-  [(same-prompt-tag? tag_1 tag_2) #f])
-
-
-;; for continuation marks
-(define-metafunction abort-lang
-  marks : E v v -> v
-  [(marks hole v v_1) v_1]
-  [(marks (wcm w_1 E) v_1 v)
-   (marks E v_1 (cons v_2 v))
-   (where (in-hole W ((v_1 v_2) w_2)) w_1)]
-  [(marks (wcm w E) v v_1)
-   (marks E v v_1)
-   (where (in-hole W ·) w)
-   (side-condition/hidden (term (not-in-W v W)))]
-  [(marks (E e_1) v v_1) (marks E v v_1)]
-  [(marks (v_1 E) v_2 v_3) (marks E v_2 v_3)]
-  [(marks (binop E e) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (binop v E) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (unop E) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (if E e_1 e_2) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (case E (null = e_1) ((cons x_1 x_2) = e_2)) v_2 v_1)
-   (marks E v_2 v_1)]
-  [(marks (% e E v) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (% E pt v) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (monitor ctc E k l j) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (abort t E e) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (abort t v E) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (call/comp E e) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (call/comp v E) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (call/cm E e_1 e_2) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (call/cm v_3 E e_2) v_2 v_1) (marks E v_2 v_1)]
-  [(marks (ccm E t) v_1 v_2) (marks E v_1 v_2)]
-  [(marks (check E v l_1 l_2) v_1 v_2) (marks E v_1 v_2)])
-
-;; evaluator
-;; term [store] -> result
-(define (abort-eval t #:init-store [store (term ·)])
-  (define state (term (<> ,t ,store)))
-  (define steps 0)
-  (define exceeded-max-steps #f)
-  (define results 
-    (apply-reduction-relation* abort-red state
-                               #:stop-when
-                               (λ (_)
-                                 (set! steps (add1 steps))
-                                 ;; treat 100 steps as non-terminating
-                                 (and (steps . > . 100)
-                                      (set! exceeded-max-steps #t)))))
-  (cond [(or (empty? results)
-             exceeded-max-steps)
-         'non-terminating]
-        [else
-         (define result (cadr (car results)))
-         (match result
-           [(? number? n) n]
-           [(? boolean? b) b]
-           ['unit 'unit]
-           [`(cons ,v_1 ,v_2) `(cons ,v_1 ,v_2)]
-           [`(null ,t) 'null]
-           ['key 'mark-key]
-           [`(MG ,e ...) 'mark-key]
-           ['tag 'prompt-tag]
-           [`(PG ,e ...) 'prompt-tag]
-           [`(λ ,e ...) 'procedure]
-           [`(-> ,e_1 ,e_2) 'contract]
-           [`(prompt-tag/c ,e ...) 'contract]
-           [`(mark/c ,e ...) 'contract]
-           ;; flat contracts are 'procedure even though they could be
-           ;; 'contract (this works better since all unary procedures are
-           ;;  contracts in Racket)
-           [`(flat ,e) 'procedure]
-           [`(ctc-error ,e_1 ,e_2) `(ctc-error ,e_1 ,e_2)]
-           [`(error) 'error]
-           [_
-            (if (e-missing-prompt? result)
-                'missing-prompt
-                (error (format "Got stuck: ~a" result)))])]))
-
-(define (e-missing-prompt? e)
-  (or (redex-match abort-lang
-                   (side-condition
-                    (in-hole E_pt
-                             (call/comp v pt))
-                    (term (no-match E_pt pt)))
-                   e)
-      (redex-match abort-lang
-                   (side-condition
-                    (in-hole E_pt
-                             (abort t pt v))
-                    (term (no-match E_pt pt)))
-                   e)))
-
-
-
-
-(define (random-exp depth)
-  (match
-      (generate-term
-       abort+Γ-lang
-       #:satisfying
-       (tc · Σ e t)
-       depth)
-    [#f #f]
-    [`(tc · ,Σ ,e ,t) 
-     (list Σ e)]))
-
-(define (eval-random-exps n [depth 4])
-  (for ([_ n])
-    (define e (random-exp depth))
-    (when e
-      (pretty-write e)
-      (abort-eval e))))
-
-(define ccmg-e '(μ
- (Bxf : (List (Prompt Num Num)))
- (ccm
-  (monitor
-   (mark/c
-    (prompt-tag/c (flat (λ (F : Num) #t)) (flat (λ (Q : Num) #t)) Num Num)
-    (Prompt Num Num))
-   (make-cm-key (Prompt Num Num))
-   "LxkZYC"
-   "r"
-   "I")
-  (Prompt Num Num))))
-
-(define (progress-holds? e)
-  (or (redex-match abort-lang v e)
-      (e-missing-prompt? e)
-      (= (length (apply-reduction-relation abort-red `(<> ,e ·)))
-         1)))
-
-(define (preservation-holds? e)
-  (define t (judgment-holds (tc · · ,e t) t))
-  (or (redex-match abort-lang v e)
-      (e-missing-prompt? e)
-      (match (apply-reduction-relation abort-red `(<> ,e ·))
-        [`((<> ,e* ,st*))
-         (equal? (judgment-holds (tc · ,st* ,e* t) t)
-                 t)])))
-
-(define (is-error? e)
-  (or (redex-match abort-lang (in-hole E (ctc-error l_1 l_2)) e)
-      (redex-match abort-lang (in-hole E (error)) e)))
-
-;; artifacts of the reduction relation that can't
-;; be typed checked
-(define (in-between-state? exp)
-  (or (redex-match abort-lang (in-hole E (seq (update mk e_1) e_2)) exp)
-      (redex-match abort-lang (in-hole E (check e v l_1 l_2)) exp)))
-
-(define (soundness-holds? e [inp-Σ '·])
-  (define t (judgment-holds (tc · ,inp-Σ ,e t) t))
-  (define exceeded-max-steps #f)
-  (define steps 0)
-  (or (not t)
-      (match (apply-reduction-relation* 
-              abort-red `(<> ,e ,inp-Σ)
-              #:stop-when
-              (λ (_)
-                (set! steps (add1 steps))
-                ;; treat 40 steps as non-terminating
-                ;; larger examples tend to be useless...
-                (and (steps . > . 40)
-                     (set! exceeded-max-steps #t))))
-        ['() #t] ;; looping reduction graph
-        [`((<> ,e* ,st*))
-         (or (is-error? e*)
-             (and (or exceeded-max-steps
-                      (redex-match abort-lang v e*)
-                      (e-missing-prompt? e*))
-                  (or (in-between-state? e*)
-                      (equal? (judgment-holds (tc · ,st* ,e* t) t)
-                              t))))]
-        [_
-         (if exceeded-max-steps
-             #t
-             (error 'soundness "multiple reductions found for ~s" e))])))
-
-(define (check-random-exps n [depth 4] #:verbose [verbose? #f])
-  (for/and ([_ n])
-    (define e (random-exp depth))
-    (or (not e)
-        (match-let* ([(list s e) e]
-                     [ok? (soundness-holds? e s)])
-          (when verbose?
-            (pretty-write e))
-          (unless ok?
-            (error 'check "soundness failed for: ~s\n~s" s e))
-          ok?))))
-
-(define (type-check e Σ)
-  (judgment-holds (tc · ,Σ ,e t)))
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/generators.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/generators.rkt
deleted file mode 100644
index 08dde678a2..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/generators.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/base
-
-(require (except-in redex/benchmark/models/delim-cont/delim-cont let)
-         (only-in redex/private/generate-term pick-an-index)
-         redex/reduction-semantics
-         racket/bool
-         racket/match)
-
-(provide (all-defined-out))
-
-(module+ adhoc-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'grammar)
-  (define (generate)
-    (generate-term abort+Γ-lang (<> e Σ) 4)))
-
-(module+ enum-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'enum)
-  (define (generate [p-value 0.125])
-    (generate-term abort+Γ-lang (<> e Σ) #:i-th (pick-an-index p-value))))
-
-(module+ ordered-mod
-  (provide generate get-generator type)
-  (define (get-generator)
-    (let ([index 0])
-      (λ () (begin0
-              (generate index)
-              (set! index (add1 index))))))
-  (define type 'ordered)
-  (define (generate [index 0])
-    (generate-term abort+Γ-lang (<> e Σ)  #:i-th index)))
-
-(module+ typed-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'search)
-  (define (generate)
-    (match (generate-term
-            abort+Γ-lang
-            #:satisfying
-            (tc · Σ e t)
-            4)
-      [`(tc ,_ ,Σ ,e ,_) `(<> ,e ,Σ)]
-      [#f #f])))
-
-(module+ check-mod
-  (provide check)
-  (define (check term)
-    (or (not term)
-        (match term
-          [`(<> ,e ,Σ)
-           (implies (type-check e Σ)
-                    (soundness-holds? e Σ))]))))
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/test.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/test.rkt
deleted file mode 100644
index e871236d75..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/test.rkt
+++ /dev/null
@@ -1,622 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics
-         (for-syntax syntax/parse)
-         "delim-cont.rkt"
-         (only-in rackunit 
-                  check-equal?
-                  check-false
-                  check-true))
-
-(judgment-holds
- (tc · · (+ 1 2) t)
- t)
-(judgment-holds
- (tc · · ((λ (var:x : Num) (+ var:x 5)) 3) t)
- t)
-(judgment-holds
- (tc · · (if (zero? 0) #t #f) t)
- t)
-(judgment-holds
- (tc · ·
-     ((λ (pt : (Prompt Num Num))
-        (* (% (+ 1 (abort Num pt 5))
-              pt
-              (λ (x : Num) (+ x 5)))
-           3))
-      (make-prompt-tag Num Num))
-     t)
- t)
-(judgment-holds
- (tc · · (flat (λ (x : Num) (zero? x))) t)
- t)
-(judgment-holds
- (tc ·
-     (tag0 : (Prompt Num Num) ·)
-     (monitor (prompt-tag/c
-               (flat (λ (x : Num) (zero? x)))
-               (flat (λ (x : Num) (zero? x)))
-               Num Num)
-              tag0
-              "pos"
-              "neg"
-              "con")
-     t)
- t)
-
-
-(test-equal
- (term (no-match (wcm ((key_0 0) ·) hole) tag_0))
- #t)
-(test-equal
- (term (no-match (wcm · hole) tag_0))
- #t)
-(test-equal
- (term (no-match (abort Bool #t hole) tag_0))
- #t)
-(test-equal (term (no-match hole tag_0)) #t)
-(test-equal
- (term (no-match (% hole
-                    tag_0 
-                    (λ (var:x : Num) (+ var:x 2)))
-                 tag_0))
- #f)
-(test-equal
- (term (no-match (% hole
-                    tag_0
-                    (λ (var:x : Num) (+ var:x 2)))
-                 tag_1))
- #t)
-
-;; evaluation tests
-
-(check-equal? (abort-eval (term (+ 1 2)))
-              3)
-(check-equal? (abort-eval (term (λ (var:x : Num) #t)))
-              'procedure)
-(check-equal? (abort-eval (term (make-prompt-tag Num Bool)))
-              'prompt-tag)
-
-;; helper for tests
-(define-syntax (do-test stx)
-  (syntax-parse stx
-                [(_ ?input ?expected)
-                 #'(do-test ?input ?expected
-                            #:init-store (term ·)
-                            #:store-type ·)]
-                [(_ ?input ?expected #:init-store ?store #:store-type ?store-type)
-                 #'(begin
-                     (check-true (judgment-holds (tc · ?store-type ,?input t)))
-                     (check-equal? (abort-eval ?input #:init-store ?store)
-                                   ?expected))]))
-
-;; eval and type checking tests
-;; recursion
-(do-test
- (term ((μ (var:f : (→ Num Num))
-           (λ (var:n : Num)
-             (if (zero? var:n)
-                 1
-                 (* var:n (var:f (- var:n 1))))))
-        5))
- (term 120))
-
-;; list recursion
-(do-test
- (term ((μ (var:f : (→ (List Num) Num))
-           (λ (var:lst : (List Num))
-             (case var:lst
-               (null = 0)
-               ((cons var:x1 var:x2) =
-                             (+ var:x1 (var:f var:x2))))))
-        (cons 5 (cons 6 (null Num)))))
- (term 11))
-
-;; list contract
-(do-test
- (term (monitor (list/c (flat (λ (var:x : Num) (zero? var:x))))
-                (cons 0 (cons 6 (null Num)))
-                "pos" "neg" "con"))
- (term (ctc-error "pos" "con")))
-
-;; no control effect
-(do-test
- (term (% 5 (make-prompt-tag Num Num) (λ (var:x : Num) var:x)))
- (term 5))
-
-;; test basic abort & handle
-(do-test
- (term (let ([(var:pt : (Prompt Num Num))
-              (make-prompt-tag Num Num)])
-         (% (abort Num var:pt 5)
-            var:pt
-            (λ (var:x : Num) (+ var:x 1)))))
- (term 6))
-
-;; abort past a prompt
-(do-test
- (term (let ([(var:pt : (Prompt Num Num))
-              (make-prompt-tag Num Num)])
-         (% (% (abort Num var:pt 5)
-               (make-prompt-tag Num Num)
-               (λ (var:x : Num) (+ var:x 2)))
-            var:pt
-            (λ (var:x : Num) (+ var:x 1)))))
- (term 6))
-
-;; abort to innermost prompt
-(do-test
- (term (let ([(var:pt : (Prompt Num Num))
-              (make-prompt-tag Num Num)])
-         (% (% (abort Num var:pt 5)
-               var:pt
-               (λ (var:x : Num) (+ var:x 2)))
-            var:pt
-            (λ (var:x : Num) (+ var:x 1)))))
- (term 7))
-
-;; composable continuations
-(do-test
- (term (let ([(var:pt : (Prompt Num Num))
-              (make-prompt-tag Num Num)])
-         (% (+ 1 (call/comp
-                  (λ (var:kont : (→ Num Num))
-                    (+ (var:kont 3) (var:kont 5)))
-                  var:pt))
-            var:pt
-            (λ (var:x : Num) var:x))))
- (term 11))
-
-(do-test
- (term (let ([(var:pt : (Prompt (→ Unit Num) Num))
-              (make-prompt-tag (→ Unit Num) Num)])
-         (% (+ 1 (call/comp
-                  (λ (var:kont : (→ Num Num))
-                    (abort Num var:pt
-                           (λ (var:x : Unit)
-                             (+ (var:kont 3) (var:kont 5)))))
-                  var:pt))
-            var:pt
-            (λ (var:kont : (→ Unit Num)) (var:kont unit)))))
- (term 10))
-
-;; call/cc encoding
-(do-test
- (term (let ([(var:pt : (Prompt (→ Unit Num) Num))
-              (make-prompt-tag (→ Unit Num) Num)])
-         (% (+ 1 (call/cc
-                  (λ (var:kont : (→ Num Num))
-                    (+ (var:kont 3) 
-                       (var:kont 5)))
-                  var:pt))
-            var:pt
-            (λ (var:kont : (→ Unit Num)) (var:kont unit)))))
- (term 4))
-
-;; handler destroys call/cc semantics
-(do-test
- (term (let ([(var:pt : (Prompt (→ Unit Num) Num))
-              (make-prompt-tag (→ Unit Num) Num)])
-         (% (+ 1 (call/cc
-                  (λ (var:kon : (→ Num Num))
-                    (+ (var:kon 3) (var:kon 5)))
-                  var:pt))
-            var:pt
-            (λ (var:kon : (→ Unit Num)) 18))))
- (term 18))
-
-;; continuation marks
-(do-test
- (term (let ([(var:mk : (Mark Num))
-              (make-cm-key Num)])
-         (call/cm
-          var:mk 5
-          (ccm var:mk Num))))
- (term (cons 5 (null Num))))
-
-(do-test
- (term (let ([(var:mk : (Mark Num))
-              (make-cm-key Num)])
-         (call/cm
-          var:mk 5
-          (call/cm
-           var:mk 7
-           (ccm var:mk Num)))))
- (term (cons 7 (null Num))))
-
-;; make sure wcms merge in weird cases
-(do-test
- (term ((λ (var:f : (→ Unit (List Num)))
-          (wcm ((key0 5) ·) (var:f unit)))
-        (λ (var:x : Unit)
-          (wcm ((key0 3) ·) (ccm key0 Num)))))
- (term (cons 3 (null Num)))
- #:init-store (term (key0 : (Mark Num) ·))
- #:store-type (key0 : (Mark Num) ·))
-
-;; continuation mark contracts
-(do-test
- (term (let ([(var:mk : (Mark Num))
-              (monitor (mark/c (flat (λ (var:x : Num) (zero? var:x))) Num)
-                       (make-cm-key Num)
-                       "pos"
-                       "neg"
-                       "con")])
-         (call/cm
-          var:mk 5
-          (ccm var:mk Num))))
- (term (ctc-error "neg" "con")))
-
-(do-test
- (term (let ([(var:mk : (Mark Num))
-              (monitor (mark/c (flat (λ (var:x : Num) (zero? var:x))) Num)
-                       (make-cm-key Num)
-                       "pos"
-                       "neg"
-                       "con")])
-         (call/cm
-          var:mk 0
-          (ccm var:mk Num))))
- (term (cons 0 (null Num))))
-
-;; naive contract
-(do-test
- (term (let ([(var:pt : (Prompt Num Num))
-              (make-prompt-tag Num Num)])
-         (% (monitor (flat (λ (var:x : Num) (number? var:x)))
-                     (abort Num var:pt 5)
-                     "pos"
-                     "neg"
-                     "con")
-            var:pt
-            (λ (var:x : Num) (+ var:x 1)))))
- (term 6))
-
-;; first-order checks
-(do-test
- (term (monitor (flat (λ (var:x : Num) (zero? var:x)))
-                5
-                "server"
-                "client"
-                "con"))
- (term (ctc-error "server" "con")))
-
-;; prompt & abort in the same component, the tag elsewhere
-(do-test
- (term (let ([(var:pt : (Prompt Num Num))
-              (monitor (prompt-tag/c (flat (λ (var:x : Num) (zero? var:x)))
-                                     (flat (λ (var:x : Num) (zero? var:x)))
-                                     Num Num)
-                       (make-prompt-tag Num Num)
-                       "server"
-                       "client"
-                       "con")])
-         (% (abort Num var:pt 3)
-            var:pt
-            (λ (var:x : Num) (+ var:x 1)))))
- (term (ctc-error "client" "con")))
-
-;; call/comp issue
-(do-test
- (term (let ([(var:pt : (Prompt Num Num))
-              (monitor (prompt-tag/c (flat (λ (var:x : Num) (zero? var:x)))
-                                     (flat (λ (var:x : Num) (zero? var:x)))
-                                     Num Num)
-                       (make-prompt-tag Num Num)
-                       "server"
-                       "client"
-                       "con")])
-         (% (+ 1
-               (call/comp
-                (λ (var:k : (→ Num Num))
-                  (var:k 0))
-                var:pt))
-            var:pt
-            (λ (var:x : Num) (+ var:x 1)))))
- (term (ctc-error "client" "con")))
-
-;; blame even on one side
-(do-test
- (term (let ([(var:pt1 : (Prompt Num Num))
-              (make-prompt-tag Num Num)])
-         (let ([(var:pt2 : (Prompt Num Num))
-                (monitor (prompt-tag/c (flat (λ (var:x : Num) (zero? var:x)))
-                                       (flat (λ (var:x : Num) (zero? (- var:x 5))))
-                                       Num Num)
-                         var:pt1
-                         "client"
-                         "server"
-                         "con")])
-           (% (+ 1 ; doesn't add to 5
-                 (call/comp
-                  (λ (var:k : (→ Num Num))
-                    (var:k 3))
-                  var:pt1))
-              var:pt2
-              (λ (var:x : Num) (+ var:x 1))))))
- (term (ctc-error "server" "con")))
-
-;; blame even on other side
-(do-test
- (term (let ([(var:pt1 : (Prompt Num Num))
-              (make-prompt-tag Num Num)])
-         (let ([(var:pt2 : (Prompt Num Num))
-                (monitor (prompt-tag/c (flat (λ (var:x : Num) (zero? var:x)))
-                                       (flat (λ (var:x : Num) (zero? (- var:x 5))))
-                                       Num Num)
-                         var:pt1
-                         "server"
-                         "client"
-                         "con")])
-           (% (+ 1 ; doesn't add to 5
-                 (call/comp
-                  (λ (var:k : (→ Num Num))
-                    (var:k 3))
-                  var:pt2))
-              var:pt1
-              (λ (var:x : Num) (+ var:x 1))))))
- (term (ctc-error "server" "con")))
-
-;; same with ho-contract
-(do-test
- (term (let ([(var:pt : (Prompt (→ Num Num) Num))
-              (monitor (prompt-tag/c (-> (flat (λ (var:x : Num) (zero? var:x)))
-                                         (flat (λ (var:x : Num) (number? var:x))))
-                                     (flat (λ (var:x : Num) (number? var:x)))
-                                     (→ Num Num) Num)
-                       (make-prompt-tag (→ Num Num) Num)
-                       "server"
-                       "client"
-                       "con")])
-         (% (abort Num var:pt (λ (var:x : Num) 5))
-            var:pt
-            (λ (var:x : (→ Num Num)) (var:x 8)))))
- (term (ctc-error "client" "con")))
-
-;; again, but from other side
-(do-test
- (term (let ([(var:pt : (Prompt (→ Num Num) Num))
-              (monitor (prompt-tag/c (-> (flat (λ (var:x : Num) (zero? var:x)))
-                                         (flat (λ (var:x : Num) (zero? var:x))))
-                                     (flat (λ (var:x : Num) (zero? var:x)))
-                                     (→ Num Num) Num)
-                       (make-prompt-tag (→ Num Num) Num)
-                       "server"
-                       "client"
-                       "con")])
-         (% (abort Num var:pt (λ (var:x : Num) 3))
-            var:pt
-            (λ (var:f : (→ Num Num)) (var:f 0)))))
- (term (ctc-error "client" "con")))
-
-;; abort across boundary w/ ho-value
-(do-test
- (term (let ([(var:do-prompt : (→ (→ (Prompt (→ Num Num) Num) Num) Num))
-              (let ([(var:pt : (Prompt (→ Num Num) Num))
-                     (make-prompt-tag (→ Num Num) Num)])
-                (monitor (-> (-> (prompt-tag/c (-> (flat (λ (var:x : Num) (zero? var:x)))
-                                                   (flat (λ (var:x : Num) (zero? var:x))))
-                                               (flat (λ (var:x : Num) (zero? var:x)))
-                                               (→ Num Num) Num)
-                                 (flat (λ (var:x : Num) (number? var:x))))
-                             (flat (λ (var:x : Num) (number? var:x))))
-                         (λ (var:f : (→ (Prompt (→ Num Num) Num) Num))
-                           (% (var:f var:pt)
-                              var:pt
-                              (λ (var:f : (→ Num Num)) (var:f 5))))
-                         "server"
-                         "client"
-                         "con"))])
-         (var:do-prompt
-          (λ (var:pt : (Prompt (→ Num Num) Num))
-            (abort Num var:pt (λ (var:v : Num) (+ var:v 1)))))))
- (term (ctc-error "server" "con"))) ;; MF: nice example but in a paper presentation you need to simplify
-
-;; where the prompt flows across multiple boundaries
-(do-test
- (term (let ([(var:do-prompt : (→ (→ (Prompt (→ Num Num) Num) Num) Num))
-              (let ([(var:pt : (Prompt (→ Num Num) Num))
-                     (make-prompt-tag (→ Num Num) Num)])
-                (monitor (-> (-> (prompt-tag/c (-> (flat (λ (var:x : Num) (number? var:x)))
-                                                   (flat (λ (var:x : Num) (number? var:x))))
-                                               (flat (λ (var:x : Num) (number? var:x)))
-                                               (→ Num Num) Num)
-                                 (flat (λ (var:x : Num) (number? var:x))))
-                             (flat (λ (var:x : Num) (number? var:x))))
-                         (λ (var:f : (→ (Prompt (→ Num Num) Num) Num))
-                           (% (var:f var:pt)
-                              var:pt
-                              (λ (var:f : (→ Num Num)) (var:f 1))))
-                         "A"
-                         "B"
-                         "con1"))])
-         (let ([(var:do-prompt-2 : (→ (→ (Prompt (→ Num Num) Num) Num) Num))
-                (monitor (-> (-> (prompt-tag/c (-> (flat (λ (var:x : Num) (zero? var:x)))
-                                                   (flat (λ (var:x : Num) (number? var:x))))
-                                               (flat (λ (var:x : Num) (number? var:x)))
-                                               (→ Num Num) Num)
-                                 (flat (λ (var:x : Num) (number? var:x))))
-                             (flat (λ (var:x : Num) (number? var:x))))
-                         (λ (var:f : (→ (Prompt (→ Num Num) Num) Num))
-                           (var:do-prompt var:f))
-                         "B"
-                         "C"
-                         "con2")])
-           (var:do-prompt-2
-            (λ (var:pt : (Prompt (→ Num Num) Num))
-              (abort Num var:pt (λ (var:v : Num) (+ var:v 1))))))))
- (term (ctc-error "B" "con2")))
-
-#|
-  ;; from random test generation
-  (do-test
-   (term (boolean?
-          (abort (monitor
-                  (prompt-tag/c (-> (flat (λ (H) (error)))
-                                    (flat (λ (R) (error)))))
-                  (prompt-tag v)
-                  "pos"
-                  "neg")
-                 (make-prompt-tag))))
-   (term (error)))
-   |#
-
-
-;; tests for bugs found by random generation
-(test-equal
- (term (subst (make-cm-key Bool) var:x 5))
- (term (make-cm-key Bool)))
-
-(test-equal
- (term (subst (null Bool) var:x 5))
- (term (null Bool)))
-
-(test-equal
- (abort-eval (term (ccm (make-cm-key Bool) Bool)))
- 'null)
-
-(test-equal
- (abort-eval (term (μ (var:B : Num) var:B)))
- 'non-terminating)
-
-(test-equal
- (abort-eval (term unit))
- 'unit)
-
-(test-equal
- (abort-eval
-  (term (call/comp
-         (λ (var:Dp : (→ (Mark Bool) Num)) (make-cm-key Bool))
-         (make-prompt-tag (Mark (Con Num)) Num))))
- 'missing-prompt)
-
-(test-equal
- (term (no-match (call/comp 
-                  (λ (var:K : (→ (Prompt (Mark Num) Bool) 
-                             (List (Prompt Bool Unit)))) 
-                    (make-prompt-tag (Mark Num) Bool)) 
-                  (wcm · hole)) tag))
- #t)
-
-(test-equal
- (abort-eval
-  (term (abort
-         Num
-         (make-prompt-tag Bool (List (Mark Bool)))
-         (boolean? 2))))
- 'missing-prompt)
-
-(test-equal
- (term (marks (call/cm hole (+ 1 2) 1) key1 (null (→ (Mark Num) Num))))
- (term (null (→ (Mark Num) Num))))
-
-(test-equal
- (term
-  (marks (if (boolean? hole) 1 2) key (null (→ Num (Mark Unit)))))
- (term (null (→ Num (Mark Unit)))))
-
-(test-equal
- (term 
-  (no-match (call/cm key (wcm · hole) 
-                     ((wcm · (λ (var:C : Bool) #f)) (unit? 3))) 
-            tag))
- #t)
-
-(test-equal
- (abort-eval
-  (term
-   (number?
-    (μ
-     (var:i : Num)
-     (-
-      (+ (case 
-             (null (Con (Con Bool))) 
-           (null = 1) 
-           ((cons var:X var:u) = 2)) (if #t 0 0))
-      var:i)))))
- 'non-terminating)
-
-(test-equal
- (judgment-holds
-  (tc
-   ·
-   (tag2
-    :
-    (Prompt (Mark (Prompt Unit Num)) (Prompt (→ Num Unit) (Con Bool)))
-    (tag1
-     :
-     (Prompt Num (→ (→ Unit Unit) (Con Unit)))
-     (tag
-      :
-      (Prompt
-       (→ (Prompt Num Unit) (→ Bool Unit))
-       (Prompt Num (→ (→ Unit Unit) (Con Unit))))
-      ·)))
-   (abort
-    (→ Num (→ Num Num))
-    tag1
-    (wcm
-     ·
-     (call/comp
-      (λ (var:Sa : (→ Num (Prompt (→ Num Unit) (Con Bool)))) 0)
-      tag2)))
-   t)
-  t)
- '((→ Num (→ Num Num))))
-
-(test-equal
- (judgment-holds
-  (tc 
-   ·
-   (tag1
-    :
-    (Prompt Bool (List Num))
-    (key1
-     :
-     (Mark Bool)
-     (tag
-      :
-      (Prompt Unit (Mark (List (Mark Unit))))
-      (key : (Mark (Prompt Unit (Mark (List (Mark Unit))))) ·))))
-   (wcm
-    ((key
-      (PG
-       (flat (λ (var:G : Unit) #t))
-       (mark/c
-        (list/c (mark/c (flat (λ (var:b : Unit) #t)) Unit))
-        (List (Mark Unit)))
-       tag
-       "B"
-       "iF"
-       "CgXohMerymUWF"))
-     ·)
-    (monitor
-     (flat (λ (var:Mk : Unit) #t))
-     (abort Unit tag1 #t)
-     "fO"
-     "clRmiOfXGo"
-     "jxeinueLyNmLozqsKl"))
-   t)
-  t)
- '(Unit))
-
-(test-equal
- (judgment-holds
-  (tc · (key : (Mark (Mark (Mark Num))) ·)
-      (MG
-       (mark/c (mark/c (flat (λ (var:r : Num) #f)) Num) (Mark Num))
-       key
-       "EVYdYcpulOg"
-       "G"
-       "BjUOkycjoz")
-      t)
-  t)
- '((Mark (Mark (Mark Num)))))
-
-
-
-
-(check-false (term (not-wcm (wcm · hole))))
-(check-false (term (not-wcm (+ 5 (wcm · hole)))))
-(check-true (term (not-wcm hole)))
-(check-true (term (not-wcm (abort Num hole 5))))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/typed-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/typed-info.rkt
deleted file mode 100644
index 3be674c381..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/typed-info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide (all-defined-out))
-
-(define name "delim-cont")
-(define fname (make-path-root 'delim-cont))
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (all-mods/type 'typed here name fname))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/util.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/util.rkt
deleted file mode 100644
index eb645b44ea..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/delim-cont/util.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket
-
-(require redex/benchmark)
-
-(provide bug-mod-rw
-         test)
-
-(define-rewrite bug-mod-rw
-  redex/benchmark/models/delim-cont/delim-cont
-  ==> 
-  (submod ".." delim-cont)
-  #:context (require))
-
-(define-syntax-rule (test cexp)
-  (module+ test
-    (require (except-in rackunit check)
-             (submod ".." generators check-mod))
-    (check-equal? (check cexp) #f)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/generators.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/generators.rkt
deleted file mode 100644
index e4c6b58f93..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/generators.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket/base
-
-(require redex/examples/let-poly
-         (only-in redex/private/generate-term pick-an-index)
-         redex/reduction-semantics
-         racket/bool)
-
-(provide (all-defined-out))
-
-(module+ adhoc-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'grammar)
-  (define (generate)
-    (generate-term stlc M 5)))
-
-(module+ enum-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'enum)
-  (define (generate [p-value 0.035])
-    (generate-term stlc M #:i-th (pick-an-index p-value))))
-
-(module+ ordered-mod
-  (provide generate get-generator type)
-  (define (get-generator)
-    (let ([index 0])
-      (λ () (begin0
-              (generate index)
-              (set! index (add1 index))))))
-  (define type 'ordered)
-  (define (generate [index 0])
-    (generate-term stlc M #:i-th index)))
-
-(module+ check-mod
-  (require (only-in redex/examples/stlc-tests-lib consistent-with?))
-  (provide check)
-  
-  #|
-   Check to see if a combination of preservation
-   and progress holds for the first 100 terms
-   reachable from the given term.
-  |#
-
-  (define (check M)
-  (or (not M)
-      (let ([t-type (type-check M)])
-        (implies
-         t-type
-         (let loop ([Σ+M `(· ,M)] [n 100])
-           (define new-type (type-check (list-ref Σ+M 1) (list-ref Σ+M 0)))
-           (and (consistent-with? t-type new-type)
-                (or (v? (list-ref Σ+M 1))
-                    (let ([red-res (apply-reduction-relation red Σ+M)])
-                      (and (= (length red-res) 1)
-                           (let ([red-t (car red-res)])
-                             (or (equal? red-t "error")
-                                 (zero? n) (loop red-t (- n 1))))))))))))))
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-1.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-1.rkt
deleted file mode 100644
index c304ebbd31..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-1.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "use a lambda-bound variable where a type variable should have been")
-
-(define-rewrite bug1
-  (tc-down (x y Γ) M (λ y κ) σ_ans)
-  ==> 
-  (tc-down (x y Γ) M (λ x κ) σ_ans)
-  #:context (define-judgment-form)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/let-poly.rkt") let-poly bug1)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example '(hd ((λ x x) 1)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-2.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-2.rkt
deleted file mode 100644
index 7fec4fd027..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-2.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "the classic polymorphic let + references bug")
-
-(define-rewrite bug2
-  ([(where N_2 (subst N x v))
-    (where y ,(variable-not-in (term N_2) 'l))
-    (tc-down Γ ((λ y N_2) v) κ σ_2)
-    ------------------------------------------
-    (tc-down Γ (let ([x v]) N) κ σ_2)]
-   
-   [(where #t (not-v? M))
-    (tc-down Γ ((λ x N) M) κ σ_2)
-    ---------------------------------
-    (tc-down Γ (let ([x M]) N) κ σ_2)])
-  ==>
-  ([(where N_2 (subst N x M))
-    (where y ,(variable-not-in (term N_2) 'l))
-    (tc-down Γ ((λ y N_2) M) κ σ_2)
-    ------------------------------------------
-    (tc-down Γ (let ([x M]) N) κ σ_2)])
-  #:context (define-judgment-form)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/let-poly.rkt") let-poly bug2)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example '(let ([x (new nil)])
-                                 ((λ ignore
-                                    ((hd (get x)) 1))
-                                  ((set x) ((cons 5) nil)))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-3.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-3.rkt
deleted file mode 100644
index 42e722e12f..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-3.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "mix up types in the function case")
-
-(define-rewrite bug3
-  (where G (unify τ_2 (τ_1 → x)))
-  ==> 
-  (where G (unify τ_1 (τ_2 → x)))
-  #:context (define-judgment-form)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/let-poly.rkt") let-poly bug3)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example (term (1 cons)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-4.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-4.rkt
deleted file mode 100644
index 7a1235ebb6..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-4.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error
-  (string-append "misspelled the name of a metafunction in a side-condition, "
-                 "causing the occurs check to not happen"))
-
-(define-rewrite bug4
-  [(uh (x τ G) Gx) ⊥ (where #t (in-vars-τ? x τ))]
-  ==> 
-  [(uh (x τ G) Gx) ⊥ (where #t (in-vars? x τ))]
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/let-poly.rkt") let-poly bug4)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw exn-rw)
-
-(define small-counter-example (term ((λ x (x x)) hd)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-5.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-5.rkt
deleted file mode 100644
index 9419b66b11..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-5.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "eliminate-G was written as if it always gets a Gx as input")
-
-(define-rewrite bug5
-  ([(eliminate-G x τ (σ_1 σ_2 G))
-   ((eliminate-τ x τ σ_1) (eliminate-τ x τ σ_2) (eliminate-G x τ G))]
-   . rest)
-  ==> 
-  ([(eliminate-G x τ (x σ G))
-    (τ (eliminate-τ x τ σ) (eliminate-G x τ G))]
-   [(eliminate-G x τ (y σ G))
-    (y (eliminate-τ x τ σ) (eliminate-G x τ G))]
-   . rest)
-  #:context (define-metafunction)
-  #:variables (rest)
-  #:exactly-once)
-
-(include/rewrite (lib "redex/examples/let-poly.rkt") let-poly bug5)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw exn-rw)
-
-(define small-counter-example (term (cons 1)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-6.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-6.rkt
deleted file mode 100644
index 6af8889b34..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-6.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "∨ has an incorrect duplicated variable, leading to an uncovered case")
-
-(define-rewrite bug6
-  [(∨ boolean_1 boolean_2) #t]
-  ==> 
-  [(∨ boolean boolean) #t]
-  #:context (define-metafunction)
-  #:exactly-once)
-
-(include/rewrite (lib "redex/examples/let-poly.rkt") let-poly bug6)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw exn-rw)
-
-(define small-counter-example (term (λ x (x x))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-7.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-7.rkt
deleted file mode 100644
index 34b525a9a2..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-7.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error
-  (string-append "used let --> left-left-λ rewrite rule for let, "
-                 "but the right-hand side is less polymorphic"))
-
-(define-rewrite bug7-a
-  ((v E)
-   (let ([x E]) M))
-  ==> 
-  ((v E))
-  #:context (define-language)
-  #:exactly-once)
-
-(define-rewrite bug7-b
-  (--> (Σ (in-hole E (let ([x v]) M)))
-       (Σ (in-hole E (subst M x v)))
-       . rest)
-  ==> 
-  (--> (Σ (in-hole E (let ([x M]) N)))
-       (Σ (in-hole E ((λ x N) M)))
-       . rest)
-  #:context (reduction-relation)
-  #:variables (rest)
-  #:exactly-once)
-
-(include/rewrite (lib "redex/examples/let-poly.rkt") let-poly bug7-a bug7-b)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example (term (let ((x (λ y y))) (x x))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-info.rkt
deleted file mode 100644
index 0281266211..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/let-poly-info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide all-mods)
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (make-all-mods here "let-poly" (make-path-root 'let-poly)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/util.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/util.rkt
deleted file mode 100644
index a7250d5eed..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/let-poly/util.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket
-
-(require redex/benchmark)
-
-(provide bug-mod-rw
-         exn-rw
-         test)
-
-(define-rewrite bug-mod-rw
-  redex/examples/let-poly
-  ==> 
-  (submod ".." let-poly)
-  #:context (require))
-
-(define-rewrite exn-rw
- (let ([t-type (type-check M)])
-   body)
-  ==>
-  (with-handlers ([exn:fail? (λ (x) #f)])
-    (let ([t-type (type-check M)])
-      body))
-  #:variables (body)
-  #:exactly-once)
-
-(define-syntax-rule (test cexp)
-  (module+ test
-    (require (except-in rackunit check)
-             (submod ".." generators check-mod))
-    (check-equal? (check cexp) #f)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/generators.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/generators.rkt
deleted file mode 100644
index 067c2cbd25..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/generators.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-
-(require redex/examples/list-machine/list-machine
-         redex/examples/list-machine/list-machine-typing
-         (prefix-in typed: redex/benchmark/models/list-machine/ls-typed-gen)
-         (only-in redex/private/generate-term pick-an-index)
-         redex/reduction-semantics
-         racket/bool
-         racket/list
-         racket/match)
-
-(provide (all-defined-out))
-
-(module+ adhoc-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'grammar)
-  (define (generate)
-    (generate-term list-machine-typing ((l0 : ι p) Π) 7)))
-
-(module+ enum-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'enum)
-  (define (generate [p-value 0.5])
-    (generate-term list-machine-typing ((l0 : ι p) Π) #:i-th (pick-an-index p-value))))
-
-(module+ ordered-mod
-  (provide generate get-generator type)
-  (define (get-generator)
-    (let ([index 0])
-      (λ () (begin0
-              (generate index)
-              (set! index (add1 index))))))
-  (define type 'ordered)
-  (define (generate [index 0])
-    (generate-term list-machine-typing ((l0 : ι p) Π) #:i-th index)))
-
-(module+ typed-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'search)
-  (define (generate)
-    (match (generate-term typed:list-machine-typing
-                          #:satisfying
-                          (typed:check-program (l0 : ι p) Π)
-                          7)
-      [`(typed:check-program ,p ,Π)
-       `(,p ,Π)]
-      [#f #f])))
-
-(module+ check-mod
-  (provide check type-check check-progress)
-  
-  (define (check-progress p)
-    (define r_0 (term (empty v0 ↦ nil)))
-    (define ι_0 (car (judgment-holds (program-lookup ,p l0 ι) ι)))
-    (or (equal? ι_0 'halt)
-        (and
-         (= 1
-            (length (apply-reduction-relation 
-                     red
-                     `(,p ,r_0 ,ι_0))))
-         (let ([closure (apply-reduction-relation* 
-                         red
-                         `(,p ,r_0 ,ι_0)
-                         #:stop-when
-                         (let ([count 0])
-                           (λ (_)
-                             (begin0
-                               (count . > . 1000)
-                               (set! count (add1 count))))))])
-           ;; if reduction terminates in less than 1000 steps, check it ends with halt
-           ;; (if the #:stop-when condition is true, we get back an empty list, 
-           ;; and the same thing for a reduction cycle)
-           (or (empty? closure)
-               (and (= 1 (length closure))
-                    (match (car closure)
-                      [`(,p ,r ,ι)
-                       (equal? ι 'halt)])))))))
-
-  (define (type-check p Π)
-    (judgment-holds (check-program ,p ,Π)))
-  
-  (define (check pΠ)
-    (or (not pΠ)
-        (match pΠ
-          [`(,p ,Π)
-           (implies (type-check p Π) (check-progress p))]))))
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-1.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-1.rkt
deleted file mode 100644
index 2758d26ec4..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-1.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics
-         racket/list
-         racket/match)
-
-(provide (all-defined-out))
-
-(define the-error "confuses the lhs value for the rhs value in cons type rule")
-
-(define-rewrite bug1
-  ((:lookup Γ v_0 τ_0) 
-   (:lookup Γ v_1 τ_1)
-   . rest)
-  ==> 
-  ((:lookup Γ v_0 τ_0) 
-   (:lookup Γ v_0 τ_1)
-   . rest)
-  #:context (define-judgment-form)
-  #:variables (rest)
-  #:exactly-once)
-
-(define-rewrite bug1-typed
-  ((:lookup-Γ Γ v_0 τ_0) 
-   (:lookup-Γ Γ v_1 τ_1)
-   . rest)
-  ==> 
-  ((:lookup-Γ Γ v_0 τ_0) 
-   (:lookup-Γ Γ v_0 τ_1)
-   . rest)
-  #:context (define-judgment-form)
-  #:variables (rest)
-  #:exactly-once)
-
-
-(define-rewrite return-stopped-rw
-  (let ([closure (apply-reduction-relation* 
-                         red
-                         `(,p ,r_0 ,ι_0)
-                         #:stop-when
-                         (let ([count 0])
-                           (λ (_)
-                             (begin0
-                               (count . > . 1000)
-                               (set! count (add1 count))))))])
-           (or (empty? closure)
-               (and (= 1 (length closure))
-                    (match (car closure)
-                      [`(,p ,r ,ι)
-                       (equal? ι 'halt)]))))
-  ==>
-  (let* ([stopped #f]
-         [closure (apply-reduction-relation* 
-                   red
-                   `(,p ,r_0 ,ι_0)
-                   #:stop-when
-                   (let ([count 0])
-                     (λ (_)
-                       (begin0
-                         (count . > . 100)
-                         (when (count . > . 100)
-                           (set! stopped #t))
-                         (set! count (add1 count))))))])
-    (or stopped
-        (empty? closure)
-        (and (= 1 (length closure))
-             (match (car closure)
-               [`(,p ,r ,ι)
-                (equal? ι 'halt)]))))
-  #:exactly-once)
-
-(include/rewrite (lib "redex/examples/list-machine/list-machine.rkt") list-machine)
-
-(include/rewrite (lib "redex/examples/list-machine/list-machine-typing.rkt") list-machine-typing bug1)
-
-(include/rewrite (lib "redex/benchmark/models/list-machine/ls-typed-gen.rkt") ls-typed-gen bug1-typed)
-
-(define-rewrite bug-mod3
-  redex/benchmark/list-machine/ls-typed-gen
-  ==>
-  (submod ".." ls-typed-gen)
-  #:context (require))
-
-(include/rewrite "generators.rkt" generators bug-mod-rw return-stopped-rw bug-mod3)
-
-(define small-counter-example
-  (term ((l0 : (begin (cons v0 Z v0) halt) end)
-         (l0 : (v0 : nil empty) empty))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-2.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-2.rkt
deleted file mode 100644
index 8f7dbd8535..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-2.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics
-         racket/list
-         racket/match)
-
-(provide (all-defined-out))
-
-(define the-error "var-set may skip a var with matching id (in reduction)")
-
-(define-rewrite bug2
-  ((where #t (different v v_2))
-   (var-set r v_2 a_2 r_2) . rest)
-  ==> 
-  ((var-set r v_2 a_2 r_2) . rest)
-  #:context (define-judgment-form)
-  #:variables (rest)
-  #:exactly-once)
-
-
-;; if reduction terminates in less than 20 steps, check it ends with halt
-;; (if there is a reduction cycle, the empty list is returned)
-;; (when the reduction is stopped artificially, the current term is returned)
-;; 20 is a small number, but some terms can get exponentially large
-(define-rewrite stop-earlier-rw
-  (let ([closure (apply-reduction-relation* 
-                  red
-                  `(,p ,r_0 ,ι_0)
-                  #:stop-when
-                  (let ([count 0])
-                    (λ (_)
-                      (begin0
-                        (count . > . 1000)
-                        (set! count (add1 count))))))])
-    (or (empty? closure)
-        (and (= 1 (length closure))
-             (match (car closure)
-               [`(,p ,r ,ι)
-                (equal? ι 'halt)]))))
-  ==>
-  (let* ([stopped #f]
-         [closure (apply-reduction-relation* 
-                   red
-                   `(,p ,r_0 ,ι_0)
-                   #:stop-when
-                   (let ([count 0])
-                     (λ (_)
-                       (begin0
-                         (count . > . 20)
-                         (when (count . > . 20)
-                           (set! stopped #t))
-                         (set! count (add1 count))))))])
-    (or stopped
-        (empty? closure)
-        (and (= 1 (length closure))
-             (match (car closure)
-               [`(,p ,r ,ι)
-                (equal? ι 'halt)]))))
-  #:exactly-once)
-
-(include/rewrite (lib "redex/examples/list-machine/list-machine.rkt") list-machine bug2)
-
-(include/rewrite (lib "redex/examples/list-machine/list-machine-typing.rkt") list-machine-typing)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw stop-earlier-rw)
-
-(define small-counter-example
-  (term ((l0 : (begin (cons v0 v0 v0) halt) end)
-          (l0 : (v0 : nil empty) empty))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-3.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-3.rkt
deleted file mode 100644
index c85f17594b..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-3.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics
-         racket/list
-         racket/match)
-
-(provide (all-defined-out))
-
-(define the-error "cons doesn't actually update the store")
-
-(define-rewrite bug3
-  ((p r (begin (cons v_0 v_1 v_2) ι))
-   (p r_2 ι)
-   . rest)
-  ==> 
-  ((p r (begin (cons v_0 v_1 v_2) ι))
-   (p r ι)
-   . rest)
-  #:context (reduction-relation)
-  #:variables (rest)
-  #:exactly-once)
-
-(include/rewrite (lib "redex/examples/list-machine/list-machine.rkt") list-machine bug3)
-
-(include/rewrite (lib "redex/examples/list-machine/list-machine-typing.rkt") list-machine-typing)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((l0 : (begin (cons v0 v0 v0) (begin (fetch-field v0 1 v0) halt)) end)
-         (l0 : (v0 : nil empty) empty))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-info.rkt
deleted file mode 100644
index b471aa6bfa..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/list-machine-info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide all-mods)
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (make-all-mods here "list-machine" (make-path-root 'list-machine)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/ls-typed-gen.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/ls-typed-gen.rkt
deleted file mode 100644
index 5adfd5d7e6..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/ls-typed-gen.rkt
+++ /dev/null
@@ -1,429 +0,0 @@
-#lang racket
-
-(define the-error "no error")
-
-(require redex/reduction-semantics
-         racket/list
-         racket/match)
-
-(provide (all-defined-out))
-
-(define-language list-machine
-  (a nil
-     (cons a a))
-  (v variable-not-otherwise-mentioned)
-  (r empty
-     (r v ↦ a))
-  (l variable-not-otherwise-mentioned)
-  (ι (jump l)
-     (branch-if-nil v l)
-     (fetch-field v 0 v)
-     (fetch-field v 1 v)
-     (cons v v v)
-     halt
-     (begin ι ι))
-  (p (l : ι p)
-     end))
-
-(define-judgment-form list-machine
-  #:contract (var-lookup r v a)
-  #:mode (var-lookup I I O)
-  [-----
-   (var-lookup (r v ↦ a) v a)]
-  [(where #t (different v_1 v_2))
-   (var-lookup r v_2 a_2)
-   -----
-   (var-lookup (r v_1 ↦ a_1) v_2 a_2)])
-
-(define-judgment-form list-machine
-  #:contract (var-set r v a r)
-  #:mode (var-set I I I O)
-  [-----
-   (var-set (r v ↦ a) v a_2 (r v ↦ a_2))]
-  [(where #t (different v v_2))
-   (var-set r v_2 a_2 r_2)
-   -----
-   (var-set (r v ↦ a) v_2 a_2 (r_2 v ↦ a))]
-  [-----
-   (var-set empty v a (empty v ↦ a))])
-
-(define-judgment-form list-machine
-  #:contract (program-lookup p l ι)
-  #:mode (program-lookup I I O)
-  [-----
-   (program-lookup (l : ι p) l ι)]
-  [(where #t (different l l_2))
-   (program-lookup p l_2 ι_2)
-   -----
-   (program-lookup (l : ι p) l_2 ι_2)])
-
-(define red 
-  (reduction-relation 
-   list-machine
-   #:domain (p r ι)
-   (--> (p r (begin (begin ι_1 ι_2) ι_3))
-        (p r (begin ι_1 (begin ι_2 ι_3)))
-        "step-seq")
-   (--> (p r (begin (fetch-field v 0 v_2) ι))
-        (p r_2 ι)
-        "step-fetch-field-0"
-        (judgment-holds (var-lookup r v (cons a_0 a_1)))
-        (judgment-holds (var-set r v_2 a_0 r_2)))
-   (--> (p r (begin (fetch-field v 1 v_2) ι))
-        (p r_2 ι)
-        "step-fetch-field-1"
-        (judgment-holds (var-lookup r v (cons a_0 a_1)))
-        (judgment-holds (var-set r v_2 a_1 r_2)))
-   (--> (p r (begin (cons v_0 v_1 v_2) ι))
-        (p r_2 ι)
-        "step-cons"
-        (judgment-holds (var-lookup r v_0 a_0))
-        (judgment-holds (var-lookup r v_1 a_1))
-        (judgment-holds (var-set r v_2 (cons a_0 a_1) r_2)))
-   (--> (p r (begin (branch-if-nil v l) ι))
-        (p r ι)
-        "step-branch-not-taken"
-        (judgment-holds (var-lookup r v (cons a_0 a_1))))
-   (--> (p r (begin (branch-if-nil v l) ι))
-        (p r ι_2)
-        "step-branch-taken"
-        (judgment-holds (var-lookup r v nil))
-        (judgment-holds (program-lookup p l ι_2)))
-   (--> (p r (jump l))
-        (p r ι_2)
-        "step-jump"
-        (judgment-holds (program-lookup p l ι_2)))))
-
-(define (run-prog p)
-  (define r_0 (term (empty v0 ↦ nil)))
-  (define ι_0 (car (judgment-holds (program-lookup ,p l0 ι) ι)))
-  (apply-reduction-relation* red `(,p ,r_0 ,ι_0)))
-
-
-(define (check-progress p)
-  (define r_0 (term (empty v0 ↦ nil)))
-  (define ι_0 (car (judgment-holds (program-lookup ,p l0 ι) ι)))
-  (or (equal? ι_0 'halt)
-      (and
-       (= 1
-          (length (apply-reduction-relation 
-                   red
-                   `(,p ,r_0 ,ι_0))))
-       (let ([closure (apply-reduction-relation* 
-                       red
-                       `(,p ,r_0 ,ι_0)
-                       #:stop-when
-                       (let ([count 0])
-                         (λ (_)
-                           (begin0
-                             (count . > . 1000)
-                             (set! count (add1 count))))))])
-         ;; if reduction terminates in less than 1000 steps, check it ends with halt
-         ;; (if the #:stop-when condition is true, we get back an empty list, 
-         ;; and the same thing for a reduction cycle)
-         (or (empty? closure)
-             (and (= 1 (length closure))
-                  (match (car closure)
-                    [`(,p ,r ,ι)
-                     (equal? ι 'halt)])))))))
-
-(define (check p)
-  (or (not p)
-      (check-progress p)))
-  
-(define-metafunction list-machine
-  different : any any -> any
-  [(different any_1 any_1)
-   #f]
-  [(different any_1 any_2)
-   #t])
-
-(define-extended-language list-machine-typing list-machine
-  (τ nil (list τ) (listcons τ))
-  (Γ empty (v : τ Γ))
-  (Π empty (l : Γ Π)))
-
-(define-judgment-form list-machine-typing
-  #:contract (check-program p Π)
-  #:mode (check-program I I)
-  [(:lookup-Π Π l0 (v0 : nil empty))
-   (labels-distinct (l0 : ι p))
-   ;; note : changed from l-⊂
-   (d= Π (l0 : ι p))
-   (labels-distinct-Π Π)
-   (check-blocks Π (l0 : ι p))
-   -----
-   (check-program (l0 : ι p) Π)])
-
-(define-judgment-form list-machine-typing
-  #:contract (Γ-⊂ Γ Γ)
-  #:mode (Γ-⊂ I I)
-  [-----
-   (Γ-⊂ Γ empty)]
-  [(:lookup-Γ Γ_1 v τ_1) 
-   (⊂ τ_1 τ_2)
-   (Γ-⊂ Γ_1 Γ_2)
-   ----
-   (Γ-⊂ Γ_1 (v : τ_2 Γ_2))])
-
-(define-judgment-form list-machine-typing
-  #:contract (check-blocks Π p)
-  #:mode (check-blocks I I)
-  [(:lookup-Π Π l Γ)
-   (check-block Π Γ ι)
-   (check-blocks Π p)
-   -----
-   (check-blocks Π (l : ι p)) ]
-  [-----
-   (check-blocks Π end)])
-
-(define-judgment-form list-machine-typing
-  #:contract (check-block Π Γ ι)
-  #:mode (check-block I I I)
-  [-----
-   (check-block Π Γ halt)]
-  [(check-instr Π Γ ι_1 Γ_2) 
-   (check-block Π Γ_2 ι_2)
-   -----
-   (check-block Π Γ (begin ι_1 ι_2))]
-  [(:lookup-Π Π l Γ_2)
-   (Γ-⊂ Γ Γ_2)
-   -----
-   (check-block Π Γ (jump l))])
-
-(define-judgment-form list-machine-typing
-  #:contract (check-instr Π Γ ι Γ)
-  #:mode (check-instr I I I O)
-  [(check-instr Π Γ ι_1 Γ_1)
-   (check-instr Π Γ_1 ι_2 Γ_2)
-   -----
-   (check-instr Π Γ (begin ι_1 ι_2) Γ_2)]
-  [(:lookup-Γ Γ v (list τ))
-   (:lookup-Π Π l Γ_1)
-   (:set Γ v nil Γ_3)
-   (Γ-⊂ Γ_3 Γ_1)
-   (:set Γ_3 v (listcons τ) Γ_2)
-   -----
-   (check-instr Π Γ (branch-if-nil v l) Γ_2)]
-  [(:lookup-Γ Γ v (listcons τ))
-   (:lookup-Π Π l Γ_1)
-   (:set Γ v nil Γ_2)
-   (Γ-⊂ Γ_2 Γ_1)
-   -----
-   (check-instr Π Γ (branch-if-nil v l) Γ)]
-  [(:lookup-Γ Γ v nil)
-   (:lookup-Π Π l Γ_1)
-   (Γ-⊂ Γ Γ_1)
-   -----
-   (check-instr Π Γ (branch-if-nil v l) Γ)]
-  [(:lookup-Γ Γ v (listcons τ)) (:set Γ v_2 τ Γ_2)
-   -----
-   (check-instr Π Γ (fetch-field v 0 v_2) Γ_2)]
-  [(:lookup-Γ Γ v (listcons τ)) (:set Γ v_2 (list τ) Γ_2)
-   -----
-   (check-instr Π Γ (fetch-field v 1 v_2) Γ_2)]
-  [(:lookup-Γ Γ v_0 τ_0) (:lookup-Γ Γ v_1 τ_1)
-   (⊔ (list τ_0) τ_1 (list τ)) (:set Γ v (listcons τ) Γ_2)
-   -----
-   (check-instr Π Γ (cons v_0 v_1 v) Γ_2)])
-
-(define-judgment-form list-machine-typing
-  #:contract (⊂ τ τ)
-  #:mode (⊂ O I)
-  [-----
-   (⊂ τ τ)]
-  [-----
-   (⊂ nil (list τ))]
-  [(⊂ τ τ_2)
-   -----
-   (⊂ (list τ) (list τ_2))]
-  [(⊂ τ τ_2)
-   -----
-   (⊂ (listcons τ) (list τ_2))]
-  [(⊂ τ τ_2)
-   -----
-   (⊂ (listcons τ) (listcons τ_2))])
-
-(define-judgment-form list-machine-typing
-  #:contract (⊔ τ τ τ)
-  #:mode (⊔ I I O)
-  [-----
-   (⊔ τ τ τ)]
-  [-----
-   (⊔ (list τ) nil (list τ))]
-  [-----
-   (⊔ nil (list τ) (list τ))]
-  [(⊔ (list τ_1) (list τ_2) τ_3)
-   -----
-   (⊔ (list τ_1) (listcons τ_2) τ_3)]
-  [(⊔ (list τ_1) (list τ_2) τ_3)
-   -----
-   (⊔ (listcons τ_1) (list τ_2) τ_3)]
-  [(⊔ τ_1 τ_2 τ_3)
-   -----
-   (⊔ (list τ_1) (list τ_2) (list τ_3))]
-  [-----
-   (⊔ (listcons τ) nil (list τ))]
-  [-----
-   (⊔ nil (listcons τ) (list τ))]
-  [(⊔ τ_1 τ_2 τ_3)
-   -----
-   (⊔ (listcons τ_1) (listcons τ_2) (listcons τ_3))])
-
-(define-judgment-form list-machine-typing
-  #:contract (:lookup any v any)
-  #:mode (:lookup I I O)
-  [-----
-   (:lookup (v : any_τ any_Γ) v any_τ)]
-  [(where #t (different v_1 v_2))
-   (:lookup any_Γ v_2 any_τ2)
-   -----
-   (:lookup (v_1 : any_τ1 any_Γ) v_2 any_τ2)])
-
-(define-judgment-form list-machine-typing
-  #:contract (:lookup-Γ Γ v τ)
-  #:mode (:lookup-Γ I I O)
-  [-----
-   (:lookup-Γ (v : τ Γ) v τ)]
-  [(where #t (different v_1 v_2))
-   (:lookup-Γ Γ v_2 τ_2)
-   -----
-   (:lookup-Γ (v_1 : τ_1 Γ) v_2 τ_2)])
-
-(define-judgment-form list-machine-typing
-  #:contract (:lookup-Π Π l Γ)
-  #:mode (:lookup-Π I I O)
-  [-----
-   (:lookup-Π (l : Γ Π) l Γ)]
-  [(where #t (different l_1 l_2))
-   (:lookup-Π Π l_2 Γ_2)
-   -----
-   (:lookup-Π (l_1 : Γ_1 Π) l_2 Γ_2)])
-
-(define-judgment-form list-machine-typing
-  #:contract (:set Γ v τ Γ)
-  #:mode (:set I I I O)
-  [-----
-   (:set (v : any_τ any_Γ) v any_τ2 (v : any_τ2 any_Γ))]
-  [(where #t (different v v_2))
-   (:set any_Γ v_2 any_τ2 any_Γ2)
-   -----
-   (:set (v : any_τ any_Γ) v_2 any_τ2 (v : any_τ any_Γ2))]
-  [-----
-   (:set empty v any_τ (v : any_τ empty))])
-
-(define-metafunction list-machine-typing
-  [(dom (l_1 : any_1 any_2))
-   (l_1 (dom any_2))]
-  [(dom empty) empty])
-
-(define-metafunction list-machine-typing
-  [(dom-P (l_1 : ι_1 p))
-   (l_1 (dom p))]
-  [(dom-P end) empty])
-
-(define-metafunction list-machine-typing
-  [(dom-Π (l_1 : Γ_1 Π))
-   (l_1 (dom Π))]
-  [(dom-Π empty) empty])
-
-#;
-(define-metafunction list-machine-typing
-  l-⊂ : (l ...) (l ...) -> any
-  [(l-⊂ (l_1 ...) (l_2 ...))
-   ,(let ([ht (make-hash)])
-      (for ([l (in-list (term (l_2 ...)))])
-        (hash-set! ht l #t))
-      (for/and ([l (in-list (term (l_1 ...)))])
-        (hash-ref ht l #f)))])
-
-(define-relation list-machine-typing
-  [(l-⊂ (l_1 empty) l_2)
-   (where #t (lmem l_1 l_2))]
-  [(l-⊂ (l_1 l_2) l_3)
-   (l-⊂ l_2 l_3)
-   (where #t (lmem l_1 l_3))]
-  [(l-⊂ empty any)])
-
-(define-relation list-machine-typing
-  [(d= (l_1 : Γ_1 Π) (l_1 : ι p))
-   (d= Π p)]
-  [(d= empty end)])
-
-(define-relation list-machine-typing
-  [(d-⊂ (l_1 : Γ_1 Π) p)
-   (has-label p l_1)
-   (d-⊂ Π p)]
-  [(d-⊂ (l_1 : Γ_1 Π) (l_2 : ι p))
-   (d-⊂ (l_1 : Γ_1 Π) p)]
-  [(d-⊂ empty p)])
-
-(define-relation list-machine-typing
-  [(has-label (l_1 : ι p) l_1)]
-  [(has-label (l_1 : ι p) l_2)
-   (has-label p l_2)])
-
-(define-relation list-machine-typing
-  [(labels-distinct (l_1 : ι p))
-   (label-not-in l_1 p)
-   (labels-distinct p)]
-  [(labels-distinct end)])
-
-(define-relation list-machine-typing
-  [(label-not-in l_1 (l_2 : ι p))
-   (different l_1 l_2)
-   (label-not-in l_1 p)]
-  [(label-not-in l_1 end)])
-
-(define-metafunction list-machine-typing
-  [(lmem l_1 (l_1 l_2))
-   #t]
-  [(lmem l_1 (l_2 l_3))
-   (lmem l_1 l_3)]
-  [(lmem l_1 empty)
-   #f])
-
-(define-relation list-machine-typing
-  [(labels-distinct-Π (l_1 : Γ Π))
-   (label-not-in-Π l_1 Π)
-   (labels-distinct-Π Π)]
-  [(labels-distinct-Π empty)])
-
-(define-relation list-machine-typing
-  [(label-not-in-Π l_1 (l_2 : Γ Π))
-   (different l_1 l_2)
-   (label-not-in-Π l_1 Π)]
-  [(label-not-in-Π l_1 empty)])
-
-(define (generate-M-term)
-  (generate-term list-machine-typing (l0 : ι p) 7))
-
-(define (type-check p)
-  ;; need to provide a program typing, so generate 10 randomly and
-  ;; see if any succeed...
-  (let loop ([i 0])
-    (cond
-      [(i . > . 10) #f]
-      [else
-       (define guess-Π (generate-term list-machine-typing (l0 : (v0 : nil empty) Π) 7))
-       (or (judgment-holds (check-program ,p ,guess-Π))
-           (loop (add1 i)))])))
-
-(define (typed-generator)
-  (let ([g (redex-generator list-machine-typing 
-                            (check-program p Π)
-                            7)])
-    (λ () 
-      (match (g)
-        [`(check-program ,p ,Π)
-         p]
-        [#f #f]))))
-
-(define (generate-typed-term)
-  (match (generate-term list-machine-typing
-                        #:satisfying
-                        (check-program p Π)
-                        7)
-    [`(check-program ,p ,Π)
-     p]
-    [#f #f]))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/typed-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/typed-info.rkt
deleted file mode 100644
index 7dd4ca4e5a..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/typed-info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide (all-defined-out))
-
-(define name "list-machine")
-(define fname (make-path-root 'list-machine))
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (all-mods/type 'typed here name fname))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/util.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/util.rkt
deleted file mode 100644
index c990e0bbfd..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/list-machine/util.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket
-
-(require redex/benchmark)
-
-(provide bug-mod-rw
-         test)
-
-(define-rewrite bug-mod1
-  redex/examples/list-machine/list-machine
-  ==>
-  (submod ".." list-machine)
-  #:context (require))
-
-(define-rewrite bug-mod2
-  redex/examples/list-machine/list-machine-typing
-  ==>
-  (submod ".." list-machine-typing)
-  #:context (require))
-
-(define-rewrite/compose bug-mod-rw
-  bug-mod1 bug-mod2)
-
-(define-syntax-rule (test cexp)
-  (module+ test
-    (require (except-in rackunit check)
-             (submod ".." generators check-mod))
-    (check-equal? (check cexp) #f)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/generators.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/generators.rkt
deleted file mode 100644
index 9f83fabe8a..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/generators.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket/base
-
-(require redex/examples/poly-stlc
-         (only-in redex/private/generate-term pick-an-index)
-         redex/reduction-semantics
-         racket/bool
-         racket/match)
-
-(provide (all-defined-out))
-
-(module+ adhoc-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'grammar)
-  (define (generate)
-    (generate-term poly-stlc M 5)))
-
-(module+ enum-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'enum)
-  (define (generate [p-value 0.065])
-    (generate-term poly-stlc M #:i-th (pick-an-index p-value))))
-
-(module+ ordered-mod
-  (provide generate get-generator type)
-  (define (get-generator)
-    (let ([index 0])
-      (λ () (begin0
-              (generate index)
-              (set! index (add1 index))))))
-  (define type 'ordered)
-  (define (generate [index 0])
-    (generate-term poly-stlc M #:i-th index)))
-
-(module+ typed-mod
-  (provide generate get-generator type)
-  (define type 'search)
-  (define (get-generator) generate)
-  (define (generate)
-    ((match-lambda [`(typeof • ,M ,τ) M]
-                   [#f #f])
-     (generate-term poly-stlc #:satisfying (typeof • M τ) 3))))
-
-(module+ check-mod
-  (provide check)
-  (define (check term)
-    (or (not term)
-        (v? term)
-        (let ([t-type (type-check term)])
-          (implies
-           t-type
-           (let ([red-res (apply-reduction-relation red term)])
-             (and (= (length red-res) 1)
-                  (let ([red-t (car red-res)])
-                    (or (equal? red-t "error")
-                        (let ([red-type (type-check red-t)])
-                          (equal? t-type red-type)))))))))))
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-1.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-1.rkt
deleted file mode 100644
index b87190fac3..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-1.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "app rule the range of the function is matched to the argument")
-
-(define-rewrite bug1
-  (typeof Γ M_2 σ)
-  ==> 
-  (typeof Γ M_2 σ_2)
-  #:context (define-judgment-form)
-  #:variables (A)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/poly-stlc.rkt") poly-stlc bug1)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example 
-  (term ([hd @ int] 0)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-2.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-2.rkt
deleted file mode 100644
index 9d0b2bfd84..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-2.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "the (([cons @ τ] v) v) value has been omitted")
-
-(define-rewrite bug2
-  ((([cons @ τ] v) v) . rest)
-  ==>
-  rest
-  #:context (define-language)
-  #:variables (rest))
-
-(include/rewrite (lib "redex/examples/poly-stlc.rkt") poly-stlc bug2)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term (([cons @ int] 1) [nil @ int])))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-3.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-3.rkt
deleted file mode 100644
index 21ae2dfa1e..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-3.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "the order of the types in the function position of application has been swapped")
-
-(define-rewrite bug3
-  (typeof Γ M (σ → σ_2))
-  ==>
-  (typeof Γ M (σ_2 → σ))
-  #:context (define-judgment-form)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/poly-stlc.rkt") poly-stlc bug3)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((λ (x int) [nil @ int])
-         [nil @ int])))
-
-(test small-counter-example)
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-4.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-4.rkt
deleted file mode 100644
index b8e157ac81..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-4.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "the type of cons is incorrect")
-
-(define-rewrite bug4
-  (∀ a (a → ((list a) → (list a))))
-  ==>
-  (∀ a (a → ((list a) → a)))
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/poly-stlc.rkt") poly-stlc bug4)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((+ 1) (([cons @ int] 1) [nil @ int]))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-5.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-5.rkt
deleted file mode 100644
index 050d899701..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-5.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "the tail reduction returns the wrong value")
-
-(define-rewrite bug5
-  (in-hole E v_2)
-  ==>
-  (in-hole E v_1)
-  #:context (reduction-relation)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/poly-stlc.rkt") poly-stlc bug5)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example  
-  (term ([tl @ int] (([cons @ int] 1) [nil @ int]))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-6.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-6.rkt
deleted file mode 100644
index cef3072c8d..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-6.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "hd reduction acts on partially applied cons")
-
-(define-rewrite bug6
-  (in-hole E ((hd @ τ) (((cons @ τ) v_1) v_2)))
-  ==>
-  (in-hole E ((hd @ τ) ((cons @ τ) v_1)))
-  #:context (reduction-relation)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/poly-stlc.rkt") poly-stlc bug6)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ([hd @ int] (([cons @ int] 1) [nil @ int]))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-7.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-7.rkt
deleted file mode 100644
index 8e22cba75b..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-7.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "evaluation isn't allowed on the rhs of applications")
-
-(define-rewrite bug7
-  ((E M) 
-   (v E))
-  ==>
-  ((E M))
-  #:context (define-language)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/poly-stlc.rkt") poly-stlc bug7)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((+ 1) ((+ 2) 3))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-8.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-8.rkt
deleted file mode 100644
index 3e32859b08..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-8.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "lookup always returns int")
-
-(define-rewrite bug8
-  [(lookup (x σ Γ) x)
-   σ]
-  ==>
-  [(lookup (x σ Γ) x)
-   int]
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/poly-stlc.rkt") poly-stlc bug8)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((λ (x (list int)) (+ x))
-         [nil @ int])))
-
-(test small-counter-example)
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-9.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-9.rkt
deleted file mode 100644
index 85505666df..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-9.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "variables aren't required to match in lookup")
-
-(define-rewrite bug9
-  (lookup (x σ Γ) x)
-  ==>
-  (lookup (x σ Γ) x_2)
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/poly-stlc.rkt") poly-stlc bug9)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((λ (y (list int)) ([hd @ int] x))
-         [nil @ int])))
-
-(test small-counter-example)
-
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-info.rkt
deleted file mode 100644
index ae40e5cea8..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/poly-stlc-info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide all-mods)
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (make-all-mods here "poly-stlc" (make-path-root 'poly-stlc)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/typed-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/typed-info.rkt
deleted file mode 100644
index 3eb557b44d..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/typed-info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide (all-defined-out))
-
-(define name "poly-stlc")
-(define fname (make-path-root 'poly-stlc))
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (all-mods/type 'typed here name fname))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/util.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/util.rkt
deleted file mode 100644
index 201ade7b3b..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/poly-stlc/util.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket
-
-(require redex/benchmark)
-
-(provide bug-mod-rw
-         test)
-
-(define-rewrite bug-mod-rw
-  redex/examples/poly-stlc
-  ==> 
-  (submod ".." poly-stlc)
-  #:context (require))
-
-(define-syntax-rule (test cexp)
-  (module+ test
-    (require (except-in rackunit check)
-             (submod ".." generators check-mod))
-    (check-equal? (check cexp) #f)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/generators.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/generators.rkt
deleted file mode 100644
index 8995e4275b..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/generators.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang racket/base
-
-(require redex/examples/rbtrees
-         (only-in redex/private/generate-term pick-an-index)
-         redex/reduction-semantics
-         racket/match
-         racket/bool)
-
-(provide (all-defined-out))
-
-(module+ adhoc-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'grammar)
-  (define (generate)
-    (generate-term rbtrees t 5)))
-
-(module+ enum-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'enum)
-  (define (generate [p-value 0.25])
-    (generate-term rbtrees t #:i-th (pick-an-index p-value))))
-
-(module+ ordered-mod
-  (provide generate get-generator type)
-  (define (get-generator)
-    (let ([index 0])
-      (λ () (begin0
-              (generate index)
-              (set! index (add1 index))))))
-  (define type 'ordered)
-  (define (generate [index 0])
-    (generate-term rbtrees t #:i-th index)))
-
-(module+ typed-mod
-  (provide generate get-generator type)
-  (define type 'search)
-  (define (get-generator) generate)
-  (define (generate)
-    ((match-lambda 
-       [`(rb-tree ,t) t]
-       [#f #f])
-     (generate-term rbtrees #:satisfying (rb-tree t) 3))))
-
-(module+ check-mod
-  (provide check)
-  (define (check t)
-    (or (not t)
-        (implies (judgment-holds (rb-tree ,t)) 
-                 (ins-preserves-rb-tree t)))))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-1.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-1.rkt
deleted file mode 100644
index b557bae18d..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-1.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "ins does no rebalancing")
-
-(define-rewrite bug1
-  (balance (c . stuff))
-  ==> 
-  (c . stuff)
-  #:context (define-metafunction)
-  #:variables (stuff))
-
-(include/rewrite (lib "redex/examples/rbtrees.rkt") rbtrees bug1)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(require (only-in (submod "." rbtrees) num->n))
-
-(define small-counter-example 
-  (term (B (R E (num->n 0) E)
-           (num->n 2)
-           E)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-2.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-2.rkt
deleted file mode 100644
index e48cd4e86d..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-2.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "the first case is removed from balance")
-
-(define-rewrite bug2
-  ([(balance (B (R (R t_1 n_1 t_2) n_2 t_3) n_3 t_4))
-    (R (B t_1 n_1 t_2) n_2 (B t_3 n_3 t_4))]
-   . other-cases)
-  ==> 
-  other-cases
-  #:context (define-metafunction)
-  #:variables (other-cases))
-
-(include/rewrite (lib "redex/examples/rbtrees.rkt") rbtrees bug2)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(require (only-in (submod "." rbtrees) num->n))
-
-(define small-counter-example 
-  (term (B (R E (num->n 1) E)
-           (num->n 2)
-           E)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-3.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-3.rkt
deleted file mode 100644
index b1a4ef07a8..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-3.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "doesn't increment black depth in non-empty case")
-
-(define-rewrite bug3
-  (rbt (B (c_1 t_11 n_1 t_12) n (c_2 t_21 n_2 t_22)) n_1min n_2max (s n_bd))
-  ==> 
-  (rbt (B (c_1 t_11 n_1 t_12) n (c_2 t_21 n_2 t_22)) n_1min n_2max n_bd)
-  #:context (define-judgment-form)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/rbtrees.rkt") rbtrees bug3)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(require (only-in (submod "." rbtrees) num->n))
-
-(define small-counter-example 
-  (term (B 
-         (B 
-          (R E (num->n 1) E)
-          (num->n 2)
-          (R E (num->n 3) E))
-         (num->n 4)
-         (R E (num->n 5) E))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-info.rkt
deleted file mode 100644
index cedf7b76d9..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/rbtrees-info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide all-mods)
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (make-all-mods here "rbtrees" (make-path-root 'rbtrees)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/typed-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/typed-info.rkt
deleted file mode 100644
index 1c82a18f00..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/typed-info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide (all-defined-out))
-
-(define name "rbtrees")
-(define fname (make-path-root 'rbtrees))
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (all-mods/type 'typed here name fname))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/util.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/util.rkt
deleted file mode 100644
index 5463239de1..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rbtrees/util.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket
-
-(require redex/benchmark)
-
-(provide bug-mod-rw
-         test)
-
-(define-rewrite bug-mod-rw
-  redex/examples/rbtrees
-  ==> 
-  (submod ".." rbtrees)
-  #:context (require))
-
-(define-syntax-rule (test cexp)
-  (module+ test
-    (require (except-in rackunit check)
-             (submod ".." generators check-mod))
-    (check-equal? (check cexp) #f)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/generators.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/generators.rkt
deleted file mode 100644
index e65070925e..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/generators.rkt
+++ /dev/null
@@ -1,81 +0,0 @@
-#lang racket/base
-
-(require racket/bool
-         racket/match
-         redex/reduction-semantics
-         redex/benchmark
-         redex/examples/racket-machine/grammar
-         redex/examples/racket-machine/verification
-         redex/examples/racket-machine/randomized-tests
-         (prefix-in jdg: redex/benchmark/models/rvm/verif-jdg)
-         (only-in redex/private/generate-term pick-an-index))
-
-(provide (all-defined-out))
-
-(module+ adhoc-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'grammar)
-  (define (generate)
-    (fix (generate-term bytecode e 5))))
-
-(module+ enum-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'enum)
-  (define (generate [p-value 0.03])
-    (fix (generate-term bytecode e #:i-th (pick-an-index p-value)))))
-
-(module+ ordered-mod
-  (provide generate get-generator type)
-  (define (get-generator)
-    (let ([index 0])
-      (λ () (begin0
-              (generate index)
-              (set! index (add1 index))))))
-  (define type 'ordered)
-  (define (generate [index 0])
-    (fix (generate-term bytecode e #:i-th index))))
-
-(module+ typed-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'search)
-  (define (generate)
-    (match (generate-term
-            jdg:vl
-            #:satisfying
-            (jdg:V e • O #f • • ∅ s_1 γ_1 η_1)
-            4)
-      [#f #f]
-      [`(jdg:V ,e • O #f • • ∅ ,s_1 ,γ_1 ,η_1)
-       (fix (term (jdg:trans-e ,e)))])))
-
-(module+ check-mod
-  (provide check)
-  (define (check e)
-    (let/ec vf-not-total
-      (or (not e)
-          (implies (with-handlers ([exn:fail? (λ (exc)
-                                                (maybe-log-exn exc e)
-                                                (vf-not-total #f))])
-                     (bytecode-ok? e))
-                   (match 
-                       (with-handlers
-                           ([exn:fail? (λ (exc)
-                                         (maybe-log-exn exc e)
-                                         #f)])
-                         (run e '() 100))
-                     [(cutoff) #t]
-                     [(answer _) #t]
-                     [_ #f])))))
-  
-  (define (maybe-log-exn exc e)
-    (if (regexp-match? #rx"counterexample|domain|clauses" (exn-message exc))
-        (begin (bmark-log 'rvm-expected-exception
-                          `(#:exn-message ,(exn-message exc) #:expression ,e))
-               #f)
-        (begin (bmark-log 'rvm-unexpected-exception
-                          `(#:exn-message ,(exn-message exc) #:expression ,e))
-               (raise exc)))))
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/jdg-grammar.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/jdg-grammar.rkt
deleted file mode 100644
index 53bd3b2298..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/jdg-grammar.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics)
-
-(define-language bytecode
-  (e (loc n)
-     (loc-noclr n)
-     (loc-clr n)
-     (loc-box n)
-     (loc-box-noclr n)
-     (loc-box-clr n)
-     
-     (let-one e e)
-     (let-void n e)
-     (let-void-box n e)
-     
-     (boxenv n e)
-     (install-value n e e)
-     (install-value-box n e e)
-     
-     (application e e ...)
-     (seq e e e ...)
-     (branch e e e)
-     (let-rec (l ...) e)
-     (indirect x)
-     (proc-const (τ ...) e)
-     (case-lam l ...)
-     l
-     v)
-  
-  (l (lam (τ ...) (n ...) e))
-  
-  (v number
-     void
-     'variable
-     b)
-  
-  (τ val ref)
-  (n natural)
-  (b #t #f)
-  ((x y) variable))
-
-(provide bytecode)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-14.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-14.rkt
deleted file mode 100644
index 5d79277450..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-14.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "certain updates to initialized slots could break optimizer assumptions")
-
-(define-rewrite bug14a
-  ((where uninit (stack-ref n s_2))
-   . rest)
-  ==> 
-  rest
-  #:context (define-metafunction)
-  #:variables (rest)
-  #:exactly-once)
-
-(define-rewrite bug14b
-  ((side-condition (term (AND (same? ṽ_0 uninit) ellipsis)))
-   . rest)
-  ==> 
-  rest
-  #:context (define-metafunction)
-  #:variables (rest ellipsis)
-  #:exactly-once)
-
-(define-rewrite bug14c
-  ([(closure-intact? (box-nc ṽ_1 ellipsis) . rest1)
-    . rest2]
-   . rest)
-  ==> 
-  ([(closure-intact? (box-nc ṽ_1 ellipsis) . rest1)
-    . rest2]
-   [(closure-intact? (box-nc ṽ_1 ellipsis) (imm ṽ_2 ellipsis))
-    (closure-intact? (ṽ_1 ellipsis) (ṽ_2 ellipsis))]
-   . rest)
-  #:context (define-metafunction)
-  #:variables (rest rest1 rest2 ellipsis)
-  #:exactly-once)
-
-(define-rewrite bug14a-jdg
-  ((where uninit (sref n s_2))
-   . rest)
-  ==> 
-  rest
-  #:context (define-judgment-form)
-  #:variables (rest)
-  #:exactly-once)
-
-(define-rewrite bug14b-jdg
-  ((uninits s_a)
-   . rest)
-  ==> 
-  rest
-  #:context (define-judgment-form)
-  #:variables (rest)
-  #:exactly-once)
-
-(define-rewrite bug14c-jdg
-  ([(closure-intact (imm-nc sl_1) (imm sl_2))
-    (closure-intact sl_1 sl_2)]
-   . rest)
-  ==> 
-  ([(closure-intact (imm-nc sl_1) (imm sl_2))
-    (closure-intact sl_1 sl_2)]
-   [(closure-intact (box sl_1) (imm sl_2))
-    (closure-intact sl_1 sl_2)]
-   . rest)
-  #:context (define-relation)
-  #:variables (rest)
-  #:exactly-once)
-
-(define-rewrite/compose bug14 bug14a bug14b bug14c)
-
-(include/rewrite (lib "redex/examples/racket-machine/grammar.rkt") grammar)
-
-(include/rewrite (lib "redex/examples/racket-machine/verification.rkt") verification bug14)
-
-(include/rewrite (lib "redex/examples/racket-machine/randomized-tests.rkt") randomized-tests rt-rw)
-
-(include/rewrite (lib "redex/benchmark/models/rvm/verif-jdg.rkt") verif-jdg bug14a-jdg bug14b-jdg bug14c-jdg)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  '(let-one 'x
-            (application (proc-const (val val) (loc 0))
-                         (loc-noclr 2)
-                         (install-value 2 'y 'z))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-15.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-15.rkt
deleted file mode 100644
index 6951a6bf86..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-15.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "neglected to restrict case-lam to accept only 'val' arguments")
-
-(define-rewrite bug15v
-  ((verify (case-lam (name l (lam (val ellipsis1) (n ellipsis2) e)) ellipsis3) s n_l b γ η f)
-   . rest)
-  ==>
-  ((verify (case-lam (name l (lam (τ ellipsis1) (n ellipsis2) e)) ellipsis3) s n_l b γ η f)
-   . rest)
-  #:context (define-metafunction)
-  #:variables (rest ellipsis1 ellipsis2 ellipsis3)
-  #:exactly-once)
-
-(define-rewrite bug15rt
-  `(case-lam ,@(map (curry recur depth #f) ls))
-  ==>
-  `(case-lam ,@(map (curry recur depth #t) ls))
-  #:context (match)
-  #:exactly-once)
-
-(define-rewrite bug15-jdg
-  [(lam-verified?* ((lam τl nl e) el) sl m)
-   (vals τl)
-   (lam-verified? (lam τl nl e) sl m)
-   (lam-verified?* el sl m)]
-  ==>
-  [(lam-verified?* ((lam τl nl e) el) sl m)
-   (lam-verified? (lam τl nl e) sl m)
-   (lam-verified?* el sl m)]
-  #:context (define-judgment-form)
-  #:exactly-once)
-
-(include/rewrite (lib "redex/examples/racket-machine/grammar.rkt") grammar)
-
-(include/rewrite (lib "redex/examples/racket-machine/verification.rkt") verification bug15v)
-
-(include/rewrite (lib "redex/examples/racket-machine/randomized-tests.rkt") randomized-tests rt-rw bug15rt)
-
-(include/rewrite (lib "redex/benchmark/models/rvm/verif-jdg.rkt") verif-jdg bug15-jdg)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  '(let-one 42 
-            (boxenv 0 
-                    (application (case-lam (lam (ref) () (loc-box 0))) 
-                                 (loc-box 1)))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-2.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-2.rkt
deleted file mode 100644
index 30a0b65505..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-2.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "stack offset / pointer confusion")
-
-(define-rewrite bug2
-  [(redo-clrs ((n_0 ṽ_0) (n_1 ṽ_1) ellipsis1) s) 
-   (redo-clrs ((n_1 ṽ_1) ellipsis2) (set not ,(- (- (term n_h) (term n_0)) (term 1)) s))
-   (where n_h ,(length (term s)))
-   (side-condition (< (term n_0) (term n_h)))]
-  ==> 
-  [(redo-clrs ((n_0 ṽ_0) (n_1 ṽ_1) ellipsis1) s) 
-   (redo-clrs ((n_1 ṽ_1) ellipsis2) (set not ,(- (- (term n_h) (term n_0)) (term 1)) s))
-   (where n_h ,(length (term s)))]
-  #:context (define-metafunction)
-  #:variables (ellipsis1 ellipsis2)
-  #:exactly-once)
-
-(define-rewrite bug2-jdg
-  [(redo-clrs ((n ν) γ) s (supdt (n- (n- (slen s) n) (S O)) not s_2))
-   (n< n (slen s))
-   (n≠ (n- (slen s) n) O)
-   (redo-clrs γ s s_2)]
-  ==>
-  [(redo-clrs ((n ν) γ) s (supdt (n- (n- (slen s) n) (S O)) not s_2))
-   (redo-clrs γ s s_2)]
-  #:context (define-judgment-form)
-  #:exactly-once)
-
-(include/rewrite (lib "redex/examples/racket-machine/grammar.rkt") grammar)
-
-(include/rewrite (lib "redex/examples/racket-machine/verification.rkt") verification bug2)
-
-(include/rewrite (lib "redex/benchmark/models/rvm/verif-jdg.rkt") verif-jdg bug2-jdg)
-
-(include/rewrite (lib "redex/examples/racket-machine/randomized-tests.rkt") randomized-tests rt-rw)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  '(proc-const (val)
-               (branch (loc 0)
-                       (let-one 'x
-                                (branch (loc 1)
-                                        (loc-clr 0)
-                                        void))
-                       void)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-3.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-3.rkt
deleted file mode 100644
index ced95be9d7..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-3.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "application slots not initialized properly")
-
-;; applies in 3 places
-(define-rewrite bug3
-  (abs-push n not s)
-  ==> 
-  (abs-push n uninit s))
-
-(define-rewrite bug3-jdg
-  (abs-push n not sl)
-  ==> 
-  (abs-push n uninit sl))
-
-(include/rewrite (lib "redex/examples/racket-machine/grammar.rkt") grammar)
-
-(include/rewrite (lib "redex/examples/racket-machine/verification.rkt") verification bug3)
-
-(include/rewrite (lib "redex/examples/racket-machine/randomized-tests.rkt") randomized-tests rt-rw)
-
-(include/rewrite (lib "redex/benchmark/models/rvm/verif-jdg.rkt") verif-jdg bug3 bug3-jdg)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  '(application
-    (proc-const (val val) (branch (loc-noclr 0) 'a 'b))
-    'x
-    (install-value 0 'y (boxenv 0 'z))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-4.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-4.rkt
deleted file mode 100644
index a6db20f403..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-4.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "mishandling branches when then branch needs more stack than else branch; bug in the boxenv case not checking a stack bound")
-
-(define-rewrite bug3
-  ((side-condition (< (term n_p) (term n_l)))
-   . rest)
-  ==> 
-  rest
-  #:context (define-metafunction)
-  #:variables (rest)
-  #:exactly-once)
-
-(define-rewrite bug4-jdg
-  [(V (boxenv n_p e) s n_l b γ η f s_2 γ_2 η_2)
-    (where imm (sref n_p s))
-    (V e (supdt n_p box s) n_l b γ η f s_2 γ_2 η_2)
-    (n< n_p n_l)]
-  ==> 
-  [(V (boxenv n_p e) s n_l b γ η f s_2 γ_2 η_2)
-    (where imm (sref n_p s))
-    (V e (supdt n_p box s) n_l b γ η f s_2 γ_2 η_2)]
-  #:context (define-judgment-form)
-  #:exactly-once)
-
-(include/rewrite (lib "redex/examples/racket-machine/grammar.rkt") grammar)
-
-(include/rewrite (lib "redex/examples/racket-machine/verification.rkt") verification bug3)
-
-(include/rewrite (lib "redex/examples/racket-machine/randomized-tests.rkt") randomized-tests rt-rw)
-
-(include/rewrite (lib "redex/benchmark/models/rvm/verif-jdg.rkt") verif-jdg bug4-jdg)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  '(let-one 'x
-            (branch #f (boxenv 0 'y) (loc-box 0))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-5.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-5.rkt
deleted file mode 100644
index 94a0f0c7aa..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-5.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "mishandling branches when then branch needs more stack than else branch; bug in the let-rec case not checking a stack bound")
-
-(define-rewrite bug5
-  ((side-condition (<= (term n) (term n_l)))
-   . rest)
-  ==> 
-  rest
-  #:context (define-metafunction)
-  #:variables (rest)
-  #:exactly-once)
-
-(define-rewrite bug5-jdg
-  ((n<= n n_l)
-   . rest)
-  ==> 
-  rest
-  #:context (define-judgment-form)
-  #:variables (rest)
-  #:exactly-once)
-
-(include/rewrite (lib "redex/examples/racket-machine/grammar.rkt") grammar)
-
-(include/rewrite (lib "redex/examples/racket-machine/verification.rkt") verification bug5)
-
-(include/rewrite (lib "redex/examples/racket-machine/randomized-tests.rkt") randomized-tests rt-rw)
-
-(include/rewrite (lib "redex/benchmark/models/rvm/verif-jdg.rkt") verif-jdg bug5-jdg)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  '(let-void 1 
-             (branch #f 
-                     (let-rec ((lam () (0) 'x)) 'y) 
-                     (loc-noclr 0))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-6.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-6.rkt
deleted file mode 100644
index 0d80ae0b6d..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-6.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "forgot to implement the case-lam branch in verifier")
-
-(define-rewrite bug6
-  ((side-condition (term (AND (lam-verified? l s ?) ellipsis)))
-   . rest)
-  ==> 
-  rest
-  #:context (define-metafunction)
-  #:variables (rest ellipsis)
-  #:exactly-once)
-
-(define-rewrite bug6-jdg
-  [(V (case-lam el) s n_l b γ η f s γ η)
-   (lam-verified?* el s ?)]
-  ==>
-  [(V (case-lam el) s n_l b γ η f s γ η)]
-  #:context (define-judgment-form)
-  #:exactly-once)
-
-(include/rewrite (lib "redex/examples/racket-machine/grammar.rkt") grammar)
-
-(include/rewrite (lib "redex/examples/racket-machine/verification.rkt") verification bug6)
-
-(include/rewrite (lib "redex/examples/racket-machine/randomized-tests.rkt") randomized-tests rt-rw)
-
-(include/rewrite (lib "redex/benchmark/models/rvm/verif-jdg.rkt") verif-jdg bug6-jdg)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  '(application
-    (case-lam (lam (val) () (loc-noclr 34)))
-    'x))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-info.rkt
deleted file mode 100644
index f90002b53f..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/rvm-info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide all-mods)
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (make-all-mods here "rvm" (make-path-root 'rvm)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/typed-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/typed-info.rkt
deleted file mode 100644
index c40b5eb7f8..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/typed-info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide (all-defined-out))
-
-(define name "rvm")
-(define fname (make-path-root 'rvm))
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (all-mods/type 'typed here name fname))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/util.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/util.rkt
deleted file mode 100644
index 640551b953..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/util.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark)
-
-(provide bug-mod-rw
-         rt-rw
-         test)
-
-(define-rewrite bug-mod-1
-  redex/examples/racket-machine/grammar
-  ==> 
-  (submod ".." grammar)
-  #:context (require))
-
-(define-rewrite bug-mod-2
-  redex/examples/racket-machine/verification
-  ==> 
-  (submod ".." verification)
-  #:context (require))
-
-(define-rewrite bug-mod-3
-  redex/examples/racket-machine/randomized-tests
-  ==> 
-  (submod ".." randomized-tests)
-  #:context (require))
-
-(define-rewrite bug-mod-4
-  redex/benchmark/models/rvm/verif-jdg
-  ==> 
-  (submod ".." verif-jdg)
-  #:context (require))
-
-;; adjust large numbers to keep the reduction from blowing up
-(define-rewrite rt-rw
-  [`(,(and (or 'let-void 'let-void-box) i) ,n ,e)
-       `(,i ,n ,(recur (+ depth n) #f e))]
-  ==>
-  [`(,(and (or 'let-void 'let-void-box) i) ,n ,e)
-       `(,i ,(modulo n 20) ,(recur (+ depth (modulo n 20)) #f e))]
-  #:exactly-once
-  #:context (match))
-
-(define-rewrite/compose bug-mod-rw bug-mod-1 bug-mod-2 bug-mod-3 bug-mod-4)
-
-(define-syntax-rule (test cexp)
-  (module+ test
-    (require (except-in rackunit check)
-             (submod ".." generators check-mod))
-    (check-equal? (check cexp) #f)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/verif-jdg.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/verif-jdg.rkt
deleted file mode 100644
index c2dd883738..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/rvm/verif-jdg.rkt
+++ /dev/null
@@ -1,750 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics 
-         "jdg-grammar.rkt")
-
-(provide (all-defined-out))
-
-
-(define (bytecode-ok? e)
-  (not (eq? 'invalid (car (term (verify ,e () 0 #f () () ∅))))))
-
-(define (bytecode-ok/V? e)
-  (judgment-holds
-   (V ,e • O #f • • ∅ s_1 γ_1 η_1)))
-
-(define-extended-language verification 
-  bytecode
-  (s (ṽ ...) invalid)
-  (ṽ uninit imm box imm-nc box-nc not)
-  (γ ((n ṽ) ...))
-  (η (n ...))
-  (f (n n (ṽ ...)) ∅)
-  (m n ?))
-
-(define-language bl
-  (e (loc n)
-     (loc-noclr n)
-     (loc-clr n)
-     (loc-box n)
-     (loc-box-noclr n)
-     (loc-box-clr n)
-     
-     (let-one e e)
-     (let-void n e)
-     (let-void-box n e)
-     
-     (boxenv n e)
-     (install-value n e e)
-     (install-value-box n e e)
-     
-     (application e el)
-     ;; change to (seq el) ?
-     (seq e e)
-     (branch e e e)
-     (let-rec ll e)
-     (indirect x)
-     (proc-const τl e)
-     (case-lam ll)
-     l
-     v)
-  
-  (el (e el) •)
-  
-  (l (lam τl nl e))
-  
-  (ll (l ll) •)
-  
-  (τl (τ τl) •)
-  
-  (nl (n nl) •)
-  
-  (v n
-     void
-     'variable
-     b)
-  
-  (τ val ref)
-  (n O (S n))
-  (b boolean)
-  ((x y) variable))
-
-(define-metafunction bl
-  [(trans-e (application e el))
-   (application (trans-e e) (trans-e e_2) ...)
-   (where (e_2 ...) (cns->lst el))]
-  [(trans-e (proc-const τl e))
-   (proc-const (cns->lst τl) (trans-e e))]
-  [(trans-e (case-lam el))
-   (case-lam any ...)
-   (where (e ...) (cns->lst el))
-   (where (any ...) ((trans-e e) ...))]
-  [(trans-e (any n e))
-   (any (trans-n n) (trans-e e))
-   (side-condition (memq (term any) '(let-void let-void-box)))]
-  [(trans-e (seq e_1 e_2))
-   (seq any_3 ... any_4 ...)
-   (where (any_3 ...) (un-seq e_1))
-   (where (any_4 ...) (un-seq e_2))]
-  [(trans-e (branch e_1 e_2 e_3))
-   (branch (trans-e e_1) (trans-e e_2) (trans-e e_3))]
-  [(trans-e (let-one e_1 e_2))
-   (let-one (trans-e e_1) (trans-e e_2))]
-  [(trans-e (boxenv n e))
-   (boxenv (trans-n n) (trans-e e))]
-  [(trans-e (any n e_1 e_2))
-   (any (trans-n n) (trans-e e_1) (trans-e e_2))
-   (side-condition (memq (term any) '(install-value install-value-box)))]
-  [(trans-e (proc-const τl e))
-   (proc-const (cns->lst τl) (trans-e e))]
-  [(trans-e (let-rec ll e))
-   (let-rec ((trans-l any_l) ...) (trans-e e))
-   (where (any_l ...) (cns->lst ll))]
-  [(trans-e (any n))
-   (any (trans-n n))
-   (side-condition (memq (term any) '(loc loc-noclr loc-clr loc-box loc-box-clr loc-box-noclr)))]
-  [(trans-e l_1)
-   (trans-l l_1)]
-  [(trans-e n)
-   (trans-n n)]
-  [(trans-e any)
-   any])
-
-(define-metafunction bl
-  [(trans-l (lam τl nl e))
-   (lam (cns->lst τl) (number_2 ...) (trans-e e))
-   (where (n_1 ...) (cns->lst nl))
-   (where (number_2 ...) ((trans-n n_1) ...))])
-
-(define-metafunction bl
-  [(un-seq e_1)
-   (any_2 ...)
-   (where (seq any_2 ...) (trans-e e_1))]
-  [(un-seq e)
-   ((trans-e e))])
-
-(define-metafunction bl
-  [(trans-n O)
-   0]
-  [(trans-n (S n))
-   ,(add1 (term (trans-n n)))])
-
-(define-extended-language vl
-  bl
-  (sl (ν sl) •)
-  (s sl invalid)
-  (ν uninit imm box imm-nc box-nc not)
-  (γ ((n ν) γ) •)
-  (η (n η) •)
-  (f (n n sl) ∅)
-  (m n ?))
-
-
-(define (check-V-res v-res)
-  ;(displayln (list 'check-V-res v-res))
-  (match v-res
-    [`(V ,e ,s1 ,n ,b ,γ1 ,η1 ,f ,s2 ,γ2 ,η2)
-     (unless
-         (equal?
-          (term
-           (verify
-            (trans-e ,e)
-            (trans-s ,s1)
-            (trans-n ,n)
-            ,b
-            (trans-γ ,γ1)
-            (trans-η ,η1)
-            (trans-f ,f)))
-          (term
-           ((trans-s ,s2)
-            (trans-γ ,γ2)
-            (trans-η ,η2))))
-       (error 'check-V-res "failed on ~s " e))]))
-
-(define (check-Vs n #:generator [g #f])
-  (define gen (redex-generator vl
-                               (V e • O #f • • ∅ s_1 γ_1 η_1)
-                               6))
-  (for ([_ (in-range n)])
-    (define maybe-V 
-      (if g 
-          (gen)
-          (generate-term
-           vl
-           #:satisfying
-           ;(V e s n b γ η f s_1 γ_1 η_1)
-           (V e • O #f • • ∅ s_1 γ_1 η_1)
-           5)))
-    (match maybe-V
-      [#f
-       (display ".")]
-      [`(V ,e ,s ,n ,b ,γ ,η ,f ,s_1 ,γ_1 ,η_1)
-       (displayln (term (trans-e ,e)))
-       (check-V-res maybe-V)])))
-
-(define-metafunction vl
-  [(trans-γ ((n ν) γ))
-   (((trans-n n) ν) any ...)
-   (where (any ...) (trans-γ γ))]
-  [(trans-γ •)
-   ()])
-
-(define-metafunction vl
-  [(trans-η (n η))
-   ((trans-n n) any ...)
-   (where (any ...) (trans-η η))]
-  [(trans-η •)
-   ()])
-         
-(define-metafunction vl
-  [(trans-f ∅)
-   ∅]
-  [(trans-f (n_1 n_2 sl))
-   ((trans-n n_1) (trans-n n_2) (cns->lst sl))])
-
-(define-metafunction vl
-  [(trans-s invalid)
-   invalid]
-  [(trans-s sl)
-   (cns->lst sl)])
-         
-(define-metafunction vl
-  [(cns->lst (any_1 any_2))
-   (any_1 any_3 ...)
-   (where (any_3 ...) (cns->lst any_2))]
-  [(cns->lst •)
-   ()])
-
-
-;; verification judgment -----------------------------------------------
-
-
-(define-judgment-form vl
-  #:mode (V I I I I I I I O O O)
-  #:contract (V e s n b γ η f s γ η)
-  
-  ;localrefs
-  [(V (loc n) s n_l #f γ η f s γ η)
-   (lmem (sref n s) (imm (imm-nc •)))]
-  [(V (loc n) s n_l #t γ η f s γ η)
-   (lmem (sref n s) (imm (imm-nc (box (box-nc •)))))]
-  [(V (loc-box n) s n_l b γ η f s γ η)
-   (lmem (sref n s) (box (box-nc •)))]
-  
-  [(V (loc-noclr n) s n_l #f γ η f (supdt n (nc ν_n) s) γ η_l)
-   (where ν_n (sref n s))
-   (log-noclr n n_l ν_n η η_l)
-   (lmem ν_n (imm (imm-nc •)))]
-  [(V (loc-noclr n) s n_l #t γ η f (supdt n (nc ν_n) s) γ η_l)
-   (where ν_n (sref n s))
-   (log-noclr n n_l ν_n η η_l)
-   (lmem ν_n (imm (imm-nc (box (box-nc •)))))]
-  [(V (loc-box-noclr n) s n_l b γ η f (supdt n box-nc s) γ η_l)
-   (where ν_n (sref n s))
-   (log-noclr n n_l ν_n η η_l)
-   (lmem ν_n (box (box-nc •)))]
-  
-  
-  [(V (loc-clr n) s n_l #f γ η f (supdt n not s) γ_l η)
-   (where imm (sref n s))
-   (log-clr n s n_l γ γ_l)]
-  [(V (loc-clr n) s n_l #t γ η f (supdt n not s) γ_l η)
-   (lmem (sref n s) (imm (box •)))
-   (log-clr n s n_l γ γ_l)]
-  [(V (loc-box-clr n) s n_l b γ η f (supdt n not s) γ_l η)
-   (where box (sref n s))
-   (log-clr n s n_l γ γ_l)]
-
-  ;branch
-  [(V (branch e_c e_t e_e) s n_l b γ η f s_n (concat γ_2 γ_3) η_3)
-   (V e_c s n_l #f γ η ∅ s_1 γ_1 η_1)
-   (V e_t (trim s_1 s) O b • • f s_2 γ_2 η_2)
-   (undo-clrs γ_2 (trim s_2 s) s_21)
-   (undo-noclrs η_2 s_21 s_22)
-   (V e_e s_22 O b γ_1 η_1 f s_3 γ_3 η_3)
-   (redo-clrs γ_2 (trim s_3 s) s_n)]
-  
-  ;let-one
-  [(V (let-one e_r e_b) sl n_l b γ η f s_2 γ_2 η_2)
-   (where sl_0 (uninit sl))
-   (V e_r sl_0 (n+ n_l (S O)) #f γ η ∅ sl_1 γ_1 η_1)
-   (where (uninit sl_1*) (trim sl_1 sl_0))
-   (V e_b (imm sl_1*) (n+ n_l (S O)) b γ_1 η_1 (shift (S O) f) s_2 γ_2 η_2)]
-  
-  ;seq
-  [(V (seq e_0 e_1) s n_l b γ η f s_2 γ_2 η_2)
-   (V e_0 s n_l #t γ η ∅ s_1 γ_1 η_1)
-   (V e_1 (trim s_1 s) n_l b γ_1 η_1 f s_2 γ_2 η_2)]
-  
-  ;application
-  [(V (application (loc-noclr n) el) s n_l b_i γ η (n_f n_s sl_f) s_2 γ_2 η_2)
-   (n= n (n+ n_f (len el)))
-   (V-self-app (application (loc-noclr n) el) s n_l γ η (n_f n_s sl_f) s_2 γ_2 η_2)]
-  [(V (application (lam τl nl e) el) s n_l b γ η f s_2 γ_2 η_2)
-   (where n (len el))
-   (where n_l* (n+ n n_l))
-   (where s_1 (abs-push n not s))
-   (V*-ref el τl s_1 n_l* γ η s_2 γ_2 η_2)
-   (lam-verified? (lam τl nl e) s_1 ?)]
-  [(V (application (proc-const τl e) el) s n_l b γ η f s_2 γ_2 η_2)
-   (V (application (lam τl • e) el) s n_l b γ η f s_2 γ_2 η_2)]
-  [(V (application e_0 el) s n_l b γ η f s_2 γ_2 η_2)
-   ;; the only place where cases might overlap, so exclude that explicitly
-   (not-self-app (application e_0 el) s f)
-   (where n (len el))
-   (where n_l* (n+ n n_l))
-   (V* (e_0 el) (abs-push n not s) n_l* #f γ η s_2 γ_2 η_2)]
-  
-  ; literals
-  [(V n s n_l b γ η f s γ η)]
-  [(V b s n_l b_i γ η f s γ η)]
-  [(V (quote variable) s n_l b γ η f s γ η)]
-  [(V void s n_l b γ η f s γ η)]
-  
-  ; install-value
-  [(V (install-value n e_r e_b) s n_l b γ η f s_3 γ_3 η_3)
-   (n< n n_l)
-   (V e_r s n_l #f γ η ∅ s_1 γ_1 η_1)
-   (where s_2 (trim s_1 s))
-   (where uninit (sref n s_2))
-   (V e_b (supdt n imm s_2) n_l b γ η f s_3 γ_3 η_3)]
-  [(V (install-value-box n e_r e_b) s n_l b γ η f s_3 γ_3 η_3)
-   (n< n (len s))
-   (V e_r s n_l #f γ η ∅ s_1 γ_1 η_1)
-   (where s_2 (trim s_1 s))
-   (lmem (sref n s_2) (box (box-nc •)))
-   (V e_b s_2 n_l b γ_1 η_1 f s_3 γ_3 η_3)]
-  
-  ; boxenv
-  [(V (boxenv n_p e) s n_l b γ η f s_2 γ_2 η_2)
-   (where imm (sref n_p s))
-   (V e (supdt n_p box s) n_l b γ η f s_2 γ_2 η_2)
-   (n< n_p n_l)]
-  
-  ; indirect
-  [(V (indirect x) s n_l b γ η f s γ η)]
-  
-  ; let-void
-  [(V (let-void n e) s n_l b_i γ η f s_1 γ_1 η_1)
-   (V e (abs-push n uninit s) (n+ n n_l) b_i γ η (shift n f) s_1 γ_1 η_1)]
-  [(V (let-void-box n e) s n_l b_i γ η f s_1 γ_1 η_1)
-   (V e (abs-push n box s) (n+ n n_l) b_i γ η (shift n f) s_1 γ_1 η_1)]
-  
-   ; procedures in arbitrary context
-  [(V (lam τl nl e) s n_l b γ η f s γ η)
-   (vals (val τl))
-   (lam-verified? (lam τl nl e) s ?)]
-  [(V (proc-const τl e) s n_l b γ η f s_1 γ_1 η_1)
-   (vals τl)
-   (V (lam τl • e) s n_l b γ η f s_1 γ_1 η_1)]
-  
-  ; case-lam
-  [(V (case-lam el) s n_l b γ η f s γ η)
-   (lam-verified?* el s ?)]
-  
-   ; let-rec
-  [(V (let-rec ll e) s n_l b γ η f s_2 γ_2 η_2)
-   (where n (len ll))
-   (n<=  n n_l)
-   (lsplit n s s_a s_b)
-   (uninits s_a)
-   (where s_1 (abs-push n imm s_b))
-   (verify-ll O s_1 ll)
-   (V e s_1 n_l b γ η f s_2 γ_2 η_2)])
-
-(define-judgment-form vl
-  #:mode (verify-ll I I I)
-  [(verify-ll n s •)]
-  [(verify-ll n s ((lam τl (n_l nl) e) ll))
-   (vals τl)
-   (lam-verified? (lam τl (n_l nl) e) s n)
-   (verify-ll (S n) s ll)])
-
-(define-judgment-form vl
-  #:mode (V* I I I I I I O O O)
-  #:contract (V* el s n b γ η s γ η)
-  [(V* • s n_l b γ η s γ η)]
-  [(V* (e_0 el) s n_l b γ η s_2 γ_2 η_2)
-   (V e_0 s n_l b γ η ∅ s_1 γ_1 η_1)
-   (V* el (trim s_1 s) n_l b γ_1 η_1 s_2 γ_2 η_2)])
-
-(define-judgment-form vl
-  #:mode (V-self-app I I I I I I O O O)
-  #:contract (V-self-app e s n γ η f s γ η)
-  [(V-self-app (application e_0 el) sl n_l γ η (n_f n_s sl_f) sl_1 γ_1 η_1)
-   (where n (len el))
-   (where n_l* (n+ n n_l))
-   (V* (e_0 el) (abs-push n not sl) n_l* #f γ η sl_1 γ_1 η_1)
-   (closure-intact (ssblst n_s (slen sl_f) sl_1) sl_f)])
-
-(define-judgment-form vl
-  #:mode (V*-ref I I I I I I O O O)
-  [(V*-ref • • s n_l γ η s γ η)]
-  [(V*-ref (e_0 el) (val τl) s n_l γ η s_2 γ_2 η_2)
-   (V e_0 s n_l #f γ η ∅ s_1 γ_1 η_1)
-   (V*-ref el τl (trim s_1 s) n_l γ_1 η_1 s_2 γ_2 η_2)]
-  [(V*-ref (e_0 el) • s n_l γ η s_2 γ_2 η_2)
-   (V* (e_0 el) s n_l #f γ η s_2 γ_2 η_2)]
-  [(V*-ref • (τ_0 τl) s n_l γ η s γ η)]
-  [(V*-ref ((loc n) el) (ref τl) s n_l γ η s_2 γ_2 η_2)
-   ; Require the reference to load a box.
-   (V (loc-box n) s n_l #f γ η ∅ s_1 γ_1 η_1)
-   (V*-ref el τl s_1 n_l γ_1 η_1 s_2 γ_2 η_2)]
-  [(V*-ref ((loc-noclr n) el) (ref τl) s n_l γ η s_2 γ_2 η_2)
-   ; Require the reference to load a box.
-   (V (loc-box-noclr n) s n_l #f γ η ∅ s_1 γ_1 η_1)
-   (V*-ref el τl s_1 n_l γ_1 η_1 s_2 γ_2 η_2)]
-  [(V*-ref ((loc-clr n) el) (ref τl) s n_l γ η s_2 γ_2 η_2)
-   ; Require the reference to load a box.
-   (V (loc-box-clr n) s n_l #f γ η ∅ s_1 γ_1 η_1)
-   (V*-ref el τl s_1 n_l γ_1 η_1 s_2 γ_2 η_2)])
- 
-(define-relation vl 
-  [(closure-intact • •)]
-  [(closure-intact (imm-nc sl_1) (imm sl_2))
-   (closure-intact sl_1 sl_2)]
-  [(closure-intact (box-nc sl_1) (box sl_2))
-   (closure-intact sl_1 sl_2)]
-  [(closure-intact (ν sl_1) (ν sl_2))
-   (closure-intact sl_1 sl_2)])
-
-(define-relation vl
-  [(vals (val τl))
-   (vals τl)]
-  [(vals •)])
-
-(define-relation vl
-  [(uninits (uninit sl))
-   (uninits sl)]
-  [(uninits •)])
-
-(define-judgment-form vl
-  #:mode (lam-verified? I I I)
-  [(lam-verified? (lam τl nl e) sl m)
-   ;(where n_d (len sl))
-   ;(lmax nl n_m)
-   ;(n< n_m n_d)
-   (where n_d* (n+ (len nl) (len τl)))
-   (where sl_0 (collate-refs nl sl))
-   (not-lmem uninit sl_0)
-   (not-lmem not sl_0)
-   (where s_d (drop-noclrs sl_0))
-   (extract-self m nl τl s_d f)
-   (V e (concat s_d (arg τl)) n_d* #f • • f sl_1 γ_1 η_1)])
-
-(define-judgment-form vl
-  #:mode (lam-verified?* I I I)
-  [(lam-verified?* • sl m)]
-  [(lam-verified?* ((lam τl nl e) el) sl m)
-   (vals τl)
-   (lam-verified? (lam τl nl e) sl m)
-   (lam-verified?* el sl m)])
-
-;; suffers from ?/n confusion
-;; fixable by transforming to a metafunction
-;; but need to add judgment-holds support 
-
-(define-judgment-form vl
-  #:mode (extract-self I I I I O)
-  [(extract-self ? nl τl sl ∅)]
-  [(extract-self n nl τl sl ∅)
-   (not-lmem n nl)]
-  [(extract-self n_i (n_i nl) τl sl (O (len τl) sl))
-   (not-lmem n_i nl)]
-  [(extract-self n_i (n_0 nl) τl sl ((S n_n) n_τ sl))
-   (extract-self n_i nl τl sl (n_n n_τ sl))
-   (nlmem n_i nl)])
-
-(define-metafunction vl
-  [(loc-noclr? (loc-noclr e))
-   #t]
-  [(loc-noclr? e)
-   #f])
-
-(define-relation vl
-  [(not-self-app (application e el) s ∅)]
-  [(not-self-app (application e el) s f)
-   (where #f (loc-noclr? e))]
-  [(not-self-app (application (loc-noclr n) el) s (n_f n_s s_f))
-   (n≠ n (n+ n_f (len el)))])
-
-(define-relation vl
-  [(n≠ O (S n))]
-  [(n≠ (S n) O)]
-  [(n≠ (S n_1) (S n_2))
-   (n≠ n_1 n_2)])
-
-#;
-(define-metafunction vl
-  [(es ? nl τl sl)
-   ∅]
-  [(extract-self n nl τl sl)
-   ∅
-   (judgment-holds (not-lmem n nl))]
-  [(extract-self n_i (n_i nl) (τ_0 τl) sl (O O sl))
-   (not-lmem n_i nl)]
-  [(extract-self n_i (n_0 nl) (τ_0 τl) sl ((S n_n) (S n_τ) sl))
-   (extract-self n_i nl τl sl (n_n n_τ sl))
-   (nlmem n_i nl)])
-
-(define-metafunction vl
-  [(ssblst O O sl)
-   •]
-  [(ssblst O (S n) (ν sl))
-   (ν (ssblst O n sl))]
-  [(ssblst (S n_1) n_2 (ν sl))
-   (ssblst n_1 n_2 sl)])
-  
-(define-relation vl
-  [(lmem ν (ν sl))]
-  [(lmem ν (ν_1 sl))
-   (lmem ν sl)])
-
-(define-relation vl
-  [(nlmem n (n nl))]
-  [(nlmem n (n_1 nl))
-   (nlmem n nl)])
-
-(define-relation vl
-  [(not-lmem any_1 (any_2 any_3))
-   (not-lmem any_1 any_3)
-   (where (any_!_4 any_!_4) (any_1 any_2))]
-  [(not-lmem any_1 •)])
-
-(define-judgment-form vl
-  #:mode (lmax I O)
-  [(lmax • O)]
-  [(lmax (n nl) n)
-   (lmax nl n_m)
-   (n< n_m n)]
-  [(lmax (n nl) n_m)
-   (lmax nl n_m)
-   (n< n n_m)])
-
-(define-metafunction vl
-  [(sref O (ν sl))
-   ν]
-  [(sref (S n) (ν_1 sl))
-   (sref n sl)]
-  [(sref n •)
-   #f])
-
-(define-metafunction vl
-  #;[(supdt O ν_1 •)
-   (ν_1 •)]
-  [(supdt O ν_1 (ν_2 sl))
-   (ν_1 sl)]
-  [(supdt (S n) ν_1 (ν_2 sl))
-   (ν_2 (supdt n ν_1 sl))])
-
-(define-metafunction vl
-  [(n- n_1 O)
-   n_1]
-  [(n- (S n_1) (S n_2))
-   (n- n_1 n_2)]
-  #;
-  [(n- O (S n))
-   #f])
-
-(define-metafunction vl
-  [(n+ O n)
-   n]
-  [(n+ (S n_1) n_2)
-   (n+ n_1 (S n_2))])
-
-(define-metafunction vl
-  [(slen •)
-   O]
-  [(slen (ν sl))
-   (S (slen sl))])
-
-(define-metafunction vl
-  [(len •)
-   O]
-  [(len (any_1 any_2))
-   (S (len any_2))])
-
-(define-relation vl
-  [(n< O (S n))]
-  [(n< (S n_1) (S n_2))
-   (n< n_1 n_2)])
-
-(define-relation vl
-  [(n<= O n)]
-  [(n<= (S n_1) (S n_2))
-   (n<= n_1 n_2)])
-  
-(define-relation vl
-  [(n= O O)]
-  [(n= (S n_1) (S n_2))
-   (n= n_1 n_2)])
-
-(define-judgment-form vl
-  #:mode (lsplit I I O O)
-  [(lsplit O any_1 • any_1)]
-  [(lsplit (S n) (any_1 any_2) (any_1 any_3) any_4)
-   (lsplit n any_2 any_3 any_4)])
-   
-
-(define-metafunction vl
-  shift : n f -> f
-  [(shift n ∅) ∅]
-  [(shift n (n_f n_s sl)) 
-   ((n+ n n_f) (n+ n n_s) sl)])
-
-(define-metafunction vl
-  abs-push : n ν sl -> sl
-  [(abs-push O ν sl) sl]
-  [(abs-push (S n) ν sl)
-   (abs-push n ν (ν sl))])
-
-;; note: could turn this back into a metafunction
-;; if the restriction on relations in term positions
-;; is removed....
-;; or support judgment-holds, maybe that is better
-;; naturally a metafunction in any case...
-(define-judgment-form vl
-  #:contract (log-noclr n n ν η η)
-  #:mode (log-noclr I I I I O)
-  [(log-noclr n_p n_l ν_p η ((n- n_p n_l) η))
-   (n<= n_l n_p)
-   (lmem ν_p (imm (box •)))]
-  [(log-noclr n_p n_l ν_p η η)
-   (lmem ν_p (imm-nc (box-nc (uninit (not •)))))]
-  [(log-noclr n_p n_l ν_p η η)
-   (n< n_p n_l)])
-
-
-(define-metafunction vl
-  nc : ν -> ν
-  [(nc imm) imm-nc]
-  [(nc imm-nc) imm-nc]
-  [(nc box) box-nc]
-  [(nc box-nc) box-nc])
-
-(define-judgment-form vl
-  #:contract (log-clr n s n γ γ)
-  #:mode (log-clr I I I I O)
-  [(log-clr n_p s n_l γ (((n- (n- (slen s) n_p) (S O)) ν_np) γ))
-   (where ν_np (sref n_p s))
-   (n<= n_l n_p)]
-  [(log-clr n_p s n_l γ γ)
-   (n< n_p n_l)])
-
-;; need more specific nt types in
-;; relations like this or there can be problems
-;; satisfying constraings (i.e. trying to satisfy an sl with anys)
-(define-metafunction vl
-  [(concat • any_1)
-   any_1]
-  [(concat (any_1 any_2) any_3)
-   (any_1 (concat any_2 any_3))])
-
-
-(define-judgment-form vl
-  #:mode (undo-clrs I I O)
-  [(undo-clrs γ invalid invalid)]
-  [(undo-clrs • s s)]
-  [(undo-clrs ((n ν) γ) s (supdt (n- (n- (slen s) n) (S O)) ν s_2))
-   (n< n (slen s))
-   (n≠ (n- (slen s) n) O)
-   (undo-clrs γ s s_2)]
-  [(undo-clrs ((n ν) γ) s s)
-   (n<= (slen s) n)])
-
-(define-judgment-form vl
-  #:mode (undo-noclrs I I O)
-  [(undo-noclrs η invalid invalid)]
-  [(undo-noclrs • s s)]
-  [(undo-noclrs (n η) s (supdt n imm s_2))
-   (where imm-nc (sref n s))
-   (undo-noclrs η s s_2)]
-  [(undo-noclrs (n η) s (supdt n box s_2))
-   (where box-nc (sref n s))
-   (undo-noclrs η s s_2)]
-  [(undo-noclrs (n η) s s_2)
-   (undo-noclrs η s s_2)
-   ;; Bug 1
-   ;; (lmem (sref n s) (uninit (imm (imm-nc (boc-nc (box (not •)))))))
-   (lmem (sref n s) (uninit (imm (box (not •)))))])
-
-(define-judgment-form vl
-  #:mode (redo-clrs I I O)
-  [(redo-clrs γ invalid invalid)]
-  [(redo-clrs • s s)]
-  [(redo-clrs ((n ν) γ) s (supdt (n- (n- (slen s) n) (S O)) not s_2))
-   (n< n (slen s))
-   (n≠ (n- (slen s) n) O)
-   (redo-clrs γ s s_2)]
-  [(redo-clrs ((n ν) γ) s s)
-   (n<= (slen s) n)])
-
-(define-metafunction vl
-  [(collate-refs • sl)
-   •]
-  [(collate-refs (n nl) sl)
-   ((sref n sl) (collate-refs nl sl))])
-
-(define-metafunction vl
-  [(drop-noclrs (imm-nc sl))
-   (imm (drop-noclrs sl))]
-  [(drop-noclrs (box-nc sl))
-   (box sl)]
-  [(drop-noclrs (ν sl))
-   (ν (drop-noclrs sl))]
-  [(drop-noclrs •)
-   •])
-
-;; had to make both of these
-;; j-forms for the below reasons...
-#;
-(define-metafunction vl
-  undo-clrs : γ s -> s
-  [(undo-clrs γ invalid) invalid]
-  [(undo-clrs • s) s]
-  [(undo-clrs ((n ν) γ) s)
-   (undo-clrs γ (supdt (n- (n- (slen s) n) (S O)) ν s))]
-  ;; --> (slen s) < n
-  ;; but generation doesn't support this fall-through!!
-  [(undo-clrs ((n ν) γ) s)
-   (undo-clrs γ s)])
-#;
-(define-metafunction vl
-  redo-clrs : γ s -> s
-  [(redo-clrs γ invalid) invalid]
-  [(redo-clrs • s) s]
-  [(redo-clrs ((n ν) γ) s) 
-   (redo-clrs γ (supdt (n- (n- (slen s) n) (S O)) not s))]
-  ;; --> (slen s) < n
-  ;; but generation doesn't support this fall-through!!
-  [(redo-clrs ((n ν) γ) s)
-   (redo-clrs γ s)])
-
-(define-metafunction vl
-  trim : s s -> s
-  [(trim invalid s) invalid]
-  [(trim s_1 s_2)
-   (sdrp (n- (slen s_1) (slen s_2)) s_1)])
-
-(define-metafunction vl
-  [(sdrp O sl)
-   sl]
-  [(sdrp (S n) (ν sl))
-   (sdrp n sl)]
-  [(sdrp n •)
-   •])
-
-(define-metafunction vl
-  [(valid? invalid) #f]
-  [(valid? sl) #t])
-
-(define-metafunction vl
-  [(arg •)
-   •]
-  [(arg (val τl))
-   (imm (arg τl))]
-  [(arg (ref τl))
-   (box (arg τl))])
-
-
-(provide (all-defined-out))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/generators.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/generators.rkt
deleted file mode 100644
index 5acf428c39..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/generators.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-
-(require (lib "redex/examples/stlc+lists.rkt")
-         (only-in redex/private/generate-term pick-an-index)
-         redex/reduction-semantics
-         racket/bool
-         racket/match)
-
-(provide (all-defined-out))
-
-(module+ adhoc-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'grammar)
-  (define (generate)
-    (generate-term stlc M 5)))
-
-(module+ enum-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'enum)
-  (define (generate [p-value 0.035])
-    (generate-term stlc M #:i-th (pick-an-index p-value))))
-
-(module+ ordered-mod
-  (provide generate get-generator type)
-  (define (get-generator)
-    (let ([index 0])
-      (λ () (begin0
-              (generate index)
-              (set! index (add1 index))))))
-  (define type 'ordered)
-  (define (generate [index 0])
-    (generate-term stlc M #:i-th index)))
-
-(module+ typed-mod
-  (provide generate get-generator type)
-  (define type 'search)
-  (define (get-generator) generate)
-  (define (generate)
-    ((match-lambda [`(typeof • ,M ,τ) M]
-                   [#f #f])
-     (generate-term stlc #:satisfying (typeof • M τ) 5))))
-
-(module+ check-mod
-  (provide check)
-  (define (check term)
-    (or (not term)
-        (v? term)
-        (let ([t-type (type-check term)])
-          (implies
-           t-type
-           (let ([red-res (apply-reduction-relation red term)])
-             (and (= (length red-res) 1)
-                  (let ([red-t (car red-res)])
-                    (or (equal? red-t "error")
-                        (let ([red-type (type-check red-t)])
-                          (equal? t-type red-type)))))))))))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-1.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-1.rkt
deleted file mode 100644
index 7da6152c6f..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-1.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "app rule the range of the function is matched to the argument")
-
-(define-rewrite bug1
-  (typeof Γ M_2 σ)
-  ==> 
-  (typeof Γ M_2 σ_2)
-  #:context (define-judgment-form)
-  #:variables (A)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists.rkt") stlc bug1)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example 
-  (term (hd 0)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-2.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-2.rkt
deleted file mode 100644
index fcb924bfdc..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-2.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "the ((cons v) v) value has been omitted")
-
-(define-rewrite bug2
-  (((cons v) v) . rest)
-  ==>
-  rest
-  #:context (define-language)
-  #:variables (rest))
-
-(include/rewrite (lib "redex/examples/stlc+lists.rkt") stlc bug2)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((cons 0) nil)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-3.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-3.rkt
deleted file mode 100644
index 859e796a34..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-3.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "the order of the types in the function position of application has been swapped")
-
-(define-rewrite bug3
-  (typeof Γ M (σ → σ_2))
-  ==>
-  (typeof Γ M (σ_2 → σ))
-  #:context (define-judgment-form)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists.rkt") stlc bug3)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((λ (x int) cons) cons)))
-
-(test small-counter-example)
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-4.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-4.rkt
deleted file mode 100644
index a78d3ee56d..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-4.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "the type of cons is incorrect")
-
-(define-rewrite bug4
-  (int → ((list int) → (list int)))
-  ==>
-  (int → ((list int) → int))
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists.rkt") stlc bug4)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((+ 1) ((cons 1) nil))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-5.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-5.rkt
deleted file mode 100644
index 29cf809134..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-5.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "the tail reduction returns the wrong value")
-
-(define-rewrite bug5
-  (in-hole E v_2)
-  ==>
-  (in-hole E v_1)
-  #:context (reduction-relation)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists.rkt") stlc bug5)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example  
-  (term (tl ((cons 1) nil))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-6.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-6.rkt
deleted file mode 100644
index 17c40105cb..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-6.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "hd reduction acts on partially applied cons")
-
-(define-rewrite bug6
-  (in-hole E (hd ((cons v_1) v_2)))
-  ==>
-  (in-hole E (hd (cons v_1)))
-  #:context (reduction-relation)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists.rkt") stlc bug6)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term (hd ((cons 1) nil))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-7.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-7.rkt
deleted file mode 100644
index 4636ad6b06..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-7.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "evaluation isn't allowed on the rhs of applications")
-
-(define-rewrite bug7
-  ((E M) 
-   (v E))
-  ==>
-  ((E M))
-  #:context (define-language)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists.rkt") stlc bug7)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((+ 1) ((+ 2) 3))))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-8.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-8.rkt
deleted file mode 100644
index be061efd6b..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-8.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "lookup always returns int")
-
-(define-rewrite bug8
-  [(lookup (x σ Γ) x)
-   σ]
-  ==>
-  [(lookup (x σ Γ) x)
-   int]
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists.rkt") stlc bug8)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((λ (x (list int)) (cons x)) nil)))
-
-(test small-counter-example)
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-9.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-9.rkt
deleted file mode 100644
index d3aff09a4b..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-9.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "variables aren't required to match in lookup")
-
-(define-rewrite bug9
-  (lookup (x σ Γ) x)
-  ==>
-  (lookup (x σ Γ) x_2)
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists.rkt") stlc bug9)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example
-  (term ((λ (x int) (λ (y (list int)) x)) 1)))
-
-(test small-counter-example)
-
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-info.rkt
deleted file mode 100644
index e1f2969004..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide all-mods)
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (make-all-mods here "stlc" (make-path-root 'stlc+lists)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/typed-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/typed-info.rkt
deleted file mode 100644
index 947d05bdaf..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/typed-info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide (all-defined-out))
-
-(define name "stlc")
-(define fname (make-path-root 'stlc+lists))
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (all-mods/type 'typed here name fname))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/util.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/util.rkt
deleted file mode 100644
index 26f59683ab..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/util.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket
-
-(require "../../private/rw-defs.rkt")
-
-(provide bug-mod-rw
-         test)
-
-(define-rewrite bug-mod-rw
-  (lib "redex/examples/stlc+lists.rkt")
-  ==> 
-  (submod ".." stlc)
-  #:context (require))
-
-(define-syntax-rule (test cexp)
-  (module+ test
-    (require (except-in rackunit check)
-             (submod ".." generators check-mod))
-    (check-equal? (check cexp) #f)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/generators.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/generators.rkt
deleted file mode 100644
index a7940ebe14..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/generators.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-
-(require redex/examples/stlc+lists+subst
-         (only-in redex/private/generate-term pick-an-index)
-         redex/reduction-semantics
-         racket/bool
-         racket/match)
-
-(provide (all-defined-out))
-
-(module+ adhoc-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'grammar)
-  (define (generate)
-    (generate-term stlc M 5)))
-
-(module+ enum-mod
-  (provide generate get-generator type)
-  (define (get-generator) generate)
-  (define type 'enum)
-  (define (generate [p-value 0.035])
-    (generate-term stlc M #:i-th (pick-an-index p-value))))
-
-(module+ ordered-mod
-  (provide generate get-generator type)
-  (define (get-generator)
-    (let ([index 0])
-      (λ () (begin0
-              (generate index)
-              (set! index (add1 index))))))
-  (define type 'ordered)
-  (define (generate [index 0])
-    (generate-term stlc M #:i-th index)))
-
-(module+ typed-mod
-  (provide generate get-generator type)
-  (define type 'search)
-  (define (get-generator) generate)
-  (define (generate)
-    ((match-lambda [`(typeof • ,M ,τ) M]
-                   [#f #f])
-     (generate-term stlc #:satisfying (typeof • M τ) 5))))
-
-(module+ check-mod
-  (provide check)
-  (define (check term)
-    (or (not term)
-        (v? term)
-        (let ([t-type (type-check term)])
-          (implies
-           t-type
-           (let ([red-res (apply-reduction-relation red term)])
-             (and (= (length red-res) 1)
-                  (let ([red-t (car red-res)])
-                    (or (equal? red-t "error")
-                        (let ([red-type (type-check red-t)])
-                          (equal? t-type red-type)))))))))))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-1.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-1.rkt
deleted file mode 100644
index 8b027c8fd2..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-1.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "forgot the variable case")
-
-(define-rewrite bug1
-  ([(subst x x M_x)
-    M_x]
-   . rest)
-  ==> 
-  rest
-  #:context (define-metafunction)
-  #:variables (rest)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists+subst.rkt") stlc-sub bug1)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw subst-check-rw)
-
-(define small-counter-example 
-  (term ((λ (x int) x) 1)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-2.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-2.rkt
deleted file mode 100644
index 79b2e660b7..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-2.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "wrong order of arguments to replace call")
-
-(define-rewrite bug2
-  (λ (x_new τ) (subst (replace M y x_new) x M_x))
-  ==> 
-  (λ (x_new τ) (subst (replace M x_new y) x M_x))
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists+subst.rkt") stlc-sub bug2)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw subst-check-rw)
-
-(define small-counter-example 
-  (term ((λ (x int) (λ (y int) y)) 1)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-3.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-3.rkt
deleted file mode 100644
index 069eb9c472..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-3.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "swaps function and argument position in application")
-
-(define-rewrite bug3
-  ((subst M x M_x) (subst N x M_x))
-  ==> 
-  ((subst N x M_x) (subst M x M_x))
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists+subst.rkt") stlc-sub bug3)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw subst-check-rw)
-
-(define small-counter-example 
-  (term ((λ (x int) (+ 1)) 1)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-4.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-4.rkt
deleted file mode 100644
index 8b668c3a7d..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-4.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "variable not fresh enough")
-
-(define-rewrite bug4
-  (where x_new ,(variable-not-in (term (x y M))
-                                 (term y)))
-  ==> 
-  (where x_new ,(variable-not-in (term M)
-                                 (term y)))
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists+subst.rkt") stlc-sub bug4)
-
-
-(include/rewrite "generators.rkt" generators bug-mod-rw subst-check-rw)
-
-(define small-counter-example 
-  (term ((λ (z int) (((λ (y1 int) (λ (y int) y)) z) 1)) 0)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-5.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-5.rkt
deleted file mode 100644
index c646411b67..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-5.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "replace all variables")
-
-(define-rewrite bug5
-  (subst x x M_x)
-  ==> 
-  (subst x y M_x)
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists+subst.rkt") stlc-sub bug5)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw subst-check-rw)
-
-(define small-counter-example 
-  (term ((λ (x int) (λ (y (list int)) (hd y))) 1)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-6.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-6.rkt
deleted file mode 100644
index b6e64a4166..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-6.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "forgot the variable case")
-
-(define-rewrite bug1
-  ([(subst x x M_x)
-    M_x]
-   . rest)
-  ==> 
-  rest
-  #:context (define-metafunction)
-  #:variables (rest)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists+subst.rkt") stlc-sub bug1)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example 
-  (term ((λ (x int) x) 1)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-7.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-7.rkt
deleted file mode 100644
index b1716a36fe..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-7.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "wrong order of arguments to replace call")
-
-(define-rewrite bug2
-  (λ (x_new τ) (subst (replace M y x_new) x M_x))
-  ==> 
-  (λ (x_new τ) (subst (replace M x_new y) x M_x))
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists+subst.rkt") stlc-sub bug2)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example 
-  (term ((λ (x int) (λ (y int) y)) 1)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-8.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-8.rkt
deleted file mode 100644
index 90755215ff..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-8.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "swaps function and argument position in application")
-
-(define-rewrite bug3
-  ((subst M x M_x) (subst N x M_x))
-  ==> 
-  ((subst N x M_x) (subst M x M_x))
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists+subst.rkt") stlc-sub bug3)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example 
-  (term ((λ (x int) (+ 1)) 1)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-9.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-9.rkt
deleted file mode 100644
index 332016e36e..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-9.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require redex/benchmark
-         "util.rkt"
-         redex/reduction-semantics)
-(provide (all-defined-out))
-
-(define the-error "replace all variables")
-
-(define-rewrite bug5
-  (subst x x M_x)
-  ==> 
-  (subst x y M_x)
-  #:context (define-metafunction)
-  #:once-only)
-
-(include/rewrite (lib "redex/examples/stlc+lists+subst.rkt") stlc-sub bug5)
-
-(include/rewrite "generators.rkt" generators bug-mod-rw)
-
-(define small-counter-example 
-  (term ((λ (x int) (λ (y (list int)) (hd y))) 1)))
-
-(test small-counter-example)
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-info.rkt
deleted file mode 100644
index fb956fb2be..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/stlc-sub-info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide all-mods)
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (make-all-mods here "stlc-sub" (make-path-root 'stlc-subst)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/typed-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/typed-info.rkt
deleted file mode 100644
index bfa70a40f0..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/typed-info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         "../util/info-util.rkt")
-
-(provide (all-defined-out))
-
-(define name "stlc-sub")
-(define fname (make-path-root 'stlc-subst))
-
-(define-runtime-path here ".")
-
-(define (all-mods)
-  (all-mods/type 'typed here name fname))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/util.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/util.rkt
deleted file mode 100644
index 7e520d32a8..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/util.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket
-
-(require redex/benchmark)
-
-(provide bug-mod-rw
-         subst-check-rw
-         test)
-
-(define-rewrite bug-mod-rw
-  redex/examples/stlc+lists+subst
-  ==> 
-  (submod ".." stlc-sub)
-  #:context (require))
-
-(define-rewrite subst-check-rw
-  (define (check term) . rest)
-  ==>
-  (define (check term)
-    (subst-check term))
-  #:variables (rest term)
-  #:once-only)
-
-(define-syntax-rule (test cexp)
-  (module+ test
-    (require (except-in rackunit check)
-             (submod ".." generators check-mod))
-    (check-equal? (check cexp) #f)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/type-all-info.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/type-all-info.rkt
deleted file mode 100644
index e6aa0e20a5..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/type-all-info.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-
-(require racket/runtime-path
-         racket/list
-         racket/path)
-
-(provide all-mods)
-
-(define-runtime-path here ".")
-
-(define (all-info-files)
-  (for/list ([f (in-directory here)]
-             #:when (and (file-exists? f)
-                         (regexp-match #rx"^.*typed-info\\.rkt$"
-                                       (path->string f)))
-             #:unless (regexp-match #rx".*all-info.*"
-                                    (path->string f)))
-    (path->string 
-     (find-relative-path (simplify-path (current-directory))
-                         (simplify-path f)))))
-
-(define (all-mods)
-  (append-map (λ (f)
-                ((dynamic-require f 'all-mods)))
-              (all-info-files)))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/util/info-util.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/util/info-util.rkt
deleted file mode 100644
index d72a85cca5..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/models/util/info-util.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-
-(require racket/path
-         racket/list
-         racket/runtime-path)
-
-(provide make-all-mods
-         make-path-root
-         all-mods/type)
-
-(define-runtime-path here ".")
-
-(define types '(grammar enum ordered))
-
-(define type->genmod
-  (hash 'grammar 'adhoc-mod
-        'enum 'enum-mod
-        'ordered 'ordered-mod
-        'typed 'typed-mod))
-
-(define (get-name/modpaths filename type path-root)
-  (define model-name (first (regexp-split #rx"\\." (last (regexp-split #rx"/" filename)))))
-  (define mod-path (string->symbol
-                    (string-append
-                     (symbol->string path-root)
-                     "/"
-                     model-name)))
-  (list (first (regexp-split #rx"\\." (last (regexp-split #rx"/" filename))))
-        `(submod ,mod-path generators ,(hash-ref type->genmod type))
-        `(submod ,mod-path generators check-mod)))
-
-(define (all-mods/type type the-dir name-base path-root)
-  (for/list ([f (in-directory the-dir)]
-             #:when (regexp-match (regexp (string-append name-base "-[0-9]+\\.rkt$")) 
-                                  (path->string f)))
-    (get-name/modpaths f type path-root)))
-
-(define (make-all-mods the-dir name-base path-root)
-  (apply append
-         (for/list ([t (in-list types)])
-           (all-mods/type t the-dir name-base path-root))))
-
-(define (make-path-root model-dir)
-  (string->symbol
-   (string-append
-    "redex/benchmark/models/"
-    (symbol->string model-dir))))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/gen-run.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/gen-run.rkt
deleted file mode 100644
index cebcf7dffd..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/gen-run.rkt
+++ /dev/null
@@ -1,159 +0,0 @@
-#lang racket/base
-
-(require "logging.rkt"
-         racket/match
-         racket/contract
-         math/statistics)
-
-(provide
- (struct-out run-results))
-
-(struct timeout ())
-(struct reached-limit (tries) #:transparent)
-(struct run-results (tries time cexps) #:transparent)
-
-(provide/contract 
- [run-gen-and-check/mods
-  (->* (module-path?
-        module-path?
-        natural-number/c)
-       (#:name string?)
-       run-results?)]
- [run-gen-and-check
-  (->* ((-> (-> any/c))
-        (-> any/c boolean?)
-        natural-number/c)
-       (#:name string?
-        #:type symbol?)
-       run-results?)])
-
-(define (run-gen-and-check/mods gen-mod-path check-mod-path seconds #:name [name "unknown"])
-  (define get-gen (dynamic-require gen-mod-path 'get-generator))
-  (define type (dynamic-require gen-mod-path 'type))
-  (define check (dynamic-require check-mod-path 'check))
-  (run-gen-and-check get-gen check seconds #:name name #:type type))
-
-(define (run-gen-and-check get-gen check seconds
-                           #:name [name "unknown"]
-                           #:type [type 'unknown])
-  (log-start name type)
-  (with-heartbeat #:name name #:type type
-                  (λ () (run-generations get-gen check seconds
-                                         #:name name
-                                         #:type type))))
-
-(define (run-generations get-gen check seconds
-                  #:name [name "unknown"]
-                  #:type [type 'unknown] 
-                  #:first-only [first-only #f])
-  (collect-garbage)
-  (define s-time (current-process-milliseconds))
-  (define time-limit (+ s-time (* 1000 seconds)))
-  (define counterexamples 0)
-  (define (tot-time) (- (current-process-milliseconds) s-time))
-  (let trials-loop ([t 0]
-                    [g (get-gen)]
-                    [stats empty-statistics]
-                    [terms 0])
-    (define trial-start-time (current-process-milliseconds))
-    (define (me-time) (- (current-process-milliseconds) trial-start-time))
-    (match (one-counterexample trial-start-time time-limit 
-                               g check name type)
-      [(timeout)
-       (trials-loop t g stats terms)]
-      [(reached-limit tries)
-       (exit-message name type (+ tries terms) (tot-time) counterexamples)
-       (run-results (+ tries terms) (tot-time) counterexamples)]
-      [(list tries term)
-       (define new-stats (update-statistics stats (me-time)))
-       (set! counterexamples (add1 counterexamples))
-       (log-counterexample name type term tries (me-time))
-       (if (and (not first-only)
-                (or (continue? new-stats (add1 t) name type)
-                    (t . < . 5)))
-           (trials-loop (add1 t) (get-gen) new-stats (+ tries terms))
-           (begin
-             (exit-message name type (+ tries terms) (tot-time) counterexamples)
-             (run-results (+ tries terms) (tot-time) counterexamples)))])))
-
-(define TIMEOUT-DEFAULT (* 5 60 1000)) ;; 5 mins in ms
-
-(define (one-counterexample s-time time-limit generator check fname type [timeout-time TIMEOUT-DEFAULT])
-  (let/ec break
-    (let loop ([tries 0])
-      (when ((current-process-milliseconds) . > . time-limit)
-        (break (reached-limit tries))) 
-      (define term (with-timeout timeout-time generator
-                                 (λ () 
-                                   (log-gen-timeout fname type)
-                                   (break (timeout)))))
-      (define ok? (with-timeout timeout-time (λ () (check term))
-                                (λ () 
-                                  (log-check-timeout fname type term)
-                                  (break (timeout)))
-                                (λ (exn)
-                                  (print-and-log (format "\nException when calling check with: ~a" term))
-                                  (raise exn))))
-      (cond
-        [(not ok?)
-         (list tries term)]
-        [else
-         (loop (add1 tries))]))))
-
-(define (with-timeout time thunk fail-thunk [on-exn raise])
-  (define res-chan (make-channel))
-  (define exn-chan (make-channel))
-  (define thd (thread (λ () 
-                        (with-handlers ([exn:fail? (λ (exn) (channel-put exn-chan exn))])
-                          (channel-put res-chan (thunk))))))
-  (sync
-   (handle-evt (alarm-evt (+ (current-inexact-milliseconds) time))
-               (λ (_) 
-                 (break-thread thd)
-                 (fail-thunk)))
-   (handle-evt exn-chan
-               (λ (exn) (on-exn exn)))
-   (handle-evt res-chan
-               (λ (result-of-thunk) result-of-thunk))))
-
-(define (print-and-log str)
-  (displayln str)
-  (bmark-log 'print str))
-
-(define (with-heartbeat thunk 
-                        #:time [time 10]
-                        #:type [type #f]
-                        #:name [name #f])
-  (define res-chan (make-channel))
-  (define exn-chan (make-channel))
-  (define thd (thread (λ () 
-                        (with-handlers ([exn:fail? (λ (exn) (channel-put exn-chan exn))])
-                          (channel-put res-chan (thunk))))))
-  (define heartbeat-thd
-    (thread (λ () 
-              (let loop () 
-                (log-heartbeat name type) 
-                (sleep time)
-                (loop)))))
-  (sync
-   (handle-evt res-chan
-               (λ (res) 
-                 (kill-thread heartbeat-thd)
-                 res))
-   (handle-evt exn-chan
-               (λ (e)
-                 (raise e)))
-   (handle-evt heartbeat-thd
-               (λ (_) (error 'with-hearbeat "heartbeat thread ended")))))
-
-(define (exit-message file type terms time countxmps)
-  (log-finished file type time terms countxmps))
-
-
-(define (continue? new-stats num-results name type)
-  (define avg (statistics-mean new-stats))
-  (define dev (/ (statistics-stddev new-stats #:bias #t) (sqrt num-results)))
-  (log-new-avg name type (exact->inexact avg) dev)
-  (or (= dev 0)
-      ((/ dev avg) . > . 0.1)))
-  
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/graph-data.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/graph-data.rkt
deleted file mode 100644
index 3da9309f5c..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/graph-data.rkt
+++ /dev/null
@@ -1,285 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         racket/match
-         racket/function
-         math/statistics
-         math/distributions
-         plot/no-gui
-         (only-in plot/utils known-point-symbols)
-         "logging.rkt")
-
-(provide type-colors
-         type-names
-         type-symbols
-         extract-data/log-directory
-         extract-log-data
-         plot/log-directory
-         extract-log-names
-         extract-names/log-directory
-         process-data
-         
-         ;; hacky function exported only so that
-         ;; processing of the data can occur as a separate,
-         ;; run only once step
-         make-plot/data-stats/name-avgs)
-
-(define type-colors
-  (make-parameter (let ([cur-c 0]
-                        [cur-tcs (make-hash)])
-                    (λ (type)
-                      (hash-ref! cur-tcs type
-                                 (begin0
-                                   cur-c
-                                   (set! cur-c (add1 cur-c))))))))
-
-(define type-symbols
-  (make-parameter (let ([syms (drop known-point-symbols 3)]
-                        [cur-tss (make-hash)])
-                    (λ (type)
-                      (hash-ref! cur-tss type
-                                 (if (empty? syms)
-                                     (error 'type-symbols "no more symbols available!")
-                                     (begin0 (car syms)
-                                             (set! syms (cdr syms)))))))))
-
-(define type-names (make-parameter symbol->string))
-
-(define (plot/log-directory path)
-  (make-plot
-   (extract-data/log-directory path)
-   (extract-names/log-directory path)))
-
-(define (plot/log-data data)
-  (make-plot
-   (extract-log-data data)
-   (extract-log-names data)))
-
-(define (extract-log-data ld-list)
-  (for/list ([d (in-list (filter
-                          (make-event-filter 'counterexample)
-                          ld-list))])
-    (list ((datum-selector '#:model) d)
-          ((datum-selector '#:type) d)
-          ((datum-selector '#:time) d))))
-
-(define (extract-data/log-directory dir-path)
-  (append-map
-   extract-log-data
-   (map read-logfile 
-        (filter
-         file-exists?
-         (directory-list dir-path
-                         #:build? dir-path)))))
-
-(define (extract-log-names ld-list)
-  (remove-duplicates
-   (map ((curry datum-selector) '#:model)
-        (filter (make-event-filter 'finished) ld-list))))
-
-(define (extract-names/log-directory dir-path)
-  (remove-duplicates
-   (append-map
-    extract-log-names
-    (map read-logfile 
-         (filter
-          file-exists?
-          (directory-list dir-path
-                          #:build? dir-path))))))
-
-(define (make-plot data all-names)
-  (define-values (data-stats name-avgs)
-    (process-data data all-names))
-  (define max-non-f-value-from-list-ref-d2
-    (apply max (filter values (map (λ (d) (list-ref d 2)) data))))
-  (make-plot/data-stats/name-avgs data-stats 
-                                  name-avgs 
-                                  all-names
-                                  max-non-f-value-from-list-ref-d2
-                                  #f))
-
-(define (make-plot/data-stats/name-avgs data-stats name-avgs all-names
-                                        max-non-f-value-from-list-ref-d2
-                                        include-only-models-with-data?)
-  (define name-order (make-name-order name-avgs))
-  (define (tlabel pre-tick)
-    (define v (pre-tick-value pre-tick))
-    (define label-list
-      (filter
-       (λ (n) (= (name-order n) v))
-       (hash-keys name-avgs)))
-    (if (empty? label-list) 
-        ""
-        (car label-list)))
-  (parameterize ([plot-x-tick-label-angle 75]
-                 [plot-x-tick-label-anchor 'right]
-                 [error-bar-width 12]
-                 [plot-y-transform (axis-transform-bound log-transform 0.00001 +inf.0)]
-                 [plot-legend-anchor 'top-left]
-                 [plot-x-ticks (ticks (linear-ticks-layout #:number 30 #:base 10
-                                              #:divisors '(1))
-                         (λ (_1 _2 pts) (map tlabel pts)))]
-                 [plot-y-ticks (log-ticks #:number 20 #:base 10)])
-    (plot-pict
-     (make-plot-renderers/internal data-stats name-avgs)
-     #:x-min 0
-     #:y-min 0.01
-     #:y-max (* 10 (/ max-non-f-value-from-list-ref-d2 1000))
-     #:x-max (+ 0.5 
-                (if include-only-models-with-data?
-                    (for/sum ([(k val) (in-hash name-avgs)])
-                      (if (null? val)
-                          0
-                          1))
-                    (length all-names))))))
-
-(define (make-plot-renderers data all-names)
-  (define-values (data-stats name-avgs)
-    (process-data data all-names))
-  (make-plot-renderers/internal data-stats name-avgs))
-
-(define (make-plot-renderers/internal data-stats name-avgs)
-  
-  (define types (remove-duplicates
-                 (map second data-stats)))
-  
-  (define name-order (make-name-order name-avgs))
-  
-  (define (plot-type type n)
-    (define this-type
-      (map (λ (d)
-             (define name (rewrite-name (last (regexp-split #rx"/" (car d)))))
-             (cons name (cdr d)))
-           (filter
-            (λ (l)
-              (and (equal? type (list-ref l 1))
-                   (list-ref l 2)))
-            data-stats)))
-    (define ps
-      (points
-       (map
-        (λ (l)
-          (list (name-order (list-ref l 0)) (list-ref l 2)))
-        this-type)
-       #:label (string-append ((type-names) type)
-                              (format " (~s successes)" (length this-type)))
-       #:sym ((type-symbols) type)
-       #:size (* (point-size) 1.5)
-       #:color ((type-colors) type)))
-    (if (equal? type 'ordered)
-        ps
-        (list (error-bars
-               (map (λ (d)
-                      (list (name-order (list-ref d 0)) 
-                            (list-ref d 2)
-                            (list-ref d 3)))
-                    this-type)
-               #:y-min 0.01
-               #:color "dark gray")
-              ps)))
-  
-  (for/list ([t (in-list types)]
-             [n (in-naturals)])
-    (plot-type t n)))
-
-
-(define (process-data data all-names)
-  (define name-avgs (make-hash))
-  (for ([b (in-list all-names)])
-    (hash-set! name-avgs (rewrite-name b) '()))
-  (define d-stats
-    (let loop ([d data]
-               [sorted-times (hash)])
-      (match d
-        [(cons (list name type time) rest)
-         (loop rest
-               (hash-set sorted-times (cons name type)
-                         (cons (/ time 1000)
-                               (hash-ref sorted-times (cons name type)
-                                         (λ () '())))))]
-        ['()
-         (for/list ([(name/type times) (in-hash sorted-times)]
-                    #:unless (and ((length times) . < . Min-Trials)
-                                  (not (equal? (cdr name/type) 'ordered))))
-           (define name (rewrite-name (last (regexp-split #rx"/" (car name/type)))))
-           (hash-set! name-avgs 
-                      name
-                      (cons (mean times) (hash-ref name-avgs name '()))) 
-           (list (car name/type)
-                 (cdr name/type)
-                 (mean times)
-                 (if (equal? (cdr name/type) 'ordered)
-                     0
-                     (error-bar times))))])))
-  (values d-stats
-          name-avgs))
-
-(define (make-name-order name-avgs)
-    (let ([memo (make-hash)])
-      (λ (name)
-        (hash-ref memo name
-                  (λ ()
-                    (define ans
-                      (length
-                       (or
-                        (memf
-                         (λ (n) (equal? n name))
-                         (sort (sort (hash-keys name-avgs)
-                                     string>?)
-                               >
-                               #:key (λ (k)
-                                       (define val (hash-ref name-avgs k))
-                                       (cond 
-                                         [(number? val) val]
-                                         [(empty? val) +inf.0]
-                                         [else (mean val)]))))
-                        '())))
-                    (hash-set! memo name ans)
-                    ans)))))
-
-(define (rewrite-name n)
-  (regexp-replace #rx"verification-" n "rvm-"))
-
-(define Min-Trials 2)
-
-(define (error-bar times)
-  (define sdev (stddev times #:bias #t))
-  (define this-z (if (> (length times) 30)
-                     z
-                     (hash-ref t-inv-cdf-97.5 (sub1 (length times)))))
-  (/ (* this-z sdev) (sqrt (length times))))
-
-(define z (inv-cdf (normal-dist) 0.975))
-
-(define t-inv-cdf-97.5
-  (hash 1 12.706
-        2 4.303
-        3 3.182
-        4 2.776
-        5 2.571
-        6 2.447
-        7 2.365
-        8 2.306
-        9 2.262
-        10 2.228
-        11 2.201
-        12 2.129
-        13 2.160
-        14 2.145
-        15 2.131
-        16 2.120
-        17 2.110
-        18 2.101
-        19 2.093
-        20 2.086
-        21 2.080
-        22 2.074
-        23 2.069
-        24 2.064
-        25 2.060
-        26 2.056
-        27 2.052
-        28 2.048
-        29 2.045
-        30 2.042))
-
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/logging.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/logging.rkt
deleted file mode 100644
index c127643176..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/logging.rkt
+++ /dev/null
@@ -1,168 +0,0 @@
-#lang racket/base
-
-(require racket/date
-         racket/match
-         racket/function)
-
-(provide benchmark-logging-to
-         log-counterexample
-         log-new-avg
-         log-gen-timeout
-         log-check-timeout
-         log-start
-         log-finished
-         log-heartbeat
-         timestamp
-         bmark-log
-         bmark-log-directory
-         read-logfile
-         make-event-filter
-         datum-selector)
-
-(struct bmark-log-data (data))
-(struct bmark-log-end ())
-(struct gc-info (major? pre-amount pre-admin-amount code-amount
-                        post-amount post-admin-amount
-                        start-process-time end-process-time
-                        start-time end-time)
-  #:prefab)
-
-(define bmark-log-directory (make-parameter #f))
-
-(define (benchmark-logging-to filename thunk)
-  (define bmark-log-recv
-    (make-log-receiver (current-logger) 'debug))
-  (define handler (log-handler filename))
-  (define res-chan (make-channel))
-  (define exn-chan (make-channel))
-  (define body-thd
-    (thread (λ () 
-              (with-handlers ([exn:fail? (λ (exn) (channel-put exn-chan exn))])
-                (channel-put res-chan (thunk))))))
-  (define result (void))
-  (let loop ()
-    (sync
-     (handle-evt exn-chan
-                 (λ (exn) (raise exn)))
-     (handle-evt res-chan
-                 (λ (result-of-thunk)
-                   (set! result result-of-thunk)
-                   (log-message (current-logger) 'info "STOP" (bmark-log-end))
-                   (loop)))
-     (handle-evt bmark-log-recv 
-                 (λ (log-evt)
-                   (define data (vector-ref log-evt 2))
-                   (match data
-                     [(? gc-info? d)
-                      (handle-gc-log-evt d)
-                      (loop)]
-                     [(bmark-log-end)
-                      result]
-                     [else
-                      (handler data)
-                      (loop)]))))))
-
-(define (log-handler filename)
-  (λ (data)
-    (match data
-      [(bmark-log-data data)
-       (define fpath (if (bmark-log-directory)
-                         (path->string
-                          (build-path (bmark-log-directory) 
-                                      (string->path filename)))
-                         filename))
-       (call-with-output-file fpath
-         (λ (log-port)
-           (write data log-port)
-           (newline log-port))
-         #:exists 'append)]
-      [_ (void)])))
-
-(define (handle-gc-log-evt gci)
-  (when (gc-info-major? gci)
-    (bmark-log 'gc-major
-               `(#:amount ,(- (gc-info-pre-amount gci) (gc-info-post-amount gci))
-                 #:time ,(- (gc-info-end-process-time gci) (gc-info-start-process-time gci))))))
-
-(define (log-counterexample model gen cexp tries time)
-  (bmark-log 'counterexample
-             `(#:model ,model
-               #:type ,gen
-               #:counterexample ,cexp
-               #:iterations ,tries
-               #:time ,time)))
-
-(define (log-new-avg model gen avg err)
-  (bmark-log 'new-average
-             `(#:model ,model
-               #:type ,gen
-               #:average ,avg
-               #:stderr ,err)))
-
-(define (log-gen-timeout model gen)
-  (bmark-log 'timeout
-             `(#:during 'generation
-               #:model ,model
-               #:type ,gen)))
-
-(define (log-check-timeout model gen term)
-  (bmark-log 'timeout
-             `(#:during 'check
-               #:term ,term
-               #:model ,model
-               #:type ,gen)))
-
-(define (log-start model gen)
-  (bmark-log 'start
-             `(#:model ,model
-               #:type ,gen)))
-
-(define (log-finished model gen time tries countxmps)
-  (bmark-log 'finished
-             `(#:model ,model
-               #:type ,gen
-               #:time-ms ,time
-               #:attempts ,tries
-               #:num-counterexamples ,countxmps
-               #:rate-terms/s ,(exact->inexact (/ tries (/ time 1000)))
-               #:attempts/cexp ,(if (zero? countxmps)
-                                                'N/A
-                                                (exact->inexact (/ tries countxmps))))))
-
-(define (log-heartbeat model gen)
-  (bmark-log 'heartbeat
-             `(#:model ,model
-               #:type ,gen)))
-
-(define path-format (compose string->symbol path->string))
-
-(define (bmark-log event data)
-  (log-message (current-logger) 'info "BENCHMARK-LOGGING" 
-               (bmark-log-data `(,event ,(timestamp) ,data))))
-            
-
-(define (timestamp)
-  (parameterize ([date-display-format 'iso-8601])
-    (string->symbol (date->string (current-date) #t))))
-
-(define (read-logfile logfile)
-  (call-with-input-file logfile
-    (λ (in)
-      (reverse
-       (let loop ([log '()])
-         (define next (read in))
-         (if (eof-object? next)
-             log
-             (loop (cons next log))))))))
-
-(define (make-event-filter event)
-  (λ (ld)
-    (match ld
-      [(list (? ((curry eq?) event)) time data) #t]
-      [_ #f])))
-
-(define (datum-selector kw)
-  (λ (ld)
-    (match ld
-      [(list event time (list head ... (? ((curry eq?) kw)) datum rest ...))
-       datum])))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/plot-lines.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/plot-lines.rkt
deleted file mode 100644
index d49474ddfe..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/plot-lines.rkt
+++ /dev/null
@@ -1,136 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         plot/no-gui
-         "graph-data.rkt")
-
-(provide line-plot
-         line-plot-renderer/log-directory
-         line-plot-renderer)
-
-(define (line-plot dir [output #f])
-  (parameterize ([plot-x-transform log-transform]
-                 [plot-x-label "Time in Seconds"]
-                 [plot-y-label "Number of Bugs Found"]
-                 [plot-width 600] 
-                 [plot-height 300]
-                 [plot-x-ticks (log-ticks #:number 20 #:base 10)])
-    (if output
-        (plot-file (line-plot-renderer/log-directory dir)
-                   output
-                   #:x-min 0.05)
-        (plot-pict (line-plot-renderer/log-directory dir)
-                   #:x-min 0.05))))
-
-(define (line-plot-renderer/log-directory dir)
-  (define-values (data _)
-    (process-data (extract-data/log-directory dir)
-                  (extract-names/log-directory dir)))
-  (make-renderers data))
-
-(define (line-plot-renderer log-data)
-  (define-values (data _)
-    (process-data (extract-log-data log-data)
-                  (extract-log-names log-data)))
-  (make-renderers data))
-                    
-(define line-styles
-  (list 'solid 'dot 'long-dash
-        'short-dash 'dot-dash))
-
-(define (make-renderers stats)
-  (define max-t (apply max (map third stats)))
-  
-  ;; (listof (list/c type data))
-  (define types+datas
-    (for/list ([(type avgs) (in-hash (sort-stats stats))]
-               [n (in-naturals)])
-      (define pts 
-        (for/fold ([l '()]) 
-          ([a (sort avgs <)]
-           [c (in-naturals)])
-          (cons (list a (add1 c))
-                (cons 
-                 (list a c) 
-                 l))))
-      (list type (reverse (cons (list max-t (/ (length pts) 2)) pts)))))
-  
-  (unless (= 3 (length types+datas)) 
-    (error 'plot-lines.rkt "ack: assuming that there are only three competitors"))
-  (define-values (_ crossover-points)
-    (for/fold ([last-winner #f]
-               [crossover-points '()])
-      ([grammar-pr (in-list (list-ref (assoc 'grammar types+datas) 1))]
-       [enum-pr (in-list (list-ref (assoc 'enum types+datas) 1))]
-       [ordered-pr (in-list (list-ref (assoc 'ordered types+datas) 1))])
-      (unless (and (= (list-ref grammar-pr 1)
-                      (list-ref enum-pr 1))
-                   (= (list-ref grammar-pr 1)
-                      (list-ref ordered-pr 1)))
-        (error 'plot-lines.rkt "ack: expected points to match up ~s ~s ~s"
-               grammar-pr
-               enum-pr
-               ordered-pr))
-      (define y-position (list-ref grammar-pr 1))
-      (define grammar-time (list-ref grammar-pr 0))
-      (define enum-time (list-ref enum-pr 0))
-      (define ordered-time (list-ref ordered-pr 0))
-      (define best (min grammar-time enum-time ordered-time))
-      (define current-winner
-        (cond
-          [(= grammar-time best) 'grammar]
-          [(= ordered-time best) 'ordered]
-          [(= enum-time best) 'enum]))
-      (values current-winner
-              (cond
-                [(and last-winner (not (equal? last-winner current-winner)))
-                 (cons (point-label (vector best y-position)
-                                    (format "~a, ~a"
-                                            (number+unit/s y-position "bug")
-                                            (format-time best))
-                                    #:anchor 'bottom-right)
-                       crossover-points)]
-                [else
-                 crossover-points]))))
-  (append 
-   crossover-points
-   (for/list ([type+pts (in-list types+datas)]
-              [n (in-naturals)])
-     (define type (list-ref type+pts 0))
-     (define pts (list-ref type+pts 1))
-     (lines
-      (reverse pts)
-      ;#:width 2
-      #:color ((type-colors) type)
-      #:style (list-ref line-styles n)
-      #:label ((type-names) type)))))
-
-(define (format-time number)
-  (cond
-    [(<= number 60) (number+unit/s number "second")]
-    [(<= number (* 60 60)) (number+unit/s (/ number 60) "minute")]
-    [(<= number (* 60 60 24)) (number+unit/s (/ number 60 60) "hour")]
-    [else (number+unit/s (/ number 60 60 24) "day")]))
-
-(define (number+unit/s raw-n unit) 
-  (define n (round raw-n))
-  (format "~a ~a~a" n unit (if (= n 1) "" "s")))
-
-(module+ test
-  (require rackunit)
-  (check-equal? (format-time 0) "0 seconds")
-  (check-equal? (format-time 1) "1 second")
-  (check-equal? (format-time 59) "59 seconds")
-  (check-equal? (format-time 70) "1 minute")
-  (check-equal? (format-time 110) "2 minutes")
-  (check-equal? (format-time (* 60 60 2)) "2 hours")
-  (check-equal? (format-time (* 60 60 #e2.2)) "2 hours")
-  (check-equal? (format-time (* 60 60 #e8.2)) "8 hours")
-  (check-equal? (format-time (* 60 60 24 3)) "3 days"))
-
-(define (sort-stats stats)
-  (for/fold ([h (hash)])
-    ([s (in-list stats)])
-    (hash-set h (second s)
-              (cons (third s)
-                    (hash-ref h (second s) '())))))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/rewrite.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/rewrite.rkt
deleted file mode 100644
index 20d40fa720..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/rewrite.rkt
+++ /dev/null
@@ -1,233 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     racket/syntax
-                     racket/list
-                     (only-in syntax/path-spec resolve-path-spec))
-         (for-template racket/base))
-
-(provide rewriter/ids
-         (for-syntax apply-to syntax-ids))
-
-(define-syntax (rewriter stx)
-  (syntax-case stx ()
-    [(_ from to vars contexts once? exactly-once?)
-     (with-syntax ([ids (syntax-ids #'from (syntax->list #'vars))])
-       #'(rewriter/ids from to ids contexts once? exactly-once?))]))
-
-(define-syntax (rewriter/ids stx)
-  (syntax-case stx ()
-    [(_ from to ids contexts once? exactly-once?)
-     (with-syntax* ([to-rw-id #'to-rw]
-                    [body-rw-stx (contextual-rewrite-stx #'from #'to #'ids #'contexts #'once? #'exactly-once?)]
-                    [module-body-rw (module-body-context-rw-stx #'to-rw-id #'body-rw-stx)])
-       #'(λ (stx)
-           (syntax-case stx ()
-             [(_ to-rw)
-              (let ([to-rw-id #'to-rw])
-                module-body-rw)])))]))
-
-(define-for-syntax (contextual-rewrite-stx from to ids contexts once? exactly-once?)
-  (with-syntax* ([(ctx ...) contexts]
-                 [rewrite-here #'rewrite-here]
-                 [(loop-id ...) (generate-temporaries contexts)]
-                 [(all-loops ...) (append (syntax->list #'(loop-id ...)) (list #'rewrite-here))]
-                 [first-loop-id (car (syntax->list #'(all-loops ...)))]
-                 [(next ...) (cdr (syntax->list #'(all-loops ...)))])
-    #`(λ (stx)
-        (define applied? #f)
-        (define (loop-id stx)
-          (syntax-case stx (ctx)
-            [(ctx rest (... ...))
-             (with-syntax ([(-rest (... ...)) (next #'(rest (... ...)))])
-               #'(ctx -rest (... ...)))]
-            [(a . b)
-             (with-syntax ([-a (loop-id #'a)]
-                           [-b (loop-id #'b)])
-               #'(-a . -b))]
-            [_ stx])) ...
-        (define (rewrite-here stx)
-          (syntax-case stx #,ids
-            [#,from
-             (begin
-               (when (or #,once? #,exactly-once?)
-                 (when applied? 
-                   (raise-syntax-error 'rewrite (format "~a ==> ~a applied a second time"
-                                                         '#,from
-                                                         '#,to)
-                                       stx))
-                 (set! applied? #t))
-               #'#,to)]
-            [(a . b)
-             (with-syntax ([-a (rewrite-here #'a)]
-                           [-b (rewrite-here #'b)])
-               #'(-a . -b))]
-            [_
-             stx]))
-        (begin0 (first-loop-id stx)
-                (when (and #,exactly-once? (not applied?))
-                  (raise-syntax-error 'rewrite (format "~a ==> ~a was never applied"
-                                                         '#,from
-                                                         '#,to)
-                                       stx))))))
-
-(define-for-syntax (syntax-ids stx vars)
-  (syntax-case stx (...)
-    [(a . b)
-     (append (syntax-ids #'a vars) (syntax-ids #'b vars))]
-    [(... ...)
-     '()]
-    [()
-     '()]
-    [id
-     (identifier? #'id)
-     (if (findf (λ (v) (free-identifier=? #'id v)) vars)
-         '()
-         (list #'id))]
-    [_
-     '()]))
-
-(define-syntax (relative-path-rewriter-stx stx)
-  (syntax-case stx ()
-    [(_ mod-directory-path)
-     (with-syntax* ([body-rw-stx (rel-path-body-rw-stx #'mod-directory-path)]
-                    [full-stx-id #'full-stx]
-                    [module-rw-stx (module-body-context-rw-stx #'full-stx-id #'body-rw-stx)])
-       #`(λ (stx)
-           (syntax-case stx ()
-             [(_ full-stx)
-              (let ([full-stx-id #'full-stx])
-                module-rw-stx)])))]))
-
-(define-for-syntax (rel-path-body-rw-stx mod-directory-path)
-  #`(λ (stx)
-      (let loop ([stx stx]
-                 [in-require? #f])
-        (syntax-case stx (require lib planet submod)
-          [(require rqs (... ...))
-           (with-syntax ([rqs-rw (loop #'(rqs (... ...)) #t)])
-             #'(require . rqs-rw))]
-          [(planet . rest)
-           in-require?
-           stx]
-          [(lib . rest)
-           in-require?
-           stx]
-          [(submod p . rest)
-           (and in-require?
-                (or
-                 (equal? "." (syntax-e #'p))
-                 (equal? ".." (syntax-e #'p))))
-           stx]
-          [(a . b)
-           (with-syntax ([a-rw (loop #'a in-require?)]
-                         [b-rw (loop #'b in-require?)])
-             #'(a-rw . b-rw))]
-          [relative-path
-           (and in-require?
-                (string? (syntax-e #'relative-path))
-                (relative-path? (syntax-e #'relative-path)))
-           (let* ([p-string (syntax-e #'relative-path)]
-                  [full-path (path->string
-                              (simplify-path 
-                               (cleanse-path
-                                (build-path #,mod-directory-path
-                                            (string->path p-string)))))])
-             #`(file #,full-path))]
-          [_ stx]))))
-
-(define-syntax (path-spec-rewriter stx)
-  (syntax-case stx ()
-    [(_ path-spec local-mod)
-     (let ([file (resolve-path-spec #'path-spec #'path-spec #'path-spec)])
-       (with-syntax* ([body-rw-stx (fp->local-body-rw-stx (path->string file) #'local-mod)]
-                      [full-stx-id #'full-stx]
-                      [module-rw-stx (module-body-context-rw-stx #'full-stx-id #'body-rw-stx)])
-         #`(λ (stx)
-             (syntax-case stx ()
-               [(_ full-stx)
-                (let ([full-stx-id #'full-stx])
-                  module-rw-stx)]))))]))
-
-(define-syntax (full-path->local-rewriter stx)
-  (syntax-case stx ()
-    [(_ full-path local-mod)
-     (with-syntax* ([body-rw-stx (fp->local-body-rw-stx #'full-path #'local-mod)]
-                    [full-stx-id #'full-stx]
-                    [module-rw-stx (module-body-context-rw-stx #'full-stx-id #'body-rw-stx)])
-       #`(λ (stx)
-           (syntax-case stx ()
-             [(_ full-stx)
-              (let ([full-stx-id #'full-stx])
-                module-rw-stx)])))]))
-
-(define-for-syntax (fp->local-body-rw-stx full-path-candidate local-mod)
-  #`(λ (stx)
-      (let loop ([stx stx]
-                 [in-require? #f])
-        (syntax-case stx (require lib planet submod file)
-          [(require rqs (... ...))
-           (with-syntax ([rqs-rw (loop #'(rqs (... ...)) #t)])
-             #'(require . rqs-rw))]
-          [(planet . rest)
-           in-require?
-           stx]
-          [(lib . rest)
-           in-require?
-           stx]
-          [(submod p . rest)
-           (and in-require?
-                (or
-                 (equal? "." (syntax-e #'p))
-                 (equal? ".." (syntax-e #'p))))
-           stx]
-          [(submod p rest (... ...))
-           in-require?
-           (with-syntax ([p-rw (loop #'p)])
-             (syntax-case #'p-rw (submod)
-               [(submod p-inner rest-inner (... ...))
-                #'(submod p-inner rest-inner (... ...) rest (... ...))]
-               [_
-                #'(submod p-rw rest (... ...))]))]
-          [(file full-path)
-           (and in-require?
-                (string? (syntax-e #'full-path))
-                (complete-path? (syntax-e #'full-path)))
-           ;; intended to rewrite paths already modified by the relative-path pass
-           ;; (everything that pass touches will be a complete path), or 
-           ;; pre-existing complete paths (shouldn't see anything else here, right?...)
-           (if (equal? #,full-path-candidate
-                       (syntax-e #'full-path))
-               #'#,local-mod
-               stx)]
-          [(a . b)
-           (with-syntax ([a-rw (loop #'a in-require?)]
-                         [b-rw (loop #'b in-require?)])
-             #'(a-rw . b-rw))]
-          [_ stx]))))
-
-(define-for-syntax (module-body-context-rw-stx full-stx body-rw-stx)
-  #`(let loop ([stx #,full-stx])
-      (syntax-case stx (module)
-        [(module . body)
-         (with-syntax ([body-rw (#,body-rw-stx #'body)])
-           #'(module . body-rw))]
-        [(a . b)
-         (with-syntax ([a-rw (loop #'a)]
-                       [b-rw (loop #'b)])
-           #'(a-rw . b-rw))]
-        [_
-         stx])))
-
-
-(define-for-syntax (apply-to ids arg)
-  (syntax-case ids (rewriter)
-    [((rewriter . stuff) . b)
-     (with-syntax ([rest (apply-to #'b arg)]
-                   [rw-id (syntax-local-lift-expression #'(rewriter . stuff))])
-       #'(rw-id rest))]
-    [(a . b)
-     (with-syntax ([rest (apply-to #'b arg)])
-       #'(a rest))]
-    [()
-     arg]))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/rw-defs.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/rw-defs.rkt
deleted file mode 100644
index 3ce1908605..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/private/rw-defs.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang racket/base
-
-(require "rewrite.rkt"
-         (for-syntax racket/base
-                     racket/syntax
-                     syntax/parse
-                     (only-in syntax/path-spec resolve-path-spec)
-                     "rewrite.rkt"))
-
-(provide define-rewrite
-         define-rewrite/compose
-         include/rewrite)
-
-(begin-for-syntax
-  (define-syntax-class identifier-list
-    (pattern (id:id ...))))
-
-(define-syntax (define-rewrite stx)
-  (syntax-parse stx #:datum-literals (==>)
-   [(define-rewriter rw:id from:expr ==> to:expr
-      (~or (~optional (~seq #:variables variables:identifier-list)
-                      #:name "#:variables <list of identifiers> option")
-           (~optional (~seq #:context contexts:identifier-list)
-                      #:name "#:context <context specification> option")
-           (~optional (~seq (~and #:once-only once-only-kw))
-                      #:name "#:one-only option")
-           (~optional (~seq (~and #:exactly-once exactly-once-kw))
-                      #:name "#:exactly-once option")) ...)
-    (with-syntax* ([vars (if (attribute variables) #'variables #'())]
-                   [ctxs (if (attribute contexts) #'contexts #'())]
-                   [once-val (if (attribute once-only-kw) #t #f)]
-                   [exactly-once-val (if (attribute exactly-once-kw) #t #f)]
-                   [ids (syntax-ids #'from (syntax->list #'vars))])
-      #`(define-syntax rw (rewriter/ids from to ids ctxs once-val exactly-once-val)))]))
-       
-(define-syntax (define-rewrite/compose stx)
-  (syntax-case stx ()
-    [(_ id rws ...)
-     (with-syntax* ([the-stx #'the-stx]
-                    [body (apply-to #'(rws ...) #'the-stx)])
-       #`(define-syntax-rule (id the-stx)
-           body))]))
-
-(define-syntax (include/rewrite stx)
-  (syntax-case stx ()
-    [(_ mod-path new-name rws ...)
-     (syntax-case (include-mod #'mod-path stx) (module)
-       [(module old-name . body)
-        (apply-to #'(rws ...) #'(module new-name . body))])]))
-
-(define-for-syntax (include-mod mod-path context-stx)
-  (define file (resolve-path-spec mod-path mod-path mod-path))
-  (define file-stx
-         (parameterize ([read-accept-lang #t]
-                        [read-accept-reader #t]
-                        [port-count-lines-enabled #t])
-           (call-with-input-file file
-             (λ (in)
-               (read-syntax file in)))))
-  (let loop ([content file-stx])
-           (cond
-             [(pair? content)
-              (cons (loop (car content))
-                    (loop (cdr content)))]
-             [(null? content) null]
-             [else
-              (define v (syntax-e content))
-              (datum->syntax
-               context-stx
-               (cond
-                 [(pair? v) 
-                  (loop v)]
-                 [(vector? v)
-                  (list->vector (loop (vector->list v)))]
-                 [(box? v)
-                  (box (loop (unbox v)))]
-                 [else
-                  v])
-               content
-               content)])))
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/run-benchmark.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/run-benchmark.rkt
deleted file mode 100644
index efbd071a96..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/run-benchmark.rkt
+++ /dev/null
@@ -1,110 +0,0 @@
-#lang racket/base
-
-(require racket/cmdline
-         racket/list
-         racket/match
-         racket/system
-         racket/runtime-path
-         racket/function
-         compiler/find-exe
-         racket/file)
-
-(define-runtime-path here ".")
-(define-runtime-path run-generators "run-generator.rkt")
-
-(struct work (name gen-mod check-mod))
-
-(define print-work-status? (make-parameter #f))
-
-(define (do-work worklist time-seconds num-procs [log-directory (current-directory)])
-
-  (define work-sem (make-semaphore 1))
-  
-  (when (print-work-status?)
-    (printf "worklist:\n~a\n"
-            (apply string-append
-                   (add-between (for/list ([w (in-list worklist)])
-                                  (match-define (work f g c) w)
-                                  (define t (dynamic-require g 'type))
-                                  (format "~a : ~s" f t))
-                                ",\n"))))
-  
-  (define (do-next)
-    (semaphore-wait work-sem)
-    (cond
-      [(empty? worklist)
-       (semaphore-post work-sem)
-       (void)]
-      [else
-       (match-define (work name gen-mod check-mod) (car worklist))
-       (set! worklist (cdr worklist))
-       (semaphore-post work-sem)
-       (define args 
-         (apply string-append 
-                (add-between (list (string-append "-n " name)
-                                   (string-append "-c " (format "'~s'" check-mod))
-                                   (string-append "-g " (format "'~s'" gen-mod))
-                                   (string-append "-s " (number->string time-seconds))
-                                   (string-append "-d " (path->string log-directory))
-                                   "-l"
-                                   (if (print-work-status?)
-                                       "-v" ""))
-                             " ")))
-       (define command 
-         (apply string-append 
-                (add-between 
-                 (list (path->string (find-exe)) 
-                       (path->string run-generators)
-                       args) " ")))
-       (system command)
-       (do-next)]))
-  
-  (map thread-wait
-       (for/list ([_ (in-range num-procs)])
-         (thread do-next)))
-  (void))
-
-(define (run-benchmark all-mods seconds num-processes log-dir)
-  (define worklist
-    (map (λ (l) (apply work l))
-         all-mods))
-  (do-work worklist seconds num-processes log-dir))
-  
-(module+ main
-  
-  (define gen-types '())
-  (define secs 0)
-  (define num-procs 1)
-  (define all? #f)
-  
-  (define info-mod-file
-    (command-line
-     #:once-each
-     [("-m" "--minutes") minutes "Minutes to run each instance for"
-                         (set! secs (* 60 (string->number minutes)))]
-     [("-s" "--seconds") seconds "Seconds to run each instance for"
-                         (set! secs (string->number seconds))]
-     [("-n" "--num-processes") num-processes "Number of processes to run in parallel"
-                               (set! num-procs (string->number num-processes))]
-     [("-a" "--all") "Run all generation types"
-                     (set! all? #t)]
-     #:multi
-     [("-t" "--type") t "Generation type to run, one of: grammar, ordered, enum"
-                      (set! gen-types (cons (string->symbol t) gen-types))]
-     #:args (info-mod-filename)
-     info-mod-filename))
-  
-  (define log-dir (make-temporary-file "bmark-logs~a" 'directory))
-  
-  (define all-mods ((if all?
-                        values
-                        ((curry filter)
-                         (match-lambda 
-                           [(list _ gen-mod _)
-                            (member (dynamic-require gen-mod 'type) gen-types)])))
-                    ((dynamic-require info-mod-file 'all-mods))))
-  
-  (printf "Logging to: ~a\n" log-dir)
-  
-  (parameterize ([print-work-status? #t])
-    (run-benchmark all-mods secs num-procs log-dir)))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/run-generator.rkt b/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/run-generator.rkt
deleted file mode 100644
index dafa07e413..0000000000
--- a/pkgs/redex-pkgs/redex-benchmark/redex/benchmark/run-generator.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/base
-
-(require "private/logging.rkt"
-         "private/gen-run.rkt"
-         racket/cmdline
-         racket/match
-         racket/port)
-
-
-(define secs 60)
-(define gen-mod #f)
-(define check-mod #f)
-(define run-name (string-append
-                  "run-"
-                  (symbol->string (timestamp))))
-(define log-dir (current-directory))
-(define log? #f)
-(define verbose? #f)
-
-(define (log-name name type)
-  (string-append name "-" (symbol->string type) ".rktd"))
-
-(command-line
- #:once-each
- [("-m" "--minutes") minutes "Minutes to run for (default 1)"
-                     (set! secs (* 60 (string->number minutes)))]
- [("-s" "--seconds") seconds "Seconds to run for (default 60)"
-                     (set! secs (string->number seconds))]
- [("-g" "--gen-mod") generator-module "Generator module path"
-                     (call-with-input-string 
-                      generator-module
-                      (λ (in) (set! gen-mod (read in))))]
- [("-c" "--check-mod") check-module "Generator module path"
-                       (call-with-input-string 
-                        check-module
-                        (λ (in) (set! check-mod (read in))))]
- [("-n" "--name") name "Test run name"
-                  (set! run-name name)]
- [("-d" "--log-directory") log-directory "Directory to write log files to"
-                           (set! log-dir log-directory)]
- [("-v" "--verbose") "Verbose"
-                     (set! verbose? #t)]
- [("-l" "--log") "Turn logging on"
-                 (set! log? #t)])
-
-(unless gen-mod
-  (printf "Must specify a generator module (-g <module path>)\n")
-  (exit))
-(unless check-mod
-  (printf "Must specify a check module (-c <module path>\n")
-  (exit))
-
-(when verbose?
-  (printf "Running ~a for ~a seconds... \t[~s ~s]\n" run-name secs gen-mod check-mod))
-
-(match-define (run-results tries time cexps) 
-  (if log?
-      (parameterize ([bmark-log-directory log-dir])
-        (benchmark-logging-to (log-name run-name (dynamic-require gen-mod 'type))
-                         (λ () (run-gen-and-check/mods gen-mod check-mod secs #:name run-name))))
-      (run-gen-and-check/mods gen-mod check-mod secs #:name run-name)))
-
-(when verbose?
-  (printf "Finished running ~a in ~a seconds, found ~a counterexamples\n" run-name (exact->inexact (/ time 1000)) cexps))
diff --git a/pkgs/redex-pkgs/redex-doc/LICENSE.txt b/pkgs/redex-pkgs/redex-doc/LICENSE.txt
deleted file mode 100644
index 6c4fed3f4b..0000000000
--- a/pkgs/redex-pkgs/redex-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-redex-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/redex-pkgs/redex-doc/info.rkt b/pkgs/redex-pkgs/redex-doc/info.rkt
deleted file mode 100644
index 5f57d5b213..0000000000
--- a/pkgs/redex-pkgs/redex-doc/info.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base" "racket-doc"))
-(define build-deps '("draw-doc"
-                     "gui-doc"
-                     "htdp-doc"
-                     "pict-doc"
-                     "slideshow-doc"
-                     "at-exp-lib"
-                     "scribble-lib"
-                     "gui-lib"
-                     "htdp-lib"
-                     "pict-lib"
-                     "redex-gui-lib"
-                     "redex-benchmark"
-                     "rackunit-lib"))
-
-(define pkg-desc "documentation part of \"redex\"")
-
-(define pkg-authors '(robby bfetscher))
diff --git a/pkgs/redex-pkgs/redex-doc/redex/info.rkt b/pkgs/redex-pkgs/redex-doc/redex/info.rkt
deleted file mode 100644
index add1c160a7..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings (list (list "redex.scrbl" (list 'multi-page) (list 'tool))))
diff --git a/pkgs/redex-pkgs/redex-doc/redex/redex.scrbl b/pkgs/redex-pkgs/redex-doc/redex/redex.scrbl
deleted file mode 100644
index ce7edb6568..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/redex.scrbl
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/bnf
-          scribble/struct
-          scribble/eval
-          "scribblings/cite.rkt")
-
-@title{Redex: Practical Semantics Engineering}
-
-@author["Robert Bruce Findler" "Casey Klein" "Burke Fetscher"]
-
-PLT Redex consists of a domain-specific language for specifying
-reduction semantics, plus a suite of tools for working with the
-semantics. 
-
-This manual consists of two parts: a tutorial introduction and a reference for Redex. 
-Also see
-@link["http://redex.racket-lang.org/"]{@tt{http://redex.racket-lang.org/}}
-and the @tt{examples} subdirectory in the @tt{redex} collection.
-
-@table-of-contents[]
-
-@include-section["scribblings/tut.scrbl"]
-@include-section["scribblings/ref.scrbl"]
-@include-section["scribblings/benchmark.scrbl"]
-
-@generate-bibliography[]
-@index-section[]
-
-
-@; Needs a timeout for testing:
-@(module* test racket/base
-   (require (submod ".."))
-   (module config info
-     (define timeout 300)))
diff --git a/pkgs/redex-pkgs/redex-doc/redex/scribblings/benchmark-models.scrbl b/pkgs/redex-pkgs/redex-doc/redex/scribblings/benchmark-models.scrbl
deleted file mode 100644
index 745cb929e6..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/scribblings/benchmark-models.scrbl
+++ /dev/null
@@ -1,402 +0,0 @@
-#lang scribble/base
-
-@(require "cite.rkt"
-          "bug-info.rkt"
-          scribble/core
-          scriblib/figure
-          scriblib/footnote
-          scribble/manual
-          racket/format
-          (only-in pict scale))
-
-@title[#:tag "sec:benchmark"]{The Benchmark Models}
-
-The programs in our benchmark come from two sources:
-synthetic examples based on our experience with Redex over
-the years and from models that we and others
-have developed and bugs that were encountered during
-the development process.
-
-The benchmark has six different Redex models, each of which
-provides a grammar of terms for the model and a soundness
-property that is universally quantified over those terms.
-Most of the models are of programming languages and most of
-the soundness properties are type-soundness, but we also
-include red-black trees with the property that insertion
-preserves the red-black invariant, as well as one richer
-property for one of the programming language models 
-(discussed in @secref["sec:b:stlc-sub"]).
-
-For each model, we have manually introduced bugs into a
-number of copies of the model, such that each copy is
-identical to the correct one, except for a single bug. The bugs
-always manifest as a term that falsifies the soundness
-property. 
-
-The table in @figure-ref["fig:benchmark-overview"] gives an
-overview of the benchmark suite, showing some numbers for
-each model and bug. Each model has its name and the number
-of lines of code for the bug-free model (the buggy versions
-are always within a few lines of the originals). The line
-number counts include the model and the specification of the
-property.
-
-Each bug has a number and, with the exception of the rvm
-model, the numbers count from 1 up to the number of bugs.
-The rvm model bugs are all from 
-@citet[racket-virtual-machine]'s work and we follow their
-numbering scheme (see @secref["sec:b:rvm"] for more
-information about how we chose the bugs from that paper).
-
-The @bold{S/M/D/U} column shows a classification of each bug as:
-@itemlist[
-  @item{@bold{S} (Shallow) Errors in the encoding of the system into Redex,
-         due to typos or a misunderstanding of subtleties of Redex.}
-  @item{@bold{M} (Medium) Errors in the algorithm behind the
-         system, such as using too simple of a data-structure that doesn't
-         allow some important distinction, or misunderstanding that some
-         rule should have a side-condition that limits its applicability.}
-  @item{@bold{D} (Deep) Errors in the developer's understanding of the system, 
-         such as when a type system really isn't sound and the author
-         doesn't realize it.}
-  @item{@bold{U} (Unnatural) Errors that are unlikely to have come up in
-         real Redex programs but are included for our own curiosity. There
-         are only two bugs in this category.}]
-
-The size column shows the size of the term representing the
-smallest counterexample we know for each bug, where we
-measure size as the number of pairs of parentheses and atoms
-in the s-expression representation of the term.
-
-Each subsection of this section introduces one of the
-models in the benchmark, along with the errors we introduced
-into each model. 
-
-@figure*["fig:benchmark-overview" "Benchmark Overview"]{
- @centered{
-  @tabular[#:sep 
-           @hspace[1]
-           #:column-properties '(left)
-           #:row-properties '((baseline bottom-border) (baseline))
-           (cons
-            (list @bold{Model}
-                  @bold{LoC}
-                  @bold{Bug#}
-                  @bold{S/M/D/U}
-                  @bold{Size}
-                  @bold{Description of Bug})
-            (let ([last-type #f])
-              (for/list ([t/n (in-list all-types/nums)])
-                (define type (list-ref t/n 0))
-                (define num (list-ref t/n 1))
-                (begin0
-                  (list (if (equal? last-type type)
-                            ""
-                            @seclink[(format "sec:b:~a" type)]{@(symbol->string type)})
-                        (if (equal? last-type type)
-                            ""
-                            (format "~a" (get-line-count type)))
-                        (number->string num)
-                        (symbol->string (get-category type num))
-                        (number->string (get-counterexample-size type num))
-                        (list (get-error type num)))
-                  (set! last-type type)))))]
-  }
-}
-
-@section[#:tag "sec:b:stlc"]{stlc} 
-A simply-typed λ-calculus with base
-types of numbers and lists of numbers, including the
-constants @tt{+}, which operates on numbers, and
-@tt{cons}, @tt{head}, @tt{tail}, and @tt{nil} (the empty
-list), all of which operate only on lists of numbers. The
-property checked is type soundness: the combination of
-preservation (if a term has a type and takes a step, then
-the resulting term has the same type) and progress (that
-well-typed non-values always take a reduction step). 
-
-We introduced nine different bugs into this system. The
-first confuses the range and domain types of the function in
-the application rule, and has the small counterexample: 
-@racket[(hd 0)]. We consider this to be a shallow bug, since
-it is essentially a typo and it is hard to imagine anyone
-with any knowledge of type systems making this conceptual
-mistake. Bug 2 neglects to specify that a fully applied 
-@racket[cons] is a value, thus the list 
-@racket[((cons 0) nil)] violates the progress property. We
-consider this be be a medium bug, as it is not a typo, but
-an oversight in the design of a system that is otherwise
-correct in its approach.
-
-We consider the next three bugs to be shallow. Bug 3
-reverses the range and the domain of function types in the
-type judgment for applications. This was one of the easiest
-bug for all of our approaches to find. Bug 4 assigns
-@racket[cons] a result type of @racket[int]. The fifth bug
-returns the head of a list when @racket[tl] is applied. Bug
-6 only applies the @racket[hd] constant to a partially
-constructed list (i.e., the term @racket[(cons 0)] instead
-of @racket[((cons 0) nil)]). Only the grammar based random
-generation exposed bugs 5 and 6 and none of our approaches
-exposed bug 4.
-
-The seventh bug, also classified as medium, omits a production
-from the definition of evaluation contexts and thus doesn't reduce
-the right-hand-side of function applications.
-
-Bug 8 always returns the type @racket[int] when looking up
-a variable's type in the context. This bug (and the identical one
-in the next system) are the only bugs we classify as unnatural. We
-included it because it requires a program to have a variable with
-a type that is more complex that just @racket[int] and to actually
-use that variable somehow.
-
-Bug 9 is simple; the variable lookup function has an error where it
-doesn't actually compare its input to variable in the environment,
-so it effectively means that each variable has the type of the nearest
-enclosing lambda expression.
-
-@section[#:tag "sec:b:poly-stlc"]{poly-stlc} 
-This is a polymorphic version of @secref["sec:b:stlc"], with
-a single numeric base type, polymorphic lists, and polymorphic 
-versions of the list constants. 
-No changes were made to the model except those necessary to 
-make the list operations polymorphic.
-There is no type inference in the model, so all polymorphic
-terms are required to be instantiated with the correct
-types in order for the function to type check. 
-Of course, this makes it much more difficult to automatically 
-generate well-typed terms, and thus counterexamples.
-As with @bold{stlc}, the property checked is
-type soundness.
-
-All of the bugs in this system are identical to those in
-@bold{stlc}, aside from any changes that had to be made
-to translate them to this model. 
-
-This model is also a subset of the language specified in
-@citet[palka-workshop], who used a specialized and optimized
-QuickCheck generator for a similar type system to find bugs 
-in GHC. We adapted this system (and its restriction in
-@bold{stlc}) because it has already been used successfully
-with random testing, which makes it a reasonable target for
-an automated testing benchmark.
-
-@section[#:tag "sec:b:stlc-sub"]{stlc-sub} 
-The same language and type system as @secref["sec:b:stlc"],
-except that in this case all of the errors are in the substitution
-function. 
-
-Our own experience has been that it is easy to make subtle
-errors when writing substitution functions, so we added this
-set of tests specifically to target them with the benchmark.
-There are two soundness checks for this system. Bugs 1-5 are
-checked in the following way: given a candidate
-counterexample, if it type checks, then all βv-redexes in
-the term are reduced (but not any new ones that might
-appear) using the buggy substitution function to get a second
-term. Then, these two terms are checked to see if they both
-still type check and have the same type and that the result
-of passing both to the evaluator is the same.
-
-Bugs 4-9 are checked using type soundness for this system as
-specified in the discussion of the @secref["sec:b:stlc"] model. We
-included two predicates for this system because we believe
-the first to be a good test for a substitution function but
-not something that a typical Redex user would write, while
-the second is something one would see in most Redex models
-but is less effective at catching bugs in the substitution
-function.
-
-The first substitution bug we introduced simply omits the
-case that replaces the correct variable with the
-term to be substituted. We considered this to be a shallow
-error, and indeed all approaches were able to uncover it,
-although the time it took to do so varied.
-
-Bug 2 permutes the order of arguments when making a
-recursive call. This is also categorized as a shallow bug,
-although it is a common one, at least  based on our
-experience writing substitutions in Redex.
-
-Bug 3 swaps the function and argument positions of
-an application while recurring, again essentially a typo and
-a shallow error, although one of the more difficult to
-find in this model.
-
-The fourth substitution bug neglects to make the renamed
-bound variable fresh enough when recurring past a
-lambda. Specifically, it ensures that the new variable is
-not one that appears in the body of the function, but it
-fails to make sure that the variable is different from the
-bound variable or the substituted variable. We categorized
-this error as deep because it corresponds to a
-misunderstanding of how to generate fresh variables, a
-central concern of the substitution function.
-
-Bug 5 carries out the substitution for all variables in the
-term, not just the given variable. We categorized it as SM,
-since it is essentially a missing side condition, although a
-fairly egregious one.
-
-Bugs 6-9 are duplicates of bugs 1-3 and bug 5, except that
-they are tested with type soundness instead. (It is
-impossible to detect bug 4 with this property.)
-
-@section[#:tag "sec:b:let-poly"]{let-poly}
-
-A language with ML-style @tt{let} polymorphism, included in
-the benchmark to explore the difficulty of finding the 
-classic let+references unsoundness. With the exception of
-the classic bug, all of the bugs were errors made during
-the development of this model (and that were caught during
-development).
-
-The first bug is simple; it corresponds to a typo, swapping
-an @tt{x} for a @tt{y} in a rule such that a type variable
-is used as a program variable.
-
-Bug number 2 is the classic let+references bug. It changes the rule
-for @tt{let}-bound variables in such a way that generalization
-is allowed even when the initial value expression is not a value.
-
-Bug number 3 is an error in the function application case where the
-wrong types are used for the function position (swapping two types
-in the rule).
-
-Bugs 4, 5, and 6 were errors in the definition of the unification
-function that led to various bad behaviors.
-
-Finally, bug 7 is a bug that was introduced early on, but was only 
-caught late in the development process of the model. It used a
-rewriting rule for @tt{let} expressions that simply reduced them
-to the corresponding @tt{((λ} expressions. This has the correct
-semantics for evaluation, but the statement of type-soundness does not
-work with this rewriting rule because the let expression has more
-polymorphism that the corresponding application expression.
-
-@section[#:tag "sec:b:list-machine"]{list-machine} An implementation of 
-@citet[list-machine]'s list-machine benchmark. This is a
-reduction semantics (as a pointer machine operating over an
-instruction pointer and a store) and a type system for a
-seven-instruction first-order assembly language that
-manipulates @tt{cons} and @tt{nil} values. The property
-checked is type soundness as specified in 
-@citet[list-machine], namely that well-typed programs always
-step or halt. Three mutations are included.
-
-The first list-machine bug incorrectly uses the head position
-of a cons pair where it should use the tail position in the 
-cons typing rule. This bug amounts to a typo and is classified
-as simple.
-
-The second bug is a missing side-condition in the rule that updates
-the store that has the effect of updating the first position in
-the store instead of the proper position in the store for
-all of the store update operations. We classify this as a medium bug.
-
-The final list-machine bug is a missing subscript in one rule
-that has the effect that the list cons operator does not store
-its result. We classify this as a simple bug.
-
-@section[#:tag "sec:b:rbtrees"]{rbtrees} A model that implements the red-black
-tree insertion function and checks that insertion preserves
-the red-black tree invariant (and that the red-black tree is
-a binary search tree).
-
-The first bug simply removes the re-balancing operation from
-insert. We classified this bug as medium since it seems like
-the kind of mistake that a developer might make in staging
-the implementation. That is, the re-balancing operation is separate
-and so might be put off initially, but then forgotten. 
-
-The second bug misses one situation in the re-balancing
-operation, namely when a black node has two red nodes under
-it, with the second red node to the right of the first. This
-is a medium bug.
-
-The third bug is in the function that counts the black depth in
-the red-black tree predicate. It forgets to increment the count
-in one situation. This is a simple bug.
-
-@section[#:tag "sec:b:delim-cont"]{delim-cont}
-@citet[delim-cont-cont]'s model of a contract and type system for
-delimited control. The language
-is Plotkin's PCF extended with operators for delimited continuations,
-continuation marks, and contracts for those operations. 
-The property checked is type soundness. We added three bugs
-to this model.
-
-The first was a bug we found by mining the model's
-git repository's history. This bug fails to put a list
-contract around the result of extracting the marks from a
-continuation, which has the effect of checking the contract
-that is supposed to be on the elements of a list against the
-list itself instead. We classify this as a medium bug.
-
-The second bug was in the rule for handling list contracts. When checking
-a contract against a cons pair, the rule didn't specify that it should
-apply only when the contract is actually a list contract, meaning
-that the cons rule would be used even on non-list contacts, leading
-to strange contract checking. We consider this a medium bug because
-the bug manifests itself as a missing @racket[list/c] in the rule.
-
-The last bug in this model makes a mistake in the typing
-rule for the continuation operator. The mistake is to leave
-off one-level of arrows, something that is easy to do with
-so many nested arrow types, as continuations tend to have.
-We classify this as a simple error.
-
-@section[#:tag "sec:b:rvm"]{rvm} A existing model and test
-framework for the Racket virtual machine and bytecode
-verifier@~cite[racket-virtual-machine]. The bugs were
-discovered during the development of the model and reported
-in section 7 of that paper. Unlike the rest of the models,
-we do not number the bugs for this model sequentially but instead
-use the numbers from @citet[racket-virtual-machine]'s work.
-
-We included only some of the bugs, excluding bugs for two
-reasons:
-@itemlist[@item{The paper tests two properties: an internal
-  soundness property that relates the verifier to the
-  virtual machine model, and an external property that
-  relates the verifier model to the verifier implementation.
-  We did not include any that require the latter properties because it
-  requires building a complete, buggy version of the Racket
-  runtime system to include in the benchmark.}
-           
-          @item{We included all of the internal properties
-  except those numbered 1 and 7 for practical reasons. The
-  first is the only bug in the machine model, as opposed to
-  just the verifier, which would have required us to
-  include the entire VM model in the benchmark. The second
-  would have required modifying the abstract representation
-  of the stack in the verifier model in contorted way to
-  mimic a more C-like implementation of a global, imperative
-  stack. This bug was originally in the C implementation of
-  the verifier (not the Redex model) and to replicate it in
-  the Redex-based verifier model would require us to program
-  in a low-level imperative way in the Redex model,
-  something not easily done.}]
-
-These bugs are described in detail in @citet[racket-virtual-machine]'s paper.
-
-This model is unique in our benchmark suite because it
-includes a function that makes terms more likely to be
-useful test cases. In more detail, the machine model does
-not have variables, but instead is stack-based; bytecode
-expressions also contain internal pointers that must be
-valid. Generating a random (or in-order) term is relatively
-unlikely to produce one that satisfies these constraints.
-For example, of the first 10,000 terms produced by
-the in-order enumeration only 1625 satisfy the constraints.
-The ad hoc random generator generators produces about 900
-good terms in 10,000 attempts and the uniform random
-generator produces about 600 in 10,000 attempts.
-
-To make terms more likely to be good test cases, this
-model includes a function that looks for out-of-bounds
-stack offsets and bogus internal pointers and replaces
-them with random good values. This function is applied
-to each of the generated terms before using them to test
-the model.
diff --git a/pkgs/redex-pkgs/redex-doc/redex/scribblings/benchmark.scrbl b/pkgs/redex-pkgs/redex-doc/redex/scribblings/benchmark.scrbl
deleted file mode 100644
index b624656986..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/scribblings/benchmark.scrbl
+++ /dev/null
@@ -1,270 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          scribble/bnf
-          scribble/struct
-          scribble/eval
-          scribble/racket
-          scribblings/guide/modfile
-          redex/benchmark
-          racket/include
-          racket/runtime-path
-          "cite.rkt"
-          (for-syntax racket/include)
-          (for-label racket
-                     racket/include
-                     redex/benchmark
-                     racket/date))
-
-@title[#:tag "benchmark"]{Automated Testing Benchmark}
-
-@defmodule[redex/benchmark]
-
-Redex's automated testing benchmark provides a collection
-of buggy models and falsifiable properties to test how
-efficiently methods of automatic test case generation are
-able to find counterexamples for the bugs.
-
-Each entry in the benchmark contains a @deftech{check} function
-and multiple @deftech{generate} functions. The @tech{check} function
-determines if a given example is a counterexample (i.e. if
-it uncovers the buggy behavior) and each of the @tech{generate}
-functions generates candidate examples to be tried. There are multiple
-ways to generate terms for each model. They typically correspond to different
-uses of @racket[generate-term], but could be any way to generate examples.
-See @racket[run-gen-and-check] for the precise contracts for @tech{generate}
-and @tech{check} functions.
-
-Most of the entries in the benchmark are small differences to existing, 
-bug-free models, where some small change to the model introduces the
-bug. These changes are described using @racket[define-rewrite].
-
-To run a benchmark entry with a particular generator, see @racket[run-gen-and-check/mods].
-
-@include-section["benchmark-models.scrbl"]
-
-@section[#:tag "manage"]{Managing Benchmark Modules}
-
-This section describes utilities for making changes to existing modules to 
-create new ones, intended to assist in adding bugs to models and keeping 
-buggy models in sync with changes to the original model.
-
-@defform[#:literals(==>)
-         (define-rewrite id from ==> to 
-           [#:context (context-id ...)
-            #:variables (variable-id ...)
-            #:once-only
-            #:exactly-once])]
-
-Defines a syntax transformer bound to @racket[id], the effect of which is
-to rewrite syntax matching the pattern @racket[from] to the result
-expression @racket[to]. The @racket[from] argument should follow the 
-grammar of a @racket[syntax-case] pattern, and @racket[to] acts
-as the corresponding result expression. The behavior of the match is the
-same as @racket[syntax-case], except that all identifiers in
-@racket[from] are treated as literals with the exception of an identifier
-that has the same binding as a @racket[variable-id] appearing in the
-@racket[#:variables] keyword argument, which is treated
-as a pattern variable. (The reverse of the situation for
-@racket[syntax-case], where literals must be specified instead.)
-The rewrite will only be applied in the context of a @racket[module] form,
-but it will be applied wherever possible within the module body,
-subject to a few constraints.
-
-The rest of the keyword arguments control where and how often the
-rewrite may be applied. The @racket[#:once-only] option specifies that the
-rewrite can be applied no more than once, and the @racket[#:exactly-once]
-option asserts that the rewrite must be applied once (and no more). In both
-cases a syntax error is raised if the condition is not met. The
-@racket[#:context] option searches for syntax of the form
-@racket[(some-id . rest)], where the binding of @racket[some-id] 
-matches that of the first @racket[context-id] in the @racket[#:context] list, 
-at which point it recurs on @racket[rest] but drops the first id from the
-list. Once every @racket[context-id] has been matched, the
-rewrite can be applied.
-
-@defform[(define-rewrite/compose id rw-id ...)]
-Defines a syntax transformer bound to @racket[id], assuming that
-every @racket[rw-id] also binds a syntax transformer, such that @racket[id] 
-has the effect of applying all of the @racket[rw-id]s.
-
-@defform[(include/rewrite path-spec mod-id rw-id ...)]
-If the syntax designated by @racket[path-spec] is a module, the module syntax
-is inlined as a submodule with the identifier @racket[mod-id]. Assumes each
-@racket[rw-id] binds a syntax transformer, and applies them to the resulting
-module syntax. The syntax of @racket[path-spec] must be same as for
-@racket[include].
-
-@(define-runtime-path here ".")
-@(define bmark-eval (parameterize ([current-load-relative-directory here])
-                      (make-base-eval)))
-@(interaction-eval #:eval bmark-eval (require redex/benchmark))
-
-
-For example, if the contents of the file mod-fx.rkt are:
-@(parameterize ([current-load-relative-directory here])
-   (racketmodfile "mod-fx.rkt"))
-Then:
-@interaction[#:eval bmark-eval
-  (define-rewrite xy-rw 
-    x ==> y
-    #:context (f)
-    #:once-only)
-  (require "mod-fx.rkt")
-  (f 3)
-  (include/rewrite "mod-fx.rkt" submod-fx xy-rw)
-  (require (prefix-in s: 'submod-fx))
-  (s:f 3)]
-
-@section[#:tag "run"]{Running Benchmark Models}
-
-@defproc[(run-gen-and-check [get-gen (-> (-> any/c))]
-                            [check (-> any/c boolean?)]
-                            [seconds natural-number/c]
-                            [#:name name string? "unknown"]
-                            [#:type type symbol? 'unknown]) 
-                            run-results?]{
-Repeatedly @tech{generate}s random terms and @tech{check}s if they are counterexamples
-to some property defined by @racket[check], where a term is considered a counterexample
-if @racket[check] returns @racket[#f] for that term.
-
-The @racket[get-gen] thunk is called to build a generator of random terms
-(which may close over some state). A new generator is created each time the property
-is found to be false.
-
-Each @tech{generate}d term is passed to @racket[check] to see if it is a counterexample.
-The interval in milliseconds between counterexamples is
-tracked, and the process is repeated either until the time specified by
-@racket[seconds] has elapsed or the standard error in the average interval
-between counterexamples is less than 10% of the average.
-
-The result is an instance of @racket[run-results] containing the total number of
-terms @tech{generate}d, the total elapsed time, and the number of counterexamples found.
-More detailed information can be obtained using the benchmark logging facilities,
-for which @racket[name] is refers to the name of the model, and @racket[type]
-is a symbol indicating the generation type used.
-}
-
-@defstruct*[run-results ([tries natural-number/c]
-                         [time natural-number/c]
-                         [cexps natural-number/c])]{
-  Minimal results for one run of a @tech{generate} and @tech{check} pair.
-}
-
-@defproc[(run-gen-and-check/mods [gen-mod-path module-path?]
-                                 [check-mod-path module-path?]
-                                 [seconds natural-number/c]
-                                 [#:name name string? "unknown"]) 
-         run-results?]{
-Just like @racket[run-gen-and-check], except that @racket[gen-mod-path] and
-@racket[check-mod-path] are module paths to a @emph{generator module} and a
-@emph{check module}, which are assumed to have the following characteristics:
-@itemlist[
-          @item{A @emph{generator module} provides the function @racket[get-generator],
-                  which meets the specification for the @racket[get-gen] argument to
-                  @racket[run-gen-and-check], and @racket[type], which is a symbol
-                  designating the type of the generator.}
-          @item{A @emph{check module} provides the function @racket[check], which meets
-                  the specification for the @racket[check] argument to 
-                  @racket[run-gen-and-check].}
-          ]
-}
-
-@section[#:tag "log"]{Logging}
-
-@defstruct*[bmark-log-data ([data any/c])]{
-Contains data logged by the benchmark, as described below.
-}
-
-Detailed information gathered during a benchmark run is logged to the @racket[current-logger], 
-at the @racket['info] level, with the message @racket["BENCHMARK-LOGGING"]. The 
-@racket[data] field of the log message contains a @racket[bmark-log-data] struct, which
-wraps data of the form:
-
-@racketgrammar*[#:literals (list)
-                [log-data (list event timestamp data-list)]]
-
-Where @racket[event] is a symbol that designates the type of event, and 
-@racket[timestamp] is symbol that contains the @racket[current-date] of the event in
-ISO-8601 format.
-The information in @racket[data-list] depends on the event, but must be in the form
-of a list alternating between a keyword and a datum, where the keyword is a short description
-of the datum. 
-
-The following events are logged (the symbol designating the event is in parentheses, and
-the form of the data logged for each event is shown):
-@itemlist[
-          @item{Run starts (@racket['start]), logged when beginning a run with a new
-                            @tech{generate}/@tech{check} pair.
-                @racketgrammar[#:literals (list quote)
-                               data-list (list '#:model model '#:type gen)]}
-          @item{Run completions (@racket['finished]), logged at the end of a run.
-                @racketgrammar[#:literals (list quote)
-                               data-list (list '#:model model '#:type gen '#:time-ms time 
-                                               '#:attempts tries 
-                                               '#:num-counterexamples countxmps 
-                                               '#:rate-terms/s rate '#:attempts/cexp atts)]}
-          @item{Every counterexample found (@racket['counterexample]).
-                @racketgrammar[#:literals (list quote)
-                               data-list (list '#:model model '#:type gen 
-                                               '#:counterexample term '#:iterations tries 
-                                               '#:time time)]}
-          @item{New average intervals between counterexamples (@racket['new-average]), which
-                    are recalculated whenever a counterexample is found.
-                @racketgrammar[#:literals (list quote)
-                               data-list (list '#:model model '#:type gen 
-                                               '#:average avg '#:stderr err)]}
-          @item{Major garbage collections (@racket['gc-major]).
-                @racketgrammar[#:literals (list quote)
-                               data-list (list '#:amount amount '#:time time)]}
-          @item{Heartbeats (@racket['hearbeat]) are logged every 10 seconds by the benchmark
-                            as a way to be sure that the benchmark has not crashed.
-                @racketgrammar[#:literals (list quote)
-                               data-list (list '#:model model '#:type gen)]}
-          @item{Timeouts (@racket['timeout]), which occur when generating or @tech{check}ing a single
-                         takes term longer than 5 minutes.
-                @racketgrammar[#:literals (list check generation quote)
-                               data-list (list '#:during 'check '#:term term '#:model model
-                                               '#:type gen)
-                                         (list '#:during 'generation '#:model model '#:type gen)]}
-          ]
-
-@defproc[(benchmark-logging-to [filename string?]
-                               [thunk (-> any/c)]) 
-         any/c]{Intercepts events logged by the benchmark and writes the data specified by
-                the @racket[log-data] production above to @racket[filename].
-}
-
-@defparam[bmark-log-directory directory (or/c path-string? path-for-some-system? 'up 'same)
-                              #:value (current-directory)]{
-Controls the directory where @racket[filename] in @racket[benchmark-logging-to] is located.}
-
-@section{Plotting}
-
-Plotting and analysis tools consume data of the form produced by the benchmark
-logging facilities (see @secref{log}).
-
-@emph{TODO!}
-
-@section[#:tag "sec:finding"]{Finding the Benchmark Models}
-
-The models included in the distribution of the benchmark are in the
-@filepath{redex/benchmark/models} subdirectory of the @racket[redex-benchmark]
-package. Each such subdirectory contains an info file named according to the
-pattern @filepath{<name>-info.rkt}, defining a module that provides the function:
-
-@defproc[(all-mods)
-         (listof (list/c string? module-path? module-path?))]{Returns a list of 
-@tech{generate} and @tech{check} pairs for a given model or set of models, such that for each 
-pair the first element is the name of the model, the second is a module defining a 
-generator, and the third is a module defining a @tech{check} function.}
-
-The file @filepath{redex/benchmark/models/all-info.rkt} provides an @racket[all-mods]
-function listing all of the @tech{generate} and @tech{check} pairs included in the benchmark.
-
-A command line interface is provided by the file 
-@filepath{redex/benchmark/run-benchmark.rkt}, 
-which takes an ``info'' file as described above as its primary argument and provides
-options for running the listed tests. It automatically writes results from each run to
-a separate log file, all of which are located in a temporary directory.
-(The directory path is printed to standard out at the beginning of the run).
diff --git a/pkgs/redex-pkgs/redex-doc/redex/scribblings/bug-info.rkt b/pkgs/redex-pkgs/redex-doc/redex/scribblings/bug-info.rkt
deleted file mode 100644
index 100ad45f9a..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/scribblings/bug-info.rkt
+++ /dev/null
@@ -1,189 +0,0 @@
-#lang racket/base
-
-(provide get-line-count
-         get-counterexample
-         get-error
-         get-category
-         get-counterexample-size
-         get-counterexample-depth
-         all-types/nums
-         type->num->cat)
-
-(define type->files
-  (hash 'stlc '(("stlc.rkt" "redex/examples"))
-        'poly-stlc '(("poly-stlc.rkt" "redex/examples"))
-        'stlc-sub '(("stlc+lists+subst.rkt" "redex/examples"))
-        'let-poly '(("let-poly.rkt" "redex/examples"))
-        'rbtrees '(("rbtrees.rkt" "redex/examples"))
-        'list-machine '(("list-machine.rkt" "redex/examples/list-machine")
-                        ("list-machine-typing.rkt" "redex/examples/list-machine"))
-        'delim-cont '(("grammar.rkt" "redex/examples/delim-cont")
-                      ("reduce.rkt" "redex/examples/delim-cont")
-                      ("meta.rkt" "redex/examples/delim-cont"))
-        'rvm '(("verification.rkt" "redex/examples/racket-machine")
-               ("grammar.rkt" "redex/examples/racket-machine")
-               ("reduction.rkt" "redex/examples/racket-machine"))))
-
-(define (type->bug-file type num)
-  (collection-file-path (format "~a-~a.rkt" type num)
-                        "redex" "benchmark" "models"
-                        (format "~a" (type->dirname type))))
-
-(define (type->dirname type)
-  (case type
-    [(stlc) 'stlc+lists]
-    [(stlc-sub) 'stlc-subst]
-    [else type]))
-
-;; the order of this list is intended to match the
-;; order of the subsections in the benchmark section
-(define type->numof/order
-  '((stlc 9)
-    (poly-stlc 9)
-    (stlc-sub 9)
-    (let-poly 7)
-    (list-machine 3)
-    (rbtrees 3)
-    (delim-cont 3)
-    (rvm there-is-no-number-here)))
-
-(define rvm-nums '(2 3 4 5 6 14 15))
-
-(define all-types/nums
-  (for*/list ([t (in-list (map car type->numof/order))]
-              [n (if (equal? t 'rvm)
-                     (in-list rvm-nums)
-                     (in-range 1 (add1 (cadr (assoc t type->numof/order)))))])
-    (list t n)))
-
-
-(define type->num->cat
-  (hash 
-   'stlc 
-   ; stlc: 1S 2M 3S 4S 5S 6M 7M 8? 9S
-   (hash 1 'S
-         2 'M
-         3 'S
-         4 'S
-         5 'S
-         6 'M
-         7 'M
-         8 'U
-         9 'S)
-   'poly-stlc
-   ; poly-stlc: 1S 2M 3S 4S 5S 6M 7M 8? 9S
-   (hash 1 'S
-         2 'M
-         3 'S
-         4 'S
-         5 'S
-         6 'M
-         7 'M
-         8 'U
-         9 'S)
-   'stlc-sub
-   ; stlc-sub: 1S 2S 3S 4M 5SM
-   (hash 1 'S
-         2 'S
-         3 'S
-         4 'D
-         5 'SM
-         6 'S
-         7 'S
-         8 'S
-         9 'SM)
-   'let-poly
-   (hash 1 'S
-         2 'D
-         3 'M
-         4 'S
-         5 'M
-         6 'M
-         7 'D)
-   'list-machine
-   ; list-machine: 1S 2M 3S
-   (hash 1 'S
-         2 'M
-         3 'S)
-   'rbtrees
-   ; rbtrees: 1SD 2SM 3SMD
-   (hash 1 'M
-         2 'M
-         3 'S)
-   'delim-cont
-   ; delim-cont: 1M 2M 3SD
-   (hash 1 'M
-         2 'M
-         3 'S)
-   'rvm
-   ; rvm: 2? 3D 4M 5M 6M 14M 15S
-   (hash 2 'M
-         3 'D
-         4 'M
-         5 'M
-         6 'M
-         14 'M
-         15 'S)))
-
-(define (get-category type num)
-  (hash-ref (hash-ref type->num->cat type) num))
-
-(define (get-line-count type)
-  (number->string
-   (for/sum ([cfp (in-list (hash-ref type->files type))])
-     (define path (apply collection-file-path cfp))
-     (line-count path))))
-
-(define (bmark-path file)
-  (collection-file-path file))
-
-(define (line-count path)
-  (call-with-input-file path
-    (λ (in)
-      (length
-       (for/list ([line (in-lines in)]
-                  #:unless (white-space/comment? line))
-         'line)))))
-
-(define (white-space/comment? line)
-  (or (regexp-match? #rx"^[ \t]*$" line)
-      (regexp-match? #rx"^[ \t]*;.*$" line)))
-
-(define (get-counterexample-size type num)
-  (define cx (get-counterexample type num))
-  (count-size cx))
-
-(define (get-counterexample-depth type num)
-  (define cx (get-counterexample type num))
-  (count-depth cx))
-
-(define (get-counterexample type num)
-  (define path (type->bug-file type num))
-  (dynamic-require path 'small-counter-example))
-
-(define (get-error type num)
-  (define path (type->bug-file type num))
-  (dynamic-require path 'the-error))
-
-(define (count-depth l)
-  (cond
-    [(list? l) (+ 1 (apply max 0 (map count-depth l)))]
-    [else 1]))
-
-(define (count-size l)
-  (cond
-    [(list? l) (apply + 1 (map count-size l))]
-    [else 1]))
-
-(module+ test
-  (require rackunit)
-  (check-equal? (count-depth 1) 1)
-  (check-equal? (count-depth '(1)) 2)
-  (check-equal? (count-depth '((1))) 3)
-  (check-equal? (count-depth '((1) (1))) 3)
-  (check-equal? (count-depth '((1) (1) (1) (1 1 1 1 1 1))) 3)
-  (check-equal? (count-size 1) 1)
-  (check-equal? (count-size '(1)) 2)
-  (check-equal? (count-size '((1))) 3)
-  (check-equal? (count-size '((1) (1))) 5)
-  (check-equal? (count-size '((1) (1) (1) (1 1 1 1 1 1))) 14))
diff --git a/pkgs/redex-pkgs/redex-doc/redex/scribblings/cite.rkt b/pkgs/redex-pkgs/redex-doc/redex/scribblings/cite.rkt
deleted file mode 100644
index 72494e8fe2..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/scribblings/cite.rkt
+++ /dev/null
@@ -1,104 +0,0 @@
-#lang at-exp racket/base
-(require scriblib/autobib
-         scribble/base
-         scribble/core)
-(provide generate-bibliography ~cite citet
-         amb1 amb2 Hanford
-         
-         racket-virtual-machine
-         palka-workshop
-         list-machine
-         delim-cont-cont)
-
-(define jar "Journal of Automated Reasoning")
-(define hosc "Higher-Order and Symbolic Computation")
-(define esop "European Symposium on Programming")
-
-(define (book-chapter-location
-          #:title title
-          #:author [author #f]
-          #:edition [edition #f]
-          #:publisher [publisher #f])
-   (let* ([s @italic{@(string-titlecase title)}]
-          [s (if edition
-                 @elem{@|s| @(string-titlecase edition) edition}
-                 s)]
-          [s (if author
-                 @elem{@|s| by @|author|}
-                 s)]
-          [s (if publisher
-                 (if s
-                     @elem{@|s|. @|publisher|}
-                     publisher)
-                 s)])
-     (unless s
-       (error 'book-chapter-location "no arguments"))
-     @elem{In @|s|}))
-
-(define-cite ~cite citet generate-bibliography)
-(define amb1
-  (make-bib #:title "A Basis for a Mathematical Theory of Computation"
-            #:author "John McCarthy"
-            #:location
-            (book-chapter-location #:title "Computer Programming and Formal Systems"
-                                   #:author (editor (authors "P. Braffort" "D. Hirschberg")))
-            #:date 1963
-            #:url "http://www-formal.stanford.edu/jmc/basis.html"))
-(define amb2
-  (make-bib #:title "Non-deterministic Lisp with dependency-directed backtracking"
-            #:author (authors "Ramin Zabih"
-                              "David McAllester"
-                              "David Chapman")
-            #:location (proceedings-location
-                        "Proceedings of the Sixth National Conference on Artificial Intelligence"
-                        #:pages '(59 64))
-            #:date 1987))
-
-(define ibm-sys "IBM Systems Journal")
-(define Hanford
-  (make-bib
-   #:author (authors "Kenneth V. Hanford")
-   #:title "Automatic generation of test cases"
-   #:location (journal-location ibm-sys
-                                #:volume 9
-                                #:number "4"
-                                #:pages '(244 257))
-   #:date "1970"
-   #:url "http://dl.acm.org/citation.cfm?id=1663480"))
-
-(define racket-virtual-machine
-  (make-bib
-   #:author (authors "Casey Klein" "Robert Bruce Findler" "Matthew Flatt")
-   #:title "The Racket virtual machine and randomized testing"
-   #:location (journal-location hosc)
-   #:date 2013
-   #:url "http://plt.eecs.northwestern.edu/racket-machine/"))
-
-(define palka-workshop
-  (make-bib
-   #:author (authors "Michał H. Pałka" "Koen Claessen"
-                     "Alejandro Russo" "John Hughes")
-   #:title "Testing an Optimising Compiler by Generating Random Lambda Terms"
-   #:location (proceedings-location "International Workshop on Automation of Software Test")
-   #:date 2011
-   #:url "http://dl.acm.org/citation.cfm?id=1982615"))
-
-(define list-machine
-  (make-bib
-   #:author (authors "Andrew W. Appel" "Robert Dockins" "Xavier Leroy")
-   #:title "A list-machine benchmark for mechanized metatheory"
-   #:location (journal-location jar
-                       #:volume 49
-                       #:number 3
-                       #:pages '(453 491))
-   #:date 2012
-   #:url "http://www.cs.princeton.edu/~appel/listmachine/"))
-
-(define delim-cont-cont
-  (make-bib
-   #:author (authors "Asumu Takikawa" "T. Stephen Strickland" "Sam Tobin-Hochstadt")
-   #:title "Constraining Delimited Control with Contracts"
-   #:location (proceedings-location esop
-                                    #:pages '(229 248))
-   #:date 2013
-   #:url "http://dl.acm.org/citation.cfm?id=2450287"))
diff --git a/pkgs/redex-pkgs/redex-doc/redex/scribblings/dynamic-typesetting-and-macros.scrbl b/pkgs/redex-pkgs/redex-doc/redex/scribblings/dynamic-typesetting-and-macros.scrbl
deleted file mode 100644
index cdceaa04a2..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/scribblings/dynamic-typesetting-and-macros.scrbl
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require racket/runtime-path)
-;; this uses a dynamic require here so that
-;; the zo compiler does not see a connection 
-;; between this file and typesetting-and-macros.scrbl
-;; so that we can avoid compiling that file. 
-(define-runtime-path typesetting-and-macros.scrbl "typesetting-and-macros.scrbl")
-(define doc (dynamic-require typesetting-and-macros.scrbl 'doc))
-(provide doc)
diff --git a/pkgs/redex-pkgs/redex-doc/redex/scribblings/info.rkt b/pkgs/redex-pkgs/redex-doc/redex/scribblings/info.rkt
deleted file mode 100644
index 6fffddbf12..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/scribblings/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang info
-;; skip this file because we want to preserve the source
-;; location information in the syntax templates so the
-;; redex examples typset properly
-(define compile-omit-paths '("typesetting-and-macros.scrbl"))
-
diff --git a/pkgs/redex-pkgs/redex-doc/redex/scribblings/mod-fx.rkt b/pkgs/redex-pkgs/redex-doc/redex/scribblings/mod-fx.rkt
deleted file mode 100644
index 4b97657f53..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/scribblings/mod-fx.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-
-(provide f)
-(define x 'X!)
-(define (f x) x)
diff --git a/pkgs/redex-pkgs/redex-doc/redex/scribblings/ref.scrbl b/pkgs/redex-pkgs/redex-doc/redex/scribblings/ref.scrbl
deleted file mode 100644
index c082a48956..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/scribblings/ref.scrbl
+++ /dev/null
@@ -1,3769 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/bnf
-          scribble/struct
-          scribble/eval
-          (for-syntax racket/base)
-          (for-label racket/base
-                     (except-in racket/gui make-color)
-                     racket/pretty
-                     racket/contract
-                     mrlib/graph
-                     (except-in 2htdp/image make-pen text)
-                     (only-in pict pict? text dc-for-text-size text-style/c
-                              vc-append hbl-append)
-                     redex))
-
-@(define-syntax (defpattech stx)
-   (syntax-case stx ()
-     [(_ arg)
-      (identifier? #'arg)
-      (let ([as (symbol->string (syntax-e #'arg))])
-        #`(index '("Redex Pattern" #,as) (deftech #:style? #f @racket[arg])))]))
-
-@(define-syntax (pattech stx)
-   (syntax-case stx ()
-     [(_ arg)
-      (identifier? #'arg)
-      #`(tech #,(symbol->string (syntax-e #'arg)))]))
-
-@(define-syntax (ttpattern stx)
-   (syntax-case stx ()
-    [(_ args ...)
-     #'((tech (racketvarfont "pattern")) args ...)]
-    [x (identifier? #'x) #'(tech (racketvarfont "pattern"))]))
-
-@(define-syntax (ttpattern-sequence stx)
-   (syntax-case stx ()
-    [(_ args ...)
-     #'((tech #:key "pattern" (racketvarfont "pattern-sequence")) args ...)]
-    [x (identifier? #'x) #'(tech #:key "pattern" (racketvarfont "pattern-sequence"))]))
-
-@(define-syntax (pattern stx)
-   (syntax-case stx ()
-    [(_ args ...)
-     #'((tech "pattern") args ...)]
-    [x (identifier? #'x) #'(tech "pattern")]))
-
-@(define-syntax (tttterm stx)
-   (syntax-case stx ()
-    [(_ args ...)
-     #'((tech (racketvarfont "term")) args ...)]
-    [x (identifier? #'x) #'(tech (racketvarfont "term"))]))
-
-@(define-syntax (tterm stx)
-   (syntax-case stx ()
-    [(_ args ...)
-     #'((tech "term") args ...)]
-    [x (identifier? #'x) #'(tech "term")]))
-
-@(define-syntax-rule (arrows a0 a ...)
-   (make-blockquote #f 
-    (list (make-paragraph 
-           (list (racketidfont (make-element #f (list (symbol->string 'a0))))
-                 (make-element #f (list " " (hspace 1) " " (racketidfont (symbol->string 'a))))
-                 ...)))))
-
-@(define (examples-link relative-path dir? text)
-   (link (format "http://git.racket-lang.org/plt/~a/HEAD:/collects/redex/examples/~a"
-                 (if dir? "tree" "blob")
-                 relative-path)
-         (filepath text)))
-
-@(define redex-eval (make-base-eval))
-@(interaction-eval #:eval redex-eval (require redex/reduction-semantics))
-
-@title{The Redex Reference}
-
-To load Redex use: @defmodule*/no-declare[(redex)] which provides all of
-the names documented in this library.
-
-Alternatively, use the @racketmodname[redex/reduction-semantics] and 
-@racketmodname[redex/pict] modules, which provide only non-GUI 
-functionality (i.e., everything except @racketmodname[redex/gui]), 
-making them suitable for programs which should not depend on 
-@racketmodname[racket/gui/base].
-
-@section{Patterns}
-
-@defmodule*/no-declare[(redex/reduction-semantics)]
-@declare-exporting[redex/reduction-semantics redex]
-
-This section covers Redex's @deftech{pattern} language, used in many
-of Redex's forms.
-
-Note that pattern matching is caching (including caching the results
-of side-conditions). This means that once a pattern has matched a
-given term, Redex assumes that it will always match that term. 
-
-This is the grammar for the Redex pattern language. Non-terminal
-references are wrapped with angle brackets; otherwise identifiers
-in the grammar are terminals.
-
-@(racketgrammar*
-   [pattern any 
-            _
-            number 
-            natural
-            integer
-            real
-            string 
-            boolean
-            variable 
-            (variable-except <id> ...)
-            (variable-prefix <id>)
-            variable-not-otherwise-mentioned
-            hole
-            symbol
-            (name <id> <pattern>)
-            (in-hole <pattern> <pattern>)
-            (hide-hole <pattern>)
-            (side-condition <pattern> guard)
-            (cross <id>)
-            (<pattern-sequence> ...)
-            <racket-constant>]
-   [pattern-sequence 
-     <pattern> 
-     (code:line ... (code:comment "literal ellipsis"))
-     ..._id])
-
-@itemize[
-
-@item{The @defpattech[any] @pattern matches any sexpression.
-This @pattern may also be suffixed with an underscore and another
-identifier, in which case they bind the full name (as if it
-were an implicit @pattech[name] @pattern) and match the portion
-before the underscore.
-}
-
-@item{The @defpattech[_] @pattern matches any sexpression,
-but does not bind @pattech[_] as a name, nor can it be suffixed to bind a name.
-}
-
-@item{The @defpattech[number] @pattern matches any number.
-This @pattern may also be suffixed with an underscore and another
-identifier, in which case they bind the full name (as if it
-were an implicit @pattech[name] @pattern) and match the portion
-before the underscore.
-}
-
-@item{The @defpattech[natural] @pattern matches any exact 
-non-negative integer.
-This @pattern may also be suffixed with an underscore and another
-identifier, in which case they bind the full name (as if it
-were an implicit @pattech[name] @pattern) and match the portion
-before the underscore.
-}
-
-@item{The @defpattech[integer] @pattern matches any exact integer.
-This @pattern may also be suffixed with an underscore and another
-identifier, in which case they bind the full name (as if it
-were an implicit @pattech[name] @pattern) and match the portion
-before the underscore.
-}
-
-@item{The @defpattech[real] @pattern matches any real number.
-This @pattern may also be suffixed with an underscore and another
-identifier, in which case they bind the full name (as if it
-were an implicit @pattech[name] @pattern) and match the portion
-before the underscore.
-}
-
-@item{The @defpattech[string] @pattern matches any string. 
-This @pattern may also be suffixed with an underscore and another
-identifier, in which case they bind the full name (as if it
-were an implicit @pattech[name] @pattern) and match the portion
-before the underscore.
-}
-
-@item{The @defpattech[boolean] @pattern matches @racket[#true] and @racket[#false]
-(which are the same as @racket[#t] and @racket[#f], respectively).
-This @pattern may also be suffixed with an underscore and another
-identifier, in which case they bind the full name (as if it
-were an implicit @pattech[name] @pattern) and match the portion
-before the underscore.
-}
-
-@item{The @defpattech[variable] @pattern matches any symbol.
-This @pattern may also be suffixed with an underscore and another
-identifier, in which case they bind the full name (as if it
-were an implicit @pattech[name] @pattern) and match the portion
-before the underscore.
-}
-
-@item{The @defpattech[variable-except] @pattern matches any symbol except those
-listed in its argument. This is useful for ensuring that
-keywords in the language are not accidentally captured by
-variables. 
-}
-
-@item{ The @defpattech[variable-prefix] @pattern matches any symbol
-that begins with the given prefix. }
-
-@item{The @defpattech[variable-not-otherwise-mentioned] @pattern matches any
-symbol except those that are used as literals elsewhere in
-the language.
-}
-
-@item{The @defpattech[hole] @pattern matches anything when inside
-the first argument to an @pattech[in-hole] @|pattern|. Otherwise, 
-it matches only a hole.
-}
-
-@item{The @defpattech[symbol] @pattern stands for a literal symbol that must
-match exactly, unless it is the name of a non-terminal in a
-relevant language or contains an underscore. 
-
-If it is a non-terminal, it matches any of the right-hand
-sides of that non-terminal. If the non-terminal appears
-twice in a single pattern, then the match is constrained
-to expressions that are the same, unless the pattern is part
-of a grammar, in which case there is no constraint.
-
-If the symbol is a non-terminal followed by an underscore,
-for example @tt{e_1}, it is implicitly the same as a name @pattern
-that matches only the non-terminal, @tt{(@pattech[name] e_1 e)} for the
-example. Accordingly, repeated uses of the same name are
-constrained to match the same expression.
-
-If the symbol is a non-terminal followed by @tt{_!_}, for example
-@tt{e_!_1}, it is also treated as a @|pattern|, but repeated uses of
-the same @pattern are constrained to be different. For
-example, this @|pattern|:
-
-@racketblock[(e_!_1 e_!_1 e_!_1)]
-
-matches lists of three @tt{e}s, but where all three of them are
-distinct.
-
-If the @tt{_!_} is used under the ellipsis then the ellipsis is effectively
-ignored. That is, a pattern like this:
-
-@racketblock[(e_!_1 ... e_!_1)]
-
-matches all sequences of @racket[e]s that have at least one element and are
-all distinct.
-
-Unlike a @tt{_} @|pattern|, the @tt{_!_} @|pattern|s do not bind names.
-
-If @tt{_} names and @tt{_!_} are mixed, they are treated as
-separate. That is, this @pattern @tt{(e_1 e_!_1)} matches just the
-same things as @tt{(e e)}, but the second doesn't bind any
-variables.
-
-If the symbol otherwise has an underscore, it is an error.
-}
-
-@item{The @pattern @tt{(@defpattech[name] symbol @ttpattern)}
-matches @ttpattern and binds using it to the name @tt{symbol}. 
-}
-
-@item{The @tt{(@defpattech[in-hole] @ttpattern @ttpattern)} @pattern
-matches the first @|ttpattern|. This match must include exactly one match
-against the second @|ttpattern|. If there are zero matches or more
-than one match, an exception is raised.
-
-When matching the first argument of in-hole, the @racket[hole] @pattern
-matches any sexpression. Then, the sexpression that matched the hole
-@pattern is used to match against the second @|pattern|.
-}
-
-@item{The @tt{(@defpattech[hide-hole] @ttpattern)} @pattern matches what
-the embedded @ttpattern matches but if the @pattern matcher is
-looking for a decomposition, it ignores any holes found in
-that @|ttpattern|.
-}
-
-@item{The @tt{(@defpattech[side-condition] @ttpattern guard)} @pattern
-matches what the embedded @ttpattern matches, and then the guard
-expression is evaluated. If it returns @racket[#f], the @pattern fails
-to match, and if it returns anything else, the @pattern matches. Any
-occurrences of @racket[name] in the @pattern (including those implicitly
-there via @tt{_} patterns) are bound using @racket[term-let] in the
-guard. 
-}
-
-@item{The @tt{(@defpattech[cross] symbol)} @pattern is used for the compatible
-closure functions. If the language contains a non-terminal with the
-same name as @racket[symbol], the @pattern @racket[(cross symbol)] matches the
-context that corresponds to the compatible closure of that
-non-terminal.
-}
-
-@item{The @tt{(@defpattech[pattern-sequence] ...)}
-@pattern matches a sexpression
-list, where each pattern-sequence element matches an element
-of the list. In addition, if a list @pattern contains an
-ellipsis, the ellipsis is not treated as a literal, instead
-it matches any number of duplicates of the @pattern that
-came before the ellipses (including 0). Furthermore, each
-@tt{(@pattech[name] symbol @ttpattern)} in the duplicated @pattern binds a
-list of matches to @tt{symbol}, instead of a single match.  (A
-nested duplicated @pattern creates a list of list matches,
-etc.) Ellipses may be placed anywhere inside the row of
-@|pattern|s, except in the first position or immediately after
-another ellipses.
-
-Multiple ellipses are allowed. For example, this @|pattern|:
-
-@racketblock[((name x a) ... (name y a) ...)]
-
-matches this sexpression:
-
-@racketblock[(@#,tttterm (a a))]
-
-three different ways. One where the first @tt{a} in the @pattern
-matches nothing, and the second matches both of the
-occurrences of @tt{a}, one where each named @pattern matches a
-single @tt{a} and one where the first matches both and the
-second matches nothing.
-
-If the ellipses is named (i.e., has an underscore and a name
-following it, like a variable may), the @pattern matcher
-records the length of the list and ensures that any other
-occurrences of the same named ellipses must have the same
-length. 
-
-As an example, this @|pattern|:
-
-@racketblock[((name x a) ..._1 (name y a) ..._1)]
-
-only matches this sexpression:
-
-@racketblock[(@#,tttterm (a a))]
-
-one way, with each named @pattern matching a single a. Unlike
-the above, the two @|pattern|s with mismatched lengths is ruled
-out, due to the underscores following the ellipses.
-
-Also, like underscore @|pattern|s above, if an underscore
-@pattern begins with @tt{..._!_}, then the lengths must be
-different.
-
-Thus, with the @|pattern|:
-
-@racketblock[((name x a) ..._!_1 (name y a) ..._!_1)]
-
-and the expression
-
-@racketblock[(@#,tttterm (a a))]
-
-two matches occur, one where @tt{x} is bound to @racket['()] and
-@tt{y} is bound to @racket['(a a)] and one where @tt{x} is bound to
-@racket['(a a)] and @tt{y} is
-bound to @racket['()].
-
-}
-]
-
-@defform*[[(redex-match lang @#,ttpattern any)
-           (redex-match lang @#,ttpattern)]]{
-          
-If @racket[redex-match] receives three arguments, it
-matches the pattern (in the language) against its third
-argument. If it matches, this returns a list of match
-structures describing the matches (see @racket[match?] and 
-@racket[match-bindings]). If it fails, it returns
-@racket[#f].
-
-If @racket[redex-match] receives only two arguments, it
-builds a procedure for efficiently testing if expressions
-match the pattern, using the language @racket[lang]. The
-procedures accepts a single expression and if the expression
-matches, it returns a list of match structures describing the
-matches. If the match fails, the procedure returns @racket[#f].
-
-@examples[#:eval 
-          redex-eval
-          (define-language nums
-            (AE number
-                (+ AE AE)))
-          (redex-match nums
-                       (+ AE_1 AE_2)
-                       (term (+ (+ 1 2) 3)))
-          (redex-match nums
-                       (+ AE_1 (+ AE_2 AE_3))
-                       (term (+ (+ 1 2) 3)))
-          (redex-match nums
-                       (+ AE_1 AE_1)
-                       (term (+ (+ 1 2) 3)))]
-
-}
-
-@defform*[[(redex-match? lang @#,ttpattern any)
-           (redex-match? lang @#,ttpattern)]]{
-          
-Like @racket[redex-match], except it returns only a boolean
-indicating if the match was successful.
-
-@examples[#:eval 
-          redex-eval
-          (define-language nums
-            (AE number
-                (+ AE AE)))
-          (redex-match? nums
-                        (+ AE_1 AE_2)
-                        (term (+ (+ 1 2) 3)))
-          (redex-match? nums
-                        (+ AE_1 AE_1)
-                        (term (+ (+ 1 2) 3)))]
-
-}
-
-@defproc[(match? [val any/c]) boolean?]{
-
-Determines if a value is a @tt{match} structure.
-}
-
-@defproc[(match-bindings [m match?]) (listof bind?)]{
-
-This returns a list of @racket[bind] structs that
-binds the pattern variables in this match.
-}
-
-@defstruct[bind ([name symbol?] [exp any/c])]{
-
-Instances of this struct are returned by @racket[redex-match].
-Each @racket[bind] associates a name with an s-expression from the
-language, or a list of such s-expressions, if the @tt{(@pattech[name] ...)}
-clause is followed by an ellipsis.  Nested ellipses produce
-nested lists.
-}
-
-@defparam[caching-enabled? on? boolean?]{
-  When this parameter is @racket[#t] (the default), Redex caches the results of 
-  pattern matching and metafunction evaluation. There is a separate cache for
-  each pattern and metafunction; when one fills (see @racket[set-cache-size!]),
-  Redex evicts all of the entries in that cache.
-
-  Caching should be disabled when matching a pattern that depends on values
-  other than the in-scope pattern variables or evaluating a metafunction
-  that reads or writes mutable external state.
-}
-
-@defproc[(set-cache-size! [size positive-integer?]) void?]{
-Changes the size of the per-pattern and per-metafunction caches.
-
-The default size is @racket[350].
-}
-
-@defparam[check-redudancy check? boolean?]{
-  Ambiguous patterns can slow down
-  Redex's pattern matching implementation significantly. To help debug
-  such performance issues, set the @racket[check-redundancy]
-  parameter to @racket[#t]. This causes Redex to, at runtime,
-  report any redundant matches that it encounters.
-}
-
-@section{Terms}
-
-@declare-exporting[redex/reduction-semantics redex]
-
-Object language expressions in Redex are written using
-@racket[term]. It is similar to Racket's @racket[quote] (in
-many cases it is identical) in that it constructs lists as
-the visible representation of terms. 
-
-The grammar of @deftech{term}s is (note that an ellipsis
-stands for repetition unless otherwise indicated):
-
-@(racketgrammar* #:literals (in-hole hole unquote unquote-splicing) 
-   [term identifier
-         (term-sequence ...)
-         ,racket-expression
-         (in-hole term term)
-         hole
-         #t #f
-         string]
-   [term-sequence 
-     term
-     ,@racket-expression
-     (code:line ... (code:comment "literal ellipsis"))])
-
-@itemize[
-
-@item{A term written @racket[_identifier] is equivalent to the
-corresponding symbol, unless the identifier is bound by
-@racket[term-let], @racket[define-term], or a @|pattern| variable or
-the identifier is @tt{hole} (as below).}
-
-@item{A term written @racket[(_term-sequence ...)] constructs a list of
-the terms constructed by the sequence elements.}
-
-@item{A term written @racket[,_racket-expression] evaluates the
-@racket[racket-expression] and substitutes its value into the term at
-that point.}
-
-@item{A term written @racket[,@_racket-expression] evaluates the
-@racket[racket-expression], which must produce a list. It then splices
-the contents of the list into the expression at that point in the sequence.}
-
-@item{A term written @racket[(in-hole #,tttterm #,tttterm)]
- is the dual to the @pattern @racket[in-hole] -- it accepts
- a context and an expression and uses @racket[plug] to combine
-them.}
-
-@item{A term written @racket[hole] produces a hole.}
-
-@item{A term written as a literal boolean or a string
-produces the boolean or the string.}
-]
-
-@defform*[[(term @#,tttterm) (term @#,tttterm #:lang lang-id)]]{
-
-Used for construction of a term.
-
-It behaves similarly to @racket[quasiquote], except for a few special
-forms that are recognized (listed below) and that names bound by
-@racket[term-let] are implicitly substituted with the values that
-those names were bound to, expanding ellipses as in-place sublists (in
-the same manner as syntax-case patterns).
-
-The optional @racket[#:lang] keyword must supply an identifier bound
-by @racket[define-language], and adds a check that any symbol containing
-an underscore in @tttterm could have been bound by a pattern in the
-language referenced by @racket[lang-id].  In practice, this means that the
-underscore must be preceded by a non-terminal in that language or a
-built-in @ttpattern such as @racket[number].  This form of @racket[term]
-is used internally by default, so this check is applied to terms 
-that are constructed by Redex forms such as @racket[reduction-relation] 
-and @racket[define-metafunction].
-
-For example,
-
-@racketblock[
-(term-let ([body '(+ x 1)]
-           [(expr ...) '(+ - (values * /))]
-           [((id ...) ...) '((a) (b) (c d))])
-  (term (let-values ([(id ...) expr] ...) body)))
-]
-
-evaluates to
-
-@racketblock[
-'(let-values ([(a) +] 
-              [(b) -] 
-              [(c d) (values * /)]) 
-   (+ x 1))
-]
-
-It is an error for a term variable to appear in an
-expression with an ellipsis-depth different from the depth
-with which it was bound by @racket[term-let]. It is also an error
-for two @racket[term-let]-bound identifiers bound to lists of
-different lengths to appear together inside an ellipsis.
-}
-
-@defidform[hole]{ Recognized specially within
-  @racket[term]. A @racket[hole] form is an
-  error elsewhere.  }
-
-@defidform[in-hole]{ Recognized specially within
-  @racket[reduction-relation]. An @racket[in-hole] form is an
-  error elsewhere.  }
-
-@defform/subs[(term-let ([tl-pat expr] ...) body)
-              ([tl-pat identifier (tl-pat-ele ...)]
-               [tl-pat-ele tl-pat (code:line tl-pat ... (code:comment "a literal ellipsis"))])]{
-
-Matches each given id pattern to the value yielded by
-evaluating the corresponding expression and binds each variable in
-the id pattern to the appropriate value (described
-below). These bindings are then accessible to the @|tttterm|
-syntactic form.
-
-Note that each ellipsis should be the literal symbol consisting of
-three dots (and the ... elsewhere indicates repetition as usual). If
-@racket[tl-pat] is an identifier, it matches any value and binds it to
-the identifier, for use inside @racket[term]. If it is a list, it
-matches only if the value being matched is a list value and only if
-every subpattern recursively matches the corresponding list
-element. There may be a single ellipsis in any list pattern; if one is
-present, the pattern before the ellipses may match multiple adjacent
-elements in the list value (possibly none).
-
-This form is a lower-level form in Redex, and not really designed to
-be used directly. For @racket[let]-like forms that use
-Redex's full pattern matching facilities, see @racket[redex-let],
-@racket[redex-let*], @racket[term-match], @racket[term-match/single].
-}
-
-@defform[(redex-let language ([@#,ttpattern expression] ...) body ...+)]{
-Like @racket[term-let] but the left-hand sides are Redex patterns, 
-interpreted according to the specified language. It is a syntax
-error for two left-hand sides to bind the same pattern variable.
-
-This form raises an exception recognized by @racket[exn:fail:redex?] 
-if any right-hand side does not match its left-hand side in exactly one 
-way. 
-
-In some contexts, it may be more efficient to use @racket[term-match/single]
-(lifted out of the context).
-}
-
-@defform[(redex-let* language ([@#,ttpattern expression] ...) body ...+)]{
-The @racket[let*] analog of @racket[redex-let].
-}
-
-@defform[(define-term identifier @#,tttterm)]{
-Defines @racket[identifier] for use in @|tterm| templates.}
-
-@defform[(term-match language [@#,ttpattern expression] ...)]{
-
-This produces a procedure that accepts term (or quoted)
-expressions and checks them against each pattern. The
-function returns a list of the values of the expression
-where the pattern matches. If one of the patterns matches
-multiple times, the expression is evaluated multiple times,
-once with the bindings in the pattern for each match.
-
-When evaluating a @racket[term-match] expression, the patterns are
-compiled in an effort to speed up matching. Using the procedural
-result multiple times to avoid compiling the patterns multiple times.
-}
-
-@defform[(term-match/single language [@#,ttpattern expression] ...)]{
-
-This produces a procedure that accepts term (or quoted)
-expressions and checks them against each pattern. The
-function returns the expression behind the first successful
-match. If that pattern produces multiple matches, an error
-is signaled. If no patterns match, an error is signaled.
-
-Raises an exception recognized by @racket[exn:fail:redex?] if
-no clauses match or if one of the clauses matches multiple ways.
-
-When evaluating a @racket[term-match/single] expression, the patterns
-are compiled in an effort to speed up matching. Using the procedural
-result multiple times to avoid compiling the patterns multiple times.
-}
-
-@defproc[(plug [context any/c] [expression any/c]) any]{
-
-The first argument to this function is an sexpression to
-plug into. The second argument is the sexpression to replace
-in the first argument. It returns the replaced term. This is
-also used when a @racket[term] sub-expression contains @tt{in-hole}.
-}
-
-@defproc[(variable-not-in [t any/c] [var symbol?]) symbol?]{
-
-This helper function accepts an sexpression and a
-variable. It returns a variable not in the sexpression with
-a prefix the same as the second argument.
-
-}
-
-@defproc[(variables-not-in [t any/c] [vars (listof symbol?)]) (listof symbol?)]{
-
-This function, like variable-not-in, makes variables that do
-no occur in its first argument, but it returns a list of
-such variables, one for each variable in its second
-argument. 
-
-Does not expect the input symbols to be distinct, but does
-produce variables that are always distinct.
-}
-
-@defproc[(exn:fail:redex? [v any/c]) boolean?]{
-  Returns @racket[#t] if its argument is a Redex exception record, and
-  @racket[#f] otherwise.
-}
-
-@section{Languages}
-
-@declare-exporting[redex/reduction-semantics redex]
-
-@defform/subs[#:literals (::=)
-              (define-language lang-name 
-                non-terminal-def ...)
-              ([non-terminal-def (non-terminal-name ...+ ::= @#,ttpattern ...+)
-                                 (non-terminal-name @#,ttpattern ...+)
-                                 ((non-terminal-name ...+) @#,ttpattern ...+)])]{
-
-This form defines the grammar of a language. It allows the
-definition of recursive @|pattern|s, much like a BNF, but for
-regular-tree grammars. It goes beyond their expressive
-power, however, because repeated @racket[name] @|pattern|s and
-side-conditions can restrict matches in a context-sensitive
-way.
-
-A @racket[non-terminal-def] comprises one or more non-terminal names
-(considered aliases) followed by one or more productions.
-
-For example, the following defines @deftech{@racket[_lc-lang]} as the
-grammar of the λ-calculus:
-
-@racketblock[
-  (define-language lc-lang
-    (e (e e ...)
-       x
-       v)
-    (c (v ... c e ...)
-       hole)
-    (v (λ (x ...) e))
-    (x variable-not-otherwise-mentioned))
-]
-
-with non-terminals @racket[e] for the expression language, @racket[x] for
-variables, @racket[c] for the evaluation contexts and @racket[v] for values.
-}
-
-@defidform[::=]{
-A non-terminal's names and productions may be separated by the keyword @racket[::=].
-Use of the @racket[::=] keyword outside a language definition is a syntax error.
-}
-
-@defform/subs[#:literals (::=)
-              (define-extended-language extended-lang base-lang 
-                non-terminal-def ...)
-              ([non-terminal-def (non-terminal-name ...+ ::= @#,ttpattern ...+)
-                                 (non-terminal-name @#,ttpattern ...+)
-                                 ((non-terminal-name ...+) @#,ttpattern ...+)])]{
-
-This form extends a language with some new, replaced, or
-extended non-terminals. For example, this language:
-
-@racketblock[
-  (define-extended-language lc-num-lang
-    lc-lang
-    (v ....     (code:comment "extend the previous `v' non-terminal")
-       number
-       +)
-    (x (variable-except λ +)))
-]
-
-extends @racket[_lc-lang] with two new alternatives (@racket[+] and @racket[number])
-for the @racket[v] non-terminal, carries forward the @racket[e] 
-and @racket[c] non-terminals, and replaces the @racket[x] non-terminal 
-with a new one (which happens to be equivalent to the one that would 
-have been inherited).
-
-The four-period ellipses indicates that the new language's
-non-terminal has all of the alternatives from the original
-language's non-terminal, as well as any new ones. If a
-non-terminal occurs in both the base language and the
-extension, the extension's non-terminal replaces the
-originals. If a non-terminal only occurs in either the base
-language, then it is carried forward into the
-extension. And, of course, extend-language lets you add new
-non-terminals to the language.
-
-If a language is has a group of multiple non-terminals
-defined together, extending any one of those non-terminals
-extends all of them.
-}
-
-@defform/subs[(define-union-language L base/prefix-lang ...)
-              ([base/prefix-lang lang-id
-                                 (prefix lang-id)])]{
-  Constructs a language that is the union of all of the
-  languages listed in the @racket[base/prefix-lang].
-  
-  If the two languages have non-terminals in common, then 
-  @racket[define-union-language] will combine all of the productions
-  of the common non-terminals. For example, this definition of @racket[L]:
-  @racketblock[(define-language L1
-                 (e ::=
-                    (+ e e) 
-                    number))
-               (define-language L2
-                 (e ::=
-                    (if e e e)
-                    true 
-                    false))
-               (define-union-language L L1 L2)]
-  is equivalent to this one:
-  @racketblock[(define-language L
-                 (e ::=
-                    (+ e e) 
-                    number
-                    (if e e e)
-                    true 
-                    false))]
-  
-  If a language has a prefix, then all of the non-terminals
-  from that language have the corresponding prefix in 
-  the union language. The prefix helps avoid unintended collisions
-  between the constituent language's non-terminals.
-  
-  For example, with two these two languages:
-  @racketblock[(define-language UT
-                 (e (e e)
-                    (λ (x) e)
-                    x))
-               
-               (define-language WT
-                 (e (e e)
-                    (λ (x t) e)
-                    x)
-                 (t (→ t t)
-                    num))]
-  then this declaration:
-  @racketblock[(define-union-language B (ut. UT) (wt. WT))]
-  will create a language named @racket[B] containing the non-terminals
-  @racket[ut.e], @racket[wt.e], and @racket[wt.t] consisting
-  of the productions listed in the original languages.
-}
-                                                                                
-@defproc[(language-nts [lang compiled-lang?]) (listof symbol?)]{
-
-Returns the list of non-terminals (as symbols) that are
-defined by this language.
-}
-
-@defproc[(compiled-lang? [l any/c]) boolean?]{
-
-Returns @racket[#t] if its argument was produced by @racket[language], @racket[#f]
-otherwise.
-}
-
-@section{Reduction Relations}
-
-@declare-exporting[redex/reduction-semantics redex]
-
-@defform/subs[#:literals (--> fresh side-condition side-condition/hidden
-                          where where/hidden judgment-holds with)
-              (reduction-relation language domain base-arrow
-                                  reduction-case ...
-                                  shortcuts)
-              ([domain (code:line) (code:line #:domain @#,ttpattern)]
-               [base-arrow (code:line) (code:line #:arrow base-arrow-name)]
-               [reduction-case (arrow-name @#,ttpattern @#,tttterm red-extras ...)]
-               [red-extras rule-name
-                           (fresh fresh-clause ...)
-                           (side-condition racket-expression)
-                           (where @#,ttpattern @#,tttterm)
-                           (judgment-holds (judgment-form-id pat/term ...))
-                           (side-condition/hidden racket-expression)
-                           (where/hidden @#,ttpattern @#,tttterm)]
-               [shortcuts (code:line)
-                          (code:line with shortcut ...)]
-               [shortcut [(old-arrow-name @#,ttpattern @#,tttterm)
-                          (new-arrow-name identifier identifier)]]
-               [rule-name identifier
-                          string 
-                          (computed-name racket-expression)]
-               [fresh-clause var ((var1 ...) (var2 ...))]
-               [pat/term @#,ttpattern
-                         @#,tttterm])]{
-
-Defines a reduction relation case-wise, one case for each of the
-@racket[reduction-case] clauses. 
-
-The optional @racket[domain] clause provides a contract for the
-relation, in the form of a pattern that defines the relation's 
-domain and codomain.
-
-The @racket[arrow-name] in each @racket[reduction-case] clause is either 
-@racket[base-arrow-name] (default @racket[-->]) or an arrow name
-defined by @racket[shortcuts] (described below). In either case, 
-the @|pattern| refers to @racket[language] and binds variables in
-the corresponding @|tterm|. Following the @|pattern| and @|tterm|
-can be the name of the reduction rule and declarations of fresh
-variables and side-conditions.
-
-For example, the expression
-
-@racketblock[
-  (reduction-relation
-   lc-lang
-   (--> (in-hole c_1 ((λ (variable_i ...) e_body) v_i ...))
-        (in-hole c_1 ,(foldl lc-subst 
-                             (term e_body) 
-                             (term (v_i ...)) 
-                             (term (variable_i ...))))
-        beta-v))
-]
-
-defines a reduction relation for the @tech{@racket[_lc-lang]} grammar.
-
-A rule's name (used in @seclink["Typesetting" "typesetting"],
-the @racket[stepper], @racket[traces], and 
-@racket[apply-reduction-relation/tag-with-names]) can be given
-as a literal (an identifier or a string) or as an expression
-that computes a name using the values of the bound pattern
-variables (much like the rule's right-hand side). Some operations
-require literal names, so a rule definition may provide both
-a literal name and a computed name. In particular, only rules that include
-a literal name may be replaced using @racket[extend-reduction-relation],
-used as breakpoints in the @racket[stepper], and selected using
-@racket[render-reduction-relation-rules]. The output of 
-@racket[apply-reduction-relation/tag-with-names], @racket[traces], and
-the @racket[stepper] prefers the computed name, if it exists. Typesetting
-a rule with a computed name shows the expression that computes the name
-only when the rule has no literal name or when it would not typeset in 
-pink due to @racket[with-unquote-rewriter]s in the context; otherwise,
-the literal name (or nothing) is shown.
-
-Fresh variable clauses generate variables that do not
-occur in the term being reduced. If the @racket[fresh-clause] is a
-variable, that variable is used both as a binding in the
-@|tterm| and as the prefix for the freshly generated
-variable. (The variable does not have to be
-a non-terminal in the language of the reduction relation.)
-
-The second form of @racket[fresh-clause]s generates 
-a sequence of variables. In that case, the ellipses
-are literal ellipses; that is, you must actually write
-ellipses in your rule. The variable @racket[var1] is like the
-variable in first case of a @racket[fresh-clause]; namely it is
-used to determine the prefix of the generated variables and
-it is bound in the right-hand side of the reduction rule,
-but unlike the single-variable fresh clause, it is bound to
-a sequence of variables. The variable @racket[var2] is used to
-determine the number of variables generated and @racket[var2] must be
-bound by the left-hand side of the rule.
-
-The expressions within @as-index{@racket[side-condition] clause}s
-and @as-index{@racket[side-condition/hidden] clause}s are collected with @racket[and] and
-used as guards on the case being matched. The argument to each
-side-condition should be a Racket expression, and the pattern
-variables in the @|ttpattern| are bound in that expression. A
-@racket[side-condition/hidden] clause is the same as
-a @racket[side-condition] clause, except that the condition is not
-rendered when typesetting via @racketmodname[redex/pict].
-
-Each @deftech{@racket[where] clause} acts as a side condition requiring a
-successful pattern match, and it can bind pattern variables in the
-side-conditions (and @racket[where] clauses) that follow and in the
-metafunction result. The bindings are the same as bindings in a
-@racket[term-let] expression. A @as-index{@racket[where/hidden] clause} is the
-same as a @racket[where] clause, but the clause is not
-rendered when typesetting via @racketmodname[redex/pict].
-
-Each @racket[judgment-holds] clause acts like a @racket[where] clause, where
-the left-hand side pattern incorporates each of the patterns used in the 
-judgment form's output positions.
-
-Each @racket[shortcut] clause defines arrow names in terms of 
-@racket[base-arrow-name] and earlier @racket[shortcut] definitions.
-The left- and right-hand sides of a @racket[shortcut] definition 
-are identifiers, not @|pattern|s and @|tterm|s. These identifiers
-need not correspond to non-terminals in @racket[language].
-
-For example, this expression
-
-@racketblock[
-  (reduction-relation
-   lc-num-lang
-   (==> ((λ (variable_i ...) e_body) v_i ...)
-        ,(foldl lc-subst 
-                (term e_body) 
-                (term (v_i ...)) 
-                (term (variable_i ...))))
-   (==> (+ number_1 ...)
-        ,(apply + (term (number_1 ...))))
-   
-   with
-   [(--> (in-hole c_1 a) (in-hole c_1 b))
-    (==> a b)])
-]
-  
-defines reductions for the λ-calculus with numbers,
-where the @tt{==>} shortcut is defined by reducing in the context
-@tt{c}.
-
-A @racket[fresh] clause in @racket[reduction-case] defined by shortcut
-refers to the entire term, not just the portion matched by the left-hand
-side of shortcut's use.
-}
-
-@defform[(extend-reduction-relation reduction-relation language more ...)]{
-
-This form extends the reduction relation in its first
-argument with the rules specified in @racket[more]. They should
-have the same shape as the rules (including the @racket[with]
-clause) in an ordinary @racket[reduction-relation].
-
-If the original reduction-relation has a rule with the same
-name as one of the rules specified in the extension, the old
-rule is removed.
-
-In addition to adding the rules specified to the existing
-relation, this form also reinterprets the rules in the
-original reduction, using the new language.
-}
-@defproc[(union-reduction-relations [r reduction-relation?] ...) 
-         reduction-relation?]{
-
-Combines all of the argument reduction relations into a
-single reduction relation that steps when any of the
-arguments would have stepped.
-}
-
-@defproc[(reduction-relation->rule-names [r reduction-relation?])
-         (listof symbol?)]{
-
-Returns the names of the reduction relation's named clauses.
-}
-
-@defform[(compatible-closure reduction-relation lang non-terminal)]{
-
-This accepts a reduction, a language, the name of a
-non-terminal in the language and returns the compatible
-closure of the reduction for the specified non-terminal.
-}
-
-@defform[(context-closure reduction-relation lang pattern)]{
-
-This accepts a reduction, a language, a pattern representing
-a context (i.e., that can be used as the first argument to
-@racket[in-hole]; often just a non-terminal) in the language and
-returns the closure of the reduction in that context.
-}
-
-@defproc[(reduction-relation? [v any/c]) boolean?]{
-  Returns @racket[#t] if its argument is a reduction-relation, and
-  @racket[#f] otherwise.
-}
-
-@defproc[(apply-reduction-relation [r reduction-relation?] [t any/c]) (listof any/c)]{
-
-This accepts reduction relation, a term, and returns a
-list of terms that the term reduces to.
-}
-
-@defproc[(apply-reduction-relation/tag-with-names
-          [r reduction-relation?]
-          [t any/c])
-         (listof (list/c (union false/c string?) any/c))]{
-
-Like @racket[apply-reduction-relation], but the result indicates the
-names of the reductions that were used.
-}
-
-@defproc[(apply-reduction-relation*
-          [r reduction-relation?]
-          [t any/c]
-          [#:cache-all? cache-all? boolean? (current-cache-all?)]
-          [#:stop-when stop-when (-> any/c any) (λ (x) #f)])
-         (listof any/c)]{
-
-Accepts a reduction relation and a
-term. Starting from @racket[t], it follows every reduction
-path and returns all of the terms that do not reduce further.
-If there are infinite reduction
-sequences that do not repeat, this function will not
-terminate (it does terminate if the only infinite reduction paths are cyclic).
-
-If the @racket[cache-all?] argument is @racket[#t], then @racket[apply-reduction-relation*]
-keeps a cache of all visited terms when traversing the graph and does not revisit
-any of them. This cache can, in some cases, use a lot of memory, so it is off by
-default and the cycle checking happens by keeping track only of the current path
-it is traversing through the reduction graph.
-
-The @racket[stop-when] argument controls the stopping criterion. Specifically, it is
-called with each term that @racket[apply-reduction-relation*] encounters. If it
-ever returns a true value (anything except @racket[#f]), then @racket[apply-reduction-relation*]
-considers the term to be irreducible (and so returns it and does not try to
-reduce it further).
-
-}
-
-@defparam[current-cache-all? cache-all? boolean?]{
-  Controls the behavior of @racket[apply-reduction-relation*]
-  and @racket[test-->>]'s cycle checking. See @racket[apply-reduction-relation*]
-  for more details.
-}
-
-@examples[
-#:eval redex-eval
-       (define-language empty-lang)
-       (define R
-         (reduction-relation
-          empty-lang
-          (--> 0 1)
-          (--> 0 2)
-          (--> 2 3)
-          (--> 3 3)))
-       (apply-reduction-relation R 0)
-       (apply-reduction-relation* R 0)]
-
-@defidform[-->]{ Recognized specially within
-  @racket[reduction-relation]. A @racket[-->] form is an
-  error elsewhere.  }
-
-@defidform[fresh]{ Recognized specially within
-  @racket[reduction-relation]. A @racket[fresh] form is an
-  error elsewhere.  }
-
-@defidform[with]{ Recognized specially within
-  @racket[reduction-relation]. A @racket[with] form is an
-  error elsewhere.  }
-
-@section{Other Relations}
-
-@declare-exporting[redex/reduction-semantics redex]
-
-@defform/subs[#:literals (: -> 
-                          where side-condition 
-                          side-condition/hidden where/hidden 
-                          judgment-holds)
-             (define-metafunction language
-               metafunction-contract
-               [(name @#,ttpattern ...) @#,tttterm metafunction-extras ...] 
-               ...)
-             ([metafunction-contract (code:line) 
-                                     (code:line id : @#,ttpattern-sequence ... -> range
-                                                maybe-pre-condition
-                                                maybe-post-condition)]
-              [maybe-pre-condition (code:line #:pre @#,tttterm)
-                                   (code:line)]
-              [maybe-post-condition (code:line #:post @#,tttterm)
-                                    (code:line)]
-              [range @#,ttpattern
-                     (code:line @#,ttpattern or range)
-                     (code:line @#,ttpattern ∨ range)
-                     (code:line @#,ttpattern ∪ range)]
-              [metafunction-extras (side-condition racket-expression)
-                                   (side-condition/hidden racket-expression)
-                                   (where pat @#,tttterm)
-                                   (where/hidden pat @#,tttterm)
-                                   (judgment-holds 
-                                    (judgment-form-id pat/term ...))
-                                   (clause-name name)
-                                   (code:line or @#,tttterm)])]{
-
-The @racket[define-metafunction] form builds a function on
-sexpressions according to the pattern and right-hand-side
-expressions. The first argument indicates the language used
-to resolve non-terminals in the pattern expressions. Each of
-the rhs-expressions is implicitly wrapped in @|tttterm|. 
-
-The contract, if present, is matched against every input to
-the metafunction and, if the match fails, an exception is raised.
-If present, the term inside the @racket[maybe-pre-condition] is evaluated
-after a successful match to the input pattern in the contract (with
-any variables from the input contract bound). If
-it returns @racket[#f], then the input contract is considered to not
-have matched and an error is also raised. When a metafunction
-returns, the expression in the @racket[maybe-post-condition] is
-evaluated (if present), with any variables from the input or output 
-contract bound.
-
-The @racket[side-condition], @racket[hidden-side-condition],
-@racket[where], and @racket[where/hidden] clauses behave as
-in the @racket[reduction-relation] form.
-
-The resulting metafunction raises an exception recognized by @racket[exn:fail:redex?] if
-no clauses match or if one of the clauses matches multiple ways
-(and that leads to different results for the different matches).
-
-The @racket[side-condition] extra is evaluated after a successful match
-to the corresponding argument pattern. If it returns @racket[#f],
-the clause is considered not to have matched, and the next one is tried.
-The @racket[side-condition/hidden] extra behaves the same, but is
-not typeset.
-
-The @racket[where] and @racket[where/hidden] extra are like
-@racket[side-condition] and @racket[side-condition/hidden],
-except the match guards the clause.
-
-The @racket[judgment-holds] clause is like @racket[side-condition]
-and @racket[where], except the given judgment must hold for the
-clause to be taken.
-
-The @racket[clause-name] is used only when typesetting. See
-@racket[metafunction-cases].
-
-Note that metafunctions are assumed to always return the same results
-for the same inputs, and their results are cached, unless
-@racket[caching-enabled?] is set to @racket[#f]. Accordingly, if a
-metafunction is called with the same inputs twice, then its body is
-only evaluated a single time.
-
-As an example, these metafunctions finds the free variables in
-an expression in the @racket[_lc-lang] above:
-
-@racketblock[
-    (define-metafunction lc-lang
-      free-vars : e -> (x ...)
-      [(free-vars (e_1 e_2 ...))
-       (∪ (free-vars e_1) (free-vars e_2) ...)]
-      [(free-vars x) (x)]
-      [(free-vars (λ (x ...) e))
-       (- (free-vars e) (x ...))])
-]
-
-The first argument to define-metafunction is the grammar
-(defined above). Following that are three cases, one for
-each variation of expressions (e in @racket[_lc-lang]). The free variables of an
-application are the free variables of each of the subterms;
-the free variables of a variable is just the variable
-itself, and the free variables of a λ expression are
-the free variables of the body, minus the bound parameters.
-
-Here are the helper metafunctions used above.
-
-@racketblock[
-    (define-metafunction lc-lang
-      ∪ : (x ...) ... -> (x ...)
-      [(∪ (x_1 ...) (x_2 ...) (x_3 ...) ...)
-       (∪ (x_1 ... x_2 ...) (x_3 ...) ...)]
-      [(∪ (x_1 ...))
-       (x_1 ...)]
-      [(∪) ()])
-    
-    (define-metafunction lc-lang
-      - : (x ...) (x ...) -> (x ...)
-      [(- (x ...) ()) (x ...)]
-      [(- (x_1 ... x_2 x_3 ...) (x_2 x_4 ...))
-       (- (x_1 ... x_3 ...) (x_2 x_4 ...))
-       (side-condition (not (memq (term x_2) (term (x_3 ...)))))]
-      [(- (x_1 ...) (x_2 x_3 ...))
-       (- (x_1 ...) (x_3 ...))])
-]
-
-Note the side-condition in the second case of @racket[-]. It
-ensures that there is a unique match for that case. Without
-it, @racket[(term (- (x x) x))] would lead to an ambiguous
-match.
-
-The @racket[or] clause is used to define a form of conditional
-right-hand side of a metafunction. In particular, if any of the
-@racket[where] or @racket[side-condition] clauses fail, then
-evaluation continues after an @racket[or] clause, treating the
-term that follows as the result (subject to any subsequent
-@racket[where] clauses or @racket[side-condition]s. This construction
-is equivalent to simply duplicating the left-hand side of the
-clause, once for each @racket[or] expression, but signals to
-the typesetting library to use a large left curly brace to group
-the conditions in the @racket[or].
-
-@history[#:changed "1.4" @list{Added @racket[#:post] conditions.}]
-         #:changed "1.5" @list{Added @racket[or] clauses.}]
-}
-
-@defform[(define-metafunction/extension f language 
-           metafunction-contract
-           [(g @#,ttpattern ...) @#,tttterm metafunction-extras ...] 
-           ...)]{
-
-Defines a metafunction @racket[g] as an extension of an existing
-metafunction @racket[f]. The metafunction @racket[g] behaves as 
-if @racket[f]'s clauses were appended to its definition (with 
-occurrences of @racket[f] changed to @racket[g] in the inherited
-clauses).
-}
-
-For example, @racket[define-metafunction/extension] may be used to extend
-the free-vars function above to the forms introduced by the language
-@racket[_lc-num-lang].
-                
-@racketblock[
-(define-metafunction/extension free-vars lc-num-lang
-  free-vars-num : e -> (x ...)
-  [(free-vars-num number) 
-   ()]
-  [(free-vars-num (+ e_1 e_2))
-   (∪ (free-vars-num e_1)
-      (free-vars-num e_2))])
-]
-                
-@defform[(in-domain? (metafunction-name @#,tttterm ...))]{
-Returns @racket[#t] if the inputs specified to @racket[metafunction-name] are
-legitimate inputs according to @racket[metafunction-name]'s contract,
-and @racket[#f] otherwise.
-}
-
-@defform/subs[#:literals (I O where where/hidden side-condition side-condition/hidden etc.)
-             (define-judgment-form language
-               mode-spec
-               contract-spec
-               invariant-spec
-               rule rule ...)
-             ([mode-spec (code:line #:mode (form-id pos-use ...))]
-              [contract-spec (code:line) 
-                             (code:line #:contract (form-id @#,ttpattern-sequence ...))]
-              [invariant-spec (code:line #:inv @#,tttterm)
-                                   (code:line)]
-              [pos-use I
-                       O]
-              [rule [premise
-                     ... 
-                     dashes rule-name
-                     conclusion]
-                    [conclusion 
-                     premise 
-                     ...
-                     rule-name]]
-              [conclusion (form-id pat/term ...)]
-              [premise (code:line (judgment-form-id pat/term ...) maybe-ellipsis)
-                       (where @#,ttpattern @#,tttterm)
-                       (where/hidden @#,ttpattern @#,tttterm)
-                       (side-condition @#,tttterm)
-                       (side-condition/hidden @#,tttterm)]
-              [rule-name (code:line)
-                         string
-                         non-ellipsis-non-hypens-var]
-              [pat/term @#,ttpattern
-                        @#,tttterm]
-              [maybe-ellipsis (code:line)
-                              ...]
-              [dashes ---
-                      ----
-                      -----
-                      etc.])]{
-Defines @racket[form-id] as a relation on terms via a set of inference rules.
-Each rule must be such that its premises can be evaluated left-to-right
-without ``guessing'' values for any of their pattern variables. Redex checks this
-property using the mandatory @racket[mode-spec] declaration, which partitions positions
-into inputs @racket[I] and outputs @racket[O]. Output positions in conclusions
-and input positions in premises must be @|tttterm|s; input positions in conclusions and 
-output positions in premises must be @|ttpattern|s. When the optional @racket[contract-spec] 
-declaration is present, Redex dynamically checks that the terms flowing through
-these positions match the provided patterns, raising an exception recognized by 
-@racket[exn:fail:redex] if not. The term in the optional @racket[invariant-spec] is
-evaluated after the output positions have been computed and the contract has matched
-successfully, with variables from the contract bound; a result of @racket[#f] is
-considered to be a contract violation and an exception is raised.
-
-For example, the following defines addition on natural numbers:
-@interaction[
-#:eval redex-eval
-       (define-language nats
-         (n ::= z (s n)))
-       (define-judgment-form nats
-         #:mode (sum I I O)
-         #:contract (sum n n n)
-         [-----------  "zero"
-          (sum z n n)]
-         
-         [(sum n_1 n_2 n_3)
-          ------------------------- "add1"
-          (sum (s n_1) n_2 (s n_3))])]
-
-The @racket[judgment-holds] form checks whether a relation holds for any 
-assignment of pattern variables in output positions.
-@examples[
-#:eval redex-eval
-       (judgment-holds (sum (s (s z)) (s z) (s (s (s z)))))
-       (judgment-holds (sum (s (s z)) (s z) (s (s (s n)))))
-       (judgment-holds (sum (s (s z)) (s z) (s (s (s (s n))))))]
-Alternatively, this form constructs a list of terms based on the satisfying
-pattern variable assignments.
-@examples[
-#:eval redex-eval
-       (judgment-holds (sum (s (s z)) (s z) (s (s (s n)))) n)
-       (judgment-holds (sum (s (s z)) (s z) (s (s (s (s n))))) n)
-       (judgment-holds (sum (s (s z)) (s z) (s (s (s n)))) (s n))]
-
-Declaring different modes for the same inference rules enables different forms
-of computation. For example, the following mode allows @racket[judgment-holds]
-to compute all pairs with a given sum.
-@interaction[
-#:eval redex-eval
-       (define-judgment-form nats
-         #:mode (sumr O O I)
-         #:contract (sumr n n n)
-         [------------
-          (sumr z n n)]
-         
-         [(sumr n_1 n_2 n_3)
-          --------------------------
-          (sumr (s n_1) n_2 (s n_3))])
-       (judgment-holds (sumr n_1 n_2 (s (s z))) (n_1 n_2))]
-
-A rule's @racket[where] and @racket[where/hidden] premises behave as in 
-@racket[reduction-relation] and @racket[define-metafunction].
-@examples[
-#:eval redex-eval
-       (define-judgment-form nats
-         #:mode (le I I)
-         #:contract (le n n)
-         [--------
-          (le z n)]
-         
-         [(le n_1 n_2)
-          --------------------
-          (le (s n_1) (s n_2))])
-       (define-metafunction nats
-         pred : n -> n or #f
-         [(pred z) #f]
-         [(pred (s n)) n])
-       (define-judgment-form nats
-         #:mode (gt I I)
-         #:contract (gt n n)
-         [(where n_3 (pred n_1))
-          (le n_2 n_3)
-          ----------------------
-          (gt n_1 n_2)])
-       (judgment-holds (gt (s (s z)) (s z)))
-       (judgment-holds (gt (s z) (s z)))]
-
-A rule's @racket[side-condition] and @racket[side-condition/hidden] premises are similar
-to those in @racket[reduction-relation] and @racket[define-metafunction], except that
-they do not implicitly unquote their right-hand sides. In other words, a premise 
-of the form @racket[(side-condition term)] is equivalent to the premise 
-@racket[(where #t term)], except it does not typeset with the ``#t = '', as that would.
-
-Judgments with exclusively @racket[I] mode positions may also be used in @|tttterm|s
-in a manner similar to metafunctions, and evaluate to a boolean.
-@examples[
-#:eval redex-eval
-       (term (le (s z) (s (s z))))
-       (term (le (s z) z))]
-
-A literal ellipsis may follow a judgment premise when a template in one of the
-judgment's input positions contains a pattern variable bound at ellipsis-depth
-one.
-@examples[
-#:eval redex-eval
-       (define-judgment-form nats
-         #:mode (even I)
-         #:contract (even n)
-         
-         [-------- "evenz"
-          (even z)]
-         
-         [(even n)
-          ---------------- "even2"
-          (even (s (s n)))])
-       
-       (define-judgment-form nats
-         #:mode (all-even I)
-         #:contract (all-even (n ...))
-         [(even n) ...
-          ------------------
-          (all-even (n ...))])
-       (judgment-holds (all-even (z (s (s z)) z)))
-       (judgment-holds (all-even (z (s (s z)) (s z))))]
-
-Redex evaluates premises depth-first, even when it doing so leads to 
-non-termination. For example, consider the following definitions:
-@interaction[
-#:eval redex-eval
-       (define-language vertices
-         (v a b c))
-       (define-judgment-form vertices
-         #:mode (edge I O)
-         #:contract (edge v v)
-         [(edge a b)]
-         [(edge b c)])
-       (define-judgment-form vertices
-         #:mode (path I I)
-         #:contract (path v v)
-         [----------
-          (path v v)]
-         
-         [(path v_2 v_1)
-          --------------
-          (path v_1 v_2)]
-         
-         [(edge v_1 v_2)
-          (path v_2 v_3)
-          --------------
-          (path v_1 v_3)])]
-Due to the second @racket[path] rule, the follow query fails to terminate:
-@racketinput[(judgment-holds (path a c))]
-
-The @(examples-link "" #t "examples") directory demonstrates three use cases:
-@itemlist[
-@item{@(examples-link "define-judgment-form/typing-rules.rkt" #f "typing-rules.rkt") ---
-      defines a type system in a way that supports mechanized typesetting.
-      When a typing judgment form can be given a mode, it can also be encoded as
-      a metafunction using @tech{@racket[where] clauses} as premises, but Redex
-      cannot typeset that encoding as inference rules.}
-@item{@(examples-link "define-judgment-form/sos.rkt" #f "sos.rkt") ---
-      defines an SOS-style semantics in a way that supports mechanized typesetting.}
-@item{@(examples-link "define-judgment-form/multi-val.rkt" #f "multi-val.rkt") ---
-      defines a judgment form that serves as a multi-valued metafunction.}]}
-
-@defform[(define-extended-judgment-form language judgment-form-id
-           option ...
-           rule ...)]{
- Defines a new judgment form that extends @racket[judgment-form-id] 
- with additional rules. The @racket[option]s and @racket[rule]s
- are as in @racket[define-judgment-form].
- 
- The mode specification in this judgment form and the original
- must be the same.
-}
-                             
-@defform*/subs[((judgment-holds judgment)
-                (judgment-holds judgment @#,tttterm))
-               ([judgment (judgment-form-id pat/term ...)])]{
-In its first form, checks whether @racket[judgment] holds for any assignment of
-the pattern variables in @racket[judgment-id]'s output positions. In its second
-form, produces a list of terms by instantiating the supplied term template with
-each satisfying assignment of pattern variables.
-
-@interaction[#:eval 
-             redex-eval
-             (judgment-holds (sum (s (s z)) (s z) n))
-             (judgment-holds (sum (s (s z)) (s z) n) n)]
-See @racket[define-judgment-form] for more examples.
-}
-
-@defform[(build-derivations judgment)]{
-  Constructs all of the @racket[derivation] trees
-  for @racket[judgment]. 
-  
-@examples[
-#:eval redex-eval
-       (build-derivations (even (s (s z))))]
-}
-
-@defstruct[derivation ([term any/c] [name (or/c string? #f)] [subs (listof derivation?)])]{
-  Represents a derivation from a judgment form. 
-
-  The @racket[term] field holds an s-expression based rendering of the
-  conclusion of the derivation, the @racket[name] field holds the name
-  of the clause with @racket[term] as the conclusion, and
-  @racket[subs] contains the sub-derivations.
-
-  See also @racket[build-derivations].
-}
-                                                            
-@defidform[I]{
-Recognized specially within @racket[define-judgment-form], the @racket[I] keyword
-is an error elsewhere.
-} 
-@defidform[O]{
-Recognized specially within @racket[define-judgment-form], the @racket[O] keyword
-is an error elsewhere.
-}
-
-@defform/subs[#:literals (⊂ ⊆ × x)
-              (define-relation language
-                relation-contract
-                [(name @#,ttpattern ...) 
-                 @#,tttterm ...
-                 metafunction-extras ...] ...)
-              ([relation-contract (code:line)
-                                  (code:line form-id ⊂ @#,ttpattern x ... x @#,ttpattern)
-                                  (code:line form-id ⊆ @#,ttpattern × ... × @#,ttpattern)])]{
-Similar to @racket[define-judgment-form] but suitable only when every position
-is an input. There is no associated form corresponding to 
-@racket[judgment-holds]; querying the result uses the same syntax as 
-metafunction application.
-
-The contract specification for a relation restricts the patterns that can
-be used as input to a relation. For each argument to the relation, there
-should be a single pattern, using @racket[x] or @racket[×] to separate
-the argument contracts.
-
-@examples[
-#:eval redex-eval
-       (define-language types
-         ((τ σ) int
-                num
-                (τ → τ)))
-
-       (define-relation types
-         subtype ⊆ τ × τ
-         [(subtype int num)]
-         [(subtype (τ_1 → τ_2) (σ_1 → σ_2))
-          (subtype σ_1 τ_1)
-          (subtype τ_2 σ_2)]
-         [(subtype τ τ)])
-
-       (term (subtype int num))
-       (term (subtype (int → int) (num → num)))
-       (term (subtype (num → int) (num → num)))]
-}
-
-@defparam[current-traced-metafunctions traced-metafunctions (or/c 'all (listof symbol?))]{
-
-Controls which metafunctions are currently being traced. If it is
-@racket['all], all of them are. Otherwise, the elements of the list
-name the metafunctions to trace. 
-
-The tracing looks just like the tracing done by the @racketmodname[racket/trace]
-library, except that the first column printed by each traced call indicate
-if this call to the metafunction is cached. Specifically, a @tt{c} is printed
-in the first column if the result is just returned from the cache and a
-space is printed if the metafunction call is actually performed.
-
-Defaults to @racket['()].
-
-}
-
-@section{Testing}
-
-@declare-exporting[redex/reduction-semantics redex]
-
-@defform/subs[(test-equal e1 e2 option)
-              ([option (code:line #:equiv pred-expr)
-                       (code:line)])
-	      #:contracts ([pred-expr (-> any/c any/c any/c)])]{
-
-Tests to see if @racket[e1] is equal to @racket[e2], using @racket[pred-expr] as
-the comparison. It defaults to @racket[(default-equiv)].
-
-@examples[#:eval redex-eval
-                 
-                 (define-language L
-                   (bt ::= 
-                       empty
-                       (node any bt bt))
-                   (lt ::=
-                       empty
-                       (node any lt empty)))
-                 
-                 (define-metafunction L
-                   linearize/a : bt lt -> lt
-                   [(linearize/a empty lt) lt]
-                   [(linearize/a (node any_val bt_left bt_right) lt)
-                    (node any_val (linearize/a bt_left (linearize/a bt_right lt)) empty)])
-                 
-                 (define-metafunction L
-                   linearize : bt -> lt
-                   [(linearize bt) (linearize/a bt empty)])
-                 
-                 (test-equal (term (linearize empty))
-                             (term empty))
-                 (test-equal (term (linearize (node 1
-                                                    (node 2 empty empty)
-                                                    (node 3 empty empty))))
-                             (term (node 1 (node 2 (node 3 empty empty) empty) empty)))
-                 (test-results)
-]}
-
-@defform/subs[(test-->> rel-expr option ... e1-expr e2-expr ...)
-              ([option (code:line #:cycles-ok)
-                       (code:line #:equiv pred-expr)
-                       (code:line #:pred pred-expr)])
-              #:contracts ([rel-expr reduction-relation?]
-                           [pred-expr (--> any/c any)]
-                           [e1-expr any/c]
-                           [e2-expr any/c])]{
-
-Tests to see if the term @racket[e1-expr],
-reduces to the terms @racket[e2-expr] under @racket[rel-expr],
-using @racket[pred-expr] to determine equivalence. 
-
-If @racket[#:pred] is specified, it is applied to each reachable term
-until one of the terms fails to satisfy the predicate (i.e., the
-predicate returns @racket[#f]). If that happens, then the test fails
-and a message is printed with the term that failed to satisfy the
-predicate.
-
-This test uses
-@racket[apply-reduction-relation*], so it does not terminate
-when the resulting reduction graph is infinite, although it 
-does terminate if there are cycles in the (finite) graph.
-
-If @racket[#:cycles-ok] is not supplied then any cycles detected
-are treated as a test failure. If a @racket[pred-expr] is supplied,
-then it is used to compare the expected and actual results. If it 
-isn't supplied, then @racket[(default-equiv)] is used.
-}
-
-@defform/subs[(test--> rel-expr option ... e1-expr e2-expr ...)
-              ([option (code:line #:equiv pred-expr)])
-              #:contracts ([rel-expr reduction-relation?]
-                           [pred-expr (--> any/c any/c any/c)]
-                           [e1-expr any/c]
-                           [e2-expr any/c])]{
-
-Tests to see if the term @racket[e1-expr],
-reduces to the terms @racket[e2-expr] in a single @racket[rel-expr]
-step, using @racket[pred-expr] to determine equivalence (or
-@racket[(default-equiv)] if @racket[pred-expr] isn't specified).
-}
-
-@examples[
-#:eval redex-eval
-       (define-language L
-         (i integer))
-
-       (define R
-         (reduction-relation
-          L
-          (--> i i)
-          (--> i ,(add1 (term i)))))
-
-       (define (mod2=? i j)
-         (= (modulo i 2) (modulo j 2)))
-
-       (test--> R #:equiv mod2=? 7 1)
-
-       (test--> R #:equiv mod2=? 7 1 0)
-       
-       (test-results)]
-
-@defform/subs[(test-->>∃ option ... rel-expr start-expr goal-expr)
-              ([option (code:line #:steps steps-expr)])
-              #:contracts ([rel-expr reduction-relation?]
-                           [start-expr any/c]
-                           [goal-expr (or/c (-> any/c any/c)
-                                            (not/c procedure?))]
-                           [steps-expr (or/c natural-number/c +inf.0)])]{
-Tests to see if the term @racket[start-expr] reduces according to the reduction 
-relation @racket[rel-expr] to a term specified by @racket[goal-expr] in 
-@racket[steps-expr] or fewer steps (default 1,000). The specification 
-@racket[goal-expr] may be either a predicate on terms or a term itself.
-}
-@defidform[test-->>E]{An alias for @racket[test-->>∃].}
-
-@examples[
-#:eval redex-eval
-       (define-language L
-         (n natural))
-
-       (define succ-mod8
-         (reduction-relation
-          L
-          (--> n ,(modulo (add1 (term n)) 8))))
-
-       (test-->>∃ succ-mod8 6 2)
-       (test-->>∃ succ-mod8 6 even?)
-       (test-->>∃ succ-mod8 6 8)
-       (test-->>∃ #:steps 6 succ-mod8 6 5)
-       
-       (test-results)]
-
-@defform[(test-predicate p? e)]{
-Tests to see if the value of @racket[e] matches the predicate @racket[p?].
-}
-
-@defproc[(test-results) void?]{
-Prints out how many tests passed and failed, and resets the
-counters so that next time this function is called, it
-prints the test results for the next round of tests.
-}
-
-@defparam[default-equiv equiv (-> any/c any/c any/c)]{
-  The value of this parameter is used as the default value
-  of the equivalence predicates
-  for @racket[test-equal], @racket[test-->], and @racket[test-->>].
-  
-  It defaults to @racket[equal?].
-}
-
-@defform/subs[(make-coverage subject)
-              ([subject (code:line metafunction)
-                        (code:line relation-expr)])]{
-Constructs a structure (recognized by @racket[coverage?])
-to contain per-case test coverage of the supplied metafunction
-or reduction relation. Use with @racket[relation-coverage] and 
-@racket[covered-cases].
-}
-
-@defproc[(coverage? [v any/c]) boolean?]{
-Returns @racket[#t] for a value produced by @racket[make-coverage]
-and @racket[#f] for any other.}
-
-@defparam[relation-coverage tracked (listof coverage?)]{
-Redex populates the coverage records in @racket[tracked] (default @racket[null]),
-counting the times that tests exercise each case of the associated metafunction
-and relations.}
-
-@defproc[(covered-cases 
-          [c coverage?])
-         (listof (cons/c string? natural-number/c))]{
-Extracts the coverage information recorded in @racket[c], producing
-an association list mapping names (or source locations, in the case of
-metafunctions or unnamed reduction-relation cases) to application counts.}
-
-@examples[
-#:eval redex-eval
-       (define-language empty-lang)
-       
-       (define-metafunction empty-lang
-         [(plus number_1 number_2)
-          ,(+ (term number_1) (term number_2))])
-       
-       (define equals
-         (reduction-relation 
-          empty-lang
-          (--> (+) 0 "zero")
-          (--> (+ number) number)
-          (--> (+ number_1 number_2 number ...)
-               (+ (plus number_1 number_2)
-                  number ...)
-               "add")))
-       (let ([equals-coverage (make-coverage equals)]
-             [plus-coverage (make-coverage plus)])
-         (parameterize ([relation-coverage (list equals-coverage 
-                                                 plus-coverage)])
-           (apply-reduction-relation* equals (term (+ 1 2 3)))
-           (values (covered-cases equals-coverage)
-                   (covered-cases plus-coverage))))]
-
-@defform*/subs[((generate-term from-pattern)
-                (generate-term from-judgment-form)
-                (generate-term from-metafunction)
-                (generate-term from-reduction-relation))
-               ([from-pattern
-                 (code:line language @#,ttpattern size-expr kw-args ...)
-                 (code:line language @#,ttpattern)
-                 (code:line language @#,ttpattern #:i-th index-expr)
-                 (code:line language @#,ttpattern #:i-th)]
-                [from-judgment-form
-                 (code:line language #:satisfying
-                            (judgment-form-id @#,ttpattern ...))
-                 (code:line language #:satisfying
-                            (judgment-form-id @#,ttpattern ...)
-                            size-expr)]
-                [from-metafunction
-                 (code:line language #:satisfying 
-                            (metafunction-id @#,ttpattern ...) = @#,ttpattern)
-                 (code:line language #:satisfying 
-                            (metafunction-id @#,ttpattern ...) = @#,ttpattern
-                            size-expr)
-                 (code:line #:source metafunction size-expr kw-args)
-                 (code:line #:source metafunction)]
-                [from-reduction-relation
-                 (code:line #:source reduction-relation-expr
-                            size-expr kw-args ...)
-                 (code:line #:source reduction-relation-expr)]
-                [kw-args (code:line #:attempt-num attempts-expr)
-                         (code:line #:retries retries-expr)])
-              #:contracts ([size-expr natural-number/c]
-                           [attempt-num-expr natural-number/c]
-                           [retries-expr natural-number/c])]{
-
-Generates terms in a number of different ways:
-@itemlist[@item{@racket[from-pattern]:
-                 In the first case, randomly makes an expression matching the given pattern
-                 whose size is bounded by @racket[size-expr]; the second returns a function
-                 that accepts a size bound and returns a random term. Calling this function 
-                 (even with the same size bound) may be more efficient than using the first case.
-                 
-                 
-                 @examples[#:eval
-                           redex-eval
-                           (define-language L
-                             (e ::=
-                                (e e)
-                                (λ (x) e)
-                                x)
-                             (x ::= a b c))
-                           
-                           (for/list ([i (in-range 10)])
-                             (generate-term L e 3))]
-                 
-                 The @racket[#:i-th] option uses an enumeration of the non-terminals in a language. 
-                 If @racket[index-expr] is supplied, @racket[generate-term] returns the corresponding
-                 term and if it isn't, @racket[generate-term] returns a function from indices
-                 to terms.
-                 @examples[#:eval
-                           redex-eval
-                           (for/list ([i (in-range 9)])
-                             (generate-term L e #:i-th i))]
-
-                 Base type enumerations such as @racket[boolean], 
-                 @racket[natural] and @racket[integer] are what you might expect:
-                 
-                 @examples[#:eval
-                           redex-eval
-                           (for/list ([i (in-range 10)])
-                             (generate-term L boolean #:i-th i))
-                           (for/list ([i (in-range 10)])
-                             (generate-term L natural #:i-th i))
-                           (for/list ([i (in-range 10)])
-                             (generate-term L integer #:i-th i))]
-                 
-                 The @racket[real] base type enumeration consists of all integers and flonums, and the
-                 @racket[number] pattern consists of complex numbers with real and imaginary parts 
-                 taken from the @racket[real] enumeration.
-                 
-                 @examples[#:eval
-                           redex-eval
-                           (for/list ([i (in-range 20)])
-                             (generate-term L real #:i-th i))
-                           (for/list ([i (in-range 20)])
-                             (generate-term L number #:i-th i))]
-                 
-                 The @racket[string] enumeration produces all single character strings before
-                 going on to strings with multiple characters. For each character it starts
-                 the lowercase Latin characters, then uppercase Latin, and then every remaining
-                 Unicode character. The @racket[variable] enumeration is the same, except it 
-                 produces symbols instead of strings.
-                 
-                 @examples[#:eval
-                           redex-eval
-                           (generate-term L string #:i-th 0)
-                           (generate-term L string #:i-th 1)
-                           (generate-term L string #:i-th 26)
-                           (generate-term L string #:i-th 27)
-                           (generate-term L string #:i-th 52)
-                           (generate-term L string #:i-th 53)
-                           (generate-term L string #:i-th 956)
-                           (generate-term L variable #:i-th 1)
-                           (generate-term L variable #:i-th 27)]
-                 
-                 The @racket[variable-prefix], @racket[variable-except], and
-                 @racket[variable-not-otherwise-mentioned] are defined
-                 similarly, as you expect.
-                 
-                 @examples[#:eval
-                           redex-eval
-                           (define-language L
-                             (used ::= a b c)
-                             (except ::= (variable-except a))
-                             (unused ::= variable-not-otherwise-mentioned))
-                           (for/list ([i (in-range 10)])
-                             (generate-term L (variable-prefix a:) #:i-th i))
-                           (for/list ([i (in-range 10)])
-                             (generate-term L except #:i-th i))
-                           (for/list ([i (in-range 10)])
-                             (generate-term L unused #:i-th i))]
-
-                 Finally, the @racket[any] pattern enumerates sexpressions of the above base types.
-                 @examples[#:eval
-                           redex-eval
-                           (for/list ([i (in-range 20)])
-                             (generate-term L any #:i-th i))]
-                 
-                 In addition, all other pattern types are supported
-                 except for mismatch repeat @racket[..._!_] patterns
-                 and @racket[side-condition] patterns.
-                 
-                 The enumerators do not repeat terms unless the given pattern is ambiguous.
-                 Roughly speaking, the enumerator generates all possible ways that a pattern
-                 might be parsed and since ambiguous patterns have multiple ways they might
-                 be parsed, those multiple parsings turn into repeated elements in the enumeration.
-                 
-                 @examples[#:eval
-                           redex-eval
-                           (for/list ([i (in-range 9)])
-                             (generate-term L (boolean_1 ... boolean_2 ...) #:i-th i))]
-                 
-                 Other sources of ambiguity are @racket[in-hole] and overlapping non-terminals.
-                 @examples[#:eval
-                           redex-eval
-                           (define-language L
-                             (e ::= (e e) (λ (x) e) x)
-                             (E ::= hole (e E) (E e))
-                             (x ::= a b c))
-
-                           (for/list ([i (in-range 9)])
-                             (generate-term L (in-hole E e) #:i-th i))
-                           
-                           (define-language L
-                             (overlap ::= natural integer))
-                           (for/list ([i (in-range 10)])
-                             (generate-term L overlap #:i-th i))]
-
-                 For similar reasons, enumerations for mismatch
-                 patterns (using @racketvarfont{_!_}) do not work properly when given 
-                 ambiguous patterns; they may repeat elements of the enumeration.
-                 @examples[#:eval
-                           redex-eval
-                           (define-language Bad
-                             (ambig ::= (x ... x ...)))
-                           (generate-term Bad (ambig_!_1 ambig_!_1) #:i-th 4)]
-                 In this case, the elements of the resulting list are the same,
-                 even though they should not be, according to the pattern. Internally,
-                 the enumerator has discovered two different ways to generate @racket[ambig]
-                 (one where the @racket[x] comes from the first ellipses and one from the second)
-                 but those two different ways produce the same term and so the enumerator
-                 incorrectly produces @racket[(x x)].
-                 
-                 }
-           @item{@racket[from-judgment-form]: Randomly picks a term that satisfies
-                  the given use of the judgment form.
-                  
-                  @examples[#:eval
-                            redex-eval
-                            (define-language L
-                              (nat ::= Z (S nat)))
-                            (define-judgment-form L
-                              #:mode (sum I I O)
-                              [---------------
-                               (sum Z nat nat)]
-                              [(sum nat_1 nat_2 nat_3)
-                               -------------------------------
-                               (sum (S nat_1) nat_2 (S nat_3))])
-                            
-                            (for/list ([i (in-range 10)])
-                              (generate-term L #:satisfying 
-                                             (sum nat_1 nat_2 nat_3)
-                                             3))]}
-           @item{@racket[from-metafunction]: The first form randomly picks a term
-                  that satisfies the given invocation of the metafunction, using
-                  techniques similar to how the @racket[from-judgment-form] case works.
-                  The second form uses a more naive approach; it simply generates terms
-                  that match the patterns of the cases of the metafunction; it does not
-                  consider the results of the metafunctions, nor does it consider
-                  patterns from earlier cases when generating terms based on a particular case.
-                  The third case is like the second, except it returns a function that accepts
-                  the size and keywords arguments that may be more efficient if multiple 
-                  random terms are generated.
-                  @examples[#:eval
-                            redex-eval
-                            (define-language L
-                             (n number))
-                            (define-metafunction L
-                              [(F one-clause n) ()]
-                              [(F another-clause n) ()])
-                            
-                            (for/list ([i (in-range 10)])
-                              (generate-term #:source F 5))]}
-           @item{@racket[from-reduction-relation]: In the first case, @racket[generate-term]
-                  randomly picks a rule from the reduction relation and tries to pick a term
-                  that satisfies its domain pattern, returning that. The second case returns
-                  a function that accepts the size and keyword arguments that may be more
-                  efficient if multiple random terms are generated.
-                  
-                  @examples[#:eval
-                            redex-eval
-                            (define-language L
-                             (n number))
-                            (for/list ([i (in-range 10)])
-                              (generate-term
-                               #:source
-                               (reduction-relation
-                                L
-                                (--> (one-clause n) ())
-                                (--> (another-clause n) ()))
-                               5))]}]
-
-The argument @racket[size-expr] bounds the height of the generated term
-(measured as the height of its parse tree). 
-
-The optional keyword argument @racket[attempt-num-expr] 
-(default @racket[1]) provides coarse grained control over the random
-decisions made during generation; increasing @racket[attempt-num-expr]
-tends to increase the complexity of the result. For example, the absolute
-values of numbers chosen for @pattech[integer] patterns increase with
-@racket[attempt-num-expr].
-
-The random generation process does not actively consider the constraints
-imposed by @pattech[side-condition] or @tt{_!_} @|pattern|s; instead, 
-it uses a ``guess and check'' strategy in which it freely generates 
-candidate terms then tests whether they happen to satisfy the constraints,
-repeating as necessary. The optional keyword argument @racket[retries-expr]
-(default @racket[100]) bounds the number of times that 
-@racket[generate-term] retries the generation of any pattern. If 
-@racket[generate-term] is unable to produce a satisfying term after 
-@racket[retries-expr] attempts, it raises an exception recognized by
-@racket[exn:fail:redex:generation-failure?].
-}
-
-@defform/subs[(redex-check template property-expr kw-arg ...)
-              ([template (code:line language @#,ttpattern)
-                         (code:line language @#,ttpattern #:enum)
-                         (code:line language #:satisfying
-                            (judgment-form-id @#,ttpattern ...))
-                         (code:line language #:satisfying 
-                            (metafunction-id @#,ttpattern ...) = @#,ttpattern)]
-              [kw-arg (code:line #:attempts attempts-expr)
-                       (code:line #:source metafunction)
-                       (code:line #:source relation-expr)
-                       (code:line #:retries retries-expr)
-                       (code:line #:print? print?-expr)
-                       (code:line #:attempt-size attempt-size-expr)
-                       (code:line #:prepare prepare-expr)
-                       (code:line #:keep-going? keep-going?-expr)])
-              #:contracts ([property-expr any/c]
-                           [attempts-expr natural-number/c]
-                           [relation-expr reduction-relation?]
-                           [retries-expr natural-number/c]
-                           [print?-expr any/c]
-                           [attempt-size-expr (-> natural-number/c natural-number/c)]
-                           [prepare-expr (-> any/c any/c)])]{
-Searches for a counterexample to @racket[property-expr], interpreted
-as a predicate universally quantified over the pattern variables
-bound by the @racket[pattern](s) in @racket[template].
-@racket[redex-check] constructs and tests 
-a candidate counterexample by choosing a random term @math{t} based 
-on @racket[template] and then evaluating @racket[property-expr]
-using the @racket[match-bindings] produced by @racket[match]ing
-@math{t} against @racket[pattern]. The form of @racket[template] controls
-how @math{t} is generated:
-@itemlist[@item{@racket[language @#,ttpattern]:
-                 In this case, @racket[redex-check] uses an ad hoc strategy for 
-                 generating @racket[_pattern]. For the first 10 seconds, it uses 
-                 in-order enumeration to pick terms. After that, it
-                 alternates back and forth between in-order enumeration
-                 and the ad hoc random generator. After the 10 minute mark,
-                 it switches over to using just the ad hoc random generator.}
-          @item{@racket[language @#,ttpattern #:ad-hoc]:
-                 In this case, @racket[redex-check] uses an ad hoc random generator
-                 to generate terms that match @racket[_pattern].}
-          @item{@racket[language @#,ttpattern #:in-order]:
-                 In this case, @racket[redex-check] uses an enumeration
-                 of @racket[_pattern], checking each @math{t} one at a time}
-          @item{@racket[language @#,ttpattern #:uniform-at-random p-value]:
-                 that to index into an enumeration of @racket[_pattern].
-                 If the enumeration is finite, @racket[redex-check] picks a natural number
-                 uniformly at random; if it isn't, @racket[redex-check] uses a geometric
-                 distribution with @racket[p-value] as its probability of zero 
-                 to pick the number of bits in the index and then picks a
-                 number uniformly at random with that number of bits.}
-          @item{@racket[language @#,ttpattern #:enum bound]:
-                 This is similar to @racket[#:uniform-at-random], except
-                 that Redex always picks a random natural number less than @racket[bound]
-                 to index into the enumeration}
-          @item{@racket[language #:satisfying (judgment-form-id @#,ttpattern ...)]:
-                  Generates terms that match @racket[pattern] and satisfy 
-                  the judgment form.}
-          @item{@racket[language #:satisfying (metafunction-id @#,ttpattern ...) = @#,ttpattern]:
-                  Generates terms matching the two @racket[pattern]s, such that
-                  if the first is the argument to the metafunction, the
-                  second will be the result.}]
-
-@racket[redex-check] generates at most @racket[attempts-expr] 
-(default @racket[(default-check-attempts)])
-random terms in its search. The size and complexity of these terms tend to increase 
-with each failed attempt. The @racket[#:attempt-size] keyword determines the rate at which
-terms grow by supplying a function that bounds term size based on the number of failed
-attempts (see @racket[generate-term]'s @racket[size-expr] argument). By default, the bound
-grows according to the @racket[default-attempt-size] function.
-
-When @racket[print?-expr] produces any non-@racket[#f] value (the default), 
-@racket[redex-check] prints the test outcome on @racket[current-output-port].
-When @racket[print?-expr] produces @racket[#f], @racket[redex-check] prints
-nothing, instead 
-@itemlist[
-  @item{returning a @racket[counterexample] structure when the test reveals a counterexample,}
-  @item{returning @racket[#t] when all tests pass, or}
-  @item{raising a @racket[exn:fail:redex:test] when checking the property raises an exception.}
-]
-
-The optional @racket[#:prepare] keyword supplies a function that transforms each
-generated example before @racket[redex-check] checks @racket[property-expr].
-This keyword may be useful when @racket[property-expr] takes the form
-of a conditional, and a term chosen freely from the grammar is unlikely to
-satisfy the conditional's hypothesis. In some such cases, the @racket[prepare] 
-keyword  can be used to increase the probability that an example satisfies the
-hypothesis.
-
-The @racket[#:retries] keyword behaves identically as in @racket[generate-term],
-controlling the number of times the generation of any pattern will be
-reattempted. It can't be used together with @racket[#:satisfying].
-
-If @racket[keep-going?-expr] produces any non-@racket[#f] value,
-@racket[redex-check] will stop only when it hits the limit on the number of attempts 
-showing all of the errors it finds. This argument is allowed only when 
-@racket[print?-expr] is not @racket[#f].
-
-When passed a metafunction or reduction relation via the optional @racket[#:source]
-argument, @racket[redex-check] distributes its attempts across the left-hand sides
-of that metafunction/relation by using those patterns, rather than @racket[pattern],
-as the basis of its generation. It is an error if any left-hand side generates a
-term that does not match @racket[pattern]. @racket[#:source] cannot be used
-with @racket[#:satisfying].}
-
-@examples[
-#:eval redex-eval
-       (define-language empty-lang)
-       
-       (random-seed 0)
-
-       (redex-check 
-        empty-lang
-        ((number_1 ...)
-         (number_2 ...))
-        (equal? (reverse (append (term (number_1 ...))
-                                 (term (number_2 ...))))
-                (append (reverse (term (number_1 ...)))
-                        (reverse (term (number_2 ...))))))
-
-       (redex-check 
-        empty-lang
-        ((number_1 ...)
-         (number_2 ...))
-        (equal? (reverse (append (term (number_1 ...))
-                                 (term (number_2 ...))))
-                (append (reverse (term (number_2 ...)))
-                        (reverse (term (number_1 ...)))))
-        #:attempts 200)
-       
-       (let ([R (reduction-relation 
-                 empty-lang
-                 (--> (Σ) 0)
-                 (--> (Σ number) number)
-                 (--> (Σ number_1 number_2 number_3 ...)
-                      (Σ ,(+ (term number_1) (term number_2)) 
-                         number_3 ...)))])
-         (redex-check
-          empty-lang
-          (Σ number ...)
-          (printf "~s\n" (term (number ...)))
-          #:attempts 3
-          #:source R))
-
-       (redex-check
-        empty-lang
-        number
-        (begin
-          (printf "checking ~s\n" (term number))
-          (positive? (term number)))
-        #:prepare (λ (n)
-                    (printf "preparing ~s; " n)
-                    (add1 (abs n)))
-        #:attempts 3)
-                     
-       (define-language L
-         (nat ::= Z (S nat)))
-       (define-judgment-form L
-         #:mode (sum I I O)
-         [---------------
-          (sum Z nat nat)]
-         [(sum nat_1 nat_2 nat_3)
-          -------------------------------
-          (sum (S nat_1) nat_2 (S nat_3))])
-       (redex-check L
-                    #:satisfying
-                    (sum nat_1 nat_2 nat_3)
-                    (equal? (judgment-holds
-                             (sum nat_1 nat_2 nat_4) nat_4)
-                            (term (nat_3)))
-                    #:attempts 100)
-       (redex-check L
-                    #:satisfying
-                    (sum nat_1 nat_2 nat_3)
-                    (equal? (term nat_1) (term nat_2)))]
-
-@defparam[depth-dependent-order? depth-dependent (or/c boolean? 'random)
-                                 #:value 'random]{
-
-Toggles whether or not Redex will dynamically adjust the
-chance that more recursive clauses of judgment forms or metafunctions 
-are chosen earlier when attempting to generate terms 
-with forms that use @racket[#:satisfying]. If it is @racket[#t],
-Redex favors more recursive clauses at
-lower depths and less recursive clauses at depths closer to the
-limit, in an attempt to generate larger terms. 
-When it is @racket[#f], all clause orderings have equal probability
-above the bound.
-By default, it is @racket['random], which causes Redex to
-choose between the two above alternatives with equal probability.
-}
-
-@defform/subs[(redex-generator language-id satisfying size-expr)
-              ([satisfying (judgment-form-id @#,ttpattern ...)
-                           (code:line (metafunction-id @#,ttpattern ...) = @#,ttpattern)])
-              #:contracts ([size-expr natural-number/c])]{
-  
-  @italic{WARNING: @racket[redex-generator] is a new, experimental form, 
-          and its API may change.}
-                                                     
-  Returns a thunk that, each time it is called, either generates a random
-  s-expression based on @racket[satisfying] or fails to (and returns @racket[#f]). 
-  The terms returned by a particular thunk are guaranteed to be distinct.
-  
-  @examples[#:eval
-            redex-eval
-            (define-language L
-              (nat ::= Z (S nat)))
-            (define-judgment-form L
-              #:mode (sum I I O)
-              [---------------
-               (sum Z nat nat)]
-              [(sum nat_1 nat_2 nat_3)
-               -------------------------------
-               (sum (S nat_1) nat_2 (S nat_3))])
-            (define gen-sum (redex-generator L (sum nat_1 nat_2 nat_3) 3))
-            (for/list ([_ (in-range 5)])
-              (gen-sum))]
-}
-
-@defstruct[counterexample ([term any/c]) #:inspector #f]{
-Produced by @racket[redex-check], @racket[check-reduction-relation], and 
-@racket[check-metafunction] when testing falsifies a property.}
-
-@defstruct[(exn:fail:redex:test exn:fail:redex) ([source exn:fail?] [term any/c])]{
-Raised by @racket[redex-check], @racket[check-reduction-relation], and 
-@racket[check-metafunction] when testing a property raises an exception.
-The @racket[exn:fail:redex:test-source] component contains the exception raised by the property,
-and the @racket[exn:fail:redex:test-term] component contains the term that induced the exception.}
-
-                                                         
-@defform/subs[(check-reduction-relation relation property kw-args ...)
-              ([kw-arg (code:line #:attempts attempts-expr)
-                       (code:line #:retries retries-expr)
-                       (code:line #:print? print?-expr)
-                       (code:line #:attempt-size attempt-size-expr)
-                       (code:line #:prepare prepare-expr)])
-              #:contracts ([property (-> any/c any/c)]
-                           [attempts-expr natural-number/c]
-                           [retries-expr natural-number/c]
-                           [print?-expr any/c]
-                           [attempt-size-expr (-> natural-number/c natural-number/c)]
-                           [prepare-expr (-> any/c any/c)])]{
-Tests @racket[relation] as follows: for each case of @racket[relation],
-@racket[check-reduction-relation] generates @racket[attempts] random
-terms that match that case's left-hand side and applies @racket[property] 
-to each random term.
-
-This form provides a more convenient notation for
-@racketblock[(redex-check L any (property (term any)) 
-                          #:attempts (* n attempts)
-                          #:source relation)]
-when @racket[relation] is a relation on @racket[L] with @racket[n] rules.}
-
-@defform/subs[(check-metafunction metafunction property kw-args ...)
-              ([kw-arg (code:line #:attempts attempts-expr)
-                       (code:line #:retries retries-expr)
-                       (code:line #:print? print?-expr)
-                       (code:line #:attempt-size attempt-size-expr)
-                       (code:line #:prepare prepare-expr)])
-              #:contracts ([property (-> (listof any/c) any/c)]
-                           [attempts-expr natural-number/c]
-                           [retries-expr natural-number/c]
-                           [print?-expr any/c]
-                           [attempt-size-expr (-> natural-number/c natural-number/c)]
-                           [prepare-expr (-> (listof any/c) (listof any/c))])]{
-Like @racket[check-reduction-relation] but for metafunctions. 
-@racket[check-metafunction] calls @racket[property] with lists
-containing arguments to the metafunction. Similarly, @racket[prepare-expr]
-produces and consumes argument lists.}
-
-@(redex-eval '(random-seed 0))
-@examples[
-#:eval redex-eval
-       (define-language empty-lang)
-
-       (define-metafunction empty-lang
-         Σ : number ... -> number
-         [(Σ) 0]
-         [(Σ number) number]
-         [(Σ number_1 number_2) ,(+ (term number_1) (term number_2))]
-         [(Σ number_1 number_2 ...) (Σ number_1 (Σ number_2 ...))])
-       
-       (check-metafunction Σ (λ (args) 
-                               (printf "trying ~s\n" args)
-                               (equal? (apply + args)
-                                       (term (Σ ,@args))))
-                           #:attempts 2)]
-
-@defproc[(default-attempt-size [n natural-number/c]) natural-number/c]{
-The default value of the @racket[#:attempt-size] argument to 
-@racket[redex-check] and the other randomized testing forms, this 
-procedure computes an upper bound on the size of the next
-test case from the number of previously attempted tests @racket[n]. 
-Currently, this procedure computes the base 5 logarithm, but 
-that behavior may change in future versions.
-}
-
-@defparam[default-check-attempts attempts natural-number/c]{Determines the default
-value for @racket[redex-check]'s optional @racket[#:attempts] argument. By default,
-@racket[attempts] is 1,000.}
-
-@defparam[redex-pseudo-random-generator generator pseudo-random-generator?]{
-@racket[generate-term] and the randomized testing forms (e.g., @racket[redex-check])
-use the parameter @racket[generator] to construct random terms. The parameter's
-initial value is @racket[(current-pseudo-random-generator)].}
-
-@defproc[(exn:fail:redex:generation-failure? [v any/c]) boolean?]{
-  Recognizes the exceptions raised by @racket[generate-term], 
-  @racket[redex-check], etc. when those forms are unable to produce
-  a term matching some pattern.
-}
-
-@deftech{Debugging PLT Redex Programs}
-
-It is easy to write grammars and reduction rules that are
-subtly wrong. Typically such mistakes result in examples
-that get stuck when viewed in a @racket[traces] window.
-
-The best way to debug such programs is to find an expression
-that looks like it should reduce, but doesn't, then try to find
-out which pattern is failing to match. To do so, use the
-@racket[redex-match] form.
-
-In particular, first check if the term in question matches the
-your system's main non-terminal (typically the expression
-or program non-terminal). If it does not match, simplify the term
-piece by piece to determine whether the problem is in the
-term or the grammar. 
-
-If the term does match your system's main
-non-terminal, determine by inspection which reduction rules
-should apply. For each such rule, repeat the above term-pattern 
-debugging procedure, this time using the rule's left-hand side 
-pattern instead of the system's main non-terminal. In addition
-to simplifying the term, also consider simplifying the pattern.
-
-If the term matches the left-hand side, but the rule does not 
-apply, then one of the rule's @racket[side-condition] or 
-@racket[where] clauses is not satisfied. Using the bindings
-reported by @racket[redex-match], check each @racket[side-condition]
-expression and each @racket[where] pattern-match to discover which
-clause is preventing the rule's application.
-
-@section{GUI}
-
-@defmodule*/no-declare[(redex/gui)]
-@declare-exporting[redex/gui redex]
-
-This section describes the GUI tools that Redex provides for
-exploring reduction sequences.
-
-@defproc[(traces [reductions reduction-relation?] 
-                 [expr (or/c any/c (listof any/c))]
-                 [#:multiple? multiple? boolean? #f]
-                 [#:reduce reduce (-> reduction-relation? any/c
-                                      (listof (list/c (union false/c string?) any/c)))
-                           apply-reduction-relation/tag-with-names]
-                 [#:pred pred
-                         (or/c (-> sexp any)
-                               (-> sexp term-node? any))
-                         (λ (x) #t)]
-                 [#:pp pp
-                       (or/c (any -> string)
-                             (any output-port number (is-a?/c text%) -> void))
-                       default-pretty-printer]
-                 [#:colors colors 
-                  (listof 
-                   (cons/c string? 
-                           (and/c (listof (or/c string? (is-a?/c color%)))
-                                  (λ (x) (<= 0 (length x) 6)))))
-                  '()]
-                 [#:racket-colors? racket-colors? boolean? #t]
-                 [#:scheme-colors? scheme-colors? boolean? racket-colors?]
-                 [#:filter term-filter (-> any/c (or/c #f string?) any/c) (λ (x y) #t)]
-                 [#:x-spacing x-spacing real? 15]
-                 [#:y-spacing y-spacing real? 15]
-                 [#:layout layout (-> (listof term-node?) void?) void]
-                 [#:edge-labels? edge-labels? boolean? #t]
-                 [#:edge-label-font edge-label-font (or/c #f (is-a?/c font%)) #f]
-                 [#:graph-pasteboard-mixin graph-pasteboard-mixin 
-                                           (make-mixin-contract graph-pasteboard<%>)
-                                           values])
-         void?]{
-
-This function opens a new window and inserts each expression
-in @racket[expr] (if @racket[multiple?] is @racket[#t] -- if
-@racket[multiple?] is @racket[#f], then @racket[expr] is treated as a single
-expression). Then, it reduces the terms until at least
-@racket[reduction-steps-cutoff] (see below) different terms are
-found, or no more reductions can occur. It inserts each new
-term into the gui. Clicking the @onscreen{reduce} button reduces
-until @racket[reduction-steps-cutoff] more terms are found.
-
-The @racket[reduce] function applies the reduction relation to the terms.
-By default, it is @racket[apply-reduction-relation/tag-with-names];
-it may be changed to only return a subset of the possible reductions,
-for example, but it must satisfy the same contract as
-@racket[apply-reduction-relation/tag-with-names].
-
-The @racket[pred] function indicates if a term has a particular
-property. If it returns @racket[#f], the term is displayed with a
-pink background. If it returns a string or a @racket[color%] object,
-the term is displayed with a background of that color (using
-@racket[the-color-database] to map the string to a color). If it
-returns any other value, the term is displayed normally. If
-the @racket[pred] function accepts two arguments, a term-node
-corresponding to the term is passed to the predicate. This
-lets the predicate function explore the (names of the)
-reductions that led to this term, using @racket[term-node-children],
-@racket[term-node-parents], and @racket[term-node-labels].
-
-The @racket[pred] function may be called more than once per node. In
-particular, it is called each time an edge is added to a
-node. The latest value returned determines the color.
-
-The @racket[pp] function is used to specially print expressions. It
-must either accept one or four arguments. If it accepts one
-argument, it will be passed each term and is expected to
-return a string to display the term.
-
-If the @racket[pp] function takes four arguments, it should render
-its first argument into the port (its second argument) with
-width at most given by the number (its third argument). The
-final argument is the text where the port is connected --
-characters written to the port go to the end of the editor.
-Use @racket[write-special] to send @racket[snip%] objects or 
-@racketmodname[2htdp/image] images 
-(or other things that subscribe to @racketmodname[file/convertible]
-or @racketmodname[pict/convert])
-directly to the editor.
-
-The @racket[colors] argument, if provided, specifies a list of
-reduction-name/color-list pairs. The traces gui will color arrows
-drawn because of the given reduction name with the given color instead
-of using the default color.
-
-The @racket[cdr] of each of the elements of @racket[colors] is a list
-of colors, organized in pairs. The first two colors cover the colors
-of the line and the border around the arrow head, the first when the
-mouse is over a graph node that is connected to that arrow, and the
-second for when the mouse is not over that arrow. Similarly, the next
-colors are for the text drawn on the arrow and the last two are for
-the color that fills the arrow head.  If fewer than six colors are
-specified, the specified colors are used and then defaults are
-filled in for the remaining colors.
-
-The @racket[racket-colors?] argument (along with @racket[scheme-colors?],
-retained for backward compatibility), controls the coloring of 
-each window. When @racket[racket-colors?] is @racket[#t] (and
-@racket[scheme-colors?] is @racket[#t] too), @racket[traces] colors the 
-contents according to DrRacket's Racket-mode color scheme; otherwise,
-@racket[traces] uses a black color scheme.
-
-The @racket[term-filter] function is called each time a new node is
-about to be inserted into the graph. If the filter returns false, the
-node is not inserted into the graph.
-
-The @racket[x-spacing] and @racket[y-spacing] arguments control the amount of
-space put between the snips in the default layout.
-
-The @racket[layout] argument is called (with all of the terms) when
-new terms are inserted into the window. In general, it is called
-after new terms are inserted in response to the user clicking on the
-reduce button, and after the initial set of terms is inserted.
-See also @racket[term-node-set-position!].
-
-If @racket[edge-labels?] is @racket[#t] (the default), then edge labels
-are drawn; otherwise not.
-
-The @racket[edge-label-font] argument is used as the font on the edge
-labels. If @racket[#f] is supplied, the @racket[dc<%>] object's default
-font is used.
-
-The traces library uses an instance of the @racketmodname[mrlib/graph]
-library's @racket[graph-pasteboard<%>] interface to layout
-the graphs.  Sometimes, overriding one of its methods can
-help give finer-grained control over the layout, so the
-@racket[graph-pasteboard-mixin] is applied to the class
-before it is instantiated. Also note that all of the snips
-inserted into the editor by this library have a
-@tt{get-term-node} method which returns the snip's
-@racket[term-node].
-
-For a more serious example of @racket[traces], please see @secref["tutorial"],
-but for a silly one that demonstrates how the @racket[pp] argument
-lets us use images, we can take the pairing functions discussed in
-Matthew Szudzik's @italic{An Elegant Pairing Function} presentation:
-@racketblock[(define/contract (unpair z)
-               (-> exact-nonnegative-integer? 
-                   (list/c exact-nonnegative-integer? exact-nonnegative-integer?))
-               (define i (integer-sqrt z))
-               (define i2 (* i i))
-               (cond
-                 [(< (- z i2) i)
-                  (list (- z i2) i)]
-                 [else 
-                  (list i (- z i2 i))]))
-             
-             (define/contract (pair x y)
-               (-> exact-nonnegative-integer? exact-nonnegative-integer?
-                   exact-nonnegative-integer?)
-               (if (= x (max x y))
-                   (+ (* x x) x y)
-                   (+ (* y y) x)))]
-and build a reduction relation out of them:
-@racketblock[(define-language L (n ::= natural))
-             (define red
-               (reduction-relation
-                L
-                (--> (n_1 n_2)
-                     ,(unpair (+ 1 (pair (term n_1) 
-                                         (term n_2)))))))
-             (traces red (term (0 0)))]
-We can then turn those two numbers into two stars, where the
-number indicates the number of points in the star:
-@racketblock[(require 2htdp/image)
-             (define/contract (two-stars point-count1 point-count2)
-               (-> (>=/c 2) (>=/c 2) image?)
-               (overlay
-                (radial-star (+ 2 point-count1)
-                             10 60
-                             "solid"
-                             (make-color 255 0 255 150))
-                (radial-star (+ 2 point-count2)
-                             10 60
-                             "solid"
-                             "cornflowerblue")))]
-and then use the @racket[pp] function to show those in the
-traces window instead of just the numbers.
-@racketblock[(traces red 
-                     (term (0 0))
-                     #:pp
-                     (λ (term port w txt)
-                       (write-special 
-                        (two-stars (+ 2 (list-ref term 0))
-                                   (+ 2 (list-ref term 1)))
-                        port)))]
-
-}
-
-@defproc[(traces/ps [reductions reduction-relation?] 
-                    [expr (or/c any/c (listof any/c))]
-                    [file (or/c path-string? path?)]
-                    [#:multiple? multiple? boolean? #f]
-                    [#:reduce reduce (-> reduction-relation? any/c
-                                         (listof (list/c (union false/c string?) any/c)))
-                              apply-reduction-relation/tag-with-names]
-                    [#:pred pred
-                            (or/c (-> sexp any)
-                                  (-> sexp term-node? any))
-                            (λ (x) #t)]
-                    [#:pp pp
-                          (or/c (any -> string)
-                                (any output-port number (is-a?/c text%) -> void))
-                          default-pretty-printer]
-                    [#:colors colors 
-                              (listof 
-                               (cons/c string?
-                                       (and/c (listof (or/c string? (is-a?/c color%)))
-                                              (λ (x) (<= 0 (length x) 6)))))
-                              '()]
-                    [#:filter term-filter (-> any/c (or/c #f string?) any/c) (λ (x y) #t)]
-                    [#:layout layout (-> (listof term-node?) void?) void]
-                    [#:x-spacing x-spacing number? 15]
-                    [#:y-spacing y-spacing number? 15]
-                    [#:edge-labels? edge-labels? boolean? #t]
-                    [#:edge-label-font edge-label-font (or/c #f (is-a?/c font%)) #f]
-                    [#:graph-pasteboard-mixin graph-pasteboard-mixin 
-                                              (make-mixin-contract graph-pasteboard<%>)
-                                              values]
-                    [#:post-process post-process (-> (is-a?/c graph-pasteboard<%>) any/c)])
-         void?]{
-
-This function  behaves just like the function @racket[traces], but
-instead of opening a window to show the reduction graph, it just saves
-the reduction graph to the specified @racket[file].
-
-All of the arguments behave like the arguments to @racket[traces],
-with the exception of the @racket[post-process] argument. It is called
-just before the PostScript is created with the graph pasteboard.
-}
-
-@defproc[(stepper [reductions reduction-relation?] 
-                  [t any/c] 
-                  [pp (or/c (any -> string)
-                            (any output-port number (is-a?/c text%) -> void))
-                      default-pretty-printer])
-          void?]{
-
-This function opens a stepper window for exploring the
-behavior of the term @racket[t] in the reduction system given by
-@racket[reductions].
-
-The @racket[pp] argument is the same as to the
-@racket[traces] function but is here for
-backwards compatibility only and
-should not be changed for most uses, but instead adjusted with
-@racket[pretty-print-parameters]. Specifically, the 
-highlighting shown in the stepper window can be wrong if
-@racket[default-pretty-printer] does not print sufficiently similarly
-to how @racket[pretty-print] prints (when adjusted by
-@racket[pretty-print-parameters]'s behavior, of course).
-}
-
-@defproc[(stepper/seed [reductions reduction-relation?]
-                       [seed (cons/c any/c (listof any/c))]
-                       [pp (or/c (any -> string)
-                                 (any output-port number (is-a?/c text%) -> void))
-                           default-pretty-printer])
-         void?]{
-
-Like @racket[stepper], this function opens a stepper window, but it
-seeds it with the reduction-sequence supplied in @racket[seed].
-}
-
-@defproc[(show-derivations [derivations (cons/c derivation? (listof derivation?))]
-                           [#:pp pp
-                                 (or/c (any -> string)
-                                       (any output-port number (is-a?/c text%) -> void))
-                                 default-pretty-printer]
-                           [#:racket-colors? racket-colors? boolean? #f]
-                           [#:init-derivation init-derivation exact-nonnegative-integer? 0])
-         any]{
-  Opens a window to show @racket[derivations]. 
-                         
-  The @racket[pp] and @racket[racket-colors?] arguments are like those to @racket[traces].
-  
-  The initial derivation shown in the window is chosen by @racket[init-derivation], used
-  as an index into @racket[derivations].
-}
-
-@defproc[(derivation/ps [derivation derivation?]
-                        [filename path-string?]
-                        [#:pp pp
-                              (or/c (any -> string)
-                                    (any output-port number (is-a?/c text%) -> void))
-                              default-pretty-printer]
-                        [#:racket-colors? racket-colors? boolean? #f]
-                        [#:post-process post-process (-> (is-a?/c pasteboard%) any)])
-         void?]{
-                
-  Like @racket[show-derivations], except it prints a single
-  derivation in PostScript to @racket[filename].
-}
-
-@defproc[(term-node-children [tn term-node?]) (listof term-node?)]{
-
-Returns a list of the children (i.e., terms that this term
-reduces to) of the given node.
-
-Note that this function does not return all terms that this
-term reduces to -- only those that are currently in the
-graph.
-}
-
-               
-@defproc[(term-node-parents [tn term-node?]) (listof term-node?)]{
-
-Returns a list of the parents (i.e., terms that reduced to the
-current term) of the given node.
-
-Note that this function does not return all terms that
-reduce to this one -- only those that are currently in the
-graph.
-}
-@defproc[(term-node-labels [tn term-node?]) (listof (or/c false/c string?))]{
-
-Returns a list of the names of the reductions that led to
-the given node, in the same order as the result of
-term-node-parents. If the list contains @racket[#f], that means that
-the corresponding step does not have a label.
-}
-
-@defproc[(term-node-set-color! [tn term-node?] [color (or/c string? (is-a?/c color%) false/c)])
-         void?]{
-
-Changes the highlighting of the node; if its second argument
-is @racket[#f], the coloring is removed, otherwise the color is set
-to the specified @racket[color%] object or the color named by the
-string. The @racket[color-database<%>] is used to convert the string
-to a @racket[color%] object.
-}
-
-@defproc[(term-node-color [tn term-node?]) (or/c string? (is-a?/c color%) false/c)]{
-
-Returns the current highlighting of the node. See also @racket[term-node-set-color!].
-}
-
-
-@defproc[(term-node-set-red! [tn term-node?] [red? boolean?]) void?]{
-
-Changes the highlighting of the node; if its second argument
-is @racket[#t], the term is colored pink, if it is @racket[#f], the term is
-not colored specially.
-
-}
-
-@defproc[(term-node-expr [tn term-node?]) any]{
-
-Returns the expression in this node.
-}
-
-@defproc[(term-node-set-position! [tn term-node?] 
-                                  [x (and/c real? positive?)]
-                                  [y (and/c real? positive?)])
-         void?]{
-
-Sets the position of @racket[tn] in the graph to (@racket[x],@racket[y]). 
-}
-
-@defproc[(term-node-x [tn term-node?]) real?]{
-Returns the @tt{x} coordinate of @racket[tn] in the window.
-}
-@defproc[(term-node-y [tn term-node?]) real?]{
-Returns the @tt{y} coordinate of @racket[tn] in the window.
-}
-@defproc[(term-node-width [tn term-node?]) real?]{
-Returns the width of @racket[tn] in the window.
-}
-@defproc[(term-node-height [tn term-node?]) real?]{
-Returns the height of @racket[tn] in the window.
-}
-
-@defproc[(term-node? [v any/c]) boolean?]{
-
-Recognizes term nodes.
-}
-
-@defparam[reduction-steps-cutoff cutoff number?]{
-
-A parameter that controls how many steps the @racket[traces] function
-takes before stopping.
-}
-
-@defparam[initial-font-size size number?]{
-
-A parameter that controls the initial font size for the terms shown
-in the GUI window.
-}
-
-@defparam[initial-char-width width (or/c number? (-> any/c number?))]{
-
-A parameter that determines the initial width of the boxes
-where terms are displayed (measured in characters) for both
-the stepper and traces.
-
-If its value is a number, then the number is used as the width for 
-every term. If its value is a function, then the function is called
-with each term and the resulting number is used as the width.
-}
-
-@deftogether[[
-@defparam[dark-pen-color color (or/c string? (is-a?/c color<%>))]{}
-@defparam[dark-brush-color color (or/c string? (is-a?/c color<%>))]{}
-@defparam[light-pen-color color (or/c string? (is-a?/c color<%>))]{}
-@defparam[light-brush-color color (or/c string? (is-a?/c color<%>))]{}
-@defparam[dark-text-color color (or/c string? (is-a?/c color<%>))]{}
-@defparam[light-text-color color (or/c string? (is-a?/c color<%>))]{}]]{
-
-These six parameters control the color of the edges in the graph.
-
-The dark colors are used when the mouse is over one of the nodes that
-is connected to this edge. The light colors are used when it isn't.
-
-The pen colors control the color of the line. The brush colors control
-the color used to fill the arrowhead and the text colors control the
-color used to draw the label on the edge.
-}
-
-@defparam[pretty-print-parameters f (-> (-> any/c) any/c)]{
-  A parameter that is used to set other @racket[pretty-print]
-  parameters. 
-  
-  Specifically, whenever @racket[default-pretty-printer] prints
-  something it calls @racket[f] with a thunk that does the actual
-  printing. Thus, @racket[f] can adjust @racket[pretty-print]'s
-  parameters to adjust how printing happens.
-
-}
-
-@defproc[(default-pretty-printer 
-           [v any/c] 
-           [port output-port?]
-           [width exact-nonnegative-integer?]
-           [text (is-a?/c text%)])
-         void?]{
-
-This is the default value of @racket[pp] used by @racket[traces] and
-@racket[stepper] and it uses
-@racket[pretty-print]. 
-
-This function uses the value of @racket[pretty-print-parameters] to adjust how it prints.
-
-It sets the @racket[pretty-print-columns] parameter to
-@racket[width], and it sets @racket[pretty-print-size-hook]
-and @racket[pretty-print-print-hook] to print holes and the
-symbol @racket['hole] to match the way they are input in a
-@racket[term] expression.
-
-}
-
-@section{Typesetting}
-
-@defmodule*/no-declare[(redex/pict)]
-@declare-exporting[redex/pict redex]
-
-The @racketmodname[redex/pict] library provides functions
-designed to typeset grammars, reduction relations, and
-metafunctions.
-
-Each grammar, reduction relation, and metafunction can be
-saved in a @filepath{.ps} file (as encapsulated PostScript),
-or can be turned into a pict for viewing in the REPL or
-using with Slideshow (see the @racketmodname[pict]
-library).
-
-For producing papers with Scribble, just include the
-picts inline in the paper and pass the the @DFlag{dvipdf} 
-flag generate the @filepath{.pdf} file. For producing
-papers with LaTeX, create @filepath{.ps} files from Redex and use
-@tt{latex} and @tt{dvipdf} to create @filepath{.pdf} files
-(using @tt{pdflatex} with @filepath{.pdf} files will 
-work but the results will not look as good onscreen).
-
-@subsection{Picts, PDF, & PostScript}
-
-This section documents two classes of operations, one for
-direct use of creating postscript figures for use in papers
-and for use in DrRacket to easily adjust the typesetting:
-@racket[render-term],
-@racket[render-language],
-@racket[render-reduction-relation], 
-@racket[render-relation],
-@racket[render-judgment-form],
-@racket[render-metafunctions], and
-@racket[render-lw], 
-and one for use in combination with other libraries
-that operate on @racketmodname[pict]s
-@racket[term->pict],
-@racket[language->pict],
-@racket[reduction-relation->pict],
-@racket[relation->pict],
-@racket[judgment-form->pict],
-@racket[metafunction->pict], and
-@racket[lw->pict].
-The primary difference between these functions is that the former list
-sets @racket[dc-for-text-size] and the latter does not.
-
-
-@defform*[[(render-term lang term)
-           (render-term lang term file)]]{
-  Renders the term @racket[term]. If @racket[file] is @racket[#f] or not present,
-  @racket[render-term] produces a pict; if @racket[file] is a path, it saves
-  Encapsulated PostScript in the provided filename, unless the filename
-  ends with @filepath{.pdf}, in which case it saves PDF.
-  
-  The @racket[term] argument must be a literal; it is not an 
-  evaluated position. For example, this:
-  @racketblock[(define-language L)
-               (define x (term (+ 1 2)))
-               (render-term L x)]
-  will render the term @racket[x], not the term @racket[(+ 1 2)].
-  
-  See @racket[render-language] for more details on the construction of the pict.
-}
-
-
-@defform[(term->pict lang term)]{
- Produces a pict like @racket[render-term], but without
- adjusting @racket[dc-for-text-size].
-
- The first argument is expected to be a @racket[compiled-language?] and
- the second argument is expected to be a term (without the
- @racket[term] wrapper). The formatting in the @racket[term] argument
- is used to determine how the resulting pict will look.
- 
- This function is primarily designed to be used with
- Slideshow or with other tools that combine @racketmodname[pict]s
- together.
-}
-
-@defproc[(render-term/pretty-write [lang compiled-lang?]
-                                   [term any/c]
-                                   [filename path-string?]
-                                   [#:width width #f])
-         void?]{
-  Like @racket[render-term], except that the @racket[term] argument is evaluated,
-  and expected to return a term. Then, @racket[pretty-write] is used
-  to determine where the line breaks go, using the @racket[width] argument
-  as a maximum width (via @racket[pretty-print-columns]).
-}
-
-@defproc[(term->pict/pretty-write [lang compiled-lang?] 
-                                  [term any/c]
-                                  [filename (or/c path-string? #f)]
-                                  [#:width width #f])
-         pict?]{
-  Like @racket[term->pict], but with the same change that
-  @racket[render-term/pretty-write] has from @racket[render-term].
-}
-
-@defproc[(render-language [lang compiled-lang?]
-                          [file (or/c false/c path-string?) #f]
-                          [#:nts nts (or/c false/c (listof (or/c string? symbol?)))
-                           (render-language-nts)])
-         (if file void? pict?)]{
-
-Renders a language. If @racket[file] is @racket[#f],
-it produces a pict; if @racket[file] is a path, it saves
-Encapsulated PostScript in the provided filename, unless the filename
-ends with @filepath{.pdf}, in which case it saves PDF.
-See
-@racket[render-language-nts] for information on the
-@racket[nts] argument.
-
-This function parameterizes @racket[dc-for-text-size] to install a
-relevant dc: a @racket[bitmap-dc%] or a @racket[post-script-dc%], depending on
-whether @racket[file] is a path.
-
-See @racket[language->pict] if you are using Slideshow or
-are otherwise setting @racket[dc-for-text-size].  }
-
-@defproc[(language->pict (lang compiled-lang?)
-                         [#:nts nts (or/c false/c (listof (or/c string? symbol?)))
-                          (render-language-nts)])
-         pict?]{
-
-Produce a pict like @racket[render-language], but without
-adjusting @racket[dc-for-text-size].
-
-This function is primarily designed to be used with
-Slideshow or with other tools that combine @racketmodname[pict]s
-together.
-}
-
-@defproc[(render-reduction-relation [rel reduction-relation?]
-                                    [file (or/c false/c path-string?) #f]
-                                    [#:style style reduction-rule-style/c (rule-pict-style)])
-         (if file void? pict?)]{
-
-Renders a reduction relation. If @racket[file] is @racket[#f],
-it produces a pict; if @racket[file] is a path, it saves
-Encapsulated PostScript in the provided filename, unless the filename
-ends with @filepath{.pdf}, in which case it saves PDF.
-See @racket[rule-pict-style] for information on the
-@racket[style] argument.
-
-This function parameterizes @racket[dc-for-text-size] to install a
-relevant dc: a @racket[bitmap-dc%] or a @racket[post-script-dc%], depending on
-whether @racket[file] is a path. See also
-@racket[reduction-relation->pict].
-
-The following forms of arrows can be typeset: 
-
-@arrows[--> -+> ==> -> => ..> >-> ~~> ~> :-> :--> c->
-        -->> >-- --< >>-- --<<]
-
-}
-
-@defproc[(reduction-relation->pict (r reduction-relation?)
-                                   [#:style style reduction-rule-style/c (rule-pict-style)])
-         pict?]{
-
-  Produces a pict like @racket[render-reduction-relation], but 
-  without setting @racket[dc-for-text-size].
-
-This function is
-primarily designed to be used with Slideshow or with
-other tools that combine @racketmodname[pict]s together.
-}
-
-@deftogether[[
-@defform[(render-metafunction metafunction-name maybe-contract)]{}
-@defform/none[#:literals (render-metafunction)
-              (render-metafunction metafunction-name filename maybe-contract)]{}
-@defform[(render-metafunctions metafunction-name ... 
-                               maybe-filename maybe-contract)
-          #:grammar ([maybe-filename (code:line) (code:line #:file filename)]
-                     [maybe-contract? (code:line) (code:line #:contract? bool-expr)])]{}]]{
-Like @racket[render-reduction-relation] but for metafunctions.
-
-Similarly, @racket[render-metafunctions] accepts multiple 
-metafunctions and renders them together, lining up all of the
-clauses together.
-
-If the metafunctions have contracts, they are typeset as the first
-lines of the output unless the expression following @racket[#:contract?]
-evaluates to @racket[#f] (which is the default).
-
-This function sets @racket[dc-for-text-size]. See also
-@racket[metafunction->pict] and
-@racket[metafunctions->pict].
-
-@history[#:changed "1.3" @list{Added @racket[#:contract?] keyword argument.}]
-}
-
-@defform[(metafunction->pict metafunction-name)]{
-  This produces a pict, but without setting @racket[dc-for-text-size].
-  It is suitable for use in Slideshow or other libraries that combine
-  @racketmodname[pict]s.
-}
-
-@defform[(metafunctions->pict metafunction-name ...)]{
-  Like @racket[metafunction->pict], 
-  this produces a @racketmodname[pict], but without setting @racket[dc-for-text-size]
-  and is suitable for use in Slideshow or other libraries that combine
-  @racketmodname[pict]s. Like
-  @racket[render-metafunctions], it accepts multiple metafunctions
-  and renders them together.
-}
-
-@deftogether[(@defform[(render-relation relation-name)]{}
-              @defform/none[#:literals (render-relation)
-                                       (render-relation relation-name filename)]{})]{
-Like @racket[render-metafunction] but for relations.
-
-This function sets @racket[dc-for-text-size]. See also
-@racket[relation->pict].
-}
-
-@deftogether[(@defform[(render-judgment-form judgment-form-name)]{}
-              @defform/none[#:literals (render-judgment-form)
-                                       (render-judgment-form judgment-form-name filename)]{})]{
-Like @racket[render-metafunction] but for judgment forms.
-
-This function sets @racket[dc-for-text-size]. See also
-@racket[judgment-form->pict].
-}
-
-@defform[(relation->pict relation-name)]{
-  This produces a pict, but without setting @racket[dc-for-text-size].
-  It is suitable for use in Slideshow or other libraries that combine
-  @racketmodname[pict]s.
-}
-
-@defform[(judgment-form->pict judgment-form-name)]{
-  This produces a pict, but without setting @racket[dc-for-text-size].
-  It is suitable for use in Slideshow or other libraries that combine
-  @racketmodname[pict]s.
-}
-
-@subsection{Customization}
-
-@defparam[render-language-nts nts (or/c false/c (listof symbol?))]{
-  The value of this parameter controls which non-terminals
-  @racket[render-language] and @racket[language->pict] render by default. If it
-  is @racket[#f] (the default), all non-terminals are rendered.
-  If it is a list of symbols, only the listed symbols are rendered.
-
-  See also @racket[language-nts].
-}
-
-@defparam[non-terminal-gap-space gap-space real?]{
-  Controls the amount of vertical space between non-terminals
-  in a typeset language.
-  
-  Defaults to @racket[0].
-  
-  @history[#:added "1.1"]
-}
-
-@defparam[extend-language-show-union show? boolean?]{
-
-A parameter that controls the rendering of extended languages.
-If the parameter value is @racket[#t], then a language constructed with
-extend-language is shown as if the language had been
-constructed directly with @racket[language]. If it is @racket[#f], then only
-the last extension to the language is shown (with
-four-period ellipses, just like in the concrete syntax).
-
-Defaults to @racket[#f].
-
-Note that the @racket[#t] variant can look a little bit strange if
-@racket[....] are used and the original version of the language has
-multi-line right-hand sides.
-}
-
-@defparam[extend-language-show-extended-order ext-order? boolean?]{
-
-A parameter that controls the rendering of extended languages when
-@racket[extend-language-show-union] has a true value.  If this
-parameter's value is @racket[#t], then productions are shown as
-ordered in the language extension instead of the order of the
-original, unextended language.
-
-Defaults to @racket[#f].
-
-@history[#:added "1.2"]}
-
-@defparam[render-reduction-relation-rules 
-          rules 
-          (or/c false/c 
-                (listof (or/c symbol? 
-                              string?
-                              exact-nonnegative-integer?)))]{
-  This parameter controls which rules in a reduction relation
-  will be rendered. The strings and symbols match the names of
-  the rules and the integers match the position of the rule in
-  the original definition.
-}
-
-@defparam[rule-pict-style style reduction-rule-style/c]{
-
-This parameter controls the style used by default for the reduction
-relation. It can be @racket['horizontal], where the left and
-right-hand sides of the reduction rule are beside each other or
-@racket['vertical], where the left and right-hand sides of the
-reduction rule are above each other.  The @racket['compact-vertical]
-style moves the reduction arrow to the second line and uses less space
-between lines.  The @racket['vertical-overlapping-side-conditions]
-variant, the side-conditions don't contribute to the width of the
-pict, but are just overlaid on the second line of each rule.  The
-@racket['horizontal-left-align] style is like the @racket['horizontal]
-style, but the left-hand sides of the rules are aligned on the left,
-instead of on the right. The @racket[''horizontal-side-conditions-same-line]
-is like @racket['horizontal], except that side-conditions
-are on the same lines as the rule, instead of on their own line below.
-
-}
-
-@defthing[reduction-rule-style/c contract?]{
-
-A contract equivalent to
-
-@racketblock[(or/c 'vertical 
-                   'compact-vertical
-                   'vertical-overlapping-side-conditions
-                   'horizontal
-                   'horizontal-left-align
-                   'horizontal-side-conditions-same-line
-                   (-> (listof rule-pict-info?) pict?))]
-
-The symbols indicate various pre-defined styles. The procedure
-implements new styles; it is give the @racket[rule-pict-info?]
-values, one for each clause in the reduction relation,
-and is expected to combine them into a single @racket[pict?]
-}
-
-@defproc[(rule-pict-info? [x any/c]) boolean?]{
-  A predicate that recognizes information about a rule for use 
-  in rendering the rule as a @racket[pict?].
-}
-@defproc[(rule-pict-info-arrow [rule-pict-info rule-pict-info?]) symbol?]{
-  Extracts the arrow used for this rule. See also @racket[arrow->pict].
-}
-@defproc[(rule-pict-info-lhs [rule-pict-info rule-pict-info?]) pict?]{
-  Extracts a pict for the left-hand side of this rule.
-}
-@defproc[(rule-pict-info-rhs [rule-pict-info rule-pict-info?]) pict?]{
- Extracts a pict for the right-hand side of this rule.
-}
-@defproc[(rule-pict-info-label [rule-pict-info rule-pict-info?]) (or/c symbol? #f)]{
- Returns the label used for this rule, unless there is no label
- for the rule or @racket[_computed-label] was used,
- in which case this returns @racket[#f].
-}
-@defproc[(rule-pict-info-computed-label [rule-pict-info rule-pict-info?]) (or/c pict? #f)]{
-  Returns a pict for the typeset version of the label of this rule, when
-  @racket[_computed-label] was used. Otherwise, returns @racket[#f].
-}
-@defproc[(rule-pict-info->side-condition-pict [rule-pict-info rule-pict-info?] 
-                                              [max-width real? +inf.0])
-         pict?]{
-  Builds a pict for the @racket[_side-condition]s and @racket[_where] clauses
-  for @racket[rule-pict-info], attempting to keep the width under @racket[max-width].
-}
-
-
-@defparam[arrow-space space natural-number/c]{
-
-This parameter controls the amount of extra horizontal space
-around the reduction relation arrow. Defaults to 0.
-}
-
-@defparam[label-space space natural-number/c]{
-
-This parameter controls the amount of extra space before the
-label on each rule, except in the @racket['vertical] and 
-@racket['vertical-overlapping-side-conditions] modes, where
-it has no effect. Defaults to 0.
-}
-
-@defparam[metafunction-pict-style style 
-                                  (or/c 'left-right
-                                        'up-down
-                                        'left-right/vertical-side-conditions
-                                        'up-down/vertical-side-conditions
-                                        'left-right/compact-side-conditions
-                                        'up-down/compact-side-conditions
-                                        'left-right/beside-side-conditions)]{
-
-This parameter controls the style used for typesetting
-metafunctions. The @racket['left-right] style means that the
-results of calling the metafunction are displayed to the 
-right of the arguments and the @racket['up-down] style means that
-the results are displayed below the arguments.
-
-The @racket['left-right/vertical-side-conditions] and
-@racket['up-down/vertical-side-conditions] variants format side
-conditions each on a separate line, instead of all on the same line.
-
-The @racket['left-right/compact-side-conditions] and
-@racket['up-down/compact-side-conditions] variants move side
-conditions to separate lines to avoid making the rendered form wider
-than it would be otherwise.
-
-The @racket['left-right/beside-side-conditions] variant is like
-@racket['left-right], except it puts the side-conditions on the 
-same line, instead of on a new line below the case.}
-
-@defparam[delimit-ellipsis-arguments? delimit? any/c]{
-This parameter controls the typesetting of metafunction definitions
-and applications. When it is non-@racket[#f] (the default), commas
-precede ellipses that represent argument sequences; when it is 
-@racket[#f] no commas appear in those positions.
-}
-
-@defparam[white-square-bracket make-white-square-bracket (-> boolean? pict?)]{
-This parameter controls the typesetting of the brackets in metafunction
-definitions and applications. It is called to supply the two white bracket
-picts. If @racket[#t] is supplied, the function should return the open 
-white bracket (to be used at the left-hand side of an application) and if
-@racket[#f] is supplied, the function should return the close white bracket.
-
-It's default value is @racket[default-white-square-bracket]. See also
-@racket[homemade-white-square-bracket].
-
-@history[#:added "1.1"]
-}
-
-@defproc[(homemade-white-square-bracket [open? boolean?]) pict?]{
- This function implements the default way that older versions
- of Redex typeset whitebrackets. It uses two overlapping
- @litchar{[} and  @litchar{]} chars with a little whitespace between them.
-
- @history[#:added "1.1"]
-}
-
-@defproc[(default-white-square-bracket [open? boolean?]) pict?]{
- This function returns picts built using
- @litchar{〚} and  @litchar{〛}
- in the style @racket[default-style], using
- @racket[current-text] and @racket[default-font-size].
-
- If these result in picts that are more than 1/2 whitespace,
- then 1/3 of the whitespace is trimmed from sides (trimmed
- only from the left of the open and the right of the close).
- 
- @history[#:added "1.1"]
-}
-
-@defparam[linebreaks breaks (or/c #f (listof boolean?))]{
-  This parameter controls which cases in the metafunction 
-  are rendered on two lines and which are rendered on one.
-  
-  If its value is a list, the length of the list must match
-  the number of cases plus one if there is a contract. 
-  Each boolean indicates if that case has a linebreak or not.
-  
-  This parameter's value influences the @racket['left/right] styles only.
-}
-
-@defparam[metafunction-cases 
-          cases
-          (or/c #f (and/c (listof (or/c exact-nonnegative-integer? 
-                                        string?))
-                          pair?))]{
-
-Controls which cases in a metafunction are rendered. If it is @racket[#f]
-(the default), then all of the cases appear. If it is a list, then only 
-the selected cases appear. The numbers indicate the cases counting from
-@racket[0] and the strings indicate cases named with @racket[clause-name].
-
-This parameter also controls how which clauses in judgment forms are rendered, but
-only in the case that @racket[judgment-form-cases] is @racket[#f] (and in that
-case, only the numbers are used).
-}
-                                  
-@defparam[judgment-form-cases 
-          cases
-          (or/c #f
-                (and/c (listof (or/c exact-nonnegative-integer?
-                                     string?))
-                       pair?))]{
-   Controls which clauses in a judgment form are rendered. If it is 
-   @racket[#f] (the default), then all of them are rendered. If
-   it is a list, then only the selected clauses appear (numbers
-   count from @racket[0], and strings correspond to the labels
-   in a judgment form).
-}
-
-@deftogether[[
-@defparam[label-style style text-style/c]{}
-@defparam[grammar-style style text-style/c]{}
-@defparam[paren-style style text-style/c]{}
-@defparam[literal-style style text-style/c]{}
-@defparam[metafunction-style style text-style/c]{}
-@defparam[non-terminal-style style text-style/c]{}
-@defparam[non-terminal-subscript-style style text-style/c]{}
-@defparam[non-terminal-superscript-style style text-style/c]{}
-@defparam[default-style style text-style/c]{}]]{
-
-These parameters determine the font used for various text in
-the picts. See @racket[text] in the texpict collection for
-documentation explaining @racket[text-style/c]. One of the more
-useful things it can be is one of the symbols @racket['roman],
-@racket['swiss], or @racket['modern], which are a serif, sans-serif, and
-monospaced font, respectively. (It can also encode style
-information, too.)
-
-The @racket[label-style] is used for the reduction rule label
-names. The @racket[literal-style] is used for names that aren't
-non-terminals that appear in patterns. The
-@racket[metafunction-style] is used for the names of
-metafunctions. 
-The @racket[paren-style] is used for the parentheses 
-(including ``['', ``]'', ``@"{"'', and ``@"}"'',
-as well as ``('' and ``)''), but not for the square brackets used for
-in-hole decompositions, which use the @racket[default-style].
-The @racket[grammar-style] is used for the ``::='' and ``|''
-in grammars.
-
-The @racket[non-terminal-style] parameter is used for the names of non-terminals.
-Two parameters style the text in the (optional) "underscore" component
-of a non-terminal reference. The first, @racket[non-terminal-subscript-style],
-applies to the segment between the underscore and the first caret (@racket[^]) 
-to follow it; the second, @racket[non-terminal-superscript-style], applies
-to the segment following that caret. For example, in the non-terminal 
-reference @racket[x_y^z], @racket[x] has style @racket[non-terminal-style],
-@racket[y] has style @racket[non-terminal-subscript-style], and @racket[z]
-has style @racket[non-terminal-superscript-style].
-
-The @racket[default-style] is used for parenthesis, the dot in dotted
-lists, spaces, the
-"where" and "fresh" in side-conditions, and other places
-where the other parameters aren't used.
-}
-
-@deftogether[[
-@defparam[label-font-size size (and/c (between/c 1 255) integer?)]{}
-@defparam[metafunction-font-size size (and/c (between/c 1 255)
-                                             integer?)]{}
-@defparam[default-font-size size (and/c (between/c 1 255) integer?)]{}]]{
-
-These parameters control the various font sizes. The
-default-font-size is used for all of the font sizes except
-labels and metafunctions.
-}
-
-@defparam[reduction-relation-rule-separation sep (parameter/c (and/c integer? positive? exact?))]{  
-
-Controls the amount of space between clauses in a reduction
-relation. Defaults to 4.
-}
-
-@defparam[curly-quotes-for-strings on? boolean?]{
-
-Controls if the open and close quotes for strings are turned
-into “ and ” or are left as merely ".
-
-Defaults to @racket[#t].
-}
-
-@defparam[current-text proc (-> string? text-style/c number? pict?)]{
-
-This parameter's function is called whenever Redex typesets
-some part of a grammar, reduction relation, or
-metafunction. It defaults to the @racketmodname[pict] 
-library's @racket[text] function.
-}
-
-@defproc[(arrow->pict [arrow symbol?]) pict?]{
-  Returns the pict corresponding to @racket[arrow].
-}
-
-@defproc[(set-arrow-pict! [arrow symbol?] [proc  (-> pict?)]) void?]{
-
-This functions sets the pict for a given reduction-relation
-symbol. When typesetting a reduction relation that uses the
-symbol, the thunk will be invoked to get a pict to render
-it. The thunk may be invoked multiple times when rendering a
-single reduction relation.
-}
-
-@defparam[white-bracket-sizing proc (-> string? number? (values number? number? number? number?))]{
-
-  This parameter is used when typesetting metafunctions to
-  determine how to create the @"\u301a\u301b"
-  characters. Rather than using those characters directly
-  (since glyphs tend not to be available in PostScript
-  fonts), they are created by combining two ‘[’ characters
-  or two ‘]’ characters together.
-  
-  The procedure accepts a string that is either @racket["["]
-  or @racket["]"], and returns four numbers. The first two
-  numbers determine the offset (from the left and from the
-  right respectively) for the second square bracket, and the
-  second two two numbers determine the extra space added (to
-  the left and to the right respectively).
-
-  The default value of the parameter is: @racketblock[
-     (λ (str size)
-       (let ([inset-amt (floor/even (max 4 (* size 1/2)))])
-         (cond
-           [(equal? str "[")
-            (values inset-amt
-                    0
-                    0
-                    (/ inset-amt 2))]
-           [else
-            (values 0
-                    inset-amt
-                    (/ inset-amt 2)
-                    0)])))]
-
- where @racket[floor/even] returns the nearest even number
- below its argument.  This means that for sizes 9, 10, and
- 11, @racket[inset-amt] will be 4, and for 12, 13, 14, and
- 15, @racket[inset-amt] will be 6.
-
-}
-
-@defparam[horizontal-bar-spacing space (parameter/c exact-nonnegative-integer?)]{
-  Controls the amount of space around the horizontal bar when rendering
-  a relation (that was created by @racket[define-relation]). Defaults
-  to @racket[4].
-}
-@defparam[relation-clauses-combine combine 
-                                   (parameter/c (-> (listof pict?) pict?))]{
-  The @racket[combine] function is called with the list of picts that are obtained by rendering
-  a relation; it should put them together into a single pict. It defaults to
-  @racket[(λ (l) (apply vc-append 20 l))]
-}
-
-@defparam[where-make-prefix-pict make-prefix (parameter/c (-> pict?))]{
-  The @racket[make-prefix] function is called with no arguments to generate a pict
-  that prefixes @tech{@racket[where] clauses}. It defaults to a function that
-  produces a pict for ``where'' surrounded by spaces using the default style.
-}
-
-@defparam[where-combine combine (parameter/c (-> pict? pict? pict?))]{
-  The @racket[combine] function is called with picts for the left and right
-  side of a where clause, and it should put them together into a single pict. It defaults to
-  @racket[(λ (l r) (hbl-append l _=-pict r))], where @racket[_=-pict] is an equal
-  sign surrounded by spaces using the default style.
-}
-
-@subsection[#:tag "pink"]{Removing the Pink Background}
-
-@declare-exporting[redex/pict redex]
-
-When reduction rules, a metafunction, or a grammar contains
-unquoted Racket code or side-conditions, they are rendered
-with a pink background as a guide to help find them and
-provide an alternative typesetting for them. In general, a
-good goal for a PLT Redex program that you intend to typeset
-is to only include such things when they correspond to
-standard mathematical operations, and the Racket code is an
-implementation of those operations.
-
-To replace the pink code, use:
-
-@defform[(with-unquote-rewriter proc expression)]{
-
-Installs @racket[proc] as the current unquote rewriter and
-evaluates @racket[expression]. If that expression computes any picts,
-the unquote rewriter specified is used to remap them.
-
-The @racket[proc] must match the contract @racket[(-> lw? lw?)].
-Its result should be the rewritten version version of the input.
-}
-
-@defform[(with-atomic-rewriter name-symbol
-                               string-or-thunk-returning-pict
-                               expression)]{
-
-This extends the current set of atomic-rewriters with one
-new one that rewrites the value of name-symbol to
-@racket[string-or-pict-returning-thunk] (applied, in the case of a
-thunk), during the evaluation of expression.
-
-@racket[name-symbol] is expected to evaluate to a symbol. The value
-of @racket[string-or-thunk-returning-pict] is used whenever the symbol
-appears in a pattern.
-}
-
-@defform[(with-compound-rewriter name-symbol
-                                 proc
-                                 expression)]{
-
-This extends the current set of compound-rewriters with one
-new one that rewrites the value of name-symbol via proc,
-during the evaluation of expression.
-
-@racket[name-symbol] is expected to evaluate to a symbol. The value
-of proc is called with a @racket[(listof lw)], and is expected to
-return a new @racket[(listof (or/c lw? string? pict?))],
-rewritten appropriately. 
-
-The list passed to the rewriter corresponds to the
-@racket[lw] for the sequence that has name-symbol's value at
-its head.
-
-The result list is constrained to have at most 2 adjacent
-non-@racket[lw]s. That list is then transformed by adding
-@racket[lw] structs for each of the non-@racket[lw]s in the
-list (see the text just below the description of @racket[lw] for a
-explanation of logical space):
-
-@itemize[
-@item{
-    If there are two adjacent @racket[lw]s, then the logical
-    space between them is filled with whitespace.}
-
-@item{
-    If there is a pair of @racket[lw]s with just a single
-    non-@racket[lw] between them, a @racket[lw] will be
-    created (containing the non-@racket[lw]) that uses all
-    of the available logical space between the @racket[lw]s.
-}
-
-@item{
-    If there are two adjacent non-@racket[lw]s between two
-    @racket[lw]s, the first non-@racket[lw] is rendered
-    right after the first @racket[lw] with a logical space
-    of zero, and the second is rendered right before the
-    last @racket[lw] also with a logical space of zero, and
-    the logical space between the two @racket[lw]s is
-    absorbed by a new @racket[lw] that renders using no
-    actual space in the typeset version.
-}]
-
-One useful way to take advantage of @racket[with-compound-rewriters]
-is to return a list that begins and ends with @racket[""] (the
-empty string). In that situation, any extra logical space that
-would have been just outside the sequence is replaced with an 
-@racket[lw] that does not draw anything at all.
-
-}
-
-@defform[(with-compound-rewriters ([name-symbol proc] ...)
-                                  expression)]{
-Shorthand for nested @racket[with-compound-rewriter] expressions.}
-
-@subsection{LWs}
-                                              
-@defstruct[lw ([e (or/c string?
-                        symbol?
-                        pict? 
-                        (listof (or/c (symbols 'spring) lw?)))]
-               [line exact-positive-integer?]
-               [line-span exact-positive-integer?]
-               [column exact-positive-integer?]
-               [column-span exact-positive-integer?]
-               [unq? boolean?]
-               [metafunction? boolean?])
-              #:mutable]{
-The @racket[lw] data structure corresponds represents a pattern or a Racket
-expression that is to be typeset.  The functions listed above
-construct @racket[lw] structs, select fields out of them, and
-recognize them. The @racket[lw] binding can be used with
-@racket[copy-struct].
-
-The values of the @racket[unq?] and @racket[metafunction?] fields, respectively,
-indicate whether the @racket[lw] represents an unquoted expression or a 
-metafunction application. See @racket[to-lw] for the meanings of the other fields.
-}
-
-@defproc[(build-lw [e (or/c string?
-                            symbol?
-                            pict? 
-                            (listof (or/c (symbols 'spring) lw?)))]
-                   [line exact-positive-integer?]
-                   [line-span exact-positive-integer?]
-                   [column exact-positive-integer?]
-                   [column-span exact-positive-integer?]) 
-         lw?]{
-Like @racket[make-lw] but specialized for constructing @racket[lw]s that
-do not represent unquoted expressions or metafunction applications.
-}
-
-@defform[(to-lw arg)]{
-
-This form turns its argument into @racket[lw] structs that
-contain all of the spacing information just as it would appear
-when being used to typeset.
-
-Each sub-expression corresponds to its own lw, and
-the element indicates what kind of subexpression it is. If
-the element is a list, then the lw corresponds to a
-parenthesized sequence, and the list contains a lw
-for the open paren, one lw for each component of the
-sequence and then a lw for the close
-parenthesis. In the case of a dotted list, there will also
-be a lw in the third-to-last position for the dot.
-
-For example, this expression:
-
-@racketblock[(a)]
-
-becomes this lw (assuming the above expression
-appears as the first thing in the file):
-
-@racketblock[
-     (build-lw (list (build-lw "(" 0 0 0 1)
-                              (build-lw 'a 0 0 1 1)
-                              (build-lw ")" 0 0 2 1))
-                        0 0 0 3)
-]
-
-If there is some whitespace in the sequence, like this one:
-
-@racketblock[
-  (a b)
-]
-
-then there is no lw that corresponds to that
-whitespace; instead there is a logical gap between the
-lws.
-
-@racketblock[
-     (build-lw (list (build-lw "(" 0 0 0 1)
-                     (build-lw 'a 0 0 1 1)
-                     (build-lw 'b 0 0 3 1)
-                     (build-lw ")" 0 0 4 1))
-               0 0 0 5)
-]
-
-In general, identifiers are represented with symbols and
-parenthesis are represented with strings and @racket[pict]s can be
-inserted to render arbitrary pictures.
-
-The line, line-span, column, and column-span correspond to
-the logical spacing for the redex program, not the actual
-spacing that will be used when they are rendered. The
-logical spacing is only used when determining where to place
-typeset portions of the program. In the absence of any
-rewriters, these numbers correspond to the line and column
-numbers in the original program.
-
-The line and column are absolute numbers from the beginning
-of the file containing the expression. The column number is
-not necessarily the column of the open parenthesis in a
-sequence -- it is the leftmost column that is occupied by
-anything in the sequence. The line-span is the number of
-lines, and the column span is the number of columns on the
-last line (not the total width).
-
-When there are multiple lines, lines are aligned based on
-the logical space (i.e., the line/column &
-line-span/column-span) fields of the lws. As an
-example, if this is the original pattern:
-
-@racketblock[
-   (all good boys
-        deserve fudge)
-]
-
-then the leftmost edges of the words "good" and "deserve"
-will be lined up underneath each other, but the relative
-positions of "boys" and "fudge" will be determined by the
-natural size of the words as they rendered in the
-appropriate font.
-
-When @racket['spring] appears in the list in the @racket[e]
-field of a @racket[lw] struct, then it absorbs all of the
-space around it. It is also used by @racket[to-lw] when
-constructing the picts for unquoted strings. For example, this expression
-
-@racketblock[,x]
-
-corresponds to these structs:
-
-@racketblock[(build-lw (list (build-lw "" 1 0 9 0)
-                             'spring
-                             (build-lw x 1 0 10 1))
-                       1 0 9 2)]
-
-and the @racket['spring] causes there to be no space between
-the empty string and the @racket[x] in the typeset output.
-
-}
-
-@defproc[(to-lw/stx [stx syntax?]) lw?]{
-  This is the runtime variant on @racket[to-lw]; it accepts a 
-  syntax object and returns the corresponding @racket[lw] structs.
-  It only uses the location information in the syntax object,
-  so metafunctions will not be rendered properly.
-}
-
-@defproc[(render-lw (language/nts (or/c (listof symbol?) compiled-lang?))
-                    (lw lw?)) pict?]{
-
-  Produces a pict that corresponds to the @racket[lw] object
-  argument, using @racket[language/nts] to determine which
-  of the identifiers in the @racket[lw] argument are
-  non-terminals.
-
-  This function sets @racket[dc-for-text-size]. See also
-  @racket[lw->pict].
-}
-
-@defproc[(lw->pict (language/ntw (or/c (listof symbol?) compiled-lang?))
-                   (lw lw?)) pict?]{
-
-  Produces a pict that corresponds to the @racket[lw] object
-  argument, using @racket[language/nts] to determine which
-  of the identifiers in the @racket[lw] argument are
-  non-terminals.
-
-  This does not set the @racket[dc-for-text-size] parameter. See also
-  @racket[render-lw].
-}
-
-@deftogether[[
-@defproc[(just-before [stuff (or/c pict? string? symbol?)]
-                      [lw lw?])
-                     lw?]{}
-@defproc[(just-after [stuff (or/c pict? string? symbol?)]
-                     [lw lw?])
-                    lw?]{}]]{
-These two helper functions build new lws whose contents are
-the first argument, and whose line and column are based on
-the second argument, making the new loc wrapper be either
-just before or just after that argument. The line-span and
-column-span of the new lw is always zero.
-}
-
-@include-section["dynamic-typesetting-and-macros.scrbl"]
-
-@close-eval[redex-eval]
diff --git a/pkgs/redex-pkgs/redex-doc/redex/scribblings/tut-util.rkt b/pkgs/redex-pkgs/redex-doc/redex/scribblings/tut-util.rkt
deleted file mode 100644
index 85cde91bd8..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/scribblings/tut-util.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang at-exp racket/base
-
-(require scribble/base 
-         scribble/core)
-(provide exercise exref)
-
-(define i 0)
-(define (exercise [id #f])
-  (set! i (+ i 1))
-  (when id (hash-set! ex-ids id i))
-  (element (style 'bold '()) 
-           (format "Exercise ~a" i)))
-(define ex-ids (make-hash))
-(define (exref id) (format "~a" (hash-ref ex-ids id)))
-
diff --git a/pkgs/redex-pkgs/redex-doc/redex/scribblings/tut.scrbl b/pkgs/redex-pkgs/redex-doc/redex/scribblings/tut.scrbl
deleted file mode 100644
index c8e7a43bc0..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/scribblings/tut.scrbl
+++ /dev/null
@@ -1,1132 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/bnf
-          scribble/struct
-          scribble/eval
-          racket/runtime-path
-          scriblib/autobib
-          (for-syntax racket/base 
-                      setup/path-to-relative 
-                      setup/main-collects)
-          setup/dirs
-          "tut-util.rkt"
-          "cite.rkt"
-          (for-label racket/base
-                     racket/gui
-                     racket/pretty
-                     racket/contract
-                     pict
-                     mrlib/graph
-                     redex))
-
-@(define amb-eval (make-base-eval))
-@(interaction-eval #:eval amb-eval (require racket
-                                            redex/reduction-semantics 
-                                            redex/pict
-                                            pict
-                                            racket/pretty))
-@(interaction-eval #:eval amb-eval (begin (pretty-print-columns 40) (random-seed 0)))
-
-@(define orig-op (current-output-port))
-@(define orig-ep (current-error-port))
-
-@; evaluates its argument in the amb-eval, but sets
-@; the output to go the real stdout & stdin; use this
-@; to add extra test cases that don't get rendered
-@; in the file (but that drdr can catch the output of)
-@(define-syntax-rule
-   (amb-try e ...)
-   (amb-eval `(parameterize ([current-output-port ,orig-op]
-                             [current-error-port ,orig-ep])
-                ,'e ...)))
-
-@; (interaction/test exp passed?) ==> renders as interaction would, 
-@; but also checks to see if 'passed?'
-@; holds for the result of 'exp'
-@(define-for-syntax (loc stx)
-   (let ([src (syntax-source stx)])
-     (if (path? src)
-         (path->relative-string/library src)
-         #f)))
-@(define-syntax (interaction/test stx)
-   (syntax-case stx ()
-     [(_ exp passed?)
-      (with-syntax ([line (syntax-line stx)]
-                    [src (loc stx)])
-        #'(begin (amb-try (interaction/test/proc passed? exp src line))
-                 (interaction #:eval amb-eval exp)))]))
-@(amb-eval '(define (interaction/test/proc passed? val src line)
-              (unless (passed? val)
-                (eprintf "~a: test case on line ~a failed\n  ~s\n  pred: ~s\n" 
-                         src line
-                         val
-                         (contract-name passed?)))))
-
-@; just like (amb/test exp passed?), except it does not 
-@; render the result
-@(define-syntax (amb/test stx)
-   (syntax-case stx ()
-     [(_ exp passed?)
-      (with-syntax ([line (syntax-line stx)]
-                    [src (loc stx)])
-        #'(begin (amb-try (interaction/test/proc passed? exp src line))
-                 ""))]))
-
-@(define-syntax (check-output stx)
-   (syntax-case stx ()
-     [(_ exp reg)
-      (with-syntax ([line (syntax-line stx)]
-                    [src (loc stx)])
-        #'(check-output/proc 'exp reg line src))]))
-@(define (check-output/proc exp reg line src)
-   (define sp (open-output-string))
-   (amb-eval `(parameterize ([current-output-port ,sp])
-                ,exp))
-   (define got (get-output-string sp))
-   (unless (regexp-match reg got)
-     (eprintf "~a: test case on line ~a failed\n  ~s\n  expected ~s\n"
-              src line got reg)))
-
-@title[#:tag "tutorial"]{Amb: A Redex Tutorial}
-
-This tutorial is designed for those familiar with the call-by-value
-λ-calculus (and evaluation contexts), but not Redex. 
-The tutorial works though a model of
-the λ-calculus extended with a variation on McCarthy's @racket[amb] operator
-for ambiguous choice@~cite[amb1 amb2].
-
-If you are not familiar with Racket, first try 
-@other-doc['(lib "quick.scrbl" "scribblings/quick")] or
-@other-doc['(lib "more.scrbl" "scribblings/more")].
-
-The model includes a standard evaluation reduction relation and a type system.
-Along the way, the tutorial demonstrates Redex's support for unit testing,
-random testing, typesetting, metafunctions, reduction relations,
-and judgment forms. It also includes a number of exercises to use
-as jumping off points to explore Redex in more depth, and each of the
-functions and syntactic forms used in the examples are linked to more
-information.
-
-@section{Defining a Language}
-
-To get started, open DrRacket, and put the following two
-lines at the top of the file (if the first line is not
-there already, use the @onscreen{Language|Choose Language...}
-menu item to make sure that DrRacket is set to use
-the language declaration in the source).
-@codeblock|{
-#lang racket
-(require redex)
-}|
-Those lines tell DrRacket that we're writing a program
-in the @racketmodname[racket] language and we're going
-to be using the @racketmodname[redex] DSL.
-
-Next, enter the following definition.
-
-@racketblock+eval[#:eval amb-eval
-                         (define-language L
-                           (e (e e)
-                              (λ (x t) e)
-                              x
-                              (amb e ...)
-                              number
-                              (+ e ...)
-                              (if0 e e e)
-                              (fix e))
-                           (t (→ t t) num)
-                           (x variable-not-otherwise-mentioned))]
-
-
-The @racket[define-language] form gives a name to
-a grammar. In this case, @racket[L] is the Racket-level
-name referring to the grammar containing the non-terminal
-@racket[e], with six productions (application, abstraction,
-variables, @racket[amb] expressions, numbers, and addition
-expressions), the non-terminal @racket[t] with two productions,
-and the non-terminal @racket[x] that uses the pattern
-keyword @racket[variable-not-otherwise-mentioned]. This 
-special pattern matches all symbols except those used
-as literals in the grammar (in this case: @racket[λ],
-@racket[amb], @racket[+], and @racket[→]).
-
-Once we have defined the grammar, we can ask Redex if 
-specific terms match the grammar. This expression checks
-to see if the @racket[e] non-terminal (from @racket[L])
-matches the object-language expression @racket[(λ (x) x)].
-
-To do this, first click the @onscreen{Run} button in DrRacket's
-toolbar and then enter the following expression after the prompt
-For the remainder of this tutorial, expressions prefixed with a
-@tt{>} are intended to be run in the interactions window (lower pane), 
-and expressions without the @tt{>} prefix belong in the definitions 
-window (the upper pane).
-
-@interaction/test[(redex-match 
-                   L
-                   e
-                   (term (λ (x) x)))
-                  not]
-
-In general, a @racket[redex-match] expression first names a language,
-then a pattern, and then its third position is an arbitrary Racket expression.
-In this case, we use @racket[term] to construct an Redex object-level expression.
-The @racket[term] operator is much like Lisp's @racket[quasiquote]
-(typically written @tt{`}).
-
-This term does not match @racket[e]
-(since @racket[e] insists the function parameters come with types), 
-so Redex responds with @racket[#f], false.
-
-When an expression does match, as with this one:
-
-@interaction/test[(redex-match 
-                   L
-                   e
-                   (term ((λ (x num) (amb x 1)) 
-                          (+ 1 2))))
-                  (list/c match?)]
-
-Redex responds with bindings for all of the pattern variables.
-In this case, there is just one, @racket[e],
-and it matches the entire expression.
-
-We can also use matching to extract sub-pieces. For example, we can
-pull out the function and argument position of an application expression
-like this:
-
-@interaction/test[(redex-match 
-                   L
-                   (e_1 e_2)
-                   (term ((λ (x num) (amb x 1)) 
-                          (+ 1 2))))
-                  (list/c match?)]
-
-As you probably noticed, @racket[redex-match] returns a list of 
-matches, not just a single match. The previous matches each only
-matched a single way, so the corresponding lists only have a single
-element. But a pattern may be ambiguous, e.g., the following pattern
-which matches any non-empty sequence of expressions, but binds different
-elements of the sequence in different ways:
-
-@interaction/test[(redex-match 
-                   L
-                   (e_1 ... e_2 e_3 ...)
-                   (term ((+ 1 2)
-                          (+ 3 4)
-                          (+ 5 6))))
-                  (list/c match? match? match?)]
-
-@exercise[]
-
-Use @racket[redex-match] to extract the body of the
-@racket[λ] expression from this object-language program:
-@racketblock[((λ (x num) (+ x 1)) 
-              17)]
-
-@exercise[]
-
-Use @racket[redex-match] to extract the range portion
-of the type
-@racket[(→ num (→ num num))].
-
-
-@exercise[]
-
-Redex's pattern language supports ambiguity through non-terminals,
-the @racket[in-hole] pattern, and ellipsis placement (as in the example
-just above). Use the latter source of ambiguity to design a pattern
-that matches one way for each adjacent pair of expressions in
-a sequence. That is, if you match the sequence @racket[(1 2 3 4)],
-then you'd expect one match for 1 & 2, one match for 2 & 3, and one match for 3 & 4.
-In general, this pattern should produce n matches when there are n+1
-expressions in the sequence.
-
-To test your solution use @racket[redex-match] like this:
-@racketblock[(redex-match
-              L
-               (code:comment @#,t{your solution goes here})
-              (term (1 2 3 4)))]
-where you expect a result like this
-@racketblock[(list
-              (match (list (bind 'e_1 1) (bind 'e_2 2)))
-              (match (list (bind 'e_1 2) (bind 'e_2 3)))
-              (match (list (bind 'e_1 3) (bind 'e_2 4))))]
-but possibly with more pattern variables in the resulting
-match.
-
-@amb/test[(redex-match
-           L
-           (e_1 ... e_2 e_3 e_4 ...)
-           (term (1 2 3 4)))
-          (list/c match? match? match?)]
-
-@exercise["named-ellipses"]
-
-The ellipsis pattern can also be ``named'' via subscripts that, when
-duplicated, force the lengths of the corresponding sequences to match.
-For example, the pattern
-@racketblock[((λ (x ...) e) v ...)]
-matches application expressions where the function may have a different
-arity than the number of arguments it receives, but the pattern:
-@racketblock[((λ (x ..._1) e) v ..._1)]
-ensures that the number of @racket[x]s is the same as the number
-of @racket[v]s.
-
-Use this facility to write a pattern that matches odd length lists 
-of expressions, returning one match for each pair of expressions
-that are equidistant from the ends of the sequence. For example,
-if matching the sequence @racket[(1 2 3 4 5)], there would be two
-matches, one for the pair @racket[1] & @racket[5] and another for
-the pair @racket[2] & @racket[4]. Your match should include the
-the bindings @racket[e_left] and @racket[e_right] that extract these
-pairs (one element of the pair bound to @racket[e_left] and the other
-to @racket[e_right]). Test your pattern with @racket[redex-match].
-
-@amb/test[(redex-match
-           L
-           (e_1 ..._1 e_left e_3 ..._2
-            e_4
-            e_5 ..._2 e_right e_7 ..._1)
-           (term (1 2 3 4 5)))
-          (list/c match? match?)]
-
-@section{Typing}
-
-To support a type system for our language, we need 
-to define type environments, which we do by extending
-the language @racket[L] with a new non-terminal 
-@racket[Γ], that we use to represent environments.
-
-@racketblock+eval[#:eval 
-                  amb-eval
-                  (define-extended-language L+Γ L
-                    [Γ · (x : t Γ)])]
-                  
-The @racket[define-extended-language] form accepts the
-name of the new language, the name of the extended 
-language and then a series of non-terminals just
-like @racket[define-language].
-
-In the extended language, we can give all of the
-typing rules for our language. Ignoring the 
-@racket[#:mode] specification for a moment, the beginning
-of this use of @racket[define-judgment-form] 
-has a contract declaration indicating that the judgments all have
-the shape @racket[(types Γ e t)]. 
-
-@racketblock+eval[#:eval 
-                  amb-eval
-                  (define-judgment-form
-                    L+Γ
-                    #:mode (types I I O)
-                    #:contract (types Γ e t)
-                    
-                    [(types Γ e_1 (→ t_2 t_3))
-                     (types Γ e_2 t_2)
-                     -------------------------
-                     (types Γ (e_1 e_2) t_3)]
-                    
-                    [(types (x : t_1 Γ) e t_2)
-                     -----------------------------------
-                     (types Γ (λ (x t_1) e) (→ t_1 t_2))]
-                    
-                    [(types Γ e (→ (→ t_1 t_2) (→ t_1 t_2)))
-                     ---------------------------------------
-                     (types Γ (fix e) (→ t_1 t_2))]
-                    
-                    [---------------------
-                     (types (x : t Γ) x t)]
-                    
-                    [(types Γ x_1 t_1)
-                     (side-condition (different x_1 x_2))
-                     ------------------------------------
-                     (types (x_2 : t_2 Γ) x_1 t_1)]
-                    
-                    [(types Γ e num) ...
-                     -----------------------
-                     (types Γ (+ e ...) num)]
-                    
-                    [--------------------
-                     (types Γ number num)]
-                    
-                    [(types Γ e_1 num)
-                     (types Γ e_2 t)
-                     (types Γ e_3 t)
-                     -----------------------------
-                     (types Γ (if0 e_1 e_2 e_3) t)]
-                    
-                    [(types Γ e num) ...
-                     --------------------------
-                     (types Γ (amb e ...) num)])]
-
-The first clause gives
-the typing rule for application expressions, saying
-that if @racket[e_1] has the type 
-@racket[(→ t_2 t_3)] and @racket[e_2] has the type
-@racket[t_2], then the application expression 
-has the type @racket[t_3].
-
-Similarly, the other clauses give the typing
-rules for all of the other forms in the language.
-
-Most of the rules use use @racket[types], or give base types to atomic
-expressions, but the fifth rule is worth a special look. It says that
-if a variable type checks in some environment, then it also type
-checks in an extended environment, provided that the environment extension
-does not use the variable in question. 
-
-The @racket[different] function is a metafunction, defined as you might expect:
-@racketblock+eval[#:eval amb-eval
-                         (define-metafunction L+Γ
-                           [(different x_1 x_1) #f]
-                           [(different x_1 x_2) #t])]
-
-The @racket[#:mode] specification tells Redex how to compute derivations. In this case, 
-the mode specification indicates that @racket[Γ] and @racket[e] are to be 
-thought of as inputs, and the type position is to be thought of as an output.
-
-Redex then checks that spec, making sure that, given a particular @racket[Γ] and 
-@racket[e], it can compute a @racket[t] or, perhaps, multiple @racket[t]s (if
-the patterns are ambiguous, or if multiple rules apply to a given pair of
-@racket[Γ] and @racket[e]).
-
-@amb-try[(test-equal (judgment-holds (types (x : num ·) y t_1) t_1)
-                     (term ()))
-         (test-equal (judgment-holds (types (x : num ·) x t_1) t_1)
-                     (term (num)))
-         (test-equal (judgment-holds (types (x : num (y : (→ num num) ·)) x t_1) t_1)
-                     (term (num)))
-         (test-equal (judgment-holds (types (x : num (y : (→ num num) ·)) y t_1) t_1)
-                     (term ((→ num num))))
-         (test-equal (judgment-holds (types (x : num (x : (→ num num) ·)) y t_1) t_1)
-                     (term ()))
-         (test-equal (judgment-holds (types · (+ 1 2 3) t_1) t_1)
-                     (term (num)))
-         (test-equal (judgment-holds (types · (λ (y num) y) t_1) t_1)
-                     (term ((→ num num))))
-         (test-equal (judgment-holds (types · (λ (y num) (λ (z num) z)) t_1) t_1)
-                     (term ((→ num (→ num num)))))
-         (test-equal (judgment-holds (types · (λ (y num) (λ (z num) y)) t_1) t_1)
-                     (term ((→ num (→ num num)))))
-         (test-equal (judgment-holds (types · (λ (y num) (λ (z num) q)) t_1) t_1)
-                     (term ()))
-         (test-equal (judgment-holds (types · (((λ (x num) (λ (y num) x)) 1) 2) t_1) t_1)
-                     (term (num)))
-         (test-equal (judgment-holds (types · (amb) t_1) t_1)
-                     (term (num)))
-         (test-equal (judgment-holds (types · (amb 1) t_1) t_1)
-                     (term (num)))
-         (test-equal (judgment-holds (types · (amb 1 2) t_1) t_1)
-                     (term (num)))
-         (test-equal (judgment-holds (types · (+ (amb (+ 1 2) (+ 3 4.5))
-                                                 (amb (+ 5 6) (+ 7 8)))
-                                            t_1)
-                                     t_1)
-                     (term (num)))]
-@(check-output (test-results)
-               #rx"All [0-9]+ tests passed")
-
-@section{Testing Typing}
-
-The @racket[judgment-holds] form checks to see if a potential judgment
-is derivable. For example,
-
-@interaction/test[(judgment-holds 
-                   (types ·
-                          ((λ (x num) (amb x 1)) 
-                           (+ 1 2))
-                          t)
-                   t)
-                  (list/c 'num)]
-
-computes all of the types that the expression
-@racketblock[((λ (x num) (amb x 1)) 
-              (+ 1 2))]
-has, returning a list of them (in this case, just one).
-
-In general, the @racket[judgment-holds] form's first argument
-is an instance of some judgment-form that should have concrete
-terms for the @racket[I] positions in the mode spec, and patterns
-in the positions labeled @racket[O]. Then, the second position
-in @racket[judgment-holds] is an expression that can use the
-pattern variables inside those @racket[O] positions. The result
-of @racket[judgment-holds] will be a list of terms, one for
-each way that the pattern variables in the @racket[O] positions
-can be filled when evaluating @racket[judgment-holds]'s second
-position.
-
-For example,
-if we wanted to extract only the range position of the type
-of some function, we could write this:
-
-@interaction/test[(judgment-holds 
-                   (types ·
-                          (λ (f (→ num (→ num num))) (f (amb 1 2)))
-                          (→ t_1 t_2))
-                   t_2)
-                  (list/c (list/c '→ 'num 'num))]
-
-The result of this expression is a singleton list containing the
-function type that maps numbers to numbers. The reason you see
-two open parentheses is that Redex exploits Racket's s-expressions
-to reflect Redex terms as Racket values. Here's another way
-to write the same value
-
-@interaction[#:eval amb-eval (list (term (→ num num)))]
-
-Racket's printer does not know that it should use @racket[term] for the
-inner lists and @racket[list] (or @racket[quote]) for the
-outer list, so it just uses the @racket[quote] notation for all
-of them.
-
-We can combine @racket[judgment-holds] with Redex's unit test support 
-to build a small test suite:
-@interaction[#:eval amb-eval
-                    (test-equal 
-                     (judgment-holds 
-                      (types · (λ (x num) x) t)
-                      t)
-                     (list (term (→ num num))))
-                    (test-equal 
-                     (judgment-holds 
-                      (types · (amb 1 2 3) t)
-                      t)
-                     (list (term num)))
-                    (test-equal 
-                     (judgment-holds 
-                      (types · (+ 1 2) t)
-                      t)
-                     (list (term (→ num num))))]
-
-Redex is silent when tests pass and gives the source location for the failures, as above.
-The @racket[test-equal] form accepts two expressions, evaluates them,
-and checks to see if they are @racket[equal?] (structural equality). 
-
-To see a summary of the tests run so far, call @racket[test-results].
-
-@interaction[#:eval amb-eval (test-results)]
-
-@exercise[]
-
-Remove the @racket[different] side-condition and demonstrate
-how one expression now has multiple types, using @racket[judgment-holds].
-That is, find a use of @racket[judgment-holds] that returns a list
-of length two, with two different types in it.
-
-@exercise[]
-
-The typing rule for @racket[amb] is overly restrictive. In general,
-it would be better to have a rule like this one:
-
-@racketblock[[(types Γ e t) ...
-              -----------------------
-              (types Γ (amb e ...) t)]]
-
-but Redex does not support this rule because the mode specification is 
-not satisfied in the case that @racket[amb] has no subexpressions. That is,
-any type should be okay in this case, but Redex cannot ``guess'' which type
-is the one needed for a particular derivation, so it rejects the entire
-@racket[define-judgment-form] definition. (The error message is different,
-but this is the ultimate cause of the problem.)
-
-Fix this by annotating @racket[amb] expressions with their types, making suitable
-changes to the language as well as the @racket[define-judgment-form] for
-@racket[types]. Add new test cases to make sure you've done this properly.
-
-@section{Defining a Reduction Relation}
-
-To reduce terms, Redex provides @racket[reduction-relation], a form 
-that defines unary relations by cases. To define a reduction
-relation for our @racket[amb] language, we first need to define
-the evaluation contexts and values, so we extend the
-language a second time.
-
-
-@; these definitions are just like racketblock+eval, but also
-@; preserve source locations so we can show typesetting
-@; examples in a later section
-@(require syntax/strip-context)
-@(define-syntax (m stx)
-   (syntax-case stx ()
-     [(_ arg)
-      (let ()
-        (define rewritten
-          (let loop ([stx #'arg])
-            (cond
-              [(syntax? stx) #`(datum->syntax #f
-                                              #,(loop (syntax-e stx))
-                                              (vector (convert-to-path 
-                                                       '#,(and (path? (syntax-source stx))
-                                                               (path->main-collects-relative (syntax-source stx))))
-                                                      #,(syntax-line stx)
-                                                      #,(syntax-column stx)
-                                                      #,(syntax-position stx)
-                                                      #,(syntax-span stx)))]
-              [(pair? stx) #`(cons #,(loop (car stx))
-                                   #,(loop (cdr stx)))]
-              [(or (symbol? stx) (null? stx)
-                   (number? stx) (keyword? stx)
-                   (string? stx))
-               #`'#,stx]
-              [else (error 'm "unk ~s" stx)])))
-        #`(let ()
-            (amb-eval #,rewritten)
-            (racketblock arg)))]))
-@(define (convert-to-path src)
-   (cond
-     [(path? src) src]
-     [(not src) src]
-     [else
-      (apply build-path
-             (find-collects-dir) 
-             (map bytes->path (cdr src)))]))
-
-@m[(define-extended-language Ev L+Γ
-     (p (e ...))
-     (P (e ... E e ...))
-     (E (v E) 
-        (E e)
-        (+ v ... E e ...)
-        (if0 E e e)
-        (fix E)
-        hole)
-     (v (λ (x t) e)
-        (fix v)
-        number))]
-
-To give a suitable notion of evaluation for @racket[amb], we define
-@racket[p], a non-terminal for programs. Each program consists of a
-sequence of expressions and we will use them to represent the possible
-ways in which an @racket[amb] expression could have been evaluated.
-Initially, we will simply wrap an expression in a pair of parentheses
-to generate a program that consists of that single expression.
-
-The non-terminal @racket[P] gives the corresponding evaluation contexts
-for @racket[p]s and says that evaluation can occur in any of them,
-without restriction. The grammar for @racket[E] dictates that 
-reduction may occur inside application expressions and addition expressions,
-always from left to right.
-
-To prepare for the reduction relation, we first define a metafunction
-for summation.
-
-@racketblock+eval[#:eval 
-                  amb-eval
-                  (define-metafunction Ev
-                    Σ : number ... -> number
-                    [(Σ number ...) 
-                     ,(apply + (term (number ...)))])]
-
-@amb/test[(term (Σ 1 2 3 4))
-          (λ (x) (equal? x 10))]
-
-This lifts the Racket function @racket[+] to Redex, giving it the name
-@racket[Σ]. The unquote (comma) in the definition of the metafunction
-escapes into Racket, using @racket[apply] and @racket[+] to sum
-up the sequence of numbers that were passed to @racket[Σ]. As we've
-noted before, the
-@racket[term] operator is like Racket's @racket[quasiquote] operator, but
-it is also sensitive to Redex pattern variables. In this case,
-@racket[(term (number ...))] produces a list of numbers, extracting
-the arguments from the call to @racket[Σ].
-
-To define a reduction relation, we also have to define substitution.
-Generally speaking, substitution functions are tricky to get right
-and, since they generally are not shown in papers, we have defined
-a workhorse substitution function in Racket that runs in near linear 
-time. The source code is included with Redex. If you'd like to have a look,
-evaluate the expression below in the REPL to find the precise path
-on your system:
-
-@centered{@racket[(collection-file-path "tut-subst.rkt" "redex")]}
-
-(Test cases are in @filepath{test/tut-subst-test.rkt}, 
-relative to @filepath{tut-subst.rkt}.)
-
-That file contains the definition of the function @racket[subst/proc], 
-which expects four
-arguments: a predicate for determining if an expression is a variable,
-a list of variables to replace, a list of terms to replace them with,
-and a term to do the replacement inside (the function has a hard-wired
-notion of the shape of all binding forms, but is agnostic to the other
-expression forms in the language).
-
-To use this substitution function, we also need to lift it into Redex, 
-just like we did for @racket[Σ].
-
-@racketblock+eval[#:eval 
-                  amb-eval
-                  (require redex/tut-subst)
-                  (define-metafunction Ev
-                    subst : x v e -> e
-                    [(subst x v e) 
-                     ,(subst/proc x? (list (term x)) (list (term v)) (term e))])
-                  (define x? (redex-match Ev x))]
-
-In this case, we use @racket[term] to extract the values of the Redex variables
-@racket[x], @racket[v], and @racket[e] and then pass them to @racket[subst/proc].
-
-The definition of @racket[x?] uses a specialized, more efficient form of
-@racket[redex-match]; supplying @racket[redex-match] with only two arguments
-permits Redex to do some processing of the pattern, and it results in a
-predicate that matches the pattern in the given language (which we can
-supply directly to @racket[subst/proc]).
-
-Using that substitution function, we can now give the reduction relation.
-
-@m[(define red
-     (reduction-relation
-      Ev
-      #:domain p
-      (--> (in-hole P (if0 0 e_1 e_2))
-           (in-hole P e_1)
-           "if0t")
-      (--> (in-hole P (if0 v e_1 e_2))
-           (in-hole P e_2)
-           (side-condition (not (equal? 0 (term v))))
-           "if0f")
-      (--> (in-hole P ((fix (λ (x t) e)) v))
-           (in-hole P (((λ (x t) e) (fix (λ (x t) e))) v))
-           "fix")
-      (--> (in-hole P ((λ (x t) e) v))
-           (in-hole P (subst x v e))
-           "βv")
-      (--> (in-hole P (+ number ...))
-           (in-hole P (Σ number ...))
-           "+")
-      (--> (e_1 ... (in-hole E (amb e_2 ...)) e_3 ...)
-           (e_1 ... (in-hole E e_2) ... e_3 ...)
-           "amb")))]
-
-@amb-try[(test-->> red 
-                   (term ((+ 1 2 3)))
-                   (term (6)))
-         (test-->> red 
-                   (term ((+ 1 (+ 2 3))))
-                   (term (6)))
-         (test-->> red 
-                   (term ((+ (+ 1 2) 3)))
-                   (term (6)))
-         (test-->> red
-                   (term ((amb (+ 1 2) 4)))
-                   (term (3 4)))
-         (test-->> red
-                   (term ((+ 1 (amb 1 2))))
-                   (term (2 3)))
-         (test-->> red
-                   (term ((((λ (x num) (λ (y num) x)) 1) 2)))
-                   (term (1)))
-         (test-->> red
-                   (term ((((λ (x num) (λ (y num) (amb x y))) 1) 2)))
-                   (term (1 2)))
-         (test-->> red
-                   (term ((+ (amb (+ 1 2) (+ 3 4.5))
-                             (amb (+ 5 6) (+ 7 8)))))
-                   (term (14 18 18.5 22.5)))
-         (test-->> red
-                   (term ((if0 0 1 2)))
-                   (term (1)))
-         (test-->> red
-                   (term ((if0 2 1 0)))
-                   (term (0)))
-         (test-->> red
-                   (term (((fix (λ (f (→ num num)) (λ (x num) (if0 x 0 (f (+ x -1)))))) 2)))
-                   (term (0)))]
-
-@(check-output (test-results)
-               #rx"All [0-9]+ tests passed")
-
-The @racket[reduction-relation] form accepts the name of a language,
-the domain of the relation (@racket[p] in this case), and 
-then a series of rewriting rules, each of the form @racket[(--> pattern pattern)].
-
-The first rule replaces @racket[if0] expressions when the test position
-is @racket[0] by the second subexpression (the true branch). It uses
-the @racket[in-hole] pattern, the Redex notation for context decomposition.
-In this case, it decomposes a program into some @racket[P] with
-an appropriate @racket[if0] expression inside, and then the right-hand
-side of the rule places @racket[e_1] into the same context.
-
-The rule for the false branch should apply when the test position is
-any value except @racket[0]. To establish this, we use a
-@racket[side-condition]. In general, a side-condition is a Racket
-expression that is evaluated for expressions where the pattern matches;
-if it returns true, then the rule fires. In this case, we
-use @racket[term] to extract the value of @racket[v] and then
-compare it with @racket[0].
-
-To explore the behavior of a reduction relation, Redex provides
-@racket[traces] and @racket[stepper]. They both accept a reduction
-relation and a term, and then show you how that term reduces in
-a GUI. The GUI that @racket[traces] uses is better suited to
-a quick overview of the reduction graph and @racket[stepper]
-is better for more detailed explorations of reduction graphs that
-have larger expressions in them.
-
-@exercise[]
-
-Evaluate 
-@racketblock[(traces red 
-                     (term ((+ (amb 1 2)
-                               (amb 10 20)))))]
-It does not show all of the terms by default, but 
-one click the @onscreen{Reduce} button shows them all.
-
-If you have Graphviz installed, Redex can use it to
-lay out the graph; click @onscreen{Fix Layout} and
-Redex will call out to @tt{dot} to lay out the graph.
-
-@exercise[]
-
-Design a function that accepts a number @racket[n] and
-evaluates (ambiguously) to any of the numbers between 
-@racket[n] and @racket[0]. Call it with @racket[10] and
-look at the results in both @racket[traces] and
-@racket[stepper].
-
-Hint: to subtract 1 from @racket[n], use @racket[(+ n -1)]
-
-@amb/test[(apply-reduction-relation*
-           red
-           (term (((fix
-                    (λ (f (→ num num))
-                      (λ (n num)
-                        (if0 n
-                             0
-                             (amb n (f (+ n -1)))))))
-                   10))))
-          (list/c (list/c 10 9 8 7 6 5 4 3 2 1 0))]
-
-@section{Testing Reduction Relations}
-
-Redex provides @racket[test-->>] for using
-testing the transitive closure of a reduction relation. 
-If you supply it a reduction relation and two terms,
-it will reduce the first term and make sure that it
-yields the second.
-
-@interaction[#:eval amb-eval
-                    (test-->>
-                     red
-                     (term ((if0 1 2 3)))
-                     (term (3)))
-                    (test-->>
-                     red
-                     (term ((+ (amb 1 2)
-                               (amb 10 20))))
-                     (term (11 21 12 22)))
-                    (test-results)]
-
-The @racket[test-->] form is like @racket[test-->>], except
-that it only reduces the term a single step. 
-
-@interaction[#:eval amb-eval
-                    (test-->
-                     red
-                     (term ((+ (amb 1 2) 3)))
-                     (term ((+ 1 3) (+ 2 3))))
-                    (test-results)]
-
-If a term
-produces multiple results, then each of the results
-must be listed.
-
-@interaction[#:eval amb-eval
-                    (test-->
-                     red
-                     (term ((+ 1 2) (+ 3 4)))
-                     (term (3 (+ 3 4)))
-                     (term ((+ 1 2) 7)))
-                    (test-results)]
-
-Technically, when using @racket[test-->>],
-it finds 
-all irreducible terms that are reachable from the
-given term, and expects them all to be listed,
-with one special case: when it detects a cycle in the 
-reduction graph, then it signals an error. (Watch out: when
-the reduction graph is infinite and there are no cycles,
-then @racket[test-->>] consumes all available memory.)
-
-@interaction[#:eval amb-eval
-                    (test-->>
-                     red
-                     (term (((fix (λ (x (→ num num)) x)) 1))))
-                    (test-results)]
-
-To suppress this behavior, pass @racket[#:cycles-ok]
-to @racket[test-->>].
-
-@interaction[#:eval amb-eval
-                    (test-->>
-                     red #:cycles-ok
-                     (term (((fix (λ (x (→ num num)) x)) 1))))
-                    (test-results)]
-
-This test case has no expected results but still passes, since 
-there are no irreducible terms reachable from the given term.
-
-@exercise[]
-
-Extend λ to support multiple arguments. Use the notation
-@racket[(λ (x t) ... e)] for multi-arity λ expressions
-because the @racket[subst/proc]
-function works properly with @racket[λ] expressions of that
-shape. Use this definition of @racket[subst].
-
-@racketblock[(define-metafunction Ev
-               subst : (x v) ... e -> e
-               [(subst (x v) ... e) 
-                ,(subst/proc x?
-                             (term (x ...))
-                             (term (v ...))
-                             (term e))])]
-
-Also, adjust the typing rules (and do not forget that an ellipsis can be named, 
-as discussed in exercise @exref["named-ellipses"]).
-
-@section{Random Testing}
-
-Random testing is a cheap and easy way to find counter-examples to false
-claims. Unsurprisingly, it is hard to pin down exactly which false claims
-that random testing can provide counter-examples to. @citet[Hanford]
-put it best (calling his random test case generator a syntax machine):
-``[a]lthough as a writer of test cases, the syntax machine is certainly 
-unintelligent, it is also uninhibited. It can test a [language] processor with many 
-combinations that would not be thought of by a human test case writer.''
-
-To get a sense of how random testing works, we define this
-Racket predicate
-@racketblock+eval[#:eval 
-                  amb-eval
-                  (define (progress-holds? e)
-                    (if (types? e)
-                        (or (v? e)
-                            (reduces? e))
-                        #t))]
-that captures the statement of the progress result.
-
-The three helper functions @racket[types?], @racket[v?],
-and @racket[reduces?] can be defined by using our earlier
-definitions of typing, the grammar, and the reduction relation,
-plus calls into Redex:
-
-@racketblock+eval[#:eval
-                  amb-eval
-                  (define (types? e)
-                    (not (null? (judgment-holds (types · ,e t)
-                                                t))))
-                  
-                  (define v? (redex-match Ev v))
-                  
-                  (define (reduces? e)
-                    (not (null? (apply-reduction-relation 
-                                 red
-                                 (term (,e))))))]
-
-The only new construct here is @racket[apply-reduction-relation], which accepts
-a reduction and a term, and returns a list of expressions that it reduces to
-in a single step. Thus, @racket[reduces?] returns @racket[#t] when the given
-term is reducible and @racket[#f] otherwise.
-
-Putting all of that together with @racket[redex-check] will cause
-Redex to randomly generate 1,000 @racket[e]s and attempt to falsify them:
-
-@interaction[#:eval
-             amb-eval
-             (redex-check Ev e (progress-holds? (term e)))]
-
-The @racket[redex-check] form accepts the name of a language (@racket[Ev] in this case),
-a pattern (@racket[e] in this case), and a Racket expression that returns a
-boolean. It randomly generates expressions matching the pattern and then invokes
-the expression in an attempt to elicit @racket[#f] from the Racket expression.
-
-We can also ask @racket[redex-check] how good of a job it is doing. 
-Specifically, this expression re-runs the same random test, but
-this time sets up some instrumenting infrastructure to 
-determine how many of the reduction rules fire during the
-testing. In this case, we create a coverage value that
-indicates that we're interested in how many of the rules in
-@racket[red] fired, and then we install it using the 
-@racket[relation-coverage] parameter. In the dynamic
-extent of the @racket[parameterize], then, the relation
-will record how it gets tested. Once that returns we can use
-@racket[covered-cases] to see exactly how many times each case
-fired.
-
-@interaction[#:eval
-             amb-eval
-             (let ([c (make-coverage red)])
-               (parameterize ([relation-coverage (list c)])
-                 (redex-check Ev e (progress-holds? (term e))))
-               (covered-cases c))]
-
-Not many of them! To improve coverage, we can tell @racket[redex-check]
-to try generating expressions using the patterns on the left-hand
-side of the rules to generate programs, and then check to see if progress for each of
-the expressions in the program:
-
-@interaction[#:eval
-             amb-eval
-             (check-reduction-relation 
-              red
-              (λ (p) (andmap progress-holds? p)))]
-
-The @racket[check-reduction-relation] is a shorthand for using @racket[redex-check] to
-generate elements of the domain of the given reduction relation (@racket[red] in this
-case), and then pass them to the given function, attempting to elicit @racket[#f].
-
-In this case, since the domain of @racket[red] is @racket[p], the random generator
-produces sequences of @racket[e] expressions, which are reflected
-into Redex as lists, and so we simply try to see if progress holds
-for each element of the list, using @racket[andmap].
-
-Still no test failures, but installing the same coverage testing boilerplate around 
-the call to @racket[check-reduction-relation] tells us that we got much
-better coverage of the reduction system.
-
-@interaction[#:eval
-             amb-eval
-             (let ([c (make-coverage red)])
-               (parameterize ([relation-coverage (list c)])
-                 (check-reduction-relation 
-                  red
-                  (λ (p) (andmap progress-holds? p)))
-                 (covered-cases c)))]
-
-
-@exercise[]
-
-Remove one of the productions from @racket[E] (except @racket[hole]) 
-and find an expression in the revised system that causes 
-@racket[progress?] to return @racket[#f].
-
-See if @racket[redex-check] can also falsify progress for the same
-system.
-
-@exercise[]
-
-Formulate and randomly check type preservation. Usually, this lemma
-says that if an expression has a type and it takes a step, then 
-it produces an expression with the same type. In this case, however,  
-formulate a predicate that accepts an expression and checks that, if
-it has a type and takes a step, then all of the resulting expressions in the new
-program have the same type.
-
-@(check-output (let ()
-                 (define (preservation-holds? e) 
-                   (define tys (judgment-holds (types · ,e t) t))
-                   (case (length tys)
-                     [(0) #t]
-                     [(1)
-                      (for/and ([next-p (apply-reduction-relation red `(,e))])
-                        (for/and ([next-e (in-list next-p)])
-                          (define next-tys (judgment-holds (types · ,next-e t) t))
-                          (and (= 1 (length next-tys))
-                               (equal? (car next-tys)
-                                       (car tys)))))]
-                     [else #f]))
-                 (check-reduction-relation
-                  red
-                  (λ (p) 
-                    (andmap preservation-holds? p))))
-               #rx"check-reduction-relation: no counterexamples in 1000 attempts")
-
-@section{Typesetting the Reduction Relation}
-
-Redex's typesetting facilities accept languages, metafunctions, reduction relations,
-and judgment-forms and produce typeset output that can be included directly
-into a figure in a paper.
-
-@interaction[#:eval 
-             amb-eval
-             (render-reduction-relation red)]
-
-The result of @racket[render-reduction-relation] is rendered directly in DrRacket's
-interactions window, and also can be saved as a @filepath{.ps} file by passing
-the name of the file as the second argument to @racket[render-reduction-relation].
-
-Redex's typesetting also interoperates with the @racketmodname[pict] library.
-If we pull it in with a @racket[require]:
-
-@racketblock[(require #,(racketmodname pict))]
-
-then we can use the pict primitives to combine typeset fragments into a larger whole.
-
-@interaction[#:eval 
-             amb-eval
-             (scale (vl-append
-                     20
-                     (language->pict Ev)
-                     (reduction-relation->pict red))
-                    3/2)]
-
-Generally speaking, Redex has reasonable default ways to typeset its
-definitions, except when they escapes to Racket. In that case,
-it typesets the code in a fixed-width font and makes the background pink to call our
-attention to it. While it is possible to use @racket[with-unquote-rewriter] to 
-tell Redex how to typeset those regions, often it is easier to define a metafunction
-and call it. In this case, we can use @racket[different] (defined earlier).
-
-@m[(define if0-false-rule
-     (reduction-relation
-      Ev #:domain p
-      (--> (in-hole P (if0 v e_1 e_2))
-           (in-hole P e_2)
-           (side-condition (term (different v 0)))
-           "if0f")))]
-
-Now when we typeset this reduction-relation there is no pink.
-
-@interaction[#:eval amb-eval (render-reduction-relation if0-false-rule)]
-
-Still, the typesetting is non-optimal, so we can use @racket[with-compound-rewriter]
-to adjust the way calls to @racket[different] typeset.
-
-@interaction[#:eval amb-eval 
-                    (with-compound-rewriter
-                     'different
-                     (λ (lws)
-                       (list "" (list-ref lws 2) " ≠ " (list-ref lws 3) ""))
-                    (render-reduction-relation if0-false-rule))]
-
-The compound rewriter is given a list of @racket[lw] structs that correspond to the 
-untypeset sequence for a use of @racket[different], and then can replace them with
-a different set of strings and @racket[lw]s. For more details on the structure of
-@racket[lw] structs and to experiment with them, see @racket[to-lw].
-
-@exercise[]
-
-Redex uses the indentation and newlines in the program source code to
-determine where the line breaks in the printed output goes, instead of
-using a pretty-printer, so as to give Redex programmers fine-grained
-control over how their models typeset.
-
-Exploit this facility so that this expression produces an expression
-with a minimum amount of whitespace within its bounding box.
-(The call to @racket[frame] helps to clarify where the bounding
-box is.)
-
-@racketblock[(frame
-              (vl-append
-               20
-               (language->pict Ev)
-               (reduction-relation->pict red)))]
-
-That is, adjust the whitespace in @racket[Ev] so that it
-fills as much of the width established by rendering @racket[red].
-
-@exercise[]
-
-Typeset @racket[types]. Use a compound rewriter so a use of @racket[(type Γ e t)]
-is rendered as @racketblock[Γ ⊢ e : t]
-
-@close-eval[amb-eval]
-
-
-@; Needs a timeout for testing:
-@(module* test racket/base
-   (require (submod ".."))
-   (module config info
-     (define timeout 300)))
diff --git a/pkgs/redex-pkgs/redex-doc/redex/scribblings/typesetting-and-macros.scrbl b/pkgs/redex-pkgs/redex-doc/redex/scribblings/typesetting-and-macros.scrbl
deleted file mode 100644
index c4190e97ee..0000000000
--- a/pkgs/redex-pkgs/redex-doc/redex/scribblings/typesetting-and-macros.scrbl
+++ /dev/null
@@ -1,161 +0,0 @@
-#lang scribble/base
-
-@(require scribble/manual
-          scribble/bnf
-          scribble/struct
-          scribble/eval
-          scribble/racket
-          (for-syntax racket/base)
-          (for-label racket/base
-                     (except-in racket/gui make-color)
-                     racket/pretty
-                     racket/contract
-                     mrlib/graph
-                     (except-in 2htdp/image make-pen text)
-                     (only-in pict pict? text dc-for-text-size text-style/c
-                              vc-append)
-                     redex))
-
-@(define redex-macros-eval (make-base-eval))
-@(interaction-eval #:eval redex-macros-eval (require redex/reduction-semantics
-                                                     redex/pict
-                                                     (for-syntax racket/base)))
-
-@title{Macros and Typesetting}
-
-When you have a macro that abstracts over variations in 
-Redex programs, then typesetting is unlikely to work
-without some help from your macros.
-
-To see the issue, consider this macro abstraction over
-a Redex grammar:
-@interaction[#:eval 
-             redex-macros-eval
-             (define-syntax-rule
-               (def-my-lang L prim ...)
-               (define-language L
-                 (e ::=
-                    (λ (x) e)
-                    (e e)
-                    prim ...
-                    x)
-                 (x ::= variable-not-otherwise-mentioned)))
-
-             (def-my-lang L + - *)
-             (render-language L)]
-Redex thinks that the grammar is going ``backwards'' because 
-of the way macro expansion synthesizes source locations.
-In particular, in the result of the macro expansion, the
-third production for @racket[_e] appears to come later
-in the file than the fourth production and this confuses
-Redex, making it unable to typeset this language.
-
-One simple, not-very-general work-around is to just avoid 
-typesetting the parts that come from the macro arguments. For
-example if you move the primitives into their own non-terminal
-and then just avoid typesetting that, Redex can cope:
-
-@(define exp
-   (quote-syntax
-    (define-syntax-rule
-      (def-my-lang L prim ...)
-      (define-language L
-        (e ::=
-           (λ (x) e)
-           (e e)
-           prims
-           x)
-        (prims ::= prim ...)
-        (x ::= variable-not-otherwise-mentioned)))))
-
-@(redex-macros-eval exp)
-@(to-paragraph exp)
-
-@interaction[#:eval 
-             redex-macros-eval
-             (def-my-lang L + - *)
-             (render-language L #:nts '(e x))]
-
-You can also, however, exploit Racket's macro system to rewrite the
-source locations in a way that tells Redex where the macro-introduced
-parts of the language are supposed to be, and then typesetting
-will work normally. For example, here is one way to do this with
-the original language:
-
-@(require redex/reduction-semantics (for-syntax racket/base))
-@(define fancy-exp
-  (quote-syntax
-   (define-syntax (def-my-lang stx)
-      (syntax-case stx ()
-        [(_ L a ...)
-         (let ()
-           (define template
-             #'(define-language L
-                 (e (λ (x) e)
-                    (e e)
-                    HERE
-                    x)
-                 (x variable-not-otherwise-mentioned)))
-           (car
-            (let loop ([stx template])
-              (syntax-case stx (HERE)
-                [HERE 
-                 (let loop ([as (syntax->list #'(a ...))]
-                            [pos (syntax-position stx)]
-                            [col (syntax-column stx)])
-                   (cond
-                     [(null? as) '()]
-                     [else 
-                      (define a (car as))
-                      (define span 
-                        (string-length
-                         (symbol->string (syntax-e a))))
-                      (define srcloc
-                        (vector (syntax-source stx)
-                                (syntax-line stx)
-                                col
-                                pos
-                                span))
-                      (cons
-                       (datum->syntax a 
-                                      (syntax-e a)
-                                      srcloc
-                                      a)
-                       (loop (cdr as)
-                             (+ pos span 1)
-                             (+ col span 1)))]))]
-                [(a ...)
-                 (list
-                  (datum->syntax
-                   stx
-                   (apply append (map loop (syntax->list #'(a ...))))
-                   stx
-                   stx))]
-                [a
-                 (list stx)]))))]))))
-
-@(redex-macros-eval fancy-exp)
-@(to-paragraph fancy-exp)
-
-@interaction[#:eval redex-macros-eval
-                    (def-my-lang L + - *)]
-@interaction[#:eval redex-macros-eval
-             (render-language L)]
-
-
-And one final caveat: when Racket compiles source files to bytecode format, 
-it discards source location information in syntax constants, 
-which means that if a file containing
-a macro like the one above is compiled to bytecode, then it cannot properly
-adjust the source locations and the typeset language will not look right 
-(the important constant whose source locations are lost is @racket[template], above).
-
-The simplest way to avoid this problem is to just avoid creating bytecode for
-these files.
-
-It is possible to write the constant in the source code, however, and then
-process it so the compiled version of the file contains different data structures
-that record the source locations of the expressions. Redex does this internally so that 
-compiled files that use, e.g., @racket[define-language], still correctly typeset.
-But when you write macros that expand into @racket[define-language], you must
-also take this step yourself (or avoid @tt{.zo} files).
diff --git a/pkgs/redex-pkgs/redex-examples/LICENSE.txt b/pkgs/redex-pkgs/redex-examples/LICENSE.txt
deleted file mode 100644
index 8aacfab044..0000000000
--- a/pkgs/redex-pkgs/redex-examples/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-redex-examples
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/redex-pkgs/redex-examples/info.rkt b/pkgs/redex-pkgs/redex-examples/info.rkt
deleted file mode 100644
index 889f13b0c3..0000000000
--- a/pkgs/redex-pkgs/redex-examples/info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "compiler-lib"
-               "rackunit-lib"
-               "redex-gui-lib"
-               "slideshow-lib"
-               "math-lib"
-               "plot-lib"))
-
-(define build-deps '())
-
-(define pkg-desc "PLT Redex examples")
-
-(define pkg-authors '(robby bfetscher))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/README b/pkgs/redex-pkgs/redex-examples/redex/examples/README
deleted file mode 100644
index ccb9d1f5f6..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/README
+++ /dev/null
@@ -1,82 +0,0 @@
-The examples subcollection contains several small languages 
-to demonstrate various different uses of PLT Redex:
-
-  arithmetic.rkt: an arithmetic language with every
-  possible order of evaluation
-
-  beginner.rkt: a PLT Redex implementation of (much of) the
-  beginning student teaching language.
-
-  cbn-letrec.rkt: the definition of evaluation contexts in Ariola and
-  Felleisen's call-by-need letrec calculus
-
-  church.rkt: Church numerals with call by name
-  normal order evaluation
-
-  combinators.rkt: fills in the gaps in a proof in
-  Barendregt that i and j (defined in the file) are
-  a combinator basis
-
-  compatible-closure.rkt: an example use of compatible
-  closure. Also, one of the first examples from Matthias
-  Felleisen and Matthew Flatt's monograph
-
-  cont-mark-transform/: the continuation mark transformation from
-  McCarthy's ICFP '09 paper “Automatically RESTful Web Applications
-  Or, Marking Modular Serializable Continuations" 
-
-  contracts.rkt: A core contract calculus, including blame, 
-  with function contracts, (eager) pair contracts, 
-  and a few numeric predicates
-
-  define-judgment-form: example uses of `define-judgment-form'
-
-  delim-cont/: The model from Flatt, Yu, Findler, and Felleisen's ICFP
-  '07 paper "Adding Delimited and Composable Control to a Production
-  Programming Environment"
-  
-  let-poly.rkt: lambda calculus with list constants, let-polymorphism
-  and type inference
-
-  letrec.rkt: shows how to model letrec with a store and
-  some infinite looping terms
-
-  list-machine/: the List Machine benchmark by Appel, Dockins, and
-  Leroy.
-
-  omega.rkt: the call by value lambda calculus with call/cc.
-  Includes omega and two call/cc-based infinite loops, one of
-  which has an ever-expanding term size and one of which has
-  a bounded term size.
-
-  pi-calculus.rkt: a formulation of the pi calculus, following
-  Milner's 1990 paper, "Functions as Processes"
-
-  poly-stlc.rkt: a polymorphic lambda calculus with list constants
-
-  racket-machine/: an operational semantics for (much of) Racket
-  bytecode
-
-  r6rs/: an implementation of the R6RS Scheme formal semantics
-
-  semaphores.rkt: a simple threaded language with semaphores
-
-  stlc.rkt: a semantics for a typed CBV language with multi-argument
-  functions, conditionals, and addition
-
-  stlc+lists.rkt: simply typed lambda calculus with list and 
-  number types
-
-  stlc+lists+subst.rkt: identical to stlc+lists.rkt except that
-  capture avoiding substitution is defined explicitly 
-
-  subject-reduction.rkt: demos traces/pred that type checks
-  the term.
-
-  threads.rkt: shows how non-deterministic choice can be
-  modeled in a reduction semantics. Contains an example use
-  of a simple alternative pretty printer.
-
-  types.rkt: shows how the simply-typed lambda calculus's
-  type system can be written as a rewritten system (see
-  Kuan, MacQueen, Findler in ESOP 2007 for more).
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/arithmetic.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/arithmetic.rkt
deleted file mode 100644
index fa77a6894e..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/arithmetic.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang racket
-(require redex)
-
-(define-language lang
-  (e (binop e e)
-     (sqrt e)
-     number)
-  (binop +
-         -
-         *
-         /)
-  
-  (e-ctxt (binop e e-ctxt)
-          (binop e-ctxt e)
-          (sqrt e-ctxt)
-          hole)
-  (v number))
-
-(define reductions
-  (reduction-relation
-   lang
-   (c--> (+ number_1 number_2)
-         ,(+ (term number_1) (term number_2))
-         "add")
-   (c--> (- number_1 number_2)
-         ,(- (term number_1) (term number_2))
-         "subtract")
-   (c--> (* number_1 number_2)
-         ,(* (term number_1) (term number_2))
-         "multiply")
-   (c--> (/ number_1 number_2)
-         ,(/ (term number_1) (term number_2))
-         "divide")
-   (c--> (sqrt number_1)
-         ,(sqrt (term number_1))
-         "sqrt")
-   with
-   [(--> (in-hole e-ctxt_1 a) (in-hole e-ctxt_1 b))
-    (c--> a b)]))
-
-(define traces-file
-  (make-temporary-file "traces~a.ps"))
-
-(traces/ps reductions (term (- (* (sqrt 36) (/ 1 2)) (+ 1 2)))
-           traces-file)
-
-;; Check for the command line flag --no-print
-;; If it's set, don't print the temporary file name,
-;; This flag is so that DrDr can avoid seeing a change here. 
-;; -- samth
-(define print-name?
-  (let ([print? #t])
-    (command-line
-     #:once-each
-     ["--no-print" "omit printing of file name" (set! print? #f)])
-    print?))
-
-(when print-name?
-  (printf "Traces are in ~a\n" traces-file))
-
-;; Test mode: no printing:
-(module test racket/base
-  (require syntax/location)
-  (parameterize ([current-command-line-arguments (vector "--no-print")])
-    (dynamic-require (quote-module-path "..") #f)))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/beginner.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/beginner.rkt
deleted file mode 100644
index da3a5802f3..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/beginner.rkt
+++ /dev/null
@@ -1,936 +0,0 @@
-#lang racket
-#|
-
-This is the semantics of Beginner Scheme, one of the
-languages in DrRacket.
-
-The first test case fails because the beginner spec
-is broken for that program (ie, the model faithfully
-reflects the (broken) spec).
-
-|#
-
-(require redex/reduction-semantics)
-
-(provide run-tests
-         run-big-test
-         reductions)
-
-#|
-  
-  `lang' below is actually more generous than beginner, but the
-  reductions assume that the programs are all syntactically
-  well-formed programs in beginner scheme (with the additional
-  constraints that all makers are properly applied and function-
-  defined variables are only applied and non-function-defined
-  variables are never applied -- except for the maker check,
-  these will be in a future version of beginner)
-  
-  still missing: many primops and characters
-  
-  are there any primops that take zero arguments?
-  (should that be syntacically disallowed?)
-
-  |#
-
-(define-language lang
-  (p (d/e ...))
-  (d/e (define (x x x ...) e)
-       (define x (lambda (x x ...) e))
-       (define x e)
-       (define-struct x (x ...))
-       e)
-  (e (x e e ...)
-     (prim-op e ...) 
-     (cond (e e) (e e) ...)
-     (cond (e e) ... (else e))
-     (if e e e)
-     (and e e e ...)
-     (or e e e ...)
-     x
-     v)
-  
-  (prim-op + * / cons first rest empty? struct? symbol=?)
-  
-  (p-ctxt (d/e-v ... d/e-ctxt d/e ...))
-  (d/e-ctxt (define x e-ctxt)
-            e-ctxt)
-  (e-ctxt hole
-          (x v ... e-ctxt e ...)
-          (prim-op v ... e-ctxt e ...)
-          (cond [false e] ... [e-ctxt e] [e e] ...)
-          (cond [false e] ... [e-ctxt e] [e e] ... [else e])
-          (and true ... e-ctxt e ...)
-          (or false ... e-ctxt e ...))
-  
-  (d/e-v (define x (lambda (x x ...) e))
-         (define x v)
-         (define (x x x ...) e)
-         (define-struct x (x ...))
-         v)
-  
-  (v (maker v ...)
-     non-struct-value)
-  (non-struct-value number
-                    list-value
-                    bool
-                    string
-                    'x)
-  (list-value empty
-              (cons v list-value))
-  (bool true
-        false)
-  
-  (maker (side-condition variable_1 (maker? (term variable_1))))
-  
-  (x (side-condition
-      (name 
-       x
-       (variable-except define
-                        define-struct
-                        lambda
-                        cond
-                        else
-                        if
-                        and
-                        or
-                        empty
-                        true
-                        false
-                        quote))
-      (not (prim-op? (term x))))))
-
-(define-metafunction lang
-  [(beg-e-subst (x v x)) v]
-  [(beg-e-subst (x v (any_1 ...))) ((beg-e-subst (x v any_1)) ...)]
-  [(beg-e-subst (x v any)) any])
-
-(define (maker? v)
-  (and (symbol? v)
-       (regexp-match #rx"^make-" (symbol->string v))))
-
-(define p? (redex-match lang p))
-(define prim-op? (redex-match lang prim-op))
-
-(define reductions
-  (reduction-relation
-   lang
-   ((and true ... false e ...) . ==> . false)
-   ((and true ...) . ==> . true)
-   ((side-condition (and true ... v_1 e ...)
-                    (and (not (eq? (term v_1) 'true))
-                         (not (eq? (term v_1) 'false))))
-    . e==> .
-    "and: question result is not true or false")
-   ((or false ... true e ...) . ==> . true)
-   ((or false ...) . ==> . false)
-   ((side-condition (or false ... v_1 e ...)
-                    (and (not (eq? (term v_1) 'true))
-                         (not (eq? (term v_1) 'false))))
-    . e==> .
-    "or: question result is not true or false")
-   
-   ((if true e_1 e_2) . ==> . e_1)
-   ((if false e_1 e_2) . ==> . e_2)
-   (e==> (if v_1 e_1 e_2)
-         "if: question result is not true or false"
-         (side-condition (and (not (eq? (term v_1) 'false))
-                              (not (eq? (term v_1) 'true)))))
-   
-   
-   ((cond (false e) ... (true e_1) (e_2 e_3) ...) . ==> . e_1)
-   ((cond (false e) ... (true e_1) (e_2 e_3) ... (else e_4)) . ==> . e_1)
-   ((cond (false e) ... (else e_1)) . ==> . e_1)
-   ((cond (false e) ...) . e==> . "cond: all question results were false")
-   
-   ((side-condition
-     (cond (false e_1) ... (v_1 e_2) (e_3 e_4) ...)
-     (and (not (eq? (term v_1) 'false))
-          (not (eq? (term v_1) 'true))
-          (not (eq? (term v_1) 'else))))
-    . e==> .
-    "cond: question result is not true or false")
-   
-   ((side-condition
-     (cond (false e_1) ... (v_1 e_2) (e_3 e_4) ... (else e_5))
-     (and (not (eq? (term v_1) 'false))
-          (not (eq? (term v_1) 'true))
-          (not (eq? (term v_1) 'else))))
-    . e==> .
-    "cond: question result is not true or false")
-   
-   
-   ((empty? empty) . ==> . true)
-   ((side-condition (empty? v_1)
-                    (not (eq? (term v_1) 'empty)))
-    . ==> . 
-    false)
-   ((empty?) . e==> . "empty?: expects one argument")
-   ((empty? v_1 v_2 v_3 ...) . e==> . "empty?: expects one argument")
-   
-   ((side-condition (cons v v_1)
-                    (and (not (eq? (term v_1) 'empty))
-                         (not (and (pair? (term v_1))
-                                   (eq? (car (term v_1)) 'cons)))))
-    . e==> .
-    "cons: second argument must be of type <list>")
-   
-   ((first (cons v_1 list-value)) . ==> . v_1)
-   ((first) . e==> . "first: expects one argument")
-   ((first v_1 v_2 v_3 ...) . e==> . "first: expects one argument")
-   ((side-condition (first v_1)
-                    (not (and (pair? (term v_1)) 
-                              (eq? (car (term v_1)) 'cons))))
-    . e==> .
-    "first: expects argument of type <pair>")
-   
-   ((rest (cons v list-value_1)) . ==> . list-value_1)
-   ((rest v_1 v_2 v_3 ...) . e==> . "rest: expects one argument")
-   ((rest) . e==> . "rest: expects one argument")
-   
-   ((side-condition (rest v_1)
-                    (not (and (pair? (term v_1)) 
-                              (eq? (car (term v_1)) 'cons))))
-    . e==> .
-    "rest: expects argument of type <pair>")
-   
-   ((symbol=? 'x_1 'x_2) . ==> . ,(if (eq? (term x_1) (term x_2)) (term true) (term false)))
-   ((side-condition (symbol=? v_1 v_2)
-                    (or (not (and (pair? (term v_1))
-                                  (eq? (car (term v_1)) 'quote)))
-                        (not (and (pair? (term v_2))
-                                  (eq? (car (term v_2)) 'quote)))))
-    . e==> .
-    "symbol=?: expects argument of type <symbol>")
-   ((symbol=?)
-    . e==> .
-    "procedure symbol=?: expects 2 arguments")
-   ((symbol=? v_1 v_2 v_3 v_4 ...)
-    . e==> .
-    "procedure symbol=?: expects 2 arguments")
-   
-   ((+ number_1 ...) . ==> . ,(apply + (term (number_1 ...))))
-   ((* number_1 ...) . ==> . ,(apply * (term (number_1 ...))))
-   ((side-condition (+ v_arg ...)
-                    (ormap (lambda (v_arg) (not (number? v_arg))) (term (v_arg ...))))
-    . e==> .
-    "+: expects type <number>")
-   
-   ((side-condition (/ number_1 number_2 ...)
-                    (andmap (lambda (number_2) (not (zero? number_2))) (term (number_2 ...))))
-    . ==> .
-    ,(apply / (term (number_1 number_2 ...))))
-   ((side-condition (/ number_1 number_2 ...)
-                    (ormap (lambda (number_2) (zero? number_2)) (term (number_2 ...))))
-    . e==> . 
-    "/: division by zero")
-   ((side-condition (/ v_arg ...)
-                    (ormap (lambda (v_arg) (not (number? v_arg))) (term (v_arg ...))))
-    . e==> .
-    "/: expects type <number>")
-   
-   ;; unbound id application
-   (--> (side-condition
-         (d/e-v_before ...
-          (in-hole d/e-ctxt (x_f v ...))
-          d/e ...)
-         (and (not (prim-op? (term x_f)))
-              (not (defined? (term x_f) (term (d/e-v_before ...))))))
-        ,(format "reference to undefined identifier: ~a" (term x_f)))
-   
-   ;; procedure application as lambda
-   (--> (d/e-v_before ...
-         (define x_f (lambda (x_var ...) e_body))
-         d/e-v_middle ...
-         (in-hole d/e-ctxt_1 (x_f v_arg ...))
-         d/e_after ...)
-        (d/e-v_before ...
-         (define x_f (lambda (x_var ...) e_body))
-         d/e-v_middle ...
-         (in-hole d/e-ctxt_1
-                  ,(multi-subst (term (x_var ...))
-                                (term (v_arg ...))
-                                (term e_body)))
-         d/e_after ...))
-   
-   ;; define-style procedure application
-   (--> (d/e-v_before ...
-         (define (x_f x_var ...) e_body)
-         d/e-v_middle ...
-         (in-hole d/e-ctxt (x_f v_arg ...))
-         (name after d/e) ...)
-        (d/e-v_before ...
-         (define (x_f x_var ...) e_body)
-         d/e-v_middle ...
-         (in-hole d/e-ctxt
-                  ,(multi-subst (term (x_var ...))
-                                (term (v_arg ...))
-                                (term e_body)))
-         after ...))
-   
-   ;; reference to non-procedure define:
-   (--> (d/e-v_before ...
-         (name defn (define (name a x) (name val v)))
-         d/e-v_middle ...
-         (in-hole (name ctxt d/e-ctxt) (name a x))
-         d/e_after ...)
-        (d/e-v_before ...
-         defn
-         d/e-v_middle ...
-         (in-hole ctxt val)
-         d/e_after ...))
-   
-   ;; unbound reference to top-level id in hole:
-   (-->
-    (side-condition
-     (d/e-v_before ...
-      (in-hole d/e-ctxt (name a x))
-      d/e ...)
-     (and (not (prim-op? (term a)))
-          (not (defined? (term a) (term (d/e-v_before ...))))))
-    ,(format "reference to undefined identifier: ~a" (term a)))
-   
-   ;; reference to procedure-bound var in hole:
-   (--> (d/e-v_1 ...
-         (define (x_f x_var ...) (name body e))
-         d/e-v_2 ...
-         (in-hole d/e-ctxt x_f)
-         d/e ...)
-        ,(format "~a is a procedure, so it must be applied to arguments" (term x_f)))
-   
-   ;; reference to non-procedure-bound-var in application
-   (--> (d/e-v_1 ...
-         (define x_a v_val)
-         d/e-v_2 ...
-         (in-hole d/e-ctxt (x_a v ...))
-         d/e ...)
-        ,(format "procedure application: expected procedure, given: ~a" (term v_val)))
-   
-   ((struct? ((name maker maker) v ...)) . ==> . true)
-   ((struct? non-struct-value) . ==> . false)
-   
-   ;; struct predicate passes
-   (--> (side-condition
-         (d/e-v_before ...
-          (define-struct x_struct (x_field ...))
-          d/e-v_middle ...
-          (in-hole d/e-ctxt (x_predicate (x_maker v_arg ...)))
-          d/e_after ...)
-         (and (maker-name-match? (term x_struct) (term x_maker))
-              (predicate-name-match? (term x_struct) (term x_predicate))))
-        (d/e-v_before ...
-         (define-struct x_struct (x_field ...))
-         d/e-v_middle ...
-         (in-hole d/e-ctxt true)
-         d/e_after ...))
-   
-   ;; struct predicate fail to another struct
-   (--> (side-condition
-         (d/e-v_before ...
-          (define-struct x_struct (x_field ...))
-          d/e-v_middle ...
-          (in-hole d/e-ctxt (x_predicate (x_maker v ...)))
-          (name after d/e) ...)
-         (and (not (maker-name-match? (term x_struct) (term x_maker)))
-              (predicate-name-match? (term x_struct) (term x_predicate))))
-        (d/e-v_before ...
-         (define-struct x_struct (x_field ...))
-         d/e-v_middle ...
-         (in-hole d/e-ctxt false)
-         after ...))
-   
-   ;; struct predicate fail to another value
-   (--> (side-condition
-         (d/e-v_before ...
-          (define-struct x_struct (x_field ...))
-          d/e-v_middle ...
-          (in-hole (name ctxt d/e-ctxt) (x_predicate non-struct-value))
-          d/e_after ...)
-         (predicate-name-match? (term x_struct) (term x_predicate))) 
-        (d/e-v_before ...
-         (define-struct x_struct (x_field ...))
-         d/e-v_middle ...
-         (in-hole ctxt false)
-         d/e_after ...))
-   
-   ;; misapplied selector 1
-   (--> (side-condition
-         (d/e-v_before ...
-          (define-struct x_struct (x_field ...))
-          d/e-v_middle ...
-          (in-hole d/e-ctxt (x_selector (x_maker v_arg ...)))
-          d/e_after ...)
-         (and (not (maker-name-match? (term x_struct) (term x_maker)))
-              (selector-name-match? (term x_struct) (term (x_field ...)) (term x_selector))))
-        ,(format "~a: expects argument of matching struct" (term x_selector)))
-   
-   ;; misapplied selector 2
-   (--> (side-condition
-         (d/e-v_before ...
-          (define-struct x_struct (x_field ...))
-          d/e-v_middle ...
-          (in-hole d/e-ctxt (x_selector non-struct-value))
-          d/e_after ...)
-         (selector-name-match? (term x_struct) (term (x_field ...)) (term x_selector)))
-        ,(format "~a: expects argument of matching struct" (term x_selector)))
-   
-   ;; well-applied selector
-   (--> (side-condition
-         (d/e-v_before ...
-          (define-struct x_struct (x_field ...))
-          d/e-v_middle ...
-          (in-hole (name ctxt d/e-ctxt) (x_selector (x_maker v_arg ...)))
-          d/e_after ...)
-         (and (maker-name-match? (term x_struct) (term x_maker))
-              (selector-name-match? (term x_struct) (term (x_field ...)) (term x_selector))))
-        (d/e-v_before ...
-         (define-struct x_struct (x_field ...))
-         d/e-v_middle ...
-         (in-hole ctxt
-                  ,(list-ref (term (v_arg ...))
-                             (struct-index (term x_struct) 
-                                           (term (x_field ...))
-                                           (term x_selector))))
-         d/e_after ...))
-   
-   with
-   [(--> (in-hole p-ctxt_1 a) (in-hole p-ctxt_1 b)) (==> a b)]
-   [(--> (in-hole p-ctxt a) b) (e==> a b)]))
-
-(define (defined? f befores)
-  (ormap
-   (lambda (before)
-     (match before
-       [`(define (,a-name ,x ...) ,b)
-        (eq? f a-name)]
-       [`(define ,a-name (lambda ,x ...))
-        (eq? f a-name)]
-       [`(define-struct ,struct-name (,fields ...))
-        (or (ormap (lambda (field)
-                     (eq? f (string->symbol (format "~a-~a" struct-name field))))
-                   fields)
-            (eq? f (string->symbol (format "make-~a" struct-name)))
-            (eq? f (string->symbol (format "~a?" struct-name))))]
-       [else #t]))
-   befores))
-
-(define (multi-subst orig-vars orig-args body)
-  (let loop ([args orig-args]
-             [vars orig-vars]
-             [body body])
-    (cond
-      [(and (null? args) (null? vars))
-       body]
-      [(or (null? args) (null? vars))
-       (error 'multi-subst 
-              "malformed program, formals ~s and actuals ~s do not have the same size"
-              orig-vars
-              orig-args)]
-      [else (loop (cdr args) 
-                  (cdr vars)
-                  (term-let ((x (car vars))
-                             (v (car args))
-                             (body body))
-                    (term (beg-e-subst (x v body)))))])))
-
-(define (selector-name-match? struct fields selector)
-  (ormap (lambda (field) (string=? (format "~a-~a" struct field) 
-                                   (symbol->string selector)))
-         fields))
-
-(define (struct-index struct init-fields selector)
-  (let loop ([i 0]
-             [fields init-fields])
-    (cond
-      [(null? fields) (error 'struct-index "~s ~s ~s" struct init-fields selector)]
-      [else (let ([field (car fields)])
-              (if (string=? (format "~a-~a" struct field) 
-                            (symbol->string selector))
-                  i
-                  (loop (+ i 1)
-                        (cdr fields))))])))
-
-(define (maker-name-match? name maker)
-  (let* ([names (symbol->string name)]
-         [makers (symbol->string maker)]
-         [namel (string-length names)]
-         [makerl (string-length makers)])
-    (and (makerl . > . namel)
-         (string=? (substring makers (- makerl namel) makerl)
-                   names))))
-
-(define (predicate-name-match? name predicate)
-  (eq? (string->symbol (format "~a?" name)) predicate))
-
-(define failed-tests 0)
-(define total-tests 0)
-
-(define (test in out)
-  (set! total-tests (+ total-tests 1))
-  (let/ec k
-    (let* ([failed
-            (lambda (msg)
-              (set! failed-tests (+ failed-tests 1))
-              (eprintf "FAILED: ~a\n" msg)
-              (k (void)))]
-           [got (normalize in failed)])
-      (unless (equal? got out)
-        (eprintf "FAILED:   ~s\ngot:      ~s\nexpected: ~s\n" in got out)
-        (set! failed-tests (+ failed-tests 1))))))
-
-(define (test-all step . steps)
-  (set! total-tests (+ total-tests 1))
-  (let loop ([this step]
-             [rest steps])
-    (let ([nexts (apply-reduction-relation reductions this)])
-      (cond
-        [(null? rest)
-         (unless (null? nexts)
-           (set! failed-tests (+ failed-tests 1))
-           (eprintf "FAILED: ~s\n  last step: ~s\n  reduced to: ~s\n"
-                    step
-                    this
-                    nexts))]
-        [else
-         (cond
-           [(and (pair? nexts)
-                 (null? (cdr nexts)))
-            (let ([next (car nexts)])
-              (if (equal? next (car rest))
-                  (loop (car rest)
-                        (cdr rest))
-                  (begin
-                    (set! failed-tests (+ failed-tests 1))
-                    (eprintf "FAILED: ~s\n     step: ~s\n expected: ~s\n      got: ~s\n"
-                             step
-                             this
-                             (car rest)
-                             next))))]
-           [else
-            (set! failed-tests (+ failed-tests 1))
-            (eprintf "FAILED: ~s\n  step: ~s\n  not single step: ~s\n"
-                     step
-                     this
-                     nexts)])]))))
-
-(define show-dots (make-parameter #f))
-(define (normalize orig-term failed)
-  (let loop ([term orig-term]
-             [n 1000])
-    (unless (p? term)
-      (failed (format "not a p: ~s orig: ~s" term orig-term)))
-    (let ([nexts (apply-reduction-relation reductions term)])
-      (when (show-dots)
-        (display #\.)
-        (flush-output))
-      (cond
-        [(= n 0)
-         (when (show-dots)
-           (newline))
-         (error 'normalize "found too many reductions")]
-        [(null? nexts) 
-         (when (show-dots)
-           (newline))
-         term]
-        [(string? (car nexts))
-         (when (show-dots)
-           (newline))
-         (car nexts)]
-        [(null? (cdr nexts)) (loop (car nexts) (- n 1))]
-        [else 
-         (when (show-dots)
-           (newline))
-         (failed (format "found more than one reduction\n ~s\n ->\n~s" term nexts))]))))
-
-(define (show-test-results)
-  (cond
-    [(= failed-tests 0) 
-     (fprintf (current-output-port) "passed all ~a tests\n" total-tests)]
-    [else
-     (eprintf "failed ~a out of ~a tests\n" failed-tests total-tests)]))
-
-(define-syntax (tests stx)
-  (syntax-case stx ()
-    [(_ args ...)
-     (syntax
-      (begin
-        (set! failed-tests 0)
-        (set! total-tests 0)
-        args ...
-        (show-test-results)))]))
-
-(define (run-tests [run-struct-test? #t])
-  (tests
-   (when run-struct-test?
-     (test
-      '((define-struct s ())
-	(s? (make-s)))
-      '((define-struct s ())
-	true)))
-   
-   (test
-    '((define-struct s (a b))
-      (s-a (make-s 1 3)))
-    '((define-struct s (a b))
-      1))
-   
-   (test
-    '((define-struct s (a b))
-      (s-b (make-s 1 3)))
-    '((define-struct s (a b))
-      3))
-   
-   (test
-    '((define-struct s (a b))
-      (define-struct t (x y))
-      (t-x (make-s 1 2)))
-    "t-x: expects argument of matching struct")
-   
-   (test
-    '((define-struct t (x y))
-      (t-x 12))
-    "t-x: expects argument of matching struct")
-   
-   (test
-    '((define-struct s (a b))
-      (define-struct t (x y))
-      (s? (make-s 1 2)))
-    '((define-struct s (a b))
-      (define-struct t (x y))
-      true))
-   
-   (test
-    '((define-struct s (a b))
-      (define-struct t (x y))
-      (t? (make-s 1 2)))
-    '((define-struct s (a b))
-      (define-struct t (x y))
-      false))
-   
-   (test
-    '((define-struct s (a b))
-      (struct? (make-s 1 2))
-      (struct? 1))
-    '((define-struct s (a b))
-      true
-      false))
-   
-   (test
-    '((define (f x) x)
-      (f 1))
-    '((define (f x) x)
-      1))
-   
-   (test
-    '((define (f x) x)
-      (define (g x) x)
-      (define (h x) x)
-      (g g))
-    "g is a procedure, so it must be applied to arguments")
-   
-   (test
-    '((define (f x) x)
-      (define x 1)
-      (define (h x) x)
-      (x 2))
-    "procedure application: expected procedure, given: 1")
-   
-   (test
-    '((define (double l) (+ l l))
-      (double 2))
-    '((define (double l) (+ l l))
-      4))
-   
-   (test
-    '((define f (lambda (x) x))
-      (f 1))
-    '((define f (lambda (x) x))
-      1))
-   
-   (test
-    '((define double (lambda (l) (+ l l)))
-      (double 2))
-    '((define double (lambda (l) (+ l l)))
-      4))
-   
-   (test
-    '((f 1))
-    "reference to undefined identifier: f")
-   
-   (test
-    '((f 1)
-      (define (f x) x))
-    "reference to undefined identifier: f")
-   
-   (test
-    '((make-s 1)
-      (define-struct s (a b)))
-    "reference to undefined identifier: make-s")
-   
-   (test
-    '((+ 1 2 3))
-    '(6))
-   
-   (test
-    '((+ 1 "2" 3))
-    "+: expects type <number>")
-   
-   (test
-    '((/ 1 2 3))
-    '(1/6))
-   
-   (test
-    '((/ 1 2 0 3))
-    "/: division by zero")
-   
-   (test
-    '((/ 1 "2" 3))
-    "/: expects type <number>")
-   
-   (test '((+ 1 (/ (+ 3 5) (+ 2 2)))) '(3))
-   
-   (test '((symbol=? 'x 'x)) '(true))
-   (test '((symbol=? 'x 'y)) '(false))
-   (test '((symbol=? 1 'x)) 
-         "symbol=?: expects argument of type <symbol>")
-   (test '((symbol=? 'x 1)) 
-         "symbol=?: expects argument of type <symbol>")
-   
-   (test '((cons 1 empty)) '((cons 1 empty)))
-   (test '((cons 1 2))
-         "cons: second argument must be of type <list>")
-   (test '((+ (first (cons 1 2)) 2))
-         "cons: second argument must be of type <list>")
-   (test '((+ (first (cons 1 empty)) 2))
-         '(3))
-   
-   (test
-    '((first (cons 1 empty)))
-    '(1))
-   
-   (test
-    '((first 1))
-    "first: expects argument of type <pair>")
-   
-   (test
-    '((first 1 2))
-    "first: expects one argument")
-   
-   (test
-    '((first))
-    "first: expects one argument")
-   
-   (test
-    '((rest (cons 1 empty)))
-    '(empty))
-   
-   (test
-    '((rest 1))
-    "rest: expects argument of type <pair>")
-   
-   (test
-    '((rest 1 2))
-    "rest: expects one argument")
-   
-   (test
-    '((rest))
-    "rest: expects one argument")
-   
-   (test
-    '((empty? empty))
-    '(true))
-   
-   (test
-    '((empty? 1))
-    '(false))
-   
-   (test
-    '((empty?))
-    "empty?: expects one argument")
-   
-   (test
-    '((empty? 1 2))
-    "empty?: expects one argument")
-   
-   (test
-    '((cond [true 1]))
-    '(1))
-   
-   (test
-    '((cond [else 1]))
-    '(1))
-   
-   (test-all
-    '((cond [false 1] [else 2]))
-    '(2))
-   
-   (test-all
-    '((cond [false 1] [false 2]))
-    "cond: all question results were false")
-   
-   (test
-    '((cond [1 1]))
-    "cond: question result is not true or false")
-   
-   (test
-    '((cond [(empty? empty) 'infinite] [else 3]))
-    '('infinite))
-   
-   (test-all
-    '((cond [(if false false false) 'x] [(if true true true) 'y] [(if false false false) 'z]))
-    '((cond [false 'x] [(if true true true) 'y] [(if false false false) 'z]))
-    '((cond [false 'x] [true 'y] [(if false false false) 'z]))
-    '('y))
-   
-   (test-all
-    '((cond [(if false false false) 'x] [(if true true true) 'y] [else 'z]))
-    '((cond [false 'x] [(if true true true) 'y] [else 'z]))
-    '((cond [false 'x] [true 'y] [else 'z]))
-    '('y))
-   
-   (test-all
-    '((cond [(if false false false) 'x] [(if false false false) 'y] [else 'z]))
-    '((cond [false 'x] [(if false false false) 'y] [else 'z]))
-    '((cond [false 'x] [false 'y] [else 'z]))
-    '('z))
-   
-   (test-all
-    '((and true true 3))
-    "and: question result is not true or false")
-   
-   (test-all
-    '((and 1 true true))
-    "and: question result is not true or false")
-   
-   (test-all
-    '((and true true true false))
-    '(false))
-   
-   (test-all
-    '((and false true))
-    '(false))
-   
-   (test-all
-    '((or false false 3))
-    "or: question result is not true or false")
-   
-   (test-all
-    '((or 1 false false))
-    "or: question result is not true or false")
-   
-   (test-all
-    '((or false false false true))
-    '(true))
-   
-   (test-all
-    '((or true false))
-    '(true))
-   
-   (test-all
-    '((or (if false false false) (if false false false) (if true true true) (if false false false)))
-    '((or false (if false false false) (if true true true) (if false false false)))
-    '((or false false (if true true true) (if false false false)))
-    '((or false false true (if false false false)))
-    '(true))
-   
-   (test-all
-    '((and (if true true true) (if true true true) (if false false false) (if true true true)))
-    '((and true (if true true true) (if false false false) (if true true true)))
-    '((and true true (if false false false) (if true true true)))
-    '((and true true false (if true true true)))
-    '(false))
-   
-   (test
-    '((if 1 2 3))
-    "if: question result is not true or false")
-   
-   (test
-    '((if true 'x 'y))
-    '('x))
-   
-   (test
-    '((if false 'x 'y))
-    '('y))
-   
-   ; test non-procedure-defs in context:
-   (test
-    `((+ 3 4) (define a 3) (+ 5 6))
-    `(7 (define a 3) 11))
-   
-   ; test reduction of non-procedure-defs:
-   (test 
-    `((define a 13) (define b (+ a 9)) (+ 3 4))
-    `((define a 13) (define b 22) 7))
-   
-   ; test reduction of unbound ids in hole:
-   (test 
-    `(x)
-    "reference to undefined identifier: x")
-   
-   ; test reduction of function-bound id in hole:
-   (test
-    `((define (a x) (+ x 1)) a)
-    "a is a procedure, so it must be applied to arguments")
-   
-   ; test reduction of non-procedure-def in application:
-   (test
-    `((define a 3) (a 9))
-    "procedure application: expected procedure, given: 3")))
-
-(define (run-big-test)
-  (parameterize ([show-dots #t])
-    (tests
-     (test
-      '((define-struct pr (hd tl))
-        (define (avg l)
-          (cond
-            [(empty? l) 'infinite]
-            [else (/ (sum l) (howmany/acc l 0))]))
-        (define (sum l)
-          (cond
-            [(empty? (pr-tl l)) (pr-hd l)]
-            [else (+ (pr-hd l) (sum (pr-tl l)))]))
-        (define (howmany/acc l acc)
-          (cond
-            [(empty? l) acc]
-            [else (howmany/acc (pr-tl l) (+ acc 1))]))
-        (avg empty)
-        (avg (make-pr 3 (make-pr 4 (make-pr 5 (make-pr 6 (make-pr 7 (make-pr 8 (make-pr 9 empty)))))))))
-      
-      '((define-struct pr (hd tl))
-        (define (avg l)
-          (cond
-            [(empty? l) 'infinite]
-            [else (/ (sum l) (howmany/acc l 0))]))
-        (define (sum l)
-          (cond
-            [(empty? (pr-tl l)) (pr-hd l)]
-            [else (+ (pr-hd l) (sum (pr-tl l)))]))
-        (define (howmany/acc l acc)
-          (cond
-            [(empty? l) acc]
-            [else (howmany/acc (pr-tl l) (+ acc 1))]))
-        'infinite
-        6))
-     (test
-      '((define (contains-sym? s l)
-          (cond
-            [(empty? l) false]
-            [true (or (symbol=? s (first l))
-                      (contains-sym? s (rest l)))]))
-        (contains-sym? 'x (cons 'z (cons 'y (cons 'x empty))))
-        (contains-sym? 'a (cons 'p (cons 'q (cons 'p (cons 'q (cons 'p (cons 'q empty))))))))
-      '((define (contains-sym? s l)
-          (cond
-            [(empty? l) false]
-            [true (or (symbol=? s (first l))
-                      (contains-sym? s (rest l)))]))
-        true
-        false)))))
-
-(provide main)
-(define (main)
-  (run-tests)
-  (run-big-test))
-
-(module+ main (main))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cbn-letrec.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cbn-letrec.rkt
deleted file mode 100644
index 6a95253db3..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cbn-letrec.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics)
-
-;; Ariola and Felleisen's formulation:
-;;
-;; M ::= .... | letrec D in M
-;; D ::= x_1 be M_1, ..., x_n be M_n
-;; E ::= ....
-;;     | letrec D in E
-;;     | letrec D, x be E in E[x]
-;;     | letrec x_n be E, D[x, x_n] in E[x]
-;; D[x, x_n] ::= x be E[x_1], ..., x_n-1 be E[x_n], D
-;;
-;; Redex's pattern language does not support this formuation directly.
-;; There are two obstacles, both related to letrec's binding clauses:
-;; 1. The clauses are considered to be unordered. For example, the term
-;;                  letrec x be λx.x, y be x in y
-;; is equivalent to the term:
-;;                  letrec y be y, x be λx.x in y
-;; 2. The ellipsis notation in the definition of D[x, x_n] expresses a
-;; relationship between adjacent bindings that cannot be directly 
-;; expressed using Redex's ellipsis, namely that
-;;                  x_i be E[x_i+1]
-;; precedes the binding for x_i+1.
-;;
-;; The definition below works around these obstacles using a 
-;; metafunction that checks the dependency expressed in D[x, x_n].
-
-(define-language cbn-letrec
-  ((M N) x (λ x M) (M M) (letrec D M))
-  (D ([x M] ...))
-  (V (λ x M))
-  (A V (letrec D A))
-  (E hole (E M) (letrec D E)
-     (side-condition
-      (letrec ([x_0 M_0] ... [x_i E_i] [x_i+1 M_i+1] ...) 
-        (in-hole E_j x_j))
-      (and (term (reachable? x_j x_i ([x_0 M_0] ... [x_i+1 M_i+1] ...)))
-           (term (does-not-bind? E_j x_j)))))
-  (x variable-not-otherwise-mentioned))
-
-(define-metafunction cbn-letrec
-  reachable? : x x D -> #t or #f
-  [(reachable? x_j x_j D) #t]
-  [(reachable? x_j x_i ([x_0 M_0] ... [x_j (in-hole E_j x_k)] [x_j+1 M_j+1] ...))
-   ,(and (term (does-not-bind? E_j x_k))
-         (term (reachable? x_k x_i ([x_0 M_0] ... [x_j+1 M_j+1] ...))))])
-
-;; unnessary if we assume binding occurrences are chosen to avoid shadowing
-(define-metafunction cbn-letrec
-  does-not-bind? : E x -> #t or #f
-  [(does-not-bind? hole x) #t]
-  [(does-not-bind? (E M) x)
-   (does-not-bind? E x)]
-  [(does-not-bind? (letrec ([x_0 M_0] ...) E) x)
-   ,(and (not (member (term x) (term (x_0 ...))))
-         (term (does-not-bind? E x)))]
-  [(does-not-bind? (letrec ([x_0 M_0] ... [x_i E_i] [x_i+1 M_i+1] ...) M) x)
-   ,(and (not (member (term x) (term (x_0 ... x_i x_i+1 ...))))
-         (term (does-not-bind? E_i x)))])
-
-(define-syntax-rule (test-match t p)
-  (test-match/count t p 1))
-(define-syntax-rule (test-no-match t p)
-  (test-match/count t p 0))
-(define-syntax (test-match/count stx)
-  (syntax-case stx ()
-    [(_ p t n)
-     #`(let ([matches (redex-match cbn-letrec p (term t))])
-         #,(syntax/loc stx
-             (test-equal (if matches (length matches) 0) 
-                         n)))]))
-
-(test-match E (hole (λ x x)))
-(test-no-match E ((λ x x) hole))
-
-(test-match E (letrec ([x x]) hole))
-
-(test-no-match E (letrec ([x hole]) (λ x x)))
-(test-match E (letrec ([x x] [y hole] [z z]) y))
-(test-match E (letrec ([x hole]) (x (λ x x))))
-(test-match E (letrec ([x hole] [y (x (λ x x))]) y))
-(test-match E (letrec ([x y] [y z] [z hole]) x))
-(test-match E (letrec ([z hole] [y z] [x y]) x))
-(test-no-match E (letrec ([x hole]) (letrec ([x (λ x x)]) x)))
-(test-no-match E (letrec ([x y] [y (letrec ([z (λ x x)]) z)] [z hole]) x))
-
-(test-equal (term (does-not-bind? (hole (λ x x)) x)) #t)
-(test-equal (term (does-not-bind? (letrec ([x x] [y y] [z z]) hole) x)) #f)
-(test-equal (term (does-not-bind? (letrec ([x x] [y y] [z z]) hole) y)) #f)
-(test-equal (term (does-not-bind? (letrec ([x x] [y y] [z z]) hole) z)) #f)
-(test-equal (term (does-not-bind? (letrec ([x x] [y y] [z z]) hole) a)) #t)
-(test-equal (term (does-not-bind? (letrec ([x x] [y hole] [z z]) y) x)) #f)
-(test-equal (term (does-not-bind? (letrec ([x x] [y hole] [z z]) y) y)) #f)
-(test-equal (term (does-not-bind? (letrec ([x x] [y hole] [z z]) y) z)) #f)
-(test-equal (term (does-not-bind? (letrec ([x x] [y hole] [z z]) y) a)) #t)
-(test-equal (term (does-not-bind? (letrec ([x x]) (letrec ([y y]) hole)) y)) #f)
-(test-equal (term (does-not-bind? (letrec ([x x]) (letrec ([y hole]) y)) y)) #f)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/church.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/church.rkt
deleted file mode 100644
index 503f39cec0..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/church.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket
-(require redex)
-
-(reduction-steps-cutoff 100)
-
-(define-language lang
-  (e (lambda (x) e)
-     (let (x e) e)
-     (app e e)
-     (+ e e)
-     number
-     x)
-  (e-ctxt (lambda (x) e-ctxt)
-          a-ctxt)
-  (a-ctxt (let (x a-ctxt) e)
-          (app a-ctxt e)
-          (app x a-ctxt)
-          hole)
-  (v (lambda (x) e)
-     x)
-  (x variable))
-
-(define reductions
-  (reduction-relation
-   lang
-   (--> (in-hole e-ctxt_1 (app (lambda (x_1) e_body) e_arg))
-        (in-hole e-ctxt_1 (subst (x_1 e_arg e_body))))
-   (--> (in-hole e-ctxt_1 (let (x_1 v_1) e_1))
-        (in-hole e-ctxt_1 (subst (x_1 v_1 e_1))))))
-
-(define-metafunction lang
-  [(subst (x_1 e_1 (lambda (x_1) e_2))) (lambda (x_1) e_2)]
-  [(subst (x_1 e_1 (lambda (x_2) e_2))) 
-   ,(term-let ((x_new (variable-not-in (term e_1) (term x_2))))
-      (term (lambda (x_new) (subst (x_1 e_1 (subst (x_2 x_new e_2)))))))]
-  [(subst (x_1 e_1 (let (x_1 e_2) e_3))) (let (x_1 (subst (x_1 e_1 e_2))) e_3)]
-  [(subst (x_1 e_1 (let (x_2 e_2) e_3)))
-   ,(term-let ((x_new (variable-not-in (term e_1) (term x_2))))
-      (term (let (x_2 (subst (x_1 e_1 e_2))) (subst (x_1 e_1 (subst (x_2 x_new e_3)))))))]
-  [(subst (x_1 e_1 x_1)) e_1]
-  [(subst (x_1 e_1 x_2)) x_2]
-  [(subst (x_1 e_1 (app e_2 e_3)))
-   (app (subst (x_1 e_1 e_2))
-        (subst (x_1 e_1 e_3)))]
-  [(subst (x_1 e_1 (+ e_2 e_3)))
-   (+ (subst (x_1 e_1 e_2))
-      (subst (x_1 e_1 e_3)))]
-  [(subst (x_1 e_1 number_1)) number_1])
-
-(traces reductions
-        '(let (plus (lambda (m) 
-                      (lambda (n) 
-                        (lambda (s)
-                          (lambda (z)
-                            (app (app m s) (app (app n s) z)))))))
-           (let (two (lambda (s) (lambda (z) (app s (app s z)))))
-             (app (app plus two) two))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/combinators.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/combinators.rkt
deleted file mode 100644
index 7aff400fa8..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/combinators.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket
-
-;"one point basis"
-;"formal aspects of computing"
-
-(require redex)
-
-(initial-font-size 12)
-(reduction-steps-cutoff 100)
-(initial-char-width 80)
-
-(define-language lang
-  (e (e e)
-     comb
-     abs1
-     abs2
-     abs3)
-  (e-ctxt (e e-ctxt)
-          (e-ctxt e)
-          hole)
-  (comb i
-        j
-        b
-        c
-        c*
-        w))
-
-(define ij-relation
-  (reduction-relation
-   lang
-   (--> (in-hole e-ctxt_1 (i e_1)) 
-        (in-hole e-ctxt_1 e_1))
-   (--> (in-hole e-ctxt_1 ((((j e_a) e_b) e_c) e_d))
-        (in-hole e-ctxt_1 ((e_a e_b) ((e_a e_d) e_c))))))
-
-(define relation
-  (union-reduction-relations
-   ij-relation
-   (reduction-relation
-    lang
-    (--> (in-hole e-ctxt_1 (((b e_m) e_n) e_l))
-         (in-hole e-ctxt_1 (e_m (e_n e_l))))
-    (--> (in-hole e-ctxt_1 (((c e_m) e_n) e_l))
-         (in-hole e-ctxt_1 ((e_m e_l) e_n)))
-    (--> (in-hole e-ctxt_1 ((c* e_a) e_b))
-         (in-hole e-ctxt_1 (e_b e_a)))
-    (--> (in-hole e-ctxt_1 ((w e_a) e_b))
-         (in-hole e-ctxt_1 ((e_a e_b) e_b))))))
-
-
-(define c* `((j i) i))
-(define (make-c c*) `(((j ,c*) (j ,c*)) (j ,c*)))
-(define (make-b c) `((,c ((j i) ,c)) (j i)))
-(define (make-w b c c*) `(,c ((,c ((,b ,c) ((,c ((,b j) ,c*)) ,c*))) ,c*)))
-(define (make-s b c w) `((,b ((,b (,b ,w)) ,c)) (,b ,b)))
-
-(traces relation
-        (list 
-         `((,c* abs1) abs2)
-         `(((,(make-c 'c*) abs1) abs2) abs3)
-         `(((,(make-b 'c) abs1) abs2) abs3)
-         `((,(make-w 'b 'c 'c*) abs1) abs2)
-         `(((,(make-s 'b 'c 'w) abs1) abs2) abs3))
-        #:multiple? #t)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/compatible-closure.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/compatible-closure.rkt
deleted file mode 100644
index 88e3e06365..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/compatible-closure.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket
-(require redex)
-
-(define-language grammar
-  (B t
-     f
-     (B * B)))
-
-(define r
-  (reduction-relation
-   grammar
-   (--> (f * B_1) B_1 false) ; [a]
-   (--> (t * B_1) t true))) ; [b]
-
-(define ->r (compatible-closure r grammar B))
-
-(traces ->r '((f * f) * (t * f)))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/CMT-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/CMT-test.rkt
deleted file mode 100644
index d4415d0cba..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/CMT-test.rkt
+++ /dev/null
@@ -1,296 +0,0 @@
-#lang racket
-
-(require "CMT.rkt"
-         "SL-syntax.rkt"
-         "SL-semantics.rkt"
-         "TL-syntax.rkt"
-         "TL-semantics.rkt"
-         "common.rkt"
-         "test-util.rkt"
-         redex)
-
-(define-syntax (test-translation stx)
-  (syntax-case stx ()
-    [(_ expr)
-     #`(with-handlers ([exn:fail?
-                        (λ (exn)
-                          #,(syntax/loc stx 
-                              (test-equal (exn-message exn) "")))])
-         (let ([e (term expr)])
-           (let ([v ((make-eval -->SL (redex-match SL v))
-                     (term (∅ / ,e)))]
-                 [u ((make-eval -->TL (redex-match TL v))
-                     (term (∅ / (translate ,e))))])
-             #,(syntax/loc stx (test-equal u v)))))]))
-
-(test-translation
- ((λ (x) ("S" x))
-  (call/cc (λ (k) (k ("Z"))))))
-
-; two marks with the same key on the same frame
-(test-translation
- ((λ (x) x)
-  (w-c-m ("a") ("1")
-         (w-c-m ("a") ("2")
-                (c-c-m [("a")])))))
-
-; mark reapplied to the reconstituted continuation
-(test-translation
- (w-c-m ("a") ("1")
-        (w-c-m ("a") ("2")
-               ((λ (x) (x))
-                (call/cc (λ (k) (k (λ () (c-c-m [("a")])))))))))
-
-; variables as keys/values in w-c-ms in context
-(test-translation
- ((λ (x y z)
-    (w-c-m x y
-           (w-c-m x z
-                  ((λ (x) (x))
-                   (call/cc (λ (k) (k (λ () (c-c-m [x])))))))))
-  ("a") ("1") ("2")))
-
-; transforms a context that includes variables in application frame
-(test-translation
- ((λ (f)
-    (f (w-c-m ("a") ("1")
-              ((call/cc (λ (k) (k (λ () (c-c-m [("a")])))))))))
-  (λ (x) x)))
-
-; transformation within installed continuation marks
-(test-translation
- (w-c-m ("a") (λ () (call/cc (λ (k) (k (λ () (c-c-m [("a")]))))))
-        ((λ (frames)
-           (match frames
-             [("cons" cms _)
-              (match cms
-                [("cons" cm _)
-                 (match cm
-                   [("cons" _ t)
-                    ((t))])])]))
-         (c-c-m [("a")]))))
-
-; a continuation, in a values-only position, that contains
-; multiple frames, each with continuation marks
-(test-translation
- (letrec ([(ref k) (κ ((λ (x) ("outer" x))
-                       (w-c-m ("a") ("1")
-                              (w-c-m ("b") ("2")
-                                     ((λ (x) ("inner" x))
-                                      (w-c-m ("a") ("3")
-                                             (w-c-m ("b") ("4")
-                                                    (hole))))))))])
-   ((λ (x) ("skipped" x))
-    ((ref k) (λ () (c-c-m [("a") ("b")]))))))
-
-; produces a call to map-set where one argument is a (K x).
-(test-translation
- (λ (x) (w-c-m ("k" x) ("l") (x))))
-
-; application and match translation redexes allow variables
-; in datatype instances
-(test-translation
- (λ (x) (x ("k" x))))
-(test-translation
- (λ (x) (match ("k" x) [("k" x) x])))
-
-; w-c-m translation redex with non-w body
-(test-translation
- (λ (x)
-   (w-c-m ("a") ("b")
-          ("c" x))))
-
-; continuation value in continuation mark of a continuation value
-(test-translation
- ((λ (x) ("skipped" x))
-  ((κ (w-c-m ("a") (κ ((λ (x) ("wrapped" x)) hole))
-             ((λ (x) ("skipped" x))
-              (hole))))
-   (λ ()
-     ((λ (ms)
-        (match ms
-          [("cons" f _)
-           (match f
-             [("cons" m _)
-              (match m
-                [("cons" _ k)
-                 (k ("a"))])])]))
-      (c-c-m [("a")]))))))
-
-(test-->>
- -->TL
- #:cycles-ok
- (term
-  (∅
-   /
-   (translate
-    ((λ (t) (t t))
-     (call/cc (λ (x) (call/cc x))))))))
-
-(test-translation
- ((λ (bh)
-    ((λ (x y) ("pair" x y))
-     bh
-     (λ (x) x)))
-  (letrec ([(ref bh) (ref bh)]) (ref bh))))
-
-(test-TL-result
- (make-store [reverse ,TL-reverse])
- (,TL-equal? ("1") ("1"))
- ("true"))
-
-(test-TL-result
- (make-store [reverse ,TL-reverse])
- (,TL-equal? ("1") ("2"))
- ("false"))
-
-(test-TL-result
- (make-store [reverse ,TL-reverse])
- (w-c-m ("1") ("whatever") (,TL-equal? ("1") ("1")))
- ("true"))
-
-(test-TL-result
- (make-store [equal? ,TL-equal?] [reverse ,TL-reverse] [map-set ,map-set])
- ((ref map-set) ("nil") ("1") ("a"))
- ("cons" ("cons" ("1") ("a")) ("nil")))
-
-(test-TL-result
- (make-store [equal? ,TL-equal?] [reverse ,TL-reverse] [map-set ,map-set])
- ((ref map-set) ("cons" ("cons" ("1") ("a"))
-                        ("cons" ("cons" ("2") ("b"))
-                                ("nil")))
-                ("2") ("c"))
- ("cons" ("cons" ("1") ("a"))
-         ("cons" ("cons" ("2") ("c"))
-                 ("nil"))))
-
-(test-TL-result
- (make-store [c-w-i-c-m ,c-w-i-c-m] [reverse ,TL-reverse])
- (w-c-m ("a") ("1")
-        ((λ (x) x)
-         ((ref c-w-i-c-m) ("a") (λ (x) x) ("2"))))
- ("2"))
-
-(test-TL-result
- (make-store [c-w-i-c-m ,c-w-i-c-m] [reverse ,TL-reverse])
- (w-c-m ("a") ("1")
-        ((ref c-w-i-c-m) ("a") (λ (x) ("b" x)) ("dontcare")))
- ("b" ("1")))
-
-(test-TL-result
- (make-store [restore-marks ,restore-marks])
- ((ref restore-marks)
-  ("cons" ("cons" ("a") ("1"))
-          ("cons" ("cons" ("b") ("2"))
-                  ("nil")))
-  (λ () (c-c-m [("a") ("b")])))
- ("cons"
-  ("cons" ("cons" ("b") ("2"))
-          ("cons" ("cons" ("a") ("1"))
-                  ("nil")))
-  ("nil")))
-
-;; Variables and Values
-(test-equal (term (CMT/a z)) (term z))
-(test-equal (term (CMT/a (ref foo))) (term (ref foo)))
-(test-equal (term (CMT/a (λ (x) z))) (term (λ (x) z)))
-
-(define TL-empty-cont
-  (term (λ (x) 
-          (abort 
-           ((ref resume)
-            ("cons"
-             ("cons" ("cons" ("diamond") ("nil"))
-                     ("nil"))
-             ("nil"))
-            x)))))
-(test-equal (term (CMT/a (κ hole))) TL-empty-cont)
-
-(test-equal 
- (term (CMT/a (κ ((ref f) (ref y) hole))))
- (term (λ (x1) 
-         (abort
-          ((ref resume)
-           ("cons"
-            ("cons" ("cons" ("diamond") ("nil")) 
-                    ("nil"))
-            ("cons"
-             ("cons" ("cons" ("diamond") ("nil"))
-                     ("cons"
-                      ("cons" ("square") (λ (x) ((ref f) (ref y) x)))
-                      ("nil")))
-             ("nil")))
-           x1)))))
-
-(test-equal (term (CMT/a ("nil"))) (term ("nil")))
-(test-equal (term (CMT/a ("cons" x ("nil")))) (term ("cons" x ("nil"))))
-
-(test-equal 
- (term (CMT/a ("cons" (κ hole) ("nil"))))
- (term ("cons" ,TL-empty-cont ("nil"))))
-
-;; Redexes
-(test-equal (term (CMT/r (f x y))) (term (f x y)))
-(test-equal 
- (term (CMT/r (f x (κ hole)))) 
- (term (f x ,TL-empty-cont)))
-
-(test-equal (term (CMT/r (letrec ([(ref x) ("nil")]) z))) 
-            (term (letrec ([(ref x) ("nil")]) z)))
-
-(test-equal 
- (term (CMT/r (letrec ([(ref x) (κ hole)]) 
-                (κ hole))))
- (term (letrec ([(ref x) ,TL-empty-cont])
-         ,TL-empty-cont)))
-
-(test-equal (term (CMT/r (call/cc f)))
-            (term (f ((ref kont/ms) (c-c-m [("square") ("diamond")])))))
-
-(test-equal (term (CMT/r (match (κ hole) [("nil") (κ hole)]))) 
-            (term (match ,TL-empty-cont
-                    [("nil") ,TL-empty-cont])))
-
-;; Contexts
-(test-equal (term (CMT/T hole)) (term hole))
-
-(test-equal (term (CMT/T ((ref f) (ref y) hole)))
-            (term ((λ (x) ((ref f) (ref y) x))
-                   (w-c-m ("square") (λ (x) ((ref f) (ref y) x))
-                          hole))))
-
-;; Compositions + Whole Programs
-(test-equal
- (term (CMT ((ref f) (ref y) (call/cc (λ (k) (k z))))))
- (term
-  ((λ (x) ((ref f) (ref y) x))
-   (w-c-m ("square") (λ (x) ((ref f) (ref y) x))
-          ((λ (k) (k z))
-           ((ref kont/ms) (c-c-m [("square") ("diamond")])))))))
-
-;; Sub-units of big test
-(test-equal (term (CMT ((ref +) ,(num 1) tmp)))
-            (term ((ref +) ,(num 1) tmp)))
-
-;;; Running the resulting programs
-(define (CMT--> sl-version expected-ans)  
-  (define tl-version
-    (term (translate ,sl-version)))
-  (test-TL-result
-   (make-store [= ,=-impl] 
-               [+ ,+-impl]
-               [- ,--impl]
-               [* ,*-impl]
-               [if ,if-impl]) 
-   ,tl-version
-   ,expected-ans))
-
-(CMT--> `(call/cc (λ (k) 
-                    ((λ (tmp) ((ref +) ,(num 2) tmp))
-                     (k ,(num 3)))))
-        (num 3))
-(CMT--> `((λ (tmp) ((ref +) ,(num 1) tmp))
-          (call/cc (λ (k) 
-                     ((λ (tmp) ((ref +) ,(num 2) tmp))
-                      (k ,(num 3))))))
-        (num 4))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/CMT.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/CMT.rkt
deleted file mode 100644
index 750e5bbe17..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/CMT.rkt
+++ /dev/null
@@ -1,232 +0,0 @@
-#lang racket
-
-(require "SL-syntax.rkt"
-         "SL-semantics.rkt"
-         "TL-syntax.rkt"
-         redex)
-
-(provide CMT translate
-         TL-equal? TL-reverse 
-         map-set c-w-i-c-m
-         restore-marks resume
-         CMT/a CMT/r CMT/T)
-
-(define-metafunction SL
-  [(CMT a) (CMT/a a)]
-  [(CMT (in-hole T r))
-   (in-hole (CMT/T T) (CMT/r r))])
-
-(define-metafunction SL
-  [(CMT/a x) x]
-  [(CMT/a σ) σ]
-  [(CMT/a (λ (x ...) e))
-   (λ (x ...) (CMT e))]
-  [(CMT/a (κ E))
-   (λ (x) (abort ((ref resume) v x)))
-   (where v (resume-marks E))
-   (where x ,(variable-not-in (term v) (term x)))]
-  [(CMT/a (K a ...))
-   (K (CMT/a a) ...)])
-
-(define-metafunction SL
-  [(CMT/r (a ...))
-   ((CMT/a a) ...)]
-  [(CMT/r (letrec ([σ w] ...) e))
-   (letrec ([σ (CMT/a w)] ...) (CMT e))]
-  [(CMT/r (w-c-m a ...))
-   (w-c-m (CMT/a a) ...)]
-  [(CMT/r (c-c-m [a ...]))
-   (c-c-m [(CMT/a a) ...])]
-  [(CMT/r (match a l ...))
-   (match (CMT/a a) (CMT/r l) ...)]
-  [(CMT/r [(K x ...) e])
-   [(K x ...) (CMT e)]]
-  [(CMT/r (abort e))
-   (abort (CMT e))]
-  [(CMT/r (call/cc w))
-   ((CMT/a w) ((ref kont/ms) (c-c-m [("square") ("diamond")])))])
-
-(define-metafunction SL
-  [(CMT/T hole) hole]
-  [(CMT/T (a ... T))
-   (v_K (w-c-m ("square") v_K (CMT/T T)))
-   (where (a_* ...) ((CMT/a a) ...))
-   (where x ,(variable-not-in (term (a_* ...)) (term x)))
-   (where v_K (λ (x) (a_* ... x)))]
-  [(CMT/T (w-c-m a_1 a_2 T))
-   (w-c-m a_1* a_2*
-          ((ref c-w-i-c-m)
-           ("diamond")
-           (λ (x_cms)
-             ((λ (x_cms’) 
-                (w-c-m ("diamond") x_cms’ any_T))
-              ((ref map-set) x_cms a_1* a_2*)))
-           ("nil")))
-   (where any_T (CMT/T T)) ; w-c-m case does not produce a T
-   (where a_1* (CMT/a a_1))
-   (where a_2* (CMT/a a_2))
-   (where (x_cms x_cms’) ,(variables-not-in (term (any_T a_1* a_2*)) '(cms cms’)))])
-
-(define-metafunction SL
-  [(resume-marks E) 
-   (resume-marks E #f ("nil"))]
-  
-  [(resume-marks hole k a_m)
-   ("cons" (frame-marks k a_m) ("nil"))]
-  [(resume-marks (w-c-m a_1 a_2 T) k a_m)
-   (resume-marks T k ("cons" ("cons" (CMT a_1) (CMT a_2)) a_m))]
-  [(resume-marks (a ... T) k a_m)
-   ("cons" (frame-marks k a_m)
-           (resume-marks T (λ (x) (a_* ... x)) ("nil")))
-   (where (a_* ...) ((CMT a) ...))
-   (where x ,(variable-not-in (term (a_* ...)) (term x)))])
-
-(define-metafunction SL
-  [(frame-marks #f a_m)
-   ("cons" ("cons" ("diamond") (reverse-marks a_m))
-           ("nil"))]
-  [(frame-marks v_k a_m)
-   ("cons" ("cons" ("diamond") (reverse-marks a_m))
-           ("cons" ("cons" ("square") v_k)
-                   ("nil")))])
-
-(define-metafunction SL
-  [(reverse-marks a)
-   (reverse-marks a ("nil"))]
-  [(reverse-marks ("nil") a) a]
-  [(reverse-marks ("cons" a_1 a_2) a_3)
-   (reverse-marks a_2 ("cons" a_1 a_3))])
-
-(define-metafunction SL
-  translate : e_1 -> (side-condition e_2 (TL-e? (term e_2)))
-  [(translate e)
-   (letrec ([(ref resume) ,resume]
-            [(ref restore-marks) ,restore-marks]
-            [(ref c-w-i-c-m) ,c-w-i-c-m]
-            [(ref map-set) ,map-set]
-            [(ref kont/ms) ,kont/ms]
-            [(ref equal?) ,TL-equal?]
-            [(ref reverse) ,TL-reverse])
-     (CMT e))])
-(define TL-e? (redex-match TL e))
-
-(define kont/ms
-  (term
-   (λ (m)
-     (λ (x)
-       (abort ((ref resume) m x))))))
-
-(define c-w-i-c-m
-  (term
-   (λ (k proc default-v)
-     ((λ (cms)
-        ((λ (reversed)
-           (proc
-            (match reversed
-              [("cons" _ rest)
-               (match rest
-                 [("cons" frame _)
-                  (match frame
-                    [("nil") default-v]
-                    [("cons" mark _)
-                     (match mark
-                       [("cons" _ value) value])])])])))
-         ((ref reverse) cms ("nil"))))
-      (c-c-m [k])))))
-
-(define map-set
-  (term
-   (λ (map k v)
-     (match map
-       [("nil") ("cons" ("cons" k v) ("nil"))]
-       [("cons" pair rest)
-        (match pair
-          [("cons" k’ v’)
-           ((λ (eq)
-              (match eq
-                [("true")
-                 ("cons" ("cons" k v) rest)]
-                [("false")
-                 ((λ (rest’) ("cons" pair rest’))
-                  ((ref map-set) rest k v))]))
-            ((ref equal?) k k’))])]))))
-
-(define restore-marks
-  (term
-   (λ (cms thnk)
-     (match cms
-       [("nil") (thnk)]
-       [("cons" cm cms)
-        (match cm
-          [("cons" m v)
-           (w-c-m m v
-                  ((ref restore-marks) cms thnk))])]))))
-
-(define resume
-  (term
-   (λ (l v)
-     (match l
-       [("nil") v]
-       [("cons" ms l)
-        (match ms
-          [("nil") ((ref resume) l v)]
-          [("cons" m ms)
-           (match m
-             [("cons" j u)
-              (match j
-                [("square")
-                 (match ms 
-                   [("nil") 
-                    (u (w-c-m ("square") u 
-                              ((ref resume) l v)))]
-                   ; How do you get a frame with both marks where square appears first?
-                   ; All frames not introduced by "runtime" calls are marked first with
-                   ; square (thus reported after any diamond mark), and `resume' seems
-                   ; to restore this invariant. Use randomized testing to investigate.
-                   [("cons" cms-mark _)
-                    (match cms-mark
-                      [("cons" _ cms)
-                       (u (w-c-m ("square") u
-                                 ((ref restore-marks) 
-                                  cms
-                                  (λ () 
-                                    (w-c-m ("diamond") cms ((ref resume) l v))))))])])]
-                [("diamond")
-                 (match ms
-                   [("nil")
-                    ((ref restore-marks)
-                     u
-                     (λ () (w-c-m ("diamond") u ((ref resume) l v))))]
-                   [("cons" kont-mark _)
-                    (match kont-mark
-                      [("cons" _ k)
-                       (k (w-c-m ("square") k
-                                 ((ref restore-marks)
-                                  u
-                                  (λ ()
-                                    (w-c-m ("diamond") u ((ref resume) l v))))))])])])])])]))))
-
-(define TL-equal?
-  (term
-   (λ (x y)
-     ((λ (cms)
-        ((λ (reversed)
-           (match reversed
-             [("cons" frame _)
-              (match frame
-                [("cons" _ rest)
-                 (match rest
-                   [("nil") ("true")]
-                   [("cons" _ __) ("false")])])]))
-         ((ref reverse) cms ("nil"))))
-      (w-c-m x ("")
-             (w-c-m y ("")
-                    (c-c-m [x y])))))))
-
-(define TL-reverse
-  (term
-   (λ (xs onto)
-     (match xs
-       [("nil") onto]
-       [("cons" x xs’)
-        ((ref reverse) xs’ ("cons" x onto))]))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-semantics-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-semantics-test.rkt
deleted file mode 100644
index 6067394d98..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-semantics-test.rkt
+++ /dev/null
@@ -1,376 +0,0 @@
-#lang racket
-
-(require "SL-syntax.rkt"
-         "SL-semantics.rkt"
-         "common.rkt"
-         "test-util.rkt"
-         redex)
-
-(test-SL-result
- ∅ 
- ((λ (x) ("S" x)) ("Z"))
- ("S" ("Z")))
-
-(test-SL-stuck ∅ ((λ (x) ("S" x)) ("Z") ("Z")))
-
-(test-SL-result
- ∅
- (match ("a" ("1"))
-   [("a" x) x]
-   [("b" y) y])
- ("1"))
-
-(test-SL-result
- ∅
- (match ("b" ("1"))
-   [("a" x) x]
-   [("b" y) y])
- ("1"))
-
-(test-SL-stuck
- ∅
- (match ("a" ("1"))
-   [("a" x) x]
-   [("a" y) y]))
-
-(test-SL-result
- ∅
- (letrec ([(ref build-list)
-           (λ (n f)
-             (match n
-               [("Z") ("nil")]
-               [("S" m) 
-                ((λ (x)
-                   ((λ (xs) ("cons" x xs))
-                    ((ref build-list) m f)))
-                 (f m))]))])
-   ((ref build-list) ("S" ("S" ("S" ("Z")))) (λ (i) ("S" i))))
- ("cons" ("S" ("S" ("S" ("Z"))))
-         ("cons" ("S" ("S" ("Z")))
-               ("cons" ("S" ("Z"))
-                     ("nil")))))
-
-(test-SL-result
- ∅
- ((λ (clobber)
-    ((λ (a)
-       ((λ (b) (a))
-        (clobber ("b"))))
-     (clobber ("a"))))
-  (λ (x)
-    (letrec ([(ref y) (λ () x)])
-      (ref y))))
- ("b"))
-
-(test-SL-result
- ∅
- (letrec ([(ref x) ("S" ("Z"))])
-   (match (ref x)
-     [("Z") ("a")]
-     [("S" _) ("b")]))
- ("b"))
-
-(test-SL-result
- ∅
- (w-c-m ("a") ("1")
-        ((λ (x) x)
-         (w-c-m ("a") ("2")
-                (c-c-m [("a")]))))
- ("cons"
-  ("cons" ("cons" ("a") ("1")) ("nil"))
-  ("cons" ("cons" ("cons" ("a") ("2")) ("nil"))
-          ("nil"))))
-
-(test-SL-result
- ∅
- (w-c-m ("a") ("1")
-        (w-c-m ("b") ("2")
-               (c-c-m [("a") ("b")])))
- ("cons" ("cons" ("cons" ("b") ("2"))
-                 ("cons" ("cons" ("a") ("1")) ("nil")))
-         ("nil")))
-
-(test-SL-result
- ∅
- (w-c-m ("a") ("1")
-        (w-c-m ("b") ("2")
-               (c-c-m [("b") ("a")])))
- ("cons" ("cons" ("cons" ("b") ("2"))
-                 ("cons" ("cons" ("a") ("1")) ("nil")))
-         ("nil")))
-
-(test-SL-result
- ∅
- (w-c-m ("a") ("1")
-        (c-c-m [("b") ("a")]))
- ("cons" ("cons" ("cons" ("a") ("1")) ("nil"))
-         ("nil")))
-
-(test-SL-result
- ∅
- (w-c-m ("a") ("1") 
-        ((λ (x) x)
-         ((λ (x) x)
-          ((λ (x) x)
-           (w-c-m ("a") ("2")
-                  (w-c-m ("b") ("1")
-                         (c-c-m [("a") ("b")])))))))
- ("cons"
-  ("cons" ("cons" ("a") ("1")) ("nil"))
-  ("cons" ("nil")
-          ("cons" ("nil")
-                  ("cons"
-                   ("cons"
-                    ("cons" ("b") ("1"))
-                    ("cons" ("cons" ("a") ("2"))
-                            ("nil")))
-                   ("nil"))))))
-
-(test-SL-result
- ∅
- (w-c-m ("a") ("1") 
-        ((λ (x) x)
-         (c-c-m [("a")])))
- ("cons"
-  ("cons" ("cons" ("a") ("1")) ("nil"))
-  ("cons" ("nil") ("nil"))))
-
-(test-SL-result
- ∅
- ((λ (_)
-    ((λ (x) (x x))
-     (λ (x) (x x))))
-  (abort ("Z")))
- ("Z"))
-
-(test-SL-result
- ∅
- ((λ (x)
-    (match x
-      [("Z") ("a")]
-      [("S" _) ("b")]))
-  (call/cc
-   (λ (k)
-     ((λ (_)
-        ((λ (x) (x x))
-         (λ (x) (x x))))
-      (k ("Z"))))))
- ("a"))
-
-(test-SL-result
- ∅
- ((λ (x) ("S" ("S" x)))
-  (letrec ([(ref k) (κ ((λ (x) ("S" x)) hole))])
-    ((ref k) ("Z"))))
- ("S" ("Z")))
-
-(test-SL-result
- ∅
- ((λ (x)
-    (match ("b" x)
-      [("b" x) x]))
-  ("a"))
- ("a"))
-
-(test-->>
- -->SL
- #:cycles-ok
- (term
-  (∅
-   /
-   ((λ (t) (t t))
-    (call/cc (λ (x) (call/cc x)))))))
-
-;; fact
-(define fact-impl
-   `(λ (n)
-      ,(:if `((ref =) n ,(num 0))
-            (:let 'marks '(c-c-m [("fact")])
-                  '(abort marks))
-            `(w-c-m ("fact") n
-                  ,(:let 'sub1-fact
-                         (:let 'sub1 `((ref -) n ,(num 1))
-                               `((ref fact) sub1))
-                         `((ref *) n sub1-fact))))))
- (define fact-tr-impl
-   `(λ (n a)
-      ,(:if `((ref =) n ,(num 0))
-            (:let 'marks '(c-c-m [("fact")])
-                  '(abort marks))
-            `(w-c-m ("fact") n
-                    ,(:let 'sub1 `((ref -) n ,(num 1))
-                           (:let 'multa `((ref *) n a)
-                                 `((ref fact-tr) sub1 multa)))))))
- (define (test-fact n)
-   (test-SL-result
-    ∅
-    ,(with-arith
-      `(letrec ([(ref fact) ,fact-impl])
-         ((ref fact) ,(num n))))
-    ,(lst (append (build-list n (λ (i) (term ("cons" ("cons" ("fact") ,(num (- n i))) ("nil")))))
-                  (list (term ("nil")) ; frame computing 1 * fact(0)
-                        (term ("nil"))))))) ; frame that names c-c-m result
- (define (test-fact-tr n)
-   (test-SL-result
-    ∅
-    ,(with-arith
-      `(letrec ([(ref fact-tr) ,fact-tr-impl])
-         ((ref fact-tr) ,(num n) ,(num 1))))
-    ,(lst (list (term ("cons" ("cons" ("fact") ,(num 1)) ("nil")))
-                (term ("nil")))))) ; frame that names c-c-m result
- (for ([i (in-range 1 4)]) (test-fact i))
- (for ([i (in-range 1 4)]) (test-fact-tr i))
-
-;;; Values
-(test-->> -->SL
-          '(∅ / (λ (x) x))
-          '(∅ / (λ (x) x)))
-(test-->> -->SL
-          '(∅ / ("nil"))
-          '(∅ / ("nil")))
-(test-->> -->SL
-          '(∅ / ("S" ("0")))
-          '(∅ / ("S" ("0"))))
-(test-->> -->SL
-          '(∅ / (ref x))
-          '(∅ / (ref x)))
-
-;;; Applications
-(test-->> -->SL 
-          '(∅ / ((λ (x) x) ("nil")))
-          '(∅ / ("nil")))
-
-;;; Store applications
-(test-->> -->SL
-          '((∅ [(ref x) ↦ (λ (x) ("nil"))])
-            /
-            ((ref x) ("0")))
-          '((∅ [(ref x) ↦ (λ (x) ("nil"))])
-            /
-            ("nil")))
-
-;;; Letrec
-(test-->> -->SL
-          '(∅ / (letrec ([(ref x) (λ (x) ("nil"))])
-                  ("foo")))
-          '((∅ [(ref x) ↦ (λ (x) ("nil"))])
-            /
-            ("foo")))
-(test-->> -->SL
-          '(∅ / (letrec ([(ref x) (λ (x) ("nil"))])
-                  ((ref x) ("0"))))
-          '((∅ [(ref x) ↦ (λ (x) ("nil"))])
-            /
-            ("nil")))
-
-;;; match
-(test-->> -->SL
-          '(∅ / (match ("S" ("0"))
-                  [("S" n) n]
-                  [("0") ("0")]))
-          '(∅ / ("0")))
-(test-->> -->SL
-          '(∅ / (match ("S" ("0"))
-                  [("0") ("0")]
-                  [("S" n) n]))
-          '(∅ / ("0")))
-
-; Store match
-(test-->> -->SL
-          '(∅ / (letrec ([(ref x) ("S" ("0"))])
-                  (match (ref x)
-                    [("S" n) n]
-                    [("0") ("0")])))
-          '((∅ [(ref x) ↦ ("S" ("0"))])
-            /
-            ("0")))
-
-;; w-c-m
-(test-->> -->SL
-          `(∅ / (w-c-m ("k") ,(num 1) ,(num 2)))
-          `(∅ / ,(num 2)))
-(test-->> -->SL
-          `(∅ / (w-c-m ("k") ,(num 1) (w-c-m ("k") ,(num 3) ,(num 2))))
-          `(∅ / ,(num 2)))
-(test-->> -->SL
-          `(∅ / (w-c-m ("k") ,(num 1) ((λ (x) x) ,(num 2))))
-          `(∅ / ,(num 2)))
-
-;; c-c-m
-(test-->> -->SL
-          `(∅ / (c-c-m [("k")]))
-          `(∅ / ("cons" ("nil") ("nil"))))
-(test-->> -->SL
-          `(∅ / (w-c-m ("k") ,(num 1) (c-c-m [("k")])))
-          `(∅ / ("cons" ("cons" ("cons" ("k") ,(num 1)) ("nil")) ("nil"))))
-(test-->> -->SL
-          `(∅ / (w-c-m ("k") ,(num 1) (w-c-m ("k") ,(num 2) (c-c-m [("k")]))))
-          `(∅ / ("cons" ("cons" ("cons" ("k") ,(num 2)) ("nil")) ("nil"))))
-(test-->> -->SL
-          `(∅ / (w-c-m ("k") ,(num 1) ((λ (x) x) (w-c-m ("k") ,(num 2) (c-c-m [("k")])))))
-          `(∅ / ("cons" ("cons" ("cons" ("k") ,(num 1)) ("nil"))
-                        ("cons" ("cons" ("cons" ("k") ,(num 2)) ("nil"))
-                                ("nil")))))
-
-(test-->> -->SL
-          `(∅ / (w-c-m ("k1") ,(num 1) (c-c-m [("k1") ("k2")])))
-          `(∅ / ("cons" ("cons" ("cons" ("k1") ,(num 1)) ("nil")) ("nil"))))
-(test-->> -->SL
-          `(∅ / (w-c-m ("k1") ,(num 1) (w-c-m ("k2") ,(num 2) (c-c-m [("k1") ("k2")]))))
-          `(∅ / ("cons" ("cons" ("cons" ("k2") ,(num 2))
-                                ("cons" ("cons" ("k1") ,(num 1))
-                                        ("nil")))
-                        ("nil"))))
-
-;; abort
-(test-->> -->SL
-          `(∅ / (abort ,(num 2)))
-          `(∅ / ,(num 2)))
-(test-->> -->SL
-          `(∅ / ((λ (x) x) (abort ,(num 2))))
-          `(∅ / ,(num 2)))
-
-;; arith
-(test-->> -->SL
-          `(∅ / ,(:let 'x (num 1) 'x))
-          `(∅ / ,(num 1)))
-(test-SL-result ∅ ,(with-arith (num 1)) ,(num 1))
-(test-SL-result ∅ ,(with-arith `((ref +) ,(num 1) ,(num 1))) ,(num 2))
-(test-SL-result ∅ ,(with-arith `((ref *) ,(num 2) ,(num 2))) ,(num 4))
-(test-SL-result ∅ ,(with-arith `((ref =) ,(num 2) ,(num 2))) ("#t"))
-(test-SL-result ∅ ,(with-arith `((ref =) ,(num 2) ,(num 3))) ("#f"))
-(test-SL-result ∅ ,(with-arith `((ref -) ,(num 3) ,(num 2))) ,(num 1))
-(test-SL-result ∅ ,(with-arith (:if '("#t") (num 1) (num 2))) ,(num 1))
-(test-SL-result ∅ ,(with-arith (:if '("#f") (num 1) (num 2))) ,(num 2))
-
-;; call/cc
-(test-->> -->SL
-          `(∅ / (call/cc (λ (k) (k ("v")))))
-          `(∅ / ("v")))
-(test-->> -->SL
-          `(∅ / (call/cc (λ (k) 
-                           ((λ (x) ("x"))
-                            (k ("v"))))))
-          `(∅ / ("v")))
-
-;; call/cc + w-c-m
-(test-->> -->SL
-          `(∅ / (w-c-m ("k") ("v1")
-                       ((λ (f) (f ("unit")))
-                        (call/cc (λ (k)
-                                   (w-c-m ("k") ("v2")
-                                          (k (λ (x) (c-c-m [("k")])))))))))
-          `(∅ / ("cons" ("cons" ("cons" ("k") ("v1")) ("nil")) ("nil"))))
-
-(test-->> -->SL
-          `(∅ / (w-c-m ("k") ("v1")
-                     ((λ (f) (f ("unit")))
-                      (call/cc (λ (k)
-                                 (w-c-m ("k") ("v2")
-                                      ((λ (cms)
-                                         (k (λ (x) cms)))
-                                       (c-c-m [("k")]))))))))
-          `(∅ / ("cons" ("cons" ("cons" ("k") ("v1")) ("nil"))
-                        ("cons" ("cons" ("cons" ("k") ("v2")) ("nil"))
-                                ("cons" ("nil")
-                                        ("nil"))))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-semantics.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-semantics.rkt
deleted file mode 100644
index e3cedb9e4f..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-semantics.rkt
+++ /dev/null
@@ -1,126 +0,0 @@
-#lang racket
-
-(require "SL-syntax.rkt"
-         redex)
-(provide -->SL χ)
-
-(define -->SL
-  (reduction-relation
-   SL #:domain (Σ / e)
-   (--> (Σ / (in-hole E ((λ (x ..._1) e) v ..._1)))
-        (Σ / (in-hole E (subst-n (x v) ... e)))
-        "1")
-   (--> (Σ / (in-hole E (match (K v ...) l ...)))
-        (Σ / (in-hole E (subst-n (x v) ... e)))
-        ; The match must be unique, according to Fig. 5
-        (where ([(K x ...) e]) (matches (K v ...) l ...))
-        "2")
-   (--> (Σ / (in-hole E (letrec ([σ v] ...) e)))
-        ((store-set Σ [σ ↦ v] ...) / (in-hole E e))
-        "3")
-   (--> (Σ / (in-hole E (σ v ...)))
-        (Σ / (in-hole E (subst-n (x v) ... e)))
-        (where (λ (x ...) e) (store-lookup Σ σ))
-        (side-condition (= (length (term (v ...))) (length (term (x ...)))))
-        "4")
-   (--> (Σ / (in-hole E_1 (σ v)))
-        (Σ / (in-hole E_2 v))
-        (where (κ E_2) (store-lookup Σ σ))
-        "4’")
-   (--> (Σ / (in-hole E (match σ l ...)))
-        (Σ / (in-hole E (match (store-lookup Σ σ) l ...)))
-        "5")
-   (--> (Σ / (in-hole E (w-c-m v_k v_1
-                               (in-hole C (w-c-m v_k v_2 e)))))
-        (Σ / (in-hole E (w-c-m v_k v_2 (in-hole C e))))
-        (side-condition (term (no-dup-keys C (v_k))))
-        "6")
-   (--> (Σ / (in-hole E (w-c-m v_k v_1 v_2)))
-        (Σ / (in-hole E v_2))
-        "7")
-   (--> (Σ / (in-hole E (c-c-m [v ...])))
-        (Σ / (in-hole E (χ (v ...) E ("nil"))))
-        "8")
-   (--> (Σ / (in-hole E (abort e)))
-        (Σ / e)
-        "9")
-   (--> (Σ / (in-hole E (call/cc v)))
-        (Σ / (in-hole E (v (κ E))))
-        "*")
-   (--> (Σ / (in-hole E_1 ((κ E_2) v)))
-        (Σ / (in-hole E_2 v))
-        "#")))
-
-(define-metafunction SL
-  [(matches (K v ...)) ()]
-  [(matches 
-    (K v ..._1)
-    [(K x ..._1) e]
-    l ...)
-   ([(K x ...) e] l_i ...)
-   (where (l_i ...) (matches (K v ...) l ...))]
-  [(matches 
-    (K v ..._1)
-    l_0 l_1 ...)
-   (l_i ...)
-   (where (l_i ...) (matches (K v ...) l_1 ...))])
-
-(define-metafunction SL
-  [(store-set Σ) Σ]
-  [(store-set Σ [σ_0 ↦ v_0] [σ_1 ↦ v_1] ...)
-   (store-set (Σ [σ_0 ↦ v_0]) [σ_1 ↦ v_1] ...)])
-
-(define-metafunction SL
-  [(store-lookup (Σ [σ ↦ v]) σ) v]
-  [(store-lookup (Σ [σ_1 ↦ v]) σ_2)
-   (store-lookup Σ σ_2)])
-
-(define-metafunction SL
-  [(χ (v_0 ...) E)
-   (χ (v_0 ...) E ("nil"))]
-  [(χ (v_0 ...) hole v_l) ("cons" v_l ("nil"))]
-  [(χ (v_0 ...) (v_i ... E) v_l)
-   ("cons" v_l (χ (v_0 ...) E ("nil")))]
-  [(χ (v_0 ... v_k v_k+1 ...) (w-c-m v_k v_v E) v_l)
-   (χ (v_0 ... v_k v_k+1 ...) E ("cons" ("cons" v_k v_v) v_l))]
-  [(χ (v_0 ...) (w-c-m v_k v_v E) v_l)
-   (χ (v_0 ...) E v_l)])
-
-(define-metafunction SL
-  [(subst-n (x_1 any_1) (x_2 any_2) ... any_3)
-   (subst x_1 any_1 (subst-n (x_2 any_2) ... any_3))]
-  [(subst-n any_3) any_3])
-
-(define-metafunction SL
-  ;; x_1 bound, so don't continue in body 
-  [(subst x_1 any_1 (λ (x_2 ... x_1 x_3 ...) any_2))
-   (λ (x_2 ... x_1 x_3 ...) any_2)]
-  ;; general purpose capture avoiding case 
-  [(subst x_1 any_1 (λ (x_2 ...) any_2))
-   (λ (x_new ...) (subst x_1 any_1 (subst-vars (x_2 x_new) ... any_2)))
-   (where (x_new ...) ,(variables-not-in (term (x_1 any_1 any_2)) (term (x_2 ...))))]
-  ;; replace x_1 with e_1 
-  [(subst x_1 any_1 x_1) any_1]
-  ;; x_1 and x_2 are different, so don't replace 
-  [(subst x_1 any_1 x_2) x_2]
-  ;; match
-  [(subst x_1 any_1 (match a [(K_0 x_0 ...) e_0] ...))
-   (match (subst x_1 any_1 a)
-     [(K_0 x_0’ ...) e_0’] 
-     ...)
-   (where 
-    ((λ (x_0’ ...) e_0’) ...)
-    ((subst x_1 any_1 (λ (x_0 ...) e_0)) ...))]
-  ;; ref
-  [(subst x any σ) σ]
-  ;; the last cases cover all other expressions 
-  [(subst x_1 any_1 (any_2 ...)) ((subst x_1 any_1 any_2) ...)]
-  [(subst x_1 any_1 any_2) any_2])
-
-(define-metafunction SL
-  [(subst-vars (x_1 any_1) x_1) any_1]
-  [(subst-vars (x_1 any_1) (any_2 ...)) ((subst-vars (x_1 any_1) any_2) ...)]
-  [(subst-vars (x_1 any_1) any_2) any_2]
-  [(subst-vars (x_1 any_1) (x_2 any_2) ... any_3)
-   (subst-vars (x_1 any_1) (subst-vars (x_2 any_2) ... any_3))]
-  [(subst-vars any) any])
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-syntax.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-syntax.rkt
deleted file mode 100644
index b40fdff2b1..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-syntax.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket
-
-(require "TL-syntax.rkt"
-         redex)
-(provide SL no-dup-keys)
-
-(define-extended-language SL TL
-  (e ....
-     (call/cc w))
-  (v ....
-     (κ (hide-hole E)))
-  (a ....
-     (κ (hide-hole E)))
-  
-  (D (w-c-m v v D)
-     hole
-     (v ... D))
-  (E (side-condition D_1 (term (no-dup-keys D_1 ()))))
-  
-  ; used in the marks collapsing rule (6)
-  (C (w-c-m v v C)
-     hole)
-  
-  ; used in translation
-  (r (a ...)
-     (letrec ([σ w] ...) e)
-     (w-c-m a a a)
-     (c-c-m [a ...])
-     (match a l ...)
-     (abort e)
-     (call/cc e))
-  (T (w-c-m a a T)
-     hole
-     (a ... T))
-  (k v
-     #f))
-
-(define-metafunction SL
-  [(no-dup-keys hole (v ...)) 
-   #t]
-  [(no-dup-keys (w-c-m v_i v D) (v_0 ... v_i v_i+1 ...))
-   #f]
-  [(no-dup-keys (w-c-m v_i v D) (v_0 ...))
-   (no-dup-keys D (v_i v_0 ...))]
-  [(no-dup-keys (v ... D) (v_0 ...))
-   (no-dup-keys D ())])
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-semantics-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-semantics-test.rkt
deleted file mode 100644
index dc1730d102..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-semantics-test.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket
-
-(require "TL-semantics.rkt"
-         "common.rkt"
-         redex)
-
-(test-TL-result
- ∅
- ((λ (x) x) (λ (x) x))
- (λ (x) x))
-
-(test-TL-stuck
- ∅
- (call/cc (λ (x) x)))
-
-(test-predicate
- (curry regexp-match? #rx"not defined")
- (with-handlers ([exn:fail? exn-message])
-   (apply-reduction-relation
-    -->TL
-    (term (∅ / ((κ hole) (λ (x) x)))))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-semantics.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-semantics.rkt
deleted file mode 100644
index 673ce76f89..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-semantics.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket
-
-(require "TL-syntax.rkt"
-         "SL-syntax.rkt"
-         "SL-semantics.rkt"
-         redex)
-
-(provide -->TL)
-
-(define -->TL
-  (extend-reduction-relation
-   -->SL SL #:domain (Σ / (side-condition e_1 (TL-expr? (term e_1))))
-   (--> any any
-        (side-condition #f)
-        "*")
-   (--> any any
-        (side-condition #f)
-        "#")))
-(define TL-expr? (redex-match TL e))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-syntax.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-syntax.rkt
deleted file mode 100644
index 767bed49fb..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-syntax.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket
-
-(require redex)
-(provide TL)
-
-(define-language TL
-  (e a
-     (a ... e)
-     (letrec ([σ v] ...) e)
-     (w-c-m a a e)
-     (c-c-m [a ...])
-     (match a l ...)
-     (abort e))
-  
-  (l [(K x ...) e])
-  (a (λ (x ...) e)
-     σ
-     x
-     (K a ...))
-  (w v
-     x)
-  (v (λ (x ...) e)
-     (K v ...)
-     σ)
-  
-  (x variable-not-otherwise-mentioned)
-  (σ (ref variable))
-  
-  (Σ ∅
-     (Σ [σ ↦ v]))
-  
-  (K string))
-
-
-
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/all-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/all-test.rkt
deleted file mode 100644
index 5e2fbaa1d9..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/all-test.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket
-
-(require "TL-semantics-test.rkt"
-         "SL-semantics-test.rkt"
-         "CMT-test.rkt"
-         redex/reduction-semantics)
-
-(test-results)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/common.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/common.rkt
deleted file mode 100644
index a81fc51e6c..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/common.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang racket
-
-(require "SL-syntax.rkt" "SL-semantics.rkt"
-         "TL-syntax.rkt" "TL-semantics.rkt"
-         redex)
-
-(define ((make-eval --> value?) program)
-  (match (unique-normal-form program -->)
-    [(and state `(,_ / ,expr))
-     (if (value? expr)
-         (term (answer ,expr))
-         (raise (eval-undefined "stuck" (current-continuation-marks) program state)))]))
-(define-struct (eval-undefined exn:fail) (input stuck-state))
-(provide make-eval
-         (struct-out eval-undefined))
-
-(define-metafunction SL
-  [(answer (λ (x ...) e))
-   procedure]
-  [(answer (K v ...))
-   (K (answer v) ...)]
-  [(answer σ)
-   reference]
-  [(answer (κ E))
-   procedure])
-
-(define (unique-normal-form t R)
-  (match (let ([nfs '()]
-               [seen (set)])
-           (let recur ([u t] [s (max-normalization-steps)])
-             (when (negative? s)
-               (raise (normalization-timeout "too many steps" (current-continuation-marks))))
-             (unless (set-member? seen u)
-               (set! seen (set-add seen u))
-               (match (apply-reduction-relation R u)
-                 [(list) (set! nfs (cons u nfs))]
-                 [vs (for ([v vs]) (recur v (sub1 s)))])))
-           nfs)
-    [(list u) u]
-    [(list) (raise (normalization-timeout "no normal forms" (current-continuation-marks)))]
-    [_ (error 'unique-normal-form "distinct normal forms")]))
-(define max-normalization-steps (make-parameter +inf.0))
-(define-struct (normalization-timeout exn:fail) ())
-(provide max-normalization-steps
-         (struct-out normalization-timeout))
-
-(define-syntax (test-result stx)
-  (syntax-case stx ()
-    [(_ R Σ e v)
-     #`(match (unique-normal-form (term (Σ / e)) R)
-         [`(,_ / ,u)
-          #,(syntax/loc stx (test-equal u (term v)))])]))
-
-(define-syntax (test-stuck stx)
-  (syntax-case stx ()
-    [(_ R v? Σ e)
-     #`(match (unique-normal-form (term (Σ / e)) R)
-         [`(,_ / ,r)
-          #,(syntax/loc stx (test-predicate (negate v?) r))])]))
-
-(define-syntax-rule (define-test-forms language relation test-result-id test-stuck-id)
-  (begin
-    (define value? (redex-match language v))
-    (define-syntax-rule (test-result-id . args)
-      (test-result relation . args))
-    (define-syntax-rule (test-stuck-id . args)
-      (test-stuck relation value? . args))
-    (provide test-result-id test-stuck-id)))
-
-(define-test-forms SL -->SL test-SL-result test-SL-stuck)
-(define-test-forms TL -->TL test-TL-result test-TL-stuck)
-
-(define-metafunction SL
-  [(make-store) ∅]
-  [(make-store [any_1 any_2] any_3 ...)
-   ((make-store any_3 ...)
-    [(ref any_1) ↦ any_2])])
-(provide make-store)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/randomized-tests.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/randomized-tests.rkt
deleted file mode 100644
index e0b6f87f1d..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/randomized-tests.rkt
+++ /dev/null
@@ -1,235 +0,0 @@
-#lang racket
-
-(require "SL-syntax.rkt" "SL-semantics.rkt"
-         "TL-syntax.rkt" "TL-semantics.rkt"
-         "CMT.rkt"
-         "common.rkt"
-         redex/reduction-semantics)
-(provide main same-result?)
-
-(define (main . args)
-  (define seed (add1 (random (sub1 (expt 2 31)))))
-  (define unique-decomp-tests #f)
-  (define CMT-range-all-tests #f)
-  (define CMT-range-rules-tests #f)
-  (define same-result-all-tests #f)
-  (define same-result-rules-tests #f)
-  
-  (command-line
-   #:argv args
-   #:once-each
-   ["--seed"
-    n
-    "Seed PRG with n"
-    (set! seed (string->number n))]
-   ["--unique-decomposition"
-    n
-    "Test unique decomposition of n expressions"
-    (set! unique-decomp-tests (string->number n))]
-   ["--CMT-range"
-    n
-    ("Test that CMT produces a TL expression for n expressions,"
-     "chosen from SL's e non-terminal")
-    (set! CMT-range-all-tests (string->number n))]
-   ["--CMT-range-rules"
-    n
-    ("Test that CMT produces a TL expression for n expressions,"
-     "chosen from the left-hand sides of -->SL")
-    (set! CMT-range-rules-tests (string->number n))]
-   ["--same-result"
-    n
-    ("Test that translation preserves meaning for n expression,"
-     "chosen from SL's e non-terminal")
-    (set! same-result-all-tests (string->number n))]
-   ["--same-result-rules"
-    n
-    ("Test that translation preserves meaning for n expression,"
-     "chosen from SL's e non-terminal")
-    (set! same-result-rules-tests (string->number n))])
-  
-  (printf "Random seed: ~s\n" seed)
-  
-  (when unique-decomp-tests
-    (test-unique-decomposition unique-decomp-tests))
-  (when CMT-range-all-tests
-    (test-CMT-range CMT-range-all-tests))
-  (when CMT-range-rules-tests
-    (test-CMT-range/rules CMT-range-rules-tests))
-  (when same-result-all-tests
-    (test-same-result same-result-all-tests))
-  (when same-result-rules-tests
-    (test-same-result/rules same-result-rules-tests)))
-
-;; Unique decomposition
-(define (test-unique-decomposition attempts)
-  (redex-check SL e (uniquely-decomposes? (term e)) #:attempts attempts))
-
-(define uniquely-decomposes?
-  (let ([a? (redex-match SL a)]
-        [decompositions (redex-match SL (in-hole T r))])
-    (λ (e)
-      (or (a? e)
-          (match (decompositions e)
-            [(list _) #t]
-            [_ #f])))))
-
-;; CMT produces TL expressions
-(define (test-CMT-range attempts)
-  (test-translation CMT-produces-TL?
-                    #:attempts attempts))
-
-(define (test-CMT-range/rules attempts)
-  (test-translation CMT-produces-TL? 
-                    #:attempts attempts 
-                    #:source -->SL/no-side-conds))
-
-(define CMT-produces-TL?
-  (let ([TL-e? (redex-match TL e)])
-    (λ (e) 
-      (TL-e? (term (CMT ,e))))))
-
-;; Translated programs have the same result
-(define (test-same-result attempts)
-  (test-translation same-result? 
-                    #:attempts attempts))
-
-(define (test-same-result/rules attempts)
-  (test-translation same-result?
-                    #:attempts attempts
-                    #:source -->SL/no-side-conds))
-
-(define (same-result? expr)
-  (let/ec return
-    (define SL-result
-      (with-handlers ([normalization-timeout? return]
-                      [eval-undefined? return])
-        (parameterize ([max-normalization-steps 1000])
-          (SL-eval (term (∅ / ,expr))))))
-    (define TL-result
-      (dynamic-wind
-       (λ () (set-cache-size! 100))
-       (λ () (TL-eval (term (∅ / (translate ,expr)))))
-       (λ () (set-cache-size! 350))))
-    (or (equal? SL-result TL-result)
-        (compares-incomparable-keys? expr))))
-
-(define SL-eval
-  (make-eval -->SL (redex-match SL v)))
-(define TL-eval
-  (make-eval -->TL (redex-match TL v)))
-
-;; Utilities
-(define-syntax-rule (test-translation predicate . kw-args)
-  (redex-check SL-gen (Σ / e) 
-               (predicate (term e))
-               #:prepare close-program . kw-args))
-
-(define-extended-language SL-gen SL
-  (σ (ref (variable-except resume restore-marks c-w-i-c-m map-set kont/ms equal? last)))
-  (K (side-condition string_1 (not (member (term string_1) '("square" "diamond")))))
-  
-  (K-tree (K K-tree ...)))
-
-(define -->SL/no-side-conds
-  ; Disables side-conditions on some rules.
-  (extend-reduction-relation
-   -->SL SL
-   (--> (Σ / (in-hole E (match (K v ...) l ...))) any "2")
-   (--> (Σ / (in-hole E (σ v ...))) any "4")
-   (--> (Σ / (in-hole E_1 (σ v))) any "4’")))
-
-(define close-program
-  (match-lambda
-    [`(,Σ / ,e)
-     `(,Σ / ,(close-expr e))]))
-
-(define close-expr
-  (let ([var? (redex-match SL x)]
-        [val? (redex-match SL v)])
-    (λ (expr)
-      ; 1. Considers refs to be bound only within the binding letrec.
-      ; 2. Avoids adding duplicate mark to an existing frame, since 
-      ; doing so (a) can make a continuation value syntactically invalid
-      ; and (b) can change the reduction rule that applies
-      (let recur ([expr expr] [vars (set)] [refs (set)] [keys (set)])
-        (match expr
-          [(? var?)
-           (if (set-empty? vars)
-               (if (set-empty? refs)
-                   (random-constant)
-                   `(ref ,(random-element refs)))
-               (if (set-member? vars expr)
-                   expr
-                   (random-element vars)))]
-          [`(ref ,σ)
-           (if (set-empty? refs)
-               (random-constant)
-               (if (set-member? refs σ)
-                   expr
-                   `(ref ,(random-element refs))))]
-          [`(w-c-m ,k ,v ,e)
-           (define k’
-             (if (val? k)
-                 k
-                 (let retry ([candidate (recur k vars refs keys)]
-                             [retries 0])
-                   (when (> retries 3)
-                     (error 'close "too many"))
-                   (if (set-member? keys candidate)
-                       (retry (list (first (random-constant)) candidate)
-                              (add1 retries))
-                       candidate))))
-           (define ext-keys
-             (if (val? k’)
-                 (set-add keys k’)
-                 keys))
-           `(w-c-m ,k’ ,(recur v vars refs (set))
-                   ,(recur e vars refs ext-keys))]
-          [`(letrec ([(ref ,σs) ,es] ...) ,e)
-           (define ext-refs (extend refs σs))
-           `(letrec ,(for/list ([e es] [σ σs])
-                               `[(ref ,σ) ,(recur e vars ext-refs (set))])
-              ,(recur e vars ext-refs (set)))]
-          [`(match ,e [(,ks ,xss ...) ,es] ...)
-           (define ext-vars (extend vars (apply append xss)))
-           `(match ,(recur e vars refs (set))
-              ,@(for/list ([xs xss] [e es] [k ks])
-                  `[(,k ,@xs) ,(recur e ext-vars refs (set))]))]
-          [`(λ ,xs ,e)
-           (define ext-vars (extend vars xs))
-           `(λ ,xs ,(recur e ext-vars refs (set)))]
-          [(? list?)
-           (map (λ (e) (recur e vars refs (set))) expr)]
-          [_ expr])))))
-
-(define (extend s xs)
-  (for/fold ([s s]) ([x xs])
-            (set-add s x)))
-
-(define random-constant
-  (let ([generate-K-tree (generate-term SL-gen K-tree)])
-    (λ () (generate-K-tree (random 3)))))
-
-(define (random-element xs)
-  (list-ref (set-map xs values) (random (set-count xs))))
-
-(define (compares-incomparable-keys? expr)
-  (define procedure? (redex-match SL (λ (x ...) e)))
-  (define continuation? (redex-match SL (κ E)))
-  (let/ec return
-    (apply-reduction-relation*
-     (extend-reduction-relation 
-      -->SL SL
-      (--> (Σ / (in-hole E (c-c-m [v ...])))
-           ,(if (andmap comparable? (term (v ...)))
-                (term (Σ / (in-hole E (χ (v ...) E ("nil")))))
-                (return #t))
-           "8"))
-     `(∅ / ,expr))
-    #f))
-
-(define comparable?
-  (let ()
-    (define-extended-language SL’ SL
-      (c σ (K c ...)))
-    (redex-match SL’ c)))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/test-util.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/test-util.rkt
deleted file mode 100644
index 1619ad1ac8..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/test-util.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang racket
-
-(require "common.rkt" redex)
-(provide (all-defined-out))
-
-(define (num n)
-  (if (zero? n)
-      `("0")
-      `("S" ,(num (sub1 n)))))
-
-(define (lst l)
-  (if (empty? l)
-      `("nil")
-      `("cons" ,(first l) ,(lst (rest l)))))
-
-(define (:let name named-expr body)
-  `((λ (,name) ,body)
-    ,named-expr))
-
-(define =-impl
-  `(λ (x y)
-     (match x
-       [("0") 
-        (match y
-          [("0") ("#t")]
-          [("S" yn) ("#f")])]
-       [("S" xn)
-        (match y
-          [("0") ("#f")]
-          [("S" yn) ((ref =) xn yn)])])))
-
-(define +-impl
-  `(λ (x y)
-     (match x
-       [("0") y]
-       [("S" xn)
-        ,(:let 'in '((ref +) xn y)
-               '("S" in))])))
-
-(define --impl
-  `(λ (n m)
-     (match n
-       [("0") n]
-       [("S" k) 
-        (match m
-          [("0") n]
-          [("S" l) ((ref -) k l)])])))
-
-(define *-impl
-  `(λ (n m)
-     (match n
-       [("0") ("0")]
-       [("S" p) ,(:let 'tmp '((ref *) p m)
-                       '((ref +) m tmp))])))
-
-(define if-impl
-  `(λ (cond true false)
-     (match cond
-       [("#t") (true)]
-       [("#f") (false)])))
-
-(define (with-arith e)
-  `(letrec
-       ([(ref =) ,=-impl]
-        [(ref +) ,+-impl]
-        [(ref -) ,--impl]
-        [(ref *) ,*-impl]
-        [(ref if) ,if-impl])
-     ,e))
-
-(define arith-store
-  (term
-   (make-store [= ,=-impl] 
-               [+ ,+-impl]
-               [- ,--impl]
-               [* ,*-impl]
-               [if ,if-impl])))
-
-(define (:if cond true false)
-  (:let 'cond-val cond
-        `((ref if)
-          cond-val
-          (λ () ,true)
-          (λ () ,false))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/contracts.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/contracts.rkt
deleted file mode 100644
index 10cb4f90a7..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/contracts.rkt
+++ /dev/null
@@ -1,153 +0,0 @@
-#lang racket
-
-#|
-
-A core contract calculus, including blame, 
-with function contracts, (eager) pair contracts, 
-and a few numeric predicates
-
-|#
-
-(require redex/reduction-semantics
-         redex/examples/subst)
-
-(define-language lang
-  (e (e e ...)
-     x
-     number
-     (λ (x ...) e)
-     
-     (if e e e)
-     #t #f
-     
-     cons car cdr
-     
-     -> or/c
-     ac
-     pred?
-     (blame l)
-     l)
-  (pred? number?
-         odd?
-         positive?)
-  (E (v ... E e ...)
-     (if E e e)
-     hole)
-  (v number
-     (λ (x ...) e)
-     cons car cdr
-     (cons v v)
-     pred?
-     -> or/c ac
-     (-> v ...)
-     (or/c v ...)
-     #t #f
-     l)
-
-  (l + -) ;; blame labels
-  
-  (x variable-not-otherwise-mentioned))
-
-(define reds
-  (reduction-relation
-   lang
-   (--> (in-hole E ((λ (x ...) e) v ...))
-        (in-hole E (subst-n ((x v) ... e)))
-        (side-condition (= (length (term (x ...)))
-                           (length (term (v ...)))))
-        βv)
-   
-   (--> (in-hole E (if #t e_1 e_2)) (in-hole E e_1) ift)
-   (--> (in-hole E (if #f e_1 e_2)) (in-hole E e_2) iff)
-   
-   (--> (in-hole E (number? number)) (in-hole E #t))
-   (--> (in-hole E (number? v))
-        (in-hole E #f)
-        (side-condition (not (number? (term v)))))
-
-   (--> (in-hole E (car (cons v_1 v_2))) 
-        (in-hole E v_1))
-   (--> (in-hole E (cdr (cons v_1 v_2))) 
-        (in-hole E v_2))
-   
-   (--> (in-hole E (odd? number))
-        (in-hole E #t)
-        (side-condition (odd? (term number))))
-   (--> (in-hole E (odd? v))
-        (in-hole E #f)
-        (side-condition (or (not (number? (term v)))
-                            (not (odd? (term v))))))
-   
-   (--> (in-hole E (positive? number))
-        (in-hole E #t)
-        (side-condition (positive? (term number))))
-   (--> (in-hole E (positive? v))
-        (in-hole E #f)
-        (side-condition (or (not (number? (term v)))
-                            (not (positive? (term v))))))
-
-   
-   (--> (in-hole E (blame l)) 
-        (blame l)
-        (side-condition (not (equal? (term E) (term hole)))))
-   
-   (--> (in-hole E (ac pred? v l))
-        (in-hole E (if (pred? v) v (blame l))))
-   (--> (in-hole E (ac (-> v_dom ... v_rng) (λ (x ...) e) l))
-        (in-hole E (λ (x ...) (ac v_rng ((λ (x ...) e) (ac v_dom x l_2) ...) l)))
-        (where l_2 (¬ l)))
-   
-   (--> (in-hole E (ac (cons v_1 v_2) (cons v_3 v_4) l))
-        (in-hole E (cons (ac v_1 v_3 l) (ac v_2 v_4 l))))
-   
-   (--> (in-hole E (ac (or/c pred? v_1 v_2 ...) v_3 l))
-        (in-hole E (if (pred? v_3) 
-                       v_3
-                       (ac (or/c v_1 v_2 ...) v_3 l))))
-   (--> (in-hole E (ac (or/c v_1) v_2 l))
-        (in-hole E (ac v_1 v_2 l)))
-   ))
-
-(define-metafunction lang
-  [(¬ +) -]
-  [(¬ -) +])
-
-(test-->> reds (term ((λ (x y) x) 1 2)) 1)
-(test-->> reds (term ((λ (x y) y) 1 2)) 2)
-(test-->> reds (term (if (if #t #f #t) #f #t)) (term #t))
-(test-->> reds (term (positive? 1)) #t)
-(test-->> reds (term (positive? -1)) #f)
-(test-->> reds (term (positive? (λ (x) x))) #f)
-(test-->> reds (term (odd? 1)) #t)
-(test-->> reds (term (odd? 2)) #f)
-(test-->> reds (term (odd? (λ (x) x))) #f)
-(test-->> reds (term (car (cdr (cdr (cons 1 (cons 2 (cons 3 #f))))))) 3)
-
-(test-->> reds (term ((λ (x) x) (blame -))) (term (blame -)))
-(test-->> reds (term (ac number? 1 +)) 1)
-(test-->> reds (term (ac number? (λ (x) x) +)) (term (blame +)))
-(test-->> reds (term ((ac (-> number? number?) (λ (x) x) +) 1)) 1)
-(test-->> reds 
-         (term ((ac (-> number? number?) (λ (x) x) +) #f)) 
-         (term (blame -)))
-(test-->> reds 
-         (term ((ac (-> number? number?) (λ (x) #f) +) 1))
-         (term (blame +)))
-(test-->> reds
-         (term (ac (or/c odd? positive?) 1 +))
-         1)
-(test-->> reds
-         (term (ac (or/c odd? positive?) -1 +))
-         -1)
-(test-->> reds
-         (term (ac (or/c odd? positive?) 2 +))
-         2)
-(test-->> reds
-         (term (ac (or/c odd? positive?) -2 +))
-         (term (blame +)))
-
-(test-->> reds
-         (term (ac (cons odd? positive?) (cons 3 1) +))
-         (term (cons 3 1)))
-
-(test-results)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/multi-val.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/multi-val.rkt
deleted file mode 100644
index 2aaa776549..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/multi-val.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics)
-
-(define-language funny-pairs
-  (e (e e ...)
-     x
-     v)
-  (v (λ (x ...) e)
-     (pair v v)
-     pair
-     b
-     number)
-  (b fst
-     snd
-     one)
-  (E hole
-     (v ... E e ...))
-  (x variable-not-otherwise-mentioned))
-
-(define reduction
-  (reduction-relation
-   funny-pairs #:domain e
-   (--> (in-hole E ((λ (x ..._1) e) v ..._1))
-        (in-hole E (subst e [x v] ...)))
-   (--> (in-hole E (b v_1))
-        (in-hole E v_2)
-        (judgment-holds (δ b v_1 v_2)))))
-
-(define-judgment-form funny-pairs
-  #:mode (δ I I O)
-  [(δ fst (pair v_1 v_2) v_1)]
-  [(δ snd (pair v_1 v_2) v_2)]
-  [(δ one (pair v_1 v_2) v_1)]
-  [(δ one (pair v_1 v_2) v_2)])
-
-(define-metafunction funny-pairs
-  subst : e [x v] ... -> e
-  [(subst e) e]
-  [(subst e [x_1 v_1] [x_2 v_2] ...)
-   (subst (subst1 e x_1 v_1) [x_2 v_2] ...)])
-
-(define-metafunction funny-pairs
-  subst1 : e x v -> e
-  [(subst1 (e ...) x v)
-   ((subst1 e x v) ...)]
-  [(subst1 x x v) v]
-  [(subst1 x_1 x_2 v) x_1]
-  [(subst1 (λ (x_1 ... x_i x_i+1 ...) e) x_i v)
-   (λ (x_1 ... x_i x_i+1 ...) e)]
-  [(subst1 (λ (x_1 ...) e) x v)
-   ; capture shmapture...
-   (λ (x_1 ...) (subst1 e x v))]
-  [(subst1 pair x v) pair]
-  [(subst1 b x v) b])
-
-(test-->> reduction
-          (term (fst (pair 1 2)))
-          (term 1))
-(test-->> reduction
-          (term (snd (pair 1 2)))
-          (term 2))
-(test-->> reduction
-          (term (snd (λ (x) x)))
-          (term (snd (λ (x) x))))
-(test-->> reduction
-          (term (one (pair 1 2)))
-          (term 1)
-          (term 2))
-(test-->> reduction
-          (term ((one (pair fst snd))
-                 ((one (pair fst snd))
-                  (pair (pair 1 2) (pair 3 4)))))
-          (term 1)
-          (term 2)
-          (term 3)
-          (term 4))
-(test-->> reduction
-          (term ((λ (x) x) 1))
-          (term 1))
-(test-->> reduction
-          (term ((λ (x y) y) 1 2))
-          (term 2))
-(test-->> reduction
-          (term (((λ (x) (λ (x) x)) 1) 2))
-          (term 2))
-(test-->> reduction
-          (term (((λ (x) (λ (y) (x y))) (λ (z) z)) 1))
-          (term 1))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/sos.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/sos.rkt
deleted file mode 100644
index 810c84361c..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/sos.rkt
+++ /dev/null
@@ -1,138 +0,0 @@
-#lang racket
-
-(require redex)
-
-
-;                                                                        
-;                                                                        
-;                   ;;;    ;             ;             ;                 
-;   ;  ;           ;                           ;                         
-;   ;   ;   ;;;   ;;;;;  ;;;   ;; ;;   ;;;    ;;;;;  ;;;     ;;;  ;; ;;  
-;   ;   ;  ;   ;   ;       ;    ;;  ;    ;     ;       ;    ;   ;  ;;  ; 
-;   ;   ;  ;;;;;   ;       ;    ;   ;    ;     ;       ;    ;   ;  ;   ; 
-;   ;   ;  ;       ;       ;    ;   ;    ;     ;       ;    ;   ;  ;   ; 
-;   ;  ;   ;       ;       ;    ;   ;    ;     ;   ;   ;    ;   ;  ;   ; 
-;  ;;;;     ;;;;  ;;;;;  ;;;;; ;;; ;;; ;;;;;    ;;;  ;;;;;   ;;;  ;;; ;;;
-;                                                                        
-;                                                                        
-;                                                                        
-;                                                                        
-
-
-(define-language λv
-  (e (e e)
-     x
-     v)
-  (v (λ (x) e)
-     i
-     add1)
-  (i integer)
-  (x variable-not-otherwise-mentioned))
-
-(define-judgment-form λv
-  #:mode (small-step I O)
-  #:contract (small-step e e)
-  [(small-step ((λ (x) e) v) (subst e x v))]
-  [(small-step (add1 i) (δ add1 i))]
-  [(small-step (e_1 e_2) (e_1′ e_2))
-   (small-step e_1 e_1′)]
-  [(small-step (v e_2) (v e_2′))
-   (small-step e_2 e_2′)])
-
-(define-judgment-form λv
-  #:mode (small-step* I O)
-  #:contract (small-step* e e)
-  [(small-step* e e)]
-  [(small-step* e_1 e_3)
-   (small-step e_1 e_2)
-   (small-step* e_2 e_3)])
-
-(define-judgment-form λv
-  #:mode (eval I O)
-  #:contract (eval e e)
-  [(eval e v)
-   (small-step* e v)])
-
-(define-metafunction λv
-  [(δ add1 i) ,(add1 (term i))])
-
-(define-metafunction λv
-  subst : e x v -> e
-  [(subst (e_1 e_2) x v)
-   ((subst e_1 x v) (subst e_2 x v))]
-  [(subst x x v) v]
-  [(subst x_1 x_2 v) x_1]
-  [(subst (λ (x) e) x v)
-   (λ (x) e)]
-  [(subst (λ (x_1) e) x_2 v)
-   ; capture shmapture...
-   (λ (x_1) (subst e x_2 v))]
-  [(subst i x v) i]
-  [(subst add1 x v) add1])
-
-(test-equal (judgment-holds (eval (add1 (add1 (add1 0))) v) v) 
-            (list (term 3)))
-(test-equal (judgment-holds 
-             (eval (((λ (x) (λ (x) (x (add1 7)))) 0) add1)
-                   v)
-             v)
-            (list (term 9)))
-
-
-;                                                                               
-;                                                                               
-;                                                             ;                 
-;  ;  ;  ;                                     ;      ;                         
-;     ;   ;;; ;;;;; ;;    ;;;    ;;;;   ;;;   ;;;;;  ;;;;;  ;;;   ;; ;;    ;; ;;
-;     ;    ;   ;  ;;  ;  ;   ;  ;   ;  ;   ;   ;      ;       ;    ;;  ;  ;  ;; 
-;     ;     ;  ;  ;   ;  ;;;;;   ;;;   ;;;;;   ;      ;       ;    ;   ;  ;   ; 
-;     ;     ; ;   ;   ;  ;          ;  ;       ;      ;       ;    ;   ;  ;   ; 
-;     ;      ;;   ;   ;  ;      ;   ;  ;       ;   ;  ;   ;   ;    ;   ;  ;   ; 
-;    ;;;     ;    ;;;;    ;;;;  ;;;;    ;;;;    ;;;    ;;;  ;;;;; ;;; ;;;  ;;;; 
-;            ;    ;                                                           ; 
-;          ;;;;  ;;;                                                       ;;;  
-;                                                                               
-;                                                                               
-
-
-(define rewrite-subst
-  (match-lambda
-    [(list _ _ e x v _)
-     (list "" e "{" x ":=" v "}")]))
-(define rewrite-small-step
-  (match-lambda
-    [(list _ _ e1 e2 _)
-     (list "" e1 " → " e2)]))
-
-(with-compound-rewriters
- (['small-step rewrite-small-step]
-  ['subst rewrite-subst])
- (render-judgment-form small-step))
-
-
-;                                                   
-;                                                   
-;                                 ;                 
-;  ;  ;  ;                                          
-;     ;    ;; ;;   ;;;    ;;;;  ;;;   ;; ;;    ;; ;;
-;     ;     ;;    ;   ;  ;   ;    ;    ;;  ;  ;  ;; 
-;     ;     ;      ;;;;  ;        ;    ;   ;  ;   ; 
-;     ;     ;     ;   ;  ;        ;    ;   ;  ;   ; 
-;     ;     ;     ;   ;  ;   ;    ;    ;   ;  ;   ; 
-;    ;;;   ;;;;;   ;;;;;  ;;;   ;;;;; ;;; ;;;  ;;;; 
-;                                                 ; 
-;                                              ;;;  
-;                                                   
-;                                                   
-
-;; Relations defined with `define-judgment-form' do 
-;; not work directly with `traces', but they can be
-;; embedded within reduction relations.
-(define small-step-rr
-  (reduction-relation
-   λv
-   (--> e_1 e_2
-        (judgment-holds (small-step e_1 e_2)))))
-
-(define (trace-λv expr)
-  (traces small-step-rr expr))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/typing-rules-no-ellipses.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/typing-rules-no-ellipses.rkt
deleted file mode 100644
index 6eadfa91f1..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/typing-rules-no-ellipses.rkt
+++ /dev/null
@@ -1,102 +0,0 @@
-#lang racket
-
-(require redex/pict
-         redex/reduction-semantics)
-
-(provide (all-defined-out))
-
-;; This file makes some small changes to the system in
-;; typing-rules.rkt (in the same directory) to allow generation
-;; of terms that satisfy the "typeof" judgment-form.  Specifically,
-;; since generation doesn't yet support ellipses, they have to be
-;; eliminated from the judgment-form and the metafunctions it depends on.
-
-(define-language STLC
-  (e (λ (x τ) e)
-     (e e)
-     x
-     i
-     add1)
-  (τ int
-     (τ → τ))
-  (Γ ([x τ] Γ)
-     ())
-  (i integer)
-  (x variable-not-otherwise-mentioned))
-
-(define-judgment-form STLC
-  #:mode (typeof I I O)
-  #:contract (typeof Γ e τ)
-  
-  [(typeof ([x τ_1] Γ) e τ_2)
-   ------------------------------------
-   (typeof Γ (λ (x τ_1) e) (τ_1 → τ_2))]
-  
-  [(typeof Γ e_1 (τ_2 → τ))
-   (typeof Γ e_2 τ_2)
-   ------------------------
-   (typeof Γ (e_1 e_2) τ)]
-  
-  [(where τ (lookup Γ x))
-   --------------
-   (typeof Γ x τ)]
-  
-  [----------------
-   (typeof Γ i int)]
-  
-  [---------------------------
-   (typeof Γ add1 (int → int))])
-
-
-(define-metafunction STLC
-  lookup : Γ x -> τ
-  [(lookup ([x τ] Γ) x) 
-   τ]
-  [(lookup ([x_1 τ] Γ) x_0)
-   (lookup Γ x_0)]
-  [(lookup () x)
-   #f])
-
-(test-equal 
- (judgment-holds 
-  (typeof () 
-          (λ (x int) 
-            (λ (x (int → int))
-              (x (add1 7))))
-          τ)
-  τ)
- (list (term (int → ((int → int) → int)))))
-(test-equal 
- (judgment-holds
-  (typeof () 
-          (λ (x int)
-            (λ (x (int → int))
-              (add1 x)))
-          τ))
- #f)
-
-
-(define (random-typed-term)
-  (generate-term STLC
-                 #:satisfying
-                 (typeof () e τ)
-                 5))
-
-(define (random-typed-terms n)
-  (define gen-one (redex-generator STLC (typeof () e τ) 5))
-  (for/list ([_ n])
-    (extract-term-from-derivation 
-     (gen-one))))
-
-(define (extract-term-from-derivation t)
-  (match t
-    [`(typeof () ,e ,t)
-     ;; test to make sure the generator
-     ;; generated something that the 
-     ;; judgment form actually accepts
-     (define types (judgment-holds (typeof () ,e τ) τ))
-     (unless (= 1 (length types))
-       (error 'typeof "non-unique types: ~s in ~s\n" types e))
-     (test-equal (car types) t)
-     e]
-    [#f #f]))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/typing-rules.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/typing-rules.rkt
deleted file mode 100644
index 58eacd2d9a..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/typing-rules.rkt
+++ /dev/null
@@ -1,122 +0,0 @@
-#lang racket
-
-(require redex/pict
-         redex/reduction-semantics)
-
-
-;                                                                        
-;                                                                        
-;                   ;;;    ;             ;             ;                 
-;   ;  ;           ;                           ;                         
-;   ;   ;   ;;;   ;;;;;  ;;;   ;; ;;   ;;;    ;;;;;  ;;;     ;;;  ;; ;;  
-;   ;   ;  ;   ;   ;       ;    ;;  ;    ;     ;       ;    ;   ;  ;;  ; 
-;   ;   ;  ;;;;;   ;       ;    ;   ;    ;     ;       ;    ;   ;  ;   ; 
-;   ;   ;  ;       ;       ;    ;   ;    ;     ;       ;    ;   ;  ;   ; 
-;   ;  ;   ;       ;       ;    ;   ;    ;     ;   ;   ;    ;   ;  ;   ; 
-;  ;;;;     ;;;;  ;;;;;  ;;;;; ;;; ;;; ;;;;;    ;;;  ;;;;;   ;;;  ;;; ;;;
-;                                                                        
-;                                                                        
-;                                                                        
-;                                                                        
-
-
-(define-language STLC
-  (e (λ (x τ) e)
-     (e e)
-     x
-     i
-     add1)
-  (τ int
-     (τ → τ))
-  (Γ ([x τ] ...))
-  (i integer)
-  (x variable-not-otherwise-mentioned))
-
-(define-judgment-form STLC
-  #:mode (typeof I I O)
-  #:contract (typeof Γ e τ)
-  
-  [(typeof (extend Γ x τ_1) e τ_2)
-   ------------------------------------
-   (typeof Γ (λ (x τ_1) e) (τ_1 → τ_2))]
-  
-  [(typeof Γ e_1 (τ_2 → τ))
-   (typeof Γ e_2 τ_2)
-   ------------------------
-   (typeof Γ (e_1 e_2) τ)]
-  
-  [(where τ (lookup Γ x))
-   --------------
-   (typeof Γ x τ)]
-  
-  [----------------
-   (typeof Γ i int)]
-  
-  [----------------------------
-   (typeof Γ add1 (int → int))])
-
-(define-metafunction STLC
-  extend : Γ x τ -> Γ
-  [(extend ([x_0 τ_0] ... [x_i τ_i] [x_i+1 τ_i+1] ...) x_i τ)
-   ([x_0 τ_0] ... [x_i τ] [x_i+1 τ_i+1] ...)]
-  [(extend ([x_1 τ_1] ...) x_0 τ_0)
-   ([x_0 τ_0] [x_1 τ_1] ...)])
-
-(define-metafunction STLC
-  lookup : Γ x -> τ
-  [(lookup ([x_0 τ_0] ... [x_i τ_i] [x_i+1 τ_i+1] ...) x_i) 
-   τ_i])
-
-(test-equal 
- (judgment-holds 
-  (typeof () 
-          (λ (x int) 
-            (λ (x (int → int))
-              (x (add1 7))))
-          τ)
-  τ)
- (list (term (int → ((int → int) → int)))))
-(test-equal 
- (judgment-holds
-  (typeof () 
-          (λ (x int)
-            (λ (x (int → int))
-              (add1 x)))
-          τ))
- #f)
-
-
-;                                                                               
-;                                                                               
-;                                                             ;                 
-;  ;  ;  ;                                     ;      ;                         
-;     ;   ;;; ;;;;; ;;    ;;;    ;;;;   ;;;   ;;;;;  ;;;;;  ;;;   ;; ;;    ;; ;;
-;     ;    ;   ;  ;;  ;  ;   ;  ;   ;  ;   ;   ;      ;       ;    ;;  ;  ;  ;; 
-;     ;     ;  ;  ;   ;  ;;;;;   ;;;   ;;;;;   ;      ;       ;    ;   ;  ;   ; 
-;     ;     ; ;   ;   ;  ;          ;  ;       ;      ;       ;    ;   ;  ;   ; 
-;     ;      ;;   ;   ;  ;      ;   ;  ;       ;   ;  ;   ;   ;    ;   ;  ;   ; 
-;    ;;;     ;    ;;;;    ;;;;  ;;;;    ;;;;    ;;;    ;;;  ;;;;; ;;; ;;;  ;;;; 
-;            ;    ;                                                           ; 
-;          ;;;;  ;;;                                                       ;;;  
-;                                                                               
-;                                                                               
-
-
-(define rewrite-typeof
-  (match-lambda
-    [(list _ _ Γ e τ _)
-     (list "" Γ " ⊢ " e " : " τ)]))
-(define rewrite-extend
-  (match-lambda
-    [(list _ _ Γ x τ _)
-     (list "" Γ ", " x ":" τ)]))
-(define rewrite-lookup
-  (match-lambda
-    [(list _ _ Γ x _)
-     (list "" Γ "(" x ")")]))
-
-(with-compound-rewriters 
- (['typeof rewrite-typeof]
-  ['extend rewrite-extend]
-  ['lookup rewrite-lookup])
- (render-judgment-form typeof))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/README.txt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/README.txt
deleted file mode 100644
index cf44a9f695..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/README.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-This model is from the paper _Adding Delimited and Composable Control
-to a Production Programming Environment_ from ICFP 2007.
-
-To run the tests using the model:
----------------------------------
-
- 1. Open "test.rkt" in DrRacket
-
- 2. Change DrRacket's current language to "Use the language declared
-    in the source"
-
- 3. Click "Run"
-
-Afterward, in the REPL window that shows whether the tests passed, you
-can try your own expressions using the `show' function. The program
-`call/cc-loop' is helpfully defined, so that you can try
-
- (show call/cc-loop)
-
-
-To read the program:
---------------------
-
-After a quick look at "grammar.rkt", read "reduce.rkt". If you become
-interested in a metafunction, see "meta.rkt"
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/grammar.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/grammar.rkt
deleted file mode 100644
index 671a66e516..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/grammar.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Expression grammar:
-
-;; `core-grammar' is typeset for the paper, but `grammar'
-;; extends it with some standard things (such as arithmetic,
-;; assignment, and output) to make testing easier.
-
-(define-language core-grammar
-  ;; Expressions
-  ;;  Constrain `wcm' so that it can't
-  ;;  wrap an immediate `wcm':
-  (e m (wcm w m))
-  (m x v (e e ...) (begin e e) (% e e e) (dw x e e e)) 
-  
-  ;; Values
-  (v (list v ...) (λ (x ...) e) (cont v (hide-hole E)) (comp (hide-hole E))
-     dynamic-wind abort current-marks
-     cons u)
-  (n number)
-  
-  ;; Primitives that need a wcm wrapper:
-  (u call/cc call/comp call/cm)
-  
-  ;; Variables
-  (x (variable-except λ if begin set!
-                      call/cc cont 
-                      % call/comp abort comp
-                      dynamic-wind dw
-                      call/cm wcm current-marks
-                      zero? + print cons list first rest
-                      * <>))
-  
-  ;; `wcm' bindings
-  (w ((v v) ...))
-  
-  ;; Evaluation contexts
-  ;;  Constrain `wcm' so it can't wrap a `wcm'.
-  ;;  General evalation context:
-  (E W (in-hole W (dw x e E e)))
-  ;;  Evaluation context without `dw':
-  (W M (wcm w M))
-  (M hole (v ... W e ...) (begin W e) (% W e e) (% v e W) (% v W v))
-  ;; Context ending on a dw boundary:
-  (D hole (in-hole E (dw x e hole e))))
-
-(define-extended-language grammar core-grammar
-  
-  (p (<> s       ; store
-         (o ...) ; output
-         e))     ; expression
-  
-  (m ....
-     (if e e e)
-     (set! x e))
-  (v ....
-     n #f #t
-     zero? print + first rest)
-  
-  ;; Store
-  (s ([x v] ...))
-  
-  ;; Output
-  (o number)
-  
-  (M ....
-     (set! x W)
-     (if W e e)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Debugging:
-
-(define-syntax (define-language-predicates stx)
-  (syntax-case stx ()
-    [(_ id)
-     (with-syntax ([? (datum->syntax
-                       #'id
-                       (string->symbol (format "~s?" (syntax-e #'id)))
-                       #'id)])
-       #'(define ? (redex-match grammar id)))]
-    [(_ id ...)
-     #'(begin (define-language-predicates id) ...)]))
-
-(define-language-predicates p e x v E)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(provide core-grammar grammar
-         p? e? x? v? E?)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/meta.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/meta.rkt
deleted file mode 100644
index e72692115a..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/meta.rkt
+++ /dev/null
@@ -1,140 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics
-         "grammar.rkt")
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Substitution:
-
-(define-metafunction grammar
-  [(subst x_1 x_1 e_1) ; shortcut
-   e_1]
-  [(subst x_1 e_1 (λ (x_2 ... x_1 x_3 ...) e_2))
-   (λ (x_2 ... x_1 x_3 ...) e_2)]
-  [(subst x_1 x_2 (λ (x_3 ...) e_1)) ; shortcut; x_1 != any x_3
-   (λ (x_3 ...) (subst x_1 x_2 e_1))]
-  [(subst x_1 e_1 (λ (x_2 ...) e_2)) ; x_1 != any x_2
-   ,(term-let ([(x_new ...) (variables-not-in (term (x_1 e_1 e_2)) (term (x_2 ...)))])
-              (term (λ (x_new ...) 
-                      (subst x_1 e_1 (subst* (x_2 ...) (x_new ...) e_2)))))]
-  [(subst x_1 e_1 x_1) e_1]
-  [(subst x_1 e x_2) x_2] ; x_1 != x_2, since previous didn't match
-  [(subst x_1 e_1 v_1) v_1] ; all other values are atomic
-  [(subst x_1 e_1 (list v_1 ...)) (list (subst x_1 e_1 v_1) ...)]
-  [(subst x_1 e_1 (e_2 ...))
-   ((subst x_1 e_1 e_2) ...)]
-  [(subst x_1 e_1 (if e_2 e_3 e_4))
-   (if (subst x_1 e_1 e_2) 
-       (subst x_1 e_1 e_3)
-       (subst x_1 e_1 e_4))]
-  [(subst x_1 e_1 (begin e_2 e_3))
-   (begin (subst x_1 e_1 e_2) 
-          (subst x_1 e_1 e_3))]
-  [(subst x_1 e_1 (set! x_2 e_2))
-   (set! x_2 (subst x_1 e_1 e_2))]
-  [(subst x_1 e_1 (% e_2 e_3 e_4))
-   (% (subst x_1 e_1 e_2) 
-      (subst x_1 e_1 e_3) 
-      (subst x_1 e_1 e_4))]    
-  [(subst x_1 e_1 (wcm ((v_1 v_2) ...) e_2))
-   (wcm (((subst x_1 e_1 v_1)
-          (subst x_1 e_1 v_2)) ...)
-        (subst x_1 e_1 e_2))]
-  [(subst x_1 e_1 (dw x_2 e_2 e_3 e_4))
-   (dw x_2
-       (subst x_1 e_1 e_2) 
-       (subst x_1 e_1 e_3) 
-       (subst x_1 e_1 e_4))])
-
-(define-metafunction grammar
-  [(subst* () () e_1) e_1]
-  [(subst* (x_1 x_2 ...) (e_1 e_2 ...) e_3)
-   (subst* (x_2 ...) (e_2 ...) (subst x_1 e_1 e_3))])
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Other meta-functions:
-
-(define-metafunction grammar
-  [(noPrompt v_1 (% v_1 E v)) #f]
-  [(noPrompt v_1 (% v_2 E_1 v)) (noPrompt v_1 E_1)]
-  [(noPrompt v hole) #t]
-  [(noPrompt v_1 (v ... E_1 e ...)) (noPrompt v_1 E_1)]
-  [(noPrompt v_1 (if E_1 e_2 e_3)) (noPrompt v_1 E_1)]
-  [(noPrompt v_1 (begin E_1 e_2)) (noPrompt v_1 E_1)]
-  [(noPrompt v_1 (set! x E_1)) (noPrompt v_1 E_1)]
-  [(noPrompt v_1 (wcm w E_1)) (noPrompt v_1 E_1)]
-  [(noPrompt v_1 (dw x e_0 E_1 e_1)) (noPrompt v_1 E_1)]
-  [(noPrompt v_1 (% v_2 e E_1)) (noPrompt v_1 E_1)]
-  [(noPrompt v_1 (% E_1 e_1 e_2)) (noPrompt v_1 E_1)])
-
-(define-metafunction grammar
-  [(get-marks-core (in-hole hole hole) v e_2) e_2]
-  [(get-marks-core (wcm (name w_1 ((v_4 v_5) ... (v_1 v_3) (v_6 v_7) ...)) E_1) v_1 e_2) (get-marks E_1 v_1 (cons v_3 e_2))]
-  [(get-marks-core (wcm w_1 E_1) v_1 e_2) (get-marks E_1 v_1 e_2) (side-condition (term (notInDom v_1 w_1)))]
-  [(get-marks-core (v ... E_1 e ...) v_1 e_2) (get-marks E_1 v_1 e_2)]
-  [(get-marks-core (begin E_1 e) v_1 e_2) (get-marks E_1 v_1 e_2)]
-  [(get-marks-core (% v_2 E_1 v_3) v_1 e_2) (get-marks E_1 v_1 e_2)]
-  [(get-marks-core (% v_2 e_1 E_1) v_1 e_2) (get-marks E_1 v_1 e_2)]
-  [(get-marks-core (% E_1 e_1 e_3) v_1 e_2) (get-marks E_1 v_1 e_2)]
-  [(get-marks-core (dw x e_1 E_1 e_3) v_1 e_2) (get-marks E_1 v_1 e_2)])
-
-(define-metafunction grammar
-  [(get-marks (if E_1 e_1 e_3) v_1 e_2) (get-marks E_1 v_1 e_2)]
-  [(get-marks (set! x E_1) v_1 e_2) (get-marks E_1 v_1 e_2)]
-  [(get-marks E_1 v_1 e_2) (get-marks-core E_1 v_1 e_2)])
-
-(define-metafunction grammar
-  [(expose-wcm e_1) e_1 (side-condition (term (noMatchWCM e_1 (wcm w e))))]
-  [(expose-wcm (wcm () e_1)) e_1]
-  [(expose-wcm (wcm ((v_1 v_2) (v_3 v_4) ...) e_1))
-   (call/cm v_1 v_2 (λ () (expose-wcm (wcm ((v_3 v_4) ...) e_1))))])
-
-(define-metafunction grammar
-  [(sameDWs W_1 W_2) (True)]
-  [(sameDWs (in-hole W_1 (dw x_1 e_1 E_1 e_2)) 
-            (in-hole W_2 (dw x_1 e_1 E_2 e_2)))
-   (sameDWs E_1 E_2)]
-  [(sameDWs any_1 any_2) (False)])
-
-(define-metafunction grammar
-  [(noShared (in-hole W_1 (dw x_1 e_1 E_1 e_2))
-             (in-hole W_2 (dw x_1 e_1 E_2 e_2)))
-   (False)]
-  [(noShared any_1 any_2) (True)])
-
-(define-metafunction grammar
-  [(nonWCM (in-hole E (wcm w hole))) #f]
-  [(nonWCM any) #t])
-
-;; The rest are helpers that are typeset specially in the paper
-
-(define-metafunction grammar
-  [(noMatch E_1 any (% v_1 any_1 any_2)) (noPrompt v_1 E_1)]
-  [(noMatch E_1 any (wcm any_1 any_2)) (nonWCM E_1)])
-
-(define-metafunction grammar
-  [(noMatchWCM (wcm w e_1) any) #f]
-  [(noMatchWCM any_1 any_2) #t])
-
-(define-metafunction grammar
-  [(notIn v_1 (v_2 ...)) ,(not (member (term v_1) (term (v_2 ...))))])
-
-(define-metafunction grammar
-  [(notInDom v_1 ((v_2  v_3) ...)) (notIn v_1 (v_2 ...))])
-
-(define-metafunction grammar [(True) #t])
-(define-metafunction grammar [(False) #f])
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(provide subst subst*
-         noPrompt
-         get-marks get-marks-core
-         expose-wcm
-         sameDWs
-         noShared
-         nonWCM
-         noMatch
-         noMatchWCM
-         notIn
-         notInDom)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/model-impl.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/model-impl.rkt
deleted file mode 100644
index d9e7ec53ef..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/model-impl.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang racket
-
-(provide % abort call/comp call/cm current-marks
-         (rename-out [_call/cc call/cc]
-                     [_if if] 
-                     [_+ +]
-                     [_print print]
-                     [_cons cons]
-                     [_set! set!]
-                     [_zero? zero?]))
-
-(define tag
-  (let ([tags (make-hash)])
-    (λ (v)
-      (hash-ref tags v 
-                (λ ()
-                  (let ([t (make-continuation-prompt-tag)])
-                    (hash-set! tags v t)
-                    t))))))
-
-(define-syntax-rule (% tag-val expr handler)
-  (call-with-continuation-prompt 
-   (λ () expr)
-   (let ([v tag-val])
-     (if (let comparable? ([v v])
-           (cond [(procedure? v) #f]
-                 [(list? v) (andmap comparable? v)]
-                 [else #t]))
-         (tag v)
-         (raise-type-error '% "non-procedure" v)))
-   (let ([h handler])
-     (λ (x) (h x)))))
-
-(define (abort tag-val result) 
-  (abort-current-continuation (tag tag-val) result))
-
-(define ((force-unary f) x) (f x))
-
-(define (_call/cc proc tag-val)
-  (call/cc (compose proc force-unary) (tag tag-val)))
-
-(define (call/comp proc tag-val) 
-  (call-with-composable-continuation (compose proc force-unary) (tag tag-val)))
-
-(define (call/cm key val thunk)
-  (with-continuation-mark key val (thunk)))
-
-(define (current-marks key tag-val)
-  (continuation-mark-set->list 
-   (current-continuation-marks (tag tag-val))
-   key))
-
-(define-syntax-rule (_if e1 e2 e3)
-  (let ([v1 e1])
-    (case v1
-      [(#t) e2]
-      [(#f) e3]
-      [else (raise-type-error 'if "#t or #f" v1)])))
-
-(define (_+ x y) (+ x y))
-
-(define-syntax-rule (_set! x e)
-  (begin (set! x e) #f))
-
-(define (_zero? x)
-  (equal? 0 x))
-
-(define (_cons x xs)
-  (if (list? xs)
-      (cons x xs)
-      (raise-type-error 'cons "list?" 1 x xs)))
-
-(define (_print n)
-  (if (number? n)
-      (begin (print n) #f)
-      (raise-type-error 'print "number" n)))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/randomized-tests-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/randomized-tests-test.rkt
deleted file mode 100644
index 73cb51772c..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/randomized-tests-test.rkt
+++ /dev/null
@@ -1,156 +0,0 @@
-#lang racket
-
-(require "randomized-tests.rkt"
-         "reduce.rkt"
-         "grammar.rkt"
-         rackunit
-         (except-in redex/reduction-semantics plug))
-
-(define-syntax (test-transformation stx)
-  (syntax-case stx ()
-    [(_ program expected-output expected-result)
-     #`(match-let ([(answer actual-output actual-result)
-                    (model-eval (transform-intermediate (term program)))])
-         (begin
-           #,(syntax/loc #'expected-output
-               (check-equal? actual-output expected-output))
-           #,(syntax/loc #'expected-result
-               (check-equal? actual-result 'expected-result))))]))
-
-(test-transformation
- (<> ()
-     ()
-     (% 0
-        (wcm ()
-             ((λ (k)
-                (begin (k 7) (print 1)))
-              (cont 0 hole)))
-        (λ (x) x)))
- "" 7)
-
-(test-transformation
- (<> ()
-        ()
-        (cont 1 (begin hole (print 3))))
- "" procedure)
-
-(test-transformation
- (<> ()
-     ()
-     (% 0
-        (print
-         (wcm ()
-              ((λ (k) (begin (k 1) 2))
-               (comp (print hole)))))
-        (λ (x) x)))
- "12" #f)
-
-(test-transformation
- (<> ()
-     (1)
-     (% 1
-        (dw 
-         x_1
-         (print 1)
-         (wcm ()
-              ((λ (k) (k 3))
-               (cont 1 (dw x_1 (print 1) hole (print 2)))))
-         (print 2))
-        (λ (x) x)))
- "12" 3)
-
-(test-transformation
- (<> ()
-     (1)
-     (% 0
-        ((% 0
-            (dw
-             x_1
-             (print 1)
-             (wcm ()
-                  ((λ (k) k)
-                   (cont 0 (dw x_1  (print 1) hole (print 2)))))
-             (print 2))
-            (λ (x) x))
-         3)
-        (λ (x) x)))
- "1212" 3)
-
-(test-transformation
- (<> () []
-        (% 0
-           (wcm ([1 2] [3 4])
-                ((λ (x) x)
-                 (wcm ([1 5] [3 6])
-                      (cons (current-marks 1 0)
-                            (cons (current-marks 3 0)
-                                  (list))))))
-           (λ (x) x)))
- "" ((5 2) (6 4)))
-
-(test-transformation
- (<>
-  ()
-  ()
-  (dw
-   ra
-   (print 1)
-   (print 2)
-   (print 3)))
- "23" #f)
-
-(test-transformation
- (<> ()
-     ()
-     (%
-      1
-      (dw x_1
-          (print 1)
-          (abort 1 (cont 1 (dw x_1 (print 1) hole (print 3))))
-          (print 3))
-      (λ (k) (% 1 (k 4) (λ (x) x)))))
- "313" 4)
-
-(test-transformation
- (<>
-  ()
-  ()
-  ((comp
-    (dw
-     ra
-     (print 1)
-     hole
-     (dw q (print 2) (print 3) (print 4))))
-   5))
- "134" 5)
-
-(test-transformation
- (<>
-  ()
-  ()
-  (cont 0
-        (dw x
-            #f
-            (cons (cont 1 hole) hole)
-            (print 2))))
- "" procedure)
-
-(define (transformation-preserves-meaning? p)
-  (let ([original-result (parameterize ([model-eval-steps 1000]) (model-eval p))]
-        [transformed (transform-intermediate p)]
-        [warn (λ () (eprintf "Long test:\n") (pretty-write p (current-error-port)))]
-        [threshold (* 60 2)])
-    (or (timeout? original-result)
-        (let ([transformed-result 
-               (timeout-warn threshold (model-eval transformed) (warn))])
-          (if (answer? original-result)
-              (equal? original-result transformed-result)
-              (not (answer? transformed-result))))
-        ; filters bad tests
-        (bad-test? (timeout-warn threshold (impl-eval (impl-program transformed)) (warn))))))
-
-(define-syntax-rule (test-transformation/randomized . kw-args)
-  (let ([test-number 1])
-    (redex-check grammar p (transformation-preserves-meaning? (term p))
-               #:prepare fix-prog 
-               #:source :-> . kw-args)))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/randomized-tests.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/randomized-tests.rkt
deleted file mode 100644
index 835892044f..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/randomized-tests.rkt
+++ /dev/null
@@ -1,553 +0,0 @@
-#lang racket
-
-(require "grammar.rkt"
-         "reduce.rkt"
-         (except-in redex/reduction-semantics plug)
-         racket/runtime-path)
-
-(provide (all-defined-out))
-
-(module+ main (apply main (vector->list (current-command-line-arguments))))
-(module+ test
-  (main "--rules" "2250" "--size" "3")
-  (module config info
-    (define timeout 240)
-    (define random? #t)))
-
-(define (main . args)
-  (define from-grammar-tests #f)
-  (define from-rules-tests #f)
-  
-  (define seed (add1 (random (sub1 (expt 2 31)))))
-  
-  (define size #f)
-  (define attempt->size default-attempt-size)
-
-  (define repetitions 1)
-  
-  (command-line
-   #:argv args
-   #:once-each
-   ["--grammar"
-    n
-    "Perform n tests generated from the grammar for programs"
-    (set! from-grammar-tests (string->number n))]
-   ["--rules"
-    n
-    "Perform n tests generated from the reduction relation"
-    (set! from-rules-tests (string->number n))]
-   ["--seed"
-    n
-    "Generate tests using the PRG seed n"
-    (set! seed (string->number n))]
-   ["--size"
-    n
-    "Generate tests of size at most n"
-    (set! size (string->number n))
-    (set! attempt->size (const size))]
-   ["--log"
-    p
-    "Log generated tests to path p"
-    (log-test (curryr pretty-write (open-output-file p #:exists 'truncate)))]
-   ["--repetitions"
-    n
-    "Repeats the command n times"
-    (set! repetitions (string->number n))])
-  
-  
-  (for ([_ (in-range 0 repetitions)])
-    
-    (printf "Test seed: ~a (size: ~a)\n" seed (or size "variable"))
-    (parameterize ([current-pseudo-random-generator test-prg])
-      (random-seed seed))
-    
-    (parameterize ([redex-pseudo-random-generator test-prg])
-      (when from-grammar-tests
-        (time (test #:attempts from-grammar-tests #:attempt-size attempt->size)))
-      (when from-rules-tests
-        (time (test #:source :-> #:attempts from-rules-tests #:attempt-size attempt->size))))))
-
-(define log-test (make-parameter void))
-
-(define-syntax-rule (test . kw-args)
-  (redex-check grammar p (begin ((log-test) (term p)) (same-behavior? (term p))) 
-               #:prepare fix-prog . kw-args))
-
-(define fix-prog
-  (match-lambda
-    [`(<> ,s ,_ ,e)
-     (match-let ([`([,xs ,vs] ...) (remove-duplicates s #:key first)])
-       `(<> ,(map list xs (map (fix-expr xs) vs)) [] ,((fix-expr xs) e)))]))
-
-(define (fix-expr top-vars) 
-  (define rewrite
-    (compose drop-duplicate-binders
-             proper-wcms
-             proper-conts
-             consistent-dws
-             (curry close top-vars '())))
-  ; Must call proper-wcm after proper-conts because the latter
-  ; exposes opportunities to the former.
-  ;
-  ; (% 1 
-  ;    (cont 1
-  ;          (wcm ([2 3])
-  ;               (% 1
-  ;                  (wcm ([2 4])
-  ;                       hole)
-  ;                  (λ (x) x))))
-  ;   (λ (x) x))
-  ;
-  ; But proper-conts sometimes cannot do its job until proper-wcms
-  ; turns an arbitrary context into an evaluation context.
-  ;
-  ; (% 1 
-  ;  (cont 1
-  ;        (wcm ([2 3])
-  ;             (wcm ([2 4])
-  ;                  (% 1 hole (λ (x) x)))))
-  ;  (λ (x) x))
-  ;
-  ; It might work to make proper-conts work in more contexts,
-  ; but it's easier to iterate the rules to a fixed point (and
-  ; there may be more dependencies that require iteration anyway).
-  (λ (e)
-    (let loop ([e e])
-      (define e’ (rewrite e))
-      (if (equal? e e’) e (loop e’)))))
-
-(struct error (cause) #:transparent)
-(struct answer (output result) #:transparent)
-(struct bad-test (reason) #:transparent)
-(struct timeout ())
-
-(define (same-behavior? prog)
-  (let ([impl-behavior (timeout-kill 15 (impl-eval (impl-program (transform-intermediate prog))))])
-    (or (bad-test? impl-behavior)
-        (timeout? impl-behavior)
-        (let ([model-behavior (timeout-warn 30 (model-eval prog) (pretty-write prog))])
-          (or (timeout? model-behavior)
-              (if (error? impl-behavior)
-                  (error? model-behavior)
-                  (and (answer? model-behavior)
-                       (equal? impl-behavior model-behavior))))))))
-
-(define impl-program
-  (match-lambda
-    [`(<> ,s [] ,e)
-     `(let* ([previous-error #f]
-             [result 
-              (with-handlers ([exn:fail? void])
-                (call-with-exception-handler
-                 (λ (exn)
-                   (when (and (exn:fail? exn) (not previous-error))
-                     (set! previous-error exn))
-                   exn)
-                 (λ () (letrec ,s ,e))))])
-            (if (exn:fail? previous-error)
-                (raise previous-error)
-                result))]
-    [e e]))
-
-(define-runtime-module-path model-impl "model-impl.rkt")
-
-(define impl-eval
-  (let ([ns (make-base-empty-namespace)])
-    (parameterize ([current-namespace ns])
-      (namespace-require 'racket)
-      (namespace-require (resolved-module-path-name model-impl)))
-    (define show
-      (match-lambda
-        [(? procedure?) 'procedure]
-        [(? list? vs) (map show vs)]
-        [v v]))
-    (λ (test)
-      (define output (open-output-string))
-      (define result
-        (with-handlers ([exn:fail?
-                         (match-lambda
-                           [(exn:fail (regexp "%: expected argument of type <non-procedure>") _)
-                            (bad-test "procedure as tag")]
-                           [(exn:fail m _)
-                            (error m)])])
-          (parameterize ([current-output-port output])
-            (eval test ns))))
-      (if (or (error? result) (bad-test? result))
-          result
-          (answer (get-output-string output) 
-                  (show result))))))
-
-(define model-eval-steps (make-parameter +inf.0))
-
-(define (model-eval prog)
-  (let/ec return
-    (define show
-      (match-lambda
-        [(? number? n) n]
-        [(? boolean? b) b]
-        [`(list . ,vs) (map show vs)]
-        [v 'procedure]))
-    (define (eval prog steps)
-      (define ns (set))
-      (let recur ([p prog] [d steps] [s (set)])
-        (define qs (apply-reduction-relation :-> p))
-        (if (empty? qs)
-            (set! ns (set-add ns p))
-            (if (< d 0)
-                (return (timeout))
-                (for ([q qs])
-                     (if (set-member? s q)
-                         (return (timeout))
-                         (recur q (sub1 d) (set-add s p)))))))
-      (set-map ns values))
-    (match (eval prog (model-eval-steps))
-      [(list (and p `(<> ,_ ,output ,result)))
-       (if (v? result)
-           (answer
-            (apply string-append (map (curry format "~v") output))
-            (show result))
-           (error p))])))
-
-(define (with-timeout thunk timeout on-timeout)
-  (let ([c (make-channel)])
-    (struct raised (value))
-    (let ([t (thread
-              (λ () 
-                (channel-put 
-                 c (with-handlers ([exn:fail? raised])
-                     (thunk)))))])
-      (match (sync/timeout timeout c)
-        [#f (on-timeout t c)]
-        [(raised v) (raise v)]
-        [x x]))))
-
-(define-syntax-rule (timeout-kill time expr)
-  (with-timeout (λ () expr) time 
-                (λ (t _) 
-                  (kill-thread t)
-                  (timeout))))
-(define-syntax-rule (timeout-warn time expr warn)
-  (with-timeout (λ () expr) time
-                (λ (_ c)
-                  warn
-                  (sync c))))
-
-(define (close top-vars loc-vars expr)
-  (match expr
-    [(? x? x) 
-     (let ([bound (append top-vars loc-vars)])
-       (cond [(memq x bound) x]
-             [(not (empty? bound)) 
-              (random-member bound)]
-             [else (random-literal)]))]
-    [`(set! ,x ,e)
-     (define e’ (close top-vars loc-vars e))
-     (cond [(memq x top-vars)
-            `(set! ,x ,e’)]
-           [(empty? top-vars) e’]
-           [else `(set! ,(random-member top-vars) ,e’)])]
-    [`(λ ,xs ,e) 
-     `(λ ,xs 
-        ,(close (filter (negate (curryr member xs)) top-vars) 
-                (append xs loc-vars)
-                e))]
-    [`(dw ,x ,e_1 ,e_2 ,e_3)
-     ; Local variables are substituted away in realistic pre-
-     ; and post-thunks. This invariant is important to 
-     ; `consistent-dws', which copies such thunks into different
-     ; scopes.
-     `(dw ,x 
-          ,(close top-vars '() e_1) 
-          ,(close top-vars loc-vars e_2) 
-          ,(close top-vars '() e_3))]
-    ; substitution does not recur inside continuation values
-    ; (not sure why it bothers to recur within dw expression)
-    [`(cont ,v ,E)
-     `(cont ,(close top-vars '() v)
-            ,(close top-vars '() E))]
-    [`(cont ,E)
-     `(comp ,(close top-vars '() E))]
-    [(? list?)
-     (map (curry close top-vars loc-vars) expr)]
-    [_ expr]))
-
-(define drop-duplicate-binders
-  (match-lambda
-    [`(λ ,xs ,e)
-     `(λ ,(remove-duplicates xs) ,(drop-duplicate-binders e))]
-    [(? list? es)
-     (map drop-duplicate-binders es)]
-    [e e]))
-
-(define (consistent-dws p)
-  (define pre-post
-    (let ([h (make-hash)])
-      (λ (id pre post)
-        (match (hash-ref h id #f)
-          [#f
-           (hash-set! h id (list pre post))
-           (list pre post)]
-          [x x]))))
-  (let recur ([x p] [excluded '()])
-    (match x
-      [`(dw ,x ,e1 ,e2 ,e3)
-       (if (member x excluded)
-           (recur e2 excluded)
-           (match-let ([(list e1’ e3’) (pre-post x e1 e3)])
-             `(dw ,x 
-                  ,(recur e1’ (cons x excluded))
-                  ,(recur e2 excluded)
-                  ,(recur e3’ (cons x excluded)))))]
-      [(? list?) (map (curryr recur excluded) x)]
-      [_ x])))
-
-(define (proper-wcms e)
-  ; Performs two tasks:
-  ; 1. drops duplicate cm keys, and
-  ; 2. drops `wcm' frames when the reduction relation
-  ; would not otherwise merge the marks (replacing them
-  ; with `call/cm' requires more care, since the `wcm'
-  ; body may contain a hole).
-  (let fix ([ctxt 'wont-have-wcm] [e e])
-    (define tail
-      (match-lambda
-        [(or 'comp-top 'may-have-wcm) 'may-have-wcm]
-        ['wont-have-wcm 'wont-have-wcm]))
-    (match e
-      [`(wcm ,w ,e)
-       (match ctxt
-         [(or 'comp-top 'wont-have-wcm)
-          `(wcm ,(remove-duplicates (fix 'dont-care w) #:key first) 
-                ,(fix 'may-have-wcm e))]
-         ['may-have-wcm
-          (fix 'may-have-wcm e)])]
-      [`(list . ,vs)
-       ; context doesn't matter for values
-       `(list . ,(map (curry fix 'dont-care) vs))]
-      [`(λ ,xs ,e)
-       ; caller's continuation may be marked
-       `(λ ,xs ,(fix 'may-have-wcm e))]
-      [`(cont ,v ,E)
-       ; body will be wrapped in a prompt
-       `(cont ,(fix 'dont-care v) ,(fix 'wont-have-wcm E))]
-      [`(comp ,E)
-       ; comp application merges only top-level marks
-       `(comp ,(fix 'comp-top E))]
-      [`(begin ,e1 ,e2)
-       `(begin ,(fix 'wont-have-wcm e1)
-               ; "begin-v" does not merge marks
-               ,(fix (tail ctxt) e2))]
-      [`(% ,e1 ,e2 ,e3)
-       `(% ,(fix 'wont-have-wcm e1)
-           ; prompt persists until e2 is a value
-           ,(fix 'wont-have-wcm e2)
-           ,(fix 'wont-have-wcm e3))]
-      [`(dw ,x ,e1 ,e2 ,e3)
-       `(dw ,x 
-            ,(fix 'wont-have-wcm e1)
-            ; dw persists until e2 is a value
-            ,(fix 'wont-have-wcm e2)
-            ,(fix 'wont-have-wcm e3))]
-      [`(if ,e1 ,e2 ,e3)
-       `(if ,(fix 'wont-have-wcm e1) 
-            ; "ift" and "iff" do not merge marks
-            ,(fix (tail ctxt) e2)
-            ,(fix (tail ctxt) e3))]
-      [`(set! ,x ,e)
-       `(set! ,x ,(fix 'wont-have-wcm e))]
-      [(? list?) 
-       (map (curry fix 'wont-have-wcm) e)]
-      [_ e])))
-
-(define proper-conts
-  ; Turns (cont v_1 (in-hole E_1 (% v_1 E_2 v_2)))
-  ; into  (cont v_1 (in-hole E_1        E_2     ))
-  ; since no real program can construct the former.
-  ;
-  ; It would be nice to perform this transformation
-  ; by iteratively applying this rewrite rule
-  ;
-  ; (--> (in-hole (name C (cross e)) (cont v_1 (in-hole E_1 (% v_1 E_2 v_2))))
-  ;      (in-hole C (cont v_1 (in-hole E_1 E_2))))
-  ;
-  ; but a Redex bug (PR 11579) prevents that from working.
-  (let ([none (gensym)])
-    (define-metafunction grammar
-      [(fix (cont v E) any)
-       (cont (fix v ,none) (fix E v))]
-      
-      [(fix (dw x e_1 E e_2) any)
-       (dw x (fix e_1 ,none) (fix E any) (fix e_2 ,none))]
-      [(fix (wcm w E) any)
-       (wcm (fix w ,none) (fix E any))]
-      [(fix (v ... E e ...) any)
-       ((fix v ,none) ... (fix E any) (fix e ,none) ...)]
-      [(fix (begin E e) any)
-       (begin (fix E any) (fix e ,none))]
-      [(fix (% E e_1 e_2) any)
-       (% (fix E any) (fix e_1 ,none) (fix e_2 ,none))]
-      [(fix (% v e E) any)
-       (% (fix v ,none) (fix e ,none) (fix E any))]
-      [(fix (% any E v) any)
-       (fix E any)]
-      [(fix (% v_1 E v_2) any)
-       (% (fix v_1 ,none) (fix E any) (fix v_2 ,none))]
-      [(fix (set! x E) any)
-       (set! x (fix E any))]
-      [(fix (if E e_1 e_2) any)
-       (if (fix E any) (fix e_1 ,none) (fix e_2 ,none))]
-      
-      [(fix (any_1 ...) any_2)
-       ((fix any_1 ,none) ...)]
-      [(fix any_1 any_2)
-       any_1])
-    (λ (expr)
-      (term (fix ,expr ,none)))))
-
-(define transform-intermediate
-  (match-lambda
-    [(and p `(<> ,s ,o ,e))
-     (define fresh (make-fresh p))
-     (define allocated (map first s))
-     (define (alloc-cell prefix)
-       (define cell (fresh prefix))
-       (set! allocated (cons cell allocated))
-       cell)
-     (define capts (alloc-cell "active-cont-capts"))
-     (define dw-frame-locs
-       (let ([locs (make-hash)])
-         (λ (x)
-           (hash-ref 
-            locs x
-            (λ () (let ([ys (list (alloc-cell (format "~s-allocated?" x))
-                                  (alloc-cell (format "~s-skip-pre?" x))
-                                  (alloc-cell (format "~s-comp-cont" x)))])
-                    (hash-set! locs x ys)
-                    ys))))))
-     (define transform
-       (match-lambda
-         [`(wcm () ,m)
-          (transform m)]
-         [`(wcm ([,k ,v] . ,w) ,m)
-          `(call/cm ,(transform k) ,(transform v)
-                    (λ () ,(transform `(wcm ,w ,m))))]
-         [(and e `(dw ,x ,e1 ,e2 ,e3))
-          (match-let ([(list a? s? c) (dw-frame-locs x)]
-                      [t (fresh "t")])
-            `((λ (,t)
-                (if ,a?
-                    (begin (if (zero? ,capts) (set! ,s? #t) #f) (,c ,t))
-                    (% 1
-                       (dynamic-wind
-                        (λ () 
-                          (if (zero? ,capts)
-                              (if ,a? 
-                                  (if ,s? (set! ,s? #f) ,(transform e1))
-                                  #f)
-                              #f))
-                        (λ ()
-                          ((call/comp 
-                            (λ (k)
-                              (begin
-                                (set! ,c k)
-                                (abort 1 k)))
-                            1)))
-                        (λ () 
-                          (if (zero? ,capts)
-                              (if ,a?
-                                  ,(transform e3)
-                                  (set! ,a? #t))
-                              (set! ,a? #t))))
-                       (λ (k) (begin (if (zero? ,capts) (set! ,s? #t) #f) (k ,t))))))
-              (λ () ,(transform e2))))]
-         [`(cont ,v ,E)
-          (let ([x (fresh "v")])
-            `(begin
-               (set! ,capts (+ ,capts 1))
-               ((λ (,x)
-                  (% ,x 
-                     ,(transform 
-                       (term (plug ,E (call/cc (λ (k) (abort ,x k)) ,x))))
-                     (λ (x) (begin (set! ,capts (+ ,capts -1)) x))))
-                ,(transform v))))]
-         [`(comp ,E)
-          (define numbers
-            (match-lambda
-              [(? integer? n) (list n)]
-              [(? list? l) (append-map numbers l)]
-              [_ (list)]))
-          (define t (add1 (apply max 0 (numbers E))))
-          `(begin
-             (set! ,capts (+ ,capts 1))
-             (% ,t 
-                ,(transform
-                  (term (plug ,E (call/comp (λ (k) (abort ,t k)) ,t))))
-                (λ (x) (begin (set! ,capts (+ ,capts -1)) x))))]
-         [`(list ,vs ...)
-          `(list ,@(map transform-value vs))]
-         [(? list? xs) 
-          (map transform xs)]
-         [e e]))
-     (define transform-value
-       (match-lambda
-         [(and e (or `(cont ,_ ,_) `(comp ,_)))
-          `(λ (x) (,(transform e) x))]
-         [e (transform e)]))
-     (define e’ (transform e))
-     (define s’ (map (match-lambda [(list x v) (list x (transform-value v))]) s))
-     `(<> ,(map (λ (x) (match (assoc x s’)
-                         [#f (list x #f)]
-                         [(list _ v’) (list x v’)]))
-                allocated)
-          ,o
-          (begin
-            (set! ,capts 0)
-            ,e’))]))
-
-;; The built-in `plug' sometimes chooses the wrong hole.
-(define-metafunction grammar
-  [(plug hole any) any]
-  [(plug (in-hole W (dw x e_1 E e_2)) any)
-   (in-hole W (dw x e_1 (plug E any) e_2))]
-  [(plug (wcm w M) any)
-   (wcm w (plug M any))]
-  [(plug (v ... W e ...) any)
-   (v ... (plug W any) e ...)] 
-  [(plug (begin W e) any)
-   (begin (plug W any) e)]
-  [(plug (% W e_1 e_2) any)
-   (% (plug W any) e_1 e_2)]
-  [(plug (% v e W) any)
-   (% v e (plug W any))]
-  [(plug (% v_1 W v_2) any)
-   (% v_1 (plug W any) v_2)]
-  [(plug (set! x W) any)
-   (set! x (plug W any))]
-  [(plug (if W e_1 e_2) any)
-   (if (plug W any) e_1 e_2)])
-
-(define (make-fresh p)
-  (define suffix
-    (let recur ([x p] [s 0])
-      (cond [(symbol? x)
-             (match (regexp-match #rx"_(.+)$" (symbol->string x))
-               [(list _ n) (max s (add1 (string->number n)))]
-               [#f s])]
-            [(pair? x) (recur (cdr x) (recur (car x) s))]
-            [else s])))
-  (λ (prefix)
-    (begin0 (string->symbol (format "~a_~a" prefix suffix))
-            (set! suffix (add1 suffix)))))
-
-(define (random-literal)
-  (random-member
-   '(dynamic-wind abort current-marks cons
-                  -inf.0 +inf.0 -1 0 1 1/3 -1/4 .33 -.25 4-3i 3+4i
-                  call/cc call/comp call/cm
-                  #f #t zero? print + first rest)))
-
-(define (random-member xs)
-  (parameterize ([current-pseudo-random-generator test-prg])
-    (list-ref xs (random (length xs)))))
-
-(define test-prg (make-pseudo-random-generator))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/reduce.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/reduce.rkt
deleted file mode 100644
index c1f909545b..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/reduce.rkt
+++ /dev/null
@@ -1,212 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics
-         "grammar.rkt"
-         "meta.rkt")
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Reductions:
-
-(define :->
-  (reduction-relation
-   grammar
-   
-   ;; beta
-   (~~> ((λ (x_1 ..._1) e_1) v_1 ..._1)
-        (subst* (x_1 ...) (v_1 ...) e_1)
-        "beta")
-   
-   ;; arithmetic
-   (~~> (+ n_1 n_2)
-        ,(+ (term n_1) (term n_2))
-        "+")
-   (~~> (zero? 0)
-        #t
-        "zero?")
-   (~~> (zero? v_1)
-        #f
-        (side-condition (not (equal? 0 (term v_1))))
-        "non-zero")
-   
-   ;; lists
-   (~~> (cons v_1 (list v_2 ...))
-        (list v_1 v_2 ...)
-        "cons")
-   (~~> (first (list v_1 v_2 ...))
-        v_1
-        "first")
-   (~~> (rest (list v_1 v_2 ...))
-        (list v_2 ...)
-        "rest")
-   
-   ;; printing
-   (--> (<> s_1 [o_1 ...] (in-hole E_1 (print o_2)))
-        (<> s_1 [o_1 ... o_2] (in-hole E_1 #f))
-        "print")
-   
-   ;; if
-   (~~> (if #t e_1 e_2)
-        e_1
-        "ift")
-   (~~> (if #f e_1 e_2)
-        e_2
-        "iff")
-   
-   ;; begin
-   (~~> (begin v e_1)
-        e_1
-        "begin-v")
-   
-   ;; set! and lookup
-   (--> (<> ([x_1 v_1] ... [x_2 v_2] [x_3 v_3] ...) [o_1 ...] (in-hole E_1 (set! x_2 v_4)))
-        (<> ([x_1 v_1] ... [x_2 v_4] [x_3 v_3] ...) [o_1 ...] (in-hole E_1 #f))
-        "assign")
-   (--> (<> ([x_1 v_1] ... [x_2 v_2] [x_3 v_3] ...) [o_1 ...] (in-hole E_1 x_2))
-        (<> ([x_1 v_1] ... [x_2 v_2] [x_3 v_3] ...) [o_1 ...] (in-hole E_1 v_2))
-        "lookup")
-   
-   ;; prompt
-   ;;  When we get a value, drop the prompt.
-   (~~> (% v_1 v_2 v_3)
-        v_2
-        "prompt-v")
-   
-   ;; call/cc
-   ;;  Capture; the context E_2 must not include a prompt with the same tag,
-   ;;  and we don't want immediate marks.
-   (~~> (% v_2 (in-hole E_2 (wcm w_1 (call/cc v_1 v_2))) v_3)
-        (% v_2 (in-hole E_2 (wcm w_1 (v_1 (cont v_2 E_2)))) v_3)
-        (side-condition (term (noMatch E_2 E (% v_2 E v))))
-        "call/cc")
-   ;;  Invoke a continuation when there are no dw pre or post thunks to run (i.e.,
-   ;;  no dw thunks in the unshared parts of the current and target continuations).
-   ;;  D_2/D_6 is shared between the captured and current continuations; we make sure
-   ;;  that W_3 and E_4 don't share.
-   (~~> (% v_1 (in-hole D_2 (in-hole W_3 ((cont v_1 (in-hole D_6 (in-hole W_4 hole))) v_2))) v_3)
-        (% v_1 (in-hole D_6 (in-hole W_4 v_2)) v_3)
-        (side-condition (term (noMatch (in-hole D_2 W_3) E (% v_1 E v))))
-        (side-condition (term (sameDWs D_2 D_6)))
-        (side-condition (term (noShared W_3 W_4)))
-        "cont")
-   ;;  Invoke a continuation where there is a dw post thunk to run:
-   ;;   - D_2/D_6 is the shared prefix of the current and captured continuation.
-   ;;     (We make sure that E_3[(dw x_1 e_1 W_5 e_2)] and E_4 don't share.)
-   ;;   - Keep D_2[E_3], replacing the relevant `dw' to run the post thunk
-   ;;     and then resume the continuation jump.
-   ;;  The second step means replacing (dw x e_1 W_5[((cont ...) v)] e_2)
-   ;;  with (begin e_2 ((cont ...) v))).
-   (~~> (% v_2 (in-hole D_2 (in-hole E_3 (dw x_1 e_1 (in-hole W_5 ((cont v_2 (in-hole D_6 (hide-hole E_4))) v_1)) e_2))) v_3)
-        (% v_2 (in-hole D_2 (in-hole E_3 (begin e_2 ((cont v_2 (in-hole D_6 E_4)) v_1)))) v_3)
-        (side-condition (term (noMatch (in-hole D_2 E_3) E (% v_2 E v))))
-        (side-condition (term (sameDWs D_2 D_6)))
-        (side-condition (term (noMatch W_5 E (% v_2 E v))))
-        (side-condition (term (noShared (in-hole E_3 (dw x_1 e_1 W_5 e_2)) E_4)))
-        "cont-post")
-   ;;  Invoke a continuation when there are only dw pre thunks to run (i.e.,
-   ;;  no dw thunks in the unshared part of the current continuation).
-   ;;  D_2/D_6 is shared between the captured and current continuations; we
-   ;;  make sure that W_3 and W_4[(dw ...)] don't share.
-   ;;  We do one pre thunk at a time, just in case the pre thunk arranges for
-   ;;  the relevant prompt to disappear. To do just one pre thunk, we
-   ;;  create `(begin e_1 (dw x_1 e_1 ((cont ...) v) e_2))', which runs the pre
-   ;;  thunk and then tries again to invoke the continuation --- but inside a
-   ;;  `dw' for the already-run pre-thunk, so that it's treated as shared and not
-   ;;  run again.
-   (~~> (% v_1 (in-hole D_2 (in-hole W_3 ((cont v_1 (name k (in-hole D_6 (in-hole W_4 (dw x_1 e_1 (hide-hole E_5) e_2))))) v_2))) v_3)
-        (% v_1 (in-hole D_6 (in-hole W_4 (begin e_1 (dw x_1 e_1 ((cont v_1 k) v_2) e_2)))) v_3)
-        (side-condition (term (noMatch (in-hole D_2 W_3) E (% v_1 E v))))
-        (side-condition (term (sameDWs D_2 D_6)))
-        (side-condition (term (noShared W_3 (in-hole W_4 (dw x_1 e_1 E_5 e_2)))))
-        "cont-pre")
-   
-   ;; abort
-   ;;  Like continuation invocation, the case without dw post thunks:
-   (~~> (% v_1 (in-hole W_2 (abort v_1 v_2)) v_3)
-        (v_3 v_2)
-        (side-condition (term (noMatch W_2 E (% v_1 E v))))
-        "abort")
-   ;;  And the case with a dw post thunk --- simpler than invoking a
-   ;;  continuation, because we don't have to compute shared parts:
-   (~~> (dw x_1 e_1 (in-hole W_2 (abort v_1 v_2)) e_2)
-        (begin e_2 (abort v_1 v_2))
-        (side-condition (term (noMatch W_2 E (% v_1 E v))))
-        "abort-post")
-   
-   ;; composable continuation
-   ;;  Capture up to the relevant prompt, not including immediate marks:
-   (~~> (% v_2 (in-hole E_2 (wcm w_1 (call/comp v_1 v_2))) v_3)
-        (% v_2 (in-hole E_2 (wcm w_1 (v_1 (comp E_2)))) v_3)
-        (side-condition (term (noMatch E_2 E (% v_2 E v))))
-        "call/comp")
-   ;;  On invocation, we want to splice leading `wcm's with any marks
-   ;;  at the invocation context. We do that by convertings the leading
-   ;;  `wcm's back to `call/cm', so they get spliced as usual
-   ;;  for evaluating `call/cm' (see below). Meanwhile, we need to
-   ;;  handle the case that there are dw pre thunks to run on the way in
-   ;;  (which is a little simpler than for non-composable continuations,
-   ;;  since we don't have to worry about sharing w.r.t. a prompt).
-   (~~> ((comp (in-hole W_1 hole)) v_1)
-        (expose-wcm (in-hole W_1 v_1))
-        "comp")
-   (~~> ((comp (in-hole W_1 (dw x_1 e_1 (hide-hole E_2) e_2))) v_1)
-        (expose-wcm (in-hole W_1 (begin e_1 (dw x_1 e_1 ((comp E_2) v_1) e_2))))
-        "comp-pre")
-   
-   ;; continuation marks
-   ;;  Introduce a `wcm' when needed for certain primitives:
-   (-+> (in-hole E_1 (u_1 v_1 ...))
-        (in-hole E_1 (wcm () (u_1 v_1 ...)))
-        (side-condition (term (noMatch E_1 E (wcm w hole))))
-        "wcm-intro")
-   ;;  When we get a value, discard marks:
-   (~~> (wcm w v_1)
-        v_1
-        "wcm-v")
-   
-   ;;  When `call/cm' uses the same key as a wrapping
-   ;;  mark, then replace the old value.
-   (~~> (wcm ((v_1 v_2) ... (v_3 v_4) (v_5 v_6) ...) 
-             (call/cm v_3 v_7 (λ () e_1)))
-        (wcm ((v_1 v_2) ... (v_3 v_7) (v_5 v_6) ...) e_1)
-        "wcm-set")
-   ;;  When `call/cm' uses a different key than any wrapping
-   ;;  mark, then add a new mark.
-   (~~> (wcm ((v_1 v_2) ...) (call/cm v_3 v_4 (λ () e_1)))
-        (wcm ((v_1 v_2) ... (v_3 v_4)) e_1)
-        (side-condition (term (notIn v_3 (v_1 ...))))
-        "wcm-add")
-   ;;  To get the current mark value for mark key, search
-   ;;  the current context (using `get-marks'), using only
-   ;;  the part of the continuation up to a prompt with the
-   ;;  given tag.
-   (~~> (% v_2 (in-hole E_2 (current-marks v_1 v_2)) v_3)
-        (% v_2 (in-hole E_2 (get-marks E_2 v_1 (list))) v_3)
-        (side-condition (term (noMatch E_2 E (% v_2 E v))))
-        "marks")
-   
-   ;; dynamic-wind
-   ;;  Evaluate a `dynamic-wind' function by generating a new `dw'
-   ;;  wrapper. The wrapper uses a newly allocated (globally unique)
-   ;;  tag variable. Also, introduce a `begin' with the pre-thunk
-   ;;  body --- which, crucially, is put *outside* the generated `dw'.
-   (~~> (dynamic-wind (λ () e_1) (λ () e_2) (λ () e_3))
-        (begin e_1 (dw x_1 e_1 e_2 e_3))
-        (fresh x_1)
-        "dw")
-   ;;  When we get a result from the dw, evaluate the post thnk
-   ;;  (outside the `dw') and then continue returning the result.
-   (~~> (dw x e_1 v_1 e_3)
-        (begin e_3 v_1)
-        "dw-v")
-   
-   with
-   ;; -+> is evaluation independent of the store and output:
-   [(--> (<> s_1 [o_1 ...] from) (<> s_1 [o_1 ...] to)) (-+> from to)]
-   ;; ~~> is evaluation in any E:
-   [(-+> (in-hole E_1 from)
-         (in-hole E_1 to))
-    (~~> from to)]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(provide :->)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/test.rkt
deleted file mode 100644
index 786a15a835..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/test.rkt
+++ /dev/null
@@ -1,1235 +0,0 @@
-#lang racket
-
-(require redex
-         "grammar.rkt"
-         "meta.rkt"
-         "reduce.rkt")
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Abbreviations:
-
-;; The classic (let ([v (call/cc call/cc)]) 
-;;              ((call/cc call/cc) v))
-(define call/cc-loop
-  `(<>
-    () []
-    (% 0
-       ((λ (v) ((call/cc (λ (x) (call/cc x 0)) 0) v))
-        (call/cc (λ (x) (call/cc x 0)) 0))
-       (λ (x) x))))
-
-(define (show prog)
-  (stepper :-> prog))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Tests
-(define (test desc expr result)
-  (let ([r (car (apply-reduction-relation* :-> expr))])
-    (unless (equal? r result)
-      (printf "~s:\n~s\n" desc expr)
-      (printf "=> ~s\n\n" r)
-      (error 'test "expected ~s" result)))
-  (set! tests-passed (add1 tests-passed)))
-(define tests-passed 0)
-
-;; Basic ----------------------------------------
-
-(define (basic-tests)
-  (test "(λx.e)[y←v] ≠ λy.(e[x←y][y←v])"
-        '(<>
-          ([k 4]) []
-          (((λ (k1) (λ (k) k))
-            (λ () k))
-           0))
-        '(<> ([k 4]) [] 0))
-  (test "(λx.e)[y←v] ≠ λz.(e[x←z][y←v]) if z ∈ FV(e)"
-        '(<>
-          ([k2 5])
-          ()
-          (((λ (k1) (λ (k) k2))
-            (λ () k))
-           0))
-        '(<> ([k2 5]) [] 5))
-  (test "basic dw"
-        '(<>
-          () []
-          (dynamic-wind (λ () (print 1))
-                        (λ () (print 2))
-                        (λ () (print 3))))
-        '(<> () (1 2 3) #f))
-  (test "call/cc dw"
-        '(<>
-          () []
-          (%
-           0
-           (call/cc
-            (λ (k)
-              (dynamic-wind (λ () (print 1))
-                            (λ () (k 0))
-                            (λ () (print 3))))
-            0)
-           (λ (x) x)))
-        '(<> () (1 3) 0))
-  (test "abort"
-        '(<>
-          () []
-          (%
-           0             
-           (+ 10 (abort 0 7))
-           (λ (x) (+ x 1))))
-        '(<>
-          () []
-          8))
-  (test "abort inner"
-        '(<>
-          () []
-          (%
-           0             
-           (+ 10 
-              (%
-               1         
-               (abort 1 7)
-               (λ (x) (+ x 1))))
-           (λ (x) (+ x 2))))
-        '(<>
-          () []
-          18))
-  (test "abort outer"
-        '(<>
-          () []
-          (%
-           0             
-           (+ 10 
-              (%
-               1
-               (abort 0 7)
-               (λ (x) (+ x 1))))
-           (λ (x) (+ x 2))))
-        '(<>
-          () []
-          9))
-  (test "abort inner with same tag"
-        '(<>
-          () []
-          (%
-           0             
-           (+ 10 
-              (%
-               0
-               (abort 0 7)
-               (λ (x) (+ x 1))))
-           (λ (x) (+ x 2))))
-        '(<>
-          () []
-          18))
-  (test "abort handler in tail position"
-        '(<>
-          () []
-          (%
-           0
-           (call/cm
-            100 1
-            (λ ()
-              (%
-               1
-               (abort 1 (λ ()
-                          (call/cm
-                           100 2
-                           (λ ()
-                             (current-marks 100 0)))))
-               (λ (f)
-                 (f)))))
-           (λ (x) x)))
-        '(<>
-          () []
-          (list 2)))
-  (test "abort dw"
-        '(<>
-          () []
-          (%
-           0
-           (call/cc
-            (λ (k)
-              (dynamic-wind (λ () (print 1))
-                            (λ () (abort 0 7))
-                            (λ () (print 3))))
-            0)
-           (λ (x) (+ x 1))))
-        '(<> () (1 3) 8))
-  (test "abort tag eval"
-        '(<>
-          () []
-          (% (print 1) 2 3))
-        '(<> () [1] 2))
-  (test "abort handler eval"
-        '(<>
-          () []
-          (% 1 2 (print 3)))
-        '(<> () [3] 2))
-  (test "call/cc 2 levels dw"
-        '(<>
-          ()
-          []
-          (%
-           0
-           (call/cc
-            (λ (k)
-              (dynamic-wind
-               (λ () (print 1))
-               (λ ()
-                 (dynamic-wind
-                  (λ () (print 2))
-                  (λ ()
-                    (k 10))
-                  (λ () (print 3))))
-               (λ () (print 4))))
-            0)
-           (λ (x) x)))
-        '(<> () [1 2 3 4] 10))
-  (test "abort 2 levels dw"
-        '(<>
-          ()
-          []
-          (%
-           0
-           (dynamic-wind
-            (λ () (print 1))
-            (λ ()
-              (dynamic-wind
-               (λ () (print 2))
-               (λ ()
-                 (abort 0 10))
-               (λ () (print 3))))
-            (λ () (print 4)))
-           (λ (x) (+ x 1))))
-        '(<> () [1 2 3 4] 11))
-  (test "in thunk isn't really in"
-        '(<>
-          () []
-          (%
-           0
-           (call/cc
-            (λ (k)
-              (dynamic-wind
-               (λ () (begin
-                       (print 1)
-                       (k 11)))
-               (λ () (print 2))
-               (λ () (print 3))))
-            0)
-           (λ (x) x)))
-        '(<> () [1] 11))
-  (test "in thunk isn't really in, but it's in surrounding"
-        '(<>
-          () []
-          (%
-           0
-           (call/cc
-            (λ (k)
-              (dynamic-wind
-               (λ () (print -1))
-               (λ ()
-                 (dynamic-wind
-                  (λ () (begin
-                          (print 1)
-                          (k 11)))
-                  (λ () (print 2))
-                  (λ () (print 3))))
-               (λ () (print -2))))
-            0)
-           (λ (x) x)))
-        '(<> () [-1 1 -2] 11))
-  (test "dw shared during jump"
-        '(<>
-          () []
-          (% 0 
-             (dynamic-wind 
-              (λ () (print 0))
-              (λ () ((call/cc (λ (f) f) 0) (λ (x) 10)))
-              (λ () (print 1)))
-             (λ (x) x)))
-        '(<> () [0 1] 10))
-  (test "dw not shared during jump"
-        '(<>
-          () []
-          (% 0 
-             ((dynamic-wind 
-               (λ () (print 0))
-               (λ () (call/cc (λ (f) f) 0))
-               (λ () (print 1)))
-              (λ (x) 10))
-             (λ (x) x)))
-        '(<> () [0 1 0 1] 10))
-  (test "composable captures continuation marks"
-        '(<>
-          () []
-          (%
-           100
-           ((λ (k) (k (λ (v) (current-marks 0 100)))) 
-            (% 0 
-               (call/cm 0 100 
-                        (λ ()
-                          ((call/comp (λ (k) (λ (v) k)) 0)
-                           99)) )
-               (λ (x) x)))
-           (λ (x) x)))
-        '(<> () [] (list 100)))
-  (test "continuation marks wrapping % not captured"
-        '(<>
-          () []
-          (%
-           101
-           ((λ (k) (k (λ (v) (current-marks 0 101)))) 
-            (call/cm 0 100 
-                     (λ ()
-                       (% 0 
-                          ((call/comp (λ (k) (λ (v) k)) 0)
-                           99)
-                          (λ (x) x)))))
-           (λ (x) x)))
-        '(<> () [] (list)))
-  (test "visible marks restricted by prompt tag"
-        '(<>
-          () []
-          (% 101
-             (call/cm 0 100
-                      (λ ()
-                        (% 102
-                           (call/cm 0 99
-                                    (λ () 
-                                      (current-marks 0 102)))
-                           (λ (x) x))))
-             (λ (x) x)))
-        '(<> () [] (list 99)))
-  (test "visible marks not restricted by other prompt tags"
-        '(<>
-          () []
-          (% 101
-             (call/cm 0 100
-                      (λ ()
-                        (% 102
-                           (call/cm 0 99
-                                    (λ () 
-                                      (current-marks 0 101)))
-                           (λ (x) x))))
-             (λ (x) x)))
-        '(<> () [] (list 99 100)))
-  (test "getting marks fails if there's no prompt with the given tag"
-        '(<>
-          () []
-          (% 101
-             (call/cm 0 100
-                      (λ ()
-                        (current-marks 0 102)))
-             (λ (x) x)))
-        '(<> () [] (% 101 (wcm ((0 100)) (current-marks 0 102)) (λ (x) x))))
-  (test "pre and post thunks in a composable continuation"
-        '(<> 
-          () []
-          ((λ (f)
-             (f (λ (v) 10)))
-           (%
-            0
-            (dynamic-wind
-             (λ () (print 1))
-             (λ ()
-               (call/comp (λ (k) k) 0))
-             (λ () (print 2)))
-            (λ (x) x))))
-        '(<>
-          ()
-          [1 2 1 2]
-          (λ (v) 10)))
-  (test "prompt enclosing prompt-tag expression"
-        '(<> () [] 
-             (% 0
-                (% (abort 0 1) 2 3)
-                (λ (x) x)))
-        '(<> () [] 1))
-  (test "prompt enclosing prompt-handler expression"
-        '(<> () []
-             (% 0 
-                (begin 
-                  (% 0 1 (abort 0 2))
-                  (print 3))
-                (λ (x) x)))
-        '(<> () [] 2))
-  (test "prompt-tag position in continuation-marks context"
-        '(<> () []
-             (% 0 
-                (call/cm 
-                 1 2
-                 (λ ()
-                   (% (abort 0 (current-marks 1 0))
-                      3
-                      4)))
-                (λ (x) x)))
-        '(<> () [] (list 2)))
-  (test "prompt-handler position in continuation-marks context"
-        '(<> () []
-             (% 0 
-                (call/cm 
-                 1 2
-                 (λ ()
-                   (call/cm
-                    1 3
-                    (% 0
-                       4
-                       (abort 0 (current-marks 1 0))))))
-                (λ (x) x)))
-        '(<> () [] (list 2)))
-  (test "if-test position in continuation-marks context"
-        '(<> ()
-             []
-             (% 0
-                (call/cm 
-                 1 2 
-                 (λ () (if (abort 0 (current-marks 1 0)) 3 4)))
-                (λ (x) x)))
-        '(<> () [] (list 2)))
-  (test "dw in continuation-marks context"
-        '(<> ()
-             []
-             (% 0
-                (call/cm 1 2 
-                         (λ () 
-                           (dynamic-wind
-                            (λ () #f)
-                            (λ () (current-marks 1 0))
-                            (λ () #t))))
-                (λ (x) x)))
-        '(<> () [] (list 2)))
-  (test "wcm without key in continuation-marks context"
-        '(<> ()
-             []
-             (% 0
-                (wcm ([1 2])
-                     ((λ (x) x)
-                      (wcm ([3 4])
-                           (current-marks 3 0))))
-                (λ (x) x)))
-        '(<> () [] (list 4))))
-
-;; R6RS dynamic-wind ----------------------------------------
-
-(define (r6rs-dw-tests)
-  (test "out thunk is really out"
-        '(<>
-          ([n 0]
-           [do-jump? #t]
-           [k-out #f])
-          []
-          (%
-           0
-           (begin
-             (begin
-               (call/cc
-                (λ (k)
-                  (dynamic-wind
-                   (λ () (set! n (+ n 1)))
-                   (λ () (k 99))
-                   (λ ()
-                     (begin
-                       (set! n (+ n 1))
-                       (call/cc (λ (k) (set! k-out k)) 0)))))
-                0)
-               (if do-jump?
-                   (begin
-                     (set! do-jump? #f)
-                     (k-out 0))
-                   11))
-             (begin
-               (set! k-out #f)
-               n))
-           (λ (x) x)))
-        '(<> ([n 2] [do-jump? #f] [k-out #f]) [] 2))
-  (test "out thunk is really out during trimming"
-        '(<>
-          ([n 0]
-           [do-jump? #t]
-           [k-out #f])
-          []
-          (%
-           0
-           (begin
-             (call/cc
-              (λ (k)
-                (dynamic-wind
-                 (λ () (set! n (+ n 1)))
-                 (λ () (k 100))
-                 (λ ()
-                   (begin
-                     (set! n (+ n 1))
-                     (call/cc (λ (k) (set! k-out k)) 0)))))
-              0)
-             (begin
-               (if do-jump?
-                   (begin
-                     (set! do-jump? #f)
-                     (k-out 0))
-                   11)
-               (begin
-                 (set! k-out #f)
-                 n)))
-           (λ (x) x)))
-        '(<> ([n 2] [do-jump? #f] [k-out #f]) () 2))
-  (test "jumping during the results of trimming, pre-thunk"
-        '(<> 
-          ([pre-count 0]
-           [pre-jump? #f]
-           [after-jump? #t]
-           [grab? #t]
-           [the-k #f])
-          []
-          (%
-           0
-           (begin
-             (dynamic-wind
-              (λ ()
-                (begin
-                  (set! pre-count (+ pre-count 1))
-                  (if pre-jump?
-                      (begin
-                        (set! pre-jump? #f)
-                        (begin
-                          (set! after-jump? #f)
-                          (the-k 999)))
-                      999)))
-              (λ () 
-                (if grab?
-                    (call/cc
-                     (λ (k)
-                       (begin
-                         (set! grab? #f)
-                         (set! the-k k)))
-                     0)
-                    999))
-              (λ () (+ 0 10)))
-             (begin
-               (if after-jump?
-                   (begin
-                     (set! pre-jump? #t)
-                     (the-k 999))
-                   999)
-               (begin
-                 (set! the-k #f) ;; just to make testing simpler
-                 pre-count)))
-           (λ (x) x)))
-        '(<>
-          ([pre-count 3]
-           [pre-jump? #f]
-           [after-jump? #f]
-           [grab? #f]
-           [the-k #f])
-          ()
-          3))
-  (test "jumping during the results of trimming, post-thunk"
-        '(<>
-          ([post-count 0] 
-           [post-jump? #t]
-           [jump-main? #t]
-           [grab? #t]
-           [the-k #f])
-          []
-          (%
-           0
-           (begin
-             (begin
-               (if grab?
-                   (call/cc
-                    (λ (k)
-                      (begin
-                        (set! grab? #f)
-                        (set! the-k k)))
-                    0)
-                   999)
-               (dynamic-wind
-                (λ () (+ 0 1))
-                (λ () 
-                  (if jump-main?
-                      (begin
-                        (set! jump-main? #f)
-                        (the-k 999))
-                      999))
-                (λ () 
-                  (begin
-                    (set! post-count (+ post-count 1))
-                    (if post-jump?
-                        (begin
-                          (set! post-jump? #f)
-                          (the-k 999))
-                        999)))))
-             (begin
-               (set! the-k #f) ;; just to make testing simpler
-               post-count))
-           (λ (x) x)))
-        '(<>
-          ([post-count 2]
-           [post-jump? #f]
-           [jump-main? #f]
-           [grab? #f]
-           [the-k #f]) 
-          []
-          2))
-  (test "hop out one level"
-        '(<>
-          ()
-          []
-          
-          (%
-           0
-           ((dynamic-wind (λ () (print 0))
-                          (λ () (call/cc (λ (k) k) 0))
-                          (λ () (print 1)))
-            (λ (y) (print 7)))
-           (λ (x) x)))
-        '(<>
-          ()
-          [0 1 0 1 7]
-          #f))
-  (test "hop out two levels"
-        '(<> ()
-             []
-             (%
-              0
-              ((dynamic-wind 
-                (λ () (print 1))
-                (λ () 
-                  (dynamic-wind
-                   (λ () (print 2))
-                   (λ () (call/cc (λ (k) k) 0))
-                   (λ () (print 3))))
-                (λ () (print 4)))
-               (λ (y) (print 8)))
-              (λ (x) x)))
-        '(<>
-          ()
-          [1 2 3 4 1 2 3 4 8]
-          #f))
-  (test "don't duplicate tail"
-        '(<>
-          ()
-          []
-          (%
-           0
-           (dynamic-wind 
-            (λ () (print 1))
-            (λ () 
-              ((dynamic-wind (λ () (print 2))
-                             (λ () (call/cc (λ (k) k) 0))
-                             (λ () (print 3)))
-               (λ (y) (print 9))))
-            (λ () (print 4)))
-           (λ (x) x)))
-        '(<>
-          ()
-          [1 2 3 2 3 9 4]
-          #f))
-  (test "don't duplicate tail, 2 deep"
-        '(<>
-          ()
-          []
-          
-          (%
-           0
-           (dynamic-wind 
-            (λ () (print 1))
-            (λ () 
-              (dynamic-wind 
-               (λ () (print 2))
-               (λ () 
-                 ((dynamic-wind (λ () (print 3))
-                                (λ () (call/cc (λ (k) k) 0))
-                                (λ () (print 4)))
-                  (λ (y) (print 9))))
-               (λ () (print 5))))
-            (λ () (print 6)))
-           (λ (x) x)))
-        '(<>
-          ()
-          [1 2 3 4 3 4 9 5 6]
-          #f))
-  (test "hop out and back into another one"
-        '(<>
-          ()
-          []
-          (%
-           0
-           ((λ (ok)
-              (dynamic-wind (λ () (print 1))
-                            (λ () (ok (λ (y) (print 9))))
-                            (λ () (print 2))))
-            (dynamic-wind (λ () (print 3))
-                          (λ () (call/cc (λ (k) k) 0))
-                          (λ () (print 4))))
-           (λ (x) x)))
-        '(<>
-          ()
-          [3 4 1 2 3 4 1 9 2]
-          #f))
-  (test "hop out one level and back in two levels"
-        '(<>
-          ()
-          []
-          (%
-           0
-           ((λ (ok)
-              (dynamic-wind
-               (λ () (print 1))
-               (λ ()
-                 (dynamic-wind
-                  (λ () (print 2))
-                  (λ () (ok (λ (y) (print 9))))
-                  (λ () (print 3))))
-               (λ () (print 4))))
-            (call/cc (λ (k) k) 0))
-           (λ (x) x)))
-        '(<>
-          ()
-          [1 2 3 4 1 2 9 3 4]
-          #f))
-  (test "hop out two levels and back in two levels"
-        '(<>
-          ()
-          []
-          (%
-           0
-           ((λ (ok)
-              (dynamic-wind
-               (λ () (print 1))
-               (λ () 
-                 (dynamic-wind
-                  (λ () (print 2))
-                  (λ () (ok (λ (y) (print 9))))
-                  (λ () (print 3))))
-               (λ () (print 4))))
-            (dynamic-wind
-             (λ () (print 5))
-             (λ () 
-               (dynamic-wind
-                (λ () (print 6))
-                (λ () (call/cc (λ (k) k) 0))
-                (λ () (print 7))))
-             (λ () (print 8))))
-           (λ (x) x)))
-        '(<>
-          ()
-          [5 6 7 8 1 2 3 4 5 6 7 8 1 2 9 3 4]
-          #f)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; composability
-
-(define (cont-tests)
-  (test "captured under new %"
-        '(<>
-          ([retry #f])
-          []
-          (begin
-            (%
-             0
-             (+ 18
-                (call/cc
-                 (λ (k)
-                   (begin
-                     (set! retry k)
-                     17))
-                 0))
-             (λ (x) x))
-            ((λ (y)
-               (begin
-                 (set! retry #f)
-                 y))
-             (+ 1 (%
-                   0
-                   (retry 10)
-                   (λ (x) x))))))
-        '(<>
-          ([retry #f])
-          []
-          29))               
-  (test "catch in composed"
-        '(<>
-          () []
-          (%
-           0
-           ((λ (k)
-              ((λ (k2)
-                 (%
-                  0
-                  (k2 (list 89))
-                  (λ (x) x)))
-               (%
-                0
-                (k (λ ()
-                     (first (call/cc (λ (k2)
-                                       (cons k2 (list)))
-                                     0))))
-                (λ (x) x))))
-            (%
-             0
-             ((call/cc (λ (k) (λ () k))
-                       0))
-             (λ (x) x)))
-           (λ (x) x)))
-        '(<>
-          () []
-          89))
-  (test "simple composable"
-        '(<>
-          [] ()
-          ((λ (k)
-             (k (λ () 8)))
-           (%
-            0
-            ((call/comp
-              (λ (k) (λ () k))
-              0))
-            (λ (x) x))))
-        '(<> [] () 8))
-  (test "composable doesn't introduce %"
-        '(<>
-          [] ()
-          (%
-           0
-           ((λ (k)
-              ((λ (k2)
-                 (if (first (rest k2))
-                     ((first k2) (list 10 #f))
-                     (first k2)))
-               (k (λ ()
-                    (call/cc (λ (k2) 
-                               (cons k2 (list #t)))
-                             0)))))
-            (%
-             0
-             ((call/comp
-               (λ (k) (λ () k))
-               0))
-             (λ (x) x)))
-           (λ (x) x)))
-        '(<>
-          [] ()
-          10))
-  (test "post thunk runs current continuation as composable"
-        '(<>
-          ([a #f]
-           [do-a? #t])
-          []
-          (%
-           0
-           (dynamic-wind
-            (λ () (print 1))
-            (λ ()
-              (begin
-                (dynamic-wind
-                 (λ () (print 2))
-                 (λ () 
-                   ((call/cc (λ (k)
-                               (begin
-                                 (set! a k)
-                                 (λ () 12)))
-                             0)))
-                 (λ () (print 3)))
-                (dynamic-wind
-                 (λ () (print 4))
-                 (λ ()
-                   (if do-a?
-                       (begin
-                         (set! do-a? #f)
-                         (a (λ () 11)))
-                       (begin
-                         (set! a #f)
-                         12)))
-                 (λ ()
-                   (begin
-                     (print 5)
-                     (call/comp
-                      (λ (k)
-                        (k 10))
-                      0))))))
-            (λ () (print 6)))
-           (λ (x) x)))
-        '(<>
-          ([a #f][do-a? #f])
-          [1 2 3 4 5 1 6 2 3 4 5 1 6 6]
-          12))
-  (test "post thunk runs current continuation as composable under %"
-        '(<>
-          ([a #f]
-           [do-a? #t])
-          []
-          (%
-           0
-           (dynamic-wind
-            (λ () (print 1))
-            (λ ()
-              (begin
-                (dynamic-wind
-                 (λ () (print 2))
-                 (λ () 
-                   ((call/cc (λ (k)
-                               (begin
-                                 (set! a k)
-                                 (λ () 12)))
-                             0)))
-                 (λ () (print 3)))
-                (dynamic-wind
-                 (λ () (print 4))
-                 (λ ()
-                   (if do-a?
-                       (begin
-                         (set! do-a? #f)
-                         (a (λ () 11)))
-                       (begin
-                         (set! a #f)
-                         12)))
-                 (λ ()
-                   (begin
-                     (print 5)
-                     (call/comp
-                      (λ (k)
-                        (%
-                         0
-                         (k 10)
-                         (λ (x) x)))
-                      0))))))
-            (λ () (print 6)))
-           (λ (x) x)))
-        '(<>
-          ([a #f] [do-a? #f])
-          [1 2 3 4 5 1 2 3 4 5 1 6 6 2 3 4 5 1 6 6]
-          12))
-  (test "post think trims dws to run on exit"
-        '(<>
-          ([output (list)]
-           [exit-k #f]
-           [done? #f])
-          []
-          (%
-           0
-           (begin
-             ;; Capture a continuation w.r.t. the default prompt tag:
-             (call/cc
-              (λ (esc)
-                (dynamic-wind
-                 (λ () 0)
-                 (λ () 
-                   ;; Set a prompt for tag p1:
-                   (%
-                    1
-                    
-                    (dynamic-wind
-                     (λ () 0)
-                     ;; inside d-w, jump out:
-                     (λ () (esc 100))
-                     (λ ()
-                       (begin
-                         ;; As we jump out, capture a continuation 
-                         ;; w.r.t. p1:
-                         ((call/cc
-                           (λ (k) 
-                             (begin
-                               (set! exit-k k)
-                               (λ () 10)))
-                           1))
-                         (set! output (cons 99 output)))))
-                    (λ (x) x)))
-                 (λ ()
-                   ;; This post thunk is not in the
-                   ;;  delimited continuation captured
-                   ;; via tag p1:
-                   (set! output (cons 101 output)))))
-              0)
-             (if done?
-                 (begin
-                   (set! exit-k #f)
-                   output)
-                 (begin
-                   (set! done? #t)
-                   ;; Now invoke the delimited continuation, which must
-                   ;; somehow continue the jump to `esc':
-                   (%
-                    1
-                    (exit-k (λ () 10))
-                    (λ (x) x)))))
-           (λ (x) (x))))
-        '(<> 
-          ([output (list 99 101 99)]
-           [exit-k #f]
-           [done? #t])
-          ()
-          (list 99 101 99)))
-  (test "post thunk captures continuation that is invoked without target % (gets stuck)"
-        '(<>
-          ([output (list)]
-           [exit-k #f])
-          ()
-          (%
-           0
-           ((λ (k)
-              (abort 0
-                     (λ ()
-                       (%
-                        1
-                        (exit-k (λ () (set! exit-k #f)))
-                        (λ (x) x)))))
-            (call/cc 
-             (λ (esc)
-               (%
-                1
-                (dynamic-wind
-                 (λ () 0)
-                 (λ () (esc 100))
-                 (λ ()
-                   (begin
-                     ((call/cc
-                       (λ (k) 
-                         (begin
-                           (set! exit-k k)
-                           (λ () 10)))
-                       1))
-                     (set! output (cons 101 output)))))
-                (λ (x) x)))
-             0))
-           (λ (f) (f))))
-        (term (<>
-               ((output (list 101 101))
-                (exit-k #f))
-               ()
-               (%
-                1
-                ((cont 0
-                       ((λ (k)
-                          (abort
-                           0
-                           (λ ()
-                             (%
-                              1
-                              (exit-k (λ () (set! exit-k #f)))
-                              (λ (x) x)))))
-                        hole))
-                 100)
-                (λ (x1) x1)))))
-  (test "similar way to get stuck, but using the pre thunk"
-        '(<>
-          ([output (list)]
-           [exit-k #f])
-          ()
-          (%
-           0
-           ((λ (k)
-              (abort 0
-                     (λ ()
-                       (%
-                        1
-                        (exit-k (λ () (set! exit-k #f)))
-                        (λ (x) x)))))
-            (call/cc 
-             (λ (esc)
-               (%
-                1
-                (dynamic-wind
-                 (λ ()
-                   (begin
-                     ((call/cc
-                       (λ (k) 
-                         (begin
-                           (set! exit-k k)
-                           (λ () 10)))
-                       1))
-                     (set! output (cons 101 output))))
-                 (λ () (esc 100))
-                 (λ () 0))
-                (λ (x) x)))
-             0))
-           (λ (f) (f))))
-        (term (<>
-               ((output (list 101 101))
-                (exit-k #f))
-               ()
-               (%
-                1
-                (dw
-                 x_1 ; <--- beware: this is a fresh variable. Will it always be x_1?
-                 (begin
-                   ((call/cc
-                     (λ (k1)
-                       (begin
-                         (set! exit-k k1)
-                         (λ () 10)))
-                     1))
-                   (set! output (cons 101 output)))
-                 ((cont
-                   0
-                   ((λ (k)
-                      (abort
-                       0
-                       (λ ()
-                         (%
-                          1
-                          (exit-k (λ () (set! exit-k #f)))
-                          (λ (x)
-                            x)))))
-                    hole))
-                  100)
-                 0)
-                (λ (x1) x1)))))
-  (test "loop"
-        '(<>
-          ([counter (list 4 3 2 1 0)])
-          []
-          (%
-           0
-           ((λ (k)
-              ((λ (k2)
-                 (if (first (rest k2))
-                     ((first k2) (λ () 
-                                   (if (zero? (first counter))
-                                       (list 10 #f)
-                                       (begin
-                                         (set! counter (rest counter))
-                                         ((call/cc (λ (k) (λ () 
-                                                            (cons k (list #t))))
-                                                   0))))))
-                     (first k2)))
-               (%
-                1
-                (k (λ ()
-                     ((call/cc (λ (k) (λ () 
-                                        (cons k (list #t))))
-                               0))))
-                (λ (x) x))))
-            (%
-             1
-             ((call/cc (λ (k) (λ () k))
-                       1))
-             (λ (x) x)))
-           (λ (x) x)))
-        '(<>
-          ([counter (list 0)])
-          []
-          10))
-  (void))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Chain
-
-(define chain-defns
-  `([make
-     (λ (pre post)
-       (%
-        0
-        (dynamic-wind
-         (λ () (print pre))
-         (λ ()
-           ((call/comp
-             (λ (k) (λ () k))
-             0)))
-         (λ () (print post)))
-        (λ (x) x)))]
-    [chain
-     (λ (E_1 E_2)
-       (%
-        0
-        (E_1 (λ ()
-               (E_2 (λ ()
-                      ((call/comp
-                        (λ (k) (λ () k))
-                        0))))))
-        (λ (x) x)))]
-    [composable->replacing
-     (λ (E)
-       (%
-        0
-        (E (λ ()
-             ((call/cc
-               (λ (k) (λ () k))
-               0))))
-        (λ (x) x)))]))
-
-(define (with-chain-bindings e)
-  `((λ (one-two three-four)
-      ((λ (one-three-four-two one-NINE-three-four-two )
-         ((λ (one-two* three-four* one-three-four-two* one-NINE-three-four-two*)
-            (%
-             0
-             ,e
-             (λ (x) x)))
-          (composable->replacing one-two)
-          (composable->replacing three-four)
-          (composable->replacing one-three-four-two)
-          (composable->replacing one-NINE-three-four-two)))
-       (chain one-two three-four)
-       (chain one-two (λ (x) ((λ (z)
-                                (begin (print 9) z))
-                              (three-four x))))))
-    (make 1 2)
-    (make 3 4)))
-
-(define chain-output '(1 2 3 4 1 3 4 2 1 3 4 9 2 1 2 3 4 1 3 4 2 1 3 4 9 2))
-
-(define (chain-tests)
-  (test "check chain setup"
-        `(<>
-          (,@chain-defns)
-          []
-          ,(with-chain-bindings 10))
-        `(<>
-          (,@chain-defns)
-          [,@chain-output]
-          10))
-  (test "chain sharing"
-        `(<>
-          (,@chain-defns)
-          []
-          ,(with-chain-bindings 
-            `(one-three-four-two* (λ ()
-                                    (one-two* (λ () 0))))))
-        `(<>
-          (,@chain-defns)
-          [,@chain-output 1 3 4 2]
-          0))
-  (test "chain non-sharing"
-        `(<>
-          (,@chain-defns)
-          []
-          ,(with-chain-bindings 
-            `(one-three-four-two* (λ ()
-                                    (three-four* (λ () 0))))))
-        `(<>
-          (,@chain-defns)
-          [,@chain-output 1 3 4 2 3 4]
-          0))
-  (test "chain sharing with spliced frame"
-        `(<>
-          (,@chain-defns)
-          []
-          ,(with-chain-bindings 
-            `(one-three-four-two* (λ ()
-                                    (one-NINE-three-four-two* (λ () 0))))))
-        `(<>
-          (,@chain-defns)
-          [,@chain-output 1 3 4 9 2]
-          0))
-  (test "chain sharing with spliced frame (skipped)"
-        `(<>
-          (,@chain-defns)
-          []
-          ,(with-chain-bindings 
-            `(one-NINE-three-four-two* (λ ()
-                                         (one-three-four-two* (λ () 0))))))
-        `(<>
-          (,@chain-defns)
-          [,@chain-output 1 3 4 2]
-          0)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Run
-
-(begin
-  (basic-tests)
-  (r6rs-dw-tests)
-  (cont-tests)
-  (chain-tests)
-  (printf "All ~s tests passed.\n" tests-passed))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/info.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/info.rkt
deleted file mode 100644
index 9208ca242d..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/info.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang info
-
-(define name "Reduction Semantics examples")
-
-(define test-omit-paths '("church.rkt"
-                          "combinators.rkt"
-                          "compatible-closure.rkt"
-                          "delim-cont/test.rkt"
-                          "letrec.rkt"
-                          "list-machine/slides.rkt"
-                          "omega.rkt"
-                          "r6rs/r6rs-tests.rkt"
-                          "r6rs/show-examples.rkt"
-                          "racket-machine/impl-exec.rkt"
-                          "racket-machine/reduction-test.rkt"
-                          "racket-machine/verification-test.rkt"
-                          "semaphores.rkt"
-                          "subject-reduction.rkt"
-                          "threads.rkt"
-                          "types.rkt"))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/let-poly.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/let-poly.rkt
deleted file mode 100644
index 88c39fe4a8..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/let-poly.rkt
+++ /dev/null
@@ -1,742 +0,0 @@
-#lang racket/base
-
-(require redex/reduction-semantics
-         (only-in redex/private/generate-term pick-an-index)
-         racket/match
-         racket/list
-         racket/contract
-         racket/bool racket/set
-         (only-in redex/examples/stlc-tests-lib consistent-with?))
-
-(provide (all-defined-out))
-
-(define-language stlc
-  (M N ::= 
-     (λ x M)
-     (M N)
-     x
-     c
-     (let ([x M]) N))
-  (Γ (x σ Γ)
-     ·)
-  (σ τ ::=
-     int
-     (σ → τ)
-     (list τ)
-     (ref τ)
-     x)
-  (c d ::= c0 c1)
-  (c0 ::= + integer)
-  (c1 ::= cons nil hd tl new get set)
-  (x y r ::= variable-not-otherwise-mentioned)
-  
-  (v (λ x M)
-     c
-     ((cons v) v)
-     (cons v)
-     (+ v)
-     (set v)
-     r)
-  (E hole
-     (E M)
-     (v E)
-     (let ([x E]) M))
-  (Σ ::= · (r v Σ))
-  
-  (κ ::= 
-     · 
-     (λ τ κ)
-     (1 Γ M κ)
-     (2 τ κ))
-  
-  (G  ::= · (τ σ G))
-  (Gx ::= · (x σ Gx)))
-
-(define v? (redex-match? stlc v))
-(define τ? (redex-match? stlc τ))
-(define x? (redex-match? stlc x))
-(define M? (redex-match? stlc M))
-(define Σ-M? (redex-match? stlc (Σ M)))
-
-#|
-
-The typing judgment has no rule with multiple 
-(self-referential) premises. Instead, it explicitly
-manipulates a continuation so that it can, when it
-discovers a type equality, simply do the substitution
-through the continuation. This also makes it possible
-to easily generate fresh variables by picking ones
-that aren't in the expression or the continuation.
-
-The 'tc-down' rules recur thru the term to find a type
-of the left-most subexpression and the 'tc-up' rules
-bring that type back, recurring on the continuation.
-
-|#
-
-(define-judgment-form stlc
-  #:mode (typeof I O)
-  #:contract (typeof M σ)
-  
-  [(tc-down · M · σ)
-   -------------
-   (typeof M σ)])
-
-(define-judgment-form stlc
-  #:mode (tc-down I I I O)
-  #:contract (tc-down Γ M κ σ)
-  
-  [(tc-up (const-type0 c0) κ σ_ans)
-   ------------------------------
-   (tc-down Γ c0 κ σ_ans)]
-  
-  [(where x ,(variable-not-in (term (Γ κ)) 'γ))
-   (tc-up (const-type1 x c1) κ σ_ans)
-   ------------------------------
-   (tc-down Γ c1 κ σ_ans)]
-  
-  [(where τ (lookup-Γ Γ x))
-   (tc-up τ κ σ_ans)
-   ---------------------------
-   (tc-down Γ x κ σ_ans)]
-  
-  [(where y ,(variable-not-in (term (x Γ M κ)) 'α2-))
-   (tc-down (x y Γ) M (λ y κ) σ_ans)
-   ------------------------------------------------
-   (tc-down Γ (λ x M) κ σ_ans)]
-  
-  [(tc-down Γ M_1 (1 Γ M_2 κ) σ_2)
-   --------------------------
-   (tc-down Γ (M_1 M_2) κ σ_2)]
-  
-  [(where N_2 (subst N x v))
-   (where y ,(variable-not-in (term N_2) 'l))
-   (tc-down Γ ((λ y N_2) v) κ σ_2)
-   ------------------------------------------
-   (tc-down Γ (let ([x v]) N) κ σ_2)]
-  
-  [(where #t (not-v? M))
-   (tc-down Γ ((λ x N) M) κ σ_2)
-   ---------------------------------
-   (tc-down Γ (let ([x M]) N) κ σ_2)])
-
-(define-judgment-form stlc
-  #:mode (tc-up I I O)
-  #:contract (tc-up τ κ σ)
-  
-  [---------------------
-   (tc-up σ_ans · σ_ans)]
-  
-  [(tc-down Γ M (2 τ κ) σ_ans)
-   ---------------------------
-   (tc-up τ (1 Γ M κ) σ_ans)]
-  
-  [(where x ,(variable-not-in (term (τ_1 τ_2 κ)) 'α1-))
-   (where G (unify τ_2 (τ_1 → x)))
-   (tc-up (apply-subst-τ G x)
-          (apply-subst-κ G κ)
-          σ_ans)
-   ---------------------------------------------------
-   (tc-up τ_1 (2 τ_2 κ) σ_ans)]
-  
-  [(tc-up (τ_1 → τ_2) κ σ_ans)
-   ---------------------------
-   (tc-up τ_2 (λ τ_1 κ) σ_ans)])
-
-(define-metafunction stlc
-  const-type0 : c0 -> σ
-  [(const-type0 +) (int → (int → int))]
-  [(const-type0 integer) int])
-
-(define-metafunction stlc
-  const-type1 : x c1 -> σ
-  [(const-type1 x nil) (list x)]
-  [(const-type1 x cons) (x → ((list x) → (list x)))]
-  [(const-type1 x hd) ((list x) → x)]
-  [(const-type1 x tl) ((list x) → (list x))]
-  [(const-type1 x new) (x → (ref x))]
-  [(const-type1 x get) ((ref x) → x)]
-  [(const-type1 x set) ((ref x) → (x → x))])
-
-(define-metafunction stlc
-  lookup-Γ : Γ x -> σ or #f
-  [(lookup-Γ (x σ Γ) x) σ]
-  [(lookup-Γ (x σ Γ) y) (lookup-Γ Γ y)]
-  [(lookup-Γ · x) #f])
-
-(define-metafunction stlc
-  unify : τ τ -> Gx or ⊥
-  [(unify τ σ) (uh (τ σ ·) ·)])
-
-#|
-
-Algorithm copied from Chapter 8 in _Handbook of Automated Reasoning_:
-Unification Theory by Franz Baader and Wayne Synder
-http://www.cs.bu.edu/~snyder/publications/UnifChapter.pdf
-
-The 'uh' function iterates over a set of equations applying the
-rules from the paper, building up the result substitution in G_r.
-
-|#
-
-(define-metafunction stlc
-  uh : G Gx -> Gx or ⊥
-  
-  [(uh · Gx) Gx]
-  
-  ;; orient
-  [(uh (τ x G) Gx) (uh (x τ G) Gx) (where #t (not-var? τ))]
-  
-  ;; trivial (other cases are covered by decomposition rule)
-  [(uh (x x G) Gx) (uh G Gx)]
-  
-  ;; decomposition
-  [(uh ((τ_1 → τ_2) (σ_1 → σ_2) G) Gx) (uh (τ_1 σ_1 (τ_2 σ_2 G)) Gx)]
-  [(uh ((list τ)    (list σ)    G) Gx) (uh (τ σ G)               Gx)]
-  [(uh ((ref τ)     (ref σ)     G) Gx) (uh (τ σ G)               Gx)]
-  [(uh (int         int         G) Gx) (uh G                     Gx)]
-  
-  ;; symbol clash
-  [(uh (τ σ G) Gx) ⊥ (where #t (not-var? τ)) (where #t (not-var? σ))]
-  
-  ;; occurs check
-  [(uh (x τ G) Gx) ⊥ (where #t (in-vars-τ? x τ))]
-  
-  ;; variable elimination
-  [(uh (x τ G) Gx)
-   (uh (eliminate-G x τ G) (x τ (eliminate-G x τ Gx)))])
-
-(define-metafunction stlc
-  eliminate-G : x τ G -> G
-  [(eliminate-G x τ ·) ·]
-  [(eliminate-G x τ (σ_1 σ_2 G))
-   ((eliminate-τ x τ σ_1) (eliminate-τ x τ σ_2) (eliminate-G x τ G))])
-
-(define-metafunction stlc
-  eliminate-τ : x τ σ -> σ
-  [(eliminate-τ x τ (σ_1 → σ_2)) ((eliminate-τ x τ σ_1) → (eliminate-τ x τ σ_2))]
-  [(eliminate-τ x τ (list σ)) (list (eliminate-τ x τ σ))]
-  [(eliminate-τ x τ (ref σ)) (ref (eliminate-τ x τ σ))]
-  [(eliminate-τ x τ int) int]
-  [(eliminate-τ x τ x) τ]
-  [(eliminate-τ x τ y) y])
-
-(define-metafunction stlc
-  ∨ : boolean boolean -> boolean
-  [(∨ #f #f) #f]
-  [(∨ boolean_1 boolean_2) #t])
-
-(define-metafunction stlc
-  not-var? : τ -> boolean
-  [(not-var? x) #f]
-  [(not-var? τ) #t])
-
-(define-metafunction stlc
-  in-vars-τ? : x τ -> boolean
-  [(in-vars-τ? x (τ_1 → τ_2)) (∨ (in-vars-τ? x τ_1) (in-vars-τ? x τ_2))]
-  [(in-vars-τ? x (list τ)) (in-vars-τ? x τ)]
-  [(in-vars-τ? x (ref τ)) (in-vars-τ? x τ)]
-  [(in-vars-τ? x int) #f]
-  [(in-vars-τ? x x) #t]
-  [(in-vars-τ? x y) #f])
-
-(define-metafunction stlc
-  apply-subst-τ : Gx τ -> τ
-  [(apply-subst-τ · τ) τ]
-  [(apply-subst-τ (x τ G) σ)
-   (apply-subst-τ G (eliminate-τ x τ σ))])
-
-(define-metafunction stlc
-  apply-subst-κ : Gx κ -> κ
-  [(apply-subst-κ Gx ·) ·]
-  [(apply-subst-κ Gx (λ σ κ)) 
-   (λ (apply-subst-τ Gx σ) (apply-subst-κ Gx κ))]
-  [(apply-subst-κ Gx (1 Γ M κ))
-   (1 (apply-subst-Γ Gx Γ) M (apply-subst-κ Gx κ))]
-  [(apply-subst-κ Gx (2 σ κ))
-   (2 (apply-subst-τ Gx σ)
-      (apply-subst-κ Gx κ))])
-
-(define-metafunction stlc
-  apply-subst-Γ : Gx Γ -> Γ
-  [(apply-subst-Γ Gx (y σ Γ)) (y (apply-subst-τ Gx σ) (apply-subst-Γ Gx Γ))]
-  [(apply-subst-Γ Gx ·) ·])
-
-(define-metafunction stlc
-  not-v? : M -> boolean
-  [(not-v? v) #f]
-  [(not-v? M) #t])
-
-#|
-
-The reduction relation rewrites a pair of
-a store and an expression to a new store
-and a new expression or into the string
- "error" (for hd and tl of the empty list)
-
-|#
-
-(define red
-  (reduction-relation
-   stlc
-   (--> (Σ (in-hole E ((λ x M) v)))
-        (Σ (in-hole E (subst M x v)))
-        "βv")
-   (--> (Σ (in-hole E (let ([x v]) M)))
-        (Σ (in-hole E (subst M x v)))
-        "let")
-   (--> (Σ (in-hole E (hd ((cons v_1) v_2))))
-        (Σ (in-hole E v_1))
-        "hd")
-   (--> (Σ (in-hole E (tl ((cons v_1) v_2))))
-        (Σ (in-hole E v_2))
-        "tl")
-   (--> (Σ (in-hole E (hd nil)))
-        "error"
-        "hd-err")
-   (--> (Σ (in-hole E (tl nil)))
-        "error"
-        "tl-err")
-   (--> (Σ (in-hole E ((+ integer_1) integer_2)))
-        (Σ (in-hole E ,(+ (term integer_1) (term integer_2))))
-        "+")
-   (--> (Σ (in-hole E (new v)))
-        ((r v Σ) (in-hole E r))
-        (fresh r)
-        "ref")
-   (--> (Σ (in-hole E ((set x) v)))
-        ((update-Σ Σ x v) (in-hole E (lookup-Σ Σ x)))
-        "set")
-   (--> (Σ (in-hole E (get x)))
-        (Σ (in-hole E (lookup-Σ Σ x)))
-        "get")))
-
-#|
-
-Capture avoiding substitution
-
-|#
-
-
-(define-metafunction stlc
-  subst : M x M -> M
-  [(subst x x M_x)
-   M_x]
-  [(subst (λ x M) x M_x)
-   (λ x M)]
-  [(subst (let ([x M]) N) x M_x)
-   (let ([x (subst M x M_x)]) N)]
-  [(subst (λ y M) x M_x)
-   (λ x_new (subst (replace M y x_new) x M_x))
-   (where x_new ,(variable-not-in (term (x y M))
-                                  (term y)))]
-  [(subst (let ([y N]) M) x M_x)
-   (let ([x_new (subst N x M_x)]) (subst (replace M y x_new) x M_x))
-   (where x_new ,(variable-not-in (term (x y M))
-                                  (term y)))]
-  [(subst (M N) x M_x)
-   ((subst M x M_x) (subst N x M_x))]
-  [(subst M x M_z)
-   M])
-
-(define-metafunction stlc
-  [(replace x x x_new)
-   x_new]
-  [(replace (λ x_0 M) x x_new)
-   (λ (replace x_0 x x_new) (replace M x x_new))]
-  [(replace (let ([x_0 M]) N) x x_new)
-   (let ([(replace x_0 x x_new)
-          (replace M x x_new)])
-     (replace N x x_new))]
-  [(replace (M N) x x_new)
-   ((replace M x x_new) (replace N x x_new))]
-  [(replace M x x_new)
-   M])
-
-#;
-(define-metafunction stlc
-  [(replace (any_1 ...) x_1 x_new)
-   ((replace any_1 x_1 x_new) ...)]
-  [(replace x_1 x_1 x_new)
-   x_new]
-  [(replace any_1 x_1 x_new)
-   any_1])
-
-(define-metafunction stlc
-  lookup-Σ : Σ x -> v
-  [(lookup-Σ (x v Σ) x) v]
-  [(lookup-Σ (x v Σ) y) (lookup-Σ Σ y)])
-
-(define-metafunction stlc
-  update-Σ : Σ x v -> Σ
-  [(update-Σ (x v_1 Σ) x v_2) (x v_2 Σ)]
-  [(update-Σ (x v_1 Σ) y v_2) (x v_1 (update-Σ Σ y v_2))])
-
-#|
-
-A top-level evaluator
-
-|#
-
-(define/contract (Eval M)
-  (-> M? (or/c "error" 'list 'λ 'ref number?))
-  (define M-t (type-check M))
-  (unless M-t
-    (error 'Eval "doesn't typecheck: ~s" M))
-  (define res (apply-reduction-relation* red (term (· ,M))))
-  (unless (= 1 (length res))
-    (error 'Eval "internal error: not exactly 1 result ~s => ~s" M res))
-  (define ans (car res))
-  (match (car res)
-    ["error" "error"]
-    [`(,Σ ,N)
-     (define ans-t (type-check N Σ))
-     (unless (equal? M-t ans-t)
-       (error 'Eval "internal error: type soundness fails for ~s" M))
-     (match N
-       [(? x?) (cond
-                 [(term (in-dom? ,Σ ,N))
-                  'ref]
-                 [else
-                  (error 'Eval "internal error: reduced to a free variable ~s"
-                         M)])]
-       [(or `((cons ,_) ,_) `nil) 'list]
-       [(or `(λ ,_ ,_) `(cons ,_) `(set ,_) `(+ ,_)) 'λ]
-       [(? number?) N]
-       [_ (error 'Eval "internal error: didn't reduce to a value ~s" M)])]))
-
-#|
-
-A type checker; the optional argument is a store to use
-for type checking free variables in M.
-
-|#
-
-(define/contract (type-check M [Σ (term ·)])
-  (->* (M?) (any/c) (or/c τ? #f))
-  (define M-ts (judgment-holds (typeof ,(Σ+M->M Σ M) τ) τ))
-  (cond
-    [(null? M-ts)
-     #f]
-    [(null? (cdr M-ts))
-     (car M-ts)]
-    [else
-     (error 'type-check "non-unique type: ~s : ~s" M M-ts)]))
-
-;; building an expression out of a store can be done in this model
-;; with just topological sort because there are no recursive types,
-;; so the store will not contain any cycles
-(define (Σ+M->M Σ M)
-  ;; nodes : edges[r -o> v]
-  (define nodes (make-hash))
-  (define edges (make-hash))
-  (let loop ([Σ Σ])
-    (match Σ
-      [`· (void)]
-      [`(,r ,v ,Σ) 
-       (hash-set! nodes r v)
-       (loop Σ)]))
-  
-  (for ([(n rhs) (in-hash nodes)]) (hash-set! edges n (set)))
-  (for ([(n-src rhs) (in-hash nodes)])
-    (for ([(n-dest _) (in-hash nodes)])
-      (when (mentions-node? n-dest rhs)
-        (hash-set! edges n-src (set-add (hash-ref edges n-src) n-dest)))))
-  (define rev-sorted (reverse-topo-sort (for/list ([(k v) (in-hash nodes)]) k)
-                                        edges))
-  (let loop ([sorted rev-sorted])
-    (cond
-      [(empty? sorted) M]
-      [else
-       (define r (car sorted))
-       (term (let ([,r (new ,(hash-ref nodes r))])
-               ,(loop (cdr sorted))))])))
-
-(define (mentions-node? v r)
-  (let loop ([v v])
-    (cond
-      [(symbol? v) (equal? r v)]
-      [(pair? v) (or (loop (car v)) (loop (cdr v)))]
-      [else #f])))
-
-#|
-
-The first algorithm from this page:
-http://en.wikipedia.org/wiki/Topological_sorting#Algorithms
-
-|#
-(define/contract (reverse-topo-sort nodes edges)
-  (-> (listof any/c) (hash/c any/c (set/c any/c)) (listof any/c))
-  
-  (for ([node (in-list nodes)])
-    (unless (hash-ref edges node #f)
-      (error 'topo-sort "no edge entry for ~s" node)))
-  
-  (define incoming-counts (build-incoming-counts nodes edges))
-  (define (remove-edge src dest)
-    (hash-set! edges src (set-remove (hash-ref edges src) dest))
-    (hash-set! incoming-counts dest (- (hash-ref incoming-counts dest) 1)))
-  
-  (define l '())
-  (define s (for/set ([(n c) (in-hash incoming-counts)]
-                      #:when (zero? c))
-              n))
-  (let loop ()
-    (unless (set-empty? s)
-      (define n (set-first s))
-      (set! s (set-remove s n))
-      (set! l (cons n l))
-      (for ([m (in-set (hash-ref edges n))])
-        (remove-edge n m)
-        (when (zero? (hash-ref incoming-counts m))
-          (set! s (set-add s m))))
-      (loop)))
-  
-  l)
-
-(define (build-incoming-counts nodes edges)
-  (define incoming-counts (make-hash))
-  (for ([n (in-list nodes)]) (hash-set! incoming-counts n 0))
-  (for ([(n neighbors) (in-hash edges)])
-    (for ([neighbor (in-set neighbors)])
-      (hash-set! incoming-counts neighbor (+ (hash-ref incoming-counts neighbor) 1))))
-  incoming-counts)
-
-(module+ test
-  
-  (test-equal (build-incoming-counts '(x y z) 
-                                     (make-hash (list (cons 'x (set 'y 'z))
-                                                      (cons 'y (set 'z))
-                                                      (cons 'z (set)))))
-              (make-hash (list (cons 'x 0)
-                               (cons 'y 1)
-                               (cons 'z 2))))
-  (test-equal (reverse-topo-sort '() (make-hash)) '())
-  (test-equal (reverse-topo-sort '(x) 
-                                 (make-hash (list (cons 'x (set)))))
-              '(x))
-  (test-equal (reverse-topo-sort '(x y) 
-                                 (make-hash (list (cons 'y (set))
-                                                  (cons 'x (set 'y)))))
-              '(y x))
-  (test-equal (reverse-topo-sort '(y x) 
-                                 (make-hash (list (cons 'y (set))
-                                                  (cons 'x (set 'y)))))
-              '(y x))
-  (test-equal (reverse-topo-sort '(x y z) 
-                                 (make-hash (list (cons 'x (set 'y))
-                                                  (cons 'y (set 'z))
-                                                  (cons 'z (set)))))
-              '(z y x))
-  (test-equal (reverse-topo-sort '(x y z) 
-                                 (make-hash (list (cons 'x (set 'y 'z))
-                                                  (cons 'y (set 'z))
-                                                  (cons 'z (set)))))
-              '(z y x))
-  (define (one-of? a . bs) (for/or ([b (in-list bs)]) (equal? a b)))
-  (test-equal (one-of? (reverse-topo-sort '(x y z) 
-                                          (make-hash (list (cons 'x (set 'z))
-                                                           (cons 'y (set 'z))
-                                                           (cons 'z (set)))))
-                       '(z x y)
-                       '(z y x))
-              #t)
-  
-  (test-equal (Σ+M->M (term (r1 r2 (r2 1 ·))) (term 2))
-              (term (let ([r2 (new 1)]) (let ([r1 (new r2)]) 2))))
-  (test-equal (Σ+M->M (term (r2 1 (r1 r2 ·))) (term 2))
-              (term (let ([r2 (new 1)]) (let ([r1 (new r2)]) 2))))
-  
-  (test-equal (term (subst ((+ 1) 1) x 2))
-              (term ((+ 1) 1)))
-  (test-equal (term (subst ((+ x) x) x 2))
-              (term ((+ 2) 2)))
-  (test-equal (term (subst ((+ y) x) x 2))
-              (term ((+ y) 2)))
-  (test-equal (term (subst ((+ y) z) x 2))
-              (term ((+ y) z)))
-  (test-equal (term (subst ((λ x x) x) x 2))
-              (term ((λ x x) 2)))
-  (test-equal (consistent-with? (term (subst ((λ y x) x) x 2))
-                                (term ((λ y 2) 2)))
-              #t)
-  (test-equal (consistent-with? (term (subst ((λ y x) x) x (λ q z)))
-                                (term ((λ y (λ q z)) (λ q z))))
-              #t)
-  (test-equal (consistent-with? (term (subst ((λ y x) x) x (λ q y)))
-                                (term ((λ y2 (λ q y)) (λ q y))))
-              #t)
-  (test-equal (consistent-with? (term (subst (λ z (λ z1 z)) q 1))
-                                (term (λ z (λ z1 z))))
-              #t)
-  
-  (test-equal (consistent-with? (term (subst (let ([y x]) x) x 2))
-                                (term (let ([y 2]) 2)))
-              #t)
-  (test-equal (consistent-with? (term (subst (let ([y x]) x) x (λ q z)))
-                                (term (let ([y (λ q z)]) (λ q z))))
-              #t)
-  (test-equal (consistent-with? (term (subst (let ([y x]) x) x (λ q y)))
-                                (term (let ([y (λ q y)]) (λ q y))))
-              #t)
-  (test-equal (consistent-with? (term (subst (let ([z 11]) (let ([z1 12]) z)) q 1))
-                                (term (let ([z 11]) (let ([z1 12]) z))))
-              #t)
-  (test-equal (consistent-with? (term (subst (let ((|| +)) ||) |1| (λ x1 x1)))
-                                (term (let ((|| +)) ||)))
-              #t)
-  
-  (test-equal (term (unify x int))
-              (term (x int ·)))
-  (test-equal (term (unify int x))
-              (term (x int ·)))
-  (test-equal (term (unify int (list int)))
-              (term ⊥))
-  (test-equal (term (unify int int))
-              (term ·))
-  (test-equal (term (unify (list int) (list int)))
-              (term ·))
-  (test-equal (term (unify (int → x) (y → (list int))))
-              (term (x (list int) (y int ·))))
-  (test-equal (term (unify (int → x) (x → (list int))))
-              (term ⊥))
-  (test-equal (term (unify (x   → (y          → x))
-                           (int → ((list int) → y))))
-              (term ⊥))
-  (test-equal (term (unify (x   → (y          → x))
-                           (int → ((list int) → z))))
-              (term (z int (y (list int) (x int ·)))))
-  (test-equal (term (unify (x   → (y          → z))
-                           (int → ((list int) → x))))
-              (term (z int (y (list int) (x int ·)))))
-  (test-equal (term (unify (x   → (y   → z))
-                           (y   → (z   → int))))
-              (term (z int (y int (x int ·)))))
-  (test-equal (term (unify x (x → y)))
-              (term ⊥))
-  
-  (test-equal (judgment-holds (typeof 5 τ) τ)
-              (list (term int)))
-  (test-equal (judgment-holds (typeof nil τ) τ)
-              (list (term (list γ))))
-  (test-equal (judgment-holds (typeof (cons 1) τ) τ)
-              (list (term ((list int) → (list int)))))
-  (test-equal (judgment-holds (typeof ((cons 1) nil) τ) τ)
-              (list (term (list int))))
-  (test-equal (consistent-with? (judgment-holds (typeof (λ x x) τ) τ)
-                                (list (term (α → α))))
-              #t)
-  (test-equal (consistent-with? (judgment-holds (typeof (λ x (λ y x)) τ) τ)
-                                (list (term (α → (α1 → α)))))
-              #t)
-  (test-equal (consistent-with? (judgment-holds (typeof (λ f (λ x (f ((+ x) 1)))) τ) τ)
-                                (list (term ((int → α) → (int → α)))))
-              #t)
-  (test-equal (judgment-holds (typeof (λ f (λ x ((+ (f ((+ x) 1))) 2))) τ) τ)
-              (list (term ((int → int) → (int → int)))))
-  (test-equal (judgment-holds (typeof (λ f (λ x ((+ x) (f 1)))) τ) τ)
-              (list (term ((int → int) → (int → int)))))
-  (test-equal (judgment-holds (typeof (λ x (x x)) τ) τ)
-              (list))
-  (test-equal (judgment-holds (typeof ((+ ((+ 1) 2)) ((+ 3) 4)) τ) τ)
-              (list (term int)))
-  (test-equal (judgment-holds (typeof ((cons ((cons 1) nil)) nil) τ) τ)
-              (list (term (list (list int)))))
-  (test-equal (judgment-holds (typeof ((cons nil) nil) τ) τ)
-              (list (term (list (list γ1)))))
-  (test-equal (judgment-holds (typeof ((set (new 1)) 2) τ) τ)
-              (list (term int)))
-  (test-equal (judgment-holds (typeof (get (new 1)) τ) τ)
-              (list (term int)))
-  (test-equal (judgment-holds (typeof (let ([id (λ y y)])
-                                        ((id id) 1))
-                                      τ)
-                              τ)
-              (list (term int)))
-  (test-equal (judgment-holds (typeof (let ([r (new nil)])
-                                        (let ([n ((set r) ((cons 5) nil))])
-                                          ((hd (get r)) 1)))
-                                      τ)
-                              τ)
-              (list))
-  
-  (test-->> red (term (· ((λ x x) 7))) (term (· 7)))
-  (test-->> red (term (· (((λ x (λ x x)) 2) 1))) (term (· 1)))
-  (test-->> red (term (· (((λ x (λ y x)) 2) 1))) (term (· 2)))
-  (test-->> red 
-            (term (· ((λ x ((cons x) nil)) 11)))
-            (term (· ((cons 11) nil))))
-  (test-->> red 
-            (term (· ((λ x ((cons x) nil)) 11)))
-            (term (· ((cons 11) nil))))
-  (test-->> red 
-            (term (· ((cons ((λ x x) 11)) nil)))
-            (term (· ((cons 11) nil))))
-  (test-->> red
-            (term (· (cons ((λ x x) 1))))
-            (term (· (cons 1))))
-  (test-->> red
-            (term (· ((cons ((λ x x) 1)) nil)))
-            (term (· ((cons 1) nil))))
-  (test-->> red
-            (term (· (hd ((λ x ((cons x) nil)) 11))))
-            (term (· 11)))
-  (test-->> red
-            (term (· (tl ((λ x ((cons x) nil)) 11))))
-            (term (· nil)))
-  (test-->> red
-            (term (· (tl nil)))
-            "error")
-  (test-->> red
-            (term (· (hd nil)))
-            "error")
-  (test-->> red
-            (term (· ((+ 1) (hd nil))))
-            "error")
-  (test-->> red
-            (term (· ((+ ((+ 1) 2)) ((+ 3) 4))))
-            (term (· 10)))
-  (test-->> red
-            (term (· ((λ f (f 3)) (cons 1))))
-            (term (· ((cons 1) 3))))
-  (test-->> red
-            (term (· ((λ f (f 3)) (+ 1))))
-            (term (· 4)))
-  (test-->> red
-            (term (· (let ([f (+ 2)]) ((+ (f 3)) (f 4)))))
-            (term (· 11)))
-  (test-->> red
-            (term (· (get (new 1))))
-            (term ((r 1 ·) 1)))
-  (test-->> red
-            (term (· ((set (new 1)) 2)))
-            (term ((r 2 ·) 1)))
-  (test-->> red
-            #:equiv consistent-with?
-            (term (· (let ([r (new 1)])
-                       (let ([o ((set r) 2)])
-                         (get r)))))
-            (term ((r 2 ·) 2)))
-  (test-->> red
-            #:equiv consistent-with?
-            (term (· (let ([r (new nil)])
-                       (let ([n ((set r) ((cons 5) nil))])
-                         ((hd (get r)) 1)))))
-            (term ((r ((cons 5) nil) ·) (5 1))))
-  
-  (test-equal (Eval (term ((λ x x) 3)))
-              3)
-  (test-equal (Eval (term ((cons 1) nil)))
-              'list)
-  (test-equal (Eval (term (cons 1)))
-              'λ)
-  (test-equal (Eval (term (λ x x)))
-              'λ)
-  (test-equal (type-check (term 5))
-              (term int))
-  (test-equal (type-check (term (5 5)))
-              #f)
-  (test-equal (type-check (term r1) (term (r1 r (r 1 ·))))
-              (term (ref (ref int))))
-  (test-equal (type-check (term r1) (term (r 1 (r1 r ·))))
-              (term (ref (ref int)))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/letrec.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/letrec.rkt
deleted file mode 100644
index afc91faacf..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/letrec.rkt
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang racket
-
-#|
-
-BUG: letrec & let are not handled properly by substitution
-
-|#
-
-(require redex "subst.rkt")
-
-(reduction-steps-cutoff 20)
-
-(define-language lang
-  (p ((store (x v) ...) e))
-  (e (set! x e)
-     (let ((x e)) e)
-     (letrec ((x e)) e)
-     (begin e e ...)
-     (e e)
-     x
-     v)
-  (v (lambda (x) e)
-     number)
-  (x variable)
-  (pc ((store (x v) ...) ec))
-  (ec (ec e)
-      (v ec)
-      (set! variable ec)
-      (let ((x ec)) e)
-      (begin ec e e ...)
-      hole))
-
-;; collect : term -> term
-;; performs a garbage collection on the term `p'
-(define (collect p)
-  (define (substitute var exp body)
-    (term-let ((var var) 
-               (exp exp)
-               (body body))
-      (term (subst (var exp body)))))
-  
-  (define (find-unused vars p)
-    (filter (λ (var) (unused? var p))
-            vars))
-  
-  (define (unused? var p)
-    (let ([rhss (map cadr (cdar p))]
-          [body (cadr p)])
-      (and (not (free-in? var body))
-           (andmap (λ (rhs) (not (free-in? var rhs)))
-                   rhss))))
-  
-  (define (free-in? var body)
-    (not (equal? (substitute var (gensym) body)
-                 body)))
-  
-  (define (remove-unused vars p)
-    `((store ,@(filter (λ (binding) (not (memq (car binding) vars)))
-                       (cdar p)))
-      ,(cadr p)))
-  
-  (let* ([vars (map car (cdar p))]
-         [unused (find-unused vars p)])
-    (cond
-      [(null? unused) p]
-      [else
-       (collect (remove-unused unused p))])))
-
-(define reductions
-  (reduction-relation
-   lang
-   (==> (in-hole pc_1 (begin v e_1 e_2 ...))
-        (in-hole pc_1 (begin e_1 e_2 ...))
-        begin\ many)
-   
-   (==> (in-hole pc_1 (begin e_1))
-        (in-hole pc_1 e_1)
-        begin\ one)
-   
-   (==> ((store (x_before v_before) ...
-           (x_i v_i)
-           (x_after v_after) ...)
-         (in-hole ec_1 x_i))
-        ((store 
-             (x_before v_before) ... 
-           (x_i v_i)
-           (x_after v_after) ...)
-         (in-hole ec_1 v_i))
-        deref)
-   
-   (==> ((store (x_before v_before) ...
-           (x_i v)
-           (x_after v_after) ...)
-         (in-hole ec_1 (set! x_i v_new)))
-        ((store (x_before v_before) ... 
-           (x_i v_new)
-           (x_after v_after) ...)
-         (in-hole ec_1 v_new))
-        set!)     
-   
-   (==> (in-hole pc_1 ((lambda (x_1) e_1) v_1))
-        (in-hole pc_1 (subst (x_1 v_1 e_1)))
-        βv)
-   
-   (==> ((store (name the-store any) ...)
-         (in-hole ec_1 (let ((x_1 v_1)) e_1)))
-        ,(let ((new-x (variable-not-in (term (the-store ...)) (term x_1))))
-           (term
-            ((store the-store ... (,new-x v_1))
-             (in-hole ec_1 (subst (x_1 ,new-x e_1))))))
-        let)
-   
-   (==> (in-hole pc_1 (letrec ((x_1 e_1)) e_2))
-        (in-hole pc_1 (let ((x_1 0)) (begin (set! x_1 e_1) e_2)))
-        letrec)
-   
-   with
-   [(--> a ,(collect (term b))) (==> a b)]))
-
-(define (run e) (traces reductions `((store) ,e)))
-
-(run '(letrec ((f (lambda (x)
-                    (letrec ((y (f 1))) 
-                      2))))
-        (f 3)))
-
-(run '(letrec ((f (lambda (x)
-                    (letrec ((y 1))
-                      (f 1)))))
-        (f 3)))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/README.txt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/README.txt
deleted file mode 100644
index c2832620e0..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/README.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-This is the model from
-
-  A List-machine Benchmark for Mechanized Metatheory
-  Andrew W. Appel, Robert Dockins, and Xavier Leroy
-
-Specifically, it contains all of the formal definitions in sections 3
-and 4 (list-machine.rkt), section 5 (list-machine-typing.rkt), the
-example from section 6 (sample.rkt), and the lub definition in 8.1
-(also in list-machine-typing.rkt).
-
-All of the relations and functions are directly executable in Redex
-(using the lub definition from 8.1, not the one in 5).
-
-The file test.rkt contains unit tests, roughly one per case in each of
-the definitions, and the file slides.rkt is a Slideshow presentation
-that shows the instruction reduction relation and the type system.
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/list-machine-typing.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/list-machine-typing.rkt
deleted file mode 100644
index 45134bf8c5..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/list-machine-typing.rkt
+++ /dev/null
@@ -1,178 +0,0 @@
-#lang racket
-(require redex/reduction-semantics
-         redex/examples/list-machine/list-machine)
-
-(provide list-machine-typing
-         check-program
-         check-blocks
-         check-block
-         check-instr
-         :set :lookup
-         ⊂ ⊔ Γ-⊂
-         dom l-⊂)
-
-(define-extended-language list-machine-typing list-machine
-  (τ nil (list τ) (listcons τ))
-  (Γ empty (v : τ Γ))
-  (Π empty (l : Γ Π)))
-
-(define-judgment-form list-machine-typing
-  #:contract (check-program p Π)
-  #:mode (check-program I I)
-  [(check-blocks Π p)
-   (where #t (l-⊂ (dom Π) (dom p)))
-   (:lookup Π l0 (v0 : nil empty))
-   -----
-   (check-program p Π)])
-
-(define-judgment-form list-machine-typing
-  #:contract (Γ-⊂ Γ Γ)
-  #:mode (Γ-⊂ I I)
-  [-----
-   (Γ-⊂ Γ empty)]
-  [(:lookup Γ_1 v τ_1) 
-   (⊂ τ_1 τ_2)
-   (Γ-⊂ Γ_1 Γ_2)
-   ----
-   (Γ-⊂ Γ_1 (v : τ_2 Γ_2))])
-
-(define-judgment-form list-machine-typing
-  #:contract (check-blocks Π p)
-  #:mode (check-blocks I I)
-  [(:lookup Π l Γ)
-   (check-block Π Γ ι)
-   (check-blocks Π p)
-   -----
-   (check-blocks Π (l : ι p)) ]
-  [-----
-   (check-blocks Π end)])
-
-(define-judgment-form list-machine-typing
-  #:contract (check-block Π Γ ι)
-  #:mode (check-block I I I)
-  [-----
-   (check-block Π Γ halt)]
-  [(check-instr Π Γ ι_1 Γ_2) 
-   (check-block Π Γ_2 ι_2)
-   -----
-   (check-block Π Γ (begin ι_1 ι_2))]
-  [(:lookup Π l Γ_2)
-   (Γ-⊂ Γ Γ_2)
-   -----
-   (check-block Π Γ (jump l))])
-
-(define-judgment-form list-machine-typing
-  #:contract (check-instr Π Γ ι Γ)
-  #:mode (check-instr I I I O)
-  [(check-instr Π Γ ι_1 Γ_1)
-   (check-instr Π Γ_1 ι_2 Γ_2)
-   -----
-   (check-instr Π Γ (begin ι_1 ι_2) Γ_2)]
-  [(:lookup Γ v (list τ))
-   (:lookup Π l Γ_1)
-   (:set Γ v nil Γ_3)
-   (Γ-⊂ Γ_3 Γ_1)
-   (:set Γ_3 v (listcons τ) Γ_2)
-   -----
-   (check-instr Π Γ (branch-if-nil v l) Γ_2)]
-  [(:lookup Γ v (listcons τ))
-   (:lookup Π l Γ_1)
-   (:set Γ v nil Γ_2)
-   (Γ-⊂ Γ_2 Γ_1)
-   -----
-   (check-instr Π Γ (branch-if-nil v l) Γ)]
-  [(:lookup Γ v nil)
-   (:lookup Π l Γ_1)
-   (Γ-⊂ Γ Γ_1)
-   -----
-   (check-instr Π Γ (branch-if-nil v l) Γ)]
-  [(:lookup Γ v (listcons τ)) (:set Γ v_2 τ Γ_2)
-   -----
-   (check-instr Π Γ (fetch-field v 0 v_2) Γ_2)]
-  [(:lookup Γ v (listcons τ)) (:set Γ v_2 (list τ) Γ_2)
-   -----
-   (check-instr Π Γ (fetch-field v 1 v_2) Γ_2)]
-  [(:lookup Γ v_0 τ_0) (:lookup Γ v_1 τ_1)
-   (⊔ (list τ_0) τ_1 (list τ)) (:set Γ v (listcons τ) Γ_2)
-   -----
-   (check-instr Π Γ (cons v_0 v_1 v) Γ_2)])
-(define-judgment-form list-machine-typing
-  #:contract (⊂ τ τ)
-  #:mode (⊂ O I)
-  [-----
-   (⊂ τ τ)]
-  [-----
-   (⊂ nil (list τ))]
-  [(⊂ τ τ_2)
-   -----
-   (⊂ (list τ) (list τ_2))]
-  [(⊂ τ τ_2)
-   -----
-   (⊂ (listcons τ) (list τ_2))]
-  [(⊂ τ τ_2)
-   -----
-   (⊂ (listcons τ) (listcons τ_2))])
-
-(define-judgment-form list-machine-typing
-  #:contract (⊔ τ τ τ)
-  #:mode (⊔ I I O)
-  [-----
-   (⊔ τ τ τ)]
-  [-----
-   (⊔ (list τ) nil (list τ))]
-  [-----
-   (⊔ nil (list τ) (list τ))]
-  [(⊔ (list τ_1) (list τ_2) τ_3)
-   -----
-   (⊔ (list τ_1) (listcons τ_2) τ_3)]
-  [(⊔ (list τ_1) (list τ_2) τ_3)
-   -----
-   (⊔ (listcons τ_1) (list τ_2) τ_3)]
-  [(⊔ τ_1 τ_2 τ_3)
-   -----
-   (⊔ (list τ_1) (list τ_2) (list τ_3))]
-  [-----
-   (⊔ (listcons τ) nil (list τ))]
-  [-----
-   (⊔ nil (listcons τ) (list τ))]
-  [(⊔ τ_1 τ_2 τ_3)
-   -----
-   (⊔ (listcons τ_1) (listcons τ_2) (listcons τ_3))])
-
-(define-judgment-form list-machine-typing
-  #:contract (:lookup any v any)
-  #:mode (:lookup I I O)
-  [-----
-   (:lookup (v : any_τ any_Γ) v any_τ)]
-  [(where #t (different v_1 v_2))
-   (:lookup any_Γ v_2 any_τ2)
-   -----
-   (:lookup (v_1 : any_τ1 any_Γ) v_2 any_τ2)])
-
-(define-judgment-form list-machine-typing
-  #:contract (:set Γ v τ Γ)
-  #:mode (:set I I I O)
-  [-----
-   (:set (v : any_τ any_Γ) v any_τ2 (v : any_τ2 any_Γ))]
-  [(where #t (different v v_2))
-   (:set any_Γ v_2 any_τ2 any_Γ2)
-   -----
-   (:set (v : any_τ any_Γ) v_2 any_τ2 (v : any_τ any_Γ2))]
-  [-----
-   (:set empty v any_τ (v : any_τ empty))])
-
-(define-metafunction list-machine-typing
-  dom : any -> (l ...)
-  [(dom (l_1 : any_1 any_2))
-   (l_1 l_2 ...)
-   (where (l_2 ...) (dom any_2))]
-  [(dom any) ()])
-
-(define-metafunction list-machine-typing
-  l-⊂ : (l ...) (l ...) -> any
-  [(l-⊂ (l_1 ...) (l_2 ...))
-   ,(let ([ht (make-hash)])
-      (for ([l (in-list (term (l_2 ...)))])
-        (hash-set! ht l #t))
-      (for/and ([l (in-list (term (l_1 ...)))])
-        (hash-ref ht l #f)))])
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/list-machine.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/list-machine.rkt
deleted file mode 100644
index 869bf85df8..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/list-machine.rkt
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang racket
-(require redex/reduction-semantics)
-
-(provide list-machine red 
-         var-lookup var-set
-         program-lookup
-         different)
-
-(define-language list-machine
-  (a nil
-     (cons a a))
-  (v variable-not-otherwise-mentioned)
-  (r empty
-     (r v ↦ a))
-  (l variable-not-otherwise-mentioned)
-  (ι (jump l)
-     (branch-if-nil v l)
-     (fetch-field v 0 v)
-     (fetch-field v 1 v)
-     (cons v v v)
-     halt
-     (begin ι ι))
-  (p (l : ι p)
-     end))
-
-(define-judgment-form list-machine
-  #:contract (var-lookup r v a)
-  #:mode (var-lookup I I O)
-  [-----
-   (var-lookup (r v ↦ a) v a)]
-  [(where #t (different v_1 v_2))
-   (var-lookup r v_2 a_2)
-   -----
-   (var-lookup (r v_1 ↦ a_1) v_2 a_2)])
-
-(define-judgment-form list-machine
-  #:contract (var-set r v a r)
-  #:mode (var-set I I I O)
-  [-----
-   (var-set (r v ↦ a) v a_2 (r v ↦ a_2))]
-  [(where #t (different v v_2))
-   (var-set r v_2 a_2 r_2)
-   -----
-   (var-set (r v ↦ a) v_2 a_2 (r_2 v ↦ a))]
-  [-----
-   (var-set empty v a (empty v ↦ a))])
-
-(define-judgment-form list-machine
-  #:contract (program-lookup p l ι)
-  #:mode (program-lookup I I O)
-  [-----
-   (program-lookup (l : ι p) l ι)]
-  [(where #t (different l l_2))
-   (program-lookup p l_2 ι_2)
-   -----
-   (program-lookup (l : ι p) l_2 ι_2)])
-
-(define red 
-  (reduction-relation 
-   list-machine
-   #:domain (p r ι)
-   (--> (p r (begin (begin ι_1 ι_2) ι_3))
-        (p r (begin ι_1 (begin ι_2 ι_3)))
-        "step-seq")
-   (--> (p r (begin (fetch-field v 0 v_2) ι))
-        (p r_2 ι)
-        "step-fetch-field-0"
-        (judgment-holds (var-lookup r v (cons a_0 a_1)))
-        (judgment-holds (var-set r v_2 a_0 r_2)))
-   (--> (p r (begin (fetch-field v 1 v_2) ι))
-        (p r_2 ι)
-        "step-fetch-field-1"
-        (judgment-holds (var-lookup r v (cons a_0 a_1)))
-        (judgment-holds (var-set r v_2 a_1 r_2)))
-   (--> (p r (begin (cons v_0 v_1 v_2) ι))
-        (p r_2 ι)
-        "step-cons"
-        (judgment-holds (var-lookup r v_0 a_0))
-        (judgment-holds (var-lookup r v_1 a_1))
-        (judgment-holds (var-set r v_2 (cons a_0 a_1) r_2)))
-   (--> (p r (begin (branch-if-nil v l) ι))
-        (p r ι)
-        "step-branch-not-taken"
-        (judgment-holds (var-lookup r v (cons a_0 a_1))))
-   (--> (p r (begin (branch-if-nil v l) ι))
-        (p r ι_2)
-        "step-branch-taken"
-        (judgment-holds (var-lookup r v nil))
-        (judgment-holds (program-lookup p l ι_2)))
-   (--> (p r (jump l))
-        (p r ι_2)
-        "step-jump"
-        (judgment-holds (program-lookup p l ι_2)))))
-
-
-(define-metafunction list-machine
-  different : any any -> any
-  [(different any_1 any_2) ,(not (equal? (term any_1) (term any_2)))])
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/p-sample.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/p-sample.rkt
deleted file mode 100644
index ebab2981ac..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/p-sample.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket
-(require redex
-         "list-machine.rkt" 
-         "list-machine-typing.rkt")
-
-(define p-sample
-  (term (l0 : (begin (cons v0 v0 v1)
-                     (begin (cons v0 v1 v1)
-                            (begin (cons v0 v1 v1)
-                                   (jump l1))))
-            (l1 : (begin (branch-if-nil v1 l2)
-                         (begin (fetch-field v1 1 v1)
-                                (begin (branch-if-nil v0 l1)
-                                       (jump l2))))
-                (l2 : halt
-                    end)))))
-
-;; Eval : p -> r | 'crashed | 'multiple-results
-(define (Eval p)
-  (define l0 (car (judgment-holds (program-lookup ,p l0 ι) ι))) 
-  (define result (apply-reduction-relation* red (term (,p (empty v0 ↦ nil) ,l0))))
-  (cond
-    [(= 1 (length result))
-     (with-handlers ((exn:fail:redex? (λ (x) 'crashed)))
-       (redex-let list-machine
-                  ([(p r halt) (car result)])
-                  (term r)))]
-    [else 'multiple-results]))
-
-(Eval p-sample)
-
-(define Π-sample
-  (term (l0 : (v0 : nil empty)
-            (l1 : (v0 : nil (v1 : (list nil) empty))
-                (l2 : empty empty)))))
-
-(judgment-holds (check-program ,p-sample ,Π-sample))
-
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/slides.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/slides.rkt
deleted file mode 100644
index faef424a45..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/slides.rkt
+++ /dev/null
@@ -1,85 +0,0 @@
-#lang racket
-(require slideshow
-         redex
-         "list-machine.rkt"
-         "list-machine-typing.rkt")
-
-(define (with-rewriters t)
-  (define rewrite-lookup
-    (match-lambda
-      [(list op id r v a cp)
-       (list "" r "(" v ") = " a)]))
-  (define set-rewrite
-    (match-lambda
-      [(list op id r1 v a r2 cp)
-       (list "" r1 "[" v ":=" a "] = " r2)]))
-  (define subset-rewrite
-    (match-lambda
-      [(list op id left right cp)
-       (list "" left " ⊂ " right "")]))
-  (define (turn which subscr)
-    (hbl-append (text which (default-style) (default-font-size))
-                (text subscr (cons 'subscript (default-style)) (default-font-size))
-                (text " " (default-style) (default-font-size))))
-  (with-compound-rewriters
-   (['var-lookup rewrite-lookup]
-    ['var-set set-rewrite]
-    ['program-lookup rewrite-lookup]
-    [':lookup rewrite-lookup]
-    [':set set-rewrite]
-    ['check-program
-     (match-lambda 
-       [(list op id p Π cp)
-        (list (turn "⊨" "prog") p " : " Π)])]
-    ['check-blocks
-     (match-lambda
-       [(list op ip  Π p cp)
-        (list "" Π (turn "⊢" "blocks") p)])]
-    ['check-block
-     (match-lambda
-       [(list op id Π Γ ι cp)
-        (list "" Π ";" Γ (turn "⊢" "blocks") ι)])]
-    ['check-instr
-     (match-lambda
-       [(list op id Π Γ1 ι Γ2 cp)
-        (list "" Π (turn "⊢" "instr") Γ1 "{" ι "}" Γ2)])]
-    ['l-⊂ subset-rewrite]
-    ['Γ-⊂ subset-rewrite]
-    ['⊔ 
-     (match-lambda
-       [(list op id τ1 τ2 τ3 cp)
-        (list "" τ1 "⊔" τ2 " = " τ3)])]
-    ['dom
-     (λ (lws)
-       (define arg (list-ref lws 2))
-       (list "dom(" arg ")"))])
-   (t)))
-
-(define (scale-to-fit/m p)
-  (scale p (min (/ (- 1024 margin margin) (pict-width p))
-                (/ (- 768 margin margin) (pict-height p)))))
-
-(slide 
- (with-rewriters
-  (λ ()
-    (scale-to-fit/m
-     (ht-append
-      40
-      (language->pict list-machine #:nts '(a p ι))
-      (reduction-relation->pict red))))))
-
-(slide
- (with-rewriters
-  (λ ()
-    (scale-to-fit/m
-     (judgment-form->pict check-instr)))))
-
-(slide
- (with-rewriters
-  (λ ()
-    (scale-to-fit/m
-     (vc-append
-      40
-      (judgment-form->pict check-block)
-      (judgment-form->pict check-blocks)
-      (judgment-form->pict check-program))))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/test.rkt
deleted file mode 100644
index 4c43e4f184..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/test.rkt
+++ /dev/null
@@ -1,167 +0,0 @@
-#lang racket
-(require "list-machine.rkt"
-         "list-machine-typing.rkt"
-         redex)
-
-(test-equal (judgment-holds (var-lookup (empty x ↦ nil) x a) a)
-            (list (term nil)))
-(test-equal (judgment-holds (var-lookup (empty x ↦ nil) y a) a)
-            (list))
-(test-equal (judgment-holds (var-lookup ((empty y ↦ (cons nil nil)) x ↦ nil) y a) a)
-            (list (term (cons nil nil))))
-
-(test-equal (judgment-holds (var-set empty x nil r) r)
-            (list (term (empty x ↦ nil))))
-(test-equal (judgment-holds (var-set (empty x ↦ nil) x (cons nil nil) r) r)
-            (list (term (empty x ↦ (cons nil nil)))))
-(test-equal (judgment-holds (var-set (empty x ↦ nil) y (cons nil nil) r) r)
-            (list (term ((empty y ↦ (cons nil nil)) x ↦ nil))))
-
-(test-equal (judgment-holds (program-lookup (l1 : halt end) l1 ι) ι)
-            (list (term halt)))
-(test-equal (judgment-holds (program-lookup (l1 : halt (l2 : (begin halt halt) end)) l2 ι) ι)
-            (list (term (begin halt halt))))
-
-(test--> red
-         (term (end empty (begin (begin (jump l1) (jump l2)) (jump l3))))
-         (term (end empty (begin (jump l1) (begin (jump l2) (jump l3))))))
-(test--> red
-         (term (end 
-                ((empty x ↦ (cons (cons nil nil) nil)) y ↦ nil)
-                (begin (fetch-field x 0 y) halt)))
-         (term (end 
-                ((empty x ↦ (cons (cons nil nil) nil)) y ↦ (cons nil nil))
-                halt)))
-(test--> red
-         (term (end 
-                ((empty x ↦ (cons nil (cons nil nil))) y ↦ nil)
-                (begin (fetch-field x 1 y) halt)))
-         (term (end 
-                ((empty x ↦ (cons nil (cons nil nil))) y ↦ (cons nil nil))
-                halt)))
-(test--> red
-         (term (end ((empty x ↦ nil) y ↦ nil) (begin (cons x y z) halt)))
-         (term (end (((empty z ↦ (cons nil nil)) x ↦ nil) y ↦ nil) halt)))
-(test--> red
-         (term (end (empty x ↦ (cons nil nil)) (begin (branch-if-nil x l) halt)))
-         (term (end (empty x ↦ (cons nil nil)) halt)))
-(test--> red
-         (term ((l : (begin halt halt) end) (empty x ↦ nil) (begin (branch-if-nil x l) halt)))
-         (term ((l : (begin halt halt) end) (empty x ↦ nil) (begin halt halt))))
-(test--> red
-         (term ((l : (begin halt halt) end) (empty x ↦ nil) (jump l)))
-         (term ((l : (begin halt halt) end) (empty x ↦ nil) (begin halt halt))))
-
-(test-equal (judgment-holds (:lookup (x : nil empty) x τ) τ)
-            (list (term nil)))
-(test-equal (judgment-holds (:lookup (x : nil empty) y τ) τ)
-            (list))
-(test-equal (judgment-holds (:lookup (x : nil (y : (list nil) empty)) y τ) τ)
-            (list (term (list nil))))
-
-(test-equal (judgment-holds (:set empty x nil Γ) Γ)
-            (list (term (x : nil empty))))
-(test-equal (judgment-holds (:set (x : nil empty) x (list nil) Γ) Γ)
-            (list (term (x : (list nil) empty))))
-(test-equal (judgment-holds (:set (x : nil empty) y (list nil) Γ) Γ)
-            (list (term (x : nil (y : (list nil) empty)))))
-
-(test-equal (judgment-holds (⊂ nil nil)) #t)
-(test-equal (judgment-holds (⊂ nil (list nil))) #t)
-(test-equal (judgment-holds (⊂ (list nil) (list (list nil)))) #t)
-(test-equal (judgment-holds (⊂ (listcons nil) (list (list nil)))) #t)
-(test-equal (judgment-holds (⊂ (listcons nil) (listcons (list nil)))) #t)
-
-(redex-check
- list-machine-typing
- τ
- (let ()
-   (define subtypes (judgment-holds (⊂ τ_s τ) τ_s))
-   (or (null? subtypes)
-       (let ([τ_1 (list-ref subtypes (random (length subtypes)))]
-             [τ_2 (list-ref subtypes (random (length subtypes)))])
-         (for/and ([τ_3 (judgment-holds (⊔ ,τ_1 ,τ_2 τ_3) τ_3)])
-           (judgment-holds (⊂ τ_3 τ))))))
- #:attempts 100)
-
-(test-equal (judgment-holds (Γ-⊂ (x : nil empty) (x : nil empty)))
-            #t)
-(test-equal (judgment-holds (Γ-⊂ (x : nil empty) (x : (list nil) empty)))
-            #t)
-(test-equal (judgment-holds (Γ-⊂ (x : nil (y : (list nil) empty)) (x : (list nil) empty)))
-            #t)
-(test-equal (judgment-holds (Γ-⊂ (y : (list nil) (x : nil empty)) (x : (list nil) empty)))
-            #t)
-
-(test-equal (judgment-holds (check-instr (l0 : (x : (list nil) empty) empty)
-                                         (x : (list nil) empty)
-                                         (branch-if-nil x l0)
-                                         Γ)
-                            Γ)
-            (list (term (x : (listcons nil) empty))))
-(test-equal (judgment-holds (check-instr (l0 : (x : nil empty) empty)
-                                         (x : (listcons nil) empty)
-                                         (branch-if-nil x l0)
-                                         Γ)
-                            Γ)
-            (list (term (x : (listcons nil) empty))))
-(test-equal (judgment-holds (check-instr (l0 : (x : nil empty) empty)
-                                         (x : nil empty)
-                                         (branch-if-nil x l0)
-                                         Γ)
-                            Γ)
-            (list (term (x : nil empty))))
-
-(test-equal (judgment-holds (check-instr empty
-                                         (x : (listcons nil) empty)
-                                         (fetch-field x 0 y)
-                                         Γ)
-                            Γ)
-            (list (term (x : (listcons nil) (y : nil empty)))))
-(test-equal (judgment-holds (check-instr empty
-                                         (x : (listcons nil) empty)
-                                         (fetch-field x 1 y)
-                                         Γ)
-                            Γ)
-            (list (term (x : (listcons nil) (y : (list nil) empty)))))
-(test-equal (judgment-holds (check-instr empty
-                                         (x : (listcons nil) 
-                                            (y : (list (list nil)) 
-                                               (z : nil empty)))
-                                         (cons x y z)
-                                         Γ)
-                            Γ)
-            (list (term (x : (listcons nil) 
-                           (y : (list (list nil)) 
-                              (z : (listcons (list nil))
-                                 empty))))))
-(test-equal (judgment-holds (check-instr
-                             (l0 : (v0 : nil empty) empty)
-                             (v0 : nil empty)
-                             (cons v0 x f)
-                             Γ))
-            #f)
-
-(test-equal (judgment-holds (check-block empty empty halt)) #t)
-(test-equal (judgment-holds (check-block empty
-                                         (x : (listcons nil) empty)
-                                         (begin (fetch-field x 0 y) halt)))
-            #t)
-(test-equal (judgment-holds (check-block (l0 : empty empty)
-                                         (x : nil empty)
-                                         (jump l0)))
-            #t)
-(test-equal (judgment-holds (check-blocks empty end)) #t)
-(test-equal (judgment-holds (check-blocks (l0 : empty empty) (l0 : halt end))) #t)
-(test-equal (judgment-holds (check-program (l0 : halt end) (l0 : (v0 : nil empty) empty)))
-            #t)
-
-(test-equal (term (dom (l0 : halt (l1 : halt end))))
-            (term (l0 l1)))
-(test-equal (term (dom (l0 : empty (l2 : empty end))))
-            (term (l0 l2)))
-(test-equal (term (l-⊂ (l0 l1 l2) (l2 l3 l0 l1 l11)))
-            #t)
-(test-equal (term (l-⊂ (l0 l1 l2 l33) (l2 l3 l0 l1 l11)))
-            #f)
-(test-results)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/omega.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/omega.rkt
deleted file mode 100644
index 0164b88d4e..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/omega.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket
-(require redex "subst.rkt")
-
-(reduction-steps-cutoff 10)
-
-(define-language lang
-  (e (e e)
-     (abort e)
-     x
-     v)
-  (c (v c)
-     (c e)
-     hole)
-  (v call/cc
-     number
-     (lambda (x) e))
-  
-  (x (variable-except lambda call/cc abort)))
-
-(define reductions
-  (reduction-relation
-   lang
-   (--> (in-hole c (call/cc v))
-        (in-hole c (v (lambda (x) (abort (in-hole c x)))))
-        call/cc
-        (fresh x))
-   (--> (in-hole c (abort e)) 
-        e
-        abort)
-   (--> (in-hole c ((lambda (x) e) v))
-        (in-hole c (subst (x v e)))
-        βv)))
-
-(traces reductions '((lambda (x) (x x)) (lambda (x) (x x))))
-(traces reductions '((call/cc call/cc) (call/cc call/cc)))
-(traces reductions '((lambda (x) ((call/cc call/cc) x)) (call/cc call/cc)))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/pi-calculus.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/pi-calculus.rkt
deleted file mode 100644
index e66b63fb9a..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/pi-calculus.rkt
+++ /dev/null
@@ -1,384 +0,0 @@
-#lang racket
-
-;; this is a formulation of the pi-calculus in redex, following Milner's 1990 paper,
-;; "Functions as Processes", available online (for now, anyhow) at:
-;; ftp://ftp.inria.fr/INRIA/publication/publi-ps-gz/RR/RR-1154.ps.gz
-
-
-;; the challenge here is handling the structural congruence rules; in particular,
-;; these rules use congruence "as needed" to make the reductions work. An alternate
-;; solution would be to determine a canonical representative for each of the
-;; equivalence classes implied by structural congruence, and to formulate reduction
-;; rules that are guaranteed to converge to this canonical element.  This would 
-;; have the advantage that you wouldn't have to trust that my "as needed" rules
-;; are adequate, but ... I couldn't see how to do it cleanly in the presence of
-;; replicating terms. Also, this solution has the advantage that its steps match
-;; those of milner; each of his steps is exactly one of our steps.
-
-;; this model performs no "garbage collection" to remove dead terms.
-
-(require redex/reduction-semantics)
-
-(define-language π-calculus
-  (π (π π)       ;; parallel composition
-     zero         ;; dead computation
-     (nu a π)     ;; fresh name
-     (out a a π)  ;; sending 
-     (in a a π)   ;; receiving
-     (! π))       ;; replication
-  (a variable)
-  ;; evaluation contexts:
-  (E hole
-     (E π)
-     (π E)
-     (nu a E)
-     (! E)))
-
-
-(define red
-  (reduction-relation 
-   π-calculus
-   
-   ;; the only reduction rule: an "in" matches with an "out" on the same channel.
-   (--> (in-hole E_1 ((in-hole E_in (in a_ch a_x π_in)) (in-hole E_out (out a_ch a_o π_out))))
-        (in-hole E_1 (maybe-lift sent E_in (in a_ch a_x π_in) E_out (out a_ch a_o π_out)))
-        
-        (fresh sent)
-        ;; the name of the channel must be free on both sides:
-        (side-condition (and (not (member (term a_ch) (term (bound-by E_in))))
-                             (not (member (term a_ch) (term (bound-by E_out)))))))
-   
-   
-   ;; EXACTLY THE SAME except in & out are reversed in the input:
-   (--> (in-hole E_1 ((in-hole E_out (out a_ch a_o π_out)) (in-hole E_in (in a_ch a_x π_in))))
-        (in-hole E_1 (maybe-lift sent E_in (in a_ch a_x π_in) E_out (out a_ch a_o π_out)))
-        
-        (fresh sent)
-        ;; the name of the channel must be free on both sides:
-        (side-condition (and (not (member (term a_ch) (term (bound-by E_in))))
-                             (not (member (term a_ch) (term (bound-by E_out)))))))))
-
-
-;; maybe-lift : given a fresh identifier and two context/π pairs, perform replication
-;; on each pair if necessary and then lift the nu-binding of the a_o name if necessary
-;; (renaming it a_lifted)
-(define-metafunction π-calculus
-  maybe-lift : a E π E π -> π
-  
-  ;; the name being sent needs lifting, so that it includes the recipient:
-  [(maybe-lift a_lifted E_in (in a_ch a_x π_in) E_out (out a_ch a_o π_out))
-   (nu a_lifted ((in-hole E_i¬! (subst a_x a_lifted π_in))
-                 (in-hole (rename-innermost a_o a_lifted E_o¬!)
-                          (subst a_o a_lifted π_out))))
-   
-   (where E_i¬!  (replicate-as-needed E_in  (in a_ch a_x π_in)))
-   (where E_o¬! (replicate-as-needed E_out (out a_ch a_o π_out)))
-   
-   (side-condition (member (term a_o) (term (bound-by E_out))))]
-  
-  ;; otherwise, no need to lift nu:
-  [(maybe-lift a_lifted E_in (in a_ch a_x π_in) E_out (out a_ch a_o π_out))
-   ((in-hole E_i¬! (subst a_x a_o π_in))
-    (in-hole E_o¬! π_out))
-   
-   (where E_i¬!  (replicate-as-needed E_in  (in a_ch a_x π_in)))
-   (where E_o¬! (replicate-as-needed E_out (out a_ch a_o π_out)))])
-
-
-
-;; replicate-as-needed : performs replication to uncover the desired
-;; expression
-(define-metafunction π-calculus
-  replicate-as-needed : E π -> E
-  [(replicate-as-needed hole π_orig)     hole]  
-  [(replicate-as-needed (E π) π_orig)    ((replicate-as-needed E π_orig) π)]
-  [(replicate-as-needed (π E) π_orig)    (π (replicate-as-needed E π_orig))]
-  [(replicate-as-needed (nu a E) π_orig) (nu a (replicate-as-needed E π_orig))]
-  [(replicate-as-needed (! E) π_orig)    ((replicate-as-needed E π_orig)
-                                          (in-hole (! E) π_orig))])
-
-;; rename-innermost : rename the *innermost* binding of a given name along
-;; an evaluation context, using another given name. At this point,
-;; there should be no bangs along the context. Also, a_from should 
-;; be fresh, so there's no need to worry about those collisions.
-(define-metafunction π-calculus
-  rename-innermost : a_from a_to E -> E
-  ;; no hole case; the base case is no more bindings of a_from
-  [(rename-innermost a_from a_to (E π))         ((rename-innermost a_from a_to E) π)]
-  [(rename-innermost a_from a_to (π E))         (π (rename-innermost a_from a_to E))]
-  
-  ;; this is the last! substitute from here on out:
-  [(rename-innermost a_from a_to (nu a_from E))  (subst/E a_from a_to E)
-                                                 (side-condition (not (member (term a_from) (term (bound-by E)))))]
-  
-  [(rename-innermost a_from a_to (nu a_other E)) (nu a_other (rename-innermost a_from a_to E))]
-  ;; no case for bang.  
-  )
-
-;; THE REST OF THIS IS BOILERPLATE... (subst, free-vars, etc.)
-
-
-;; BOUND-BY : compute the variables bound along the spine of a context
-(define-metafunction π-calculus
-  bound-by : E -> (a ...)
-  [(bound-by hole)     ()]
-  [(bound-by (E π))   (bound-by E)]
-  [(bound-by (π E))   (bound-by E)]
-  [(bound-by (nu a E)) (a a_rest ...)
-                       (where (a_rest ...) (bound-by E))]
-  [(bound-by (! E)) (bound-by E)])
-
-
-
-
-;; SUBST
-
-;; substitute a_to for a_from in π.  Note that renaming may be necessary, 
-;; when looking inside a binder for a_to.
-(define-metafunction π-calculus
-  subst : a a π -> π
-  [(subst a_from a_to zero) zero]
-  [(subst a_from a_to (π_1 π_2)) ((subst a_from a_to π_1)
-                                  (subst a_from a_to π_2))]
-  ;; shadowing of a_from: stop substitution
-  [(subst a_from a_to (nu a_from π)) (nu a_from π)]
-  ;; shadowing of a_to: rename if a_from occurs free.
-  [(subst a_from a_to (nu a_to π))
-   (nu a_new (subst a_from a_to (subst a_to a_new π)))
-   (where a_new (fresh-in (nu a_to π) a_to))
-   (side-condition (member (term a_from) (term (free-vars π))))]
-  ;; otherwise, proceed:
-  [(subst a_from a_to (nu a π))
-   (nu a (subst a_from a_to π))]
-  
-  [(subst a_from a_to (out a_1 a_2 π))
-   (out (subst-name a_from a_to a_1)
-        (subst-name a_from a_to a_2) 
-        (subst a_from a_to π))]
-  ;; shadowing of a_from: stop substitution
-  [(subst a_from a_to (in a_ch a_from π))
-   (in (subst-name a_from a_to a_ch) a_from π)]
-  ;; shadowing of a_to: rename if a_from occurs free
-  [(subst a_from a_to (in a_ch a_to π))
-   (in (subst-name a_from a_to a_ch) 
-       a_new
-       (subst a_from a_to (subst a_to a_new π)))
-   (where a_new (fresh-in (in a_ch a_to π) a_to))
-   (side-condition (member (term a_from) (term (free-vars π))))]
-  ;; otherwise, proceed:
-  [(subst a_from a_to (in a_ch a_x π))
-   (in (subst-name a_from a_to a_ch) a_x (subst a_from a_to π))]
-  
-  [(subst a_from a_to (! π))
-   (! (subst a_from a_to π))])
-
-;; SUBST/E : substitute a_to for a_from in π; assumes 
-;; there are no more bindings for a_from along the context sπne,
-;; and that a_to is fresh (enough).
-(define-metafunction π-calculus
-  subst/E : a_from a_to E -> E
-  
-  [(subst/E a_from a_to hole)      hole]
-  [(subst/E a_from a_to (π E))    ((subst a_from a_to π) (subst/E a_from a_to E))]
-  [(subst/E a_from a_to (E π))    ((subst/E a_from a_to E) (subst a_from a_to π))]
-  [(subst/E a_from a_to (nu a E))  (nu a (subst/E a_from a_to E))]
-  [(subst/E a_from a_to (! E))  (! (subst/E a_from a_to))])
-
-
-;; SUBST-NAME: replace a_from with a_to, leave other names alone.
-(define-metafunction π-calculus
-  subst-name : a a a -> a
-  [(subst-name a_src a_tgt a_src)   a_tgt]
-  [(subst-name a_src a_tgt a)       a])
-
-;; FREE-VARS : return a list of the variables that occur free in the term
-;; WARNING: MAY INCLUDE DUPLICATES...
-(define-metafunction π-calculus
-  free-vars : π -> (a ...)
-  [(free-vars zero) ()]
-  [(free-vars (π_1 π_2)) (a_1 ... a_2 ...)
-                         (where (a_1 ...) (free-vars π_1))
-                         (where (a_2 ...) (free-vars π_2))]
-  [(free-vars (nu a π)) (set-minus (free-vars π) a)]
-  [(free-vars (out a_ch a_o π)) (a_ch a_o a ...)
-                                (where (a ...) (free-vars π))]
-  [(free-vars (in a_ch a_x π)) (a_ch a ...)
-                               (where (a ...) (set-minus (free-vars π) a_x))])
-
-;; remove *all* instances of a_kilt from (a ...)
-(define-metafunction π-calculus
-  set-minus : (a ...) a -> (a ...)
-  [(set-minus (a_1 ... a_kilt a_2 ...) a_kilt) (set-minus (a_1 ... a_2 ...) a_kilt)]
-  [(set-minus (a ...) a_kilt) (a ...)])
-
-
-;; provide variable-not-in as a metafunction:
-(define-metafunction π-calculus
-  fresh-in : π a -> a
-  [(fresh-in π a) ,(variable-not-in (term π) (term a))])
-
-
-;; TEST CASES
-
-(test--> red (term zero))
-;; simplest communication:
-(test--> red
-         (term ((in a b zero) (out a c zero)))
-         (term (zero zero)))
-;; check simplest substitution
-(test--> red
-         (term ((out a c zero) (in a b (out b b zero))))
-         (term ((out c c zero) zero)))
-;; check simple nesting
-(test--> red
-         (term (((out z y zero) (out a c zero)) ((in a b (out b b zero)) (out x w zero))))
-         (term (((out c c zero) (out x w zero)) ((out z y zero) zero))))
-;; outer context:
-(test--> red
-         (term (zero (nu a (((out z y zero) (out a c zero)) ((in a b (out b b zero)) (out x w zero))))))
-         (term (zero (nu a (((out c c zero) (out x w zero)) ((out z y zero) zero))))))
-;; with bang replication:
-(test--> red
-         (term (zero (nu a (((out z y zero) (out a c zero)) ((! (in a b (out b b zero))) (out x w zero))))))
-         (term  (zero (nu a ((((out c c zero) (! (in a b (out b b zero)))) (out x w zero)) 
-                             ((out z y zero) zero))))))
-;; with lifting (depends on fresh name):
-(test--> red
-         (term (zero (nu a (((out z y zero) (nu c (out a c (in c c zero)))) ((! (in a b (out b b zero))) (out x w zero))))))
-         (term (zero (nu a (nu sent
-                               ((((out sent sent zero)
-                                  (! (in a b (out b b zero))))
-                                 (out x w zero))
-                                ((out z y zero) (in sent c zero))))))))
-
-;; need longer examples...
-
-;; this on taken from wikipedia:
-(test--> red
-         (term ((nu x ((out x z zero)
-                       (in x y (out y x (in x y zero)))))
-                (in z v (out v v zero))))
-         (term ((nu x ((out z x (in x y zero))
-                       zero))
-                (in z v (out v v zero)))))
-(test--> red
-         (term ((nu x ((out z x (in x y zero))
-                       zero))
-                (in z v (out v v zero))))
-         (term (nu sent ((out sent sent zero)
-                         ((in sent y zero) zero)))))
-
-(test--> red
-         (term (nu sent ((out sent sent zero)
-                         ((in sent y zero) zero))))
-         (term (nu sent ((zero zero)
-                         zero))))
-
-
-(test-equal (term (rename-innermost a1 a2 
-                                    ((out a1 a1 zero)
-                                     (nu a1 ((nu a1 (hole (out a1 a1 zero)))
-                                             (out a1 a1 zero))))))
-            (term ((out a1 a1 zero)
-                   (nu a1 ((hole (out a2 a2 zero))
-                           (out a1 a1 zero))))))
-
-(test-equal (term (replicate-as-needed ((out a b zero)
-                                        (! ((nu e (! hole))
-                                               (out c d zero))))
-                                       (out e f zero)))
-            (term ((out a b zero)
-                   (((nu e (hole
-                            (! (out e f zero))))
-                     (out c d zero))
-                    (! ((nu e (! (out e f zero)))
-                           (out c d zero)))))))
-
-(begin (test-equal (term (bound-by hole))
-                   '())
-       (test-equal (term (bound-by (nu x hole)))
-                   '(x))
-       (test-equal (term (bound-by (nu x (nu y hole))))
-                   '(x y))
-       (test-equal (term (bound-by (zero (nu x hole))))
-                   '(x))
-       (test-equal (term (bound-by (! (nu x hole))))
-                   '(x)))
-
-
-(test-equal (term (set-minus (w x y x z) x))
-              `(w y z))
-
-(test-equal (term (free-vars zero)) `())
-(test-equal (term (free-vars (out a b zero))) `(a b))
-(test-equal (term (free-vars (out a b (out c d zero)))) `(a b c d))
-(test-equal (term (free-vars ((out a b zero) (out c d zero)))) `(a b c d))
-(test-equal (term (free-vars (nu a (out a a (out b a zero)))))  '(b))
-(test-equal (term (free-vars (in a b (out b b zero)))) `(a))
-
-(test-equal (term (subst a1 a2 (nu a3 (out a1 a1 zero))))
-            (term (nu a3 (out a2 a2 zero))))
-
-(test-equal (term (subst a1 a2 (in a1 a1 (out a1 a1 zero))))
-            (term (in a2 a1 (out a1 a1 zero))))
-(test-equal (term (subst a1 a2 (in a1 a2 (out a1 a1 (out a2 a2 zero)))))
-            (term (in a2 a3 (out a2 a2 (out a3 a3 zero)))))
-(test-equal (term (subst a1 a2 (in a1 a3 (out a3 a1 zero))))
-            (term (in a2 a3 (out a3 a2 zero))))
-
-(test-equal (term (subst a1 a2 (! (out a1 a1 zero))))
-            (term (! (out a2 a2 zero))))
-
-
-;; MILNER'S (1990) TRANSLATION FROM CBN-LAMBDA CALCULUS TO PI-CALCULUS:
-
-(define-language lambda-calculus
-  (e (lam x e) x (e e))
-  (x (variable-except lam))
-  (E hole (E e))
-  
-  (π (π π)
-      zero
-      (nu a π)
-      (out a a π)
-      (in a a π)
-      (! π))
-  (a variable))
-
-
-;; not bothering to define reduction...
-
-;; Encode-as-π : turn an lc term into a π-calculus term.
-(define-metafunction lambda-calculus
-  encode-as-π : e a -> π
-  [(encode-as-π (lam x e) a)  (in a x (in a v (encode-as-π e v)))]
-  [(encode-as-π x a)          (out x a zero)]
-  [(encode-as-π (e_1 e_2) a)  (nu v ((encode-as-π e_1 v)
-                                     (nu a_x (out v a_x (out v a (binding-encode a_x e_2))))))
-                              (where a_x ,(variable-not-in (term e_2) (term x)))])
-
-;; binding-encode : represent a binding.  This is the key idea: represent a binding
-;; as a replicating agent that listens on a channel and delivers a channel corresponding
-;; to the argument to anyone that wants it.
-(define-metafunction lambda-calculus
-  binding-encode : a e -> π
-  [(binding-encode a e) (! (in a w (encode-as-π e w)))])
-
-;; test sequence adapted from paper for the term ((lam x x) (lam y y))
-
-(test--> red
-         (term (encode-as-π ((lam x x) (lam y y)) chan))
-         (term (nu v (nu sent ((in v v (out sent v zero)) (out v chan (! (in sent w (in w y (in w v (out y v zero)))))))))))
-
-(test--> red
-         (term (nu v (nu sent ((in v v (out sent v zero)) (out v chan (! (in sent w (in w y (in w v (out y v zero))))))))))
-         (term (nu v (nu sent ((out sent chan zero) (! (in sent w (in w y (in w v (out y v zero))))))))))
-
-(test--> red
-         (term (nu v (nu sent ((out sent chan zero) (! (in sent w (in w y (in w v (out y v zero)))))))))
-         (term (nu v (nu sent (((in chan y (in chan v (out y v zero))) (! (in sent w (in w y (in w v (out y v zero)))))) zero)))))
-
-;; observe that the bang clause can be collected: it's listening on a channel that can't escape. So (observes Milner) this
-;; is equivalent to (encode-as-π (lam y y) chan).
-
-(test-results)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/poly-stlc.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/poly-stlc.rkt
deleted file mode 100644
index 86042c75a9..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/poly-stlc.rkt
+++ /dev/null
@@ -1,309 +0,0 @@
-#lang racket/base
-
-(require redex/reduction-semantics
-         (only-in redex/private/generate-term pick-an-index)
-         racket/bool
-         racket/match
-         racket/contract
-         redex/tut-subst)
-
-(provide (all-defined-out))
-
-(define-language poly-stlc
-  (M N ::= 
-     (λ (x σ) M)
-     (M N)
-     C
-     integer
-     x)
-  (C ::=
-     [C @ σ]
-     c)
-  (σ τ ::= 
-     int
-     (σ → τ)
-     (list σ))
-  (γ ::=
-     int
-     (γ → γ)
-     (list γ)
-     α)
-  (Γ ::=
-     (x σ Γ)
-     •)
-  (Σ Y ::= 
-     (∀ α Σ)
-     γ)
-  (x y ::= variable-not-otherwise-mentioned)
-  (α β ::= variable-not-otherwise-mentioned)
-  (c d ::= map nil cons hd tl +)
-  
-  (v (λ (x τ) M)
-     C
-     integer
-     (+ v)
-     ([cons @ τ] v)
-     (([cons @ τ] v) v)
-     ([[map @ τ_1] @ τ_2] v))
-  (E hole
-     (E M)
-     (v E)))
-
-;; overlaps: random seed 35
-
-(define-judgment-form poly-stlc
-  #:mode (typeof I I O)
-  
-  [---------------------
-   (typeof Γ number int)]
-  
-  [(typeof-C C τ)
-   --------------
-   (typeof Γ C τ)]
-  
-  [(where τ (lookup Γ x))
-   ----------------------
-   (typeof Γ x τ)]
-  
-  [(typeof (x σ Γ) M σ_2)
-   --------------------------------
-   (typeof Γ (λ (x σ) M) (σ → σ_2))]
-  
-  [(typeof Γ M (σ → σ_2))
-   (typeof Γ M_2 σ)
-   ----------------------
-   (typeof Γ (M M_2) σ_2)])
-
-(define-judgment-form poly-stlc 
-  #:mode (typeof-C I O)
-  
-  [(where (∀ α γ) (const-type c))
-   (where σ (t-subst γ α τ))
-   ------------------------------
-   (typeof-C [c @ τ] σ)]
-  
-  [(where (∀ α (∀ β γ)) (const-type c))
-   (where γ_1 (t-subst γ β τ_2))
-   (where σ (t-subst γ_1 α τ_1))
-   ------------------------------
-   (typeof-C [[c @ τ_1] @ τ_2] σ)]
-  
-  [(where γ (const-type c))
-   ------------------------------
-   (typeof-C c γ)])
-
-(define-extended-judgment-form poly-stlc typeof
-  #:mode (typ-ind I I O)
-  [(where (∀ α σ_c) (const-type c))
-   (where (σ → τ) (t-subst σ_c α σ_1))
-   (typ-ind Γ M σ)
-   -----------------------------------
-   (typ-ind Γ ([c @ σ_1] M) τ)])
-
-(define-metafunction poly-stlc
-  lookup : Γ x -> σ or #f
-  [(lookup (x σ Γ) x)
-   σ]
-  [(lookup (x σ Γ) x_2)
-   (lookup Γ x_2)]
-  [(lookup • x)
-   #f])
-
-(define-metafunction poly-stlc 
-  const-type : c -> Σ
-  [(const-type nil)
-   (∀ b (list b))]
-  [(const-type cons)
-   (∀ a (a → ((list a) → (list a))))]
-  [(const-type hd)
-   (∀ a ((list a) → a))]
-  [(const-type tl)
-   (∀ a ((list a) → (list a)))]
-  [(const-type map)
-   (∀ α (∀ β ((α → β) → ((list α) → (list β)))))]
-  [(const-type +)
-   (int → (int → int))])
-
-(define-metafunction poly-stlc
-  t-subst : γ α τ -> γ
-  [(t-subst int α τ)
-   int]
-  [(t-subst α α τ)
-   τ]
-  [(t-subst α β τ)
-   α]
-  [(t-subst (list γ) α τ)
-   (list (t-subst γ α τ))]
-  [(t-subst (γ → γ_2) α τ)
-   ((t-subst γ α τ) → (t-subst γ_2 α τ))])
-
-(define red
-  (reduction-relation
-   poly-stlc
-   (--> (in-hole E ((λ (x τ) M) v))
-        (in-hole E (subst M x v))
-        "βv")
-   (--> (in-hole E ((hd @ τ) (((cons @ τ) v_1) v_2)))
-        (in-hole E v_1)
-        "hd")
-   (--> (in-hole E ((tl @ τ) (((cons @ τ) v_1) v_2)))
-        (in-hole E v_2)
-        "tl")
-   (--> (in-hole E ((((map @ τ_1) @ τ_2) v) (nil @ τ_1)))
-        (in-hole E (nil @ τ_2))
-        "map-nil")
-   (--> (in-hole E ((((map @ τ_1) @ τ_2) v) (((cons @ τ_1) v_1) v_2)))
-        (in-hole E (((cons @ τ_2) (v v_1)) ((((map @ τ_1) @ τ_2) v) v_2)))
-        "map-cons")
-   (--> (in-hole E ((hd @ τ) (nil @ τ)))
-        "error"
-        "hd-err")
-   (--> (in-hole E ((tl @ τ) (nil @ τ)))
-        "error"
-        "tl-err")
-   (--> (in-hole E ((+ integer_1) integer_2))
-        (in-hole E ,(+ (term integer_1) (term integer_2)))
-        "+")))
-
-(define M? (redex-match poly-stlc M))
-(define/contract (Eval M)
-  (-> M? (or/c M? "error"))
-  (define M-t (judgment-holds (typeof • ,M τ) τ))
-  (unless (pair? M-t)
-    (error 'Eval "doesn't typecheck: ~s" M))
-  (define res (apply-reduction-relation* red M))
-  (unless (= 1 (length res))
-    (error 'Eval "internal error: not exactly 1 result ~s => ~s" M res))
-  (define ans (car res))
-  (if (equal? "error" ans)
-      "error"
-      (let ([ans-t (judgment-holds (typeof • ,ans τ) τ)])
-        (unless (equal? M-t ans-t)
-          (error 'Eval "internal error: type soundness fails for ~s" M))
-        ans)))
-
-(define x? (redex-match poly-stlc x))
-(define-metafunction poly-stlc
-  subst : M x M -> M
-  [(subst M x N) 
-   ,(subst/proc x? (term (x)) (term (N)) (term M))])
-
-(define v? (redex-match? poly-stlc v))
-(define τ? (redex-match? poly-stlc τ))
-(define/contract (type-check M)
-  (-> M? (or/c τ? #f))
-  (define M-t (judgment-holds (typeof • ,M τ) τ))
-  (cond
-    [(null? M-t)
-     #f]
-    [(null? (cdr M-t))
-     (car M-t)]
-    [else
-     (error 'type-check "non-unique type: ~s : ~s" M M-t)]))
-
-(module+ test
-  
-  (test-equal (judgment-holds (typeof • 5 τ) τ)
-              (list (term int)))
-  (test-equal (judgment-holds (typeof • [nil @ int] τ) τ)
-              (list (term (list int))))
-  (test-equal (judgment-holds (typeof • ([cons @ int] 1) τ) τ)
-              (list (term ((list int) → (list int)))))
-  (test-equal (judgment-holds (typeof • (([cons @ int] 1) [nil @ int]) τ) τ)
-              (list (term (list int))))
-  (test-equal (judgment-holds (typeof • (λ (x int) x) τ) τ)
-              (list (term (int → int))))
-  (test-equal (judgment-holds (typeof • (λ (x (int → int)) (λ (y int) x)) τ) τ)
-              (list (term ((int → int) → (int → (int → int))))))
-  (test-equal (judgment-holds
-               (typeof •
-                       ([tl @ int]
-                        ([hd @ (list int)]
-                         ((λ (l (list (list int)))
-                            (([cons @ (list int)] (([cons @ int] 1) [nil @ int]))
-                             l))
-                          [nil @ (list int)])))
-                       τ)
-               τ)
-              (list (term (list int))))
-  (test-equal (judgment-holds
-               (typeof •
-                       (([[map @ int] @ (list int)]
-                         (λ (x int) (([cons @ int] x) [nil @ int])))
-                        (([cons @ int] 2)
-                         (([cons @ int] 4)
-                          [nil @ int])))
-                       τ)
-               τ)
-              (list (term (list (list int)))))
-  
-  (test-->> red (term ((λ (x int) x) 7)) (term 7))
-  (test-->> red (term (((λ (x int) (λ (x int) x)) 2) 1)) (term 1))
-  (test-->> red (term (((λ (x int) (λ (y int) x)) 2) 1)) (term 2))
-  (test-->> red 
-            (term ((λ (x int) (([cons @ int] x) [nil @ int])) 11))
-            (term (([cons @ int] 11) [nil @ int])))
-  (test-->> red 
-            (term ((λ (x int) (([cons @ int] x) [nil @ int])) 11))
-            (term (([cons @ int] 11) [nil @ int])))
-  (test-->> red 
-            (term (([cons @ int] ((λ (x int) x) 11)) [nil @ int]))
-            (term (([cons @ int] 11) [nil @ int])))
-  (test-->> red
-            (term ([cons @ int] ((λ (x int) x) 1)))
-            (term ([cons @ int] 1)))
-  (test-->> red
-            (term (([cons @ int] ((λ (x int) x) 1)) [nil @ int]))
-            (term (([cons @ int] 1) [nil @ int])))
-  (test-->> red
-            (term ([hd @ int] ((λ (x int) (([cons @ int] x) [nil @ int])) 11)))
-            (term 11))
-  (test-->> red
-            (term ([tl @ int] ((λ (x int) (([cons @ int] x) [nil @ int])) 11)))
-            (term [nil @ int]))
-  (test-->> red
-            (term ([tl @ int] [nil @ int]))
-            "error")
-  (test-->> red
-            (term ([hd @ int] [nil @ int]))
-            "error")
-  (test-->> red
-            (term ((λ (f (int → (list int))) (f 3)) ([cons @ int] 1)))
-            (term (([cons @ int] 1) 3)))
-  (test-->> red
-            (term 
-             ([tl @ int]
-              ([hd @ (list int)]
-               ((λ (l (list (list int)))
-                  (([cons @ (list int)] (([cons @ int] 1) [nil @ int]))
-                   l))
-                [nil @ (list int)]))))
-            (term [nil @ int]))
-  
-  (test-->> red
-            (term (([[map @ int] @ (list int)]
-                    (λ (x int) (([cons @ int] x) [nil @ int])))
-                   (([cons @ int] 2)
-                    (([cons @ int] 4)
-                     [nil @ int]))))
-            (term (((cons @ (list int)) (((cons @ int) 2) (nil @ int)))
-                   (((cons @ (list int)) (((cons @ int) 4) (nil @ int)))
-                    (nil @ (list int))))))
-  (test-equal (Eval (term ((λ (x int) x) 3)))
-              (term 3))
-  
-  
-  (test-equal (judgment-holds (typeof • ((+ ((+ 1) 2)) ((+ 3) 4)) τ) τ)
-              (list (term int)))
-  (test-->> red
-            (term ((+ 1) ([hd @ int] [nil @ int])))
-            "error")
-  (test-->> red
-            (term ((+ ((+ 1) 2)) ((+ 3) 4)))
-            (term 10))
-  (test-->> red
-            (term ((λ (f (int → int)) (f 3)) (+ 1)))
-            (term 4))
-  
-  (test-results))
-
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/README b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/README
deleted file mode 100644
index 1e46c92fed..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/README
+++ /dev/null
@@ -1,25 +0,0 @@
-This directory a the PLT Redex implementation of the
-R6RS operational semantics and a test suite for the
-semantics.
-
-== r6rs.rkt: the semantics itself.
-
-== r6rs-tests.rkt: the test suite for the semantics. Use:
-
-   racket -t r6rs-tests.rkt -m
-
-   to run the tests and see a single period shown per test
-   run (each test that explores more than 100 states shows a
-   colon for each 100 states it explores). To see a more
-   verbose output (that shows each test), use:
-
-   racket -t r6rs-tests.rkt -m #t
-
-== show-examples.rkt: use this file to explore particular
-   examples in a GUI. Its content shows how to use it and
-   gives a few examples. Either run it in DrRacket's module
-   language, or like this from the commandline:
-
-   gracket show-examples.rkt
-
-== test.rkt: test suite infrastructure
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/r6rs-tests.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/r6rs-tests.rkt
deleted file mode 100644
index 621aa14fcf..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/r6rs-tests.rkt
+++ /dev/null
@@ -1,2123 +0,0 @@
-#lang racket/base
-(require racket/match
-         redex/reduction-semantics
-         (for-syntax racket/base)
-         "test.rkt"
-         "r6rs.rkt")
-
-;; ============================================================
-;; TESTING APPARATUS
-
-;; test : p (from the r6 grammar) [the test]
-;; expected : (list-of p)
-(define-struct r6test (test expected))
-
-(define (make-r6test/v t expected) 
-  (make-r6test `(store () ,t)
-               (list `(store () (values ,expected)))))
-(define (make-r6test/e t err)
-  (make-r6test `(store () ,t)
-               (list `(uncaught-exception (make-cond ,err)))))
-
-(define (run-a-test test verbose?)
-  (unless verbose?
-    (printf ".") 
-    (flush-output))
-  (let ([t (r6test-test test)]
-        [expected (r6test-expected test)])
-    (set! test-count (+ test-count 1))
-    (when verbose? (printf "testing ~s ... " t))
-    (flush-output)
-    (with-handlers ([exn:fail:duplicate?
-                     (lambda (e)
-                       (set! failed-tests (+ failed-tests 1))
-                       (unless verbose? 
-                         (printf "\ntesting ~s ... " t))
-                       (raise e))])
-      (let* ([results (evaluate reductions
-                                t
-                                (or verbose? 'dots)
-                                (verify-p* t))])
-        (let ([rewritten-results (remove-duplicates (map rewrite-actual results))])
-          (for-each (verify-a* t) results)
-          (unless (set-same? expected rewritten-results equal?)
-            (set! failed-tests (+ failed-tests 1))
-            (unless verbose? 
-              (printf "\ntesting ~s ... " t))
-            (printf "TEST FAILED!\nexpected:~a\nrewritten-received:~a\nreceived:~a\n\n"
-                    (combine-in-lines expected)
-                    (combine-in-lines rewritten-results)
-                    (combine-in-lines results))))))))
-
-(define p*-pattern (redex-match lang p*))
-(define a*-pattern (redex-match lang a*))
-(define r*-pattern (redex-match lang r*))
-(define verified-terms 0)
-(define ((verify-p* orig) sexp)
-  (let ([m (p*-pattern sexp)])
-    (unless (and m
-                 (= 1 (length m)))
-      (newline)
-      (error 'verify-p* "matched ~a times\n ~s\norig\n ~s" 
-             (if m
-                 (length m)
-                 "0")
-             sexp orig))
-    (set! verified-terms (+ verified-terms 1))))
-
-(define ((verify-a* orig-sexp) sexp)
-  (unless (a*-pattern sexp)
-    (newline) 
-    (error 'verify-a* "didn't match ~s\noriginal term ~s" sexp orig-sexp))
-  
-  ;; verify that observable is defined for this value
-  (let ([candidate-r* (term-let ((sexp sexp))
-                                (term (observable sexp)))])
-    (unless (r*-pattern candidate-r*)
-      (error 'verify-a* "observable of ~s is ~s, but isn't an r*\noriginal term ~s"
-             sexp
-             candidate-r*
-             orig-sexp))))
-
-(define (remove-duplicates lst)
-  (let ([ht (make-hash)])
-    (for-each (λ (x) (hash-set! ht x #t)) lst)
-    (hash-map ht (λ (x y) x))))
-
-(define (combine-in-lines strs) (apply string-append (map (λ (x) (format "\n  ~s" x)) strs)))
-
-(define (rewrite-actual actual)
-  (match actual
-    [`(unknown ,str) actual]
-    [`(uncaught-exception ,v) actual]
-    [`(store ,xs ...)
-     (subst-:-vars actual)]
-    [_
-     (error 'rewrite-actual "unknown actual ~s\n" actual)]))
-
-(define (subst-:-vars exp)
-  (match exp
-    [`(store ,str ,exps ...)
-     (let* ([pp-var? (λ (x) (regexp-match #rx"^([(]-)?[qmi]p" (format "~a" (car x))))]
-            [pp-bindings (filter pp-var? str)]
-            [with-out-pp (fp-sub pp-bindings `(store ,(filter (λ (x) (not (pp-var? x))) str) ,@exps))]
-            [with-out-app-vars (remove-unassigned-app-vars with-out-pp)]
-            [without-ri-vars (remove-unused-ri-vars with-out-app-vars)])
-       without-ri-vars)]
-    [`(unknown ,string) string]
-    [_ (error 'subst-:-vars "unknown exp ~s" exp)]))
-
-(define (is-ri-var? x) 
-  (or (and (symbol? x) (regexp-match #rx"^r" (symbol->string x)))
-      (and (pair? x)
-           (symbol? (car x))
-           (regexp-match #rx"^-i" (symbol->string (car x))))))
-
-(define (remove-unused-ri-vars exp)
-  (match exp
-    [`(store ,str ,exps ...)
-     (let ([ri-vars (filter is-ri-var? (map car str))]
-           [str-without-ri-binders 
-            (filter (λ (binding) (not (is-ri-var? (car binding)))) str)])
-       `(store ,(filter (λ (binding)
-                          (cond
-                            [(is-ri-var? (car binding)) 
-                             (not (not-in (car binding) (cons str-without-ri-binders exps)))]
-                            [else #t]))
-                        str)
-               ,@exps))]))
-
-(define (remove-unassigned-app-vars term)
-  (match term 
-    [`(store ,bindings ,body)
-     (let* ([binding-rhss (map cadr bindings)]
-            [bindings-to-sub 
-             (filter (λ (binding) (not (appears-in-set? (car binding) body)))
-                     (filter (λ (binding) (regexp-match #rx"^bp" (format "~a" (car binding)))) bindings))]
-            [vars-to-sub (map car bindings-to-sub)])
-       `(store ,(filter (λ (binding) (not (memq (car binding) vars-to-sub))) bindings)
-               ,(r6-all bindings-to-sub body)))]))
-
-(define (not-in var e)
-  (cond
-    [(pair? e) (and (not-in var (car e))
-                    (not-in var (cdr e)))]
-    [else (not (equal? var e))]))
-
-(define (appears-in-set? x e)
-  (let loop ([e e])
-    (match e
-      [`(set! ,x2 ,e2) (or (equal? x x2)
-                           (loop e2))]
-      [else
-       (and (list? e) 
-            (ormap loop e))])))
-
-
-(define (fp-sub bindings term)
-  (let loop ([term term])
-    (let ([next (do-one-subst bindings term)])
-      (cond 
-        [(equal? term next) next]
-        [else (loop next)]))))
-
-(define (r6-all sub-vars body)
-  (term-let ([(sub-vars ...) sub-vars]
-             [body body])
-            (term (r6rs-subst-many (sub-vars ... body)))))
-
-(define (do-one-subst sub-vars term)
-  (match term
-    [`(store ,str ,exps ...)
-     (let* ([keep-vars 
-             (map (λ (pr)
-                    `(,(car pr)
-                      ,(r6-all sub-vars (cadr pr))))
-                  str)])
-       `(store ,keep-vars ,@(r6-all sub-vars exps)))]))
-
-(define test-count 0)
-(define failed-tests 0)
-
-(define arithmetic-tests
-  (list
-   (make-r6test/v '(+) 0)
-   (make-r6test/v '(+ 1) 1)
-   (make-r6test/v '(+ 1 2) 3)
-   (make-r6test/v '(+ 1 2 3) 6)
-   
-   (make-r6test/v '(- 1) -1)
-   (make-r6test/v '(- 1 2) -1)
-   (make-r6test/v '(- 1 2 3) -4)
-   
-   (make-r6test/v '(*) 1)
-   (make-r6test/v '(* 2) 2)
-   (make-r6test/v '(* 2 3) 6)
-   (make-r6test/v '(* 2 3 4) 24)
-   
-   (make-r6test/v '(/ 2) 1/2)
-   (make-r6test/v '(/ 1 2) 1/2)
-   (make-r6test/v '(/ 1 2 3) 1/6)
-   
-   (make-r6test/e '(/ #f) "arith-op applied to non-number")
-   
-   (make-r6test/e '(/ 1 2 3 4 5 0 6) "divison by zero")
-   (make-r6test/e '(/ 0) "divison by zero")
-   
-   (make-r6test '(store () ((lambda (x) (+ x x)) #f))
-                (list '(uncaught-exception (make-cond "arith-op applied to non-number"))))))
-
-(define assignment-results-tests
-  (list
-   ;; begin
-   (make-r6test/v '((lambda (x) (begin x (set! x 2) x)) 3)
-                  2)
-   (make-r6test '(store () (letrec ([x 1]) (begin 2 (set! x 2))))
-                (list '(unknown "unspecified result")))
-   
-   ;; begin0 
-   (make-r6test/v '((lambda (x) (begin0 x (set! x 2))) 3)
-                  3)
-   (make-r6test '(store () (letrec ([x 1]) (begin0 (set! x 2) 2 3)))
-                (list '(unknown "unspecified result")))
-   (make-r6test/v '((lambda (x) (begin (begin0 (set! x 1) (set! x 2)) x)) 3)
-                  2)
-   
-   
-   ;; application
-   (make-r6test '(store () (letrec ([x 1]) ((lambda (x) 1) (set! x 2))))
-                (list '(unknown "unspecified result")))
-   (make-r6test '(store () (letrec ([x 1]) ((set! x 2) 2)))
-                (list '(unknown "unspecified result")))
-   
-   ;; if
-   (make-r6test '(store () (letrec ([x 1]) (if (set! x 2) 2 3)))
-                (list '(unknown "unspecified result")))
-   
-   ;; set!
-   (make-r6test '(store () (letrec ([x 1]) (set! x (set! x 2))))
-                (list '(unknown "unspecified result")))
-   
-   (make-r6test '(store () (letrec ([x '(1)]) (set! x (set-car! x 2))))
-                (list '(unknown "unspecified result")
-                      '(uncaught-exception (make-cond "can't set-car! on a non-pair or an immutable pair"))))
-   
-   ;; handlers
-   (make-r6test '(store () (letrec ([x 1]) (with-exception-handler (lambda (e) (set! x 2)) (lambda () (car 'x)))))
-                (list '(uncaught-exception (make-cond "handler returned"))))
-   
-   ;; call with values
-   (make-r6test '(store () (letrec ([x 1]) (call-with-values (lambda () (set! x 2)) +)))
-                (list '(unknown "unspecified result")))
-   
-   ;; dynamic-wind
-   (make-r6test/v '((lambda (x) (dynamic-wind (lambda () (set! x 0)) (lambda () x) (lambda () (set! x 2)))) 1)
-                  0)
-   (make-r6test '(store () (letrec ([x 1]) (dynamic-wind (lambda () 0) (lambda () (set! x 2)) (lambda () 1))))
-                (list '(unknown "unspecified result")))
-   (make-r6test '(store () (letrec ([x 1]) (begin (dynamic-wind (lambda () 0) (lambda () (set! x 2)) (lambda () 1)) 5)))
-                (list '(store ((lx-x 2)) (values 5))))))
-
-(define basic-form-tests
-  (list
-   
-   (make-r6test/e '((lambda (x y) x) (lambda (x) x))
-                  "arity mismatch")
-   
-   (make-r6test/v '(if #t 12 13) 12)
-   (make-r6test/v '(if #f 12 13) 13)
-   (make-r6test/v '(begin (if #f 12 14) 14) 14)
-   (make-r6test/v '((lambda (x) (if #t (set! x 45) 'x) x) 1) 45)
-   (make-r6test/v '((lambda (x) (if #f (set! x 45) 'z) x) 1) 1)
-   
-   ;; begin0 tests
-   (make-r6test/v '(begin0 (+ 1 1))
-                  2)
-   (make-r6test/v '(begin0 (+ 1 1) (+ 2 3))
-                  2)
-   (make-r6test/v '((lambda (x) (begin0 x (set! x 4))) 2)
-                  2)
-   (make-r6test/v '(((lambda (x) (begin0 (lambda () x) (set! x (+ x 1)) (set! x (+ x 1)) (set! x (+ x 1))))
-                     2))
-                  5)))
-
-(define pair-tests
-  (list
-   (make-r6test/v '(if (null? (cons 1 (cons 2 (cons (lambda (x) x) null)))) 0 1) 
-                  1)
-   (make-r6test/v '(null? (cons 1 (cons 2 (cons (lambda (x) x) null)))) #f)
-   (make-r6test/v '(null? (cons 1 2)) #f)
-   (make-r6test/v '(null? null) #t)
-   (make-r6test/v '(pair? null) #f)
-   (make-r6test/v '(pair? (cons 1 1)) #t)
-   (make-r6test/v '(null? (list 1 2)) #f)
-   (make-r6test/v '(pair? (list 1)) #t)
-   (make-r6test/v '(pair? (list)) #f)
-   (make-r6test/v '(null? (list)) #t)
-   
-   (make-r6test/v '((lambda (x) ((lambda (y) (car (cdr x))) (begin (set-car! (cdr x) 400) 11))) 
-                    (cons 1 (cons 2 null)))
-                  400)
-   (make-r6test/v '((lambda (x) ((lambda (y) (cdr (cdr x))) (begin (set-cdr! (cdr x) 400) 12)))
-                    (cons 1 (cons 2 null))) 
-                  400)
-   (make-r6test '(store () ((lambda (x) (set-cdr! x 4) (cdr x)) '(3)))
-                (list '(store () (values 4))
-                      '(uncaught-exception (make-cond "can't set-cdr! on a non-pair or an immutable pair"))))
-   (make-r6test '(store () ((lambda (x) (set-car! x 4) (car x)) '(3)))
-                (list '(store () (values 4))
-                      '(uncaught-exception (make-cond "can't set-car! on a non-pair or an immutable pair"))))
-   
-   (make-r6test '(store ()
-                        (letrec ([first-time? #t]
-                                 [f (lambda y (if first-time?
-                                                  (begin
-                                                    (set! first-time? #f)
-                                                    (set-car! y 2))
-                                                  (car y)))]
-                                 [g (lambda () (apply f '(1)))])
-                          (g)
-                          (g)))
-                (list '(store ((lx-first-time? #f)
-                               (lx-f (lambda y (if lx-first-time?
-                                                   (begin
-                                                     (set! lx-first-time? #f)
-                                                     (set-car! y 2))
-                                                   (car y))))
-                               (lx-g (lambda () (apply lx-f (cons 1 null)))))
-                              (values 1))))))
-
-(define quote-tests
-  (list
-   (make-r6test/v ''#f #f)
-   (make-r6test/v ''#t #t)
-   (make-r6test/v ''1 1)
-   (make-r6test/v ''x ''x)
-   (make-r6test/v ''null ''null)
-   (make-r6test/v '(null? 'null) #f)
-   (make-r6test/v ''unspecified ''unspecified)
-   (make-r6test/v '((lambda (x) (eqv? 'x 1)) 1) #f)))
-
-(define eqv-tests
-  (list
-   (make-r6test '(store () (eqv? (lambda (x) x) (lambda (x) x)))
-                (list '(unknown "equivalence of procedures")))
-   (make-r6test '(store () (eqv? (lambda (x) x) (lambda (x) x)))
-                (list '(unknown "equivalence of procedures")))
-   (make-r6test '(store () ((lambda (x) (eqv? x x)) (lambda (x) x)))
-                (list '(unknown "equivalence of procedures")))
-   
-   (make-r6test/v '(eqv? (cons 1 2) (cons 1 2)) #f)
-   (make-r6test/v '((lambda (x) (eqv? x x)) (cons 1 2)) #t)
-   
-   (make-r6test '(store () (apply apply values '(())))
-                (list '(store () (values))))
-   
-   (make-r6test/v '(eqv? #t #t) #t)
-   (make-r6test/v '(eqv? #t #f) #f)
-   
-   (make-r6test/v '(eqv? 'x 'y) #f)
-   (make-r6test/v '(eqv? 'y 'y) #t)
-   
-   (make-r6test/v '(eqv? (lambda (x) x) #t) #f)
-   (make-r6test/v '(eqv? #t (lambda (x) x)) #f)
-   (make-r6test/v '(eqv? '() null) #t)
-   
-   (make-r6test '(store () (eqv? '(a) '(a))) 
-                (list '(store () (values #f))))
-   (make-r6test '(store () (eqv? '(a) '(b))) 
-                (list '(store () (values #f))))
-   (make-r6test '(store () ((lambda (x) (eqv? x x)) '(a)))
-                (list '(store () (values #t))))
-   
-   (make-r6test '(store ()
-                        (eqv?
-                         (call/cc
-                          (lambda (k)
-                            (with-exception-handler
-                             k
-                             (lambda () (car 'x)))))
-                         (call/cc
-                          (lambda (k)
-                            (with-exception-handler
-                             k
-                             (lambda () (car)))))))
-                (list '(store () (values #f))
-                      '(store () (values #t))))
-   (make-r6test '(store ()
-                        ((lambda (x) (eqv? x x))
-                         (call/cc
-                          (lambda (k)
-                            (with-exception-handler
-                             k
-                             (lambda () (car 'x)))))))
-                (list '(store () (values #f))
-                      '(store () (values #t))))
-   
-   (make-r6test/v '(eqv?
-                    (call/cc
-                     (lambda (k)
-                       (with-exception-handler
-                        k
-                        (lambda () (car 'x)))))
-                    #f)
-                  #f)
-   (make-r6test/v '(eqv?
-                    #f
-                    (call/cc
-                     (lambda (k)
-                       (with-exception-handler
-                        k
-                        (lambda () (car 'x))))))
-                  #f)
-   (make-r6test/v '(eqv?
-                    (lambda (x) x)
-                    (call/cc
-                     (lambda (k)
-                       (with-exception-handler
-                        k
-                        (lambda () (car 'x))))))
-                  #f)
-   (make-r6test/v '(eqv?
-                    (call/cc
-                     (lambda (k)
-                       (with-exception-handler
-                        k
-                        (lambda () (car 'x)))))
-                    (lambda (x) x))
-                  #f)))
-
-(define err-tests
-  (list
-   
-   (make-r6test/e '(call-with-values (lambda (x) x) (lambda (y) y))
-                  "arity mismatch")
-   (make-r6test/e '(/) "arity mismatch")
-   (make-r6test/e '(-) "arity mismatch")
-   (make-r6test/e '(cons) "arity mismatch")
-   (make-r6test/e '(null?) "arity mismatch")
-   (make-r6test/e '(pair?) "arity mismatch")
-   (make-r6test/e '(car) "arity mismatch")
-   (make-r6test/e '(cdr) "arity mismatch")
-   (make-r6test/e '(set-car!) "arity mismatch")
-   (make-r6test/e '(set-cdr!) "arity mismatch")
-   (make-r6test/e '(call/cc) "arity mismatch")
-   (make-r6test/e '(eqv?) "arity mismatch")
-   (make-r6test/e '(apply) "arity mismatch")
-   (make-r6test/e '(apply values) "arity mismatch")
-   (make-r6test/e '(call-with-values) "arity mismatch")
-   
-   (make-r6test/e '(dynamic-wind 1) "arity mismatch")
-   
-   (make-r6test/e '(apply 1 2) "can't apply non-procedure")
-   (make-r6test/e '(apply 1 null) "can't apply non-procedure")
-   (make-r6test/e '(apply values 2) "apply's last argument non-list")
-   (make-r6test/e '(car 1) "can't take car of non-pair")
-   (make-r6test/e '(cdr 1) "can't take cdr of non-pair")
-   (make-r6test/e '(set-car! 2 1) "can't set-car! on a non-pair or an immutable pair")
-   (make-r6test/e '(set-cdr! 1 2) "can't set-cdr! on a non-pair or an immutable pair")
-   
-   (make-r6test/e '(call/cc 1) "can't call non-procedure")
-   (make-r6test/e '(call-with-values 1 2) "can't call non-procedure")))
-
-(define r5-tests
-  (list
-   
-   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-   ;;
-   ;; tests from R5RS
-   ;;
-   
-   ; ----
-   ; 4.1.3
-   (make-r6test/v '(+ 3 4) 7)
-   (make-r6test/v '((if #f + *) 3 4) 12)
-   
-   
-   ; ----
-   ; 4.1.4
-   (make-r6test/v '(lambda (x) (+ x x)) '(lambda (x) (+ x x)))
-   (make-r6test/v '((lambda (x) (+ x x)) 4) 8)
-   
-   (make-r6test '(store ()
-                        (letrec* ([reverse-subtract
-                                   (lambda (x y) (- y x))])
-                                 (reverse-subtract 7 10)))
-                (list
-                 '(store ((lx-reverse-subtract (lambda (x y) (- y x))))
-                         (values 3))))
-   
-   (make-r6test '(store ()
-                        (letrec* ([add4
-                                   ((lambda (x)
-                                      (lambda (y)
-                                        (+ x y)))
-                                    4)])
-                                 (add4 6)))
-                (list
-                 '(store ((lx-add4 (lambda (y) (+ 4 y))))
-                         (values 10))))
-   
-   (make-r6test/v '((lambda x x) 3 4 5 6)
-                  '(cons 3 (cons 4 (cons 5 (cons 6 null)))))
-   (make-r6test/v '((lambda (x y dot z) z) 3 4 5 6)
-                  '(cons 5 (cons 6 null)))
-   
-   ; ----
-   ; 4.2.2 
-   
-   (make-r6test '(store ()
-                        (letrec* ([even?
-                                   (lambda (n)
-                                     (if (eqv? 0 n)
-                                         #t
-                                         (odd? (- n 1))))]
-                                  [odd?
-                                   (lambda (n)
-                                     (if (eqv? 0 n)
-                                         #f
-                                         (even? (- n 1))))])
-                                 ;; using 88 here runs, but isn't really much more useful
-                                 ;; for testing purposes (it also takes > 1000 reductions)
-                                 (even? 2)))
-                (list
-                 '(store ((lx-even?
-                           (lambda (n)
-                             (if (eqv? 0 n)
-                                 #t
-                                 (lx-odd? (- n 1)))))
-                          (lx-odd?
-                           (lambda (n)
-                             (if (eqv? 0 n)
-                                 #f
-                                 (lx-even? (- n 1))))))
-                         
-                         (values #t))))
-   
-   ; ----
-   ; 4.2.3
-   (make-r6test '(store () (letrec* ([x 0]) (begin (set! x 5) (+ x 1))))
-                (list '(store ((lx-x 5)) (values 6))))
-   
-   
-   ; ----
-   ; 5.2.1
-   
-   (make-r6test '(store () 
-                        (letrec* ([add3 (lambda (x) (+ x 3))])
-                                 (add3 3)))
-                (list '(store ((lx-add3 (lambda (x) (+ x 3)))) (values 6))))
-   (make-r6test '(store () (letrec* ((first car))
-                                    (first '(1 2))))
-                (list '(store ((lx-first car)) (values 1))))
-   
-   
-   ; ----
-   ; 6.1
-   
-   (make-r6test/v '(eqv? 'a 'a) #t)
-   (make-r6test/v '(eqv? 'a 'b) #f)
-   (make-r6test/v '(eqv? 2 2) #t)
-   (make-r6test/v '(eqv? '() '()) #t)
-   (make-r6test/v '(eqv? 100000000 100000000) #t)
-   (make-r6test/v '(eqv? (cons 1 2) (cons 1 2)) #f)
-   (make-r6test '(store () (eqv? (lambda () 1) (lambda () 2)))
-                (list '(unknown "equivalence of procedures")))
-   (make-r6test/v '(eqv? #f 'nil) #f)
-   (make-r6test/v '(eqv? #f '()) #f)
-   (make-r6test '(store () ((lambda (p) (eqv? p p)) (lambda (x) x)))
-                (list '(unknown "equivalence of procedures")))
-   
-   (make-r6test 
-    '(store () 
-            (letrec* ([gen-counter
-                       (lambda ()
-                         ((lambda (n) 
-                            (lambda () (set! n (+ n 1)) n))
-                          0))])
-                     ((lambda (g) (eqv? g g))
-                      (gen-counter))))
-    (list '(unknown "equivalence of procedures")))
-   
-   (make-r6test 
-    '(store () 
-            (letrec* ((gen-counter
-                       (lambda ()
-                         ((lambda (n) 
-                            (lambda () (set! n (+ n 1)) n))
-                          0))))
-                     (eqv? (gen-counter) (gen-counter))))
-    (list '(unknown "equivalence of procedures")))
-   
-   
-   
-   ; ----
-   ; 6.3.2
-   
-   (make-r6test '(store ()
-                        (letrec* ([x (list 'a 'b 'c)]
-                                  [y x])
-                                 y))
-                (list
-                 '(store ((lx-x (cons 'a (cons 'b (cons 'c null))))
-                          (lx-y (cons 'a (cons 'b (cons 'c null)))))
-                         (values (cons 'a (cons 'b (cons 'c null)))))))
-   
-   (make-r6test '(store ()
-                        (letrec* ((x (list 'a 'b 'c))
-                                  (y x))
-                                 (set-cdr! x 4)
-                                 x))
-                (list
-                 '(store ((lx-x (cons 'a 4))
-                          (lx-y (cons 'a 4)))
-                         (values (cons 'a 4)))))
-   
-   (make-r6test '(store ()
-                        (letrec* ((x (list 'a 'b 'c))
-                                  (y x))
-                                 (set-cdr! x 4)
-                                 (eqv? x y)))
-                (list
-                 '(store ((lx-x (cons 'a 4))
-                          (lx-y (cons 'a 4)))
-                         (values #t))))
-   
-   (make-r6test '(store ()
-                        (letrec* ((x (list 'a 'b 'c))
-                                  (y x))
-                                 (set-cdr! x 4)
-                                 y))
-                (list
-                 '(store ((lx-x (cons 'a 4))
-                          (lx-y (cons 'a 4)))
-                         (values (cons 'a 4)))))
-   
-   ; ----
-   ; 6.4
-   (make-r6test/v '(apply + (list 3 4)) 7)
-   
-   (make-r6test
-    '(store ()
-            (letrec* ([compose
-                       (lambda (f g)
-                         (lambda args
-                           (f (apply g args))))]
-                      
-                      [sqrt (lambda (x) (if (eqv? x 900) 30 #f))])
-                     ((compose sqrt *) 12 75)))
-    (list '(store ((lx-compose (lambda (f g)
-                                 (lambda args
-                                   (f (apply g args)))))
-                   (lx-sqrt (lambda (x) (if (eqv? x 900) 30 #f))))
-                  (values 30))))))
-
-(define (conv-base base vec)
-  (let loop ([i (vector-length vec)]
-             [acc 0])
-    (cond
-      [(zero? i) acc]
-      [else (loop (- i 1)
-                  (+ acc (* (expt base (- i 1))
-                            (vector-ref vec (- i 1)))))])))
-
-(define (deconv-base base number)
-  (list->vector
-   (let loop ([i number])
-     (cond
-       [(zero? i) '()]
-       [else (cons (modulo i base)
-                   (loop (quotient i base)))]))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; app tests
-;;
-
-(define app-tests
-  (list 
-   (make-r6test/v '((lambda () 1)) 1)
-   (make-r6test/v '(((lambda (x) (lambda (x) x)) 1) 2) 2)
-   (make-r6test/v '(((lambda (x) (lambda (x dot y) x)) 1) 2) 2)
-   (make-r6test/v '(((lambda (x) (lambda (y dot x) (car x))) 1) 2 3) 3)
-   (make-r6test/e '((lambda (x y) x) 1) "arity mismatch")
-   (make-r6test/v '(car ((lambda (x) (cons x null)) 3)) 3)
-   (make-r6test/v '((lambda (x) x) 3) 3)
-   (make-r6test/v '((lambda (x y) (- x y)) 6 5) 1)
-   (make-r6test/e '((lambda () (+ 1 2 3)) 3 4 5)
-                  "arity mismatch")
-   (make-r6test/v '((lambda (x y z) (+ x y z)) 3 4 5) 12)
-   (make-r6test/v '((lambda (x y) (+ x y)) (+ 1 2) (+ 3 4)) 10)
-   (make-r6test/v '((lambda (x1 x2 dot y) (car y)) 1 2 3 4) 3)
-   (make-r6test/v '((lambda (x dot y) (car y)) 1 2 3 4) 2)
-   (make-r6test/v '((lambda (x dot y) x) 1) 1)
-   (make-r6test/e '((lambda (x y dot z) x) 1)
-                  "arity mismatch")
-   (make-r6test/v '((lambda args (car (cdr args))) 1 2 3 4 5 6) 2)
-   (make-r6test/v '((lambda args (eqv? args args)) 1 2) #t)
-   (make-r6test/v '((lambda args ((lambda (y) args) (begin (set! args 50) 123)))) 50)
-   (make-r6test '(store () ((lambda args ((lambda (y) args) (set! args 50)))))
-                (list '(unknown "unspecified result")))
-   (make-r6test/v '(if ((lambda (x) x) 74) ((lambda () 6)) (6 54)) 6)
-   (make-r6test/e '(1 1) "can't call non-procedure")
-   (make-r6test/e '(if ((lambda (x) x) #f) ((lambda () 6)) (6 54))
-                  "can't call non-procedure")
-   
-   (make-r6test '(store () (- 1))
-                (list '(store () (values -1))))
-   
-   (make-r6test '(store () (- (- 1)))
-                (list '(store () (values 1))))
-   
-   (make-r6test '(store ((x 1)) (begin (set! x (begin (set! x (- x)) (- x))) x))
-                (list '(store ((x 1)) (values 1))))
-   
-   (make-r6test '(store ((x 1))
-                        ((lambda (p q) x)
-                         (begin (set! x (- x)) 1)
-                         (begin (set! x (- x)) 1)))
-                (list '(store ((x 1))
-                              (values 1))))
-   
-   (make-r6test '(store ((x 1))
-                        ((lambda (p q) 1)
-                         (begin (set! x 5) 1)
-                         (begin (set! x 6) 2)))
-                (list '(store ((x 5)) (values 1))
-                      '(store ((x 6)) (values 1))))
-   
-   (make-r6test/v '(call/cc
-                    (lambda (k)
-                      (with-exception-handler
-                       (lambda (e) (k e))
-                       (lambda () (apply (lambda (x y) x) 1 null)))))
-                  '(make-cond "arity mismatch"))
-   
-   (make-r6test/v '((lambda (x) ((lambda (y) x) (begin (set! x 5) 'whatever))) 3) 5)
-   (make-r6test '(store ()
-                        (((lambda (a b ret) ((lambda (x y) ret) (begin (set! ret a) #f)
-                                                                (begin (set! ret b) #t)))
-                          (lambda () 1)
-                          (lambda () 3)
-                          5)))
-                '((store () (values 1))
-                  (store () (values 3))))
-   
-   (make-r6test/v (let ([Y '(lambda (le)
-                              ((lambda (f) (f f))
-                               (lambda (f)
-                                 (le (lambda (z) ((f f) z))))))])
-                    `((,Y
-                       (lambda (length)
-                         (lambda (l)
-                           (if (null? l)
-                               0
-                               (+ (length (cdr l)) 1)))))
-                      (cons 1 null)))
-                  1)
-   (make-r6test/v '((lambda (x y) (+ x y)) ((lambda (x) x) 3) ((lambda (x) x) 4)) 
-                  7)
-   (make-r6test/v '((lambda (x) ((lambda (a b) x) (begin (set! x (- x)) 'x)
-                                                  (begin (set! x (- x)) 'y))) 
-                    1)
-                  1)
-   
-   (make-r6test/v '((lambda (x) (begin (set! x 5) (set! x 4) (set! x 3) x)) 0) 3)
-   (make-r6test/v '((lambda (x y) (x y)) + 0) 0)
-   (make-r6test/v '(apply + (cons 1 (cons 2 null))) 3)
-   (make-r6test '(store ()
-                        ((lambda (x) (set-cdr! x x) (apply + x))
-                         (cons 1 #f)))
-                (list '(uncaught-exception (make-cond "apply called on circular list"))))
-   
-   (make-r6test '(store ()
-                        ((lambda (x)
-                           (set-cdr! (cdr x) x)
-                           (apply + x))
-                         (cons 1 (cons 2 #f))))
-                (list '(uncaught-exception (make-cond "apply called on circular list"))))
-   
-   ;; app
-   (make-r6test/v '((lambda args (apply + args)) 1 2 3 4) 10)
-   (make-r6test/v '((lambda (f) (eqv? (f 1) (f 1))) (lambda args (car args))) #t)
-   (make-r6test '(store () 
-                        (letrec* ((length
-                                   (lambda (l)
-                                     (if (null? l)
-                                         0
-                                         (+ 1 (length (cdr l)))))))
-                                 (length (list 1 2 3))))
-                (list '(store ((lx-length
-                                (lambda (l)
-                                  (if (null? l)
-                                      0
-                                      (+ 1 (lx-length (cdr l)))))))
-                              (values 3))))
-   (make-r6test '(store () ((lambda (x) 
-                              (set! x (x 
-                                       (begin (set! x +) 4)
-                                       (begin (set! x *) 2)))
-                              x)
-                            /))
-                (list '(store () (values 2))
-                      '(store () (values 6))
-                      '(store () (values 8))))
-   
-   (make-r6test '(store () ((lambda (x) 
-                              (set! x (x 
-                                       (begin (set! x +) 12)
-                                       (begin (set! x *) 2)
-                                       (begin (set! x -) 2)))
-                              x)
-                            /))
-                (list '(store () (values 3))
-                      '(store () (values 16))
-                      '(store () (values 8))
-                      '(store () (values 48))))
-   
-   (make-r6test '(store () 
-                        ((lambda (x) 
-                           (set! x (x (begin (set! x *) 2)))
-                           x)
-                         /))
-                (list '(store () (values 2))
-                      '(store () (values 1/2))))
-   
-   ;; test non-determinism in spec (a single application can go two different ways
-   ;; at two different times)
-   (make-r6test '(store ()  
-                        (letrec ((x null)
-                                 (twice (lambda (f) (f) (f))))
-                          (twice
-                           (lambda ()
-                             ((lambda (p q) 1)
-                              (begin (set! x (cons 1 x)) 'foo)
-                              (begin (set! x (cons 2 x)) 'bar))))))
-                (list
-                 '(store ((lx-x (cons 1 (cons 2 (cons 1 (cons 2 null)))))
-                          (lx-twice (lambda (f) (f) (f))))
-                         (values 1))
-                 '(store ((lx-x (cons 2 (cons 1 (cons 1 (cons 2 null)))))
-                          (lx-twice (lambda (f) (f) (f))))
-                         (values 1))
-                 '(store ((lx-x (cons 1 (cons 2 (cons 2 (cons 1 null)))))
-                          (lx-twice (lambda (f) (f) (f))))
-                         (values 1))
-                 '(store ((lx-x (cons 2 (cons 1 (cons 2 (cons 1 null)))))
-                          (lx-twice (lambda (f) (f) (f))))
-                         (values 1))))
-   
-   (make-r6test/v '(condition? (make-cond "xyz")) #t)
-   (make-r6test/v '(condition? 1) #f)
-   (make-r6test/v '(procedure?
-                    (call/cc
-                     (lambda (k)
-                       (with-exception-handler k (lambda () (car 'x))))))
-                  #f)
-   (make-r6test/v '(condition?
-                    (call/cc
-                     (lambda (k)
-                       (with-exception-handler k (lambda () (car 'x))))))
-                  #t)
-   
-   ;; test capture avoiding substitution
-   (make-r6test '(store () 
-                        (letrec ((x 1))
-                          (((lambda (f) (lambda (x) (+ x (f))))
-                            (lambda () x))
-                           2)))
-                (list '(store ((lx-x 1)) (values 3))))
-   
-   (make-r6test '(store ()
-                        (((lambda (x1) (lambda (x) x))
-                          3)
-                         4))
-                (list '(store () (values 4))))
-   (make-r6test '(store ()
-                        (((lambda (x)
-                            (lambda args (car args)))
-                          1)
-                         2))
-                (list '(store () (values 2))))
-   
-   (make-r6test '(store () 
-                        (letrec ((x 1))
-                          (((lambda (f) (lambda (y dot x) (f)))
-                            (lambda () x))
-                           2)))
-                (list '(store ((lx-x 1)) (values 1))))
-   
-   (make-r6test/v '((lambda (x y dot z) (set! z (cons x z)) (set! z (cons y z)) (apply + z))
-                    1 2 3 4)
-                  '10)
-   
-   (make-r6test '(store () 
-                        (letrec ((g (lambda (y) y))
-                                 (f (lambda (x) (g 1))))
-                          (((lambda (x) (lambda (g) (g x))) f)
-                           (lambda (x) 17))))
-                (list '(store ((lx-g (lambda (y) y))
-                               (lx-f (lambda (x) (lx-g 1))))
-                              (values 17))))))
-
-(define mv-tests
-  (list
-   (make-r6test
-    '(store () ((lambda (x) x) (values (lambda (y) y))))
-    (list '(store () (values (lambda (y) y)))))
-   (make-r6test
-    '(store () (call-with-values (lambda () (lambda (y) y)) (lambda (x) x)))
-    (list '(store () (values (lambda (y) y)))))
-   (make-r6test
-    '(store () (call-with-values 
-                (lambda ()
-                  (call-with-values
-                   (lambda () ((lambda (z) z) (lambda (q) q)))
-                   (lambda (y) y))) 
-                (lambda (x) x)))
-    (list '(store () (values (lambda (q) q)))))
-   (make-r6test
-    '(store () (call-with-values 
-                (lambda ()
-                  (call-with-values (lambda () (values (lambda (p) p)))
-                                    (((lambda (z) z) (lambda (a) (a a))) (lambda (m) m))))
-                (call-with-values (lambda () (values (lambda (q) q))) (lambda (x) (lambda (y) x)))))
-    (list '(store () (values (lambda (q) q)))))
-   
-   
-   (make-r6test
-    '(store () ((lambda (x) x) call-with-values))
-    (list '(store () (values call-with-values))))
-   (make-r6test
-    '(store () (values))
-    (list '(store () (values))))
-   (make-r6test
-    '(store () (values (lambda (x) x)))
-    (list '(store () (values (lambda (x) x)))))
-   (make-r6test
-    '(store () (values (lambda (x) x) (lambda (q) q)))
-    (list '(store () (values (lambda (x) x) (lambda (q) q)))))
-   
-   (make-r6test
-    '(store () (call-with-values (values values) (lambda () (lambda (x) x))))
-    (list '(store () (values (lambda (x) x)))))
-   (make-r6test
-    '(store () ((lambda (x) x) (values (lambda (y) y))))
-    (list '(store () (values (lambda (y) y)))))
-   (make-r6test
-    '(store () (call-with-values (lambda () (lambda (y) y)) (lambda (x) x)))
-    (list '(store () (values (lambda (y) y)))))
-   
-   (make-r6test
-    '(store () 
-            (call-with-values 
-             (lambda ()
-               (call-with-values
-                (lambda ()
-                  ((lambda (z) z) (lambda (q) q)))
-                (lambda (y) y)))
-             (lambda (x) x)))
-    (list '(store () (values (lambda (q) q)))))
-   
-   (make-r6test
-    '(store () 
-            (call-with-values 
-             (lambda ()
-               (call-with-values (lambda ()
-                                   (values (lambda (p) p)))
-                                 (((lambda (x) x) (lambda (x) (x x))) (lambda (m) m))))
-             (call-with-values (lambda () (values (lambda (q) q))) 
-                               (lambda (x) (lambda (y) x)))))
-    (list '(store () (values (lambda (q) q)))))
-   
-   (make-r6test
-    '(store () (call-with-values (lambda () (values values values)) call-with-values))
-    (list '(store () (values))))
-   
-   (make-r6test
-    '(store () ((lambda (x y) x) (values (lambda (z) z) (lambda (q) q))))
-    (list '(unknown "context expected one value, received 2")))
-   
-   (make-r6test
-    '(store () (begin (if #t 1 2) 3))
-    (list '(store () (values 3))))
-   
-   
-   (make-r6test
-    '(store () ((if (values 1 2 3 4 5 6 7 8 9 10) 11 12)))
-    (list '(unknown "context expected one value, received 10")))
-   
-   
-   (make-r6test
-    '(store () (if (begin 1 2) 1 2))
-    (list '(store () (values 1))))
-   
-   (make-r6test
-    '(store () ((lambda (x) (begin (set! x (begin 1 2)) x)) 1))
-    (list '(store () (values 2))))
-   
-   (make-r6test/v '(call/cc (lambda (k) (cons 1 (cons 2 (cons 3 (k 5)))))) 5)
-   (make-r6test/v '(call-with-values (lambda () (call/cc (lambda (k) (k)))) +) 0)
-   (make-r6test/v '(call-with-values (lambda () (call/cc (lambda (k) (k 1 2)))) +) 3)
-   (make-r6test/v '((call/cc values) values) 'values)
-   (make-r6test '(store ()
-                        (letrec ((x 0)
-                                 (f
-                                  (lambda ()
-                                    (set! x (+ x 1))
-                                    (values x x))))
-                          (call-with-values f (lambda (x y) x))
-                          (call-with-values f (lambda (x y) x))))
-                (list
-                 '(store ((lx-x 2)
-                          (lx-f (lambda ()
-                                  (set! lx-x (+ lx-x 1))
-                                  (values lx-x lx-x))))
-                         (values 2))))
-   (make-r6test/v '((lambda (x) (call-with-values x (lambda (x y) x)))
-                    (lambda () (values (+ 1 2) 2)))
-                  3)
-   
-   (make-r6test/v '((if #t call-with-values +) (lambda () (+ 1 1)) (lambda (x) x))
-                  2)
-   
-   (make-r6test/v '(call-with-values (lambda () (values (+ 1 2) (+ 2 3))) +) 8)
-   (make-r6test/v '(call-with-values * +) 1)
-   (make-r6test/v '(call-with-values (lambda () (apply values (cons 1 (cons 2 null)))) +) 3)
-   (make-r6test/v '(call-with-values (lambda () 1) +) 1)
-   
-   (make-r6test/e
-    '(call-with-values (lambda ()
-                         ((lambda (f) 
-                            (f ((lambda (id) id) (lambda (x) (x x)))
-                               (lambda (x y) x)))
-                          values))
-                       (lambda (a b) (a b)))
-    "arity mismatch")
-   
-   (make-r6test/v '((lambda (x) x) (values 1)) 1)
-   (make-r6test '(store () (values 1 2))
-                (list '(store () (values 1 2))))
-   (make-r6test '(store () (begin ((lambda (x) (values x x x)) 1) 1))
-                (list '(store () (values 1))))
-   (make-r6test '(store () ((lambda (x) (values x x x)) 1))
-                (list '(store () (values 1 1 1))))
-   
-   (make-r6test/v '(begin (values) 1) 1)
-   (make-r6test/v '(+ 1 (begin (values 1 2 3) 1)) 2)))
-
-(define dw-tests
-  (list 
-   
-   ;; an infinite loop that produces a finite (circular) reduction graph
-   (make-r6test
-    '(store ()
-            ((lambda (x) ((call/cc call/cc) x)) (call/cc call/cc)))
-    (list))
-   
-   ;; next examples is one a continuation example that mz gets wrong
-   (make-r6test 
-    '(store ()
-            ((lambda (count)
-               ((lambda (first-time? k)
-                  (if first-time?
-                      (begin
-                        (set! first-time? #f)
-                        (set! count (+ count 1))
-                        (k values))
-                      1234))
-                #t
-                (call/cc values))
-               count)
-             0))
-    (list '(store () (values 2))))
-   
-   (make-r6test
-    '(store ([x 2]) x)
-    (list '(store ((x 2)) (values 2))))
-   (make-r6test
-    '(store ([x 2]) (begin (set! x (+ x 1)) x))
-    (list '(store ((x 3)) (values 3))))
-   
-   (make-r6test
-    '(store () (begin ((lambda (x) (+ x x)) 1) 2))
-    (list '(store () (values 2))))
-   
-   (make-r6test
-    '(store () (+ (call/cc (lambda (k) (+ (k 1) 1))) 1))
-    (list '(store () (values 2))))
-   (make-r6test
-    '(store () ((call/cc (lambda (x) x)) (lambda (y) 1)))
-    (list '(store () (values 1))))
-   
-   (make-r6test
-    '(store ((x 0))
-            (begin
-              (dynamic-wind (lambda () (set! x 1))
-                            (lambda () (begin (set! x 2) 'whatever))
-                            (lambda () (set! x 3)))
-              x))
-    (list '(store ((x 3)) (values 3))))
-   
-   
-   (make-r6test
-    '(store ((x 0)) (dynamic-wind (lambda () (set! x (+ x 1)))
-                                  (lambda () (begin (set! x (+ x 1)) x))
-                                  (lambda () (set! x (+ x 1)))))
-    (list '(store ((x 3)) (values 2))))
-   
-   ;; dynamic wind and multiple values
-   (make-r6test '(store () (dynamic-wind values (lambda () (values 1 2)) values))
-                (list '(store () (values 1 2))))
-   
-   ;; dynamic-wind given non-lambda procedure values
-   (make-r6test '(store () (dynamic-wind values values values))
-                (list '(store () (values))))
-   (make-r6test '(store () (dynamic-wind values (lambda x x) values))
-                (list '(store () (values null))))
-   
-   
-   (make-r6test/e '(dynamic-wind 1 1 1) "dynamic-wind expects procs")
-   (make-r6test/e '(dynamic-wind (lambda () (car 'x)) 1 1) "dynamic-wind expects procs")
-   
-   ;; make sure that dynamic wind signals non-proc errors directly
-   ;; instead of calling procedures
-   (make-r6test/e '(dynamic-wind (lambda () (car 'x)) 1 2)
-                  "dynamic-wind expects procs")
-   (make-r6test/e '(dynamic-wind (lambda () (car 1)) (lambda (x) x) (lambda (y) y))
-                  "can't take car of non-pair")
-   
-   (make-r6test/e '(dynamic-wind (lambda () (car 1)) (lambda (x dot y) x) (lambda () 1))
-                  "can't take car of non-pair")
-   (make-r6test/v '(dynamic-wind + (lambda y 2) *)
-                  2)
-   (make-r6test/v '(dynamic-wind values list (lambda y y))
-                  'null)
-   
-   
-   (make-r6test ; "in thunk isn't really in"
-    '(store ((n 0))
-            
-            (begin
-              (call/cc
-               (lambda (k)
-                 (dynamic-wind
-                  (lambda () (begin
-                               (set! n (+ n 1))
-                               (k 11)))
-                  +
-                  (lambda () (set! n (+ n 1))))))
-              n))
-    (list '(store ((n 1)) (values 1))))
-   
-   (make-r6test ; "out thunk is really out"
-    '(store ((n 0)
-             (do-jump? #t)
-             (k-out #f))
-            
-            (begin
-              (call/cc
-               (lambda (k)
-                 (dynamic-wind
-                  (lambda () (set! n (+ n 1)))
-                  +
-                  (lambda ()
-                    (begin
-                      (set! n (+ n 1))
-                      (call/cc (lambda (k) (set! k-out k))))))))
-              (if do-jump?
-                  (begin
-                    (set! do-jump? #f)
-                    (k-out 0))
-                  11)
-              (set! k-out #f)
-              n))
-    (list '(store ((n 2) (do-jump? #f) (k-out #f)) (values 2))))
-   
-   (make-r6test ; "out thunk is really out during trimming"
-    '(store ((n 0)
-             (do-jump? #t)
-             (k-out #f))
-            
-            (begin
-              (call/cc
-               (lambda (k)
-                 (dynamic-wind
-                  (lambda () (set! n (+ n 1)))
-                  +
-                  (lambda ()
-                    (begin
-                      (set! n (+ n 1))
-                      (call/cc (lambda (k) (set! k-out k))))))))
-              (if do-jump?
-                  (begin
-                    (set! do-jump? #f)
-                    (k-out 0))
-                  11)
-              (set! k-out #f)
-              n))
-    (list '(store ((n 2) (do-jump? #f) (k-out #f)) (values 2))))
-   
-   (make-r6test ; "jumping during the results of trimming, pre-thunk"
-    '(store ((pre-count 0)
-             (pre-jump? #f)
-             (after-jump? #t)
-             (grab? #t)
-             (the-k #f))
-            
-            (begin
-              (dynamic-wind
-               (lambda ()
-                 (begin
-                   (set! pre-count (+ pre-count 1))
-                   (if pre-jump?
-                       (begin
-                         (set! pre-jump? #f)
-                         (set! after-jump? #f)
-                         (the-k 999))
-                       999)))
-               (lambda () 
-                 (if grab?
-                     (call/cc
-                      (lambda (k)
-                        (begin
-                          (set! grab? #f)
-                          (set! the-k k)
-                          'ignoreme)))
-                     999))
-               +)
-              (if after-jump?
-                  (begin
-                    (set! pre-jump? #t)
-                    (the-k 999))
-                  999)
-              (set! the-k #f) ;; just to make testing simpler
-              pre-count))
-    (list '(store ((pre-count 3) (pre-jump? #f) (after-jump? #f) (grab? #f) (the-k #f)) (values 3))))
-   
-   (make-r6test ; "jumping during the results of trimming, post-thunk"
-    '(store ((post-count 0)
-             (post-jump? #t)
-             (jump-main? #t)
-             (grab? #t)
-             (the-k #f))
-            
-            (begin
-              (if grab?
-                  (call/cc
-                   (lambda (k)
-                     (begin
-                       (set! grab? #f)
-                       (set! the-k k))))
-                  999)
-              (dynamic-wind
-               +
-               (lambda () 
-                 (if jump-main?
-                     (begin
-                       (set! jump-main? #f)
-                       (the-k 999))
-                     999))
-               (lambda () 
-                 (begin
-                   (set! post-count (+ post-count 1))
-                   (if post-jump?
-                       (begin
-                         (set! post-jump? #f)
-                         (the-k 999))
-                       999))))
-              (set! the-k #f) ;; just to make testing simpler
-              post-count))
-    (list '(store ((post-count 2) (post-jump? #f) (jump-main? #f) (grab? #f) (the-k #f)) (values 2))))
-   
-   (make-r6test ; "dynamic-wind gets a continuation"
-    '(store () (call/cc (lambda (k) (dynamic-wind + k +))))
-    (list '(store () (values))))
-   
-   #|
-
-to read the following tests, read the argument to conv-base from right to left
-each corresponding set! should happen in that order.
-in case of a test case failure, turn the number back into a sequence
-of digits with deconv-base
-
-|#
-   
-   (make-r6test ; "hop out one level"
-    '(store ((x 0)
-             (one 0)
-             (two 0)
-             (three 0)) 
-            
-            (begin
-              (set! one (lambda () (set! x (+ (* x 2) 0))))
-              (set! two (lambda () (call/cc (lambda (k) k))))
-              (set! three (lambda () (set! x (+ (* x 2) 1))))
-              ((dynamic-wind one two three)
-               (lambda (y) x))))
-    (list (let ([final-x (conv-base 2 #(1 0 1 0))])
-            `(store ((x ,final-x)
-                     (one (lambda () (set! x (+ (* x 2) 0))))
-                     (two (lambda () (call/cc (lambda (k) k))))
-                     (three (lambda () (set! x (+ (* x 2) 1)))))
-                    (values ,final-x)))))
-   
-   (make-r6test ;"hop out two levels"
-    '(store ((x 0)
-             (one 0)
-             (two 0)
-             (three 0)
-             (four 0))
-            
-            (begin
-              (set! one   (lambda () (set! x (+ (* x 5) 1))))
-              (set! two   (lambda () (set! x (+ (* x 5) 2))))
-              (set! three (lambda () (set! x (+ (* x 5) 3))))
-              (set! four  (lambda () (set! x (+ (* x 5) 4))))
-              ((dynamic-wind 
-                one
-                (lambda () 
-                  (dynamic-wind
-                   two
-                   (lambda () (call/cc (lambda (k) k)))
-                   three))
-                four)
-               (lambda (y) x))))
-    (list 
-     (let ([final-x (conv-base 5 #(4 3 2 1 4 3 2 1))])
-       `(store ((x ,final-x)
-                (one   (lambda () (set! x (+ (* x 5) 1))))
-                (two   (lambda () (set! x (+ (* x 5) 2))))
-                (three (lambda () (set! x (+ (* x 5) 3))))
-                (four  (lambda () (set! x (+ (* x 5) 4)))))
-               (values ,final-x)))))
-   
-   (make-r6test ; "don't duplicate tail"
-    '(store ((x 0)
-             (one 0)
-             (two 0)
-             (three 0)
-             (four 0))
-            
-            (begin
-              (set! one (lambda () (set! x (+ (* x 5) 1))))
-              (set! two (lambda () (set! x (+ (* x 5) 2))))
-              (set! three (lambda () (set! x (+ (* x 5) 3))))
-              (set! four (lambda () (set! x (+ (* x 5) 4))))
-              (dynamic-wind 
-               one
-               (lambda () 
-                 ((dynamic-wind two
-                                (lambda () (call/cc (lambda (k) k)))
-                                three)
-                  (lambda (y) x)))
-               four)))
-    (list `(store ((x ,(conv-base 5 #(4 3 2 3 2 1)))
-                   (one (lambda () (set! x (+ (* x 5) 1))))
-                   (two (lambda () (set! x (+ (* x 5) 2))))
-                   (three (lambda () (set! x (+ (* x 5) 3))))
-                   (four (lambda () (set! x (+ (* x 5) 4)))))
-                  
-                  (values ,(conv-base 5 #(3 2 3 2 1))))))
-   
-   (make-r6test ; "dont' duplicate tail, 2 deep"
-    '(store ((x 0)
-             (one 0)
-             (two 0)
-             (three 0)
-             (four 0)
-             (five 0)
-             (six 0))
-            
-            (begin
-              (set! one (lambda () (set! x (+ (* x 7) 1))))
-              (set! two (lambda () (set! x (+ (* x 7) 2))))
-              (set! three (lambda () (set! x (+ (* x 7) 3))))
-              (set! four (lambda () (set! x (+ (* x 7) 4))))
-              (set! five (lambda () (set! x (+ (* x 7) 5))))
-              (set! six (lambda () (set! x (+ (* x 7) 6))))
-              (dynamic-wind 
-               one
-               (lambda () 
-                 (dynamic-wind 
-                  two
-                  (lambda () 
-                    ((dynamic-wind three
-                                   (lambda () (call/cc (lambda (k) k)))
-                                   four)
-                     (lambda (y) x)))
-                  five))
-               six)))
-    
-    (list `(store ((x ,(conv-base 7 #(6 5 4 3 4 3 2 1)))
-                   (one (lambda () (set! x (+ (* x 7) 1))))
-                   (two (lambda () (set! x (+ (* x 7) 2))))
-                   (three (lambda () (set! x (+ (* x 7) 3))))
-                   (four (lambda () (set! x (+ (* x 7) 4))))
-                   (five (lambda () (set! x (+ (* x 7) 5))))
-                   (six (lambda () (set! x (+ (* x 7) 6)))))
-                  (values ,(conv-base 7 #(4 3 4 3 2 1))))))
-   
-   (make-r6test ; "hop out and back into another one"
-    '(store ((x 0)
-             (one 0)
-             (two 0)
-             (three 0)
-             (four 0))
-            
-            (begin
-              (set! one (lambda () (set! x (+ (* x 5) 1))))
-              (set! two (lambda () (set! x (+ (* x 5) 2))))
-              (set! three (lambda () (set! x (+ (* x 5) 3))))
-              (set! four (lambda () (set! x (+ (* x 5) 4))))
-              ((lambda (ok)
-                 (dynamic-wind one
-                               (lambda () (ok (lambda (y) x)))
-                               two))
-               (dynamic-wind three
-                             (lambda () (call/cc (lambda (k) k)))
-                             four))))
-    (list `(store ((x ,(conv-base 5 #(2 1 4 3 2 1 4 3)))
-                   (one (lambda () (set! x (+ (* x 5) 1))))
-                   (two (lambda () (set! x (+ (* x 5) 2))))
-                   (three (lambda () (set! x (+ (* x 5) 3))))
-                   (four (lambda () (set! x (+ (* x 5) 4)))))
-                  (values ,(conv-base 5 #(1 4 3 2 1 4 3))))))
-   
-   (make-r6test ; "hop out one level and back in two levels"
-    '(store ((x 0)
-             (one 0)
-             (two 0)
-             (three 0)
-             (four 0))
-            
-            (begin
-              (set! one (lambda () (set! x (+ (* x 5) 1))))
-              (set! two (lambda () (set! x (+ (* x 5) 2))))
-              (set! three (lambda () (set! x (+ (* x 5) 3))))
-              (set! four (lambda () (set! x (+ (* x 5) 4))))
-              ((lambda (ok)
-                 (dynamic-wind
-                  one
-                  (lambda ()
-                    (dynamic-wind
-                     two
-                     (lambda () (ok (lambda (y) x)))
-                     three))
-                  four))
-               (call/cc (lambda (k) k)))))
-    (list `(store ((x ,(conv-base 5 #(4 3 2 1 4 3 2 1)))
-                   (one (lambda () (set! x (+ (* x 5) 1))))
-                   (two (lambda () (set! x (+ (* x 5) 2))))
-                   (three (lambda () (set! x (+ (* x 5) 3))))
-                   (four (lambda () (set! x (+ (* x 5) 4)))))
-                  (values ,(conv-base 5 #(2 1 4 3 2 1))))))
-   
-   (make-r6test ; "hop out two levels and back in two levels"
-    '(store ((x 0)
-             (one 0)
-             (two 0)
-             (three 0)
-             (four 0)
-             (five 0)
-             (six 0)
-             (seven 0)
-             (eight 0))
-            
-            (begin
-              (set! one (lambda () (set! x (+ (* x 9) 1))))
-              (set! two (lambda () (set! x (+ (* x 9) 2))))
-              (set! three (lambda () (set! x (+ (* x 9) 3))))
-              (set! four (lambda () (set! x (+ (* x 9) 4))))
-              (set! five (lambda () (set! x (+ (* x 9) 5))))
-              (set! six (lambda () (set! x (+ (* x 9) 6))))
-              (set! seven (lambda () (set! x (+ (* x 9) 7))))
-              (set! eight (lambda () (set! x (+ (* x 9) 8))))
-              ((lambda (ok)
-                 (dynamic-wind
-                  one
-                  (lambda () 
-                    (dynamic-wind
-                     two
-                     (lambda () (ok (lambda (y) x)))
-                     three))
-                  four))
-               (dynamic-wind
-                five
-                (lambda () 
-                  (dynamic-wind
-                   six
-                   (lambda () (call/cc (lambda (k) k)))
-                   seven))
-                eight))))
-    (list `(store ((x ,(conv-base 9 #(4 3 2 1 8 7 6 5 4 3 2 1 8 7 6 5)))
-                   (one (lambda () (set! x (+ (* x 9) 1))))
-                   (two (lambda () (set! x (+ (* x 9) 2))))
-                   (three (lambda () (set! x (+ (* x 9) 3))))
-                   (four (lambda () (set! x (+ (* x 9) 4))))
-                   (five (lambda () (set! x (+ (* x 9) 5))))
-                   (six (lambda () (set! x (+ (* x 9) 6))))
-                   (seven (lambda () (set! x (+ (* x 9) 7))))
-                   (eight (lambda () (set! x (+ (* x 9) 8)))))
-                  (values ,(conv-base 9 #(2 1 8 7 6 5 4 3 2 1 8 7 6 5))))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; exception tests
-;;
-
-(define exn-tests
-  (list
-   (make-r6test/v '(with-exception-handler (lambda (x) 1) (lambda () 2))
-                  2)
-   (make-r6test/v '(with-exception-handler (lambda (x) 1) (lambda () (raise-continuable 2)))
-                  1)
-   (make-r6test/v '(with-exception-handler (lambda (x) x) (lambda () (raise-continuable 2)))
-                  2)
-   (make-r6test/v '(with-exception-handler values (lambda () (raise-continuable 2)))
-                  2)
-   (make-r6test '(store () (with-exception-handler (lambda (x) x) values))
-                (list '(store () (values))))
-   (make-r6test '(store () (with-exception-handler (lambda (x) (values x x)) (lambda () (raise-continuable 1))))
-                (list '(store () (values 1 1))))
-   (make-r6test/v '(+ 1 (with-exception-handler
-                         (lambda (x) (+ 2 x))
-                         (lambda () (+ 3 (raise-continuable (+ 2 2))))))
-                  10)
-   
-   (make-r6test '(store ()
-                        (call/cc
-                         (lambda (k)
-                           (with-exception-handler
-                            (lambda (x)
-                              (with-exception-handler
-                               (lambda (y) (k (eqv? x y)))
-                               (lambda () (car 1))))
-                            (lambda () (car 1))))))
-                (list '(store () (values #t))
-                      '(store () (values #f))))
-   
-   ;; nested handlers
-   (make-r6test/v '(with-exception-handler
-                    (lambda (x) (+ 2 x))
-                    (lambda ()
-                      (with-exception-handler
-                       (lambda (x) (+ 3 x))
-                       (lambda () (raise-continuable 1)))))
-                  4)
-   
-   (make-r6test/v '(with-exception-handler
-                    (lambda (y) (with-exception-handler
-                                 (lambda (x) (+ 3 x y))
-                                 (lambda () (raise-continuable 1))))
-                    (lambda () (raise-continuable 17)))
-                  21)
-   
-   (make-r6test/v '(with-exception-handler
-                    values
-                    (lambda ()
-                      (with-exception-handler
-                       (lambda (y) (raise-continuable y))
-                       (lambda () (raise-continuable 1)))))
-                  1)
-   
-   (make-r6test '(store ()
-                        (with-exception-handler 
-                         (lambda (y) (raise-continuable y))
-                         (lambda () (raise 2))))
-                (list '(uncaught-exception 2)))
-   
-   (make-r6test '(store ()
-                        (with-exception-handler 
-                         (lambda (y) (raise y))
-                         (lambda () (raise-continuable 2))))
-                (list '(uncaught-exception 2)))
-   
-   (make-r6test '(store () (raise 2))
-                (list '(uncaught-exception 2)))
-   
-   (make-r6test '(store () (raise-continuable 2))
-                (list '(uncaught-exception 2)))
-   
-   (make-r6test '(store () (letrec* ([w 3]
-                                     [x (+ 1 (raise-continuable 2))]
-                                     [y 2])
-                                    1))
-                (list '(uncaught-exception 2)))
-   
-   (make-r6test '(store ()
-                        (with-exception-handler
-                         (lambda (x) x)
-                         (lambda () (raise 2))))
-                (list '(uncaught-exception (make-cond "handler returned"))))
-   
-   (make-r6test/e '((lambda (c e)
-                      (with-exception-handler
-                       (lambda (x) (if (eqv? c 0)
-                                       (set! c 1)
-                                       (if (eqv? c 1)
-                                           (begin (set! c 2)
-                                                  (set! e x))
-                                           (raise e))))
-                       (lambda () (raise 2))))
-                    0 #f)
-                  "handler returned")
-   
-   (make-r6test/v '(call/cc 
-                    (lambda (k) 
-                      (with-exception-handler 
-                       (lambda (x) (k (eqv? x 2)))
-                       (lambda () (car 1)))))
-                  #f)
-   
-   (make-r6test/v '((lambda (sx first-time?)
-                      ((lambda (k)
-                         (if first-time?
-                             (begin
-                               (set! first-time? #f)
-                               (with-exception-handler
-                                (lambda (x) (k values))
-                                (lambda ()
-                                  (dynamic-wind
-                                   +
-                                   (lambda () (raise-continuable 1))
-                                   (lambda () (set! sx (+ sx 1)))))))
-                             sx))
-                       (call/cc values)))
-                    1 #t)
-                  2)
-   
-   (make-r6test/v '(with-exception-handler
-                    (lambda (x) (begin (set! x (+ x 1)) x))
-                    (lambda ()
-                      (raise-continuable 1)))
-                  2)
-   
-   (make-r6test/v '(call/cc
-                    (lambda (k)
-                      (with-exception-handler
-                       (lambda (x) (set! x (+ x 1)) (k x))
-                       (lambda ()
-                         (raise 1)))))
-                  2)
-   
-   (make-r6test/v '(with-exception-handler
-                    (lambda (x) 2)
-                    (lambda ()
-                      (dynamic-wind
-                       +
-                       (lambda () (raise-continuable 1))
-                       +)))
-                  2)
-   
-   (make-r6test '(store ()
-                        (with-exception-handler
-                         (lambda (x) (raise (+ x 1)))
-                         (lambda ()
-                           (dynamic-wind
-                            +
-                            (lambda () (raise 1))
-                            +))))
-                (list '(uncaught-exception 2)))
-   
-   (make-r6test/v '(with-exception-handler
-                    (lambda (x) x)
-                    (lambda ()
-                      (dynamic-wind
-                       +
-                       (lambda () (raise-continuable 1))
-                       +)))
-                  1)
-   
-   (make-r6test/v '(with-exception-handler
-                    (lambda (x) (begin (set! x 2) x))
-                    (lambda ()
-                      (dynamic-wind
-                       +
-                       (lambda () (raise-continuable 1))
-                       +)))
-                  2)
-   
-   (make-r6test/v '(with-exception-handler
-                    (lambda (x) (with-exception-handler
-                                 (lambda (x) x)
-                                 (lambda () (raise-continuable 1))))
-                    (lambda () (raise-continuable 2)))
-                  1)
-   
-   (make-r6test/v '(with-exception-handler
-                    (lambda (y) 
-                      (with-exception-handler
-                       (lambda (x) y)
-                       (lambda ()
-                         (raise-continuable 1))))
-                    (lambda ()
-                      (raise-continuable 2)))
-                  2)
-   
-   (make-r6test/v '(with-exception-handler
-                    (lambda (y) 
-                      (with-exception-handler
-                       (lambda (x) x)
-                       (lambda ()
-                         (raise-continuable 1))))
-                    (lambda ()
-                      (raise-continuable 2)))
-                  1)
-   
-   (make-r6test/e '(with-exception-handler 2 +)
-                  "with-exception-handler expects procs")
-   (make-r6test/e '(with-exception-handler + 2)
-                  "with-exception-handler expects procs")
-   (make-r6test/e '(with-exception-handler 1 2)
-                  "with-exception-handler expects procs")
-   (make-r6test/v '(with-exception-handler (lambda (wrench crowbar) wrench) (lambda () 1))
-                  1)
-   (make-r6test/e '(with-exception-handler (lambda (wrench crowbar) wrench) (lambda () (raise 1)))
-                  "arity mismatch")
-   (make-r6test/e '(with-exception-handler 3 (lambda () 1))
-                  "with-exception-handler expects procs")
-   
-   (make-r6test/v '((lambda (y)
-                      (with-exception-handler
-                       (lambda (x) (set! y (+ x y)))
-                       (lambda ()
-                         (raise-continuable 1)
-                         (raise-continuable 2)
-                         y)))
-                    0)
-                  3)
-   
-   (make-r6test '(store ()
-                        (with-exception-handler
-                         (lambda (x) (raise x))
-                         (lambda () (raise 1))))
-                (list '(uncaught-exception 1)))
-   
-   ;; make sure that the inner handler is called twice, 
-   ;; rather than the inner handler called once and the outer one called once.
-   (make-r6test/v '((lambda (o)
-                      (with-exception-handler
-                       (lambda (x) (set! o (* 3 o)))
-                       (lambda ()
-                         (with-exception-handler
-                          (lambda (x) (set! o (* 2 o)) x)
-                          (lambda () 
-                            (raise-continuable 4)
-                            (raise-continuable 4)))))
-                      o)
-                    1)
-                  4)
-   
-   (make-r6test 
-    '(store ()
-            (letrec* ([k #f]
-                      [ans #f]
-                      [first-time? #t])
-                     (with-exception-handler
-                      (lambda (x)
-                        (begin
-                          (call/cc (lambda (k2) (set! k k2)))
-                          (set! x (+ x 1))
-                          (set! ans x)))
-                      (lambda ()
-                        (raise-continuable 1)))
-                     (if first-time?
-                         (begin
-                           (set! first-time? #f)
-                           (k 1))
-                         (set! k #f))
-                     ans))
-    (list '(store ((lx-k #f) (lx-ans 3) (lx-first-time? #f))
-                  (values 3))))
-   
-   ;; test trimming function in the presence of exceptions when trimming handlers
-   ;; this test belongs in the dw section. have to move it there after changing its syntax
-   (make-r6test '(store ()
-                        (letrec* ((phase 0)
-                                  (k #f)
-                                  (l '()))
-                                 (with-exception-handler
-                                  (lambda (x) (if (eqv? phase 0)
-                                                  (begin
-                                                    (set! phase 1)
-                                                    (call/cc (lambda (k2) (begin (set! k k2) 'whatever))))
-                                                  (if (eqv? phase 1)
-                                                      (begin
-                                                        (set! phase 2)
-                                                        (k 1))
-                                                      1234)))
-                                  (lambda ()
-                                    (dynamic-wind 
-                                     (lambda () (set! l (cons 1 l)))
-                                     (lambda () 
-                                       (dynamic-wind 
-                                        (lambda () (set! l (cons 2 l)))
-                                        (lambda () (raise-continuable 1))
-                                        (lambda () (set! l (cons 3 l))))
-                                       (dynamic-wind 
-                                        (lambda () (set! l (cons 4 l)))
-                                        (lambda () (raise-continuable 1))
-                                        (lambda () (set! l (cons 5 l)))))
-                                     (lambda () (set! l (cons 6 l))))))
-                                 (set! k #f)
-                                 (apply values l)))
-                (list '(store ((lx-phase 2) 
-                               (lx-k #f)
-                               (lx-l (cons 6 (cons 5 (cons 4 (cons 3 (cons 2 (cons 5 (cons 4 (cons 3 (cons 2 (cons 1 null))))))))))))
-                              (values 6 5 4 3 2 5 4 3 2 1))))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; letrec tests
-;;
-
-(define letrec-tests
-  (list 
-   (make-r6test '(store () (letrec ([x 1] [y 2]) (+ x y)))
-                (list '(store ((lx-x 1) (lx-y 2)) (values 3))))
-   (make-r6test '(store ()
-                        (letrec ([flip (lambda (x) (if x (flop #f) #t))]
-                                 [flop (lambda (x) (if x (flip x) x))])
-                          (begin0 (flop #t)
-                                  (set! flip 1)
-                                  (set! flop 2))))
-                (list '(store ((lx-flip 1)
-                               (lx-flop 2))
-                              (values #f))))
-   (make-r6test '(store () (letrec ([x (begin (set! x 1) 2)]) x))
-                (list '(store ((lx-x 2)) (values 2))
-                      '(uncaught-exception (make-cond "letrec variable touched"))))
-   (make-r6test '(store ()
-                        (letrec ([x (begin (set! y 2) 5)]
-                                 [y (begin (set! x 3) 7)])
-                          (* x y)))
-                (list '(store ((lx-x 5) (lx-y 7)) (values 35))
-                      '(uncaught-exception (make-cond "letrec variable touched"))))
-   (make-r6test '(store () (letrec ([x x]) x))
-                (list '(uncaught-exception (make-cond "letrec variable touched"))))
-   (make-r6test '(store () (letrec ([x y] [y x]) x))
-                (list '(uncaught-exception (make-cond "letrec variable touched"))))
-   (make-r6test '(store () (letrec ([x 1] [y x]) y))
-                (list '(uncaught-exception (make-cond "letrec variable touched"))))
-   
-   (make-r6test '(store () (letrec ([x 1] [y 2]) (set! x 3) (set! y 4) (+ x y)))
-                (list '(store ((lx-x 3) (lx-y 4)) (values 7))))
-   
-   (make-r6test '(store () (letrec* ([x 1] [y 2]) (+ x y)))
-                (list '(store ((lx-x 1) (lx-y 2)) (values 3))))
-   (make-r6test '(store ()
-                        (letrec* ([flip (lambda (x) (if x (flop #f) #t))]
-                                  [flop (lambda (x) (if x (flip x) x))])
-                                 (begin0 (flop #t)
-                                         (set! flip 1)
-                                         (set! flop 2))))
-                (list '(store ((lx-flip 1) (lx-flop 2)) (values #f))))
-   (make-r6test '(store () (letrec* ([x (begin (set! x 1) 2)]) x))
-                (list '(store ((lx-x 2)) (values 2))
-                      '(uncaught-exception (make-cond "letrec variable touched"))))
-   (make-r6test '(store ()
-                        (letrec* ([x (begin (set! y 2) 5)]
-                                  [y (begin (set! x 3) 7)])
-                                 (* x y)))
-                (list '(store ((lx-x 3) (lx-y 7)) (values 21))
-                      '(uncaught-exception (make-cond "letrec variable touched"))))
-   (make-r6test '(store () (letrec* ([x x]) x))
-                (list '(uncaught-exception (make-cond "letrec variable touched"))))
-   (make-r6test '(store () (letrec* ([x y] [y x]) x))
-                (list '(uncaught-exception (make-cond "letrec variable touched"))))
-   (make-r6test '(store () (letrec* ([x 1] [y x]) y))
-                (list '(store ((lx-x 1) (lx-y 1)) (values 1))))
-   
-   (make-r6test '(store () ((lambda (x y) (letrec ([q (begin (set! x 2) 23)]) (begin (set! y 3) (* x y))))
-                            5 7))
-                (list '(store ((lx-q 23)) (values 6))))
-   (make-r6test '(store () ((lambda (x y) (letrec* ([q (begin (set! x 2) 23)]) (begin (set! y 3) (* x y))))
-                            5 7))
-                (list '(store ((lx-q 23)) (values 6))))
-   (make-r6test '(store () (letrec* ([x 1] [y 2]) (set! x 3) (set! y 4) (+ x y)))
-                (list '(store ((lx-x 3) (lx-y 4)) (values 7))))
-   
-   
-   (make-r6test '(store ()
-                        (letrec* ([k (call/cc (lambda (x) x))])
-                                 (k (lambda (x) x))
-                                 (k 2)))
-                (list '(uncaught-exception (make-cond "reinvoked continuation of letrec init"))
-                      '(store ((lx-k (lambda (x) x))) (values 2))))
-   (make-r6test '(store ()
-                        (letrec ([k (call/cc (lambda (x) x))])
-                          (k (lambda (x) x))
-                          (k 2)))
-                (list '(uncaught-exception (make-cond "reinvoked continuation of letrec init"))
-                      '(store ((lx-k (lambda (x2) x2))) (values 2))))
-   
-   (make-r6test '(store ()
-                        ((lambda (flag)
-                           (letrec* ([k
-                                      ((lambda (k)
-                                         (if flag
-                                             'nothing-doing
-                                             (car 'not-a-pair))
-                                         k) 
-                                       (call/cc (lambda (x) x)))])
-                                    (set! flag #f)
-                                    (k (lambda (x) x))
-                                    (k 2)))
-                         #t))
-                (list '(uncaught-exception (make-cond "can't take car of non-pair"))))
-   (make-r6test '(store ()
-                        ((lambda (flag)
-                           (letrec ([k
-                                     ((lambda (k)
-                                        (if flag
-                                            'nothing-doing
-                                            (car 'not-a-pair))
-                                        k) 
-                                      (call/cc (lambda (x) x)))])
-                             (set! flag #f)
-                             (k (lambda (x) x))
-                             (k 2)))
-                         #t))
-                (list '(uncaught-exception (make-cond "can't take car of non-pair"))))
-   
-   
-   (make-r6test '(store ()
-                        ((lambda (flag)
-                           (letrec ([k (call/cc (lambda (x) x))]
-                                    [x (if flag
-                                           'nothing-doing
-                                           (car 'not-a-pair))])
-                             (set! flag #f)
-                             (k (lambda (x) x))
-                             (k 2)))
-                         #t))
-                (list '(uncaught-exception (make-cond "reinvoked continuation of letrec init"))
-                      '(uncaught-exception (make-cond "can't take car of non-pair"))
-                      '(store ((lx-k (lambda (x2) x2)) (lx-x 'nothing-doing)) (values 2))))
-   
-   (make-r6test '(store ()
-                        ((lambda (flag)
-                           (letrec* ([k (call/cc (lambda (x) x))]
-                                     [x (if flag
-                                            'nothing-doing
-                                            (car 'not-a-pair))])
-                                    (set! flag #f)
-                                    (k (lambda (x) x))
-                                    (k 2)))
-                         #t))
-                (list '(uncaught-exception (make-cond "reinvoked continuation of letrec init"))
-                      '(uncaught-exception (make-cond "can't take car of non-pair"))))
-   
-   (make-r6test '(store ()
-                        (letrec* ([x (values 1 2)])
-                                 x))
-                (list '(unknown "context expected one value, received 2")))
-   (make-r6test '(store ()
-                        (letrec ([x (values 1 2)])
-                          x))
-                (list '(unknown "context expected one value, received 2")))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; testing functions
-;;
-
-
-(define-syntax (test-fn stx)
-  (syntax-case stx ()
-    [(_ test-case expected)
-     (with-syntax ([line (syntax-line stx)])
-       (syntax (test-fn/proc (λ () test-case) expected line)))]))
-
-(define (test-fn/proc tc expected line)
-  (let ([got (tc)])
-    (unless (equal? got expected)
-      (set! failed-tests (+ failed-tests 1))
-      (eprintf "line ~s failed\nexpected ~s\n     got ~s\n"
-               line
-               expected
-               got))))
-
-
-(define (test-fns)
-  (begin
-    (test-fn (term (Var-set!d? (x (set! x 1)))) #t)
-    (test-fn (term (Var-set!d? (x (set! y 1)))) #f)
-    (test-fn (term (Var-set!d? (x (lambda (x) (set! x 2))))) #f)
-    (test-fn (term (Var-set!d? (x (lambda (z dot x) (set! x 2))))) #f)
-    (test-fn (term (Var-set!d? (x (lambda (x dot z) (set! x 2))))) #f)
-    (test-fn (term (Var-set!d? (x (lambda (y) (set! x 2))))) #t)
-    (test-fn (term (Var-set!d? (x 
-                                (if (begin (set! x 2))
-                                    1
-                                    2))))
-             #t)
-    (test-fn (term (Var-set!d? (x (begin0 (begin (begin0 1 2) 3) 4))))
-             #f)
-    (test-fn (term (Var-set!d? (x (dw x1 1 2 3)))) #f)
-    (test-fn (term (Var-set!d? (y (throw x ((set! z x)))))) #f)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; all of the tests
-;;
-
-(define the-sets 
-  (list (list "app" app-tests)
-        (list "exn" exn-tests)
-        (list "dw" dw-tests)
-        (list "eqv" eqv-tests)
-        (list "r5" r5-tests)
-        (list "mv" mv-tests)
-        (list "letrec" letrec-tests)
-        (list "unspec" assignment-results-tests)
-        (list "quote" quote-tests)
-        (list "arith" arithmetic-tests)
-        (list "basic" basic-form-tests)
-        (list "pair" pair-tests)
-        (list "err" err-tests)))
-
-(define the-tests (apply append (map cadr the-sets)))
-
-(define (main #:verbose? [verbose? #f] #:compare-with-racket? [compare-with-racket? #f])
-  (cond
-    [compare-with-racket?
-     (let ()
-       
-       (define redex-exps '())
-       (define r6-module-bodies '())
-       (define missing 0)
-     
-       (define (no-bads? x)
-         (define bads '(begin0 make-cond))
-         (let loop ([x x])
-           (cond
-             [(pair? x) (and (loop (car x))
-                             (loop (cdr x)))]
-             [(memq x bads) #f]
-             [else #t])))
-       
-       (for ([set (in-list the-sets)]
-             [i (in-naturals)])
-         (for ([test (in-list (cadr set))]
-               [j (in-naturals)])
-           (match (r6test-test test)
-             [(and `(store () ,exp)
-                   (? no-bads?))
-              (set! r6-module-bodies (cons exp r6-module-bodies))
-              (set! redex-exps (cons (r6test-test test) redex-exps))]
-             [_ (set! missing (+ missing 1))])))
-       
-       (printf "Running ~a tests (skipping ~a)\n" (length redex-exps) missing)
-
-       (define ns (make-base-namespace))
-       
-       ;; initialize the namespace by evaluating a dummy module
-       (parameterize ([current-namespace ns])
-         (eval `(module r6rs-init r6rs (import (rnrs) (rnrs mutable-pairs (6))))))
-
-       (collect-garbage) (collect-garbage)
-       (printf "Running in Racket's R6RS mode...\n")
-       (parameterize ([current-namespace ns])
-         (time (eval `(module r6rs-big r6rs (import (rnrs) (rnrs mutable-pairs (6)))
-                        (define null '())
-                        ,@r6-module-bodies))))
-       
-       (collect-garbage) (collect-garbage)
-       (printf "Running in the Redex model finding only the first outcome...\n")
-       (time (for ([test (in-list redex-exps)])
-               (evaluate reductions test #f void
-                         #:only-first-answer? #t)))
-
-       (collect-garbage) (collect-garbage)
-       (printf "Running in the Redex model finding all outcomes...\n")
-       (time (for ([test (in-list redex-exps)])
-               (evaluate reductions test #f void
-                         #:only-first-answer? #f))))]
-    [else
-     (time
-      (let ()
-        (define first? #t)
-        (define (run-a-set name set)
-          (unless first?
-            (if verbose?
-                (printf "\n\n")
-                (printf "\n")))
-          (if verbose?
-              (printf "~a\n~a tests\n\n" 
-                      (apply string (build-list 60 (λ (i) #\-)))
-                      name)
-              (begin (printf "~a tests " name)
-                     (flush-output)))
-          (set! first? #f)
-          (for-each (λ (x) (run-a-test x verbose?)) set))
-        
-        (set! failed-tests 0)
-        (set! verified-terms 0)
-        (test-fns)
-        (for-each (λ (set) (apply run-a-set set)) the-sets)
-        (unless verbose? (printf "\n"))
-        
-        (if (= 0 failed-tests)
-            (printf "~a tests, all passed\n" test-count)
-            (eprintf "~a tests, ~a tests failed\n" test-count failed-tests))
-        (printf "verified that ~a terms are p*\n" verified-terms)))
-     (when verbose?
-       (collect-garbage) (collect-garbage) (collect-garbage)
-       (printf "mem ~s\n" (current-memory-use))
-       (let ([v (make-vector 10)])
-         (vector-set-performance-stats! v)
-         (printf "ht searches    ~a\nslots searched ~a\n" (vector-ref v 8) (vector-ref v 9))))]))
-
-(provide main
-         the-tests
-         
-         ;; the 'test' and the 'expected' are not compared with equal?.
-         ;; instead, the result of running the test is first simplified
-         ;; by substituting all of the variables with a colon in their
-         ;; names thru the term, and then the results from the test are
-         ;; compared with equal? to the elements of `expected'
-         
-         (struct-out r6test))
-
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/r6rs.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/r6rs.rkt
deleted file mode 100644
index f9d686f06d..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/r6rs.rkt
+++ /dev/null
@@ -1,953 +0,0 @@
-#lang racket
-  (require redex/reduction-semantics
-           racket/match)
-  
-  (provide lang 
-           reductions
-           r6rs-subst-one
-           r6rs-subst-many
-           Var-set!d?)
-  
-  (provide Arithmetic
-           Basic--syntactic--forms
-           Cons 
-           Eqv
-           Procedure--application
-           Apply
-           Call-cc--and--dynamic-wind
-           Exceptions
-           Multiple--values--and--call-with-values
-           Quote
-           Letrec
-           Underspecification
-           observable)
-  
-  (define-syntax (metafunction-type stx)
-    ;; these are only used in the figures
-    #'(void))
-
-  (define-language lang
-    (p* (store (sf ...) es) (uncaught-exception v) (unknown string))
-    (a* (store (sf ...) (values v ...)) (uncaught-exception v) (unknown string))
-    (r* (values r*v ...) exception unknown)
-    (r*v  pair null 'sym sqv condition procedure)
-    (sf (x b) (pp (cons v v)))
-    (b v bh)
-    
-    (es 'seq 'sqv '()
-        (begin es es ...) (begin0 es es ...) (es es ...)
-        (if es es es) (set! x es) x
-        nonproc pproc (lambda f es es ...)
-        (letrec ([x_!_1 es] ...) es es ...) 
-        (letrec* ([x_!_1 es] ...) es es ...)
-        
-        ;; intermediate states
-        (dw x e e e)
-        (throw x_1 (in-hole E x_1))
-        unspecified
-        (handlers proc ... e)
-        (l! x es)
-        (reinit x))
-    (f (x_!_1 ...)
-       (x_!_1 x_!_1 ... dot x_!_1)
-       x)
-    
-    (s seq () sqv sym)
-    (seq (s s ...) (s s ... dot sqv) (s s ... dot sym))
-    (sqv n #t #f)
-    
-    (p (store (sf ...) e))
-    (e (begin e e ...) (begin0 e e ...)
-       (e e ...) (if e e e)
-       (set! x e) (handlers proc ... e)
-       x nonproc proc (dw x e e e)
-       unspecified
-       (letrec ([x_!_1 e] ...) e e ...)
-       (letrec* ([x_!_1 e] ...) e e ...)
-       (l! x e)
-       (reinit x))
-    (v nonproc proc)
-    (nonproc pp null 'sym sqv (make-cond string))
-    
-    (proc (lambda f e e ...) pproc (throw x_1 (in-hole E x_1)))
-    (pproc aproc proc1 proc2 list dynamic-wind apply values)
-    (proc1 null? pair? car cdr call/cc procedure? condition? raise*)
-    (proc2 cons consi set-car! set-cdr! eqv? call-with-values with-exception-handler)
-    (aproc + - / *)
-    (raise* raise-continuable raise)
-    
-    ; pair pointers, both mutable and immutable
-    (pp ip mp)
-    (ip (-ip x))
-    (mp (-mp x))
-    
-    (sym (variable-except dot))
-    
-    (x (variable-except 
-        dot                                  ; the . in dotted pairs
-        lambda if loc set!                   ; core syntax names
-        quote
-        begin begin0
-        
-        null                                 ; non-function values
-        unspecified
-        pair closure
-        
-        error                                ; signal an error
-        
-        letrec letrec* l! reinit
-        
-        procedure? condition?
-        cons consi pair? null? car cdr       ; list functions
-        set-car! set-cdr! list
-        + - * /                              ; math functions
-        call/cc throw dw dynamic-wind        ; call/cc functions
-        values call-with-values              ; values functions
-        apply eqv?
-        
-        with-exception-handler handlers
-        raise-continuable raise make-cond
-        -ip -mp))
-    (cansub x pp)
-    
-    (n number)
-    
-    (P (store (sf ...) E))
-    (Po (store (sf ...) (in-hole E Fo)))
-    (P* (store (sf ...) (in-hole E E*)) (store (sf ...) hole))
-    
-    (E (in-hole Fo E) (in-hole E* E) hole)
-    (E* F* (handlers proc ... hole) (dw x e hole e))
-    
-    (F (in-hole Fo F) (in-hole F* F) hole)
-    (Fo (v ... hole v ...) (if hole e e) (set! x hole) (l! x hole))
-    (F* (begin hole e e ...) (begin0 hole e e ...) 
-        (begin0 (values v ...) hole e ...) (begin0 unspecified hole e ...)
-        (call-with-values (lambda () hole e ...) v))
-    
-    ;; all of the one-layer contexts that "demand" their values, 
-    ;; (maybe just "demand" it enough to ensure it is the right # of values)
-    ;; which requires unspecified to blow up.
-    (U (v ... hole v ...) (if hole e e) (set! x hole) (l! x hole)
-       (call-with-values (lambda () hole) v))
-    
-    ;; everything except exception handler bodies
-    (PG (store (sf ...) G))
-    (G (in-hole F (dw x e G e))
-       F)
-    
-    ;; everything except dw
-    (H (in-hole F (handlers proc ... H)) F)
-    
-    (S hole (begin e e ... S es ...) (begin S es ...)
-       (begin0 e e ... S es ...) (begin0 S es ...)
-       (e ... S es ...) (if S es es) (if e S es) (if e e S)
-       (set! x S) (l! x S) 
-       (lambda f S es ...) (lambda f e e ... S es ...)
-       (letrec ([x_!_1 e] ... [x_!_1 S] [x_!_1 es] ...) es es ...)
-       (letrec ([x_!_1 e] ...) S es ...)
-       (letrec ([x_!_1 e] ...) e e ... S es ...)
-       (letrec* ([x_!_1 e] ... [x_!_2 S] [x_!_3 es] ...) es es ...)
-       (letrec* ([x_!_1 e] ...) S es ...)
-       (letrec* ([x_!_1 e] ...) e e ... S es ...))
-    
-    (B E (in-hole E (begin e B))))
-
-  (define Basic--syntactic--forms
-    (reduction-relation
-     lang
-     ;; if
-     (--> (in-hole P_1 (if v_1 e_1 e_2)) (in-hole P_1 e_1) "6if3t"
-          (side-condition (not (eq? (term v_1) #f))))
-     (--> (in-hole P_1 (if #f e_1 e_2))
-          (in-hole P_1 e_2)
-          "6if3f")
-     
-     ;; begin
-     (--> (in-hole P_1 (begin (values v ...) e_1 e_2 ...))
-          (in-hole P_1 (begin e_1 e_2 ...))
-          "6beginc")
-     (--> (in-hole P_1 (begin e_1)) (in-hole P_1 e_1) "6begind")
-     
-     ;; begin0
-     (--> (in-hole P_1 (begin0 (values v_1 ...) (values v_2 ...) e_2 ...))
-          (in-hole P_1 (begin0 (values v_1 ...) e_2 ...))
-          "6begin0n")
-     (--> (in-hole P_1 (begin0 e_1)) (in-hole P_1 e_1) "6begin01")))
-  
-  (define Arithmetic
-    (reduction-relation
-     lang
-     ;; primitives for numbers
-     (--> (in-hole P_1 (+)) (in-hole P_1 0) "6+0")
-     (--> (in-hole P_1 (+ n_1 n_2 ...)) (in-hole P_1 ,(sum-of (term (n_1 n_2 ...)))) "6+")
-     
-     (--> (in-hole P_1 (- n_1)) (in-hole P_1 ,(- (term n_1))) "6u-")
-     (--> (in-hole P_1 (- n_1 n_2 n_3 ...)) 
-          (in-hole P_1 ,(- (term n_1) (sum-of (term (n_2 n_3 ...)))))
-          "6-")
-     (--> (in-hole P_1 (-))
-          (in-hole P_1 (raise (make-cond "arity mismatch")))
-          "6-arity")
-     
-     (--> (in-hole P_1 (*)) (in-hole P_1 1) "6*1")
-     (--> (in-hole P_1 (* n_1 n_2 ...)) (in-hole P_1 ,(product-of (term (n_1 n_2 ...)))) "6*")
-     
-     (--> (in-hole P_1 (/ n_1)) (in-hole P_1 (/ 1 n_1))
-          "6u/")
-     (--> (in-hole P_1 (/ n_1 n_2 n_3 ...))
-          (in-hole P_1 ,(/ (term n_1) (product-of (term (n_2 n_3 ...)))))
-          "6/"
-          (side-condition (not (member 0 (term (n_2 n_3 ...))))))
-     (--> (in-hole P_1 (/ n_1 n_2 ... 0 n_3 ...))
-          (in-hole P_1 (raise (make-cond "divison by zero")))
-          "6/0")
-     (--> (in-hole P_1 (/))
-          (in-hole P_1 (raise (make-cond "arity mismatch")))
-          "6/arity")
-     
-     (--> (in-hole P_1 (aproc v_1 ...))
-          (in-hole P_1 (raise (make-cond "arith-op applied to non-number")))
-          "6ae"
-          (side-condition
-           (ormap (lambda (v) (not (number? v)))
-                  (term (v_1 ...)))))))
-  
-  (define (sum-of x) (apply + x))
-  (define (product-of x) (apply * x))
-  
-  (define Eqv
-    (reduction-relation
-     lang
-     
-     (--> (in-hole P_1 (eqv? v_1 v_1))
-          (in-hole P_1 #t)
-          "6eqt"
-          (side-condition (not (proc? (term v_1))))
-          (side-condition (not (condition? (term v_1)))))
-     
-     (--> (in-hole P_1 (eqv? v_1 v_2))
-          (in-hole P_1 #f)
-          "6eqf"
-          (side-condition (not (equal? (term v_1) (term v_2))))
-          (side-condition (or (not (proc? (term v_1)))
-                              (not (proc? (term v_2)))))
-          (side-condition (or (not (condition? (term v_1)))
-                              (not (condition? (term v_2))))))
-     
-     (--> (in-hole P_1 (eqv? (make-cond string_1) (make-cond string_2)))
-          (in-hole P_1 #t)
-          "6eqct")
-     (--> (in-hole P_1 (eqv? (make-cond string_1) (make-cond string_2)))
-          (in-hole P_1 #f)
-          "6eqcf")))
-  
-  (define Cons
-    (reduction-relation
-     lang
-  
-     (--> (in-hole P_1 (list v_1 v_2 ...))
-          (in-hole P_1 (cons v_1 (list v_2 ...)))
-          "6listc")
-     (--> (in-hole P_1 (list))
-          (in-hole P_1 null)
-          "6listn")
-     
-     (--> (store (sf_1 ...) (in-hole E_1 (cons v_1 v_2)))
-          (store (sf_1 ... ((-mp x) (cons v_1 v_2))) (in-hole E_1 (-mp x)))
-          "6cons"
-          (fresh x))
-     
-     (--> (store (sf_1 ...) (in-hole E_1 (consi v_1 v_2)))
-          (store (sf_1 ... ((-ip x) (cons v_1 v_2))) (in-hole E_1 (-ip x)))
-          "6consi"
-          (fresh x))
-     
-     ;; car
-     (--> (store (sf_1 ... (pp_i (cons v_1 v_2)) sf_2 ...) (in-hole E_1 (car pp_i)))
-          (store (sf_1 ... (pp_i (cons v_1 v_2)) sf_2 ...) (in-hole E_1 v_1))
-          "6car")
-
-     ;; cdr
-     (--> (store (sf_1 ... (pp_i (cons v_1 v_2)) sf_2 ...) (in-hole E_1 (cdr pp_i)))
-          (store (sf_1 ... (pp_i (cons v_1 v_2)) sf_2 ...) (in-hole E_1 v_2))
-          "6cdr")
-     
-     (--> (store (sf_1 ... (mp_1 (cons v_1 v_2)) sf_2 ...) (in-hole E_1 (set-car! mp_1 v_3)))
-          (store (sf_1 ... (mp_1 (cons v_3 v_2)) sf_2 ...) (in-hole E_1 unspecified))
-          "6setcar")
-
-     (--> (store (sf_1 ... (mp_1 (cons v_1 v_2)) sf_2 ...) (in-hole E_1 (set-cdr! mp_1 v_3)))
-          (store (sf_1 ... (mp_1 (cons v_1 v_3)) sf_2 ...) (in-hole E_1 unspecified))
-          "6setcdr")
-
-     ;; null?
-     (--> (in-hole P_1 (null? null))
-          (in-hole P_1 #t)
-          "6null?t")
-     (--> (in-hole P_1 (null? v_1))
-          (in-hole P_1 #f)
-          "6null?f"
-          (side-condition (not (null-v? (term v_1)))))
-     
-     (--> (in-hole P_1 (pair? pp))
-          (in-hole P_1 #t)
-          "6pair?t")
-     (--> (in-hole P_1 (pair? v_1))
-          (in-hole P_1 #f)
-          "6pair?f"
-          (side-condition (not (pp? (term v_1)))))
-     
-     (--> (in-hole P_1 (car v_i))
-          (in-hole P_1 (raise (make-cond "can't take car of non-pair")))
-          "6care"
-          (side-condition (not (pp? (term v_i)))))
-     
-     (--> (in-hole P_1 (cdr v_i))
-          (in-hole P_1 (raise (make-cond "can't take cdr of non-pair")))
-          "6cdre"
-          (side-condition (not (pp? (term v_i)))))
-     
-     (--> (in-hole P_1 (set-car! v_1 v_2))
-          (in-hole P_1 (raise (make-cond "can't set-car! on a non-pair or an immutable pair")))
-          "6scare"
-          (side-condition (not (mp? (term v_1)))))
-     
-     (--> (in-hole P_1 (set-cdr! v_1 v_2))
-          (in-hole P_1 (raise (make-cond "can't set-cdr! on a non-pair or an immutable pair")))
-          "6scdre"
-          (side-condition (not (mp? (term v_1)))))))
-  
-  (define Procedure--application
-    (reduction-relation
-     lang
-     
-     (--> (in-hole P_1 (e_1 ... e_i e_i+1 ...))
-          (in-hole P_1 ((lambda (x) (e_1 ... x e_i+1 ...)) e_i))
-          "6mark"
-          (fresh (x lifted))
-          (side-condition (not (v? (term e_i))))
-          (side-condition 
-           (ormap (lambda (e) (not (v? e))) (term (e_1 ... e_i+1 ...)))))
-     
-     (--> (store (sf_1 ...) (in-hole E_1 ((lambda (x_1 x_2 ..._1) e_1 e_2 ...) v_1 v_2 ..._1)))
-          (store (sf_1 ... (bp v_1))
-                 (in-hole E_1
-                          ((r6rs-subst-one (x_1 bp (lambda (x_2 ...) e_1 e_2 ...)))
-                           v_2 ...)))
-          "6appN!"
-          (fresh bp)
-          (side-condition
-           (and (unique? (term (x_1 x_2 ...)))
-                (term (Var-set!d? (x_1 (lambda (x_2 ...) e_1 e_2 ...)))))))
-     
-     (--> (in-hole P_1 ((lambda (x_1 x_2 ..._1) e_1 e_2 ...) v_1 v_2 ..._1))
-          (in-hole P_1 ((r6rs-subst-one (x_1 v_1 (lambda (x_2 ...) e_1 e_2 ...))) v_2 ...))
-          "6appN"
-          (side-condition
-           (and (unique? (term (x_1 x_2 ...)))
-                (not (term (Var-set!d? (x_1 (lambda (x_2 ...) e_1 e_2 ...))))))))
-     
-     (--> (in-hole P_1 ((lambda () e_1 e_2 ...)))
-          (in-hole P_1 (begin e_1 e_2 ...))
-          "6app0")
-     
-     (--> (in-hole P_1 ((lambda (x_1 x_2 ..._1 dot x_r) e_1 e_2 ...) v_1 v_2 ..._1 v_3 ...))
-          (in-hole P_1 ((lambda (x_1 x_2 ... x_r) e_1 e_2 ...) v_1 v_2 ... (list v_3 ...)))
-          "6μapp"
-          (side-condition (unique? (term (x_1 x_2 ... x_r)))))
-     
-     (--> (in-hole P_1 ((lambda x_1 e_1 e_2 ...) v_1 ...))
-          (in-hole P_1 ((lambda (x_1) e_1 e_2 ...) (list v_1 ...)))
-          "6μapp1")
-     
-     ;; variable lookup
-     (--> (store (sf_1 ... (x_1 v_1) sf_2 ...) (in-hole E_1 x_1))
-          (store (sf_1 ... (x_1 v_1) sf_2 ...) (in-hole E_1 v_1))
-          "6var")
-     
-     ;; set!
-     (--> (store (sf_1 ... (x_1 v_1) sf_2 ...) (in-hole E_1 (set! x_1 v_2)))
-          (store (sf_1 ... (x_1 v_2) sf_2 ...) (in-hole E_1 unspecified))
-          "6set")
-     
-     (--> (in-hole P_1 (procedure? proc)) (in-hole P_1 #t) "6proct")
-     (--> (in-hole P_1 (procedure? nonproc)) (in-hole P_1 #f) "6procf")
-     
-     ;; mu-lambda too few arguments case
-     (--> (in-hole P_1 ((lambda (x_1 ...) e_1 e_2 ...) v_1 ...))
-          (in-hole P_1 (raise (make-cond "arity mismatch")))
-          "6arity"
-          (side-condition
-           (not (= (length (term (x_1 ...)))
-                   (length (term (v_1 ...)))))))
-     
-     (--> (in-hole P_1 ((lambda (x_1 x_2 ... dot x) e_1 e_2 ...) v_1 ...))
-          (in-hole P_1 (raise (make-cond "arity mismatch")))
-          "6μarity"
-          (side-condition
-           (< (length (term (v_1 ...)))
-              (length (term (x_1 x_2 ...))))))
-     
-     (--> (in-hole P_1 (nonproc v ...))
-          (in-hole P_1 (raise (make-cond "can't call non-procedure")))
-          "6appe")
-     
-     (--> (in-hole P_1 (proc1 v_1 ...))
-          (in-hole P_1 (raise (make-cond "arity mismatch")))
-          "61arity"
-          (side-condition (not (= (length (term (v_1 ...))) 1))))
-     (--> (in-hole P_1 (proc2 v_1 ...))
-          (in-hole P_1 (raise (make-cond "arity mismatch")))
-          "62arity"
-          (side-condition (not (= (length (term (v_1 ...))) 2))))))
-  
-  (define Apply
-    (reduction-relation
-     lang
-     
-     (--> (in-hole P_1 (apply proc_1 v_1 ... null))
-          (in-hole P_1 (proc_1 v_1 ...))
-          "6applyf")
-     
-     (--> (store (sf_1 ... (pp_1 (cons v_2 v_3)) sf_2 ...) (in-hole E_1 (apply proc_1 v_1 ... pp_1)))
-          (store (sf_1 ... (pp_1 (cons v_2 v_3)) sf_2 ...) (in-hole E_1 (apply proc_1 v_1 ... v_2 v_3)))
-          "6applyc"
-          (side-condition (not (term (circular? (pp_1 v_3 (sf_1 ... (pp_1 (cons v_2 v_3)) sf_2 ...)))))))
-     
-     (--> (store (sf_1 ... (pp_1 (cons v_2 v_3)) sf_2 ...) (in-hole E_1 (apply proc_1 v_1 ... pp_1)))
-          (store (sf_1 ... (pp_1 (cons v_2 v_3)) sf_2 ...) (in-hole E_1 (raise (make-cond "apply called on circular list"))))
-          "6applyce"
-          (side-condition (term (circular? (pp_1 v_3 (sf_1 ... (pp_1 (cons v_2 v_3)) sf_2 ...))))))
-     
-     (--> (in-hole P_1 (apply nonproc v ...))
-          (in-hole P_1 (raise (make-cond "can't apply non-procedure")))
-          "6applynf")
-     
-     (--> (in-hole P_1 (apply proc v_1 ... v_2))
-          (in-hole P_1 (raise (make-cond "apply's last argument non-list")))
-          "6applye"
-          (side-condition (not (list-v? (term v_2)))))
-     
-     (--> (in-hole P_1 (apply)) (in-hole P_1 (raise (make-cond "arity mismatch"))) "6apparity0")
-     (--> (in-hole P_1 (apply v)) (in-hole P_1 (raise (make-cond "arity mismatch"))) "6apparity1")))
-  
-  ;; circular? : pp val store -> boolean
-  ;; returns #t if pp is reachable via val in the store
-  (metafunction-type circular? (pp val (sf ...)))
-  (define-metafunction lang
-    circular? : (pp v (sf ...)) -> any
-    [(circular? (pp_1 pp_2 (sf_1 ... (pp_2 (cons v_1 v_2)) sf_2 ...)))
-     #t
-     (side-condition (equal? (term pp_1) (term v_2)))]
-    [(circular? (pp_1 pp_2 (sf_1 ... (pp_2 (cons v_1 v_2)) sf_2 ...)))
-     (circular? (pp_1 v_2 (sf_1 ... (pp_2 (cons v_1 v_2)) sf_2 ...)))
-     (side-condition (not (equal? (term pp_1) (term v_2))))]
-    [(circular? (pp_1 v_1 (sf_1 ...)))
-     #f]) ;; otherwise
-  
-  ;; Var-set!d? : e -> boolean
-  (metafunction-type Var-set!d? (x e))
-  (define-metafunction lang
-    Var-set!d? : (x e) -> any
-    [(Var-set!d? (x_1 (set! x_2 e_1))) 
-     #t
-     (side-condition (equal? (term x_1) (term x_2)))]
-    [(Var-set!d? (x_1 (set! x_2 e_1))) 
-     (Var-set!d? (x_1 e_1))
-     (side-condition (not (equal? (term x_1) (term x_2))))]
-    [(Var-set!d? (x_1 (begin e_1 e_2 e_3 ...)))
-     ,(or (term (Var-set!d? (x_1 e_1)))
-          (term (Var-set!d? (x_1 (begin e_2 e_3 ...)))))]
-    [(Var-set!d? (x_1 (begin e_1)))
-     (Var-set!d? (x_1 e_1))]
-    [(Var-set!d? (x_1 (e_1 e_2 ...))) 
-     (Var-set!d? (x_1 (begin e_1 e_2 ...)))]
-    [(Var-set!d? (x_1 (if e_1 e_2 e_3)))
-     ,(or (term (Var-set!d? (x_1 e_1)))
-          (term (Var-set!d? (x_1 e_2)))
-          (term (Var-set!d? (x_1 e_3))))]
-    [(Var-set!d? (x_1 (begin0 e_1 e_2 ...)))
-     (Var-set!d? (x_1 (begin e_1 e_2 ...)))]
-    
-    [(Var-set!d? (x_1 (lambda (x_2 ...) e_1 e_2 ...))) 
-     (Var-set!d? (x_1 (begin e_1 e_2 ...)))
-     (side-condition (not (memq (term x_1) (term (x_2 ...)))))]
-    [(Var-set!d? (x_1 (lambda (x_2 ... dot x_3) e_1 e_2 ...))) 
-     (Var-set!d? (x_1 (begin e_1 e_2 ...)))
-     (side-condition (not (memq (term x_1) (term (x_2 ... x_3)))))]
-    [(Var-set!d? (x_1 (lambda x_2 e_1 e_2 ...))) 
-     (Var-set!d? (x_1 (begin e_1 e_2 ...)))
-     (side-condition (not (equal? (term x_1) (term x_2))))]
-    [(Var-set!d? (x_1 (letrec ([x_2 e_1] ...) e_2 e_3 ...)))
-     (Var-set!d? (x_1 (begin e_1 ... e_2 e_3 ...)))
-     (side-condition (not (memq (term x_1) (term (x_2 ...)))))]
-    [(Var-set!d? (x_1 (letrec* ([x_2 e_1] ...) e_2 e_3 ...)))
-     (Var-set!d? (x_1 (begin e_1 ... e_2 e_3 ...)))
-     (side-condition (not (memq (term x_1) (term (x_2 ...)))))]
-    [(Var-set!d? (x_1 (l! x_2 e_1)))
-     (Var-set!d? (x_1 (set! x_2 e_1)))]
-    [(Var-set!d? (x_1 (reinit x_2 e_1)))
-     (Var-set!d? (x_1 (set! x_2 e_1)))]
-    [(Var-set!d? (x_1 (dw x_2 e_1 e_2 e_3)))
-     ,(or (term (Var-set!d? (x_1 e_1)))
-          (term (Var-set!d? (x_1 e_2)))
-          (term (Var-set!d? (x_1 e_3))))]
-    [(Var-set!d? (x_1 any_1)) #f])
-     
-     
-  (define Call-cc--and--dynamic-wind
-    (reduction-relation
-     lang
-     (--> (in-hole P_1 (dynamic-wind proc_1 proc_2 proc_3))
-          (in-hole P_1 
-                   (begin (proc_1)
-                          (begin0
-                            (dw x (proc_1) (proc_2) (proc_3))
-                            (proc_3))))
-          "6wind"
-          (fresh x))
-     (--> (in-hole P_1 (dynamic-wind v_1 v_2 v_3))
-          (in-hole P_1 (raise (make-cond "dynamic-wind expects procs")))
-          "6winde"
-          (side-condition (or (not (proc? (term v_1)))
-                              (not (proc? (term v_2)))
-                              (not (proc? (term v_3))))))
-     
-     (--> (in-hole P_1 (dynamic-wind v_1 ...))
-          (in-hole P_1 (raise (make-cond "arity mismatch")))
-          "6dwarity"
-          (side-condition (not (= (length (term (v_1 ...))) 3))))
-     
-     (--> (in-hole P_1 (dw x e_1 (values v_1 ...) e_2))
-          (in-hole P_1 (values v_1 ...))
-          "6dwdone")
-     
-     (--> (store (sf_1 ...) (in-hole E_1 (call/cc v_1)))
-          (store (sf_1 ...) (in-hole E_1 (v_1 (throw x (in-hole E_1 x)))))
-          "6call/cc"
-          (fresh x))
-     
-     (--> (store (sf_1 ...) (in-hole E_1 ((throw x_1 (in-hole E_2 x_1)) v_1 ...)))
-          (store (sf_1 ...) (in-hole (Trim (E_1 E_2)) (values v_1 ...)))
-          "6throw")))
-  
-  (metafunction-type pRe (-> E E))
-  (define-metafunction lang
-    pRe : E -> B
-    [(pRe (in-hole H_1 (dw x_1 e_1 E_1 e_2))) 
-     (in-hole H_1
-              (begin e_1 
-                     (dw x_1 e_1 (pRe E_1) e_2)))]
-    [(pRe (in-hole H_1 hole)) H_1])
-  
-  (metafunction-type poSt (-> E E))
-  (define-metafunction lang
-    poSt : E -> E
-    [(poSt (in-hole E_1 (dw x_1 e_1 H_2 e_2)))
-     (in-hole (poSt E_1) (begin0 (dw x_1 e_1 hole e_2) e_2))]
-    [(poSt H_1) hole])
-  
-  (metafunction-type Trim (-> E E E))
-  (define-metafunction lang
-    Trim : (E E) -> B
-    [(Trim ((in-hole H_1 (dw x_1 e_1 E_1 e_2))
-            (in-hole H_2 (dw x_1 e_3 E_2 e_4))))
-     (in-hole H_2 (dw x_1 e_3 (Trim (E_1 E_2)) e_4))]
-    [(Trim ((in-hole E_1 hole)
-            (in-hole E_2 hole)))
-     (begin (in-hole (poSt E_1) 1)
-            (pRe E_2))])
-
-  (define Exceptions
-    (reduction-relation
-     lang
-     
-     (--> (in-hole PG (raise* v_1))
-          (uncaught-exception v_1)
-          "6xunee")
-     
-     (--> (in-hole P (handlers (in-hole G (raise* v_1))))
-          (uncaught-exception v_1)
-          "6xuneh")
-     
-     (--> (in-hole PG_1 (with-exception-handler proc_1 proc_2))
-          (in-hole PG_1 (handlers proc_1 (proc_2)))
-          "6xwh1")
-     
-     (--> (in-hole P_1 (handlers proc_1 ... (in-hole G_1 (with-exception-handler proc_2 proc_3))))
-          (in-hole P_1 (handlers proc_1 ... (in-hole G_1 (handlers proc_1 ... proc_2 (proc_3)))))
-          "6xwhn")
-     
-     (--> (in-hole P_1 (handlers proc_1 ... (in-hole G_1 (with-exception-handler v_1 v_2))))
-          (in-hole P_1 (handlers proc_1 ... (in-hole G_1 (raise (make-cond "with-exception-handler expects procs")))))
-          "6xwhne"
-          (side-condition (or (not (proc? (term v_1)))
-                              (not (proc? (term v_2))))))
-     
-     (--> (in-hole P_1 (handlers proc_1 ... proc_2 (in-hole G_1 (raise-continuable v_1))))
-          (in-hole P_1 (handlers proc_1 ... proc_2 (in-hole G_1 (handlers proc_1 ... (proc_2 v_1)))))
-          "6xrc")
-     
-     (--> (in-hole P_1 (handlers 
-                        proc_1 ... proc_2
-                        (in-hole G_1 (raise v_1))))
-          (in-hole P_1 (handlers 
-                        proc_1 ... proc_2 
-                        (in-hole G_1 
-                                 (handlers proc_1 ... 
-                                           (begin (proc_2 v_1)
-                                                  (raise (make-cond "handler returned")))))))
-          "6xr")
-     
-     (--> (in-hole P_1 (condition? (make-cond string)))
-          (in-hole P_1 #t)
-          "6ct")
-     
-     (--> (in-hole P_1 (condition? v_1))
-          (in-hole P_1 #f)
-          "6cf"
-          (side-condition (not (condition? (term v_1)))))
-     
-     (--> (in-hole P_1 (handlers proc_1 ... (values v_1 ...)))
-          (in-hole P_1 (values v_1 ...))
-          "6xdone")
-     
-     (--> (in-hole PG_1 (with-exception-handler v_1 v_2))
-          (in-hole PG_1 (raise (make-cond "with-exception-handler expects procs")))
-          "6weherr"
-          (side-condition (or (not (proc? (term v_1)))
-                              (not (proc? (term v_2))))))))
-  
-  (define Multiple--values--and--call-with-values
-    (reduction-relation
-     lang
-     ;; values promotion
-     (--> (in-hole P* v)
-          (in-hole P* (values v))
-          "6promote")
-     
-     ;; values demotion
-     (--> (in-hole Po (values v))
-          (in-hole Po v)
-          "6demote")
-     
-     ; resolving call-with-values statements
-     (--> (in-hole P_1 (call-with-values (lambda () (values v_2 ...)) v_1))
-          (in-hole P_1 (v_1 v_2 ...))
-          "6cwvd")
-     
-     (--> (in-hole P_1 (call-with-values v_1 v_2))
-          (in-hole P_1 (call-with-values (lambda () (v_1)) v_2))
-          "6cwvw"
-          (side-condition (not (lambda-null? (term v_1)))))))
-  
-  (define Letrec
-    (reduction-relation
-     lang
-     (--> (store (sf_1 ... (x_1 bh) sf_2 ...) (in-hole E_1 (l! x_1 v_2)))
-          (store (sf_1 ... (x_1 v_2) sf_2 ...) (in-hole E_1 unspecified))
-          "6initdt")
-     (--> (store (sf_1 ... (x_1 v_1) sf_2 ...) (in-hole E_1 (l! x_1 v_2)))
-          (store (sf_1 ... (x_1 v_2) sf_2 ...) (in-hole E_1 unspecified))
-          "6initv")
-     (--> (store (sf_1 ... (x_1 bh) sf_2 ...) (in-hole E_1 (set! x_1 v_1)))
-          (store (sf_1 ... (x_1 v_1) sf_2 ...) (in-hole E_1 unspecified))
-          "6setdt")
-     (--> (store (sf_1 ... (x_1 bh) sf_2 ...) (in-hole E_1 (set! x_1 v_1)))
-          (store (sf_1 ... (x_1 bh) sf_2 ...) (in-hole E_1 (raise (make-cond "letrec variable touched"))))
-          "6setdte")
-     (--> (store (sf_1 ... (x_1 bh) sf_2 ...) (in-hole E_1 x_1))
-          (store (sf_1 ... (x_1 bh) sf_2 ...) (in-hole E_1 (raise (make-cond "letrec variable touched"))))
-          "6dt")
-     
-     (--> (store (sf_1 ... (x_1 #f) sf_2 ...) (in-hole E_1 (reinit x_1)))
-          (store (sf_1 ... (x_1 #t) sf_2 ...) (in-hole E_1 'ignore))
-          "6init")
-     (--> (store (sf_1 ... (x_1 b) sf_2 ...) (in-hole E_1 (reinit x_1)))
-          (store (sf_1 ... (x_1 b) sf_2 ...) (in-hole E_1 'ignore))
-          "6reinit"
-          (side-condition (term b)))
-     (--> (store (sf_1 ... (x_1 b) sf_2 ...) (in-hole E_1 (reinit x_1)))
-          (store (sf_1 ... (x_1 b) sf_2 ...) (in-hole E_1 (raise (make-cond "reinvoked continuation of letrec init"))))
-          "6reinite"
-          (side-condition (term b)))
-     
-     (--> (store (sf_1 ...) (in-hole E_1 (letrec ([x_1 e_1] ...) e_2 e_3 ...)))
-          (store (sf_1 ... (lx bh) ... (ri #f) ...)
-                 (in-hole E_1 
-                          ((lambda (x_1 ...) 
-                             (l! lx x_1) ...
-                             (r6rs-subst-many ((x_1 lx) ... e_2))
-                             (r6rs-subst-many ((x_1 lx) ... e_3)) ...)
-                           (begin0 (r6rs-subst-many ((x_1 lx) ... e_1))
-                             (reinit ri))
-                           ...)))
-          "6letrec"
-          (side-condition (unique? (term (x_1 ...))))
-          (fresh ((lx ...) 
-                  (x_1 ...)
-                  ,(map (λ (x) (string->symbol (format "lx-~a" x))) (term (x_1 ...)))))
-          (fresh ((ri ...) 
-                  (x_1 ...)
-                  ,(map (λ (x) (string->symbol (format "ri-~a" x))) (term (x_1 ...))))))
-     (--> (store (sf_1 ...) (in-hole E_1 (letrec* ([x_1 e_1] ...) e_2 e_3 ...)))
-          (store (sf_1 ... (lx bh) ... (ri #f) ...)
-            (in-hole E_1 
-                     (r6rs-subst-many 
-                      ((x_1 lx) ...
-                       (begin
-                         (begin
-                           (l! lx e_1)
-                           (reinit ri)) 
-                         ...
-                         e_2
-                         e_3 ...)))))
-          "6letrec*"
-          (fresh ((lx ...)
-                  (x_1 ...)
-                  ,(map (λ (x) (string->symbol (format "lx-~a" x))) (term (x_1 ...)))))
-          (fresh ((ri ...) 
-                  (x_1 ...)
-                  ,(map (λ (x) (string->symbol (format "ri-~a" x))) (term (x_1 ...))))))))
-  
-  (define Underspecification
-    (reduction-relation
-     lang
-     (--> (in-hole P (eqv? proc_1 proc_2))
-          (unknown "equivalence of procedures")
-          "6ueqv")
-     (--> (in-hole Po (values v_1 ...))
-          (unknown ,(format "context expected one value, received ~a" (length (term (v_1 ...)))))
-          "6uval"
-          (side-condition (not (= (length (term (v_1 ...))) 1))))
-     (--> (in-hole P (in-hole U unspecified))
-          (unknown "unspecified result")
-          "6udemand")
-     (--> (store (sf ...) unspecified)
-          (unknown "unspecified result")
-          "6udemandtl")
-     
-     (--> (in-hole P_1 (begin unspecified e_1 e_2 ...))
-          (in-hole P_1 (begin e_1 e_2 ...))
-          "6ubegin")
-     (--> (in-hole P_1 (handlers v ... unspecified))
-          (in-hole P_1 unspecified)
-          "6uhandlers")
-     (--> (in-hole P_1 (dw x e_1 unspecified e_2))
-          (in-hole P_1 unspecified)
-          "6udw")
-     (--> (in-hole P_1 (begin0 (values v_1 ...) unspecified e_1 ...))
-          (in-hole P_1 (begin0 (values v_1 ...) e_1 ...))
-          "6ubegin0")
-     (--> (in-hole P_1 (begin0 unspecified (values v_2 ...) e_2 ...))
-          (in-hole P_1 (begin0 unspecified e_2 ...))
-          "6ubegin0u")
-     (--> (in-hole P_1 (begin0 unspecified unspecified e_2 ...))
-          (in-hole P_1 (begin0 unspecified e_2 ...))
-          "6ubegin0uu")))
-  
-  (define Quote
-    (reduction-relation
-     lang
-     (--> (store (sf_1 ...) (in-hole S_1 'sqv_1))
-          (store (sf_1 ...) (in-hole S_1 sqv_1))
-          "6sqv")
-     (--> (store (sf_1 ...) (in-hole S_1 '()))
-          (store (sf_1 ...) (in-hole S_1 null))
-          "6eseq")
-     (--> (store (sf_1 ...) (in-hole S_1 'seq_1))
-          (store (sf_1 ...) ((lambda (qp) (in-hole S_1 qp)) (Qtoc seq_1)))
-          "6qcons"
-          (fresh qp))
-     (--> (store (sf_1 ...) (in-hole S_1 'seq_1))
-          (store (sf_1 ...) ((lambda (qp) (in-hole S_1 qp)) (Qtoic seq_1)))
-          "6qconsi"
-          (fresh qp))))
-  
-  (metafunction-type Qtoc (-> seq e))
-  (define-metafunction lang
-    Qtoc : s -> e
-    [(Qtoc ()) null]
-    [(Qtoc (s_1 s_2 ...)) (cons (Qtoc s_1) (Qtoc (s_2 ...)))]
-    [(Qtoc (s_1 dot sqv_1)) (cons (Qtoc s_1) sqv_1)]
-    [(Qtoc (s_1 s_2 s_3 ... dot sqv_1)) (cons (Qtoc s_1) (Qtoc (s_2 s_3 ... dot sqv_1)))]
-    [(Qtoc (s_1 dot sym_1)) (cons (Qtoc s_1) 'sym_1)]
-    [(Qtoc (s_1 s_2 s_3 ... dot sym_1)) (cons (Qtoc s_1) (Qtoc (s_2 s_3 ... dot sym_1)))]
-    [(Qtoc sym_1) 'sym_1]
-    [(Qtoc sqv_1) sqv_1])
-  
-  (metafunction-type Qtoic (-> s e))
-  (define-metafunction lang
-    Qtoic : s -> e
-    [(Qtoic ()) null]
-    [(Qtoic (s_1 s_2 ...)) (consi (Qtoic s_1) (Qtoic (s_2 ...)))]
-    [(Qtoic (s_1 dot sqv_1)) (consi (Qtoic s_1) sqv_1)]
-    [(Qtoic (s_1 s_2 s_3 ... dot sqv_1)) (consi (Qtoic s_1) (Qtoic (s_2 s_3 ... dot sqv_1)))]
-    [(Qtoic (s_1 dot sym_1)) (consi (Qtoic s_1) 'sym_1)]
-    [(Qtoic (s_1 s_2 s_3 ... dot sym_1)) (consi (Qtoic s_1) (Qtoic (s_2 s_3 ... dot sym_1)))]
-    [(Qtoic sym_1) 'sym_1]
-    [(Qtoic sqv_1) sqv_1])
-  
-  (define reductions
-    (union-reduction-relations
-     Arithmetic
-     Basic--syntactic--forms
-     Cons 
-     Eqv
-     Procedure--application
-     Apply
-     Call-cc--and--dynamic-wind
-     Exceptions
-     Multiple--values--and--call-with-values
-     Quote
-     Letrec
-     Underspecification))
-  
-  (define-metafunction lang
-    
-    ;; variable cases
-    [(r6rs-subst-one (cansub_1 e_1 cansub_1)) e_1]
-    [(r6rs-subst-one (cansub_1 e_1 cansub_2)) cansub_2]
-    
-    ;; dont substitute inside quoted expressions
-    [(r6rs-subst-one (cansub_1 e_1 'any_1)) 'any_1]
-    
-    ;; when the lambda/letrec binds the variable, stop stubstituting
-    [(r6rs-subst-one (cansub_1 e (lambda (cansub_2 ... cansub_1 cansub_3 ...) e_2 e_3 ...)))
-     (lambda (cansub_2 ... cansub_1 cansub_3 ...) e_2 e_3 ...)
-     (side-condition (not (memq (term cansub_1) (term (cansub_2 ...)))))]
-    [(r6rs-subst-one (cansub_1 e (lambda (cansub_2 ... dot cansub_1) e_2 e_3 ...)))
-     (lambda (cansub_2 ... dot cansub_1) e_2 e_3 ...)]
-    [(r6rs-subst-one (cansub_1 e (lambda (cansub_2 ... cansub_1 cansub_3 ... dot cansub_4) e_2 e_3 ...)))
-     (lambda (cansub_2 ... cansub_1 cansub_3 ... dot cansub_4) e_2 e_3 ...)
-     (side-condition (not (memq (term cansub_1) (term (cansub_2 ...)))))]
-    [(r6rs-subst-one (cansub_1 e (lambda cansub_1 e_2 e_3 ...)))
-     (lambda cansub_1 e_2 e_3 ...)]
-    [(r6rs-subst-one (cansub_1 e (letrec ([cansub_2 e_2] ... [cansub_1 e_1] [cansub_3 e_3] ...) e_4 e_5 ...)))
-     (letrec ([cansub_2 e_2] ... [cansub_1 e_1] [cansub_3 e_3] ...) e_4 e_5 ...)
-     (side-condition (not (memq (term cansub_1) (term (cansub_2 ...)))))]
-    [(r6rs-subst-one (cansub_1 e (letrec* ([cansub_2 e_2] ... [cansub_1 e_1] [cansub_3 e_3] ...) e_4 e_5 ...)))
-     (letrec* ([cansub_2 e_2] ... [cansub_1 e_1] [cansub_3 e_3] ...) e_4 e_5 ...)
-     (side-condition (not (memq (term cansub_1) (term (cansub_2 ...)))))]
-    
-    ;; next 3 cases: we know no capture can occur, so we just recur
-    [(r6rs-subst-one (cansub_1 e_1 (lambda (cansub_2 ...) e_2 e_3 ...)))
-     (lambda (cansub_2 ...) 
-       (r6rs-subst-one (cansub_1 e_1 e_2))
-       (r6rs-subst-one (cansub_1 e_1 e_3)) ...)
-     (side-condition (andmap (λ (x) (equal? (variable-not-in (term e_1) x) x))
-                             (term (cansub_2 ...))))]
-    [(r6rs-subst-one (cansub_1 e_1 (lambda (cansub_2 ... dot cansub_3) e_2 e_3 ...)))
-     (lambda (cansub_2 ...) 
-       (r6rs-subst-one (cansub_1 e_1 e_2))
-       (r6rs-subst-one (cansub_1 e_1 e_3)) ...)
-     (side-condition (andmap (λ (x) (equal? (variable-not-in (term e_1) x) x))
-                             (term (cansub_2 ... cansub_3))))]
-    [(r6rs-subst-one (cansub_1 e_1 (lambda cansub_2 e_2 e_3 ...)))
-     (lambda cansub_2
-       (r6rs-subst-one (cansub_1 e_1 e_2))
-       (r6rs-subst-one (cansub_1 e_1 e_3)) ...)
-     (side-condition (equal? (variable-not-in (term e_1) (term cansub_2)) 
-                             (term cansub_2)))]
-    [(r6rs-subst-one (cansub_1 e_1 (letrec ([cansub_2 e_2] ...) e_3 e_4 ...)))
-     (letrec ([cansub_2 (r6rs-subst-one (cansub_1 e_1 e_2))] ...) 
-       (r6rs-subst-one (cansub_1 e_1 e_3)) 
-       (r6rs-subst-one (cansub_1 e_1 e_4)) ...)
-     (side-condition (andmap (λ (x) (equal? (variable-not-in (term e_1) x) x))
-                             (term (cansub_2 ...))))]
-    [(r6rs-subst-one (cansub_1 e_1 (letrec* ([cansub_2 e_2] ...) e_3 e_4 ...)))
-     (letrec* ([cansub_2 (r6rs-subst-one (cansub_1 e_1 e_2))] ...) 
-              (r6rs-subst-one (cansub_1 e_1 e_3)) 
-              (r6rs-subst-one (cansub_1 e_1 e_4)) ...)
-     (side-condition (andmap (λ (x) (equal? (variable-not-in (term e_1) x) x))
-                             (term (cansub_2 ...))))]
-    
-    ;; capture avoiding cases
-    [(r6rs-subst-one (cansub_1 e_1 (lambda (cansub_2 ... dot cansub_3) e_2 e_3 ...)))
-     ,(term-let ([(cansub_new ... cansub_new_dot) (variables-not-in (term (cansub_1 e_1 e_2 e_3 ...))
-                                                                    (term (cansub_2 ... cansub_3)))])
-        (term (lambda (cansub_new ... dot cansub_new_dot) 
-                (r6rs-subst-one (cansub_1 
-                                 e_1
-                                 (r6rs-subst-many ((cansub_2 cansub_new) ... (cansub_3 cansub_new_dot) e_2))))
-                (r6rs-subst-one (cansub_1 
-                                 e_1
-                                 (r6rs-subst-many ((cansub_2 cansub_new) ... (cansub_3 cansub_new_dot) e_3))))
-                ...)))]
-    [(r6rs-subst-one (cansub_1 e_1 (lambda (cansub_2 ...) e_2 e_3 ...)))
-     ,(term-let ([(cansub_new ...) (variables-not-in (term (cansub_1 e_1 e_2 e_3 ...))
-                                                     (term (cansub_2 ...)))])
-        (term (lambda (cansub_new ...) 
-                (r6rs-subst-one (cansub_1 e_1 (r6rs-subst-many ((cansub_2 cansub_new) ... e_2))))
-                (r6rs-subst-one (cansub_1 e_1 (r6rs-subst-many ((cansub_2 cansub_new) ... e_3)))) ...)))]
-    [(r6rs-subst-one (cansub_1 e_1 (lambda cansub_2 e_2 e_3 ...)))
-     ,(term-let ([cansub_new (variable-not-in (term (cansub_1 e_1 e_2 e_3 ...))
-                                              (term cansub_2))])
-        (term (lambda cansub_new
-                (r6rs-subst-one (cansub_1 e_1 (r6rs-subst-one (cansub_2 cansub_new e_2))))
-                (r6rs-subst-one (cansub_1 e_1 (r6rs-subst-one (cansub_2 cansub_new e_3)))) ...)))]
-    [(r6rs-subst-one (cansub_1 e_1 (letrec ([cansub_2 e_2] ...) e_3 e_4 ...)))
-     ,(term-let ([(cansub_new ...) (variables-not-in (term (cansub_1 e_1 e_2 ... e_3 e_4 ...))
-                                                     (term (cansub_2 ...)))])
-        (term (letrec ([cansub_new (r6rs-subst-one 
-                                    (cansub_1 
-                                     e_1
-                                     (r6rs-subst-many ((cansub_2 cansub_new) ... e_2))))] ...)
-                (r6rs-subst-one (cansub_1 e_1 (r6rs-subst-many ((cansub_2 cansub_new) ... e_3))))
-                (r6rs-subst-one (cansub_1 e_1 (r6rs-subst-many ((cansub_2 cansub_new) ... e_4)))) ...)))]
-    [(r6rs-subst-one (cansub_1 e_1 (letrec* ([cansub_2 e_2] ...) e_3 e_4 ...)))
-     ,(term-let ([(cansub_new ...) (variables-not-in (term (cansub_1 e_1 e_2 ... e_3 e_4 ...))
-                                                     (term (cansub_2 ...)))])
-        (term (letrec* ([cansub_new (r6rs-subst-one 
-                                     (cansub_1 
-                                      e_1
-                                      (r6rs-subst-many ((cansub_2 cansub_new) ... e_2))))] ...)
-                       (r6rs-subst-one (cansub_1 e_1 (r6rs-subst-many ((cansub_2 cansub_new) ... e_3))))
-                       (r6rs-subst-one (cansub_1 e_1 (r6rs-subst-many ((cansub_2 cansub_new) ... e_4)))) ...)))]
-    
-    ;; last two cases cover all other expressions -- they don't have any variables, 
-    ;; so we don't care about their structure. 
-    [(r6rs-subst-one (cansub_1 e_1 (any_1 ...))) ((r6rs-subst-one (cansub_1 e_1 any_1)) ...)]
-    [(r6rs-subst-one (cansub_1 e_1 any_1)) any_1])
-  
-  (define-metafunction lang
-    [(r6rs-subst-many ((cansub_1 e_1) (cansub_2 e_2) ... e_3)) 
-     (r6rs-subst-one (cansub_1 e_1 (r6rs-subst-many ((cansub_2 e_2) ... e_3))))]
-    [(r6rs-subst-many (e_1)) e_1])
-  
-  (metafunction-type observable (-> a* r*))
-  (define-metafunction lang
-    observable : a* -> r*
-    [(observable (store (sf ...) (values v_1 ...)))
-     (values (observable-value v_1) ...)]
-    [(observable (uncaught-exception v))
-     exception]
-    [(observable (unknown string))
-     unknown])
-  
-  (metafunction-type observable-value (-> v r*v))
-  (define-metafunction lang
-    observable-value : v -> r*v
-    [(observable-value pp_1) pair]
-    [(observable-value null) null]
-    [(observable-value 'sym_1) 'sym_1]
-    [(observable-value sqv_1) sqv_1]
-    [(observable-value (make-cond string)) condition]
-    [(observable-value proc) procedure])
-  
-  (define condition? (redex-match lang (make-cond string)))
-  (define lambda-null? (redex-match lang (lambda () e)))
-  (define null-v? (redex-match lang null))
-  
-  (define v? (redex-match lang v))
-  (define proc? (redex-match lang proc))
-  (define pp? (redex-match lang pp))
-  (define mp? (redex-match lang mp))
-  (define ip? (redex-match lang ip))
-  (define es? (redex-match lang es))
-  (define (list-v? v) (or (pp? v) (null-v? v)))
-  (define (unique? l)
-    (or (null? l)
-        (and (andmap (lambda (e) (not (equal? (car l) e))) (cdr l))
-             (unique? (cdr l)))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/racket-vs-redex.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/racket-vs-redex.rkt
deleted file mode 100644
index 5c9cdaf0a8..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/racket-vs-redex.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-#|
-
-This runs (most of) the R6RS test suite in both Racket and Redex
-and prints out timing results that compare the two of them.
-
-It skips a few tests that are testing internal states of the redex
-r6rs model since they use features that aren't in r6rs itself.
-
-|#
-
-(require "r6rs-tests.rkt")
-(main #:compare-with-racket? #t)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/show-examples.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/show-examples.rkt
deleted file mode 100644
index 5a13850afc..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/show-examples.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang racket
-
-(require redex
-         "r6rs.rkt")
-(provide show show-expression
-         step step-expression)
-
-
-
-;; the number of steps to produce automatically (the GUI lets you produce more if you wish)
-(reduction-steps-cutoff 100)
-
-;; the width of the boxes in the GUI (used when pretty-printing their contents)
-;; defaults to 40 if unspecified
-(initial-char-width 60)
-
-;; show : sexp -> void
-;; shows the reduction sequence for its argument; any terms
-;; that don't match the script p (p*) non-terminal are turned pink
-(define (show x)
-  (traces reductions
-          x
-          #:pred (λ (x) 
-                   (let ([m (tm x)])
-                     (and m
-                          (= 1 (length m)))))))
-(define tm (redex-match lang p*))
-(define (show-expression x) (show `(store () ,x)))
-
-(define (step x) (stepper reductions x))
-(define (step-expression x) (step `(store () ,x)))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; example uses of the above functions
-;; if any of the terms in the graph don't 
-;;    match p*, they will be colored red
-;; 
-
-(show '(store () (((lambda (x y) (set! x (+ x y)) x) 2 3))))
-
-;; an infinite, tail-recursive loop
-(show-expression '((lambda (x) ((call/cc call/cc) x)) (call/cc call/cc)))
-
-;; two infinite loops, one in left-to-right and one in right-to-left evaluation order
-;; one goes into a non-tail infinite loop, the other's reduction graph has a cycle
-(step '(store () 
-              ((call/cc call/cc) 
-               (call/cc call/cc))))
-
-
-;; demonstrates sharing
-(show-expression
- '((lambda (c)
-     ((lambda (x y) 
-        (set-car! x 3)
-        (car y))
-      c c))
-   (cons 1 2)))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/test.rkt
deleted file mode 100644
index c436bf082a..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/test.rkt
+++ /dev/null
@@ -1,219 +0,0 @@
-#lang racket/base
-
-(require redex/reduction-semantics
-         racket/contract
-         (for-syntax racket/base
-                     setup/path-to-relative))
-
-(define-struct test-suite (name reductions to-mz equal? tests))
-(define-struct test (name input expecteds run-mz? around file line))
-
-(define (show-dup-error from dup)
-  (string->immutable-string
-   (format "FOUND DUPLICATE!\n----\n~s\nwent to this twice:\n~s\n----\n"
-           from
-           dup)))
-
-(define (uniq from lot)
-  (let loop ((thelist lot))
-    (unless (null? thelist)
-      (when (member (car thelist) (cdr thelist))
-        (raise (make-exn:fail:duplicate 
-                (show-dup-error from (car thelist))
-                (current-continuation-marks))))
-      (loop (cdr thelist)))))
-(define-struct (exn:fail:duplicate exn:fail) ())
-
-(define (evaluate reductions t progress? [intermediate-state-test void] #:only-first-answer? [only-first-answer? #f])
-  (let ([cache (make-hash)]
-        [count 0]
-        [results (make-hash)])
-    
-    (let loop ([t t]
-               [depth 0])
-      (unless (hash-ref cache t (λ () #f))
-        (hash-set! cache t #t)
-        (set! count (+ count 1))
-        (intermediate-state-test t)
-        (when progress?
-          (cond
-            [(eq? progress? 'dots)
-             (when (= 0 (modulo count 100))
-               (printf ":")
-               (flush-output))]
-            [else
-             (when (= 0 (modulo count 5000))
-               (printf "~s states ... " count)
-               (flush-output))]))
-        (let ([nexts (apply-reduction-relation reductions t)])
-          (cond
-            [(null? nexts)
-             (hash-set! results t #t)]
-            [only-first-answer?
-             (loop (car nexts) (+ depth 1))]
-            [else
-             (uniq t nexts)
-             (for-each (λ (t) (loop t (+ depth 1)))
-                       nexts)]))))
-    
-    (when progress?
-      (unless (eq? progress? 'dots)
-        (printf "~s state~a total\n" count (if (= 1 count) "" "s"))))
-    (hash-map results (λ (x y) x))))
-
-(define (set-same? s1 s2 same?)
-  (define (in-s1? s2-ele) (ormap (lambda (s1-ele) (same? s1-ele s2-ele)) s1))
-  (define (in-s2? s1-ele) (ormap (lambda (s2-ele) (same? s1-ele s2-ele)) s2))
-  (and (andmap in-s1? s2)
-       (andmap in-s2? s1)
-       #t))
-
-(define-syntax (-test stx)
-  (syntax-case stx ()
-    [(_ name term expected) 
-     (with-syntax ([line (syntax-line stx)]
-                   [source (and (path? (syntax-source stx))
-                                (path->relative-string/library (syntax-source stx)))])
-       (syntax (build-test name term (list expected) #t #f line source)))]
-    [(_ name term expected mz?) 
-     (with-syntax ([line (syntax-line stx)]
-                   [source (and (path? (syntax-source stx))
-                                (path->relative-string/library (syntax-source stx)))])
-       (syntax (build-test name term (list expected) mz? #f line source)))]
-    [(_ name term expected mz? around)
-     (with-syntax ([line (syntax-line stx)]
-                   [source (and (path? (syntax-source stx))
-                                (path->relative-string/library (syntax-source stx)))])
-       (syntax (build-test name term (list expected) mz? around line source)))]))
-
-(define-syntax (test/anss stx)
-  (syntax-case stx ()
-    [(_ name term expecteds) 
-     (with-syntax ([line (syntax-line stx)]
-                   [source (and (path? (syntax-source stx))
-                                (path->relative-string/library (syntax-source stx)))])
-       (syntax (build-test name term expecteds #t #f line source)))]))
-
-(define (build-test name term expecteds mz? around line source)
-  (make-test name term expecteds mz? (or around (λ (t) (t)))
-             (cond
-               [(path? source)
-                (let-values ([(base name dir?) (split-path source)])
-                  (path->string name))]
-               [else "<unknown file>"]) 
-             line))
-
-(define (run-test-suite test-suite)
-  (printf "running test suite: ~a\n" (test-suite-name test-suite))
-  (let ([count 0])
-    (for-each (λ (test) 
-                (set! count (+ count 1))
-                (run-test test-suite test))
-              (test-suite-tests test-suite))
-    (printf "ran ~a tests\n" count)))
-
-(define-struct multiple-values (lst) #:transparent)
-
-(define (run-test test-suite test)
-  (let* ([name (test-name test)]
-         [input (test-input test)]
-         [expecteds (test-expecteds test)]
-         [file (test-file test)]
-         [line (test-line test)]
-         [got 
-          ((test-around test)
-           (λ ()
-             (evaluate (test-suite-reductions test-suite)
-                       input
-                       #f)))])
-    (unless (set-same? got expecteds (test-suite-equal? test-suite))
-      (eprintf "line ~a of ~a ~a\n    test: ~s\n     got: ~s\nexpected: ~s\n\n"
-               line
-               file
-               name
-               input
-               (separate-lines got)
-               (separate-lines expecteds)))
-    (when (test-run-mz? test)
-      (let* ([mv-wrap
-              (λ vals
-                (if (= 1 (length vals))
-                    (car vals)
-                    (make-multiple-values vals)))]
-             [mz-got 
-              (with-handlers ([exn? values]) 
-                (call-with-values
-                 (λ () (eval ((test-suite-to-mz test-suite) input)))
-                 mv-wrap))]
-             [expected (car expecteds)]
-             [mz-expected (with-handlers ([exn? values])
-                            (call-with-values
-                             (λ () (eval ((test-suite-to-mz test-suite) expected)))
-                             mv-wrap))])
-        (unless (same-mz? mz-got mz-expected)
-          (parameterize ([print-struct #t])
-            (eprintf "line ~s of ~a ~a\nMZ  test: ~s\n     got: ~s\nexpected: ~s\n\n" 
-                     line
-                     file
-                     name
-                     input 
-                     (if (exn? mz-got) (exn-message mz-got) mz-got)
-                     (if (exn? mz-expected) (exn-message mz-expected) mz-expected))))))))
-
-(define (separate-lines sexps)
-  (cond
-    [(null? sexps) ""]
-    [(null? (cdr sexps)) (car sexps)]
-    [else (apply string-append (map (λ (x) (format "\n~s" x)) sexps))]))
-
-(define (same-mz? mz-got mz-expected)
-  (or (same-mz-single-value? mz-got mz-expected)
-      
-      (and (multiple-values? mz-got)
-           (multiple-values? mz-expected)
-           (andmap same-mz-single-value?
-                   (multiple-values-lst mz-got)
-                   (multiple-values-lst mz-expected)))
-      
-      (and (exn? mz-got) 
-           (exn? mz-expected)
-           (equal? (exn-message mz-got)
-                   (exn-message mz-expected)))
-      
-      (and (exn? mz-got)
-           (regexp? mz-expected)
-           (regexp-match mz-expected (exn-message mz-got)))))
-
-(define (same-mz-single-value? mz-got mz-expected)
-  (or (equal? mz-got mz-expected)
-      (and (procedure? mz-got) 
-           (procedure? mz-expected)
-           (equal? (procedure-arity mz-got)
-                   (procedure-arity  mz-expected)))))
-
-
-(define (-test-suite n a b e? . c) (make-test-suite n a b e? c))
-
-(provide (rename-out [-test test]))
-(provide/contract [rename -test-suite
-                          test-suite
-                          (->* (string?
-                                reduction-relation?
-                                (-> any/c any)
-                                (-> any/c any/c boolean?))
-                               (listof test?)
-                               test-suite?)]
-                  [run-test-suite (-> test-suite? any)])
-
-(provide test-suite-tests
-         test?
-         test-name
-         test-input
-         test-expecteds
-         test-file
-         test-line
-         test/anss
-         
-         evaluate
-         exn:fail:duplicate?
-         set-same?)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/examples.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/examples.rkt
deleted file mode 100644
index 17e06621d9..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/examples.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang racket
-
-(require (only-in "reduction.rkt" -> load)
-         (only-in "verification.rkt" bytecode-ok?)
-         (only-in "model-impl.rkt" compile-bytecode impl->model)
-         redex
-         rackunit)
-
-;; eval: e ((x e) ...) -> (listof result)
-;; Evaluates a bytecode program.
-;; result ::= v | closure | stuck
-(define (eval expr [cycles '()])
-  (map (match-lambda
-         [`((clos ,_) ,_ ,_ ,_ ()) (closure)]
-         [`(,v ,_ ,_ ,_ ()) v]
-         [`(,_ ,_ ,_ ,_ (,_ ,_ ...)) (stuck)]
-         ['error (error)])
-       (let ([seen (make-hash)]
-             [finals '()])
-         (let loop ([state (program expr cycles)])
-           (unless (hash-ref seen state #f)
-             (hash-set! seen state #t)
-             (let ([succs (apply-reduction-relation -> state)])
-               (if (null? succs)
-                   (set! finals (cons state finals))
-                   (map loop succs)))))
-         finals)))
-
-(define (program expr cycles)
-  (term (load ,expr ,cycles)))
-
-(struct closure () #:transparent)
-(struct stuck () #:transparent)
-(struct error () #:transparent)
-
-(check-equal? (eval '(application (proc-const (val) (loc 0)) 'y))
-              '('y))
-(check-equal? (eval '(application (indirect x) 'y) '((x (proc-const (val) (loc 0)))))
-              '('y))
-(check-equal? (eval '(proc-const (val) (loc 0)))
-              (list (closure)))
-(check-equal? (eval '(application (proc-const (val) (loc 0))))
-              (list (error)))
-(define bug-#3
-  '(let-one (proc-const (val) (loc 0)) 
-            (application 
-             (loc-noclr 1) 
-             (install-value 1 (proc-const (val) 'x) 
-                            'y))))
-(let ([sorted (λ (xs) (sort xs string<=? #:key (curry format "~s")))])
-  (check-pred (negate bytecode-ok?) bug-#3)
-  (check-equal? (sorted (eval bug-#3)) '('x 'y)))
-
-(define (trace expr [cycles '()])
-  (traces -> (program expr cycles)))
-(define (step expr [cycles '()])
-  (stepper -> (program expr cycles)))
-
-(when (let ([pop-ups? #t])
-        (command-line
-         #:once-any
-         ["--no-pop-ups"
-          "Avoid opening the `traces' and `stepper' windows"
-          (set! pop-ups? #f)])
-        pop-ups?)
-  (trace bug-#3)
-  (step bug-#3))
-
-;; racket->bytecode: syntax -> (e ((x e) ...))
-;; Compiles a Racket expression into bytecode.
-(define racket->bytecode
-  (compose impl->model compile-bytecode))
-
-(define a-racket-program
-  #'(let ([cons (λ (x y) (λ (s) (s x y)))]
-          [car (λ (p) (p (λ (x y) x)))]
-          [cdr (λ (p) (p (λ (x y) y)))]
-          [null #f]
-          [null? (λ (x) (if x #f #t))])
-      (letrec ([find (lambda (it? xs)
-                       (if (null? xs)
-                           #f
-                           (let ([x (car xs)])
-                             (if (it? x)
-                                 x
-                                 (find it? (cdr xs))))))])
-        (find (λ (x) x) (cons #f (cons #f (cons 1 (cons 2 null))))))))
-
-;; If this test fails, it's probably because the compiler has changed
-;; and no longer maps this program into the subset supported in the
-;; model. Try the version bundled with Redex (see the README).
-(match-let ([(cons expr cycles) (racket->bytecode a-racket-program)])
-  (check-equal? (eval expr cycles) '(1)))
-
-;; Test mode: no windows:
-(module test racket/base
-  (require syntax/location)
-  (parameterize ([current-command-line-arguments (vector "--no-pop-ups")])
-    (dynamic-require (quote-module-path "..") #f)))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/grammar.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/grammar.rkt
deleted file mode 100644
index 53bd3b2298..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/grammar.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics)
-
-(define-language bytecode
-  (e (loc n)
-     (loc-noclr n)
-     (loc-clr n)
-     (loc-box n)
-     (loc-box-noclr n)
-     (loc-box-clr n)
-     
-     (let-one e e)
-     (let-void n e)
-     (let-void-box n e)
-     
-     (boxenv n e)
-     (install-value n e e)
-     (install-value-box n e e)
-     
-     (application e e ...)
-     (seq e e e ...)
-     (branch e e e)
-     (let-rec (l ...) e)
-     (indirect x)
-     (proc-const (τ ...) e)
-     (case-lam l ...)
-     l
-     v)
-  
-  (l (lam (τ ...) (n ...) e))
-  
-  (v number
-     void
-     'variable
-     b)
-  
-  (τ val ref)
-  (n natural)
-  (b #t #f)
-  ((x y) variable))
-
-(provide bytecode)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/impl-eval.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/impl-eval.rkt
deleted file mode 100644
index 5538ed9fd5..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/impl-eval.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang racket
-
-(require racket/serialize
-         racket/runtime-path
-         compiler/zo-marshal)
-
-(provide (all-defined-out))
-
-(serializable-struct impl-timeout ())
-(serializable-struct impl-rejected ())
-(serializable-struct impl-exception (value))
-(serializable-struct impl-answer (value))
-(serializable-struct impl-clos-val ())
-(serializable-struct impl-undefined-val ())
-
-(define (eval-impl expr timeout)
-  (let* ([p (zo-marshal expr)]
-         [c (make-channel)]
-         [t (thread
-             (λ ()
-               (parameterize ([read-accept-compiled #t])
-                 (channel-put c (with-handlers ([exn:fail? values])
-                                  (let ([val (eval (read (open-input-bytes p)))])
-                                    (impl-answer
-                                     (cond [(procedure? val) (impl-clos-val)]
-                                           [(eq? (letrec ([x x]) x) val) (impl-undefined-val)]
-                                           [else val]))))))))])
-    
-    (match (sync/timeout timeout c)
-      [(and (? exn:fail?) (exn (regexp #rx"ill-formed code") _))
-       (impl-rejected)]
-      [(exn msg _) (impl-exception msg)]
-      [#f (begin (kill-thread t) (impl-timeout))]
-      [x x])))
-
-(define-runtime-path impl-exec-path "impl-exec.rkt")
-
-(define (eval-impl-external expr timeout)
-  (let-values ([(in-in in-out) (make-pipe)]
-               [(out-in out-out) (make-pipe)])
-    (parameterize ([current-input-port in-in]
-                   [current-output-port out-out])
-      (write timeout in-out)
-      (write (serialize expr) in-out)
-      (if (system (format "racket -X ~a ~a"
-                          (find-executable-path 
-                           (find-system-path 'exec-file)
-                           (find-system-path 'collects-dir))
-                          impl-exec-path))
-          (deserialize (read out-in))
-          (error 'eval-impl-external "failed to evaluate ~a" expr)))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/impl-exec.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/impl-exec.rkt
deleted file mode 100644
index 006cd4d1fb..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/impl-exec.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket
-
-(require racket/serialize
-         "impl-eval.rkt")
-
-(define timeout (read))
-(define bytecode (deserialize (read)))
-
-(write (serialize (eval-impl bytecode timeout)))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/model-impl.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/model-impl.rkt
deleted file mode 100644
index 904d5b178f..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/model-impl.rkt
+++ /dev/null
@@ -1,211 +0,0 @@
-#lang racket
-
-(require compiler/zo-parse
-         compiler/zo-marshal
-         "impl-eval.rkt")
-
-(provide (all-defined-out)
-         (all-from-out "impl-eval.rkt"))
-
-(define (compile-bytecode expr)
-  (let ([tmp (make-temporary-file)])
-    (call-with-output-file tmp #:exists 'truncate
-      (λ (p) 
-        (parameterize ([current-namespace (make-base-namespace)])
-          (write (compile expr) p))))
-    (begin0
-      (call-with-input-file tmp zo-parse)
-      (delete-file tmp))))
-
-(define (impl->model expr)
-  (define cycled (cycle-points expr))
-  (define text-addr (make-hasheq))
-  (define next-loc
-    (let ([suffix 0])
-      (λ ()
-        (set! suffix (add1 suffix))
-        (string->symbol (format "x~s" suffix)))))
-  (define text-seg '())
-  (cons 
-   (let recur ([e expr])
-     (match e
-       [(compilation-top _ _ e)
-        (recur e)]
-       [(localref #f n #f #t #f)
-        `(loc ,n)]
-       [(localref #f n #t _ #f)
-        `(loc-clr ,n)]
-       [(localref #f n #f #f #f)
-        `(loc-noclr ,n)]
-       [(localref #t n #f #t #f)
-        `(loc-box ,n)]
-       [(localref #t n #t _ #f)
-        `(loc-box-clr ,n)]
-       [(localref #t n #f #f #f)
-        `(loc-box-noclr ,n)]
-       [(let-one r b #f #f)
-        `(let-one ,(recur r) ,(recur b))]
-       [(let-void n #f b)
-        `(let-void ,n ,(recur b))]
-       [(let-void n #t b)
-        `(let-void-box ,n ,(recur b))]
-       [(install-value 1 n #f r b)
-        `(install-value ,n ,(recur r) ,(recur b))]
-       [(install-value 1 n #t r b)
-        `(install-value-box ,n ,(recur r) ,(recur b))]
-       [(boxenv n b)
-        `(boxenv ,n ,(recur b))]
-       [(application f as)
-        `(application ,(recur f) ,@(map recur as))]
-       [(seq es)
-        `(seq ,@(map recur es))]
-       [(branch c t e)
-        `(branch ,(recur c) ,(recur t) ,(recur e))]
-       [(let-rec rs b)
-        `(let-rec ,(map recur rs) ,(recur b))]
-       [(lam _ _ _ τs #f ns `(val/ref ...) _ _ b)
-        `(lam ,τs ,(vector->list ns) ,(recur b))]
-       [(closure l _)
-        (define (model-rep)
-          (match-let ([`(lam ,τs () ,b) (recur l)])
-            `(proc-const ,τs ,b)))
-        (if (hash-ref cycled e #f)
-            `(indirect ,(let ([x (hash-ref text-addr e #f)])
-                          (or x
-                              (let ([x (next-loc)])
-                                (hash-set! text-addr e x)
-                                (set! text-seg (cons (list x (model-rep)) text-seg))
-                                x))))
-            (model-rep))]
-       [(case-lam _ ls)
-        `(case-lam ,@(map recur ls))]
-       [(? void?) 'void]
-       [(? number?) e]
-       [(? boolean?) e]
-       [(? symbol?) `',e]
-       [_ (error 'impl->model "unrecognized form ~s" e)]))
-   text-seg))
-
-(define (cycle-points expr)
-  (define seen (make-hasheq))
-  (let recur ([e expr])
-    (when (zo? e) ; i.e., not a literal
-      (if (hash-ref seen e #f)
-          (unless (closure? e)
-            (error 'cycle-refs "illegal cycle through ~s" e))
-          (begin
-            (hash-set! seen e #t)
-            (match e
-              [(compilation-top _ _ e)
-               (recur e)]
-              [(localref _ _ _ _ _)
-               (void)]
-              [(let-one r b _ _)
-               (recur r)
-               (recur b)]
-              [(let-void _ _ b)
-               (recur b)]
-              [(install-value _ _ _ r b)
-               (recur r)
-               (recur b)]
-              [(boxenv _ b)
-               (recur b)]
-              [(application f as)
-               (recur f) 
-               (for-each recur as)]
-              [(seq es)
-               (for-each recur es)]
-              [(branch c t e)
-               (recur c)
-               (recur t)
-               (recur e)]
-              [(let-rec rs b)
-               (for-each recur rs) 
-               (recur b)]
-              [(lam _ _ _ _ _ _ _ _ _ b)
-               (recur b)]
-              [(closure l _)
-               (recur l)]
-              [(case-lam _ ls)
-               (for-each recur ls)]
-              [_ (void)])))))
-  seen)
-
-(define (model->impl expr [cycles '()])
-  (let ([cycle-places (make-immutable-hash
-                       (map (match-lambda
-                              [(cons x _) 
-                               (cons x (make-placeholder #f))])
-                            cycles))])
-    (letrec ([recur (λ (e)
-                      (match e
-                        [`(loc ,n) (cons (localref #f n #f #t #f) 0)]
-                        [`(loc-clr ,n) (cons (localref #f n #t #t #f) 0)]
-                        [`(loc-noclr ,n) (cons (localref #f n #f #f #f) 0)]
-                        [`(loc-box ,n) (cons (localref #t n #f #t #f) 0)]
-                        [`(loc-box-clr ,n) (cons (localref #t n #t #t #f) 0)]
-                        [`(loc-box-noclr ,n) (cons (localref #t n #f #f #f) 0)]
-                        [`(let-one ,r ,b)
-                         (match-let ([(cons rr dr) (recur r)]
-                                     [(cons rb db) (recur b)])
-                           (cons (let-one rr rb #f #f)
-                                 (add1 (max dr db))))]
-                        [`(,(and (or 'let-void 'let-void-box) i) ,n ,b)
-                         (match-let ([(cons rb db) (recur b)])
-                           (let ([b? (match i ['let-void #f] ['let-void-box #t])])
-                             (cons (let-void n b? rb) 
-                                   (+ n db))))]
-                        [`(,(and (or 'install-value 'install-value-box) i) ,n ,r ,b)
-                         (match-let ([(cons rr dr) (recur r)]
-                                     [(cons rb db) (recur b)])
-                           (let ([b? (match i ['install-value #f] ['install-value-box #t])])
-                             (cons (install-value 1 n b? rr rb)
-                                   (max dr db))))]
-                        [`(boxenv ,n ,e)
-                         (match-let ([(cons re de) (recur e)])
-                           (cons (boxenv n re) de))]
-                        [`(application ,f . ,as)
-                         (match-let ([`((,rf . ,df) (,ras . ,das) ...)
-                                      (map recur (cons f as))])
-                           (cons (application rf ras)
-                                 (+ (length as) (apply max df das))))]
-                        [`(seq ,e ,es ...)
-                         (match-let ([`((,re . ,de) (,res . ,des) ...)
-                                      (map recur (cons e es))])
-                           (cons (seq (cons re res))
-                                 (apply max de des)))]
-                        [`(branch ,c ,t ,f)
-                         (match-let ([(cons rc dc) (recur c)]
-                                     [(cons rt dt) (recur t)]
-                                     [(cons rf df) (recur f)])
-                           (cons (branch rc rt rf)
-                                 (max dc dt df)))]
-                        [`(let-rec (,rs ...) ,b)
-                         (match-let ([`((,rrs . 0) ...) (map recur rs)]
-                                     [(cons rb db) (recur b)])
-                           (cons (let-rec rrs rb) db))]
-                        [`(lam (,τs ...) (,ns ...) ,b)
-                         (match-let ([(cons rb db) (recur b)])
-                           (cons (lam (gensym) '()
-                                      (length τs) τs #f
-                                      (list->vector ns) (for/list ([_ ns]) 'val/ref)
-                                      #f (+ (length τs) (length ns) db) rb)
-                                 0))]
-                        [`(proc-const (,τs ...) ,b)
-                         (match-let ([(cons re 0) (recur `(lam ,τs () ,b))])
-                           (cons (closure re (gensym)) 0))]
-                        [`(case-lam ,cs ...)
-                         (match-let ([`((,rcs . 0) ...) (map recur cs)])
-                           (cons (case-lam (gensym) rcs) 0))]
-                        [`(indirect ,x)
-                         (cons (hash-ref cycle-places x) 0)]
-                        ['void (cons (void) 0)]
-                        [else (cons e 0)]))])
-      (match-let ([(cons rep-expr dep-expr) (recur expr)])
-        (for-each
-         (match-lambda
-           [(list x e)
-            (placeholder-set! (hash-ref cycle-places x) (car (recur e)))])
-         cycles)
-        (make-reader-graph
-         (compilation-top dep-expr (prefix 0 '() '()) rep-expr))))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/randomized-tests-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/randomized-tests-test.rkt
deleted file mode 100644
index 254a58865f..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/randomized-tests-test.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics "randomized-tests.rkt")
-
-(let ([r (run (term (application (lam (val) () (loc-noclr 0)) 'x)) (term ()) 100)])
-  (test-equal
-   (and (answer? r)
-        (equal? (answer-value r) ''x))
-   #t))
-
-(test-predicate
- cutoff?
- (run (term (let-void 1 (let-rec ((lam () (0) (application (loc-noclr 0)))) (application (loc-noclr 0))))) (term ()) 100))
-
-(test-predicate
- non-conf?
- (run
-  (term
-   (let-one 
-    (lam (val) () (loc-noclr 0))
-    (application
-     (loc-noclr 1)
-     (install-value 1 'non-proc 'x))))
-  (term ())
-  100))
-
-(test-predicate
- stuck?
- (run
-  (term
-   (let-one 
-    'x
-    (let-void 
-     1
-     (let-rec
-      ((lam () (0 1) 
-            (branch (loc-noclr 1)
-                    (boxenv 1 (application (loc-noclr 0)))
-                    'y)))
-      (application (loc-noclr 0))))))
-  (term ())
-  100))
-
-(test-results)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/randomized-tests.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/randomized-tests.rkt
deleted file mode 100644
index b5d426fe39..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/randomized-tests.rkt
+++ /dev/null
@@ -1,345 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics
-         (only-in redex/examples/racket-machine/grammar bytecode)
-         (only-in redex/examples/racket-machine/reduction -> load runtime)
-         (only-in redex/examples/racket-machine/verification bytecode-ok?)
-         redex/examples/racket-machine/model-impl
-         compiler/zo-parse compiler/zo-marshal)
-
-(provide (all-defined-out))
-
-;; Test the internal properties (verifier totality, safety, and confluence)
-;; on acyclic expressions. The verifier's totality is tested implicitly by
-;; treating a "no clauses matched" exception as a test failure.
-(define (test-internal-properties 
-         #:verifier [verified? bytecode-ok?]
-         #:reduction [-> ->]
-         #:prepare [prepare fix]
-         #:steps [steps 100]
-         #:attempts [attempts 5000])
-  (redex-check
-   bytecode e (safe-and-confluent? (term e) (term ()) verified? -> steps)
-   #:prepare prepare
-   #:attempts attempts))
-
-;; Tests the internal properties on cyclic expressions.
-(define (test-internal-properties/cycles
-         #:steps [steps 100]
-         #:attempts [attempts 5000]
-         #:print? [print? #t])
-  (redex-check
-   bytecode (side-condition (e (x_0 (name e_0 (proc-const (τ ...) e_0*))) ...)
-                            (equal? (term (x_0 ...))
-                                    (remove-duplicates (term (x_0 ...)))))
-   (safe-and-confluent? (term e) (term ((x_0 e_0) ...)) bytecode-ok? -> steps)
-   #:attempts attempts
-   #:prepare fix-cyclic
-   #:print? print?))
-
-;; Tests the external properties (the model and implementation agree on
-;; verification and evaluation questions).
-(define (test-external-properties
-         #:prepare [prepare (compose optimize fix)]
-         #:model-verifier [model-verified? bytecode-ok?]
-         #:steps [steps 100]
-         #:timeout [timeout 10]
-         #:attempts [attempts 5000]
-         #:print? [print? #t])
-  (redex-check
-   bytecode e
-   (model-impl-consistent? (term e) '() steps timeout model-verified?)
-   #:prepare prepare
-   #:attempts attempts
-   #:print? print?))
-
-; result = answer | stuck | cutoff | non-conf
-(define-struct cutoff ())
-(define-struct stuck (state))
-(define-struct answer (value))
-(define-struct non-conf (values))
-
-; run: e ((x e) ...) nat -> result
-(define (run e cycles cutoff #:reduction [-> ->])
-  (let ([cache (make-hash)])
-    (let loop ([s (term (load ,e ,cycles))]
-               [c cutoff])
-      (let ([r (hash-ref cache s #f)])
-        (if (and r (>= (car r) c))
-            (cdr r)
-            (begin
-              ; If we see this state again while it's marked pending, 
-              ; it will be with a lesser cutoff, and it will indicate a 
-              ; cycle in the reduction graph. Without pruning, a cycle
-              ; the reduction graph produces a cutoff result; with it
-              ; a cylce produces a pending, which is treated identically.
-              (hash-set! cache s (cons c 'pending))
-              (let ([r
-                     (cond [(term (halted? ,s)) 
-                            (make-answer 
-                             (if (eq? s 'error)
-                                 'error
-                                 (car s)))]
-                           [(zero? c) (make-cutoff)]
-                           [else
-                            (let ([nexts (map (curryr loop (sub1 c)) (apply-reduction-relation -> s))])
-                              (if (null? nexts)
-                                  (make-stuck s)
-                                  (or (findf non-conf? nexts)
-                                      (findf stuck? nexts)
-                                      (let ([answers (filter answer? nexts)])
-                                        (if (null? answers)
-                                            (make-cutoff)
-                                            (let cmp ([others (cdr answers)])
-                                              (if (null? others)
-                                                  (car answers)
-                                                  (if (equal? (answer-value (car answers))
-                                                              (answer-value (car others)))
-                                                      (cmp (cdr others))
-                                                      (make-non-conf 
-                                                       (list (answer-value (car answers))
-                                                             (answer-value (car others))))))))))))])])
-                (begin
-                  (hash-set! cache s (cons c r))
-                  r))))))))
-
-(define (verified/cycles? expr cycles verified?)
-  (and (verified? expr)
-       (andmap (match-lambda [`(,_ ,e) (verified? e)])
-               cycles)))
-
-(define (safe-and-confluent? expr cycles verified? -> steps)
-  (with-handlers ([exn:fail? (λ (_) #f)])
-    (or (not (verified/cycles? expr cycles verified?))
-        (match (run expr cycles steps #:reduction ->)
-          [(cutoff) #t]
-          [(answer _) #t]
-          [(stuck _) #f]
-          [(non-conf _) #f]))))
-
-(define (model-impl-consistent? expr cycles steps timeout model-verified?)
-  (define (equiv-results? m i)
-    (match m
-      ['uninit #f]
-      [`(box ,_) #f]
-      ['undefined (impl-undefined-val? i)]
-      [`(clos ,_) (impl-clos-val? i)]
-      ['void (void? i)]
-      [else (equal? m i)]))
-  (with-handlers ([exn:fail? (λ (_) #f)])
-    (let ([model-verified? (verified/cycles? expr cycles model-verified?)]
-          [impl-result (eval-impl-external (model->impl expr cycles) timeout)])
-      (and 
-       (if model-verified? 
-           (not (impl-rejected? impl-result))
-           (impl-rejected? impl-result))
-       (or (not model-verified?)
-           (match (run expr cycles steps)
-             [(cutoff) #t]
-             [(stuck _) #f]
-             [(non-conf _) #f]
-             [(answer a) (equiv-results?
-                          a
-                          (match impl-result
-                            [(impl-answer v) v]
-                            [(impl-exception _) 'error]))]))))))
-
-;; A reimplementation of the optimizations in the implementation's
-;; bytecode reader
-(define (optimize expr)
-  (define value?
-    (let ([v? (redex-match bytecode v)])
-      (λ (e)
-        (or (v? e)
-            (match e
-              [`(proc-const ,_ ,_) #t]
-              [`(lam ,_ ,_ ,_) #t]
-              [`(case-lam ,_ ...) #t]
-              [else #f])))))
-  (define omittable?
-    (match-lambda
-      [`(loc ,_) #t]
-      [`(loc-noclr ,_) #t]
-      [`(loc-box ,_) #t]
-      [`(loc-box-noclr ,_) #t]
-      [`(proc-const ,_ ,_) #t]
-      [`(lam ,_ ,_ ,_) #t]
-      [`(case-lam ,_ ...) #t]
-      [(? (redex-match bytecode v)) #t]
-      [`(branch ,c ,t ,e)
-       (and (omittable? c)
-            (omittable? t)
-            (omittable? e))]
-      [`(let-one ,r ,b)
-       (and (omittable? r)
-            (omittable? b))]
-      [`(,(or 'let-void 'let-void-box) 
-         ,_ 
-         (,(or 'install-value 'install-value-box) 0 ,r ,b))
-       (and (omittable? r)
-            (omittable? b))]
-      [`(,(or 'let-void 'let-void-box) ,_ ,b)
-       (omittable? b)]
-      [`(let-rec ,_ ,b)
-       (omittable? b)]
-      [`(application void ,es ...)
-       (andmap omittable? es)]
-      [else #f]))
-  (let recur ([e expr])
-    (match e
-      [`(branch ,c ,t ,e)
-       (let ([c* (recur c)])
-         (if (value? c*)
-             (if c* (recur t) (recur e))
-             `(branch ,c* ,(recur t) ,(recur e))))]
-      [`(seq ,es ...)
-       (letrec ([flatten (λ (es)
-                           (foldr (λ (e a)
-                                    (match e
-                                      [`(seq ,es ...)
-                                       (append es a)]
-                                      [else (cons e a)]))
-                                  '() es))]
-                ; preserves tail position
-                [omit (λ (es kept?)
-                        (if (null? es)
-                            '()
-                            (if (and (omittable? (car es))
-                                     (not (null? (cdr es))))
-                                (omit (cdr es) kept?)
-                                (cons (car es) (omit (cdr es) #t)))))])
-         (match (omit (map recur (flatten es)) #f)
-           ['() 'void]
-           [`(,e) e]
-           [es `(seq ,@es)]))]
-      [(? list?) (map recur e)]
-      [else e])))
-
-;; Performs a write-read round trip to see the optimizations performed
-;; by the implementation's bytecode reader
-(define (write-read expr)
-  (let-values ([(in out) (make-pipe)]
-               [(tmp) (make-temporary-file)])
-    (zo-marshal-to expr out)
-    (let ([optimized (parameterize ([read-accept-compiled #t])
-                       (read in))])
-      (call-with-output-file tmp #:exists 'truncate
-        (λ (p) (write optimized p))))
-    (begin0
-      (call-with-input-file tmp zo-parse)
-      (delete-file tmp))))
-
-(define-metafunction runtime
-  halted? : p -> b
-  [(halted? (V S H T ())) #t]
-  [(halted? error) #t]
-  [(halted? (V S H T (i_0 i_1 ...))) #f])
-
-(define random-expr
-  (let ([generator (generate-term bytecode e)])
-    (λ (attempt) 
-      (generator (inexact->exact (round (/ (log attempt) (log 5))))))))
-(define random-value
-  (let ([generator (generate-term bytecode v)])
-    (λ () (generator 3))))
-(define-syntax-rule (ref-or-else n e e*)
-  (if (zero? n) e* e))
-
-(define cycle-targets (make-parameter '()))
-
-;; Makes three classes of corrections:
-;; 1. replaces out-of-bounds stack offsets with random in-bounds 
-;;    ones (without checking that the new target contains an
-;;    appropriate value),
-;; 2. replaces `ref' argument annotations with `val' annotations
-;;    when the procedure appears in a context that does not allow
-;;    `ref' arguments (but does not alter the procedure's body), and
-;; 3. replaces `indirect' targets with ones in the `cycle-targets'
-;;    parameter (and replaces the entire `indirect' expression
-;;    with a random value if `cycle-targets' is empty).
-(define (fix expr)
-  (define (localref? i)
-    (memq i '(loc loc-noclr loc-clr loc-box loc-box-noclr loc-box-clr)))
-  (let recur ([depth 0] [refs? #f] [expr expr])
-    (match expr
-      [`(,(? localref? i) ,n) 
-       (ref-or-else depth `(,i ,(modulo n depth)) (random-value))]
-      
-      [`(let-one ,e1 ,e2)
-       `(let-one ,(recur (add1 depth) #f e1)
-                 ,(recur (add1 depth) #f e2))]
-      [`(,(and (or 'let-void 'let-void-box) i) ,n ,e)
-       `(,i ,n ,(recur (+ depth n) #f e))]
-      
-      [`(boxenv ,n ,e)
-       (let ([e* (recur depth #f e)])
-         (ref-or-else depth `(boxenv ,(modulo n depth) ,e*) e*))]
-      [`(,(and (or 'install-value 'install-value-box) i) ,n ,e1 ,e2)
-       (let ([e1* (recur depth #f e1)]
-             [e2* (recur depth #f e2)])
-         (ref-or-else depth `(,i ,(modulo n depth) ,e1* ,e2*) `(seq ,e1* ,e2*)))]
-      
-      [`(application ,e ,es ...)
-       (let ([m (length es)])
-         `(application
-           ,(recur depth #t e)
-           ,@(map (curry recur (+ depth m) #f) es)))]
-      [`(,(and (or 'branch 'seq) i) ,es ...)
-       `(,i ,@(map (curry recur depth #f) es))]
-      [`(let-rec (,ls ...) ,e)
-       (let ([n (min depth (length ls))]
-             [ls* (map (curry recur depth #f) ls)])
-         `(let-rec ,(map (curry recur depth #f) (take ls* n))
-                   ,(recur depth #f e)))]
-      [`(indirect ,c) 
-       (cond [(memq c (cycle-targets))
-              `(indirect ,c)]
-             [(not (null? (cycle-targets))) 
-              `(indirect ,(list-ref (cycle-targets) (random (length (cycle-targets)))))]
-             [else
-              (random-value)])]
-      [`(proc-const (,τs ...) ,e)
-       (let ([n (length τs)])
-         `(proc-const ,(if refs? τs (build-list n (λ (_) 'val)))
-                      ,(recur n #f e)))]
-      [`(case-lam ,ls ...)
-       `(case-lam ,@(map (curry recur depth #f) ls))]
-      [`(lam (,τs ...) (,ns ...) ,e)
-       (let ([m (length τs)])
-         `(lam ,(if refs? τs (build-list m (λ (_) 'val)))
-               ,(if (zero? depth) 
-                    '()
-                    (map (curryr modulo depth) ns))
-               ,(recur (+ m (if (zero? depth) 0 (length ns))) #f e)))]
-      [(? number?) expr]
-      ['void expr]
-      [`(quote ,_) expr]
-      [(? boolean?) expr])))
-
-(define fix-cyclic
-  (match-lambda
-    [`(,e (,xs ,es) ...)
-     (parameterize ([cycle-targets xs])
-       (cons (fix e) 
-             (map (λ (x e) (list x (fix e)))
-                  xs es)))]))
-
-;; Replaces all `indirect' expressions with random values
-(define no-indirects
-  (match-lambda
-    [`(indirect ,_) (random-value)]
-    [(? list? l) (map no-indirects l)]
-    [e e]))
-
-(define (main)
-  (define-syntax-rule (test t k)
-    (match t
-      [#t k]
-      [(counterexample p)
-       (pretty-print p (current-error-port))
-       (exit 1)]))
-  (test (time (test-internal-properties/cycles #:attempts 4000 #:print? #f))
-        (test (time (test-external-properties #:attempts 250 #:print? #f))
-              (void))))
-
-(module+ main (void (main)))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/reduction-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/reduction-test.rkt
deleted file mode 100644
index 621c0dfc5a..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/reduction-test.rkt
+++ /dev/null
@@ -1,731 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics
-         "reduction.rkt")
-
-;                                                                                             
-;                                                                                             
-;  ;;; ;;;                        ;;;                                ;                        
-;   ;; ;;          ;             ;                           ;                                
-;   ;; ;;   ;;;   ;;;;;   ;;;   ;;;;; ;;  ;; ;; ;;    ;;;;  ;;;;;  ;;;     ;;;  ;; ;;    ;;;; 
-;   ; ; ;  ;   ;   ;     ;   ;   ;     ;   ;  ;;  ;  ;   ;   ;       ;    ;   ;  ;;  ;  ;   ; 
-;   ; ; ;  ;;;;;   ;      ;;;;   ;     ;   ;  ;   ;  ;       ;       ;    ;   ;  ;   ;   ;;;  
-;   ;   ;  ;       ;     ;   ;   ;     ;   ;  ;   ;  ;       ;       ;    ;   ;  ;   ;      ; 
-;   ;   ;  ;       ;   ; ;   ;   ;     ;  ;;  ;   ;  ;   ;   ;   ;   ;    ;   ;  ;   ;  ;   ; 
-;  ;;; ;;;  ;;;;    ;;;   ;;;;; ;;;;;   ;; ;;;;; ;;;  ;;;     ;;;  ;;;;;   ;;;  ;;; ;;; ;;;;  
-;                                                                                             
-;                                                                                             
-;                                                                                             
-;                                                                                             
-
-
-;; heap-ref
-(test-equal (term (heap-ref (box y) ((w 0) (x 1) (y 2) (z 3)))) 2)
-
-;; heap-set
-(test-equal (term (heap-set 7 (box y) ((w 0) (x 1) (y 2) (z 3))))
-            (term ((w 0) (x 1) (y 7) (z 3))))
-
-;; push
-(test-equal (term (push (1 2 3) (4 5 ε)))
-            (term (1 2 3 4 5 ε)))
-
-;; push-uninit
-(test-equal (term (push-uninit 2 (1 2 (3 uninit 4 ε))))
-            (term (uninit uninit 1 2 (3 uninit 4 ε))))
-
-;; stack-ref
-(test-equal (term (stack-ref 1 (1 2 3 (ε)))) 2)
-(test-equal (term (stack-ref 3 (1 2 (3 4 (ε))))) 4)
-
-;; stack-set
-(test-equal (term (stack-set 2 1 (1 uninit uninit 4 ε)))
-            (term (1 2 uninit 4 ε)))
-(test-equal (term (stack-set 4 3 (1 2 (3 uninit 5 ε))))
-            (term (1 2 (3 4 5 ε))))
-
-;; load
-
-(define-syntax test-load
-  (syntax-rules ()
-    [(_ e (e* h t))
-     (test-predicate
-      (redex-match runtime (uninit (((ε))) h t (e*)))
-      (term (load e ())))]))
-
-(test-load
- (proc-const (val ref) 'body)
- ((clos x_1) ((x_1 ((clos 2 () x_2)))) ((x_2 'body))))
-
-(test-load
- (application 
-  (proc-const (val ref) 'body1)
-  (proc-const (val) 'body2))
- ((application (clos x_1) (clos x_2)) 
-  ((x_1 ((clos 2 () x_3)))
-   (x_2 ((clos 1 () x_4))))
-  ((x_3 'body1) (x_4 'body2))))
-
-(test-load
- (seq 
-  (proc-const (val ref) 'body1)
-  (proc-const (val) 'body2))
- ((seq (clos x_1) (clos x_2)) 
-  ((x_1 ((clos 2 () x_3)))
-   (x_2 ((clos 1 () x_4))))
-  ((x_3 'body1) (x_4 'body2))))
-
-(test-load
- (let-rec ((lam () (1) 'body1)
-           (lam (val) (0) 'body2))
-          (lam (val val) (0) 'body3))
- ((let-rec ((lam 0 (1) x_1)
-            (lam 1 (0) x_2))
-           (lam 2 (0) x_3))
-  ()
-  ((x_3 'body3) (x_1 'body1) (x_2 'body2))))
-
-(test-load
- (let-one 
-  (proc-const (val ref) 'body1)
-  (proc-const (val) 'body2))
- ((let-one (clos x_1) (clos x_2)) 
-  ((x_1 ((clos 2 () x_3)))
-   (x_2 ((clos 1 () x_4))))
-  ((x_3 'body1) (x_4 'body2))))
-
-(test-load
- (let-void 0 (proc-const (val ref) 'body))
- ((let-void 0 (clos x_1)) 
-  ((x_1 ((clos 2 () x_2))))
-  ((x_2 'body))))
-
-(test-load
- (boxenv 0 (proc-const (val ref) 'body))
- ((boxenv 0 (clos x_1)) 
-  ((x_1 ((clos 2 () x_2))))
-  ((x_2 'body))))
-
-(test-load
- (install-value 0 
-                (proc-const (val ref) 'body1)
-                (proc-const (val) 'body2))
- ((install-value 0 (clos x_1) (clos x_2)) 
-  ((x_1 ((clos 2 () x_3)))
-   (x_2 ((clos 1 () x_4))))
-  ((x_3 'body1) (x_4 'body2))))
-
-(test-load
- (branch
-  (proc-const (val ref) 'body1)
-  (proc-const (val) 'body2)
-  (proc-const () 'body3))
- ((branch (clos x_1) (clos x_2) (clos x_3)) 
-  ((x_1 ((clos 2 () x_4)))
-   (x_2 ((clos 1 () x_5)))
-   (x_3 ((clos 0 () x_6))))
-  ((x_4 'body1) (x_5 'body2) (x_6 'body3))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (application (loc-noclr 0)))) 'x))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'x))
-  ()
-  ((x_1 (self-app x_1 (loc-noclr 0))))))
-
-(test-load
- (let-void 1 (let-rec ((lam (val) (0) (application (loc-noclr 1) 'x))) 'y))
- ((let-void 1 (let-rec ((lam 1 (0) x_1)) 'y))
-  ()
-  ((x_1 (self-app x_1 (loc-noclr 1) 'x)))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (application (loc-noclr 0) 'x))) 'y))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'y))
-  ()
-  ((x_1 (application (loc-noclr 0) 'x)))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (boxenv 0 (application (loc-box-noclr 0))))) 'x))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'x))
-  ()
-  ((x_1 (boxenv 0 (application (loc-box-noclr 0)))))))
-
-(test-load
- (let-void 1 (let-rec ((lam (val) (0) (application (loc-noclr 0)))) 'x))
- ((let-void 1 (let-rec ((lam 1 (0) x_1)) 'x))
-  ()
-  ((x_1 (application (loc-noclr 0))))))
-
-(test-load
- (let-one 'x (let-void 1 (let-rec ((lam () (1 0) (application (loc-noclr 1)))) 42)))
- ((let-one 'x (let-void 1 (let-rec ((lam 0 (1 0) x_1)) 42)))
-  ()
-  ((x_1 (self-app x_1 (loc-noclr 1))))))
-
-(test-load
- (let-one 'x (let-void 1 (let-rec ((lam () (1) (application (loc-noclr 0)))) 42)))
- ((let-one 'x (let-void 1 (let-rec ((lam 0 (1) x_1)) 42)))
-  ()
-  ((x_1 (application (loc-noclr 0))))))
-
-(test-load
- (let-one 'x (let-void 1 (let-rec ((lam () (1) (application (loc-noclr 0)))) 42)))
- ((let-one 'x (let-void 1 (let-rec ((lam 0 (1) x_1)) 42)))
-  ()
-  ((x_1 (application (loc-noclr 0))))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (lam () (0) (application (loc-noclr 0))))) 'x))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'x))
-  ()
-  ((x_1 (lam 0 (0) x_2))
-   (x_2 (application (loc-noclr 0))))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0 0) (application (loc-noclr 0)))) 'y))
- ((let-void 1 (let-rec ((lam 0 (0 0) x_1)) 'y))
-  ()
-  ((x_1 (application (loc-noclr 0))))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0 0) (application (loc-noclr 1)))) 'y))
- ((let-void 1 (let-rec ((lam 0 (0 0) x_1)) 'y))
-  ()
-  ((x_1 (self-app x_1 (loc-noclr 1))))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (let-one 'x (boxenv 0 (application (loc-noclr 1)))))) 'y))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'y))
-  ()
-  ((x_1 (let-one 'x (boxenv 0 (self-app x_1 (loc-noclr 1))))))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (let-one (application (loc-noclr 1)) 'x))) 'y))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'y))
-  ()
-  ((x_1 (let-one (application (loc-noclr 1)) 'x)))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (application (application (loc-noclr 0))))) 'x))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'x))
-  ()
-  ((x_1 (application (application (loc-noclr 0)))))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (let-rec () (application (loc-noclr 0))))) 'x))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'x))
-  ()
-  ((x_1 (let-rec () (self-app x_1 (loc-noclr 0)))))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (let-void 1 (install-value 1 'x (application (loc-noclr 1)))))) 'y))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'y))
-  ()
-  ((x_1 (let-void 1 (install-value 1 'x (self-app x_1 (loc-noclr 1))))))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (let-void 1 (install-value 1 (application (loc-noclr 1)) 'x)))) 'y))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'y))
-  ()
-  ((x_1 (let-void 1 (install-value 1 (application (loc-noclr 1)) 'x))))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (seq 'x (application (loc-noclr 0))))) 'y))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'y))
-  ()
-  ((x_1 (seq 'x (self-app x_1 (loc-noclr 0)))))))
-
-(test-load
- (let-void 1 (let-rec ((lam () (0) (seq (application (loc-noclr 0)) 'x))) 'y))
- ((let-void 1 (let-rec ((lam 0 (0) x_1)) 'y))
-  ()
-  ((x_1 (seq (application (loc-noclr 0)) 'x)))))
-
-(test-load
- (case-lam (lam (val) () (lam (val) (0) 'x)) (lam (val val) () 'y))
- ((case-lam (lam 1 () x_1) (lam 2 () x_3))
-  ()
-  ((x_1 (lam 1 (0) x_2)) (x_2 'x) (x_3 'y))))
-
-;                                                                 
-;                                                                 
-;  ;;;;;             ;;                         ;                 
-;   ;   ;             ;                 ;                         
-;   ;   ;   ;;;    ;; ; ;;  ;;   ;;;;  ;;;;;  ;;;     ;;;  ;; ;;  
-;   ;   ;  ;   ;  ;  ;;  ;   ;  ;   ;   ;       ;    ;   ;  ;;  ; 
-;   ;;;;   ;;;;;  ;   ;  ;   ;  ;       ;       ;    ;   ;  ;   ; 
-;   ;  ;   ;      ;   ;  ;   ;  ;       ;       ;    ;   ;  ;   ; 
-;   ;   ;  ;      ;   ;  ;  ;;  ;   ;   ;   ;   ;    ;   ;  ;   ; 
-;  ;;;   ;  ;;;;   ;;;;;  ;; ;;  ;;;     ;;;  ;;;;;   ;;;  ;;; ;;;
-;                                                                 
-;                                                                 
-;                                                                 
-;                                                                 
-
-(define step (compose car (curry apply-reduction-relation ->)))
-
-;; application
-(test-->
- ->
- (term (uninit (((ε))) () () ((application 1 2 3))))
- (term (uninit (uninit uninit ((ε))) () () ((reorder (call 2) (1 ?) (2 0) (3 1))))))
-
-;; self-app
-(test-->
- ->
- (term
-  ((clos x)
-   ('a ((clos x) ('b ε)))
-   ((x ((clos 0 ((clos x)) x1))))
-   ((x1 (self-app x1 (loc-noclr 1) 'c)))
-   ((self-app x1 (loc-noclr 1) 'c))))
- (term
-  ((clos x)
-   ('a ((clos x) ('b ε)))
-   ((x ((clos 0 ((clos x)) x1))))
-   ((x1 (self-app x1 (loc-noclr 1) 'c)))
-   ((application (loc-noclr 1) 'c))))
- (term
-  ((clos x)
-   (uninit 'a ((clos x) ('b ε)))
-   ((x ((clos 0 ((clos x)) x1))))
-   ((x1 (self-app x1 (loc-noclr 1) 'c)))
-   ((reorder (self-call x1) ('c 0))))))
-
-;; reorder
-(test-->
- ->
- (term (uninit (((ε))) () () ((reorder (call 1) ('x 0) ((loc-noclr 0) ?)))))
- (term (uninit (((ε))) () () (framepush 'x framepop (set 0)
-                                        framepush (loc-noclr 0) framepop
-                                        (call 1)))))
-(test-->
- ->
- (term (uninit (((ε))) () () ((reorder (call 1) ((loc-noclr 0) ?) ('x 0)))))
- (term (uninit (((ε))) () () ((reorder (call 1) ('x 0) ((loc-noclr 0) ?)))))
- (term (uninit (((ε))) () () (framepush (loc-noclr 0) framepop (set 0)
-                                        framepush 'x framepop
-                                        (swap 0) (call 1)))))
-
-(test-->
- ->
- (term (uninit (((ε))) () ((x 'q)) ((reorder (self-call x) ('x 0) ((loc-noclr 0) 1)))))
- (term (uninit (((ε))) () ((x 'q)) (framepush 'x framepop (set 0)
-                                              framepush (loc-noclr 0) framepop (set 1)
-                                              (self-call x)))))
-(test-->
- ->
- (term (uninit (((ε))) () ((x 'q)) ((reorder (self-call x) ((loc-noclr 0) 1) ('x 0)))))
- (term (uninit (((ε))) () ((x 'q)) ((reorder (self-call x) ('x 0) ((loc-noclr 0) 1)))))
- (term (uninit (((ε))) () ((x 'q)) (framepush (loc-noclr 0) framepop (set 1)
-                                              framepush 'x framepop (set 0)
-                                              (self-call x)))))
-
-(test-equal
- (sort
-  (map
-   car
-   (apply-reduction-relation/tag-with-names
-    ->
-    (term 
-     (uninit
-      (uninit uninit 'a 'b 'c ε)
-      ()
-      ()
-      ((reorder (call 2) ((loc-noclr 0) ?) ((loc-noclr 1) 0) ((loc-noclr 2) 1)))))))
-  string<=?)
- '("finalize-app-not-last" "reorder" "reorder"))
-
-;; swap
-(test-->
- ->
- (term ('z ('a 'b 'c ε) () () ((swap 1))))
- (term ('b ('a 'z 'c ε) () () ())))
-
-;; call
-(test-->
- ->
- (term ((clos x1) ('x 'y 'z ('q ('r ε))) ((x1 ((clos 2 ('w) x2)))) ((x2 'z)) ((call 2))))
- (term ((clos x1) (('w ('x 'y ε))) ((x1 ((clos 2 ('w) x2)))) ((x2 'z)) ('z))))
-
-(test-->
- ->
- (term ((clos x1) 
-        ('x 'y 'z ('q ('r ε)))
-        ((x1 ((clos 1 () x2) (clos 2 ('w) x3) (clos 2 ('w) x4))))
-        ((x2 'a) (x3 'b) (x4 'c))
-        ((call 2))))
- (term ((clos x1)
-        (('w ('x 'y ε)))
-        ((x1 ((clos 1 () x2) (clos 2 ('w) x3) (clos 2 ('w) x4))))
-        ((x2 'a) (x3 'b) (x4 'c))
-        ('b))))
-
-(test-equal
- (caar
-  (apply-reduction-relation*
-   ->
-   (term (load (application (lam (val) () (loc-noclr 0)) (application (lam (val) () (loc-noclr 0)) 'x)) ()))))
- ''x)
-
-;; self-call
-(test-->
- ->
- (term
-  ('c
-   ('d 'b ((clos x) ('c ε)))
-   ((x ((clos 0 ((clos x)) x1))))
-   ((x1 (self-app x1 (loc-noclr 1) 'c)))
-   ((self-call x1))))
- (term
-  ('c
-   (((clos x) ('d ε)))
-   ((x ((clos 0 ((clos x)) x1))))
-   ((x1 (self-app x1 (loc-noclr 1) 'c)))
-   ((self-app x1 (loc-noclr 1) 'c)))))
-
-(test-equal
- (map 
-  car
-  (apply-reduction-relation* 
-   ->
-   (term (load (let-void 1 (let-rec ((lam (val val) (0) 
-                                          (branch (loc-noclr 1)
-                                                  (loc-noclr 2)
-                                                  (application (loc-noclr 2) #t (loc-noclr 3)))))
-                                    (application (loc-noclr 2) #f #t))) ()))))
- '(#f))
-
-;; arity
-(test-equal
- (step (term ((clos x1) ('y 'q ε) ((x1 ((clos 2 ('w) x2)))) ((x2 'z)) ((call 1)))))
- (term error))
-
-(test-->>
- ->
- (term (uninit (((ε))) () ((x 'x)) ((let-one 7 (boxenv 0 (application (lam 0 (1) x) 'y))))))
- (term error))
-
-(test-->
- ->
- (term
-  ((clos x170017)
-   (19 ((ε)))
-   ((x170017
-     ((clos 4 () x170018)))
-    (x170015
-     ((clos 9 () x170016))))
-   ((x170018 (clos x170015))
-    (x170016 void))
-   ((call 1))))
- (term error))
-
-;; non-closure
-(test-equal
- (step (term ('f ('x 'y 'q ε) () () ((call 2)))))
- (term error))
-
-;; localref
-(test-->
- ->
- (term (uninit (1 ε) () () ((loc 0))))
- (term (1 (1 ε) () () ())))
-
-;; loc-box
-(test-->
- ->
- (term (uninit ((box x) ε) ((x 1)) () ((loc-box 0))))
- (term (1 ((box x) ε) ((x 1)) () ())))
-
-;; loc-clr
-(test-equal
- (step (term (uninit (1 ε) () () ((loc-clr 0)))))
- (term (1 (uninit ε) () () ())))
-
-;; loc-box-clr
-(test-equal
- (step (term (uninit ((box x) ε) ((x 1)) () ((loc-box-clr 0)))))
- (term (1 (uninit ε) ((x 1)) () ())))
-
-;; value
-(test-equal
- (step (term (uninit (((ε))) () () (3))))
- (term (3 (((ε))) () () ())))
-
-;; close-lam
-(test-equal
- (step (term (uninit ('x 'y ('z ε)) () ((x 'q)) ((lam 3 (0 2) x)))))
- (term ((clos x1) ('x 'y ('z ε)) ((x1 ((clos 3 ('x 'z) x)))) ((x 'q)) ())))
-
-;; close-case-lam
-(test-equal
- (step (term (uninit ('x 'y ('z ε)) ((x1 'a)) ((x2 'b) (x3 'c)) ((case-lam (lam 3 (0 2) x2) (lam 2 (1 0) x3))))))
- (term ((clos x4) ('x 'y ('z ε)) ((x4 ((clos 3 ('x 'z) x2) (clos 2 ('y 'x) x3))) (x1 'a)) ((x2 'b) (x3 'c)) ())))
-
-;; let-one
-(test-equal
- (step (term (uninit ('x ε) () () ((let-one 'y 'z)))))
- (term (uninit (uninit 'x ε) () () (framepush 'y framepop (set 0) 'z))))
-
-;; framepop
-(test-equal
- (step (term (uninit ('u ('w ('x 'y ('z ε)))) () () (framepop))))
- (term (uninit ('z ε) () () ())))
-
-;; framepush
-(test-equal
- (step (term (7 ('x uninit ('y ε)) () () (framepush))))
- (term (7 (((('x uninit ('y ε))))) () () ())))
-
-;; set
-(test-equal
- (step (term ('z ('x ('y ε)) () () ((set 1)))))
- (term ('z ('x ('z ε)) () () ())))
-
-;; set-box
-(test-equal
- (step (term ('x ((box y) ε) ((y 'z)) () ((set-box 0)))))
- (term ('x ((box y) ε) ((y 'x)) () ())))
-
-;; boxenv
-(test-equal
- (step (term (uninit (9 ε) ((y 8)) () ((boxenv 0 'z)))))
- (term (uninit ((box x) ε) ((x 9) (y 8)) () ('z))))
-
-;; let-void
-(test-equal
- (step (term (uninit ('x 'y ε) () () ((let-void 3 'z)))))
- (term (uninit (uninit uninit uninit 'x 'y ε) () () ('z))))
-
-;; let-void-box
-(test-predicate
- (redex-match
-  runtime
-  (uninit 
-   ((box variable_1) (box variable_2) (box x) ε)
-   ((variable_1 undefined) (variable_2 undefined) (x 'y))
-   ()
-   ('z)))
- (step (term (uninit ((box x) ε) ((x 'y)) () ((let-void-box 2 'z))))))
-
-;; install-value
-(test-->
- ->
- (term (uninit (uninit ε) () () ((install-value 0 'r 'b) 'q)))
- (term (uninit (uninit ε) () () (framepush 'r framepop (set 0) 'b 'q))))
-(test-->
- ->
- (term (uninit (uninit ε) () () ((install-value-box 0 'r 'b) 'q)))
- (term (uninit (uninit ε) () () (framepush 'r framepop (set-box 0) 'b 'q))))
-
-;; seq-many
-(test-equal
- (step (term (uninit (((ε))) () () ((seq 'x 'y 'z) 'w))))
- (term (uninit (((ε))) () () (framepush 'x framepop (seq 'y 'z) 'w))))
-
-;; seq-one
-(test-equal
- (step (term (uninit ((((ε)))) () () ((seq 'x 'y) 'z))))
- (term (uninit ((((ε)))) () () (framepush 'x framepop 'y 'z))))
-
-;; branch
-(let ([test-branch (λ (cond res)
-                     (test-->>
-                      ->
-                      `(uninit 
-                        ('t 'f ε)
-                        ()
-                        ()
-                        ((branch (let-one 'q ,cond)
-                                 (loc 0)
-                                 (loc 1))))
-                      `(',res ('t 'f ε) () () ())))])
-  (test-branch ''not-false 't)
-  (test-branch #f 'f))
-
-;; let-rec
-(test-->
- ->
- (term
-  ('x
-   (uninit uninit (box x1) ε)
-   ((x1 'x))
-   ((x2 'f) (x3 'g))
-   ((let-rec
-     ((lam 1 (1 2) x2)
-      (lam 1 (0 2) x3))
-     (loc-noclr 0)))))
- (term
-  ('x
-   ((clos x4) (clos x5) (box x1) ε)
-   ((x1 'x)
-    (x4 ((clos 1 ((clos x5) (box x1)) x2)))
-    (x5 ((clos 1 ((clos x4) (box x1)) x3))))
-   ((x2 'f) (x3 'g))
-   ((loc-noclr 0)))))
-
-(test-->
- ->
- (term
-  (uninit
-   (uninit ((ε)))
-   ((x1 ((clos 0 () x2))))
-   ((x2 'x) (x3 'y))
-   ((let-rec ((lam 0 (0) x3)) 'z))))
- (term
-  (uninit
-   ((clos x4) ((ε)))
-   ((x1 ((clos 0 () x2))) (x4 ((clos 0 ((clos x4)) x3))))
-   ((x2 'x) (x3 'y))
-   ('z))))
-
-(test-->> 
- ->
- #:cycles-ok
- (term
-  (uninit
-   (((ε)))
-   ()
-   ((x1 (application (loc-noclr 0)))
-    (x2 (application (loc-noclr 0))))
-   ((let-void
-     2
-     (let-rec ((lam 0 (1) x1)
-               (lam 0 (0) x2))
-              (application (loc-noclr 1))))))))
-
-;; indirect
-(test-->> 
- ->
- #:cycles-ok
- (term
-  (uninit
-   (((ε)))
-   ((x1 ((clos 0 () x2))))
-   ((x2 (application (indirect x3)))
-    (x3 (clos x1)))
-   ((application (indirect x3))))))
-
-;; loops
-(test-->>
- ->
- #:cycles-ok
- (term
-  (uninit
-   (((ε)))
-   ()
-   ((x1 (application
-         (loc-noclr 1)
-         (loc-noclr 1)))
-    (x2 (let-one
-         7
-         (application
-          (let-one 8 (loc-noclr 3))
-          (let-one 9 (loc-noclr 3))))))
-   ((application (lam 1 () x1) (lam 1 () x2))))))
-
-(test-->>
- ->
- #:cycles-ok
- (term (load (let-one (indirect x57042) (application (loc-noclr 1) (loc-noclr 1)))
-             ((x57042 (proc-const (val) (application (loc-noclr 1) (loc-noclr 1))))))))
-
-(test-->>
- ->
- #:cycles-ok
- (term (load (let-void 1 (let-rec ((lam () (0) (application (loc-noclr 0)))) (application (loc-noclr 0)))) ())))
-
-; mutable variables
-(test-->>
- ->
- `(uninit (((ε))) () 
-          ()
-          ((let-void
-            1
-            (install-value 0 777 (boxenv 0 (install-value-box 0 888 (loc-box-noclr 0)))))))
- (term (888 ((box x) ((ε))) ((x 888)) () ())))
-
-(test-->>
- ->
- `(uninit (((ε))) () ()
-          ((let-one
-            (let-void
-             1
-             (install-value
-              0
-              'foo
-              (boxenv
-               0
-               (let-one
-                (install-value-box 1 7 void)
-                (seq (loc-clr 0) (let-one (loc-box-noclr 2) (loc-noclr 0)))))))
-            (loc-noclr 0))))
- (term (7 (7 ((ε))) ((x 7)) () ())))
-
-;; locals pushed for seq sub-exprs should be popped
-(test-->>
- ->
- (term (uninit (((ε))) () () ((seq (let-one 1 (loc 0)) (let-one 2 (loc 0)) 3))))
- (term (3 (((ε))) () () ())))
-
-; closure-captured value is above explicit arguments
-(test-equal
- (caar
-  (apply-reduction-relation*
-   ->
-   (term (load (application
-                (let-void
-                 1
-                 (install-value
-                  0
-                  777
-                  (boxenv
-                   0
-                   (lam
-                    (val val val)
-                    (0)
-                    (install-value-box 0 (loc-noclr 3) (loc-box-noclr 0))))))
-                111
-                222
-                333)
-               ()))))
- 333)
-
-;; ref arg
-(test-->>
- ->
- #:cycles-ok
- (term (uninit (((ε))) () ((x1 (loc-box-noclr 0))) ((let-one 'x (boxenv 0 (application (lam 1 () x1) (loc-noclr 1)))))))
- (term ('x ((((box x2) ε))) ((x3 ((clos 1 () x1))) (x2 'x)) ((x1 (loc-box-noclr 0))) ())))
-
-;; case-lam
-(test-equal
- (map
-  car
-  (apply-reduction-relation* 
-   ->
-   (term 
-    (load (application 
-           (let-one 'a 
-                    (let-one 'b
-                             (let-one 'c
-                                      (case-lam (lam () (2) (loc-noclr 0))
-                                                (lam (val) (1) (loc-noclr 0))
-                                                (lam (val) (0) (loc-noclr 0))))))
-           'x)
-          ()))))
- '('b))
-
-(test-equal
- (apply-reduction-relation* 
-  ->
-  (term (load (application (case-lam (lam (val) () 1) (lam (val val) () 2))) ())))
- '(error))
-
-(test-equal
- (apply-reduction-relation* 
-  ->
-  (term (load (application (case-lam)) ())))
- '(error))
-
-(test-results)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/reduction.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/reduction.rkt
deleted file mode 100644
index f1ec5a6444..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/reduction.rkt
+++ /dev/null
@@ -1,436 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics)
-(require "grammar.rkt" "util.rkt")
-
-(define-extended-language runtime bytecode
-  (p (V S H T C) error)
-  
-  (V v uninit (box x))
-  
-  (S (u ... s))
-  (s ε S)
-  (u v uninit (box x))
-  
-  (H ((x h) ...))
-  (h v ((clos n (u ...) x) ...))
-  
-  (T ((x e) ...))
-  
-  (C (i ...))
-  
-  (i e 
-     (swap n) (reorder i (e m) ...)
-     (set n) (set-box n)
-     (branch e e)
-     framepop framepush
-     (call n) (self-call x))
-  
-  (l (lam n (n ...) x))
-  (v .... 
-     undefined
-     (clos x))
-  (e ....
-     (self-app x e e ...))
-  (m n ?))
-
-(define procedure-rules
-  (reduction-relation
-   runtime
-   (--> (V S ((x_0 h_0) ...) T ((lam n (n_0 ...) x_i) i ...))
-        ((clos x) S ((x ((clos n ((stack-ref n_0 S) ...) x_i))) (x_0 h_0) ...) T (i ...))
-        (fresh x)
-        "lam")
-   (--> (V S ((x_0 h_0) ...) T ((case-lam (lam n (n_0 ...) x_j) ...) i ...))
-        ((clos x) S ((x ((clos n ((stack-ref n_0 S) ...) x_j) ...)) (x_0 h_0) ...) T (i ...))
-        (fresh x)
-        "case-lam")
-   (--> (V S ((x_0 h_0) ...) T ((let-rec ((name l_0 (lam n_0 (n_00 ...) y_0)) ...) e) i ...))
-        (V S_* ((x_0 h_0) ... (x ((clos n_0 ((stack-ref n_00 S_*) ...) y_0))) ...) T (e i ...))
-        (fresh ((x ...) (l_0 ...)))
-        (where (n ...) (count-up ,(length (term (l_0 ...)))))
-        (where S_* (stack-set* ((clos x) n) ... S))
-        "let-rec")))
-
-;; hide the 'apply append' in a metafunction 
-(define-metafunction runtime
-  [(flatten ((any ...) ...))
-   (any ... ...)])
-
-(define application-rules
-  (reduction-relation
-   runtime
-   (--> (V S H T ((application e_0 e_1 ...) i ...))
-        (V (push-uninit n S) H T ((reorder (call n) (e_0 ?) (e_1 n_1) ...) i ...))
-        (where n ,(length (term (e_1 ...))))
-        (where (n_1 ...) (count-up n))
-        "application")
-   (--> (V S H T ((self-app x e_0 e_1 ...) i ...))
-        (V S H T ((application e_0 e_1 ...) i ...))
-        "self-app")
-   (--> (V S H T ((self-app x e_0 e_1 ...) i ...))
-        (V (push-uninit n S) H T ((reorder (self-call x) (e_1 n_1) ...) i ...))
-        (where n ,(length (term (e_1 ...))))
-        (where (n_1 ...) (count-up n))
-        "self-app-opt")
-   (--> (V S H T ((reorder i_r (e_0 m_1) ... ((loc-noclr n) m_i) (e_i+1 m_i+1) (e_i+2 m_i+2) ...) i ...))
-        (V S H T ((reorder i_r (e_0 m_1) ... (e_i+1 m_i+1) (e_i+2 m_i+2) ... ((loc-noclr n) m_i)) i ...))
-        "reorder")
-   (--> (V S H T ((reorder (call n) (e_0 n_0) ... (e_n ?)) i ...))
-        (V S H T (,@(term (flatten ((framepush e_0 framepop (set n_0)) ...)))
-                  framepush e_n framepop (call n) i ...))
-        "finalize-app-is-last")
-   (--> (V S H T ((reorder (call n) (e_0 n_0) ... (e_i ?) (e_i+1 n_i+1) ... (e_j n_j)) i ...))
-        (V S H T (,@(term (flatten ((framepush e_0 framepop (set n_0)) ...)))
-                  framepush e_i framepop (set n_j)
-                  ,@(term (flatten ((framepush e_i+1 framepop (set n_i+1)) ...)))
-                  framepush e_j framepop
-                  (swap n_j) (call n) i ...))
-        "finalize-app-not-last")
-   (--> (V S H T ((reorder (self-call x) (e_0 n_0) ...) i ...))
-        (V S H T (,@(term (flatten ((framepush e_0 framepop (set n_0)) ...)))
-                  (self-call x) i ...))
-        "finalize-self-app")
-   (--> ((clos x_i) (u_1 ... u_n+1 ... (u_m ... (u_k ... s))) (name H ((x_0 h_0) ...
-                                                                       (x_i ((clos n_0 (u_0 ...) y_0) ...
-                                                                             (clos n_i (u_i ...) y_i) 
-                                                                             (clos n_i+1 (u_i+1 ...) y_i+1) ...))
-                                                                       (x_i+1 h_i+1) ...)) (name T ((y_j e_j) ... (y_i e_i) (y_k e_k) ...)) ((call n_i) i ...))
-        ((clos x_i) ((u_i ... (u_1 ... s))) H T (e_i i ...))
-        (side-condition (not (memq (term n_i) (term (n_0 ...)))))
-        (side-condition (= (term n_i) (length (term (u_1 ...)))))
-        "call")
-   (--> (V (u_0 ... u_i ... (u_j ... (u_k ... s))) H (name T ((x_0 e_0) ... (x_i e_i) (x_i+1 e_i+1) ...)) ((self-call x_i) i ...))
-        (V ((u_j ... (u_0 ... s))) H T (e_i i ...))
-        (side-condition (= (length (term (u_0 ...))) (length (term (u_k ...)))))
-        "self-call")
-   (--> (v S H T ((call n) i ...))
-        error
-        "non-closure"
-        (side-condition (not (clos? (term v)))))
-   (--> ((clos x_i) 
-         S
-         ((x_0 h_0) ... (x_i ((clos n_0 (u_0 ...) y_0) ...)) (x_i+1 h_i+1) ...)
-         T
-         ((call n) i ...))
-        error
-        (side-condition (not (memq (term n) (term (n_0 ...)))))
-        "app-arity")))
-
-(define stack-ref-rules
-  (reduction-relation
-   runtime
-   (--> (V S H T ((loc n) i ...))
-        ((stack-ref n S) S H T (i ...))
-        "loc")
-   (--> (V S H T ((loc-noclr n) i ...))
-        ((stack-ref n S) S H T (i ...))
-        "loc-noclr")
-   (--> (V S H T ((loc-clr n) i ...))
-        ((stack-ref n S) (stack-set uninit n S) H T (i ...))
-        "loc-clr")
-   
-   (--> (V S H T ((loc-box n) i ...))
-        ((heap-ref (stack-ref n S) H) S H T (i ...))
-        "loc-box")
-   (--> (V S H T ((loc-box-noclr n) i ...))
-        ((heap-ref (stack-ref n S) H) S H T (i ...))
-        "loc-box-noclr")
-   (--> (V S H T ((loc-box-clr n) i ...))
-        ((heap-ref (stack-ref n S) H) (stack-set uninit n S) H T (i ...))
-        "loc-box-clr")))
-
-(define stack-instructions
-  (reduction-relation
-   runtime
-   (--> (V S H T ((set n) i ...))
-        (V (stack-set V n S) H T (i ...))
-        "set")
-   (--> (v S H T ((set-box n) i ...))
-        (v S (heap-set v (stack-ref n S) H) T (i ...))
-        "set-box")
-   (--> (V S H T ((swap n) i ...))
-        ((stack-ref n S) (stack-set V n S) H T (i ...))
-        "swap")
-   (--> (V (u_0 ... (u_1 ... (u_2 ... s))) H T (framepop i ...))
-        (V s H T (i ...))
-        "framepop")
-   (--> (V S H T (framepush i ...))
-        (V (((S))) H T (i ...))
-        "framepush")))
-
-(define stack-change-rules
-  (reduction-relation
-   runtime
-   (--> (V S H T ((install-value n e_r e_b) i ...))
-        (V S H T (framepush e_r framepop (set n) e_b i ...))
-        "install-value")
-   (--> (V S H T ((install-value-box n e_r e_b) i ...))
-        (V S H T (framepush e_r framepop (set-box n) e_b i ...))
-        "install-value-box")
-   (--> (V S ((x_0 h_0) ...) T ((boxenv n e) i ...))
-        (V (stack-set (box x) n S) ((x v) (x_0 h_0) ...) T (e i ...))
-        (fresh x)
-        (where v (stack-ref n S))
-        "boxenv")))
-
-(define stack-push-rules
-  (reduction-relation
-   runtime
-   (--> (V S H T ((let-one e_r e_b) i ...))
-        (V (push-uninit 1 S) H T (framepush e_r framepop (set 0) e_b i ...))
-        "let-one")
-   (--> (V S H T ((let-void n e) i ...))
-        (V (push-uninit n S) H T (e i ...))
-        "let-void")
-   (--> (V S ((x_0 h_0) ...) T ((let-void-box n e) i ...))
-        (V (push ((box x_n) ...) S) ((x_n undefined) ... (x_0 h_0) ...) T (e i ...))
-        (where (x_n ...) (n-freshes n x_0 ... T))
-        "let-void-box")))
-
-(define-metafunction runtime
-  [(n-freshes n x ... T)
-   ,(variables-not-in (term (x ... T)) (build-list (term n) (λ (_) 'x)))])
-
-(define miscellaneous-rules
-  (reduction-relation
-   runtime
-   (--> (V S H T (v i ...))
-        (v S H T (i ...))
-        "value")
-   (--> (V S H T ((branch e_c e_t e_f) i ...))
-        (V S H T (framepush e_c framepop (branch e_t e_f) i ...))
-        "branch")
-   (--> (v S H T ((branch e_t e_f) i ...))
-        (v S H T (e_t i ...))
-        (side-condition (≠ (term v) (term #f)))
-        "branch-true")
-   (--> (#f S H T ((branch e_t e_f) i ...))
-        (#f S H T (e_f i ...))
-        "branch-false")
-   (--> (V S H T ((seq e_1 e_2 e_3 e_4 ...) i ...))
-        (V S H T (framepush e_1 framepop (seq e_2 e_3 e_4 ...) i ...))
-        "seq-many")
-   (--> (V S H T ((seq e_1 e_2) i ...))
-        (V S H T (framepush e_1 framepop e_2 i ...))
-        "seq-two")
-   (--> (V S H (name T ((x_0 e_0) ... (x_i e_i) (x_i+1 e_i+1) ...)) ((indirect x_i) i ...))
-        (V S H T (e_i i ...))
-        "indirect")))
-
-(define ->
-  (union-reduction-relations
-   stack-ref-rules
-   stack-instructions
-   stack-push-rules
-   stack-change-rules
-   procedure-rules
-   application-rules
-   miscellaneous-rules))
-
-(define (≠ a b) (not (equal? a b)))
-
-(define clos? 
-  (redex-match runtime (clos x)))
-
-(define-extended-language loader bytecode
-  (φ - (n n x))
-  (e any)
-  (H any)
-  (h any)
-  (T any)
-  (l any))
-
-(define-metafunction loader
-  [(load e ((x_0 (proc-const (τ ...) e_b)) ...))
-   (uninit (((ε))) H (concat ((x_0 e_0*) ...) T) (e_*))
-   (where ((e_* e_0* ...) H T (y ...))
-          (load’* ((e -) ((proc-const (τ ...) e_b) -) ...)
-                  (x_0 ...)))])
-
-(define-metafunction loader
-  [(incφ - n) -]
-  [(incφ (n_p n_a x) n) (,(+ (term n) (term n_p)) n_a x)])
-
-(define-metafunction loader
-  [(load-lam-rec (lam (τ_0 ...) (n_0 ... n_i n_i+1 ...) e) n_i (y ...))
-   ; When a closure captures itself multiple times, only the last 
-   ; occurrence is considered a self-reference.
-   ((lam n (n_0 ... n_i n_i+1 ...) x) H (concat ((x e_*)) T) (y_* ...))
-   (where n ,(length (term (τ_0 ...))))
-   (where x (fresh-in (y ...)))
-   (where (e_* H T (y_* ...))
-          (load’ e (,(length (term (n_0 ...))) n x) (x y ...)))
-   (side-condition (not (memq (term n_i) (term (n_i+1 ...)))))]
-  [(load-lam-rec l n_j (y ...)) (load’ l - (y ...))])
-
-(define-metafunction loader
-  [(load-lam-rec* () (y ...)) (() () () (y ...))]
-  [(load-lam-rec* ((l_0 n_0) (l_1 n_1) ...) (y ...))
-   ((l_0* l_1* ...) (concat H_0 H_1) (concat T_0 T_1) (y_** ...))
-   (where (l_0* H_0 T_0 (y_* ...))
-          (load-lam-rec l_0 n_0 (y ...)))
-   (where ((l_1* ...) H_1 T_1 (y_** ...))
-          (load-lam-rec* ((l_1 n_1) ...) (y_* ...)))])
-
-(define-metafunction loader
-  [(load’ (application (loc-noclr n) e_1 ...) (n_p n_a x) (y ...))
-   ((self-app x (loc-noclr n) e_1* ...) H T (y_* ...))
-   (side-condition (= (term n) (+ (term n_p) (length (term (e_1 ...))))))
-   (side-condition (= (term n_a) (length (term (e_1 ...)))))
-   (where ((e_1* ...) H T (y_* ...)) (load’* ((e_1 -) ...) (y ...)))]
-  
-  [(load’ (let-rec (l_0 ...) e) φ (y ...))
-   ((let-rec (l_0* ...) e_*)
-    (concat H_0 H_1) (concat T_0 T_1)
-    (y_** ...))
-   (where (e_* H_0 T_0 (y_* ...)) (load’ e φ (y ...)))
-   (where (n_0 ...) (count-up ,(length (term (l_0 ...)))))
-   (where ((l_0* ...) H_1 T_1 (y_** ...)) 
-          (load-lam-rec* ((l_0 n_0) ...) (y_* ...)))]
-  
-  [(load’ (application e_0 e_1 ...) φ (y ...))
-   ((application e_0* e_1* ...) H T (y_* ...))
-   (where ((e_0* e_1* ...) H T (y_* ...))
-          (load’* ((e_0 -) (e_1 -) ...) (y ...)))]
-  
-  [(load’ (let-one e_r e_b) φ (y ...))
-   ((let-one e_r* e_b*) 
-    (concat H_r H_b) (concat T_r T_b)
-    (y_** ...))
-   (where (e_r* H_r T_r (y_* ...)) (load’ e_r - (y ...)))
-   (where (e_b* H_b T_b (y_** ...)) (load’ e_b (incφ φ 1) (y_* ...)))]
-  
-  [(load’ (let-void n e) φ (y ...))
-   ((let-void n e_*) H T (y_* ...))
-   (where (e_* H T (y_* ...)) (load’ e (incφ φ n) (y ...)))]
-  [(load’ (let-void-box n e) φ (y ...))
-   ((let-void-box n e_*) H T (y_* ...))
-   (where (e_* H T (y_* ...)) (load’ e (incφ φ n) (y ...)))]
-  
-  [(load’ (boxenv n e) φ (y ...))
-   ((boxenv n e_*) H T (y_* ...))
-   (where (e_* H T (y_* ...)) (load’ e φ (y ...)))]
-  
-  [(load’ (install-value n e_r e_b) φ (y ...))
-   ((install-value n e_r* e_b*)
-    (concat H_r H_b) (concat T_r T_b)
-    (y_** ...))
-   (where (e_r* H_r T_r (y_* ...)) (load’ e_r - (y ...)))
-   (where (e_b* H_b T_b (y_** ...)) (load’ e_b φ (y_* ...)))]
-  [(load’ (install-value-box n e_r e_b) φ (y ...))
-   ((install-value-box n e_r* e_b*)
-    (concat H_r H_b) (concat T_r T_b)
-    (y_** ...))
-   (where (e_r* H_r T_r (y_* ...)) (load’ e_r - (y ...)))
-   (where (e_b* H_b T_b (y_** ...)) (load’ e_b φ (y_* ...)))]
-  
-  [(load’ (seq e_0 ... e_n) φ (y ...))
-   ((seq e_0* ... e_n*) 
-    (concat H_0 H_1) (concat T_0 T_1)
-    (y_** ...))
-   (where ((e_0* ...) H_0 T_0 (y_* ...)) (load’* ((e_0 -) ...) (y ...)))
-   (where (e_n* H_1 T_1 (y_** ...)) (load’ e_n φ (y_* ...)))]
-  
-  [(load’ (branch e_c e_t e_f) φ (y ...))
-   ((branch e_c* e_t* e_f*)
-    (concat H_c H_t H_f) (concat T_c T_t T_f )
-    (y_*** ...))
-   (where (e_c* H_c T_c (y_* ...)) (load’ e_c - (y ...)))
-   (where (e_t* H_t T_t (y_** ...)) (load’ e_t φ (y_* ...)))
-   (where (e_f* H_f T_f (y_*** ...)) (load’ e_f φ (y_** ...)))]
-  
-  [(load’ (lam (τ_0 ...) (n_0 ...) e) φ (y ...))
-   ((lam n (n_0 ...) x) 
-    H 
-    (concat ((x e_*)) T)
-    (y_* ...))
-   (where x (fresh-in (y ...)))
-   (where n ,(length (term (τ_0 ...))))
-   (where (e_* H T (y_* ...)) (load’ e - (x y ...)))]
-  
-  [(load’ (proc-const (τ_0 ...) e) φ (y ...))
-   ((clos x) 
-    (concat ((x ((clos n () x_*)))) H) 
-    (concat ((x_* e_*)) T)
-    (y_* ...))
-   (where x (fresh-in (y ...)))
-   (where x_* (fresh-in (x y ...)))
-   (where n ,(length (term (τ_0 ...))))
-   (where (e_* H T (y_* ...)) (load’ e - (x x_* y ...)))]
-  
-  [(load’ (case-lam l_0 ...) φ (y ...))
-   ((case-lam l_0* ...) H T (y_* ...))
-   (where ((l_0* ...) H T (y_* ...))
-          (load’* ((l_0 φ) ...) (y ...)))]
-  
-  [(load’ e φ (y ...)) (e () () (y ...))])
-
-(define-metafunction loader
-  [(load’* () (y ...)) (() () () (y ...))]
-  [(load’* ((e_0 φ_0) (e_1 φ_1) ...) (y ...))
-   ((e_0* e_1* ...) 
-    (concat H_0 H_1) (concat T_0 T_1)
-    (y_** ...))
-   (where (e_0* H_0 T_0 (y_* ...)) 
-          (load’ e_0 φ_0 (y ...)))
-   (where ((e_1* ...) H_1 T_1 (y_** ...))
-          (load’* ((e_1 φ_1) ...) (y_* ...)))])
-
-(define-metafunction loader
-  [(fresh-in (x ...))
-   ,(variable-not-in (term (x ...)) 'x)])
-
-(define-metafunction
-  runtime
-  heap-ref : (box x) H -> h
-  [(heap-ref (box x_i) ((x_0 h_0) ... (x_i h_i) (x_i+1 h_i+1) ...)) h_i])
-
-(define-metafunction
-  runtime
-  heap-set : h (box x) H -> H
-  [(heap-set h (box x_i) ((x_0 h_0) ... (x_i h_i) (x_i+1 h_i+1) ...))
-   ((x_0 h_0) ... (x_i h) (x_i+1 h_i+1) ...)])
-
-(define-metafunction
-  runtime
-  push : (u ...) (u ... s) -> (u ... s)
-  [(push (u_0 ...) (u_i ... s))
-   (u_0 ... u_i ... s)])
-
-(define-metafunction
-  runtime
-  push-uninit : n (u ... s) -> (uninit ... u ... s)
-  [(push-uninit 0 S) S]
-  [(push-uninit n (u ... s))
-   (push-uninit ,(- (term n) (term 1)) (uninit u ... s))])
-
-(define-metafunction
-  runtime
-  stack-ref : n S -> u
-  [(stack-ref 0 (v u ... s)) v]
-  [(stack-ref 0 ((box x) u ... s)) (box x)]
-  [(stack-ref n (u_0 u_1 ... s)) 
-   (stack-ref ,(- (term n) (term 1)) (u_1 ... s))
-   (side-condition (> (term n) (term 0)))]
-  [(stack-ref n ((u ... s)))
-   (stack-ref n (u ... s))])
-
-(define-metafunction
-  runtime
-  stack-set : u n S -> S
-  [(stack-set u n (u_0 ... u_n u_n+1 ... s))
-   (u_0 ... u u_n+1 ... s)
-   (side-condition 
-    (= (term n) (length (term (u_0 ...)))))]
-  [(stack-set u n (u_0 ... s))
-   (u_0 ... (stack-set u ,(- (term n) (length (term (u_0 ...)))) s))])
-
-(define-metafunction
-  runtime
-  stack-set* : (u n) ... S -> S
-  [(stack-set* S) S]
-  [(stack-set* (u_0 n_0) (u_1 n_1) ... S)
-   (stack-set* (u_1 n_1) ... (stack-set u_0 n_0 S))])
-
-(provide (all-defined-out))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/util.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/util.rkt
deleted file mode 100644
index 4c008d8b79..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/util.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket
-
-(require "grammar.rkt"
-         redex/reduction-semantics)
-
-(provide (all-defined-out))
-
-(define-language any-L)
-
-(define-metafunction any-L
-  [(count-up number)
-   ,(build-list (term number) (λ (x) x))])
-
-(define-metafunction any-L
-  concat : (any ...) ... -> (any ...)
-  [(concat any ...) ,(apply append (term (any ...)))])
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/verification-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/verification-test.rkt
deleted file mode 100644
index 2155eeaf7b..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/verification-test.rkt
+++ /dev/null
@@ -1,591 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics)
-(require "grammar.rkt" "verification.rkt")
-
-;; trim test cases: just test length-related stuff
-;; the contents of the stack itself may be completely bogus
-(test-equal (term (trim invalid ())) (term invalid))
-(test-equal (term (trim (uninit imm box imm-nc box-nc not) (uninit imm box imm-nc box-nc not)))
-            (term (uninit imm box imm-nc box-nc not)))
-(test-equal (term (trim (uninit imm box imm-nc box-nc not) (imm-nc box-nc not)))
-            (term (imm-nc box-nc not)))
-(test-equal (term (trim (uninit imm box imm-nc box-nc not) ()))
-            (term ()))
-
-;; localrefs
-(test-predicate
- (negate bytecode-ok?)
- '(loc 0))
-
-(test-predicate
- bytecode-ok?
- '(let-one 7 (loc 0)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (loc 1)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (loc-box 0)))
-
-(test-predicate
- bytecode-ok?
- '(let-one 7 (boxenv 0 (loc-box 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (boxenv 0 (loc 0))))
-
-(test-predicate
- bytecode-ok?
- '(let-one (let-one 7 (loc 0)) (loc 0)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one (let-one 7 (loc 0)) (loc 1)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void-box 2 (seq (loc-box-clr 0) (loc-box-clr 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (seq (loc-noclr 0) (loc-clr 0))))
-
-(test-predicate
- bytecode-ok?
- '(let-one 'x (seq (loc-noclr 0) (loc-noclr 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (seq (loc-noclr 0) (loc-noclr 0) (loc-clr 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void-box 1 (seq (loc-box-noclr 0) (loc-box-clr 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void-box 1 (seq (loc-box-noclr 0) (loc-noclr 0) (loc-box-clr 0))))
-
-(test-predicate
- bytecode-ok?
- '(let-void-box 1 (seq (loc-clr 0) 'x)))
-
-(test-predicate
- bytecode-ok?
- '(let-void-box 1 (branch 'q (seq (loc-box-noclr 0) (loc-box-noclr 0)) 'q)))
-
-;; let-one
-(test-predicate
- bytecode-ok?
- '(let-one 'x (loc-noclr 0)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one (loc 0) 'z))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one (install-value 0 'x 'y) 'z))
-
-;; application
-(test-predicate
- bytecode-ok?
- '(application 'w 'x 'y 'z))
-
-(test-predicate
- bytecode-ok?
- '(let-one 7 (application (loc 3) 'x (loc 3) 'z)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (application (loc 0) 'x 'y 'z)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 1 (application (let-one 'x 'y) (loc-noclr 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(application (lam (ref) () 'x) 'y))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (application (lam (ref) () 'y) (loc-noclr 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(application (lam (val val) () 'a) (let-void 2 'b) (install-value 2 'c 'd)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (boxenv 0 (application (lam (ref) () 'y) (loc-box-noclr 1)))))
-
-(test-predicate
- bytecode-ok?
- '(application (lam (ref) () 'x)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (boxenv 0 (application (lam () () 'body) (loc-noclr 0)))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(application
-   (let-one 'x (boxenv 0 (proc-const (val) 'y)))
-   (loc-box-noclr 0)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(application
-   (proc-const (val val) (branch (loc-noclr 0) 'a 'b))
-   'x
-   (install-value 0 'y (boxenv 0 'z))))
-
-; self-app
-(test-predicate
- bytecode-ok?
- '(let-void 1 (let-rec ((lam () (0) (application (loc-noclr 0)))) 'x)))
-
-(test-predicate
- bytecode-ok?
- '(let-void 1 (let-rec ((lam () (0) (seq 'x (application (loc-noclr 0))))) 'y)))
-
-(test-predicate
- bytecode-ok?
- '(let-void 1 (let-rec ((lam () (0) (let-one 'x (boxenv 0 (application (loc-noclr 1)))))) 'y)))
-
-(test-predicate
- bytecode-ok?
- '(let-void 1 (let-rec ((lam () (0) (let-void 1 (install-value 0 'x (application (loc-noclr 0)))))) 'y)))
-
-(test-predicate
- bytecode-ok?
- '(let-void 1 (let-rec ((lam () (0) (branch 'x (application (loc-noclr 0)) (application (loc-noclr 0))))) 'y)))
-
-(test-predicate
- bytecode-ok?
- '(let-void 1 (let-rec ((lam () (0) (let-rec () (application (loc-noclr 0))))) 'y)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 1 (let-rec ((lam () (0) (boxenv 0 (application (loc-noclr 0))))) 'x)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (let-void 1 (let-rec ((lam () (0 1) (seq (loc-clr 1) (application (loc-noclr 0))))) 'y))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (let-rec ((lam () (0) (application (loc-noclr 0)))) 'x)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 
-   1
-   (let-rec ((lam () (0)
-                  (install-value
-                   0
-                   (proc-const () 'x)
-                   (application (loc-noclr 0)))))
-            (application (loc-noclr 0)))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x
-           (let-void 1
-                     (let-rec ((lam (val) (1 0)
-                                    (seq (loc-clr 0)
-                                         (application (loc-noclr 2) 'y))))
-                              (application (loc-noclr 1) 'z)))))
-
-(test-predicate
- bytecode-ok?
- '(let-one 'x
-           (let-void 1
-                     (let-rec ((lam (val) (1 0)
-                                    (application (loc-noclr 2) 'y)))
-                              (application (loc-noclr 1) 'z)))))
-
-(test-predicate
- bytecode-ok?
- '(let-one 'x
-          (let-void 2
-                    (let-rec ((lam () (1 2) (loc-clr 1))
-                              (lam () (0 2) (loc-clr 1)))
-                             'x))))
-
-(test-predicate
- bytecode-ok?
- '(let-void 1 (let-rec ((lam () (0 0) 'x)) 'y)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one (proc-const () void)
-           (let-void 1
-                     (let-rec ((lam () (0 1) 
-                                    (seq (application (loc 1))
-                                         (boxenv 1
-                                                 (application (loc-noclr 0))))))
-                              (application (loc 0))))))
-
-(let ([lr '(let-rec ((lam () (0 1 2) 
-                          (seq (application (loc-box-noclr 1))
-                               (application (loc-noclr 2))
-                               (application (loc-noclr 0)))))
-                    (application (loc 0)))])
-  (test-predicate
-   bytecode-ok?
-   `(let-one 'x (let-one 'y (boxenv 0 (let-void 1 ,lr))))))
-
-; seq
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (boxenv 0 (seq 'x (loc 0)))))
-
-(test-predicate
- bytecode-ok?
- '(let-one 7 (boxenv 0 (seq (loc 0) 'x))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 1 (seq (let-one 'x 'y) (loc-noclr 0))))
-
-;; install-value
-(test-predicate
- bytecode-ok?
- '(let-void 1 (install-value 0 'x (loc 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (install-value 0 'x (loc 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (install-value-box 0 'x 'y)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (install-value 1 'x 'y)))
-
-(test-predicate
- bytecode-ok?
- '(let-one 7 (boxenv 0 (install-value-box 0 'x (loc-box 0)))))
-
-(test-predicate
- bytecode-ok?
- '(let-one
-   'x
-   (install-value-box 0 (boxenv 0 'y) (loc-box 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (boxenv 0 (install-value 0 'x 'y))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void-box 1 (install-value-box 0 (loc-box-clr 0) 'x)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(application (loc-box 0) (install-value-box 0 'x 'y)))
-
-;; let-void
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 2 (application (loc 0) (loc 2))))
-
-(test-predicate
- bytecode-ok?
- '(let-void-box 2 (application (loc-box 1) (loc-box 2))))
-
-;; box-env
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (boxenv 1 'y)))
-
-;; lam
-(test-predicate
- bytecode-ok?
- '(let-one 
-   'x 
-   (let-one 
-    'y
-    (let-one
-     'z
-     (boxenv 
-      2
-      (lam
-       (val val) (0 2)
-       (application 
-        (loc 3)
-        (loc-box 4)
-        (loc 5)
-        (loc 6))))))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (lam () (1) 'n)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(lam () (0) 'n))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 1 (application (lam (val) (0) 'x) 'y)))
-
-;; proc-const
-(test-predicate
- bytecode-ok?
- '(proc-const (val val) (application (loc-noclr 1) (loc-noclr 2))))
-
-;; branch
-(test-predicate
- bytecode-ok?
- '(let-one 'x (branch 'x (loc-noclr 0) (loc-clr 0))))
-
-(test-predicate
- bytecode-ok?
- '(let-one 'x (branch 'y (loc-clr 0) (loc-clr 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (seq (branch 'y 'z (loc-noclr 0)) (loc-clr 0))))
-
-(test-predicate
- bytecode-ok?
- '(let-one 'x (seq (branch 'y (loc-noclr 0) 'z) (loc-clr 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (seq (branch 'y 'z (loc-clr 0)) (loc 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (seq (branch 'y (loc-clr 0) 'z) (loc 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 1 (branch 'w (install-value-box 0 'x 'y) 'z)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 1 (branch 'w 'z (install-value-box 0 'x 'y))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'w (branch 'x (boxenv 0 'y) (loc-clr 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (branch (loc-noclr 0) (loc-noclr 0) (loc-clr 0))))
-
-(test-predicate
- bytecode-ok?
- '(proc-const (val val val)
-              (branch (loc 0)
-                      (branch (loc 1)
-                              (loc-clr 2)
-                              void)
-                      (application (loc 2)))))
-
-(test-predicate
- bytecode-ok?
- '(let-one 'x
-           (branch #f
-                   (let-one (loc-noclr 1) void)
-                   (loc-clr 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(proc-const (val)
-              (seq
-               (branch (loc 0)
-                       (loc-clr 0)
-                       void)
-               (install-value 0 'x void))))
-
-(test-predicate
- bytecode-ok?
- '(proc-const (val)
-              (seq
-               (branch (loc 0)
-                       (let-one 'x
-                                (branch (loc 1)
-                                        (loc-clr 0)
-                                        void))
-                       void)
-               (loc 0))))
-
-(test-predicate
- bytecode-ok?
- '(proc-const (val)
-              (branch (loc 0)
-                      (let-void-box 2
-                                    (branch (loc 2)
-                                            (loc-box-clr 1)
-                                            void))
-                      void)))
-
-(test-predicate
- bytecode-ok?
- '(proc-const (val)
-              (seq
-               (branch (loc 0)
-                       (let-one 'x
-                                (branch (loc 1)
-                                        (let-one 'x (loc-clr 1))
-                                        void))
-                       void)
-               (loc 0))))
-
-; let-rec
-(test-predicate
- bytecode-ok?
- '(let-void 1 (let-rec ((lam () (0) (application (loc-noclr 0)))) (application (loc-noclr 0)))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 0 (let-rec ((lam () (0) (application (loc-noclr 0)))) (application (loc-noclr 0)))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 
-   1
-   (let-rec ((lam (ref) () 'x))
-            'y)))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 1 (branch #f (let-rec ((lam () (0) 'x)) 'y) (loc-noclr 0))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void 1 (let-rec ((lam () () 'x)) 'y)))
-
-;; ignored? properly maintained
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (boxenv 0 (seq (application (loc 0)) 'x))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (boxenv 0 (seq (application 'w (loc 0)) 'x))))
-
-(test-predicate
- bytecode-ok?
- '(seq (let-void-box 1 (install-value-box 0 'x (loc 0))) 'y))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 7 (boxenv 0 (seq (install-value 0 (loc 0) 'x) 'y))))
-
-(test-predicate
- bytecode-ok?
- '(seq (let-one 'x (boxenv 0 (loc 0))) 'y))
-
-(test-predicate
- bytecode-ok?
- '(let-one 'x (boxenv 0 (seq (let-one 'y (loc 0)) 'z))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (boxenv 0 (seq (let-one (loc 0) 'y) 'z))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void-box 1 (seq (branch (loc 0) 'x 'y) 'z)))
-
-(test-predicate
- bytecode-ok?
- '(let-void-box 1 (seq (branch 'x (loc 0) (loc 0)) 'y)))
-
-(test-predicate
- bytecode-ok?
- '(let-one 'x (boxenv 0 (seq (let-void 1 (let-rec ((lam () (0) 'y)) (loc-noclr 0))) 'z))))
-
-;; ref args
-(test-predicate
- bytecode-ok?
- '(let-one 'x (boxenv 0 (application (lam (ref) () (loc-box-noclr 0)) (loc-noclr 1)))))
-
-(test-predicate
- bytecode-ok?
- '(let-one 'x (boxenv 0 (application (proc-const (ref) (loc-box-noclr 0)) (loc-noclr 1)))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (boxenv 0 (application (lam (ref) () (loc-box-noclr 0)) (loc-noclr 0)))))
-
-(test-predicate
- bytecode-ok?
- '(let-one 
-   'x
-   (boxenv
-    0
-    (application
-     (lam (ref val) () 'y)
-     (loc-noclr 2)
-     (loc-box-noclr 2)))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 
-   'x
-   (boxenv
-    0
-    (application
-     (lam (ref val) () 'y)
-     (loc-clr 2)
-     (loc-box-noclr 2)))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 
-   'x
-   (boxenv
-    0
-    (application
-     (lam (ref ref) () 'y)
-     (loc-clr 2)
-     (loc-noclr 2)))))
-
-(test-predicate 
- (negate bytecode-ok?)
- '(lam (val ref) () 'y))
-
-; case-lam
-(test-predicate bytecode-ok? '(case-lam))
-
-(test-predicate
- bytecode-ok?
- '(let-one 'x (case-lam (lam (val) () 'y) (lam () (0) 'z))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (case-lam (lam (val) () 'y) (lam () (1) 'z))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 'x (case-lam (lam (val) () (loc-noclr 34)))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-void-box 1 (application (case-lam (lam (ref) () (loc-box-noclr 0))) (loc-noclr 1))))
-
-(test-predicate
- (negate bytecode-ok?)
- '(let-one 42
-           (boxenv 0
-                   (application
-                    (case-lam (lam (ref) () (loc-box 0)))
-                    (loc-box 1)))))
-
-; literals
-(test-predicate bytecode-ok? #t)
-
-(test-results)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/verification.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/verification.rkt
deleted file mode 100644
index 0e890b6acc..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/verification.rkt
+++ /dev/null
@@ -1,363 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics)
-(require redex/examples/racket-machine/grammar 
-         redex/examples/racket-machine/util)
-
-(define (bytecode-ok? e)
-  (not (eq? 'invalid (car (term (verify ,e () 0 #f () () ∅))))))
-
-(define-extended-language verification 
-  bytecode
-  (s (ṽ ...) invalid)
-  (ṽ uninit imm box imm-nc box-nc not)
-  (γ ((n ṽ) ...))
-  (η (n ...))
-  (f (n n (ṽ ...)) ∅)
-  (m n ?))
-
-(define-metafunction verification
-  verify : e s n b γ η f -> (s γ η)
-  
-  ; localrefs
-  [(verify (loc n) (ṽ_0 ... ṽ_n ṽ_n+1 ...) n_l #f γ η f)
-   ((ṽ_0 ... ṽ_n ṽ_n+1 ...) γ η)
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))
-   (side-condition (memq (term ṽ_n) '(imm imm-nc)))]
-  [(verify (loc n) (ṽ_0 ... ṽ_n ṽ_n+1 ...) n_l #t γ η f)
-   ((ṽ_0 ... ṽ_n ṽ_n+1 ...) γ η)
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))
-   (side-condition (memq (term ṽ_n) '(imm imm-nc box box-nc)))]
-  [(verify (loc-box n) (ṽ_0 ... ṽ_n ṽ_n+1 ...) n_l b γ η f)
-   ((ṽ_0 ... ṽ_n ṽ_n+1 ...) γ η)
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))
-   (side-condition (memq (term ṽ_n) '(box box-nc)))]
-  
-  [(verify (loc-noclr n) (ṽ_0 ... ṽ_n ṽ_n+1 ...) n_l #f γ η f) 
-   ((ṽ_0 ... (nc ṽ_n) ṽ_n+1 ...) γ (log-noclr n n_l ṽ_n η))
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))
-   (side-condition (memq (term ṽ_n) '(imm imm-nc)))]
-  [(verify (loc-noclr n) (ṽ_0 ... ṽ_n ṽ_n+1 ...) n_l #t γ η f) 
-   ((ṽ_0 ... (nc ṽ_n) ṽ_n+1 ...) γ (log-noclr n n_l ṽ_n η))
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))
-   (side-condition (memq (term ṽ_n) '(imm imm-nc box box-nc)))]
-  [(verify (loc-box-noclr n) (ṽ_0 ... ṽ_n ṽ_n+1 ...) n_l b γ η f) 
-   ((ṽ_0 ... box-nc ṽ_n+1 ...) γ (log-noclr n n_l ṽ_n η))
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))
-   (side-condition (memq (term ṽ_n) '(box box-nc)))]
-  
-  [(verify (loc-clr n) (name s (ṽ_0 ... imm ṽ_n+1 ...)) n_l #f γ η f)
-   ((ṽ_0 ... not ṽ_n+1 ...) (log-clr n s n_l γ) η)
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))]
-  [(verify (loc-clr n) (name s (ṽ_0 ... ṽ_n ṽ_n+1 ...)) n_l #t γ η f)
-   ((ṽ_0 ... not ṽ_n+1 ...) (log-clr n s n_l γ) η)
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))
-   (side-condition (memq (term ṽ_n) '(imm box)))]
-  [(verify (loc-box-clr n) (name s (ṽ_0 ... box ṽ_n+1 ...)) n_l b γ η f) 
-   ((ṽ_0 ... not ṽ_n+1 ...) (log-clr n s n_l γ) η)
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))]
-  
-  ; branch
-  [(verify (branch e_c e_t e_e) s n_l b γ η f)
-   ((redo-clrs γ_2 (trim s_3 s)) (concat γ_2 γ_3) η_3)
-   (where (s_1 γ_1 η_1) (verify e_c s n_l #f γ η ∅))
-   (where (s_2 γ_2 η_2) (verify e_t (trim s_1 s) 0 b () () f))
-   (where (s_3 γ_3 η_3) (verify e_e (undo-noclrs η_2 (undo-clrs γ_2 (trim s_2 s))) 0 b γ_1 η_1 f))]
-  
-  ; let-one
-  [(verify (let-one e_r e_b) (ṽ_1 ...) n_l b γ η f)
-   (verify e_b (imm ṽ_1* ...) ,(+ (term n_l) (term 1)) b γ_1 η_1 
-           (shift 1 f))
-   (where s_0 (uninit ṽ_1 ...))
-   (where (s_1 γ_1 η_1) (verify e_r s_0 ,(add1 (term n_l)) #f γ η ∅))
-   (where (uninit ṽ_1* ...) (trim s_1 s_0))]
-  
-  ; seq
-  [(verify (seq e_0 ... e_n) s n_l b γ η f)
-   (verify e_n s_1 n_l b γ_1 η_1 f)
-   (where (s_1 γ_1 η_1) (verify* (e_0 ...) s n_l #t γ η))]
-  
-  ; application
-  [(verify (application (name e_0 (loc-noclr n)) e_1 ...) s n_l b_i γ η (n_f n_s (ṽ ...)))
-   (verify-self-app (application e_0 e_1 ...) s n_l γ η (n_f n_s (ṽ ...)))
-   (side-condition (= (term n) (+ (term n_f) (length (term (e_1 ...))))))]
-  [(verify (application (lam (τ_0 ...) (n_0 ...) e) e_0 ...) (name s (ṽ_0 ...)) n_l b γ η f)
-   (verify*-ref (e_0 ...) (τ_0 ...) s_1 n_l* γ η)
-   (where n ,(length (term (e_0 ...))))
-   (where n_l* ,(+ (term n) (term n_l)))
-   (where s_1 (abs-push n not s))
-   (side-condition (term (lam-verified? (lam (τ_0 ...) (n_0 ...) e) s_1 ?)))]
-  [(verify (application (proc-const (τ_0 ...) e) e_0 ...) s n_l b γ η f)
-   (verify (application (lam (τ_0 ...) () e) e_0 ...) s n_l b γ η f)]
-  [(verify (application e_0 e_1 ...) (name s (ṽ_0 ...)) n_l b γ η f)
-   (verify* (e_0 e_1 ...) (abs-push n not s) n_l* #f γ η)
-   (where n ,(length (term (e_1 ...))))
-   (where n_l* ,(+ (term n) (term n_l)))]
-  
-  ; let-void
-  [(verify (let-void n e) (name s (ṽ_0 ...)) n_l b_i γ η f)
-   (verify e (abs-push n uninit s) ,(+ (term n) (term n_l)) 
-           b_i γ η (shift n f))]
-  [(verify (let-void-box n e) (name s (ṽ_0 ...)) n_l b_i γ η f)
-   (verify e (abs-push n box s) ,(+ (term n) (term n_l))
-           b_i γ η (shift n f))]
-  
-  ; procedures in arbitrary context
-  [(verify (lam ((name τ val) ...) (n_0 ...) e) s n_l b γ η f)
-   (s γ η)
-   (side-condition (term (lam-verified? (lam (τ ...) (n_0 ...) e) s ?)))]
-  [(verify (proc-const ((name τ val) ...) e) s n_l b γ η f)
-   (verify (lam (τ ...) () e) s n_l b γ η f)]
-  
-  ; case-lam
-  [(verify (case-lam (name l (lam (val ...) (n ...) e)) ...) s n_l b γ η f)
-   (s γ η)
-   (side-condition (term (AND (lam-verified? l s ?) ...)))]
-  
-  ; literals
-  [(verify number s n_l b γ η f) (s γ η)]
-  [(verify b s n_l b_i γ η f) (s γ η)]
-  [(verify (quote variable) s n_l b γ η f) (s γ η)]
-  [(verify void s n_l b γ η f) (s γ η)]
-  
-  ; install-value
-  [(verify (install-value n e_r e_b) s n_l b γ η f)
-   (verify e_b (set imm n s_2) n_l b γ η f)
-   (side-condition (< (term n) (term n_l)))
-   (where (s_1 γ_1 η_1) (verify e_r s n_l #f γ η ∅))
-   (where s_2 (trim s_1 s))
-   (side-condition (term (valid? s_2)))
-   (where uninit (stack-ref n s_2))]
-  [(verify (install-value-box n e_r e_b) (name s (ṽ_0 ...)) n_l b γ η f)
-   (verify e_b s_2 n_l b γ_1 η_1 f)
-   (side-condition (< (term n) (length (term s))))
-   (where (s_1 γ_1 η_1) (verify e_r s n_l #f γ η ∅))
-   (where s_2 (trim s_1 s))
-   (side-condition (term (valid? s_2)))
-   (side-condition (memq (term (stack-ref n s_2)) '(box box-nc)))]
-  
-  ; boxenv
-  [(verify (boxenv n_p e) (ṽ_0 ... imm ṽ_n+1 ...) n_l b γ η f)
-   (verify e (ṽ_0 ... box ṽ_n+1 ...) n_l b γ η f)
-   (side-condition (= (length (term (ṽ_0 ...))) (term n_p)))
-   (side-condition (< (term n_p) (term n_l)))]
-  
-  ; let-rec
-  [(verify (let-rec ((name l (lam ((name v val) ...) (n_0 n_1 ...) e_0)) ...) e) (ṽ_0 ... ṽ_n ...) n_l b γ η f)
-   (verify e s_1 n_l b γ η f)
-   (where n ,(length (term (l ...))))
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))
-   (side-condition (term (AND (same? ṽ_0 uninit) ...)))
-   (side-condition (<= (term n) (term n_l)))
-   (where s_1 (abs-push n imm (ṽ_n ...)))
-   (where (n_i ...) (count-up ,(length (term (l ...)))))
-   (side-condition (term (AND (lam-verified? l s_1 n_i) ...)))]
-  
-  ; indirect
-  [(verify (indirect x) s n_l b γ η f) (s γ η)]
-  
-  ; else
-  [(verify e s n_l b γ η f) (invalid γ η)])
-
-(define-metafunction verification
-  verify* : (e ...) s n_l b γ η -> (s γ η)
-  [(verify* () s n_l b γ η) (s γ η)]
-  [(verify* (e_0 e_1 ...) s n_l b γ η)
-   (verify* (e_1 ...) (trim s_1 s) n_l b γ_1 η_1)
-   (where (s_1 γ_1 η_1) (verify e_0 s n_l b γ η ∅))])
-
-(define-metafunction verification
-  verify*-ref : (e ...) (τ ...) s n_l γ η -> (s γ η)
-  [(verify*-ref () () s n_l γ η) (s γ η)]
-  [(verify*-ref (e_0 e_1 ...) (val τ_1 ...) s n_l γ η)
-   (verify*-ref (e_1 ...) (τ_1 ...)
-                (trim s_1 s) n_l γ_1 η_1)
-   (where (s_1 γ_1 η_1) (verify e_0 s n_l #f γ η ∅))]
-  [(verify*-ref (e_0 e_1 ...) () s n_l γ η)
-   (verify* (e_0 e_1 ...) s n_l #f γ η)]
-  [(verify*-ref () (τ_0 τ_1 ...) s n_l γ η) (s γ η)]
-  [(verify*-ref ((loc n) e_1 ...) (ref τ_1 ...) s n_l γ η)
-   (verify*-ref (e_1 ...) (τ_1 ...) s_1 n_l γ_1 η_1)
-   ; Require the reference to load a box.
-   (where (s_1 γ_1 η_1) (verify (loc-box n) s n_l #f γ η ∅))]
-  [(verify*-ref ((loc-noclr n) e_1 ...) (ref τ_1 ...) s n_l γ η)
-   (verify*-ref (e_1 ...) (τ_1 ...) s_1 n_l γ_1 η_1)
-   ; Require the reference to load a box.
-   (where (s_1 γ_1 η_1) (verify (loc-box-noclr n) s n_l #f γ η ∅))]
-  [(verify*-ref ((loc-clr n) e_1 ...) (ref τ_1 ...) s n_l γ η)
-   (verify*-ref (e_1 ...) (τ_1 ...) s_1 n_l γ_1 η_1)
-   ; Require the reference to load a box.
-   (where (s_1 γ_1 η_1) (verify (loc-box-clr n) s n_l #f γ η ∅))]
-  [(verify*-ref (e ...) (τ ...) s n_l γ η) (invalid γ η)])
-
-(define-metafunction verification
-  [(lam-verified? (lam (τ_0 ...) (n_0 ...) e) (name s (ṽ_0 ...)) m)
-   (valid? s_1)
-   (where n_d ,(length (term s)))
-   (where n_d* ,(+ (length (term (τ_0 ...))) (length (term (n_0 ...)))))
-   (side-condition (term (AND (less-than? n_0 n_d) ...)))
-   (side-condition (term (AND (not-member? (stack-ref n_0 s) (uninit not)) ...)))
-   (where (ṽ ...) ((drop-noclr (stack-ref n_0 s)) ...))
-   (where f (extract-self m (n_0 ...) (τ_0 ...) (ṽ ...)))
-   (where (s_1 γ_1 η_1) (verify e (ṽ ... (arg τ_0) ...) n_d* #f () () f))]
-  [(lam-verified? l s m) #f])
-
-(define-metafunction verification
-  [(extract-self ? (n_0 ...) (τ_0 ...) (ṽ_0 ...)) ∅]
-  [(extract-self n_i (n_0 ... n_i n_i+1 ...) (τ_0 ...) (ṽ_0 ...))
-   (,(length (term (n_0 ...))) ,(length (term (τ_0 ...))) (ṽ_0 ...))
-   ; When a closure captures itself multiple times, only the last 
-   ; occurrence is considered a self-reference.
-   (side-condition (term (not-member? n_i (n_i+1 ...))))]
-  [(extract-self n (n_0 ...) (τ_0 ...) (ṽ_0 ...)) ∅])
-
-(define-metafunction verification
-  drop-noclr : ṽ -> ṽ
-  [(drop-noclr imm-nc) imm]
-  [(drop-noclr box-nc) box]
-  [(drop-noclr ṽ) ṽ])
-
-(define-metafunction verification
-  [(verify-self-app (application e_0 e_1 ...) (name s (ṽ_0 ...)) n_l γ η (n_f n_s (ṽ_j ...)))
-   (s_1 γ_1 η_1)
-   (where n ,(length (term (e_1 ...))))
-   (where n_l* ,(+ (term n) (term n_l)))
-   (where (s_1 γ_1 η_1) (verify* (e_0 e_1 ...) (abs-push n not s) n_l* #f γ η))
-   (side-condition (term (valid? s_1)))
-   (where (n_j ...) (count-up ,(length (term (ṽ_j ...)))))
-   (side-condition (term (closure-intact? ((stack-ref (plus n_j n_s) s_1) ...) (ṽ_j ...))))]
-  [(verify-self-app e s n_l γ η f) (invalid γ η)])
-
-(define-metafunction verification
-  closure-intact? : (ṽ ...) (ṽ ...) -> b 
-  [(closure-intact? () ()) #t]
-  [(closure-intact? (imm-nc ṽ_1 ...) (imm ṽ_2 ...))
-   (closure-intact? (ṽ_1 ...) (ṽ_2 ...))]
-  [(closure-intact? (box-nc ṽ_1 ...) (box ṽ_2 ...))
-   (closure-intact? (ṽ_1 ...) (ṽ_2 ...))]
-  [(closure-intact? (ṽ ṽ_1 ...) (ṽ ṽ_2 ...))
-   (closure-intact? (ṽ_1 ...) (ṽ_2 ...))]
-  [(closure-intact? (ṽ_1 ...) (ṽ_2 ...)) #f])
-
-(define-metafunction verification
-  shift : n f -> f
-  [(shift n ∅) ∅]
-  [(shift n (n_f n_s (ṽ ...))) 
-   (,(+ (term n) (term n_f)) ,(+ (term n) (term n_s)) (ṽ ...))])
-
-(define-metafunction verification
-  arg : τ -> ṽ
-  [(arg val) imm]
-  [(arg ref) box])
-
-(define-metafunction verification
-  abs-push : n ṽ (ṽ ...) -> s
-  [(abs-push 0 ṽ (ṽ_0 ...)) (ṽ_0 ...)]
-  [(abs-push n ṽ (ṽ_0 ...))
-   (abs-push ,(sub1 (term n)) ṽ (ṽ ṽ_0 ...))])
-
-(define-metafunction verification
-  stack-ref : n (ṽ ...) -> ṽ
-  [(stack-ref n (ṽ_0 ... ṽ_n ṽ_n+1 ...))
-   ṽ_n
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))])
-
-(define-metafunction verification
-  set : ṽ n (ṽ ...) -> (ṽ ...)
-  [(set ṽ n (ṽ_0 ... ṽ_n ṽ_n+1 ...))
-   (ṽ_0 ... ṽ ṽ_n+1 ...)
-   (side-condition (= (length (term (ṽ_0 ...))) (term n)))])
-
-(define-metafunction verification
-  nc : ṽ -> ṽ
-  [(nc imm) imm-nc]
-  [(nc imm-nc) imm-nc]
-  [(nc box) box-nc]
-  [(nc box-nc) box-nc])
-
-(define-metafunction verification
-  log-noclr : n n ṽ η -> η
-  [(log-noclr n_p n_l ṽ_p (n_0 ...))
-   (,(- (term n_p) (term n_l)) n_0 ...)
-   (side-condition (>= (term n_p) (term n_l)))
-   (side-condition (memq (term ṽ_p) '(imm box)))]
-  [(log-noclr n_p n_l ṽ_p η) η])
-
-(define-metafunction verification
-  undo-noclrs : η s -> s
-  [(undo-noclrs η invalid) invalid]
-  [(undo-noclrs () s) s]
-  [(undo-noclrs (n_0 n_1 ...) (ṽ_0 ... imm-nc ṽ_i ...))
-   (undo-noclrs (n_1 ...) (ṽ_0 ... imm ṽ_i ...))
-   (side-condition (= (length (term (ṽ_0 ...))) (term n_0)))]
-  [(undo-noclrs (n_0 n_1 ...) (ṽ_0 ... box-nc ṽ_i ...))
-   (undo-noclrs (n_1 ...) (ṽ_0 ... box ṽ_i ...))
-   (side-condition (= (length (term (ṽ_0 ...))) (term n_0)))]
-  [(undo-noclrs (n_0 n_1 ...) s)
-   (undo-noclrs (n_1 ...) s)])
-
-(define-metafunction verification
-  log-clr : n s n γ -> γ
-  [(log-clr n_p (name s (ṽ_0 ... ṽ_p ṽ_p+1 ...)) n_l ((n_i ṽ_i) ...))
-   ((,(- (- (term n_h) (term n_p)) (term 1)) ṽ_p) (n_i ṽ_i) ...)
-   (where n_h ,(length (term s)))
-   (side-condition (>= (term n_p) (term n_l)))
-   (side-condition (= (length (term (ṽ_0 ...))) (term n_p)))]
-  [(log-clr n_p s n_l γ) γ])
-
-(define-metafunction verification
-  undo-clrs : γ s -> s
-  [(undo-clrs γ invalid) invalid]
-  [(undo-clrs () s) s]
-  [(undo-clrs ((n_0 ṽ_0) (n_1 ṽ_1) ...) s)
-   (undo-clrs ((n_1 ṽ_1) ...) (set ṽ_0 ,(- (- (term n_h) (term n_0)) (term 1)) s))
-   (where n_h ,(length (term s)))
-   (side-condition (< (term n_0) (term n_h)))]
-  [(undo-clrs ((n_0 ṽ_0) (n_1 ṽ_1) ...) s)
-   (undo-clrs ((n_1 ṽ_1) ...) s)])
-
-(define-metafunction verification
-  redo-clrs : γ s -> s
-  [(redo-clrs γ invalid) invalid]
-  [(redo-clrs () s) s]
-  [(redo-clrs ((n_0 ṽ_0) (n_1 ṽ_1) ...) s) 
-   (redo-clrs ((n_1 ṽ_1) ...) (set not ,(- (- (term n_h) (term n_0)) (term 1)) s))
-   (where n_h ,(length (term s)))
-   (side-condition (< (term n_0) (term n_h)))]
-  [(redo-clrs ((n_0 ṽ_0) (n_1 ṽ_1) ...) s) 
-   (redo-clrs ((n_1 ṽ_1) ...) s)])
-
-(define-metafunction verification
-  trim : s s -> s
-  [(trim invalid s) invalid]
-  [(trim (ṽ_1 ... ṽ_2 ...) (ṽ_3 ...))
-   (ṽ_2 ...)
-   (side-condition (= (length (term (ṽ_2 ...))) (length (term (ṽ_3 ...)))))])
-
-(define-metafunction verification
-  [(valid? invalid) #f]
-  [(valid? (ṽ ...)) #t])
-
-
-;; Typsetting tricks:
-
-(define-metafunction verification
-  [(AND) #t]
-  [(AND #t any_1 ...) (AND any_1 ...)]
-  [(AND any_0 any_1 ...) #f])
-
-(define-metafunction verification
-  [(same? any_1 any_1) #t]
-  [(same? any_1 any_2) #f])
-
-(define-metafunction verification
-  [(less-than? n_1 n_2) ,(< (term n_1) (term n_2))])
-
-(define-metafunction verification
-  [(plus n_1 n_2) ,(+ (term n_1) (term n_2))])
-
-(define-metafunction verification
-  [(not-member? any_1 (any_2 ...))
-   ,(not (member (term any_1) (term (any_2 ...))))])
-
-(provide (all-defined-out))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/rbtrees.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/rbtrees.rkt
deleted file mode 100644
index 30e0b157de..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/rbtrees.rkt
+++ /dev/null
@@ -1,209 +0,0 @@
-#lang racket/base
-
-(require redex/reduction-semantics
-         (only-in redex/private/generate-term pick-an-index)
-         racket/match racket/bool)
-
-(provide (all-defined-out))
-
-(define-language rbtrees
-  (t E
-     (c t n t))
-  (c R B)
-  (n O (s n)))
-
-(define-judgment-form rbtrees
-  #:mode (rb-tree I)
-  [(rb-tree t)
-   (rbt t n_1 n_2 n_3)])
-
-(define-judgment-form rbtrees
-  #:mode (rbt I O O O)
-  [(rbt (R E n E) n n O)]
-  [(rbt (B E n E) n n (s O))]
-  [(rbt (R (B t_l1 n_l t_l2)
-           n
-           (B t_r1 n_r t_r2))
-        n_1min n_2max n_bd)
-   (rbt (B t_l1 n_l t_l2) n_1min n_1max n_bd)
-   (rbt (B t_r1 n_r t_r2) n_2min n_2max n_bd)
-   (< n_1max n)
-   (< n n_2min)]
-  [(rbt (B E n (c_2 t_21 n_2 t_22)) n n_2max (s O))
-   (rbt (c_2 t_21 n_2 t_22) n_2min n_2max O)
-   (< n n_2min)]
-  [(rbt (B (c_1 t_11 n_1 t_12) n E) n_1min n (s O))
-   (rbt (c_1 t_11 n_1 t_12) n_1min n_1max O)
-   (< n_1max n)]
-  [(rbt (B (c_1 t_11 n_1 t_12) n (c_2 t_21 n_2 t_22)) n_1min n_2max (s n_bd))
-   (rbt (c_1 t_11 n_1 t_12) n_1min n_1max n_bd)
-   (rbt (c_2 t_21 n_2 t_22) n_2min n_2max n_bd)
-   (< n_1max n)
-   (< n n_2min)])
-
-(define-relation rbtrees
-  [(< O (s n))]
-  [(< (s n_1) (s n_2))
-   (< n_1 n_2)])
-
-(define-judgment-form rbtrees
-  #:mode (ordered? I O O)
-  [(ordered? (c E n E) n n)]
-  [(ordered? (c E n t_2) n n_2max)
-   (ordered? t_2 n_2min n_2max)
-   (< n n_2min)]
-  [(ordered? (c t_1 n E) n_1min n)
-   (ordered? t_1 n_1min n_1max)
-   (< n_1max n)]
-  [(ordered? (c t_1 n t_2) n_1min n_2max)
-   (ordered? t_1 n_1min n_1max)
-   (ordered? t_2 n_2min n_2max)
-   (< n_1max n)
-   (< n n_2min)])
-
-(define-metafunction rbtrees
-  [(insert n t)
-   (B t_1 n_1 t_2)
-   (where (c t_1 n_1 t_2) (ins n t))])
-
-(define-metafunction rbtrees
-  [(ins n E)
-   (R E n E)]
-  [(ins n_1 (c t_1 n_2 t_2))
-   (balance (c (ins n_1 t_1) n_2 t_2))
-   (where #t (< n_1 n_2))]
-  [(ins n_1 (c t_1 n_2 t_2))
-   (balance (c t_1 n_2 (ins n_1 t_2)))
-   (where #t (< n_2 n_1))]
-  [(ins n t)
-   t])
-
-(define-metafunction rbtrees
-  [(balance (B (R (R t_1 n_1 t_2) n_2 t_3) n_3 t_4))
-   (R (B t_1 n_1 t_2) n_2 (B t_3 n_3 t_4))]
-  [(balance (B (R t_1 n_1 (R t_2 n_2 t_3)) n_3 t_4))
-   (R (B t_1 n_1 t_2) n_2 (B t_3 n_3 t_4))]
-  [(balance (B t_1 n_1 (R (R t_2 n_2 t_3) n_3 t_4)))
-   (R (B t_1 n_1 t_2) n_2 (B t_3 n_3 t_4))]
-  [(balance (B t_1 n_1 (R t_2 n_2 (R t_3 n_3 t_4))))
-   (R (B t_1 n_1 t_2) n_2 (B t_3 n_3 t_4))]
-  [(balance t)
-   t])
-
-
-(define-metafunction rbtrees
-  [(n->num O)
-   0]
-  [(n->num (s n))
-   ,(+ 1 (term (n->num n)))])
-
-(define-metafunction rbtrees
-  [(t->num E)
-   E]
-  [(t->num (c t_1 n t_2))
-   (c (t->num t_1) (n->num n) (t->num t_2))])
-
-(define-metafunction rbtrees
-  [(num->n 0)
-   O]
-  [(num->n number)
-   (s (num->n ,(sub1 (term number))))])
-
-(define-metafunction rbtrees
-  [(numt->t E)
-   E]
-  [(numt->t (c any_1 number any_2))
-   (c (numt->t any_1) (num->n number) (numt->t any_2))])
-
-(define (rand-ordt depth)
-  (match (generate-term
-          rbtrees
-          #:satisfying
-          (ordered? t n_1 n_2)
-          depth)
-    [#f #f]
-    [`(ordered? ,t ,min ,max)
-     (term (t->num ,t))]))
-
-(define (rand-ordts depth num)
-  (for/list ([_ (in-range num)])
-    (rand-ordt depth)))
-
-(module+
-    test
-  (require rackunit)
-  (check-true (judgment-holds
-               (ordered?
-                (B (R E (s O) E)
-                   (s (s (s O)))
-                   E)
-                n_1 n_2)))
-  (check-true (judgment-holds
-               (rb-tree (B (R E (s O) E)
-                          (s (s (s O)))
-                          E))))
-  (check-true (judgment-holds
-               (rb-tree (B (R E (s O) E)
-                        (s (s (s O)))
-                        E))))
-  (check-true (judgment-holds
-               (rb-tree (R (B E (s O) E)
-                        (s (s (s O)))
-                        (B E
-                           (s (s (s (s (s O)))))
-                           E)))))
-  (check-false (judgment-holds
-                (rb-tree (R (B E (s (s O)) E)
-                         (s O)
-                         (R E O E))))))
-
-(define (ins-preserves-rb-tree t)
-  (or (not (judgment-holds (rb-tree ,t)))
-      (match (judgment-holds (ordered? ,t n_1 n_2) (n_1 n_2))
-        [`((,min-n ,max-n))
-         (define nmin (term (n->num ,min-n)))
-         (define nmax (term (n->num ,max-n)))
-         (for/and ([n (in-range (max 0 (sub1 nmin)) (+ 2 nmax))])
-           (judgment-holds
-            (rb-tree
-             (insert (num->n ,n) ,t))))])))
-
-(module+
-    test
-  (define (check-rbsts n)
-    (for ([_ (in-range n)])
-      (match (generate-term rbtrees
-                            #:satisfying
-                            (rb-tree t)
-                            8)
-        [#f (void)]
-        [`(rbst ,t)
-         (check-not-false (or (ins-preserves-rb-tree t)
-                              (printf "~s\n" t)))])))
-
-  (define (check-rbst/rb-tree tries)
-    (for ([_ tries])
-      (match (generate-term rbtrees
-                            #:satisfying
-                            (rb-tree t)
-                            8)
-        [#f (void)]
-        [`(rbst ,t)
-         (define res
-           (judgment-holds
-            (rb-tree ,t)))
-         (unless res (displayln t))
-         (check-not-false res)]))
-    (for ([_ tries])
-      (match (generate-term rbtrees
-                            #:satisfying
-                            (rb-tree t)
-                            8)
-        [#f (void)]
-        [`(rb-tree ,t)
-         (define res
-           (judgment-holds
-            (rb-tree ,t)))
-         (unless res (displayln t))
-         (check-not-false res)]))))
-
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/semaphores.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/semaphores.rkt
deleted file mode 100644
index ed541f8ba9..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/semaphores.rkt
+++ /dev/null
@@ -1,166 +0,0 @@
-#lang racket
-(require redex)
-
-#|
-  
-semaphores make things much more predictable...
-  
-|#  
-
-(reduction-steps-cutoff 100)
-
-(define-language lang
-  (p ((store (variable v) ...)
-      (semas (variable sema-count) ...)
-      (threads e ...)))
-  (sema-count number
-              none)
-  (e (set! variable e)
-     (begin e ...)
-     (semaphore variable)
-     (semaphore-wait e)
-     (semaphore-post e)
-     (lambda (variable) e)
-     (e e)
-     variable
-     (list e ...)
-     (cons e e)
-     number
-     (void))
-  (p-ctxt ((store (variable v) ...)
-           (semas (variable sema-count) ...)
-           (threads e ... e-ctxt e ...)))
-  (e-ctxt (e-ctxt e)
-          (v e-ctxt)
-          (cons e-ctxt e)
-          (cons v e-ctxt)
-          (list v ... e-ctxt e ...)
-          (set! variable e-ctxt)
-          (begin e-ctxt e ...)
-          (semaphore-wait e-ctxt)
-          (semaphore-post e-ctxt)
-          hole)
-  (v (semaphore variable)
-     (lambda (variable) e)
-     (list v ...)
-     number
-     (void)))
-
-(define reductions
-  (reduction-relation
-   lang
-   (--> (in-hole (name c p-ctxt) (begin v e_1 e_2 e_rest ...))
-        (in-hole c (begin e_1 e_2 e_rest ...)))
-   (--> (in-hole (name c p-ctxt) (cons v_1 (list v_2s ...)))
-        (in-hole c (list v_1 v_2s ...)))
-   (--> (in-hole (name c p-ctxt) (begin v e_1))
-        (in-hole c e_1))
-   (--> (in-hole (name c p-ctxt) (begin v_1))
-        (in-hole c v_1))
-   (--> ((store
-             (variable_before v_before) ...
-           ((name x variable) (name v v))
-           (variable_after v_after) ...)
-         (name semas any)
-         (threads
-          e_before ...
-          (in-hole (name c e-ctxt) (name x variable))
-          e_after ...))
-        ((store
-             (variable_before v_before) ...
-           (x v)
-           (variable_after v_after) ...)
-         semas
-         (threads
-          e_before ...
-          (in-hole c v)
-          e_after ...)))
-   (--> ((store (variable_before v_before) ...
-           (variable_i v)
-           (variable_after v_after) ...)
-         (name semas any)
-         (threads
-          e_before ...
-          (in-hole (name c e-ctxt) (set! variable_i v_new))
-          e_after ...))
-        ((store (variable_before v_before) ...
-           (variable_i v_new)
-           (variable_after v_after) ...)
-         semas
-         (threads
-          e_before ...
-          (in-hole c (void))
-          e_after ...)))
-   (--> ((name store any)
-         (semas
-          (variable_before v_before) ...
-          (variable_sema number_n)
-          (variable_after v_after) ...)
-         (threads
-          e_before ...
-          (in-hole (name c e-ctxt) (semaphore-wait (semaphore variable_sema)))
-          e_after ...))
-        (store
-            (semas
-             (variable_before v_before) ...
-             (variable_sema ,(if (= (term number_n) 1)
-                                 (term none)
-                                 (- (term number_n) 1)))
-             (variable_after v_after) ...)
-          (threads
-           e_before ...
-           (in-hole c (void))
-           e_after ...)))
-   (--> ((name store any)
-         (semas
-          (variable_before v_before) ...
-          (variable_sema number_n)
-          (variable_after v_after) ...)
-         (threads
-          e_before ...
-          (in-hole (name c e-ctxt) (semaphore-post (semaphore variable_sema)))
-          e_after ...))
-        (store
-            (semas
-             (variable_before v_before) ...
-             (variable_sema ,(+ (term number_n) 1))
-             (variable_after v_after) ...)
-          (threads
-           e_before ...
-           (in-hole c (void))
-           e_after ...)))
-   
-   (--> ((name store any)
-         (semas
-          (variable_before v_before) ...
-          (variable_sema none)
-          (variable_after v_after) ...)
-         (threads
-          e_before ...
-          (in-hole (name c e-ctxt) (semaphore-post (semaphore variable_sema)))
-          e_after ...))
-        (store
-            (semas
-             (variable_before v_before) ...
-             (variable_sema 1)
-             (variable_after v_after) ...)
-          (threads
-           e_before ...
-           (in-hole c (void))
-           e_after ...)))))
-
-(stepper reductions
-         `((store (y (list)))
-           (semas)
-           (threads (set! y (cons 1 y))
-                    (set! y (cons 2 y)))))
-
-(stepper reductions
-         `((store (y (list)))
-           (semas (x 1))
-           (threads (begin (semaphore-wait (semaphore x)) 
-                           (set! y (cons 1 y)) 
-                           (semaphore-post (semaphore x)))
-                    (begin (semaphore-wait (semaphore x))
-                           (set! y (cons 2 y))
-                           (semaphore-post (semaphore x))))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/stlc+lists+subst.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/stlc+lists+subst.rkt
deleted file mode 100644
index a48325230d..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/stlc+lists+subst.rkt
+++ /dev/null
@@ -1,276 +0,0 @@
-#lang racket/base
-
-(require redex/reduction-semantics
-         (only-in redex/private/generate-term pick-an-index)
-         racket/match
-         racket/list
-         racket/contract
-         racket/bool)
-
-(provide (all-defined-out))
-
-(define-language stlc
-  (M N ::= 
-     (λ (x σ) M)
-     (M N)
-     x
-     c)
-  (Γ (x σ Γ)
-     •)
-  (σ τ ::=
-     int
-     (list int)
-     (σ → τ))
-  (c d ::= cons nil hd tl + integer)
-  ((x y) variable-not-otherwise-mentioned)
-  
-  (v (λ (x τ) M)
-     c
-     (cons v)
-     ((cons v) v)
-     (+ v))
-  (E hole
-     (E M)
-     (v E)))
-
-(define-judgment-form stlc
-  #:mode (typeof I I O)
-  #:contract (typeof Γ M σ)
-  
-  [---------------------------
-   (typeof Γ c (const-type c))]
-  
-  [(where τ (lookup Γ x))
-   ----------------------
-   (typeof Γ x τ)]
-  
-  [(typeof (x σ Γ) M σ_2)
-   --------------------------------
-   (typeof Γ (λ (x σ) M) (σ → σ_2))]
-  
-  [(typeof Γ M (σ → σ_2))
-   (typeof Γ M_2 σ)
-   ----------------------
-   (typeof Γ (M M_2) σ_2)])
-
-(define-metafunction stlc
-  const-type : c -> σ
-  [(const-type nil)
-   (list int)]
-  [(const-type cons)
-   (int → ((list int) → (list int)))]
-  [(const-type hd)
-   ((list int) → int)]
-  [(const-type tl)
-   ((list int) → (list int))]
-  [(const-type +)
-   (int → (int → int))]
-  [(const-type integer)
-   int])
-
-(define-metafunction stlc
-  lookup : Γ x -> σ or #f
-  [(lookup (x σ Γ) x)
-   σ]
-  [(lookup (x σ Γ) x_2)
-   (lookup Γ x_2)]
-  [(lookup • x)
-   #f])
-
-(define red
-  (reduction-relation
-   stlc
-   (--> (in-hole E ((λ (x τ) M) v))
-        (in-hole E (subst M x v))
-        "βv")
-   (--> (in-hole E (hd ((cons v_1) v_2)))
-        (in-hole E v_1)
-        "hd")
-   (--> (in-hole E (tl ((cons v_1) v_2)))
-        (in-hole E v_2)
-        "tl")
-   (--> (in-hole E (hd nil))
-        "error"
-        "hd-err")
-   (--> (in-hole E (tl nil))
-        "error"
-        "tl-err")
-   (--> (in-hole E ((+ integer_1) integer_2))
-        (in-hole E ,(+ (term integer_1) (term integer_2)))
-        "+")))
-
-(define-metafunction stlc
-  subst : M x M -> M
-  [(subst x x M_x)
-   M_x]
-  [(subst (λ (x τ) M) x M_x)
-   (λ (x τ) M)]
-  [(subst (λ (y τ) M) x M_x)
-   (λ (x_new τ) (subst (replace M y x_new) x M_x))
-   (where x_new ,(variable-not-in (term (x y M))
-                                  (term y)))]
-  [(subst (M N) x M_x)
-   ((subst M x M_x) (subst N x M_x))]
-  [(subst M x M_z)
-   M])
-
-(define-metafunction stlc
-  [(replace (any_1 ...) x_1 x_new)
-   ((replace any_1 x_1 x_new) ...)]
-  [(replace x_1 x_1 x_new)
-   x_new]
-  [(replace any_1 x_1 x_new)
-   any_1])
-
-(define M? (redex-match stlc M))
-(define/contract (Eval M)
-  (-> M? (or/c M? string? 'error))
-  (define M-t (judgment-holds (typeof • ,M τ) τ))
-  (cond
-    [(pair? M-t)
-     (define res (apply-reduction-relation* red M))
-     (cond
-       [(= 1 (length res))
-        (define ans (car res))
-        (if (equal? "error" ans)
-            'error
-            (let ([ans-t (judgment-holds (typeof • ,ans τ) τ)])
-              (cond
-                [(equal? M-t ans-t) ans]
-                [else (format "internal error: type soundness fails for ~s" M)])))]
-       [else
-        (format "internal error: not exactly 1 result ~s => ~s" M res)])]
-    [else 
-     (error 'Eval "argument doesn't typecheck: ~s" M)]))
-
-(define-metafunction stlc
-  answer : any -> any
-  [(answer (λ (x τ) M)) λ]
-  [(answer c) c]
-  [(answer (cons v)) λ]
-  [(answer ((cons v_1) v_2)) cons]
-  [(answer (+ v)) λ]
-  [(answer error) error])
-
-(define x? (redex-match stlc x))
-
-(define v? (redex-match? stlc v))
-(define τ? (redex-match? stlc τ))
-(define/contract (type-check M)
-  (-> M? (or/c τ? #f))
-  (define M-t (judgment-holds (typeof • ,M τ) τ))
-  (cond
-    [(empty? M-t)
-     #f]
-    [(null? (cdr M-t))
-     (car M-t)]
-    [else
-     (error 'type-check "non-unique type: ~s : ~s" M M-t)]))
-
-(define (progress-holds? M)
-  (if (type-check M)
-      (or (v? M)
-          (not (null? (apply-reduction-relation red (term ,M)))))
-      #t))
-
-(define (interesting-term? M)
-  (and (type-check M)
-       (term (uses-bound-var? () ,M))))
-
-(define-metafunction stlc
-  [(uses-bound-var? (x_0 ... x_1 x_2 ...) x_1)
-   #t]
-  [(uses-bound-var? (x_0 ...) (λ (x τ) M))
-   (uses-bound-var? (x x_0 ...) M)]
-  [(uses-bound-var? (x ...) (M N))
-   ,(or (term (uses-bound-var? (x ...) M))
-        (term (uses-bound-var? (x ...) N)))]
-  [(uses-bound-var? (x ...) (cons M))
-   (uses-bound-var? (x ...) M)]
-  [(uses-bound-var? (x ...) any)
-   #f])
-
-(define (really-interesting-term? M)
-  (and (interesting-term? M)
-       (term (applies-bv? () ,M))))
-
-(define-metafunction stlc
-  [(applies-bv? (x_0 ... x_1 x_2 ...) (x_1 M))
-   #t]
-  [(applies-bv? (x_0 ...) (λ (x τ) M))
-   (applies-bv? (x x_0 ...) M)]
-  [(applies-bv? (x ...) (M N))
-   ,(or (term (applies-bv? (x ...) M))
-        (term (applies-bv? (x ...) N)))]
-  [(applies-bv? (x ...) (cons M))
-   (applies-bv? (x ...) M)]
-  [(applies-bv? (x ...) any)
-   #f])
-
-(define (reduction-step-count/func red v?)
-  (λ (term)
-    (let loop ([t term]
-               [n 0])
-      (define res (apply-reduction-relation red t))
-      (cond 
-        [(and (empty? res)
-              (v? t))
-         n]
-        [(and (empty? res)
-              (equal? t "error"))
-         n]
-        [(= (length res) 1)
-         (loop (car res) (add1 n))]
-        [else
-         (error 'reduction-step-count "failed reduction: ~s\n~s\n~s" term t res)]))))
-
-(define reduction-step-count
-  (reduction-step-count/func red v?))
-
-;; rewrite all βv redexes already in the term
-;; (but not any new ones that might appear)
-(define-metafunction stlc
-  βv-> : M -> M
-  [(βv-> ((λ (x τ) M) v))  (subst (βv-> M) x (βv-> v))]
-  [(βv-> ((λ (x τ) M) y))  (subst (βv-> M) x y)]
-  [(βv-> (λ (x τ) M))      (λ (x τ) (βv-> M))]
-  [(βv-> (M N))            ((βv-> M) (βv-> N))]
-  [(βv-> M)                M])
-
-;; check : (or/c #f M) -> boolean[#f = counterexample found!]
-(define (subst-check M)
-  (or (not M)
-      (let ([M-type (type-check M)])
-        (implies M-type
-                 (let* ([N (term (βv-> ,M))][N-type (type-check N)])
-                   (and (equal? N-type M-type)
-                        (let ([a1 (Eval M)] [a2 (Eval N)])
-                          (and (not (string? a1)) (not (string? a2)) 
-                               (equal? (term (answer ,a1)) (term (answer ,a2)))
-                               (or (equal? a1 'error)
-                                   (and (equal? (type-check a1) M-type)
-                                        (equal? (type-check a2) M-type)))))))))))
-
-(module+ test
-  
-  (require redex/examples/stlc-tests-lib)
-  
-  (stlc-tests uses-bound-var?
-              typeof
-              red
-              reduction-step-count
-              Eval
-              subst)
-  
-  (test-equal (term (βv-> ((λ (x int) x) 1)))
-              (term 1))
-  (test-equal (term (βv-> (((λ (x (int → int)) x) (λ (x int) x)) 1)))
-              (term ((λ (x int) x) 1)))
-  (test-equal (term (βv-> ((+ ((λ (x int) x) 1)) ((λ (y int) y) 2))))
-              (term ((+ 1) 2)))
-  (test-equal (term (βv-> (λ (y int) ((λ (x int) x) y))))
-              (term (λ (y int) y)))
-  (test-equal (subst-check (term ((λ (x int) x) 1))) #t)
-  (test-equal (subst-check (term (hd ((cons 1) 2)))) #t)
-  
-  (test-results))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/stlc+lists.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/stlc+lists.rkt
deleted file mode 100644
index de477438b2..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/stlc+lists.rkt
+++ /dev/null
@@ -1,214 +0,0 @@
-#lang racket/base
-
-(require redex/reduction-semantics
-         (only-in redex/private/generate-term pick-an-index)
-         racket/match
-         racket/list
-         racket/contract
-         racket/bool
-         redex/tut-subst)
-
-(provide (all-defined-out))
-
-(define-language stlc
-  (M N ::= 
-     (λ (x σ) M)
-     (M N)
-     x
-     c)
-  (Γ (x σ Γ)
-     •)
-  (σ τ ::=
-     int
-     (list int)
-     (σ → τ))
-  (c d ::= cons nil hd tl + integer)
-  ((x y) variable-not-otherwise-mentioned)
-  
-  (v (λ (x τ) M)
-     c
-     (cons v)
-     ((cons v) v)
-     (+ v))
-  (E hole
-     (E M)
-     (v E)))
-
-(define-judgment-form stlc
-  #:mode (typeof I I O)
-  #:contract (typeof Γ M σ)
-  
-  [---------------------------
-   (typeof Γ c (const-type c))]
-  
-  [(where τ (lookup Γ x))
-   ----------------------
-   (typeof Γ x τ)]
-  
-  [(typeof (x σ Γ) M σ_2)
-   --------------------------------
-   (typeof Γ (λ (x σ) M) (σ → σ_2))]
-  
-  [(typeof Γ M (σ → σ_2))
-   (typeof Γ M_2 σ)
-   ----------------------
-   (typeof Γ (M M_2) σ_2)])
-
-(define-metafunction stlc
-  const-type : c -> σ
-  [(const-type nil)
-   (list int)]
-  [(const-type cons)
-   (int → ((list int) → (list int)))]
-  [(const-type hd)
-   ((list int) → int)]
-  [(const-type tl)
-   ((list int) → (list int))]
-  [(const-type +)
-   (int → (int → int))]
-  [(const-type integer)
-   int])
-
-(define-metafunction stlc
-  lookup : Γ x -> σ or #f
-  [(lookup (x σ Γ) x)
-   σ]
-  [(lookup (x σ Γ) x_2)
-   (lookup Γ x_2)]
-  [(lookup • x)
-   #f])
-
-(define red
-  (reduction-relation
-   stlc
-   (--> (in-hole E ((λ (x τ) M) v))
-        (in-hole E (subst M x v))
-        "βv")
-   (--> (in-hole E (hd ((cons v_1) v_2)))
-        (in-hole E v_1)
-        "hd")
-   (--> (in-hole E (tl ((cons v_1) v_2)))
-        (in-hole E v_2)
-        "tl")
-   (--> (in-hole E (hd nil))
-        "error"
-        "hd-err")
-   (--> (in-hole E (tl nil))
-        "error"
-        "tl-err")
-   (--> (in-hole E ((+ integer_1) integer_2))
-        (in-hole E ,(+ (term integer_1) (term integer_2)))
-        "+")))
-
-(define M? (redex-match stlc M))
-(define/contract (Eval M)
-  (-> M? (or/c M? "error"))
-  (define M-t (judgment-holds (typeof • ,M τ) τ))
-  (unless (pair? M-t)
-    (error 'Eval "doesn't typecheck: ~s" M))
-  (define res (apply-reduction-relation* red M))
-  (unless (= 1 (length res))
-    (error 'Eval "internal error: not exactly 1 result ~s => ~s" M res))
-  (define ans (car res))
-  (if (equal? "error" ans)
-      "error"
-      (let ([ans-t (judgment-holds (typeof • ,ans τ) τ)])
-        (unless (equal? M-t ans-t)
-          (error 'Eval "internal error: type soundness fails for ~s" M))
-        ans)))
-
-(define x? (redex-match stlc x))
-(define-metafunction stlc
-  subst : M x M -> M
-  [(subst M x N) 
-   ,(subst/proc x? (term (x)) (term (N)) (term M))])
-
-(define v? (redex-match? stlc v))
-(define τ? (redex-match? stlc τ))
-(define/contract (type-check M)
-  (-> M? (or/c τ? #f))
-  (define M-t (judgment-holds (typeof • ,M τ) τ))
-  (cond
-    [(empty? M-t)
-     #f]
-    [(null? (cdr M-t))
-     (car M-t)]
-    [else
-     (error 'type-check "non-unique type: ~s : ~s" M M-t)]))
-
-(test-equal (type-check (term 5))
-            (term int))
-(test-equal (type-check (term (5 5)))
-            #f)
-
-(define (progress-holds? M)
-  (if (type-check M)
-      (or (v? M)
-          (not (null? (apply-reduction-relation red (term ,M)))))
-      #t))
-
-(define (interesting-term? M)
-  (and (type-check M)
-       (term (uses-bound-var? () ,M))))
-
-(define-metafunction stlc
-  [(uses-bound-var? (x_0 ... x_1 x_2 ...) x_1)
-   #t]
-  [(uses-bound-var? (x_0 ...) (λ (x τ) M))
-   (uses-bound-var? (x x_0 ...) M)]
-  [(uses-bound-var? (x ...) (M N))
-   ,(or (term (uses-bound-var? (x ...) M))
-        (term (uses-bound-var? (x ...) N)))]
-  [(uses-bound-var? (x ...) (cons M))
-   (uses-bound-var? (x ...) M)]
-  [(uses-bound-var? (x ...) any)
-   #f])
-
-(define (really-interesting-term? M)
-  (and (interesting-term? M)
-       (term (applies-bv? () ,M))))
-
-(define-metafunction stlc
-  [(applies-bv? (x_0 ... x_1 x_2 ...) (x_1 M))
-   #t]
-  [(applies-bv? (x_0 ...) (λ (x τ) M))
-   (applies-bv? (x x_0 ...) M)]
-  [(applies-bv? (x ...) (M N))
-   ,(or (term (applies-bv? (x ...) M))
-        (term (applies-bv? (x ...) N)))]
-  [(applies-bv? (x ...) (cons M))
-   (applies-bv? (x ...) M)]
-  [(applies-bv? (x ...) any)
-   #f])
-
-(define (reduction-step-count/func red v?)
-  (λ (term)
-    (let loop ([t term]
-               [n 0])
-      (define res (apply-reduction-relation red t))
-      (cond 
-        [(and (empty? res)
-              (v? t))
-         n]
-        [(and (empty? res)
-              (equal? t "error"))
-         n]
-        [(= (length res) 1)
-         (loop (car res) (add1 n))]
-        [else
-         (error 'reduction-step-count "failed reduction: ~s\n~s\n~s" term t res)]))))
-
-(define reduction-step-count
-  (reduction-step-count/func red v?))
-
-
-(module+ test
-  
-  (require redex/examples/stlc-tests-lib)
-  
-  (stlc-tests uses-bound-var?
-              typeof
-              red
-              reduction-step-count
-              Eval
-              subst))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/stlc-tests-lib.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/stlc-tests-lib.rkt
deleted file mode 100644
index 186544940a..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/stlc-tests-lib.rkt
+++ /dev/null
@@ -1,168 +0,0 @@
-#lang racket/base
-(require redex/reduction-semantics)
-(provide stlc-tests
-         consistent-with?)
-
-(define (consistent-with? t1 t2)
-  (define table (make-hash))
-  (let loop ([t1 t1]
-             [t2 t2])
-    (cond
-      [(and (pair? t1) (pair? t2))
-       (and (loop (car t1) (car t2))
-            (loop (cdr t1) (cdr t2)))]
-      [(and (symbol? t1) 
-            (symbol? t2)
-            (not (equal? t1 t2))
-            (same-first-char-or-empty-and-numbers? t1 t2))
-       (cond
-         [(equal? t1 t2) #t]
-         [else
-          (define bound (hash-ref table t1 #f))
-          (cond
-            [bound (equal? bound t2)]
-            [else
-             (hash-set! table t1 t2)
-             #t])])]
-      [else (equal? t1 t2)])))
-
-(define (same-first-char-or-empty-and-numbers? t1 t2)
-  (define (first-char s) (string-ref (symbol->string s) 0))
-  (cond
-    [(equal? t1 '||)
-     (regexp-match #rx"[^[0-9]*$" (symbol->string t2))]
-    [(equal? t2 '||)
-     (regexp-match #rx"[^[0-9]*$" (symbol->string t1))]
-    [else
-     (equal? (first-char t1)
-             (first-char t2))]))
-
-(define-syntax-rule
-  (stlc-tests uses-bound-var?
-              typeof
-              red
-              reduction-step-count
-              Eval
-              subst)
-  (begin
-    
-    (test-equal (term (uses-bound-var? () 5))
-                #f)
-    (test-equal (term (uses-bound-var? () nil))
-                #f)
-    (test-equal (term (uses-bound-var? () (λ (x int) x)))
-                #t)
-    (test-equal (term (uses-bound-var? () (λ (x int) y)))
-                #f)
-    (test-equal (term (uses-bound-var? () ((λ (x int) x) 5)))
-                #t)
-    (test-equal (term (uses-bound-var? () ((λ (x int) xy) 5)))
-                #f)
-    
-    (test-equal (consistent-with? '(λ (z1 int) (λ (z2 int) z2))
-                                  '(λ (z int) (λ (z1 int) z)))
-                #f)
-    (test-equal (consistent-with? '(λ (z1 int) (λ (z2 int) z2))
-                                  '(λ (z int) (λ (z1 int) z1)))
-                #t)
-    
-    (test-equal (term (subst ((+ 1) 1) x 2))
-                (term ((+ 1) 1)))
-    (test-equal (term (subst ((+ x) x) x 2))
-                (term ((+ 2) 2)))
-    (test-equal (term (subst ((+ y) x) x 2))
-                (term ((+ y) 2)))
-    (test-equal (term (subst ((+ y) z) x 2))
-                (term ((+ y) z)))
-    (test-equal (term (subst ((λ (x int) x) x) x 2))
-                (term ((λ (x int) x) 2)))
-    (test-equal (consistent-with? (term (subst ((λ (y int) x) x) x 2))
-                                  (term ((λ (y int) 2) 2)))
-                #t)
-    (test-equal (consistent-with? (term (subst ((λ (y int) x) x) x (λ (q int) z)))
-                                  (term ((λ (y int) (λ (q int) z)) (λ (q int) z))))
-                #t)
-    (test-equal (consistent-with? (term (subst ((λ (y int) x) x) x (λ (q int) y)))
-                                  (term ((λ (y2 int) (λ (q int) y)) (λ (q int) y))))
-                #t)
-    (test-equal (consistent-with? (term (subst (λ (z int) (λ (z1 int) z)) q 1))
-                                  (term (λ (z int) (λ (z1 int) z))))
-                #t)
-    
-    (test-equal (judgment-holds (typeof • 5 τ) τ)
-                (list (term int)))
-    (test-equal (judgment-holds (typeof • nil τ) τ)
-                (list (term (list int))))
-    (test-equal (judgment-holds (typeof • (cons 1) τ) τ)
-                (list (term ((list int) → (list int)))))
-    (test-equal (judgment-holds (typeof • ((cons 1) nil) τ) τ)
-                (list (term (list int))))
-    (test-equal (judgment-holds (typeof • (λ (x int) x) τ) τ)
-                (list (term (int → int))))
-    (test-equal (judgment-holds (typeof • (λ (x (int → int)) (λ (y int) x)) τ) τ)
-                (list (term ((int → int) → (int → (int → int))))))
-    (test-equal (judgment-holds (typeof • ((+ ((+ 1) 2)) ((+ 3) 4)) τ) τ)
-                (list (term int)))
-    
-    (test-->> red (term ((λ (x int) x) 7)) (term 7))
-    (test-->> red (term (((λ (x int) (λ (x int) x)) 2) 1)) (term 1))
-    (test-->> red (term (((λ (x int) (λ (y int) x)) 2) 1)) (term 2))
-    (test-->> red 
-              (term ((λ (x int) ((cons x) nil)) 11))
-              (term ((cons 11) nil)))
-    (test-->> red 
-              (term ((λ (x int) ((cons x) nil)) 11))
-              (term ((cons 11) nil)))
-    (test-->> red 
-              (term ((cons ((λ (x int) x) 11)) nil))
-              (term ((cons 11) nil)))
-    (test-->> red
-              (term (cons ((λ (x int) x) 1)))
-              (term (cons 1)))
-    (test-->> red
-              (term ((cons ((λ (x int) x) 1)) nil))
-              (term ((cons 1) nil)))
-    (test-->> red
-              (term (hd ((λ (x int) ((cons x) nil)) 11)))
-              (term 11))
-    (test-->> red
-              (term (tl ((λ (x int) ((cons x) nil)) 11)))
-              (term nil))
-    (test-->> red
-              (term (tl nil))
-              "error")
-    (test-->> red
-              (term (hd nil))
-              "error")
-    (test-->> red
-              (term ((+ 1) (hd nil)))
-              "error")
-    (test-->> red
-              (term ((+ ((+ 1) 2)) ((+ 3) 4)))
-              (term 10))
-    (test-->> red
-              (term ((λ (f (int → (list int))) (f 3)) (cons 1)))
-              (term ((cons 1) 3)))
-    (test-->> red
-              (term ((λ (f (int → int)) (f 3)) (+ 1)))
-              (term 4))
-              
-    (test-equal (Eval (term ((λ (x int) x) 3)))
-                (term 3))
-    
-    (test-equal (reduction-step-count (term (λ (x int) x)))
-                0)
-    (test-equal (reduction-step-count (term ((λ (x int) x) 1)))
-                1)
-    (test-equal (reduction-step-count (term ((λ (x int) x) 1)))
-                1)
-    (test-equal (reduction-step-count (term ((cons 1) nil)))
-                0)
-    (test-equal (reduction-step-count (term (hd ((cons 1) nil))))
-                1)
-    (test-equal (reduction-step-count (term (hd nil)))
-                1)
-    (test-equal (reduction-step-count (term ((λ (x int) x) (hd ((cons 1) nil)))))
-                2)
-    
-    (test-results)))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/stlc.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/stlc.rkt
deleted file mode 100644
index c98ed3295d..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/stlc.rkt
+++ /dev/null
@@ -1,243 +0,0 @@
-#lang racket
-(require redex)
-(provide λ λv red typeof)
-
-(define-language λ
-  (e (e e)
-     x
-     (λ (x τ) e)
-     (if0 e e e)
-     (+ e e)
-     number)
-  (τ (τ -> τ) num)
-  (x variable-not-otherwise-mentioned))
-
-(define-extended-language λv λ
-  (v (λ (x τ) e) number)
-  (E hole
-     (v E) (E e)
-     (if0 E e e)
-     (+ E e) (+ v E))
-  (Γ · (x τ Γ)))
-
-(define red
-  (reduction-relation
-   λv
-   (--> (in-hole E (+ number_1 number_2))
-        (in-hole E (Σ number_1 number_2))
-        "+")
-   (--> (in-hole E (if0 0 e_1 e_2))
-        (in-hole E e_1)
-        "if0t")
-   (--> (in-hole E (if0 number e_1 e_2))
-        (in-hole E e_2)
-        "if0f"
-        (side-condition 
-          (not (= 0 (term number)))))
-   (--> (in-hole E ((λ (x τ) e) v))
-        (in-hole E (subst x v e))
-        "βv")))
-
-(define-metafunction λv
-  Σ : number number -> number
-  [(Σ number_1 number_2)
-   ,(+ (term number_1) (term number_2))])
-
-(define-metafunction λv
-  subst : x any any -> any
-  ;; 1. x_1 bound, so don't continue in λ body
-  [(subst x_1 any_1 (λ (x_1 τ_1) any_2))
-   (λ (x_1 τ_1) any_2)]
-  ;; 2. general purpose capture avoiding case
-  [(subst x_1 any_1 (λ (x_2 τ_2) any_2))
-   (λ (x_new τ_2)
-     (subst x_1 any_1
-            (subst-var x_2 x_new
-                       any_2)))
-   (where (x_new)
-          ,(variables-not-in
-            (term (x_1 any_1 any_2)) 
-            (term (x_2))))]
-  ;; 3. replace x_1 with e_1
-  [(subst x_1 any_1 x_1) any_1]
-  ;; 4. x_1 and x_2 are different, so don't replace
-  [(subst x_1 any_1 x_2) x_2]
-  ;; the last cases cover all other expressions
-  [(subst x_1 any_1 (any_2 ...))
-   ((subst x_1 any_1 any_2) ...)]
-  [(subst x_1 any_1 any_2) any_2])
-
-(define-metafunction λv
-  subst-var : x any any -> any
-  [(subst-var x_1 any_1 x_1) any_1]
-  [(subst-var x_1 any_1 (any_2 ...))
-   ((subst-var x_1 any_1 any_2) ...)]
-  [(subst-var x_1 any_1 any_2) any_2])
-
-(define-judgment-form λv
-  #:mode (typeof I I O)
-  #:contract (typeof Γ e τ)
-  
-  [---------------------
-   (typeof Γ number num)]
-  
-  [(typeof Γ e_1 num)
-   (typeof Γ e_2 num)
-   --------------------------
-   (typeof Γ (+ e_1 e_2) num)]
-  
-  [(typeof Γ e_1 num)
-   (typeof Γ e_2 τ)
-   (typeof Γ e_3 τ)
-   ------------------------------
-   (typeof Γ (if0 e_1 e_2 e_3) τ)]
-  
-  [(where τ (lookup Γ x))
-   ----------------------
-   (typeof Γ x τ)]
-  
-  [(typeof Γ e_1 (τ_2 -> τ))
-   (typeof Γ e_2 τ_2)
-   --------------------------
-   (typeof Γ (e_1 e_2) τ)]
-  
-  [(typeof (x_1 τ_1 Γ) e τ)
-   ----------------------------------------
-   (typeof Γ (λ (x_1 τ_1) e) (τ_1 -> τ))])
-
-(define-metafunction λv
-  lookup : Γ x -> τ or #f
-  [(lookup (x τ Γ) x) τ]
-  [(lookup (x_1 τ Γ) x_2) (lookup Γ x_2)]
-  [(lookup · x) #f])
-
-
-;; remove this #; to run an example
-#;
-(traces red
-        (term 
-         (+ ((λ (n num)
-               (if0 n
-                    1
-                    0))
-             (+ 2 2))
-            2)))
-
-;; remove this #; to generate a random well-typed term
-#;
-(generate-term λv #:satisfying (typeof · e num) 5)
-
-
-(define (preservation e)
-  (define types (judgment-holds (typeof · ,e τ) τ))
-  (unless (null? types)
-    (unless (= 1 (length types)) (error 'preservation "multiple types! ~s" e)))
-  (cond
-    [(null? types) #t]
-    [else
-     (for/and ([v (apply-reduction-relation* red e)])
-       (equal? (judgment-holds (typeof · ,v τ) τ)
-               types))]))
-
-(define (try-it)
-  (redex-check λv 
-               #:satisfying (typeof · e num) 
-               (preservation (term e))))
-
-(test-->> red (term ((λ (x num) x) 1)) 1)
-(test-->> red (term (((λ (x num) (λ (y num) x)) 1) 2)) 1)
-(test-->> red (term (((λ (x num) (λ (y num) y)) 1) 2)) 2)
-(test-->> red (term (((λ (x num) (λ (x num) x)) 1) 2)) 2)
-(test-->> red (term (((λ (x num) (λ (y num) x)) 1) 2)) 1)
-(test-->> red (term ((λ (x num) (+ x x)) 2)) 4)
-(test-->> red (term ((λ (x num) (if0 x x (+ x 1))) 2)) 3)
-(test-->> red (term ((λ (x num) (if0 x x (+ x 1))) 0)) 0)
-(test-->> red 
-          (term (((λ (x num) (λ (y num) (λ (z num) x))) 1) 2))
-          (term (λ (z num) 1)))
-(test-->> red
-          (term (+ (+ 1 2) (+ 3 4)))
-          (term 10))
-
-(test-equal (term (subst x y x)) (term y))
-(test-equal (term (subst x y z)) (term z))
-(test-equal (term (subst x y (x (y z)))) (term (y (y z))))
-(test-equal (term (subst x y ((λ (x num) x) ((λ (y1 num) y1) (λ (x num) z)))))
-            (term ((λ (x num) x) ((λ (y2 num) y2) (λ (x num) z)))))
-(test-equal (term (subst x y (if0 (+ 1 x) x x)))
-            (term (if0 (+ 1 y) y y)))
-(test-equal (term (subst x (λ (z num) y) (λ (y num) x)))
-            (term (λ (y1 num) (λ (z num) y))))
-(test-equal (term (subst x 1 (λ (y num) x)))
-            (term (λ (y num) 1)))
-(test-equal (term (subst x y (λ (y num) x)))
-            (term (λ (y1 num) y)))
-(test-equal (term (subst x (λ (y num) y) (λ (z num) (z2 z))))
-            (term (λ (z1 num) (z2 z1))))
-(test-equal (term (subst x (λ (z num) z) (λ (z num) (z1 z))))
-            (term (λ (z2 num) (z1 z2))))
-(test-equal (term (subst x z (λ (z num) (z1 z))))
-            (term (λ (z2 num) (z1 z2))))
-(test-equal (term (subst x3 5 (λ (x2 num) x2)))
-            (term (λ (x1 num) x1)))
-(test-equal (term (subst z * (λ (z num) (λ (x num) 1))))
-            (term (λ (z num) (λ (x num) 1))))
-(test-equal (term (subst q (λ (x num) z) (λ (z num) (λ (x num) q))))
-            (term (λ (z1 num) (λ (x1 num) (λ (x num) z)))))
-(test-equal (term (subst x 1 (λ (x num) (λ (x num) x))))
-            (term (λ (x num) (λ (x num) x))))
-
-(define (typecheck G e)
-  (match (judgment-holds (typeof ,G ,e τ) τ)
-    [(list) #f]
-    [(list t) t]
-    [_ (error 'typecheck
-              "multiple typing derivations for term ~a in environment ~a"
-              e G)]))
-
-(test-equal (typecheck (term ·) (term 1))
-            (term num))
-(test-equal (typecheck (term ·) (term (1 1)))
-            #f)
-(test-equal (typecheck (term (x num ·)) (term x))
-            (term num))
-(test-equal (typecheck (term ·) (term x))
-            #f)
-(test-equal (typecheck (term ·) (term ((λ (x num) x) 1)))
-            (term num))
-(test-equal (typecheck (term ·) (term (((λ (x num) x) 1) 2)))
-            #f)
-(test-equal (typecheck (term ·) 
-                       (term (((λ (f (num -> num))
-                                 (λ (x num)
-                                   (f x)))
-                               (λ (x num) x))
-                              1)))
-            (term num))
-(test-equal (typecheck (term ·)
-                       (term (((λ (f (num -> num))
-                                 (λ (x num)
-                                   (f x)))
-                               1)
-                              (λ (x num) x))))
-            #f)
-(test-equal (typecheck (term ·) (term (+ (+ 1 2) 3)))
-            (term num))
-(test-equal (typecheck (term ·) (term (if0 1 (λ (x num) x) 3)))
-            #f)
-(test-equal (typecheck (term ·) (term (if0 1 2 3)))
-            (term num))
-(test-equal (typecheck (term ·) (term (λ (x num) (x 2))))
-            #f)
-(test-equal (typecheck (term ·)
-                       (term (λ (x num)
-                               (λ (x (num -> num))
-                                 (x 0)))))
-            (term (num -> ((num -> num) -> num))))
-(test-equal (typecheck (term ·)
-                       (term (λ (x (num -> num))
-                               (λ (x num)
-                                 (x 0)))))
-            #f)
-
-(test-results)
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/subject-reduction.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/subject-reduction.rkt
deleted file mode 100644
index 22be4833ae..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/subject-reduction.rkt
+++ /dev/null
@@ -1,108 +0,0 @@
-#lang racket
-(require redex)
-
-(reduction-steps-cutoff 10)
-
-(define-language lang
-  (e (e e)
-     (abort e)
-     x
-     v)
-  (x (variable-except lambda call/cc abort))
-  (c (v c)
-     (c e)
-     hole)
-  (v call/cc
-     number
-     (lambda (x t) e))
-  (t num
-     (t -> t)))
-
-(define reductions
-  (reduction-relation
-   lang
-   (--> (in-hole c_1 (call/cc v_arg))
-        ,(term-let ([v (variable-not-in (term c_1) 'x)])
-           (term
-            (in-hole c_1 (v_arg (lambda (v) (abort (in-hole c_1 v)))))))
-        call/cc)
-   (--> (in-hole c (abort e_1))
-        e_1
-        abort)
-   
-   ;; this rules calls subst with the wrong arguments, which is caught by the example below.
-   (--> (in-hole c_1 ((lambda (x_format t_1) e_body) v_actual))
-        (in-hole c_1 (subst (x_format e_body v_actual)))
-        βv)))
-
-(define (type-check term)
-  (let/ec k
-    (let loop ([term term]
-               [env '()])
-      (match term
-        [(? symbol?) 
-         (let ([l (assoc term env)])
-           (if l
-               (cdr l)
-               (k #f)))]
-        [(? number?) 'num]
-        [`(lambda (,x ,t) ,b)
-         (let ([body (loop b (cons (cons x t) env))])
-           `(,t -> ,body))]
-        [`(,e1 ,e2)
-         (let ([t1 (loop e1 env)]
-               [t2 (loop e2 env)])
-           (match t1
-             [`(,td -> ,tr)
-              (if (equal? td t2)
-                  tr
-                  (k #f))]
-             [else (k #f)]))]))))
-
-(define (pred term1)
-  (let ([t1 (type-check term1)])
-    (lambda (term2)
-      (and t1
-           (equal? (type-check term2) t1)))))
-
-(define-language subst-lang
-  (x variable))
-
-(define-metafunction subst-lang
-  [(subst-n ((x_1 any_1) (x_2 any_2) ... any_3))
-   (subst (x_1 any_1 (subst-n ((x_2 any_2) ... any_3))))]
-  [(subst-n (any_3)) any_3])
-
-(define-metafunction subst-lang
-  ;; 1. x_1 bound, so don't continue in λ body
-  [(subst (x_1 any_1 (λ (x_1 t) any_2)))
-   (λ (x_1 t) any_2)]
-  ;; 2. general purpose capture avoiding case
-  [(subst (x_1 any_1 (λ (x_2 t) any_2)))
-   ,(term-let ([x_new
-                (variable-not-in (term (x_1 any_1 any_2)) 
-                                 (term x_2))])
-              (term 
-               (λ (x_new t) 
-                 (subst (x_1 any_1 (subst-vars ((x_2 x_new) any_2)))))))]
-  ;; 3. replace x_1 with e_1
-  [(subst (x_1 any_1 x_1)) any_1]
-  ;; 4. x_1 and x_2 are different, so don't replace
-  [(subst (x_1 any_1 x_2)) x_2]
-  ;; the last two cases cover all other expression forms
-  [(subst (x_1 any_1 (any_2 ...)))
-   ((subst (x_1 any_1 any_2)) ...)]
-  [(subst (x_1 any_1 any_2)) any_2])
-
-(define-metafunction subst-lang
-  [(subst-vars ((x_1 any_1) x_1)) any_1]
-  [(subst-vars ((x_1 any_1) (any_2 ...))) ((subst-vars ((x_1 any_1) any_2)) ...)]
-  [(subst-vars ((x_1 any_1) any_2)) any_2]
-  [(subst-vars ((x_1 any_1) (x_2 any_2) ... any_3)) 
-   (subst-vars ((x_1 any_1) (subst-vars ((x_2 any_2) ... any_3))))]
-  [(subst-vars (any)) any])
-
-(define (show term)
-  (traces reductions term #:pred (pred term)))
-
-(show '((lambda (x (num -> num)) 1) ((lambda (x (num -> num)) x) (lambda (x num) x))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/subst.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/subst.rkt
deleted file mode 100644
index 4a7c5c4826..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/subst.rkt
+++ /dev/null
@@ -1,71 +0,0 @@
-#lang racket
-(require redex/reduction-semantics)
-(provide subst subst-n)
-
-(define-language subst-lang
-  (x variable))
-
-(define-metafunction subst-lang
-  [(subst-n ((x_1 any_1) (x_2 any_2) ... any_3))
-   (subst (x_1 any_1 (subst-n ((x_2 any_2) ... any_3))))]
-  [(subst-n (any_3)) any_3])
-
-(define-metafunction subst-lang
-  ;; 1. x_1 bound, so don't continue in λ body
-  [(subst (x_1 any_1 (λ (x_2 ... x_1 x_3 ...) any_2)))
-   (λ (x_2 ... x_1 x_3 ...) any_2)
-   (side-condition (not (member (term x_1) (term (x_2 ...)))))]
-  ;; 2. general purpose capture avoiding case
-  [(subst (x_1 any_1 (λ (x_2 ...) any_2)))
-   ,(term-let ([(x_new ...)
-                (variables-not-in (term (x_1 any_1 any_2)) 
-                                  (term (x_2 ...)))])
-              (term 
-               (λ (x_new ...) 
-                 (subst (x_1 any_1 (subst-vars ((x_2 x_new) ... any_2)))))))]
-  ;; 3. replace x_1 with e_1
-  [(subst (x_1 any_1 x_1)) any_1]
-  ;; 4. x_1 and x_2 are different, so don't replace
-  [(subst (x_1 any_1 x_2)) x_2]
-  ;; the last two cases cover all other expression forms
-  [(subst (x_1 any_1 (any_2 ...)))
-   ((subst (x_1 any_1 any_2)) ...)]
-  [(subst (x_1 any_1 any_2)) any_2])
-
-(define-metafunction subst-lang
-  [(subst-vars ((x_1 any_1) x_1)) any_1]
-  [(subst-vars ((x_1 any_1) (any_2 ...))) ((subst-vars ((x_1 any_1) any_2)) ...)]
-  [(subst-vars ((x_1 any_1) any_2)) any_2]
-  [(subst-vars ((x_1 any_1) (x_2 any_2) ... any_3)) 
-   (subst-vars ((x_1 any_1) (subst-vars ((x_2 any_2) ... any_3))))]
-  [(subst-vars (any)) any])
-
-(begin
-  (test-equal (term (subst (x y x))) (term y))
-  (test-equal (term (subst (x y z))) (term z))
-  (test-equal (term (subst (x y (x (y z))))) (term (y (y z))))
-  (test-equal (term (subst (x y ((λ (x) x) ((λ (y1) y1) (λ (x) z))))))
-        (term ((λ (x) x) ((λ (y2) y2) (λ (x) z)))))
-  (test-equal (term (subst (x y (if0 (+ 1 x) x x))))
-        (term (if0 (+ 1 y) y y)))
-  (test-equal (term (subst (x (λ (z) y) (λ (y) x))))
-        (term (λ (y1) (λ (z) y))))
-  (test-equal (term (subst (x 1 (λ (y) x))))
-        (term (λ (y) 1)))
-  (test-equal (term (subst (x y (λ (y) x))))
-        (term (λ (y1) y)))
-  (test-equal (term (subst (x (λ (y) y) (λ (z) (z2 z)))))
-        (term (λ (z1) (z2 z1))))
-  (test-equal (term (subst (x (λ (z) z) (λ (z) (z1 z)))))
-        (term (λ (z2) (z1 z2))))
-  (test-equal (term (subst (x z (λ (z) (z1 z)))))
-        (term (λ (z2) (z1 z2))))
-  (test-equal (term (subst (x3 5 (λ (x2) x2))))
-        (term (λ (x1) x1)))
-  (test-equal (term (subst (z * (λ (z x) 1))))
-        (term (λ (z x) 1)))
-  (test-equal (term (subst (q (λ (x) z) (λ (z x) q))))
-        (term (λ (z1 x1) (λ (x) z))))
-  (test-equal (term (subst (x 1 (λ (x x) x))))
-        (term (λ (x x) x)))
-  (test-results))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/threads.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/threads.rkt
deleted file mode 100644
index ff1d06c9e5..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/threads.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang racket
-(require redex)
-
-(reduction-steps-cutoff 100)
-
-(define-language threads
-  (p ((store (x v) ...) (threads e ...)))
-  (e (set! x e)
-     (let ((x e)) e)
-     (e e)
-     x
-     v
-     (+ e e))
-  (v (lambda (x) e)
-     number)
-  (x variable)
-  (pc ((store (x v) ...) tc))
-  (tc (threads e ... ec e ...))
-  (ec (ec e) (v ec) (set! variable ec) (let ((x ec)) e) (+ ec e) (+ v ec) hole))
-
-(define reductions
-  (reduction-relation
-   threads
-   (--> (in-hole pc_1 (+ number_1 number_2))
-        (in-hole pc_1 ,(+ (term number_1) (term number_2)))
-        sum)
-   
-   (--> ((store
-          (name befores (x_0 v_0)) ...
-          (x_i v_i)
-          (name afters (x_i+1 v_i+1)) ...)
-         (in-hole tc_1 x_i))
-        ((store 
-          befores ... 
-          (x_i v_i)
-          afters ...)
-         (in-hole tc_1 v_i))
-        deref)
-   
-   (--> ((store (x_1 v_1) ... (x_i v) (x_2 v_2) ...)
-         (in-hole tc_1 (set! x_i v_new)))
-        ((store (x_1 v_1) ... (x_i v_new) (x_2 v_2) ...)
-         (in-hole tc_1 v_new))
-        set!)
-   
-   (--> (in-hole pc_1 ((lambda (x_1) e_1) v_1))
-        (in-hole pc_1 ,(substitute (term x_1) (term v_1) (term e_1)))
-        app)
-   
-   (--> ((store (name the-store any) ...)
-         (in-hole tc_1 (let ((x_1 v_1)) e_1)))
-        (term-let ((new-x (variable-not-in (term (the-store ...)) (term x_1))))
-          (term 
-           ((store the-store ... (new-x v_1))
-            (in-hole tc_1 ,(substitute (term x_1) (term new-x) (term e_1))))))
-        let)))
-
-(define (substitute . x) (error 'substitute "~s" x))
-
-(define (run es) (traces reductions `((store) (threads ,@es))))
-(provide run)
-
-(define (count x) 
-  (match x
-    [`(set! ,x ,e) (+ 1 (count e))]
-    [(? symbol?) 1]
-    [(? number?) 0]
-    [`(+ ,e1 ,e2) (+ 1 (count e1) (count e2))]))
-
-;; use a pretty-printer that just summaizes the terms, showing the depth of each thread.
-(traces reductions
-        '((store (x 1))
-          (threads
-           (set! x (+ x -1))
-           (set! x (+ x 1))))
-        
-        #:pp
-        (lambda (exp)
-          (match exp
-            [`((store (x ,x)) (threads ,t1 ,t2))
-             (format "~a ~a ~a" x (count t1) (count t2))])))
-
-(parameterize ([initial-char-width 16])
-  (stepper reductions '((store) (threads 
-                                 (+ 1 1)
-                                 (+ 1 1)
-                                 (+ 1 1)))))
diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/types.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/types.rkt
deleted file mode 100644
index 9bbac06a7a..0000000000
--- a/pkgs/redex-pkgs/redex-examples/redex/examples/types.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang racket
-(require redex
-         "subst.rkt")
-
-(reduction-steps-cutoff 10)
-
-(define-language lang
-  (e (e e)
-     x
-     number
-     (lambda (x t) e)
-     (if e e e)
-     (= e e)
-     (-> e e)
-     num
-     bool)
-  (c (t c)
-     (c e)
-     (-> t c)
-     (-> c e)
-     (= t c)
-     (= c e)
-     (if c e e)
-     (if t c e)
-     (if t t c)
-     hole)
-  (x (variable-except lambda -> if =))
-  (t num bool (-> t t)))
-
-(define reductions
-  (reduction-relation
-   lang
-   (r--> number num)
-   
-   (r--> (lambda (x_1 t_1) e_body)
-         (-> t_1 (subst (x_1 t_1 e_body))))
-   
-   (r--> ((-> t_1 t_2) t_1) t_2)
-   
-   (e--> (side-condition ((-> t_1 t) t_2)
-                         (not (equal? (term t_1) (term t_2))))
-         ,(format "app: domain error ~s and ~s" (term t_1) (term t_2)))
-   
-   (e--> (num t_1)
-         ,(format "app: non function error ~s" (term t_1)))
-   
-   (r--> (if bool t_1 t_1) t_1)
-   (e--> (side-condition (if bool t_1 t_2)
-                         (not (equal? (term t_1) (term t_2))))
-         ,(format "if: then and else clause mismatch ~s and ~s" (term t_1) (term t_2)))
-   (e--> (side-condition (if t_1 t t)
-                         (not (equal? (term t_1) 'bool)))
-         ,(format "if: test not boolean ~s" (term t_1)))
-   
-   (r--> (= num num) bool)
-   (e--> (side-condition (= t_1 t_2)
-                         (or (not (equal? (term t_1) 'num))
-                             (not (equal? (term t_2) 'num))))
-         ,(format "=: not comparing numbers ~s and ~s" (term t_1) (term t_2)))
-   
-   with
-   
-   [(--> (in-hole c_1 a) (in-hole c_1 b)) (r--> a b)]
-   [(--> (in-hole c a) b) (e--> a b)]))
-
-(traces reductions
-        '((lambda (x num) (lambda (y num) (if (= x y) 0 x))) 1))
-(traces reductions
-        '((lambda (x num) (lambda (y num) (if (= x y) 0 (lambda (x num) x)))) 1))
diff --git a/pkgs/redex-pkgs/redex-gui-lib/LICENSE.txt b/pkgs/redex-pkgs/redex-gui-lib/LICENSE.txt
deleted file mode 100644
index 97325db572..0000000000
--- a/pkgs/redex-pkgs/redex-gui-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-redex-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/redex-pkgs/redex-gui-lib/info.rkt b/pkgs/redex-pkgs/redex-gui-lib/info.rkt
deleted file mode 100644
index cf8d466fae..0000000000
--- a/pkgs/redex-pkgs/redex-gui-lib/info.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base"
-               "draw-lib"
-               "gui-lib"
-               "data-lib"
-               "profile-lib"
-               "unstable-2d"
-               "redex-lib"
-               "redex-pict-lib"
-               "pict-lib"))
-(define build-deps '("rackunit-lib"))
-(define implies '("redex-lib" "redex-pict-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"redex\" gui")
-
-(define pkg-authors '(robby bfetscher))
diff --git a/pkgs/redex-pkgs/redex-gui-lib/redex/gui.rkt b/pkgs/redex-pkgs/redex-gui-lib/redex/gui.rkt
deleted file mode 100644
index 49e1d2baad..0000000000
--- a/pkgs/redex-pkgs/redex-gui-lib/redex/gui.rkt
+++ /dev/null
@@ -1,127 +0,0 @@
-;; should cache the count of new snips -- dont
-;; use `count-snips'; use something associated with the
-;; equal hash-table
-
-#lang racket/base
-
-(require "private/stepper.rkt"
-         "private/traces.rkt"
-         redex/private/matcher
-         redex/private/reduction-semantics
-         "private/size-snip.rkt"
-         "private/show-derivations.rkt"
-         redex/private/judgment-form
-         mrlib/graph
-         racket/contract
-         racket/class
-         racket/gui/base)
-
-(define pp-contract
-  (or/c (-> any/c string?)
-        (-> any/c output-port? number? (is-a?/c text%) any)))
-
-(define ((reduction-sequence? red) terms)
-  (let loop ([term (car terms)]
-             [terms (cdr terms)])
-    (or (null? terms)
-        (and (member (car terms) (apply-reduction-relation red term))
-             (loop (car terms)
-                   (cdr terms))))))
-
-(provide/contract
- [traces (->* (reduction-relation?
-               any/c)
-              (#:multiple?
-               boolean?
-               #:pred (or/c (any/c . -> . any)
-                            (any/c term-node? . -> . any))
-               #:pp pp-contract
-               #:colors (listof (list/c string? string?))
-               #:scheme-colors? boolean?
-               #:racket-colors? boolean?
-               #:layout (-> any/c any/c)
-               #:edge-label-font (or/c #f (is-a?/c font%))
-               #:edge-labels? boolean?
-               #:filter (-> any/c (or/c #f string?) any/c)
-               #:x-spacing real?
-               #:y-spacing real?
-               #:graph-pasteboard-mixin (make-mixin-contract graph-pasteboard<%>)
-               #:reduce (-> reduction-relation? any/c
-                            (listof (list/c (or/c false/c string?) any/c))))
-              any)]
- [traces/ps (->* (reduction-relation?
-                  any/c
-                  (or/c path-string? path?))
-                 (#:multiple?
-                  boolean?
-                  #:pred (or/c (any/c . -> . any)
-                               (any/c term-node? . -> . any))
-                  #:pp pp-contract
-                  #:colors (listof any/c)
-                  #:scheme-colors? boolean?
-                  #:racket-colors? boolean?
-                  #:layout (-> any/c any/c)
-                  #:edge-label-font (or/c #f (is-a?/c font%))
-                  #:edge-labels? boolean?
-                  #:filter (-> any/c (or/c #f string?) any/c)
-                  #:x-spacing real?
-                  #:y-spacing real?
-                  #:graph-pasteboard-mixin (make-mixin-contract graph-pasteboard<%>)
-                  #:reduce (-> reduction-relation? any/c
-                               (listof (list/c (or/c false/c string?) any/c)))
-                  #:post-process (-> (is-a?/c graph-pasteboard<%>) any/c))
-                 any)]
- 
- [show-derivations (->* ((cons/c derivation? (listof derivation?)))
-                        (#:pp pp-contract
-                         #:racket-colors? boolean?
-                         #:init-derivation exact-nonnegative-integer?)
-                        any)]
- [derivation/ps (->* (derivation? path-string?)
-                     (#:pp pp-contract
-                      #:racket-colors? boolean?
-                      #:post-process (-> (is-a?/c pasteboard%) any))
-                     any)]
- 
- [term-node? (-> any/c boolean?)]
- [term-node-parents (-> term-node? (listof term-node?))]
- [term-node-children (-> term-node? (listof term-node?))]
- [term-node-labels (-> term-node? (listof (or/c false/c string?)))]
- [term-node-set-red! (-> term-node? boolean? void?)]
- [term-node-set-color! (-> term-node? 
-                           (or/c string? (is-a?/c color%) false/c)
-                           void?)]
- [term-node-color (-> term-node? (or/c string? (is-a?/c color%) false/c))]
- [term-node-expr (-> term-node? any)]
- [term-node-set-position! (-> term-node? real? real? void?)]
- [term-node-x (-> term-node? real?)]
- [term-node-y (-> term-node? real?)]
- [term-node-width (-> term-node? real?)]
- [term-node-height (-> term-node? real?)]
- 
- [stepper
-  (->* (reduction-relation?
-        any/c)
-       (pp-contract)
-       void?)]
- [stepper/seed 
-  (->* (reduction-relation?
-        (cons/c any/c (listof any/c)))
-       (pp-contract)
-       void?)]
- 
- [dark-pen-color (parameter/c (or/c string? (is-a?/c color%)))]
- [light-pen-color (parameter/c (or/c string? (is-a?/c color%)))]
- [dark-brush-color (parameter/c (or/c string? (is-a?/c color%)))]
- [light-brush-color (parameter/c (or/c string? (is-a?/c color%)))]
- [dark-text-color (parameter/c (or/c string? (is-a?/c color%)))]
- [light-text-color (parameter/c (or/c string? (is-a?/c color%)))]
- [initial-font-size (parameter/c number?)]
- [initial-char-width (parameter/c (or/c number? (-> any/c number?)))])
-
-(provide/contract 
- [reduction-steps-cutoff (parameter/c exact-nonnegative-integer?)]
- [default-pretty-printer
-   (-> any/c output-port? exact-nonnegative-integer? (is-a?/c text%) 
-       void?)]
- [pretty-print-parameters (parameter/c (-> (-> any) any))])
diff --git a/pkgs/redex-pkgs/redex-gui-lib/redex/main.rkt b/pkgs/redex-pkgs/redex-gui-lib/redex/main.rkt
deleted file mode 100644
index 3b0da6e910..0000000000
--- a/pkgs/redex-pkgs/redex-gui-lib/redex/main.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require redex/reduction-semantics
-         "gui.rkt"
-         redex/pict)
-(provide (all-from-out redex/reduction-semantics
-                       "gui.rkt"
-                       redex/pict))
diff --git a/pkgs/redex-pkgs/redex-gui-lib/redex/private/gen-trace.rkt b/pkgs/redex-pkgs/redex-gui-lib/redex/private/gen-trace.rkt
deleted file mode 100644
index a096df0624..0000000000
--- a/pkgs/redex-pkgs/redex-gui-lib/redex/private/gen-trace.rkt
+++ /dev/null
@@ -1,764 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         racket/set
-         racket/function
-         racket/match
-         racket/vector
-         racket/list
-         racket/class
-         racket/pretty
-         racket/gui/base
-         racket/string
-         redex/private/jdg-gen
-         redex/private/judgment-form
-         redex/private/search
-         redex/private/trace-layout
-         (only-in redex/private/pat-unify
-                  dq
-                  env-eqs
-                  env-dqs))
-
-(provide make-tree
-         show-trace
-         raw-locs
-         format-trace)
-
-;; tree browser prototype
-;; 
-;; uses a mapping to a geometric series to get an "axis at infinity" effect
-;;
-;; TODO:
-;; * the layout algorithm is pretty dumb right now, could definitely be improved
-;; * zooming/panning starts getting slow for trees with around 1,000 nodes
-;;
-
-
-(define loc? (listof exact-nonnegative-integer?))
-(define trace-element? (cons/c loc? list?))
-(define trace? (listof trace-element?))
-;; well-formed trace: nodes with no siblings have a parent
-;; and nodes that aren't the oldest sibling (index 0) have a next-youngest
-;; this is a little slow right now - mabe overkill, but probably will have a similar
-;; complexity to a layout algorithm that scans the entire trace
-(define (trace-is-well-formed? trace)
-  (define locs (set))
-  (define (add-check-for-replaces loc)
-    (set! locs (set-remove-all locs (curry loc-prefix-same? loc)))
-    (set! locs (set-add locs loc)))
-  (for/and ([t-e (in-list trace)])
-    (add-check-for-replaces (car t-e))
-    (match t-e
-      [`(() ,rest ...)
-       #t]
-      [`((,locs-parent ... 0) ,rest ...)
-       (set-member? locs locs-parent)]
-      [`((,locs-parent ... ,n) ,rest ...)
-       (set-member? locs `(,@locs-parent ,(- n 1)))])))
-(define well-formed-trace? (and/c trace? trace-is-well-formed?))
-         
-(define (show-trace)
-  (define tr (get-most-recent-trace))
-  (when tr
-    (define trace (format-trace tr))
-    (when trace
-      (show-trace-frame trace))))
-
-;(define-struct gen-trace (tr-loc clause input state bound env) #:prefab)
-#;
-(vector 'info 
-        "generation-log: yes" 
-        (gen-trace '() (clause '(list (list (list))) '() '()'yes) '(list (list (name l_0 (nt l)))) #t 5 (env '#hash() '())) 
-        'generation-log)
-
-(define (format-trace tr)
-  (map (match-lambda
-             [(vector 'info clause-name
-                      (gen-trace tr-loc clause input state bound env) 'generation-log)
-              (list (reverse tr-loc) clause-name state input (clause-head-pat clause) bound 0 env)])
-           tr))
-
-(define/contract (show-trace-frame trace)
-  (-> well-formed-trace? any)
-  (define tf (new tree-frame% [t trace] [w 600] [h 600]))
-  (send tf display))
-
-(define (set-remove-all old-set pred?)
-  (for/fold ([new-s (set)])
-    ([s old-set])
-    (if (pred? s)
-        new-s
-        (set-add new-s s))))
-
-(define (loc-prefix-same? parent child)
-  (and (<= (length parent) (length child))
-       (for/and ([e1 parent] [e2 child])
-         (equal? e1 e2))))
-
-(struct gen-tree
-  (loc attributes [children #:mutable])
-  #:transparent)
-
-(struct attributes
-  (label id in-bound term body coords [focus #:mutable] env)
-  #:transparent)
-
-(struct coords
-  (x y)
-  #:transparent
-  #:mutable)
-
-(struct trace-step (path b-factor attributes)
-  #:transparent)
-
-(struct lvar (id) #:prefab)
-
-(define SCROLL-RANGE 10000)
-
-;; doesn't currently use all the information in the trace
-(define (make-tree trace)
-  (let loop ([tree (vector 0)]
-             [t trace])
-    (match t
-      [`((,loc ,name ,state ,term ,body ,bound ,depth ,env) ,remaining-traces ...)
-       (define atts (attributes name (gensym) (positive? bound) term body (coords #f #f) #f env))
-       (loop (insert-tree-atts loc atts tree) remaining-traces)]
-      [_
-       tree])))
-
-(define (trace-step-loc t-step)
-  (match t-step
-      [`(,loc ,name ,state ,term ,body ,bound ,depth ,env)
-       loc]))
-
-(define (trace-step->atts t-step)
-  (match t-step
-      [`(,loc ,name ,state ,term ,body ,bound ,depth ,env)
-       (attributes name (gensym) (positive? bound) term body (coords #f #f) #f env)]))
-
-(define (insert-tree-atts loc attributes tree-root)
-  (insert-tree-node loc (gen-tree loc attributes (make-vector 0)) tree-root))
-
-(define (insert-tree-node full-loc node tree-root)
-  (define (insert-node loc node tree)
-    (match loc
-      [`(,i) ;; append or replace
-       (cond [(or (= 0 (vector-length (gen-tree-children tree)))
-                  (not (vector-member full-loc
-                                 (vector-map gen-tree-loc (gen-tree-children tree)))))
-              (define new-children (vector-append (gen-tree-children tree)
-                                                  (vector node)))
-              (set-gen-tree-children! tree new-children)
-              #f]
-             [else
-              (define old-node 
-                (vector-ref (gen-tree-children tree) 
-                            (vector-member full-loc
-                                           (vector-map gen-tree-loc (gen-tree-children tree)))))
-              (vector-set! (gen-tree-children tree) i
-                           node)
-              old-node])]
-      [`(,i ,is ...)
-       (insert-node is node (vector-ref (gen-tree-children tree) i))]
-      ['() ;; initial tree (or replacement)
-       (set! tree-root node)]
-      [_ (error "tree didn't have expected generation pattern" loc tree)]))
-  (insert-node full-loc node tree-root)
-  tree-root)
-
-(define (get-node-at-loc loc tree-root)
-  (let recur ([t tree-root]
-              [l loc])
-    (match l
-      [`(,i)
-       (if (and (0 . < . (vector-length (gen-tree-children t)))
-                (i . < . (vector-length (gen-tree-children t))))
-           (vector-ref (gen-tree-children t) i)
-           #f)]
-      ['() t]
-      [`(,i ,is ...)
-       (recur (vector-ref (gen-tree-children t) i) is)]
-      [_ #f])))
-
-(define (remove-tree-node loc tree-root)
-  (let recur ([t tree-root]
-              [l loc])
-    (match l
-      [`(,i)
-       (if (= (vector-length (gen-tree-children t)) (+ i 1))
-           (set-gen-tree-children! t (vector-take (gen-tree-children t) i))
-           (error "can only remove the last child of a node"))]
-      [`(,i ,is ...)
-       (recur (vector-ref (gen-tree-children t) i) is)]
-      [`()
-       (error "can't remove tree root")]))
-  tree-root)
-
-
-(define (set-focus-to-true node)
-  (match node
-    [(gen-tree loc as cs)
-     (set-attributes-focus! as #t)]
-    [_
-     (void)]))
-
-(define (all-trees trace)
-  (for/list ([i (length trace)]) (make-tree (take trace i))))
- 
-(define no-pen (new pen% [style 'transparent]))
-(define no-brush (new brush% [style 'transparent]))
-(define green-brush (new brush% [color "Medium Sea Green"]))
-(define focus-brush (new brush% [color "Red"]))
-(define blue-pen (new pen% [color "Steel Blue"] [width 2]))
-(define grey-pen (new pen% [color "Light Slate Grey"] [width 1]))
-(define grey-brush (new pen% [color "Slate Grey"]))
-
-(define (add-layout-info tree locs->x-coords)
-  (let loop ([t tree]
-             [depth 1])
-    (match t
-      [(gen-tree loc (attributes p b-f b l l2 cs f e) children)
-       (for ([c children])
-         (loop c (add1 depth)))
-       (set-coords-x! cs (hash-ref locs->x-coords loc))
-       (set-coords-y! cs depth)]))
-  tree)
-
-(define (max-depth trace)
-  (define max-d 0)
-  (let loop ([t trace])
-    (match t
-      [`((,loc ,other-stuff ...) ,remaining-traces ...)
-       (when (> (add1 (length loc)) max-d)
-         (set! max-d (add1 (length loc))))
-       (loop remaining-traces)]
-      [_ max-d])))
-
-(define (raw-locs trace)
-  (map (match-lambda
-         [`(,loc ,name ,state ,term ,body ,bound ,depth ,env)
-          loc])
-       trace))
-
-;; handles keeping track of the trace
-;; and mutating the tree
-;; tree-frame does the drawing
-(define trace-state%
-  (class object%
-    
-    (init trace-init)
-    
-    (define step 0)
-    (define tree #f)
-    (define trace trace-init)
-    (define tr-locs (raw-locs trace))
-    (define-values (locs->widths locs->coords)
-      (trace->widths/coords tr-locs))
-    (define final-tree (make-tree trace))
-    (define width (hash-ref locs->widths '()))
-    (define depth (apply max (map length tr-locs)))
-    (define last-atts #f)
-    (define lvars->names (make-hash))
-    (define names-inc 0)
-    (define subtree-stack '())
-    
-    (super-new)
-    
-    (update-tree-one-step)
-    
-    (define/public (take-step)
-      (unless (equal? step (sub1 (length trace)))
-        (set! step (add1 step))
-        (update-tree-one-step)))
-    
-    (define/public (step-back)
-      (unless (= step 0)
-        (match (first subtree-stack)
-          [`(,loc ,subtree)
-           (if subtree
-             (set! tree (insert-tree-node loc subtree tree))
-             (set! tree (remove-tree-node loc tree)))])
-        (set! subtree-stack (rest subtree-stack))
-        (set! step (sub1 step))
-        (defocus)
-        (set-focus-to-true (get-node-at-loc (trace-step-loc (list-ref trace step)) tree))
-        (set! last-atts (trace-step->atts (list-ref trace step)))
-        (add-layout-info tree locs->coords)))
-    
-    (define/public (rewind)
-      (set! step 0)
-      (set! tree #f)
-      (update-tree-one-step))
-    
-    (define/public (fast-forward)
-      (for ([i (in-range (add1 step) (length trace))])
-        (take-step)))
-    
-    (define/public (get-tree) tree)
-    
-    (define/public (get-width) width)
-    (define/public (get-depth) depth)
-    
-    (define/public (current-atts)
-      last-atts)
-    
-    (define/public (prettify-pat term)
-      (match term
-        [`(name ,id ,bound)
-         id]
-        [`(list ,subterms ...)
-         (for/list ([s subterms]) (prettify-pat s))]
-        [`(cstr (,nts ...) ,term)
-         `(cstr (,@nts) ,(prettify-pat term))]
-        [_ term]))
-    
-    ;; TODO: "garbage collect" vars,
-    ;; treating rule and input as roots
-    (define/public (format-pattern p eqs)
-      (match p
-        [`(name ,id ,bound)
-         (format-pattern (hash-ref eqs (lvar id)) eqs)]
-        [(lvar id)
-         (format-pattern (hash-ref eqs (lvar id)) eqs)]
-        [`(list ,subterms ...)
-         (for/list ([s subterms]) (format-pattern s eqs))]
-        [`(cstr (,nts ...) ,p)
-         `(cstr (,@nts) ,(format-pattern p eqs))]
-        [_ p]))
-    
-    (define/public (update-focus x y-index)
-      (defocus)
-      (define as (get-coord-atts x y-index))
-      (when as
-        (set-attributes-focus! as #t))
-      as)
-    
-    (define/public (get-coord-atts x y-index)
-      (define (get-x t-node)
-        (match t-node
-          [(gen-tree loc (attributes p b-f b l l2 (coords x y) f e) cs)
-           x]
-          [_ +inf.0]))
-      (define closest-node
-        (let recur ([t tree]
-                    [d (sub1 y-index)])
-          (cond
-            [(= d 0)
-             t]
-            [else
-             (match t
-               [(gen-tree loc as '#())
-                #f]
-               [(gen-tree loc as children)
-                (define c-closest-ns (for/list ([c children])
-                                       (recur c (sub1 d))))
-                (first (sort c-closest-ns <
-                             #:key (λ (c) (if c 
-                                              (abs (- x (get-x c)))
-                                              +inf.0))))])])))
-      (match closest-node 
-        [(gen-tree loc as children)
-         (set-attributes-focus! as #t)
-         as]
-        [_ #f]))
-    
-    (define/public (focus-coords)
-      (let recur ([t tree])
-        (match t
-          [(gen-tree loc (attributes p b-f b l l2 cs #t e) children)
-           cs]
-          [(gen-tree loc as '#())
-           #f]
-          [(gen-tree loc as children)
-           (define s-t-l (memf (λ (e) e)
-                               (for/list ([c children]) (recur c))))
-           (if (or (not s-t-l) (empty? s-t-l))
-               #f
-               (first s-t-l))])))
-    
-    (define/public (format-info as)
-      (match as
-        [(attributes name id bound term body coords f e)
-         (define eqs (env-eqs e))
-         (define sorted-vars (sort (hash-keys eqs)
-                                   (λ (l r) (string<? (symbol->string (lvar-id l))
-                                                      (symbol->string (lvar-id r))))))
-         (string-append
-          (string-join
-           (for/list ([k sorted-vars])
-             (string-append (symbol->string (lvar-id k)) "\t = "
-                            (match (hash-ref eqs k)
-                              [(lvar next) (symbol->string next)]
-                              [`(name ,next ,_) (symbol->string next)]
-                              [_ " - "]) "\t = "
-                            (string-replace (pretty-format (format-pattern (hash-ref eqs k) eqs)) "\n" "\n\t   \t   ")))
-           "\n")
-          "\n\n"
-          (string-join
-           (for/list ([a-dq (in-list (env-dqs e))])
-             (match a-dq
-               [(dq ps dq-e)
-                    (string-append "∀ " (format "~s" ps)
-                                   (format "~s" (first dq-e)) " ≠\n\t"
-                                   (format "~s" (second dq-e)))])
-           "\n")))]))
-    
-    (define/private (defocus)
-      (let recur ([t tree])
-        (match t
-          [(gen-tree loc as '#())
-           (set-attributes-focus! as #f)]
-          [(gen-tree loc as children)
-           (set-attributes-focus! as #f)
-           (for ([c children]) (recur c))])))
-    
-    (define/private (update-tree-one-step)
-      (define trace-step (list-ref trace step))
-      (when tree (defocus))
-      (match trace-step
-        [`(,loc ,name ,state ,term ,body ,bound ,depth ,env)
-         (set! subtree-stack (cons (list loc (get-node-at-loc loc tree)) subtree-stack))
-         (define atts (attributes name (gensym) (positive? bound) term body (coords #f #f) #t env))
-         (set! last-atts atts)
-         (set! tree (insert-tree-atts loc atts tree))]
-        [_ (error "Trace had incorrect format, failed to update tree")])
-      (add-layout-info tree locs->coords))
-    
-    ))
-;; end trace-state%      
-
-  
-(define yscale-base .632)
-(define (set-y-base f) (set! yscale-base f))
-(define (ybase-sum) (/ yscale-base (- 1 yscale-base)))
-(define (find-ybase-center)
-  (define mid (/ (ybase-sum) 2))
-  (define sums (for/hash ([i 10])
-                 (values (abs (- mid
-                                 (apply + (for/list ([k i]) 
-                                            (expt yscale-base i)))))
-                         i)))
-  (hash-ref sums (apply min (hash-keys sums))))
-
-
-(define trans-steps 15)
-(define (set-t-s x) (set! trans-steps x))
-
-(define Y-SHIFT 0)
-(define (set-y-shift s) (set! Y-SHIFT s))
-
-(define tree-canvas%
-  (class canvas%
-    
-    (super-new)
-    
-    (define scroll-handler (λ (e) #f))
-    (define/public (set-scroll-handler f)
-      (set! scroll-handler f))
-    (define/override (on-scroll event)
-      (scroll-handler event))
-    
-    (define key-handler (λ (e) #f))
-    (define/public (set-key-handler f)
-      (set! key-handler f))
-    (define/override (on-char event)
-      (key-handler event))))
-
-(define tree-frame%
-  (class frame%
-    
-    (init t w h)
-    (define trace (new trace-state% [trace-init t]))
-    (define width w)
-    (define height h)
-    (define shift (/ w 2))
-    
-    (super-new [label "Generation Trace"])
-    
-    (define (t-width)
-      (send trace get-width))
-    (define (depth)
-      (send trace get-depth))
-    
-    (define y-index 1)
-    (define x-coord 0)
-    (define scale 1)
-    (define/private (rescale factor)
-      (set! scale (* scale factor)))
-    (define/private (trans-x x)
-      (set! x-coord (+ x-coord x))
-      (update-scroll-x x-coord))
-    (define/private (shift-y steps)
-      (set! y-index (+ y-index steps))
-      (update-scroll-y y-index))
-    
-    (define rescale-factor (/ w (t-width)))
-    (define scale-factor (if (= 0 (depth))
-                             1
-                             (expt rescale-factor (/ 1 (depth)))))
-    
-    (rescale rescale-factor)
-    (define canvas (new tree-canvas% [parent this]
-                        [min-width w]
-                        [min-height h]
-                        [style (list 'hscroll 'vscroll)]
-                        [paint-callback (lambda (canvas dc)
-                                          (draw-t))]))
-    (send canvas set-scroll-range 'horizontal SCROLL-RANGE)
-    (send canvas set-scroll-range 'vertical SCROLL-RANGE)
-    (send canvas set-scroll-pos 'vertical 0)
-    (send canvas set-scroll-pos 'horizontal (/ SCROLL-RANGE 2))
-    
-    (send canvas set-scroll-handler
-          (λ (event)
-            (define dir (send event get-direction))
-            (define pos (update-scroll-pos event))
-            (define x-pos x-coord)
-            (define y-pos y-index)
-            (match dir
-              ['horizontal
-               (set! x-pos (* (t-width) (- .5 (/ pos SCROLL-RANGE))))]
-              ['vertical
-               (set! y-pos (- (* (depth) (/ pos SCROLL-RANGE))))])
-            (animate-transition (- x-pos x-coord) (- y-pos y-index))))
-    
-    (send canvas set-key-handler
-          (λ (event)
-            (define-values (d-x d-y)
-              (match (send event get-key-code)
-                ['wheel-down
-                 (values 0 (- (/ (depth) 40)))]
-                ['wheel-up
-                 (values 0 (/ (depth) 40))]
-                ['wheel-right
-                 (values (- (/ (t-width) 40)) 0)]
-                ['wheel-left
-                 (values (/ (t-width) 40) 0)]
-                ['left
-                 (send trace step-back)
-                 (update/all-steps)
-                 (values #f #f)]
-                ['right
-                 (send trace take-step)
-                 (update/all-steps)
-                 (values #f #f)]
-                [_
-                 (values #f #f)]))
-            (when (and d-x d-y)
-              (animate-transition d-x d-y))))
-    
-    (define/private (update-scroll-pos event)
-      (define pos (send event get-position))
-      (match (send event get-event-type)
-        ['line-up
-         (- pos (/ SCROLL-RANGE 20))]
-        ['line-down
-         (+ pos (/ SCROLL-RANGE 20))]
-        ['page-up
-         (- pos (/ SCROLL-RANGE 20))]
-        ['page-down
-         (+ pos (/ SCROLL-RANGE 20))]
-        [_ pos]))
-    
-    (define/private (update-scroll-x x)
-      (send canvas set-scroll-pos 'horizontal (+ (* (- x) (/ SCROLL-RANGE (t-width))) 
-                                                 (/ SCROLL-RANGE 2))))
-    (define/private (update-scroll-y y-index)
-      (send canvas set-scroll-pos 'vertical (max 0 (* (/ y-index (- (max 1 (depth)))) SCROLL-RANGE))))
-                                          
-    (define dc (send canvas get-dc))
-    
-    (define/public (display)
-      (send this show #t))
-    
-    (define panel1 (new vertical-panel% [parent this]
-                             [min-height 80]
-                             [stretchable-height 80]))
-    (define panel2 (new horizontal-panel% [parent panel1]
-                             [min-height 40]
-                             [stretchable-height 40]))
-    (define rule-message (new text-field% [parent panel2]
-                              [label "Rule:"]))
-    (define rewind-button (new button% [parent panel2]
-                               [label "<<"]
-                               [callback (λ (b e)
-                                           (send trace rewind)
-                                           (update/all-steps))]))
-    (define back-button (new button% [parent panel2]
-                             [label "Back"]
-                             [callback (λ (b e)
-                                         (send trace step-back)
-                                         (update/all-steps))]))
-    (define step-button (new button% [parent panel2]
-                             [label "Step"]
-                             [callback (λ (b e)
-                                         (send trace take-step)
-                                         (update/all-steps))]))
-    (define ff-button (new button% [parent panel2]
-                           [label ">>"]
-                           [callback (λ (b e)
-                                       (send trace fast-forward)
-                                       (update/all-steps))]))
-    (define term-message (new text-field% [parent panel1]
-                              [label "Term:"]))
-    (define body-message (new text-field% [parent panel1]
-                              [label "Body:"]))
-    (update-messages)
-    
-    (define/private (update/all-steps)
-      (define f-coords (send trace focus-coords))
-      (cond
-        [f-coords
-         (define center-x (x-inv-map shift))
-         (define ∆x (- center-x (coords-x f-coords)))
-         (define ∆y (- 5 (+ y-index (coords-y f-coords))))
-         (animate-transition ∆x ∆y)]
-        [else
-         (send canvas refresh-now
-               (λ (dc) (draw-t)))])
-      (update-messages))
-    
-    (define/private (update-messages [atts #f])
-      (define as (if atts atts (send trace current-atts)))
-      (match as
-        [(attributes name id bound term body coords f e)
-         (send rule-message set-value (format "~s" name))
-         (send term-message set-value (format "~s" (send trace prettify-pat term)))
-         (send body-message set-value (format "~s" (send trace prettify-pat body)))])
-      (send panel1 refresh))
-    
-    (define/private (pop-info-window as)
-      (define info-w (new frame% [label "Environment"]
-                          [width 300]
-                          [height 300]))
-      (define output-string (send trace format-info as))
-      (define env-text (new text-field% [label #f]
-                            [parent info-w]
-                            [style '(multiple)]
-                            [init-value output-string]))
-      (send info-w show #t))
-    
-    (define y-scale (/ h (ybase-sum)))
-    (define y-cs (for/list ([y 10])
-                   (* y-scale
-                      (apply + (for/list ([i (in-range 1 y)]) (expt yscale-base i))))))
-    (define/private (i-for-y y-raw)
-      (define y (- y-raw Y-SHIFT))
-      (define diffs (for/hash ([i 10] [y-c y-cs]) 
-                      (values (+ 0.0 (abs (- y y-c))) i)))
-      (hash-ref diffs (+ 0.0 (apply min (hash-keys diffs)))))
-    
-    (define/private (delta-x x)
-      (/ (- (/ width 2) x) scale))
-    (define/private (x-inv-map x)
-      (- (/ (- x shift) scale) x-coord))
-    
-    (define/override (on-subwindow-event receiver event)
-      (cond 
-        [(and (eq? receiver canvas)
-              (send event button-down?))
-         (define x (send event get-x))
-         (define y (send event get-y))
-         (define ∆x (delta-x x))
-         (define actual-y (- (i-for-y y) y-index))
-         (define actual-x (x-inv-map x))
-         (cond 
-           [(send event button-down? 'left)
-            (define focus-as (send trace update-focus actual-x (round actual-y)))
-            (update-messages focus-as)
-            (send canvas refresh-now
-                  (λ (dc) (draw-t)))]
-           [(send event button-down? 'right)
-            (pop-info-window (send trace get-coord-atts actual-x (round actual-y)))])]
-        [else
-         #f]))
-    
-    (define/private (animate-transition ∆x ∆y)
-      (define scaling (expt scale-factor ∆y))
-      (define trans-steps (inexact->exact (ceiling (max (abs (/ (* ∆x 40) (t-width)))
-                                                        (if (= 0 (depth)) 0 (abs (/ (* ∆y 40) (depth))))
-                                                        1))))
-      (define dx (/ ∆x trans-steps))
-      (define dy (/ ∆y trans-steps))
-      (define ds (expt scaling (/ 1 trans-steps)))
-      (for ([i trans-steps])
-        (trans-x dx)
-        (shift-y dy)
-        (rescale ds)
-        (send canvas refresh-now
-              (λ (dc) (draw-t)))))
-    
-    (define map-y-memo (make-hash))
-    (define map-y-int-memo (make-hash))
-    (define/private (map-y-int y)
-      (hash-ref map-y-int-memo y
-                (λ ()
-                  (define res
-                    (if (< 0 y)
-                        (+ Y-SHIFT (* (apply + (for/list ([i (in-range 1 y)]) 
-                                                 (expt yscale-base i)))
-                                      y-scale))
-                        (- Y-SHIFT (* (+ (abs y) 1) y-scale))))
-                  (hash-set! map-y-int-memo y res)
-                  res)))
-    (define/private (map-y y)
-      (hash-ref map-y-memo y
-                (λ ()
-                  (define y-t (truncate y))
-                  (define res (if (= y y-t)
-                                  (map-y-int y)
-                                  (let ([frac (abs (- y y-t))]
-                                        [next (if (<= 0 y-t) (+ y-t 1) (- y-t 1))])
-                                    (+ (* frac (map-y-int next))
-                                       (* (- 1 frac) (map-y-int y-t))))))
-                  (hash-set! map-y-memo y res)
-                  res)))
-    
-    (define/private (adjust-x x)
-      (* scale (+ x-coord x)))
-    (define/private (adjust-y y)
-      (+ y y-index))
-    
-    (define/private (line x1-raw y1-raw x2-raw y2-raw)
-      (define x1 (adjust-x x1-raw))
-      (define x2 (adjust-x x2-raw))
-      (define y1 (adjust-y y1-raw))
-      (define y2 (adjust-y y2-raw))
-      (when (or (and (x1 . > . (- shift)) (x1 . < . shift) 
-                     (y1 . > . -1) (y1 . < . 10))
-                (and (x2 . > . (- shift)) (x2 . < . shift) 
-                     (y2 . > . -1) (y2 . < . 10)))
-        (send dc set-brush no-brush)
-        (send dc set-pen blue-pen)
-        (send dc draw-line (+ shift x1) (map-y y1) (+ shift x2) (map-y y2))))
-    
-    (define/private (node x-raw y-raw focus?)
-      (define x (adjust-x x-raw))
-      (define y (adjust-y y-raw))
-      (when (and (x . > . (- shift)) (x . < . shift)
-                 (y . < . 8) (y . > . -1))
-        (send dc set-pen no-pen)
-        (cond
-          [focus?
-           (send dc set-brush focus-brush)
-           (send dc draw-ellipse (+ shift (- x 7)) (- (map-y y) 7) 14 14)]
-          [else
-           (send dc set-brush green-brush)
-           (send dc draw-ellipse (+ shift (- x 5)) (- (map-y y) 5) 10 10)])))
-    
-    (define/private (draw-t)
-      (define (draw-subtree t d)
-        (match t
-          [(gen-tree loc (attributes p b-f b l l2 (coords x y) f e) '#())
-           (node x y f)]
-          [(gen-tree loc (attributes p b-f b l l2 (coords x y) f e) children)
-           (for ([c children])
-             (match c 
-               [(gen-tree loc (attributes p b-f b l l2 (coords c-x c-y) f e) children)
-                (line x y c-x c-y)
-                (draw-subtree c (add1 d))]))
-           (node x y f)]))
-      (send dc set-smoothing 'aligned)
-      (draw-subtree (send trace get-tree) 0))))
-
-;;; end treeframe%
diff --git a/pkgs/redex-pkgs/redex-gui-lib/redex/private/sexp-diffs.rkt b/pkgs/redex-pkgs/redex-gui-lib/redex/private/sexp-diffs.rkt
deleted file mode 100644
index 0fb01e9853..0000000000
--- a/pkgs/redex-pkgs/redex-gui-lib/redex/private/sexp-diffs.rkt
+++ /dev/null
@@ -1,183 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/contract
-         mrlib/graph
-         racket/pretty
-         racket/class
-         framework
-         "size-snip.rkt")
-
-(provide show-differences find-differences)
-
-(define (all-but-last l)
-  (let loop ([l l])
-    (cond
-      [(null? (cdr l)) null]
-      [else (cons (car l) (loop (cdr l)))])))
-
-(define (record-differences sexp1 sexp2)
-  (let ([ht (make-hasheq)])
-    ;; loop's result indicates if the sexps are different
-    (let loop ([sexp1 sexp1]
-               [sexp2 sexp2])
-      (cond
-        [(eq? sexp1 sexp2) #f]
-        [(and (pair? sexp1)
-              (pair? sexp2)
-              (equal? (d-length sexp1)
-                      (d-length sexp2)))
-         (let ([subs-same (map/d loop sexp1 sexp2)])
-           (if (and (andmap values subs-same)
-                    (not (= 1 (d-length sexp1))))
-               (begin
-                 (hash-set! ht sexp1 #t)
-                 (hash-set! ht sexp2 #t)
-                 #t)
-               #f))]
-        [(equal? sexp1 sexp2) #f]
-        [else 
-         (hash-set! ht sexp1 #t)
-         (hash-set! ht sexp2 #t)
-         #t]))
-    ht))
-
-(define (unwrap s)
-  (cond
-    [(pair? s) (cons (unwrap (car s))
-                     (unwrap (cdr s)))]
-    [(wrap? s) (wrap-content s)]
-    [else s]))
-
-(define (unkink s)
-  (let loop ([s s])
-    (cond
-      [(pair? s) (cons (loop (car s))
-                       (if (null? (cdr s))
-                           '()
-                           (loop (cdr s))))]
-      [(vector? s)
-       (list->vector (map loop (vector->list s)))]
-      [(box? s)
-       (box (loop (unbox s)))]
-      [(syntax? s) (datum->syntax s (unkink (loop (syntax-e s))) s)]
-      [(number? s) (make-wrap s)]
-      [(symbol? s) (make-wrap s)]
-      [(null? s) (make-wrap s)]
-      [(boolean? s) (make-wrap s)]
-      [(string? s) (make-wrap s)]
-      [(bytes? s) (make-wrap s)]
-      [(regexp? s) (make-wrap s)]
-      [else s])))
-
-(define-struct wrap (content) #:inspector (make-inspector))
-
-(define (show-differences orig-s1 orig-s2 columns)
-  (let-values ([(to-color-s1 to-color-s2)
-                (find-differences orig-s1 orig-s2 columns columns)])
-    (define f (new frame% [label ""] [width 600] [height 500]))
-    (define hp (new horizontal-panel% [parent f]))
-    (define t1 (new text:basic%))
-    (define t2 (new text:basic%))
-    (define c1 (new editor-canvas% 
-                    [parent hp]
-                    [editor t1]))
-    (define c2 (new editor-canvas% 
-                    [parent hp]
-                    [editor t2]))
-    (render-sexp/colors orig-s1 to-color-s1 t1 columns)
-    (render-sexp/colors orig-s2 to-color-s2 t2 columns)
-    (send f show #t)))
-
-(define (find-differences orig-s1 orig-s2 columns1 columns2)
-  (let ([s1 (unkink orig-s1)]
-        [s2 (unkink orig-s2)])
-    (define diff-ht (record-differences s1 s2))
-    (values (find-coloring s1 diff-ht columns1)
-            (find-coloring s2 diff-ht columns2))))
-
-;; render-sexp/colors : sexp ht text -> void
-(define (render-sexp/colors sexp to-color text columns)
-  (let ([start '()])
-    ((pretty-print-parameters)
-     (λ ()
-       (parameterize ([pretty-print-columns columns])
-         (pretty-write sexp (open-output-text-editor text)))))
-    (for-each 
-     (λ (p) (send text highlight-range (car p) (cdr p) (send the-color-database find-color "NavajoWhite")))
-     to-color)
-    (send text change-style 
-          (make-object style-delta% 'change-family 'modern)
-          0
-          (send text last-position))))
-
-(define (find-coloring sexp diff-ht columns)
-  (let* ([start '()]
-         [to-color '()]
-         [pending-bytes (bytes)]
-         [position 0]
-         [counting-port
-          (make-output-port 'counting-port
-                            always-evt
-                            (λ (bs start end can-block? breaks?)
-                              (cond
-                                [(= 0 (bytes-length bs))
-                                 0]
-                                [else
-                                 (set! pending-bytes (bytes-append pending-bytes (bytes (bytes-ref bs start))))
-                                 (let ([str (with-handlers ([exn:fail:contract? (λ (x) #f)])
-                                              (bytes->string/utf-8 pending-bytes))])
-                                   (when str
-                                     (set! position (+ position (string-length str)))
-                                     (set! pending-bytes (bytes))))
-                                 1]))
-                            void)])
-    ((pretty-print-parameters)
-     (λ ()
-       (parameterize ([pretty-print-columns columns]
-                      [pretty-print-remap-stylable
-                       (λ (val)
-                         (and (wrap? val)
-                              (symbol? (wrap-content val))
-                              (wrap-content val)))]
-                      [pretty-print-size-hook
-                       (λ (val dsp? port)
-                         (if (wrap? val)
-                             (or (default-pretty-printer-size-hook (wrap-content val) dsp? port)
-                                 (string-length (format "~s" (wrap-content val))))
-                             (default-pretty-printer-size-hook val dsp? port)))]
-                      [pretty-print-print-hook
-                       (λ (val dsp? port)
-                         (let ([unwrapped (if (wrap? val) (wrap-content val) val)])
-                           (default-pretty-printer-print-hook unwrapped dsp? port)))]
-                      [pretty-print-pre-print-hook
-                       (λ (obj port)
-                         (when (hash-ref diff-ht obj #f)
-                           (flush-output port)
-                           (set! start (cons position start))))]
-                      [pretty-print-post-print-hook
-                       (λ (obj port)
-                         (when (hash-ref diff-ht obj #f)
-                           (flush-output port)
-                           (set! to-color (cons (cons (car start) position) to-color))
-                           (set! start (cdr start))))])
-         (pretty-write sexp counting-port))))
-    to-color))
-
-;; does a map-like operation, but if the list is dotted, flattens the results into an actual list.
-(define (map/d f l1 l2)
-  (let loop ([l1 l1]
-             [l2 l2])
-    (cond
-      [(pair? l1)
-       (cons (f (car l1) (car l2))
-             (loop (cdr l1) (cdr l2)))]
-      [(null? l1) null]
-      [else (list (f l1 l2))])))
-
-(define (d-length l1)
-  (let loop ([l1 l1]
-             [n 0])
-    (cond
-      [(pair? l1) (loop (cdr l1) (+ n 1))]
-      [(null? l1) n]
-      [else (cons 'dotted (+ n 1))])))
diff --git a/pkgs/redex-pkgs/redex-gui-lib/redex/private/show-derivations.rkt b/pkgs/redex-pkgs/redex-gui-lib/redex/private/show-derivations.rkt
deleted file mode 100644
index a3387c79dc..0000000000
--- a/pkgs/redex-pkgs/redex-gui-lib/redex/private/show-derivations.rkt
+++ /dev/null
@@ -1,339 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/gui/base
-         racket/match
-         racket/pretty
-         framework
-         "size-snip.rkt"
-         redex/private/judgment-form
-         "traces.rkt")
-
-(provide show-derivations
-         derivation/ps)
-
-(define sub-derivation-horizontal-gap 20)
-(define sub-derivation-vertical-gap 10) ;; must be even
-
-(define (derivation/ps derivation filename
-                       #:pp [pp default-pretty-printer]
-                       #:racket-colors? [racket-colors? #f]
-                       #:post-process [post-process void])
-  (define-values (ec pb)
-    (parameterize ([actually-show-window #f])
-      (show-derivations (list derivation)
-                        #:pp pp
-                        #:racket-colors? racket-colors?)))
-  (post-process pb)
-  (print-to-ps pb ec filename))
-
-(define actually-show-window (make-parameter #t))
-
-(define (show-derivations derivations
-                          #:pp [pp default-pretty-printer]
-                          #:racket-colors? [racket-colors? #f]
-                          #:init-derivation [init-derivation 0])
-  (define init-cw (initial-char-width))
-  (define f (new (class deriv-frame%
-                   (define size-callback-queued? #f)
-                   (define/override (on-size w h)
-                     (unless size-callback-queued?
-                       (set! size-callback-queued? #t)
-                       (queue-callback
-                        (λ ()
-                          (set! size-callback-queued? #f)
-                          (send pb begin-edit-sequence)
-                          (send pb re-run-layout)
-                          (send pb end-edit-sequence))
-                        #f))
-                     (super on-size w h))
-                   (super-new [label "PLT Redex Judgment Form Derivations"]
-                              [width 400]
-                              [height 400]))))
-  (define ac (send f get-area-container))
-  (define pb #f)
-  (define current-derivation #f)
-  (define ec (new editor-canvas% 
-                  [parent ac]))
-  (send f reflow-container)
-    
-  (define (show-derivation i)
-    (set! current-derivation i)
-    (set! pb (new derivation-pb%))
-    (send ec set-editor pb)
-    (send f reflow-container)
-    (send pb begin-edit-sequence)
-    (fill-derivation-pb pb (list-ref derivations i) pp racket-colors? 
-                        (if char-width-slider
-                            (send char-width-slider get-value)
-                            init-cw))
-    (send which-msg set-label (ith-label i))
-    (send pb end-edit-sequence))
-  
-  (define controls-panel (new vertical-panel% [parent ac] [stretchable-height #f]))
-  (define which-derivation-panel (new horizontal-panel% [parent ac] [stretchable-height #f] [alignment '(right center)]))
-  
-  (define (next/prev-derivation dir label)
-    (new button%
-         [label label]
-         [parent which-derivation-panel]
-         [callback
-          (λ (x y)
-            (show-derivation (modulo (+ current-derivation dir)
-                                     (length derivations))))]))
-  (next/prev-derivation -1 "Prev Derivation")
-  (define (ith-label i)
-    (format "~a / ~a" (+ i 1) (length derivations)))
-  (define which-msg
-    (new message% 
-         [label (ith-label (- (length derivations) 1))]
-         [parent which-derivation-panel]))
-  (next/prev-derivation +1 "Next Derivation")
-  (when (<= (length derivations) 1)
-    (send ac change-children
-          (λ (l) (remq which-derivation-panel l))))
-  
-  (define (set-all-cws cw)
-    (when pb
-      (let loop ([snip (send pb find-first-snip)])
-        (when snip
-          (when (is-a? snip deriv-editor-snip%)
-            (send snip set-char-width cw))
-          (loop (send snip next))))))
-  
-  (define char-width-slider 
-    (and (number? init-cw)
-         (new slider%
-              [parent controls-panel]
-              [min-value 2]
-              [max-value 100]
-              [init-value init-cw]
-              [label "Pretty Print Width"]
-              [callback
-               (λ (_1 _2)
-                 (when pb
-                   (send pb begin-edit-sequence)
-                   (set-all-cws (send char-width-slider get-value))
-                   (send pb re-run-layout)
-                   (send pb end-edit-sequence)))])))
-  (show-derivation 0)
-  (cond
-    [(actually-show-window)
-     (send f show #t)]
-    [else
-     (values ec pb)]))
-
-(define deriv-frame%
-  (frame:standard-menus-mixin (frame:basic-mixin frame%)))
-
-(define (fill-derivation-pb pb derivation pp racket-colors? cw)
-  (define top-snip
-    (let loop ([derivation derivation])
-      (define children
-        (reverse
-         (for/fold ([children '()]) ([sub (in-list (derivation-subs derivation))])
-           (define child (loop sub))
-           (cons child children))))
-      (define line-snip (new line-snip%))
-      (define name-snip (and (derivation-name derivation)
-                             (make-object string-snip% 
-                               (format " [~a]" (derivation-name derivation)))))
-      (define snip (make-snip (derivation-term derivation) 
-                              children
-                              pp
-                              racket-colors?
-                              (get-user-char-width 
-                               cw
-                               (derivation-term derivation))
-                              line-snip
-                              name-snip))
-      (send snip set-derivation-children children)
-      (send pb insert snip)
-      (send pb insert line-snip)
-      (when name-snip (send pb insert name-snip))
-      snip))
-  (send pb set-top-snip top-snip)
-  (send pb re-run-layout))
-
-(define derivation-pb%
-  (class pasteboard%
-    
-    (define top-snip #f)
-    (define/public (set-top-snip ts) (set! top-snip ts))
-    (define/public (get-top-snip) top-snip)
-    
-    (define/public (re-run-layout)
-      (define table (make-hash))
-      (send top-snip resize-derivation this table)
-      (define admin (send this get-admin))
-      (define-values (init-x init-y)
-        (cond
-          [admin
-           (define bw (box 0))
-           (define bh (box 0))
-           (send admin get-view #f #f bw bh)
-           (match-define (cons derivation-width derivation-height) (hash-ref table top-snip))
-           (values (max 0 (- (/ (unbox bw) 2) (/ derivation-width 2)))
-                   (max 0 (- (/ (unbox bh) 2) (/ derivation-height 2))))]
-          [else
-           (values 0 0)]))
-      (send top-snip layout-derivation table this init-x init-y))
-    
-    (define/augment (can-interactive-resize? evt) #f)
-    (define/augment (can-interactive-move? evt) #f)
-    (define/augment (can-select? snip on?) (not on?))
-    
-    (inherit get-focus-snip)
-    
-    (super-new)
-    
-    (inherit set-keymap)
-    (set-keymap pb-km)))
-
-(define pb-km (new keymap%))
-(send pb-km add-function "set-focus"
-      (λ (pb evt)
-        (define-values (x y) (send pb dc-location-to-editor-location
-                                   (send evt get-x)
-                                   (send evt get-y)))
-        (define snp (send pb find-snip x y))
-        (cond
-          [(not snp)
-           (send pb set-caret-owner #f)]
-          [(is-a? snp deriv-editor-snip%)
-           (send pb set-caret-owner snp)])))
-(send pb-km map-function "leftbutton" "set-focus")
-
-(define deriv-text%
-  (class size-text%
-    (inherit get-admin)
-    (define/override (on-focus on?)
-      (define admin (get-admin))
-      (when (is-a? admin editor-snip-editor-admin<%>)
-        (define snip (send admin get-snip))
-        (send snip show-border on?)))
-    (super-new)))
-
-(define (make-snip expr children pp code-colors? cw line-snip name-snip)
-  (let* ([text (new deriv-text%)]
-         [es (instantiate deriv-editor-snip% ()
-               [char-width cw]
-               [editor text]
-               [pp pp]
-               [expr expr]
-               [with-border? #f]
-               [line-snip line-snip]
-               [name-snip name-snip])])
-    (send text set-autowrap-bitmap #f)
-    (send text set-max-width 'none)
-    (send text freeze-colorer)
-    (unless code-colors?
-      (send text stop-colorer #t))
-    (send es format-expr)
-    es))
-
-(define deriv-editor-snip%
-  (class* size-editor-snip% ()
-    (define derivation-children '())
-    (define/public (set-derivation-children c) (set! derivation-children c))
-    (init-field line-snip)
-    (init-field name-snip)
-    
-    (define/public (resize-derivation pb table)
-      (let loop ([derivation derivation])
-        (define-values (children-width children-height)
-          (for/fold ([width 0]
-                     [height 0])
-            ([child (in-list derivation-children)])
-            (define-values (this-w this-h) (send child resize-derivation pb table))
-            (values (+ width this-w)
-                    (max height this-h))))
-        (define sub-derivation-width
-          (if (null? derivation-children)
-              0
-              (+ children-width (* (- (length derivation-children)
-                                      1)
-                                   sub-derivation-horizontal-gap))))
-        (define name-width (if name-snip
-                               (find-snip-width pb name-snip)
-                               0))
-        (define derivation-width
-          (+ (max sub-derivation-width
-                  (find-snip-width pb this))
-             name-width))
-        (define derivation-height
-          (+ children-height
-             sub-derivation-vertical-gap
-             (find-snip-height pb this)))
-        (hash-set! table this (cons derivation-width derivation-height))
-        (values derivation-width derivation-height)))
-    
-    (define/public (layout-derivation table pb dx dy)
-      (match-define (cons derivation-width derivation-height) (hash-ref table this))
-      (define my-height (find-snip-height pb this))
-      (define my-width (find-snip-width pb this))
-      (define name-snip-width (if name-snip
-                                  (find-snip-width pb name-snip)
-                                  0))
-      (define my-x (+ dx (- (/ (- derivation-width name-snip-width) 2) (/ my-width 2))))
-      (define my-y (+ dy derivation-height (- my-height)))
-      (define children-width
-        (for/sum ([child (in-list derivation-children)])
-          (car (hash-ref table child))))
-      (define start-dx (+ dx (/ (- (- derivation-width name-snip-width) children-width) 2)))
-      (send pb move-to this my-x my-y)
-      (send pb move-to line-snip dx (- my-y (/ sub-derivation-vertical-gap 2)))
-      (send line-snip set-width (- derivation-width name-snip-width))
-      (when name-snip
-        (define name-snip-height (find-snip-height pb name-snip))
-        (send pb move-to name-snip 
-              (+ dx derivation-width (- name-snip-width))
-              (- my-y (/ sub-derivation-vertical-gap 2) (/ name-snip-height 2))))
-      (for/fold ([dx start-dx]) ([snip (in-list derivation-children)])
-        (define that-ones-width (car (hash-ref table snip)))
-        (define that-ones-height (cdr (hash-ref table snip)))
-        (send snip layout-derivation table
-              pb
-              dx
-              (+ dy (- derivation-height that-ones-height my-height sub-derivation-vertical-gap)))
-        (+ dx that-ones-width sub-derivation-horizontal-gap)))
-    
-    (super-new)))
-
-(define line-snip%
-  (class snip%
-    (inherit get-admin)
-    (define width 10)
-    (define/public (set-width w) 
-      (unless (equal? w width)
-        (define admin (get-admin))
-        (set! width w) 
-        (when admin 
-          (send admin resized this #f)
-          (send admin needs-update this 0 0 w 1))))
-    (define/override (copy)
-      (define c (new line-snip%))
-      (send c set-width width)
-      c)
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (define old-smoothing (send dc get-smoothing))
-      (define old-pen (send dc get-pen))
-      (send dc set-pen "black" 1 'transparent)
-      (send dc set-brush "black" 'solid)
-      (send dc set-smoothing 'aligned)
-      (send dc draw-rectangle x y width 1)
-      (send dc set-smoothing old-smoothing)
-      (send dc set-pen old-pen))
-    (define/override (get-extent dc x y wb hb db sb lb rb)
-      (super get-extent dc x y wb hb db sb lb rb)
-      (set-box/f wb width)
-      (set-box/f hb 1))
-    (inherit set-snipclass)
-    (super-new)
-    (set-snipclass line-snipclass)))
-
-(define (set-box/f b v) (when (box? b) (set-box! b v)))
-
-(define line-snipclass (new snip-class%))
-(send line-snipclass set-classname "redex:derivation-line")
-(send line-snipclass set-version 1)
-(send (get-the-snip-class-list) add line-snipclass)
diff --git a/pkgs/redex-pkgs/redex-gui-lib/redex/private/size-snip.rkt b/pkgs/redex-pkgs/redex-gui-lib/redex/private/size-snip.rkt
deleted file mode 100644
index 02daec2cc4..0000000000
--- a/pkgs/redex-pkgs/redex-gui-lib/redex/private/size-snip.rkt
+++ /dev/null
@@ -1,215 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class
-         framework
-         racket/pretty
-         redex/private/lang-struct
-         redex/private/matcher)
-
-(provide reflowing-snip<%>
-         size-editor-snip%
-         size-text%
-         default-pretty-printer
-         default-pretty-printer-size-hook
-         default-pretty-printer-print-hook
-         pretty-print-parameters
-         initial-char-width
-         resizing-pasteboard-mixin
-         get-user-char-width
-         find-snip-height
-         find-snip-width)
-
-(define initial-char-width (make-parameter 30))
-
-;; get-user-char-width : value-bound-to-'initial-char-width'-parameter sexp -> number
-(define (get-user-char-width cw/proc expr)
-  (cond
-    [(number? cw/proc) cw/proc]
-    [else (cw/proc expr)]))
-
-(define pretty-print-parameters (make-parameter (λ (thunk) (thunk))))
-  
-(define (default-pretty-printer v port w spec)
-  (parameterize ([pretty-print-columns w]
-                 [pretty-print-size-hook default-pretty-printer-size-hook]
-                 [pretty-print-print-hook default-pretty-printer-print-hook])
-    ((pretty-print-parameters)
-     (λ ()
-       (pretty-write v port)))))
-
-(define (default-pretty-printer-size-hook val display? op)
-  (cond
-    [(hole? val) 4]
-    [(eq? val 'hole) 6]
-    [else #f]))
-
-(define (default-pretty-printer-print-hook val display? op)
-  (cond
-    [(hole? val)
-     (display "hole" op)]
-    [(eq? val 'hole) 
-     (display ",'hole" op)]
-    [else (write val op)]))
-
-(define reflowing-snip<%>
-  (interface ()
-    reflow-program))
-
-(define (resizing-pasteboard-mixin pb%)
-  (class pb%
-    
-    (define/augment (on-interactive-resize snip)
-      (when (is-a? snip reflowing-snip<%>)
-        (send snip reflow-program))
-      (inner (void) on-interactive-resize snip))
-    
-    (define/augment (after-interactive-resize snip)
-      (when (is-a? snip reflowing-snip<%>)
-        (send snip reflow-program))
-      (inner (void) after-interactive-resize snip))
-    
-    (define/override (interactive-adjust-resize snip w h)
-      (super interactive-adjust-resize snip w h)
-      (when (is-a? snip reflowing-snip<%>)
-        (send snip reflow-program)))
-    
-    (inherit get-snip-location
-             begin-edit-sequence
-             end-edit-sequence
-             find-first-snip
-             get-dc)
-    
-    (super-new)))
-
-(define size-editor-snip%
-  (class* editor-snip% (reflowing-snip<%>)
-    (init-field expr)
-    (init pp)
-    (init-field char-width)
-    (define real-pp
-      (if (procedure-arity-includes? pp 4)
-          pp
-          (lambda (v port w spec) (display (pp v) port))))
-    
-    (inherit get-admin)
-    (define/public (get-expr) expr)
-    (define/public (get-char-width) char-width)
-    (define/public (set-char-width cw) 
-      (unless (equal? char-width cw)
-        (set! char-width cw)
-        (format-expr)
-        (on-width-changed char-width)))
-    
-    (define/override (resize w h)
-      (super resize w h)
-      (reflow-program))
-    
-    (inherit get-editor)
-    ;; final
-    (define/pubment (reflow-program)
-      (let* ([tw (get-width-of-char)]
-             [sw (get-snip-width)])
-        (when (and tw sw)
-          (let ([new-width (max 1 (inexact->exact (floor (/ sw tw))))])
-            (unless (equal? new-width char-width)
-              (set! char-width new-width)
-              (format-expr)
-              (on-width-changed char-width))))))
-    
-    (inherit get-margin)
-    (define/public (get-snip-width)
-      (let ([admin (get-admin)])
-        (and admin
-             (let ([containing-editor (send admin get-editor)]
-                   [bl (box 0)]
-                   [br (box 0)])
-               (send containing-editor get-snip-location this bl #f #f)
-               (send containing-editor get-snip-location this br #f #t)
-               (let ([outer-w (- (unbox br) (unbox bl))])
-                 (let-values ([(hms vms) (get-margin-space)])
-                   (- outer-w hms)))))))
-    
-    (define/private (get-margin-space)
-      (let ([bl (box 0)]
-            [br (box 0)]
-            [bt (box 0)]
-            [bb (box 0)])
-        (get-margin bl bt br bb)
-        (values (+ (unbox bl) (unbox br) 6)   ;; not sure what the 2 is for. Maybe caret space?
-                (+ (unbox bt) (unbox bb)))))
-    
-    ;; get-width-of-char : -> number or false
-    ;; depends on `dc' field
-    (define/public (get-width-of-char)
-      (let ([ed (get-editor)])
-        (and ed
-             (let ([std-style (send (editor:get-standard-style-list) find-named-style "Standard")]
-                   [dc (send ed get-dc)])
-               (and dc
-                    (let-values ([(tw th _2 _3) (send dc get-text-extent "w"
-                                                      (and std-style
-                                                           (send std-style get-font)))])
-                      tw))))))
-    
-    ;; depends on `dc' field
-    (define/public (get-height-of-char)
-      (let ([ed (get-editor)])
-        (and ed
-             (let ([dc (send ed get-dc)]
-                   [std-style (send (editor:get-standard-style-list) find-named-style "Standard")])
-               (and dc
-                    (let-values ([(tw th _2 _3) (send dc get-text-extent "w"
-                                                      (and std-style
-                                                           (send std-style get-font)))])
-                      th))))))
-    
-    (define/pubment (on-width-changed w) (inner (void) on-width-changed w))
-    
-    (define/public (format-expr)
-      (let* ([text (get-editor)]
-             [port (open-output-text-editor text)])
-        (send text begin-edit-sequence)
-        (when (is-a? text color:text<%>)
-          (send text thaw-colorer))
-        (send text set-styles-sticky #f)
-        (send text erase)
-        (real-pp expr port char-width text)
-        (unless (zero? (send text last-position))
-          (when (char=? #\newline (send text get-character (- (send text last-position) 1)))
-            (send text delete (- (send text last-position) 1) (send text last-position))))
-        (when (is-a? text color:text<%>)
-          (send text freeze-colorer))
-        (send text end-edit-sequence)))
-    
-    (super-new)
-    (inherit use-style-background)
-    (use-style-background #t)))
-
-(define size-text%
-  (racket:set-mode-mixin
-   (racket:text-mixin
-    (editor:keymap-mixin
-     (color:text-mixin
-      (text:autocomplete-mixin
-       (mode:host-text-mixin
-        (editor:standard-style-list-mixin
-         text:basic%))))))))
-
-
-
-;; find-snip-height : editor snip -> number
-(define (find-snip-height ed snip)
-  (let ([bt (box 0)]
-        [bb (box 0)])
-    (send ed get-snip-location snip #f bt #f)
-    (send ed get-snip-location snip #f bb #t)
-    (- (unbox bb)
-       (unbox bt))))
-
-(define (find-snip-width ed snip)
-  (let ([br (box 0)]
-        [bl (box 0)])
-    (send ed get-snip-location snip br #f #t)
-    (send ed get-snip-location snip bl #f #f)
-    (- (unbox br)
-       (unbox bl))))
diff --git a/pkgs/redex-pkgs/redex-gui-lib/redex/private/stepper.rkt b/pkgs/redex-pkgs/redex-gui-lib/redex/private/stepper.rkt
deleted file mode 100644
index f37e166ffd..0000000000
--- a/pkgs/redex-pkgs/redex-gui-lib/redex/private/stepper.rkt
+++ /dev/null
@@ -1,913 +0,0 @@
-#|
-
-todo:
-
-  - tree diff
-
-  - step until a particular reduction happens (or a choice point is reached)
-  
-  - break points: supply a function to traces that is a predicate on terms, indicating if
-    this one is one where the -> button should stop.
-
-|#
-
-#lang racket/base
-
-(require racket/pretty
-         racket/gui/base
-         racket/list
-         racket/class
-         racket/set
-         framework
-         mrlib/graph
-         racket/contract
-         "sexp-diffs.rkt"
-         "size-snip.rkt"
-         redex/private/reduction-semantics)
-  
-  (provide stepper stepper/seed
-           
-           ; for testing
-           show-diff node%)
-  
-  (define dot-spacing 20)
-  (define dot-size 10)
-  (define initial-color "white")
-  (define in-path-color "orchid")
-  (define visible-color "purple")
-  (define cycle-color "yellow")
-  (define visible-cycle-color "gold")
-  
-  (define (pick-label candidate fallback)
-    (cond
-      [(andmap (λ (x) (send normal-control-font screen-glyph-exists? x #t))
-               (string->list candidate))
-       candidate]
-      [else
-       fallback]))
-  
-  ;; initial-button-label is just used to give some space to the buttons on non-mac platforms
-  (define initial-button-label (pick-label "↩→↕" "<->-"))
-  
-  (define forward-label (pick-label "→" "->"))
-  (define updown-label (pick-label "↕" "^"))
-  (define back-label (pick-label "↩" "<-"))
-  
-  (define (stepper red term [pp default-pretty-printer])
-    (stepper/seed red (list term) pp))
-  
-  (define (stepper/seed red seed [pp default-pretty-printer])
-    (define term (car seed))
-    ;; all-nodes-ht : hash[sexp -o> (is-a/c node%)]
-    (define all-nodes-ht (make-hash))
-    
-    (define root (new node%
-                      [pp pp]
-                      [all-nodes-ht all-nodes-ht]
-                      [term term]
-                      [red red]
-                      [change-path (λ (new-node) (change-path new-node))]
-                      [init-cw (initial-char-width)]))
-    
-    ;; path : (listof (listof (is-a/c node%))
-    ;; the currently visible columns in the pasteboard
-    (define path (cons (list root) '()))
-    
-    (define f (new frame% 
-                   [label "PLT Redex Stepper"]
-                   [width 700]
-                   [height 450]))
-    (define dp (new vertical-panel% [parent f]))
-    (define upper-hp (new horizontal-panel% [parent dp]))
-    (define lower-hp (new horizontal-panel% [alignment '(center center)] [parent f] [stretchable-height #f]))
-    
-    (define (moved left top right bottom)
-      (let ([bx (box 0)])
-        (let loop ([path path])
-          (cond
-            [(null? path) (void)]
-            [else
-             (let* ([path-ele (car path)]
-                    [snip (send (car path-ele) get-big-snip)]
-                    [visible?
-                     (or (begin (send pb get-snip-location snip bx #f #f)
-                                (<= left (unbox bx) right))
-                         (begin (send pb get-snip-location snip bx #f #t)
-                                (<= left (unbox bx) right)))])
-               (for-each (λ (node) (send node set-visible? visible?))
-                         path-ele))
-             (loop (cdr path))]))))
-    
-    (define pb (new columnar-pasteboard% [moved moved]))
-    
-    (define ec (new forward-size-editor-canvas% [parent upper-hp] [editor pb] [style '(#;no-vscroll)]))
-    (define bp-outer (new vertical-panel% [parent upper-hp] [stretchable-width #f]))
-    (define bp (new vertical-panel% [parent bp-outer] [stretchable-width #f]))
-    (define bp-spacer (new grow-box-spacer-pane% [parent bp-outer]))
-    
-    (define zoom-out-pb (new zoom-out-pasteboard%))
-    (define zoom-out-ec (new editor-canvas% 
-                             [stretchable-height #t]
-                             [parent lower-hp]
-                             [style '(hide-vscroll)]
-                             [editor zoom-out-pb]))
-    
-    (define choice-vp (new vertical-panel% [alignment '(center center)] [parent lower-hp] [stretchable-width #f]))
-    (define reduction-names (reduction-relation->rule-names red))
-    (define reds-choice 
-      (and (not (null? reduction-names))
-           (new choice%
-                [parent choice-vp]
-                [font small-control-font]
-                [label #f]
-                [choices (list* "Single Step"
-                                "Step Until Choice"
-                                (map (λ (x) (format "Reduce until ~a" x))
-                                     reduction-names))])))
-    (define red-name-message
-      (and (not (null? (reduction-relation->rule-names red)))
-           (new message% 
-                [parent choice-vp] 
-                [stretchable-width #t]
-                [font small-control-font] 
-                [label ""])))
-    (define stupid-internal-definition-syntax1 (new grow-box-spacer-pane% [parent lower-hp]))
-    
-    (define (update-buttons)
-      (let ([last-column (last path)])
-        (let ([last-column last-column])
-          (let loop ([children (send bp get-children)]
-                     [n 0])
-            (cond
-              [(= n (length last-column)) 
-               (send bp change-children
-                     (λ (l)
-                       (filter (λ (p) (not (memq p children))) l)))
-               (void)]
-              [(null? children)
-               (new button-object% 
-                    [parent bp]
-                    [n n])
-               (loop children
-                     (+ n 1))]
-              [else
-               (loop (cdr children)
-                     (+ n 1))])))
-        (let ([button-objects (send bp get-children)])
-          (if (null? (cdr button-objects))
-              (send (car button-objects) hide-vertical)
-              (for-each (λ (x) (send x show-vertical))
-                        button-objects))
-          (for-each (λ (node button-object)
-                      (cond
-                        [(not (null? (send node get-cycle)))
-                         (send button-object step-goes-back #t)
-                         (send button-object enable-step #f)]
-                        [else
-                         (send button-object step-goes-back #f)
-                         (send button-object enable-step (not (null? (send node get-successors))))]))
-                    last-column
-                    button-objects))))
-    
-    (define button-object%
-      (class vertical-panel%
-        (init-field n)
-        (super-new [style '(border)]
-                   [alignment '(left center)])
-        
-        (inherit change-children)
-        (define/public (hide-vertical)
-          (change-children (λ (x) (remq expand-button x))))
-        (define/public (show-vertical)
-          (change-children (λ (x) (if (memq expand-button x)
-                                      x
-                                      (append x (list expand-button))))))
-        
-        (define/public (enable-step on?)
-          (send step-button enable on?))
-        
-        (define/public (step-goes-back back?)
-          (send step-button set-label 
-                (if back? 
-                    back-label 
-                    forward-label)))
-        
-        (define step-button
-          (new button%
-               [label initial-button-label]
-               [callback (λ (x y) (forward-step n))]
-               [parent this]))
-        (define expand-button
-          (new button% 
-               [label initial-button-label] 
-               [callback (λ (x y) (expand n))] 
-               [parent this]))
-        
-        (send step-button set-label forward-label)
-        (send expand-button set-label updown-label)))
-    
-    (define (forward-step n)
-      (let* ([last-pr (last-pair path)]
-             [last-column (car last-pr)]
-             [click-target (list-ref last-column n)])
-        (cond
-          [(not (null? (send click-target get-cycle)))
-           (void)]
-          [else
-           (let ([new-path-tail (iterate-until-done click-target)])
-             (for-each (λ (x) (send x set-in-path? (eq? x click-target))) last-column)
-             (for-each (λ (new-children)
-                         (for-each (λ (x) (send x set-in-path? #t)) new-children))
-                       new-path-tail)
-             (set! path
-                   (let loop ([path path])
-                     (cond
-                       [(null? (cdr path))
-                        (cons (list click-target)
-                              new-path-tail)]
-                       [else (cons (car path) (loop (cdr path)))])))
-             (update-everything)
-             (update-highlight-to-end))])))
-    
-    ;; iterate-until-done : node -> (listof (listof node))
-    ;; iterates forward in the path until a choice point is reached
-    ;; or until we hit a stopping point. return the new tail of the path
-    (define (iterate-until-done click-target)
-      (let ([looking-for
-             (cond
-               [(or (not reds-choice)
-                    (zero? (send reds-choice get-selection)))
-                #f]
-               [(equal? (send reds-choice get-selection) 1)
-                #t]
-               [else (symbol->string
-                      (list-ref reduction-names (- (send reds-choice get-selection) 2)))])])
-        (let loop ([next-node click-target]
-                   [new-nodes (list)]
-                   [cutoff (if looking-for
-                               100
-                               1)])
-          (cond
-            [(zero? cutoff) (reverse new-nodes)]
-            [else
-             (let ([new-children (begin (send next-node force)
-                                        (send next-node get-children))])
-               (cond
-                 [(null? new-children)
-                  (reverse new-nodes)]
-                 [(null? (cdr new-children))
-                  (cond
-                    [(send (car new-children) in-cycle?)
-                     (reverse (cons new-children new-nodes))]
-                    [(and (not (eq? looking-for #t))
-                          (member looking-for (find-reduction-label next-node (car new-children) #f)))
-                     (reverse (cons new-children new-nodes))]
-                    [else
-                     (loop (car new-children)
-                           (cons new-children new-nodes)
-                           (- cutoff 1))])]
-                 [else
-                  (reverse (cons new-children new-nodes))]))]))))
-    
-    (define (expand n)
-      (let* ([last-pr (last-pair path)]
-             [last-column (car last-pr)]
-             [survivor (list-ref last-column n)])
-        (for-each (λ (x) (send x set-in-path? (eq? x survivor))) last-column)
-        (set! path
-              (let loop ([path path])
-                (cond
-                  [(null? (cdr path)) 
-                   (cons (list survivor) '())]
-                  [else
-                   (cons (car path) (loop (cdr path)))])))
-        (update-everything)
-        (update-highlight-to-end)))
-    
-    (define (get-path-to-root node)
-      (let loop ([node node]
-                 [acc null])
-        (let ([parents (send node get-parents)])
-          (cond
-            [(null? parents) (cons (list node) acc)]
-            [node (loop (car parents) 
-                        (cons (list node) acc))]))))
-    
-    (define (change-path new-node)
-      (cond
-        [(ormap (λ (l) (memq new-node l)) path)
-         ;; if this node is in the current path, just move the view
-         (let* ([snip (send new-node get-big-snip)]
-                [br (box 0)])
-           (send pb get-snip-location snip br #f #t)
-           (let ([bw (box 0)]
-                 [bh (box 0)])
-             (send (send (send ec get-editor) get-admin) get-view #f #f bw bh)
-             (let* ([x (max 0 (- (unbox br) (unbox bw)))])
-               (send ec scroll-to x 0.0 (- (unbox bw) 4) (- (unbox bh) 1) #t 'end))))]
-        [else
-         (let ([new-path (get-path-to-root new-node)])
-           (let loop ([new-path new-path]
-                      [path path])
-             (cond
-               [(or (null? path)
-                    (null? new-path)
-                    (not (equal? (car path) (car new-path))))
-                (for-each (λ (old-ele) (for-each (λ (x) (send x set-in-path? #f)) old-ele))
-                          path)
-                (for-each (λ (old-ele) (for-each (λ (x) (send x set-in-path? #t)) old-ele))
-                          new-path)]
-               [else
-                (loop (cdr new-path) (cdr path))]))
-           
-           (set! path new-path)
-           (update-everything))])
-      (update-highlight-to-node-and-parent new-node))
-    
-    (define (update-everything)
-      (send pb begin-edit-sequence)
-      (pb-change-columns)
-      (pb-last-column-visible)
-      (send pb end-edit-sequence)
-      (update-buttons))
-    
-    (define (update-highlight-to-end)
-      (let-values ([(one-col-before last-column)
-                    (let loop ([path path]
-                               [one-before #f]
-                               [last-one #f])
-                      (cond
-                        [(null? path) (values one-before last-one)]
-                        [else (loop (cdr path)
-                                    last-one
-                                    (car path))]))])
-        (when (and one-col-before
-                   last-column
-                   (= 1 (length one-col-before))
-                   (= 1 (length last-column)))
-          (set-highlight (car one-col-before)
-                         (car last-column)))))
-    
-    (define (update-highlight-to-node-and-parent node)
-      (let* ([all-parents (send node get-parents)]
-             [visible-parent
-              (ormap (λ (x) (and (memq x all-parents) x))
-                     (apply append path))])
-        (when visible-parent
-          (set-highlight visible-parent node))))
-    
-    (define (set-highlight parent child)
-      (for-each
-       (λ (col)
-         (for-each (λ (node) (send (send node get-big-snip) clear-diffs))
-                   col))
-       path)
-      
-      (show-diff parent child)
-      
-      (when red-name-message
-        (let ([label (map (λ (x) (if x (format "[~a]" x) "≪unknown≫"))
-                          (find-reduction-label parent child #t))])
-          (cond
-            [(null? label) (void)]
-            [(null? (cdr label))
-             (send red-name-message set-label (car label))]
-            [else
-             (apply 
-              string-append
-              (car label)
-              (map (λ (x) (format " and ~a" x))
-                   (cdr label)))]))))
-    
-    (define (find-reduction-label parent child computed?)
-      (let ([children (send parent get-children)])
-        (and children
-             (let loop ([children children]
-                        [red-names (if computed?
-                                       (send parent get-successor-computed-names)
-                                       (send parent get-successor-names))])
-               (cond
-                 [(null? children) #f]
-                 [else
-                  (if (eq? (car children) child)
-                      (car red-names)
-                      (loop (cdr children)
-                            (cdr red-names)))])))))
-    
-    (define (pb-change-columns)
-      (send pb change-columns (map (λ (l) (map (λ (x) (send x get-big-snip)) l)) 
-                                   path))
-      (send zoom-out-pb refresh-tree root))
-    
-    ;; makes the last column visible
-    (define (pb-last-column-visible)
-      (let ([admin (send pb get-admin)]
-            [sl (box 0)]
-            [st (box 0)]
-            [sr (box 0)]
-            [sb (box 0)])
-        (when admin
-          ;; reverse so the topmost snip is the last one
-          (for ([node (in-list (reverse (car (last-pair path))))])
-            (let ([s (send node get-big-snip)])
-              (send pb get-snip-location s sl st #f)
-              (send pb get-snip-location s sr sb #t)
-              (send pb scroll-to s 0 0 (- (unbox sr) (unbox sl)) (- (unbox sb) (unbox st)) #t))))))
-    
-    (hash-set! all-nodes-ht term root)
-    (send root set-in-path? #t)
-    
-    (let loop ([term (car seed)]
-               [last-nexts #f]
-               [terms (cdr seed)])
-      
-      (when last-nexts
-        (expand (find-i term last-nexts void)))
-      (cond
-        [(null? terms) (void)]
-        [else
-         (let* ([nexts (apply-reduction-relation red term)]
-                [ith (find-i (car terms)
-                             nexts
-                             (λ ()
-                               (error 'stepper "term ~s does not reduce to ~s"
-                                      term 
-                                      (car terms))))])
-           (forward-step 0)
-           (loop (car terms)
-                 nexts
-                 (cdr terms)))]))
-    
-    (send f show #t)
-    (pb-change-columns)
-    (update-buttons))
-  
-  (define (show-diff parent child)
-    (let-values ([(to-color1 to-color2) 
-                  (find-differences 
-                   (send parent get-term)
-                   (send child get-term)
-                   (send (send parent get-big-snip) get-char-width)
-                   (send (send child get-big-snip) get-char-width))])
-      (send (send parent get-big-snip) highlight-diffs to-color1)
-      (send (send child get-big-snip) highlight-diffs to-color2)
-      (void)))
-  
-  (define (find-i term terms fail)
-    (let loop ([i 0]
-               [terms terms])
-      (cond
-        [(null? terms) (fail)]
-        [(equal? (car terms) term) i]
-        [else (loop (+ i 1) (cdr terms))])))
-  
-  (define node%
-    (class object%
-      (init-field term 
-                  red
-                  change-path
-                  all-nodes-ht
-                  pp
-                  init-cw)
-      (init [parent #f])
-      
-      (define parents (if parent 
-                          (list parent)
-                          '()))
-      ;; cycle : (listof node) 
-      ;; the nodes that have the same term as this one, due to a cycle in the reduction graph
-      (define cycle '())
-      (define children #f)
-      (define big-snip (mk-big-snip term this pp init-cw))
-      (define dot-snip (new dot-snip% [node this]))
-      (define in-path? #f)
-      (define visible? #f)
-    
-      (define successors #f)
-
-      ;; #f => uninited, else
-      ;; (listof (listof string))
-      ;; one list element for each successor, one nested list element for each reduction that applied (typically 1)
-      (define successor-names #f)
-      (define successor-computed-names #f)
-      (define/public (get-successors)
-        (unless successors
-          (let-values ([(succs names comp-names)
-                        (for/fold ([succs (set)]
-                                   [names #hash()]
-                                   [comp-names #hash()])
-                          ([reduction (apply-reduction-relation/tagged red term)])
-                          (let ([name (first reduction)]
-                                [comp-name (second reduction)]
-                                [succ (third reduction)]
-                                [add (λ (x) (λ (xs) (cons x xs)))])
-                            (values (set-add succs succ)
-                                    (hash-update names succ (add name) '())
-                                    (hash-update comp-names succ (add comp-name) '()))))])
-            (set! successors (set-map succs values))
-            (set! successor-names (map (λ (s) (hash-ref names s)) successors))
-            (set! successor-computed-names (map (λ (s) (hash-ref comp-names s)) successors))))
-        successors)
-      (define/public (get-successor-names)
-        (get-successors) ;; force the variables to be defined
-        successor-names)
-      (define/public (get-successor-computed-names)
-        (get-successors) ;; force the variables to be defined
-        successor-computed-names)
-      
-      (define/public (move-path)
-        (change-path this))
-      
-      (define/public (set-in-path? p?)
-        (set! in-path? p?)
-        (update-color))
-      
-      (define/public (set-visible? v?)
-        (set! visible? v?)
-        (update-color))
-      
-      (define/private (update-color)
-        (send dot-snip set-color 
-              (cond
-                [(and visible? in-path? (not (null? cycle)))
-                 visible-cycle-color]
-                [(not (null? cycle))
-                 cycle-color]
-                [(and visible? in-path?)
-                 visible-color]
-                [in-path?
-                 in-path-color]
-                [else
-                 initial-color])))
-      
-      (define/public (get-cycle) cycle)
-      (define/public (add-cycle c) (set! cycle (cons c (remq c cycle))))
-      (define/public (in-cycle?) (not (null? cycle)))
-      (define/public (get-term) term)
-      (define/public (get-big-snip) big-snip)
-      (define/public (get-dot-snip) dot-snip)
-      (define/public (get-parents) parents)
-      (define/public (add-parent p)
-        (add-links (send p get-dot-snip) dot-snip)
-        (set! parents (cons p parents)))
-      (define/public (get-children) (or children '()))
-      (define/public (force)
-        (unless children
-          (set! children
-                (map (λ (x) (make-child x)) (get-successors)))))
-      
-      (define/private (make-child term)
-        (let ([already-there (hash-ref all-nodes-ht term #f)]
-              [mk-child-node
-               (λ ()
-                 (new node%
-                      [pp pp]
-                      [term term]
-                      [red red]
-                      [change-path change-path]
-                      [all-nodes-ht all-nodes-ht]
-                      [parent this]
-                      [init-cw init-cw]))])
-          (cond
-            [(and already-there
-                  (or (eq? this already-there)
-                      (is-parent? already-there)))
-             (let ([n (mk-child-node)])
-               (send n add-cycle already-there)
-               (send already-there add-cycle n)
-               n)]
-            [already-there
-             (send already-there add-parent this)
-             already-there]
-            [else
-             (let ([child-node (mk-child-node)])
-               (hash-set! all-nodes-ht term child-node)
-               child-node)])))
-      
-        (define/private (is-parent? node)
-          (let loop ([parents (get-parents)])
-            (ormap (λ (p)
-                     (or (eq? p node)
-                         (loop (send p get-parents))))
-                   parents)))
-        
-      (super-new)
-      (when cycle
-        (send dot-snip set-color cycle-color))
-      (when parent
-        (add-links (send parent get-dot-snip) dot-snip))))
-    
-  (define zoom-out-pasteboard%
-    (class (graph-pasteboard-mixin pasteboard%)
-      (inherit insert move-to get-canvas get-admin)
-
-      (inherit find-snip set-caret-owner global-to-local)
-      (define/override (on-event evt)
-        (when (send evt button-down?)
-          (let ([x (box (send evt get-x))]
-                [y (box (send evt get-y))])
-            (global-to-local x y)
-            (let ([s (find-snip (unbox x) (unbox y))])
-              (when s
-                (set-caret-owner s 'immediate)))))
-        (super on-event evt))
-      
-      (define/public (refresh-tree root)
-        (let ([level-ht (make-hasheq)]
-              [node-to-level-ht (make-hasheq)]
-              [max-n 0])
-          
-          (let loop ([tree root]
-                     [n 0])
-            (let ([old-level (hash-ref node-to-level-ht tree #f)])
-              (cond
-                [(not old-level)
-                 (hash-set! node-to-level-ht tree n)
-                 (hash-set! level-ht n (cons tree (hash-ref level-ht n '())))]
-                [(< old-level n)
-                 (hash-set! level-ht old-level (remq tree (hash-ref level-ht old-level)))
-                 (hash-set! level-ht n (cons tree (hash-ref level-ht n '())))
-                 (hash-set! node-to-level-ht tree n)]
-                [else
-                 (void)])
-              (set! max-n (max n max-n))
-              (for-each (λ (x) (loop x (+ n 1))) (send tree get-children))))
-          
-          (let* ([tallest-column (apply max (hash-map level-ht (λ (x y) (length y))))]
-                 [canvas (get-canvas)]
-                 [_1 (send canvas min-client-height (* tallest-column dot-spacing))]
-                 [vertical-space
-                  (let-values ([(w h) (send canvas get-client-size)]) h)])
-            (let loop ([n 0])
-              (when (<= n max-n)
-                (let ([nodes (reverse (hash-ref level-ht n))])
-                  (let loop ([nodes nodes]
-                             [y (/ (- vertical-space
-                                      (* (length nodes) dot-spacing)) 
-                                   2)])
-                    (cond
-                      [(null? nodes) (void)]
-                      [else
-                       (let* ([node (car nodes)]
-                              [dot-snip (send node get-dot-snip)])
-                         (insert dot-snip (* n dot-spacing) y)   ;; in case the snip's been inserted already
-                         (move-to dot-snip (* n dot-spacing) y)  ;; also do the move to
-                         (loop (cdr nodes) (+ y dot-spacing)))])))
-                (loop (+ n 1)))))))
-      (super-new)
-      (send this set-flip-labels? #f)
-      (inherit set-draw-arrow-heads?)
-      (set-draw-arrow-heads? #f)))
-
-  (define (set-box/f b v) (when (box? b) (set-box! b v)))
-  
-  (define dot-snip%
-    (class (graph-snip-mixin snip%)
-      (init-field node)
-      
-      (inherit get-admin)
-      (define color initial-color)
-      (define/public (set-color c)
-        (unless (equal? color c)
-          (set! color c)
-          (let ([admin (get-admin)])
-            (when admin
-              (send admin needs-update this 0 0 dot-size dot-size)))))
-      (define/override (get-extent dc x y wb hb descentb spaceb lspaceb rspaceb)
-        (set-box/f wb dot-size)
-        (set-box/f hb dot-size)
-        (set-box/f descentb 0)
-        (set-box/f spaceb 0)
-        (set-box/f lspaceb 0)
-        (set-box/f rspaceb 0))
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (let ([smoothing (send dc get-smoothing)]
-              [brush (send dc get-brush)])
-          (send dc set-smoothing 'aligned)
-          (send dc set-brush color 'solid)
-          (send dc draw-ellipse x y dot-size dot-size)
-          (send dc set-brush brush)
-          (send dc set-smoothing smoothing)))
-      (define/override (on-event dc x y editorx editory evt)
-        (when (send evt button-up?)
-          (send node move-path)))
-      
-      (define/override (copy) (new snip%))
-      (super-new)
-      (inherit set-snipclass set-flags get-flags)
-      (set-flags (cons 'handles-events (get-flags)))
-      (set-snipclass dot-snipclass)))
-  
-  (define dot-snipclass
-    (new
-     (class snip-class%
-       (define/override (read f)
-         (new dot-snip%))
-       (super-new))))
-  (send dot-snipclass set-classname "plt-redex:dot")
-  (send dot-snipclass set-version 1)
-  (send (get-the-snip-class-list) add dot-snipclass)
-       
-  
-  (define forward-size-editor-canvas%
-    (class canvas:basic% 
-      (inherit get-editor)
-      (define/override (on-size w h)
-        (send (get-editor) update-heights))
-      (super-new)))
-  
-  (define (mk-big-snip sexp node pp init-cw)
-    (let* ([txt (new text:keymap%)]
-           [s (new big-snip% 
-                   [pp pp]
-                   [node node]
-                   [editor txt]
-                   [expr sexp]
-                   [char-width (get-user-char-width init-cw sexp)])])
-      (send txt set-autowrap-bitmap #f)
-      #;(send txt freeze-colorer)
-      (send s format-expr)
-      s))
-  
-  (define big-snip%
-    (class size-editor-snip%
-      (inherit get-editor)
-      (init-field node)
-      (define/public (get-node) node)
-      (define clear-thunks '())
-      (define/augment (on-width-changed w)
-        (clear-diffs)
-        (inner (void) on-width-changed w))
-      (define/public (highlight-diffs to-color)
-        (clear-diffs)
-        (set! clear-thunks
-              (map 
-               (λ (p) (send (get-editor) highlight-range
-                            (car p)
-                            (cdr p)
-                            (send the-color-database find-color "NavajoWhite")))
-               to-color)))
-      (define/public (clear-diffs)
-        (for-each (λ (t) (t)) clear-thunks)
-        (set! clear-thunks null))
-      (super-new)))
-  
-  (define columnar-pasteboard% 
-    (class (resizing-pasteboard-mixin pasteboard%)
-      (init-field moved)
-      
-      (define current-columns '())
-      (inherit insert remove find-snip)
-      
-      ;; strange to think that this is the way to catch 
-      ;; different snips becoming visible in the editor, but oh well.
-      (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-        (super on-paint before? dc left top right bottom dx dy draw-caret)
-        (unless before?
-          (let ([admin (get-admin)])
-            (when admin
-              (let ([bx (box 0)]
-                    [by (box 0)]
-                    [bw (box 0)]
-                    [bh (box 0)])
-                (send admin get-view bx by bw bh)
-                (moved (unbox bx)
-                       (unbox by)
-                       (+ (unbox bx) (unbox bw))
-                       (+ (unbox by) (unbox bh))))))))
-      
-      (define/public (change-columns orig-new-columns)
-        (let loop ([current-columns current-columns]
-                   [new-columns orig-new-columns])
-          (cond
-            [(and (null? current-columns)
-                  (null? new-columns))
-             (void)]
-            [(null? new-columns) 
-             (insert/remove current-columns '())]
-            [(null? current-columns)
-             (insert/remove '() new-columns)]
-            [(equal? (car current-columns)
-                     (car new-columns))
-             (loop (cdr current-columns)
-                   (cdr new-columns))]
-            [else
-             (insert/remove current-columns new-columns)]))
-        (set! current-columns orig-new-columns)
-        (update-heights))
-      
-      ;; insert/remove : (listof (listof snip)) (listof (listof snip)) -> void
-      (define/private (insert/remove to-remove to-insert)
-        (let ([flat-to-remove (apply append to-remove)]
-              [flat-to-insert (apply append to-insert)])
-          (for-each
-           (λ (x) 
-             (unless (memq x flat-to-insert)
-               (remove x)))
-           flat-to-remove)
-          (for-each (λ (x) (insert x)) flat-to-insert)))
-      
-      (inherit get-admin move-to)
-      (define/public (update-heights)
-        (let ([admin (get-admin)])
-          (let-values ([(w h) (get-view-size)])
-            (let loop ([columns current-columns]
-                       [x 0])
-              (cond
-                [(null? columns) (void)]
-                [else
-                 (let* ([column (car columns)])
-                   (cond
-                     [(null? (cdr column))
-                      ;; if there is only a single snip in the column, we let it be as long as it wants to be.
-                      (let* ([snip (car column)]
-                             [sw (get-snip-width snip)]
-                             [sh (get-snip-max-height snip)]
-                             [new-height (- (max h sh) (get-border-height snip))])
-                        (move-to snip x 0)
-                        (send snip set-min-height new-height)
-                        (send snip set-max-height new-height)
-                        (loop (cdr columns) (+ x sw)))]
-                     [else
-                      ;; otherwise, we make all of the snips fit into the visible area
-                      (let* ([base-space (quotient h (length column))]
-                             [widest
-                              (let loop ([snips column]
-                                         [extra-space (modulo h (length column))]
-                                         [y 0]
-                                         [widest 0])
-                                (cond
-                                  [(null? snips) widest]
-                                  [else 
-                                   (let* ([snip (car snips)]
-                                          [sw (get-snip-width snip)]
-                                          [h (+ base-space
-                                                (if (zero? extra-space)
-                                                    0
-                                                    1))])
-                                     (move-to snip x y)
-                                     (let ([border-height (get-border-height snip)])
-                                       (send snip set-min-height (- h border-height))
-                                       (send snip set-max-height (- h border-height)))
-                                     (loop (cdr snips)
-                                           (if (zero? extra-space)
-                                               0
-                                               (- extra-space 1))
-                                           (+ y h)
-                                           (max widest sw)))]))])
-                          (for-each (λ (snip) 
-                                      (let ([border-width (get-border-width snip)])
-                                        (send snip set-min-width (- widest border-width))
-                                        (send snip set-max-width (- widest border-width))))
-                                    column)
-                        (loop (cdr columns)
-                              (+ x widest)))]))])))))
-
-      (define/private (get-border-height snip)
-        (let ([lb (box 0)]
-              [tb (box 0)]
-              [rb (box 0)]
-              [bb (box 0)])
-          (send snip get-margin lb tb bb rb)
-          (+ (unbox bb) (unbox tb))))
-      
-      (define/private (get-border-width snip)
-        (let ([lb (box 0)]
-              [tb (box 0)]
-              [rb (box 0)]
-              [bb (box 0)])
-          (send snip get-margin lb tb bb rb)
-          (+ (unbox lb) (unbox rb))))
-      
-      (inherit get-snip-location)
-      (define/public (get-snip-width snip)
-        (let ([lb (box 0)]
-              [rb (box 0)])
-          (get-snip-location snip lb #f #f)
-          (get-snip-location snip rb #f #t)
-          (- (unbox rb) (unbox lb))))
-      
-      ;; get-snip-max-height : snip -> number
-      ;; returns the maximum height that the snip wants to be 
-      ;; (ie, the end position of the longest line)
-      (define/private (get-snip-max-height snip)
-        (let ([txt (send snip get-editor)]
-              [yb (box 0)]
-              [tb (box 0)]
-              [bb (box 0)])
-          (send snip get-margin (box 0) tb (box 0) bb)
-          (send txt position-location (send txt last-position) #f yb #f #t #t)
-          (+ (unbox yb)
-             (unbox tb)
-             (unbox bb))))
-          
-      (define/private (get-view-size)
-        (let ([admin (get-admin)])
-          (if admin
-              (let ([wb (box 0)]
-                    [hb (box 0)])
-                (send admin get-view #f #f wb hb)
-                (values (unbox wb) (- (unbox hb) 2)))
-              (values 10 10))))
-      
-      (super-new)))
diff --git a/pkgs/redex-pkgs/redex-gui-lib/redex/private/traces.rkt b/pkgs/redex-pkgs/redex-gui-lib/redex/private/traces.rkt
deleted file mode 100644
index 79c5d34622..0000000000
--- a/pkgs/redex-pkgs/redex-gui-lib/redex/private/traces.rkt
+++ /dev/null
@@ -1,922 +0,0 @@
-#lang racket/base
-
-;; should cache the count of new snips -- dont
-;; use `count-snips'; use something associated with the
-;; equal hash-table
-
-(require mrlib/graph
-         redex/private/reduction-semantics
-         redex/private/matcher
-         "size-snip.rkt"
-         racket/gui/base
-         racket/class
-         racket/file
-         racket/math
-         framework)
-
-(preferences:set-default 'plt-reducer:show-bottom #t boolean?)
-
-(define dark-pen-color (make-parameter "blue"))
-(define light-pen-color (make-parameter "lightblue"))
-(define dark-brush-color (make-parameter "lightblue"))
-(define light-brush-color (make-parameter "white"))
-(define dark-text-color (make-parameter "blue"))
-(define light-text-color (make-parameter "lightblue"))
-
-;; after (about) this many steps, stop automatic, initial reductions
-(define reduction-steps-cutoff (make-parameter 20))
-
-(define-struct term-node (snip))
-(define (term-node-parents term-node) (send (term-node-snip term-node) get-one-step-parents))
-(define (term-node-children term-node) (send (term-node-snip term-node) get-one-step-children))
-(define (term-node-expr term-node) (send (term-node-snip term-node) get-expr))
-(define (term-node-labels term-node) (send (term-node-snip term-node) get-one-step-labels))
-(define (term-node-set-color! term-node r?)
-  (snip/eventspace
-   term-node
-   (λ ()
-     (send (term-node-snip term-node) set-bad r?))))
-(define (term-node-color term-node) (send (term-node-snip term-node) get-bad))
-
-(define (term-node-set-red! term-node r?)
-  (term-node-set-color! term-node (and r? "pink")))
-
-(define (term-node-set-position! term-node x y)
-  (snip/eventspace/ed 
-   term-node
-   (λ (ed)
-     (when ed
-       (send ed move-to (term-node-snip term-node) x y)))))
-
-(define (term-node-width term-node)
-  (snip/eventspace/ed 
-   term-node
-   (λ (ed)
-     (let ([lb (box 0)]
-           [rb (box 0)]
-           [snip (term-node-snip term-node)])
-       (if (and (send ed get-snip-location snip lb #f #f)
-                (send ed get-snip-location snip rb #f #t))
-           (- (unbox rb) (unbox lb))
-           0)))))
-
-(define (term-node-height term-node)
-  (snip/eventspace/ed 
-   term-node
-   (λ (ed)
-     (let ([tb (box 0)]
-           [bb (box 0)]
-           [snip (term-node-snip term-node)])
-       (if (and (send ed get-snip-location snip #f tb #f)
-                (send ed get-snip-location snip #f bb #t))
-           (- (unbox bb) (unbox tb))
-           0)))))
-
-(define (term-node-x term-node)
-  (snip/eventspace/ed 
-   term-node
-   (λ (ed)
-     (let ([xb (box 0)]
-           [snip (term-node-snip term-node)])
-       (if (send ed get-snip-location snip xb #f #f)
-           (unbox xb)
-           0)))))
-
-(define (term-node-y term-node)
-  (snip/eventspace/ed 
-   term-node
-   (λ (ed)
-     (let ([yb (box 0)]
-           [snip (term-node-snip term-node)])
-       (if (send ed get-snip-location snip #f yb #f)
-           (unbox yb)
-           0)))))
-
-(define (snip/eventspace/ed term-node f)
-  (snip/eventspace 
-   term-node
-   (λ ()
-     (let* ([snip (term-node-snip term-node)]
-            [admin (send snip get-admin)])
-       (f (and admin (send admin get-editor)))))))
-
-  
-(define (snip/eventspace term-node thunk)
-  (let* ([snip (term-node-snip term-node)]
-         [eventspace (send snip get-my-eventspace)])
-    (cond
-      [(eq? (current-eventspace) eventspace)
-       (thunk)]
-      [else
-       (let ([c (make-channel)])
-         (parameterize ([current-eventspace eventspace])
-           (queue-callback
-            (λ ()
-              (channel-put c (thunk)))))
-         (channel-get c))])))
-
-(define initial-font-size
-  (make-parameter
-   (send (send (send (editor:get-standard-style-list) 
-                     find-named-style
-                     "Standard")
-               get-font)
-         get-point-size)))
-
-;; the initial spacing between row and columns of the reduction terms
-(define default-x-spacing 15)
-(define default-y-spacing 15)
-
-(define (traces/ps reductions pre-exprs filename
-                   #:multiple? [multiple? #f] 
-                   #:pred [pred (λ (x) #t)] 
-                   #:pp [pp default-pretty-printer] 
-                   #:racket-colors? [racket-colors? #t]
-                   #:scheme-colors? [scheme-colors? racket-colors?]
-                   #:colors [colors '()]
-                   #:layout [layout void]
-                   #:edge-label-font [edge-label-font #f]
-                   #:edge-labels? [edge-labels? #t]
-                   #:graph-pasteboard-mixin [extra-graph-pasteboard-mixin values]
-                   #:filter [term-filter (lambda (x y) #t)]
-                   #:post-process [post-process void]
-                   #:x-spacing [x-spacing default-x-spacing]
-                   #:y-spacing [y-spacing default-x-spacing]
-                   #:reduce [reduce apply-reduction-relation/tag-with-names])
-  (let-values ([(graph-pb canvas)
-                (traces reductions pre-exprs
-                        #:no-show-frame? #t
-                        #:multiple? multiple? 
-                        #:pred pred
-                        #:pp pp
-                        #:racket-colors? racket-colors?
-                        #:scheme-colors? scheme-colors?
-                        #:colors colors
-                        #:layout layout
-                        #:edge-label-font edge-label-font
-                        #:edge-labels? edge-labels?
-                        #:graph-pasteboard-mixin extra-graph-pasteboard-mixin
-                        #:filter term-filter
-                        #:x-spacing x-spacing
-                        #:y-spacing y-spacing
-                        #:reduce reduce)])
-    (post-process graph-pb)
-    (print-to-ps graph-pb canvas filename)))
-
-(define (print-to-ps graph-pb canvas filename)
-  (let ([admin (send graph-pb get-admin)]
-        [printing-admin (new printing-editor-admin% [ed graph-pb])])
-    (send canvas set-editor #f)
-    (send graph-pb set-admin printing-admin)
-    
-    (dynamic-wind
-     void
-     (λ ()
-       (send graph-pb size-cache-invalid)
-       
-       (send graph-pb re-run-layout)
-       
-       (let ([ps-setup (make-object ps-setup%)])
-         (send ps-setup copy-from (current-ps-setup))
-         (send ps-setup set-file filename)
-         (send ps-setup set-mode 'file)
-         (parameterize ([current-ps-setup ps-setup])
-           (send graph-pb print #f #f 'postscript #f #f #t))))
-     
-     (λ ()
-       (send graph-pb set-admin admin)
-       (send canvas set-editor graph-pb)
-       (send printing-admin shutdown) ;; do this early
-       (let loop ([snip (send graph-pb find-first-snip)])
-         (when snip
-           (send snip size-cache-invalid)
-           (loop (send snip next))))
-       (send graph-pb size-cache-invalid)
-       (send graph-pb re-run-layout)))))
-
-(define printing-editor-admin%
-  (class editor-admin%
-    
-    (init-field ed)
-    
-    (define temp-file (make-temporary-file "redex-size-snip-~a"))
-    
-    (define ps-dc
-      (let ([ps-setup (make-object ps-setup%)])
-        (send ps-setup copy-from (current-ps-setup))
-        (send ps-setup set-file temp-file)
-        (parameterize ([current-ps-setup ps-setup])
-          (make-object post-script-dc% #f #f #f #t))))
-    
-    (send ps-dc start-doc "fake dc")
-    (send ps-dc start-page)
-    (super-new)
-    
-    (define/public (shutdown)
-      (send ps-dc end-page)
-      (send ps-dc end-doc)
-      (delete-file temp-file))
-       
-    
-    (define/override (get-dc [x #f] [y #f])
-      (super get-dc x y)
-      ps-dc)
-    (define/override (get-max-view x y w h [full? #f])
-      (get-view x y w h full?))
-    (define/override (get-view x y w h [full? #f])
-      (when x (set-box! x 0.0))
-      (when y (set-box! x 0.0))
-      (when (box? w) (set-box! w 500))
-      (when (box? h) (set-box! h 500)))
-    
-    ;; the following methods are not overridden; they all default to doing nothing.
-    ;;   grab-caret
-    ;;   modified
-    ;;   needs-update
-    ;;   popup-menu
-    ;;   refresh-delayed?
-    ;;   resized
-    ;;   scroll-to
-    ;;   update-cursor
-    ))
-
-(define (traces reductions pre-exprs 
-                #:multiple? [multiple? #f] 
-                #:pred [pred (λ (x) #t)] 
-                #:pp [pp default-pretty-printer] 
-                #:colors [colors '()]
-                #:racket-colors? [racket-colors? #t]
-                #:scheme-colors? [scheme-colors? racket-colors?]
-                #:layout [layout void]
-                #:edge-label-font [given-edge-label-font #f]
-                #:edge-labels? [edge-labels? #t]
-                #:filter [term-filter (lambda (x y) #t)]
-                #:graph-pasteboard-mixin [extra-graph-pasteboard-mixin values]
-                #:no-show-frame? [no-show-frame? #f]
-                #:x-spacing [x-spacing default-x-spacing]
-                #:y-spacing [y-spacing default-y-spacing]
-                #:reduce [reduce apply-reduction-relation/tag-with-names])
-  (define exprs (if multiple? pre-exprs (list pre-exprs)))
-  (define main-eventspace (current-eventspace))
-  (define saved-parameterization (current-parameterization))
-  (define graph-pb
-    (let ([pb (new (extra-graph-pasteboard-mixin graph-pasteboard%)
-                   [layout layout] [edge-label-font given-edge-label-font]
-                   [edge-labels? edge-labels?])])
-      (send pb set-flip-labels? #f)
-      pb))
-  (define user-char-width (initial-char-width))
-  (define f (instantiate red-sem-frame% ()
-              (label "PLT Redex Reduction Graph")
-              (style '(toolbar-button))
-              (graph-pb graph-pb)
-              (width 600)
-              (height 400)
-              (toggle-panel-callback
-               (lambda ()
-                 (send remove-my-contents-panel
-                       change-children
-                       (lambda (l)
-                         (preferences:set 'plt-reducer:show-bottom (null? l))
-                         (if (null? l)
-                             (list bottom-panel)
-                             null)))))))
-  (define ec (make-object editor-canvas% (send f get-area-container) graph-pb))
-  (define remove-my-contents-panel (new vertical-panel%
-                                        (parent (send f get-area-container))
-                                        (stretchable-height #f)))
-  (define bottom-panel (new vertical-panel%
-                            (parent remove-my-contents-panel)
-                            (stretchable-height #f)))
-  (define font-size (instantiate slider% ()
-                      (label "Font Size")
-                      (min-value 1)
-                      (init-value (initial-font-size))
-                      (max-value 127)
-                      (parent bottom-panel)
-                      (callback (lambda (slider evt) 
-                                  (send graph-pb begin-edit-sequence)
-                                  (set-font-size (send slider get-value))
-                                  (send graph-pb end-edit-sequence)
-                                  (send ec refresh)))))
-  (define lower-panel (instantiate horizontal-panel% ()
-                        (parent bottom-panel)
-                        (stretchable-height #f)))
-  (define dot-panel (instantiate horizontal-panel% ()
-                        (parent bottom-panel)
-                        (stretchable-height #f)))
-  (define reduce-button (make-object button% 
-                          "Reducing..." 
-                          lower-panel
-                          (lambda (x y)
-                            (reduce-button-callback #f))))
-  (define status-message (instantiate message% ()
-                           (label "")
-                           (parent lower-panel)
-                           (stretchable-width #t)))
-  (define dot (new button% 
-                   [parent dot-panel] 
-                   [label "Fix Layout"] 
-                   [callback 
-                    (λ (x y)
-                      (set! dot? (not dot?))
-                      (dot-callback))]))
-  (define dot-mode (new choice%
-                        [parent dot-panel]
-                        [label #f]
-                        [callback
-                         (λ x
-                           (send dot-overlap set-label
-                                 (if (equal? 0 (send dot-mode get-selection))
-                                     "Top to Bottom"
-                                     "No Overlap"))
-                           (when dot?
-                             (dot-callback)))]
-                        [choices (list dot-label neato-label neato-hier-label neato-ipsep-label)]))
-  (define dot-overlap (new check-box%
-                           [value #t]
-                           [callback
-                            (λ x
-                              (when dot?
-                                (dot-callback)))]
-                           [parent dot-panel]
-                           [label "Top to Bottom"]))
-                   
-  (define snip-cache (make-hash))
-  
-  ;; call-on-eventspace-main-thread : (-> any) -> any
-  ;; =reduction thread=
-  (define (call-on-eventspace-main-thread thnk)
-    (parameterize ([current-eventspace main-eventspace])
-      (let ([s (make-semaphore 0)]
-            [ans #f])
-        (queue-callback
-         (lambda ()
-           (call-with-parameterization
-            saved-parameterization
-            (λ ()
-              (set! ans (thnk))))
-           (semaphore-post s)))
-        (semaphore-wait s)
-        ans)))
-  
-  (define default-colors (list (dark-pen-color) (light-pen-color) 
-                               (dark-text-color) (light-text-color)
-                               (dark-brush-color) (light-brush-color)))
-  
-  (define code-colors? (and racket-colors? scheme-colors?))
-  
-  ;; only changed on the reduction thread
-  ;; frontier : (listof (is-a?/c graph-editor-snip%))
-  (define frontier 
-    (filter
-     (λ (x) x)
-     (map (lambda (expr) (apply build-snip
-                                snip-cache #f expr pred pp #f code-colors?
-                                (get-user-char-width user-char-width expr)
-                                default-colors))
-          exprs)))
-  
-  
-  ;; set-font-size : number -> void
-  ;; =eventspace main thread=
-  (define (set-font-size size)
-    (let* ([standard (send (editor:get-standard-style-list) find-named-style
-                           "Standard")]
-           [delta (make-object style-delta%)])
-      (send standard get-delta delta)
-      (send delta set-size-mult 0)
-      (send delta set-size-add size)
-      (send standard set-delta delta)
-      (send graph-pb set-arrowhead-params (* pi 1/4) size (* size 2/3))
-      (unless given-edge-label-font
-        (send graph-pb set-edge-label-font
-              (send the-font-list find-or-create-font 
-                    size 'default 'normal 'normal)))))
-  
-  ;; fill-out : (listof X) (listof X) -> (listof X)
-  ;; produces a list whose length matches defaults but
-  (define (fill-out l defaults)
-    (let loop ([l l]
-               [defaults defaults])
-      (cond
-        [(null? l) defaults]
-        [else 
-         (cons (car l) (loop (cdr l) (cdr defaults)))])))
-  
-  (define name->color-ht 
-    (let ((ht (make-hash)))
-      (for-each 
-       (λ (c)
-         (hash-set! ht (car c) (fill-out (cdr c) default-colors)))
-       colors)
-      ht))
-  
-  ;; red->colors : string -> (values string string string string string string)
-  (define (red->colors reduction-name)
-    (apply values (hash-ref name->color-ht
-                            reduction-name 
-                            default-colors)))
-  
-  ;; reduce-frontier : -> void
-  ;; =reduction thread=
-  ;; updates frontier with the new snip after a single reduction
-  (define (reduce-frontier)
-    (define col #f)
-    (let loop ([snips frontier]
-               [new-frontier null]
-               [y 0])
-      (cond
-        [(null? snips)
-         (set! frontier new-frontier)]
-        [else
-         (define snip (car snips))
-         (define new-snips 
-           (filter 
-            (lambda (x) x)
-            (for/list ([red+sexp (in-list (reduce reductions (send snip get-expr)))])
-              (define-values (name sexp) (apply values red+sexp))
-              (call-on-eventspace-main-thread
-               (λ ()
-                 (cond
-                   [(term-filter sexp name)
-                    (define-values (dark-arrow-color 
-                                    light-arrow-color 
-                                    dark-label-color 
-                                    light-label-color
-                                    dark-pen-color
-                                    light-pen-color)
-                      (red->colors name))
-                    (build-snip snip-cache snip sexp pred pp name code-colors? 
-                                (get-user-char-width user-char-width sexp)
-                                light-arrow-color dark-arrow-color 
-                                dark-label-color light-label-color
-                                dark-pen-color light-pen-color)]
-                   [else #f]))))))
-         (define new-y 
-           (call-on-eventspace-main-thread
-            (lambda () ; =eventspace main thread=
-              (send graph-pb begin-edit-sequence)
-              (unless col  ;; only compute col here, incase user moves snips
-                (set! col (+ x-spacing (find-rightmost-x graph-pb))))
-              (begin0
-                (insert-into col y graph-pb new-snips y-spacing)
-                (send graph-pb end-edit-sequence)
-                (send status-message set-label
-                      (string-append (term-count (count-snips)) "..."))))))
-         (loop (cdr snips)
-               (append new-frontier new-snips)
-               new-y)])))
-  
-  ;; count-snips : -> number
-  ;; =eventspace main thread=
-  ;; counts the snips in `pb'. 
-  (define (count-snips)
-    (let loop ([n 0]
-               [snip (send graph-pb find-first-snip)])
-      (cond
-        [snip (loop (+ n 1) (send snip next))]
-        [else n])))
-  
-  ;; dot-callback : -> void
-  (define dot? #f)
-  (define (dot-callback)
-    (cond
-      [(not (find-dot))
-       (message-box "PLT Redex"
-                    "Could not find the dot binary")]
-      [dot?
-       (send graph-pb begin-edit-sequence)
-       (dot-positioning graph-pb 
-                        (send dot-mode get-string-selection)
-                        (not (send dot-overlap get-value))) ;; refreshes the display
-       (send graph-pb set-dot-callback void)
-       (send graph-pb immobilize)
-       (send graph-pb end-edit-sequence)
-       (send dot set-label "Unlock")
-       (send reduce-button enable #f)
-       (send font-size enable #f)]
-      [else
-       (out-of-dot-state)]))
-  
-  (define (out-of-dot-state)
-    (send graph-pb mobilize)
-    (send graph-pb set-dot-callback #f)
-    (send graph-pb invalidate-bitmap-cache)
-    (send dot set-label "Fix Layout")
-    (send reduce-button enable #t)
-    (send font-size enable #t))
-  
-  ;; reduce-button-callback : boolean -> void
-  ;; =eventspace main thread=
-  (define (reduce-button-callback show-all-at-once?)
-    (when show-all-at-once? (send graph-pb begin-edit-sequence))
-    (send reduce-button enable #f)
-    (send reduce-button set-label "Reducing...")
-    (thread
-     (lambda ()
-       (let ([update-gui
-              (λ (failed?)
-                (queue-callback
-                 (lambda () ;; =eventspace main thread=
-                   (send graph-pb begin-edit-sequence)
-                   (send graph-pb re-run-layout)
-                   (send graph-pb end-edit-sequence)
-                   (when show-all-at-once? (send graph-pb end-edit-sequence))
-                   (scroll-to-rightmost-snip)
-                   (send reduce-button set-label "Reduce")
-                   (cond
-                     [failed? 
-                      (send status-message set-label "Error while reducing")]
-                     [(null? frontier)
-                      (send status-message set-label (term-count (count-snips)))]
-                     [else
-                      (send status-message set-label 
-                            (string-append (term-count (count-snips))
-                                           " (possibly more to find)"))
-                      (send reduce-button enable #t)]))))])
-         (with-handlers ((exn:fail? (λ (x) (update-gui #t) (raise x))))
-           (do-some-reductions)
-           (update-gui #f))))))
-  
-  #;
-  (define (reduce-button-callback show-all-at-once?)
-    (when show-all-at-once? (send graph-pb begin-edit-sequence))
-    (send reduce-button enable #f)
-    (send reduce-button set-label "Reducing...")
-    (thread
-     (lambda ()
-       (let ([update-gui
-              (λ (failed?)
-                (queue-callback
-                 (lambda () ;; =eventspace main thread=
-                   (scroll-to-rightmost-snip)
-                   (cond
-                     [failed? 
-                      (send status-message set-label "Error while reducing")
-                      (send reduce-button set-label "Reduce")]
-                     [else
-                      (send reduce-button set-label "Reduce")
-                      (cond
-                        [(null? frontier)
-                         (send status-message set-label (term-count (count-snips)))]
-                        [else
-                         (send status-message set-label 
-                               (string-append (term-count (count-snips))
-                                              "(possibly more to find)"))
-                         (send reduce-button enable #t)])]))))])
-         (with-handlers ((exn:fail? (λ (x) (update-gui #t) (raise x))))
-           (do-some-reductions)
-           (update-gui #f))))))
-  
-  (define (term-count n)
-    (format "found ~a term~a" n (if (equal? n 1) "" "s")))
-  
-  ;; do-some-reductions : -> void
-  ;; =reduction thread=
-  ;; reduces some number of times, 
-  ;; adding at least reduction-steps-cutoff steps
-  ;; before stopping (unless there aren't that many left)
-  (define (do-some-reductions)
-    (let ([initial-size (call-on-eventspace-main-thread count-snips)])
-      (let loop ()
-        (cond
-          [(null? frontier) (void)]
-          [((call-on-eventspace-main-thread count-snips)
-            . >= . 
-            (+ initial-size (reduction-steps-cutoff)))
-           (void)]
-          [else
-           (reduce-frontier)
-           (loop)]))))
-  
-  ;; scroll-to-rightmost-snip : -> void
-  ;; =eventspace main thread=
-  (define (scroll-to-rightmost-snip)
-    (let ([rightmost-snip (send graph-pb find-first-snip)])
-      (let loop ([rightmost-snip rightmost-snip]
-                 [rightmost-y (get-right-edge rightmost-snip)]
-                 [snip (send rightmost-snip next)])
-        (cond
-          [(not snip) (make-snip-visible rightmost-snip)]
-          [else
-           (let ([snip-y (get-right-edge snip)])
-             (if (<= rightmost-y snip-y)
-                 (loop snip snip-y (send snip next))
-                 (loop rightmost-snip rightmost-y (send snip next))))]))))
-  
-  ;; make-snip-visisble : snip -> void
-  ;; =eventspace-main-thread=
-  (define (make-snip-visible snip)
-    (let ([bl (box 0)]
-          [bt (box 0)]
-          [br (box 0)]
-          [bb (box 0)])
-      (send graph-pb get-snip-location snip bl bt #f)
-      (send graph-pb get-snip-location snip br bb #t)
-      (send graph-pb scroll-to 
-            snip
-            0
-            0
-            (- (unbox br) (unbox bl))
-            (- (unbox bb) (unbox bt))
-            #t)))
-  
-  ;; get-right-edge : snip -> void
-  ;; =eventspace-main-thread=
-  (define (get-right-edge snip)
-    (let ([br (box 0)])
-      (send graph-pb get-snip-location snip br #f #t)
-      (unbox br)))
-  
-  (send remove-my-contents-panel
-        change-children
-        (lambda (l)
-          (if (preferences:get 'plt-reducer:show-bottom)
-              (list bottom-panel)
-              null)))
-  (out-of-dot-state) ;; make sure the state is initialized right
-  (set-font-size (initial-font-size)) ;; call this before 'insert-into' or it triggers resizing
-  (insert-into init-rightmost-x 0 graph-pb frontier y-spacing)
-  (cond
-    [no-show-frame?
-     (let ([s (make-semaphore)]) 
-       (thread (λ () 
-                 (do-some-reductions)
-                 (semaphore-post s)))
-       (yield s))
-     (values graph-pb ec)]
-    [else
-     (reduce-button-callback #t)
-     (send f show #t)]))
-
-(define red-sem-frame%
-  (class (frame:standard-menus-mixin (frame:basic-mixin frame%))
-    (init-field graph-pb toggle-panel-callback)
-    (define/override (file-menu:create-save?) #f)
-    (define/override (on-toolbar-button-click) (toggle-panel-callback))
-    (define/override (file-menu:between-save-as-and-print file-menu)
-      (make-object menu-item% "Print..."
-        file-menu
-        (lambda (item evt) (send graph-pb print)))
-      (make-object menu-item% "Export as Encapsulated PostScript..."
-        file-menu
-        (lambda (item evt) (send graph-pb print #t #f 'postscript this #f)))
-      (make-object menu-item% "Export as PostScript..."
-        file-menu
-        (lambda (item evt) (send graph-pb print #t #f 'postscript this)))
-      (make-object menu-item% 
-        "Toggle bottom stuff"
-        file-menu
-        (lambda (item evt) (toggle-panel-callback))))
-    (super-new)))
-
-(define graph-pasteboard% 
-  (class (resizing-pasteboard-mixin
-          (graph-pasteboard-mixin pasteboard%))
-    
-    (init-field layout) ;; (-> (listof term-node) void)
-    ;; this is the function supplied by the :#layout argument to traces or traces/ps
-    
-    (define dot-callback #f)
-    (define/public (set-dot-callback cb) (set! dot-callback cb))
-    (define/override (draw-edges dc left top right bottom dx dy)
-      (if dot-callback
-          (dot-callback this dc left top right bottom dx dy)
-          (super draw-edges dc left top right bottom dx dy)))
-    
-    (define mobile? #t)
-    (define/public (immobilize) (set! mobile? #f))
-    (define/public (mobilize) (set! mobile? #t))
-    
-    (define/augment (can-interactive-move? evt) mobile?)
-    (define/augment (can-interactive-resize? evt) mobile?)
-    
-    (inherit find-first-snip)
-    (define/public (re-run-layout)
-      (layout 
-       (let loop ([snip (find-first-snip)])
-         (cond
-           [(not snip) '()]
-           [(is-a? snip reflowing-snip<%>)
-            (cons (send snip get-term-node)
-                  (loop (send snip next)))]
-           [else (loop (send snip next))]))))
-    
-    (super-new)))
-
-(define graph-editor-snip%
-  (class* (graph-snip-mixin size-editor-snip%) (reflowing-snip<%>)
-    (init-field my-eventspace)
-    (inherit get-expr)
-    (define bad-color #f)
-    (inherit get-admin)
-    (define/public (get-my-eventspace) my-eventspace)
-    (define/public (set-bad color)
-      (send (get-editor) set-bad color)
-      (set! bad-color color)
-      (let ([admin (get-admin)])
-        (when admin 
-          (let ([wb (box 0)]
-                [hb (box 0)])
-            (send admin get-view-size wb hb)
-            (send admin needs-update this 0 0 (unbox wb) (unbox hb))))))
-    (define/public (get-bad) bad-color)
-    
-    (define names-to-here '())
-    ;; might have the same parent twice with a different name
-    ;; might have different parens with the same name.
-    ;; just record this in a list.
-    (define/public (record-edge-label parent name)
-      (set! names-to-here (cons (list parent name) names-to-here)))
-    (define/public (get-one-step-labels)
-      (map cadr names-to-here))
-    (define/public (get-one-step-parents) (map (λ (x) (send (car x) get-term-node)) names-to-here))
-    (define term-node #f)
-    (define/public (get-term-node) 
-      (unless term-node
-        (set! term-node (make-term-node this)))
-      term-node)
-    
-    (inherit get-children)
-    (define/public (get-one-step-children)
-      (map (λ (x) (send x get-term-node)) (get-children)))
-    
-    (inherit get-editor)
-    (inherit get-extent)
-    (define/override (draw dc x y left top right bottom dx dy draw-caret)
-      (when bad-color
-        (let ([bw (box 0)]
-              [bh (box 0)]
-              [pen (send dc get-pen)]
-              [brush (send dc get-brush)])
-          (get-extent dc x y bw bh #f #f #f #f)
-          (send dc set-pen (send the-pen-list find-or-create-pen bad-color 1 'solid))
-          (send dc set-brush (send the-brush-list find-or-create-brush bad-color 'solid))
-          (send dc draw-rectangle x y (unbox bw) (unbox bh))
-          (send dc set-pen pen)
-          (send dc set-brush brush)))
-      (super draw dc x y left top right bottom dx dy draw-caret))
-    
-    (super-new)))
-
-(define program-text%
-  (class size-text%
-    (define bad-color #f)
-    (define/public (set-bad color) (set! bad-color color))
-    
-    (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
-      (when (and bad-color before?)
-        (let ([pen (send dc get-pen)]
-              [brush (send dc get-brush)])
-          (send dc set-pen (send the-pen-list find-or-create-pen bad-color 1 'solid))
-          (send dc set-brush (send the-brush-list find-or-create-brush bad-color 'solid))
-          (send dc draw-rectangle (+ dx left) (+ dy top) (- right left) (- bottom top))
-          (send dc set-pen pen)
-          (send dc set-brush brush)))
-      (super on-paint before? dc left top right bottom dx dy draw-caret))
-    (super-new)))
-
-(define lines-pen (send the-pen-list find-or-create-pen "black" 1 'solid))
-
-;; where the first snips are inserted
-(define init-rightmost-x 25)
-
-;; insert-into : number number pasteboard (listof snip%) -> number
-;; inserts the snips into the pasteboard vertically 
-;; aligned, starting at (x,y). Returns
-;; the y coordinate where another snip might be inserted.
-(define (insert-into x y pb exprs y-spacing)
-  (let loop ([exprs exprs]
-             [y y])
-    (cond
-      [(null? exprs) y]
-      [else
-       (let ([es (car exprs)])
-         (send pb insert es x y)
-         (loop (cdr exprs)
-               (+ y (find-snip-height pb es) y-spacing)))])))
-
-;; build-snip : hash-table
-;;              (union #f (is-a?/c graph-snip<%>)) 
-;;              sexp
-;;              sexp -> boolean
-;;              (any port number -> void)
-;;              (union #f string)
-;;              number
-;;              color^6
-;;           -> (union #f (is-a?/c graph-editor-snip%))
-;; returns #f if a snip corresponding to the expr has already been created.
-;; also adds in the links to the parent snip
-;; =eventspace main thread=
-(define (build-snip cache parent-snip expr pred pp name code-colors? cw
-                    light-arrow-color dark-arrow-color dark-label-color light-label-color
-                    dark-brush-color light-brush-color)
-  (let-values ([(snip new?)
-                (let/ec k
-                  (values (hash-ref
-                           cache
-                           expr
-                           (lambda ()
-                             (let ([new-snip (make-snip parent-snip expr pred pp code-colors? cw)])
-                               (hash-set! cache expr new-snip)
-                               (k new-snip #t))))
-                          #f))])
-
-    (when parent-snip
-      (send snip record-edge-label parent-snip name)
-      (add-links/text-colors parent-snip snip
-                             (send the-pen-list find-or-create-pen dark-arrow-color 0 'solid)
-                             (send the-pen-list find-or-create-pen light-arrow-color 0 'solid)
-                             (send the-brush-list find-or-create-brush dark-brush-color 'solid)
-                             (send the-brush-list find-or-create-brush light-brush-color 'solid)
-                             (if (is-a? dark-label-color color%)
-                                 dark-label-color
-                                 (make-object color% dark-label-color))
-                             (if (is-a? light-label-color color%)
-                                 light-label-color
-                                 (make-object color% light-label-color))
-                             0 0
-                             name)
-      (update-badness pred parent-snip (send parent-snip get-expr)))
-    
-    (update-badness pred snip expr)
-    
-    (and new? snip)))
-
-(define (update-badness pred snip expr)
-  (let ([good? 
-         (if (procedure-arity-includes? pred 2)
-             (pred expr (send snip get-term-node))
-             (pred expr))])
-    (send snip set-bad (cond
-                         [(or (string? good?) 
-                              (is-a? good? color%))
-                          good?]
-                         [(not good?) "pink"]
-                         [else #f]))))
-
-;; make-snip : (union #f (is-a?/c graph-snip<%>)) 
-;;             sexp 
-;;             sexp -> boolean
-;;             (any port number -> void)
-;;             boolean
-;;             number
-;;          -> (is-a?/c graph-editor-snip%)
-;; unconditionally creates a new graph-editor-snip
-;; =eventspace main thread=
-(define (make-snip parent-snip expr pred pp code-colors? cw)
-  (let* ([text (new program-text%)]
-         [es (instantiate graph-editor-snip% ()
-               (char-width cw)
-               (editor text)
-               (my-eventspace (current-eventspace))
-               (pp pp)
-               (expr expr))])
-    (send text set-autowrap-bitmap #f)
-    (send text set-max-width 'none)
-    (send text freeze-colorer)
-    (unless code-colors?
-      (send text stop-colorer #t))
-    (send es format-expr)
-    es))
-
-;; find-rightmost-x : pasteboard -> number
-(define (find-rightmost-x pb) 
-  (let ([first-snip (send pb find-first-snip)])
-    (if first-snip
-        (let loop ([snip first-snip]
-                   [max-x (find-snip-right-edge pb first-snip)])
-          (cond
-            [snip
-             (loop (send snip next)
-                   (max max-x (find-snip-right-edge pb snip)))]
-            [else max-x]))
-        init-rightmost-x)))
-
-;; find-snip-right-edge : editor snip -> number
-(define (find-snip-right-edge ed snip)
-  (let ([br (box 0)])
-    (send ed get-snip-location snip br #f #t)
-    (unbox br)))
-
-(provide traces
-         traces/ps
-         print-to-ps
-         term-node?
-         term-node-parents
-         term-node-children
-         term-node-labels 
-         term-node-set-red!
-         term-node-set-color!
-         term-node-color
-         term-node-set-position!
-         term-node-x
-         term-node-y
-         term-node-width
-         term-node-height
-         term-node-expr)
-
-(provide reduction-steps-cutoff initial-font-size
-         dark-pen-color light-pen-color dark-brush-color light-brush-color
-         dark-text-color light-text-color)
diff --git a/pkgs/redex-pkgs/redex-lib/LICENSE.txt b/pkgs/redex-pkgs/redex-lib/LICENSE.txt
deleted file mode 100644
index 97325db572..0000000000
--- a/pkgs/redex-pkgs/redex-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-redex-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/redex-pkgs/redex-lib/info.rkt b/pkgs/redex-pkgs/redex-lib/info.rkt
deleted file mode 100644
index e8c3ef1812..0000000000
--- a/pkgs/redex-pkgs/redex-lib/info.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang info
-
-;; racket -l redex/tests/run-tests
-
-(define collection 'multi)
-
-(define deps '("data-enumerate-lib"
-               "scheme-lib"
-               "base"
-               "data-lib"
-               "math-lib"
-               "tex-table"
-               "profile-lib"
-               "typed-racket-lib"
-               "unstable-2d"))
-(define build-deps '("rackunit-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"redex\"")
-
-(define pkg-authors '(robby bfetscher))
-
-(define version "1.5")
diff --git a/pkgs/redex-pkgs/redex-lib/redex/HISTORY.txt b/pkgs/redex-pkgs/redex-lib/redex/HISTORY.txt
deleted file mode 100644
index 8436e6f491..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/HISTORY.txt
+++ /dev/null
@@ -1,843 +0,0 @@
-v6.1.1
-
-  * Performance improvements for example generation, both for 
-    enumerators (#:i-th in generate-term) and judgment forms
-    (#:satisfying in generate-term)
-
-  * Add short discussion of each of the benchmark programs
-
-  * Use unicode whitebracket characters for metafunction typesetting
-
-  * add support for "big left curly bracket"-style conditionals
-    when typesetting metafunctions
-
-v6.1
-
-  * changed the semantics for _!_ variables when they are under
-    ellipses, making them less insane. There is now a much simpler
-    description of how these two interact (in the docs)
-    
-  * improved the performance of term generation from judgment-forms
-    (when using the #:satisfying keyword argument)
-
-  * lots of improvements to the enumeration test case generator
-
-  * metafunctions can now typeset their contracts
-
-  * added #:equiv option to test-equal
-
-  * added default-equiv
-
-  * added the #:enum-p keyword
-    (based on statistics help from Neil Toronto)
-
-  * change the default strategy of redex-check to do enumeration first,
-    then interleave random generation and enumeration and then just
-    do random generation
-
-v6.0
-
-  * Added an enumerator for patterns. For example, here's how to get
-    the first 100 untyped LC terms (over 3 variables) and the 10^10000-th:
-
-        #lang racket
-        (require redex)
-        
-        (define-language L
-          (e (e e) x (λ (x) e))
-          (x a b c))
-        
-        (for/list ([i (in-range 100)])
-          (generate-term L e #:i-th i))
-
-        (generate-term L e #:i-th (expt 10 10000))
-
-    Thanks to Max New for the enumerator.
-
-  * More patterns that match no terms are now syntax errors, e.g.:
-    (any_1 ..._!_1 any_2 ..._!_1 (any_1 any_2) ...)
- 
-  * added where-make-prefix-pict and where-combine parameters.
-
-  * added #:keep-going to redex-check
-
-  * added #:satisfying to redex-check
-
-  * added #:reduce argument to traces
-
-  * DrRacket's Check Syntax now works better with Redex pattern variables
-
-  * The pattern _ now matches anything but does not bind a variable
-
-  * bug fixes
-
-v5.3.4
-
-  * adjusted define-union-language to allow the unioned languages to
-    have overlapping non-terminals; in that case the productions are
-    combined
-
-  * Adjust check-metafunction and check-reduction-relation so that
-    they skip over randomly generated terms that don't match the
-    contract spec (or #:domain spec). This means that when there is a
-    case in the metafunction (or reduction-relation) whose nominal
-    pattern is more general than the contract would allow, that those
-    terms are discarded instead of used as inputs to the predicate.
-
-  * Added the #:pre keyword to define-metafunction. It allows
-    contracts that have to relate different arguments to a
-    metafunction.
-
-  * Fixed the way random generation for define-judgment-form works so
-    that it properly handles metafunctions (i.e., it properly takes
-    into account that previous patterns in a metafunction must not
-    match when generating a particular clause)
-
-
-v5.3.3
-
-No changes
-
-v5.3.2
-
-  * added random-generation based on define-judgment-form
-    (which allows Redex to more effectively generate things
-     like well-typed terms)
-
-  * removed the restriction on unquotes in define-judgment-form
-
-  * added the option to use judgment-forms with only I mode
-    positions in terms
-
-  * added 'boolean' as a new pattern
-
-  * define-relation now compiles to judgment-form
-    (instead of a metafunction)
-  
-  * added show-derivations to visualize judgment form derivations
-    	     
-v5.3.1
-
-  * added optional #:lang keyword to term
-
-  * added the ability to name clauses to define-judgment-form
-
-  * added judgment-form-cases
-
-  * adjust define-judgment-form typesetting so that it uses
-    the line breaks in a premise to determine how to line
-    break the typeset version
-
-v5.3
-
-  * added the amb tutorial.
-
-  * added define-union-language
-
-  * added define-extended-judgment-form
-
-  * extended render-* functions so they can produce PDF
-
-v5.2.1
-
-  * rewrote the internals of the pattern matcher to be more consistent
-    (centralized more error checking, moving more of it to compile
-    time, and various other internal cleanups).
-
-  * improved the way caching works so it uses about 1/5th memory and
-    speeds up the R6RS test suite by about a factor of 2.
-
-  * added a number of optimizations to the pattern matcher that
-    speed up the R6RS test suite by 50% or so and speed up a
-    lambdaJS benchmark by about a factor of 25.
-
-  * added support for side-conditions and where clauses to
-    define-relation, also added support for side-conditions to
-    define-judgment-form
-
-  * added the List-machine benchmark (by Appel, Dockins & Leroy)
-
-v5.2
-
-  * added define-judgment-form form
-
-  * added define-term form
-
-  * added with-compound-rewriters form
-
-  * added Ariola-Felleisen by-need evaluation contexts to examples
-
-  * improved error message for definition forms in expression contexts
-
-v5.1.2
-
-  * added support for typsetting define-relation relations
-
-  * made apply-reduction-relation* call remove-duplicates
-    on the result of apply-reduction-relation
-
-  * extended render-reduction-relation-rules to accept rule indices
-    in addition to rule names
-
-  * added the to-lw/stx procedure
-
-  * fixed domain checking for unioned reduction relations
-
-  * added the #:cache-all? argument to apply-reduction-relation*
-    and the current-cache-all? parameter
-
-  * fixed stepper's handling of symbols that required || quoting
-
-  * removed all undocumented exports
-
-  * added the redex-let form
-
-  * added the #:source argument to generate-term
-
-  * changed redex-match to hide bindings for named ellipses such
-    as ..._x
-
-  * improve test-->E failure message
-
-  * fixed misc. bugs in examples and typos in documentation
-
-v5.1.1
-
-  * changed pattern language to disallow unquote
-
-  * fixed matching of ..._x and ..._!_x within ellipses
-
-  * fixed bugs in stepper's diff highlighting
-
-  * improved rendering of arrows in typesetting
-
-  * added support for unioned metafunction codomains
-
-  * fixed typesetting of the pattern (hole p_0 p_1 ...)
-
-  * added arrow->pict, which shows how reduction relation are rendered
-    in typesetting
-
-  * added a parameter that provides the default for redex-check's
-    #:attempts argument
-
-  * changed the random term generator to produce shorter sequences
-
-  * added a Redex model of the system in Jay McCarthy's ICFP '09 paper
-    "Automatically RESTful Web Applications Or, Marking Modular
-    Serializable Continuations" to the examples directory
-
-  * resolved PRs 10665, 11174, 11579, 11041, 10837, and 11853
-
-v5.1
-
-  * adds an optional #:pred keyword argument to `test-->>' form
-
-  * added the `redex-pseudo-random-generator' parameter
-
-  * added option `::=' syntax to non-terminal definitions
-
-  * added contract support to `define-relation'
-
-  * added the `test-->∃' form
-
-  * fixed minor bugs
-
-v5.0.2
-
-  * added `pretty-print-parameters' to control term pretty-printing
-
-  * added `grammar-style' and `paren-style' typesetting parameters
-
-  * added support for computed reduction rule names
-
-  * added delimited control model to examples
-
-  * added optional #:attempt-size and #:prepare keyword arguments to random 
-    testing forms
-
-  * fixed minor bugs
-
-v5.0.1
-
-  * changed the matching of `where' clauses in a
-    backwards-incompatible way. Previously, pattern variables bound by
-    a `where' left-hand side shadowed bindings from earlier clauses
-    and the case's left-hand side; now, `where' clauses match only
-    when their bindings match the existing ones. 
-
-  * fixed minor bugs
-
-v5.0
-
-  * added an optional term-equivalence predicate to the test--> and
-    test-->> forms
-
-  * added R6RS and Racket VM models to examples sub-collection
-
-  * fixed minor bugs
-  
-v4.2.5
-
-  * reversed the order in which `where' and `side-condition' clauses
-    appear in typeset definitions
-
-  * added support for `where' and `side-condition' clauses that do not
-    appear in the metafunction's typeset definition
-
-  * added a #:print? flag to redex-check, to control whether it prints
-    or returns its result
-
-  * renamed the #:attempts keyword to #:attempt-num in the `generate-term' form
-
-  * changed typesetting to render `where' clauses as `fresh' clauses
-    when the right-hand side is a call to `variable-not-in' or 
-    `variables-not-in'
-
-  * changed typesetting of meta-variables to render anything following
-    a caret (^) as a superscript
-
-  * minor bug fixes
-
-v4.2.4
-
-  * minor bug fixes
-
-v4.2.3
-
-  * added support for collecting metafunction coverage, using the
-    'relation-coverage' parameter. This includes a backwards
-    incompatible change: the parameter's value is now a list of
-    coverage structures, to allow coverage collection for multiple 
-    metafunctions and reduction relations at once.
-
-  * redex/reduction-semantics exports the names `hole' and `in-hole'
-    (and `term' no longer captures those names).
-
-  * minor bug fixes
-
-v4.2.2
-
-  * minor bug fixes
-
-v4.2.1
-
-  * improved 'where' conditions in metafunctions and
-    reduction-relations so that they work with Redex's full pattern
-    language. 
-
-    This is a backwards incompatible change. In old versions,
-    variables used in a where clause were independent of the pattern
-    language. Now, if the variable in a where clause is a literal in
-    the grammar, the result of the where clause must be that
-    literal. Similarly, if the variable is a non-terminal, the result
-    must match that non-terminal.
-
-  * added 'define-relation' 
-
-  * relaxed the restrictions on metafunctions so that multiple
-    pattern matches are allowed, as long as the right-hand side
-    has the same value for each different pattern binding
-
-  * added metafunction styles 'up-down/compact-side-conditions,
-    'left-right/compact-side-conditions, and 
-    'left-right/beside-side-conditions.
-
-  * added #:x-spacing and #:y-spacing parameters to traces and
-    traces/ps
-
-  * changed the grammar for 'side-condition' clauses
-    from (side-condition scheme-expression ... )
-    to (side-condition scheme-expression)
-
-v4.2
-
-  * minor bug fixes
-
-v4.1.5
-
-  * renamed test--> to test-->>
-
-  * added a new test--> that only tests for a single step in the
-    reduction sequence
-
-  * added #:cycles-ok flag to (what is now called) test-->>
-
-  * define-metafunction and reduction-relation now work better with
-    Check Syntax
-    
-  * added the #:arrow keyword to reduction-relation, which lets you use
-    a different main arrow (mostly useful for the typesetting)
-
-  * added domain specifications to reduction relations via
-    the #:domain keyword
-
-  * 'traces' copes better with errors during reduction 
-
-  * initial-char-width now accepts functions to give finer grained
-    control of the initial widths of the terms.
-
-  * traces & traces/ps: added the ability to specify a mixin
-    to be mixed into the graph pasteboard
-
-  * added built-in patterns natural, integer, and real
-  
-v4.1.4
-
-  * added redex-check, a tool for automatically generating test cases
-    for Redex specifications.
-
-  * improved traces for use in generating PostScript:
-
-    - added traces/ps
-
-    - added more coloring arguments to traces: #:scheme-colors? 
-    #:default-arrow-highlight-color, and #:default-arrow-color
-
-    - added the #:layout argument to traces 
-
-    - added term-node-set-position! and related term-node functions
-
-  * Added tracing to metafunctions (see current-traced-metafunctions)
-
-  * added caching-enabled? parameter (changed how set-cache-size! 
-    works)
-
-v4.1.2
-
-  - added white-bracket-sizing to control how the brackets
-    are typeset when rendering a metafunction.
-
-  - added render-* functions that make it easier to experiment
-    with typesetting at the REPL.
-
-  - where clauses in metafunctions now are implicitly in
-    `term's (they were not documented at all before)
-
-v4.1 (this is the first version that was included in the PLT
-      distribution. Before this, Redex was in PLaneT).
-
-  EXTENSIONS:
-
-  - added test-equal, test-pred, test-reduces, and test-results
-
-  - removed restriction on apply-reduction-relation*
-    replaced it with additional work while matching
-    non-terminals to remove the redundancy
-
-  - added `in-domain?'
-
-  CHANGES:
-
-  - define-metafunction and co. now use a different syntax.
-
-  - got rid of named holes. This means, eg, that (hole #f) now matches
-    a two element list, not just the hole directly.
-
-  - zero occurrences of a hole when matching an `in-hole' now
-    correctly fails.
-
-  - the `where' keyword in reduction-relation became `with' (and the
-    arguments reversed order)
-
-  - renamed the `rib' struct to `bind' (and mismatch-rib =>
-    mismatch-bind)
-
-  - merged the various traces functions into a single
-    function that accepts keyword arguments.
-
-  - renamed the loc-wrapper struct to lw.
-
-  - language->ps and language->pict's listof-symbols is now
-    optional and thus the language->ps's arguments changed
-    order to make that work.
-
-  - renamed test-match to redex-match
-
-  - no long export mtch struct or bindings struct and
-    test-match's result is not simplified.
-
-  - extend-reduction-relation now uses the names of the
-    rules to replace existing rules (instead of just
-    unioning the rules)
-
-  - in-hole used to substitute into named holes, but now it
-    only substitutes into unnamed holes. Use in-named-hole
-    on the right-hand side to do the substitution
-
-  - removed hole-here
-
-  BUG FIXES:
-
-  - fixed a (not easily noticed) bug in the way hole
-    matching worked for named holes.
-
-  - extending a non-terminal that's been defined together
-    with other non-terminals now works as expected.
-
-  - handling of non-terminals uses that have underscores in
-    them now works properly (only showed up when using them
-    in the definition of a language)
-
-  - an extended language can now define multiple non-terminals
-    together
-
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-below here were the versions of Redex that appeared in PLaneT
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-("robby" "redex.plt" 4 4)
-
-  - undid some changes that broke backwards compatibility
-
-("robby" "redex.plt" 4 3)
-
-  - added extend-reduction-relation
-  - fixed a bug whereby reduction relations that reduced to
-    false were always ignored
-
-("robby" "redex.plt" 4 2)
-
-  - fixed a bug in the way `in-hole' inside
-    an ellipsis on the right-hand side of a
-    reduction rule.
-
-("robby" "redex.plt" 4 1)
-
-  - improved stepper so that scrolling works when large
-    terms are present.
-
-("robby" "redex.plt" 4 0)
-
-  - changed conventions for subscripts. Now, non-terminals
-    w/out subscripts bind in reduction rules (but they still
-    do not bind in grammar definitions).
-
-  - wheres and side-conditions now bind as expected in
-    reduction-rules
-
-  - fixed a bug in metafunction pict generation (parallel
-    fix from 3.28)
-
-  - renamed horizontal-arrow-space to arrow-space.
-  - renamed horizontal-label-space to label-space.
-
-("robby" "redex.plt" 3 27)
-
-  - added horizontal-arrow-space, horizontal-label-space
-  - number & variable now typeset in italics (to match the other non-terminals)
-  - improved fresh variable generation
-  - added `where' for bindings in metafunctions
-  - added 'up-down mode for metafunction typesetting
-  - added optional argument to reduction-relation->pict &
-    reduction-relation->ps
-  - PR 8957
-
-("robby" "redex.plt" 3 26)
-
-  - fixed a bug in pict generation
-
-("robby" "redex.plt" 3 25)
-
-  - added hole-here support for `term'
-
-("robby" "redex.plt" 3 24)
-
-  - added curly-quotes-for-strings and current-text
-
-("robby" "redex.plt" 3 23)
-
-  - fixed a bug that cause typesetting of grammars that
-    defined hole as the first production of some
-    non-terminal.
-
-  - added hide-hole pattern
-
-("robby" "redex.plt" 3 22)
-
-  - ??
-
-("robby" "redex.plt" 3 21)
-
-  - added `where' as a binding form in the individual
-    clauses of a reduction-relation.
-
-  - typesetting: 
-
-    - improved handling of nested term, quote,
-      unquote, and unquote-splicing.
-
-    - fixed up in-named-hole and (hole x) to use subscripts.
-
-    - improved the docs for the loc wrappers to explain
-      logical spacing.
-
-    - improved typesetting of languages built with
-      extend-language. See extend-language-show-union.
-
-    - added set-arrow-pict!
-
-("robby" "redex.plt" 3 20)
-
-  - improved the interface for rewriting aspects of the typesetting.
-
-  - added linebreaks, with-compound-rewriter, and with-atomic-rewriter
-
-("robby" "redex.plt" 3 19)
-
-  - improved source locations for error messages when misusing ellipses, eg:
-    (term-let ([(x ...) '(1 2)] [(y ...) '(1 2 3)]) (term ((x y) ...)))
-    or similar things via reduction-relation, metafunctions, etc.
-
-  - fixed PR 8752: `name' patterns only show the name,
-    leaving the thing defined to the where clause
-
-("robby" "redex.plt" 3 18)
-
-  - fixed PRS relating to pict generation: 8749 8751 8750
-    and a few other bugs along the way.
-
-("robby" "redex.plt" 3 17)
-
-  - initial-char-width now controls both the stepper & traces
-
-("robby" "redex.plt" 3 16)
-
-  - added define-multi-args-metafunction
-  - finished first pass of the pict generation rewriting
-
-("robby" "redex.plt" 3 15)
-
-  - fixed a bug in stepper/seed
-
-("robby" "redex.plt" 3 14)
-
-  - fixed some silly mistakes in the packaging
-
-("robby" "redex.plt" 3 13)
-
-  - added variable-not-otherwise-mentioned as a new pattern
-  - added stepper/seed
-  - added an optional pretty-printing argument to stepper.
-  - improved the ps rendering of the arrows
-    for --> -> => ==> ~> and ~~>
-  - rewrote internals of pict rendering (hopefully no change
-    yet, but there may be bugs introduced ...).
-
-("robby" "redex.plt" 3 12)
-
-  - Added pict and .ps generation functions for
-    reduction-relations, metafunctions, and grammars. These
-    are still primitive; the most obvious missing feature is
-    the inability (without secret knowledge) to replace the
-    pink stuff.
-  - fixed a bug in the way the stepper highlights
-    differences in the presence of quote (by disabling the '
-    shortcuts printing)
-
-    NOTE this version of redex requires not just any
-    369.100, but one from 5/19 in the afternoon (or newer).
-
-("robby" "redex.plt" 3 11)
-
-  - changed the order of the arguments in the new `fresh' clauses
-    introduced in the last release.
-
-("robby" "redex.plt" 3 10)
-
-  - fixed bugs in the way that ..._x patterns work (they 
-    didn't handle binding well).
-  - fixed misc bugs in the stepper
-  - added the ability to generate a sequence of fresh variables
-    in a single rule
-
-("robby" "redex.plt" 3 9)
-
-  - added side-condition specs to metafunctions
-  - added test-reduces and test-reduces/multiple to schemeunit.ss
-  - fixed a bug in the handling of _!_
-  - improved the "found the same binder" error message to show
-    the source locations of the two offending binders
-
-("robby" "redex.plt" 3 8)
-
-  - fixed a bug in the way (hole #f) patterns matched.
-  - fixed a bug in the initial height of the boxes in `traces' 
-  - added reduction->relation-names
-  - added ability to step until a particular reduction (and
-    the reduction labels) in the stepper.
-
-("robby" "redex.plt" 3 7) 
-
-  - improved syntax error message (PR 8576)
-  - added difference highlighting for adjacent terms in the stepper
-
-("robby" "redex.plt" 3 6)
-
-  - added stepper
-
-("robby" "redex.plt" 3 5)
-
-  - bugfix (I think ... this version's changes seem to have been forgotten)
-
-("robby" "redex.plt" 3 4)
-
-  - added term-node-children
-
-("robby" "redex.plt" 3 3)
-
-  - added term-match and term-match/single
-  - added variables-not-in
-  - fixed a bug in metafunctions
-
-("robby" "redex.plt" 3 2)
-
-  - added language-nts
-  - added better error messages when using parts of the
-    pattern language as ordinary things in the grammar.
-
-("robby" "redex.plt" 3 1) 
-
-  - adds the ability to have multi-colored terms, not just
-    pink ones.
-
-("robby" "redex.plt" 3 0)
-
-This release changes the syntax of the reduction relations
-to make it more consistent and more in line with the way
-reduction relations are written in papers. This is the
-precise set of removals and additions:
-
-  - added extend-language
-  - added reduction-rule & apply-reduction-relation
-  - added union-reduction-relations
-  - added define-language
-
-  - changed compatible-closure & context-closure so that the
-    pattern argument is not quoted, but is just the pattern
-    in the last argument.
-
-  - changed term-node-labels so that it can return #f (in
-    the list) when a reduction doesn't have a label.
-
-  - removed language->predicate, compile-pattern,
-    match-pattern (use test-match instead)
-
-  - removed reduction, reduction/name, reduction/context,
-    reduction/context/name (use reduction-relation instead)
-
-  - removed red? (use reduction-relation? instead)
-
-  - removed reduce (use apply-reduction-relation instead)
-
-  - removed reduce-all (use apply-reduction-relation* insetad)
-
-  - removed reduce/tag-with-reduction (use
-    apply-reduction-relation/tag-with-names instead)
-
-  - removed red-name, reduction->name, give-name
-
-  - removed language (use define-language instead)
-
-  - removed helper.ss
-
-Other improvements:
-
-  - check syntax draws arrows for the non-terminals in a
-    `language' now, both to the language and to the
-    reduction rules.
-
-("robby" "redex.plt" 2 6)
-
-  - added reduce-all and note about bad parsing performance
-    issues.
-
-  - added `test-match' and note about how to debug redex
-    programs to doc.txt
- 
-  - added redex-specific 'check' functions for use with
-    schemeunit.
-
-  - add `metafunction' for defining meta functions using the
-    pattern matching notation used in reductions and grammars.
-
-("robby" "redex.plt" 2 5) 
-
-  - fixed bugs in compatible-closure & context-closure
-
-("robby" "redex.plt" 2 4) 
-
-  - reduced the amount of memory used for caching
-    significantly (with some small speedup for 
-    a largeish reduction semantics test suite)
-
-  - added set-cache-size!
-
-  - added variable-prefix pattern
-
-  - added ..._<id> pattern that can be used to ensure matching
-    lengths of repeated patterns.
-
-  - added _!_ subscripts (both in ... and regular) to ensure
-    that the matched things are different (or have different
-    lengths in the case of ..._!_ subscripts)
-
-("robby" "redex.plt" 2 3) 
-
-  - added the ability to traverse the graph generated by
-    traces in order to decide if a term should be
-    highlighted in red. See the traces/pred documentation
-    for details.
-
-  - added term-node functions
-
-  - added red-name function
-
-  - removed make-plt.ss from archive
-
-("robby" "redex.plt" 2 2)
-
-  - added a blurb, fixed a typo in the docs.
-
-("robby" "redex.plt" 2 1)
-
-  - changed the way a contract is specified on the matcher
-    to get a 30% speed up on the beginner test suite.
-    Thanks, Matthew for spotting that!
-
-("robby" "redex.plt" 2 0)
-
-  - fixed a bug in compatible-closure handling that could
-    result in duplicate matches when there should only have
-    been a single match.
-
-  - added labels to edges for reductions
-    when shown in GUI. See docs for
-    reduction/name
-
-  - small performance improvement to matcher 
-    (10-20% on non-trivial examples)
-
-  - added letrec.ss example (and improved some
-    of the examples to use labels)
-
-("robby" "redex.plt" 1 3)
-
-  - Fixed a bug in the compatible closure function; otherwise the
-    same as 1.1
-
-("robby" "redex.plt" 1 2)
-
-  - Obsolete'd version. It used to be a first attempt at the 2.0
-    revision, but now should be avoided. 
-
-    Use 2.0 instead of this version.
-
-("robby" "redex.plt" 1 1)
-
-  - fixed packaging error
-
-("robby" "redex.plt" 1 0)
-
-  - initial release to PLaneT
-
diff --git a/pkgs/redex-pkgs/redex-lib/redex/info.rkt b/pkgs/redex-pkgs/redex-lib/redex/info.rkt
deleted file mode 100644
index 86419d2b5f..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/info.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang info
-
-(define collection "redex")
-
-(define name "PLT Redex")
-(define release-note-files (list (list "Redex" "HISTORY.txt")))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/2set.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/2set.rkt
deleted file mode 100644
index 40853b6ca6..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/2set.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match
-         racket/set)
-
-(provide 2Setof
-         (rename-out [mk-2set 2set]
-                     [2set-set1 2set-ones]
-                     [2set-set2 2set-manys])
-         2set-add
-         2set-union)
-
-(define-type (2Setof A) (2set A))
-(struct: (A) 2set ([set1 : (Setof A)]
-                   [set2 : (Setof A)]))
-
-(: mk-2set : (All (a) (a * -> (2Setof a))))
-(define (mk-2set . xs)
-  (for/fold ([acc (2set (ann (set) (Setof a))
-                        (ann (set) (Setof a)))])
-            ([x (in-list xs)])
-    (2set-add acc x)))
-
-(: 2set-add : (All (a) ((2Setof a) a * -> (2Setof a))))
-(define (2set-add ts . xs)
-  (for/fold ([acc ts])
-            ([x (in-list xs)])
-    (match-define (2set ones manys) acc)
-    (cond [(set-member? ones x)
-           (2set ones (set-add manys x))]
-          [else (2set (set-add ones x) manys)])))
-
-(: 2set-union : (All (a) ((2Setof a) (2Setof a) -> (2Setof a))))
-(define/match (2set-union ts1 ts2)
-  [((2set s11 s12) (2set s21 s22))
-   (define common (set-intersect s11 s21))
-   (2set (set-union s11 s21)
-         (set-union s12 s22 common))])
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/build-nt-property.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/build-nt-property.rkt
deleted file mode 100644
index bcf1d252b5..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/build-nt-property.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         "lang-struct.rkt")
-
-(provide
- (contract-out
-  [build-nt-property (-> (listof nt?)
-                         (-> any/c (hash/c symbol? any/c) any/c)
-                         any/c
-                         (-> any/c any/c any/c)
-                         (hash/c symbol? any/c))]
-  [build-nt-property/name (-> (listof nt?)
-                              (-> any/c symbol? (hash/c symbol? any/c) any/c)
-                              any/c
-                              (-> any/c any/c any/c)
-                              (hash/c symbol? any/c))]))
-
-;; build-nt-property : lang 
-;;                     (pattern hash[symbol -o> ans] -> ans)
-;;                     init-ans
-;;                     (ans ans -> ans) 
-;;                  -> hash[nt -o> ans]
-;; builds a property table using a fixed point computation,
-;; using base-answer and lub as the lattice
-(define (build-nt-property lang test-rhs base-answer lub)
-  (build-nt-property/name lang
-                          (λ (pat n ht)
-                             (test-rhs pat ht))
-                          base-answer
-                          lub))
-
-;; build-nt-property : lang 
-;;                     (pattern symbol hash[symbol -o> ans] -> ans)
-;;                     init-ans
-;;                     (ans ans -> ans) 
-;;                  -> hash[nt -o> ans]
-(define (build-nt-property/name lang test-rhs/name base-answer lub)
-  (define ht (make-hash))
-  (for ([nt (in-list lang)])
-    (hash-set! ht (nt-name nt) base-answer))
-  (let loop ()
-    (define something-changed? #f)
-    (for ([nt (in-list lang)])
-      (define next-val
-        (for/fold ([acc base-answer])
-                  ([rhs (in-list (nt-rhs nt))])
-          (lub acc (test-rhs/name (rhs-pattern rhs) (nt-name nt) ht))))
-      (unless (equal? next-val (hash-ref ht (nt-name nt)))
-        (hash-set! ht (nt-name nt) next-val)
-        (set! something-changed? #t)))
-    (when something-changed? (loop)))
-  ht)
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/compiler/match.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/compiler/match.rkt
deleted file mode 100644
index 6eace49da9..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/compiler/match.rkt
+++ /dev/null
@@ -1,1743 +0,0 @@
-#lang scheme
-(require redex/reduction-semantics)
-(require racket/set)
-(provide red detect-hole detect-hole2 hole-table Get-Free-Name-Patterns 
-         Flush1
-         Flushable?
-         Build-Cond
-         Cond-List
-         simplify
-         compile
-         Get-Pvar)
-
-(define hole-table (make-hash))
-
-(define the-hole (term hole))
-(define no-context #f)
-(define in-context #t)
-(define ∅ #f)
-(define context-match (make-parameter no-context))
-(define (variable-prefix? x y) 
-  (let* ([prefix-str (symbol->string x)]
-         [prefix-len (string-length prefix-str)])
-    (and (symbol? y)
-         (let ([str (symbol->string y)])
-           (and ((string-length str) . >= . prefix-len)
-                (string=? (substring str 0 prefix-len) prefix-str))))))
-(define rev (λ (x) 
-              (if (cons? x)
-                  (reverse x)
-                  x)))
-
-(define new-var-list '())
-
-(define-language L
-  [e (cond [e e] ...)
-     (let ((x e) ...) e)
-     (e e ...)
-     m
-     b]
-  [v (cond [v v] ...)
-     (let ((x v) ...) v)
-     (v v ...)
-     b]
-  [b empty
-     plug
-     reverse
-     append
-     list
-     andmap
-     no-match
-     cons?
-     number?
-     natural?
-     integer?
-     real?
-     string?
-     symbol?
-     context-match
-     or
-     set-union
-     set
-     set-from-list
-     set-map
-     curry
-     pair-path-append
-     path-append
-     variable-except?
-     variable-prefix?
-     ()
-     begin
-     ∪
-     singleton
-     eqv?
-     set-empty?
-     ∅
-     else
-     car
-     cdr
-     number
-     string
-     bool
-     cons
-     elip
-     'any
-     not
-     =
-     term-let
-     variable-not-otherwise-mentioned]
-  [bool #t
-        #f]
-  [Context 
-   (cond [v v] ...
-         [v Context]
-         [v e] ...)
-   (cond [v v] ...
-         [Context e]
-         [e e] ...)
-   (let ((x v) ...) v ... Context e ...)
-   (v ... Context e ...)
-   hole]
-  [m (matrix (x ...) (row ...) (pvar ...) (pvar ...) natural bool)]
-  [row ((p ... -> r) eqs ...)]
-  [eqs (pvar bool eq ...)]
-  [elip ;,'... 
-   (side-condition variable_1 (eq? (term variable_1) '...))]
-  [eq id
-      (= pvar)
-      ;(car eq)
-      ;(cdr eq)
-      (cons eq eq)
-      (plug eq eq)
-      ; not used yet
-      (append eq eq)
-      lit-hole]
-  (p (or p p)
-     lit-hole
-     (lit-in-hole p_1 p_2)
-     (lit-hide-hole p)
-     (lit-name variable p)
-     (lit-side-condition p any)
-     (nt id)
-     rep
-     scw)
-  (scw s
-       cw)
-  (s lit-number
-     lit-natural
-     lit-integer
-     lit-real
-     lit-string
-     lit-variable
-     (lit-variable-except id ...)
-     (lit-variable-prefix id))
-  (cw c
-      wildcard)
-  (wildcard wc)
-  (c number
-     string
-     'variable
-     '()
-     cp
-     #t
-     #f)
-  (cp (cons p p))
-  (rep (repeat p p))
-  (id variable)
-  ((match-repeat z) variable-not-otherwise-mentioned)
-  (pvar variable-not-otherwise-mentioned
-        ; possibly (pvar variable-not-otherwise-mentioned)
-        (pvar pvar)
-        (pvar elip))
-  (x (car x)
-     (cdr x)
-     (cons x x)
-     pvar)
-  (r any
-     (car any)
-     (cdr any))
-  ((op replace) any))
-
-(define red
-  (reduction-relation
-   L
-   
-   ; Top-Row-All-Wildcard
-   ;   If the top row is all wildcard patterns, we're not inside a repeat, or in the non-terminal set mode, 
-   ;   replace the top row with a singleton of it's rhs, and union this with the matrix built from the remaining rows.
-   
-   (--> (in-hole Context (matrix (x_1 ...) 
-                                 (((wildcard ... -> r_1) eqs_1 ...) 
-                                  ((p_1 ... -> r_2) eqs_2 ...) 
-                                  ...)
-                                 (pvar ...)
-                                 (pvar_3 ...)
-                                 0
-                                 bool))
-        (in-hole Context
-                 (begin r_1 
-                        (matrix (x_1 ...) 
-                                (((p_1 ... -> r_2) eqs_2 ...) 
-                                 ...)
-                                (pvar ...)
-                                (pvar_3 ...)
-                                0
-                                bool)
-                        )
-                 )
-        (side-condition (eqv? (length (term (x_1 ...))) (length (term (wildcard ...)))))
-        (side-condition (not (term (Flushable? (eqs_1 ...)))))
-        Top-Row-All-Wildcard)
-   
-   ; Top-Row-All-Wildcard in repeat
-   ;   This is to support our hack of using the repeat matching function as a rhs to a matrix when matching repeats. 
-   ;   When we see a one rowed matrix, where the top row is all wildcards, replace with the rhs.
-   
-   (--> (in-hole Context (matrix (x_1 ...) 
-                                 (((wildcard ... -> r_1) eqs_1 ...))
-                                 (pvar ...)
-                                 (pvar_3 ...)
-                                 natural
-                                 bool))
-        (in-hole Context r_1)
-        (side-condition (eqv? (length (term (x_1 ...))) (length (term (wildcard ...)))))
-        (side-condition (> (term natural) 0))
-        Top-Row-All-Wildcard-in-repeat)
-   
-   ; Empty-Rows
-   ;   Transform matrices with no rows into ∅.
-   
-   (--> (in-hole Context (matrix (x ...)
-                                 ()
-                                 (pvar ...)
-                                 (pvar_3 ...)
-                                 natural
-                                 bool))
-        (in-hole Context ∅)
-        Empty-Rows)
-   
-   ; Empty Variables
-   ;   Transform matrices with no input variables into ∅.
-   (--> (in-hole Context (matrix ()
-                                 (((p_1 p_2 ... -> r_1) eqs_1 ...)
-                                  ((p_3 p_4 ... -> r_2) eqs_2 ...)
-                                  ...)
-                                 (pvar ...)
-                                 (pvar_3 ...)
-                                 natural
-                                 bool))
-        (in-hole Context ∅)
-        Empty-Variables)
-   
-   ; Drop-Front-Column-All-Wildcard
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((wc p_2 ... -> r_1) eqs_1 ...)
-                          ((wc p_4 ... -> r_2) eqs_2 ...)
-                          ...)
-                         (pvar ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context
-                 (matrix (x_2 ...)
-                         (((p_2 ... -> r_1) eqs_1 ...)
-                          ((p_4 ... -> r_2) eqs_2 ...)
-                          ...)
-                         (pvar ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (side-condition (ormap not-a-wildcard? (term (p_2 ...))))
-        Drop-Front-Column-All-Wildcard)
-   
-   ; Unroll-Or
-   ;   If the first pattern of a row in the matrix is an or pattern, duplicate the row for each branch of the or.
-   
-   (--> (in-hole Context
-                 (matrix (x_1 ...) 
-                         (((p_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((or p_3 p_4) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context 
-                 (matrix (x_1 ...) 
-                         (((p_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          ((p_3 p_5 ... -> r_2) eqs_2 ...)
-                          ((p_4 p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (side-condition (andmap not-an-or? (term (p_1 ...))))
-        Unroll-Or)
-   
-   ; binding-name
-   ;   If the first pattern of a row in the matrix has is a name pattern where the id is not yet marked as bound, 
-   ;   and we're not inside a repeat, then mark the id as bound, replace the name with the pattern contained in it, 
-   ;   wrap the row in a let which binds the id to the current input variable, and union the result of the let with the matrix formed by the remaining rows.
-   
-   (--> (in-hole Context 
-                 (matrix (x_1 x_2 ...) 
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((lit-name pvar_1 p_3) p_5 ... -> r_2) (pvar_4 bool_4 eq_4 ...) ... (pvar_1 bool_1 eq_1 ...) (pvar_5 bool_5 eq_5 ...) ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_2 ...)
-                         (pvar_3 ...)
-                         0
-                         bool))
-        (in-hole Context
-                 (matrix (x_1 x_2 ...) 
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          ((p_3 p_5 ... -> r_2) (pvar_4 bool_4 eq_4 ...) ... (pvar_1 bool_1 ,@(remove-duplicates (term (x_1 eq_1 ...)))) (pvar_5 bool_5 eq_5 ...) ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_2 ...)
-                         (pvar_3 ...)
-                         0
-                         bool))
-        binding-name)
-   
-   ; binding-name-repeat
-   ;   If inside a repeat, there is a 1 row matrix with a name pattern in its front column, where the variable is not marked as bound in either place in the matrix, 
-   ;   replace the name with the pattern it matches, wrap the matrix inside a let which binds the id to the current input variable, 
-   ;   and mark the variable as bound in only the list of repeat variables.
-   
-   (--> (in-hole Context 
-                 (matrix (x_1 x_2 ...) 
-                         ((((lit-name pvar_1 p_3) p_5 ... -> r_2) eqs_1 ...))
-                         (pvar_2 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context 
-                 (let ((pvar_1 x_1))
-                   (matrix (x_1 x_2 ...)
-                           (((p_3 p_5 ... -> r_2) eqs_1 ...))
-                           (pvar_2 ...)
-                           (pvar_1 pvar_3 ...)
-                           natural
-                           bool)))
-        ;(side-condition (not (member (term pvar_1) (term (pvar_2 ...)))))
-        (side-condition (not (member (term pvar_1) (map (λ (x) (term (Get-Pvar ,x))) (append (term (Binding-Eqs (eqs_1 ...))) (append (term (True-Eqs (eqs_1 ...) ())) (term (pvar_3 ...))))  ))))
-        (side-condition (> (term natural) 0))
-        binding-name-repeat)
-   
-   ; bound-name-from-outside-repeat
-   ;     If a one rowed matrix inside a repeat begins with a name pattern where the identifier is marked as bound outside the repeat, 
-   ;   wrap the matrix in an equality test between the car of the already-bound value, and the current input variable, 
-   ;   then continue matching starting with the p from inside the name pattern. 
-   ;     We take the car because we know that all variables bound inside repeats will bind to lists, 
-   ;   so an existing binding is equal one inside a repeat if each element of the bindings is equal.
-   
-   (--> (in-hole Context 
-                 (matrix (x_1 x_2 ...) 
-                         ((((lit-name pvar_1 p_3) p_5 ... -> r_2) eqs_1 ...))
-                         (pvar_2 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context 
-                 (cond [(equal? pvar_11 x_1)
-                        (matrix (x_1 x_2 ...)
-                                (((p_3 p_5 ... -> r_2) eqs_1 ...))
-                                (pvar_2 ...)
-                                (pvar_3 ...)
-                                natural
-                                bool)]
-                       ))
-        (where pvar_11 (Get-Temp-Name pvar_1 (pvar_2 ...)))
-        (side-condition (> (term natural) 0))
-        (side-condition (member (term pvar_1) (map (λ (x) (term (Get-Pvar ,x))) (append (term (Binding-Eqs (eqs_1 ...))) (term (True-Eqs (eqs_1 ...) ())) ))))
-        bound-name-from-outside-repeat)
-   
-   ; bound-name-from-inside-repeat
-   ;   If a one rowed matrix inside a repeat begins with a name pattern where the identifier is marked as bound inside the repeat, 
-   ;   wrap the matrix in an equality test between the already-bound value and the current input variable, then continue matching starting with the p from inside the name pattern.
-   
-   (--> (in-hole Context 
-                 (matrix (x_1 x_2 ...) 
-                         ((((lit-name pvar_1 p_3) p_5 ... -> r_2) eqs_1 ...))
-                         (pvar_2 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context 
-                 (cond [(equal? pvar_1 x_1)
-                        (matrix (x_1 x_2 ...)
-                                (((p_3 p_5 ... -> r_2) eqs_1 ...))
-                                (pvar_2 ...)
-                                (pvar_3 ...)
-                                natural
-                                bool)
-                        ]
-                       #;[else ∅]
-                       ))
-        (side-condition (> (term natural) 0))
-        (side-condition (member (term pvar_1) (map (λ (x) (term (Get-Pvar ,x))) (term (pvar_3 ...)))))
-        bound-name-from-inside-repeat)
-   
-   ; non-terminal 
-   ;   If a row in a matrix starts with a non-terminal which does not potentially contain a hole, wrap the row with a conditional 
-   ;   which calls the function wicth matches the non-terminal using boolean operations instead of sets where possible. Union this with the matrix formed by the remaining rows.
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((nt id) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_2 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context
-                 (begin 
-                   (cond ((,(string->symbol (format "~s~s" (term id) '-bool)) x_1)
-                          (matrix (x_2 ...)
-                                  (((p_* ... -> r_*) eqs_* ...) ...)
-                                  (pvar_2 ...)
-                                  (pvar_3 ...)
-                                  natural
-                                  bool)
-                          )
-                         #;(else ∅)
-                         )
-                   (matrix (x_1 x_2 ...)
-                           (((p_** ... -> r_**) eqs_** ...) ...)
-                           (pvar_2 ...)
-                           (pvar_3 ...)
-                           natural
-                           bool)))
-        (where (((p_* ... -> r_*) eqs_* ...) ...) (drop-first-p (same-starting-pattern 
-                                                                 (nt id)
-                                                                 (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                                                                  ...
-                                                                  (((nt id) p_5 ... -> r_2) eqs_2 ...)
-                                                                  ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                                                                  ...))))
-        (where (((p_** ... -> r_**) eqs_** ...) ...) (diff-starting-pattern (nt id) (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                                                                                     ...
-                                                                                     ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                                                                                     ...)))
-        non-terminal)
-   
-   ; Constructor
-   ; If the front column is all either "constructor" patterns, or wildcard patterns, with at least one non-wildcard, then specialize the matrix based on the constructors.
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((wildcard_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          ((c_1 p_3 ... -> r_2) eqs_2 ...)
-                          ((cw_2 p_4 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context 
-                 (Build-Cond ((Cond-List (simplify (c_1 cw_2 ...))) 
-                              (matrix (x_1 x_2 ...)
-                                      (((wildcard_1 p_2 ... -> r_1) eqs_1 ...)
-                                       ...
-                                       ((c_1 p_3 ... -> r_2) eqs_2 ...)
-                                       ((cw_2 p_4 ... -> r_3) eqs_3 ...)
-                                       ...)
-                                      (pvar_1 ...)
-                                      (pvar_3 ...)
-                                      natural
-                                      bool) carx cdrx)))
-        (fresh carx)
-        (fresh cdrx)
-        Constructor)
-   
-   ; hole
-   ;   If a row in the matrix contains a lit-hole in its first column, and the flag for non-terminal-set is #f, 
-   ;   then separate the row from the rest of the matrix, replacing hole with "context-match," which will subsequently be transformed 
-   ;   into a conditional based on whether or not there is a current context. Union this with the matrix formed by the remaining rows.
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          ((lit-hole p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context
-                 (begin 
-                   (cond [(or (context-match) (eqv? x_1 the-hole))
-                          (matrix (x_2 ...)
-                                  (((p_* ... -> r_*) eqs_* ...) ...)
-                                  (pvar_1 ...)
-                                  (pvar_3 ...)
-                                  natural
-                                  bool)]
-                         #;(else ∅)
-                         )
-                   (matrix (x_1 x_2 ...)
-                           (((p_** ... -> r_**) eqs_** ...) ...)
-                           (pvar_1 ...)
-                           (pvar_3 ...)
-                           natural
-                           bool)
-                   ))
-        
-        (where (((p_* ... -> r_*) eqs_* ...) ...) (drop-first-p (same-starting-pattern 
-                                                                 lit-hole
-                                                                 (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                                                                  ...
-                                                                  ((lit-hole p_5 ... -> r_2) eqs_2 ...)
-                                                                  ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                                                                  ...))))
-        (where (((p_** ... -> r_**) eqs_** ...) ...) (diff-starting-pattern lit-hole 
-                                                                            (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                                                                             ...
-                                                                             ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                                                                             ...)))
-        hole)
-   
-   ; in-hole (wrong number of holes)
-   ;   If a row in a matrix begins with a lit-in-hole, but the number of holes in the first pattern is 0 or > 1, eliminate the row.
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((lit-in-hole p_3 p_4) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (side-condition (not (eqv? 1 (term (detect-hole2 0 p_3)))))
-        
-        in-hole-wrong-number-of-holes)
-   
-   ; in-hole (not base case)
-   ;   If a row in a matrix begins with a lit-in-hole, and the number of holes in the first pattern is 1, then return the same matrix, 
-   ;   but change the in-hole pattern so that the pieces of the first pattern that don't contain the hole are shifted to the outside of the in-hole.
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((lit-in-hole p_3 p_4) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((move-hole-op-inward lit-in-hole p_4 p_3) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        
-        (side-condition (eqv? 1 (term (detect-hole2 0 p_3))))
-        (side-condition (not-a-lit-name? (term p_3)))
-        in-hole-move-hole-op)
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((lit-in-hole (lit-name pvar p_3) p_4) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((lit-in-hole ,(car (term any_*)) p_4) p_5 ... -> r_2) ,@(cadr (term any_*)))
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (fresh pvar-car)
-        (fresh pvar-cdr)
-        (where any_* (push-name-downward (lit-name pvar p_3) (eqs_2 ...) pvar-car pvar-cdr))
-        (side-condition (not-a-nt? (term p_3)))
-        in-hole-name)
-   
-   ; in-hole (base case)
-   ;   If a row in a matrix begins with lit-in-hole, where the only thing in the first position is a non-terminal with 1 hole in it, 
-   ;   then transform the row into an expression to parameterize a new context, get back the set of pairs which match the non-terminal, 
-   ;   then test the cdr of each pair against the second pattern, and finally continue matching the row. Union this with the matrix formed by the remaining rows.
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((lit-in-hole (nt id) p_4) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context
-                 (begin
-                   (for
-                    ((rt (parameterize ((context-match in-context))
-                           (in-list (,(string->symbol (format "~s~s" (term id) '-list)) x_1)))))
-                    (let ((cdr-rt (cdr rt)))
-                      (matrix (cdr-rt x_2 ...)
-                              (((p_* ... -> r_*) eqs_* ...) ...)
-                              (pvar_1 ...)
-                              (pvar_3 ...)
-                              natural
-                              bool))
-                    )
-                   (matrix (x_1 x_2 ...)
-                           (((p_** ... -> r_**) eqs_** ...) ...)
-                           (pvar_1 ...)
-                           (pvar_3 ...)
-                           natural
-                           bool)
-                   )
-                 )
-        (side-condition (eqv? 1 (term (detect-hole2 0 (nt id)))))
-        
-        (where (((p_* ... -> r_*) eqs_* ...) ...) (replace-first-p p_4
-                                                                   (same-starting-pattern 
-                                                                    (lit-in-hole (nt id) p_4)
-                                                                    (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                                                                     ...
-                                                                     (((lit-in-hole (nt id) p_4) p_5 ... -> r_2) eqs_2 ...)
-                                                                     ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                                                                     ...))))
-        (where (((p_** ... -> r_**) eqs_** ...) ...) (diff-starting-pattern (lit-in-hole (nt id) p_4)
-                                                                            (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                                                                             ...
-                                                                             ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                                                                             ...)))
-        (fresh rt)
-        (fresh cdr-rt)
-        in-hole)
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((lit-in-hole (lit-name pvar (nt id)) p_4) p_5 ... -> r_2) (pvar_7 bool_7 eq_7 ...) ... (pvar bool_1 eq_1 ...) (pvar_8 bool_8 eq_8 ...) ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context
-                 (begin 
-                   (for
-                    ((rt (parameterize ((context-match in-context))
-                           (in-list (,(string->symbol (format "~s~s" (term id) '-list)) x_1)))))
-                    (let ((car-rt (car rt))
-                          (cdr-rt (cdr rt)))
-                      (matrix (cdr-rt x_2 ...)
-                              (((p_4 p_5 ... -> r_2) (pvar_7 bool_7 eq_7 ...) ... (pvar bool_1 car-rt eq_1 ...) (pvar_8 bool_8 eq_8 ...) ...))
-                              (pvar_1 ...)
-                              (pvar_3 ...)
-                              natural
-                              bool))
-                    )
-                   (matrix (x_1 x_2 ...)
-                           (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                            ...
-                            ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                            ...)
-                           (pvar_1 ...)
-                           (pvar_3 ...)
-                           natural
-                           bool)
-                   )
-                 )
-        (fresh rt)
-        (fresh car-rt)
-        (fresh cdr-rt)
-        (side-condition (eqv? 1 (term (detect-hole2 0 (nt id)))))
-        in-hole-nt-name)
-   
-   ; hide-hole (not base case)
-   ;   If a row in a matrix starts with a lit-hide-hole, replace the lit-hide-hole with a hide-hole where the patterns not containing holes have been shifted to the outside.
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((lit-hide-hole p_3) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((move-hole-op-inward lit-hide-hole 'lit-hole p_3) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        
-        hide-hole-move-hole-op)
-   
-   ; hide-hole (base case)
-   ;   If a row in a matrix starts with a lit-hide-hole where the pattern is a non-terminal containing at least one hole,
-   ;   wrap the row in an expression to parameterize the context to no-context, then match the non-terminal and the rest of the row. 
-   ;   Union the result with the rows formed by the rest of the matrix.
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((lit-hide-hole (nt id)) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context
-                 (begin
-                   (parameterize ((context-match no-context))
-                     (matrix (x_1 x_2 ...)
-                             (((p_* ... -> r_*) eqs_* ...) ...) #;(((nt id) p_5 ... -> r_2))
-                             (pvar_1 ...)
-                             (pvar_3 ...)
-                             natural
-                             bool))
-                   (matrix (x_1 x_2 ...)
-                           (((p_** ... -> r_**) eqs_** ...) ...)
-                           (pvar_1 ...)
-                           (pvar_3 ...)
-                           natural
-                           bool)
-                   )
-                 )
-        (side-condition (not (eqv? 0 (term (detect-hole2 0 (nt id))))))
-        
-        (where (((p_* ... -> r_*) eqs_* ...) ...) (replace-first-p (nt id)
-                                                                   (same-starting-pattern 
-                                                                    (lit-hide-hole (nt id))
-                                                                    (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                                                                     ...
-                                                                     (((lit-hide-hole (nt id)) p_5 ... -> r_2) eqs_2 ...)
-                                                                     ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                                                                     ...))))
-        (where (((p_** ... -> r_**) eqs_** ...) ...) 
-               (diff-starting-pattern
-                (lit-hide-hole (nt id))
-                (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                 ...
-                 ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                 ...)))
-        hide-hole-nt)
-   
-   ; hide-hole (hole)
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((lit-hide-hole lit-hole) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context
-                 (begin
-                   (parameterize ((context-match no-context))
-                     (matrix (x_1 x_2 ...)
-                             (((p_* ... -> r_*) eqs_* ...) ...) #;(((nt id) p_5 ... -> r_2))
-                             (pvar_1 ...)
-                             (pvar_3 ...)
-                             natural
-                             bool))
-                   (matrix (x_1 x_2 ...)
-                           (((p_** ... -> r_**) eqs_** ...) ...)
-                           (pvar_1 ...)
-                           (pvar_3 ...)
-                           natural
-                           bool)
-                   )
-                 )
-        
-        (where (((p_* ... -> r_*) eqs_* ...) ...) (replace-first-p lit-hole
-                                                                   (same-starting-pattern 
-                                                                    (lit-hide-hole lit-hole)
-                                                                    (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                                                                     ...
-                                                                     (((lit-hide-hole lit-hole) p_5 ... -> r_2) eqs_2 ...)
-                                                                     ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                                                                     ...))))
-        (where (((p_** ... -> r_**) eqs_** ...) ...) 
-               (diff-starting-pattern
-                (lit-hide-hole lit-hole)
-                (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                 ...
-                 ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                 ...)))
-        hide-hole)
-   
-   ; side-condition
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((lit-side-condition p_3 any) p_4 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        (in-hole Context 
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          ((p_3 p_4 ... -> (if any r_2 ∅)) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...)
-                         natural
-                         bool))
-        
-        side-condition)
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                          ...
-                          (((repeat p_3 p_4) p_5 ... -> r_2) eqs_2 ...)
-                          ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                          ...)
-                         (pvar_1 ...)
-                         (pvar_3 ...) 
-                         natural
-                         bool))
-        (in-hole Context
-                 (begin
-                   (matrix (x_1 x_2 ...)
-                           ((((repeat p_3 p_4) p_5 ... -> r_2) eqs_2 ...))
-                           (pvar_1 ...)
-                           (pvar_3 ...)
-                           natural
-                           bool)
-                   (matrix (x_1 x_2 ...)
-                           (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                            ...
-                            ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                            ...)
-                           (pvar_1 ...)
-                           (pvar_3 ...)
-                           natural
-                           bool)))
-        (side-condition (or (> (length (term (((cw_1 p_2 ... -> r_1) eqs_1 ...) ...))) 0)
-                            (> (length (term (((p_6 p_7 ... -> r_3) eqs_3 ...) ...))) 0)))
-        repeat-split)
-   
-   ; Repeat
-   ;    If a row in a matrix starts with (repeat p_1 p_2), first determine all the identifiers for name patterns in p_1. Call the ones which are not marked as bound in the matrix variable_1 ..., and the ones which are marked as bound in the matrix variable_2 ...
-   ;    Seperate the matrix into the row with the repeat and all other rows, unioning the result together. Wrap the repeat row in a let expression to bind all the elements of variable_2 ... to fresh temporary variables. Inside this define a letrec called match-repeach as a function which takes a fresh variable z, variable_1 ..., and variable_2 ... as its arguments. variable_1 ... will be used to build up the bindings from inside the repeat, while variable_2 ... will be unwrapped to check that values already bound outside of the repeat match those inside the repeat.
-   ;    Inside the function, union the results of two conditionals. The first is the "base case," where every element of variable_2 ... is equal to the empty list, and therefore the variable bound outside the repeat are correct inside the repeat. In this case, we return a matrix where the first input variable is z, the first pattern in the row is p_2, and the rest of the input/row are the same as before. We mark variable_1 ... as bound. This matrix is wrapped in a let expression which restores the values bound outside the repeat back from their temporary forms.
-   ;    The second conditional checks if z and variable_2 ... are all cons?. If they are, it stores all the values for variable_1 ... as temporaries, then matches (car z) against p_1, with the righthand side equal to a call to match repeat with (cdr z), the cons of variable_1 ... the temporary values for variable_1 ..., and the cdr of all the elements of variable 2. (The new bindings are built up by one layer, and the ones bound outside of the repeat are "unwrapped" by one layer). In this one row, one pattern matrix, the natural indicating the depth of the repeat is incremented.
-   ;    Finally, in the body of the letrec, all the elements of variable_1 ... are bound to empty, and there is the call (match-repeat x_1 variable_1 ... variable_2 ...).
-   
-   ;; what happens with the (pvar_3 ...) field of the matrix when you have a matrix from a pattern like this one:
-   #;(((((name x number) (name x number)) ...)
-       (((name x number) (name x number)) ...))
-      ((((name x number) (name x number)) ...)
-       (((name x number) (name x number)) ...)) ...)
-   ;; or, generally, there are nested repeats where the pvar_3's are significant.
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         ((((repeat p_3 p_4) p_5 ... -> r_2) eqs_2 ...))
-                         (pvar_1 ...)
-                         (pvar_3 ...) 
-                         natural
-                         bool))
-        (in-hole Context
-                 (letrec ((match-repeat
-                           (λ (z any_binding_temp ... any_bound_temp ...)      
-                             (begin
-                               (when (and (null? any_bound_temp) ...)
-                                 (Build-Let ;reverse
-                                  (let ([pvar_11 any_binding_temp] ...)
-                                    (matrix (z x_2 ...)
-                                            (((p_4 p_5 ... -> r_2) ,@(term (Add-Repeat-Vars (eqs_2 ...) (pvar_11 ...) (any_binding_temp ...)))))
-                                            (((Get-Pvar pvar_22) any_bound_temp) ...)
-                                            (pvar_3 ...) ; fix this
-                                            natural
-                                            bool))
-                                  (any_binding_temp ...)))
-                               (when (and (cons? z) (cons? any_bound_temp) ...)
-                                 (let ((carz (car z))
-                                       (any_car_bound_temp (car any_bound_temp))
-                                       ...)
-                                   (matrix (carz)
-                                           (((p_3 -> (match-repeat 
-                                                      (cdr z)
-                                                      (cons pvar_11 any_binding_temp) ...
-                                                      (cdr any_bound_temp) ...))
-                                             eqs_2 ...))
-                                           (((Get-Pvar pvar_22) any_car_bound_temp) ...)
-                                           (pvar_3 ...)
-                                           ,(+ 1 (term natural))
-                                           bool))
-                                 )))))
-                   (Build-Temp-Let natural
-                                   (any_bound_temp ...) 
-                                   (pvar_22 ...)
-                                   (Build-Let-Empty natural ,(map (λ (x) (term (Get-Pvar ,x))) (term (any_binding_temp ...)))
-                                                    ;,(if (zero? (term natural))
-                                                    (match-repeat x_1 any_binding_temp ... any_bound_temp ...)
-                                                    ;(term (match-repeat x_1 any_binding_temp ... (car any_bound_temp) ...))
-                                                    ;)
-                                                    )
-                                   )
-                   )
-                 )
-        (where (pvar_11 ...) ,(remove-duplicates (map (λ (x) (term (Get-Pvar ,x)))
-                                                      (term 
-                                                       (Get-Free-Name-Patterns
-                                                        p_3 
-                                                        ,(map (λ (x) (term (Get-Pvar ,x))) (append (term (Binding-Eqs (eqs_2 ...))) (term (True-Eqs (eqs_2 ...) ())) )) ())))))
-        (where (pvar_22 ...) ,(begin
-                                ;(printf "~a\n" (remove-duplicates (map (λ (x) (term (Get-Pvar ,x 0))) (append (term (Binding-Eqs (eqs_* ...))) (term (True-Eqs (eqs_* ...) ())))) ))
-                                (remove-duplicates (map (λ (x) (term (Get-Pvar ,x 0))) (append (term (Binding-Eqs (eqs_2 ...))) (term (True-Eqs (eqs_2 ...) ())))) )
-                                ))
-        (fresh match-repeat)
-        (fresh z)
-        (fresh carz)
-        (fresh ((any_binding_temp ...)
-                (pvar_11 ...)))
-        (fresh ((single_binding_temp ...)
-                (pvar_11 ...)))
-        (fresh ((any_bound_temp ...)
-                (pvar_22 ...)))
-        (fresh ((any_car_bound_temp ...)
-                (pvar_22 ...)))
-        (side-condition (not (term (Flushable? 
-                                    (eqs_2 ...)))))
-        Repeat)
-   
-   ; built-in non-terminals
-   (-->
-    (in-hole Context
-             (matrix (x_1 x_2 ...)
-                     (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                      ...
-                      ((s p_5 ... -> r_2) eqs_2 ...)
-                      ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                      ...)
-                     (pvar_2 ...)
-                     (pvar_3 ...)
-                     natural
-                     bool))
-    (in-hole Context
-             (begin 
-               (cond ((Func-Replace (eqv? s x_1))
-                      (matrix (x_2 ...)
-                              (((p_* ... -> r_*) eqs_* ...) ...)
-                              (pvar_2 ...)
-                              (pvar_3 ...)
-                              natural
-                              bool))
-                     (else ∅))
-               (matrix (x_1 x_2 ...)
-                       (((p_** ... -> r_**) eqs_** ...) ...)
-                       (pvar_2 ...)
-                       (pvar_3 ...)
-                       natural
-                       bool)))
-    (where (((p_* ... -> r_*) eqs_* ...) ...) (drop-first-p (same-starting-pattern 
-                                                             s
-                                                             (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                                                              ...
-                                                              ((s p_5 ... -> r_2) eqs_2 ...)
-                                                              ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                                                              ...))))
-    (where (((p_** ... -> r_**) eqs_** ...) ...) (diff-starting-pattern s 
-                                                                        (((cw_1 p_2 ... -> r_1) eqs_1 ...)
-                                                                         ...
-                                                                         ((p_6 p_7 ... -> r_3) eqs_3 ...)
-                                                                         ...)))
-    
-    #;(side-condition (andmap not-a-lit-name? (term (p_6 ...))))
-    (side-condition (not (term (Flushable? 
-                                    (eqs_2 ...)))))
-    built-in-non-terminals)
-   
-   (--> (in-hole Context
-                 (matrix (x_1 x_2 ...)
-                         (((p_1 p_5 ... -> r_2) eqs_2 ...))
-                         (pvar_1 ...)
-                         (pvar_3 ...) 
-                         natural
-                         bool))
-        (in-hole Context
-                 (Flush1 
-                  (eqs_2 ...)
-                  (matrix (x_1 x_2 ...)
-                                 (((p_1 p_5 ... -> r_2) eqs_2 ...))
-                                 (pvar_1 ...)
-                                 (pvar_3 ...) 
-                                 natural
-                                 bool)))
-        (side-condition (term (Flushable? (eqs_2 ...))))
-        flush1)
-   ))
-
-(define not-a-wildcard?
-  (let ([wildcard? (redex-match L wildcard)])
-    (λ (x) (not (wildcard? x)))))
-
-(define not-an-or?
-  (let ([or? (redex-match L (or p_1 p_2))])
-    (λ (x) (not (or? x)))))
-
-(define not-a-lit-name?
-  (let ([lit-name? (redex-match L (lit-name variable p))])
-    (λ (x) (not (lit-name? x)))))
-
-(define not-a-pvar?
-  (let ([pvar? (redex-match L pvar)])
-    (λ (x) (not (pvar? x)))))
-
-(define not-a-rep?
-  (let ([rep? (redex-match L rep)])
-    (λ (x) (not (rep? x)))))
-
-(define not-a-side-condition?
-  (let ([sc? (redex-match L (lit-side-condition p any))])
-    (λ (x) (not (sc? x)))))
-
-(define not-a-cp?
-  (let ([cp? (redex-match L cp)])
-    (λ (x) (not (cp? x)))))
-
-(define not-a-nt?
-  (let ([nt? (redex-match L (nt id))])
-    (λ (x) (not (nt? x)))))
-
-(define not-a-lit-hole?
-  (let ([lit-hole? (redex-match L lit-hole)])
-    (λ (x) (not (lit-hole? x)))))
-
-(define not-a-s?
-  (let ([s? (redex-match L s)])
-    (λ (x) (not (s? x)))))
-
-(define not-an-id?
-  (let ([id? (redex-match L id)])
-    (λ (x) (not (id? x)))))
-
-(define not-an-in-hole?
-  (let ([in-hole? (redex-match L (lit-in-hole p_1 p_2))])
-    (λ (x) (not (in-hole? x)))))
-
-(define is-a-wc?
-  (let ([wc? (redex-match L wildcard)])
-    (λ (x) (not (not (wc? x))))))
-
-(define natural?
-  (λ (x) (and 
-          (exact-integer? x) 
-          (not (negative? x)))))
-
-(define-metafunction L
-  ((Get-Pvar id) id)
-  ((Get-Pvar (pvar elip)) (Get-Pvar pvar))
-  ((Get-Pvar pvar 0)
-   pvar)
-  ((Get-Pvar (pvar elip) natural)
-   (Get-Pvar pvar ,(- (term natural) 1)))
-  ((Get-Pvar id natural)
-   id)
-  )
-
-(define-metafunction L
-  [(Add-Repeat-Vars ((pvar bool eq ...) eqs_2 ...) (pvar_1 ... pvar_3 pvar_2 ...))
-   (Add-Repeat-Vars (eqs_2 ... (pvar bool ,@(remove-duplicates (term (pvar_3 eq ...))))) (pvar_1 ... pvar_2 ...))
-   (side-condition (equal? (term pvar_3) (term (Get-Pvar pvar))))
-   ]
-  [(Add-Repeat-Vars (eqs_1 ... (pvar bool eq ...) eqs_2 ...) (pvar_3 pvar_1 ...))
-   (Add-Repeat-Vars (eqs_1 ... eqs_2 ... (pvar bool ,@(remove-duplicates (term (pvar_3 eq ...))))) (pvar_1 ...))
-   (side-condition (equal? (term pvar_3) (term (Get-Pvar pvar))))
-   ]
-  [(Add-Repeat-Vars (eqs ...) (pvar_1 ...))
-   (eqs ...)]
-  [(Add-Repeat-Vars ((pvar bool eq ...) eqs_2 ...) (pvar_1 ... pvar_3 pvar_2 ...) (pvar_11 ... pvar_33 pvar_22 ...))
-   (Add-Repeat-Vars (eqs_2 ... (pvar bool ,@(remove-duplicates (term (pvar_33 eq ...))))) (pvar_1 ... pvar_2 ...) (pvar_11 ... pvar_22 ...))
-   (side-condition (equal? (term pvar_3) (term (Get-Pvar pvar))))
-   (side-condition (and (equal? (length (term (pvar_1 ...))) (length (term (pvar_11 ...))))
-                        (equal? (length (term (pvar_2 ...))) (length (term (pvar_22 ...))))))
-   ]
-  [(Add-Repeat-Vars (eqs_1 ... (pvar bool eq ...) eqs_2 ...) (pvar_3 pvar_1 ...) (pvar_33 pvar_11 ...))
-   (Add-Repeat-Vars (eqs_1 ... eqs_2 ... (pvar bool ,@(remove-duplicates (term (pvar_33 eq ...))))) (pvar_1 ...) (pvar_11 ...))
-   (side-condition (equal? (term pvar_3) (term (Get-Pvar pvar))))
-   ]
-  [(Add-Repeat-Vars (eqs ...) (pvar_1 ...) (pvar_11 ...))
-   (eqs ...)])
-
-(define-metafunction L
-  [(True-Eqs ((pvar #t eq ...) eqs_2 ...) (pvar_1 ...))
-   (True-Eqs (eqs_2 ...) (pvar pvar_1 ...))]
-  [(True-Eqs ((pvar #f eq ...) eqs_2 ...) (pvar_1 ...))
-   (True-Eqs (eqs_2 ...) (pvar_1 ...))]
-  [(True-Eqs () (pvar_1 ...))
-   (pvar_1 ...)]
-  )
-
-(define-metafunction L
-  [(Binding-Eqs ((pvar bool eq ... id eq ...) eqs_2 ...))
-   (pvar pvar_* ...)
-   (where (pvar_* ...) (Binding-Eqs (eqs_2 ...)))]
-  [(Binding-Eqs ((pvar bool eq ...) eqs_2 ...))
-   (pvar_* ...)
-   (where (pvar_* ...) (Binding-Eqs (eqs_2 ...)))]
-  [(Binding-Eqs (eqs ...))
-   ()])
-
-(define-metafunction L
-  [(Minimize-Names (pvar pvar_2 ... pvar_3 pvar_4 ...))
-   (pvar_* ...)
-   (where (pvar_* ...) (Minimize-Names (pvar pvar_2 ... pvar_4 ...)))
-   (side-condition (and (equal? (term (Get-Pvar pvar)) (term (Get-Pvar pvar_3))) (<= (term (Depth pvar)) (term (Depth pvar_3)) )))
-   (side-condition (andmap (λ (x) (not (equal? (term (Get-Pvar pvar)) (term (Get-Pvar ,x))))) (term (pvar_2 ...))))]
-  [(Minimize-Names (pvar pvar_2 ... pvar_3 pvar_4 ...))
-   (pvar_* ...)
-   (where (pvar_* ...) (Minimize-Names (pvar_3 pvar_2 ... pvar_4 ...)))
-   (side-condition (and (equal? (term (Get-Pvar pvar)) (term (Get-Pvar pvar_3))) (> (term (Depth pvar)) (term (Depth pvar_3)) )))
-   (side-condition (andmap (λ (x) (not (equal? (term (Get-Pvar pvar)) (term (Get-Pvar ,x))))) (term (pvar_2 ...))))]
-  [(Minimize-Names (pvar pvar_2 ...))
-   (pvar pvar_* ...)
-   (where (pvar_* ...) (Minimize-Names (pvar_2 ...)))
-   ]
-  [(Minimize-Names ())
-   ()]
-  )
-
-(define-metafunction L
-  [(Depth (pvar elip))
-   ,(+ 1 (term (Depth pvar)))]
-  [(Depth pvar)
-   0]
-  )
-
-(define-metafunction L 
-  [(Get-Free-Name-Patterns (lit-in-hole p_1 p_2) (pvar_1 ...) (pvar_2 ...)) 
-   (Minimize-Names ,(append (term (Get-Free-Name-Patterns p_1 (pvar_1 ...) ())) 
-                            (append (term (Get-Free-Name-Patterns p_2 (pvar_1 ...) ()))
-                                    (term (pvar_2 ...)))))]
-  [(Get-Free-Name-Patterns (lit-hide-hole p_1) (pvar_1 ...) (pvar_2 ...))
-   (Minimize-Names ,(append (term (Get-Free-Name-Patterns p_1 (pvar_1 ...) ())) (term (pvar_2 ...))))]
-  [(Get-Free-Name-Patterns (or p_1 p_2) (pvar_1 ...) (pvar_2 ...)) 
-   (Minimize-Names ,(append (term (Get-Free-Name-Patterns p_1 (pvar_1 ...) ())) 
-                            (append (term (Get-Free-Name-Patterns p_2 (pvar_1 ...) ()))
-                                    (term (pvar_2 ...)))))]
-  [(Get-Free-Name-Patterns (cons p_1 p_2) (pvar_1 ...) (pvar_2 ...)) 
-   (Minimize-Names ,(append (term (Get-Free-Name-Patterns p_1 (pvar_1 ...) ())) 
-                            (append (term (Get-Free-Name-Patterns p_2 (pvar_1 ...) ()))
-                                    (term (pvar_2 ...)))))]
-  [(Get-Free-Name-Patterns (lit-name id p) (pvar_1 ...) (pvar_2 ...))
-   (Minimize-Names ,(append (term (Get-Free-Name-Patterns p (pvar_1 ...) ())) (append (list (term id)) (term (pvar_2 ...)))))
-   (side-condition (andmap (λ (x) (not (eqv? (term id) x))) (term (pvar_1 ...))))]
-  [(Get-Free-Name-Patterns (repeat p_1 p_2) (pvar_1 ...) (pvar_2 ...))
-   (Minimize-Names ,(append (map (λ (x) `(,x ...)) (remove-duplicates (term (Get-Free-Name-Patterns p_1 (pvar_1 ...) ()))))
-                            (append (term (Get-Free-Name-Patterns p_2 (pvar_1 ...) ()))
-                                    (term (pvar_2 ...)))))]
-  [(Get-Free-Name-Patterns (lit-side-condition p_1 any) (pvar_1 ...) (pvar_2 ...))
-   (Minimize-Names ,(append (term (Get-Free-Name-Patterns p_1 (pvar_1 ...) ())) (term (pvar_2 ...))))]
-  [(Get-Free-Name-Patterns any (pvar_1 ...) (pvar_2 ...)) ()])
-
-(define-metafunction L 
-  ((Build-Let-Empty natural () any)
-   any)
-  [(Build-Let-Empty natural (pvar_1 ...) any)
-   (let ((pvar_1 '())
-         ...)
-     any)])
-
-(define-metafunction L
-  [(Build-Let any ())
-   any]
-  [(Build-Let any (pvar_1 ...))
-   (let ((pvar_1 (rev pvar_1))
-         ...)
-     any)])
-
-(define-metafunction L
-  ((Build-Temp-Let 0 () () any)
-   any)
-  [(Build-Temp-Let 0 (pvar_1 ...) (any_2 ...) any)
-   (let ((pvar_1 (term any_2))
-         ...)
-     any)]
-  ((Build-Temp-Let natural any_1 any_2 any_3)
-   any_3)
-  ((Build-Temp-Let () () any)
-   any)
-  [(Build-Temp-Let (pvar_1 ...) (any_2 ...) any)
-   (let ((pvar_1 any_2)
-         ...)
-     any)])
-
-(define-metafunction L 
-  [(Build-Temp-Cons (pvar_1 ...) (pvar_2 ...))
-   ((cons pvar_1 pvar_2) ...)])
-
-(define-metafunction L 
-  [(Build-Cdr (pvar_1 ...))
-   ((cdr pvar_1) ...)])
-
-; first pass hole detection assumes non-terminals contain no holes
-(define-metafunction L
-  ((detect-hole natural lit-hole)
-   ,(+ 1 (term natural)))
-  ((detect-hole natural (nt id))
-   0)
-  ((detect-hole natural (lit-in-hole p_1 p_2))
-   ,(+ (term natural) (term (detect-hole 0 p_2))))
-  ((detect-hole natural (lit-hide-hole p_1))
-   natural)
-  ((detect-hole natural (or p_1 p_2))
-   ,(+ (max (term (detect-hole 0 p_1)) (term (detect-hole 0 p_2))) (term natural)))
-  ((detect-hole natural (cons p_1 p_2))
-   ,(+ (+ (term (detect-hole 0 p_1)) (term (detect-hole 0 p_2))) (term natural)))
-  ((detect-hole natural (repeat p_1 p_2))
-   ,(+ (term (detect-hole 0 p_2)) (term natural)))
-  ((detect-hole natural (lit-name pvar p))
-   ,(+ (term (detect-hole 0 p)) (term natural)))
-  ((detect-hole natural any)
-   natural))
-
-; detect holes using a table with a hole count for each non-terminal
-(define-metafunction L
-  ((detect-hole2 natural lit-hole)
-   ,(+ 1 (term natural)))
-  ((detect-hole2 natural (nt id))
-   ,(hash-ref hole-table (term id)))
-  ((detect-hole2 natural (lit-in-hole p_1 p_2))
-   ,(+ (term natural) (term (detect-hole2 0 p_2))))
-  ((detect-hole2 natural (lit-hide-hole p_1))
-   natural)
-  ((detect-hole2 natural (or p_1 p_2))
-   ,(+ (max (term (detect-hole2 0 p_1)) (term (detect-hole2 0 p_2))) (term natural)))
-  ((detect-hole2 natural (cons p_1 p_2))
-   ,(+ (+ (term (detect-hole2 0 p_1)) (term (detect-hole2 0 p_2))) (term natural)))
-  ((detect-hole2 natural (repeat p_1 p_2))
-   ,(+ (term (detect-hole2 0 p_2)) (term natural)))
-  ((detect-hole2 natural (lit-name pvar p))
-   ,(+ (term (detect-hole2 0 p)) (term natural)))
-  ((detect-hole2 natural any)
-   natural)
-  )
-
-; op is either lit-in-hole or lit-hide-hole
-; replace is either p_2 from (lit-in-hole p_1 p_2) or 'lit-hole
-; pattern is either p_1 from (lit-in-hole p_1 p_2) or p from (lit-hide-hole p)
-(define-metafunction L
-  ((move-hole-op-inward lit-in-hole replace lit-hole)
-   replace)
-  ((move-hole-op-inward lit-hide-hole replace lit-hole)
-   (lit-hide-hole lit-hole))
-  ((move-hole-op-inward lit-in-hole replace (nt id))
-   (lit-in-hole (nt id) replace)
-   (side-condition (eqv? 1 (term (detect-hole2 0 (nt id))))))
-  ((move-hole-op-inward lit-hide-hole replace (nt id))
-   (nt id)
-   (side-condition (eqv? 0 (term (detect-hole2 0 (nt id))))))
-  ((move-hole-op-inward lit-hide-hole replace (nt id))
-   (lit-hide-hole (nt id)))
-  ((move-hole-op-inward lit-hide-hole replace (lit-in-hole p_1 p_2))
-   (lit-in-hole p_1 p_2))
-  ; context inside of context
-  ((move-hole-op-inward lit-in-hole replace (lit-in-hole p_1 p_2))
-   (lit-in-hole p_1 (lit-in-hole p_2 replace))
-   (side-condition (eqv? 1 (term (detect-hole2 0 p_2)))))
-  ((move-hole-op-inward op replace (lit-hide-hole p))
-   (lit-hide-hole p))
-  ((move-hole-op-inward lit-in-hole replace (lit-name pvar p))
-   (lit-in-hole (lit-name pvar p) replace)
-   (side-condition (eqv? 1 (term (detect-hole2 0 (lit-name pvar p))))))
-  ((move-hole-op-inward lit-in-hole replace (lit-name pvar p))
-   (lit-name pvar p)
-   (side-condition (eqv? 0 (term (detect-hole2 0 (lit-name pvar p))))))
-  ((move-hole-op-inward lit-hide-hole replace (lit-name pvar p))
-   (lit-name pvar (lit-hide-hole p)))
-  ((move-hole-op-inward op replace (or p_1 p_2))
-   (or (move-hole-op-inward op replace p_1) (move-hole-op-inward op replace p_2)))
-  ((move-hole-op-inward op replace (cons p_1 p_2))
-   (cons (move-hole-op-inward op replace p_1) (move-hole-op-inward op replace p_2)))
-  ((move-hole-op-inward op replace (repeat p_1 p_2))
-   (repeat p_1 (move-hole-op-inward op replace p_2))
-   (side-condition (eqv? 1 (term (detect-hole2 0 p_2)))))
-  ((move-hole-op-inward op replace any)
-   any)
-  )
-
-(define-metafunction L
-  ((push-name-downward (lit-name pvar (cons p_1 p_2)) (eqs_1 ... (pvar bool eq_1 ...) eqs_2 ...) pvar_fresh1 pvar_fresh2)
-   ((cons (lit-name pvar_fresh1 p_1) (lit-name pvar_fresh2 p_2)) (eqs_1 ... (pvar bool (cons pvar_fresh1 pvar_fresh2) eq_1 ...) (pvar_fresh1 #f) (pvar_fresh2 #f) eqs_2 ...)))
-  ((push-name-downward (lit-name pvar lit-hole) (eqs_1 ... (pvar bool eq_1 ...) eqs_2 ...) pvar_fresh1 pvar_fresh2)
-   (lit-hole (eqs_1 ... (pvar bool lit-hole eq_1 ...) eqs_2 ...)))
-  ((push-name-downward (lit-name pvar (lit-name pvar_2 p_1)) (eqs_1 ... (pvar bool eq_1 ...) eqs_2 ...) pvar_fresh1 pvar_fresh2)
-   ((lit-name pvar_2 p_1) (eqs_1 ... (pvar bool (= pvar_2) eq_1 ...) eqs_2 ...)))
-  ((push-name-downward (lit-name pvar (lit-in-hole p_1 p_2)) (eqs_1 ... (pvar bool eq_1 ...) eqs_2 ...) pvar_fresh1 pvar_fresh2)
-   ((lit-in-hole (lit-name pvar_fresh1 p_1) (lit-name pvar_fresh2 p_2)) (eqs_1 ... (pvar bool (plug pvar_fresh1 pvar_fresh2) eq_1 ...) (pvar_fresh1 #f) (pvar_fresh2 #f) eqs_2 ...)))
-  ((push-name-downward (lit-name pvar (repeat p_1 p_2))  (eqs_1 ... (pvar bool eq_1 ...) eqs_2 ...) pvar_fresh1 pvar_fresh2)
-   ((repeat (lit-name pvar_fresh1 p_1) (lit-name pvar_fresh2 p_2)) (eqs_1 ... (pvar bool (cons pvar_fresh1 pvar_fresh2) eq_1 ...) (pvar_fresh1 #f) (pvar_fresh2 #f) eqs_2 ...)))
-  ((push-name-downward any_1 any_2 any_3 any_4)
-   (any_1 any_2))
-  )
-
-; Replace (eqv? c x) with (another-function x) where appropriate.
-(define-metafunction L
-  [(Func-Replace (eqv? lit-number x)) (number? x)]
-  [(Func-Replace (eqv? lit-natural x)) (natural? x)]
-  [(Func-Replace (eqv? lit-integer x)) (exact-integer? x)]
-  [(Func-Replace (eqv? lit-real x)) (real? x)]
-  [(Func-Replace (eqv? lit-string x)) (string? x)]
-  [(Func-Replace (eqv? lit-variable x)) (symbol? x)]
-  [(Func-Replace (eqv? (lit-variable-except variable ...) x)) (and (symbol? x) (andmap (λ (y) (not (equal? y x))) (quote (variable ...))))]
-  [(Func-Replace (eqv? (lit-variable-prefix variable) x)) (variable-prefix? 'variable x)]
-  [(Func-Replace (eqv? string x)) (equal? string x)]
-  [(Func-Replace (eqv? any x)) (eqv? any x)]
-  )
-
-(define-metafunction L
-  [(simplify (cp_1 p_2 ...))
-   ((cons '() '()) p_* ...)
-   (where (p_* ...) (simplify (p_2 ...)))]
-  [(simplify (wc p_2 ...))
-   (p_* ...)
-   (where (p_* ...) (simplify (p_2 ...)))]
-  [(simplify (p_1 p_2 ...))
-   (p_1 p_* ...)
-   (where (p_* ...) (simplify (p_2 ...)))]
-  [(simplify ())
-   ()]
-  )
-
-; Remove wc and all but one cp from the list of cw
-(define-metafunction L
-  Cond-List : (cw ...) -> (cw ...)
-  [(Cond-List ()) ()]
-  [(Cond-List (cw_1 ... cw_2 cw_3 ... cw_2 cw_4 ...)) 
-   (cw_* ...)
-   (where (cw_* ...) (Cond-List (cw_1 ... cw_2 cw_3 ... cw_4 ...)))]
-  [(Cond-List (c_1 ... wc c_2 ...))
-   (cw_* ...)
-   (where (cw_* ...) (Cond-List (c_1 ... c_2 ...)))]
-  [(Cond-List (cw_1 ... cp_1 cw_2 ... cp_2 cw_3 ...))
-   (cw_* ...)
-   (where (cw_* ...) (Cond-List (cp_1 cw_1 ... cw_2 ... cw_3 ...)))
-   (side-condition (andmap not-a-cp? (term (cw_1 ...))))
-   (side-condition (andmap not-a-cp? (term (cw_2 ...))))]
-  [(Cond-List (cw_1 cw_2 ... cp_1 cw_3 ...))
-   (cw_* ...)
-   (where (cw_* ...) (Cond-List (cp_1 cw_1 cw_2 ... cw_3 ...)))]
-  [(Cond-List (cw ...)) (cw ...)])
-
-; Build a cond expression given constructors and a matrix
-(define-metafunction L
-  Build-Cond : ((cw ...) m x x) -> e
-  [(Build-Cond ((cp_1 cw_1 ...) 
-                (matrix (x_1 x_2 ...)
-                        (((cw_2 p_2 ... -> r_1) eqs_1 ...)
-                         ...
-                         ((c_1 p_3 ... -> r_2) eqs_2 ...)
-                         ((cw_3 p_4 ... -> r_3) eqs_3 ...)
-                         ...)
-                        (pvar_1 ...)
-                        (pvar_3 ...)
-                        natural
-                        bool)
-                x_3
-                x_4))
-   (begin (cond
-            [(cons? x_1)
-             (let ((x_3 (car x_1))
-                   (x_4 (cdr x_1)))
-               (matrix (x_4 x_3 x_2 ...)
-                       (SL (((cw_2 p_2 ... -> r_1) eqs_1 ...)
-                            ...
-                            ((c_1 p_3 ... -> r_2) eqs_2 ...)
-                            ((cw_3 p_4 ... -> r_3) eqs_3 ...)
-                            ...))
-                       (pvar_1 ...)
-                       (pvar_3 ...)
-                       natural
-                       bool)
-               )
-             ]
-            [(Func-Replace (eqv? cw_1 x_1))
-             (matrix (x_2 ...)
-                     (S cw_1 (((cw_2 p_2 ... -> r_1) eqs_1 ...)
-                              ...
-                              ((c_1 p_3 ... -> r_2) eqs_2 ...)
-                              ((cw_3 p_4 ... -> r_3) eqs_3 ...)
-                              ...))
-                     (pvar_1 ...)
-                     (pvar_3 ...)
-                     natural
-                     bool)
-             ]
-            ...
-            #;(else ∅)
-            )
-          (matrix (x_2 ...)
-                  (D (((cw_2 p_2 ... -> r_1) eqs_1 ...)
-                      ...
-                      ((c_1 p_3 ... -> r_2) eqs_2 ...)
-                      ((cw_3 p_4 ... -> r_3) eqs_3 ...)
-                      ...))
-                  (pvar_1 ...)
-                  (pvar_3 ...)
-                  natural
-                  bool)
-          )
-   ]
-  [(Build-Cond ((cw_1 ...) 
-                (matrix (x_1 x_2 ...)
-                        (((cw_2 p_2 ... -> r_1) eqs_1 ...)
-                         ...
-                         ((c_1 p_3 ... -> r_2) eqs_2 ...)
-                         ((cw_3 p_4 ... -> r_3) eqs_3 ...)
-                         ...)
-                        (pvar_1 ...)
-                        (pvar_3 ...)
-                        natural
-                        bool)
-                x_3
-                x_4))
-   (begin (cond 
-            [(Func-Replace (eqv? cw_1 x_1))
-             (matrix (x_2 ...)
-                     (S cw_1 (((cw_2 p_2 ... -> r_1) eqs_1 ...)
-                              ...
-                              ((c_1 p_3 ... -> r_2) eqs_2 ...)
-                              ((cw_3 p_4 ... -> r_3) eqs_3 ...)
-                              ...))
-                     (pvar_1 ...)
-                     (pvar_3 ...)
-                     natural
-                     bool)
-             ]
-            ...
-            #;(else ∅)
-            )
-          (matrix (x_2 ...)
-                  (D (((cw_2 p_2 ... -> r_1) eqs_1 ...)
-                      ...
-                      ((c_1 p_3 ... -> r_2) eqs_2 ...)
-                      ((cw_3 p_4 ... -> r_3) eqs_3 ...)
-                      ...))
-                  (pvar_1 ...)
-                  (pvar_3 ...)
-                  natural
-                  bool)
-          )
-   ]
-  )
-
-; S metafunction from the paper, applied to cons patterns
-(define-metafunction L
-  SL : (row ...) -> (row ...)
-  [(SL ()) ()]
-  [(SL ((((cons p_1 p_2) p_3 ... -> r_1) eqs_1 ...) ((p ... -> r) eqs_2 ...) ...))
-   (((p_2 p_1 p_3 ... -> r_1) eqs_1 ...)
-    ((p_* ... -> r_*) eqs_* ...)
-    ...)
-   (where (((p_* ... -> r_*) eqs_* ...) ...)
-          (SL (((p ... -> r) eqs_2 ...) ...)))]
-  [(SL (((wc p_2 ... -> r_1) eqs_1 ...) ((p ... -> r) eqs_2 ...) ...))
-   (;(wc wc p_2 ... -> r_1)
-    ((p_* ... -> r_*) eqs_* ...)
-    ...)
-   (where (((p_* ... -> r_*) eqs_* ...) ...)
-          (SL (((p ... -> r) eqs_2 ...) ...)))]
-  [(SL (((p_1 ... -> r_1) eqs_1 ...) ((p ... -> r) eqs_2 ...) ...))
-   (((p_* ... -> r_*) eqs_* ...)
-    ...)
-   (where (((p_* ... -> r_*) eqs_* ...) ...)
-          (SL (((p ... -> r) eqs_2 ...) ...)))])
-
-; S metafunction from the paper
-(define-metafunction L
-  S : cw (row ...) -> (row ...)
-  [(S cw ()) ()]
-  [(S wc (((p ... -> r) eqs_1 ...) ...)) ()]
-  [(S c_1 (((c_1 p_2 ... -> r_1) eqs_1 ...) ((p ... -> r) eqs_2 ...) ...))
-   (((p_2 ... -> r_1) eqs_1 ...)
-    ((p_* ... -> r_*) eqs_* ...)
-    ...)
-   (where (((p_* ... -> r_*) eqs_* ...) ...)
-          (S c_1 (((p ... -> r) eqs_2 ...) ...)))]
-  [(S cw (((p_1 p_2 ... -> r_1) eqs_1 ...) ((p ... -> r) eqs_2 ...) ...))
-   (((p_* ... -> r_*) eqs_* ...)
-    ...)
-   (where (((p_* ... -> r_*) eqs_* ...) ...)
-          (S cw (((p ... -> r) eqs_2 ...) ...)))]
-  [(S cw (((p_1 ... -> r_1) eqs_1 ...) ((p ... -> r) eqs_2 ...) ...))
-   (((p_* ... -> r_*) eqs_* ...)
-    ...)
-   (where (((p_* ... -> r_*) eqs_* ...) ...)
-          (S cw (((p ... -> r) eqs_2 ...) ...)))])
-
-; D metafunction from the paper
-(define-metafunction L
-  D : (row ...) -> (row ...)
-  [(D ()) ()]
-  [(D (((wc p_2 ... -> r_1) eqs_1 ...) ((p ... -> r) eqs_2 ...) ...))
-   (((p_2 ... -> r_1) eqs_1 ...)
-    ((p_* ... -> r_*) eqs_* ...)
-    ...)
-   (where (((p_* ... -> r_*) eqs_* ...) ...)
-          (D (((p ... -> r) eqs_2 ...) ...)))]
-  [(D (((p_1 p_2 ... -> r_1) eqs_1 ...) ((p ... -> r) eqs_2 ...) ...))
-   (((p_* ... -> r_*) eqs_* ...)
-    ...)
-   (where (((p_* ... -> r_*) eqs_* ...) ...)
-          (D (((p ... -> r) eqs_2 ...) ...)))])
-
-(define-metafunction L
-  drop-first-p : (row ...) -> (row ...)
-  ((drop-first-p (((p_1 p_2 ... -> r) eqs_1 ...) ...))
-   (((p_2 ... -> r) eqs_1 ...) ...))
-  )
-
-
-(define-metafunction L
-  replace-first-p : p (row ...) -> (row ...)
-  ((replace-first-p p_1 (((p_2 p_3 ... -> r) eqs_1 ...) ...))
-   (((p_1 p_3 ... -> r) eqs_1 ...) ...))
-  )
-
-(define-metafunction L
-  same-starting-pattern : p (row ...) -> (row ...)
-  ((same-starting-pattern p_1 (((p_1 p_3 ... -> r) eqs_1 ...) row ...))
-   (((p_1 p_3 ... -> r) eqs_1 ...) row_* ...) 
-   (where (row_* ...)
-          (same-starting-pattern p_1 (row ...))))
-  ((same-starting-pattern (name p_1 p_!_1) (((p_!_1 p_3 ... -> r) eqs_1 ...) row ...))
-   (row_* ...)
-   (where (row_* ...)
-          (same-starting-pattern p_1 (row ...))))
-  ((same-starting-pattern p_1 ()) ())
-  )
-
-(define-metafunction L
-  diff-starting-pattern : p (row ...) -> (row ...)
-  ((diff-starting-pattern p_1 (((p_1 p_3 ... -> r) eqs_1 ...) row ...))
-   (diff-starting-pattern p_1 (row ...)))
-  ((diff-starting-pattern (name p_1 p_!_1) ((((name p_2 p_!_1) p_3 ... -> r) eqs_1 ...) row ...))
-   (((p_2 p_3 ... -> r) eqs_1 ...) row_* ...) 
-   (where (row_* ...)
-          (diff-starting-pattern p_1 (row ...))))
-  ((diff-starting-pattern p_1 ()) ())
-  )
-
-(define-metafunction L
-  ((Get-Temp-Name pvar_1 ((pvar_1 pvar_2) pvar_3 ...))
-   pvar_2)
-  ((Get-Temp-Name pvar_1 ((pvar_1 pvar_2) pvar_3 ...))
-   (Get-Temp-Name pvar (pvar_3 ...))
-   (side-condition (not (equal? (term pvar) (term pvar_1)))))
-  ((Get-Temp-Name pvar_1 (pvar_3 ...))
-   ())
-  )
-
-; use eqs ... () eqs ... (where lookup)
-(define-metafunction L
-  ((Flushable? ((pvar bool eq_1 ... lit-hole eq_2 ...) eqs_2 ...))
-   #t)
-  ((Flushable? ((pvar bool eq_1 ... id eq_2 ...) eqs_2 ...))
-   #t)
-  ((Flushable? ((pvar bool eq ... (= pvar_3) eq_2 ...) eqs_2 ... (pvar_3 #t eq_3 ...) eqs_3 ...))
-   #t)
-  ((Flushable? ((pvar bool eq ... (cons pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_1 #t eq_1 ...) eqs_3 ... (pvar_3 #t eq_4 ...) eqs_4 ...))
-   #t)
-  ((Flushable? ((pvar bool eq ... (plug pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_1 #t eq_1 ...) eqs_3 ... (pvar_3 #t eq_4 ...) eqs_4 ...))
-   #t)
-  ((Flushable? ((pvar bool eq ... (cons pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_3 #t eq_1 ...) eqs_3 ... (pvar_1 #t eq_4 ...) eqs_4 ...))
-   #t)
-  ((Flushable? ((pvar bool eq ... (plug pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_3 #t eq_1 ...) eqs_3 ... (pvar_1 #t eq_4 ...) eqs_4 ...))
-   #t)
-  ((Flushable? (eqs_1 eqs_2 ...))
-   (Flushable? (eqs_2 ...)))
-  )
-
-; takes matrix plus list to iterate on -> expression, or no
-(define-metafunction L
-  ((Flush1 ((pvar #f eq_1 ... lit-hole eq_2 ...) eqs_2 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (term-let ((pvar the-hole))
-             (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar #t eq_1 ... eq_2 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (side-condition (andmap not-a-lit-hole? (term (eq_1 ...)))))
-  
-  ((Flush1 ((pvar #t eq_1 ... lit-hole eq_2 ...) eqs_2 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (if (equal? (term pvar) the-hole)
-       (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar #t eq_1 ... eq_2 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0)
-       ∅)
-   (side-condition (andmap not-a-lit-hole? (term (eq_1 ...)))))
-  
-  ((Flush1 ((pvar #f eq_1 ... id eq_2 ...) eqs_2 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (term-let ((pvar id))
-             (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar #t eq_1 ... eq_2 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (side-condition (andmap not-an-id? (term (eq_1 ...)))))
-  
-  ((Flush1 ((pvar #t eq_1 ... id eq_2 ...) eqs_2 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (if (equal? (term pvar) id)
-       (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar #t eq_1 ... eq_2 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0)
-       ∅)
-   (side-condition (andmap not-an-id? (term (eq_1 ...)))))
-  
-  ((Flush1 ((pvar #f eq ... (= pvar_3) eq_2 ...) eqs_2 ... (pvar_3 #t eq_3 ...) eqs_3 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (term-let ((pvar (term pvar_3)))
-             (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar_3 #t eq_3 ...) eqs_3 ... (pvar #t eq ... eq_2 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (side-condition (andmap (λ (x) (not (redex-match L (= pvar_11) x))) (term (eq ...)))))
-  
-  ((Flush1 ((pvar #t eq ... (= pvar_3) eq_2 ...) eqs_2 ... (pvar_3 #t eq_3 ...) eqs_3 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (if (equal? (term pvar) (term pvar_3))
-       (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar_3 #t eq_3 ...) eqs_3 ... (pvar #t eq ... eq_2 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0)
-       ∅)
-   (side-condition (andmap (λ (x) (not (redex-match L (= pvar_11) x))) (term (eq ...)))))
-  
-  ((Flush1 ((pvar #t eq ... (cons pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_1 #t eq_1 ...) eqs_3 ... (pvar_3 #t eq_4 ...) eqs_4 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (if (and (cons? (term pvar))
-            (equal? (car (term pvar)) (term pvar_1)) 
-            (equal? (cdr (term pvar)) (term pvar_3)))
-       (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar_1 #t eq_1 ...) eqs_3 ... (pvar_3 #t eq_4 ...) eqs_4 ... (pvar #t eq ... eq_3 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0)
-       ∅)
-   (side-condition (and (term pvar)
-                        (term pvar_1)
-                        (term pvar_3)
-                        (andmap (λ (x) (not (redex-match L (cons pvar_11 pvar_12) x))) (term (eq ...))))))
-  
-  ((Flush1 ((pvar #f eq ... (cons pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_1 #t eq_1 ...) eqs_3 ... (pvar_3 #t eq_4 ...) eqs_4 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (term-let ((pvar (cons (term pvar_1) (term pvar_3))))
-             (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar_1 #t eq_1 ...) eqs_3 ... (pvar_3 #t eq_4 ...) eqs_4 ... (pvar #t eq ... eq_3 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (side-condition (andmap (λ (x) (not (redex-match L (cons pvar_11 pvar_12) x))) (term (eq ...)))))
-  
-  ((Flush1 ((pvar #t eq ... (plug pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_1 #t eq_1 ...) eqs_3 ... (pvar_3 #t eq_4 ...) eqs_4 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (if (equal? (term pvar) (plug (term pvar_1) (term pvar_3)))
-       (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar_1 #t eq_1 ...) eqs_3 ... (pvar_3 #t eq_4 ...) eqs_4 ... (pvar #t eq ... eq_3 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0)
-       ∅)
-   (side-condition (andmap (λ (x) (not (redex-match L (plug pvar_11 pvar_12) x))) (term (eq ...)))))
-  
-  ((Flush1 ((pvar #f eq ... (plug pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_1 #t eq_1 ...) eqs_3 ... (pvar_3 #t eq_4 ...) eqs_4 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (term-let ((pvar (plug (term pvar_1) (term pvar_3))))
-             (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar_1 #t eq_1 ...) eqs_3 ... (pvar_3 #t eq_4 ...) eqs_4 ... (pvar #t eq ... eq_3 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (side-condition (andmap (λ (x) (not (redex-match L (plug pvar_11 pvar_12) x))) (term (eq ...)))))
-  
-  ((Flush1 ((pvar #t eq ... (cons pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_3 #t eq_1 ...) eqs_3 ... (pvar_1 #t eq_4 ...) eqs_4 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (if (and (cons? (term pvar))
-            (equal? (car (term pvar)) (term pvar_1)) 
-            (equal? (cdr (term pvar)) (term pvar_3)))
-       (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar_3 #t eq_1 ...) eqs_3 ... (pvar_1 #t eq_4 ...) eqs_4 ... (pvar #t eq ... eq_3 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0)
-       ∅)
-   (side-condition (and (term pvar)
-                        (term pvar_1)
-                        (term pvar_3)
-                        (andmap (λ (x) (not (redex-match L (cons pvar_11 pvar_12) x))) (term (eq ...))))))
-  
-  ((Flush1 ((pvar #f eq ... (cons pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_3 #t eq_1 ...) eqs_3 ... (pvar_1 #t eq_4 ...) eqs_4 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (term-let ((pvar (cons (term pvar_1) (term pvar_3))))
-             (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar_3 #t eq_1 ...) eqs_3 ... (pvar_1 #t eq_4 ...) eqs_4 ... (pvar #t eq ... eq_3 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (side-condition (andmap (λ (x) (not (redex-match L (cons pvar_11 pvar_12) x))) (term (eq ...)))))
-  
-  ((Flush1 ((pvar #t eq ... (plug pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_3 #t eq_1 ...) eqs_3 ... (pvar_1 #t eq_4 ...) eqs_4 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (if (equal? (term pvar) (plug (term pvar_1) (term pvar_3)))
-       (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar_3 #t eq_1 ...) eqs_3 ... (pvar_1 #t eq_4 ...) eqs_4 ... (pvar #t eq ... eq_3 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0)
-       ∅)
-   (side-condition (andmap (λ (x) (not (redex-match L (plug pvar_11 pvar_12) x))) (term (eq ...)))))
-  
-  ((Flush1 ((pvar #f eq ... (plug pvar_1 pvar_3) eq_3 ...) eqs_2 ... (pvar_3 #t eq_1 ...) eqs_3 ... (pvar_1 #t eq_4 ...) eqs_4 ...) 
-           (matrix (x_11 ...) (((p_11 ... -> r) eqs_22 ...)) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (term-let ((pvar (plug (term pvar_1) (term pvar_3))))
-             (matrix (x_11 ...) (((p_11 ... -> r) eqs_2 ... (pvar_3 #t eq_1 ...) eqs_3 ... (pvar_1 #t eq_4 ...) eqs_4 ... (pvar #t eq ... eq_3 ...))) (pvar_11 ...) (pvar_22 ...) natural bool_0))
-   (side-condition (andmap (λ (x) (not (redex-match L (plug pvar_11 pvar_12) x))) (term (eq ...)))))
-  )
-
-
-(define-namespace-anchor here)
-
-(define/contract (compile m)
-  (-> (redex-match L m) (-> any/c any/c))
-  (eval `(λ (a) 
-           (let ([results '()])
-             ,(car (apply-reduction-relation* red m))
-             results))
-        (namespace-anchor->namespace here)))
-
-(collect-garbage) (collect-garbage)
-#;(time (void (apply-reduction-relation* red '(matrix (a) (
-                                                           (((cons (repeat lit-number (repeat lit-number '())) (cons lit-string '())) -> 1))
-                                                           )
-                                                      ()
-                                                      ()
-                                                      0
-                                                      #f))))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/compiler/redextomatrix.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/compiler/redextomatrix.rkt
deleted file mode 100644
index a09a30c1bd..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/compiler/redextomatrix.rkt
+++ /dev/null
@@ -1,566 +0,0 @@
-#lang racket/base
-
-(require (except-in racket/base compile)
-         racket/function
-         racket/match)
-(require (except-in redex/reduction-semantics make-bind plug))
-(require "match.rkt")
-(require racket/set)
-(require profile)
-(require (only-in "../../private/matcher.rkt"
-                  make-bindings
-                  make-bind
-                  make-mtch
-                  build-flat-context
-                  )
-         (only-in "../../private/lang-struct.rkt"
-                  the-hole)
-         racket/list)
-
-(define plug (λ (x y)
-               (cond 
-                 ((cons? x)
-                  (cons (plug (car x) y) (plug (cdr x) y)))
-                 ((or (equal? x the-hole) (equal? x (term hole)))
-                  y)
-                 (else x))))
-
-(provide test-red-rel
-         test-non-term
-         test-redex-match)
-
-; holds symbols for language
-(define lit-table (make-hash))
-
-; holds or pattern versions of the input
-(define or-table (make-hash))
-
-; holds compiled code 
-(define nt-table (make-hash))
-
-(define-struct nt-struct (match-bool match-set))
-
-(define (compile-define-language-nts dl)
-  (match dl
-    [`(define-language ,(? symbol? name)
-        ,non-terms ...)
-     (map (λ (x) (car x))
-          non-terms)]
-    [_
-     'error]))
-
-(define (compile-define-language-lit dl nts)
-  (match dl
-    [`(define-language ,(? symbol? name)
-        ,non-terms ...)
-     (for-each (λ (x) (extract-literals/pat nts (cdr x) lit-table))
-               non-terms)]
-    [_
-     'error]))
-
-(define (extract-literals/pat nts pat ht)
-  (let loop ([pat pat])
-    (match pat
-      [`any (void)]
-      [`number (void)]
-      [`string (void)]
-      [`natural (void)]
-      [`integer (void)]
-      [`real (void)]
-      [`variable (void)]
-      [`(variable-except ,s ...) (void)]
-      [`(variable-prefix ,s) (void)]
-      [`variable-not-otherwise-mentioned (void)]
-      [`hole (void)]
-      [(? symbol? s) 
-       (unless (regexp-match #rx"_" (symbol->string s))
-         (unless (regexp-match #rx"^\\.\\.\\." (symbol->string s))
-           (unless (memq s nts)
-             (hash-set! ht s #t)
-             )))]
-      [`(name ,name ,pat) (loop pat)]
-      [`(in-hole ,p1 ,p2) 
-       (loop p1)
-       (loop p2)]
-      [`(hide-hole ,p) (loop p)]
-      [`(side-condition ,p ,g ,e)
-       (loop p)]
-      [`(cross ,s) (void)]
-      [_
-       (let l-loop ([l-pat pat])
-         (when (pair? l-pat) 
-           (loop (car l-pat))
-           (l-loop (cdr l-pat))))])))
-
-(define (compile-define-language-or dl nts)
-  (match dl
-    [`(define-language ,(? symbol? name)
-        ,non-terms ...)
-     (for-each (λ (x) (hash-set! or-table (car x) (build-or (cdr x) nts (hash-map lit-table (λ (x y) x)) #t)))
-          non-terms)]
-    [_
-     'error]))
-
-(define (build-or pat-l nts syms dl)
-  (let loop ([pat-l pat-l]
-             [nts nts]
-             [syms syms])
-    (if (pair? pat-l)
-        (if (eqv? (length pat-l) 1)
-            (translate-redex (car pat-l) nts syms dl)
-            `(or ,(translate-redex (car pat-l) nts syms dl)
-                 ,(loop (cdr pat-l) nts syms)))
-        (translate-redex pat-l nts syms dl))))
-
-(define (translate-redex pat nts syms dl)
-  (let loop ([pat pat])
-    (match pat
-      [`(,repeated ,(? (λ (x) (eq?  x '...)) ep))
-       `(repeat ,(loop repeated) '())]
-      [`(,repeated ,(? (λ (x) (eq?  x '...)) ep) ,next ...)
-       `(repeat ,(loop repeated) ,(loop next))]
-      [`any (if dl 'wc '(lit-name any wc))]
-      [`number (if dl 'lit-number '(lit-name number lit-number))]
-      [`string (if dl 'lit-string '(lit-name string lit-string))]
-      [`natural (if dl 'lit-natural '(lit-name natural lit-natural))]
-      [`integer (if dl 'lit-integer '(lit-name integer lit-integer))]
-      [`real (if dl 'lit-real '(lit-name real lit-real))]
-      [`variable (if dl 'lit-variable '(lit-name variable lit-variable))]
-      [`(variable-except ,s ...) `(lit-variable-except ,@s)]
-      [`(variable-prefix ,s) `(lit-variable-prefix ,s)]
-      [`variable-not-otherwise-mentioned (if dl `(lit-variable-except ,@syms) `(lit-name variable-not-otherwise-mentioned (lit-variable-except ,@syms)))]
-      [`hole 'lit-hole]
-      [(? symbol? s)
-       (if (memq s nts) 
-           (if dl
-               `(nt ,s)
-               `(lit-name ,s (nt ,s)))
-           (if (has-underscore? s)
-               (let ((split (split-underscore s)))
-                 (cond
-                   ((equal? split 'any) `(lit-name ,s wc))
-                   ((equal? split 'number) `(lit-name ,s lit-number))
-                   ((equal? split 'string) `(lit-name ,s lit-string))
-                   ((equal? split 'natural) `(lit-name ,s lit-natural))
-                   ((equal? split 'integer) `(lit-name ,s lit-integer))
-                   ((equal? split 'real) `(lit-name ,s lit-real))
-                   ((equal? split 'variable) `(lit-name ,s lit-variable))
-                   ((equal? split 'variable-not-otherwise-mentioned) `(lit-name ,s (lit-variable-except ,@syms)))
-                   ((equal? split 'hole) `(lit-name ,s lit-hole))
-                   (else `(lit-name ,s (nt ,split)))
-                   )
-                 )
-               `',s))]
-      [`(name ,name ,pat) `(lit-name ,name ,(loop pat))]
-      [`(in-hole ,p1 ,p2) 
-       `(lit-in-hole
-         ,(loop p1)
-         ,(loop p2))]
-      [`(hide-hole ,p) `(lit-hide-hole ,(loop p))]
-      [`(side-condition ,p ,e)
-       `(lit-side-condition ,(loop p) ,e)]
-      [`(side-condition ,p ,e ,e2)
-       `(lit-side-condition ,(loop p) (,e ,e2))]
-      [`(cross ,s) (void)]
-      [e
-       (if (pair? pat) 
-           `(cons ,(loop (car pat))
-                  ,(loop (cdr pat)))
-           (if (empty? pat)
-               ''()
-               e))]
-      )))
-
-;; split-underscore : symbol -> symbol
-;; returns the text before the underscore in a symbol (as a symbol)
-;; raise an error if there is more than one underscore in the input
-(define (split-underscore sym)
-  (let ([str (symbol->string sym)])
-    (cond
-      [(regexp-match #rx"^([^_]*)_[^_]*$" str)
-       =>
-       (λ (m) (string->symbol (cadr m)))]
-      [(regexp-match #rx"^([^_]*)_!_[^_]*$" str)
-       =>
-       (λ (m) (string->symbol (cadr m)))]
-      [else
-       (error 'compile-pattern "found a symbol with multiple underscores: ~s" sym)])))
-
-;; has-underscore? : symbol -> boolean
-(define (has-underscore? sym)
-  (memq #\_ (string->list (symbol->string sym))))
-
-(define build-hole-table
-  (λ (old-ht)
-    (unless (equal? hole-table old-ht)
-      (let ((prev (make-hash)))
-        (hash-for-each
-         hole-table
-         (λ (key val)
-           (hash-set! prev key val)))
-        (hash-for-each
-         or-table
-         (λ (key val)
-           (hash-set! hole-table key (term (detect-hole2 0 ,val)))))
-        (build-hole-table prev))))
-  )
-
-(define state '())
-(define hole-var '())
-(define nt-func '())
-
-(define wrap-production-with-name
-  (λ (x)
-    (set! state x)
-    (set! hole-var '())
-    (set! nt-func '())
-    (wrap-production-with-name-helper x)
-    )
-  )
-
-(define wrap-production-with-name-helper
-  (λ (exp)
-    (match exp
-      [`(cons ,(? (λ (x) (eqv? 1 (term (detect-hole2 0 ,x)))) p1)
-              ,(? (λ (x) (eqv? 0 (term (detect-hole2 0 ,x)))) p2))
-       `(cons ,(wrap-production-with-name-helper p1) ,(wrap-production-with-name-helper p2))]
-      [`(cons ,(? (λ (x) (eqv? 0 (term (detect-hole2 0 ,x)))) p1)
-              ,(? (λ (x) (eqv? 1 (term (detect-hole2 0 ,x)))) p2))
-       `(cons ,(wrap-production-with-name-helper p1) ,(wrap-production-with-name-helper p2))]
-      [`(cons ,(? (λ (x) (eqv? 0 (term (detect-hole2 0 ,x)))) p1)
-              ,(? (λ (x) (eqv? 0 (term (detect-hole2 0 ,x)))) p2))
-       (let ((x (variable-not-in state 'x)))
-         (set! state (cons x state))
-         `(lit-name ,x (cons ,p1 ,p2)))]
-      [`(lit-name ,id ,(? (λ (x) (eqv? 1 (term (detect-hole2 0 ,x)))) p))
-       `(lit-name ,id ,(wrap-production-with-name-helper p))]
-      [`(lit-name ,id ,(? (λ (x) (eqv? 0 (term (detect-hole2 0 ,x)))) p))
-       `(lit-name ,id ,p)]
-      [`(lit-side-condition ,(? (λ (x) (eqv? 0 (term (detect-hole2 0 ,x)))) p) ,any)
-       (let ((x (variable-not-in state 'x)))
-         (set! state (cons x state))
-         `(lit-name ,x (lit-side-condition ,p ,any))
-         )]
-      [`(lit-side-condition ,(? (λ (x) (eqv? 1 (term (detect-hole2 0 ,x)))) p) ,any)
-       (wrap-production-with-name-helper p)]
-      [`(repeat ,p1 ,(? (λ (x) (eqv? 0 (term (detect-hole2 0 ,x)))) p2))
-       (let ((x (variable-not-in state 'x)))
-         (set! state (cons x state))
-         `(lit-name ,x (repeat ,p1 ,p2))
-         )]
-      [`(repeat ,p1 ,(? (λ (x) (eqv? 1 (term (detect-hole2 0 ,x)))) p2))
-       (let ((x (variable-not-in state 'x)))
-         (set! state (cons x state))
-         `(repeat (lit-name ,x ,p1) ,(wrap-production-with-name-helper p2))
-         )]
-      [`(lit-in-hole ,p1 ,(? (λ (x) (eqv? 0 (term (detect-hole2 0 ,x)))) p2))
-       (let ((x (variable-not-in state 'x)))
-         (set! state (cons x state))
-         `(lit-name ,x (lit-in-hole ,p1 ,p2))
-         )]
-      [`(lit-in-hole ,p1 ,(? (λ (x) (eqv? 1 (term (detect-hole2 0 ,x)))) p2))
-       (let ((x (variable-not-in state 'x)))
-         (set! state (cons x state))
-         (let ((y (variable-not-in state 'y)))
-           (set! hole-var y)
-           `(lit-in-hole (lit-name ,x ,p1) (lit-name ,y ,p2))
-           )
-         )]
-      ['lit-hole
-       (let ((x (variable-not-in state 'x)))
-         (set! state (cons x state))
-         (set! hole-var x)
-         `(lit-name ,x lit-hole)
-         )]
-      [`(nt ,id)
-       (if (eqv? 1 (term (detect-hole2 0 (nt ,id))))
-           (let ((x (variable-not-in state 'x)))
-             (set! state (cons x state))
-             (set! hole-var x)
-             (set! nt-func id)
-             `(lit-name ,x wc)
-             )
-           (let ((x (variable-not-in state 'x)))
-             (set! state (cons x state))
-             `(lit-name ,x (nt ,id))
-             )
-           )]
-      [`',(? (λ (x) (or (symbol? x) (equal? '() x))) ex)
-       exp]
-      [_ (if (or (number? exp) (string? exp) (boolean? exp))
-             exp
-             (let ((x (variable-not-in state 'x)))
-               (set! state (cons x state))
-               `(lit-name ,x ,exp)
-               ))])
-    )
-  )
-
-(define build-right-hand-side
-  (λ (x)
-    (if (equal? nt-func '())
-        (if (equal? hole-var '()) 
-            `(set! results (cons (cons ,(build-right-hand-side-helper x) '()) results))
-            `(set! results (cons (cons ,(build-right-hand-side-helper x) (term ,hole-var)) results))
-            )
-        `(for ((,hole-var (in-list (,(string->symbol (format "~s~s" nt-func '-list)) (term ,hole-var)))))
-              (set! results (cons (cons ,(build-right-hand-side-helper x) (cdr ,hole-var)) results))
-              )
-        )
-    )
-  )
-
-(define build-right-hand-side-helper
-  (λ (exp)
-    (match exp
-      [`(lit-name ,(? (λ (x) (not (equal? hole-var x))) x) ,p)
-       (if (or (not (cons? p)) (and (cons? p) (not (equal? (car p) 'lit-name))))
-           `(term ,x)
-           (build-right-hand-side-helper p))]
-      [`(lit-name ,(? (λ (x) (equal? hole-var x)) x) lit-hole)
-       'the-hole]
-      [`(lit-name ,(? (λ (x) (equal? hole-var x)) x) wc)
-       `(car ,hole-var)]
-      [`(lit-name ,(? (λ (x) (equal? hole-var x)) x) ,p)
-       `(term ,x)]
-      [`(cons ,p1 ,p2)
-       `(cons ,(build-right-hand-side-helper p1) ,(build-right-hand-side-helper p2))]
-      [`(lit-in-hole ,p1 ,p2)
-       (build-right-hand-side-helper p1)]
-      [`(repeat ,p1 ,p2)
-       `(append ,(build-right-hand-side-helper p1) ,(build-right-hand-side-helper p2))]
-      [_ 
-       exp]
-      )))
-
-(define make-or-list
-  (λ (exp)
-    (match exp
-      [`(or ,pro1 ,pro2)
-       (cons pro1 (make-or-list pro2))]
-      [_ (cons exp '())]
-      )
-    )
-  )
-
-(define-namespace-anchor here)
-
-;; compile-dl : sexp[lang] -> (listof sexp[def])
-(define (compile-dl lang)
-  (let* ([lang lang]
-         [nts (compile-define-language-nts lang)]
-         [lit-table lit-table]
-         [or-table or-table]
-         [nt-table nt-table]
-         [hole-table hole-table])
-    
-    
-    (compile-define-language-lit lang nts)
-    (compile-define-language-or lang nts)
-    (caching-enabled? #f)
-    ; Initialize the hole table
-    (hash-for-each 
-     or-table 
-     (λ (key val)
-       (hash-set! hole-table key (term (detect-hole 0 ,val)))
-       ))
-    
-    (build-hole-table '())
-    (caching-enabled? #t)
-    
-    (hash-for-each
-     or-table
-     (λ (key val)
-       (let ((compiled-bool (begin #;(printf "~a\n\n" (term (matrix (a)
-                                                                  (
-                                                                   ((,val -> (set! results (cons #t results))) ,@(map (λ (x) (list x #f)) (remove-duplicates (term (Get-Free-Name-Patterns ,val () ())))))
-                                                                   )
-                                                                  ()
-                                                                  ()
-                                                                  0
-                                                                  #f))) 
-                                   (car (apply-reduction-relation* red
-                                                                   (term (matrix (a)
-                                                                                 (
-                                                                                  ((,val -> (set! results (cons #t results))) ,@(map (λ (x) (list x #f)) (remove-duplicates (term (Get-Free-Name-Patterns ,val () ())))))
-                                                                                  )
-                                                                                 ()
-                                                                                 ()
-                                                                                 0
-                                                                                 #f))))
-                                   )
-                            )
-             (compiled-set (begin #;(traces red (term (matrix (a)
-                                                                 ( ,@(map (λ (x) 
-                                                                            (let ((row (wrap-production-with-name x))) 
-                                                                              `((,row -> ,(build-right-hand-side row)) 
-                                                                                
-                                                                                ,@(map (λ (x) (list x #f)) (remove-duplicates (term (Get-Free-Name-Patterns ,row () ())))))))
-                                                                          (make-or-list val)))
-                                                                 ()
-                                                                 ()
-                                                                 0
-                                                                 #f)))
-                                  (match (apply-reduction-relation* red 
-                                                                  (term (matrix (a)
-                                                                                ( ,@(map (λ (x) 
-                                                                                           (let ((row (wrap-production-with-name x))) 
-                                                                                             `((,row -> ,(build-right-hand-side row)) 
-                                                                                               
-                                                                                               ,@(map (λ (x) (list x #f)) (remove-duplicates (term (Get-Free-Name-Patterns ,row () ())))))))
-                                                                                         (make-or-list val)))
-                                                                                ()
-                                                                                ()
-                                                                                0
-                                                                                #f)))
-                                    ((list x) x))
-                                  )
-                           ))
-         (hash-set! nt-table
-                    key
-                    (make-nt-struct
-                     (term (define ,(string->symbol (format "~s~s" key '-bool))
-                             (λ (a)
-                               (let ((results (list)))
-                                 ,compiled-bool
-                                 (and (andmap values results) (positive? (length results)))))))
-                     (term (define ,(string->symbol (format "~s~s" key '-list))
-                             (λ (a)
-                               (let ((results (list)))
-                                 ,compiled-set
-                                 results)))))))))
-    
-    (append (hash-map nt-table (λ (_ n) (nt-struct-match-bool n)))
-            (hash-map nt-table (λ (_ n) (nt-struct-match-set n))))))
-
-; compile-reduction-relation: sexp[reduction-relation] (listof symbol[non-terminals]) (listof symbols) -> sexp[def]
-(define (compile-reduction-relation rr nts syms)
-  `(λ (a)
-     (let ([results '()])
-       ,(car
-         (apply-reduction-relation* 
-          red
-          (let loop ([e rr])
-            (match e
-              [`(reduction-relation ,L ,rules ...)
-               (term (matrix (a) ,(map loop rules) () () 0 #f))]
-              [`(--> ,pat ,t)
-               (let ((p (translate-redex pat nts syms #f)))
-                 `((,p -> (set! results (cons (term ,t) results)))
-                   ,@(map (λ (x) (list x #f)) 
-                          (remove-duplicates (term (Get-Free-Name-Patterns ,p () ()))))))]))))
-       results)))
-
-(define (make-test-mtch a b c) (make-mtch a (build-flat-context b) c))
-
-; compile-redex-match: sexp[pattern] (listof symbol[non-terminals]) (listof symbols) -> sexp[def]
-(define (compile-redex-match pat nts syms)
-  ; prints for debuging
-  (printf "~a\n\n"
-          `(matrix (a) (,(let ((p (translate-redex pat nts syms #f)))
-                           `((,p -> 
-                                 (set! results (cons (make-test-mtch (make-bindings (list ,@(map (λ (x) `(make-bind ',(string->symbol (format "~s" (term (Get-Pvar ,x)))) (term ,x))) 
-                                                                                                 (remove-duplicates (term (Get-Free-Name-Patterns ,p () ())))) ))
-                                                                     a
-                                                                     'none)
-                                                     results))
-                                 ) 
-                             ,@(map (λ (x) (list x #f)) (remove-duplicates (term (Get-Free-Name-Patterns ,p () ())))))
-                           )
-                        ) () () 0 #f)
-          )
-  (printf "~a\n\n" 
-          (apply-reduction-relation* 
-           red
-           `(matrix (a) (,(let ((p (translate-redex pat nts syms #f)))
-                            `((,p -> 
-                                  (set! results (cons (make-test-mtch (make-bindings (list ,@(map (λ (x) `(make-bind ',(string->symbol (format "~s" (term (Get-Pvar ,x)))) (term ,x))) 
-                                                                                                  (remove-duplicates (term (Get-Free-Name-Patterns ,p () ())))) ))
-                                                                      a
-                                                                      'none)
-                                                      results))
-                                  ) 
-                              ,@(map (λ (x) (list x #f)) (remove-duplicates (term (Get-Free-Name-Patterns ,p () ())))))
-                            )
-                         ) () () 0 #f))
-          )
-  `(λ (a)
-     (let ([results '()])
-       ,(begin
-          (car
-           (apply-reduction-relation* 
-            red
-            `(matrix (a) (,(let ((p (translate-redex pat nts syms #f)))
-                             `((,p -> 
-                                   (set! results (cons (make-test-mtch (make-bindings (list ,@(map (λ (x) `(make-bind ',(string->symbol (format "~s" (term (Get-Pvar ,x)))) (term ,x))) 
-                                                                                                   (remove-duplicates (term (Get-Free-Name-Patterns ,p () ())))) ))
-                                                                       a
-                                                                       'none)
-                                                       results))
-                                   ) 
-                               ,@(map (λ (x) (list x #f)) (remove-duplicates (term (Get-Free-Name-Patterns ,p () ())))))
-                             )
-                          ) () () 0 #f)
-            )))
-       results)))
-
-;; make-lang-namespace: sexp[lang] -> namespace
-(define (make-lang-namespace lang)
-  (define lang-defs (compile-dl lang))
-  (define namespace (namespace-anchor->namespace here))
-  #;(pretty-print lang-defs)
-  (for-each (curryr eval namespace) lang-defs)
-  namespace)
-
-;; test-red-rel: sexp[lang] -> sexp[red-rel] (listof sexp[nts]) (listof symbol) -> sexp[term] -> sexp[term]
-(define (test-red-rel lang)
-  (define namespace (make-lang-namespace lang))
-  (define nts (compile-define-language-nts lang))
-  (define syms (compile-define-language-lit lang nts))
-  (λ (rel)
-    (eval (compile-reduction-relation rel nts syms) namespace)))
-
-;; test-red-match: sexp[lang] -> sexp[pat] (listof sexp[nts]) (listof symbol) -> sexp[term] -> sexp[term]
-(define (test-redex-match lang)
-  (define namespace (make-lang-namespace lang))
-  (define nts (compile-define-language-nts lang))
-  (define syms (compile-define-language-lit lang nts))
-  (λ (pat)
-    #;(pretty-print (compile-redex-match pat nts syms))
-    (eval (compile-redex-match pat nts syms) namespace)))
-
-;; sexp[lang] -> sexp[non-terminal] -> sexp[term] -> boolean
-(define (test-non-term lang)
-  (define namespace (make-lang-namespace lang))
-  (λ (nt)
-    (eval `(λ (t) (,(string->symbol (format "~s-bool" nt)) t)) namespace)))        
-
-(caching-enabled? #f)
-
-(define ∅ #f)
-(define ∪ set-union)
-(define singleton set)
-
-(define natural?
-  (λ (x) (and 
-          (exact-integer? x) 
-          (not (negative? x)))))
-
-(define (variable-prefix? x y) 
-  (let* ([prefix-str (symbol->string x)]
-         [prefix-len (string-length prefix-str)])
-    (and (symbol? y)
-         (let ([str (symbol->string y)])
-           (and ((string-length str) . >= . prefix-len)
-                (string=? (substring str 0 prefix-len) prefix-str))))))
-
-(define no-context #f)
-
-(define in-context #t)
-
-(define context-match (make-parameter no-context))
-
-(define rev (λ (x) 
-              (if (cons? x)
-                  (reverse x)
-                  x)))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/cycle-check.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/cycle-check.rkt
deleted file mode 100644
index c6d9b6ec7f..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/cycle-check.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-(require racket/match)
-
-(provide check-for-cycles)
-
-;; doesn't check for cycles via things like:
-;;  a ::= hole
-;;  b ::= (in-hole a b)
-(define (check-for-cycles stx ntss/stx prodss/stx)
-  
-  (define ntss (syntax->datum ntss/stx))
-  (define prodss (syntax->datum prodss/stx))
-  
-  ;; hash[sym[nt] -o> (listof sym[nt])
-  (define table (make-hash))
-  
-  ;; build the graph
-  (for ([nts (in-list ntss)]
-        [prods (in-list prodss)])
-    (define base-nt (car nts))
-    (for ([nt (in-list (cdr nts))])
-      (hash-set! table nt (list base-nt)))
-    (hash-set! table base-nt '())
-    (for ([prod (in-list prods)])
-      (match prod
-        [`(nt ,name)
-         (hash-set! table base-nt (cons name (hash-ref table base-nt)))]
-        [_ (void)])))
-  
-  ;; traverse the graph looking for cycles
-  (define cycle
-    (for/or ([(nt neighbors) (in-hash table)])
-      (define visited (make-hash))
-      (for/or ([neighbor (in-list neighbors)]) 
-        (let loop ([current-node neighbor])
-          (cond
-            [(eq? current-node nt) nt]
-            [(hash-ref visited current-node #f) #f]
-            [else
-             (hash-set! visited current-node #t)
-             (for/or ([neighbor (in-list (hash-ref table current-node))])
-               (loop neighbor))])))))
-  
-  (when cycle
-    (raise-syntax-error 'define-language
-                        (format
-                         "found a cycle that includes the non-terminal ~a"
-                         cycle)
-                        stx)))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/defined-checks.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/defined-checks.rkt
deleted file mode 100644
index f66e5e0dcb..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/defined-checks.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-
-(require "error.rkt")
-(provide check-defined-module)
-
-(define (check-defined-module thunk name desc)
-  (with-handlers ([exn:fail:contract:variable?
-                   (λ (_) (report-undefined name desc))])
-    (thunk)))
-
-(define (report-undefined name desc)
-  (raise
-   (exn:fail:contract:variable
-    (format "~s: undefined;\n cannot use ~a before its definition" name desc)
-    (current-continuation-marks)
-    name)))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/enum.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/enum.rkt
deleted file mode 100644
index a0a90c64c9..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/enum.rkt
+++ /dev/null
@@ -1,296 +0,0 @@
-#lang racket/base
-(require racket/bool
-         racket/contract
-         racket/function
-         racket/list
-         racket/math
-         racket/match
-         racket/promise
-         racket/set
-
-         "enumerator.rkt"
-         "env.rkt"
-         "error.rkt"
-         "lang-struct.rkt"
-         "match-a-pattern.rkt"
-         "preprocess-pat.rkt"
-         "preprocess-lang.rkt")
-
-(provide 
- (contract-out
-  [lang-enumerators (-> (listof nt?) (promise/c (listof nt?)) lang-enum?)]
-  [pat-enumerator (-> lang-enum?
-                      any/c ;; pattern
-                      (or/c #f enum?))]
-  [enum-ith (-> enum? exact-nonnegative-integer? any/c)]
-  [enum-size (-> enum? (or/c +inf.0 exact-nonnegative-integer?))]
-  [lang-enum? (-> any/c boolean?)]
-  [enum? (-> any/c boolean?)]))
-
-;; nt-enums : hash[sym -o> (or/c #f enum)]
-;; cc-enums : promise/c (hash[sym -o> (or/c #f enum)])
-;; unused-var/e : enum
-(struct lang-enum (nt-enums delayed-cc-enums unused-var/e))
-(struct production (n term) #:transparent)
-(struct repeat (n terms) #:transparent)
-(struct name-ref (name) #:transparent)
-(struct misname-ref (name tag) #:transparent)
-(struct nrep-ref (name subpat) #:transparent)
-(struct decomp (ctx term) #:transparent)
-(struct hide-hole (term) #:transparent)
-
-;; Top level exports
-(define enum-ith decode)
-(define (enum-size e)
-  (define s (size e))
-  (if (equal? s +inf.f)
-      +inf.0
-      s))
-
-(define (lang-enumerators lang cc-lang)
-  (define (make-lang-table! ht lang)
-    (define-values (fin-lang rec-lang cant-enumerate-table) (sep-lang lang))
-    (define (enumerate-lang! cur-lang enum-f)
-      (for ([nt (in-list cur-lang)])
-        (hash-set! ht
-                   (nt-name nt)
-                   (if (hash-ref cant-enumerate-table (nt-name nt))
-                       #f
-                       (enum-f (nt-rhs nt) nt-enums)))))
-    (enumerate-lang! fin-lang
-                     (λ (rhs enums)
-                        (enumerate-rhss rhs l-enum)))
-    (enumerate-lang! rec-lang
-                     (λ (rhs enums)
-                        (thunk/e +inf.f
-                                 (λ ()
-                                    (enumerate-rhss rhs l-enum)))))
-    ht)
-  (define nt-enums (make-hash))
-  (define cc-enums (delay (make-hash)))
-  (define unused-var/e
-    (apply except/e
-           var/e
-           (used-vars lang)))
-  (define l-enum
-    (lang-enum nt-enums cc-enums unused-var/e))
-  
-  (make-lang-table! nt-enums lang)
-  (define filled-cc-enums
-    (delay (make-lang-table! (force cc-enums) (force cc-lang))))
-
-  (struct-copy lang-enum l-enum [delayed-cc-enums filled-cc-enums]))
-
-(define (pat-enumerator l-enum pat)
-  (cond
-    [(can-enumerate? pat (lang-enum-nt-enums l-enum) (lang-enum-delayed-cc-enums l-enum))
-     (map/e
-      to-term
-      (λ (_)
-        (redex-error 'pat-enum "Enumerator is not a  bijection"))
-      (pat/e pat l-enum))]
-    [else #f]))
-
-(define (enumerate-rhss rhss l-enum)
-  (define (with-index i e)
-    (cons (map/e (curry production i)
-                 production-term
-                 e)
-          (λ (nd-x) (= i (production-n nd-x)))))
-  (apply disj-sum/e
-         (for/list ([i (in-naturals)]
-                    [production (in-list rhss)])
-           (with-index i
-                       (pat/e (rhs-pattern production) l-enum)))))
-
-(define (pat/e pat l-enum)
-  (match-define (ann-pat nv pp-pat) (preprocess pat))
-  (map/e
-   ann-pat
-   (λ (ap)
-      (values (ann-pat-ann ap)
-              (ann-pat-pat ap)))
-   (env/e nv l-enum)
-   (pat-refs/e pp-pat l-enum)))
-
-;; (: pat-refs/e : Pat (HashTable Symbol (Enum Pat)) (Enum Symbol) -> Enum RefPat)
-(define (pat-refs/e pat l-enum)
-  (define (loop pat)
-    (match-a-pattern
-     pat
-     [`any any/e]
-     [`number num/e]
-     [`string string/e]
-     [`natural nat/e]
-     [`integer integer/e]
-     [`real real/e]
-     [`boolean bool/e]
-     [`variable var/e]
-     [`(variable-except ,s ...)
-      (apply except/e var/e s)]
-     [`(variable-prefix ,s)
-      (var-prefix/e s)]
-     [`variable-not-otherwise-mentioned
-      (lang-enum-unused-var/e l-enum)]
-     [`hole (const/e the-hole)]
-     [`(nt ,id)
-      (lang-enum-get-nt-enum l-enum id)]
-     [`(name ,n ,pat)
-      (const/e (name-ref n))]
-     [`(mismatch-name ,n ,tag)
-      (const/e (misname-ref n tag))]
-     [`(in-hole ,p1 ,p2)
-      (map/e decomp
-             (match-lambda
-              [(decomp ctx term)
-               (values ctx term)])
-             (loop p1)
-             (loop p2))]
-     [`(hide-hole ,p)
-      (map/e hide-hole
-             hide-hole-term
-             (loop p))]
-     [`(side-condition ,p ,g ,e)
-      (unsupported pat)]
-     [`(cross ,s)
-      (lang-enum-get-cross-enum l-enum s)]
-     [`(list ,sub-pats ...)
-      (apply list/e
-       (for/list ([sub-pat (in-list sub-pats)])
-         (match sub-pat
-           [`(repeat ,pat #f #f)
-            (map/e
-             (λ (ts)
-                (repeat (length ts)
-                        ts))
-             (λ (rep)
-                (repeat-terms rep))
-             (many/e (loop pat)))]
-           [`(repeat ,tag ,n #f)
-            (const/e (nrep-ref n tag))]
-           [`(repeat ,pat ,n ,m)
-            (unimplemented "mismatch repeats (..._!_)")]
-           [else (loop sub-pat)])))]
-     [(? (compose not pair?)) 
-      (const/e pat)]))
-  (loop pat))
-
-(define/match (env/e nv l-enum)
-  [((env names misnames nreps) _)
-   (define (val/e p)
-     (pat-refs/e p l-enum))
-
-   (define/match (misvals/e p-ts)
-     [((cons p ts))
-      (define p/e (val/e p))
-      (fold-enum (λ (ts-excepts tag)
-                    (define excepts
-                      (map cdr ts-excepts))
-                    (cons/e (const/e tag)
-                            (apply except/e p/e excepts)))
-                 (set->list ts))])
-   
-   (define/match (reprec/e nv-t)
-     [((cons nv tpats))
-      (define tpats/e
-        (hash-traverse/e val/e tpats))
-      (many/e
-       (cons/e (env/e nv l-enum)
-               tpats/e))])
-   (define names-env
-     (hash-traverse/e val/e names))
-
-   (define misnames-env
-     (hash-traverse/e misvals/e misnames))
-   
-   (define nreps-env
-     (hash-traverse/e reprec/e nreps))
-   (map/e
-    t-env
-    (match-lambda
-     [(t-env  names misnames nreps)
-      (values names misnames nreps)])
-    names-env
-    misnames-env
-    nreps-env)])
-
-;; to-term : (ann-pat t-env pat-with-refs) -> redex term
-(define/match (to-term ap)
-  [((ann-pat nv term))
-   (strip-hide-holes ((refs-to-fn term) nv))])
-
-;; refs-to-fn : RefPat -> (TEnv -> Term)
-(define (refs-to-fn refpat)
-  (match refpat
-    [(ann-pat nv term)
-     (λ (_)
-        ((refs-to-fn term) nv))]
-    [(production _ term)
-     (refs-to-fn term)]
-    [(decomp ctx-refs termpat-refs)
-     (define ctx-fn (refs-to-fn ctx-refs))
-     (define term-fn (refs-to-fn termpat-refs))
-     (λ (nv)
-        (define ctx (ctx-fn nv))
-        (define term (term-fn nv))
-        (plug-hole ctx term))]
-    [(hide-hole p)
-     (define p-fn (refs-to-fn p))
-     (λ (nv)
-        (hide-hole (p-fn nv)))]
-    [(name-ref n)
-     (λ (nv)
-        (t-env-name-ref nv n))]
-    [(misname-ref n tag)
-     (λ (nv)
-        ((refs-to-fn (t-env-misname-ref nv n tag)) nv))]
-    [(list subrefpats ...)
-     (compose
-      append*
-      (sequence-fn
-       (for/list ([subrefpat (in-list subrefpats)])
-         (match subrefpat
-           [(repeat _ subs)
-            (sequence-fn (map refs-to-fn subs))]
-           [(nrep-ref n tag)
-            (λ (nv)
-               (define env-ts (t-env-nrep-ref nv n))
-               (for/list ([nv-t (in-list env-ts)])
-                 (match nv-t
-                   [(cons nv tterms)
-                    ((refs-to-fn (hash-ref tterms tag)) nv)])))]
-           [_ (sequence-fn (list (refs-to-fn subrefpat)))]))))]
-    [else (λ (_) refpat)]))
-
-(define (strip-hide-holes term)
-  (match term
-    [(hide-hole t) (strip-hide-holes t)]
-    [(list ts ...) (map strip-hide-holes ts)]
-    [_ term]))
-
-(define (plug-hole ctx term)
-  (define (plug ctx)
-    (match ctx
-      [(? (curry eq? the-hole)) term]
-      [(list ctxs ...) (map plug ctxs)]
-      [_ ctx]))
-  (define (unhide term)
-    (match term
-      [(list ctxs ...) (map unhide ctxs)]
-      [(hide-hole term) (unhide term)]
-      [_ term]))
-  (unhide (plug ctx)))
-
-;; (: sequence-fn : (All (a b) (Listof (a -> b)) -> (a -> (Listof b))))
-(define (sequence-fn fs)
-  (λ (x)
-     (for/list ([f (in-list fs)])
-       (f x))))
-
-;; lang-enum-get-nt-enum : lang-enum Symbol -> (or/c Enum #f)
-(define (lang-enum-get-nt-enum l-enum s)
-  (hash-ref (lang-enum-nt-enums l-enum) s))
-
-;; lang-enum-get-cross-enum : lang-enum Symbol -> (or/c Enum #f)
-(define (lang-enum-get-cross-enum l-enum s)
-  (hash-ref (force (lang-enum-delayed-cc-enums l-enum)) s))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/enumerator.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/enumerator.rkt
deleted file mode 100644
index 49887f743b..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/enumerator.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang racket/base
-(require data/enumerate
-         racket/function
-         racket/list
-         racket/contract/base)
-(provide enum
-         enum?
-         size
-         (contract-out
-          (rename to-nat encode (-> enum? any/c exact-nonnegative-integer?))
-          (rename from-nat decode (-> enum? exact-nonnegative-integer? any/c)))
-         empty/e
-         const/e
-         from-list/e
-         fin/e
-         disj-sum/e
-         disj-append/e
-         cons/e
-         elegant-cons/e
-         dep/e
-         dep2/e ;; requires size (eventually should replace dep/e with this)
-         map/e
-         filter/e ;; very bad, only use for small enums
-         except/e 
-         thunk/e
-         fix/e
-         many/e
-         many1/e
-         list/e
-         vec/e
-
-         cantor-vec/e
-         cantor-list/e
-
-         box-vec/e
-         box-list/e
-         
-         traverse/e
-         hash-traverse/e
-         
-         fail/e
-         
-         approximate
-         to-list
-         to-stream
-         take/e
-         fold-enum
-
-         nat/e
-         range/e
-         slice/e
-         nat+/e
-
-         ;; Base type enumerators
-         any/e
-         (rename-out [symbol/e var/e])
-         var-prefix/e
-         num/e
-         integer/e
-         bool/e
-         real/e
-         string/e)
-
-(define (var-prefix/e s)
-  (define as-str (symbol->string s))
-  (map/e (compose string->symbol
-                  (curry string-append as-str)
-                  symbol->string)
-         (compose string->symbol
-                  list->string
-                  (curry (flip drop) (string-length as-str))
-                  string->list
-                  symbol->string)
-         symbol/e))
-
-(define (flip f)
-  (λ (x y)
-     (f y x)))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/env.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/env.rkt
deleted file mode 100644
index c4ba10af4c..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/env.rkt
+++ /dev/null
@@ -1,150 +0,0 @@
-#lang typed/racket
-
-(require/typed "error.rkt"
-               [redex-error (Symbol String Any * -> Nothing)])
-(require racket/set)
-
-(provide (struct-out env)
-         empty-env
-         add-name
-         add-mismatch
-         pure-nrep
-         env-union
-         (struct-out t-env)
-         t-env-name-ref
-         t-env-misname-ref
-         t-env-nrep-ref)
-
-;; For now, accept any pattern
-(define-type Pattern Any)
-(define-type Term Any)
-(define-type Env env)
-(define-type TEnv t-env)
-(define-type Tag Integer)
-(define-type (Tagged a) (HashTable Tag a))
-
-(struct: env ([names    : (HashTable Symbol Pattern)]
-              [misnames : (HashTable Symbol (Pairof Pattern (Setof Tag)))]
-              [nreps    : (HashTable Symbol (Pairof Env (Tagged Pattern)))])
-         #:transparent)
-
-(struct: t-env ([names    : (HashTable Symbol Term)]
-                [misnames : (HashTable Symbol (Listof (Pairof Tag Term)))]
-                [nreps    : (HashTable Symbol (Listof (Pairof TEnv (Tagged Term))))])
-         #:transparent)
-
-(: empty-env : Env)
-(define empty-env
-  (env (hash) (hash) (hash)))
-
-(: empty-t-env : TEnv)
-(define empty-t-env
-  (t-env (hash) (hash) (hash)))
-
-(: add-name : Env Symbol Pattern -> Env)
-(define/match (add-name e n p)
-  [((env names misnames nreps) _ _)
-   (define (default) p)
-   (define update identity)
-   (env (hash-update names n update default) misnames nreps)])
-
-(: add-mismatch : Env Symbol Pattern Tag -> Env)
-(define/match (add-mismatch e n p t)
-  [((env names misnames nreps) _ _ _)
-   (: default : -> (Pairof Pattern (Setof Tag)))
-   (define (default) (cons p (set t)))
-   (: update : (Pairof Pattern (Setof Tag)) -> (Pairof Pattern (Setof Tag)))
-   (define/match (update p-ts)
-     [((cons p ts))
-      (cons p (set-add ts t))])
-   (env names
-        (hash-update misnames n update default)
-        nreps)])
-
-(: pure-nrep : Symbol Env Tag Pattern -> Env)
-(define (pure-nrep n repnv tag pat)
-  (: nreps : (HashTable Symbol (Pairof Env (Tagged Pattern))))
-  (define nreps
-    (hash-set (ann (hash) (HashTable Symbol (Pairof Env (Tagged Pattern))))
-              n
-              (cons repnv
-                    (hash-set (ann (hash) (Tagged Pattern))
-                              tag
-                              pat))))
-  (env (hash) (hash) nreps))
-
-(: t-env-name-ref : TEnv Symbol -> Term)
-(define/match (t-env-name-ref e n)
-  [((t-env names _ _) _)
-   (hash-ref names n (thunk (redex-error 't-env-name-ref "name not found: ~s" n)))])
-
-(: t-env-misname-ref : TEnv Symbol Tag -> Term)
-(define/match (t-env-misname-ref te m tag)
-  [((t-env _ misnames _) _ _)
-   (define tagged-terms
-     (hash-ref misnames m (thunk (redex-error 't-env-misname-ref "mismatch name not found: ~s" m))))
-   (define maybe-term
-     (assoc tag tagged-terms))
-   (cond [maybe-term (cdr maybe-term)]
-         [else (redex-error 't-env-misname-ref "mismatch name tag not found: ~s" tag)])])
-
-(: t-env-nrep-ref : TEnv Symbol -> (Listof (Pairof TEnv Term)))
-(define/match (t-env-nrep-ref nv n)
-  [((t-env _ _ nreps) n)
-   (hash-ref nreps n (thunk (redex-error 't-env-nrep-ref "repeat not found: ~s" n)))])
-
-(: env-union : Env Env -> Env)
-(define/match (env-union e1 e2)
-  [((env ns1 ms1 rs1) (env ns2 ms2 rs2))
-   
-   (define names-union
-     (hash-union ns1
-                 ns2
-                 (λ (_ v1 v2)
-                    (unless (equal? v1 v2)
-                      (redex-error 'generate-term-#:ith "named patterns must be the same pattern"))
-                    v1)))
-
-   (: mis-combo : Symbol (Pairof Pattern (Setof Tag)) (Pairof Pattern (Setof Tag)) -> (Pairof Pattern (Setof Tag)))
-   (define/match (mis-combo k pts1 pts2)
-     [(_ (cons p1 ts1) (cons p2 ts2))
-      (unless (equal? p1 p2)
-        (redex-error 'generate-term-#:ith "mismatch named patterns must be the same pattern"))
-      (cons p1 (set-union ts1 ts2))])
-   
-   (: misnames-union : (HashTable Symbol (Pairof Pattern (Setof Tag))))
-   (define misnames-union
-     (hash-union ms1 ms2 mis-combo))
-   
-   (: nrep-combo : Symbol (Pairof Env (Tagged Pattern)) (Pairof Env (Tagged Pattern)) -> (Pairof Env (Tagged Pattern)))
-   (define/match (nrep-combo _ e-t1 e-t2)
-     [(_ (cons nv1 t1) (cons nv2 t2))
-      (cons (env-union nv1 nv2)
-            (hash-union t1 t2
-                        (λ (t _1 _2)
-                           (redex-error 'env-union
-                                        "2 tags should never collide, but these did: ~s, ~s with tag: ~s in envs ~s and ~s"
-                                        _1 _2 t e1 e2))))])
-   (define nreps-union
-     (hash-union rs1 rs2 nrep-combo))
-   (env names-union misnames-union nreps-union)])
-
-(: key-set : (All (k v) (HashTable k v) -> (Setof k)))
-(define (key-set m)
-  (list->set (hash-keys m)))
-
-(: hash-union : (All (k v) (HashTable k v) (HashTable k v) (k v v -> v) -> (HashTable k v)))
-(define (hash-union m1 m2 combo)
-  (: ks1 : (Setof k))
-  (: ks2 : (Setof k))
-  (define ks1 (key-set m1))
-  (define ks2 (key-set m2))
-  (for/hash: : (HashTable k v)
-               ([k : k (in-set (set-union ks1 ks2))])
-    (define v1 (hash-ref m1 k (thunk #f)))
-    (define v2 (hash-ref m2 k (thunk #f)))
-    (define v
-      (cond [(and v1 v2)
-             (combo k v1 v2)]
-            [else (or v1 v2 (redex-error 'absurd ""))]))
-    (values k v)))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/error.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/error.rkt
deleted file mode 100644
index 68eecc994f..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/error.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-
-(provide redex-error
-         exn:fail:redex?
-         (struct-out exn:fail:redex)
-         unsupported
-         unimplemented)
-
-(define-struct (exn:fail:redex exn:fail) ())
-(define (redex-error name fmt . args)
-  (define suffix (apply format fmt args))
-  (define message
-    (if name
-        (format "~a: ~a" name suffix)
-        suffix))
-  (raise (make-exn:fail:redex message (current-continuation-marks))))
-
-(define (unsupported pat)
-  (redex-error 'generate-term "#:i-th does not support ~s patterns" pat))
-
-(define (unimplemented pat)
-  (redex-error 'generate-term "#:i-th does not yet support ~s patterns" pat))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/extract-conditions.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/extract-conditions.rkt
deleted file mode 100644
index b1f394a47c..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/extract-conditions.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     syntax/stx)
-         "match-a-pattern.rkt"
-         racket/match)
-
-(provide extract-clauses
-         extracted-clauses->fns)
-
-(define-for-syntax extracted-conditions #f)
-(define-syntax (extract-clauses stx)
-  (syntax-case stx (match-a-pattern)
-    [(_ (match-a-pattern #:allow-else p clauses ...))
-     (begin
-       (set! extracted-conditions
-             (cons #'p
-                   (filter
-                    values
-                    (map
-                     (λ (clause)
-                       (syntax-case clause (_)
-                         [[cond #f] #f]
-                         [[`(name id pat) if-part]
-                          [eq? 'name (syntax-e #'name)]
-                          #f] ;; skip this here, want bound variant for pat* - added in pat-unify
-                         [[_ exp ...] #f] ;; skip the cstr test; that's added elsewhere
-                         [[cond not-false ...] #'cond]))
-                     (syntax->list #'(clauses ...))))))
-       (stx-car (stx-cdr stx)))]))
-
-(define-syntax (extracted-clauses->fns stx)
-  (unless extracted-conditions
-    (raise-syntax-error #f "no pats extracted"))
-  (with-syntax ([(p condition ...) extracted-conditions]
-                [(name ...) (map (λ (x) (string->symbol (format "~s" (syntax->datum x))))
-                                 (cdr extracted-conditions))])
-    #`(list 
-       (let ([name (λ (p) (match p [condition #t] [else #f]))])
-         name) ...)))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/fresh.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/fresh.rkt
deleted file mode 100644
index 257a6278c9..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/fresh.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/set)
-
-(define (variable-not-in sexp var)
-  (define var-str (symbol->string var))
-  (define var-prefix
-    (let ([m (regexp-match #rx"^(.*[^0-9])[0-9]+$" var-str)])
-      (if m
-          (cadr m)
-          var-str)))
-  (define found-exact-var? #f)
-  (define nums
-    (let loop ([sexp sexp]
-               [nums (set)])
-      (cond
-        [(pair? sexp) (loop (cdr sexp) (loop (car sexp) nums))]
-        [(symbol? sexp) 
-         (when (equal? sexp var)
-           (set! found-exact-var? #t))
-         (define str (symbol->string sexp))
-         (define match (regexp-match #rx"([0-9]+)$" str))
-         (if (and match
-                  (is-prefix? var-prefix str))
-             (set-add nums (string->number (list-ref match 1)))
-             nums)]
-        [else nums])))
-  (cond
-    [(not found-exact-var?) var]
-    [(set-empty? nums) (string->symbol (format "~a1" var))]
-    [else (string->symbol (format "~a~a" var-prefix (find-best-number nums)))]))
-
-(define (find-best-number nums)
-  (let loop ([sorted (sort (set->list nums) <)]
-             [i 1])
-    (cond
-      [(null? sorted) i]
-      [else 
-       (define fst (car sorted))
-       (cond
-         [(< i fst) i]
-         [(> i fst) (loop (cdr sorted) i)]
-         [(= i fst) (loop (cdr sorted) (+ i 1))])])))
-
-(define (variables-not-in sexp vars)
-  (let loop ([vars vars]
-             [sexp sexp])
-    (cond
-      [(null? vars) null]
-      [else 
-       (define new-var (variable-not-in sexp (car vars)))
-       (cons new-var
-             (loop (cdr vars)
-                   (cons new-var sexp)))])))
-
-(define (is-prefix? str1 str2)
-  (and (<= (string-length str1) (string-length str2))
-       (for/and ([c1 (in-string str1)]
-                 [c2 (in-string str2)])
-         (equal? c1 c2))))
-
-(provide/contract
- [variable-not-in (any/c symbol? . -> . symbol?)]
- [variables-not-in (any/c (listof symbol?) . -> . (listof symbol?))])
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/generate-term.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/generate-term.rkt
deleted file mode 100644
index 36270173a4..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/generate-term.rkt
+++ /dev/null
@@ -1,918 +0,0 @@
-#lang racket/base
-(require "rg.rkt" 
-         "jdg-gen.rkt"
-         "error.rkt"
-         "enum.rkt"
-         "reduction-semantics.rkt"
-         "struct.rkt"
-         "term.rkt"
-         "matcher.rkt"
-         "judgment-form.rkt"
-         "search.rkt"
-         "term-fn.rkt"
-         "pat-unify.rkt"
-         racket/contract
-         racket/match
-         racket/pretty
-         (for-syntax racket/base
-                     racket/set
-                     syntax/stx
-                     setup/path-to-relative
-                     "rewrite-side-conditions.rkt"
-                     "term-fn.rkt"
-                     "keyword-macros.rkt")
-         math/base
-         math/distributions)
-
-(define-for-syntax (metafunc name)
-  (and (identifier? name)
-       (let ([tf (syntax-local-value name (λ () #f))])
-         (and (term-fn? tf) (term-fn-get-id tf)))))
-
-(define-for-syntax (metafunc/err name stx)
-  (let ([m (metafunc name)])
-    (if m m (raise-syntax-error #f "not a metafunction" stx name))))
-
-(define-for-syntax (term-generator lang pattern what)
-  (with-syntax ([pattern pattern])
-    #`((compile #,lang '#,what) `pattern)))
-
-(define (make-generator raw-generators form-name)
-  (λ (size #:attempt-num [attempt-num 1] #:retries [retries default-retries])
-    (define (check-arg arg)
-      (unless (natural-number/c arg)
-        (raise-argument-error form-name "natural number" arg)))
-    (check-arg size)
-    (check-arg attempt-num)
-    (check-arg retries)
-    (let-values ([(term _) ((match raw-generators
-                              [(list g) g]
-                              [_ (pick-from-list raw-generators)])
-                            size attempt-num retries)])
-      term)))
-
-(define-for-syntax (show-message stx)
-  (syntax-case stx ()
-    [(what . _)
-     (identifier? #'what)
-     (with-syntax ([loc (if (and (path? (syntax-source stx))
-                                 (syntax-line stx))
-                            (format "~a:~a"
-                                    (path->relative-string/library (syntax-source stx)) 
-                                    (syntax-line stx))
-                            #f)])
-       #`(λ (msg)
-           (fprintf 
-            (current-output-port)
-            "~a: ~a~a"
-            'what (if loc (string-append loc "\n") "") msg)))]))
-
-(define-for-syntax attempts-keyword
-  (list '#:attempts #'(default-check-attempts)
-        (list #'natural-number/c "#:attempts argument")))
-(define-for-syntax source-keyword
-  (list '#:source #f))
-(define-for-syntax retries-keyword
-  (list '#:retries #'default-retries 
-        (list #'natural-number/c "#:retries argument")))
-(define-for-syntax print?-keyword
-  (list '#:print? #t))
-(define-for-syntax attempt-size-keyword
-  (list '#:attempt-size #'default-attempt-size 
-        (list #'attempt-size/c "#:attempt-size argument")))
-(define-for-syntax keep-going-keyword
-  (list '#:keep-going? #'#f (list #'boolean? "#:keep-going? argument")))
-(define-for-syntax (prepare-keyword lists?)
-  (list '#:prepare #f 
-        (list (if lists? #'(-> list? list?) #'(-> any/c any/c)) 
-              "#:prepare argument")))
-
-(define-for-syntax satisfying-disallowed-kws
-  (set '#:source '#:retries))
-
-(define-syntax (redex-check stx)
-  (define valid-kws 
-    (list* '#:satisfying
-           '#:ad-hoc
-           '#:enum
-           '#:uniform-at-random
-           '#:in-order
-           (map car (list attempts-keyword
-                          source-keyword
-                          retries-keyword
-                          print?-keyword
-                          attempt-size-keyword
-                          keep-going-keyword
-                          (prepare-keyword #f)))))
-  (define used-kws
-    (for/fold ([kws (set)])
-              ([maybe-kw-stx (in-list (syntax->list stx))])
-      (define maybe-kw (syntax-e maybe-kw-stx))
-      (cond 
-        [(keyword? maybe-kw)
-         (unless (member maybe-kw valid-kws)
-           (raise-syntax-error 'redex-check "unknown keyword" stx maybe-kw-stx))
-         (set-add kws maybe-kw)]
-        [else kws])))
-  (define bad-kws (set-intersect used-kws satisfying-disallowed-kws))
-  (syntax-case stx (=)
-    [(form lang #:satisfying (mf-id . args) = res property . kw-args)
-     (unless (set-empty? bad-kws)
-       (raise-syntax-error 'redex-check (format "~s cannot be used with #:satisfying" (car (set->list bad-kws))) stx))
-     (redex-check/mf stx #'form #'lang #'mf-id #'args #'res #'property #'kw-args)]
-    [(form lang #:satisfying (jform-id . pats) property . kw-args)
-     (unless (set-empty? bad-kws)
-       (raise-syntax-error 'redex-check (format "~s cannot be used with #:satisfying" (car (set->list bad-kws))) stx))
-     (redex-check/jf stx #'form #'lang #'jform-id #'pats #'property #'kw-args)]
-    [(form lang #:satisfying . rest)
-     (raise-syntax-error 'redex-check "#:satisfying expected judgment form or metafunction syntax followed by a property" stx #'rest)]
-    [(form lang pat #:enum biggest-e property . kw-args)
-     (redex-check/pat stx #'form #'lang #'pat #'property #'biggest-e #f #f #f #'kw-args)]
-    [(form lang pat #:uniform-at-random p-value property . kw-args)
-     (redex-check/pat stx #'form #'lang #'pat #'property #f #'p-value #f #f #'kw-args)]
-    [(form lang pat #:in-order property . kw-args)
-     (redex-check/pat stx #'form #'lang #'pat #'property #f #f #t #f #'kw-args)]
-    [(form lang pat #:ad-hoc property . kw-args)
-     (redex-check/pat stx #'form #'lang #'pat #'property #f #f #f #t #'kw-args)]
-    [(form lang pat property . kw-args)
-     (redex-check/pat stx #'form #'lang #'pat #'property #f #f #f #f #'kw-args)]))
-
-(define-struct gen-fail ())
-
-(define-for-syntax (redex-check/jf orig-stx form lang jf-id pats property kw-args)
-  (define-values (attempts-stx source-stx retries-stx print?-stx size-stx fix-stx keep-going-stx)
-    (parse-redex-check-kw-args kw-args orig-stx form))
-  (define nts (definition-nts lang orig-stx 'redex-check))
-  (unless (judgment-form-id? jf-id)
-    (raise-syntax-error 'redex-check "expected a judgment-form" jf-id))
-  (define j-f (lookup-judgment-form-id jf-id))
-  (define clauses (judgment-form-gen-clauses j-f))
-  (define relation? (judgment-form-relation? j-f))
-  (define args-stx (if relation?
-                       (syntax/loc #'args #`(#,pats))
-                       pats))
-  (with-syntax* ([(syncheck-exp pattern (names ...) (names/ellipses ...))
-                  (rewrite-side-conditions/check-errs lang 'redex-check #t args-stx)]
-                 [show (show-message orig-stx)]
-                 [res-term-stx #`(#,jf-id #,@args-stx)]
-                 [property #`(bind-prop
-                               (λ (bindings)
-                                 #,(bind-pattern-names 'redex-check
-                                                       #'(names/ellipses ...)
-                                                       #'((lookup-binding bindings 'names) ...)
-                                                       property)))])
-                (quasisyntax/loc orig-stx
-                  (let ([term-match (λ (generated)
-                                      (cond [(test-match #,lang res-term-stx generated) => values]
-                                            [else (redex-error 'redex-check "~s does not match ~s" generated 'res-term-stx)]))])
-                    syncheck-exp
-                    (let ([default-attempt-size (λ (s) (add1 (default-attempt-size s)))])
-                      (parameterize ([attempt->size #,size-stx]
-                                     [unsupported-pat-err-name 'redex-check])
-                        (check-one
-                         (λ (size _1 _2)
-                           (values
-                            (match ((make-jf-gen/proc '#,jf-id #,clauses #,lang 'pattern size))
-                              [(and res (? values)) res]
-                              [else (gen-fail)])
-                            #f))
-                         property #,attempts-stx 0 (and #,print?-stx show) #,fix-stx term-match
-                         #,keep-going-stx)))))))
-
-(define-for-syntax (redex-check/mf orig-stx form lang mf-id args-stx res-stx property kw-args)
-  (define-values (attempts-stx source-stx retries-stx print?-stx size-stx fix-stx keep-going-stx)
-    (parse-redex-check-kw-args kw-args orig-stx form))
-  (define nts (definition-nts lang orig-stx 'redex-check))
-  (define m (metafunc mf-id))
-  (unless m (raise-syntax-error 'generate-term "expected a metafuction" mf-id))
-  (define mf (syntax-local-value mf-id (λ () #f)))
-  (with-syntax* ([(lhs-syncheck-exp lhs-pat (lhs-names ...) (lhs-names/ellipses ...))
-                  (rewrite-side-conditions/check-errs lang 'redex-check #t args-stx)]
-                 [(rhs-syncheck-exp rhs-pat (rhs-names ...) (rhs-names/ellipses ...))
-                  (rewrite-side-conditions/check-errs lang 'redex-check #t res-stx)]
-                 [res-term-stx #`((#,mf-id #,@args-stx) = #,res-stx)]
-                 [mf-id (term-fn-get-id mf)]
-                 [show (show-message orig-stx)]
-                 [property #`(bind-prop
-                               (λ (bindings)
-                                 #,(bind-pattern-names 'redex-check
-                                                       #'(lhs-names/ellipses ... 
-                                                          rhs-names/ellipses ...)
-                                                       #'((lookup-binding bindings 'lhs-names) ...
-                                                          (lookup-binding bindings 'rhs-names) ...)
-                                                       property)))])
-                (quasisyntax/loc orig-stx
-                  (let ([term-match (λ (generated)
-                                      (cond [(test-match #,lang res-term-stx generated) => values]
-                                            [else (redex-error 'redex-check "~s does not match ~s" generated 'res-term-stx)]))])
-                    lhs-syncheck-exp
-                    rhs-syncheck-exp
-                    (let ([default-attempt-size (λ (s) (add1 (default-attempt-size s)))])
-                      (parameterize ([attempt->size #,size-stx])
-                        (check-one
-                         (λ (size _1 _2)
-                           (values
-                            (match ((make-mf-gen/proc 'mf-id mf-id #,lang 'lhs-pat 'rhs-pat size))
-                              [(and res (? values)) res]
-                              [else (gen-fail)])
-                            #f))
-                         property #,attempts-stx 0 (and #,print?-stx show) #,fix-stx term-match
-                         #,keep-going-stx)))))))
-
-(define-for-syntax (redex-check/pat orig-stx form lang pat property 
-                                    enum-bound-e enum-p-value in-order? ad-hoc?
-                                    kw-args)
-  (with-syntax ([(syncheck-exp pattern (name ...) (name/ellipses ...))
-                 (rewrite-side-conditions/check-errs 
-                  lang
-                  'redex-check #t pat)]
-                [show (show-message orig-stx)])
-    (define-values (attempts-stx source-stx retries-stx print?-stx size-stx fix-stx keep-going-stx)
-      (parse-redex-check-kw-args kw-args orig-stx form)) 
-    (with-syntax ([property #`(bind-prop
-                               (λ (bindings)
-                                 #,(bind-pattern-names 'redex-check
-                                                       #'(name/ellipses ...)
-                                                       #'((lookup-binding bindings 'name) ...)
-                                                       property)))])
-      (quasisyntax/loc orig-stx
-        (let ([att #,attempts-stx]
-              [ret #,retries-stx]
-              [print? #,print?-stx]
-              [fix #,fix-stx]
-              [keep-going? #,keep-going-stx]
-              [term-match (λ (generated)
-                            (cond [(test-match #,lang #,pat generated) => values]
-                                  [else (redex-error 'redex-check "~s does not match ~s" generated '#,pat)]))])
-          syncheck-exp
-          (parameterize ([attempt->size #,size-stx])
-            #,(cond
-                [source-stx
-                 (when enum-bound-e
-                   (raise-syntax-error
-                    #f
-                    "#:enum cannot be used with the #:source keyword"
-                    orig-stx))
-                 (when enum-p-value
-                   (raise-syntax-error
-                    #f
-                    "#:uniform-at-random cannot be used with the #:source keyword"
-                    orig-stx))
-                 (when in-order?
-                   (raise-syntax-error
-                    #f
-                    "#:in-order cannot be used with the #:source keyword"
-                    orig-stx))
-                 #`(let-values ([(metafunc/red-rel num-cases) 
-                                  #,(cond [(metafunc source-stx)
-                                           => (λ (x) #`(values #,x (length (metafunc-proc-cases #,x))))]
-                                          [else
-                                           #`(let ([r #,(apply-contract #'reduction-relation? source-stx 
-                                                                        "#:source argument" (syntax-e form))])
-                                               (values r (length (reduction-relation-make-procs r))))])])
-                      (check-lhs-pats
-                       #,lang
-                       metafunc/red-rel
-                       property
-                       (max 1 (floor (/ att num-cases)))
-                       ret
-                       'redex-check
-                       (and print? show)
-                       fix
-                       keep-going?
-                       #:term-match term-match))]
-                [else
-                 (cond
-                   [in-order?
-                    #`(check-one
-                       (in-order-generator #,lang `pattern)
-                       property att ret (and print? show) (or fix (λ (x) x)) term-match
-                       keep-going?)]
-                   [(or enum-bound-e enum-p-value)
-                    #`(check-one
-                       (ith-generator #,lang `pattern #,enum-bound-e #,enum-p-value)
-                       property att ret (and print? show) (or fix (λ (x) x)) term-match
-                       keep-going?)]
-                   [ad-hoc?
-                    #`(check-one
-                       #,(term-generator lang #'pattern 'redex-check)
-                       property att ret (and print? show) fix (and fix term-match)
-                       keep-going?)]
-                   [else
-                    #`(check-one
-                       (default-generator #,lang `pattern)
-                       property att ret (and print? show) (or fix (λ (x) x)) term-match
-                       keep-going?)])])))))))
-
-(define (default-generator lang pat)
-  (define ad-hoc-generator ((compile lang 'redex-check) pat))
-  (define enum (pat-enumerator (compiled-lang-enum-table lang) pat))
-  (cond
-    [enum
-     (define in-bounds (if (= +inf.0 (enum-size enum))
-                           (λ (x) x)
-                           (λ (x) (modulo x (enum-size enum)))))
-     (define start-time (current-inexact-milliseconds))
-     (define interleave-start-attempt #f)
-     (define interleave-time (+ start-time (* 1000 10))) ;; 10 seconds later
-     (define pure-random-start-attempt #f)
-     (define pure-random-time (+ start-time (* 1000 60 10))) ;; 10 minutes later
-     (λ (_size _attempt _retries)
-       (define now (current-inexact-milliseconds))
-       (cond
-         [(<= now interleave-time)
-          (values (enum-ith enum (in-bounds (- _attempt 1))) 'ignored)]
-         [(<= now pure-random-time)
-          (unless interleave-start-attempt (set! interleave-start-attempt _attempt))
-          (define interleave-attempt (- _attempt interleave-start-attempt))
-          (cond
-            [(odd? interleave-attempt) 
-             (ad-hoc-generator _size (/ (- interleave-attempt 1) 2) _retries)]
-            [else
-             (define enum-id (in-bounds (+ interleave-start-attempt (/ interleave-attempt 2) -1)))
-             (values (enum-ith enum enum-id) 'ignored)])]
-         [else
-          (unless pure-random-start-attempt (set! pure-random-start-attempt _attempt))
-          (ad-hoc-generator _size
-                            (+ (- _attempt pure-random-start-attempt)
-                               (quotient (- pure-random-start-attempt pure-random-start-attempt)
-                                         2))
-                            _retries)]))]
-    [else
-     ad-hoc-generator]))
-
-(define (ith-generator lang pat enum-bound enum-p-value)
-  (define enum-lang (compiled-lang-enum-table lang))
-  (define enum (pat-enumerator enum-lang pat))
-  (unless enum (error 'redex-check "cannot enumerate the pattern ~s" pat))
-  (define the-size (enum-size enum))
-  (cond
-    [enum-bound
-     (define bound (if (equal? the-size +inf.0)
-                       enum-bound
-                       (min enum-bound the-size)))
-     (λ (_size _attempt _retries)
-       (values (enum-ith enum (random-natural bound))
-               'ignored))]
-    [else
-     (cond
-       [(equal? the-size +inf.0)
-        (λ (_size _attempt _retries)
-          (values (enum-ith enum (pick-an-index enum-p-value))
-                  'ignored))]
-       [else
-        (λ (_size _attempt _retries)
-          (values (enum-ith enum (random-natural the-size))
-                  'ignored))])]))
-
-(define (in-order-generator lang pat)
-  (define enum-lang (compiled-lang-enum-table lang))
-  (define enum (pat-enumerator enum-lang pat))
-  (unless enum (error 'redex-check "cannot enumerate the pattern ~s" pat))
-  (define the-size (enum-size enum))
-  (λ (_size _attempt _retries)
-    (values (enum-ith enum (if (= +inf.0 the-size)
-                               (- _attempt 1)
-                               (modulo (- _attempt 1) the-size)))
-            'ignored)))
-
-;; pick-an-index : ([0,1] -> Nat) ∩ (-> Nat)
-(define (pick-an-index [prob-of-zero 0.01])
-  (max (random-natural/no-mean prob-of-zero)
-       (random-natural/no-mean prob-of-zero)
-       (random-natural/no-mean prob-of-zero)))
-
-;; random-natural/no-mean : [0,1] -> Nat
-(define (random-natural/no-mean prob-of-zero)
-  (define x (sample (geometric-dist prob-of-zero)))
-  (define m1 (expt 2 (exact-floor x)))
-  (define m0 (quotient m1 2))
-  (random-integer m0 m1))
-
-(define-for-syntax (parse-redex-check-kw-args kw-args orig-stx form-name)
-  (apply values
-         (parse-kw-args (list attempts-keyword
-                              source-keyword
-                              retries-keyword
-                              print?-keyword
-                              attempt-size-keyword
-                              (prepare-keyword #f)
-                              keep-going-keyword)
-                        kw-args
-                        orig-stx
-                        (syntax-e form-name))))
-
-(define (format-attempts a)
-  (format "~a attempt~a" a (if (= 1 a) "" "s")))
-
-(define (check-one generator property attempts retries show term-fix term-match keep-going?)
-  (define c (check generator property attempts retries show keep-going?
-                   #:term-fix term-fix
-                   #:term-match term-match))
-  (cond 
-    [(counterexample? c)
-     (unless show c)] ; check printed it
-    [show
-     (show (format "no counterexamples in ~a\n"
-                   (format-attempts attempts)))]
-    [else
-     #t]))
-
-(define-struct (exn:fail:redex:test exn:fail:redex) (source term))
-(define-struct counterexample (term) #:transparent)
-
-(define-struct term-prop (pred))
-(define-struct bind-prop (pred))
-
-(define (check generator property attempts retries show keep-going?
-               #:source [source #f]
-               #:term-fix [term-fix #f]
-               #:term-match [term-match #f]
-               #:skip-term? [skip-term? (λ (x) #f)])
-  (let loop ([remaining attempts])
-    (cond 
-      [(zero? remaining)
-       #t]
-      [else
-       (define attempt (add1 (- attempts remaining)))
-       (define-values (raw-term bindings) (generator ((attempt->size) attempt) attempt retries))
-       (cond
-         [(gen-fail? raw-term)
-          (loop (sub1 remaining))]
-         [else
-          (define handler 
-            (λ (action term)
-              (λ (exn)
-                (define msg (format "~a ~s raises an exception" action term))
-                (when show (show (format "~a\n" msg)))
-                (raise 
-                 (if show
-                     exn
-                     (make-exn:fail:redex:test
-                      (format "~a:\n~a" msg (exn-message exn))
-                      (current-continuation-marks)
-                      exn
-                      term))))))
-          (define term (with-handlers ([exn:fail? (handler "fixing" raw-term)])
-                         (if term-fix (term-fix raw-term) raw-term)))
-          (cond
-            [(skip-term? term) (loop (- remaining 1))]
-            [(if term-match
-                 (let ([bindings (make-bindings 
-                                  (match-bindings
-                                   (pick-from-list (term-match term))))])
-                   (with-handlers ([exn:fail? (handler "checking" term)])
-                     (match property
-                       [(term-prop pred) (pred term)]
-                       [(bind-prop pred) (pred bindings)])))
-                 (with-handlers ([exn:fail? (handler "checking" term)])
-                   (match (cons property term-fix)
-                     [(cons (term-prop pred) _) (pred term)]
-                     [(cons (bind-prop pred) #f) (pred bindings)])))
-             (loop (sub1 remaining))]
-            [else
-             (when show
-               (show
-                (format "counterexample found after ~a~a:\n"
-                        (format-attempts attempt)
-                        (if source (format " with ~a" source) "")))
-               (pretty-write term (current-output-port)))
-             (if keep-going?
-                 (loop (sub1 remaining))
-                 (make-counterexample term))])])])))
-
-(define (check-lhs-pats lang mf/rr prop attempts retries what show term-fix keep-going?
-                        #:term-match [term-match #f])
-  (define lang-gen (compile lang what))
-  (define-values (pats srcs skip-term?)
-    (cond [(metafunc-proc? mf/rr)
-           (values (map (λ (case) ((metafunc-case-lhs+ case) lang)) 
-                        (metafunc-proc-cases mf/rr))
-                   (metafunction-srcs mf/rr)
-                   (compose not (metafunc-proc-in-dom? mf/rr)))]
-          [(reduction-relation? mf/rr)
-           (values (map (λ (rwp) ((rewrite-proc-lhs rwp) lang)) (reduction-relation-make-procs mf/rr))
-                   (reduction-relation-srcs mf/rr)
-                   (let ([pat (compile-pattern (reduction-relation-lang mf/rr)
-                                               (reduction-relation-domain-pat mf/rr)
-                                               #f)])
-                     (λ (x) (not (match-pattern? pat x)))))]))
-  
-  (let loop ([pats pats] [srcs srcs])
-    (if (and (null? pats) (null? srcs))
-        (if show
-            (show
-             (format "no counterexamples in ~a (with each clause)\n"
-                     (format-attempts attempts)))
-            #t)
-        (let ([c (with-handlers ([exn:fail:redex:generation-failure?
-                                  ; Produce an error message that blames the LHS as a whole.
-                                  (λ (_)
-                                    (raise-gen-fail what (format "LHS of ~a" (car srcs)) retries))])
-                   (check
-                    (lang-gen (car pats))
-                    prop
-                    attempts
-                    retries
-                    show
-                    keep-going?
-                    #:skip-term? skip-term?
-                    #:source (car srcs)
-                    #:term-match term-match
-                    #:term-fix term-fix))])
-          (if (and (not keep-going?) (counterexample? c))
-              (unless show c)
-              (loop (cdr pats) (cdr srcs)))))))
-
-(define-syntax (check-metafunction stx)
-  (syntax-case stx ()
-    [(form name property . kw-args)
-     (let-values ([(attempts retries print? size fix keep-going?)
-                   (apply values
-                          (parse-kw-args (list attempts-keyword
-                                               retries-keyword
-                                               print?-keyword
-                                               attempt-size-keyword
-                                               (prepare-keyword #t)
-                                               keep-going-keyword)
-                                         (syntax kw-args)
-                                         stx
-                                         (syntax-e #'form)))]
-                  [(m) (metafunc/err #'name stx)])
-       (quasisyntax/loc stx
-         (parameterize ([attempt->size #,size])
-           (let ([att #,attempts]
-                 [ret #,retries]
-                 [fix #,fix])
-             (check-lhs-pats 
-              (metafunc-proc-lang #,m)
-              #,m
-              (term-prop #,(apply-contract #'(-> (listof any/c) any) #'property #f (syntax-e #'form)))
-              att
-              ret
-              'check-metafunction
-              (and #,print? #,(show-message stx))
-              fix
-              #,keep-going?)))))]))
-
-(define (reduction-relation-srcs r)
-  (map (λ (proc) (or (rewrite-proc-name proc)
-                     (format "clause at ~a" (rewrite-proc-lhs-src proc))))
-       (reduction-relation-make-procs r)))
-
-(define (metafunction-srcs m)
-  (map (λ (x) (format "clause at ~a" (metafunc-case-src-loc x)))
-       (metafunc-proc-cases m)))
-
-(define-syntax (check-reduction-relation stx)
-  (syntax-case stx ()
-    [(form relation property . kw-args)
-     (let-values ([(attempts retries print? size fix keep-going?)
-                   (apply values
-                          (parse-kw-args (list attempts-keyword
-                                               retries-keyword
-                                               print?-keyword
-                                               attempt-size-keyword
-                                               (prepare-keyword #f)
-                                               keep-going-keyword)
-                                         (syntax kw-args)
-                                         stx
-                                         (syntax-e #'form)))])
-       (quasisyntax/loc stx
-         (parameterize ([attempt->size #,size])
-           (let ([att #,attempts]
-                 [ret #,retries]
-                 [rel #,(apply-contract #'reduction-relation? #'relation #f (syntax-e #'form))]
-                 [fix #,fix]
-                 [keep-going? #,keep-going?])
-             (check-lhs-pats
-              (reduction-relation-lang rel)
-              rel
-              (term-prop #,(apply-contract #'(-> any/c any) #'property #f (syntax-e #'form)))
-              att
-              ret
-              'check-reduction-relation
-              (and #,print? #,(show-message stx))
-              fix
-              keep-going?)))))]))
-
-(define-syntax (generate-term stx)
-  (let ([l (cdr (syntax->list stx))])
-    (for ([x (in-list l)])
-      (define k (syntax-e x))
-      (when (keyword? k)
-        (unless (member k '(#:satisfying #:source #:attempt-num #:retries #:i-th))
-          (raise-syntax-error 'generate-term "unknown keyword" stx x)))))
-  
-  (define (parse-keyword-args args)
-    (define attempt-num #f)
-    (define retries #f)
-    
-    (let loop ([args args])
-      (syntax-case args ()
-        [() 
-         (values (or attempt-num #'1)
-                 (or retries #'100))]
-        [(#:attempt-num attempt-num-expr . rest)
-         (let ()
-           (when attempt-num
-             (raise-syntax-error 'generate-term 
-                                 "found multiple #:attempt-num keywords"
-                                 stx
-                                 (stx-car args)))
-           (set! attempt-num #'(check-keyword-arg attempt-num-expr))
-           (loop #'rest))]
-        [(#:retries retries-expr . rest)
-         (let ()
-           (when retries
-             (raise-syntax-error 'generate-term 
-                                 "found multiple #:retries keywords"
-                                 stx
-                                 (stx-car args)))
-           (set! retries #'(check-keyword-arg retries-expr))
-           (loop #'rest))]
-        [(x . y)
-         (raise-syntax-error 'generate-term
-                             "illegal syntax; expected #:attempt-num and #:retries keywords arguments"
-                             #'x
-                             stx)])))
-  
-  (define (check-size exp)
-    (when (keyword? (syntax-e exp))
-      (raise-syntax-error 'generate-term 
-                          "expected a size expression"
-                          stx
-                          exp)))
-  
-  #`(#%expression
-     #,(syntax-case stx (=)
-         [(_ lang pat #:i-th i-expr)
-          #'(generate-term/ith lang pat i-expr)]
-         [(_ lang pat #:i-th)
-          #'(generate-term/ith lang pat)]
-         [(_ language #:satisfying (mf-id . args) = res)
-          #'(generate-term/mf language (mf-id . args) res)]
-         [(_ language #:satisfying (mf-id . mf-args) = res size)
-          #'(generate-term/mf language (mf-id . mf-args) res size)]
-         [(_ language #:satisfying (jf-id . jf-args))
-          #`(generate-term/jf language (jf-id . jf-args))]
-         [(_ language #:satisfying (jf-id . jf-args) size)
-          #`(generate-term/jf language (jf-id . jf-args) size)]
-         [(_ #:source metafunction/relation size . args)
-          (let ()
-            (check-size #'size)
-            (define-values (attempt-num retries-expr) (parse-keyword-args #'args))
-            #`(generate-term/source metafunction/relation size #,attempt-num #,retries-expr))]
-         [(_ #:source metafunction/relation)
-          #`(generate-term/source metafunction/relation)]
-         [(_ lang pat size . args)
-          (let ()
-            (check-size #'size)
-            (define-values (attempt-num retries-expr) (parse-keyword-args #'args))
-            #`(generate-term/lang-pat lang pat size #,attempt-num #,retries-expr))]
-         [(_ lang pat)
-          #`(generate-term/lang-pat lang pat)])))
-
-(define (check-keyword-arg expr)
-  (unless (exact-nonnegative-integer? expr)
-    (raise-argument-error 'generate-term
-                          "natural number"
-                          expr))
-  expr)
-
-(define-syntax (generate-term/ith stx)
-  (syntax-case stx ()
-    [(_ lang pat . rest)
-     (with-syntax ([(syncheck-exp pattern (vars ...) (vars/ellipses ...)) 
-                    (rewrite-side-conditions/check-errs 
-                     #'lang
-                     'generate-term #t #'pat)])
-       (define fn-stx #'(begin syncheck-exp (generate-ith/proc lang `pattern)))
-       (syntax-case #'rest ()
-         [() fn-stx]
-         [(i-expr) #`(#,fn-stx i-expr)]))]))
-
-(define (generate-ith/proc lang pat)
-  (define enum-lang (compiled-lang-enum-table lang))
-  (define enum (pat-enumerator enum-lang pat))
-  (unless enum (error 'generate-term "cannot enumerate ~s" pat))
-  (define the-size (enum-size enum))
-  (λ (i)
-    (unless (exact-nonnegative-integer? i)
-      (raise-argument-error 'generate-term
-                            "exact-nonnegative-integer?"
-                            i))
-    (enum-ith enum (if (equal? the-size +inf.0)
-                       i
-                       (modulo i the-size)))))
-
-(define-syntax (generate-term/mf stx)
-  (syntax-case stx ()
-    [(_ language (mf-id . args) res . size-maybe)
-     (let ()
-       (language-id-nts #'language 'generate-term) ;; for the error side-effect
-       (define m (metafunc #'mf-id))
-       (unless m (raise-syntax-error 'generate-term "expected a metafuction" #'mf-id))
-       (define (body-code size)
-         #`(generate-mf-pat language (mf-id . args) res #,size))
-       (syntax-case #'size-maybe ()
-         [() #`(λ (size) #,(body-code #'size))]
-         [(size) (body-code #'size)]))]))
-
-(define-syntax (generate-term/jf stx)
-  (syntax-case stx ()
-    [(_ language (jf-id . args) . size-maybe)
-     (let ()
-       (language-id-nts #'language 'generate-term) ;; for the error side-effect
-       (unless (judgment-form-id? #'jf-id)
-         (raise-syntax-error 'generate-term "expected a judgment-form" #'jf-id))
-       (syntax-case #'size-maybe ()
-         [() #`(λ (size) (generate-jf-pat language (jf-id . args) size))]
-         [(size) #'(generate-jf-pat language (jf-id . args) size)]))]))
-
-(define-syntax (generate-term/source stx)
-  (syntax-case stx ()
-    [(_ mf/rel . size+args-maybe)
-     (let ()
-       (define generator-stx
-         (cond
-           [(metafunc #'mf/rel)
-            => (λ (f)
-                 #`(make-generate-term/source/mf-generator 'mf/rel #,f))]
-           [else
-            #`(make-generate-term/source/rr-generator
-               #,(apply-contract #'reduction-relation? #'mf/rel
-                                 "#:source argument" 'generate-term))]))
-       (syntax-case #'size+args-maybe ()
-         [() generator-stx]
-         [(size attempt-num retries-expr)
-          #`(#,generator-stx size #:attempt-num attempt-num #:retries retries-expr)]))]))
-
-(define (make-generate-term/source/mf-generator name f)
-  (make-generator
-   (let* ([L (metafunc-proc-lang f)]
-          [compile-pat (compile L 'generate-term)]
-          [cases (metafunc-proc-cases f)])
-     (check-cases name cases)
-     (map (λ (c) (compile-pat ((metafunc-case-lhs+ c) L))) 
-          cases))
-   'generate-term))
-
-(define (make-generate-term/source/rr-generator r)
-  (unless (reduction-relation? r)
-    (raise-argument-error 'generate-term "reduction-relation?" r))
-  (make-generator
-   (let* ([L (reduction-relation-lang r)]
-          [compile-pat (compile L 'orig-name)])
-     (map (λ (p) (compile-pat ((rewrite-proc-lhs p) L)))
-          (reduction-relation-make-procs r)))
-   'generate-term))
-
-(define-syntax (generate-term/lang-pat stx)
-  (syntax-case stx ()
-    [(_ lang pat . rest)
-     (with-syntax ([(syncheck-exp pattern (vars ...) (vars/ellipses ...)) 
-                    (rewrite-side-conditions/check-errs 
-                     #'lang
-                     'generate-term
-                     #t #'pat)])
-       (define generator-exp
-         #`(begin syncheck-exp 
-                  (generate-term/lang-pat/proc 
-                   #,(term-generator #'lang #'pattern 'generate-term))))
-       (syntax-case #'rest ()
-         [() generator-exp]
-         [(size attempt-num retries-expr)
-          #`(#,generator-exp size #:attempt-num attempt-num #:retries retries-expr)]))]))
-
-(define (generate-term/lang-pat/proc tg) (make-generator (list tg) 'generate-term))
-
-(define (check-cases name cases)
-  (when (null? cases)
-    (raise-gen-fail 'generate-term (format "from ~a metafunction (it has no clauses)" name) 1)))
-
-(define-syntax (generate-mf-pat stx)
-  (syntax-case stx ()
-    [(g-m-p lang-id (mf-name . lhs-pats) rhs-pat size)
-     #`(parameterize ([unsupported-pat-err-name 'generate-term])
-         ((make-redex-generator lang-id (mf-name . lhs-pats) = rhs-pat size)))]))
-
-(define-syntax (generate-jf-pat stx)
-  (syntax-case stx ()
-    [(g-j-p lang-id (jf-name . pat-raw) size)
-     #`(parameterize ([unsupported-pat-err-name 'generate-term])
-         ((make-redex-generator lang-id (jf-name . pat-raw) size)))]))
-
-(define-syntax (redex-generator stx)
-  (syntax-case stx ()
-    [(form-name args ...)
-     #`(#%expression (make-redex-generator args ...))]))
-
-(define-syntax (make-redex-generator stx)
-  (syntax-case stx ()
-    [(_ lang-id (jf/mf-id . args) . rest)
-     (cond
-       [(judgment-form-id? #'jf/mf-id)
-        (syntax-case #'rest ()
-          [(size)
-           (let* ([j-f (lookup-judgment-form-id #'jf/mf-id)]
-                  [clauses (judgment-form-gen-clauses j-f)]
-                  [nts (definition-nts #'lang-id stx 'redex-generator)]
-                  [relation? (judgment-form-relation? j-f)]
-                  [args-stx (if relation?
-                                (syntax/loc #'args (args))
-                                #'args)]) 
-             (with-syntax ([(syncheck-exp pat (names ...) (names/ellipses ...))
-                            (rewrite-side-conditions/check-errs #'lang-id 'redex-generator #t args-stx)])
-               #`(begin
-                   syncheck-exp
-                   #,(if relation?
-                         #`(let ([gen-proc (make-jf-gen/proc 'jf/mf-id #,clauses lang-id 'pat size)])
-                             (λ ()
-                               (match (gen-proc)
-                                 [`(,jf-name (,trms (... ...)))
-                                  `(,jf-name ,@trms)]
-                                 [#f #f])))
-                         #`(make-jf-gen/proc 'jf/mf-id #,clauses lang-id 'pat size)))))]
-          [_
-           (raise-syntax-error 'redex-generator 
-                               "expected an integer depth bound"
-                               stx
-                               #'rest)])]
-       [(metafunc #'jf/mf-id)
-        (syntax-case #'rest ()
-          [(= res size)
-           (and (identifier? #'=)
-                (equal? '= (syntax->datum #'=)))
-           (let ()
-             (define mf (syntax-local-value #'jf/mf-id (λ () #f)))
-             (define nts (definition-nts #'lang-id stx 'redex-generator))
-             (with-syntax ([(lhs-syncheck-exp lhs-pat (lhs-names ...) (lhs-names/ellipses ...))
-                            (rewrite-side-conditions/check-errs #'lang-id (syntax-e #'g-m-p) #t #'args)]
-                           [(rhs-syncheck-exp rhs-pat (rhs-names ...) (rhs-names/ellipses ...))
-                            (rewrite-side-conditions/check-errs #'lang-id (syntax-e #'g-m-p) #t #'res)]
-                           [mf-id (term-fn-get-id mf)])
-               #`(begin lhs-syncheck-exp rhs-syncheck-exp (make-mf-gen/proc 'mf-id mf-id lang-id 'lhs-pat 'rhs-pat size))))]
-          [_
-           (raise-syntax-error 'redex-generator 
-                               "expected \"=\" followed by a result pattern and an integer depth bound"
-                               stx
-                               #'rest)])]
-       [else
-        (raise-syntax-error 'redex-generator
-                            "expected either a metafunction or a judgment-form identifier"
-                            stx
-                            #'jf/mf-id)])]
-    [(_ not-lang-id . rest)
-     (not (identifier? #'not-lang-id))
-     (raise-syntax-error 'redex-generator
-                         "expected an identifier in the language position"
-                         stx
-                         #'not-lang-id)]))
-
-(define (make-jf-gen/proc jf-id mk-clauses lang pat size)
-  (define gen (search/next (mk-clauses) pat size lang))
-  (define (termify search-res)
-    (cond
-      [(not-failed? search-res)
-       (define exp (pat->term lang (p*e-p search-res) (p*e-e search-res)))
-       (and (not-failed? exp)
-            (cons jf-id exp))]
-      [else #f]))
-  (λ ()
-    (parameterize ([current-logger generation-logger])
-      (termify (gen)))))
-
-(define (make-mf-gen/proc fn metafunc-proc lang lhs-pat rhs-pat size)
-  (define gen (search/next ((metafunc-proc-gen-clauses metafunc-proc))
-                           `(list ,lhs-pat ,rhs-pat)
-                           size
-                           lang))
-  (define (termify res)
-    (and (not-failed? res)
-         (match res
-           [(p*e lhs+rhs env)
-            (define lhs+rhs-term (pat->term lang lhs+rhs env))
-            (and (not-failed? lhs+rhs-term)
-                 (match lhs+rhs-term
-                   [(list lhs-term rhs-term)
-                    `((,fn ,@lhs-term) = ,rhs-term)]))])))
-  (λ ()
-    (parameterize ([current-logger generation-logger])
-      (termify (gen)))))
-
-(provide redex-check
-         generate-term
-         check-reduction-relation
-         check-metafunction
-         enable-gen-trace!
-         disable-gen-trace!
-         last-gen-trace
-         get-most-recent-trace
-         update-gen-trace!
-         exn:fail:redex:generation-failure?
-         redex-generator
-         (struct-out counterexample)
-         (struct-out exn:fail:redex:test)
-         pick-an-index
-         depth-dependent-order?)
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/jdg-gen.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/jdg-gen.rkt
deleted file mode 100644
index 5f716276f9..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/jdg-gen.rkt
+++ /dev/null
@@ -1,209 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         racket/set
-         (only-in "rg.rkt"
-                  [compile rg:compile])
-         (only-in "reduction-semantics.rkt"
-                  do-test-match)
-         "pat-unify.rkt"
-         (only-in "fresh.rkt" variable-not-in)
-         (for-syntax racket/base))
-
-(provide pat->term
-         check-dq
-         dq)
-
-(struct ok ())
-
-
-;; term generation
-
-;; pat->term lang pat* env env -> term
-(define (pat->term lang pat full-env [term-e (make-hash)])
-  (define nt-matchers (make-hash))
-  (define eqs (env-eqs full-env))
-  (define (get-matcher nt)
-    (hash-ref nt-matchers nt
-              (λ () (let ([mtchr (do-test-match lang `(nt ,nt) '() 'pat->term #t)])
-                      (hash-set! nt-matchers nt mtchr)
-                      mtchr))))
-  (define (ground-or-ok p)
-    (let/ec okk
-      (let recur ([p p])
-        (match p
-          [(lvar id)
-           ;; careful! term-e has terms, eqs has pats!
-           (hash-ref term-e p
-              (λ () (recur (hash-ref eqs p))))]
-          [`(name ,id ,(bound))
-           (hash-ref term-e (lvar id)
-              (λ () (recur (hash-ref eqs (lvar id)))))]
-          [`(list ,ps ...)
-           `(,@(for/list ([p ps]) (recur p)))]
-          [`(cstr (,nts ...) ,p)
-           (recur p)]
-         [`(variable-not-in ,not-in-p ,sym)
-          (recur not-in-p)]
-          [`(nt ,_)
-           (okk (ok))]
-          [(? predef-pat? _)
-           (okk (ok))]
-          [_ p]))))
-  ;; do this first since the term environment (term-e) is needed for the dqs
-  (define res-term
-    (let recur ([p pat])
-      (match p
-        [`(name ,var ,(bound))
-         (define-values (rep-lvar pat) (lookup var eqs))
-         (call/ec (λ (fail)
-                    (hash-ref term-e rep-lvar
-                              (λ () (let ([t (recur pat)])
-                                      (unless (not-failed? t) (fail (unif-fail)))
-                                      (hash-set! term-e rep-lvar t)
-                                      t)))))]
-        [`(cstr (,nts ...) ,pat)
-         (match pat
-           [`(nt ,p-nt)
-            (define all-nts (cons p-nt nts))
-            (for/not-failed ([nt-pat all-nts])
-                            (define term (recur `(nt ,nt-pat)))
-                            (and/fail (for/and ([nt (remove nt-pat all-nts)])
-                                        ((get-matcher nt) term))
-                                      term))]
-           [`any
-            (for/not-failed ([nt-pat nts])
-                            (define term (recur `(nt ,nt-pat)))
-                            (and/fail (for/and ([nt (remove nt-pat nts)])
-                                        ((get-matcher nt) term))
-                                      term))]
-           [_
-            (define term (recur pat))
-            (and/fail (for/and ([nt nts])
-                        ((get-matcher nt) term))
-                      term)])]
-        [`(name ,var ,pat)
-         (error 'make-term "can't instantiate a term with an unbound variable: ~s" p)]
-        [`(list ,ps ...)
-         (call/ec (λ (fail)
-                    (for/list ([p ps])
-                      (let ([res (recur p)])
-                        (unless (not-failed? res) (fail (unif-fail)))
-                        res))))]
-        [`(variable-not-in ,not-in-p ,sym)
-         (variable-not-in (recur not-in-p) sym)]
-        [_
-         (make-term p lang)])))
-  (and/fail 
-   (not-failed? res-term)
-   (for/and ([(k v) (in-hash eqs)])
-     (match v
-       [`(cstr (,nts ...) ,p)
-        (define grook (ground-or-ok p))
-        (or (ok? grook)
-            (for/and ([nt nts])
-              ((get-matcher nt) grook)))]
-       [_ #t]))
-   (check-dqs (remove-empty-dqs (env-dqs full-env)) term-e lang eqs)
-   res-term))
-
-(define-syntax-rule (for/not-failed ((x xs)) b ...)
-  (for/fold ([res (unif-fail)])
-    ([x xs])
-    #:break (not-failed? res)
-    b ...))
-
-(define (make-term p lang)
-  (let-values ([(p bs) (gen-term p lang 2)])
-    p))   
-
-(define (check-dqs dqs term-e lang eqs)
-  (for/and ([dq dqs])
-    (define te (hash-copy term-e))
-    (check-dq dq te lang eqs)))
-
-(struct not-ground ())
-
-(define (check-dq the-dq term-e lang eqs)
-  (match-define (dq ps `(,lhs ,rhs)) the-dq)
-  (define rhs-term (pat->term/term-e ps rhs term-e eqs lang))
-  (define lhs-term (pat->term/term-e ps lhs term-e eqs lang))
-  (not (compare-partial-terms rhs-term lhs-term)))
-  
-(define (pat->term/term-e ps t term-e actual-e lang)
-  (call/ec
-   (λ (fail)
-     (let recur ([p t])
-       (match p
-         [`(name ,var ,(bound))
-          (cond
-            [(member var ps)
-             `(name ,var ,(bound))]
-            [(hash-has-key? term-e (lvar var))
-             (recur (hash-ref term-e (lvar var)))]
-            [else
-             (let ([new-val (recur (hash-ref actual-e (lvar var)))])
-               (hash-set! term-e (lvar var) new-val)
-               new-val)])]
-         [`(cstr  (,nts ...) ,pat)
-          (recur pat)]
-         [`(list ,ps ...)
-          (for/list ([p ps]) (recur p))]
-         [`(nt ,_)
-          (fail (not-ground))]
-         [`(,stuff ...) ;; here it's a fully instanatiated list
-          `(,@stuff)]
-         [_
-          (let-values ([(p bs) (gen-term p lang 2)])
-           p)])))))
-
-(define (compare-partial-terms l r)
-  (define param-vals (hash))
-  (define (update-param-vals p v)
-    (set! param-vals
-          (hash-set param-vals p
-              (set-add (hash-ref param-vals p (λ () (set))) v))))
-  (and
-   (let recur ([l l]
-               [r r])
-     (match* (l r)
-       [(`(name ,lv ,(bound)) `(name ,rv ,(bound)))
-        (update-param-vals lv r)
-        (update-param-vals rv l)
-        #t]
-       [(`(name ,lv ,(bound)) _)
-        (update-param-vals lv r)
-        #t]
-       [(_ `(name ,rv ,(bound)))
-        (update-param-vals rv l)
-        #t]
-       [(`(,l-ts ...) `(,r-ts ...))
-        (and (= (length l-ts) (length r-ts))
-             (for/and ([lt l-ts]
-                       [rt r-ts])
-               (recur lt rt)))]
-       [(_ _)
-        (equal? l r)]))
-   ;; TODO: handle case where param appears twice against different stuff
-   (for/and ([vs (in-list (hash-values param-vals))])
-     ((set-count vs) . < . 2))))
-                   
-
-(define (gen-term pat lang size [num-atts 1] [retries 100])
-  (((rg:compile lang 'what) pat) size num-atts retries))
-
-(define (lookup-pat id env)
-  (define-values (_ pat) (lookup id env))
-  pat)
-
-(define (lookup-rep id env)
-  (define-values (rep _) (lookup id env))
-  rep)
-
-(define (lookup id env)
-  (define res (hash-ref env (lvar id)))
-  (match res
-    [(lvar new-id)
-     (lookup new-id env)]
-    [_
-     (values (lvar id) res)]))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/judgment-form.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/judgment-form.rkt
deleted file mode 100644
index e24b972e12..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/judgment-form.rkt
+++ /dev/null
@@ -1,1666 +0,0 @@
-#lang racket/base
-
-(require "matcher.rkt"
-         "term.rkt"
-         "fresh.rkt"
-         "error.rkt"
-         "search.rkt"
-         racket/trace
-         racket/list
-         racket/stxparam
-         "term-fn.rkt"
-         "rewrite-side-conditions.rkt"
-         (only-in "pat-unify.rkt"
-                  unsupported-pat-err-name
-                  unsupported-pat-err))
-
-(require
- (for-syntax "rewrite-side-conditions.rkt"
-             "term.rkt"
-             "term-fn.rkt"
-             "loc-wrapper-ct.rkt"
-             racket/stxparam-exptime
-             racket/base
-             racket/syntax
-             syntax/id-table
-             racket/list
-             syntax/parse
-             syntax/stx))
-
-(require
- (for-template "term.rkt"))
-
-(struct derivation (term name subs) 
-  #:transparent
-  #:guard (λ (term name subs struct-name)
-            (unless (or (not name) (string? name))
-              (raise-argument-error struct-name "(or/c string? #f)" 1 term name subs))
-            (unless (and (list? subs)
-                         (andmap derivation? subs))
-              (raise-argument-error struct-name "derivation?" 2 term name subs))
-            (values term name subs)))
-
-;; structs that hold intermediate results when building a derivation
-(struct derivation-subs-acc (subs-so-far this-output) #:transparent)
-(struct derivation-with-output-only (output name subs) #:transparent)
-
-;; Intermediate structures recording clause "extras" for typesetting.
-(define-struct metafunc-extra-side-cond (expr))
-(define-struct metafunc-extra-where (lhs rhs))
-(define-struct metafunc-extra-fresh (vars))
-
-(begin-for-syntax
-  ;; pre: (judgment-form-id? stx) holds
-  (define (lookup-judgment-form-id stx)
-    (define jf-pe (judgment-form-pending-expansion))
-    (if (and jf-pe
-             (free-identifier=? (car jf-pe) stx))
-        (cdr jf-pe)
-        (syntax-local-value stx)))
-  (define judgment-form-pending-expansion (make-parameter #f)))
-
-(define-for-syntax (prune-syntax stx)
-  (datum->syntax
-   (identifier-prune-lexical-context #'whatever '(#%app #%datum))
-   (let loop ([stx stx])
-     (syntax-case stx ()
-       [(a . b)
-        (datum->syntax (identifier-prune-lexical-context #'whatever '(#%app))
-                       (cons (loop #'a) (loop #'b))
-                       stx
-                       stx)]
-       [x 
-        (identifier? #'x)
-        (identifier-prune-lexical-context #'x (list (syntax-e #'x) '#%top))]
-       [() (datum->syntax #f '() stx)]
-       [_ (datum->syntax (identifier-prune-lexical-context #'whatever '(#%datum))
-                         (syntax->datum stx)
-                         stx
-                         stx)]))))
-
-(define-syntax (--> stx) (raise-syntax-error '--> "used outside of reduction-relation"))
-(define-syntax (fresh stx) (raise-syntax-error 'fresh "used outside of reduction-relation"))
-(define-syntax (with stx) (raise-syntax-error 'with "used outside of reduction-relation"))
-
-(module mode-utils racket/base
-  
-  (require racket/list)
-  
-  (provide split-by-mode
-           assemble)
-  
-  (define (split-by-mode xs mode)
-    (for/fold ([ins '()] [outs '()])
-      ([x (reverse xs)]
-       [m (reverse mode)])
-      (case m
-        [(I) (values (cons x ins) outs)]
-        [(O) (values ins (cons x outs))]
-        [else (error 'split-by-mode "ack ~s" m)])))
-  
-  (define (assemble mode inputs outputs)
-    (let loop ([ms mode] [is inputs] [os outputs])
-      (if (null? ms)
-          '()
-          (case (car ms)
-            [(I) (cons (car is) (loop (cdr ms) (cdr is) os))]
-            [(O) (cons (car os) (loop (cdr ms) is (cdr os)))])))))
-
-(require 'mode-utils
-         (for-syntax 'mode-utils))
-
-(define-for-syntax (generate-binding-constraints names names/ellipses bindings syn-err-name)
-  (define (id/depth stx)
-    (syntax-case stx ()
-      [(s (... ...))
-       (let ([r (id/depth #'s)])
-         (make-id/depth (id/depth-id r) (add1 (id/depth-depth r))))]
-      [s (make-id/depth #'s 0)]))
-  (define temporaries (generate-temporaries names))
-  (values
-   (for/fold ([cs '()])
-     ([n names]
-      [w/e names/ellipses]
-      [x temporaries])
-     (cond [(hash-ref bindings (syntax-e n) #f)
-            => (λ (b) 
-                 (let ([b-id/depth (id/depth b)]
-                       [n-id/depth (id/depth w/e)])
-                   (if (= (id/depth-depth b-id/depth) (id/depth-depth n-id/depth))
-                       (cons #`(equal? #,x (term #,b)) cs)
-                       (raise-ellipsis-depth-error
-                        syn-err-name
-                        (id/depth-id n-id/depth) (id/depth-depth n-id/depth)
-                        (id/depth-id b-id/depth) (id/depth-depth b-id/depth)))))]
-           [else cs]))
-   temporaries
-   (for/fold ([extended bindings])
-     ([name names] 
-      [w/ellipses names/ellipses])
-     (hash-set extended (syntax-e name) w/ellipses))))
-
-;; the withs, freshs, and side-conditions come in backwards order
-;; rt-lang is an identifier that will be bound to a (runtime) language,
-;;   not necc bound via define-language. 
-;; ct-lang is an identifier  guaranteed to be bound by define-language
-;;   that can be used to call rewrite-side-conditions/check-errs, but
-;;   some extension of that language may end up being bound to rt-lang
-(define-for-syntax (bind-withs orig-name main rt-lang lang-nts ct-lang stx
-                               where-mode body names w/ellipses
-                               side-condition-unquoted? jf-results-id)
-  (with-disappeared-uses
-   (let loop ([stx stx]
-              [to-not-be-in main]
-              [env (make-immutable-hash
-                    (map (λ (x e) (cons (syntax-e x) e))
-                         names w/ellipses))])
-     (syntax-case stx (fresh judgment-holds)
-       [() body]
-       [((-where x e) y ...)
-        (where-keyword? #'-where)
-        (let ()
-          (with-syntax ([(syncheck-exp side-conditions-rewritten (names ...) (names/ellipses ...))
-                         (rewrite-side-conditions/check-errs
-                          ct-lang
-                          'reduction-relation
-                          #t
-                          #'x)]
-                        [lang-stx rt-lang])
-            (define-values (binding-constraints temporaries env+)
-              (generate-binding-constraints (syntax->list #'(names ...))
-                                            (syntax->list #'(names/ellipses ...))
-                                            env
-                                            orig-name))
-            (with-syntax ([(binding-constraints ...) binding-constraints]
-                          [(x ...) temporaries])
-              (define rest-body (loop #'(y ...) #`(list x ... #,to-not-be-in) env+))
-              #`(begin
-                  syncheck-exp
-                  (#,(case where-mode
-                     [(flatten)
-                      #'combine-where-results/flatten]
-                     [(predicate)
-                      #'combine-where-results/predicate]
-                     [else (error 'unknown-where-mode "~s" where-mode)])
-                 (match-pattern (compile-pattern #,rt-lang `side-conditions-rewritten #t)
-                                (term e #:lang #,ct-lang))
-                 (λ (bindings)
-                   (let ([x (lookup-binding bindings 'names)] ...)
-                     (and binding-constraints ...
-                          #,(bind-pattern-names orig-name
-                                                #'(names/ellipses ...)
-                                                #'(x ...)
-                                                rest-body)))))))))]
-       [((-side-condition s ...) y ...)
-        (side-condition-keyword? #'-side-condition)
-        (if side-condition-unquoted?
-            #`(and s ... #,(loop #'(y ...) to-not-be-in env))
-            #`(and (term s) ... #,(loop #'(y ...) to-not-be-in env)))]
-       [((fresh x) y ...)
-        (identifier? #'x)
-        #`(term-let ([x (variable-not-in #,to-not-be-in 'x)])
-                    #,(loop #'(y ...) #`(list (term x) #,to-not-be-in) env))]
-       [((fresh x name) y ...)
-        (identifier? #'x)
-        #`(term-let ([x (let ([the-name (term name)])
-                          (verify-name-ok '#,orig-name the-name)
-                          (variable-not-in #,to-not-be-in the-name))])
-                    #,(loop #'(y ...) #`(list (term x) #,to-not-be-in) env))]
-       [((fresh (y) (x ...)) z ...)
-        #`(term-let ([(y #,'...)
-                      (variables-not-in #,to-not-be-in
-                                        (map (λ (_ignore_) 'y)
-                                             (term (x ...))))])
-                    #,(loop #'(z ...) #`(list (term (y #,'...)) #,to-not-be-in) env))]
-       [((fresh (y) (x ...) names) z ...)
-        #`(term-let ([(y #,'...)
-                      (let ([the-names (term names)]
-                            [len-counter (term (x ...))])
-                        (verify-names-ok '#,orig-name the-names len-counter)
-                        (variables-not-in #,to-not-be-in the-names))])
-                    #,(loop #'(z ...) #`(list (term (y #,'...)) #,to-not-be-in) env))]
-       [((judgment-holds j) . after)
-        (loop (cons #'j #'after) to-not-be-in env)]
-       [((form-name pats ...) . after)
-        (judgment-form-id? #'form-name)
-        (let ()
-          (define premise (syntax-case stx () [(p . _) #'p]))
-          (define-values (rest-clauses under-ellipsis?)
-            (syntax-case #'after ()
-              [(maybe-ellipsis . more)
-               (ellipsis? #'maybe-ellipsis)
-               (values #'more #t)]
-              [_ (values #'after #f)]))
-          (define judgment-form (lookup-judgment-form-id #'form-name))
-          (define mode (judgment-form-mode judgment-form))
-          (define judgment-proc (judgment-form-proc judgment-form))
-          (define-values (input-template output-pre-pattern)
-            (let-values ([(in out) (split-by-mode (syntax->list #'(pats ...)) mode)])
-              (if under-ellipsis?
-                  (let ([ellipsis (syntax/loc premise (... ...))])
-                    (values #`(#,in #,ellipsis) #`(#,out #,ellipsis)))
-                  (values in out))))
-          (define-values (syncheck-exp output-pattern output-names output-names/ellipses)
-            (with-syntax ([(syncheck-exp output names names/ellipses)
-                           (rewrite-side-conditions/check-errs ct-lang orig-name #t
-                                                               output-pre-pattern)])
-              (values #'syncheck-exp
-                      #'output
-                      (syntax->list #'names)
-                      (syntax->list #'names/ellipses))))
-          (define-values (binding-constraints temporaries env+)
-            (generate-binding-constraints output-names output-names/ellipses env orig-name))
-          (define rest-body
-            (loop rest-clauses #`(list judgment-output #,to-not-be-in) env+))
-          (define call
-            (let ([input (quasisyntax/loc premise (term #,input-template #:lang #,ct-lang))])
-              (define (make-traced input)
-                (quasisyntax/loc premise
-                  (call-judgment-form 'form-name #,judgment-proc '#,mode #,input
-                                      #,(if jf-results-id #''() #f))))
-              (if under-ellipsis?
-                  #`(repeated-premise-outputs #,input (λ (x) #,(make-traced #'x)))
-                  (make-traced input))))
-          (record-disappeared-uses (list #'form-name))
-          (with-syntax ([(output-name ...) output-names]
-                        [(output-name/ellipsis ...) output-names/ellipses]
-                        [(temp ...) temporaries]
-                        [(binding-constraint ...) binding-constraints])
-            #`(begin
-                #,syncheck-exp
-                (void #,(defined-check judgment-proc "judgment form" #:external #'form-name))
-                (judgment-form-bind-withs/proc
-                 #,rt-lang
-                 `#,output-pattern
-                 #,call
-                 #,under-ellipsis?
-                 #,jf-results-id
-                 (λ (bindings #,(if jf-results-id jf-results-id '_ignored))
-                   (let ([temp (lookup-binding bindings 'output-name)] ...)
-                     (and binding-constraint ...
-                          #,(bind-pattern-names orig-name
-                                                #'(output-name/ellipsis ...)
-                                                #'(temp ...)
-                                                rest-body))))))))]))))
-
-(define (judgment-form-bind-withs/proc lang output-pattern output under-ellipsis? old-maps do-something)
-  (let ([compiled-pattern (compile-pattern lang output-pattern #t)])
-    (for/fold ([outputs '()]) ([sub-output (in-list output)])
-      (define sub-tree (if under-ellipsis?
-                           (map derivation-subs-acc-subs-so-far sub-output)
-                           (derivation-subs-acc-subs-so-far sub-output)))
-      (define term (if under-ellipsis?
-                       (map derivation-subs-acc-this-output sub-output)
-                       (derivation-subs-acc-this-output sub-output)))
-      (define mtchs (match-pattern compiled-pattern term))
-      (if mtchs
-          (for/fold ([outputs outputs]) ([mtch (in-list mtchs)])
-            (define mtch-outputs (do-something (mtch-bindings mtch) 
-                                               (and old-maps
-                                                    (if under-ellipsis?
-                                                        (append (reverse sub-tree) old-maps)
-                                                        (cons sub-tree old-maps)))))
-            (if mtch-outputs
-                (append mtch-outputs outputs)
-                outputs))
-          outputs))))
-
-(define (combine-where-results/flatten mtchs result)
-  (and mtchs
-       (for/fold ([r '()]) ([m mtchs])
-         (let ([s (result (mtch-bindings m))])
-           (if s (append s r) r)))))
-
-(define (combine-where-results/predicate mtchs result)
-  (and mtchs 
-       (for/or ([mtch mtchs])
-         (result (mtch-bindings mtch)))))
-
-(define (repeated-premise-outputs inputs premise)
-  (if (null? inputs)
-      '(())
-      (let ([output (premise (car inputs))])
-        (if (null? output)
-            '()
-            (for*/list ([o output] [os (repeated-premise-outputs (cdr inputs) premise)])
-              (cons o os))))))
-
-(define (call-judgment-form form-name form-proc mode input derivation-init)
-  (define traced (current-traced-metafunctions))
-  (define vecs
-    (if (or (eq? 'all traced) (memq form-name traced))
-        (let ([outputs #f])
-          (define spacers
-            (for/fold ([s '()]) ([m mode])
-              (case m [(I) s] [(O) (cons '_ s)])))
-          (define (wrapped . _)
-            (set! outputs (form-proc form-proc input derivation-init))
-            (for/list ([output (in-list outputs)])
-              (cons form-name (assemble mode input (derivation-with-output-only-output output)))))
-          (apply trace-call form-name wrapped (assemble mode input spacers))
-          outputs)
-        (form-proc form-proc input derivation-init)))
-  (remove-duplicates
-   (for/list ([v (in-list vecs)])
-     (define subs (derivation-with-output-only-subs v))
-     (define rulename (derivation-with-output-only-name v))
-     (define this-output (derivation-with-output-only-output v))
-     (derivation-subs-acc
-      (and subs (derivation (cons form-name (assemble mode input this-output))
-                            
-                            ;; just drop the subderivations 
-                            ;; and the name when we know we
-                            ;; won't be using them.
-                            ;; this lets the remove-duplicates
-                            ;; call just above do something 
-                            ;; and possibly avoid exponential blowup
-                            
-                            (if (include-entire-derivation)
-                                rulename
-                                "")
-                            (if (include-entire-derivation)
-                                (reverse subs)
-                                '())))
-      this-output))))
-
-(define include-entire-derivation (make-parameter #f))
-
-(define (verify-name-ok orig-name the-name)
-  (unless (symbol? the-name)
-    (error orig-name "expected a single name, got ~s" the-name)))
-
-(define (verify-names-ok orig-name the-names len-counter)
-  (unless (and (list? the-names)
-               (andmap symbol? the-names))
-    (error orig-name
-           "expected a sequence of names, got ~s"
-           the-names))
-  (unless (= (length len-counter)
-             (length the-names))
-    (error orig-name
-           "expected the length of the sequence of names to be ~a, got ~s"
-           (length len-counter)
-           the-names)))
-
-(define current-traced-metafunctions (make-parameter '()))
-
-(define-for-syntax (mode-keyword stx)
-  (raise-syntax-error #f "keyword invalid outside of mode specification" stx))
-(define-syntax I mode-keyword)
-(define-syntax O mode-keyword)
-
-(define-for-syntax (check-judgment-arity stx judgment)
-  (syntax-case judgment ()
-    [(form-name pat ...)
-     (judgment-form-id? #'form-name)
-     (unless (judgment-form-relation? (lookup-judgment-form-id #'form-name))
-       (let ([expected (length (judgment-form-mode (lookup-judgment-form-id #'form-name)))]
-             [actual (length (syntax->list #'(pat ...)))])
-         (unless (= actual expected)
-           (raise-syntax-error 
-            #f 
-            (format "mode specifies a ~a-ary relation but use supplied ~a term~a" 
-                    expected actual (if (= actual 1) "" "s"))
-            judgment))))]
-    [(form-name pat ...)
-     (raise-syntax-error #f "expected a judgment form name" stx #'form-name)]))
-
-(define (substitute from to pat)
-  (let recur ([p pat])
-    (syntax-case p (side-condition)
-      [(side-condition p c)
-       #`(side-condition #,(recur #'p) c)]
-      [(p ...)
-       #`(#,@(map recur (syntax->list #'(p ...))))]
-      [else
-       (if (and (identifier? p) (bound-identifier=? p from))
-           to
-           p)])))
-
-(define-for-syntax (definition-nts lang orig-stx syn-error-name)
-  (unless (identifier? lang)
-    (raise-syntax-error #f "expected an identifier in the language position" orig-stx lang))
-  (language-id-nts lang syn-error-name))
-
-(define-for-syntax (lhs-lws clauses)
-  (with-syntax ([((lhs-for-lw _ ...) ...) clauses])
-    (map (λ (x) (to-lw/proc (datum->syntax #f (cdr (syntax-e x)) x)))
-         (syntax->list #'(lhs-for-lw ...)))))
-
-(define-syntax (define-judgment-form stx)
-  (not-expression-context stx)
-  (syntax-case stx ()
-    [(def-form-id lang . body)
-     (do-extended-judgment-form #'lang (syntax-e #'def-form-id) #'body #f stx #f)]))
-
-(define-syntax (define-extended-judgment-form stx)
-  (not-expression-context stx)
-  (syntax-case stx ()
-    [(def-form-id lang original-id . body)
-     (begin
-       (unless (judgment-form-id? #'original-id)
-         (raise-syntax-error 'define-extended-judgment-form 
-                             "expected a judgment form"
-                             stx
-                             #'original-id))
-       (do-extended-judgment-form #'lang 'define-extended-judgment-form #'body #'original-id stx #f))]))
-
-(define-syntax (define-relation stx)
-  (syntax-case stx ()
-    [(def-form-id lang . body)
-     (begin
-       (unless (identifier? #'lang)
-         (raise-syntax-error #f "expected an identifier in the language position" stx #'lang))
-       (define-values (contract-name dom-ctcs pre-condition 
-                                     codom-contracts codom-seps post-condition
-                                     pats)
-         (split-out-contract stx (syntax-e #'def-form-id) #'body #t))
-       (with-syntax* ([((name trms ...) rest ...) (car pats)]
-                      [(mode-stx ...) #`(#:mode (name I))]
-                      [(ctc-stx ...) (if dom-ctcs 
-                                         #`(#:contract (name #,dom-ctcs)) 
-                                         #'())]
-                      [(clauses ...) pats]
-                      [new-body #`(mode-stx ... ctc-stx ... clauses ...)])
-         (do-extended-judgment-form #'lang (syntax-e #'def-form-id) #'new-body #f stx #t)))]))
-
-;; if relation? is true, then the contract is a list of redex patterns
-;; if relation? is false, then the contract is a single redex pattern
-;;   (meant to match the actual argument as a sequence)
-(define-for-syntax (split-out-contract stx syn-error-name rest relation?)
-  ;; initial test determines if a contract is specified or not
-  (cond
-    [(pair? (syntax-e (car (syntax->list rest))))
-     (values #f #f #f (list #'any) '() #f 
-             (check-clauses stx syn-error-name (syntax->list rest) relation?))]
-    [else
-     (syntax-case rest ()
-       [(id separator more ...)
-        (identifier? #'id)
-        (cond
-          [relation?
-           (let-values ([(contract clauses) 
-                         (parse-relation-contract #'(separator more ...) syn-error-name stx)])
-             (when (null? clauses)
-               (raise-syntax-error syn-error-name 
-                                   "expected clause definitions to follow domain contract"
-                                   stx))
-             (values #'id contract #f (list #'any) '() #f
-                     (check-clauses stx syn-error-name clauses #t)))]
-          [else
-           (unless (eq? ': (syntax-e #'separator))
-             (raise-syntax-error syn-error-name "expected a colon to follow the meta-function's name" stx #'separator))
-           (let loop ([more (syntax->list #'(more ...))]
-                      [dom-pats '()])
-             (cond
-               [(null? more)
-                (raise-syntax-error syn-error-name "expected an ->" stx)]
-               [(eq? (syntax-e (car more)) '->)
-                (define-values (raw-clauses rev-codomains rev-codomain-separators
-                                            pre-condition post-condition)
-                  (let loop ([prev (car more)]
-                             [more (cdr more)]
-                             [codomains '()]
-                             [codomain-separators '()])
-                    (cond
-                      [(null? more)
-                       (raise-syntax-error syn-error-name
-                                           "expected a range contract to follow" stx prev)]
-                      [else
-                       (define after-this-one (cdr more))
-                       (cond
-                         [(null? after-this-one)
-                          (values null (cons (car more) codomains) codomain-separators #t #t)]
-                         [else
-                          (define kwd (cadr more))
-                          (cond
-                            [(member (syntax-e kwd) '(or ∨ ∪))
-                             (loop kwd 
-                                   (cddr more)
-                                   (cons (car more) codomains)
-                                   (cons (syntax-e kwd) codomain-separators))]
-                            [(and (not relation?) 
-                                  (or (equal? (syntax-e kwd) '#:pre)
-                                      (equal? (syntax-e kwd) '#:post)))
-                             (when (null? (cddr more)) 
-                               (raise-syntax-error 
-                                'define-metafunction 
-                                (format "expected an expression to follow ~a keyword"
-                                        (syntax-e kwd))
-                                kwd))
-                             (define pre #t)
-                             (define post #t)
-                             (define remainder (cdddr more))
-                             (cond
-                               [(equal? (syntax-e kwd) '#:pre)
-                                (set! pre (caddr more))
-                                (define without-pre (cdddr more))
-                                (when (and (pair? without-pre)
-                                           (equal? (syntax-e (car without-pre)) '#:post))
-                                  (when (null? (cddr without-pre)) 
-                                    (raise-syntax-error 
-                                     'define-metafunction 
-                                     "expected an expression to follow #:post keyword"
-                                     kwd))
-                                  (set! remainder (cddr without-pre))
-                                  (set! post (cadr without-pre)))]
-                               [(equal? (syntax-e kwd) '#:post)
-                                (set! post (caddr more))])
-                             (values remainder
-                                     (cons (car more) codomains)
-                                     codomain-separators
-                                     pre 
-                                     post)]
-                            [else
-                             (values (cdr more)
-                                     (cons (car more) codomains)
-                                     codomain-separators
-                                     #t
-                                     #t)])])])))
-                (let ([doms (reverse dom-pats)]
-                      [clauses (check-clauses stx syn-error-name raw-clauses relation?)])
-                  (values #'id
-                          doms
-                          (if relation? #f pre-condition)
-                          (reverse rev-codomains)
-                          (reverse rev-codomain-separators)
-                          (if relation? #f post-condition)
-                          clauses))]
-               [else
-                (loop (cdr more) (cons (car more) dom-pats))]))])]
-       [_
-        (raise-syntax-error
-         syn-error-name
-         (format "expected the name of the ~a, followed by its contract (or no name and no contract)"
-                 (if relation? "relation" "meta-function"))
-         stx
-         rest)])]))
-
-(define-for-syntax (parse-relation-contract after-name syn-error-name orig-stx)
-  (syntax-case after-name ()
-    [(subset . rest-pieces)
-     (unless (memq (syntax-e #'subset) '(⊂ ⊆))
-       (raise-syntax-error syn-error-name
-                           "expected ⊂ or ⊆ to follow the relation's name"
-                           orig-stx #'subset))
-     (let ([more (syntax->list #'rest-pieces)])
-       (when (null? more)
-         (raise-syntax-error syn-error-name 
-                             (format "expected a sequence of patterns separated by x or × to follow ~a" 
-                                     (syntax-e #'subset))
-                             orig-stx
-                             #'subset))
-       (let loop ([more (cdr more)]
-                  [arg-pats (list (car more))])
-         (cond
-           [(and (not (null? more)) (memq (syntax-e (car more)) '(x ×)))
-            (when (null? (cdr more))
-              (raise-syntax-error syn-error-name 
-                                  (format "expected a pattern to follow ~a" (syntax-e (car more)))
-                                  orig-stx (car more)))
-            (loop (cddr more)
-                  (cons (cadr more) arg-pats))]
-           [else (values (reverse arg-pats) more)])))]))
-
-(define-for-syntax (do-extended-judgment-form lang syn-err-name body orig stx is-relation?)
-  (define nts (definition-nts lang stx syn-err-name))
-  (define-values (judgment-form-name dup-form-names mode position-contracts invariant clauses rule-names)
-    (parse-judgment-form-body body syn-err-name stx (identifier? orig) is-relation?))
-  (define definitions
-    (with-syntax ([judgment-form-runtime-proc
-                   (syntax-property (syntax/loc judgment-form-name judgment-form-runtime-proc)
-                                    'undefined-error-name
-                                    (syntax-e judgment-form-name))])
-      #`(begin
-          (define-syntax #,judgment-form-name 
-            (judgment-form '#,judgment-form-name '#,(cdr (syntax->datum mode)) #'judgment-form-runtime-proc
-                           #'mk-judgment-form-proc #'#,lang #'jf-lws
-                           '#,rule-names #'judgment-runtime-gen-clauses #'mk-judgment-gen-clauses #'jf-term-proc #,is-relation?))
-          (define-values (mk-judgment-form-proc mk-judgment-gen-clauses)
-            (compile-judgment-form #,judgment-form-name #,mode #,lang #,clauses #,rule-names #,position-contracts #,invariant
-                                   #,orig #,stx #,syn-err-name judgment-runtime-gen-clauses))
-          (define judgment-form-runtime-proc (mk-judgment-form-proc #,lang))
-          (define jf-lws (compiled-judgment-form-lws #,clauses #,judgment-form-name #,stx))
-          (define judgment-runtime-gen-clauses (mk-judgment-gen-clauses #,lang (λ () (judgment-runtime-gen-clauses))))
-          (define jf-term-proc (make-jf-term-proc #,judgment-form-name #,syn-err-name #,lang #,nts #,mode)))))
-  (syntax-property
-   (values ;prune-syntax
-    (if (eq? 'top-level (syntax-local-context))
-        ; Introduce the names before using them, to allow
-        ; judgment form definition at the top-level.
-        #`(begin 
-            (define-syntaxes (judgment-form-runtime-proc judgment-runtime-gen-clauses jf-term-proc jf-lws) (values))
-            #,definitions)
-        definitions))
-   'disappeared-use
-   (map syntax-local-introduce dup-form-names)))
-
-(define-for-syntax (jf-is-relation? jf-id)
-  (judgment-form-relation? (lookup-judgment-form-id jf-id)))
-
-(define-for-syntax (parse-judgment-form-body body syn-err-name full-stx extension? is-relation?)
-  (define-syntax-class pos-mode
-    #:literals (I O)
-    (pattern I)
-    (pattern O))
-  (define-syntax-class mode-spec
-    #:description "mode specification"
-    (pattern (_:id _:pos-mode ...)))
-  (define-syntax-class contract-spec
-    #:description "contract specification"
-    (pattern (_:id _:expr ...)))
-  (define (horizontal-line? id)
-    (regexp-match? #rx"^-+$" (symbol->string (syntax-e id))))
-  (define-syntax-class horizontal-line
-    (pattern x:id #:when (horizontal-line? #'x)))
-  (define-syntax-class name
-    (pattern x #:when (and (not is-relation?)
-                           (or (and (symbol? (syntax-e #'x))
-                                    (not (horizontal-line? #'x))
-                                    (not (eq? '... (syntax-e #'x))))
-                               (string? (syntax-e #'x))))))
-  (define (parse-rules rules)
-    (define-values (backward-rules backward-names)
-      (for/fold ([parsed-rules '()]
-                 [names '()])
-        ([rule rules])
-        (syntax-parse rule
-          [(prem ... _:horizontal-line n:name conc)
-           (values (cons #'(conc prem ...) parsed-rules)
-                   (cons #'n names))]
-          [(prem ... _:horizontal-line conc)
-           (values (cons #'(conc prem ...) parsed-rules)
-                   (cons #f names))]
-          [(conc prem ... n:name)
-           (values (cons #'(conc prem ...) parsed-rules)
-                   (cons #'n names))]
-          [else
-           (values (cons rule parsed-rules)
-                   (cons #f names))])))
-    (values (reverse backward-rules)
-            (reverse backward-names)))
-  (define-values (name/mode mode-stx name/contract contract invariant rules rule-names)
-    (syntax-parse body #:context full-stx
-      [((~or (~seq #:mode ~! mode:mode-spec)
-             (~seq #:contract ~! contract:contract-spec)
-             (~seq #:inv ~! inv:expr))
-        ...
-        rule:expr ...)
-       (let-values ([(name/mode mode)
-                     (syntax-parse #'(mode ...)
-                       [((name the-mode ...)) (values #'name (car (syntax->list #'(mode ...))))]
-                       [_ 
-                        (raise-syntax-error 
-                         #f
-                         (if (null? (syntax->list #'(mode ...)))
-                             "expected definition to include a mode specification"
-                             "expected definition to include only one mode specification")
-                         full-stx)])]
-                    [(name/ctc ctc)
-                     (syntax-parse #'(contract ...)
-                       [() (values #f #f)]
-                       [((name . contract)) (values #'name (syntax->list #'contract))]
-                       [(_ . dups)
-                        (raise-syntax-error 
-                         syn-err-name "expected at most one contract specification"
-                         #f #f (syntax->list #'dups))])]
-                    [(invt)
-                     (syntax-parse #'(inv ...)
-                       [() #f]
-                       [(invar) #'invar]
-                       [(_ . dups)
-                        (raise-syntax-error
-                         syn-err-name "expected at most one invariant specification"
-                         #f #f (syntax->list #'dups))])])
-         (define-values (parsed-rules rule-names) (parse-rules (syntax->list #'(rule ...)))) 
-         (values name/mode mode name/ctc ctc invt parsed-rules rule-names))]))
-  (check-clauses full-stx syn-err-name rules #t)
-  (check-dup-rule-names full-stx syn-err-name rule-names)
-  (check-arity-consistency mode-stx contract full-stx)
-  (define-values (form-name dup-names)
-    (syntax-case rules ()
-      [() 
-       (not extension?)
-       (raise-syntax-error #f "expected at least one rule" full-stx)]
-      [_ (defined-name (list name/mode name/contract) rules full-stx)]))
-  (define string-rule-names
-    (for/list ([name (in-list rule-names)])
-      (cond
-        [(not name) name]
-        [(symbol? (syntax-e name))
-         (symbol->string (syntax-e name))]
-        [else (syntax-e name)])))
-  (values form-name dup-names mode-stx contract invariant rules string-rule-names))
-
-;; names : (listof (or/c #f syntax[string]))
-(define-for-syntax (check-dup-rule-names full-stx syn-err-name names)
-  (define tab (make-hash))
-  (for ([name (in-list names)])
-    (when (syntax? name)
-      (define k (if (symbol? (syntax-e name))
-                    (symbol->string (syntax-e name))
-                    (syntax-e name)))
-      (hash-set! tab k (cons name (hash-ref tab k '())))))
-  (for ([(k names) (in-hash tab)])
-    (unless (= 1 (length names))
-      (raise-syntax-error syn-err-name
-                          "duplicate rule names"
-                          (car names) #f (cdr names)))))
-                          
-(define-for-syntax (check-arity-consistency mode-stx contracts full-def)
-  (when (and contracts (not (= (length (cdr (syntax->datum mode-stx)))
-                               (length contracts))))
-    (raise-syntax-error 
-     #f "mode and contract specify different numbers of positions" full-def)))
-
-(define-for-syntax (defined-name declared-names clauses orig-stx)
-  (with-syntax ([(((used-names _ ...) _ ...) ...) clauses])
-    (define-values (the-name other-names)
-      (let ([present (filter values declared-names)])
-        (if (null? present)
-            (values (car (syntax->list #'(used-names ...)))
-                    (cdr (syntax->list #'(used-names ...))))
-            (values (car present) 
-                    (append (cdr present) (syntax->list #'(used-names ...)))))))
-    (let loop ([others other-names])
-      (cond
-        [(null? others) (values the-name other-names)]
-        [else
-         (unless (eq? (syntax-e the-name) (syntax-e (car others)))
-           (raise-syntax-error 
-            #f
-            "expected the same name in both positions"
-            orig-stx
-            the-name (list (car others))))
-         (loop (cdr others))]))))
-
-(define-syntax (make-jf-term-proc stx)
-  (syntax-case stx ()
-    [(_  jdg-name syn-err-name lang nts mode)
-     (if (member 'O (syntax->datum #'mode))
-         #'(λ (_)
-             (error 'syn-err-name "judgment forms with output mode positions cannot currently be used in term"))
-         (with-syntax* ([(binding ...) (generate-temporaries (cdr (syntax->list #'mode)))]
-                        [(input) (generate-temporaries (list #'input))]
-                        [body-stx (bind-withs #'syn-err-name '() #'lang (syntax->datum #'nts) #'lang
-                                              (if (jf-is-relation? #'jdg-name)
-                                                  (list #'(jdg-name ((unquote-splicing input))))
-                                                  (list #'(jdg-name (unquote binding) ...)))
-                                              'flatten
-                                              #`(list #t)
-                                              '()
-                                              '()
-                                              #f
-                                              #f)])
-                       (if (jf-is-relation? #'jdg-name)
-                           #`(λ (input)
-                               (not (null? body-stx)))
-                           #`(λ (input)
-                               (call-with-values 
-                                (λ () (apply values input))
-                                (λ (binding ...)
-                                  (not (null? body-stx))))))))]))
-
-(define-syntax (judgment-holds/derivation stx)
-  (syntax-case stx ()
-    [(_ stx-name derivation? judgment)
-     #`(not (null? #,(syntax/loc stx (judgment-holds/derivation stx-name derivation? judgment #t))))]
-    [(_ stx-name derivation? (form-name . pats) tmpl)
-     (and (judgment-form-id? #'form-name)
-          (when (jf-is-relation? #'form-name)
-            (raise-syntax-error (syntax-e #'stx-name) "relations not allowed" #'form-name)))
-     (let* ([syn-err-name (syntax-e #'stx-name)]
-            [lang (judgment-form-lang (lookup-judgment-form-id #'form-name))]
-            [nts (definition-nts lang stx syn-err-name)]
-            [judgment (syntax-case stx () [(_ _ _ judgment _) #'judgment])]
-            [derivation? (syntax-e #'derivation?)]
-            [id-or-not (if derivation?
-                           (car (generate-temporaries '(jf-derivation-lst)))
-                           #f)]
-            [main-stx
-             (bind-withs syn-err-name '() lang nts lang
-                         (list judgment)
-                         'flatten
-                         (if derivation?
-                             id-or-not
-                             #`(list (term #,#'tmpl #:lang #,lang)))
-                         '()
-                         '()
-                         #f
-                         id-or-not)])
-       (check-judgment-arity stx judgment)
-       (syntax-property
-        #`(parameterize ([include-entire-derivation #,derivation?])
-            #,(if id-or-not
-                  #`(let ([#,id-or-not '()])
-                      #,main-stx)
-                  #`(sort #,main-stx
-                          string<=?
-                          #:key (λ (x) (format "~s" x)))))
-        'disappeared-use
-        (syntax-local-introduce #'form-name)))]
-    [(_ stx-name derivation? (not-form-name . _) . _)
-     (not (judgment-form-id? #'form-name))
-     (raise-syntax-error (syntax-e #'stx-name) "expected a judgment form name" #'not-form-name)]
-    [(_ stx-name . whatever)
-     (raise-syntax-error (syntax-e #'stx-name)
-                         "bad syntax"
-                         stx)]))
-
-(define-syntax (judgment-holds stx)
-  (syntax-case stx ()
-    [(_  (jf-id . args))
-     #`(#%expression (judgment-holds/derivation judgment-holds #f #,(stx-car (stx-cdr stx))))]
-    [(_  (jf-id . args) trm)
-     #`(#%expression (judgment-holds/derivation judgment-holds #f #,(stx-car (stx-cdr stx)) trm))]))
-
-(define-syntax (build-derivations stx)
-  (syntax-case stx ()
-    [(_  jf-expr)
-     #'(#%expression (judgment-holds/derivation build-derivations #t jf-expr any))]))
-
-(define-for-syntax (do-compile-judgment-form-proc name mode-stx clauses rule-names contracts orig-ctcs nts orig lang stx syn-error-name)
-  (with-syntax ([(init-jf-derivation-id) (generate-temporaries '(init-jf-derivation-id))])
-    (define mode (cdr (syntax->datum mode-stx)))
-    (define-values (input-contracts output-contracts)
-      (values (first contracts)
-              (second contracts))
-      #;(if contracts
-          (let-values ([(ins outs) (split-by-mode contracts mode)])
-            (values ins outs))
-          (values #f #f)))
-    (define (compile-clause clause clause-name)
-      (syntax-case clause ()
-        [((_ . conc-pats) . prems)
-         (let-values ([(input-pats output-pats) (split-by-mode (syntax->list #'conc-pats) mode)])
-           (with-syntax ([(lhs-syncheck-exp lhs (names ...) (names/ellipses ...)) (rewrite-side-conditions/check-errs lang syn-error-name #t input-pats)]
-                         [(jf-derivation-id) (generate-temporaries '(jf-derivation-id))])
-             (define (contracts-compilation ctcs)
-               (with-syntax ([(ctc ...) ctcs])
-                 #`(list (compile-pattern lang `ctc #f) ...)))
-             (define body
-               (parameterize ([judgment-form-pending-expansion
-                               (cons name
-                                     (struct-copy judgment-form (lookup-judgment-form-id name)
-                                                  [proc #'recur]))])
-                 (bind-withs syn-error-name '() lang nts lang
-                             (syntax->list #'prems) 
-                             'flatten #`(list (derivation-with-output-only (term (#,@output-pats) #:lang #,lang)
-                                                                           #,clause-name
-                                                                           jf-derivation-id))
-                             (syntax->list #'(names ...))
-                             (syntax->list #'(names/ellipses ...))
-                             #f
-                             #'jf-derivation-id)))
-             (with-syntax ([(compiled-lhs compiled-input-ctcs compiled-output-ctcs)
-                            (generate-temporaries '(compiled-lhs compiled-input-ctcs compiled-output-ctcs))])
-               
-               #`(
-                  ;; pieces of a 'let' expression to be combined: first some bindings
-                  ([compiled-lhs (compile-pattern lang `lhs #t)]
-                   #,@(if input-contracts
-                          (list #`[compiled-input-ctcs (compile-pattern lang `#,input-contracts #f)])
-                          (list))
-                   #,@(if output-contracts
-                          (list #`[compiled-output-ctcs (compile-pattern lang `#,output-contracts #f)])
-                          (list)))
-                  ;; and then the body of the let, but expected to be behind a (λ (input) ...).
-                  (let ([jf-derivation-id init-jf-derivation-id])
-                    (begin
-                      lhs-syncheck-exp
-                      #,@(if input-contracts
-                             (list #`(check-judgment-form-contract '#,name input #f compiled-input-ctcs '#,orig-ctcs 'I '#,mode))
-                             (list))
-                      (combine-judgment-rhses
-                       compiled-lhs
-                       input
-                       (λ (bnds)
-                         #,(bind-pattern-names 'judgment-form
-                                               #'(names/ellipses ...)
-                                               #'((lookup-binding bnds 'names) ...)
-                                               body))
-                       #,(if output-contracts
-                             #`(λ (output)
-                                 (check-judgment-form-contract '#,name input output compiled-output-ctcs '#,orig-ctcs 'O '#,mode))
-                             #`void))))))))]))
-  
-    (when (identifier? orig)
-      (define orig-mode (judgment-form-mode (lookup-judgment-form-id orig)))
-      (unless (equal? mode orig-mode)
-        (raise-syntax-error syn-error-name
-                            (format 
-                             "mode for extended judgment form does not match original mode; got ~s for the original and ~s for the extension"
-                             `(,(syntax-e orig) ,@orig-mode)
-                             `(,(syntax-e name) ,@mode))
-                            stx
-                            mode-stx)))
-    
-    (with-syntax ([(((clause-proc-binding ...) clause-proc-body) ...) (map compile-clause clauses rule-names)])
-      (with-syntax ([(clause-proc-body-backwards ...) (reverse (syntax->list #'(clause-proc-body ...)))])
-        (if (identifier? orig)
-            (with-syntax ([orig-mk (judgment-form-mk-proc (lookup-judgment-form-id orig))])
-              #`(λ (lang)
-                  (let (clause-proc-binding ... ...)
-                    (let ([prev (orig-mk lang)])
-                      (λ (recur input init-jf-derivation-id)
-                        (append (prev recur input init-jf-derivation-id)
-                                clause-proc-body-backwards ...))))))
-            #`(λ (lang)
-                (let (clause-proc-binding ... ...)
-                  (λ (recur input init-jf-derivation-id)
-                    (append clause-proc-body-backwards ...)))))))))
-
-(define (combine-judgment-rhses compiled-lhs input rhs check-output)
-  (define mtchs (match-pattern compiled-lhs input))
-  (cond
-    [mtchs
-     (define output-table (make-hash))
-     (for ([m (in-list mtchs)])
-       (define os (rhs (mtch-bindings m)))
-       (when os
-         (for ([x (in-list os)])
-           (hash-set! output-table x #t))))
-     (define outputs (hash-map output-table (λ (k v) k)))
-     (for ([output (in-list outputs)])
-       (check-output output))
-     outputs]
-    [else '()]))
-
-(define-for-syntax (do-compile-judgment-form-lws clauses jf-name-stx full-def)
-  (syntax-case clauses ()
-    [(((_ . conc-body) prems ...) ...)
-     (with-syntax ([((rhss ...) (sc/ws ...)) (if (jf-is-relation? jf-name-stx)
-                                                 (with-syntax ([(((rhses ...) (where/sc ...)) ...)
-                                                                (relation-split-out-rhs #'((prems ...) ...) full-def)])
-                                                   #'(((rhses ...) ...) ((where/sc ...) ...)))
-                                                 (let ([rev-premss
-                                                        ; for consistency with metafunction extras
-                                                        (for/list ([prems (syntax->list #'((prems ...) ...))])
-                                                          (reverse (syntax->list prems)))]
-                                                       [no-rhss (map (λ (_) '()) clauses)])
-                                                   (list no-rhss rev-premss)))])
-       #`(generate-lws #t (conc-body ...) #,(lhs-lws clauses) (sc/ws ...) (rhss ...) #f))]))
-
-(define-for-syntax (relation-split-out-rhs raw-rhsss orig-stx)
-  (for/list ([rhss (in-list (syntax->list raw-rhsss))])
-    (define rhses '())
-    (define sc/wheres '())
-    (for ([rhs (in-list (syntax->list rhss))])
-      (define (found-one) 
-        (set! sc/wheres (cons rhs sc/wheres)))
-      (syntax-case rhs (side-condition side-condition/hidden where where/hidden judgment-holds)
-        [(side-condition . stuff) (found-one)]
-        [(side-condition/hidden . stuff) (found-one)]
-        [(where . stuff) (found-one)]
-        [(where/hidden . stuff) (found-one)]
-        [(judgment-holds . stuff) (found-one)]
-        [_ 
-         (cond
-           [(null? sc/wheres)
-            (set! rhses (cons rhs rhses))]
-           [else
-            (raise-syntax-error 'define-relation
-                                (format "found a '~a' clause not at the end; followed by a normal, right-hand side clause"
-                                        (syntax-e (car (syntax-e (car sc/wheres)))))
-                                (last sc/wheres)
-                                #f
-                                (list  rhs))])]))
-    (list (reverse rhses)
-          (reverse sc/wheres))))
-
-(define (check-judgment-form-contract form-name input-term output-term+trees contracts orig-ctcs mode modes)
-  (define o-term (and (eq? mode 'O)
-                      (derivation-with-output-only-output output-term+trees)))
-  (define description
-    (case mode
-      [(I) "input"]
-      [(O) "output"]))
-  (when contracts
-    (case mode
-      [(I)
-       (unless (match-pattern contracts input-term)
-         (redex-error form-name (string-append "judgment input values do not match its contract;\n"
-                                               " (unknown output values indicated by _)\n  contract: ~a\n  values: ~a")
-                      (cons form-name orig-ctcs)
-                      (cons form-name (assemble modes input-term (build-list (length modes)
-                                                                             (λ (_) '_))))))]
-      [(O)
-       (define io-term (assemble modes input-term o-term))
-       (unless (match-pattern contracts io-term)
-         (redex-error form-name "judgment values do not match its contract;\n  contract: ~a\n  values: ~a"
-                      (cons form-name orig-ctcs) (cons form-name io-term)))]))
-  #;
-  (when contracts
-    (let loop ([rest-modes modes] [rest-terms terms] [rest-ctcs contracts] [pos 1])
-      (unless (null? rest-modes)
-        (if (eq? mode (car rest-modes))
-            (if (match-pattern (car rest-ctcs) (car rest-terms))
-                (loop (cdr rest-modes) (cdr rest-terms) (cdr rest-ctcs) (+ 1 pos))
-                (redex-error form-name "~a ~s at position ~s does not match its contract"
-                             description (car rest-terms) pos))
-            (loop (cdr rest-modes) rest-terms rest-ctcs (+ 1 pos)))))))
-
-(define-for-syntax (mode-check mode clauses nts syn-err-name orig-stx)
-  (define ((check-template bound-anywhere) temp bound)
-    (let check ([t temp])
-      (syntax-case t (unquote)
-        [x
-         (identifier? #'x)
-         (unless (cond [(free-id-table-ref bound-anywhere #'x #f)
-                        (free-id-table-ref bound #'x #f)]
-                       [(id-binds? nts #t #'x)
-                        (term-fn? (syntax-local-value #'x (λ () #f)))]
-                       [else #t])
-           (raise-syntax-error syn-err-name "unbound pattern variable" #'x))]
-        [(u ...)
-         (for-each check (syntax->list #'(u ...)))]
-        [_ (void)])))
-  (define ((bind kind) pat bound)
-    (define-values (ids _)
-      (extract-names nts syn-err-name #t pat kind))
-    (for/fold ([b bound]) ([x ids])
-      (free-id-table-set b x #t)))
-  (define (split-body judgment)
-    (syntax-case judgment ()
-      [(form-name . body)
-       (if (judgment-form-relation? (lookup-judgment-form-id #'form-name))
-           (values (list) (list #'(body)))
-           (split-by-mode (syntax->list #'body) 
-                      (judgment-form-mode
-                       (lookup-judgment-form-id #'form-name))))]))
-  (define (drop-ellipses prems)
-    (syntax-case prems ()
-      [() '()]
-      [(prem maybe-ellipsis . remaining)
-       (ellipsis? #'maybe-ellipsis)
-       (syntax-case #'prem ()
-         [(form-name . _)
-          (judgment-form-id? #'form-name)
-          (cons #'prem (drop-ellipses #'remaining))]
-         [_ (raise-syntax-error syn-err-name "ellipses must follow judgment form uses" #'maybe-ellipsis)])]
-      [(prem . remaining)
-       (cons #'prem (drop-ellipses #'remaining))]))
-  (define (fold-clause pat-pos tmpl-pos acc-init clause)
-    (syntax-case clause ()
-      [(conc . prems)
-       (let-values ([(conc-in conc-out) (split-body #'conc)])
-         (check-judgment-arity orig-stx #'conc)
-         (define acc-out
-           (for/fold ([acc (foldl pat-pos acc-init conc-in)])
-             ([prem (drop-ellipses #'prems)])
-             (syntax-case prem ()
-               [(-where pat tmpl)
-                (where-keyword? #'-where)
-                (begin
-                  (tmpl-pos #'tmpl acc)
-                  (pat-pos #'pat acc))]
-               [(-side-condition tmpl)
-                (side-condition-keyword? #'-side-condition)
-                (begin (tmpl-pos #'tmpl acc)
-                       acc)]
-               [(form-name . _)
-                (if (judgment-form-id? #'form-name)
-                    (let-values ([(prem-in prem-out) (split-body prem)])
-                      (check-judgment-arity orig-stx prem)
-                      (for ([pos prem-in]) (tmpl-pos pos acc))
-                      (foldl pat-pos acc prem-out))
-                    (raise-syntax-error syn-err-name "expected judgment form name" #'form-name))]
-               [_ (raise-syntax-error syn-err-name "malformed premise" prem)])))
-         (for ([pos conc-out]) (tmpl-pos pos acc-out))
-         acc-out)]))
-  (for ([clause clauses])
-    (define do-tmpl
-      (check-template
-       (fold-clause (bind 'rhs-only) void (make-immutable-free-id-table) clause)))
-    (fold-clause (bind 'rhs-only) do-tmpl (make-immutable-free-id-table) clause)))
-
-(define-syntax (generate-lws stx)
-  (syntax-case stx ()
-    [(_ relation? seq-of-lhs seq-of-lhs-for-lw seq-of-tl-side-cond/binds seq-of-rhs 
-        side-condition-unquoted?)
-     (with-syntax
-         ([(rhs/lw ...) 
-           (syntax-case #'relation? ()
-             [#t (map (λ (x) #`(list #,@(map to-lw/proc (syntax->list x))))
-                      (syntax->list #'seq-of-rhs))]
-             [#f (map to-lw/proc (syntax->list #'seq-of-rhs))])]
-          [(((bind-id/lw . bind-pat/lw) ...) ...)
-           ;; Also for pict, extract pattern bindings
-           (map name-pattern-lws (syntax->list #'seq-of-lhs))]
-          [((where/sc/lw ...) ...)
-           ;; Also for pict, extract where bindings
-           (for/list ([hm (in-list (syntax->list #'seq-of-tl-side-cond/binds))])
-             (define the-extras (visible-extras hm))
-             (for/list ([lst (in-list the-extras)]
-                        [next (if (null? the-extras)
-                                  '()
-                                  (append (cdr the-extras) (list #f)))])
-               (syntax-case next (or)
-                 [or (to-lw/proc lst)]
-                 [else
-                  (syntax-case lst (unquote side-condition where or)
-                    [(form-name . _)
-                     (judgment-form-id? #'form-name)
-                     #`(make-metafunc-extra-side-cond #,(to-lw/proc lst))]
-                    [(form-name . _)
-                     (judgment-form-id? #'form-name)
-                     #`(make-metafunc-extra-side-cond #,(to-lw/proc lst))]
-                    [(where pat (unquote (f _ _)))
-                     (and (or (identifier? #'pat)
-                              (let ([l (syntax->list #'pat)])
-                                (and l (andmap identifier? (syntax->list #'pat)))))
-                          (or (free-identifier=? #'f #'variable-not-in)
-                              (free-identifier=? #'f #'variables-not-in)))
-                     (with-syntax ([(ids ...)
-                                    (map to-lw/proc
-                                         (if (identifier? #'pat)
-                                             (list #'pat)
-                                             (syntax->list #'pat)))])
-                       #`(make-metafunc-extra-fresh
-                          (list ids ...)))]
-                    [(where pat exp)
-                     #`(make-metafunc-extra-where
-                        #,(to-lw/proc #'pat) #,(to-lw/proc #'exp))]
-                    [(side-condition x)
-                     #`(make-metafunc-extra-side-cond
-                        #,(if (syntax-e #'side-condition-unquoted?)
-                              (to-lw/uq/proc #'x)
-                              (to-lw/proc #'x)))]
-                    [or ''or]
-                    [(clause-name name)
-                     #''(clause-name name)]
-                    [maybe-ellipsis
-                     (ellipsis? #'maybe-ellipsis)
-                     (to-lw/proc #'maybe-ellipsis)])])))]
-          [(((where-bind-id/lw . where-bind-pat/lw) ...) ...)
-           (for/list ([clauses (in-list (syntax->list #'seq-of-tl-side-cond/binds))])
-             (for/fold ([binds '()]) ([clause (visible-extras clauses)])
-               (syntax-case clause (where)
-                 [(form-name . pieces)
-                  (judgment-form-id? #'form-name)
-                  (let*-values ([(mode) (judgment-form-mode (lookup-judgment-form-id #'form-name))]
-                                [(_ outs) (split-by-mode (syntax->list #'pieces) mode)])
-                    (for/fold ([binds binds]) ([out outs])
-                      (append (name-pattern-lws out) binds)))]
-                 [(where lhs rhs) (append (name-pattern-lws #'lhs) binds)]
-                 [_ binds])))]
-          [(((rhs-bind-id/lw . rhs-bind-pat/lw/uq) ...) ...)
-           ;; Also for pict, extract pattern bindings
-           (map (λ (x) (map (λ (x) (cons (to-lw/proc (car x)) (to-lw/uq/proc (cdr x))))
-                            (extract-term-let-binds x)))
-                (syntax->list #'seq-of-rhs))]
-          
-          [(x-lhs-for-lw ...) #'seq-of-lhs-for-lw])
-       #'(list (list x-lhs-for-lw
-                     (list (make-metafunc-extra-where bind-id/lw bind-pat/lw) ...
-                           (make-metafunc-extra-where where-bind-id/lw where-bind-pat/lw) ...
-                           (make-metafunc-extra-where rhs-bind-id/lw rhs-bind-pat/lw/uq) ...
-                           where/sc/lw ...)
-                     rhs/lw)
-               ...))]))
-
-(define-for-syntax (visible-extras extras)
-  (for/fold ([visible empty]) ([extra (syntax->list extras)])
-    (syntax-case extra (where/hidden
-                        side-condition/hidden
-                        judgment-holds)
-      [(where/hidden pat exp) visible]
-      [(side-condition/hidden x) visible]
-      [(judgment-holds judgment)
-       (cons #'judgment visible)]
-      [_ (cons extra visible)])))
-
-(define-syntax (compile-judgment-form stx)
-  (syntax-case stx ()
-    [(_ judgment-form-name mode-arg lang raw-clauses rule-names ctcs invt orig full-def syn-err-name judgment-form-runtime-gen-clauses)
-     (let ([nts (definition-nts #'lang #'full-def (syntax-e #'syn-err-name))]
-           [rule-names (syntax->datum #'rule-names)]
-           [syn-err-name (syntax-e #'syn-err-name)]
-           [clauses (rewrite-relation-prems
-                     (if (jf-is-relation? #'judgment-form-name)
-                         (fix-relation-clauses (syntax-e #'judgment-form-name) (syntax->list #'raw-clauses))
-                         (syntax->list #'raw-clauses)))]
-           [mode (cdr (syntax->datum #'mode-arg))])
-       (unless (jf-is-relation? #'judgment-form-name) 
-         (mode-check (cdr (syntax->datum #'mode-arg)) clauses nts syn-err-name stx))
-       (define maybe-wrap-contract (if (syntax-e #'invt)
-                                       (λ (ctc-stx)
-                                         #`(side-condition #,ctc-stx (term invt)))
-                                       values))
-       (define-values (i-ctc-syncheck-expr i-ctc)
-         (syntax-case #'ctcs ()
-           [#f (values #'(void) #f)]
-           [(p ...)
-            (let-values ([(i-ctcs o-ctcs) (split-by-mode (syntax->list #'(p ...)) mode)])
-              (with-syntax* ([(i-ctcs ...) i-ctcs]
-                             [(syncheck i-ctc-pat (names ...) (names/ellipses ...))
-                              (rewrite-side-conditions/check-errs #'lang #'syn-error-name #f #'(i-ctcs ...))])
-                (values #'syncheck #'i-ctc-pat)))]))
-       (define-values (ctc-syncheck-expr ctc)
-         (cond 
-           [(not (or (syntax-e #'ctcs) 
-                     (syntax-e #'invt)))
-            (values #'(void) #f)]
-           [else
-            (define ctc-stx ((if (syntax-e #'invt)
-                                 (λ (ctc-stx)
-                                   #`(side-condition #,ctc-stx (term invt)))
-                                 values)
-                             (if (syntax-e #'ctcs)
-                                 #'ctcs
-                                 #'any)))
-            (with-syntax ([(syncheck ctc-pat (names ...) (names/ellipses ...))
-                           (rewrite-side-conditions/check-errs #'lang #'syn-error-name #f ctc-stx)])
-              (values #'syncheck #'ctc-pat))]))
-       (define-values (syncheck-exprs contracts)
-         (syntax-case #'ctcs ()
-           [#f (values '() #f)]
-           [(p ...)
-            (let loop ([pats (syntax->list #'(p ...))]
-                       [ctcs '()]
-                       [syncheck-exps '()])
-              (cond
-                [(null? pats) (values syncheck-exps (reverse ctcs))]
-                [else
-                 (define pat (car pats))
-                 (with-syntax ([(syncheck-exp pat (names ...) (names/ellipses ...)) 
-                                (rewrite-side-conditions/check-errs #'lang #'syn-error-name #f pat)])
-                   (loop (cdr pats)
-                         (cons #'pat ctcs)
-                         (cons #'syncheck-exp syncheck-exps)))]))]))
-       (define proc-stx (do-compile-judgment-form-proc #'judgment-form-name
-                                                       #'mode-arg
-                                                       clauses
-                                                       rule-names
-                                                       (list i-ctc ctc)
-                                                       #'ctcs
-                                                       nts
-                                                       #'orig
-                                                       #'lang
-                                                       #'full-def
-                                                       syn-err-name))
-       (define gen-stx (with-syntax* ([(comp-clauses ...) 
-                                       (map (λ (c) (compile-gen-clause c mode syn-err-name 
-                                                                       #'judgment-form-name #'lang)) 
-                                            clauses)])
-                                     (if (identifier? #'orig)
-                                         (with-syntax ([prev-mk (judgment-form-mk-gen-clauses (lookup-judgment-form-id #'orig))])
-                                           #`(λ (effective-lang judgment-form-runtime-gen-clauses)
-                                               (define mk-prev-clauses (prev-mk effective-lang judgment-form-runtime-gen-clauses))
-                                               (λ ()
-                                                 (append 
-                                                  (mk-prev-clauses)
-                                                  #,(check-pats
-                                                     #'(list comp-clauses ...))))))
-                                         #`(λ (effective-lang judgment-form-runtime-gen-clauses)
-                                             (λ ()
-                                               #,(check-pats
-                                                  #'(list comp-clauses ...)))))))
-       #`(begin #,i-ctc-syncheck-expr #,ctc-syncheck-expr 
-                (values #,proc-stx #,gen-stx)))]))
-
-(define-for-syntax (rewrite-relation-prems clauses)
-  (map (λ (c)
-         (syntax-case c ()
-           [(conc prems ...)
-            (with-syntax ([(new-prems ...) (map (λ (p)
-                                                  (syntax-case p ()
-                                                    [(r-name rest ...)
-                                                     (and (identifier? #'r-name)
-                                                          (judgment-form-id? #'r-name)
-                                                          (jf-is-relation? #'r-name))
-                                                     #'(r-name (rest ...))]
-                                                    [else
-                                                     p]))
-                                                (syntax->list #'(prems ...)))])
-              #'(conc new-prems ...))]))
-       clauses))
-
-(define-for-syntax (fix-relation-clauses name raw-clauses)
-  (map (λ (clause-stx)
-         (define (fix-rule rule-stx)
-           (syntax-case rule-stx ()
-             [(rule-name rest ...)
-              (and (identifier? #'rule-name)
-                   (judgment-form-id? #'rule-name))
-              #'(rule-name rest ...)]
-             [rule
-              #'(side-condition rule)]))
-         (let loop ([c-stx clause-stx]
-                    [new-c-stx '()]
-                    [extra-stx '()])
-           (syntax-case c-stx ()
-             [()
-              (let* ([c-rev (reverse new-c-stx)]
-                     [conclusion (syntax-case (car c-rev) ()
-                                   [(r-name rest ...)
-                                    #'(r-name (rest ...))])])
-                (with-syntax ([(cls ...) (cons conclusion (append (reverse extra-stx) (cdr c-rev)))])
-                  #'(cls ...)))]
-             [((where ext-rest ...) rest ...)
-              (where-keyword? #'where)
-              (loop #'(rest ...)
-                    new-c-stx
-                    (cons #'(where ext-rest ...) extra-stx))]
-             [((side-con ext-rest ...) rest ...)
-              (side-condition-keyword? #'side-con)
-              (loop #'(rest ...)
-                    new-c-stx
-                    (cons #'(side-con (unquote ext-rest ...)) extra-stx))]
-             [(rule ellipsis rest ...)
-              (ellipsis? #'ellipsis)
-              (loop #'(rest ...)
-                    (cons #'ellipsis (cons (fix-rule #'rule) new-c-stx))
-                    extra-stx)]
-             [(rule rest ...)
-              (loop #'(rest ...)
-                    (cons (fix-rule #'rule) new-c-stx)
-                    extra-stx)])))
-       raw-clauses))
-
-(define-syntax (compile-judgment-gen-clauses stx)
-  (syntax-case stx ()
-    [(_ judgment-form-name mode-arg lang clauses ctcs orig full-def syn-err-name judgment-form-runtime-gen-clauses)
-     (let ([clauses (syntax->list #'clauses)]
-           [nts (definition-nts #'lang #'full-def (syntax-e #'syn-err-name))]
-           [syn-err-name (syntax-e #'syn-err-name)]
-           [mode (cdr (syntax->datum #'mode-arg))])
-       (with-syntax* ([(comp-clauses ...) 
-                       (map (λ (c) (compile-gen-clause c mode syn-err-name 
-                                                       #'judgment-form-name #'lang)) 
-                            clauses)])
-                     (if (identifier? #'orig)
-                         (with-syntax ([prev-mk (judgment-form-mk-gen-clauses (lookup-judgment-form-id #'orig))])
-                           #`(λ (effective-lang judgment-form-runtime-gen-clauses)
-                               (define mk-prev-clauses (prev-mk effective-lang judgment-form-runtime-gen-clauses))
-                               (λ ()
-                                 (append 
-                                  (mk-prev-clauses)
-                                  #,(check-pats
-                                     #'(list comp-clauses ...))))))
-                         #`(λ (effective-lang judgment-form-runtime-gen-clauses)
-                             (λ ()
-                               #,(check-pats
-                                  #'(list comp-clauses ...)))))))]))
-
-(define-syntax (compiled-judgment-form-lws stx)
-  (syntax-case stx ()
-    [(_ clauses name def-stx)
-     (do-compile-judgment-form-lws (syntax->list #'clauses) #'name #'def-stx)]))
-
-(define-for-syntax (extract-term-let-binds lhs)
-  (let loop ([lhs lhs])
-    (syntax-case* lhs (term-let) (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
-      [(term-let ((x e1) ...) e2 ...)
-       (append (map cons
-                    (syntax->list #'(x ...))
-                    (syntax->list #'(e1 ...)))
-               (loop #'(e2 ...)))]
-      ;; FIXME: should follow the grammar of patterns!
-      [(a . b)
-       (append (loop #'a) (loop #'b))]
-      [_else null])))
-
-
-
-(define-for-syntax (name-pattern-lws pat)
-  (map (λ (x) (cons (to-lw/proc (car x)) (to-lw/proc (cdr x))))
-       (extract-pattern-binds pat)))
-
-(define-for-syntax (extract-pattern-binds lhs)
-  (let loop ([lhs lhs])
-    (syntax-case* lhs (name) (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
-      [(name id expr)
-       (identifier? #'id)
-       (cons (cons #'id #'expr) (loop #'expr))]
-      ;; FIXME: should follow the grammar of patterns!
-      [(a . b)
-       (append (loop #'a) (loop #'b))]
-      [_else null])))
-
-(define-for-syntax (check-clauses stx syn-error-name rest relation?)
-  (syntax-case rest ()
-    [([(lhs ...) roc1 roc2 ...] ...)
-     rest]
-    [([(lhs ...) rhs ...] ...)
-     (if relation?
-         rest
-         (begin
-           (for-each 
-            (λ (clause)
-              (syntax-case clause ()
-                [(a b) (void)]
-                [x (raise-syntax-error syn-error-name "expected a pattern and a right-hand side" stx clause)]))
-            rest)
-           (raise-syntax-error syn-error-name "error checking failed.3" stx)))]
-    [([x roc ...] ...)
-     (begin
-       (for-each 
-        (λ (x)
-          (syntax-case x ()
-            [(lhs ...) (void)]
-            [x (raise-syntax-error syn-error-name "expected a function prototype" stx #'x)]))
-        (syntax->list #'(x ...)))
-       (raise-syntax-error syn-error-name "error checking failed.1" stx))]
-    [(x ...)
-     (begin
-       (for-each 
-        (λ (x)
-          (syntax-case x ()
-            [(stuff stuff2 ...) (void)]
-            [x (raise-syntax-error syn-error-name "expected a clause" stx #'x)]))
-        (syntax->list #'(x ...)))
-       (raise-syntax-error syn-error-name "error checking failed.2" stx))]))
-
-(define-for-syntax (ellipsis? stx)
-  (and (identifier? stx)
-       (free-identifier=? stx (quote-syntax ...))))
-
-(define-for-syntax (where-keyword? id)
-  (and (identifier? id)
-       (or (free-identifier=? id #'where)
-           (free-identifier=? id #'where/hidden))))
-(define-for-syntax (side-condition-keyword? id)
-  (and (identifier? id)
-       (or (free-identifier=? id #'side-condition)
-           (free-identifier=? id #'side-condition/hidden))))
-;                                                                        
-;                                                                        
-;                                                      ;                 
-;                                              ;                         
-;    ;; ;;  ;;;  ;; ;;    ;;;   ;; ;;   ;;;   ;;;;;  ;;;     ;;;  ;; ;;  
-;   ;  ;;  ;   ;  ;;  ;  ;   ;   ;;    ;   ;   ;       ;    ;   ;  ;;  ; 
-;   ;   ;  ;;;;;  ;   ;  ;;;;;   ;      ;;;;   ;       ;    ;   ;  ;   ; 
-;   ;   ;  ;      ;   ;  ;       ;     ;   ;   ;       ;    ;   ;  ;   ; 
-;   ;   ;  ;      ;   ;  ;       ;     ;   ;   ;   ;   ;    ;   ;  ;   ; 
-;    ;;;;   ;;;; ;;; ;;;  ;;;;  ;;;;;   ;;;;;   ;;;  ;;;;;   ;;;  ;;; ;;;
-;       ;                                                                
-;    ;;;                                                                 
-;                                                                        
-;                                                                        
-
-
-
-
-(define-for-syntax (compile-gen-clause clause-stx mode syn-error-name jdg-name lang)
-  (syntax-case clause-stx ()
-    [((conc-name . conc-body-raw) prems ...)
-     (let*-values ([(conc/+ conc/-) (split-by-mode (syntax->list #'conc-body-raw) mode)]
-                   [(syncheck-exps conc/+rw names) (rewrite-pats conc/+ lang)]
-                   [(ps-rw eqs p-names) (rewrite-prems #t (syntax->list #'(prems ...)) names lang 'define-judgment-form)]
-                   [(conc/-rw conc-mfs) (rewrite-terms conc/- p-names)]
-                   [(conc) (assemble mode conc/+rw conc/-rw)])
-       (with-syntax ([(c ...) conc]
-                     [(c-mf ...) conc-mfs]
-                     [(eq ...) eqs]
-                     [(prem-bod ...) (reverse ps-rw)])
-         #`(begin #,@syncheck-exps
-                  (clause '(list c ...) (list eq ...) (list c-mf ... prem-bod ...) effective-lang '#,jdg-name))))]))
-
-
-(define-for-syntax (rewrite-prems in-judgment-form? prems names lang what)
-  (define (rewrite-jf prem-name prem-body ns ps-rw eqs)
-    (define p-form (lookup-judgment-form-id prem-name))
-    (define p-mode (judgment-form-mode p-form))
-    (define p-clauses (judgment-form-gen-clauses p-form))
-    (define-values (p/-s p/+s) (split-by-mode (syntax->list prem-body) p-mode))
-    (define-values (p/-rws mf-apps) (rewrite-terms p/-s ns in-judgment-form?))
-    (define-values (syncheck-exps p/+rws new-names) (rewrite-pats p/+s lang))
-    (define p-rw (assemble p-mode p/-rws p/+rws))
-    (with-syntax ([(p ...) p-rw])
-      (values (cons #`(begin
-                        #,@syncheck-exps
-                        (prem #,p-clauses '(list p ...)))
-                    (append mf-apps ps-rw))
-              eqs
-              (append ns new-names))))
-  (define-values (prems-rev new-eqs new-names)
-    (for/fold ([ps-rw '()] 
-               [eqs '()]
-               [ns names])
-      ([prem prems])
-      (syntax-case prem ()
-        [(-where pat term)
-         (where-keyword? #'-where)
-         (let-values ([(term-rws mf-cs) (rewrite-terms (list #'term) ns in-judgment-form?)])
-           (with-syntax ([(syncheck-exp pat-rw new-names) (rewrite/pat #'pat lang)])
-             (values (append mf-cs ps-rw)
-                     (cons #`(begin syncheck-exp (eqn 'pat-rw '#,(car term-rws))) eqs)
-                     (append (syntax->datum #'new-names) ns))))]
-        [(side-cond rest)
-         (side-condition-keyword? #'side-cond)
-         (if in-judgment-form?
-             (let-values ([(term-rws mf-cs) (rewrite-terms (list #'rest) ns in-judgment-form?)])
-               (values (append mf-cs ps-rw)
-                       (cons #`(dqn '() #f '#,(car term-rws)) eqs)
-                       ns))
-             (values ps-rw eqs ns))]
-        [(prem-name . prem-body)
-         (and (judgment-form-id? #'prem-name) in-judgment-form?)
-         (rewrite-jf #'prem-name #'prem-body ns ps-rw eqs)]
-        [(judgment-holds (prem-name . prem-body))
-         (and (judgment-form-id? #'prem-name) (not in-judgment-form?))
-         (rewrite-jf #'prem-name #'prem-body ns ps-rw eqs)]
-        [var
-         (eq? '... (syntax-e #'var))
-         ;; TODO - fix when implementing ellipses
-         (values ps-rw eqs ns)]
-        [else (raise-syntax-error what "malformed premise" prem)])))
-  (values prems-rev new-eqs new-names))
-
-(define-for-syntax (rewrite-pats pats lang)
-  (with-syntax ([((syncheck-exp pat-rw (names ...)) ...) 
-                 (map (λ (p) (rewrite/pat p lang))
-                      pats)])
-    (values #'(syncheck-exp ...)
-            (syntax->list #'(pat-rw ...))
-            (remove-duplicates (syntax->datum #'(names ... ...))))))
-                  
-
-(define-for-syntax (rewrite/pat pat lang)
-  (with-syntax ([(syncheck-exp body (names ...) (names/ellipses ...))
-                 (rewrite-side-conditions/check-errs lang #'rewrite/pat #t pat)])
-    #'(syncheck-exp body (names ...))))
-
-(define-for-syntax (rewrite-terms terms names [reverse-mfs? #f])
-  (define maybe-rev (if reverse-mfs? reverse values))
-  (with-syntax* ([((term-pattern ((res-pat ((metafunc f) args-pat)) ...) body-pat) ...)
-                  (map (λ (t) (term-rewrite t names)) terms)]
-                 [((mf-clauses ...) ...) (map (λ (fs) 
-                                                (map (λ (f-id)
-                                                       (with-syntax ([f-id f-id])
-                                                         (if (judgment-form-id? #'f-id)
-                                                             #'(error 'generate-term "generation disabled for relations in term positions")
-                                                             #'(metafunc-proc-gen-clauses f-id))))
-                                                     (syntax->list fs)))
-                                              (syntax->list #'((f ...) ...)))])
-                (values (syntax->list #'(body-pat ...))
-                        (maybe-rev (syntax->list #'((prem mf-clauses '(list args-pat res-pat)) ... ...))))))
-
-(define-for-syntax (check-pats stx)
-  (cond
-    [(has-unsupported-pat? stx) 
-     =>
-     (λ (bad-stx)
-       #`(unsupported-pat-err #,bad-stx))]
-    [else
-     stx]))
-
-(define-for-syntax (has-unsupported-pat? stx)
-  (syntax-case stx ()
-    [(repeat . rest)
-     (and (identifier? #'repeat)
-          (eq? (syntax-e #'repeat) 'repeat))
-     #''(repeat . rest)]
-    [(side-condition . rest)
-     (and (identifier? #'side-condition)
-          (eq? (syntax-e #'side-condition) 'side-condition))
-     #''(side-condition . rest)]
-    [(in-hole . rest)
-     (and (identifier? #'in-hole)
-          (eq? (syntax-e #'in-hole) 'in-hole))
-     #''(in-hole . rest)]
-    [(undatum (variable-not-in (term . tr) (q/t s)))
-     (and (identifier? #'undatum)
-          (eq? (syntax-e #'undatum) 'undatum)
-          (identifier? #'variable-not-in)
-          (eq? (syntax-e #'variable-not-in) 'variable-not-in)
-          (identifier? #'q/t)
-          (or (eq? (syntax-e #'q/t) 'term)
-              (eq? (syntax-e #'q/t) 'quote)
-              (eq? (syntax-e #'q/t) 'quasiquote)))
-     #f]
-    [(undatum . rest)
-     (and (identifier? #'undatum)
-          (eq? (syntax-e #'undatum) 'undatum))
-     #''(undatum . rest)]
-    [(undatum-splicing .rest)
-     (and (identifier? #'undatum-splicing)
-          (eq? (syntax-e #'undatum-splicing) 'undatum-splicing))
-     #''(undatum-splicing .rest)]
-    [(elems ...)
-     (for/or ([e (in-list (syntax->list #'(elems ...)))])
-       (has-unsupported-pat? e))]
-    [_
-     #f]))
-
-(provide define-judgment-form 
-         define-relation
-         define-extended-judgment-form
-         judgment-holds
-         build-derivations
-         generate-lws
-         (struct-out derivation)
-         (for-syntax extract-term-let-binds
-                     name-pattern-lws
-                     extract-pattern-binds
-                     check-clauses
-                     split-by-mode
-                     where-keyword?
-                     side-condition-keyword?
-                     ellipsis?
-                     visible-extras
-                     judgment-form-id?
-                     lookup-judgment-form-id
-                     split-out-contract))
-
-
-(provide --> fresh with I O ;; macro keywords
-         (for-syntax prune-syntax
-                     side-condition-keyword?
-                     bind-withs
-                     split-by-mode)
-         current-traced-metafunctions
-         
-         (struct-out metafunc-extra-side-cond)
-         (struct-out metafunc-extra-where)
-         (struct-out metafunc-extra-fresh))
-
-(provide unsupported-pat-err-name
-         (for-syntax rewrite-terms
-                     currently-expanding-term-fn
-                     rewrite-prems
-                     with-syntax*
-                     definition-nts
-                     check-pats
-                     relation-split-out-rhs))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/keyword-macros.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/keyword-macros.rkt
deleted file mode 100644
index 4c8bb505d9..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/keyword-macros.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         racket/contract
-         setup/path-to-relative
-         (for-template racket/base racket/contract))
-
-(define (parse-kw-args formals actuals source form-name)
-  (let loop ([current (for/hash ([arg formals]) (values (car arg) #f))]
-             [rest actuals])
-    (syntax-case rest ()
-      [() (map (λ (arg) 
-                 (match (hash-ref current (car arg))
-                   [#f (cadr arg)]
-                   [x (match (cdr (cdr arg))
-                        ['() x]
-                        [`((,ctc ,desc))
-                         (apply-contract ctc x desc form-name)])]))
-               formals)]
-      [(kw . rest)
-       (not (keyword? (syntax-e (syntax kw))))
-       (raise-syntax-error #f "expected a keyword" source (syntax kw))]
-      [(kw arg . rest)
-       (keyword? (syntax-e (syntax arg)))
-       (raise-syntax-error #f "expected an argument expression" source (syntax arg))]
-      [(kw arg . rest)
-       (let ([none (gensym)])
-         (eq? none (hash-ref current (syntax-e (syntax kw)) none)))
-       (raise-syntax-error #f "invalid keyword" source (syntax kw))]
-      [(kw arg . rest)
-       (hash-ref current (syntax-e (syntax kw)))
-       (raise-syntax-error #f "repeated keyword" source (syntax kw))]
-      [(kw)
-       (raise-syntax-error #f "missing argument expression after keyword" source (syntax kw))]
-      [(kw arg . rest)
-       (loop (hash-set current (syntax-e (syntax kw)) (syntax arg))
-             (syntax rest))]
-      [else (raise-syntax-error #f "bad keyword argument syntax" source rest)])))
-
-;; note: depents on current-directory (or current-load-relative-directory)
-(define (client-name stx form)
-  (define mpi/path/sym (syntax-source-module stx))
-  (define pth/sym (if (module-path-index? mpi/path/sym)
-                      (resolved-module-path-name 
-                       (module-path-index-resolve mpi/path/sym))
-                      mpi/path/sym))
-  (if (path? pth/sym)
-      (path->relative-string/library pth/sym)
-      (format "~s" pth/sym)))
-
-(define (src-loc-stx stx)
-  #`#(#,(and (path? (syntax-source stx))
-             (path->relative-string/library (syntax-source stx)))
-      #,(syntax-line stx) 
-      #,(syntax-column stx) 
-      #,(syntax-position stx)
-      #,(syntax-span stx)))
-
-(define (apply-contract ctc expr desc form)
-  #`(contract #,ctc #,expr
-              #,(client-name expr form) '#,form
-              #,desc #,(src-loc-stx expr)))
-
-(provide src-loc-stx
-         apply-contract
-         client-name
-         parse-kw-args)
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/lang-struct.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/lang-struct.rkt
deleted file mode 100644
index 9428c59c76..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/lang-struct.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/base
-
-(provide (struct-out nt)
-         (struct-out rhs)
-         the-not-hole
-         the-hole
-         hole?)
-
-;; lang = (listof nt)
-;; nt = (make-nt sym (listof rhs))
-;; rhs = (make-rhs single-pattern)
-;; single-pattern = sexp
-(define-struct nt (name rhs) #:transparent)
-(define-struct rhs (pattern) #:transparent)
-(define-values (the-hole the-not-hole hole?)
-  (let ()
-    (struct hole (which)
-      #:property prop:equal+hash (list (λ (x y recur) #t)
-                                       (λ (v recur) 255)
-                                       (λ (v recur) 65535))
-      #:methods gen:custom-write
-      [(define (write-proc a-hole port mode)
-         (define str (if (equal? (hole-which a-hole) 'the-hole)
-                         "hole"
-                         "not-hole"))
-         (cond
-           [(or (equal? mode 0) (equal? mode 1))
-            (write-string str port)]
-           [else
-            (write-string "#<" port)
-            (write-string str port)
-            (write-string ">" port)]))]
-      #:inspector #f)
-    (define the-hole (hole 'the-hole))
-    (define the-not-hole (hole 'the-not-hole))
-    (values the-hole the-not-hole hole?)))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper-ct.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper-ct.rkt
deleted file mode 100644
index a9381dbb6d..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper-ct.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang racket/base
-(require (for-template racket/base)
-         (for-template "loc-wrapper-rt.rkt")
-         "term-fn.rkt")
-(provide to-lw/proc to-lw/uq/proc)
-
-(define (process-arg stx quote-depth)
-  (define quoted? (quote-depth . > . 0))
-  (define init-loc-wrapper/q? (if quoted? 'init-loc-wrapper/quoted 'init-loc-wrapper/unquoted)) 
-  (define-values (op cl)
-    (if (syntax? stx)
-        (case (syntax-property stx 'paren-shape)
-          [(#\{) (values "{" "}")]
-          [(#\[) (values "[" "]")]
-          [else (values "(" ")")])
-        (values #f #f)))
-  (define (reader-shorthand arg qd-delta mrk)
-    #`#(#,init-loc-wrapper/q? 
-        #(list #(#,init-loc-wrapper/q? #,mrk
-                                      #,(syntax-line stx)
-                                      #,(syntax-column stx))
-               'spring
-               #,(process-arg arg (+ quote-depth qd-delta)))
-        #,(syntax-line stx) 
-        #,(syntax-column stx)))
-  (define (handle-sequence qd-delta)
-    (with-syntax ([(others ...) (map (λ (x) (process-arg x (+ qd-delta quote-depth))) (syntax->list stx))]) 
-      #`#(#,(if quoted?
-                'init-loc-wrapper-sequence/quoted
-                'init-loc-wrapper-sequence/unquoted)
-          #,op #,(syntax-line stx) #,(syntax-column stx)
-          others ...)))
-  (syntax-case* stx (name unquote quote unquote-splicing term) (λ (x y) (eq? (syntax-e x) (syntax-e y)))
-    ['a (reader-shorthand #'a +1 (if (= quote-depth 0) "" "'"))]
-    [,a (reader-shorthand #'a -1 (if (= quote-depth 1) "" ","))]
-    [,@a (reader-shorthand #'a -1 (if (= quote-depth 1) "" ",@"))]
-    [(term a)
-     (if (= quote-depth 0)
-         #`#(#,init-loc-wrapper/q?
-             #(list #(#,init-loc-wrapper/q? "" #,(syntax-line stx) #,(syntax-column stx))
-                    'spring
-                    #,(process-arg (cadr (syntax->list stx)) (+ quote-depth 1)))
-             #,(syntax-line stx) 
-             #,(syntax-column stx))
-         (handle-sequence +1))]
-    [(a ...)
-     (handle-sequence 0)]
-    [(a b ... . c)
-     #`#(#,init-loc-wrapper/q? 
-         #(list #(#,init-loc-wrapper/q? #,op #,(syntax-line stx) #,(syntax-column stx))
-                #,@(map (λ (x) (process-arg x quote-depth)) (syntax->list (syntax (a b ...))))
-                #(#,init-loc-wrapper/q? #," . " #f #f)
-                #,(process-arg #'c quote-depth)
-                #(#,init-loc-wrapper/q? #,cl #f #f))
-         #,(syntax-line stx) 
-         #,(syntax-column stx))]
-    [x 
-     (and (identifier? #'x)
-          (and (syntax-transforming?)
-               (or (term-fn? (syntax-local-value #'x (λ () #f)))
-                   (judgment-form? (syntax-local-value #'x (λ () #f))))))
-     #`#(make-lw
-         '#,(syntax-e #'x)
-         #,(syntax-line stx) 
-         #f
-         #,(syntax-column stx)
-         #f
-         #f
-         #t)]
-    [x 
-     (identifier? #'x)
-     #`#(#,init-loc-wrapper/q? 
-         '#,(syntax-e #'x)
-         #,(syntax-line stx) 
-         #,(syntax-column stx))]
-    [x 
-     #`#(#,init-loc-wrapper/q?
-         #,(let ([base (syntax-e #'x)])
-             (if (string? base)
-                 #`#(rewrite-quotes #,(format "~s" base))
-                 (format "~s" (syntax-e #'x))))
-         #,(syntax-line stx) 
-         #,(syntax-column stx))]))
-
-(define (to-lw/proc stx [add-add-spans? #t]) 
-  (if add-add-spans?
-      #`(add-spans/interp-lws #,(process-arg stx 1))
-      (process-arg stx 1)))
-(define (to-lw/uq/proc stx [add-add-spans? #t])
-  (if add-add-spans?
-      #`(add-spans/interp-lws #,(process-arg stx 0))
-      (process-arg stx 0)))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper-rt.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper-rt.rkt
deleted file mode 100644
index 2f61659c04..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper-rt.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang racket/base
-
-;; this is the runtime code for loc-wrapper-ct.rkt.
-;; it isn't really its own module, but separated
-;; out in order to get the phases right.
-(provide (all-defined-out))
-
-(require racket/match
-         "term.rkt")
-
-(define (init-loc-wrapper e line column quoted?)
-  (if quoted?
-      (make-lw e line #f column #f #f #f)
-      (make-lw e line #f column #f #t #f)))
-
-(define (init-loc-wrapper/unquoted e line column)
-  (init-loc-wrapper e line column #f))
-(define (init-loc-wrapper/quoted e line column)
-  (init-loc-wrapper e line column #t))
-
-;; lw = (union 'spring loc-wrapper)
-
-;; e : (union string symbol #f (listof lw))
-;; line, line-span, column, column-span : number
-(define-struct lw (e line line-span column column-span unq? metafunction?) 
-  #:mutable
-  #:inspector (make-inspector))
-
-;; build-lw is designed for external consumption
-(define (build-lw e line line-span column column-span)
-  (make-lw e line line-span column column-span #f #f))
-
-(define curly-quotes-for-strings (make-parameter #t))
-
-(define (rewrite-quotes s)
-  (if (curly-quotes-for-strings)
-      (string-append "“"
-                     (substring s 1 (- (string-length s) 1))
-                     "”")
-      s))
-
-(define (add-spans/interp-lws arg)
-  (add-spans
-   (let loop ([arg arg])
-     (match arg
-       [(vector 'init-loc-wrapper/quoted e line column)
-        (init-loc-wrapper/quoted (loop e) (loop line) (loop column))]
-       [(vector 'init-loc-wrapper/unquoted e line column)
-        (init-loc-wrapper/unquoted (loop e) (loop line) (loop column))]
-       [(vector 'make-lw e line line-span column column-span unq? metafunction?)
-        (make-lw (loop e) (loop line) (loop line-span) (loop column) 
-                 (loop column-span) (loop unq?) (loop metafunction?))]
-       [(vector 'rewrite-quotes arg)
-        (rewrite-quotes (loop arg))]
-       [(vector 'list x ...)
-        (map loop x)]
-       [(vector (and (or 'init-loc-wrapper-sequence/quoted
-                         'init-loc-wrapper-sequence/unquoted)
-                     kwd)
-                open line col args ...)
-        (define quoted? (eq? 'init-loc-wrapper-sequence/quoted kwd))
-        (define l-line (loop line))
-        (define l-col (loop col))
-        (init-loc-wrapper 
-         (cons (init-loc-wrapper open l-line l-col quoted?)
-               (append (map loop args)
-                       (list (init-loc-wrapper (open->close open) #f #f quoted?))))
-         l-line l-col quoted?)]
-       [`(quote ,x) x]
-       [(? number?) arg]
-       [(? boolean?) arg]
-       [(? string?) arg]
-       [(? symbol?) arg]
-       [else
-        (error 'add-spans/interp-lws "unk ~s" arg)]))))
-
-(define (open->close open)
-  (cond
-    [(equal? open "(") ")"]
-    [(equal? open "[") "]"]
-    [(equal? open "{") "}"]
-    [(equal? open #f) #f]
-    [else (error 'open->close "unk ~s" open)]))
-
-(define (add-spans lw)
-  (define line-seen-so-far 0)
-  
-  (define (add-spans/lw lw line col)
-    (cond
-      [(eq? lw 'spring) (values line col col)]
-      [else
-       (let ([start-line (or (lw-line lw) line line-seen-so-far)]
-             [start-column (or (lw-column lw) col 0)])
-         (set! line-seen-so-far (max line-seen-so-far start-line))
-         (unless (lw-line lw) (set-lw-line! lw line-seen-so-far))
-         (unless (lw-column lw) (set-lw-column! lw start-column))
-         (let-values ([(last-line first-column last-column)
-                       (add-spans/obj (lw-e lw) start-line start-column)])
-           (set-lw-line-span! lw (- last-line start-line))
-           (let ([new-col (min/f (lw-column lw)
-                                 first-column)])
-             (set-lw-column! lw new-col)
-             (set-lw-column-span! lw (- last-column new-col)))
-           (values last-line first-column last-column)))]))
-  (define (add-spans/obj e line col)
-    (cond
-      [(string? e) 
-       (values line col (+ col (string-length e)))]
-      [(symbol? e)
-       (values line col (+ col (string-length (format "~s" e))))]
-      [(not e) (values line col col)]
-      [else 
-       (let loop ([lws e]
-                  [line line]
-                  [first-column col]
-                  [last-column col]
-                  [current-col col])
-         (cond
-           [(null? lws) (values line first-column last-column)]
-           [else 
-            (let-values ([(last-line inner-first-column inner-last-column)
-                          (add-spans/lw (car lws) line current-col)])
-              (if (= last-line line)
-                  (loop (cdr lws)
-                        last-line
-                        (min inner-first-column first-column)
-                        (max inner-last-column last-column)
-                        inner-last-column)
-                  (loop (cdr lws)
-                        last-line
-                        (min inner-first-column first-column)
-                        inner-last-column
-                        inner-last-column)))]))]))
-  
-  (add-spans/lw lw #f #f)
-  lw)
-
-(define (min/f a b)
-  (cond
-    [(and a b) (min a b)]
-    [a a]
-    [b b]
-    [else 0]))
-
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper.rkt
deleted file mode 100644
index 9ea915a35b..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         (for-syntax racket/base)
-         (for-syntax "loc-wrapper-ct.rkt")
-         "loc-wrapper-rt.rkt")
-
-(define-syntax (to-lw stx) 
-  (syntax-case stx ()
-    [(_ stx)
-     (to-lw/proc #'stx)]))
-(define-syntax (to-lw/uq stx)
-  (syntax-case stx ()
-    [(_ stx)
-     (to-lw/uq/proc #'stx)]))
-
-(define pnum (and/c number? (or/c zero? positive?)))
-
-(provide/contract
- (struct lw ((e any/c)
-             (line pnum)
-             (line-span pnum)
-             (column pnum)
-             (column-span pnum)
-             (unq? boolean?)
-             (metafunction? boolean?)))
- [build-lw (-> any/c pnum pnum pnum pnum lw?)])
-
-(provide to-lw
-         to-lw/uq
-         curly-quotes-for-strings)
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/match-a-pattern.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/match-a-pattern.rkt
deleted file mode 100644
index 9cc5675c15..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/match-a-pattern.rkt
+++ /dev/null
@@ -1,154 +0,0 @@
-#lang racket/base
-(require racket/match 
-         (for-syntax racket/match
-                     racket/base))
-(provide match-a-pattern match-a-pattern/single-base-case)
-
-#|
-
-The grammar for the internal patterns is the 
-contents of the should-be-pats list, where each
-'pat' that appears behind an unquote there is
-a self-reference in the grammar. 
-
-  lpat ::= pat 
-         | `(repeat ,pat ,(or/c symbol? #f) ,(or/c symbol? #f))
-         ;; repeat indicates a repetition (ellipsis in the
-         ;; surface language), where the pattern inside is
-         ;; what's repeated, the second position is a name
-         ;; if the ellipsis is named normally and the final
-         ;; position is a name if the ellipsis has a mismatch
-         ;; name (more below).
-  var ::= symbol?     
-  condition ::= (-> bindings? any) ;; any is treated like a boolean
-
-Also, the `(cross ,nt) pattern alwyas has hypenated non-terminals, ie
-(cross e) in the source turns into (cross e-e) after translation which
-means that the other cross non-terminals, e.g. (cross e-v), are not
-directly available as redex patterns, but can only be used via the
-non-terminals that Redex creates for the cross languages.
-
-Internal patterns also come with the invariant that there are no
-redundant or non-local ellipses names. That is, consider this pattern:
-
-  (any_1 ..._1 any_1 ..._2)
-
-It might seem like it would turn into something like this:
-
-  (list (repeat (name any_1 any) ..._1 #f)
-        (repeat (name any_1 any) ..._2 #f))
-
-but the _1 and _2 are actually not as specific as they could be, 
-since the any_1 name will force the two ellipses lengths to be
-the same. So, this must turn into this pattern:
-
-  (list (repeat (name any_1 any) ..._1 #f)
-        (repeat (name any_1 any) ..._1 #f))
-
-Similarly, if there are superflous names, they are deleted. For
-example, this source pattern:
-
-  (any_1 ..._1)
-
-turns into this:
-
-  (list (repeat (name any_1 any) #f #f))
-
-Also, although there cannot be any patterns at the source level
-that have both kinds of names, there can be once the ellipses
-have been resolved. For example, this:
-
-  (any_1 ..._1
-   any_1 ..._!_2
-   any_1 ..._1
-   any_1 ..._!_2)
-
-turns into this:
-
-  (list (repeat (name any_1 any) ..._1 #f)
-        (repeat (name any_1 any) ..._1 ..._!_2)
-        (repeat (name any_1 any) ..._1 #f)
-        (repeat (name any_1 any) ..._1 ..._!_2))
-
-|#
-
-(define-for-syntax (match-a-pattern/proc stx skip-non-recursive?)
-  (define (check-pats pats allow-else?)
-    (let ()
-      (define (non-recursive? x) (or (<= x 12) (= x 18) (= x 20)))
-      (define should-be-pats
-        (append '(`any
-                  `number
-                  `string
-                  `natural
-                  `integer
-                  `real
-                  `boolean
-                  `variable
-                  `(variable-except ,var ...)
-                  `(variable-prefix ,var)
-                  `variable-not-otherwise-mentioned
-                  `hole
-                  `(nt ,var)
-                  `(name ,var ,pat)
-                  `(mismatch-name ,var ,pat)
-                  `(in-hole ,pat ,pat) ;; context, then contractum
-                  `(hide-hole ,pat)
-                  `(side-condition ,pat ,condition ,srcloc-expr)
-                  `(cross ,var)
-                  `(list ,lpat ...)
-                  
-                   ;; pattern for literals (numbers, strings, prefabs, etc etc etc)
-                  (? (compose not pair?)))
-                (if (or allow-else? skip-non-recursive?)
-                    (list '_)
-                    (list))))
-      (define unused-supplied-pats
-        (for/fold ([supplied-pats pats])
-                  ([should-be (in-list should-be-pats)]
-                   [i (in-naturals)])
-          
-          (when (null? supplied-pats)
-            (raise-syntax-error #f 
-                                (format "did not find pattern ~s"
-                                        should-be)
-                                stx))
-          (define supplied-pat (car supplied-pats))
-          (cond [(and (non-recursive? i) skip-non-recursive?)
-                 supplied-pats]
-                [else
-                 (define pats-match?
-                   (let loop ([pat (syntax->datum supplied-pat)]
-                              [should-be should-be])
-                     (cond
-                      [(and (null? pat) (null? should-be)) #t]
-                      [(and (pair? pat) (pair? should-be))
-                       (cond
-                        [(eq? (car should-be) 'unquote)
-                         (eq? (car pat) 'unquote)]
-                        [else
-                         (and (loop (car pat) (car should-be))
-                              (loop (cdr pat) (cdr should-be)))])]
-                      [else (equal? pat should-be)])))
-                 (unless pats-match?
-                   (raise-syntax-error #f
-                                       (format "expected pattern ~s" 
-                                               should-be)
-                                       stx
-                                       supplied-pats))
-                 (cdr supplied-pats)])))      
-      (unless (null? unused-supplied-pats)
-        (raise-syntax-error #f "too many patterns" stx unused-supplied-pats))))
-  (syntax-case stx ()
-    [(_ #:allow-else to-match [pats rhs ...] ...)
-     (not skip-non-recursive?)
-     (let ()
-       (check-pats (syntax->list #'(pats ...)) #t)
-       #'(match to-match [pats rhs ...] ...))]
-    [(_ to-match [pats rhs ...] ...)
-     (let ()
-       (check-pats (syntax->list #'(pats ...)) skip-non-recursive?)
-       #'(match to-match [pats rhs ...] ...))]))
-
-(define-syntax (match-a-pattern stx) (match-a-pattern/proc stx #f))
-(define-syntax (match-a-pattern/single-base-case stx) (match-a-pattern/proc stx #t))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/matcher.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/matcher.rkt
deleted file mode 100644
index eef56b7af8..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/matcher.rkt
+++ /dev/null
@@ -1,2056 +0,0 @@
-#lang racket/base
-
-;; optimization ideas:
-;;
-;; -- jay's idea
-;;
-;; -- when a list pattern has only a single repeat,
-;;    don't search for matches, just count
-;;
-;; -- need to figure out something to do with patterns
-;;    that have multiple ellipses in a sequence. Perhaps try
-;;    to look for the fixed parts and then see if the others
-;;    will fill in between them?
-;;
-;; -- when a match is unambiguous (and possibly only when
-;;    there are no names underneath an ellipsis),
-;;    pre-allocate the space to store the result (in a vector)
-;;
-;; -- change the way decomposition matching works to pass down
-;;    the pattern to match at the hole and match it there, so
-;;    that in situations like this: (in-hole E (+ n_1 n_2))
-;;    we don't return all of the bogus matches that show up
-;;    by treating the hole as 'any'. 
-;;
-;;    (this one turns out not to be so great because it
-;;     makes caching less effective)
-;;
-;; -- combine the left-hand sides of a reduction relation
-;;    so to avoid re-doing decompositions over and over
-;;    (maybe....)
-;;
-;; -- parallelism? but what about the hash-table cache?
-;; 
-#|
-
-Note: the patterns described in the documentation are
-slightly different than the patterns processed here.
-See match-a-pattern.rkt for more details
-
-|#
-(require racket/list
-         racket/match
-         racket/contract
-         racket/promise
-         racket/set
-         data/union-find
-         racket/performance-hint
-         (for-syntax racket/base)
-         "build-nt-property.rkt"
-         "underscore-allowed.rkt"
-         "match-a-pattern.rkt"
-         "lang-struct.rkt"
-         "enum.rkt")
-
-(define-struct compiled-pattern (cp binds-names? skip-dup-check?) #:transparent)
-
-(define caching-enabled? (make-parameter #t))
-
-;; var = (make-var sym sexp)
-;; patterns are sexps with `var's embedded
-;; in them. It means to match the
-;; embedded sexp and return that binding
-
-;; bindings = (make-bindings (listof rib))
-;; rib = (make-bind sym sexp)
-;; if a rib has a pair, the first element of the pair should be treated as a prefix on the identifier
-;; NOTE: the bindings may contain mismatch-ribs temporarily, but they are all removed
-;;       by merge-multiples/remove, a helper function called from match-pattern
-(define-values (make-bindings bindings-table bindings? empty-bindings)
-  (let () 
-    (define-struct bindings (table) #:transparent) ;; for testing, add inspector
-    (define empty-bindings (make-bindings '()))
-    (values (lambda (table) (if (null? table) empty-bindings (make-bindings table)))
-            bindings-table
-            bindings?
-            empty-bindings)))
-
-(define-struct bind (name exp) #:transparent)
-(define-struct mismatch-bind (name exp nesting-depth) #:transparent)
-
-;; repeat = (make-repeat compiled-pattern (listof rib) (or/c #f symbol?) (or/c #f symbol?))
-(define-struct repeat (pat empty-bindings name mismatch) #:transparent)
-
-;; compiled-pattern : exp hole-info nesting-depth -> (union #f (listof mtch))
-;; mtch = (make-mtch bindings sexp[context] (union none sexp[hole]))
-;; hole-info = boolean
-;;               #f means we're not in a `in-hole' context
-;;               #t means we're looking for a hole
-(define-values (mtch-bindings mtch-context mtch-hole make-mtch mtch?)
-  (let ()
-    (define-struct mtch (bindings context hole) #:inspector (make-inspector))
-    (values mtch-bindings
-            mtch-context
-            mtch-hole
-            (lambda (a b c)
-              (unless (bindings? a)
-                (error 'make-mtch "expected bindings for first agument, got ~e" a))
-              (make-mtch a b c))
-            mtch?)))
-
-(define none
-  (let ()
-    (define-struct none ())
-    (make-none)))
-(define (none? x) (eq? x none))
-
-;; compiled-lang : (make-compiled-lang (listof nt) 
-;;                                     hash[sym -o> compiled-pattern]
-;;                                     hash[sym -o> compiled-pattern]
-;;                                     hash[sym -o> compiled-pattern]
-;;                                     hash[sym -o> boolean])
-;;                                     hash[sexp[pattern] -o> (cons compiled-pattern boolean)]
-;;                                     hash[sexp[pattern] -o> (cons compiled-pattern boolean)]
-;;                                     pict-builder
-;;                                     (listof symbol)
-;;                                     (listof (listof symbol)) -- keeps track of `primary' non-terminals
-;;                                     hash[sym -o> pattern]
-;;                                     (hash/c symbol? enum?)) ;; see enum.rkt
-
-(define-struct compiled-lang (lang delayed-cclang ht list-ht raw-across-ht raw-across-list-ht
-                                   has-hole-or-hide-hole-ht cache bind-names-cache pict-builder
-                                   literals nt-map collapsible-nts
-                                   enum-table))
-(define (compiled-lang-cclang x) (force (compiled-lang-delayed-cclang x)))
-(define (compiled-lang-across-ht x)
-  (compiled-lang-cclang x) ;; ensure this is computed
-  (compiled-lang-raw-across-ht x))
-(define (compiled-lang-across-list-ht x) 
-  (compiled-lang-cclang x) ;; ensure this is computed
-  (compiled-lang-raw-across-list-ht x))
-
-;; lookup-binding : bindings (union sym (cons sym sym)) [(-> any)] -> any
-(begin-encourage-inline
-  (define (lookup-binding bindings
-                          sym
-                          [fail (lambda () 
-                                  (error 'lookup-binding "didn't find ~e in ~e" sym bindings))])
-    (let loop ([ribs (bindings-table bindings)])
-      (cond
-        [(null? ribs) (fail)]
-        [else
-         (let ([rib (car ribs)])
-           (if (and (bind? rib) (eq? (bind-name rib) sym))
-               (bind-exp rib)
-               (loop (cdr ribs))))]))))
-
-;; compile-language : language-pict-info[see pict.rkt] (listof nt) (listof (uf-set/c symbol?)) -> compiled-lang
-(define (compile-language pict-info lang nt-map)
-  (let* ([clang-ht (make-hasheq)]
-         [clang-list-ht (make-hasheq)]
-         [across-ht (make-hasheq)]
-         [across-list-ht (make-hasheq)]
-         [has-hole-or-hide-hole-ht (build-has-hole-or-hide-hole-ht lang)]
-         [cache (make-hash)]
-         [bind-names-cache (make-hash)]
-         [literals (extract-literals lang)]
-         [collapsible-nts (extract-collapsible-nts lang)]
-         [clang (make-compiled-lang lang #f clang-ht clang-list-ht 
-                                    across-ht across-list-ht
-                                    has-hole-or-hide-hole-ht 
-                                    cache bind-names-cache
-                                    pict-info
-                                    literals
-                                    nt-map
-                                    collapsible-nts
-                                    #f)]
-         [non-list-nt-table (build-non-list-nt-label lang)]
-         [list-nt-table (build-list-nt-label lang)]
-         [do-compilation
-          (lambda (ht list-ht lang)
-            (for ([nt (in-list lang)])
-              (for ([rhs (in-list (nt-rhs nt))])
-                (define-values (compiled-pattern-proc has-hole? has-hide-hole? names) 
-                  (compile-pattern/cross? clang (rhs-pattern rhs) #f))
-                (define (add-to-ht ht) 
-                  (define nv (cons (build-compiled-pattern compiled-pattern-proc names)
-                                   (hash-ref ht (nt-name nt))))
-                  (hash-set! ht (nt-name nt) nv))
-                (define may-be-non-list? (may-be-non-list-pattern? (rhs-pattern rhs) non-list-nt-table))
-                (define may-be-list? (may-be-list-pattern? (rhs-pattern rhs) list-nt-table))
-                (when may-be-non-list? (add-to-ht ht))
-                (when may-be-list? (add-to-ht list-ht))
-                (unless (or may-be-non-list? may-be-list?)
-                  (error 'compile-language 
-                         "internal error: unable to determine whether pattern matches lists, non-lists, or both: ~s"
-                         (rhs-pattern rhs))))))]
-         [init-ht
-          (lambda (ht)
-            (for-each (lambda (nt) (hash-set! ht (nt-name nt) null))
-                      lang))])
-    
-    (init-ht clang-ht)
-    (init-ht clang-list-ht)
-    
-    (hash-for-each
-     clang-ht
-     (lambda (nt rhs)
-       (when (has-underscore? nt)
-         (error 'compile-language "cannot use underscore in nonterminal name, ~s" nt))))
-    
-    (define compatible-context-language
-      (delay
-        (let ([compatible-context-language
-               (build-compatible-context-language clang-ht lang)])
-          (for-each (lambda (nt)
-                      (hash-set! across-ht (nt-name nt) null)
-                      (hash-set! across-list-ht (nt-name nt) null))
-                    compatible-context-language)
-          (do-compilation across-ht across-list-ht compatible-context-language)
-          compatible-context-language)))
-    (do-compilation clang-ht clang-list-ht lang)
-    (define enumerators
-      (lang-enumerators lang compatible-context-language))
-    (struct-copy compiled-lang clang [delayed-cclang compatible-context-language]
-                                     [enum-table enumerators])))
-
-;; mk-uf-sets : (listof (listof sym)) -> (hash[symbol -o> uf-set?])
-;; in the result hash, each nt maps to a uf-set that represents
-;; the set of non-terminals that are coming from the same group
-(define (mk-uf-sets args)
-  (for/fold ([iht (hash)]) ([same-nts (in-list args)])
-    (define main-name (car same-nts))
-    (define main (uf-new main-name))
-    (for/fold ([iht (hash-set iht main-name main)]) 
-      ([other (in-list (cdr same-nts))])
-      (define next (uf-new other))
-      (uf-union! main next)
-      (hash-set iht other next))))
-
-;; extract-collapsible-nts : (listof nt) -> (listof any)
-(define (extract-collapsible-nts nts)
-  (define nt-hash (for/hasheq ([nt nts]) 
-                    (values (nt-name nt) (nt-rhs nt))))
-  (for/fold ([c-nts (hasheq)])
-    ([nt (in-hash-keys nt-hash)])
-    (let loop ([rhss (hash-ref nt-hash nt)])
-      (if (= (length rhss) 1)
-          (match (rhs-pattern (car rhss))
-            [`(nt ,next)
-             (loop (hash-ref nt-hash next))]
-            [else
-             (hash-set c-nts nt (rhs-pattern (car rhss)))])
-          c-nts))))
-
-
-;; extract-literals : (listof nt) -> (listof symbol)
-(define (extract-literals nts)
-  (let ([literals-ht (make-hasheq)]
-        [nt-names (map nt-name nts)])
-    (for-each (λ (nt) 
-                (for-each (λ (rhs) (extract-literals/pat nt-names (rhs-pattern rhs) literals-ht))
-                          (nt-rhs nt)))
-              nts)
-    (hash-map literals-ht (λ (x y) x))))
-
-;; extract-literals/pat : (listof sym) pattern ht -> void
-;; inserts the literals mentioned in pat into ht
-(define (extract-literals/pat nts pat ht)
-  (let loop ([pat pat])
-    (match-a-pattern pat
-      [`any (void)]
-      [`number (void)]
-      [`string (void)]
-      [`natural (void)]
-      [`integer (void)]
-      [`real (void)]
-      [`boolean (void)]
-      [`variable (void)]
-      [`(variable-except ,s ...) (void)]
-      [`(variable-prefix ,s) (void)]
-      [`variable-not-otherwise-mentioned (void)]
-      [`hole (void)]
-      [`(nt ,id) (void)]
-      [`(name ,name ,pat) (loop pat)]
-      [`(mismatch-name ,name ,pat) (loop pat)]
-      [`(in-hole ,p1 ,p2) 
-       (loop p1)
-       (loop p2)]
-      [`(hide-hole ,p) (loop p)]
-      [`(side-condition ,p ,g ,e)
-       (loop p)]
-      [`(cross ,s) (void)]
-      [`(list ,sub-pats ...)
-       (for ([sub-pat (in-list sub-pats)])
-         (match sub-pat
-           [`(repeat ,pat ,name ,mismatch)
-            (loop pat)]
-           [else
-            (loop sub-pat)]))]
-      [(? (compose not pair?)) 
-       (when (symbol? pat)
-         (unless (regexp-match #rx"_" (symbol->string pat))
-           (unless (regexp-match #rx"^\\.\\.\\." (symbol->string pat))
-             (unless (memq pat nts)
-               (hash-set! ht pat #t)))))])))
-
-;; prefix-nts : string pat -> pat
-(define (prefix-nts prefix pat)
-  (let loop ([pat pat])
-    (match-a-pattern pat
-      [`any pat]
-      [`number pat]
-      [`string pat]
-      [`natural pat]
-      [`integer pat]
-      [`real pat]
-      [`boolean pat]
-      [`variable pat]
-      [`(variable-except ,s ...) pat]
-      [`(variable-prefix ,s) pat]
-      [`variable-not-otherwise-mentioned pat]
-      [`hole pat]
-      [`(nt ,id) `(nt ,(string->symbol (string-append prefix (symbol->string id))))]
-      [`(name ,name ,pat) `(name , name ,(loop pat))]
-      [`(mismatch-name ,name ,pat) `(mismatch-name ,name ,(loop pat))]
-      [`(in-hole ,p1 ,p2) `(in-hole ,(loop p1) ,(loop p2))]
-      [`(hide-hole ,p) `(hide-hole ,(loop p))]
-      [`(side-condition ,p ,g ,e) `(side-condition ,(loop p) ,g ,e)]
-      [`(cross ,s) pat]
-      [`(list ,sub-pats ...)
-       `(list ,@(for/list ([sub-pat (in-list sub-pats)])
-                  (match sub-pat
-                    [`(repeat ,pat ,name ,mismatch)
-                     `(repeat ,(loop pat) ,name ,mismatch)]
-                    [else
-                     (loop sub-pat)])))]
-      [(? (compose not pair?)) 
-       pat])))
-
-; build-has-hole-or-hide-hole-ht : (listof nt) -> hash[symbol -o> boolean]
-; produces a map of nonterminal -> whether that nonterminal could produce a hole
-(define (build-has-hole-or-hide-hole-ht lang)
-  (build-nt-property 
-   lang
-   (lambda (pattern ht)
-     (let loop ([pattern pattern])
-       (match-a-pattern pattern
-         [`any #f]
-         [`number #f]
-         [`string #f]
-         [`natural #f]
-         [`integer #f]
-         [`real #f]
-         [`boolean #f]
-         [`variable #f] 
-         [`(variable-except ,vars ...) #f]
-         [`(variable-prefix ,var) #f]
-         [`variable-not-otherwise-mentioned #f]
-         [`hole #t]
-         [`(nt ,id) (hash-ref ht id)]
-         [`(name ,name ,pat) (loop pat)]
-         [`(mismatch-name ,name ,pat) (loop pat)]
-         [`(in-hole ,context ,contractum) (loop contractum)]
-         [`(hide-hole ,arg) #t]
-         [`(side-condition ,pat ,condition ,expr) (loop pat)]
-         [`(cross ,nt) #f]
-         [`(list ,pats ...)
-          (for/or ([pat (in-list pats)])
-            (match pat
-              [`(repeat ,pat ,name ,mismatch?) (loop pat)]
-              [_ (loop pat)]))]
-         [(? (compose not pair?)) #f])))
-   #f
-   (λ (x y) (or x y))))
-
-;; build-compatible-context-language : lang -> lang
-(define (build-compatible-context-language clang-ht lang)
-  (remove-empty-compatible-contexts
-   (apply
-    append
-    (map 
-     (lambda (nt1)
-       (map
-        (lambda (nt2)
-          (let ([compat-nt (build-compatible-contexts/nt clang-ht (nt-name nt1) nt2)])
-            (if (eq? (nt-name nt1) (nt-name nt2))
-                (make-nt (nt-name compat-nt)
-                         (cons
-                          (make-rhs 'hole)
-                          (nt-rhs compat-nt)))
-                compat-nt)))
-        lang))
-     lang))))
-
-;; remove-empty-compatible-contexts : lang -> lang
-;; Removes the empty compatible context non-terminals and the 
-;; rhss that reference them.
-(define (remove-empty-compatible-contexts lang)
-  (define (has-cross? pattern crosses)
-    (match pattern
-      [`(cross ,(? symbol? nt)) (memq nt crosses)]
-      [(list-rest p '... rest) (has-cross? rest crosses)]
-      [(cons first rest) (or (has-cross? first crosses)
-                             (has-cross? rest crosses))]
-      [_ #f]))
-  (define (delete-empty nts)
-    (for/fold ([deleted null] [kept null]) ([nt nts])
-      (if (null? (nt-rhs nt))
-          (values (cons nt deleted) kept)
-          (values deleted (cons nt kept)))))
-  (define (delete-references deleted-names remaining-nts)
-    (map (λ (nt) 
-           (make-nt (nt-name nt)
-                    (filter (λ (rhs) (not (has-cross? (rhs-pattern rhs) deleted-names))) 
-                            (nt-rhs nt))))
-         remaining-nts))
-  
-  (let loop ([nts lang])
-    (let-values ([(deleted kept) (delete-empty nts)])
-      (if (null? deleted)
-          kept
-          (loop (delete-references (map nt-name deleted) kept))))))
-
-;; build-compatible-contexts : clang-ht prefix nt -> nt
-;; constructs the compatible closure evaluation context from nt.
-(define (build-compatible-contexts/nt clang-ht prefix nt)
-  (make-nt
-   (symbol-append prefix '- (nt-name nt))
-   (apply append
-          (map
-           (lambda (rhs)
-             (let-values ([(maker count) (build-compatible-context-maker clang-ht
-                                                                         (rhs-pattern rhs)
-                                                                         prefix)])
-               (let loop ([i count])
-                 (cond
-                   [(zero? i) null]
-                   [else (let ([nts (build-across-nts (nt-name nt) count (- i 1))])
-                           (cons (make-rhs (maker (box nts)))
-                                 (loop (- i 1))))]))))
-           (nt-rhs nt)))))
-
-(define (symbol-append . args)
-  (string->symbol (apply string-append (map symbol->string args))))
-
-;; build-across-nts : symbol number number -> (listof pattern)
-(define (build-across-nts nt count i)
-  (let loop ([j count])
-    (cond
-      [(zero? j) null]
-      [else
-       (cons (= i (- j 1)) 
-             (loop (- j 1)))])))
-
-;; build-compatible-context-maker : symbol pattern -> (values ((box (listof pattern)) -> pattern) number)
-;; when the result function is applied, it takes each element
-;; of the of the boxed list and plugs them into the places where
-;; the nt corresponding from this rhs appeared in the original pattern. 
-;; The number result is the number of times that the nt appeared in the pattern.
-(define (build-compatible-context-maker clang-ht pattern prefix)
-  (let ([count 0])
-    (define maker
-     (let loop ([pattern pattern])
-       (define (untouched-pattern _) 
-         (values pattern #f))
-       (match-a-pattern pattern
-         [`any untouched-pattern]
-         [`number untouched-pattern]
-         [`string untouched-pattern]
-         [`natural untouched-pattern]
-         [`integer untouched-pattern]
-         [`real untouched-pattern]
-         [`boolean untouched-pattern]
-         [`variable untouched-pattern] 
-         [`(variable-except ,vars ...) untouched-pattern]
-         [`(variable-prefix ,var) untouched-pattern]
-         [`variable-not-otherwise-mentioned untouched-pattern]
-         [`hole untouched-pattern]
-         [`(nt ,name)
-          (cond
-            [(hash-ref clang-ht name #f)
-             (set! count (+ count 1))
-             (lambda (l)
-               (let ([fst (car (unbox l))])
-                 (set-box! l (cdr (unbox l)))
-                 (if fst
-                     (values `(cross ,(symbol-append prefix '- name)) #t)
-                     (values pattern #f))))]
-            [else untouched-pattern])]
-         [`(name ,name ,pat)
-          (let ([patf (loop pat)])
-            (lambda (l)
-              (let-values ([(p h?) (patf l)])
-                (values `(name ,name ,p) h?))))]
-         [`(mismatch-name ,name ,pat)
-          (let ([patf (loop pat)])
-            (lambda (l)
-              (let-values ([(p h?) (patf l)])
-                (values `(mismatch-name ,name ,p) h?))))]
-         [`(in-hole ,context ,contractum)
-          (let ([match-context (loop context)]
-                [match-contractum (loop contractum)])
-            (lambda (l)
-              (let-values ([(ctxt _) (match-context l)]
-                           [(ctct h?) (match-contractum l)])
-                (values `(in-hole ,ctxt ,ctct) h?))))]
-         [`(hide-hole ,p)
-          (let ([m (loop p)])
-            (lambda (l)
-              (let-values ([(p h?) (m l)])
-                (if h?
-                    (values p #t)
-                    (values `(hide-hole ,p) #f)))))]
-         [`(side-condition ,pat ,condition ,expr)
-          (let ([patf (loop pat)])
-            (lambda (l)
-              (let-values ([(p h?) (patf l)])
-                (values `(side-condition ,p ,condition ,expr) h?))))]
-         [`(cross ,arg) untouched-pattern]
-         [`(list ,pats ...)
-          (define pre-cross
-            (for/list ([sub-pat (in-list pats)])
-              (match sub-pat
-                [`(repeat ,pat ,name ,mismatch)
-                 (list (loop pat) sub-pat)]
-                [else
-                 (list (loop sub-pat) #f)])))
-          (λ (l)
-            (define any-cross? #f)
-            (define post-cross
-              (map (match-lambda 
-                     [(list f r?)
-                      (let-values ([(p h?) (f l)])
-                        (set! any-cross? (or any-cross? h?))
-                        (list p h? r?))])
-                   pre-cross))
-            (define (hide p)
-              (if any-cross?
-                  (match p
-                    [`(repeat ,p ,name ,mismatch?)
-                     `(repeat (hide-hole ,p) ,name ,mismatch?)]
-                    [_ 
-                     `(hide-hole ,p)])
-                  p))
-            (values
-             `(list ,@(foldr (λ (post tail)
-                               (match post
-                                 [(list p* #t (and (not #f) p))
-                                  `(,(hide p) ,p* ,(hide p) . ,tail)]
-                                 [(list p #f (not #f))
-                                  `((repeat ,(hide p) #f #f) . ,tail)]
-                                 [(list p* #t #f)
-                                  `(,p* . ,tail)]
-                                 [(list p #f #f)
-                                  `(,(hide p) . ,tail)]))
-                             '()
-                             post-cross))
-             any-cross?))]
-         [(? (compose not pair?)) untouched-pattern])))
-    (values (λ (l) (let-values ([(p _) (maker l)]) p))
-            count)))
-
-;; build-list-nt-label : lang -> hash[symbol -o> boolean]
-(define (build-list-nt-label lang)
-  (build-nt-property lang
-                     may-be-list-pattern?
-                     #f
-                     (λ (x y) (or x y))))
-
-(define (may-be-list-pattern? pattern nt-table)
-  (let loop ([pattern pattern])
-    (match-a-pattern pattern
-      [`any #t]
-      [`number #f]
-      [`string #f]
-      [`natural #f]
-      [`integer #f]
-      [`real #f]
-      [`boolean #f]
-      [`variable #f]
-      [`(variable-except ,vars ...) #f]
-      [`(variable-prefix ,var) #f]
-      [`variable-not-otherwise-mentioned #f]
-      [`hole #t]
-      [`(nt ,id) (hash-ref nt-table id)]
-      [`(name ,id ,pat) (loop pat)]
-      [`(mismatch-name ,id ,pat) (loop pat)]
-      [`(in-hole ,context ,contractum) 
-       ;; pessimistic, assumes that context can be 'hole' directly
-       (or (loop context) (loop contractum))]
-      [`(hide-hole ,p) (loop p)]
-      [`(side-condition ,pat ,condition ,expr) (loop pat)]
-      [`(cross ,nt) #t]
-      [`(list ,pats ...) #t]
-      [(? (compose not pair?)) #f])))
-
-
-;; build-non-list-nt-label : lang -> hash[symbol -o> boolean]
-(define (build-non-list-nt-label lang)
-  (build-nt-property lang
-                     may-be-non-list-pattern?
-                     #f
-                     (λ (x y) (or x y))))
-
-(define (may-be-non-list-pattern? pattern ht)
-  (let loop ([pattern pattern])
-    (match-a-pattern pattern
-      [`any #t]
-      [`number #t]
-      [`string #t]
-      [`natural #t]
-      [`integer #t]
-      [`real #t]
-      [`boolean #t]
-      [`variable #t]
-      [`(variable-except ,vars ...) #t]
-      [`(variable-prefix ,prefix) #t]
-      [`variable-not-otherwise-mentioned #t]
-      [`hole #t]
-      [`(nt ,nt) (hash-ref ht nt)]
-      [`(name ,name ,pat) (loop pat)]
-      [`(mismatch-name ,name ,pat) (loop pat)]
-      [`(in-hole ,context ,contractum) 
-       ;; pessimistic, assumes that context can be 'hole' directly
-       (or (loop context) (loop contractum))]
-      [`(hide-hole ,p) (loop p)]
-      [`(side-condition ,pat ,condition ,expr) (loop pat)]
-      [`(cross ,nt) #t]
-      [`(list ,pats ...) #f]
-      [(? (compose not pair?)) #t])))
-
-;; match-pattern? : compiled-pattern exp -> boolean
-(define (match-pattern? compiled-pattern exp)
-  (and (match-pattern compiled-pattern exp) #t))
-
-;; match-pattern : compiled-pattern exp -> (union #f (listof bindings))
-(define (match-pattern compiled-pattern exp)
-  (let ([results ((compiled-pattern-cp compiled-pattern) exp #f 0)])
-    (if (compiled-pattern-skip-dup-check? compiled-pattern)
-        results
-        (and results
-             (let ([filtered (filter-multiples results)])
-               (and (not (null? filtered))
-                    filtered))))))
-
-;; filter-multiples : (listof mtch) -> (listof mtch)
-(define (filter-multiples matches)
-  ;(printf "matches ~s\n" matches)
-  (let loop ([matches matches]
-             [acc null])
-    (cond
-      [(null? matches) 
-       ;; this reverse here is to get things back
-       ;; in the same order that they'd be in if the
-       ;; skip-dup-check? bolean had been true
-       (reverse acc)]
-      [else
-       (let ([merged (merge-multiples/remove (car matches))])
-         (if merged
-             (loop (cdr matches) (cons merged acc))
-             (loop (cdr matches) acc)))])))
-
-;; merge-multiples/remove : bindings -> (union #f bindings)
-;; returns #f if all duplicate bindings don't bind the same thing
-;; returns a new bindings 
-(define (merge-multiples/remove match)
-  (let/ec fail
-    (let (
-          ;; match-ht : sym -o> sexp
-          [match-ht (make-hash)]
-          
-          ;; mismatch-ht : sym -o> hash[sexp -o> #t]
-          [mismatch-ht (make-hash)]
-          
-          [ribs (bindings-table (mtch-bindings match))])
-      (for ([rib (in-list ribs)])
-        (cond
-          [(bind? rib)
-           (let ([name (bind-name rib)]
-                 [exp (bind-exp rib)])
-             (let ([previous-exp (hash-ref match-ht name uniq)])
-               (cond
-                 [(eq? previous-exp uniq)
-                  (hash-set! match-ht name exp)]
-                 [else
-                  (unless (equal? exp previous-exp)
-                    (fail #f))])))]
-          [(mismatch-bind? rib)
-           (match-define (mismatch-bind name exp nesting-depth) rib)
-           (define priors (hash-ref mismatch-ht name uniq))
-           (when (eq? priors uniq)
-             (define table (make-hash))
-             (hash-set! mismatch-ht name table)
-             (set! priors table))
-           (cond
-             [(equal? nesting-depth 'unknown-mismatch-depth)
-              (unless (null? exp)
-                (error 'matcher.rkt 
-                       (string-append "invariant broken; unknown-mismatch-depth should"
-                                      " appear only when the expression is an empty list: ~s")
-                       exp))]
-             [else
-              (let loop ([depth nesting-depth]
-                         [exp exp])
-                (cond
-                  [(= depth 0)
-                   (when (hash-ref priors exp #f)
-                     (fail #f))
-                   (hash-set! priors exp #t)]
-                  [else
-                   (for ([exp-ele (in-list exp)])
-                     (loop (- depth 1) exp-ele))]))])]))
-      (make-mtch
-       (make-bindings (hash-map match-ht make-bind))
-       (mtch-context match)
-       (mtch-hole match)))))
-
-;; compile-pattern : compiled-lang pattern boolean -> compiled-pattern
-(define (compile-pattern clang pattern bind-names?)
-  (let-values ([(pattern has-hole? has-hide-hole? names) (compile-pattern/cross? clang pattern bind-names?)])
-    (build-compiled-pattern (if (or has-hole? has-hide-hole? (not (null? names)))
-                                pattern
-                                (convert-matcher pattern))
-                            names)))
-
-(define (build-compiled-pattern proc names)
-  (make-compiled-pattern proc
-                         
-                         (null? names)
-                         
-                              ;; none of the names are duplicated
-                         (and (equal? names (remove-duplicates names))
-                              
-                              ;; no mismatch names
-                              (not (for/or ([name (in-list names)])
-                                     (pair? name))))))
-
-;; compile-pattern/cross? : compiled-lang pattern boolean -> (values compiled-pattern boolean)
-(define (compile-pattern/cross? clang pattern bind-names?)
-  (define clang-ht (compiled-lang-ht clang))
-  (define clang-list-ht (compiled-lang-list-ht clang))
-  (define has-hole-or-hide-hole-ht (compiled-lang-has-hole-or-hide-hole-ht clang))
-  
-  (define (compile-pattern/default-cache pattern)
-    (compile-pattern/cache pattern 
-                           (if bind-names?
-                               (compiled-lang-bind-names-cache clang)
-                               (compiled-lang-cache clang))))
-  
-  (define in-name-parameter (make-parameter #f))
-  
-  (define (compile-pattern/cache pattern compiled-pattern-cache)
-    (let ([compiled-cache (hash-ref compiled-pattern-cache pattern uniq)])
-      (cond 
-        [(eq? compiled-cache uniq)
-         (define-values (compiled-pattern has-hole? has-hide-hole? names) (true-compile-pattern pattern))
-         (unless (equal? (if (or has-hole? has-hide-hole? (not (null? names)))
-                             3
-                             1)
-                         (procedure-arity compiled-pattern))
-           (error 'compile-pattern "got procedure with wrong arity; pattern ~s ~s ~s ~s ~s\n"
-                  pattern compiled-pattern has-hole? has-hide-hole? names))
-         (define val (list (match pattern
-                             [`(nt ,p)
-                              (memoize compiled-pattern has-hole?)]
-                             [_ compiled-pattern])
-                           has-hole?
-                           has-hide-hole?
-                           names))
-         (hash-set! compiled-pattern-cache pattern val)
-         (apply values val)]
-        [else
-         (apply values compiled-cache)])))
-  
-  ;; invariant : if both result booleans are #f (ie, no-hole and no names), then
-  ;;             the result (matching) function returns a boolean and has arity 1. 
-  ;;             otherwise it is a compiled-pattern function (ie returning a list
-  ;;             of assoc tables)
-  (define (true-compile-pattern pattern)
-    (match-a-pattern pattern
-      [`any (simple-match (λ (x) #t))]
-      [`number (simple-match number?)]
-      [`string (simple-match string?)]
-      [`natural (simple-match exact-nonnegative-integer?)]
-      [`integer (simple-match exact-integer?)]
-      [`real (simple-match real?)]
-      [`boolean (simple-match boolean?)]
-      [`variable (simple-match symbol?)]
-      [`(variable-except ,vars ...)
-       (simple-match
-        (λ (exp)
-          (and (symbol? exp)
-               (not (memq exp vars)))))]
-      [`(variable-prefix ,var)
-       (define prefix-str (symbol->string var))
-       (define prefix-len (string-length prefix-str))
-       (simple-match
-        (λ (exp)
-          (and (symbol? exp)
-               (let ([str (symbol->string exp)])
-                 (and ((string-length str) . >= . prefix-len)
-                      (string=? (substring str 0 prefix-len) prefix-str))))))]
-      [`variable-not-otherwise-mentioned
-       (let ([literals (compiled-lang-literals clang)])
-         (simple-match
-          (λ (exp)
-            (and (symbol? exp) 
-                 (not (memq exp literals))))))]
-      [`hole
-       (values match-hole #t #f '())]
-      [`(nt ,nt)
-       (define in-name? (in-name-parameter))
-       (define has-hole? (hash-ref has-hole-or-hide-hole-ht nt))
-       (values
-        (if has-hole?
-            (λ (exp hole-info nesting-depth)
-              (match-nt (hash-ref clang-list-ht nt)
-                        (hash-ref clang-ht nt)
-                        nt exp hole-info))
-            (λ (exp)
-              (match-nt/boolean
-               (hash-ref clang-list-ht nt)
-               (hash-ref clang-ht nt)
-               nt exp)))
-        has-hole?
-        #f
-        '())]
-      [`(name ,name ,pat)
-       (define-values (match-pat has-hole? has-hide-hole? names) 
-         (parameterize ([in-name-parameter #t])
-           (compile-pattern/default-cache pat)))
-       (values (match-named-pat name (if (or has-hide-hole? has-hole? (not (null? names)))
-                                         match-pat
-                                         (convert-matcher match-pat))
-                                #f)
-               has-hole?
-               has-hide-hole?
-               (cons name names))]
-      [`(mismatch-name ,name ,pat)
-       (define-values (match-pat has-hole? has-hide-hole? names) (compile-pattern/default-cache pat))
-       (values (match-named-pat name (if (or has-hide-hole? has-hole? (not (null? names)))
-                                         match-pat
-                                         (convert-matcher match-pat))
-                                #t)
-               has-hole?
-               has-hide-hole?
-               (cons `(mismatch-name name) names))]
-      [`(in-hole ,context ,contractum) 
-       (define-values (match-context ctxt-has-hole? ctxt-has-hide-hole? ctxt-names)
-         (compile-pattern/default-cache context))
-       (define-values (match-contractum contractum-has-hole? contractum-has-hide-hole? contractum-names)
-         (compile-pattern/default-cache contractum))
-       (unless ctxt-has-hole?
-         (error 'compile-pattern
-                "found an in-hole pattern whose context position has no hole ~s"
-                pattern))
-       (values
-        (if (or ctxt-has-hide-hole?
-                contractum-has-hole?
-                contractum-has-hide-hole?
-                (not (null? ctxt-names))
-                (not (null? contractum-names)))
-            (match-in-hole context
-                           contractum
-                           exp
-                           match-context
-                           (if (or contractum-has-hole? contractum-has-hide-hole? (not (null? contractum-names)))
-                               match-contractum
-                               (convert-matcher match-contractum)))
-            (match-in-hole/contractum-boolean context
-                                              contractum
-                                              exp
-                                              match-context
-                                              match-contractum))
-        contractum-has-hole?
-        (or ctxt-has-hide-hole? contractum-has-hide-hole?)
-        (append ctxt-names contractum-names))]
-      [`(hide-hole ,p)
-       (define-values (match-pat has-hole? has-hide-hole? names) (compile-pattern/default-cache p))
-       (values
-        (cond
-          [(or has-hole? has-hide-hole? (not (null? names)))
-           (lambda (exp hole-info nesting-depth)
-             (let ([matches (match-pat exp #f nesting-depth)])
-               (and matches
-                    (map (λ (match) (make-mtch (mtch-bindings match) 
-                                               (hole->not-hole (mtch-context match))
-                                               none))
-                         matches))))]
-          [else
-           (lambda (exp hole-info nesting-depth)
-             (let ([matches (match-pat exp)])
-               (and matches
-                    (list (make-mtch empty-bindings
-                                     (hole->not-hole exp)
-                                     none)))))])
-        #f
-        #t
-        names)]
-      [`(side-condition ,pat ,condition ,expr)
-       (define-values (match-pat has-hole? has-hide-hole? names) (compile-pattern/default-cache pat))
-       (values
-        (if (or has-hole? has-hide-hole? (not (null? names)))
-            (λ (exp hole-info nesting-depth)
-              (let ([matches (match-pat exp hole-info nesting-depth)])
-                (and matches
-                     (let ([filtered (filter (λ (m) (condition (mtch-bindings m))) 
-                                             (filter-multiples matches))])
-                       (if (null? filtered)
-                           #f
-                           filtered)))))
-            (λ (exp)
-              (and (match-pat exp)
-                   (condition empty-bindings))))
-        has-hole?
-        has-hide-hole?
-        names)]
-      [`(cross ,(? symbol? id))
-       (define across-ht (compiled-lang-across-ht clang))
-       (define across-list-ht (compiled-lang-across-list-ht clang))
-       (cond
-         [(hash-maps? across-ht id)
-          (values
-           (λ (exp hole-info nesting-depth)
-             (match-nt (hash-ref across-list-ht id)
-                       (hash-ref across-ht id)
-                       id exp hole-info))
-           #t
-           #f
-           '())]
-         [else
-          (error 'compile-pattern "unknown cross reference ~a" id)])]
-      [`(list ,pats ...)
-       (define-values (rewritten has-hole?s has-hide-hole?s namess) (rewrite-ellipses pats compile-pattern/default-cache))
-       (define any-has-hole? (ormap values has-hole?s))
-       (define any-has-hide-hole? (ormap values has-hide-hole?s))
-       (define repeats (length (filter repeat? rewritten)))
-       (define non-repeats (length (filter (λ (x) (not (repeat? x))) rewritten)))
-       (define names (apply append namess))
-       (define rewritten/coerced
-         (for/list ([pat (in-list rewritten)]
-                    [has-hole? (in-list has-hole?s)]
-                    [has-hide-hole? (in-list has-hide-hole?s)]
-                    [names (in-list namess)])
-           (cond
-             [(repeat? pat)
-              ;; have to use procedure arity test here in case the
-              ;; name on this pattern is in the repeat (in which case
-              ;; the has-hide-hole? boolean will be true, but pat
-              ;; may not need converting)
-              (if (equal? (procedure-arity (repeat-pat pat))
-                          3)
-                  pat
-                  (struct-copy repeat pat [pat (convert-matcher (repeat-pat pat))]))]
-             [else
-              (if (or has-hole? has-hide-hole? (not (null? names)))
-                  pat
-                  (convert-matcher pat))])))
-       (values
-        (cond
-          [(not (or any-has-hole? any-has-hide-hole? (not (null? names))))
-           (λ (exp)
-             (cond
-               [(list? exp) (match-list/boolean rewritten exp)]
-               [else #f]))]
-          [(= 0 repeats)
-           (λ (exp hole-info nesting-depth)
-             (cond
-               [(list? exp)
-                ;; shortcircuit: if the list isn't the right length, give up immediately.
-                (if (= (length exp) non-repeats)
-                    (match-list/no-repeats rewritten/coerced exp hole-info nesting-depth)
-                    #f)]
-               [else #f]))]
-          [else
-           (λ (exp hole-info nesting-depth)
-             (cond
-               [(list? exp)
-                ;; shortcircuit: if the list doesn't have the right number of
-                ;; fixed parts, give up immediately
-                (if (>= (length exp) non-repeats)
-                    (match-list rewritten/coerced exp hole-info nesting-depth)
-                    #f)]
-               [else #f]))])
-        any-has-hole?
-        any-has-hide-hole?
-        names)]
-      
-      [(? (compose not pair?))
-       (cond
-         [(compiled-pattern? pattern) ;; can this really happen anymore?!
-          (values (compiled-pattern-cp pattern)
-                  ;; return #ts here as a failsafe; no way to check better.
-                  #t
-                  #t)]
-         [(eq? pattern '....)
-          ;; this should probably be checked at compile time, not here
-          (error 'compile-language "the pattern .... can only be used in extend-language")]
-         [else
-          (simple-match
-           (λ (exp) 
-             (equal? pattern exp)))])]))
-  
-  ;; simple-match : (any -> bool) -> (values <compiled-pattern> boolean boolean)
-  ;; does a match based on a predicate
-  (define (simple-match pred)
-    (values (lambda (exp) (pred exp))
-            #f
-            #f
-            '()))
-  
-  (compile-pattern/default-cache pattern))
-
-
-;; convert-matcher : (any -> boolean) -> <compiled-pattern>
-(define (convert-matcher boolean-based-matcher)
-  (unless (equal? (procedure-arity boolean-based-matcher) 1)
-    (error 'convert-matcher 
-           "not a unary proc: ~s" 
-           boolean-based-matcher))
-  (define (match-boolean-to-record-converter exp hole-info nesting-depth)
-    (and (boolean-based-matcher exp)
-         (list (make-mtch empty-bindings
-                          (build-flat-context exp)
-                          none))))
-  match-boolean-to-record-converter)
-
-;; match-named-pat : symbol <compiled-pattern> -> <compiled-pattern>
-(define (match-named-pat name match-pat mismatch-bind?)
-  (λ (exp hole-info nesting-depth)
-    (let ([matches (match-pat exp hole-info nesting-depth)])
-      (and matches 
-           (map (lambda (match)
-                  (make-mtch
-                   (make-bindings (cons (if mismatch-bind?
-                                            (make-mismatch-bind name 
-                                                                (mtch-context match)
-                                                                nesting-depth)
-                                            (make-bind name (mtch-context match)))
-                                        (bindings-table (mtch-bindings match))))
-                   (mtch-context match)
-                   (mtch-hole match)))
-                matches)))))
-
-;; has-underscore? : symbol -> boolean
-(define (has-underscore? sym)
-  (memq #\_ (string->list (symbol->string sym))))
-
-(define (memoize f needs-all-args?)
-  (case (procedure-arity f)
-    [(1) (memoize/1 f nohole)]
-    [(3) (memoize/3 f w/hole)]
-    [else (error 'memoize "unknown arity for ~s" f)]))
-
-(define cache-size 63)
-(define (set-cache-size! cs) (set! cache-size cs))
-
-;; original version, but without closure allocation in hash lookup
-(define-syntax (mk-memoize-key stx)
-  (syntax-case stx ()
-    [(_ arity)
-     (with-syntax ([(args ...) (generate-temporaries (build-list (syntax-e #'arity) (λ (x) 'x)))])
-       (with-syntax ([key-exp (if (= 1 (syntax-e #'arity))
-                                  (car (syntax->list #'(args ...)))
-                                  #'(list args ...))])
-         #'(λ (f statsbox)
-             (let ([ht (make-hash)]
-                   [entries 0])
-               (lambda (args ...)
-                 (cond
-                   [(not (caching-enabled?)) (f args ...)]
-                   [else
-                    (let* ([key key-exp])
-                      ;(record-cache-test! statsbox)
-                      (unless (< entries cache-size)
-                        (set! entries 0)
-                        (set! ht (make-hash)))
-                      (let ([ans (hash-ref ht key uniq)])
-                        (cond
-                          [(eq? ans uniq)
-                           ;(record-cache-miss! statsbox)
-                           (set! entries (+ entries 1))
-                           (let ([res (f args ...)])
-                             (hash-set! ht key res)
-                             res)]
-                          [else ans])))]))))))]))
-
-;(define memoize/1 (mk-memoize-key 1))
-;(define memoize/3 (mk-memoize-key 3))
-
-(define-syntax (mk-memoize-vec stx)
-  (syntax-case stx ()
-    [(_ arity)
-     (with-syntax ([(args ...) (generate-temporaries (build-list (syntax-e #'arity) (λ (x) 'x)))])
-       (with-syntax ([key-exp (if (= 1 (syntax-e #'arity))
-                                  (car (syntax->list #'(args ...)))
-                                  #'(list args ...))])
-         #'(λ (f statsbox)
-             (let* ([uniq (gensym)]
-                    [this-cache-size cache-size]
-                    [ans-vec (make-vector this-cache-size uniq)]
-                    [key-vec (make-vector this-cache-size uniq)])
-               (lambda (args ...)
-                 (cond
-                   [(not (caching-enabled?)) (f args ...)]
-                   [else
-                    ;(record-cache-test! statsbox)
-                    ;(when (zero? (modulo (cache-stats-hits statsbox) 1000))
-                    ;  (record-cache-size! statsbox (cons ans-vec key-vec)))
-                    (let* ([key key-exp]
-                           [index (modulo (equal-hash-code key) this-cache-size)])
-                      (cond
-                        [(equal? (vector-ref key-vec index) key)
-                         (vector-ref ans-vec index)]
-                        [else
-                         ;(record-cache-miss! statsbox)
-                         (unless (eq? uniq (vector-ref key-vec index)) (record-cache-clobber! statsbox))
-                         (let ([ans (f args ...)])
-                           (vector-set! key-vec index key)
-                           (vector-set! ans-vec index ans)
-                           ans)]))]))))))]))
-
-(define memoize/1 (mk-memoize-vec 1))
-(define memoize/3 (mk-memoize-vec 3))
-
-;; hash version, but with an extra hash that tells when to evict cache entries
-#;
-(define (memoize/key f key-fn statsbox)
-  (let* ([cache-size 50]
-         [ht (make-hash)]
-         [uniq (gensym)]
-         [when-to-evict-table (make-hasheq)]
-         [pointer 0])
-    (lambda (x y)
-      (record-cache-test! statsbox)
-      (let* ([key (key-fn x y)]
-             [value-in-cache (hash-ref ht key uniq)])
-        (cond
-          [(eq? value-in-cache uniq)
-           (record-cache-miss! statsbox)
-           (let ([res (f x y)])
-             (let ([to-remove (hash-ref when-to-evict-table pointer uniq)])
-               (unless (eq? uniq to-remove)
-                 (hash-remove! ht to-remove)))
-             (hash-set! when-to-evict-table pointer key)
-             (hash-set! ht key res)
-             (set! pointer (modulo (+ pointer 1) cache-size))
-             res)]
-          [else
-           value-in-cache])))))
-
-;; lru cache
-;; for some reason, this seems to hit *less* than the "just dump stuff out" strategy!
-#;
-(define (memoize/key f key-fn statsbox)
-  (let* ([cache-size 50]
-         [cache '()])
-    (lambda (x y)
-      (record-cache-test! statsbox)
-      (let ([key (key-fn x y)])
-        (cond
-          [(null? cache)
-           ;; empty cache
-           (let ([ans (f x y)])
-             (record-cache-miss! statsbox)
-             (set! cache (cons (cons key ans) '()))
-             ans)]
-          [(null? (cdr cache))
-           ;; one element cache
-           (if (equal? (car (car cache)) key)
-               (cdr (car cache))
-               (let ([ans (f x y)])
-                 (record-cache-miss! statsbox)
-                 (set! cache (cons (cons key ans) cache))
-                 ans))]
-          [else
-           ;; two of more element cache
-           (cond
-             [(equal? (car (car cache)) key)
-              ;; check first element
-              (cdr (car cache))]
-             [(equal? (car (cadr cache)) key)
-              ;; check second element
-              (cdr (cadr cache))]
-             [else
-              ;; iterate from the 3rd element onwards
-              (let loop ([previous2 cache]
-                         [previous1 (cdr cache)]
-                         [current (cddr cache)]
-                         [i 0])
-                (cond
-                  [(null? current)
-                   ;; found the end of the cache -- need to drop the last element if the cache is too full,
-                   ;; and put the current value at the front of the cache.
-                   (let ([ans (f x y)])
-                     (record-cache-miss! statsbox)
-                     (set! cache (cons (cons key ans) cache))
-                     (unless (< i cache-size)
-                       ;; drop the last element from the cache
-                       (set-cdr! previous2 '()))
-                     ans)]
-                  [else
-                   (let ([entry (car current)])
-                     (cond
-                       [(equal? (car entry) key)
-                        ;; found a hit 
-                        
-                        ; remove this element from the list where it is.
-                        (set-cdr! previous1 (cdr current))
-                        
-                        ; move it to the front of the cache
-                        (set! cache (cons current cache))
-                        
-                        ; return the found element
-                        (cdr entry)]
-                       [else
-                        ;; didn't hit yet, continue searching
-                        (loop previous1 current (cdr current) (+ i 1))]))]))])])))))
-
-;; hash version, but with a vector that tells when to evict cache entries
-#;
-(define (memoize/key f key-fn statsbox)
-  (let* ([cache-size 50]
-         [ht (make-hash)]
-         [uniq (gensym)]
-         [vector (make-vector cache-size uniq)] ;; vector is only used to evict things from the hash
-         [pointer 0])
-    (lambda (x y)
-      (let* ([key (key-fn x y)]
-             [value-in-cache (hash-ref ht key uniq)])
-        (cond
-          [(eq? value-in-cache uniq)
-           (let ([res (f x y)])
-             (let ([to-remove (vector-ref vector pointer)])
-               (unless (eq? uniq to-remove)
-                 (hash-remove! ht to-remove)))
-             (vector-set! vector pointer key)
-             (hash-set! ht key res)
-             (set! pointer (modulo (+ pointer 1) cache-size))
-             res)]
-          [else
-           value-in-cache])))))
-
-;; vector-based version, with a cleverer replacement strategy
-#;
-(define (memoize/key f key-fn statsbox)
-  (let* ([cache-size 20]
-         ;; cache : (vector-of (union #f (cons key val)))
-         ;; the #f correspond to empty spots in the cache
-         [cache (make-vector cache-size #f)] 
-         [pointer 0])
-    (lambda (x y)
-      (let ([key (key-fn x y)])
-        (let loop ([i 0])
-          (cond
-            [(= i cache-size)
-             (unless (vector-ref cache pointer)
-               (vector-set! cache pointer (cons #f #f)))
-             (let ([pair (vector-ref cache pointer)]
-                   [ans (f x y)])
-               (set-car! pair key)
-               (set-cdr! pair ans)
-               (set! pointer (modulo (+ 1 pointer) cache-size))
-               ans)]
-            [else
-             (let ([entry (vector-ref cache i)])
-               (if entry
-                   (let ([e-key (car entry)]
-                         [e-val (cdr entry)])
-                     (if (equal? e-key key)
-                         e-val
-                         (loop (+ i 1))))
-                   
-                   ;; if we hit a #f, just skip ahead and store this in the cache
-                   (loop cache-size)))]))))))
-
-;; original version
-#;
-(define (memoize/key f key-fn statsbox)
-  (let ([ht (make-hash)]
-        [entries 0])
-    (lambda (x y)
-      (record-cache-test! statsbox)
-      (let* ([key (key-fn x y)]
-             [compute/cache
-              (lambda ()
-                (set! entries (+ entries 1))
-                (record-cache-miss! statsbox)
-                (let ([res (f x y)])
-                  (hash-set! ht key res)
-                  res))])
-        (unless (< entries 200) ; 10000 was original size
-          (set! entries 0)
-          (set! ht (make-hash)))
-        (hash-ref ht key compute/cache)))))
-
-(define (record-cache-miss! statsbox)
-  (set-cache-stats-hits! statsbox (sub1 (cache-stats-hits statsbox)))
-  (set-cache-stats-misses! statsbox (add1 (cache-stats-misses statsbox))))
-
-(define (record-cache-test! statsbox)
-  (set-cache-stats-hits! statsbox (add1 (cache-stats-hits statsbox))))
-
-(define (record-cache-clobber! statsbox)
-  (set-cache-stats-clobber-hits! statsbox (add1 (cache-stats-clobber-hits statsbox))))
-
-(define-struct cache-stats (name misses hits clobber-hits sizes) #:mutable)
-(define (new-cache-stats name) (make-cache-stats name 0 0 0 '()))
-
-(define w/hole (new-cache-stats "hole"))
-(define nohole (new-cache-stats "no-hole"))
-
-(define (record-cache-size! cache-stats cache)
-  (define size 
-    (let loop ([cache cache])
-      (cond
-        [(vector? cache)
-         (for/fold ([size (vector-length cache)])
-                   ([ele (in-vector cache)])
-           (+ size (loop ele)))]
-        [(pair? cache)
-         (+ 1 (loop (car cache)) (loop (cdr cache)))]
-        [else 1])))
-  (set-cache-stats-sizes! cache-stats (cons size (cache-stats-sizes cache-stats))))
-
-(define (print-stats)
-  (let ((stats (list w/hole nohole)))
-    (for-each 
-     (lambda (s) 
-       (when (> (+ (cache-stats-hits s) (cache-stats-misses s)) 0)
-         (printf "~a has ~a hits, ~a misses (~a% miss rate)\n" 
-                 (cache-stats-name s)
-                 (cache-stats-hits s)
-                 (cache-stats-misses s)
-                 (floor
-                  (* 100 (/ (cache-stats-misses s)
-                            (+ (cache-stats-hits s) (cache-stats-misses s))))))))
-     stats)
-    (let ((overall-hits (apply + (map cache-stats-hits stats)))
-          (overall-miss (apply + (map cache-stats-misses stats)))
-          (overall-clobber-hits (apply + (map cache-stats-clobber-hits stats))))
-      (printf "---\nOverall hits:   ~a\n" overall-hits)
-      (printf "Overall misses: ~a\n" overall-miss)
-      (when (> (+ overall-hits overall-miss) 0)
-        (printf "Overall miss rate: ~a%\n" 
-                (floor (* 100 (/ overall-miss (+ overall-hits overall-miss))))))
-      (printf "Overall clobbering hits: ~a\n" overall-clobber-hits))
-    
-    (let* ([sizes (apply append (map cache-stats-sizes stats))]
-           [len (length sizes)])
-      (unless (zero? len)
-        (let ([avg (/ (apply + 0.0 sizes) len)])
-          (printf "Average cache size ~s; ~a samples\n" avg len))))))
-
-;; match-hole : compiled-pattern
-(define match-hole
-  (λ (exp hole-info nesting-depth)
-    (if hole-info
-        (list (make-mtch empty-bindings
-                         the-hole
-                         exp))
-        (and (hole? exp)
-             (list (make-mtch empty-bindings
-                              the-hole
-                              none))))))
-
-;; match-in-hole : sexp sexp sexp compiled-pattern compiled-pattern -> compiled-pattern
-(define (match-in-hole context contractum exp match-context match-contractum)
-   (λ (exp old-hole-info nesting-depth)
-     (define mtches (match-context exp #t nesting-depth))
-     (and mtches
-          (let loop ([mtches mtches]
-                     [acc null])
-            (cond
-              [(null? mtches) 
-               (if (null? acc)
-                   #f
-                   acc)]
-              [else 
-               (define mtch (car mtches))
-               (define bindings (mtch-bindings mtch))
-               (define hole-exp (mtch-hole mtch))
-               (define contractum-mtches (match-contractum hole-exp old-hole-info nesting-depth))
-               (when (eq? none hole-exp)
-                 (error 'matcher.rkt "found no hole when matching a decomposition"))
-               (if contractum-mtches
-                   (let i-loop ([contractum-mtches contractum-mtches]
-                                [acc acc])
-                     (cond
-                       [(null? contractum-mtches) (loop (cdr mtches) acc)]
-                       [else (let* ([contractum-mtch (car contractum-mtches)]
-                                    [contractum-bindings (mtch-bindings contractum-mtch)])
-                               (i-loop
-                                (cdr contractum-mtches)
-                                (cons
-                                 (make-mtch (make-bindings
-                                             (append (bindings-table contractum-bindings)
-                                                     (bindings-table bindings)))
-                                            (build-nested-context 
-                                             (mtch-context mtch)
-                                             (mtch-context contractum-mtch))
-                                            (mtch-hole contractum-mtch))
-                                 acc)))]))
-                   (loop (cdr mtches) acc))])))))
-
-(define (match-in-hole/contractum-boolean context contractum exp match-context match-contractum)
-  (λ (exp)
-    ;; we get here only if there are no names in the context so we can safely pass 0 as the depth
-    (define mtches (match-context exp #t 0))
-    (and mtches
-         (let loop ([mtches mtches])
-           (cond
-             [(null? mtches) #f]
-             [else 
-              (let* ([mtch (car mtches)]
-                     [hole-exp (mtch-hole mtch)]
-                     [contractum-mtches (match-contractum hole-exp)])
-                (when (eq? none hole-exp)
-                  (error 'matcher.rkt "found no hole when matching a decomposition"))
-                (or contractum-mtches
-                    (loop (cdr mtches))))])))))
-
-;; match-list/boolean : (listof (union repeat (any -> boolean)))
-;;                      sexp hole-info -> boolean
-(define (match-list/boolean patterns exp)
-  (define has-repeats? (ormap repeat? patterns))
-  (cond
-    [(not (list? exp)) #f]
-    [(and (not has-repeats?)
-          (not (= (length patterns) (length exp))))
-     #f]
-    [else
-     (let loop ([exp exp]
-                [patterns patterns])
-       (cond
-         [(null? exp)
-          (let loop ([patterns patterns])
-            (or (null? patterns)
-                (and (repeat? (car patterns))
-                     (loop (cdr patterns)))))]
-         [(null? patterns) #f]
-         [(repeat? (car patterns)) 
-          (or (loop exp (cdr patterns))
-              (and ((repeat-pat (car patterns)) (car exp))
-                   (loop (cdr exp) patterns)))]
-         [else
-          (and ((car patterns) (car exp))
-               (loop (cdr exp) (cdr patterns)))]))]))
-
-;; match-list : (listof (union repeat compiled-pattern)) sexp hole-info -> (union #f (listof bindings))
-(define (match-list patterns exp hole-info nesting-depth)
-  (let (;; raw-match : (listof (listof (listof mtch)))
-        [raw-match (match-list/raw patterns exp hole-info nesting-depth)])
-    
-    (and (not (null? raw-match))
-         (let loop ([raw-match raw-match])
-           (cond
-             [(null? raw-match) '()]
-             [else (append (combine-matches (car raw-match))
-                           (loop (cdr raw-match)))])))))
-
-;; match-list/raw : (listof (union repeat compiled-pattern)) 
-;;                  sexp
-;;                  hole-info
-;;               -> (listof (listof (listof mtch)))
-;; the result is the raw accumulation of the matches for each subpattern, as follows:
-;;  (listof (listof (listof mtch)))
-;;  \       \       \-------------/  a match for one position in the list (failures don't show up)
-;;   \       \-------------------/   one element for each position in the pattern list
-;;    \-------------------------/    one element for different expansions of the ellipses
-;; the failures to match are just removed from the outer list before this function finishes
-;; via the `fail' argument to `loop'.
-(define (match-list/raw patterns exp hole-info nesting-depth)
-  (let/ec k
-    (let loop ([patterns patterns]
-               [exp exp]
-               ;; fail : -> alpha
-               ;; causes one possible expansion of ellipses to fail
-               ;; initially there is only one possible expansion, so
-               ;; everything fails.
-               [fail (lambda () (k null))])
-      (cond
-        [(pair? patterns)
-         (let ([fst-pat (car patterns)])
-           (cond
-             [(repeat? fst-pat)
-              (if (or (null? exp) (pair? exp))
-                  (let ([r-pat (repeat-pat fst-pat)]
-                        [r-mt (make-mtch (make-bindings (repeat-empty-bindings fst-pat))
-                                         (build-flat-context '())
-                                         none)])
-                    (apply 
-                     append
-                     (cons (let/ec k
-                             (let ([mt-fail (lambda () (k null))])
-                               (map (lambda (pat-ele) 
-                                      (cons (add-ellipses-index (list r-mt)
-                                                                (repeat-name fst-pat)
-                                                                (repeat-mismatch fst-pat)
-                                                                0
-                                                                nesting-depth)
-                                            pat-ele))
-                                    (loop (cdr patterns) exp mt-fail))))
-                           (let r-loop ([exp exp]
-                                        ;; past-matches is in reverse order
-                                        ;; it gets reversed before put into final list
-                                        [past-matches (list r-mt)]
-                                        [index 1])
-                             (cond
-                               [(pair? exp)
-                                (let* ([fst (car exp)]
-                                       [m (r-pat fst hole-info (+ nesting-depth 1))])
-                                  (if m
-                                      (let* ([combined-matches (collapse-single-multiples m past-matches)]
-                                             [reversed 
-                                              (add-ellipses-index 
-                                               (reverse-multiples combined-matches)
-                                               (repeat-name fst-pat)
-                                               (repeat-mismatch fst-pat)
-                                               index
-                                               nesting-depth)])
-                                        (cons 
-                                         (let/ec fail-k
-                                           (map (lambda (x) (cons reversed x))
-                                                (loop (cdr patterns) 
-                                                      (cdr exp)
-                                                      (lambda () (fail-k null)))))
-                                         (r-loop (cdr exp)
-                                                 combined-matches
-                                                 (+ index 1))))
-                                      (list null)))]
-                               ;; what about dotted pairs?
-                               [else (list null)])))))
-                  (fail))]
-             [else
-              (cond
-                [(pair? exp)
-                 (let* ([fst-exp (car exp)]
-                        [match (fst-pat fst-exp hole-info nesting-depth)])
-                   (if match
-                       (let ([exp-match (map (λ (mtch) (make-mtch (mtch-bindings mtch)
-                                                                  (build-list-context (mtch-context mtch))
-                                                                  (mtch-hole mtch)))
-                                             match)])
-                         (map (lambda (x) (cons exp-match x))
-                              (loop (cdr patterns) (cdr exp) fail)))
-                       (fail)))]
-                [else
-                 (fail)])]))]
-        [else
-         (if (null? exp)
-             (list null)
-             (fail))]))))
-
-(define null-match (list (make-mtch (make-bindings '()) '() none)))
-
-(define (match-list/no-repeats patterns exp hole-info nesting-depth)
-  
-  (define (match-list/raw/no-repeats/no-ambiguity patterns exp hole-info)
-    (let/ec k
-      (define-values (bindings lst hole)
-        (let loop ([patterns patterns]
-                   [exp exp])
-          (cond
-            [(pair? patterns)
-             (let ([fst-pat (car patterns)])
-               (cond
-                 [(pair? exp)
-                  (let* ([fst-exp (car exp)]
-                         [fst-mtchs (fst-pat fst-exp hole-info nesting-depth)])
-                    (cond
-                      [(not fst-mtchs) (k #f)]
-                      [(null? (cdr fst-mtchs))
-                       (define mtch1 (car fst-mtchs))
-                       (define-values (bindings lst hole) (loop (cdr patterns) (cdr exp)))
-                       (define new-bindings (bindings-table (mtch-bindings mtch1)))
-                       (values (append new-bindings bindings)
-                               (build-cons-context (mtch-context mtch1) lst)
-                               (pick-hole (mtch-hole mtch1) hole))]
-                      [else
-                       (error 'ack)]))]
-                 [else (k #f)]))]
-            [else
-             (if (null? exp)
-                 (values '() '() none)
-                 (k #f))])))
-      (list (make-mtch (make-bindings bindings) lst hole))))
-  
-  (define (match-list/raw/no-repeats patterns exp hole-info)
-    (let/ec k
-      (let loop ([patterns patterns]
-                 [exp exp])
-        (cond
-          [(pair? patterns)
-           (let ([fst-pat (car patterns)])
-             (cond
-               [(pair? exp)
-                (let* ([fst-exp (car exp)]
-                       [fst-mtchs (fst-pat fst-exp hole-info nesting-depth)])
-                  (cond
-                    [fst-mtchs
-                     (define rst-mtchs (loop (cdr patterns) (cdr exp)))
-                     (cond
-                       [rst-mtchs
-                        (combine-pair/no-repeat fst-mtchs rst-mtchs)]
-                       [else
-                        (k #f)])]
-                    [else (k #f)]))]
-               [else (k #f)]))]
-          [else
-           (if (null? exp)
-               null-match
-               (k #f))]))))
-  
-  ;; combine-pair : (listof mtch) (listof mtch) -> (listof mtch)
-  (define (combine-pair/no-repeat fst snd)
-    (let ([mtchs null])
-      (for-each 
-       (lambda (mtch1)
-         (for-each
-          (lambda (mtch2)
-            (set! mtchs (cons (make-mtch 
-                               (make-bindings (append (bindings-table (mtch-bindings mtch1))
-                                                      (bindings-table (mtch-bindings mtch2))))
-                               (build-cons-context (mtch-context mtch1) (mtch-context mtch2))
-                               (pick-hole (mtch-hole mtch1) 
-                                          (mtch-hole mtch2)))
-                              mtchs)))
-          snd))
-       fst)
-      mtchs))
-  
-  ;(match-list/raw/no-repeats/no-ambiguity patterns exp hole-info)
-  (match-list/raw/no-repeats patterns exp hole-info)
-  )
-
-;; add-ellipses-index : (listof mtch) (or/c sym #f) (or/c sym #f) number -> (listof mtch)
-(define (add-ellipses-index mtchs name mismatch-name i nesting-depth)
-  (let* ([ribs '()]
-         [ribs (if name
-                   (cons (make-bind name i) ribs)
-                   ribs)]
-         [ribs (if mismatch-name
-                   (cons (make-mismatch-bind mismatch-name i nesting-depth) ribs)
-                   ribs)])
-    (map (λ (mtch) (make-mtch (make-bindings (append ribs (bindings-table (mtch-bindings mtch))))
-                              (mtch-context mtch)
-                              (mtch-hole mtch)))
-         mtchs)))
-
-;; collapse-single-multiples : (listof mtch) (listof mtch[to-lists]) -> (listof mtch[to-lists])
-(define (collapse-single-multiples bindingss multiple-bindingss)
-  (apply append 
-         (map
-          (lambda (multiple-match)
-            (let ([multiple-bindings (mtch-bindings multiple-match)])
-              (map
-               (lambda (single-match)
-                 (let ([single-bindings (mtch-bindings single-match)])
-                   (make-mtch (make-bindings 
-                               (map (match-lambda* 
-                                      [`(,(struct bind (name sing-exp)) ,(struct bind (name mult-exp)))
-                                       (make-bind name (cons sing-exp mult-exp))]
-                                      [`(,(struct mismatch-bind (name sing-exp nesting-depth1))
-                                         ,(struct mismatch-bind (name mult-exp nesting-depth2)))
-                                       (make-mismatch-bind name 
-                                                           (cons sing-exp mult-exp)
-                                                           nesting-depth1)]
-                                      [else 
-                                       (error 'collapse-single-multiples
-                                              "internal error: expected matches' bindings in same order; got\n  ~e\n  ~e"
-                                              single-bindings
-                                              multiple-bindings)])
-                                    (bindings-table single-bindings)
-                                    (bindings-table multiple-bindings)))
-                              (build-cons-context
-                               (mtch-context single-match)
-                               (mtch-context multiple-match))
-                              (pick-hole (mtch-hole single-match)
-                                         (mtch-hole multiple-match)))))
-               bindingss)))
-          multiple-bindingss)))
-
-;; pick-hole : (union none sexp) (union none sexp) -> (union none sexp)
-(define (pick-hole s1 s2)
-  (cond
-    [(eq? none s1) s2]
-    [(eq? none s2) s1]
-    [(error 'matcher.rkt "found two holes")]))
-
-;; reverse-multiples : (listof mtch[to-lists]) -> (listof mtch[to-lists])
-;; reverses the rhs of each rib in the bindings and reverses the context.
-(define (reverse-multiples matches)
-  (map (lambda (match)
-         (let ([bindings (mtch-bindings match)])
-           (make-mtch
-            (make-bindings
-             (map (lambda (rib)
-                    (cond
-                      [(bind? rib)
-                       (make-bind (bind-name rib)
-                                  (reverse (bind-exp rib)))]
-                      [(mismatch-bind? rib)
-                       (make-mismatch-bind (mismatch-bind-name rib)
-                                           (reverse (mismatch-bind-exp rib))
-                                           (mismatch-bind-nesting-depth rib))]))
-                  (bindings-table bindings)))
-            (reverse-context (mtch-context match))
-            (mtch-hole match))))
-       matches))
-
-;; match-nt : (listof compiled-rhs) (listof compiled-rhs) sym exp hole-info
-;;        -> (union #f (listof bindings))
-(define (match-nt list-rhs non-list-rhs nt term hole-info)
-  (if hole-info
-      
-      (let loop ([rhss (if (or (null? term) (pair? term))
-                           list-rhs
-                           non-list-rhs)]
-                 [ans '()])
-        (cond
-          [(null? rhss) 
-           (if (null? ans)
-               #f
-               (begin
-                 (when (check-redudancy)
-                   (let ([rd (remove-duplicates ans)])
-                     (unless (= (length rd) (length ans))
-                       (eprintf "found redundancy when matching the non-terminal ~s against:\n~s~a"
-                                nt
-                                term
-                                (apply
-                                 string-append
-                                 (map (λ (x) (format "\n  ~s" x))
-                                      ans))))))
-                 ans))]
-          [else
-           (let ([mth (call-nt-proc/bindings (car rhss) term hole-info)])
-             (cond
-               [mth
-                (loop (cdr rhss) (append mth ans))]
-               [else 
-                (loop (cdr rhss) ans)]))]))
-      
-      ;; if we're not doing a decomposition, we just need
-      ;; to find the first match, not all of the matches
-      (let loop ([rhss (if (or (null? term) (pair? term))
-                           list-rhs
-                           non-list-rhs)])
-        (cond
-          [(null? rhss) #f]
-          [else
-           (or (call-nt-proc/bindings (car rhss) term hole-info)
-               (loop (cdr rhss)))]))))
-
-(define check-redudancy (make-parameter #f))
-
-(define (match-nt/boolean list-rhs non-list-rhs nt term)
-  (let loop ([rhss (if (or (null? term) (pair? term))
-                       list-rhs
-                       non-list-rhs)])
-    (cond
-      [(null? rhss) #f]
-      [else
-       (or (call-nt-proc/bool (compiled-pattern-cp (car rhss)) term)
-           (loop (cdr rhss)))])))
-
-(define (call-nt-proc/bool nt-proc exp)
-  (if (procedure-arity-includes? nt-proc 1)
-      (nt-proc exp)
-      (and (remove-bindings/filter (nt-proc exp #f 0)) #t)))
-
-(define (call-nt-proc/bindings compiled-pattern exp hole-info)
-  (define nt-proc (compiled-pattern-cp compiled-pattern))
-  (define skip-dup? (compiled-pattern-skip-dup-check? compiled-pattern))
-  (define has-names? (compiled-pattern-binds-names? compiled-pattern))
-  (cond
-    [(procedure-arity-includes? nt-proc 1)
-     (and (nt-proc exp)
-          (list (make-mtch empty-bindings
-                           (build-flat-context exp)
-                           none)))]
-    [skip-dup? 
-     (define res (nt-proc exp hole-info 0))
-     (and res
-          (not (null? res))
-          (if has-names?
-              (map (λ (match)
-                     (make-mtch empty-bindings
-                                (mtch-context match)
-                                (mtch-hole match)))
-                   res)
-              res))]
-    [else
-     (remove-bindings/filter (nt-proc exp hole-info 0))]))
-
-;; remove-bindings/filter : (union #f (listof mtch)) -> (union #f (listof mtch))
-(define (remove-bindings/filter matches)
-  (and matches
-       (let ([filtered (filter-multiples matches)])
-         ;(printf ">> ~s\n=> ~s\n\n" matches filtered)
-         (and (not (null? filtered))
-              (map (λ (match)
-                     (make-mtch empty-bindings
-                                (mtch-context match)
-                                (mtch-hole match)))
-                   matches)))))
-
-;; rewrite-ellipses : (listof l-pat) 
-;;                    (pattern -> (values compiled-pattern boolean))
-;;                 -> (values (listof (union repeat compiled-pattern)) boolean)
-;; moves the ellipses out of the list and produces repeat structures
-(define (rewrite-ellipses pattern compile)
-  (define (maybe-cons hd tl) (if hd (cons hd tl) tl))
-  (let loop ([exp-eles pattern])
-    (match exp-eles
-      [`() (values empty empty empty empty)]
-      [(cons `(repeat ,pat ,name ,mismatch-name) rst)
-       (define-values (fst-compiled fst-has-hole? fst-has-hide-hole? fst-names) (compile pat))
-       (define-values (rst-compiled rst-has-hole? rst-has-hide-hole? rst-names) (loop rst))
-       (values (cons (make-repeat fst-compiled
-                                  (extract-empty-bindings pat)
-                                  name
-                                  mismatch-name)
-                     rst-compiled)
-               (cons fst-has-hole? rst-has-hole?)
-               (cons (or fst-has-hide-hole? name mismatch-name) rst-has-hide-hole?)
-               (cons (maybe-cons name (maybe-cons (and mismatch-name `(mismatch , mismatch-name))
-                                                  fst-names))
-                     rst-names))]
-      [(cons pat rst)
-       (define-values (fst-compiled fst-has-hole? fst-has-hide-hole? fst-names) (compile pat))
-       (define-values (rst-compiled rst-has-hole? rst-has-hide-hole? rst-names) (loop rst))
-       (values (cons fst-compiled rst-compiled)
-               (cons fst-has-hole? rst-has-hole?)
-               (cons fst-has-hide-hole? rst-has-hide-hole?)
-               (cons fst-names rst-names))])))
-
-(define (prefixed-with? prefix exp)
-  (and (symbol? exp)
-       (let* ([str (symbol->string exp)]
-              [len (string-length str)])
-         (and (len . >= . (string-length prefix))
-              (string=? (substring str 0 (string-length prefix))
-                        prefix)))))
-
-(define dummy (box 0))
-
-;; extract-empty-bindings : pattern -> (listof rib)
-(define (extract-empty-bindings pattern)
-  (let loop ([pattern pattern]
-             [ribs null])
-    (match-a-pattern pattern
-      [`any ribs]
-      [`number ribs]
-      [`string ribs]
-      [`natural ribs]
-      [`integer ribs]
-      [`real ribs]
-      [`boolean ribs]
-      [`variable ribs]
-      [`(variable-except ,vars ...) ribs]
-      [`(variable-prefix ,vars) ribs]
-      [`variable-not-otherwise-mentioned ribs]
-      
-      [`hole ribs]
-      [`(nt ,nt) ribs]
-      [`(name ,name ,pat)
-       (cons (make-bind name '()) (loop pat ribs))]
-      [`(mismatch-name ,name ,pat) 
-       (cons (make-mismatch-bind name '() 'unknown-mismatch-depth) (loop pat ribs))]
-      [`(in-hole ,context ,contractum) (loop contractum (loop context ribs))]
-      [`(hide-hole ,p) (loop p ribs)]
-      [`(side-condition ,pat ,test ,expr) (loop pat ribs)]
-      [`(cross ,id) ribs]
-      [`(list ,pats ...)
-       (let-values ([(rewritten has-hole? has-hide-hole? names)
-                     (rewrite-ellipses pats (lambda (x) (values x #f #f '())))])
-         (let i-loop ([r-exps rewritten]
-                      [ribs ribs])
-           (cond
-             [(null? r-exps) ribs]
-             [else (let ([r-exp (car r-exps)])
-                     (cond
-                       [(repeat? r-exp)
-                        (define bindings (if (repeat-mismatch r-exp)
-                                             (list (make-mismatch-bind (repeat-mismatch r-exp)
-                                                                       '()
-                                                                       'unknown-mismatch-depth))
-                                             '()))
-                        (define bindings2 (if (repeat-name r-exp)
-                                              (cons (make-bind (repeat-name r-exp) '()) bindings)
-                                              bindings))
-                        (append bindings2
-                                (repeat-empty-bindings r-exp)
-                                (i-loop (cdr r-exps) ribs))]
-                       [else
-                        (loop (car r-exps) (i-loop (cdr r-exps) ribs))]))])))]
-      [(? (compose not pair?)) ribs])))
-
-;; combine-matches : (listof (listof mtch)) -> (listof mtch)
-;; input is the list of bindings corresonding to a piecewise match
-;; of a list. produces all of the combinations of complete matches
-(define (combine-matches matchess)
-  (let loop ([matchess matchess])
-    (cond
-      [(null? matchess) combine-matches-base-case]
-      [else (combine-pair (car matchess) (loop (cdr matchess)))])))
-
-;; this 'inlines' build-flat-context so that the definition can remain here, near where it is used.
-(define combine-matches-base-case (list (make-mtch empty-bindings
-						   '() #;(build-flat-context '()) 
-						   none)))
-
-;; combine-pair : (listof mtch) (listof mtch) -> (listof mtch)
-(define (combine-pair fst snd)
-  (let ([mtchs null])
-    (for-each 
-     (lambda (mtch1)
-       (for-each
-        (lambda (mtch2)
-          (set! mtchs (cons (make-mtch 
-                             (make-bindings (append (bindings-table (mtch-bindings mtch1))
-                                                    (bindings-table (mtch-bindings mtch2))))
-                             (build-append-context (mtch-context mtch1) (mtch-context mtch2))
-                             (pick-hole (mtch-hole mtch1) 
-                                        (mtch-hole mtch2)))
-                            mtchs)))
-        snd))
-     fst)
-    mtchs))
-
-(define (hash-maps? ht key)
-  (not (eq? (hash-ref ht key uniq) uniq)))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; context adt
-;;
-
-#|
-  ;; This version of the ADT isn't right yet -- 
-  ;; need to figure out what to do about (name ...) patterns.
-
-  (define-values (struct:context make-context context? context-ref context-set!)
-    (make-struct-type 'context #f 1 0 #f '() #f 0))
-  (define hole values)
-  (define (build-flat-context exp) (make-context (lambda (x) exp)))
-  (define (build-cons-context c1 c2) (make-context (lambda (x) (cons (c1 x) (c2 x)))))
-  (define (build-append-context l1 l2) (make-context (lambda (x) (append (l1 x) (l2 x)))))
-  (define (build-list-context l) (make-context (lambda (x) (list (l x)))))
-  (define (build-nested-context c1 c2) (make-context (lambda (x) (c1 (c2 x)))))
-  (define (plug exp hole-stuff) (exp hole-stuff))
-  (define (reverse-context c) (make-context (lambda (x) (reverse (c x)))))
-
-|#
-(define (context? x) #t)
-
-(define (hole->not-hole exp)
-  (let loop ([exp exp])
-    (cond
-      [(pair? exp) 
-       (define old-car (car exp))
-       (define new-car (loop old-car))
-       (cond
-         [(eq? new-car old-car)
-          (define old-cdr (cdr exp))
-          (define new-cdr (loop old-cdr))
-          (if (eq? new-cdr old-cdr)
-              exp
-              (cons new-car new-cdr))]
-         [else (cons new-car (cdr exp))])]
-      [(eq? exp the-hole)
-       the-not-hole]
-      [else exp])))
-
-(define (build-flat-context exp) exp)
-(define (build-cons-context e1 e2) (cons e1 e2))
-(define (build-append-context e1 e2) (append e1 e2))
-(define (build-list-context x) (list x))
-(define (reverse-context x) (reverse x))
-(define (build-nested-context c1 c2) 
-  (plug c1 c2))
-
-(define (plug exp hole-stuff)
-  (let loop ([exp exp])
-    (cond
-      [(pair? exp) 
-       (define old-car (car exp))
-       (define new-car (loop old-car))
-       (cond
-         [(eq? new-car old-car)
-          (define old-cdr (cdr exp))
-          (define new-cdr (loop old-cdr))
-          (if (eq? new-cdr old-cdr)
-              exp
-              (cons new-car new-cdr))]
-         [else (cons new-car (cdr exp))])]
-      [(eq? the-not-hole exp)
-       the-not-hole]
-      [(eq? the-hole exp)
-       hole-stuff]
-      [else exp])))
-
-;;
-;; end context adt
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; used in hash lookups to tell when something isn't in the table
-(define uniq (gensym))
-
-(provide/contract
- (match-pattern (compiled-pattern? any/c . -> . (or/c false/c (listof mtch?))))
- (match-pattern? (compiled-pattern? any/c . -> . boolean?))
- (compile-pattern (-> compiled-lang? any/c boolean?
-                      compiled-pattern?))
- 
- (set-cache-size! (-> (and/c integer? positive?) void?))
- (cache-size (and/c integer? positive?))
- 
- (mtch? predicate/c)
- (make-mtch (bindings? any/c any/c . -> . mtch?))
- (mtch-bindings (mtch? . -> . bindings?))
- (mtch-context (mtch? . -> . any/c))
- (mtch-hole (mtch? . -> . (or/c none? any/c)))
- 
- (make-bindings ((listof bind?) . -> . bindings?))
- (bindings-table (bindings? . -> . (listof bind?)))
- (bindings? predicate/c)
- 
- (make-bind (symbol? any/c . -> . bind?))
- (bind? predicate/c)
- (bind-name (bind? . -> . symbol?))
- (bind-exp (bind? . -> . any/c))
- (compile-language (-> any/c (listof nt?) (hash/c symbol? uf-set?) compiled-lang?)))
-(provide compiled-pattern? 
-         print-stats)
-
-;; for test suite
-(provide build-cons-context
-         build-flat-context
-         context?
-         extract-empty-bindings
-         (rename-out [bindings-table bindings-table-unchecked])
-         (struct-out mismatch-bind)
-         (struct-out compiled-pattern))
-
-(provide (struct-out compiled-lang)
-         compiled-lang-cclang
-         
-         lookup-binding
-         
-         compiled-pattern
-         
-         plug
-         none? none
-         
-         make-repeat
-         rewrite-ellipses
-         build-compatible-context-language
-         caching-enabled?
-         check-redudancy
-         prefix-nts
-         mk-uf-sets)
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/pat-unify.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/pat-unify.rkt
deleted file mode 100644
index 694523c92d..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/pat-unify.rkt
+++ /dev/null
@@ -1,969 +0,0 @@
-#lang unstable/2d racket/base
-
-(require racket/contract
-         racket/function
-         racket/list
-         racket/match
-         racket/promise
-         racket/set
-         "match-a-pattern.rkt"
-         "matcher.rkt"
-         "lang-struct.rkt"
-         "extract-conditions.rkt"
-         "enum.rkt"
-         "error.rkt"
-         (for-syntax "rewrite-side-conditions.rkt"
-                     racket/base)
-         unstable/2d/match)
-
-(provide unify
-         unify*
-         (struct-out p*e)
-         (struct-out env)
-         (struct-out bound)
-         (struct-out lvar)
-         check-and-resimplify
-         disunify*
-         disunify
-         empty-env
-         pat*-clause-p?s
-         bind-names
-         remove-empty-dqs
-         and/fail
-         (struct-out unif-fail)
-         not-failed?
-         dq
-         dq-dq
-         predef-pat?
-         unique-name-nums
-         fresh-pat-vars
-         make-uid
-         p*e-eqs
-         unsupported-pat-err-name
-         unsupported-pat-err)
-
-
-;;
-;; atom := `any | `number | `string | `integer | `boolean | `real | `variable | `variable-not-otherwise-mentioned
-;; var  := symbol?
-;; nt   := symbol?
-;; pat  := `(nt ,var) | `(list ,pat ...)  | atom | `(name ,var ,pat) | `(mismatch-name ,name ,pat)
-;; pat* := `(nt ,var) | `(list ,pat* ...) | atom | `(name ,var ,(bound)) |
-;;         `(cstr (,nt ...) ,pat*)  -- no nested cstrs | `(mismatch-name ,name ,pat*)
-;;
-;; Unification takes a language, two pats, and an environment,
-;; and produces a pat* and and environment (p*e) or fails.
-;; Unify calls bind-names to convert a pat into a pat*, and unify*
-;; does the actual work of unifying two pat*'s.
-;; A pat* doesn't have any meaning unless it is paired with an environment - all
-;; names in a pat* are bound, and a pat* may have constraints (cstrs) on subpatterns.
-
-
-(struct lvar (id) #:prefab)
-
-(struct uninstantiated () #:prefab)
-
-(struct bound () #:prefab)
-
-(struct p*e (p e) #:transparent)
-
-(struct env (eqs dqs) #:transparent)
-(struct dq (params dq) #:transparent)
-(define empty-env (env (hash) '()))
-
-(struct unif-fail () #:transparent)
-
-(define (not-failed? maybe-failed)
-  (not (unif-fail? maybe-failed)))
-
-(define-syntax (and/fail stx)
-  (syntax-case stx ()
-    [(_ conds ... res)
-     #'(if (and conds ...)
-           res
-           (unif-fail))]))
-
-(define predef-pats (set 'any 'number 'string 'integer 'boolean 'real 'variable 'natural 'variable-not-otherwise-mentioned))
-(define (predef-pat? a)
-  (or (set-member? predef-pats a)
-      (match a
-        [`(variable-except ,_ ...) #t]
-        [`(variable-prefix ,_) #t]
-        [_ #f])))
-(define (var? s)
-  (symbol? s))
-(define (n-t? s)
-  (symbol? s))
-(define (pat-or-pat*? is-pat*? p)
-  (let loop ([p p])
-    (extract-clauses
-     (match-a-pattern #:allow-else p
-       [`any #t]
-       [`number #t]
-       [`string #t]
-       [`natural #t]
-       [`integer #t]
-       [`real #t]
-       [`boolean #t]
-       [`variable #t]
-       [`(variable-except ,vars ...) #t]
-       [`(variable-prefix ,pfx) #t]
-       [`variable-not-otherwise-mentioned #t]
-       [`hole #f]
-       [`(nt ,(? n-t? n))
-        #t]
-       [`(name ,(? var? name) ,p)
-        (if is-pat*?
-            (bound? p)
-            (loop p))]
-       [`(mismatch-name ,name ,p)
-        (loop p)]
-       [`(in-hole ,p1 ,p2) #f]
-       [`(hide-hole ,p) #f]
-       [`(side-condition ,pat ,condition ,srcloc-expr) #f]
-       [`(cross ,var) #f]
-       [`(list ,ps ...)
-        (for/and ([p ps]) (loop p))]
-       [(? (compose not pair?))
-        (or (symbol? p) (number? p) (string? p) (boolean? p))]
-       [_ 
-        (and is-pat*?
-             (match p
-               [`(cstr (,nts ...) ,p*)
-                (and (for/and ([n nts]) (n-t? n))
-                     (loop p*))]
-               [_ #f]))]))))
-
-(define (pat? p) (pat-or-pat*? #f p))
-(define (pat*? p) (pat-or-pat*? #t p))
-(define pat*-clause-p?s (append (list
-                                 (let ([bound-name? (λ (p) (match p [`(name ,id ,(bound)) #t] [_ #f]))])
-                                   bound-name?)
-                                 (let ([cstr? (λ (p) (match p [`(cstr (,nts ...) ,pat) #t] [_ #f]))])
-                                   cstr?))
-                                (extracted-clauses->fns)))
-
-;; used to track new equations for disunification
-(define new-eqs (make-parameter (make-hash)))
-
-;; (hash/c id (listof pat*))
-;; disqequations generated (by mismatch-pattern) during a given unification pass
-(define dqs-found (make-parameter (make-hash)))
-
-(define-syntax-rule
-  (maybe-let ([x e]) body ...)
-  (let ([val e])
-    (match val
-      [(unif-fail) val]
-      [_ (let ([x val]) body ...)])))
-
-(define-syntax maybe-let*
-  (syntax-rules ()
-    [(maybe-let* () body ...) (let () body ...)]
-    [(maybe-let* ([x x-e] [y e] ...) body ...)
-     (maybe-let ([x x-e])
-       (maybe-let* ([y e] ...) body ...))]))
-
-(define-syntax-rule
-  (p*e-eqs x)
-  (env-eqs (p*e-e x)))
-      
-;; pat pat env lang -> (or/c p*e? unif-fail?)
-(define (unify t u e L)
-  (parameterize ([dqs-found (make-hash)])
-    (maybe-let* ([t* (bind-names t e L)]
-                 [u* (bind-names u (p*e-e t*) L)]
-                 [res (unify* (p*e-p t*) (p*e-p u*) (p*e-e u*) L)])
-                (define eqs (p*e-eqs res))
-                (define res-pat (p*e-p res))
-                (define found-pre-dqs (apply set-union (set) 
-                                             (for/list ([dq-sides/id (hash-values (dqs-found))])
-                                               (list->dq-pairs dq-sides/id))))
-                (maybe-let* ([found-dqs (for/fold ([fdqs '()])
-                                          ([pdq (in-set found-pre-dqs)])
-                                          (maybe-let* ([fdqs fdqs])
-                                                      (define new-dq (disunify* '() (first pdq) (second pdq) eqs L))
-                                                      (and/fail new-dq
-                                                                (cons new-dq fdqs))))])
-                            (define real-dqs (filter (λ (dq) (not (boolean? dq))) found-dqs))
-                            (define new-dqs (check-and-resimplify eqs (append real-dqs (env-dqs e)) L))
-                            (and/fail new-dqs
-                                      (p*e res-pat (env eqs new-dqs)))))))
-
-(define (list->dq-pairs dq-sides)
-  (cond
-    [(or (empty? dq-sides) 
-         (equal? '() (cdr dq-sides)))
-     (set)]
-    [else
-     (set-union (for/set ([rhs (cdr dq-sides)])
-                         (list (car dq-sides) rhs))
-                (list->dq-pairs (cdr dq-sides)))]))
-
-;; pat pat env lang -> (or/c env boolean?)
-(define (disunify params t u e L)
-  (parameterize ([new-eqs (make-hash)])
-    (define t*e (bind-names t e L))
-    (cond 
-      [(unif-fail? t*e) e]
-      [else
-       (define u*e (bind-names u (p*e-e t*e) L))
-       (cond
-         [(unif-fail? u*e) e]
-         [else
-          (define new-dq (disunify* params (p*e-p t*e) (p*e-p u*e) (env-eqs (p*e-e u*e)) L))
-          (match new-dq
-            [#f #f]
-            [#t
-             (env (env-eqs (p*e-e u*e))
-                  (env-dqs e))]
-            [_
-             (env (env-eqs (p*e-e u*e))
-                  (cons new-dq
-                        (env-dqs e)))])])])))
-
-(define base-dq `((list) (list)))
-
-(define (remove-empty-dqs dqs)
-  (filter (λ (dq) (not (equal? base-dq dq)))
-          dqs))
-
-(define (extend-dq new-eqs ineq0 eqs)
-  (for/fold ([ineq ineq0])
-    ([(k v) (in-hash new-eqs)])
-    (match ineq
-      [`((list ,vars ...) (list ,terms ...))
-       (match* (k v)
-         [((lvar id-l) (lvar id-r))
-          `((list ,@vars (name ,id-l ,(bound))) 
-            (list ,@terms ,(resolve-no-nts/var v eqs)))]
-         [((lvar id-l) pat*-r)
-          `((list ,@vars (name ,id-l ,(bound))) 
-            (list ,@terms ,(resolve-no-nts/pat v eqs)))])])))
-
-(define (resolve-no-nts/var lv eqs)
-  (define-values (rep pat _) (lookup (lvar-id lv) eqs))
-  (if (not (groundable? pat))
-      `(name ,(lvar-id rep) ,(bound))
-      (resolve-no-nts/pat pat eqs)))
-
-(define (resolve-no-nts/pat pat eqs)
-  (let recur ([p pat])
-        (match p
-          [`(name ,id ,(bound))
-           (resolve-no-nts/var (lvar id) eqs)]
-          [`(list ,ps ...)
-           `(list ,@(for/list ([p ps]) (recur p)))]
-          [`(cstr (,cs ...) p)
-           (recur p)]
-          [_
-           (unless (groundable? p)
-             (error resolve-no-nts/pat 
-                    "non-groundable pat at internal pattern position: ~s" p))
-           p])))
-
-
-(define (groundable? p)
-  (match p
-    [`(nt ,_) #f]
-    [(? predef-pat? _) #f]
-    [`(cstr ,_ ,p)
-     (groundable? p)]
-    [_ #t]))                                   
-                                           
-
-;; eqs dqs -> dqs or #f
-;; simplified - first element in lhs of all inequations is a var not occuring in lhs of eqns
-(define (check-and-resimplify eqs dqs L)
-  (define-values (dqs-notok dqs-ok) 
-    (partition (λ (a-dq)
-                 (hash-has-key? 
-                  eqs
-                  (lvar (match a-dq
-                          [(dq ps `((list (name ,v1 ,(bound)) ,vs ...) (list ,t1 ,ts ...)))
-                           v1]))))
-               (remove-empty-dqs dqs)))
-  (let loop ([ok dqs-ok]
-             [notok dqs-notok])
-    (cond
-      [(empty? notok)
-       ok]
-      [else
-       (match notok
-         [`(,(dq ps `(,vars-p* ,term-p*)) ,rest ...)
-          (let ([new-dq (disunify* ps vars-p* term-p* eqs L)])
-            (and new-dq
-                 (match new-dq
-                   [#t (loop ok rest)]
-                   [_ (loop (cons new-dq ok) rest)])))])])))
-
-;; params pat* pat* eqs lang -> boolean or dq
-(define (disunify* params u* t* eqs L)
-  (parameterize ([new-eqs (make-hash)])
-    (define res (unify* u* t* (env eqs '()) L))
-    (cond
-      [(unif-fail? res) #t]
-      [(empty? (hash-keys (new-eqs))) #f]
-      [else
-       (define-values (new-ps new-dq)
-         (param-elim params (extend-dq (new-eqs) base-dq (env-eqs (p*e-e res)))))
-       (match new-dq
-         [`((list) (list))
-          #f]
-         [`((list (name, var-ids ,(bound)) ...) (list ,pats ...))
-          ;; check to see if parameter eliminations exposed some
-          ;; equivalences...
-          (and
-           (or (equal? (length params) (length new-ps))
-               (for/and ([v (in-list var-ids)]
-                         [p (in-list pats)])
-                 (or (not (hash-has-key? eqs (lvar v)))
-                     (not (equal? (resolve-no-nts/pat `(name ,v ,(bound)) eqs)
-                                  p)))))
-           (dq new-ps new-dq))])])))
-
-
-(define (param-elim params unquantified-dq)             
-  (let loop ([dq-rest unquantified-dq]                                             
-             [ps params]             
-             [new-dq-l '()]         
-             [new-dq-r '()]
-             [lhs-ps (hash)])
-    (match dq-rest                   
-      ['((list) (list))
-       (define-values
-         (ndql ndqr nps)
-         (for/fold ([ndql new-dq-l] [ndqr new-dq-r] [nps ps])
-           ([(p lhss) (in-hash lhs-ps)])
-           (if ((length lhss) . > . 1)
-               (values (foldr cons ndql lhss)
-                       (foldr cons ndqr (build-list (length lhss) 
-                                                    (λ (_) p)))
-                       nps)
-               (values ndql 
-                       ndqr 
-                       (remove (list-ref p 1) nps)))))
-       (values nps `((list ,@ndql) (list ,@ndqr)))]       
-      [`((list (name ,v1,(bound)) ,vs ...) (list ,t1 ,ts ...))    
-       (cond                         
-         [(member v1 params)
-          (loop `((list ,@vs) (list ,@ts))          
-                (remove v1 ps)                      
-                new-dq-l                            
-                new-dq-r
-                lhs-ps)]
-         [(match t1
-            [`(name ,tn ,(bound)) (member tn ps)]
-            [_ #f])
-          (loop `((list ,@vs) (list ,@ts))
-                ps
-                new-dq-l
-                new-dq-r
-                (hash-set lhs-ps t1 (cons `(name ,v1 ,(bound)) 
-                                          (hash-ref lhs-ps t1 '()))))]
-         [else                       
-          (loop `((list ,@vs) (list ,@ts))          
-                ps                                  
-                (cons `(name ,v1 ,(bound)) new-dq-l)
-                (cons t1 new-dq-r)
-                lhs-ps)])]))) 
-
-
-;; refactoring bind-names to remove set!'s (with the idea of enabling optimizations)
-;; seems to have no effect on performance
-
-;; pat env lang -> p*e or (unif-fail)
-(define (bind-names pat e L)
-  (define eqs (env-eqs e))
-  (define dqs (env-dqs e))
-  (define res-pat
-    (let loop ([pat pat])
-      (match pat
-        [`(name ,name ,(bound))
-         (error 'bind-names "pat*, not a pat: ~s" pat)]
-        [`(name ,name ,pat)
-         (maybe-let ([b-pat (loop pat)])
-                    (let recur ([id name])
-                      (define res (hash-ref eqs (lvar id) (uninstantiated)))
-                      (match res
-                        [(uninstantiated)
-                         (when (equal? b-pat (bound))
-                           (error 'bind-names "tried to set something to bound"))
-                         (and/fail (not (occurs?* id b-pat eqs L))
-                                   (set! eqs (hash-set eqs (lvar id) b-pat))
-                                   ;; here we only bind to things in the local pattern
-                                   ;; so don't update new-eqs
-                                   `(name ,name ,(bound)))]
-                        [(lvar new-id)
-                         (define next (recur new-id))
-                         (match next
-                           [`(name ,id-new ,(bound))
-                            (unless (eq? id id-new)
-                              ;; path compression: don't update new-eqs here
-                              (set! eqs (hash-set eqs (lvar id) (lvar id-new))))]
-                           [_ (void)])
-                         next]
-                        [_
-                         (maybe-let ([u-res (unify-update* id b-pat res (env eqs #f) L)])
-                                    (set! eqs (p*e-eqs u-res))
-                                    `(name ,id ,(bound)))])))]
-        [`(list ,pats ...)
-         (let/ec fail
-           `(list ,@(for/list ([p pats])
-                      (define res (loop p))
-                      (if (not-failed? res)
-                          res
-                          (fail (unif-fail))))))]
-        [`(variable-not-in ,p ,s)
-         (maybe-let* ([pat (loop p)]
-                      [s-pat (loop s)])
-                     `(variable-not-in ,pat ,s-pat))]
-        [`(mismatch-name ,name ,p)
-         (maybe-let ([b-pat (loop p)])
-                    `(mismatch-name ,name ,b-pat))]
-        [_ pat])))
-  (maybe-let ([res-pat res-pat])
-             (p*e res-pat (env eqs dqs))))
-
-
-;; unify* : pat* pat* env lang -> p*e? or unif-fail?
-(define (unify* t0 u0 e0 L)
-  (define t*e (resolve t0 e0))
-  (define u*e (resolve u0 (p*e-e t*e)))
-  (define t (p*e-p t*e))
-  (define u (p*e-p u*e))
-  (define e (p*e-e u*e))
-  #2dmatch
-  ╔═════════════════╦═════════════════╦═════════════╦═══════════════╦═══════════╦══════╦════════════╦══════════════╦═══════════════════╦═════════╦══════════╦══════════════╦═════════════╗
-  ║            u    ║ `(mismatch-name ║ `(name      ║ `(cstr        ║`(nt ,n-u) ║`any  ║ (? num-ty?)║`(list        ║ (? pvar?)         ║ `string ║ `boolean ║ (? base-ty?) ║(? not-pair?)║
-  ║                 ║   ,u-name       ║   ,name-u   ║   (,nts1 ...) ║           ║      ║            ║  ,us ...)    ║                   ║         ║          ║              ║             ║
-  ║  t              ║   ,u-pat)       ║   ,(bound)) ║   ,p1)        ║           ║      ║            ║              ║                   ║         ║          ║              ║             ║
-  ╠═════════════════╬═════════════════╩═════════════╩═══════════════╩═══════════╩══════╩════════════╩══════════════╩═══════════════════╩═════════╩══════════╩══════════════╩═════════════╣
-  ║`(mismatch-name  ║ (hash-set! (dqs-found) t-name (cons u (hash-ref (dqs-found) t-name (λ () '()))))                                                                                   ║
-  ║  ,t-name        ║ (unify* t-pat u e L)                                                                                                                                               ║
-  ║  ,t-pat)        ║                                                                                                                                                                    ║
-  ╠═════════════════╬═════════════════╦══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╣
-  ║`(name ,name-t   ║                 ║ (instantiate* name-t u e L)                                                                                                                      ║
-  ║       ,(bound)) ║                 ║                                                                                                                                                  ║
-  ╠═════════════════╣                 ╚═════════════╦═══════════════╦════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╣
-  ║`(cstr           ║                               ║(u*-2cstrs     ║ (u*-1cstr nts2 p2 u e L)                                                                                           ║
-  ║  (,nts2 ...)    ║                               ║  nts1 p1      ║                                                                                                                    ║
-  ║  ,p2)           ║                               ║  nts2 p2 e L) ║                                                                                                                    ║
-  ╠═════════════════╣                               ╚═══════════════╬═══════════╦════════════════════════════════════════════════════════════════════════════════════════════════════════╣
-  ║ `(nt ,n-t)      ║                                               ║(u*-2nts   ║ (u*-1nt n-t u e L)                                                                                     ║
-  ║                 ║                                               ║ n-t n-u   ║                                                                                                        ║
-  ║                 ║                                               ║ e L)      ║                                                                                                        ║
-  ╠═════════════════╣                                               ╚═══════════╬════════════════════════════════════════════════════════════════════════════════════════════════════════╣
-  ║  `any           ║                                                           ║ (p*e u e)                                                                                              ║
-  ║                 ║                                                           ║                                                                                                        ║
-  ╠═════════════════╣                                                           ╚══════╦════════════╦══════════════════════════════════════════════════════════════════════╦═════════════╣
-  ║  (? num-ty?)    ║                                                                  ║(u*-2nums   ║                                                                      ║             ║
-  ║                 ║                                                                  ║  t u e)    ║                                                                      ║             ║
-  ╠═════════════════╣                                                                  ╚════════════╬══════════════╗                                                       ║             ║
-  ║ `(list ,ts ...) ║                                                                               ║(u*-2lsts     ║                                (unif-fail)            ║             ║
-  ║                 ║                                                                               ║ ts us e L)   ║                                                       ║(u*-matches? ║
-  ╠═════════════════╣                                                                               ╚══════════════╬═══════════════════╗                                   ║  t u        ║
-  ║ (? pvar?)       ║                                                                                              ║(u*-2pvars u t e L)║                                   ║  e L)       ║
-  ╠═════════════════╣                                                                                              ╚═══════════════════╬═════════╗                         ║             ║
-  ║ `string         ║                   (unify* u t e L)                                                                               ║(p*e t e)║                         ║             ║
-  ╠═════════════════╣                                                                                                                  ╚═════════╬══════════╗              ║             ║
-  ║ `boolean        ║                                                                                                                            ║(p*e t e) ║              ║             ║
-  ╠═════════════════╣                                                                                                                            ╚══════════╬══════════════╣             ║
-  ║ (? base-ty?)    ║                                                                                                                                       ║   (p*e t e)  ║             ║
-  ╠═════════════════╣                                                                                                                                       ╚══════════════╬═════════════╣
-  ║ (? not-pair?)   ║                                                                                                                                                      ║(and/fail    ║
-  ║                 ║                                                                                                                                                      ║ (equal? t u)║
-  ║                 ║                                                                                                                                                      ║ (p*e t e))  ║
-  ╚═════════════════╩══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╩═════════════╝)
-
-(define (pvar? x) (or (vnom? x)
-                      (var-pref? x)
-                      (var-exc? x)
-                      (vni? x)
-                      (equal? 'variable x)))
-(define (vnom? x) (equal? x 'variable-not-otherwise-mentioned))
-(define (var-pref? x) (match x
-                        [`(variable-prefix ,p) #t]
-                        [_ #f]))
-(define (var-exc? x) (match x
-                       [`(variable-except ,p ...) #t]
-                       [_ #f]))
-(define (not-pair? x) (not (pair? x)))
-(define vni?
-  (match-lambda [`(variable-not-in ,e ,s) #t]
-                [_ #f]))
-
-;; pvar? pvar? env lang -> (or/c p*e? unif-fail?)
-(define (u*-2pvars v1 v2 e L)
-  (define res
-    (begin
-    #2dmatch
-    ╔══════════════════════════╦══════════════════════════╦════════════════════════════════╦═══════════════════════════════╦════════════════╦══════════════════════════════════════╗
-    ║                   v1     ║`(variable-prefix ,p1)    ║ `(variable-except ,e1 ... )    ║    (? vnom?)                  ║   `variable    ║`(variable-not-in ,e1 ,s)             ║       
-    ║ v2                       ║                          ║                                ║                               ║                ║                                      ║
-    ╠══════════════════════════╬══════════════════════════╬════════════════════════════════╬═══════════════════════════════╬════════════════╬══════════════════════════════════════╣
-    ║                          ║ (cond                    ║ (and/fail                      ║(u*-2pvars                     ║                ║(and/fail                             ║
-    ║ `(variable-prefix ,p2)   ║  [(sym-pref? p1 p2)      ║  (not (ormap                   ║ v2                            ║                ║  (sym-pref? p2 s)                    ║
-    ║                          ║   `(variable-prefix ,p2)]║        (curry sym-pref? p2)    ║ `(variable-except             ║                ║  v1)                                 ║
-    ║                          ║  [(sym-pref? p2 p1)      ║        e1))                    ║ ,@(compiled-lang-literals L)) ║                ║                                      ║
-    ║                          ║   `(variable-prefix ,p1)]║  v2)                           ║ e L)                          ║                ║                                      ║
-    ║                          ║  [else (unif-fail)])     ║                                ║                               ║                ║                                      ║
-    ╠══════════════════════════╬══════════════════════════╬════════════════════════════════╣                               ║                ╠══════════════════════════════════════╣
-    ║                          ║                          ║ `(variable-except              ║                               ║                ║`(variable-not-in                     ║
-    ║  `(variable-except       ║                          ║   ,@(de-dupe/sorted            ║                               ║       v2       ║   (list ,e1 ,@e2)                    ║
-    ║     ,e2 ...)             ║                          ║      (merge/sorted e1 e2)))    ║                               ║                ║   ,s)                                ║
-    ║                          ║                          ║                                ║                               ║                ║                                      ║
-    ╠══════════════════════════╣                          ╚════════════════════════════════╬═══════════════════════════════╣                ╠══════════════════════════════════════╣
-    ║                          ║                                                           ║                               ║                ║(u*-2pvars v1                         ║
-    ║  (? vnom?)               ║                                                           ║              v1               ║                ║`(variable-except                     ║
-    ║                          ║                                                           ║                               ║                ║  ,@(compiled-lang-literals L))       ║
-    ║                          ║                                                           ║                               ║                ║ e L)                                 ║
-    ╠══════════════════════════╣               (u*-2pvars v2 v1 e L)                       ╚═══════════════════════════════╣                ╠══════════════════════════════════════╣
-    ║                          ║                                                                                           ║                ║                                      ║
-    ║ `variable                ║                                                                                           ║                ║              v1                      ║  
-    ║                          ║                                                                                           ║                ║                                      ║
-    ╠══════════════════════════╣                                                                                           ╚════════════════╬══════════════════════════════════════╣
-    ║                          ║                                                                                                            ║                                      ║
-    ║ `(variable-not-in ,e2 ,t)║                                                                                                            ║     (2-vnis v1 v2 e L)               ║  
-    ║                          ║                                                                                                            ║                                      ║
-    ╚══════════════════════════╩════════════════════════════════════════════════════════════════════════════════════════════════════════════╩══════════════════════════════════════╝))
-  (match res
-    [(unif-fail) res]
-    [(p*e _ _) res]
-    [_ (p*e res e)]))
-  
-
-(define (2-vnis v1 v2 e L)
-  (match-define `(variable-not-in ,e1 ,s1) v1)
-  (match-define `(variable-not-in ,e2 ,s2) v2)
-  (cond
-    [(not (and (symbol? s1) (symbol? s2)))
-     (maybe-let ([s-res (unify* s1 s2 e L)])
-       (p*e `(variable-not-in (list ,e1 ,e2) ,(p*e-p s-res))
-            (p*e-e s-res)))]
-    [(sym-pref? s1 s2)
-     `(variable-not-in (list ,e1 ,e2) s2)]
-    [(sym-pref? s2 s1)
-     `(variable-not-in (list ,e1 ,e2) s1)]
-    [else (unif-fail)])) 
-
-(define (sym-pref? sp s)
-  (regexp-match
-   (string-append "^" (symbol->string sp) ".*$")
-   (symbol->string s)))
-
-(define (u*-2cstrs nts1 p1 nts2 p2 e L)
-  (maybe-let ([res (unify* p1 p2 e L)])
-    (define res-p (p*e-p res))
-    (define new-nts (merge-ids/sorted nts1 nts2 L))
-    (and/fail new-nts
-              (when (lvar? res-p)
-                (error 'unify* "unify* returned lvar as result: ~s\n~s\n~s\n" p1 p2 e))
-              (p*e `(cstr ,new-nts ,res-p) (p*e-e res)))))
-
-(define (u*-1cstr nts p u e L)
-  (maybe-let ([res (unify* p u e L)])
-             (define res-p (p*e-p res))
-             (define res-e (p*e-e res))
-             (match res-p
-               [(lvar id)
-                (error 'unify* "unify* returned lvar as result: ~s\n~s\n~s\n" p u e)]
-               [`(nt ,nt)
-                (define new-nts (merge-ids/sorted (list nt) nts L))
-                (and/fail new-nts
-                          (p*e `(cstr ,new-nts ,p) res-e))]
-               [`(cstr ,nts2 ,new-p)
-                (define new-nts (merge-ids/sorted nts nts2 L))
-                (and/fail new-nts
-                          (p*e `(cstr ,new-nts ,new-p) res-e))]
-               [_
-                (and/fail (for/and ([n nts]) (check-nt n L res-p e))
-                          (p*e `(cstr ,nts ,res-p) res-e))])))
-  
-(define (u*-2nts n-t n-u e L)
-  (if (equal? n-t n-u)
-      (p*e `(nt ,n-t) e)
-      (u*-1nt n-t `(nt ,n-u) e L)))
-
-(define (u*-1nt p u e L)
-  (and/fail
-   (check-nt p L u e)
-   (if (hash-has-key? (compiled-lang-collapsible-nts L) p)
-       (maybe-let ([bn-res (bind-names (fresh-pat-vars (hash-ref (compiled-lang-collapsible-nts L) p) (make-hash)) e L)])
-         (unify* (p*e-p bn-res) u (p*e-e bn-res) L))
-       ;; removed a unification of u with itself here
-       ;; (the reason for which was mysterious)
-       (p*e `(cstr (,p) ,u) e))))
-  
-(define (u*-2lsts ts us e L)
-  (and/fail (= (length ts) (length us))
-            (maybe-let ([res-ps-e
-                         (let loop ([ts ts]
-                                    [us us]
-                                    [e e]
-                                    [rs '()])
-                           (if (empty? ts)
-                               (cons rs e)
-                               (maybe-let ([res (unify* (car ts) (car us) e L)])
-                                          (loop (cdr ts)
-                                                (cdr us)
-                                                (p*e-e res)
-                                                (cons (p*e-p res) rs)))))])
-                 (p*e `(list ,@(reverse (car res-ps-e)))
-                      (cdr res-ps-e)))))
-
-(define (u*-2nums t u e)
-  (p*e
-   (cond 
-     [(number-superset? t u) u]
-     [(number-superset? u t) t])
-   e))
-
-(define (u*-matches? t u e L)
-  (maybe-let ([pat-res
-               (match* (t u)
-                 [((? num-ty? t) _)
-                  (and/fail ((number-pred t) u)
-                            u)]
-                 [(`variable-not-otherwise-mentioned (? symbol? s))
-                  (and/fail (not (memq s (compiled-lang-literals L)))
-                            (not (base-ty? s))
-                            s)]
-                 [(`(variable-except ,ss ...) (? symbol? s))
-                  (and/fail (not (memq s ss))
-                            u)]
-                 [(`(variable-prefix ,pref) (? symbol? s))
-                  (and/fail (regexp-match 
-                             (regexp (string-append "^" (symbol->string pref) ".*$"))
-                             (symbol->string s))
-                            u)]           
-                 [(`variable (? symbol? s))
-                  (and/fail (not (base-ty? s))
-                            s)]
-                 [(`string (? string? s))
-                  s]
-                 [(`boolean (? boolean? b))
-                  b]
-                 [(_ _) (unif-fail)])])
-             (p*e pat-res e)))
-    
-(define (resolve pat e)
-  (define e-eqs (env-eqs e))
-  (define-values (res-pat eqz)
-    (let loop ([pat pat]
-               [eqs e-eqs])
-      (match pat
-        [`(name ,id ,(bound))
-         (define-values (rep eqs2) (lookup-rep id eqs))
-         (define id-rep (lvar-id rep))
-         (match (hash-ref eqs2 (lvar id-rep))
-           [`(name ,next-id ,(bound))
-            (loop `(name ,next-id ,(bound)) (hash-set eqs2 (lvar id) (lvar next-id)))]
-           [_
-            (values `(name ,id-rep ,(bound)) eqs2)])]
-        [_ (values pat eqs)])))
-  (p*e res-pat (struct-copy env e [eqs eqz])))
-
-;; id pat* pat* env lang -> p*e? or unif-fail?
-(define (unify-update* id pat-1 pat-2 e L)
-  (maybe-let ([u-res (unify* pat-1 pat-2 e L)])
-   (define res-e (p*e-e u-res))
-   (define res-eqs (env-eqs res-e))
-   (define res-p (p*e-p u-res))
-   (and/fail (not (occurs?* id pat-1 res-eqs L))
-             (not (occurs?* id pat-2 res-eqs L))
-             (when (equal? u-res (bound)) 
-               (error 'update "tried to set something to bound"))
-             (unless (equal? u-res (hash-ref res-eqs (lvar id) (uninstantiated)))
-               (unless (or (nt-only-pat? res-p)
-                           (ground-pat-eq? pat-1 pat-2))
-                 (hash-set! (new-eqs) (lvar id) res-p)))
-             (p*e res-p (struct-copy env res-e [eqs (hash-set res-eqs (lvar id) res-p)])))))
-
-(define (nt-only-pat? p*)
-  (match p*
-    [`(nt ,_)
-      #t]
-    [`(cstr (,_ ...) ,p2)
-     (nt-only-pat? p2)]
-    ;; only put things in disequations that are constraints between lvars
-    ;; or actual values for lvars
-    [(? (λ (s) (predef-pat? s)))
-     p*]
-    [_
-     #f]))
-
-;; occurs* : name (pat* or lvar] -> bool
-;; pat* --> path compression has been added by bind-names, so
-;; we only need to look at the id in name, and the pattern it is bound to
-;; TODO: replace name in p*'s with lvar - this is the most obvious of many 
-;; functions that would be improved by this
-(define (occurs?* name p eqs L)
-  (match p
-    [`(name ,name-p ,(bound))
-     (or (eq? name name-p)
-         (occurs?* name (hash-ref eqs (lvar name-p) (uninstantiated)) eqs L))]
-    [`(list ,ps ...)
-     (for/or ([p ps])
-       (occurs?* name p eqs L))]
-    [`(cstr (,nts ...) ,pat)
-     (occurs?* name pat eqs L)]
-    [(lvar id)
-     (or (eq? name id)
-         (occurs?* name (hash-ref eqs (lvar id) (uninstantiated)) eqs L))]
-    [`(cstr ,(lvar _))
-     (error 'occurs?* "rogue lvar: ~s\n" p)]
-    [_ #f]))
-
-(define (instantiate* id pat e L)
-  (define-values (p eqs2) (lookup-pat id (env-eqs e)))
-  (define id-res (resolve p (struct-copy env e [eqs eqs2])))
-  (define e-res (p*e-e id-res))
-  (define id-pat (p*e-p id-res))
-  (define e-eqs (p*e-eqs id-res))
-  (match* (id-pat pat)
-    [(`(name ,next-id ,(bound)) _)
-     (maybe-let ([n-res (instantiate* next-id pat e-res L)])
-        (define n-eqs (p*e-eqs n-res))
-        (and/fail (not (occurs?* id (lvar next-id) n-eqs L))
-                  (p*e `(name ,next-id ,(bound))
-                       (struct-copy env e
-                                    [eqs (hash-set n-eqs (lvar id) (lvar next-id))]))))]
-    [(_ `(name ,id-2 ,(bound)))
-     (cond 
-       [(eq? id id-2) (p*e pat e)]
-       [else
-        (define-values (p2 eqsp2) (lookup-pat id-2 e-eqs))
-        (define id-2-res (resolve p2 (struct-copy env e-res [eqs eqsp2])))
-        (define id-2-pat (p*e-p id-2-res))
-        (maybe-let ([res (unify-update* id id-pat id-2-pat (p*e-e id-2-res) L)])
-          (define e-res (p*e-e res))
-          (and/fail (not (occurs?* id-2 (lvar id) (env-eqs e-res) L))
-                    (unless (ground-pat-eq? id-pat id-2-pat)
-                      (hash-set! (new-eqs) (lvar id-2) (lvar id)))
-                    (p*e `(name ,id ,(bound))
-                         (struct-copy env e
-                                      [eqs (hash-set (env-eqs e-res) (lvar id-2) (lvar id))]))))])]
-    [(_ _)
-     (maybe-let ([res (unify-update* id id-pat pat e L)])
-       (p*e `(name ,id ,(bound)) (p*e-e res)))]))
-
-;; we want to consider ground pats that are equal
-;; modulo constraints as equal when disunifying (see uses)
-(define (ground-pat-eq? p* u*)
-  (match* (p* u*)
-    [(`(cstr (,pnts ...) ,p-next) u)
-     (ground-pat-eq? p-next u)]
-    [(p `(cstr (,unts ...) ,u-next))
-     (ground-pat-eq? p u-next)]
-    [(`(list ,ps ...) `(list ,us ...))
-     (and (equal? (length ps) (length us))
-          (for/and ([p ps] [u us]) 
-            (ground-pat-eq? p u)))]
-    [(_ `(name ,id ,(bound)))
-     #f]
-    [(`(name ,id ,(bound)) _)
-     #f]
-    [(_ `(nt ,u-nt))
-     #f]
-    [(`(nt ,p-nt) _)
-     #f]
-    [(_ (? predef-pat? u))
-     #f]
-    [((? predef-pat? p) _)
-     #f]
-    [(_ _)
-     (equal? p* u*)]))
-
-(define (merge-ids/sorted l1 l2 lang)
-  (and (for*/and ([nt1 l1] [nt2 l2])
-         (check-nt nt1 lang `(nt ,nt2) empty-env))
-       (de-dupe/sorted (merge/sorted l1 l2))))
-
-(define (symbol<? s1 s2)
-  (string<? (symbol->string s1) (symbol->string s2)))
-
-(define (merge/sorted ids1 ids2)
-  (cond [(empty? ids1) ids2]
-        [(empty? ids2) ids1]
-        [(symbol<? (car ids1) (car ids2))
-         (cons (car ids1) (merge/sorted (cdr ids1) ids2))]
-        [else
-         (cons (car ids2) (merge/sorted ids1 (cdr ids2)))]))
-
-(define (de-dupe/sorted lst)
-  (match lst
-    ['() '()]
-    [`(,a) `(,a)]
-    [`(,a ,a ,rest ...)
-     (de-dupe/sorted (cons a rest))]
-    [`(,a ,b ,rest ...)
-     (cons a (de-dupe/sorted (cons b rest)))]))
-
-(define (num-ty? symbol)
-  (member symbol
-          '(number real integer natural)))
-
-(define npreds (hash 'number number?
-                     'real real?
-                     'integer integer?
-                     'natural (λ (n) (and (integer? n)
-                                           (>= n 0)))))
-(define (number-pred symbol)
-  (hash-ref npreds symbol))
-
-(define (number-superset? super sub)
-  (define nums '(any number real integer natural))
-  (>= (length (member super nums))
-      (length (member sub nums))))
-
-(define (base-ty? symbol)
-  (member symbol
-          '(any number string natural integer real boolean
-                variable variable-not-otherwise-mentioned)))
-
-(define (lookup-pat id eqs)
-  (define-values (_ pat new-eqs) (lookup id eqs))
-  (values pat new-eqs))
-
-(define (lookup-rep id eqs)
-  (define-values (rep _ new-eqs) (lookup id eqs))
-  (values rep new-eqs))
-
-(define (lookup id eqs)
-  (let loop ([id id])
-    (define res (hash-ref eqs (lvar id) 
-                          (λ () (error 'lookup "unbound var: ~a" id))))
-    (match res
-      [(lvar new-id)
-       (define-values (rep pat new-eqs) (loop new-id))
-       (values rep pat (hash-set new-eqs (lvar id) rep))]
-      [_
-       (values (lvar id) res eqs)])))
-
-
-(define unsupported-pat-err-name (make-parameter #f))
-
-(define (unsupported-pat-err pat)
-  (unless (unsupported-pat-err-name)
-    (redex-error 'unsupported-pat-err-name "not set before derivation generation"))
-  (redex-error (unsupported-pat-err-name)
-               (string-append "generation failed at unsupported pattern;\n"
-                              " (#:satisfying keyword does not support ellipses, contexts, side-conditions, or unquote)\n"
-                              "  pattern: ~a")
-               pat))
-
-(define normalizing-nt (make-parameter #f))
-
-(define check-nt
-  (let ([memo (make-hash)])
-    (λ (nt clang pat e)
-      (parameterize ([normalizing-nt nt])
-        (define npat (normalize-pat clang e pat))
-        (hash-ref memo (list nt clang npat)
-                  (λ ()
-                    (define pat-ok? 
-                      (for/or ([ntp (in-list (map (((curry normalize-pat) clang) e) (nt-pats nt clang)))])
-                        (not-failed? (unify* npat ntp empty-env clang))))
-                    (hash-set! memo (list nt clang npat) pat-ok?)
-                    pat-ok?))))))
-
-(define (normalize-pat lang e pat)
-  (define err unsupported-pat-err)
-  (let loop ([pat pat]
-             [depth 5])
-    (cond
-      [(depth . <= . 0) 'any]
-      [else
-       (match-a-pattern #:allow-else pat
-                        [`any pat]
-                        [`number pat]
-                        [`string pat]
-                        [`natural pat]
-                        [`integer pat]
-                        [`real pat]
-                        [`boolean pat]
-                        [`variable pat]
-                        [`(variable-except ,s ...) pat]
-                        [`(variable-prefix ,s) pat]
-                        [`variable-not-otherwise-mentioned pat]
-                        [`hole (err pat)]
-                        [`(nt ,id)
-                         (cond 
-                           [(and (normalizing-nt)
-                                 (eq? (normalizing-nt) id)) 'any]
-                           [(hash-has-key? (compiled-lang-collapsible-nts lang) id)
-                            (loop (hash-ref (compiled-lang-collapsible-nts lang) id) (sub1 depth))]
-                           [else pat])]
-                        [`(name ,name ,npat)
-                         (if (bound? npat)
-                             (match-let ([(p*e `(name ,n ,(bound)) e-new) (resolve pat e)])
-                               (loop (hash-ref (env-eqs e) (lvar n)) depth))
-                             `(name ,name ,(loop npat (sub1 depth))))]
-                        [`(mismatch-name ,name ,pat) (loop pat (sub1 depth))]
-                        [`(in-hole ,p1 ,p2) (err pat)]
-                        [`(hide-hole ,p) (loop p (sub1 depth))]
-                        [`(side-condition ,p ,g ,e)
-                         (err pat)]
-                        [`(cross ,s) (err pat)]
-                        [`(list ,sub-pats ...)
-                         `(list ,@(for/list ([sub-pat (in-list sub-pats)])
-                                    (match sub-pat
-                                      [`(repeat ,pat ,name ,mismatch)
-                                       (err sub-pat)]
-                                      [_
-                                       (loop sub-pat (sub1 depth))])))]
-                        [(? (compose not pair?)) 
-                         pat]
-                        [_
-                         (match pat
-                           [`(cstr ,cs ,p)
-                            (loop p (sub1 depth))]
-                           [`(variable-not-in ,p ,s)
-                            `variable])])])))
-
-(define (nt-pats nt lang)
-  (define this-rhs
-    (nt-rhs
-     (let ([the-nt (findf (λ (lang-nt)
-                            (equal? nt (nt-name lang-nt)))
-                          (compiled-lang-lang lang))])
-       (unless the-nt
-         (error 'unify "nonterminal ~a not found for provided language... nts found: ~a" 
-                nt (hash-keys (compiled-lang-nt-map lang))))
-       the-nt)))
-  (match this-rhs
-    [(list (rhs `(nt ,alias)))
-     (nt-pats alias lang)]
-    [_
-     (map rhs-pattern this-rhs)]))
-       
-(define empty-lang
-  (compiled-lang
-   #f #f #f #f #f #f #f #f #f #f '() #f (hash)
-   (lang-enumerators '() (delay '()))))
-
-(define unique-name-nums (make-parameter 0))
-
-;; TODO: compare with free-identifier=? so renaming is safe
-;; w/r/t macro expansion
-;; (use free-id-table)
-(define (fresh-pat-vars pre-pat instantiations)
-  (match pre-pat
-    [`(name ,id ,pat)
-     (define new-id (hash-ref instantiations id
-                              (λ ()
-                                (define unique-id (make-uid id))
-                                (hash-set! instantiations id unique-id)
-                                unique-id)))
-     `(name ,new-id ,(fresh-pat-vars pat instantiations))]
-    [`(list ,pats ...)
-     `(list ,@(for/list ([p pats]) (fresh-pat-vars p instantiations)))]
-    [`(variable-not-in ,pat ,s)
-     `(variable-not-in ,(fresh-pat-vars pat instantiations) ,s)]
-    [_ pre-pat]))
-
-(define (make-uid id)
-  (let ([uid-num (unique-name-nums)])
-    (unique-name-nums (add1 uid-num))
-    (string->symbol (string-append (symbol->string id) "_" (number->string uid-num)))))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/preprocess-lang.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/preprocess-lang.rkt
deleted file mode 100644
index ff4f0b2531..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/preprocess-lang.rkt
+++ /dev/null
@@ -1,406 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     racket/math)
-         racket/bool
-         racket/contract
-         racket/list
-         racket/math
-         racket/match
-         racket/set
-         racket/promise
-         "build-nt-property.rkt"
-         "lang-struct.rkt"
-         "match-a-pattern.rkt")
-
-(provide
- (contract-out
-  [sep-lang (-> (listof nt?)
-                (values (listof nt?)
-                        (listof nt?)
-                        (hash/c symbol? boolean?)))]
-  [used-vars (-> (listof nt?)
-                 (listof symbol?))]
-  [can-enumerate? (-> any/c 
-                      (hash/c symbol? any/c) 
-                      (promise/c (hash/c symbol? any/c))
-                      boolean?)]))
-
-;; sep-lang : lang -> lang lang
-;; topologically sorts non-terminals by dependency
-;; sorts rhs's so that recursive ones go last
-(define (sep-lang lang)
-  (define (filter-edges edges lang)
-    (for/fold ([filtered (hash)])
-              ([nt (in-list lang)])
-      (define name (nt-name nt))
-      (hash-set filtered name (hash-ref edges name))))
-  (define edges (find-edges lang))
-  (define cyclic-nts (find-cycles edges))
-  (define-values (cyclic non-cyclic)
-    (partition (λ (nt)
-                  (set-member? cyclic-nts (nt-name nt)))
-               lang))
-  ;; topological sort
-  (define sorted-left
-    (topo-sort non-cyclic
-               (filter-edges edges non-cyclic)))
-  ;; rhs sort
-  (define sorted-right
-    (sort-productions cyclic
-                   cyclic-nts))
-  
-  (values sorted-left
-          sorted-right
-          (build-cant-enumerate-table lang edges)))
-
-;; find-edges : lang -> (hash[symbol] -o> (setof (listof symbol)))
-(define (find-edges lang)
-  (foldl
-   (λ (nt m)
-      (hash-set
-       m (nt-name nt)
-       (fold-map/set
-        (λ (rhs)
-           (let loop ([pat (rhs-pattern rhs)]
-                      [s (set)])
-             (match-a-pattern
-               pat
-               [`any s]
-               [`number s]
-               [`string s]
-               [`natural s]
-               [`integer s]
-               [`real s]
-               [`boolean s]
-               [`variable s]
-               [`(variable-except ,var ...) s]
-               [`(variable-prefix ,var) s]
-               [`variable-not-otherwise-mentioned s]
-               [`hole s]
-               [`(nt ,id) (set-add s id)]
-               [`(name ,var ,pat)
-                (loop pat s)]
-               [`(mismatch-name ,name ,pat)
-                (loop pat s)]
-               [`(in-hole ,p1 ,p2)
-                (set-union (loop p1 s)
-                           (loop p2 s))]
-               [`(hide-hole ,p) (loop p s)]
-               [`(side-condition ,p ,_1 ,_2) (loop p s)]
-               [`(cross ,id) (set-add s id)]
-               [`(list ,sub-pats ...)
-                (fold-map/set
-                 (λ (sub-pat)
-                    (match sub-pat
-                      [`(repeat ,pat ,name ,mismatch)
-                       (loop pat s)]
-                      [else (loop sub-pat s)]))
-                 sub-pats)]
-               [(? (compose not pair?)) s])))
-        (nt-rhs nt))))
-   (hash)
-   lang))
-
-;; find-cycles : (hash[symbol] -o> (setof symbol)) -> (setof symbol)
-(define (find-cycles edges)
-  (foldl
-   (λ (v s)
-      (if (let rec ([cur v]
-                    [seen (set)])
-            (cond [(set-member? seen cur) #t]
-                  [else
-                   (ormap
-                    (λ (next)
-                       (rec next
-                            (set-add seen cur)))
-                    (set->list (hash-ref edges cur (set))))]))
-          (set-add s v)
-          s))
-   (set)
-   (hash-keys edges)))
-
-;; calls-rec? : pat (setof symbol) -> bool
-(define (calls-rec? pat recs)
-  (let rec ([pat pat])
-    (match-a-pattern
-     pat
-     [`any #f]
-     [`number #f]
-     [`string #f]
-     [`natural #f]
-     [`integer #f]
-     [`real #f]
-     [`boolean #f]
-     [`variable #f]
-     [`(variable-except ,s ...) #f]
-     [`(variable-prefix ,s) #f]
-     [`variable-not-otherwise-mentioned #f]
-     [`hole #f]
-     [`(nt ,id) (set-member? recs id)]
-     [`(name ,name ,pat)
-      (rec pat)]
-     [`(mismatch-name ,name ,pat)
-      (rec pat)]
-     [`(in-hole ,p1 ,p2)
-      (or (rec p1)
-          (rec p2))]
-     [`(hide-hole ,p) (rec p)]
-     [`(side-condition ,p ,g ,e) #f]
-     [`(cross ,s) (set-member? recs s)]
-     [`(list ,sub-pats ...)
-      (ormap (λ (sub-pat)
-                (match sub-pat
-                  [`(repeat ,pat ,name ,mismatch)
-                   (rec pat)]
-                  [else (rec sub-pat)]))
-             sub-pats)]
-     [(? (compose not pair?)) #f])))
-      
-;; topo-sort : lang (hash[symbol] -o> (setof symbol)) -> lang
-(define (topo-sort lang edges)
-  (define (find-top rem edges)
-    (let find ([rem rem])
-      (let ([v (car rem)])
-        (let check ([vs (hash-keys edges)])
-          (cond [(empty? vs) v]
-                [(set-member? (hash-ref edges (car vs))
-                              v)
-                 (find (cdr rem))]
-                [else (check (cdr vs))])))))
-  (let loop ([rem (hash-keys edges)]
-             [edges edges]
-             [out-lang '()])
-    (cond [(empty? rem) out-lang]
-          [else
-           (let ([v (find-top rem edges)])
-             (loop (remove v rem)
-                   (hash-remove edges v)
-                   (cons
-                    (find-nt lang v)
-                    out-lang)))])))
-
-;; find-nt : lang, symbol -> nt
-(define (find-nt lang name)
-  (findf (λ (nt)
-            (eq? name (nt-name nt)))
-         lang))
-
-
-;; sort-productions : lang, (hash[symbol] -o> (setof symbol)) -> lang
-(define (sort-productions cyclic nts)
-  (define table (terminal-distance-table cyclic nts))
-  (define resp
-    (for/list ([cur-nt (in-list cyclic)])
-     (match cur-nt
-       [(nt name productions)
-        (define (max-terminal-distance pat)
-          (define referenced-nts (directly-used-nts pat))
-          (define maximum
-            (for/max ([cur-name (in-set referenced-nts)])
-              (if (symbol=? cur-name name)
-                  +inf.0
-                  (hash-ref table cur-name 0))))
-          (if (and (negative? maximum)
-                   (infinite? maximum))
-              0
-              maximum))
-        (nt name
-            (sort productions
-                  <
-                  #:key (compose max-terminal-distance rhs-pattern)
-                  #:cache-keys? #t))])))
-  resp)
-
-;; terminal-distance-table : lang (hash[symbol] -o> symbol)
-;;                         -> (hash[symbol] -o> (U natural +inf)
-(define (terminal-distance-table cyclic recs)
-  (define (terminal-distance pat this-nt-name table)
-    (define referenced-nts (directly-used-nts pat))
-    (define maximum
-      (for/max ([cur-name (in-set referenced-nts)])
-        (cond [(symbol=? cur-name this-nt-name)
-               +inf.0]
-              [else
-               (hash-ref table cur-name 0)])))
-    (or (and (infinite? maximum)
-             (negative? maximum)
-             0)
-        (add1 maximum)))
-  (build-nt-property/name cyclic
-                          terminal-distance
-                          +inf.0
-                          min))
-
-;; directly-used-nts : pat -> (setof symbol)
-(define (directly-used-nts pat)
-  (match-a-pattern/single-base-case pat
-    [`(name ,n ,p)
-     (directly-used-nts p)]
-    [`(mismatch-name ,n ,p)
-     (directly-used-nts p)]
-    [`(in-hole ,p1 ,p2)
-     (set-union (directly-used-nts p1)
-                (directly-used-nts p2))]
-    [`(hide-hole ,p)
-     (directly-used-nts p)]
-    [`(side-condition ,p ,c ,v)
-     (directly-used-nts p)]
-    [`(list ,sub-pats ...)
-     (fold-map/set
-      (λ (sub-pat)
-         (match sub-pat
-           ;; Not a direct reference since an empty list can always be
-           ;; enumerated
-           [`(repeat ,p ,n ,m) (set)]
-           [else (directly-used-nts sub-pat)]))
-      sub-pats)]
-    [_ (match pat
-         [`(nt ,id) (set id)]
-         [`(cross ,id) (set id)]
-         [_ (set)])]))
-
-;; used-vars : lang -> (listof symbol)
-(define (used-vars lang)
-  (set->list
-   (fold-map/set
-    (λ (the-nt)
-       (fold-map/set
-        (λ (the-rhs)
-           (let loop ([pat (rhs-pattern the-rhs)])
-             (match-a-pattern
-              pat
-              [`any (set)]
-              [`number (set)]
-              [`string (set)]
-              [`natural (set)]
-              [`integer (set)]
-              [`real (set)]
-              [`boolean (set)]
-              [`variable (set)]
-              [`(variable-except ,s ...) (set)]
-              [`(variable-prefix ,s) (set)]
-              [`variable-not-otherwise-mentioned (set)]
-              [`hole (set)]
-              [`(nt ,id) (set)]
-              [`(name ,name ,pat) (set)]
-              [`(mismatch-name ,name ,pat) (set)]
-              [`(in-hole ,p1 ,p2)
-               (set-union (loop p1)
-                          (loop p2))]
-              [`(hide-hole ,p) (loop p)]
-              [`(side-condition ,p ,g ,e) (set)] 
-              [`(cross ,s) (set)]
-              [`(list ,sub-pats ...)
-               (fold-map/set
-                (λ (sub-pat)
-                   (match sub-pat
-                     [`(repeat ,pat ,name ,mismatch)
-                      (loop pat)]
-                     [else (loop sub-pat)]))
-                sub-pats)]
-              [(? (compose not pair?))
-               (if (symbol? pat)
-                   (set pat)
-                   (set))])))
-        (nt-rhs the-nt)))
-    lang)))
-
-;; fold-map/set : (a -> setof b) (listof a) -> (setof b)
-(define (fold-map/set f l)
-  (for/fold ([acc (set)])
-            ([x (in-list l)])
-    (set-union (f x) acc)))
-
-(define (pos-inf? n)
-  (and (infinite? n)
-       (positive? n)))
-
-(define (my-max default new)
-  (if (> new default)
-      new
-      default))
-
-;; Short circuits for +inf
-(define-syntax (for/max stx)
-  (syntax-case stx ()
-    [(_ clauses . defs+exprs)
-     (with-syntax ([original stx])
-       #'(for/fold/derived original
-                           ([current-max -inf.0])
-                           clauses
-           #:break (pos-inf? current-max)
-           (my-max current-max
-                   (let () . defs+exprs))))]))
-
-
-(define (build-cant-enumerate-table lang edges)
-  ;; cant-enumerate-table : hash[sym[nt] -o> boolean]
-  (define cant-enumerate-table (make-hash))
-  
-  ;; fill in base cases
-  (for ([nt (in-list lang)])
-    (define name (nt-name nt))
-    (unless (for/and ([rhs (in-list (nt-rhs nt))])
-              (can-enumerate? (rhs-pattern rhs) #f #f))
-      (hash-set! cant-enumerate-table name #t)))
-  
-  ;; short-circuiting graph traversal
-  (define visited (make-hash))
-  (define (cant-enumerate-nt/fill-table nt-sym)
-    (hash-ref 
-     cant-enumerate-table
-     nt-sym
-     (λ ()
-       (define ans
-         (cond
-           [(hash-ref visited nt-sym #f) #f]
-           [else 
-            (hash-set! visited nt-sym #t)
-            ;; the '() in the next line is supicious; take it out and see tests fail
-            ;; that probably should be fixed not by putting it back....
-            (for/or ([next (in-set (hash-ref edges nt-sym '()))])
-              (cant-enumerate-nt/fill-table next))]))
-       (hash-set! cant-enumerate-table nt-sym ans)
-       ans)))
-  
-  ;; fill in the entire table
-  (for ([nt (in-list lang)])
-    (cant-enumerate-nt/fill-table (nt-name nt)))
-  
-  cant-enumerate-table)
-    
-;; can-enumerate? : any/c hash[sym -o> any[boolean]] (promise hash[sym -o> any[boolean]])
-(define (can-enumerate? pat can-enumerate-ht cross-can-enumerate-ht)
-  (let loop ([pat pat])
-    (match-a-pattern
-     pat
-     [`any #t]
-     [`number #t]
-     [`string #t]
-     [`natural #t]
-     [`integer #t]
-     [`real #t]
-     [`boolean #t]
-     [`variable #t]
-     [`(variable-except ,s ...) #t]
-     [`(variable-prefix ,s) #t]
-     [`variable-not-otherwise-mentioned #t]
-     [`hole #t]
-     [`(nt ,id) 
-      (or (not can-enumerate-ht)
-          (and (hash-ref can-enumerate-ht id) #t))]
-     [`(name ,n ,pat) (loop pat)]
-     [`(mismatch-name ,n ,pat) (loop pat)]
-     [`(in-hole ,p1 ,p2) (and (loop p1) (loop p2))]
-     [`(hide-hole ,p) (loop p)]
-     [`(side-condition ,p ,g ,e) #f]
-     [`(cross ,id) 
-      (or (not cross-can-enumerate-ht) 
-          (and (hash-ref (force cross-can-enumerate-ht) id)
-               #t))]
-     [`(list ,sub-pats ...)
-      (for/and ([sub-pat (in-list sub-pats)])
-        (match sub-pat
-          [`(repeat ,pat ,_ ,_) (loop pat)]
-          [else (loop sub-pat)]))]
-     [(? (compose not pair?)) #t])))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/preprocess-pat.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/preprocess-pat.rkt
deleted file mode 100644
index d815369c0d..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/preprocess-pat.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         racket/set
-
-         "2set.rkt"
-         "env.rkt"
-         "error.rkt"
-         "match-a-pattern.rkt")
-
-(provide preprocess
-         (struct-out ann-pat))
-
-;; preprocess : pat -> (ann-pat env pat)
-(define (preprocess pat)
-  (build-env (remove-names pat)))
-
-;; This function returns an env containing all top-level name references, i.e., the ones that need to be enumerated doing anything
-(define (build-env pat)
-  (define counter 0)
-  (define (get-and-inc!)
-    (begin0 counter
-      (set! counter (add1 counter))))
-  (define (walk pat)
-    (match-a-pattern/single-base-case pat
-      [`(name ,n ,subpat)
-       (match-define (ann-pat subenv new-subpat) (walk subpat))
-       (ann-pat (add-name subenv n subpat)
-                `(name ,n ,new-subpat))]
-      [`(mismatch-name ,n ,subpat)
-       (match-define (ann-pat subenv new-subpat) (walk subpat))
-       (define tag (get-and-inc!))
-       (ann-pat (add-mismatch subenv n subpat tag)
-                `(mismatch-name ,n ,tag))]
-      [`(in-hole ,p1 ,p2)
-       (match-define (ann-pat subenv1 newsub1)
-                     (walk p1))
-       (match-define (ann-pat subenv2 newsub2)
-                     (walk p2))
-       (ann-pat (env-union subenv1 subenv2)
-                `(in-hole ,newsub1 ,newsub2))]
-      [`(hide-hole ,p)
-       (match-define (ann-pat subenv newsub)
-                     (walk p))
-       (ann-pat subenv `(hide-hole ,newsub))]
-      [`(side-condition ,p ,c ,s)
-       (unsupported "side-condition")]
-      [`(list ,sub-pats ...)
-       (define ann-sub-pats
-         (for/list ([sub-pat (in-list sub-pats)])
-           (match sub-pat
-             [`(repeat ,p #f #f)
-              (ann-pat empty-env sub-pat)]
-             [`(repeat ,p ,n #f)
-              (match-define (ann-pat subenv subp)
-                            (walk p))
-              (define tag (get-and-inc!))
-              (ann-pat (pure-nrep n subenv tag subp)
-                       `(repeat ,tag ,n #f))]
-             [`(repeat ,p ,n ,m)
-              (unimplemented "mismatch repeat")]
-             [_ (walk sub-pat)])))
-       (define list-env
-         (for/fold ([accenv empty-env])
-                   ([sub-apat (in-list ann-sub-pats)])
-           (match sub-apat
-             [(ann-pat subenv _)
-              (env-union subenv accenv)])))
-       (ann-pat list-env (cons 'list (map ann-pat-pat ann-sub-pats)))]
-      [_ (pure-ann-pat pat)]))
-  (define res
-    (walk pat))
-  res)
-
-(define (remove-names pat)
-  (define names-2set (find-names pat))
-  (define names (2set-ones names-2set))
-  (define 2names (2set-manys names-2set))
-  (define badnames (set-subtract names 2names))
-  (define (strip-named name subpat con)
-    (define sub-stripped (strip subpat))
-    (if (set-member? badnames name)
-        sub-stripped
-        (con name sub-stripped)))
-  (define (keep-if-good name)
-    (and (not (set-member? badnames name))
-         name))
-  (define (strip pat)
-    (match-a-pattern/single-base-case pat
-      [`(name ,n ,subpat)
-       (strip-named n subpat (λ (n s) `(name ,n ,s)))]
-      [`(mismatch-name ,n ,subpat)
-       (strip-named n subpat (λ (n s) `(mismatch-name ,n ,s)))]
-      [`(in-hole ,p1 ,p2)
-       `(in-hole ,(strip p1)
-                 ,(strip p2))]
-      [`(hide-hole ,p)
-       `(hide-hole ,(strip p))]
-      [`(side-condition ,p ,c ,s)
-       `(side-condition ,(strip p) ,c ,s)]
-      [`(list ,sub-pats ...)
-       (cons 'list
-             (map (match-lambda
-                   [`(repeat ,p ,n ,m)
-                    (define sub (strip p))
-                    (define s-n (keep-if-good n))
-                    (define s-m (keep-if-good m))
-                    `(repeat ,sub ,s-n ,s-m)]
-                   [sub-pat (strip sub-pat)])
-                  sub-pats))]
-      [_ pat]))
-  (strip pat))
-
-(define (find-names pat)
-  (match-a-pattern/single-base-case pat
-    [`(name ,n ,subpat)
-     (2set-add (find-names subpat)
-               n)]
-    [`(mismatch-name ,n ,subpat)
-     (2set-add (find-names subpat)
-               n)]
-    [`(in-hole ,p1 ,p2)
-     (2set-union (find-names p1)
-                 (find-names p2))]
-    [`(hide-hole ,p)
-     (find-names p)]
-    [`(side-condition ,p ,c ,s)
-     (find-names p)]
-    [`(list ,sub-pats ...)
-     (foldr 2set-union
-            (2set)
-            (map (match-lambda
-                  [`(repeat ,p ,n ,m)
-                   (2set-add (find-names p) n m)]
-                  [sub-pat (find-names sub-pat)])
-                 sub-pats))]
-    [_ (2set)]))
-
-;; Patterns annotated with variable/name/repeat information
-(struct ann-pat (ann pat)
-        #:transparent)
-
-(define (pure-ann-pat pat)
-  (ann-pat empty-env pat))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/red-sem-macro-helpers.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/red-sem-macro-helpers.rkt
deleted file mode 100644
index 5e19aac4a9..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/red-sem-macro-helpers.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-
-(provide extract-names)
-
-(require racket/match)
-
-(define (extract-names stx)
-  (let ([dup-names
-         (let loop ([sexp (syntax->datum stx)]
-                    [names null])
-           (match sexp
-             [`(name ,(and sym (? symbol?)) ,pat)
-              (loop pat (cons sym names))]
-             [`(in-hole* ,(and sym (? symbol?)) ,pat1 ,pat2)
-              (loop pat1
-                    (loop pat2
-                          (cons sym names)))]
-             [`(in-hole ,pat1 ,pat2)
-              (loop pat1
-                    (loop pat2
-                          (cons 'hole names)))]
-             [(? list?)
-              (let i-loop ([sexp sexp]
-                           [names names])
-                (cond
-                  [(null? sexp) names]
-                  [else (i-loop (cdr sexp) (loop (car sexp) names))]))]
-             [else names]))]
-        [ht (make-hasheq)])
-    (for-each (lambda (name) (hash-set! ht name #f)) dup-names)
-    (hash-map ht (lambda (x y) x))))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/reduction-semantics.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/reduction-semantics.rkt
deleted file mode 100644
index e5334d2232..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/reduction-semantics.rkt
+++ /dev/null
@@ -1,2625 +0,0 @@
-#lang racket/base
-
-(require "matcher.rkt"
-         "struct.rkt"
-         "term.rkt"
-         "fresh.rkt"
-         "loc-wrapper.rkt"
-         "error.rkt"
-         "judgment-form.rkt"
-         "term-fn.rkt"
-         "search.rkt"
-         "lang-struct.rkt"
-         (for-syntax "cycle-check.rkt"
-                     setup/path-to-relative)
-         racket/trace
-         racket/contract
-         racket/list
-         racket/set
-         data/union-find
-         (rename-in racket/match (match match:)))
-
-(require (for-syntax syntax/name
-                     "loc-wrapper-ct.rkt"
-                     "rewrite-side-conditions.rkt"
-                     "term-fn.rkt"
-                     "underscore-allowed.rkt"
-                     syntax/boundmap
-                     syntax/id-table
-                     racket/base
-                     racket/list
-                     syntax/parse
-                     syntax/parse/experimental/contract
-                     syntax/name
-                     racket/syntax))
-
-(define (language-nts lang)
-  (hash-map (compiled-lang-ht lang) (λ (x y) x)))
-
-(define-for-syntax (term-matcher orig-stx make-matcher)
-  (syntax-case orig-stx ()
-    [(form-name lang [pattern rhs] ...)
-     (begin
-       (unless (identifier? #'lang)
-         (raise-syntax-error (syntax-e #'form-name) "expected an identifier in the language position" orig-stx #'lang))
-       (with-syntax ([((syncheck-expr side-conditions-rewritten (names ...) (names/ellipses ...)) ...)
-                      (map (λ (x) (rewrite-side-conditions/check-errs #'lang (syntax-e #'form-name) #t x))
-                           (syntax->list (syntax (pattern ...))))]
-                     [(cp-x ...) (generate-temporaries #'(pattern ...))]
-                     [make-matcher make-matcher])
-         (with-syntax ([(mtch-procs ...)
-                        (for/list ([names/ellipses (in-list (syntax->list #'((names/ellipses ...) ...)))]
-                                   [names (in-list (syntax->list #'((names ...) ...)))]
-                                   [rhs (in-list (syntax->list #'(rhs ...)))])
-                          (with-syntax ([(names ...) names])
-                            #`(λ (match)
-                                #,(bind-pattern-names 
-                                   #'form-name 
-                                   names/ellipses
-                                   #'((lookup-binding (mtch-bindings match) 'names) ...)
-                                   rhs))))])
-           #`(begin
-               syncheck-expr ...
-               (make-matcher
-                'form-name lang 
-                (list 'pattern ...)
-                (list (compile-pattern lang `side-conditions-rewritten #t) ...)
-                (list mtch-procs ...))))))]))
-
-(define-syntax (term-match/single stx)
-  (term-matcher stx #'term-match/single/proc))
-(define-syntax (term-match stx)
-  (term-matcher stx #'term-match/proc))
-
-(define ((term-match/proc form-name lang ps cps rhss) term)
-  (append-map
-   (λ (cp rhs)
-     (let ([matches (match-pattern cp term)])
-       (if matches
-           (map rhs matches)
-           '())))
-   cps rhss))
-
-(define ((term-match/single/proc form-name lang ps0 cps rhss) term)
-  (let loop ([ps ps0] [cps cps] [rhss rhss])
-    (if (null? ps)
-        (redex-error form-name 
-                     (if (null? (cdr ps0))
-                         (format "term ~s does not match pattern ~s" term (car ps0))
-                         (format "no patterns matched ~s" term)))
-        (let ([match (match-pattern (car cps) term)])
-          (if match
-              (begin
-                (unless (null? (cdr match))
-                  (redex-error
-                   form-name
-                   "pattern ~s matched term ~s multiple ways"
-                   (car ps)
-                   term))
-                ((car rhss) (car match)))
-              (loop (cdr ps) (cdr cps) (cdr rhss)))))))
-
-(define-syntaxes (redex-let redex-let*)
-  (let ()
-    (define-syntax-class binding
-      #:description "binding clause"
-      (pattern (lhs:expr rhs:expr)))
-    (define-syntax-class (bindings extract)
-      #:description (if extract
-                        "sequence of disjoint binding clauses"
-                        "sequence of binding clauses")
-      (pattern (b:binding ...)
-               #:fail-when (and extract
-                                (check-duplicate-identifier
-                                 (apply append (map extract (syntax->list #'(b.lhs ...))))))
-               "duplicate pattern variable"
-               #:with (lhs ...) #'(b.lhs ...)
-               #:with (rhs ...) #'(b.rhs ...)))
-    
-    (define (redex-let stx)
-      (define-values (form-name nts)
-        (syntax-case stx ()
-          [(name lang . _) 
-           (values (syntax-e #'name)
-                   (language-id-nts #'lang (syntax-e #'name)))]))
-      (define (pattern-variables pattern)
-        (let-values ([(names _) (extract-names nts form-name #t pattern)])
-          names))
-      (syntax-parse stx
-        [(name lang (~var bs (bindings pattern-variables)) body ...+)
-         (with-syntax ([(t ...) (generate-temporaries #'bs)])
-           #`(let ([t bs.rhs] ...)
-               #,(nested-lets #'lang #'([bs.lhs t] ...) #'(body ...) #'name)))]))
-    
-    (define (redex-let* stx)
-      (syntax-parse stx
-        [(name lang (~var bs (bindings #f)) body ...+)
-         (nested-lets #'lang #'bs #'(body ...) #'name)]))
-    
-    (define (nested-lets lang bindings bodies name)
-      (syntax-case bindings ()
-        [()
-         #`(let () #,@bodies)]
-        [([lhs rhs] . bindings)
-         (with-syntax ([rest-lets (nested-lets lang #'bindings bodies name)])
-           #`(#,(term-matcher #`(#,name #,lang [lhs rest-lets]) 
-                              #'term-match/single/proc) 
-              rhs))]))
-    
-    (values redex-let redex-let*)))
-
-(define-syntax (compatible-closure stx)
-  (syntax-case stx ()
-    [(_ red lang nt)
-     (identifier? (syntax nt))
-     (with-syntax ([(syncheck-expr side-conditions-rewritten (names ...) (names/ellipses ...))
-                    (rewrite-side-conditions/check-errs #'lang
-                                                        'compatible-closure 
-                                                        #t
-                                                        (syntax (cross nt)))])
-       (syntax (begin syncheck-expr
-                      (do-context-closure red lang `side-conditions-rewritten 'compatible-closure))))]
-    [(_ red lang nt)
-     (raise-syntax-error 'compatible-closure "expected a non-terminal as last argument" stx (syntax nt))]))
-
-(define-syntax (context-closure stx)
-  (syntax-case stx ()
-    [(_ red lang pattern)
-     (with-syntax ([(syncheck-expr side-conditions-rewritten (names ...) (names/ellipses ...))
-                    (rewrite-side-conditions/check-errs #'lang
-                                                        'context-closure
-                                                        #t
-                                                        (syntax pattern))])
-       (syntax
-        (begin
-          syncheck-expr
-          (do-context-closure
-           red
-           lang
-           `side-conditions-rewritten
-           'context-closure))))]))
-
-(define (do-context-closure red lang pat name)
-  (unless (reduction-relation? red)
-    (error name "expected <reduction-relation> as first argument, got ~e" red))
-  (unless (compiled-lang? lang)
-    (error name "expected <lang> as second argument, got ~e" lang))
-  
-  (let ([lang-nts (language-nts lang)])
-    (for ([red-lang-nt (in-list (language-nts (reduction-relation-lang red)))])
-      (unless (member red-lang-nt lang-nts)
-        (error 
-         name 
-         "language argument does not contain a definition of the non-terminal ~a, needed by the reduction-relation"
-         red-lang-nt))))
-  
-  (build-reduction-relation
-   #f
-   lang
-   (map
-    (λ (make-proc)
-      (make-rewrite-proc
-       (λ (lang)
-         (define f (make-proc lang))
-         (define cp (compile-pattern
-                     lang
-                     `(in-hole (name ctxt ,pat)
-                               (name exp any))
-                     #f))
-         (λ (main-exp exp extend acc)
-           (let loop ([ms (or (match-pattern cp exp) '())]
-                      [acc acc])
-             (cond
-               [(null? ms) acc]
-               [else
-                (let* ([mtch (car ms)]
-                       [bindings (mtch-bindings mtch)])
-                  (loop (cdr ms)
-                        (f main-exp
-                           (lookup-binding bindings 'exp)
-                           (λ (x) (extend (plug (lookup-binding bindings 'ctxt) x)))
-                           acc)))]))))
-       (rewrite-proc-name make-proc)
-       (rewrite-proc-lhs make-proc)
-       (rewrite-proc-lhs-src make-proc)
-       (rewrite-proc-id make-proc)))
-    (reduction-relation-make-procs red))
-   (reduction-relation-rule-names red)
-   (reduction-relation-lws red)
-   (let ([orig-pat (reduction-relation-domain-pat red)])
-     (cond
-       [(equal? orig-pat `any)
-        ;; special case for backwards compatibility:
-        ;; if there was no #:domain argument, then we
-        ;; probably should let the compatible closure also
-        ;; not have a domain
-        `any]
-       [else
-        `(in-hole ,pat ,orig-pat)]))))
-
-(define (apply-reduction-relation/tagged p v)
-  (let loop ([procs (reduction-relation-procs p)]
-             [acc '()])
-    (cond
-      [(null? procs) acc]
-      [else 
-       (loop (cdr procs)
-             ((car procs) v acc))])))
-
-(define (apply-reduction-relation/tag-with-names p v) (map cdr (apply-reduction-relation/tagged p v)))
-(define (apply-reduction-relation p v) (map caddr (apply-reduction-relation/tagged p v)))
-
-(define-syntax (-reduction-relation stx)
-  (syntax-case stx ()
-    [(_ lang args ...)
-     (with-syntax ([orig-stx stx])
-       (syntax/loc stx (do-reduction-relation orig-stx reduction-relation empty-reduction-relation #f lang args ...)))]))
-
-(define-syntax (extend-reduction-relation stx)
-  (syntax-case stx ()
-    [(_ orig-reduction-relation lang args ...)
-     (with-syntax ([orig-stx stx])
-       (syntax/loc stx (do-reduction-relation orig-stx extend-reduction-relation orig-reduction-relation #t lang args ...)))]))
-
-(define-for-syntax (generate-binding-constraints names names/ellipses bindings syn-err-name)
-  (define (id/depth stx)
-    (syntax-case stx ()
-      [(s (... ...))
-       (let ([r (id/depth #'s)])
-         (make-id/depth (id/depth-id r) (add1 (id/depth-depth r))))]
-      [s (make-id/depth #'s 0)]))
-  (define temporaries (generate-temporaries names))
-  (values
-   (for/fold ([cs '()])
-     ([n names]
-      [w/e names/ellipses]
-      [x temporaries])
-     (cond [(hash-ref bindings (syntax-e n) #f)
-            => (λ (b) 
-                 (let ([b-id/depth (id/depth b)]
-                       [n-id/depth (id/depth w/e)])
-                   (if (= (id/depth-depth b-id/depth) (id/depth-depth n-id/depth))
-                       (cons #`(equal? #,x (term #,b)) cs)
-                       (raise-ellipsis-depth-error
-                        syn-err-name
-                        (id/depth-id n-id/depth) (id/depth-depth n-id/depth)
-                        (id/depth-id b-id/depth) (id/depth-depth b-id/depth)))))]
-           [else cs]))
-   temporaries
-   (for/fold ([extended bindings])
-     ([name names] 
-      [w/ellipses names/ellipses])
-     (hash-set extended (syntax-e name) w/ellipses))))
-
-(define-for-syntax (check-judgment-arity stx judgment)
-  (syntax-case judgment ()
-    [(form-name pat ...)
-     (judgment-form-id? #'form-name)
-     (let ([expected (length (judgment-form-mode (lookup-judgment-form-id #'form-name)))]
-           [actual (length (syntax->list #'(pat ...)))])
-       (unless (= actual expected)
-         (raise-syntax-error 
-          #f 
-          (format "mode specifies a ~a-ary relation but use supplied ~a term~a" 
-                  expected actual (if (= actual 1) "" "s"))
-          judgment)))]
-    [(form-name pat ...)
-     (raise-syntax-error #f "expected a judgment form name" stx #'form-name)]))
-
-(define-syntax (do-reduction-relation stx)
-  (define (do-reduction-relation/proc stx)
-    (syntax-case stx ()
-      [(_ orig-stx id orig-reduction-relation allow-zero-rules? lang . w/domain-args)
-       (identifier? #'lang)
-       (prune-syntax
-        (let-values ([(domain-pattern main-arrow args)
-                      (parse-keywords #'orig-stx #'id #'w/domain-args)])
-          (with-syntax ([(rules ...) (before-with args)]
-                        [(shortcuts ...) (after-with args)])
-            (with-syntax ([(lws ...) (map rule->lws (syntax->list #'(rules ...)))])
-              (reduction-relation/helper 
-               #'orig-stx
-               (syntax-e #'id)
-               #'orig-reduction-relation
-               (syntax lang)
-               (syntax->list (syntax (rules ...)))
-               (syntax->list (syntax (shortcuts ...)))
-               #'(list lws ...)
-               (syntax-e #'allow-zero-rules?)
-               domain-pattern
-               main-arrow)))))]
-      [(_ orig-stx id orig-reduction-relation allow-zero-rules? lang args ...)
-       (raise-syntax-error (syntax-e #'id) 
-                           "expected an identifier for the language name"
-                           #'lang)]))
-  
-  (define default-arrow #'-->)
-  
-  (define (parse-keywords stx id args)
-    (let ([domain-contract #'any]
-          [main-arrow default-arrow])
-      
-      ;; ensure no duplicate keywords
-      (let ([ht (make-hash)]
-            [known-keywords '(#:arrow #:domain)])  ;; #:arrow not yet implemented
-        (for-each (λ (kwd/stx)  ;; (not necc a keyword)
-                    (let ([kwd (syntax-e kwd/stx)])
-                      (when (keyword? kwd)
-                        (unless (member kwd known-keywords)
-                          (raise-syntax-error (syntax-e id)
-                                              "unknown keyword"
-                                              stx
-                                              kwd/stx))
-                        (when (hash-ref ht kwd #f)
-                          (raise-syntax-error (syntax-e id)
-                                              "duplicate keywords"
-                                              stx
-                                              kwd/stx
-                                              (list (hash-ref ht kwd))))
-                        (hash-set! ht kwd kwd/stx))))
-                  (syntax->list args)))
-      
-      (let loop ([args args])
-        (syntax-case args ()
-          [(#:domain pat args ...)
-           (begin (set! domain-contract #'pat)
-                  (loop #'(args ...)))]
-          [(#:domain)
-           (raise-syntax-error (syntax-e id) 
-                               "expected a domain after #:domain"
-                               stx)]
-          [(#:arrow arrow . args)
-           (identifier? #'arrow)
-           (begin (set! main-arrow #'arrow)
-                  (loop #'args))]
-          [(#:arrow arrow . args)
-           (raise-syntax-error (syntax-e id) 
-                               "expected an arrow after #:arrow, not a compound expression"
-                               stx
-                               #'arrow)]
-          [(#:arrow)
-           (raise-syntax-error (syntax-e id) 
-                               "expected an arrow after #:arrow"
-                               stx)]
-          [_
-           (begin
-             (values domain-contract main-arrow args))]))))
-
-  
-  (define (before-with stx)
-    (let loop ([lst (syntax->list stx)])
-      (cond
-        [(null? lst) null]
-        [else
-         (let ([fst (car lst)])
-           (syntax-case (car lst) (with)
-             [with null]
-             [else (cons (car lst) (loop (cdr lst)))]))])))
-  
-  (define (after-with stx)
-    (let loop ([lst (syntax->list stx)])
-      (cond
-        [(null? lst) null]
-        [else
-         (let ([fst (car lst)])
-           (syntax-case (car lst) (with)
-             [with (cdr lst)]
-             [else (loop (cdr lst))]))])))
-  
-  (define (name-pattern-lws/rr pat)
-    (for/list ([lw-pair (name-pattern-lws pat)])
-      (if (pair? lw-pair)
-          #`(cons #,(car lw-pair) #,(cdr lw-pair))
-          (error 'name-pattern-lws/rr "ack"))))
-  
-  (define (rule->lws rule)
-    (syntax-case rule ()
-      [(arrow lhs rhs stuff ...)
-       (let-values ([(label computed-label scs/withs fvars)
-                     (let loop ([stuffs (syntax->list #'(stuff ...))]
-                                [label #f]
-                                [computed-label #f]
-                                [scs/withs null]
-                                [fvars null])
-                       (cond
-                         [(null? stuffs) (values label computed-label (reverse scs/withs) (reverse fvars))]
-                         [else
-                          (syntax-case (car stuffs) (where where/hidden
-                                                           side-condition side-condition/hidden
-                                                           fresh variable-not-in
-                                                           computed-name
-                                                           judgment-holds)
-                            [(fresh xs ...) 
-                             (loop (cdr stuffs)
-                                   label
-                                   computed-label
-                                   scs/withs
-                                   (append 
-                                    (reverse (map (λ (x)
-                                                    (to-lw/proc
-                                                     (syntax-case x ()
-                                                       [x
-                                                        (identifier? #'x)
-                                                        #'x]
-                                                       [(x whatever)
-                                                        (identifier? #'x)
-                                                        #'x]
-                                                       [((y dots) (x dots2))
-                                                        (datum->syntax 
-                                                         #f 
-                                                         `(,(syntax->datum #'y) ...) 
-                                                         #'y)]
-                                                       [((y dots) (x dots2) whatever)
-                                                        (datum->syntax 
-                                                         #f 
-                                                         `(,(syntax->datum #'y) ...) 
-                                                         #'y)])))
-                                                  (syntax->list #'(xs ...))))
-                                    fvars))]
-                            [(where x e)
-                             (loop (cdr stuffs)
-                                   label
-                                   computed-label
-                                   (cons #`(cons #,(to-lw/proc #'x) #,(to-lw/proc #'e))
-                                         (append (name-pattern-lws/rr #'x) scs/withs))
-                                   fvars)]
-                            [(where/hidden x e)
-                             (loop (cdr stuffs) label computed-label scs/withs fvars)]
-                            [(side-condition sc)
-                             (loop (cdr stuffs)
-                                   label
-                                   computed-label
-                                   (cons (to-lw/uq/proc #'sc) scs/withs)
-                                   fvars)]
-                            [(side-condition/hidden sc)
-                             (loop (cdr stuffs) label computed-label scs/withs fvars)]
-                            [x
-                             (identifier? #'x)
-                             (loop (cdr stuffs)
-                                   #''x
-                                   computed-label
-                                   scs/withs
-                                   fvars)]
-                            [x
-                             (string? (syntax-e #'x))
-                             (loop (cdr stuffs)
-                                   #'(string->symbol x)
-                                   computed-label
-                                   scs/withs
-                                   fvars)]
-                            [(computed-name e)
-                             (loop (cdr stuffs)
-                                   label
-                                   #'e
-                                   scs/withs
-                                   fvars)]
-                            [(judgment-holds (form-name . pieces))
-                             (judgment-form-id? #'form-name)
-                             (loop (cdr stuffs)
-                                   label
-                                   computed-label
-                                   (let*-values ([(mode) (judgment-form-mode (lookup-judgment-form-id #'form-name))]
-                                                 [(_ outs) (split-by-mode (syntax->list #'pieces) mode)])
-                                     (cons (to-lw/proc #'(form-name . pieces))
-                                           (for/fold ([binds scs/withs]) ([out outs])
-                                             (append (name-pattern-lws/rr out) binds))))
-                                   fvars)]
-                            [_
-                             ;; just skip over junk here, and expect a syntax error to be raised elsewhere
-                             (loop (cdr stuffs) label computed-label scs/withs fvars)])]))])
-         (with-syntax ([(scs/withs ...) scs/withs]
-                       [(fvars ...) fvars]
-                       [((bind-id . bind-pat) ...) 
-                        (extract-pattern-binds #'lhs)]
-                       [((tl-id . tl-pat) ...)
-                       (extract-term-let-binds #'rhs)])
-           #`(make-rule-pict-info 'arrow
-                                  #,(to-lw/proc #'lhs)
-                                  #,(to-lw/proc #'rhs)
-                                  #,label
-                                  #,(and computed-label 
-                                         (to-lw/proc #`,#,computed-label))
-                                  (list scs/withs ...
-                                        #,@(map (λ (bind-id bind-pat)
-                                                  #`(cons #,(to-lw/proc bind-id)
-                                                          #,(to-lw/proc bind-pat)))
-                                                (syntax->list #'(bind-id ...))
-                                                (syntax->list #'(bind-pat ...)))
-                                        #,@(map (λ (tl-id tl-pat)
-                                                  #`(cons #,(to-lw/proc tl-id)
-                                                          #,(to-lw/uq/proc tl-pat)))
-                                                (syntax->list #'(tl-id ...))
-                                                (syntax->list #'(tl-pat ...))))
-                                  (list fvars ...))))]
-      ;; just skip over junk here, since syntax error checks elsewhere will catch this
-      [_ #f]))
-  
-  (define (reduction-relation/helper stx orig-name orig-red-expr lang-id rules shortcuts 
-                                     lws 
-                                     allow-zero-rules?
-                                     domain-pattern
-                                     main-arrow)
-    (let ([ht (make-module-identifier-mapping)]
-          [all-top-levels '()]
-          [withs (make-module-identifier-mapping)])
-      (for-each (λ (shortcut)
-                  (syntax-case shortcut ()
-                    [((rhs-arrow rhs-from rhs-to)
-                      (lhs-arrow a b))
-                     (not (identifier? #'a))
-                     (raise-syntax-error
-                      orig-name
-                      "malformed shortcut, expected identifier"
-                      shortcut #'a)]
-                    [((rhs-arrow rhs-from rhs-to)
-                      (lhs-arrow a b))
-                     (not (identifier? #'b))
-                     (raise-syntax-error
-                      orig-name
-                      "malformed shortcut, expected identifier"
-                      shortcut #'b)]
-                    [((rhs-arrow rhs-from rhs-to)
-                      (lhs-arrow lhs-from lhs-to))
-                     (begin
-                       (table-cons! withs #'lhs-arrow #'rhs-arrow)
-                       (table-cons! ht (syntax rhs-arrow) shortcut))]
-                    [((a b c) d)
-                     (raise-syntax-error 
-                      orig-name
-                      "malformed shortcut, expected right-hand side to have three sub-expressions"
-                      stx (syntax d))]
-                    [(a b)
-                     (raise-syntax-error 
-                      orig-name
-                      "malformed shortcut, expected left-hand side to have three sub-expressions"
-                      stx (syntax a))]
-                    [(a b c d ...)
-                     (raise-syntax-error 
-                      orig-name
-                      "malformed shortcut, expected only two subparts for a shortcut definition, found an extra one"
-                      stx
-                      (syntax c))]
-                    [_ (raise-syntax-error orig-name
-                                           "malformed shortcut"
-                                           stx shortcut)]))
-                shortcuts)
-      (for ([rule (in-list rules)]) 
-        (syntax-case rule ()
-          [(arrow . rst)
-           (begin
-             (unless (identifier? #'arrow)
-               (raise-syntax-error orig-name "expected a reduction relation arrow" stx #'arrow))
-             (set! all-top-levels (cons #'arrow all-top-levels))
-             (table-cons! ht (syntax arrow) rule))]))
-        
-        ;; signal a syntax error if there are shortcuts defined, but no rules that use them
-        (unless (null? shortcuts)
-          (unless (module-identifier-mapping-get ht main-arrow (λ () #f))
-            (raise-syntax-error orig-name 
-                                (format "no ~a rules" (syntax-e main-arrow))
-                                stx)))
-        
-        (for-each (λ (tl)
-                    (let loop ([id tl])
-                      (unless (free-identifier=? main-arrow id)
-                        (let ([nexts
-                               (module-identifier-mapping-get
-                                withs id 
-                                (λ () 
-                                  (raise-syntax-error 
-                                   orig-name
-                                   (format "the ~s relation is not defined"
-                                           (syntax->datum id))
-                                   stx
-                                   id)))])
-                          (for-each loop nexts)))))
-                  all-top-levels)
-        
-        (let ([name-table (make-hasheq)])
-          (hash-set! name-table #f 0)
-          ;; name table maps symbols for the rule names to their syntax objects and to a counter indicating what
-          ;; order the names were encountered in. The current value of the counter is stored in the table at key '#f'.
-          (with-syntax ([lang-id lang-id]
-                        [(top-level ...) (get-choices stx orig-name ht lang-id main-arrow
-                                                      name-table lang-id allow-zero-rules?)]
-                        [(rule-names ...) 
-                         (begin
-                           (hash-remove! name-table #f)
-                           (map car (sort (hash-map name-table (λ (k v) (list k (list-ref v 1)))) < #:key cadr)))]
-                        [lws lws]
-                        
-                        [(domain-syncheck-expr domain-pattern-side-conditions-rewritten (names ...) (names/ellipses ...))
-                         (rewrite-side-conditions/check-errs
-                          lang-id
-                          orig-name
-                          #f
-                          domain-pattern)])
-            #`(begin
-                domain-syncheck-expr
-                (build-reduction-relation
-                 #,orig-red-expr
-                 lang-id
-                 (list top-level ...)
-                 '(rule-names ...)
-                 lws
-                 `domain-pattern-side-conditions-rewritten))))))
-    
-    #|    
-    ;; relation-tree = 
-    ;;   leaf
-    ;;  (make-node id[frm] pat[frm] id[to] pat[to] (listof relation-tree))
-    (define-struct node (frm-id frm-pat to-id to-pat))
-    (define-struct leaf (frm-pat to-pat))
-  |#  
-    ;; get-choices : stx[original-syntax-object] bm lang identifier ht[sym->syntax] identifier[language-name] -> (listof relation-tree)
-    (define (get-choices stx orig-name bm lang id name-table lang-id allow-zero-rules?)
-      (reverse
-       (apply 
-        append
-        (map (λ (x) (get-tree stx orig-name bm lang x name-table lang-id allow-zero-rules?))
-             (module-identifier-mapping-get 
-              bm id
-              (λ ()
-                (if allow-zero-rules?
-                    '()
-                    (raise-syntax-error orig-name 
-                                        (format "no rules use ~a" (syntax->datum id))
-                                        stx 
-                                        (if (equal? id default-arrow) #f id)))))))))
-    
-    (define (get-tree stx orig-name bm lang case-stx name-table lang-id allow-zero-rules?)
-      (syntax-case case-stx ()
-        [(arrow from to extras ...)
-         (list (do-leaf stx 
-                        orig-name
-                        lang 
-                        name-table
-                        (syntax from) 
-                        (syntax to) 
-                        (syntax->list (syntax (extras ...)))
-                        lang-id))]
-        [((rhs-arrow rhs-from rhs-to) (lhs-arrow lhs-frm-id lhs-to-id))
-         (let ([lang-nts (language-id-nts lang-id 'reduction-relation)]
-               [rewrite-side-conds
-                (λ (pat) (rewrite-side-conditions/check-errs lang-id orig-name #t pat))])
-           (with-syntax ([(lhs-syncheck-expr side-conditions-rewritten (names ...) (names/ellipses ...))
-                          (rewrite-side-conds
-                           (rewrite-node-pat (syntax-e (syntax lhs-frm-id))
-                                             (syntax rhs-from)))]
-                         [(rhs-syncheck-expr fresh-rhs-from (fresh-names ...) (fresh-names/ellipses ...)) 
-                          (rewrite-side-conds 
-                           (freshen-names #'rhs-from #'lhs-frm-id lang-nts orig-name))]
-                         [lang lang])
-             (map
-              (λ (child-proc)
-                #`(begin
-                    lhs-syncheck-expr
-                    rhs-syncheck-expr
-                    (do-node-match
-                     'lhs-frm-id
-                     'lhs-to-id
-                     `side-conditions-rewritten
-                     (λ (bindings rhs-binder) 
-                       (term-let ([lhs-to-id rhs-binder])
-                                 #,(bind-pattern-names 'reduction-relation
-                                                       #'(names/ellipses ...)
-                                                       #'((lookup-binding bindings 'names) ...)
-                                                       #'(term rhs-to #:lang lang))))
-                     #,child-proc
-                     `fresh-rhs-from)))
-              (get-choices stx orig-name bm #'lang
-                           (syntax lhs-arrow) 
-                           name-table lang-id 
-                           allow-zero-rules?))))]))
-    (define (rewrite-node-pat id term)
-      (let loop ([t term])
-        (syntax-case t (side-condition)
-          [(side-condition p c)
-           #`(side-condition #,(loop #'p) c)]
-          [(p ...)
-           (map loop (syntax->list #'(p ...)))]
-          [else 
-           (if (and (identifier? t) (eq? id (syntax-e t)))
-               `(name ,id any)
-               t)])))
-    
-    (define (freshen-names pat hole-id nts what)
-      (define (fresh x)
-        (gensym
-         (if (or (memq x nts) (memq x underscore-allowed))
-             (string-append (symbol->string x) "_")
-             x)))
-      (let-values ([(bound _) (extract-names nts what #t pat 'binds-anywhere)])
-        (let ([renames (make-bound-identifier-mapping)])
-          (for-each 
-           (λ (x)
-             (unless (bound-identifier=? x hole-id)
-               (bound-identifier-mapping-put! renames x (fresh (syntax-e x)))))
-           bound)
-          (let recur ([p pat])
-            (syntax-case p (side-condition)
-              [(side-condition p c)
-               #`(side-condition 
-                  #,(recur #'p)
-                  (term-let (#,@(bound-identifier-mapping-map renames (λ (x y) #`(#,x (term #,y)))))
-                            c))]
-              [(p ...)
-               #`(#,@(map recur (syntax->list #'(p ...))))]
-              [else
-               (if (identifier? p)
-                   (bound-identifier-mapping-get renames p (λ () p))
-                   p)])))))
-    
-    (define (do-leaf stx orig-name lang name-table from to extras lang-id)
-      (define lang-nts (language-id-nts lang-id 'reduction-relation))
-      (define (rw-sc pat) (rewrite-side-conditions/check-errs lang-id orig-name #t pat))
-      (define-values (name computed-name sides/withs/freshs) (process-extras stx orig-name name-table extras))
-      (define rt-lang-id (car (generate-temporaries (list lang))))
-      (with-syntax ([(from-syncheck-expr side-conditions-rewritten (names ...) (names/ellipses ...)) (rw-sc from)])
-        (define body-code
-          (bind-withs orig-name 
-                      #'main-exp
-                      rt-lang-id
-                      lang-nts
-                      lang-id
-                      sides/withs/freshs
-                      'flatten
-                      #`(begin
-                          from-syncheck-expr
-                          (list (cons #,(or computed-name #'none)
-                                      (term #,to #:lang #,lang))))
-                      (syntax->list #'(names ...))
-                      (syntax->list #'(names/ellipses ...))
-                      #t
-                      #f))
-        (define test-case-body-code
-          ;; this contains some redundant code
-          (bind-withs orig-name
-                      #'#t 
-                      #'lang-id2
-                      lang-nts
-                      lang-id
-                      sides/withs/freshs
-                      'predicate
-                      #'#t
-                      (syntax->list #'(names ...))
-                      (syntax->list #'(names/ellipses ...))
-                      #t
-                      #f))
-        (with-syntax ([(lhs-syncheck-expr lhs-w/extras (w/extras-names ...) (w/extras-names/ellipses ...))
-                       (rw-sc #`(side-condition #,from #,test-case-body-code))]
-                      [lhs-source (format "~a:~a:~a"
-                                          (and (path? (syntax-source from))
-                                               (path->relative-string/library (syntax-source from)))
-                                          (syntax-line from)
-                                          (syntax-column from))]
-                      [name name]
-                      [lang lang]
-                      [body-code body-code])
-          #`(begin
-              lhs-syncheck-expr
-              (build-rewrite-proc/leaf 
-               `side-conditions-rewritten
-               (λ (#,rt-lang-id)
-                 (λ (main-exp bindings)
-                   #,(bind-pattern-names 'reduction-relation
-                                         #'(names/ellipses ...)
-                                         #'((lookup-binding bindings 'names) ...)
-                                         #'body-code)))
-               lhs-source
-               name
-               (λ (lang-id2) `lhs-w/extras))))))
-    
-    (define (process-extras stx orig-name name-table extras)
-      (let* ([the-name #f]
-             [the-name-stx #f]
-             [computed-name-stx #f]
-             [sides/withs/freshs 
-              (let loop ([extras extras])
-                (cond
-                  [(null? extras) '()]
-                  [else
-                   (syntax-case (car extras) (fresh computed-name judgment-holds)
-                     [name 
-                      (or (identifier? (car extras))
-                          (string? (syntax-e (car extras))))
-                      (begin
-                        (let* ([raw-name (syntax-e (car extras))]
-                               [name-sym
-                                (if (symbol? raw-name)
-                                    raw-name
-                                    (string->symbol raw-name))])
-                          (when (hash-ref name-table name-sym #f)
-                            (raise-syntax-errors orig-name 
-                                                 "same name on multiple rules"
-                                                 stx
-                                                 (list (car (hash-ref name-table name-sym))
-                                                       (syntax name))))
-                          (let ([num (hash-ref name-table #f)])
-                            (hash-set! name-table #f (+ num 1))
-                            (hash-set! name-table name-sym (list (syntax name) num)))
-                          
-                          (when the-name
-                            (raise-syntax-errors orig-name
-                                                 "expected only a single name" 
-                                                 stx
-                                                 (list the-name-stx (car extras))))
-                          (set! the-name (if (symbol? raw-name)
-                                             (symbol->string raw-name)
-                                             raw-name))
-                          (set! the-name-stx (car extras))
-                          (loop (cdr extras))))]
-                     [(fresh var ...)
-                      (append (map (λ (x)
-                                     (syntax-case x ()
-                                       [x
-                                        (identifier? #'x)
-                                        #'(fresh x)]
-                                       [(x name)
-                                        (identifier? #'x)
-                                        #'(fresh x name)]
-                                       [((ys dots2) (xs dots1))
-                                        (and (eq? (syntax-e #'dots1) (string->symbol "..."))
-                                             (eq? (syntax-e #'dots2) (string->symbol "...")))
-                                        #'(fresh (ys) (xs dots1))]
-                                       [((ys dots2) (xs dots1) names)
-                                        (and (eq? (syntax-e #'dots1) (string->symbol "..."))
-                                             (eq? (syntax-e #'dots2) (string->symbol "...")))
-                                        #'(fresh (ys) (xs dots1) names)]
-                                       [x
-                                        (raise-syntax-error orig-name 
-                                                            "malformed fresh variable clause"
-                                                            stx
-                                                            #'x)]))
-                                   (syntax->list #'(var ...)))
-                              (loop (cdr extras)))]
-                     [(-side-condition exp ...)
-                      (side-condition-keyword? #'-side-condition)
-                      (cons (car extras) (loop (cdr extras)))]
-                     [(-where x e)
-                      (where-keyword? #'-where)
-                      (cons (car extras) (loop (cdr extras)))]
-                     [(-where . x)
-                      (where-keyword? #'-where)
-                      (raise-syntax-error orig-name "malformed where clause" stx (car extras))]
-                     [(computed-name e)
-                      (if computed-name-stx
-                          (raise-syntax-errors orig-name "expected at most one computed-name clause"
-                                               stx (list computed-name-stx #'e))
-                          (set! computed-name-stx #'e))
-                      (loop (cdr extras))]
-                     [(computed-name . _)
-                      (raise-syntax-error orig-name "malformed computed-name clause" stx (car extras))]
-                     [(judgment-holds judgment)
-                      (begin
-                        (check-judgment-arity stx #'judgment)
-                        (cons #'judgment (loop (cdr extras))))]
-                     [_
-                      (raise-syntax-error orig-name "unknown extra" stx (car extras))])]))])
-        (values the-name computed-name-stx sides/withs/freshs)))
-    
-    ;; table-cons! hash-table sym any -> void
-    ;; extends ht at key by `cons'ing hd onto whatever is alrady bound to key (or the empty list, if nothing is)
-    (define (table-cons! ht key hd)
-      (module-identifier-mapping-put! ht key (cons hd (module-identifier-mapping-get ht key (λ () '())))))
-    
-    (define (raise-syntax-errors sym str stx stxs)
-      (raise (make-exn:fail:syntax 
-              (string->immutable-string (format "~a: ~a~a" 
-                                                sym 
-                                                str
-                                                (if (error-print-source-location)
-                                                    (string-append ":" (stxs->list stxs))
-                                                    "")))
-              (current-continuation-marks)
-              stxs)))
-    
-    (define (stxs->list stxs)
-      (apply
-       string-append
-       (let loop ([stxs stxs])
-         (cond
-           [(null? stxs) '()]
-           [else 
-            (cons (format " ~s" (syntax->datum (car stxs)))
-                  (loop (cdr stxs)))]))))
-  
-  (do-reduction-relation/proc stx))
-
-(define (build-rewrite-proc/leaf side-conditions-rewritten 
-                                 build-really-matched/lang-arg
-                                 lhs-source
-                                 name
-                                 lhs-w/extras-proc)
-  (let ([case-id (gensym)])
-    (make-rewrite-proc
-     (λ (lang-id)
-       (define build-really-matched (build-really-matched/lang-arg lang-id))
-       (let ([cp (compile-pattern lang-id side-conditions-rewritten #t)])
-         (λ (main-exp exp f other-matches)
-           (let ([mtchs (match-pattern cp exp)])
-             (if mtchs
-                 (let loop ([mtchs mtchs]
-                            [acc other-matches])
-                   (cond
-                     [(null? mtchs) acc]
-                     [else 
-                      (let* ([mtch (car mtchs)]
-                             [bindings (mtch-bindings mtch)]
-                             [really-matched (build-really-matched main-exp bindings)])
-                        (cond
-                          [really-matched
-                           (for-each
-                            (λ (c)
-                              (let ([r (coverage-relation c)])
-                                (when (and (reduction-relation? r)
-                                           (memf (λ (r) (eq? case-id (rewrite-proc-id r)))
-                                                 (reduction-relation-make-procs r)))
-                                  (cover-case case-id c))))
-                            (relation-coverage))
-                           (loop (cdr mtchs) 
-                                 (map/mt (λ (x) (list name
-                                                      (if (none? (car x)) 
-                                                          name
-                                                          (format "~a" (car x)))
-                                                      (f (cdr x)))) 
-                                         really-matched acc))]
-                          [else 
-                           (loop (cdr mtchs) acc)]))]))
-                 other-matches)))))
-     name
-     lhs-w/extras-proc
-     lhs-source
-     case-id)))
-
-(define (union-reduction-relations fst snd . rst)
-  (let ([name-ht (make-hasheq)]
-        [counter 0]
-        [lst (list* fst snd rst)]
-        [first-lang (reduction-relation-lang fst)])
-    (for-each
-     (λ (red)
-       (unless (eq? first-lang (reduction-relation-lang red))
-         (error 'union-reduction-relations 
-                "expected all of the reduction relations to use the same language"))
-       (for-each (λ (name)
-                   (when (hash-ref name-ht name #f)
-                     (error 'union-reduction-relations "multiple rules with the name ~s" name))
-                   (hash-set! name-ht name counter)
-                   (set! counter (+ counter 1)))
-                 (reduction-relation-rule-names red)))
-     (reverse lst)) ;; reverse here so the names get put into the hash in the proper (backwards) order
-    (make-reduction-relation
-     first-lang
-     (reverse (apply append (map reduction-relation-make-procs lst)))
-     (map car (sort (hash-map name-ht list) < #:key cadr))
-     (apply append (map reduction-relation-lws lst)) 
-     (reverse (apply append (map reduction-relation-procs lst)))
-     ;; not clear what the contract is here.
-     `any)))
-
-(define (do-node-match lhs-frm-id lhs-to-id pat rhs-proc child-make-proc rhs-from)
-  (define (subst from to in)
-    (let recur ([p in])
-      (cond [(eq? from p) to]
-            [(pair? p) (map recur p)]
-            [else p])))
-  ;; need call to make-rewrite-proc
-  ;; also need a test case here to check duplication of names.
-  (make-rewrite-proc
-   (λ (lang)
-     (let ([cp (compile-pattern lang pat #t)]
-           [child-proc (child-make-proc lang)])
-       (λ (main-exp exp f other-matches)
-         (let ([mtchs (match-pattern cp exp)])
-           (if mtchs
-               (let o-loop ([mtchs mtchs]
-                            [acc other-matches])
-                 (cond
-                   [(null? mtchs) acc]
-                   [else
-                    (let ([sub-exp (lookup-binding (mtch-bindings (car mtchs)) lhs-frm-id)])
-                      (o-loop (cdr mtchs) 
-                              (child-proc main-exp
-                                          sub-exp
-                                          (λ (x) (f (rhs-proc (mtch-bindings (car mtchs)) x)))
-                                          acc)))]))
-               other-matches)))))
-   (rewrite-proc-name child-make-proc)
-   (λ (lang) (subst lhs-frm-id ((rewrite-proc-lhs child-make-proc) lang) rhs-from))
-   (rewrite-proc-lhs-src child-make-proc)
-   (rewrite-proc-id child-make-proc)))
-
-(define relation-coverage (make-parameter null))
-
-(define (cover-case id cov)
-  (hash-update! (coverage-counts cov) id 
-                (λ (c) (cons (car c) (add1 (cdr c))))))
-
-(define (covered-cases cov)
-  (sort (hash-map (coverage-counts cov) (λ (k v) v))
-        string<=?
-        #:key car))
-
-(define-struct coverage (relation counts))
-
-(define-syntax (fresh-coverage stx)
-  (syntax-case stx ()
-    [(name subj-stx)
-     (with-syntax ([subj
-                    (cond [(and (identifier? (syntax subj-stx))
-                                (let ([tf (syntax-local-value (syntax subj-stx) (λ () #f))])
-                                  (and (term-fn? tf) (term-fn-get-id tf))))
-                           => values]
-                          [else (syntax (let ([r subj-stx])
-                                          (if (reduction-relation? r)
-                                              r
-                                              (raise-type-error 'name "reduction-relation" r))))])])
-       (syntax
-        (let ([h (make-hasheq)])
-          (cond [(metafunc-proc? subj)
-                 (for-each
-                  (λ (c) (hash-set! h (metafunc-case-id c) (cons (metafunc-case-src-loc c) 0)))
-                  (metafunc-proc-cases subj))]
-                [(reduction-relation? subj)
-                 (for-each 
-                  (λ (rwp) 
-                    (hash-set! h (rewrite-proc-id rwp) (cons (or (rewrite-proc-name rwp) (rewrite-proc-lhs-src rwp)) 0)))
-                  (reduction-relation-make-procs subj))])
-          (make-coverage subj h))))]))
-
-(define-syntax (test-match stx) (test-match/both stx #f))
-(define-syntax (test-match? stx) (test-match/both stx #t))
-
-(define-for-syntax (test-match/both stx boolean-only?)
-  (syntax-case stx ()
-    [(form-name lang-exp pattern)
-     (identifier? #'lang-exp)
-     (let ()
-       (define what (syntax-e #'form-name))
-       (with-syntax ([(syncheck-expr side-condition-rewritten (vars ...) (ids/depths ...))
-                      (rewrite-side-conditions/check-errs #'lang-exp what #t #'pattern)])
-         (with-syntax ([binders (map syntax-e (syntax->list #'(vars ...)))]
-                       [name (syntax-local-infer-name stx)])
-           #`(begin
-               syncheck-expr
-               (do-test-match lang-exp `side-condition-rewritten 'binders 'name #,boolean-only?)))))]
-    [(form-name lang-exp pattern expression)
-     (identifier? #'lang-exp)
-     (syntax 
-      ((form-name lang-exp pattern) expression))]
-    [(_ a b c)
-     (raise-syntax-error 'redex-match "expected an identifier (bound to a language) as first argument" stx #'a)]
-    [(_ a b)
-     (raise-syntax-error 'redex-match "expected an identifier (bound to a language) as first argument" stx #'a)]))
-
-(define-struct match (bindings) #:inspector #f)
-
-(define (do-test-match lang pat binders context-name boolean-only?)
-  (unless (compiled-lang? lang)
-    (error 'redex-match "expected first argument to be a language, got ~e" lang))
-  (define name (or context-name
-                   (and (symbol? pat)
-                        pat)))
-  (define cpat (compile-pattern lang pat #t))
-  (define redex-match-proc
-    (if boolean-only?
-        (λ (exp) (match-pattern? cpat exp))
-        (λ (exp)
-          (let ([ans (match-pattern cpat exp)])
-            (and ans
-                 (map (λ (m) (make-match (sort-bindings 
-                                          (filter (λ (x) (and (memq (bind-name x) binders)
-                                                              (not-ellipsis-name (bind-name x))))
-                                                  (bindings-table (mtch-bindings m))))))
-                      ans))))))
-  (if name
-      (procedure-rename redex-match-proc name)
-      redex-match-proc))
-(define (not-ellipsis-name x)
-  (not (regexp-match? #rx"^[.][.][.]" (symbol->string x))))
-
-(define (sort-bindings bnds)
-  (sort
-   bnds
-   (λ (x y) (string-ci<=? (symbol->string (bind-name x))
-                          (symbol->string (bind-name y))))))
-
-(define-struct metafunction (proc))
-
-(define-struct metafunc-case (lhs rhs lhs+ src-loc id) #:transparent)
-
-(define-syntax (in-domain? stx)
-  (syntax-case stx ()
-    [(_ (name exp ...))
-     (begin
-       (unless (identifier? #'name)
-         (raise-syntax-error #f "expected an identifier" stx #'name))
-       #'(in-domain?/proc (metafunction-form name) (term (exp ...))))]))
-
-(define (in-domain?/proc mf exp)
-  (let ([mp (metafunction-proc mf)])
-    ((metafunc-proc-in-dom? mp)
-     exp)))
-
-(define-for-syntax (lhs-lws clauses)
-  (with-syntax ([((lhs-for-lw _ ...) ...) clauses])
-    (map (λ (x) (to-lw/proc (datum->syntax #f (cdr (syntax-e x)) x)))
-         (syntax->list #'(lhs-for-lw ...)))))
-
-;                                                                                                          
-;                                                                                                          
-;                                                                                                          
-;                            ;              ;;;                                 ;    ;;                    
-;                           ;;             ;;;;                                ;;    ;;                    
-;  ;;;;;;; ;;;;    ;;;    ;;;;; ;;;;;;;   ;;;;; ;;;; ;;;; ;;;; ;;;    ;;;;;  ;;;;;        ;;;;   ;;;; ;;;  
-;  ;;;;;;;;;;;;;  ;;;;;  ;;;;;; ;;;;;;;;  ;;;;  ;;;; ;;;; ;;;;;;;;;  ;;;;;; ;;;;;; ;;;;  ;;;;;;  ;;;;;;;;; 
-;  ;;;; ;;; ;;;; ;;;; ;;  ;;;;      ;;;; ;;;;;; ;;;; ;;;; ;;;; ;;;; ;;;;;;;  ;;;;  ;;;; ;;;;;;;; ;;;; ;;;; 
-;  ;;;; ;;; ;;;; ;;;;;;;  ;;;;   ;;;;;;; ;;;;;; ;;;; ;;;; ;;;; ;;;; ;;;;     ;;;;  ;;;; ;;;; ;;; ;;;; ;;;; 
-;  ;;;; ;;; ;;;; ;;;;;    ;;;;; ;;  ;;;;  ;;;;  ;;;; ;;;; ;;;; ;;;; ;;;;;;;  ;;;;; ;;;; ;;;;;;;; ;;;; ;;;; 
-;  ;;;; ;;; ;;;;  ;;;;;;  ;;;;; ;;;;;;;;  ;;;;  ;;;;;;;;; ;;;; ;;;;  ;;;;;;  ;;;;; ;;;;  ;;;;;;  ;;;; ;;;; 
-;  ;;;; ;;; ;;;;   ;;;;    ;;;;  ;; ;;;;  ;;;;   ;;; ;;;; ;;;; ;;;;   ;;;;;   ;;;; ;;;;   ;;;;   ;;;; ;;;; 
-;                                                                                                          
-;                                                                                                          
-;                                                                                                          
-
-(define-syntax (define-metafunction stx)
-  (syntax-case stx ()
-    [(_ . rest)
-     (internal-define-metafunction stx #f #'rest)]))
-
-(define-syntax (define-metafunction/extension stx)
-  (syntax-case stx ()
-    [(_ prev . rest)
-     (identifier? #'prev)
-     (internal-define-metafunction stx #'prev #'rest)]))
-
-(define-for-syntax (internal-define-metafunction orig-stx prev-metafunction stx)
-  (not-expression-context orig-stx)
-  (syntax-case stx ()
-    [(lang . rest)
-     (let ([syn-error-name (if prev-metafunction
-                               'define-metafunction/extension
-                               'define-metafunction)])
-       ;; keep this near the beginning, so it signals the first error (PR 10062)
-       (definition-nts #'lang orig-stx syn-error-name)
-       (when (null? (syntax-e #'rest))
-         (raise-syntax-error syn-error-name "no clauses" orig-stx))
-       (when prev-metafunction
-         (syntax-local-value 
-          prev-metafunction
-          (λ ()
-            (raise-syntax-error 
-             syn-error-name 
-             "expected a previously defined metafunction" orig-stx prev-metafunction))))
-       (let*-values ([(contract-name dom-ctcs pre-condition 
-                                     codom-contracts codomain-separators post-condition
-                                     pats)
-                      (split-out-contract orig-stx syn-error-name #'rest #f)]
-                     [(name _) (defined-name (list contract-name) pats orig-stx)])
-         (when (and prev-metafunction (eq? (syntax-e #'name) (syntax-e prev-metafunction)))
-           (raise-syntax-error syn-error-name
-                               "the extended and extending metafunctions cannot share a name"
-                               orig-stx
-                               prev-metafunction))
-         (with-syntax ([(name2 name-predicate) (generate-temporaries (list name name))]
-                       [name name])
-           (with-syntax ([name2+prop (syntax-property #'name2
-                                                      'undefined-error-name
-                                                      (syntax-e #'name))])
-             (with-syntax ([defs #`(begin
-                                     (define-values (name2+prop name-predicate)
-                                       (generate-metafunction #,orig-stx
-                                                              lang
-                                                              #,prev-metafunction
-                                                              name
-                                                              name-predicate
-                                                              #,dom-ctcs
-                                                              #,(if pre-condition
-                                                                    (list pre-condition)
-                                                                    #f)
-                                                              #,codom-contracts
-                                                              '#,codomain-separators
-                                                              #,(if post-condition
-                                                                    (list post-condition)
-                                                                    #f)
-                                                              #,pats
-                                                              #,syn-error-name))
-                                     (term-define-fn name name2))])
-               (if (eq? 'top-level (syntax-local-context))
-                   ; Introduce the names before using them, to allow
-                   ; metafunction definition at the top-level.
-                   (syntax 
-                    (begin 
-                      (define-syntaxes (name2+prop name-predicate) (values))
-                      defs))
-                   (syntax defs)))))))]))
-
-(define-for-syntax (extract-clause-names stuffss)
-  (for/list ([stuffs (in-list (syntax->list stuffss))])
-    (define the-clause-name #f)
-    (define stuff-without-clause-name
-      (for/fold ([stuffs '()]) ([stuff+name (in-list (syntax->list stuffs))])
-        (syntax-case* stuff+name (clause-name) (λ (x y) (eq? (syntax-e x) (syntax-e y)))
-          [(clause-name id)
-           (begin
-             (unless (or (identifier? #'id)
-                         (string? (syntax-e #'id)))
-               (raise-syntax-error 'define-metafunction 
-                                   "expected an identifier or a string"
-                                   #'id))
-             (when the-clause-name
-               (raise-syntax-error 'define-metafunction
-                                   "multiple names in a single clause"
-                                   #f
-                                   #f
-                                   (list the-clause-name #'id)))
-             (set! the-clause-name #'id)
-             stuffs)]
-          [_ 
-           (cons stuff+name stuffs)])))
-    (cons (cond
-            [(not the-clause-name) #f]
-            [(identifier? the-clause-name) (symbol->string (syntax-e the-clause-name))]
-            [else the-clause-name])
-          (reverse stuff-without-clause-name))))
-
-(define-for-syntax (eliminate-metafunction-ors stx)
-  (define (is-not-or? x)
-    (syntax-case x (or)
-      [or #f]
-      [else #t]))
-  (apply 
-   append
-   (for/list ([clause (in-list (syntax->list stx))])
-     (syntax-case clause ()
-       [(lhs . rhs+stuff)
-        (let ()
-          (define split 
-            (let loop ([lst (syntax->list #'rhs+stuff)])
-              (define batch (takef lst is-not-or?))
-              (cond
-                [(null? batch) '()]
-                [else 
-                 (define next (dropf lst is-not-or?))
-                 (if (pair? next)
-                     (cons batch (loop (cdr next)))
-                     (list batch))])))
-          (map (λ (x) (cons #'lhs x)) split))]))))
-
-(define-syntax (generate-metafunction stx)
-  (syntax-case stx ()
-    [(_ orig-stx lang prev-metafunction-stx
-        name name-predicate
-        dom-ctcs-stx pre-condition-stx
-        codom-contracts-stx codomain-separators-stx post-condition-stx
-        pats-stx syn-error-name)
-     (let ()
-       (define (condition-or-false s)
-         (define info (syntax-e s))
-         (cond
-           [info
-            (unless (pair? info) (error 'condition-or-false "~s" s))
-            (car info)]
-           [else #f]))
-       (define prev-metafunction (and (syntax-e #'prev-metafunction-stx) #'prev-metafunction-stx))
-       (define dom-ctcs (syntax-e #'dom-ctcs-stx))
-       (define pre-condition (condition-or-false #'pre-condition-stx))
-       (define codom-contracts (syntax-e #'codom-contracts-stx))
-       (define codomain-separators (syntax-e #'codomain-separators-stx))
-       (define post-condition (condition-or-false #'post-condition-stx))
-       (define pats (syntax-e #'pats-stx))
-       (define syn-error-name (syntax-e #'syn-error-name))
-       (define lang-nts
-         (definition-nts #'lang #'orig-stx syn-error-name))
-       (with-syntax ([(((original-names lhs-clauses ...) raw-rhses ...) ...)
-                      (eliminate-metafunction-ors #'pats-stx)]
-                     [(lhs-for-lw ...) (lhs-lws pats)]
-                     [(((_1 lhs-with-ors-intact ...)
-                        rhs-with-ors-intact
-                        stuff-with-ors-intact ...) ...)
-                      pats])
-         (with-syntax ([((rhs stuff+names ...) ...) #'((raw-rhses ...) ...)]
-                       [(lhs ...) #'((lhs-clauses ...) ...)])
-           (with-syntax ([((clause-name stuff ...) ...) 
-                          (extract-clause-names #'((stuff+names ...) ...))])
-             (parse-extras #'((stuff ...) ...))
-             (with-syntax ([((syncheck-expr side-conditions-rewritten lhs-names lhs-namess/ellipses) ...) 
-                            (map (λ (x) (rewrite-side-conditions/check-errs
-                                         #'lang
-                                         syn-error-name
-                                         #t
-                                         x))
-                                 (syntax->list (syntax (lhs ...))))])
-               (with-syntax ([(rhs/wheres ...)
-                              (map (λ (sc/b rhs names names/ellipses)
-                                     (bind-withs
-                                      syn-error-name '()  
-                                      #'effective-lang lang-nts #'lang
-                                      sc/b 'flatten
-                                      #`(list (term #,rhs #:lang lang))
-                                      (syntax->list names) 
-                                      (syntax->list names/ellipses)
-                                      #t
-                                      #f))
-                                   (syntax->list #'((stuff ...) ...))
-                                   (syntax->list #'(rhs ...))
-                                   (syntax->list #'(lhs-names ...))
-                                   (syntax->list #'(lhs-namess/ellipses ...)))]
-                             [(rg-rhs/wheres ...)
-                              (map (λ (sc/b rhs names names/ellipses) 
-                                     (bind-withs
-                                      syn-error-name '()  
-                                      #'effective-lang lang-nts #'lang
-                                      sc/b 'predicate
-                                      #`#t
-                                      (syntax->list names)
-                                      (syntax->list names/ellipses)
-                                      #t
-                                      #f))
-                                   (syntax->list #'((stuff ...) ...))
-                                   (syntax->list #'(rhs ...))
-                                   (syntax->list #'(lhs-names ...))
-                                   (syntax->list #'(lhs-namess/ellipses ...)))])
-                 (with-syntax ([((rg-syncheck-expr rg-side-conditions-rewritten rg-names rg-names/ellipses ...) ...)
-                                (map (λ (x) (rewrite-side-conditions/check-errs
-                                             #'lang
-                                             syn-error-name
-                                             #t
-                                             x))
-                                     (syntax->list (syntax ((side-condition lhs rg-rhs/wheres) ...))))]
-                               [(clause-src ...)
-                                (map (λ (lhs)
-                                       (format "~a:~a:~a"
-                                               (and (path? (syntax-source lhs))
-                                                    (path->relative-string/library (syntax-source lhs)))
-                                               (syntax-line lhs)
-                                               (syntax-column lhs)))
-                                     (syntax->list #'(original-names ...)))]
-                               [(dom-syncheck-expr dom-side-conditions-rewritten 
-                                                   (dom-names ...)
-                                                   dom-names/ellipses)
-                                (if dom-ctcs
-                                    (rewrite-side-conditions/check-errs
-                                     #'lang
-                                     syn-error-name
-                                     #f
-                                     dom-ctcs)
-                                    #'((void) any () ()))]
-                               [((codom-syncheck-expr 
-                                  codom-side-conditions-rewritten
-                                  codom-names 
-                                  codom-names/ellipses) ...)
-                                (map (λ (codom-contract)
-                                       (rewrite-side-conditions/check-errs
-                                        #'lang
-                                        syn-error-name
-                                        #f
-                                        (if post-condition
-                                            #`(side-condition (#,dom-ctcs #,codom-contract)
-                                                              (term #,post-condition))
-                                            codom-contract)))
-                                     codom-contracts)]
-                               [(rhs-fns ...)
-                                (map (λ (names names/ellipses rhs/where)
-                                       (with-syntax ([(names ...) names]
-                                                     [(names/ellipses ...) names/ellipses]
-                                                     [rhs/where rhs/where])
-                                         (syntax
-                                          (λ (name bindings)
-                                            (term-let-fn ((name name))
-                                                         (term-let ([names/ellipses (lookup-binding bindings 'names)] ...)
-                                                                   rhs/where))))))
-                                     (syntax->list #'(lhs-names ...))
-                                     (syntax->list #'(lhs-namess/ellipses ...))
-                                     (syntax->list (syntax (rhs/wheres ...))))]
-                               [(gen-clause ...)
-                                (make-mf-clauses (syntax->list #'(lhs ...))
-                                                 (syntax->list #'(rhs ...))
-                                                 (syntax->list #'((stuff ...) ...))
-                                                 lang-nts syn-error-name #'name #'lang)])
-                   (syntax-property
-                    (prune-syntax
-                     #`(let ([sc `(side-conditions-rewritten ...)]
-                             [dsc `dom-side-conditions-rewritten])
-                         syncheck-expr ... rg-syncheck-expr ... dom-syncheck-expr codom-syncheck-expr ...
-                         (let ([cases (map (λ (pat rhs-fn rg-lhs src)
-                                             (make-metafunc-case
-                                              (λ (effective-lang) (compile-pattern effective-lang pat #t))
-                                              rhs-fn
-                                              rg-lhs src (gensym)))
-                                           sc
-                                           (list (λ (effective-lang) rhs-fns) ...)
-                                           (list (λ (effective-lang) `rg-side-conditions-rewritten) ...)
-                                           `(clause-src ...))]
-                               [parent-cases 
-                                #,(if prev-metafunction
-                                      #`(metafunc-proc-cases #,(term-fn-get-id (syntax-local-value prev-metafunction)))
-                                      #'null)])
-                           (build-metafunction 
-                            lang
-                            cases
-                            parent-cases
-                            (λ (f/dom)
-                              (make-metafunc-proc
-                               (let ([name (lambda (x) (f/dom x))]) name)
-                               '(clause-name ...)
-                               (list
-                                ;; mf contract
-                                #,(if (and dom-ctcs codom-contracts)
-                                      #`(list
-                                         #,(with-syntax ([(dom-ctc ...) dom-ctcs])
-                                             #`(list (to-lw dom-ctc) ...))
-                                         #,(with-syntax ([(codom-ctc ...) codom-contracts])
-                                             #`(list (to-lw codom-ctc) ...))
-                                         #,codomain-separators)
-                                      #'#f)
-                                
-                                ;; body of mf
-                                (generate-lws #f
-                                              ((lhs-with-ors-intact ...) ...)
-                                              (lhs-for-lw ...)
-                                              ((stuff-with-ors-intact ...) ...)
-                                              (rhs-with-ors-intact ...)
-                                              #t))
-                               lang
-                               #t ;; multi-args?
-                               'name
-                               (let ([name (lambda (x) (name-predicate x))]) name)
-                               dsc
-                               (append cases parent-cases)
-                               #,(cond
-                                   [prev-metafunction
-                                    #`(extend-mf-clauses #,(term-fn-get-id (syntax-local-value prev-metafunction))
-                                                         (λ ()
-                                                           (add-mf-dqs #,(check-pats #'(list gen-clause ...)))))]
-                                   [else
-                                    #`(memoize0
-                                       (λ ()
-                                         (add-mf-dqs #,(check-pats #'(list gen-clause ...)))))])))
-                            #,(if dom-ctcs #'dsc #f)
-                            (λ (bindings) 
-                              #,(bind-pattern-names 'define-metafunction
-                                                    #'dom-names/ellipses
-                                                    #'((lookup-binding bindings 'dom-names) ...)
-                                                    #`(term #,pre-condition)))
-                            `(codom-side-conditions-rewritten ...)
-                            #,(and post-condition #t)
-                            'name))))
-                    'disappeared-use
-                    (map syntax-local-introduce 
-                         (syntax->list #'(original-names ...)))))))))))]))
-
-(define (extend-mf-clauses old-mf new-clauses)
-  (memoize0
-   (λ ()
-     (define new-cs (new-clauses))
-     (define new-lhss
-       (for/list ([c new-cs])
-         (match: c
-           [(clause `(list ,c-lhs ,c-rhs) c-eq/dqs c-prems c-lang c-name)
-            c-lhs])))
-     (define new-old-cs
-       (for/list ([old-c (in-list ((metafunc-proc-gen-clauses old-mf)))])
-         (match: old-c
-           [(clause `(list ,c-lhs ,c-rhs) c-eq/dqs c-prems c-lang c-name)
-            (define new-dqs (make-clause-dqs c-lhs new-lhss (length new-lhss)))
-            (struct-copy clause old-c
-                         [eq/dqs (append new-dqs c-eq/dqs)])])))
-     (append new-cs new-old-cs))))
-
-(define uniq (gensym))
-(define (memoize0 t)
-  (let ([ans uniq])
-    (λ ()
-      (when (eq? ans uniq)
-        (set! ans (t)))
-      ans)))
-
-(define-for-syntax (make-mf-clauses lhss rhss extrass nts err-name name lang)
-  (define rev-clauses
-    (for/fold ([clauses '()]) 
-      ([lhs (in-list lhss)] [rhs (in-list rhss)] [extras (in-list extrass)])
-      (with-syntax ([(lhs-syncheck-expr lhs-pat (names ...) (names/ellipses ...)) (rewrite-side-conditions/check-errs lang err-name #t lhs)])
-        (define-values (ps-rw extra-eqdqs p-names) 
-          (rewrite-prems #f (syntax->list extras) (syntax->datum #'(names ...)) lang 'define-metafunction))
-        (define-values (rhs-pats mf-clausess) (rewrite-terms (list rhs) p-names)) 
-        (define clause-stx
-          (with-syntax ([(prem-rw ...) ps-rw]
-                        [(eqs ...) extra-eqdqs]
-                        [(mf-clauses ...) mf-clausess]
-                        [(rhs-pat) rhs-pats])
-            #`(begin
-                lhs-syncheck-expr
-                (clause '(list lhs-pat rhs-pat)
-                        (list eqs ...)
-                        (list prem-rw ... mf-clauses ...)
-                        #,lang
-                        '#,name))))
-        (cons clause-stx clauses))))
-  (reverse rev-clauses))
-
-(define (add-mf-dqs clauses)
-  (define-values (new-clauses _)
-    (for/fold ([new-cs '()] [prev-lhss '()])
-      ([c clauses])
-      (match: c
-        [(clause `(list ,c-lhs ,c-rhs) c-eq/dqs c-prems c-lang c-name)
-         (define new-dqs (make-clause-dqs c-lhs prev-lhss))
-         (define new-c (struct-copy clause c
-                                    [eq/dqs (append new-dqs c-eq/dqs)]))
-         (values (cons new-c new-cs)
-                 (cons c-lhs prev-lhss))])))
-  (reverse new-clauses))
-
-(define (make-clause-dqs rhs-pat prev-lhs-pats [n 0])
-  (define rhs-vs (pat-vars rhs-pat))
-  (define fixed-lhss
-    (for/list ([lhs (in-list prev-lhs-pats)])
-      (begin0
-        (let recur ([p lhs])
-          (match: p
-            [`(name ,v ,p)
-             (define new-v (string->symbol (format "~s_lhs~s" v n)))
-             (let loop ([new-v new-v])
-               (if (set-member? rhs-vs new-v)
-                   (loop (string->symbol (format "~s:" new-v)))
-                   `(name ,new-v ,(recur p))))]
-            [`(list ,ps ...)
-             `(list ,@(map recur ps))]
-            [_ p]))
-        (set! n (add1 n)))))
-  (for/list ([plhs (in-list fixed-lhss)])
-    (define lhs-vs (pat-vars plhs))
-    (dqn (set->list lhs-vs) plhs rhs-pat)))
-
-(define (pat-vars p)
-  (match: p
-    [`(name ,v ,p)
-     (set-add (pat-vars p) v)]
-    [`(list ,ps ...)
-     (apply set-union (set) (map pat-vars ps))]
-    [_
-     (set)]))
-  
-(define-for-syntax (check-arity-consistency mode contracts full-def)
-  (when (and contracts (not (= (length mode) (length contracts))))
-    (raise-syntax-error 
-     #f "mode and contract specify different numbers of positions" full-def)))
-
-(define-for-syntax (defined-name declared-names clauses orig-stx)
-  (with-syntax ([(((used-names _ ...) _ ...) ...) clauses])
-    (define-values (the-name other-names)
-      (let ([present (filter values declared-names)])
-        (if (null? present)
-            (values (car (syntax->list #'(used-names ...)))
-                    (cdr (syntax->list #'(used-names ...))))
-            (values (car present) 
-                    (append (cdr present) (syntax->list #'(used-names ...)))))))
-    (let loop ([others other-names])
-      (cond
-        [(null? others) (values the-name other-names)]
-        [else
-         (unless (eq? (syntax-e the-name) (syntax-e (car others)))
-           (raise-syntax-error 
-            #f
-            "expected the same name in both positions"
-            orig-stx
-            the-name (list (car others))))
-         (loop (cdr others))]))))
-
-
-(define-for-syntax (parse-extras extras)
-  (for-each
-   (λ (stuffs)
-     (for-each
-      (λ (stuff)
-        (syntax-case stuff (where side-condition where/hidden side-condition/hidden judgment-holds)
-          [(side-condition tl-side-conds ...) 
-           (void)]
-          [(side-condition/hidden tl-side-conds ...) 
-           (void)]
-          [(where x e)
-           (void)]
-          [(where/hidden x e)
-           (void)]
-          [(where . args)
-           (raise-syntax-error 'define-metafunction 
-                               "malformed where clause"
-                               stuff)]
-          [(where/hidden . args)
-           (raise-syntax-error 'define-metafunction 
-                               "malformed where/hidden clause"
-                               stuff)]
-          [(judgment-holds (form-name . _))
-           (unless (judgment-form-id? #'form-name)
-             (raise-syntax-error 'define-metafunction
-                                 "expected the name of a judgment-form"
-                                 #'form-name))]
-          [_
-           (raise-syntax-error 'define-metafunction 
-                               "expected a side-condition, where, or clause-name"
-                               stuff)]))
-      (syntax->list stuffs)))
-   (syntax->list extras)))
-
-
-(define (build-metafunction lang cases parent-cases 
-                            wrap
-                            dom-contract-pat pre-condition
-                            codom-contract-pats post-condition?
-                            name)
-  (let* ([dom-compiled-pattern (and dom-contract-pat (compile-pattern lang dom-contract-pat #f))]
-         [codom-compiled-patterns (map (λ (codom-contract-pat) (compile-pattern lang codom-contract-pat #f))
-                                       codom-contract-pats)]
-         [all-cases (append cases parent-cases)]
-         [lhss-at-lang (map (λ (case) ((metafunc-case-lhs case) lang)) all-cases)]
-         [rhss-at-lang (map (λ (case) ((metafunc-case-rhs case) lang)) all-cases)]
-         [ids (map metafunc-case-id all-cases)])
-    (values
-     (wrap
-      (letrec ([cache (make-hash)]
-               [cache-entries 0]
-               [not-in-cache (gensym)]
-               [cache-result (λ (arg res case)
-                               (when (caching-enabled?)
-                                 (when (>= cache-entries cache-size)
-                                   (set! cache (make-hash))
-                                   (set! cache-entries 0))
-                                 (hash-set! cache arg (cons res case))
-                                 (set! cache-entries (add1 cache-entries))))]
-               [log-coverage (λ (id)
-                               (when id
-                                 (for-each 
-                                  (λ (c)
-                                    (let ([r (coverage-relation c)])
-                                      (when (and (metafunc-proc? r)
-                                                 (findf (λ (c) (eq? id (metafunc-case-id c)))
-                                                        (metafunc-proc-cases r)))
-                                        (cover-case id c))))
-                                  (relation-coverage))))]
-               [metafunc
-                (λ (exp)
-                  (let ([cache-ref (hash-ref cache exp not-in-cache)])
-                    (cond
-                      [(or (not (caching-enabled?)) (eq? cache-ref not-in-cache))
-                       (define dom-match-result 
-                         (if dom-compiled-pattern
-                             (match-pattern dom-compiled-pattern exp)
-                             '()))
-                       (when dom-compiled-pattern
-                         (unless dom-match-result
-                           (redex-error name
-                                        "~s is not in my domain"
-                                        `(,name ,@exp)))
-                         (unless (for/and ([mtch (in-list dom-match-result)])
-                                   (pre-condition (mtch-bindings mtch)))
-                           (redex-error name
-                                        "~s is not in my domain"
-                                        `(,name ,@exp))))
-                       (let loop ([ids ids]
-                                  [lhss lhss-at-lang]
-                                  [rhss rhss-at-lang]
-                                  [num (- (length parent-cases))])
-                         (cond
-                           [(null? ids) 
-                            (redex-error name "no clauses matched for ~s" `(,name . ,exp))]
-                           [else
-                            (define pattern (car lhss))
-                            (define rhs (car rhss))
-                            (define id (car ids))
-                            (define (continue) (loop (cdr ids) (cdr lhss) (cdr rhss) (+ num 1)))
-                            (define mtchs (match-pattern pattern exp))
-                            (cond
-                              [(not mtchs) (continue)]
-                              [else
-                               (define anss
-                                 (apply append
-                                        (filter values
-                                                (map (λ (mtch) (rhs traced-metafunc (mtch-bindings mtch)))
-                                                     mtchs))))
-                               (define ht (make-hash))
-                               (for-each (λ (ans) (hash-set! ht ans #t)) anss)
-                               (cond
-                                 [(null? anss)
-                                  (continue)]
-                                 [(not (= 1 (hash-count ht)))
-                                  (redex-error name "~a matched ~s ~a returned different results" 
-                                               (if (< num 0)
-                                                   "a clause from an extended metafunction"
-                                                   (format "clause #~a (counting from 0)" num))
-                                               `(,name ,@exp)
-                                               (if (= 1 (length mtchs))
-                                                   "but"
-                                                   (format "~a different ways and "
-                                                           (length mtchs))))]
-                                 [else
-                                  (define ans (car anss))
-                                  (unless (for/or ([codom-compiled-pattern 
-                                                    (in-list codom-compiled-patterns)])
-                                            (match-pattern codom-compiled-pattern 
-                                                           (if post-condition?
-                                                               (list exp ans)
-                                                               ans)))
-                                    (redex-error name
-                                                 "codomain test failed for ~s, call was ~s"
-                                                 ans 
-                                                 `(,name ,@exp)))
-                                  (cache-result exp ans id)
-                                  (log-coverage id)
-                                  ans])])]))]
-                      [else 
-                       (log-coverage (cdr cache-ref))
-                       (car cache-ref)])))]
-               [ot (current-trace-print-args)]
-               [otr (current-trace-print-results)]
-               [traced-metafunc (lambda (exp)
-                                  (if (or (eq? (current-traced-metafunctions) 'all)
-                                          (memq name (current-traced-metafunctions)))
-                                      (parameterize ([current-trace-print-args
-                                                      (λ (name args kws kw-args level)
-                                                        (if (or (not (caching-enabled?))
-                                                                (eq? not-in-cache (hash-ref cache exp not-in-cache)))
-                                                            (display " ")
-                                                            (display "c"))
-                                                        (ot name (car args) kws kw-args level))]
-                                                     [current-trace-print-results
-                                                      (λ (name results level)
-                                                        (display " ")
-                                                        (otr name results level))]
-                                                     [print-as-expression #f])
-                                        (trace-call name metafunc exp))
-                                      (metafunc exp)))])
-        traced-metafunc))
-     (if dom-compiled-pattern
-         (λ (exp) (and (match-pattern dom-compiled-pattern exp) #t))
-         (λ (exp) (and (ormap (λ (lhs) (match-pattern lhs exp)) lhss-at-lang) 
-                       #t))))))
-
-(define-syntax (metafunction-form stx)
-  (syntax-case stx ()
-    [(_ id)
-     (identifier? #'id)
-     (let ([v (syntax-local-value #'id (lambda () #f))])
-       (if (term-fn? v)
-           (syntax-property
-            #`(make-metafunction #,(term-fn-get-id v))
-            'disappeared-use
-            (list (syntax-local-introduce #'id)))
-           (raise-syntax-error
-            #f
-            "not bound as a metafunction"
-            stx
-            #'id)))]))
-
-(define-syntax (::= stx)
-  (raise-syntax-error #f "cannot be used outside a language definition" stx))
-
-(define-for-syntax (parse-non-terminals nt-defs stx)
-  (define (parse-non-terminal def)
-    (define (delim? stx)
-      (and (identifier? stx) (free-identifier=? stx #'::=)))
-    (define-values (left delim right)
-      (syntax-case def ()
-        [(_ _ ...)
-         (let split ([xs def])
-           (syntax-case xs (::=)
-             [() (values '() #f '())]
-             [(x . prods)
-              (delim? #'x)
-              (values '() #'x (syntax->list #'prods))]
-             [(x . xs)
-              (let-values ([(l d r) (split #'xs)])
-                (values (cons #'x l) d r))]))]
-        [_ (raise-syntax-error #f "expected non-terminal definition" stx def)]))
-    (define (check-each xs bad? msg)
-      (define x (findf bad? xs))
-      (when x (raise-syntax-error #f msg stx x)))
-    (define-values (names prods)
-      (if delim
-          (begin
-            (when (null? left)
-              (raise-syntax-error #f "expected preceding non-terminal names" stx delim))
-            (values left right))
-          (values (syntax-case (car left) ()
-                    [(x ...) (syntax->list #'(x ...))]
-                    [x (list #'x)])
-                  (cdr left))))
-    
-    (check-each names (λ (x) (not (identifier? x)))
-                "expected non-terminal name")
-    (check-each names (λ (x) (memq (syntax-e x) (cons 'name underscore-allowed)))
-                "cannot use pattern language keyword as a non-terminal name")
-    (check-each names (λ (x) (regexp-match? #rx"_" (symbol->string (syntax-e x))))
-                "cannot use _ in a non-terminal name")
-    (check-each names (λ (x) (regexp-match? #rx"^[.][.][.]$" (symbol->string (syntax-e x))))
-                "cannot name a non-terminal `...'")
-    (check-each names (λ (x) (regexp-match? #rx"^[.][.][.]_" (symbol->string (syntax-e x))))
-                "cannot start a non-terminal name with `..._'")
-    
-    (when (null? prods)
-      (raise-syntax-error #f "expected at least one production to follow" 
-                          stx (or delim (car left))))
-    (check-each prods delim? "expected production")
-    (cons names prods))
-  (define parsed (map parse-non-terminal (syntax->list nt-defs)))
-  (define defs (make-hash))
-  (for ([p parsed])
-    (define ns (car p))
-    (for ([n ns])
-      (define m (hash-ref defs (syntax-e n) #f))
-      (if m
-          (raise-syntax-error #f "same non-terminal defined twice"
-                              stx n (list m))
-          (hash-set! defs (syntax-e n) n))))
-  parsed)
-
-(define-syntax (define-language stx)
-  (not-expression-context stx)
-  (syntax-case stx ()
-    [(form-name lang-name . nt-defs)
-     (begin
-       (unless (identifier? #'lang-name)
-         (raise-syntax-error #f "expected an identifier" stx #'lang-name))
-       (with-syntax ([(define-language-name) (generate-temporaries #'(lang-name))])
-         (define non-terms (parse-non-terminals #'nt-defs stx))
-         (with-syntax* ([((names prods ...) ...) non-terms]
-                        [(all-names ...) (apply append (map car non-terms))]
-                        [bindings
-                         (record-nts-disappeared-bindings #'lang-name (syntax->list #'(all-names ...)))])
-           (quasisyntax/loc stx
-             (begin
-               bindings
-               (define-syntax lang-name
-                 (make-set!-transformer
-                  (make-language-id
-                   (λ (stx)
-                     (syntax-case stx (set!)
-                       [(set! x e) (raise-syntax-error (syntax-e #'form-name) "cannot set! identifier" stx #'e)]
-                       [(x e (... ...))
-                        #'(define-language-name e (... ...))]
-                       [x 
-                        (identifier? #'x)
-                        #'define-language-name]))
-                   '(all-names ...)
-                   (to-table #'lang-name #'(all-names ...)))))
-               (define define-language-name
-                 #,(syntax/loc stx (language form-name lang-name (all-names ...) (names prods ...) ...))))))))]))
-
-(define-for-syntax (record-nts-disappeared-bindings lang nt-ids [prop `disappeared-binding])
-  (let loop ([nt-ids nt-ids]
-             [stx #'(void)])
-    (cond
-     [(null? nt-ids) stx]
-     [else 
-      (define old (syntax-property stx prop))
-      (define new (syntax-local-introduce (lang-nt-id lang (car nt-ids))))
-      (loop (cdr nt-ids)
-            (syntax-property stx
-                             prop
-                             (if old (cons new old) new)))])))
-
-(define-for-syntax (lang-nt-id lang-stx nt-stx)
-  (format-id nt-stx "~a:~a" 
-             (syntax->datum lang-stx) 
-             (syntax->datum nt-stx)
-             #:source nt-stx
-             #:props nt-stx))
-             
-
-(define-for-syntax (to-table lang x)
-  (for/hash ([id (in-list (syntax->list x))])
-    (values (syntax-e id) (lang-nt-id lang id))))
-
-(define-struct binds (source binds))
-  
-(define-syntax (language stx)
-  (syntax-case stx ()
-    [(_ form-name lang-id (all-names ...) (name rhs ...) ...)
-     (prune-syntax
-      (let ()
-        (let ([all-names (syntax->list #'(all-names ...))])
-          (with-syntax ([(((r-syncheck-expr r-rhs r-names r-names/ellipses) ...) ...) 
-                         ;; r-syncheck-expr has nothing interesting, I believe, so drop it
-                         (map (lambda (rhss) 
-                                (map (lambda (rhs)
-                                       (rewrite-side-conditions/check-errs
-                                        #'lang-id
-                                        (syntax-e #'form-name)
-                                        #f
-                                        rhs)) 
-                                     (syntax->list rhss)))
-                              (syntax->list (syntax ((rhs ...) ...))))]
-                        [((rhs/lw ...) ...) 
-                         (map (lambda (rhss) (map to-lw/proc (syntax->list rhss)))
-                              (syntax->list (syntax ((rhs ...) ...))))]
-                        [(refs ...)
-                         (let loop ([stx (syntax ((rhs ...) ...))])
-                           (cond
-                             [(identifier? stx)
-                              (if (ormap (λ (x) (bound-identifier=? x stx)) 
-                                         all-names)
-                                  (list stx)
-                                  '())]
-                             [(syntax? stx)
-                              (loop (syntax-e stx))]
-                             [(pair? stx)
-                              (append (loop (car stx))
-                                      (loop (cdr stx)))]
-                             [else '()]))])
-            (check-for-cycles stx #'(name ...) #'((r-rhs ...) ...))
-            (with-syntax ([(the-stx ...) (cdr (syntax-e stx))]
-                          [(all-names ...) all-names]
-                          [((uniform-names ...) ...)
-                           (map (λ (x) (if (identifier? x) (list x) x))
-                                (syntax->list (syntax (name ...))))]
-                          [(first-names ...)
-                           (map (λ (x) (if (identifier? x) x (car (syntax->list x))))
-                                (syntax->list (syntax (name ...))))]
-                          [((new-name orig-name) ...)
-                           (apply
-                            append
-                            (map (λ (name-stx)
-                                   (if (identifier? name-stx)
-                                       '()
-                                       (let ([l (syntax->list name-stx)])
-                                         (map (λ (x) (list x (car l)))
-                                              (cdr l)))))
-                                 (syntax->list #'(name ...))))])
-              
-              ;; note: when there are multiple names for a single non-terminal,
-              ;; we build equivalent non-terminals by redirecting all except the
-              ;; first non-terminal to the first one, and then make the first one
-              ;; actually have all of the productions. This should produce better
-              ;; caching behavior and should compile faster than duplicating the
-              ;; right-hand sides.
-              (syntax/loc stx
-                (begin
-                  (let ([all-names 1] ...)
-                    (begin (void) refs ...))
-                  (compile-language (list (list '(uniform-names ...) rhs/lw ...) ...)
-                                    (list (make-nt 'first-names (list (make-rhs `r-rhs) ...)) ...
-                                          (make-nt 'new-name (list (make-rhs '(nt orig-name)))) ...)
-                                    (mk-uf-sets '((uniform-names ...) ...))))))))))]))
-
-
-(define-syntax (define-extended-language stx)
-  (syntax-case stx ()
-    [(_ name orig-lang . nt-defs)
-     (begin
-       (unless (identifier? (syntax name))
-         (raise-syntax-error 'define-extended-language "expected an identifier" stx #'name))
-       (unless (identifier? (syntax orig-lang))
-         (raise-syntax-error 'define-extended-language "expected an identifier" stx #'orig-lang))
-       (let ([old-names (language-id-nts #'orig-lang 'define-extended-language)]
-             [non-terms (parse-non-terminals #'nt-defs stx)])
-         (with-syntax* ([((names prods ...) ...) non-terms]
-                        [(all-names ...)
-                         ;; The names may have duplicates if the extended language
-                         ;; extends non-terminals in the parent language. They need
-                         ;; to be removed for `define-union-language`
-                         (remove-duplicates
-                          (apply append old-names (map car non-terms))
-                          (λ (n1 n2)
-                            (let ([n1 (if (syntax? n1) (syntax-e n1) n1)]
-                                  [n2 (if (syntax? n2) (syntax-e n2) n2)])
-                              (eq? n1 n2))))]
-                        [(define-language-name) (generate-temporaries #'(name))]
-                        [(nt-ids ...) (apply append (map car non-terms))]
-                        [uses
-                         (record-nts-disappeared-bindings #'orig-lang (syntax->list #'(nt-ids ...)) 'disappeared-use)]
-                        [bindings
-                         (record-nts-disappeared-bindings #'name (syntax->list #'(nt-ids ...)))])
-           (quasisyntax/loc stx
-             (begin
-               uses
-               bindings
-               (define define-language-name 
-                 #,(syntax/loc stx
-                     (extend-language orig-lang (all-names ...) (names prods ...) ...)))
-               (define-syntax name
-                 (make-set!-transformer
-                  (make-language-id
-                   (λ (stx)
-                     (syntax-case stx (set!)
-                       [(set! x e) (raise-syntax-error 'define-extended-language "cannot set! identifier" stx #'e)]
-                       [(x e (... ...)) #'(define-language-name e (... ...))]
-                       [x 
-                        (identifier? #'x)
-                        #'define-language-name]))
-                   '(all-names ...)
-                   (to-table #'name #'(nt-ids ...))))))))))]))
-
-
-(define-syntax (extend-language stx)
-  (syntax-case stx ()
-    [(_ lang (all-names ...) (name rhs ...) ...)
-     (with-syntax ([(((r-syncheck-expr r-rhs r-names r-names/ellipses) ...) ...)
-                    (map (lambda (rhss) (map (λ (x) (rewrite-side-conditions/check-errs
-                                                     (append (language-id-nts #'lang 'define-extended-language)
-                                                             (map syntax-e
-                                                                  (syntax->list #'(all-names ...))))
-                                                     'define-extended-language
-                                                     #f
-                                                     x))
-                                             (syntax->list rhss)))
-                         (syntax->list (syntax ((rhs ...) ...))))]
-                   [((rhs/lw ...) ...) (map (lambda (rhss) (map to-lw/proc (syntax->list rhss)))
-                                            (syntax->list (syntax ((rhs ...) ...))))]
-                   [((uniform-names ...) ...)
-                    (map (λ (x) (if (identifier? x) (list x) x))
-                         (syntax->list (syntax (name ...))))])
-       (syntax/loc stx
-         (do-extend-language (begin r-syncheck-expr ... ... lang)
-                             (list (make-nt '(uniform-names ...) (list (make-rhs `r-rhs) ...)) ...)
-                             (list (list '(uniform-names ...) rhs/lw ...) ...))))]))
-
-(define extend-nt-ellipses '(....))
-
-;; do-extend-language : compiled-lang (listof (listof nt)) ? -> compiled-lang
-;; note: the nts that come here are an abuse of the `nt' struct; they have
-;; lists of symbols in the nt-name field.
-(define (do-extend-language old-lang new-nts new-pict-infos)
-  (unless (compiled-lang? old-lang)
-    (error 'define-extended-language "expected a language as first argument, got ~e" old-lang))
-  
-  (let ([old-nts (compiled-lang-lang old-lang)]
-        [old-ht (make-hasheq)]
-        [new-ht (make-hasheq)])
-    
-    
-    (for-each (λ (nt) 
-                (hash-set! old-ht (nt-name nt) nt)
-                (hash-set! new-ht (nt-name nt) nt))
-              old-nts)
-    
-    (for-each (λ (raw-nt)
-                (let* ([names (nt-name raw-nt)]
-                       [rhs (nt-rhs raw-nt)]
-                       [primary-names (map (λ (name) (find-primary-nt name old-lang)) names)]
-                       [main-primary (car primary-names)])
-                  
-                  ;; error checking
-                  (when (and (ormap not primary-names)
-                             (ormap symbol? primary-names))
-                    (error 'define-extended-language "new language extends old non-terminal ~a and also adds new shortcut ~a"
-                           (ormap (λ (x y) (and (symbol? x) y)) primary-names names)
-                           (ormap (λ (x y) (and (not x) y)) primary-names names)))
-                  
-                  ;; error checking
-                  (when (andmap symbol? primary-names)
-                    (let ([main-orig (car names)])
-                      (let loop ([primary-names (cdr primary-names)]
-                                 [names (cdr names)])
-                        (cond
-                          [(null? primary-names) void]
-                          [else 
-                           (unless (eq? main-primary (car primary-names))
-                             (error 'define-extended-language
-                                    (string-append 
-                                     "new language does not have the same non-terminal aliases as the old,"
-                                     " non-terminal ~a was not in the same group as ~a in the old language")
-                                    (car names)
-                                    main-orig))
-                           (loop (cdr primary-names) (cdr names))]))))
-                                  
-                  
-                  ;; rebind original nt
-                  (let ([nt (make-nt (or main-primary (car names)) rhs)])
-                    (cond
-                      [(ormap (λ (rhs) (member (rhs-pattern rhs) extend-nt-ellipses))
-                              (nt-rhs nt))
-                       (unless (hash-ref old-ht (nt-name nt) #f)
-                         (error 'define-extended-language
-                                "the language extends the ~s non-terminal, but that non-terminal is not in the old language"
-                                (nt-name nt)))
-                       (hash-set! new-ht 
-                                  (nt-name nt)
-                                  (make-nt
-                                   (nt-name nt)
-                                   (append (nt-rhs (hash-ref old-ht (nt-name nt)))
-                                           (filter (λ (rhs) (not (member (rhs-pattern rhs) extend-nt-ellipses)))
-                                                   (nt-rhs nt)))))]
-                      [else
-                       (hash-set! new-ht (nt-name nt) nt)]))
-                  
-                  ;; add new shortcuts (if necessary)
-                  (unless main-primary
-                    (for-each (λ (shortcut-name)
-                                (hash-set! new-ht 
-                                           shortcut-name 
-                                           (make-nt shortcut-name (list (make-rhs `(nt ,(car names)))))))
-                              (cdr names)))))
-                  
-              new-nts)
-    
-    (compile-language (vector (compiled-lang-pict-builder old-lang)
-                              new-pict-infos)
-                      (hash-map new-ht (λ (x y) y))
-                      (compiled-lang-nt-map old-lang))))
-
-(define-syntax (define-union-language stx)
-  (syntax-case stx ()
-    [(_ name orig-langs ...)
-     (begin
-       (unless (identifier? (syntax name))
-         (raise-syntax-error 'define-extended-language "expected an identifier" stx #'name))
-       (when (null? (syntax->list #'(orig-langs ...)))
-         (raise-syntax-error 'define-union-language "expected at least one additional language" stx))
-       ;; normalized-orig-langs : (listof (list string[prefix] id (listof symbol)[nts] stx[orig clause in union]))
-       (define normalized-orig-langs
-         (for/list ([orig-lang (in-list (syntax->list #'(orig-langs ...)))])
-           (syntax-case orig-lang ()
-             [x (identifier? #'x) (list #f #'x (language-id-nts #'x 'define-union-language) orig-lang)]
-             [(prefix lang)
-              (and (identifier? #'prefix)
-                   (identifier? #'lang))
-              (list (symbol->string (syntax-e #'prefix)) #'lang (language-id-nts #'lang 'define-union-language) orig-lang)]
-             [else (raise-syntax-error 'define-union-language 
-                                       "malformed additional language"
-                                       stx orig-lang)])))
-       
-       ;; ht : sym -o> (listof stx)
-       ;; maps each non-terminal (with its prefix) to a
-       ;; list of syntax objects that they come from in the original
-       ;; define-union-language declaration 
-       (define names-table (make-hash))
-       
-       (for ([normalized-orig-lang (in-list normalized-orig-langs)])
-         (define prefix (list-ref normalized-orig-lang 0))
-         (for ([no-prefix-nt (in-list (list-ref normalized-orig-lang 2))])
-           (define nt (string->symbol (string-append (or prefix  "")
-                                                     (symbol->string no-prefix-nt))))
-           (let ([prev (hash-ref names-table nt '())])
-             (hash-set! names-table nt (cons (list-ref normalized-orig-lang 3) prev)))))
-       
-       (with-syntax ([(all-names ...) (sort (hash-map names-table (λ (x y) x)) string<=? #:key symbol->string)]
-                     [((prefix old-lang _1 _2) ...) normalized-orig-langs]
-                     [(define-language-name) (generate-temporaries #'(name))])
-         #'(begin
-             (define define-language-name (union-language (list (list 'prefix old-lang) ...)))
-             (define-syntax name
-               (make-set!-transformer
-                (make-language-id
-                 (λ (stx)
-                   (syntax-case stx (set!)
-                     [(set! x e) (raise-syntax-error 'define-extended-language "cannot set! identifier" stx #'e)]
-                     [(x e (... ...)) #'(define-language-name e (... ...))]
-                     [x 
-                      (identifier? #'x)
-                      #'define-language-name]))
-                 '(all-names ...)
-                 (to-table #'name #'())))))))]))
-
-(define (union-language old-langs/prefixes)
-  
-  (define (add-prefix prefix sym)
-    (if prefix
-        (string->symbol
-         (string-append prefix
-                        (symbol->string sym)))
-        sym))
-  
-  ;; nt-maps-with-prefixes : (listof hash[symbol -o> uf-set?])
-  ;; add prefixes on the canonical elements and in the
-  ;; hash-table domains
-  (define nt-maps-with-prefixes
-    (for/list ([old-pr (in-list old-langs/prefixes)])
-      (define prefix (list-ref old-pr 0))
-      (define nt-map (compiled-lang-nt-map (list-ref old-pr 1)))
-      (cond
-        [prefix
-         (define already-prefixed '())
-         (for/hash ([(nt a-uf-set) (in-hash nt-map)])
-           (define already-prefixed?
-             (for/or ([x (in-list already-prefixed)])
-               (uf-same-set? x a-uf-set)))
-           (unless already-prefixed?
-             (uf-set-canonical! a-uf-set (add-prefix prefix (uf-find a-uf-set)))
-             (set! already-prefixed (cons a-uf-set already-prefixed)))
-           (values (add-prefix prefix nt) a-uf-set))]
-        [else nt-map])))
-
-  ;; combine all of the nt-maps into a single one,
-  ;; unioning the sets as approrpriate
-  (define new-nt-map (car nt-maps-with-prefixes))
-  (for ([nt-map (in-list (cdr nt-maps-with-prefixes))])
-    (for ([(k this-uf-set) (in-hash nt-map)])
-      (define final-uf-set (hash-ref new-nt-map k #f))
-      (cond
-        [final-uf-set 
-         (uf-union! final-uf-set this-uf-set)]
-        [else
-         (set! new-nt-map (hash-set new-nt-map k this-uf-set))])))
-  
-  (define names-table (make-hash))
-  (for ([old-lang/prefix (in-list old-langs/prefixes)])
-    (define prefix (list-ref old-lang/prefix 0))
-    (define lang (compiled-lang-lang (list-ref old-lang/prefix 1)))
-    (for ([nt (in-list lang)])
-      (define name (add-prefix prefix (nt-name nt)))
-      (define new-rhses
-        (for/set ([rhs (in-list (nt-rhs nt))])
-          (if prefix 
-              (make-rhs (prefix-nts prefix (rhs-pattern rhs)))
-              rhs)))
-      (hash-set! names-table 
-                 name
-                 (set-union new-rhses (hash-ref names-table name (set))))))
-  
-  (compile-language #f
-                    (hash-map names-table (λ (name set) (make-nt name (set->list set))))
-                    new-nt-map))
-
-
-;; find-primary-nt : symbol lang -> symbol or #f
-;; returns the primary non-terminal for a given nt, or #f if `nt' isn't bound in the language.
-(define (find-primary-nt nt lang)
-  (define uf/f (hash-ref (compiled-lang-nt-map lang) nt #f))
-  (and uf/f
-       (uf-find uf/f)))
-
-(define (apply-reduction-relation* reductions exp 
-                                   #:cache-all? [cache-all? (current-cache-all?)]
-                                   #:stop-when [stop-when (λ (x) #f)])
-  (let-values ([(results cycle?) (traverse-reduction-graph reductions exp
-                                                           #:cache-all? cache-all?
-                                                           #:stop-when stop-when)])
-    results))
-
-(struct search-success ())
-(struct search-failure (cutoff?))
-
-;; traverse-reduction-graph : 
-;;  reduction-relation term #:goal (-> any boolean?) #:steps number? #:visit (-> any/c void?) -> (or/c search-success? search-failure?)
-;;  reduction-relation term #:goal #f                #:steps number? #:visit (-> any/c void?) -> (values (listof any/c) boolean?)
-(define (traverse-reduction-graph reductions start #:goal [goal? #f] #:steps [steps +inf.0] #:visit [visit void] 
-                                  #:cache-all? [cache-all? (current-cache-all?)]
-                                  #:stop-when [stop-when (λ (x) #f)])
-  (define visited (and cache-all? (make-hash)))
-  (let/ec return
-    (let ([answers (make-hash)]
-          [cycle? #f]
-          [cutoff? #f])
-      (let loop ([term start]
-                 ;; It would be better to record all visited terms, to avoid traversing
-                 ;; any part of the graph multiple times. Results from 
-                 ;;    collects/redex/trie-experiment
-                 ;; in commit
-                 ;;    152084d5ce6ef49df3ec25c18e40069950146041
-                 ;; suggest that a hash works better than a trie.
-                 [path (make-immutable-hash '())]
-                 [more-steps steps])
-        (if (and goal? (goal? term))
-            (return (search-success))
-            (cond
-              [(hash-ref path term #f)
-               (set! cycle? #t)]
-              [else
-               (visit term)
-               (cond
-                 [(stop-when term)
-                  (unless goal? 
-                    (hash-set! answers term #t))]
-                 [else
-                  (define nexts (apply-reduction-relation reductions term))
-                  (cond
-                    [(null? nexts) 
-                     (unless goal? 
-                       (hash-set! answers term #t))]
-                    [else (if (zero? more-steps)
-                              (set! cutoff? #t)
-                              (for ([next (in-list (remove-duplicates nexts))])
-                                (when (or (not visited)
-                                          (not (hash-ref visited next #f)))
-                                  (when visited (hash-set! visited next #t))
-                                  (loop next 
-                                        (hash-set path term #t) 
-                                        (sub1 more-steps)))))])])])))
-      (if goal?
-          (search-failure cutoff?)
-          (values (sort (hash-map answers (λ (x y) x))
-                        string<=?
-                        #:key (λ (x) (format "~s" x)))
-                  cycle?)))))
-
-(define current-cache-all? (make-parameter #f))
-
-;; map/mt : (a -> b) (listof a) (listof b) -> (listof b)
-;; map/mt is like map, except
-;;  a) it uses the last argument instead of the empty list
-;;  b) if `f' returns #f, that is not included in the result
-(define (map/mt f l mt-l)
-  (let loop ([l l])
-    (cond
-      [(null? l) mt-l]
-      [else
-       (let ([this-one (f (car l))])
-         (if this-one
-             (cons this-one (loop (cdr l)))
-             (loop (cdr l))))])))
-
-(define (reduction-relation->rule-names x) 
-  (reverse (reduction-relation-rule-names x)))
-
-
-;                                                                               
-;                                                                               
-;                                                                               
-;      ;                     ;                         ;;     ;                 
-;     ;;                    ;;                         ;;    ;;                 
-;   ;;;;;   ;;;    ;;;;;  ;;;;;      ;;;;; ;;;; ;;;;       ;;;;;   ;;;    ;;;;; 
-;  ;;;;;;  ;;;;;  ;;;;;; ;;;;;;     ;;;;;; ;;;; ;;;; ;;;; ;;;;;;  ;;;;;  ;;;;;; 
-;   ;;;;  ;;;; ;; ;;;;    ;;;;      ;;;;   ;;;; ;;;; ;;;;  ;;;;  ;;;; ;; ;;;;   
-;   ;;;;  ;;;;;;;  ;;;;   ;;;;       ;;;;  ;;;; ;;;; ;;;;  ;;;;  ;;;;;;;  ;;;;  
-;   ;;;;; ;;;;;     ;;;;  ;;;;;       ;;;; ;;;; ;;;; ;;;;  ;;;;; ;;;;;     ;;;; 
-;   ;;;;;  ;;;;;; ;;;;;;  ;;;;;     ;;;;;; ;;;;;;;;; ;;;;  ;;;;;  ;;;;;; ;;;;;; 
-;    ;;;;   ;;;;  ;;;;;    ;;;;     ;;;;;   ;;; ;;;; ;;;;   ;;;;   ;;;;  ;;;;;  
-;                                                                               
-;                                                                               
-;                                                                               
-
-(define tests 0)
-(define test-failures 0)
-(define (inc-failures) (set! test-failures (+ test-failures 1)))
-(define (inc-tests) (set! tests (+ tests 1)))
-
-(define (test-results)
-  (cond
-    [(= tests 0)
-     (printf "No tests run.\n")]
-    [(= test-failures 0)
-     (cond
-       [(= tests 1)
-        (printf "One test passed.\n")]
-       [(= tests 2)
-        (printf "Both tests passed.\n")]
-       [else
-        (printf "All ~a tests passed.\n" tests)])]
-    [else
-     (printf "~a test~a failed (out of ~a total).\n"
-             test-failures
-             (if (= test-failures 1) "" "s")
-             tests)])
-  (set! tests 0)
-  (set! test-failures 0))
-
-(define-for-syntax (get-srcloc stx)
-  #`(list 
-     '#,(and (path? (syntax-source stx))
-             (path->relative-string/library (syntax-source stx)))
-     '#,(syntax-line stx)
-     '#,(syntax-column stx)
-     '#,(syntax-position stx)))
-
-(define-for-syntax test-equiv-ctc
-  #'(-> any/c any/c any/c))
-(define-for-syntax test-equiv-name
-  "#:equiv argument")
-(define-for-syntax test-equiv-default
-  #'(default-equiv))
-
-(define-syntax (test-->> stx)
-  (syntax-parse stx
-    [(form red:expr
-           (~or (~optional (~seq (~and #:cycles-ok (~bind [cycles-ok? #t])))
-                           #:defaults ([cycles-ok? #f])
-                           #:name "#:cycles-ok argument")
-                (~optional (~seq #:equiv equiv?)
-                           #:defaults ([equiv?.c test-equiv-default])
-                           #:name test-equiv-name)
-                (~optional (~seq #:pred pred)
-                           #:defaults ([pred #f])
-                           #:name "#:pred argument"))
-           ...
-           e1:expr
-           e2:expr ...)
-     #:declare equiv? (expr/c test-equiv-ctc #:name test-equiv-name)
-     #`(test-->>/procs 'test-->> red e1 (list e2 ...) 
-                       traverse-reduction-graph
-                       #,(attribute cycles-ok?)
-                       equiv?.c
-                       #,(attribute pred)
-                       #,(get-srcloc stx))]))
-
-(define-syntax (test--> stx)
-  (syntax-parse stx
-    [(form red:expr
-           (~optional (~seq #:equiv equiv?)
-                      #:defaults ([equiv?.c test-equiv-default]))
-           e1:expr
-           e2:expr ...)
-     #:declare equiv? (expr/c test-equiv-ctc #:name test-equiv-name)
-     #`(test-->>/procs 'test--> red e1 (list e2 ...) apply-reduction-relation/dummy-second-value #t equiv?.c #f #,(get-srcloc stx))]))
-
-(define (apply-reduction-relation/dummy-second-value red arg #:visit visit)
-  (values (apply-reduction-relation red arg) #f))
-
-(define (test-->>/procs name red arg expected apply-red cycles-ok? equiv? pred srcinfo)
-  (unless (reduction-relation? red)
-    (error name "expected a reduction relation as first argument, got ~e" red))
-  (when pred
-    (unless (and (procedure? pred)
-                 (procedure-arity-includes? pred 1))
-      (error 'test-->> "expected a procedure that accepted one argument for the #:pred, got ~e" pred)))
-  (inc-tests)
-  (define visit-already-failed? #f)
-  (define (visit t)
-    (when pred
-      (unless visit-already-failed?
-        (unless (pred t)
-          (set! visit-already-failed? #t)
-          (inc-failures)
-          (print-failed srcinfo)
-          (eprintf "found a term that failed #:pred: ~v\n" t)))))
-  (let-values ([(got got-cycle?) (apply-red red arg #:visit visit)])
-    
-    (cond
-      [(and got-cycle?
-            (not cycles-ok?))
-       (inc-failures)
-       (print-failed srcinfo)
-       (eprintf "found a cycle in the reduction graph\n")]
-      [else
-       (unless visit-already-failed?
-         (let* ([⊆ (λ (s1 s2) (andmap (λ (x1) (memf (λ (x) (equiv? x1 x)) s2)) s1))]
-                [set-equal? (λ (s1 s2) (and (⊆ s1 s2) (⊆ s2 s1)))])
-           (unless (set-equal? expected got)
-             (inc-failures)
-             (print-failed srcinfo)
-             (for-each
-              (λ (v2) (eprintf "expected: ~v\n" v2))
-              expected)
-             (if (empty? got)
-                 (eprintf "got nothing\n")
-                 (for-each
-                  (λ (v1) (eprintf "  actual: ~v\n" v1))
-                  got)))))])))
-
-(define-syntax (test-->>∃ stx)
-  (syntax-parse stx
-    [(form (~optional (~seq #:steps steps) #:defaults ([steps.c #'1000]))
-           relation
-           start:expr
-           goal)
-     #:declare relation (expr/c #'reduction-relation? 
-                                #:name "reduction relation expression")
-     #:declare goal (expr/c #'(or/c (-> any/c any/c) (not/c procedure?)) 
-                            #:name "goal expression")
-     #:declare steps (expr/c #'(or/c natural-number/c +inf.0) 
-                             #:name "steps expression")
-     #`(test-->>∃/proc relation.c start goal.c steps.c #,(get-srcloc stx))]))
-
-(define (test-->>∃/proc relation start goal steps srcinfo)
-  (let ([result (traverse-reduction-graph 
-                 relation
-                 start 
-                 #:goal (if (procedure? goal) goal (λ (x) (equal? goal x)))
-                 #:steps steps)])
-    (inc-tests)
-    (when (search-failure? result)
-      (print-failed srcinfo)
-      (inc-failures)
-      (begin
-        (if (procedure? goal)
-            (eprintf "no term satisfying ~a reachable from ~a" goal start)
-            (eprintf "term ~a not reachable from ~a" goal start))
-        (when (search-failure-cutoff? result)
-          (eprintf " (within ~a steps)" steps))
-        (newline (current-error-port))))))
-
-(define-syntax (test-predicate stx)
-  (syntax-case stx ()
-    [(_ p arg)
-     #`(test-predicate/proc p arg #,(get-srcloc stx))]))
-
-(define (test-predicate/proc pred arg srcinfo)
-  (inc-tests)
-  (unless (pred arg)
-    (inc-failures)
-    (print-failed srcinfo)
-    (eprintf "  ~v does not hold for\n  ~v\n" 
-             pred arg)))
-
-(define default-equiv (make-parameter equal?))
-
-(define-syntax (test-equal stx)
-  (syntax-case stx ()
-    [(_ e1 e2)
-     #`(test-equal/proc e1 e2 #,(get-srcloc stx) #,test-equiv-default)]
-    [(_ e1 e2 #:equiv ~equal?)
-     #`(test-equal/proc e1 e2 #,(get-srcloc stx) ~equal?)]))
-
-(define (test-equal/proc v1 v2 srcinfo equal?)
-  (inc-tests)
-  (unless (equal? v1 v2)
-    (inc-failures)
-    (print-failed srcinfo)
-    (eprintf "  actual: ~v\n" v1)
-    (eprintf "expected: ~v\n" v2)))
-
-(define (print-failed srcinfo)
-  (let ([file (list-ref srcinfo 0)]
-        [line (list-ref srcinfo 1)]
-        [column (list-ref srcinfo 2)]
-        [pos (list-ref srcinfo 3)])
-    (eprintf "FAILED ~a~a\n"
-             (cond
-               [(string? file) file]
-               [else ""])
-             (cond
-               [(and line column)
-                (format ":~a.~a" line column)]
-               [pos 
-                (format "::~a" pos)]
-               [else #f]))))
-
-(provide (rename-out [-reduction-relation reduction-relation])
-         ::=
-         reduction-relation->rule-names
-         extend-reduction-relation
-         reduction-relation?
-         union-reduction-relations
-         
-         compatible-closure
-         context-closure
-         
-         define-language
-         define-extended-language
-         define-union-language
-         
-         define-metafunction
-         define-metafunction/extension
-         define-relation
-         
-         (rename-out [metafunction-form metafunction])
-         metafunction? metafunction-proc
-         in-domain?
-         metafunc-proc-lang
-         metafunc-proc-clause-names
-         metafunc-proc-pict-info
-         metafunc-proc-name
-         metafunc-proc-multi-arg?
-         metafunc-proc-in-dom?
-         metafunc-proc-dom-pat
-         metafunc-proc-cases
-         metafunc-proc?
-         (struct-out metafunc-case)
-         
-         (struct-out binds))
-
-(provide test-match
-         test-match?
-         term-match
-         term-match/single
-         redex-let 
-         redex-let*
-         make-bindings bindings-table bindings?
-         match? match-bindings
-         make-bind bind? bind-name bind-exp
-         make-match
-         
-         test-equal
-         test-->>
-         test-->
-         test-->>∃ (rename-out [test-->>∃ test-->>E])
-         test-predicate
-         test-results
-         default-equiv)
-
-
-(provide language-nts
-         apply-reduction-relation
-         apply-reduction-relation/tag-with-names
-         apply-reduction-relation/tagged
-         apply-reduction-relation*
-         current-cache-all?
-         variable-not-in
-         variables-not-in)
-
-(provide relation-coverage
-         covered-cases
-         (rename-out [fresh-coverage make-coverage])
-         coverage?)
-
-(provide do-test-match)
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/rewrite-side-conditions.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/rewrite-side-conditions.rkt
deleted file mode 100644
index c96a950423..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/rewrite-side-conditions.rkt
+++ /dev/null
@@ -1,590 +0,0 @@
-#lang racket/base
-
-  (require "underscore-allowed.rkt"
-           "term.rkt"
-           "term-fn.rkt"
-           setup/path-to-relative
-           (for-template
-            racket/base
-            "term.rkt"
-            "matcher.rkt"))
-  
-  (provide rewrite-side-conditions/check-errs
-           extract-names
-           (rename-out [binds? id-binds?])
-           raise-ellipsis-depth-error
-           make-language-id
-           language-id-nts
-           bind-pattern-names)
-  
-  (provide (struct-out id/depth))
-  
-  ;; the result is a four-tuple (as a list) syntax object
-  ;; - the first is an ordinary expression that evaluates
-  ;;   to (void), but tells check syntax about binding information
-  ;; - the second is an expression that, when prefixed with a
-  ;;   quasiquote, evaluates to a pattern that can be used with
-  ;;   match-a-pattern (at runtime).
-  (define (rewrite-side-conditions/check-errs all-nts/lang-id what bind-names? orig-stx)
-    (define all-nts (if (identifier? all-nts/lang-id)
-                        (language-id-nts all-nts/lang-id what)
-                        all-nts/lang-id))
-    (define id-stx-table (if (identifier? all-nts/lang-id)
-                             (language-id-nt-identifiers all-nts/lang-id #f)
-                             (hash)))
-    (define (expected-exact name n stx)
-      (raise-syntax-error what (format "~a expected to have ~a arguments" 
-                                       name
-                                       n)
-                          orig-stx 
-                          stx))
-    (define (expected-arguments name stx)
-      (raise-syntax-error what (format "~a expected to have arguments" name) orig-stx stx))
-    (define (expect-identifier src stx)
-      (unless (identifier? stx)
-        (raise-syntax-error what "expected an identifier" src stx)))
-    
-    ; union-find w/o balancing or path compression (at least for now)
-    (define (union e f sets)
-      (hash-set sets (find f sets) (find e sets)))
-    (define (find e sets)
-      (let recur ([chd e] [par (hash-ref sets e #f)])
-        (if (and par (not (eq? chd par))) (recur par (hash-ref sets par #f)) chd)))
-    
-    (define void-stx #'(void))
-    
-    (define last-contexts (make-hasheq))
-    (define last-stx (make-hasheq)) ;; used for syntax error reporting
-    (define assignments #hasheq())
-
-    ;; hash[sym -o> (listof stx)]
-    (define var-locs-table (make-hash))
-    
-    ;; hash[sym -o> sym]
-    ;; tells the original names for any given repeat to be replaced after
-    ;; normalization and checking has finished
-    (define original-repeat-names (make-hash))
-    
-    (define (record-binder pat-stx under under-mismatch-ellipsis)
-      (define pat-sym (syntax->datum pat-stx))
-      (hash-set! var-locs-table pat-sym (cons pat-stx (hash-ref var-locs-table pat-sym '())))
-      
-      (set! assignments
-            (if (null? under)
-                assignments
-                (let ([last (hash-ref last-contexts pat-sym #f)])
-                  (hash-set! last-stx pat-sym (cons pat-stx (hash-ref last-stx pat-sym '())))
-                  (cond
-                    [last
-                     (unless (equal? (length last) (length under))
-                       (define stxs (hash-ref last-stx pat-sym))
-                       (raise-syntax-error
-                        what
-                        (format "found ~a under ~a ellips~as in one place and ~a ellips~as in another"
-                                pat-sym
-                                (length last)
-                                (if (= 1 (length last)) "i" "e")
-                                (length under)
-                                (if (= 1 (length under)) "i" "e"))
-                        orig-stx
-                        (car stxs)
-                        (cdr stxs)))
-                     (foldl (λ (cur last asgns) (union cur last asgns)) assignments under last)]
-                    [else
-                     (hash-set! last-contexts pat-sym under)
-                     assignments])))))
-    
-    (define (record-syncheck-use stx nt)
-      (define the-use (build-disappeared-use id-stx-table nt stx))
-      (when the-use
-        (define old (syntax-property void-stx 'disappeared-use))
-        (set! void-stx
-              (syntax-property void-stx
-                               'disappeared-use
-                               (if old (cons the-use old) the-use)))))
-
-    (define ellipsis-number 0)
-    
-    (define-values (term names)
-      (let loop ([term orig-stx]
-                 [under '()]
-                 [under-mismatch-ellipsis '()])
-        (syntax-case term (side-condition variable-except variable-prefix
-                                          hole name in-hole hide-hole cross unquote and)
-          [(side-condition pre-pat (and))
-           ;; rewriting metafunctions (and possibly other things) that have no where, etc clauses
-           ;; end up with side-conditions that are empty 'and' expressions, so we just toss them here.
-           (loop #'pre-pat under under-mismatch-ellipsis)]
-          [(side-condition pre-pat exp)
-           (let ()
-             (define-values (pre-term pre-vars) (loop #'pre-pat under under-mismatch-ellipsis))
-             (define names/ellipses (map build-dots pre-vars))
-             (with-syntax ([pre-term pre-term]
-                           [((name name/ellipses) ...)
-                            (map (λ (id name/ellipses)
-                                   (list (id/depth-id id)
-                                         name/ellipses))
-                                 pre-vars
-                                 names/ellipses)]
-                           [src-loc 
-                            (let ([stx #'exp])
-                              (define src (syntax-source stx))
-                              (define line (syntax-line stx))
-                              (define col (syntax-column stx))
-                              (format "~a:~a" 
-                                      (if (path? src)
-                                          (path->relative-string/library src)
-                                          "?")
-                                      (if (and line col)
-                                          (format "~a:~a" line col)
-                                          (if line
-                                              (format "~a:?" line)
-                                              (syntax-position stx)))))])
-               (values (syntax/loc (if (syntax? term)
-                                       term
-                                       (datum->syntax #f 'whatever #f))
-                         (side-condition
-                          pre-term
-                          ,(lambda (bindings)
-                             (term-let
-                              ([name/ellipses (lookup-binding bindings 'name)] ...)
-                              exp))
-                          ; For use in error messages.
-                          src-loc))
-                       pre-vars)))]
-          [(side-condition a ...) (expected-exact 'side-condition 2 term)]
-          [side-condition (expected-arguments 'side-condition term)]
-          [(variable-except a ...)
-           (begin
-             (for ([a (in-list (syntax->list #'(a ...)))])
-               (expect-identifier term a))
-             (values term '()))]
-          [variable-except (expected-arguments 'variable-except term)]
-          [(variable-prefix a)
-           (begin
-             (expect-identifier term #'a)
-             (values term '()))]
-          [(variable-prefix a ...) (expected-exact 'variable-prefix 1 term)]
-          [variable-prefix (expected-arguments 'variable-prefix term)]
-          [hole (values term '())]
-          [(name x y)
-           (let ()
-             (define-values (sub-term sub-vars) (loop #'y under under-mismatch-ellipsis))
-             (record-binder #'x under under-mismatch-ellipsis)
-             (values #`(name x #,sub-term)
-                     (cons (make-id/depth #'x (length under))
-                           sub-vars)))]
-          [(name x ...) (expected-exact 'name 2 term)]
-          [name (expected-arguments 'name term)]
-          [(in-hole a b)
-           (let ()
-             (define-values (a-term a-vars) (loop #'a under under-mismatch-ellipsis))
-             (define-values (b-term b-vars) (loop #'b under under-mismatch-ellipsis))
-             (values #`(in-hole #,a-term #,b-term)
-                     (append a-vars b-vars)))]
-          [(in-hole a ...) (expected-exact 'in-hole 2 term)]
-          [in-hole (expected-arguments 'in-hole term)]
-          [(hide-hole a) 
-           (let ()
-             (define-values (sub-term vars) (loop #'a under under-mismatch-ellipsis))
-             (values #`(hide-hole #,sub-term) vars))]
-          [(hide-hole a ...) (expected-exact 'hide-hole 1 term)]
-          [hide-hole (expected-arguments 'hide-hole term)]
-          [(cross a)
-           (let ()
-             (expect-identifier term #'a)
-             (define a-str (symbol->string (syntax-e #'a)))
-             (values #`(cross #,(string->symbol (format "~a-~a" a-str a-str)))
-                     '()))]
-          [(cross a ...) (expected-exact 'cross 1 term)]
-          [cross (expected-arguments 'cross term)]
-          [(unquote . _)
-           (raise-syntax-error what "unquote disallowed in patterns" orig-stx term)]
-          [_
-           (identifier? term)
-           (let ()
-             (define m (regexp-match #rx"^([^_]*)_(.*)$" (symbol->string (syntax-e term))))
-             (cond
-               [m
-                (define prefix (list-ref m 1))
-                (define suffix (list-ref m 2))
-                (define suffix-sym (string->symbol suffix))
-                (define prefix-sym (string->symbol prefix))
-                (define prefix-stx (datum->syntax term prefix-sym))
-                (define mismatch? (regexp-match? #rx"^!_" suffix))
-                (cond
-                  [(eq? (syntax-e term) '_) (values `any '())] ;; don't bind wildcard
-                  [(eq? prefix-sym '...)
-                   (raise-syntax-error 
-                    what
-                    "found an ellipsis outside of a sequence"
-                    orig-stx
-                    term)]
-                  [(memq prefix-sym all-nts)
-                   (record-binder term under under-mismatch-ellipsis)
-                   (record-syncheck-use term prefix-sym)
-                   (if mismatch?
-                       (values `(mismatch-name ,term (nt ,prefix-stx))
-                               '())
-                       (values `(name ,term (nt ,prefix-stx))
-                               (list (make-id/depth term (length under)))))]
-                  [(memq prefix-sym underscore-allowed)
-                   (record-binder term under under-mismatch-ellipsis)
-                   (if mismatch?
-                       (values `(mismatch-name ,term ,prefix-stx)
-                               '())
-                       (values `(name ,term ,prefix-stx)
-                               (list (make-id/depth term (length under)))))]
-                  [else
-                   (raise-syntax-error
-                    what
-                    (format (string-append "before underscore must be either a"
-                                           " non-terminal or a built-in pattern, found ~a in ~s")
-                            prefix-sym (syntax-e term))
-                    orig-stx 
-                    term)])]
-               [(eq? (syntax-e term) '...)
-                (raise-syntax-error 
-                 what
-                 "found an ellipsis outside of a sequence"
-                 orig-stx
-                 term)]
-               [(memq (syntax-e term) all-nts)
-                (record-syncheck-use term (syntax-e term))
-                (cond
-                  [bind-names?
-                   (record-binder term under under-mismatch-ellipsis)
-                   (values `(name ,term (nt ,term)) (list (make-id/depth term (length under))))]
-                  [else
-                   (values `(nt ,term) '())])]
-               [(memq (syntax-e term) underscore-allowed)
-                (cond
-                  [bind-names?
-                   (record-binder #'term under under-mismatch-ellipsis)
-                   (values `(name ,term ,term) (list (make-id/depth term (length under))))]
-                  [else
-                   (values term '())])]
-               [else
-                (values term '())]))]
-          [(terms ...)
-           (let ()
-             (define terms-lst (syntax->list #'(terms ...)))
-             (define (is-ellipsis? term)
-               (and (identifier? term)
-                    (regexp-match? #rx"^[.][.][.]" (symbol->string (syntax-e term)))))
-             (when (and (pair? terms-lst) (is-ellipsis? (car terms-lst)))
-               (raise-syntax-error what
-                                   "ellipsis should not appear in the first position of a sequence"
-                                   orig-stx 
-                                   term))
-             (define-values (updated-terms vars)
-               (let t-loop ([terms terms-lst])
-                 (cond
-                   [(null? terms) (values '() '())]
-                   [(null? (cdr terms))
-                    (define-values (term vars) (loop (car terms) under under-mismatch-ellipsis))
-                    (values (list term) vars)]
-                   [(is-ellipsis? (cadr terms))
-                    (when (and (pair? (cddr terms))
-                               (is-ellipsis? (caddr terms)))
-                      (raise-syntax-error what
-                                          "two ellipses should not appear in a row"
-                                          orig-stx
-                                          (cadr terms)
-                                          (list (caddr terms))))
-                    (define ellipsis-pre-sym (syntax-e (cadr terms)))
-                    (define ellipsis-pre-str (symbol->string ellipsis-pre-sym))
-                    (define mismatch? (regexp-match? #rx"^[.][.][.]_!_" ellipsis-pre-str))
-                    (define-values (ellipsis-str was-named-ellipsis?)
-                      (cond
-                        [mismatch?
-                         (set! ellipsis-number (+ ellipsis-number 1))
-                         (values (format "..._r~a" ellipsis-number) #f)]
-                        [(regexp-match? #rx"^[.][.][.]_r" ellipsis-pre-str)
-                         (values (string-append (substring ellipsis-pre-str 0 4)
-                                                "r"
-                                                (substring ellipsis-pre-str 
-                                                           4
-                                                           (string-length ellipsis-pre-str)))
-                                 #t)]
-                        [(regexp-match? #rx"^[.][.][.]_" ellipsis-pre-str) 
-                         (values ellipsis-pre-str #t)]
-                        [else 
-                         (set! ellipsis-number (+ ellipsis-number 1))
-                         (values (format "..._r~a" ellipsis-number) #f)]))
-                    (define ellipsis-sym (string->symbol ellipsis-str))
-                    (when was-named-ellipsis? 
-                      (hash-set! original-repeat-names ellipsis-sym ellipsis-pre-sym))
-                    (define ellipsis+name (datum->syntax
-                                           (cadr terms)
-                                           (string->symbol ellipsis-str)
-                                           (cadr terms)))
-                    (record-binder ellipsis+name under under-mismatch-ellipsis)
-                    (define-values (fst-term fst-vars) 
-                      (loop (car terms) 
-                            (cons (syntax-e ellipsis+name) under)
-                            (if mismatch?
-                                (cons (syntax-e (cadr terms)) under-mismatch-ellipsis)
-                                under-mismatch-ellipsis)))
-                    (define-values (rst-terms rst-vars) (t-loop (cddr terms)))
-                    (values (cons `(repeat ,fst-term ,ellipsis+name ,(if mismatch? (cadr terms) #f))
-                                  rst-terms)
-                            (append fst-vars
-                                    (if was-named-ellipsis? 
-                                        (list (make-id/depth (cadr terms) (length under)))
-                                        '())
-                                    rst-vars))]
-                   [else
-                    (define-values (fst-term fst-vars) 
-                      (loop (car terms) under under-mismatch-ellipsis))
-                    (define-values (rst-terms rst-vars) (t-loop (cdr terms)))
-                    (values (cons fst-term rst-terms)
-                            (append fst-vars rst-vars))])))
-             (values `(list ,@updated-terms) vars))]
-          [else
-           (when (pair? (syntax-e term))
-             (let loop ([term term])
-               (cond
-                 [(syntax? term) (loop (syntax-e term))]
-                 [(pair? term) (loop (cdr term))]
-                 [(null? term) (void)]
-                 [#t
-                  (raise-syntax-error what "dotted pairs not supported in patterns" orig-stx term)])))
-           (values term '())])))
-    
-    (define closed-table
-      (make-immutable-hasheq (hash-map assignments (λ (cls _) (cons cls (find cls assignments))))))
-     
-    (define repeat-id-counts (make-hash))
-
-    (define ellipsis-normalized 
-      (let loop ([pat term])
-        (syntax-case pat (repeat)
-          [(repeat sub-pat name mismatch-name)
-           (let ()
-             (define mapped-name (hash-ref closed-table (syntax-e #'name) #f))
-             (define new-name (if mapped-name
-                                  mapped-name
-                                  (syntax-e #'name)))
-             (hash-set! repeat-id-counts new-name (+ 1 (hash-ref repeat-id-counts new-name 0)))
-             (let ([id (syntax-e #'mismatch-name)])
-               (when id
-                 (hash-set! repeat-id-counts id (+ 1 (hash-ref repeat-id-counts id 0)))))
-             #`(repeat #,(loop #'sub-pat) #,new-name mismatch-name))]
-          [(a ...)
-           (let ()
-             (define new (map loop (syntax->list #'(a ...))))
-             (if (syntax? pat)
-                 (datum->syntax pat new pat)
-                 new))]
-          [_ pat])))
-    
-    (define (raise-impossible-pattern-error pat1 pat2)
-      (define (find-pat-var pat)
-        (syntax-case pat (name)
-          [(name id pat)
-           (syntax-e #'id)]
-          [_ #f]))
-      (define pat-var1 (find-pat-var pat1))
-      (define pat-var2 (find-pat-var pat1))
-      (cond
-        [(and pat-var1 pat-var2
-              (not (equal? pat-var1 pat-var2)))
-         (define all-ids (append (hash-ref var-locs-table pat-var1 '())
-                                 (hash-ref var-locs-table pat-var2 '())))
-         (raise-syntax-error 
-          what 
-          (format 
-           (string-append "no terms match pattern;\n"
-                          " ~a and ~a are together overly constrained")
-           pat-var1 pat-var2)
-          orig-stx
-          (if (null? all-ids) #f (car all-ids))
-          (if (null? all-ids) '() (cdr all-ids)))]
-        [(or pat-var1 pat-var2)
-         =>
-         (λ (the-pat-var)
-           (define all-ids (hash-ref var-locs-table the-pat-var '()))
-           (raise-syntax-error 
-            what 
-            (format (string-append "no terms match pattern;\n"
-                                   " ~a is overly constrained")
-                    the-pat-var)
-            orig-stx
-            (if (null? all-ids) #f (car all-ids))
-            (if (null? all-ids) '() (cdr all-ids))))]
-        [else
-         (raise-syntax-error
-          what
-          "no terms match pattern"
-          orig-stx)]))
-#|
-    (printf "term\n") ((dynamic-require 'racket/pretty 'pretty-print)
-                       (syntax->datum (datum->syntax #'here term)))
-    (printf "norm\n") ((dynamic-require 'racket/pretty 'pretty-print)
-                       (syntax->datum (datum->syntax #'here ellipsis-normalized)))
-    (printf "repeat-id-counts ~s\n" repeat-id-counts)
-|#
-    
-    ;; hash[(list symbol[match-id] symbol[mismatch-id]) -o> syntax[repeat pattern]]
-    (define both-match-and-mismatch-id (make-hash))
-    
-    (define ellipsis-normalized/simplified 
-      (let loop ([pat ellipsis-normalized])
-        (syntax-case pat (repeat)
-          [(repeat sub-pat name mismatch-name)
-           (let ()
-             (define final-match-repeat-name 
-               (if (= 1 (hash-ref repeat-id-counts (syntax-e #'name)))
-                   (hash-ref original-repeat-names (syntax-e #'name) #f)
-                   #'name))
-             (define final-mismatch-repeat-name
-               (if (and (syntax-e #'mismatch-name)
-                        (= 1 (hash-ref repeat-id-counts (syntax-e #'mismatch-name))))
-                   #f
-                   #'mismatch-name))
-             (when (and (identifier? final-mismatch-repeat-name)
-                        (identifier? final-match-repeat-name))
-               (define key (list (syntax-e final-mismatch-repeat-name) 
-                                 (syntax-e final-match-repeat-name)))
-               (define already-bound (hash-ref both-match-and-mismatch-id key #f))
-               (when already-bound
-                 (raise-impossible-pattern-error already-bound #'sub-pat))
-               (hash-set! both-match-and-mismatch-id key #'sub-pat))
-             #`(repeat #,(loop #'sub-pat) 
-                       #,final-match-repeat-name
-                       #,final-mismatch-repeat-name))]
-          [(a ...)
-           (let ()
-             (define new (map loop (syntax->list #'(a ...))))
-             (if (syntax? pat)
-                 (datum->syntax pat new pat)
-                 new))]
-          [_ pat])))
-    
-    (filter-duplicates what orig-stx names)
-    
-    (with-syntax ([(name/ellipses ...) (map build-dots names)]
-                  [(name ...) (map id/depth-id names)]
-                  [term ellipsis-normalized/simplified]
-                  [void-stx void-stx])
-      #'(void-stx term (name ...) (name/ellipses ...))))
-  
-  (define-struct id/depth (id depth))
-  
-  ;; extract-names : syntax syntax -> 
-  ;;   (values (listof syntax)
-  ;;           (listof syntax[x | (x ...) | ((x ...) ...) | ...]))
-  ;; this function is obsolete and uses of it are suspect. Things should be using 
-  ;; rewrite-side-conditions/check-errs instead
-  (define (extract-names all-nts what bind-names? orig-stx [mode 'rhs-only])
-    (let* ([dups
-            (let loop ([stx orig-stx]
-                       [names null]
-                       [depth 0])
-              (syntax-case stx (name in-hole side-condition cross nt)
-                [(name sym pat)
-                 (identifier? (syntax sym))
-                 (loop (syntax pat) 
-                       (cons (make-id/depth (syntax sym) depth) names)
-                       depth)]
-                [(in-hole pat1 pat2)
-                 (loop (syntax pat1)
-                       (loop (syntax pat2) names depth)
-                       depth)]
-                [(side-condition pat . rest)
-                 (loop (syntax pat) names depth)]
-                [(cross _) names]
-                [(pat ...)
-                 (let i-loop ([pats (syntax->list (syntax (pat ...)))]
-                              [names names])
-                   (cond
-                     [(null? pats) names]
-                     [else 
-                      (if (or (null? (cdr pats))
-                              (not (identifier? (cadr pats)))
-                              (not (or (free-identifier=? (quote-syntax ...)
-                                                          (cadr pats))
-                                       (let ([inside (syntax-e (cadr pats))])
-                                         (regexp-match #rx"^\\.\\.\\._" (symbol->string inside))))))
-                          (i-loop (cdr pats)
-                                  (loop (car pats) names depth))
-                          (i-loop (cdr pats)
-                                  (loop (car pats) names (+ depth 1))))]))]
-                [x
-                 (and (identifier? (syntax x))
-                      ((case mode
-                         [(rhs-only) binds-in-right-hand-side?]
-                         [(binds-anywhere) binds?])
-                       all-nts bind-names? (syntax x)))
-                 (cons (make-id/depth (syntax x) depth) names)]
-                [else names]))]
-           [no-dups (filter-duplicates what orig-stx dups)])
-      (values (map id/depth-id no-dups)
-              (map build-dots no-dups))))
-  
-  ;; build-dots : id/depth -> syntax[x | (x ...) | ((x ...) ...) | ...]
-  (define (build-dots id/depth)
-    (let loop ([depth (id/depth-depth id/depth)])
-      (cond
-        [(zero? depth) (id/depth-id id/depth)]
-        [else (with-syntax ([rest (loop (- depth 1))]
-                            [dots (quote-syntax ...)])
-                (syntax (rest dots)))])))
-  
-  (define (binds? nts bind-names? x)
-    (and (not (eq? '_ (syntax-e x)))
-         (or (and bind-names? (memq (syntax-e x) nts))
-             (and bind-names? (memq (syntax-e x) underscore-allowed))
-             (regexp-match #rx"_" (symbol->string (syntax-e x))))))
-  
-  (define (binds-in-right-hand-side? nts bind-names? x)
-    (and (binds? nts bind-names? x)
-         (let ([str (symbol->string (syntax-e x))])
-           (and (not (regexp-match #rx"^\\.\\.\\._" str))
-                (not (regexp-match #rx"_!_" str))))))
-  
-  (define (raise-ellipsis-depth-error what 
-                                      one-binder 
-                                      one-depth 
-                                      another-binder 
-                                      another-depth
-                                      [orig-stx #f])
-    (raise-syntax-error
-     what
-     (format "found the same binder, ~s, at different depths, ~a and ~a"
-             (syntax->datum one-binder)
-             one-depth
-             another-depth)
-     orig-stx
-     another-binder
-     (list one-binder)))
-  
-  (define (filter-duplicates what orig-stx dups)
-    (let loop ([dups dups])
-      (cond
-        [(null? dups) null]
-        [else 
-         (cons
-          (car dups)
-          (filter (lambda (x) 
-                    (let ([same-id? (free-identifier=? (id/depth-id x)
-                                                       (id/depth-id (car dups)))])
-                      (when same-id?
-                        (unless (equal? (id/depth-depth x)
-                                        (id/depth-depth (car dups)))
-                          (raise-ellipsis-depth-error
-                           what 
-                           (id/depth-id x) (id/depth-depth x)
-                           (id/depth-id (car dups)) (id/depth-depth (car dups))
-                           orig-stx)))
-                      (not same-id?)))
-                  (loop (cdr dups))))])))
-
-  (define (bind-pattern-names err-name names/ellipses vals body)
-    (with-syntax ([(names/ellipsis ...) names/ellipses]
-                  [(val ...) vals])
-      #`(term-let/error-name
-         #,err-name
-         ([names/ellipsis val] ...) 
-         #,body)))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/rg.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/rg.rkt
deleted file mode 100644
index 3aeb1aa06e..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/rg.rkt
+++ /dev/null
@@ -1,802 +0,0 @@
-#lang racket/base
-
-(require "matcher.rkt"
-         "lang-struct.rkt"
-         "reduction-semantics.rkt"
-         "underscore-allowed.rkt"
-         "error.rkt"
-         "struct.rkt"
-         "match-a-pattern.rkt"
-         (for-syntax "reduction-semantics.rkt")
-         racket/dict
-         racket/contract
-         racket/promise
-         racket/unit
-         racket/match
-         mrlib/tex-table)
-
-(define redex-pseudo-random-generator
-  (make-parameter (current-pseudo-random-generator)))
-(define (generator-random . arg)
-  (parameterize ([current-pseudo-random-generator (redex-pseudo-random-generator)])
-    (apply random arg)))
-
-(define (exotic-choice? [random generator-random]) (= 0 (random 5)))
-(define (use-lang-literal? [random generator-random]) (= 0 (random 20)))
-
-(define default-check-attempts (make-parameter 1000))
-
-(define ascii-chars-threshold 1000)
-(define tex-chars-threshold 1500)
-(define chinese-chars-threshold 2500)
-
-(define (pick-var lang-lits attempt [random generator-random])
-  (let ([length (add1 (random-natural 4/5 random))])
-    (string->symbol (random-string lang-lits length attempt random))))
-
-(define (pick-char attempt [random generator-random])
-  (cond [(or (< attempt ascii-chars-threshold) (not (exotic-choice? random)))
-         (let ([i (random (add1 (- (char->integer #\z) (char->integer #\a))))]
-               [cap? (zero? (random 2))])
-           (integer->char (+ i (char->integer (if cap? #\A #\a)))))]
-        [(or (< attempt tex-chars-threshold) (not (exotic-choice? random)))
-         (let ([i (random (- #x7E #x20 1))]
-               [_ (- (char->integer #\_) #x20)])
-           (integer->char (+ #x20 (if (= i _) (add1 i) i))))]
-        [(or (< attempt chinese-chars-threshold) (not (exotic-choice? random)))
-         (car (string->list (pick-from-list (map cadr tex-shortcut-table) random)))]
-        [else
-         (integer->char (+ #x4E00 (random (- #x9FCF #x4E00))))]))
-
-(define (random-string lang-lits length attempt [random generator-random])
-  (if (and (not (null? lang-lits)) (use-lang-literal? random))
-      (pick-from-list lang-lits random)
-      (list->string (build-list length (λ (_) (pick-char attempt random))))))
-
-(define (pick-any lang sexp [random generator-random]) 
-  (if (and (> (dict-count (rg-lang-non-cross lang)) 0) (zero? (random 5)))
-      (let ([nts (rg-lang-non-cross lang)])
-        (values lang (pick-from-list (dict-map nts (λ (nt _) nt)) random)))
-      (values sexp 'sexp)))
-
-(define (pick-string lang-lits attempt [random generator-random])
-  (random-string lang-lits (random-natural 1/5 random) attempt random))
-
-;; next-non-terminal-decision selects a subset of a non-terminal's productions.
-;; This implementation, the default, chooses them all, but many of the
-;; generator's test cases restrict the productions.
-(define pick-nts values)
-
-(define (pick-from-list l [random generator-random])
-  (list-ref l (random (length l))))
-
-;; Chooses a random (exact) natural number from the "shifted" geometric distribution:
-;;   P(random-natural = k) = p(1-p)^k
-;;
-;; P(random-natural >= k) = (1-p)^(k+1)
-;; E(random-natural) = (1-p)/p
-;; Var(random-natural) = (1-p)/p^2
-(define (random-natural p [random generator-random])
-  (sub1 (inexact->exact (ceiling (real-part (/ (log (random)) (log (- 1 p))))))))
-
-(define (negative? random)
-  (zero? (random 2)))
-
-(define (random-integer p [random generator-random])
-  (* (if (negative? random) -1 1) (random-natural p random)))
-
-(define (random-rational p [random generator-random])
-  (/ (random-integer p random) (add1 (random-natural p random))))
-
-(define (random-real p [random generator-random])
-  (* (random) 2 (random-integer p random)))
-
-(define (random-complex p [random generator-random])
-  (let ([randoms (list random-integer random-rational random-real)])
-    (make-rectangular ((pick-from-list randoms random) p random) 
-                      ((pick-from-list randoms random) p random))))
-
-(define integer-threshold 100)
-(define rational-threshold 500)
-(define real-threshold 1000)
-(define complex-threshold 2000)
-
-(define default-retries 100)
-(define retry-threshold (max chinese-chars-threshold complex-threshold))
-(define proportion-before-threshold 9/10)
-(define proportion-at-size 1/10)
-(define post-threshold-incr 50)
-
-;; Determines the parameter p for which random-natural's expected value is E
-(define (expected-value->p E)
-  ;; E = 0 => p = 1, which breaks random-natural
-  (/ 1 (+ (max 1 E) 1)))
-
-; Determines a size measure for numbers, sequences, etc., using the
-; attempt count.
-(define default-attempt-size
-  (λ (n) (inexact->exact (floor (/ (log (add1 n)) (log 5))))))
-(define attempt-size/c
-  (-> natural-number/c natural-number/c))
-(define attempt->size 
-  (make-parameter default-attempt-size))
-
-(define (pick-number attempt #:top-threshold [top-threshold complex-threshold] [random generator-random])
-  (let loop ([threshold 0] 
-             [generator random-natural]
-             [levels `((,integer-threshold . ,random-integer)
-                       (,rational-threshold . ,random-rational)
-                       (,real-threshold . ,random-real)
-                       (,complex-threshold . ,random-complex))])
-    (if (or (null? levels)
-            (< attempt (caar levels))
-            (< top-threshold (caar levels))
-            (not (exotic-choice? random)))
-        (generator (expected-value->p ((attempt->size) (- attempt threshold))) random)
-        (loop (caar levels) (cdar levels) (cdr levels)))))
-
-(define (pick-natural attempt [random generator-random])
-  (pick-number attempt #:top-threshold 0 random))
-
-(define (pick-integer attempt [random generator-random])
-  (pick-number attempt #:top-threshold integer-threshold random))
-
-(define (pick-real attempt [random generator-random])
-  (pick-number attempt #:top-threshold real-threshold random))
-
-(define (pick-boolean attempt [random generator-random])
-  (zero? (random 2)))
-
-(define (pick-sequence-length size)
-  (random-natural (expected-value->p size)))
-
-(define (min-prods nt prods base-table)
-  (let* ([sizes (hash-ref base-table nt)]
-         [min-size (apply min/f sizes)])
-    (map cadr (filter (λ (x) (equal? min-size (car x))) (map list sizes prods)))))
-
-(define-struct rg-lang (non-cross delayed-cross base-cases))
-(define (rg-lang-cross x) (force (rg-lang-delayed-cross x)))
-(define (prepare-lang lang)
-  (values lang 
-          (map symbol->string (compiled-lang-literals lang))
-          (find-base-cases lang)))
-
-(define-struct (exn:fail:redex:generation-failure exn:fail:redex) ())
-(define (raise-gen-fail who what attempts)
-  (let ([str (format "~a: unable to generate ~a in ~a attempt~a" 
-                     who what attempts (if (= attempts 1) "" "s"))])
-    (raise (make-exn:fail:redex:generation-failure str (current-continuation-marks)))))
-
-(define (compile lang what)
-  (define-values/invoke-unit (generation-decisions)
-    (import) (export decisions^))
-  
-  (define (gen-nt lang name cross? retries size attempt filler)
-    (define productions
-      (hash-ref ((if cross? rg-lang-cross rg-lang-non-cross) lang) name))
-    (define-values (term _)
-      (let ([gen (pick-from-list
-                  (if (zero? size)
-                      (min-prods name productions 
-                                 ((if cross? base-cases-cross base-cases-non-cross)
-                                  (rg-lang-base-cases lang)))
-                      ((next-non-terminal-decision) productions)))])
-        (gen retries (max 0 (sub1 size)) attempt empty-env filler)))
-    term)
-  
-  (define (generate/pred name gen pred init-sz init-att retries)
-    (define pre-threshold-incr 
-      (ceiling
-       (/ (- retry-threshold init-att)
-          (* proportion-before-threshold (add1 retries)))))
-    (define (incr-size? remain)
-      (zero? 
-       (modulo (sub1 remain) 
-               (ceiling (* proportion-at-size retries)))))
-    (let retry ([remaining (add1 retries)]
-                [size init-sz]
-                [attempt init-att])
-      (if (zero? remaining)
-          (raise-gen-fail what (format "pattern ~s" name) retries)
-          (let-values ([(term env) (gen size attempt)])
-            (if (pred term env)
-                (values term env)
-                (retry (sub1 remaining)
-                       (if (incr-size? remaining) (add1 size) size)
-                       (+ attempt
-                          (if (>= attempt retry-threshold)
-                              post-threshold-incr
-                              pre-threshold-incr))))))))
-  
-  (define (generate/prior name env gen)
-    (let* ([none (gensym)]
-           [prior (hash-ref env name none)])
-      (if (eq? prior none)
-          (let-values ([(term env) (gen)])
-            (values term (hash-set env name term)))
-          (values prior env))))
-  
-  
-  (define (generate-sequence gen env vars length)
-    (define (split-environment env)
-      (foldl (λ (var seq-envs)
-               (let ([vals (hash-ref env var #f)])
-                 (if vals
-                     (map (λ (seq-env val) (hash-set seq-env var val)) seq-envs vals)
-                     seq-envs)))
-             (build-list length (λ (_) #hash())) vars))
-    (define (merge-environments seq-envs)
-      (foldl (λ (var env)
-               (hash-set env var (map (λ (seq-env) (hash-ref seq-env var)) seq-envs)))
-             env vars))
-    (define-values (seq envs)
-      (let recur ([envs (split-environment env)])
-        (if (null? envs)
-            (values null null)
-            (let*-values 
-                ([(hd env) (gen (car envs))]
-                 [(tl envs) (recur (cdr envs))])
-              (values (cons hd tl) (cons env envs))))))
-    (values seq (merge-environments envs)))
-  
-  (define ((generator/attempts g) r s a e f)
-    (values (g a) e))
-  
-  (define (mismatches-satisfied? env)
-    (define groups (make-hasheq))
-    (define (get-group group)
-      (hash-ref groups group
-                (λ ()
-                  (let ([vals (make-hash)])
-                    (hash-set! groups group vals)
-                    vals))))
-    (for/and ([(name val) env])
-      (or (not (mismatch? name))
-          (let ([prior (get-group (mismatch-var name))])
-            (and (not (hash-ref prior val #f))
-                 (hash-set! prior val #t))))))
-  
-  (define empty-env #hash())
-  
-  (define (bindings env)
-    (make-bindings
-     (for/fold ([bindings null]) ([(key val) (in-hash env)])
-       (if (symbol? key) 
-           (cons (make-bind key val) bindings)
-           bindings))))
-  
-  (define-values (langp lits lang-bases) (prepare-lang lang))
-  (define-values (sexpp _ sexp-bases) (prepare-lang sexp))
-  (define lit-syms (compiled-lang-literals lang))
-  
-  (define (compile pat any?)
-    
-    (define vars-table (make-hash))
-    (define (find-vars pat) (hash-ref vars-table pat '()))
-    (define mismatch-id 0)
-    (define-values (rewritten-pat vars)
-      (let loop ([pat pat])
-        (define (add/ret pat vars) 
-          (hash-set! vars-table pat vars)
-          (values pat vars))
-        (define (build-mismatch var) 
-          (set! mismatch-id (+ mismatch-id 1))
-          (make-mismatch mismatch-id var))
-        (match-a-pattern pat
-          [`any (values pat '())]
-          [`number (values pat '())]
-          [`string (values pat '())]
-          [`natural (values pat '())]
-          [`integer (values pat '())]
-          [`real (values pat '())]
-          [`boolean (values pat '())]
-          [`variable (values pat '())]
-          [`(variable-except ,vars ...) (values pat '())]
-          [`(variable-prefix ,var) (values pat '())]
-          [`variable-not-otherwise-mentioned (values pat '())]
-          [`hole (values pat '())]
-          [`(nt ,x) (values pat '())]
-          [`(name ,name ,p) 
-           (define-values (p-rewritten p-names) (loop p))
-           (add/ret `(name ,name ,p-rewritten) (cons name p-names))]
-          [`(mismatch-name ,name ,p)
-           (define mm (build-mismatch name)) 
-           (define-values (p-rewritten p-names) (loop p))
-           (add/ret `(mismatch-name ,mm ,p-rewritten)
-                    (cons mm p-names))]
-          [`(in-hole ,p1 ,p2) 
-           (define-values (p1-rewritten p1-names) (loop p1))
-           (define-values (p2-rewritten p2-names) (loop p2))
-           (add/ret `(in-hole ,p1-rewritten ,p2-rewritten)
-                    (append p1-names p2-names))]
-          [`(hide-hole ,p) 
-           (define-values (p-rewritten p-names) (loop p))
-           (add/ret `(hide-hole ,p-rewritten) p-names)]
-          [`(side-condition ,p ,e ,e2) 
-           (define-values (p-rewritten p-names) (loop p))
-           (add/ret `(side-condition ,p-rewritten ,e ,e2) p-names)]
-          [`(cross ,var) (values pat '())]
-          [`(list ,lpats ...)
-           (define-values (lpats-rewritten vars)
-             (for/fold ([ps-rewritten '()]
-                        [vars '()])
-                       ([lpat (in-list lpats)])
-               (match lpat 
-                 [`(repeat ,p ,name ,mismatch-name)
-                  (define l1 (if name (list name) '()))
-                  (define mm (and mismatch-name
-                                  (build-mismatch mismatch-name)))
-                  (define l2 (if mm (cons mm l1) l1))
-                  (define-values (p-rewritten p-vars) (loop p))
-                  (values (cons `(repeat ,p-rewritten ,name ,mm) ps-rewritten)
-                          (append l2 p-vars vars))]
-                 [_ 
-                  (define-values (p-rewritten p-vars) (loop lpat))
-                  (values (cons p-rewritten ps-rewritten)
-                          (append p-vars vars))])))
-           (add/ret `(list ,@(reverse lpats-rewritten))
-                    vars)]
-          [(? (compose not pair?)) (values pat '())])))
-    
-    (let* ([nt? (is-nt? (if any? sexpp langp))]
-           [mismatches? #f]
-           [generator 
-            ; retries size attempt env filler -> (values terms env)
-            ;
-            ; Patterns like (in-hole C_1 p) require constructing both an unfilled context
-            ; (exposed via the C_1 binding) and a filled context (exposed as the result).
-            ; A generator constructs both by constructing the context, using either 
-            ; `the-hole' or `the-not-hole' as appropriate, then filling it using `plug'.
-            ; Before returning its result, a generator replaces occurrences of `the-not-hole'
-            ; with `the-hole' to avoid exposing the distinction to the user, but 
-            ; `the-not-hole' remains in bindings supplied to side-condition predicates, to
-            ; match the behavior of the matcher.
-            ;
-            ; Repeated traversals via `plug' are not asymptotically worse than simultaneously
-            ; constructing the filled and unfilled pattern, due to languages like this one,
-            ; which names contexts in a way that prevents any sharing.
-            ; (define-language L
-            ;  (W hole
-            ;  ; extra parens to avoid matcher loop
-            ;  (in-hole (W_1) (+ natural hole))))
-            (let recur ([pat rewritten-pat])
-              (match-a-pattern pat
-                [`any
-                 (λ (r s a e f)
-                   (let*-values ([(lang nt) ((next-any-decision) langc sexpc)]
-                                 [(term) (gen-nt lang nt #f r s a the-not-hole)])
-                     (values term e)))]
-                [`number (generator/attempts (λ (a) ((next-number-decision) a)))]
-                [`string (generator/attempts (λ (a) ((next-string-decision) lits a)))]
-                [`natural (generator/attempts (λ (a) ((next-natural-decision) a)))]
-                [`integer (generator/attempts (λ (a) ((next-integer-decision) a)))]
-                [`real (generator/attempts (λ (a) ((next-real-decision) a)))]
-                [`boolean (generator/attempts (λ (a) ((next-boolean-decision) a)))]
-                [`variable (generator/attempts (λ (a) ((next-variable-decision) lits a)))]
-                [`(variable-except ,vars ...)
-                 (let ([g (recur 'variable)])
-                   (λ (r s a e f)
-                     (generate/pred pat
-                                    (λ (s a) (g r s a e f))
-                                    (λ (var _) (not (memq var vars)))
-                                    s a r)))]
-                [`(variable-prefix ,prefix)
-                 (define (symbol-append prefix suffix)
-                   (string->symbol (string-append (symbol->string prefix) (symbol->string suffix))))
-                 (let ([g (recur 'variable)])
-                   (λ (r s a e f)
-                     (let-values ([(t e) (g r s a e f)])
-                       (values (symbol-append prefix t) e))))]
-                [`variable-not-otherwise-mentioned
-                 (let ([g (recur 'variable)])
-                   (λ (r s a e f)
-                     (generate/pred pat
-                                    (λ (s a) (g r s a e f))
-                                    (λ (var _) (not (memq var lit-syms)))
-                                    s a r)))]
-                [`hole (λ (r s a e f) (values f e))]
-                [`(nt ,nt-id)
-                   (λ (r s a e f)
-                     (values (gen-nt (if any? sexpc langc) nt-id #f r s a f) e))]
-                [`(name ,id ,p)
-                 (let ([g (recur p)])
-                   (λ (r s a e f)
-                     (generate/prior id e (λ () (g r s a e f)))))]
-                [`(mismatch-name ,id ,pat)
-                 (let ([g (recur pat)])
-                   (set! mismatches? #t)
-                   (λ (r s a e f)
-                     (let-values ([(t e) (g r s a e f)])
-                       (values t (hash-set e id t)))))]
-                [`(in-hole ,context ,filler)
-                 (let ([c-context (recur context)]
-                       [c-filler (recur filler)])
-                   (λ (r s a e f)
-                     (let*-values ([(filler env) (c-filler r s a e f)]
-                                   [(context env) (c-context r s a env the-hole)])
-                       (values (plug context filler) env))))]
-                [`(hide-hole ,pattern)
-                 (let ([g (recur pattern)])
-                   (λ (r s a e f)
-                     (g r s a e the-not-hole)))]
-                [`(side-condition ,pat ,(? procedure? condition) ,guard-src-loc)
-                 (let ([g (recur pat)])
-                   (λ (r s a e f)
-                     (generate/pred `(side-condition ,(unparse-pattern pat) ,guard-src-loc) 
-                                    (λ (s a) (g r s a e f))
-                                    (λ (_ env) (condition (bindings env)))
-                                    s a r)))]
-                [`(cross ,(? symbol? p))
-                 (λ (r s a e f)
-                   (values (gen-nt (if any? sexpc langc) p #t r s a f) e))]
-                
-                [`(list ,in-lpats ...)
-                 (let loop ([lpats in-lpats])
-                   (match lpats
-                     [`() (λ (r s a e f) (values '() e))]
-                     [(cons `(repeat ,sub-pat ,name ,mismatch-name) rst)
-                      (let ([elemg (recur sub-pat)]
-                            [tailg (loop rst)]
-                            [vars (find-vars sub-pat)])
-                        (when mismatch-name
-                          (set! mismatches? #t))
-                        (λ (r s a env0 f)
-                          (define len 
-                            (let ([prior (and name (hash-ref env0 name #f))])
-                              (if prior
-                                  prior
-                                  (if (zero? s) 0 ((next-sequence-decision) s)))))
-                          (let*-values ([(seq env) (generate-sequence (λ (e) (elemg r s a e f)) env0 vars len)]
-                                        [(env) (if name (hash-set env name len) env)]
-                                        [(env) (if mismatch-name 
-                                                   (hash-set env mismatch-name len)
-                                                   env)]
-                                        [(tail env) (tailg r s a env f)])
-                            (values (append seq tail) env))))]
-                     [(cons hdp tlp)
-                      (let ([hdg (recur hdp)]
-                            [tlg (loop tlp)])
-                        (λ (r s a env f)
-                          (let*-values 
-                              ([(hd env) (hdg r s a env f)]
-                               [(tl env) (tlg r s a env f)])
-                            (values (cons hd tl) env))))]))]
-                [(? (compose not pair?))
-                 (λ (r s a e f) (values pat e))]))])
-      (if mismatches?
-          (λ (r s a e f)
-            (let ([g (λ (s a) (generator r s a e f))]
-                  [p? (λ (_ e) (mismatches-satisfied? e))])
-              (generate/pred (unparse-pattern pat) g p? s a r)))
-          generator)))
-  (define (compile-non-terminals nts any?)
-    (make-immutable-hash
-     (map (λ (nt) (cons (nt-name nt)
-                        (map (λ (p) (compile (rhs-pattern p) any?))
-                             (nt-rhs nt))))
-          nts)))
-  (define (compile-language lang bases any?)
-    (make-rg-lang
-     (compile-non-terminals (compiled-lang-lang lang) any?)
-     (delay (compile-non-terminals (compiled-lang-cclang lang) any?))
-     bases))
-  (define langc (compile-language langp lang-bases #f))
-  (define sexpc (compile-language sexpp sexp-bases #t))
-  (define (compile-pattern pat) (compile pat #f))
-  (λ (pat)
-    (define g (compile-pattern pat))
-    (λ (size attempt retries)
-      (define-values (t e) (g retries size attempt empty-env the-hole))
-      (values (let replace-the-not-hole ([t t])
-                (cond [(eq? t the-not-hole) the-hole]
-                      [(list? t) (map replace-the-not-hole t)]
-                      [else t])) 
-              (bindings e)))))
-
-(define-struct base-cases (delayed-cross non-cross))
-(define (base-cases-cross x) (force (base-cases-delayed-cross x)))
-
-;; find-base-cases : (list/c nt) -> base-cases
-(define (find-base-cases lang)
-  (define nt-table (make-hash))
-  (define changed? #f)
-  (define (nt-get nt) (hash-ref nt-table nt 'inf))
-  (define (nt-set nt new) 
-    (let ([old (nt-get nt)])
-      (unless (equal? new old)
-        (set! changed? #t)
-        (hash-set! nt-table nt new))))
-  
-  (define ((process-nt cross?) nt)
-    (nt-set (cons cross? (nt-name nt)) (apply min/f (map process-rhs (nt-rhs nt)))))
-  
-  (define (process-rhs rhs)
-    (let ([nts (rhs->nts (rhs-pattern rhs))])
-      (if (null? nts) 
-          0
-          (add1/f (apply max/f (map nt-get nts))))))
-  
-  ;; rhs->path : pattern -> (listof (cons/c boolean symbol))
-  ;; determines all of the non-terminals in a pattern
-  (define (rhs->nts pat)
-    (let ([nts '()])
-      (let loop ([pat pat])
-        (match-a-pattern pat
-          [`any (void)]
-          [`number (void)]
-          [`string (void)]
-          [`natural (void)]
-          [`integer (void)]
-          [`real (void)]
-          [`boolean (void)]
-          [`variable (void)]
-          [`(variable-except ,vars ...) (void)]
-          [`(variable-prefix ,var) (void)]
-          [`variable-not-otherwise-mentioned (void)]
-          [`hole (void)]
-          [`(nt ,var) (set! nts (cons (cons #f var) nts))]
-          [`(name ,n ,p) (loop p)]
-          [`(mismatch-name ,n ,p) (loop p)]
-          [`(in-hole ,p1 ,p2) (loop p1) (loop p2)]
-          [`(hide-hole ,p) (loop p)]
-          [`(side-condition ,p ,exp ,info) (loop p)]
-          [`(cross ,x-nt)
-           (set! nts (cons (cons #t x-nt) nts))]
-          [`(list ,lpats ...)
-           (for ([lpat (in-list lpats)])
-             (match lpat
-               [`(repeat ,p ,name ,mismatch?)
-                (loop p)]
-               [_ (loop lpat)]))]
-          [(? (compose not pair?)) (void)]))
-      nts))
-
-  ;; build-table : (listof nt) -> hash
-  (define (build-table nts)
-    (let ([tbl (make-hasheq)])
-      (for-each
-       (λ (nt) (hash-set! tbl (nt-name nt) (map process-rhs (nt-rhs nt))))
-       nts)
-      tbl))
-  
-  ;; we can delay the work of computing the base cases for
-  ;; the cross part of the language since none of the productions 
-  ;; refer to it (as that's not allowed in general and would be
-  ;; quite confusing if it were...)
-  (let loop ()
-    (set! changed? #f)
-    (for-each (process-nt #f) (compiled-lang-lang lang))
-    (when changed?
-      (loop)))
-  (make-base-cases
-   (delay (begin
-            (let loop ()
-              (set! changed? #f)
-              (for-each (process-nt #t) (compiled-lang-cclang lang))
-              (when changed?
-                (loop)))
-            (build-table (compiled-lang-cclang lang))))
-   (build-table (compiled-lang-lang lang))))
-
-(define min/f
-  (case-lambda
-    [(a) a]
-    [(a b) 
-     (cond
-       [(eq? a 'inf) b]
-       [(eq? b 'inf) a]
-       [else (min a b)])]
-    [(a b . c) (min/f a (apply min/f b c))]))
-(define max/f
-  (case-lambda
-    [(a) a]
-    [(a b) 
-     (cond
-       [(eq? a 'inf) a]
-       [(eq? b 'inf) b]
-       [else (max a b)])]
-    [(a b . c) (max/f a (apply max/f b c))]))
-(define (add1/f a) (if (eq? a 'inf) 'inf (+ a 1)))
-
-;; is-nt? : compiled-lang any -> boolean
-(define ((is-nt? lang) x)
-  (and (hash-ref (compiled-lang-ht lang) x #f) #t))
-
-;; built-in? : any -> boolean
-(define (built-in? x)
-  (and (memq x underscore-allowed) #t))
-
-;; nt-by-name : lang symbol boolean -> nt
-(define (nt-by-name lang name cross?)
-  (findf (λ (nt) (eq? name (nt-name nt))) 
-         (if cross? 
-             (compiled-lang-cclang lang)
-             (compiled-lang-lang lang))))
-
-(define named-nt-rx #rx"^([^_]+)_[^_]*$")
-(define mismatch-nt-rx #rx"([^_]+)_!_[^_]*$")
-(define named-ellipsis-rx #rx"^\\.\\.\\._[^_]*$")
-(define mismatch-ellipsis-rx #rx"^\\.\\.\\._!_[^_]*$")
-
-;; symbol-match : regexp -> any -> (or/c false symbol)
-;; Returns the sub-symbol matching the sub-pattern inside
-;; the first capturing parens.
-(define ((symbol-match rx) x)
-  (and (symbol? x) 
-       (let ([match (regexp-match rx (symbol->string x))])
-         (and match (cadr match) (string->symbol (cadr match))))))
-
-(define-struct class (id) #:transparent)
-
-(define-struct mismatch (id var) #:transparent)
-
-(define-struct binder (name) #:transparent)
-(define binder-pattern
-  (match-lambda
-    [(struct binder (name))
-     (match ((symbol-match named-nt-rx) name)
-       [#f name]
-       [p p])]))
-
-;; name: (or/c symbol? mismatch?)
-;;   The generator records `name' in the environment when generating an ellipsis,
-;;   to enforce sequence length constraints.
-;; class: class?
-;;   When one binding appears under two (non-nested) ellipses, the sequences generated
-;;   must have the same length; `class' groups ellipses to reflect this constraint.
-;; var: (list/c (or/c symbol? class? mismatch? binder?))
-;;   the bindings within an ellipses, used to split and merge the environment before
-;;   and after generating an ellipsis
-(define-struct ellipsis (name pattern class vars) #:inspector (make-inspector))
-
-;; unparse-pattern: parsed-pattern -> pattern
-(define unparse-pattern
-  (match-lambda
-    [(struct binder (name)) name]
-    [(struct mismatch (id var)) var]
-    [(list-rest (struct ellipsis (name sub-pat _ _)) rest)
-     (let ([ellipsis (if (mismatch? name) (mismatch-var name) name)])
-       (list* (unparse-pattern sub-pat) ellipsis (unparse-pattern rest)))]
-    [(cons first rest) 
-     (cons (unparse-pattern first) (unparse-pattern rest))]
-    [other other]))
-
-;; class-reassignments : parsed-pattern -> hash[sym -o> sym]
-(define (class-reassignments pattern)
-  ; union-find w/o balancing or path compression (at least for now)
-  (define (union e f sets)
-    (hash-set sets (find f sets) (find e sets)))
-  (define (find e sets)
-    (let recur ([chd e] [par (hash-ref sets e #f)])
-      (if (and par (not (eq? chd par))) (recur par (hash-ref sets par #f)) chd)))
-  
-  (let* ([last-contexts (make-hasheq)]
-         [assignments #hasheq()] 
-         [record-binder
-          (λ (pat under)
-            (set! assignments
-                  (if (null? under) 
-                      assignments
-                      (let ([last (hash-ref last-contexts pat #f)])
-                        (if last
-                            (foldl (λ (cur last asgns) (union cur last asgns)) assignments under last)
-                            (begin
-                              (hash-set! last-contexts pat under)
-                              assignments))))))])
-    (let recur ([pat pattern] [under null])
-      (match-a-pattern pat
-                       [`any assignments]
-                       [`number assignments]
-                       [`string assignments]
-                       [`natural assignments]
-                       [`integer assignments]
-                       [`real assignments]
-                       [`boolean assignments]
-                       [`variable assignments]
-                       [`(variable-except ,vars ...) assignments]
-                       [`(variable-prefix ,var) assignments]
-                       [`variable-not-otherwise-mentioned assignments]
-                       [`hole assignments]
-                       [`(nt ,var) assignments]
-                       [`(name ,var ,pat)
-                        (record-binder var under)
-                        (recur pat under)]
-                       [`(mismatch-name ,var ,pat)
-                        (recur pat under)]
-                       [`(in-hole ,p1 ,p2)
-                        (recur p2 under)
-                        (recur p1 under)]
-                       [`(hide-hole ,p)
-                        (recur p under)]
-                       [`(side-condition ,p ,exp ,srcloc)
-                        (recur p under)]
-                       [`(cross ,nt) assignments]
-                       [`(list ,lpats ...)
-                        (for ([lpat (in-list lpats)])
-                          (match lpat
-                            [`(repeat ,p ,name ,mismatch?)
-                             (record-binder name under)
-                             (recur p (cons (or name (gensym)) under))]
-                            [_ (recur lpat under)]))
-                        assignments]
-                       [(? (compose not pair?)) assignments]))
-    (make-immutable-hasheq (hash-map assignments (λ (cls _) (cons cls (find cls assignments)))))))
-
-(define (reassign-classes pattern)
-  (let* ([reassignments (class-reassignments pattern)]
-         [rewrite (λ (c) (make-class (hash-ref reassignments (class-id c) (class-id c))))])
-    (let recur ([pat pattern])
-      (match pat
-        #;
-        [`(repeat ,sub-pat ,name ,mismatch?)
-         `(repeat ,(recur sub-pat)
-                  ,(rewrite name)
-                  ,mismatch?)]
-        [(struct ellipsis (name sub-pat class vars))
-         (make-ellipsis name (recur sub-pat) (rewrite class)
-                        (map (λ (v) (if (class? v) (rewrite v) v)) vars))]
-        [(? list?) (map recur pat)]
-        [_ pat]))))
-
-;; used in generating the `any' pattern
-(define-language sexp (sexp variable string number hole (sexp ...) boolean))
-
-(define-signature decisions^
-  (next-variable-decision
-   next-number-decision
-   next-natural-decision
-   next-integer-decision
-   next-real-decision
-   next-boolean-decision
-   next-non-terminal-decision
-   next-sequence-decision
-   next-any-decision
-   next-string-decision))
-
-(define random-decisions@
-  (unit (import) (export decisions^)
-        (define (next-variable-decision) pick-var)
-        (define (next-number-decision) pick-number)
-        (define (next-natural-decision) pick-natural)
-        (define (next-integer-decision) pick-integer)
-        (define (next-real-decision) pick-real)
-        (define (next-boolean-decision) pick-boolean)
-        (define (next-non-terminal-decision) pick-nts)
-        (define (next-sequence-decision) pick-sequence-length)
-        (define (next-any-decision) pick-any)
-        (define (next-string-decision) pick-string)))
-
-(define generation-decisions (make-parameter random-decisions@))
-
-(provide (struct-out ellipsis) 
-         (struct-out mismatch)
-         (struct-out class)
-         (struct-out binder)
-         (struct-out rg-lang)
-         (struct-out base-cases) 
-         base-cases-cross
-         (struct-out exn:fail:redex:generation-failure)
-         raise-gen-fail)
-
-(provide pick-from-list pick-sequence-length pick-nts
-         pick-char pick-var pick-string pick-any pick-boolean
-         pick-number pick-natural pick-integer pick-real
-         unparse-pattern
-         prepare-lang
-         class-reassignments reassign-classes
-         default-retries
-         default-attempt-size
-         default-check-attempts
-         attempt-size/c
-         proportion-at-size
-         retry-threshold proportion-before-threshold post-threshold-incr
-         is-nt? nt-by-name min-prods
-         generation-decisions decisions^ 
-         random-string
-         sexp 
-         find-base-cases
-         attempt->size
-         redex-pseudo-random-generator)
-
-(provide compile)
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/search.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/search.rkt
deleted file mode 100644
index b466ac00c1..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/search.rkt
+++ /dev/null
@@ -1,342 +0,0 @@
-#lang racket/base
-
-(require "pat-unify.rkt" 
-         "error.rkt"
-         racket/match
-         racket/list
-         racket/contract
-         racket/set
-         math/distributions
-         (except-in math/number-theory permutations)
-         (for-syntax racket/base))
-
-(provide (struct-out clause)
-         (struct-out prem)
-         (struct-out eqn)
-         (struct-out dqn)
-         search/next
-         (struct-out gen-trace)
-         get-dist)
-
-;; search tracing facility
-(provide enable-gen-trace!
-         disable-gen-trace!
-         last-gen-trace
-         get-most-recent-trace
-         update-gen-trace!
-         generation-logger
-         gen-state
-         depth-dependent-order?)
-
-;; clause : head-pat eq/dqs (listof prem)
-(define-struct clause (head-pat eq/dqs prems lang name) #:transparent)
-;; prem : (-> (listof clauses)) pat
-(define-struct prem (mk-clauses pat) #:transparent)
-;; eq/dqs : (listof (or/c eq? dq?))
-(define-struct eqn (lhs rhs) #:transparent)
-;; ps : (listof symbol?) - the universally quantified variables ("parameters")
-(define-struct dqn (ps lhs rhs) #:transparent)
-(define (prem-clauses prem) ((prem-mk-clauses prem)))
-
-(define-struct partial-rule (pat clauses tr-loc bound) 
-  #:transparent)
-;; fringe = (listof partial-rule)
-;; partial-rule = (partial-rule pat (listof clause) tr-frame)
-;; the partial rule is the order we're going to process a given rule in. 
-;; If above the bound, we randomize them before putting them into the fringe.
-
-(define-struct fail-cont (env fringe bound)
-  #:transparent)
-
-(define depth-dependent-order? (make-parameter 'random))
-
-(define-struct gen-trace (tr-loc clause input state bound env) #:prefab)
-
-(define gen-state (make-parameter (set 'shuffle-clauses 'success-jump)))
-
-(define (shuffle-clauses?)
-  (set-member? (gen-state) 'shuffle-clauses))
-
-(define (success-jump?)
-  (set-member? (gen-state) 'success-jump))
-
-
-(define bt-count (make-parameter 0))
-(define bt-limit (make-parameter 0))
-(define (inc-bt-count) 
-  (bt-count (add1 (bt-count))))
-
-(define pushdown-count (make-parameter 0))
-(define pushdown-limit (make-parameter 0))
-(define (inc-pushdown-count)
-  (pushdown-count (add1 (pushdown-count))))
-
-(define (search/next clauses input bound lang)
-  (parameterize ([depth-dependent-order? (if (equal? (depth-dependent-order?) 'random)
-                                             (> 0.5 (random))
-                                             (depth-dependent-order?))])
-    (define name-nums 0)
-    (define fresh-pat (parameterize ([unique-name-nums 0])
-                        (begin0
-                          (fresh-pat-vars input (make-hash))
-                          (set! name-nums (unique-name-nums)))))
-    (define fs (list (fail-cont empty-env
-                                (list (make-partial-rule 
-                                       fresh-pat 
-                                       (if (shuffle-clauses?)
-                                           (shuffle-clauses clauses 0 bound)
-                                           (order-clauses clauses))
-                                       '() bound))
-                                bound)))
-    (define v-locs (make-hash))
-    (λ ()
-      (parameterize ([unique-name-nums name-nums]
-                     [bt-count 0]
-                     [bt-limit (* bound 10)]
-                     [pushdown-count 0]
-                     [pushdown-limit (* bound 200)])
-        (define-values (ans fails)
-          (with-handlers ([exn:fail:redex:search-failure? (λ (e) 
-                                                            (define f-conts (exn:fail:redex:search-failure-fails e))
-                                                            (values (unif-fail) (trim-fails f-conts)))])
-            (define-values (env/f fails)
-              (fail-back fs))
-            (values (and/fail env/f (unify fresh-pat 'any env/f lang))
-                    fails)))
-        (set-last-gen-trace! (generation-trace))
-        (set! fs (if (success-jump?)
-                     fails
-                     (shuffle-fails fails)))  ;; how to test if we're randomizing here?
-        (set! name-nums (unique-name-nums))
-        ans))))
-
-(define (trim-fails fs)
-  (define rev-fs (reverse fs))
-  (reverse
-   (let loop ([rfs rev-fs])
-     (match rfs
-       [(cons (fail-cont _1 _2 (? (λ (b) (< b 0)) bound)) rest)
-        (loop rest)]
-       [_
-        rfs]))))
-
-(define (shuffle-fails fs)
-  (cond 
-    [((length fs) . > . 0)
-     (define-values (ls rs) (split-at fs (random (length fs))))
-     (append rs ls)]
-    [else fs]))
-
-(define (fail-back fs)
-  (inc-bt-count)
-  (match fs
-    [(list (fail-cont e f b) rest ...)
-     (choose-rule e f rest)]
-    [_ (values #f fs)]))
-
-(define (choose-rule env fringe fail)
-  (cond
-    [(empty? fringe)
-     (values env fail)]
-    [else
-     (push-down (car fringe) env (cdr fringe) fail)]))
-
-(define (push-down a-partial-rule env fringe fail)
-  (inc-pushdown-count)
-  (match-define (partial-rule pat clauses tr-loc bound) a-partial-rule)
-  (check-depth-limits bound tr-loc fail)
-  (define depth (length tr-loc))
-  (cond
-    [(null? clauses)
-     (fail-back fail)]
-    [else
-     (define the-clause (fresh-clause-vars (car clauses)))
-     (define res-pe (do-unification the-clause pat env))
-     (when (log-receiver? gen-log-recv)
-       (log-message (current-logger) 'info (symbol->string (clause-name the-clause))
-                    (gen-trace tr-loc the-clause pat (and res-pe #t) bound env)))
-     (define failure-fringe
-       (cons (struct-copy partial-rule
-                          a-partial-rule
-                          [clauses (cdr clauses)])
-             fringe))
-     (cond
-       [(not res-pe)
-        (choose-rule env failure-fringe fail)]
-       [else
-        (define new-fringe-elements
-          (for/list ([prem (in-list (clause-prems the-clause))]
-                     [n (in-naturals)])
-            (define prem-cls (prem-clauses prem))
-            (make-partial-rule (prem-pat prem) 
-                               (if (positive? bound)
-                                   (if (shuffle-clauses?)
-                                       (shuffle-clauses prem-cls depth bound)
-                                       (order-clauses prem-cls))
-                                   (order-clauses prem-cls))
-                               (cons n tr-loc)
-                               (- bound 1))))
-        (define new-fringe (append new-fringe-elements
-                                   fringe))
-        (choose-rule (p*e-e res-pe)
-                     new-fringe
-                     (cons (fail-cont env failure-fringe bound) fail))])]))
-
-(define (shuffle-clauses cs depth bound)
-  (if (depth-dependent-order?)
-      (shuffle/binomial cs depth bound)
-      (shuffle cs)))
-
-(define (shuffle/binomial clauses depth bound)
-  (random-order clauses depth (+ depth bound) 
-                #:key (λ (cls) (length (clause-prems cls)))))
-
-(define (random-order l depth max-depth #:key [key values])
-  (define len (length l))
-  (define bd (get-dist len depth max-depth))
-  (define n (round ((distribution-sample bd))))
-  (define perm (nth-lexico-perm len (inexact->exact n)))
-  (define l-sorted (reverse (sort (shuffle l) < #:key key)))
-  (for/list ([i (in-list perm)])
-    (list-ref l-sorted i)))
-
-(define get-dist
-  (let ([cache (make-hash)])
-    (λ (number-of-choices depth max-depth)
-      (hash-ref cache (list number-of-choices depth max-depth)
-                (λ ()
-                  (define nperms (factorial number-of-choices))
-                  (define d (binomial-dist (sub1 nperms) 
-                                           (+ (/ depth max-depth) 
-                                              (* 0.05 (- 0.5 (/ depth max-depth))))))
-                  (hash-set! cache (list number-of-choices depth max-depth) d)
-                  d)))))
-
-(define (nth-lexico-perm len n)
-  (let recur ([indices (build-list len values)]
-              [n n])
-    (cond
-      [(= (length indices) 1)
-       indices]
-      [else
-       (define-values (q r)
-         (quotient/remainder n (factorial (- (length indices) 1))))
-       (define index (list-ref indices q))
-       (cons index
-             (recur (remove index indices) r))])))
-
-(define (order-clauses cs)
-  (define num-prems->cs (make-hash))
-  (for ([c (in-list cs)])
-    (hash-set! num-prems->cs
-               (length (clause-prems c))
-               (set-add
-                (hash-ref num-prems->cs
-                          (length (clause-prems c))
-                          (set))
-                c)))
-  (apply append
-         (for/list ([k (in-list (sort (hash-keys num-prems->cs) <))])
-           (shuffle (set->list (hash-ref num-prems->cs k))))))
-
-(define (do-unification clse input env)
-  (match-define (clause head-pat eq/dqs prems lang name) clse)
-  (clause head-pat eq/dqs prems lang name)
-  (define-values (eqs dqs) (partition eqn? eq/dqs))
-  (define env1
-    (let loop ([e env]
-               [dqs dqs])
-      (match dqs
-        ['() e]
-        [(cons (dqn ps lhs rhs) rest)
-         (define u-res (disunify ps lhs rhs e lang))
-         (and u-res
-              (loop u-res rest))])))
-  (define head-p*e (and/fail env1 (unify input head-pat env1 lang)))
-  (cond
-    [(not-failed? head-p*e)
-     (define res-p (p*e-p head-p*e))
-     (let loop ([e (p*e-e head-p*e)]
-                [eqs eqs])
-       (match eqs
-         ['() 
-          (p*e (p*e-p head-p*e) e)]
-         [(cons (eqn lhs rhs) rest)
-          (define u-res (unify lhs rhs e lang))
-          (and (not-failed? u-res)
-               (loop (p*e-e u-res) rest))]))]
-    [else #f]))
-
-(define (fresh-clause-vars clause-raw)
-  (define instantiations (make-hash))
-  (struct-copy clause clause-raw
-               [head-pat (fresh-pat-vars (clause-head-pat clause-raw) instantiations)]
-               [eq/dqs (for/list ([eq/dq (in-list (clause-eq/dqs clause-raw))])
-                         (match eq/dq
-                           [(eqn lhs rhs)
-                            (eqn (fresh-pat-vars lhs instantiations)
-                                 (fresh-pat-vars rhs instantiations))]
-                           [(dqn ps lhs rhs)
-                            (dqn (map (λ (id) (hash-ref instantiations id
-                                                        (λ () 
-                                                          (define unique-id (make-uid id))
-                                                          (hash-set! instantiations id unique-id)
-                                                          unique-id)))
-                                      ps)
-                                 (fresh-pat-vars lhs instantiations)
-                                 (fresh-pat-vars rhs instantiations))]))]
-               [prems (for/list ([p (clause-prems clause-raw)])
-                        (match p
-                          [(prem mk-clauses pat)
-                           (prem mk-clauses (fresh-pat-vars pat instantiations))]))]))
-
-(define-struct (exn:fail:redex:search-failure exn:fail:redex) (fails))
-
-(define (check-depth-limits bound tr-loc fails)
-  (when ((pushdown-count) . > . (pushdown-limit))
-    (define str (format "pushdown count of ~s exceeded at ~s" (pushdown-count) tr-loc))
-    ;(printf "!*\n\t~s\t*!\n" str)
-    (raise (make-exn:fail:redex:search-failure str (current-continuation-marks) fails)))
-  (when (> (bt-count) (bt-limit))
-    (define str (format "backtrack count of ~s exceeded at ~s" (bt-limit) tr-loc))
-    ;(displayln str)
-    (raise (make-exn:fail:redex:search-failure str (current-continuation-marks) fails)))
-  (when (> (length tr-loc) (* 3 (+ (length tr-loc) bound)))
-    (define str (format "depth bound exceeded at depth: ~s" (length tr-loc)))
-    ;(displayln str)
-    (raise (make-exn:fail:redex:search-failure str (current-continuation-marks) fails))))
-
-
-(define generation-logger (make-logger 'generation-log (current-logger)))
-
-(define gen-log-recv #f)
-
-(define (enable-gen-trace!) 
-  (set! gen-log-recv (make-log-receiver generation-logger 'info)))
-
-(define (disable-gen-trace!)
-  (set! gen-log-recv #f))
-
-(define (get-most-recent-trace)
-  (and (log-receiver? gen-log-recv)
-       most-recent-trace))
-
-(define (generation-trace)
-  (if (log-receiver? gen-log-recv)
-      (let loop ()
-        (define next (sync/timeout 0 gen-log-recv))
-        (if next
-            (cons next (loop))
-            '()))
-      #f))
-
-(define (update-gen-trace!)
-  (set-last-gen-trace! (generation-trace)))
-
-(define most-recent-trace #f)
-
-(define (last-gen-trace)
-  most-recent-trace)
-
-(define (set-last-gen-trace! trace)
-  (set! most-recent-trace trace))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/struct.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/struct.rkt
deleted file mode 100644
index e7a89e575b..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/struct.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang racket/base
-
-(require racket/list "matcher.rkt")
-
-;; don't provide reduction-relation directly, so that we can use that for the macro's name.
-(provide reduction-relation-lang
-         reduction-relation-make-procs
-         reduction-relation-rule-names
-         reduction-relation-lws
-         reduction-relation-procs
-         reduction-relation-domain-pat
-         build-reduction-relation make-reduction-relation
-         reduction-relation?
-         empty-reduction-relation
-         make-rewrite-proc rewrite-proc? rewrite-proc-name 
-         rewrite-proc-lhs rewrite-proc-lhs-src rewrite-proc-id
-         (struct-out rule-pict-info))
-
-(define-struct rule-pict-info (arrow
-                               lhs rhs
-                               label computed-label
-                               side-conditions/pattern-binds fresh-vars))
-
-;; type proc = (exp exp (any -> any) (listof any) -> (listof any)))
-;;   a proc is a `cached' version of a make-proc, specialized to a particular language
-;;   since that first application does all the work of compiling a pattern (wrt to a language),
-;;   we want to avoid doing it multiple times, so it is cached in a reduction-relation struct
-
-
-(define-values (make-rewrite-proc 
-                rewrite-proc? 
-                rewrite-proc-name rewrite-proc-lhs rewrite-proc-lhs-src rewrite-proc-id)
-  (let ()
-    (define-values (type constructor predicate accessor mutator) 
-      (make-struct-type 'rewrite-proc #f 5 0 #f '() #f 0))
-    (values constructor 
-            predicate 
-            (make-struct-field-accessor accessor 1 'name)
-            (make-struct-field-accessor accessor 2 'lhs)
-            (make-struct-field-accessor accessor 3 'lhs-src)
-            (make-struct-field-accessor accessor 4 'id))))
-
-;; lang : compiled-language
-;; make-procs = (listof (compiled-lang -> proc))
-;; rule-names : (listof sym)
-;; procs : (listof proc)
-(define-struct reduction-relation (lang make-procs rule-names lws procs domain-pat))
-
-(define empty-reduction-relation (make-reduction-relation 'empty-reduction-relations-language
-                                                          '()
-                                                          '()
-                                                          '()
-                                                          '()
-                                                          #f))
-
-(define (build-reduction-relation original language rules rule-names lws domain)
-  (define combined-rules
-    (if original
-        (append 
-         (filter (λ (rule)
-                   (or (not (rewrite-proc-name rule))
-                       (not (member (string->symbol (rewrite-proc-name rule)) rule-names))))
-                 (reduction-relation-make-procs original))
-         rules)
-        rules))
-  (define combined-rule-names
-    (if original
-        (remove-duplicates (append rule-names (reduction-relation-rule-names original)))
-        rule-names))
-  (define compiled-domain (compile-pattern language domain #f))
-  (make-reduction-relation
-   language combined-rules combined-rule-names lws
-   (map (λ (rule)
-          (define specialized (rule language))
-          (define (checked-rewrite t)
-            (unless (match-pattern compiled-domain t)
-              (error 'reduction-relation "relation reduced to ~s via ~a, which is outside its domain"
-                     t
-                     (let ([name (rewrite-proc-name rule)])
-                       (if name
-                           (format "the rule named ~a" name)
-                           "an unnamed rule"))))
-            t)
-          (λ (exp acc)
-            (unless (match-pattern compiled-domain exp)
-              (error 'reduction-relation "relation not defined for ~s" exp))
-            (specialized exp exp checked-rewrite acc)))
-        combined-rules)
-   domain))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/term-fn.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/term-fn.rkt
deleted file mode 100644
index c8514ae1cc..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/term-fn.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang racket/base
-
-(require (for-template racket/base "defined-checks.rkt"))
-(provide make-term-fn
-         term-fn?
-         term-fn-get-id
-         (struct-out term-id)
-         
-         (struct-out judgment-form)
-         
-         (struct-out defined-term)
-         defined-term-id?
-         defined-check
-         not-expression-context
-         
-         metafunc-proc-clause-names
-         metafunc-proc-pict-info
-         metafunc-proc-lang
-         metafunc-proc-multi-arg?
-         metafunc-proc-name
-         metafunc-proc-in-dom?
-         metafunc-proc-dom-pat
-         metafunc-proc-cases
-         metafunc-proc-gen-clauses
-         metafunc-proc?
-         make-metafunc-proc
-         
-         make-language-id
-         language-id-nts
-         language-id-nt-identifiers
-         pattern-symbols
-         
-         build-disappeared-use)
-
-(define-values (struct-type make-term-fn term-fn? term-fn-get term-fn-set!) 
-  (make-struct-type 'term-fn #f 1 0))
-(define term-fn-get-id (make-struct-field-accessor term-fn-get 0))
-
-(define-struct term-id (id depth prev-id))
-
-(define (transformer-predicate p? stx)
-  (and (identifier? stx)
-       (cond [(syntax-local-value stx (λ () #f)) => p?]
-             [else #f])))
-
-(define-struct judgment-form (name mode proc mk-proc lang lws rule-names 
-                                   gen-clauses mk-gen-clauses term-proc relation?)
-  #:transparent)
-
-(define-struct defined-term (value))
-(define (defined-term-id? stx)
-  (transformer-predicate defined-term? stx))
-
-(define (defined-check id desc #:external [external id])
-  (if (equal? (identifier-binding id) 'lexical)
-      (datum->syntax id (syntax-e id) external id)
-      (quasisyntax/loc external (check-defined-module (λ () #,id) '#,external #,desc))))
-
-(define (not-expression-context stx)
-  (when (eq? (syntax-local-context) 'expression)
-    (raise-syntax-error #f "not allowed in an expression context" stx)))
-
-(define-values (language-id make-language-id language-id? language-id-get language-id-set) 
-  (make-struct-type 'language-id #f 3 0 #f '() #f 0))
-
-(define (language-id-nts stx id) (language-id-getter stx id 1))
-(define (language-id-getter stx id n)
-  (unless (identifier? stx)
-    (raise-syntax-error id "expected an identifier defined by define-language" stx))
-  (let ([val (syntax-local-value stx (λ () #f))])
-    (unless (and (set!-transformer? val)
-                 (language-id? (set!-transformer-procedure val)))
-      (raise-syntax-error id "expected an identifier defined by define-language" stx))
-    (language-id-get (set!-transformer-procedure val) n)))
-(define (language-id-nt-identifiers stx id) (language-id-getter stx id 2))
-
-(define pattern-symbols '(any number natural integer real string variable 
-                              variable-not-otherwise-mentioned hole symbol))
-
-(define-values (struct:metafunc-proc
-                make-metafunc-proc
-                metafunc-proc?
-                metafunc-proc-ref
-                metafunc-proc-set!)
-  (make-struct-type 'metafunc-proc #f 10 0 #f null (current-inspector) 0))
-(define metafunc-proc-clause-names (make-struct-field-accessor metafunc-proc-ref 1))
-(define metafunc-proc-pict-info (make-struct-field-accessor metafunc-proc-ref 2))
-(define metafunc-proc-lang (make-struct-field-accessor metafunc-proc-ref 3))
-(define metafunc-proc-multi-arg? (make-struct-field-accessor metafunc-proc-ref 4))
-(define metafunc-proc-name (make-struct-field-accessor metafunc-proc-ref 5))
-(define metafunc-proc-in-dom? (make-struct-field-accessor metafunc-proc-ref 6))
-(define metafunc-proc-dom-pat (make-struct-field-accessor metafunc-proc-ref 7))
-(define metafunc-proc-cases (make-struct-field-accessor metafunc-proc-ref 8))
-(define metafunc-proc-gen-clauses (make-struct-field-accessor metafunc-proc-ref 9))
-
-
-(define (build-disappeared-use id-stx-table nt id-stx)
-  (cond
-    [id-stx-table
-     (define table-entry (hash-ref id-stx-table nt #f))
-     (cond
-       [table-entry
-        (define the-srcloc (vector
-                            (syntax-source id-stx)
-                            (syntax-line id-stx)
-                            (syntax-column id-stx)
-                            (syntax-position id-stx)
-                            ;; shorten the span so it covers only up to the underscore
-                            (string-length (symbol->string nt))))
-        (define the-id (datum->syntax table-entry
-                                      (syntax-e table-entry)
-                                      the-srcloc id-stx))
-        (syntax-property the-id 'original-for-check-syntax #t)]
-       [else
-        #f])]
-    [else
-     #f]))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/term.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/term.rkt
deleted file mode 100644
index 58310e7bff..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/term.rkt
+++ /dev/null
@@ -1,487 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base 
-                     "term-fn.rkt"
-                     syntax/boundmap
-                     syntax/parse
-                     racket/syntax
-                     (only-in racket/list flatten)
-                     "keyword-macros.rkt"
-                     "matcher.rkt")
-         (only-in "fresh.rkt" variable-not-in)
-         syntax/datum
-         "error.rkt"
-         "lang-struct.rkt"
-         "matcher.rkt")
-
-(provide term term-let define-term
-         hole in-hole
-         term-let/error-name term-let-fn term-define-fn
-         (for-syntax term-rewrite
-                     term-temp->pat
-                     currently-expanding-term-fn
-                     judgment-form-id?))
-
-(define-syntax (hole stx) (raise-syntax-error 'hole "used outside of term"))
-(define-syntax (in-hole stx) (raise-syntax-error 'in-hole "used outside of term"))
-
-(define (with-syntax* stx)
-  (syntax-case stx ()
-    [(_ () e) (syntax e)]
-    [(_ (a b ...) e) (syntax (with-syntax (a) (with-syntax* (b ...) e)))]))
-
-(define-for-syntax lang-keyword
-  (list '#:lang #f))
-
-(define-for-syntax (judgment-form-id? stx)
-  (and (identifier? stx)
-       (judgment-form? (syntax-local-value stx (λ () #f)))))
-
-(define-syntax (term stx)
-  (syntax-case stx ()
-    [(term t . kw-args)
-     (let ()
-       (define lang-stx (car
-                         (parse-kw-args (list lang-keyword)
-                                        (syntax kw-args)
-                                        stx
-                                        (syntax-e #'form))))
-       (cond
-         [lang-stx
-          (define-values (lang-nts lang-nt-ids)
-            (let loop ([ls lang-stx])
-              (define slv (syntax-local-value ls (λ () lang-stx)))
-              (if (term-id? slv)
-                  (loop (term-id-prev-id slv))
-                  (values (language-id-nts ls 'term)
-                          (language-id-nt-identifiers ls 'term)))))
-          (quasisyntax/loc stx (term/nts t #,lang-nts #,lang-nt-ids))]
-         [else
-          (syntax/loc stx (term/nts t #f #f))]))]))
-
-(define-syntax (term/nts stx)
-  (syntax-case stx ()
-    [(_ arg nts nt-ids)
-     (syntax/loc stx (#%expression (term/private arg nts nt-ids)))]))
-
-(define-for-syntax current-id-stx-table (make-parameter #f))
-
-(define-syntax (term/private stx)
-  (syntax-case stx ()
-    [(_ arg-stx nts-stx id-stx-table)
-     (parameterize ([current-id-stx-table (syntax-e #'id-stx-table)])
-       (with-disappeared-uses
-        (let-values ([(t a-mfs) (term-rewrite/private #'arg-stx #'nts-stx #f)])
-          (term-temp->unexpanded-term t a-mfs))))]))
-
-(define-for-syntax (term-rewrite t names)
-  (let*-values ([(t-t a-mfs) (term-rewrite/private t #`#f names)]
-                [(t-pat) (term-temp->pat t-t names)])
-    t-pat))
-
-(define-syntax (mf-apply stx)
-  (syntax-case stx ()
-    [(_ mf)
-     (quasisyntax/loc stx (λ (x) #,(syntax/loc stx (mf x))))]))
-
-(define-syntax (jf-apply stx)
-  (syntax-case stx ()
-    [(_ jf)
-     (judgment-form-id? #'jf)
-     (judgment-form-term-proc (syntax-local-value #'jf (λ () #f)))]))
-
-(define-syntax (mf-map stx)
-  (syntax-case stx ()
-    [(_ inner-apps)
-     #'(λ (l) (map inner-apps l))]))
-
-(define-for-syntax currently-expanding-term-fn (make-parameter #f))
-
-
-;; term-rewrite/private produces expressions from the following grammar:
-;; (which get further processed by term-temp->unexpanded-term or term-temp->pat)
-;;
-;; term-template := `(term-template (,term-binding ...) ,term-datum)
-;; term-binding  := `(,t-bind-pat (,mf-apps ,term-datum))
-;; t-bind-pat    := id | (ref id) | `(,t-b-seq ...)
-;; t-b-seq       := t-bind-pat | ellipsis
-;; mf-apps       := `(mf-map ,mf-apps) | `(mf-apply ,metafunction-id) | `(jf-apply ,judgment-form-id)
-;; term-datum    := `(quasidatum ,d)
-;; d             := literal | pattern-variable | `(,d-seq ...) | ;; other (holes, undatum)
-;; d-seq         := d | ellipsis
-
-;; actually can be attached to anything that matches a variable in the language
-;; is removed by the internal term rewriter
-;; and expands into an error
-;; *bound* things will be caught by the other rewrite/max-depth possibilities
-
-(define-for-syntax (term-rewrite/private arg-stx nts-stx names)
-
-  (define lang-nts (syntax->datum nts-stx))
-  (define outer-bindings '())
-  (define applied-metafunctions
-    (make-free-identifier-mapping))
-  
-  (define (rewrite stx)
-    (let-values ([(rewritten _) (rewrite/max-depth stx 0 #f #f)])
-      rewritten))
-  
-  (define (rewrite-application fn args depth srcloc-stx)
-    (let-values ([(rewritten max-depth) (rewrite/max-depth args depth #t #t)])
-      (let ([result-id (car (generate-temporaries '(f-results)))])
-        (with-syntax ([fn fn])
-          (let loop ([func (if (judgment-form-id? #'fn)
-                               (syntax/loc srcloc-stx (jf-apply fn))
-                               (syntax/loc srcloc-stx (mf-apply fn)))]
-                     [args-stx rewritten]
-                     [res result-id]
-                     [args-depth (min depth max-depth)])
-            (with-syntax ([func func]
-                          [args args-stx]
-                          [res res])
-              (if (zero? args-depth)
-                  (begin
-                    (set! outer-bindings 
-                          (cons (syntax [res (func (quasidatum args))])
-                                outer-bindings))
-                    (values result-id (min depth max-depth)))
-                  (with-syntax ([dots (datum->syntax #'here '... arg-stx)])
-                    (loop (syntax (begin (mf-map func)))
-                          (syntax/loc args-stx (args dots))
-                          (syntax (res dots))
-                          (sub1 args-depth))))))))))
-  
-  (define (rewrite/max-depth stx depth ellipsis-allowed? continuing-an-application?)
-    (syntax-case stx (unquote unquote-splicing in-hole hole)
-      [(metafunc-name arg ...)
-       (and (not continuing-an-application?)
-            (identifier? (syntax metafunc-name))
-            (if names
-                (not (memq (syntax->datum #'metafunc-name) names))
-                #t)
-            (term-fn? (syntax-local-value (syntax metafunc-name) (λ () #f))))
-       (let ([f (term-fn-get-id (syntax-local-value/record (syntax metafunc-name) (λ (x) #t)))])
-         (free-identifier-mapping-put! applied-metafunctions 
-                                       (datum->syntax f (syntax-e f) #'metafunc-name)
-                                       #t)
-         (rewrite-application f (syntax/loc stx (arg ...)) depth stx))]
-      [(jf-name arg ...)
-       (and (not continuing-an-application?)
-            (identifier? (syntax jf-name))
-            (if names
-                (not (memq (syntax->datum #'jf-name) names))
-                #t)
-            (judgment-form-id? #'jf-name))
-       (begin
-         (unless (not (memq 'O (judgment-form-mode (syntax-local-value #'jf-name))))
-           (raise-syntax-error 'term 
-                               "judgment forms with output mode (\"O\") positions disallowed"
-                               arg-stx stx))
-         (rewrite-application #'jf-name (syntax/loc stx (arg ...)) depth stx))]
-      [f
-       (and (identifier? (syntax f))
-            (if names
-                (not (memq (syntax->datum #'f) names))
-                #t)
-            (term-fn? (syntax-local-value (syntax f) (λ () #f))))
-       (raise-syntax-error 'term "metafunction must be in an application" arg-stx stx)]
-      [x
-       (and (identifier? #'x)
-            (term-id? (syntax-local-value #'x (λ () #f))))
-       (let ([id (syntax-local-value/record #'x (λ (x) #t))])
-         (define stx-result (datum->syntax (term-id-id id) (syntax-e (term-id-id id)) #'x))
-         
-         (define raw-sym (syntax-e #'x))
-         (define raw-str (symbol->string raw-sym))
-         (define m (regexp-match #rx"^([^_]*)_" raw-str))
-         (define prefix-sym (if m
-                                (string->symbol (list-ref m 1))
-                                raw-sym))
-         (check-id (syntax->datum (term-id-id id)) stx ellipsis-allowed? #t)
-         
-         (define new-id
-           (build-disappeared-use (current-id-stx-table) 
-                                  prefix-sym
-                                  (syntax-local-introduce #'x)))
-         (when new-id (record-disappeared-uses (list new-id)))
-         (values stx-result
-                 (term-id-depth id)))]
-      [x
-       (defined-term-id? #'x)
-       (let ([ref (syntax-property
-                   (defined-term-value (syntax-local-value #'x))
-                   'disappeared-use 
-                   (syntax-local-introduce #'x))])
-         (check-id (syntax->datum #'x) stx ellipsis-allowed? #t)
-         (with-syntax ([v #`(begin
-                              #,(defined-check ref "term" #:external #'x)
-                              #,ref)])
-           (values #`(undatum v) 0)))]
-      [(unquote x)
-       (values (syntax (undatum x)) 0)]
-      [(unquote . x)
-       (raise-syntax-error 'term "malformed unquote" arg-stx stx)]
-      [(unquote-splicing x)
-       (values (syntax (undatum-splicing x)) 0)]
-      [(unquote-splicing . x)
-       (raise-syntax-error 'term "malformed unquote splicing" arg-stx stx)]
-      [(in-hole id body)
-       (rewrite-application (syntax (λ (x) (apply plug x))) (syntax/loc stx (id body)) depth stx)]
-      [(in-hole . x)
-       (raise-syntax-error 'term "malformed in-hole" arg-stx stx)]
-      [hole (values (syntax (undatum the-hole)) 0)]
-      [x
-       (and (identifier? (syntax x))
-            (check-id (syntax->datum #'x) stx ellipsis-allowed? #f))
-       (values stx 0)]
-      [() (values stx 0)]
-      [(x ... . y)
-       (not (null? (syntax->list #'(x ...))))
-       (let-values ([(x-rewrite max-depth)
-                     (let i-loop ([xs (syntax->list (syntax (x ...)))])
-                       (cond
-                         [(null? xs) (rewrite/max-depth #'y depth #t #f)]
-                         [else
-                          (let ([new-depth (if (and (not (null? (cdr xs)))
-                                                    (identifier? (cadr xs))
-                                                    (free-identifier=? (quote-syntax ...)
-                                                                       (cadr xs)))
-                                               (+ depth 1)
-                                               depth)])
-                            (let-values ([(fst fst-max-depth)
-                                          (rewrite/max-depth (car xs) new-depth #t #f)]
-                                         [(rst rst-max-depth)
-                                          (i-loop (cdr xs))])
-                              (values (cons fst rst)
-                                      (max fst-max-depth rst-max-depth))))]))])
-         (values (datum->syntax stx x-rewrite stx stx) max-depth))]
-      
-      [_ (values stx 0)]))
-  
-  (define (check-id id stx ellipsis-allowed? term-id?)
-    (define m (regexp-match #rx"^([^_]*)_" (symbol->string id)))
-    (cond
-      [m
-       (define before-underscore (string->symbol (list-ref m 1)))
-       (when (and (not term-id?)
-                  (equal? before-underscore '...))
-         (raise-syntax-error 
-          'term
-          "ellipsis cannot have an underscore"
-          arg-stx stx))
-       (when lang-nts
-         (unless (memq before-underscore (append pattern-symbols lang-nts))
-           (raise-syntax-error
-            'term 
-            "before underscore must be either a non-terminal or a built-in pattern"
-            arg-stx stx)))]
-      [else
-       (unless ellipsis-allowed?
-         (when (equal? id '...) 
-           (raise-syntax-error
-            'term
-            "misplaced ellipsis"
-            arg-stx stx)))]))
-       
-  (values
-   (with-syntax ([rewritten (rewrite arg-stx)])
-     (with-syntax ([(outer-bs ...) (reverse outer-bindings)])
-       #'(term-template
-          (outer-bs ...)
-          (quasidatum rewritten))))
-   applied-metafunctions))
-
-(define-for-syntax (term-temp->unexpanded-term term-stx applied-mfs)
-  (syntax-case term-stx (term-template)
-    [(term-template (outer-bs ...) t)
-     (let ([outer-bindings (syntax->list #'(outer-bs ...))])
-       #`(begin
-           #,@(free-identifier-mapping-map
-               applied-mfs
-               (λ (f _) (defined-check f "metafunction")))
-           #,(let loop ([bs outer-bindings])
-               (cond
-                 [(null? bs) (syntax t)]
-                 [else (with-syntax ([rec (loop (cdr bs))]
-                                     [fst (car bs)])
-                         (syntax (with-datum (fst)
-                                             rec)))]))))]))
-
-(define-for-syntax (term-temp->pat t-t names)
-  (syntax-case t-t (term-template)
-    [(term-template (term-bindings ...) body-datum)
-     (let loop ([t-bs-raw (syntax->list #'(term-bindings ...))]
-                [t-bs '()]
-                [ns names])
-       (cond
-         [(null? t-bs-raw)
-          (with-syntax ([body-pat (term-datum->pat #'body-datum ns)]
-                        [(bind-pats ...) (reverse t-bs)])
-            #'(term-pattern (bind-pats ...) body-pat))]
-         [else
-          (with-syntax ([(bind-lhs (bind-mf-sig bind-term-datum)) (car t-bs-raw)])
-            (let ([new-names (append ns (bind-lhs-name #'bind-lhs))])
-              (with-syntax ([bind-rhs-pat (term-datum->pat #'bind-term-datum new-names)]
-                            [bind-lhs-pat (d->pat #'bind-lhs new-names)]
-                            [bind-mf-pat (bind-mf-sig->pat #'bind-mf-sig)])
-                (loop (cdr t-bs-raw)
-                      (cons #'(bind-lhs-pat (bind-mf-pat bind-rhs-pat)) t-bs)
-                      new-names))))]))]))
-
-(define-for-syntax (term-datum->pat t-d names)
-  (syntax-case t-d ()
-    [(quasidatum d)
-     (d->pat #'d names)]))
-
-(define-for-syntax (d->pat d names)
-  (syntax-case d (... undatum in-hole undatum-splicing variable-not-in term quote)
-    [()
-     #'(list)]
-    [(undatum (variable-not-in (term t) (quote s)))
-     (with-syntax ([t-pat (d->pat #'t names)])
-       #'(variable-not-in t-pat s))]
-    [(undatum (variable-not-in (term t1) (term t2)))
-     (with-syntax ([t1-pat (d->pat #'t1 names)]
-                   [t2-pat (d->pat #'t2 names)])
-       #'(variable-not-in t1-pat t2-pat))]
-    [(undatum rest ...) ;; holes are also undatumed
-     d]
-    [(undatum-splicing rest ...)
-     d]
-    [(in-hole rest ...)
-     d]
-    [(r-dat (... ...) rest ...)
-     (with-syntax ([r-pat (d->pat #'r-dat names)]
-                   [(list rest-pats ...) (d->pat #'(rest ...) names)])
-       #'(list (repeat r-pat #f #f) rest-pats ...))]
-    [(d ds ...)
-     (with-syntax ([p (d->pat #'d names)]
-                   [(list ps ...) (d->pat #'(ds ...) names)])
-       #'(list p ps ...))]
-    [var
-     (and (identifier? #'var)
-          (memq (syntax->datum #'var) names))
-     #'(name var any)]
-    [literal
-     #'literal]))
-
-(define-for-syntax (bind-lhs-name blhs)
-  (define name (filter (λ (n) (not (eq? n '...)))
-                       (flatten (syntax->datum blhs))))
-  (unless (equal? (length name) 1)
-    (error 'term-rewrite "term function lhs binding had more than one name: ~s" (syntax->datum blhs)))
-  name)
-
-(define-for-syntax (bind-mf-sig->pat bmfs)
-  (syntax-case bmfs ()
-    ;; TODO : handle apps at ellipsis depth , handle judgment forms (I only)
-    [(mf-apply f)
-     (and (identifier? #'mf-apply)
-          (eq? (syntax-e #'mf-apply) 'mf-apply))
-     #'(metafunc f)]
-    [(jf-apply f)
-     (and (identifier? #'jf-apply)
-          (eq? (syntax-e #'jf-apply) 'jf-apply))
-     #'(jform f)]))
-
-(define-syntax (term-let-fn stx)
-  (syntax-case stx ()
-    [(_ ([f rhs] ...) body1 body2 ...)
-     (with-syntax ([(g ...) (generate-temporaries (syntax (f ...)))])
-       (syntax 
-        (let ([g rhs] ...)
-          (let-syntax ([f (make-term-fn #'g)] ...)
-            body1
-            body2 ...))))]))
-
-(define-syntax (term-define-fn stx)
-  (syntax-case stx ()
-    [(_ id exp)
-     (with-syntax ([id2 (datum->syntax #'here (syntax-e #'id) #'id #'id)])
-       (syntax
-        (begin
-          (define id2 exp)
-          (define-syntax id
-            (make-term-fn #'id2)))))]))
-
-(define-syntax (term-let/error-name stx)
-  (syntax-case stx ()
-    [(_ error-name ([x1 rhs1] [x rhs] ...) body1 body2 ...)
-     (let ()
-       (unless (identifier? #'error-name)
-         (raise-syntax-error 'term-let/error-name 
-                             "expected an identifier as the first argument"
-                             stx
-                             #'error-name))
-       (define-values (orig-names new-names depths new-x1)
-         (let loop ([stx #'x1] [depth 0])
-           (define ((combine orig-names new-names depths new-pat)
-                    orig-names* new-names* depths* new-pat*)
-             (values (append orig-names orig-names*)
-                     (append new-names new-names*)
-                     (append depths depths*)
-                     (cons new-pat new-pat*)))
-           (syntax-case stx (...)
-             [x 
-              (and (identifier? #'x)
-                   (not (free-identifier=? (quote-syntax ...) #'x)))
-              (let ([new-name (datum->syntax #'here (syntax-e #'x) #'x #'x)])
-                (values (list #'x)
-                        (list new-name)
-                        (list depth)
-                        new-name))]
-             [(x (... ...) . xs)
-              (let-values ([(orig-names new-names depths new-pat)
-                            (call-with-values
-                             (λ () (loop #'xs depth))
-                             (call-with-values
-                              (λ () (loop #'x (add1 depth)))
-                              combine))])
-                (values orig-names new-names depths 
-                        (list* (car new-pat) #'(... ...) (cdr new-pat))))]
-             [(x . xs)
-              (call-with-values
-               (λ () (loop #'xs depth))
-               (call-with-values
-                (λ () (loop #'x depth))
-                combine))]
-             [_
-              (values '() '() '() stx)])))
-       (with-syntax ([(orig-names ...) orig-names]
-                     [(new-names ...) new-names]
-                     [(depths ...) depths]
-                     [new-x1 new-x1]
-                     [no-match (syntax/loc (syntax rhs1)
-                                 (error 'error-name "term ~s does not match pattern ~s" rhs1 'x1))])
-         (syntax
-          (datum-case rhs1 ()
-                      [new-x1
-                       (let-syntax ([orig-names (make-term-id #'new-names depths #'orig-names)] ...)
-                         (term-let/error-name error-name ((x rhs) ...) body1 body2 ...))]
-                      [_ no-match]))))]
-    [(_ error-name () body1 body2 ...)
-     (syntax
-      (begin body1 body2 ...))]
-    [(_ x)
-     (raise-syntax-error 'term-let "expected at least one body" stx)]))
-
-(define-syntax (term-let stx)
-  (syntax-case stx ()
-    [(_ () body1)
-     #'body1]
-    [(_ ([x rhs] ...) body1 body2 ...)
-     (syntax
-      (term-let/error-name term-let ((x rhs) ...) body1 body2 ...))]
-    [(_ x)
-     (raise-syntax-error 'term-let "expected at least one body" stx)]))
-
-(define-syntax (define-term stx)
-  (syntax-parse stx
-                [(_ x:id t:expr)
-                 (not-expression-context stx)
-                 (with-syntax ([term-val (syntax-property (syntax/loc #'x term-val)
-                                                          'undefined-error-name
-                                                          (syntax-e #'x))])
-                   #'(begin
-                       (define term-val (term t))
-                       (define-syntax x (defined-term #'term-val))))]))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/trace-layout.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/trace-layout.rkt
deleted file mode 100644
index 6a32a3bacf..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/trace-layout.rkt
+++ /dev/null
@@ -1,226 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         racket/list)
-
-(provide trace->coords
-         trace->widths/coords)
-         
-
-(define-struct tree (loc children) #:transparent)
-;; children : (listof tree)
-
-(define-struct u-tree (loc subtrees) #:transparent)
-(define (u-tree-children ut)
-  (car (u-tree-subtrees ut)))
-(define (add-child ut child)
-  (match ut
-    [(u-tree loc (list st sts ...))
-     (u-tree loc (cons (cons child st) sts))]))
-;; subtrees : (listof (listof u-tree))
-;; first subtree is the "active" subtree
-
-(define (insert-loc loc input-tree)
-  (let loop ([lc loc]
-             [tr input-tree])
-    (match* (lc tr)
-      [(`(,l) (tree loc children))
-       (when (for/or ([c children]) (= (tree-loc c) l))
-         (error 'insert-loc "tried to replace a node: ~s" l))
-       (tree loc (cons (tree l '()) children))]
-      [(`(,l ,ls ...) (tree loc children))
-       (tree loc
-             (for/list ([t (tree-children tr)])
-               (if (= l (tree-loc t))
-                   (loop ls t)
-                   t)))])))
-
-(define (build-tree full-trace)
-  (let loop ([trace full-trace]
-             [t #f])
-    (match trace
-      ['() t]
-      [`(() ,locs ...)
-       (loop locs (tree '() '()))]
-      [`(,loc ,locs ...)
-       (loop locs (insert-loc loc t))])))
-
-(define (append/replace-child a-u-tree l)
-  (match a-u-tree
-    [(u-tree ut-loc ut-sts)
-     (define-values (this-c other-cs)
-       (partition (λ (c) (equal? (u-tree-loc c) l))
-                  (car ut-sts)))
-     (match this-c
-       ['()
-        (add-child a-u-tree (u-tree l '(())))]
-       [(list (u-tree c-l c-sts))
-        (u-tree ut-loc (cons
-                        (cons (u-tree c-l (cons '() c-sts)) other-cs)
-                        (cdr ut-sts)))]
-       [else
-        (error 'append/replace-child "identical twins not allowed at: ~s" a-u-tree)])]))
-
-
-(define (insert-loc/u loc input-tree)
-  (let loop ([lc loc]
-             [tr input-tree])
-    (match* (lc tr)
-      [(`(,l) a-tree)
-       (append/replace-child a-tree l)]
-      [(`(,l ,ls ...) (u-tree loc (list (list children ...) sts ...)))
-       (u-tree loc
-               (cons
-                (for/list ([t children])
-                  (if (= l (u-tree-loc t))
-                      (loop ls t)
-                      t))
-                sts))])))
-
-(define (build-tree/u full-trace)
-  (let loop ([trace full-trace]
-             [t (u-tree '() '())])
-    (match trace
-      ['() t]
-      [`(() ,locs ...)
-       (loop locs (u-tree '() (cons '() (u-tree-subtrees t))))]
-      [`(,loc ,locs ...)
-       (loop locs (insert-loc/u loc t))])))
-
-(define NODE-WIDTH 200)
-
-(define (trace->max-depth trace)
-  (apply max (map (λ (loc) (add1 (length loc))) trace)))
-
-(define (collect-width-info a-u-tree max-depth)
-  (define locs->max-width (make-hash))
-  (define locs->most-children (make-hash))
-  (let loop ([t a-u-tree]
-             [d 0]
-             [full-loc '()])
-    (match t
-      [(u-tree loc sts)
-       (define my-loc (if (equal? loc '()) '() (cons loc full-loc)))
-       (define mc (map (λ (c) (cons (u-tree-loc c) my-loc))
-                       (car (sort sts > #:key length))))
-       (when (>= (length mc)
-                 (length (hash-ref locs->most-children my-loc '())))
-         (hash-set! locs->most-children
-                    my-loc
-                    mc))
-       (define width (apply max 
-                            (map (λ (st)
-                                   (if (empty? st) 
-                                       (* NODE-WIDTH (add1 (- max-depth d)))
-                                       (apply + (for/list ([c st])
-                                                  (loop c (add1 d) my-loc)))))
-                                 sts)))
-       (when (>= width (hash-ref locs->max-width my-loc 0))
-         (hash-set! locs->max-width my-loc width))
-       width]))
-  (values locs->max-width
-          locs->most-children))
-
-(define (make-x-coords ls->mws ls->mcs)
-  (define locs->coords (make-hash))
-  (hash-set! locs->coords '() 0)
-  (let loop1 ([cur-loc '()]
-              [cur-x 0])
-    (hash-set! locs->coords (reverse cur-loc) cur-x)
-    (define cs (sort (hash-ref ls->mcs cur-loc)
-                     <
-                     #:key car))
-    (define this-width (apply + (map (λ (c)
-                                       (hash-ref ls->mws c))
-                                     cs)))
-    (define left-x (- cur-x (/ this-width 2)))
-    (for ([c-loc (in-list cs)])
-      (define c-w (hash-ref ls->mws c-loc))
-      (loop1 c-loc (+ left-x (/ c-w 2)))
-      (set! left-x (+ left-x c-w))))
-  locs->coords)
-
-(define (trace->widths/coords tr)
-  (define tree (build-tree/u tr))
-  (define-values (ls->mws ls->mcs)
-    (collect-width-info tree (trace->max-depth tr)))
-  (values ls->mws (make-x-coords ls->mws ls->mcs)))
-
-(define (trace->coords tr)
-  (define-values (_ cs)
-    (trace->widths/coords tr))
-  cs)
-
-
-(module+ 
- test
- 
- (require rackunit)
- 
- (check-equal? (insert-loc '(1) (tree '() '()))
-               (tree '() (list (tree 1 '()))))
- 
- (check-equal? (insert-loc '(0) (insert-loc '(1) (tree '() '())))
-               (tree '() (list (tree 0 '()) (tree 1 '()))))
- 
- (check-equal? (insert-loc '(0 0) (insert-loc '(0) (insert-loc '(1) (tree '() '()))))
-               (tree '() (list (tree 0 (list (tree 0 '()))) (tree 1 '()))))
- 
- (check-equal? (build-tree '(() (0) (1)))
-               (tree '() (list (tree 1 '()) (tree 0 '()))))
- 
- (check-equal? (build-tree '(() (0) (1) (0 0) (0 1)))
-               (tree '() (list (tree 1 '()) (tree 0 (list (tree 1 '()) (tree 0 '()))))))
- (check-equal? (build-tree '(() (3) (2) (1) (0)
-                                (3 0) (3 1) (3 2)))
-               (tree
-                '()
-                (list
-                 (tree 0 '())
-                 (tree 1 '())
-                 (tree 2 '())
-                 (tree 3 (list (tree 2 '()) (tree 1 '()) (tree 0 '()))))))
- (check-equal? (build-tree/u '(() (0)))
-               (u-tree '() 
-                       (list 
-                        (list 
-                         (u-tree 0 '(()))))))
- (check-equal? (build-tree/u '(() (0) (1)))
-               (u-tree '() 
-                       (list 
-                        (list 
-                         (u-tree 1 '(())) 
-                         (u-tree 0 '(()))))))
- (check-equal? (build-tree/u '(() (0) (0)))
-               (u-tree '() 
-                       (list
-                        (list 
-                         (u-tree 0 '(() ()))))))
- (check-equal? (build-tree/u '(() ()))
-               (u-tree '() '(() ())))
- (check-equal? (build-tree/u '(() (0) (0) (0) () (0) (0 0) (1) (1 0) (1 0)))
-               (u-tree
-                '()
-                (list
-                 (list
-                  (u-tree 1 (list (list (u-tree 0 '(() ())))))
-                  (u-tree 0 (list (list (u-tree 0 '(()))))))
-                 (list (u-tree 0 '(() () ()))))))
- (check-equal? (trace->coords '(() (0) (1)))
-               (make-hash (list (cons '() 0)
-                                (cons '(0) (- NODE-WIDTH))
-                                (cons '(1) NODE-WIDTH))))
- (check-equal? (trace->coords '(() (0) (1) (0 0) (0 1) (0 2)))
-               (make-hash (list (cons '() 0)
-                                (cons '(0) (- (* NODE-WIDTH (/ 3 2))))
-                                (cons '(0 0) (- (* NODE-WIDTH (/ 7 2))))
-                                (cons '(0 1) (- (* NODE-WIDTH (/ 3 2))))
-                                (cons '(0 2) (/ NODE-WIDTH 2))
-                                (cons '(1) (* NODE-WIDTH 3)))))
- (check-equal? (trace->coords '(() (0) (1) (0 0) (0 1) (0) (0 0) (0 1) (0 2)))
-               (make-hash (list (cons '() 0)
-                                (cons '(0) (- (* NODE-WIDTH (/ 3 2))))
-                                (cons '(0 0) (- (* NODE-WIDTH (/ 7 2))))
-                                (cons '(0 1) (- (* NODE-WIDTH (/ 3 2))))
-                                (cons '(0 2) (/ NODE-WIDTH 2))
-                                (cons '(1) (* NODE-WIDTH 3))))))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/underscore-allowed.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/underscore-allowed.rkt
deleted file mode 100644
index d43b75aecd..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/private/underscore-allowed.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(provide underscore-allowed) 
-(define underscore-allowed '(any number string variable variable-not-otherwise-mentioned natural integer real boolean))
diff --git a/pkgs/redex-pkgs/redex-lib/redex/reduction-semantics.rkt b/pkgs/redex-pkgs/redex-lib/redex/reduction-semantics.rkt
deleted file mode 100644
index 4c2227bda1..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/reduction-semantics.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang racket/base
-(require racket/contract)
-
-(require "private/reduction-semantics.rkt"
-         "private/judgment-form.rkt"
-         "private/matcher.rkt"
-         "private/term.rkt"
-         "private/rg.rkt"
-         "private/error.rkt"
-         "private/generate-term.rkt")
-
-(provide exn:fail:redex?) ;; from error.rkt
-
-(provide reduction-relation 
-         --> fresh with ;; keywords for reduction-relation
-         hole in-hole ;; keywords for term
-         ::= ;; keywords for language definition
-         I O ;; keyword for define-judgment-form
-         extend-reduction-relation
-         reduction-relation?
-         
-         compatible-closure
-         context-closure
-         
-         define-language
-         define-extended-language
-         define-union-language
-         plug
-         compiled-lang?
-         term
-         term-let
-         define-metafunction
-         define-metafunction/extension
-         define-relation
-         define-judgment-form
-         define-extended-judgment-form
-         judgment-holds
-         build-derivations
-         (struct-out derivation)
-         in-domain?
-         caching-enabled?
-         make-coverage
-         coverage?
-         check-redudancy)
-
-(provide (rename-out [test-match redex-match])
-         (rename-out [test-match? redex-match?])
-         term-match
-         term-match/single
-         redex-let
-         redex-let*
-         define-term
-         match? match-bindings
-         make-bind bind? bind-name bind-exp
-         
-         test-equal
-         test-->>
-         test-->
-         test-->>∃ (rename-out [test-->>∃ test-->>E])
-         test-predicate
-         test-results)
-
-(provide redex-check
-         generate-term
-         check-metafunction
-         check-reduction-relation
-         redex-generator
-         exn:fail:redex:generation-failure?
-         (struct-out exn:fail:redex:test)
-         (struct-out counterexample)
-         depth-dependent-order?)
-
-(provide variable-not-in
-         variables-not-in)
-
-(provide/contract
- [current-traced-metafunctions (parameter/c (or/c 'all (listof symbol?)))]
- [reduction-relation->rule-names (-> reduction-relation? (listof symbol?))]
- [language-nts (-> compiled-lang? (listof symbol?))]
- [set-cache-size! (-> number? void?)]
- [apply-reduction-relation (-> reduction-relation? any/c (listof any/c))]
- [apply-reduction-relation/tag-with-names
-  (-> reduction-relation? any/c (listof (list/c (or/c false/c string?) any/c)))]
- [apply-reduction-relation* (->* (reduction-relation? any/c) (#:cache-all? boolean? #:stop-when (-> any/c any)) (listof any/c))]
- [current-cache-all? (parameter/c boolean?)]
- [union-reduction-relations (->* (reduction-relation? reduction-relation?)
-                                 ()
-                                 #:rest (listof reduction-relation?)
-                                 reduction-relation?)]
- [relation-coverage (parameter/c (listof coverage?))]
- [covered-cases (-> coverage? (listof (cons/c string? natural-number/c)))]
- [redex-pseudo-random-generator (parameter/c pseudo-random-generator?)]
- [default-attempt-size attempt-size/c]
- [default-check-attempts (parameter/c natural-number/c)]
- [default-equiv (parameter/c (-> any/c any/c any/c))])
diff --git a/pkgs/redex-pkgs/redex-lib/redex/tut-subst.rkt b/pkgs/redex-pkgs/redex-lib/redex/tut-subst.rkt
deleted file mode 100644
index 255c623c5b..0000000000
--- a/pkgs/redex-pkgs/redex-lib/redex/tut-subst.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang racket/base
-
-#|
-
-The substitution function in this file has been designed
-to work with any expression language so long as the only
-binding form is λ and the shape of λ terms is:
-  
-      (λ (x any) ... e)
-
-(for types) or
-
-      (λ x ... e)
-
-for untyped.
-
-|#
-
-(require racket/set racket/match
-         redex/reduction-semantics)
-(provide subst/proc fvs)
-
-(define (subst/proc x? vars replacements body)
-  (define replacements-ht
-    (for/fold ([m (hash)])
-              ([v (in-list vars)]
-               [rep (in-list replacements)])
-      (hash-set m v rep)))
-  (define replacements-free-vars (for/list ([x (in-set (fvs x? replacements))]) x))
-  (define replacements-fresh-vars (variables-not-in (cons vars body) 
-                                                    replacements-free-vars))
-  (define init-fv-map 
-    (for/fold ([m (hash)])
-              ([fresh (in-list replacements-fresh-vars)]
-               [free (in-list replacements-free-vars)])
-      (hash-set m free fresh)))
-  (let loop ([body body]
-             [fvs-inactive init-fv-map]
-             [fvs-active (hash)]
-             [replacements replacements-ht])
-    (match body
-      [`(λ (,xs ,ts) ... ,body)
-       (define-values (new-xs new-inactive new-active new-replacements)
-         (adjust-active-inactive xs fvs-inactive fvs-active replacements))
-       `(λ ,@(map (λ (x t) `(,x ,t)) new-xs ts)
-          ,(loop body new-inactive new-active new-replacements))]
-      [`(λ ,(? symbol? xs) ... ,body)
-       (define-values (new-xs new-inactive new-active new-replacements)
-         (adjust-active-inactive xs fvs-inactive fvs-active replacements))
-       `(λ ,@new-xs
-          ,(loop body new-inactive new-active new-replacements))]
-      [(? x? x)
-       (cond
-         [(hash-ref fvs-active x #f) => values]
-         [(hash-ref replacements x #f) => values]
-         [else x])]
-      [(? list?)
-       (map (λ (x) (loop x fvs-inactive fvs-active replacements))
-            body)]
-      [_ body])))
-
-(define (adjust-active-inactive xs fvs-inactive fvs-active replacements)
-  (let loop ([xs xs]
-             [new-xs '()]
-             [fvs-inactive fvs-inactive]
-             [fvs-active fvs-active]
-             [replacements replacements])
-    (cond
-      [(null? xs)
-       (values (reverse new-xs)
-               fvs-inactive 
-               fvs-active
-               replacements)]
-      [else
-       (define x (car xs))
-       (define inactive-var? (hash-has-key? fvs-inactive x))
-       (define active-var? (hash-has-key? fvs-active x))
-       (define new-x
-         (cond
-           [inactive-var? (hash-ref fvs-inactive x)]
-           [active-var? (hash-ref fvs-active x)]
-           [else x]))
-       (loop (cdr xs)
-             (cons new-x new-xs)
-             (if inactive-var?
-                 (hash-remove fvs-inactive x)
-                 fvs-inactive)
-             (if inactive-var?
-                 (hash-set fvs-active x (hash-ref fvs-inactive x))
-                 fvs-active)
-             (if (hash-has-key? replacements x)
-                 (hash-remove replacements x)
-                 replacements))])))
-
-(define (fvs x? body)
-  (let loop ([body body])
-    (match body
-      [`(λ (,xs ,ts) ... ,body)
-       (set-subtract (loop body) (apply set xs))]
-      [(? x?)
-       (set body)]
-      [(? list?)
-       (for/fold ([fvs (set)])
-                 ([e (in-list body)])
-         (set-union fvs (loop e)))]
-      [_ (set)])))
diff --git a/pkgs/redex-pkgs/redex-pict-lib/LICENSE.txt b/pkgs/redex-pkgs/redex-pict-lib/LICENSE.txt
deleted file mode 100644
index 97325db572..0000000000
--- a/pkgs/redex-pkgs/redex-pict-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-redex-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/redex-pkgs/redex-pict-lib/info.rkt b/pkgs/redex-pkgs/redex-pict-lib/info.rkt
deleted file mode 100644
index 2f28e706a6..0000000000
--- a/pkgs/redex-pkgs/redex-pict-lib/info.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base"
-               "draw-lib"
-               "data-lib"
-               "profile-lib"
-               "unstable-2d"
-               "redex-lib"
-               "pict-lib"))
-
-(define build-deps '("rackunit-lib"))
-
-(define implies '("redex-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"redex\" using picts")
-
-(define pkg-authors '(robby bfetscher))
-
-(define version "1.1")
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-pict-lib/redex/pict.rkt b/pkgs/redex-pkgs/redex-pict-lib/redex/pict.rkt
deleted file mode 100644
index 7f9a6e21aa..0000000000
--- a/pkgs/redex-pkgs/redex-pict-lib/redex/pict.rkt
+++ /dev/null
@@ -1,155 +0,0 @@
-#lang racket/base
-
-(require racket/contract
-         "private/pict.rkt"
-         "private/core-layout.rkt"
-         redex/private/struct
-         redex/private/loc-wrapper
-         redex/reduction-semantics
-         texpict/mrpict)
-
-(define reduction-rule-style/c
-  (or/c 'vertical 
-        'compact-vertical
-        'vertical-overlapping-side-conditions
-        'horizontal
-        'horizontal-left-align
-        'horizontal-side-conditions-same-line
-        (-> (listof rule-pict-info?) pict?)))
-
-(provide reduction-rule-style/c render-term term->pict
-         term->pict/pretty-write
-         render-term/pretty-write)
-
-(provide/contract
- [render-reduction-relation
-  (->i ([rel reduction-relation?])
-       ([file (or/c false/c path-string?)]
-        #:style
-        [style reduction-rule-style/c])
-       [result (file)
-               (if (path-string? file)
-                   void?
-                   pict?)])]
- [reduction-relation->pict (->* (reduction-relation?)
-                                (#:style reduction-rule-style/c)
-                                pict?)]
- [render-reduction-relation-rules 
-  (parameter/c (or/c #f (listof (or/c symbol? string? exact-nonnegative-integer?))))]
- 
- [language->pict (->* (compiled-lang?)
-                      (#:nts (or/c false/c (listof (or/c string? symbol?))))
-                      pict?)]
- [render-language
-  (->i ([lang compiled-lang?])
-       ([file (or/c false/c path-string?)]
-        #:nts
-        [nts (or/c false/c (listof (or/c string? symbol?)))])
-       [result (file)
-               (if (path-string? file)
-                   void?
-                   pict?)])]
- 
- [rule-pict-info-arrow (-> rule-pict-info? symbol?)]
- [rule-pict-info-lhs (-> rule-pict-info? pict?)]
- [rule-pict-info-rhs (-> rule-pict-info? pict?)]
- [rule-pict-info-label (-> rule-pict-info? (or/c symbol? #f))]
- [rule-pict-info-computed-label (-> rule-pict-info? (or/c pict? #f))]
- [rule-pict-info->side-condition-pict (->* (rule-pict-info?) ((and/c positive? real?)) pict?)]
- [rule-pict-info? (-> any/c boolean?)])
-
-; syntax
-(provide relation->pict
-         metafunction->pict
-         metafunctions->pict
-         judgment-form->pict
-         
-         render-relation
-         render-metafunction
-         render-metafunctions
-         render-judgment-form)
-
-(provide/contract
- [render-language-nts (parameter/c (or/c false/c (listof (or/c string? symbol?))))]
- [extend-language-show-union (parameter/c boolean?)]
- [extend-language-show-extended-order (parameter/c boolean?)]
- [current-text (parameter/c (-> string? text-style/c number? pict?))])
-
-(provide/contract
- [non-terminal-gap-space (parameter/c real?)]
- [label-style (parameter/c text-style/c)]
- [literal-style (parameter/c text-style/c)]
- [grammar-style (parameter/c text-style/c)]
- [paren-style (parameter/c text-style/c)]
- [metafunction-style (parameter/c text-style/c)]
- [default-style (parameter/c text-style/c)]
- [non-terminal-style (parameter/c text-style/c)]
- [non-terminal-subscript-style (parameter/c text-style/c)]
- [non-terminal-superscript-style (parameter/c text-style/c)]
- [linebreaks (parameter/c (or/c false/c (listof boolean?)))]
- [curly-quotes-for-strings (parameter/c boolean?)]
- [white-bracket-sizing (parameter/c
-                        (-> string? number? (values number? number? number? number?)))]
- [horizontal-bar-spacing (parameter/c exact-nonnegative-integer?)]
- [relation-clauses-combine (parameter/c (-> (listof pict?) pict?))]
- [where-make-prefix-pict (parameter/c (-> pict?))]
- [where-combine (parameter/c (-> pict? pict? pict?))])
-
-(provide/contract
- [rule-pict-style 
-  (parameter/c reduction-rule-style/c)]
- [arrow-space (parameter/c natural-number/c)]
- [label-space (parameter/c natural-number/c)]
- [metafunction-cases (parameter/c (or/c #f (listof (or/c exact-nonnegative-integer? string?))))]
- [judgment-form-cases (parameter/c (or/c #f (and/c (listof (or/c exact-nonnegative-integer? string?))
-                                                   pair?)))]
- [metafunction-pict-style 
-  (parameter/c (symbols 'left-right
-                        'left-right/vertical-side-conditions
-                        'left-right/compact-side-conditions
-                        'left-right/beside-side-conditions
-                        'up-down
-                        'up-down/vertical-side-conditions
-                        'up-down/compact-side-conditions))]
- [delimit-ellipsis-arguments? (parameter/c any/c)]
- 
- [default-white-square-bracket (-> boolean? pict?)]
- [homemade-white-square-bracket (-> boolean? pict?)]
- [white-square-bracket (parameter/c (-> boolean? pict?))])
-
-(provide/contract
- [label-font-size (parameter/c (and/c (between/c 1 255) integer?))]
- [default-font-size (parameter/c (and/c (between/c 1 255) integer?))]
- [metafunction-font-size (parameter/c (and/c (between/c 1 255) integer?))]
- [reduction-relation-rule-separation (parameter/c (and/c integer? positive? exact?))])
-
-(provide
- build-lw
- lw
- lw?
- lw-e
- lw-line
- lw-line-span
- lw-column
- lw-column-span)
-
-(provide to-lw
-         to-lw/stx
-         (struct-out lw))
-
-(provide/contract
- [just-before (-> (or/c pict? string? symbol?) lw? lw?)]
- [just-after (-> (or/c pict? string? symbol?) lw? lw?)])
-(provide with-unquote-rewriter
-         with-compound-rewriter
-         with-compound-rewriters
-         with-atomic-rewriter)
-
-(provide/contract
- [set-arrow-pict! (-> symbol? (-> pict?) void?)]
- [arrow->pict (-> symbol? pict?)]
- 
- [lw->pict
-  (-> (or/c (listof symbol?) compiled-lang?) lw? pict?)]
- [render-lw
-  (-> (or/c (listof symbol?) compiled-lang?) lw? pict?)])
diff --git a/pkgs/redex-pkgs/redex-pict-lib/redex/private/arrow.rkt b/pkgs/redex-pkgs/redex-pict-lib/redex/private/arrow.rkt
deleted file mode 100644
index 4309f91566..0000000000
--- a/pkgs/redex-pkgs/redex-pict-lib/redex/private/arrow.rkt
+++ /dev/null
@@ -1,129 +0,0 @@
-#lang racket/base
-(require texpict/mrpict
-         racket/draw
-         racket/class
-         racket/contract)
-
-(provide/contract
- [make-arrow-pict
-  (-> string?
-      (or/c 'curvy 'straight 'straight-double 'map)
-      symbol?
-      number?
-      (-> pict?))])
-
-(define (make-arrow-pict sample-str style font-family font-size)
-  (let ([ans #f])
-    (λ ()
-      (or ans
-          (begin
-            (set! ans (raw-make-arrow-pict sample-str style font-family font-size))
-            ans)))))
-
-(define (raw-make-arrow-pict sample-str style font-family font-size)
-  (let-values ([(w h d a) (send (dc-for-text-size) get-text-extent sample-str
-                                (send the-font-list
-                                      find-or-create-font
-                                      font-size
-                                      font-family
-                                      'normal
-                                      'normal))])
-    (let* ([pen-width-factor 0.042] ;; factor of the height to get the pen width
-           [line-pos (+ a (/ (- h a) 2))]
-           [head-width (/ w 5)]
-           [head-height (* (- h a) 9/16)]
-           [path (and (eq? style 'curvy)
-                      (let* ([b (blank w (- h a d) d)]
-                             [a-sz (* head-width 1)]
-                             [p (new dc-path%)]
-                             [inc (/ (- w head-width) 3)])
-                        (send p move-to 0 line-pos)
-                        (let ([y (- line-pos (/ a-sz 2))])
-                          (send p curve-to 
-                                0 line-pos
-                                (/ inc 2) y
-                                inc y)
-                          (let ([y2 (+ line-pos (/ a-sz 2))])
-                            (send p curve-to
-                                  (* 3/2 inc) y
-                                  (* 3/2 inc) y2
-                                  (* 2 inc) y2)
-                            (send p curve-to
-                                  (* 5/2 inc) y2
-                                  (* 5/2 inc) line-pos
-                                  (* 3 inc) line-pos)
-                            (send p line-to w line-pos)))
-                        p))])
-      (inset
-       (dc
-        (λ (dc dx dy)
-          (let ([old-pen (send dc get-pen)]
-                [old-brush (send dc get-brush)]
-                [old-smoothing (send dc get-smoothing)])
-            (send dc set-smoothing 'smoothed)
-            (send dc set-pen (send old-pen get-color) (* h pen-width-factor) 'solid)
-            
-            ;; main line of arrow
-            (case style
-              [(curvy)
-               (send dc draw-path path dx dy)]
-              [(map)
-               (send dc draw-line
-                     dx
-                     (- (+ dy line-pos) (/ head-height 2))
-                     dx
-                     (+ (+ dy line-pos) (/ head-height 2)))
-               (send dc draw-line 
-                     dx
-                     (+ dy line-pos)
-                     (+ dx w)
-                     (+ dy line-pos))]
-              [(straight)
-               (send dc draw-line 
-                     dx
-                     (+ dy line-pos)
-                     (+ dx w)
-                     (+ dy line-pos))]
-              [(straight-double)
-               (send dc draw-line 
-                     dx 
-                     (+ dy line-pos -1)
-                     (+ dx w -2)
-                     (+ dy line-pos -1))
-               (send dc draw-line 
-                     dx
-                     (+ dy line-pos 1)
-                     (+ dx w -2)
-                     (+ dy line-pos 1))])
-            
-            (unless (eq? style 'straight-double)
-              ;; when a single line arrow, make the arrow head's lines a tiny bit thinner
-              (send dc set-pen (send old-pen get-color) (* h pen-width-factor .8) 'solid))
-            
-            ;; upper line of arrowhead
-            (send dc draw-spline
-                  (+ dx w)
-                  (+ dy line-pos)
-                  
-                  (+ dx w (- head-width) (* head-width 1/5))
-                  (+ dy line-pos (- (* head-height 4/16)))
-                  
-                  (+ dx w (- head-width))
-                  (+ dy line-pos (- (/ head-height 2))))
-            
-            ;; lower line of arrowhead
-            (send dc draw-spline
-                  (+ dx w)
-                  (+ dy line-pos)
-                  
-                  (+ dx w (- head-width) (* head-width 1/5))
-                  (+ dy line-pos (+ (* head-height 4/16)))
-                  
-                  (+ dx w (- head-width))
-                  (+ dy line-pos (+ (/ head-height 2))))
-            
-            (send dc set-smoothing old-smoothing)
-            (send dc set-pen old-pen)
-            (send dc set-brush old-brush)))
-        w h (- h d) d)
-       2 0))))
diff --git a/pkgs/redex-pkgs/redex-pict-lib/redex/private/core-layout.rkt b/pkgs/redex-pkgs/redex-pict-lib/redex/private/core-layout.rkt
deleted file mode 100644
index 729cd90026..0000000000
--- a/pkgs/redex-pkgs/redex-pict-lib/redex/private/core-layout.rkt
+++ /dev/null
@@ -1,940 +0,0 @@
-#lang racket/base
-
-(require redex/private/loc-wrapper
-         redex/private/matcher
-         redex/private/reduction-semantics
-         redex/private/underscore-allowed
-         
-         texpict/utils
-         texpict/mrpict
-        
-         racket/match
-         racket/draw
-         racket/class
-         racket/contract 
-         
-         (for-syntax racket/base
-                     syntax/parse))
-
-(define pink-code-font 'modern)
-
-(provide find-enclosing-loc-wrapper
-         render-lw
-         lw->pict
-         basic-text
-         metafunction-text
-         grammar-style
-         paren-style
-         default-style
-         label-style
-         non-terminal-style
-         non-terminal-subscript-style
-         non-terminal-superscript-style
-         label-font-size
-         default-font-size
-         metafunction-font-size
-         non-terminal
-         literal-style
-         metafunction-style
-         delimit-ellipsis-arguments?
-         
-         open-white-square-bracket
-         close-white-square-bracket
-         default-white-square-bracket
-         homemade-white-square-bracket
-         white-square-bracket
-         
-         just-before
-         just-after
-         with-unquote-rewriter
-         with-compound-rewriter
-         with-compound-rewriters
-         with-atomic-rewriter
-         STIX?
-         white-bracket-sizing
-         apply-rewrites
-         use-homemade-white-brackets
-         left-curly-bracket-upper-hook
-         left-curly-bracket-middle-piece
-         left-curly-bracket-lower-hook
-         curly-bracket-extension
-         
-         ;; for test suite
-         build-lines
-         (struct-out token)
-         (struct-out string-token)
-         (struct-out pict-token)
-         (struct-out spacer-token)
-         (struct-out line)
-         current-text)
-  
-  (define STIX? #f)
-  
-  ;; atomic-rewrite-table : (parameter (listof (list symbol (union string pict))))
-  (define atomic-rewrite-table 
-    (make-parameter 
-     `((... ,(λ ()
-               (if STIX?
-                   (basic-text "\u22ef" (default-style))
-                   (basic-text "..." (default-style)))))
-       (hole "[]"))))
-  
-  (define-syntax (with-atomic-rewriter stx)
-    (syntax-parse stx
-      [(_ name transformer e:expr)
-       #:declare name
-       (expr/c #'symbol?
-               #:name "atomic-rewriter name")
-       #:declare transformer
-       (expr/c #'(or/c (-> pict?) string?)
-               #:name "atomic-rewriter rewrite")
-       #'(parameterize ([atomic-rewrite-table
-                         (cons (list name.c transformer.c)
-                               (atomic-rewrite-table))])
-           e)]))
-  
-  ;; compound-rewrite-table : (listof lw) -> (listof (union lw pict string))
-  (define compound-rewrite-table 
-    (make-parameter 
-     `((in-hole ,(λ (args)
-                   (let ([context (list-ref args 2)]
-                         [thing-in-hole (list-ref args 3)])
-                     (if (and (lw? thing-in-hole)
-                              (equal? (lw-e thing-in-hole) 'hole))
-                         (list (blank) context (blank))
-                         (list (blank) 
-                               context 
-                               "" 
-                               (basic-text "[" (default-style))
-                               thing-in-hole
-                               (basic-text "]" (default-style)))))))
-       (hide-hole ,(λ (args)
-                     (list (blank)
-                           (list-ref args 2)
-                           (blank))))
-       (name ,(λ (args)
-                (let ([open-paren (list-ref args 0)]
-                      [the-name (list-ref args 2)]
-                      [close-paren (list-ref args 4)])
-                  (list (blank)
-                        the-name
-                        (blank))))))))
-  
-  (define-syntax-rule 
-    (with-compound-rewriter name rewriter body)
-    (with-compound-rewriters ([name rewriter]) body))
-  (define-syntax (with-compound-rewriters stx)
-    (syntax-parse stx
-      [(_ ([name rewriter] ...) body:expr)
-       #:declare name (expr/c #'symbol? #:name "compound-rewriter name")
-       #:declare rewriter (expr/c #'(-> (listof lw?)
-                                        (listof (or/c lw? string? pict?)))
-                                  #:name "compound-rewriter transformer")
-       #'(parameterize ([compound-rewrite-table
-                         (append (reverse (list (list name rewriter.c) ...))
-                                 (compound-rewrite-table))])
-           body)]))
-  
-  
-  (define-syntax (with-unquote-rewriter stx)
-    (syntax-parse stx
-      [(_ transformer e:expr)
-       #:declare transformer
-       (expr/c #'(-> lw? lw?)
-               #:name "unquote-rewriter")
-       #'(parameterize ([current-unquote-rewriter transformer.c])
-           e)]))
-  (define current-unquote-rewriter (make-parameter values))
-  
-  ;; token = string-token | spacer-token | pict-token | align-token | up-token
-  
-  (define-struct token (column span) #:inspector (make-inspector))
-  
-  ;; string : string
-  ;; style : valid third argument to mrpict.rkt's `text' function
-  (define-struct (string-token token) (string style) #:inspector (make-inspector))
-  
-  ;; width : number
-  ;; pict : pict
-  (define-struct (pict-token token) (pict) #:inspector (make-inspector))
-  
-  ;; spacer : number
-  (define-struct (spacer-token token) () #:inspector (make-inspector))
-
-  ;; pict : pict
-  ;; this token always appears at the beginning of a line and its width
-  ;; is the x-coordinate of the pict inside itself (which must appear on
-  ;; an earlier line)
-  (define-struct align-token (pict) #:inspector (make-inspector))
-
-  ;; lines : number
-  ;; this token corresponds to a deletion of a bunch of vertical space
-  ;; things following it start 'lines' lines higher up.
-  (define-struct (up-token token) (lines) #:inspector (make-inspector))
-  
-  ;; n : number (the line number)
-  ;; tokens : (listof token)
-  (define-struct line (n tokens) #:inspector (make-inspector))
-  
-  (define (render-lw nts lw)
-    (parameterize ([dc-for-text-size (make-object bitmap-dc% (make-object bitmap% 1 1))])
-      (lw->pict nts lw)))
-  
-  (define (lw->pict nts lw)
-    (lines->pict 
-     (setup-lines 
-      (build-lines 
-       (if (compiled-lang? nts)
-           (language-nts nts)
-           nts)
-       (apply-rewrites lw)))))
-  
-  (define (apply-rewrites orig-lw)
-    (define (ar/lw an-lw)
-      (cond
-        [(eq? 'spring an-lw) an-lw]
-        [(lw? an-lw)
-         (let* ([w-out-term-let (remove-term-let an-lw)]
-                [rewritten 
-                 (if (lw-unq? w-out-term-let)
-                     ((current-unquote-rewriter) w-out-term-let)
-                     w-out-term-let)])
-           (if (equal? rewritten an-lw)
-               (struct-copy lw
-                            an-lw
-                            [e (ar/e (lw-e an-lw)
-                                     (lw-line an-lw)
-                                     (lw-line-span an-lw)
-                                     (lw-column an-lw)
-                                     (lw-column-span an-lw))])
-               (ar/lw rewritten)))]))
-    
-    (define (remove-term-let an-lw)
-      (if (lw-unq? an-lw)
-          (let ([content (lw-e an-lw)])
-            (if (and (pair? content)
-                     (pair? (cdr content))
-                     (lw? (cadr content))
-                     (equal? 'term-let (lw-e (cadr content))))
-                (struct-copy lw
-                             an-lw
-                             [e (append (list (just-before "" an-lw) 'spring)
-                                        (lw-e (second-to-last content))
-                                        (list 'spring (just-after "" an-lw)))])
-                an-lw))
-          an-lw))
-    
-    (define (ar/e e line line-span col col-span)
-      (cond
-        [(symbol? e) e]
-        [(string? e) e]
-        [(pict? e) e]
-        [(and (pair? e)
-              (lw? (car e))
-              (member (lw-e (car e)) '("(" "[" "{")) ;; ensures we're really beginning a sequence
-                                                     ;; only useful for typesetting grammars, due to
-                                                     ;; the loc-wrappers that it synthesizes
-              (pair? (cdr e))
-              (lw? (cadr e))
-              (assoc (lw-e (cadr e)) (compound-rewrite-table)))
-         =>
-         (λ (m)
-           (let ([rewritten ((cadr m) e)])
-             (when (and (pair? rewritten)
-                        (pair? (cdr rewritten))
-                        (eq? (cadr rewritten) 
-                             (cadr e)))
-               (error 'apply-rewrites "rewritten version still has symbol of the same name as original: ~s" 
-                      (cadr rewritten)))
-             (let ([adjusted 
-                    (adjust-spacing rewritten 
-                                    line line-span col col-span
-                                    (lw-e (cadr e)))])
-               (map ar/lw adjusted))))]
-        [(and (pair? e)
-              (pair? (cdr e))
-              (lw? (cadr e))
-              (lw-metafunction? (cadr e)))
-         (map ar/lw (rewrite-metafunction-app e
-                                              line line-span col col-span 
-                                              (lw-e (cadr e))))]
-        [else
-         (map ar/lw e)]))
-    (ar/lw orig-lw))
-  
-  (define (second-to-last l)
-    (cond
-      [(null? l) (error 'second-to-last "empty list")]
-      [(null? (cdr l)) (error 'second-to-last "one element list")]
-      [else (let loop ([l (cddr l)]
-                       [fst (car l)]
-                       [snd (cadr l)])
-              (cond
-                [(null? l) fst]
-                [else (loop (cdr l)
-                            snd
-                            (car l))]))]))
-    
-  (define (rewrite-metafunction-app lst line line-span col col-span something-or-other)
-    (list* (build-lw "" line 0 col 0)
-           'spring
-           (just-after (hbl-append 
-                        (metafunction-text (symbol->string (lw-e (cadr lst))))
-                        (open-white-square-bracket))
-                       (cadr lst))
-           'spring
-           (let loop ([lst (cddr lst)])
-             (cond
-               [(null? lst) null]
-               [(null? (cdr lst))
-                (let ([last (car lst)])
-                  (list (build-lw "" (lw-line last) 0 (lw-column last) 0)
-                        'spring
-                        (just-after (close-white-square-bracket) last)))]
-               [(null? (cddr lst))
-                (cons (car lst) (loop (cdr lst)))]
-               [else 
-                (if (and (not (delimit-ellipsis-arguments?))
-                         (eq? '... (lw-e (cadr lst))))
-                    (cons (car lst)
-                          (loop (cdr lst)))
-                    (list* (car lst) 
-                           (just-after (basic-text "," (default-style)) (car lst))
-                           (loop (cdr lst))))]))))
-  
-  (define (just-before what lw)
-    (build-lw (if (symbol? what)
-                  (symbol->string what)
-                  what)
-              (lw-line lw)
-              0
-              (lw-column lw)
-              0))
-  
-  (define (just-after what lw)
-    (build-lw (if (symbol? what)
-                  (symbol->string what)
-                  what)
-              (+ (lw-line lw) (lw-line-span lw))
-              0
-              (+ (lw-column lw) (lw-column-span lw))
-              0))
-  
-  ;; adjust-spacing : (listof (union string pict loc-wrapper))
-  ;;                  number
-  ;;                  number
-  ;;                  symbol
-  ;;               -> (listof loc-wrapper)
-  ;; builds loc-wrappers out of the strings in the rewrittens, 
-  ;; using the originals around the string in order to find column numbers for the strings
-  ;; NB: there is still an issue with this code -- if the rewrite drops stuff that
-  ;;     appears at the end of the sequence, blank space will still appear in the final output ...
-  ;;     When this is fixed, remove the workaround for the `in-hole' rewriter.
-  (define (adjust-spacing in-rewrittens init-line init-line-span init-column init-column-span who)
-    (let loop ([rewrittens in-rewrittens]
-               [line init-line]
-               [column init-column])
-      (let* ([to-wrap (collect-non-lws rewrittens)]
-             [next-lw (first-lws rewrittens)]
-             [after-next-lw (drop-to-lw-and1 rewrittens)]
-             [next-lw-line (if next-lw
-                               (lw-line next-lw)
-                               (+ init-line init-line-span))]
-             [next-lw-column (if next-lw
-                                 (lw-column next-lw)
-                                 (+ init-column init-column-span))])
-        ;; error checking
-        (cond
-          [(= line next-lw-line)
-           (when (next-lw-column . < . column)
-             (error 'adjust-spacing "for ~a; loc-wrapper takes up too many columns. Expected it to not pass ~a, but it went to ~a"
-                    who
-                    next-lw-column
-                    column))]
-          [(next-lw-line . < . line)
-           (error 'adjust-spacing "for ~a; last loc-wrapper takes up too many lines. Expected it to not pass line ~a, but it went to ~a"
-                  who
-                  next-lw-line
-                  line)])
-        (let* ([next-line (+ next-lw-line
-                             (if next-lw
-                                 (lw-line-span next-lw)
-                                 0))]
-               [next-column (+ next-lw-column 
-                               (if next-lw
-                                   (lw-column-span next-lw)
-                                   0))])
-          (cond
-            [(and after-next-lw (null? to-wrap))
-             (cons next-lw (loop after-next-lw next-line next-column))]
-            [(and (not after-next-lw) (null? to-wrap))
-             '()]
-            [else
-             (let-values ([(to-wrap1 to-wrap2) (extract-pieces-to-wrap who to-wrap)])
-               (let ([new-lw-col
-                      (if (= line next-lw-line)
-                          column
-                          init-column)]
-                     [new-lw-col-span
-                      (if (= line next-lw-line)
-                          (- next-lw-column column)
-                          (- next-lw-column init-column))])
-                 (list* (build-lw to-wrap1 line 0 new-lw-col 0)
-                        'spring
-                        (build-lw (blank)
-                                  line
-                                  (- next-lw-line line)
-                                  new-lw-col 
-                                  new-lw-col-span)
-                        'spring
-                        (build-lw to-wrap2 next-lw-line 0 (+ new-lw-col new-lw-col-span) 0)
-                        (if after-next-lw
-                            (cons next-lw (loop after-next-lw next-line next-column))
-                            '()))))])))))
-  
-  (define (extract-pieces-to-wrap who lst)
-    (let ([fst (car lst)])
-      (if (pair? (cdr lst))
-          (let ([snd (cadr lst)])
-            (when (pair? (cddr lst))
-              (error 'adjust-spacing 
-                     "for ~a; found ~a consecutive loc-wrappers, expected at most 2: ~a"
-                     who
-                     (length lst)
-                     (apply string-append
-                            (format "~s" fst)
-                            (map (λ (x) (format " ~s" x)) (cdr lst)))))
-            (values fst snd))
-          (values fst (blank)))))
-  
-  (define (drop-to-lw-and1 lst)
-    (let loop ([lst lst])
-      (cond
-        [(null? lst) #f]
-        [else
-         (let ([ele (car lst)])
-           (if (lw? ele)
-               (cdr lst)
-               (loop (cdr lst))))])))
-    
-  (define (collect-non-lws lst)
-    (let loop ([lst lst])
-      (cond
-        [(null? lst) null]
-        [else
-         (let ([ele (car lst)])
-           (if (lw? ele)
-               null
-               (cons ele (loop (cdr lst)))))])))
-  
-  (define (first-lws lst)
-    (let loop ([lst lst])
-      (cond
-        [(null? lst) #f]
-        [else
-         (let ([ele (car lst)])
-           (if (lw? ele) 
-               ele
-               (loop (cdr lst))))])))
-  
-  (define (build-lines all-nts lw)
-    (define initial-column (lw-column lw))
-    (define initial-line (lw-line lw))
-    (define current-line (lw-line lw))
-    (define current-column (lw-column lw))
-    
-    ;; if there are lines that are in the source, 
-    ;; but should not be rendered as blank lines, this counts them
-    ;; specifically it is the number of such lines that have
-    ;; already passed.
-    (define gobbled-lines 0)
-    
-    (define last-token-spring? #f)
-    (define tokens '())
-    (define lines '())
-    (define (eject line line-span col col-span atom unquoted?)
-      (cond
-        [(= current-line line)
-         (void)]
-        [(< current-line line)
-         (let ([lines-to-end (- line current-line)])
-           
-           (set! lines (cons (make-line (- current-line gobbled-lines) (reverse tokens)) lines))
-           (set! tokens '())
-           
-           (cond [last-token-spring? 
-                  ;; gobble up empty lines
-                  ;; we gobble up lines so that we continue on the line we were
-                  ;; on before (which is actually now split into two different elements of the line list)
-                  (set! gobbled-lines (+ gobbled-lines lines-to-end))]
-                 [else 
-                  ;; insert a bunch of blank lines
-                  (for/list ([i (in-range 1 lines-to-end)])
-                    (define new-line (make-line (+ (- current-line gobbled-lines) i) '()))
-                    (set! lines (cons new-line lines)))])
-           
-           
-           (set! tokens (cons (make-spacer-token 0 (- col initial-column))
-                              tokens))
-           
-           (set! current-line line)
-           (set! current-column col))]
-        [else
-         (error 'eject
-                "lines going backwards (current-line ~s line ~s atom ~s tokens ~s)" 
-                current-line
-                line
-                atom
-                tokens)])
-      (when (< current-column col)
-        (let ([space-span (- col current-column)])
-          (set! tokens (cons (make-blank-space-token unquoted?
-                                                     (- current-column initial-column)
-                                                     space-span)
-                             tokens))))
-      (set! last-token-spring? #f)
-      (set! tokens (append 
-                    (reverse
-                     (atom->tokens (- col initial-column) col-span atom all-nts unquoted?))
-                    tokens))
-      (set! current-column (+ col col-span)))
-    
-    (define (make-blank-space-token unquoted? col col-span)
-      (if last-token-spring?
-          (make-pict-token col col-span (blank))
-          (let ([str (apply string (build-list col-span (λ (x) #\space)))])
-            (if unquoted?
-                (make-pict-token col col-span (pink-background ((current-text) str pink-code-font (default-font-size))))
-                (make-string-token col col-span str (default-style))))))
-    
-    (define (handle-loc-wrapped lw)
-      (cond
-        [(memq lw '(spring spring-next))
-         (set! last-token-spring? lw)]
-        [else
-         (handle-object (lw-e lw)
-                        (lw-line lw)
-                        (lw-line-span lw)
-                        (lw-column lw)
-                        (lw-column-span lw)
-                        (lw-unq? lw))]))
-    
-    (define (handle-object obj line line-span col col-span unquoted?)
-      (cond
-        [(symbol? obj) (eject line line-span col col-span obj unquoted?)]
-        [(string? obj) (eject line line-span col col-span obj unquoted?)]
-        [(pict? obj) (eject line line-span col col-span obj unquoted?)]
-        [(not obj) (eject line line-span col col-span (blank) unquoted?)]
-        [else
-         (for-each (λ (x) (handle-loc-wrapped x))
-                   obj)]))
-    
-    (handle-loc-wrapped lw)
-    (set! lines (cons (make-line (- current-line gobbled-lines) (reverse tokens)) 
-                      lines)) ;; handle last line ejection
-    lines)
-  
-  ;; setup-lines : (listof line) -> (listof line)
-  ;; removes the spacer tokens from the beginning of lines, replacing them with align tokens
-  ;; expects the lines to be in reverse order
-  (define (setup-lines lines)
-    (let loop ([lines lines])
-      (cond
-        [(null? lines) null]
-        [else 
-         (let* ([line (car lines)]
-                [line-content (line-tokens line)]
-                [line-num (line-n line)]
-                [rst (cdr lines)])
-           (if (null? line-content)
-               (cons line (loop (cdr lines)))
-               (if (spacer-token? (car line-content))
-                   (let ([pict (blank)])
-                     (if (andmap (lambda (x) (null? (line-tokens x))) rst)
-                         (cons (make-line line-num (cdr line-content))
-                               (loop rst))
-                         (let ([rst (split-out (token-span (car line-content))
-                                               pict
-                                               rst)])
-                           (cons (make-line line-num (cons (make-align-token pict) (cdr line-content)))
-                                 (loop rst)))))
-                   (cons line (loop (cdr lines))))))])))
-
-  ;; split-out : number pict (listof line) -> (listof line)
-  (define (split-out col pict lines)
-    (let ([new-token (make-pict-token col 0 pict)])
-      (let loop ([lines lines])
-        (cond
-          [(null? lines)
-           ;; this case can happen when the line in question is to the left of all other lines
-           (error 'exchange-spacer "could not find matching line")]
-          [else (let* ([line (car lines)]
-                       [tokens (line-tokens line)])
-                  (if (null? tokens)
-                      (cons line (loop (cdr lines)))
-                      (let ([spacer (car tokens)])
-                        (cond
-                          [(not (spacer-token? spacer))
-                           (cons (make-line (line-n line)
-                                            (insert-new-token col new-token (token-column spacer) tokens))
-                                 (cdr lines))]
-                          [(= (token-span spacer)
-                              col)
-                           (cons (make-line (line-n line) (list* spacer new-token (cdr tokens)))
-                                 (cdr lines))]
-                          [(> (token-span spacer)
-                              col)
-                           (cons line (loop (cdr lines)))]
-                          [(< (token-span spacer)
-                              col)
-                           (cons (make-line (line-n line) (insert-new-token col new-token (token-column spacer) tokens))
-                                 (cdr lines))]))))]))))
-                  
-  ;; insert-new-token : number token number (listof token) -> (listof token)
-  (define (insert-new-token column-to-insert new-token init-width tokens)
-    (let loop ([tokens tokens]
-               [column 0])
-      (cond
-        [(null? tokens)
-         (list new-token)]
-        [else
-         (let ([tok (car tokens)])
-           (unless (token? tok)
-             (error 'insert-new-token "ack ~s" tok))
-           (cond
-             [(<= column-to-insert (token-column tok))
-              (cons new-token tokens)]
-             [(< (token-column tok)
-                 column-to-insert
-                 (+ (token-column tok) (token-span tok)))
-              (append (split-token (- column-to-insert (token-column tok)) tok new-token)
-                      (cdr tokens))]
-             [(= column-to-insert (+ (token-column tok) (token-span tok)))
-              (list* (car tokens) new-token (cdr tokens))]
-             [else 
-              (cons (car tokens)
-                    (loop (cdr tokens)
-                          (+ (token-column tok) (token-span tok))))]))])))
-               
-  (define (split-token offset tok new-token)
-    (cond
-      [(string-token? tok)
-       (define len (string-length (string-token-string tok)))
-       (list (make-string-token (token-column tok)
-                                offset
-                                (substring (string-token-string tok)
-                                           0 (min len offset))
-                                (string-token-style tok))
-             new-token
-             (make-string-token (+ (token-column tok) offset)
-                                (- (token-span tok) offset)
-                                (substring (string-token-string tok)
-                                           (min offset len)
-                                           len)
-                                (string-token-style tok)))]
-      [(pict-token? tok)
-       (list new-token)]))
-  
-  ;; lines->pict : (non-empty-listof line) -> pict
-  ;; expects the lines to be in order from bottom to top
-  (define (lines->pict lines)
-    (let ([lines-ht (make-hash)])
-      
-      ;; this loop builds a pict with all of the lines 
-      ;; in order from top to bottom, ignoring the line numbers
-      ;; it also saves the lines in the lines ht above.
-      ;; the lines are first built like that so that 'handle-single-line'
-      ;; can have its 'rst' arguments
-      (let loop ([lines lines])
-        (cond
-          [(null? lines) (blank)]
-          [(null? (cdr lines))
-           (let* ([line (car lines)]
-                  [this-pict (handle-single-line line (blank))]) 
-             (hash-set! lines-ht
-                        (line-n line)
-                        (cons this-pict (hash-ref lines-ht (line-n line) '())))
-             this-pict)]
-          [else
-           (let ([line (car lines)])
-             (let* ([rst (loop (cdr lines))]
-                    [this-pict (handle-single-line (car lines) rst)])
-               (hash-set! lines-ht
-                          (line-n line)
-                          (cons this-pict (hash-ref lines-ht (line-n line) '())))
-               (vl-append rst this-pict)))]))
-      
-      ;; build the actual pict, based on the line numbers
-      ;; the reverse ensures that when two lines have the same number,
-      ;; the "lower" one is underneat the "upper" one.
-      (let ([max (apply max (map line-n lines))]
-            [min (apply min (map line-n lines))])
-        (let loop ([i min])
-          (let ([lines (apply lbl-superimpose (reverse (hash-ref lines-ht i (list (blank)))))])
-            (cond
-              [(= i max) lines]
-              [else
-               (vl-append lines (loop (+ i 1)))]))))))
-
-  ;; handle-single-line : line pict -> pict
-  ;; builds a line, on the assumption that if the first
-  ;; token in the line is an align-token, then the pict
-  ;; that gives it its width is somewhere in 'rst'.
-  (define (handle-single-line line rst)
-    (let ([tokens (line-tokens line)])
-      (cond
-        [(null? tokens) 
-         (let ([h (pict-height (token->pict (make-string-token 0 0 "x" (default-style))))])
-           (blank 0 h))]
-        [else
-         (if (align-token? (car tokens))
-             (let-values ([(x y) (lt-find rst (align-token-pict (car tokens)))])
-               (apply htl-append 
-                      (blank x 0)
-                      (map token->pict (cdr tokens))))
-             (apply htl-append (map token->pict tokens)))])))
-  
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;;  font specs
-  ;;
-  
-  
-  (define (token->pict tok)
-    (cond
-      [(string-token? tok)
-       (basic-text (string-token-string tok) (string-token-style tok))]
-      [(pict-token? tok) (pict-token-pict tok)]
-      [else (error 'token->pict "~s" tok)]))
-  
-  (define (atom->tokens col span atom all-nts unquoted?)
-    (cond
-      [(pict? atom)
-       (list (make-pict-token col span atom))]
-      [unquoted?
-       (list (make-pict-token col span 
-                              (pink-background 
-                               ((current-text) (if (string? atom) atom (format "~a" atom))
-                                               pink-code-font
-                                               (default-font-size)))))]
-      [(and (symbol? atom)
-            (not (equal? atom '_))
-            (regexp-match #rx"^([^_^]*)_([^^]*)\\^?(.*)$" (symbol->string atom)))
-       =>
-       (match-lambda
-           [(list _ nt sub sup)
-            (let* ([sub-pict (basic-text sub (non-terminal-subscript-style))]
-                   [sup-pict (basic-text sup (non-terminal-superscript-style))]
-                   [sub+sup (lbl-superimpose sub-pict sup-pict)])
-              (list (non-terminal->token col span nt)
-                    (make-pict-token (+ col span) 0 sub+sup)))])]
-      [(or (memq atom all-nts)
-           (memq atom underscore-allowed))
-       (list (non-terminal->token col span (symbol->string atom)))]
-      [(symbol? atom)
-       (list (or (rewrite-atomic col span atom literal-style)
-                 (make-string-token col span (symbol->string atom) (literal-style))))]
-      [(member atom '("(" ")" "[" "]" "{" "}"))
-       (list (make-string-token col span atom (paren-style)))]
-      [(string? atom)
-       (list (make-string-token col span atom (default-style)))]
-      [else (error 'atom->tokens "unk ~s" atom)]))
-
-  (define (rewrite-atomic col span e get-style)
-    (cond
-     [(assoc e (atomic-rewrite-table))
-      =>
-      (λ (m)
-         (when (eq? (cadr m) e)
-           (error 'apply-rewrites "rewritten version of ~s is still ~s" e e))
-         (let ([p (cadr m)])
-           (if (procedure? p)
-               (make-pict-token col span (p))
-               (make-string-token col span p (get-style)))))]
-     [else #f]))
-
-  (define (non-terminal->token col span str)
-    (let ([e (string->symbol str)])
-      (or (rewrite-atomic col span e non-terminal-style)
-          (make-string-token col
-                             span
-                             str
-                             (non-terminal-style)))))
-  
-  (define (pick-font lst fallback)
-    (let ([fl (get-face-list 'all)])
-      (let loop ([lst lst])
-        (cond
-          [(null? lst) fallback]
-          [else (if (member (car lst) fl)
-                    (car lst)
-                    (loop (cdr lst)))]))))
-  
-  (define current-text (make-parameter text))
-
-  (define (basic-text str style) ((current-text) str style (default-font-size)))
-  (define (non-terminal str) ((current-text) str (non-terminal-style) (default-font-size)))
-  (define (unksc str) (pink-background ((current-text) str pink-code-font (default-font-size))))
-  (define non-terminal-style (make-parameter '(italic . roman)))
-  (define non-terminal-subscript-style (make-parameter `(subscript . ,(non-terminal-style))))
-  (define non-terminal-superscript-style (make-parameter `(superscript . ,(non-terminal-style))))
-  (define default-style (make-parameter 'roman))
-  (define grammar-style (make-parameter 'roman))
-  (define paren-style (make-parameter 'roman))
-  (define metafunction-style (make-parameter 'swiss))
-  (define (metafunction-text str) ((current-text) str (metafunction-style) (metafunction-font-size)))
-  (define literal-style (make-parameter 'swiss))
-  (define label-style (make-parameter 'swiss))
-  (define default-font-size (make-parameter 14))
-  (define metafunction-font-size (make-parameter (default-font-size)))
-  (define label-font-size (make-parameter 14))
-  (define delimit-ellipsis-arguments? (make-parameter #t))
-
-(define white-square-bracket-cache (make-hash))
-(define (default-white-square-bracket open?)
-  (define key (list (current-text) (default-style) (default-font-size) open?))
-  (cond
-    [(hash-ref white-square-bracket-cache key #f) => values]
-    [else
-     (define candidate ((current-text) (if open? "〚" "〛") (default-style) (default-font-size)))
-     (define w (inexact->exact (ceiling (pict-width candidate))))
-     (define h (inexact->exact (ceiling (pict-height candidate))))
-     (define bmp (make-bitmap w h))
-     (define bdc (make-object bitmap-dc% bmp))
-     (draw-pict candidate bdc 0 0)
-     (define bytes (make-bytes (* w h 4)))
-     (send bmp get-argb-pixels 0 0 w h bytes)
-     (define (white-pixel? x y)
-       (define c (* 4 (+ (* y w) x)))
-       (= (bytes-ref bytes c) 0))
-     (define outermost-x
-       (let/ec k
-         (for ([x (if open?
-                      (in-range w)
-                      (in-range (- w 1) -1 -1))])
-           (define the-y
-             (for/or ([y (in-range h)])
-               (and (not (white-pixel? x y))
-                    y)))
-           (when the-y
-             (k x)))))
-     (define pict
-       (cond 
-         [(if open?
-              (<= 1/2 (/ outermost-x w))
-              (<= 1/2 (/ (- w outermost-x) w)))
-          ;; when the entire half is white
-          (if open?
-              (inset/clip candidate (- (/ w 3)) 0 0 0)
-              (inset/clip candidate 0 0 (- (/ w 3)) 0))]
-         [else
-          candidate]))
-     (hash-set! white-square-bracket-cache key pict)
-     pict]))
-
-(define (homemade-white-square-bracket open?)
-  (white-bracket (if open? "[" "]")))
-
-(define white-square-bracket (make-parameter default-white-square-bracket))
-(define use-homemade-white-brackets (make-parameter #f))
-(define (open-white-square-bracket) ((white-square-bracket) #t))
-(define (close-white-square-bracket) ((white-square-bracket) #f))
-
-(define left-curly-bracket-upper-hook "⎧")
-(define left-curly-bracket-middle-piece "⎨")
-(define left-curly-bracket-lower-hook "⎩")
-(define curly-bracket-extension "⎪")
-
-  ;; white-bracket : string -> pict
-  ;; puts two of `str' next to each other to make 
-  ;; a `white' version of the bracket.
-  (define (white-bracket str)
-    (let-values ([(left-inset-amt right-inset-amt left-space right-space)
-                  ((white-bracket-sizing) str 
-                                          (default-font-size))])
-      (let ([main-bracket (basic-text str (default-style))])
-        (inset (refocus (cbl-superimpose main-bracket
-                                         (hbl-append (blank left-inset-amt)
-                                                     (basic-text str (default-style))
-                                                     (blank right-inset-amt)))
-                        main-bracket)
-               left-space
-               0
-               right-space
-               0))))
-  
-  (define white-bracket-sizing 
-    (make-parameter
-     (λ (str size)
-       (let ([inset-amt (floor/even (max 4 (* size 1/2)))])
-         (cond
-           [(equal? str "[")
-            (values inset-amt
-                    0
-                    0
-                    (/ inset-amt 2))]
-           [else
-            (values 0
-                    inset-amt
-                    (/ inset-amt 2)
-                    0)])))))
-
-  (define (floor/even x)
-    (let ([x (floor x)])
-      (if (odd? x)
-          (- x 1)
-          x)))
-  
-  (define (pink-background p)
-    (refocus
-     (cc-superimpose 
-      (colorize (filled-rectangle (pict-width p)
-                                  (pict-height p)
-                                  #:draw-border? #f)
-                "pink")
-      p)
-     p))
-  
-  (define (add-between i l)
-    (cond
-      [(null? l) l]
-      [else 
-       (cons (car l)
-             (apply append 
-                    (map (λ (x) (list i x)) (cdr l))))]))
-  
-  
-  ;; for use 
-  (define (find-enclosing-loc-wrapper lws)
-    (let* ([first-line (apply min (map lw-line lws))]
-           [last-line (apply min (map (λ (x) (+ (lw-line x) (lw-line-span x))) lws))]
-           [last-line-lws (find-lws-with-matching-last-line lws last-line)]
-           [last-column (apply max (map (λ (x) (+ (lw-column x) (lw-column-span x))) last-line-lws))]
-           [first-column (apply min (map lw-column last-line-lws))])
-      (build-lw
-       lws
-       first-line
-       (- last-line first-line)
-       first-column
-       (- last-column first-column))))
-  
-  (define (find-lws-with-matching-last-line in-lws line)
-    (define lws '())
-    
-    (define (find/lw lw)
-      (cond
-        [(eq? lw 'spring) (void)]
-        [(lw? lw)
-         (when (= line (+ (lw-line lw) (lw-line-span lw)))
-           (set! lws (cons lw lws))
-           (find/e (lw-e lw)))]))
-    
-    (define (find/e e)
-      (cond
-        [(symbol? e) (void)]
-        [(string? e) (void)]
-        [(pict? e) (void)]
-        [else (for-each find/lw e)]))
-    
-    (find/e in-lws)
-    lws)
diff --git a/pkgs/redex-pkgs/redex-pict-lib/redex/private/pict.rkt b/pkgs/redex-pkgs/redex-pict-lib/redex/private/pict.rkt
deleted file mode 100644
index 77978c3d46..0000000000
--- a/pkgs/redex-pkgs/redex-pict-lib/redex/private/pict.rkt
+++ /dev/null
@@ -1,1510 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/draw
-         racket/class
-         racket/match
-         racket/pretty
-         racket/set
-         (only-in racket/list drop-right last partition add-between
-                  splitf-at remove-duplicates)
-         
-         pict
-         
-         redex/private/reduction-semantics
-         redex/private/judgment-form
-         redex/private/struct
-         redex/private/loc-wrapper
-         redex/private/matcher
-         redex/private/arrow
-         "core-layout.rkt")
-(require (prefix-in lw/ct: redex/private/loc-wrapper-ct)
-         (prefix-in lw/rt: redex/private/loc-wrapper-rt))
-
-(require (for-syntax racket/base
-                     redex/private/term-fn
-                     syntax/parse))
-
-(provide render-term 
-         term->pict
-         
-         render-term/pretty-write
-         term->pict/pretty-write
-         
-         to-lw/stx
-         
-         language->pict
-         render-language
-         render-language-nts
-         
-         reduction-relation->pict
-         render-reduction-relation
-         render-reduction-relation-rules
-         
-         relation->pict
-         metafunction->pict
-         metafunctions->pict
-         judgment-form->pict
-         
-         render-relation
-         render-metafunction
-         render-metafunctions
-         render-judgment-form
-         
-         basic-text
-         
-         default-style
-         grammar-style
-         paren-style
-         label-style
-         literal-style
-         metafunction-style
-         delimit-ellipsis-arguments?
-         
-         label-font-size
-         default-font-size
-         metafunction-font-size
-         reduction-relation-rule-separation
-
-         where-make-prefix-pict
-         where-combine
-         
-         just-before
-         just-after         
-         
-         non-terminal-gap-space
-         rule-pict-style
-         arrow-space
-         label-space
-         metafunction-pict-style
-         metafunction-cases
-         judgment-form-cases
-         compact-vertical-min-width
-         extend-language-show-union
-         extend-language-show-extended-order
-         set-arrow-pict!
-         arrow->pict
-         horizontal-bar-spacing
-         relation-clauses-combine
-         
-         rule-pict-info->side-condition-pict)
-
-(provide/contract
- [linebreaks (parameter/c (or/c #f (listof boolean?)))])
-
-
-;                                                                             
-;                                                                             
-;                                                                             
-;                       ;;;;                       ;    ;;                    
-;                       ;;;;                      ;;    ;;                    
-;  ;;; ;;;   ;;;     ;;;;;;; ;;;; ;;;;   ;;;;;  ;;;;;        ;;;;   ;;;; ;;;  
-;  ;;;;;;;  ;;;;;   ;;;;;;;; ;;;; ;;;;  ;;;;;; ;;;;;; ;;;;  ;;;;;;  ;;;;;;;;; 
-;  ;;;; ;; ;;;; ;; ;;;;;;;;; ;;;; ;;;; ;;;;;;;  ;;;;  ;;;; ;;;;;;;; ;;;; ;;;; 
-;  ;;;;    ;;;;;;; ;;;; ;;;; ;;;; ;;;; ;;;;     ;;;;  ;;;; ;;;; ;;; ;;;; ;;;; 
-;  ;;;;    ;;;;;   ;;;;;;;;; ;;;; ;;;; ;;;;;;;  ;;;;; ;;;; ;;;;;;;; ;;;; ;;;; 
-;  ;;;;     ;;;;;;  ;;;;;;;; ;;;;;;;;;  ;;;;;;  ;;;;; ;;;;  ;;;;;;  ;;;; ;;;; 
-;  ;;;;      ;;;;    ;;;;;;;  ;;; ;;;;   ;;;;;   ;;;; ;;;;   ;;;;   ;;;; ;;;; 
-;                                                                             
-;                                                                             
-;                                                                             
-;                                                               
-;                                                               
-;                                                               
-;                  ;;;;              ;    ;;                    
-;                  ;;;;             ;;    ;;                    
-;  ;;; ;;;   ;;;   ;;;; ;;;;;;;   ;;;;;        ;;;;   ;;;; ;;;  
-;  ;;;;;;;  ;;;;;  ;;;; ;;;;;;;; ;;;;;; ;;;;  ;;;;;;  ;;;;;;;;; 
-;  ;;;; ;; ;;;; ;; ;;;;     ;;;;  ;;;;  ;;;; ;;;;;;;; ;;;; ;;;; 
-;  ;;;;    ;;;;;;; ;;;;  ;;;;;;;  ;;;;  ;;;; ;;;; ;;; ;;;; ;;;; 
-;  ;;;;    ;;;;;   ;;;; ;;  ;;;;  ;;;;; ;;;; ;;;;;;;; ;;;; ;;;; 
-;  ;;;;     ;;;;;; ;;;; ;;;;;;;;  ;;;;; ;;;;  ;;;;;;  ;;;; ;;;; 
-;  ;;;;      ;;;;  ;;;;  ;; ;;;;   ;;;; ;;;;   ;;;;   ;;;; ;;;; 
-;                                                               
-;                                                               
-;                                                               
-
-(define (do-reduction-relation->pict what rr style)
-  (let ([rules (render-reduction-relation-rules)])
-    ((rule-pict-style->proc style)
-     (map (rr-lws->trees (language-nts (reduction-relation-lang rr)))
-          (if rules
-              (let ([ht (make-hash)])
-                (for ([rp (in-list (reduction-relation-lws rr))]
-                      [i (in-naturals)])
-                  (hash-set! ht i rp)
-                  (hash-set! ht (rule-pict-info-label rp) rp))
-                (map (lambda (label)
-                       (hash-ref ht (if (string? label)
-                                        (string->symbol label)
-                                        label)
-                                 (lambda ()
-                                   (error what
-                                          "no rule found for ~a: ~e"
-                                          (if (number? label) "index" "label")
-                                          label))))
-                     rules))
-              (reduction-relation-lws rr))))))
-
-(define (reduction-relation->pict rr #:style [style (rule-pict-style)]) 
-  (do-reduction-relation->pict 'reduction-relation->pict rr style))
-
-(define render-reduction-relation-rules (make-parameter #f))
-
-(define (render-reduction-relation rr [filename #f]
-                                   #:style [style (rule-pict-style)])
-  (if filename
-      (save-as-ps/pdf
-       (λ () (do-reduction-relation->pict 'render-reduction-relation rr style))
-       filename)
-      (parameterize ([dc-for-text-size (make-object bitmap-dc% (make-object bitmap% 1 1))])
-        (do-reduction-relation->pict 'render-reduction-relation rr style))))
-
-(define ((rr-lws->trees nts) rp)
-  (let ([tp (λ (x) (lw->pict nts x))])
-    (make-rule-pict-info (rule-pict-info-arrow rp)
-                         (tp (rule-pict-info-lhs rp))
-                         (tp (rule-pict-info-rhs rp))
-                         (rule-pict-info-label rp)
-                         (and (rule-pict-info-computed-label rp)
-                              (let ([rewritten (apply-rewrites (rule-pict-info-computed-label rp))])
-                                (and (not (and (rule-pict-info-label rp)
-                                               (let has-unq? ([x rewritten])
-                                                 (and (lw? x)
-                                                      (or (lw-unq? x)
-                                                          (and (list? (lw-e x))
-                                                               (ormap has-unq? (lw-e x))))))))
-                                     (tp rewritten))))
-                         (map (lambda (v) 
-                                (if (pair? v)
-                                    (where-pict (tp (car v)) (tp (cdr v)))
-                                    (tp v)))
-                              (rule-pict-info-side-conditions/pattern-binds rp))
-                         (map tp (rule-pict-info-fresh-vars rp)))))
-
-(define current-label-extra-space (make-parameter 0))
-(define reduction-relation-rule-separation (make-parameter 4))
-
-(define ((rule-picts->pict/horizontal left-column-align side-conditions-same-line?) rps)
-  (let* ([sep 2]
-         [max-rhs (apply max
-                         0
-                         (map pict-width
-                              (map rule-pict-info-rhs rps)))]
-         [max-w (apply max
-                       0
-                       (map (lambda (rp)
-                              (+ sep sep
-                                 (pict-width (rule-pict-info-lhs rp))
-                                 (pict-width (arrow->pict (rule-pict-info-arrow rp)))
-                                 (pict-width (rule-pict-info-rhs rp))))
-                            rps))])
-    (table 4
-           (apply
-            append
-            (let ([len (length rps)])
-              (for/list ([rp (in-list rps)]
-                         [i (in-naturals 1)])
-                (let ([arrow (hbl-append (blank (arrow-space) 0)
-                                         (arrow->pict (rule-pict-info-arrow rp))
-                                         (blank (arrow-space) 0))]
-                      [lhs (rule-pict-info-lhs rp)]
-                      [rhs (rule-pict-info-rhs rp)]
-                      [spc (basic-text " " (default-style))]
-                      [label (hbl-append (blank (label-space) 0) (rp->pict-label rp))]
-                      [sep (blank 4)])
-                  (append 
-                   (if side-conditions-same-line?
-                       (list lhs arrow 
-                             (hbl-append
-                              rhs
-                              (let ([sc (rule-pict-info->side-condition-pict rp max-w)])
-                                (inset sc (min 0 (- max-rhs (pict-width sc))) 0 0 0)))
-                             label)
-                       (list lhs arrow rhs label
-                             (blank) (blank)
-                             (let ([sc (rule-pict-info->side-condition-pict rp max-w)])
-                               (inset sc (min 0 (- max-rhs (pict-width sc))) 0 0 0))
-                             (blank)))
-                   (if (= len i)
-                       '()
-                       (list sep (blank) (blank) (blank))))))))
-           (list* left-column-align ctl-superimpose ltl-superimpose)
-           (list* left-column-align ctl-superimpose ltl-superimpose)
-           (list* sep sep (+ sep (current-label-extra-space))) 2)))
-
-(define arrow-space (make-parameter 0))
-(define label-space (make-parameter 0))
-
-(define ((make-vertical-style side-condition-combiner) rps)
-  (let* ([mk-top-line-spacer
-          (λ (rp)
-            (hbl-append (rule-pict-info-lhs rp)
-                        (basic-text " " (default-style))
-                        (arrow->pict (rule-pict-info-arrow rp))
-                        (basic-text " " (default-style))
-                        (rp->pict-label rp)))]
-         [mk-bot-line-spacer
-          (λ (rp)
-            (rt-superimpose
-             (rule-pict-info-rhs rp)
-             (rule-pict-info->side-condition-pict rp +inf.0)))]
-         [multi-line-spacer
-          (if (null? rps)
-              (blank)
-              (ghost
-               (launder
-                (ctl-superimpose 
-                 (apply ctl-superimpose (map mk-top-line-spacer rps))
-                 (apply ctl-superimpose (map mk-bot-line-spacer rps))))))]
-         [spacer (dc void 
-                     (pict-width multi-line-spacer)
-                     (pict-descent multi-line-spacer) ;; probably could be zero ...
-                     0
-                     (pict-descent multi-line-spacer))])
-    (if (null? rps)
-        (blank)
-        (apply
-         vl-append
-         (add-between
-          (map (λ (rp)
-                 (side-condition-combiner
-                  (vl-append
-                   (ltl-superimpose 
-                    (htl-append (rule-pict-info-lhs rp)
-                                (basic-text " " (default-style))
-                                (arrow->pict (rule-pict-info-arrow rp)))
-                    (rtl-superimpose 
-                     spacer
-                     (rp->pict-label rp)))
-                   (rule-pict-info-rhs rp))
-                  (rule-pict-info->side-condition-pict rp +inf.0)))
-               rps)
-          (blank 0 (reduction-relation-rule-separation)))))))
-
-(define compact-vertical-min-width (make-parameter 0))
-
-(define rule-picts->pict/vertical 
-  (make-vertical-style vr-append))
-
-(define rule-picts->pict/vertical-overlapping-side-conditions
-  (make-vertical-style rbl-superimpose))
-
-(define (rule-picts->pict/compact-vertical rps)
-  (let* ([max-w (apply max
-                       (compact-vertical-min-width)
-                       (map pict-width
-                            (append
-                             (map rule-pict-info-lhs rps)
-                             (map rule-pict-info-rhs rps))))]
-         [scs (map (lambda (rp)
-                     (rule-pict-info->side-condition-pict rp max-w))
-                   rps)]
-         [labels (map (lambda (rp)
-                        (hbl-append (blank (label-space) 0) (rp->pict-label rp)))
-                      rps)]
-         [total-w (apply max
-                         max-w
-                         (append (map pict-width scs)
-                                 (map (lambda (lbl)
-                                        (+ max-w 2 (label-space) (pict-width lbl)))
-                                      labels)))]
-         [one-line
-          (lambda (sep?)
-            (lambda (rp sc label)
-              (let ([arrow (hbl-append (arrow->pict (rule-pict-info-arrow rp))
-                                       (blank (arrow-space) 0))]
-                    [lhs (rule-pict-info-lhs rp)]
-                    [rhs (rule-pict-info-rhs rp)]
-                    [spc (basic-text " " (default-style))]
-                    [sep (blank (compact-vertical-min-width)
-                                (reduction-relation-rule-separation))]
-                    [add-label (lambda (p label)
-                                 (htl-append 
-                                  p
-                                  (inset label (- total-w (pict-width p) (pict-width label))
-                                         0 0 0)))])
-                (append
-                 (if ((apply + (map pict-width (list lhs spc arrow spc rhs)))
-                      . < .
-                      max-w)
-                     (list 
-                      (blank) (add-label (hbl-append lhs spc arrow spc rhs) label)
-                      (blank) sc)
-                     (list (blank) (add-label lhs label)
-                           arrow rhs
-                           (blank) sc))
-                 (if sep? (list (blank) sep) null)))))])
-    (if (null? rps)
-        (blank)
-        (table 2
-               (append
-                (apply
-                 append
-                 (map (one-line #t)
-                      (drop-right rps 1) 
-                      (drop-right scs 1)
-                      (drop-right labels 1)))
-                ((one-line #f) (last rps) (last scs) (last labels)))
-               ltl-superimpose ltl-superimpose
-               2 2))))
-
-;; side-condition-pict : (listof pict) (listof pict) number -> pict
-(define (side-condition-pict fresh-vars pattern-binds/sc max-w)
-  (let* ([frsh 
-          (if (null? fresh-vars)
-              null
-              (list
-               (hbl-append
-                (apply 
-                 hbl-append
-                 (add-between
-                  fresh-vars
-                  (basic-text ", " (default-style))))
-                (basic-text " fresh" (default-style)))))]
-         [lst (add-between
-               (append
-                pattern-binds/sc
-                frsh)
-               'comma)])
-    (if (null? lst)
-        (blank)
-        (let ([where ((where-make-prefix-pict))])
-          (let ([max-w (- max-w (pict-width where))])
-            (htl-append where
-                        (let loop ([p (car lst)][lst (cdr lst)])
-                          (cond
-                            [(null? lst) p]
-                            [(eq? (car lst) 'comma)
-                             (loop (htl-append p (basic-text ", " (default-style)))
-                                   (cdr lst))]
-                            [((+ (pict-width p) (pict-width (car lst))) . > . max-w)
-                             (vl-append p
-                                        (loop (car lst) (cdr lst)))]
-                            [else (loop (htl-append p (car lst)) (cdr lst))]))))))))
-
-(define where-make-prefix-pict
-  (make-parameter (lambda ()
-                    (basic-text " where " (default-style)))))
-(define otherwise-make-pict
-  (make-parameter (lambda ()
-                    (basic-text " otherwise" (default-style)))))
-
-(define (where-pict lhs rhs)
-  ((where-combine) lhs rhs))
-
-(define where-combine
-  (make-parameter (lambda (lhs rhs)
-                    (htl-append lhs (make-=) rhs))))
-
-(define (rule-pict-info->side-condition-pict rp [max-w +inf.0])
-  (side-condition-pict (rule-pict-info-fresh-vars rp)
-                       (rule-pict-info-side-conditions/pattern-binds rp)
-                       max-w))
-
-(define (rp->pict-label rp)
-  (cond [(rule-pict-info-computed-label rp) => bracket]
-        [(rule-pict-info-label rp)
-         (string->bracketed-label 
-          (format "~a" (rule-pict-info-label rp)))]
-        [else (blank)]))
-
-(define (string->bracketed-label str)
-  (define m (regexp-match #rx"^([^_]*)(?:_([^_]*)|)$" str))
-  (bracket
-   (hbl-append
-    ((current-text) (cadr m) (label-style) (label-font-size))
-    (if (caddr m)
-        ((current-text) (caddr m) `(subscript . ,(label-style)) (label-font-size))
-        (blank)))))
-
-(define (bracket label)
-  (hbl-append
-   ((current-text) " [" (label-style) (label-font-size))
-   label
-   ((current-text) "]" (label-style) (label-font-size))))
-
-(define (make-horiz-space picts) (blank (pict-width (apply cc-superimpose picts)) 0))
-
-(define rule-pict-style (make-parameter 'vertical))
-(define rule-pict-style-table 
-  (make-hash
-   (list (cons 'vertical rule-picts->pict/vertical)
-         (cons 'compact-vertical rule-picts->pict/compact-vertical)
-         (cons 'vertical-overlapping-side-conditions
-               rule-picts->pict/vertical-overlapping-side-conditions)
-         (cons 'horizontal-left-align
-               (rule-picts->pict/horizontal ltl-superimpose #f))
-         (cons 'horizontal-side-conditions-same-line
-               (rule-picts->pict/horizontal rtl-superimpose #t))
-         (cons 'horizontal
-               (rule-picts->pict/horizontal rtl-superimpose #f)))))
-   
-(define (rule-pict-style->proc style)
-  (cond
-    [(symbol? style) (hash-ref rule-pict-style-table style)]
-    [else style]))
-
-(define (mk-arrow-pict sz style)
-  (let ([cache (make-hash)])
-    (lambda ()
-      (let ([s (default-font-size)])
-        ((hash-ref cache s
-                   (lambda ()
-                     (let ([f (make-arrow-pict sz style 'roman s)])
-                       (hash-set! cache s f)
-                       f))))))))
-
-(define long-arrow-pict (mk-arrow-pict "xxx" 'straight))
-(define short-arrow-pict (mk-arrow-pict "m" 'straight))
-(define curvy-arrow-pict (mk-arrow-pict "xxx" 'curvy))
-(define short-curvy-arrow-pict (mk-arrow-pict "m" 'curvy))
-(define double-arrow-pict (mk-arrow-pict "xxx" 'straight-double))
-(define short-double-arrow-pict (mk-arrow-pict "m" 'straight-double))
-(define map-arrow-pict (mk-arrow-pict "m" 'map))
-(define long-map-arrow-pict (mk-arrow-pict "xxx" 'map))
-
-(define user-arrow-table (make-hasheq))
-(define (set-arrow-pict! arr thunk)
-  (hash-set! user-arrow-table arr thunk))
-
-(define (arrow->pict arr)
-  (let ([ut (hash-ref user-arrow-table arr #f)])
-    (if ut
-        (ut)
-        (case arr
-          [(--> -+>) (long-arrow-pict)]
-          [(==>) (double-arrow-pict)]
-          [(->) (short-arrow-pict)]
-          [(=>) (short-double-arrow-pict)]
-          [(..>) (basic-text "\u21E2" (default-style))]
-          [(>->) (basic-text "\u21a3" (default-style))]
-          [(~~>) (curvy-arrow-pict)]
-          [(~>) (short-curvy-arrow-pict)]
-          [(:->) 
-           (if STIX?
-               (basic-text "\u21a6" (default-style))
-               (map-arrow-pict))]
-          [(:-->) 
-           (if STIX?
-               (basic-text "\u27fc" (default-style))
-               (long-map-arrow-pict))]
-          [(c->) (basic-text "\u21aa" (default-style))]
-          [(-->>) (basic-text "\u21a0" (default-style))]
-          [(>--) (basic-text "\u291a" (default-style))]
-          [(--<) (basic-text "\u2919" (default-style))]
-          [(>>--) (basic-text "\u291c" (default-style))]
-          [(--<<) (basic-text "\u291b" (default-style))]
-          [else (error 'arrow->pict "unknown arrow ~s" arr)]))))
-
-
-
-;                                                                       
-;                                                                       
-;                                                                       
-;  ;;;;                                                                 
-;  ;;;;                                                                 
-;  ;;;; ;;;;;;;  ;;;; ;;;   ;;;;;;; ;;;; ;;;; ;;;;;;;   ;;;;;;;   ;;;   
-;  ;;;; ;;;;;;;; ;;;;;;;;; ;;;;;;;; ;;;; ;;;; ;;;;;;;; ;;;;;;;;  ;;;;;  
-;  ;;;;     ;;;; ;;;; ;;;; ;;; ;;;; ;;;; ;;;;     ;;;; ;;; ;;;; ;;;; ;; 
-;  ;;;;  ;;;;;;; ;;;; ;;;; ;;;;;;;; ;;;; ;;;;  ;;;;;;; ;;;;;;;; ;;;;;;; 
-;  ;;;; ;;  ;;;; ;;;; ;;;;  ;;;;;;; ;;;; ;;;; ;;  ;;;;  ;;;;;;; ;;;;;   
-;  ;;;; ;;;;;;;; ;;;; ;;;; ;   ;;;; ;;;;;;;;; ;;;;;;;; ;   ;;;;  ;;;;;; 
-;  ;;;;  ;; ;;;; ;;;; ;;;; ;;;;;;;;  ;;; ;;;;  ;; ;;;; ;;;;;;;;   ;;;;  
-;                          ;;;;;;;;                    ;;;;;;;;         
-;                           ;;;;;;                      ;;;;;;          
-;                                                                       
-
-;; type flattened-language-pict-info =
-;;   (listof (cons (listof symbol[nt]) (listof loc-wrapper[rhs])))
-;; type language-pict-info = 
-;;  (union (vector flattened-language-pict-info language-pict-info) 
-;;         flattened-language-pict-info)
-
-(define (render-language lang [filename #f] #:nts [nts (render-language-nts)])
-  (if filename
-      (save-as-ps/pdf (λ () (do-language->pict 'render-language lang nts)) filename)
-      (parameterize ([dc-for-text-size (make-object bitmap-dc% (make-object bitmap% 1 1))])
-        (do-language->pict 'render-language lang nts))))
-
-(define (language->pict lang #:nts [nts (render-language-nts)])
-  (do-language->pict 'language->pict lang nts))
-
-(define (do-language->pict what lang specd-non-terminals)
-  (unless (compiled-lang-pict-builder lang)
-    (error what "cannot render the result of define-union-language"))
-  (let ([all-non-terminals (hash-map (compiled-lang-ht lang) (λ (x y) x))])
-    (when specd-non-terminals
-      (check-non-terminals what specd-non-terminals lang))
-    (make-grammar-pict (compiled-lang-pict-builder lang) 
-                       (or specd-non-terminals all-non-terminals)
-                       all-non-terminals)))
-
-(define render-language-nts (make-parameter #f))
-
-(define (check-non-terminals what nts lang)
-  (let ([langs-nts (language-nts lang)])
-    (for-each
-     (λ (nt) 
-       (unless (memq nt langs-nts)
-         (error what 
-                "the non-terminal ~s is not one of the language's nonterminals (~a)"
-                nt
-                (if (null? langs-nts)
-                    "it has no non-terminals"
-                    (apply
-                     string-append
-                     "which are: "
-                     (format "~a" (car langs-nts))
-                     (map (λ (x) (format " ~a" x)) (cdr langs-nts)))))))
-     nts)))
-
-;; save-as-ps/pdf : (-> pict) path-string -> void
-(define (save-as-ps/pdf mk-pict filename) 
-  (let ([ps/pdf-dc (make-ps/pdf-dc filename)])
-    (parameterize ([dc-for-text-size ps/pdf-dc])
-      (send ps/pdf-dc start-doc "x")
-      (send ps/pdf-dc start-page)
-      (draw-pict (mk-pict) ps/pdf-dc 0 0)
-      (send ps/pdf-dc end-page)
-      (send ps/pdf-dc end-doc))))
-
-(define (make-ps/pdf-dc filename)
-  (let ([ps-setup (make-object ps-setup%)])
-    (send ps-setup copy-from (current-ps-setup))
-    (send ps-setup set-file filename)
-    (send ps-setup set-mode 'file)
-    (define is-pdf? 
-      (cond
-        [(path? filename) (regexp-match #rx#"[.]pdf$" (path->bytes filename))]
-        [else (regexp-match #rx"[.]pdf$" filename)]))
-    (define % (if is-pdf? pdf-dc% post-script-dc%))
-    (parameterize ([current-ps-setup ps-setup])
-      (make-object % #f #f))))
-
-(define non-terminal-gap-space (make-parameter 0))
-
-;; raw-info : language-pict-info
-;; nts : (listof symbol) -- the nts that the user expects to see
-(define (make-grammar-pict raw-info nts all-nts)
-  (let* ([info (remove-unwanted-nts nts (flatten-grammar-info raw-info all-nts nts))]
-         [term-space 
-          (launder
-           (ghost
-            (apply cc-superimpose (map (λ (x) (sequence-of-non-terminals (car x)))
-                                       info))))])
-    (apply vl-append
-           (non-terminal-gap-space)
-           (map (λ (line)
-                  (htl-append 
-                   (rc-superimpose term-space (sequence-of-non-terminals (car line)))
-                   (lw->pict
-                    all-nts
-                    (find-enclosing-loc-wrapper (add-bars-and-::= (cdr line))))))
-                info))))
-
-(define (sequence-of-non-terminals nts)
-  (let ([draw-nt (lambda (nt)
-                   (lw->pict nts (build-lw nt 0 0 0 0)))])
-    (let loop ([nts (cdr nts)]
-               [pict (draw-nt (car nts))])
-      (cond
-       [(null? nts) pict]
-       [else 
-        (loop (cdr nts)
-              (hbl-append pict 
-                          (non-terminal ", ")
-                          (draw-nt (car nts))))]))))
-
-
-(define extend-language-show-union (make-parameter #f))
-(define extend-language-show-extended-order (make-parameter #f))
-
-;; remove-unwanted-nts : (listof symbol) flattened-language-pict-info -> flattened-language-pict-info
-(define (remove-unwanted-nts nts info)
-  (filter (λ (x) (not (null? (car x))))
-          (map
-           (λ (x) (cons (filter (λ (x) (member x nts)) (car x))
-                        (cdr x)))
-           info)))
-
-
-;; flatten-grammar-info : language-pict-info (listof symbol) -> flattened-language-pict-info
-(define (flatten-grammar-info info all-nts wanted-nts)
-  (define (merge-line nt extension orig-line)
-    (cond
-     [(and extension orig-line)
-      (let ([rhss (cdr extension)])
-        (cons nt
-              (map (λ (x)
-                     (if (and (lw? x) (eq? '.... (lw-e x)))
-                         (struct-copy lw
-                                      x
-                                      [e
-                                       (lw->pict all-nts
-                                                 (find-enclosing-loc-wrapper
-                                                  (add-bars (cdr orig-line))))])
-                         x))
-                   (cdr extension))))]
-     [extension extension]
-     [else orig-line]))
-  (let ([union? (extend-language-show-union)]
-        [ext-order? (extend-language-show-extended-order)])
-    (let loop ([info info])
-      (cond
-        [(vector? info) 
-         (let ([orig (loop (vector-ref info 0))]
-               [extensions (vector-ref info 1)])
-           (if union?
-               (cond
-                [(not ext-order?)
-                 ;; Use original order, adding extra extensions after:
-                 (define orig-nts (list->set (map car orig)))
-                 (append
-                  (map (λ (orig-line)
-                         (define nt (car orig-line))
-                         (merge-line nt (assoc nt extensions) orig-line))
-                       orig)
-                  (filter (lambda (extension) (not (set-member? orig-nts (car extension))))
-                          extensions))]
-                [else
-                 ;; Use extension order, adding any extra originals after:
-                 (define ext-nts (list->set (map car extensions)))
-                 (append
-                  (map (λ (extension)
-                         (define nt (car extension))
-                         (merge-line nt extension (assoc nt orig)))
-                       extensions)
-                  (filter (lambda (orig-line) (not (set-member? ext-nts (car orig-line))))
-                          orig))])
-               extensions))]
-        [else info]))))
-
-(define (make-::=) (basic-text " ::= " (grammar-style)))
-(define (make-bar) 
-  (basic-text " | " (grammar-style))
-  #;
-  (let ([p (basic-text " | " (grammar-style))])
-    (dc 
-     (λ (dc dx dy)
-       (cond
-         [(is-a? dc post-script-dc%)
-          (let ([old-pen (send dc get-pen)])
-            (send dc set-pen "black" .6 'solid)
-            (send dc draw-line 
-                  (+ dx (/ (pict-width p) 2)) dy
-                  (+ dx (/ (pict-width p) 2)) (+ dy (pict-height p)))
-            (send dc set-pen old-pen))]
-         [else
-          (send dc draw-text " | " dx dy)]))
-     (pict-width p)
-     (pict-height p)
-     (pict-ascent p)
-     (pict-descent p))))
-
-(define (add-bars-and-::= lst)
-  (cond
-    [(null? lst) null]
-    [else
-     (cons
-      (let ([fst (car lst)])
-        (build-lw
-         (rc-superimpose (ghost (make-bar)) (make-::=))
-         (lw-line fst)
-         (lw-line-span fst)
-         (lw-column fst)
-         0))
-      (let loop ([fst (car lst)]
-                 [rst (cdr lst)])
-        (cond
-          [(null? rst) (list fst)]
-          [else 
-           (let* ([snd (car rst)]
-                  [bar 
-                   (cond
-                     [(= (lw-line snd)
-                         (lw-line fst))
-                      (let* ([line (lw-line snd)]
-                             [line-span (lw-line-span snd)]
-                             [column (+ (lw-column fst)
-                                        (lw-column-span fst))]
-                             [column-span
-                              (max (- (lw-column snd)
-                                      (+ (lw-column fst)
-                                         (lw-column-span fst)))
-                                   0)])
-                        (build-lw (make-bar) line line-span column column-span))]
-                     [else
-                      (build-lw
-                       (rc-superimpose (make-bar) (ghost (make-::=)))
-                       (lw-line snd)
-                       (lw-line-span snd)
-                       (lw-column snd)
-                       0)])])
-             (list* fst
-                    bar
-                    (loop snd (cdr rst))))])))]))
-
-(define (add-bars lst)
-  (let loop ([fst (car lst)]
-             [rst (cdr lst)])
-    (cond
-      [(null? rst) (list fst)]
-      [else 
-       (let* ([snd (car rst)]
-              [bar 
-               (cond
-                 [(= (lw-line snd)
-                     (lw-line fst))
-                  (let* ([line (lw-line snd)]
-                         [line-span (lw-line-span snd)]
-                         [column (+ (lw-column fst)
-                                    (lw-column-span fst))]
-                         [column-span
-                          (- (lw-column snd)
-                             (+ (lw-column fst)
-                                (lw-column-span fst)))])
-                    (build-lw (make-bar) line line-span column column-span))]
-                 [else
-                  (build-lw
-                   (make-bar)
-                   (lw-line snd)
-                   (lw-line-span snd)
-                   (lw-column snd)
-                   0)])])
-         (list* fst
-                bar
-                (loop snd (cdr rst))))])))
-
-
-;                                       
-;                                       
-;                                       
-;                                       
-;                        ;              
-;                      ;;;              
-;  ;;; ;; ;;;    ;;;;  ;;;;  ;;;;;      
-;  ;;;;;;;;;;;  ;; ;;; ;;;; ;;;;;;;     
-;  ;;; ;;; ;;; ;;; ;;; ;;;  ;;  ;;;     
-;  ;;; ;;; ;;; ;;;;;;; ;;;    ;;;;; ;;;;
-;  ;;; ;;; ;;; ;;;     ;;;  ;;; ;;; ;;;;
-;  ;;; ;;; ;;;  ;;;;;; ;;;; ;;; ;;;     
-;  ;;; ;;; ;;;   ;;;;   ;;;  ;;;;;;     
-;                                       
-;                                       
-;                                       
-;                                       
-;                                                        
-;                                                        
-;                                                        
-;                                                        
-;   ;;;;                          ;  ;;;                 
-;  ;;;                          ;;;                      
-;  ;;;; ;;; ;;; ;;; ;;    ;;;   ;;;; ;;;   ;;;   ;;; ;;  
-;  ;;;; ;;; ;;; ;;;;;;;  ;;;;;  ;;;; ;;;  ;;;;;  ;;;;;;; 
-;  ;;;  ;;; ;;; ;;; ;;; ;;;  ;; ;;;  ;;; ;;; ;;; ;;; ;;; 
-;  ;;;  ;;; ;;; ;;; ;;; ;;;     ;;;  ;;; ;;; ;;; ;;; ;;; 
-;  ;;;  ;;; ;;; ;;; ;;; ;;;  ;; ;;;  ;;; ;;; ;;; ;;; ;;; 
-;  ;;;  ;;;;;;; ;;; ;;;  ;;;;;  ;;;; ;;;  ;;;;;  ;;; ;;; 
-;  ;;;   ;; ;;; ;;; ;;;   ;;;    ;;; ;;;   ;;;   ;;; ;;; 
-;                                                        
-;                                                        
-;                                                        
-;                                                        
-
-
-(define (make-=) (basic-text " = " (default-style)))
-
-(define-syntax (metafunction->pict stx)
-  (syntax-case stx ()
-    [(_ name)
-     (identifier? #'name)
-     #'(metafunctions->pict name)]))
-
-(define-syntax (metafunctions->pict stx)
-  (syntax-parse stx 
-    [(_ name1:id name2:id ... 
-        (~optional (~seq #:contract? contract-e:expr) #:defaults ([contract-e #'#f])))
-     #'(metafunctions->pict/proc (list (metafunction name1) (metafunction name2) ...)
-                                 contract-e
-                                 'metafunctions->pict)]))
-
-(define-syntax (relation->pict stx)
-  (syntax-case stx ()
-    [(form name1)
-     (identifier? #'name1)
-     #'(inference-rules-pict/relation 'form (metafunction name1))]))
-
-(define-syntax (render-metafunctions stx)
-  (syntax-parse stx
-    [(_ name1:id name2:id ... (~seq k:keyword e:expr) ...)
-     (define filename #'#f)
-     (define contract? #'#f)
-     (for ([kwd (in-list (syntax->list #'(k ...)))]
-           [e (in-list (syntax->list #'(e ...)))])
-       (cond
-         [(equal? '#:filename (syntax-e kwd))
-          (set! filename e)]
-         [(equal? '#:contract? (syntax-e kwd))
-          (set! contract? e)]
-         [else
-          (raise-syntax-error #f "unexpected keyword" stx kwd)]))
-     #`(render-metafunction/proc 
-        (list (metafunction name1) (metafunction name2) ...)
-        #,contract?
-        #,filename
-        'render-metafunctions)]))
-
-(define-syntax (render-metafunction stx)
-  (syntax-parse stx
-    [(_ name:id
-        (~optional file:expr #:defaults ([file #'#f]))
-        (~optional (~seq k:keyword e:expr)))
-     #`(render-metafunction/proc (list (metafunction name))
-                                 #,(cond
-                                     [(not (attribute k)) #'#f]
-                                     [(and (equal? (syntax-e (attribute k)) '#:contract?))
-                                      #'e]
-                                     [else
-                                      (raise-syntax-error #f "unknown keyword" stx #'k)])
-                                 file
-                                 'render-metafunction)]))
-
-(define-syntax (render-relation stx)
-  (syntax-case stx ()
-    [(form rest ...)
-     #'(render-judgment-form rest ...)]))
-               
-(define linebreaks (make-parameter #f))
-
-(define metafunction-pict-style (make-parameter 'left-right))
-(define metafunction-cases (make-parameter #f))
-(define (select-mf-cases contracts eqns case-labelss)
-  (define mf-cases (metafunction-cases))
-  (cond
-    [mf-cases
-     (define i 0)
-     (define sorted-cases (remove-duplicates (sort (filter number? mf-cases) <)))
-     (define named-cases (apply set (filter string? mf-cases)))
-     (apply 
-      append
-      (for/list ([eqns (in-list eqns)]
-                 [contract (in-list contracts)]
-                 [case-labels (in-list case-labelss)])
-        (filter
-         values
-         (cons 
-          contract
-          (for/list ([eqn (in-list eqns)]
-                     [case-label (in-list case-labels)])
-            (begin0
-              (cond
-                [(and (pair? sorted-cases) (= i (car sorted-cases)))
-                 (set! sorted-cases (cdr sorted-cases))
-                 eqn]
-                [(set-member? named-cases case-label)
-                 eqn]
-                [else #f])
-              (set! i (+ i 1))))))))]
-    [else (apply append 
-                 (for/list ([eqns (in-list eqns)]
-                            [contract (in-list contracts)])
-                   (if contract
-                       (cons contract eqns)
-                       eqns)))]))
-
-(define judgment-form-cases (make-parameter #f))
-(define (select-jf-cases eqns conclusions eqn-names)
-  (define cases
-    (or (judgment-form-cases)
-        (and (metafunction-cases)
-             (filter number? (metafunction-cases)))))
-  (cond
-    [cases
-     (define-values (rev-eqns rev-concs rev-eqn-names)
-       (for/fold ([eqns '()]
-                  [concs '()]
-                  [eqn-names '()])
-                 ([eqn (in-list eqns)]
-                  [conc (in-list conclusions)]
-                  [eqn-name (in-list eqn-names)]
-                  [i (in-naturals)])
-         (if (or (member i cases)
-                 (member eqn-name cases))
-             (values (cons eqn eqns)
-                     (cons conc concs)
-                     (cons eqn-name eqn-names))
-             (values eqns concs eqn-names))))
-      (values (reverse rev-eqns) (reverse rev-concs) (reverse rev-eqn-names))]
-    [else 
-     (values eqns conclusions eqn-names)]))
-
-(define (metafunctions->pict/proc mfs contract? name)
-  (unless (andmap (λ (mf) (equal? (metafunc-proc-lang (metafunction-proc (car mfs)))
-                                  (metafunc-proc-lang (metafunction-proc mf))))
-                  mfs)
-    (error name "expected metafunctions that are all drawn from the same language"))
-  (define current-linebreaks (linebreaks))
-  (define all-nts (language-nts (metafunc-proc-lang (metafunction-proc (car mfs)))))
-  (define sep 2)
-  (define style (metafunction-pict-style))
-  (define (wrapper->pict lw) (lw->pict all-nts lw))
-  (define contracts (for/list ([mf (in-list mfs)]) 
-                      (define lws (list-ref (metafunc-proc-pict-info (metafunction-proc mf)) 0))
-                      (cond
-                        [(and contract? lws)
-                         (define doms (list-ref lws 0))
-                         (define rngs (list-ref lws 1))
-                         (define separators (list-ref lws 2))
-                         (render-metafunction-contract
-                          (metafunc-proc-lang (metafunction-proc mf))
-                          (metafunc-proc-name (metafunction-proc mf))
-                          doms
-                          rngs
-                          separators)]
-                        [else #f])))
-  (define all-eqns (map (λ (mf) (list-ref (metafunc-proc-pict-info (metafunction-proc mf)) 1)) mfs))
-  (define all-lhss 
-    (for/list ([mf (in-list mfs)])
-      (for/list ([eqn (in-list (list-ref (metafunc-proc-pict-info (metafunction-proc mf)) 1))])
-        (wrapper->pict
-         (metafunction-call (metafunc-proc-name (metafunction-proc mf))
-                            (list-ref eqn 0))))))
-  (define case-labels (map (λ (mf) (metafunc-proc-clause-names (metafunction-proc mf))) mfs))
-  (define eqns (select-mf-cases contracts all-eqns case-labels))
-  (define lhs/contracts (select-mf-cases contracts all-lhss case-labels))
-  
-  (unless (or (not current-linebreaks)
-              (= (length current-linebreaks) (length eqns)))
-    (error 'metafunction->pict
-           (string-append
-            "expected the current-linebreaks parameter to be a list"
-            " whose length matches the number of cases in the metafunction"
-            " plus one if there is a contract (~a), but got ~s")
-           (length eqns)
-           current-linebreaks))
-  (define linebreak-list (or current-linebreaks
-                             (map (lambda (x) #f) eqns)))
-  (define mode (case style
-                 [(left-right 
-                   left-right/vertical-side-conditions
-                   left-right/compact-side-conditions
-                   left-right/beside-side-conditions)
-                  'horizontal]
-                 [(up-down
-                   up-down/vertical-side-conditions
-                   up-down/compact-side-conditions)
-                  'vertical]
-                 [else (error 'metafunctions->pict "unknown mode")]))
-  (define =-pict (make-=))
-  (define vertical-side-conditions?
-    (memq style '(up-down/vertical-side-conditions
-                  left-right/vertical-side-conditions
-                  left-right*/vertical-side-conditions)))
-  (define compact-side-conditions? 
-    (memq style '(up-down/compact-side-conditions
-                  left-right/compact-side-conditions
-                  left-right*/compact-side-conditions)))
-  
-  (define (handle-single-side-condition scs)
-    (define-values (fresh where/sc) (partition metafunc-extra-fresh? scs))
-    (side-condition-pict 
-     (foldl (λ (clause picts) 
-              (foldr (λ (l ps) (cons (wrapper->pict l) ps))
-                     picts (metafunc-extra-fresh-vars clause)))
-            '() fresh)
-     (filter
-      values
-      (for/list ([thing (in-list where/sc)])
-        (match thing
-          [(struct metafunc-extra-where (lhs rhs))
-           (where-pict (wrapper->pict lhs) (wrapper->pict rhs))]
-          [(struct metafunc-extra-side-cond (expr))
-           (wrapper->pict expr)]
-          [`(clause-name ,n) #f])))
-     (cond
-       [vertical-side-conditions? 
-        ;; maximize line breaks:
-        0]
-       [compact-side-conditions?
-        ;; maximize line break as needed:
-        max-line-w/pre-sc]
-       [else 
-        ;; no line breaks:
-        +inf.0])))
-  
-  (define (build-brace-based-rhs stuff)
-    (define conds
-      (let loop ([stuff stuff])
-        (define-values (before after) (splitf-at stuff (λ (x) (not (equal? x 'or)))))
-        (if (null? after)
-            (list before)
-        (cons before (loop (cdr after))))))
-    (define last-line (- (length conds) 1))
-    (define rhs+scs (for/list ([cond-line (in-list conds)]
-                               [i (in-naturals)])
-                      (define rhs (wrapper->pict (car cond-line)))
-                      (define scs 
-                        (if (and (= last-line i) (null? (cdr cond-line)))
-                            ((otherwise-make-pict))
-                            (handle-single-side-condition (cdr cond-line))))
-                      (list rhs scs)))
-    (define rhs (map car rhs+scs))
-    (define scs (map cadr rhs+scs))
-    (define widest-rhs (apply max 0 (map pict-width rhs)))
-    (define widest-scs (apply max 0 (map pict-width scs)))
-    (add-left-brace
-     (apply vl-append
-            2
-            (for/list ([rhs (in-list rhs)]
-                       [scs (in-list scs)])
-              (htl-append (lbl-superimpose 
-                           rhs
-                           (blank widest-rhs 0))
-                          (lbl-superimpose 
-                           scs
-                           (blank widest-scs 0)))))))
-  
-  (define (add-left-brace pict)
-    (let loop ([i 0])
-      (define extender 
-        (apply
-         vl-append
-         (for/list ([_ (in-range i)])
-           (basic-text curly-bracket-extension (default-style)))))
-      (define left-brace
-        (vl-append (basic-text left-curly-bracket-upper-hook (default-style))
-                   extender
-                   (basic-text left-curly-bracket-middle-piece (default-style))
-                   extender
-                   (basic-text left-curly-bracket-lower-hook (default-style))))
-      (cond
-        [(< (pict-height pict) (pict-height left-brace))
-         (define top-bottom-diff (- (pict-height left-brace)
-                                    (pict-height pict)))
-         (inset (refocus (hc-append left-brace pict) pict)
-                (pict-width left-brace)
-                (/ top-bottom-diff 2)
-                0
-                (/ top-bottom-diff 2))]
-        [else (loop (+ i 1))])))
-
-  (define rhss (for/list ([eqn/contract (in-list eqns)])
-                 (cond
-                   [(pict? eqn/contract)
-                    'contract]
-                   [else
-                    (define sc-info (list-ref eqn/contract 1))
-                    (cond
-                      [(member 'or sc-info)
-                       (build-brace-based-rhs 
-                        (cons (list-ref eqn/contract 2)
-                              (reverse sc-info)))]
-                      [else
-                       (wrapper->pict (list-ref eqn/contract 2))])])))
-  
-  (define max-line-w/pre-sc (and
-                             compact-side-conditions?
-                             (for/fold ([biggest 0]) ([lhs/contract (in-list lhs/contracts)]
-                                                      [rhs (in-list rhss)]
-                                                      [linebreak? (in-list linebreak-list)])
-                               (cond
-                                 [(equal? rhs 'contract)
-                                  ;; this is a contract
-                                  (max biggest (pict-width lhs/contract))]
-                                 [(eq? mode 'vertical)
-                                  (max biggest
-                                       (+ (pict-width lhs/contract) (pict-width =-pict))
-                                       (pict-width rhs))]
-                                 [linebreak?
-                                  (max biggest
-                                       (pict-width lhs/contract)
-                                       (+ (pict-width rhs) sep (pict-width =-pict)))]
-                                 [else
-                                  (max biggest
-                                       (+ (pict-width lhs/contract)
-                                          (pict-width rhs)
-                                          (pict-width =-pict)
-                                          (* 2 sep)))]))))
-  
-  (define scs (for/list ([eqn (in-list eqns)])
-                (cond
-                  [(pict? eqn) #f]
-                  [else
-                   (define scs (reverse (list-ref eqn 1)))
-                   (cond
-                     [(null? scs) #f]
-                     [(member 'or scs) #f]
-                     [else (handle-single-side-condition scs)])])))
-  (case mode
-    [(horizontal)
-     (define (adjust-for-fills rows)
-       ;; Some rows have the form (list <pict> 'fill 'fill),
-       ;; in which case we want the <pict> to span all columns.
-       ;; To do that, we need to know the total width of the first
-       ;; two columns of non-spanning rows.
-       (define max-w-before-rhs (apply 
-                                 max
-                                 0
-                                 (map (lambda (row)
-                                        (match row
-                                          [(list lhs 'fill 'fill)
-                                           (+ sep sep)]
-                                          [else
-                                           (+ (pict-width (car row))
-                                              sep
-                                              (pict-width (cadr row))
-                                              sep)]))
-                                      rows)))
-       (apply
-        append
-        (map (lambda (row)
-               (match row
-                 [(list lhs 'fill 'fill)
-                  (list
-                   ;; pretend that content is zero-width:
-                   (inset lhs 0 0 (- (pict-width lhs)) 0)
-                   (blank)
-                   ;; blank that's wide enough to ensure that the
-                   ;; right column covers the spanning pict
-                   ;; (and no more)
-                   (blank (max 0 (- (pict-width lhs) max-w-before-rhs))
-                          0))]
-                 [else row]))
-             rows)))
-     (define table-elements
-       (adjust-for-fills
-        (apply append
-               (for/list ([lhs/contract (in-list lhs/contracts)]
-                          [sc (in-list scs)]
-                          [rhs (in-list rhss)]
-                          [linebreak? (in-list linebreak-list)])
-                 (append
-                  (list
-                   (cond
-                     [(equal? rhs 'contract) ;; contract
-                      (list lhs/contract 'fill 'fill)]
-                     [linebreak?
-                      (list lhs/contract 'fill 'fill)]
-                     [(and sc (eq? style 'left-right/beside-side-conditions))
-                      (list lhs/contract =-pict (htl-append 10 rhs sc))]
-                     [else
-                      (list lhs/contract =-pict rhs)]))
-                  (if linebreak?
-                      (list
-                       (list (htl-append sep =-pict rhs)
-                             'fill
-                             'fill))
-                      null)
-                  (if (or (not sc)
-                          (and (not linebreak?)
-                               (eq? style 'left-right/beside-side-conditions)))
-                      null
-                      (list
-                       (list sc 'fill 'fill))))))))
-     (if (null? table-elements)
-         (blank)
-         (table 3 table-elements 
-                ltl-superimpose ltl-superimpose
-                sep sep))]
-    [(vertical)
-     (apply vl-append
-            sep
-            (apply append
-                   (for/list ([lhs/contract (in-list lhs/contracts)]
-                              [sc (in-list scs)]
-                              [rhs (in-list rhss)])
-                     (cond
-                       [(equal? rhs 'contract) ;; contract
-                        (list lhs/contract)]
-                       [else
-                        (cons
-                         (vl-append (htl-append lhs/contract =-pict) rhs)
-                         (if (not sc)
-                             null
-                             (list sc)))]))))]))
-
-(define (render-metafunction-contract lang name doms rngs separators)
-  (hbl-append (basic-text (format "~a" name) (metafunction-style))
-              (basic-text " : " (default-style))
-              (apply hbl-append (add-between (map (λ (x) (lw->pict lang x)) doms) 
-                                             (basic-text " " (default-style))))
-              (basic-text " → " (default-style))
-              (apply hbl-append 
-                     (add-between (interleave-ctc-separators
-                                   (map (λ (x) (lw->pict lang x)) rngs)
-                                   (map (λ (x) (basic-text (format "~a" x) (default-style)))
-                                        separators))
-                                  (basic-text " " (default-style))))))
-
-(define (interleave-ctc-separators eles betweens)
-  (cond
-    [(null? betweens) eles]
-    [else (list* (car eles)
-                 (car betweens)
-                 (interleave-ctc-separators (cdr eles) (cdr betweens)))]))
-
-(define (metafunction-call name an-lw)
-  (struct-copy lw an-lw
-               [e
-                (list*
-                 ;; the first loc wrapper is just there to make the
-                 ;; shape of this line be one that the apply-rewrites
-                 ;; function (in core-layout.rkt) recognizes as a metafunction
-                 (make-lw "("
-                          (lw-line an-lw)
-                          0
-                          (lw-column an-lw)
-                          0 
-                          #f
-                          #f)
-                 (make-lw name
-                          (lw-line an-lw)
-                          0
-                          (lw-column an-lw)
-                          0 
-                          #f
-                          #t)
-                 (cdr (lw-e an-lw)))]))  
-
-(define (add-commas-and-rewrite-parens eles)
-  (let loop ([eles eles]
-             [between-parens? #f]
-             [comma-pending #f])
-    (cond
-      [(null? eles) null]
-      [else 
-       (let ([an-lw (car eles)])
-         (cond
-           [(not (lw? an-lw)) 
-            (cons an-lw (loop (cdr eles) between-parens? #f))]
-           [(equal? "(" (lw-e an-lw))
-            (cons (struct-copy lw
-                               an-lw
-                               [e (open-white-square-bracket)])
-                  (loop (cdr eles) #t #f))]
-           [(equal? ")" (lw-e an-lw))
-            (cons (struct-copy lw
-                               an-lw
-                               [e (close-white-square-bracket)])
-                  (loop (cdr eles) #f #f))]
-           [(and between-parens?
-                 comma-pending)
-            (list* (build-lw (basic-text ", " (default-style))
-                             (car comma-pending)
-                             0
-                             (cdr comma-pending)
-                             0)
-                   'spring
-                   (loop eles #t #f))]
-           [else
-            (cons an-lw 
-                  (loop (cdr eles)
-                        between-parens?
-                        (if between-parens?
-                            (cons (+ (lw-line an-lw) (lw-line-span an-lw))
-                                  (+ (lw-column an-lw) (lw-column-span an-lw)))
-                            #f)))]))])))
-
-(define (replace-paren x)
-  (cond
-    [(not (lw? x)) x]
-    [(equal? "(" (lw-e x))
-     (struct-copy lw
-                  x
-                  [e (hbl-append -2 
-                                 (basic-text "[" (default-style))
-                                 (basic-text "[" (default-style)))])]
-    [(equal? ")" (lw-e x))
-     (struct-copy lw
-                  x
-                  [e
-                   (hbl-append -2 
-                               (basic-text "]" (default-style))
-                               (basic-text "]" (default-style)))])]
-    [else x]))
-
-(define (render-metafunction/proc mfs contract? filename name)
-  (cond
-    [filename
-     (save-as-ps/pdf (λ () (metafunctions->pict/proc mfs contract? name))
-                     filename)]
-    [else
-     (parameterize ([dc-for-text-size (make-object bitmap-dc% (make-object bitmap% 1 1))])
-       (metafunctions->pict/proc mfs contract? name))]))
-
-(define (render-pict make-pict filename)
-  (cond
-    [filename
-     (save-as-ps/pdf make-pict filename)]
-    [else
-     (parameterize ([dc-for-text-size (make-object bitmap-dc% (make-object bitmap% 1 1))])
-       (make-pict))]))
-
-(define (inference-rules-pict name all-eqns eqn-names lang judgment-form?)
-  (define all-nts (language-nts lang))
-  (define (wrapper->pict lw) (lw->pict all-nts lw))
-  (define all-conclusions 
-    (map (lambda (eqn) 
-           (wrapper->pict
-            (metafunction-call name (list-ref eqn 0))))
-         all-eqns))
-  (define-values (selected-eqns conclusions selected-eqn-names)
-    (select-jf-cases all-eqns all-conclusions eqn-names))
-  
-  (define (wrapper->pict+lines lw)
-    (list (wrapper->pict lw) (lw-line lw) (+ (lw-line lw) (lw-line-span lw))))
-  
-  ;; premises : (listof (listof pict))
-  ;; each inner list of premises goes on the same line; each element
-  ;; of the outer list is a separate line
-  (define premisess 
-    (for/list ([eqn (in-list selected-eqns)])
-      ;; all-premises : (listof pict number[first-line] number [last-line])
-      (define all-premises
-        (append (map wrapper->pict+lines (list-ref eqn 2))
-                (map (match-lambda
-                       [(struct metafunc-extra-where (lhs rhs))
-                        (list (where-pict (wrapper->pict lhs) (wrapper->pict rhs))
-                              (lw-line lhs)
-                              (+ (lw-line rhs) (lw-line-span rhs)))]
-                       [(struct metafunc-extra-side-cond (expr))
-                        (wrapper->pict+lines expr)]
-                       [wrapper (wrapper->pict+lines wrapper)])
-                     (list-ref eqn 1))))
-      (define sorted-premises (sort all-premises < #:key (λ (x) (list-ref x 1))))
-       
-      ;; returns #t if the two premises share at least one line in common
-      (define (overlaps? premise1 premise2)
-        (<= (list-ref premise1 1)
-            (list-ref premise2 1)
-            (list-ref premise1 2)))
-      
-      (cond
-        [(not judgment-form?) (list (map car all-premises))]
-        [(null? sorted-premises) '()]
-        [else
-         (define line-grouped-premises (list (list (car sorted-premises))))
-         (for ([prev-premise (in-list sorted-premises)]
-               [premise (in-list (cdr sorted-premises))])
-           (cond
-             [(overlaps? prev-premise premise)
-              (set! line-grouped-premises (cons (cons premise (car line-grouped-premises))
-                                                (cdr line-grouped-premises)))]
-             [else
-              (set! line-grouped-premises (cons (list premise) line-grouped-premises))]))
-         (reverse (map (λ (x) (reverse (map car x))) line-grouped-premises))])))
-
-  ((relation-clauses-combine)
-   (for/list ([conclusion (in-list conclusions)]
-              [premises (in-list premisess)]
-              [name (in-list selected-eqn-names)])
-     (define top (apply vc-append 4 (map (λ (premises) (apply hbl-append 20 premises)) premises)))
-     (define line-w (max (pict-width top) (pict-width conclusion)))
-     (define line (dc (λ (dc dx dy) (send dc draw-line dx dy (+ dx line-w) dy))
-                      line-w 1)) 
-     (define w/out-label
-       (vc-append
-        (horizontal-bar-spacing)
-        top
-        line
-        conclusion))
-     (if name
-         (let ([label (string->bracketed-label name)])
-           (let-values ([(x y) (rc-find w/out-label line)])
-             (hb-append w/out-label 
-                        (vl-append label
-                                   (blank 0 (- (- (pict-height w/out-label) y)
-                                               (/ (pict-height label) 2)))))))
-         w/out-label))))
-
-(define horizontal-bar-spacing (make-parameter 4))
-(define relation-clauses-combine (make-parameter (λ (l) (apply vc-append 20 l))))
-
-(define-for-syntax (inference-rules-pict/judgment-form form-name)
-  (define jf (syntax-local-value form-name))
-  (define-values (name lws rule-names lang relation?) 
-    (values (judgment-form-name jf) (judgment-form-lws jf) (judgment-form-rule-names jf)
-            (judgment-form-lang jf) (judgment-form-relation? jf)))
-  (syntax-property
-   #`(inference-rules-pict '#,name
-                           #,lws
-                           '#,rule-names
-                           #,lang
-                           #,(not relation?))
-   'disappeared-use
-   (syntax-local-introduce form-name)))
-
-(define-syntax (render-judgment-form stx)
-  (syntax-case stx ()
-    [(_ form-name . opt-arg)
-     (if (judgment-form-id? #'form-name)
-         (let ([save-as (syntax-case #'opt-arg ()
-                          [() #'#f]
-                          [(path) #'path])])
-           #`(render-pict (λ () #,(inference-rules-pict/judgment-form #'form-name))
-                          #,save-as))
-         (raise-syntax-error #f "expected a judgment form name" stx #'form-name))]))
-
-(define-syntax (judgment-form->pict stx)
-  (syntax-case stx ()
-    [(_ form-name)
-     (if (judgment-form-id? #'form-name)
-         (inference-rules-pict/judgment-form #'form-name)
-         (raise-syntax-error #f "expected a judgment form name" stx #'form-name))]))
-
-;                              
-;                              
-;                              
-;                              
-;    ;                         
-;    ;                         
-;   ;;;     ;;;   ; ;;   ;;;;; 
-;    ;     ;   ;  ;;  ;  ; ; ; 
-;    ;     ;;;;;  ;   ;  ; ; ; 
-;    ;     ;      ;      ; ; ; 
-;    ;     ;   ;  ;      ; ; ; 
-;     ;;    ;;;   ;      ; ; ; 
-;                              
-;                              
-;
-
-(define-syntax (render-term stx)
-  (syntax-case stx ()
-    [(_ lang term)
-     #'(render-term/proc lang (to-lw term))]
-    [(_ lang term filename)
-     #'(render-term/proc lang (to-lw term) filename)]))
-
-(define-syntax (term->pict stx)
-  (syntax-case stx ()
-    [(_ lang term)
-     #'(do-term->pict lang (to-lw term))]))
-
-(define (render-term/proc lang lw [filename #f])
-  (if filename
-      (save-as-ps/pdf (λ () (do-term->pict lang lw)) filename)
-      (parameterize ([dc-for-text-size (make-object bitmap-dc% (make-object bitmap% 1 1))])
-        (do-term->pict lang lw))))
-
-(define (do-term->pict lang lw) (lw->pict (language-nts lang) lw))
-
-(define (render-term/pretty-write lang term [filename #f] #:width [width (pretty-print-columns)])
-  (if filename
-      (save-as-ps/pdf (λ () (term->pict/pretty-write lang term #:width width)) filename)
-      (parameterize ([dc-for-text-size (make-object bitmap-dc% (make-object bitmap% 1 1))])
-        (term->pict/pretty-write lang term #:width width))))
-
-(define (term->pict/pretty-write lang term #:width [width (pretty-print-columns)])
-  (define-values (in out) (make-pipe))
-  (thread (λ ()
-            (parameterize ([pretty-print-columns width])
-              (pretty-write term out))
-            (close-output-port out)))
-  (port-count-lines! in)
-  (lw->pict lang (to-lw/stx (read-syntax #f in))))
-
-(define (to-lw/stx stx)
-  (lw/rt:add-spans/interp-lws 
-   (syntax->datum 
-    (lw/ct:to-lw/proc stx #f))))
-
diff --git a/pkgs/redex-pkgs/redex-test/LICENSE.txt b/pkgs/redex-pkgs/redex-test/LICENSE.txt
deleted file mode 100644
index d6a69b87b1..0000000000
--- a/pkgs/redex-pkgs/redex-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-redex-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/redex-pkgs/redex-test/info.rkt b/pkgs/redex-pkgs/redex-test/info.rkt
deleted file mode 100644
index 389c7986be..0000000000
--- a/pkgs/redex-pkgs/redex-test/info.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "rackunit-lib"
-               "at-exp-lib"
-               "compatibility-lib"
-               "drracket"
-               "gui-lib"
-               "pict-lib"
-               "redex-gui-lib"
-               "redex-examples"
-               "data-lib"))
-(define build-deps '("racket-index"
-                     "scheme-lib"))
-
-(define pkg-desc "tests for \"redex\"")
-
-(define pkg-authors '(robby bfetscher))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test-util.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test-util.rkt
deleted file mode 100644
index 0248068ec4..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test-util.rkt
+++ /dev/null
@@ -1,235 +0,0 @@
-#lang racket/base
-(require framework
-         pict
-         racket/runtime-path
-         racket/gui/base
-         (for-syntax racket/base)
-         racket/class
-         racket/promise
-         redex/pict
-         redex/reduction-semantics)
-
-(provide btest done show-bitmap-test-gui?)
-
-(define show-bitmap-test-gui? (make-parameter #t))
-
-(define just-save-failures? (getenv "PLTJUSTSAVEFAILURES"))
-
-(define tests 0)
-(define failed-tests 0)
-(define failed-panels '())
-(define (done)
-  (if (zero? failed-tests)
-      (printf "bitmap-test.rkt: ~a tests, all passed\n" tests)
-      (eprintf "bitmap-test.rkt: ~a tests, ~a failed\n" tests failed-tests)))
-
-(define-syntax (btest stx)
-  (syntax-case stx ()
-    [(_ test-exp bitmap-filename)
-     #`(test/proc
-        #,(syntax-line stx)
-        (λ () test-exp)
-        bitmap-filename)]))
-
-(define-runtime-path bmps-dir (format "bmps-~a" (system-type)))
-
-(define (test/proc line-number pict-thunk raw-bitmap-filename)
-  (set! tests (+ tests 1))
-  (let* ([pict (set-fonts/call pict-thunk)]
-         [bitmap-filename 
-          (build-path bmps-dir
-                      raw-bitmap-filename)]
-         [old-bitmap (if (file-exists? bitmap-filename)
-                         (read-bitmap bitmap-filename)
-                         (let* ([bm (make-bitmap 100 20)]
-                                [bdc (make-object bitmap-dc% bm)])
-                           (send bdc clear)
-                           (send bdc draw-text "does not exist" 0 0)
-                           (send bdc set-bitmap #f)
-                           bm))]
-         [new-bitmap ((if (eq? (system-type) 'unix)
-                          make-bitmap
-                          make-screen-bitmap)
-                       (ceiling (inexact->exact (pict-width pict))) 
-                       (ceiling (inexact->exact (pict-height pict))))]
-         [bdc (make-object bitmap-dc% new-bitmap)])
-    (send bdc clear)
-    (draw-pict pict bdc 0 0)
-    (send bdc set-bitmap #f)
-    (unless (bitmaps-same? old-bitmap new-bitmap)
-      (set! failed-tests (+ failed-tests 1))
-      (cond
-        [just-save-failures? 
-         (eprintf "saving ~a\n" bitmap-filename)
-         (void (send new-bitmap save-file bitmap-filename 'png))]
-        [else
-         (when (show-bitmap-test-gui?)
-           (let ([failed-panel (make-failed-panel line-number bitmap-filename old-bitmap new-bitmap)])
-             (set! failed-panels (append failed-panels (list failed-panel)))))]))))
-
-(define (set-fonts/call thunk)
-  (case (system-type)
-    [(unix)
-     (define (rewrite-style s)
-       (let loop ([s s])
-         (cond
-           [(pair? s) (cons (loop (car s)) (loop (cdr s)))]
-           [(eq? s 'roman) (verify-face "DejaVu Serif")]
-           [(eq? s 'swiss) (verify-face "DejaVu Sans")]
-           [else s])))
-     (parameterize ([label-style (rewrite-style (label-style))]
-                    [literal-style (rewrite-style (literal-style))]
-                    [metafunction-style (rewrite-style (metafunction-style))]
-                    [non-terminal-style (rewrite-style (non-terminal-style))]
-                    [non-terminal-subscript-style (rewrite-style (non-terminal-subscript-style))]
-                    [non-terminal-superscript-style (rewrite-style (non-terminal-superscript-style))]
-                    [default-style (rewrite-style (default-style))])
-       (thunk))]
-    [else
-     (thunk)]))
-
-(define (verify-face face)
-  (unless (member face (get-face-list))
-    (error 'verify-face "unknown face: ~s" face))
-  face)
-
-(define (bitmaps-same? old-bitmap new-bitmap)
-  (let ([w (send old-bitmap get-width)]
-        [h (send old-bitmap get-height)])
-    (and (= w (send new-bitmap get-width))
-         (= h (send new-bitmap get-height))
-         (let ([bytes1 (make-bytes (* w h 4))]
-               [bytes2 (make-bytes (* w h 4))])
-           (send old-bitmap get-argb-pixels 0 0 w h bytes1)
-           (send new-bitmap get-argb-pixels 0 0 w h bytes2)
-           (equal? bytes1 bytes2)))))
-
-(define test-result-single-panel #f)
-(define (get-test-result-single-panel)
-  (cond
-    [test-result-single-panel
-     test-result-single-panel]
-    [else
-     (let ()
-       (define f (new frame% [label "bitmap-test.rkt failures"]))
-       (define lined (new vertical-panel% [parent f] [style '(border)]))
-       (define sp (new panel:single% [parent lined]))
-       (define current-index 0)
-       (define hp (new horizontal-panel% [parent f] [alignment '(center center)]))
-       (define prev 
-         (new button% 
-              [label "Prev"] 
-              [parent hp]
-              [callback
-               (λ (x y)
-                 (set! current-index (modulo (- current-index 1) (length failed-panels)))
-                 (update-gui))]))
-       (define next (new button% 
-                         [label "Next"] 
-                         [parent hp]
-                         [callback
-                          (λ (x y)
-                            (set! current-index (modulo (+ current-index 1) (length failed-panels)))
-                            (update-gui))]))
-       (define (update-gui) 
-         (send sp active-child (list-ref failed-panels current-index)))
-       (set! test-result-single-panel sp)
-       (send f show #t)
-       sp)]))
-
-(define (compute-diffs old-bitmap new-bitmap)
-  (define ow (send old-bitmap get-width))
-  (define nw (send new-bitmap get-width))
-  (define oh (send old-bitmap get-height))
-  (define nh (send new-bitmap get-height))
-  (define w (max ow nw))
-  (define h (max oh nh))
-  (define old-bytes (make-bytes (* ow oh 4)))
-  (define new-bytes (make-bytes (* nw nh 4)))
-  (define diff-bytes (make-bytes (* w h 4) 255))
-  (define number-of-different-pixels 0)
-  (send old-bitmap get-argb-pixels 0 0 ow oh old-bytes)
-  (send new-bitmap get-argb-pixels 0 0 nw nh new-bytes)
-  (let loop ([x 0])
-    (unless (= x w)
-      (let loop ([y 0])
-        (unless (= y h)
-          (define diff-start (* 4 (+ (* y w) x)))
-          (cond
-            [(and (< x nw)
-                  (< y nh)
-                  (< x ow)
-                  (< y oh))
-             (define old-start (* 4 (+ (* y ow) x)))
-             (define new-start (* 4 (+ (* y nw) x)))
-             (define a (bytes-ref old-bytes old-start))
-             (define r (bytes-ref old-bytes (+ old-start 1)))
-             (define g (bytes-ref old-bytes (+ old-start 2)))
-             (define b (bytes-ref old-bytes (+ old-start 3)))
-             (cond
-               [(and (= a (bytes-ref new-bytes new-start))
-                     (= r (bytes-ref new-bytes (+ new-start 1)))
-                     (= g (bytes-ref new-bytes (+ new-start 2)))
-                     (= b (bytes-ref new-bytes (+ new-start 3))))
-                (bytes-set! diff-bytes diff-start a)
-                (bytes-set! diff-bytes (+ diff-start 1) r)
-                (bytes-set! diff-bytes (+ diff-start 2) g)
-                (bytes-set! diff-bytes (+ diff-start 3) b)]
-               [else
-                (set! number-of-different-pixels (+ number-of-different-pixels 1))
-                ;; don't need to set diff-start or (+ diff-start 1) since
-                ;; the bytes are initialized to 255
-                (bytes-set! diff-bytes (+ diff-start 2) 0)
-                (bytes-set! diff-bytes (+ diff-start 3) 0)])]
-            [else
-             (bytes-set! diff-bytes (+ diff-start 2) 0)
-             (bytes-set! diff-bytes (+ diff-start 3) 0)])
-          (loop (+ y 1))))
-      (loop (+ x 1))))
-  (define diff-bitmap (make-bitmap w h))
-  (send diff-bitmap set-argb-pixels 0 0 w h diff-bytes)
-  (values diff-bitmap number-of-different-pixels))
-
-(define (make-failed-panel line-number filename old-bitmap new-bitmap)
-  (define-values (diff-bitmap number-of-different-pixels) (compute-diffs old-bitmap new-bitmap))
-  (define f (new vertical-panel% [parent (get-test-result-single-panel)]))
-  (define msg (new message% [label (format "line ~a" line-number)] [parent f]))
-  (define hp (new horizontal-panel% [parent f]))
-  (define vp1 (new vertical-panel% [parent hp]))
-  (define vp2 (new vertical-panel% [parent hp]))
-  (define computing/differences-msg 
-    (new message% [label (format "~a pixels different" number-of-different-pixels)] [parent f]))
-  (define chk (new check-box% 
-                   [label "Show diff"]
-                   [value #t]
-                   [parent f]
-                   [callback (λ (_1 _2) (chk-callback))]))
-  (define (chk-callback)
-    (cond
-      [(send chk get-value)
-       (send right-hand set-label diff-bitmap)]
-      [else
-       (send right-hand set-label new-bitmap)]))
-  (define btn (new button%
-                   [parent f]
-                   [label "Save"]
-                   [callback
-                    (λ (x y)
-                      (send new-bitmap save-file filename 'png))]))
-  (define left-label (new message% 
-                          [parent vp1]
-                          [label (format "Old ~ax~a" 
-                                         (send old-bitmap get-width)
-                                         (send old-bitmap get-height))]))
-  (define left-hand (new message%
-                         [parent vp1]
-                         [label old-bitmap]))
-  (define right-label (new message% 
-                           [parent vp2]
-                           [label (format "New ~ax~a"
-                                          (send new-bitmap get-width)
-                                          (send new-bitmap get-height))]))
-  (define right-hand (new message%
-                          [parent vp2]
-                          [label diff-bitmap]))
-  f)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test.rkt
deleted file mode 100644
index d5e68b5b55..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test.rkt
+++ /dev/null
@@ -1,473 +0,0 @@
-#lang racket
-(require "bitmap-test-util.rkt"
-         redex/pict redex/reduction-semantics
-         pict)
-
-(module test racket/base) ; run by run-tests
-(white-square-bracket homemade-white-square-bracket)
-
-;; tests: 
-;;  - language,
-;;  - multi-line non-terminals, single-line non-terminals
-(define-language lang
-  (e (e e) 
-     x
-     (λ (x) e)
-     number)
-  (v number (λ (x) e))
-  ((x y) variable-not-otherwise-mentioned))
-
-(btest (render-language lang) "language.png")
-
-(btest (render-language lang #:nts '(e v)) "language-nox.png")
-
-(let ()
-  (define-language L1
-    [a 1]
-    [b 2]
-    [c 3]
-    [d 4]
-    [e 5])
-  
-  (define-extended-language L2 L1
-    [d .... more-d]
-    [c different-c]
-    [b .... more-b]
-    [a different-a]
-    [f 6]
-    [g 7]
-    [h 8])
-  
-  (define-extended-language L3 L2
-    [c differenter-c]
-    [d .... yet-more-d]
-    [f different-f]
-    [g .... more-g])
-  
-  (btest
-   (apply
-    ht-append
-    2
-    (for*/list ([union? '(#f #t)]
-                [ext-order? '(#f #t)])
-      (parameterize ([extend-language-show-union union?]
-                     [extend-language-show-extended-order ext-order?])
-        (vc-append
-         2
-         (frame (language->pict L1))
-         (frame (language->pict L2))
-         (frame (language->pict L3))))))
-   "extended-language.png"))
-
-(define red
-  (reduction-relation
-   lang
-   (--> ((λ (x) e) v) (S x v e))))
-
-;; tests: reduction-relation
-(btest (render-reduction-relation red)
-       "reduction-relation.png")
-
-(btest (render-reduction-relation 
-        (extend-reduction-relation red lang (--> 1 2)))
-       "extended-reduction-relation.png")
-
-(btest (render-reduction-relation
-        (with-unquote-rewriter
-         (let ([once? #f])
-           (λ (l)
-             (if once?
-                 l
-                 (begin0
-                   (struct-copy lw
-                                l
-                                [e "a: any"]
-                                [unq? #f])
-                   (set! once? #t)))))
-         (reduction-relation
-          lang
-          (--> (a any) 1 "a" (computed-name (format "a: ~a" (term any))))
-          (--> (b any) 2 "b" (computed-name (format "b: ~a" (term any))))
-          (--> (c any) 3 (computed-name (format "c: ~a" (term any)))))))
-       "reduction-relation-with-computed-labels.png")
-
-(let ([R (reduction-relation
-          lang
-          (--> 1 1 "a")
-          (--> 2 2 "b" (computed-name "a"))
-          (--> 3 3 (computed-name "c")))])
-  (btest (parameterize ([render-reduction-relation-rules
-                         (remq 'b (reduction-relation->rule-names R))])
-           (render-reduction-relation R))
-         "reduction-relation-with-computed-labels-and-hiding.png"))
-
-;; this test should fail because it gets the order wrong
-;; for the where/side-conditions
-(define red2
-  (reduction-relation
-   lang
-   (--> (number_a number_b number_c number_d)
-        any_z
-        (where (any_x any_y) (number_a number_b))
-        (side-condition (= (term number_c) 5))
-        (where any_z any_x)
-        (side-condition (= (term number_d) 5)))))
-
-(btest (render-reduction-relation red2)
-       "red2.png")
-
-(let ()
-  (define-judgment-form lang
-    #:mode (id I O)
-    [(id e e)])
-  (btest (render-reduction-relation
-          (reduction-relation
-           lang
-           (--> e_1
-                q
-                (where (name q e_2) e_1)
-                (judgment-holds (id e_2 (name r e_3))))))
-         "red-with-where-name.png"))
-
-(define-metafunction lang
-  S : x v e -> e
-  [(S x v e) e])
-
-(btest (render-metafunction S)
-       "metafunction.png")
-
-(let ()
-  (define-metafunction lang
-    [(f (e_1 e_2))
-     (e_3 e_4)
-     (judgment-holds (J e_1 e_3))
-     (judgment-holds (J e_2 e_4))])
-  (define-judgment-form lang
-    #:mode (J I O)
-    [(J e e)])
-  (btest (render-metafunction f)
-         "metafunction-judgment-holds.png"))
-
-(define-metafunction lang
-  T : any any -> 1 ∪ (2 2) ∨ 1234
-  [(T x y)
-   1
-   (side-condition (not (eq? (term x) (term y))))
-   (clause-name first-one)]
-  [(T x x) 
-   (any_1 any_2)
-   (where any_1 2)
-   (where any_2 2)]
-  [(T _ _ _) 1234])
-
-;; in this test, the metafunction has 3 clauses 
-;; with a side-condition on the first clause
-;; a 'where' in the second clause, and an underscore
-(btest (parameterize ([metafunction-cases '("first-one" 1)])
-         (render-metafunction T))
-       "metafunction-T.png")
-
-;; in this test, the `x' is italic and the 'z' is sf, since 'x' is in the grammar, and 'z' is not.
-(btest (render-lw 
-        lang 
-        (to-lw ((λ (x) (x x))
-                (λ (z) (z z)))))
-       "lw.png")
-
-(define-metafunction lang
-  [(TL 1) (a
-           ,(term-let ((x (term 1)))
-                      (term x))
-           below-only)]
-  [(TL 2) (a
-           ,(term-let ((x (term 1)))
-                      (term x)) beside
-                      below)]
-  [(TL any)
-   3333333333
-   (where 3 any)
-   or
-   2
-   (where 2 any)
-   or
-   0])
-
-;; this tests that term-let is sucked away properly
-;; when the metafunction is rendered
-(btest (render-metafunction TL) "metafunction-TL.png")
-
-(define-metafunction lang
-  [(Name (name x-arg arg)) 
-   ,(term-let ((x-term-let (term 1)))
-              (term (x-where x-term-let)))
-   (where x-where 2)]
-  [(Name number) short])
-
-;; this tests that the three variable bindings
-;; (x-arg, x-term-let, and x-where) 
-;; all show up in the output.
-(btest (render-metafunction Name) "metafunction-Name.png")
-
-;; same as previous, but with vertical organization of the bindings
-(btest (parameterize ([metafunction-pict-style 'up-down/vertical-side-conditions])
-         (render-metafunction Name))
-       "metafunction-Name-vertical.png")
-
-;; compact turns out to be the same, since a line break is needed before
-;; each side-condition clause:
-(btest (parameterize ([metafunction-pict-style 'up-down/compact-side-conditions])
-         (render-metafunction Name))
-       "metafunction-Name-vertical.png")
-
-;; in horizontal mode:
-(btest (vl-append
-        (clip
-         (parameterize ([metafunction-pict-style 'left-right])
-           (render-metafunction Name)))
-        (clip
-         (parameterize ([metafunction-pict-style 'left-right/beside-side-conditions])
-           (render-metafunction Name)))
-        (clip
-         (parameterize ([metafunction-pict-style 'left-right/vertical-side-conditions])
-           (render-metafunction Name)))
-        (clip
-         (parameterize ([metafunction-pict-style 'left-right/compact-side-conditions])
-           (render-metafunction Name)))
-        (clip
-         (parameterize ([metafunction-pict-style 'left-right/compact-side-conditions]
-                        [linebreaks '(#t #f)])
-           (render-metafunction Name)))
-        (clip
-         (parameterize ([metafunction-pict-style 'left-right/compact-side-conditions]
-                        [linebreaks '(#f #t)])
-           (render-metafunction Name)))
-        (clip
-         (parameterize ([metafunction-pict-style 'left-right/beside-side-conditions]
-                        [linebreaks '(#t #f)])
-           (render-metafunction Name))))
-       "metafunction-Name-horizontal.png")
-
-;; makes sure that there is no overlap inside or across metafunction calls  
-;; or when there are unquotes involved
-(define-metafunction lang
-  [(multi-arg a
-              b
-              c)
-   ((multi-arg a 
-               b 
-               c)
-    (multi-arg a 
-               b 
-               c))]
-  [(multi-arg unquote-test)
-   (,@(term (multi-arg with-unquote))
-    ,@(term (multi-arg with-unquote))
-    ,@(term (multi-arg with-unquote)))])
-
-(btest (render-metafunction multi-arg) "metafunction-multi-arg.png")
-
-;; makes sure that the LHS and RHS of metafunctions are appropriately
-;; rewritten
-
-(define-metafunction lang
-  subst : e x e -> e
-  [(subst x x e) e]
-  [(subst number x e) number]
-  [(subst x_1 x_2 e) x_1]
-  [(subst (e_1 e_2) x e)
-   ((subst e_1 x e) (subst e_2 x e))]
-  [(subst (λ (x) e_b) x e)
-   (λ (x) e)]
-  [(subst (λ (x_f) e_f) x_a e_a)
-   (λ (x_f) (subst e_f x_a e_a))])
-
-(define (subst-rw lws)
-  (list ""
-        (list-ref lws 2)
-        "{"
-        (list-ref lws 3)
-        ":="
-        (list-ref lws 4)
-        "}"))
-
-(btest (with-atomic-rewriter
-        'number "number" ;; this rewriter has no effect; here to test that path in the code
-        (with-compound-rewriter
-         'subst subst-rw
-         (render-metafunction subst)))
-       "metafunction-subst.png")
-
-
-;; make sure two metafunctions simultaneously rewritten line up properly
-(btest (render-metafunctions S T TL #:contract? #t) "metafunctions-multiple.png")
-
-;; make sure that the ellipses don't have commas before them.
-(define-metafunction lang
-  rdups : x ... -> (x ...)
-  [(rdups x_1 x_2 ... x_1 x_3 ...)
-   (rdups x_2 ... x_1 x_3 ...)]
-  [(rdups x_1 x_2 ...)
-   (x_1 x_3 ...)
-   (where (x_3 ...) (rdups x_2 ...))]
-  [(rdups) ()])
-
-(btest (render-metafunction rdups) "rdups-delimited.png")
-(parameterize ([delimit-ellipsis-arguments? #f])
-  (btest (render-metafunction rdups) "rdups-undelimited.png"))
-
-;; Non-terminal superscripts
-(btest (render-lw lang (to-lw (x_^abcdef x_q^abcdef)))
-       "superscripts.png")
-
-;; `variable-not-in' in `where' RHS rendered as `fresh'
-(define-metafunction lang
-  [(f (name n 1)) 
-   (x x_1 x_2 x_3)
-   (where x ,(variable-not-in 'y 'x))
-   (where (x_1 x_2) ,(variables-not-in 'z '(x1 x2)))
-   (where x_3 (variables-not-in 'z '(x1 x2)))])
-(btest (render-metafunction f) "var-not-in.png")
-(let ([variable-not-in list])
-  (define-metafunction lang
-    [(g 1) 
-     x
-     (where x ,(variable-not-in 'y 'x))])
-  (btest (render-metafunction g) "var-not-in-rebound.png"))
-
-;; hidden `where' and `side-condition' clauses
-(define-metafunction lang
-  [(mf-hidden 1)
-   2
-   (where/hidden number 7)
-   (side-condition/hidden (= 1 2))])
-(btest (render-metafunction mf-hidden) "mf-hidden.png")
-(btest (render-reduction-relation
-        (reduction-relation
-         lang
-         (--> 1
-              2
-              (where/hidden number 7)
-              (side-condition/hidden (= 1 2)))))
-       "rr-hidden.png")
-
-;; holes
-(let ()
-  (define-language L
-    (n (hole x) ; a "named hole" at one time
-       hole))
-  (btest (render-language L) "holes.png"))
-
-(let ()
-  ;; the 'has no lambdas' relation (useful because it has a case with no premises)
-  (define-relation lang
-    [(r e_1 e_2) (r e_1) (r e_2)]
-    [(r x)])
-  (btest (render-relation r) "relation.png"))
-
-(let ()
-  ;; a relation with a `name' pattern in its conclusion
-  (define-relation lang
-    [(r (name e (λ (x) x)))
-     (r x)])
-  (btest (render-relation r) "relation-with-name.png"))    
-
-;; judgment form
-(let ()
-  (define-language nats
-    (n z (s n)))
-  
-  (define-judgment-form nats
-    #:mode (sum I I O)
-    [----------- "sumz"
-     (sum z n n)]
-    [(sum n_1 n_2 n_3)
-     ------------------------- "sums"
-     (sum (s n_1) n_2 (s n_3))])
-  
-  (define-judgment-form nats
-    #:mode (mfw I O)
-    [(mfw n_1 n_2)
-     (where n_2 (f n_1))])
-  
-  (define-metafunction nats
-    [(f n) n])
-  
-  (define-judgment-form nats
-    #:mode (nps I O)
-    [(nps (name a (s n_1)) n_2)
-     (nps z (name n_1 (s (s n_1))))
-     (where (name b n_2) z)])
-  
-  (define-judgment-form nats
-    #:mode (lt2 I)
-    [(lt2 z)]
-    [(lt2 (s z))])
-  
-  (define-judgment-form nats
-    #:mode (uses-ellipses I)
-    [(uses-ellipses (n ...))
-     (lt2 n) ... (sum z z z)])
-  
-  (btest (vc-append 
-          10
-          (render-judgment-form sum)
-          
-          (with-compound-rewriter
-           'sum
-           (λ (lws) (list "" (list-ref lws 2) " + " (list-ref lws 3) " = " (list-ref lws 4)))
-           (render-judgment-form sum))
-          
-          (render-judgment-form mfw)
-          
-          (render-judgment-form nps)
-          
-          (render-judgment-form uses-ellipses))
-         
-         "judgment-form-examples.png"))
-
-(let ()
-  (define-language STLC
-    (e (λ (x : τ) e)
-       (e e)
-       x)
-    (x variable-not-otherwise-mentioned)
-    ((τ σ) b
-           (τ → τ))
-    (Γ ([x τ] ...)))
-  
-  (define-judgment-form STLC
-    #:mode (typeof I I O)
-    #:contract (typeof Γ e τ)
-    [(typeof Γ (e_1 e_2) τ)
-     (typeof Γ e_1 (τ_2 → τ)) (typeof Γ e_2 τ_2)]
-    [(typeof Γ (λ (x : τ) e) (τ → σ))
-     (typeof (extend Γ x τ) e σ)]
-    [(typeof Γ x τ)
-     (where τ (lookup Γ x))])
-  
-  (define-metafunction STLC
-    extend : Γ x τ -> Γ
-    [(extend ([x_1 τ_1] ...) x_0 τ_0)
-     ([x_0 τ_0] [x_1 τ_1] ...)])
-  
-  (define-metafunction STLC
-    lookup : Γ x -> τ
-    [(lookup ([x_0 τ_0] ... [x_i τ_i] [x_i+1 τ_i+1] ...)) τ_i])
-  
-  (define (rewrite-typeof lws)
-    (list "" (list-ref lws 2) " ⊢ " (list-ref lws 3) " : " (list-ref lws 4)))
-  
-  (define (rewrite-extend lws)
-    (list "" (list-ref lws 2) ", " (list-ref lws 3) ":" (list-ref lws 4)))
-  
-  (define (rewrite-lookup lws)
-    (list "" (list-ref lws 2) "(" (list-ref lws 3) ")"))
-  
-  (btest (with-compound-rewriters
-          (['typeof rewrite-typeof]
-           ['extend rewrite-extend]
-           ['lookup rewrite-lookup])
-          (render-judgment-form typeof))
-         "stlc.png"))
-
-(done)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/extended-language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/extended-language.png
deleted file mode 100644
index 01df28212f..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/extended-language.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/extended-reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/extended-reduction-relation.png
deleted file mode 100644
index e5e6f04eec..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/extended-reduction-relation.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/holes.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/holes.png
deleted file mode 100644
index 0e9d02e892..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/holes.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/judgment-form-examples.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/judgment-form-examples.png
deleted file mode 100644
index 326ab12663..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/judgment-form-examples.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/language-nox.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/language-nox.png
deleted file mode 100644
index 9a5397d98e..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/language-nox.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/language.png
deleted file mode 100644
index 3dfe28b8d9..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/language.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/lw.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/lw.png
deleted file mode 100644
index b27d0b015c..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/lw.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name-horizontal.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name-horizontal.png
deleted file mode 100644
index 7e2d7bc912..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name-horizontal.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name-vertical.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name-vertical.png
deleted file mode 100644
index e44a3f1635..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name-vertical.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name.png
deleted file mode 100644
index 4299c5d570..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-T.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-T.png
deleted file mode 100644
index db3f7b304f..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-T.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-TL.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-TL.png
deleted file mode 100644
index 4746e42812..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-TL.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-judgment-holds.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-judgment-holds.png
deleted file mode 100644
index c7b532d35b..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-judgment-holds.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-multi-arg.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-multi-arg.png
deleted file mode 100644
index 0540833c7a..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-multi-arg.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-subst.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-subst.png
deleted file mode 100644
index ac01bacf87..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-subst.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction.png
deleted file mode 100644
index 35aeac99b3..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunctions-multiple.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunctions-multiple.png
deleted file mode 100644
index 441595ee3d..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunctions-multiple.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/mf-hidden.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/mf-hidden.png
deleted file mode 100644
index 8aaa240a82..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/mf-hidden.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rdups-delimited.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rdups-delimited.png
deleted file mode 100644
index 6b488ff9a0..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rdups-delimited.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rdups-undelimited.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rdups-undelimited.png
deleted file mode 100644
index 405e378d2e..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rdups-undelimited.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/red-with-where-name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/red-with-where-name.png
deleted file mode 100644
index 3447aa169d..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/red-with-where-name.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/red2.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/red2.png
deleted file mode 100644
index d413fd3270..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/red2.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation-with-computed-labels-and-hiding.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation-with-computed-labels-and-hiding.png
deleted file mode 100644
index 42d5de4dd3..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation-with-computed-labels-and-hiding.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation-with-computed-labels.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation-with-computed-labels.png
deleted file mode 100644
index 3cb901ba22..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation-with-computed-labels.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation.png
deleted file mode 100644
index 810f478b53..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/relation-with-name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/relation-with-name.png
deleted file mode 100644
index 4fec4f510a..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/relation-with-name.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/relation.png
deleted file mode 100644
index 8219519967..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/relation.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rr-hidden.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rr-hidden.png
deleted file mode 100644
index e5e6f04eec..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rr-hidden.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/stlc.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/stlc.png
deleted file mode 100644
index 8a858029ce..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/stlc.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/superscripts.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/superscripts.png
deleted file mode 100644
index 3704ea1f64..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/superscripts.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-extended-language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-extended-language.png
deleted file mode 100644
index 87e19556d4..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-extended-language.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-extended-reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-extended-reduction-relation.png
deleted file mode 100644
index 68452ef4df..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-extended-reduction-relation.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-language-nox.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-language-nox.png
deleted file mode 100644
index a05ce95394..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-language-nox.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-language.png
deleted file mode 100644
index cb88a9a4d9..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-language.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-lw.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-lw.png
deleted file mode 100644
index 708c9df4aa..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-lw.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-Name-vertical.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-Name-vertical.png
deleted file mode 100644
index 9a89a3f870..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-Name-vertical.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-Name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-Name.png
deleted file mode 100644
index b299b86abd..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-Name.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-T.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-T.png
deleted file mode 100644
index 05edef4444..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-T.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-TL.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-TL.png
deleted file mode 100644
index 378e0fd05b..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-TL.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-multi-arg.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-multi-arg.png
deleted file mode 100644
index 6753b06610..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-multi-arg.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-subst.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-subst.png
deleted file mode 100644
index 3f00d4671a..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-subst.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction.png
deleted file mode 100644
index b9d908c4ac..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunctions-multiple.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunctions-multiple.png
deleted file mode 100644
index c7bb749a3a..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunctions-multiple.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-reduction-relation.png
deleted file mode 100644
index d2196e527c..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-reduction-relation.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/var-not-in-rebound.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/var-not-in-rebound.png
deleted file mode 100644
index ce34b2da18..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/var-not-in-rebound.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/var-not-in.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/var-not-in.png
deleted file mode 100644
index 8e609f375a..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/var-not-in.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/extended-language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/extended-language.png
deleted file mode 100644
index 6afac91762..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/extended-language.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/extended-reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/extended-reduction-relation.png
deleted file mode 100644
index 269178a311..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/extended-reduction-relation.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/holes.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/holes.png
deleted file mode 100644
index 31b2a8faf0..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/holes.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/judgment-form-examples.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/judgment-form-examples.png
deleted file mode 100644
index d57672c6e1..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/judgment-form-examples.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/language-nox.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/language-nox.png
deleted file mode 100644
index 27b9cb8541..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/language-nox.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/language.png
deleted file mode 100644
index d2dde8ef32..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/language.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/lw.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/lw.png
deleted file mode 100644
index 8e6c26c635..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/lw.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name-horizontal.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name-horizontal.png
deleted file mode 100644
index 144afde18c..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name-horizontal.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name-vertical.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name-vertical.png
deleted file mode 100644
index b38d1e004f..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name-vertical.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name.png
deleted file mode 100644
index 5e011ccd86..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-T.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-T.png
deleted file mode 100644
index 6ad36f4ca2..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-T.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-TL.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-TL.png
deleted file mode 100644
index 26b2d65143..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-TL.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-judgment-holds.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-judgment-holds.png
deleted file mode 100644
index cec2c25c3a..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-judgment-holds.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-multi-arg.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-multi-arg.png
deleted file mode 100644
index c20279c92f..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-multi-arg.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-subst.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-subst.png
deleted file mode 100644
index 419be1bc3e..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-subst.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction.png
deleted file mode 100644
index ca0ce1aafc..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunctions-multiple.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunctions-multiple.png
deleted file mode 100644
index 80312fcacb..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunctions-multiple.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/mf-hidden.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/mf-hidden.png
deleted file mode 100644
index a76e9835b0..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/mf-hidden.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rdups-delimited.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rdups-delimited.png
deleted file mode 100644
index c699e88de1..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rdups-delimited.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rdups-undelimited.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rdups-undelimited.png
deleted file mode 100644
index 4200ff65d9..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rdups-undelimited.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/red-with-where-name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/red-with-where-name.png
deleted file mode 100644
index 8a06509c39..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/red-with-where-name.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/red2.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/red2.png
deleted file mode 100644
index b1ed63a09f..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/red2.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation-with-computed-labels-and-hiding.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation-with-computed-labels-and-hiding.png
deleted file mode 100644
index 76721c174c..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation-with-computed-labels-and-hiding.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation-with-computed-labels.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation-with-computed-labels.png
deleted file mode 100644
index f73350b14c..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation-with-computed-labels.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation.png
deleted file mode 100644
index fd2c77b2d1..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/relation-with-name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/relation-with-name.png
deleted file mode 100644
index ad5833a94f..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/relation-with-name.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/relation.png
deleted file mode 100644
index a272e4ccc6..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/relation.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rr-hidden.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rr-hidden.png
deleted file mode 100644
index 269178a311..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rr-hidden.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/stlc.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/stlc.png
deleted file mode 100644
index 2dc76f0aed..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/stlc.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/superscripts.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/superscripts.png
deleted file mode 100644
index 2dc331bb13..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/superscripts.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/var-not-in-rebound.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/var-not-in-rebound.png
deleted file mode 100644
index da075ee648..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/var-not-in-rebound.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/var-not-in.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/var-not-in.png
deleted file mode 100644
index 356927d4f1..0000000000
Binary files a/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/var-not-in.png and /dev/null differ
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/check-syntax-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/check-syntax-test.rkt
deleted file mode 100644
index 8bebc7aa03..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/check-syntax-test.rkt
+++ /dev/null
@@ -1,214 +0,0 @@
-#lang racket
-
-(require "test-util.rkt"
-         drracket/check-syntax
-         redex/pict
-         redex/reduction-semantics
-         (for-syntax setup/path-to-relative)
-         setup/path-to-relative)
-
-(module test racket/base)
-
-(reset-count)
-
-(define-syntax (identifier stx)
-  (syntax-case stx ()
-    [(_ x)
-     (identifier? #'x)
-     #`(let ([p (open-input-string (format "~s" 'x))])
-         (port-count-lines! p)
-         (set-port-next-location! 
-          p
-          #,(syntax-line #'x)
-          #,(syntax-column #'x)
-          #,(syntax-position #'x))
-         (read-syntax '#,(and (path? (syntax-source #'x))
-                              (path->relative-string/library (syntax-source #'x)))
-                      p))]))
-
-(define (source stx)
-  (list (and (path? (syntax-source stx))
-             (path->relative-string/library (syntax-source stx)))
-        (syntax-line stx)
-        (syntax-column stx)))
-
-(define (expected-arrows bindings)
-  (for/fold ([arrs (set)]) ([binding bindings])
-            (for/fold ([arrs arrs]) ([bound (cdr binding)])
-                      (set-add arrs
-                               (list (source (car binding))
-                                     (source bound))))))
-
-(define (expected-rename-class binding)
-  (apply set (map source binding)))
-
-(define collector%
-  (class (annotations-mixin object%)
-    (super-new)
-    (define/override (syncheck:find-source-object stx)
-      stx)
-    (define/override (syncheck:add-arrow start-source-obj
-                                         start-left
-                                         start-right
-                                         end-source-obj
-                                         end-left
-                                         end-right
-                                         actual?
-                                         phase-level)
-      (set! arrows 
-            (set-add arrows 
-                     (list (source start-source-obj)
-                           (source end-source-obj)))))
-    (define arrows (set))
-    (define/public (collected-arrows) arrows)))
-
-(define-namespace-anchor module-anchor)
-(define module-namespace 
-  (namespace-anchor->namespace module-anchor))
-
-;; judgment forms
-(let ([annotations (new collector%)])
-  (define-values (add-syntax done)
-    (make-traversal module-namespace #f))
-  
-  (define language-def-name (identifier L))
-  (define language-use-name (identifier L))
-  
-  (define mode-name (identifier J))
-  (define contract-name (identifier J))
-  (define conclusion-name (identifier J))
-  (define premise-name (identifier J))
-  (define render-name (identifier J))
-  (define holds-name (identifier J))
-  
-  (define language-binding 
-    (list language-def-name language-use-name))
-  (define judgment-form-binding
-    (list mode-name contract-name conclusion-name premise-name render-name holds-name))
-  
-  (parameterize ([current-annotations annotations]
-                 [current-namespace module-namespace])
-    (add-syntax
-     (expand #`(let ()
-                 (define-language #,language-def-name)
-                 (define-judgment-form #,language-use-name
-                   #:mode (#,mode-name)
-                   #:contract (#,contract-name)
-                   [(#,conclusion-name)
-                    (#,premise-name)])
-                 (render-judgment-form #,render-name)
-                 (judgment-holds (#,holds-name)))))
-    (done))
-  
-  (test (send annotations collected-arrows)
-        (expected-arrows
-         (list language-binding judgment-form-binding))))
-
-;; metafunctions
-(let ([annotations (new collector%)])
-  (define-values (add-syntax done)
-    (make-traversal module-namespace #f))
-  
-  (define language-def-name (identifier L))
-  (define language-use-name (identifier L))
-  
-  (define contract-name (identifier f))
-  (define lhs-name (identifier f))
-  (define rhs-name (identifier f))
-  (define render-name (identifier f))
-  (define term-name (identifier f))
-  
-  (define language-binding
-    (list language-def-name language-use-name))
-  (define metafunction-binding
-    (list contract-name lhs-name rhs-name render-name term-name))
-  
-  (parameterize ([current-annotations annotations]
-                 [current-namespace module-namespace])
-    (add-syntax
-     (expand #`(let ()
-                 (define-language #,language-def-name)
-                 (define-metafunction #,language-use-name
-                   #,contract-name : () -> ()
-                   [(#,lhs-name) (#,rhs-name)])
-                 (render-metafunction #,render-name)
-                 (term (#,term-name)))))
-    (done))
-  
-  (test (send annotations collected-arrows)
-        (expected-arrows
-         (list language-binding metafunction-binding))))
-
-;; define-term
-(let ([annotations (new collector%)])
-  (define-values (add-syntax done)
-    (make-traversal module-namespace #f))
-  
-  (define def-name (identifier x))
-  (define use-name (identifier x))
-  
-  (parameterize ([current-annotations annotations]
-                 [current-namespace module-namespace])
-    (add-syntax
-     (expand #`(let ()
-                 (define-term #,def-name a)
-                 (term (#,use-name b)))))
-    (done))
-  
-  (test (send annotations collected-arrows) 
-        (expected-arrows
-         (list (list def-name use-name)))))
-
-;; extended language
-(let ([annotations (new collector%)])
-  (define-values (add-syntax done)
-    (make-traversal module-namespace #f))
-  
-  (define base-lang-def (identifier L1))
-  (define base-lang-use1 (identifier L1))
-  (define base-lang-use2 (identifier L1))
-  (define base-lang-use3 (identifier L1))
-  (define extended-lang-def (identifier L2))
-  (define extended-lang-use (identifier L2))
-  (define base-nt-name (identifier e))
-  (define base-nt-use (identifier e))
-  (define base-nt-alias (identifier f))
-  (define alias-use (identifier f))
-  (define extended-nt-name (identifier e))
-  (define extended-nt-use (identifier e))
-  
-  (define base-lang-bindings
-    (list base-lang-def base-lang-use1 base-lang-use2 base-lang-use3))
-  (define extended-lang-bindings
-    (list extended-lang-def extended-lang-use))
-  (define base-nt-bindings
-    (list base-nt-name extended-nt-name base-nt-use))
-  (define extended-nt-bindings
-    (list extended-nt-name extended-nt-use))
-  (define alias-bindings
-    (list base-nt-alias alias-use))
-  
-  (parameterize ([current-annotations annotations]
-                 [current-namespace module-namespace])
-    (add-syntax
-     (expand #`(let ()
-                 (define-language #,base-lang-def
-                   ((#,base-nt-name #,base-nt-alias) number))
-                 (define-extended-language #,extended-lang-def #,base-lang-use1
-                   (#,extended-nt-name .... variable))
-                 (redex-match #,base-lang-use2 #,base-nt-use 1)
-                 (redex-match #,extended-lang-use #,extended-nt-use 'x)
-                 (redex-match #,base-lang-use3 #,alias-use 2))))
-    (done))
-  
-  (test (send annotations collected-arrows)
-        (expected-arrows
-         (list base-lang-bindings
-               extended-lang-bindings
-               base-nt-bindings
-               extended-nt-bindings
-               alias-bindings))))
-  
-    
-
-(print-tests-passed 'check-syntax-test.rkt)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/color-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/color-test.rkt
deleted file mode 100644
index c87dfe6020..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/color-test.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang racket/base
-
-#|
-
-tests the color setting ability during a reduction sequence.
-
-In one window, you expect to see a red and a blue snip. as you reduce you expect to see a spectrum from blue to red
-
-In the other window, you expect to see the currently unreducted terms in green and all others white.
-
-|#
-
-(require redex/reduction-semantics
-         redex/gui
-         racket/gui/base
-         racket/class)
-
-(module test racket/base)
-
-(reduction-steps-cutoff 1)
-
-(let ()
-  
-  (define (get-range term-node)
-    (let loop ([node term-node])
-      (let ([parents (term-node-parents node)])
-        (cond
-          [(null? parents) (list node)]
-          [else (cons node (loop (car parents)))]))))
-  
-  (define (color-range-pred sexp term-node) 
-    (let* ([parents (get-range term-node)]
-           [max-val (car (term-node-expr (car parents)))])
-      (for-each
-       (λ (node)
-         (let ([val (car (term-node-expr node))])
-           (term-node-set-color! node
-                                 (make-object color% 
-                                   (floor (- 255 (* val (/ 255 max-val))))
-                                   0
-                                   (floor (* val (/ 255 max-val)))))))
-       parents)
-      (term-node-color term-node)))
-  
-  (define-language empty-language)
-  
-  (traces 
-   (reduction-relation
-    empty-language
-    (--> (number_1 word)
-         (,(+ (term number_1) 1) word)
-         inc))
-   '(1 word)
-   #:pred color-range-pred))
-
-(let ()
-  (define-language empty-language)
-  
-  (define (last-color-pred sexp term-node)
-    (if (null? (term-node-children term-node))
-        "green"
-        "white"))
-  
-  (traces (reduction-relation
-           empty-language
-           (--> (number_1 word)
-                (,(+ (term number_1) 1) word)
-                inc)
-           (--> (number_1 word)
-                (,(* (term number_1) 2) word)
-                dup))
-          '(1 word)
-          #:pred last-color-pred))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/compiler/info.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/compiler/info.rkt
deleted file mode 100644
index a5b71b1dd7..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/compiler/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-omit-paths 'all)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/compiler/matrix-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/compiler/matrix-tests.rkt
deleted file mode 100644
index cd0406fa70..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/compiler/matrix-tests.rkt
+++ /dev/null
@@ -1,193 +0,0 @@
-#lang racket
-(require redex)
-(require racket/set)
-(require redex/private/compiler/match
-         redex/private/compiler/redextomatrix)
-
-(define the-hole (term hole))
-(define no-context #f)
-(define in-context #t)
-(define ∅ #f)
-(define context-match (make-parameter no-context))
-(define (variable-prefix? x y) 
-  (let* ([prefix-str (symbol->string x)]
-         [prefix-len (string-length prefix-str)])
-    (and (symbol? y)
-         (let ([str (symbol->string y)])
-           (and ((string-length str) . >= . prefix-len)
-                (string=? (substring str 0 prefix-len) prefix-str))))))
-
-(define (m-test matrix input expected)
-  (let ((r ((compile matrix) input)))
-    (unless (equal? (apply set r) (apply set expected)) (printf "Matrix: ~s Input: ~s ==> Expected: ~s Got: ~s\n" matrix input expected r))))
-
-(define (compiled-test func f-name input expected)
-  (let ((r (func input)))
-    (unless (equal? (apply set r) (apply set expected)) (printf "Func: ~s Input: ~s ==> Expected: ~s Got: ~s\n" f-name input expected r))))
-
-(define number-f (compile `(matrix (a) (((lit-number -> (set! results (cons 1 results))))) () () 0 #f)))
-(define real-f (compile `(matrix (a) (((lit-real -> (set! results (cons 1 results))))) () () 0 #f)))
-(define integer-f (compile `(matrix (a) (((lit-integer -> (set! results (cons 1 results))))) () () 0 #f)))
-(define natural-f (compile `(matrix (a) (((lit-natural -> (set! results (cons 1 results))))) () () 0 #f)))
-(define nine-f (compile `(matrix (a) (((9 -> (set! results (cons 1 results))))) () () 0 #f)))
-(define numbers-f (compile `(matrix (a) (((lit-number -> (set! results (cons 1 results))))
-                                         ((lit-real -> (set! results (cons 2 results))))
-                                         ((lit-integer -> (set! results (cons 3 results))))
-                                         ((lit-natural -> (set! results (cons 4 results))))
-                                         ((9 -> (set! results (cons 5 results))))) () () 0 #f)))
-(define list-of-any-3-f (compile `(matrix (a) ((((cons wc (cons wc (cons wc '()))) -> (set! results (cons 1 results))))) () () 0 #f)))
-(define variable-f (compile `(matrix (a) (((lit-variable -> (set! results (cons 1 results))))) () () 0 #f)))
-(define empty-f (compile `(matrix (a) ((('() -> (set! results (cons 1 results))))) () () 0 #f)))
-(define x-f (compile `(matrix (a) ((('x -> (set! results (cons 1 results))))) () () 0 #f)))
-(define string-x-f (compile `(matrix (a) ((("x" -> (set! results (cons 1 results))))) () () 0 #f)))
-(define string-f (compile `(matrix (a) (((lit-string -> (set! results (cons 1 results))))) () () 0 #f)))
-(define hole-f (compile `(matrix (a) (((lit-hole -> (set! results (cons 1 results))))) () () 0 #f)))
-(define in-hole-f (compile `(matrix (a) ((((lit-in-hole (cons lit-number (cons lit-hole '())) lit-number) -> (set! results (cons 1 results))))) () () 0 #f)))
-(define hide-hole-f (compile `(matrix (a) ((((lit-in-hole (cons (lit-hide-hole lit-hole) (cons lit-hole '())) lit-number) -> (set! results (cons 1 results))))) () () 0 #f)))
-(define repeat-number-f (compile `(matrix (a) ((((repeat lit-number '()) -> (set! results (cons 1 results))))) () () 0 #f)))
-(define repeat-number-number-f (compile `(matrix (a) ((((repeat (cons lit-number (cons lit-number '())) '()) -> (set! results (cons 1 results))))) () () 0 #f)))
-(define number_1-number_1-f (compile `(matrix (a) ((((cons (lit-name number_1 lit-number) (cons (lit-name number_1 lit-number) '())) -> (set! results (cons 1 results))) (number_1 #f))) () () 0 #f)))
-(define repeat-number-repeat-any-f (compile `(matrix (a) ((((repeat lit-number (repeat wc '())) -> (set! results (cons 1 results))))) () () 0 #f)))
-(define repeat-repeat-number_1-f (compile `(matrix (a) ((((repeat (repeat (lit-name number_1 lit-number) '()) '()) -> (set! results (cons 1 results))) (((number_1 ,'...) ,'...) #f))) () () 0 #f)))
-(define true-false-f (compile `(matrix (a) (((#t -> (set! results (cons 1 results))))
-                                            ((#f -> (set! results (cons 2 results))))) () () 0 #f)))
-(define variable-prefix-x-f (compile `(matrix (a) ((((lit-variable-prefix x) -> (set! results (cons 1 results))))) () () 0 #f)))
-(define variable-except-x-y-z-f (compile `(matrix (a) ((((lit-variable-except x y z) -> (set! results (cons 1 results))))) () () 0 #f)))
-
-(define (test)
-  (compiled-test number-f 'number-f 'x '())
-  (compiled-test real-f 'real-f 'x '())
-  (compiled-test integer-f 'integer-f 'x '())
-  (compiled-test natural-f 'natural-f 'x '())
-  (compiled-test nine-f 'nine-f 'x '())
-  (compiled-test numbers-f 'numbers-f 'x '())
-  
-  (compiled-test number-f 'number-f 0+4/5i '(1))
-  (compiled-test real-f 'real-f 0+4/5i '())
-  (compiled-test integer-f 'integer-f 0+4/5i '())
-  (compiled-test natural-f 'natural-f 0+4/5i '())
-  (compiled-test nine-f 'nine-f 0+4/5i '())
-  (compiled-test numbers-f 'numbers-f 0+4/5i '(1))
-  
-  (compiled-test number-f 'number-f 9.0 '(1))
-  (compiled-test real-f 'real-f 9.0 '(1))
-  (compiled-test integer-f 'integer-f 9.0 '())
-  (compiled-test natural-f 'natural-f 9.0 '())
-  (compiled-test nine-f 'nine-f 9.0 '())
-  (compiled-test numbers-f 'numbers-f 9.0 '(1 2))
-  
-  (compiled-test number-f 'number-f -1 '(1))
-  (compiled-test real-f 'real-f -1 '(1))
-  (compiled-test integer-f 'integer-f -1 '(1))
-  (compiled-test natural-f 'natural-f -1 '())
-  (compiled-test nine-f 'nine-f -1 '())
-  (compiled-test numbers-f 'numbers-f -1 '(1 2 3))
-  
-  (compiled-test number-f 'number-f 6 '(1))
-  (compiled-test real-f 'real-f 6 '(1))
-  (compiled-test integer-f 'integer-f 6 '(1))
-  (compiled-test natural-f 'natural-f 6 '(1))
-  (compiled-test nine-f 'nine-f 6 '())
-  (compiled-test numbers-f 'numbers-f 6 '(1 2 3 4))
-  
-  (compiled-test number-f 'number-f 9 '(1))
-  (compiled-test real-f 'real-f 9 '(1))
-  (compiled-test integer-f 'integer-f 9 '(1))
-  (compiled-test natural-f 'natural-f 9 '(1))
-  (compiled-test nine-f 'nine-f 9 '(1))
-  (compiled-test numbers-f 'numbers-f 9 '(1 2 3 4 5))
-  
-  (compiled-test list-of-any-3-f 'list-of-any-3-f 'a '())
-  (compiled-test list-of-any-3-f 'list-of-any-3-f '(() () ()) '(1))
-  (compiled-test list-of-any-3-f 'list-of-any-3-f '(1 2 3) '(1))
-  (compiled-test list-of-any-3-f 'list-of-any-3-f '(1 (2 3) ((4))) '(1))
-  
-  (compiled-test variable-f 'variable-f '() '())
-  (compiled-test variable-f 'variable-f 'x '(1))
-  (compiled-test variable-f 'variable-f '|x  y  x| '(1))
-  (compiled-test variable-f 'variable-f '\|x '(1))
-  
-  (compiled-test empty-f 'empty-f '() '(1))
-  (compiled-test empty-f 'empty-f (list '()) '())
-  (compiled-test empty-f 'empty-f 'x '())
-  (compiled-test empty-f 'empty-f 9 '())
-  (compiled-test empty-f 'empty-f '(1 2 3) '())
-  
-  (compiled-test x-f 'x-f 'x '(1))
-  (compiled-test x-f 'x-f 'y '())
-  (compiled-test x-f 'x-f '() '())
-  (compiled-test x-f 'x-f 9 '())
-  (compiled-test x-f 'x-f '(1 2 3) '())
-  
-  (compiled-test string-x-f 'string-x-f "x" '(1))
-  (compiled-test string-x-f 'string-x-f "y" '())
-  (compiled-test string-x-f 'string-x-f 'x '())
-  (compiled-test string-x-f 'string-x-f 'y '())
-  (compiled-test string-x-f 'string-x-f '() '())
-  (compiled-test string-x-f 'string-x-f 9 '())
-  (compiled-test string-x-f 'string-x-f '(1 2 3) '())
-  
-  (compiled-test string-f 'string-f "x" '(1))
-  (compiled-test string-f 'string-f "zyx" '(1))
-  (compiled-test string-f 'string-f 'x '())
-  (compiled-test string-f 'string-f 'y '())
-  (compiled-test string-f 'string-f '() '())
-  (compiled-test string-f 'string-f 9 '())
-  (compiled-test string-f 'string-f '(1 2 3) '())
-  
-  (compiled-test hole-f 'hole-f the-hole '(1))
-  (compiled-test hole-f 'hole-f 'hole '())
-  
-  (compiled-test in-hole-f 'in-hole-f '(1 2) '(1))
-  (compiled-test in-hole-f 'in-hole-f (term (1 hole)) '())
-  (compiled-test in-hole-f 'in-hole-f '(1 x) '())
-  
-  (compiled-test hide-hole-f 'hide-hole-f (term (hole 2)) '(1))
-  (compiled-test hide-hole-f 'hide-hole-f '(1 2) '())
-  (compiled-test hide-hole-f 'hide-hole-f (term (1 hole)) '())
-  (compiled-test hide-hole-f 'hide-hole-f '(1 x) '())
-  
-  (compiled-test repeat-number-f 'repeat-number-f '() '(1))
-  (compiled-test repeat-number-f 'repeat-number-f '(9) '(1))
-  (compiled-test repeat-number-f 'repeat-number-f '(x) '())
-  (compiled-test repeat-number-f 'repeat-number-f 9 '())
-  (compiled-test repeat-number-f 'repeat-number-f '(1 2 3 4 5) '(1))
-  (compiled-test repeat-number-f 'repeat-number-f '(1 2 3 4 y) '())
-  (compiled-test repeat-number-f 'repeat-number-f '(1 2 3 4 ()) '())
-  
-  (compiled-test repeat-number-number-f 'repeat-number-number-f '() '(1))
-  (compiled-test repeat-number-number-f 'repeat-number-number-f '((1 2)) '(1))
-  (compiled-test repeat-number-number-f 'repeat-number-number-f '((1 2) (4 5)) '(1))
-  (compiled-test repeat-number-number-f 'repeat-number-number-f '((1 2) (1 1) (1 2 3)) '())
-  (compiled-test repeat-number-number-f 'repeat-number-number-f '((1 2) (x 9)) '())
-  (compiled-test repeat-number-number-f 'repeat-number-number-f '(()) '())
-  
-  (compiled-test number_1-number_1-f 'number_1-number_1-f '(-1 -1) '(1))
-  (compiled-test number_1-number_1-f 'number_1-number_1-f '(-1 1) '())
-  
-  (compiled-test repeat-number-repeat-any-f 'repeat-number-repeat-any-f '(1 2 3 4 5) '(1))
-  (compiled-test repeat-number-repeat-any-f 'repeat-number-repeat-any-f '(1 2 x 4 5) '(1))
-  (compiled-test repeat-number-repeat-any-f 'repeat-number-repeat-any-f '(x 2 3 4 5) '(1))
-  (compiled-test repeat-number-repeat-any-f 'repeat-number-repeat-any-f '() '(1))
-  (compiled-test repeat-number-repeat-any-f 'repeat-number-repeat-any-f '(1 2 (3 4 5)) '(1))
-  (compiled-test repeat-number-repeat-any-f 'repeat-number-repeat-any-f '1 '())
-  
-  (compiled-test repeat-repeat-number_1-f 'repeat-repeat-number_1-f '() '(1))
-  (compiled-test repeat-repeat-number_1-f 'repeat-repeat-number_1-f '(()) '(1))
-  (compiled-test repeat-repeat-number_1-f 'repeat-repeat-number_1-f '(() ()) '(1))
-  
-  (compiled-test true-false-f 'true-false-f #t '(1))
-  (compiled-test true-false-f 'true-false-f #f '(2))
-  (compiled-test true-false-f 'true-false-f 'true '())
-  
-  (compiled-test variable-prefix-x-f 'variable-prefix-x-f 'x '(1))
-  (compiled-test variable-prefix-x-f 'variable-prefix-x-f 'xyz '(1))
-  (compiled-test variable-prefix-x-f 'variable-prefix-x-f 'zyx '())
-  
-  (compiled-test variable-except-x-y-z-f 'variable-except-x-y-z-f 'x '())
-  (compiled-test variable-except-x-y-z-f 'variable-except-x-y-z-f 'y '())
-  (compiled-test variable-except-x-y-z-f 'variable-except-x-y-z-f 'z '())
-  (compiled-test variable-except-x-y-z-f 'variable-except-x-y-z-f 'xyz '(1))
-  )
-
-(test)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/compiler/redex-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/compiler/redex-tests.rkt
deleted file mode 100644
index c32548d6b6..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/compiler/redex-tests.rkt
+++ /dev/null
@@ -1,883 +0,0 @@
-#lang racket
-(require (only-in redex term)
-         redex/private/lang-struct
-         redex/private/matcher
-         redex/private/compiler/match
-         redex/private/compiler/redextomatrix
-         (only-in "../test-util.rkt" equal/bindings?)
-         mzlib/list)
-
-(define (make-test-mtch a b c) (make-mtch a (build-flat-context b) c))
-
-(define (build-context c)
-  (let loop ([c c])
-    (cond
-      [(eq? c the-hole) the-hole]
-      [(pair? c) (build-cons-context (loop (car c)) (loop (cdr c)))]
-      [(or (null? c)
-           (number? c)
-           (symbol? c))
-       (build-flat-context c)]
-      [else (error 'build-context "unknown ~s" c)])))
-
-(define no-context #f)
-(define in-context #t)
-(define context-match (make-parameter no-context))
-
-(define natural?
-  (λ (x) (and 
-          (exact-integer? x) 
-          (not (negative? x)))))
-
-(define (variable-prefix? x y) 
-  (let* ([prefix-str (symbol->string x)]
-         [prefix-len (string-length prefix-str)])
-    (and (symbol? y)
-         (let ([str (symbol->string y)])
-           (and ((string-length str) . >= . prefix-len)
-                (string=? (substring str 0 prefix-len) prefix-str))))))
-
-(define (run-match-test xs ys)
-  (cond
-    [(and (not xs) (not ys)) #t]
-    [(and (list? xs)
-          (list? ys))
-     (and (andmap (λ (x) (memf (λ (y) (equal/bindings? x y)) ys)) xs)
-          (andmap (λ (y) (memf (λ (x) (equal/bindings? x y)) xs)) ys)
-          (= (length xs) (length ys)))]
-    [else #f]))
-
-(define empty-lang (test-redex-match '(define-language empty)))
-(define x-lang (test-redex-match '(define-language x-lang (x (variable-except x)))))
-(define ab-lang (test-redex-match '(define-language ab-lang (aa a) (bb b))))
-(define xab-lang (test-redex-match '(define-language xab-lang 
-                                      (exp (+ exp exp)
-                                           number)
-                                      (ctxt (+ ctxt exp)
-                                            (+ exp ctxt)
-                                            hole)
-                                      (ec-one (+ (hole xx) exp)
-                                              (+ exp (hole xx)))
-                                      (same-in-nt ((name x any) (name x any)))
-                                      (forever-list (forever-list forever-list ...)
-                                                    x)
-                                      (lsts ()
-                                            (x)
-                                            x
-                                            #f)
-                                      (split-out split-out2)
-                                      (split-out2 number)
-                                      (simple simple-rhs)
-                                      (nesting-names (a (name x nesting-names))
-                                                     b)
-                                      (var variable-not-otherwise-mentioned)
-                                      (underscore exp_1)
-                                      )
-                                   ))
-(define nany-lang (test-redex-match '(define-language nany (n any number))))
-
-; test-empty : sexp[pattern] sexp[term] answer -> void
-;; returns #t if pat matching exp with the empty language produces ans.
-(define (test-empty pat exp ans)
-  (let ((a ((empty-lang pat) exp)))
-    (unless (run-match-test ans (if (empty? a) #f a)) (printf "Pattern: ~s Input: ~s ==> Got: ~s Expected: ~s\n" pat exp a ans))
-    )
-  )
-
-;; test-x : sexp[pattern] sexp[term] answer -> void
-;; returns #t if pat matching exp with the x language produces ans.
-(define (test-x pat exp ans)
-  (let ((a ((x-lang pat) exp)))
-    (unless (run-match-test ans (if (empty? a) #f a)) (printf "Pattern: ~s Input: ~s ==> Got: ~s Expected: ~s\n" pat exp a ans))
-    )
-  )
-
-;; test-ab : sexp[pattern] sexp[term] answer -> void
-;; returns #t if pat matching exp with the ab language produces ans.
-(define (test-ab pat exp ans)
-  (let ((a ((ab-lang pat) exp)))
-    (unless (run-match-test ans (if (empty? a) #f a)) (printf "Pattern: ~s Input: ~s ==> Got: ~s Expected: ~s\n" pat exp a ans))
-    )
-  )
-
-;; test-xab : sexp[pattern] sexp[term] answer -> void
-;; returns #t if pat matching exp with the xab language produces ans.
-(define (test-xab pat exp ans)
-  (let ((a ((xab-lang pat) exp)))
-    (unless (run-match-test ans (if (empty? a) #f a)) (printf "Pattern: ~s Input: ~s ==> Got:\n~s\nExpected:\n~s\n\n" pat exp a ans))
-    )
-  )
-
-(define (test-nany pat exp ans)
-  (let ((a ((nany-lang pat) exp)))
-    (unless (run-match-test ans (if (empty? a) #f a)) (printf "Pattern: ~s Input: ~s ==> Got:\n~s\nExpected:\n~s\n\n" pat exp a ans))
-    )
-  )
-
-(define (test)
-  (print-struct #t)
-  (test-empty 'any 1 (list (make-test-mtch (make-bindings (list (make-bind 'any 1))) 1 'none)))
-  (test-empty 'any 'true (list (make-test-mtch (make-bindings (list (make-bind 'any 'true))) 'true 'none)))
-  (test-empty 'any "a" (list (make-test-mtch (make-bindings (list (make-bind 'any "a"))) "a" 'none)))
-  (test-empty 'any '(a b) (list (make-test-mtch (make-bindings (list (make-bind 'any '(a b)))) '(a b) 'none)))
-  (test-empty 'any #t (list (make-test-mtch (make-bindings (list (make-bind 'any #t))) #t 'none)))
-  (test-empty 1 1 (list (make-test-mtch (make-bindings null) 1 'none)))
-  (test-empty 1 '() #f)
-  (test-empty 99999999999999999999999999999999999999999999999
-              99999999999999999999999999999999999999999999999
-              (list (make-test-mtch (make-bindings null) 
-                                    99999999999999999999999999999999999999999999999
-                                    'none)))
-  (test-empty 99999999999999999999999999999999999999999999999
-              '()
-              #f)
-  (test-empty 'x 'x (list (make-test-mtch (make-bindings null) 'x 'none)))
-  (test-empty 'x '() #f)
-  (test-empty 1 2 #f)
-  (test-empty "a" "b" #f)
-  (test-empty "a" '(x) #f)
-  (test-empty "a" '() #f)
-  (test-empty "a" "a" (list (make-test-mtch (make-bindings null) "a" 'none)))
-  (test-empty 'number 1 (list (make-test-mtch (make-bindings (list (make-bind 'number 1))) 1 'none)))
-  (test-empty 'number 'x #f)
-  (test-empty 'number '() #f)
-  (test-empty 'natural 1 (list (make-test-mtch (make-bindings (list (make-bind 'natural 1))) 1 'none)))
-  (test-empty 'natural 'x #f)
-  (test-empty 'natural '() #f)
-  (test-empty 'natural -1 #f)
-  (test-empty 'natural 1.0 #f)
-  (test-empty 'integer -1 (list (make-test-mtch (make-bindings (list (make-bind 'integer -1))) -1 'none)))
-  (test-empty 'integer 'x #f)
-  (test-empty 'integer '() #f)
-  (test-empty 'integer 1.0 #f)
-  (test-empty 'real 1.1 (list (make-test-mtch (make-bindings (list (make-bind 'real 1.1))) 1.1 'none)))
-  (test-empty 'real 'x #f)
-  (test-empty 'real '() #f)
-  (test-empty 'real 2+3i #f)
-  (test-empty 'string "a" (list (make-test-mtch (make-bindings (list (make-bind 'string "a"))) "a" 'none)))
-  (test-empty 'string 1 #f)
-  (test-empty 'string '() #f)
-  (test-empty 'variable 'x (list (make-test-mtch (make-bindings (list (make-bind 'variable 'x))) 'x 'none)))
-  (test-empty 'variable 1 #f)
-  (test-empty '(variable-except x) 1 #f)
-  (test-empty '(variable-except x) 'x #f)
-  (test-empty '(variable-except x) 'y (list (make-test-mtch (make-bindings null) 'y 'none)))
-  
-  (test-x 'x 'y (list (make-mtch (make-bindings (list (make-bind 'x 'y))) 'y 'none)))
-  ; added to replace:
-  #;(test-lang 'x 'y (list (make-mtch (make-bindings (list (make-bind 'x 'y))) 'y 'none))
-               (list (make-nt 'x (list (make-rhs '(variable-except x))))))
-  
-  (test-empty '(variable-prefix x:) 'x: (list (make-test-mtch (make-bindings null) 'x: 'none)))
-  (test-empty '(variable-prefix x:) 'x:x (list (make-test-mtch (make-bindings null) 'x:x 'none)))
-  (test-empty '(variable-prefix x:) ': #f)
-  (test-empty '(variable-prefix x:) '() #f)
-  (test-empty 'hole 1 #f)
-  (test-empty `hole
-              the-hole
-              (list (make-test-mtch (make-bindings (list)) the-hole 'none)))
-  (test-empty '(in-hole (hole 2) 1)
-              '(1 2)
-              (list (make-test-mtch (make-bindings (list)) `(1 2) 'none)))
-  
-  (test-empty '(in-hole (name E_1 ((hide-hole hole) hole)) x)
-              `(,the-hole x)
-              (list (make-test-mtch (make-bindings (list (make-bind 'E_1 `(,the-not-hole ,the-hole)))) 
-                                    `(,the-hole x)
-                                    'none)))
-  (test-empty '(name x number) 1 (list (make-test-mtch (make-bindings (list (make-bind 'x 1) (make-bind 'number 1))) 1 'none)))
-  (test-empty 'number_x 1 (list (make-test-mtch (make-bindings (list (make-bind 'number_x 1))) 1 'none)))
-  (test-empty 'string_y "b" (list (make-test-mtch (make-bindings (list (make-bind 'string_y "b"))) "b" 'none)))
-  (test-empty 'any_z '(a b) (list (make-test-mtch (make-bindings (list (make-bind 'any_z '(a b)))) '(a b) 'none)))
-  
-  ; We don't have _!_ yet
-  
-  ;    (test-empty '(name x_!_1 number) 1 (list (make-test-mtch (make-bindings (list (make-bind 'number 1))) 1 'none)))
-  ;    (test-empty '((name x_!_1 number) (name x_!_1 number)) '(1 1) #f)
-  ;    (test-empty '((name x_!_1 number_a) (name x_!_1 number_b)) '(1 2) 
-  ;                (list (make-test-mtch (make-bindings (list (make-bind 'number_a 1)
-  ;                                                           (make-bind 'number_b 2)))
-  ;                                      '(1 2) 
-  ;                                      'none)))
-  ;    (test-empty '(number_!_1 number_!_1) '(1 1) #f)
-  ;    (test-empty '(number_!_1 number_!_1) '(1 2) (list (make-test-mtch (make-bindings (list)) '(1 2) 'none)))
-  ;    (test-empty '(number_!_1 ...) '(1 2) (list (make-test-mtch (make-bindings (list)) '(1 2) 'none)))
-  ;    (test-empty '(number_!_1 ...) '(1 2 3 4 5) (list (make-test-mtch (make-bindings (list)) '(1 2 3 4 5) 'none)))
-  ;    (test-empty '(number_!_1 ...) '(1 2 3 1 5) (list (make-test-mtch (make-bindings (list)) '(1 2 3 1 5) 'none)))
-  ;    (test-empty '((number_!_1 ...) (number_!_1 ...)) 
-  ;                '((1 2 3 1 5) (1 2 3 1 5))
-  ;                #f)
-  ;    (test-empty '((number_!_1 ...) (number_!_1 ...)) 
-  ;                '((17 2 3 1 5) (1 2 3 1 5))
-  ;                (list (make-test-mtch (make-bindings (list)) '((17 2 3 1 5) (1 2 3 1 5)) 'none)))
-  ;    (test-empty '((number_!_1 number_!_1) ... number_!_1 ...) '((1 1) (2 2) 1 3) #f)
-  ;    (test-empty '((number_!_1 number_!_1) ... number_!_1 ...) '((1 1) (2 3) 1 2) #f)
-  ;    (test-empty '((number_!_1 number_!_1) ... number_!_1 ...)
-  ;                '((1 1) (2 3) 1 4)
-  ;                (list (make-test-mtch (make-bindings (list)) '((1 1) (2 3) 1 4) 'none)))
-  
-  ; cases based on "test-ellipses"
-  ; (test-ellipses '(a) '(a))
-  (test-empty '(a) '(a) (list (make-test-mtch (make-bindings null) '(a) 'none)))
-  
-  ; (test-ellipses '(a ...) `(,(make-repeat 'a '() #f #f)))
-  (test-empty '(a ...) '() (list (make-test-mtch (make-bindings null) '() 'none)))
-  (test-empty '(a ...) '(a) (list (make-test-mtch (make-bindings null) '(a) 'none)))
-  (test-empty '(a ...) '(a a a) (list (make-test-mtch (make-bindings null) '(a a a) 'none)))
-  (test-empty '(a ...) '(a b a) #f) 
-  
-  ; (test-ellipses '((a ...) ...) `(,(make-repeat '(a ...) '() #f #f)))
-  (test-empty '((a ...) ...) '() (list (make-test-mtch (make-bindings null) '() 'none)))
-  (test-empty '((a ...) ...) '(()) (list (make-test-mtch (make-bindings null) '(()) 'none)))
-  (test-empty '((a ...) ...) '(() (a) (a a a)) (list (make-test-mtch (make-bindings null) '(() (a) (a a a)) 'none)))
-  (test-empty '((a ...) ...) '((a a a a a) () () (a a)) (list (make-test-mtch (make-bindings null) '((a a a a a) () () (a a)) 'none)))
-  (test-empty '((a ...) ...) '((a a a a a) () () (b a)) #f)
-  
-  ; (test-ellipses '(a ... b c ...) `(,(make-repeat 'a '() #f #f) b ,(make-repeat 'c '() #f #f)))
-  (test-empty '(a ... b c ...) '(b) (list (make-test-mtch (make-bindings null) '(b) 'none)))
-  (test-empty '(a ... b c ...) '(a b) (list (make-test-mtch (make-bindings null) '(a b) 'none)))
-  (test-empty '(a ... b c ...) '(b c) (list (make-test-mtch (make-bindings null) '(b c) 'none)))
-  (test-empty '(a ... b c ...) '(a a a b) (list (make-test-mtch (make-bindings null) '(a a a b) 'none)))
-  (test-empty '(a ... b c ...) '(b c c c) (list (make-test-mtch (make-bindings null) '(b c c c) 'none)))
-  (test-empty '(a ... b c ...) '(a a a b c c) (list (make-test-mtch (make-bindings null) '(a a a b c c) 'none)))
-  (test-empty '(a ... b c ...) '(a a a b b c c) #f)
-  
-  ; (test-ellipses '((name x a) ...) `(,(make-repeat '(name x a) (list (make-bind 'x '())) #f #f))) 
-  (test-empty '((name x a) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'x '()))) '() 'none)))
-  (test-empty '((name x a) ...) '(a) (list (make-test-mtch (make-bindings (list (make-bind 'x '(a)))) '(a) 'none)))
-  (test-empty '((name x a) ...) '(a a a) (list (make-test-mtch (make-bindings (list (make-bind 'x '(a a a)))) '(a a a) 'none)))
-  (test-empty '((name x a) ...) '(a b a) #f)
-  
-  ;    (test-ellipses '((name x (a ...)) ...)
-  ;                   `(,(make-repeat '(name x (a ...)) (list (make- bind 'x '())) #f #f)))
-  (test-empty '((name x (a ...)) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'x '()))) '() 'none)))
-  (test-empty '((name x (a ...)) ...) '(()) (list (make-test-mtch (make-bindings (list (make-bind 'x '(())))) '(()) 'none)))
-  (test-empty '((name x (a ...)) ...) '(() (a) (a a a)) (list (make-test-mtch (make-bindings (list (make-bind 'x '(() (a) (a a a))))) '(() (a) (a a a)) 'none)))
-  (test-empty '((name x (a ...)) ...) '((a a a a a) () () (a a)) (list (make-test-mtch (make-bindings (list (make-bind 'x '((a a a a a) () () (a a))))) '((a a a a a) () () (a a)) 'none)))
-  (test-empty '((name x (a ...)) ...) '((a a a a a) () () (b a)) #f)
-  
-  ;    (test-ellipses '(((name x a) ...) ...)
-  ;                   `(,(make-repeat '((name x a) ...) (list (make-bind 'x '())) #f #f)))
-  (test-empty '(((name x a) ...) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'x '()))) '() 'none)))
-  (test-empty '(((name x a) ...) ...) '(()) (list (make-test-mtch (make-bindings (list (make-bind 'x '(())))) '(()) 'none)))
-  (test-empty '(((name x a) ...) ...) '(() (a) (a a a)) (list (make-test-mtch (make-bindings (list (make-bind 'x '(() (a) (a a a))))) '(() (a) (a a a)) 'none)))
-  (test-empty '(((name x a) ...) ...) '((a a a a a) () () (a a)) (list (make-test-mtch (make-bindings (list (make-bind 'x '((a a a a a) () () (a a))))) '((a a a a a) () () (a a)) 'none)))
-  (test-empty '(((name x a) ...) ...) '((a a a a a) () () (b a)) #f)
-  
-  ;    (test-ellipses '((1 (name x a)) ...)
-  ;                   `(,(make-repeat '(1 (name x a)) (list (make-bind 'x '())) #f #f)))
-  (test-empty '((1 (name x a)) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'x '()))) '() 'none)))
-  (test-empty '((1 (name x a)) ...) '((1 a)) (list (make-test-mtch (make-bindings (list (make-bind 'x '(a)))) '((1 a)) 'none)))
-  (test-empty '((1 (name x a)) ...) '((1 a) (1 a) (1 a)) (list (make-test-mtch (make-bindings (list (make-bind 'x '(a a a)))) '((1 a) (1 a) (1 a)) 'none)))
-  (test-empty '((1 (name x a)) ...) '((1 a) (2 a) (1 a)) #f)
-  (test-empty '((1 (name x a)) ...) '((1 a) (1 b) (1 a)) #f)
-  
-  ;    (test-ellipses '((any (name x a)) ...)
-  ;                   `(,(make-repeat '(any (name x a)) (list (make-bind 'any '())
-  ;                                                           (make-bind 'x '())) 
-  ;                                   #f #f)))
-  (test-empty '((any (name x a)) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'any '()) (make-bind 'x '()))) '() 'none)))
-  (test-empty '((any (name x a)) ...) '((b a)) (list (make-test-mtch (make-bindings (list (make-bind 'any '(b)) (make-bind 'x '(a)))) '((b a)) 'none)))
-  (test-empty '((any (name x a)) ...) '((1 a) (2 a) (3 a)) (list (make-test-mtch (make-bindings (list (make-bind 'any '(1 2 3)) (make-bind 'x '(a a a)))) '((1 a) (2 a) (3 a)) 'none)))
-  (test-empty '((any (name x a)) ...) '((1 a) (2 b) (3 a)) #f)
-  
-  ;    (test-ellipses '((number (name x a)) ...)
-  ;                   `(,(make-repeat '(number (name x a)) (list (make-bind 'number '())
-  ;                                                              (make-bind 'x '())) 
-  ;                                   #f #f)))
-  (test-empty '((number (name x a)) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'number '()) (make-bind 'x '()))) '() 'none)))
-  (test-empty '((number (name x a)) ...) '((2 a)) (list (make-test-mtch (make-bindings (list (make-bind 'number '(2)) (make-bind 'x '(a)))) '((2 a)) 'none)))
-  (test-empty '((number (name x a)) ...) '((1 a) (2 a) (3 a)) (list (make-test-mtch (make-bindings (list (make-bind 'number '(1 2 3)) (make-bind 'x '(a a a)))) '((1 a) (2 a) (3 a)) 'none)))
-  (test-empty '((number (name x a)) ...) '((1 a) (2 b) (3 a)) #f)
-  (test-empty '((number (name x a)) ...) '((1 a) (b a) (3 a)) #f)
-  
-  ;    (test-ellipses '((variable (name x a)) ...)
-  ;                   `(,(make-repeat '(variable (name x a)) (list (make-bind 'variable '())
-  ;                                                                (make-bind 'x '()))
-  ;                                   #f #f)))
-  (test-empty '((variable (name x a)) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'variable '()) (make-bind 'x '()))) '() 'none)))
-  (test-empty '((variable (name x a)) ...) '((x a)) (list (make-test-mtch (make-bindings (list (make-bind 'variable '(x)) (make-bind 'x '(a)))) '((x a)) 'none)))
-  (test-empty '((variable (name x a)) ...) '((x a) (y a) (z a)) (list (make-test-mtch (make-bindings (list (make-bind 'variable '(x y z)) (make-bind 'x '(a a a)))) '((x a) (y a) (z a)) 'none)))
-  (test-empty '((variable (name x a)) ...) '((x a) (y b) (z a)) #f)
-  (test-empty '((variable (name x a)) ...) '((1 a) (b a) (c a)) #f)
-  
-  ;    (test-ellipses '(((name x a) (name y b)) ...)
-  ;                   `(,(make-repeat '((name x a) (name y b)) (list (make-bind 'x '()) (make-bind 'y '())) #f #f)))
-  (test-empty '(((name x a) (name y b)) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'y '()) (make-bind 'x '()))) '() 'none)))
-  (test-empty '(((name x a) (name y b)) ...) '((a b)) (list (make-test-mtch (make-bindings (list (make-bind 'y '(b)) (make-bind 'x '(a)))) '((a b)) 'none)))
-  (test-empty '(((name x a) (name y b)) ...) '((a b) (a b)) (list (make-test-mtch (make-bindings (list (make-bind 'y '(b b)) (make-bind 'x '(a a)))) '((a b) (a b)) 'none)))
-  (test-empty '(((name x a) (name y b)) ...) '((a b) (b a)) #f)
-  (test-empty '(((name x a) (name y b)) ...) '(a b) #f)
-  (test-empty '(((name x a) (name y b)) ...) '(a b a b) #f)
-  (test-empty '(((name x a) (name y b)) ...) '(a c) #f)
-  
-  ;    (test-ellipses '((name x (name y b)) ...)
-  ;                   `(,(make-repeat '(name x (name y b)) (list (make-bind 'x '()) (make-bind 'y '())) #f #f)))
-  (test-empty '((name x (name y b)) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'y '()) (make-bind 'x '()))) '() 'none)))
-  (test-empty '((name x (name y b)) ...) '(b) (list (make-test-mtch (make-bindings (list (make-bind 'y '(b)) (make-bind 'x '(b)))) '(b) 'none)))
-  (test-empty '((name x (name y b)) ...) '(b b b) (list (make-test-mtch (make-bindings (list (make-bind 'y '(b b b)) (make-bind 'x '(b b b)))) '(b b b) 'none)))
-  (test-empty '((name x (name y b)) ...) '(b b a) #f)
-  
-  ;    (test-ellipses '((in-hole (name x a) (name y b)) ...)
-  ;                   `(,(make-repeat '(in-hole (name x a) (name y b)) 
-  ;                                  (list (make-bind 'y '()) (make-bind 'x '())) #f #f)))
-  (test-empty '((in-hole (name x a) (name y b)) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'y '()) (make-bind 'x '()))) '() 'none)))
-  (test-empty '((in-hole (name x a) (name y b)) ...) '(a) #f)
-  
-  ; We don't have ..._ or ..._!_ yet 
-  ;    (test-ellipses '(a ..._1)
-  ;                   `(,(make-repeat 'a (list) '..._1 #f)))
-  ;    (test-ellipses '(a ..._!_1)
-  ;                   `(,(make-repeat 'a (list) '..._!_1 #t)))
-  
-  
-  (test-empty '(((name x 5) (name y 5)) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'x '()) (make-bind 'y '()))) '() 'none)))
-  (test-empty '(((name x 5) (name y 5)) ...) '((5 5)) (list (make-test-mtch (make-bindings (list (make-bind 'x '(5)) (make-bind 'y '(5)))) '((5 5)) 'none)))
-  (test-empty '(((name x 5) (name y 5)) ...) '((5 5) (5 5) (5 5)) (list (make-test-mtch (make-bindings (list (make-bind 'y '(5 5 5)) (make-bind 'x '(5 5 5)))) '((5 5) (5 5) (5 5)) 'none)))
-  (test-empty '(((name x 5) (name y 5)) ...) '((5 6)) #f)
-  
-  (test-empty '((number number) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'number '()))) '() 'none)))
-  (test-empty '((number number) ...) '((5 5)) (list (make-test-mtch (make-bindings (list (make-bind 'number '(5)))) '((5 5)) 'none)))
-  (test-empty '((number number) ...) '((1 1) (2 2) (3 3)) (list (make-test-mtch (make-bindings (list (make-bind 'number '(1 2 3)))) '((1 1) (2 2) (3 3)) 'none)))
-  (test-empty '((number number) ...) '((1 2)) #f)
-  
-  (test-empty '(number ... number ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'number '()))) '() 'none)))
-  (test-empty '(number ... number ...) '(1 1) (list (make-test-mtch (make-bindings (list (make-bind 'number '(1)))) '(1 1) 'none)))
-  (test-empty '(number ... number ...) '(1 2 1 2) (list (make-test-mtch (make-bindings (list (make-bind 'number '(1 2)))) '(1 2 1 2) 'none)))
- (test-empty '(number ... number ...) '(1 2) #f)
-  
-;  (test-empty '((number ... number ...) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'number '()))) '() 'none)))
-;  (test-empty '((number ... number ...) ...) '(()) (list (make-test-mtch (make-bindings (list (make-bind 'number '(())))) '(()) 'none)))
-;  (test-empty '((number ... number ...) ...) '((1 1)) (list (make-test-mtch (make-bindings (list (make-bind 'number '((1))))) '((1 1)) 'none)))
-;  (test-empty '((number ... number ...) ...) '((1 1) (2 2) (1 2 3 1 2 3) (4 5 6 4 5 6)) (list (make-test-mtch (make-bindings 
-;                                                                                                               (list (make-bind 'number '((1) (2) (1 2 3) (4 5 6)))))
-;                                                                                                              '((1 1) (2 2) (1 2 3 1 2 3) (4 5 6 4 5 6))
-;                                                                                                              'none)))
-;  (test-empty '((number ... number ...) ...) '((1 1) (2 2) (1 2 3 1 2 3) (4 5 6 4 5 -6)) #f)
-;  
-;  (test-empty '((name number any) (number ... number ...) ...) '(()) (list (make-test-mtch (make-bindings (list (make-bind 'any '()) (make-bind 'number '()))) '(()) 'none)))
-;  (test-empty '((name number any) (number ... number ...) ...) '(((1)) (1 1)) (list (make-test-mtch (make-bindings (list (make-bind 'any '((1))) (make-bind 'number '((1))))) '(((1)) (1 1)) 'none)))
-;  (test-empty '((name number any) (number ... number ...) ...) '(((1)) (1 2)) #f)
-;  (test-empty '((name number any) (number ... number ...) ...) '(((2)) (1 1)) #f)
-;  
-;  (test-empty '((number ... number ...) ... (name number any)) '(()) (list (make-test-mtch (make-bindings (list (make-bind 'any '()) (make-bind 'number '()))) '(()) 'none)))
-;  (test-empty '((number ... number ...) ... (name number any)) '((1 1) ((1))) (list (make-test-mtch (make-bindings (list (make-bind 'any '((1))) (make-bind 'number '((1))))) '((1 1) ((1))) 'none)))
-;  (test-empty '((number ... number ...) ... (name number any)) '((1 2) ((1))) #f)
-;  (test-empty '((number ... number ...) ... (name number any)) '((1 1) ((2))) #f)
-  
-;  ; causes an error
-;  #;(test-empty '((number ... number ...) ... (number ... number ...) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'number '()))) '() 'none)))
-;  
-  (test-empty '() '() (list (make-test-mtch (make-bindings null) '() 'none)))
-  (test-empty '(a) '(a) (list (make-test-mtch (make-bindings null) '(a) 'none)))
-  (test-empty '(a) '(b) #f)
-  (test-empty '(a b) '(a b) (list (make-test-mtch (make-bindings null) '(a b) 'none)))
-  (test-empty '(a b) '(a c) #f)
-  (test-empty '() 1 #f)
-  (test-empty '(#f x) '(#f x) (list (make-test-mtch (make-bindings null) '(#f x) 'none)))
-  (test-empty '(#f (name y any)) '(#f) #f)
-  (test-empty '(in-hole (z hole) a) '(z a) (list (make-test-mtch (make-bindings (list)) '(z a) 'none)))
-  (test-empty '(in-hole (z hole) (in-hole (x hole) a)) 
-              '(z (x a))
-              (list (make-test-mtch (make-bindings (list)) '(z (x a)) 'none)))
-  
-  #;(run-test/cmp 'in-hole-zero-holes 
-                  (with-handlers ([exn:fail? (λ (e) (regexp-match #rx"zero holes" (exn-message e)))])
-                    (test-empty '(in-hole (1 2) 2) '(1 2) 'never-gets-here)
-                    'should-have-raised-an-exception)
-                  '("zero holes")
-                  equal?)
-  
-  
-  (test-empty '(in-hole (in-hole (x hole) hole) y)
-              '(x y)
-              (list (make-test-mtch (make-bindings (list)) '(x y) 'none)))
-  
-  (test-empty '(number number) '(1 1) (list (make-test-mtch (make-bindings (list (make-bind 'number 1))) '(1 1) 'none)))
-  (test-empty '((name x number) (name x number)) '(1 1) (list (make-test-mtch (make-bindings (list (make-bind 'x 1) (make-bind 'number 1))) '(1 1) 'none)))
-  (test-empty '((name x number_q) (name x number_r)) '(1 1) (list (make-test-mtch (make-bindings (list (make-bind 'x 1) 
-                                                                                                       (make-bind 'number_q 1)
-                                                                                                       (make-bind 'number_r 1)))
-                                                                                  '(1 1)
-                                                                                  'none)))
-  (test-empty '(number number) '(1 2) #f)
-  (test-empty '((name x number) (name x number)) '(1 2) #f)
-  (test-empty '((name x number_q) (name x number_r)) '(1 2) #f)
-  
-  (test-empty '(a ...) '() (list (make-test-mtch (make-bindings empty) '() 'none)))
-  (test-empty '(a ...) '(a) (list (make-test-mtch (make-bindings empty) '(a) 'none)))
-  (test-empty '(a ...) '(a a) (list (make-test-mtch (make-bindings empty) '(a a) 'none)))
-  (test-empty '((name x a) ...) '() (list (make-test-mtch (make-bindings (list (make-bind 'x '()))) '() 'none)))
-  (test-empty '((name x a) ...) '(a) (list (make-test-mtch (make-bindings (list (make-bind 'x '(a)))) '(a) 'none)))
-  (test-empty '((name x a) ...) '(a a) (list (make-test-mtch (make-bindings (list (make-bind 'x '(a a)))) '(a a) 'none)))
-  (test-empty '(hole ...) '() (list (make-test-mtch (make-bindings empty) '() 'none)))    
-  (test-empty '(b ... a ...) '() (list (make-test-mtch (make-bindings empty) '() 'none)))
-  (test-empty '(b ... a ...) '(a) (list (make-test-mtch (make-bindings empty) '(a) 'none)))
-  (test-empty '(b ... a ...) '(b) (list (make-test-mtch (make-bindings empty) '(b) 'none)))
-  (test-empty '(b ... a ...) '(b a) (list (make-test-mtch (make-bindings empty) '(b a) 'none)))
-  (test-empty '(b ... a ...) '(b b a a) (list (make-test-mtch (make-bindings empty) '(b b a a) 'none)))
-  (test-empty '(b ... a ...) '(a a) (list (make-test-mtch (make-bindings empty) '(a a) 'none)))
-  (test-empty '(b ... a ...) '(b b) (list (make-test-mtch (make-bindings empty) '(b b) 'none)))
-  
-  ;    (test-empty '(a ..._1 a ..._2) 
-  ;                '(a) 
-  ;                (list (make-test-mtch (make-bindings (list (make-bind '..._1 1) (make-bind '..._2 0))) '(a) 'none)
-  ;                      (make-test-mtch (make-bindings (list (make-bind '..._1 0) (make-bind '..._2 1))) '(a) 'none)))
-  ;    (test-empty '(a ..._1 a ..._1) '(a) #f)
-  ;    (test-empty '(a ..._1 a ..._1)
-  ;                '(a a) 
-  ;                (list (make-test-mtch (make-bindings (list (make-bind '..._1 1))) '(a a) 'none)))
-  ;
-  ;    (test-empty '((name x a) ..._!_1 (name y a) ..._!_1) 
-  ;                '(a a) 
-  ;                (list (make-test-mtch (make-bindings (list (make-bind 'x '()) (make-bind 'y '(a a)))) '(a a) 'none)
-  ;                      (make-test-mtch (make-bindings (list (make-bind 'x '(a a)) (make-bind 'y '()))) '(a a) 'none)))
-  ;    
-  ;    (test-empty '((name y b) ... (name x a) ...) '() 
-  ;                (list (make-test-mtch (make-bindings (list (make-bind 'x '())
-  ;                                                      (make-bind 'y '())))
-  ;                                 '()
-  ;                                 'none)))
-  ;    (test-empty '((name y b) ... (name x a) ...) '(a)
-  ;                (list (make-test-mtch (make-bindings (list (make-bind 'x '(a))
-  ;                                                      (make-bind 'y '())))
-  ;                                 '(a)
-  ;                                 'none)))
-  ;    (test-empty '((name y b) ... (name x a) ...) '(b) 
-  ;                (list (make-test-mtch (make-bindings (list (make-bind 'x '())
-  ;                                                      (make-bind 'y '(b))))
-  ;                                 '(b)
-  ;                                 'none)))
-  ;    (test-empty '((name y b) ... (name x a) ...) '(b b a a) 
-  ;                (list (make-test-mtch (make-bindings (list (make-bind 'x '(a a))
-  ;                                                      (make-bind 'y '(b b))))
-  ;                                 '(b b a a)
-  ;                                 'none)))
-  ;    (test-empty '((name y a) ... (name x a) ...) '(a) 
-  ;                (list (make-test-mtch (make-bindings (list (make-bind 'x '())
-  ;                                                      (make-bind 'y '(a))))
-  ;                                 '(a)
-  ;                                 'none)
-  ;                      (make-test-mtch (make-bindings (list (make-bind 'x '(a))
-  ;                                                      (make-bind 'y '())))
-  ;                                 '(a)
-  ;                                 'none)))
-  ;    (test-empty '((name y a) ... (name x a) ...) '(a a) 
-  ;                (list (make-test-mtch (make-bindings (list (make-bind 'x '())
-  ;                                                      (make-bind 'y '(a a))))
-  ;                                 '(a a)
-  ;                                 'none)
-  ;                      (make-test-mtch (make-bindings (list (make-bind 'x '(a))
-  ;                                                      (make-bind 'y '(a))))
-  ;                                 '(a a)
-  ;                                 'none)
-  ;                      (make-test-mtch (make-bindings (list (make-bind 'x '(a a))
-  ;                                                      (make-bind 'y '())))
-  ;                                 '(a a)
-  ;                                 'none)))
-  #;(test-ab '(bb_y ... aa_x ...) '() 
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '())
-                                                        (make-bind 'bb_y '())))
-                                   '()
-                                   'none)))
-  #;(test-ab '(bb_y ... aa_x ...) '(a)
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '(a))
-                                                        (make-bind 'bb_y '())))
-                                   '(a) 
-                                   'none)))
-  #;(test-ab '(bb_y ... aa_x ...) '(b) 
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '())
-                                                        (make-bind 'bb_y '(b))))
-                                   '(b)
-                                   'none)))
-  #;(test-ab '(bb_y ... aa_x ...) '(b b a a) 
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '(a a))
-                                                        (make-bind 'bb_y '(b b))))
-                                   '(b b a a)
-                                   'none)))
-  #;(test-ab '(aa_y ... aa_x ...) '(a) 
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '())
-                                                        (make-bind 'aa_y '(a))))
-                                   '(a)
-                                   'none)
-                   (make-test-mtch (make-bindings (list (make-bind 'aa_x '(a))
-                                                        (make-bind 'aa_y '())))
-                                   '(a)
-                                   'none)))
-  #;(test-ab '(aa_y ... aa_x ...) '(a a) 
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '())
-                                                        (make-bind 'aa_y '(a a))))
-                                   '(a a)
-                                   'none)
-                   (make-test-mtch (make-bindings (list (make-bind 'aa_x '(a))
-                                                        (make-bind 'aa_y '(a))))
-                                   '(a a)
-                                   'none)
-                   (make-test-mtch (make-bindings (list (make-bind 'aa_x '(a a))
-                                                        (make-bind 'aa_y '())))
-                                   '(a a)
-                                   'none)))
-  
-  (test-empty '((name x number) ...) '(1 2) (list (make-test-mtch (make-bindings (list (make-bind 'x '(1 2)) (make-bind 'number '(1 2)))) '(1 2) 'none)))
-  
-  (test-empty '(a ...) '(b) #f)
-  (test-empty '(a ... b ...) '(c) #f)
-  (test-empty '(a ... b) '(b c) #f)
-  (test-empty '(a ... b) '(a b c) #f)
-  
-  
-  (test-nany '(n n ...) '((1 1) 1 1) (list (make-test-mtch (make-bindings (list (make-bind 'n '(1 1)))) '((1 1) 1 1) 'none)))
-  (test-nany '(n (n ...)) '((1 1) (1 1)) (list (make-test-mtch (make-bindings (list (make-bind 'n '(1 1)))) '((1 1) (1 1)) 'none)))
-  (test-empty '((name x any) 
-                ((name x number) ...))
-              '((1 1) (1 1))
-              (list (make-test-mtch (make-bindings (list (make-bind 'x '(1 1))
-                                                         (make-bind 'any '(1 1))
-                                                         (make-bind 'number '(1 1))))
-                                    '((1 1) (1 1)) 
-                                    'none)))
-  
-  (test-empty '((variable_1 variable_1) ...)
-              '((x y))
-              #f)
-  
-  
-  (test-empty '(number ...) '()
-              (list (make-test-mtch (make-bindings (list (make-bind 'number '()))) '() 'none)))
-  (test-ab '(aa ...) '()
-           (list (make-test-mtch (make-bindings (list (make-bind 'aa '()))) '() 'none)))
-  
-  
-  ;; testing block-in-hole
-  (test-empty '(hide-hole a) 'b #f)
-  (test-empty '(hide-hole a) 'a (list (make-test-mtch (make-bindings '()) 'a 'none)))
-  (test-empty '(hide-hole a) '(block-in-hole a) #f)
-  (test-empty '(in-hole (x (hide-hole hole)) 1) '(x 1) #f)
-  (test-empty '(in-hole (x hole) 1) '(x 1) (list (make-test-mtch (make-bindings '()) '(x 1) 'none)))
-  (test-empty '(in-hole ((hole #f) (hide-hole hole)) junk)
-              '(junk junk2)
-              #f)
-  
-  (test-xab 'lsts '() (list (make-test-mtch (make-bindings (list (make-bind 'lsts '()))) '() 'none)))
-  (test-xab 'lsts '(x) (list (make-test-mtch (make-bindings (list (make-bind 'lsts '(x)))) '(x) 'none)))
-  (test-xab 'lsts 'x (list (make-test-mtch (make-bindings (list (make-bind 'lsts 'x))) 'x 'none)))
-  (test-xab 'lsts #f (list (make-test-mtch (make-bindings (list (make-bind 'lsts #f))) #f 'none)))
-  (test-xab 'split-out '1 (list (make-test-mtch (make-bindings (list (make-bind 'split-out 1))) '1 'none)))
-  
-  (test-xab 'exp 1 (list (make-test-mtch (make-bindings (list (make-bind 'exp 1))) 1 'none)))
-  (test-xab 'exp '(+ 1 2) (list (make-test-mtch (make-bindings (list (make-bind 'exp '(+ 1 2)))) '(+ 1 2) 'none)))
-  (test-xab '(in-hole ctxt any)
-            '1
-            (list (make-test-mtch (make-bindings (list (make-bind 'ctxt the-hole) (make-bind 'any 1))) 1 'none)))
-  (test-xab '(in-hole ctxt (name x any))
-            '1
-            (list (make-test-mtch (make-bindings (list (make-bind 'ctxt the-hole) (make-bind 'x 1) (make-bind 'any 1))) 1 'none)))
-  
-  (test-xab '(in-hole (name c ctxt) (name x any))
-            '(+ 1 2)
-            (list (make-test-mtch (make-bindings (list (make-bind 'ctxt (build-context the-hole))
-                                                       (make-bind 'c (build-context the-hole))
-                                                       (make-bind 'x '(+ 1 2))
-                                                       (make-bind 'any '(+ 1 2))))
-                                  '(+ 1 2) 'none)
-                  (make-test-mtch (make-bindings (list (make-bind 'ctxt (build-context `(+ ,the-hole 2)))
-                                                       (make-bind 'c (build-context `(+ ,the-hole 2)))
-                                                       (make-bind 'x 1)
-                                                       (make-bind 'any 1)))
-                                  '(+ 1 2) 'none)
-                  (make-test-mtch (make-bindings (list (make-bind 'ctxt (build-context `(+ 1 ,the-hole)))
-                                                       (make-bind 'c (build-context `(+ 1 ,the-hole)))
-                                                       (make-bind 'x 2)
-                                                       (make-bind 'any 2))) 
-                                  '(+ 1 2) 'none)))
-  (test-xab '(in-hole (name c ctxt) (name i (+ number_1 number_2)))
-            '(+ (+ 1 2) (+ 3 4))
-            (list (make-test-mtch 
-                   (make-bindings (list (make-bind 'i '(+ 1 2))
-                                        (make-bind 'number_1 1)
-                                        (make-bind 'number_2 2)
-                                        (make-bind 'ctxt (build-context `(+ ,the-hole (+ 3 4))))
-                                        (make-bind 'c (build-context `(+ ,the-hole (+ 3 4))))))
-                   '(+ (+ 1 2) (+ 3 4))
-                   'none)
-                  (make-test-mtch (make-bindings (list (make-bind 'i '(+ 3 4)) 
-                                                       (make-bind 'number_1 3)
-                                                       (make-bind 'number_2 4)
-                                                       (make-bind 'ctxt `(+ (+ 1 2) ,the-hole))
-                                                       (make-bind 'c `(+ (+ 1 2) ,the-hole))))
-                                  '(+ (+ 1 2) (+ 3 4))
-                                  'none)))
-  
-  (test-empty '(in-hole ((z hole)) (name x any))
-              '((z a))
-              (list (make-test-mtch (make-bindings (list (make-bind 'x 'a) (make-bind 'any 'a))) '((z a)) 'none)))
-  ; in-hole-name bug
-  (test-empty '(in-hole (name c (z ... hole z ...)) any)
-              '(z z)
-              (list 
-               (make-test-mtch (make-bindings (list (make-bind 'c `(z ,the-hole)) (make-bind 'any 'z))) '(z z) 'none)
-               (make-test-mtch (make-bindings (list (make-bind 'c `(,the-hole z)) (make-bind 'any 'z))) '(z z) 'none)))
-  (test-empty '(in-hole (name c (z ... hole z ...)) any)
-              '(z z z)
-              (list 
-               (make-test-mtch (make-bindings (list (make-bind 'c `(z z ,the-hole)) (make-bind 'any 'z))) '(z z z) 'none)
-               (make-test-mtch (make-bindings (list (make-bind 'c `(z ,the-hole z)) (make-bind 'any 'z))) '(z z z) 'none)
-               (make-test-mtch (make-bindings (list (make-bind 'c `(,the-hole z z)) (make-bind 'any 'z))) '(z z z) 'none)))
-  
-  (test-empty '(z (in-hole (name c (z hole)) a))
-              '(z (z a))
-              (list 
-               (make-test-mtch (make-bindings (list (make-bind 'c `(z ,the-hole))))
-                               '(z (z a))
-                               'none)))
-  
-  (test-empty '(a (in-hole (name c1 (b (in-hole (name c2 (c hole)) d) hole)) e))
-              '(a (b (c d) e))
-              (list 
-               (make-test-mtch (make-bindings (list (make-bind 'c2 `(c ,the-hole))
-                                                    (make-bind 'c1 `(b (c d) ,the-hole))))
-                               '(a (b (c d) e))
-                               'none)))
-  
-  (test-empty '(in-hole (in-hole hole hole) a)
-              'a
-              (list (make-test-mtch (make-bindings (list)) 'a 'none)))
-  
-  (test-empty '(a (b (in-hole (name c1 (in-hole (name c2 (c hole)) (d hole))) e)))
-              '(a (b (c (d e))))
-              (list 
-               (make-test-mtch (make-bindings (list (make-bind 'c1 `(c (d ,the-hole)))
-                                                    (make-bind 'c2 `(c ,the-hole))))
-                               '(a (b (c (d e))))
-                               'none)))
-  
-  (test-empty '(in-hole (name c1 (in-hole (name c2 (c hole)) (d hole))) e)
-              '(c (d e))
-              (list 
-               (make-test-mtch (make-bindings (list (make-bind 'c1 `(c (d ,the-hole)))
-                                                    (make-bind 'c2 `(c ,the-hole))))
-                               '(c (d e))
-                               'none)))
-  
-  (test-empty '(in-hole (in-hole (c hole) (d hole)) e)
-              '(c (d e))
-              (list (make-test-mtch (make-bindings null) '(c (d e)) 'none)))
-  
-  (test-empty `(+ 1 (side-condition any (lambda (bindings) #t) #t))
-              '(+ 1 b)
-              (list (make-test-mtch (make-bindings (list (make-bind 'any 'b))) '(+ 1 b) 'none)))
-  (test-empty `(+ 1 (side-condition any (lambda (bindings) #f) #f))
-              '(+ 1 b)
-              #f)
-  
-  (test-empty `(+ 1 (side-condition b (lambda (bindings) #t) #t))
-              '(+ 1 b)
-              (list (make-test-mtch (make-bindings '()) '(+ 1 b) 'none)))
-  (test-empty `(+ 1 (side-condition a (lambda (bindings) #t)) #t)
-              '(+ 1 b)
-              #f)
-  
-  (test-empty `(side-condition (name x any) (lambda (bindings) (eq? (term x) #;(lookup-binding bindings 'x) 'a)) (eq? (term x) 'a))
-              'a
-              (list 
-               (make-test-mtch (make-bindings (list (make-bind 'x 'a)
-                                                    (make-bind 'any 'a)))
-                               'a
-                               'none)))
-  
-  (test-empty `(+ 1 (side-condition (name x any) (lambda (bindings) (eq? (term x) #;(lookup-binding bindings 'x) 'a)) (eq? (term x) 'a)))
-              '(+ 1 a)
-              (list 
-               (make-test-mtch (make-bindings (list (make-bind 'x 'a)
-                                                    (make-bind 'any 'a)))
-                               '(+ 1 a)
-                               'none)))
-  
-  (test-empty `(side-condition (name x any) (lambda (bindings) (eq? (term x) #;(lookup-binding bindings 'x) 'a)) (eq? (term x) 'a))
-              'b
-              #f)
-  
-  (test-empty `(+ 1 (side-condition (name x any) (lambda (bindings) (eq? (term x) #;(lookup-binding bindings 'x) 'a)) (eq? (term x) 'a)))
-              '(+ 1 b)
-              #f) 
-  
-  (test-empty `(any_2 any_3 ...) '(1 2 3) (list 
-               (make-test-mtch (make-bindings (list (make-bind 'any_2 1)
-                                                    (make-bind 'any_3 '(2 3))))
-                               '(1 2 3)
-                               'none)))
-  
-  #;(test-empty `(side-condition ((any_1 ..._a) (any_2 ..._a))
-                                 (lambda (bindings) (error 'should-not-be-called))
-                                 (error 'should-not-be-called))
-                '((1 2 3) (4 5))
-                #f)
-  
-  (test-xab 'exp_1
-            '(+ 1 2)
-            (list (make-test-mtch (make-bindings (list (make-bind 'exp_1 '(+ 1 2)))) '(+ 1 2) 'none)))
-  (test-xab '(exp_1 exp_2)
-            '((+ 1 2) (+ 3 4))
-            (list (make-test-mtch (make-bindings (list (make-bind 'exp_1 '(+ 1 2)) (make-bind 'exp_2 '(+ 3 4))))
-                                  '((+ 1 2) (+ 3 4))
-                                  'none)))
-  (test-xab '(exp_1 exp_1)
-            '((+ 1 2) (+ 3 4))
-            #f)
-  (test-xab 'nesting-names
-            'b
-            (list (make-test-mtch (make-bindings (list (make-bind 'nesting-names 'b))) 'b 'none)))
-  (test-xab 'nesting-names
-            '(a b)
-            (list (make-test-mtch (make-bindings (list (make-bind 'nesting-names '(a b)))) '(a b) 'none)))
-  (test-xab 'nesting-names
-            '(a (a b))
-            (list (make-test-mtch (make-bindings (list (make-bind 'nesting-names '(a (a b))))) '(a (a b)) 'none)))
-  (test-xab '((name x a) nesting-names)
-            '(a (a (a b)))
-            (list (make-test-mtch (make-bindings (list (make-bind 'x 'a)
-                                                       (make-bind 'nesting-names '(a (a b)))))
-                                  '(a (a (a b))) 'none)))
-  (test-xab 'nesting-names
-            '(a (a (a (a b))))
-            (list (make-test-mtch (make-bindings (list (make-bind 'nesting-names '(a (a (a (a b)))))))
-                                  '(a (a (a (a b)))) 'none)))
-  
-  (test-xab 'same-in-nt
-            '(x x)
-            (list (make-test-mtch (make-bindings (list (make-bind 'same-in-nt '(x x)))) '(x x) 'none)))
-  (test-xab 'same-in-nt
-            '(x y)
-            #f)
-  
-  ; We don't have cross yet  
-  
-  ;    (test-xab '(in-hole (cross forever-list) 1)
-  ;              '(a b c)
-  ;              #f)
-  ;    
-  ;    (test-xab '(in-hole (cross forever-list) 1)
-  ;              '(1 x x)
-  ;              (list (make-test-mtch (make-bindings '()) '(1 x x) 'none)))
-  ;    
-  ;    (test-xab '(in-hole (cross forever-list) 1)
-  ;              '(x 1 x)
-  ;              (list (make-test-mtch (make-bindings '()) '(x 1 x) 'none)))
-  ;    
-  ;    
-  ;    (test-xab '(in-hole (cross simple) g)
-  ;              'g
-  ;              (list (make-mtch (make-bindings (list)) 'g 'none)))
-  
-  (test-xab 'var '+ #f)
-  (test-xab 'var 'anunusedvariable (list (make-mtch (make-bindings (list (make-bind 'var 'anunusedvariable))) 'anunusedvariable 'none)))
-  (test-xab 'var 'exp (list (make-mtch (make-bindings (list (make-bind 'var 'exp))) 'exp 'none)))
-  (test-xab 'var 'exp_x (list (make-mtch (make-bindings (list (make-bind 'var 'exp_x))) 'exp_x 'none)))
-  
-  (test-xab 'underscore '(+ 1 2) (list (make-mtch (make-bindings (list (make-bind 'underscore '(+ 1 2)))) '(+ 1 2) 'none)))
-  (test-xab 'underscore '2 (list (make-mtch (make-bindings (list (make-bind 'underscore 2))) 2 'none)))
-  
-;  ; simple boolean language
-;  (define bool
-;    '(define-language bool
-;       (B true
-;          false
-;          (and B B)
-;          (or B B))
-;       (C (and C B)
-;          (or C B)
-;          hole))
-;    
-;    (define bool-rr
-;      '(reduction-relation bool
-;                           (--> (in-hole C (and false B))
-;                                (in-hole C false)
-;                                )
-;                           (--> (in-hole C (and true B))
-;                                (in-hole C B)
-;                                )
-;                           (--> (in-hole C (or false B))
-;                                (in-hole C B))
-;                           (--> (in-hole C (or true B))
-;                                (in-hole C true))
-;                           ))
-;    
-;    ; metafunction-less λv language:
-;    
-;    ; define-language
-;    (define λv '(define-language λv
-;                  (e (e e ...) (if0 e e e) x v)
-;                  (v (λ (x ...) e) number * +)
-;                  (E (v ... E e ...) (if0 E e e) hole)
-;                  (x (variable-except if0 λ * +))))
-;    
-;    ; converted metafunctions
-;    (define subst-vars-rr
-;      '(reduction-relation 
-;        λv
-;        (--> ((x_1 any_1) x_1) 
-;             any_1)
-;        (--> ((x_1 any_1) (any_2 ...))
-;             ,(map subst-vars (term (((x_1 any_1) any_2) ...))) )
-;        (--> (side-condition
-;              ((x_1 any_1) any_2)
-;              (and (not (list? any_2)) 
-;                   (not (eq? (term x_1) (term any_2)))))
-;             any_2)
-;        (--> ((x_1 any_1) (x_2 any_2) (x_3 any_3) ... any_4)
-;             ,(subst-vars (term ((x_1 any_1) ,(subst-vars (term ((x_2 any_2) (x_3 any_3) ... any_4)))))))
-;        (--> (any)
-;             any)))
-;    
-;    (define subst-rr 
-;      '(reduction-relation
-;        λv
-;        (--> (x_1 any_1 (λ (x_2 ... x_1 x_3 ...) any_2))
-;             (λ (x_2 ... x_1 x_3 ...) any_2))
-;        (--> (side-condition
-;              (x_1 any_1 (λ (x_2 ...) any_2))
-;              (not (memq (term x_1) (term (x_2 ...)))))
-;             ,(term-let ([(x_new ...) (variables-not-in (term (x_1 any_1 any_2)) (term (x_2 ...)))])
-;                        (term
-;                         (λ (x_new ...) ,(subst (term (x_1 any_1 ,(subst-vars (term ((x_2 x_new) ... any_2))))) )))) )
-;        (--> (x_1 any_1 x_1) 
-;             any_1)
-;        (--> (side-condition
-;              (x_1 any_1 x_2)
-;              (not (eq? (term x_1) (term x_2))))
-;             x_2)
-;        (--> (x any (e_1 e_2 ...))
-;             (,(subst (term (x any e_1))) ,@(map subst (term ((x any e_2) ...)))) )
-;        (--> (x any (if0 e_1 e_2 e_3))
-;             (if0 ,(subst (term (x any e_1))) ,(subst (term (x any e_2))) ,(subst (term (x any e_3)))))
-;        (--> (x any number)
-;             number)
-;        (--> (x any +)
-;             +)
-;        (--> (x any *)
-;             *)))
-;    
-;    (define subst-n-rr '(reduction-relation 
-;                         λv
-;                         (--> ((x_1 any_1) (x_2 any_2) ... any_3)
-;                              ,(subst (term (x_1 any_1 ,(subst-n (term ((x_2 any_2) ... any_3)))))))
-;                         (--> (any_3)
-;                              any_3)))
-;    
-;    ; reduction-relation
-;    (define λv-rr '(reduction-relation 
-;                    λv
-;                    (--> (in-hole E (* number_1 number_2)) 
-;                         (in-hole E ,(* (term number_1) (term number_2))))
-;                    (--> (in-hole E (+ number_1 number_2)) 
-;                         (in-hole E ,(+ (term number_1) (term number_2))))
-;                    (--> (in-hole E (if0 0 e_1 e_2))
-;                         (in-hole E e_1))
-;                    (--> (in-hole E (if0 (side-condition number_1 (not (zero? (term number_1)))) e_1 e_2))
-;                         (in-hole E e_2))
-;                    (--> (in-hole E (side-condition ((λ (x ...) e) v ...)
-;                                                    (= (length (term (x ...)))
-;                                                       (length (term (v ...))))))
-;                         (in-hole E ,(subst-n (term ((x v) ... e)))))))
-  )
-  (test)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/core-layout-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/core-layout-test.rkt
deleted file mode 100644
index a5befdbb1c..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/core-layout-test.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang racket/base
-
-(require redex/private/core-layout
-         redex/private/loc-wrapper
-         "lw-test-util.rkt"
-         "test-util.rkt")
-
-(module test racket/base)
-
-(require texpict/mrpict mred/mred mzlib/class)
-(dc-for-text-size (make-object bitmap-dc% (make-object bitmap% 1 1)))
-
-(reset-count)
-
-(let ([content
-       (list (make-lw 'x 15 1 35 0 #f #f)
-             (make-lw (list
-                       (make-lw "(" 15 0 35 1 #f #f)
-                       (make-lw 'a 15 0 36 1 #f #f)
-                       (make-lw 'b 16 0 36 1 #f #f)
-                       (make-lw ")" 16 0 37 1 #f #f))
-                      15 1 35 3 #f #f))])
-  (test (find-enclosing-loc-wrapper content)
-        (build-lw content
-                  15 1 35 3)))
-
-(define (replace-pict-tokens x)
-  (let loop ([x x])
-    (cond
-      [(line? x) (make-line (line-n x) (loop (line-tokens x)))]
-      [(pair? x) (cons (loop (car x))
-                       (loop (cdr x)))]
-      [(pict-token? x)
-       (struct-copy pict-token x [pict 'pict])]
-      [else x])))
-
-(test (replace-pict-tokens
-       (build-lines
-        '()
-        (normalize-lw
-         (to-lw
-          ,(term
-            (a b c))))))
-      (list (make-line 0
-                       (list (make-spacer-token 0 2)
-                             (make-string-token 2 1 "(" 'roman)
-                             (make-string-token 3 1 "a" 'swiss)
-                             (make-string-token 4 1 " " 'roman)
-                             (make-string-token 5 1 "b" 'swiss)
-                             (make-string-token 6 1 " " 'roman)
-                             (make-string-token 7 1 "c" 'swiss)
-                             (make-string-token 8 1 ")" 'roman)))
-            (make-line 0
-                       (list (make-string-token 0 0 "" 'roman) 
-                             (make-pict-token 0 1 'pict)
-                             (make-pict-token 1 0 'pict)))))
-
-(test (replace-pict-tokens
-       (build-lines
-        '(|+1|)
-        (normalize-lw
-         (to-lw
-          ,(term
-            (|+1| x))))))
-      (list (make-line 0
-                       (list (make-spacer-token 0 2)
-                             (make-string-token 2 1 "(" 'roman)
-                             (make-string-token 3 4 "+1" '(italic . roman))
-                             (make-string-token 7 1 " " 'roman)
-                             (make-string-token 8 1 "x" 'swiss)
-                             (make-string-token 9 1 ")" 'roman)))
-            (make-line 0
-                       (list (make-string-token 0 0 "" 'roman) 
-                             (make-pict-token 0 1 'pict)
-                             (make-pict-token 1 0 'pict)))))
-
-(test (replace-pict-tokens
-       (build-lines
-        '()
-        (normalize-lw
-         (to-lw
-          ,(term
-            (a b
-               c))))))
-      (list (make-line 1
-                       (list (make-spacer-token 0 5)
-                             (make-string-token 5 1 "c" 'swiss)
-                             (make-string-token 6 1 ")" 'roman)))
-            (make-line 0
-                       (list (make-spacer-token 0 2)
-                             (make-string-token 2 1 "(" 'roman)
-                             (make-string-token 3 1 "a" 'swiss)
-                             (make-string-token 4 1 " " 'roman)
-                             (make-string-token 5 1 "b" 'swiss)))
-            (make-line 0
-                       (list (make-string-token 0 0 "" 'roman) 
-                             (make-pict-token 0 1 'pict)
-                             (make-pict-token 1 0 'pict)))))
-
-(print-tests-passed "core-layout.rkt")
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/dq-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/dq-test.rkt
deleted file mode 100644
index 1cd759d76d..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/dq-test.rkt
+++ /dev/null
@@ -1,599 +0,0 @@
-#lang racket
-
-(require redex/private/pat-unify
-         rackunit
-         (for-syntax redex/private/rewrite-side-conditions 
-                     racket/list))
-
-
-(define-syntax check-dq
-  (syntax-rules ()
-    [(check-dq args ... #f)
-     (let/ec fail
-       (let ([check/fail (λ (c) (if (or (not c)
-                                        (unif-fail? c))
-                                    (fail (void))
-                                    c))])
-         (check-dq-hlp check/fail args ... #f)))]
-    [(check-dq args ...)
-     (let/ec fail
-       (let ([check/fail (λ (c) (if (or (not c)
-                                        (unif-fail? c))
-                                    (fail (error 'check-dq "unexpected failure: ~s" '(args ...)))
-                                    c))])
-         (check-dq-hlp check/fail args ...)))]))
-
-(define-syntax (check-dq-hlp stx)
-  (syntax-case stx (=== =/= --> return env:)
-    [(_ check/fail eigens --> return env: e)
-       #'e]
-    [(_ check/fail eigens --> #f env: e)
-       #'(check-false e)]
-    [(_ check/fail eigens --> #t env: e)
-     #'(check-not-false e)]
-    [(_ check/fail eigens --> l2 =/= r2 || l3 =/= r3 env: e)
-     (with-syntax ([(l2-p r2-p l3-p r3-p) (to-pats (list #'l2 #'r2 #'l3 #'r3))])
-       #'(let ([res-dq (dq-dq (first (env-dqs (check/fail e))))])
-           (check-not-false
-            (or (equal? (nts->any res-dq)
-                       (list l2-p r2-p))
-                (equal? (nts->any res-dq)
-                       (list l3-p r3-p))))))]
-    [(_ check/fail eigens --> l2 =/= r2 env: e)
-     (with-syntax ([(l2-p r2-p) (to-pats (list #'l2 #'r2))])
-       #'(let ([res-dq (dq-dq (first (env-dqs (check/fail e))))])
-           (check-equal? (nts->any res-dq)
-                         (list l2-p r2-p))))]
-    [(_ check/fail eigens l === r rest ... env: e)
-     (with-syntax ([(l-p r-p) (to-pats (list #'l #'r))])
-       #'(check-dq-hlp check/fail eigens rest ... env: (p*e-e (check/fail (unify l-p r-p (check/fail e) #f)))))]
-    [(_ check/fail eigens l =/= r rest ... env: e)
-     (with-syntax ([(l-p r-p) (to-pats (list #'l #'r))])
-       #'(check-dq-hlp check/fail eigens rest ... env: (disunify 'eigens l-p r-p (check/fail e) #f)))]
-    [(_ no-env ...)
-     (not (memq 'env: (flatten (syntax->datum #'(no-env ...)))))
-     #'(check-dq-hlp no-env ... env: empty-env)]))
-
-(define (nts->any s-exp)
-  (match s-exp
-    [`(nt ,_) 'any]
-    [(bound) 'any]
-    [(list es ...)
-     (map nts->any es)]
-    [_ s-exp]))
-
-(define-for-syntax (to-pats ps-in)
-  (define syms (filter symbol? (flatten (map syntax->datum ps-in))))
-  (define (make-pat s) 
-    (with-syntax ([(_ p _ _) 
-                   (rewrite-side-conditions/check-errs syms 'check-dq #t s)])
-      #'(nts->any 'p)))
-  (map make-pat ps-in))
-
-
-(check-dq
-   (a b)
-   (a b) =/= x
-   x === (1 2)
-   -->
-   #f)
-
-(check-dq
-   (a b)
-   x === (1 2)
-   (a b) =/= x
-   -->
-   #f)
-
-(check-dq
-   (a b)
-   (a a) =/= x
-   x === (1 2)
-   -->
-   #t)
-
-(check-dq
-   (a b)
-   x === (1 2)
-   (a a) =/= x
-   -->
-   #t)
-
-(check-dq
-   (c d)
-   x === (1 2)
-   x === (a b)
-   x =/= (c d)
-   -->
-   #f)
-
-(check-dq
-   (c d)
-   x === (1 2)
-   x =/= (c d)
-   x === (a b)
-   -->
-   #f)
-(check-dq
-   (c d)
-   x =/= (c d)
-   x === (1 2)
-   x === (a b)
-   -->
-   #f)
-
-(check-dq
-   (c d)
-   x === (1 2)
-   x === (a b)
-   x =/= (c c)
-   -->
-   #t)
-
-(check-dq
-   (c d)
-   x === (1 2)
-   x =/= (c c)
-   x === (a b)
-   -->
-   #t)
-(check-dq
-   (c d)
-   x =/= (c c)
-   x === (1 2)
-   x === (a b)
-   -->
-   #t)
-
-;; The following is translated from the kanren
-;; test suite. Only those tests that actually
-;; apply in this context were transcribed.
-;; Essentially, those of the form:
-;; exists x ... eqs ... forall y ... single-dq
-;; i.e. some conjuction of equations under 
-;; existential quantifiers and a single dq 
-;; under an additional universal quantifier.
-
-;; Eigen test suite
-;; Jason Hemann, Will Byrd, Dan Friedman
-;; Pre-alpha
-
-
-#|
-(test-check "eigen test 10"
-  (run 1 (q) (eigen (x) (=/= x q)))
-  '())
-|#
-
-(check-false
- (disunify '(x) '(name x any) '(name q any) empty-env #f))
-
-#|
-(test-check "eigen test 12"
-  (run 1 (q) (eigen (e1 e2) (=/= 5 e2)))
-  '())
-|#
-
-(check-false
- (disunify '(e1 e2) 5 '(name e2 any) empty-env #f))
-
-#|
-(test-check "eigen test 13"
-  (run 1 (q) (eigen (e1 e2) (=/= e1 e2)))
-  '())
-|#
-
-(check-false
- (disunify '(e1 e2) '(name e1 any) '(name e2 any) empty-env #f))
-
-#|
-(test-check "eigen test 14.5"
-  (run 1 (q)
-    (eigen (a b)
-      (=/= `(,a . ,b) q)))
-  '((_.0 (=/= ((_.0 (e.0 . e.1)))))))
-|#
-
-(check-dq
-   (a b)
-   (a b) =/= q 
-   -->
-   (q) =/= ((a b)))
-
-
-#|
-(test-check "pair w/eigen younger than var"
-  (run 1 (q) (eigen (a) (=/= `(1 . ,q) a)))
-  '())
-|#
-
-(check-dq
- (a)
- (1 q) =/= a
- -->
- #f)
-
-#|
-
-
-(test-check "eigen test 16"
-  (run 1 (q) 
-    (fresh (x) 
-      (eigen (a)
-        (=/= `(6 ,x) `(5 ,a)))))
-  '(_.0))
-|#
-
-(check-dq
- (a)
- (6 x) =/= (5 a)
- -->
- #t)
-
-#|
-
-(test-check "D & J 1"
-  (run 1 (q) (eigen (a) (=/= `(1 2 3 ,q 4) a)))
-  '())
-|#
-
-(check-dq
- (a)
- (1 2 3 q 4) =/= a
- -->
- #f)
-
-
-#|
-
-(test-check "Will's 4"
-  (run 1 (q) (fresh (x) (eigen (a) (=/= `(1 2 3 ,a 4) x))))
-  '(_.0))
-|#
-
-(check-dq
- (a)
- (1 2 3 a 4) =/= x
- -->
- #t)
-
-#|
-
-(test-check "Will's 5"
-  (run 1 (q) (fresh (x) (eigen (a) (=/= `(1 2 3 ,x 4) a))))
-  '())
-|#
-
-(check-dq
- (a)
- (1 2 3 x 4) =/= a
- -->
- #f)
-
-#|
-
-(test-check "eigen test"
-  ;; Exists X, Forall A . A =/= `(,X)
-  ;; Fails. Let A be `(,X)
-  (run 1 (x) (eigen (a) (=/= a `(,x))))
-  '())
-|#
-
-(check-dq
- (a)
- a =/= (x)
- -->
- #f)
-
-#|
-
-(test-check "eigen disequalities, working"
-  ;; Exists X, Forall A. `(1 2 3 ,a 4) =/= X
-  ;; Let X be any symbol
-  (run 1 (q) (fresh (x) (eigen (a) (=/= `(1 2 3 ,a 4) x))))
-  '(_.0))
-|#
-
-(check-dq
- (a)
- (1 2 3 a 4) =/= x
- --> 
- #t)
-
-#|
-
-(test-check "Eigen on pair"
-  (run 1 (q) (eigen (e) (=/= e `(,e))))
-  '(_.0))
-|#
-
-(check-dq
- (e)
- e =/= (e)
- -->
- #t)
-
-#|
-
-(test-check "eigen-pairs 12"
-  (run 1 (q)
-    (fresh (y) 
-      (eigen (e1 e2)
-        (=/= `(,e1 . ,e2) y))))
-  '(_.0))
-|#
-
-(check-dq
- (e1 e2)
- (e1 e2) =/= y
- -->
- #t)
-
-#|
-(test-check "eigen-pairs 13"
-  (run 1 (q)
-    (fresh (y)
-      (== y 7)
-      (eigen (e1 e2)
-        (=/= `(,e1 . ,e2) y))))
-  '(_.0))
-|#
-
-(check-dq
- (e1 e2)
- y === 7
- (e1 e2) =/= y
- -->
- #t)
-
-#|
-
-(test-check "eigen-pairs 14"
-  (run 1 (q)
-    (fresh (y)
-      (eigen (e1 e2)
-        (=/= `(,e1 . ,e2) y)
-        (== y 7))))
-  '(_.0))
-|#
-
-(check-dq
- (e1 e2)
- y === 7
- (e1 e2) =/= y
- -->
- #t)
-
-#|
-
-(test-check "Eigen violation, again"
-  (run 1 (q) (eigen (x) (=/= x q)))
-  '())
-|#
-
-(check-dq
- (q)
- x =/= q
- --> 
- #f)
-
-#|
-
-(test-check "Eigen violation, again 2"
-  (run 1 (q) (eigen (x) (=/= q x)))
-  '())
-|#
-
-(check-dq
- (x)
- q =/= x
- --> 
- #f)
-
-
-#|
-
-(test-check "same eigen issues, small"
-  (run 1 (q) 
-    (eigen (e1)
-      (=/= `(1 . 0) `(,e1 . ,e1))))
-  '(_.0))
-|#
-
-(check-dq
- (e1)
- (1 0) =/= (e1 e1)
- -->
- #t)
-
-#|
-(test-check "inviolable contraint should be tossed"
-  (run 1 (q) 
-    (eigen (e e2) 
-      (=/= `(1 1 . ()) `(,e ,e2 . ,e))))
-  '(_.0))
-|#
-
-(check-dq
- (e e2)
- (1 1 0) =/= (e e2 e)
- --> 
- #t)
-
-#|
-
-(test-check "same eigens can't unify to distinct values"
-  (run 1 (q) 
-    (== q 1)
-    (eigen (e e2) 
-      (=/= `(,q ,q . ()) `(,e ,e2 . ,e)) (prt)))
-  '(1))
-|#
-
-(check-dq
- (e e2)
- q === 1
- (q q 0) =/= (e e2 2)
- -->
- #t)
-
-#|
-
-(test-check "shapes are issues, should fail"
-  (run 1 (q) 
-    (eigen (e e2) 
-      (=/= `(,q ,q . ()) `(,e ,e2 . ,e)) (prt))
-    (== q '()))
-  '())
-|#
-
-(check-dq
- (e e2)
- q === 0
- (q q 0) =/= (e e2 e)
- --> 
- #f)
-
-#|
-
-
-(printf "These are off for the moment~n")
-
-#!eof
-|#
-#|
-(test-check "eigens need to create disequality constraints; we smuggle'em in"
-  (run 1 (q)
-    (eigen (e)
-      (=/= `(,q . ()) `(,e . ,e))))
-  '((_.0) (=/= ((_.0 ())))))
-|#
-
-(check-dq
- (e)
- (q 0) =/= (e e)
- -->
- (q) =/= (0))
-
-#|
-
-(test-check "eigens need to create disequality constraints; we smuggle'em in b"
-  (run 1 (q)
-    (eigen (e)
-      (=/= `(() . ,q) `(,e . ,e))))
-  '((_.0 (=/= ((_.0 ()))))))
-|#
-
-(check-dq
- (e)
- (0 q) =/= (e e)
- -->
- (q) =/= (0))
-
-#|
-
-(test-check "eigens need to find their way to causing disequalities, through subst"
-  (run 1 (q)
-    (fresh (a b c)
-      (== `(,a ,b ,c) q)
-      (eigen (e)
-        (=/= `(,e ,b ,e) `(,a ,c ,c))
-        (== b c))))
-  '((_.0 _.1 _.2) (=/= ((_.0 _.2)))))
-|#
-
-;; equivalent, since b = c?
-;!!!
-(check-dq
- (e)
- b === c
- (e b e) =/= (a c c)
- -->
- (b a) =/= (e e)
- ||
- (a b) =/= (e e))
-
-#|
-
-(test-check "shapes are issues"
-  (run 1 (q) 
-    (eigen (e e2) 
-      (=/= `(,q ,q . ()) `(,e ,e2 . ,e)) (prt)))
-  '(_.0))
-|#
-
-(check-dq
- (e1 e2)
- (q q 0) =/= (e e2 e)
- -->
- #t)
-
-#|
-
-(test-check "one of these things is not like the other"
-  (run 1 (q) 
-    (fresh (a b c)
-      (== `(,a ,b ,c) q)
-      (eigen (e)
-        (=/= `(,a ,b ,c) `(,e ,e ,e)))))
-  '((_.0 _.1 _.2) (=/= ((_.0 _.1) (_.0 _.2) (_.1 _.2)))))
-|#
-
-;; a =/= b \/ a =/= c \/ b =/= c <-> a =/= c \/ b =/= c <-> (b a) =/= (c c)
-(check-dq
- (e)
- (a b c) =/= (e e e)
- -->
- (b a) =/= (c c)
- ||
- (a b) =/= (c c))
-
-#|
-
-(test-check "should succeed b/c same eigen, diff vars"
-  (run 1 (q) 
-    (fresh (a b) 
-      (== `(,a . ,b) q)
-      (eigen (e1)
-        (=/= `(,a . ,b) `(,e1 . ,e1)))))
-  '((_.0 _.1) (=/= ((_.0 _.1)))))
-|#
-
-(check-dq
- (e1)
- (a b) =/= (e1 e1)
- -->
- (a) =/= (b))
-
-
-#|
-
-(test-check "occurs-checky-thing-w-same-var"
-  (run 1 (q)
-    (fresh (a)
-      (eigen (e)
-        (=/= `(,a . (,a)) `(,e . ,e)))))
-  '(_.0))
-|#
-
-(check-dq
- (e)
- (a (a)) =/= (e e)
- -->
- #t)
-
-#|
-
-(test-check "occurs-checky-thing-w-same-var b"
-  (run 1 (q)
-    (fresh (a)
-      (eigen (e)
-        (=/= `((,a) . ,a) `(,e . ,e)))))
-  '(_.0))
-|#
-
-(check-dq
- (e)
- ((a) a) =/= (e e)
- --> 
- #t)
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/enum-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/enum-test.rkt
deleted file mode 100644
index c18eedb0c9..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/enum-test.rkt
+++ /dev/null
@@ -1,183 +0,0 @@
-#lang racket/base
-(require rackunit
-         redex/reduction-semantics
-         (for-syntax racket/base))
-
-(module test racket/base)
-
-(define-syntax (try-it stx)
-  (syntax-case stx ()
-    [(_ l p)
-     (with-syntax ([line (syntax-line stx)])
-       #'(test-begin
-          (for ([i (in-range 200)])
-            (check-not-exn
-             (λ ()
-                (define term
-                  (generate-term l p #:i-th i))
-                (unless (redex-match l p term)
-                  (error 'bad-term (format "line ~a: i=~a" line i))))))))]))
-
-;; base types
-(define-language Base
-  (a any)
-  (num number)
-  (s string)
-  (nat natural)
-  (i integer)
-  (r real)
-  (b boolean))
-
-(try-it Base a)
-(try-it Base num)
-(try-it Base s)
-(try-it Base nat)
-(try-it Base i)
-(try-it Base r)
-(try-it Base b)
-
-;; Repeat test
-(define-language Rep
-  (r (variable variable ...)))
-
-(try-it Rep r)
-
-;; Recursion test
-(define-language Λc
-  (e (e e)
-     (λ (x) e)
-     x)
-  (x (variable-except λ)))
-
-(try-it Λc e)
-(try-it Λc x)
-
-;; De Bruijn for performance comparison
-(define-language DBλc
-  (e (e e)
-     (λ e)
-     x)
-  (x natural))
-
-(try-it DBλc e)
-
-
-;; Name test
-(define-language Named
-  (n (number_1 number_1)))
-
-;; Very slow, to be fixed
-(try-it Named n)
-
-(define-language not-SKI
-  (y x
-     s
-     k
-     i)
-  (x (variable-except s k i)))
-
-(try-it not-SKI x)
-(try-it not-SKI y)
-
-(define-language λv
-  (e (e e ...)
-     (if0 e e e)
-     x
-     v)
-  (v (λ (x ...) e)
-     number
-     +)
-  (E (v ... E e ...)
-     (if0 E e e)
-     hole)
-  (x (variable-except λ + if0)))
-
-(try-it λv e)
-(try-it λv v)
-(try-it λv E)
-(try-it λv x)
-
-;; No longer supported
-(define-language M
-  (m (x_!_1 x_!_1))
-  (p (string_!_1 string_!_1))
-  (n (p_!_1 p_!_1))
-  (x string)
-
-  ;; Example of poorly behaved mismatch
-  (ambig (y ... y ...)))
-
-(try-it M m)
-(try-it M n)
-(try-it M p)
-;; Ambiguity kills us here
-;; (try-it M (ambig_!_1 ambig_!_1))
-
-;; test variable filtering
-(define-language Vars
-  (mention a b c x y z 2 #f #\c (vec 1 2))
-  (varpre (variable-prefix moo))
-  (varexc (variable-except x λ))
-  (varnom variable-not-otherwise-mentioned))
-
-(try-it Vars varpre)
-(try-it Vars varexc)
-(try-it Vars varnom)
-
-;; Named repeats
-(define-language NRep
-  (v  (natural ..._1 natural ..._1))
-  (v2 (v ..._1 v ..._2 v ..._1 v ..._2))
-  (v3 (natural_1 ..._1 natural_1 ..._1))
-  (v4 (((natural_1 #t) ..._1) ..._2 ((#f natural_1) ..._1) ..._2))
-  ;; The motherlode
-  (v5 ((string_7 (((natural_1 variable_2) ..._1 any_3) ..._2)) ..._3 (((any_3 (variable_2 natural_1) ..._1) ..._2) string_7) ..._3)))
-
-(try-it NRep v)
-(try-it NRep v2)
-(try-it NRep v3)
-(try-it NRep v4)
-(try-it NRep v5)
-
-;; Test production sort
-(define-language rec
-  (e (e e)
-     v)
-  (v (λ (x) e)
-     x)
-  (x variable-not-otherwise-mentioned))
-
-(try-it rec e)
-(try-it rec v)
-
-;; Hole/in-hole test
-(define-language Holes
-  (h hole)
-  (ctx (cons hole boolean)
-       (cons boolean hole))
-  (hide (pair ctx (hide-hole ctx)))
-  (i (in-hole ctx number))
-  (i2 (in-hole hide real)))
-
-(try-it Holes ctx)
-(try-it Holes i)
-(try-it Holes i2)
-(try-it Holes hole)
-(try-it Holes (in-hole hole number))
-(try-it Holes (in-hole (cons hole boolean) (cons number string)))
-(try-it Holes (in-hole (cons hole number_1) number_1))
-
-;; Cross test
-(define-language CrossLang
-  (e (e e)
-     (λ (x) e)
-     x)
-  (x variable-not-otherwise-mentioned))
-
-(try-it CrossLang e)
-(try-it CrossLang x)
-(try-it CrossLang (cross e))
-(try-it CrossLang (cross x))
-(try-it CrossLang (in-hole (cross x) e))
-(try-it CrossLang (in-hole (cross e) x))
-
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/err-loc-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/err-loc-test.rkt
deleted file mode 100644
index ada8763603..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/err-loc-test.rkt
+++ /dev/null
@@ -1,183 +0,0 @@
-#lang racket/base
-
-(module util racket/base
-  (require setup/path-to-relative
-           racket/runtime-path
-           "test-util.rkt"
-           (for-syntax racket/base))
-  (provide exec-syntax-error-tests
-           exec-runtime-error-tests
-           syn-err-test-namespace)
-  
-  (define-runtime-path this-dir ".")
-  
-  (define syn-err-test-namespace (make-base-namespace))
-  (parameterize ([current-namespace syn-err-test-namespace])
-    (eval '(require redex/reduction-semantics)))
-  
-  (define (syntax-error-test-setup thunk)
-    (parameterize ([current-namespace syn-err-test-namespace])
-      (with-handlers ([exn:fail:syntax? 
-                       (λ (exn) 
-                         (values (exn-message exn)
-                                 (map source-location (exn:fail:syntax-exprs exn))))])
-        (thunk))))
-  (define (runtime-error-test-setup thunk)
-    (define errortrace-key (dynamic-require 'errortrace/errortrace-key 'errortrace-key))
-    (parameterize ([current-compile ((dynamic-require 'errortrace/errortrace-lib
-                                                      'make-errortrace-compile-handler))])
-      (with-handlers ([exn:fail? 
-                       (λ (exn) 
-                         (values (exn-message exn)
-                                 (let ([ans (let ([marks (continuation-mark-set->list
-                                                          (exn-continuation-marks exn)
-                                                          errortrace-key)])
-                                              (if (null? marks) '() (list (cdar marks))))])
-                                   (let loop ([ans ans])
-                                     (cond
-                                       [(pair? ans) (cons (loop (car ans)) (loop (cdr ans)))]
-                                       [(path? ans) (path->relative-string/library ans)]
-                                       [else ans])))))])
-        (thunk))))
-  
-  (define ((exec-error-tests setup exec) path)
-    (for ([test (read-tests (build-path this-dir path))])
-      (exec-error-test test exec setup)))
-  (define exec-syntax-error-tests
-    (exec-error-tests syntax-error-test-setup expand))
-  (define exec-runtime-error-tests
-    (exec-error-tests runtime-error-test-setup eval))
-  
-  (define (exec-error-test spec exec setup)
-    (define-values (file line expected-message expected-sources test)
-      (make-error-test spec))
-    (let-values ([(actual-message actual-sources)
-                  (setup (λ () (begin (exec test) (values "" '()))))])
-      (test/proc (λ () actual-message) expected-message line file)
-      (test/proc (λ () actual-sources) expected-sources line file)))
-  
-  (define (make-error-test spec)
-    (syntax-case spec ()
-      [(message named-pieces body)
-       (make-error-test (syntax/loc spec (message named-pieces () body)))]
-      [(message ([loc-name loc-piece] ...) ([non-loc-name non-loc-piece] ...) body)
-       (values (and (path? (syntax-source spec))
-                    (path->relative-string/library (syntax-source spec)))
-               (syntax-line spec)
-               (syntax-e #'message)
-               (map source-location (syntax->list #'(loc-piece ...)))
-               #'(let-syntax ([subst 
-                               (λ (stx)
-                                 (syntax-case (syntax-local-introduce stx) ()
-                                   [(_ loc-name ... non-loc-name ...)
-                                    #'body]))])
-                   (subst loc-piece ... non-loc-piece ...)
-                   (void)))]))
-  
-  (define (source-location stx)
-    (list (and (path? (syntax-source stx))
-               (path->relative-string/library (syntax-source stx))) 
-          (syntax-line stx) 
-          (syntax-column stx) 
-          (syntax-position stx)
-          (syntax-span stx)))
-  
-  (define (read-tests path)
-    (call-with-input-file path
-      (λ (port)
-        (port-count-lines! port)
-        (let loop ()
-          (define test (read-syntax path port))
-          (if (eof-object? test)
-              '()
-              (cons test (loop))))))))
-
-(require "test-util.rkt"
-         redex/reduction-semantics
-         (for-syntax racket/base)
-         'util)
-
-(reset-count)
-
-(parameterize ([current-namespace syn-err-test-namespace])
-  (eval (quote-syntax
-         (define-language syn-err-lang
-           (M (M M)
-              number)
-           (E hole
-              (E M)
-              (number E))
-           (X (number any)
-              (any number))
-           (Q (Q ...)
-              variable)
-           (UN (add1 UN)
-               zero)))))
-
-
-(parameterize ([current-namespace (make-base-namespace)])
-  (eval '(require redex/reduction-semantics redex/pict))
-  (eval '(define-language L
-           (s a b c)))
-  (exec-runtime-error-tests "run-err-tests/define-union-language.rktd"))
-
-(exec-syntax-error-tests "syn-err-tests/language-definition.rktd")
-
-;; term with #:lang tests
-(exec-syntax-error-tests "syn-err-tests/term-lang.rktd")
-
-(parameterize ([current-namespace (make-base-namespace)])
-  (eval '(require redex/reduction-semantics))
-  (exec-runtime-error-tests "run-err-tests/judgment-form-undefined.rktd"))
-
-(exec-syntax-error-tests "syn-err-tests/metafunction-definition.rktd")
-
-(exec-syntax-error-tests "syn-err-tests/relation-definition.rktd")
-
-(exec-syntax-error-tests "syn-err-tests/reduction-relation-definition.rktd")
-
-(exec-syntax-error-tests "syn-err-tests/redex-let.rktd")
-
-(exec-syntax-error-tests "syn-err-tests/judgment-form-definition.rktd")
-(exec-syntax-error-tests "syn-err-tests/judgment-holds.rktd")
-
-(parameterize ([current-namespace (make-base-namespace)])
-  (eval '(require redex/reduction-semantics))
-  (eval '(define-language L
-           (s a b c)))
-  (eval '(define-judgment-form L
-           #:mode (ctc-fail I O)
-           #:contract (ctc-fail s s)
-           [(ctc-fail a q)]
-           [(ctc-fail b s)
-            (ctc-fail q s)]
-           [(ctc-fail c s)
-            (ctc-fail a s)]))
-  (eval '(define-judgment-form L
-           #:mode (inv-fail I O)
-           #:contract (inv-fail s_1 s_2)
-           #:inv ,(not (eq? (term s_1) (term s_2)))
-           [(inv-fail s a)]))
-  (exec-runtime-error-tests "run-err-tests/judgment-form-contracts.rktd")
-  (exec-runtime-error-tests "run-err-tests/judgment-form-undefined.rktd")
-  (exec-runtime-error-tests "run-err-tests/judgment-form-ellipses.rktd"))
-
-(parameterize ([current-namespace (make-base-namespace)])
-  (eval '(require redex/reduction-semantics))
-  (eval '(define-language L))
-  (eval '(define-metafunction L
-           ∨ : boolean boolean -> boolean
-           [(∨ #f #f) #f]
-           [(∨ boolean boolean) #t]))
-  (exec-runtime-error-tests "run-err-tests/metafunction-no-match.rktd"))
-
-(require redex/private/term
-         redex/private/lang-struct)
-(define-namespace-anchor here)
-  (define ns (namespace-anchor->namespace here))
-  (parameterize ([current-namespace ns])
-    (exec-runtime-error-tests "run-err-tests/term.rktd"))
-  
-  (exec-syntax-error-tests "syn-err-tests/term.rktd")
-  
-(print-tests-passed 'err-loc-test.rkt)
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/gen-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/gen-test.rkt
deleted file mode 100644
index 29b30f88b3..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/gen-test.rkt
+++ /dev/null
@@ -1,909 +0,0 @@
-#lang racket
-
-(require redex/reduction-semantics
-         redex/private/jdg-gen
-         redex/private/generate-term
-         "test-util.rkt"
-         (only-in redex/private/pat-unify
-                  bound
-                  lvar))
-
-
-(define-syntax-rule (is-not-false e)
-  (test (not e) #f))
-
-(define-syntax-rule (is-false e)
-  (test e #f))
-
-(define-syntax-rule (no-counterexample e)
-  (test
-   (counterexample? e)
-   #f))
-
-(define-language L0)
-
-(let ()
-  
-  (test (check-dq (dq '() (list `a `a)) (make-hash) L0 (hash))
-              #f)
-  (test (check-dq (dq '() (list `a `b)) (make-hash) L0 (hash))
-              #t)
-  (test (check-dq (dq '() (list `(list a) `(list a))) (make-hash) L0 (hash))
-              #f)
-  (test (check-dq (dq '() (list `(list a) `(list b))) (make-hash) L0 (hash))
-              #t)
-  (test (check-dq (dq '() (list `(list number) `(list variable))) (make-hash) L0 (hash))
-              #t)
-  (test (check-dq (dq '() (list `(list a) `(list number))) (make-hash) L0 (hash))
-              #t)
-  (test (check-dq (dq '() (list `(list 2) `(list variable-not-otherwise-mentioned)))
-                  (make-hash) L0 (hash))
-              #t)
-  (test (check-dq (dq '() (list `(list a b) `(list a number))) (make-hash) L0 (hash))
-              #t)
-  (test (check-dq (dq '() (list `(list a b) `(list a b))) (make-hash) L0 (hash))
-              #f)
-  (test (check-dq (dq '()
-                            (list `(list (name a ,(bound)))
-                                  `(list (name a ,(bound)))))
-                        (make-hash)
-                        L0
-                        (hash (lvar 'a) 'number))
-              #f)
-  (test (check-dq (dq '()
-                            (list `(name a ,(bound))
-                                  `(name b ,(bound))))
-                        (make-hash (list (cons (lvar 'a) '(1 2 3))
-                                         (cons (lvar 'b) '(1 2 3))))
-                        L0
-                        (hash (lvar 'a) 'any (lvar 'b) 'any))
-              #f)
-  )
-
-(let ()
-  
-  (define-language nats
-    (n z (s n)))
-  
-  (define-judgment-form nats
-    #:mode (sum I I O)
-    #:contract (sum n n n)
-    [(sum z n n)]
-    [(sum (s n_1) n_2 (s n_3))
-     (sum n_1 n_2 n_3)])
-  
-  (define-relation nats
-    [(r-sum z n n)]
-    [(r-sum (s n_1) n_2 (s n_3))
-     (r-sum n_1 n_2 n_3)])
-  
-  (test (judgment-holds (sum z (s z) (s z)))
-              #t)
-  
-  (test (judgment-holds (sum (s z) (s z) (s (s z))))
-              #t)
-  
-  (test (generate-term nats #:satisfying (sum z (s z) n) +inf.0)
-              '(sum z (s z) (s z)))
-  
-  (test (generate-term nats #:satisfying (sum (s z) (s z) n) +inf.0)
-              '(sum (s z) (s z) (s (s z))))
-  
-  (test (generate-term nats #:satisfying (sum z z (s z)) 5)
-              #f)
-  
-  (for ([_ 50])
-    (match (generate-term nats #:satisfying (sum n_1 n_2 n_3) 5)
-      [`(sum ,l ,r ,res)
-       (test (judgment-holds (sum ,l ,r n) n)
-                   `(,res))])
-    (match (generate-term nats #:satisfying (r-sum n_1 n_2 n_3) 5)
-      [`(r-sum ,l ,r ,res)
-       (test (term (r-sum ,l ,r ,res))
-                   #t)]))
-  (no-counterexample
-   (redex-check nats
-                #:satisfying
-                (sum n_1 n_2 n_3)
-                (equal? (car (judgment-holds
-                              (sum n_1 n_2 n_4) n_4))
-                        (term n_3))
-                #:attempts 50
-                #:print? #f))
-  
-  (no-counterexample
-   (redex-check nats
-                #:satisfying
-                (r-sum n_1 n_2 n_3)
-                (judgment-holds
-                 (sum n_1 n_2 n_3))
-                #:attempts 50
-                #:print? #f))
-  )
-
-(let ()
-  
-  (define-language lists
-    (l (x l)
-       ())
-    (x variable-not-otherwise-mentioned))
-  
-  (define-judgment-form lists
-    #:mode (not-in I I)
-    [(not-in x_0 ())]
-    [(not-in x_0 (x_1 l_0))
-     (different x_0 x_1) ;; this line has to go first or this won't terminate
-     (not-in x_0 l_0)])
-  
-  (define-judgment-form lists
-    #:mode (different I I)
-    [(different x_!_1 x_!_1)])
-  
-  (test
-   (judgment-holds (not-in a (b (c (d (e (f ())))))))
-   #t)
-  
-  (test
-   (judgment-holds (not-in a (b (c (d (a (f ())))))))
-   #f)
-  
-  (test
-   (generate-term lists #:satisfying (not-in a (b (a (c l)))) 5)
-   #f)
-  
-  (test
-   (not (generate-term lists #:satisfying (not-in a (b (c (d (e (f ())))))) +inf.0))
-   #f)
-  
-  (for/and ([_ 50])
-    (match (generate-term lists #:satisfying (not-in a l) 5)
-      [`(not-in a ,l)
-       (unless (judgment-holds (not-in a ,l)) (printf "l: ~s\n" l))
-       (test (judgment-holds (not-in a ,l))
-                   #t)]
-      [#f
-       (void)]))
-  
-  (no-counterexample
-   (redex-check lists
-                #:satisfying
-                (not-in x l)
-                (judgment-holds (not-in x l))
-                #:attempts 50
-                #:print? #f))
-                
-  )
-
-(let ()
-  
-  (define-language TL
-    (T (N T T)
-       (L number)))
-  
-  (define-relation TL
-    [(tree (N T_1 T_2))
-     (tree T_1)
-     (tree T_2)]
-    [(tree (L number))])
-  
-  (test
-   (not
-    (empty?
-     (filter
-      values
-      (for/list ([_ 100])
-        (generate-term TL #:satisfying (tree T) 2)))))
-   #t)
-  )
-
-(let ()
-  
-  (define-language simple
-    (e (+ e e)
-       (+ e e e)
-       number))
-  
-  (define-judgment-form simple
-    #:mode (double I I)
-    [(double (+ e_1 e_2) e_3)
-     (where e_3 (+ (+ e_1 e_1) (+ e_2 e_2)))])
-  
-  (for ([_ 50])
-    (define t (generate-term simple #:satisfying (double e_1 e_2) +inf.0))
-    (match t
-      [`(double ,e1 ,e2)
-       (test (judgment-holds (double ,e1 ,e2))
-                   #t)]
-      [#f
-       (void)]))
-  
-  (no-counterexample
-   (redex-check simple
-                #:satisfying
-                (double e_1 e_2)
-                (judgment-holds
-                 (double e_1 e_2))
-                #:attempts 50
-                #:print? #f))
-  
-  (define-metafunction simple
-    [(duplicate e_1 e_1)
-     (+ e_1 e_1 e_1)]
-    [(duplicate e_1 e_2)
-     (+ e_3 e_4)
-     (where e_31 e_1)
-     (where e_3 (+ e_31 e_31))
-     (where e_42 e_2)
-     (where e_4 (+ e_42 e_42))]
-    [(duplicate e_1)
-     (duplicate e_1 e_1)])
-  
-  (define-judgment-form simple
-    #:mode (double2 I I)
-    [(double2 (+ e_1 e_2) e_3)
-     (where e_3 (duplicate e_1 e_2))]
-    [(double2 e_1 e_2)
-     (where e_2 (duplicate e_1))])
-  
-  (test (term (duplicate 1 2))
-              '(+ (+ 1 1) (+ 2 2)))
-  
-  (test (term (duplicate 1))
-              '(+ 1 1 1))
-  
-  (test (term (duplicate 2 2))
-              '(+ 2 2 2))
-  
-  (test (judgment-holds (double2 (+ 1 2) (+ (+ 1 1) (+ 2 2))))
-              #t)
-  
-  (test (judgment-holds (double2 1 (+ 1 1 1)))
-              #t)
-  
-  (test (judgment-holds (double2 (+ 2 2) (+ 2 2 2)))
-              #t)
-  
-  (for ([_ 50])
-    (define t (generate-term simple #:satisfying (double2 e_1 e_2) +inf.0))
-    (match t
-      [`(double2 ,e1 ,e2)
-       (test (judgment-holds (double2 ,e1 ,e2))
-                   #t)]
-      [#f
-       (void)]))
-  
-  (no-counterexample
-   (redex-check simple
-                #:satisfying
-                (double2 e_1 e_2)
-                (judgment-holds 
-                 (double2 e_1 e_2))
-                #:attempts 50
-                #:print? #f))
-  
-  )
-
-(let ()
-  (define-language STLC
-    (e (λ (x τ) e)
-       (e e)
-       x
-       i
-       add1)
-    (τ int
-       (τ → τ))
-    (Γ ([x τ] Γ)
-       •)
-    (i integer)
-    (x variable-not-otherwise-mentioned))
-  
-  (define-judgment-form STLC
-    #:mode (typeof I I O)
-    #:contract (typeof Γ e τ)
-    [(typeof Γ i int)]
-    [(typeof Γ x (lookup x Γ))]
-    [(typeof Γ add1 (int → int))]
-    [(typeof Γ (λ (x τ_1) e) (τ_1 → τ_2))
-     (typeof ([x τ_1] Γ) e τ_2)]
-    [(typeof Γ (e_1 e_2) τ)
-     (typeof Γ e_1 (τ_2 → τ))
-     (typeof Γ e_2 τ_2)])
-  
-  (define-metafunction STLC
-    [(lookup x ([x τ] Γ))
-     τ]
-    [(lookup x ([x_1 τ] Γ))
-     (lookup x Γ)])
-  
-  (define-extended-language if-l STLC
-    (e (if0 e e e)
-       ....))
-  
-  (define-extended-judgment-form if-l typeof
-    #:mode (typ-if I I O)
-    [(typ-if Γ (if0 e_1 e_2 e_3) τ)
-     (typ-if Γ e_1 int)
-     (typ-if Γ e_2 τ)
-     (typ-if Γ e_3 τ)])
-  
-  (test (generate-term STLC
-                             #:satisfying
-                             (lookup x ([x int] ([x (int → int)] •))) = (int → int)
-                             6)
-              #f)
-  
-  (test (judgment-holds (typeof ([x_1 int] ([x_1 (int → int)] •)) (x_1 5) int))
-              #f)
-  (test (judgment-holds (typeof ([x_2 int] ([x_1 (int → int)] •)) (x_1 5) int))
-              #t)
-  
-  (for ([_ 50])
-    (define term (generate-term STLC #:satisfying (typeof Γ e τ) 6))
-    (match term
-      [`(typeof ,g ,e ,t)
-       (define tp (judgment-holds (typeof ,g ,e τ) τ))
-       (test tp `(,t))]
-      [#f
-       (void)]))
-  
-  (no-counterexample
-   (redex-check STLC
-                #:satisfying
-                (typeof Γ e τ)
-                (equal? (car (judgment-holds
-                              (typeof Γ e τ_2) τ_2))
-                        (term τ))
-                #:attempts 50
-                #:print? #f))
-  
-  (for ([_ 50])
-    (define term (generate-term if-l #:satisfying (typ-if Γ e τ) 5))
-    (match term
-      [`(typ-if ,g ,e ,t)
-       (define tp (judgment-holds (typ-if ,g ,e τ) τ))
-       (test tp `(,t))]
-      [#f
-       (void)]))
-  
-  (no-counterexample
-   (redex-check STLC
-                #:satisfying
-                (typ-if Γ e τ)
-                (equal? (car (judgment-holds
-                              (typ-if Γ e τ_2) τ_2))
-                        (term τ))
-                #:attempts 50
-                #:print? #f))
-  
-  (define g (redex-generator STLC (typeof • e τ) 5))
-  (define terms (filter values (for/list ([_ 100]) (g))))
-  (test (length terms)
-              (length (remove-duplicates terms)))
-  (map (match-lambda
-         [`(typeof ,g ,e ,t)
-          (define tp (judgment-holds (typeof ,g ,e τ) τ))
-          (test tp `(,t))])
-       terms)
-  (void)
-  )
-
-(let ()
-  (define-language l
-    (e (n e)
-       •)
-    (n number))
-  
-  (define-metafunction l
-    fltr : n e -> e
-    [(fltr n •)
-     •]
-    [(fltr n (n e))
-     (fltr n e)]
-    [(fltr n (n_0 e))
-     (n_0 (fltr n e))])
-  
-  (define-judgment-form l
-    #:mode (filtered I I O)
-    [(filtered e n (fltr n e))])
-  
-  (test (generate-term l #:satisfying (filtered (1 (2 (3 (4 •)))) 3 (1 (2 (4 •)))) +inf.0)
-              '(filtered (1 (2 (3 (4 •)))) 3 (1 (2 (4 •)))))
-  (test (generate-term l #:satisfying (filtered (1 (2 (3 (4 •)))) 5 (1 (2 (4 •)))) +inf.0)
-              #f)
-  
-  (for ([_ 25])
-    (define term (generate-term l #:satisfying (filtered e_1 n e_2) 5))
-    (match term
-      [`(filtered ,e1 ,n ,e2)
-       (define tp (judgment-holds (filtered ,e1 ,n e_2) e_2))
-       (test tp `(,e2))]
-      [#f
-       (void)]))
-  
-  (no-counterexample
-   (redex-check l
-                #:satisfying
-                (filtered e_1 n e_2)
-                (equal? (car (judgment-holds
-                              (filtered e_1 n e_3) e_3))
-                        (term e_2))
-                #:attempts 25
-                #:print? #f))
-  
-  (for ([_ 25])
-    (define t (generate-term l #:satisfying (fltr n e) = e_1 5))
-    (match t
-      [`((fltr ,n ,e) = ,e1)
-       (test (term (fltr ,n ,e)) e1)]
-      [#f
-       (void)]))
-  
-  (no-counterexample
-   (redex-check l 
-                #:satisfying 
-                (fltr n e) = e_1
-                (equal? (term (fltr n e)) (term e_1))
-                #:attempts 25
-                #:print? #f))
-  
-  (define g (redex-generator l (fltr n e_1) = e_2 5))
-  (define terms (filter values (for/list ([_ 50]) (g))))
-  (test (length terms)
-              (length (remove-duplicates terms)))
-  (map (match-lambda
-         [`((fltr ,n ,e) = ,e1)
-          (test (term (fltr ,n ,e)) e1)])
-       terms)
-  (void))
-
-(let ()
-  
-  (define-language L
-    (v a
-       b
-       c
-       d
-       e
-       f)
-    (bool T F))
-  
-  (define-metafunction L
-    [(is-a? a) T]
-    [(is-a? v) F])
-  
-  (define-metafunction/extension is-a? L
-    [(is-a/b? b) T])
-  
-  (define-metafunction/extension is-a/b? L
-    [(is-a/b/c/d/e? c) T]
-    [(is-a/b/c/d/e? d) T]
-    [(is-a/b/c/d/e? e) T])
-  
-  
-  (test (generate-term L #:satisfying (is-a? a) = any +inf.0)
-              '((is-a? a) = T))
-  (test (generate-term L #:satisfying (is-a? b) = any +inf.0)
-              '((is-a? b) = F))
-  (test (generate-term L #:satisfying (is-a? c) = any +inf.0)
-              '((is-a? c) = F))
-  (test (generate-term L #:satisfying (is-a/b? a) = any +inf.0)
-              '((is-a/b? a) = T))
-  (test (generate-term L #:satisfying (is-a/b? b) = any +inf.0)
-              '((is-a/b? b) = T))
-  (test (generate-term L #:satisfying (is-a/b? c) = any +inf.0)
-              '((is-a/b? c) = F))
-  
-  (test (generate-term L #:satisfying (is-a? a) = F +inf.0)
-              #f)
-  (test (generate-term L #:satisfying (is-a? b) = T +inf.0)
-              #f)
-  (test (generate-term L #:satisfying (is-a? c) = T +inf.0)
-              #f)
-  (test (generate-term L #:satisfying (is-a/b? a) = F +inf.0)
-              #f)
-  (test (generate-term L #:satisfying (is-a/b? b) = F +inf.0)
-              #f)
-  (test (generate-term L #:satisfying (is-a/b? c) = T +inf.0)
-              #f)
-  
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? a) = any +inf.0)
-              '((is-a/b/c/d/e? a) = T))
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? b) = any +inf.0)
-              '((is-a/b/c/d/e? b) = T))
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? c) = any +inf.0)
-              '((is-a/b/c/d/e? c) = T))
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? d) = any +inf.0)
-              '((is-a/b/c/d/e? d) = T))
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? e) = any +inf.0)
-              '((is-a/b/c/d/e? e) = T))
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? f) = any +inf.0)
-              '((is-a/b/c/d/e? f) = F))
-  
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? a) = F +inf.0)
-              #f)
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? b) = F +inf.0)
-              #f)
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? c) = F +inf.0)
-              #f)
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? d) = F +inf.0)
-              #f)
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? e) = F +inf.0)
-              #f)
-  (test (generate-term L #:satisfying (is-a/b/c/d/e? f) = T +inf.0)
-              #f))
-
-;; errors for unsupprted pats
-(let ()
-  (define-language L (n any))
-  (define-metafunction L
-    [(g (side-condition any #f)) any])
-  (define-metafunction L
-    [(f n) (g n)])
-  (test (with-handlers ((exn:fail? exn-message))
-          (generate-term L #:satisfying (f any) = any +inf.0)
-          "didn't raise an exception")
-        #rx".*generate-term:.*side-condition.*"))
-(let ()
-  (define-language L (n any))
-  (define-metafunction L
-    [(g any_1 ...) (any_1 ...)])
-  (define-metafunction L
-    [(f n) (g n)])
-  (test (with-handlers ((exn:fail? exn-message))
-          (generate-term L #:satisfying (f any) = any +inf.0)
-          "didn't raise an exception")
-        #rx".*generate-term:.*repeat.*"))
-
-(let ()
-  (define-language L
-    (n 1))
-  
-  (define-judgment-form L
-    #:mode (jf I)
-    [(jf (n_0 n_1 ...))
-     (jf n_0)
-     (where (n_2 ...) (n_1 ...))
-     (jf (n_1 ...))]
-    [(jf 1)]
-    [(jf 2)]
-    [(jf 3)])
-  
-  (test (with-handlers ([exn:fail? exn-message])
-          (generate-term L #:satisfying (jf n_1 n_2 n_3) +inf.0))
-        #rx".*generate-term:.*repeat.*"))
-
-(let ()
-  (define-language L
-    (q any)
-    (r number))
-  
-  (define-metafunction L
-    [(f r_1)
-     r_2
-     (where r_2 ,(+ (term r) (term r)))]
-    [(f (q_1 q_2))
-     q_3
-     (where q_3 (f q_1))
-     (where q_3 (f q_2))])
-  
-  (test (with-handlers ([exn:fail? exn-message])
-          (generate-term L #:satisfying (f r_1) = r_2 +inf.0))
-        #rx".*generate-term:.*undatum.*"))
-
-
-(let ()
-  (define-language L (n 2))
-  (define-metafunction L
-    [(n any) any])
-  (define-metafunction L
-    [(f n) (n 1)])
-  (test (generate-term L #:satisfying (f any_1) = any_2 +inf.0)
-              '((f 2) = (2 1))))
-
-(let ()
-  (define-language L (n 2))
-  (define-metafunction L
-    [(n any) any])
-  (define-metafunction L
-    [(f n) n])
-  (test (generate-term L #:satisfying (f any_1) = any_2 +inf.0)
-              '((f 2) = 2)))
-
-(let ()
-  
-  (define-language l (n number))
-  
-  (define-metafunction l
-    [(t n n)
-     1]
-    [(t n 2)
-     2]
-    [(t 1 n)
-     3]
-    [(t n_1 n_2)
-     4])
-  
-  (test (generate-term l #:satisfying (t 1 1) = 1 +inf.0)
-              '((t 1 1) = 1))
-  (test (generate-term l #:satisfying (t 1 1) = 2 +inf.0)
-              #f)
-  (test (generate-term l #:satisfying (t 1 2) = 2 +inf.0)
-              '((t 1 2) = 2))
-  (test (generate-term l #:satisfying (t 1 2) = 3 +inf.0)
-              #f)
-  (test (generate-term l #:satisfying (t 1 3) = 3 +inf.0)
-              '((t 1 3) = 3))
-  (test (generate-term l #:satisfying (t 1 3) = 4 +inf.0)
-              #f)
-  (test (generate-term l #:satisfying (t 6 7) = 4 +inf.0)
-              '((t 6 7) = 4))
-  (test (generate-term l #:satisfying (t 6 7) = 3 +inf.0)
-              #f)
-  (test (generate-term l #:satisfying (t 6 7) = 2 +inf.0)
-              #f)
-  (test (generate-term l #:satisfying (t 6 7) = 1 +inf.0)
-              #f)
-  
-  (no-counterexample
-   (redex-check l 
-                #:satisfying 
-                (t n_1 n_2) = n_3
-                (equal? (term (t n_1 n_2)) (term n_3))
-                #:attempts 50
-                #:print? #f))
-  
-  )
-
-(let ()
-  (define-judgment-form L0
-    #:mode (J I I)
-    [(J any_1 any_1)])
-  
-  (define f (generate-term L0 #:satisfying (J any_2 any_3)))
-  
-  (let/ec k
-    (for ([i (in-range 100)])
-      (define t (f 10))
-      (unless (equal? (list-ref t 1) (list-ref t 2))
-        (test (list-ref t 1) (list-ref t 2))
-        ;; after a single test failure, stop running the loop
-        (k (void))))))
-
-
-(let ()
-  (define-language L
-    (e (or e e) b)
-    (b T F))
-  
-  (define-relation L
-    [(or-eval T)]
-    [(or-eval (or T e_2))]
-    [(or-eval (or (or e_1 e_2) e_3)) (or-eval (or e_1 (or e_2 e_3)))]
-    [(or-eval (or F e)) (or-eval e)])
-  
-  (test (generate-term L #:satisfying (or-eval F) +inf.0)
-              #f)
-  (test (generate-term L #:satisfying (or-eval T) +inf.0)
-              '(or-eval T))
-  (test (generate-term L #:satisfying (or-eval (or (or F F) T)) +inf.0)
-              '(or-eval (or (or F F) T))))
-
-(let ()
-  (define-language wrong-nums
-    (n z (s z)))
-  
-  (define-relation wrong-nums
-    [(sum z n n)]
-    [(sum (s n_1) n_2 (s n_3))
-     (sum n_1 n_2 n_3)])
-  
-  (for ([n 10])
-    (define r (random 100000))
-    (random-seed r)
-    (define g (redex-generator wrong-nums (sum n_1 n_2 n_3) 1))
-    (with-handlers
-        ([exn? (λ (e) 
-                 (printf "random seed: ~s\n" r)
-                 (raise e))])
-      (for ([n 10])
-        (g)))))
-
-(let ()
-  (define-relation L0
-    [(a any)])
-  (define-relation L0
-    [(b any)])
-  (define-relation L0
-    [(c any) (a (b any))])
-  
-  (define-metafunction L0
-    [(f any)
-     (a ny)])
-
-  (define-judgment-form L0
-    #:mode (J I O)
-    [(J any_1 any_2)
-     (J (a any_1) any_2)]
-    [(J #t #f)])
-  
-  (test (term (a #t))
-        #t)
-  (test (term (a 42))
-        #t)
-  (test (term (a #f))
-        #t)
-  
-  (test (with-handlers ([exn:fail? exn-message])
-          (generate-term L0 #:satisfying (c any) +inf.0))
-        #rx".*generate-term:.*relation.*")
-  
-  (test (with-handlers ([exn:fail? exn-message])
-          (generate-term L0 #:satisfying (f any_1) = any_2 +inf.0))
-        #rx".*generate-term:.*relation.*")
-  
-  (test (with-handlers ([exn:fail? exn-message])
-          (generate-term L0 #:satisfying (J any_1 any_2) +inf.0))
-        #rx".*generate-term:.*relation.*"))
-
-(let ()
-  
-  (define-relation L0
-    [(R number)
-     number]
-    [(R string)])
-  
-  (define-relation L0
-    [(R2 number)
-     #f]
-    [(R2 string)])
-  
-  (define-relation L0
-    [(R3 any)
-     any])
-  
-  (is-not-false (generate-term L0 #:satisfying (R 5) +inf.0))
-  (is-not-false (generate-term L0 #:satisfying (R "hello") +inf.0))
-  (is-false (generate-term L0 #:satisfying (R #t) +inf.0))
-  (is-false (generate-term L0 #:satisfying (R #f) +inf.0))
-  
-  (is-false (generate-term L0 #:satisfying (R2 5) +inf.0))
-  (is-not-false (generate-term L0 #:satisfying (R2 "hello") +inf.0))
-  (is-false (generate-term L0 #:satisfying (R2 #t) +inf.0))
-  (is-false (generate-term L0 #:satisfying (R2 #f) +inf.0))
-  
-  (is-not-false (generate-term L0 #:satisfying (R3 5) +inf.0))
-  (is-not-false (generate-term L0 #:satisfying (R3 "hello") +inf.0))
-  (is-not-false (generate-term L0 #:satisfying (R3 #t) +inf.0))
-  (is-false (generate-term L0 #:satisfying (R3 #f) +inf.0))
-  
-  
-  (define-judgment-form L0
-    #:mode (J I)
-    [(J (any))
-     (side-condition any)]
-    [(J (any_1 any_2))
-     (J any_1)
-     (J any_2)])
-  
-  (is-not-false (generate-term L0 #:satisfying (J (1)) +inf.0))
-  (is-not-false (generate-term L0 #:satisfying (J ((1) (2))) +inf.0))
-  (is-false (generate-term L0 #:satisfying (J ((1) (#f))) 5))
-  (is-false (generate-term L0 #:satisfying (J ((#f) (2))) 5))
-  (is-not-false (generate-term L0 #:satisfying (J ((#t) (2))) 5)))
-
-(let ()
-  
-  (define-metafunction L0
-    [(f (any_1 any_2))
-     2]
-    [(f any_1)
-     1])
-  
-  (define-judgment-form L0
-    #:mode (J I I)
-    [(J (any_1 any_2) 2)]
-    [(J any_1 1)])
-  
-  
-  (test (generate-term L0
-                             #:satisfying
-                             (f (any_1 any_2)) = 1
-                             +inf.0)
-              #f)
-  
-  (test (not
-               (generate-term L0
-                              #:satisfying
-                              (f (any_1 any_2)) = 2
-                              +inf.0))
-              #f)
-  (is-not-false
-   (for/and ([_ 50])
-     (match (generate-term L0
-                           #:satisfying
-                           (f any) = 1
-                           5)
-       [`((f (,a ,b)) = 1) #f]
-       [else #t]))))
-
-(let ()
-  
-  (define-relation L0
-    [(R (#f #f #f) 3)]
-    [(R (#f #f) 2)]
-    [(R #f 1)])
-  
-  (is-not-false
-   (generate-term
-    L0
-    #:satisfying
-    (R any_1 any_2)
-    +inf.0))
-  
-  (is-not-false
-   (generate-term
-    L0
-    #:satisfying
-    (R (any_1 any_2) any_3)
-    +inf.0))
-  
-  (is-not-false
-   (generate-term
-    L0
-    #:satisfying
-    (R (any_1 any_2 any_3) any_4)
-    +inf.0))
-  
-  (is-false
-   (generate-term
-    L0
-    #:satisfying
-    (R (any_1 any_2) 3)
-    +inf.0))
-  
-  (is-not-false
-   (generate-term
-    L0
-    #:satisfying
-    (R #f any)
-    +inf.0))
-  )
-
-(let ()
-  
-  (define-relation L0
-    [(not-mem any_1 (any_2 any_3))
-     (not-mem any_1 any_3)
-     (where (any_!_4 any_!_4) (any_1 any_2))]
-    [(not-mem any_1 ())])
-  
-  (is-not-false
-   (generate-term
-    L0
-    #:satisfying
-    (not-mem d (a (b (c ()))))
-    +inf.0))
-  
-  (is-false
-   (generate-term
-    L0
-    #:satisfying
-    (not-mem b (a (b (c ()))))
-    +inf.0)))
-
-(let ()
-  (test (generate-term L0 natural #:i-th 0) 0)
-  (let ([gen-ith (generate-term L0 natural #:i-th)])
-    (test (gen-ith 0) 0)
-    (test (gen-ith 1) 1)))
-
-(let ()
-  (define-language L
-    (e ::= (name aha! any)))
-
-  (define-judgment-form L
-    #:mode (J I I)
-    [(J e e)])
-  
-  (is-not-false
-   (generate-term L #:satisfying (J e_1 e_2) 10)))
\ No newline at end of file
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/hole-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/hole-test.rkt
deleted file mode 100644
index 90d8ea6df5..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/hole-test.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang scheme
-(require redex)
-
-(module test racket/base)
-
-(define-language tl-grammar
-  [v (cont (hide-hole E))]
-  [E hole
-     (v ... E)])
-
-(define test1
-  (reduction-relation
-   tl-grammar
-   [--> (in-hole E_1 (explode))
-        (in-hole E_1 1)]))
-
-(test--> test1 
-         (term ((cont hole) (explode)))
-         (term ((cont hole) 1)))
-
-(define test2
-  (reduction-relation
-   tl-grammar
-   [--> (in-hole E_1 (explode))
-        (asplode E_1)]))
-
-(define-metafunction tl-grammar
-  asplode : E -> any
-  [(asplode ((cont hole) hole))
-   okay])
-
-(test--> test2
-         (term ((cont hole) (explode)))
-         (term okay))
-
-(test-results)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/keyword-macros-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/keyword-macros-test.rkt
deleted file mode 100644
index aec1195579..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/keyword-macros-test.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang scheme
-
-(require redex/private/keyword-macros
-         "test-util.rkt")
-
-(module test racket/base)
-
-(reset-count)
-
-(let* ([formals `((#:b ,#'1) (#:c ,#'2))]
-       [parse 
-        (λ (actuals) 
-          (map syntax-e 
-               (parse-kw-args formals (cdr (syntax-e actuals)) actuals 'dontcare)))])
-  (let-syntax ([msg-src
-                (syntax-rules ()
-                  [(_ expr)
-                   (with-handlers ([exn:fail:syntax?
-                                    (λ (exn)
-                                      (values (exn-message exn)
-                                              (exn:fail:syntax-exprs exn)))])
-                     (begin expr (values 'no-msg 'no-src)))])])
-    (let ()
-      (test (parse #'(a #:c 3 #:b 4)) '(4 3))
-      (test (parse #'(a #:b 4 #:c 3)) '(4 3))
-      (test (parse #'(a #:c 3)) '(1 3))
-      (let*-values ([(kw) (syntax-taint #'#:b)]
-                    [(msg src) (msg-src (parse #`(a #,kw)))])
-        (test msg #rx"a: missing argument expression after keyword")
-        (test src (list kw)))
-      (let*-values ([(arg) (syntax-taint #'1)]
-                    [(msg src) (msg-src (parse #`(a #:b 1 #,arg)))])
-        (test msg #rx"a: expected a keyword")
-        (test src (list arg)))
-      (let*-values ([(kw) (syntax-taint #'#:c)]
-                    [(msg src) (msg-src (parse #`(a #:c 1 #:b 2 #,kw 3)))])
-        (test msg #rx"a: repeated keyword")
-        (test src (list kw)))
-      (let*-values ([(kw) (syntax-taint #'#:c)]
-                    [(msg src) (msg-src (parse #`(a #:b #,kw 3)))])
-        (test msg #rx"a: expected an argument expression")
-        (test src (list kw)))
-      (let*-values ([(kw) (syntax-taint #'#:typo)]
-                    [(msg src) (msg-src (parse #`(a #:b 3 #,kw 4)))])
-        (test msg #rx"a: invalid keyword")
-        (test src (list kw))))))
-
-(define-namespace-anchor test-module)
-
-(let* ([default #'3]
-       [formals `((#:a ,default (,#'(-> number? string?) "#:a arg")))]
-       [form 'test-form]
-       [parse (λ (actuals) (parse-kw-args formals actuals actuals form))])
-  (test (first (parse #'())) default)
-  (define arg
-    (eval (first (parse #'(#:a (λ (x) 3)))) 
-          (namespace-anchor->namespace test-module)))
-  (test-contract-violation
-   (arg 3)
-   #:blaming "keyword-macros-test"
-   #:message "#:a arg")
-  (test-contract-violation
-   (arg "NaN")
-   #:blaming (format "~a" form)
-   #:message "#:a arg"))
-
-(print-tests-passed 'keyword-macros-test.rkt)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/lw-test-util.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/lw-test-util.rkt
deleted file mode 100644
index c6d2251e10..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/lw-test-util.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-(module lw-test-util mzscheme
-  (require redex/private/loc-wrapper)
-  (provide normalize-lw)
-  
-  (define (normalize-lw lw)
-    (define-values (min-line min-column) (find-min-line/col lw))
-    (define (normalize/lw lw)
-      (cond
-        [(lw? lw)
-         (make-lw (normalize/e (lw-e lw))
-                  (- (lw-line lw) min-line)
-                  (lw-line-span lw)
-                  (- (lw-column lw) min-column)
-                  (lw-column-span lw)
-                  (lw-unq? lw)
-                  (lw-metafunction? lw))]
-        [else lw]))
-    (define (normalize/e e)
-      (cond
-        [(symbol? e) e]
-        [(string? e) e]
-        [else (map normalize/lw e)]))
-    (normalize/lw lw))
-  
-  (define (find-min-line/col lw)
-    (define min-line #f)
-    (define min-col #f)
-    (define (find-min/lw lw)
-      (when (lw? lw)
-        (set! min-line (if min-line
-                           (min min-line (lw-line lw))
-                           (lw-line lw)))
-        (set! min-col (if min-col
-                          (min min-col (lw-column lw))
-                          (lw-column lw)))
-        (find-min/e (lw-e lw))))
-    (define (find-min/e e)
-      (cond
-        [(symbol? e) (void)]
-        [(string? e) (void)]
-        [else (for-each find-min/lw e)]))
-    (find-min/lw lw)
-    (values min-line min-col)))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/lw-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/lw-test.rkt
deleted file mode 100644
index e089c3dcc2..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/lw-test.rkt
+++ /dev/null
@@ -1,329 +0,0 @@
-#|
-
-     DO NOT TABIFY THIS FILE
-
-|#
-
-
-;                                            
-;                                            
-;  ;;;;                                      
-;   ;  ;                                ;    
-;   ;   ;   ;;;         ;; ;;    ;;;   ;;;;; 
-;   ;   ;  ;   ;         ;;  ;  ;   ;   ;    
-;   ;   ;  ;   ;         ;   ;  ;   ;   ;    
-;   ;   ;  ;   ;         ;   ;  ;   ;   ;    
-;   ;  ;   ;   ;         ;   ;  ;   ;   ;   ;
-;  ;;;;     ;;;         ;;; ;;;  ;;;     ;;; 
-;                                            
-;                                            
-;                                            
-;                                            
-;                                            
-;                                            
-;                ;;        ;      ;;;        
-;    ;            ;              ;           
-;   ;;;;;   ;;;   ; ;;   ;;;    ;;;;; ;;; ;;;
-;    ;     ;   ;  ;;  ;    ;     ;     ;   ; 
-;    ;      ;;;;  ;   ;    ;     ;      ;  ; 
-;    ;     ;   ;  ;   ;    ;     ;      ; ;  
-;    ;   ; ;   ;  ;   ;    ;     ;       ;;  
-;     ;;;   ;;;;;;;;;;   ;;;;;  ;;;;;    ;   
-;                                        ;   
-;                                      ;;;;  
-;                                            
-;                                            
-;                                                                 
-;                                                                 
-;         ;;        ;                    ;;;    ;     ;;          
-;    ;     ;                            ;              ;          
-;   ;;;;;  ; ;;   ;;;     ;;;;         ;;;;;  ;;;      ;     ;;;  
-;    ;     ;;  ;    ;    ;   ;          ;       ;      ;    ;   ; 
-;    ;     ;   ;    ;     ;;;           ;       ;      ;    ;;;;; 
-;    ;     ;   ;    ;        ;          ;       ;      ;    ;     
-;    ;   ; ;   ;    ;    ;   ;          ;       ;      ;    ;     
-;     ;;; ;;; ;;; ;;;;;  ;;;;          ;;;;;  ;;;;;  ;;;;;   ;;;; 
-;                                                                 
-;                                                                 
-;                                                                 
-;                                                                 
-
-
-(module lw-test racket/base
-  (require "test-util.rkt"
-           redex/private/loc-wrapper
-           "lw-test-util.rkt"
-           (only-in redex/pict to-lw/stx))
-  
-  (reset-count)
-  
-  (test (normalize-lw (to-lw ()))
-        (build-lw (list (build-lw "(" 0 0 0 1)
-                        (build-lw ")" 0 0 1 1))
-                  0 0 0 2))
-  
-  (test (normalize-lw (to-lw "x"))
-        (build-lw "“x”" 0 0 0 3))
-  
-  (test (normalize-lw (to-lw "#f"))
-        (build-lw "“#f”" 0 0 0 4))
-  
-  (test (normalize-lw (to-lw #f))
-        (build-lw "#f" 0 0 0 2))
-  
-  (test (normalize-lw (to-lw/uq ()))
-        (make-lw (list (make-lw "(" 0 0 0 1 #t #f)
-                       (make-lw ")" 0 0 1 1 #t #f))
-                 0 0 0 2 #t #f))
-  
-  (test (normalize-lw (to-lw (a)))
-        (build-lw (list (build-lw "(" 0 0 0 1)
-                        (build-lw 'a 0 0 1 1)
-                        (build-lw ")" 0 0 2 1))
-                  0 0 0 3))
-  
-  (test (normalize-lw (to-lw (a
-                              b)))
-        (build-lw (list (build-lw "(" 0 0 0 1)
-                        (build-lw 'a 0 0 1 1)
-                        (build-lw 'b 1 0 1 1)
-                        (build-lw ")" 1 0 2 1))
-                  0 1 0 3))
-  
-  (test (normalize-lw (to-lw (a b)))
-        (build-lw 
-         (list (build-lw "(" 0 0 0 1)
-               (build-lw 'a 0 0 1 1)
-               (build-lw 'b 0 0 3 1)
-               (build-lw ")" 0 0 4 1))
-         0 0 0 5))
-  
-  
-  (test (normalize-lw (to-lw (a
-                              (b c)
-                              d)))
-        (build-lw (list (build-lw "(" 0 0 0 1)
-                        (build-lw 'a 0 0 1 1)
-                        (build-lw 
-                         (list (build-lw "(" 1 0 1 1)
-                               (build-lw 'b 1 0 2 1)
-                               (build-lw 'c 1 0 4 1)
-                               (build-lw ")" 1 0 5 1))
-                         1 0 1 5)
-                        (build-lw 'd 2 0 1 1)
-                        (build-lw ")" 2 0 2 1))
-                  0 2 0 3))
-  
-  (test (normalize-lw (to-lw (abcdefghijkl
-                              b)))
-        (build-lw (list (build-lw "(" 0 0 0 1)
-                        (build-lw 'abcdefghijkl 0 0 1 12)
-                        (build-lw 'b 1 0 1 1)
-                        (build-lw ")" 1 0 2 1))
-                  0 1 0 3))
-  
-  (test (normalize-lw (to-lw ((a b)
-                              c)))
-        (build-lw (list (build-lw "(" 0 0 0 1)
-                        (build-lw 
-                         (list (build-lw "(" 0 0 1 1)
-                               (build-lw 'a 0 0 2 1)
-                               (build-lw 'b 0 0 4 1)
-                               (build-lw ")" 0 0 5 1))
-                         0 0 1 5)
-                        (build-lw 'c 1 0 1 1)
-                        (build-lw ")" 1 0 2 1))
-                  0 1 0 3))
-  
-  (test (normalize-lw (to-lw (aaa bbb
-                                  (ccc
-                              ddd)))) ;; <--- the ddd should be lined up under the aaa
-        (build-lw (list (build-lw "(" 0 0 0 1)
-                                 (build-lw 'aaa 0 0 1 3)
-                                 (build-lw 'bbb 0 0 5 3)
-                                 (build-lw
-                                  (list
-                                   (build-lw "(" 1 0 5 1)
-                                   (build-lw 'ccc 1 0 6 3)
-                                   (build-lw 'ddd 2 0 1 3)
-                                   (build-lw ")" 2 0 4 1))
-                                  1 1 1 4)
-                                 (build-lw ")" 2 0 5 1))
-                           0 2 0 6))
-  
-  (test (normalize-lw          (to-lw (aaa bbb
-                                           (ccc
-                                       ddd          ;; <--- the ddd should be lined up under the aaa
-                                            eee)))) ;; <--- the eee should be lined up under the ccc
-        (build-lw (list (build-lw "(" 0 0 0 1)
-                        (build-lw 'aaa 0 0 1 3)
-                        (build-lw 'bbb 0 0 5 3)
-                        (build-lw
-                         (list
-                          (build-lw "(" 1 0 5 1)
-                          (build-lw 'ccc 1 0 6 3)
-                          (build-lw 'ddd 2 0 1 3)
-                          (build-lw 'eee 3 0 6 3)
-                          (build-lw ")" 3 0 9 1))
-                         1 2 1 9)
-                        (build-lw ")" 3 0 10 1))
-                  0 3 0 11))
-  
-  (test (normalize-lw (to-lw ([{}])))
-        (build-lw (list (build-lw "(" 0 0 0 1)
-                        (build-lw
-                         (list
-                          (build-lw "[" 0 0 1 1)
-                          (build-lw
-                           (list
-                            (build-lw "{" 0 0 2 1)
-                            (build-lw "}" 0 0 3 1))
-                           0 0 2 2)
-                          (build-lw "]" 0 0 4 1))
-                         0 0 1 4)
-                        (build-lw ")" 0 0 5 1))
-                  0 0 0 6))
-  
-  (test (normalize-lw (to-lw ,x))
-        (make-lw
-         (list 
-          (make-lw "" 0 0 0 0 #f #f)
-          'spring
-          (make-lw 'x 0 0 1 1 #t #f))
-         0 0 0 2 #f #f))
-  
-  (test (normalize-lw (to-lw ,@x))
-        (make-lw
-         (list 
-          (make-lw "" 0 0 0 0 #f #f)
-          'spring
-          (make-lw 'x 0 0 2 1 #t #f))
-         0 0 0 3 #f #f))
-  
-  (test (normalize-lw (to-lw 'x))
-        (make-lw
-         (list 
-          (make-lw "'" 0 0 0 1 #f #f)
-          'spring
-          (make-lw 'x 0 0 1 1 #f #f))
-         0 0 0 2 #f #f))
-  
-  (test (normalize-lw (to-lw ,(term x)))
-        (make-lw
-         (list 
-          (make-lw "" 0 0 0 0 #f #f)
-          'spring
-          (make-lw
-           (list 
-            (make-lw "" 0 0 1 0 #t #f) 
-            'spring
-            (make-lw 'x 0 0 7 1 #f #f))
-           0 0 1 7 #t #f))
-         0 0 0 8 #f #f))
-
-  (test (normalize-lw (to-lw (term x)))
-        (build-lw 
-         (list 
-          (build-lw "(" 0 0 0 1)
-          (build-lw 'term 0 0 1 4)
-          (build-lw 'x 0 0 6 1)
-          (build-lw ")" 0 0 7 1))
-         0 0 0 8))
-  
-  (test (normalize-lw (to-lw '(term x)))
-        (build-lw
-         (list 
-          (build-lw "'" 0 0 0 1)
-          'spring
-          (build-lw
-           (list
-            (build-lw "(" 0 0 1 1)
-            (build-lw 'term 0 0 2 4)
-            (build-lw 'x 0 0 7 1)
-            (build-lw ")" 0 0 8 1))
-           0
-           0
-           1
-           8))
-         0 0 0 9))
-  
-  (test (normalize-lw (to-lw ''x))
-        (build-lw
-         (list 
-          (build-lw "'" 0 0 0 1)
-          'spring
-          (build-lw
-           (list
-            (build-lw "'" 0 0 1 1)
-            'spring
-            (build-lw 'x 0 0 2 1))
-           0
-           0
-           1
-           2))
-         0 0 0 3))
-  
-  (test (normalize-lw (to-lw (|+1| x)))
-        (build-lw
-         (list (build-lw "(" 0 0 0 1)
-               (build-lw '|+1| 0 0 1 4)
-               (build-lw 'x 0 0 6 1)
-               (build-lw ")" 0 0 7 1))
-         0 0 0 8))
-  
-  ;; this one seems suspicious: why does the second comma start at 1 instead of 0?
-  ;; rendering seems to work, however, so we'll go with it ..
-  (test (normalize-lw (to-lw ,,x))
-        (build-lw
-         (list 
-          (build-lw "" 0 0 0 0)
-          'spring
-          (make-lw
-           (list
-            (make-lw "," 0 0 1 1 #t #f)
-            'spring
-            (make-lw 'x 0 0 2 1 #t #f))
-           0 0 1 2
-           #t #f))
-         0 0 0 3))
-  
-  (let ([from-str (λ (str) 
-                    (define p (open-input-string str))
-                    (port-count-lines! p)
-                    (read-syntax #f p))])
-    
-    (test (normalize-lw (to-lw/stx (from-str "()")))
-          (normalize-lw (to-lw ())))
-
-    (test (normalize-lw (to-lw/stx (from-str "a")))
-          (normalize-lw (to-lw a)))
-
-    (test (normalize-lw (to-lw/stx (from-str "(c)")))
-          (normalize-lw (to-lw (c))))
-    
-    (test (normalize-lw (to-lw/stx (from-str "((b))")))
-          (normalize-lw (to-lw ((b)))))
-    
-    (test (normalize-lw (to-lw/stx (from-str "(a b c)")))
-          (normalize-lw (to-lw (a b c))))
-    
-    (test (normalize-lw (to-lw/stx (from-str "1")))
-          (normalize-lw (to-lw 1)))
-    
-    (test (normalize-lw (to-lw/stx (from-str "(#t)")))
-          (normalize-lw (to-lw (#t))))
-    
-    (test (normalize-lw (to-lw/stx (from-str "#f")))
-          (normalize-lw (to-lw #f)))
-    
-    (test (normalize-lw (to-lw/stx (from-str "(a b)")))
-          (normalize-lw (to-lw (a b))))
-    
-    (test (normalize-lw (to-lw/stx (from-str "(a ((b)) c 1 #t)")))
-          (normalize-lw (to-lw (a ((b)) c 1 #t))))
-    
-    (test (normalize-lw (to-lw/stx (from-str "(a b . c)")))
-          (normalize-lw (to-lw (a b . c)))))
-  
-  (print-tests-passed "lw-test.rkt"))
-
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/matcher-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/matcher-test.rkt
deleted file mode 100644
index 228631c84e..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/matcher-test.rkt
+++ /dev/null
@@ -1,1056 +0,0 @@
-#lang racket/base
-
-(require redex/private/matcher
-         redex/private/lang-struct
-         (only-in "test-util.rkt" equal/bindings?)
-         (for-syntax racket/base)
-         racket/list)
-
-(module test racket/base)
-
-(error-print-width 500)
-  
-(define (make-test-mtch a b c) (make-mtch a (build-flat-context b) c))
-  
-(define (test)
-  (let-syntax ([this-line (λ (stx) (datum->syntax #'here (syntax-line stx)))])
-    (print-struct #t)
-    (test-empty '(name any any) 1 (list (make-test-mtch (make-bindings (list (make-bind 'any 1))) 1 none)))
-    (test-empty '(name any any) 'true (list (make-test-mtch (make-bindings (list (make-bind 'any 'true))) 'true none)))
-    (test-empty '(name any any) "a" (list (make-test-mtch (make-bindings (list (make-bind 'any "a"))) "a" none)))
-    (test-empty '(name any any) '(a b) (list (make-test-mtch (make-bindings (list (make-bind 'any '(a b)))) '(a b) none)))
-    (test-empty '(name any any) #t (list (make-test-mtch (make-bindings (list (make-bind 'any #t))) #t none)))
-    (test-empty 1 1 (list (make-test-mtch (make-bindings null) 1 none)))
-    (test-empty 1 '() #f)
-    (test-empty 99999999999999999999999999999999999999999999999
-                99999999999999999999999999999999999999999999999
-                (list (make-test-mtch (make-bindings null) 
-                                      99999999999999999999999999999999999999999999999
-                                      none)))
-    (test-empty 99999999999999999999999999999999999999999999999
-                '()
-                #f)
-    (test-empty 'x 'x (list (make-test-mtch (make-bindings null) 'x none)))
-    (test-empty 'x '() #f)
-    (test-empty 1 2 #f)
-    (test-empty "a" "b" #f)
-    (test-empty "a" '(x) #f)
-    (test-empty "a" '() #f)
-    (test-empty "a" "a" (list (make-test-mtch (make-bindings null) "a" none)))
-    (test-empty #s(x 1) #s(x 1) (list (make-test-mtch (make-bindings null) #s(x 1) none)))
-    (test-empty #s(x 1) #s(x 2) #f)
-    (test-empty '(name number number) 1 (list (make-test-mtch (make-bindings (list (make-bind 'number 1))) 1 none)))
-    (test-empty 'number 'x #f)
-    (test-empty 'number '() #f)
-    (test-empty '(name natural natural) 1 (list (make-test-mtch (make-bindings (list (make-bind 'natural 1))) 1 none)))
-    (test-empty 'natural 'x #f)
-    (test-empty 'natural '() #f)
-    (test-empty 'natural -1 #f)
-    (test-empty 'natural 1.0 #f)
-    (test-empty '(name integer integer) -1 (list (make-test-mtch (make-bindings (list (make-bind 'integer -1))) -1 none)))
-    (test-empty 'integer 'x #f)
-    (test-empty 'integer '() #f)
-    (test-empty 'integer 1.0 #f)
-    (test-empty '(name real real) 1.1 (list (make-test-mtch (make-bindings (list (make-bind 'real 1.1))) 1.1 none)))
-    (test-empty 'real 'x #f)
-    (test-empty 'real '() #f)
-    (test-empty 'real 2+3i #f)
-    (test-empty 'boolean #t (list (make-test-mtch (make-bindings (list)) #t none)))
-    (test-empty 'boolean #f (list (make-test-mtch (make-bindings (list)) #f none)))
-    (test-empty 'boolean 'x #f)
-    (test-empty '(name string string) "a" (list (make-test-mtch (make-bindings (list (make-bind 'string "a"))) "a" none)))
-    (test-empty 'string 1 #f)
-    (test-empty 'string '() #f)
-    (test-empty '(name variable variable) 'x (list (make-test-mtch (make-bindings (list (make-bind 'variable 'x))) 'x none)))
-    (test-empty 'variable 1 #f)
-    (test-empty '(variable-except x) 1 #f)
-    (test-empty '(variable-except x) 'x #f)
-    (test-empty '(variable-except x) 'y (list (make-test-mtch (make-bindings null) 'y none)))
-    (test-lang (this-line)
-               '(name x (nt x))
-               'y
-               (list (make-mtch (make-bindings (list (make-bind 'x 'y))) 'y none))
-               (list (make-nt 'x (list (make-rhs '(variable-except x))))))
-    (test-empty '(variable-prefix x:) 'x: (list (make-test-mtch (make-bindings null) 'x: none)))
-    (test-empty '(variable-prefix x:) 'x:x (list (make-test-mtch (make-bindings null) 'x:x none)))
-    (test-empty '(variable-prefix x:) ': #f)
-    (test-empty '(variable-prefix x:) '() #f)
-    
-    (test-empty 'hole 1 #f)
-    (test-empty 'hole
-                the-hole
-                (list (make-test-mtch (make-bindings (list)) the-hole none)))
-    (test-empty '(in-hole (list hole 2) 1)
-                '(1 2)
-                (list (make-test-mtch (make-bindings (list)) `(1 2) none)))
-    
-    (test-empty '(in-hole (name E_1 (list (hide-hole hole) hole)) x)
-                `(,the-hole x)
-                (list (make-test-mtch (make-bindings (list (make-bind 'E_1 `(,the-not-hole ,the-hole)))) 
-                                      `(,the-hole x)
-                                      none)))
-    
-    (test-empty '(name x (name number number)) 1 (list (make-test-mtch (make-bindings (list (make-bind 'x 1) (make-bind 'number 1))) 1 none)))
-    (test-empty '(name number_x number) 1 (list (make-test-mtch (make-bindings (list (make-bind 'number_x 1))) 1 none)))
-    (test-empty '(name string_y string) "b" (list (make-test-mtch (make-bindings (list (make-bind 'string_y "b"))) "b" none)))
-    (test-empty '(name any_z any) '(a b) (list (make-test-mtch (make-bindings (list (make-bind 'any_z '(a b)))) '(a b) none)))
-    
-    (test-empty '(mismatch-name x_!_1 (name number number)) 1 (list (make-test-mtch (make-bindings (list (make-bind 'number 1))) 1 none)))
-    (test-empty '(list (mismatch-name x_!_1 (name number number)) (mismatch-name x_!_1 number)) '(1 1) #f)
-    (test-empty '(list (mismatch-name x_!_1 (name number_a number)) (mismatch-name x_!_1 (name number_b number))) '(1 2) 
-                (list (make-test-mtch (make-bindings (list (make-bind 'number_a 1)
-                                                           (make-bind 'number_b 2)))
-                                      '(1 2) 
-                                      none)))
-    (test-empty '(list (mismatch-name number_!_1 number) (mismatch-name number_!_1 number)) '(1 1) #f)
-    (test-empty '(list (mismatch-name number_!_1 number) (mismatch-name number_!_1 number)) '(1 2) (list (make-test-mtch (make-bindings (list)) '(1 2) none)))
-    (test-empty '(list (repeat (mismatch-name number_!_1 number) #f #f)) '(1 2) (list (make-test-mtch (make-bindings (list)) '(1 2) none)))
-    (test-empty '(list (repeat (mismatch-name number_!_1 number) #f #f)) '(1 2 3 4 5) (list (make-test-mtch (make-bindings (list)) '(1 2 3 4 5) none)))
-    (test-empty '(list (repeat (mismatch-name number_!_1 number) #f #f))
-                '(1 2 3 4 5)
-                (list (make-test-mtch (make-bindings (list)) '(1 2 3 4 5) none)))
-    (test-empty '(list (repeat (mismatch-name number_!_1 number) #f #f))
-                '(1 2 3 1 5)
-                #f)
-    (test-empty '(list (list (repeat (mismatch-name number_!_1 number) #f #f)) (list (repeat number_!_1 #f #f))) 
-                '((1 2 3 1 5) (1 2 3 1 5))
-                #f)
-    (test-empty '(list (list (repeat (mismatch-name number_!_1 number) #f #f))
-                       (list (repeat (mismatch-name number_!_1 number) #f #f))) 
-                '((17 2 3 1 5) (1 2 3 1 5))
-                #f)
-    (test-empty '(list (list (list (repeat (mismatch-name number_!_1 number) #f #f)))
-                       (list (list (repeat (mismatch-name number_!_1 number) #f #f))))
-                '(((1 2)) ((3 4)))
-                (list (make-test-mtch (make-bindings (list)) '(((1 2)) ((3 4))) none)))
-    (test-empty '(list (list (list (repeat (mismatch-name number_!_1 number) #f #f)))
-                       (list (list (repeat (mismatch-name number_!_1 number) #f #f))))
-                '(((1 2)) ((3 1)))
-                #f)
-    (test-empty '(list (repeat (list (mismatch-name number_!_1 number) (mismatch-name number_!_1 number)) #f #f) 
-                       (repeat (mismatch-name number_!_1 number) #f #f)) 
-                '((1 1) (2 2) 1 3)
-                #f)
-    (test-empty '(list (repeat (list (mismatch-name number_!_1 number) (mismatch-name number_!_1 number)) #f #f)
-                       (repeat (mismatch-name number_!_1 number) #f #f))
-                '((1 1) (2 3) 1 2)
-                #f)
-    (test-empty '(list (repeat (list (mismatch-name number_!_1 number) (mismatch-name number_!_1 number)) #f #f)
-                       (repeat (mismatch-name number_!_1 number) #f #f))
-                '((1 1) (2 3) 1 4)
-                #f)
-    (test-empty '(list (repeat (list (mismatch-name number_!_1 number) (mismatch-name number_!_1 number)) #f #f)
-                       (repeat (mismatch-name number_!_1 number) #f #f))
-                '((1 2) (3 4) 5 6)
-                (list (make-test-mtch (make-bindings (list)) '((1 2) (3 4) 5 6) none)))
-    (test-empty '(list (repeat (mismatch-name number_!_1 number) #f #f))
-                '()
-                (list (make-test-mtch (make-bindings (list)) '() none)))
-    
-    (test-empty '(list (repeat (name x_1 1) ..._1 ..._!_1)
-                       (repeat (name x_1 1) ..._1 #f)
-                       (repeat (name x_2 2) ..._2 ..._!_1)
-                       (repeat (name x_2 2) ..._2 #f))
-                '(1 1 2 2)
-                #f)
-    (test-empty '(list (repeat (name x_1 1) ..._1 ..._!_1)
-                       (repeat (name x_1 1) ..._1 #f)
-                       (repeat (name x_2 2) ..._2 ..._!_1)
-                       (repeat (name x_2 2) ..._2 #f))
-                '(1 1 2 2 2)
-                #f)
-    (test-empty '(list (repeat (name x_1 1) ..._1 ..._!_1)
-                       (repeat (name x_1 1) ..._1 #f)
-                       (repeat (name x_2 2) ..._2 ..._!_1)
-                       (repeat (name x_2 2) ..._2 #f))
-                '(1 1 1 2 2)
-                #f)
-    (test-empty '(list (repeat (name x_1 1) ..._1 ..._!_1)
-                       (repeat (name x_1 1) ..._1 #f)
-                       (repeat (name x_2 2) ..._2 ..._!_1)
-                       (repeat (name x_2 2) ..._2 #f))
-                '(1 1 1 1 2 2)
-                (list (make-mtch (make-bindings (list (make-bind 'x_1 '(1 1))
-                                                      (make-bind 'x_2 '(2))
-                                                      (make-bind '..._2 1)
-                                                      (make-bind '..._1 2)))
-                                 '(1 1 1 1 2 2)
-                                 none)))
-    
-    (test-ellipses '(a) '(a))
-    (test-ellipses '((repeat a #f #f)) `(,(make-repeat 'a '() #f #f)))
-    (test-ellipses '((repeat (list (repeat a #f #f)) #f #f)) `(,(make-repeat '(list (repeat a #f #f)) '() #f #f)))
-    (test-ellipses '((repeat a #f #f) b (repeat c #f #f)) `(,(make-repeat 'a '() #f #f) b ,(make-repeat 'c '() #f #f)))
-    (test-ellipses '((repeat (name x a) #f #f)) `(,(make-repeat '(name x a) (list (make-bind 'x '())) #f #f))) 
-    (test-ellipses '((repeat (name x (list (repeat a #f #f))) #f #f))
-                   `(,(make-repeat '(name x (list (repeat a #f #f))) (list (make-bind 'x '())) #f #f)))
-    (test-ellipses '((repeat (list (repeat (name x a) #f #f)) #f #f))
-                   `(,(make-repeat '(list (repeat (name x a) #f #f)) (list (make-bind 'x '())) #f #f)))
-    (test-ellipses '((repeat (list 1 (name x a)) #f #f))
-                   `(,(make-repeat '(list 1 (name x a)) (list (make-bind 'x '())) #f #f)))
-    (test-ellipses '((repeat (list (name any any) (name x a)) #f #f))
-                   `(,(make-repeat '(list (name any any) (name x a)) 
-                                        (list (make-bind 'any '())
-                                              (make-bind 'x '())) 
-                                        #f #f)))
-    (test-ellipses '((repeat (list (name number number) (name x a)) #f #f))
-                   `(,(make-repeat '(list (name number number) (name x a)) 
-                                   (list (make-bind 'number '())
-                                         (make-bind 'x '()))
-                                   #f #f)))
-    (test-ellipses '((repeat (list (name variable variable) (name x a)) #f #f))
-                   `(,(make-repeat '(list (name variable variable) (name x a))
-                                        (list (make-bind 'variable '())
-                                              (make-bind 'x '()))
-                                        #f #f)))
-    (test-ellipses '((repeat (list (name x a) (name y b)) #f #f))
-                   `(,(make-repeat '(list (name x a) (name y b)) (list (make-bind 'x '()) (make-bind 'y '())) #f #f)))
-    
-    (test-ellipses '((repeat (name x (name y b)) #f #f))
-                   `(,(make-repeat '(name x (name y b)) (list (make-bind 'x '()) (make-bind 'y '())) #f #f)))
-    (test-ellipses '((repeat (in-hole (name x a) (name y b)) #f #f))
-                   `(,(make-repeat '(in-hole (name x a) (name y b)) 
-                                   (list (make-bind 'y '()) (make-bind 'x '())) 
-                                   #f #f)))
-    
-    (test-ellipses '((repeat a ..._1 #f))
-                   `(,(make-repeat 'a (list) '..._1 #f)))
-    (test-ellipses '((repeat a #f ..._!_1))
-                   `(,(make-repeat 'a (list) #f '..._!_1)))
-    
-    (test-empty '(list) '() (list (make-test-mtch (make-bindings null) '() none)))
-    (test-empty '(list a) '(a) (list (make-test-mtch (make-bindings null) '(a) none)))
-    (test-empty '(list a) '(b) #f)
-    (test-empty '(list a b) '(a b) (list (make-test-mtch (make-bindings null) '(a b) none)))
-    (test-empty '(list a b) '(a c) #f)
-    (test-empty '(list) 1 #f)
-    (test-empty '(list #f x) '(#f x) (list (make-test-mtch (make-bindings null) '(#f x) none)))
-    (test-empty '(list #f (name y any)) '(#f) #f)
-    (test-empty '(in-hole (list z hole) a) '(z a) (list (make-test-mtch (make-bindings (list)) '(z a) none)))
-    (test-empty '(in-hole (list z hole) (in-hole (list x hole) a)) 
-                '(z (x a))
-                (list (make-test-mtch (make-bindings (list)) '(z (x a)) none)))
-    
-    (run-test/cmp (this-line)
-                  'in-hole-zero-holes 
-                  (with-handlers ([exn:fail? (λ (e) (regexp-match #rx"no hole" (exn-message e)))])
-                    (test-empty '(in-hole (list 1 2) 2) '(1 2) 'never-gets-here)
-                    'should-have-raised-an-exception)
-                  '("no hole")
-                  equal?)
-                
-    
-    (test-empty '(in-hole (in-hole (list x hole) hole) y)
-                '(x y)
-                (list (make-test-mtch (make-bindings (list)) '(x y) none)))
-    
-    (test-empty '(list (name number number) (name number number)) '(1 1) (list (make-test-mtch (make-bindings (list (make-bind 'number 1))) '(1 1) none)))
-    (test-empty '(list (name x (name number number)) (name x (name number number)))
-                '(1 1)
-                (list (make-test-mtch (make-bindings (list (make-bind 'x 1) (make-bind 'number 1))) '(1 1) none)))
-    (test-empty '(list (name x (name number_q number)) (name x (name number_r number)))
-                '(1 1)
-                (list (make-test-mtch (make-bindings (list (make-bind 'x 1) 
-                                                           (make-bind 'number_q 1)
-                                                           (make-bind 'number_r 1)))
-                                      '(1 1)
-                                      none)))
-    (test-empty '(list (name number number) (name number number)) '(1 2) #f)
-    (test-empty '(list (name x number) (name x number)) '(1 2) #f)
-    (test-empty '(list (name x number_q) (name x number_r)) '(1 2) #f)
-    
-    (test-empty '(list (repeat a #f #f)) '() (list (make-test-mtch (make-bindings empty) '() none)))
-    (test-empty '(list (repeat a #f #f)) '(a) (list (make-test-mtch (make-bindings empty) '(a) none)))
-    (test-empty '(list (repeat a #f #f)) '(a a) (list (make-test-mtch (make-bindings empty) '(a a) none)))
-    (test-empty '(list (repeat (name x a) #f #f)) '() (list (make-test-mtch (make-bindings (list (make-bind 'x '()))) '() none)))
-    (test-empty '(list (repeat (name x a) #f #f)) '(a) (list (make-test-mtch (make-bindings (list (make-bind 'x '(a)))) '(a) none)))
-    (test-empty '(list (repeat (name x a) #f #f)) '(a a) (list (make-test-mtch (make-bindings (list (make-bind 'x '(a a)))) '(a a) none)))
-    (test-empty '(list (repeat hole #f #f)) '() (list (make-test-mtch (make-bindings empty) '() none)))
-    
-    (test-empty '(list (repeat b #f #f) (repeat a #f #f)) '() (list (make-test-mtch (make-bindings empty) '() none)))
-    (test-empty '(list (repeat b #f #f) (repeat a #f #f)) '(a) (list (make-test-mtch (make-bindings empty) '(a) none)))
-    (test-empty '(list (repeat b #f #f) (repeat a #f #f)) '(b) (list (make-test-mtch (make-bindings empty) '(b) none)))
-    (test-empty '(list (repeat b #f #f) (repeat a #f #f)) '(b a) (list (make-test-mtch (make-bindings empty) '(b a) none)))
-    (test-empty '(list (repeat b #f #f) (repeat a #f #f)) '(b b a a) (list (make-test-mtch (make-bindings empty) '(b b a a) none)))
-    (test-empty '(list (repeat b #f #f) (repeat a #f #f)) '(a a) (list (make-test-mtch (make-bindings empty) '(a a) none)))
-    (test-empty '(list (repeat b #f #f) (repeat a #f #f)) '(b b) (list (make-test-mtch (make-bindings empty) '(b b) none)))
-    
-    (test-empty '(list (repeat a ..._1 #f) (repeat a ..._2 #f)) 
-                '(a) 
-                (list (make-test-mtch (make-bindings (list (make-bind '..._1 1) (make-bind '..._2 0))) '(a) none)
-                      (make-test-mtch (make-bindings (list (make-bind '..._1 0) (make-bind '..._2 1))) '(a) none)))
-    (test-empty '(list (repeat a ..._1 #f) (repeat a ..._1 #f)) '(a) #f)
-    (test-empty '(list (repeat a ..._1 #f) (repeat a ..._1 #f))
-                '(a a) 
-                (list (make-test-mtch (make-bindings (list (make-bind '..._1 1))) '(a a) none)))
-    
-    (test-empty '(list (repeat (list (repeat a ..._1 #f) (repeat a ..._1 #f)) #f #f))
-                '((a a a a)) 
-                (list (make-test-mtch (make-bindings (list (make-bind '..._1 '(2)))) '((a a a a)) none)))
-    (test-empty '(list (repeat (list (repeat a #f ..._!_1) (repeat a #f ..._!_1)) #f #f))
-                '((a a a a)) 
-                (list (make-test-mtch (make-bindings '()) '((a a a a)) none)
-                      (make-test-mtch (make-bindings '()) '((a a a a)) none)
-                      (make-test-mtch (make-bindings '()) '((a a a a)) none)
-                      (make-test-mtch (make-bindings '()) '((a a a a)) none)))
-
-    (test-empty '(list (repeat (name x a) #f ..._!_1) (repeat (name y a) #f ..._!_1)) 
-                '(a a) 
-                (list (make-test-mtch (make-bindings (list (make-bind 'x '()) (make-bind 'y '(a a)))) '(a a) none)
-                      (make-test-mtch (make-bindings (list (make-bind 'x '(a a)) (make-bind 'y '()))) '(a a) none)))
-    
-    (test-empty '(list (repeat (name y b) #f #f) (repeat (name x a) #f #f)) '() 
-                (list (make-test-mtch (make-bindings (list (make-bind 'x '())
-                                                      (make-bind 'y '())))
-                                 '()
-                                 none)))
-    (test-empty '(list (repeat (name y b) #f #f) (repeat (name x a) #f #f)) '(a)
-                (list (make-test-mtch (make-bindings (list (make-bind 'x '(a))
-                                                      (make-bind 'y '())))
-                                 '(a)
-                                 none)))
-    (test-empty '(list (repeat (name y b) #f #f) (repeat (name x a) #f #f)) '(b) 
-                (list (make-test-mtch (make-bindings (list (make-bind 'x '())
-                                                      (make-bind 'y '(b))))
-                                 '(b)
-                                 none)))
-    (test-empty '(list (repeat (name y b) #f #f) (repeat (name x a) #f #f)) '(b b a a) 
-                (list (make-test-mtch (make-bindings (list (make-bind 'x '(a a))
-                                                      (make-bind 'y '(b b))))
-                                 '(b b a a)
-                                 none)))
-    (test-empty '(list (repeat (name y a) #f #f) (repeat (name x a) #f #f)) '(a) 
-                (list (make-test-mtch (make-bindings (list (make-bind 'x '())
-                                                      (make-bind 'y '(a))))
-                                 '(a)
-                                 none)
-                      (make-test-mtch (make-bindings (list (make-bind 'x '(a))
-                                                      (make-bind 'y '())))
-                                 '(a)
-                                 none)))
-    (test-empty '(list (repeat (name y a) #f #f) (repeat (name x a) #f #f)) '(a a) 
-                (list (make-test-mtch (make-bindings (list (make-bind 'x '())
-                                                      (make-bind 'y '(a a))))
-                                 '(a a)
-                                 none)
-                      (make-test-mtch (make-bindings (list (make-bind 'x '(a))
-                                                      (make-bind 'y '(a))))
-                                 '(a a)
-                                 none)
-                      (make-test-mtch (make-bindings (list (make-bind 'x '(a a))
-                                                      (make-bind 'y '())))
-                                 '(a a)
-                                 none)))
-    
-    (test-ab (this-line)
-             '(list (repeat (name bb_y (nt bb)) #f #f) (repeat (name aa_x (nt aa)) #f #f))
-             '() 
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '())
-                                                        (make-bind 'bb_y '())))
-                                   '()
-                                   none)))
-    (test-ab (this-line)
-             '(list (repeat (name bb_y (nt bb)) #f #f) (repeat (name aa_x (nt aa)) #f #f))
-             '(a)
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '(a))
-                                                   (make-bind 'bb_y '())))
-                              '(a) 
-                              none)))
-    (test-ab (this-line)
-             '(list (repeat (name bb_y (nt bb)) #f #f) (repeat (name aa_x (nt aa)) #f #f))
-             '(b) 
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '())
-                                                   (make-bind 'bb_y '(b))))
-                              '(b)
-                              none)))
-    (test-ab (this-line)
-             '(list (repeat (name bb_y (nt bb)) #f #f) (repeat (name aa_x (nt aa)) #f #f))
-             '(b b a a) 
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '(a a))
-                                                   (make-bind 'bb_y '(b b))))
-                              '(b b a a)
-                              none)))
-    (test-ab (this-line)
-             '(list (repeat (name aa_y (nt aa)) #f #f) (repeat (name aa_x (nt aa)) #f #f))
-             '(a) 
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '())
-                                                   (make-bind 'aa_y '(a))))
-                              '(a)
-                              none)
-                   (make-test-mtch (make-bindings (list (make-bind 'aa_x '(a))
-                                                   (make-bind 'aa_y '())))
-                              '(a)
-                              none)))
-    (test-ab (this-line)
-             '(list (repeat (name aa_y (nt aa)) #f #f) (repeat (name aa_x (nt aa)) #f #f))
-             '(a a) 
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa_x '())
-                                                   (make-bind 'aa_y '(a a))))
-                              '(a a)
-                              none)
-                   (make-test-mtch (make-bindings (list (make-bind 'aa_x '(a))
-                                                   (make-bind 'aa_y '(a))))
-                              '(a a)
-                              none)
-                   (make-test-mtch (make-bindings (list (make-bind 'aa_x '(a a))
-                                                   (make-bind 'aa_y '())))
-                              '(a a)
-                              none)))
-    
-    (test-empty '(list (repeat (name x (name number number)) #f #f))
-                '(1 2)
-                (list (make-test-mtch (make-bindings (list (make-bind 'x '(1 2)) (make-bind 'number '(1 2)))) '(1 2) none)))
-    
-    (test-empty '(list (repeat a #f #f)) '(b) #f)
-    (test-empty '(list (repeat a #f #f) (repeat b #f #f)) '(c) #f)
-    (test-empty '(list (repeat a #f #f) b) '(b c) #f)
-    (test-empty '(list (repeat a #f #f) b) '(a b c) #f)
-    
-    (test-lang (this-line)
-               '(list (name n (nt n)) (repeat (name n (nt n)) #f #f))
-               '((1 1) 1 1)
-               (list (make-mtch (make-bindings (list (make-bind 'n '(1 1)))) '((1 1) 1 1) none))
-               (list (make-nt 'n (list (make-rhs 'any) (make-rhs 'number)))))
-    (test-lang (this-line)
-               '(list (name n (nt n)) (list (repeat (name n (nt n)) #f #f)))
-               '((1 1) (1 1))
-               (list (make-mtch (make-bindings (list (make-bind 'n '(1 1)))) '((1 1) (1 1)) none))
-               (list (make-nt 'n (list (make-rhs 'any) (make-rhs 'number)))))
-    (test-empty '(list (name x (name any any)) 
-                       (list (repeat (name x (name number number)) #f #f)))
-                '((1 1) (1 1))
-                (list (make-test-mtch (make-bindings (list (make-bind 'x '(1 1))
-                                                           (make-bind 'any '(1 1))
-                                                           (make-bind 'number '(1 1))))
-                                      '((1 1) (1 1)) 
-                                      none)))
-    
-    (test-empty '(list (repeat (list variable_1 variable_1) #f #f))
-                '((x y))
-                #f)
-    
-    (test-empty '(list (repeat (name number number) #f #f)) '()
-                (list (make-test-mtch (make-bindings (list (make-bind 'number '()))) '() none)))
-    (test-ab (this-line)
-             '(list (repeat (name aa aa) #f #f))
-             '()
-             (list (make-test-mtch (make-bindings (list (make-bind 'aa '()))) '() none)))
-    
-    
-    ;; testing block-in-hole
-    (test-empty '(hide-hole a) 'b #f)
-    (test-empty '(hide-hole a) 'a (list (make-test-mtch (make-bindings '()) 'a none)))
-    (test-empty '(hide-hole a) '(block-in-hole a) #f)
-    (test-empty '(in-hole (list x hole) 1) '(x 1) (list (make-test-mtch (make-bindings '()) '(x 1) none)))
-    (test-empty '(in-hole (list hole (hide-hole hole)) junk)
-                '(junk junk2)
-                #f)
-    
-    (test-xab '(name lsts (nt lsts)) '() (list (make-test-mtch (make-bindings (list (make-bind 'lsts '()))) '() none)))
-    (test-xab '(name lsts (nt lsts)) '(x) (list (make-test-mtch (make-bindings (list (make-bind 'lsts '(x)))) '(x) none)))
-    (test-xab '(name lsts (nt lsts)) 'x (list (make-test-mtch (make-bindings (list (make-bind 'lsts 'x))) 'x none)))
-    (test-xab '(name lsts (nt lsts)) #f (list (make-test-mtch (make-bindings (list (make-bind 'lsts #f))) #f none)))
-    (test-xab '(name split-out (nt split-out)) '1 (list (make-test-mtch (make-bindings (list (make-bind 'split-out 1))) '1 none)))
-
-    (test-xab '(name exp (nt exp)) 1 (list (make-test-mtch (make-bindings (list (make-bind 'exp 1))) 1 none)))
-    (test-xab '(name exp (nt exp)) '(+ 1 2) (list (make-test-mtch (make-bindings (list (make-bind 'exp '(+ 1 2)))) '(+ 1 2) none)))
-    (test-xab '(in-hole (name ctxt (nt ctxt)) (name any any))
-              '1
-              (list (make-test-mtch (make-bindings (list (make-bind 'ctxt the-hole) (make-bind 'any 1))) 1 none)))
-    (test-xab '(in-hole (name ctxt (nt ctxt)) (name x (name any any)))
-              '1
-              (list (make-test-mtch (make-bindings (list (make-bind 'ctxt the-hole) (make-bind 'x 1) (make-bind 'any 1))) 1 none)))
-    (test-xab '(in-hole (name c (name ctxt (nt ctxt))) (name x (name any any)))
-              '(+ 1 2)
-              (list (make-test-mtch (make-bindings (list (make-bind 'ctxt (build-context the-hole))
-                                                         (make-bind 'c (build-context the-hole))
-                                                         (make-bind 'x '(+ 1 2))
-                                                         (make-bind 'any '(+ 1 2))))
-                                    '(+ 1 2) none)
-                    (make-test-mtch (make-bindings (list (make-bind 'ctxt (build-context `(+ ,the-hole 2)))
-                                                         (make-bind 'c (build-context `(+ ,the-hole 2)))
-                                                         (make-bind 'x 1)
-                                                         (make-bind 'any 1)))
-                                    '(+ 1 2) none)
-                    (make-test-mtch (make-bindings (list (make-bind 'ctxt (build-context `(+ 1 ,the-hole)))
-                                                         (make-bind 'c (build-context `(+ 1 ,the-hole)))
-                                                         (make-bind 'x 2)
-                                                         (make-bind 'any 2))) 
-                                    '(+ 1 2) none)))
-    (test-xab '(in-hole (name c (name ctxt (nt ctxt))) (name i (list + (name number_1 number) (name number_2 number))))
-              '(+ (+ 1 2) (+ 3 4))
-              (list (make-test-mtch 
-                     (make-bindings (list (make-bind 'i '(+ 1 2))
-                                          (make-bind 'number_1 1)
-                                          (make-bind 'number_2 2)
-                                          (make-bind 'ctxt (build-context `(+ ,the-hole (+ 3 4))))
-                                          (make-bind 'c (build-context `(+ ,the-hole (+ 3 4))))))
-                     '(+ (+ 1 2) (+ 3 4))
-                     none)
-                    (make-test-mtch (make-bindings (list (make-bind 'i '(+ 3 4)) 
-                                                         (make-bind 'number_1 3)
-                                                         (make-bind 'number_2 4)
-                                                         (make-bind 'ctxt `(+ (+ 1 2) ,the-hole))
-                                                         (make-bind 'c `(+ (+ 1 2) ,the-hole))))
-                               '(+ (+ 1 2) (+ 3 4))
-                               none)))
-    
-    (test-empty '(in-hole (list (list z hole)) (name x (name any any)))
-                '((z a))
-                (list (make-test-mtch (make-bindings (list (make-bind 'x 'a) (make-bind 'any 'a))) '((z a)) none)))
-    (test-empty '(in-hole (name c (list (repeat z #f #f) hole (repeat z #f #f))) (name any any))
-                '(z z)
-                (list 
-                 (make-test-mtch (make-bindings (list (make-bind 'c `(z ,the-hole)) (make-bind 'any 'z))) '(z z) none)
-                 (make-test-mtch (make-bindings (list (make-bind 'c `(,the-hole z)) (make-bind 'any 'z))) '(z z) none)))
-    (test-empty '(in-hole (name c (list (repeat z #f #f) hole (repeat z #f #f))) (name any any))
-                '(z z z)
-                (list 
-                 (make-test-mtch (make-bindings (list (make-bind 'c `(z z ,the-hole)) (make-bind 'any 'z))) '(z z z) none)
-                 (make-test-mtch (make-bindings (list (make-bind 'c `(z ,the-hole z)) (make-bind 'any 'z))) '(z z z) none)
-                 (make-test-mtch (make-bindings (list (make-bind 'c `(,the-hole z z)) (make-bind 'any 'z))) '(z z z) none)))
-    
-    (test-empty '(list z (in-hole (name c (list z hole)) a))
-                '(z (z a))
-                (list 
-                 (make-test-mtch (make-bindings (list (make-bind 'c `(z ,the-hole))))
-                            '(z (z a))
-                            none)))
-    
-    (test-empty '(list a (in-hole (name c1 (list b (in-hole (name c2 (list c hole)) d) hole)) e))
-                '(a (b (c d) e))
-                (list 
-                 (make-test-mtch (make-bindings (list (make-bind 'c2 `(c ,the-hole))
-                                                 (make-bind 'c1 `(b (c d) ,the-hole))))
-                            '(a (b (c d) e))
-                            none)))
-
-    (test-empty '(in-hole (in-hole hole hole) a)
-                'a
-                (list (make-test-mtch (make-bindings (list)) 'a none)))
-    
-    (test-empty '(list a (list b (in-hole (name c1 (in-hole (name c2 (list c hole)) (list d hole))) e)))
-                '(a (b (c (d e))))
-                (list 
-                 (make-test-mtch (make-bindings (list (make-bind 'c1 `(c (d ,the-hole)))
-                                                 (make-bind 'c2 `(c ,the-hole))))
-                            '(a (b (c (d e))))
-                            none)))
-    
-    (test-empty `(list + 1 (side-condition (name any any) ,(lambda (bindings) #t) #t))
-                '(+ 1 b)
-                (list (make-test-mtch (make-bindings (list (make-bind 'any 'b))) '(+ 1 b) none)))
-    (test-empty `(list + 1 (side-condition (name any any) ,(lambda (bindings) #f) #f))
-                '(+ 1 b)
-                #f)
-    
-    (test-empty `(list + 1 (side-condition b ,(lambda (bindings) #t) #t))
-                '(+ 1 b)
-                (list (make-test-mtch (make-bindings '()) '(+ 1 b) none)))
-    (test-empty `(list + 1 (side-condition a ,(lambda (bindings) #t) #t) #t)
-                '(+ 1 b)
-                #f)
-
-    (test-empty `(side-condition (name x (name any any)) ,(lambda (bindings) (eq? (lookup-binding bindings 'x) 'a)) side-condition-srcloc)
-                'a
-                (list 
-                 (make-test-mtch (make-bindings (list (make-bind 'x 'a)
-                                                      (make-bind 'any 'a)))
-                            'a
-                            none)))
-
-    (test-empty `(list + 1 (side-condition (name x (name any any))
-                                           ,(lambda (bindings) (eq? (lookup-binding bindings 'x) 'a)) side-condition-srcloc))
-                '(+ 1 a)
-                (list 
-                 (make-test-mtch (make-bindings (list (make-bind 'x 'a)
-                                                      (make-bind 'any 'a)))
-                            '(+ 1 a)
-                            none)))
-
-    (test-empty `(side-condition (name x any) ,(lambda (bindings) (eq? (lookup-binding bindings 'x) 'a)) (eq? (term x) 'a))
-                'b
-                #f)
-    
-    (test-empty `(list + 1 (side-condition (name x any) ,(lambda (bindings) (eq? (lookup-binding bindings 'x) 'a)) (eq? (term x) 'a)))
-                '(+ 1 b)
-                #f)
-    
-    (test-empty `(side-condition (list (list (repeat any_1 ..._a #f)) (list (repeat any_2 ..._a #f)))
-                                 ,(lambda (bindings) (error 'should-not-be-called))
-                                 (error 'should-not-be-called))
-                '((1 2 3) (4 5))
-                #f)
-    
-    (test-xab '(name exp_1 (nt exp))
-              '(+ 1 2)
-              (list (make-test-mtch (make-bindings (list (make-bind 'exp_1 '(+ 1 2)))) '(+ 1 2) none)))
-    (test-xab '(list (name exp_1 (nt exp)) (name exp_2 (nt exp)))
-              '((+ 1 2) (+ 3 4))
-              (list (make-test-mtch (make-bindings (list (make-bind 'exp_1 '(+ 1 2)) (make-bind 'exp_2 '(+ 3 4))))
-                               '((+ 1 2) (+ 3 4))
-                               none)))
-    (test-xab '(list (name exp_1 (nt exp)) (name exp_1 (nt exp)))
-              '((+ 1 2) (+ 3 4))
-              #f)
-    (test-xab '(name nesting-names (nt nesting-names))
-              'b
-              (list (make-test-mtch (make-bindings (list (make-bind 'nesting-names 'b))) 'b none)))
-    (test-xab '(name nesting-names (nt nesting-names))
-              '(a b)
-              (list (make-test-mtch (make-bindings (list (make-bind 'nesting-names '(a b)))) '(a b) none)))
-    (test-xab '(name nesting-names (nt nesting-names))
-              '(a (a b))
-              (list (make-test-mtch (make-bindings (list (make-bind 'nesting-names '(a (a b))))) '(a (a b)) none)))
-    (test-xab '(list (name x a) (name nesting-names (nt nesting-names)))
-              '(a (a (a b)))
-              (list (make-test-mtch (make-bindings (list (make-bind 'x 'a)
-                                                         (make-bind 'nesting-names '(a (a b)))))
-                                    '(a (a (a b))) none)))
-    (test-xab '(name nesting-names (nt nesting-names))
-              '(a (a (a (a b))))
-              (list (make-test-mtch (make-bindings (list (make-bind 'nesting-names '(a (a (a (a b)))))))
-                                    '(a (a (a (a b)))) none)))
-    
-    (test-xab '(name same-in-nt (nt same-in-nt))
-              '(x x)
-              (list (make-test-mtch (make-bindings (list (make-bind 'same-in-nt '(x x)))) '(x x) none)))
-    (test-xab '(name same-in-nt (nt same-in-nt))
-              '(x y)
-              #f)
-    
-    (test-xab '(in-hole (cross forever-list-forever-list) 1)
-              '(a b c)
-              #f)
-    
-    (test-xab '(in-hole (cross forever-list-forever-list) 1)
-              '(1 x x)
-              (list (make-test-mtch (make-bindings '()) '(1 x x) none)))
-    
-    (test-xab '(in-hole (cross forever-list-forever-list) 1)
-              '(x 1 x)
-              (list (make-test-mtch (make-bindings '()) '(x 1 x) none)))
-    
-    
-    (test-xab '(in-hole (cross simple-simple) g)
-              'g
-              (list (make-mtch (make-bindings (list)) 'g none)))
-    
-    (test-xab '(name var (nt var)) '+ #f)
-    (test-xab '(name var (nt var)) 'anunusedvariable (list (make-mtch (make-bindings (list (make-bind 'var 'anunusedvariable))) 'anunusedvariable none)))
-    (test-xab '(name var (nt var)) 'exp (list (make-mtch (make-bindings (list (make-bind 'var 'exp))) 'exp none)))
-    (test-xab '(name var (nt var)) 'exp_x (list (make-mtch (make-bindings (list (make-bind 'var 'exp_x))) 'exp_x none)))
-    
-    (test-xab '(name underscore (nt underscore)) '(+ 1 2) (list (make-mtch (make-bindings (list (make-bind 'underscore '(+ 1 2)))) '(+ 1 2) none)))
-    (test-xab '(name underscore (nt underscore)) '2 (list (make-mtch (make-bindings (list (make-bind 'underscore 2))) 2 none)))
-  
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;;
-    ;; tests to check on the name/non-name optimization likely
-    ;; many of these are duplicates of the ones above, but it 
-    ;; is hard to know which are and which aren't.
-    ;;
-    
-    (test-xab '(name x (name y 1)) 1 (list (make-mtch (make-bindings (list (make-bind 'x 1) (make-bind 'y 1))) 1 none)))
-    (test-xab '(list (mismatch-name y_!_1 1)
-                     (mismatch-name y_!_1 2))
-              '(1 2)
-              (list (make-mtch (make-bindings '()) '(1 2) none)))
-    (test-xab '(list (mismatch-name x_!_1 (name a 1))
-                     (mismatch-name x_!_1 (name b 2)))
-              '(1 2)
-              (list (make-mtch (make-bindings (list (make-bind 'a 1) (make-bind 'b 2))) '(1 2) none)))
-    (test-xab '(in-hole (name x hole) (name y 1)) 1 (list (make-mtch (make-bindings (list (make-bind 'x the-hole) (make-bind 'y 1)))
-                                                                     1
-                                                                     none)))
-    (test-xab '(in-hole (name x hole) 1) 1 (list (make-mtch (make-bindings (list (make-bind 'x the-hole)))
-                                                            1
-                                                            none)))
-    (test-xab '(in-hole hole (name y 1)) 1 (list (make-mtch (make-bindings (list (make-bind 'y 1)))
-                                                            1
-                                                            none)))
-    (test-xab '(in-hole hole 1) 1 (list (make-mtch (make-bindings '()) 1 none)))
-    (test-xab '(hide-hole (list hole 1)) `(,the-hole 1) (list (make-mtch (make-bindings '()) `(,the-hole 1) none)))
-    (test-xab '(hide-hole (list 2 1)) `(2 1) (list (make-mtch (make-bindings '()) `(2 1) none)))
-    (test-xab '(hide-hole (list (name z 2) 1)) `(2 1) (list (make-mtch (make-bindings (list (make-bind 'z 2))) `(2 1) none)))
-    (test-xab `(side-condition (name x 1) ,(λ (bindings) (equal? bindings (make-bindings (list (make-bind 'x 1))))) 'srcloc)
-              1
-              (list (make-mtch (make-bindings (list (make-bind 'x 1))) 1 none)))
-    (test-xab `(side-condition 2 ,(λ (bindings) (equal? bindings (make-bindings '()))) 'srcloc)
-              2
-              (list (make-mtch (make-bindings '()) 2 none)))
-    (test-xab '(list (repeat (name x 1) #f #f))
-              '(1 1 1)
-              (list (make-mtch (make-bindings (list (make-bind 'x '(1 1 1)))) '(1 1 1) none)))
-    (test-xab '(list (repeat 1 ..._1 #f))
-              '(1 1 1)
-              (list (make-mtch (make-bindings (list (make-bind '..._1 3))) '(1 1 1) none)))
-    (test-xab '(list (repeat 1 #f ..._!_1)
-                     (repeat 2 #f ..._!_1))
-              '(1 1 2)
-              (list (make-mtch (make-bindings '()) '(1 1 2) none)))
-    (test-xab '(list (repeat 1 #f #f))
-              '(1 1 1)
-              (list (make-mtch (make-bindings '()) '(1 1 1) none)))
-    
-    (test-xab '(in-hole (name hh-D (nt hh-D)) whatever)
-              `(,the-hole whatever)
-              (list (make-mtch (make-bindings (list (make-bind 'hh-D (list the-hole the-not-hole))))
-                               `(,the-hole whatever)
-                               none)))
-
-    ;;
-    ;;
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    
-    
-    (run-test
-     (this-line)
-     'compatible-context-language1
-     (build-compatible-context-language
-      (mk-hasheq '((exp . ()) (ctxt . ())))
-      (list (make-nt 'exp
-                     (list (make-rhs '(list + (nt exp) (nt exp)))
-                           (make-rhs 'number)))
-            (make-nt 'ctxt
-                     (list (make-rhs '(list + (nt ctxt) (nt exp)))
-                           (make-rhs '(list + (nt exp) (nt ctxt)))
-                           (make-rhs 'hole)))))
-     (list
-      (make-nt 'ctxt-ctxt
-               (list (make-rhs 'hole)
-                     (make-rhs `(list (hide-hole +) (cross ctxt-ctxt) (hide-hole (nt exp))))
-                     (make-rhs `(list (hide-hole +) (hide-hole (nt ctxt)) (cross ctxt-exp)))
-                     (make-rhs `(list (hide-hole +) (cross ctxt-exp) (hide-hole (nt ctxt))))
-                     (make-rhs `(list (hide-hole +) (hide-hole (nt exp)) (cross ctxt-ctxt)))))
-      (make-nt 'ctxt-exp
-               (list (make-rhs `(list (hide-hole +) (cross ctxt-exp) (hide-hole (nt exp))))
-                     (make-rhs `(list (hide-hole +) (hide-hole (nt exp)) (cross ctxt-exp)))))
-      (make-nt 'exp-ctxt
-               (list (make-rhs `(list (hide-hole +) (cross exp-ctxt) (hide-hole (nt exp))))
-                     (make-rhs `(list (hide-hole +) (hide-hole (nt ctxt)) (cross exp-exp)))
-                     (make-rhs `(list (hide-hole +) (cross exp-exp) (hide-hole (nt ctxt))))
-                     (make-rhs `(list (hide-hole +) (hide-hole (nt exp)) (cross exp-ctxt)))))
-      (make-nt 'exp-exp 
-               (list (make-rhs 'hole) 
-                     (make-rhs `(list (hide-hole +) (cross exp-exp) (hide-hole (nt exp)))) 
-                     (make-rhs `(list (hide-hole +) (hide-hole (nt exp)) (cross exp-exp)))))))
-    
-    (run-test
-     (this-line)
-     'compatible-context-language2
-     (build-compatible-context-language
-      (mk-hasheq '((m . ()) (v . ())))
-      (list (make-nt 'm (list (make-rhs '(list (nt m) (nt m))) (make-rhs '(list + (nt m) (nt m))) (make-rhs '(nt v))))
-            (make-nt 'v (list (make-rhs 'number) (make-rhs '(list lambda (list x) (nt m)))))))
-     (list
-      (make-nt 'v-v (list (make-rhs 'hole) (make-rhs '(list (hide-hole lambda) (hide-hole (list x)) (cross v-m)))))
-      (make-nt 'v-m
-               (list
-                (make-rhs '(list (cross v-m) (hide-hole (nt m))))
-                (make-rhs '(list (hide-hole (nt m)) (cross v-m)))
-                (make-rhs '(list (hide-hole +) (cross v-m) (hide-hole (nt m))))
-                (make-rhs '(list (hide-hole +) (hide-hole (nt m)) (cross v-m)))
-                (make-rhs '(cross v-v))))
-      (make-nt 'm-v (list (make-rhs '(list (hide-hole lambda) (hide-hole (list x)) (cross m-m)))))
-      (make-nt 'm-m
-               (list
-                (make-rhs 'hole)
-                (make-rhs '(list (cross m-m) (hide-hole (nt m))))
-                (make-rhs '(list (hide-hole (nt m)) (cross m-m)))
-                (make-rhs '(list (hide-hole +) (cross m-m) (hide-hole (nt m))))
-                (make-rhs '(list (hide-hole +) (hide-hole (nt m)) (cross m-m)))
-                (make-rhs '(cross m-v))))))
-    
-    (run-test
-     (this-line)
-     'compatible-context-language3
-     (build-compatible-context-language
-      (mk-hasheq '((m . ()) (seven . ())))
-      (list (make-nt 'm (list (make-rhs '(list (nt m) (nt seven) (nt m)))
-                              (make-rhs 'number)))
-            (make-nt 'seven (list (make-rhs 7)))))
-     `(,(make-nt
-         'm-m
-         `(,(make-rhs 'hole) 
-           ,(make-rhs `(list (cross m-m) (hide-hole (nt seven)) (hide-hole (nt m))))
-           ,(make-rhs `(list (hide-hole (nt m)) (hide-hole (nt seven)) (cross m-m)))))
-       ,(make-nt
-         'seven-m
-         `(,(make-rhs `(list (cross seven-m) (hide-hole (nt seven)) (hide-hole (nt m))))
-           ,(make-rhs `(list (hide-hole (nt m)) (cross seven-seven) (hide-hole (nt m))))
-           ,(make-rhs `(list (hide-hole (nt m)) (hide-hole (nt seven)) (cross seven-m)))))
-       ,(make-nt 'seven-seven `(,(make-rhs 'hole)))))
-    
-    (run-test
-     (this-line)
-     'compatible-context-language4
-     (build-compatible-context-language
-      (mk-hasheq '((a . ()) (b . ()) (c . ())))
-      (list (make-nt 'a (list (make-rhs '(nt b))))
-            (make-nt 'b (list (make-rhs '(nt c))))
-            (make-nt 'c (list (make-rhs 3)))))
-     (list (make-nt 'c-c (list (make-rhs 'hole)))
-           (make-nt 'c-b (list (make-rhs '(cross c-c))))
-           (make-nt 'c-a (list (make-rhs '(cross c-b))))
-           (make-nt 'b-b (list (make-rhs 'hole)))
-           (make-nt 'b-a (list (make-rhs '(cross b-b))))
-           (make-nt 'a-a (list (make-rhs 'hole)))))
-    
-    (run-test
-     (this-line)
-     'compatible-context-language5
-     (build-compatible-context-language
-      (mk-hasheq '((a . ()) (b . ()) (c . ())))
-      (list (make-nt 'a (list (make-rhs '1) (make-rhs '2) (make-rhs '3)))
-            (make-nt 'b (list (make-rhs '(nt a))
-                              (make-rhs '(list (name a_1 (nt a)) (mismatch-name b_!_1 (nt b))))))))
-      (list (make-nt 'a-a (list (make-rhs 'hole)))
-            (make-nt 'a-b (list (make-rhs '(cross a-a))
-                                (make-rhs '(list (name a_1 (cross a-a)) (hide-hole (mismatch-name b_!_1 (nt b)))))
-                                (make-rhs '(list (hide-hole (name a_1 (nt a))) (mismatch-name b_!_1 (cross a-b)))))) 
-            (make-nt 'b-b (list (make-rhs 'hole) 
-                                (make-rhs '(list (hide-hole (name a_1 (nt a))) (mismatch-name b_!_1 (cross b-b))))))))
-    
-    (test-ellipsis-binding '(list (repeat (list (name number_1 number) (name number_2 number)) #f #f)) '() '((1 2)))
-    (test-ellipsis-binding '(list (repeat (name x (name number_1 number)) #f #f)) '() '(1 2))
-    (test-ellipsis-binding '(list (repeat (list (list (repeat (name number_1 number) #f #f)) 
-                                                (list (repeat (name number_2 number) #f #f)))
-                                          #f
-                                          #f))
-                           '()
-                           '(((1) (2))))
-    (test-ellipsis-binding '(list (repeat number #f #f) variable) '() '(1 x))
-    (test-ellipsis-binding '(list (repeat (in-hole (name H_1 (nt H)) (name number_1 number)) #f #f)) '((H hole)) '(1 2))
-    
-    (cond
-      [(= failures 0)
-       (printf "matcher-test.rkt: all ~a tests passed.\n" test-count)]
-      [else
-       (eprintf "matcher-test.rkt: ~a test~a failed.\n" 
-                failures
-                (if (= failures 1)
-                    ""
-                    "s"))])))
-
-  ;; mk-hasheq : (listof (cons sym any)) -> hash
-  ;; builds a hash table that has the bindings in assoc-list
-  (define (mk-hasheq assoc-list)
-    (let ([ht (make-hash)])
-      (for-each
-       (lambda (a)
-         (hash-set! ht (car a) (cdr a)))
-       assoc-list)
-      ht))
-  
-  ;; test-empty : sexp[pattern] sexp[term] answer -> void
-  ;; returns #t if pat matching exp with the empty language produces ans.
-  (define-syntax (test-empty stx)
-    (syntax-case stx ()
-      [(_ . args)
-       (with-syntax ([line (syntax-line stx)])
-         #'(test-empty/proc line . args))]))
-  
-  (define (test-empty/proc line pat exp ans)
-    (run-match-test
-     line
-     `(match-pattern (compile-pattern (compile-language 'pict-stuff-not-used '() (hash)) ',pat #t) ',exp)
-     (match-pattern 
-      (compile-pattern (compile-language 'pict-stuff-not-used '() (hash)) pat #t)
-      exp)
-     ans))
-  
-  ;; test-lang : sexp[pattern] sexp[term] answer (list/c nt) -> void
-  ;; returns #t if pat matching exp with the language defined by the given nts
-  (define (test-lang line pat exp ans nts)
-    (let ([nt-map (mk-uf-sets (map (λ (x) (list (nt-name x)))
-                                   nts))])
-      (run-match-test
-       line
-       `(match-pattern (compile-pattern (compile-language 'pict-stuff-not-used ',nts ,nt-map) ',pat #t) ',exp)
-       (match-pattern 
-        (compile-pattern (compile-language 'pict-stuff-not-used nts nt-map) pat #t)
-        exp)
-       ans)))
-  
-  (define xab-lang #f)
-  ;; test-xab : sexp[pattern] sexp[term] answer -> void
-  ;; returns #t if pat matching exp with a simple language produces ans.
-  
-  (define-syntax (test-xab stx)
-    (syntax-case stx ()
-      [(_ . args)
-       (with-syntax ([line (syntax-line stx)])
-         #'(test-xab/proc line . args))]))
-  
-  (define (test-xab/proc line pat exp ans)
-    (unless xab-lang
-      (let ([nts
-             (list (make-nt 'exp
-                            (list (make-rhs '(list + (nt exp) (nt exp)))
-                                  (make-rhs 'number)))
-                   (make-nt 'ctxt
-                            (list (make-rhs '(list + (nt ctxt) (nt exp)))
-                                  (make-rhs '(list + (nt exp) (nt ctxt)))
-                                  (make-rhs 'hole)))
-                   
-                   (make-nt 'ec-one
-                            (list (make-rhs '(list + hole (nt exp)))
-                                  (make-rhs '(list + (nt exp) hole))))
-                   
-                   (make-nt 'same-in-nt (list (make-rhs '(list (name x any) (name x any)))))
-                   
-                   (make-nt 'forever-list (list (make-rhs '(list (nt forever-list) (repeat (nt forever-list) #f #f)))
-                                                (make-rhs 'x)))
-                   
-                   (make-nt 'lsts
-                            (list (make-rhs '(list))
-                                  (make-rhs '(list x))
-                                  (make-rhs 'x)
-                                  (make-rhs '#f)))
-                   (make-nt 'split-out
-                            (list (make-rhs '(nt split-out2))))
-                   (make-nt 'split-out2
-                            (list (make-rhs 'number)))
-                   
-                   (make-nt 'simple (list (make-rhs 'simple-rhs)))
-                   
-                   (make-nt 'nesting-names
-                            (list (make-rhs '(list a (name x (nt nesting-names))))
-                                  (make-rhs 'b)))
-                   (make-nt 'var (list (make-rhs `variable-not-otherwise-mentioned)))
-                   
-                   (make-nt 'underscore (list (make-rhs '(name exp_1 (nt exp)))))
-
-                   (make-nt 'hh-v (list (make-rhs '(hide-hole (nt hh-D)))))
-                   (make-nt 'hh-D (list (make-rhs 'hole) (make-rhs '(list (nt hh-v) (nt hh-D)))))
-                   
-                   )])
-      (set! xab-lang
-            (compile-language 'pict-stuff-not-used
-                              nts
-                              (mk-uf-sets (map (λ (x) (list (nt-name x))) nts))))))
-    (run-match-test
-     line
-     `(match-pattern (compile-pattern xab-lang ',pat #t) ',exp)
-     (match-pattern (compile-pattern xab-lang pat #t) exp)
-     ans))
-  
-  (define ab-lang #f)
-  ;; test-ab : sexp[pattern] sexp[term] answer -> void
-  ;; returns #t if pat matching exp with a simple language produces ans.
-  (define (test-ab line pat exp ans)
-    (unless ab-lang
-      (set! ab-lang
-            (compile-language 
-             'pict-stuff-not-used
-             (list (make-nt 'aa
-                            (list (make-rhs 'a)))
-                   (make-nt 'bb
-                            (list (make-rhs 'b))))
-             (mk-uf-sets '((aa) (bb))))))
-    (run-match-test
-     line
-     `(match-pattern (compile-pattern ab-lang ',pat #t) ',exp)
-     (match-pattern (compile-pattern ab-lang pat #t) exp)
-     ans))
-  
-  ;; test-ellipses : sexp sexp -> void
-  (define-syntax (test-ellipses stx)
-    (syntax-case stx ()
-      [(_ . args)
-       (with-syntax ([line (syntax-line stx)])
-         #'(test-ellipses/proc line . args))]))
-  
-  ;; pats : (listof pat)
-  (define (test-ellipses/proc line pats expected)
-    (run-test
-     line
-     `(rewrite-ellipses ',pats (lambda (x) (values x #f #f)))
-     (let-values ([(compiled-pattern has-hole? has-hide-hole? names) (rewrite-ellipses pats (lambda (x) (values x #f #f '())))])
-       compiled-pattern)
-     expected))
-  
-  ;; test-ellipsis-binding: sexp sexp sexp -> boolean
-  ;; Checks that `extract-empty-bindings' produces bindings in the same order
-  ;; as the matcher, as required by `collapse-single-multiples'
-  (define-syntax (test-ellipsis-binding stx)
-    (syntax-case stx ()
-      [(_ . args)
-       (with-syntax ([line (syntax-line stx)])
-         #'(test-ellipsis-binding/proc line . args))]))
-  
-  (define (test-ellipsis-binding/proc line pat nts/sexp exp)
-    (define (binding-names bindings)
-      (map (λ (b)
-             (cond [(bind? b) (bind-name b)]
-                   [(mismatch-bind? b) (mismatch-bind-name b)]))
-           bindings))
-    (run-test
-     line
-     `(test-ellipsis-binding ,pat)
-     (let ([mtch ((compiled-pattern-cp
-                   (let ([nts (map (λ (nt-def) (nt (car nt-def) (map rhs (cdr nt-def)))) nts/sexp)])
-                     (compile-pattern (compile-language 'pict-stuff-not-used nts 
-                                                        (mk-uf-sets (map (λ (x) (list (nt-name x))) nts)))
-                                      pat #t)))
-                  exp
-                  #t
-                  0)])
-       (if mtch
-           (binding-names
-            (bindings-table-unchecked
-             (mtch-bindings
-              (car mtch))))
-           'failed-to-match))
-     (binding-names (extract-empty-bindings pat))))
-  
-  ;; run-test/cmp : sexp any any (any any -> boolean)
-  ;; compares ans with expected. If failure,
-  ;; prints info about the test and increments failures
-  (define failures 0)
-  (define test-count 0)
-  (define (run-test/cmp line symbolic ans expected cmp?)
-    (set! test-count (+ test-count 1))
-    (cond
-      [(cmp? ans expected)
-       '(printf "passed: line ~a\n" line)]
-      [else 
-       (set! failures (+ failures 1))
-       (eprintf "    test on line ~a\n   input: ~s\nexpected: ~s\n     got: ~s\n"
-                line symbolic expected ans)]))
-  
-  (define (run-test line symbolic ans expected) (run-test/cmp line symbolic ans expected equal/bindings?))
-  
-  ;; run-match-test : sexp got expected
-  ;;   expects both ans and expected to be lists or both to be #f and
-  ;;   compares them using a set-like equality if they are lists
-  (define (run-match-test line symbolic ans expected)
-    (with-handlers ((exn:fail? (λ (x)
-                                 (eprintf "exception raised while running test on line ~a\n" line)
-                                 (raise x))))
-      (run-test/cmp
-       line
-       symbolic ans expected
-       (λ (xs ys)
-         (cond
-           [(and (not xs) (not ys)) #t]
-           [(and (list? xs)
-                 (list? ys))
-            (and (andmap (λ (x) (memf (λ (y) (equal/bindings? x y)) ys)) xs)
-                 (andmap (λ (y) (memf (λ (x) (equal/bindings? x y)) xs)) ys)
-                 (= (length xs) (length ys)))]
-           [else #f])))))
-  
-  (define (build-context c)
-    (let loop ([c c])
-      (cond
-        [(eq? c the-hole) the-hole]
-        [(pair? c) (build-cons-context (loop (car c)) (loop (cdr c)))]
-        [(or (null? c)
-             (number? c)
-             (symbol? c))
-         (build-flat-context c)]
-        [else (error 'build-context "unknown ~s" c)])))
-  
-  (test)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/pict-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/pict-test.rkt
deleted file mode 100644
index 0367f51e50..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/pict-test.rkt
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang racket/base
-(require racket/file)
-;; these tests just make sure that errors don't happen.
-
-(module test racket/base)
-
-(require redex/reduction-semantics
-         redex/pict
-         pict 
-         racket/gui/base
-         racket/class
-         rackunit)
-
-(define-language empty-language)
-
-(define-language var-ab
-  [var (a 
-        b)])
-(void (render-language var-ab))
-
-(define-language var-not-ab
-  [var (variable-except x
-                        y)])
-(void (render-language var-not-ab))
-
-(let ()
-  (define-metafunction empty-language [(zero any_in) 0])
-  (void (render-metafunction zero)))
-
-(void
- (render-reduction-relation
-  (reduction-relation
-   empty-language
-   (--> number_const
-        ,(term
-          (+ number_const 0))))))
-
-(void
- (render-reduction-relation 
-  (reduction-relation
-   empty-language
-   (--> a b
-        (fresh x)
-        (fresh y)))))
-
-
-(define-language x1-9 
-  (x 1 2 3 4 5 6 7 8 9))
-
-(define-extended-language x0-10 x1-9
-  (x 0 .... 10))
-
-(void (render-language x0-10))
-
-(let ([tmp (make-temporary-file "redex-pict-test~a.pdf")])
-  (render-language x0-10 tmp)
-  (delete-file tmp))
-
-(define-metafunction empty-language
-  id : any -> any
-  [(id any) any])
-
-(check-equal?
- (pict-width
-  (parameterize ([metafunction-cases '()])
-    (render-metafunction id)))
- 0)
-
-(check-equal?
- (pict-height
-  (parameterize ([metafunction-cases '()])
-    (render-metafunction id)))
- 0)
-
-(void
- (parameterize ([metafunction-cases '()])
-   (render-metafunction id #:contract? #t)))
-
-(define-judgment-form empty-language
-  #:mode (deep-empty I)
-  #:contract (deep-empty any)
-  [-----
-   (deep-empty ())]
-  [(deep-empty any)
-   ----
-   (deep-empty (any))])
-
-(check-equal?
- (pict-width
-  (parameterize ([metafunction-cases '()])
-    (render-judgment-form deep-empty)))
- 0)
-
-(check-equal?
- (pict-height
-  (parameterize ([metafunction-cases '()])
-    (render-judgment-form deep-empty)))
- 0)
-
-;; check the contracts for the various rule-pict functions
-(void
- (parameterize ([rule-pict-style
-                 (λ (rule-pict-infos)
-                   (for ([r (in-list rule-pict-infos)])
-                     (rule-pict-info-arrow r)
-                     (rule-pict-info-lhs r)
-                     (rule-pict-info-rhs r)
-                     (rule-pict-info-label r)
-                     (rule-pict-info-computed-label r)
-                     (rule-pict-info->side-condition-pict r))
-                   (blank))])
-   (render-reduction-relation
-    (reduction-relation
-     empty-language
-     (--> (a any) 1 "a")
-     (--> (b any) 2 b)
-     (--> (c any) 3 (computed-name (format "c: ~a" (term any))))
-     (--> (d any) 4)
-     (--> (e any) 5 (where (1) any))))))
-
-(printf "pict-test.rkt done\n")
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/rewrite-side-condition-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/rewrite-side-condition-test.rkt
deleted file mode 100644
index 8849e83f28..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/rewrite-side-condition-test.rkt
+++ /dev/null
@@ -1,153 +0,0 @@
-#lang racket/base
-(require (for-syntax redex/private/rewrite-side-conditions
-                     racket/base)
-         redex/private/term ;; to get bindings for 'in-hole' etc
-         rackunit)
-
-(define-syntax (rsc stx)
-  (syntax-case stx ()
-    [(_ pat (nts ...) bind-names?)
-     (with-handlers ((exn:fail:syntax?
-                      (λ (x)
-                        #`'#,(exn-message x))))
-       (with-syntax ([(ignore pat (vars ...) (vars/ellipses ...))
-                      (rewrite-side-conditions/check-errs 
-                       (syntax->datum #'(nts ...))
-                       'rsc
-                       (syntax-e #'bind-names?)
-                       #'pat)])
-         #'(list `pat
-                 `(vars ...)
-                 `(vars/ellipses ...))))]))
-
-(check-equal? (rsc 1 () #t) `(1 () ()))
-(check-equal? (rsc (1) () #t) `((list 1) () ()))
-(check-equal? (rsc (_ _ (name x _)) () #t) `((list any any (name x any)) (x) (x)))
-(check-equal? (rsc (1 ...) () #t) `((list (repeat 1 #f #f)) () ()))
-(check-equal? (rsc (1 ..._2) () #t) `((list (repeat 1 ..._2 #f)) (..._2) (..._2)))
-(check-equal? (rsc (1 ..._2 1 ..._2) () #t) 
-              `((list (repeat 1 ..._2 #f) (repeat 1 ..._2 #f)) (..._2 ..._2) (..._2 ..._2)))
-(check-equal? (rsc (1 ..._!_3) () #t) `((list (repeat 1 #f #f)) () ()))
-(check-equal? (rsc (1 ..._!_3 1 ..._!_3) () #t)
-              `((list (repeat 1 #f ..._!_3) (repeat 1 #f ..._!_3)) () ()))
-
-(check-equal? (rsc x (x) #t) `((name x (nt x)) (x) (x)))
-(check-equal? (rsc x (x) #f) `((nt x) () ()))
-(check-equal? (rsc x_1 (x) #t) `((name x_1 (nt x)) (x_1) (x_1)))
-(check-equal? (rsc x_1 (x) #f) `((name x_1 (nt x)) (x_1) (x_1)))
-(check-equal? (rsc any (x) #t) `((name any any) (any) (any)))
-(check-equal? (rsc any (x) #f) `(any () ()))
-(check-equal? (rsc any_1 (x) #t) `((name any_1 any) (any_1) (any_1)))
-(check-equal? (rsc any_1 (x) #f) `((name any_1 any) (any_1) (any_1)))
-(check-equal? (rsc ((x ...) ...) (x) #t) 
-              `((list (repeat (list (repeat (name x (nt x)) #f #f)) #f #f))
-                (x)
-                (((x ...) ...))))
-(check-equal? (rsc (any_1 any_1) (x) #f) `((list (name any_1 any) (name any_1 any)) 
-                                           (any_1 any_1) 
-                                           (any_1 any_1)))
-(check-equal? (rsc (in-hole (hole a #f (hide-hole hole)) (cross x)) '(x) #f)
-              `((in-hole (list hole a #f (hide-hole hole)) (cross x-x))
-                ()
-                ()))
-
-(check-regexp-match
- #rx"any_1 is overly"
- (rsc (any_1 ..._!_1 any_1 ..._!_1) () #f))
-(check-regexp-match
- #rx"any_1 is overly constrained"
- (rsc (any_1 ..._!_1 any_2 ..._!_1 (any_1 any_2) ...) () #f))
-(check-regexp-match
- #rx"any_1 is overly constrained"
-(rsc (any_1 ..._!_1 any_2 ..._!_1 any_1 ..._1 any_2 ..._1) () #f))
-(check-regexp-match
- #rx"any_1 is overly constrained"
- (rsc (any_1 ..._!_1 any_2 ..._!_1 (any_1 any_3) ... (any_3 any_2) ...) () #f))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; test the normalization of the ellipses underscores
-;;
-(check-equal? (car (rsc (x_1 ..._1 x_2 ..._2 x_2 ..._1) (x) #t))
-              '(list (repeat (name x_1 (nt x)) ..._1 #f)
-                     (repeat (name x_2 (nt x)) ..._1 #f)
-                     (repeat (name x_2 (nt x)) ..._1 #f)))
-(check-equal? (car (rsc ((x_1 ..._1 x_1 ..._2) (x_2 ..._1 x_2 ..._2) x_3 ..._2) (x) #t))
-              '(list (list (repeat (name x_1 (nt x)) ..._2 #f) 
-                           (repeat (name x_1 (nt x)) ..._2 #f))
-                     (list (repeat (name x_2 (nt x)) ..._2 #f)
-                           (repeat (name x_2 (nt x)) ..._2 #f)) 
-                     (repeat (name x_3 (nt x)) ..._2 #f)))
-(check-equal? (car (rsc (x_1 ..._1 x ..._2 x_1 ..._2) (x) #t))
-              '(list (repeat (name x_1 (nt x)) ..._2 #f)
-                     (repeat (name x (nt x)) ..._2 #f)
-                     (repeat (name x_1 (nt x)) ..._2 #f)))
-(check-equal? (car (rsc (x_1 ..._1 x_2 ..._2 (x_1 x_2) ..._3) (x) #t))
-              '(list (repeat (name x_1 (nt x)) ..._3 #f)
-                     (repeat (name x_2 (nt x)) ..._3 #f)
-                     (repeat (list (name x_1 (nt x)) (name x_2 (nt x))) ..._3 #f)))
-(check-equal? (car (rsc ((x_1 ..._1) ..._2 x_2 ..._3 (x_1 ..._4 x_2) ..._5) (x) #t))
-              '(list (repeat (list (repeat (name x_1 (nt x)) ..._4 #f)) ..._5 #f)
-                     (repeat (name x_2 (nt x)) ..._5 #f)
-                     (repeat (list (repeat (name x_1 (nt x)) ..._4 #f)
-                                   (name x_2 (nt x)))
-                             ..._5
-                             #f)))
-(check-equal? (car (rsc ((x_1 ..._1) ..._2 (x_1 ..._3) ..._4 (x_1 ..._5) ..._6) (x) #t))
-              '(list (repeat (list (repeat (name x_1 (nt x)) ..._5 #f)) ..._6 #f)
-                     (repeat (list (repeat (name x_1 (nt x)) ..._5 #f)) ..._6 #f)
-                     (repeat (list (repeat (name x_1 (nt x)) ..._5 #f)) ..._6 #f)))
-
-(check-equal? (car (rsc (x_1 ..._1 x_1 ..._2 x_2 ..._1 x_2 ..._4 x_2 ..._3) (x) #t))
-              '(list (repeat (name x_1 (nt x)) ..._3 #f)
-                     (repeat (name x_1 (nt x)) ..._3 #f)
-                     (repeat (name x_2 (nt x)) ..._3 #f)
-                     (repeat (name x_2 (nt x)) ..._3 #f)
-                     (repeat (name x_2 (nt x)) ..._3 #f)))
-
-(check-equal? (car (rsc (x_1 ... x_1 ..._!_1 x_1 ..._1) (x) #t))
-              '(list (repeat (name x_1 (nt x)) ..._1 #f)
-                     (repeat (name x_1 (nt x)) ..._1 #f)
-                     (repeat (name x_1 (nt x)) ..._1 #f)))
-
-(check-equal? (car (rsc (x_1 ... x_1 ..._!_1 x_1 ..._1 x_2 ..._!_1) (x) #t))
-              '(list (repeat (name x_1 (nt x)) ..._1 #f)
-                     (repeat (name x_1 (nt x)) ..._1 ..._!_1)
-                     (repeat (name x_1 (nt x)) ..._1 #f)
-                     (repeat (name x_2 (nt x)) #f ..._!_1)))
-
-(check-equal? (car (rsc ((3 ..._1) ..._2 (4 ..._1) ..._3) (x) #t))
-              '(list (repeat (list (repeat 3 ..._1 #f)) ..._3 #f)
-                     (repeat (list (repeat 4 ..._1 #f)) ..._3 #f)))
-
-(check-equal? (car (rsc (x ..._1 x ..._2 
-                           variable ..._2 variable ..._3 variable_1 ..._3 variable_1 ..._4)
-                        (x) #t))
-              '(list (repeat (name x (nt x)) ..._4 #f)
-                     (repeat (name x (nt x)) ..._4 #f)
-                     (repeat (name variable variable) ..._4 #f)
-                     (repeat (name variable variable) ..._4 #f)
-                     (repeat (name variable_1 variable) ..._4 #f)
-                     (repeat (name variable_1 variable) ..._4 #f)))
-
-(check-equal? (car (rsc (z_1 ... z_2 ..._!_1 (z_1 z_2) ...) (z) #t))
-              '(list (repeat (name z_1 (nt z)) ..._r3 #f)
-                     (repeat (name z_2 (nt z)) ..._r3 #f)
-                     (repeat (list (name z_1 (nt z))
-                                   (name z_2 (nt z)))
-                             ..._r3
-                             #f)))
-
-(check-equal? (car (rsc (z_1 ... z_2 ..._!_1 z_3 ..._!_1 (z_1 z_2) ...) (z) #t))
-              '(list (repeat (name z_1 (nt z)) ..._r4 #f)
-                     (repeat (name z_2 (nt z)) ..._r4 ..._!_1)
-                     (repeat (name z_3 (nt z)) #f ..._!_1)
-                     (repeat (list (name z_1 (nt z))
-                                   (name z_2 (nt z)))
-                             ..._r4
-                             #f)))
-
-;;
-;; test the normalization of the ellipses underscores
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/rg-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/rg-test.rkt
deleted file mode 100644
index 088e05410d..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/rg-test.rkt
+++ /dev/null
@@ -1,1462 +0,0 @@
-#lang racket
-
-(require "test-util.rkt"
-         redex/private/reduction-semantics
-         redex/private/judgment-form
-         redex/private/matcher
-         redex/private/term
-         redex/private/rg
-         redex/private/generate-term
-         redex/private/keyword-macros
-         redex/private/error)
-
-(module test racket/base)
-
-(define-namespace-anchor nsa)
-(define ns (namespace-anchor->namespace nsa))
-
-(reset-count)
-
-;; to-table : hash-table -> assoc
-;; extracts the hash-table's mapping in a deterministic way
-(define (to-table ht)
-  (sort (hash-map ht cons)
-        (λ (x y) (string<=? (format "~a" (car x)) (format "~a" (car y))))))
-
-;; output : (-> (-> void) string)
-(define (output thunk)
-  (let ([p (open-output-string)])
-    (parameterize ([current-output-port p])
-      (unless (void? (thunk))
-        (error 'output "expected void result")))
-    (begin0
-      (get-output-string p)
-      (close-output-port p))))
-
-(define-syntax (test-contract-violation/client stx)
-  (syntax-case stx ()
-    [(form expr) 
-     (syntax/loc stx (form "" expr))]
-    [(_ name expr)
-     (syntax/loc stx
-       (test-contract-violation 
-        (output (λ () expr))
-        #:blaming "rg-test"
-        #:message name
-        #:extract (match-lambda
-                    [(exn:fail:redex:test _ _ (? exn:fail:contract:blame? e) _) e]
-                    [x x])))]))
-
-(let ()
-  (define-language lc
-    (e x (e e) (λ (x) e))
-    (x variable))
-  (let ([bc (find-base-cases lc)])
-    (test (to-table (base-cases-non-cross bc))
-          '((e . (1 2 2)) (x . (0))))
-    (test (to-table (base-cases-cross bc))
-          '((e-e . (0 2 2 1)) (x-e . (1 2 2 2 2)) (x-x . (0))))))
-
-(let ()
-  (define-language lang
-    (e (e e)))
-  (let ([bc (find-base-cases lang)])
-    (test (to-table (base-cases-non-cross bc)) '((e . (inf))))
-    (test (to-table (base-cases-cross bc)) '((e-e . (0 inf inf))))))
-
-(let ()
-  (define-language lang
-    (a 1 2 3)
-    (b a (a_1 b_!_1)))
-  (let ([bc (find-base-cases lang)])
-    (test (to-table (base-cases-non-cross bc))
-          '((a . (0 0 0)) (b . (1 2))))
-    (test (to-table (base-cases-cross bc))
-          '((a-a . (0)) (a-b . (1 2 2)) (b-b . (0 1))))))
-
-(let ()
-  (define-language lc
-    (e (e e ...)
-       (+ e e)
-       x
-       v)
-    (v (λ (x) e)
-       number)
-    (x variable))
-  (let ([bc (find-base-cases lc)])
-    (test (to-table (base-cases-non-cross bc)) 
-          '((e . (2 2 1 1)) (v . (2 0)) (x . (0))))
-    (test (to-table (base-cases-cross bc))
-          '((e-e . (0 2 2 2 2 2)) (e-v . (1)) (v-e . (2 2 2 2 1)) (v-v . (0 2))
-                                  (x-e . (2 2 2 2 1 3)) (x-v . (2 2)) (x-x . (0))))))
-
-(let ()
-  (define-language L
-    (x (variable-prefix x)
-       (variable-except y)
-       (name x 1)
-       (name y 1))
-    (y 12))
-  (test (hash-ref (base-cases-non-cross (find-base-cases L)) 'x)
-        '(0 0 0 0)))
-
-(define (make-random . nums)
-  (let ([nums (box nums)])
-    (λ ([m +inf.0])
-      (cond [(null? (unbox nums)) (error 'make-random "out of numbers")]
-            [(>= (car (unbox nums)) m) (error 'make-random "number too large")]
-            [else (begin0 (car (unbox nums)) (set-box! nums (cdr (unbox nums))))]))))
-
-(test (pick-from-list '(a b c) (make-random 1)) 'b)
-
-(test (pick-number 24 (make-random 1/5)) 3)
-(test (pick-number 224 (make-random 0 0 1/5)) -5)
-(test (pick-number 524 (make-random 0 0 1 1/5 1/5)) 3/4)
-(test (pick-number 1624 (make-random 0 0 0 .5 1 .5)) 3.0)
-(test (pick-number 2624 (make-random 0 0 0 0 1 1 1/5 1/5 2 .5 0 .5))
-      (make-rectangular 7/8 -3.0))
-
-(test (pick-natural 224 (make-random 1/5)) 5)
-(test (pick-integer 900 (make-random 0 0 1/5)) -7)
-(test (pick-real 9000 (make-random 0 0 0 .5 1 1/8)) 11.0)
-(test (pick-boolean 9000 (make-random 1)) #f)
-(test (pick-boolean 9000 (make-random 0)) #t)
-
-(let* ([lits '("bcd" "cbd")])
-  (test (pick-char 0 (make-random 0 0)) #\A)
-  (test (pick-char 0 (make-random 2 1)) #\c)
-  (test (pick-char 1000 (make-random 1 25 0)) #\Z)
-  (test (pick-char 1000 (make-random 0 65)) #\a)
-  (test (pick-char 1500 (make-random 0 1 65)) #\a)
-  (test (pick-char 1500 (make-random 0 0 3)) #\⇒)
-  (test (pick-char 2500 (make-random 0 0 1 3)) #\⇒)
-  (test (pick-char 2500 (make-random 0 0 0 1)) (integer->char #x4E01))
-  (test (pick-char 1000 (make-random 0 (- (char->integer #\_) #x20))) #\`)
-  (test (random-string lits 3 0 (make-random 0 1)) "cbd")
-  (test (random-string lits 3 0 (make-random 1 0 1 1 1 2 1)) "abc")
-  (test (pick-string lits 0 (make-random .5 1 0 1 1 1 2 1)) "abc")
-  (test (pick-var lits 0 (make-random .01 1 0 1 1 1 2 1)) 'abc))
-
-(define-syntax raised-exn-msg
-  (syntax-rules ()
-    [(_ expr) (raised-exn-msg exn:fail? expr)]
-    [(_ exn? expr)
-     (with-handlers ([exn? exn-message])
-       (begin
-         expr
-         (let ()
-           (define-struct exn-not-raised ())
-           (make-exn-not-raised))))]))
-
-(define (patterns . selectors) 
-  (map (curry compose list) selectors))
-
-(define (iterator name items)
-  (let ([bi (box items)])
-    (λ () 
-      (if (null? (unbox bi))
-          (error name "empty")
-          (begin0 (car (unbox bi)) (set-box! bi (cdr (unbox bi))))))))
-
-(let ([iter (iterator 'test-iterator '(a b))])
-  (test (iter) 'a)
-  (test (iter) 'b)
-  (test (raised-exn-msg (iter)) #rx"empty"))
-
-(define (decisions #:var [var pick-var] 
-                   #:nt [nt pick-nts]
-                   #:str [str pick-string]
-                   #:num [num pick-number]
-                   #:nat [nat pick-natural]
-                   #:int [int pick-integer]
-                   #:real [real pick-real]
-                   #:bool [bool pick-boolean]
-                   #:any [any pick-any]
-                   #:seq [seq pick-sequence-length])
-  (define-syntax decision
-    (syntax-rules ()
-      [(_ d) (if (procedure? d) (λ () d) (iterator (quote d) d))]))
-  (unit (import) (export decisions^)
-        (define next-variable-decision (decision var))
-        (define next-non-terminal-decision (decision nt))
-        (define next-number-decision (decision num))
-        (define next-natural-decision (decision nat))
-        (define next-integer-decision (decision int))
-        (define next-real-decision (decision real))
-        (define next-boolean-decision (decision bool))
-        (define next-string-decision (decision str))
-        (define next-any-decision (decision any))
-        (define next-sequence-decision (decision seq))))
-
-(define-syntax generate-term/decisions
-  (syntax-rules ()
-    [(_ lang pat size attempt decisions)
-     (parameterize ([generation-decisions decisions])
-       (generate-term lang pat size #:attempt-num attempt))]))
-
-(let ()
-  (define-language lc
-    (e (e e) x (λ (x) e))
-    (x (variable-except λ)))
-  
-  ;; Generate (λ (x) x)
-  (test 
-   (generate-term/decisions 
-    lc e 1 0
-    (decisions #:var (list (λ _ 'x) (λ _'x))
-               #:nt (patterns third first first first)))
-   '(λ (x) x))
-  
-  ;; Generate pattern that's not a non-terminal
-  (test 
-   (generate-term/decisions 
-    lc (x x x_1 x_1) 1 0
-    (decisions #:var (list (λ _ 'x) (λ _ 'y)))) 
-   '(x x y y))
-  
-  ; After choosing (e e), size decremented forces each e to x.
-  (test
-   (generate-term/decisions 
-    lc e 1 0
-    (decisions #:nt (patterns first)
-               #:var (list (λ _ 'x) (λ _ 'y))))
-   '(x y)))
-
-(let ()
-  (define-language L
-    (n 1))
-  
-  (test ((generate-term L n) 0) 1)
-  (test ((generate-term L n) 0 #:retries 0) 1)
-  (test ((generate-term L n) 0 #:attempt-num 0) 1)
-
-  (test (with-handlers ([exn:fail:syntax? exn-message])
-          (parameterize ([current-namespace ns])
-            (expand #'(generate-term M n))))
-        #rx"generate-term: expected an identifier defined by define-language([\n ]+in: M)?(\n|$)")
-  (test (with-handlers ([exn:fail:contract? exn-message])
-          (generate-term L n 1.5))
-        #rx"generate-term: contract violation([\n ]+)expected: natural number.*")
-  (test (with-handlers ([exn:fail:contract? exn-message])
-          (generate-term L n 1 #:retries .5))
-        #rx"generate-term: contract violation([\n ]+)expected: natural number.*")
-  (test (with-handlers ([exn:fail:contract? exn-message])
-          (generate-term L n 1 #:attempt-num .5))
-        #rx"generate-term: contract violation([\n ]+)expected: natural number.*")
-  (test-contract-violation/client "#:source" (generate-term #:source 'not-a-reduction-relation)))
-
-(let ([set-rand-2 
-       (λ (to-be prg)
-         (parameterize ([current-pseudo-random-generator prg])
-           (random-seed 
-            (case to-be
-              [(0) 5]
-              [(1) 0]))))])
-  
-  (set-rand-2 0 (current-pseudo-random-generator))
-  (test (random 2) 0)
-  (set-rand-2 1 (current-pseudo-random-generator))
-  (test (random 2) 1)
-  
-  (define-language L)
-  (define R
-    (reduction-relation 
-     L
-     (--> a 1)
-     (--> b 2)))
-  (define-metafunction L
-    [(F a) 1]
-    [(F b) 2])
-  
-  (set-rand-2 0 (redex-pseudo-random-generator))
-  (test (generate-term #:source R 0) 'a)
-  (set-rand-2 1 (redex-pseudo-random-generator))
-  (test ((generate-term #:source R) 0) 'b)
-  
-  (set-rand-2 0 (redex-pseudo-random-generator))
-  (test ((generate-term #:source F) 0) '(a))
-  (set-rand-2 1 (redex-pseudo-random-generator))
-  (test (generate-term #:source F 0) '(b))
-  
-  (let ([before (pseudo-random-generator->vector (redex-pseudo-random-generator))])
-    (generate-term L () 0)
-    (test (pseudo-random-generator->vector (redex-pseudo-random-generator))
-          before)))
-
-;; variable-except pattern
-(let ()
-  (define-language var
-    (e (variable-except x y)))
-  (test
-   (generate-term/decisions
-    var e 2 0
-    (decisions #:var (list (λ _ 'x) (λ _ 'y) (λ _ 'x) (λ _ 'z))))
-   'z))
-
-(let ()
-  (define-language L
-    (n natural)
-    (i integer)
-    (r real)
-    (b boolean))
-  (test (let ([n (generate-term L n 0 #:attempt-num 10000)])
-          (and (integer? n)
-               (exact? n)
-               (not (negative? n))))
-        #t)
-  (test (generate-term/decisions L n 0 1 (decisions #:nat (λ (_) 42))) 42)
-  (test (let ([i (generate-term L i 0 #:attempt-num 10000)])
-          (and (integer? i) (exact? i)))
-        #t)
-  (test (generate-term/decisions L i 0 1 (decisions #:int (λ (_) -42))) -42)
-  (test (real? (generate-term L r 0 #:attempt-num 10000)) #t)
-  (test (generate-term/decisions L r 0 1 (decisions #:real (λ (_) 4.2))) 4.2))
-
-(let ()
-  (define-language lang
-    (a (number number ... "foo" ... "bar" #t ...))
-    (b (number_1 ..._!_1 number_1 ..._1))
-    (c (variable_1 ..._1 number_2 ..._1))
-    (d (z_1 ... z_2 ..._!_1 (z_1 z_2) ...))
-    (f (n_1 ..._1 n_2 ..._2 n_2 ..._1))
-    (g (z_1 ..._!_1 z_2 ... (z_1 z_2) ...))
-    (n number)
-    (q literal)
-    (z 4))
-  (test
-   (generate-term/decisions 
-    lang a 2 0
-    (decisions #:num (build-list 3 (λ (n) (λ (_) n)))
-               #:seq (list (λ (_) 2) (λ (_) 3) (λ (_) 1))))
-   `(0 1 2 "foo" "foo" "foo" "bar" #t))
-  (test (generate-term/decisions lang b 5 0 (decisions #:seq (list (λ (_) 0))))
-        null)
-  (test (generate-term/decisions lang c 5 0 (decisions #:seq (list (λ (_) 0))))
-        null)
-  (test (generate-term/decisions lang d 5 0 (decisions #:seq (list (λ (_) 2))))
-        '(4 4 4 4 (4 4) (4 4)))
-  (test (raised-exn-msg 
-         exn:fail:redex:generation-failure?
-         (parameterize ([generation-decisions
-                         (decisions #:var (list (λ _ 'x) (λ _ 'x)))])
-           (generate-term lang (variable-except x) 5 #:retries 1))) 
-        #rx"generate-term: unable to generate pattern \\(variable-except x\\) in 1")
-  (test (raised-exn-msg 
-         exn:fail:redex:generation-failure?
-         (parameterize ([generation-decisions
-                         (decisions #:var (λ _ 'literal))])
-           (generate-term lang variable-not-otherwise-mentioned 5 #:retries 1))) 
-        #rx"generate-term: unable to generate pattern variable-not-otherwise-mentioned in 1")
-  (test (generate-term/decisions lang f 5 0 (decisions #:seq (list (λ (_) 0)))) null)
-  (test (generate-term/decisions 
-         lang
-         ((0 ..._!_1) ... (1 ..._!_1) ...)
-         5 0
-         (decisions #:seq (list (λ (_) 2) (λ (_) 3) (λ (_) 4) (λ (_) 2) (λ (_) 3) (λ (_) 4)
-                                (λ (_) 2) (λ (_) 3) (λ (_) 4) (λ (_) 1) (λ (_) 3))))
-        '((0 0 0) (0 0 0 0) (1 1 1)))
-  (test (generate-term/decisions 
-         lang ((0 ..._!_1) ... (1 ..._!_1) ...) 5 0
-         (decisions #:seq (list (λ (_) 2) (λ (_) 3) (λ (_) 4) (λ (_) 2) (λ (_) 3) (λ (_) 5))))
-        '((0 0 0) (0 0 0 0) (1 1 1) (1 1 1 1 1))))
-
-(let ()
-  (define-language lang (e (variable-prefix pf)))
-  (test 
-   (generate-term/decisions
-    lang e 5 0
-    (decisions #:var (list (λ _ 'x))))
-   'pfx))
-
-(let ()
-  (define-language lang (x variable literal))
-  (test ((is-nt? lang) 'x) #t)
-  (test ((is-nt? lang) 'y) #f))
-
-(let ()
-  (define-language lang
-    (e number (e_1 e_2 e e_1 e_2)))
-  (test
-   (generate-term/decisions
-    lang e 5 0
-    (decisions #:nt (patterns second first first first)
-               #:num (list (λ _ 2) (λ _ 3) (λ _ 4))))
-   '(2 3 4 2 3)))
-
-(let ()
-  (define-language lang
-    (a (number_!_1 number_!_2 number_!_1))
-    (b (c_!_1 c_!_1 c_!_1))
-    (c 1 2))
-  (test
-   (generate-term/decisions
-    lang a 5 0
-    (decisions #:num (list (λ _ 1) (λ _ 1) (λ _ 1) (λ _ 1) (λ _ 1) (λ _ 2))))
-   '(1 1 2))
-  (test
-   (generate-term/decisions
-    lang (number_!_1 number_!_2 number_!_1) 5 0
-    (decisions #:num (list (λ _ 1) (λ _ 1) (λ _ 1) (λ _ 1) (λ _ 1) (λ _ 2))))
-   '(1 1 2))
-  (test
-   (raised-exn-msg exn:fail:redex:generation-failure? (generate-term lang b 5000))
-   #rx"unable"))
-
-(let ()
-  (define-language lang
-    (e string)
-    (f foo bar))
-  (test
-   (let/ec k 
-     (generate-term/decisions 
-      lang e 5 0 
-      (decisions #:str (list (λ (l a) (k (sort l string<=?)))))))
-   '("bar" "foo")))
-
-(let ()
-  (define-language lang
-    (a 43)
-    (b (side-condition a_1 (odd? (term a_1))))
-    (c (side-condition a_1 (even? (term a_1))))
-    (e (side-condition (x_1 x_!_2 x_!_2) (not (eq? (term x_1) 'x))))
-    (x variable))
-  (test (generate-term lang b 5) 43)
-  (test (generate-term lang (side-condition a (odd? (term a))) 5) 43)
-  (test (raised-exn-msg exn:fail:redex:generation-failure? (generate-term lang c 5))
-        #rx"unable to generate pattern")
-  (test (let/ec k
-          (generate-term lang (number_1 (side-condition 7 (k (term number_1)))) 5))
-        'number_1)
-  
-  (test ; mismatch patterns work with side-condition failure/retry
-   (generate-term/decisions
-    lang e 5 0
-    (decisions #:var (list (λ _ 'x) (λ _ 'x) (λ _ 'y) (λ _ 'y) (λ _ 'x) (λ _ 'y))))
-   '(y x y))
-  (test ; generate compiles side-conditions in pattern
-   (generate-term/decisions 
-    lang (side-condition x_1 (not (eq? (term x_1) 'x))) 5 0
-    (decisions #:var (list (λ _ 'x) (λ _ 'y))))
-   'y))
-
-(let ()
-  (define-language lang
-    (a (name x b))
-    (b 4)
-    (c (side-condition (name x d) (zero? (term x))))
-    (d 2 1 0)
-    (e ((side-condition (name d_1 d) (zero? (term d_1))) d_1)))
-  (test (generate-term lang a 5) 4)
-  (test (generate-term lang c 5) 0)
-  (test (generate-term lang e 5) '(0 0)))
-
-(let ()
-  (define-language lang
-    (a number (+ a a))
-    (A hole (+ a A) (+ A a))
-    (C hole)
-    (e ((in-hole (in-hole f (number_1 hole)) number_1) number_1)) 
-    (f (in-hole C (number_1 hole)))
-    (g (in-hole (side-condition (hole number_1) (zero? (term number_1))) number_2))
-    (h ((in-hole i number_1) number_1))
-    (i (number_1 (in-hole j (number_1 hole))))
-    (j (in-hole (hole number_1) (number_1 hole)))
-    (x variable)
-    (y variable))
-  
-  (test 
-   (generate-term/decisions 
-    lang (in-hole A number ) 5 0
-    (decisions 
-     #:nt (patterns second second first first third first second first first)
-     #:num (build-list 5 (λ (x) (λ (_) x)))))
-   '(+ (+ 1 2) (+ 0 (+ 3 4))))
-  
-  (test (let/ec k
-          (generate-term lang (side-condition (in-hole C_1 1) (k (term C_1))) 5))
-        (term hole))
-  
-  (test (generate-term lang (in-hole (in-hole (1 hole) hole) 5) 5) '(1 5))
-  (test (generate-term lang (hole 4) 5) (term (hole 4)))
-  (test (generate-term/decisions 
-         lang (variable_1 (in-hole C variable_1)) 5 0
-         (decisions #:var (list (λ _ 'x) (λ _ 'y) (λ _ 'x))))
-        '(x x))
-  (test (generate-term/decisions 
-         lang (variable_!_1 (in-hole C variable_!_1)) 5 0
-         (decisions #:var (list (λ _ 'x) (λ _ 'x) (λ _ 'x) (λ _ 'y))))
-        '(x y))
-  (test (generate-term/decisions lang e 5 0 (decisions #:num (list (λ _ 1) (λ _ 2))))
-        '((2 (1 1)) 1))
-  (test (generate-term/decisions lang g 5 0 (decisions #:num (list (λ _ 1) (λ _ 2) (λ _ 1) (λ _ 0))))
-        '(1 0))
-  (test (generate-term/decisions lang h 5 0 (decisions #:num (list (λ _ 1) (λ _ 2) (λ _ 3))))
-        '((2 ((3 (2 1)) 3)) 1)))
-
-(let ()
-  (define-language L
-    (C (c hole))
-    (D (d hole))
-    (E (e hole))
-    (F (f hole))
-    
-    (p (in-hole (hole hole) 4))
-    (q (in-hole (hole ... hole) 4)))
-  
-  (test (generate-term L (in-hole 3 4) 5) 3)
-  (test (raised-exn-msg 
-         exn:fail? 
-         (test-match L p (generate-term L p 5)))
-        #rx"two holes")
-  (test (raised-exn-msg 
-         exn:fail?
-         (test-match L q (generate-term/decisions L q 5 0 (decisions #:seq (list (λ (_) 1))))))
-        #rx"two holes")
-  
-  (let ([bindings #f])
-    (test (generate-term 
-           L 
-           (side-condition (name CDEF (in-hole (name CDE (in-hole (name CD (in-hole C D)) E)) F))
-                           (set! bindings (term (C D E F CD CDE CDEF))))
-           0)
-          (term (c (d (e (f hole))))))
-    (test bindings (term ((c hole) (d hole) (e hole) (f hole) 
-                                   (c (d hole)) (c (d (e hole))) (c (d (e (f hole))))))))
-  
-  (test
-   (let/ec return
-     (generate-term
-      L
-      (side-condition (name C (hide-hole hole))
-                      (return (term (in-hole C 1))))
-      0))
-   (term hole))
-  
-  (test (generate-term 
-         L
-         (in-hole ((hide-hole (in-hole hole hole)) hole) 1)
-         0)
-        (term (hole 1))))
-
-(let ()
-  (define-language lc
-      (e (e e) (+ e e) x v)
-      (v (λ (x) e) number)
-      (x variable-not-otherwise-mentioned))
-  (test (generate-term/decisions lc x 5 0 (decisions #:var (list (λ _ 'λ) (λ _ '+) (λ _ 'x))))
-        'x))
-
-(let ()
-  (define-language four 
-    (e 4)
-    (f 5))
-  (define-language empty)
-  
-  ;; `any' pattern
-  (let ([four (make-rg-lang '((e . ()) (f . ())) '((e-e . ()) (f-f . ())) 'dont-care)]
-        [sexp (make-rg-lang 'dont-care 'dont-care 'dont-care)])
-    (test (call-with-values (λ () (pick-any four sexp (make-random 0 1))) list)
-          (list four 'f))
-    (test (call-with-values (λ () (pick-any four sexp (make-random 1))) list)
-          (list sexp 'sexp)))
-  (test (generate-term/decisions 
-         four any 5 0 (decisions #:any (list (λ (lang sexp) (values lang 'e))))) 4)
-  (test (generate-term/decisions
-         four any 5 0 
-         (decisions #:any (list (λ (lang sexp) (values sexp 'sexp)))
-                    #:nt (patterns fifth second second second)
-                    #:seq (list (λ _ 3))
-                    #:str (list (λ _ "foo") (λ _ "bar") (λ _ "baz"))))
-        '("foo" "bar" "baz"))
-  (test (generate-term/decisions
-         empty any 5 0 (decisions #:nt (patterns first)
-                                  #:any (λ (langc sexpc) (values sexpc 'sexp))
-                                  #:var (list (λ _ 'x))))
-        'x)
-  (test 
-   (generate-term/decisions 
-    empty (in-hole (any hole) 7) 5 0
-    (decisions #:any (list (λ (_ sexp) (values sexp 'sexp)))
-               #:nt (patterns fourth)))
-   (term (hole 7))))
-
-;; `hide-hole' pattern
-(let ()
-  (define-language lang
-    (e (hide-hole (in-hole ((hide-hole hole) hole) 1))))
-  (test (generate-term lang e 5) (term (hole 1)))
-  (test (plug (generate-term lang (hide-hole hole) 0) 3) 3))
-
-(define (output-error-port thunk)
-  (let ([port (open-output-string)])
-    (parameterize ([current-error-port port])
-      (thunk))
-    (get-output-string port)))
-
-;; `cross' pattern
-(let ()
-  (define-language lang
-    (e x (e e) v)
-    (v (λ (x) e))
-    (x variable-not-otherwise-mentioned))
-  (define-extended-language name-collision lang (e-e 47))
-  
-  (test (generate-term/decisions
-         lang (cross e) 3 0 
-         (decisions #:nt (patterns fourth first first second first first first)
-                    #:var (list (λ _ 'x) (λ _ 'y))))
-        (term (λ (x) (hole y))))
-  
-  (test (generate-term/decisions name-collision (cross e) 3 0
-                                 (decisions #:nt (patterns first)))
-        (term hole))
-  (test (generate-term/decisions name-collision e-e 3 0
-                                 (decisions #:nt (patterns first)))
-        47)
-  
-  (test (hash-ref (base-cases-non-cross (find-base-cases name-collision)) 'e-e)
-        '(0)))
-
-(let ()
-  (define-language L
-    (a ((a ...) ...)))
-  (test (generate-term/decisions
-         L (cross a) 3 0 
-         (decisions #:nt (patterns second first)
-                    #:seq (list (λ _ 0) (λ _ 0) (λ _ 0) (λ _ 0))))
-        (term ((hole)))))
-
-;; generation failures increase size and attempt
-(let ()
-  (define-language L
-    (a d b)
-    (b d c)
-    (c e)
-    
-    (x variable))
-  (test
-   (generate-term/decisions
-    L (side-condition a (eq? (term a) 'e)) 0 0
-    ; It isn't possible for `a' to generate 'y until size is 2.
-    ; When size is 0, the generator has no choice but the 'x production.
-    ; When size is 1, the generator has a choice for `a' but not for `b'.
-    ; Supply enough first-production choices to cover the size 1 attempts
-    ; followed by the choices that produce 'y on the first size 2 attempt.
-    (decisions 
-     #:nt (apply patterns 
-                 (append (build-list (* default-retries proportion-at-size)
-                                     (λ (_) first))
-                         (list second second first)))))
-   'e)
-  
-  (test
-   (generate-term/decisions
-    L (side-condition x (number? (term x))) 0 0
-    (decisions #:var (λ (lang-lits attempt)
-                       (if (>= attempt retry-threshold) 0 'x))))
-   0)
-  
-  (let ([attempts null]
-        [start (sub1 retry-threshold)]
-        [finish (+ retry-threshold post-threshold-incr)])
-    (generate-term/decisions
-     L (side-condition x (number? (term x))) 0 start
-     (decisions #:var (λ (lang-lits attempt)
-                        (set! attempts (cons attempt attempts))
-                        (if (= attempt finish) 0 'x))))
-    (test attempts (list finish retry-threshold start))))
-
-;; At size zero, a sequence length must be zero; otherwise,
-;; we risk increasing the problem size.
-(let ()
-  (define-language L
-    (a (a ...)))
-  (test (generate-term/decisions L a 0 1 (decisions #:seq '()))
-        (term ())))
-
-;; redex-check
-(let ()
-  (define-language lang
-    (d 5)
-    (e 17 4)
-    (n number))
-  
-  (test (let ([checked 0])
-          (parameterize ([default-check-attempts 1])
-            (redex-check lang () (set! checked (add1 checked)) #:print? #f))
-          checked)
-        1)
-  (test (redex-check lang d #t #:attempts 1 #:print? (not #t)) #t)
-  (test (redex-check lang d #f #:print? #f)
-        (make-counterexample 5))
-  (let ([exn (with-handlers ([exn:fail:redex:test? values])
-               (redex-check lang d (error 'boom ":(") #:print? #f)
-               'not-an-exn)])
-    (test (exn-message exn) "checking 5 raises an exception:\nboom: :(")
-    (test (exn-message (exn:fail:redex:test-source exn)) "boom: :(")
-    (test (exn:fail:redex:test-term exn) 5))
-  
-  (test (output (λ () (redex-check lang d #f)))
-        #rx"redex-check: .*:.*\ncounterexample found after 1 attempt:\n5\n")
-  (test (output (λ () (redex-check lang d #t))) 
-        #rx"redex-check: .*:.*\nno counterexamples in 1000 attempts\n")
-  (let-syntax ([noloc (λ (stx)
-                        (syntax-case stx ()
-                          [(_ e) (datum->syntax stx (syntax->datum #'e) #f)]))])
-    (test (output (λ () (noloc (redex-check lang d #t)))) 
-          "redex-check: no counterexamples in 1000 attempts\n"))
-  (test (output (λ () (redex-check lang (d e) (and (= (term d) 5) (or (= (term e) 4) (= (term e) 17))) #:attempts 200)))
-        #rx"no counterexamples")
-  (test (output (λ () (redex-check lang (d ...) (zero? (modulo (foldl + 0 (term (d ...))) 5)) #:attempts 2)))
-        #rx"no counterexamples")
-  (test (output (λ () (redex-check lang (d e) #f)))
-        #rx"counterexample found after 1 attempt:\n\\(5 (4|17)\\)\n")
-  (let* ([p (open-output-string)]
-         [m (parameterize ([current-output-port p])
-              (with-handlers ([exn:fail? exn-message])
-                (redex-check lang d (error 'pred-raised))
-                'no-exn-raised))])
-    (test m "error: pred-raised")
-    (test (get-output-string p) #rx"checking 5 raises.*\n$")
-    (close-output-port p))
-
-  (test (output
-         (λ ()
-           (redex-check lang n (eq? 42 (term n)) 
-                        #:attempts 1
-                        #:source (reduction-relation 
-                                  lang 
-                                  (--> 42 dontcare)
-                                  (--> 0 dontcare z)))))
-        #rx"counterexample found after 1 attempt with z:\n0\n")
-  
-  (let ([generated null]
-        [R (reduction-relation 
-            lang 
-            (--> 1 dontcare)
-            (--> 2 dontcare))])
-    (test (output
-           (λ ()
-             (redex-check lang n (set! generated (cons (term n) generated)) 
-                          #:attempts 5
-                          #:source R)))
-          #rx"no counterexamples.*with each clause")
-    (test generated '(2 2 1 1))
-    
-    (test (redex-check lang any #t 
-                       #:attempts 1 
-                       #:source R
-                       #:print? (not #t))
-          #t)
-    (test (redex-check lang any (= (term any) 1)
-                        #:source R
-                        #:print? #f)
-          (make-counterexample 2)))
-  
-  (let ()
-    (define-metafunction lang
-      [(mf 42) dontcare]
-      [(mf 0) dontcare])
-    (test (output
-           (λ ()
-             (redex-check lang (n) (eq? 42 (term n)) 
-                          #:attempts 1
-                          #:source mf)))
-          #px"counterexample found after 1 attempt with clause at .*:\\d+:\\d+:\n\\(0\\)\n")
-    (test (redex-check lang any #t 
-                       #:attempts 1 
-                       #:source mf
-                       #:print? (not #t))
-          #t)
-    (test (redex-check lang any (= (car (term any)) 42)
-                        #:source mf
-                        #:print? #f)
-          (make-counterexample '(0))))
-  
-  (let ()
-    (define-metafunction lang
-      [(f) 
-       dontcare
-       (side-condition #f)])
-    (test (raised-exn-msg
-           exn:fail:redex:generation-failure?
-           (redex-check lang any #t 
-                        #:attempts 1
-                        #:source f))
-          #px"unable to generate LHS of clause at .*:\\d+:\\d+"))
-  
-  (let ()
-    (define-metafunction lang
-      [(mf d e) dontcare])
-    (test (output
-           (λ ()
-             (redex-check lang (number_1 number_2) 
-                          (and (= (term number_1) 5)
-                               (or (= (term number_2) 4)
-                                   (= (term number_2) 17)))
-                          #:attempts 10
-                          #:source mf)))
-          #rx"no counterexamples"))
-  
-  ; Without the #:attempt-size argument, the attempt would use size 0,
-  ; which does not require a non-terminal decision.
-  (test (let/ec k
-          (parameterize ([generation-decisions 
-                          (decisions #:nt (list (λ _ (k #t))))])
-            (redex-check lang d #:ad-hoc #t #:attempts 1 #:print? #f #:attempt-size add1)
-            #f))
-        #t)
-  
-  (let ([generated '()]
-        [fixed '()]
-        [fix add1])
-    (redex-check lang number (set! fixed (cons (term number) fixed))
-                 #:prepare (λ (n) 
-                             (set! generated (cons n generated))
-                             (fix n))
-                 #:attempts 10
-                 #:print? #f)
-    (test fixed (map fix generated)))
-  (test (parameterize ([generation-decisions 
-                        (decisions #:num (list (λ _ 0)))])
-          (redex-check lang number (= 0 (term number)) 
-                       #:prepare add1
-                       #:print? #f))
-        (counterexample 1))
-  (test (raised-exn-msg
-         exn:fail?
-         (redex-check lang 0 #t #:prepare (λ (_) (error 'fixer)) #:print? #f))
-        #rx"fixing 0")
-  (test (raised-exn-msg 
-         exn:fail:redex?
-         (redex-check lang natural #t #:prepare (compose - add1)))
-        #rx"does not match natural")
-  (test (raised-exn-msg 
-         exn:fail:redex?
-         (redex-check lang natural #t
-                      #:prepare -
-                      #:source (reduction-relation lang (--> 47 1))))
-        #rx"-47 does not match natural")
-  (test (redex-check lang number (= 0 (term number))
-                     #:prepare add1
-                     #:source (reduction-relation lang (--> 0 1))
-                     #:print? #f)
-        (counterexample 1))
-  
-  (test-contract-violation/client
-   "#:attempts argument"
-   (redex-check lang natural #t #:attempts 3.5))
-  (test-contract-violation/client
-   "#:retries argument"
-   (redex-check lang natural #t #:retries 3.5))
-  (test-contract-violation/client
-   "#:attempt-size argument"
-   (redex-check lang natural #t #:attempt-size -))
-  (test-contract-violation/client
-   "#:prepare argument"
-   (redex-check lang natural #t #:prepare (λ (_) (values))))
-  
-  (test (raised-exn-msg 
-         exn:fail:redex?
-         (redex-check lang n #t #:source (reduction-relation lang (--> x 1))))
-        #rx"x does not match n")
-  (test (raised-exn-msg
-         exn:fail:redex:generation-failure?
-         (redex-check lang (side-condition any #f) #t #:retries 42 #:attempts 1))
-        #rx"^redex-check: unable .* in 42")
-
-  (let ([unable-loc #px"^redex-check: unable to generate LHS of clause at .*:\\d+:\\d+ in 42"])
-    (let-syntax ([test-gen-fail
-                  (syntax-rules ()
-                    [(_ clauses ... expected)
-                     (test 
-                      (raised-exn-msg
-                       exn:fail:redex:generation-failure?
-                       (redex-check lang any #t 
-                                    #:source (reduction-relation 
-                                              lang
-                                              clauses ...)
-                                    #:retries 42
-                                    #:attempts 1))
-                      expected)])])
-      (test-gen-fail 
-       (--> (side-condition any #f) any)
-       unable-loc)
-      
-      (test-gen-fail 
-       (==> (side-condition any #f) any)
-       with [(--> a b) (==> a b)]
-       unable-loc)
-      
-      (test-gen-fail
-       (--> (side-condition any #f) any impossible)
-       #rx"^redex-check: unable to generate LHS of impossible in 42")))
-  
-  
-  (test (let ([checked 0])
-          (redex-check lang n #:ad-hoc (set! checked (add1 checked)) 
-                       #:print? #f
-                       #:attempts 10)
-          checked)
-        10)
-  
-  (test (let ([checked 0])
-          (redex-check lang n #:enum 100 (set! checked (add1 checked)) 
-                       #:print? #f
-                       #:attempts 10)
-          checked)
-        10)
-  
-  (test (let ([checked 0])
-          (redex-check lang n #:uniform-at-random 0.1 (set! checked (add1 checked)) 
-                       #:print? #f
-                       #:attempts 10)
-          checked)
-        10)
-  
-  (test (let ([checked '()])
-          (redex-check lang natural #:in-order 
-                       (set! checked (cons (term natural) checked)) 
-                       #:print? #f
-                       #:attempts 5)
-          checked)
-        '(4 3 2 1 0)))
-
-(let ()
-  ;; just make sure no errors
-  ;(redex-check (side-condition any #t) cap-x #t #:attempts 10)
-  
-  (define-language L
-    (cap-x := (side-condition 
-               variable_1 
-               (regexp-match #rx"^[A-Z]" (symbol->string (term variable_1))))))
-  
-  ;; just make sure no errors
-  (redex-check L cap-x #t #:attempts 10))
-
-;; check-reduction-relation
-(let ()
-  (define-language L
-    (e (+ e ...) number)
-    (E (+ number ... E* e ...))
-    (E* hole)
-    (n 4))
-  
-  (let ([R (reduction-relation
-            L
-            (--> 1 2)
-            (--> 2 3))])
-    (test (check-reduction-relation R (λ (_) #t) #:print? #f) #t)
-    (test (counterexample-term (check-reduction-relation R (curry = 1) #:print? #f))
-          2))
-  
-  (let ([generated null]
-        [R (reduction-relation
-            L
-            (==> (+ number ...) whatever)
-            (--> (side-condition number (even? (term number))) whatever)
-            with
-            [(--> (in-hole E a) whatever)
-             (==> a b)])])
-    (test (begin
-            (output
-             (λ ()
-               (parameterize ([generation-decisions 
-                               (decisions #:seq (list (λ _ 0) (λ _ 0) (λ _ 0))
-                                          #:num (list (λ _ 1) (λ _ 1) (λ _ 0)))])
-                 (check-reduction-relation 
-                  R (λ (term) (set! generated (cons term generated)))
-                  #:attempts 1))))
-            generated)
-          (reverse '((+ (+)) 0))))
-  
-  (test (let* ([generated null]
-               [R (reduction-relation
-                   L
-                   (--> (name t (number_1 number_3))
-                        dontcare
-                        (side-condition (set! generated (cons (term t) generated)))
-                        (where number_1 4)
-                        (where number_2 number_1)
-                        (where number_3 number_2)))])
-          (parameterize ([generation-decisions 
-                          (decisions #:num (list (λ _ 3) (λ _ 4) 
-                                                 (λ _ 4) (λ _ 3)
-                                                 (λ _ 4) (λ _ 4)))])
-            (check-reduction-relation R (λ (_) #t) #:attempts 1 #:print? #f))
-          generated)
-        '((4 4) (4 3) (3 4)))
-  
-  ; Extension reinterprets the LHSs of the base relation
-  ; relative to the new language.
-  (let ()
-    (define-language L (x 1))
-    (define-extended-language M L (x 2))
-    (define R
-      (reduction-relation L (--> x yes)))
-    (define S (extend-reduction-relation R M))
-    (test (let/ec k (check-reduction-relation S k)) 2))
-  
-  ; Extension reinterprets the `where' clauses of the base relation
-  ; relative to new language.
-  (let ()
-    (define-language L (x 1))
-    (define-extended-language M L (x 2))
-    (define R
-      (reduction-relation
-       L
-       (--> () ()
-            (where x 2))))
-    (define S (extend-reduction-relation R M))
-    
-    (test (with-handlers ([exn:fail:redex:generation-failure? (const #f)])
-            (check-reduction-relation S (λ (_) #t) #:attempts 1 #:print? #f))
-          #t))
-  
-  (let ([generated '()]
-        [fixed '()]
-        [fix add1])
-    (check-reduction-relation
-     (reduction-relation L (--> number number))
-     (λ (n) (set! fixed (cons n fixed)))
-     #:prepare (λ (n) 
-                 (set! generated (cons n generated))
-                 (fix n))
-     #:attempts 10
-     #:print? #f)
-    (test fixed (map fix generated)))
-  (test (parameterize ([generation-decisions 
-                        (decisions #:num (list (λ _ 0)))])
-          (check-reduction-relation
-           (reduction-relation L (--> number number))
-           (curry = 0)
-           #:prepare add1
-           #:print? #f))
-        (counterexample 1))
-  (test (raised-exn-msg
-         exn:fail?
-         (check-reduction-relation
-          (reduction-relation L (--> 0 0))
-          (λ (_) #t)
-          #:prepare (λ (_) (error 'fixer))
-          #:print? #f))
-        #rx"fixing 0")
-  (test-contract-violation/client
-   "#:prepare argument" 
-   (check-reduction-relation 
-    (reduction-relation L (--> 0 0))
-    void
-    #:prepare (λ () 0)))
-  
-  (let ([S (reduction-relation L (--> 1 2 name) (--> 3 4))])
-    (test (output (λ () (check-reduction-relation S (λ (x) #t) #:attempts 1)))
-          #rx"check-reduction-relation:.*no counterexamples")
-    (test (output 
-           (λ () (check-reduction-relation S (λ (x) #f))))
-          #rx"counterexample found after 1 attempt with name:\n1\n")
-    (test (output 
-           (λ () (check-reduction-relation S (curry eq? 1))))
-          #px"counterexample found after 1 attempt with clause at .*:\\d+:\\d+:\n3\n"))
-  
-  (test (output 
-         (λ () (check-reduction-relation (reduction-relation L (--> 1 2) (--> 3 4 name)) (curry eq? 1))))
-        #px"counterexample found after 1 attempt with name:\n3\n")
-  
-  (test (let/ec k
-          (parameterize ([generation-decisions 
-                          (decisions #:nt (list (λ _ (k #t))))])
-            (check-reduction-relation 
-             (reduction-relation L (--> e e))
-             (λ _ #t) #:attempts 1 #:print? #f #:attempt-size add1)
-            #f))
-        #t)
-  
-  (let ([T (reduction-relation
-            L
-            (==> number number
-                 (where any_num number)
-                 (side-condition (eq? (term any_num) 4))
-                 (where any_numb any_num)
-                 (side-condition (eq? (term any_numb) 4)))
-            with
-            [(--> (9 a) b)
-             (==> a b)])])
-    (test (output
-           (λ ()
-             (parameterize ([generation-decisions 
-                             (decisions #:num (build-list 5 (λ (x) (λ _ x))))])
-               (check-reduction-relation 
-                T (curry equal? '(9 4)) 
-                #:attempts 1))))
-          #rx"no counterexamples"))
-  
-  ;; just check that this doesn't raise an errors.
-  (let ()
-    (define-language empty)
-    (define red (reduction-relation
-                 empty
-                 #:domain 1
-                 (--> any any)))
-    (check-reduction-relation 
-     red 
-     (λ (x) (apply-reduction-relation red x))))
-  
-  (let ([U (reduction-relation L (--> (side-condition any #f) any))])
-    (test (raised-exn-msg
-           exn:fail:redex:generation-failure?
-           (check-reduction-relation U (λ (_) #t)))
-          #rx"^check-reduction-relation: unable"))
-
-  (let ([R (reduction-relation L (--> any any))])
-    (test-contract-violation/client
-     "#:attempts argument"
-     (check-reduction-relation R values #:attempts -1))
-    (test-contract-violation/client
-     "#:retries argument"
-     (check-reduction-relation R values #:retries -1))
-    (test-contract-violation/client
-     "#:attempt-size argument"
-     (check-reduction-relation R values #:attempt-size (λ (_) (values 1 2))))
-    (test-contract-violation/client
-     "#:prepare argument"
-     (check-reduction-relation R values #:prepare (λ (_) (values 1 2))))
-    (test-contract-violation/client (check-reduction-relation R #t))))
-
-; check-metafunction
-(let ()
-  (define-language empty)
-  
-  (define-metafunction empty
-    [(m 1) whatever]
-    [(m 2) whatever])
-  (define-metafunction empty
-    [(n (side-condition any #f)) any])
-  
-  (test (check-metafunction m (λ (_) #t) #:print? #f) #t)
-  (test (counterexample-term
-         (check-metafunction m (compose (curry = 1) car) #:print? #f))
-        '(2))
-  
-  (let ([generated null])
-    (test (begin
-            (output 
-             (λ ()
-               (check-metafunction m (λ (t) (set! generated (cons t generated))) #:attempts 1)))
-            generated) 
-          (reverse '((1) (2)))))
-  
-  (test
-   (let/ec k
-     (define-language L (n 2))
-     (define-metafunction L
-       [(f n)
-        n
-        (where number_2 ,(add1 (term n)))
-        (where number_3 ,(add1 (term number_2)))
-        (side-condition (k (term number_3)))]
-       [(f any) 0])
-     (check-metafunction f (λ (_) #t)))
-   4)
-  
-  (let ()
-    (define-language L 
-      ((m n) number))
-    (define-metafunction L
-      [(f m_0 m_1 ...)
-       ()
-       (where (n_0 ... n_i ...) (m_0 m_1 ...))
-       (side-condition (null? (term (n_0 ...))))])
-    (test
-     (with-handlers ([exn:fail:redex:generation-failure? (λ (_) #f)])
-       (check-metafunction f (λ (_) #t) #:retries 1 #:print? #f #:attempts 1))
-     #t))
-  
-  (test (let ([generated null])
-          (define-language L)
-          (define-metafunction L
-            [(f (name t (number_1 number_3)))
-             dontcare
-             (side-condition (set! generated (cons (term t) generated)))
-             (where number_1 4)
-             (where number_2 number_1)
-             (where number_3 number_2)])
-          (parameterize ([generation-decisions 
-                          (decisions #:num (list (λ _ 3) (λ _ 4) 
-                                                 (λ _ 4) (λ _ 3)
-                                                 (λ _ 4) (λ _ 4)))])
-            (check-metafunction f (λ (_) #t) #:attempts 1 #:print? #f))
-          generated)
-        '((4 4) (4 3) (3 4)))
-  
-  (test (let/ec k
-          (define-language L (n number))
-          (define-metafunction L
-            [(f n) n])
-          (parameterize ([generation-decisions 
-                          (decisions #:nt (list (λ _ (k #t))))])
-            (check-metafunction f (λ _ #t) #:attempts 1 #:print? #f #:attempt-size add1)
-            #f))
-        #t)
-  
-  (let ([generated '()]
-        [fixed '()]
-        [fix add1])
-    (define-metafunction empty
-      [(f number) number])
-    (check-metafunction
-     f (λ (n) (set! fixed (cons (car n) fixed)))
-     #:prepare (λ (n) 
-                 (set! generated (cons (car n) generated))
-                 (list (fix (car n))))
-     #:attempts 10
-     #:print? #f)
-    (test fixed (map fix generated)))
-  (test (parameterize ([generation-decisions 
-                        (decisions #:num (list (λ _ 0)))])
-          (define-metafunction empty
-            [(f number) number])
-          (check-metafunction
-           f (compose (curry = 0) car)
-           #:prepare (compose list add1 car)
-           #:print? #f))
-        (counterexample '(1)))
-  (test (let ()
-          (define-metafunction empty
-            [(f 0) 0])
-          (raised-exn-msg
-           exn:fail?
-           (check-metafunction
-            f (λ (_) #t)
-            #:prepare (λ (_) (error 'fixer))
-            #:print? #f)))
-        #rx"fixing \\(0\\)")
-  
-  (let ()
-    (define-metafunction empty
-      [(f 0) 0])
-    (test-contract-violation/client
-     "#:attempts argument"
-     (check-metafunction f void #:attempts 3.5))
-    (test-contract-violation/client
-     "#:retries argument"
-     (check-metafunction f void #:retries 3.5))
-    (test-contract-violation/client
-     "#:attempt-size argument"
-     (check-metafunction f void #:attempt-size 3.5))
-    (test-contract-violation/client
-     "#:prepare argument"
-     (check-metafunction f void #:prepare car #:print? #f))
-    (test-contract-violation/client (check-metafunction f (λ () #t))))
-  
-  ; Extension reinterprets the LHSs of the base metafunction
-  ; relative to the new language.
-  (let ()
-    (define-language L (x 1))
-    (define-extended-language M L (x 2))
-    (define-metafunction L 
-      [(f x) yes])
-    (define-metafunction/extension f M
-      g : any -> any)
-    (test (let/ec k (check-metafunction g k)) '(2)))
-  
-  ; Extension reinterprets the `where' clauses of the base metafunction
-  ; relative to the new language.
-  (let ()
-    (define-language L (x 1))
-    (define-extended-language M L (x 2))
-    (define-metafunction L 
-      [(f)
-       ?
-       (where x 2)])
-    (define-metafunction/extension f M
-      g : any -> any)
-    (test (with-handlers ([exn:fail:redex:generation-failure? (const #f)])
-            (check-metafunction g (λ (?) #t) #:attempts 1 #:print? #f))
-          #t))
-  
-  (test (output (λ () (check-metafunction m (λ (_) #t)))) #rx"no counterexamples")
-  (test (output (λ () (check-metafunction m (curry eq? 1))))
-        #px"check-metafunction:.*counterexample found after 1 attempt with clause at .*:\\d+:\\d+")
-  (test (raised-exn-msg
-         exn:fail:redex:generation-failure?
-         (check-metafunction n (λ (_) #t) #:retries 42))
-        #rx"check-metafunction: unable .* in 42")
-
-  
-  (let ()
-    (define-metafunction empty
-      mf : 1 -> 1
-      [(mf any) any])
-    
-    ;; just make sure no errors
-    (test (begin
-            (check-metafunction
-             mf
-             (λ (args) (term (mf ,@args))))
-            42)
-          42))
-  
-  (let ()
-    (define-metafunction empty bogo : any -> any)
-
-    (test (raised-exn-msg
-           exn:fail:redex:generation-failure?
-           (generate-term #:source bogo 5))
-          #rx"unable.*bogo")))
-
-(let ()
-  (define-language lang (x variable))
-  (define-syntax test-class-reassignments
-    (syntax-rules ()
-      [(_ pattern expected)
-       (test (to-table (class-reassignments pattern))
-             expected)]))
-  
-  (test-class-reassignments 
-   '(list (repeat (name x_1 (nt x)) ..._1 #f) (repeat (name x_2 (nt x)) ..._2 #f) (repeat (name x_2 (nt x)) ..._1 #f))
-   '((..._2 . ..._1)))
-  (test-class-reassignments
-   '(list (list (repeat (name x_1 (nt x)) ..._1 #f) (repeat (name x_1 (nt x)) ..._2 #f))
-          (list (repeat (name x_2 (nt x)) ..._1 #f) (repeat (name x_2 (nt x)) ..._2 #f)) 
-          (repeat (name x_3 (nt x)) ..._2 #f))
-   '((..._1 . ..._2) (..._2 . ..._2)))
-  (test-class-reassignments
-   '(list (repeat (name x_1 (nt x)) ..._1 #f) (repeat (name x (nt x)) ..._2 #f) (repeat (name x_1 (nt x)) ..._2 #f))
-   '((..._1 . ..._2)))
-  (test-class-reassignments
-   '(list (repeat (name x_1 (nt x)) ..._1 #f)
-          (repeat (name x_2 (nt x)) ..._2 #f)
-          (repeat (list (name x_1 (nt x)) (name x_2 (nt x))) ..._3 #f))
-   '((..._1 . ..._3) (..._2 . ..._3)))
-  (test-class-reassignments
-   '(list (repeat (list (repeat (name x_1 (nt x)) ..._1 #f)) ..._2 #f)
-          (repeat (name x_2 (nt x)) ..._3 #f)
-          (repeat (list (repeat (name x_1 (nt x)) ..._4 #f)
-                        (name x_2 (nt x)))
-                  ..._5
-                  #f))
-   '((..._1 . ..._4) (..._2 . ..._5) (..._3 . ..._5)))
-  (test-class-reassignments
-   '(list (repeat (list (repeat (name x_1 (nt x)) ..._1 #f)) ..._2 #f)
-          (repeat (list (repeat (name x_1 (nt x)) ..._3 #f)) ..._4 #f)
-          (repeat (list (repeat (name x_1 (nt x)) ..._5 #f)) ..._6 #f))
-   '((..._1 . ..._5) (..._2 . ..._6) (..._3 . ..._5) (..._4 . ..._6)))
-  (test-class-reassignments
-   '(list (repeat (name x_1 (nt x)) ..._1 #f)
-          (repeat (name x_1 (nt x)) ..._2 #f)
-          (repeat (name x_2 (nt x)) ..._1 #f)
-          (repeat (name x_2 (nt x)) ..._4 #f)
-          (repeat (name x_2 (nt x)) ..._3 #f))
-   '((..._1 . ..._3) (..._2 . ..._3) (..._4 . ..._3)))
-  (test 
-   (hash-map 
-    (class-reassignments '(list (repeat (name x_1 (nt x)) #f #f)
-                                (repeat (name x_1 (nt x)) ..._!_1 #t)
-                                (repeat (name x_1 (nt x)) ..._1 #f))) 
-    (λ (_ cls) cls))
-   '(..._1 ..._1))
-  (test-class-reassignments
-   '(list (repeat (list (repeat 3 ..._1 #f)) ..._2 #f)
-          (repeat (list (repeat 4 ..._1 #f)) ..._3 #f))
-   '((..._2 . ..._3)))
-  (test-class-reassignments
-   '(list (repeat (name x (nt x)) ..._1 #f)
-          (repeat (name x (nt x)) ..._2 #f)
-          (repeat (name variable variable) ..._2 #f)
-          (repeat (name variable variable) ..._3 #f)
-          (repeat (name variable_1 variable) ..._3 #f)
-          (repeat (name variable_1 variable) ..._4 #f))
-   '((..._1 . ..._4) (..._2 . ..._4) (..._3 . ..._4))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  #:satisfying tests
-;;
-(let ()
-  (define-language nats [n z (s n)])
-
-  (define-judgment-form nats
-    #:mode (sum I I O)
-    [-----------
-     (sum z n n)]
-    [(sum n_1 (s n_2) n_3)
-     -------------------------
-     (sum (s n_1) n_2 n_3)])
-
-  (test (generate-term nats
-                       #:satisfying
-                       (sum z z n)
-                       5)
-        '(sum z z z))
-
-  (test (generate-term nats
-                       #:satisfying
-                       (sum (s z) (s z) n)
-                       5)
-        '(sum (s z) (s z) (s (s z)))))
-
-(let ()
-  (define-language nats [n z (s n)])
-  
-  (define-metafunction nats
-    [(sum z n) n]
-    [(sum (s n_1) n_2) (sum n_1 (s n_2))])
-
-  (test (generate-term nats
-                       #:satisfying
-                       (sum z z) = n
-                       5)
-        '((sum z z) = z))
-
-  (test (generate-term nats
-                       #:satisfying
-                       (sum (s z) (s z)) = n
-                       5)
-        '((sum (s z) (s z)) = (s (s z)))))
-
-(let ()
-  (define-language L)
-  (define tries 0)
-  (output
-   (λ ()
-     (redex-check L any
-                  (begin (set! tries (+ tries 1)) #f)
-                  #:attempts 10
-                  #:keep-going? #t)))
-  (test tries 10))
-
-(let ()
-  (define-language L)
-  
-  (define-judgment-form L 
-    #:mode (wf I)
-    [--------------
-     (wf (any ...))])
-
-  (test (regexp-match?
-         #rx"^redex-check: generation failed at unsupported pattern"
-         (with-handlers ([exn:fail? exn-message])
-           (redex-check L #:satisfying (wf any) #t)
-           "no exn raised"))
-        #t))
-
-
-;; redex-test-seed
-(let ([seed 0])
-  (define-language L)
-  (define (generate)
-    (generate-term L (number ...) 100 #:attempt-num 10000000))
-  (test (begin (random-seed seed) (generate))
-        (begin (random-seed seed) (generate)))
-  (let ([prg (make-pseudo-random-generator)])
-    (define (seed-effect-generate effect)
-      (begin
-        (parameterize ([current-pseudo-random-generator prg])
-          (random-seed seed))
-        (effect)
-        (parameterize ([redex-pseudo-random-generator prg])
-          (generate))))
-    (test (seed-effect-generate void)
-          (seed-effect-generate random))))
-
-(print-tests-passed 'rg-test.rkt)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/define-union-language.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/define-union-language.rktd
deleted file mode 100644
index c76d8ad9cf..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/define-union-language.rktd
+++ /dev/null
@@ -1,6 +0,0 @@
-("render-language: cannot render the result of define-union-language"
- ([rl (render-language L2)]) ([L2 L2] [L L])
- (let ()
-   (define-language L (e any))
-   (define-union-language L2 L)
-   rl))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-contracts.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-contracts.rktd
deleted file mode 100644
index fc97e8e8bc..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-contracts.rktd
+++ /dev/null
@@ -1,15 +0,0 @@
-(#rx"contract: \\(ctc-fail s s\\).*values: \\(ctc-fail q _\\)"
- ([judgment (ctc-fail q s)])
- (judgment-holds judgment))
-(#rx"contract: \\(ctc-fail s s\\).*values: \\(ctc-fail a q\\)"
- ([judgment (ctc-fail a s)])
- (judgment-holds judgment))
-(#rx"contract: \\(ctc-fail s s\\).*values: \\(ctc-fail q _\\)"
- ([judgment (ctc-fail b s)])
- (judgment-holds judgment))
-(#rx"contract: \\(ctc-fail s s\\).*values: \\(ctc-fail a q\\)"
- ([judgment (ctc-fail c s)])
- (judgment-holds judgment))
-(#rx"contract: \\(inv-fail s_1 s_2\\).*values: \\(inv-fail a a\\)"
- ([judgment (inv-fail a s)])
- (judgment-holds judgment))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-ellipses.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-ellipses.rktd
deleted file mode 100644
index 46590e44c4..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-ellipses.rktd
+++ /dev/null
@@ -1,10 +0,0 @@
-(#rx"incompatible ellipsis match counts"
- ([premise (bad-zip ((any_1 any_i) ...))])
- ([name bad-zip] [binder1 any_1] [binder2 any_i] [ellipsis ...])
- (let ()
-   (define-language L)
-   (define-judgment-form L
-     #:mode (name I)
-     [(name (binder1 ellipsis binder2 ellipsis))
-      premise])
-   (judgment-holds (name (1 2)))))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-undefined.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-undefined.rktd
deleted file mode 100644
index cb26621a4e..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-undefined.rktd
+++ /dev/null
@@ -1,9 +0,0 @@
-("q: undefined;\n cannot use before initialization"
- ([use q]) ([def q])
- (let ()
-   (judgment-holds (use 1))
-   (define-language L)
-   (define-judgment-form L 
-     #:mode (def I)
-     [(def 1)])
-   #f))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/metafunction-no-match.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/metafunction-no-match.rktd
deleted file mode 100644
index 26cab18e27..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/metafunction-no-match.rktd
+++ /dev/null
@@ -1,3 +0,0 @@
-(#rx"∨: no clauses matched"
- ([mf (∨ #f #t)])
- (term mf))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/metafunction-undefined.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/metafunction-undefined.rktd
deleted file mode 100644
index fb90f94aa8..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/metafunction-undefined.rktd
+++ /dev/null
@@ -1,8 +0,0 @@
-("reference to metafunction q before its definition"
- ([use q]) ([def q])
- (let ()
-   (term (use))
-   (define-language L)
-   (define-metafunction L
-     [(def) ()])
-   #f))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/term.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/term.rktd
deleted file mode 100644
index 1f0933cb46..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/term.rktd
+++ /dev/null
@@ -1,49 +0,0 @@
-(#rx"incompatible ellipsis match counts"
- ([body (((x y) ...) ...)])
- ([xlhs (x ...)] [ylhs ((y ...) ...)])
- (term-let ([xlhs '(a b c)]
-            [ylhs '((1 2) (4 5 6) (7 8 9))])
-           (term body)))
-
-(#rx"incompatible ellipsis match counts"
- ([body ((((f x) y) ...) ...)])
- ([fn f] [xlhs (x ...)] [ylhs ((y ...) ...)])
- (term-let-fn ([fn car])
-              (term-let ([xlhs '(a b c)]
-                         [ylhs '((1 2) (4 5 6) (7 8 9))])
-                        (term body))))
-
-(#rx"incompatible ellipsis match counts"
- ([body (f ((x y) ...))])
- ([fn f] [xlhs (x ...)] [ylhs (y ...)])
- (term-let-fn ([fn car])
-              (term-let ([xlhs '(a b)]
-                         [ylhs '(c d e)])
-                        (term body))))
-
-(#rx"incompatible ellipsis match counts"
- ([app (f (x y))])
- ([fn f] [xlhs (x ...)] [ylhs (y ...)] [ellipsis ...])
- (term-let-fn ([fn car])
-              (term-let ([xlhs '(a b)]
-                         [ylhs '(c d e)])
-                        (term (app ellipsis)))))
-
-(#rx"incompatible ellipsis match counts"
- ([plug (in-hole hole (x y))])
- ([xlhs (x ...)] [ylhs (y ...)] [ellipsis ...])
- (term-let-fn ([fn car])
-              (term-let ([xlhs '(a b)]
-                         [ylhs '(c d e)])
-                        (term (plug ellipsis)))))
-
-(#rx"term .* does not match pattern"
- ([rhs 'a]) ([ellipsis ...])
- (term-let ([(x ellipsis) rhs]) 3))
-
-("x: undefined;\n cannot use before initialization"
- ([use x]) ([def x])
- (let ()
-   (define t (term (use y)))
-   (define-term def z)
-   t))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt
deleted file mode 100644
index 407f0a2a0f..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-
-;; require this file to run all of the test suites for redex.
-
-(require racket/runtime-path
-         racket/cmdline
-         racket/match
-         pkg/lib
-         "test-util.rkt"
-         "bitmap-test-util.rkt")
-
-(define test-examples? #f)
-
-(command-line
- #:once-each
- [("--no-bitmap-gui") "skips the GUI for bitmap-test.rkt" (show-bitmap-test-gui? #f)]
- [("--examples") "executes the tests in the examples directory" (set! test-examples? #t)])
-
-(define test-files
-  (append
-   '("lw-test.rkt"
-     "matcher-test.rkt"
-     "rewrite-side-condition-test.rkt"
-     "unify-tests.rkt"
-     "dq-test.rkt"
-     "tl-test.rkt"
-     "err-loc-test.rkt"
-     "term-test.rkt"
-     "rg-test.rkt"
-     "gen-test.rkt"
-     "keyword-macros-test.rkt"
-     "core-layout-test.rkt"
-     "pict-test.rkt"
-     "hole-test.rkt"
-     "stepper-test.rkt"
-     "check-syntax-test.rkt"
-     "test-docs-complete.rkt"
-     "tut-subst-test.rkt"
-     "enum-test.rkt"
-     "bitmap-test.rkt")
-   (if test-examples?
-       '("<redex-examples>/redex/examples/cbn-letrec.rkt"
-         "<redex-examples>/redex/examples/stlc.rkt"
-         "<redex-examples>/redex/examples/pi-calculus.rkt"
-         "<redex-examples>/redex/examples/list-machine/test.rkt"
-         ("<redex-examples>/redex/examples/beginner.rkt" main)
-         "<redex-examples>/redex/examples/racket-machine/reduction-test.rkt"
-         "<redex-examples>/redex/examples/racket-machine/verification-test.rkt"
-         "<redex-examples>/redex/examples/delim-cont/test.rkt"
-         "<redex-examples>/redex/examples/cont-mark-transform/all-test.rkt"
-         ("<redex-examples>/redex/examples/r6rs/r6rs-tests.rkt" main))
-       '())))
-
-(define-runtime-path here ".")
-(define examples-path (pkg-directory "redex-examples"))
-
-(define (flush)
-  ;; these flushes are here for running under cygwin, 
-  ;; which somehow makes racket think it isn't using
-  ;; an interative port
-  (flush-output (current-error-port))
-  (flush-output (current-output-port)))
-
-(for ([test-file (in-list test-files)])
-  (define-values (file provided action)
-    (match test-file
-      [(list (? string? file) id)
-       (values file id (λ (x) (x)))]
-      [(? string?) 
-       (values test-file #f values)]))
-  (flush)
-  (printf "running ~a\n" file)
-  (flush)
-  (define path
-    (if (regexp-match #rx"<redex-examples>" file)
-        (build-path examples-path (cadr (regexp-match #rx"^<redex-examples>/(.*)$" file)))
-        (build-path here file)))
-  (action (dynamic-require path provided))
-  (flush))
-
-(printf "\nWARNING: didn't run color-test.rkt\n")
-(flush)
-
-
-;; Test mode:
-(module test racket/base
-  (require syntax/location)
-  (parameterize ([current-command-line-arguments
-                  (vector "--examples" "--no-bitmap-gui")])
-    (dynamic-require (quote-module-path "..") #f)))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/ryr-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/ryr-test.rkt
deleted file mode 100644
index 9a76d8d978..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/ryr-test.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-(require net/url 
-         racket/port 
-         racket/file
-         file/gunzip
-         file/untar)
-
-(define tmp-dir (make-temporary-file "ryr-test-~a" 'directory))
-(current-directory tmp-dir)
-(define models-url "http://www.eecs.northwestern.edu/~robby/lightweight-metatheory/models.tar.gz")
-(printf "downloading ~a\n   to ~a\n" models-url tmp-dir)
-(call-with-output-file "models.tar.gz"
-  (λ (out-port)
-    (call/input-url
-     (string->url models-url)
-     get-pure-port
-     (λ (in-port)
-       (copy-port in-port out-port)))))
-(gunzip "models.tar.gz")
-(untar "models.tar")
-
-(define racket-files
-  (sort (for/list ([file (in-directory "models")]
-                   #:when (regexp-match #rx"rkt$" (path->string file))
-                   #:unless (regexp-match #rx"/[.]_" (path->string file)))
-          file)
-        string<=?
-        #:key path->string))
-
-(for ([file (in-list racket-files)])
-  (printf "running ~a\n" file)
-  (flush-output)
-  (let/ec k
-    (parameterize ([error-escape-handler (λ args (k (void)))])
-      (dynamic-require file #f)))
-  (flush-output (current-error-port))
-  (flush-output))
-
-(delete-directory/files tmp-dir)
-
-(module+ test
-  (module config info
-    (define timeout 200)
-    (define random? #t)))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/stepper-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/stepper-test.rkt
deleted file mode 100644
index 6dfa59a7e3..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/stepper-test.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang racket/base
-
-(require framework
-         racket/class
-         "test-util.rkt"
-         redex/reduction-semantics
-         redex/private/stepper
-         redex/private/size-snip)
-
-(module test racket/base)
-
-(reset-count)
-
-;; diff : term term -> (cons range range)
-;; range = (listof (cons nat nat))
-(define (diff from to)
-  (define (make-node t)
-    (new node%
-         [pp default-pretty-printer]
-         [all-nodes-ht 'dont-care]
-         [term t]
-         [red 'dont-care]
-         [change-path 'dont-care]
-         [init-cw (initial-char-width)]))
-  (define (ranges node)
-    (sort (map (λ (range) (cons (text:range-start range)
-                                (text:range-end range)))
-               (send (send (send node get-big-snip) get-editor)
-                     get-highlighted-ranges))
-          < #:key car))
-  (define from-node (make-node from))
-  (define to-node (make-node to))
-  (show-diff from-node to-node)
-  (cons (ranges from-node) (ranges to-node)))
-
-(test (diff (term (hole a)) (term (hole b)))
-      (cons (list (cons 6 7)) (list (cons 6 7))))
-(test (diff (term (,'hole a)) (term (,'hole b)))
-      (cons (list (cons 8 9)) (list (cons 8 9))))
-
-(test (diff (term (() #f () #f)) (term (1 2 () #f)))
-      (cons (list (cons 1 3) (cons 4 6))
-            (list (cons 1 2) (cons 3 4))))
-(test (diff (term (<> ((a b)) () e)) (term (<> ((a b)) () (c d))))
-      (cons (list (cons 15 16))
-            (list (cons 15 20))))
-
-(test (diff (term |a'|) (term b))
-      (cons (list (cons 0 4)) (list (cons 0 1))))
-
-(print-tests-passed 'stepper-test.rkt)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/judgment-form-definition.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/judgment-form-definition.rktd
deleted file mode 100644
index 7141644f6e..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/judgment-form-definition.rktd
+++ /dev/null
@@ -1,208 +0,0 @@
-(#rx"define-judgment-form:.*expression context"
- ([illegal-def (define-judgment-form L #:mode (J) [(J)])])
- (values illegal-def))
-
-(#rx"expected an identifier defined by define-language"
- ([not-lang q])
- (define-judgment-form not-lang))
-
-(#rx"expected.*I.*or.*O"
- ([bad-mode q])
- (define-judgment-form syn-err-lang
-   #:mode (sum I bad-mode O)))
-
-(#rx"expected mode specification"
- ([bad-spec q])
- (define-judgment-form syn-err-lang
-   #:mode bad-spec))
-
-(#rx"expected contract specification"
- ([bad-spec q])
- (define-judgment-form syn-err-lang
-   #:mode (sum I I O)
-   #:contract bad-spec))
-
-(#rx"expected definition to include a mode specification"
- ([bad-def (define-judgment-form syn-err-lang
-             #:contract (J)
-             [(J)])])
- bad-def)
-
-(#rx"expected at most one contract specification"
- ([dup-spec (J)])
- (define-judgment-form syn-err-lang
-  #:mode (J)
-  #:contract (J)
-  #:contract dup-spec))
-
-(#rx"expected at most one contract specification"
- ([dup-spec1 (J)] [dup-spec2 (J)])
- (define-judgment-form syn-err-lang
-   #:contract (J)
-   #:mode (J)
-   #:contract dup-spec1
-   #:contract dup-spec2))
-
-(#rx"expected the same name"
- ([name1 J] [name2 K]) ([name3 J])
- (define-judgment-form syn-err-lang
-   #:mode (name1)
-   #:contract (name2)
-   [(name3)]))
-
-(#rx"expected the same name"
- ([name1 J] [name2 K]) ([name3 J])
- (define-judgment-form syn-err-lang
-   #:mode (name1)
-   #:contract (name3)
-   [(name2)]))
-
-(#rx"expected at least one rule"
- ([bad-def (define-judgment-form syn-err-lang
-             #:mode (J I)
-             #:contract (J n))])
- bad-def)
-(#rx"malformed premise"
- ([bad-prem q])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (J I)
-     [(J number)
-      bad-prem
-      q])
-   (void)))
-(#rx"expected judgment form name"
- ([bad-judgment-form q])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (J I)
-     [(J number)
-      (bad-judgment-form)])
-   (void)))
-(#rx"different numbers of positions"
- ([bad-def (define-judgment-form syn-err-lang
-             #:mode (J I)
-             #:contract (J n n)
-             [(J number)])])
- bad-def)
-
-(#rx"unbound pattern variable"
- ([unbound number_2])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (J I O)
-     [(J number_1 unbound)
-      (J number_1 number_1)])
-   (void)))
-(#rx"unbound pattern variable"
- ([unbound number_2])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (J I O)
-     [(J number_1 number_2)
-      (J unbound number_1)])
-   (void)))
-(#rx"unbound pattern variable"
- ([unbound number_3])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (J I O)
-     [(J number_1 number_2)
-      (where number_2 unbound)])
-   (void)))
-(#rx"unbound pattern variable"
- ([unbound q])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (J I O)
-     [(J number_1 number_2)
-      (where number_2 unbound)
-      (where (name q number) number_1)])
-   (void)))
-(#rx"J: mode specifies a 1-ary relation but use supplied 0 terms"
- ([bad-conc (J)]) ([name J])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (name I)
-     [bad-conc])
-   (void)))
-(#rx"J: mode specifies a 1-ary relation but use supplied 0 terms"
- ([bad-prem (J)]) ([name J])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (name I)
-     [(name number)
-      bad-prem])
-   (void)))
-(#rx"J: mode specifies a 0-ary relation but use supplied 1 term"
- ([bad-prem (J a)]) ([name J])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (name)
-     [(name)
-      bad-prem])
-   (void)))
-
-
-(#rx"missing ellipsis"
- ([use any_0]) ([ellipsis ...] [def any_0])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (tmpl-depth I O)
-     [(tmpl-depth (def ellipsis) any)
-      (tmpl-depth use any)])
-   (void)))
-(#rx"same binder.*different depths"
- ([binder1 any_0] [binder2 any_0])
- ([ellipsis ...])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (pat-depth I O)
-     [(pat-depth (binder1 ellipsis) ())
-      (pat-depth () binder2)])
-   (void)))
-(#rx"too many ellipses"
- ([premise (no-ellipsis any)])
- ([binder any] [name no-ellipsis] [ellipsis ...])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (name I)
-     [(name binder)
-      premise ellipsis])
-   (void)))
-
-(#rx"unbound pattern variable"
- ([x f_7])
- (let ()
-   (define-language L
-     (f any))
-   (define-judgment-form L
-     #:mode (J1 O)
-     [(J1 x)])
-   (void)))
-
-(#rx"unbound pattern variable"
- ([use f_2]) ([outer-def f_2] [inner-def f_2])
- (let ()
-   (define-language L
-     (f any))
-   (define-metafunction L
-     [(outer-def) ()])
-   (define-judgment-form L
-     #:mode (K I I O)
-     [(K a any_1 x)
-      (K b (use) (name inner-def any))]
-     [(K b any K-b-out)])
-   (void)))
-
-(#rx"does not match original mode"
- ([mode2 (J2 I O O)]) ([J2 J2])
- (let ()
-   (define-language L)
-   (define-judgment-form L
-     #:mode (J1 I I O)
-     [(J1 any_1 any_2 any_2)])
-   (define-extended-judgment-form L J1
-     #:mode mode2
-     [(J2 any_1 17 any_1)])
-   (void)))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/judgment-holds.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/judgment-holds.rktd
deleted file mode 100644
index f73e0221d9..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/judgment-holds.rktd
+++ /dev/null
@@ -1,12 +0,0 @@
-(#rx"expected a judgment form name"
- ([not-judgment-form junk])
- (judgment-holds (not-judgment-form z (s z))))
-
-(#rx"a[?]: mode specifies a 1-ary relation but use supplied 2 terms"
- ([bad-judgment (a? a q)])
- ([name a?])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (name I)
-     [(name a)])
-   (judgment-holds bad-judgment)))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/language-definition.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/language-definition.rktd
deleted file mode 100644
index a7e881721f..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/language-definition.rktd
+++ /dev/null
@@ -1,29 +0,0 @@
-(#rx"define-language:.*expression context"
- ([illegal-def (define-language L)])
- (values illegal-def))
-
-(#rx"define-language:.*unquote disallowed"
- ([illegal-unquote ,3])
- (let ()
-   (define-language L
-     (n illegal-unquote))
-   (void)))
-
-; error message shows correct form name
-(#rx"define-extended-language:.*underscore"
- ([bad-underscore y_1])
- (let ()
-   (define-language L)
-   (define-extended-language M L
-     (z () (1 bad-underscore)))
-   (void)))
-
-(#rx"expected an identifier" ([not-id (L)]) (define-language not-id))
-(#rx"expected at least one production" ([separator ::=]) (define-language L (x separator)))
-(#rx"expected at least one production" ([nt x]) (define-language L (nt)))
-(#rx"expected at least one production" ([nt-pos (x)]) (define-language L (nt-pos)))
-(#rx"expected preceding non-terminal names" ([separator ::=]) (define-language L (separator a b)))
-(#rx"expected non-terminal name" ([not-nt (y)]) (define-language L (x not-nt ::= z)))
-(#rx"expected production" ([not-prod ::=]) (define-language L (x ::= y not-prod z)))
-(#rx"expected non-terminal definition" ([not-def q]) (define-language L not-def))
-(#rx"expected non-terminal definition" ([not-def ()]) (define-language L not-def))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/metafunction-definition.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/metafunction-definition.rktd
deleted file mode 100644
index 2df3ea0228..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/metafunction-definition.rktd
+++ /dev/null
@@ -1,36 +0,0 @@
-(#rx"define-metafunction:.*expression context"
- ([illegal-def (define-metafunction syn-err-lang [(f) ()])])
- (values illegal-def))
-(#rx"define-metafunction/extension:.*expression context"
- ([illegal-def (define-metafunction/extension f syn-err-lang [(g) ()])])
- (let ()
-   (define-metafunction syn-err-lang [(f) ()])
-   (values illegal-def)))
-
-(#rx"expected a pattern and a right-hand side"
- ([clause [(f x)]])
- (define-metafunction syn-err-lang
-   clause))
-
-(#rx"expected an identifier"
- ([not-id (junk)])
- (define-metafunction not-id also-junk))
-(#rx"expected an identifier"
- ([not-id junk])
- (define-metafunction not-id also-junk))
-
-(#rx"before underscore"
- ([not-non-term z!_1])
- (define-metafunction syn-err-lang
-  [(func M_1 E_2)
-   (M_1 (E_2 not-non-term) M_1)]))
-
-(#rx"metafunction must be in an application"
- ([z2 z])
- (let ()
-   (define-metafunction syn-err-lang
-     [(i any) any])
-   (define-metafunction syn-err-lang
-     [(z any) (0)])
-   (let ()
-     (term (i z2 4)))))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/redex-let.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/redex-let.rktd
deleted file mode 100644
index 7c820be646..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/redex-let.rktd
+++ /dev/null
@@ -1,3 +0,0 @@
-(#rx"redex-let: duplicate pattern variable"
- ([dup number])
- (redex-let syn-err-lang ([(dup) 1] [dup 1]) (term dup)))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/reduction-relation-definition.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/reduction-relation-definition.rktd
deleted file mode 100644
index 292aa1937b..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/reduction-relation-definition.rktd
+++ /dev/null
@@ -1,145 +0,0 @@
-(#rx"no rules"
- ([unused ==>])
- (reduction-relation 
-  syn-err-lang
-  (~~> (number_1 number_2)
-       ,(* (term number_1) (term number_2)))
-  with
-  [(--> (M a) (M b)) (~~> a b)]
-  [(~~> (M a) (M b)) (unused a b)]))
-
-(#rx"no rules use -->"
- ([bad-def (reduction-relation syn-err-lang)])
- bad-def)
-
-(#rx"~~> relation is not defined"
- ([undef ~~>])
- (reduction-relation 
-  syn-err-lang
-  (undef (number_1 number_2)
-         ,(* (term number_1) (term number_2)))))
-
-(#rx"same name on multiple rules"
- ([name1 mult] [name2 mult])
- (reduction-relation 
-  syn-err-lang
-  (--> (number_1 number_2) 
-       ,(* (term number_1) (term number_2))
-       name2)
-  (--> (number_1 number_2) 
-       ,(* (term number_1) (term number_2))
-       name1)))
-
-
-(#rx"different depths"
- ([binder1 number_1] [binder2 number_1]) ([ellipsis ...])
- (reduction-relation
-  syn-err-lang
-  (--> binder1
-       ()
-       (where (binder2 ellipsis) '()))))
-
-(#rx"different depths"
- ([binder1 x] [binder2 x]) ([ellipsis ...])
- (redex-match
-  syn-err-lang
-  ((name binder1 any) (name binder2 any_2) ellipsis)))
-
-(#rx"different depths"
- ([binder1 x] [binder2 x]) ([ellipsis ...])
- (let ()
-   (define-language bad-lang5
-     (e ((name binder1 any) (name binder2 any_2) ellipsis)))
-   (void)))
-
-(#rx"==> relation is not defined"
- ([undef ==>])
- (reduction-relation 
-  syn-err-lang
-  (--> 1 2)
-  (undef 3 4)))
-
-(#rx"~> relation is not defined"
- ([undef ~>])
- (reduction-relation 
-  syn-err-lang
-  (--> 1 2)
-  (==> 3 4)
-  with
-  [(undef a b) (==> a b)]))
-
-(#rx"expected identifier"
- ([not-id (+ 3 b)])
- (reduction-relation
-  syn-err-lang
-  (==> 1 2)
-  with
-  [(--> a b)
-   (==> a not-id)]))
-
-(#rx"expected identifier"
- ([not-id (+ 3 a)])
- (reduction-relation
-  syn-err-lang
-  (==> 1 2)
-  with
-  [(--> a b)
-   (==> not-id b)]))
-
-(#rx"name expected to have arguments" 
- ([name-kw name])
- (let () (define-language bad-lang1 (e name-kw)) (void)))
-(#rx"name expected to have 2 arguments" 
- ([bad-pat (name x)])
- (let () (define-language bad-lang2 (e bad-pat)) (void)))
-(#rx"cannot use _" ([bad-underscore x_y]) (define-language bad-lang3 (bad-underscore x)))
-(#rx"at least one production" ([nt b]) (define-language bad-lang4 (a 1 2) (nt)))
-(#rx"at least one production"
- ([nt a])
- (let ()
-   (define-language good-lang (nt 1 2))
-   (define-extended-language bad-lang5 good-lang (nt) (b 2))
-   (void)))
-(#rx"same non-terminal"
- ([nt2 x] [nt1 x])
- (define-language bad-lang5 (nt1 1) (nt2 2)))
-(#rx"same non-terminal"
- ([nt2 x] [nt1 x])
- (define-language bad-lang6 ((nt1 nt2) 1)))
-(#rx"same non-terminal"
- ([nt2 x] [nt1 x])
- (let ()
-   (define-language good-lang)
-   (define-extended-language bad-lang7 good-lang ((nt1 nt2) 1))))
-
-(#rx"before underscore" 
- ([bad-underscore m_1])
- (redex-match syn-err-lang bad-underscore))
-(#rx"expected an identifier"
- ([not-id 2])
- (redex-match syn-err-lang (variable-except a not-id c)))
-(#rx"expected an identifier"
- ([not-id 7])
- (redex-match syn-err-lang (variable-prefix not-id)))
-(#rx"expected an identifier"
- ([not-id 7])
- (redex-match syn-err-lang (cross not-id)))
-
-(#rx"a?: mode specifies a 1-ary relation but use supplied 2 terms"
- ([bad-judgment (a? a q)])
- ([name a?])
- (let ()
-   (define-judgment-form syn-err-lang
-     #:mode (name I)
-     [(name a)])
-   (reduction-relation
-    syn-err-lang
-    (--> 1 1
-         (judgment-holds bad-judgment)))))
-
-(#rx"before underscore"
- ([not-non-term Z_1])
- (reduction-relation 
-  syn-err-lang
-  (--> (in-hole E (Q_1 M_1))
-       (in-hole E (M_1 not-non-term)))))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/relation-definition.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/relation-definition.rktd
deleted file mode 100644
index 8b0ccecae5..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/relation-definition.rktd
+++ /dev/null
@@ -1,30 +0,0 @@
-(#rx"expected the name of the relation"
- ([bad-def (define-relation syn-err-lang R)])
- bad-def)
-
-(#rx"expected a sequence of patterns separated by"
- ([subset ⊂])
- (define-relation syn-err-lang R subset))
-
-(#rx"expected clause definitions"
- ([bad-def (define-relation syn-err-lang foo ⊆ c)])
- bad-def)
-
-(#rx"expected a pattern"
- ([cross ×])
- (define-relation syn-err-lang foo ⊆ c cross))
-
-(#rx"found a 'where' clause not at the end"
- ([first-where (where any_c any_a)]
-  [first-post-where (R () ())])
- (define-relation syn-err-lang
-   [(R () ())]
-   [(R (any_a) (any_b)) 
-    (R any_c any_d) 
-    first-where
-    (where any_d any_b)
-    first-post-where]))
-
-(#rx"expected an identifier in the language position"
- ([not-lang [(R a)]])
- (define-relation not-lang))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/term-lang.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/term-lang.rktd
deleted file mode 100644
index 06ead00cf8..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/term-lang.rktd
+++ /dev/null
@@ -1,11 +0,0 @@
-(#rx"before underscore"
- ([not-a-non-term Z_1])
- (term not-a-non-term #:lang syn-err-lang))
-
-(#rx"before underscore"
- ([not-a-non-term AA_1])
- (term (Q_1 Q_2 (Q_3 not-a-non-term)) #:lang syn-err-lang))
-
-(#rx".*define-language.*boglang"
- ([bogus-language boglang])
- (term 5 #:lang bogus-language))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/term.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/term.rktd
deleted file mode 100644
index 2312024850..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/term.rktd
+++ /dev/null
@@ -1,8 +0,0 @@
-(#rx"missing ellipsis"
- ([id-no-ellipsis x]) ([ellipsis ...])
- (term-let ([(id-no-ellipsis ellipsis) '(a b c)]) (term id-no-ellipsis)))
-
-(#rx"too few ellipses"
- ([bound x]) ([bind x])
- (... (term-let ([((bind ...) ...) '()])
-                (term (bound ...)))))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/term-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/term-test.rkt
deleted file mode 100644
index eb0093ea86..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/term-test.rkt
+++ /dev/null
@@ -1,107 +0,0 @@
-#lang racket/base
-(require redex/private/term
-         redex/private/lang-struct
-         redex/private/matcher
-         racket/function
-         "test-util.rkt")
-
-(module test racket/base)
-
-(reset-count)
-(test (term 1) 1)
-(test (term (1 2)) (list 1 2))
-(test (term (1 ,(+ 1 1))) (list 1 2))
-(test (term-let ([x 1]) (term (x x))) (list 1 1))
-(test (term-let ([(x ...) (list 1 2 3)]) (term ((y x) ...))) '((y 1) (y 2) (y 3)))
-
-(test (term (in-hole (1 hole) 2)) (term (1 2)))
-(test (term (in-hole (1 hole (hole x)) 2)) (term (1 2 (hole x))))
-
-(test (equal? (term hole) (term hole)) #t)
-(test (hole? (term hole)) #t)
-(test (hole? (term (hole #f))) #f)
-(test (hole? (term (hole the-name))) #f)
-
-(test (term-let-fn ((f (lambda (q) q)))
-                   (term (f 1 2 3)))
-      (term (1 2 3)))
-
-(test (term-let-fn ((f (lambda (q) `(y ,(car q)))))
-                   (term (f (zzzz))))
-      (term (y (zzzz))))
-
-(test (term-let-fn ((f (λ (x) (add1 (car x)))))
-                   (term (f 2)))
-      (term 3))
-
-(test (term-let ([((x ...) ...) (list (list 1 1) (list 2 2) (list 3 3))])
-                (term-let-fn ((f (λ (x) (car x))))
-                             (term ((qq (f x) ...) ...))))
-      (term ((qq 1 1) (qq 2 2) (qq 3 3))))
-
-(test (term-let-fn ((f (lambda (x) (car x))))
-                   (term (f hole)))
-      (term hole))
-
-(test (term-let-fn ((f (lambda (q) `(y ,(car q)))))
-                   (term-let-fn ((g (lambda (x) `(ff ,(car x)))))
-                                (term (g (f (zzzz))))))
-      (term (ff (y (zzzz)))))
-
-(test (term-let-fn ((f (lambda (q) `(y ,(car q)))))
-                   (term-let-fn ((g (lambda (x) `(ff ,(car x)))))
-                                (term (f (g (f (zzzz)))))))
-      (term (y (ff (y (zzzz))))))
-
-(test (term-let ([x 1])
-                (term (x . y)))
-      (term (1 . y)))
-
-(test (term-let ([(x ...) (list 3 2 1)])
-                (term (x ... . y)))
-      (term (3 2 1 . y)))
-
-(test (term-let ([(x . y) (cons 1 2)])
-                (term (x y)))
-      (term (1 2)))
-
-;; test that the implicit `plug' inserted by `in-hole' 
-;; deals with ellipses properly
-(test (term-let ([(E ...) '(1 2 3)])
-                (term ((in-hole E x) ...)))
-      (term (1 2 3)))
-
-(test (term-let-fn ((metafun car))
-                   (term-let ((x 'whatever)
-                              ((y ...) '(4 5 6)))
-                             (term (((metafun x) y) ...))))
-      '((whatever 4) (whatever 5) (whatever 6)))
-
-(test (term-let-fn ((metafun (λ (x) (car x))))
-                   (term-let (((y ...) '(4 5 6)))
-                             (term ((y (metafun 1)) ...))))
-      '((4 1) (5 1) (6 1)))
-
-(test (term-let-fn ((f (compose add1 car)))
-                   (term-let (((x ...) '(1 2 3))
-                              ((y ...) '(a b c)))
-                             (term (((f x) y) ...))))
-      '((2 a) (3 b) (4 c)))
-
-(test (term-let-fn ((f (curry foldl + 0)))
-                   (term-let (((x ...) '(1 2 3)))
-                             (term (f x ...))))
-      6)
-
-(test (term-let-fn ((f (compose add1 car)))
-                   (term-let (((x ...) '(1 2 3))
-                              (((y ...) ...) '((a b c) (d e f) (g h i))))
-                             (term ((((f x) y) ...) ...))))
-      '(((2 a) (3 b) (4 c)) ((2 d) (3 e) (4 f)) ((2 g) (3 h) (4 i))))
-
-(test (term-let-fn ((f (curry foldl + 0)))
-                   (term-let ((((x ...) ...) '((1 2) (3 4 5) (6))))
-                             (term ((f x ...) ...))))
-      '(3 12 6))
-
-(print-tests-passed 'term-test.rkt)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/test-docs-complete.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/test-docs-complete.rkt
deleted file mode 100644
index 9ce05d476e..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(module test racket/base) ; <- DISABLES TEST
-(require rackunit/docs-complete)
-(check-docs (quote redex/reduction-semantics))
-(check-docs (quote redex/pict))
-(check-docs (quote redex))
-(check-docs (quote redex/gui))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/test-util.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/test-util.rkt
deleted file mode 100644
index b2b850d896..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/test-util.rkt
+++ /dev/null
@@ -1,137 +0,0 @@
-#lang scheme
-
-(require redex/private/matcher
-         redex/private/lang-struct
-         (for-syntax syntax/parse setup/path-to-relative)
-         setup/path-to-relative
-         racket/runtime-path)
-(provide test tests reset-count
-         print-tests-passed
-         equal/bindings?
-         test-contract-violation
-         test/proc)
-
-(define (read-syntax-test path)
-  (call-with-input-file path
-    (λ (port)
-      (port-count-lines! port)
-      (read-syntax path port))))
-
-(define-syntax (test stx)
-  (syntax-case stx ()
-    [(_ expected got)
-     (with-syntax ([line (syntax-line stx)]
-                   [fn (if (path? (syntax-source (syntax got)))
-                           (path->relative-string/library (syntax-source (syntax got)))
-                           "<unknown file>")])
-       (syntax/loc stx (test/proc (λ () expected) got line fn)))]))
-
-(define tests 0)
-(define failures 0)
-(define (reset-count) 
-  (set! tests 0)
-  (set! failures 0))
-
-(define (print-tests-passed filename)
-  (cond
-    [(= 0 tests)
-     (printf "~a: no tests were run.\n" filename)]
-    [(= 0 failures)
-     (printf "~a: ~a passed.\n" 
-             filename 
-             (case tests
-               [(1) "1 test"]
-               [(2) "both tests"]
-               [else (format "~a tests" tests)]))]
-    [else
-     (printf "~a: ~a test~a failed.\n" filename failures (if (= 1 failures) "" "s"))]))
-
-(define (test/proc run expected line filename)
-  ;(printf "testing line ~s:~s\n" filename line)
-  (let ([got (with-handlers ((exn:fail? values)) (run))])
-    (set! tests (+ tests 1))
-    (unless (and (not (exn? got))
-                 (matches? got expected))
-      (set! failures (+ 1 failures))
-      (eprintf "test: file ~a line ~a:\n     got ~s\nexpected ~s\n"
-               filename
-               line
-               got
-               expected)
-      (when (exn:fail? got)
-        ((error-display-handler) (exn-message got) got))
-      (eprintf "\n"))))
-
-(define (matches? got expected)
-  (cond
-    [(regexp? expected)
-     (and (string? got) (regexp-match expected got) #t)]
-    [else
-     (equal/bindings? got expected)]))
-
-;; equal/bindings? : any any -> boolean
-;; compares two sexps (with embedded bindings) for equality.
-;; uses an order-insensitive comparison for the bindings
-(define (equal/bindings? fst snd)
-  (let loop ([fst fst]
-             [snd snd])
-    (cond
-      [(pair? fst)
-       (and (pair? snd) 
-            (loop (car fst) (car snd))
-            (loop (cdr fst) (cdr snd)))]
-      [(mtch? fst)
-       (and (mtch? snd)
-            (loop (mtch-bindings fst)
-                  (mtch-bindings snd))
-            (let ([g1 (gensym 'run-match-test-sym)])
-              (equal/bindings? (mtch-context fst)
-                               (mtch-context snd)))
-            (equal/bindings? (mtch-hole fst)
-                             (mtch-hole snd)))]
-      [(bindings? fst)
-       (and (bindings? snd)
-            (let ([fst-table (bindings-table fst)]
-                  [snd-table (bindings-table snd)])
-              (and (= (length fst-table)
-                      (length snd-table))
-                   (andmap
-                    loop
-                    (sort fst-table rib-lt)
-                    (sort snd-table rib-lt)))))]
-      [(and (bind? fst)
-            (bind? snd)
-            (context? (bind-exp fst))
-            (context? (bind-exp snd)))
-       (and (equal? (bind-name fst) (bind-name snd))
-            (let ([g (gensym 'run-match-test-sym2)])
-              (equal/bindings? (bind-exp fst)
-                               (bind-exp snd))))]
-      [(and (hole? fst)
-            (hole? snd))
-       #t]
-      [else (equal? fst snd)])))
-
-;; rib-lt : rib rib -> boolean
-(define (rib-lt r1 r2) (string<=? (format "~s" (bind-name r1))
-                                  (format "~s" (bind-name r2))))
-
-(define-syntax (test-contract-violation stx)
-  (syntax-parse stx
-    [(_ expr
-        (~or (~once (~seq #:blaming blaming:expr))
-             (~optional (~seq #:message message:expr)
-                        #:defaults ([message #'""]))
-             (~optional (~seq #:extract extract:expr)
-                        #:defaults ([extract #'values])))
-        ...)
-     #`(test (with-handlers ([(λ (exn)
-                                (let ([exn (extract exn)])
-                                  (and (exn:fail:contract:blame? exn)
-                                       (regexp-match? 
-                                        blaming
-                                        (format "~a" (blame-positive (exn:fail:contract:blame-object exn)))))))
-                              exn-message])
-               expr
-               (gensym 'no-violation))
-             #,(syntax/loc stx (regexp message)))]))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/tl-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/tl-test.rkt
deleted file mode 100644
index 9a5516d405..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/tl-test.rkt
+++ /dev/null
@@ -1,3523 +0,0 @@
-#lang racket
-  (require "test-util.rkt"
-           redex/reduction-semantics
-           (only-in redex/private/matcher make-bindings make-bind)
-           racket/match
-           racket/trace
-           redex/private/struct)
-
-  (module test racket/base)
-
-  (reset-count)
-
-  
-;                                                          
-;                                                          
-;    ;;                                                    
-;     ;                                                    
-;     ;     ;;;  ;; ;;    ;; ;;;;  ;;   ;;;    ;; ;;  ;;;  
-;     ;    ;   ;  ;;  ;  ;  ;;  ;   ;  ;   ;  ;  ;;  ;   ; 
-;     ;     ;;;;  ;   ;  ;   ;  ;   ;   ;;;;  ;   ;  ;;;;; 
-;     ;    ;   ;  ;   ;  ;   ;  ;   ;  ;   ;  ;   ;  ;     
-;     ;    ;   ;  ;   ;  ;   ;  ;  ;;  ;   ;  ;   ;  ;     
-;   ;;;;;   ;;;;;;;; ;;;  ;;;;   ;; ;;  ;;;;;  ;;;;   ;;;; 
-;                            ;                    ;        
-;                         ;;;                  ;;;         
-;                                                          
-;                                                          
-
-  
-  (define-language empty-language)
-  
-  (define-language grammar
-    (M (M M)
-       number)
-    (E hole
-       (E M)
-       (number E))
-    (X (number any)
-       (any number))
-    (Q (Q ...)
-       variable)
-    (UN (add1 UN)
-        zero))
-  
-  (test (let ([m (redex-match 
-                  empty-language
-                  (side-condition (any_1 ...) #t)
-                  '())])
-          (and m
-               (= 1 (length m))
-               (match-bindings (car m))))
-        (list (make-bind 'any_1 '())))
-  
-  (test (pair? (redex-match grammar M '(1 1))) #t)
-  (test (pair? (redex-match grammar M '(1 1 1))) #f)
-  (test (pair? (redex-match grammar
-                            (side-condition (M_1 M_2) (equal? (term M_1) (term M_2)))
-                            '(1 1)))
-        #t)
-  (test (pair? (redex-match grammar
-                           (side-condition (M_1 M_2) (equal? (term M_1) (term M_2))) 
-                           '(1 2)))
-        #f)
-  
-  (test (pair? ((redex-match grammar M) '(1 1)))
-        #t)
-  
-  (test (pair? (redex-match grammar (name not-an-nt_subscript 1) 1)) #t)
-
-  ;; next 3: test naming of subscript-less non-terminals
-  (test (pair? (redex-match grammar (M M) (term (1 1)))) #t)
-  (test (pair? (redex-match grammar (M M) (term (1 2)))) #f)
-  (test (pair? (redex-match grammar (M_1 M_2) (term (1 2)))) #t)
-  
-  (define-language base-grammar
-    (q 1)
-    (e (+ e e) number)
-    (x (variable-except +)))
-  
-  (define-extended-language extended-grammar
-    base-grammar 
-    (e .... (* e e))
-    (x (variable-except + *))
-    (r 2))
-  
-  (test (pair? (redex-match extended-grammar e '(+ 1 1))) #t)
-  (test (pair? (redex-match extended-grammar e '(* 2 2))) #t)
-  (test (pair? (redex-match extended-grammar r '2)) #t)
-  (test (pair? (redex-match extended-grammar q '1)) #t)
-  (test (pair? (redex-match extended-grammar x '*)) #f)
-  (test (pair? (redex-match extended-grammar x '+)) #f)
-  (test (pair? (redex-match extended-grammar e '....)) #f)
-  
-  ;; make sure that `language' with a four period ellipses signals an error
-  (test (regexp-match #rx"[.][.][.][.]" (with-handlers ([exn? exn-message]) 
-                                          (let ()
-                                            (define-language x (e ....))
-                                            12)))
-        '("...."))
-
-  (let ()
-    ; non-terminals added by extension can have underscores
-    (define-extended-language L base-grammar
-      (z () (1 z_1 z_1)))
-    (test (redex-match L z (term (1 () (1 () ())))) #f))
-  
-  ;; test multiple variable non-terminals
-  (let ()
-    (define-language lang
-      ((l m) (l m) x)
-      (x variable-not-otherwise-mentioned))
-    (test (pair? (redex-match lang m (term x)))
-          #t))
-  
-  ;; test multiple variable non-terminals
-  (let ()
-    (define-language lang
-      ((l m) (l m) x)
-      (x variable-not-otherwise-mentioned))
-    (test (pair? (redex-match lang l (term x)))
-          #t))
-  
-  (let ()
-    (define-language L
-      [Cv (name n variable-not-otherwise-mentioned)])
-    (test (redex-match L Cv (term ())) #f)
-    (test (pair? (redex-match L Cv (term x))) #t))
-  
-  (let ()
-    (define-language lang
-      ((x y) 1 2 3))
-    (define-extended-language lang2 lang
-      (x .... 4))
-    (test (pair? (redex-match lang2 x 4)) #t)
-    (test (pair? (redex-match lang2 y 4)) #t)
-    (test (pair? (redex-match lang2 x 1)) #t)
-    (test (pair? (redex-match lang2 y 2)) #t))
-  
-  ;; test that the variable "e" is not bound in the right-hand side of a side-condition
-  ;; this one signaled an error at some point
-  (let ()
-    (define-language bad
-      (e 2 (side-condition (e) #t)))
-    (test (pair? (redex-match bad e '(2)))
-          #t))
-
-  ;; test that the variable "e" is not bound in the right-hand side of a side-condition
-  ;; this one tests to make sure it really isn't bound
-  (let ([x #f])
-    (define-language bad
-      (e 2 (side-condition (e) (set! x (term e)))))
-    (redex-match bad e '(2))
-    (test x 'e))
-  
-  ;; test multiple variable non-terminals being extended
-  (let ()
-    (define-language lang
-      ((x y) 1 2 3))
-    (define-extended-language lang2 lang
-      (x .... 4))
-    (test (pair? (redex-match lang2 x 4)) #t)
-    (test (pair? (redex-match lang2 y 4)) #t)
-    (test (pair? (redex-match lang2 x 1)) #t)
-    (test (pair? (redex-match lang2 y 2)) #t))
-  
-  ;; test multiple variable non-terminals in an extended language
-  (let ()
-    (define-language lang
-      ((x y) 1 2 3))
-    (define-extended-language lang2 lang
-      ((z w) 5 6 7))
-    (test (pair? (redex-match lang2 z 5)) #t)
-    (test (pair? (redex-match lang2 w 6)) #t))
-  
-  ;; test cases that ensure that extending any one of a
-  ;; multiply defined non-terminal gets extended properly
-  (let ()
-    (define-language iswim
-      ((V U W) AA))
-
-    (define-extended-language iswim-cont
-      iswim
-      (W .... QQ))
-
-    (test (pair? (redex-match iswim-cont U (term QQ)))
-          #t))
-  
-  (let ()
-    (define-language iswim
-      ((V U W) AA))
-
-    (define-extended-language iswim-cont
-      iswim
-      (W .... QQ))
-
-    (test (pair? (redex-match iswim-cont V (term QQ)))
-          #t)
-    (test (pair? (redex-match iswim-cont U (term QQ)))
-          #t)
-    (test (pair? (redex-match iswim-cont W (term QQ)))
-          #t))
-  
-  (let ()
-    (define-language iswim
-      ((V U W) AA))
-    
-    (define-extended-language iswim-cont
-      iswim
-      (V .... QQ))
-    
-    (test (pair? (redex-match iswim-cont V (term QQ)))
-          #t)
-    (test (pair? (redex-match iswim-cont U (term QQ)))
-          #t)
-    (test (pair? (redex-match iswim-cont W (term QQ)))
-          #t))
-  
-  (let ()
-    (define-language okay
-      [(X Y) z])
-    
-    (define-extended-language replace-both
-      okay
-      [(X Y) q])
-    
-    ;; this test ran into an infinite loop in an earlier version of redex.
-    (test (redex-match replace-both X (term explode)) #f))
-  
-  (test (with-handlers ([exn? exn-message])
-          (let () 
-            (define-language main
-              [(X Y) z])
-            (define-extended-language new
-              main
-              [(X Y Z) q])
-            (void)))
-        "define-extended-language: new language extends old non-terminal X and also adds new shortcut Z")
-  
-  (test (with-handlers ([exn? exn-message])
-          (let () 
-            (define-language main
-              [(X Y) z]
-              [(P Q) w])
-            (define-extended-language new
-              main
-              [(X P) q])
-            (void)))
-        "define-extended-language: new language does not have the same non-terminal aliases as the old, non-terminal P was not in the same group as X in the old language")
-  
-  ;; underscores in literals
-  (let ()
-    (define-language L
-      (x (variable-except a_b))
-      (y (variable-prefix a_b)))
-    (test (pair? (redex-match L x (term a_c))) #t)
-    (test (pair? (redex-match L y (term a_bc))) #t))
-  
-  ; underscores allowed on built-in non-terminals and names bound
-  (let ([m (redex-match 
-            grammar 
-            (any_1 number_1 natural_1 integer_1
-                   real_1 string_1 variable_1
-                   variable-not-otherwise-mentioned_1)
-            '(1 2 3 4 5 "s" s t))])
-    (test (if m
-              (map bind-exp
-                   (sort (match-bindings (car m))
-                         string<=?
-                         #:key (compose symbol->string bind-name)))
-              '())
-          '(1 4 3 2 5 "s" t s)))
-
-  (let ()
-    (define-language L
-      (e (e e) number))
-    ;; not a syntax error since first e is not a binder
-    (test (pair? (redex-match L ((cross e) e ...) (term ((hole 2) 1)))) #t))
-  
-  ;; match structures do not report ..._x bindings
-  (test (map match-bindings (redex-match grammar (a ..._1) (term (a a a))))
-        '(()))
-  
-  ;; make sure redex-match? does the equality check
-  (test (redex-match? empty-language (any_0 any_0) (term (1 2))) #f)
-
-  (define-syntax (test-match stx)
-    (syntax-case stx ()
-      [(_ actual (((var val) ...) ...))
-       (syntax/loc stx
-         (test (apply
-                set
-                (for/list ([match actual])
-                  (for/list ([bind (match-bindings match)])
-                    (list (bind-name bind) (bind-exp bind)))))
-               (apply set (list (list (list 'var (term val)) ...) ...))))]))
-  
-  ;; cross
-  (let ()
-    (define-language L
-      (e (e e)
-         (cont (hide-hole E))
-         number
-         x)
-      (E hole
-         (e ... E e ...))
-      (x variable-not-otherwise-mentioned))
-    (test-match 
-     (redex-match 
-      L 
-      (in-hole (cross e) e)
-      (term (cont (1 hole))))
-     (((e (cont (1 hole))))
-      ((e 1)))))
-  (let ()
-    (define-language L
-      (e (e e ...)
-         x
-         v)
-      (v (λ (x ...) e)
-         cont-val
-         number)
-      (cont-val (cont (hide-hole E)))
-      (E hole
-         (in-hole L E))
-      (L (v ... hole e ...))
-      (x variable-not-otherwise-mentioned))
-    
-    ;; no "found two holes" error
-    (test (redex-match L (cross e) (term (cont ((λ (x) x) hole)))) #f)
-    
-    (test-match 
-     (redex-match 
-      L 
-      (in-hole (cross e) e)
-      (term ((cont ((λ (x) x) hole)) (λ (y) y))))
-     (((e x))
-      ((e ((cont ((λ (x) x) hole)) (λ (y) y))))
-      ((e y))
-      ((e (λ (y) y)))
-      ((e (cont ((λ (x) x) hole)))))))
-  
-  ;; test caching
-  (let ()
-    (define match? #t)
-    
-    (define-language lang
-      (x (side-condition any match?)))
-    
-    (test (pair? (redex-match lang x 1)) #t)
-    (set! match? #f)
-    (test (pair? (redex-match lang x 1)) #t)
-    (parameterize ([caching-enabled? #f])
-      (test (pair? (redex-match lang x 1)) #f)))
-  
-  
-  (let ()
-    (define sc-eval-count 0)
-    (define-language lang
-      (x (side-condition any (begin (set! sc-eval-count (+ sc-eval-count 1))
-                                    #t))))
-    
-    (redex-match lang x 1)
-    (redex-match lang x 1)
-    (parameterize ([caching-enabled? #f])
-      (redex-match lang x 1))
-    (test sc-eval-count 2))
-  
-  (let ()
-    (define rhs-eval-count 0)
-    (define-metafunction empty-language
-      [(f any) ,(begin (set! rhs-eval-count (+ rhs-eval-count 1))
-                       1)])
-    
-    (term (f 1))
-    (term (f 1))
-    (parameterize ([caching-enabled? #f])
-      (term (f 1)))
-    (test rhs-eval-count 2))
-  
-  (let ()
-    (define-language L)
-    (define-extended-language E L
-      (v ((bar X_1) X_1))
-      ((X Y) any))
-    (test (and (redex-match E v (term ((bar 1) 1))) #t) #t)
-    (test (redex-match E v (term ((bar 1) 2))) #f))
-  
-  (let ()
-    (define-language L
-      (M N ::= (M N) (λ (x) M) x)
-      (x ::= variable-not-otherwise-mentioned))
-    (test (and (redex-match L M '(λ (x) (x x))) #t) #t)
-    (test (and (redex-match L N '(λ (x) (x x))) #t) #t)
-    (define-extended-language L+ L
-      (M ::= .... n)
-      (n m ::= number))
-    (test (and (redex-match L+ M '(λ (x) 7)) #t) #t)
-    (test (and (redex-match L+ m 7) #t) #t)
-    (let ([::= void])
-      (define-language L
-        (::= () (number ::=)))
-      (test (and (redex-match L ::= '(1 ())) #t) #t)))
-  
-  (let ()
-    (define-language L1
-      ((q x) 1 2 3)
-      ((y w) 4 5 6 x)
-      (z 7 8 9))
-    
-    (define-language L2
-      ((x y) 100 101 102)
-      (b 103 x))
-    
-    (define-union-language L L1 (- L2))
-    
-    (test (and (redex-match L x 3) #t) #t)
-    (test (and (redex-match L y 2) #t) #t)
-    (test (redex-match L x 100) #f)
-    (test (and (redex-match L -x 100) #t) #t)
-    (test (and (redex-match L -b 100) #t) #t)
-    (test (redex-match L -b 3) #f))
-
-  ;; The following two tests make sure that `define-union-language`
-  ;; works with extended languages
-  (let ()
-    (define-language LBase
-      (e (+ e e)
-         number))
-
-    (define-extended-language L1 LBase
-      (e ....
-         (- e e)))
-
-    (define-extended-language L2 LBase
-      (e ....
-         (* e e)))
-
-    (define-union-language LMerge (one. L1) (two. L2))
-
-    #|
-    The error that used to be raised:
-    define-union-language: two sublanguages both contribute the non-terminal: one.e in:
-      (one. L1)
-      (one. L1)
-    |#
-
-
-    (test (and (redex-match LMerge one.e (term (- 0 0))) #t) #t)
-    (test (and (redex-match LMerge two.e (term (* 0 0))) #t) #t)
-
-    (define-union-language LMergeUntagged L1 L2)
-
-    (for ([t (list (term 1) (term (* 1 1)) (term (+ 1 1)) (term (- 1 1)))])
-       (test (redex-match? LMergeUntagged e t) #t)))
-  
-  ;; test that define-union-language properly merges non-terminals
-  (let () 
-    (define-language LBase
-      (e (+ e e) number))
-    
-    (define-extended-language L1 LBase
-      (e ....  (- e e)))
-    
-    (define-extended-language L2 LBase
-      (e ....  (* e e)))
-    
-    ;; Untagged union of two languages that define the same nonterminal
-    (define-union-language LMergeUntagged L1 L2)
-    
-    ;; Tagged merge of two extended languages that define the same
-    ;; nonterminal
-    (define-union-language LMergeTagged (f. L1) (d. L2))
-    
-    (test (redex-match? LMergeUntagged e (term 1)) #t)
-    (test (redex-match? LMergeUntagged e (term (* 1 1))) #t)
-    (test (redex-match? LMergeUntagged e (term (+ 1 1))) #t)
-    (test (redex-match? LMergeUntagged e (term (- 1 1))) #t)
-    
-    (test (redex-match? LMergeTagged f.e 1) #t)
-    (test (redex-match? LMergeTagged d.e 1) #t)
-    
-    (test (redex-match? LMergeTagged f.e (term (+ 1 1))) #t)
-    (test (redex-match? LMergeTagged f.e (term (- 1 1))) #t)
-    (test (redex-match? LMergeTagged f.e (term (* 1 1))) #f)
-    
-    (test (redex-match? LMergeTagged d.e (term (+ 1 1))) #t)
-    (test (redex-match? LMergeTagged d.e (term (* 1 1))) #t)
-    (test (redex-match? LMergeTagged d.e (term (- 1 1))) #f))
-  
-  (let ()
-    (define-language L1 (e f ::= 1))
-    (define-language L2 (e g ::= 2))
-    (define-union-language Lc L1 L2)
-    (test (redex-match? Lc e 1) #t)
-    (test (redex-match? Lc e 2) #t)
-    (test (redex-match? Lc f 1) #t)
-    (test (redex-match? Lc f 2) #t)
-    (test (redex-match? Lc g 1) #t)
-    (test (redex-match? Lc g 2) #t))
-  
-  (let ()
-    (define-language UT
-      (e (e e)
-         (λ (x) e)
-         x))
-    
-    (define-language WT
-      (e (e e)
-         (λ (x t) e)
-         x)
-      (t (→ t t)
-         num))
-    
-    (define-extended-language UT+ UT
-      (e ....
-         (foo e e)))
-    
-    (define-union-language B (ut. UT+) (wt. WT))
-    
-    (test (and (redex-match B ut.e (term (foo x x))) #t) #t)
-    (test (redex-match B wt.e (term (foo x x))) #f))
-
-  (let ()
-    (test (redex-match empty-language number 'a) #f)
-    (test (redex-match empty-language (in-hole hole number) 'a) #f))
-
-  (let ()
-    (define-language L
-      (a number)
-      (b (a a))
-      (c (b b)))
-    (test (term 1 #:lang L) 1)
-    (test (term ((1 2) (3 4)) #:lang L) '((1 2) (3 4)))
-    (test (term (1 2 3 4) #:lang L) '(1 2 3 4))
-    (test (redex-let L ([a_1 5])
-                     (term (a_1 6) #:lang L))
-          '(5 6))
-    (test (redex-let L ([number_1 5])
-                     (term (number_1 6) #:lang L))
-          '(5 6)))
-    
-(let ()
-  ;; test to make sure that reasonable short-circuiting is happening
-  ;; when matching lists of differing length to avoid exponential behavior
-  
-  ;; this test is fragile because it is based on cpu times.
-  ;; on my machine, with the bug in place it takes 2000+ msec
-  ;; to run and with the fix it takes 200 or so msec.
-  
-  (define-language abort-core-lang
-    (e integer
-       (- e)
-       (- e e)))
-  
-  (define (add-minuses t count)
-    (let loop ([i count])
-      (cond
-        [(zero? i) t]
-        [else `(- ,(loop (- i 1)))])))
-  
-  
-  (define-values (answer cpu real gc) 
-    (time-apply
-     (λ ()
-       (parameterize ([caching-enabled? #f])
-         (for ([count (in-range 20)])
-           (redex-match abort-core-lang
-                        e
-                        (add-minuses 11 count)))))
-     '()))
-  (test (< cpu 1000) #t))
-
-(let ()
-  ;; _ as a non-binding match
-  (define-language L)
-
-  (test (pair? (redex-match L _ '(1 2 3)))
-        #t)
-  (test (redex-match L (_ _) '(1 2 3))
-        #f)
-  (test (pair? (redex-match L (_ _ ...)'(1 2)))
-        #t)
-  (test (redex-match L (_ _ ...)'())
-        #f)
-  (test (pair? (redex-match L (_ (_ _ ...) ...) '((1 2) (3 4) (5 6))))
-        '#t)
-  (test (redex-match L (_ (_ _ ...) ...) '((1 2) (3 4) () (5 6)))
-        #f))
-
-
-(let ()
-  (test (and (redex-match
-              empty-language
-              (natural ..._r)
-              (term ()))
-             #t)
-        #t))
-
-;                                                                                             
-;                                                                                             
-;                                 ;;;                                ;                        
-;                  ;             ;                           ;                                
-;  ;;; ;    ;;;   ;;;;;   ;;;   ;;;;; ;;  ;; ;; ;;    ;;;;  ;;;;;  ;;;     ;;;  ;; ;;    ;;;; 
-;   ; ; ;  ;   ;   ;     ;   ;   ;     ;   ;  ;;  ;  ;   ;   ;       ;    ;   ;  ;;  ;  ;   ; 
-;   ; ; ;  ;;;;;   ;      ;;;;   ;     ;   ;  ;   ;  ;       ;       ;    ;   ;  ;   ;   ;;;  
-;   ; ; ;  ;       ;     ;   ;   ;     ;   ;  ;   ;  ;       ;       ;    ;   ;  ;   ;      ; 
-;   ; ; ;  ;       ;   ; ;   ;   ;     ;  ;;  ;   ;  ;   ;   ;   ;   ;    ;   ;  ;   ;  ;   ; 
-;  ;;;;;;;  ;;;;    ;;;   ;;;;; ;;;;;   ;; ;;;;; ;;;  ;;;     ;;;  ;;;;;   ;;;  ;;; ;;; ;;;;  
-;                                                                                             
-;                                                                                             
-;                                                                                             
-;                                                                                             
-
-  
-  (define-metafunction grammar
-    [(f (side-condition (number_1 number_2)
-                        (< (term number_1)
-                           (term number_2))))
-     x]
-    [(f (number 1)) y]
-    [(f (number_1 2)) ,(+ (term number_1) 2)]
-    [(f (4 4)) q]
-    [(f (4 4)) r])
-
-  (define-metafunction grammar
-    [(g X) x])
-  
-  (test (term (f (1 17))) 'x)
-  (test (term (f (11 1))) 'y)
-  (test (term (f (11 2))) 13)
-  
-  
-  ;; match two clauess => take first one
-  (test (term (f (4 4))) 'q)
-  
-  ;; match one clause two ways => error
-  (let ()
-    (define-metafunction empty-language
-      [(ll (number_1 ... number_2 ...)) (number_1 ...)])
-    (test (with-handlers ((exn? (λ (x) 'exn-raised))) 
-            (term (ll ()))
-            'no-exn)
-          'no-exn)
-    (test (with-handlers ((exn? (λ (x) 'exn-raised))) 
-            (term (ll (4 4)))
-            'no-exn)
-          'exn-raised))
-  
-  ;; match no ways => error
-  (test (with-handlers ((exn? (λ (x) 'exn-raised))) (term (f mis-match)) 'no-exn)
-        'exn-raised)
-
-  ;; test redex-match in RHS and side-condition
-  (let ()
-    (define-metafunction empty-language
-      [(f)
-       ,(and (redex-match empty-language number 7) #t)
-       (side-condition (redex-match empty-language number 7))])
-    (test (term (f)) #t))
-  
-  (define-metafunction grammar
-    [(h (M_1 M_2)) ((h M_2) (h M_1))]
-    [(h number_1) ,(+ (term number_1) 1)])
-  
-  (test (term (h ((1 2) 3)))
-        (term (4 (3 2))))
-  
-  (define-metafunction grammar
-    [(h2 (Q_1 ...)) ((h2 Q_1) ...)]
-    [(h2 variable) z])
-  
-  (test (term (h2 ((x y) a b c)))
-        (term ((z z) z z z)))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f (1)) 1]
-      [(f (2)) 2]
-      [(f 3) 3])
-    (test (in-domain? (f 1)) #f)
-    (test (in-domain? (f (1))) #t)
-    (test (in-domain? (f ((1)))) #f)
-    (test (in-domain? (f 3)) #t)
-    (test (in-domain? (f 4)) #f))
-  
-  (let ()
-    (define-metafunction empty-language
-      f : number -> number
-      [(f 1) 1])
-    (test (in-domain? (f 1)) #t)
-    (test (in-domain? (f 2)) #t)
-    (test (in-domain? (f x)) #f))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f x) x])
-    (test 
-     (term-let ((y 'x))
-               (in-domain? (f y)))
-     #t)
-    (test 
-     (term-let ((y 'z))
-               (in-domain? (f y)))
-     #f))
-  
-  (let ()
-    (define-language foo)
-
-    (test (term-let ([bar 23])
-                    (term 5 #:lang foo))
-          5)
-
-    (test (term-let ([foo 23])
-                    (term 6 #:lang foo))
-          6)
-
-    (test (term-let ([foo 12])
-                    (term-let ([foo 23])
-                              (term 7 #:lang foo)))
-          7)
-    )
-  
-  ; Extension reinterprets the base meta-function's contract
-  ; according to the new language.
-  (let ()
-    (define-language L (x 1))
-    (define-extended-language M L (x 2))
-    (define-metafunction L
-      f : x -> x
-      [(f x) x])
-    (define-metafunction/extension f M
-      [(g q) q])
-    
-    (with-handlers ([(λ (x) 
-                       (and (exn:fail? x)
-                            (regexp-match? #rx"no clauses matched"
-                                           (exn-message x))))
-                     (λ (_) #f)])
-      (test (begin (term (g 2)) #t) #t))
-    
-    (test (in-domain? (g 2)) #t))
-  
-  ; in-domain? interprets base meta-function LHSs according to
-  ; the new language.
-  (let ()
-    (define-language L (x 1))
-    (define-extended-language M L (x 2))
-    (define-metafunction L
-      [(f x) x])
-    (define-metafunction/extension f M
-      [(g q) q])
-    (test (in-domain? (g 2)) #t))
-  
-  ;; mutually recursive metafunctions
-  (define-metafunction grammar
-    [(odd zero) #f]
-    [(odd (add1 UN_1)) (even UN_1)])
-  
-  (define-metafunction grammar
-    [(even zero) #t]
-    [(even (add1 UN_1)) (odd UN_1)])
-  
-  (test (term (odd (add1 (add1 (add1 (add1 zero))))))
-        (term #f))
-    
-  (let ()
-    (define-metafunction empty-language
-      [(pRe xxx) 1])
-    
-    (define-metafunction empty-language
-      [(Merge-Exns any_1) any_1])
-    
-    (test (term (pRe (Merge-Exns xxx)))
-          1))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f (x)) ,(term-let ([var-should-be-lookedup 'y]) (term (f var-should-be-lookedup)))]
-      [(f y) y]
-      [(f var-should-be-lookedup) var-should-be-lookedup]) ;; taking this case is bad!
-    
-    (test (term (f (x))) (term y)))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f (x)) (x ,@(term-let ([var-should-be-lookedup 'y]) (term (f var-should-be-lookedup))) x)]
-      [(f y) (y)]
-      [(f var-should-be-lookedup) (var-should-be-lookedup)]) ;; taking this case is bad!
-    
-    (test (term (f (x))) (term (x y x))))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f (any_1 any_2))
-       case1
-       (side-condition (not (equal? (term any_1) (term any_2))))
-       (side-condition (not (equal? (term any_1) 'x)))]
-      [(f (any_1 any_2))
-       case2
-       (side-condition (not (equal? (term any_1) (term any_2))))]
-      [(f (any_1 any_2))
-       case3])
-    (test (term (f (q r))) (term case1))
-    (test (term (f (x y))) (term case2))
-    (test (term (f (x x))) (term case3)))
-
-  (let ()
-    (define-metafunction empty-language
-      [(f (n number)) (n number)]
-      [(f (a any)) (a any)]
-      [(f (v variable)) (v variable)]
-      [(f (s string)) (s string)])
-    (test (term (f (n 1))) (term (n 1)))
-    (test (term (f (a (#f "x" whatever)))) (term (a (#f "x" whatever))))
-    (test (term (f (v x))) (term (v x)))
-    (test (term (f (s "x"))) (term (s "x"))))
-  
-  ;; test ..._1 patterns
-  (let ()
-    (define-metafunction empty-language
-      [(zip ((variable_id ..._1) (number_val ..._1)))
-       ((variable_id number_val) ...)])
-    
-    (test (term (zip ((a b) (1 2)))) (term ((a 1) (b 2)))))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f any_1 any_2 any_3) (any_3 any_2 any_1)])
-    (test (term (f 1 2 3)) 
-          (term (3 2 1))))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f (any_1 any_2 any_3)) 3])
-    (define-metafunction/extension f empty-language
-      [(g (any_1 any_2)) 2])
-    (define-metafunction/extension g empty-language
-      [(h (any_1)) 1])
-    (test (term (h (1))) 1)
-    (test (term (h (1 2))) 2)
-    (test (term (h (1 2 3))) 3))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f any_1 any_2 any_3) 3])
-    (define-metafunction/extension f empty-language
-      [(g any_1 any_2) 2])
-    (define-metafunction/extension g empty-language
-      [(h any_1) 1])
-    (test (term (h 1)) 1)
-    (test (term (h 1 2)) 2)
-    (test (term (h 1 2 3)) 3))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f number_1 number_2) (f number_1)])
-    (define-metafunction/extension f empty-language
-      [(g number_1) number_1])
-    (define-metafunction empty-language
-      [(h number_1 number_2) (h number_1)]
-      [(h number_1) number_1])
-    (test (term (g 11 17)) 11)
-    (test (term (h 11 17)) 11))
-
-  (let ()
-    (define-language L 
-      (v 1))
-    (define-extended-language M
-      L
-      (v .... 2))
-    (define-metafunction L
-      [(f v) v])
-    (define-metafunction/extension f M
-      [(g 17) 17])
-    (test (term (g 2)) 2))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f any) 1])
-    (define-metafunction/extension f empty-language
-      [(g any) 2])
-    (test (term (g 0)) 2))
-  
-  (let ()
-    (define-language L 
-      (v 1 (v)))
-    (define-metafunction L
-      f : v -> v
-      [(f (v)) 
-       any_1
-       (where any_1 (f v))])
-    
-    (define-extended-language M
-      L
-      (v .... 2))
-    (define-metafunction/extension f M
-      g : v -> v
-      [(g 2) 2])
-
-    (test (term (g (2))) 2))
-  
-  (let ()
-    (define-language L (x 1))
-    (define-extended-language M L (x 2))
-    (define-metafunction L 
-      [(f)
-       yes
-       (where x 2)]
-      [(f)
-       no])
-    (define-metafunction/extension f M
-      g : -> any)
-    (test (term (g)) 'yes))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f (number_1 number_2))
-       number_3
-       (where number_3 ,(+ (term number_1) (term number_2)))])
-    (test (term (f (11 17))) 28))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f variable) 
-       (any_x any_x)
-       (where any_x (variable variable))])
-    (test (term (f z)) 
-          (term ((z z) (z z)))))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f number_1)
-       number_1
-       (where number_2 ,(add1 (term number_1)))
-       (where number_3 ,(add1 (term number_2)))
-       (side-condition (and (number? (term number_3))
-                            (= (term number_3) 4)))]
-      [(f any) 0])
-    (test (term (f 2)) 2))
-  
-  (let ()
-    (define-language x-lang
-      (x variable))
-    (define-metafunction x-lang
-      f : x x -> x
-      [(f x_1 x_2) x_1])
-    (test (term (f p q)) (term p))
-    (test (in-domain? (f p q)) #t))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(err number_1 ... number_2 ...) (number_1 ...)])
-    (test (term (err)) (term ()))
-    (test (with-handlers ((exn:fail:redex? (λ (x) 'right-exn))
-                          ((λ (x) #t) (λ (x) 'wrong-exn)))
-            (term (err 1 2))
-            'no-exn)
-          'right-exn))
-  
-  (let ()
-    (define-metafunction empty-language
-      err : number ... -> number
-      [(err number ...) 1])
-    (test (with-handlers ((exn:fail:redex? (λ (x) 'right-exn))
-                          ((λ (x) #t) (λ (x) 'wrong-exn)))
-            (term (err #f #t))
-            'no-exn)
-          'right-exn))
-  
-  (let ()
-    (define-metafunction empty-language
-      err : number ... -> number
-      [(err number ...) #f])
-    (test (with-handlers ((exn:fail:redex? (λ (x) 'right-exn))
-                          ((λ (x) #t) (λ (x) 'wrong-exn)))
-            (term (err 1 2))
-            'no-exn)
-          'right-exn))
-  
-  (let ()
-    (define-metafunction empty-language
-      err : number ... -> (number number)
-      [(err number ...) (number ...)])
-    (test (with-handlers ((exn:fail:redex? (λ (x) 'right-exn))
-                          ((λ (x) #t) (λ (x) 'wrong-exn)))
-            (term (err 1 2))
-            'no-exn)
-          'no-exn)
-    (test (with-handlers ((exn:fail:redex? (λ (x) 'right-exn))
-                          ((λ (x) #t) (λ (x) 'wrong-exn)))
-            (term (err 1 1))
-            'no-exn)
-          'no-exn))
-    
-  (let ()
-    ;; test that 'where' clauses can contain recursive calls.
-    (define-metafunction empty-language
-      [(f (any)) 
-       x
-       (where x (f any))]
-      [(f any) any])
-    (test (term (f ((((x))))))
-          (term x)))
-  
-  (let ()
-    (define-language lamv
-      (z variable hole))
-
-    (define-metafunction lamv
-      foo : z  -> any
-      [(foo hole) dontcare]
-      [(foo variable) docare])
-
-    (test (term (foo hole))
-          (term dontcare))
-    (test (term (foo y))
-          (term docare)))
-  
-  (let ()
-    (define f-called? #f)
-    (define-metafunction empty-language
-      f : (side-condition any_1 (begin (set! f-called? #t) #t)) -> any
-      [(f any_1) any_1])
-    (test (term (f 1)) 1)
-    (test f-called? #t))
-    
-  (let ()
-    (define g-called? #f)
-    (define-metafunction empty-language
-      g : any -> (side-condition any_1 (begin (set! g-called? #t) #t))
-      [(g any_1) any_1])
-    (test (term (g 1)) 1)
-    (test g-called? #t))
-  
-  ;; test that tracing works properly
-  ;; note that caching comes into play here (which is why we don't see the recursive calls)
-  (let ()
-    (define-metafunction empty-language
-      [(f 0) 0]
-      [(f number) (f ,(- (term number) 1))])
-    
-    (let ([sp (open-output-string)])
-      (parameterize ([current-output-port sp])
-        (term (f 1)))
-      (test (get-output-string sp) ""))
-    
-    (let ([sp (open-output-string)])
-      (parameterize ([current-output-port sp]
-                     [current-traced-metafunctions 'all]
-                     [print-as-expression #f])
-        (term (f 1)))
-      (test (get-output-string sp) "c>(f 1)\n <0\n"))
-    
-    (let ([sp (open-output-string)])
-      (parameterize ([current-output-port sp]
-                     [current-traced-metafunctions 'all]
-                     [print-as-expression #f]
-                     [caching-enabled? #f])
-        (term (f 1)))
-      (test (get-output-string sp) " >(f 1)\n > (f 0)\n < 0\n <0\n"))
-    
-    (let ([sp (open-output-string)])
-      (parameterize ([current-output-port sp]
-                     [current-traced-metafunctions '(f)]
-                     [print-as-expression #f])
-        (term (f 1)))
-      (test (get-output-string sp) "c>(f 1)\n <0\n"))
-    
-    
-    (define-metafunction empty-language
-      [(g (any)) ((g any) (g any))]
-      [(g 1) 1])
-    
-    (let ([sp (open-output-string)])
-      (parameterize ([current-output-port sp]
-                     [current-traced-metafunctions '(g)]
-                     [print-as-expression #f])
-        (term (g (1))))
-      (test (get-output-string sp) " >(g (1))\n > (g 1)\n < 1\nc> (g 1)\n < 1\n <(1 1)\n"))
-    
-    )
-  
-  (let ()
-    (define-language var-lang [(x y z w) variable])
-    
-    ;; this should produce the second case, 
-    ;; since the where clause (should) fail to match 
-    ;; in the first case.
-    (define-metafunction var-lang
-      [(f x)
-       first-case
-       (where (AnotherAtom y) (Atom x))]
-      [(f x)
-       second-case])
-    
-    (test (term (f a)) (term second-case)))
-  
-  (let ()
-    
-    ;; this is an ambiguous function 
-    ;; and should signal an error if it is ever called
-    ;; with multiple different arguments, but if the
-    ;; arguments are all the same, it will return
-    ;; the same result for any parse, and thus should be allowed.
-    (define-metafunction empty-language
-      [(f any_x ... any_y any_z ...)
-       any_y])
-    
-    (test (term (f 1 1 1 1 1)) (term 1)))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(ex variable_x) 
-       variable_x
-       (where quote variable_x)])
-    
-    (test (term (ex quote)) (term quote)))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f any ...)
-       (any ...)
-       (where variable_1 x)
-       (side-condition #f)
-       (where (number ...) y)]
-      [(f any ...)
-       12345])
-    
-    (test (term (f 8)) 12345))
-  
-  (let ()
-    (define-metafunction empty-language
-      [(f number_1 number_2 ... (number_s ...) ...)
-       yes
-       (where number_1 1)
-       (where (number_3 ...) ,(cdr (term (number_2 ...))))
-       (where (number_3 ...) (3 4 5))
-       (where (number_1 (number_s ...) ...)
-              ,(if (null? (term ((number_s ...) ...)))
-                   (term (number_1))
-                   (term (number_1 () (6) (7 8) (9 10 11)))))]
-      [(f any ...)
-       no])
-    (test (term (f 1 2 3 4 5)) 'yes)
-    (test (term (f 1 2 3 4)) 'no)
-    (test (term (f 0 2 3 4 5)) 'no)
-    (test (term (f 1 2 3 4 5 () (6) (7 8) (9 10 11))) 'yes))
-  
-  (let ()
-    (define-language L 
-      [bool #t #f])
-    (define-metafunction L
-      f : any -> bool or number
-      [(f any) any])
-    (test (term (f 1)) (term 1))
-    (test (term (f #f)) (term #f)))
-  
-  (let ()
-    (define-language L 
-      [bool #t #f])
-    (define-metafunction L
-      f : any -> bool ∪ number
-      [(f any) any])
-    (test (term (f 1)) (term 1))
-    (test (term (f #f)) (term #f)))
-  
-  (let ()
-    (define-language L 
-      [bool #t #f]
-      [abc a b c]
-      [def d e f])
-    (define-metafunction L
-      f : any -> bool ∨ number ∪ abc or def
-      [(f any) any])
-    (test (term (f 1)) (term 1))
-    (test (term (f #f)) (term #f))
-    (test (term (f c)) (term c))
-    (test (term (f e)) (term e)))
-  
-  ;; test that the contracts are called in order (or else 'car' fails)
-  (let ()
-    (define x '())
-    (define-language L
-      [seq (any any ...)])
-    (define-metafunction L
-      g : any -> 
-      (side-condition any_1 (begin (set! x (cons 1 x)) #f))
-      or (side-condition any_1 (begin (set! x (cons 2 x)) #f))
-      or any
-      [(g any) any])
-    (test (begin (term (g whatever))
-                 x)
-          '(2 1)))
-  
-  (let ()
-    
-    (define-metafunction empty-language
-      must-be-identity : natural_1 -> natural_1
-      [(must-be-identity any) 0])
-
-    (test (with-handlers ((exn:fail:redex? exn-message))
-            (term (must-be-identity 1)))
-          #rx"codomain test failed")
-    
-    (define-metafunction empty-language
-      [(same any_1 any_1) #t]
-      [(same any_1 any_2) #f])
-    
-    (define-metafunction empty-language
-      m : any_1 any_2 -> any_3
-      #:pre (same any_1 any_2)
-      [(m any_x any_y) any_x])
-    
-    (test (term (m 1 1)) 1)
-    (test (with-handlers ((exn:fail:redex? exn-message))
-            (term (m 1 2)))
-          #rx"is not in my domain")
-    
-    (define-metafunction empty-language
-      is-nat : any -> boolean
-      [(is-nat natural) #t]
-      [(is-nat any) #f])
-
-    (define-metafunction empty-language
-      post-only : any_1 -> any_2
-      #:post (same any_1 any_2)
-      [(post-only any) 1])
-
-    (test (term (post-only 1)) 1)
-    (test (with-handlers ([exn:fail:redex? exn-message])
-            (term (post-only 2)))
-          #rx"codomain")
-
-    (define-metafunction empty-language
-      pre-and-post : any_1 -> any_2
-      #:pre (is-nat any_1)
-      #:post (same any_1 any_2)
-      [(pre-and-post any) 1])
-
-    (test (term (pre-and-post 1)) 1)
-    (test (with-handlers ([exn:fail:redex? exn-message])
-            (term (pre-and-post x)))
-          #rx"is not in my domain")
-    (test (with-handlers ([exn:fail:redex? exn-message])
-            (term (pre-and-post 2)))
-          #rx"codomain")
-    )
-  
-  (let ()
-    (define-language L
-      (n z (s n)))
-    
-    (define-metafunction L
-      [(f n)
-       n_1
-       (judgment-holds (p n n_1))])
-    
-    (define-judgment-form L
-      #:mode (p I O)
-      #:contract (p n n)
-      [(p z z)]
-      [(p (s n) n)]
-      [(p (s n) z)])
-    
-    (test (term (f (s z)))
-          (term z))
-    (test (with-handlers ([exn:fail:redex? exn-message])
-            (term (f (s (s z))))
-            "")
-          #rx"returned different results"))
-  
-  ;; errors for not-yet-defined metafunctions
-  (test (let ([on (current-namespace)])
-          (parameterize ([current-namespace (make-base-namespace)])
-            (namespace-attach-module on 'redex/reduction-semantics)
-            (namespace-require 'racket/base)
-            (eval '(module m racket
-                     (require redex/reduction-semantics)
-                     (term (q))
-                     (define-language L)
-                     (define-metafunction L [(q) ()])))
-            (with-handlers ([exn:fail:contract:variable? exn-message])
-              (eval '(require 'm))
-              #f)))
-        #rx"^q: undefined;\n[^\n]*use[^\n]*before")
-  (test (with-handlers ([exn:fail:contract:variable? exn-message])
-          (let ()
-            (term (q))
-            (define-language L)
-            (define-metafunction L [(q) ()])
-            #f))
-        #rx"^q: undefined;\n[^\n]*use[^\n]*before")
-
-(let ()
-  ;; named ellipses in where clauses
-  (define-language L)
-  
-  (define-metafunction L
-  [(f (any ..._n))
-   3
-   (where (any_2 ..._n) (1 2 3))]
-  [(f any)
-   #f])
-
-  (test (term (f (a b c))) 3)
-  (test (term (f (a b))) #f))
-  
-(let ()
-  ;; 'or' in metafunctions
-  (define-language L)
-  
-  (define-metafunction L
-    [(f any ...)
-     three
-     (where (any_1 any_2 any_3) (any ...))
-     or
-     two
-     (where (any_1 any_2) (any ...))
-     or
-     something-else])
-
-  (test (term (f a b c)) (term three))
-  (test (term (f a b)) (term two))
-  (test (term (f a)) (term something-else)))
-
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-;       ;;           ;;; ;;                                   ;;           ;;  ;;                 
-;       ;;          ;;;  ;;                                   ;;          ;;;  ;;                 
-;    ;;;;;   ;;;;  ;;;;; ;;  ;; ;;;   ;;;;       ;;;;  ;;;;   ;;   ;;;;  ;;;;; ;;   ;;;;   ;; ;;; 
-;   ;;;;;;  ;;  ;; ;;;;  ;;  ;;;;;;  ;;  ;;      ;;;; ;;  ;;  ;;  ;;  ;;  ;;;; ;;  ;;;;;;  ;;;;;; 
-;  ;;;  ;; ;;;;;;;; ;;   ;;  ;;  ;; ;;;;;;;;;;;; ;;  ;;;;;;;; ;;    ;;;;  ;;;  ;; ;;;  ;;; ;;  ;; 
-;  ;;;  ;; ;;;      ;;   ;;  ;;  ;; ;;;     ;;;; ;;  ;;;      ;;  ;;; ;;  ;;;  ;; ;;;  ;;; ;;  ;; 
-;   ;;;;;;  ;;; ;;  ;;   ;;  ;;  ;;  ;;; ;;      ;;   ;;; ;;  ;; ;;;  ;;  ;;;; ;;  ;;;;;;  ;;  ;; 
-;    ;;;;;   ;;;;   ;;   ;;  ;;  ;;   ;;;;       ;;    ;;;;   ;;  ;;;;;;   ;;; ;;   ;;;;   ;;  ;; 
-;                                                                                                 
-;                                                                                                 
-;                                                                                                 
-
-  
-  (let ()
-    (define-relation empty-language
-      [(<: any any) #t])
-    
-    (test (term (<: 1 1)) #t)
-    (test (term (<: 1 2)) #f))
-  
-  (let ()
-    (define-relation empty-language
-      [(<: number_1 number_2) ,(< (term number_1) (term number_2))]
-      [(<: number_1 number_1) #t])
-    
-    (test (term (<: 1 2)) #t)
-    (test (term (<: 1 1)) #t)
-    (test (term (<: 2 1)) #f))
-  
-  (let ()
-    (define-relation empty-language
-      [(<: number_1 ... number_2 number_3 ... number_2 number_4 ...) #t])
-    
-    (test (term (<: 1 2 3 4)) #f)
-    (test (term (<: 1 1 2 3 4)) #t)
-    (test (term (<: 1 2 1 3 4)) #t)
-    (test (term (<: 1 2 3 1 4)) #t)
-    (test (term (<: 1 2 3 4 1)) #t))
-  
-  (let ()
-    (define-relation empty-language
-      [(<: number_1 number_1)])
-    (test (term (<: 1 1)) #t)
-    (test (term (<: 1 2)) #f))
-  
-  (let ()
-    (define-relation empty-language
-      [(<: number_1 number_2 number_3)
-       ,(= (term number_1) (term number_2))
-       ,(= (term number_2) (term number_3))])
-    (test (term (<: 1 2 3)) #f)
-    (test (term (<: 1 1 2)) #f)
-    (test (term (<: 1 2 2)) #f)
-    (test (term (<: 1 1 1)) #t))
-  
-  (let ()
-    (define-relation empty-language
-      d ⊆ any × any
-      [(d (any) (any)) (d any any)]
-      [(d () ())])
-    
-    (test (term (d ((())) ((())))) #t)
-    (test (term (d ((())) ())) #f))
-  
-  (let ()
-    (define-relation empty-language
-      d ⊂ any x any
-      [(d (any) (any)) (d any any)]
-      [(d () ())])
-    
-    (test (term (d ((())) ((())))) #t)
-    (test (term (d ((())) ())) #f))
-  
-  (let ()
-    (define-relation empty-language
-      d ⊂ (any)
-      [(d (1))])
-    
-    (test (term (d (1))) #t)
-    (test (term (d (2))) #f)
-    (test (with-handlers ((exn:fail? (λ (x) 'passed)))
-            (term (d 1))
-            'failed)
-          'passed))
-  
-  (let ()
-    (define-language types
-      ((τ σ) int
-             num
-             (τ ... → τ)))
-    
-    (define-relation types
-      subtype ⊆ τ × τ
-      [(subtype int num)]
-      [(subtype (τ_1 ..._1 → τ_2) (σ_1 ..._1 → σ_2))
-       (subtype σ_1 τ_1) ...
-       (subtype τ_2 σ_2)]
-      [(subtype τ τ)])
-    
-    (test (term (subtype int int)) #t)
-    (test (term (subtype int num)) #t)
-    (test (term (subtype (int int int → int) (int int → int))) #f)
-    (test (term (subtype (int int → int) (int num → int))) #f)
-    (test (term (subtype (int num → int) (int int → int))) #t)
-    (test (term (subtype (int int → int) (int int → num))) #t))
-  
-  (let ()
-    (define-relation empty-language
-      [(R () ())]
-      [(R (any_a) (any_b)) 
-       (R any_c any_d) 
-       (where any_c any_a)
-       (where any_d any_b)])
-    
-    (test (term (R () ())) #t)
-    (test (term (R (()) (()))) #t)
-    (test (term (R (()) ())) #f))
-  
-  (let ()
-    (define-relation empty-language
-      [(R () ())]
-      [(R (any_a) (any_b)) 
-       (R any_c any_d) 
-       (where/hidden any_c any_a)
-       (where/hidden any_d any_b)])
-    
-    (test (term (R () ())) #t)
-    (test (term (R (()) (()))) #t)
-    (test (term (R (()) ())) #f))
-  
-  (let ()
-    (define-relation empty-language
-      [(R any_a any_b)
-       (side-condition (equal? (term any_a)
-                               (term any_b)))])
-    
-    (test (term (R (xx) (xx))) #t)
-    (test (term (R (()) ())) #f))
-  
-  (let ()
-    (define-relation empty-language
-      [(R any_a any_b)
-       (side-condition/hidden
-        (equal? (term any_a)
-                (term any_b)))])
-    
-    (test (term (R (xx) (xx))) #t)
-    (test (term (R (()) ())) #f))
-  
-  (let ()
-    
-    (define-relation empty-language
-      [(a number_1)
-       (b number_1)]
-      [(a 2)])
-    
-    (define-relation empty-language
-      [(b 1)]
-      [(b 2)])
-    
-    (test (term (a 1)) #t)
-    (test (term (a 2)) #t)
-    (test (term (a 3)) #f)
-    (test (term (b 1)) #t)
-    (test (term (b 2)) #t)
-    (test (term (b 3)) #f))
-  
-  (let ()
-    (define-relation empty-language
-      [(a any)])
-    (define-relation empty-language
-      [(b any)])
-    (define-relation empty-language
-      [(c any) (a (b any))])
-    
-    (define-metafunction empty-language
-      [(f any)
-       (c any)])
-    
-    (define-judgment-form empty-language
-      #:mode (J I O)
-      [(J any_1 (a any_1))])
-    
-    (test (term (a 1)) #t)
-    (test (term (b 2)) #t)
-    (test (term (c 3)) #t)
-    (test (term (c (b (a x)))) #t)
-    (test (term (f q)) #t)
-    (test (judgment-holds (J Z #t)) #t)
-    (test (judgment-holds (J Z Z)) #f)
-    )
-
-  
-;                    ;;                         ;                                        ;;                    ;                 
-;                     ;                 ;                                                 ;            ;                         
-;   ;; ;;   ;;;    ;; ; ;;  ;;   ;;;;  ;;;;;  ;;;     ;;;  ;; ;;          ;; ;;   ;;;     ;     ;;;   ;;;;;  ;;;     ;;;  ;; ;;  
-;    ;;    ;   ;  ;  ;;  ;   ;  ;   ;   ;       ;    ;   ;  ;;  ;          ;;    ;   ;    ;    ;   ;   ;       ;    ;   ;  ;;  ; 
-;    ;     ;;;;;  ;   ;  ;   ;  ;       ;       ;    ;   ;  ;   ;  ;;;;;   ;     ;;;;;    ;     ;;;;   ;       ;    ;   ;  ;   ; 
-;    ;     ;      ;   ;  ;   ;  ;       ;       ;    ;   ;  ;   ;          ;     ;        ;    ;   ;   ;       ;    ;   ;  ;   ; 
-;    ;     ;      ;   ;  ;  ;;  ;   ;   ;   ;   ;    ;   ;  ;   ;          ;     ;        ;    ;   ;   ;   ;   ;    ;   ;  ;   ; 
-;   ;;;;;   ;;;;   ;;;;;  ;; ;;  ;;;     ;;;  ;;;;;   ;;;  ;;; ;;;        ;;;;;   ;;;;  ;;;;;   ;;;;;   ;;;  ;;;;;   ;;;  ;;; ;;;
-;                                                                                                                                
-;                                                                                                                                
-;                                                                                                                                
-;                                                                                                                                
-
-  
-  
-  (test (apply-reduction-relation
-         (reduction-relation 
-          grammar
-          (--> (in-hole E_1 (number_1 number_2))
-               (in-hole E_1 ,(* (term number_1) (term number_2)))))
-         '((2 3) (4 5)))
-        (list '(6 (4 5))))
-
-  (test (apply-reduction-relation
-         (reduction-relation 
-          grammar
-          (~~> (number_1 number_2)
-               ,(* (term number_1) (term number_2)))
-          with
-          [(--> (in-hole E_1 a) (in-hole E_1 b)) (~~> a b)])
-         '((2 3) (4 5)))
-        (list '(6 (4 5))))
-  
-  (test (apply-reduction-relation
-         (reduction-relation 
-          grammar
-          (==> (number_1 number_2)
-               ,(* (term number_1) (term number_2)))
-          with
-          [(--> (M_1 a) (M_1 b)) (~~> a b)]
-          [(~~> (M_1 a) (M_1 b)) (==> a b)])
-         '((1 2) ((2 3) (4 5))))
-        (list '((1 2) ((2 3) 20))))
-  
-  (test (apply-reduction-relation
-         (reduction-relation 
-          grammar
-          (~~> (number_1 number_2)
-               ,(* (term number_1) (term number_2)))
-          (==> (number_1 number_2)
-               ,(* (term number_1) (term number_2)))
-          with
-          [(--> (M_1 a) (M_1 b)) (~~> a b)]
-          [(--> (a M_1) (b M_1)) (==> a b)])
-         '((2 3) (4 5)))
-        (list '(6 (4 5))
-              '((2 3) 20)))
-  
-  (test (apply-reduction-relation
-         (reduction-relation 
-          grammar
-          (--> (M_1 (number_1 number_2))
-               (M_1 ,(* (term number_1) (term number_2))))
-          (==> (number_1 number_2)
-               ,(* (term number_1) (term number_2)))
-          with
-          [(--> (a M_1) (b M_1)) (==> a b)])
-         '((2 3) (4 5)))
-        (list '((2 3) 20)
-              '(6 (4 5))))
-  
-  ; The scope of a `where' clause includes the left-hand sides
-  ; of subsequent `where' clauses.
-  (test (apply-reduction-relation
-         (reduction-relation
-          grammar
-          (--> any
-               1
-               (where number_1 2)
-               (where (side-condition any (number? (term number_1))) dontcare)))
-         'dontcare)
-        '(1))
-  
-  ; shortcuts like this fail if compilation fails to preserve
-  ; lexical context for side-conditions expressions.
-  (test (let ([x #t])
-          (apply-reduction-relation
-           (reduction-relation
-            grammar
-            (==> variable variable)
-            with
-            [(--> (a (side-condition number x)) b)
-             (==> a b)])
-           '(x 4)))
-        '(x))
-  
-  ; test multiply matching `where' with failing `where' inside
-  (test (apply-reduction-relation
-         (reduction-relation
-          empty-language
-          (--> ()
-               ()
-               (where (number_1 ... number_i number_i+1 ...)
-                      (1 2 3))
-               (where number_i 2)))
-         '())
-        '(()))
-  
-  (test (apply-reduction-relation
-         (reduction-relation
-          empty-language
-          (--> (in-hole (name E
-                              (in-hole ((hide-hole hole) hole)
-                                       hole))
-                        number)
-               (in-hole E ,(add1 (term number)))))
-         (term (hole 2)))
-        (list (term (hole 3))))
-  
-  (test (apply-reduction-relation/tag-with-names
-         (reduction-relation 
-          grammar
-          (--> (number_1 number_2) 
-               ,(* (term number_1) (term number_2))
-               mul))
-         '(4 5))
-        (list (list "mul" 20)))
-  
-  (test (apply-reduction-relation/tag-with-names
-         (reduction-relation 
-          grammar
-          (--> (number_1 number_2) 
-               ,(* (term number_1) (term number_2))
-               "mul"))
-         '(4 5))
-        (list (list "mul" 20)))
-  
-  (test (apply-reduction-relation/tag-with-names
-         (reduction-relation 
-          grammar
-          (--> (number_1 number_2) 
-               ,(* (term number_1) (term number_2))))
-         '(4 5))
-        (list (list #f 20)))
-  
-  (test (apply-reduction-relation/tag-with-names
-         (reduction-relation 
-          grammar
-          (==> (number_1 number_2) 
-               ,(* (term number_1) (term number_2))
-               mult)
-          with
-          [(--> (M_1 a) (M_1 b)) (==> a b)])
-         '((2 3) (4 5)))
-        (list (list "mult" '((2 3) 20))))
-  
-  (test (apply-reduction-relation/tag-with-names
-         (reduction-relation
-          grammar
-          (--> any
-               (number_i number_i*)
-               (where (number_0 ... number_i number_i+1 ...) any)
-               (where (number_0* ... number_i* number_i+1* ...) any)
-               pick-two
-               (computed-name
-                (format "(~s, ~s)"
-                        (length (term (number_0 ...)))
-                        (length (term (number_0* ...)))))))
-         '(9 7))
-        '(("(1, 1)" (7 7)) ("(1, 0)" (7 9)) ("(0, 1)" (9 7)) ("(0, 0)" (9 9))))
-  
-  (test (apply-reduction-relation/tag-with-names
-         (reduction-relation grammar (--> 1 2 (computed-name 3))) 1)
-        '(("3" 2)))
-  
-  (test (apply-reduction-relation
-         (union-reduction-relations
-          (reduction-relation empty-language
-                              (--> x a)
-                              (--> x b))
-          (reduction-relation empty-language
-                              (--> x c)
-                              (--> x d)))
-         'x)
-        (list 'a 'b 'c 'd))
-  
-  (test (apply-reduction-relation
-         (union-reduction-relations
-          (reduction-relation empty-language (--> x a))
-          (reduction-relation empty-language (--> x b))
-          (reduction-relation empty-language (--> x c))
-          (reduction-relation empty-language (--> x d)))
-         'x)
-        (list 'a 'b 'c 'd))
-  
-  
-  (let ([R (reduction-relation empty-language #:domain number (--> 1 a "first"))]
-        [S (reduction-relation empty-language (--> 2 a "second"))])
-    (test (apply-reduction-relation (union-reduction-relations R S) 2)
-          (list 'a))
-    (test (apply-reduction-relation (union-reduction-relations S R) 2)
-          (list 'a)))
-  
-  (test (apply-reduction-relation
-         (reduction-relation 
-          empty-language
-          (--> (number_1 number_2) 
-               number_2
-               (side-condition (< (term number_1) (term number_2))))
-          (--> (number_1 number_2) 
-               number_1
-               (side-condition (< (term number_2) (term number_1)))))
-         '(1 2))
-        (list 2))
-  
-  (test (apply-reduction-relation
-         (reduction-relation 
-          empty-language
-          (--> x #f))
-         (term x))
-        (list #f))
-  
-  (define-language x-language
-    (x variable))
-  
-  (test (apply-reduction-relation
-         (reduction-relation 
-          x-language
-          (--> x (x x)))
-         'y)
-        (list '(y y)))
-  
-  (test (apply-reduction-relation
-         (reduction-relation 
-          x-language
-          (--> (x ...) ((x ...))))
-         '(p q r))
-        (list '((p q r))))
-
-  #;
-  (test (apply-reduction-relation
-         (reduction-relation 
-          empty-language
-          #:main-arrow :->
-          (:-> 1 2))
-         1)
-        '(2))
-  
-  (test (apply-reduction-relation
-         (reduction-relation 
-          empty-language
-          #:domain number
-          (--> 1 2))
-         1)
-        '(2))
-  
-  
-  (test (let ([red
-               (reduction-relation 
-                empty-language
-                #:domain number
-                (--> 1 2))])
-          (with-handlers ((exn? exn-message))
-            (apply-reduction-relation red 'x)
-            'no-exception-raised))
-        "reduction-relation: relation not defined for x")
-
-  (test (let ([red
-               (reduction-relation 
-                empty-language
-                #:domain number
-                (--> 1 x))])
-          (with-handlers ((exn? exn-message))
-            (apply-reduction-relation red 1)
-            'no-exception-raised))
-        "reduction-relation: relation reduced to x via an unnamed rule, which is outside its domain")
-
-  (let* ([red1
-          (reduction-relation 
-           empty-language
-           #:domain (side-condition number_1 (even? (term number_1)))
-           (--> number number))]
-         [red2
-          (reduction-relation 
-           empty-language
-           #:domain (side-condition number_1 (odd? (term number_1)))
-           (--> number number))]
-         [red-c
-          (union-reduction-relations red1 red2)])
-    
-    ;; ensure first branch of 'union' is checked  
-    (test (with-handlers ((exn? exn-message))
-            (apply-reduction-relation red-c 1)
-            'no-exception-raised)
-          "reduction-relation: relation not defined for 1")
-
-    ;; ensure second branch of 'union' is checked
-    (test (with-handlers ((exn? exn-message))
-            (apply-reduction-relation red-c 2)
-            'no-exception-raised)
-          "reduction-relation: relation not defined for 2"))
-
-  (let ()
-    (define-language l1
-      (D 0 1 2))
-    (define r1
-      (reduction-relation 
-       l1
-       #:domain D
-       (--> D D)))
-    (define-language l2
-      (D 0 1 2 3))
-    (define r2
-      (extend-reduction-relation r1 l2))
-    
-    ;; test that the domain is re-interpreted wrt the new language
-    (test (apply-reduction-relation r2 3)
-          '(3)))
-  
-  (let ()
-    (define-language L)
-    (define R
-      (reduction-relation L #:domain 1 (--> any any)))
-    (define S
-      (extend-reduction-relation R L #:domain 2))
-    
-    ;; test that the new domain applies to inherited rules
-    (test (apply-reduction-relation S 2)
-          '(2))
-    (test (with-handlers ([exn:fail? exn-message])
-            (apply-reduction-relation S 1))
-          #rx"not defined"))
-  
-  (let ()
-    (define-language L)
-    (define R
-      (reduction-relation L (--> 1 1 "a")))
-    (define S
-      (extend-reduction-relation R L (--> 2 2 "a")))
-    
-    ;; test that overridden rules do not appear (twice)
-    (test (reduction-relation->rule-names S)
-          '(a)))
-  
-  (let ()
-    (define-language L)
-    
-    ;; test that symbol-named rules replace string-named rules
-    (test (apply-reduction-relation
-           (extend-reduction-relation
-            (reduction-relation L (--> 1 1 "a"))
-            L (--> 1 2 a))
-           1)
-          '(2))
-    ;; and vice versa
-    (test (apply-reduction-relation
-           (extend-reduction-relation
-            (reduction-relation L (--> 1 1 a))
-            L (--> 1 2 "a"))
-           1)
-          '(2)))
-  
-  (let ()
-    (define-language l1
-      (D 0 1 2))
-    (define r1
-      (reduction-relation 
-       l1
-       #:domain (D D)
-       (--> (D_1 D_2) (D_2 D_1))))
-    
-    ;; test that duplicated identifiers in the domain contract do not have to be equal
-    (test (apply-reduction-relation r1 (term (1 2)))
-          (list (term (2 1)))))
-  
-  ;;test that #:arrow keyword works
-  (test (apply-reduction-relation 
-         (reduction-relation 
-          empty-language
-          #:arrow :->
-          (:-> 1 2))
-         1)
-        '(2))
-
-  (let ()
-    (define-language n-lang
-      [n number])
-    (test (apply-reduction-relation
-           (reduction-relation n-lang [--> any ,(length (redex-match n-lang n 1))])
-           11)
-          '(1)))
-  
-  (let ([R (reduction-relation
-            grammar
-            (--> (number_1 number_2 ... (number_s ...) ...)
-                 yes
-                 (where number_1 1)
-                 (where (number_3 ...) ,(cdr (term (number_2 ...))))
-                 (where (number_3 ...) (3 4 5))
-                 (where (number_1 (number_s ...) ...)
-                        ,(if (null? (term ((number_s ...) ...)))
-                             (term (number_1))
-                             (term (number_1 () (6) (7 8) (9 10 11)))))))])
-    (test (apply-reduction-relation R (term (1 2 3 4 5))) '(yes))
-    (test (apply-reduction-relation R (term (1 2 3 4))) '())
-    (test (apply-reduction-relation R (term (0 2 3 4 5))) '())
-    (test (apply-reduction-relation R (term (1 2 3 4 5 () (6) (7 8) (9 10 11)))) '(yes)))
-  
-  ;; expect union with duplicate names to fail
-  (test (with-handlers ((exn? (λ (x) 'passed)))
-          (union-reduction-relations
-           (reduction-relation 
-            grammar
-            (--> (number_1 number_2) 
-                 ,(* (term number_1) (term number_2))
-                 mult))
-           (reduction-relation 
-            grammar
-            (--> (number_1 number_2) 
-                 ,(* (term number_1) (term number_2))
-                 mult)))
-          'failed)
-        'passed)
-  
-  (test (with-handlers ((exn? (λ (x) 'passed)))
-          (union-reduction-relations
-           (union-reduction-relations
-            (reduction-relation 
-             grammar
-             (--> (number_1 number_2) 
-                  ,(* (term number_1) (term number_2))
-                  mult))
-            (reduction-relation 
-             grammar
-             (--> (number_1 number_2) 
-                  ,(* (term number_1) (term number_2))
-                  mult3)))
-           
-           (union-reduction-relations
-            (reduction-relation 
-             grammar
-             (--> (number_1 number_2) 
-                  ,(* (term number_1) (term number_2))
-                  mult))
-            (reduction-relation 
-             grammar
-             (--> (number_1 number_2) 
-                  ,(* (term number_1) (term number_2))
-                  mult2))))
-          'passed)
-        'passed)
-  
-  ;; sorting in this test case is so that the results come out in a predictable manner.
-  (test (sort
-         (apply-reduction-relation
-          (compatible-closure 
-           (reduction-relation 
-            grammar
-            (--> (number_1 number_2) 
-                 ,(* (term number_1) (term number_2))
-                 mult))
-           grammar
-           M)
-          '((2 3) (4 5)))
-         (λ (x y) (string<=? (format "~s" x) (format "~s" y))))
-        (list '((2 3) 20)
-              '(6 (4 5))))
-  
-  (test (apply-reduction-relation
-         (compatible-closure 
-          (reduction-relation 
-           grammar
-           (--> (number_1 number_2) 
-                ,(* (term number_1) (term number_2))
-                mult))
-          grammar
-          M)
-         '(4 2))
-        (list '8))
-  
-  (test (with-handlers ((exn:fail? exn-message))
-          (apply-reduction-relation
-           (context-closure 
-            (reduction-relation
-             empty-language #:domain #f
-             (--> #f #f))
-            empty-language hole)
-           #t)
-          "exn not raised")
-        #rx"^reduction-relation:")
-  
-  (test (apply-reduction-relation
-         (context-closure 
-          (context-closure 
-           (reduction-relation grammar (--> 1 2))
-           grammar
-           (y hole))
-          grammar
-          (x hole))
-         '(x (y 1)))
-        (list '(x (y 2))))
-
-  (test (apply-reduction-relation
-         (reduction-relation 
-          grammar
-          (--> (variable_1 variable_2) 
-               (variable_1 variable_2 x)
-               mul
-               (fresh x)))
-         '(x x1))
-        (list '(x x1 x2)))
-  
-  (test (apply-reduction-relation
-         (reduction-relation 
-          grammar
-          (~~> number 
-               x
-               (fresh x))
-          with 
-          [(--> (variable_1 variable_2 a) (variable_1 variable_2 b)) (~~> a b)])
-         '(x x1 2))
-        (list '(x x1 x2)))
-  
-  (test (apply-reduction-relation
-         (reduction-relation 
-          x-language
-          (--> (x_1 ...)
-               (x ...)
-               (fresh ((x ...) (x_1 ...)))))
-         '(x y x1))
-        (list '(x2 x3 x4)))
-
-  (test (apply-reduction-relation
-         (reduction-relation
-          empty-language
-          (--> (variable_1 ...)
-               (x ... variable_1 ...)
-               (fresh ((x ...) (variable_1 ...) (variable_1 ...)))))
-         '(x y z))
-        (list '(x1 y1 z1 x y z)))
-
-  (test (apply-reduction-relation 
-         (reduction-relation 
-          empty-language
-          (--> any (any_y x)
-               (where any_y x)
-               (fresh x)))
-         (term junk))
-        (list '(x x1)))
-  
-  (test (apply-reduction-relation 
-         (reduction-relation 
-          empty-language
-          (--> (variable ...) (variable_0 ... variable_1 ...)
-               (fresh ((variable_0 ...) (variable ...)))
-               (fresh ((variable_1 ...) (variable ...)))))
-         (term (x y)))
-        (list '(variable_0 variable_1 variable_2 variable_3)))
-
-  
-  ;; test that redex match can be used in a side-condition 
-  ;; with the same language that is used to define the 
-  ;; reduction relation.
-  (test (apply-reduction-relation
-         (reduction-relation
-          empty-language
-          (--> any_1 3
-               (side-condition (redex-match empty-language (any_1 any_2) (term any_1)))))
-         '(a b))
-        '(3))
-  
-  (test (apply-reduction-relation
-         (reduction-relation
-          empty-language
-          (--> variable_1
-               (x variable_1)
-               (fresh (x variable_1))))
-         'q)
-        (list '(q1 q)))
-  
-  (test (apply-reduction-relation
-         (extend-reduction-relation (reduction-relation empty-language (--> 1 2))
-                                    empty-language
-                                    (--> 1 3))
-         1)
-        '(3 2))
-  
-  (test (apply-reduction-relation
-         (extend-reduction-relation
-          (reduction-relation empty-language (--> 1 2 (computed-name 1)))
-          empty-language
-          (--> 1 3 (computed-name 1)))
-         1)
-        '(3 2))
-  
-  (test (apply-reduction-relation
-         (extend-reduction-relation
-          (reduction-relation empty-language (--> 1 2 (computed-name 1) x))
-          empty-language
-          (--> 1 3 (computed-name 1) x))
-         1)
-        '(3))
-  
-  (let ()
-    (define-language e1
-      (e 1))
-    (define-language e2
-      (e 2))
-    (define red1 (reduction-relation e1 (--> e (e e))))
-    (define red2 (extend-reduction-relation red1 e2 (--> ignoreme ignoreme)))
-    (test (apply-reduction-relation red1 1) '((1 1)))
-    (test (apply-reduction-relation red1 2) '())
-    (test (apply-reduction-relation red2 1) '())
-    (test (apply-reduction-relation red2 2) '((2 2))))
-  
-  (let ()
-    (define red1 (reduction-relation empty-language
-                                     (--> a (a a) 
-                                          a)
-                                     (--> b (b b) 
-                                          b)
-                                     (--> q x)))
-    (define red2 (extend-reduction-relation red1
-                                            empty-language
-                                            (--> a (c c)
-                                                 a)
-                                            (--> q z)))
-    (test (apply-reduction-relation red1 (term a)) (list (term (a a))))
-    (test (apply-reduction-relation red1 (term b)) (list (term (b b))))
-    (test (apply-reduction-relation red1 (term q)) (list (term x)))
-    (test (apply-reduction-relation red2 (term a)) (list (term (c c))))
-    (test (apply-reduction-relation red2 (term b)) (list (term (b b))))
-    (test (apply-reduction-relation red2 (term q)) (list (term z) (term x))))
-  
-  (let ()
-    (define red1 
-      (reduction-relation
-       empty-language
-       (==> a (a a) 
-            a)
-       (==> b (b b) 
-            b)
-       (==> q w)
-       with
-       [(--> (X a) (X b)) (==> a b)]))
-    
-    (define red2 
-      (extend-reduction-relation
-       red1
-       empty-language
-       (==> a (c c)
-            a)
-       (==> q z)
-       with
-       [(--> (X a) (X b)) (==> a b)]))
-    
-    (test (apply-reduction-relation red1 (term (X a))) (list (term (X (a a)))))
-    (test (apply-reduction-relation red1 (term (X b))) (list (term (X (b b)))))
-    (test (apply-reduction-relation red1 (term (X q))) (list (term (X w))))
-    (test (apply-reduction-relation red2 (term (X a))) (list (term (X (c c)))))
-    (test (apply-reduction-relation red2 (term (X b))) (list (term (X (b b)))))
-    (test (apply-reduction-relation red2 (term (X q))) (list (term (X z)) 
-                                                             (term (X w)))))
-  
-  (let ()
-    (define-language L (M ::= number))
-    (define r (reduction-relation L (--> M M (where M M))))
-    (define-extended-language L1 L (M ::= string))
-    (define r1 (extend-reduction-relation r L1))
-    (test (apply-reduction-relation r1 "7") '("7")))
-
-  (let ()
-    (define-language L (M ::= number))
-    (define-extended-language L1 L (M ::= string))
-    (define-judgment-form L
-      #:mode (id I O)
-      #:contract (id any any)
-      [(id any any)])
-    (define t  (reduction-relation L (--> M M (judgment-holds (id M M)))))
-    (define t1 (extend-reduction-relation t L1))
-    (test (apply-reduction-relation t1 "7") '("7")))
-
-  (test (reduction-relation->rule-names
-         (reduction-relation
-          empty-language
-          (--> x y a)))
-        '(a))
-  
-  (test (reduction-relation->rule-names
-         (reduction-relation
-          empty-language
-          (--> x y a)
-          (--> y z b)
-          (--> z w c)))
-        '(a b c))
-  
-  (test (reduction-relation->rule-names
-         (reduction-relation
-          empty-language
-          (--> x y a)
-          (--> y z b)
-          (--> z w c)
-          (--> p q z)
-          (--> q r y)
-          (--> r p x)))
-        '(a b c z y x))
-  
-  (test (reduction-relation->rule-names
-         (reduction-relation
-          empty-language
-          (--> x y a (computed-name "x to y"))
-          (--> y z (computed-name "y to z"))))
-        '(a))
-  
-  (test (reduction-relation->rule-names
-         (extend-reduction-relation
-          (reduction-relation
-           empty-language
-           (--> x y a)
-           (--> y z b)
-           (--> z w c))
-          empty-language
-          (--> p q z)
-          (--> q r y)
-          (--> r p x)))
-        '(a b c z y x))
-  
-    (test (reduction-relation->rule-names
-           (union-reduction-relations
-            (reduction-relation
-             empty-language
-             (--> x y a)
-             (--> y z b)
-             (--> z w c))
-            (reduction-relation
-             empty-language
-             (--> p q z)
-             (--> q r y)
-             (--> r p x))))
-        '(a b c z y x))
-    
-    (let ()
-      (define-judgment-form empty-language
-        #:mode (R I O)
-        [(R a a)]
-        [(R a b)])
-      (test (apply-reduction-relation
-             (reduction-relation
-              empty-language
-              (--> a any
-                   (judgment-holds (R a any))))
-             'a)
-            '(a b)))
-    
-    ; a call to a metafunction that looks like a pattern variable
-    (let ()
-      (define result 'result)
-      (define-language L
-        (f any))
-      (define-judgment-form L
-        #:mode (J O)
-        [(J (f_2))])
-      (define-metafunction L
-        [(f_2) ,result])
-      (test (judgment-holds (J any) any)
-            (list result)))
-  
-    ;                                                                 
-    ;                                                                 
-    ;                    ;;                        ;;                 
-    ;                     ;                         ;            ;    
-    ;   ;; ;;   ;;;    ;; ;   ;;;  ;;  ;;           ;     ;;;   ;;;;; 
-    ;    ;;    ;   ;  ;  ;;  ;   ;  ;  ;            ;    ;   ;   ;    
-    ;    ;     ;;;;;  ;   ;  ;;;;;   ;;    ;;;;;    ;    ;;;;;   ;    
-    ;    ;     ;      ;   ;  ;       ;;             ;    ;       ;    
-    ;    ;     ;      ;   ;  ;      ;  ;            ;    ;       ;   ;
-    ;   ;;;;;   ;;;;   ;;;;;  ;;;; ;;  ;;         ;;;;;   ;;;;    ;;; 
-    ;                                                                 
-    ;                                                                 
-    ;                                                                 
-    ;                                                                 
-  
-    (let ()
-      (define-language L
-        (n number)
-        (x variable))
-      
-      (test (redex-let L ([(n_1 n_2) '(1 2)])
-                       (term (n_2 n_1)))
-            (term (2 1)))
-      (test (redex-let L ([(x_i ([x_0 n_0] ... [x_i n_i] [x_i+1 n_i+1] ...))
-                           '(b ([a 1] [b 2] [c 3]))])
-                       (term n_i))
-            2)
-      (test (with-handlers ([exn:fail:redex? exn-message])
-              (redex-let L ([(n) 1]) 'no-exn))
-            "redex-let: term 1 does not match pattern (n)")
-      (test (with-handlers ([exn:fail:redex? exn-message])
-              (redex-let L ([(n_1 ... n_i n_i+1 ...) '(1 2 3)]) 'no-exn))
-            "redex-let: pattern (n_1 ... n_i n_i+1 ...) matched term (1 2 3) multiple ways")
-      (test (redex-let L ([n_1 1])
-                       (redex-let L ([n_1 2] [n_2 (term n_1)])
-                                  (term (n_1 n_2))))
-            (term (2 1)))
-      (test (redex-let L ([n_1 1])
-                       (redex-let* L ([n_1 2] [n_2 (term n_1)])
-                                   (term (n_1 n_2))))
-            (term (2 2)))
-      
-      (test (redex-let L ([(n_1 n_1) '(1 1)]) (term n_1))
-            1)
-      (test
-       (redex-let* L ([(n_1) '(1)] [n_1 1]) (term n_1))
-       1))
-  
-
-;                                                                                                                                              
-;                                                                                                                                              
-;                                                                                                                                              
-;       ;            ;;    ;                           ;               ;                                               ;;                      
-;       ;           ;      ;                           ;               ;                               ;              ;                        
-;       ;           ;                                                  ;                               ;              ;                        
-;    ;;;;   ;;;    ;;;     ;    ;;;;    ;;;            ;    ;   ;   ;;;;   ;;;;  ;;;;;   ;;;   ;;;;   ;;;            ;;;    ;;;   ; ;;   ;;;;; 
-;   ;   ;  ;   ;    ;      ;    ;   ;  ;   ;  ;;;;;    ;    ;   ;  ;   ;  ;   ;  ; ; ;  ;   ;  ;   ;   ;     ;;;;;    ;    ;   ;  ;;  ;  ; ; ; 
-;   ;   ;  ;;;;;    ;      ;    ;   ;  ;;;;;           ;    ;   ;  ;   ;  ;   ;  ; ; ;  ;;;;;  ;   ;   ;              ;    ;   ;  ;   ;  ; ; ; 
-;   ;   ;  ;        ;      ;    ;   ;  ;               ;    ;   ;  ;   ;  ;   ;  ; ; ;  ;      ;   ;   ;              ;    ;   ;  ;      ; ; ; 
-;   ;   ;  ;   ;    ;      ;    ;   ;  ;   ;           ;    ;  ;;  ;   ;  ;   ;  ; ; ;  ;   ;  ;   ;   ;              ;    ;   ;  ;      ; ; ; 
-;    ;;;;   ;;;     ;      ;    ;   ;   ;;;            ;     ;; ;   ;;;;   ;;;;  ; ; ;   ;;;   ;   ;    ;;            ;     ;;;   ;      ; ; ; 
-;                                                      ;                      ;                                                                
-;                                                      ;                  ;   ;                                                                
-;                                                    ;;                    ;;;                                                                 
-
-    (let ()
-      (define-language nats
-        (n z (s n)))
-      
-      (define-judgment-form nats
-        #:mode (sumi I I O)
-        #:contract (sumi n n n)
-        [(sumi z n n)]
-        [(sumi (s n_1) n_2 (s n_3))
-         (sumi n_1 n_2 n_3)])
-      (test (judgment-holds (sumi z (s z) n) n)
-            (list (term (s z))))
-      (test (judgment-holds (sumi (s (s z)) (s z) n) n)
-            (list (term (s (s (s z))))))
-      (test (judgment-holds (sumi ,'z (s z) (s z))) #t)
-      
-      (define-judgment-form nats
-        #:mode (sumi2 I I O)
-        #:contract (sumi2 n n n)
-        [------------- sumz ;; symbol name
-         (sumi2 z n n)]
-        [(sumi2 n_1 n_2 n_3)
-         ---------------------------  "sumn" ;; string name
-         (sumi2 (s n_1) n_2 (s n_3))])
-      (test (judgment-holds (sumi2 z (s z) n) n)
-            (list (term (s z))))
-      (test (judgment-holds (sumi2 (s (s z)) (s z) n) n)
-            (list (term (s (s (s z))))))
-
-      (define-judgment-form nats
-        #:mode (sumo O O I)
-        #:contract (sumo n n n)
-        [(sumo z n n)]
-        [(sumo (s n_1) n_2 (s n_3))
-         (sumo n_1 n_2 n_3)])
-      (test (judgment-holds (sumo n_1 n_2 z) ([,'n_1 n_1] [,'n_2 n_2]))
-            (list (term ([n_1 z] [n_2 z]))))
-      (test (judgment-holds (sumo n_1 n_2 (s z)) ([,'n_1 n_1] [,'n_2 n_2]))
-            (list (term ([n_1 (s z)] [n_2 z]))
-                  (term ([n_1 z] [n_2 (s z)]))))
-      
-      (define-judgment-form nats
-        #:mode (sumo-ls O O I)
-        [(sumo-ls (s n_1) n_2 n_3)
-         (sumo (s n_1) n_2 n_3)])
-      (test (judgment-holds (sumo-ls n_1 n_2 (s z)) ([,'n_1 n_1] [,'n_2 n_2]))
-            (list (term ([n_1 (s z)] [n_2 z]))))
-      (test (judgment-holds (sumo-ls (s n_1) n_2 (s z))) #t)
-      (test (judgment-holds (sumo-ls z n_2 (s z))) #f)
-      (test (judgment-holds (sumo-ls z n_2 (s z)) whatever) (list))
-      
-      (define-judgment-form nats
-        #:mode (sumo-lz O O I)
-        [(sumo-lz z n_2 n_3)
-         (sumo z n_2 n_3)])
-      (test (judgment-holds (sumo-lz n_1 n_2 (s z)) ([,'n_1 n_1] [,'n_2 n_2]))
-            (list (term ([n_1 z] [n_2 (s z)]))))
-      
-      (define-judgment-form nats
-        #:mode (member O I)
-        [(member n_i (n_0 ... n_i n_i+1 ...))])
-      
-      (test (judgment-holds (member n (z (s z) z (s (s z)))) n)
-            (list (term (s (s z))) (term (s z)) (term z)))
-      
-      (define-judgment-form nats
-        #:mode (has-zero I)
-        [(has-zero (n ...))
-         (member z (n ...))])
-      
-      (test (judgment-holds (has-zero ((s z) z (s (s z))))) #t)
-      
-      (define-judgment-form nats
-        #:mode (le2 I)
-        [(le2 n)
-         (le (add2 n) (s (s (s (s z)))))])
-      
-      (define-judgment-form nats
-        #:mode (le I I)
-        [(le z n)]
-        [(le (s n_1) (s n_2))
-         (le n_1 n_2)])
-      
-      (define-metafunction nats
-        add2 : n -> n
-        [(add2 n) (s (s n))])
-      
-      (test (judgment-holds (le2 (s (s z)))) #t)
-      (test (judgment-holds (le2 (s (s (s z))))) #f)
-      
-      (define-judgment-form nats
-        #:mode (uses-add2 I O)
-        #:contract (uses-add2 n n)
-        [(uses-add2 n_1 n_2)
-         (sumo n_2 n_3 n_1)
-         (where n_2 (add2 n_3))])
-      
-      (test (judgment-holds (uses-add2 (s (s (s (s z)))) n) n)
-            (list (term (s (s (s z))))))
-      
-      (define-judgment-form nats
-        #:mode (add1 I O)
-        #:contract (add1 n n)
-        [(add1 n (s n))])
-      
-      (define-judgment-form nats
-        #:mode (map-add1 I O)
-        #:contract (map-add1 (n ...) (n ...))
-        [(map-add1 (n ...) (n_+ ...))
-         (add1 n n_+) ...])
-      
-      (test (judgment-holds (map-add1 () (n ...))
-                            (n ...))
-            (list (term ())))
-      
-      (test (judgment-holds (map-add1 (z (s z) (s (s z))) (n ...))
-                            (n ...))
-            (list (term ((s z) (s (s z)) (s (s (s z)))))))
-
-      (define-judgment-form nats
-        #:mode (map-add1-check I O)
-        #:contract (map-add1-check (n ...) (n ...))
-        [(map-add1-check (n ...) ((s n) ...))
-         (add1 n (s n)) ...])
-      
-      (test (judgment-holds (map-add1-check (z (s z) (s (s z))) (n ...))
-                            (n ...))
-            (list (term ((s z) (s (s z)) (s (s (s z)))))))
-      
-      (define-judgment-form nats
-        #:mode (add-some-noz I O)
-        #:contract (add-some-noz n n)
-        [(add-some-noz z z)]
-        [(add-some-noz (s n) (s n))]
-        [(add-some-noz (s n) (s (s n)))])
-      
-      (define-judgment-form nats
-        #:mode (map-add-some-noz I O)
-        #:contract (map-add-some-noz (n ...) (n ...))
-        [(map-add-some-noz (n ...) (n_+ ...))
-         (add-some-noz n n_+) ...])
-      
-      (test (sort (judgment-holds (map-add-some-noz (z (s z) (s (s z))) (n ...))
-                                  (n ...))
-                  string<=?
-                  #:key (λ (x) (format "~s" x)))
-            (list (term (z (s (s z)) (s (s (s z)))))
-                  (term (z (s (s z)) (s (s z))))
-                  (term (z (s z) (s (s (s z)))))
-                  (term (z (s z) (s (s z))))))
-      
-      (define-judgment-form nats
-        #:mode (add-some I O)
-        #:contract (add-some n n)
-        [(add-some n n)]
-        [(add-some n (s n))])
-      
-      (define-judgment-form nats
-        #:mode (map-add-some-one I O)
-        #:contract (map-add-some-one (n ...) (n ...))
-        [(map-add-some-one (n ...) ((s n) ...))
-         (add-some n (s n)) ...])
-      
-      (test (judgment-holds (map-add-some-one (z (s z) (s (s z))) (n ...))
-                            (n ...))
-            (list (term ((s z) (s (s z)) (s (s (s z)))))))
-      
-      (define-judgment-form nats
-        #:mode (hyphens I)
-        [(hyphens b)
-         -----------
-         (hyphens a)]
-        [(hyphens c)
-         -
-         (hyphens b)]
-        [(hyphens c)])
-      (test (judgment-holds (hyphens a)) #t)
-      
-      (let-syntax ([test-trace 
-                    (syntax-rules ()
-                      [(_ expr trace-spec expected)
-                       (test (let ([trace (open-output-string)])
-                               (parameterize ([current-output-port trace]
-                                              [current-traced-metafunctions trace-spec])
-                                 expr)
-                               (get-output-string trace))
-                             expected)])])
-        (test-trace (judgment-holds (sumi (s z) (s (s z)) n) n)
-                    '(sumi)
-                    #reader scribble/reader
-                    @string-append{>(sumi '(s z) '(s (s z)) '_)
-                                   > (sumi 'z '(s (s z)) '_)
-                                   < '((sumi z (s (s z)) (s (s z))))
-                                   <'((sumi (s z) (s (s z)) (s (s (s z)))))
-                            
-                                  })
-        (test-trace (judgment-holds (sumo n_1 n_2 (s z)))
-                    'all
-                    #reader scribble/reader
-                    @string-append{>(sumo '_ '_ '(s z))
-                                   > (sumo '_ '_ 'z)
-                                   < '((sumo z z z))
-                                   <'((sumo (s z) z (s z)) (sumo z (s z) (s z)))
-                            
-                                  })
-        (test-trace (letrec ([f (match-lambda
-                                  ['z #t]
-                                  [`(s ,n) (f n)])])
-                      (define-judgment-form nats
-                        #:mode (ext-trace I I)
-                        [(ext-trace z (side-condition n (f (term n))))]
-                        [(ext-trace (s n_1) n_2)
-                         (ext-trace n_1 n_2)])
-                      (trace f)
-                      (judgment-holds (ext-trace (s z) (s z))))
-                    'all
-                    #reader scribble/reader
-                    @string-append{>(ext-trace '(s z) '(s z))
-                                   > (ext-trace 'z '(s z))
-                                   > >(f '(s z))
-                                   > >(f 'z)
-                                   < <#t
-                                   < '((ext-trace z (s z)))
-                                   <'((ext-trace (s z) (s z)))
-                                  
-                                  })))
-    
-    
-    
-    (let ()
-      (define-judgment-form empty-language
-        #:mode (R I I)
-        [(side-condition (different any_a any_b))
-         -----
-         (R any_a any_b)])
-      (define-metafunction empty-language
-        [(different any_a any_a) #f]
-        [(different any_a any_b) #t])
-      (test (judgment-holds (R 1 2)) #t)
-      (test (judgment-holds (R 1 1)) #f)
-      (test (term (R 1 2)) #t)
-      (test (term (R 1 1)) #f))
-    
-    (let ()
-      (define-judgment-form empty-language
-        #:mode (J I O)
-        [(J any_2 any_3)
-         -----------------
-         (J (any_2) any_3)]
-        [---------------------
-         (J variable variable)])
-      
-      
-      (define-extended-judgment-form empty-language J 
-        #:mode (J2 I O)
-        
-        [------------------
-         (J2 number number)]
-        
-        [(J2 any_1 any_3)
-         ------------------------
-         (J2 (any_1 any_2) any_3)])
-      
-      (test (judgment-holds (J (x) any) any) '(x))
-      (test (judgment-holds (J2 (1 y) any) any) '(1))
-      (test (judgment-holds (J2 (x y) any) any) '(x))
-      (test (judgment-holds (J2 ((((x) z) y)) any) any) '(x))
-      (test (judgment-holds (J2 ((((11) z) y)) any) any) '(11)))
-    
-    (let ()
-      
-      (define-language L1
-        (n 1 2 3))
-      
-      (define-extended-language L2 L1
-        (n .... 4 5 6))
-      
-      (define-judgment-form L1
-        #:mode (J1 I O)
-        [-----------
-         (J1 n_1 n_1)])
-      
-      (define-extended-judgment-form L2 J1 
-        #:mode (J2 I O))
-      
-      (test (judgment-holds (J1 1 any) any) '(1))
-      (test (judgment-holds (J2 1 any) any) '(1))
-      (test (judgment-holds (J2 4 any) any) '(4)))
-    
-    (let ()
-      (define-language L (N ::= z (s N) (t N)))
-      
-      (define-judgment-form L
-        #:mode (J2 I O)
-        [--------  "one"
-         (J2 1 1)]
-        [--------  two
-         (J2 1 2)])
-      
-      (test (build-derivations (J2 1 any))
-            (list (derivation '(J2 1 1) "one" '())
-                  (derivation '(J2 1 2) "two" '())))
-      
-      
-      
-      (define-judgment-form L
-        #:contract (K any any)
-        #:mode (K I O)
-        [-----------
-         (K () z)]
-        [(K any_1 N) ...
-         ---------------------------
-         (K (any_1 ...) (N ...))])
-      
-      
-      
-      (test (build-derivations (K (()) any))
-            (list (derivation '(K (()) (z))
-			      #f
-                              (list (derivation '(K () z) #f '())))))
-      
-      (test
-       (build-derivations (K (() ()) any))
-       (list (derivation 
-              '(K (() ()) (z z))
-	      #f
-              (list
-               (derivation '(K () z) #f '())
-               (derivation '(K () z) #f '())))))
-      
-      (define-judgment-form L
-        #:contract (J any any)
-        #:mode (J I O)
-        [--------
-         (J () z)]
-        [(J any_1 N)  (J any_2 N)
-         ----------------------------
-         (J (any_1 any_2) (s N))]
-        [(J any N)
-         ---------------
-         (J (any) (s N))])
-      
-      (test (build-derivations 
-             (J ((()) (())) N))
-            (list (derivation
-                   '(J ((()) (())) (s (s z)))
-		   #f
-                   (list (derivation 
-                          '(J (()) (s z))
-			  #f
-                          (list
-                           (derivation
-                            '(J () z)
-			    #F
-                            '())))
-                         (derivation 
-                          '(J (()) (s z))
-			  #f
-                          (list
-                           (derivation
-                            '(J () z)
-			    #f
-                            '())))))))
-      
-      (define-judgment-form L
-        #:mode (J3 I O)
-        [(J any_1 any_2)
-         ------------
-         (J3 any_1 any_2)])
-      
-      (test (build-derivations (J3 (()) N))
-            (list (derivation
-                   '(J3 (()) (s z))
-		   #f
-                   (list
-                    (derivation
-                     '(J (()) (s z))
-		     #f
-                     (list 
-                      (derivation 
-                       '(J () z)
-		       #f
-                       '()))))))))
-    (let ()
-      (define-language U
-        (n Z (S n)))
-      
-      (define-judgment-form U
-        #:mode (jsum I I I)
-        [(jsum n Z n)]
-        [(jsum n_1 (S n_2) (S n_3))
-         (jsum n_1 n_2 n_3)])
-      
-      (define-relation U
-        sum ⊆ n x n x n
-        [(sum n Z n)]
-        [(sum n_1 (S n_2) (S n_3))
-         (sum n_1 n_2 n_3)])
-      
-      (define-relation U
-        [(rjsum n_1 n_2 n_3)
-         (jjsum n_1 n_2 n_3)])
-      
-      (define-judgment-form U
-        #:mode (jjsum I I I)
-        [(jjsum n_1 n_2 n_3)
-         (rrsum n_1 n_2 n_3)])
-      
-      (define-relation U
-        [(rrsum n_1 n_2 n_3)
-         (jsum n_1 n_2 n_3)])
-      
-      (test (term (sum Z Z Z)) #t)
-      (test (term (sum Z Z (S Z))) #f)
-      (test (term (sum (S Z) (S Z) (S (S Z)))) #t)
-      (test (term (sum (S Z) (S (S Z)) (S (S Z)))) #f)
-      (test (term (sum (S (S Z)) (S (S Z)) (S (S (S (S Z)))))) #t)
-      (test (term (sum (S (S Z)) (S (S Z)) (S (S (S Z))))) #f)
-      (test (term (jsum Z Z Z)) #t)
-      (test (term (jsum Z Z (S Z))) #f)
-      (test (term (jsum (S Z) (S Z) (S (S Z)))) #t)
-      (test (term (jsum (S Z) (S (S Z)) (S (S Z)))) #f)
-      (test (term (jsum (S (S Z)) (S (S Z)) (S (S (S (S Z)))))) #t)
-      (test (term (jsum (S (S Z)) (S (S Z)) (S (S (S Z))))) #f)
-      (test (term (rjsum Z Z Z)) #t)
-      (test (term (rjsum Z Z (S Z))) #f)
-      (test (term (rjsum (S Z) (S Z) (S (S Z)))) #t)
-      (test (term (rjsum (S Z) (S (S Z)) (S (S Z)))) #f)
-      (test (term (rjsum (S (S Z)) (S (S Z)) (S (S (S (S Z)))))) #t)
-      (test (term (rjsum (S (S Z)) (S (S Z)) (S (S (S Z))))) #f))
-    
-    (let ()
-      (define-judgment-form empty-language
-        #:mode (Q I O)
-        [(Q number_1 ,(+ (term number_1) (term number_1)))]
-        [(Q (number_1 number_2) number_3)
-         (Q ,(+ (term number_1) (term number_2)) number_3)])
-      
-      (test (judgment-holds (Q 1 2))
-                  #t)
-      (test (judgment-holds (Q 1 3))
-                  #f)
-      (test (judgment-holds (Q 1 number_1) number_1)
-                  '(2))
-      (test (judgment-holds (Q 7 14))
-                  #t)
-      (test (judgment-holds (Q 7 symbol))
-                  #f)
-      (test (judgment-holds (Q 7 number_1) number_1)
-                  '(14))
-      (test (judgment-holds (Q (1 2) 6))
-                  #t)
-      (test (judgment-holds (Q (1 3) 6))
-                  #f)
-      (test (judgment-holds (Q (3 4) number_1) number_1)
-                  '(14)))
-
-  (let () 
-    (define-judgment-form empty-language
-      #:mode (J I)
-      [(D any_x) ...
-       --------------
-       (J (any_x ...))])
-    (define-judgment-form empty-language
-      #:mode (D I)
-      [----------- nat
-       (D natural)]
-      [----------- num
-       (D number)])
-
-    ;; this test is designed to check to see if we are
-    ;; avoiding an exponential blow up. On my laptop,
-    ;; a list of length 14 was taking 2 seconds before
-    ;; the fix and 1 msec afterwards. After the fix,
-    ;; a list of length 100 (as below) was also taking 
-    ;; no time.
-    
-    (define-values (_ cpu real gc)
-      (time-apply
-       (λ ()
-         (judgment-holds (J ,(build-list 100 add1))))
-       '()))
-    (test (< cpu 1000) #t))
-
-
-    
-    (parameterize ([current-namespace (make-base-namespace)])
-      (eval '(require errortrace))
-      (eval '(require redex/reduction-semantics))
-      (eval '(define-language L))
-      (eval '(define-judgment-form L
-               #:mode (J I)
-               [(J a)
-                (J b)]
-               [(J b)]))
-      (test (eval '(judgment-holds (J a))) #t))
-    
-  
-;                                                                               
-;                                                                               
-;                                                                               
-;       ;            ;;    ;                                                    
-;       ;           ;      ;                          ;                         
-;       ;           ;                                 ;                         
-;    ;;;;   ;;;    ;;;     ;    ;;;;    ;;;          ;;;     ;;;   ; ;;   ;;;;; 
-;   ;   ;  ;   ;    ;      ;    ;   ;  ;   ;  ;;;;;   ;     ;   ;  ;;  ;  ; ; ; 
-;   ;   ;  ;;;;;    ;      ;    ;   ;  ;;;;;          ;     ;;;;;  ;   ;  ; ; ; 
-;   ;   ;  ;        ;      ;    ;   ;  ;              ;     ;      ;      ; ; ; 
-;   ;   ;  ;   ;    ;      ;    ;   ;  ;   ;          ;     ;   ;  ;      ; ; ; 
-;    ;;;;   ;;;     ;      ;    ;   ;   ;;;            ;;    ;;;   ;      ; ; ; 
-;                                                                               
-;                                                                               
-;                                                                               
-  
-  (test (let ()
-          (define-term x 1)
-          (term (x x)))
-        (term (1 1)))
-  (test (let ()
-          (define-term x 1)
-          (let ([x 'whatever])
-            (term (x x))))
-        (term (x x)))
-    
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;
-  ;; examples from doc.txt
-  ;;
-  
-  (define-language lc-lang
-    (e (e e ...)
-       x
-       v)
-    (c (v ... c e ...)
-       hole)
-    (v (lambda (x ...) e))
-    (x variable-not-otherwise-mentioned))
-  
-  (test (let ([m (redex-match lc-lang e (term (lambda (x) x)))])
-          (and m (length m)))
-        1)
-  
-  (define-extended-language qabc-lang lc-lang (q a b c))
-  
-  (test (redex-match qabc-lang
-                     e
-                     (term (lambda (a) a)))
-        #f)
-  
-  (test (let ([m (redex-match qabc-lang
-                              e
-                              (term (lambda (z) z)))])
-          (and m (length m)))
-        1)
-  
-  (require mzlib/list)
-  (let ()
-    (define-metafunction lc-lang
-      free-vars : e -> (x ...)
-      [(free-vars (e_1 e_2 ...))
-       (∪ (free-vars e_1) (free-vars e_2) ...)]
-      [(free-vars x) (x)]
-      [(free-vars (lambda (x ...) e))
-       (- (free-vars e) (x ...))])
-    
-    (define-metafunction lc-lang
-      ∪ : (x ...) ... -> (x ...)
-      [(∪ (x_1 ...) (x_2 ...) (x_3 ...) ...)
-       (∪ (x_1 ... x_2 ...) (x_3 ...) ...)]
-      [(∪ (x_1 ...))
-       (x_1 ...)]
-      [(∪) ()])
-    
-    (define-metafunction lc-lang
-      - : (x ...) (x ...) -> (x ...)
-      [(- (x ...) ()) (x ...)]
-      [(- (x_1 ... x_2 x_3 ...) (x_2 x_4 ...))
-       (- (x_1 ... x_3 ...) (x_2 x_4 ...))
-       (side-condition (not (memq (term x_2) (term (x_3 ...)))))]
-      [(- (x_1 ...) (x_2 x_3 ...))
-       (- (x_1 ...) (x_3 ...))])
-    
-    (test (term (∪)) (term ()))
-    (test (term (∪ (x y) (z a) (b c))) (term (x y z a b c)))
-    
-    (test (term (- (x y) ())) (term (x y)))
-    (test (term (- (x y) (x))) (term (y)))
-    (test (term (- (y x) (x))) (term (y)))
-    (test (term (- (x x x x x) (x))) (term ()))
-    
-    (test (term (free-vars (lambda (x) (x y)))) (list 'y))
-    (test (term (free-vars (a (b (c (d e)))))) (term (a b c d e))))
-
-  (test (variable-not-in (term (x y z)) 'x)
-        (term x1))
-  
-  (test (variable-not-in (term (y z)) 'x)
-        (term x))
-  (test (variable-not-in (term (x x1 x2 x3 x4 x5 x6 x7 x8 x9 x10)) 'x)
-        (term x11))
-  (test (variable-not-in (term (x x11)) 'x)
-        (term x1))
-  (test (variable-not-in (term (x x1 x2 x3)) 'x1)
-        (term x4))
-  (test (variable-not-in (term (x x1 x1 x2 x2)) 'x)
-        (term x3))
-  (test (variable-not-in (term (|| |1|)) '||) '|2|)
-  
-  (test (variables-not-in (term (x y z)) '(x))
-        '(x1))
-  (test (variables-not-in (term (x2 y z)) '(x x x))
-        '(x x1 x3))
-  
-  (test ((term-match/single empty-language
-                            [(variable_x variable_y)
-                             (cons (term variable_x)
-                                   (term variable_y))])
-         '(x y))
-        '(x . y))
-  
-  (test ((term-match/single empty-language
-                            [(side-condition (variable_x variable_y)
-                                             (eq? (term variable_x) 'x))
-                             (cons (term variable_x)
-                                   (term variable_y))])
-         '(x y))
-        '(x . y))
-  
-  (test ((term-match/single empty-language [() 'a] [() 'b])
-         '())
-        'a)
-
-  (test (with-handlers ((exn:fail:redex? (λ (x) 'right-exn))
-                        ((λ (x) #t) (λ (x) 'wrong-exn)))
-          ((term-match/single empty-language
-                              [(number_1 ... number_2 ...) 1])
-           '(1 2 3))
-          'no-exn)
-        'right-exn)
-  
-  (test (with-handlers ((exn:fail:redex? (λ (x) 'right-exn))
-                        ((λ (x) #t) (λ (x) 'wrong-exn)))
-          ((term-match/single empty-language
-                              [(number_1 ... number_2 ...) 1])
-           'x)
-          'no-exn)
-        'right-exn)
-  
-  (test ((term-match empty-language
-                     [(number_1 ... number_2 ...) 1])
-         'x)
-        '())
-                             
-  (define-language x-is-1-language
-    [x 1])
-  
-  (test ((term-match/single x-is-1-language
-                            [(x x)
-                             1])
-         '(1 1))
-        1)
-  
-  (test (call-with-values
-         (λ () 
-           ((term-match/single empty-language
-                               [() (values 1 2)])
-            '()))
-         list)
-        '(1 2))
-  
-  (test (let ([x 0])
-          (cons ((term-match empty-language
-                             [(any_a ... number_1 any_b ...)
-                              (begin (set! x (+ x 1))
-                                     (term number_1))])
-                 '(1 2 3))
-                x))
-        '((1 2 3) . 3))
-  
-  (test ((term-match empty-language
-                     [number_1
-                      (term number_1)]
-                     [number_1
-                      (term number_1)])
-         '1)
-        '(1 1))
-  
-  (test (apply-reduction-relation
-         (reduction-relation
-          x-language
-          (--> (x_one x_!_one x_!_one x_!_one)
-               (x_one x_!_one)))
-         (term (a a b c)))
-        (list (term (a x_!_one))))
-
-(test (apply-reduction-relation
-       (reduction-relation
-        x-language
-        (--> (x_!_one ... x_!_one) odd-length-different))
-       (term (a b c d)))
-      (list (term odd-length-different)))
-  
-  ;; tests `where' clauses in reduction relation
-  (test (apply-reduction-relation
-         (reduction-relation empty-language
-                             (--> number_1 
-                                  any_y
-                                  (where any_y ,(+ 1 (term number_1)))))
-         3)
-        '(4))
-  
-  ;; tests `where' clauses scoping
-  (test (let ([x 5])
-          (apply-reduction-relation
-           (reduction-relation empty-language
-                               (--> any 
-                                    any_z
-                                    (where any_y ,x)
-                                    (where any_x 2)
-                                    (where any_z ,(+ (term any_y) (term any_x)))))
-           'whatever))
-        '(7))
-  
-  ;; tests `where' clauses bind in side-conditions
-  (test (let ([x 'unk])
-          (apply-reduction-relation
-           (reduction-relation empty-language
-                               (--> any 
-                                    the-result
-                                    (where any_y any)
-                                    (side-condition (eq? (term any_y) 'whatever))))
-           'whatever))
-        '(the-result))
-  
-  ;; test that where clauses bind in side-conditions that follow
-  (let ([save1 #f]
-        [save2 #f])
-    (term-let ([any_y (term outer-y)])
-              (test (begin (apply-reduction-relation
-                            (reduction-relation empty-language
-                                                (--> number_1 
-                                                     any_y
-                                                     (side-condition (set! save1 (term any_y)))
-                                                     (where any_y inner-y)
-                                                     (side-condition (set! save2 (term any_y)))))
-                            3)
-                           (list save1 save2))
-                    (list 'outer-y 'inner-y))))
-  
-  (test (apply-reduction-relation
-         (reduction-relation empty-language
-                             (--> any 
-                                  any_y
-                                  (fresh x)
-                                  (where any_y x)))
-         'x)
-        '(x1))
-  
-  (test (let ([not-and
-               (λ () #f)])
-          (redex-match empty-language
-                       (side-condition any_1 (not-and))
-                       1))
-        #f)
-
-  (let ()
-    ;; tests where's ability to have redex patterns, not just syntax-case patterns
-    (define-language var-lang [(x y z w) variable])
-    
-    (define red
-      (reduction-relation
-       var-lang
-       (--> (x ...)
-            (y ... z ...)
-            (where (y ... w z ...) (x ...)))))
-    
-    (test (apply-reduction-relation red (term (a b c)))
-          (list (term (a b)) (term (a c)) (term (b c)))))
-  
-  
-  (let ([r (reduction-relation
-            grammar
-            (->1 1 2)
-            (->2 3 4)
-            (->4 5 6)
-            with
-            [(--> (side-condition (a number) (even? (term number))) b)
-             (->1 a b)]
-            [(--> (X 
-                   (number number)
-                   (X_1 X_1)
-                   (M_!_1 M_!_1)
-                   (1 ..._1 1 ..._1)
-                   (1 ..._!_1 1 ..._!_1))
-                  b)
-             (->2 X b)]
-            [(--> (a 1) b)
-             (->3 a b)]
-            [(->3 (a 2) b)
-             (->4 a b)])])
-    
-    ; test that names are properly bound for side-conditions in shortcuts
-    (let* ([lhs ((rewrite-proc-lhs (first (reduction-relation-make-procs r))) grammar)]
-           [proc (third lhs)]
-           [name (cadar (cddadr lhs))]
-           [bind (λ (n) (make-bindings (list (make-bind name n))))])
-      (test (and (proc (bind 4)) (not (proc (bind 3)))) #t))
-    
-    ; test binder renaming
-    (let ([sym-mtch? (λ (rx) (λ (s) (and (symbol? s) (regexp-match? rx (symbol->string s)))))])
-      (match (rewrite-proc-lhs (second (reduction-relation-make-procs r)))
-        [`(3
-           (,(and n1 (? (sym-mtch? #px"^number_\\d+$"))) ,n1)
-           (,(and n2 (? (sym-mtch? #px"^X_1\\d+$"))) ,n2)
-           (,(and m1 (? (sym-mtch? #px"^M_!_1\\d+$"))) ,m1)
-           (1 ,(and ...1 (? (sym-mtch? #px"^\\.\\.\\._1\\d+$"))) 1 ,...1)
-           (1 ,(and ...!1 (? (sym-mtch? #px"^\\.\\.\\._!_1\\d+$"))) 1 ,...!1))
-         #t]
-        [else #f]))
-    
-    ; test shortcut in terms of shortcut
-    (test (match ((rewrite-proc-lhs (third (reduction-relation-make-procs r))) grammar)
-            [`(list (list (side-condition 5 ,(? procedure?) ,_) 2) 1) #t]
-            [else #f])
-          #t))
-  
-  (let ([< (λ (c d) (string<? (car c) (car d)))])
-    
-    (let* ([R (reduction-relation
-               empty-language
-               (--> number (q ,(add1 (term number)))
-                    (side-condition (odd? (term number)))
-                    side-condition)
-               (--> 1 4 plain)
-               (==> 2 t
-                    shortcut)
-               with
-               [(--> (q a) b)
-                (==> a b)])]
-           [c (make-coverage R)])
-      (parameterize ([relation-coverage (list c)])
-        (apply-reduction-relation R 4)
-        (test (sort (covered-cases c) <)
-              '(("plain" . 0) ("shortcut" . 0) ("side-condition" . 0)))
-        
-        (apply-reduction-relation R 3)
-        (test (sort (covered-cases c) <)
-              '(("plain" . 0) ("shortcut" . 0) ("side-condition" . 1)))
-        
-        (apply-reduction-relation* R 1)
-        (test (sort (covered-cases c) <)
-              '(("plain" . 1) ("shortcut" . 1) ("side-condition" . 2)))))
-    
-    (let ()
-      (define-language L
-        (e (e e)
-           (delay e)
-           +inf.0
-           I)
-        (v (delay e)
-           +inf.0
-           I))
-      
-      (define red
-        (compatible-closure
-         (reduction-relation
-          L
-          (--> (+inf.0 +inf.0) (+inf.0 +inf.0))
-          (--> (I e) e))
-         L
-         e))
-      
-      (test (apply-reduction-relation* 
-             red
-             (term (I (delay (+inf.0 +inf.0))))
-             #:stop-when (redex-match L v))
-            (list (term (delay (+inf.0 +inf.0)))))
-      
-      (test (apply-reduction-relation* 
-             red
-             (term (I (delay (+inf.0 +inf.0)))))
-            '()))
-    
-    (let* ([S (reduction-relation
-               empty-language
-               (--> 1 1 uno))]
-           [S+ (extend-reduction-relation
-                S empty-language
-                (--> 2 2 dos))])
-      (let ([c (make-coverage S+)])
-        (parameterize ([relation-coverage (list c)])
-          (apply-reduction-relation S (term 1))
-          (test (sort (covered-cases c) <)
-                '(("dos" . 0) ("uno" . 1)))))
-      (let ([c (make-coverage S)])
-        (parameterize ([relation-coverage (list c)])
-          (apply-reduction-relation S+ (term 1))
-          (test (sort (covered-cases c) <)
-                '(("uno" . 1))))))
-    
-    (let* ([T (reduction-relation empty-language (--> any any))]
-           [c (make-coverage T)])
-      (parameterize ([relation-coverage (list c)])
-        (apply-reduction-relation T (term q))
-        (test (and (regexp-match #px"tl-test.(?:.+):\\d+:\\d+" (caar (covered-cases c))) #t)
-              #t))))
-
-(let ()
-  (define-language A
-    (e ::= 1))
-  
-  (define-extended-language B A
-    (fred ::= 0))
-  
-  (define err-msg
-    (with-handlers ([exn:fail? exn-message])
-      (compatible-closure
-       (reduction-relation B (--> fred fred))
-       A ;; should've been B
-       e)
-      "no error raised"))
-  
-  (test #t (regexp-match? #rx"^compatible-closure:.*fred" err-msg)))
-
-;; this tests that context-closure (and thus compatible-closure)
-;; play along properly with way extend-reduction-relation handles
-;; language extensions
-(let ()
-  (define-language L0 (K ::= number))
-  (define r (reduction-relation L0 (--> 5 6)))
-  (define r0 (context-closure r L0 (hole K)))
-  (define-language L1 (K ::= string))
-  (define r1 (extend-reduction-relation r0 L1))
-  (test (apply-reduction-relation r1  (term (5 "14"))) (list '(6 "14"))))
-  
-  (let* ([R (reduction-relation
-             empty-language
-             (--> any any id))]
-         [c (make-coverage R)]
-         [c* (make-coverage R)])
-    (parameterize ([relation-coverage (list c c*)])
-      (apply-reduction-relation R 4)
-      (test (covered-cases c) '(("id" . 1)))
-      (test (covered-cases c*) '(("id" . 1)))))
-  
-  (let* ([< (λ (c d) 
-              (let ([line-no (compose
-                              string->number
-                              second
-                              (curry regexp-match #px".*:(\\d+):\\d+"))])
-                (< (line-no (car c)) (line-no (car d)))))]
-         [src-ok? (curry regexp-match? #px"tl-test.(?:.+):\\d+:\\d+")]
-         [sorted-counts (λ (cc) (map cdr (sort (covered-cases cc) <)))])
-    (define-metafunction empty-language
-      [(f 1) 1]
-      [(f 2) 2])
-    (define-metafunction/extension f empty-language
-      [(g 3) 3])
-    (define-relation empty-language
-      [(R number)
-       ,(even? (term number))]
-      [(R number)
-       ,(= 3 (term number))])
-    
-    (let ([fc (make-coverage f)]
-          [rc (make-coverage (reduction-relation empty-language (--> any any)))])
-      (parameterize ([relation-coverage (list rc fc)])
-        (term (f 2))
-        (test (andmap (compose src-ok? car) (covered-cases fc))
-              #t)
-        (test (sorted-counts fc) '(0 1))
-        
-        (term (f 1))
-        (term (f 1))
-        (test (sorted-counts fc) '(2 1))))
-    
-    (let ([c (make-coverage f)])
-      (parameterize ([relation-coverage (list c)])
-        (term (g 1))
-        (test (sorted-counts c) '(1 0))))
-    (let ([c (make-coverage g)])
-      (parameterize ([relation-coverage (list c)])
-        (term (f 1))
-        (test (sorted-counts c) '(1 0 0))))
-    
-    ;; coverage for define-relation not working since
-    ;; it was changed to compile to judgment-form
-    #;
-    (let ([c (make-coverage R)])
-      (parameterize ([relation-coverage (list c)])
-        (term (R 2))
-        (term (R 3))
-        (term (R 5))
-        (test (sorted-counts c) '(1 1))))
-    
-    (let ([c (make-coverage f)]
-          [c* (make-coverage f)])
-      (parameterize ([relation-coverage (list c* c)])
-        (term (f 1))
-        (test (sorted-counts c) '(1 0))
-        (test (sorted-counts c*) '(1 0)))))
-  
-;                                                                       
-;                                                                       
-;                                                                       
-;                                                                       
-;                                                 ;;;                   
-;   ;;                ;;           ;             ;; ;;                  
-;   ;;                ;;            ;            ;; ;;                  
-;  ;;;;;  ;;;    ;;; ;;;;;           ;;           ;;;      ;;;;   ;;;;  
-;   ;;   ;; ;;  ;; ;  ;;  ;;;;;;;;     ;;        ;;;      ;; ;   ;;  ;; 
-;   ;;   ;;;;;  ;;;   ;;              ;;;       ;;  ;  ;; ;;     ;;  ;; 
-;   ;;   ;;       ;;  ;;            ;;;         ;;  ;;;;  ;;     ;;  ;; 
-;   ;;   ;;  ;  ; ;;  ;;           ;;           ;;   ;;   ;; ;   ;;  ;; 
-;   ;;;;  ;;;   ;;;   ;;;;         ;             ;;;;; ;;  ;;;;   ;;;;  
-;                                                                       
-;                                                                       
-;                                                                       
-
-  
-  (define-syntax-rule 
-    (capture-output arg1 args ...)
-    (let ([p (open-output-string)])
-      (parameterize ([current-output-port p]
-                     [current-error-port p])
-        arg1 args ...)
-      (get-output-string p)))
-  
-  (let ()
-    (define red (reduction-relation empty-language (--> 1 2)))
-    (test (capture-output (test-->> red 1 2) (test-results))
-          "One test passed.\n")
-    (test (capture-output (test-->> red 2 3) (test-results))
-          #rx"FAILED .*tl-test.(?:.+):[0-9.]+\nexpected: 3\n  actual: 2\n1 test failed \\(out of 1 total\\).\n"))
-    
-  (let ()
-    (define red-share (reduction-relation 
-                       empty-language
-                       (--> a b)
-                       (--> a c)
-                       (--> c d)
-                       (--> b d)))
-    (test (capture-output (test-->> red-share (term a) (term d)) (test-results))
-          "One test passed.\n"))
-  
-  (let ()
-    (define red-cycle (reduction-relation 
-                       empty-language
-                       (--> a a)))
-    (test (capture-output (test-->> red-cycle #:cycles-ok (term a)) (test-results))
-          "One test passed.\n")
-    (test (capture-output (test-->> red-cycle (term a)) (test-results))
-          #rx"FAILED .*tl-test.(?:.+):[0-9.]+\nfound a cycle in the reduction graph\n1 test failed \\(out of 1 total\\).\n"))
-  
-  (let ()
-    (define subred (reduction-relation empty-language (--> natural ,(- (term natural) 1))))
-    (test (capture-output (test-->> subred #:pred (λ (x) #t) 1 -1) (test-results))
-          "One test passed.\n")
-    (test (capture-output (test-->> subred #:pred number? 1 -1) (test-results))
-          "One test passed.\n")
-    (test (capture-output (test-->> subred #:pred odd? 1 -1) (test-results))
-         #rx"FAILED .*tl-test.rkt:[0-9.]+\nfound a term that failed #:pred: 0\n1 test failed \\(out of 1 total\\).\n"))
-  
-  (let ()
-    (define-metafunction empty-language [(f any) ((any))])
-    (test (capture-output (test-equal (term (f 1)) (term ((1))))
-                          (test-results))
-          "One test passed.\n"))
-
-  (let ()
-    (define-metafunction empty-language [(f any) ((any))])
-    (define (my-equal? x y) (and (memq x '(a b c)) (memq y '(a b c))))
-    (test (capture-output (test-equal (term a) (term b) #:equiv my-equal?)
-                          (test-results))
-          "One test passed.\n"))
-  
-  (let ()
-    (test (capture-output (test-predicate odd? 1)
-                          (test-results))
-          "One test passed.\n"))
-  
-  (let ()
-    (define red (reduction-relation empty-language (--> any (any))))
-    (test (capture-output (test--> red (term (1 2 3)) (term ((1 2 3)))) (test-results))
-          "One test passed.\n"))
-  
-  (let ()
-    (define red (reduction-relation empty-language 
-                                    (--> any (any))
-                                    (--> (any) any)))
-    (test (capture-output (test--> red (term (x)) (term ((x))) (term x)) (test-results))
-          "One test passed.\n")
-    (test (capture-output (test--> red (term (x)) (term x) (term ((x)))) (test-results))
-          "One test passed.\n"))
-  
-  (let ()
-    (define-language L
-      (i integer))
-    
-    (define R
-      (reduction-relation
-       L
-       (--> i i)
-       (--> i ,(add1 (term i)))))
-    
-    (define (mod2=? i j)
-      (= (modulo i 2) (modulo j 2)))
-    
-    (test (capture-output (test--> R #:equiv mod2=? 7 1 0) (test-results))
-          "One test passed.\n")
-    (test (capture-output (test--> R #:equiv mod2=? 7 1) (test-results))
-          #rx"FAILED .*tl-test\\.(?:.+):[0-9.]+\nexpected: 1\n  actual: 8\n  actual: 7\n1 test failed \\(out of 1 total\\).\n"))
-  
-  (let-syntax ([test-bad-equiv-arg
-                (λ (stx)
-                  (syntax-case stx ()
-                    [(_ test-form)
-                     (syntax/loc stx
-                       (test-contract-violation
-                        (test-form (reduction-relation empty-language (--> any any))
-                                   #:equiv 1 2)
-                        #:blaming "tl-test"))]))])
-    (test-bad-equiv-arg test-->)
-    (test-bad-equiv-arg test-->>))
-
-  (let ()
-    (capture-output (test-results))
-    (define-language L)
-    
-    (define 1+
-      (reduction-relation 
-       L
-       (--> number ,(add1 (term number)))))
-    
-    (define (equal-to-7 x) (= x 7))
-    (test (capture-output (test-->>∃ #:steps 5 1+ 0 equal-to-7))
-          #rx"^FAILED .*\nno term satisfying #<procedure:equal-to-7> reachable from 0 \\(within 5 steps\\)\n$")
-    
-    (test (capture-output (test-->>∃ 1+ 0 7)) "")
-    (test (capture-output (test-->>E 1+ 0 7)) "")
-    (test (capture-output (test-->>∃ #:steps +inf.0 1+ 0 7)) "")
-    (test (capture-output (test-->>∃ 1+ 0 equal-to-7)) "")
-    
-    (define identity
-      (reduction-relation
-       L
-       (--> any any)))
-    
-    (test (capture-output (test-->>∃ identity 0 1))
-          #rx"^FAILED .*\nterm 1 not reachable from 0\n$")
-    
-    (test (capture-output (test-results)) "2 tests failed (out of 6 total).\n")
-    
-    (test-contract-violation
-     (test-->>∃ 1+ 0 (λ (x y) x))
-     #:blaming "tl-test"
-     #:message "goal expression")
-    (test-contract-violation
-     (test-->>∃ 1 0 1)
-     #:blaming "tl-test"
-     #:message "reduction relation expression")
-    (test-contract-violation
-     (test-->>∃ #:steps 1.1 1+ 0 1)
-     #:blaming "tl-test"
-     #:message "steps expression"))
-  
-  (print-tests-passed 'tl-test.rkt)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/tut-subst-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/tut-subst-test.rkt
deleted file mode 100644
index c116027cb8..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/tut-subst-test.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-(require redex/reduction-semantics 
-         redex/tut-subst
-         racket/set)
-
-(define (an-x? x) (memq x '(a b c x y z z2 z2 q)))
-
-(test-equal (fvs an-x? (term (+ x a b))) (set 'x 'a 'b))
-(test-equal (fvs an-x? (term (λ (x num) (+ x y)))) (set 'y))
-(test-equal (fvs an-x? (term (λ (x num) (y num) (+ x y)))) (set))
-
-(define-language L)
-(define-metafunction L
-  [(subst (any_x any_b) ... any_body)
-   ,(subst/proc an-x? (term (any_x ...)) (term (any_b ...)) (term any_body))])
-
-(test-equal (term (subst (x y) x)) (term y))
-(test-equal (term (subst (x y) z)) (term z))
-(test-equal (term (subst (x y) (x (y z)))) (term (y (y z))))
-(test-equal (term (subst (x y) ((λ (x num) x) ((λ (y1 num) y1) (λ (x num) z)))))
-            (term ((λ (x num) x) ((λ (y1 num) y1) (λ (x num) z)))))
-(test-equal (term (subst (x y) ((λ x x) ((λ y1 y1) (λ x z)))))
-            (term ((λ x x) ((λ y1 y1) (λ x z)))))
-(test-equal (term (subst (x y) (if0 (+ 1 x) x x)))
-            (term (if0 (+ 1 y) y y)))
-(test-equal (term (subst (x (λ (z num) y)) (λ (y num) x)))
-            (term (λ (y1 num) (λ (z num) y))))
-(test-equal (term (subst (x (λ z y)) (λ y x)))
-            (term (λ y1 (λ z y))))
-(test-equal (term (subst (x 1) (λ (y num) x)))
-            (term (λ (y num) 1)))
-(test-equal (term (subst (x 1) (λ y x)))
-            (term (λ y 1)))
-(test-equal (term (subst (x y) (λ (y num) x)))
-            (term (λ (y1 num) y)))
-(test-equal (term (subst (x (λ (y num) y)) (λ (z num) (z2 z))))
-            (term (λ (z num) (z2 z))))
-(test-equal (term (subst (x (λ (z num) z)) (λ (z num) (z1 z))))
-            (term (λ (z num) (z1 z))))
-(test-equal (term (subst (x z) (λ (z num) (z1 z))))
-            (term (λ (z2 num) (z1 z2))))
-(test-equal (term (subst (x3 5) (λ (x2 num) x2)))
-            (term (λ (x2 num) x2)))
-(test-equal (term (subst (z *) (λ (z num) (x num) 1)))
-            (term (λ (z num) (x num) 1)))
-(test-equal (term (subst (q (λ (x num) z)) (λ (z num) (x num) q)))
-            (term (λ (z1 num) (x num) (λ (x num) z))))
-(test-equal (term (subst (x 1) (λ (x num) (x num) x)))
-            (term (λ (x num) (x num) x)))
-(test-equal (term (subst (x (y z)) (λ (z num) (z (x y)))))
-            (term (λ (z1 num) (z1 ((y z) y)))))
-(test-equal (term (subst (x 1) (λ (a (→ num (→ num num)))
-                                 (λ (b (→ num (→ num num)))
-                                   x))))
-            (term (λ (a (→ num (→ num num)))
-                    (λ (b (→ num (→ num num)))
-                      1))))
-(test-results)
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/unify-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/unify-tests.rkt
deleted file mode 100644
index f0db3ba2a1..0000000000
--- a/pkgs/redex-pkgs/redex-test/redex/tests/unify-tests.rkt
+++ /dev/null
@@ -1,1232 +0,0 @@
-#lang racket
-
-(require (for-syntax redex/private/rewrite-side-conditions)
-         redex/private/pat-unify
-         redex/reduction-semantics
-         redex/private/jdg-gen
-         rackunit)
-
-(provide env-equal?)
-
-(define unify*-untested (make-hash))
-(for* ([p1 (in-list pat*-clause-p?s)]
-       [p2 (in-list pat*-clause-p?s)])
-  (hash-set! unify*-untested
-             (cons (object-name p1) 
-                   (object-name p2))
-             #t))
-
-(define (log-test p1 p2)
-  (define (pat->pred-name p)
-    (ormap (λ (pred?) (and (pred? p) (object-name pred?)))
-           pat*-clause-p?s))
-  (hash-remove! unify*-untested
-                (cons (pat->pred-name p1)
-                      (pat->pred-name p2))))
-
-(define (contains-name-pat? p)
-  (cond
-    [(and (pair? p) (eq? (car p) 'name)) #t]
-    [(list? p) (ormap contains-name-pat? p)]
-    [else #f]))
-
-(define (unify/lt p1 p2 e l)
-  (unless (or (contains-name-pat? p1)
-              (contains-name-pat? p2))
-    (log-test p1 p2))
-  (unify p1 p2 e l))
-
-(define (unify*/lt p1 p2 e l)
-  (log-test p1 p2)
-  (unify* p1 p2 e l))
-
-(define-syntax m-hash
-  (λ (stx)
-    (syntax-case stx ()
-      [(m-hash kvs ...)
-       #'(hash kvs ...)])))
-
-(define (p*e-equal? pe-left pe-right)
-  (and (equal? (p*e-p pe-left)
-               (p*e-p pe-right))
-       (env-equal? (p*e-e pe-left)
-                   (p*e-e pe-right))))
-
-(define (env-equal? e-left e-right)
-  (and (equal? (env-eqs e-left)
-               (env-eqs e-right))
-       (dqs-equal? (env-dqs e-left)
-                   (env-dqs e-right))))
-
-(define (dqs->dqset dqs)
-  (for/set ([the-dq (in-list dqs)])
-           (match the-dq
-             [(dq ps dq-e)
-              (for/fold ([dq-pairs (set)])
-                ([ls (first dq-e)]
-                 [rs (second dq-e)])
-                (set-add dq-pairs (cons ls rs)))])))
-
-(check-equal? (dqs->dqset (list (dq '() `((list (name a ,(bound))
-                                                (name b ,(bound)))
-                                          (list a-cant-be
-                                                b-cant-be)))))
-              (set (set (cons 'list 'list)
-                        (cons `(name a ,(bound)) 'a-cant-be)
-                        (cons `(name b ,(bound)) 'b-cant-be))))
-
-(check-equal? (dqs->dqset `(,(dq '() `((list (name a ,(bound))
-                                             (name b ,(bound)))
-                                       (list a-cant-be
-                                             b-cant-be)))
-                            ,(dq '() `((list (name c ,(bound))
-                                             (name d ,(bound)))
-                                       (list c-cant-be
-                                             d-cant-be)))))
-              (set (set (cons 'list 'list)
-                        (cons `(name c ,(bound)) 'c-cant-be)
-                        (cons `(name d ,(bound)) 'd-cant-be))
-                   (set (cons 'list 'list)
-                        (cons `(name b ,(bound)) 'b-cant-be)
-                        (cons `(name a ,(bound)) 'a-cant-be))))
-
-(define (dqs-equal? dqs-left dqs-right)
-  (equal? (dqs->dqset dqs-left)
-          (dqs->dqset dqs-right)))
-
-(define (p*e-equivalent? pe-left pe-right initial-eqs)
-  (define (new-vars env)
-    (set-subtract (for/set ([(k v) (in-hash (env-eqs env))]) k)
-                  (for/set ([(k v) (in-hash initial-eqs)]) k)))
-  (define all-left (all-resolutions pe-left))
-  (define all-right (all-resolutions pe-right))
-  (and (unless (for/and
-                   ([l (for/list ([l all-left] 
-                                  #:when (no-lvars-pat? l)) 
-                         l)]
-                    [r (for/list ([r all-right] 
-                                  #:when (no-lvars-pat? r)) 
-                         r)])
-                 (no-lvars-pat-equal? l r))
-           (not (set-empty? (set-intersect all-left all-right))))
-       (equal? (new-vars (p*e-e pe-left))
-               (new-vars (p*e-e pe-right)))))
-
-(define (no-lvars-pat? p)
-  (match p
-    [`(list ,ps ...)
-     (for/and ([p ps])
-       (no-lvars-pat? p))]
-    [`(cstr (,nts ...) ,p)
-     (no-lvars-pat? p)]
-    [`(name ,id ,(bound))
-     #f]
-    [else 
-     #t]))
-
-(define (no-lvars-pat-equal? l r)
-  (match* (l r)
-    [(`(list ,ls ...) `(list ,rs ...))
-     (and (equal? (length ls) (length rs))
-          (for/and ([l ls] [r rs])
-            (no-lvars-pat-equal? l r)))]
-    [(`(cstr (,l-nts ...) (nt ,l-nt)) `(cstr (,r-nts ...) (nt ,r-nt)))
-     (equal? (for/set ([l `(,@l-nts ,l-nt)]) l)
-             (for/set ([r `(,@r-nts ,r-nt)]) r))]
-    [(`(cstr (,l-nts ...) ,l-p) `(cstr (,r-nts ...) ,r-p))
-     (and (equal? (for/set ([l-nt `(,@l-nts)]) l-nt)
-                  (for/set ([r-nt `(,@r-nts)]) r-nt))
-          (no-lvars-pat-equal? l-p r-p))]
-    [(_ _)
-     (equal? l r)]))
-
-(define (all-resolutions pe)
-  (define p0 (p*e-p pe))
-  (define env (p*e-e pe))
-  (define eqs (env-eqs env))
-  (let loop ([p p0]
-             [n 0])
-    (when (> n 100)
-      (error 'all-resolutions "size bound exceeded: ~s" p))
-    (match p
-      [`(name ,id ,(bound))
-       (define res (hash-ref eqs (lvar id)))
-       (match res
-         [(lvar id2)
-          (set-union (set p)
-                     (loop `(name ,id2 ,(bound)) (add1 n)))]
-         [`(name ,id2 ,(bound))
-          (set-union (set p)
-                     (loop `(name ,id2 ,(bound)) (add1 n)))]
-         [else
-          (set p res)])]
-      [`(list ,ps ...)
-        (define p-lists
-          (let loop2 ([pats ps])
-              (match pats
-                [(cons p pts)
-                 (for*/set ([all-p (loop p (add1 n))]
-                            [all-rest (loop2 pts)])
-                       `(,all-p ,@all-rest))]
-                ['() (set '())])))
-        (for/set ([p-l (in-set p-lists)])
-            (match p-l
-              [`(,ps ...)
-               `(list ,@ps)]))]
-      [`(cstr (,nts ...) ,c-p)
-       (for/set ([all-p (in-set (loop c-p (add1 n)))])
-          `(cstr (,@nts) ,all-p))]
-      [`(mismatch-name ,id ,m-p)
-       (for/set ([all-p (in-set (loop m-p (add1 n)))])
-          `(mismatch-name ,id ,all-p))]
-      [else
-       (set p)])))
-
-(check-equal? (all-resolutions (p*e 'number (env (hash) '())))
-              (set 'number))
-(check-equal? (all-resolutions (p*e `(name a ,(bound)) 
-                                    (env (hash (lvar 'a) 5) '())))
-              (set 5 `(name a ,(bound))))
-(check-equal? (all-resolutions (p*e `(name a ,(bound)) 
-                                    (env (hash (lvar 'a) (lvar 'b)
-                                               (lvar 'b) 7) '())))
-              (set 7 `(name a ,(bound)) `(name b ,(bound))))
-(check-equal? (all-resolutions (p*e `(list 1 2 3) (env (hash) '())))
-              (set '(list 1 2 3)))
-(check-equal? (all-resolutions (p*e `(list 1 (name q ,(bound)) 3)
-                                    (env (hash (lvar 'q) 2) '())))
-              (set '(list 1 2 3) `(list 1 (name q ,(bound)) 3)))
-(check-equal? (all-resolutions (p*e `(list (name a ,(bound)) (name b ,(bound)))
-                                    (env (hash (lvar 'a) 1 (lvar 'b) 2) '())))
-              (set
-               '(list 1 2)
-               `(list 1 (name b ,(bound)))
-               `(list (name a ,(bound)) 2)
-               `(list (name a ,(bound)) (name b ,(bound)))))
-(check-equal? (all-resolutions (p*e `(list (name a ,(bound)) (name b ,(bound)))
-                                    (env (hash (lvar 'a) 1 
-                                               (lvar 'b) `(name c ,(bound))
-                                               (lvar 'c) 2) '())))
-              (set
-               '(list 1 2)
-               `(list 1 (name b ,(bound)))
-               `(list 1 (name c ,(bound)))
-               `(list (name a ,(bound)) 2)
-               `(list (name a ,(bound)) (name c ,(bound)))
-               `(list (name a ,(bound)) (name b ,(bound)))))
-(check-equal? (all-resolutions (p*e `(cstr (e) (nt q)) (env (hash) '())))
-              (set '(cstr (e) (nt q))))
-
-;; test unify but only look at the eqs (half the env)
-(define (unify/format p1 p2 eqs L)
-  (define res-pe (unify/lt p1 p2 (env eqs '()) L))
-  (define res-pe-bkwd (unify/lt p2 p1 (env eqs '()) L))
-  (cond
-    [(and (p*e? res-pe)
-          (p*e? res-pe-bkwd)
-          (p*e-equivalent? res-pe res-pe-bkwd eqs))
-     (p*e (p*e-p res-pe) (env-eqs (p*e-e res-pe)))]
-    [(and (unif-fail? res-pe)
-          (unif-fail? res-pe-bkwd))
-     #f]
-    [else 
-     (list 'different-orders=>different-results
-           res-pe
-           res-pe-bkwd)]))
-
-
-(define (unify*/format p1 p2 eqs L)
-  (define e (env eqs '()))
-  (define res (unify*/lt p1 p2 e L))
-  (define res-bkwd (unify*/lt p2 p1 e L))
-  (cond
-    [(and (not-failed? res)
-          (not-failed? res-bkwd)
-          (p*e-equivalent? res res-bkwd eqs))
-     res]
-    [(and (unif-fail? res)
-          (unif-fail? res-bkwd))
-     #f]
-    [else 
-     (list 'different-orders=>different-results
-           res
-           res-bkwd)]))
-
-;; This looks really strange but it is for backwards compatability
-;; with tests that didn't take nonterminal productions into account.
-;; There nts will all (except n) accept anything, but since they
-;; have two productions they don't get collapsed (and so will create
-;; cstr's).
-(define-language L0
-  (e any any)
-  (q any any)
-  (v any any)
-  (b any any)
-  (x any any)
-  (Γ any any)
-  (s any any)
-  (a any any)
-  (Q any any)
-  (n number any))
-
-
-(check-equal? (unify/format `number `number (hash) L0)
-              (p*e `number (hash)))
-(check-equal? (unify/format `number `variable (hash) L0)
-              #f)
-(check-equal? (unify/format `number `integer (hash) L0)
-              (p*e `integer (hash)))
-(check-equal? (unify/format `(list integer natural) `(list natural integer) (hash) L0)
-              (p*e `(list natural natural) (hash)))
-(check-equal? (unify/format `(list integer natural) `(list natural variable) (hash) L0)
-              #f)
-(check-equal? (unify/format `variable `variable-not-otherwise-mentioned (hash) L0)
-              (p*e `variable-not-otherwise-mentioned (hash)))
-(check-equal? (unify/format `(nt e) `(list (nt e) variable) (hash) L0)
-              (p*e `(cstr (e) (list (nt e) variable)) (hash)))
-(check-equal? (unify/format `(list (nt e) variable) `(nt e) (hash) L0)
-              (p*e `(cstr (e) (list (nt e) variable)) (hash)))
-(check-equal? (unify/format `(nt e) `string (hash) L0)
-              (p*e `(cstr (e) string) (hash)))
-(check-equal? (unify/format `string `(nt e) (hash) L0)
-              (p*e `(cstr (e) string) (hash)))
-(check-equal? (unify/format `number `(nt e) (hash) L0)
-              (p*e `(cstr (e) number) (hash)))
-
-
-;; tests specific to #f
-;; (which don't work in the above format)
-(check-equal? (unify #f '(name x any) (env (hash) '()) #f)
-              (p*e `(name x ,(bound))
-                   (env (hash (lvar 'x) #f) '())))
-(check-equal? (unify #t '(name x any) (env (hash) '()) #f)
-              (p*e `(name x ,(bound))
-                   (env (hash (lvar 'x) #t) '())))
-(check-equal? (unify* #t 'any (env (hash) '()) #f)
-              (p*e #t (env (hash) '())))
-(check-equal? (unify* #f 'any (env (hash) '()) #f)
-              (p*e #f (env (hash) '())))
-(check-equal? (unify* #t 'any (env (hash) '()) #f)
-              (p*e #t (env (hash) '())))
-(check-equal? (unify* #f 'number (env (hash) '()) #f)
-              (unif-fail))
-(check-equal? (unify* '(list 1) 1 (env (hash) '()) #f)
-              (unif-fail))
-(check-equal? (unify* 'boolean #t (env (hash) '()) #f)
-              (p*e #t (env (hash) '())))
-(check-equal? (unify* 'boolean #f (env (hash) '()) #f)
-              (p*e #f (env (hash) '())))
-(check-equal? (unify* 'number #f (env (hash) '()) #f)
-              (unif-fail))
-(check-equal? (unify* 'integer #f (env (hash) '()) #f)
-              (unif-fail))
-(check-equal? (unify* 'natural #f (env (hash) '()) #f)
-              (unif-fail))
-(check-equal? (unify* 'real #f (env (hash) '()) #f)
-              (unif-fail))
-(check-equal? (unify* 'string #f (env (hash) '()) #f)
-              (unif-fail))
-(check-equal? (unify* 'variable #f (env (hash) '()) #f)
-              (unif-fail))
-(check-equal? (unify* 'variable-not-otherwise-mentioned #f (env (hash) '()) #f)
-              (unif-fail))
-
-(define (p-eqs-equal? a b)
-  (check-equal?
-   (cons (p*e-p a)
-         (p*e-eqs a))
-   (cons (p*e-p b)
-         (p*e-eqs b))))
-
-(define-syntax (unify-all/results stx)
-  (syntax-case stx ()
-    [(_ lhs eqs ([rhs res res-eqs] rest ...))
-     (not (syntax->datum #'res))
-     #'(begin
-         (check-equal? (unify/format lhs rhs eqs L0)
-                       #f) 
-         (unify-all/results lhs eqs (rest ...)))]
-    [(_ lhs eqs ([rhs res res-eqs] rest ...))
-     #'(begin
-         (check-equal? (unify/format lhs rhs eqs L0)
-                       (p*e res res-eqs))
-         (unify-all/results lhs eqs (rest ...)))]
-    [(_ lhs eqs ([rhs res] rest ...))
-     #'(begin
-         (p-eqs-equal? (unify/format lhs rhs eqs L0)
-                       res) 
-         (unify-all/results lhs eqs (rest ...)))]
-    [(_ lhs eqs ())
-     #'(void)]))
-
-(define-syntax (unify-all/results/no-bindings stx)
-  (syntax-case stx ()
-    [(_ lhs eqs ([rhs res] ...))
-     #'(unify-all/results lhs eqs
-                          ([rhs res eqs] ...))]))
-
-(unify-all/results/no-bindings
- 'any (hash)
- (['any 'any]
-  ['integer 'integer]
-  ['natural 'natural]
-  ['number 'number]
-  ['real 'real]
-  ['string 'string]
-  ['boolean 'boolean]
-  ['variable 'variable]
-  ['variable-not-otherwise-mentioned 'variable-not-otherwise-mentioned]
-  [7 7]
-  ["a string" "a string"]
-  ['(nt e) '(cstr (e) any)]
-  ['(list 1 2 3) '(list 1 2 3)]
-  ['(mismatch-name x any) 'any]))
-
-(unify-all/results/no-bindings
- 'number (hash)
- ([7 7]
-  [-7 -7]
-  [7.5 7.5]
-  ["a string" #f]
-  ['string #f]
-  ['boolean #f]
-  ['variable #f]
-  ['variable-not-otherwise-mentioned #f]
-  ['(list 1 2 3) #f]
-  [`(nt e) `(cstr (e) number)]))
-
-(unify-all/results/no-bindings
- 'integer (hash)
- ([7 7]
-  [-7 -7]
-  [7.5 #f]
-  ["a string" #f]
-  ['string #f]
-  ['boolean #f]
-  ['variable #f]
-  ['variable-not-otherwise-mentioned #f]
-  ['(list 1 2 3) #f]
-  [`(nt e) `(cstr (e) integer)]))
-
-(unify-all/results/no-bindings
- 'natural (hash)
- ([7 7]
-  [-7 #f]
-  [7.5 #f]
-  ["a string" #f]
-  ['string #f]
-  ['boolean #f]
-  ['variable #f]
-  ['variable-not-otherwise-mentioned #f]
-  ['(list 1 2 3) #f]
-  [`(nt e) `(cstr (e) natural)]))
-
-(unify-all/results/no-bindings
- 'real (hash)
- ([7 7]
-  [-7 -7]
-  [7.5 7.5]
-  ["a string" #f]
-  ['string #f]
-  ['boolean #f]
-  ['variable #f]
-  ['variable-not-otherwise-mentioned #f]
-  ['(list 1 2 3) #f]
-  [`(nt e) `(cstr (e) real)]))
-
-(unify-all/results/no-bindings
- 'string (hash)
- (['string 'string]
-  ['variable #f]
-  ['variable-not-otherwise-mentioned #f]
-  ['boolean #f]
-  [7 #f]
-  ["a string" "a string"]
-  ['(list a b c) #f]
-  ['(nt e) '(cstr (e) string)]))
-
-(unify-all/results/no-bindings
- 'variable (hash)
- (['variable 'variable]
-  ['x 'x]
-  ['boolean #f]
-  ["a string" #f]
-  ['(nt e) '(cstr (e) variable)]
-  ['(list 1 2 3) #f]
-  [5 #f]))
-
-(unify-all/results/no-bindings
- 'variable-not-otherwise-mentioned (hash)
- (['variable-not-otherwise-mentioned 'variable-not-otherwise-mentioned]
-  ['x 'x]
-  ['boolean #f]
-  ["a string" #f]
-  ['(nt e) '(cstr (e) variable-not-otherwise-mentioned)]
-  ['(list 1 2 3) #f]
-  [5 #f]))
-
-(unify-all/results/no-bindings
- '(nt e) (hash)
- ([5 '(cstr (e) 5)]
-  ["a string" '(cstr (e) "a string")]
-  ['boolean '(cstr (e) boolean)]
-  ['(nt q) '(cstr (e) (nt q))]))
-
-(unify-all/results/no-bindings
- 'boolean (hash)
- (['boolean 'boolean]
-  [`(list 1 2 3) #f]
-  ["abc" #f]))
-
-(unify-all/results
- '(name x any) (hash)
- ([5 `(name x ,(bound)) (hash (lvar 'x) 5)]
-  [`(list 1 2 3) `(name x ,(bound)) (hash (lvar 'x) `(list 1 2 3))]
-  ['boolean `(name x ,(bound)) (hash (lvar 'x) `boolean)]
-  ["a string" `(name x ,(bound)) (hash (lvar 'x) "a string")]))
-
-(unify-all/results/no-bindings
- '(mismatch-name x any) (hash)
- ([5 5]
-  ["a string" "a string"]
-  ['any 'any]
-  ['number 'number]
-  ['integer 'integer]
-  ['natural 'natural]
-  ['real 'real]
-  ['string 'string]
-  ['boolean 'boolean]
-  ['(list 1 2 3) '(list 1 2 3)]
-  ['(mismatch-name y 5) 5]
-  ['(nt e) '(cstr (e) any)]
-  ['variable 'variable]
-  ['variable-not-otherwise-mentioned 'variable-not-otherwise-mentioned]))
-
-(unify-all/results/no-bindings
- '(variable-except a) (hash)
- ([5 #f]
-  ['any '(variable-except a)]
-  ['number #f]
-  ['integer #f]
-  ['natural #f]
-  ['real #f]
-  ['string #f]
-  ['boolean #f]
-  ['(list 1 2 3) #f]
-  ['b 'b]
-  ['a #f]
-  ['(mismatch-name y b) 'b]
-  ['(nt e) '(cstr (e) (variable-except a))]
-  ['variable '(variable-except a)]
-  ['variable-not-otherwise-mentioned '(variable-except a)]
-  ['(variable-except b) '(variable-except a b)]
-  ['(variable-prefix a) #f]
-  ['(variable-prefix b) '(variable-prefix b)]))
-
-(unify-all/results/no-bindings
- '(variable-prefix a) (hash)
- ([5 #f]
-  ['any '(variable-prefix a)]
-  ['number #f]
-  ['integer #f]
-  ['natural #f]
-  ['real #f]
-  ['string #f]
-  ['boolean #f]
-  ['(list 1 2 3) #f]
-  ['b #f]
-  ['a 'a]
-  ['aa 'aa]
-  ['(mismatch-name y b) #f]
-  ['(nt e) '(cstr (e) (variable-prefix a))]
-  ['variable '(variable-prefix a)]
-  ['variable-not-otherwise-mentioned '(variable-prefix a)]
-  ['(variable-except b bb c) '(variable-prefix a)]
-  ['(variable-except b ab c) #f]
-  ['(variable-prefix a) '(variable-prefix a)]
-  ['(variable-prefix b) #f]))
-                  
-
-(define-syntax-rule
-  (check-pat-equal? a b)
-  (check-equal? (let ([ans a])
-                  (match ans
-                    [(p*e p _) p]
-                    [_ ans]))
-                b))
-  
-(check-pat-equal? (unify*/lt `(nt v) `(cstr (e) (list (nt e) (nt v))) empty-env L0)
-              `(cstr (e v) (list (nt e) (nt v))))
-(check-pat-equal? (unify*/lt `(cstr (e) (list (nt e) (nt v))) `(nt v) empty-env L0)
-              `(cstr (e v) (list (nt e) (nt v))))
-(check-pat-equal? (unify*/lt `(cstr (e) (list (nt e) (nt v))) 5 empty-env L0)
-              (unif-fail))
-(check-pat-equal? (unify*/lt `(cstr (e) (list (nt e) (nt v))) `(list (nt e) (nt v)) empty-env L0)
-              `(cstr (e) (list (nt e) (nt v))))
-(check-pat-equal? (unify*/lt `(cstr (e) number) `(cstr (v) natural) empty-env L0)
-              `(cstr (e v) natural))
-(check-pat-equal? (unify*/lt `(cstr (e) (list number variable)) `(cstr (e) number) empty-env L0)
-              (unif-fail))
-(check-pat-equal? (unify*/lt `(cstr (e) (list number variable-not-otherwise-mentioned)) 
-                         `(cstr (e) (list integer variable)) empty-env L0)
-              `(cstr (e) (list integer variable-not-otherwise-mentioned)))
-
-
-(define-syntax (unify*-all/results stx)
-  (syntax-case stx ()
-    [(_ lhs eqs ([rhs res res-eqs] ...))
-     #'(begin
-         (let ([pe (unify*/format lhs rhs eqs L0)])
-           (check-equal? (p*e-p pe) res)
-           (check-equal? (env-eqs (p*e-e pe)) res-eqs)) ...)]))
-
-(unify*-all/results
- `(cstr (e) (nt q)) (hash)
- (['any `(cstr (e q) any) (hash)]
-  ['integer `(cstr (e q) integer) (hash)]
-  ['natural `(cstr (e q) natural) (hash)]
-  ['number `(cstr (e q) number) (hash)]
-  ['real `(cstr (e q) real) (hash)]
-  ['string `(cstr (e q) string) (hash)]
-  [`boolean `(cstr (e q) boolean) (hash)]
-  ['variable `(cstr (e q) variable) (hash)]
-  ['variable-not-otherwise-mentioned 
-   `(cstr (e q) variable-not-otherwise-mentioned) (hash)]
-  ['(variable-except a)
-   `(cstr (e q) (variable-except a)) (hash)]
-  ['(variable-prefix a) 
-   `(cstr (e q) (variable-prefix a)) (hash)]
-  ['(list 1 2 3)
-   '(cstr (e q) (list 1 2 3)) (hash)]
-  [5 '(cstr (e q) 5) (hash)]
-  ["a string" '(cstr (e q) "a string") (hash)]
-  ['(mismatch-name x 5) '(cstr (e q) 5) (hash)]))
-
-(unify*-all/results
- `(name x ,(bound)) (hash (lvar 'x) 'any)
- (['any `(name x ,(bound)) (hash (lvar 'x) 'any)]
-  [5 `(name x ,(bound)) (hash (lvar 'x) 5)]
-  ['number `(name x ,(bound)) (hash (lvar 'x) 'number)]
-  ['integer `(name x ,(bound)) (hash (lvar 'x) 'integer)]
-  ['natural `(name x ,(bound)) (hash (lvar 'x) 'natural)]
-  ['real `(name x ,(bound)) (hash (lvar 'x) 'real)]
-  ['string `(name x ,(bound)) (hash (lvar 'x) 'string)]
-  ['boolean `(name x ,(bound)) (hash (lvar 'x) 'boolean)]
-  ['variable `(name x ,(bound)) (hash (lvar 'x) 'variable)]
-  ['variable-not-otherwise-mentioned `(name x ,(bound)) (hash (lvar 'x) 'variable-not-otherwise-mentioned)]
-  ['(variable-except a) `(name x ,(bound)) (hash (lvar 'x) '(variable-except a))]
-  ['(variable-prefix a) `(name x ,(bound)) (hash (lvar 'x) '(variable-prefix a))]
-  ['(cstr (n) any) `(name x ,(bound)) (hash (lvar 'x) '(cstr (n) any))]
-  ['(list 1 2) `(name x ,(bound)) (hash (lvar 'x) '(list 1 2))]
-  ['(mismatch-name z any) `(name x ,(bound)) (hash (lvar 'x) 'any)]
-  ['(nt q) `(name x ,(bound)) (hash (lvar 'x) '(cstr (q) any))]))
-
-(unify*-all/results
- `(name x ,(bound)) (hash (lvar 'x) 'any (lvar 'y) 'variable)
- ([`(name x ,(bound)) `(name x ,(bound)) (hash (lvar 'x) 'any (lvar 'y) 'variable)]
-  [`(name y ,(bound)) `(name x ,(bound)) (hash (lvar 'y) (lvar 'x) (lvar 'x) 'variable)]))
-
-
-(let ()
-  
-  (define-language ntl
-    (n number)
-    ((x y) variable)
-    (Q any any))
-  
-  (check-equal? (unify/format `(nt n) `any (hash) ntl)
-                (p*e `number (hash)))
-  (check-equal? (unify/format `(nt n) 5 (hash) ntl)
-                (p*e 5 (hash)))
-  (check-equal? (unify/format `(nt Q) `any (hash) ntl)
-                (p*e `(cstr (Q) any) (hash)))
-  (check-equal? (unify/format `(nt x) 'number (hash) ntl)
-                #f)
-  (check-equal? (unify/format `(nt x) 'a-var (hash) ntl)
-                (p*e 'a-var (hash)))
-  (check-equal? (unify/format `(nt x) 'any (hash) ntl)
-                (p*e 'variable (hash)))
-  (check-equal? (unify/format `(nt y) 'any (hash) ntl)
-                (p*e 'variable (hash)))
-  ;; asymmetry ok here - if the nt doesn't get unified against,
-  ;; it doesn't get collapsed
-  (check-equal? (unify/format `(nt y) '(nt Q) (hash) ntl)
-                `(different-orders=>different-results 
-                 ,(p*e '(cstr (Q) variable) (env (hash) '()))
-                 ,(p*e '(cstr (Q) (nt y)) (env (hash) '()))))
-  )
-
-
-;; numeric
-(check-equal? (unify/format `number `number (hash) L0)
-              (p*e `number (hash)))
-(check-equal? (unify/format `number `real (hash) L0)
-              (p*e `real (hash)))
-(check-equal? (unify/format `number `integer (hash) L0)
-              (p*e `integer (hash)))
-(check-equal? (unify/format `number `natural (hash) L0)
-              (p*e `natural (hash)))
-(check-equal? (unify/format `real `real (hash) L0)
-              (p*e `real (hash)))
-(check-equal? (unify/format `real `integer (hash) L0)
-              (p*e `integer (hash)))
-(check-equal? (unify/format `real `natural (hash) L0)
-              (p*e `natural (hash)))
-(check-equal? (unify/format `integer `integer (hash) L0)
-              (p*e `integer (hash)))
-(check-equal? (unify/format `integer `natural (hash) L0)
-              (p*e `natural (hash)))
-(check-equal? (unify/format `natural `natural (hash) L0)
-              (p*e `natural (hash)))
-
-
-;; bindings
-(check-equal? (unify/format `(name e_1 number) `number (hash) L0)
-              (p*e `(name e_1 ,(bound)) (m-hash (lvar `e_1) `number)))
-(check-equal? (unify/format `number `(name e_1 number) (hash) L0)
-              (p*e `(name e_1 ,(bound)) (m-hash (lvar `e_1) `number)))
-(check-equal? (unify/format `(name e_1 number) `(name e_2 integer) (hash) L0)
-              (p*e `(name e_1 ,(bound)) (m-hash (lvar `e_2) (lvar `e_1) (lvar `e_1) `integer)))
-(check-equal? (unify/format `(name e_2 integer) `(name e_1 number) (hash) L0)
-              (p*e `(name e_2 ,(bound)) (m-hash (lvar `e_1) (lvar `e_2) (lvar `e_2) `integer)))
-(check-equal? (unify/format `(name e_1 number) `(name e_2 integer) (m-hash (lvar 'e_2) `integer) L0)
-              (p*e `(name e_1 ,(bound)) (m-hash (lvar `e_1) `integer (lvar `e_2) (lvar 'e_1))))
-(check-equal? (unify/format `(name e_2 integer) `(name e_1 number) (m-hash (lvar 'e_2) `integer) L0)
-              (p*e `(name e_2 ,(bound)) (m-hash (lvar `e_1) (lvar `e_2) (lvar `e_2) `integer)))
-(check-equal? (unify/format `(name e_2 number) `(name e_1 number) 
-                            (m-hash (lvar 'e_2) `integer (lvar 'e_1) `number) L0)
-              (p*e `(name e_2 ,(bound)) (m-hash (lvar `e_1) (lvar `e_2) (lvar `e_2) `integer)))
-(check-equal? (unify/format `(name e1 (nt e)) `(name e2 5) 
-                            (m-hash (lvar 'e1) `(nt e)
-                                    (lvar 'e2) 5)
-                            L0)
-              (p*e `(name e1 ,(bound))
-                   (m-hash (lvar 'e2) (lvar 'e1)
-                           (lvar 'e1)  `(cstr (e) 5))))
-(check-equal? (unify/format `(name e1 (nt e)) `(name e2 (nt e)) 
-                            (m-hash (lvar 'e1) `(nt e)
-                                    (lvar 'e2) (lvar 'e1))
-                            L0)
-              (p*e `(name e1 ,(bound))
-                   (m-hash (lvar 'e2) (lvar 'e1)
-                           (lvar 'e1) `(nt e))))
-
-;; occurs check
-(check-false (unify/format `(name e_1 (nt e)) 
-                           `(list 5 (list 6 (name e_1 (nt e))) 7)
-                           (hash)
-                           L0))
-(check-equal? (unify/format `(name e_2 5)
-                            `(nt a)
-                            (m-hash (lvar 'e_2) (lvar 'e_1)
-                                    (lvar 'e_1) `(cstr (b) 5))
-                            L0)
-              (p*e `(name e_1 ,(bound))
-                   (m-hash (lvar 'e_2) (lvar 'e_1)
-                           (lvar 'e_1) `(cstr (a b) 5))))
-;; named vars in constraints don't get lost (their pats get added to the env)
-(check-equal? (unify/format `(nt e) `(list a b (name this (nt b)) c)
-                            (hash) L0)
-              (p*e `(cstr (e) (list a b (name this ,(bound)) c))
-                   (m-hash (lvar 'this) `(nt b))))
-(check-equal? (unify/format `(nt e) `(list a b (name this (nt b)) c)
-                            (m-hash (lvar 'this) 6) L0)
-              (p*e `(cstr (e) (list a b (name this ,(bound)) c))
-                   (m-hash (lvar 'this) `(cstr (b) 6))))
-;; resolve maintains variable dependency on update
-;; TODO: is there a more minimal test for this (change id in resolve to name-t to reproduce)
-(check-equal? (unify/format `(list (list (name x7 (nt x)) (name t_1 (nt t))) (name Γ1 (nt Γ)))
-                            `(name Γ2 (nt Γ))
-                            (m-hash (lvar 'x7) (lvar 'x1)
-                                    (lvar 'x1) `(nt x))
-                            L0)
-              (p*e '(name Γ2 #s(bound))
-                   (hash (lvar 'x1) '(nt x)
-                         (lvar 't_1) '(nt t)
-                         (lvar 'Γ1) '(nt Γ)
-                         (lvar 'x7) (lvar 'x1)
-                         (lvar 'Γ2)
-                          `(cstr
-                            (Γ)
-                            (list
-                             (list (name x1 ,(bound)) (name t_1 ,(bound)))
-                             (name Γ1 ,(bound)))))))
-(check-false (unify/format `(name x (list x x))
-                           `(name x (list x))
-                           (m-hash (lvar 'x)
-                                   `(list x x))
-                           L0))
-(check-false (unify/format `(name x (list x))
-                           `(name x (list x))
-                           (m-hash (lvar 'x)
-                                   `(list x x))
-                           L0))
-;; sometimes things aren't path compressed apparently...
-;; TODO, figure out why
-#;(check-not-false (unify/lt `(name x1 ,(bound)) `(nt x)
-                             (m-hash (lvar 'x1) (lvar 'x2)
-                                     (lvar 'x2) `(list x x))
-                             L0))
-(check-equal? (unify/format '(list (name n_2 (nt n)) (name n_3 (nt n)))
-                            '(list (name n_1 (nt n)) (name n_1 (nt n)))
-                            (hash)
-                            L0)
-              (p*e `(list (name n_2 ,(bound)) (name n_3 ,(bound))) 
-                   (m-hash (lvar 'n_3) '(nt n) 
-                           (lvar 'n_2) (lvar 'n_3)
-                           (lvar 'n_1) (lvar 'n_2))))
-
-
-(check-not-false (bind-names 'any empty-env L0))
-(check-equal? (bind-names `(name x any) empty-env L0)
-              (p*e `(name x ,(bound))
-                   (env (hash (lvar 'x) 'any) '())))
-(check-equal? (let ([h (hash (lvar 'x) (lvar 'y)
-                             (lvar 'y) 'any)])
-                (bind-names `(list (name x 5) (name y 6)) (env h '()) L0))
-              (unif-fail))
-
-(define-syntax do-unify
-  (λ (stx)
-    (syntax-case stx ()
-      [(f-name lang t-1 t-2 env)
-       (with-syntax ([(ignore-1 pat-1 (names-1 ...) (names/ellipses-1 ...))
-                      (rewrite-side-conditions/check-errs
-                       (language-id-nts #'lang 'f-name) 'f-name stx #'t-1)]
-                     [(ignore-2 pat-2 (names-2 ...) (names/ellipses-2 ...))
-                      (rewrite-side-conditions/check-errs
-                       (language-id-nts #'lang 'f-name) 'f-name stx #'t-2)])
-         #'(unify/format 'pat-1 'pat-2 env lang))])))
-
-(define-syntax u-test
-  (λ (stx)
-    (syntax-case stx ()
-      [(_ lang t-1 t-2 env res)
-       (with-syntax ([u-stx #'(do-unify lang t-1 t-2 env)])
-         #'(check-equal? u-stx res))])))
-
-(define-syntax u-fails
-  (λ (stx)
-    (syntax-case stx ()
-      [(_ lang t-1 t-2 env)
-       (with-syntax ([u-stx #'(do-unify lang t-1 t-2 env)])
-         #'(check-false u-stx))])))
-
-(define-syntax u-succeeds
-  (λ (stx)
-    (syntax-case stx ()
-      [(_ lang t-1 t-2 env)
-       (with-syntax ([u-stx #'(do-unify lang t-1 t-2 env)])
-         #'(check-not-false u-stx))])))
-
-
-(define-language U-nums
-  (n O
-     (S n)))
-
-(define (m-env . eqs)
-  (env (apply hash eqs) '()))
-
-(check-pat-equal? (unify*/lt '(cstr (n) (list S O)) '(list S O) empty-env U-nums)
-                '(cstr (n) (list S O)))
-(u-succeeds U-nums (S O) (S O) (hash))
-(u-succeeds U-nums (S (S O)) (S n) (hash))
-(u-fails U-nums (S (S O)) (S n) (m-hash (lvar 'n) '(list O)))
-(u-succeeds U-nums (S (S O)) (S n) (m-hash (lvar 'n) '(list S O)))
-(u-fails U-nums (S O) (S n) (m-hash (lvar 'n) '(list S O)))
-(u-fails U-nums (S (S O)) O (hash))
-(u-test U-nums O O (hash) (p*e 'O (hash)))
-(u-test U-nums (S (S O)) (S (S O)) 
-        (hash) (p*e '(list S (list S O)) (hash)))
-(u-fails U-nums O (S O) (hash))
-(u-fails U-nums (S O) O (hash))
-(u-test U-nums O n 
-        (hash) (p*e `(name n ,(bound)) (m-hash (lvar 'n) '(cstr (n) O))))
-(u-test U-nums n O
-        (hash) (p*e `(name n ,(bound)) (m-hash (lvar 'n) '(cstr (n) O))))
-(u-test U-nums (S n) (S (S O)) 
-        (hash) (p*e `(list S (name n ,(bound))) (m-hash (lvar 'n) '(cstr (n) (list S O)))))
-;; occurs check
-(u-fails U-nums (S n) (S (S n)) (hash))
-(u-test U-nums (S n_1) (S (S n_2)) 
-        (hash) 
-        (p*e `(list S (name n_1 ,(bound)))
-             (m-hash (lvar 'n_1) `(cstr (n) (list S (name n_2 ,(bound))))
-                     (lvar 'n_2) `(nt n))))
-(u-fails U-nums (S n) (S O) (m-hash (lvar 'n) `(list S (name n_2 ,(bound)))
-                                    (lvar 'n_2) '(nt n)))
-(u-test U-nums (S n) (S O) (m-hash (lvar 'n) 'O) 
-        (p*e `(list S (name n ,(bound)))
-             (m-hash (lvar 'n) '(cstr (n) O))))
-#|
-(u-test (S n) (S O) (m-hash '(name n (nt n)) '(name n_1 (nt n)) '(name n_1 (nt n)) 'O)
-        U-nums (m-hash '(name n (nt n)) 'O '(name n_1 (nt n)) 'O))
-(u-test (S n) (S O) (m-hash '(name n (nt n)) '(name n_1 (nt n)) '(name n_1 (nt n)) '(S O))
-        U-nums #f)
-|#
-
-
-;; λn tests
-
-(define-language λn
-  (e (e e)
-     (λ x e)
-     (if0 e e e)
-     number
-     x)
-  (x variable-not-otherwise-mentioned))
-
-(u-fails λn 1 2 (hash))
-(u-test λn (λ x 3) e_1 (hash) 
-        (p*e `(name e_1 ,(bound)) 
-             (m-hash (lvar 'e_1) `(cstr (e) (list λ (name x ,(bound)) 3))
-                     (lvar 'x) `(nt x))))
-(u-test λn (λ y 3) (λ y e_2) (hash)
-        (p*e `(list λ y (name e_2 ,(bound))) (m-hash (lvar 'e_2) `(cstr (e) 3))))
-(u-test λn (λ x 3) (λ x e_2) (hash) 
-        (p*e `(list λ (name x ,(bound)) (name e_2 ,(bound)))
-             (m-hash (lvar 'e_2) `(cstr (e) 3) (lvar 'x) `(nt x))))
-(u-fails λn (λ x 3) (e_1 e_2) (hash))
-(u-test λn (e_1 e_2) ((λ x x) 3) (hash) 
-        (p*e `(list (name e_1 ,(bound)) (name e_2 ,(bound)))
-             (m-hash (lvar 'e_2)
-                     `(cstr (e) 3)
-                     (lvar 'e_1)
-                     `(cstr (e) (list λ (name x ,(bound)) (name x ,(bound))))
-                     (lvar 'x)
-                     `(nt x))))
-
-(define-language p-types
-  (t (t -> t)
-     (∀ x t)
-     x)
-  (x variable-not-otherwise-mentioned))
-
-(define-language n-lang
-  (n number))
-
-(check-equal?
- (pat->term n-lang 'hi (env (hash (lvar 'it) '(cstr (n) hi)) '()))
- (unif-fail))
-
-
-(check-not-false (redex-match λn e_1 (pat->term λn `(nt e) (env (hash) '()))))
-(check-not-false
- (redex-match λn (e_1 e_2) (pat->term λn `(list (name e1 ,(bound))
-                                                (name e2 ,(bound)))
-                                      (env (m-hash (lvar 'e1) `(nt e)
-                                                   (lvar 'e2) `(nt e)) '()))))
-(check-not-false 
- (redex-match λn (e_1 e_1) (pat->term λn `(list (name e1 ,(bound)) (name e1 ,(bound)))
-                                      (env (m-hash (lvar 'e1)
-                                                   `(list (name e2 ,(bound)) (name e3 ,(bound)))
-                                                   (lvar 'e2)
-                                                   `(list (nt e) (name e3 ,(bound)))
-                                                   (lvar 'e3)
-                                                   `(nt e)) '()))))
-(check-not-false
- (redex-match λn (e_1 e_1) (pat->term λn `(list (name e1 ,(bound))
-                                                (name e1 ,(bound)))
-                                      (env (m-hash (lvar 'e1) `(nt e)
-                                                   (lvar 'e2) `(nt e)) '()))))
-(check-not-false
- (redex-match λn (e_1 e_2) (pat->term λn `(list (name e1 ,(bound))
-                                                (name e2 ,(bound)))
-                                      (env (m-hash (lvar 'e1) `(cstr (e) (nt e))
-                                                   (lvar 'e2) `(nt e)) '()))))
-(check-not-false 
- (redex-match λn (e_1 e_2) (pat->term λn `(cstr (e) (list (name e1 ,(bound))
-                                                          (name e2 ,(bound))))
-                                      (env (m-hash (lvar 'e1) `(cstr (e) (nt e))
-                                                   (lvar 'e2) `(nt e)) '()))))
-(check-equal? (pat->term λn `(cstr (x) (list (nt e) (nt e))) (env (hash) '()))
-              (unif-fail))
-(check-not-false (pat->term λn `(cstr (e) (list (nt e) (nt e))) (env (hash) '())))
-(check-equal? (pat->term λn `(cstr (x) (list (name e1 ,(bound))
-                                             (name e2 ,(bound))))
-                         (env (m-hash (lvar 'e1) `(cstr (e) (nt e))
-                                      (lvar 'e2) `(nt e)) '()))
-              (unif-fail))
-(check-not-false
- (redex-match λn (e_1 e_1) (pat->term λn `(list (name x1 ,(bound))
-                                                (name x2 ,(bound)))
-                                      (env (m-hash (lvar 'x1) (lvar 'x2)
-                                                   (lvar 'x2) `(nt e)) '()))))
-
-
-
-;; result contains un unsatisfiable constraint:
-;; (cstr (x) ->)
-(check-false (do-unify p-types (t_1 -> t_2) (∀ x_3 t_3) (hash)))
-
-
-;; disunification/unification with disequality tests
-;; TODO tests on the dqs here are currently order-dependent
-
-(check-false
- (disunify* '()
-            `(list (name x_1 ,(bound))) 
-            `(list (name x_2 ,(bound))) 
-            (hash (lvar 'x_1) 'a
-                   (lvar 'x_2) 'a)
-            L0))
-(check-not-false
- (disunify* '()
-            `(list (name x_1 ,(bound))) 
-            `(list (name x_2 ,(bound))) 
-            (hash (lvar 'x_1) '(nt x)
-                   (lvar 'x_2) 'a)
-            L0))
-(check-not-false
- (disunify* '()
-            `(list (name x_1 ,(bound))) 
-            `(list (name x_2 ,(bound))) 
-            (hash (lvar 'x_1) '(nt x)
-                   (lvar 'x_2) '(nt x))
-            L0))
-(check-false 
- (disunify* '() 'a '(cstr (s) a) (hash) L0))
-(check-false
- (disunify* '() `(name a2 ,(bound)) '(cstr (s) a) (hash (lvar 'a2) 'a) L0))
-(check-false
- (disunify* '() `(name a2 ,(bound)) `(name s6 ,(bound))
-            (hash (lvar 'a2) 'a
-                   (lvar 's6) '(cstr (s) a))
-            L0))
-
-(define (make-eqs eqs)
-  (for/hash ([eq eqs])
-    (values (car eq) (cdr eq))))
-
-(define (make-dqs dqs)
-  (for/list ([the-dq dqs])
-    (dq '() (list (car the-dq) (cdr the-dq)))))
-
-(define-syntax (test-disunify/no-params stx)
-  (syntax-case stx ()
-    [(_ t u eqs dqs eqs′ dqs′)
-     (quasisyntax/loc stx
-       (let* ([eqs-in (make-eqs eqs)]
-              [eqs-out (make-eqs eqs′)]
-              [dqs-in (check-and-resimplify eqs-in (make-dqs dqs) L0)]
-              [dqs-out (make-dqs dqs′)]
-              [res (disunify '() t u (env eqs-in dqs-in) L0)])
-         #,(syntax/loc stx
-             (check-not-false
-              (env-equal?
-               res
-               (env eqs-out dqs-out))))))]
-    [(_ t u eqs dqs true/false)
-     (quasisyntax/loc stx
-       (let* ([eqs-in (make-eqs eqs)]
-              [dqs-in (check-and-resimplify eqs (make-dqs dqs) L0)]
-              [res (disunify '() t u (env eqs-in dqs-in) L0)])
-         (if true/false
-             #,(syntax/loc stx (check-not-false res))
-             #,(syntax/loc stx (check-false res)))))]))
-
-(define-syntax (test-unify stx)
-  (syntax-case stx ()
-    [(_ t u v eqs dqs eqs′ dqs′)
-     (quasisyntax/loc stx
-       (let* ([eqs-in (make-eqs eqs)]
-              [eqs-out (make-eqs eqs′)]
-              [dqs-in (make-dqs dqs)]
-              [dqs-out (make-dqs dqs′)]
-              [res (unify/lt t u (env eqs-in dqs-in) L0)])
-         (check-not-false
-          (p*e-equal?
-           res
-           (p*e v (env eqs-out dqs-out))))))]
-    [(_ t u eqs dqs true/false)
-     (quasisyntax/loc stx
-       (let* ([eqs-in (make-eqs eqs)]
-              [dqs-in (make-dqs dqs)]
-              [res (unify/lt t u (env eqs-in dqs-in) L0)])
-         (if true/false
-             (check-not-false (not-failed? res))
-             (check-equal? res (unif-fail)))))]))
-
-(test-disunify/no-params 1 2 '() '() '() '())
-(test-disunify/no-params '(list 1 2) '(list 1 3) '() '() '() '())
-(test-disunify/no-params `(list (name x any) (name y any)) `(list 1)
-                 `((,(lvar 'x) . any)
-                   (,(lvar 'y) . any))
-                 '() 
-                 `((,(lvar 'x) . any)
-                   (,(lvar 'y) . any))
-                 '())
-(test-disunify/no-params `(name x any) 4
-               `((,(lvar 'x) . ,(lvar 'y))
-                 (,(lvar 'y) . 3))
-               '()
-               `((,(lvar 'x) . ,(lvar 'y))
-                 (,(lvar 'y) . 3))
-               '())
-(test-disunify/no-params `(name x any) 1 
-               `((,(lvar 'x) . 1)) '() #f)
-(test-disunify/no-params 1 `(name x any)
-               '() '()  `((,(lvar 'x) . any))
-               `(((list (name x ,(bound))) . (list 1))))
-(test-disunify/no-params `(name x any) 3
-               `((,(lvar 'x) . ,(lvar 'y))
-                 (,(lvar 'y) . 3))
-               '() #f)
-;; does violate the occurs check (stolen from Colmerauer '84)
-(test-disunify/no-params 1 `(name z any)
-               `((,(lvar 'x) . ,(lvar 'y))
-                 (,(lvar 'y) . (list (name y ,(bound)) (name z ,(bound))))
-                 (,(lvar 'z) . any))
-               `(((list (name y ,(bound)) (name z ,(bound))) . (list 2 2)))
-               `((,(lvar 'x) . ,(lvar 'y))
-                 (,(lvar 'y) . (list (name y ,(bound)) (name z ,(bound))))
-                 (,(lvar 'z) . any))
-               `(((list (name z ,(bound))) . (list 1))))
-(test-unify 1 `(name x any)
-            '()
-            `(((list (name x ,(bound))) . (list 1)))
-            #f)
-(test-unify `(name x any) 3
-            `((,(lvar 'x) . ,(lvar 'y))
-              (,(lvar 'y) . 3))
-            '()
-            #t)
-(test-unify `(name x any) 3
-            `((,(lvar 'x) . ,(lvar 'y))
-              (,(lvar 'y) . any))
-            `(((list (name y ,(bound))) . (list 3)))
-            #f)
-(test-unify `(name x any) 3
-            `((,(lvar 'x) . ,(lvar 'y))
-              (,(lvar 'y) . any))
-            `(((list (name x ,(bound)) (name y ,(bound))) . (list 2 3)))
-            #t)
-(test-unify `(name x any) 3
-            `((,(lvar 'x) . ,(lvar 'y))
-              (,(lvar 'y) . any))
-            `(((list (name x ,(bound)) (name y ,(bound))) . (list 3 2)))
-            #t)
-(test-unify `(name x any) 5
-              `((,(lvar 'y) . 4)
-                (,(lvar 'z) . 2))
-              `(((list (name z ,(bound))) . (list 3))
-                ((list (name z ,(bound)) (name y ,(bound)))
-                 . (list 2 4)))
-              #f)
-(test-unify `(name x any) 5
-              `((,(lvar 'y) . 4)
-                (,(lvar 'z) . 17))
-              `(((list (name z ,(bound))) . (list 3))
-                ((list (name z ,(bound)) (name y ,(bound)))
-                 . (list 2 4)))
-              #t)
-(test-unify `(name x any) 5
-              `((,(lvar 'y) . 4)
-                (,(lvar 'z) . 17)
-                (,(lvar 'x) . any))
-              `(((list (name x ,(bound))) . (list 3))
-                ((list (name x ,(bound)) (name y ,(bound)))
-                 . (list 5 4)))
-              #f)
-(test-unify `(name x any) 5
-              `((,(lvar 'y) . 4)
-                (,(lvar 'z) . 17)
-                (,(lvar 'x) . any))
-              `(((list (name x ,(bound))) . (list 3))
-                ((list (name x ,(bound)) (name y ,(bound)))
-                 . (list 6 4)))
-              #t)
-(test-unify `(name x any) 5
-              `((,(lvar 'y) . 4)
-                (,(lvar 'z) . 17)
-                (,(lvar 'x) . any))
-              `(((list (name x ,(bound))) . (list 3))
-                ((list (name z ,(bound)) (name y ,(bound)))
-                 . (list 5 4)))
-              #t)
-
-;; mismatch-name
-(test-unify `(list (name a any) foo)
-            `(list (mismatch-name a_!_1 any) (mismatch-name a_!_1 any))
-            `((,(lvar 'a) . foo)) '()
-            #f)
-(test-unify `(list (name a any) foo)
-            `(list (mismatch-name a_!_1 any) (mismatch-name a_!_1 any))
-            `(list (name a ,(bound)) foo)
-            `((,(lvar 'a) . bar)) '()
-            `((,(lvar 'a) . bar)) '())
-(test-unify `(list (name a (nt x)) (name b (nt x)) D) 
-            `(list (mismatch-name x_!_1 (nt x)) (mismatch-name x_!_1 (nt x))
-                   (mismatch-name x_!_1 (nt x)))
-            `(list (name a ,(bound)) (name b ,(bound)) (cstr (x) D))
-            '() '()
-            `((,(lvar 'a) . (nt x))
-              (,(lvar 'b) . (nt x)))
-            `(((list (name b ,(bound))) . (list (name a ,(bound))))
-              ((list (name a ,(bound))) . (list (cstr (x) D)))
-              ((list (name b ,(bound))) . (list (cstr (x) D)))))
-
-;; occurs check on bind (in instantiate*)
-(test-unify `(name a any)
-            `(name b any)
-            `((,(lvar 'a) . (list 5 (name b ,(bound))))
-              (,(lvar 'b) . (nt Q))) 
-            '() #f)
-(test-unify `(name a any)
-            `(name b any)
-            `((,(lvar 'a) . (list 5 (name c ,(bound))))
-              (,(lvar 'c) . ,(lvar 'b))
-              (,(lvar 'b) . ,(lvar 'd))
-              (,(lvar 'd) . (nt Q))) 
-            '() #f)
-
-;; resolve fully
-;; (necessary for parameter elimination to be correct)
-(check-not-false
- (env-equal?
-  (disunify
-   '(a)
-   '(list (name a any) (name a any))
-   '(list (name b any) 2)
-   (env '#hash() '())
-   #f)
-  (env (hash (lvar 'a) 'any (lvar 'b) 'any)
-       (list (dq '() `((list (name b ,(bound))) (list 2)))))))
-
-;; unfold non-terminals correctly
-(let ()
-  (define-language lnt
-    (a (a a) 
-       b)
-    (b (n n))
-    (c (n n n))
-    (d (b b b))
-    (n number))
-  
-  (check-equal?
-   (unify '(list 1 2 3) '(nt a) empty-env lnt)
-   (unif-fail))
-  (check-equal?
-   (unify '(nt c) '(nt a) empty-env lnt)
-   (unif-fail))
-  (check-equal?
-   (unify '(nt d) '(nt a) empty-env lnt)
-   (unif-fail))
-  (check-not-equal?
-   (unify '(list 1 2 3) '(nt c) empty-env lnt)
-   (unif-fail))
-  (check-not-equal?
-   (unify '(list 1 2) '(nt a) empty-env lnt)
-   (unif-fail))
-  )
-
-
-
-(let ([untested
-       (sort (hash-map unify*-untested (λ (k v) k))
-             string<=?
-             #:key (λ (x) (format "~s" x)))])
-  (unless (null? untested)
-    (eprintf "untested pattern pairs:\n"))
-  (for ([untested (in-list untested)])
-    (eprintf "  ~a vs ~a\n" (car untested) (cdr untested))))
diff --git a/pkgs/redex-pkgs/redex/LICENSE.txt b/pkgs/redex-pkgs/redex/LICENSE.txt
deleted file mode 100644
index b0d9932569..0000000000
--- a/pkgs/redex-pkgs/redex/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-redex
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/redex-pkgs/redex/info.rkt b/pkgs/redex-pkgs/redex/info.rkt
deleted file mode 100644
index af69894c77..0000000000
--- a/pkgs/redex-pkgs/redex/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang setup/infotab
-
-(define collection 'multi)
-
-(define deps '("redex-doc" "redex-examples" "redex-lib" "redex-gui-lib"))
-(define implies '("redex-doc" "redex-examples" "redex-lib" "redex-gui-lib"))
-
-(define pkg-desc "PLT Redex libraries for practical semantics engineering")
-
-(define pkg-authors '(robby bfetscher))
diff --git a/pkgs/sandbox-lib/LICENSE.txt b/pkgs/sandbox-lib/LICENSE.txt
deleted file mode 100644
index 32d6db847c..0000000000
--- a/pkgs/sandbox-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-sandbox-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/sandbox-lib/info.rkt b/pkgs/sandbox-lib/info.rkt
deleted file mode 100644
index 0de02fde75..0000000000
--- a/pkgs/sandbox-lib/info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base"
-               "errortrace-lib"))
-
-(define pkg-desc "Library for sandboxing Racket programs")
-
-(define pkg-authors '(eli))
diff --git a/pkgs/sandbox-lib/racket/private/sandbox-coverage.rkt b/pkgs/sandbox-lib/racket/private/sandbox-coverage.rkt
deleted file mode 100644
index 57aa2f5d77..0000000000
--- a/pkgs/sandbox-lib/racket/private/sandbox-coverage.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-;; This file is is used in the context of sandboxed code, it uses the
-;; stacktrace interface from errortrace to find uncovered expressions.
-#lang racket/base
-(require errortrace/stacktrace racket/unit (for-template racket/base))
-
-;; Test coverage run-time support
-(define test-coverage-enabled (make-parameter #t))
-(define test-coverage-info (make-hasheq))
-(define (initialize-test-coverage-point expr)
-  (hash-set! test-coverage-info expr (mcons #f #f)))
-(define (test-covered expr)
-  (let ([v (hash-ref test-coverage-info expr
-                     (lambda ()
-                       (error 'sandbox-coverage
-                              "internal error: no info for ~.s" expr)))])
-    (and v (with-syntax ([v v]) #'(#%plain-app set-mcar! v #t)))))
-
-(define (get-uncovered-expressions)
-  (let* ([xs (hash-map test-coverage-info
-                       (lambda (k v) (cons k (mcar v))))]
-         [xs (filter (lambda (x) (syntax-position (car x))) xs)]
-         [xs (sort xs (lambda (x1 x2)
-                        (let ([p1 (syntax-position (car x1))]
-                              [p2 (syntax-position (car x2))])
-                          (or (< p1 p2) ; earlier first
-                              (and (= p1 p2)
-                                   (> (syntax-span (car x1)) ; wider first
-                                      (syntax-span (car x2))))))))]
-         [xs (reverse xs)])
-    (if (null? xs)
-      xs
-      (let loop ([xs (cdr xs)] [r (list (car xs))])
-        (if (null? xs)
-          (map car (filter (lambda (x) (not (cdr x))) r))
-          (loop (cdr xs)
-                (cond [(not (and (= (syntax-position (caar xs))
-                                    (syntax-position (caar r)))
-                                 (= (syntax-span (caar xs))
-                                    (syntax-span (caar r)))))
-                       (cons (car xs) r)]
-                      [(cdar r) r]
-                      [else (cons (car xs) (cdr r))])))))))
-
-(provide get-uncovered-expressions)
-
-;; no profiling
-(define profile-key #f)
-(define profiling-enabled (lambda () #f))
-(define initialize-profile-point void)
-(define register-profile-start void)
-(define register-profile-done void)
-;; no marks
-(define (with-mark mark expr phase) expr)
-
-(define-values/invoke-unit/infer stacktrace@)
-
-(define errortrace-compile-handler
-  (let ([orig (current-compile)]
-        [ns (current-namespace)])
-    (lambda (e immediate-eval?)
-      (orig (if (and (eq? ns (current-namespace))
-                     (not (compiled-expression?
-                           (if (syntax? e) (syntax-e e) e))))
-              (annotate-top
-               (expand-syntax (if (syntax? e)
-                                e
-                                (namespace-syntax-introduce
-                                 (datum->syntax #f e))))
-               (namespace-base-phase))
-              e)
-            immediate-eval?))))
-
-(current-compile errortrace-compile-handler)
diff --git a/pkgs/sandbox-lib/racket/sandbox.rkt b/pkgs/sandbox-lib/racket/sandbox.rkt
deleted file mode 100644
index bc56ffea2a..0000000000
--- a/pkgs/sandbox-lib/racket/sandbox.rkt
+++ /dev/null
@@ -1,1222 +0,0 @@
-#lang racket/base
-
-(require racket/port
-         racket/path
-         racket/list
-         racket/string
-         racket/file
-         syntax/moddep
-         racket/gui/dynamic
-         planet/config
-         setup/dirs
-         setup/link)
-
-(provide gui?
-         sandbox-gui-available
-         sandbox-init-hook
-         sandbox-reader
-         sandbox-input
-         sandbox-output
-         sandbox-error-output
-         sandbox-propagate-breaks
-         sandbox-coverage-enabled
-         sandbox-namespace-specs
-         sandbox-override-collection-paths
-         sandbox-path-permissions
-         sandbox-security-guard
-         sandbox-network-guard
-         sandbox-exit-handler
-         sandbox-make-namespace
-         sandbox-make-inspector
-         sandbox-make-code-inspector
-         sandbox-make-logger
-         sandbox-make-plumber
-         sandbox-make-environment-variables
-         sandbox-memory-limit
-         sandbox-eval-limits
-         sandbox-eval-handlers
-         sandbox-propagate-exceptions
-         sandbox-run-submodules
-         call-with-trusted-sandbox-configuration
-         evaluator-alive?
-         kill-evaluator
-         break-evaluator
-         get-user-custodian
-         set-eval-limits
-         set-eval-handler
-         put-input
-         get-output
-         get-error-output
-         get-uncovered-expressions
-         call-in-sandbox-context
-         make-evaluator
-         make-module-evaluator
-         call-in-nested-thread*
-         call-with-limits
-         with-limits
-         call-with-deep-time-limit
-         with-deep-time-limit
-         call-with-custodian-shutdown
-         call-with-killing-threads
-         exn:fail:sandbox-terminated?
-         exn:fail:sandbox-terminated-reason
-         exn:fail:resource?
-         exn:fail:resource-resource)
-
-; for backward compatibility; maybe it should be removed:
-(define gui? (gui-available?))
-
-;; When this parameter is #t, it is adjusted when creating a sandbox:
-(define sandbox-gui-available (make-parameter #t (lambda (v) (and v #t))))
-
-(define-syntax mz/mr ; use a value for plain racket, or pull a gui binding
-  (syntax-rules ()
-    [(mz/mr mzval mrsym)
-     (if (sandbox-gui-available) (gui-dynamic-require 'mrsym) mzval)]))
-
-;; Configuration ------------------------------------------------------------
-
-(define sandbox-init-hook    (make-parameter void))
-(define sandbox-input        (make-parameter #f))
-(define sandbox-output       (make-parameter #f))
-(define sandbox-error-output
-  (make-parameter (lambda () (dup-output-port (current-error-port)))))
-(define sandbox-memory-limit (make-parameter 30))       ; 30mb total
-(define sandbox-eval-limits  (make-parameter '(30 20))) ; 30sec, 20mb
-(define sandbox-propagate-breaks (make-parameter #t))
-(define sandbox-coverage-enabled (make-parameter #f))
-(define sandbox-propagate-exceptions (make-parameter #t))
-(define sandbox-run-submodules (make-parameter null))
-
-(define (call-with-trusted-sandbox-configuration thunk)
-  (parameterize ([sandbox-propagate-breaks    #t]
-                 [sandbox-override-collection-paths '()]
-                 [sandbox-security-guard      current-security-guard]
-                 [sandbox-exit-handler        (exit-handler)]
-                 [sandbox-make-inspector      current-inspector]
-                 [sandbox-make-code-inspector current-code-inspector]
-                 [sandbox-make-logger         current-logger]
-                 [sandbox-make-plumber        (lambda () (current-plumber))]
-                 [sandbox-make-environment-variables current-environment-variables]
-                 [sandbox-memory-limit        #f]
-                 [sandbox-eval-limits         #f]
-                 [sandbox-eval-handlers       '(#f #f)])
-    (thunk)))
-
-(define (sandbox-make-namespace)
-  ((mz/mr make-base-namespace make-gui-namespace)))
-
-(define sandbox-namespace-specs
-  (make-parameter `(,sandbox-make-namespace
-                    #| no modules here by default |#)))
-
-(define (default-sandbox-reader source)
-  (for/list ([x (in-producer read-syntax eof source)]) x))
-
-(define sandbox-reader (make-parameter default-sandbox-reader))
-
-(define sandbox-override-collection-paths (make-parameter '()))
-
-(define teaching-langs
-  '(beginner beginner-abbr intermediate intermediate-lambda advanced))
-
-;; Security Guard -----------------------------------------------------------
-
-(define sep (bytes-ref (path->bytes (simplify-path "/")) 0)) ; '\' on windows
-
-(define (simplify-path* path)
-  (cond
-   [(symbol? path) #f]
-   [(and (pair? path) (eq? 'submod (car path)))
-    (simplify-path* (cadr path))]
-   [else
-    (simple-form-path (cond [(bytes? path) (bytes->path path)]
-                            [(string? path) (string->path path)]
-                            [else path]))]))
-
-;; 'read-bytecode is special, it's higher than 'read, but not lower than
-;; 'delete.
-(define permission-order '(execute write delete read-bytecode read exists))
-(define (perm<=? p1 p2)
-  (or (eq? p1 p2)
-      (and (not (eq? 'read-bytecode p1))
-           (memq p1 (memq p2 permission-order))
-           #t)))
-
-;; gets a path (can be bytes/string), returns a regexp for that path that
-;; matches also subdirs (if it's a directory)
-(define path->bregexp
-  (let* ([sep-re    (regexp-quote (bytes sep))]
-         [last-sep  (byte-regexp (bytes-append sep-re #"?$"))]
-         [suffix-re (bytes-append #"(?:$|" sep-re #")")])
-    (lambda (path)
-      (if (byte-regexp? path)
-        path
-        (let* ([path (path->bytes (simplify-path* path))]
-               [path (regexp-quote (regexp-replace last-sep path #""))])
-          (byte-regexp (bytes-append #"^" path suffix-re)))))))
-
-(define sandbox-path-permissions
-  (make-parameter '()
-    (lambda (new)
-      (map (lambda (perm)
-             (if (and (pair? perm) (symbol? (car perm))
-                      (pair? (cdr perm)) (null? (cddr perm)))
-               (list (car perm) (path->bregexp (cadr perm)))
-               (error 'sandbox-path-permissions
-                      "bad permission spec: ~e" perm)))
-           new))))
-
-;; compresses the (sandbox-path-permissions) value to a "compressed" list of
-;; (permission regexp ...) where each permission appears exactly once (so it's
-;; quicker to test it later, no need to scan the whole permission list).
-(define compressed-path-permissions
-  (let ([t (make-weak-hasheq)])
-    (define (compress-permissions ps)
-      (map (lambda (perm)
-             (let* ([ps (filter (lambda (p) (perm<=? perm (car p))) ps)]
-                    [ps (remove-duplicates (map cadr ps))])
-               (cons perm ps)))
-           permission-order))
-    (lambda ()
-      (define ps (sandbox-path-permissions))
-      (or (hash-ref t ps #f)
-          (let ([c (compress-permissions ps)]) (hash-set! t ps c) c)))))
-
-;; similar to the security guard, only with a single mode for simplification;
-;; assumes valid mode and simplified path
-(define (check-sandbox-path-permissions path needed)
-  (define bpath (path->bytes path))
-  (define perms (compressed-path-permissions))
-  (ormap (lambda (rx) (regexp-match? rx bpath)) (cdr (assq needed perms))))
-
-(define sandbox-network-guard
-  (make-parameter (lambda (what . xs)
-                    (error what "network access denied: ~e" xs))))
-
-(define (make-default-sandbox-guard)
-  (define orig-security (current-security-guard))
-  (make-security-guard
-   orig-security
-   (lambda (what path modes)
-     (when path
-       (define spath (parameterize ([current-security-guard orig-security])
-                       (simplify-path* path)))
-       (define maxperm
-         ;; assumes that the modes are valid (ie, in the above list)
-         (cond [(null? modes) (error 'default-sandbox-guard
-                                     "got empty mode list for ~e and ~e"
-                                     what path)]
-               [(null? (cdr modes)) (car modes)] ; common case
-               [else (foldl (lambda (x max) (if (perm<=? max x) x max))
-                            (car modes) (cdr modes))]))
-       (unless (check-sandbox-path-permissions spath maxperm)
-         (error what "`~a' access denied for ~a"
-                (string-append* (add-between (map symbol->string modes) "+"))
-                path))))
-   (lambda args (apply (sandbox-network-guard) args))))
-
-(define sandbox-security-guard
-  (make-parameter make-default-sandbox-guard
-    (lambda (x)
-      (if (or (security-guard? x)
-              (and (procedure? x) (procedure-arity-includes? x 0)))
-        x
-        (raise-argument-error
-         'sandbox-security-guard
-         "(or/c security-guard? (-> security-guard?))" x)))))
-
-;; this is never really used (see where it's used in the evaluator)
-(define (default-sandbox-exit-handler _) (error 'exit "sandbox exits"))
-
-(define sandbox-exit-handler (make-parameter default-sandbox-exit-handler))
-
-(define sandbox-make-inspector
-  (make-parameter (lambda () (make-inspector (current-inspector)))))
-
-(define sandbox-make-code-inspector
-  (make-parameter (lambda () (make-inspector (current-code-inspector)))))
-
-(define sandbox-make-logger (make-parameter current-logger))
-
-(define sandbox-make-plumber (make-parameter 'propagate))
-
-(define sandbox-make-environment-variables (make-parameter
-                                            (lambda ()
-                                              (environment-variables-copy
-                                               (current-environment-variables)))))
-
-(define (compute-permissions for-require for-load)
-  ;; `for-require' is a list of module paths and paths that will be `reqiure'd,
-  ;; while `for-load' is a list of path (strings) that will be `load'ed.
-  (define cpaths (map path->complete-path for-load))
-  (append (map (lambda (p) `(read ,(path->bytes p))) cpaths)
-          ;; when loading a module from "/foo/bar/baz.rkt" racket will try to see
-          ;; if "/foo/bar" exists, so allow these paths too; it might be needed
-          ;; to allow 'exists on any parent path, but I'm not sure that this is
-          ;; safe in terms of security, so put just the immediate parent dir in
-          (filter-map (lambda (p)
-                        (let ([p (and (file-exists? p) (path-only p))])
-                          (and p `(exists ,(path->bytes p)))))
-                      cpaths)
-          (module-specs->path-permissions for-require)))
-
-;; computes permissions that are needed for require specs (`read-bytecode' for
-;; all files and "compiled" subdirs, `exists' for the base-dir)
-(define (module-specs->path-permissions mods)
-  (define paths (module-specs->non-lib-paths mods))
-  (define bases
-    (let loop ([paths paths] [bases '()])
-      (if (null? paths)
-          (reverse bases)
-          (let-values ([(base* name dir?) (split-path (car paths))])
-            (define base (simplify-path* base*))
-            (loop (cdr paths)
-                  (if (member base bases) bases (cons base bases)))))))
-  (append (map (lambda (p) `(read-bytecode ,p)) paths)
-          (map (lambda (b) `(read-bytecode ,(build-path b "compiled"))) bases)
-          (map (lambda (b) `(exists ,b)) bases)))
-
-;; takes a module-spec list and returns all module paths that are needed
-;; ==> ignores (lib ...) modules
-(define (module-specs->non-lib-paths mods)
-  (define (lib? x)
-    (if (module-path-index? x)
-      (let-values ([(m base) (module-path-index-split x)]) (lib? m))
-      (or (symbol? x) (and (pair? x) (eq? 'lib (car x))))))
-  ;; turns a module spec to a simple one (except for lib specs)
-  (define (simple-modspec mod)
-    (cond [(and (pair? mod) (eq? 'lib (car mod))) #f]
-          [(module-path? mod)
-           (simplify-path* (resolve-module-path mod #f))]
-          [(path? mod)
-           (simplify-path* mod)]
-          [(not (and (pair? mod) (pair? (cdr mod))))
-           ;; don't know what this is, leave as is
-           #f]
-          [(eq? 'only (car mod))
-           (simple-modspec (cadr mod))]
-          [(eq? 'rename (car mod))
-           (simple-modspec (cadr mod))]
-          [(and (eq? 'prefix (car mod)) (pair? (cddr mod)))
-           (simple-modspec (caddr mod))]
-          [else #f]))
-  (let loop ([todo (filter-map simple-modspec mods)]
-             [r '()])
-    (cond
-      [(null? todo) r]
-      [(member (car todo) r) (loop (cdr todo) r)]
-      [else
-       (define path (car todo))
-       (loop (append (cdr todo)
-                     (filter-map
-                      (lambda (i)
-                        (simplify-path* (resolve-module-path-index i path)))
-                      (filter (lambda (i)
-                                (and (module-path-index? i) (not (lib? i))))
-                              (append-map cdr (let ([m (get-module-code
-                                                        path
-                                                        #:extension-handler
-                                                        (lambda (path loader?) #f))])
-                                                (if m
-                                                  (module-compiled-imports m)
-                                                  null))))))
-             (let ([l (cons path r)])
-               ;; If we need an .rkt path, also allow access to .ss path
-               (if (regexp-match? #rx#"[.]rkt$" (path->bytes path))
-                 (cons (path-replace-suffix path #".ss") l)
-                 l)))])))
-
-;; Resources ----------------------------------------------------------------
-
-(define-struct (exn:fail:resource exn:fail) (resource))
-
-(define memory-accounting? (custodian-memory-accounting-available?))
-
-;; similar to `call-in-nested-thread', but propagates killing the thread,
-;; shutting down the custodian or setting parameters and thread cells;
-;; optionally with thunks to call for kill/shutdown instead.
-(define (call-in-nested-thread*
-         thunk
-         [kill     (lambda () (kill-thread (current-thread)))]
-         [shutdown (lambda () (custodian-shutdown-all (current-custodian)))])
-  (define p #f)
-  (define c (make-custodian (current-custodian)))
-  (define b (make-custodian-box c #t))
-  (define break? (break-enabled))
-  (parameterize-break #f
-    (with-handlers ([(lambda (_) (not p))
-                     ;; if the after thunk was not called, then this error is
-                     ;; about the thread dying unnaturally, so propagate
-                     ;; whatever it did
-                     (lambda (_)
-                       ((if (custodian-box-value b) kill shutdown)))])
-      (dynamic-wind void
-        (lambda ()
-          (parameterize ([current-custodian c])
-            (call-in-nested-thread
-             (lambda ()
-               (break-enabled break?)
-               (dynamic-wind void thunk
-                 ;; this should always be called unless the thread is killed
-                 ;; or the custodian is shutdown, distinguish the two cases
-                 ;; through the above box
-                 (lambda ()
-                   (set! p (current-preserved-thread-cell-values))))))))
-        (lambda () (when p (current-preserved-thread-cell-values p)))))))
-
-;; useful wrapper around the above: run thunk, return one of:
-;; - (list values val ...)
-;; - (list raise exn)
-;; - 'kill or 'shut
-(define (nested thunk)
-  (call-in-nested-thread*
-   (lambda ()
-     (with-handlers ([void (lambda (e) (list raise e))])
-       (call-with-values thunk (lambda vs (list* values vs)))))
-   (lambda () 'kill) (lambda () 'shut)))
-
-(define (call-with-limits sec mb thunk)
-  ;; note that when the thread is killed after using too much memory or time,
-  ;; then all thread-local changes (parameters and thread cells) are discarded
-  (define-values [cust cust-box]
-    (if (and mb memory-accounting?)
-      ;; memory limit, set on a new custodian so if there's an out-of-memory
-      ;; error, the user's custodian is still alive
-      (let ([c (make-custodian (current-custodian))])
-        (custodian-limit-memory c (inexact->exact (round (* mb 1024 1024))) c)
-        (values c (make-custodian-box c #t)))
-      (values (current-custodian) #f)))
-  (define timeout? #f)
-  (define r
-    (parameterize ([current-custodian cust])
-      (if sec
-        (nested
-         (lambda ()
-           ;; time limit
-           (when sec
-             (define t (current-thread))
-             (thread (lambda ()
-                       (unless (sync/timeout sec t) (set! timeout? #t))
-                       (kill-thread t))))
-           (thunk)))
-        (nested thunk))))
-  (cond [timeout? (set! r 'time)]
-        [(and cust-box (not (custodian-box-value cust-box)))
-         (if (memq r '(kill shut)) ; should always be 'shut
-           (set! r 'memory)
-           (format "cust died with: ~a" r))]) ; throw internal error below
-  (case r
-    [(kill) (kill-thread (current-thread))]
-    [(shut) (custodian-shutdown-all (current-custodian))]
-    [(memory time)
-     (raise (make-exn:fail:resource (format "with-limit: out of ~a" r)
-                                    (current-continuation-marks)
-                                    r))]
-    [else (if (pair? r)
-            (apply (car r) (cdr r))
-            (error 'call-with-limits "internal error in nested: ~e" r))]))
-
-(define-syntax with-limits
-  (syntax-rules ()
-    [(with-limits sec mb body ...)
-     (call-with-limits sec mb (lambda () body ...))]))
-
-(define (custodian-managed-list* cust super)
-  (define ms (custodian-managed-list cust super))
-  (append-map
-   (λ (v)
-     (if (custodian? v)
-       (custodian-managed-list* v cust)
-       (list v)))
-   ms))
-
-(define (call-with-deep-time-limit secs thunk)
-  (define me
-    (current-custodian))
-  (define cust
-    (make-custodian me))
-  (define timeout-evt
-    (handle-evt
-     (alarm-evt (+ (current-inexact-milliseconds)
-                   (* 1000 secs)))
-     (λ (a) #f)))
-
-  (parameterize ([current-custodian cust]
-                 [current-subprocess-custodian-mode 'kill])
-    (thread thunk))
-
-  (define r
-    (let loop ()
-      (define ms (custodian-managed-list* cust me))
-      (define (thread-or-subprocess? x)
-        (or (thread? x)
-            (subprocess? x)))
-      (define ts (filter thread-or-subprocess? ms))
-      (sync
-       (if (empty? ts)
-         always-evt
-         (handle-evt
-          (apply choice-evt ts)
-          (λ (_)
-            (loop))))
-       timeout-evt)))
-  (custodian-shutdown-all cust)
-  (unless r
-    (raise (make-exn:fail:resource (format "call-with-deep-time-limit: out of ~a" r)
-                                   (current-continuation-marks)
-                                   'deep-time))))
-
-(define-syntax-rule (with-deep-time-limit sec body ...)
-  (call-with-deep-time-limit sec (λ () body ...)))
-
-;; other resource utilities
-
-(define (call-with-custodian-shutdown thunk)
-  (define cust (make-custodian (current-custodian)))
-  (define r (parameterize ([current-custodian cust]) (nested thunk)))
-  (case r
-    [(kill) (kill-thread (current-thread))]
-    [(shut) (custodian-shutdown-all (current-custodian))]
-    [else (apply (car r) (cdr r))]))
-
-(define (call-with-killing-threads thunk)
-  (define cur (current-custodian))
-  (define sub (make-custodian cur))
-  (define r (parameterize ([current-custodian sub]) (nested thunk)))
-  (let kill-all ([x sub])
-    (cond [(custodian? x) (for-each kill-all (custodian-managed-list x cur))]
-          [(thread? x) (kill-thread x)]))
-  (case r
-    [(kill) (kill-thread (current-thread))]
-    [(shut) (custodian-shutdown-all (current-custodian))]
-    [else (apply (car r) (cdr r))]))
-
-(define sandbox-eval-handlers
-  (make-parameter (list #f call-with-custodian-shutdown)))
-
-;; Execution ----------------------------------------------------------------
-
-(define (literal-identifier=? x y)
-  (or (free-identifier=? x y) (eq? (syntax-e x) (syntax-e y))))
-
-(define-namespace-anchor anchor)
-
-(define (make-evaluation-namespace)
-  (define specs   (sandbox-namespace-specs))
-  (define new-ns  ((car specs)))
-  (define orig-ns (namespace-anchor->empty-namespace anchor))
-  (define mods    (cdr specs))
-  (parameterize ([current-namespace orig-ns])
-    (for ([mod (in-list mods)]) (dynamic-require mod #f)))
-  (parameterize ([current-namespace new-ns])
-    (for ([mod (in-list mods)]) (namespace-attach-module orig-ns mod)))
-  new-ns)
-
-(define (extract-required language requires)
-  (cond
-    [(string? language) (cons language requires)]
-    [(not (pair? language)) requires]
-    [(memq (car language) '(lib file planet quote)) (cons language requires)]
-    [(eq? (car language) 'begin) requires]
-    [else (error 'extract-required "bad language spec: ~e" language)]))
-
-(define (input->port inp)
-  ;; returns #f when it can't create a port
-  (cond [(input-port? inp) inp]
-        [(string? inp) (open-input-string inp #f)]
-        [(bytes?  inp) (open-input-bytes inp #f)]
-        [(path?   inp) (open-input-file inp)]
-        [else #f]))
-
-;; Gets an input spec returns a list of syntaxes and a default source to filter
-;; uncovered expressions with.  The input can be a list of sexprs/syntaxes, or
-;; a list with a single input port spec (path/string/bytes) value.  Note that
-;; the source can be a filtering function.
-(define (input->code inps source-in n accept-lang?)
-  (if (null? inps)
-    (values '() source-in)
-    (let ([p (input->port (car inps))])
-      (cond [(and p (null? (cdr inps)))
-             (port-count-lines! p)
-             (define source
-               (or (object-name p)
-                   ;; just in case someone uses a function as the source...
-                   (if (procedure? source-in)
-                     (lambda (x) (eq? x source-in))
-                     source-in)))
-             (define code
-               (parameterize ([current-input-port p])
-                 (if accept-lang?
-                   (parameterize ([read-accept-reader #t] ; needed for #lang too
-                                  [read-accept-lang #t])
-                     ((sandbox-reader) source))
-                   ((sandbox-reader) source))))
-             ;; close a port if we opened it
-             (unless (eq? p (car inps)) (close-input-port p))
-             (values code source)]
-            [p (error 'input->code "ambiguous inputs: ~e" inps)]
-            [(andmap syntax? inps)
-             (values inps
-                     (let ([srcs (remove-duplicates (map syntax-source inps)
-                                                    equal?)])
-                       (if (null? (cdr srcs))
-                         (car srcs)
-                         (lambda (x) (memq x srcs)))))]
-            [else (let loop ([inps inps] [n n] [r '()])
-                    (if (null? inps)
-                      (values (reverse r) source-in)
-                      (loop (cdr inps) (and n (add1 n))
-                            ;; 1st at line#1, pos#1, 2nd at line#2, pos#2 etc
-                            ;; (starting from the `n' argument)
-                            (cons (add-location (car inps)
-                                                (list source-in n (and n 0) n (and n 1)))
-                                  r))))]))))
-
-(define orig-stx (read-syntax 'src (open-input-string "0"))) ; for "is original?" property
-(define (make-orig x loc) (datum->syntax #f x loc orig-stx))
-
-(define (add-location x loc)
-  (cond [(null? x) null]
-        [(list? x)
-         ;; For a list, generate a syntax-object wrapper consistent with 
-         ;; an absence of `.'s in the reader's input:
-         (make-orig (for/list ([i (in-list x)])
-                      (add-location i loc))
-                    loc)]
-        [(pair? x) (make-orig (cons (add-location (car x) loc) 
-                                    (add-location (cdr x) loc))
-                              loc)]
-        [(vector? x) (make-orig (for/vector ([i (in-vector x)])
-                                  (add-location i loc))
-                                loc)]
-        [else (make-orig x loc)]))
-
-(define ((init-hook-for-language language))
-  (cond [(not (and (pair? language) (eq? 'special (car language))))
-         (void)]
-        [(eq? (cadr language) 'r5rs)
-         (read-case-sensitive #f)
-         (read-square-bracket-as-paren #f)
-         (read-curly-brace-as-paren #f)
-         (read-accept-infix-dot #f)]
-        [(memq (cadr language) teaching-langs)
-         (read-case-sensitive #t)
-         (read-decimal-as-inexact #f)
-         ;; needed to make the test-engine work
-         (define orig-ns (namespace-anchor->empty-namespace anchor))
-         (parameterize ([current-namespace orig-ns])
-           (dynamic-require 'racket/class #f))
-         (namespace-attach-module orig-ns 'racket/class)]))
-
-;; Returns a single (module ...) or (begin ...) expression (a `begin' list will
-;; be evaluated one by one -- the language might not have a `begin'), and a
-;; default source to filter uncovered expressions with.
-;;
-;; FIXME: inserting `#%require's here is bad if the language has a
-;; `#%module-begin' that processes top-level forms specially.
-;; A more general solution would be to create a new module that exports
-;; the given language plus all of the given extra requires.
-;;
-;; We use `#%require' because, unlike the `require' of racket/base,
-;; it comes from `#%kernel', so it's always present through
-;; transitive requires.
-(define (build-program language requires input-program)
-  (define-values [prog-stxs source] (input->code input-program 'program 1 #f))
-  (define body (append (if (and (pair? requires) (eq? 'begin (car requires)))
-                         (cdr requires)
-                         (map (lambda (r) (list #'#%require r)) requires))
-                       prog-stxs))
-  (define (use-lang lang) `(module program ,lang . ,body))
-  (values (cond [(decode-language language) => use-lang]
-                [(module-path? language) (use-lang language)]
-                [(and (list? language) (eq? 'begin (car language)))
-                 (append language body)]
-                [else (error 'make-evaluator "bad language spec: ~e" language)])
-          source))
-
-(define (decode-language language)
-  (cond [(and (list? language)
-              (= 2 (length language))
-              (eq? (car language) 'special)
-              (memq (cadr language) teaching-langs))
-         `(lib ,(format "htdp-~a.rkt" (cadr language)) "lang")]
-        [(equal? language '(special r5rs))
-         `(lib "lang.rkt" "r5rs")]
-        [else #f]))
-
-;; Like a toplevel (eval `(begin ,@exprs)), but the language that is used may
-;; not have a begin.
-(define (eval* exprs)
-  (call-with-continuation-prompt
-   (lambda ()
-     (if (null? exprs)
-       (void)
-       (let ([deftag (default-continuation-prompt-tag)])
-         (let loop ([expr (car exprs)] [exprs (cdr exprs)])
-           (if (null? exprs)
-             (eval expr)
-             (begin (call-with-continuation-prompt
-                     (lambda () (eval expr))
-                     deftag
-                     (lambda (x) (abort-current-continuation deftag x)))
-                    (loop (car exprs) (cdr exprs))))))))))
-
-;; We need a powerful enough code inspector to invoke the errortrace library
-;; (indirectly through private/sandbox-coverage).  But there is a small problem
-;; here -- errortrace/stacktrace.rkt will grab the declaration-time code inspector.
-;; So we grab it here too, and use it to wrap the code that invokes errortrace. 
-;; If errortrace/stacktrace.rkt is changed to grab the current inspector, then 
-;; it would be better to avoid this here, and pass `evaluate-program' the
-;; inspector that was in effect when the sandbox was created.
-(define orig-code-inspector (variable-reference->module-declaration-inspector
-                             (#%variable-reference)))
-
-(define (evaluate-program program limit-thunk submod-names uncovered!)
-  (when uncovered!
-    (parameterize ([current-code-inspector orig-code-inspector])
-      (eval `(,#'#%require racket/private/sandbox-coverage))))
-  (define ns
-    (syntax-case* program (module) literal-identifier=?
-      [(module mod . body)
-       (identifier? #'mod)
-       (let ([mod #'mod])
-         (lambda ()
-           (eval `(,#'require (quote ,mod)))
-           (for ([submod-name (in-list submod-names)])
-             (eval `(when (module-declared? '(submod (quote ,mod) ,submod-name) #f)
-                      (dynamic-require '(submod (quote ,mod) ,submod-name) #f))))
-           (module->namespace `(quote ,(syntax-e mod)))))]
-      [_else #f]))
-  ;; the actual evaluation happens under the specified limits
-  (parameterize ([current-load-relative-directory
-                  (let* ([d (and (syntax? program) (syntax-source program))]
-                         [d (and (path-string? d) (path-only d))])
-                    (if (and d (directory-exists? d))
-                      d
-                      (current-load-relative-directory)))])
-    ((limit-thunk (lambda ()
-                    (if (and (pair? program) (eq? 'begin (car program)))
-                      (eval* (cdr program))
-                      (eval program))
-                    (when ns (set! ns (ns)))))))
-  (when uncovered!
-    (define get (let ([ns (current-namespace)])
-                  (lambda () (eval '(get-uncovered-expressions) ns))))
-    (uncovered! (list (get) get)))
-  (when (namespace? ns) (current-namespace ns)))
-
-(define null-input         (open-input-bytes #""))
-
-;; special message values for the evaluator procedure, also inside the user
-;; context they're used for function applications.
-(define-struct evaluator-message (msg args))
-(define-syntax define-evaluator-messenger
-  (syntax-rules ()
-    ;; with extra args
-    [(define-evaluator-messenger (name arg ...) msg)
-     (define (name evaluator arg ...)
-       (evaluator (make-evaluator-message msg (list arg ...))))]
-    [(define-evaluator-messenger (name . args) msg)
-     (define (name evaluator . args)
-       (evaluator (make-evaluator-message msg (list* args))))]
-    ;; without
-    [(define-evaluator-messenger name msg)
-     (define name
-       (let ([evmsg (make-evaluator-message msg '())])
-         (lambda (evaluator) (evaluator evmsg))))]))
-
-(define-evaluator-messenger evaluator-alive? 'alive?)
-(define-evaluator-messenger kill-evaluator 'kill)
-(define-evaluator-messenger break-evaluator 'break)
-(define-evaluator-messenger get-user-custodian 'user-cust)
-(define-evaluator-messenger (set-eval-limits secs mb) 'limits)
-(define-evaluator-messenger (set-eval-handler handler) 'handler)
-(define-evaluator-messenger (put-input . xs) 'input)
-(define-evaluator-messenger get-output 'output)
-(define-evaluator-messenger get-error-output 'error-output)
-(define-evaluator-messenger (get-uncovered-expressions . xs) 'uncovered)
-(define (call-in-sandbox-context evaluator thunk [unrestricted? #f])
-  (evaluator (make-evaluator-message (if unrestricted? 'thunk* 'thunk)
-                                     (list thunk))))
-
-(define-struct (exn:fail:sandbox-terminated exn:fail) (reason) #:transparent)
-(define (make-terminated reason)
-  (make-exn:fail:sandbox-terminated
-   (format "evaluator: terminated (~a)" reason)
-   (current-continuation-marks)
-   reason))
-
-(define (make-evaluator* who init-hook allow-for-require allow-for-load program-maker)
-  (define orig-code-inspector (current-code-inspector))
-  (define orig-security-guard (current-security-guard))
-  (define orig-cust     (current-custodian))
-  (define memory-cust   (make-custodian orig-cust))
-  (define memory-cust-box (make-custodian-box memory-cust #t))
-  (define user-cust     (make-custodian memory-cust))
-  (define user-cust-box (make-custodian-box user-cust #t))
-  (define coverage?     (sandbox-coverage-enabled))
-  (define propagate-exceptions? (sandbox-propagate-exceptions))
-  (define uncovered     #f)
-  (define default-coverage-source-filter #f)
-  (define input-ch      (make-channel))
-  (define result-ch     (make-channel))
-  (define busy-sema     (make-semaphore 1))
-  (define input         #f)
-  (define output        #f)
-  (define error-output  #f)
-  (define limits        (sandbox-eval-limits))
-  (define eval-handler  (car (sandbox-eval-handlers))) ; 1st handler on startup
-  (define user-thread   #t) ; set later to the thread
-  (define user-done-evt #t) ; set in the same place
-  (define terminated?   #f) ; set to an exception value when the sandbox dies
-  (define breaks-originally-enabled? (break-enabled))
-  (define submod-names (sandbox-run-submodules))
-  (define (limit-thunk thunk)
-    (define sec (and limits (car limits)))
-    (define mb  (and limits (cadr limits)))
-    (let* ([thunk (if (or sec mb)
-                    (lambda () (call-with-limits sec mb thunk))
-                    thunk)]
-           [thunk (if eval-handler (lambda () (eval-handler thunk)) thunk)])
-      thunk))
-  (define (terminated! reason)
-    (unless terminated?
-      (set! terminated?
-            (make-terminated
-             (cond
-               ;; #f is used as an indication of an internal error, when we
-               ;; don't know why the sandbox is killed
-               [(not reason) "internal error: no termination reason"]
-               ;; explicit reason given
-               [(not (eq? reason #t)) reason]
-               ;; reason = #t => guess the reason
-               [(not (custodian-box-value memory-cust-box)) 'out-of-memory]
-               [(not (custodian-box-value user-cust-box)) 'custodian-shutdown]
-               [(thread-dead? user-thread) 'thread-killed]
-               [else "internal error: cannot guess termination reason"])))))
-  (define (user-kill)
-    (when user-thread
-      (define t user-thread)
-      (set! user-thread #f)
-      (terminated! #f)
-      (custodian-shutdown-all user-cust)
-      (kill-thread t)) ; just in case
-    (void))
-  (define (terminate+kill! reason raise?)
-    (terminated! reason)
-    (user-kill)
-    (when raise? (raise terminated?)))
-  (define (user-break)
-    (when user-thread (break-thread user-thread)))
-  (define (user-process)
-    (define break-paramz (current-break-parameterization))
-    (parameterize-break
-     #f ;; disable breaks during administrative work
-     (with-handlers ([void (lambda (exn) (channel-put result-ch exn))])
-       (call-with-break-parameterization
-        break-paramz
-        (lambda ()
-          ;; enable breaks, maybe
-          (when breaks-originally-enabled? (break-enabled #t))
-          ;; first set up the environment
-          (init-hook)
-          ((sandbox-init-hook))
-          ;; now read and evaluate the input program (in the user context)
-          (evaluate-program
-           (let-values ([(prog src) (program-maker)])
-             (when coverage? (set! default-coverage-source-filter src))
-             prog)
-           limit-thunk
-           submod-names
-           (and coverage? (lambda (es+get) (set! uncovered es+get))))))
-       (channel-put result-ch 'ok))
-     (set! eval-handler (cadr (sandbox-eval-handlers))) ; interactions handler
-     ;; finally wait for interaction expressions
-     (define n 0)
-     (let loop ()
-       (define expr (channel-get input-ch))
-       (when (eof-object? expr)
-         (terminated! 'eof) (channel-put result-ch expr) (user-kill))
-       (with-handlers ([void (lambda (exn)
-                               (if propagate-exceptions?
-                                   (channel-put result-ch (cons 'exn exn))
-                                   (begin
-                                     (call-with-continuation-prompt
-                                      (lambda ()
-                                        (raise exn)))
-                                     (channel-put result-ch (cons 'vals (list (void)))))))])
-         (define run
-           (if (evaluator-message? expr)
-             (case (evaluator-message-msg expr)
-               [(thunk) (limit-thunk (car (evaluator-message-args expr)))]
-               [(thunk*) (car (evaluator-message-args expr))]
-               [else (error 'sandbox "internal error (bad message)")])
-             (limit-thunk
-              (lambda ()
-                (set! n (add1 n))
-                (define exprs
-                  (let-values ([(code _)
-                                (input->code (list expr) 'eval n #f)])
-                    code))
-                (eval* (map (lambda (expr) (cons '#%top-interaction expr))
-                            exprs))))))
-         (channel-put result-ch
-                      (cons 'vals
-                            (call-with-break-parameterization
-                             break-paramz
-                             (lambda () (call-with-values run list))))))
-       (loop))))
-  (define (get-user-result)
-    (if (and (sandbox-propagate-breaks)
-             ;; The following test is weird. We reliably catch breaks if breaks
-             ;; are enabled, except that a break just before or after isn't
-             ;; reliably propagated. A `get-result/enable-breaks' function
-             ;; would make more sense.
-             (break-enabled))
-        ;; The following loop ensures that breaks are disabled while trying
-        ;; to handle a break, which ensures that we don't fail to
-        ;; propagate a break.
-        (parameterize-break
-         #f
-         (let loop ()
-           (with-handlers* ([exn:break? (lambda (e) (user-break) (loop))])
-             (sync/enable-break user-done-evt result-ch))))
-        ;; The simple case doesn't have to deal with breaks:
-        (sync user-done-evt result-ch)))
-  (define (user-eval expr)
-    ;; the thread will usually be running, but it might be killed outside of
-    ;; the sandboxed environment, for example, if you do something like
-    ;; (kill-thread (ev '(current-thread))) when there are no per-expression
-    ;; limits (since then you get a different thread, which is already dead).
-    (when (and user-thread (thread-dead? user-thread))
-      (terminate+kill! #t #t))
-    (cond [terminated? => raise]
-          [(not user-thread)
-           (error 'sandbox "internal error (user-thread is #f)")]
-          ;; use a semaphore to know when we're currently in an evaluation, to
-          ;; prevent the evaluator from calling itself (it will deadlock, and
-          ;; there is no simple way to avoid it -- will require making a stream
-          ;; of inputs sent to the user context, queueing them as they come in,
-          ;; and for each one register a channel for a reply -- and this will
-          ;; consume resources outside the user context)
-          [(not (sync/timeout 0 busy-sema))
-           (error 'evaluator "nested evaluator call with: ~e" expr)]
-          [else (channel-put input-ch expr)
-                (define r (get-user-result))
-                (semaphore-post busy-sema)
-                (cond [(eof-object? r) (terminate+kill! #t #t)]
-                      [(eq? (car r) 'exn) (raise (cdr r))]
-                      [else (apply values (cdr r))])]))
-  (define (get-uncovered [prog? #t] [src default-coverage-source-filter])
-    (unless uncovered
-      (error 'get-uncovered-expressions "no coverage information"))
-    (define uncovered-exprs (if prog? (car uncovered) ((cadr uncovered))))
-    (if src
-      ;; when given a list of syntaxes, the src is actually a function that
-      ;; checks the input source value (which does a union of the sources)
-      (filter (if (procedure? src)
-                (lambda (x) (src (syntax-source x)))
-                (lambda (x) (equal? src (syntax-source x))))
-              uncovered-exprs)
-      uncovered-exprs))
-  (define (output-getter p)
-    (if (procedure? p) (user-eval (make-evaluator-message 'thunk (list p))) p))
-  (define (input-putter [arg input])
-    (cond [(not input)
-           (error 'put-input "evaluator input is not 'pipe")]
-          [(or (string? arg) (bytes? arg))
-           (display arg input) (flush-output input)]
-          [(eof-object? arg) (close-output-port input)]
-          [else (error 'put-input "bad argument: ~e" arg)]))
-  (define (evaluator expr)
-    (if (evaluator-message? expr)
-      (let ([msg (evaluator-message-msg expr)])
-        (case msg
-          [(alive?)  (and user-thread (not (thread-dead? user-thread)))]
-          [(kill)    (terminate+kill! 'evaluator-killed #f)]
-          [(break)   (user-break)]
-          [(user-cust) user-cust]
-          [(limits)  (set! limits (evaluator-message-args expr))]
-          [(handler) (set! eval-handler (car (evaluator-message-args expr)))]
-          [(input)   (apply input-putter (evaluator-message-args expr))]
-          [(output)  (output-getter output)]
-          [(error-output) (output-getter error-output)]
-          [(uncovered) (apply get-uncovered (evaluator-message-args expr))]
-          [(thunk thunk*) (user-eval expr)]
-          [else (error 'evaluator "internal error, bad message: ~e" msg)]))
-      (user-eval expr)))
-  (define (make-output what out set-out!)
-    (cond [(not out) (open-output-nowhere)]
-          [(and (procedure? out) (procedure-arity-includes? out 0)) (out)]
-          [(output-port? out) out]
-          [(eq? out 'pipe) (let-values ([(i o) (make-pipe)]) (set-out! i) o)]
-          [(memq out '(bytes string))
-           (define bytes? (eq? out 'bytes))
-           ;; create the port under the user's custodian
-           (define outp
-             (parameterize ([current-custodian user-cust])
-               (call-in-nested-thread
-                ;; this doesn't really matter: they're the same anyway
-                (if bytes? open-output-bytes open-output-string))))
-           (set-out! (lambda ()
-                       ;; this will run in the user context
-                       (define buf (get-output-bytes outp #t))
-                       (if bytes? buf (bytes->string/utf-8 buf #\?))))
-           outp]
-          [else (error who "bad sandox-~a spec: ~e" what out)]))
-  ;; Call path functions to make sure the underying path computations
-  ;; have been foced, so that the sandbox filesystem guards will not
-  ;; be relevant:
-  (find-config-dir)
-  (find-collects-dir)
-  ;; set global memory limit
-  (when (and memory-accounting? (sandbox-memory-limit))
-    (custodian-limit-memory
-     memory-cust
-     (inexact->exact (round (* (sandbox-memory-limit) 1024 1024)))
-     memory-cust))
-  (parameterize* ; the order in these matters
-   (;; create a sandbox context first
-    [sandbox-gui-available (and (sandbox-gui-available)
-                                (gui-available?))]
-    [current-custodian user-cust]
-    [current-thread-group (make-thread-group)]
-    ;; paths
-    [current-environment-variables ((sandbox-make-environment-variables))]
-    [current-library-collection-paths
-     (filter directory-exists?
-             (append (sandbox-override-collection-paths)
-                     (current-library-collection-paths)))]
-    [sandbox-path-permissions
-     `(,@(map (lambda (p) `(read-bytecode ,p))
-              (apply
-               append
-               (for/list ([l (current-library-collection-links)])
-                 (cond
-                  [(not l)
-                   (current-library-collection-paths)]
-                  [(hash? l)
-                   (hash-values l)]
-                  [else
-                   (if (file-exists? l)
-                       (append
-                        (links #:root? #t #:file l)
-                        (map cdr (links #:file l #:with-path? #t)))
-                       null)]))))
-       ,@(for/list ([l (current-library-collection-links)]
-                    #:when (path? l))
-           `(read ,l))
-       ,@(for*/list ([l (get-pkgs-search-dirs)]
-                     [f (in-list (list "pkgs.rktd" (make-lock-file-name "pkgs.rktd")))])
-           `(read ,(build-path l f)))
-       (read ,(build-path (find-user-pkgs-dir) "pkgs.rktd"))
-       (read-bytecode ,(PLANET-BASE-DIR))
-       (exists ,(find-system-path 'addon-dir))
-       (read ,(find-lib-dir))
-       ,@(let ([d (find-config-dir)])
-           (if d
-               `((read ,(build-path d "config.rktd")))
-               null))
-       ,@(compute-permissions allow-for-require allow-for-load)
-       ,@(sandbox-path-permissions))]
-    ;; restrict the sandbox context from this point
-    [current-security-guard
-     (let ([g (sandbox-security-guard)]) (if (security-guard? g) g (g)))]
-    [current-logger ((sandbox-make-logger))]
-    [current-plumber
-     (let ([maker (sandbox-make-plumber)])
-       (if (eq? maker 'propagate)
-           ;; Create a new plumber, but cause flushes to the original
-           ;; plumber schedule a flush in the sandbox:
-           (let ([p (make-plumber)])
-             (define fh (plumber-add-flush! (current-plumber)
-                                            (lambda (fh)
-                                              (unless (or terminated?
-                                                          ;; The evaluator thread may have terminated
-                                                          ;; asynchronously, such as through an enclosing
-                                                          ;; custodian's shutdown
-                                                          (and user-thread
-                                                               (thread-dead? user-thread)))
-                                                (call-in-sandbox-context
-                                                 evaluator
-                                                 (lambda ()
-                                                   (plumber-flush-all p)))))
-                                            ;; weak:
-                                            #t))
-             ;; Retain flush propagation as long as the new plumber is
-             ;; reachable:
-             (plumber-add-flush! p (lambda (_) fh))
-             p)
-           (maker)))]
-    [current-inspector ((sandbox-make-inspector))]
-    [current-code-inspector ((sandbox-make-code-inspector))]
-    ;; The code inspector serves two purposes -- making sure that only trusted
-    ;; byte-code is loaded, and avoiding using protected module bindings, like
-    ;; the foreign library's `unsafe!'.  We control the first through the path
-    ;; permissions -- using the 'read-bytecode permissionn level, so this
-    ;; handler just checks for that permission then goes on to load the file
-    ;; using the original inspector.
-    [current-load/use-compiled
-     (let ([handler (current-load/use-compiled)])
-       (lambda (path modname)
-         (if (check-sandbox-path-permissions
-              (parameterize ([current-security-guard orig-security-guard])
-                (simplify-path* path))
-              'read-bytecode)
-           (parameterize ([current-code-inspector orig-code-inspector])
-             (handler path modname))
-           ;; otherwise, just let the old handler throw a proper error
-           (handler path modname))))]
-    ;; prevent a potential value here from messing up creating the sandboxed
-    ;; module
-    [current-module-declare-name #f]
-    ;; set up the IO context
-    [current-input-port
-     (let ([inp (sandbox-input)])
-       (cond [(not inp) null-input]
-             [(input->port inp) => values]
-             [(and (procedure? inp) (procedure-arity-includes? inp 0)) (inp)]
-             [(eq? 'pipe inp)
-              (let-values ([(i o) (make-pipe)]) (set! input o) i)]
-             [else (error who "bad sandbox-input: ~e" inp)]))]
-    [current-output-port (make-output 'output (sandbox-output)
-                                      (lambda (o) (set! output o)))]
-    [current-error-port (make-output 'error-output (sandbox-error-output)
-                                     (lambda (o) (set! error-output o)))]
-    ;; no exiting
-    [exit-handler
-     (let ([h (sandbox-exit-handler)])
-       (if (eq? h default-sandbox-exit-handler)
-           (let ([p (current-plumber)])
-             (lambda _
-               (plumber-flush-all p)
-               (terminate+kill! 'exited #f)))
-           h))]
-    ;; general info
-    [current-command-line-arguments '#()]
-    ;; Finally, create the namespace in the restricted environment (in
-    ;; particular, it must be created under the new code inspector)
-    [current-namespace (make-evaluation-namespace)])
-   (define current-eventspace (mz/mr (make-parameter #f) current-eventspace))
-   (parameterize*
-    ;; Note the above definition of `current-eventspace': in Racket, it
-    ;; is an unused parameter.  Also note that creating an eventspace
-    ;; starts a thread that will eventually run the callback code (which
-    ;; evaluates the program in `run-in-bg') -- so this parameterization
-    ;; must be nested in the above (which is what paramaterize* does), or
-    ;; it will not use the new namespace.
-    ([current-eventspace (parameterize-break #f ((mz/mr void make-eventspace)))])
-    (define run-in-bg (mz/mr thread queue-callback))
-    (define bg-run->thread (if (sandbox-gui-available)
-                               (lambda (ignored)
-                                 ((mz/mr void eventspace-handler-thread) (current-eventspace)))
-                                values))
-    (define t (bg-run->thread (run-in-bg user-process)))
-    (set! user-done-evt (handle-evt t (lambda (_) (terminate+kill! #t #t))))
-    (set! user-thread t)))
-  (define r (get-user-result))
-  (if (eq? r 'ok)
-    ;; initial program executed ok, so return an evaluator
-    evaluator
-    ;; program didn't execute
-    (raise r)))
-
-(define (check-and-combine-allows who allow allow-for-require allow-for-load)
-  (define (check-arg-list arg what ok?)
-    (unless (and (list? arg) (andmap ok? arg))
-      (error who "bad ~a: ~e" what arg)))
-  (check-arg-list allow "allows"
-                  (lambda (x) (or (path? x) (module-path? x) (path-string? x))))
-  (check-arg-list allow-for-require "allow-for-requires"
-                  (lambda (x) (or (path? x) (module-path? x))))
-  (check-arg-list allow-for-load "allow-for-loads" path-string?)
-  ;; This split of `allow' is ugly but backward-compatible:
-  (define-values (more-allow-for-load more-allow-for-require)
-    (partition (lambda (p) (or (path? p) 
-                               ;; strings that can be treated as paths:
-                               (not (module-path? p)))) 
-               allow))
-  (values (append allow-for-require
-                  more-allow-for-require)
-          (append allow-for-load
-                  more-allow-for-load)))
-
-(define (make-evaluator lang
-                        #:requires [requires null] 
-                        #:allow-read [allow null]
-                        #:allow-for-require [allow-for-require null]
-                        #:allow-for-load [allow-for-load null]
-                        . input-program)
-  ;; `input-program' is either a single argument specifying a file/string, or
-  ;;  multiple arguments for a sequence of expressions
-  (define all-requires
-    (extract-required (or (decode-language lang) lang) 
-                      requires))
-  (unless (and (list? requires) 
-               (andmap (lambda (x) (or (path-string? x) 
-                                       (module-path? x)
-                                       (and (list? x)
-                                            (pair? x)
-                                            (eq? (car x) 'for-syntax)
-                                            (andmap module-path? (cdr x)))))
-                       requires))
-    (error 'make-evaluator "bad requires: ~e" requires))
-  (define-values (all-for-require all-for-load)
-    (check-and-combine-allows 'make-evaluator allow allow-for-require allow-for-load))
-  (define (normalize-require-for-syntax r)
-    (if (or (path? r) (and (string? r) 
-                           (not (module-path? r))))
-        `(file ,(path->string (simplify-path* r)))
-        r))
-  (define (normalize-require-for-allow r)
-    (cond
-     [(and (string? r) (not (module-path? r))) (list (string->path r))]
-     [(and (pair? r) (eq? (car r) 'for-syntax))
-      (cdr r)]
-     [else (list r)]))
-  (make-evaluator* 'make-evaluator
-                   (init-hook-for-language lang)
-                   (append (apply append
-                                  (map normalize-require-for-allow all-requires))
-                           all-for-require)
-                   (append (if (and (= 1 (length input-program))
-                                    (path? (car input-program)))
-                               (list (car input-program))
-                               '())
-                           all-for-load)
-                   (lambda () (build-program lang 
-                                             (map normalize-require-for-syntax all-requires)
-                                             input-program))))
-
-(define (make-module-evaluator input-program 
-                               #:allow-read [allow null] 
-                               #:allow-for-require [allow-for-require null]
-                               #:allow-for-load [allow-for-load null]
-                               #:language [reqlang #f])
-  ;; this is for a complete module input program
-  (define (make-program)
-    (define-values [prog source]
-      (input->code (list input-program) 'program #f #t))
-    (unless (= 1 (length prog))
-      (error 'make-module-evaluator "expecting a single `module' program; ~a"
-             (if (zero? (length prog))
-               "no program expressions given"
-               "got more than a single expression")))
-    (syntax-case* (car prog) (module) literal-identifier=?
-      [(module modname lang body ...)
-       (if (or (not reqlang) (equal? reqlang (syntax->datum #'lang)))
-         (values (car prog) source)
-         (error 'make-module-evaluator
-                "module code used `~.s' for a language, expecting `~.s'"
-                (syntax->datum #'lang) reqlang))]
-      [_else (error 'make-module-evaluator
-                    "expecting a `module' program; got ~.s"
-                    (syntax->datum (car prog)))]))
-  (define-values (all-for-require all-for-load)
-    (check-and-combine-allows 'make-module-evaluator allow allow-for-require allow-for-load))
-  (make-evaluator* 'make-module-evaluator
-                   void
-                   all-for-require
-                   (if (path? input-program) (cons input-program all-for-load) all-for-load)
-                   make-program))
diff --git a/pkgs/sandbox-lib/scheme/sandbox.rkt b/pkgs/sandbox-lib/scheme/sandbox.rkt
deleted file mode 100644
index 49696fa322..0000000000
--- a/pkgs/sandbox-lib/scheme/sandbox.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang scheme/base
-(require racket/sandbox
-         scheme/gui/dynamic)
-
-(provide (except-out (all-from-out racket/sandbox)
-                     sandbox-namespace-specs
-                     make-evaluator
-                     make-module-evaluator)
-         (rename-out
-          [scheme:sandbox-namespace-specs sandbox-namespace-specs]
-          [scheme:make-evaluator make-evaluator]
-          [scheme:make-module-evaluator make-module-evaluator]))
-
-;; copied from racket/sandbox  :(
-(define-syntax mz/mr ; use a value for plain racket, or pull a gui binding
-  (syntax-rules ()
-    [(mz/mr mzval mrsym)
-     (if gui? (gui-dynamic-require 'mrsym) mzval)]))
-
-
-(define scheme:sandbox-namespace-specs
-  (make-parameter `(,(mz/mr make-base-namespace make-gui-namespace))))
-
-(define (scheme:make-evaluator language
-                               #:requires [requires null] #:allow-read [allow null]
-                               . input-program)
-  (parameterize ([sandbox-namespace-specs (scheme:sandbox-namespace-specs)])
-    (apply make-evaluator 
-           language #:requires requires #:allow-read allow
-           input-program)))
-
-(define (scheme:make-module-evaluator
-         input-program #:allow-read [allow null] #:language [reqlang #f])
-  (parameterize ([sandbox-namespace-specs (scheme:sandbox-namespace-specs)])
-    (make-module-evaluator
-     input-program #:allow-read allow #:language reqlang)))
diff --git a/pkgs/scheme-lib/LICENSE.txt b/pkgs/scheme-lib/LICENSE.txt
deleted file mode 100644
index b0dc65da0d..0000000000
--- a/pkgs/scheme-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-scheme-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/scheme-lib/info.rkt b/pkgs/scheme-lib/info.rkt
deleted file mode 100644
index ea9c9b877c..0000000000
--- a/pkgs/scheme-lib/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "Legacy (Scheme) libraries")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/scheme-lib/scheme/async-channel.rkt b/pkgs/scheme-lib/scheme/async-channel.rkt
deleted file mode 100644
index 94fb12ee2a..0000000000
--- a/pkgs/scheme-lib/scheme/async-channel.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/async-channel
diff --git a/pkgs/scheme-lib/scheme/base.rkt b/pkgs/scheme-lib/scheme/base.rkt
deleted file mode 100644
index d252bb9db1..0000000000
--- a/pkgs/scheme-lib/scheme/base.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-(require "private/namespace.rkt")
-
-(define-syntax-rule (module-begin . forms)
-  (#%printing-module-begin 
-   (module configure-runtime '#%kernel
-     (#%require scheme/runtime-config)
-     (configure #f))
-   . forms))
-
-(provide (except-out (all-from-out racket/base) 
-                     struct
-                     hash hasheq hasheqv
-                     in-directory
-                     local-require
-                     #%module-begin)
-         (rename-out [module-begin #%module-begin])
-         make-base-empty-namespace
-         make-base-namespace)
-
-(module reader syntax/module-reader
-  scheme/base)
-
-(module configure-runtime '#%kernel
-  (#%require scheme/runtime-config)
-  (configure #f))
diff --git a/pkgs/scheme-lib/scheme/base/lang/reader.rkt b/pkgs/scheme-lib/scheme/base/lang/reader.rkt
deleted file mode 100644
index a310f982b0..0000000000
--- a/pkgs/scheme-lib/scheme/base/lang/reader.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-;; This module is preserved only for backward compatiblity
-(module reader '#%kernel
-  (#%require (submod scheme/base reader))
-  (#%provide (all-from (submod scheme/base reader))))
diff --git a/pkgs/scheme-lib/scheme/bool.rkt b/pkgs/scheme-lib/scheme/bool.rkt
deleted file mode 100644
index 1443e287b0..0000000000
--- a/pkgs/scheme-lib/scheme/bool.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/bool
diff --git a/pkgs/scheme-lib/scheme/class.rkt b/pkgs/scheme-lib/scheme/class.rkt
deleted file mode 100644
index b27204b533..0000000000
--- a/pkgs/scheme-lib/scheme/class.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scheme/base
-(require racket/class)
-(provide (except-out (all-from-out racket/class)
-                     printable<%>)
-         (rename-out [writable<%> printable<%>]))
diff --git a/pkgs/scheme-lib/scheme/cmdline.rkt b/pkgs/scheme-lib/scheme/cmdline.rkt
deleted file mode 100644
index ce043b9725..0000000000
--- a/pkgs/scheme-lib/scheme/cmdline.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/cmdline
diff --git a/pkgs/scheme-lib/scheme/contract.rkt b/pkgs/scheme-lib/scheme/contract.rkt
deleted file mode 100644
index 6ea58bc826..0000000000
--- a/pkgs/scheme-lib/scheme/contract.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/contract
diff --git a/pkgs/scheme-lib/scheme/control.rkt b/pkgs/scheme-lib/scheme/control.rkt
deleted file mode 100644
index dbdb25f214..0000000000
--- a/pkgs/scheme-lib/scheme/control.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/control
diff --git a/pkgs/scheme-lib/scheme/date.rkt b/pkgs/scheme-lib/scheme/date.rkt
deleted file mode 100644
index 6bbfcfab83..0000000000
--- a/pkgs/scheme-lib/scheme/date.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/date
diff --git a/pkgs/scheme-lib/scheme/dict.rkt b/pkgs/scheme-lib/scheme/dict.rkt
deleted file mode 100644
index bb4e0490e8..0000000000
--- a/pkgs/scheme-lib/scheme/dict.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/dict
diff --git a/pkgs/scheme-lib/scheme/enter.rkt b/pkgs/scheme-lib/scheme/enter.rkt
deleted file mode 100644
index 68820e4926..0000000000
--- a/pkgs/scheme-lib/scheme/enter.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/enter
diff --git a/pkgs/scheme-lib/scheme/exists/lang.rkt b/pkgs/scheme-lib/scheme/exists/lang.rkt
deleted file mode 100644
index ccd247deb4..0000000000
--- a/pkgs/scheme-lib/scheme/exists/lang.rkt
+++ /dev/null
@@ -1,251 +0,0 @@
-#lang scheme
-
-(require racket/contract/private/exists)
-
-;; this code builds the list of predicates (in case it changes, this may need to be re-run)
-#;
-(define runtime-predicates
-  (let ([fn (build-path (collection-path "scheme")
-                        "compiled" 
-                        "main_rkt.zo")]
-        [ns (make-base-namespace)])
-    (namespace-attach-module (current-namespace) 'scheme ns)
-    (parameterize ([current-namespace ns])
-      (namespace-require 'scheme))
-    (let-values ([(vars stx)
-                  (module-compiled-exports
-                   (parameterize ([read-accept-compiled #t])
-                     (call-with-input-file fn read)))])
-      (sort
-       (filter (λ (sym) 
-                 (let ([str (symbol->string sym)])
-                   (and (regexp-match #rx"[?]$" str)
-                        (not (regexp-match #rx"[=<>][?]$" str))
-                        (procedure-arity-includes? 
-                         (namespace-variable-value sym #t #f ns)
-                         1))))
-               (map car (cdr (assoc 0 vars))))
-       string<=?
-       #:key symbol->string))))
-
-(define-for-syntax predicates
-  '(absolute-path?
-    arity-at-least?
-    blame-original?
-    blame-swapped?
-    blame?
-    boolean?
-    box?
-    byte-pregexp?
-    byte-ready?
-    byte-regexp?
-    byte?
-    bytes-converter?
-    bytes?
-    channel?
-    chaperone-contract-property?
-    chaperone-contract?
-    chaperone?
-    char-alphabetic?
-    char-blank?
-    char-graphic?
-    char-iso-control?
-    char-lower-case?
-    char-numeric?
-    char-punctuation?
-    char-ready?
-    char-symbolic?
-    char-title-case?
-    char-upper-case?
-    char-whitespace?
-    char?
-    class?
-    compiled-expression?
-    compiled-module-expression?
-    complete-path?
-    complex?
-    cons?
-    continuation-mark-set?
-    continuation-prompt-available?
-    continuation-prompt-tag?
-    continuation?
-    contract-property?
-    contract?
-    custodian-box?
-    custodian?
-    custom-print-quotable?
-    custom-write?
-    date-dst?
-    date?
-    directory-exists?
-    double-flonum?
-    empty?
-    eof-object?
-    ephemeron?
-    even?
-    evt?
-    exact-integer?
-    exact-nonnegative-integer?
-    exact-positive-integer?
-    exact?
-    exn:break?
-    exn:fail:contract:arity?
-    exn:fail:contract:blame?
-    exn:fail:contract:continuation?
-    exn:fail:contract:divide-by-zero?
-    exn:fail:contract:non-fixnum-result?
-    exn:fail:contract:variable?
-    exn:fail:contract?
-    exn:fail:filesystem:exists?
-    exn:fail:filesystem:version?
-    exn:fail:filesystem?
-    exn:fail:network?
-    exn:fail:object?
-    exn:fail:out-of-memory?
-    exn:fail:read:eof?
-    exn:fail:read:non-char?
-    exn:fail:read?
-    exn:fail:syntax?
-    exn:fail:unsupported?
-    exn:fail:user?
-    exn:fail?
-    exn:misc:match?
-    exn:srclocs?
-    exn?
-    false?
-    file-exists?
-    file-stream-port?
-    fixnum?
-    flat-contract-property?
-    flat-contract?
-    flonum?
-    generic?
-    handle-evt?
-    has-contract?
-    hash-eq?
-    hash-equal?
-    hash-eqv?
-    hash-placeholder?
-    hash-weak?
-    hash?
-    identifier?
-    immutable?
-    impersonator-property-accessor-procedure?
-    impersonator-property?
-    impersonator?
-    inexact-real?
-    inexact?
-    input-port?
-    inspector?
-    integer?
-    interface?
-    internal-definition-context?
-    keyword?
-    link-exists?
-    list?
-    log-receiver?
-    logger?
-    member-name-key?
-    module-path-index?
-    module-path?
-    mpair?
-    namespace-anchor?
-    namespace?
-    negative?
-    null?
-    number?
-    object?
-    odd?
-    output-port?
-    pair?
-    parameter?
-    parameterization?
-    path-for-some-system?
-    path-string?
-    path?
-    placeholder?
-    port-closed?
-    port-provides-progress-evts?
-    port-writes-atomic?
-    port-writes-special?
-    port?
-    positive?
-    pregexp?
-    pretty-print-style-table?
-    primitive-closure?
-    primitive?
-    procedure-arity?
-    procedure-struct-type?
-    procedure?
-    promise-forced?
-    promise-running?
-    promise?
-    pseudo-random-generator?
-    rational?
-    readtable?
-    real?
-    regexp?
-    relative-path?
-    rename-transformer?
-    resolved-module-path?
-    security-guard?
-    semaphore-try-wait?
-    semaphore?
-    sequence?
-    set!-transformer?
-    single-flonum?
-    special-comment?
-    srcloc?
-    string?
-    struct-accessor-procedure?
-    struct-constructor-procedure?
-    struct-mutator-procedure?
-    struct-predicate-procedure?
-    struct-type-property-accessor-procedure?
-    struct-type-property?
-    struct-type?
-    struct?
-    subprocess?
-    symbol-interned?
-    symbol-unreadable?
-    symbol?
-    syntax-original?
-    syntax?
-    tcp-accept-ready?
-    tcp-listener?
-    tcp-port?
-    terminal-port?
-    thread-cell?
-    thread-dead?
-    thread-group?
-    thread-running?
-    thread?
-    udp-bound?
-    udp-connected?
-    udp?
-    unit?
-    unsupplied-arg?
-    variable-reference?
-    vector?
-    void?
-    weak-box?
-    will-executor?
-    zero?))
-
-(define-syntax (predicates/provide stx)
-  (with-syntax ([(predicates ...) predicates]
-                [(-predicates ...) (map (λ (x) (string->symbol (format "-~a" x))) predicates)])
-    #'(begin
-        (define -predicates
-          (let ([predicates (λ (x) 
-                              (if (∀∃? x)
-                                  (error 'predicates "supplied with a wrapped value ~e" x)
-                                  (predicates x)))])
-            predicates)) 
-        ...
-        (provide (rename-out (-predicates predicates) ...)
-                 (except-out (all-from-out scheme)
-                             define-struct
-                             predicates ...)))))
-
-(predicates/provide)
diff --git a/pkgs/scheme-lib/scheme/exists/lang/reader.rkt b/pkgs/scheme-lib/scheme/exists/lang/reader.rkt
deleted file mode 100644
index fd7afc4460..0000000000
--- a/pkgs/scheme-lib/scheme/exists/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-scheme/exists/lang
diff --git a/pkgs/scheme-lib/scheme/fasl.rkt b/pkgs/scheme-lib/scheme/fasl.rkt
deleted file mode 100644
index 6a982c9584..0000000000
--- a/pkgs/scheme-lib/scheme/fasl.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/fasl
diff --git a/pkgs/scheme-lib/scheme/file.rkt b/pkgs/scheme-lib/scheme/file.rkt
deleted file mode 100644
index aaf46487b5..0000000000
--- a/pkgs/scheme-lib/scheme/file.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/file
diff --git a/pkgs/scheme-lib/scheme/fixnum.rkt b/pkgs/scheme-lib/scheme/fixnum.rkt
deleted file mode 100644
index 58a261c594..0000000000
--- a/pkgs/scheme-lib/scheme/fixnum.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/fixnum
diff --git a/pkgs/scheme-lib/scheme/flonum.rkt b/pkgs/scheme-lib/scheme/flonum.rkt
deleted file mode 100644
index 96aca4f52e..0000000000
--- a/pkgs/scheme-lib/scheme/flonum.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/flonum
diff --git a/pkgs/scheme-lib/scheme/foreign.rkt b/pkgs/scheme-lib/scheme/foreign.rkt
deleted file mode 100644
index 81b8eb70d5..0000000000
--- a/pkgs/scheme-lib/scheme/foreign.rkt
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-
-(define-syntax-rule (provide-except-unsafe (ulib ...) u! id ...)
-  (begin
-    (require ulib ...)
-    (provide (except-out (all-from-out ulib ...) id ...))
-    (define-syntax (u! stx)
-      (syntax-case stx ()
-        [(_) (with-syntax ([lib+ids (datum->syntax stx `((,#'combine-in ulib ...) id ...))])
-               #'(require (only-in . lib+ids)))]))))
-
-(provide-except-unsafe (ffi/unsafe ffi/unsafe/cvector ffi/vector) unsafe!
-                       
- free end-stubborn-change
- ptr-ref ptr-set! cast
- make-sized-byte-string
- memcpy memmove memset
- malloc-immobile-cell free-immobile-cell
- malloc
- ffi-lib
- ffi-obj-ref
- get-ffi-obj
- set-ffi-obj!
- make-c-parameter
- define-c
- define-fun-syntax
- make-cvector*
- cpointer-tag set-cpointer-tag!
- cpointer-has-tag? cpointer-push-tag!
- cblock->list
- cblock->vector)
-
-(provide provide* define-unsafer
-         unsafe!)
-
-;; This module is full of unsafe bindings that are not provided to requiring
-;; modules.  Instead, an `unsafe!' binding is provided that makes these unsafe
-;; bindings available.  The following two syntaxes do that: `provide*' is like
-;; `provide', but using `(unsafe id)' registers an unsafe binding.  Then,
-;; `define-unsafer' should be used with a binding that will expose the unsafe
-;; bindings.  This might move elsewhere at some point if it turns out to be
-;; useful in other contexts.
-(provide provide* define-unsafer)
-(define-syntaxes (provide* define-unsafer)
-  (let ((unsafe-bindings '()))
-    (values
-     (lambda (stx)
-       (syntax-case stx ()
-         [(_ p ...)
-          (let loop ([provides '()]
-                     [unsafes  '()]
-                     [ps (syntax->list #'(p ...))])
-            (if (null? ps)
-              (begin (set! unsafe-bindings
-                           (append unsafe-bindings (reverse unsafes)))
-                     (with-syntax ([(p ...) provides]) #'(provide p ...)))
-              (syntax-case (car ps) (unsafe)
-                [(unsafe u)
-                 (syntax-case #'u (rename-out)
-                   [(rename-out [from to])
-                    (loop provides (cons (cons #'from #'to) unsafes) (cdr ps))]
-                   [id (identifier? #'id)
-                    (loop provides (cons (cons #'id #'id) unsafes) (cdr ps))]
-                   [_
-                    (raise-syntax-error 'provide* "bad unsafe usage"
-                                        (car ps) stx)])]
-                [_ (loop (cons (car ps) provides) unsafes (cdr ps))])))]))
-     (lambda (stx)
-       (syntax-case stx ()
-         [(_ unsafe)
-          (with-syntax ([(from ...)  (map car unsafe-bindings)]
-                        [(to   ...)  (map cdr unsafe-bindings)]
-                        [(id   ...) (generate-temporaries unsafe-bindings)])
-            (set! unsafe-bindings '())
-            #'(begin
-                (provide (protect-out unsafe))
-                (define-syntax (unsafe stx)
-                  (syntax-case stx ()
-                    [(_) (with-syntax ([(id ...) (list (datum->syntax
-                                                        stx 'to stx)
-                                                       ...)])
-                           #'(begin (define-syntax id
-                                      (make-rename-transformer (syntax-property
-                                                                (syntax-property
-                                                                 #'from
-                                                                 'not-provide-all-defined
-                                                                 #t)
-                                                                'nominal-id
-                                                                'to)))
-                                    ...))]))))])))))
diff --git a/pkgs/scheme-lib/scheme/function.rkt b/pkgs/scheme-lib/scheme/function.rkt
deleted file mode 100644
index 65826b61b8..0000000000
--- a/pkgs/scheme-lib/scheme/function.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/function
diff --git a/pkgs/scheme-lib/scheme/future.rkt b/pkgs/scheme-lib/scheme/future.rkt
deleted file mode 100644
index 7ff7325e5f..0000000000
--- a/pkgs/scheme-lib/scheme/future.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/future
diff --git a/pkgs/scheme-lib/scheme/generator.rkt b/pkgs/scheme-lib/scheme/generator.rkt
deleted file mode 100644
index 2e2faee090..0000000000
--- a/pkgs/scheme-lib/scheme/generator.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/generator
diff --git a/pkgs/scheme-lib/scheme/gui/dynamic.rkt b/pkgs/scheme-lib/scheme/gui/dynamic.rkt
deleted file mode 100644
index eb044e1480..0000000000
--- a/pkgs/scheme-lib/scheme/gui/dynamic.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require (only-in racket/gui/dynamic
-                  gui-available?))
-
-(provide gui-available?
-         gui-dynamic-require)
-
-(define (gui-dynamic-require sym)
-  (parameterize ([current-namespace (variable-reference->empty-namespace
-                                     (#%variable-reference))])
-    (if (gui-available?)
-        (dynamic-require 'mred sym)
-        (error "scheme/gui/base is not available"))))
diff --git a/pkgs/scheme-lib/scheme/help.rkt b/pkgs/scheme-lib/scheme/help.rkt
deleted file mode 100644
index b4e17a4a76..0000000000
--- a/pkgs/scheme-lib/scheme/help.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/help
diff --git a/pkgs/scheme-lib/scheme/include.rkt b/pkgs/scheme-lib/scheme/include.rkt
deleted file mode 100644
index 154d7ddb4f..0000000000
--- a/pkgs/scheme-lib/scheme/include.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/include
diff --git a/pkgs/scheme-lib/scheme/info.rkt b/pkgs/scheme-lib/scheme/info.rkt
deleted file mode 100644
index 8c704fdcac..0000000000
--- a/pkgs/scheme-lib/scheme/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '(("match.rkt" samth)))
diff --git a/pkgs/scheme-lib/scheme/init.rkt b/pkgs/scheme-lib/scheme/init.rkt
deleted file mode 100644
index 5625359f81..0000000000
--- a/pkgs/scheme-lib/scheme/init.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scheme
-
-(require "enter.rkt"
-         "help.rkt")
-
-;; Set the printer:
-(current-print (let ([pretty-printer
-                      (lambda (v)
-                        (unless (void? v)
-                          (pretty-print v)))])
-                 pretty-printer))
-
-(provide (all-from-out scheme
-                       "enter.rkt"
-                       "help.rkt"))
diff --git a/pkgs/scheme-lib/scheme/lang/reader.rkt b/pkgs/scheme-lib/scheme/lang/reader.rkt
deleted file mode 100644
index 55aa75e648..0000000000
--- a/pkgs/scheme-lib/scheme/lang/reader.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-;; This module is preserved only for backward compatiblity
-(module reader '#%kernel
-  (#%require (submod scheme reader))
-  (#%provide (all-from (submod scheme reader))))
diff --git a/pkgs/scheme-lib/scheme/language-info.rkt b/pkgs/scheme-lib/scheme/language-info.rkt
deleted file mode 100644
index bbaf009c19..0000000000
--- a/pkgs/scheme-lib/scheme/language-info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-(module language-info racket/base
-
-  (provide get-info)
-  
-  (define (get-info data)
-    (lambda (key default)
-      (case key
-        [(configure-runtime)
-         '(#(scheme/runtime-config configure #f))]
-        [else default]))))
diff --git a/pkgs/scheme-lib/scheme/list.rkt b/pkgs/scheme-lib/scheme/list.rkt
deleted file mode 100644
index 0b334aa833..0000000000
--- a/pkgs/scheme-lib/scheme/list.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/list
diff --git a/pkgs/scheme-lib/scheme/load.rkt b/pkgs/scheme-lib/scheme/load.rkt
deleted file mode 100644
index 609e33150f..0000000000
--- a/pkgs/scheme-lib/scheme/load.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang scheme
-(require syntax/strip-context)
-
-;; FIXME: copied from `racket/load'
-
-(provide (rename-out [module-begin #%module-begin]
-                     [top-interaction #%top-interaction]))
-
-(define-syntax-rule (module-begin form ...)
-  (#%plain-module-begin (top-interaction . (#%top-interaction . form)) ...))
-
-(define-syntax-rule (top-interaction . form)
-  (strip-context-and-eval (quote-syntax form)))
-
-(define-namespace-anchor a)
-(define namespace (namespace-anchor->empty-namespace a))
-(parameterize ([current-namespace namespace])
-  (namespace-require 'scheme))
-
-(define (strip-context-and-eval e)
-  (let ([ns (current-namespace)])
-    (dynamic-wind
-        (lambda ()
-          (current-namespace namespace))
-        (lambda ()
-          (call-with-continuation-prompt
-           (lambda ()
-             (eval-syntax (namespace-syntax-introduce
-                           (strip-context e))))
-           (default-continuation-prompt-tag)
-           (lambda args
-             (apply abort-current-continuation 
-                    (default-continuation-prompt-tag)
-                    args))))
-        (lambda ()
-          (set! namespace (current-namespace))
-          (current-namespace ns)))))
diff --git a/pkgs/scheme-lib/scheme/load/lang/reader.rkt b/pkgs/scheme-lib/scheme/load/lang/reader.rkt
deleted file mode 100644
index 14e2c4126f..0000000000
--- a/pkgs/scheme-lib/scheme/load/lang/reader.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang s-exp syntax/module-reader
-scheme/load
-
-#:language-info '#(scheme/language-info get-info #f)
diff --git a/pkgs/scheme-lib/scheme/local.rkt b/pkgs/scheme-lib/scheme/local.rkt
deleted file mode 100644
index 1078d68b54..0000000000
--- a/pkgs/scheme-lib/scheme/local.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/local
diff --git a/pkgs/scheme-lib/scheme/main.rkt b/pkgs/scheme-lib/scheme/main.rkt
deleted file mode 100644
index 371b1757a2..0000000000
--- a/pkgs/scheme-lib/scheme/main.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang scheme/base
-
-(require scheme/contract
-         scheme/class
-         scheme/unit
-         scheme/dict
-         scheme/include
-         scheme/pretty
-         scheme/math
-         scheme/match
-         scheme/shared
-         scheme/tcp
-         scheme/udp
-         scheme/list
-         scheme/vector
-         scheme/string
-         scheme/function
-         scheme/path
-         scheme/file
-         scheme/port
-         scheme/cmdline
-         scheme/promise
-         scheme/bool
-         scheme/local
-         scheme/nest
-         (for-syntax scheme/base))
-
-(provide (all-from-out scheme/contract
-                       scheme/class
-                       scheme/unit
-                       scheme/dict
-                       scheme/include
-                       scheme/pretty
-                       scheme/math
-                       scheme/match
-                       scheme/shared
-                       scheme/base
-                       scheme/tcp
-                       scheme/udp
-                       scheme/list
-                       scheme/vector
-                       scheme/string
-                       scheme/function
-                       scheme/path
-                       scheme/file
-                       scheme/port
-                       scheme/cmdline
-                       scheme/promise
-                       scheme/bool
-                       scheme/local
-                       scheme/nest)
-         (for-syntax (all-from-out scheme/base)))
-
-(module reader syntax/module-reader
-  scheme)
diff --git a/pkgs/scheme-lib/scheme/match.rkt b/pkgs/scheme-lib/scheme/match.rkt
deleted file mode 100644
index 164a3349e5..0000000000
--- a/pkgs/scheme-lib/scheme/match.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/match
diff --git a/pkgs/scheme-lib/scheme/math.rkt b/pkgs/scheme-lib/scheme/math.rkt
deleted file mode 100644
index a7802130d5..0000000000
--- a/pkgs/scheme-lib/scheme/math.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/math
diff --git a/pkgs/scheme-lib/scheme/nest.rkt b/pkgs/scheme-lib/scheme/nest.rkt
deleted file mode 100644
index 00febe65ae..0000000000
--- a/pkgs/scheme-lib/scheme/nest.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-
-(provide nest)
-
-;; A form that makes it easy to combine many "right-drifting" nested
-;; expressions into a single one, sort of like a generalized version of the `*'
-;; from `let*' and similar forms.
-(define-syntax nest
-  (syntax-rules ()
-    [(nest () body0 body ...)
-     (let () body0 body ...)]
-    ;; this allows putting definitions in the body
-    [(nest ([form forms ...]) body0 body ...)
-     (form forms ... (let () body0 body ...))]
-    [(nest ([form forms ...] . more) body0 body ...)
-     (form forms ... (nest more body0 body ...))]))
-
-;; using this instead will allow splicing body expressions in the last form
-;; whatever it happens to be, which can be (ab)used in strange ways
-#;
-(define-syntax nest
-  (syntax-rules ()
-    [(nest () body ...)
-     (begin body ...)]
-    [(nest ([form forms ...]) body ...)
-     (form forms ... body ...)]
-    [(nest ([form forms ...] . more) body ...)
-     (form forms ... (nest more body ...))]))
diff --git a/pkgs/scheme-lib/scheme/path.rkt b/pkgs/scheme-lib/scheme/path.rkt
deleted file mode 100644
index 6e4662f94c..0000000000
--- a/pkgs/scheme-lib/scheme/path.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/path
diff --git a/pkgs/scheme-lib/scheme/place.rkt b/pkgs/scheme-lib/scheme/place.rkt
deleted file mode 100644
index 4b8b03a5dd..0000000000
--- a/pkgs/scheme-lib/scheme/place.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/place
diff --git a/pkgs/scheme-lib/scheme/port.rkt b/pkgs/scheme-lib/scheme/port.rkt
deleted file mode 100644
index 4291124e20..0000000000
--- a/pkgs/scheme-lib/scheme/port.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/port
diff --git a/pkgs/scheme-lib/scheme/pretty.rkt b/pkgs/scheme-lib/scheme/pretty.rkt
deleted file mode 100644
index e0cdc2ac50..0000000000
--- a/pkgs/scheme-lib/scheme/pretty.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require racket/pretty)
-(provide (except-out (all-from-out racket/pretty)
-                     pretty-print)
-         (rename-out [pretty-write pretty-print]))
diff --git a/pkgs/scheme-lib/scheme/private/namespace.rkt b/pkgs/scheme-lib/scheme/private/namespace.rkt
deleted file mode 100644
index 657fdc329f..0000000000
--- a/pkgs/scheme-lib/scheme/private/namespace.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket/base
-
-(provide make-base-empty-namespace
-         make-base-namespace)
-  
-(define orig-varref (#%variable-reference orig-varref))
-
-(define (make-base-empty-namespace)
-  (let* ([this-ns (variable-reference->empty-namespace orig-varref)]
-         [ns (parameterize ([current-namespace this-ns]) ; ensures correct phase
-               (make-empty-namespace))])
-    (namespace-attach-module this-ns
-                             'scheme/base 
-                             ns)
-    ns))
-
-(define (make-base-namespace)
-  (let ([ns (make-base-empty-namespace)])
-    (parameterize ([current-namespace ns])
-      (namespace-require 'scheme/base))
-    ns))
diff --git a/pkgs/scheme-lib/scheme/private/provider/lang.rkt b/pkgs/scheme-lib/scheme/private/provider/lang.rkt
deleted file mode 100644
index 509fdee928..0000000000
--- a/pkgs/scheme-lib/scheme/private/provider/lang.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(provide (rename-out [module-begin #%module-begin]))
-
-(define-syntax-rule (module-begin mod)
-  (#%plain-module-begin
-   (require mod)
-   (provide (all-from-out mod))))
diff --git a/pkgs/scheme-lib/scheme/private/provider/lang/reader.rkt b/pkgs/scheme-lib/scheme/private/provider/lang/reader.rkt
deleted file mode 100644
index d6be5751f2..0000000000
--- a/pkgs/scheme-lib/scheme/private/provider/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-scheme/private/provider/lang
diff --git a/pkgs/scheme-lib/scheme/promise.rkt b/pkgs/scheme-lib/scheme/promise.rkt
deleted file mode 100644
index 7a87b7a2a6..0000000000
--- a/pkgs/scheme-lib/scheme/promise.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/promise
diff --git a/pkgs/scheme-lib/scheme/provide-syntax.rkt b/pkgs/scheme-lib/scheme/provide-syntax.rkt
deleted file mode 100644
index da9b1342ce..0000000000
--- a/pkgs/scheme-lib/scheme/provide-syntax.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/provide-syntax
diff --git a/pkgs/scheme-lib/scheme/provide-transform.rkt b/pkgs/scheme-lib/scheme/provide-transform.rkt
deleted file mode 100644
index 76d501d927..0000000000
--- a/pkgs/scheme-lib/scheme/provide-transform.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/provide-transform
diff --git a/pkgs/scheme-lib/scheme/provide.rkt b/pkgs/scheme-lib/scheme/provide.rkt
deleted file mode 100644
index 3e29329b94..0000000000
--- a/pkgs/scheme-lib/scheme/provide.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/provide
diff --git a/pkgs/scheme-lib/scheme/require-syntax.rkt b/pkgs/scheme-lib/scheme/require-syntax.rkt
deleted file mode 100644
index 2753a72a67..0000000000
--- a/pkgs/scheme-lib/scheme/require-syntax.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/require-syntax
diff --git a/pkgs/scheme-lib/scheme/require-transform.rkt b/pkgs/scheme-lib/scheme/require-transform.rkt
deleted file mode 100644
index c172cbb51e..0000000000
--- a/pkgs/scheme-lib/scheme/require-transform.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/require-transform
diff --git a/pkgs/scheme-lib/scheme/require.rkt b/pkgs/scheme-lib/scheme/require.rkt
deleted file mode 100644
index 9b258ef21e..0000000000
--- a/pkgs/scheme-lib/scheme/require.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/require
diff --git a/pkgs/scheme-lib/scheme/runtime-config.rkt b/pkgs/scheme-lib/scheme/runtime-config.rkt
deleted file mode 100644
index aef6106c2c..0000000000
--- a/pkgs/scheme-lib/scheme/runtime-config.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-(module runtime-config '#%kernel
-
-  (#%provide configure)
-
-  (define-values (configure)
-    (lambda (config)
-      (print-as-expression #f))))
diff --git a/pkgs/scheme-lib/scheme/runtime-path.rkt b/pkgs/scheme-lib/scheme/runtime-path.rkt
deleted file mode 100644
index 1f37b548fa..0000000000
--- a/pkgs/scheme-lib/scheme/runtime-path.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/runtime-path
diff --git a/pkgs/scheme-lib/scheme/serialize.rkt b/pkgs/scheme-lib/scheme/serialize.rkt
deleted file mode 100644
index 5c356f9d58..0000000000
--- a/pkgs/scheme-lib/scheme/serialize.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/serialize
diff --git a/pkgs/scheme-lib/scheme/set.rkt b/pkgs/scheme-lib/scheme/set.rkt
deleted file mode 100644
index eca23dab4b..0000000000
--- a/pkgs/scheme-lib/scheme/set.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/set
diff --git a/pkgs/scheme-lib/scheme/shared.rkt b/pkgs/scheme-lib/scheme/shared.rkt
deleted file mode 100644
index 9a254e619c..0000000000
--- a/pkgs/scheme-lib/scheme/shared.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/shared
diff --git a/pkgs/scheme-lib/scheme/signature/lang/reader.rkt b/pkgs/scheme-lib/scheme/signature/lang/reader.rkt
deleted file mode 100644
index 363b95d86f..0000000000
--- a/pkgs/scheme-lib/scheme/signature/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-racket/signature/lang
diff --git a/pkgs/scheme-lib/scheme/splicing.rkt b/pkgs/scheme-lib/scheme/splicing.rkt
deleted file mode 100644
index 69baca6211..0000000000
--- a/pkgs/scheme-lib/scheme/splicing.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/splicing
diff --git a/pkgs/scheme-lib/scheme/string.rkt b/pkgs/scheme-lib/scheme/string.rkt
deleted file mode 100644
index d8bce3d1cc..0000000000
--- a/pkgs/scheme-lib/scheme/string.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/string
diff --git a/pkgs/scheme-lib/scheme/struct-info.rkt b/pkgs/scheme-lib/scheme/struct-info.rkt
deleted file mode 100644
index c6400e0862..0000000000
--- a/pkgs/scheme-lib/scheme/struct-info.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/struct-info
diff --git a/pkgs/scheme-lib/scheme/stxparam-exptime.rkt b/pkgs/scheme-lib/scheme/stxparam-exptime.rkt
deleted file mode 100644
index bed9d51c53..0000000000
--- a/pkgs/scheme-lib/scheme/stxparam-exptime.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/stxparam-exptime
diff --git a/pkgs/scheme-lib/scheme/stxparam.rkt b/pkgs/scheme-lib/scheme/stxparam.rkt
deleted file mode 100644
index 922695ec8b..0000000000
--- a/pkgs/scheme-lib/scheme/stxparam.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/stxparam
diff --git a/pkgs/scheme-lib/scheme/surrogate.rkt b/pkgs/scheme-lib/scheme/surrogate.rkt
deleted file mode 100644
index 7f79d42c88..0000000000
--- a/pkgs/scheme-lib/scheme/surrogate.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/surrogate
diff --git a/pkgs/scheme-lib/scheme/system.rkt b/pkgs/scheme-lib/scheme/system.rkt
deleted file mode 100644
index 00eb4e8d5b..0000000000
--- a/pkgs/scheme-lib/scheme/system.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/system
diff --git a/pkgs/scheme-lib/scheme/tcp.rkt b/pkgs/scheme-lib/scheme/tcp.rkt
deleted file mode 100644
index 9a864b8be3..0000000000
--- a/pkgs/scheme-lib/scheme/tcp.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/tcp
diff --git a/pkgs/scheme-lib/scheme/trace.rkt b/pkgs/scheme-lib/scheme/trace.rkt
deleted file mode 100644
index 35b5e34657..0000000000
--- a/pkgs/scheme-lib/scheme/trace.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/trace
diff --git a/pkgs/scheme-lib/scheme/trait.rkt b/pkgs/scheme-lib/scheme/trait.rkt
deleted file mode 100644
index f182a19659..0000000000
--- a/pkgs/scheme-lib/scheme/trait.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/trait
diff --git a/pkgs/scheme-lib/scheme/udp.rkt b/pkgs/scheme-lib/scheme/udp.rkt
deleted file mode 100644
index 499aa40b21..0000000000
--- a/pkgs/scheme-lib/scheme/udp.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/udp
diff --git a/pkgs/scheme-lib/scheme/unit-exptime.rkt b/pkgs/scheme-lib/scheme/unit-exptime.rkt
deleted file mode 100644
index 40c3a1ff7c..0000000000
--- a/pkgs/scheme-lib/scheme/unit-exptime.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/unit-exptime
diff --git a/pkgs/scheme-lib/scheme/unit.rkt b/pkgs/scheme-lib/scheme/unit.rkt
deleted file mode 100644
index f0e3e8ea43..0000000000
--- a/pkgs/scheme-lib/scheme/unit.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-(require (except-in racket/unit struct/ctc)
-         (submod racket/unit compat))
-(provide (all-from-out racket/unit)
-         (rename-out [struct~s struct]
-                     [struct~s/ctc struct/ctc]))
diff --git a/pkgs/scheme-lib/scheme/unit/lang.rkt b/pkgs/scheme-lib/scheme/unit/lang.rkt
deleted file mode 100644
index 2a4a41125a..0000000000
--- a/pkgs/scheme-lib/scheme/unit/lang.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scheme/base
-(require scheme/unit
-         (only-in racket/unit/lang [#%module-begin unit-module-begin]))
-(provide (except-out (all-from-out scheme/base) #%module-begin)
-         (rename-out [unit-module-begin #%module-begin])
-         (all-from-out scheme/unit))
diff --git a/pkgs/scheme-lib/scheme/unit/lang/reader.rkt b/pkgs/scheme-lib/scheme/unit/lang/reader.rkt
deleted file mode 100644
index 2d0a549281..0000000000
--- a/pkgs/scheme-lib/scheme/unit/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-scheme/unit/lang
diff --git a/pkgs/scheme-lib/scheme/unsafe/ops.rkt b/pkgs/scheme-lib/scheme/unsafe/ops.rkt
deleted file mode 100644
index 33af963a7f..0000000000
--- a/pkgs/scheme-lib/scheme/unsafe/ops.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/unsafe/ops
diff --git a/pkgs/scheme-lib/scheme/vector.rkt b/pkgs/scheme-lib/scheme/vector.rkt
deleted file mode 100644
index 4cbf935a38..0000000000
--- a/pkgs/scheme-lib/scheme/vector.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang scheme/private/provider
-racket/vector
diff --git a/pkgs/schemeunit/LICENSE.txt b/pkgs/schemeunit/LICENSE.txt
deleted file mode 100644
index 47f905ac3f..0000000000
--- a/pkgs/schemeunit/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-schemeunit
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/schemeunit/gui.rkt b/pkgs/schemeunit/gui.rkt
deleted file mode 100644
index 49c63ef440..0000000000
--- a/pkgs/schemeunit/gui.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require rackunit/gui)
-(provide (all-from-out rackunit/gui))
diff --git a/pkgs/schemeunit/info.rkt b/pkgs/schemeunit/info.rkt
deleted file mode 100644
index 5d218c5856..0000000000
--- a/pkgs/schemeunit/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection "schemeunit")
-(define deps '("base"
-               "rackunit-lib"
-               "rackunit-gui"))
-
-(define pkg-desc "Legacy SchemeUnit testing framework")
-
-(define pkg-authors '(jay))
diff --git a/pkgs/schemeunit/main.rkt b/pkgs/schemeunit/main.rkt
deleted file mode 100644
index 41d8df5ecb..0000000000
--- a/pkgs/schemeunit/main.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require rackunit)
-(provide (all-from-out rackunit))
diff --git a/pkgs/schemeunit/text-ui.rkt b/pkgs/schemeunit/text-ui.rkt
deleted file mode 100644
index a5743e6c0c..0000000000
--- a/pkgs/schemeunit/text-ui.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require rackunit/text-ui)
-(provide (all-from-out rackunit/text-ui))
diff --git a/pkgs/scribble-pkgs/scribble-doc/LICENSE.txt b/pkgs/scribble-pkgs/scribble-doc/LICENSE.txt
deleted file mode 100644
index 1b82786266..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-scribble-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/scribble-pkgs/scribble-doc/info.rkt b/pkgs/scribble-pkgs/scribble-doc/info.rkt
deleted file mode 100644
index 4fa7d4bef4..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/info.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("racket-index"
-                     "mzscheme-doc"
-                     "net-doc"
-                     "scheme-lib"
-                     "draw-doc"
-                     "gui-doc"
-                     "slideshow-doc"
-                     "pict-doc"
-                     "typed-racket-doc"
-                     "at-exp-lib"
-                     "base"
-                     "compatibility-lib"
-                     "draw-lib"
-                     "pict-lib"
-                     "sandbox-lib"
-                     "slideshow-lib"
-                     "scribble-lib"
-                     "scribble-text-lib"
-                     "racket-doc"))
-(define update-implies '("scribble-lib"))
-
-(define pkg-desc "documentation part of \"scribble\"")
-
-(define pkg-authors '(mflatt eli))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/base.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/base.scrbl
deleted file mode 100644
index 34416efead..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/base.scrbl
+++ /dev/null
@@ -1,776 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual "utils.rkt"
-          (for-syntax racket/base)
-          (for-label setup/main-collects
-          racket/runtime-path))
-
-@(define-syntax def-section-like
-   (syntax-rules ()
-     [(_ id result/c x ...)
-      (defproc (id [#:tag tag (or/c #f string? (listof string?)) #f]
-                   [#:tag-prefix tag-prefix (or/c #f string? module-path?) #f]
-                   [#:style style (or/c style? #f string? symbol? (listof symbol?)) #f]
-                   [pre-content pre-content?] (... ...+))
-        result/c
-        x ...)]))
-
-@(define-syntax def-elem-proc
-   (syntax-rules ()
-     [(_ id x ...)
-      (defproc (id [pre-content pre-content?] (... ...))
-        element?
-        x ...)]))
-@(define-syntax def-style-proc
-   (syntax-rules ()
-     [(_ id)
-      @def-elem-proc[id]{Like @racket[elem], but with style @racket['id].}]))
-
-@title[#:tag "base"]{Base Document Format}
-
-@defmodulelang[scribble/base]{The @racketmodname[scribble/base]
-language provides functions and forms that can be used from code
-written either in Racket or with @elem["@"] expressions. It
-essentially extends @racketmodname[racket/base], except that top-level
-forms within a module using the @racketmodname[scribble/base] language
-are treated as document content (like @racketmodname[scribble/doclang]).
-
-The @racketmodname[scribble/base] name can also be used as a library
-with @racket[require], in which case it provides only the bindings
-defined in this section, and it also does not set the reader or
-set the default rendering format to the Racket manual format.}
-
-Functions provided by this library, such as @racket[title] and
-@racket[italic], might be called from Racket as
-
-@racketblock[
-(title #:tag "how-to" 
-       "How to Design " (italic "Great") " Programs")
-]
-
-They can also be called with @elem["@"] notation as
-
-@verbatim[#:indent 2]|{
-  @title[#:tag "how-to"]{How to Design @italic{Great} Programs}
-}|
-
-Although the procedures are mostly designed to be used from @elem["@"]
-mode, they are easier to document in Racket mode (partly because we
-have @racketmodname[scribble/manual]).
-
-@; ------------------------------------------------------------------------
-
-@section{Document Structure}
-
-@defproc[(title [#:tag tag (or/c #f string? (listof string?)) #f]
-                [#:tag-prefix tag-prefix (or/c #f string? module-path?) #f]
-                [#:style style (or/c style? #f string? symbol? (listof symbol?)) #f]
-                [#:version vers (or/c string? #f) #f]
-                [#:date date (or/c string? #f) #f]
-                [pre-content pre-content?] ...+)
-         title-decl?]{
-
-Generates a @racket[title-decl] to be picked up by @racket[decode] or
-@racket[decode-part].  The @tech{decode}d @racket[pre-content] (i.e.,
-parsed with @racket[decode-content]) supplies the title content. If
-@racket[tag] is @racket[#f], a tag string is generated automatically
-from the content. The tag string is combined with the symbol
-@racket['part] to form the full tag.
-
-The @racket[style] argument can be a style structure, or it can be one
-of the following: a @racket[#f] that corresponds to a ``plain'' style,
-a string that is used as a @tech{style name}, a symbol that is used as
-a @tech{style property}, or a list of symbols to be used as @tech{style properties}.
-For information on styles, see @racket[part]. For example, a style of
-@racket['toc] causes sub-sections to be generated as separate pages in
-multi-page HTML output.
-
-The @racket[tag-prefix] argument is propagated to the generated
-structure (see @secref["tags"]). If @racket[tag-prefix] is a module
-path, it is converted to a string using
-@racket[module-path-prefix->string].
-
-The @racket[vers] argument is propagated to the @racket[title-decl]
-structure. Use @racket[""] as @racket[vers] to suppress version
-rendering in the output.
-
-The @racket[date] argument is propagated to the @racket[title-decl]
-structure via a @racket[document-date] @tech{style property}. Use
-@racket[""] as @racket[date] to suppress date rendering in Latex
-output.
-
-The section title is automatically indexed by
-@racket[decode-part]. For the index key, leading whitespace and a
-leading ``A'', ``An'', or ``The'' (followed by more whitespace) is
-removed.}
-
-
-@def-section-like[section part-start?]{ Like @racket[title], but
- generates a @racket[part-start] of depth @racket[0] to be by
- @racket[decode] or @racket[decode-part].}
-
-@def-section-like[subsection part-start?]{ Like @racket[section], but
- generates a @racket[part-start] of depth @racket[1].}
-
-@def-section-like[subsubsection part-start?]{ Like @racket[section], but
- generates a @racket[part-start] of depth @racket[2].}
-
-@def-section-like[subsubsub*section paragraph?]{ Similar to
- @racket[section], but merely generates a paragraph that looks like an
- unnumbered section heading (for when the nesting gets too deep to
- include in a table of contents).}
-
-@defform[(include-section module-path)]{ Requires @racket[module-path]
- and returns its @racket[doc] export (without making any imports
- visible to the enclosing context). Since this form expands to
- @racket[require], it must be used in a module or top-level context.}
-
-@defproc[(author [auth content?] ...) block?]{
-
-Generates a @racket[paragraph] with style name @racket['author] to
-show the author(s) of a document, where each author is represented by
-@tech{content}. Normally, this function is used after
-@racket[title] for the beginning of a document. See also
-@racket[author+email].}
-
-@defproc[(author+email [author-name content?]
-                       [email string?] 
-                       [#:obfuscate? obfuscate? any/c #f])
-         element?]{
-
-Combines an author name with an e-mail address. If @racket[obfuscate?]
-is true, then the result obscures the e-mail address slightly to avoid
-address-harvesting robots.
-
-Note that @racket[author+email] is not a replacement for
-@racket[author].  The @racket[author+email] function is often used in
-combination with @racket[author].}
-
-@; ------------------------------------------------------------------------
-
-@section{Blocks}
-
-@defproc[(para [#:style style (or/c style? string? symbol? #f) #f] 
-               [pre-content pre-content?] ...) paragraph?]{
-
- Creates a @tech{paragraph} containing the @tech{decode}d
- @racket[pre-content] (i.e., parsed with @racket[decode-paragraph]).
-
- The @racket[style] argument can be a style, @racket[#f] to indicate a
-  ``plain'' style, a string that is used as a @tech{style name}, or a
-  symbol that is used as a @tech{style name}. (Note that
-  @racket[section] and @racket[para] treat symbols differently as
-  @racket[style] arguments.)}
-
-
-@defproc[(nested [#:style style (or/c style? string? symbol? #f) #f] 
-                 [pre-flow pre-flow?] ...) nested-flow?]{
-
- Creates a @tech{nested flow} containing the @tech{decode}d
- @racket[pre-flow] (i.e., parsed with @racket[decode-flow]).
- 
- The @racket[style] argument is handled the same as @racket[para].
- The @racket['inset] and @racket['code-inset] styles cause the nested
- flow to be inset compared to surrounding text, with the latter
- particularly intended for insetting code.}
-
-
-@defproc[(centered [pre-flow pre-flow?] ...) nested-flow?]{
-
-Produces a @tech{nested flow} whose content is centered.}
-
-
-@defproc[(margin-note [pre-flow pre-flow?] ...
-                      [#:left? left? any/c #f])
-         block?]{
-
-Produces a @tech{nested flow} that is typeset in the margin, instead
-of inlined.
-
-If @racket[left?] is true, then the note is shown on the opposite as
-it would normally be shown (which is the left-hand side for HTML
-output). Beware of colliding with output for a table of contents.}
-
-
-@defproc[(margin-note* [pre-content pre-content?] ...
-                       [#:left? left? any/c #f]) 
-         element?]{
-
-Produces an @racket[element] that is typeset in the margin, instead of
-inlined. Unlike @racket[margin-note], @racket[margin-note*] can be
-used in the middle of a paragraph; at the same time, its content is
-constrained to form a single paragraph in the margin.}
-
-
-@defproc[(itemlist [itm items/c] ...
-                   [#:style style (or/c style? string? symbol? #f) #f]) 
-         itemization?]{
-
- Constructs an @racket[itemization] given a sequence of items. Typical
- each @racket[itm] is constructed by @racket[item], but an
- @racket[itm] can be a @tech{block} that is coerced to an
- @racket[item]. Finally, @racket[itm] can be a list or @racket[splice]
- whose elements are spliced (recursively, if necessary) into the
- @racket[itemlist] sequence.
- 
- The @racket[style] argument is handled the same as @racket[para]. The
- @racket['ordered] style numbers items, instead of just using a
- bullet.}
-
-
-@defthing[items/c flat-contract?]{
-
-A contract that is equivalent to the following recursive
-specification:
-
-@racketblock[
- (or/c item? block? (listof items/c) (spliceof items/c))
-]}
-
-
-@defproc[(item [pre-flow pre-flow?] ...) item?]{
-
-Creates an item for use with @racket[itemlist]. The @tech{decode}d
-@racket[pre-flow] (i.e., parsed with @racket[decode-flow]) is the item
-content.}
-
-
-@defproc[(item? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is an item produced by
-@racket[item], @racket[#f] otherwise.}
-
-
-@defproc[(tabular [cells (listof (listof (or/c block? content? 'cont)))]
-                  [#:style style (or/c style? string? symbol? #f) #f]
-                  [#:sep sep (or/c block? content? #f) #f]
-                  [#:column-properties column-properties (listof any/c) '()]
-                  [#:row-properties row-properties (listof any/c) '()]
-                  [#:cell-properties cell-properties (listof (listof any/c)) '()])
-         table?]{
-
-Creates a @tech{table} with the given @racket[cells] content, which is
-supplied as a list of rows, where each row has a list of cells. The
-length of all rows must match.
-
-Use @racket['cont] in @racket[cells] as a cell to continue the content
-of the preceding cell in a row in the space that would otherwise be
-used for a new cell. A @racket['cont] must not appear as the first
-cell in a row.
-
-The @racket[style] argument is handled the same as @racket[para].
-
-If @racket[sep] is not @racket[#f], it is inserted as a new column
-between every column in the table; note that any
-@racket[table-columns] or @racket[table-cells] property in
-@racket[style] must take the added columns into account. Otherwise,
-the default style places no space between table columns.
-
-The @racket[column-properties], @racket[row-properties], and
-@racket[cell-properties] arguments specify @tech{style properties} for
-the columns and cells of a table; see @racket[table-columns] and
-@racket[table-cells] for a description of recognized properties. The
-lists do not contain entries for columns potentially introduced for
-@racket[sep], and when non-empty, they are extended as needed to match
-the table size determined by @racket[cells]:
-
-@itemlist[
-
- @item{If the length of @racket[column-properties] is less than the
-       length of each row in @racket[cells], the last item of the list
-       is duplicated to make the list long enough.}
-
- @item{If the length of @racket[row-properties] is less than the
-       length of @racket[cells], the last item of the list is
-       duplicated to make the list long enough.}
-
- @item{If the length of @racket[cell-properties] is less than the
-        number of rows in @racket[cells], then the last element is
-        duplicated to make the list long enough. Each list within
-        @racket[cell-properties] is treated like a
-        @racket[column-properties] list---expanded as needed to match
-        the number of columns in each row.}
-
-]
-
-Each element of @racket[column-properties] or @racket[row-properties]
-is either a list of @tech{style property} values or a non-list element
-that is wrapped as a list. Similarly, for each list that is an element
-of @racket[cell-properties], the list's non-list elements are wrapped
-as nested lists.
-
-If @racket[column-properties] is non-empty, then its list of property
-lists is converted into a @racket[table-columns] @tech{style property}
-that is added to the style specified by @racket[style]---or merged
-with an existing @racket[table-columns] @tech{style property} that
-matches the column shape of @racket[cells]. In addition, if either
-@racket[row-properties] or @racket[cell-properties] is non-empty, the
-property lists of @racket[column-properties] are merged
-with the property lists of @racket[row-properties] and
-@racket[cell-properties]. If @racket[row-properties] or
-@racket[cell-properties] is non-empty, the merged lists are
-converted into a @racket[table-cells] @tech{style property} that is
-added to the style specified by @racket[style]---or merged with an
-existing @racket[table-cells] @tech{style property} that matches the
-shape of @racket[cells].
-
-@margin-note{If the style lists for @racket[column-properties] are
-both merged with @racket[cell-properties] and converted to
-@racket[table-columns], then @racket[style] will contain some
-redundant information. In that case, @racket[column-attributes]
-properties will be used from @racket[table-columns], while other
-properties will be used from the merger into @racket[table-cells].}
-
-@history[#:changed "1.1" @elem{Added the @racket[#:column-properties],
-                               @racket[#:row-properties],
-                               and @racket[#:cell-properties] arguments.}]
-
-Examples:
-@codeblock[#:keep-lang-line? #f]|{
-#lang scribble/manual
-@tabular[#:sep @hspace[1]
-         (list (list "soup" "gazpacho")
-               (list "soup" "tonjiru"))]
-
-@tabular[#:style 'boxed
-         #:column-properties '(left right)
-         #:row-properties '(bottom-border ())
-         (list (list @bold{recipe}   @bold{vegetable})
-               (list "caldo verde"   "kale")
-               (list "kinpira gobō"  "burdock")
-               (list "makizushi"     'cont))]
-}|
-@doc-render-examples[
-  @tabular[#:sep @hspace[1]
-           (list (list "soup" "gazpacho")
-                 (list "soup" "tonjiru"))]
-
-  @tabular[#:style 'boxed
-           #:column-properties '(left right)
-           #:row-properties '(bottom-border ())
-           (list (list @bold{recipe}   @bold{vegetable})
-                 (list "caldo verde"   "kale")
-                 (list "kinpira gobō"  "burdock")
-                 (list "makizushi"     'cont))]]
-}
-
-@defproc[(verbatim [#:indent indent exact-nonnegative-integer? 0] [elem content?] ...+)
-         block?]{
-
-Typesets string @racket[elem]s in typewriter font with linebreaks
-specified by newline characters in string @racket[elem]s. Consecutive spaces in
-the string @racket[elem]s are converted to @racket[hspace] to ensure that they
-are all preserved in the output. Additional space (via
-@racket[hspace]) as specified by @racket[indent] is added to the
-beginning of each line. A non-string @racket[elem] is treated as
-content within a single line.
-
-The string @racket[elem]s are @emph{not} decoded with @racket[decode-content],
-so @racket[(verbatim "---")] renders with three hyphens instead of an
-em dash. Beware, however, that @emph{reading}
-@litchar["@"]@racket[verbatim] converts @litchar["@"] syntax
-within the argument, and such reading occurs well before
-arguments to @racket[verbatim] are delivered at run-time. To disable simple
-@litchar["@"] notation within the @racket[verbatim] argument,
-@racket[verbatim] is typically used with
-@litchar["|{"]...@litchar["}|"] or similar brackets, like this:
-
-@verbatim[#:indent 2]|{
- @verbatim|{
-   Use @bold{---} like this...
- }|
-}|
-
-which renders as
-
-@verbatim[#:indent 2]|{
-   Use @bold{---} like this...
-}|
-
-while
-
-@verbatim[#:indent 2]||{
- @verbatim|{
-   Use |@bold{---} like this...
- }|
-}||
-
-renders as
-
-@verbatim[#:indent 2]|{
-   Use |@bold{---} like this...
-}|
-
-Even with brackets like @litchar["|{"]...@litchar["}|"], beware that consistent
-leading whitespace is removed by the parser; see
-@secref["alt-body-syntax"] for more information.
-
-See also @racket[literal].}
-
-@; ------------------------------------------------------------------------
-
-@section{Text Styles and Content}
-
-@defproc[(elem [pre-content pre-content?] ...
-               [#:style style (or/c style? string? symbol? #f) #f])
-        element?]{
-
-Wraps the @tech{decode}d @racket[pre-content] as an element with style
-@racket[style].}
-
-
-@def-style-proc[italic]
-@def-style-proc[bold]
-
-@defproc[(tt [pre-content pre-content?] ...) element?]{
-
-Similar to @racket[elem], but the @racket['tt] style is used for
-immediate strings and symbols among the @racket[pre-content]
-arguments.
-
-To apply the @racket['tt] style uniformly to all @racket[pre-content]
-arguments, use @racket[(elem #:style 'tt pre-content ...)], instead.}
-
-@def-style-proc[subscript]
-@def-style-proc[superscript]
-
-@def-elem-proc[smaller]{Like @racket[elem], but with style
-@racket['smaller].  When uses of @racket[smaller] are nested, text
-gets progressively smaller.}
-
-@def-elem-proc[larger]{Like @racket[elem], but with style
-@racket['larger].  When uses of @racket[larger] are nested, text
-gets progressively larger.}
-
-@defproc[(emph [pre-content pre-content?] ...) element?]{
-The same as @racket[italic].}
-
-@defproc[(literal [str string?] ...+) element?]{
-
-Produces an element containing literally @racket[str]s with no
-decoding via @racket[decode-content].
-
-Beware that @litchar["@"] for a @racket[literal] call performs some
-processing before delivering arguments to @racket[literal]. The
-@racket[literal] form can be used with @litchar["|{"]...@litchar["}|"]
-or similar brackets to disable @litchar["@"] notation within the
-@racket[literal] argument, like this:
-
-@verbatim[#:indent 2]|{
- @literal|{@bold{---}}|
-}|
-
-which renders as
-
-@verbatim[#:indent 2]{
-   @literal|{@bold{---}}|
-}
-
-See also @racket[verbatim].}
-
-@; ------------------------------------------------------------------------
-@section[#:tag "images"]{Images}
-
-
-@defproc[(image [path (or/c path-string? (cons/c 'collects (listof bytes?)))]
-                [#:scale scale real? 1.0]
-                [#:suffixes suffixes (listof #rx"^[.]") null]
-                [#:style style (or/c style? string? symbol? #f) #f]
-                [pre-content pre-content?] ...)
-         image-element?]{
-
- Creates an image element from the given path. The @tech{decode}d
- @racket[pre-content] serves as the alternate text for contexts where
- the image cannot be displayed.
-
- If @racket[path] is a relative path, it is relative to the current
- directory, which is set by @exec{raco setup} to
- the directory of the main document file. (In general, however, it's
- more reliable to express relative paths using
- @racket[define-runtime-path].) Instead of a path or string,
- the @racket[path] argument can be a result of
- @racket[path->main-collects-relative].
-
- The @racket[scale] argument sets the images scale relative to its
- default size as determined by the content of @racket[path]. For HTML
- output, the resulting @racket[image-element] is rendered with an
- @tt{img} or @tt{object} (for SVG) tag, and @racket[scale] adjusts the
- @tt{width} and @tt{height} attributes; a class name or other
- attributes in @racket[style] can effectively override that size.
- 
- The strings in @racket[suffixes] are filtered to those supported by
- given renderer, and then the acceptable suffixes are tried in
- order. The HTML renderer supports @racket[".png"],
- @racket[".gif"], and @racket[".svg"], while the Latex renderer supports @racket[".png"],
- @racket[".pdf"], and @racket[".ps"] (but @racket[".ps"] works only
- when converting Latex output to DVI, and @racket[".png"] and
- @racket[".pdf"] work only for converting Latex output to PDF).
- 
- Note that when the @racket[suffixes] list is non-empty, then
- the @racket[path] argument should not have a suffix.
-
- @history[#:changed "1.3" @elem{Added the @racket[#:style] argument.}]}
-
-@; ------------------------------------------------------------------------
-@section[#:tag "spacing"]{Spacing}
-
-@defproc[(linebreak) element?]{
-Produces an element that forces a line break.}
-
-
-@def-elem-proc[nonbreaking]{Like @racket[elem], but line breaks are
-suppressed while rendering the content.}
-
-
-@defproc[(hspace [n exact-nonnegative-integer?]) element?]{
-
-Produces an element containing @racket[n] spaces and style
-@racket['hspace].}
-
-
-@defthing[~ string?]{
-
-A string containing the non-breaking space character,
-which is equivalent to @racket['nbsp] as an element.}
-
-
-@defthing[-~- string?]{
-
-A string containing the non-breaking hyphen character.}
-
-
-@defthing[?- string?]{
-
-A string containing the soft-hyphen character (i.e., a suggestion of
-where to hyphenate a word to break it across lines when rendering).}
-
-
-@defthing[._ element?]{
-
-Generates a period that ends an abbreviation in the middle of a
-sentence, as opposed to a period that ends a sentence (since the
-latter may be typeset with extra space). Use @litchar|{@._}| in a
-document instead of just @litchar{.} for an abbreviation-ending period
-that is preceded by a lowercase letter and followed by a space.
-
-See @racket[.__] for an example.}
-
-
-@defthing[.__ element?]{
-
-Generates a period that ends a sentence (which may be typeset with
-extra space), as opposed to a period that ends an abbreviation in the
-middle of a sentence. Use @litchar|{@.__}| in a document instead of just
-@litchar{.} for a sentence-ending period that is preceded by an
-uppercase letter.
-
-The following example illustrates both @racket[._] and @racket[.__]:
-
-@codeblock|{
- #lang scribble/base
- My name is Mr@._ T@.__ I pity the fool who can't typeset punctuation.
-}|}
-
-
-@; ------------------------------------------------------------------------
-@section[#:tag "base-links"]{Links}
-
-@defproc[(hyperlink [url string?] [pre-content pre-content?] ...
-                    [#:underline? underline? any/c #t]
-                    [#:style style (or/c style? string? symbol? #f) (if underline? #f "plainlink")]) 
-         element?]{
-
-The @tech{decode}d @racket[pre-content] is hyperlinked to
-@racket[url].  If @racket[style] is not supplied, then
-@racket[underline?] determines how the link is rendered.}
-
-
-@defproc[(url [dest string?]) element?]{
-
-Generates a literal hyperlinked URL.}
-
-
-@defproc[(secref [tag string?]
-                 [#:doc module-path (or/c module-path? #f) #f]
-                 [#:tag-prefixes prefixes (or/c (listof string?) #f) #f]
-                 [#:underline? underline? any/c #t])
-         element?]{
-
-Inserts a reference to the section tagged @racket[tag].
-
-If @racket[#:doc module-path] is provided, the @racket[tag] refers to
-a tag with a prefix determined by @racket[module-path]. When
-@exec{setup-plt} renders documentation, it automatically adds a tag
-prefix to the document based on the source module. Thus, for example,
-to refer to a section of the Racket reference,
-@racket[module-path] would be @racket['(lib
-"scribblings/reference/reference.scrbl")].
-
-The @racket[#:tag-prefixes prefixes] argument similarly supports
-selecting a particular section as determined by a path of tag
-prefixes. When a @racket[#:doc] argument is provided, then
-@racket[prefixes] should trace a path of tag-prefixed subsections to
-reach the @racket[tag] section. When @racket[#:doc] is not provided,
-the @racket[prefixes] path is relative to any enclosing section (i.e.,
-the youngest ancestor that produces a match).
-
-For HTML output, the generated reference is the hyperlinked title of
-the elements in the section's title content, except that elements with
-the @racket['aux] @tech{style property} are omitted in the hyperlink
-label. If @racket[underline?] is @racket[#f], then the hyperlink is
-rendered in HTML without an underline.
-
-For Latex output, the generated reference's format depends on the
-document style. By default, only the section number is shown in the
-reference, but the @racketmodname[scribble/manual] style shows the
-title after the section number. Customize the output (see
-@secref["config"]) by redefining the @ltx{BookRef}, @|etc|, macros (see
-@secref["builtin-latex"]).
-
-In Racket documentation that is rendered to HTML, clicking on a
-section title normally shows the @racket[secref] call that is needed
-to link to the section.}
-
-
-@defproc[(Secref [tag string?]
-                 [#:doc module-path (or/c module-path? #f) #f]
-                 [#:tag-prefixes prefixes (or/c (listof string?) #f) #f]
-                 [#:underline? underline? any/c #t])
-         element?]{
-
-Like @racket[secref], but if the rendered form of the reference starts
-with a word (e.g., ``section''), then the word is capitalized.}
-
-
-@defproc[(seclink [tag string?] 
-                  [#:doc module-path (or/c module-path? #f) #f]
-                  [#:tag-prefixes prefixes (or/c (listof string?) #f) #f]
-                  [#:underline? underline? any/c #t]
-                  [#:indirect? indirect? any/c #f]
-                  [pre-content pre-content?] ...) element?]{
-
-Like @racket[secref], but the link label is the @tech{decode}d
-@racket[pre-content] instead of the target section's name.
-
-In addition to @racket[secref]'s arguments, @racket[seclink] supports
-a @racket[indirect?] argument. When @racket[indirect?] is true, then
-the section hyperlink's resolution in HTML is potentially delayed; see
-@racket['indirect-link] for @racket[link-element].}
-
-
-@defproc[(other-doc [module-path module-path?]
-                    [#:underline? underline? any/c #t]
-                    [#:indirect indirect (or/c #f content?) #f])
-         element?]{
-
-Like @racket[secref] for the document's implicit @racket["top"]
-tag. Use this function to refer to a whole manual instead of
-@racket[secref], in case a special style in the future is used for
-manual titles.
-
-If @racket[indirect] is not @racket[#f], then the link's resolution in
-HTML can be delayed, like @racket[seclink] with @racket[#:indirect?
-#t].  The @racket[indirect] content is prefixed with ``the'' and
-suffixed with ``documentation'' to generate the rendered text of the
-link.}
-
-
-@defproc[(elemtag [t (or/c tag? string?)] [pre-content pre-content?] ...) element?]{
-
-The tag @racket[t] refers to the content form of
-@racket[pre-content].}
-
-
-@defproc[(elemref [t (or/c tag? string?)] [pre-content pre-content?] ... 
-                  [#:underline? underline? any/c #t]) element?]{
-
-The @tech{decode}d @racket[pre-content] is hyperlinked to @racket[t],
-which is normally defined using @racket[elemtag].}
-
-@; ------------------------------------------------------------------------
-
-@section[#:tag "base-indexing"]{Indexing}
-
-@defproc[(index [words (or/c string? (listof string?))]
-                [pre-content pre-content?] ...)
-         index-element?]{
-
-Creates an index element given a plain-text string---or list of
-strings for a hierarchy, such as @racket['("strings" "plain")] for a
-``plain'' entry below a more general ``strings'' entry. As index keys,
-the strings are ``cleaned'' using @racket[clean-up-index-strings]. The
-strings (without clean-up) also serve as the text to render in the
-index. The @tech{decode}d @racket[pre-content] is the text to appear
-inline as the index target.
-
-Use @racket[index] when an index entry should point to a specific word
-or phrase within the typeset document (i.e., the
-@racket[pre-content]). Use @racket[section-index], instead, to create
-an index entry that leads to a section, instead of a specific word or
-phrase within the section.}
-
-
-@defproc[(index* [words (listof string?)]
-                 [word-contents (listof list?)]
-                 [pre-content pre-content?] ...)
-         index-element?]{
-Like @racket[index], except that @racket[words] must be a list, and
-the list of contents render in the index (in parallel to
-@racket[words]) is supplied as @racket[word-contents].
-}
-
-@defproc[(as-index [pre-content pre-content?] ...)
-         index-element?]{
-
-Like @racket[index], but the word to index is determined by applying
-@racket[content->string] on the @tech{decode}d @racket[pre-content].}
-
-
-@defproc[(section-index [word string?] ...)
-         part-index-decl?]{
-
-Creates a @racket[part-index-decl] to be associated with the enclosing
-section by @racket[decode]. The @racket[word]s serve as both the keys
-and as the rendered forms of the keys within the index.}
-
-
-@defproc[(index-section [#:tag tag (or/c #f string?) "doc-index"])
-         part?]{
-
-Produces a part that shows the index the enclosing document. The
-optional @racket[tag] argument is used as the index section's tag.}
-
-
-@; ------------------------------------------------------------------------
-
-@section{Tables of Contents}
-
-@defproc[(table-of-contents) delayed-block?]{
-
-Returns a delayed flow element that expands to a table of contents for
-the enclosing section. For Latex output, however, the table of
-contents currently spans the entire enclosing document.}
-
-
-@defproc[(local-table-of-contents [#:style style (or/c symbol? #f) #f])
-         delayed-block?]{
-
-Returns a delayed flow element that may expand to a table of contents
-for the enclosing section, depending on the output type. For
-multi-page HTML output, the flow element is a table of contents; for
-Latex output, the flow element is empty.
-
-The meaning of the @racket[style] argument depends on the output type,
-but @racket['immediate-only] normally creates a table of contents that
-contains only immediate sub-sections of the enclosing section. See
-also the @racket['quiet] style of @racket[part] (i.e., in a
-@racket[part] structure, not supplied as the @racket[style] argument
-to @racket[local-table-of-contents]), which normally suppresses
-sub-part entries in a table of contents.}
-
-@; ------------------------------------------------------------------------
-
-@section{Tags}
-
-The exports of @racketmodname[scribble/tag] are all re-exported by
-@racketmodname[scribble/base].
-
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/basic.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/basic.scrbl
deleted file mode 100644
index 1fffc26897..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/basic.scrbl
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt" (for-label (only-in scribble/basic span-class)))
-
-@(define (compat)
-   @italic{For backward compatibility.})
-
-@title[#:tag "basic"]{Compatibility Basic Functions}
-
-@defmodule[scribble/basic]{The @racketmodname[scribble/basic]
-compatibility library mostly just re-exports
-@racketmodname[scribble/base].}
-
-@defproc[(span-class [style-name string?] [pre-content any/c] ...)
-         element?]{
-
-@compat[] Wraps the @tech{decode}d
-@racket[pre-content] as an element with style @racket[style-name].}
-
-
-
-@defproc[(itemize [itm (or/c whitespace? an-item?)] ...
-                  [#:style style (or/c style? string? symbol? #f) #f]) 
-         itemization?]{
-
-@compat[] Like @racket[itemlist], but whitespace strings among the
-@racket[itm]s are ignored.}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/blueboxes.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/blueboxes.scrbl
deleted file mode 100644
index 3962351168..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/blueboxes.scrbl
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual "utils.rkt"
-          (for-label scribble/core
-                     scribble/blueboxes
-                     racket/contract))
-
-@title[#:tag "blueboxes"]{Blue Boxes Utilities}
-
-@defmodule[scribble/blueboxes]{
-  The @racketmodname[scribble/blueboxes] provides access
-  to the content of the ``blue boxes'' that describe
-  some module's export (but without any styling).}
-
-@defproc[(fetch-blueboxes-strs [tag tag?]
-                               [#:blueboxes-cache blueboxes-cache
-                                                  blueboxes-cache?
-                                                  (make-blueboxes-cache)])
-         (or/c #f (non-empty-listof string?))]{
-  Returns a list of strings that show the content of the blue box
-  (without any styling information) for the documentation referenced
-  by @racket[tag].
-  
-  The first string in the list describes the export (e.g. @racket["procedure"]
-  when @racket[defproc] is used, or @racket["syntax"] when @racket[defform]
-  was used to document the export).
-}
-
-@defproc[(make-blueboxes-cache [populate? boolean?]) blueboxes-cache?]{
-  Constructs a new (mutable) blueboxes cache. 
-  
-  If @racket[populate?] is @racket[#f], the cache is initially
-  unpopulated, in which case it is filled in the first time the cache
-  is passed to @racket[fetch-bluebxoes-strs]. Otherwise, the cache is
-  initially populated.
-}
-
-@defproc[(blueboxes-cache? [v any/c]) boolean?]{
-  Determines if @racket[v] is a blueboxes cache.                                                
-}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/bnf.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/bnf.scrbl
deleted file mode 100644
index f1d51414a5..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/bnf.scrbl
+++ /dev/null
@@ -1,97 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual "utils.rkt" scribble/bnf
-          (for-label scribble/bnf))
-
-@title[#:tag "bnf"]{BNF Grammars}
-
-@defmodule[scribble/bnf]{The @racket[scribble/bnf] library
-provides utilities for typesetting grammars.}
-
-For example,
-
-@verbatim[#:indent 2]|{
-@(let ([open @litchar{(}]
-       [close @litchar{)}])
-   @BNF[(list @nonterm{expr}
-              @nonterm{id}
-              @BNF-seq[open @kleeneplus[@nonterm{expr}] close]
-              @BNF-seq[open @litchar{lambda}
-                        open @kleenestar[@nonterm{id}] close
-                        @nonterm{expr} close]
-              @nonterm{val})
-        (list @nonterm{val} 
-              @BNF-alt[@nonterm{number} @nonterm{primop}])
-        (list @nonterm{id}
-              @elem{any name except for @litchar{lambda}})])
-}|
-
-produces the output
-
-@(let ([open @litchar{(}]
-       [close @litchar{)}])
-   @BNF[(list @nonterm{expr}
-              @nonterm{id}
-              @BNF-seq[open @kleeneplus[@nonterm{expr}] close]
-              @BNF-seq[open @litchar{lambda}
-                        open @kleenestar[@nonterm{id}] close
-                        @nonterm{expr} close]
-            @nonterm{val})
-      (list @nonterm{val} 
-            @BNF-alt[@nonterm{number} @nonterm{primop}])
-        (list @nonterm{id}
-              @elem{any name except for @litchar{lambda}})])
-
-See also @racket[racketgrammar].
-
-@defproc[(BNF [prod (cons element? (listof (or/c block? element?)))] ...) table?]{
-
-Typesets a grammar table. Each production starts with an element
-(typically constructed with @racket[nonterm]) for the non-terminal
-being defined, and then a list of possibilities (typically constructed
-with @racket[BNF-seq], etc.) to show on separate lines.}
-
-@defproc[(nonterm (pre-content any/c) ...) element?]{
-
-Typesets a non-terminal: italic in angle brackets.}
-
-@defproc[(BNF-seq [elem element?] ...) element?]{
-
-Typesets a sequence.}
-
-@defproc[(BNF-seq-lines [elems (listof element?)] ...) block?]{
-
-Typesets a sequence that is broken into multiple lines, where each
-@racket[elems] is one line.}
-
-@defproc[(BNF-group [pre-content any/c] ...) element?]{
-
-Typesets a group surrounded by curly braces (so the entire group can
-be repeated, for example).}
-
-@defproc[(optional [pre-content any/c] ...) element?]{
-
-Typesets an optional element: in square brackets.}
-
-@defproc[(kleenestar [pre-content any/c] ...) element?]{
-
-Typesets a 0-or-more repetition.}
-
-@defproc[(kleeneplus [pre-content any/c] ...) element?]{
-
-Typesets a 1-or-more repetition.}
-
-@defproc[(kleenerange [n any/c] [m any/c] [pre-content any/c] ...) element?]{
-
-Typesets a @racket[n]-to-@racket[m] repetition. The @racket[n] and
-@racket[m] arguments are converted to a string using @racket[(format
-"~a" n)] and @racket[(format "~a" m)].}
-
-@defproc[(BNF-alt [elem element?] ...) element?]{
-
-Typesets alternatives for a production's right-hand side to appear on
-a single line. The result is normally used as a single possibility in
-a production list for @racket[BNF].}
-
-@defthing[BNF-etc string?]{
-
-A string to use for omitted productions or content.}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/book.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/book.scrbl
deleted file mode 100644
index 34a768a1bd..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/book.scrbl
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt")
-
-@title{Book Format}
-
-@defmodulelang[scribble/book]{The @racketmodname[scribble/book]
-language is like @racketmodname[scribble/base], but configured with
-Latex style defaults to use the standard @tt{book} class. Top-level
-sections are rendered as Latex chapters.}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/class-diagrams.rkt b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/class-diagrams.rkt
deleted file mode 100644
index f474bda221..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/class-diagrams.rkt
+++ /dev/null
@@ -1,514 +0,0 @@
-#lang racket/base
-(require (prefix-in etc: mzlib/etc)
-         texpict/mrpict
-         (only-in pict pin-line pin-arrow-line)
-         (except-in texpict/utils pin-line pin-arrow-line)
-         racket/class
-         racket/runtime-path
-         racket/draw
-         racket/contract
-         (only-in racket/list last))
-
-(define the-font-size 12)
-(define prim-font-family 'swiss)
-;; Was 'modern, but we want font smoothing even for small text:
-(define font-family (make-object font% the-font-size 'modern 'normal 'normal #f 'smoothed))
-
-(define prim-types '("int" "String" "float" "double" "boolean"))
-
-;; how far a dot is to the right of a class
-(define dot-edge-spacing 10)
-
-(define field-arrowhead-size 10)
-
-(define hierarchy-color "navy")
-(define type-link-color "firebrick")
-
-#|
-(define font-family "Palatino")
-(define-runtime-path afm "afm")
-(current-ps-afm-file-paths (cons afm (current-ps-afm-file-paths)))
-
-(let ([id (send the-font-name-directory find-or-create-font-id font-family 'default)])
-  (send the-font-name-directory set-post-script-name 
-        id 'normal 'normal "Palatino-Roman")
-  (send the-font-name-directory set-post-script-name 
-        id 'bold 'normal "Palatino-Bold")
-  (send the-font-name-directory set-post-script-name 
-        id 'normal 'italic "Palatino-Italic"))
-|#
-
-(define (user-type-font x) (text x font-family the-font-size))
-(define (prim-type-font x) (text x  prim-font-family the-font-size))
-(define (var-font x) (text x `(bold . ,font-family) the-font-size))
-(define (field-name-font x) (text x font-family the-font-size))
-(define (comment-font x) (text x font-family the-font-size))
-(define (normal-font x) (text x font-family the-font-size))
-(define (java-this) (text "this" `(bold . ,font-family) the-font-size))
-
-;; field-spec : string string -> pict
-(define (field-spec type fd #:default [default #f] [comment #f])
-  (let ([code-line
-         (hbl-append (if type 
-                         (hbl-append (type-spec type)
-                                     (normal-font " "))
-                         (blank))
-                     (field-name-font fd)
-                     (if default
-                         (hbl-append (normal-font " = ")
-                                     (normal-font default))
-                         (blank))
-                     #;
-                     (normal-font ";"))])
-    (if comment
-        (hbl-append code-line 
-                    (normal-font " ")
-                    (comment-font (format "[in ~a]" comment)))
-        code-line)))
-
-(define (method-spec range name #:body [body #f] . args)
-  (unless (even? (length args))
-    (error 'method-spec "expected a list of types and argument names, but found ~a arguments"
-           (length args)))
-  (let ([first-line
-         (hbl-append
-          (type-spec range)
-          (normal-font " ")
-          (var-font name)
-          (cond
-            [(null? args)
-             (normal-font "()")]
-            [else
-             (hbl-append
-              (normal-font "(")
-              (let loop ([args args])
-                (let* ([type (car args)]
-                       [param (cadr args)]
-                       [single-arg 
-                        (if param 
-                            (hbl-append (type-spec type)
-                                        (normal-font " ")
-                                        (var-font param))
-                            (type-spec type))])
-                  
-                  (cond
-                    [(null? (cddr args))
-                     (hbl-append single-arg (normal-font ")"))]
-                    [else
-                     (hbl-append single-arg
-                                 (normal-font ", ")
-                                 (loop (cddr args)))]))))])
-          (if body
-              (hbl-append (normal-font " {"))
-              (blank)))])
-    (if body
-        (vl-append first-line
-                   (hbl-append (blank 8 0) body (normal-font "}")))
-        first-line)))
-             
-(define (type-spec str)
-  (cond
-    [(member str prim-types) (prim-type-font str)]
-    [else (user-type-font str)]))
-
-;; class-name : string -> pict
-(define (class-name txt #:spacing-word [spacing-word txt]) 
-  (define p (colorize (lt-superimpose (ghost (var-font spacing-word))
-                                      (apply vl-append (map var-font (regexp-split #rx"\n" txt))))
-                      "white"))
-  (refocus (cc-superimpose (colorize (filled-rectangle (+ class-box-margin class-box-margin (pict-width p))
-                                                       (+ class-box-margin class-box-margin (pict-height p)))
-                                     "black")
-                           p)
-           p))
-
-(define class-box-margin 4)
-
-;; class-box : pict (or/c #f (listof pict)) (or/c #f (listof pict)) -> pict
-(define (class-box name fields methods)
-  (let* ([mk-blank (λ () (blank 0 (+ class-box-margin class-box-margin)))])
-    (cond
-      [(and methods fields)
-       (let* ([top-spacer (mk-blank)]
-              [bottom-spacer (mk-blank)]
-              [main (vl-append name 
-                               top-spacer
-                               (if (null? fields)
-                                   (blank 0 4)
-                                   (apply vl-append fields))
-                               bottom-spacer
-                               (if (null? methods)
-                                   (blank 0 4)
-                                   (apply vl-append methods)))])
-         (add-hline
-          (add-hline (frame (inset main class-box-margin))
-                     top-spacer)
-          bottom-spacer))]
-      [fields
-       (let* ([top-spacer (mk-blank)]
-              [main (vl-append name 
-                               top-spacer
-                               (if (null? fields)
-                                   (blank)
-                                   (apply vl-append fields)))])
-         (add-hline (frame (inset main class-box-margin))
-                    top-spacer))]
-      [methods (class-box name methods fields)]
-      [else (frame (inset name class-box-margin))])))
-
-(define (add-hline main sub)
-  (let-values ([(x y) (cc-find main sub)])
-    (pin-line main
-              sub (λ (p1 p2) (values 0 y))
-              sub (λ (p1 p2) (values (pict-width main) y)))))
-
-;; hierarchy : pict (cons pict (listof pict)) (cons pict (listof pict)) -> pict
-(define (hierarchy main supers subs)
-  (let ([supers-bottoms (apply max (map (λ (x) (let-values ([(x y) (cb-find main x)]) y)) supers))]
-        [subs-tops (apply min (map (λ (x) (let-values ([(x y) (ct-find main x)]) y)) subs))]
-        [sorted-subs (sort subs (λ (x y) (< (left-edge-x main x) (left-edge-x main y))))])
-    (unless (< supers-bottoms subs-tops)
-      (error 'hierarchy "expected supers to be on top of subs, supers bottom is at ~a, and subs tops is at ~a"
-             supers-bottoms
-             subs-tops))
-    (let* ([main-line-y (max (- subs-tops 20) (/ (+ supers-bottoms subs-tops) 2))]
-           [main-line-start-x (center-x  main (car sorted-subs))]
-           [main-line-end-x (center-x main (last sorted-subs))]
-           [w/main-line
-            (pin-line main
-                      main (λ (_1 _2) (values main-line-start-x main-line-y))
-                      main (λ (_1 _2) (values main-line-end-x main-line-y))
-                      #:color hierarchy-color)]
-           [super-lines
-            (map (λ (super) 
-                   (let-values ([(x y) (cb-find main super)])
-                     (pin-over 
-                      (pin-line (ghost main)
-                                super cb-find
-                                main (λ (_1 _2) (values x main-line-y)))
-                      (- x (/ (pict-width triangle) 2))
-                      (- (/ (+ y main-line-y) 2)
-                         (/ (pict-height triangle) 2))
-                      triangle)))
-                 supers)]
-           [sub-lines
-            (map (λ (sub) 
-                   (let-values ([(x y) (ct-find main sub)])
-                     (pin-line (ghost main)
-                               sub ct-find
-                               main (λ (_1 _2) (values x main-line-y))
-                               #:color hierarchy-color)))
-                 subs)])
-      (apply cc-superimpose 
-             w/main-line
-             (append sub-lines
-                     super-lines)))))
-
-(define triangle-width 12)
-(define triangle-height 12)
-(define triangle
-  (let ([points (list (make-object point% (/ triangle-width 2) 0)
-                      (make-object point% 0 triangle-height)
-                      (make-object point% triangle-width triangle-height))])
-    (colorize 
-     (dc (λ (dc dx dy)
-           (let ([brush (send dc get-brush)])
-             (send dc set-brush (send brush get-color) 'solid)
-             (send dc draw-polygon points dx dy)
-             (send dc set-brush brush)))
-         triangle-width
-         triangle-height)
-     hierarchy-color)))
-
-(define (center-x main pict)
-  (let-values ([(x y) (cc-find main pict)])
-    x))
-
-(define (left-edge-x main pict)
-  (let-values ([(x y) (lc-find main pict)])
-    x))
-
-
-(define (add-dot-right main class field) (add-dot-left-right/offset main class field 0 rc-find))
-(define add-dot-right/space 
-  (λ (main class field [count 1])
-    (add-dot-right/offset main class field (* count dot-edge-spacing))))
-(define (add-dot-right/offset main class field offset)
-  (add-dot-left-right/offset main class field offset rc-find))
-
-(define (add-dot-left main class field) (add-dot-left-right/offset main class field 0 lc-find))
-(define add-dot-left/space
-  (λ (main class field [count 1])
-    (add-dot-left/offset main class field (* count (- dot-edge-spacing)))))
-(define (add-dot-left/offset main class field offset)
-  (add-dot-left-right/offset main class field offset lc-find))
-
-(define (add-dot-left-right/offset main class field offset finder)
-  (let-values ([(_1 y) (cc-find main field)]
-               [(x-edge _2) (finder main class)])
-    (add-dot main (+ x-edge offset) y)))
-
-(define add-dot-junction
-  (case-lambda
-    [(main x-pict y-pict) (add-dot-junction main x-pict cc-find y-pict cc-find)]
-    [(main x-pict x-find y-pict y-find)
-     (let-values ([(x _1) (x-find main x-pict)]
-                  [(_2 y) (y-find main y-pict)])
-       (add-dot main x y))]))
-
-(define (add-dot-offset pict dot dx dy)
-  (let-values ([(x y) (cc-find pict dot)])
-    (add-dot pict (+ x dx) (+ y dy))))
-
-(define dot-δx (make-parameter 0))
-(define dot-δy (make-parameter 0))
-
-(define (add-dot pict dx dy)
-  (let ([dot (blank)])
-    (values (pin-over pict 
-                      (+ dx (dot-δx))
-                      (+ dy (dot-δy))
-                      dot)
-            dot)))
-
-(define (connect-dots show-arrowhead? main dot1 . dots)
-  (let loop ([prev-dot dot1]
-             [dots dots]
-             [pict main])
-    (cond
-      [(null? dots) pict]
-      [else 
-       (loop (car dots) 
-             (cdr dots)
-             (connect-two-dots pict prev-dot (car dots) (null? (cdr dots)) show-arrowhead?))])))
-
-(define (connect-two-dots pict dot1 dot2 arrowhead? show-arrowhead?)
-  (if arrowhead?
-      (pin-arrow-line field-arrowhead-size pict
-                      dot1 cc-find
-                      dot2 cc-find
-                      #:hide-arrowhead? (not show-arrowhead?)
-                      #:color type-link-color)
-      (pin-line pict
-                dot1 cc-find
-                dot2 cc-find
-                #:color type-link-color)))
-
-(define (hierarchy/layout tops bottoms 
-                          #:every-other-space [every-other-space 0]
-                          #:top-space [top-space 40]
-                          #:bottom-space [bottom-space 40]
-                          #:vertical-space [vertical-space 60])
-  (hierarchy 
-   (vc-append (apply ht-append top-space tops)
-              (blank 0 vertical-space)
-              (apply ht-append bottom-space 
-                     (let loop ([bottoms bottoms]
-                                [every-other? #f])
-                       (cond
-                         [(null? bottoms) '()]
-                         [else
-                          (cons (if every-other?
-                                    (vc-append (blank 0 every-other-space)
-                                               (car bottoms))
-                                    (car bottoms))
-                                (loop (cdr bottoms)
-                                      (not every-other?)))]))))
-   tops
-   bottoms))
-
-(define (add-dot-delta f dx dy)
-  (parameterize ([dot-δx dx]
-                 [dot-δy dy])
-    (f)))
-
-
-(define (right-right-reference main0 start-class start-field finish-class finish-name
-                               [count 1] 
-                               #:connect-dots [connect-dots connect-dots]
-                               #:dot-delta [dot-delta 0])
-  (let ([going-down? (let-values ([(_1 start-y) (find-cc main0 start-field)]
-                                  [(_2 finish-y) (find-cc main0 finish-name)])
-                       (< start-y finish-y))])
-    (define-values (main1 dot1) (add-dot-delta (λ () (add-dot-right main0 start-class start-field))
-                                               0
-                                               (if going-down? 
-                                                   dot-delta
-                                                   (- dot-delta))))
-    (define-values (main2 dot2) (add-dot-delta (λ () (add-dot-right/space main1 start-class start-field count))
-                                               dot-delta
-                                               (if going-down? 
-                                                   dot-delta
-                                                   (- dot-delta))))
-    (define-values (main3 dot3) (add-dot-delta (λ () (add-dot-right main2 finish-class finish-name))
-                                               0
-                                               (if going-down? 
-                                                   (- dot-delta)
-                                                   dot-delta)))
-    (define-values (main4 dot4) (add-dot-delta (λ () (add-dot-junction main3 dot2 dot3))
-                                               0
-                                               0))
-    
-    ;; these last two dots are just there for the delta-less arrowhead
-    (define-values (main5 dot5) (add-dot-right main4 finish-class finish-name))
-    (define-values (main6 dot6) (add-dot-delta (λ () (add-dot-right main5 finish-class finish-name))
-                                               1 ;; just enough to get the arrowhead going the right direction; not enough to see the line
-                                               0))
-    
-    (connect-dots
-     #t
-     (connect-dots #f main6 dot1 dot2 dot4 dot3)
-     dot6 
-     dot5)))
-
-(define left-left-reference
-  (λ (main0 start-class start-field finish-class finish-name [count 1] 
-            #:connect-dots [connect-dots connect-dots]
-            #:dot-delta [dot-delta 0])
-    (let ([going-down? (let-values ([(_1 start-y) (find-cc main0 start-field)]
-                                    [(_2 finish-y) (find-cc main0 finish-name)])
-                         (< start-y finish-y))])
-      (define-values (main1 dot1) (add-dot-delta (λ () (add-dot-left main0 start-class start-field))
-                                                 0
-                                                 (if going-down?
-                                                     dot-delta
-                                                     (- dot-delta))))
-      (define-values (main2 dot2) (add-dot-delta (λ () (add-dot-left/space main1 start-class start-field count))
-                                                 (- dot-delta)
-                                                 (if going-down?
-                                                     dot-delta
-                                                     (- dot-delta))))
-      (define-values (main3 dot3) (add-dot-delta (λ () (add-dot-left main2 finish-class finish-name))
-                                                 0
-                                                 (if going-down?
-                                                     (- dot-delta)
-                                                     dot-delta)))
-      (define-values (main4 dot4) (add-dot-delta (λ () (add-dot-junction main3 dot2 dot3))
-                                                 0
-                                                 0))
-      (define-values (main5 dot5) (add-dot-left main4 finish-class finish-name))
-      (define-values (main6 dot6) (add-dot-delta (λ () (add-dot-left main5 finish-class finish-name))
-                                                 -1 ;; just enough to get the arrowhead going the right direction; not enough to see the line
-                                                 0))
-      
-      (connect-dots
-       #t
-       (connect-dots #f main6 dot1 dot2 dot4 dot3)
-       dot6 
-       dot5))))
-
-(define left-top-reference
-  (λ (main0 start-class start-field finish-class [count 1] #:connect-dots [connect-dots connect-dots])
-    (define-values (main1 dot1) (add-dot-left main0 start-class start-field))
-    (define-values (main2 dot2) (add-dot-left/space main1 start-class start-field count))
-    (define-values (main3 dot3) (add-dot-junction main2 dot2 cc-find finish-class ct-find))
-    (connect-dots #t main3 dot1 dot2 dot3)))
-
-(define right-left-reference
-  (λ (main0 start-class start-field finish-class finish-name 
-            [offset 
-             (find-middle main0 start-class rc-find finish-class lc-find)]
-            #:connect-dots [connect-dots connect-dots])
-    (define-values (main1 dot1) (add-dot-right main0 start-class start-field))
-    (define-values (main2 dot2) (add-dot-right/offset main1 start-class start-field offset))
-    (define-values (main3 dot3) (add-dot-left main2 finish-class finish-name))
-    (define-values (main4 dot4) (add-dot-junction main3 dot2 dot3))
-    (connect-dots #t main4 dot1 dot2 dot4 dot3)))
-
-(define left-right-reference
-  (λ (main0 start-class start-field finish-class finish-name 
-            [offset 
-             (- (find-middle main0 start-class lc-find finish-class rc-find))]
-            #:connect-dots [connect-dots connect-dots])
-    (define-values (main1 dot1) (add-dot-left main0 start-class start-field))
-    (define-values (main2 dot2) (add-dot-left/offset main1 start-class start-field offset))
-    (define-values (main3 dot3) (add-dot-right main2 finish-class finish-name))
-    (define-values (main4 dot4) (add-dot-junction main3 dot2 dot3))
-    (connect-dots #t main4 dot1 dot2 dot4 dot3)))
-
-(define (find-middle main p1 find1 p2 find2)
-  (let-values ([(x1 y1) (find1 main p1)]
-               [(x2 y2) (find2 main p2)])
-    (- (/ (+ x1 x2) 2) (min x1 x2))))
-
-(define right-top-reference
-  (λ (main0 start-class start-field finish-class [count 1] #:connect-dots [connect-dots connect-dots])
-    (define-values (main1 dot1) (add-dot-right main0 start-class start-field))
-    (define-values (main2 dot2) (add-dot-right/space main1 start-class start-field count))
-    (define-values (main3 dot3) (add-dot-junction main2 dot2 cc-find finish-class ct-find))
-    (connect-dots #t main3 dot1 dot2 dot3)))
-
-(define connect-dots-contract (->* (boolean? pict? pict?) () #:rest (listof pict?) (values pict?)))
-
-(provide type-link-color)
-(provide/contract
- [field-spec (->* ((or/c #f string?) string?) (string? #:default string?) pict?)]
- [class-name (->* (string?) (#:spacing-word string?) pict?)]
- [class-box (-> pict? (or/c false/c (listof pict?)) (or/c false/c (listof pict?)) pict?)]
- [hierarchy/layout 
-  (->* ((cons/c pict? (listof pict?)) (cons/c pict? (listof pict?)))
-       (#:top-space 
-        integer? 
-        #:bottom-space integer? 
-        #:vertical-space integer?
-        #:every-other-space integer?)
-       pict?)]
- [user-type-font (-> string? pict?)]
- [prim-type-font (-> string? pict?)]
- [var-font (-> string? pict?)]
- [normal-font (-> string? pict?)]
- [comment-font (-> string? pict?)]
- 
- [hierarchy (-> pict? 
-                (cons/c pict? (listof pict?)) 
-                (cons/c pict? (listof pict?))
-                pict?)]
- [right-right-reference (->* (pict? pict? pict? pict? pict?)
-                             (number?
-                              #:connect-dots connect-dots-contract
-                              #:dot-delta number?)
-                             pict?)]
- [left-left-reference (->* (pict? pict? pict? pict? pict?)
-                           (number?
-                            #:connect-dots connect-dots-contract
-                            #:dot-delta number?)
-                           pict?)]
- [right-left-reference (->* (pict? pict? pict? pict? pict?)
-                            (number?
-                             #:connect-dots connect-dots-contract)
-                            pict?)]
- [left-right-reference (->* (pict? pict? pict? pict? pict?)
-                            (number?
-                             #:connect-dots connect-dots-contract)
-                            pict?)]
- [left-top-reference (->* (pict? pict? pict? pict?)
-                          (number?
-                           #:connect-dots connect-dots-contract)
-                          pict?)]
- [right-top-reference (->* (pict? pict? pict? pict?)
-                           (number?
-                            #:connect-dots connect-dots-contract)
-                           pict?)]
- 
- [dot-edge-spacing number?]
- [connect-dots connect-dots-contract]
- [add-dot-right (-> pict? pict? pict? (values pict? pict?))]
- [add-dot-right/space (-> pict? pict? pict? (values pict? pict?))]
- [add-dot-left (-> pict? pict? pict? (values pict? pict?))]
- [add-dot-left/space (-> pict? pict? pict? (values pict? pict?))]
- [add-dot-junction 
-  (case->
-   (-> pict? pict? pict? (values pict? pict?))
-   (-> pict? 
-       pict? (-> pict? pict? (values number? number?))
-       pict? (-> pict? pict? (values number? number?))
-       (values pict? pict?)))]
- [add-dot-offset (-> pict? pict? number? number? (values pict? pict?))]
- [add-dot (-> pict? number? number? (values pict? pict?))]
- [method-spec 
-  (->* (string? string?) 
-       (#:body (or/c false/c pict?)) 
-       #:rest (listof (or/c false/c string?)) 
-       pict?)]
- [java-this (-> pict?)]
- [field-arrowhead-size number?])
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/compat.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/compat.scrbl
deleted file mode 100644
index 45d8f1c94a..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/compat.scrbl
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scribble/manual
-
-@title{Compatibility Libraries}
-
-@include-section["struct.scrbl"]
-@include-section["basic.scrbl"]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/config.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/config.scrbl
deleted file mode 100644
index f10773d07f..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/config.scrbl
+++ /dev/null
@@ -1,639 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/core scribble/decode
-          scribble/html-properties scribble/latex-properties
-          "utils.rkt"
-          (for-label racket/base
-                     scribble/latex-prefix))
-
-@(define (fake-title . str) (apply bold str))
-
-@(define (css s) (tt s))
-@(define spacer @hspace[1])
-@(define baseline (style #f '(baseline)))
-@(define-syntax-rule (css-table [name desc] ...)
-   (tabular 
-    #:style (style #f (list (table-columns (list baseline baseline baseline baseline))))
-    (list (list spacer name spacer @smaller[desc]) ...)))
-
-@; ------------------------------------------------------------
-
-@title[#:tag "config" #:style 'toc]{Extending and Configuring Scribble Output}
-
-Sometimes, Scribble's primitives and built-in styles are insufficient
-to produce the output that you need. The cases in which you need to
-extend or configure Scribble fall into two groups:
-
-@itemize[
-
- @item{You may need to drop into the back-end ``language'' of CSS or
-       Latex to create a specific output effect. For this kind of
-       extension, you will mostly likely attach a
-       @racket[css-addition] or @racket[tex-addition] @tech{style property}
-       to style, where the addition implements the style name. This
-       kind of extension is described in @secref["extra-style"].}
-
- @item{You may need to produce a document whose page layout is
-       different from the Racket documentation style. For that
-       kind of configuration, you can run the @exec{scribble} command-line
-       tool and supply flags like @DFlag{prefix} or @DPFlag{style}, or
-       you can associate a @racket[html-defaults] or
-       @racket[latex-defaults] @tech{style property} to the main document's
-       style. This kind of configuration is described in
-       @secref["config-style"].}
-
-]
-
-@local-table-of-contents[]
-
-@; ------------------------------------------------------------
-
-@section[#:tag "extra-style" 
-         #:style (make-style #f (list (make-css-addition "inbox.css")
-                                      (make-tex-addition "inbox.tex")))
-        ]{Implementing Styles}
-
-When a string is used as a style in an @racket[element], 
-a @racket[multiarg-element], @racket[paragraph], @racket[table],
-@racket[itemization], @racket[nested-flow], or
-@racket[compound-paragraph], it corresponds to a CSS class for HTML
-output or a Latex macro/environment for Latex output. In Latex output,
-the string is used as a command name for a @racket[paragraph]
-and an environment name for a @racket[table], @racket[itemization],
-@racket[nested-flow], or @racket[compound-paragraph]; if the style has
-a @racket['command] @tech{style property} for a @racket[nested-flow] or
-@racket[compound-paragraph], then the style name is used as a command
-instead of an environment; and if the style has
-a @racket['multicommand] @tech{style property} for a @racket[nested-flow],
-then the style name is used as a command with multiple arguments.
-In addition, for an itemization, the style
-string is suffixed with @racket["Item"] and used as a CSS class or Latex
-macro name to use for the itemization's items (in place of @ltx{item}
-in the case of Latex).
-
-To add a mapping from your own style name to a CSS configuration, add
-a @racket[css-addition] structure instance to a style's @tech{style property}
-list. To map a style name to a Latex macro or environment, add a
-@racket[tex-addition] structure instance. A @racket[css-addition] or
-@racket[tex-addition] is normally associated with the style whose name
-is implemented by the adition, but it can also be added to the style
-for an enclosing part.
-
-Scribble includes a number of predefined styles that are used by the
-exports of @racket[scribble/base]. You can use them or redefine
-them. The styles are specified by @filepath{scribble.css} and
-@filepath{scribble.tex} in the @filepath{scribble} collection.
-
-The styles used by @racketmodname[scribble/manual] are implemented by
-@filepath{racket.css} and @filepath{racket.tex} in the
-@filepath{scribble} collection. Other libraries, such as
-@racketmodname[scriblib/autobib], similarly implement styles through files
-that are associated by @racket[css-addition] and @racket[tex-addition]
-@tech{style properties}.
-
-To avoid collisions with future additions to Scribble, start your
-style name with an uppercase letter that is not @litchar{S}. An
-uppercase letter helps to avoid collisions with macros defined by
-Latex packages, and future styles needed by @racketmodname[scribble/base] and
-@racketmodname[scribble/manual] will start with @litchar{S}.
-
-For example, a Scribble document
-
-@verbatim[#:indent 2]|{
- #lang scribble/manual
- @(require scribble/core
-           scribble/html-properties
-           scribble/latex-properties)
-
- @(define inbox-style
-    (make-style "InBox"
-                (list (make-css-addition "inbox.css")
-                      (make-tex-addition "inbox.tex"))))
-
- @title{Quantum Pet}
-
- Do not open: @elem[#:style inbox-style]{Cat}
-}|
-
-combined with an @filepath{inbox.css} that contains
-
-@verbatim[#:indent 2]|{
-  .InBox {
-    padding: 0.2em;
-    border: 1px solid #000000;
-  }
-}|
-
-and an @filepath{inbox.tex} that contains
-
-@verbatim[#:indent 2]|{
-  \newcommand{\InBox}[1]{\fbox{#1}}
-}|
-
-generates
-
-@nested[#:style 'inset]{
- @fake-title{Quantum Pet}
-
- Do not open: @elem[#:style "InBox"]{Cat}
-}
-
-@index["HTML Tags and Attributes"]{
-Scribble documents can also embed specific html tags and
-attributes.} For example, this Scribble document:
-@codeblock|{
-#lang scribble/base
-
-@(require scribble/core
-          scribble/html-properties)
-
-@(define external-image 
-   (elem
-    #:style
-    (style #f
-           (list (alt-tag "img")
-                 (attributes
-                  '((src . "http://racket-lang.org/icon.png")))))))
-
-@external-image
-}|
-
-renders as the the Racket logo at the url
-@url{http://racket-lang.org/logo.png}
-when producing html.
-
-@; ------------------------------------------------------------
-
-@section[#:tag "config-style"]{Configuring Output}
-
-The implementation of styles used by libraries depends to some degree
-on separately configurable parameters, and configuration is also
-possible by replacing style implementations. Latex output is more
-configurable in the former way, since a document class determines a
-set of page-layout and font properties that are used by other
-commands. The style-replacement kind of configuration corresponds to
-re-defining Latex macros or overriding CSS class attributes.  When
-@exec{setup-plt} builds PDF documentation, it uses both kinds of
-configuration to produce a standard layout for Racket manuals;
-that is, it selects a particular page layout, and it replaces some
-@racketmodname[racket/base] styles.
-
-Two kinds of files implement the two kinds of configuration:
-
-@itemize[
-
- @item{A @deftech{prefix file} determines the @tt{DOCTYPE} line for
-       HTML output or the @ltx{documentclass} configuration (and
-       perhaps some addition package uses or other configurations) for
-       Latex output.
-
-       The default prefix files are @filepath{scribble-prefix.html}
-       and @filepath{scribble-prefix.tex} in the @filepath{scribble}
-       collection.}
-
- @item{A @deftech{style file} refines the implementation of styles
-       used in the document---typically just the ``built-in'' styles
-       used by @racketmodname[scribble/base].
-
-       The default style files, @filepath{scribble-style.css} and
-       @filepath{scribble-style.tex} in the @filepath{scribble}
-       collection, change no style implementations.}
-
-]
-
-For a given configuration of output, typically a particular prefix
-file works with a particular style file. Some prefix or style files
-may be more reusable. For now, reading the default files is the best
-way to understand how they interact. A prefix and/or style file may
-also require extra accomanying files; for example, a prefix file for
-Latex mode may require a corresponding Latex class file. The default
-prefix and style files require no extra files.
-
-When rendering a document through the @exec{scribble} command-line
-tool, use flags to select a prefix file, style file, and additional
-accompanying files:
-
-@itemize[
-
- @item{Select the prefix file using the @as-index{@DFlag{prefix}}
-       flag. (Selecting the prefix file also cancels the default list
-       of accompanying files, if any.)}
-
- @item{Replace the style file using the @as-index{@DFlag{style}}
-       flag. Add additional style definitions and re-definitions using
-       the @as-index{@DPFlag{style}} flag.}
-
- @item{Add additional accompanying files with @as-index{@DPFlag{extra}}.}
-
-]
-
-When using the @exec{scribble} command-line utility, a document can
-declare its default style, prefix, and extra files through a
-@racket[html-defaults] and/or @racket[latex-defaults]
-@tech{style property}. In particular, when using the @exec{scribble}
-command-line tool to generate Latex or PDF a document whose main part
-is implemented with @racket[#, @hash-lang[] #,
-@racketmodname[scribble/manual]], the result has the standard
-Racket manual configuration, because @racketmodname[scribble/manual]
-associates a @racket[latex-defaults] @tech{style property} with the exported
-document. The @racketmodname[scribble/sigplan] language similarly
-associates a default configuration with an exported document.  As
-libraries imported with @racket[require], however,
-@racketmodname[scribble/manual] and @racketmodname[scribble/sigplan]
-simply implement new styles in a composable way.
-
-Whether or not a document has a default prefix- and style-file
-configuration through a @tech{style property}, the defaults can be
-overridden using @exec{scribble} command-line flags. Furthermore,
-languages like @racketmodname[scribble/manual] and
-@racketmodname[scribble/sigplan] add a @racket[html-defaults] and/or
-@racket[latex-defaults] @tech{style property} to a main-document part only if
-it does not already have such a property added through the
-@racket[#:style] argument of @racket[title].
-
-@; ------------------------------------------------------------
-
-@section[#:tag "builtin-css"]{Base CSS Style Classes}
-
-The following renderings of @elem[#:style (style #f (list
-(link-resource "demo.scrbl")))]{@filepath{demo.scrbl}} demonstrate all
-of the CSS style classes used by @racketmodname[scribble/base] forms and
-functions:
-
-@itemlist[
-
- @item{@other-doc['(lib "scribblings/scribble/demo-s1.scrbl")] shows
-       the default style in a single-page rendering without a search
-       box.}
-
- @item{@other-doc['(lib "scribblings/scribble/demo-m1.scrbl")] shows
-       the default style in a multi-page rendering without a search
-       box.}
-
- @item{@other-doc['(lib "scribblings/scribble/demo-s2.scrbl")] shows
-       the current manual style's adjustments in a single-page
-       rendering with a search box.}
-
- @item{@other-doc['(lib "scribblings/scribble/demo-m2.scrbl")] shows
-       the current manual style's adjustments in a multi-page
-       rendering with a search box.}
-
-]
-
-The style classes:
-
-@(css-table
-  [@css{maincolumn} @elem{Outer wrapper for all content in the main column.}]
-  [@css{main} @elem{Inner wrapper for all content in the main column, including navigation bars.}]
-
-  [@spacer @spacer]
-
-  [@css{refpara} @elem{Outer wrapper for right-hand @racket[margin-note] notes.}]
-  [@css{refparaleft} @elem{Outer wrapper for left-hand @racket[margin-note] notes.}]
-  [@css{refelem} @elem{Outer wrapper for right @racket[margin-note*] notes.}]
-  [@css{refelemleft} @elem{Outer wrapper for left-hand @racket[margin-note*] notes.}]
-  [@css{refcolumn} @elem{Middle wrapper for right-hand @racket[margin-note] and @racket[margin-note*] notes.}]
-  [@css{refcolumnleft} @elem{Middle wrapper for left-hand @racket[margin-note] and @racket[margin-note*] notes.}]
-  [@css{refcontent} @elem{Inner wrapper for @racket[margin-note] and @racket[margin-note*] notes.}]
-
-  [@spacer @spacer]
-
-  [@css{tocset} @elem{Groups table-of-contents panels: main and ``on this page.''}]
-
-  [@spacer @spacer]
-
-  [@css{tocview} @elem{Wraps the main (multi-page mode) or only (single-page mode) table-of-contents panel.}]
-  [@css{tocviewlist} @elem{A hierarchical layer of content in a main table-of-contents panel.}]
-  [@css{tocviewlisttopspace} @elem{With @css{tocviewlist} for the first layer.}]
-  [@css{tocviewtoggle} @elem{The always-visible name of a layer.}]
-  [@css{tocviewtitle} @elem{With @css{tocviewtoggle} for the first layer.}]
-  [@css{tocviewsublist} @elem{An item in a layer that has multiple items and more items before and after.}]
-  [@css{tocviewsublistonly} @elem{An item in a single-item layer.}]
-  [@css{tocviewsublisttop} @elem{The first item in a multi-item layer.}]
-  [@css{tocviewsublistbottom} @elem{The last item in a multi-item layer.}]
-  [@css{tocviewlink} @elem{Inner wrapper for an item in a layer when linked to a different page.}]
-  [@css{tocviewselflink} @elem{Inner wrapper for every item in a layer when linked to the same page.}]
-
-  [@spacer @spacer]
-
-  [@css{tocsub} @elem{Wraps the ``on this page'' (multi-page mode only) table-of-contents panel.}]
-  [@css{tocsubtitle} @elem{Wraps the words ``on this page''.}]
-  [@css{tocsublist} @elem{Inner table for the ``on this page'' panel.}]
-  [@css{tocsublinknumber} @elem{Number for an entry in an ``on this page'' panel.}]
-  [@css{tocsubseclink} @elem{Title for a @emph{section} entry in an ``on this page'' panel.}]
-  [@css{tocsubnonseclink} @elem{Title for a @emph{non-section} entry in an ``on this page'' panel
-                                 that has some section links.}]
-  [@css{tocsublink} @elem{Title for a @emph{non-section} entry in an ``on this page'' panel
-                                 that has no section links.}]
-
-  [@css{toctoplink} @elem{Top-level entry in an inline (not the panel) table of contents.}]
-  [@css{toclink} @elem{Nested entry in an inline (not the panel) table of contents.}]
-
-  [@spacer @spacer]
-
-  [@css{versionbox} @elem{Outer wrapper for version}]
-  [@css{version} @elem{Inner wrapper for version in the case of search box and/or navigation.}]
-  [@css{versionNoNav} @elem{Inner wrapper for version in the acse of no search box and navigation.}]
-
-  [@spacer @spacer]
-
-  [@css{SAuthorListBox} @elem{Outer wrapper for the author list.}]
-  [@css{SAuthorList} @elem{Inner wrapper for the author list.}]
-  [@css{author} @elem{Wrapper for an individual author.}]
-
-  [@spacer @spacer]
-
-  [@css{navsettop} @elem{Wraps the top navigation bar (in multi-page mode or when a search bar is present).}]
-  [@css{navsetbottom} @elem{Wraps the bottom navigation bar (in multi-page mode or when a search bar is present).}]
-  [@css{navleft} @elem{Wraps left-side elements within a navigation bar.}]
-  [@css{navright} @elem{Wraps right-side elements within a navigation bar.}]
-  [@css{nonavigation} @elem{Disabled links within a navigation bar.}]
-  [@css{searchform} @elem{Outer wrapper for a search box within the top navigation bar.}]
-  [@css{searchbox} @elem{Inner wrapper for a search box within the top navigation bar.}]
-  [@css{nosearchform} @elem{Takes the place of an absent search box within the top navigation bar.}]
-
-  [@spacer @spacer]
-
-  [@css{SSubSubSubSection} @elem{Deeply nested subsection (below @tt{<h5>}).}]
-
-  [@spacer @spacer]
-
-  [@css{SIntrapara} @elem{Used with @tt{<div>} instead of @tt{<p>} for a paragraph
-                       within a @racket[compound-paragraph].}]
-
-  [@spacer @spacer]
-
-  [@css{SubFlow} @elem{For a @racket[nested-flow] with no style name: no inset.}]
-  [@css{SCodeFlow} @elem{For a @racket[nested-flow] with the @racket['code-inset] style name:
-                          inset suitable for code.}]
-  [@css{SVInsetFlow} @elem{For a @racket[nested-flow] with the @racket['vertical-inset] style name:
-                          add space before and after suitable for code.}]
-  [@css{SCentered} @elem{For a @racket[nested-flow] created by @racket[centered]: horizontally
-                          centered.}]
-
-  [@spacer @spacer]
-
-  [@css{boxed} @elem{For a @racket[table] with the @racket['boxed] style name: as a definition box.}]
-
-  [@spacer @spacer]
-
-  [@css{compact} @elem{For an @racket[itemlist] with the @racket['compact] style name.}]
-
-  [@spacer @spacer]
-
-  [@css{techoutside} @elem{Outer wrapper for a technical-term reference.}]
-  [@css{techinside} @elem{Inner wrapper for a technical-term reference.}]
-
-  [@spacer @spacer]
-
-  [@css{indexlink} @elem{For an entry in the index.}]
-
-  [@spacer @spacer]
-
-  [@css{stt} @elem{Fixed-width text.}]
-  [@css{sroman} @elem{Serif text.}]
-  [@css{ssanserif} @elem{Sans serif text.}]
-  [@css{slant} @elem{Oblique (as opposed to italic) text.}]
-  [@css{Smaller} @elem{Smaller text (as created by @racket[smaller]).}]
-  [@css{Larger} @elem{Smaller text (as created by @racket[larger]).}]
-  [@css{hspace} @elem{For whitespace produced by @racket[hspace].}]
-  [@css{nobreak} @elem{Disable link breaks.}]
-  [@css{badlink} @elem{Broken cross-reference.}]
-  [@css{plainlink} @elem{Hyperlink without an underline.}])
-
-In addition, the @css{SIEHidden} style class is built in to all
-Scribble HTML output to hide an element on Internet Explorer 6.
-
-@; ------------------------------------------------------------
-
-@section[#:tag "manual-css"]{Manual CSS Style Classes}
-
-The following renderings of @elem[#:style (style #f (list
-(link-resource "demo-manual.scrbl")))]{@filepath{demo-manual.scrbl}}
-demonstrate all of the CSS style classes used by
-@racketmodname[scribble/manual] forms and functions in addition to the
-@seclink["builtin-css"]{base style classes}.
-
-@itemlist[
-
- @item{@other-doc['(lib "scribblings/scribble/demo-manual-s1.scrbl")] shows
-       the original style in a single-page rendering without a search
-       box.}
-
- @item{@other-doc['(lib "scribblings/scribble/demo-manual-m1.scrbl")] shows
-       the original style in a multi-page rendering without a search
-       box.}
-
- @item{@other-doc['(lib "scribblings/scribble/demo-manual-s2.scrbl")] shows
-       the current manual style's adjustments in a single-page
-       rendering with a search box.}
-
- @item{@other-doc['(lib "scribblings/scribble/demo-manual-m2.scrbl")] shows
-       the current manual style's adjustments in a multi-page
-       rendering with a search box.}
-
-]
-
-The style classes:
-
-@(css-table
-  [@css{RktSym} @elem{Identifiers with no @racket[for-label] binding.}]
-  [@css{RktValLink} @elem{Identifier with @racket[for-label] binding to a variable definition.}]
-  [@css{RktValDef} @elem{Definition site of a variable, normally combined with @css{RktValLink}.}]
-  [@css{RktStxLink} @elem{Identifier with @racket[for-label] binding to a syntactic-form definition.}]
-  [@css{RktStxDef} @elem{Definition site of a syntactic form, normally combined with @css{RktStxLink}.}]
-  [@css{RktSymDef} @elem{Definition site of an identifier without binding (normally a mistake), combined with @css{RktSym}.}]
-  [@css{RktVar} @elem{Local variable or meta-variable.}]
-  [@css{RktRes} @elem{REPL result.}]
-  [@css{RktOut} @elem{Output written to the current output port.}]
-  [@css{RktErr} @elem{Output written to the current error port.}]
-  [@css{RktCmt} @elem{A comment in Racket code.}]
-  [@css{RktVal} @elem{A literal value in Racket code.}]
-  [@css{RktPn} @elem{Parentheses, keywords, and similar delimiters in Racket code.}]
-  [@css{RktRdr} @elem{Reader shorthands in Racket code, except for commas.}]
-  [@css{RktMeta} @elem{An unquoting comma in Racket code.}]
-  [@css{highlighted} @elem{Hilighlted code (via @racket[code:highlight] in @racket[racketblock], for example).}]
-  [@css{RktIn} @elem{Foreground for literal characters written with @racket[litchar].}]
-  [@css{RktInBG} @elem{Background for literal characters written with @racket[litchar].}]
-  [@css{RktModLink} @elem{A module name linked to the module's definition.}]
-  [@css{RktMod} @elem{A module name (normally @css{RktModLink}, instead).}]
-  [@css{RktKw} @elem{A ``keyword;'' not normally used.}]
-  [@css{RktOpt} @elem{Brackets for optional arguments (in function definitions).}]
-
-  [@spacer @spacer]
-
-  [@css{RktBlk} @elem{Wrapper for multi-linke Racket code blocks.}]
-
-  [@spacer @spacer]
-
-  [@css{defmodule} @elem{Module definition block.}]
-  [@css{RpackageSpec} @elem{Package specification within a module-definition block.}]
-
-  [@spacer @spacer]
-
-  [@css{RBoxed} @elem{Definition block; always combined with @css{boxed}.}]
-  [@css{together} @elem{Table within a @racket[together] grouping.}]
-  [@css{RBackgroundLabel} @elem{Wrapper for ``procedure,'' ``syntax,'' etc., backing in a definition box.}]
-  [@css{RBackgroundLabelInner} @elem{Wrapper within @css{RBackgroundLabel}.}]
-  [@css{RForeground} @elem{Wrapper for element to appear over a @css{RBackgroundLabel}.}]
-  [@css{prototype} @elem{Wrapper for a multi-line procedure-definition prototype.}]
-  [@css{argcontract} @elem{Wrapper for a multi-line argument contract and default value.}]
-  [@css{specgrammar} @elem{Wrapper for a grammar with a syntactic-form definition box.}]
-  [@css{inherited} @elem{Wrapper for a margin ``inherited methods'' table.}]
-  [@css{inheritedlbl} @elem{Wrapper for ``Inherited methods:'' and ``from'' labels.}]
-
-  [@spacer @spacer]
-
-  [@css{leftindent} @elem{Left-indented block, such as form @racket[specsubform].}]
-  [@css{insetpara} @elem{Inset block.}]
-
-  [@spacer @spacer]
-
-  [@css{Rfilebox} @elem{Wrapper for a file box (via @racket[filebox]),}]
-  [@css{Rfiletitle} @elem{Outer wrapper for a file box title.}]
-  [@css{Rfilename} @elem{Inner wrapper for a file box title.}]
-  [@css{Rfilecontent} @elem{Wrapper for file box content.}]
-
-  [@spacer @spacer]
-
-  [@css{SHistory} @elem{Wrapper for @racket[history] paragraphs.}]
-
-  [@spacer @spacer]
-
-  [@css{RBibliography} @elem{Wrapper for a @racket[bibliography] section.}])
-
-@; ------------------------------------------------------------
-
-@section[#:tag "builtin-latex"]{Base Latex Macros}
-
-The @filepath{scribble.tex} Latex configuration includes several
-macros and environments that you can redefine to adjust the output
-style:
-
-@itemlist[
-
- @item{@ltxd[0]{preDoc} --- called before the document content; the 
-       default does nothing, while the @racketmodname[scribble/manual]
-       configuration enabled @ltx{sloppy}.}
-
- @item{@ltxd[0]{postDoc} --- called after the document content; the 
-       default does nothing.}
-
- @item{@ltxd[0]{sectionNewpage} --- called before each top-level
-       section starts; the default does nothing, while the
-       @racketmodname[scribble/manual] configuration uses
-       @ltx{newpage} to start each chapter on a new page.}
-
- @item{@ltxd[3]{SecRefLocal} --- the first argument is a Latex label,
-       the second argument is a section number, and the third argument
-       is a section title. This macro is used by @racket[secref] to
-       reference a section (other than a document or top-level section
-       within a document) that has a number and that is local to the
-       current document. The default expands to @ltx{SecRef}, passing
-       along just the second and third arguments (so that the label is
-       ignored).}
-
- @item{@ltxd[2]{SecRef} --- like @ltx{SecRefLocal}, but used when the
-       referenced section is in a different document, so that no label
-       is available. The default shows ``section'' followed by the
-       section number (ignoring the title). The
-       @racketmodname[scribble/manual] redefinition of this macro
-       shows ``§'', the section number, and the title in quotes.}
-
- @item{@ltxd[3]{ChapRefLocal} and @ltxd[2]{ChapRef} --- like
-       @ltx{SecRefLocal} and @ltx{SecRef}, but for a top-level section
-       within a document. The default implementation defers to
-       @ltx{SecRefLocal} or @ltx{SecRef}.}
-
- @item{@ltxd[3]{PartRefLocal} and @ltxd[2]{PartRef} --- like
-       @ltx{SecRefLocal} and @ltx{SecRef}, but for a top-level section
-       within a document whose part has the @racket['grouper] style
-       property. The default @ltx{PartRef} shows ``part'' followed by
-       the section number (ignoring the title).}
-
- @item{@ltxd[3]{BookRefLocal} and @ltxd[2]{BookRef} --- like
-       @ltx{SecRefLocal} and @ltx{SecRef}, but for a document (as
-       opposed to a section within the document). The default
-       @ltx{BookRef} implementation shows the title in italic.}
-
- @item{@ltxd[3]{SecRefLocalUC} and @ltxd[2]{SecRefUC} --- like
-       @ltx{SecRefLocal} and @ltx{SecRef}, but for @racket[Secref].
-       The default @ltx{SecRefUC} shows ``Section'' followed by the
-       section number.}
-
- @item{@ltxd[3]{ChapRefLocalUC} and @ltxd[2]{ChapRefUC} --- like
-       @ltx{ChapRefLocal} and @ltx{ChapRef}, but for
-       @racket[Secref]. The default @ltx{ChapRefUC}implementation
-       defers to @ltx{SecRefUC}.}
-
- @item{@ltxd[3]{PartRefLocalUC} and @ltxd[2]{PartRefUC} --- like
-       @ltx{PartRefLocal} and @ltx{PartRef}, but for @racket[Secref].
-       The default @ltx{PartRefUC} shows ``Part'' followed by the
-       section number.}
-
- @item{@ltxd[3]{BookRefLocalUC} and @ltxd[2]{BookRefUC} --- like
-       @ltx{BookRefLocal} and @ltx{BookRef}, but for @racket[Secref].
-       The default @ltx{BookRefUC} defers to @ltx{BookRef}.}
-
- @item{@ltxd[2]{SecRefLocalUN}, @ltxd[1]{SecRefUCUN},
-       @ltxd[2]{SecRefLocalUCUN}, @ltxd[1]{SecRefUN},
-       @ltxd[2]{PartRefLocalUN}, @ltxd[1]{PartRefUN},
-       @ltxd[2]{PartRefLocalUCUN}, @ltxd[1]{PartRefUCUN},
-       @ltxd[2]{BookRefLocalUN}, @ltxd[1]{BookRefUN},
-       @ltxd[2]{BookRefLocalUCUN}, @ltxd[1]{BookRefUCUN},
-       @ltxd[2]{ChapRefLocalUN}, @ltxd[1]{ChapRefUN},
-       @ltxd[2]{ChapRefLocalUCUN}, and @ltxd[1]{ChapRefUCUN} --- like
-       @ltx{SecRefLocal}, etc., but in the case that a
-       section/part/chapter number is unavailable. The default
-       implementation of @ltx{BookRefUN} uses @ltx{BookRef} with an
-       empty first argument. The default @ltx{SecRefLocalUN} expands
-       to its second argument in quotes followed by ``on page'' as a
-       @ltx{pageref} using the first argument, while the default
-       @ltx{SecRefUN} expands to its only argument in quotes. The
-       default @ltx{PartRef} and @ltx{ChapRef} variants expand to the
-       corresponding @ltx{SecRef} variant.}
-
- @item{@ltxd[2]{Ssection}, @ltxd[2]{Ssubsection},
-        @ltxd[2]{Ssubsubsection}, @ltxd[2]{Ssubsubsubsection},
-        @ltxd[2]{Ssubsubsubsubsection} --- for a top-level section, a
-        second-level section, etc., where the last variant is used for
-        all sections that are deeper than four levels. The first
-        argument corresponds to the optional argument to
-        @ltx{section}, which is used for the table of contents.}
-
- @item{@ltxd[1]{Ssectionstar}, @ltxd[1]{Ssubsectionstar},
-        @ltxd[1]{Ssubsubsectionstar}, @ltxd[1]{Ssubsubsubsectionstar},
-        @ltxd[1]{Ssubsubsubsubsectionstar} --- like @ltx{Ssection},
-        etc., but for unnumbered sections that are omitted from the
-        table of contents.}
-
- @item{@ltxd[2]{Ssectionstarx}, @ltxd[1]{Ssubsectionstarx},
-        @ltxd[2]{Ssubsubsectionstarx},
-        @ltxd[2]{Ssubsubsubsectionstarx},
-        @ltxd[2]{Ssubsubsubsubsectionstarx} --- like @ltx{Ssection},
-        etc., but for unnumbered sections (that nevertheless appear in
-        the table of contents).}
-
- @item{@ltxd[0]{Sincsection}, @ltxd[0]{Sincsubsection},
-       @ltxd[0]{Sincsubsubsection}, @ltxd[0]{Sincsubsubsubsection},
-       @ltxd[0]{Sincsubsubsubsubsection} --- increments the section
-       counter.}
-
- @item{@ltxd[2]{Spart}, @ltxd[1]{Spartstar}, @ltxd[2]{Spartstarx},
-       @ltxd[0]{Sincpart} --- like the section commands, but used for
-       in place of @ltxd[2]{Ssection}, @ltxd[1]{Ssectionstar}, @|etc|
-       for a part with the @racket['grouper] style property.}
-
- ]
-
-@; ------------------------------------------------------------
-
-@section[#:tag "latex-prefix"]{Latex Prefix Support}
-
-@defmodule[scribble/latex-prefix]{Provides a string that is useful for
-constructing a Latex document prefix.}
-
-@defthing[unicode-encoding-packages string?]{
-
-A string containing Latex code that is useful after a
-@tt{\documentclass} declaration to make Latex work with Unicode
-characters.}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/core.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/core.scrbl
deleted file mode 100644
index ff60a69c50..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/core.scrbl
+++ /dev/null
@@ -1,1702 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual 
-          (except-in "utils.rkt" url)
-          "struct-hierarchy.rkt" 
-          (for-label scribble/manual-struct
-                     racket/serialize
-                     file/convertible
-                     setup/main-collects
-                     scriblib/render-cond
-                     xml/xexpr
-                     net/url-structs
-                     (only-in scribble/html-render render-mixin)))
-
-@title[#:tag "core"]{Structures And Processing}
-
-@defmodule[scribble/core]
-
-A document is represented as a @techlink{part}, as described in
- @secref["parts"]. This representation is intended to be
- independent of its eventual rendering, and it is intended to be
- immutable; rendering extensions and specific data in a document can
- collude arbitrarily, however.
-
-A document is processed in four passes:
-
-@itemlist[
-
- @item{The @deftech{traverse pass} traverses the document content in
-       document order so that information from one part of a document
-       can be communicated to other parts of the same document. The
-       information is transmitted through a symbol-keyed mapping that
-       can be inspected and extended by @racket[traverse-element]s and
-       @racket[traverse-block]s in the document. The @tech{traverse
-       pass} iterates the traversal until it obtains a fixed point
-       (i.e., the mapping from one iteration is unchanged from the
-       previous iteration).}
-
- @item{The @deftech{collect pass} globally collects information in the
-       document that can span documents that are built at separate
-       times, such as targets for hyperlinking.}
-
- @item{The @deftech{resolve pass} matches hyperlink references
-       with targets and expands delayed elements (where the expansion
-       should not contribute new hyperlink targets).}
-
- @item{The @deftech{render pass} generates the result document.}
-
-]
-
-None of the passes mutate the document representation. Instead, the
- @tech{traverse pass}, @tech{collect pass}, and @tech{resolve pass}
- accumulate information in a side hash table, @racket[collect-info]
- table, and @racket[resolve-info] table. The @tech{collect pass} and
- @tech{resolve pass} are effectively specialized version of
- @tech{traverse pass} that work across separately built documents.
-
- 
-@; ------------------------------------------------------------------------
-
-@section[#:tag "parts"]{Parts, Flows, Blocks, and Paragraphs}
-
-This diagram shows the large-scale structure of the
-type hierarchy for Scribble documents. A box represents
-a struct or a built-in Racket type; for example @racket[part] is a struct.
-The bottom portion of a box shows the fields; for example
-@racket[part] has three fields, @racket[title], @racket[blocks], 
-and @racket[subparts].
-The substruct relationship
-is shown vertically with navy blue lines connected by a triangle;
-for example, a @racket[compound-paragraph] is a @racket[block]. 
-The types of values on fields are shown via dark red lines in the diagram.
-Doubled lines represent lists and tripled lines represent lists
-of lists; for example, the @racket[blocks] field of 
-@racket[compound-paragraph] is a list of @racket[blocks].
-Dotted lists represent functions that compute elements of
-a given field; for example, the @racket[block] field of 
-a @racket[traverse-block] struct is a function that
-computes a @racket[block]. 
-
-The diagram is not completely
-accurate: a @racket[table] may have @racket['cont]
-in place of a block in its @racket[cells] field, and
-the types of fields are only shown if they are other structs
-in the diagram.
-A prose description with more detail follows the diagram.
-
-@(mk-diagram)
-
-A @deftech{part} is an instance of @racket[part]; among other things,
- it has a title @techlink{content}, an initial @techlink{flow}, and a
- list of subsection @techlink{parts}.  There is no difference between
- a part and a full document; a particular source module just as easily
- defines a subsection (incorporated via @racket[include-section]) as a
- document.
-
-A @deftech{flow} is a list of @techlink{blocks}.
-
-A @deftech{block} is either a @techlink{table}, an
- @techlink{itemization}, a @techlink{nested flow}, a
- @techlink{paragraph}, a @techlink{compound paragraph}, a
- @techlink{traverse block}, or a @techlink{delayed block}.
-
-@itemize[
-
-       @item{A @deftech{table} is an instance of @racket[table]; it
-             has a list of list of @techlink{blocks} corresponding to
-             table cells.}
-
-       @item{A @deftech{itemization} is an instance of @racket[itemization];
-             it has a list of @techlink{flows}.}
-
-       @item{A @deftech{nested flow} is an instance of
-             @racket[nested-flow]; it has a @tech{flow} that
-             is typeset as sub-flow.}
-
-       @item{A @deftech{paragraph} is an instance of
-             @racket[paragraph]; it has a @tech{content}:
-
-             @itemize[
-
-             @item{An @deftech{content} can be a string, one of a few
-                   symbols, an instance of @racket[element] (possibly
-                   @racket[link-element], etc.), a @racket[multiarg-element], a
-                   a @techlink{traverse element}, @techlink{part-relative element}, a
-                   @techlink{delayed element}, or a list of content.
-
-                   @itemize[
-
-                   @item{A string is included in the result
-                         document verbatim, except for space, and
-                         unless the content's enclosing @tech{style} is
-                         @racket['hspace]. In a style other than
-                         @racket['hspace], consecutive spaces in the
-                         output may be collapsed togther or replaced
-                         with a line break. In the style
-                         @racket['hspace], all text is converted to
-                         uncollapsable spaces that cannot be broken
-                         across lines.}
-
-                   @item{A symbol content is either @racket['mdash],
-                         @racket['ndash], @racket['ldquo],
-                         @racket['lsquo], @racket['rdquo], @racket['rsquo], @racket['larr],
-                         @racket['rarr], or @racket['prime]; it is
-                         rendered as the corresponding HTML entity
-                         (even for Latex output).}
-
-                   @item{An instance of @racket[element] has a
-                         @techlink{content} plus a @tech{style}. The style's
-                         interpretation depends on the renderer, but it
-                         can be one of a few special symbols (such as
-                         @racket['bold]) that are recognized by all
-                         renderers.}
-
-                   @item{An instance of @racket[link-element] has a
-                         @techlink{tag} for the target of the link.}
-
-                   @item{An instance of @racket[target-element] has a
-                         @techlink{tag} to be referenced by
-                         @racket[link-element]s. An instance of the
-                         subtype @racket[toc-target-element] is
-                         treated like a kind of section label, to be
-                         shown in the ``on this page'' table for HTML
-                         output.}
-
-                   @item{An instance of @racket[index-element] has a
-                         @techlink{tag} (as a target), a list of
-                         strings for the keywords (for sorting and
-                         search), and a list of @techlink{contents} to
-                         appear in the end-of-document index.}
-
-                   @item{An instance of @racket[image-element]
-                         incorporates an image from a file into the rendered
-                         document.}
-
-                   @item{An instance of @racket[multiarg-element]
-                         combines a style with a list of content,
-                         where the style corresponds to a rendered
-                         command that takes multiple arguments.}
-
-                   @item{An instance of @racket[collect-element] has a
-                         procedure that is called in the
-                         @techlink{collect pass} of document
-                         processing to record information used by
-                         later passes.}
-
-                   @item{A @deftech{traverse element} is an instance
-                         of @racket[traverse-element], which
-                         ultimately produces content, but can
-                         accumulate and inspect information in the
-                         @tech{traverse pass}.}
-
-                   @item{A @deftech{part-relative element} is an
-                         instance of @racket[part-relative-element],
-                         which has a procedure that is called in the
-                         @techlink{collect pass} of document
-                         processing to obtain @defterm{content}. When the
-                         part-relative element's procedure is called,
-                         collected information is not yet available,
-                         but information about the enclosing parts is
-                         available.}
-
-                   @item{A @deftech{delayed element} is an instance of
-                         @racket[delayed-element], which has a
-                         procedure that is called in the
-                         @techlink{resolve pass} of document
-                         processing to obtain @defterm{content}.}
-
-                   @item{An instance of @racket[render-element] has a
-                         procedure that is called in the
-                         @techlink{render pass} of document
-                         processing.}
-
-             ]}]}
-
-       @item{A @deftech{compound paragraph} is an instance of
-             @racket[compound-paragraph]; like @racket[blockquote], it
-             has list of @tech{blocks}, but the blocks are typeset as
-             a single paragraph (e.g., no indentation after the first
-             block) instead of inset.}
-
-       @item{A @deftech{traverse block} is an instance of
-             @racket[traverse-block], which ultimately produces
-             another block, but can accumulate and inspect information
-             during the @tech{traverse pass}.}
-
-       @item{A @deftech{delayed block} is an instance of
-             @racket[delayed-block], which has a procedure that
-             is called in the @techlink{resolve pass} of document
-             processing to obtain a @defterm{block}.}
-
-]
-
-@; ------------------------------------------------------------------------
-
-@section[#:tag "tags"]{Tags}
-
-A @deftech{tag} is a list containing a symbol and either a string, a
-@racket[generated-tag] instance, or an arbitrary list. The symbol
-effectively identifies the type of the tag, such as @racket['part] for
-a tag that links to a part, or @racket['def] for a Racket function
-definition. The symbol also effectively determines the interpretation
-of the second half of the tag.
-
-A part can have a @deftech{tag prefix}, which is effectively added
-onto the second item within each tag whose first item is
-@racket['part], @racket['tech], or @racket['cite], or whose second
-item is a list that starts with @racket['prefixable]:
-
-@itemlist[
-
- @item{The prefix is added to a string second item by creating a list
-       containing the prefix and string.}
-
- @item{The prefix is added to a list second item after @racket['part],
-       @racket['tech], or @racket['cite] using @racket[cons].}
-
- @item{The prefix is added to a second item that starts
-       @racket['prefixable] by adding it to the list after
-       @racket['prefixable].}
-
- @item{A prefix is not added to a  @racket[generated-tag] item.}
-
-]
-
-The prefix is used for reference outside the part, including the use
-of tags in the part's @racket[tags] field. Typically, a document's
-main part has a tag prefix that applies to the whole document;
-references to sections and defined terms within the document from
-other documents must include the prefix, while references within the
-same document omit the prefix. Part prefixes can be used within a
-document as well, to help disambiguate references within the document.
-
-Some procedures accept a ``tag'' that is just the string part of the
-full tag, where the symbol part is supplied automatically. For
-example, @racket[section] and @racket[secref] both accept a string
-``tag'', where @racket['part] is implicit.
-
-The @racketmodname[scribble/tag] library provides functions for constructing
-@tech{tags}.
-
-@; ------------------------------------------------------------------------
-
-@section[#:tag "style"]{Styles}
-
-A @deftech{style} combines a @tech{style name} with a list of
-@tech{style properties} in a @racket[style] structure. A @deftech{style name}
-is either a string, symbol, or @racket[#f]. A @deftech{style property} can be
-anything, including a symbol or a structure such as
-@racket[color-property].
-
-A style has a single @tech{style name}, because the name typically
-corresponds to a configurable instruction to a renderer. For example,
-with Latex output, a string style name corresponds to a Latex command
-or environment. For more information on how string style names
-interact with configuration of a renderer, see
-@secref["config"]. Symbolic style names, meanwhile, provide a simple
-layer of abstraction between the renderer and documents for widely
-supported style; for example, the @racket['italic] style name is
-supported by all renderers.
-
-@tech{Style properties} within a style compose with style names and other
-properties. Again, symbols are often used for properties that are directly
-supported by renderers. For example, @racket['unnumbered] style
-property for a @tech{part} renders the part without a section number.
-Many properties are renderer-specific, such as a @racket[hover-property]
-structure that associates text with an element to be shown in an
-HTML display when the mouse hovers over the text.
-
-@; ------------------------------------------------------------------------
-
-@section[#:tag "passes"]{Collected and Resolved Information}
-
-The @techlink{collect pass}, @techlink{resolve pass}, and
-@techlink{render pass} processing steps all produce information that
-is specific to a rendering mode. Concretely, the operations are all
-represented as methods on a @racket[render<%>] object.
-
-The result of the @method[render<%> collect] method is a
-@racket[collect-info] instance. This result is provided back as an
-argument to the @method[render<%> resolve] method, which produces a
-@racket[resolve-info] value that encapsulates the results from both
-iterations. The @racket[resolve-info] value is provided back to the
-@method[render<%> resolve] method for final rendering.
-
-Optionally, before the @method[render<%> resolve] method is called,
-serialized information from other documents can be folded into the
-@racket[collect-info] instance via the @method[render<%>
-deserialize-info] method. Other methods provide serialized information
-out of the collected and resolved records.
-
-During the @techlink{collect pass}, the procedure associated with a
-@racket[collect-element] instance can register information with
-@racket[collect-put!].
-
-During the @techlink{resolve pass}, collected information for a part
-can be extracted with @racket[part-collected-info], which includes a
-part's number and its parent part (or @racket[#f]). More generally,
-the @racket[resolve-get] method looks up information previously
-collected. This resolve-time information is normally obtained by the
-procedure associated with a @techlink{delayed block} or
-@techlink{delayed element}.
-
-The @racket[resolve-get] information accepts both a @racket[part] and
-a @racket[resolve-info] argument. The @racket[part] argument enables
-searching for information in each enclosing part before sibling parts.
-
-@; ------------------------------------------------------------------------
-
-@section{Structure Reference}
-
-@defstruct[part ([tag-prefix (or/c #f string?)]
-                 [tags (listof tag?)]
-                 [title-content (or/c #f list?)]
-                 [style style?]
-                 [to-collect list?]
-                 [blocks (listof block?)]
-                 [parts (listof part?)])]{
-
-The @racket[tag-prefix] field determines the optional @techlink{tag
-prefix} for the part.
-
-The @racket[tags] indicates a list of @techlink{tags} that each link
-to the section. Normally, @racket[tags] should be a non-empty list, so
-that hyperlinks can target the section.
-
-The @racket[title-content] field holds the part's title, if any.
-
-For the @racket[style] field, the currently recognized symbolic style
-names are as follows:
-
-@itemize[
-
- @item{@racket['index] --- The part represents an index.}
-
-]
-
-The recognized @tech{style properties} are as follows:
-
-@itemize[
-
- @item{@racket['unnumbered] --- A section number is not computed or
-       rendered for the section.}
-
- @item{@racket['hidden-number] --- A section number is computed for
-       the section, but it is not rendered as part of the section name.}
-
- @item{@racket['toc-hidden] --- The part title is not shown in tables
-       of contents, including in ``on this page'' boxes. For Latex
-       rendering, the part title is omitted only if it is unnumbered
-       or has a hidden number.}
-
- @item{@racket['hidden] --- The part title is not shown; for Latex
-       output, the part title is not shown only if its is empty, and
-       in that case, it is also excluded from tables of contents.  The
-       @racket['toc-hidden] @tech{style property} usually should be included with
-       @racket['hidden] (for consistency in non-Latex output).}
-
- @item{@racket['grouper] --- The part is numbered with a Roman
-       numeral, and its subsections continue numbering as if they
-       appeared in the preceeding part. In other words, the part acts
-       like a ``part'' in a book where chapter numbering is continuous
-       across parts.}
-
- @item{@racket['toc] --- Sub-parts of the part are rendered on separate
-       pages for multi-page HTML mode.}
-
- @item{@racket['non-toc] --- Initial sub-parts of the part are
-       @emph{not} rendered on separate pages for multi-page HTML
-       mode; this @tech{style property} applies only to the main part.}
-
- @item{@racket['reveal] --- Shows sub-parts when this part is
-       displayed in a table-of-contents panel in HTML output (which
-       normally shows only the top-level sections).}
-
- @item{@racket['quiet] --- In HTML output and most other output modes,
-       hides entries for sub-parts of this part in a
-       @racket[table-of-contents] or @racket[local-table-of-contents]
-       listing except when those sub-parts are top-level entries in
-       the listing.}
-
- @item{@racket['no-toc] --- As a @tech{style property} for the main part of a
-       rendered page, causes the HTML output to not include a margin box
-       for the main table of contents; the ``on this page'' box that
-       contains @racket[toc-element] and @racket[toc-target-element]
-       links (and that only includes an ``on this page'' label for
-       multi-page documents) takes on the location and color of the
-       main table of contents, instead.}
-
- @item{@racket['no-sidebar] --- As a @tech{style property} for the main part of a
-       document, causes the HTML output to not include an ``on this 
-       page'' margin box.}
-
- @item{@racket[document-version] structure --- A version number for
-       this part and its sub-parts (except as overridden). When it is
-       not @racket[""] may be used when rendering a document; at a
-       minimum, a non-@racket[""] version is rendered when it is
-       attached to a part representing the whole document. The default
-       version for a document is @racket[(version)]. In rendered form,
-       the version is normally prefixed with the word ``Version,'' but
-       this formatting can be controlled by overriding
-       @tt{.version:before} and/or @tt{.versionNoNav:before} in CSS
-       for HTML rendering or by redefining the @tt{\SVersionBefore}
-       macro for Latex rendering (see @secref["config"]).}
-
- @item{@racket[document-date] structure --- A date for the part,
-       normally used on a document's main part for for Latex
-       output. The default date for a document is @racket[#f], which
-       avoids explicitly specifying a date at the Latex level, so that
-       the current date is used as the document date. Set the date to
-       @racket[""] to suppress a date in an output document.}
-
-  @item{@racket[body-id] structure --- Generated HTML uses the given
-        string @tt{id} attribute of the @tt{<body>} tag; this @tech{style property} can
-        be set separately for parts that start different HTML pages,
-        otherwise it is effectively inherited by sub-parts; the
-        default is @racket["scribble-racket-lang.org"], but
-        @exec{setup-plt} installs @racket["doc-racket-lang.org"] as the
-        @tt{id} for any document that it builds.}
-
- @item{@racket[attributes] structure --- Provides additional HTML
-       attributes for the @tt{<html>} tag when the part corresponds to
-       its own HTML page.}
-
- @item{@racket[head-extra] structure --- Provides additional HTML
-       content for the @tt{<head>} tag when the part corresponds to
-       its own HTML page.}
-
- @item{@racket[color-property] structure --- For HTML, applies a color
-       to the part title.}
-
- @item{@racket[background-color-property] structure --- For HTML,
-       applies a color to the background of the part title.}
-
- @item{@racket[hover-property] structure --- For HTML, adds a text
-       label to the title to be shown when the mouse hovers over
-       it.}
-           
- @item{@racket[render-convertible-as] structure --- For HTML, controls
-        how objects that subscribe to the @racketmodname[file/convertible]
-        protocol are rendered.}
-
- @item{@racket[document-source] structure --- For HTML, provides a
-        module path for the part's source. Clicking on an HTML section
-        title generated for the part or its sub-parts may show the
-        module path plus a section-tag string, so that the user can
-        create a reference to the section.}
-
-]
-
-The @racket[to-collect] field contains @techlink{content} that is
-inspected during the @techlink{collect pass}, but ignored in later
-passes (i.e., it doesn't directly contribute to the output).
-
-The @racket[blocks] field contains the part's initial flow (before
-sub-parts).
-
-The @racket[parts] field contains sub-parts.
-
-}
-
-
-@defstruct[paragraph ([style style?] [content content?])]{
-
-A @techlink{paragraph} has a @tech{style} and a @tech{content}.
-
-For the @racket[style] field, a string @tech{style name} corresponds
-to a CSS class for HTML output or a macro for Latex output (see
-@secref["extra-style"]). The following symbolic @tech{style names} are
-recognized:
-
-@itemize[
-
- @item{@racket['author] --- Typeset as the author of a document.  Such
-       paragraphs normally should appear only in the initial flow of a
-       @racket[part] for a document, where they are treated specially
-       by the Latex renderer by moving the author information to the
-       title.}
-
- @item{@racket['pretitle] --- Typeset before the title of the
-       enclosing part.}
-
- @item{@racket['wraps] --- Like a @racket[#f] @tech{style name}, but not
-       @tech{boxable} in the sense of @racket[box-mode] for Latex output.}
-
-]
-
-When a paragraph's style is @racket[#f], then it is @tech{boxable} in the
-sense of @racket[box-mode] for Latex output.
-
-The currently recognized @tech{style properties} are as follows:
-
-@itemize[
-
- @item{@racket['omitable] --- When a table cell contains a single
-       @racket[paragraph] with the @racket['omitable] @tech{style property},
-       then when rendering to HTML, no @tt{<p>} tag wraps the cell
-       content.}
-
- @item{@racket['div] --- Generates @tt{<div>} HTML output instead of
-       @tt{<p>} (unless a @racket[alt-tag] property is provided).}
-
- @item{@racket[alt-tag] structure --- Generates the indicated HTML tag
-       instead of @tt{<p>} or @tt{<div>}.}
-
- @item{@racket[attributes] structure --- Provides additional HTML
-       attributes for the @tt{<p>}, @tt{<div>}, or alternate tag.}
-
- @item{@racket[body-id] structure --- For HTML, uses the given string
-       as an @tt{id} attribute of the @tt{<p>}, @tt{<div>}, or
-       alternate tag.}
-
- @item{@racket['never-indents] --- For Latex and @tech{compound
-       paragraphs}; see @racket[compound-paragraph].}
-
- @item{@racket[box-mode] structure --- For Latex output, uses an alternate
-       rendering form for @tech{boxing contexts} (such as a table cell); see
-       @racket[box-mode].}
-
-]}
-
-
-@defstruct[table ([style style?]
-                  [blockss (listof (listof (or/c block? 'cont)))])]{
-
-See also the @racket[tabular] function.
-
-A @techlink{table} has, roughly, a list of list of blocks. A cell in
-the table can span multiple columns by using @racket['cont] instead of
-a block in the following columns (i.e., for all but the first in a set
-of cells that contain a single block).
-
-Within @racket[style], a string @tech{style name} corresponds to a CSS
-class for HTML output or an environment for Latex output (see
-@secref["extra-style"]). The following symbolic style names are also
-recognized:
-
-@itemize[
-
- @item{@racket['boxed] --- Renders as a definition.
-       This style name is not intended for use on a table that is
-       nested within a @racket['boxed] table; nested uses may look
-       right for some renders of the style but not others.}
-
- @item{@racket['centered] --- Centers HTML output horizontally.}
-
- @item{@racket['block] --- Prevents pages breaks in Latex output.}
-
-]
-
-The following @tech{style properties} are currently recognized:
-
-@itemize[
-
- @item{@racket[table-columns] structure --- Provides column-specific
-       styles, but only @racket[column-attributes] properties (if any)
-       are used if a @racket[table-cells] structure is included as a
-       @tech{style property}. See @racket[table-cells] for information
-       about how a column style is used for each cell.}
-
- @item{@racket[table-cells] structure --- Provides cell-specific
-       styles. See @racket[table-cells] for information about how the
-       styles are used.}
-
- @item{@racket[attributes] structure --- Provides additional HTML
-       attributes for the @tt{<table>} tag.}
-
- @item{@racket[body-id] structure --- For HTML, uses the given string
-       as an @tt{id} attribute of the @tt{<table>} tag.}
-
- @item{@racket['aux] --- For HTML, include the table in the
-       table-of-contents display for the enclosing part.}
-
- @item{@racket['never-indents] --- For Latex and @tech{compound
-       paragraphs}; see @racket[compound-paragraph].}
-
-]
-
-For Latex output, a paragraph as a cell value is not automatically
-line-wrapped, unless a vertical alignment is specified for the cell
-through a @racket[table-cells] or @racket[table-columns]
-@tech{style property}. To get a line-wrapped paragraph, use a
-@racket[compound-paragraph] or use an element with a string style and
-define a corresponding Latex macro in terms of @ltx{parbox}. For Latex
-output of blocks in the flow that are @racket[nested-flow]s,
-@racket[itemization]s, @racket[compound-paragraph]s, or
-@racket[delayed-block]s, the block is wrapped with @ltxe{minipage} using
-@ltx{linewidth} divided by the column count as the width.}
-
-
-@defstruct[itemization ([style style?]
-                        [blockss (listof (listof block?))])]{
-
-A @techlink{itemization} has a @tech{style} and a list of @tech{flows}.
-
-In @racket[style], a string @tech{style name} corresponds to a CSS
-class for HTML output or a macro for Latex output (see
-@secref["extra-style"]). In addition, the following symbolic style
-names are recognized:
-
-@itemize[
-
- @item{@racket['compact] --- Reduces space between items.}
-
- @item{@racket['ordered] --- Generates @tt{<ol>} HTML output instead
-       of @tt{<ul>} or an Latex enumeration instead of an
-       itemization.}
-]
-
-The following @tech{style properties} are currently recognized:
-
-@itemize[
-
- @item{@racket[attributes] structure --- Provides additional HTML
-       attributes for the @tt{<ul>} or @tt{<ol>} tag.}
-
- @item{@racket[body-id] structure --- For HTML, uses the given string
-       as an @tt{id} attribute of the @tt{<ul>} or @tt{<ol>} tag.}
-
- @item{@racket['never-indents] --- For Latex and @tech{compound
-       paragraphs}; see @racket[compound-paragraph].}
-
-]}
-
-
-@defstruct[nested-flow ([style any/c]
-                        [blocks (listof block?)])]{
-
-A @techlink{nested flow} has a style and a @tech{flow}.
-
-In @racket[style], the @tech{style name} is normally a string that
-corresponds to a CSS class for HTML @tt{<blockquote>} output or a Latex
-environment (see @secref["extra-style"]). The following symbolic style
-names are recognized:
-
-@itemize[
-
- @item{@racket['inset] --- Insets the nested flow relative to
-       surrounding text.}
-
- @item{@racket['code-inset] --- Insets the nested flow relative to
-       surrounding text in a way suitable for code. If the nested flow
-       has a single block, then it is @tech{boxable} in the sense of
-       @racket[box-mode] for Latex output.}
-
- @item{@racket['vertical-inset] --- Insets the nested flow vertically
-       relative to surrounding text, but not horizontally. If the
-       nested flow has a single block, then it is @tech{boxable} in the sense
-       of @racket[box-mode] for Latex output.}
-
-]
-
-The following @tech{style properties} are currently recognized:
-
-@itemize[
-
- @item{@racket['command] --- For Latex output, a string @tech{style
-       name} is used as a command name instead of an environment
-       name.}
-
- @item{@racket['multicommand] --- For Latex output, a string
-       @tech{style name} is used as a command name with a separate
-       argument for each block in @racket[blocks].}
-
- @item{@racket[attributes] structure --- Provides additional HTML
-       attributes for the @tt{<blockquote>} tag.}
-
- @item{@racket[body-id] structure --- For HTML, uses the given string
-       as an @tt{id} attribute of the @tt{<blockquote>} tag.}
-
- @item{@racket['never-indents] --- For Latex and @tech{compound
-       paragraphs}; see @racket[compound-paragraph].}
-
- @item{@racket[box-mode] structure --- For Latex output, uses an alternate
-       rendering form for @tech{boxing contexts} (such as a table cell); see
-       @racket[box-mode].}
-
- @item{@racket['decorative] --- The content of the nested flow is intended
-       for decoration. Text output skips a decorative nested flow.}
-
- @item{@racket[alt-tag] structure --- Generates the indicated HTML tag
-       instead of @tt{<blockquote>}.}
-
-]}
-
-
-@defstruct[compound-paragraph ([style style?]
-                               [blocks (listof block?)])]{
-
-A @techlink{compound paragraph} has a @tech{style} and a list of
-@tech{blocks}.
-
-For HTML, a @racket[paragraph] block in @racket[blocks] is rendered
-without a @tt{<p>} tag, unless the paragraph has a style with a
-non-@racket[#f] @tech{style name}. For Latex, each @tech{block} in
-@racket[blocks] is rendered with a preceding @ltx{noindent}, unless
-the block has the @racket['never-indents] property (checking
-recursively in a @racket[nested-flow] or @racket[compound-paragraph]
-if the @racket[nested-flow] or @racket[compound-paragraph] itself has
-no @racket['never-indents] property).
-
-The @racket[style] field of a compound paragraph is normally a string
-that corresponds to a CSS class for HTML output or Latex environment
-for Latex output (see @secref["extra-style"]). The following
-@tech{style properties} are currently recognized:
-
-@itemize[
-
- @item{@racket['command] --- For Latex output, a string @tech{style
-       name} is used as a command name instead of an environment
-       name.}
-
- @item{@racket[alt-tag] structure --- Generates the given HTML tag
-       instead of @tt{<p>}.}
-
- @item{@racket[attributes] structure --- Provides additional HTML
-       attributes for the @tt{<p>} or alternate tag.}
-
- @item{@racket[body-id] structure --- For HTML, uses the given string
-       as an @tt{id} attribute of the @tt{<p>} or alternate tag.}
-
- @item{@racket['never-indents] --- For Latex within another
-       @tech{compound paragraph}; see above.}
-
-]}
-
-
-@defstruct[traverse-block ([traverse block-traverse-procedure/c])]{
-
-Produces another block during the @tech{traverse pass}, eventually.
-
-The @racket[traverse] procedure is called with @racket[_get] and
-@racket[_set] procedures to get and set symbol-keyed information; the
-@racket[traverse] procedure should return either a @tech{block} (which
-effectively takes the @racket[traverse-block]'s place) or a procedure
-like @racket[traverse] to be called in the next iteration of the
-@tech{traverse pass}.
-
-All @racket[traverse-element] and @racket[traverse-block]s that have
-not been replaced are forced in document order relative to each other
-during an iteration of the @tech{traverse pass}.
-
-The @racket[_get] procedure passed to @racket[traverse] takes a symbol
-and any value to act as a default; it returns information registered
-for the symbol or the given default if no value has been
-registered. The @racket[_set] procedure passed to @racket[traverse]
-takes a symbol and a value to registered for the symbol.
-
-@margin-note*{See also @racket[cond-block] in @racketmodname[scriblib/render-cond].}
-@;
-The symbol @indexed-racket['scribble:current-render-mode] is
-automatically registered to a list of symbols that describe the
-target of document rendering. The list contains @racket['html]
-when rendering to HTML, @racket['latex] when rendering via Latex, and
-@racket['text] when rendering to text. The registration of
-@racket['scribble:current-render-mode] cannot be changed via
-@racket[_set].}
-
-
-@defstruct[delayed-block ([resolve (any/c part? resolve-info? . -> . block?)])]{
-
-The @racket[resolve] procedure is called during the @techlink{resolve
-pass} to obtain a normal @tech{block}. The first argument to
-@racket[resolve] is the renderer.
-
-}
-
-
-@defstruct[element ([style element-style?]
-                    [content content?])]{
-
-Styled @tech{content} within an enclosing @tech{paragraph} or other content.
-
-The @racket[style] field can be a @racket[style] structure, but it can
-also be just a @tech{style name}.
-
-In @racket[style], a string @tech{style name} corresponds to a CSS
-class for HTML output and a macro name for Latex output (see
-@secref["extra-style"]). The following symbolic style names are
-recognized:
-
-@itemize[
-
- @item{@racket['tt], @racket['italic], @racket['bold], @racket['roman], @racket['sf],
-       @racket['url], @racket['subscript], @racket['superscript], 
-       @racket['smaller], @racket['larger] ---
-       Basic styles recognized by all renders.}
-
- @item{@racket['hspace] --- Renders its @racket[content] as monospace
-       blanks.}
- 
- @item{@racket['newline] --- Renders a line break independent of
-       the @racket[content].}
-
- @item{@racket['no-break] --- Prevents line breaks when rendering
-       @racket[content].}
-
-]
-
-The following @tech{style properties} are currently recognized:
-
-@itemize[
-
- @item{@racket[target-url] structure --- Generates a hyperlink.}
-
- @item{@racket[url-anchor] structure --- For HTML, inserts a hyperlink
-       target before @racket[content].}
-
- @item{@racket[color-property] structure --- Applies a color to the
-       text of @racket[content].}
-
- @item{@racket[background-color-property] structure --- Applies a
-       color to the background of @racket[content].}
-
- @item{@racket[alt-tag] structure --- Generates the given HTML tag
-       instead of the default one (@tt{<span>}, @tt{b}, @|etc|).}
-
- @item{@racket[attributes] structure --- Provides additional HTML
-       attributes for a tag.}
-
- @item{@racket[hover-property] structure --- For HTML, adds a text
-       label to the content to be shown when the mouse hovers over
-       it.}
-
- @item{@racket[script-property] structure --- For HTML, supplies a
-       script alternative to @racket[content].}
-
-  @item{@racket[body-id] structure --- For HTML uses the given
-        string as an @tt{id} attribute of the @tt{<span>} tag.}
-
-  @item{@racket['aux] --- Intended for use in titles, where the
-        auxiliary part of the title can be omitted in hyperlinks. See,
-        for example, @racket[secref].}
-
-  @item{@racket['tt-chars] --- For Latex output, when the @tech{style
-        name} is a string, render the element's content with escapes
-        suitable for Latex @tt{tt} mode.}
-
-  @item{@racket['exact-chars] --- For Latex output, when the @tech{style
-        name} is a string or @racket[#f], render the elements content exactly
-        (without escapes).}
-
-  @item{@racket[command-extras] structure --- For Latex output,
-         adds strings as arguments to the Latex command.}
-
-]
-
-@history[#:changed "1.6" @elem{Changed @racket['exact-chars] handling to
-         take effect when the style name is @racket[#f].}]}
-
-
-@defstruct[(image-element element) ([path (or/c path-string?
-                                                (cons/c 'collects (listof bytes?)))]
-                                    [suffixes (listof #rx"^[.]")]
-                                    [scale real?])]{
-
-Used as a style for an @racket[element] to inline an image. The
-@racket[path] field can be a result of
-@racket[path->main-collects-relative].
-
-For each string in @racket[suffixes], if the rendered works with the
-corresponding suffix, the suffix is added to @racket[path] and used if
-the resulting path refers to a file that exists. The order in
-@racket[suffixes] determines the order in which suffixes are
-tried. The HTML renderer supports @racket[".png"], @racket[".gif"], and @racket[".svg"],
-while the Latex renderer supports @racket[".png"], @racket[".pdf"],
-and @racket[".ps"] (but rendering Latex output to PDF will not work
-with @racket[".ps"] files, while rendering to Latex DVI output works
-only with @racket[".ps"] files). If @racket[suffixes] is empty or if
-none of the suffixes lead to files that exist, @racket[path] is used
-as-is.
-
-The @racket[scale] field scales the image in its rendered form.}
-
-
-@defstruct[(target-element element) ([_tag tag?])]{
-
-Declares the content as a hyperlink target for @racket[_tag].}
-
-
-@defstruct[(toc-target-element target-element) ()]{
-
-Like @racket[target-element], the content is also a kind of section
-label to be shown in the ``on this page'' table for HTML output.}
-
-
-@defstruct[(toc-target2-element toc-target-element) ([toc-content content?])]{
-
-Extends @racket[target-element] with a separate field for the content
-to be shown in the ``on this page'' table for HTML output.}
-
-
-@defstruct[(page-target-element target-element) ()]{
-
-Like @racket[target-element], but a link to the element goes to the
-top of the containing page.}
-
-
-@defstruct[(redirect-target-element target-element) ([alt-path path-string?]
-                                                     [alt-anchor string?])]{
-
-Like @racket[target-element], but a link to the element is redirected
-to the given URL.}
-
-
-@defstruct[(toc-element element) ([toc-content content?])]{
-
-Similar to @racket[toc-target-element], but with specific content for
-the ``on this page'' table specified in the @racket[toc-content]
-field.}
-
-
-@defstruct[(link-element element) ([tag tag?])]{
-
-Hyperlinks the content to @racket[_tag].
-
-When @racket[_tag] is a part tag and the content of the element is
-@racket[null], then the hyperlink uses the target part's number and/or
-title as the content. In that case, if the section number is preceded
-by a word, the word starts in uppercase if the element's style includes a
-@racket['uppercase] property.
-
-The following symbol is recognized as a @tech{style property}:
-
-@itemize[
-
- @item{@racket['indirect-link] --- For HTML output, treats the link as
-       ``external''. When rendering to HTML and the
-       @method[render-mixin set-external-tag-path] method is called to
-       provide an external-link URL, then the resolution of the
-       hyperlink can be deferred until the link is clicked (or, in
-       some cases, patched by JavaScript when the documentation is
-       viewed in a browser).}
-
-]}
-
-
-@defstruct[(index-element element) ([tag tag?]
-                                    [plain-seq (and/c pair? (listof string?))]
-                                    [entry-seq (listof content?)]
-                                    [desc any/c])]{
-
-The @racket[plain-seq] specifies the keys for sorting, where the first
-string is the main key, the second is a sub-key, etc. For
-example, an ``night'' portion of an index might have sub-entries for
-``night, things that go bump in'' and ``night, defender of the''. The
-former would be represented by @racket[plain-seq] @racket['("night"
-"things that go bump in")], and the latter by @racket['("night"
-"defender of the")]. Naturally, single-string
-@racket[plain-seq] lists are the common case, and at least one word is
-required, but there is no limit to the word-list length. The strings in 
-@racket[plain-seq] must not contain a newline character.
-
-The @racket[entry-seq] list must have the same length as
-@racket[plain-seq]. It provides the form of each key to render in the
-final document.
-
-The @racket[desc] field provides additional information about the
-index entry as supplied by the entry creator. For example, a reference
-to a procedure binding can be recognized when @racket[desc] is an
-instance of @racket[procedure-index-desc]. See
-@racketmodname[scribble/manual-struct] for other typical types of
-@racket[desc] values.
-
-See also @racket[index].}
-
-
-@defstruct[multiarg-element ([style element-style?]
-                             [contents (listof content?)])]{
-
-Like @racket[element] with a list for content, except that for Latex
-output, if the @tech{style name} in @racket[style] is a string, then
-it corresponds to a Latex command that accepts as many arguments (each
-in curly braces) as elements of @racket[contents].}
-
-
-@defstruct[traverse-element ([traverse element-traverse-procedure/c])]{
-
-@margin-note*{See also @racket[cond-element] in @racketmodname[scriblib/render-cond].}
-@;
-Like @racket[traverse-block], but the @racket[traverse] procedure must
-eventually produce @tech{content}, rather than a @tech{block}.}
-
-
-@defstruct[delayed-element ([resolve (any/c part? resolve-info? . -> . content?)]
-                            [sizer (-> any/c)]
-                            [plain (-> any/c)])]{
-
-The @racket[render] procedure's arguments are the same as for
-@racket[delayed-block], but the result is @techlink{content}. 
-Unlike @racket[delayed-block], the
-result of the @racket[render] procedure's argument is remembered on
-the first call for re-use for a particular resolve pass.
-
-The @racket[sizer] field is a procedure that produces a substitute
-@techlink{content} for the delayed element for the purposes of
-determining the delayed element's width (see @racket[element-width]).
-
-The @racket[plain] field is a procedure that produces a substitute
-@techlink{content} when needed before the @techlink{collect pass},
-such as when @racket[element->string] is used before the @tech{collect
-pass}.}
-
-
-@defstruct[part-relative-element ([resolve (collect-info? . -> . content?)]
-                                  [sizer (-> any/c)]
-                                  [plain (-> any/c)])]{
-
-Similar to @racket[delayed-block], but the replacement
-@techlink{content} is obtained in the @techlink{collect pass} by
-calling the function in the @racket[resolve] field.
-
-The @racket[resolve] function can call @racket[collect-info-parents]
-to obtain a list of @techlink{parts} that enclose the element,
-starting with the nearest enclosing section. Functions like
-@racket[part-collected-info] and @racket[collected-info-number] can
-extract information like the part number.}
-
-
-@defstruct[(collect-element element) ([collect (collect-info . -> . any)])]{
-
-Like @racket[element], but the @racket[collect] procedure is called
-during the @techlink{collect pass}. The @racket[collect] procedure
-normally calls @racket[collect-put!].
-
-Unlike @racket[delayed-element] or @racket[part-relative-element], the
-element remains intact (i.e., it is not replaced) by either the
-@tech{collect pass} or @tech{resolve pass}.}
-
-
-@defstruct[(render-element element) ([render (any/c part? resolve-info? . -> . any)])]{
-
-Like @racket[delayed-element], but the @racket[render] procedure is called
-during the @techlink{render pass}.
-
-If a @racket[render-element] instance is serialized (such as when
-saving collected info), it is reduced to a @racket[element] instance.}
-
-
-@defstruct[collected-info ([number (listof (or/c #f exact-nonnegative-integer? string?))]
-                           [parent (or/c #f part?)]
-                           [info any/c])]{
-
-Computed for each part by the @techlink{collect pass}.
-
-The length of the @racket[number] list indicates the section's nesting
-depth.  Numbers in @racket[number] correspond to the section's number,
-it's parent's number, etc. A non-empty string is used for a
-@racket['grouper] section. For an unnumbered section, @racket[#f] is
-used in place of all numbers and @racket[""] in place of all non-empty
-strings.}
-
-
-@defstruct[target-url ([addr path-string?])]{
-
-Used as a @tech{style property} for an @racket[element]. A path is
-allowed for @racket[addr], but a string is interpreted as a URL rather
-than a file path.}
-
-
-@defstruct[document-version ([text (or/c string? #f)])]{
-
-Used as a @tech{style property} for a @racket[part] to indicate a
-version number.}
-
-
-@defstruct[document-date ([text (or/c string? #f)])]{
-
-Used as a @tech{style property} for a @racket[part] to indicate a
-date (which is typically used for Latex output).}
-
-
-@defstruct[color-property ([color (or/c string? (list/c byte? byte? byte?))])]{
-
-Used as a @tech{style property} for an @racket[element] to set its
-color. Recognized string names for @racket[color] depend on the
-renderer, but at the recognized set includes at least
-@racket["white"], @racket["black"], @racket["red"], @racket["green"],
-@racket["blue"], @racket["cyan"], @racket["magenta"], and
-@racket["yellow"]. When @racket[color] is a list of bytes, the values
-are used as RGB levels.
-
-When rendering to HTML, a @racket[color-property] is also recognized
-for a @tech{block}, @racket[part] (and used for the title in the
-latter case)or cell in a @racket[table].}
-
-
-@defstruct[background-color-property ([color (or/c string? (list/c byte? byte? byte?))])]{
-
-Like @racket[color-property], but sets the background color.}
-
-
-@defstruct[table-cells ([styless (listof (listof style?))])]{
-
-Used as a @tech{style property} for a @racket[table] to set its cells'
-styles.
-
-If a cell style has a string name, it is used as an HTML class for the
-@tt{<td>} tag or as a Latex command name.
-
-The following are recognized as cell-@tech{style properties}:
-
-@itemize[
-
- @item{@racket['left] --- Left-align the cell content.}
-
- @item{@racket['right] --- Right-align the cell content top baselines.}
-
- @item{@racket['center] --- Center the cell content horizontally.}
-
- @item{@racket['top] --- Top-align the cell content.}
-
- @item{@racket['baseline] --- Align the cell content top baselines.}
-
- @item{@racket['bottom] --- bottom-align the cell content.}
-
- @item{@racket['vcenter] --- Center the cell content vertically.}
-
- @item{@racket['border] --- Draw a line around all sides of the
-       cell. Borders along a shared edge of adjacent cells are
-       collapsed into a single line.}
-
- @item{@racket['left-border], @racket['right-border],
-       @racket['top-border], or @racket['bottom-border] --- Draw a
-       line along the corresponding side of the cell (with the same
-       border collapsing as for @racket['border]).}
-
- @item{@racket[color-property] structure --- For HTML, applies a color
-       to the cell content.}
-
- @item{@racket[background-color-property] structure --- For HTML,
-       applies a color to the background of the cell.}
-
- @item{@racket[attributes] --- Provides additional HTML attributes
-       for the cell's @tt{<td>} tag.}
-
-]
-
-@history[#:changed "1.1" @elem{Added @racket[color-property] and 
-                               @racket[background-color-property] support.}
-         #:changed "1.4" @elem{Added @racket['border], @racket['left-border],
-                               @racket['right-border], @racket['top-border],
-                               and @racket['bottom-border] support.}]}
-
-
-@defstruct[table-columns ([styles (listof style?)])]{
-
-Like @racket[table-cells], but with support for a
-@racket[column-attributes] property in each style, and the
-@racket[styles] list is otherwise duplicated for each row in the
-table. The non-@racket[column-attributes] parts of a
-@racket[table-columns] are used only when a @racket[table-cells] property is
-not present along with the @racket[table-columns] property.
-
-For HTML table rendering, for each column that has a
-@racket[column-attributes] property in the corresponding element of
-@racket[styles], the attributes are put into an HTML @tt{col} tag
-within the table.}
-
-
-@deftogether[(
-@defstruct[box-mode ([top-name string?]
-                     [center-name string?]
-                     [bottom-name string?])]
-@defproc[(box-mode* [name string?]) box-mode?]
-)]{
-
-As a @tech{style property}, indicates that a @tech{nested flow} or
-@tech{paragraph} is @deftech{boxable} when it is used in a
-@deftech{boxing context} for Latex output, but a @tech{nested flow} is
-@tech{boxable} only if its content is also @tech{boxable}.
-
-A @tech{boxing context} starts with a table cell in a multi-column
-table, and the content of a @tech{block} in a @tech{boxing context} is
-also in a @tech{boxing context}. If the cell's content is
-@tech{boxable}, then the content determines the width of the cell,
-otherwise a width is imposed. A @tech{paragraph} with a @racket[#f]
-@tech{style name} is @tech{boxable} as a single line; the
-@racket['wraps] @tech{style name} makes the paragraph
-non-@tech{boxable} so that its width is imposed and its content can
-use multiple lines. A @tech{table} is @tech{boxable} when that all of
-its cell content is boxable.
-
-To generate output in box mode, the @racket[box-mode] property
-supplies Latex macro names to apply to the @tech{nested flow} or
-@tech{paragraph} content. The @racket[top-name] macro is used if the
-box's top line is to be aligned with other boxes, @racket[center-name]
-if the box's center is to be aligned, and @racket[bottom-name] if the
-box's bottom line is to be aligned. The @racket[box-mode*] function
-creates a @racket[box-mode] structure with the same name for all three
-fields.
-
-A @racket[box-mode] @tech{style property} overrides any automatic
-boxed rendering (e.g., for a @tech{paragraph} with @tech{style name}
-@racket[#f]).  If a @tech{block} has both a @racket[box-mode]
-@tech{style property} and a @racket['multicommand] @tech{style
-property}, then the Latex macro @racket[top-name],
-@racket[center-name], or @racket[bottom-name] is applied with a
-separate argument for each of its content.}
-
-
-@defproc[(block? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a @racket[paragraph],
-@racket[table], @racket[itemization], @racket[nested-flow],
-@racket[traverse-block], or @racket[delayed-block], @racket[#f]
-otherwise.}
-
-
-@defproc[(content? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a string, symbol,
-@racket[element], @racket[multiarg-element],
-@racket[traverse-element], @racket[delayed-element],
-@racket[part-relative-element], a convertible value in 
-the sense of @racket[convertible?], or list of @tech{content}. 
-Otherwise, it returns @racket[#f].}
-
-
-@defstruct[style ([name (or/c string? symbol? #f)]
-                  [properties list?])]{
-
-Represents a @techlink{style}.}
-
-
-@defthing[plain style?]{
-
-A style @racket[(make-style #f null)].}
-
-
-@defproc[(element-style? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a string, symbol, @racket[#f],
-or @racket[style] structure.}
-
-
-@defproc[(tag? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is acceptable as a link
-@techlink{tag}, which is a list containing a symbol and either a
-string, a @racket[generated-tag] instance, or a non-empty list
-of @racket[serializable?] values.}
-
-
-@defstruct[generated-tag ()]{
-
-A placeholder for a tag to be generated during the @techlink{collect
- pass}. Use @racket[tag-key] to convert a tag containing a
- @racket[generated-tag] instance to one containing a string.
-
-}
-
-
-@defproc*[([(content->string (content content?)) string?]
-           [(content->string (content content?) (renderer any/c) (p part?) (info resolve-info?)) string?])]{
-
-Converts @tech{content} to a single string (essentially
-rendering the content as ``plain text'').
-
-If @racket[p] and @racket[info] arguments are not supplied, then a
-pre-``collect'' substitute is obtained for @tech{delayed
-elements}. Otherwise, the two arguments are used to force the
-@tech{delayed element} (if it has not been forced already).}
-
-@defproc[(content-width [c content?]) exact-nonnegative-integer?]{
-
-Returns the width in characters of the given @tech{content}.
-
-}
-
-
-@defproc[(block-width (e block?)) exact-nonnegative-integer?]{
-
-Returns the width in characters of the given @tech{block}.}
-
-
-@defstruct[collect-info ([fp any/c] [ht any/c] [ext-ht any/c] 
-                         [ext-demand (tag? collect-info? . -> . any/c)]
-                         [parts any/c] 
-                         [tags any/c] [gen-prefix any/c] 
-                         [relatives any/c] 
-                         [parents (listof part?)])]{
-
-Encapsulates information accumulated (or being accumulated) from the
-@techlink{collect pass}. The fields are exposed, but not currently
-intended for external use, except that @racket[collect-info-parents]
-is intended for external use.
-
-}
-
-@defstruct[resolve-info ([ci any/c] [delays any/c] [undef any/c] [searches any/c])]{
-
-Encapsulates information accumulated (or being accumulated) from the
-@techlink{resolve pass}. The fields are exposed, but not currently
-intended for external use.
-
-}
-
-@defproc[(info-key? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is an @deftech{info key}: a list of
-at least two elements whose first element is a symbol. The result is
-@racket[#f] otherwise.
-
-For a list that is an info tag, the interpretation of the second
-element of the list is effectively determined by the leading symbol,
-which classifies the key. However, a @racket[#f] value as the second
-element has an extra meaning: collected information mapped by such
-info keys is not propagated out of the part where it is collected;
-that is, the information is available within the part and its
-sub-parts, but not in ancestor or sibling parts.
-
-Note that every @techlink{tag} is an info key.
-
-}
-
-@defproc[(collect-put! [ci collect-info?] [key info-key?] [val any/c])
-         void?]{
-
-Registers information in @racket[ci]. This procedure should be called
-only during the @techlink{collect pass}.
-
-}
-
-@defproc[(resolve-get [p (or/c part? #f)] [ri resolve-info?] [key info-key?])
-         any/c]{
-
-Extract information during the @techlink{resolve pass} or
-@techlink{render pass} for @racket[p] from @racket[ri], where the
-information was previously registered during the @techlink{collect
-pass}. See also @secref["passes"].
-
-The result is @racket[#f] if the no value for the given key is found.
-Furthermore, the search failure is recorded for potential consistency
-reporting, such as when @exec{racket setup} is used to build
-documentation.
-
-}
-
-
-@defproc[(resolve-get/ext? [p (or/c part? #f)] [ri resolve-info?] [key info-key?])
-         (values any/c boolean?)]{
-
-Like @racket[render-get], but returns a second value to indicate
-whether the resulting information originated from an external source
-(i.e., a different document).}
-
-
-@defproc[(resolve-get/ext-id [p (or/c part? #f)] [ri resolve-info?] [key info-key?])
-         (values any/c (or/c boolean? string?))]{
-
-Like @racket[render-get/ext?], but the second result can be a string
-to indicate the source document's identification as established via
-@racket[load-xref] and a @racket[#:doc-id] argument.
-
-@history[#:added "1.1"]}
-
-
-@defproc[(resolve-search [dep-key any/c] [p (or/c part? #f)] [ri resolve-info?] [key info-key?])
-         void?]{
-
-Like @racket[resolve-get], but a shared @racket[dep-key] groups
-multiple searches as a single request for the purposes of consistency
-reporting and dependency tracking. That is, a single success for the
-same @racket[dep-key] means that all of the failed attempts for the
-same @racket[dep-key] have been satisfied. However, for dependency
-checking, such as when using @exec{racket setup} to re-build
-documentation, all attempts are recorded (in case external changes
-mean that an earlier attempt would succeed next time).
-
-}
-
-@defproc[(resolve-get/tentative [p (or/c part? #f)] [ri resolve-info?] [key info-key?])
-         any/c]{
-
-Like @racket[resolve-search], but without dependency tracking. For
-multi-document settings where dependencies are normally tracked, such
-as when using @exec{racket setup} to build documentation, this function
-is suitable for use only for information within a single document.
-
-}
-
-@defproc[(resolve-get-keys [p (or/c part? #f)]
-                           [ri resolve-info?] 
-                           [pred (info-key? . -> . any/c)])
-         list?]{
-
-Applies @racket[pred] to each key mapped for @racket[p] in
-@racket[ri], returning a list of all keys for which @racket[pred]
-returns a true value.
-
-}
-
-@defproc[(part-collected-info [p part?]
-                              [ri resolve-info?])
-         collected-info?]{
-
-Returns the information collected for @racket[p] as recorded within
-@racket[ri].
-
-}
-
-@defproc[(tag-key [t tag?] [ri resolve-info?]) tag?]{
-
-Converts a @racket[generated-tag] value with @racket[t] to a string.
-
-}
-
-
-@defproc[(traverse-block-block [b traverse-block?]
-                               [i (or/c resolve-info? collect-info?)])
-         block?]{
-
-Produces the block that replaces @racket[b].}
-
-
-@defproc[(traverse-element-content [e traverse-element?]
-                                   [i (or/c resolve-info? collect-info?)])
-         content?]{
-
-Produces the content that replaces @racket[e].}
-
-
-@defthing[block-traverse-procedure/c contract?]{
-
-Defined as
-
-@racketblock[
-  (recursive-contract
-   ((symbol? any/c . -> . any/c)
-    (symbol? any/c . -> . any)
-    . -> . (or/c block-traverse-procedure/c
-                 block?)))
-]}
-
-@defthing[element-traverse-procedure/c contract?]{
-
-Defined as
-
-@racketblock[
-  (recursive-contract
-   ((symbol? any/c . -> . any/c)
-    (symbol? any/c . -> . any)
-    . -> . (or/c element-traverse-procedure/c
-                 content?)))
-]}
-
-@; ----------------------------------------
-
-@section{HTML Style Properties}
-
-@defmodule[scribble/html-properties]{ The
-@racket[scribble/html-properties] library provides datatypes used as
-@tech{style properties} for HTML rendering.}
-
-
-@defstruct[attributes ([assoc (listof (cons/c symbol? string?))])]{
-
-Used as a @tech{style property} to add arbitrary attributes to an HTML
-tag.}
-
-
-@defstruct[alt-tag ([name (and/c string? #rx"^[a-zA-Z0-9]+$")])]{
-
-Use as a @tech{style property} for an @racket[element],
-@racket[paragraph], or @racket[compound-paragraph] to substitute an
-alternate HTML tag (instead of @tt{<span>}, @tt{<p>}, @tt{div},
-@|etc|).}
-
-
-@defstruct[column-attributes ([assoc (listof (cons/c symbol? string?))])]{
-
-Used as a @tech{style property} on a style with @racket[table-columns]
-to add arbitrary attributes to an HTML @tt{col} tag within the table.}
-
-
-@defstruct[url-anchor ([name string?])]{
-
-Used as a @tech{style property} with @racket[element] to insert an
-anchor before the element.}
-
-
-@defstruct[hover-property ([text string?])]{
-
-Used as a @tech{style property} with @racket[element] to add text that
-is shown when the mouse hovers over the element.}
-
-
-@defstruct[script-property ([type string?]
-                           [script (or/c path-string? (listof string?))])]{
-
-Used as a @tech{style property} with @racket[element] to supply a
-script alternative to the element content.}
-
-
-@defstruct[css-addition ([path (or/c path-string? 
-                                     (cons/c 'collects (listof bytes?))
-                                     url?
-                                     bytes?)])]{
-
-Used as a @tech{style property} to supply a CSS file (if @racket[path]
-is a path, string, or list), URL (if @racket[path] is a @racket[url]) or content (if @racket[path] is a byte
-string) to be referenced or included in the generated HTML. This
-property can be attached to any style, and all additions are collected
-to the top of the generated HTML page.
-
-The @racket[path] field can be a result of
-@racket[path->main-collects-relative].}
-
-@defstruct[css-style-addition ([path (or/c path-string? 
-                                           (cons/c 'collects (listof bytes?))
-                                           url?
-                                           bytes?)])]{
-
-Like @racket[css-addition], but added after any style files that are
-specified by a document and before any style files that are provided
-externally.}
-
-
-@defstruct[js-addition ([path (or/c path-string? 
-                                    (cons/c 'collects (listof bytes?))
-                                    url?
-                                    bytes?)])]{
-
-Like @racket[css-addition], but for a JavaScript file instead of a CSS file.}
-
-
-@defstruct[js-style-addition ([path (or/c path-string? 
-                                          (cons/c 'collects (listof bytes?))
-                                          url?
-                                          bytes?)])]{
-
-Like @racket[css-style-addition], but for a JavaScript file instead of a CSS file.}
-
-
-@defstruct[body-id ([value string?])]{
-
-Used as a @tech{style property} to associate an @tt{id} attribute with
-an HTML tag.}
-
-
-@defstruct[document-source ([module-path module-path?])]{
-
-Used as a @tech{style property} to associate a module path with a
-part.  Clicking on a section title within the part may show
-@racket[module-path] with the part's tag string, so that authors of
-other documents can link to the section.
-
-More specifically, the section title is given the HTML attributes
-@tt{x-source-module} and @tt{x-part-tag}, plus @tt{x-part-prefixes}
-if the section or enclosing sections declare tag prefixes. The
-@racketmodname[scribble/manual] style recognizes those tags to make
-clicking a title show cross-reference information.
-
-@history[#:added "1.2"
-         #:changed "1.7" @elem{Added @tt{x-part-prefixes}.}]}
-
-
-@defstruct[html-defaults ([prefix (or/c bytes? path-string? 
-                                        (cons/c 'collects (listof bytes?)))]
-                          [style (or/c bytes? path-string? 
-                                       (cons/c 'collects (listof bytes?)))]
-                          [extra-files (listof (or/c path-string? 
-                                                     (cons/c 'collects (listof bytes?))))])]{
-
-Like @racket[latex-defaults], but use for the 
-@exec{scribble} command-line tool's @DFlag{html} and
-@DFlag{htmls} modes.}
-
-
-@defstruct[head-extra ([xexpr xexpr/c])]{
-
-For a @racket[part] that corresponds to an HTML page, adds content to
-the @tt{<head>} tag.}
-
-
-@defstruct[render-convertible-as ([types (listof (or/c 'png-bytes 'svg-bytes))])]{
- For a @racket[part] that corresponds to an HTML page,
- controls how objects that subscribe to the @racketmodname[file/convertible]
- protocol are rendered.
-      
- The alternatives in the @racket[types] field are tried in order
- and the first one that succeeds is used in the html output.
-}
-
-@defstruct[part-link-redirect ([url url?])]{
-
-As a @tech{style property} on a @tech{part}, causes hyperiinks to the
-part to be redirected to @racket[url] instead of the rendered part.}
-
-@defstruct[link-resource ([path path-string?])]{
-
-As a @tech{style property} on an @racket[element], causes the elements
-to be rendered as a hyperlink to (a copy of) @racket[path].
-
-The file indicated by @racket[path] is referenced in place when
-@racket[render<%>] is instantiated with
-@racketidfont{refer-to-existing-files} as true. Otherwise, it is
-copied to the destination directory and potentially renamed to avoid
-conflicts.}
-
-
-@defstruct[install-resource ([path path-string?])]{
-
-Like @racket[link-resource], but makes @racket[path] accessible in the
-destination without rendering a hyperlink.
-
-This @tech{style property} is useful only when @racket[render<%>] is
-instantiated with @racketidfont{refer-to-existing-files} as
-@racket[#f], and only when @racket[path] does not match then name of
-any other file that is copied by the renderer to the destination.}
-
-@; ----------------------------------------
-
-@section{Latex Style Properties}
-
-@defmodule[scribble/latex-properties]{ The
-@racket[scribble/latex-properties] library provides datatypes used as
-@tech{style properties} for Latex rendering.}
-
-
-@defstruct[tex-addition ([path (or/c path-string? 
-                                     (cons/c 'collects (listof bytes?))
-                                     bytes?)])]{
-
-Used as a @tech{style property} to supply a @filepath{.tex} file (if
-@racket[path] is a path, string, or list) or content (if @racket[path]
-is a byte string) to be included in the generated Latex. This property
-can be attached to any style, and all additions are collected to the
-top of the generated Latex file.
-
-The @racket[path] field can be a result of
-@racket[path->main-collects-relative].}
-
-
-@defstruct[latex-defaults ([prefix (or/c bytes? path-string? 
-                                         (cons/c 'collects (listof bytes?)))]
-                           [style (or/c bytes? path-string? 
-                                        (cons/c 'collects (listof bytes?)))]
-                           [extra-files (listof (or/c path-string? 
-                                                      (cons/c 'collects (listof bytes?))))])]{
-
-Used as a @tech{style property} on the main @racket[part] of a document
-to set a default prefix file, style file, and extra files (see
-@secref["config-style"]).  The defaults are used by the
-@exec{scribble} command-line tool for and @DFlag{latex} or @DFlag{pdf}
-mode if none are supplied via @DFlag{prefix} and @DFlag{style} (where
-@racket[extra-files] are used only when @racket[prefix] is used). A
-byte-string value is used directly like file content, and a path can
-be a result of @racket[path->main-collects-relative].
-
-Languages (used with @hash-lang[]) like
-@racketmodname[scribble/manual] and @racketmodname[scribble/sigplan]
-add this property to a document to specify appropriate files for Latex
-rendering.
-
-See also @racketmodname[scribble/latex-prefix].}
-
-
-@defstruct[command-extras ([arguments (listof string?)])]{
-
-Used as a @tech{style property} on an @racket[element] to add extra
-arguments to the element's command in Latex output.}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/decode.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/decode.scrbl
deleted file mode 100644
index 3ce70c5afe..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/decode.scrbl
+++ /dev/null
@@ -1,228 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual "utils.rkt")
-
-@title[#:tag "decode"]{Decoding Text}
-
-@defmodule[scribble/decode]{The @racketmodname[scribble/decode]
-library helps you write document content in a natural way---more like
-plain text, except for @litchar["@"] escapes.  Roughly, it processes a
-stream of strings to produces instances of the
-@racketmodname[scribble/struct] datatypes (see @secref["struct"]).}
-
-At the @tech{flow} level, decoding recognizes a blank line as a
-@tech{paragraph} separator. Blocks and paragraphs without blank lines
-in between are collected into a @tech{compound paragraph}.
-
-@elemtag['(decode "rules")]{At} the @tech{content} level, decoding
-makes just a few special text conversions:
-
-@itemize[
-
- @item{@litchar{---}: converted to @racket['mdash]}
-
- @item{@litchar{--}: converted to @racket['ndash]}
-
- @item{@litchar{``}: converted to @racket['ldquo], which is fancy open quotes: ``}
-
- @item{@litchar{''}: converted to @racket['rdquo], which is fancy closing quotes: ''}
-
- @item{@litchar{'}: converted to @racket['rsquo], which is a fancy apostrophe: '}
-
- @item{@litchar{`}: converted to @racket['lsquo], which is a fancy quote: `}
-
-]
-
-Some functions @deftech{decode} a sequence of @racket[_pre-flow] or
-@racket[_pre-content] arguments using @racket[decode-flow] or
-@racket[decode-content], respectively. For example, the @racket[bold]
-function accepts any number of @racket[_pre-content] arguments, so
-that in
-
-@verbatim[#:indent 2]|{@bold{``apple''}}|
-
-the @litchar{``apple''} argument is decoded to use fancy quotes, and
-then it is bolded.
-
-
-@defproc[(pre-content? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a @deftech{pre-content} value: a
-string or other non-list @tech{content}, a list of @tech{pre-content} values, or a @racket[splice]
-containing a list of @tech{pre-content} values; otherwise returns
-@racket[#f].
-
-Pre-content is decoded into @tech{content} by functions like
-@racket[decode-content] and @racket[decode-paragraph].}
-
-
-@defproc[(pre-flow? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a @deftech{pre-flow} value: a
-string or other non-list @tech{content}, a @racket[block],
-@|void-const|, a list of @tech{pre-flow} values, or a @racket[splice] containing a list of
-@tech{pre-flow} values; otherwise returns @racket[#f].
-
-Pre-flow is decoded into a @tech{flow} (i.e., a list of @tech{blocks})
-by functions like @racket[decode-flow].}
-
-
-@defproc[(pre-part? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a @deftech{pre-part} value: a
-string or other non-list @tech{content}, a @tech{block}, a
-@racket[part], a @racket[title-decl], a @racket[part-start], a
-@racket[part-index-decl], a @racket[part-collect-decl], a
-@racket[part-tag-decl], @|void-const|, a list of @tech{pre-part} values, or a @racket[splice] containing
-a list of @tech{pre-part} values; otherwise returns @racket[#f].
-
-A pre-part sequence is decoded into a @racket[part] by functions like
-@racket[decode] and @racket[decode-part].}
-
-
-@defproc[(decode [lst (listof pre-part?)]) part?]{
-
-Decodes a document, producing a part. In @racket[lst], lists and instances of
-@racket[splice] are inlined into the list, and @|void-const|s are dropped. An instance of
-@racket[title-decl] supplies the title for the part, plus tag, style
-and version information. Instances of @racket[part-index-decl] (that
-precede any sub-part) add index entries that point to the
-section. Instances of @racket[part-collect-decl] add elements to the
-part that are used only during the @techlink{collect pass}. Instances
-of @racket[part-tag-decl] add hyperlink tags to the section
-title. Instances of @racket[part-start] at level 0 trigger sub-part
-parsing. Instances of @racket[section] trigger are used as-is as
-subsections, and instances of @racket[paragraph] and other
-flow-element datatypes are used as-is in the enclosing flow.
-
-Portions of @racket[lst] are within a part are decoded using
-@racket[decode-flow].}
-
-
-@defproc[(decode-part [lst (listof pre-part?)]
-                      [tags (listof string?)]
-                      [title (or/c #f list?)]
-                      [depth exact-nonnegative-integer?])
-         part?]{
-
-Like @racket[decode], but given a list of tag string for the part, a
-title (if @racket[#f], then a @racket[title-decl] instance is used if
-found), and a depth for @racket[part-start]s to trigger sub-part
-parsing.
-
-}
-
-@defproc[(decode-flow [lst (listof pre-flow?)]) (listof block?)]{
-
-Decodes a flow. In @racket[lst], lists and instances of
-@racket[splice] are inlined into the list. A sequence of two or more
-newlines separated only by whitespace is parsed as a
-compound-paragraph separator.
-
-Portions of @racket[lst] are within a compound paragraph are decoded using
-@racket[decode-compound-paragraph].}
-
-
-@defproc[(decode-compound-paragraph [lst (listof pre-flow?)]) block?]{
-
-Decodes a compound paragraph. In @racket[lst], lists and instances of
-@racket[splice] are inlined into the list. Instances of
-@racket[paragraph] and other @tech{block} datatypes are used as-is in
-the result. If the compound paragraph contains a single block, the
-block is returned without a @racket[compound-paragraph] wrapper.
-
-Portions of @racket[lst] that are separated by @tech{block}s are
-decoded using @racket[decode-content].}
-
-
-@defproc[(decode-paragraph [lst (listof pre-content?)]) paragraph?]{
-
-Decodes a paragraph using @racket[decode-content] to decode
-@racket[lst] as the paragraph's content.}
-
-
-@defproc[(decode-content [lst (listof pre-content?)]) list?]{
-
-Decodes @tech{content}. Elements at the start of the list that are
-whitespace (according to @racket[whitespace?]) are dropped.
-@margin-note*{Dropping whitespace in nested lists and splices was a poor
-implementation choice that is left in place for compatibility. To protect
-against it, you can exploit the similarly unfortunate fact that an empty
-list does not count as whitespace.}
-Lists and splices in @racket[lst] are
-flattened into the list, similarly dropping leading whitespace.
-Plain strings are @elemref['(decode
-"rules")]{decoded}; non-string, non-list @tech{content} is included in
-the result as-is.}
-
-
-@defproc[(decode-elements [lst (listof pre-content?)]) list?]{
-
-An alias for @racket[decode-content].}
-
-
-@defproc[(decode-string [s string?]) (listof content?)]{
-
-@elemref['(decode "rules")]{Decodes} a single string to produce
-@tech{content}.}
-
-
-@defproc[(whitespace? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a string that contains only whitespace, @racket[#f]
-otherwise.}
-
-
-@defstruct[title-decl ([tag-prefix (or/c #f string?)]
-                       [tags (listof string?)]
-                       [version (or/c string? #f)]
-                       [style style?]
-                       [content content?])]{
-
-See @racket[decode] and @racket[decode-part]. The @racket[tag-prefix]
-and @racketidfont{style} fields are propagated to the resulting
-@racket[part]. If the @racketidfont{version} field is not @racket[#f], 
-it is propagated as a @racket[document-version] style property on the
-@racket[part].}
-
-
-@defstruct[part-start ([depth integer?]
-                       [tag-prefix (or/c #f string?)]
-                       [tags (listof string?)]
-                       [style style?]
-                       [title content?])]{
-
-Like @racket[title-decl], but for a sub-part.  See @racket[decode] and
-@racket[decode-part].}
-
-
-@defstruct[part-index-decl ([plain-seq (listof string?)]
-                            [entry-seq list?])]{
-
-See @racket[decode]. The two fields are as for @racket[index-element].}
-
-
-@defstruct[part-collect-decl ([element (or/c element? part-relative-element?)])]{
-
-See @racket[decode].}
-
-
-@defstruct[part-tag-decl ([tag tag?])]{
-
-See @racket[decode].}
-
-
-@defstruct[splice ([run list?])]{
-
-See @racket[decode], @racket[decode-part], and @racket[decode-flow].}
-
-
-@defproc[(spliceof [ctc flat-contract?]) flat-contract?]{
-
-Produces a contract for a @racket[splice] instance whose
-@racketidfont{run} elements satisfy @racket[ctc].}
-
-
-@defproc[(clean-up-index-string [str string?]) string?]{
-
-Trims leading and trailing whitespace, and converts non-empty
-sequences of whitespace to a single space character.}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-class.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-class.scrbl
deleted file mode 100644
index 3b81e0eb90..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-class.scrbl
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang scribble/base
-@(require scribble/manual
-          (for-label racket/base
-                     racket/class
-                     racket/contract/base
-                     racket/draw))
-
-@(define css tt)
-
-@defclass/title[#:link-target? #f bitmap-dc% object% (dc<%>)]{
-
-In multi-page mode, this class definition gets its own page, and
-there's an ``inherited methods'' table in the margin.  The table has
-style class @css{inherited}, and the words ``inherited methods:'' and
-``from'' have style class @css{inheritedlbl}.
-
-@defmethod[#:link-target? #f (set-bitmap [bm any/c]) any]{
-
-A method example; nothing new here, but note how the defined
-identifier is not at the start of the box.}
-
-}
-
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-m1.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-m1.scrbl
deleted file mode 100644
index 55489af32e..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-m1.scrbl
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require "demo.scrbl"
-         scribble/core)
-
-(define renamed-doc
-  (struct-copy part doc
-               [title-content
-                (cons "M1 " (part-title-content doc))]))
-
-(provide (rename-out [renamed-doc doc]))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-m2.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-m2.scrbl
deleted file mode 100644
index 90587193bd..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-m2.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require "demo.scrbl"
-         scribble/core
-         scribble/manual)
-
-(define renamed-doc
-  (struct-copy part doc
-               [style manual-doc-style]
-               [title-content
-                (cons "M2 " (part-title-content doc))]))
-
-(provide (rename-out [renamed-doc doc]))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-m1.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-m1.scrbl
deleted file mode 100644
index 05e1bf1f48..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-m1.scrbl
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require "demo-manual.scrbl"
-         scribble/core)
-
-(define renamed-doc
-  (struct-copy part doc
-               [title-content
-                (cons "M1 " (part-title-content doc))]))
-
-(provide (rename-out [renamed-doc doc]))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-m2.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-m2.scrbl
deleted file mode 100644
index e10ae1cee4..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-m2.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require "demo-manual.scrbl"
-         scribble/core
-         scribble/manual)
-
-(define renamed-doc
-  (struct-copy part doc
-               [style manual-doc-style]
-               [title-content
-                (cons "M2 " (part-title-content doc))]))
-
-(provide (rename-out [renamed-doc doc]))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-s1.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-s1.scrbl
deleted file mode 100644
index a2e2d22f50..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-s1.scrbl
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require "demo-manual.scrbl"
-         scribble/core)
-
-(define renamed-doc
-  (struct-copy part doc
-               [title-content
-                (cons "S1 " (part-title-content doc))]))
-
-(provide (rename-out [renamed-doc doc]))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-s2.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-s2.scrbl
deleted file mode 100644
index aa3e84a055..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-s2.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require "demo-manual.scrbl"
-         scribble/core
-         scribble/manual)
-
-(define renamed-doc
-  (struct-copy part doc
-               [style manual-doc-style]
-               [title-content
-                (cons "S2 " (part-title-content doc))]))
-
-(provide (rename-out [renamed-doc doc]))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual.scrbl
deleted file mode 100644
index ca89f3d596..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual.scrbl
+++ /dev/null
@@ -1,203 +0,0 @@
-#lang scribble/base
-@(require scribble/manual
-          scribble/eval
-          (for-syntax racket/base)
-          (for-label racket/base
-                     racket/contract/base
-                     scribble/manual))
-
-@(define css tt)
-
-@(define-syntax (opt-example stx)
-  ;; A #\? 'paren-shape value triggers RktOpt:
-   #`@racket[#,(syntax-property #'(in-example) 'paren-shape '#\?)])
-
-@title{Manual All-Styles Document}
-
-@table-of-contents[]
-
-@section{Code Styles}
-
-@itemlist[
-
- @item{@css{RktSym} (identifier without @racket[for-label] binding): 
-       @racket[unbound] or @racketidfont{example}}
-
- @item{@css{RktValLink} (link to variable form): @racket[cons]}
-
- @item{@css{RktValDef} (definition of variable, normally combined with @css{RktValLink}):
-       @racket[list] in 
-
-       @defproc[#:link-target? #f (list) any/c]
-       @defthing[#:link-target? #f list any/c]}
-
- @item{@css{RktStxLink} (link to syntactic form): @racket[lambda]}
-
- @item{@css{RktStxDef} (definition of syntactic form, normally combined with @css{RktStxLink}):
-       @racket[lambda] in
-
-       @defform[#:link-target? #f (lambda ...)]}
-
- @item{@css{RktSymDef} (definition without binding, normally a mistake, combined with @css{RktSym}):
-       @racket[unbound-identifier] in
-
-       @defform[#:link-target? #f (unbound-identifier)]}
-
- @item{@css{RktVar} (local variable or meta-variable): @racket[_variable] or @racketvarfont{example}}
-
- @item{@css{RktRes} (REPL result): @racketresult['(1 2 3)] or @racketresultfont{example}}
-
- @item{@css{RktOut} (as written to the current output port): @racketoutput{example}}
-
- @item{@css{RktErr} (errors): @racketerror{example} or the error message in
-
-       @interaction[(+ 1 'a)]}
-
- @item{@css{RktCmt} (comments): @racketcommentfont{example} or
-
-       @racketblock[(code:comment "comment")]}
-
- @item{@css{RktVal} (values): @racket['(1 2 3)] or @racketvalfont{example}}
-
- @item{@css{highlighted} (highlight via background): @racket[(not-this (code:hilite example) nor-this)]}
-
- @item{@css{RktIn} on a @css{RktInBG}: @litchar{example}}
-
- @item{@css{RktPn} (parentheses, etc.): @racket[([{}])] or @racketparenfont{example}}
-
- @item{@css{RktRdr} (reader shorthands): non-parentheses in @racket[(#`() ,@())]}
-
- @item{@css{RktMeta} (the @racket[unquote] comma):
-       @racket[,1] or @racketmetafont{example} or ``#reader'' below.
-
-       @defmodule[@schemeidfont{module} #:module-paths (racket/base) #:reader #:no-declare #:link-target? #f]}
-
- @item{@css{RktMod} (module name; normally @css{RktModLink} instead): @racketmodfont{example}}
-
- @item{@css{RktModLink} (a linked module reference): @racketmodname[racket/base]}
-
- @item{@css{RktOpt} (option-argument brackets): brackets in @opt-example[]}
-
- @item{@css{RktKw} (not normally used): @racketkeywordfont{example}}
-
-]
-
-The @css{RktBlk} style class is used for a table of multiple lines (more
-than 1) of Racket code:
-
-@racketblock[
- (define x (+ 1 2))
- (+ x 3)
-]
-
-@section{Definition Blocks}
-
-@defmodule[racket/base #:link-target? #f]
-
-The module-declaration box above is in a @css{defmodule} table. The
-package-specification part is in an @css{RpackageSpec} wrapper.
-
-The definitions below are marked so that they are not link targets. If
-they were link targets, the table-of-contents panel on the left would
-have entries for them.
-
-@defproc[#:link-target? #f (cons [really-long-name-for-the-first-argument
-                                  any/c]
-                                 [really-long-name-for-the-second-argument
-                                  (or/c any/c
-                                        any/c)])
-         pair?]{
-
-This definition box starts with a @css{SVInsetFlow} wrapper, which is a
-@racketmodname[scribble/base] style class for the
-@racket['vertical-inset] style name on a block; it should give the
-block suitable vertical space before and after.
-
-The next layer is a @css{boxed} plus @css{RBoxed} table. The @css{boxed}
-style class is from @racketmodname[scribble/base] and the
-@racket['boxed] style name on a table. The @css{RBoxed} style class is
-from the @racket[scribble/manual] layer. Both @css{boxed} and @css{RBoxed}
-are used for all definition boxes by @racket[scribble/manual] forms.
-
-The initial content of the table includes a @css{SubFlow} (a
-@racket[scribble/base] style class for non-indented flow) to combine
-blocks for the background label with the first line of the table. The
-background label ``procedure'' has an @css{RBackgroundLabel} outer
-wrapper, which makes the label float right. (The wrapper also has the
-@css{SIEHidden} style class, which built-in for all Scribble HTML output
-and makes the label hidden on Internet Explorer 6 and earlier.)  The
-background label has an @css{RBackgroundLabelInner} inner wrapper, which
-makes the label suitably faint. The content part of the first line is
-wrapped in @css{RForeground}, which ensures that it is in front of the
-background label.
-
-In a procedure definition box:
-
-@itemlist[
-
- @item{When the initial ``prototype'' call in the definition box spans
-       multiple lines, the table that contains the call has the
-       @css{prototype} style class in addition to @css{RForeground}.}
-
- @item{When the contract or default value for an argument spans
-       multiple lines, then the contract, the ``='' for a value (if
-       any), and value (if any) are wrapped in an table with the
-       @css{argcontract} style class.}
-
-]
-
-Finally, the definition box and all of the associated explanation text
-are wrapped in @css{SIntrapara} blocks and grouped into a single
-@tt{<p>}.}
-
-@defform[#:link-target? #f 
-         (lambda ...)
-         #:grammar ([example good
-                             bad])]
-
-When a syntactic-from specification has a grammar, the grammar is in a
-table with the @css{specgrammar} style class.
-
-Since no explanation flow is attached to the above @racket[defform] use,
-there's no @css{SIntrapara} block around the table (just a @tt{<p>}).
-
-@deftogether[(
-@defproc[#:link-target? #f (cons [a any/c] [d any/c]) pair?]
-@defform[#:link-target? #f (lambda ...)]
-)]{
-
-Putting definitions together with @racket[deftogether] converts the
-@css{RBoxed} and @css{boxed} tables that would be generated for the
-individual definitions into tables with the @css{together} style
-class. The tables are then combined as rows in a new table with the
-@css{RBoxed} and @css{boxed}  style classes.}
-
-A @racket[defsubform], @racket[specsubform], etc., such as
-
-@specsubform[(lambda ...)]
-
-is indented though a wrapper with a @css{leftindent} style class.
-
-@include-section["demo-class.scrbl"]
-
-@section{Miscellaneous}
-
-In @racket[filebox] rendering,
-
-@(filebox "example.rkt" "This is a file box")
-
-a @css{Rfilebox} wrapper surrounds the file name in a @css{Rfiletitle}
-outer wrapper and an @css{Rfilename} inner wrapper, plus the file
-content in an @css{Rfilecontent} wrapper.
-
-@inset-flow{The @racket[inset-flow] form generates a
-@racket[nested-flow] with style class @css{insetpara}.}
-
-@history[#:changed "1.0" @elem{History paragraphs have the @css{SHistory} style class.}]
-
-@section{Bibliography}
-
-The bibliography table for the citation @cite["Example"] as the
-@css{RBibliography} style class.
-
-@bibliography[(bib-entry #:key "Example" #:title "Example bibliography entry")]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-s1.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-s1.scrbl
deleted file mode 100644
index b49c8dc91d..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-s1.scrbl
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require "demo.scrbl"
-         scribble/core)
-
-(define renamed-doc
-  (struct-copy part doc
-               [title-content
-                (cons "S1 " (part-title-content doc))]))
-
-(provide (rename-out [renamed-doc doc]))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-s2.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-s2.scrbl
deleted file mode 100644
index 0e1afce303..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-s2.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require "demo.scrbl"
-         scribble/core
-         scribble/manual)
-
-(define renamed-doc
-  (struct-copy part doc
-               [style manual-doc-style]
-               [title-content
-                (cons "S2 " (part-title-content doc))]))
-
-(provide (rename-out [renamed-doc doc]))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo.scrbl
deleted file mode 100644
index 037ea0e53c..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo.scrbl
+++ /dev/null
@@ -1,324 +0,0 @@
-#lang scribble/base
-@(require scribble/core
-          scribble/manual)
-
-@title[#:tag "top" #:version "1.0" #:style 'toc-hidden]{All-Styles Document, Title in ``H2''}
-
-@author["Jack" "Jill"]
-
-All of this content is within ``maincolumn'', then ``main''.
-
-@"\U2192" The version on the top left of this page is in
-``versionbox'' and then either span ``versionNoNav'' (no navigation
-bar, as for single-page rendering) or ``version'' (with navigation
-bar, as for multi-page rendering).
-
-@"\U2192" The author on the top left of this page is in
-``SAuthorListBox'', then ``SAuthorList'', and then a span ``author'',
-where @tt{<br/>} separates multiple authors.
-
-@"\U2190" The table-of-contents panels are both in a table ``tocset'':
-
-@margin-note{This note is in ``refpara'', then ``refcolumn'', then
-             ``refcontent''.}
-
-@itemlist[
-
- @item{The top panel is in ``tocview''.
-
-       The top panel can have multiple layers of the hierarchy. For a
-       single-page rendering, only one layer is present. For an
-       example of multiple layers when rendering this document to
-       multiple pages, go to @secref["deepest"].
-
-       Each layer is in a ``tocviewlist'' that also has the class
-       ``tocviewlisttopspace'' in the case of the first layer.  The
-       always-visible name of a layer is in a span ``tocviewtoggle'',
-       but that span is also in a ``tocviewtitle'' in the case of the
-       first layer. Each item under the title is in a
-       ``tocviewsublist'' or a variant: ``tocviewsublistonly'' if only
-       a single item is present, ``tocviewsublistfirst'' for the first
-       item of multi, ``tocviewsublistlast'' for the last item of
-       multiple.  Then, each item is in a span ``tocviewlink''.
-
-       Each section link in the panel is a span ``tocviewlink'' or a
-       span ``tocviewselflink'' if the link corresponds to the current
-       page or on the path to the current page.}
-
- @item{A bottom panel is visible here only for a single-page
-       rendering. See its description in @secref["h3"].}
-
-]
-
-
-@margin-note[#:left? #t]{This note is in ``refparaleft'', then
- ``refcolumnleft'', then ``refcontent''.}
-
-Table of contents uses ``toptoclink'' for the top layer, and
-``toclink'' for nested levels:
-
-@table-of-contents[]
-
-@margin-note*{This note is in ``refelem'', then ``refcolumn'', then
-              ``refcontent''.}
-@margin-note*[#:left? #t]{This note is in ``refelemleft'', then 
-              ``refcolumnleft'', then ``refcontent''.}
-
-@; ======================================================================
-@section[#:tag "h3"]{Section in ``H3''}
-
-@"\U2190" For either single-page or multi-page rendering, the
-table-of-contents column here has two panels. The top panel is
-described in the @seclink["h3"]{starting prose}. For the bottom panel:
-
-@itemlist[
-
- @item{The bottom panel is in a ``tocsub''. For a multi-page
-      rendering, the on-this-page title is in ``tocsubtitle''. The
-      rest is always in a table ``tocsublist''. For each entry, the
-      number part is in a span ``tocsublinknumber'', and the title
-      part in a span, one of the following: ``tocsubseclink'' if the
-      link represents a (sub)section, ``tocnonseclink'' if the link is
-      not a (sub)section but there are (sub)sections in the list (and
-      there is an example target in this section), or ``tocsublink''
-      if no links represent a (sub)section (see
-      @secref["all-non-sec"]).}
-
-]
-
-When a part that corresponds to a page has a @racket['no-toc] style,
-the top panel of the table-of-contents column is missing and the
-bottom panel is in a ``tocview'' instead of ``tocsub''. See
-@secref["no-toc"].
-
-Here is the target for the
-@toc-target-element[#f @elem{``tocnonseclink''} `(demo (prefixable "non-sec"))]
-link.
-
-@subsection[#:style 'toc]{Subsection in ``H4''}
-
-@local-table-of-contents[]
-
-@subsubsection[#:tag "deepest"]{Subsubsection in ``H5''}
-
-@"\U2190" This page has no on-this-page panel in a multi-page
-rendering, because there are no numbered subsections, but it has three
-levels shown in the table-of-contents panel.
-
-@subsubsub*section{``SSubSubSubSection''}
-
-
-@subsection{Second Subsection in ``H4''}
-
-
-@; ======================================================================
-@section[#:tag "no-toc" #:style 'no-toc]{Suppressed ToC Panel}
-
-In multi-page rendering, this page has no gobal table-of-contents
-panel, because it is suppressed with @racket['no-toc].
-
-@subsection{Subsection}
-
-@subsection{Another Subsection}
-
-
-@; ======================================================================
-@section[#:tag "all-non-sec"]{Non-Section On-This-Page Links}
-
-This section has only non-section targets in the on-this-page
-panel of a multi-page rendering.
-Here is the target for the
-@toc-target-element[#f @elem{``tocsublink'' 1} `(demo (prefixable "non-sec 1"))]
-link.
-Here is the target for the
-@toc-target-element[#f @elem{``tocsublink'' 2} `(demo (prefixable "non-sec 2"))]
-link.
-
-Here is the target for the @as-index{``indexlink''} link in the
-@seclink["doc-index"]{index} (where ``indexlink'' is used for the
-index entry and not here).
-
-@; ======================================================================
-@section{Element Styles}
-
-Some spans:
-
-@itemlist[
-
- @item{@tt{``stt''}}
-
- @item{@elem[#:style 'roman]{``sroman''}}
-
- @item{@elem[#:style "slant"]{``slant''}}
-
- @item{@elem[#:style 'sf]{``ssanserif''}}
-
- @item{@smaller{``Smaller''}}
-
- @item{@larger{``Larger''}}
-
- @item{``hspace'' is used for forced @hspace[3] space}
-
- @item{``url'' is used for URLs: @url{http://racket-lang.org}}
-
- @item{@elem[#:style 'no-break]{``nobreak'', which is used to prevent
- line breaks anywhere in the element so that the element may run too
- far right}}
-
- @item{@italic{italic} directly sets @tt{font-style} to @tt{italic}}
-
- @item{@bold{bold} directly sets @tt{font-weight} to @tt{bold}}
-
- @item{@elem[#:style 'superscript]{superscript} directly sets
-        @tt{vertical-align} to @tt{super} and @tt{font-size} to @tt{80%}.}
-
- @item{@elem[#:style 'subscript]{subscript} directly sets
-        @tt{vertical-align} to @tt{sub} and @tt{font-size} to @tt{80%}.}
-
-]
-
-Link spans:
-
-@itemlist[
-
- @item{@elemref[#:underline? #f '(prefixable "plain-target")]{``plainlink''}
-       hyperlink to @elemtag['(prefixable "plain-target")]{here}}
-
- @item{@deftech{technical term} definitions are simply italicized by default}
-
- @item{@tech{technical term} references are in ``techoutside'', then ``techinside''}
-
-]
-
-@; ======================================================================
-@section{Block Styles}
-
-@nested{This paragraph is in a ``SubFlow'' @tt{<blockquote>}.}
-
-@nested[#:style 'inset]{This paragraph is in a plain @tt{<blockquote>}.}
-
-@nested[#:style 'code-inset]{This paragraph is in a ``SCodeFlow''
-@tt{<blockquote>}.}
-
-@nested[#:style 'vertical-inset]{This paragraph is in a
-``SVInsetFlow'' @tt{<blockquote>}. This style is useful when space is
-not normally included between blocks.}
-
-@centered{This paragraph is in a ``SCentered'' @tt{<blockquote>}.}
-
-@tabular[#:style 'boxed (list (list @t{A ``boxed'' table.}))]
-
-@; ======================================================================
-@section{Enumerations}
-
-This one is unordered, so it uses @tt{<ul>}:
-
-@itemlist[
-
- @item{six}
-
- @item{half-dozen}
-
-]
-
-This one is ordered, so it uses @tt{<ol>}:
-
-@itemlist[#:style 'ordered
-
- @item{First}
-
- @item{Second
-
-       @itemlist[#:style 'ordered
-
-          @item{Second, first half}
-
-          @item{Second, second half
-
-                @itemlist[#:style 'ordered
-
-                           @item{First half of that}
-
-                           @item{Second half of that
-
-                                 @itemlist[#:style 'ordered
-
-                                    @item{Thin-slice start}
-
-                                    @item{Thin-sliced end}
-
-                                 ]}
-                          ]}
-
-                ]}
-
- @item{Third}
-]
-
-This one is ``compact'':
-
-@itemlist[ #:style 'compact
-
- @item{six}
-
- @item{half-dozen}
-
-]
-
-This paragraph follows the enumeration above.
-
-@; ======================================================================
-@section{Paragraph Spacing}
-
-This sentence is a paragraph all by itself.
-
-@t{This sentence is a paragraph.}
-@t{This sentence is also a paragraph, but it is connected to the
-   previous paragraph as a compound paragraph by virtue of having no
-   paragraph-breaking space before it, and each paragraph is in a
-   ``SIntraPara'' @tt{<div>} instead of a @tt{<p>}.}
-
-This sentence is a paragraph, as is each of A1, B1, A2, B2, A3, B3a,
-and B2a in the following table, but B3a and B2a form a compound paragraph.
-@;
-@tabular[(list (list "A1"
-                     "B1") 
-               (list "A2"
-                     "B2") 
-               (list "A3" 
-                     @compound-paragraph[plain (list @t{B3a} @t{B3b})]))]
-@;
-This sentence is a paragraph, and with the preceding table and
-  paragraph forms a compound paragraph.
-
-@nested{
- @t{This is a first paragraph in a @tt{<blockquote>}.}
- @t{This is a second paragraph in a @tt{<blockquote>}.}
-}
-
-
-@; ======================================================================
-@section{Navigation Bars}
-
-For multi-page rendering, this page will have a navigation bar at the
-top and bottom. The bars are within ``maincolumn'' and ``main''.
-
-The tap bar is in ``navsettop'', and the bottom one is in
-``navsetbottom''.  Within those divs, ``navsetleft'' wraps content to
-be left-aligned and ``navsetright'' wraps content to be right-aligned.
-
-Links that are disabled (such as a next-page link on the last page)
-are each in a span ``nonavigation''.
-
-When a search box is included, then it is in ``searchform'' and then
-``searchbox''. If no search box is included, then a ``nosearchform''
-@tt{div} is used.
-
-Finally, and not part of the nagivation bar, the bottom nagivation bar
-is followed by a @tt{div} with the name
-``contextindicator''. JavaScript code attached to the page copies the
-@tt{ctxtname} query argument, if any, to the @tt{div} and makes it
-visible.
-
-@; ======================================================================
-@index-section[]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/doclang.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/doclang.scrbl
deleted file mode 100644
index b30ae43ebd..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/doclang.scrbl
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt")
-
-@title[#:tag "doclang"]{Document Language}
-
-@defmodulelang[scribble/doclang2]{The @racketmodname[scribble/doclang2]
-language provides everything from @racket[racket/base], except that it
-replaces the @racket[#%module-begin] form.
-
-The @racketmodname[scribble/doclang2] @racket[#%module-begin]
-essentially packages the body of the module into a call to
-@racket[decode], binds the result to @racket[doc], and exports
-@racket[doc].
-
-Any module-level form other than an expression (e.g., a
-@racket[require] or @racket[define]) remains at the top level, and
-the @racket[doc] binding is put at the end of the module. As usual, a
-module-top-level @racket[begin] slices into the module top level.
-
-For example:
-@codeblock|{
-#lang racket
-(module example scribble/doclang2
-  "hello world, this is"
-  " an example document")
-(require 'example)
-doc
-}|
-
-The behavior of @racketmodname[scribble/doclang2] can be customized by
-providing @racket[#:id], @racket[#:post-process], and @racket[#:exprs]
-arguments at the very beginning of the module.
-
-@itemize[
-
-@item{@racket[#:id] names the top-level documentation binding. By default, this
-is @racket[doc].}
-
-@item{@racket[#:post-process] processes the body of the module after
-@racket[decode].  By default, this is @racket[values].}
-
-@item{@racket[#:exprs] prepends an additional sequence of expressions to the
-beginning of the module's body.  By default, this is the empty sequence
-@racket[()].}
-
-]
-
-This example explicitly uses the defaults for all three keywords:
-
-@codeblock|{
-#lang racket
-(module example scribble/doclang2
-  #:id doc
-  #:post-process values
-  #:exprs ()
-  "hello world, this is an example document")
-(require 'example)
-doc
-}|
-
-
-The next toy example uses a different name for the documentation binding, and
-also adds an additional binding with a count of the parts in the document:
-
-@codeblock|{
-#lang racket
-(module example scribble/doclang2
-  #:id documentation
-  #:post-process (lambda (decoded-doc)
-                   (set! number-of-parts (length (part-parts decoded-doc)))
-                   decoded-doc)
-  #:exprs ((title "My first expression!"))
-
-  (require scribble/core
-           scribble/base)
-  
-  (define number-of-parts #f)
-  (provide number-of-parts)
-  (section "part 1")
-  "hello world"
-  (section "part 2")
-  "this is another document")
-
-(require 'example)
-number-of-parts
-documentation
-}|
-}
-
-
-
-@section{@racketmodname[scribble/doclang]}
-@defmodulelang[scribble/doclang]{The @racketmodname[scribble/doclang] language
-provides the same functionality as @racketmodname[scribble/doclang2], where the
-configuration options are positional and mandatory.  The first three elements
-in the @racket[#%module-begin]'s body must be the @racket[id],
-@racket[post-process], and @racket[exprs] arguments.
-
-Example:
-@codeblock|{
-#lang racket
-(module* example scribble/doclang
-  doc
-  values
-  ()
-  (require scribble/base)
-  (provide (all-defined-out))
-  (define foo (para "hello again"))
-  "hello world, this is an example document"
-  (para "note the " (bold "structure")))
-
-(module+ main
-  (require (submod ".." example))
-  (printf "I see doc is: ~s\n\n" doc)
-  (printf "I see foo is: ~s" foo))
-}|
-}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/docreader.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/docreader.scrbl
deleted file mode 100644
index 3bcd62370b..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/docreader.scrbl
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/bnf "utils.rkt")
-
-@title[#:tag "docreader"]{Document Reader}
-
-@defmodulelang[scribble/doc]{The @racketmodname[scribble/doc] language is
-the same as @racketmodname[scribble/doclang], except that
-@racket[read-syntax-inside] is used to read the body of the module. In
-other words, the module body starts in Scribble ``text'' mode instead
-of S-expression mode.}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/eval.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/eval.scrbl
deleted file mode 100644
index b3aea23e91..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/eval.scrbl
+++ /dev/null
@@ -1,250 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          "utils.rkt"
-          (for-label racket/sandbox
-                     racket/pretty
-                     file/convertible
-                     racket/serialize))
-
-@title[#:tag "eval"]{Evaluation and Examples}
-
-@defmodule[scribble/eval]{The @racket[scribble/eval] library provides
-utilities for evaluating code at document-build time and incorporating
-the results in the document, especially to show example uses of
-defined procedures and syntax.}
-
-@defform/subs[(interaction maybe-eval maybe-escape datum ...)
-              ([maybe-eval code:blank
-                            (code:line #:eval eval-expr)]
-               [maybe-escape code:blank
-                            (code:line #:escape escape-id)])]{
-
-Like @racket[racketinput], except that the result for each input
-@racket[datum] is shown on the next line. The result is determined by
-evaluating the @racket[quote]d form of the @racket[datum] using the
-evaluator produced by @racket[eval-expr], if provided.
-
-The @racket[eval-expr] must produce a sandbox evaluator via
-@racket[make-evaluator] or @racket[make-module-evaluator] with the
-@racket[sandbox-output] and @racket[sandbox-error-output] parameters
-set to @racket['string]. If @racket[eval-expr] is not provided, an
-evaluator is created using @racket[make-base-eval]. See also
-@racket[make-eval-factory].
-
-If the value of @racket[current-print] in the sandbox is changed from
-its default value, or if @racket[print-as-expression] in the sandbox
-is set to @racket[#f], then each evaluation result is formatted to a
-port by applying @racket[(current-print)] to the value; the output
-port is set to a pipe that supports specials in the sense of
-@racket[write-special], and non-character values written to the port
-are used as @tech{content}. Otherwise, when the default
-@racket[current-print] is in place, result values are typeset using
-@racket[to-element/no-color].
-
-Certain patterns in @racket[datum] are treated specially:
-
-@itemlist[
-
- @item{A @racket[datum] of the form 
-       @racket[(@#,indexed-racket[code:line] _code-datum (@#,racketidfont{code:comment} _comment-datum ...))]
-       is treated as @racket[_code-datum] for evaluation.}
-
- @item{Other uses of @racketidfont{code:comment} and
-       @racketidfont{code:blank} are stripped from each @racket[datum]
-       before evaluation.}
-
- @item{A @racket[datum] of the form 
-       @racket[(@#,indexed-racket[eval:alts] #,(svar show-datum) #,(svar eval-datum))]
-       is treated as @svar[show-datum] for typesetting and @svar[eval-datum] for evaluation.}
-
- @item{A @racket[datum] of the form 
-       @racket[(@#,indexed-racket[eval:check] #,(svar eval-datum) #,(svar expect-datum))]
-       is treated like @racket[_eval-datum], but @svar[check-datum] is also
-       evaluated, and an error is raised if they are not @racket[equal?].}
-
- @item{A @racket[datum] of the form 
-       @racket[(@#,indexed-racket[eval:result] _content-expr _out-expr _err-expr)]
-       involves no sandboxed evaluation; instead, the @tech{content} result of @racket[_content-expr] is used as the
-       typeset form of the result, @racket[_out-expr] is treated as output printed
-       by the expression, and @racket[_err-expr] is error output printed by the
-       expression. The @racket[_out-expr] and/or @racket[_err-expr] can be omitted,
-       in which case they default to empty strings.
-
-       Normally, @racketidfont{eval:result}
-       is used in the second part of an @racketidfont{eval:alts} combination.}
-
- @item{A @racket[datum] of the form 
-       @racket[(@#,indexed-racket[eval:results] _content-list-expr _out-expr _err-expr)]
-       is treated like an @racketidfont{eval:result} form, except that @racket[_content-list-expr]
-       should produce a list of @tech{content} for multiple results of evaluation. As
-       with @racketidfont{eval:result}, @racket[_out-expr] and @racket[_err-expr] are optional.}
-
-]
-
-As an example,
-
-@codeblock|{
-#lang scribble/manual
-@(require racket/sandbox
-          scribble/eval)
-@(define my-evaluator
-   (parameterize ([sandbox-output 'string]
-                  [sandbox-error-output 'string])
-     (make-evaluator 'typed/racket/base)))
-@interaction[#:eval my-evaluator
-
-             (: my-sqr (Real -> Real))
-             (define (my-sqr x)
-               (* x x))
-             (my-sqr 42)]
-}|
-
-uses an evaluator whose language is @racketmodname[typed/racket/base].}
-
-@defform[(interaction0 maybe-eval maybe-escape datum ...)]{
-Like @racket[interaction], but without insetting the code via
-@racket[nested].}
-
-@defform[(interaction/no-prompt maybe-eval maybe-escape datum)]{
-  Like @racket[interaction], but does not render the output with a prompt.
-}
-
-@defform[(interaction-eval maybe-eval maybe-escape datum)]{
-
-Like @racket[interaction], evaluates the @racket[quote]d form of
-@racket[datum], but returns the empty string and does not catch errors.}
-
-
-@defform[(interaction-eval-show maybe-eval maybe-escape datum)]{
-
-Like @racket[interaction-eval], but produces an element representing
-the printed form of the evaluation result.}
-
-
-@defform[(racketblock+eval maybe-eval maybe-escape datum ...)]{
-
-Combines @racket[racketblock] and @racket[interaction-eval].}
-
-
-@defform[(racketblock0+eval maybe-eval maybe-escape datum ...)]{
-
-Combines @racket[racketblock0] and @racket[interaction-eval].}
-
-
-@defform[(racketmod+eval maybe-eval maybe-escape name datum ...)]{
-
-Combines @racket[racketmod] and @racket[interaction-eval].}
-
-
-@defform[(def+int maybe-eval maybe-escape defn-datum expr-datum ...)]{
-
-Like @racket[interaction], except the @racket[defn-datum] is
-typeset as for @racket[racketblock] (i.e., no prompt) and a line of
-space is inserted before the @racket[expr-datum]s.}
-
-
-@defform[(defs+int maybe-eval maybe-escape (defn-datum ...) expr-datum ...)]{
-
-Like @racket[def+int], but for multiple leading definitions.}
-
-
-@defform[(examples maybe-eval maybe-escape datum ...)]{
-
-Like @racket[interaction], but with an ``Examples:'' label prefixed.}
-
-
-@defform[(defexamples maybe-eval maybe-escape datum ...)]{
-
-Like @racket[examples], but each definition using @racket[define] or
-@racket[define-struct] among the @racket[datum]s is typeset without a
-prompt, and with line of space after it.}
-
-
-@defproc[(make-base-eval [#:pretty-print? pretty-print? any/c #t]
-                         [#:lang lang
-                          (or/c module-path?
-                                (list/c 'special symbol?)
-                                (cons/c 'begin list?))
-                          '(begin)]
-                         [input-program any/c] ...)
-         (any/c . -> . any)]{
-
-Creates an evaluator using @racket[(make-evaluator 'racket/base #:lang lang input-program ...)],
-setting sandbox parameters to disable limits, setting the outputs to
-@racket['string], and not adding extra security guards.
-
-If @racket[pretty-print?] is true, the sandbox's printer is set to
-@racket[pretty-print-handler]. In that case, values that are convertible
-in the sense of @racket[convertible?] are printed using @racket[write-special],
-except that values that are serializable in the sense of @racket[serializable?]
-are serialized for tranfers from inside the sandbox to outside (which can avoid
-pulling code and support from the sandboxed environment into the document-rendering
-environment).
-
-@history[#:changed "1.6" @elem{Changed treatment of convertible values that are
-                               serializable.}]}
-
-
-@defproc[(make-base-eval-factory [mod-paths (listof module-path?)]
-                                 [#:pretty-print? pretty-print? any/c #t]
-                                 [#:lang lang
-                                  (or/c module-path?
-                                        (list/c 'special symbol?)
-                                        (cons/c 'begin list?))
-                                  '(begin)])
-         (-> (any/c . -> . any))]{
-
-Produces a function that is like @racket[make-base-eval], except that
-each module in @racket[mod-paths] is attached to the evaluator's
-namespace. The modules are loaded and instantiated once (when the
-returned @racket[make-base-eval]-like function is called the first
-time) and then attached to each evaluator that is created.}
-
-
-@defproc[(make-eval-factory [mod-paths (listof module-path?)]
-                            [#:pretty-print? pretty-print? any/c #t]
-                            [#:lang lang
-                             (or/c module-path?
-                                   (list/c 'special symbol?)
-                                   (cons/c 'begin list?))
-                             '(begin)])
-         (-> (any/c . -> . any))]{
-
-Like @racket[make-base-eval-factory], but each module in @racket[mod-paths] is
-also required into the top-level environment for each generated evaluator.}
-
-
-@defproc[(close-eval [eval (any/c . -> . any)]) (one-of/c "")]{
-
-Shuts down an evaluator produced by @racket[make-base-eval]. Use
-@racket[close-eval] when garbage collection cannot otherwise reclaim
-an evaluator (e.g., because it is defined in a module body).}
-
-
-@defparam[scribble-eval-handler handler 
-          ((any/c . -> . any) any/c boolean? . -> . any)]{
-
-A parameter that serves as a hook for evaluation. The evaluator to use
-is supplied as the first argument to the parameter's value, and the
-second argument is the form to evaluate. The last argument is
-@racket[#t] if exceptions are being captured (to display exception
-results), @racket[#f] otherwise.}
-
-@defparam[scribble-exn->string handler (-> (or/c exn? any/c) string?)]{
-  A parameter that controls how exceptions are rendered by 
-  @racket[interaction]. Defaults to
-  @racketblock[(λ (e)
-                 (if (exn? e)
-                     (exn-message e)
-                     (format "uncaught exception: ~s" e)))]
-}
-
-@defform[(with-eval-preserve-source-locations expr ...)]{
-
-By default, the evaluation forms provided by this module, such as
-@racket[interaction] and @racket[examples], discard the source
-locations from the expressions they evaluate. Within a
-@racket[with-eval-preserve-source-locations] form, the source
-locations are preserved. This can be useful for documenting forms that
-depend on source locations, such as Redex's typesetting macros.
-}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/generic.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/generic.scrbl
deleted file mode 100644
index 33f6c2437a..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/generic.scrbl
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt")
-
-@title[#:tag "generic-prose" #:style 'toc]{High-Level Scribble API}
-
-@local-table-of-contents[]
-
-@include-section["base.scrbl"]
-@include-section["manual-stub.scrbl"]
-@include-section["book.scrbl"]
-@include-section["report.scrbl"]
-@include-section["sigplan.scrbl"]
-@include-section["jfp.scrbl"]
-@include-section["lncs.scrbl"]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/getting-started.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/getting-started.scrbl
deleted file mode 100644
index b59dd871ba..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/getting-started.scrbl
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scribble/manual
-
-@title[#:tag "getting-started" #:style 'toc]{Getting Started}
-
-
-
-@local-table-of-contents[]
-
-@include-section["how-to-paper.scrbl"]
-@include-section["how-to.scrbl"]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl
deleted file mode 100644
index a15d190b47..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl
+++ /dev/null
@@ -1,682 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/bnf "utils.rkt"
-          pict
-          (for-label scriblib/figure scribble/base scribble/sigplan
-                     (except-in pict table)))
-
-@(define-syntax-rule (samplemod . text) (codeblock . text))
-@(define-syntax-rule (sample a . text)
-   (codeblock #:context #'a #:keep-lang-line? #f
-     "#lang scribble/base" "\n" a . text))
-@(define (result . text) (apply nested #:style 'inset text))
-
-@(define sep @hspace[1])
-
-@(define sub*section subsection)
-
-@title[#:tag "getting-started"]{Getting Started}
-
-No matter what you want to do with Scribble, it's best to start by
-generating a few simple HTML and/or PDF documents. This chapter steps
-you through the basics, and it ends in @secref["roadmap"] with
-goal-specific advice on how to continue.
-
-@section[#:tag "first-example"]{A First Example}
-
-Create a file @filepath{mouse.scrbl} with this content:
-
-          @samplemod|{
-            #lang scribble/base
-
-            @title{On the Cookie-Eating Habits of Mice}
-
-            If you give a mouse a cookie, he's going to ask for a
-            glass of milk.
-          }|
-
-The first line's @racket[#, @hash-lang[] #,
-@racketmodname[scribble/base]] indicates that the file implements a
-Scribble document. The document starts in ``text mode,'' and the
-@litchar["@"] character escapes to operators like @racket[title],
-where the curly braces return to text mode for the arguments to the
-operator. The rest is document content.
-
-Now run the @exec{scribble} command-line program, specifying a mode
-for the kind of document that you want as output:
-
-       @itemize[
-
-         @item{Run
-               @commandline{scribble mouse.scrbl}
-              to generate HTML as @filepath{mouse.html}.  You may
-              notice that the apostrophe in ``he's'' turned into a
-              curly apostrophe.}
-
-         @item{Run
-               @commandline{scribble --htmls mouse.scrbl}
-              to generate HTML as @filepath{mouse/index.html}.
-              Sub-sections (which we add next) will appear as separate
-              HTML files in the @filepath{mouse} directory.}
-
-         @item{Run
-                @commandline{scribble --pdf mouse.scrbl}
-               to generate PDF as @filepath{mouse.pdf}. This will
-               work only if you have @exec{pdflatex} installed.
-               If you'd like to see the intermediate Latex, try
-                @commandline{scribble --latex mouse.scrbl}
-               to generate @filepath{mouse.tex}.}
-
-          ]
-
-See @secref["running"] for more information on the @exec{scribble}
-command-line tool.
-
-@section{Multiple Sections}
-
-Add more text to @filepath{mouse.scrbl} so that it looks like this:
-
-          @samplemod|{
-            #lang scribble/base
-
-            @title{On the Cookie-Eating Habits of Mice}
-
-            If you give a mouse a cookie, he's going to ask for a
-            glass of milk.
-
-            @section{The Consequences of Milk}
-
-            That ``squeak'' was the mouse asking for milk. Let's
-            suppose that you give him some in a big glass.
-
-            He's a small mouse. The glass is too big---way too
-            big. So, he'll probably ask you for a straw. You might as
-            well give it to him.
-
-            @section{Not the Last Straw}
-
-            For now, to handle the milk moustache, it's enough to give
-            him a napkin. But it doesn't end there... oh, no.
-          }|
-
-        Now, after the first paragraph of the paper, we have two
-        sub-sections, each created by calling @racket[section] to
-        generate a sub-section declaration. The first sub-section has
-        two paragraphs. The second section, as initiated by the result
-        of the second @racket[section] call, has a single paragraph.
-
-Run the @exec{scribble} command(s) from @secref["first-example"]
-again. You may notice the curly double-quotes in the output, and
-the @litchar{---} turned into an em dash.
-
-@;----------------------------------------
-@section{Splitting the Document Source}
-
-As a document grows larger, it's better to split sections into
-separate source files. The @racket[include-section] operation
-incorporates a document defined by a @filepath{.scrbl} file into a
-larger document.
-
-To split the example document into multiple files, change
-@filepath{mouse.scrbl} to just
-
-          @samplemod|{
-            #lang scribble/base
-
-            @title{On the Cookie-Eating Habits of Mice}
-
-            If you give a mouse a cookie, he's going to ask for a
-            glass of milk.
-
-            @include-section["milk.scrbl"]
-            @include-section["straw.scrbl"]
-          }|
-
-Create @filepath{milk.scrbl} and @filepath{straw.scrbl} in the same
-directory as @filepath{mouse.scrbl}. In @filepath{milk.scrbl}, put
-
-         @samplemod|{
-            #lang scribble/base
-
-            @title{The Consequences of Milk}
-
-            That ``squeak'' was the mouse asking for milk...
-          }|
-
-and in @filepath{straw.scrbl}, put
-
-         @samplemod|{
-            #lang scribble/base
-
-            @title{Not the Last Straw}
-
-            For now, to handle the milk moustache, ...
-          }|
-
-Notice that the new files both start with @hash-lang[], like the
-original document, and the @racket[section]s from the original
-document become @racket[title]s in the new documents. Both
-@filepath{milk.scrbl} and @filepath{straw.scrbl} are documents in
-their own right with their own titles, and they can be individually
-rendered using @exec{scribble}. Running @exec{scribble} on
-@filepath{mouse.scrbl}, meanwhile, incorporates the smaller documents
-into one document that is the same as before.
-
-@; ----------------------------------------
-@section{Document Styles}
-
-Scribble currently supports only one form of HTML output. You can
-replace the @filepath{scribble.css} file for the generated pages, and
-that's about it. (We expect to add more styles in the future.)
-
-For Latex-based PDF output, Scribble includes support for
-multiple page-layout configurations. The @filepath{mouse.scrbl}
-example so far uses the default Latex style. If you plan on submitting
-the paper to a workshop on programming languages, then---well, you
-probably need a different topic. But you can start making the current
-content look right by changing the first line to
-
-          @samplemod|{
-            #lang scribble/sigplan
-          }|
-
-If you're instead working toward Racket library documentation,
-try changing the first line to 
-
-          @samplemod|{
-            #lang scribble/manual
-          }|
-
-which produces output with a separate title page, initial content on
-that page (intended as a brief orientation to the document), and
-top-level sections turned into chapters that each start on a new page.
-If you have split the document into multiple files, the first line of
-the main document file determines the output format.
-
-Using @racketmodname[scribble/sigplan] or
-@racketmodname[scribble/manual] does not change the rendered HTML for
-a document---aside from @racketmodname[scribble/manual] adding a
-version number---but it changes the set of bindings available in the
-document body. For example, with @racketmodname[scribble/sigplan], the
-introductory text can be marked as an abstract:
-
-          @samplemod|{
-            #lang scribble/sigplan
-
-            @title{On the Cookie-Eating Habits of Mice}
-
-            @abstract{If you give a mouse a cookie, he's going to 
-                      ask for a glass of milk.}
-
-            @section{The Consequences of Milk}
-
-            ....}|
-
-When rendered as HTML, the abstract shows up as an inset paragraph. If
-you try to use @racket[abstract] with the
-@racketmodname[scribble/base] or @racketmodname[scribble/manual]
-language, then you get an error, because @racket[abstract] is not
-defined.
-
-When a document is implemented across multiple files, changing the
-language of the main document can set the style for all of the parts,
-but it does not introduce bindings into the other part files. For
-example, if you change the language of @filepath{mouse.scrbl} to
-@racketmodname[scribble/sigplan], then @racket[abstract] becomes
-available in @filepath{mouse.scrbl} but not in @filepath{milk.scrbl}
-or @filepath{straw.scrbl}. In other words, operator names are
-lexically scoped.
-
-@; ----------------------------------------
-@section{More Functions}
-
-The @racketmodname[scribble/base] language provides a collection of
-basic operations (and The @racketmodname[scribble/sigplan] and
-@racketmodname[scribble/manual] are supersets of
-@racketmodname[scribble/base]). Many of the operations are style
-variations that you can apply to text:
-
-          @sample|{
-            He's a @smaller{small mouse}. The glass is too
-            @larger{big}---@bold{way @larger{too @larger{big}}}. So, he'll
-            @italic{probably} ask you for a straw.
-          }|
-
-which renders as
-
-          @result{
-            He's a @smaller{small mouse}. The glass is too
-            @larger{big}---@bold{way @larger{too @larger{big}}}. So, he'll
-            @italic{probably} ask you for a straw.
-          }
-
-As you would expect, calls to functions like @racket[smaller],
-@racket[larger], and @racket[bold] can be nested in other calls. They
-can also be nested within calls to @racket[title] or @racket[section]:
-
-          @sample|{
-            @section{@italic{Not} the Last Straw}
-          }|
-
-@sub*section{Centering}
-
-The @racket[centered] operation centers a flow of text:
-
-         @sample|{
-           If a mouse eats all your cookies, put up a sign that says
-           @centered{
-             @bold{Cookies Wanted}
-             
-             @italic{Chocolate chip preferred!}
-           }
-           and see if anyone brings you more.
-        }|
-
-which renders as
-
-       @result{
-           If a mouse eats all your cookies, put up a sign that says
-           @centered{
-             @bold{Cookies Wanted}
-             
-             @italic{Chocolate chip preferred!}
-           }
-           and see if anyone brings you more.
-       }
-
-@sub*section{Margin Notes}
-
-The @racket[margin-note] operation is used in a similar way, but the
-rendered text is moved to the margins.
-@margin-note*{If you use @racket[margin-note], then the content shows
-             up over here.}
-
-@sub*section{Itemizations}
-
-The @racket[itemlist] operation creates a sequence of bulleted text,
-where the @racket[item] operation groups text to appear in a single
-bullet. The @racket[itemlist] operation is different from the others
-that we have seen before, because it only accepts values produced by
-@racket[item] instead of arbitrary text. This difference is reflected
-in the use of @litchar{[}...@litchar{]} for the arguments to
-@racket[itemlist] instead of  @litchar["{"]...@litchar["}"]:
-
-         @sample|{
-           @centered{@bold{Notice to Mice}}
-
-           @itemlist[@item{We have cookies for you.}
-                     @item{If you want to eat a cookie, 
-                           you must bring your own straw.}]
-         }|
-
-which renders as
-
-         @result{
-           @centered{@bold{Notice to Mice}}
-
-           @itemlist[@item{We have cookies for you.}
-                     @item{If you want to eat a cookie, 
-                           you must bring your own straw.}]
-         }
-
-@sub*section{Tables}
-
-The @racket[tabular] function takes a list of lists to organize into a
-two-dimensional table. By default, no spacing is added between columns,
-so supply a @racket[#:sep] argument to acts as a column separator.
-For example,
-
-   @sample|{
-     @tabular[#:sep @hspace[1]
-              (list (list @bold{Animal} @bold{Food})
-                    (list "mouse"       "cookie")
-                    (list "moose"       "muffin"))]
-   }|
-
-renders as
-
-   @result{
-     @tabular[#:sep @hspace[1]
-              (list (list @bold{Animal} @bold{Food})
-                    (list "mouse"       "cookie")
-                    (list "moose"       "muffin"))]
-   }
-
-@; ----------------------------------------
-@section{Text Mode vs. Racket Mode for Arguments}
-
-When @litchar{[}...@litchar{]} surrounds the arguments of an
-operation, the argument expressions are in Racket mode rather than
-text mode. Even in Racket mode, @litchar["@"] can be used to apply
-operations; once the @"@" syntax is enabled through a
-language like @racketmodname[scribble/base] (as opposed to
-@racketmodname[racket]), it behaves the same in both Racket mode and
-text mode.
-
-One advantage of using Racket mode for the arguments to
-@racket[itemlist] is that we can pass a keyword-tagged optional
-argument to @racket[itemlist]. In particular, if you want a list with
-numbers instead of bullets, supply the @racket['ordered] style to
-@racket[itemlist] using the @racket[#:style] keyword:
-
-         @sample|{
-           @itemlist[#:style 'ordered
-                     @item{Eat cookie.}
-                     @item{Drink milk.}
-                     @item{Wipe mouth.}
-                     @item{...}]
-         }|
-
-An operation doesn't care whether it's used with
-@litchar{[}...@litchar{]} or @litchar["{"]...@litchar["}"]. Roughly,
-@litchar["{"]...@litchar["}"] forms an argument that is a
-string. (Only roughly, though. Newlines or uses of @litchar["@"]
-within @litchar["{"]...@litchar["}"] complicate the picture, and we'll
-get back to that soon.) So,
-
-      @sample|{
-          @italic{Yummy!}
-      }|
-
-is equivalent to
-
-      @sample|{
-          @italic["Yummy!"]
-      }|
-
-which is equivalent to the Racket expression
-
-      @racketblock[
-          (italic "Yummy!")
-      ]
-
-These equivalences explain why Scribble functions are documented in
-Racket notation. If you're reading this in HTML format, you can click
-@racket[italic] above to access its documentation. The documentation
-won't completely make sense, yet, but it will by the end of this
-chapter.
-
-What if you want to provide arguments in text mode, but you also want
-to supply other optional arguments? You can use both
-@litchar{[}...@litchar{]} and @litchar["{"]...@litchar["}"] for an
-operation, as long as the @litchar{[}...@litchar{]} is first, and as
-long as no character separate the closing @litchar{]} from the
-opening @litchar["{"]. For example, calling @racket[italic] is the
-same as using @racket[elem] with the @racket['italic] style:
-
-      @sample|{
-        @elem[#:style 'italic]{Yummy!}
-      }|
-
-You can also @emph{omit} both @litchar{[}...@litchar{]} and
-@litchar["{"]...@litchar["}"]. In that case, the Racket expression
-after @litchar["@"] is used directly instead of applied as an
-operation. For example,
-
-     @sample|{
-       1 plus 2 is @(number->string (+ 1 2)).
-     }|
-
-renders as
-
-     @result{
-       1 plus 2 is @(number->string (+ 1 2)).
-     }
-
-The call to @racket[number->string] is needed because a naked number
-is not valid as document content.
-
-@; ----------------------------------------
-@section[#:tag "how-to:reader"]{@"@" Syntax Basics}
-
-The @"@" notation provided by Scribble is just another way of
-writing Racket expressions. Scribble documents could be constructed
-using normal Racket notation, without using @"@" at all, but
-that would be inconvenient for most purposes. The @"@"
-notation makes dealing with textual content much easier.
-
-Whether in text mode or Racket mode, @litchar["@"] in a document
-provides an escape to Racket mode. The basic syntax of @litchar["@"] is
-
-@racketblock[
- @#,BNF-seq[@litchar["@"]
-             @nonterm{cmd}
-             @litchar{[} @kleenestar{@nonterm{datum}} @litchar{]}
-             @litchar["{"] @nonterm{text-body} @litchar["}"]]
-]
-
-where all three parts after @litchar["@"] are optional, but at least
-one must be present. No spaces are allowed between
-
-@itemize[
-
- @item{@litchar["@"] and @nonterm{cmd}, @litchar{[}, or @litchar["{"]}
-
- @item{@nonterm{cmd} and @litchar{[} or @litchar["{"]; or}
-
- @item{@litchar{]} and @litchar["{"].}
-
-]
-
-A @nonterm{cmd} or @nonterm{datum} is normal Racket notation, while a
-@nonterm{text-body} is itself in text mode. A @nonterm{cmd} obviously
-must not start with @litchar{[} or @litchar["{"], even though Racket
-forms could otherwise start with those characters.
-
-The expansion of just @litchar["@"]@nonterm{cmd} into Racket code is
-
-@racketblock[
-  @#,nonterm{cmd}
-]
-
-When either @litchar{[} @litchar{]} or @litchar["{"] @litchar["}"]
-are used, the expansion is
-
-@racketblock[
-  (@#,nonterm{cmd} @#,kleenestar{@nonterm{datum}} @#,kleenestar{@nonterm{parsed-body}})
-]
-
-where @kleenestar{@nonterm{parsed-body}} is the parse result of the
-@nonterm{text-body}. The @kleenestar{@nonterm{parsed-body}} part often
-turns out to be a sequence of Racket strings.
-
-In practice, the @nonterm{cmd} is normally a Racket identifier that is
-bound to a procedure or syntactic form. If the procedure or form
-expects further text to typeset, then @litchar["{"]...@litchar["}"]
-supplies the text. If the form expects other data, typically
-@litchar{[}...@litchar{]} is used to surround Racket arguments,
-instead. Even if an operation's argument is a string, if the string is
-not used as content text (but instead used as, say, a hyperlink
-label), then the string is typically provided through
-@litchar{[}...@litchar{]} instead of @litchar["{"]...@litchar["}"].
-Sometimes, both @litchar{[}...@litchar{]} and
-@litchar["{"]...@litchar["}"] are used, where the former surround
-Racket arguments that precede text to typeset. Finally, if a form is a
-purely Racket-level form with not typeset result, such as a
-@racket[require] to import more operations, then typically just
-@litchar["@"] is used.
-
-For example the text-mode stream
-
-  @sample|{
-    @(require scriblib/figure)
-
-    @section[#:tag "poetry"]{Of Mice and Cookies}
-    See @secref["milk"].
-
-    @section[#:tag "milk"]{@italic{Important} Milk Supplies}
-    @figure["straw" @elem{A straw}]{@image["straw.png"]}
-  }|
-
-is equivalent to the Racket-mode sequence
-
-@racketblock[
-    (require scriblib/figure) "\n"
-    "\n"
-    (section #:tag "poetry" "Of Mice and Cookies") "\n"
-    "See " (secref "milk") "." "\n"
-    "\n"
-    (section #:tag "milk" (italic "Important") " Milk Supplies") "\n"
-    (figure "straw" (elem "A straw") (image "straw.png")) "\n"
-]
-
-Besides showing how different argument conventions are used for
-different operations, the above example illustrates how whitespace is
-preserved in the Racket form of a text-mode stream---including
-newlines preserved as their own strings. Notice how the second
-@racket[section] gets two arguments for its content, since the
-argument content for @racket[section] in the source stream includes
-both the use of an operator and additional text. When an operation
-like @racket[section] or @racket[italic] accepts content to typeset,
-it normally accepts an arbitrary number of arguments that together
-form the content.
-
-In addition to its role for command, a @litchar["@"] can be followed
-by @litchar{;} to start a @index['("Scribble"
-"comments")]{comment}. If the character after @litchar{;} is
-@litchar["{"], then the comment runs until a matching @litchar["}"],
-otherwise the comment runs until the end-of-line:
-
-@racketblock[
- @#,BNF-seq[@litchar["@;{"] @nonterm{comment} @litchar["}"]]
- @#,BNF-seq[@litchar["@;"]  @nonterm{line-comment}]
-]
-
-For more information on the syntax of @litchar["@"], see
-@secref["reader"]. The full syntax includes a few more details, such
-as brackets like @litchar["|{"]...@litchar["}|"] for text-mode
-arguments while disabling @litchar["@"] between the brackets.
-
-@; ---------------------------------------- 
-@section{Decoding Sequences}
-
-In a document that starts @racket[#, @hash-lang[] #,
-@racketmodname[scribble/base]], the top level is a text-mode stream,
-just like the @nonterm{text-body} in a @litchar["@"] form. As
-illustrated in the previous section, such a top-level sequence
-corresponds to a mixture of Racket-mode strings and operation
-applications. There's an implicit operation, @racket[decode], that
-wraps the whole document to consume this mixture of strings and other
-values and turn them into a document description.
-
-The @racket[decode] operation implements @defterm{flow decoding},
-which takes a document stream and breaks it up into sections and
-paragraphs. Blank lines delimit paragraphs, and the results of
-operations like @racket[title] and @racket[section] generate ``here's
-the title'' or ``a new section starts here'' declarations that are
-recognized by @racket[decode].
-
-A different but related @defterm{content decoding} takes place within
-a paragraph or section title. Content decoding is responsible for
-converting @litchar{---} to an em dash or for converting @litchar{"}
-and @litchar{'} to suitable curly quotes.
-
-The decoding process for document's stream is ultimately determined by
-the @hash-lang[] line that starts the document.  The
-@racketmodname[scribble/base], @racketmodname[scribble/manual], and
-@racketmodname[scribble/sigplan] languages all use the same
-@racket[decode] operation.  The @racketmodname[scribble/text] language,
-however, acts more like a plain-text generator and preprocessor, and it
-does not perform any such decoding rules.  (For more on
-@racketmodname[scribble/text], see @other-doc['(lib
-"scribblings/scribble/scribble-pp.scrbl")].)
-
-@margin-note{More precisely, languages like
-             @racketmodname[scribble/base] apply @racket[decode] only after
-             lifting out all definitions and imports from the document
-             stream.}
-
-When the flow decoder is used, after it breaks the input stream into
-paragraphs, it applies content decoding to strings within the
-paragraph. When content is wrapped with an operation, however, content
-decoding does not apply automatically. An operation is responsible for
-calling a content or flow decoder as it sees fit. Most operations call
-the decoder; for example, @racket[italic], @racket[bold],
-@racket[smaller], etc., all decode their arguments. Similarly,
-@racket[title] and @racket[section] decode the given content for the
-title or section name.  The @racket[literal] and @racket[verbatim]
-operators, however, do not decode the given strings. For example,
-
-    @sample|{
-      @verbatim{---}
-    }|
-
-renders as
-
-  @result{
-      @verbatim{---}
-  }
-
-Don't confuse decoding with the expansion of @"@"
-notation. The source form
-
-    @sample|{
-      @verbatim{@(number->string (+ 1 2))}
-    }|
-
-renders as
-
-  @result{
-      @verbatim{@(number->string (+ 1 2))}
-  }
-
-because the source is equivalent to
-
-    @racketblock[
-      (verbatim (number->string (+ 1 2)))
-    ]
-
-where @racket[(number->string (+ 1 2))] is evaluated to produce the
-argument to @racket[verbatim]. The @litchar["|{"]...@litchar["}|"]
-style of brackets is often used with @racket[verbatim], because
-@litchar["|{"]...@litchar["}|"] disables @"@" notation for
-arguments. For example,
-
-    @sample|{
-      @verbatim|{@(number->string (+ 1 2))}|
-    }|
-
-renders as
-
-  @result{
-      @verbatim|{@(number->string (+ 1 2))}|
-  }
-
-
-@; ----------------------------------------
-@section[#:tag "pictures"]{Pictures}
-
-Any value that is convertable to an image can be used directly within
-a Scribble document. Functions from the @racketmodname[pict]
-and @racketmodname[2htdp/image #:indirect] libraries, for example, generate
-images. For example,
-
-@sample|{
-  @(require pict)
-
-  This cookie has lost its chocolate chips: 
-  @(colorize (filled-ellipse 40 40) "beige").
-}|
-
-renders as
-
- @result{
-   This cookie has lost its chocolate chips:
-   @(colorize (filled-ellipse 40 40) "beige").
- }
-
-
-@; ----------------------------------------
-@section[#:tag "roadmap"]{Next Steps}
-
-If your immediate goal is to document a Racket library or write
-literate programs, skip to @secref["how-to-doc"], and then go back to
-@secref["reader"] and other chapters.
-
-If you are more interested in producing documents unrelated to
-Racket, continue with @secref["reader"] and then
-@secref["generic-prose"].  Move on to @secref["internals"] when you
-need more power.
-
-If you are interested in text generation and preprocessing, continue
-with @secref["reader"], but then switch to
-@other-doc['(lib "scribblings/scribble/scribble-pp.scrbl")].
\ No newline at end of file
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to.scrbl
deleted file mode 100644
index c376706172..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to.scrbl
+++ /dev/null
@@ -1,381 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/bnf "utils.rkt")
-
-@(define pkg-doc '(lib "pkg/scribblings/pkg.scrbl"))
-
-@title[#:tag "how-to-doc"]{Getting Started with Documentation}
-
-Although the @exec{scribble} command-line utility generates output
-from a Scribble document, documentation of Racket libraries is
-normally built by @exec{raco setup}. This chapter emphasizes the
-@exec{raco setup} approach, which more automatically supports links
-across documents.
-
-@margin-note{See @secref["getting-started"] for information on using the
-             @exec{scribble} command-line utility.}
-
-@;----------------------------------------
-@section[#:tag "setting-up"]{Setting Up Library Documentation}
-
-To document a collection, including a collection implemented by a
-@seclink["getting-started" #:doc pkg-doc]{package}:
-
-@itemize[
-
-  @item{Create a file in your collection with the
-        file extension @filepath{.scrbl}. Beware that the file name
-        you choose will determine the output directory's name, and
-        the directory name must be unique across all installed documents. The
-        remainder of these instructions assume that the file is called
-        @filepath{manual.scrbl} (but pick a more specific name in practice).}
-
-  @item{Start @filepath{manual.scrbl} like this:
-          @verbatim[#:indent 2]|{
-            #lang scribble/manual
-
-            @title{My Library}
-
-            Welcome to my documentation: @racket[(list 'testing 1 2 3)].
-          }|
-
-        The first line starts the file in ``text'' mode and selects
-        the Racket manual output format.
-        It also introduces bindings like @racket[title] and
-        @racket[racket] for writing Racket documentation.}
-
-  @item{Add the following entry to your collection's
-        @filepath{info.rkt}:
-
-        @racketblock[
-          (define scribblings '(("manual.scrbl" ())))
-        ]
-
-        The @racket[()] above is a list of options. When your document
-        gets large enough that you want it split into multiple pages,
-        add the @racket['multi-page] option (omitting the quote, since
-        the whole right-hand side of the definition is already
-        quoted).
-
-        If you do not already have an @filepath{info.rkt} module,
-        here's a suitable complete module:
-
-        @racketmod[
-          info
-          (define scribblings '(("manual.scrbl" ())))
-        ]}
-
-  @item{Run @exec{raco setup} to build your documentation. For a
-        collection, optionally supply @Flag{l} followed by the
-        collection name to limit the build process to that
-        collection.}
-
-  @item{For a collection that is installed as user-specific
-        (e.g., the user @tech[#:doc pkg-doc]{package scope}), the generated
-        documentation is @filepath{doc/manual/index.html} within the
-        collection directory. If the collection is installation-wide,
-        however, then the documentation
-        is generated as @filepath{manual/index.html} in the
-        installation's @filepath{doc} directory.}
-
-]
-
-@; ----------------------------------------
-@section[#:tag "racket-hyperlinks"]{Racket Typesetting and Hyperlinks}
-
-In the document source at the start of this chapter
-(@secref["setting-up"]), the Racket expression
-@racket[(#,(racketidfont "list") 'testing 1 2 3)] is typeset properly,
-but the @racketidfont{list} identifier is not hyperlinked to the usual
-definition. To cause @racketidfont{list} to be hyperlinked, add a
-@racket[require] form like this:
-
-@verbatim[#:indent 2]|{
-  @(require (for-label racket))
-}|
-
-This @racket[require] with @racket[for-label] declaration introduces a
-document-time binding for each export of the @racketmodname[racket]
-module. When the document is built, the @racket[racket] form detects
-the binding for @racket[list], and so it generates a reference to the
-specification of @racket[list]. The setup process detects the
-reference, and it finds the matching specification in the existing
-documentation, and ultimately directs the hyperlink to that
-specification.
-
-Hyperlinks based on @racket[for-label] and @racket[racket] are the
-preferred mechanism for linking to information outside of a single
-document. Such links require no information about where and how a
-binding is documented elsewhere:
-
-@verbatim[#:indent 2]|{
-  #lang scribble/manual
-  @(require (for-label racket))
-
-  @title{My Library}
-
-  See also @racket[list].
-}|
-
-The @racket[racket] form typesets a Racket expression for inline text,
-so it ignores the source formatting of the expression. The
-@racket[racketblock] form, in contrast, typesets inset Racket code,
-and it preserves the expression's formatting from the document source.
-
-@verbatim[#:indent 2]|{
-  #lang scribble/manual
-  @(require (for-label racket))
-
-  @title{My Library}
-
-  Some example Racket code:
-
-  @racketblock[
-  (define (nobody-understands-me what)
-    (list "When I think of all the"
-          what
-           "I've tried so hard to explain!"))
-  (nobody-understands-me "glorble snop")
-  ]
-}|
-
-
-@; ----------------------------------------
-@section[#:tag "section-hyperlinks"]{Section Hyperlinks}
-
-A @racket[section] declaration in a document can include a
-@racket[#:tag] argument that declares a hyperlink-target tag. The
-@racket[secref] function generates a hyperlink, using the section name
-as the text of the hyperlink. Use @racket[seclink] to create a
-hyperlink with text other than the section title.
-
-The following example illustrates section hyperlinks:
-
-@verbatim[#:indent 2]|{
-  #lang scribble/manual
-  @(require (for-label racket))
-
-
-  @title{My Library}
-
-  Welcome to my documentation: @racket[(list 'testing 1 2 3)].
-
-  @table-of-contents[]
-
-
-  @section[#:tag "chickens"]{Philadelphia Chickens}
-
-  Dancing tonight!
-
-
-  @section{Reprise}
-
-  See @secref{chickens}.
-}|
-
-Since the page is so short, the hyperlinks in the above example are
- more effective if you change the @filepath{info.rkt} file to add the
- @racket['multi-file] flag:
-
-@racketblock[
-(define scribblings '(("manual.scrbl" (multi-page))))
-]
-
-A section can have a @techlink{tag prefix} that applies to all tags as
-seen from outside the section. Such a prefix is automatically given to
-each top-level document as processed by @exec{raco setup}. Thus,
-referencing a section tag in a different document requires using a
-prefix, which is based on the target document's main source file.  The
-following example links to a section in the Racket reference
-manual:
-
-@verbatim[#:indent 2]|{
-  #lang scribble/manual
-  @(require (for-label racket))
-  @(define ref-src
-     '(lib "scribblings/reference/reference.scrbl"))
-
-  @title{My Library}
-
-  See also @italic{@secref[#:doc ref-src]{pairs}}.
-}|
-
-As mentioned in @secref{racket-hyperlinks}, however, cross-document
-references based on @racket[(require (for-label ....))] and
-@racket[racket] are usually better than cross-document references
-using @racket[secref].
-
-@; ----------------------------------------
-@section{Defining Racket Bindings}
-
-Use @racket[defproc] to document a procedure, @racket[defform] to
-document a syntactic form, @racket[defstruct] to document a structure
-type, etc.  These forms provide consistent formatting of definitions,
-and they declare hyperlink targets for @racket[racket]-based
-hyperlinks.
-
-To document a @racket[my-helper] procedure that is exported by
-@filepath{helper.rkt} in the @filepath{my-lib} collection that contains
-@filepath{manual.scrbl}:
-
-@itemize[
-
- @item{Use @racket[(require (for-label "helper.rkt"))] to import the
-       binding information about the bindings of @filepath{helper.rkt}
-       for use when typesetting identifiers. A relative reference
-       @racket["helper.rkt"] works since it is relative to the
-       documentation source.}
-
- @item{Add a @tt|{@defmodule[my-lib/helper]}| declaration, which
-       specifies the library that is being documented within the
-       section. The @racket[defmodule] form needs an absolute module
-       name @racket[mylib/helper], instead of a relative reference
-       @racket["helper.rkt"], since the module path given to
-       @racket[defmodule] appears verbatim in the generated
-       documentation.}
-
- @item{Use @racket[defproc] to document the procedure.}
-
-]
-
-Adding these pieces to @filepath{"manual.scrbl"} gives us the
-following:
-
-@; [Eli] This is also using `my-lib/helper' which doesn't work with
-@; planet libraries
-@verbatim[#:indent 2]|{
-  #lang scribble/manual
-  @(require (for-label racket
-                       "helper.rkt"))
-
-  @title{My Library}
-
-  @defmodule[my-lib/helper]
-
-  @defproc[(my-helper [lst list?])
-           (listof 
-            (not/c (one-of/c 'cow)))]{
-
-   Replaces each @racket['cow] in @racket[lst] with
-   @racket['aardvark].}
-}|
-
-In @racket[defproc], a contract is specified with each argument to the
-procedure. In this example, the contract for the @racket[_lst]
-argument is @racket[list?], which is the contract for a list. After
-the closing parenthesis that ends the argument sequence, the contract
-of the result must be given; in this case, @racket[my-helper]
-guarantees a result that is a list where none of the elements are
-@racket['cow].
-
-Some things to notice in this example and the documentation that it
-generates:
-
-@itemize[
-
- @item{The @racket[list?], @racket[listof], @|etc| elements of
-       contracts are hyperlinked to their documentation.}
-
- @item{The result contract is formatted in the generated documentation
-       in the same way as in the source. That is, the source layout of
-       contracts is preserved. (In this case, putting the contract all
-       on one line would be better.)}
-
- @item{In the prose that documents @racket[my-helper], @racket[_lst]
-       is automatically typeset in italic, matching the typesetting in
-       the blue box. The @racket[racket] form essentially knows that
-       it's used in the scope of a procedure with argument
-       @racket[_lst].}
-
- @item{If you hover the mouse pointer over @racket[my-helper], a popup
-       reports that it is provided from @racketidfont{my-lib/helper}.}
-
- @item{If you use @racket[my-helper] in any documentation now, as long
-       as that documentation source also has a @racket[(require
-       (for-label ....))] of @filepath{helper.rkt}, then the
-       reference is hyperlinked to the definition above.}
-
-]
-
-See @racket[defproc*], @racket[defform], @|etc| for more information
-on forms to document Racket bindings.
-
-@; ----------------------------------------
-@section{Showing Racket Examples}
-
-The @racket[examples] form from @racket[scribble/eval]
-helps you generate examples in your documentation.
-
-To use @racket[examples], the procedures to document must be suitable
-for use at documentation time; in fact, @racket[examples] uses
-bindings introduced into the document source by
-@racket[require]. Thus, to generate examples using @racket[my-helper]
-from the previous section, @filepath{helper.rkt} must be imported both
-via @racket[(require (for-label ....))] and @racket[require]:
-
-@verbatim[#:indent 2]|{
-  #lang scribble/manual
-  @(require scribble/eval    ; <--- added
-            "helper.rkt"     ; <--- added
-            (for-label racket
-                       "helper.rkt"))
-
-  @title{My Library}
-
-  @defmodule[my-lib/helper]{The @racketmodname[my-lib/helper]
-  module---now with extra cows!}
-
-  @defproc[(my-helper [lst list?])
-           (listof (not/c (one-of/c 'cow)))]{
-
-   Replaces each @racket['cow] in @racket[lst] with
-   @racket['aardvark].
-
-   @examples[
-     (my-helper '())
-     (my-helper '(cows such remarkable cows))
-   ]}
-}|
-
-@;----------------------------------------
-@section{Multi-Page Sections}
-
-Setting the @racket['multi-page] option (see
-@secref["section-hyperlinks"]) causes each top-level section of a
-document to be rendered as a separate HTML page.
-
-To push sub-sections onto separate pages, use the @racket['toc] style
-for the enclosing section (as started by @racket[title],
-@racket[section], @racket[subsection], etc.) and use
-@racket[local-table-of-contents] to generate hyperlinks to the
-sub-sections.
-
-Revising @filepath{cows.scrbl} from the previous section:
-
-@verbatim[#:indent 2]|{
-  #lang scribble/manual
-
-  @title[#:style '(toc)]{Cows}
-
-  @local-table-of-contents[]
-
-  @section[#:tag "singing"]{Singing}
-  Wherever they go, it's a quite a show.
-
-  @section{Dancing}
-  See @secref["singing"].
-}|
-
-To run this example, remember to change @filepath{info.rkt} to add the
-@racket['multi-page] style. You may also want to add a call to
-@racket[table-of-contents] in @filepath{manual.scrbl}.
-
-The difference between @racket[table-of-contents] and
-@racket[local-table-of-contents] is that the latter is ignored for
-Latex output.
-
-When using @racket[local-table-of-contents], it often makes sense to
-include introductory text before the call of
-@racket[local-table-of-contents]. When the introductory text is less
-important and when local table of contents is short, putting the
-introductory text after the call of @racket[local-table-of-contents]
-may be appropriate.
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/html.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/html.scrbl
deleted file mode 100644
index 133aba8992..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/html.scrbl
+++ /dev/null
@@ -1,494 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/core
-          scribble/eval
-          (only-meta-in 0 "utils.rkt")
-          (for-label (except-in racket/base #%top #%module-begin)
-                     racket/contract/base
-                     racket/string
-                     scribble/html))
-
-@(define html-eval (make-base-eval))
-@interaction-eval[#:eval html-eval (require scribble/html)]
-@interaction-eval[#:eval html-eval (require racket/string)]
-
-@title[#:tag "html" #:style 'toc]{HTML Generation}
-
-@defmodulelang[scribble/html]{The @racketmodname[scribble/html]
-language provides a way to generate HTML that is different from
-@racketmodname[scribble/base]. The @racketmodname[scribble/base]
-approach involves describing a document that can be rendered to HTML,
-Latex, or other formats. The @racketmodname[scribble/html] approach,
-in contrast, treats the document content as HTML format plus escapes.}
-
-Specifically, @racketmodname[scribble/html] is like
-@racketmodname[scribble/text], but with the following changes:
-
-@itemize[
-
-  @item{The @racketmodname[scribble/html/html],
-        @racketmodname[scribble/html/xml], and
-        @racketmodname[scribble/html/resource] are re-exported,
-        in addition to @racketmodname[scribble/text].}
-
-  @item{Free identifiers that end with @litchar{:} are implicitly
-        quoted as symbols.}
-
-]
-
-When @racketmodname[scribble/html] is used via @racket[require]
-instead of @hash-lang[], then it does not change the printing of
-values, and it does not include the bindings of @racket[racket/base].
-
-The @racketmodname[scribble/html/resource],
-@racketmodname[scribble/html/xml], and
-@racketmodname[scribble/html/html] libraries provide forms for
-generating HTML as strings to be output in the same way as
-@racketmodname[scribble/text].
-
-@local-table-of-contents[]
-
-@; ----------------------------------------
-
-@section[#:tag "html-html"]{Generating HTML Strings}
-
-@defmodule[scribble/html/html]{The @racketmodname[scribble/html/html]
-provides functions for HTML representations that render to string form
-via @racket[output-xml].}
-
-@defproc[(doctype [s (or/c string 'html 'xhtml)]) procedure?]{
-
-Produces a value that @tech{XML-renders} as a DOCTYPE declaration.
-
-@examples[#:eval html-eval
-(output-xml (doctype "?"))
-(output-xml (doctype 'html))
-(regexp-split #rx"\n|((?<=\") (?=\"))"
-              (xml->string (doctype 'xhtml)))]}
-
-
-@defproc[(xhtml [content outputable/c] ...) procedure?]{
-
-Produces a value that @tech{XML-renders} as the given content wrapped
-as XHTML.
-
-@examples[#:eval html-eval
-(regexp-split #rx"\n|((?<=\") (?=\"))"
-              (xml->string (xhtml "Hello")))]}
-
-@(define-syntax-rule (def-tags tag ...)
-   @deftogether[(
-   @defproc[(tag [v outputable/c] (... ...)) procedure?] ...
-   )]{
-
-   Like @racket[element/not-empty], but with the symbolic form of the function
-   name added as the first argument.
-
-   @examples[#:eval html-eval
-    (output-xml (title "The Book"))]})
-
-@(def-tags
-  html
-  head
-  title
-  style ; style info, which may include CDATA sections
-  script ; script statements, which may include CDATA sections
-  noscript ; alternate content container for non script-based rendering
-  frameset ; only one noframes element permitted per document
-  frame ; tiled window within frameset
-  iframe ; inline subwindow
-  noframes ; alternate content container for non frame-based rendering
-  body
-  div ; generic language/style container
-  p
-  h1
-  h2
-  h3
-  h4
-  h5
-  h6
-  ul ; Unordered list
-  ol ; Ordered (numbered) list
-  menu ; single column list (DEPRECATED)
-  dir ; multiple column list (DEPRECATED)
-  li ; list item
-  dl ; definition lists - dt for term, dd for its definition
-  dt
-  dd
-  address ; information on author
-  pre
-  blockquote
-  center ; center content
-  ins
-  del
-  a ; content is inline; except that anchors shouldn't be nested
-  span ; generic language/style container
-  bdo ; I18N BiDi over-ride
-  em ; emphasis
-  strong ; strong emphasis
-  dfn ; definitional
-  code ; program code
-  samp ; sample
-  kbd ; something user would type
-  var ; variable
-  cite ; citation
-  abbr ; abbreviation
-  acronym ; acronym
-  q ; inlined quote
-  sub ; subscript
-  sup ; superscript
-  tt ; fixed pitch font
-  i ; italic font
-  b ; bold font
-  big ; bigger font
-  small ; smaller font
-  u ; underline
-  s ; strike-through
-  strike ; strike-through
-  font ; local change to font
-  object ; embeded objects
-  applet ; Java applet
-  form ; forms shouldn't be nested
-  label ; text that belongs to a form control
-  select ; option selector
-  optgroup ; option group
-  option ; selectable choice
-  textarea ; multi-line text field
-  fieldset ; group form fields
-  legend ; fieldset label (one per fieldset)
-  button ; push button
-  table ; holds caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+)
-  caption ; caption text
-  thead ; header part, holds tr
-  tfoot ; footer part, holds tr
-  tbody ; body part, holds tr
-  colgroup ; column group, olds col
-  tr ; holds th or td
-  th ; header cell
-  td)
-
-@(define-syntax-rule (def-tags/empty tag ...)
-   @deftogether[(
-   @defproc[(tag [v outputable/c] (... ...)) procedure?] ...
-   )]{
-
-   Like @racket[element], but with the symbolic form of the function
-   name added as the first argument.
-
-   @examples[#:eval html-eval
-    (output-xml (hr))]})
-
-@(def-tags/empty
-  base meta link hr br basefont param img area input isindex col)
-
-@(define-syntax-rule (def-entities ent ...)
-   @deftogether[(
-   @defthing[ent procedure?] ...
-   )]{
-
-  The result of @racket[(entity '_id)] for each @racket[_id].
-
-   @examples[#:eval html-eval
-    (output-xml nbsp)]})
-
-@(def-entities
-  nbsp ndash mdash bull middot sdot lsquo rsquo sbquo ldquo rdquo bdquo
-  lang rang dagger Dagger plusmn deg)
-
-
-@defproc[(script/inline [v outputable/c] ...) procedure?]{
-
-Procedures a value that renders as an inline script.
-
-@examples[#:eval html-eval
-(output-xml (script/inline type: "text/javascript" "var x = 5;"))]}
-
-
-@defproc[(style/inline [v outputable/c] ...) procedure?]{
-
-Procedures a value that renders as an inline style sheet.
-
-@examples[#:eval html-eval
-(output-xml (style/inline type: "text/css"
-                          ".racket { font-size: xx-large; }"))]}
-
-
-@; ----------------------------------------
-
-@section[#:tag "html-xml"]{Generating XML Strings}
-
-@defmodule[scribble/html/xml]{The @racketmodname[scribble/html/xml]
-provides functions for XML representations that @deftech{XML-render} to string form
-via @racket[output-xml] or @racket[xml->string].}
-
-
-@defproc[(output-xml [content outputable/c] [port output-port? (current-output-port)])
-         void?]{
-
-Renders @racket[content] in the same way as @racket[output], but using
-the value of @racket[xml-writer] as the @tech{current writer} so that
-special characters are escaped as needed.}
-
-
-@defproc[(xml->string [content outputable/c]) string?]{
-
-Renders @racket[content] to a string via @racket[output-xml].}
-
-
-@defparam[xml-writer writer ((string? output-port? . -> . void))]{
-
-A parameter for a function that is used with @racket[with-writer] by
-@racket[output-xml]. The default value is a function that escapes
-@litchar{&}, @litchar{<}, @litchar{>}, and @litchar{"} to entity form.}
-
-
-@defproc[(make-element [tag symbol?]
-                       [attrs (listof (cons/c symbol? outputable/c))]
-                       [content outputable/c])
-         (and/c procedure outputable/c?)]{
-
-Produces a value that @tech{XML-renders} as XML for the
-given tag, attributes, and content.
-
-When an attribute in @racket[attrs] is mapped to @racket[#f], then it
-is skipped. When an attribute is mapped to @racket[#t], then it is
-rendered as present, but without a value.
-
-@examples[#:eval html-eval
-(output-xml (make-element 'b '() '("Try" #\space "Racket")))
-(output-xml (make-element 'a '((href . "http://racket-lang.org")) "Racket"))
-(output-xml (make-element 'div '((class . "big") (overlay . #t)) "example"))
-]}
-
-
-@defproc[(element [tag symbol?] [attrs-and-content any/c] ...)
-         (and procedure outputable/c?)]{
-
-Like @racket[make-element], but the list of @racket[attrs-and-content]
-is parsed via @racket[attributes+body] to separate the attributes and
-content.
-
-@examples[#:eval html-eval
-(output-xml (element 'b "Try" #\space "Racket"))
-(output-xml (element 'a 'href: "http://racket-lang.org" "Racket"))
-(output-xml (element 'div 'class: "big" 'overlay: #t "example"))
-(require scribble/html)
-(output-xml (element 'div class: "big" overlay: #t "example"))
-]}
-
-
-@defproc[(element/not-empty [tag symbol?] [attrs-and-content any/c] ...)
-         (and/c procedure? outputable/c)]{
-
-Like @racket[element], but the result always renders with an separate
-closing tag.
-
-@examples[#:eval html-eval
-(output-xml (element 'span))
-(output-xml (element/not-empty 'span))
-]}
-
-
-@defproc[(attribute? [v any/c]) (or/c #f symbol?)]{
-
-Returns a symbol without if @racket[v] is a symbol that ends with
-@litchar{:}, @racket[#f] otherwise. When a symbol is returned, it is
-the same as @racket[v], but without the trailing @litchar{:}.
-
-@examples[#:eval html-eval
-(attribute? 'a:)
-(attribute? 'a)
-(require scribble/html)
-(attribute? a:)
-]}
-
-
-@defproc[(attributes+body [lst list?]) (values (listof (cons/c symbol? any/c))
-                                               list?)]{
-
-Parses @racket[lst] into an association list mapping attributes to
-list elements plus a list of remaining elements. The first
-even-positioned (counting from 0) non-@racket[attribute?] element of
-@racket[lst] is the start of the ``remaining elements'' list, while
-each preceding even-positioned attribute is mapped in the association
-list to the immediately following element of @racket[lst]. In the
-association list, the trailing @litchar{:} is stripped for each
-attribute.}
-
-
-@defproc[(split-attributes+body [lst list?]) (values list? list?)]{
-
-Like @racket[attributes+body], but produces a flat list (of
-alternating attributes and value) instead of an association list as
-the first result.}
-
-
-@defproc[(literal [content any/c] ...) procedure?]{
-
-Produces a value that @tech{XML-renders} without escapes
-for special characters.
-
-@examples[#:eval html-eval
-(output-xml (literal "a->b"))
-(output-xml "a->b")]}
-
-
-@defproc[(entity [v (or/c exact-integer? symbol?)]) procedure?]{
-
-Produces a value that @tech{XML-renders} as a numeric or
-symbolic entity.
-
-@examples[#:eval html-eval
-(output-xml (entity 'gt))]}
-
-
-@defproc[(comment [content outputable/c] ... [#:newlines? newlines? any/c #f])
-         procedure?]{
-
-Produces a value that @tech{XML-renders} as a comment with
-literal content. If @racket[newlines?] is true, then newlines are
-inserted before and after the content.
-
-@examples[#:eval html-eval
-(output-xml (comment "testing" 1 2 3))]}
-
-
-@defproc[(cdata [content outputable/c] ... 
-                [#:newlines? newlines? any/c #t]
-                [#:line-pfx line-pfx any/c #f])
-         procedure?]{
-
-Produces a value that @tech{XML-renders} as CDATA with
-literal content. If @racket[newlines?] is true, then newlines are
-inserted before and after the content. The @racket[line-pfx] value is
-rendered before the CDATA opening and closing markers.
-
-@examples[#:eval html-eval
-(output-xml (cdata "testing" 1 2 3))]}
-
-
-@defform[(define/provide-elements/empty tag-id ...)]{
-
-Defines and exports @racket[tag-id] as a function that is like
-@racket[element], but with @racket['tag-id] added as the first argument.}
-
-
-@defform[(define/provide-elements/not-empty tag-id ...)]{
-
-Defines and exports @racket[tag-id] as a function that is like
-@racket[element/not-empty], but with @racket['_tag-id] added as the
-first argument.}
-
-
-@defform[(define/provide-entities entity-id ...)]{
-
-Defines and exports @racket[entity-id] as the 
-result of @racket[(entity '_entity-id)].}
-
-@; ----------------------------------------
-
-@section[#:tag "html-resources"]{HTML Resources}
-
-@defmodule[scribble/html/resource]
-
-@defproc[(resource [path string?]
-                   [renderer (or/c (path-string? . -> . any) #f)]
-                   [#:exists exists (or/c 'delete-file #f) 'delete-file])
-         (and/c resource?
-                (->* () (outputable/c) -> string?))]{
-
-Creates and returns a new @deftech{resource} value. Creating a
-resource registers @racket[renderer] (if non-@racket[#f]) to be called when rendering is
-initiated by @racket[render-all], while calling the result resource as
-a function generates a URL for the resource.
-
-For example, a typical use of @racket[resource] is to register the
-generation of a CSS file, where the value produced by
-@racket[resource] itself renders as the URL for the generated CSS
-file. Another possible use of @racket[resource] is to generate an HTML
-file, where the @racket[resource] result renders as the URL of the
-generated HTML page.
-
-The @racket[path] argument specifies the path of the output file,
-relative to the working directory, indicating where the resource file
-should be placed. Though @racket[url-roots], @racket[path] also
-determines the ultimate URL. The @racket[path] string must be a
-@litchar{/}-separated relative path with no @litchar{..}, @litchar{.},
-or @litchar{//}. The @racket[path] string can end in @litchar{/}, in
-which case @racket["index.html"] is effectively added to the string.
-Using @racket[resource] with @racket[#f] as @racket[renderer] is
-useful for converting a path to a URL according to @racket[url-roots].
-
-The @racket[renderer] argument (when non-@racket[#f]) renders the resource, receiving the
-path for the file to be created. The path provided to
-@racket[renderer] will be different from @racket[path], because the
-function is invoked in the target directory.
-
-The resulting resource value is a function that returns the URL for
-the resource. The function accepts an optional boolean; if a true
-value is provided, the result is an absolute URL, instead of relative.
-Note that the function can be used as a value for @racket[output],
-which uses the resource value as a thunk (that renders as the relative
-URL for the resource).  The default relative resulting URL is, of
-course, a value that depends on the currently rendered resource that
-uses this value.
-
-When @racket[renderer] is called by @racket[render-all], more
-resources can be created while rendering; the newly created resources
-will also be rendered, in turn, until no more new resources are
-created.
-
-If @racket[exists] is @racket['delete-file] and the target file exists
-when @racket[renderer] is to be called, then the file is deleted
-before @racket[renderer] is called.}
-
-
-@defparam[url-roots roots (or/c #f
-                                (listof (cons/c path-string?
-                                                (cons/c string?
-                                                        (listof (or/c 'abs 'index))))))]{
-
-A parameter that determines how resource paths are converted to URLs
-for reference. A @racket[#f] value is equivalent to an empty list.
-
-The parameter value is a mapping from path prefixes to URLs (actually,
-any string). When two paths have the same prefix, links from one to
-the other are relative (unless absolute links are requested); if they
-have different prefixes, the full URL is used. The paths enclosed by
-two root paths must be disjoint (e.g., the list must not include
-both @racket["/colors"] and @racket["/colors/red"], but it can include
-both @racket["/colors/red"] and @racket["/colors/blue"]).
-
-If an item in the parameter's list includes @racket['abs], then a
-site-local, absolute URL (i.e., a URL that starts with @litchar{/}) is
-produced for references among files within the corresponding prefix.
-
-If an item in the parameter's list includes @racket['index], then a
-reference to a directory path is converted to a reference to
-@filepath{index.html}, otherwise a reference to @filepath{index.html}
-is converted to a directory path.}
-
-
-@defproc[(resource? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a procedure (that takes 0 or 1
-arguments) produced by @racket[resource].}
-
-
-@defproc[(render-all) void?]{
-
-Generates all resources registered via @racket[resource].}
-
-
-@defproc[(file-writer [content-writer (outputable/c output-port? . -> . any)]
-                      [content outputable/c])
-         (path-string? . -> . any)]{
-
-Produces a function that is useful as a @racket[_writer] argument to
-@racket[resource]. Given a path, the produced function writes
-@racket[content] to the path by passing @racket[content] and an output
-port for the file to @racket[content-writer].}
-
-@; ------------------------------------------------------------
-
-@close-eval[html-eval]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.css b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.css
deleted file mode 100644
index d33f207685..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.InBox {
-  padding: 0.2em;
-  border: 1px solid #000000;
-}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.tex b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.tex
deleted file mode 100644
index 399a3ee234..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-
-\newcommand{\InBox}[1]{\fbox{#1}}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/info.rkt b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/info.rkt
deleted file mode 100644
index 2df098dea0..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define scribblings '(("scribble.scrbl" (multi-page) (racket-core -24))
-                      ("scribble-pp.scrbl" (multi-page) (tool))
-
-                      ("demo-s1.scrbl" (keep-style no-search) (omit-start))
-                      ("demo-m1.scrbl" (multi-page keep-style no-search) (omit-start))
-                      ("demo-s2.scrbl" (keep-style) (omit-start))
-                      ("demo-m2.scrbl" (multi-page keep-style) (omit-start))
-
-                      ("demo-manual-s1.scrbl" (keep-style no-search) (omit-start))
-                      ("demo-manual-m1.scrbl" (multi-page keep-style no-search) (omit-start))
-                      ("demo-manual-s2.scrbl" (keep-style) (omit-start))
-                      ("demo-manual-m2.scrbl" (multi-page keep-style) (omit-start))))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/internals.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/internals.scrbl
deleted file mode 100644
index 9c8ca23805..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/internals.scrbl
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt")
-
-@title[#:tag "internals" #:style 'toc]{Low-Level Scribble API}
-
-@local-table-of-contents[]
-
-@include-section["layers.scrbl"]
-@include-section["reader-internals.scrbl"]
-@include-section["core.scrbl"]
-@include-section["renderer.scrbl"]
-@include-section["decode.scrbl"]
-@include-section["doclang.scrbl"]
-@include-section["docreader.scrbl"]
-@include-section["xref.scrbl"]
-@include-section["tag.scrbl"]
-@include-section["blueboxes.scrbl"]
-@include-section["config.scrbl"]
-
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/jfp.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/jfp.scrbl
deleted file mode 100644
index da23c2eb6f..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/jfp.scrbl
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang scribble/manual
-@(require (except-in "utils.rkt" author) (for-label scribble/jfp))
-
-@(define-syntax-rule (def base-author)
-   (begin
-     (require (for-label scribble/base))
-     (define base-author @racket[author])))
-@(def base-author)
-
-@title{JFP Paper Format}
-
-@defmodulelang[scribble/jfp]{The @racketmodname[scribble/jfp]
-language is like @racketmodname[scribble/base], but configured with
-Latex style defaults to use the @filepath{jfp1.cls} class
-file. The class file is not included with Scribble due to license
-issues, but if the file is not manually installed into the
-@racket[scribble/jfp] collections, then it is downloaded on demand to
-@racket[(find-system-path 'addon-dir)].}
-
-Latex output with @racketmodname[scribble/jfp] uses a main-document
-version supplied to @racket[title] as the short-form document name (to
-be used in page headers).
-
-@defproc[(abstract [pre-content pre-content?] ...) block?]{
-
-Generates a @tech{nested flow} for a paper abstract.}
-
-@defform[(include-abstract module-path)]{
-
-Similar to @racket[include-section], but incorporates the document in the
-specified module as an abstract. The document must have no title or
-sub-parts.}
-
-@defproc[(author [name pre-content?] ...)
-         block?]{
-
-A replacement for @base-author from @racketmodname[scribble/base].}
-
-@defproc[((author/short [short-name pre-content?] ...) [long-name pre-content?] ...)
-         block?]{
-
-Like @racket[author], but allows the short-form names (to be used in
-page headers) to be specified separately from the long-form name.}
-
-@deftogether[(
-@defproc[(affiliation [place pre-content?] ...) element?]
-@defproc[(affiliation-mark [mark pre-content?] ...) element?]
-@defproc[(affiliation-sep) element?]
-)]{
-
-Use @racket[affiliation] within @racket[author] or the long-name part
-of @racket[author/short] to specify affiliations after all authors.
-If different authors have different affiliations, use
-@racket[affiliation-mark] with a number after each author, and then
-use @racket[affiliation-mark] before each different affiliation within
-a single @racket[affiliation], using @racket[(affiliation-sep)] to
-separate affiliations.}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/layers.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/layers.scrbl
deleted file mode 100644
index fc0fe6cf38..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/layers.scrbl
+++ /dev/null
@@ -1,239 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/bnf "utils.rkt")
-
-@title[#:tag "layers"]{Scribble Layers}
-
-Scribble is made of independently usable parts.  For example, the
-Scribble reader can be used in any situation that requires lots of
-free-form text. You can also skip Scribble's special reader support,
-and instead use the document-generation structure directly.
-
-@; ----------------------------------------------------------------------
-
-@section{Typical Composition}
-
-A Scribble document normally starts
-
-@racketmod[
-scribble/manual
-]
-
-but it could also start
-
-@racketmod[
-scribble/base
-]
-
-or
-
-@racketmod[
-scribble/doc
-]
-
-The last one introduces the smallest number of typesetting bindings in
-the document body. Using @racketmodname[scribble/base] after
-@hash-lang[] is the same as using @racketmodname[scribble/doc] plus
-@racket[(require scribble/base)], and using
-@racketmodname[scribble/manual] after @hash-lang[] is the same as using
-@racketmodname[scribble/doc] plus @racket[(require scribble/manual)].
-
-Besides making the file a module, each of the @hash-lang[]
-declarations selects the Scribble reader (instead of the usual Racket
-reader), and it starts the body of the file in ``text'' mode. The
-reader layer mostly leaves text alone, but @tech{@"@"-forms} escape
-to S-expression mode.
-
-A module written as
-
-@verbatim[#:indent 2]|{
-  #lang scribble/doc
-  @(require scribble/manual)
-
-  @(define to-be "To Be")
-
-  @title{@|to-be| or Not @|to-be|}
-
-  @bold{That} is the question.
-  Whether 'tis nobler...
-}|
-
-reads as
-
-@racketblock[
-(module #,(nonterm "name") scribble/doc
-  (require scribble/manual)
-  "\n"
-  (define to-be "To Be") "\n"
-  "\n"
-  (title to-be " or Not " to-be) "\n"
-  "\n"
-  (bold "That") " is the question." "\n"
-  "Whether 'tis nobler..." "\n")
-]
-
-As shown in this example, the read result is a module whose content
-mingles text and definitions. The @racketmodname[scribble/doc]
-language lifts definitions, @racket[require]s, and @racket[provide]s
-to the beginning of the module, while everything else is collected
-into a document bound to the provided identifier @racket[doc].  That
-is, the module is transformed to something like this:
-
-@racketblock[
-(module #,(nonterm "name") racket/base
-  (require scribble/decode
-           scribble/manual)
-  (define to-be "To Be")
-  (define doc
-    (decode
-     "\n" "\n" "\n"
-     (title to-be " or Not " to-be) "\n"
-     "\n"
-     (bold "That") " is the question." "\n"
-     "Whether 'tis nobler..." "\n"))
-  (provide doc))
-]
-
-The @racket[decode] function produces a @racket[part] structure
-instance that represents the document. To build the @racket[part]
-instance, it inspects its arguments to find a @racket[title-decl]
-value created by @racket[title] to name the part, @racket[part-start]
-values created by @racket[section] to designate sub-parts, etc.
-
-A @racket[part] is the input to a rendering back-end, such as the HTML
-renderer. All renderers recognize a fixed structure hierarchy: the
-content of a part is a @defterm{flow}, which is a sequence of
-@defterm{flow elements}, such as paragraphs and tables; a table, in
-turn, consists of a list of list of flows; a paragraph is a list of
-@defterm{elements}, which can be instances of the @racket[element]
-structure type, plain strings, or certain special symbols.
-
-The value bound to @racket[doc] in the example above is something like
-
-@racketblock[
-(make-part ....
-           (list "To Be" " or Not " "To Be") (code:comment "title")
-           ....
-           (make-flow
-             (list
-              (make-paragraph
-               (list (make-element 'bold (list "That"))
-                     " is the question." "\n"
-                     "Whether " 'rsquo "tis nobler..."))))
-           ....)
-]
-
-Notice that the @litchar{'} in the input's @litchar{'tis} has turned
-into @racket['rsquo] (rendered as a curly apostrophe). The conversion to use
-@racket['rsquo] was performed by @racket[decode] via
-@racket[decode-flow] via @racket[decode-paragraph] via
-@racket[decode-content] via @racket[decode-string].
-
-In contrast, @racket[(make-element 'bold (list "That"))] was produced
-by the @racket[bold] function.  The @racket[decode] operation is a
-function, not a syntactic form, and so @racket[bold] has control over
-its argument before @racket[decode] sees the result. Also, decoding
-traverses only immediate string arguments.
-
-As it turns out, @racket[bold] also decodes its argument, because the
-@racket[bold] function is implemented as
-
-@racketblock[
-(define (bold . strs)
-  (make-element 'bold (decode-content strs)))
-]
-
-The @racket[verbatim] function, however, does not decode its content,
-and instead typesets its text arguments directly.
-
-A document module can construct elements directly using
-@racket[make-element], but normally functions like @racket[bold] and
-@racket[verbatim] are used to construct them. In particular, the
-@racketmodname[scribble/manual] library provides many functions and
-forms to typeset elements and flow elements.
-
-The @racket[part] structure hierarchy includes built-in element types
-for setting hyperlink targets and references. Again, this machinery is
-normally packaged into higher-level functions and forms, such as
-@racket[secref], @racket[defproc], and @racket[racket].
-
-@; ----------------------------------------------------------------------
-
-@section{Layer Roadmap}
-
-Working roughly from the bottom up, the Scribble layers are:
-
-@itemize[
-
- @item{@racketmodname[scribble/reader]: A reader that extends the
-       syntax of Racket with @tech{@"@"-forms} for conveniently embedding a
-       mixin of text and escapes. See @secref["reader"].}
-
- @item{@racketmodname[scribble/core]: A set of document datatypes
-       and utilities that define the basic layout and processing of a
-       document. For example, the @racket[part] datatype is defined in
-       this layer. See @secref["core"].}
-
- @item{@racketmodname[scribble/base-render] with
-       @racketmodname[scribble/html-render],
-       @racketmodname[scribble/latex-render], or
-       @racketmodname[scribble/text-render]: A base renderer and
-       mixins that generate documents in various formats from
-       instances of the @racketmodname[scribble/struct] datatypes. See
-       @secref["renderer"].}
-
- @item{@racketmodname[scribble/decode]: Processes a stream of text,
-       section-start markers, etc. to produce instances of the
-       @racketmodname[scribble/core] datatypes. See
-       @secref["decode"].}
-
- @item{@racketmodname[scribble/doclang]: A language to be used for the
-       initial import of a module; processes the module top level
-       through @racketmodname[scribble/decode], and otherwise provides
-       all of @racketmodname[racket/base].  See @secref["doclang"].}
-
- @item{@racketmodname[scribble/doc]: A language that combines
-       @racketmodname[scribble/reader] with
-       @racketmodname[scribble/doclang]. See @secref["docreader"].}
-
- @item{@racketmodname[scribble/base]: A library of basic document
-       operators---such as @racket[title], @racket[section], and
-       @racket[secref]---for use with @racketmodname[scribble/decode]
-       and a renderer. This library name also can be used as a
-       language, where it combines @racketmodname[scribble/doc] with
-       the exports of @racketmodname[scribble/base]. See
-       @secref["base"].}
-
- @item{@racketmodname[scribble/racket]: A library of functions for
-       typesetting Racket code. See @secref["scheme"]. These functions
-       are not normally used directly, but instead used through
-       @racketmodname[scribble/manual].}
-
- @item{@racketmodname[scribble/manual]: A library of functions for
-       writing Racket documentation; re-exports
-       @racketmodname[scribble/base]. Also, the
-       @racketmodname[scribble/manual-struct] library provides types
-       for index-entry descriptions created by functions in
-       @racketmodname[scribble/manual]. See @secref["manual"].}
-
- @item{@racketmodname[scribble/eval]: A library of functions for
-       evaluating code at document-build time, especially for showing
-       examples. See @secref["eval"].}
-
- @item{@racketmodname[scribble/bnf]: A library of support functions
-       for writing grammars. See @secref["bnf"].}
-
- @item{@racketmodname[scribble/xref]: A library of support functions
-       for using cross-reference information, typically after a
-       document is rendered (e.g., to search). See @secref["xref"].}
-
- @item{@racketmodname[scribble/text]: A language that uses
-       @racketmodname[scribble/reader] preprocessing text files.}
-
-]
-
-The @exec{scribble} command-line utility generates output with a
-specified renderer. More specifically, the executable installs a
-renderer, loads the modules specified on the command line, extracts
-the @racket[doc] export of each module (which must be an instance of
-@racket[part]), and renders each---potentially with links that span
-documents.
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lncs.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lncs.scrbl
deleted file mode 100644
index 531f031a06..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lncs.scrbl
+++ /dev/null
@@ -1,97 +0,0 @@
-#lang scribble/manual
-@(require (except-in "utils.rkt" author)
-          (except-in (for-label scribble/lncs/lang) #%module-begin))
-
-@(define-syntax-rule (def base-author)
-   (begin
-     (require (for-label scribble/base))
-     (define base-author @racket[author])))
-@(def base-author)
-
-@title{LNCS Paper Format}
-
-@defmodulelang[scribble/lncs #:use-sources (scribble/lncs/lang)]{
-  The @racketmodname[scribble/lncs]
-language is like @racketmodname[scribble/base], but configured with
-Latex style defaults to use the @filepath{llncs.cls} class
-file. The class file is not included with Scribble due to license issues,
-but if the file is not manually installed into the
-@racket[scribble/lncs] collection, then it is downloaded on demand to
-@racket[(find-system-path 'addon-dir)].}
-
-@defproc[(abstract [pre-content pre-content?] ...) block?]{
-
-Generates a @tech{nested flow} for a paper abstract.}
-
-@defform[(include-abstract module-path)]{
-
-Similar to @racket[include-section], but incorporates the document in the
-specified module as an abstract. The document must have no title or
-sub-parts.}
-
-@defform/subs[#:literals (author)
-              (authors auth ...)
-              ([auth (author pre-content-expr ...)
-                     (author #:inst str-expr pre-content-expr ...)])
-              #:contracts ([pre-content-expr pre-content?]
-                           [str-expr string?])]{
-
-A replacement for @base-author from @racketmodname[scribble/base].
-
-The @racket[#:inst] should be a number that matches up to one of the
-arguments to @racket[institutes].
-}
-
-
-@defidform[author]{For use only in @racket[authors].}
-
-
-@defform[#:literals (institute)
-         (institutes (institute pre-content-expr ...) ...)
-         #:contracts ([pre-content-expr pre-content?])]{
-
-The @racket[pre-content-expr]s are used as the institutions of the authors.
-
-}
-
-@defidform[institute]{For use only in @racket[institutes].}
-
-@defform[(email pre-content-expr ...)]{
-  Specifies an email address; must be used inside @racket[institute].
-}
-
-@section{Example}
-
-Here is an example of a paper written in the LNCS format:
-
-@margin-note{For more randomly generated papers, see SCIgen:
-             @url["http://pdos.csail.mit.edu/scigen"]}
-
-@codeblock[#:keep-lang-line? #t]|{
-#lang scribble/lncs
-
-@authors[@author[#:inst "1"]{Lauritz Darragh}
-         @author[#:inst "2"]{Nikolaj Kyran}
-         @author[#:inst "2"]{Kirsten Gormlaith}
-         @author[#:inst "2"]{Tamaz Adrian}]
-
-@institutes[
-  @institute["University of Southeast Boston"
-             @linebreak[]
-             @email|{darragh@cs.seboston.edu}|]
-  @institute["University of Albion"
-             @linebreak[]
-             @email|{{nkyran,gorm,tamaz}@cs.albion.ac.uk}|]]
-
-@title{Arak: Low-Energy, Interposable Theory}
-
-@abstract{The implications of client-server symmetries have been
-far-reaching and pervasive. Given the current status of
-constant-time theory, mathematicians daringly desire the synthesis
-of rasterization, which embodies the essential principles of
-algorithms. In this work, we describe a client-server tool for
-investigating flip-flop gates (Arak), verifying that the
-producer-consumer problem can be made homogeneous, secure, and
-wireless.}
-}|
-
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex-doc.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex-doc.scrbl
deleted file mode 100644
index c23d6e8ed4..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex-doc.scrbl
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scribble/doc
-@(require scribble/lp-include)
-
-@lp-include["lp-ex.rkt"]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex.rkt b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex.rkt
deleted file mode 100644
index bfcd0abc7a..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scribble/lp
-
-Literate programs have chunks of code, like this one:
-
-@chunk[<f>
-       (define (f x)
-         <fs-body>)]
-
-and this one:
-
-@chunk[<fs-body>
-       (* x x)]
-
-that, when assembled, produce a complete program, in this case:
-
-@racketblock[(define (f x)
-               (* x x))]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.css b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.css
deleted file mode 100644
index 638efcd2a1..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.LPBoxed {
-  padding: 1ex;
-  border: 1px solid #000000;
-}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.scrbl
deleted file mode 100644
index 7c5bf0116c..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.scrbl
+++ /dev/null
@@ -1,97 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/core scribble/html-properties
-          scribble/latex-properties
-          racket/runtime-path
-          "utils.rkt"
-          (prefix-in lp-ex: "lp-ex-doc.scrbl")
-          (for-label scribble/lp-include scribble/lp))
-
-@title[#:tag "lp"
-       #:style (make-style #f
-                           (list (make-css-addition "lp.css")
-                                 (make-tex-addition "lp.tex")))
-      ]{Literate Programming}
-
-Programs written using @racketmodname[scribble/lp] are simultaneously
-two things: a program and a document describing the program.
-
-Programs in @racketmodname[scribble/lp] are viewed in two different
-ways, either by running the program directly or by including it with
-@racket[lp-include].  When running the program, all of the
-@racket[chunk] expressions are collected and stitched together into a
-program, and the rest of the module is discarded. When using
-@racket[lp-include], the entire contents of the module are preserved
-and are treated like an ordinary Scribble document, where
-@racket[chunk]s are typeset in a manner similar to @racket[codeblock].
-
-@(define-runtime-path lp-ex "lp-ex.rkt")
-
-For example, consider this program:
-
-@(call-with-input-file lp-ex
-   (lambda (port)
-     (verbatim
-      #:indent 2
-      (apply 
-       string-append
-       (let loop ()
-	 (let ([line (read-line port 'any)])
-	   (cond
-	    [(eof-object? line) '()]
-            [(equal? line "") (cons "  \n" (loop))]
-            [else 
-	       (list* line "\n" (loop))])))))))
-
-When this file is @racket[require]d in the normal manner, it defines a
-function @racket[f] that squares its argument, and the documentation
-is ignored. When it is included with @racket[lp-include], it looks
-like this:
-
-@(make-nested-flow
-  (make-style "LPBoxed" null)
-  (part-blocks lp-ex:doc))
-
-@section{@racketmodname[scribble/lp] Language}
-
-@defmodulelang[scribble/lp]{The @racketmodname[scribble/lp] language
-provides core support for literate programming.}
-
-@defform[(chunk id form ...)]{
-
-  Introduces a chunk, binding @racket[id] for use in other
-  chunks. Normally, @racket[id] starts with @litchar{<} and ends with
-  @litchar{>}.
-
-  When running a scribble program only the code inside the
-  chunks is run; the rest is ignored. 
-
-  If @racket[id] is @racketidfont{<*>}, then this chunk is
-  used as the main chunk in the file. If @racketidfont{<*>}
-  is never used, then the first chunk in the file is treated
-  as the main chunk. If some chunk is not referenced from
-  the main chunk (possibly indirectly via other chunks that
-  the main chunk references), then it is not included in the
-  program and thus is not run.
-
-}
-
-@defform[(CHUNK id form ...)]{
-
- Like @racket[chunk], but allows the use of @racket[unsyntax] in the
-code part. If you want to use @racket[unsyntax] to escape to Scribble,
-use @racket[UNSYNTAX].
-
-}
-
-@section{@racketmodname[scribble/lp-include] Module}
-
-@defmodule[scribble/lp-include]{The
-@racketmodname[scribble/lp-include] library is normally used within a
-Scribble document---that is, a module that starts with something like
-@racket[#, @hash-lang[] scribble/base] or @racket[#, @hash-lang[]
-scribble/manual], instead of @racket[#, @hash-lang[] racket].}
-
-@defform[(lp-include filename)]{
-Includes the source of @racket[filename] as the typeset version of the literate
-program.
-}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.tex b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.tex
deleted file mode 100644
index fcbaecac57..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-
-\usepackage{framed}
-\newenvironment{LPBoxed}{\begin{framed}}{\end{framed}}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual-stub.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual-stub.scrbl
deleted file mode 100644
index 4d929d7f46..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual-stub.scrbl
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt" (for-label scribble/sigplan))
-
-@title{Racket Manual Format}
-
-The @racketmodname[scribble/manual] language is a major component of
-Scribble, and it is documented in its own chapter:
-@secref["plt-manuals"].
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual.scrbl
deleted file mode 100644
index baf440adf8..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual.scrbl
+++ /dev/null
@@ -1,2110 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual "utils.rkt"
-          (for-syntax racket/base)
-          (for-label scribble/manual-struct
-                     version/utils
-                     syntax/quote))
-
-@(define lit-ellipses (racket ...))
-@(define lit-ellipses+ (racket ...+))
-
-@title[#:tag "manual" #:style 'toc]{Manual Forms}
-
-@defmodulelang[scribble/manual]{The @racketmodname[scribble/manual]
-language provides all of @racketmodname[scribble/base] plus many
-additional functions that are specific to writing Racket
-documentation. It also associates @tech{style properties} with the
-generated @racket[doc] export to select the default Racket manual
-style for rendering; see @secref["manual-render-style"] for more
-information.
-
-The @racketmodname[scribble/manual] name can also be used as a library
-with @racket[require], in which case it provides all of the same
-bindings, but without setting the reader or setting the default
-rendering format to the Racket manual format.}
-
-
-@local-table-of-contents[]
-
-@; ------------------------------------------------------------------------
-@section[#:tag "scribble:manual:code"]{Typesetting Code}
-
-The @racket[codeblock] and @racket[code] forms (see
-@secref["all-code"]) typeset code verbatim, adding a layer of color to
-the code based on the same syntax-coloring parsers that are used by
-DrRacket. Input that is parsed as an identifier is further given a
-lexical context and hyperlinked via @racket[for-label] imports.
-
-The @racket[racketblock] and @racket[racket] forms (see
-@secref["racket-code"]) typeset S-expression code roughly verbatim,
-but roughly by quoting the source term with
-@racket[syntax]. Identifiers in the quoted S-expression are
-hyperlinked via @racket[for-label] imports.
-
-The two different approaches to typesetting code---@racket[codeblock]
-and @racket[code] versus @racket[racketblock] and
-@racket[racket]---have different advantages and disadvantages:
-
-@itemlist[
-
- @item{The @racket[codeblock] and @racket[code] forms work with
-       non-S-expression syntax, and they give authors more control
-       over output (e.g., the literal number @code{2/4} is not
-       normalized to @racket[2/4]). The @racket[codeblock] and
-       @racket[code] forms do not yet support escapes to Scribble
-       element mode, and they cannot adapt spacing based on the width
-       of elements in escapes.}
-
- @item{The @racket[racketblock] and @racket[racket] forms are more
-       efficient and allow escapes to Scribble element mode. The
-       @racket[racketblock] and @racket[racket] forms are tied to
-       S-expression syntax, however, and they are based on a syntax
-       representation that tends to normalize source terms (e.g., the
-       literal number @code{2/4} is normalized to @racket[2/4]).}
-
-]
-
-@; ----------------------------------------
-@subsection[#:tag "all-code"]{@hash-lang[]-Specified Code}
-
-@defform/subs[(codeblock option ... str-expr ...+)
-              ([option (code:line #:keep-lang-line? keep-expr)
-                       (code:line #:indent indent-expr)
-                       (code:line #:expand expand-expr)
-                       (code:line #:context context-expr)
-                       (code:line #:line-numbers line-number-expr)
-                       (code:line #:line-number-sep line-number-sep-expr)])
-              #:contracts ([keep-expr any/c]
-                           [indent-expr exact-nonnegative-integer?]
-                           [expand-expr (or/c #f (syntax? . -> . syntax?))]
-                           [context-expr syntax?]
-                           [line-number-expr (or/c #f exact-nonnegative-integer?)]
-                           [line-number-sep-expr exact-nonnegative-integer?])]{
-
-Parses the code formed by the strings produced by the
-@racket[str-expr]s as a Racket module (roughly) and produces a
-@tech{block} that typesets the code inset via @racket[nested] with the
-style @racket['code-inset].
-
-The @racket[str-expr]s should normally start with @hash-lang[] to
-determine the reader syntax for the module, but the resulting
-``module'' need not expand or compile---except as needed by
-@racket[expand-expr]. If @racket[expand-expr] is omitted or produces
-false, then the input formed by @racket[str-expr] is read until an
-end-of-file is encountered, otherwise a single form is read from the
-input.
-
-When @racket[keep-expr] produces a true value (the default), the first
-line in the input (which is typically @hash-lang[]) is preserved in
-the typeset output, otherwise the first line is dropped. The typeset
-code is indented by the amount specified by @racket[indent-expr],
-which defaults to @racket[0].
-
-When @racket[expand-expr] produces @racket[#f] (which is the default),
-identifiers in the typeset code are colored and linked based on
-for-label bindings in the lexical environment of the syntax object
-provided by @racket[context-expr]. The default @racket[context-expr]
-has the same lexical context as the first @racket[str-expr].
-When @racket[line-number-expr] is true, line number is enabled starting 
-from @racket[line-number-expr], and @racket[line-number-sep] controls
-the separation (in spaces; defaults to 1) between the line numbers and
-code.
-
-When @racket[expand-expr] produces a procedure, it is used to
-macro-expand the parsed program, and syntax coloring is based on the
-parsed program.
-
-For example,
-
-@codeblock[#:keep-lang-line? #f]|<|{
-  #lang scribble/manual
-  @codeblock|{
-    #lang scribble/manual
-    @codeblock{
-      #lang scribble/manual
-      @title{Hello}
-    }
-  }|
-}|>|
-
-produces the typeset result
-
-  @codeblock|{
-    #lang scribble/manual
-    @codeblock{
-      #lang scribble/manual
-      @title{Hello}
-    }
-  }|               
-
-}
-
-
-@defform[(codeblock0 option ... str-expr ...+)]{
-
-Like @racket[codeblock], but without the @racket['code-inset]
-@racket[nested] wrapper.}
-
-
-@defform/subs[(code option ... str-expr ...+)
-              ([option (code:line #:lang lang-line-expr)
-                       (code:line #:expand expand-expr)
-                       (code:line #:context context-expr)])
-              #:contracts ([lang-line-expr (or/c #f string?)]
-                           [expand-expr (or/c #f (syntax? . -> . syntax?))]
-                           [context-expr syntax?])]{
-
-Like @racket[codeblock], but produces @tech{content} instead of a
-@tech{block}. No @hash-lang[] line should appear in the string content;
-instead, it should be provided @racket[#:lang] (as a string
-without @racket["#lang "]) if needed, and the @hash-lang[] line is always stripped
-from the output when provided. Also, each newline in @racket[str-expr]s is collapsed
-along with all surrounding whitespace to a single space.
-
-For example,
-
-@codeblock[#:keep-lang-line? #f]|<|{
-  #lang scribble/manual
-  This is @code[#:lang "at-exp racket"]|{@bold{Hi}}|'s result:
-  @bold{Hi}.
-}|>|
-
-produces the typeset result
-
-@nested[#:style 'inset]{
-  This is @code[#:lang "at-exp racket"]|{@bold{Hi}}|'s result:
-  @bold{Hi}.
-}
-
-}
-
-@; ----------------------------------------
-@subsection[#:tag "racket-code"]{Racket Code}
-
-@defform/subs[(racketblock maybe-escape datum ...)
-              ([maybe-escape code:blank
-                            (code:line #:escape escape-id)])]{
-
-Typesets the @racket[datum] sequence as a table of Racket code
-inset via @racket[nested] with the style @racket['code-inset]. The
-source locations of the @racket[datum]s determine the generated
-layout. For example,
-
-@racketblock[
-(racketblock
- (define (loop x)
-   (loop (not x))))
-]
-
-produces the output
-
-@racketblock[
-(define (loop x)
-  (loop (not x)))
-]
-
-with the @racket[(loop (not x))] indented under @racket[define],
-because that's the way it is idented the use of @racket[racketblock].
-Source-location span information is used to preserve @racket[#true]
-versus @racket[#t] and @racket[#false] versus @racket[#f], and
-syntax-object properties are used to preserve square brackets and
-curly braces versus parentheses; otherwise, using syntax objects tends
-to normalize the form of S-expression elements, such as rendering
-@code{2/4} as @racket[2/4]. When source-location information is not
-available, such as when it is lost by bytecode-compiled macros,
-spacing is inserted in the same style (within a single line) as the
-@racket[racket] form.
-
-@margin-note{See also @racket[quote-syntax/keep-srcloc] for use in a
-macro to preserve source-location information in a template.}
-
-In the above example, @racket[define] is typeset as a keyword (in black)
-and as a hyperlink to @racket[define]'s definition in the reference
-manual, because this document was built using a @racket[for-label] binding of
-@racket[define] (in the source) that matches a definition in the
-reference manual. Similarly, @racket[not] is a hyperlink to its
-definition in the reference manual.
-
-Like other forms defined via @racket[define-code],
-@racket[racketblock] expands identifiers that are bound as
-@tech{element transformers}.
-
-An @racket[#:escape] clause specifies an identifier to escape back to
-an expression that produces an @racket[element]. By default,
-the escape identifier is @racket[unsyntax]. For example,
-
-@racketblock[
-#:escape nonesuch
-(racketblock
-  (+ 1 (unsyntax (elem (racket x) (subscript "2")))))
-]
-
-produces
-
-@racketblock[
-(+ 1 (unsyntax (elem (racket x) (subscript "2"))))
-]
-
-The @racket[escape-id] that defaults to @racket[unsyntax] is regonized via
-@racket[free-identifier=?], so a binding can hide the escape behavior:
-
-@RACKETBLOCK[
-(racketblock
-  (let ([(UNSYNTAX (racket unsyntax)) #f])
-    (racketblock
-      (syntax (+ 1 (unsyntax x))))))
-]
-
-The @racket[RACKETBLOCK] form's default escape is @racket[UNSYNTAX]
-instead of @racket[unsyntax].
-
-A few other escapes are recognized symbolically:
-
-@itemize[
-
- @item{@racket[(#,(indexed-racket code:line) _datum ...)] typesets as the
-       sequence of @racket[_datum]s (i.e., without the
-       @racket[code:line] wrapper).}
-
- @item{@racket[(#,(indexed-racket code:comment) _datum)] typesets like
-       @racket[_datum], but colored as a comment and prefixed with a
-       semi-colon. A typical @racket[_datum] escapes from
-       Racket-typesetting mode using @racket[unsyntax] and
-       produces a paragraph using @racket[t]: 
-
-       @verbatim[#:indent 2]|{
-         (code:comment @#,t{this is a comment})
-       }|
-
-       (Note that @litchar|{@#,foo{...}}| reads as
-       @RACKET[(unsyntax (foo "..."))].)
-       }
-
- @item{@as-index[@racketidfont{code:blank}] typesets as a blank space.}
-
- @item{@racket[(#,(indexed-racket code:hilite) _datum)] typesets like
-       @racket[_datum], but with a background highlight.}
-
- @item{@racket[(#,(indexed-racket code:quote) _datum)] typesets like
-       @racket[(@#,racketidfont{quote} _datum)], but without rendering the
-       @racketidfont{quote} as @litchar{'}.}
-
- @item{@racketidfont{_}@racket[_id] typesets as @racket[id], but
-       colored as a variable (like @racket[racketvarfont]); this
-       escape applies only if @racketidfont{_}@racket[_id] has no
-       for-label binding and is not specifically colored as a subform
-       non-terminal via @racket[defform], a variable via
-       @racket[defproc], etc.}
-
-]
-
-See also @racketmodname[scribble/comment-reader].
-}
-
-@defform[(RACKETBLOCK maybe-escape datum ...)]{Like @racket[racketblock], but with
-the default expression escape @racket[UNSYNTAX] instead of @racket[unsyntax].}
-
-@defform[(racketblock0 maybe-escape datum ...)]{Like @racket[racketblock], but
-without insetting the code via @racket[nested].}
-
-@defform[(RACKETBLOCK0 maybe-escape datum ...)]{Like @racket[RACKETBLOCK], but
-without insetting the code via @racket[nested].}
-
-@deftogether[(
-@defform[(racketresultblock maybe-escape datum ...)]
-@defform[(racketresultblock0 maybe-escape datum ...)]
-@defform[(RACKETRESULTBLOCK maybe-escape datum ...)]
-@defform[(RACKETRESULTBLOCK0 maybe-escape datum ...)]
-)]{
-
-Like @racket[racketblock], etc., but colors the typeset text as a
-result  (i.e., a single color with no hyperlinks) instead of code.}
-
-@deftogether[(
-@defform[(racketinput maybe-escape datum ...)]
-@defform[(RACKETINPUT maybe-escape datum ...)]
-)]{Like @racket[racketblock] and @racket[RACKETBLOCK], but the
-@racket[datum]s are typeset after a prompt representing a REPL.}
-
-@deftogether[(
-@defform[(racketinput0 maybe-escape datum ...)]
-@defform[(RACKETINPUT0 maybe-escape datum ...)]
-)]{
-Like @racket[racketinput] and @racket[RACKETINPUT], but
-without insetting the code via @racket[nested].}
-
-@defform/subs[(racketmod maybe-file maybe-escape lang datum ...)
-              ([maybe-file code:blank
-                           (code:line #:file filename-expr)]
-               [maybe-escape code:blank
-                            (code:line #:escape escape-id)])]{
-
-Like @racket[racketblock], but the @racket[datum] are typeset inside a
-@racketmodfont{#lang}-form module whose language is @racket[lang].
-
-The source location of @racket[lang] (relative to the body
-@racket[datum]s) determines the relative positioning of the
-@racketmodfont{#lang} line in the typeset output. So, line up
-@racket[lang] with the left end of the content code.
-
-If @racket[#:file] is provided, then the code block is typeset using
-@racket[filebox] with @racket[filename-expr] as the filename
-argument.}
-
-@defform[(racketmod0 maybe-file maybe-escape lang datum ...)]{
-Like @racket[racketmod], but
-without insetting the code via @racket[nested].}
-
-@defform[(racket maybe-escape datum ...)]{Like @racket[racketblock], but typeset on
-a single line and wrapped with its enclosing paragraph, independent of
-the formatting of @racket[datum].}
-
-@defform[(RACKET maybe-escape datum ...)]{Like @racket[racket], but with the
-@racket[UNSYNTAX] escape like @racket[racketblock].}
-
-@defform[(racketresult maybe-escape datum ...)]{Like @racket[racket], but typeset
-as a result (i.e., a single color with no hyperlinks).}
-
-@defform[(racketid maybe-escape datum ...)]{Like @racket[racket], but typeset
-as an unbound identifier (i.e., no coloring or hyperlinks).}
-
-@deftogether[(
-@defform[(schemeblock maybe-escape datum ...)]
-@defform[(SCHEMEBLOCK maybe-escape datum ...)]
-@defform[(schemeblock0 maybe-escape datum ...)]
-@defform[(SCHEMEBLOCK0 maybe-escape datum ...)]
-@defform[(schemeinput maybe-escape datum ...)]
-@defform[(schememod lang maybe-escape datum ...)]
-@defform[(scheme maybe-escape datum ...)]
-@defform[(SCHEME maybe-escape datum ...)]
-@defform[(schemeresult maybe-escape datum ...)]
-@defform[(schemeid maybe-escape datum ...)]
-)]{
-
-Compatibility aliases. Each @racketidfont{scheme...} name is an alias for the
-corresponding @racketidfont{racket...} binding.}
-
-@; ------------------------------------------------------------------------
-
-@subsection{Preserving Comments}
-
-@defmodulereader[scribble/comment-reader]
-
-As a reader module, @racketmodname[scribble/comment-reader] reads a
-single S-expression that contains @litchar{;}-based comment lines, and
-it wraps the comments with @racket[code:comment] for use with forms
-like @racket[racketblock]. More precisely,
-@racketmodname[scribble/comment-reader] extends the current reader to
-adjust the parsing of @litchar{;}.
-
-For example, within a Scribble document that imports
-@racketmodname[scribble/manual],
-
-@verbatim[#:indent 2]|{
-  @#reader scribble/comment-reader
-   (racketblock
-    ;; This is not a pipe
-    (make-pipe)
-   )
-}|
-
-generates
-
-@#reader scribble/comment-reader
- (racketblock
-  ;; This is not a pipe
-  (make-pipe)
- )
-
-The initial @litchar["@"] is needed above to shift into S-expression
-mode, so that @racketmetafont{#reader} is recognized as a reader
-declaration instead of literal text. Also, the example uses
-@racket[(racketblock ....)]  instead of
-@racketmetafont["@"]@racket[racketblock]@racketmetafont["["]@racket[....]@racketmetafont["]"]
-because the @"@"-reader would drop comments within the
-@racket[racketblock] before giving
-@racketmodname[scribble/comment-reader] a chance to convert them.
-
-The implementation of @racketmodname[scribble/comment-reader] uses @racket[unsyntax] to
-typeset comments. When using @racketmodname[scribble/comment-reader]
-with, for instance, @racket[RACKETBLOCK], @racket[unsyntax] does not escape,
-since @racket[RACKETBLOCK] uses @racket[UNSYNTAX] as its escape form. You can
-declare an escape identifier for
-@racketmodname[scribble/comment-reader] with @racket[#:escape-id]. For example,
-
-@verbatim[#:indent 2]|{
-  @#reader scribble/comment-reader #:escape-id UNSYNTAX
-   (RACKETBLOCK
-     (define-syntax (m stx)
-       (syntax-case stx ()
-         [(_ x)
-          ;; Well this was silly
-          #`(#,x)]))
-   )
-}|
-
-generates
-
-  @#reader scribble/comment-reader #:escape-id UNSYNTAX
-   (RACKETBLOCK
-     (define-syntax (m stx)
-       (syntax-case stx ()
-         [(_ x)
-          ;; Well this was silly
-          #`(#,x)]))
-   )
-
-@; ------------------------------------------------------------------------
-@subsection{Code Fonts and Styles}
-
-@defform*[((racketmodname datum maybe-indirect)
-           (racketmodname ((unsyntax (racket unsyntax)) expr) maybe-indirect))
-          #:grammar ([maybe-indirect code:blank
-                                    #:indirect])]{
-
-Like @racket[racket], but typeset as a module path. If @racket[datum]
-is an identifier or @racket[expr] produces a symbol, then it is
-hyperlinked to the module path's definition as created by
-@racket[defmodule].
-
-If @racket[#:indirect] is specified, then the hyperlink is given the
-@racket['indirect-link] @tech{style property}, which makes the
-hyperlink's resolution in HTML potentially delayed; see
-@racket['indirect-link] for @racket[link-element].}
-
-@defform[(racketmodlink datum pre-content-expr ...)]{
-Like @racket[racketmod], but separating the module path to link
-from the content to be linked. The @racket[datum] module path is always
-linked, even if it is not an identifier.}
-
-@defproc[(litchar [str string?] ...) element?]{Typesets @racket[str]s as a
-representation of literal text. Use this when you have to talk about
-the individual characters in a stream of text, as when documenting
-a reader extension.}
-
-@defproc[(racketfont [pre-content pre-content?] ...) element?]{The
-same as @racket[(tt pre-content ...)], which applies the @racket['tt]
-style to immediate strings and symbols among the @racket[pre-content]
-arguments.  Beware that @racket[pre-content] is @racket[decode]d as
-usual, making @racket[racketfont] a poor choice for typesetting
-literal code.}
-
-@defproc[(racketplainfont [pre-content pre-content?] ...) element?]{Applies
-the @racket['tt] style to @racket[pre-content]. Beware
-that @racket[pre-content] is @racket[decode]d as usual, making
-@racket[racketplainfont] a poor choice for typesetting literal code
-directly but useful for implementing code-formatting functions.
-
-@history[#:added "1.6"]}
-
-@defproc[(racketvalfont [pre-content pre-content?] ...) element?]{Like
-@racket[racketplainfont], but colored as a value.}
-
-@defproc[(racketresultfont [#:decode? decode? boolean? #t] [pre-content pre-content?] ...) element?]{
-Like @racket[racketplainfont], but colored as a REPL result. When
-@racket[decode?] is @racket[#f], then unlike @racket[racketplainfont],
-@racket[racketresultfont] avoids @racket[decode]ing its argument.}
-
-@defproc[(racketidfont [pre-content pre-content?] ...) element?]{Like
-@racket[racketplainfont], but colored as an identifier.}
-
-@defproc[(racketvarfont [pre-content pre-content?] ...) element?]{Like
-@racket[racketplainfont], but colored as a variable (i.e., an argument or
-sub-form in a procedure being documented).}
-
-@defproc[(racketkeywordfont [pre-content pre-content?] ...) element?]{Like
-@racket[racketplainfont], but colored as a syntactic form name.}
-
-@defproc[(racketparenfont [pre-content pre-content?] ...) element?]{Like
-@racket[racketplainfont], but colored like parentheses.}
-
-@defproc[(racketmetafont [pre-content pre-content?] ...) element?]{Like
-@racket[racketplainfont], but colored as meta-syntax, such as backquote or
-unquote.}
-
-@defproc[(racketcommentfont [pre-content pre-content?] ...) element?]{Like
-@racket[racketplainfont], but colored as a comment.}
-
-@defproc[(racketerror [pre-content pre-content?] ...) element?]{Like
-@racket[racketplainfont], but colored as error-message text.}
-
-@defproc[(racketmodfont [pre-content pre-content?] ...) element?]{Like
-@racket[racketplainfont], but colored as module name.}
-
-@defproc[(racketoutput [pre-content pre-content?] ...) element?]{Like
-@racket[racketplainfont], but colored as output.}
-
-@defproc[(procedure [pre-content pre-content?] ...) element?]{Typesets
-@tech{decode}d @racket[pre-content] as a procedure name in a REPL
-result (e.g., in typewriter font with a @litchar{#<procedure:} prefix
-and @litchar{>} suffix.).}
-
-@defform[(var datum)]{Typesets @racket[datum] as an identifier that is
-an argument or sub-form in a procedure being documented. Normally, the
-@racket[defproc] and @racket[defform] arrange for @racket[racket] to
-format such identifiers automatically in the description of the
-procedure, but use @racket[var] if that cannot work for some reason.}
-
-@defform[(svar datum)]{Like @racket[var], but for subform non-terminals
-in a form definition.}
-
-@deftogether[(
-@defform*[((schememodname datum)
-           (schememodname ((unsyntax (racket unsyntax)) expr)))]
-@defform[(schememodlink datum pre-content-expr ...)]
-@defproc[(schemefont [pre-content pre-content?] ...) element?]
-@defproc[(schemevalfont [pre-content pre-content?] ...) element?]
-@defproc[(schemeresultfont [pre-content pre-content?] ...) element?]
-@defproc[(schemeidfont [pre-content pre-content?] ...) element?]
-@defproc[(schemevarfont [pre-content pre-content?] ...) element?]
-@defproc[(schemekeywordfont [pre-content pre-content?] ...) element?]
-@defproc[(schemeparenfont [pre-content pre-content?] ...) element?]
-@defproc[(schememetafont [pre-content pre-content?] ...) element?]
-@defproc[(schemeerror [pre-content pre-content?] ...) element?]
-@defproc[(schememodfont [pre-content pre-content?] ...) element?]
-@defproc[(schemeoutput [pre-content pre-content?] ...) element?]
-)]{
-
-Compatibility aliases. Each @racketidfont{scheme...} name is an alias for the
-corresponding @racketidfont{racket...} binding.}
-
-@; ------------------------------------------------------------------------
-@section[#:tag "doc-modules"]{Documenting Modules}
-
-@defform/subs[(defmodule maybe-req one-or-multi option ... pre-flow ...)
-              ([maybe-req code:blank
-                          (code:line #:require-form content-expr)]
-               [one-or-multi module-spec
-                             (code:line #:multi (module-spec ...+))]
-               [module-spec module-path
-                            content-expr]
-               [option (code:line #:module-paths (module-path ...))
-                       #:no-declare
-                       (code:line #:use-sources (src-module-path ...))
-                       (code:line #:link-target? link-target?-expr)
-                       #:indirect
-                       #:lang
-                       #:reader
-                       (code:line #:packages (pkg-expr ...))])]{
-
-Produces a sequence of flow elements (in a @racket[splice])
-to start the documentation for a module---or for multiple modules, if
-the @racket[#:multi] form is used.
-
-Each documented module specified as either a @racket[module-path] (in
-the sense of @racket[require]), in which case the module path is
-typeset using @racket[racketmodname], or by a
-@racket[content-expr]. The latter case is triggered by the presence of
-a @racket[#:module-paths] clause, which provides a plain
-@racket[module-path] for each @racket[module-spec], and the plain
-@racket[module-path] is used for cross-referencing.
-
-If a @racket[#:require-form] clause is provided and if @racket[#:lang]
-and @racket[#:reader] are not provided, the given expression produces
-content to use instead of @racket[require] for the declaration of the
-module. The @racket[#:require-form] clause is useful to suggest a
-different way of accessing the module instead of through
-@racket[require].
-
-Besides generating text, unless @racket[#:no-declare] appears as an
-option, this form expands to a use of @racket[declare-exporting] with
-@racket[module-path]s; the @racket[#:use-sources] clause, if provided,
-is propagated to @racket[declare-exporting]. Consequently,
-@racket[defmodule] should be used at most once in a section without
-@racket[#:no-declare], though it can be shadowed with
-@racket[defmodule]s in sub-sections.  Use @racket[#:no-declare] form
-when you want to provide a more specific list of modules (e.g., to
-name both a specific module and one that combines several modules) via
-your own @racket[declare-exporting] declaration
-
-When @racket[#:link-target?] is omitted or specified with an expression that
-produces a true value, then the @racket[module-path]s are also
-declared as link targets though a @racket[part-tag-decl] (which means
-that the @racket[defmodule] form must appear before any
-sub-parts). These link targets are referenced via
-@racket[racketmodname], which thus points to the enclosing section,
-rather than the individual @racket[module-path]s.
-
-Specifying @racket[#:indirect] normally makes sense only when
-@racket[#:link-target?] is specified with a @racket[#f] value. Specifying
-@racket[#:indirect] makes the module path that is displayed (and that
-normally refers to some other declaration of the module) use
-@racket[racketmodname] with @racket[#:indirect].
-
-If @racket[#:lang] is provided as an option, then the module name is
-shown after @hash-lang[] (instead of in a @racket[require] form) to
-indicate that the @racket[module-path]s are suitable for use by either
-@racket[require] or @hash-lang[].  If the module path for
-@racket[require] is syntactically different from the @hash-lang[]
-form, use @racket[#:module-paths] to provide the @racket[require]
-variant (and make each @racket[module-spec] a @racket[content-expr]).
-
-If @racket[#:reader] is provided, then the module name is shown after
-@racketmetafont{#reader} to indicate that the module path is intended
-for use as a reader module.
-
-By default, the package (if any) that supplies the documented module
-is determined automatically, but a set of providing packages can be
-specified explicitly with @racket[#:packages]. Each @racket[pkg-expr]
-result is passed on to a function like @racket[tt] for
-typesetting. Provide an empty sequence after @racket[#:packages] to
-suppress any package name in the output. Each @racket[pkg-expr]
-expression is are duplicated for a  @racket[declare-exporting] form,
-unless @racket[#:no-declare] is specified.
-
-Each @racket[option] form can appear at most once, and @racket[#:lang]
-and @racket[#:reader] are mutually exclusive.
-
-The @tech{decode}d @racket[pre-flow]s introduce the module, but need
-not include all of the module content.}
-
-
-@defform/subs[(declare-exporting module-path ... maybe-pkgs maybe-sources)
-              ([maybe-pkgs code:blank
-                           (code:line #:packages (pkg-expr ...))]
-               [maybe-sources code:blank
-                              (code:line #:use-sources (module-path ...))])]{
-
-Associates the @racket[module-path]s to all bindings defined within the
-enclosing section, except as overridden by other
-@racket[declare-exporting] declarations in nested sub-sections.  The
-list of @racket[module-path]s before @racket[#:use-sources] is shown, for
-example, when the user hovers the mouse over one of the bindings
-defined within the section.
-
-More significantly, the first @racket[module-path] before
-@racket[#:use-sources] plus the @racket[module-path]s after
-@racket[#:use-sources] determine the binding that is documented by
-each @racket[defform], @racket[defproc], or similar form within the
-section that contains the @racket[declare-exporting] declaration:
-
-@itemize[
-
- @item{If no @racket[#:use-sources] clause is supplied, then the
-       documentation applies to the given name as exported by the first
-       @racket[module-path].}
-
- @item{If @racket[#:use-sources] @racket[module-path]s are supplied, then
-       they are tried in order before the first @racket[module-path]. The
-       @racket[module-path] that provides an export with the same
-       symbolic name and @racket[free-label-identifier=?] to the given
-       name is used as the documented binding. This binding is assumed
-       to be the same as the identifier as exported by the first
-       @racket[module-path] in the @racket[declare-exporting]
-       declaration.}
-
-]
-
-Use @racket[#:use-sources] sparingly, but it is needed when
-
-@itemlist[
-
- @item{bindings are documented as originating from a module
-       @racket[_M], but the bindings are actually re-exported from
-       some module @racket[_P]; and}
-
- @item{other documented modules also re-export the bindings from
-       @racket[_P], but they are documented as re-exporting from
-       @racket[_M].}
-
-]
-
-For example, the @racket[parameterize] binding of
-@racketmodname[mzscheme] is documented as re-exported from
-@racketmodname[racket/base], but @racket[parameterize] happens to be
-implemented in a private module and re-exported by both
-@racketmodname[racket/base] and @racketmodname[mzscheme].  Importing
-@racket[parameterize] from @racketmodname[mzscheme] does not go
-through @racketmodname[racket/base], so a search for documentation on
-@racket[parameterize] in @racketmodname[mzscheme] would not
-automatically connect to the documentation of
-@racketmodname[racket/base]. To make the connection, the documentation
-of @racketmodname[racket/base] declares the private module to be a
-source through @racket[#:use-sources], so that any re-export of
-@racket[parameterize] from the private module connects to the
-documentation for @racketmodname[racket/base] (unless a re-export has
-its own documentation, which would override the automatic connection
-when searching for documentation).
-
-The initial @racket[module-path]s sequence can be empty if
-@racket[module-path]s are given with @racket[#:use-sources]. In that
-case, the rendered documentation never reports an exporting module for
-identifiers that are documented within the section, but the
-@racket[module-path]s in @racket[#:use-sources] provide a binding context
-for connecting (via hyperlinks) definitions and uses of identifiers.
-
-Supply @racket[#:packages] to specify the package that provides the
-declared modules, which is otherwise inferred automatically from the
-first @racket[module-path]. The package names are used, for example,
-by @racket[history].
-
-The @racket[declare-exporting] form should be used no more than once
-per section, since the declaration applies to the entire section,
-although overriding @racket[declare-exporting] forms can appear in
-sub-sections.
-
-@history[#:changed "1.1" @elem{Added @racket[#:packages] clause.}]}
-
-@defform*[[(defmodulelang one-or-multi maybe-sources option ... pre-flow ...)
-           (defmodulelang one-or-multi #:module-path module-path
-                          option ... pre-flow ...)]]{
-Equivalent to @racket[defmodule] with @racket[#:lang]. The
-@racket[#:module-path module-path] is provided, it is converted to
-@racket[#:module-paths (module-path)].}
-
-@defform[(defmodulereader one-or-multi option ... pre-flow ...)]{
-Equivalent to @racket[defmodule] with @racket[#:reader].}
-
-
-@deftogether[(
-@defform[(defmodule* maybe-req (module-spec ...+) option ... pre-flow ...)]
-@defform[(defmodulelang* (module-spec ...+) option ... pre-flow ...)]
-@defform[(defmodulereader* (module-spec ...+) option ... pre-flow ...)]
-)]{
-Equivalent to @racket[defmodule] variants with @racket[#:multi].}
-
-@deftogether[(
-@defform[(defmodule*/no-declare maybe-req (module-spec ...) option ... pre-flow ...)]
-@defform[(defmodulelang*/no-declare (module-spec ...) option ... pre-flow ...)]
-@defform[(defmodulereader*/no-declare (module-spec ...) option ... pre-flow ...)]
-)]{
-Equivalent to @racket[defmodule] variants @racket[#:no-declare].}
-
-@; ------------------------------------------------------------------------
-@section[#:tag "doc-forms"]{Documenting Forms, Functions, Structure Types, and Values}
-
-@defform/subs[(defproc options prototype
-                       result-contract-expr-datum
-                       maybe-value
-                       pre-flow ...)
-              ([prototype (id arg-spec ...)
-                          (prototype arg-spec ...)]
-               [arg-spec (arg-id contract-expr-datum)
-                         (arg-id contract-expr-datum default-expr)
-                         (keyword arg-id contract-expr-datum)
-                         (keyword arg-id contract-expr-datum default-expr)
-                         ellipses
-                         ellipses+]
-               [options (code:line maybe-kind maybe-link maybe-id)]
-               [maybe-kind code:blank
-                           (code:line #:kind kind-string-expr)]
-               [maybe-link code:blank
-                           (code:line #:link-target? link-target?-expr)]
-               [maybe-id code:blank
-                         (code:line #:id [src-id dest-id-expr])]
-               [maybe-value code:blank
-                            (code:line #:value value-expr-datum)]
-               [ellipses @#,lit-ellipses]
-               [ellipses+ @#,lit-ellipses+])]{
-
-Produces a sequence of flow elements (encapsulated in a
-@racket[splice]) to document a procedure named @racket[id]. Nesting
-@racket[prototype]s corresponds to a curried function, as in
-@racket[define]. Unless @racket[link-target?-expr] is specified
-and produces @racket[#f], the @racket[id] is indexed, and it also registered so
-that @racket[racket]-typeset uses of the identifier (with the same
-for-label binding) are hyperlinked to this documentation.
-
-Examples:
-@codeblock[#:keep-lang-line? #f]|{
-#lang scribble/manual
-@defproc[(make-sandwich [ingredients (listof ingredient?)])
-         sandwich?]{
-  Returns a sandwich given the right ingredients.
-}
-
-@defproc[#:kind "sandwich-maker"
-         (make-reuben [ingredient sauerkraut?] ...
-                      [#:veggie? veggie? any/c #f])
-         sandwich?]{
-  Produces a reuben given some number of @racket[ingredient]s.
-
-  If @racket[veggie?] is @racket[#f], produces a standard
-  reuben with corned beef. Otherwise, produces a vegetable
-  reuben.
-}
-}|
-
-@doc-render-examples[
- @defproc[#:link-target? #f
-          (make-sandwich [ingredients (listof ingredient?)])
-          sandwich?]{
-   Returns a sandwich given the right ingredients.
- }
-
- @defproc[#:kind "sandwich-maker"
-          #:link-target? #f
-          (make-reuben [ingredient sauerkraut?] ...
-                       [#:veggie? veggie? any/c #f])
-          sandwich?]{
-   Produces a reuben given some number of @racket[ingredient]s.
-
-   If @racket[veggie?] is @racket[#f], produces a standard
-   reuben with corned beef. Otherwise, produces a vegetable
-   reuben.
- }]
-
-When @racket[id] is indexed and registered, 
-a @racket[defmodule] or @racket[declare-exporting] form (or one of the
-variants) in an enclosing section determines the @racket[id] binding
-that is being defined. The @racket[id] should also have a for-label
-binding (as introduced by @racket[(require (for-label ....))]) that
-matches the definition binding; otherwise, the defined @racket[id]
-will not typeset correctly within the definition.
-
-Each @racket[arg-spec] must have one of the following forms:
-
-@specsubform[(arg-id contract-expr-datum)]{
-       An argument whose contract is specified by
-       @racket[contract-expr-datum] which is typeset via
-       @racket[racketblock0].}
-
-@specsubform[(arg-id contract-expr-datum default-expr)]{
-       Like the previous case, but with a default value. All arguments
-       with a default value must be grouped together, but they can be
-       in the middle of required arguments.}
-
-@specsubform[(keyword arg-id contract-expr-datum)]{
-       Like the first case, but for a keyword-based argument.}
-
-@specsubform[(keyword arg-id contract-expr-datum default-expr)]{
-       Like the previous case, but with a default
-       value.}
-
-@specsubform[@#,lit-ellipses]{Any number of the preceding argument.  This
-       form is normally used at the end, but keyword-based arguments
-       can sensibly appear afterward. See also the documentation for
-       @racket[append] for a use of @lit-ellipses before the last
-       argument.}
-
-@specsubform[@#,lit-ellipses+]{One or more of the preceding argument
-       (normally at the end, like @lit-ellipses).}
-
-The @racket[result-contract-expr-datum] is typeset via
-@racket[racketblock0], and it represents a contract on the procedure's
-result.
-
-The @tech{decode}d @racket[pre-flow] documents the procedure. In this
-description, references to @svar[arg-id]s using @racket[racket],
-@racket[racketblock], @|etc| are typeset as procedure arguments.
-
-The typesetting of all information before the @racket[pre-flow]s
-ignores the source layout, except that the local formatting is
-preserved for contracts and default-values expressions. The information
-is formatted to fit (if possible) in the number of characters specified
-by the @racket[current-display-width] parameter.
-
-An optional @racket[#:kind] specification chooses the decorative
-label, which defaults to @racket["procedure"]. A @racket[#f]
-result for @racket[kind-string-expr] uses the default, otherwise
-@racket[kind-string-expr] should produce a string. An alternate
-label should be all lowercase.
-
-If @racket[#:id [src-id dest-id-expr]] is supplied, then
-@racket[src-id] is the identifier as it appears in the
-@racket[prototype] (to be replaced by a defining instance), and
-@racket[dest-id-expr] produces the identifier to be documented in
-place of @racket[src-id]. This split between @racket[src-id] and
-@racket[dest-id-expr] roles is useful for functional abstraction of
-@racket[defproc].
-
-If @racket[#:value value-expr-datum] is given, @racket[value-expr-datum]
-is typeset using @racket[racketblock0] and included in the documentation.
-As a service to readers, please use @racket[#:value] to document only
-simple, short functions.
-}
-
-@defform[(defproc* options
-                   ([prototype
-                     result-contract-expr-datum
-                     maybe-value] ...)
-                   pre-flow ...)]{
-
-Like @racket[defproc], but for multiple cases with the same
-@racket[id]. Multiple distinct @racket[id]s can also be defined by a
-single @racket[defproc*], for the case that it's best to document a
-related group of procedures at once (but multiple @racket[defproc]s
-grouped by @racket[deftogether] also works for that case).
-
-When an @racket[id] has multiple calling cases, either they must be
-defined with a single @racket[defproc*], so that a single definition
-point exists for the @racket[id], or else all but one definition
-should use @racket[#:link-target? #f].
-
-Examples:
-@codeblock[#:keep-lang-line? #f]|{
-#lang scribble/manual
-@defproc*[([(make-pb&j) sandwich?]
-           [(make-pb&j [jelly jelly?]) sandwich?])]{
-  Returns a peanut butter and jelly sandwich. If @racket[jelly]
-  is provided, then it is used instead of the standard (grape)
-  jelly.
-}
-}|
-
-@doc-render-examples[
-  @defproc*[#:link-target? #f
-            ([(make-pb&j) sandwich?]
-             [(make-pb&j [jelly jelly?]) sandwich?])]{
-    Returns a peanut butter and jelly sandwich. If @racket[jelly]
-    is provided, then it is used instead of the standard (grape)
-    jelly.
-  }]
-}
-
-
-@defform/subs[(defform options form-datum
-                maybe-grammar maybe-contracts
-                pre-flow ...)
-              ([options (code:line maybe-kind maybe-link maybe-id maybe-literals)]
-               [maybe-kind code:blank
-                           (code:line #:kind kind-string-expr)]
-               [maybe-link code:blank
-                           (code:line #:link-target? link-target?-expr)]
-               [maybe-id code:blank
-                         (code:line #:id id)
-                         (code:line #:id [id id-expr])]
-               [maybe-literals code:blank
-                               (code:line #:literals (literal-id ...))]
-               [maybe-grammar code:blank
-                              (code:line #:grammar ([nonterm-id clause-datum ...+] ...))]
-               [maybe-contracts code:blank
-                                (code:line #:contracts ([subform-datum contract-expr-datum]
-                                                        ...))])]{
-
-Produces a sequence of flow elements (encapsulated in a
-@racket[splice]) to document a syntatic form named by @racket[id] (or the
-result of @racket[id-expr]) whose syntax is described by
-@racket[form-datum]. If no @racket[#:id] is used to specify
-@racket[id], then @racket[form-datum] must have the form @racket[(id
-. _datum)].
-
-If @racket[#:kind kind-string-expr] is supplied, it is used in the
-same way as for @racket[defproc], but the default kind is
-@racket["syntax"].
-
-If @racket[#:id [id id-expr]] is supplied, then @racket[id] is the
-identifier as it appears in the @racket[form-datum] (to be replaced by
-a defining instance), and @racket[id-expr] produces the identifier to
-be documented. This split between @racket[id] and @racket[id-expr]
-roles is useful for functional abstraction of @racket[defform].
-
-Unless @racket[link-target?-expr] is specified
-and produces @racket[#f], 
-the @racket[id] (or result of @racket[id-expr]) is indexed, and it is
-also registered so that @racket[racket]-typeset uses of the identifier
-(with the same for-label binding) are hyperlinked to this
-documentation. The @racket[defmodule] or @racket[declare-exporting]
-requirements, as well as the binding requirements for @racket[id] (or
-result of @racket[id-expr]), are the same as for @racket[defproc].
-
-The @tech{decode}d @racket[pre-flow] documents the form. In this
-description, a reference to any identifier in @racket[form-datum] via
-@racket[racket], @racket[racketblock], @|etc| is typeset as a sub-form
-non-terminal. If @racket[#:literals] clause is provided, however,
-instances of the @racket[literal-id]s are typeset normally (i.e., as
-determined by the enclosing context).
-
-If a @racket[#:grammar] clause is provided, it includes an auxiliary
-grammar of non-terminals shown with the @racket[id] form. Each
-@racket[nonterm-id] is specified as being any of the corresponding
-@racket[clause-datum]s.
-
-If a @racket[#:contracts] clause is provided, each
-@racket[subform-datum] (typically an identifier that serves as a
-meta-variable in @racket[form-datum] or @racket[clause-datum]) is
-shown as producing a value that must satisfy the contract described by
-@racket[contract-expr-datum].  Use @racket[#:contracts] only to
-specify constraints on a @emph{value} produced by an expression; for
-constraints on the @emph{syntax} of a @racket[subform-datum], use
-grammar notation instead, possibly through an auxiliary grammar
-specified with @racket[#:grammar].
-
-The typesetting of @racket[form-datum], @racket[clause-datum],
-@racket[subform-datum], and @racket[contract-expr-datum] preserves the
-source layout, like @racket[racketblock].
-
-Examples:
-@codeblock[#:keep-lang-line? #f]|{
-#lang scribble/manual
-@defform[(sandwich-promise sandwich-expr)
-         #:contracts ([sandwich-expr sandwich?])]{
-  Returns a promise to construct a sandwich. When forced, the promise
-  will produce the result of @racket[sandwich-expr].
-}
-
-@defform[#:literals (sandwich mixins)
-         (sandwich-promise* [sandwich sandwich-expr]
-                            [mixins ingredient-expr ...])
-         #:contracts ([sandwich-expr sandwich?]
-                      [ingredient-expr ingredient?])]{
-  Returns a promise to construct a sandwich. When forced, the promise
-  will produce the result of @racket[sandwich-expr]. Each result of
-  the @racket[ingredient-expr]s will be mixed into the resulting
-  sandwich.
-}
-
-@defform[(sandwich-factory maybe-name factory-component ...)
-         #:grammar
-         [(maybe-name (code:line)
-                      name)
-          (factory-component (code:line #:protein protein-expr)
-                             [vegetable vegetable-expr])]]{
-  Constructs a sandwich factory. If @racket[maybe-name] is provided,
-  the factory will be named. Each of the @racket[factory-component]
-  clauses adds an additional ingredient to the sandwich pipeline.
-}
-}|
-@doc-render-examples[
-  @defform[#:link-target? #f
-           (sandwich-promise sandwich-expr)
-           #:contracts ([sandwich-expr sandwich?])]{
-    Returns a promise to construct a sandwich. When forced, the promise
-    will produce the result of @racket[sandwich-expr].
-  }
-
-  @defform[#:link-target? #f
-           #:literals (sandwich mixins)
-           (sandwich-promise* [sandwich sandwich-expr]
-                              [mixins ingredient-expr ...])
-           #:contracts ([sandwich-expr sandwich?]
-                        [ingredient-expr ingredient?])]{
-    Returns a promise to construct a sandwich. When forced, the promise
-    will produce the result of @racket[sandwich-expr]. Each result of
-    the @racket[ingredient-expr]s will be mixed into the resulting
-    sandwich.
-  }
-
-  @defform[#:link-target? #f
-           (sandwich-factory maybe-name factory-component ...)
-           #:grammar
-           [(maybe-name (code:line)
-                        name)
-            (factory-component (code:line #:protein protein-expr)
-                               [vegetable vegetable-expr])]]{
-    Constructs a sandwich factory. If @racket[maybe-name] is provided,
-    the factory will be named. Each of the @racket[factory-component]
-    clauses adds an additional ingredient to the sandwich pipeline.
-  }]
-}
-
-@defform[(defform* options [form-datum ...+]
-           maybe-grammar maybe-contracts
-           pre-flow ...)]{
-
-Like @racket[defform], but for multiple forms using the same
-@racket[_id].
-
-Examples:
-@codeblock[#:keep-lang-line? #f]|{
-#lang scribble/manual
-@defform*[((call-with-current-sandwich expr)
-           (call-with-current-sandwich expr sandwich-handler-expr))]{
-  Runs @racket[expr] and passes it the value of the current
-  sandwich. If @racket[sandwich-handler-expr] is provided, its result
-  is invoked when the current sandwich is eaten.
-}
-}|
-@doc-render-examples[
-@defform*[#:link-target? #f
-          ((call-with-current-sandwich expr)
-           (call-with-current-sandwich expr sandwich-handler-expr))]{
-  Runs @racket[expr] and passes it the value of the current
-  sandwich. If @racket[sandwich-handler-expr] is provided, its result
-  is invoked when the current sandwich is eaten.
-}]
-}
-
-
-@defform[(defform/none maybe-kind maybe-literal form-datum 
-           maybe-grammar maybe-contracts
-           pre-flow ...)]{
-
-Like @racket[defform] with @racket[#:link-target? #f].}
-
-
-@defform[(defidform maybe-kind maybe-link id pre-flow ...)]{
-
-Like @racket[defform], but with a plain @racket[id] as the form.}
-
-
-@defform*[[(defidform/inline id)
-           (defidform/inline (@#,racket[unsyntax] id-expr))]]{
-
-Like @racket[defidform], but @racket[id] (or the result of
-@racket[id-expr], analogous to @racket[defform]) is typeset as an
-inline element. Use this form sparingly, because the typeset form does
-not stand out to the reader as a specification of @racket[id].}
-
-@deftogether[(
-@defform[(defsubform options form-datum
-            maybe-grammar maybe-contracts
-            pre-flow ...)]
-@defform[(defsubform* options [form-datum ...+]
-           maybe-grammar maybe-contracts
-           pre-flow ...)]
-)]{
-
-Like @racket[defform] and @racket[defform*], but with
-indenting on the left for both the specification and the
-@racket[pre-flow]s.}
-
-
-@defform[(specform maybe-literals datum maybe-grammar maybe-contracts
-           pre-flow ...)]{
-
-Like @racket[defform] with @racket[#:link-target? #f], but with
-indenting on the left for both the specification and the
-@racket[pre-flow]s.}
-
-
-@defform[(specsubform maybe-literals datum maybe-grammar maybe-contracts
-           pre-flow ...)]{
-
-Similar to @racket[defform] with @racket[#:link-target? #f],
-but without the initial identifier as an implicit literal,
-and the table and flow are typeset indented. This form is
-intended for use when refining the syntax of a non-terminal used in a
-@racket[defform] or other @racket[specsubform]. For example, it is
-used in the documentation for @racket[defproc] in the itemization of
-possible shapes for @svar[arg-spec].
-
-The @racket[pre-flow]s list is parsed as a flow that documents the
-procedure. In this description, a reference to any identifier in
-@racket[datum] is typeset as a sub-form non-terminal.}
-
-
-@defform[(specspecsubform maybe-literals datum maybe-grammar maybe-contracts
-           pre-flow ...)]{
-
-Like @racket[specsubform], but indented an extra level. Since using
-@racket[specsubform] within the body of @racket[specsubform] already
-nests indentation, @racket[specspecsubform] is for extra indentation
-without nesting a description.}
-
-
-@deftogether[[
-@defform[(defform/subs options form-datum
-           ([nonterm-id clause-datum ...+] ...)
-           maybe-contracts
-           pre-flow ...)]
-@defform[(defform*/subs options [form-datum ...+]
-           ([nonterm-id clause-datum ...+] ...)
-           maybe-contracts
-           pre-flow ...)]
-@defform[(specform/subs maybe-literals datum
-           ([nonterm-id clause-datum ...+] ...)
-           maybe-contracts
-           pre-flow ...)]
-@defform[(specsubform/subs maybe-literals datum
-           ([nonterm-id clause-datum ...+] ...)
-           maybe-contracts
-           pre-flow ...)]
-@defform[(specspecsubform/subs maybe-literals datum
-          ([nonterm-id clause-datum ...+] ...)
-          maybe-contracts
-          pre-flow ...)]]]{
-
-Like @racket[defform], @racket[defform*], @racket[specform],
-@racket[specsubform], and @racket[specspecsubform], respectively, but
-the auxiliary grammar is mandatory and the @racket[#:grammar] keyword
-is omitted.
-
-Examples:
-@codeblock[#:keep-lang-line? #f]|{
-#lang scribble/manual
-@defform/subs[(sandwich-factory maybe-name factory-component ...)
-              [(maybe-name (code:line)
-                           name)
-               (factory-component (code:line #:protein protein-expr)
-                                  [vegetable vegetable-expr])]]{
-  Constructs a sandwich factory. If @racket[maybe-name] is provided,
-  the factory will be named. Each of the @racket[factory-component]
-  clauses adds an additional ingredient to the sandwich pipeline.
-}
-}|
-@doc-render-examples[
-  @defform/subs[#:link-target? #f
-                (sandwich-factory maybe-name factory-component ...)
-                [(maybe-name (code:line)
-                             name)
-                 (factory-component (code:line #:protein protein-expr)
-                                    [vegetable vegetable-expr])]]{
-    Constructs a sandwich factory. If @racket[maybe-name] is provided,
-    the factory will be named. Each of the @racket[factory-component]
-    clauses adds an additional ingredient to the sandwich pipeline.
-  }]
-}
-
-
-@defform[(defparam maybe-link id arg-id
-           contract-expr-datum
-           maybe-value
-           pre-flow ...)]{
-
-Like @racket[defproc], but for a parameter. The
-@racket[contract-expr-datum] serves as both the result contract on the
-parameter and the contract on values supplied for the parameter. The
-@racket[arg-id] refers to the parameter argument in the latter case.
-
-Examples:
-@codeblock[#:keep-lang-line? #f]|{
-#lang scribble/manual
-@defparam[current-sandwich sandwich sandwich?
-          #:value empty-sandwich]{
-  A parameter that defines the current sandwich for operations that
-  involve eating a sandwich. Default value is the empty sandwich.
-}
-}|
-@doc-render-examples[
-  @defparam[#:link-target? #f
-            current-sandwich sandwich sandwich? #:value empty-sandwich]{
-    A parameter that defines the current sandwich for operations that
-    involve eating a sandwich. Default value is the empty sandwich.
-  }]
-}
-
-
-@defform[(defparam* maybe-link id arg-id 
-           in-contract-expr-datum out-contract-expr-datum
-           maybe-value
-           pre-flow ...)]{
-
-Like @racket[defparam], but with separate contracts for when the parameter is being
-set versus when it is being retrieved (for the case that a parameter guard
-coerces values matching a more flexible contract to a more restrictive one;
-@racket[current-directory] is an example).}
-
-
-@defform[(defboolparam maybe-link id arg-id
-           maybe-value
-           pre-flow ...)]{
-
-Like @racket[defparam], but the contract on a parameter argument is
-@racket[any/c], and the contract on the parameter result is
-@racket[boolean?].}
-
-
-@defform/subs[(defthing options id contract-expr-datum maybe-value
-                pre-flow ...)
-              ([options (code:line maybe-kind maybe-link maybe-id)]
-               [maybe-kind code:blank
-                           (code:line #:kind kind-string-expr)]
-               [maybe-link code:blank
-                           (code:line #:link-target? link-target?-expr)]
-               [maybe-id code:blank
-                         (code:line #:id id-expr)]
-               [maybe-value code:blank
-                            (code:line #:value value-expr-datum)])]{
-
-Like @racket[defproc], but for a non-procedure binding.
-
-If @racket[#:kind kind-string-expr] is supplied,
-it is used in the same way as for
-@racket[defproc], but the default kind is @racket["value"].
-
-If @racket[#:id id-expr] is supplied, then the result of
-@racket[id-expr] is used in place of @racket[id].
-
-If @racket[#:value value-expr-datum] is given, @racket[value-expr-datum]
-is typeset using @racket[racketblock0] and included in the documentation.
-Wide values are put on a separate line.
-
-Examples:
-@codeblock[#:keep-lang-line? #f]|{
-#lang scribble/manual
-@defthing[moldy-sandwich sandwich?]{
-  Don't eat this. Provided for backwards compatibility.
-}
-
-@defthing[empty-sandwich sandwich? #:value (make-sandwich empty)]{
-  The empty sandwich.
-}
-}|
-@doc-render-examples[
-  @defthing[#:link-target? #f
-            moldy-sandwich sandwich?]{
-    Don't eat this. Provided for backwards compatibility.
-  }
-  @defthing[#:link-target? #f
-            empty-sandwich sandwich? #:value (make-sandwich empty)]{
-    The empty sandwich.
-  }]
-}
-
-
-@deftogether[(
-@defform[       (defstruct* maybe-link struct-name ([field-name contract-expr-datum] ...)
-                  maybe-mutable maybe-non-opaque maybe-constructor
-                  pre-flow ...)]
-@defform/subs[  (defstruct maybe-link struct-name ([field-name contract-expr-datum] ...)
-                  maybe-mutable maybe-non-opaque maybe-constructor
-                  pre-flow ...)
-               ([maybe-link code:blank
-                            (code:line #:link-target? link-target?-expr)]
-                [struct-name id
-                             (id super-id)]
-                [maybe-mutable code:blank
-                               #:mutable]
-                [maybe-non-opaque code:blank
-                                  #:prefab
-                                  #:transparent
-                                  (code:line #:inspector #f)]
-                [maybe-constructor code:blank
-                                   (code:line #:constructor-name constructor-id)
-                                   (code:line #:extra-constructor-name constructor-id)
-                                   (code:line #:omit-constructor)])]
-)]{
-
-Similar to @racket[defform] or @racket[defproc], but for a structure
-definition. The @racket[defstruct*] form corresponds to @racket[struct],
-while @racket[defstruct] corresponds to @racket[define-struct].
-
-Examples:
-@codeblock[#:keep-lang-line? #f]|{
-#lang scribble/manual
-@defstruct[sandwich ([protein ingredient?] [sauce ingredient?])]{
-  A strucure type for sandwiches. Sandwiches are a pan-human foodstuff
-  composed of a partially-enclosing bread material and various
-  ingredients.
-}
-}|
-@doc-render-examples[
-  @defstruct[#:link-target? #f
-             sandwich ([protein ingredient?] [sauce ingredient?])]{
-    A strucure type for sandwiches. Sandwiches are a pan-human foodstuff
-    composed of a partially-enclosing bread material and various
-    ingredients.
-  }]
-}
-
-
-@defform[(deftogether [def-expr ...] pre-flow ...)]{
-
-Combines the definitions created by the @racket[def-expr]s into a
-single definition box. Each @racket[def-expr] should produce a
-definition point via @racket[defproc], @racket[defform], etc. Each
-@racket[def-expr] should have an empty @racket[pre-flow]; the
-@tech{decode}d @racket[pre-flow] sequence for the @racket[deftogether]
-form documents the collected bindings.
-
-Examples:
-@codeblock[#:keep-lang-line? #f]|{
-#lang scribble/manual
-@deftogether[(@defthing[test-sandwich-1 sandwich?]
-              @defthing[test-sandwich-2 sandwich?])]{
-  Two high-quality sandwiches. These are provided for convenience
-  in writing test cases
-}
-}|
-@doc-render-examples[
-  @deftogether[(@defthing[#:link-target? #f test-sandwich-1 sandwich?]
-                @defthing[#:link-target? #f test-sandwich-2 sandwich?])]{
-    Two high-quality sandwiches. These are provided for convenience
-    in writing test cases
-  }
-]
-}
-
-
-@defform/subs[(racketgrammar maybe-literals id clause-datum ...+)
-              ([maybe-literals code:blank
-                               (code:line #:literals (literal-id ...))])]{
- 
-Creates a table to define the grammar of @racket[id]. Each identifier
-mentioned in a @racket[clause-datum] is typeset as a non-terminal,
-except for the identifiers listed as @racket[literal-id]s, which are
-typeset as with @racket[racket].}
-
-
-@defform[(racketgrammar* maybe-literals [id clause-datum ...+] ...)]{
-
-Like @racket[racketgrammar], but for typesetting multiple productions
-at once, aligned around the @litchar{=} and @litchar{|}.}
-
-@defproc[(defidentifier [id identifier?]
-                        [#:form? form? boolean? #f]
-                        [#:index? index? boolean? #t]
-                        [#:show-libs? show-libs? boolean? #t])
-         element?]{
-
-Typesets @racket[id] as a Racket identifier, and also establishes the
-identifier as the definition of a binding in the same way as
-@racket[defproc], @racket[defform], etc. As always, the library that
-provides the identifier must be declared via @racket[defmodule] or
-@racket[declare-exporting] for an enclosing section.
-
-If @racket[form?] is a true value, then the identifier is documented
-as a syntactic form, so that uses of the identifier (normally
-including @racket[id] itself) are typeset as a syntactic form.
-
-If @racket[index?] is a true value, then the identifier is registered
-in the index.
-
-If @racket[show-libs?] is a true value, then the identifier's defining
-module may be exposed in the typeset form (e.g., when viewing HTML and
-the mouse hovers over the identifier).}
-
-@deftogether[(
-@defform[(schemegrammar maybe-literals id clause-datum ...+)]
-@defform[(schemegrammar* maybe-literals [id clause-datum ...+] ...)]
-)]{
-
-Compatibility aliases for @racket[racketgrammar] and @racket[racketgrammar*].}
-
-@defparam[current-display-width w exact-nonnegative-integer?]{
-
-Specifies the target maximum width in characters for the output of
-@racket[defproc] and @racket[defstruct].}
-
-
-@; ------------------------------------------------------------------------
-@section[#:tag "doc-classes"]{Documenting Classes and Interfaces}
-
-@defform/subs[(defclass maybe-link id super (intf-id ...) pre-flow ...)
-              ([maybe-link code:blank
-                           (code:line #:link-target? link-target?-expr)]
-               [super super-id
-                      (mixin-id super)])]{
-
-Creates documentation for a class @racket[id] that is a subclass of
-@racket[super] and implements each interface @racket[intf-id]. Each
-identifier in @racket[super] (except @racket[object%]) and
-@racket[intf-id] must be documented somewhere via @racket[defclass] or
-@racket[definterface].
-
-The decoding of the @racket[pre-flow] sequence should start with
-general documentation about the class, followed by constructor
-definition (see @racket[defconstructor]), and then field and method
-definitions (see @racket[defmethod]). In rendered form, the
-constructor and method specification are indented to visually group
-them under the class definition.}
-
-@defform[(defclass/title maybe-link id super (intf-id ...) pre-flow ...)]{
-
-Like @racket[defclass], also includes a @racket[title] declaration
-with the style @racket['hidden]. In addition, the constructor and
-methods are not left-indented.
-
-This form is normally used to create a section to be rendered on its
-own HTML. The @racket['hidden] style is used because the definition
-box serves as a title.}
-
-@defform[(definterface id (intf-id ...) pre-flow ...)]{
-
-Like @racket[defclass], but for an interfaces. Naturally,
-@racket[pre-flow] should not generate a constructor declaration.}
-
-@defform[(definterface/title id (intf-id ...) pre-flow ...)]{
-
-Like @racket[definterface], but for single-page rendering as in
-@racket[defclass/title].}
-
-@defform[(defmixin id (domain-id ...) (range-id ...) pre-flow ...)]{
-
-Like @racket[defclass], but for a mixin. Any number of
-@racket[domain-id] classes and interfaces are specified for the
-mixin's input requires, and any number of result classes and (more
-likely) interfaces are specified for the @racket[range-id]. The
-@racket[domain-id]s supply inherited methods.}
-
-@defform[(defmixin/title id (domain-id ...) (range-id ...) pre-flow ...)]{
-
-Like @racket[defmixin], but for single-page rendering as in
-@racket[defclass/title].}
-
-@defform/subs[(defconstructor (arg-spec ...) pre-flow ...)
-              ([arg-spec (arg-id contract-expr-datum)
-                         (arg-id contract-expr-datum default-expr)])]{
-
-Like @racket[defproc], but for a constructor declaration in the body
-of @racket[defclass], so no return contract is specified. Also, the
-@racket[new]-style keyword for each @racket[arg-spec] is implicit from
-the @racket[arg-id].}
-
-@defform[(defconstructor/make (arg-spec ...) pre-flow ...)]{
-
-Like @racket[defconstructor], but specifying by-position
-initialization arguments (for use with @racket[make-object]) instead
-of by-name arguments (for use with @racket[new]).}
-
-@defform[(defconstructor*/make [(arg-spec ...) ...] pre-flow ...)]{
-
-Like @racket[defconstructor/make], but with multiple constructor
-patterns analogous @racket[defproc*].}
-
-@defform[(defconstructor/auto-super [(arg-spec ...) ...] pre-flow ...)]{
-
-Like @racket[defconstructor], but the constructor is
-annotated to indicate that additional initialization arguments are
-accepted and propagated to the superclass.}
-
-@defform/subs[#:literals (override override-final public-final 
-                          augment augment-final pubment extend extend-final)
-              (defmethod maybe-mode maybe-link (id arg-spec ...)
-                         result-contract-expr-datum
-                         pre-flow ...)
-              ([maybe-link code:blank
-                           (code:line #:link-target? link-target?-expr)]
-               [maybe-mode code:blank
-                           (code:line #:mode override)
-                           (code:line #:mode override-final)
-                           (code:line #:mode public-final)
-                           (code:line #:mode augment)
-                           (code:line #:mode augment-final)
-                           (code:line #:mode pubment)
-                           (code:line #:mode extend)
-                           (code:line #:mode extend-final)])]{
-
-Like @racket[defproc], but for a method within a @racket[defclass] or
-@racket[definterface] body.
-
-The @racket[maybe-mode] specifies whether the method overrides a
-method from a superclass, and so on. (For these purposes, use
-@racket[#:mode override] when refining a method of an implemented
-interface.) The @racket[extend] mode is like @racket[override], but
-the description of the method should describe only extensions to the
-superclass implementation.}
-
-@defform[(defmethod* maybe-mode maybe-link
-                     ([(id arg-spec ...)
-                       result-contract-expr-datum] ...)
-                     pre-flow ...)]{
-
-Like @racket[defproc*], but for a method within a @racket[defclass] or
-@racket[definterface] body. The @racket[maybe-mode] specification is as in
-@racket[defmethod].}
-
-
-@defform[(method class/intf-id method-id)]{
-
-Creates a hyperlink to the method named by @racket[method-id] in the
-class or interface named by @racket[class/intf-id]. The hyperlink
-names the method, only; see also @racket[xmethod].
-
-For-label binding information is used with @racket[class/intf-id], but
-not @racket[method-id].}
-
-@defform[(xmethod class/intf-id method-id)]{
-
-Like @racket[method], but the hyperlink shows both the method name and
-the containing class/interface.}
-
-@defform[(this-obj)]{
-
-Within a @racket[defmethod] or similar form, typesets as a
-meta-variable that stands for the target of the method call. Use
-@racket[(this-obj)] to be more precise than prose such as ``this
-method's object.''}
-
-@; ------------------------------------------------------------------------
-@section[#:tag "doc-signatures"]{Documenting Signatures}
-
-@defform[(defsignature id (super-id ...) pre-flow ...)]{
-
-Defines a signature @racket[id] that extends the @racket[super-id]
-signatures. Any elements defined in @tech{decode}d
-@racket[pre-flow]s---including forms, procedures, structure types,
-classes, interfaces, and mixins---are defined as members of the
-signature instead of direct bindings. These definitions can be
-referenced through @racket[sigelem] instead of @racket[racket].
-
-The @tech{decode}d @racket[pre-flow]s inset under the signature
-declaration in the typeset output, so no new sections, @|etc| can be
-started.}
-
-@defform[(defsignature/splice id (super-id ...) pre-flow ...)]{
-
-Like @racket[defsignature], but the @tech{decode}d @racket[pre-flow]s
-are not typeset under the signature declaration, and new sections,
-@|etc| can be started in the @racket[pre-flow]s.}
-
-@defproc[(signature-desc [pre-flow pre-flow?] ...) any/c]{
-
-Produces an opaque value that @racket[defsignature] recognizes to
-outdent in the typeset form. This is useful for text describing the
-signature as a whole to appear right after the signature declaration.}
-
-@defform[(sigelem sig-id id)]{
-
-Typesets the identifier @racket[id] with a hyperlink to its definition
-as a member of the signature named by @racket[sig-id].}
-
-@; ------------------------------------------------------------------------
-@section[#:tag "doc-strings"]{Various String Forms}
-
-@defproc[(aux-elem [pre-content pre-content?] ...) element?]{
-Like @racket[elem], but adds an @racket['aux] @tech{style property}.}
-
-@defproc[(defterm [pre-content pre-content?] ...) element?]{Typesets the
-@tech{decode}d @racket[pre-content] as a defined term (e.g., in
-italic). Consider using @racket[deftech] instead, though, so that uses
-of @racket[tech] can hyper-link to the definition.}
-
-@defproc[(onscreen [pre-content pre-content?] ...) element?]{ Typesets the
-@tech{decode}d @racket[pre-content] as a string that appears in a GUI,
-such as the name of a button.}
-
-@defproc[(menuitem [menu-name string?] [item-name string?]) element?]{
-Typesets the given combination of a GUI's menu and item name.}
-
-@defproc[(filepath [pre-content pre-content?] ...) element?]{Typesets the
-@tech{decode}d @racket[pre-content] as a file name (e.g., in
-typewriter font and in quotes).}
-
-@defproc[(exec [pre-content pre-content?] ...) element?]{Typesets the
-@tech{decode}d @racket[pre-content] as a command line (e.g., in
-typewriter font).}
-
-@defproc[(envvar [pre-content pre-content?] ...) element?]{Typesets the given
-@tech{decode}d @racket[pre-content] as an environment variable (e.g.,
-in typewriter font).}
-
-@defproc[(Flag [pre-content pre-content?] ...) element?]{Typesets the given
-@tech{decode}d @racket[pre-content] as a flag (e.g., in typewriter
-font with a leading @litchar{-}).}
-
-@defproc[(DFlag [pre-content pre-content?] ...) element?]{Typesets the given
-@tech{decode}d @racket[pre-content] a long flag (e.g., in typewriter
-font with two leading @litchar{-}s).}
-
-@defproc[(PFlag [pre-content pre-content?] ...) element?]{Typesets the given
-@tech{decode}d @racket[pre-content] as a @litchar{+} flag (e.g., in typewriter
-font with a leading @litchar{+}).}
-
-@defproc[(DPFlag [pre-content pre-content?] ...) element?]{Typesets the given
-@tech{decode}d @racket[pre-content] a long @litchar{+} flag (e.g., in
-typewriter font with two leading @litchar{+}s).}
-
-@; ------------------------------------------------------------------------
-@section[#:tag "section-links"]{Links}
-
-See also @secref["base-links"].
-
-@defform*[[(racketlink id #:style style-expr pre-content ...)
-           (racketlink id pre-content ...)]
-          #:contracts ([id identifier?]
-                       [pre-content pre-content?])]{
-
-An element where the @tech{decode}d @racket[pre-content] is hyperlinked to the definition
-of @racket[id].}
-
-@defform[(schemelink id pre-content ...)]{
-
-Compatibility alias for @racket[racketlink].}
-
-@defproc[(link [url string?] [pre-content any/c] ...
-                [#:underline? underline? any/c #t]
-                [#:style style (or/c style? string? symbol? #f) (if underline? #f "plainlink")]) 
-         element?]{
-
-Alias of @racket[hyperlink] for backward compatibility.}
-
-@defproc[(other-manual [module-path module-path?]
-                       [#:underline? underline? any/c #t])
-         element?]{
-
-Alias of @racket[other-doc] for backward compatibility.}
-
-@defproc[(deftech [pre-content pre-content?] ...
-                  [#:key key (or/c string? #f) #f]
-                  [#:normalize? normalize? any/c #t]
-                  [#:style? style? any/c #t]) element?]{
-
-Produces an element for the @tech{decode}d @racket[pre-content], and
-also defines a term that can be referenced elsewhere using
-@racket[tech].
-
-When @racket[key] is @racket[#f], the @racket[content->string] result
-of the @tech{decode}d @racket[pre-content] is used as a key for
-references. If @racket[normalize?] is true, then the key string is
-normalized as follows:
-
-@itemize[
-
- @item{The string is case-folded.}
-
- @item{A trailing ``ies'' is replaced by ``y''.}
-
- @item{A trailing ``s'' is removed.}
-
- @item{Consecutive hyphens and whitespaces are all replaced by a
-       single space.}
-
-]
-
-These normalization steps help support natural-language references
-that differ slightly from a defined form. For example, a definition of
-``bananas'' can be referenced with a use of ``banana''.
-
-If @racket[style?] is true, then @racket[defterm] is used on
-@racket[pre-content].}
-
-@defproc[(tech [pre-content pre-content?] ...
-               [#:key key (or/c string? #f) #f]
-               [#:normalize? normalize? any/c #t]
-               [#:doc module-path (or/c module-path? #f) #f]
-               [#:tag-prefixes prefixes (or/c (listof string?) #f) #f])
-         element?]{
-
-Produces an element for the @tech{decode}d @racket[pre-content], and
-hyperlinks it to the definition of the key as established by
-@racket[deftech]. If @racket[key] is false, the decoded content is
-converted to a string (using @racket[content->string]) to use as a
-key; in either case, if @racket[normalize?] is true, the key is normalized in the same way as for
-@racket[deftech]. The @racket[#:doc] and @racket[#:tag-prefixes]
-arguments support cross-document and section-specific references, like
-in @racket[secref].
-
-With the default style files, the hyperlink created by @racket[tech]
-is somewhat quieter than most hyperlinks: the underline in HTML output
-is gray, instead of blue, and the term and underline turn blue only
-when the mouse is moved over the term.
-
-In some cases, combining both natural-language uses of a term and
-proper linking can require some creativity, even with the
-normalization performed on the term. For example, if ``bind'' is
-defined, but a sentence uses the term ``binding,'' the latter can be
-linked to the former using @racketfont["@tech{bind}ing"].}
-
-@defproc[(techlink [pre-content pre-content?] ...
-                   [#:key key (or/c string? #f) #f]
-                   [#:normalize? normalize? any/c #t]
-                   [#:doc module-path (or/c module-path? #f) #f]
-                   [#:tag-prefixes prefixes (or/c (listof string?) #f) #f]) 
-         element?]{
-
-Like @racket[tech], but the link is not quiet. For example, in HTML
-output, a hyperlink underline appears even when the mouse is not over
-the link.}
-
-@; ------------------------------------------------------------------------
-@section[#:tag "manual-indexing"]{Indexing}
-
-See also @secref["base-indexing"] for @racketmodname[scribble/base].
-
-@defform[(indexed-racket datum ...)]{
-
-A combination of @racket[racket] and @racket[as-index], with the
-following special cases when a single @racket[datum] is provided:
-
- @itemize[
-
- @item{If @racket[datum] is a @racket[quote] form, then the quote is
-       removed from the key (so that it's sorted using its unquoted
-       form).}
-
- @item{If @racket[datum] is a string, then quotes are removed from the
-       key (so that it's sorted using the string content).}
-
-]}
-
-@defform[(indexed-scheme datum ...)]{
-
-Compatibility alias for @racket[indexed-racket].}
-
-@defproc[(idefterm [pre-content pre-content?] ...) element?]{Combines
-@racket[as-index] and @racket[defterm]. The content normally should be
-plural, rather than singular. Consider using @racket[deftech],
-instead, which always indexes.}
-
-@defproc[(pidefterm [pre-content pre-content?] ...) element?]{Like
-@racket[idefterm], but plural: adds an ``s'' on the end of the content
-for the index entry. Consider using @racket[deftech], instead.}
-
-@defproc[(indexed-file [pre-content pre-content?] ...) element?]{A
-combination of @racket[file] and @racket[as-index], but where the sort
-key for the index iterm does not include quotes.}
-
-@defproc[(indexed-envvar [pre-content pre-content?] ...) element?]{A
-combination of @racket[envvar] and @racket[as-index].}
-
-@; ------------------------------------------------------------------------
-@section{Bibliography}
-
-@margin-note{See also @racketmodname[scriblib/autobib].}
-
-@defproc[(cite [key string?] ...+) element?]{
-
-Links to a bibliography entry, using the @racket[key]s both to indicate the
-bibliography entry and, in square brackets, as the link text.}
-
-@defproc[(bibliography [#:tag tag string? "doc-bibliography"]
-                       [entry bib-entry?] ...)
-         part?]{
-
-Creates a bibliography part containing the given entries, each of
-which is created with @racket[bib-entry]. The entries are typeset in
-order as given.}
-
-@defproc[(bib-entry [#:key key string?]
-                    [#:title title (or/c #f pre-content?)]
-                    [#:is-book? is-book? boolean? #f]
-                    [#:author author (or/c #f pre-content?) #f]
-                    [#:location location (or/c #f pre-content?) #f]
-                    [#:date date (or/c #f pre-content?) #f] 
-                    [#:url url (or/c #f pre-content?) #f])
-         bib-entry?]{
-
-Creates a bibliography entry. The @racket[key] is used to refer to the
-entry via @racket[cite]. The other arguments are used as elements in
-the entry:
-
-@itemize[
-
- @item{@racket[title] is the title of the cited work. It will be
-       surrounded by quotes in typeset form if @racket[is-book?] is
-       @racket[#f], otherwise it is typeset via @racket[italic].}
-
- @item{@racket[author] lists the authors. Use names in their usual
-       order (as opposed to ``last, first''), and separate multiple
-       names with commas using ``and'' before the last name (where
-       there are multiple names). The @racket[author] is typeset in
-       the bibliography as given, or it is omitted if given as
-       @racket[#f].}
-
- @item{@racket[location] names the publication venue, such as a
-       conference name or a journal with volume, number, and
-       pages. The @racket[location] is typeset in the bibliography as
-       given, or it is omitted if given as @racket[#f].}
-
- @item{@racket[date] is a date, usually just a year (as a string). It
-       is typeset in the bibliography as given, or it is omitted if
-       given as @racket[#f].}
-
- @item{@racket[url] is an optional URL. It is typeset in the
-       bibliography using @racket[tt] and hyperlinked, or it is
-       omitted if given as @racket[#f].}
-
-]}
-
-
-@defproc[(bib-entry? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a bibliography entry created by
-@racket[bib-entry], @racket[#f] otherwise.}
-
-
-@; ------------------------------------------------------------------------
-@section{Version History}
-
-@defform[(history clause ...)
-         #:grammar ([clause (code:line #:added version-expr)
-                            (code:line #:changed version-expr content-expr)])
-         #:contracts ([version-expr valid-version?]
-                      [content-expr content?])]{
-
-Generates a @tech{block} for version-history notes. The version
-refers to a package as determined by a @racket[defmodule] or
-@racket[declare-exporting] declaration within an enclosing section.
-
-Normally, @racket[history] should be used at the end of a
-@racket[defform], @racket[defproc], @|etc|, entry, although it may
-also appear in a section that introduces a module (that has been added
-to a package). In the case of a @racket[changed] entry, the content
-produced by @racket[content-expr] should normally start with a capital
-letter and end with a period, but it can be a sentence fragment such
-as ``Added a @racket[#:changed] form.''
-
-@history[#:added "1.1"]}
-
-@; ------------------------------------------------------------------------
-@section{Miscellaneous}
-
-@defproc[(t [pre-content pre-content?] ...) paragraph?]{Wraps the
-@tech{decode}d @racket[pre-content] as a paragraph.}
-
-@defthing[etc element?]{Like @racket["etc."], but with an
-abbreviation-ending period for use in the middle of a sentence.}
-
-@defthing[PLaneT element?]{@racket["PLaneT"] (to help make sure you get
-the letters in the right case).}
-
-@defthing[manual-doc-style style?]{
-
-A style to be used for a document's main @racket[part] to get the
-style configuration of @racket[@#,hash-lang[] @#,racketmodname[scribble/manual]].
-See @secref["manual-render-style"].}
-
-@defproc[(hash-lang) element?]{Returns an element for @hash-lang[]
-that is hyperlinked to an explanation.}
-
-@defthing[void-const element?]{Returns an element for @|void-const|.}
-
-@defthing[undefined-const element?]{Returns an element for @|undefined-const|.}
-
-@defproc[(commandline [pre-content pre-content?] ...) paragraph?]{Produces
-an inset command-line example (e.g., in typewriter font).}
-
-@defproc[(inset-flow [pre-flow pre-flow?] ...) nested-flow?]{
-
-Creates a @racket[nested-flow] with indenting on the left and right.
-
-Using @racket[nested] with the @racket['inset] style is a prefered
-alternative.}
-
-@defproc[(centerline [pre-flow pre-flow?] ...) nested-flow?]{
-
-An alias for @racket[centered] for backward compatibility.}
-
-@defproc[(math [pre-content any/c] ...) element?]{The @tech{decode}d
-@racket[pre-content] is further transformed:
-
- @itemize[
-
-  @item{Any immediate @racket['rsquo] is converted to @racket['prime].}
-
-  @item{Parentheses and sequences of decimal digits in immediate
-        strings are left as-is, but any other immediate string is
-        italicized.}
-
-  @item{When @litchar{_} appears before a non-empty sequence of numbers
-        and letters, the sequence is typeset as a subscript.}
-
-  @item{When @litchar{^} appears before a non-empty sequence of numbers
-        and letters, the sequence is typeset as a superscript.}
-
- ]}
-
-@defproc[(filebox [filename (or/c string? element?)] [pre-flow pre-flow?] ...)
-         block?]{
-
-Typesets the @racket[pre-flow]s as the content of
-@racket[filename]. For example, the content may be inset on the page
-with @racket[filename] above it. If @racket[filename] is a string, it
-is passed to @racket[filepath] to obtain an @racket[element].}
-
-@defproc[(deprecated [#:what what content? "library"]
-                     [replacement content?]
-                     [additional-notes content?] ...)
-         block?]{
-Produces an inset warning for deprecated libraries, functions, @|etc| (as
-described by @racket[what]), where @racket[replacement] describes a
-suitable replacement. The @racket[additional-notes] are included after the
-initial deprecation message.}
-
-@defproc[(image/plain [filename-relative-to-source string?]
-                      [pre-element any/c] ...)
-         element?]{
-
- An alias for @racket[image] for backward compatibility.}
-
-@; ------------------------------------------------------------------------
-@section[#:tag "index-entries"]{Index-Entry Descriptions}
-
-@defmodule[scribble/manual-struct]{The
-@racketmodname[scribble/manual-struct] library provides types used to
-describe index entries created by @racketmodname[scribble/manual]
-functions. These structure types are provided separate from
-@racketmodname[scribble/manual] so that
-@racketmodname[scribble/manual] need not be loaded when deserializing
-cross-reference information that was generated by a previously
-rendered document.}
-
-@defstruct[module-path-index-desc ()]{
-
-Indicates that the index entry corresponds to a module definition via
-@racket[defmodule] and company.}
-
-@defstruct[exported-index-desc ([name symbol?]
-                               [from-libs (listof module-path?)])]{
-
-Indicates that the index entry corresponds to the definition of an
-exported binding. The @racket[name] field and @racket[from-libs] list
-correspond to the documented name of the binding and the primary
-modules that export the documented name (but this list is not
-exhaustive, because new modules can re-export the binding).}
-
-@defstruct[(form-index-desc exported-index-desc) ()]{
-
-Indicates that the index entry corresponds to the definition of a
-syntactic form via @racket[defform] and company.}
-
-@defstruct[(procedure-index-desc exported-index-desc) ()]{
-
-Indicates that the index entry corresponds to the definition of a
-procedure binding via @racket[defproc] and company.}
-
-@defstruct[(thing-index-desc exported-index-desc) ()]{
-
-Indicates that the index entry corresponds to the definition of a
-binding via @racket[defthing] and company.}
-
-@defstruct[(struct-index-desc exported-index-desc) ()]{
-
-Indicates that the index entry corresponds to the definition of a
-structure type via @racket[defstruct] and company.}
-
-@defstruct[(class-index-desc exported-index-desc) ()]{
-
-Indicates that the index entry corresponds to the definition of a
-class via @racket[defclass] and company.}
-
-@defstruct[(interface-index-desc exported-index-desc) ()]{
-
-Indicates that the index entry corresponds to the definition of an
-interface via @racket[definterface] and company.}
-
-@defstruct[(mixin-index-desc exported-index-desc) ()]{
-
-Indicates that the index entry corresponds to the definition of a
-mixin via @racket[defmixin] and company.}
-
-@defstruct[(method-index-desc exported-index-desc) ([method-name symbol?]
-                                                    [class-tag tag?])]{
-
-Indicates that the index entry corresponds to the definition of an
-method via @racket[defmethod] and company. The @racket[_name] field
-from @racket[exported-index-desc] names the class or interface that
-contains the method. The @racket[method-name] field names the method.
-The @racket[class-tag] field provides a pointer to the start of the
-documentation for the method's class or interface.}
-
-@defstruct[(constructor-index-desc exported-index-desc) ([class-tag tag?])]{
-
-Indicates that the index entry corresponds to a constructor
-via @racket[defconstructor] and company. The @racket[_name] field
-from @racket[exported-index-desc] names the class or interface that
-contains the method. 
-The @racket[class-tag] field provides a pointer to the start of the
-documentation for the method's class or interface.}
-
-@;----------------------------------------
-
-@section[#:tag "manual-render-style"]{Manual Rendering Style}
-
-Using @racket[@#,hash-lang[] @#,racketmodname[scribble/manual]] for the
-main @racket[part] of a document associates @tech{style properties} on
-the @racket[doc] export to select the Racket manual style for
-rendering.
-
-A @racket[html-defaults] @tech{style property} is added to
-@racket[doc], unless @racket[doc]'s style already has a
-@racket[html-defaults] @tech{style property} (e.g., supplied to
-@racket[title]). Similarly, a @racket[latex-default] @tech{style
-property} is added if one is not already present. Finally, an
-@racket[css-style-addition] property is always added.
-
-For HTML rendering:
-
-@itemlist[
-
- @item{The document's @tech{prefix file} is set to
-       @filepath{scribble-prefix.html}, as usual, in @racket[html-defaults].}
-
- @item{The document's @tech{style file} is set to
-       @filepath{manual-style.css} from the @filepath{scribble}
-       collection in @racket[html-defaults].}
-
- @item{The file @filepath{manual-files.css} from the
-       @filepath{scribble} collection is designated as an additional
-       accompanying file in @racket[html-defaults].}
-
- @item{The file @filepath{manual-racket.css} from the
-       @filepath{scribble} collection is added as a
-       @racket[css-style-addition].}
-
-]
-
-To obtain this configuration without using @racket[@#,hash-lang[]
-@#,racketmodname[scribble/manual]], use @racket[manual-doc-style].
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/plt.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/plt.scrbl
deleted file mode 100644
index 403b94ae41..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/plt.scrbl
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt")
-
-@title[#:tag "plt-manuals" #:style 'toc]{Scribbling Documentation}
-
-The @racketmodname[scribble/manual] language and associated libraries
-provide extensive support for documenting Racket libraries. The
-most significant aspect of support for documentation is the way that
-source-code bindings are connected to documentation sites through the
-module namespace---a connection that is facilitated by the fact that
-Scribble documents are themselves modules that reside in the same
-namespace. @Secref["how-to-doc"] provides an introduction to using
-Scribble for documentation, and the remaining sections document the
-relevant libraries and APIs in detail.
-
-@local-table-of-contents[]
-
-@include-section["how-to.scrbl"]
-@include-section["style.scrbl"]
-@include-section["manual.scrbl"]
-@include-section["scheme.scrbl"]
-@include-section["eval.scrbl"]
-@include-section["srcdoc.scrbl"]
-@include-section["bnf.scrbl"]
-@include-section["compat.scrbl"]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader-internals.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader-internals.scrbl
deleted file mode 100644
index a46cdeec3c..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader-internals.scrbl
+++ /dev/null
@@ -1,335 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/bnf scribble/eval "utils.rkt"
-          (for-syntax racket/base)
-          (for-label (only-in scribble/reader
-                              use-at-readtable)))
-
-@(define read-eval (make-base-eval))
-@(interaction-eval #:eval read-eval (require (for-syntax racket/base)))
-
-@title[#:tag "reader-internals"]{@"@" Reader Internals}
-
-@;--------------------------------------------------------------------
-@section{Using the @"@" Reader}
-
-You can use the reader via Racket's @racketfont{#reader} form:
-
-@racketblock[
- @#,racketfont|{
-     #reader scribble/reader @foo{This is free-form text!}
-}|]
-
-or use the @racket[at-exp] meta-language as described in
-@secref["at-exp-lang"].
-
-Note that the Scribble reader reads @tech{@"@"-forms} as S-expressions.  This
-means that it is up to you to give meanings for these expressions in
-the usual way: use Racket functions, define your functions, or require
-functions.  For example, typing the above into @exec{racket} is likely
-going to produce a ``reference to undefined identifier'' error, unless
-@racket[foo] is defined. You can use @racket[string-append] instead,
-or you can define @racket[foo] as a function (with variable arity).
-
-A common use of the Scribble @"@"-reader is when using Scribble as a
-documentation system for producing manuals.  In this case, the manual
-text is likely to start with
-
-@racketmod[scribble/doc]
-
-which installs the @"@" reader starting in ``text mode,'' wraps the
-file content afterward into a Racket module where many useful Racket
-and documentation related functions are available, and parses the body
-into a document using @racketmodname[scribble/decode].  See
-@secref["docreader"] for more information.
-
-Another way to use the reader is to use the @racket[use-at-readtable]
-function to switch the current readtable to a readtable that parses
-@tech{@"@"-forms}.  You can do this in a single command line:
-
-@commandline{racket -ile scribble/reader "(use-at-readtable)"}
-
-@;--------------------------------------------------------------------
-@section{Syntax Properties}
-
-The Scribble reader attaches properties to syntax objects.  These
-properties might be useful in some rare situations.
-
-Forms that Scribble reads are marked with a @racket['scribble]
-property, and a value of a list of three elements: the first is
-@racket['form], the second is the number of items that were read from
-the datum part, and the third is the number of items in the body part
-(strings, sub-forms, and escapes).  In both cases, a @racket[0] means
-an empty datum/body part, and @racket[#f] means that the corresponding
-part was omitted.  If the form has neither parts, the property is not
-attached to the result.  This property can be used to give different
-meanings to expressions from the datum and the body parts, for
-example, implicitly quoted keywords:
-
-@; FIXME: a bit of code duplication here
-@def+int[
-  #:eval read-eval
-  (define-syntax (foo stx)
-    (let ([p (syntax-property stx 'scribble)])
-      (printf ">>> ~s\n" (syntax->datum stx))
-      (syntax-case stx ()
-        [(_ x ...)
-         (and (pair? p) (eq? (car p) 'form) (even? (cadr p)))
-         (let loop ([n (/ (cadr p) 2)]
-                    [as '()]
-                    [xs (syntax->list #'(x ...))])
-           (if (zero? n)
-             (with-syntax ([attrs (reverse as)]
-                           [(x ...) xs])
-               #'(list 'foo `attrs x ...))
-             (loop (sub1 n)
-                   (cons (with-syntax ([key (car xs)]
-                                       [val (cadr xs)])
-                           #'(key ,val))
-                         as)
-                   (cddr xs))))])))
-  (eval:alts
-   (code:line
-    @#,tt["@foo[x 1 y (* 2 3)]{blah}"])
-    ;; Unfortunately, expressions are preserved by `def+int'
-    ;; using `quote', not `quote-syntax' (which would create all sorts
-    ;; or binding trouble), so we manually re-attach the property:
-    (eval (syntax-property #'@foo[x 1 y (* 2 3)]{blah}
-                           'scribble '(form 4 1))))
-]
-
-In addition, the Scribble parser uses syntax properties to mark syntax
-items that are not physically in the original source --- indentation
-spaces and newlines.  Both of these will have a @racket['scribble]
-property; an indentation string of spaces will have
-@racket['indentation] as the value of the property, and a newline will
-have a @racket['(newline S)] value where @racket[S] is the original
-newline string including spaces that precede and follow it (which
-includes the indentation for the following item).  This can be used to
-implement a verbatim environment: drop indentation strings, and use
-the original source strings instead of the single-newline string.  Here
-is an example of this.
-
-@; FIXME: a bit of code duplication here
-@def+int[
-  #:eval read-eval
-  (define-syntax (verb stx)
-    (syntax-case stx ()
-      [(_ cmd item ...)
-       #`(cmd
-          #,@(let loop ([items (syntax->list #'(item ...))])
-               (if (null? items)
-                 '()
-                 (let* ([fst  (car items)]
-                        [prop (syntax-property fst 'scribble)]
-                        [rst  (loop (cdr items))])
-                   (cond [(eq? prop 'indentation) rst]
-                         [(not (and (pair? prop)
-                                    (eq? (car prop) 'newline)))
-                          (cons fst rst)]
-                         [else (cons (datum->syntax-object
-                                      fst (cadr prop) fst)
-                                     rst)])))))]))
-  (eval:alts
-   (code:line
-    @#,tt["@verb[string-append]{"]
-    @#,tt["  foo"]
-    @#,tt["    bar"]
-    @#,tt["}"])
-   @verb[string-append]{
-     foo
-       bar
-   })
-]
-
-@;--------------------------------------------------------------------
-@section[#:tag "at-exp-lang"]{Adding @"@"-expressions to a Language}
-
-@defmodulelang[at-exp]{The @racketmodname[at-exp] language installs
-@seclink["reader"]{@"@"-reader} support in the readtable used to read 
-a module, and then chains to the reader of
-another language that is specified immediately after
-@racketmodname[at-exp].}
-
-For example, @racket[@#,hash-lang[] at-exp racket/base] adds @"@"-reader
-support to @racket[racket/base], so that
-
-@racketmod[
-at-exp racket/base
-
-(define (greet who) @#,elem{@tt["@"]@racket[string-append]@racketparenfont["{"]@racketvalfont{Hello, }@tt["@|"]@racket[who]@tt["|"]@racketvalfont{.}@racketparenfont["}"]})
-(greet "friend")]
-
-reports @racket["Hello, friend."].
-
-In addition to configuring the reader for a module body,
-@racketmodname[at-exp] attaches a run-time configuration annotation to
-the module, so that it if it used as the main module, the
-@racket[current-read-interaction] parameter is adjusted to use the
-@seclink["reader"]{@"@"-reader} readtable extension.
-
-@history[#:changed "1.2" @elem{Added @racket[current-read-interaction]
-                               run-time configuration.}]
-
-@;--------------------------------------------------------------------
-@section{Interface}
-
-@defmodule[scribble/reader]{The @racketmodname[scribble/reader] module
-provides direct Scribble reader functionality for advanced needs.}
-
-@; The `with-scribble-read' trick below shadows `read' and
-@;  `read-syntax' with for-label bindings from the Scribble reader
-
-@(define-syntax with-scribble-read
-   (syntax-rules ()
-     [(_)
-      (...
-       (begin
-         (require (for-label scribble/reader))
-
-@; *** Start reader-import section ***
-@deftogether[(
-@defproc[(read [in input-port? (current-input-port)]) any]{}
-@defproc[(read-syntax [source-name any/c (object-name in)]
-                      [in input-port? (current-input-port)])
-         (or/c syntax? eof-object?)]
-)]{
-
-Implements the Scribble reader using the readtable produced by
-
-@racketblock[(make-at-readtable #:command-readtable 'dynamic
-                                #:datum-readtable 'dynamic)]
-
-@history[#:changed "1.1" @elem{Changed to use @racket['dynamic] for the command and datum readtables.}]}
-
-
-@deftogether[(
-@defproc[(read-inside [in input-port? (current-input-port)]) any]{}
-@defproc[(read-syntax-inside [source-name any/c (object-name in)]
-                             [in input-port? (current-input-port)]
-                             [#:command-char command-char char? #\@])
-         (or/c syntax? eof-object?)]
-)]{
-
-Like @racket[read] and @racket[read-syntax], but starting as if
-inside a @litchar["@{"]...@litchar["}"] to return a (syntactic) list,
-which is useful for implementing languages that are textual by default.
-
-The given @racket[command-char] is used to customize the readtable
-used by the reader, effectively passing it along to @racket[make-at-readtable].
-
-@history[#:changed "1.1" @elem{Changed to use @racket['dynamic] for the command and datum readtables.}]
-}
-
-@defproc[(make-at-readtable
-          [#:readtable readtable readtable? (current-readtable)]
-          [#:command-char command-char char? #\@]
-          [#:command-readtable command-readtable (or/c readtable? 'dynamic) readtable]
-          [#:datum-readtable datum-readtable
-                             (or/c readtable?
-                                   boolean?
-                                   (readtable? . -> . readtable?)
-                                   'dynamic)
-                             #t]
-          [#:syntax-post-processor syntax-post-proc
-                                   (syntax? . -> . syntax?)
-                                   values])
-          readtable?]{
-
-Constructs an @"@"-readtable.  The keyword arguments can customize the
-resulting reader in several ways:
-
-@itemize[
-
-@item{@racket[readtable] --- a readtable to base the @"@"-readtable
-  on.}
-
-@item{@racket[command-char] --- the character used for @tech{@"@"-forms}.}
-
-@item{@racket[command-readtable] --- determines the readtable that is
-  extended for reading the command part of an @tech{@"@"-form}:
-
-  @itemlist[
-    @item{a readtable --- extended to make @litchar{|} a delimiter
-          instead of a symbol-quoting character}
-
-    @item{@racket['dynamic] --- extends @racket[(current-readtable)]
-          at the point where a command is parsed to make @litchar{|} a
-          delimiter}
-   ]}
-
-@item{@racket[datum-readtable] --- the readtable used for
-  reading the datum part of an @tech{@"@"-form}:
-
-  @itemlist[
-    @item{@racket[#t] --- uses the constructed @"@"-readtable itself}
-    @item{a readtable --- uses the given readtable}
-    @item{a readtable-to-readtable function --- called to construct a readtable
-          from the generated @"@"-readtable}
-    @item{@racket['dynamic] --- uses @racket[(current-readtable)] at the
-          point where the datum part is parsed}
-  ]
-
-  The idea is that you may want to have completely
-  different uses for the datum part, for example, introducing a
-  convenient @litchar{key=val} syntax for attributes.}
-
-@item{@racket[syntax-post-proc] --- function that is applied on
-  each resulting syntax value after it has been parsed (but before it
-  is wrapped quoting punctuations).  You can use this to further
-  control uses of @tech{@"@"-forms}, for example, making the command be the
-  head of a list:
-
-  @racketblock[
-    (use-at-readtable
-      #:syntax-post-processor
-      (lambda (stx)
-        (syntax-case stx ()
-          [(cmd rest ...) #'(list 'cmd rest ...)]
-          [_else (error "@ forms must have a body")])))
-  ]}
-
-]
-
-@history[#:changed "1.1" @elem{Added @racket[#:command-readtable] and
-         the @racket['dynamic] option for @racket[#:datum-readtable].}]}
-
-
-@defproc[(make-at-reader [#:syntax? syntax? #t] [#:inside? inside? #f] ...)
-          procedure?]{
-Constructs a variant of a @"@"-readtable.  The arguments are the same
-as in @racket[make-at-readtable], with two more that determine the
-kind of reader function that will be created: @racket[syntax?] chooses
-between a @racket[read]- or @racket[read-syntax]-like function, and
-@racket[inside?] chooses a plain reader or an @racketid[-inside]
-variant.
-
-The resulting function has a different contract and action based on
-these inputs.  The expected inputs are as in @racket[read] or
-@racket[read-syntax] depending on @racket[syntax?]; the function will
-read a single expression or, if @racket[inside?] is true, the whole
-input; it will return a syntactic list of expressions rather than a
-single one in this case.
-
-Note that @racket[syntax?] defaults to @racket[#t], as this is the
-more expected common case when you're dealing with concrete-syntax
-reading.
-
-Note that if @racket[syntax?] is true, the @racket[read]-like function
-is constructed by simply converting a syntax result back into a datum.}
-
-
-@defproc[(use-at-readtable ...) void?]{
-
-Passes all arguments to @racket[make-at-readtable], and installs the
-resulting readtable using @racket[current-readtable]. It also enables
-line counting for the current input-port via @racket[port-count-lines!].
-
-This is mostly useful for playing with the Scribble syntax on the REPL.}
-
-@; *** End reader-import section ***
-))]))
-@with-scribble-read[]
-
-@; --------------------------------------------------
-@(close-eval read-eval)
-
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader.scrbl
deleted file mode 100644
index 2bd426c49b..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader.scrbl
+++ /dev/null
@@ -1,742 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/bnf scribble/eval "utils.rkt"
-          (for-syntax racket/base)
-          (for-label (only-in scribble/reader
-                              use-at-readtable)))
-
-@(define read-eval (make-base-eval))
-@(interaction-eval #:eval read-eval (require (for-syntax racket/base)))
-
-@(define (at-exp-racket)
-   @racket[#, @hash-lang[] #, @racketmodname[at-exp] #, @racketidfont{racket}])
-
-@title[#:tag "reader"]{@"@" Syntax}
-
-The Scribble @"@" notation is designed to be a convenient facility for
-free-form text in Racket code, where ``@"@"'' was chosen as one of the
-least-used characters in existing Racket code. An @"@"-expression is
-simply an S-expression in disguise.
-
-Typically, @"@" notation is enabled through
-@racketmodname[scribble/base] or similar languages, but you can also
-add @"@" notation to an S-expression-based language using the
-@racketmodname[at-exp] meta-language. For example,
-
-@verbatim[#:indent 2]|{
-  #lang at-exp racket
-  (define v '@op{str})
-}|
-
-is equivalent to 
-
-@racketmod[
-racket
-(define v '(op "str"))
-]
-
-Using @at-exp-racket[] is probably the easiest way to try the examples
-in this chapter.
-
-@;--------------------------------------------------------------------
-@section{The Scribble Syntax at a Glance}
-
-To review @secref["how-to:reader"], the concrete syntax of @deftech{@"@"-forms}
-is roughly
-
-@racketblock[
- @#,BNF-seq[@litchar["@"]
-            @nonterm{cmd}
-            @litchar{[} @kleenestar{@nonterm{datum}} @litchar{]}
-            @litchar["{"] @kleenestar{@nonterm{text-body}} @litchar["}"]]
-]
-
-where all three parts after @litchar["@"] are optional, but at least
-one should be present.  (Spaces are not allowed between the
-three parts.)  Roughly, a form matching the above grammar is read as
-
-@racketblock[
-  (@#,nonterm{cmd} @#,kleenestar{@nonterm{datum}} @#,kleenestar{@nonterm{parsed-body}})
-]
-
-where @nonterm{parsed-body} is the translation of each
-@nonterm{text-body} in the input.  Thus, the initial @nonterm{cmd}
-determines the Racket code that the input is translated into.  The
-common case is when @nonterm{cmd} is a Racket identifier, which reads
-as a plain Racket form, with datum arguments and/or string arguments.
-
-Here is one example:
-
-@scribble-examples|==={
-  @foo{blah blah blah}
-}===|
-
-The example shows how an input syntax is read as Racket syntax, not
-what it evaluates to. If you want to see the translation of an example
-into S-expression form, add a quote in front of it in a
-@at-exp-racket[] module. For example, running
-
-@verbatim[#:indent 2]|{
-  #lang at-exp racket
-  '@foo{blah blah blah}
-}|
-
-in DrRacket prints the output
-
-@nested[#:style 'inset]{@racketresult[(foo "blah blah blah")]}
-
-while omitting the quote
-
-@verbatim[#:indent 2]|{
-  #lang at-exp racket
-  @foo{blah blah blah}
-}|
-
-triggers a syntax error because @racket[foo] is not bound, and
-
-@verbatim[#:indent 2]|{
-  #lang at-exp racket
-  (define (foo str) (printf "He wrote ~s.\n" str))
-  @foo{blah blah blah}
-}|
-
-prints the output
-
-@nested[#:style 'inset]{@racketoutput{He wrote "blah blah blah".}}
-
-Here are more examples of @tech{@"@"-forms}:
-
-@scribble-examples|==={
-  @foo{blah "blah" (`blah'?)}
-  @foo[1 2]{3 4}
-  @foo[1 2 3 4]
-  @foo[#:width 2]{blah blah}
-  @foo{blah blah
-       yada yada}
-  @foo{
-    blah blah
-    yada yada
-  }
-}===|
-
-As seen in the last example, multiple lines and the newlines that
-separate them are parsed to multiple Racket strings.  More generally,
-a @nonterm{text-body} is made of text, newlines, and nested
-@tech{@"@"-forms}, where the syntax for @tech{@"@"-forms} is the same whether it's
-in a @nonterm{text-body} context as in a Racket context.  A
-@nonterm{text-body} that isn't an @tech{@"@"-form} is converted to a string
-expression for its @nonterm{parsed-body}; newlines and following
-indentations are converted to @racket["\n"] and all-space string
-expressions.
-
-@scribble-examples|==={
-  @foo{bar @baz{3}
-       blah}
-  @foo{@b{@u[3] @u{4}}
-       blah}
-  @C{while (*(p++))
-       *p = '\n';}
-}===|
-
-The command part of an @tech{@"@"-form} is optional as well. In that case,
-the @tech{@"@"-form} is read as a list, which usually counts as a function
-application, but it also useful when quoted with the usual Racket
-@racket[quote]:
-
-@scribble-examples|==={
-  @{blah blah}
-  @{blah @[3]}
-  '@{foo
-     bar
-     baz}
-}===|
-
-Finally, we can also drop the datum and text parts, which leaves us with
-only the command---which is read as is, not within a parenthesized
-form.  This is not useful when reading Racket code, but it can be used
-inside a text block to escape a Racket identifier.  A vertical bar
-(@litchar{|}) can be used to delimit the escaped identifier when
-needed.
-
-@scribble-examples|==={
-  @foo
-  @{blah @foo blah}
-  @{blah @foo: blah}
-  @{blah @|foo|: blah}
-}===|
-
-Actually, the command part can be any Racket expression (that does not
-start with @litchar["["], @litchar["{"], or @litchar["|"]), which is
-particularly useful with such escapes since they can be used with any
-expression.
-
-@scribble-examples|==={
-  @foo{(+ 1 2) -> @(+ 1 2)!}
-  @foo{A @"string" escape}
-}===|
-
-Note that an escaped Racket string is merged with the surrounding text
-as a special case.  This is useful if you want to use the special
-characters in your string, but escaping braces are not necessary if
-they are balanced.
-
-@scribble-examples|==={
-  @foo{eli@"@"barzilay.org}
-  @foo{A @"{" begins a block}
-  @C{while (*(p++)) {
-       *p = '\n';
-     }}
-}===|
-
-In some cases, a text contains many literal @"@"s, which can be
-cumbersome to quote individually.  For such case, braces have an
-alternative syntax: A block of text can begin with a
-``@litchar["|{"]'' and terminated accordingly with a
-``@litchar["}|"]''.  Furthermore, any nested @tech{@"@"-forms} must begin
-with a ``@litchar["|@"]''.
-
-@scribble-examples|==={
-  @foo|{bar}@{baz}|
-  @foo|{bar |@x{X} baz}|
-  @foo|{bar |@x|{@}| baz}|
-}===|
-
-In cases when even this is not convenient enough, punctuation
-characters can be added between the @litchar{|} and the braces and the
-@"@" in nested forms.  (The punctuation is mirrored for parentheses
-and @litchar{<>}s.)  With this extension, Scribble syntax can be used as a
-``here string'' replacement.
-
-@scribble-examples|==={
-  @foo|--{bar}@|{baz}--|
-  @foo|<<{bar}@|{baz}>>|
-}===|
-
-On the flip side of this is, how can an @"@" sign be used in Racket
-code?  This is almost never an issue, because Racket strings and
-characters are still read the same, and @litchar["@"] is set as a
-non-terminating reader macro so it can be used in Racket identifiers
-anywhere except in the first character of an identifier.  When
-@litchar["@"] must appear as the first character of an identifier, you
-must quote the identifier just like other non-standard characters in
-normal S-expression syntax: with a backslash or with vertical bars.
-
-@scribble-examples|==={
-  (define \@email "foo@bar.com")
-  (define |@atchar| #\@)
-}===|
-
-Note that spaces are not allowed before a @litchar{[} or a
-@litchar["{"], or they will be part of the following text (or Racket
-code).  (More on using braces in body texts below.)
-
-@scribble-examples|==={
-  @foo{bar @baz[2 3] {4 5}}
-}===|
-
-Finally, remember that the Scribble is just an alternate for
-S-expressions. Identifiers still get their meaning, as in any
-Racket code, through the lexical context in which they appear.
-Specifically, when the above @tech{@"@"-form} appears in a Racket expression
-context, the lexical environment must provide bindings for
-@racket[foo] as a procedure or a macro; it can be defined, required,
-or bound locally (with @racket[let], for example).
-
-@; FIXME: unfortunate code duplication
-@interaction[
-(eval:alts
-  (let* ([formatter (lambda (fmt)
-          (lambda args (format fmt (apply string-append args))))]
-         [bf (formatter "*~a*")]
-         [it (formatter "/~a/")]
-         [ul (formatter "_~a_")]
-         [text string-append])
-    #,(tt "@text{@it{Note}: @bf{This is @ul{not} a pipe}.}"))
-  (let* ([formatter (lambda (fmt)
-          (lambda args (format fmt (apply string-append args))))]
-         [bf (formatter "*~a*")]
-         [it (formatter "/~a/")]
-         [ul (formatter "_~a_")]
-         [text string-append])
-    @text{@it{Note}: @bf{This is @ul{not} a pipe}.}))
-]
-
-@;--------------------------------------------------------------------
-@section{The Command Part}
-
-Besides being a Racket identifier, the @nonterm{cmd} part of an
-@tech{@"@"-form} can have Racket punctuation prefixes, which will end up
-wrapping the @italic{whole} expression.
-
-@scribble-examples|==={
-  @`',@foo{blah}
-  @#`#'#,@foo{blah}
-}===|
-
-When writing Racket code, this means that @litchar|{@`',@foo{blah}}|
-is exactly the same as @litchar|{`@',@foo{blah}}| and
-@litchar|{`',@@foo{blah}}|, but unlike the latter two, the first
-construct can appear in body texts with the same meaning, whereas the
-other two would not work (see below).
-
-After the optional punctuation prefix, the @nonterm{cmd} itself is not
-limited to identifiers; it can be @italic{any} Racket expression.
-
-@scribble-examples|==={
-  @(lambda (x) x){blah}
-  @`(unquote foo){blah}
-}===|
-
-In addition, the command can be omitted altogether, which will omit it
-from the translation, resulting in an S-expression that usually
-contains, say, just strings:
-
-@scribble-examples|==={
-  @{foo bar
-    baz}
-  @'{foo bar
-     baz}
-}===|
-
-If the command part begins with a @litchar{;} (with no newline between
-the @litchar["@"] and the @litchar{;}), then the construct is a
-comment.  There are two comment forms, one for arbitrary-text and
-possibly nested comments, and another one for line comments:
-
-@racketblock[
-@#,BNF-seq[@litchar["@;{"] @kleenestar{@nonterm{any}} @litchar["}"]]
-
-@#,BNF-seq[@litchar["@;"] @kleenestar{@nonterm{anything-else-without-newline}}]
-]
-
-In the first form, the commented body must still parse correctly; see
-the description of the body syntax below.  In the second form, all
-text from the @litchar["@;"] to the end of the line @italic{and} all
-following spaces (or tabs) are part of the comment (similar to
-@litchar{%} comments in TeX).
-
-@scribble-examples|==={
-  @foo{bar @; comment
-       baz@;
-       blah}
-}===|
-
-Tip: if you use an editor in some Scheme mode without support for
-@tech{@"@"-forms}, balanced comments can be confusing, since the open brace
-looks commented out, and the closing one isn't.  In such cases it is
-useful to ``comment'' out the closing brace too:
-
-@verbatim[#:indent 2]|==={
-  @;{
-    ...
-  ;}
-}===|
-
-so the editor does not treat the file as having unbalanced
-parentheses.
-
-If only the @nonterm{cmd} part of an @tech{@"@"-form} is specified, then the
-result is the command part only, without an extra set of parenthesis.
-This makes it suitable for Racket escapes in body texts.  (More on this
-below, in the description of the body part.)
-
-@scribble-examples|==={
-  @foo{x @y z}
-  @foo{x @(* y 2) z}
-  @{@foo bar}
-}===|
-
-Finally, note that there are currently no special rules for using
-@litchar["@"] in the command itself, which can lead to things like:
-
-@scribble-examples|==={
-  @@foo{bar}{baz}
-}===|
-
-@;--------------------------------------------------------------------
-@section{The Datum Part}
-
-The datum part can contains arbitrary Racket expressions, which
-are simply stacked before the body text arguments:
-
-@scribble-examples|==={
-  @foo[1 (* 2 3)]{bar}
-  @foo[@bar{...}]{blah}
-}===|
-
-The body part can still be omitted, which is essentially an
-alternative syntax for plain (non-textual) S-expressions:
-
-@scribble-examples|==={
-  @foo[bar]
-  @foo{bar @f[x] baz}
-}===|
-
-The datum part can be empty, which makes no difference, except when
-the body is omitted.  It is more common, however, to use an empty body
-for the same purpose.
-
-@scribble-examples|==={
-  @foo[]{bar}
-  @foo[]
-  @foo
-  @foo{}
-}===|
-
-The most common use of the datum part is for Racket forms that expect
-keyword-value arguments that precede the body of text arguments.
-
-@scribble-examples|==={
-  @foo[#:style 'big]{bar}
-}===|
-
-@;--------------------------------------------------------------------
-@section{The Body Part}
-
-The syntax of the body part is intended to be as convenient as
-possible for free text.  It can contain almost any text---the only
-characters with special meaning is @litchar["@"] for sub-@tech{@"@"-forms},
-and @litchar["}"] for the end of the text.  In addition, a
-@litchar["{"] is allowed as part of the text, and it makes the
-matching @litchar["}"] be part of the text too---so balanced braces
-are valid text.
-
-@scribble-examples|==={
-  @foo{f{o}o}
-  @foo{{{}}{}}
-}===|
-
-As described above, the text turns to a sequence of string arguments
-for the resulting form.  Spaces at the beginning and end of lines are
-discarded, and newlines turn to individual @racket["\n"] strings
-(i.e., they are not merged with other body parts); see also the
-information about newlines and indentation below. Spaces are
-@italic{not} discarded if they appear after the open @litchar["{"]
-(before the closing @litchar["}"]) when there is also text that
-follows (precedes) it; specifically, they are preserved in a
-single-line body.
-
-@scribble-examples|==={
-  @foo{bar}
-  @foo{ bar }
-  @foo[1]{ bar }
-}===|
-
-If @litchar["@"] appears in a body, then it is interpreted as Racket
-code, which means that the @"@"-reader is applied recursively, and the
-resulting syntax appears as part of the S-expression, among other
-string contents.
-
-@scribble-examples|==={
-  @foo{a @bar{b} c}
-}===|
-
-If the nested @"@" construct has only a command---no body or datum
-parts---it will not appear in a subform.  Given that the command part
-can be any Racket expression, this makes @"@" a general escape to
-arbitrary Racket code.
-
-@scribble-examples|==={
-  @foo{a @bar c}
-  @foo{a @(bar 2) c}
-}===|
-
-This is particularly useful with strings, which can be used to include
-arbitrary text.
-
-@scribble-examples|==={
-  @foo{A @"}" marks the end}
-}===|
-
-Note that the escaped string is (intentionally) merged with the rest
-of the text.  This works for @litchar["@"] too:
-
-@scribble-examples|==={
-  @foo{The prefix: @"@".}
-  @foo{@"@x{y}" --> (x "y")}
-}===|
-
-@;--------------------------------------------------------------------
-@subsection[#:tag "alt-body-syntax"]{Alternative Body Syntax}
-
-In addition to the above, there is an alternative syntax for the body,
-one that specifies a new marker for its end: use @litchar["|{"] for
-the opening marker to have the text terminated by a @litchar["}|"].
-
-@scribble-examples|==={
-  @foo|{...}|
-  @foo|{"}" follows "{"}|
-  @foo|{Nesting |{is}| ok}|
-}===|
-
-This applies to sub-@tech{@"@"-forms} too---the @litchar["@"] must be
-prefixed with a @litchar{|}:
-
-@scribble-examples|==={
-  @foo|{Maze
-        |@bar{is}
-        Life!}|
-  @t|{In |@i|{sub|@"@"s}| too}|
-}===|
-
-Note that the subform uses its own delimiters, @litchar{{...}} or
-@litchar{|{...}|}.  This means that you can copy and paste Scribble
-text with @tech{@"@"-forms} freely, just prefix the @litchar["@"] if the
-immediate surrounding text has a prefix.
-
-For even better control, you can add characters in the opening
-delimiter, between the @litchar{|} and the @litchar["{"].
-Characters that are put there (non alphanumeric ASCII characters only,
-excluding @litchar["{"] and @litchar["@"]) should also be used for
-sub-@tech{@"@"-forms}, and the end-of-body marker should have these characters
-in reverse order with paren-like characters (@litchar{(},
-@litchar{[}, @litchar{<}) mirrored.
-
-@scribble-examples|==={
-  @foo|<<<{@x{foo} |@{bar}|.}>>>|
-  @foo|!!{X |!!@b{Y}...}!!|
-}===|
-
-Finally, remember that you can use an expression escape with a Racket
-string for confusing situations.  This works well when you only need
-to quote short pieces, and the above works well when you have larger
-multi-line body texts.
-
-@;--------------------------------------------------------------------
-@subsection{Racket Expression Escapes}
-
-In some cases, you may want to use a Racket identifier (or a number or
-a boolean etc.) in a position that touches the following text; in
-these situations you should surround the escaped Racket expression by
-a pair of @litchar{|} characters.  The text inside the bars is
-parsed as a Racket expression.
-
-@scribble-examples|==={
-  @foo{foo@bar.}
-  @foo{foo@|bar|.}
-  @foo{foo@3.}
-  @foo{foo@|3|.}
-}===|
-
-This form is a generic Racket expression escape, there is no body text
-or datum part when you use this form.
-
-@scribble-examples|==={
-  @foo{foo@|(f 1)|{bar}}
-  @foo{foo@|bar|[1]{baz}}
-}===|
-
-This works for string expressions too, but note that unlike the above,
-the string is (intentionally) not merged with the rest of the text:
-
-@scribble-examples|==={
-  @foo{x@"y"z}
-  @foo{x@|"y"|z}
-}===|
-
-Expression escapes also work with @italic{any} number of expressions,
-
-@scribble-examples|==={
-  @foo{x@|1 (+ 2 3) 4|y}
-  @foo{x@|*
-          *|y}
-}===|
-
-It seems that @litchar["@||"] has no purpose---but remember that these escapes
-are never merged with the surrounding text, which can be useful when
-you want to control the sub expressions in the form.
-
-@scribble-examples|==={
-  @foo{Alice@||Bob@|
-       |Carol}
-}===|
-
-Note that @litchar["@|{...}|"] can be parsed as either an escape expression or
-as the Racket command part of an @tech{@"@"-form}.  The latter is used in this case
-(since there is little point in Racket code that uses braces.
-
-@scribble-examples|==={
-  @|{blah}|
-}===|
-
-@;--------------------------------------------------------------------
-@subsection{Comments}
-
-As noted above, there are two kinds of Scribble comments: @litchar|{@;{...}}| is
-a (nestable) comment for a whole body of text (following the same
-rules for @tech{@"@"-forms}), and @litchar|{@;...}| is a line-comment.
-
-@scribble-examples|==={
-  @foo{First line@;{there is still a
-                    newline here;}
-       Second line}
-}===|
-
-One useful property of line-comments is that they continue to the end
-of the line @italic{and} all following spaces (or tabs).  Using this,
-you can get further control of the subforms.
-
-@scribble-examples|==={
-  @foo{A long @;
-       single-@;
-       string arg.}
-}===|
-
-Note how this is different from using @litchar["@||"]s in that strings
-around it are not merged.
-
-@;--------------------------------------------------------------------
-@subsection{Spaces, Newlines, and Indentation}
-
-The Scribble syntax treats spaces and newlines in a special way is
-meant to be sensible for dealing with text.  As mentioned above,
-spaces at the beginning and end of body lines are discarded, except
-for spaces between a @litchar["{"] and text, or between text and a
-@litchar["}"].
-
-@scribble-examples|==={
-  @foo{bar}
-  @foo{ bar }
-  @foo{ bar
-       baz }
-}===|
-
-A single newline that follows an open brace or precedes a closing
-brace is discarded, unless there are only newlines in the body; other
-newlines are read as a @racket["\n"] string
-
-@scribble-examples|==={
-  @foo{bar
-  }
-  @foo{
-    bar
-  }
-  @foo{
-
-    bar
-
-  }
-  @foo{
-    bar
-
-    baz
-  }
-  @foo{
-  }
-  @foo{
-
-  }
-  @foo{ bar
-       baz }
-}===|
-
-Spaces at the beginning of body lines do not appear in the resulting
-S-expressions, but the column of each line is noticed, and all-space
-indentation strings are added so the result has the same indentation.
-A indentation string is added to each line according to its distance
-from the leftmost syntax object (except for empty lines).  (Note: if
-you try these examples on a Racket REPL, you should be aware that
-the reader does not know about the ``@litchar{> }'' prompt.)
-
-@scribble-examples|==={
-  @foo{
-    bar
-    baz
-    blah
-  }
-  @foo{
-    begin
-      x++;
-    end}
-  @foo{
-      a
-     b
-    c}
-}===|
-
-If the first string came from the opening @litchar["{"] line, it is
-not prepended with an indentation (but it can affect the leftmost
-syntax object used for indentation).  This makes sense when formatting
-structured code as well as text (see the last example in the following
-block).
-
-@scribble-examples|==={
-  @foo{bar
-         baz
-       bbb}
-  @foo{ bar
-          baz
-        bbb}
-  @foo{bar
-     baz
-     bbb}
-  @foo{ bar
-     baz
-     bbb}
-  @foo{ bar
-     baz
-       bbb}
-  @text{Some @b{bold
-    text}, and
-    more text.}
-}===|
-
-Note that each @"@"-form is parsed to an S-expression that has its own
-indentation.  This means that Scribble source can be indented like
-code, but if indentation matters then you may need to apply
-indentation of the outer item to all lines of the inner one.  For
-example, in
-
-@litchar/lines|==={
-  @code{
-    begin
-      i = 1, r = 1
-      @bold{while i < n do
-              r *= i++
-            done}
-    end
-  }
-}===|
-
-a formatter will need to apply the 2-space indentation to the
-rendering of the @racket[bold] body.
-
-Note that to get a first-line text to be counted as a leftmost line,
-line and column accounting should be on for the input port
-(@racket[use-at-readtable] turns them on for the current input port).
-Without this,
-
-@litchar/lines|==={
-  @foo{x1
-         x2
-         x3}
-}===|
-
-will not have 2-space indentations in the parsed S-expression if
-source accounting is not on, but
-
-@litchar/lines|==={
-  @foo{x1
-         x2
-       x3}
-}===|
-
-will (due to the last line).  Pay attention to this, as it can be a
-problem with Racket code, for example:
-
-@litchar/lines|==={
-  @code{(define (foo x)
-          (+ x 1))}
-}===|
-
-For rare situations where spaces at the beginning (or end) of lines
-matter, you can begin (or end) a line with a @litchar["@||"].
-
-@scribble-examples|==={
-  @foo{
-    @|| bar @||
-    @|| baz}
-}===|
-
-@; --------------------------------------------------
-@(close-eval read-eval)
-
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/renderer.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/renderer.scrbl
deleted file mode 100644
index 71e29c901a..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/renderer.scrbl
+++ /dev/null
@@ -1,451 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual 
-          "utils.rkt" 
-          (for-label racket/class
-                     scribble/render
-                     scribble/xref))
-
-@(define-syntax-rule (defmodule/local lib . content)
-   (begin
-     (define-syntax-rule (intro)
-       (begin
-         (require (for-label lib))
-         (defmodule lib)
-         . content))
-     (intro)))
-
-@(begin
-  (define-syntax-rule (def-html-render-mixin id mid)
-    (begin
-      (require (for-label scribble/html-render))
-      (define id @racket[render-mixin])
-      (define mid @racket[render-multi-mixin])))
-  (def-html-render-mixin html:render-mixin html:render-multi-mixin))
-@(begin
-  (define-syntax-rule (def-latex-render-mixin id)
-    (begin
-      (require (for-label scribble/latex-render))
-      (define id @racket[render-mixin])))
-  (def-latex-render-mixin latex:render-mixin))
-
-@title[#:tag "renderer"]{Renderers}
-
-A renderer is an object that provides four main methods:
-@racket[traverse], @racket[collect], @racket[resolve], and
-@racketidfont{render}. Each method corresponds to a pass described in
-@secref["core"], and they are chained together by the @racket[render]
-function to render a document.
-
-@section{Rendering Driver}
-
-@defmodule[scribble/render]
-
-@defproc[(render [docs (listof part?)]
-                 [names (listof path-string?)]
-                 [#:render-mixin render-mixin (class? . -> . class?) @#,html:render-mixin]
-                 [#:dest-dir dest-dir (or/c #f path-string?) #f]
-                 [#:helper-file-prefix helper-file-prefix (or/c #f string?) #f]
-                 [#:prefix-file prefix-file (or/c #f path-string?) #f]
-                 [#:style-file style-file (or/c #f path-string?) #f]
-                 [#:style-extra-files style-extra-files (listof path-string?) #f]
-                 [#:extra-files extra-files (listof path-string?) #f]
-                 [#:image-preferences image-preferences (listof (or/c 'ps 'pdf 'png 'svg 'gif)) null]
-                 [#:xrefs xrefs (listof xref?) null]
-                 [#:info-in-files info-in-files (listof path-string?) null]
-                 [#:info-out-file info-out-file (or/c #f path-string?) #f]
-                 [#:redirect redirect (or/c #f string?) #f]
-                 [#:redirect-main redirect-main (or/c #f string?) #f]
-                 [#:directory-depth directory-depth exact-nonnegative-integer? 0]
-                 [#:quiet? quiet? any/c #t]
-                 [#:warn-undefined? warn-undefined? any/c (not quiet?)])
-          void?]{
-
-Renders the given @racket[docs], each with an output name derived from
-the corresponding element of @racket[names]. A directory path (if any)
-for a name in @racket[names] is discarded, and the file suffix is
-replaced (if any) with a suitable suffix for the output format.
-
-The @racket[render-mixin] argument determines the output format. By
-default, it is @html:render-mixin from @racketmodname[scribble/html-render].
-
-The @racket[dest-dir] argument determines the output directory, which
-is created using @racket[make-directory*] if it is non-@racket[#f] and
-does not exist already.
-
-The @racket[helper-file-prefix], @racket[prefix-file],
-@racket[style-file], @racket[style-extra-files], and
-@racket[extra-files] arguments are passed on to the @racket[render%]
-constructor.
-
-The @racket[image-preferences] argument specified preferred formats
-for image files and conversion, where formats listed earlier in the
-list are more preferred. The renderer specified by
-@racket[render-mixin] may not support all of the formats listed in
-@racket[image-preferences].
-
-The @racket[xrefs] argument provides extra cross-reference information
-to be used during the documents' @tech{resolve pass}. The
-@racket[info-in-files] arguments supply additional cross-reference
-information in serialized form. When the @racket[info-out-file]
-argument is not @racket[#f], cross-reference information for the
-rendered documents is written in serialized for to the specified file.
-
-The @racket[redirect] and @racket[redirect-main] arguments correspond
-to the @racket[set-external-tag-path] and
-@racket[set-external-root-url] methods of @|html:render-mixin| from
-@racketmodname[scribble/html-render], so they should be
-non-@racket[#f] only for HTML rendering.
-
-The @racket[directory-depth] arguments correspond to the
-@racket[set-directory-depth] method of @|html:render-multi-mixin|.
-
-If @racket[quiet?] is a false value, output-file information is
-written to the current output port.
-
-If @racket[warn-undefined?] is a true value, then references to
-missing cross-reference targets trigger a warning message on the
-current error port.
-
-@history[#:changed "1.4" @elem{Added the @racket[#:image-preferences] argument.}]}
-
-
-@section{Base Renderer}
-
-@defmodule[scribble/base-render]{The
-@racketmodname[scribble/base-render] module provides @racket[render%],
-which implements the core of a renderer. This rendering class must be
-refined with a mixin from @racketmodname[scribble/text-render],
-@racketmodname[scribble/markdown-render], or
-@racketmodname[scribble/html-render], or
-@racketmodname[scribble/latex-render].}
-
-The mixin structure is meant to support document-specific extensions
-to the renderers. For example, the @exec{scribble} command-line tool
-might, in the future, extract rendering mixins from a document module
-(in addition to the document proper).
-
-See the @filepath{base-render.rkt} source for more information about
-the methods of the renderer. Documents built with higher layers, such
-as @racketmodname[scribble/manual], generally do not call the render
-object's methods directly.
-
-@definterface[render<%> ()]{
-
-@defmethod[(traverse [srcs (listof part?)]
-                     [dests (listof path-string?)])
-           (and/c hash? immutable?)]{
-
-Performs the @techlink{traverse pass}, producing a hash table that
-contains the replacements for and @racket[traverse-block]s and
-@racket[traverse-elements]s. See @method[render<%> render] for
-information on the @racket[dests] argument.}
-
-@defmethod[(collect [srcs (listof part?)]
-                    [dests (listof path-string?)]
-                    [fp (and/c hash? immutable?)]
-                    [demand (tag? collect-info? . -> . any/c) (lambda (_tag _ci) #f)])
-           collect-info?]{
-
-Performs the @techlink{collect pass}. See @method[render<%> render] for
-information on the @racket[dests] arguments. The @racket[fp] argument
-is a result from the @method[render<%> traverse] method.
-
-The @racket[demand] argument supplies external tag mappings on demand.
-When the @racket[collect-info] result is later used to find a mapping
-for a tag and no mapping is already available, @racket[demand] is
-called with the tag and the @racket[collect-info]. The @racket[demand]
-function returns true to indicate when it adds information to the
-@racket[collect-info] so that the lookup should be tried again; the
-@racket[demand] function should return @racket[#f] if it does not
-extend @racket[collect-info].}
-
-@defmethod[(resolve [srcs (listof part?)]
-                    [dests (listof path-string?)]
-                    [ci collect-info?])
-           resolve-info?]{
-
-Performs the @techlink{resolve pass}. See @method[render<%> render] for
-information on the @racket[dests] argument.  The @racket[ci] argument
-is a result from the @method[render<%> collect] method.}
-
-@defmethod[(render [srcs (listof part?)]
-                   [dests (listof path-string?)]
-                   [ri resolve-info?])
-           void?]{
-
-Produces the final output.  The @racket[ri] argument is a result from
-the @method[render<%> render] method.
-
-The @racket[dests] provide names of files for Latex or single-file
-HTML output, or names of sub-directories for multi-file HTML output.
-If the @racket[dests] are relative, they're relative to the current
-directory; normally, they should indicates a path within the
-@racket[_dest-dir] supplied on initialization of the @racket[render%]
-object.}
-
-
-@defmethod[(serialize-info [ri resolve-info?])
-           any/c]{
-
-Serializes the collected info in @racket[ri].}
-
-
-@defmethod[(serialize-infos [ri resolve-info?] 
-                            [count exact-positive-integer?] 
-                            [doc part?])
-           list?]{
-
-Like @method[render<%> serialize-info], but produces @racket[count] results
-that together have the same information as produced by
-@method[render<%> serialize-info]. The structure of @racket[doc] is used to
-drive the partitioning (on the assumption that @racket[ri] is derived
-from @racket[doc]).}
-
-
-@defmethod[(deserialize-info [v any/c]
-                             [ci collect-info?]
-                             [#:root root-path (or/c path-string? false/c) #f])
-           void?]{
-
-Adds the deserialized form of @racket[v] to @racket[ci].
-
-If @racket[root-path] is not @racket[#f], then file paths that are
-recorded in @racket[ci] as relative to an instantiation-supplied
-@racket[root-path] are deserialized as relative instead to the given
-@racket[root-path].}
-
-
-@defmethod[(get-defined [ci collect-info?]) (listof tag?)]{
-
-Returns a list of tags that were defined within the documents
-represented by @racket[ci].}
-
-
-@defmethod[(get-defineds [ci collect-info?] 
-                         [count exact-positive-integer?] 
-                         [doc part?])
-           (listof (listof tag?))]{
-
-Analogous to @method[render<%> serialize-infos]: returns a list of
-tags for each of @racket[count] partitions of the result of
-@method[render<%> get-defined], using the structure of @racket[doc] to
-drive the partitioning.}
-
-
-@defmethod[(get-external [ri resolve-info?]) (listof tag?)]{
-
-Returns a list of tags that were referenced but not defined within the
-documents represented by @racket[ri] (though possibly found in
-cross-reference information transferred to @racket[ri] via
-@racket[xref-transfer-info]).}
-
-
-@defmethod[(get-undefined [ri resolve-info?]) (listof tag?)]{
-
-Returns a list of tags that were referenced by the resolved documents
-with no target found either in the resolved documents represented by
-@racket[ri] or cross-reference information transferred to @racket[ri]
-via @racket[xref-transfer-info].
-
-If multiple tags were referenced via @racket[resolve-search] and a
-target was found for any of the tags using the same dependency key,
-then no tag in the set is included in the list of undefined tags.}
-
-}
-
-@defclass[render% object% (render<%>)]{
-
-Represents a renderer.
-
-@defconstructor[([dest-dir path-string?]
-                 [refer-to-existing-files any/c #f]
-                 [root-path (or/c path-string? #f) #f]
-                 [prefix-file (or/c path-string? #f) #f]
-                 [style-file (or/c path-string? #f) #f]
-                 [style-extra-files (listof path-string?) null]
-                 [extra-files (listof path-string?) null]
-                 [image-preferences (listof (or/c 'ps 'pdf 'png 'svg 'gif)) null])]{
-
-Creates a renderer whose output will go to @racket[dest-dir]. For
-example, @racket[dest-dir] could name the directory containing the
-output Latex file, the HTML file for a single-file output, or the
-output sub-directory for multi-file HTML output.
-
-If @racket[refer-to-existing-files] is true, then when a document
-refers to external files, such as an image or a style file, then the
-file is referenced from its source location instead of copied to the
-document destination.
-
-If @racket[root-path] is not @racket[#f], it is normally the same as
-@racket[dest-dir] or a parent of @racket[dest-dir]. It causes
-cross-reference information to record destination files relative to
-@racket[root-path]; when cross-reference information is serialized, it
-can be deserialized via @method[render<%> deserialize-info] with a
-different root path (indicating that the destination files have
-moved).
-
-The @racket[prefix-file], @racket[style-file], and
-@racket[style-extra-files] arguments set files that control output
-styles in a formal-specific way; see @secref["config-style"] for more
-information.
-
-The @racket[extra-files] argument names files to be copied to the
-output location, such as image files or extra configuration files.
-
-The @racket[image-preferences] argument specified preferred formats
-for image files and conversion, where formats listed earlier in the
-list are more preferred. The renderer may not support all of the
-formats listed in @racket[image-preferences].
-
-@history[#:changed "1.4" @elem{Added the @racket[image-preferences]
-                               initialization argument.}]}}
-
-@; ----------------------------------------
-
-@section{Text Renderer}
-
-@defmodule/local[scribble/text-render]{
-
-@defmixin[render-mixin (render<%>) ()]{
-
-Specializes a @racket[render<%>] class for generating plain text.}}
-
-@; ----------------------------------------
-
-@section{Markdown Renderer}
-
-@defmodule/local[scribble/markdown-render]{
-
-@defmixin[render-mixin (render<%>) ()]{
-
-Specializes a @racket[render<%>] class for generating Markdown text.
-
-Code blocks are marked using the
-@hyperlink["http://github.github.com/github-flavored-markdown/"
-"Github convention"] @verbatim{```racket} so that they are lexed and
-formatted as Racket code.}}
-
-@; ----------------------------------------
-
-@section{HTML Renderer}
-
-@defmodule/local[scribble/html-render]{
-
-@defmixin[render-mixin (render<%>) ()]{
-
-Specializes a @racket[render<%>] class for generating HTML output.
-
-@defmethod[(set-external-tag-path [url string?]) void?]{
-
-Configures the renderer to redirect links to external documents via
-@racket[url], adding a @tt{tag} query element to the end of the
-URL that contains the Base64-encoded, @racket[print]ed, serialized
-original tag (in the sense of @racket[link-element]) for the link.
-
-If the link is based on a cross-reference entry that has a
-document-identifying string (see @racket[load-xref] and its
-@racket[#:doc-id] argument), the document identifier is added as a
-@tt{doc} query element, and a path to the target within the
-document is added as a @tt{rel} query element.}
-
-@defmethod[(set-external-root-url [url string?]) void?]{
-
-Configures the renderer to redirect links to documents installed in
-the distribution's documentation directory to the given URL, using the
-URL as a replacement to the path of the distribution's document
-directory.}
-
-}
-
-@defmixin[render-multi-mixin (render<%>) ()]{
-
-Further specializes a rendering class produced by
-@racket[render-mixin] for generating multiple HTML
-files.
-
-@defmethod[(set-directory-depth [depth exact-nonnegative-integer?]) void?]{
-
-Sets the depth of directory structure used when rendering parts that
-are own their own pages. A value of @racket[0] is treated the same as
-@racket[1].}
-
-}
-
-}
-
-@; ----------------------------------------
-
-@section{Latex Renderer}
-
-@defmodule/local[scribble/latex-render]{
-
-@defmixin[render-mixin (render<%>) ()]{
-
-Specializes a @racket[render<%>] class for generating Latex input.}}
-
-@; ----------------------------------------
-
-@section{PDF Renderer}
-
-@defmodule/local[scribble/pdf-render]{
-
-@defmixin[render-mixin (render<%>) ()]{
-
-Specializes a @racket[render<%>] class for generating PDF output via
-Latex, building on @|latex:render-mixin| from @racketmodname[scribble/latex-render].}}
-
-@; ----------------------------------------
-
-@section{Contract (Blue boxes) Renderer}
-
-@defmodule/local[scribble/contract-render]{
-
-@defmixin[override-render-mixin-multi (render<%>) ()]{
-
-Overrides the @method[render<%> render] method of 
-given renderer to record the content of the 
-blue boxes (generated by @racket[defproc], @racket[defform], etc)
-that appear in the document. 
-   
-@defmethod[#:mode override
-                  (render [srcs (listof part?)]
-                          [dests (listof path?)]
-                          [ri render-info?])
-                  void?]{
-In addition to doing whatever the @racket[super] method
-does, also save the content of the blue boxes (rendered
-via a @racketmodname[scribble/text-render] renderer).
-   
-It saves this information in three pieces in a file
-inside the @racket[dests] directories called
-@filepath{blueboxes.rktd}. The first piece is
-a single line containing a (decimal, ASCII) number. That number
-is the number of bytes that the second piece of information
-occupies in the file. The second piece of information
-is a @racket[hash] that maps @racket[tag?] values to
-a list of offsets and line numbers that follow the hash table.
-For example, if the @racket[hash] maps
-@racket['(def ((lib "x/main.rkt") abcdef))] to
-@racket['((10 . 3))], then that means that the documentation
-for the @racket[abcdef] export from the @racket[x] collection
-starts 10 bytes after the end of the hash table and continues for
-@racket[3] lines. Multiple elements in the list mean that that
-@racket[tag?] has multiple blue boxes and each shows where one
-of the boxes appears in the file.
-}}
- 
-@defmixin[override-render-mixin-single (render<%>) ()]{
-
-Just like @racket[override-render-mixin-multi], except
-it saves the resulting files in a different place.
-
-@defmethod[#:mode override
-                  (render [srcs (listof part?)]
-                          [dests (listof path?)]
-                          [ri render-info?])
-                  void?]{
-  Just like @method[override-render-mixin-multi render], except
-  that it saves the file @filepath{blueboxes.rktd} in
-  the same directory where each @racket[dests] element resides.
-}}
-}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/report.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/report.scrbl
deleted file mode 100644
index a7b8c98bcc..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/report.scrbl
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt")
-
-@title{Report Format}
-
-@defmodulelang[scribble/report]{The @racketmodname[scribble/report]
-language is like @racketmodname[scribble/book], but configured with
-Latex style defaults to use the standard @tt{report} class.}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/running.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/running.scrbl
deleted file mode 100644
index df95d135cb..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/running.scrbl
+++ /dev/null
@@ -1,212 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt"
-          scribble/bnf
-          (for-label setup/xref))
-
-@(define fn (italic "fn"))
-
-@title[#:tag "running"]{Running @exec{scribble}}
-
-The @exec{scribble} command-line tool (also available as @as-index{@exec{raco
-scribble}}) runs a Scribble document and renders it to a specific
-format. Select a format with one of the following flags, where the
-output name @|fn| is by default the document source name without
-its file suffix:
-
-@itemlist[
-
- @item{@DFlag{html} --- a single HTML page @filepath{@|fn|.html},
-       plus CSS sources and needed image files; this mode is the
-       default if no format is specified}
-
- @item{@DFlag{htmls} --- multiple HTML pages (and associated files) in
-       a @filepath{@|fn|} directory, starting with
-       @filepath{@|fn|/index.html}}
-
- @item{@DFlag{html-tree} @nonterm{n} --- HTML pages in a directory
-       tree up to @nonterm{n} layers deep; a tree of depth @exec{0} is
-       equivalent to using @DFlag{html}, and a tree of depth @exec{1}
-       is equivalent to using @DFlag{htmls}}
-
- @item{@DFlag{latex} --- LaTeX source @filepath{@|fn|.tex}, plus
-       any needed additional files (such as non-standard class files)
-       needed to run @exec{latex} or @exec{pdflatex}}
-
- @item{@DFlag{pdf} --- PDF @filepath{@|fn|.pdf} that is generated
-       via @exec{pdflatex}}
-
- @item{@DFlag{dvipdf} --- PDF @filepath{@|fn|.pdf} that is generated
-       via @exec{latex}, @exec{dvips}, and @exec{pstopdf}}
-
- @item{@DFlag{latex-section} @nonterm{n} --- LaTeX source
-       @filepath{@|fn|.tex} plus additional @filepath{.tex} files to
-       be included in the enclosing document's preamble, where the
-       enclosing document must use the UTF-8 input encoding and T1
-       font encoding; use @tt{1} for @nonterm{n} to make the rendered
-       document a section, @tt{2} for a subsection, etc.}
-
- @item{@DFlag{text} --- plain text in a single file
-       @filepath{@|fn|.txt}, with non-ASCII content encoded as UTF-8}
-
- @item{@DFlag{markdown} --- Markdown text in a single file
-       @filepath{@|fn|.md}, with non-ASCII content encoded as UTF-8}
-
-]
-
-Use @DFlag{dest-name} to specify a @|fn| other than the default name,
-but only when a single source file is provided. Use the @DFlag{dest}
-flag to specify a destination directory (for any number of source
-files). Use @DFlag{dest-base} to add a prefix to the name of each
-support file that is generated or copied to the destination.
-
-After all flags, provide one or more document sources, where each
-source declares a module. The module should either have a @racket[doc]
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{submodule}
-that exports @racket[doc] as a @racket[part], or it should directly
-export @racket[doc] as a @racket[part]. (The submodule is tried first,
-and the main module is not directly loaded or evaluated if the
-submodule can be loaded on its own.)
-
-When multiple documents are rendered at the same time, cross-reference
-information in one document is visible to the other documents. See
-@secref["xref-flags"] for information on references that cross
-documents that are built separately.
-
-@history[#:changed "1.4" @elem{Added @DFlag{dvipdf}.}]
-
-@section{Extra and Format-Specific Files}
-
-Use the @DFlag{style} flag to specify a format-specific file to adjust
-the output style file for certain formats. For HTML (single-page or
-multi-page) output, the style file should be a CSS file that is
-applied after all other CSS files, and that may therefore override
-some style properties. For Latex (or PDF) output, the style file
-should be a @filepath{.tex} file that can redefine Latex commands.
-When a particular Scribble function needs particular CSS or Latex
-support, however, a better option is to use a @racket[css-addition] or
-@racket[tex-addition] style property so that the support is included
-automatically; see @secref["config"] for more information.
-
-In rare cases, use the @DFlag{style} flag to specify a format-specific
-base style file. For HTML (single-page or multi-page) output, the
-style file should be a CSS file to substitute for
-@filepath{scribble.css} in the @filepath{scribble} collection. For
-Latex (or PDF) output, the style file should be a @filepath{.tex} file
-to substitute for @filepath{scribble.tex} in the @filepath{scribble}
-collection. The @DFlag{style} flag is rarely useful, because the
-content of @filepath{scribble.css} or @filepath{scribble.tex} is
-weakly specified; replacements must define all of the same styles, and
-the set of styles can change across versions of Racket.
-
-Use @DFlag{prefix} to specify an alternate format-specific start of
-the output file. For HTML output, the starting file specifies the
-@tt{DOCTYPE} declaration of each output HTML file as a substitute for
-@filepath{scribble-prefix.html} in the @filepath{scribble}
-collection. For Latex (or PDF) output (but not Latex-section output), the starting file specifies
-the @ltx{documentclass} declaration and initial @ltx{usepackage}
-declarations as a substitute for @filepath{scribble-prefix.tex} in the
-@filepath{scribble} collection. See also @racket[html-defaults],
-@racket[latex-defaults], and @secref["config"].
-
-For any output form, use the @DPFlag{extra} flag to add a needed file
-to the build destination, such as an image file that is referenced in
-the generated output but not included via @racket[image] (which copies
-the file automatically).
-
-@section[#:tag "xref-flags"]{Handling Cross-References}
-
-Cross references within a document or documents rendered together are
-always resolved. When cross references span documents that are
-rendered separately, cross-reference information needs to be saved and
-loaded explicitly. Cross-reference information is format-specific, but
-HTML-format information is usable for Latex (or PDF) or text rendering.
-
-A Racket installation includes HTML-format cross-reference information
-for all installed documentation. Each document's information is in a
-separate file, so that loading all relevant files would be tedious.
-The @PFlag{m} or @DPFlag{main-xref-in} flag loads cross-reference
-information for all installed documentation, so
-
-@commandline{scribble +m mine.scrbl}
-
-renders @filepath{mine.scrbl} to @filepath{mine.html} with
-cross-reference links to the Racket installation's documentation.
-(The @filepath{racket-index} package must be installed to use
-@PFlag{m}/@DPFlag{main-xref-in}.)
-
-The @DPFlag{xref-in} flag loads cross-reference information by calling
-a specified module's function. The @racketmodname[setup/xref] module
-provides @racket[load-collections-xref] to load cross-reference
-information for all installed documentation, and @PFlag{m} or
-@DPFlag{main-xref-in} is just a shorthand for @exec{++xref-in
-setup/xref load-collections-xref}.
-
-The @DFlag{redirect-main} flag for HTML output redirects links to the local
-installation's documentation to a given URL, such as
-@tt{http://docs.racket-lang.org/}. Beware that documentation links
-sometimes change (although Scribble generates HTML paths and anchors
-in a relatively stable way), so
-@tt{http://download.racket-lang.org/docs/@italic{version}/html/} may be
-more reliable when building with an installation for @italic{version}.
-The @DFlag{redirect-main} flag is ignored for non-HTML output.
-
-The @DFlag{redirect} flag is like @DFlag{redirect-main}, except
-that it builds on the given URL to indicate a cross-reference tag that
-is more stable than an HTML path and anchor (in case the documentation
-for a function changes sections, for example). No server currently
-exists to serve such tag requests, however.
-
-For cross-references among documentation that is not part of the
-Racket installation, use @DFlag{info-out} to save information from a
-document build and use @DPFlag{info-in} to load previously saved
-information. For example, if @filepath{c.scrbl} refers to information
-in @filepath{a.scrbl} and @filepath{b.scrbl}, then
-
-@commandline{scribble --info-out a.sxref a.scrbl}
-@commandline{scribble --info-out b.sxref b.scrbl}
-@commandline{scribble ++info-in a.sxref ++info-in b.sxref c.scrbl}
-
-builds @filepath{c.html} with cross-reference links into
-@filepath{a.html} and @filepath{b.html}.
-
-
-@section{Selecting an Image Format}
-
-Use the @DPFlag{convert} @nonterm{fmt} flag to select @nonterm{fmt} as
-a preferred image format to use when rendering a document that
-includes values that can be converted to different image formats. The
-@nonterm{fmt} argument can be @exec{pdf}, @exec{ps}, @exec{png},
-@exec{svg}, or @exec{gif}, but a renderer typically supports only a
-subset of those formats.
-
-Use @DPFlag{convert} @nonterm{fmt} multiple times to specify multiple
-preferred formats, where a @nonterm{fmt} earlier in the command line
-take precedence over @nonterm{fmt}s specified later.
-
-For example, to generate Latex sources with images in Encapsulated
-PostScript format (so that the result works with @exec{latex} instead
-of @exec{pdflatex}), combine @DFlag{latex} with @exec{@DPFlag{convert}
-ps}. To generate HTML pages with images converted to SVG format
-instead of PNG format, combine @DFlag{html} with
-@exec{@DPFlag{convert} svg}.
-
-@history[#:changed "1.4" @elem{Added @DPFlag{convert} support.}]
-
-@section{Passing Command-Line Arguments to Documents}
-
-When @exec{scribble} loads and renders a document module, by default
-it sets @racket[current-command-line-arguments] to an empty vector.
-Use the @DPFlag{arg} flag (any number of times) to add a string to
-@racket[current-command-line-arguments].
-
-For example,
-
-@commandline{scribble ++arg --mode ++arg fast turtle.scrbl}
-
-causes @racket[(current-command-line-arguments)] to return
-@racket['#("--mode" "fast")] while @filepath{turtle.scrbl} is loaded
-and rendered, which could affect the content that
-@filepath{turtle.scrbl} generates if it uses
-@racket[current-command-line-arguments].
-
-@history[#:changed "1.1" @elem{Added the empty-vector default and @DPFlag{arg} flag.}]
\ No newline at end of file
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scheme.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scheme.scrbl
deleted file mode 100644
index 3e295363de..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scheme.scrbl
+++ /dev/null
@@ -1,223 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual "utils.rkt" (for-label scribble/racket))
-
-@title[#:tag "scheme"]{Racket}
-
-@defmodule*[(scribble/racket scribble/scheme)]{The
-@racket[scribble/racket] library (or @racketmodname[scribble/scheme]
-for backward compatibility) provides utilities for typesetting Racket
-code. The @racket[scribble/manual] forms provide a higher-level
-interface.}
-
-@defform*[[(define-code id typeset-expr)
-           (define-code id typeset-expr uncode-id)
-           (define-code id typeset-expr uncode-id d->s-expr)
-           (define-code id typeset-expr uncode-id d->s-expr stx-prop-expr)]]{
-
-Binds @racket[id] to a form similar to @racket[racket] or
-@racket[racketblock] for typesetting code. The form generated by
-@racket[define-code] handles source-location information, escapes via
-@racket[unquote] by default, preserves binding and property information,
-and supports @tech{element transformers}.
-
-The supplied @racket[typeset-expr] expression should produce a
-procedure that performs the actual typesetting. This expression is
-normally @racket[to-element] or @racket[to-paragraph]. The argument
-supplied to @racket[typeset-expr] is normally a syntax object, but
-more generally it is the result of applying @racket[d->s-expr].
-
-The optional @racket[uncode-id] specifies the default escape from
-literal code to be recognized by @racket[id], and the default for
-@racket[uncode-id] is @racket[unsyntax]. A use of the @racket[id] form
-can specify an alternate escape via @racket[#:escape], as in
-@racket[racketblock] and @racket[racket].
-
-The optional @racket[d->s-expr] should produce a procedure that
-accepts three arguments suitable for @racket[datum->syntax]: a syntax
-object or @racket[#f], an arbitrary value, and a vector for a source
-location. The result should record as much or as little of the
-argument information as needed by @racket[typeset-expr] to typeset the
-code. Normally, @racket[d->s-expr] is @racket[datum->syntax].
-
-The @racket[stx-prop-expr] should produce a procedure for recording a
-@racket['paren-shape] property when the source expression uses with
-@racket[id] has such a property. The default is
-@racket[syntax-property].}
-
-@defproc[(to-paragraph [v any/c] 
-                       [#:expr? expr? any/c #f] 
-                       [#:escapes? escapes? any/c #t]
-                       [#:color? color? any/c #t]
-                       [#:wrap-elem wrap-elem (element? . -> . element?) (lambda (e) e)])
-         block?]{
-
-Typesets an S-expression that is represented by a syntax object, where
-source-location information in the syntax object controls the
-generated layout. When source-location information is not available,
-default spacing is used (in the same single-line style as
-@racket[to-element]).
-
-Identifiers that have @racket[for-label] bindings are typeset and
-hyperlinked based on definitions declared elsewhere (via
-@racket[defproc], @racket[defform], etc.). Unless @racket[escapes?]
-is @racket[#f], the identifiers
-@racketidfont{code:line}, @racketidfont{code:comment},
-@racketidfont{code:blank}, @racketidfont{code:hilite}, and
-@racketidfont{code:quote} are handled as in @racket[racketblock], as
-are identifiers that start with @litchar{_}.
-
-In addition, the given @racket[v] can contain @racket[var-id],
-@racket[shaped-parens], @racket[just-context], or
-@racket[literal-syntax] structures to be typeset specially (see each
-structure type for details), or it can contain @racket[element]
-structures that are used directly in the output.
-
-If @racket[expr?] is true, then @racket[v] is rendered in expression
-style, much like @racket[print] with the @racket[print-as-expression]
-parameter set to @racket[#t]. In that case, @racket[for-label]
-bindings on identifiers are ignored, since the identifiers are all
-quoted in the output. Typically, @racket[expr?] is set to true for
-printing result values.
-
-If @racket[color?] is @racket[#f], then the output is typeset without
-coloring.
-
-The @racket[wrap-elem] procedure is applied to each element
-constructed for the resulting block. When combined with @racket[#f]
-for @racket[color?], for example, the @racket[wrap-elem] procedure can
-be used to give a style to an element.}
-
-
-@defproc[((to-paragraph/prefix [prefix1 any/c] [prefix any/c] [suffix any/c])
-          [v any/c] [#:expr? expr? any/c #f] [#:escapes? escapes? any/c #t]
-          [#:color? color? any/c #f]
-          [#:wrap-elem wrap-elem (element? . -> . element?) (lambda (e) e)])
-          block?]{
-
-Like @racket[to-paragraph], but @racket[prefix1] is prefixed onto the
-first line, @racket[prefix] is prefix to any subsequent line, and
-@racket[suffix] is added to the end. The @racket[prefix1],
-@racket[prefix], and @racket[suffix] arguments are used as
-@tech{content}, except that if @racket[suffix] is a list of elements,
-it is added to the end on its own line.}
-
-
-@defproc[(to-element [v any/c]
-                     [#:expr? expr? any/c #f]
-                     [#:escapes? escapes? any/c #t]
-                     [#:defn? defn? any/c #f]) element?]{
-
-Like @racket[to-paragraph], except that source-location information is
-mostly ignored, since the result is meant to be inlined into a
-paragraph. If @racket[defn?] is true, then an identifier is styled as
-a definition site.}
-
-@defproc[(to-element/no-color [v any/c]
-                              [#:expr? expr? any/c #f]
-                              [#:escapes? escapes? any/c #t]) 
-         element?]{
-
-Like @racket[to-element], but @racket[for-syntax] bindings are
-ignored, and the generated text is uncolored. This variant is
-typically used to typeset results.}
-
-
-@defstruct[var-id ([sym (or/c symbol? identifier?)])]{
-
-When @racket[to-paragraph] and variants encounter a @racket[var-id]
-structure, it is typeset as @racket[sym] in the variable font, like
-@racket[racketvarfont]---unless the @racket[var-id] appears under
-quote or quasiquote, in which case @racket[sym] is typeset as a symbol.}
-
-
-@defstruct[shaped-parens ([val any/c]
-                          [shape char?])]{
-
-When @racket[to-paragraph] and variants encounter a
-@racket[shaped-parens] structure, it is typeset like a syntax object
-that has a @racket['paren-shape] property with value @racket[shape].}
-
-
-@defstruct[long-boolean ([val boolean?])]{
-
-When @racket[to-paragraph] and variants encounter a
-@racket[long-boolean] structure, it is typeset as @racket[#true] or @racket[#false],
-as opposed to @racket[#t] or @racket[#f].}
-
-
-@defstruct[just-context ([val any/c]
-                         [context syntax?])]{
-
-When @racket[to-paragraph] and variants encounter a
-@racket[just-context] structure, it is typeset using the
-source-location information of @racket[val] just the lexical context
-of @racket[ctx].}
-
-
-@defstruct[literal-syntax ([stx any/c])]{
-
-When @racket[to-paragraph] and variants encounter a
-@racket[literal-syntax] structure, it is typeset as the string form of
-@racket[stx]. This can be used to typeset a syntax-object value in the
-way that the default printer would represent the value.}
-
-
-@defproc[(element-id-transformer? [v any/c]) boolean?]{
-
-Provided @racket[for-syntax]; returns @racket[#t] if @racket[v] is an
-@tech{element transformer} created by
-@racket[make-element-id-transformer], @racket[#f] otherwise.}
-
-
-@defproc[(make-element-id-transformer [proc (syntax? . -> . syntax?)])
-         element-id-transformer?]{
-
-Provided @racket[for-syntax]; creates an @deftech{element
-transformer}.  When an identifier has a transformer binding to an
-@tech{element transformer}, then forms generated by
-@racket[define-code] (including @racket[racket] and
-@racket[racketblock]) typeset the identifier by applying the
-@racket[proc] to the identifier. The result must be an expression
-whose value, typically an @racket[element], is passed on to functions
-like @racket[to-paragraph] .}
-
-@defproc[(variable-id? [v any/c]) boolean?]{
-
-Provided @racket[for-syntax]; returns @racket[#t] if @racket[v] is an
-@tech{element transformer} created by @racket[make-variable-id],
-@racket[#f] otherwise.}
-
-
-@defproc[(make-variable-id [sym (or/c symbol? identifier?)])
-         variable-id?]{
-
-Provided @racket[for-syntax]; like @racket[make-element-id-transformer] for
-a transformer that produces @racket[sym] typeset as a variable (like
-@racket[racketvarfont])---unless it appears under quote or quasiquote,
-in which case @racket[sym] is typeset as a symbol.}
-
-@deftogether[(
-@defthing[output-color style?]
-@defthing[input-color style?]
-@defthing[input-background-color style?]
-@defthing[no-color style?]
-@defthing[reader-color style?]
-@defthing[result-color style?]
-@defthing[keyword-color style?]
-@defthing[comment-color style?]
-@defthing[paren-color style?]
-@defthing[meta-color style?]
-@defthing[value-color style?]
-@defthing[symbol-color style?]
-@defthing[variable-color style?]
-@defthing[opt-color style?]
-@defthing[error-color style?]
-@defthing[syntax-link-color style?]
-@defthing[value-link-color style?]
-@defthing[module-color style?]
-@defthing[module-link-color style?]
-@defthing[block-color style?]
-@defthing[highlighted-color style?]
-)]{
-
-Styles that are used for coloring Racket programs, results, and I/O.}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble-pp.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble-pp.scrbl
deleted file mode 100644
index 7cde8eec03..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble-pp.scrbl
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt")
-
-@title{Scribble as Preprocessor}
-
-@author["Matthew Flatt" "Eli Barzilay"]
-
-@section-index["Preprocessor"]
-
-The @racketmodname[scribble/text] and @racketmodname[scribble/html]
-languages act as ``preprocessor'' languages for generating text or
-HTML. These preprocessor languages use the same @"@" syntax as the
-main Scribble tool (see @other-doc['(lib
-"scribblings/scribble/scribble.scrbl")]), but instead of working in
-terms of a document abstraction that can be rendered to text and HTML
-(and other formats), the preprocessor languages work in a way that is
-more specific to the target formats.
-
-@table-of-contents[]
-
-@; ------------------------------------------------------------------------
-
-@include-section["text.scrbl"]
-@include-section["html.scrbl"]
-
-@index-section[]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble.scrbl
deleted file mode 100644
index b23116db8f..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble.scrbl
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt")
-
-@title{Scribble: The Racket Documentation Tool}
-
-@author["Matthew Flatt" "Eli Barzilay"]
-
-Scribble is a collection of tools for creating prose
-documents---papers, books, library documentation, etc.---in HTML or
-PDF (via Latex) form. More generally, Scribble helps you write
-programs that are rich in textual content, whether the content is
-prose to be typeset or any other form of text to be generated
-programmatically.
-
-This document is itself written using Scribble. You can see its source
-at
-@(let ([url "http://git.racket-lang.org/plt/tree/HEAD:/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble"])
-   (link url url)),
-starting with the @filepath{scribble.scrbl} file.
-
-@table-of-contents[]
-
-@; ------------------------------------------------------------------------
-@include-section["how-to-paper.scrbl"]
-@include-section["reader.scrbl"]
-@include-section["generic.scrbl"]
-@include-section["plt.scrbl"]
-@include-section["lp.scrbl"]
-@include-section["internals.scrbl"]
-@include-section["running.scrbl"]
-
-@index-section[]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.css b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.css
deleted file mode 100644
index 8b13789179..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.css
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.tex b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.tex
deleted file mode 100644
index c7002ea47d..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-
-\newcommand{\Short}[1]{\begin{minipage}[c]{6ex}#1\end{minipage}}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/sigplan.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/sigplan.scrbl
deleted file mode 100644
index 677a6465ba..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/sigplan.scrbl
+++ /dev/null
@@ -1,139 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt" (for-label scribble/sigplan))
-
-@title{SIGPLAN Paper Format}
-
-@defmodulelang[scribble/sigplan]{The @racketmodname[scribble/sigplan]
-language is like @racketmodname[scribble/base], but configured with
-Latex style defaults to use the @filepath{sigplanconf.cls} class
-file that is included with Scribble.}
-
-@defidform[preprint]{
-
-Enables the @tt{preprint} option. Use @racket[preprint] only on the
-same line as @hash-lang[], with only whitespace (or other options) between
-@racketmodname[scribble/sigplan] and @racket[preprint]:
-
-@verbatim[#:indent 2]|{
-  #lang scribble/sigplan @preprint
-}|}
-
-@defidform[10pt]{
-
-Enables the @tt{10pt} option. Use @racket[10pt] only on the
-same line as @hash-lang[], with only whitespace (or other options) between
-@racketmodname[scribble/sigplan] and @racket[10pt]:
-
-@verbatim[#:indent 2]|{
-  #lang scribble/sigplan @10pt
-}|
-
-@defidform[nocopyright]{
-
-Enables the @tt{nocopyright} option. Use @racket[nocopyright] only on the
-same line as @hash-lang[], with only whitespace (or other options) between
-@racketmodname[scribble/sigplan] and @racket[nocopyright]:
-
-@verbatim[#:indent 2]|{
-  #lang scribble/sigplan @nocopyright
-}|}
-
-@defidform[onecolumn]{
-
-Enables the @tt{onecolumn} option. Use @racket[onecolumn] only on the
-same line as @hash-lang[], with only whitespace (or other options) between
-@racketmodname[scribble/sigplan] and @racket[onecolumn]:
-
-@codeblock|{
-  #lang scribble/sigplan @onecolumn
-}|}
-
-
-@defidform[notimes]{
-
-Disables the use of @tt{\usepackage@"{"times@"}"} in the generated LaTeX output.
-Use @racket[onecolumn] only on the
-same line as @hash-lang[], with only whitespace (or other options) between
-@racketmodname[scribble/sigplan] and @racket[notimes]:
-
-@codeblock|{
-  #lang scribble/sigplan @notimes
-}|}
-
-@defidform[noqcourier]{
-
-Disables the use of @tt{\usepackage@"{"qcourier@"}"} in the generated LaTeX output.
-Use @racket[onecolumn] only on the
-same line as @hash-lang[], with only whitespace (or other options) between
-@racketmodname[scribble/sigplan] and @racket[noqcourier]:
-
-@codeblock|{
-  #lang scribble/sigplan @noqcourier
-}|}
-
-The @racket[10pt], @racket[preprint], @racket[nocopyright], 
-@racket[onecolumn], @racket[notimes], and @racket[noqcourier]
-options can be used together and may appear in any order.  
-}
-
-
-@defproc[(abstract [pre-content pre-content?] ...) block?]{
-
-Generates a @tech{nested flow} for a paper abstract.}
-
-@defform[(include-abstract module-path)]{
-
-Similar to @racket[include-section], but incorporates the document in the
-specified module as an abstract. The document must have no title or
-sub-parts.}
-
-@defproc[(subtitle [pre-content pre-content?] ...) element?]{
-
-Use as the last argument to @racket[title] to specify a subtitle.}
-
-@defproc[(authorinfo [name pre-content?]
-                     [affiliation pre-content?]
-                     [email pre-content?])
-         block?]{
-
-A replacement for @racket[author] that associates an affiliation and
-e-mail address with the author name.}
-
-@deftogether[(
-@defproc[(conferenceinfo [conference pre-content?] [location pre-content?]) block?]
-@defproc[(copyrightyear [content pre-content?] ...) block?]
-@defproc[(copyrightdata [content pre-content?] ...) block?]
-@defproc[(doi [content pre-content?] ...) block?]
-@defproc[(exclusive-license) block?]
-)]{
-
-Declares information that is collected into the copyright region of the paper.}
-
-
-@deftogether[(
-@defproc[(category [CR-number pre-content?] 
-                   [subcategory pre-content?]
-                   [third-level pre-content?]
-                   [fourth-level (or/c #f pre-content?) #f]) content?]
-@defproc[(terms [content pre-content?] ...) content?]
-@defproc[(keywords [content pre-content?] ...) content?]
-)]{
-
-Typesets category, term, and keyword information for the paper, which
-is normally placed immediately after an @racket[abstract] form.
-See also @url["http://www.acm.org/about/class/how-to-use"].
-
-For @racket[category], the @racket[subcategory] argument should be in
-titlecase (i.e., capitalize the first letter of each word) and a
-phrase at the level of ``Programming Languages'' or ``Software
-Engineering'' (as opposed to a category like ``Software'' or a
-third-level name like ``Concurrent Programming'' or ``Processors''). A
-@racket[third-level] phrase should be in titlecase.  A
-@racket[fourth-level] phrase, if any, should not be capitalized.
-
-For @racket[terms], each general term should be in titlecase. Terms
-are usually drawn from a fixed list, and they are usually optional.
-
-For @racket[keywords], capitalize only the first letter of the first
-word, separate phrases by commas, and do not include ``and'' before
-the last one. Keywords should be noun phrases, not adjectives.}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/srcdoc.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/srcdoc.scrbl
deleted file mode 100644
index 1e24a5d9d6..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/srcdoc.scrbl
+++ /dev/null
@@ -1,258 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual "utils.rkt"
-          (for-label scribble/srcdoc scribble/extract racket/contract))
-
-@title[#:tag "srcdoc"]{In-Source Documentation}
-
-The @racketmodname[scribble/srcdoc] and
-@racketmodname[scribble/extract] libraries support writing
-documentation within the documented code along with an export
-contract, similar to using @as-index{JavaDoc}. With this approach, a
-single contract specification is used both for the run-time contract
-and the documentation of an exported binding.
-
-The @racketmodname[scribble/srcdoc] library provides forms for
-exporting a binding with associated documentation. The
-@racket[scribble/extract] library is used to pull
-@racket[scribble/srcdoc]-based documentation into a Scribble document
-(perhaps for multiple libraries).
-
-Although documentation is written with a library's implementation when
-using @racketmodname[scribble/srcdoc], the documentation creates no
-run-time overhead for the library. Similarly, typesetting the
-documentation does not require running the library. The two phases
-(run time versus documentation time) are kept separate in much the
-same way that the module system keeps expansion-time code separate
-from run-time code, and documentation information is recorded in a
-submodule to be separately loadable from the enclosing module.
-
-For an example use, see the @filepath{file} collection's
-@filepath{gif.rkt} source file and the corresponding extraction in
-@filepath{scribblings/gif.scrbl}. As that example illustrates,
-starting the module declaration with
-
-@racketblock[
-  @#,hash-lang[] @#,racketmodname[at-exp]
-]
-
-enables the @"@"-reader, which is handy for writing documentation
-expressions.
-
-@; ----------------------------------------
-
-@section{Source Annotations for Documentation}
-
-@defmodule[scribble/srcdoc]
-
-Documentation information generated by @racketmodname[scribble/srcdoc]
-forms are accumulated into a @racketidfont{srcdoc} submodule. The
-generated submodule is accessed by the bindings of
-@racketmodname[scribble/extract].
-
-@defform[(for-doc require-spec ...)]{
-
-A @racket[require] sub-form for bindings that are needed at
-documentation time (and documentation-expansion time, etc.) instead of
-run time (and expansion time, etc.). A @racket[for-doc] import has
-no effect on a normal use of the library; it affects only
-documentation extraction.
-
-Typically, a library that uses @racketmodname[scribble/srcdoc]
-includes at least @racket[(require (for-doc scribble/base scribble/manual))]
-to get core Racket forms and basic Scribble functions to use in
-documentation expressions.}
-
-@defform*/subs[#:literals (-> ->* case->)
-               [(proc-doc/names id contract arg-specs (desc-expr ...))]
-               ([arg-specs ((arg-id ...) ((arg-id default-expr) ...))
-                           (arg-id ...)]
-                [contract (-> arg ... result)
-                          (->* (mandatory ...) (optional ...) result)
-                          (case-> (-> arg ... result) ...)]
-                [mandatory contract-expr
-                           (code:line keyword contract-expr)]
-                [optional contract-expr
-                          (code:line keyword contract-expr)])]{
-
-A @racket[provide] sub-form that exports @racket[id] with the
-contract described by @racket[contract]
-just like using @racket[contract-out].
-
-The @racket[arg-spec] specifies the names of arguments and the 
-default values, which are not
-normally written as part of a contract. They are combined with the
-contract expression to generate the description of the binding in the
-documentation via @racket[defproc]. The @racket[(arg-id default-expr)]
-pairs specify the names and default values of the optional arguments.
-If the contract supports optional arguments, then the first
-@racket[arg-spec]s form must be used, otherwise the second must be used.
-
-The @racket[desc-expr] is a sequence of documentation-time expressions that
-produces prose to describe the exported binding---that is, the last
-part of the generated @racket[defproc], so the description can refer
-to the @racket[arg-id]s using @racket[racket].
-
-The normal @racket[require]s of the enclosing library are effectively
-converted into @racket[for-label] @racket[require]s when generating
-documentation, so that identifiers in the @racket[contract]s are
-linked to their corresponding documentation. Similarly, any binding
-that is available in the run-time phase of the enclosing library
-can be referenced in documentation prose using the @racket[racket]
-form.}
-
-@defform/subs[#:literals (-> ->i ->d values)
-              (proc-doc id contract maybe-defs (desc-expr ...))
-              ([contract (-> result)
-                         (->i (arg ...) (opt ...) maybe-pre [id res])
-                         (->i (arg ...) (opt ...) maybe-pre (values [id res] ...))
-                         (->i (arg ...) (opt ...) #:rest rest [id result-expr])
-
-                         (->d (arg ...) () maybe-pre (values [id result] ...))
-                         (->d (arg ...) () maybe-pre [id result])
-                         (->d (arg ...) () #:rest id rest [id result])]
-               [maybe-pre (code:line)
-                          (code:line #:pre (pre-id ...) condition)]
-               [maybe-defs (code:line)
-                           (default-expr default-expr ...)])]{
-
-Like @racket[proc-doc/names], but supporting contract forms that embed
-argument identifiers. Only a subset of @racket[->i] and @racket[->d] forms are
-currently supported.
-
-If the sequence of optional arguments, @racket[(opt ...)] is empty then
-the @racket[maybe-arg-desc] must be not be present. If it is non-empty,
-then it must have as many default expressions are there are optional
-arguments.
-}
-
-
-@defform[(thing-doc id contract-expr (desc-expr ...))]{
-
-Like @racket[proc-doc], but for an export of an arbitrary value.}
-
-
-@defform[#:literals (parameter/c)
-         (parameter-doc id (parameter/c contract-expr) arg-id (desc-expr ...))]{
-
-Like @racket[proc-doc], but for exporting a parameter.}
-
-@defform[(struct*-doc struct-name 
-                      ([field-name contract-expr-datum] ...)
-                      maybe-omit-constructor
-                      maybe-mutable maybe-non-opaque maybe-constructor
-                      (desc-expr ...))
-         #:grammar ([maybe-omit-constructor (code:line) #:omit-constructor])]{
-  Like @racket[proc-doc], but for struct declarations that use @racket[struct].
-  
-  The @racket[maybe-mutable], @racket[maybe-non-opaque], and @racket[maybe-constructor]
-  options are as in @racket[defstruct].
-}
-
-@defform[(struct-doc struct-name 
-                     ([field-name contract-expr-datum] ...) 
-                     maybe-omit-constructor
-                     maybe-mutable maybe-non-opaque maybe-constructor
-                     (desc-expr ...))]{
-  Like @racket[struct*-doc], but for struct declarations that use @racket[define-struct].
-}
-
-
-@defform/subs[(form-doc options form-datum
-                maybe-grammar maybe-contracts
-                (desc-expr ...))
-              ([options (code:line maybe-kind maybe-link maybe-id maybe-literals)]
-               [maybe-kind code:blank
-                           (code:line #:kind kind-string-expr)]
-               [maybe-link code:blank
-                           (code:line #:link-target? link-target?-expr)]
-               [maybe-id code:blank
-                         (code:line #:id id)
-                         (code:line #:id [id id-expr])]
-               [maybe-literals code:blank
-                               (code:line #:literals (literal-id ...))]
-               [maybe-grammar code:blank
-                              (code:line #:grammar ([nonterm-id clause-datum ...+] ...))]
-               [maybe-contracts code:blank
-                                (code:line #:contracts ([subform-datum contract-expr-datum]
-                                                        ...))])]{
-
-Like @racket[proc-doc], but for an export of a syntactic form. If
-@racket[#:id] is provided, then @racket[id] is the exported identifier,
-otherwise the exported identifier is extracted from @racket[form-datum].
-
-See @racket[defform] for information on @racket[options],
-@racket[form-datum], @racket[maybe-grammar], and
-@racket[maybe-contracts].
-
-@history[#:added "1.6"]}
-
-
-@defform[(begin-for-doc form ...)]{
-
-Like to @racket[begin-for-syntax], but for documentation time instead
-of expansion time. The @racket[form]s can refer to binding
-@racket[require]d with @racket[for-doc].
-
-For example, a definition in @racket[begin-for-doc]
-can be referenced by a @racket[_desc-expr] in
-@racket[proc-doc/names].}
-
-
-@defform[(generate-delayed-documents)]{
-
-Causes documentation information to be recorded as a macro that is
-expanded (along with any @racket[for-doc] imports) in the
-module that uses @racket[include-extracted] or @racket[provide-extracted],
-instead of within (a submodule of) the module that declares the information.
-
-Delaying document generation in this way allows @racket[(for-doc
-(for-label ....))]  imports that would otherwise create cyclic module
-dependencies.
-
-To avoid problems with accumulated @racket[for-doc] imports across
-modules, @racket[generate-delayed-documents] declaration should appear
-before any @racket[for-doc] import.}
-
-
-@defform[(require/doc require-spec ...)]{
-
-A legacy shorthand for @racket[(require (for-doc require-spec ...))].}
-
-
-@defform[(provide/doc spec ...)]{
-
-A legacy alternative to @racket[(provide spec ...)]}
-
-@; ----------------------------------------
-
-@section{Extracting Documentation from Source}
-
-@defmodule[scribble/extract]
-
-@defform[(include-extracted module-path)]{
-
-Expands to a sequence of documentation forms extracted from
-@racket[module-path], which is expected to be a module that uses
-@racketmodname[scribble/srcdoc] (so that the module has a
-@racketidfont{srcdoc} submodule).}
-
-@defform[(provide-extracted module-path)]{
-
-Similar to @racket[include-extracted], but the documentation is
-packaged and exported as @racket[exported], instead of left
-inline.
-
-Use this form in combination with
-@racket[include-previously-extracted] when documentation from a single
-source is to be split and typeset among multiple documentation
-locations. The @racket[provide-extracted] form extracts the
-documentation once, and then @racket[include-previously-extracted]
-form extracts documentation for specific bindings as needed.}
-
-@defform[(include-previously-extracted module-path regexp)]{
-
-Similar to @racket[include-extracted], but instead of referring to the
-source that contains its own documentation, @racket[module-path]
-refers to a module that uses @racket[provide-extracted]. The
-@racket[include-previously-extracted] form expands to documentation
-forms for all identifiers whose string forms match @racket[regexp].}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct-hierarchy.rkt b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct-hierarchy.rkt
deleted file mode 100644
index 06bebd3d83..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct-hierarchy.rkt
+++ /dev/null
@@ -1,393 +0,0 @@
-#lang racket/base
-
-(require "class-diagrams.rkt"
-         (only-in pict pin-arrow-line)
-         texpict/mrpict
-         (except-in texpict/utils pin-arrow-line)
-         racket/system
-         racket/class
-         racket/draw)
-
-(define (mk-ps-diagram)
-  ;; thicken up the lines for postscript
-  (linewidth .8 (mk-diagram)))
-
-(provide mk-diagram)
-
-(define (mk-diagram)
-  
-  (define part-name (class-name "part" #:spacing-word "subparts"))
-  (define part-blocks-field (field-spec #f "blocks"))
-  (define part-subparts-field (field-spec #f "subparts"))
-  (define part-title-field (field-spec #f "title"))
-  (define part-box (class-box part-name (list part-title-field part-blocks-field part-subparts-field) #f))
-  
-  (define block-name (class-name "block"))
-  (define block-box (class-box block-name #f #f))
-  
-  (define para-name (class-name "paragraph"))
-  (define para-style (field-spec #f "style"))
-  (define para-content (field-spec #f "content"))
-  (define para-box (class-box para-name (list para-style para-content) #f))
-  
-  (define compound-para-name (class-name "compound-\nparagraph"))
-  (define compound-para-style (field-spec #f "style"))
-  (define compound-para-blocks (field-spec #f "blocks"))
-  (define compound-para-box (class-box compound-para-name (list compound-para-style compound-para-blocks) #f))
-  
-  (define table-name (class-name "table"))
-  (define table-style (field-spec #f "style"))
-  (define table-cells (field-spec #f "cells")) ;; blockss
-  (define table-box (class-box table-name (list table-style table-cells) #f))
-  
-  (define itemization-name (class-name "itemization"))
-  (define itemization-style (field-spec #f "style"))
-  (define itemization-items (field-spec #f "items")) ;; blockss
-  (define itemization-box (class-box itemization-name (list itemization-style itemization-items) #f))
-  
-  (define nested-flow-name (class-name "nested-\nflow"))
-  (define nested-flow-style (field-spec #f "style"))
-  (define nested-flow-blocks (field-spec #f "blocks"))
-  (define nested-flow-box (class-box nested-flow-name (list nested-flow-style nested-flow-blocks) #f))
-  
-  (define delayed-block-name (class-name "delayed-block"))
-  (define delayed-block-block (field-spec #f "block"))
-  (define delayed-block-box (class-box delayed-block-name (list delayed-block-block) #f))
-  
-  (define traverse-block-name (class-name "traverse-\nblock"))
-  (define traverse-block-block (field-spec #f "block"))
-  (define traverse-block-box (class-box traverse-block-name (list traverse-block-block) #f))
-  
-  (define content-name (class-name "content"))
-  (define content-box (class-box content-name #f #f))
-  
-  (define string-name (class-name "string"))
-  (define string-box (class-box string-name #f #f))
-
-  (define symbol-name (class-name "symbol"))
-  (define symbol-box (class-box symbol-name #f #f))
-
-  (define pict-name (class-name "pict"))
-  (define pict-box (class-box pict-name #f #f))
-
-  (define convertible-name (class-name "convertible"))
-  (define convertible-box (class-box convertible-name #f #f))
-  
-  (define list-name (class-name "list"))
-  (define list-box (class-box list-name #f #f))
-  
-  (define delayed-element-name (class-name "delayed-\nelement"))
-  (define delayed-element-content (field-spec #f "content"))
-  (define delayed-element-box (class-box delayed-element-name (list delayed-element-content) #f))
-  
-  (define render-element-name (class-name "render-\nelement"))
-  (define render-element-content (field-spec #f "content"))
-  (define render-element-box (class-box render-element-name (list render-element-content) #f))
-  
-  (define traverse-element-name (class-name "traverse-\nelement"))
-  (define traverse-element-content (field-spec #f "content"))
-  (define traverse-element-box (class-box traverse-element-name (list traverse-element-content) #f))
-  
-  (define part-relative-element-name (class-name "part-\nrelative-\nelement"))
-  (define part-relative-element-resolve (field-spec #f "resolve"))
-  (define part-relative-element-box (class-box part-relative-element-name (list part-relative-element-resolve) #f))
-  
-  (define element-name (class-name "element"))
-  (define element-style (field-spec #f "style"))
-  (define element-content (field-spec #f "content"))
-  (define element-box (class-box element-name (list element-style element-content) #f))
-  
-  (define link-element-name (class-name "link-\nelement"))
-  (define link-tag (field-spec #f "tag"))
-  (define link-element-box (class-box link-element-name
-                                      (list link-tag)
-                                      #f))
-  
-  (define collect-element-name (class-name "collect-\nelement"))
-  (define collect-element-collect (field-spec #f "collect"))
-  (define collect-element-box (class-box collect-element-name (list collect-element-collect) #f))
-  
-  (define index-element-name (class-name "index-\nelement" #:spacing-word "keywords"))
-  (define index-element-tag (field-spec #f "tag"))
-  (define index-element-keywords (field-spec #f "keywords"))
-  (define index-element-box (class-box index-element-name
-                                       (list index-element-tag index-element-keywords)
-                                       #f))
-  
-  (define image-element-name (class-name "image-\nelement" #:spacing-word "suffixes"))
-  (define image-element-path (field-spec #f "path"))
-  (define image-element-suffixes (field-spec #f "suffixes"))
-  (define image-element-scale (field-spec #f "scale"))
-  (define image-element-box (class-box image-element-name 
-                                       (list image-element-path
-                                             image-element-suffixes
-                                             image-element-scale)
-                                       #f))
-  
-  (define multiarg-element-name (class-name "multiarg-\nelement"))
-  (define multiarg-element-tag (field-spec #f "tag"))
-  (define multiarg-element-box (class-box multiarg-element-name (list multiarg-element-tag) #f))
-
-  (define target-element-name (class-name "target-\nelement"))
-  (define target-tag (field-spec #f "tag"))
-  (define target-element-box (class-box target-element-name 
-                                        (list target-tag)
-                                        #f))
-
-  (define redirect-target-element-name (class-name "redirect-target-\nelement"))
-  (define redirect-target-alt-path (field-spec #f "alt-path"))
-  (define redirect-target-alt-anchor (field-spec #f "alt-anchor"))
-  (define redirect-target-element-box (class-box redirect-target-element-name 
-                                                 (list redirect-target-alt-path redirect-target-alt-anchor)
-                                                 #f))
-  
-  (define toc-target-element-name (class-name "toc-target-\nelement"))
-  (define toc-target-element-box (class-box toc-target-element-name (list) #f))
-  
-  (define page-target-element-name (class-name "page-target-\nelement"))
-  (define page-target-element-box (class-box page-target-element-name (list) #f))
-  
-  
-  (define block-hierarchy
-    (hierarchy
-     (vc-append block-box
-                (blank 0 50)
-                (ht-append 20 
-                           (ht-append 30
-                                      compound-para-box
-                                      para-box)
-                           (vc-append (blank 0 30) itemization-box)
-                           table-box)
-                (blank 0 25)
-                (ht-append nested-flow-box 
-                           (blank 120 0)
-                           (vc-append (blank 0 30) delayed-block-box)
-                           (blank 80 0)
-                           traverse-block-box))
-     (list block-box)
-     (list compound-para-box
-           para-box
-           nested-flow-box
-           itemization-box
-           table-box
-           delayed-block-box
-           traverse-block-box)))
-
-  (define target-element-hierarchy
-    (hierarchy
-     (vc-append target-element-box
-                (blank 0 50)
-                (ht-append 20 
-                           toc-target-element-box
-                           page-target-element-box
-                           redirect-target-element-box))
-     (list target-element-box)
-     (list toc-target-element-box
-           page-target-element-box
-           redirect-target-element-box)))
-  
-  (define element-hierarchy
-    (hierarchy
-     (vc-append element-box
-                (blank 0 50)
-                (inset (ht-append 20 
-                                  collect-element-box
-                                  multiarg-element-box
-                                  (refocus target-element-hierarchy target-element-box)
-                                  link-element-box
-                                  image-element-box
-                                  index-element-box)
-                       0 0 -400 0))
-     (list element-box)
-     (list collect-element-box
-           index-element-box
-           image-element-box
-           target-element-box
-           multiarg-element-box
-           link-element-box
-           )))
-
-    (define render-element-parent-link (blank))
-  (define delayed-element-parent-link (blank))
-  (define part-relative-element-parent-link (blank))
-  (define traverse-element-parent-link (blank))
-  (define element-parent-link (blank))
-  
-  (define (drop-and-link box parent-link i)
-    (vc-append
-     (blank 0 (+ 40 (* i 20)))
-     (refocus (ct-superimpose box parent-link)
-              parent-link)))
-  
-  (define content-hierarchy
-    (hierarchy
-     (vc-append content-box
-                (blank 0 50)
-                (ht-append 15
-                           (drop-and-link (refocus element-hierarchy element-box)
-                                          element-parent-link
-                                          4)
-                           convertible-box
-                           (drop-and-link render-element-box 
-                                          render-element-parent-link
-                                          4)
-                           pict-box
-                           (drop-and-link delayed-element-box
-                                          delayed-element-parent-link
-                                          3)
-                           symbol-box
-                           (drop-and-link part-relative-element-box
-                                          part-relative-element-parent-link
-                                          1)
-                           string-box
-                           (drop-and-link traverse-element-box
-                                          traverse-element-parent-link
-                                          0)
-                           list-box))
-     (list content-box)
-     (list element-box
-           string-box
-           symbol-box
-           convertible-box
-           pict-box
-           traverse-element-parent-link
-           part-relative-element-parent-link
-           delayed-element-parent-link
-           render-element-parent-link
-           list-box)))
-    
-  (define raw
-    (vc-append part-box
-               (blank 0 20)
-               (vc-append block-hierarchy
-                          (blank 0 20)
-                          content-hierarchy)))
-  
-  (define w/connections
-    (double
-     right-right-reference
-     (double
-      left-left-reference
-      (triple
-       right-right-reference
-       (triple
-        right-right-reference
-        (double
-         left-left-reference
-         (double
-          left-left-reference
-          (double
-           right-right-reference 
-           (double
-            left-left-reference 
-            (double
-             left-left-reference 
-             (left-left-reference 
-              raw
-              element-box element-content content-box content-name 1 #:dot-delta -1)
-             part-box part-title-field content-box content-name 21)
-            part-box part-blocks-field block-box block-name)
-           part-box part-subparts-field part-box part-name 2)
-          para-box para-content content-box content-name 2)
-         compound-para-box compound-para-blocks block-box block-name 3)
-        table-box table-cells block-box block-name 2)
-       itemization-box itemization-items block-box block-name 10)
-      nested-flow-box nested-flow-blocks block-box block-name 1)
-     list-box list-box content-box content-name))
-  
-  (define w/delayed-connections 
-    (dotted-right-right-reference
-     (dotted-right-right-reference
-      (dotted-right-right-reference
-       (dotted-right-right-reference
-        (dotted-right-right-reference
-         (dotted-right-right-reference
-          w/connections
-          render-element-box render-element-content content-box content-name 30)
-         traverse-block-box traverse-block-block block-box block-name 1)
-        delayed-block-box delayed-block-block block-box block-name 17)
-       traverse-element-box traverse-element-content content-box content-name 3)
-      delayed-element-box delayed-element-content content-box content-name 22)
-     part-relative-element-box part-relative-element-resolve content-box content-name 12))
-  
-  ;; one extra pixel on the right so we get the
-  ;; line drawn to the outermost turning point
-  (inset (panorama w/delayed-connections) 0 0 1 0))
-
-(define (double f p0 a b c d [count 1])
-  (let ([arrows1 (launder (f (ghost p0) a b c d count #:dot-delta 1))]
-        [arrows2 (launder (f (ghost p0) a b c d count #:dot-delta -1))])
-    (cc-superimpose p0
-                    arrows1
-                    arrows2)))
-
-(define (triple f p0 a b c d [count 1])
-  (let ([arrows (launder (f (ghost p0) a b c d count))]
-        [up-arrows (launder (f (ghost p0) a b c d count #:dot-delta 2))]
-        [down-arrows (launder (f (ghost p0) a b c d count #:dot-delta -2))])
-    (cc-superimpose p0
-                    arrows
-                    up-arrows
-                    down-arrows)))
-
-(define (connect-circly-dots show-arrowhead? main dot1 . dots)
-  (let loop ([prev-dot dot1]
-             [dots dots]
-             [pict main])
-    (cond
-      [(null? dots) pict]
-      [else 
-       (loop (car dots) 
-             (cdr dots)
-             (connect-two-circly-dots pict prev-dot (car dots) (null? (cdr dots))))])))  
-
-;; this is a hack -- it will only work with right-right-reference
-(define (connect-two-circly-dots pict dot1 dot2 arrowhead?)
-  (let ([base
-         (let*-values ([(sx sy) (cc-find pict dot1)]
-                       [(raw-ex ey) (cc-find pict dot2)]
-                       [(ex) (if arrowhead?
-                                 (+ raw-ex 2)
-                                 raw-ex)])
-           (cc-superimpose
-            (dc 
-             (λ (dc dx dy)
-               (let ([pen (send dc get-pen)])
-                 (send dc set-pen
-                       type-link-color ;(send pen get-color)
-                       (if (is-a? dc post-script-dc%)
-                           4
-                           2)
-                       'dot)
-                 (send dc draw-line 
-                       (+ dx sx) (+ dy sy)
-                       (+ dx ex) (+ dy ey))
-                 (send dc set-pen pen)))
-             (pict-width pict)
-             (pict-height pict))
-            pict))])
-  (if arrowhead?
-      (pin-arrow-line field-arrowhead-size
-                      base
-                      dot1 (λ (ignored1 ignored2)
-                             (let-values ([(x y) (cc-find pict dot2)])
-                               (values (+ x 2) y)))
-                      dot2 cc-find
-                      #:color type-link-color)
-      base)))
-
-(define (dotted-right-right-reference p0 a b c d [count 1])
-  (right-right-reference p0 a b c d count #:connect-dots connect-circly-dots))
-
-(module+ slideshow
-  (require slideshow)
-  (define p (inset (mk-diagram) 0 0 0 1))
-  (define c (blank client-w client-h))
-  (slide (lt-superimpose (t "top") (clip (refocus (ct-superimpose p c) c))))
-  (slide (lt-superimpose (t "bottom") (clip (refocus (cb-superimpose p c) c))))
-  (slide (lt-superimpose (t "all")
-                         (ct-superimpose 
-                          c
-                          (scale p
-                                 (min (/ client-w (pict-width p))
-                                      (/ client-h (pict-height p))))))))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct.scrbl
deleted file mode 100644
index c2301f8c2c..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct.scrbl
+++ /dev/null
@@ -1,280 +0,0 @@
-#lang scribble/manual
-@(require (except-in "utils.rkt"
-                     make-part make-paragraph make-table make-itemization make-compound-paragraph
-                     make-element make-toc-element make-target-element make-toc-target-element make-toc-target2-element
-                     make-page-target-element make-redirect-target-element make-link-element
-                     make-index-element
-                     make-target-url target-url struct:target-url target-url? target-url-addr
-                     toc-element-toc-content toc-target2-element-toc-content part-title-content paragraph-content 
-                     element? element-content element-style)
-          (for-label scribble/manual-struct
-                     scribble/struct
-                     setup/main-collects))
-
-@(define (compat) @italic{For backward compatibility.})
-@(define-syntax-rule (compat/comp id)
-   @elem{@compat[] Compared to the normal constructor for @racket[id]})
-
-@title[#:tag "struct"]{Compatibility Structures And Processing}
-
-@defmodule[scribble/struct]{
-The @racket[scribble/struct] compatibility library mostly re-exports
-@racket[scribble/core], but using some different names (e.g.,
-@racket[blockquote] instead of @racket[nested-flow]).}
-
-The following structure types and functions are re-exported directly:
-
-@racketblock[collect-info resolve-info tag? block?
-             delayed-block collected-info delayed-element ; delayed-element-content delayed-block-blocks current-serialize-resolve-info
-             part-relative-element collect-info-parents ; part-relative-element-content delayed-index-desc 
-             collect-element render-element generated-tag ; generate-tag current-tag-prefixes add-current-tag-prefix
-             tag-key content->string element->string ; strip-aux
-             block-width element-width
-             info-key? part-collected-info collect-put!
-             resolve-get resolve-get/tentative resolve-get/ext?
-             resolve-search resolve-get-keys]
-
-The following structure types are re-exported, but the constructors and some selectors
-are replaced as documented further below:
-
-@racketblock[part paragraph table itemization compound-paragraph
-             element toc-element target-element toc-target-element toc-target2-element
-             page-target-element redirect-target-element link-element
-             index-element]
-
-Several additional compatibility functions and structure types are
-also exported.
-
-@defproc[(make-part [tag-prefix (or/c false/c string?)]
-                    [tags (listof tag?)]
-                    [title-content (or/c false/c list?)]
-                    [style any/c]
-                    [to-collect list?]
-                    [blocks (listof block?)]
-                    [parts (listof part?)])
-         part?]{
-
-@compat/comp[part], parses @racket[style] to convert old formats to
-the current one. Also, if @racket[title-content] is a list with a
-single item, the item by itself is stored in the resulting
-@racket[part].}
-
-@defproc[(part-flow [p part?]) (listof block?)]{
-
-@compat[] An alias for @racket[part-blocks].}
-
-@defproc[(part-title-content [p part?]) list?]{
-
-@compat[] Like the normal selector, but if the result would not be a list, it is 
-coerced to one.}
-
-@deftogether[(
-@defproc[(make-versioned-part [tag-prefix (or/c false/c string?)]
-                               [tags (listof tag?)]
-                               [title-content (or/c false/c list?)]
-                               [style any/c]
-                               [to-collect list?]
-                               [blocks (listof block?)]
-                               [parts (listof part?)]
-                               [version string?])
-         part?]
-@defproc[(versioned-part? [v any/c]) boolean?]
-)]{
-
-@compat[] Like @racket[make-part], but adds a the
-@racket[document-version] @tech{style property} using the given
-@racket[version]. The @racket[versioned-part?] predicate recognizes a
-@racket[part] with a @racket[document-version] property.}
-
-@deftogether[(
-@defproc[(make-unnumbered-part [tag-prefix (or/c false/c string?)]
-                               [tags (listof tag?)]
-                               [title-content (or/c false/c list?)]
-                               [style any/c]
-                               [to-collect list?]
-                               [blocks (listof block?)]
-                               [parts (listof part?)])
-         part?]
-@defproc[(unnumbered-part? [v any/c]) boolean?]
-)]{
-
-@compat[] Like @racket[make-part], but adds the @racket['unnumbered]
-@tech{style property}. The @racket[unnumbered-part?] predicate
-recognizes a @racket[part] with the @racket['unnumbered] property.}
-
-
-@defproc[(make-paragraph [content list?]) paragraph?]{
-
-@compat/comp[paragraph], omits a style argument. Also, if
-@racket[content] is a list containing a single item, the item by
-itself is stored in the resulting @racket[paragraph].}
-
-@defproc[(paragraph-content [p paragraph?]) list?]{
-
-@compat[] Like the normal selector, but if the result would not be a list, it is 
-coerced to one.
-}
-
-
-@deftogether[(
-@defproc[(make-styled-paragraph [content list?] [style any/c]) paragraph?]
-@defproc[(styled-paragraph? [v any/c]) boolean?]
-@defproc[(styled-paragraph-style [p paragraph?]) style?]
-)]{
-
-@compat/comp[paragraph], parses @racket[style] to convert old formats
-to the current one. The @racket[styled-paragraph?] predicate and
-@racket[styled-paragraph-style] accessor are aliases for
-@racket[paragraph?] and @racket[paragraph-style].}
-
-
-@deftogether[(
-@defproc[(make-omitable-paragraph [content list?]) paragraph?]
-@defproc[(omitable-paragraph? [v any/c]) boolean?]
-)]{
-
-@compat[] Like @racket[make-paragraph], but adds the
-@racket['omitable] @tech{style property}. The
-@racket[omitable-paragraph?] predicate checks for a paragraph with the
-property.}
-
-
-@defproc[(make-table [style any/c]
-                     [blocksss (listof (listof (or/c (listof block?) (one-of/c 'cont))))])
-         table?]{
-
-@compat/comp[table], the style is converted, and each cell has a list
-of blocks instead of a single block. If any such list has multiple
-blocks, they are combined into a @racket[nested-flow].}
-
-@defproc[(table-flowss [table table?]) 
-         (listof (listof (or/c (listof block?) (one-of/c 'cont))))]{
-
-@compat[] Like @racket[table-blockss], but adds a list wrapper to be
-consistent with @racket[make-table].}
-
-@defproc[(make-itemization [blockss (listof (listof block?))]) itemization?]{
-
-@compat/comp[itemization], omits a style argument.}
-
-@deftogether[(
-@defproc[(make-styled-itemization [style any/c]
-                                  [blockss (listof (listof block?))]) itemization?]
-@defproc[(styled-itemization? [v any/c]) boolean?]
-@defproc[(styled-itemization-style [i itemization?]) style?]
-)]{
-
-@compat/comp[itemization], parses @racket[style] to convert old
-formats to the current one. The @racket[styled-itemization?] predicate
-is an alias for @racket[itemization?], and
-@racket[styled-itemization-style] is an alias for
-@racket[itemization-style].}
-
-@defproc[(make-blockquote [style any/c] [blocks (listof block?)])
-         nested-flow?]{
-
-@compat[] Like @racket[make-nested-flow], but @racket[style] is
-parsed to the current format.}
-
-
-@deftogether[(
-@defproc[(make-auxiliary-table [style any/c]
-                               [blocksss (listof (listof (or/c (listof block?) (one-of/c 'cont))))])
-         table?]
-@defproc[(auxiliary-table? [v any/c]) boolean?]
-)]{
-
-@compat[] Like @racket[make-table], but adds the @racket['aux]
-@tech{style property}.  The @racket[auxiliary-table?] predicate recognizes
-tables with the @racket['aux] property.}
-
-
-@defproc[(make-compound-paragraph [style any/c]
-                                  [blocks (listof block?)])
-         compound-paragraph?]{
-
-@compat/comp[compound-paragraph], parses @racket[style] to convert old
-formats to the current one.}
-
-@deftogether[(
-@defproc[(make-element [style any/c] [content list?]) element?]
-@defproc[(make-toc-element [style any/c] [content list?] [toc-content list?]) toc-element?]
-@defproc[(make-target-element [style any/c] [content list?] [tag tag?]) target-element?]
-@defproc[(make-toc-target-element [style any/c] [content list?] [tag tag?]) toc-target-element?]
-@defproc[(make-toc-target2-element [style any/c] [content list?] [tag tag?] [toc-content content?]) toc-target2-element?]
-@defproc[(make-page-target-element [style any/c] [content list?] [tag tag?]) page-target-element?]
-@defproc[(make-redirect-target-element [style any/c] [content list?] [tag tag?]
-                                       [alt-path path-string?] [alt-anchor string?]) redirect-target-element?]
-@defproc[(make-link-element [style any/c] [content list?] [tag tag?]) link-element?]
-@defproc[(make-index-element [style any/c] [content list?] [tag tag?]
-                             [plain-seq (and/c pair? (listof string?))]
-                             [entry-seq list?] [desc any/c]) index-element?]
-)]{
-
-@compat[] Compared to the normal constructors, parses @racket[style] to convert old
-formats to the current one.}
-
-
-@deftogether[(
-@defproc[(element? [v any/c]) boolean?]
-@defproc[(element-content [e element?]) list?]
-@defproc[(element-style [e element?]) element-style?]
-)]{
-
-@compat[] A @tech{content} list is treated as an element by these functions,
-and the result of @racket[element-content] is always a list.}
-
-
-@defproc[(make-aux-element [style any/c] [content list?]) element?]{
-
-@compat[] Like @racket[make-element], but adds the @racket['aux]
-@tech{style property}.}
-
-
-@defproc[(make-hover-element [style any/c] [content list?] [text string?]) element?]{
-
-@compat[] Like @racket[make-element], but adds @racket[hover-property]
-containing @racket[text] to the element's style.}
-
-
-@defproc[(make-script-element [style any/c] [content list?] [type string?]
-                              [script (or/c path-string? (listof string?))]) element?]{
-
-@compat[] Like @racket[make-element], but adds @racket[script-property]
-containing @racket[type] and @racket[script] to the element's style.}
-
-
-@defstruct[with-attributes ([style any/c]
-                            [assoc (listof (cons/c symbol? string?))])]{
-
-@compat[] Used for an @racket[element]'s style to combine a base style with
-arbitrary HTML attributes. When the @racket[style] field is itself an
-instance of @racket[with-attributes], its content is automatically
-flattened into the enclosing @racket[with-attributes] when it is used
-(when, e.g., rendering an @racket[element] or @racket[paragraph]).}
-
-
-@defstruct[target-url ([addr path-string?]
-                       [style any/c])]{
-
-@compat[] Used as a style for an @racket[element]. The @racket[style] at this
-layer is a style for the hyperlink.}
-
-
-@defstruct[image-file ([path (or/c path-string?
-                                   (cons/c 'collects (listof bytes?)))]
-                       [scale real?])]{
-
-@compat[] Used as a style for an @racket[element] to inline an image. The
-@racket[path] field can be a result of
-@racket[path->main-collects-relative].}
-
-
-
-
-@defproc*[([(element->string (element content?)) string?]
-           [(element->string (element content?) (renderer any/c) (p part?) (info resolve-info?)) string?])]{
-
-@compat[] An alias for @racket[content->string].
-
-}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/style.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/style.scrbl
deleted file mode 100644
index fc4e60b378..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/style.scrbl
+++ /dev/null
@@ -1,231 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual scribble/eval "utils.rkt"
-          (for-label scribble/manual scribble/eval))
-
-@title[#:tag "reference-style"]{Style Guide}
-
-Consistent style---for terms, typesetting, and prose---makes
-documentation clearer. As much as possible, follow the rules listed in
-this section. Many of the rules are arbitrary in the sense that a
-different choice of rule could work fine, but the only way to make our
-documentation consistent is to pick one of the choices.
-
-There are too many rules to absorb easily on a first reading. Re-read
-this section after writing documentation for a library or two, and
-revisit the section periodically to refresh your memory and check for
-new rules.
-
-@section{Prose and Terminology}
-
-In the descriptive body of @racket[defform], @racket[defproc], etc.,
-do not start with ``This ...'' Instead, start with a sentence whose
-implicit subject is the form or value being described (but only start
-the first sentence that way). Capitalize the first word. Thus, the
-description will often start with ``Returns'' or ``Produces.''  Refer
-to arguments and sub-forms by name.
-
-Do not use the word ``argument'' to describe a sub-form in a syntactic
-form; use the term ``sub-form'' instead, reserving ``argument'' for
-values or expressions in a function call.  Refer to libraries and
-languages as such, rather than as ``modules'' (even though the form to
-typeset a library or language name is called @racket[racketmodname]).
-Do not call an identifier (i.e., a syntactic element) a ``variable''
-or a ``symbol.'' Do not use the word ``expression'' for a form that is
-a definition or might be a definition; use the word ``form,'' instead.
-Prefer ``function'' to ``procedure.''
-
-Use the word ``list'' only when you mean a run-time value consisting
-of the empty list and cons cells; use the word ``sequence'' in other
-cases, if you must use any word. For example, do not write that
-@racket[begin] has a ``list of sub-forms;'' instead, it has a
-``sequence of sub-forms.'' Similarly, do not refer to a ``list of
-arguments'' in a function call; just write ``arguments'' if possible,
-or write ``sequence of argument expressions.''  (Unfortunately,
-``@tech[#:doc '(lib
-"scribblings/reference/reference.scrbl")]{sequence}'' has acquired a
-specific run-time meaning, too, but the collision is less severe than
-the historical confusion between lists and other entities in Lisp.)
-
-Avoid cut-and-paste for descriptive text. If two functions are
-similar, consider documenting them together with
-@racket[deftogether]. To abstract a description, consider using
-explicit prose abstraction, such as ``@racket[x] is like @racket[y],
-except that ...,'' instead of abstracting the source and instantiating
-it multiple times; often, a prose abstraction is clearer to the reader
-than a hidden abstraction in the document implementation.
-
-Hyphenate the words ``sub-form'' and ``sub-expression.''
-
-Use ``Windows,'' ``Mac OS X,'' and ``Unix'' for the three
-``platforms'' (as opposed to ``systems'') on which Racket runs. Use
-``Unix'' as a generic term for Unix-like operating systems---notably
-including Linux---other than Mac OS X. Use ``Unix'' even when ``Gtk''
-or ``the X11 windowing system'' would be more precisely correct, but
-use ``X11'' as adjective when necessary, such as ``X11 display.''
-Racket runs ``on'' a platform, as opposed to ``under'' a platform.
-
-
-@section{Typesetting Code}
-
-Use @racketidfont{id} or a name that ends @racketidfont{-id} in
-@racket[defform] to mean an identifier, not @racketidfont{identifier},
-@racketidfont{variable}, @racketidfont{name}, or
-@racketidfont{symbol}. Similarly, use @racketidfont{expr} or something
-that ends @racketidfont{-expr} for an expression position within a
-syntactic form. Use @racketidfont{body} for a form (definition or
-expression) in an internal-definition position---always followed by 
-@racket[...+] in a grammar description. Do not use
-@racketidfont{expr} for something that isn't exactly an expression,
-@racket[id] for something that isn't exactly an identifier, etc.;
-instead, use @racket[defform/subs] to define a new non-terminal.
-
-Beware of using @racket[deftogether] to define multiple variants of a
-syntactic form or procedure, because each @racket[defform] or
-@racket[defproc] creates a definition point, but each form or
-procedure should have a single definition point. (Scribble issues a
-warning when a binding has multiple definition points.) Instead, use
-@racket[defproc*] or @racket[defform*].
-
-For function arguments, use @racket[v] as the meta-variable for ``any
-value.'' Use @racket[x] as a meta-variable only for numerical
-values. Other conventions include @racket[lst] for a list and
-@racket[proc] for a procedure.
-
-Pay attention to the difference between identifiers and meta-variables
-when using @racket[racket], especially outside of @racket[defproc] or
-@racket[defform]. Prefix a meta-variable with @litchar{_}; for
-example,
-
-@verbatim[#:indent 2]|{@racket[(rator-expr rand-expr ...)]}|
-
-would be the wrong way to refer to the grammar of a function call,
-because it produces @racket[(rator-expr rand-expr ...)], where
-@racketidfont{rator-expr} and @racketidfont{rand-expr} are
-typeset as variables. The correct description is
-
-@verbatim[#:indent 2]|{@racket[(_rator-expr _rand-expr ...)]}|
-
-which produces @racket[(_rator-expr _rand-expr ...)], where
-@racketidfont{rator-expr} and @racketidfont{rand-expr} are typeset as
-meta-variables. The @racket[defproc], @racket[defform], @|etc| forms
-greatly reduce this burden in descriptions, since they automatically
-set up meta-variable typesetting for non-literal identifiers. In
-@racket[defform], be sure to include literal identifiers (i.e., those
-not meant as variables, other than the form name being defined) in a
-@racket[#:literals] clause.
-
-To typeset an identifier with no particular interpretation---syntax,
-variable, meta-variable, etc.---use @racket[racketidfont] (e.g., as in
-@racketidfont{rand-expr} above).  Otherwise, use @racket[litchar],
-not merely @racket[racketfont] or @racket[verbatim], to refer to a
-specific sequence of characters.
-
-When a syntactic form synthesizes an identifier from a given
-identifier, use a combination of @racket[racketidfont] and
-@racket[racket] to describe the identifiers. For example, if
-@racket[_id] is combined with @racketidfont{is-} and @racketidfont{?}
-to form @racketidfont{is-}@racket[_id]@racketidfont{?}, then implement
-that identifier as
-@code[#:lang "at-exp racket"]|{@racketidfont{is-}@racket[id]@racketidfont{?}}|.
-
-When using @racket[defform] to describe a syntactic form, don't
-confuse the @racket[#:contracts] clause with a grammar
-specification. Use @racket[#:contracts] only for expressions within the
-syntactic form, and the contract is a run-time constraint---not a
-syntactic constraint, such as requiring a sub-form to be an identifier.
-Use @racket[defform/subs] for syntactic constraints.
-
-When showing example evaluations, use the REPL-snapshot style:
-
-@verbatim[#:indent 2]|{
-  @interaction[
-  (+ 1 2)
-  ]
-}|
-
-See also the @racket[scribble/eval] library and @secref["examples-style"].
-
-Use four dots, @litchar{....}, in place of omitted code, since
-@litchar{...} means repetition.
-
-
-@section{Typesetting Prose}
-
-Refrain from referring to documentation ``above'' or ``below,'' and
-instead have a hyperlink point to the right place.
-
-In prose, use @litchar{``} and @litchar{''} quotation marks instead of
-@litchar{"}. Use @litchar{---} for an em dash, and do not include
-spaces on either side. Use American style for quotation marks and punctuation
-@; [Eli] BTW, I've asked several people about this, and the general
-@;   agreement that I've seen is that this is a rather arbitrary rule
-@;   and there's no harm in doing the more logical thing of putting
-@;   the punctuations outside quotations and parens.  Just like you
-@;   did at the end of this sentence...
-@; [Matthew] See intro of this section.
-at the end of quotation marks (i.e., a sentence-terminating period
-goes inside the quotation marks). Of course, this rule does not apply
-for quotation marks that are part of code.
-
-Do not use a citation reference (as created by @racket[cite]) as a
-noun; use it as an annotation.
-
-Do not start a sentence with a Racket variable name, since it is
-normally lowercase. For example, use ``The @racket[_thing] argument
-is...'' instead of ``@racket[_thing] is...''
-
-Use @racket[etc] for ``@|etc|'' when it does not end a sentence, and
-include a comma after ``@|etc|'' unless it ends a sentence of is
-followed by other punctuation (such as a parenthesis).
-
-@section{Section Titles}
-
-Capitalize all words except articles (``the,'' ``a,'' etc.),
-prepositions, and conjunctions that are not at the start of the title.
-
-A manual title should normally start with a suitable keyword or key
-phrase (such as ``Scribble'' for this manual) that is in boldface. If
-the key word is primarily an executable name, use @racket[exec]
-instead of @racket[bold]. Optionally add further descriptive text in
-the title after a colon, where the text starting with the colon is not
-in boldface.
-
-@section{Indexing}
-
-Document and section titles, identifiers that are documented with
-@racket[defproc], @racket[defform], etc. are automatically indexed, as
-are terms defined with @racket[deftech].
-
-Symbols are not indexed automatically.  Use @racket[indexed-racket]
-instead of @racket[racket] for the instance of a symbol that roughly
-defines the use. For an example, try searching for ``truncate'' to
-find @racket['truncate] as used with @racket[open-output-file]. Do no
-use something like @racket[(index "'truncate")] to index a symbol,
-because it will not typeset correctly (i.e., in a fixed-width font
-with the color of a literal).
-
-Use @racket[index], @racket[as-index], and @racket[section-index] as a
-last resort. Create index entries for terms that are completely
-different from terms otherwise indexed. Do not try to index minor
-variations of a term or phrase in an attempt to improve search
-results; if search fails to find a word or phrase due to a minor
-variation, then the search algorithm should be fixed, not the index
-entry.
-
-@section[#:tag "examples-style"]{Examples}
-
-Strive to include examples (using @racket[examples]) with the
-documentation of every function and syntactic form. When writing
-examples, refrain from using nonsense words like ``foo'' and ``bar.''
-For example, when documenting @racket[member], resist the temptation
-to write
-
-@interaction[
-(member "foo" '("bar" "foo" "baz"))
-]
-
-and instead write something like
-
-@interaction[
-(member "Groucho" '("Harpo" "Groucho" "Zeppo"))
-]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/tag.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/tag.scrbl
deleted file mode 100644
index 1153c52fd6..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/tag.scrbl
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual "utils.rkt"
-          (for-label setup/main-collects))
-
-@title[#:tag "tag"]{Tag Utilities}
-
-@declare-exporting[scribble/tag scribble/base]
-
-@defmodule*/no-declare[(scribble/tag)]{The @racketmodname[scribble/tag]
-library provides utilities for constructing cross-reference
-@tech{tags}. The library is re-exported by
-@racketmodname[scribble/base].}
-
-@; ------------------------------------------------------------------------
-
-@defproc[(make-section-tag [name string?]
-                           [#:doc doc-mod-path (or/c module-path? #f) #f]
-                           [#:tag-prefixes tag-prefixes (or/c #f (listof string?)) #f])
-         tag?]{
-
-Forms a @tech{tag} that refers to a section whose ``tag'' (as provided
-by the @racket[#:tag] argument to @racket[section], for example) is
-@racket[name]. If @racket[doc-mod-path] is provided, the @tech{tag}
-references a section in the document implemented by
-@racket[doc-mod-path] from outside the document. Additional tag
-prefixes (for intermediate sections, typically) can be provided as
-@racket[tag-prefixes].}
-
-@defproc[(make-module-language-tag [lang symbol?]) tag?]{
-  Forms a @tech{tag} that refers to a section 
-  that contains @racket[defmodulelang] for the language
-  @racket[lang].
-}
-
-@defproc[(taglet? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a @tech{taglet}, @racket[#f]
-otherwise.
-
-A @deftech{taglet} is a value that can be combined with a symbol via
-@racket[list] to form a @tech{tag}, but that is not a
-@racket[generated-tag]. A @tech{taglet} is therefore useful as a piece
-of a @tech{tag}, and specifically as a piece of a tag that can gain a
-prefix (e.g., to refer to a section of a document from outside the
-document).}
-
-
-@defproc*[([(doc-prefix [mod-path (or/c #f module-path?)] 
-                        [taglet taglet?])
-            taglet?]
-           [(doc-prefix [mod-path (or/c #f module-path?)]
-                        [extra-prefixes (or/c #f (listof taglet?))]
-                        [taglet taglet?])
-            taglet?])]{
-
-Converts part of a cross-reference @tech{tag} that would work within a
-document implemented by @racket[mod-path] to one that works from
-outside the document, assuming that @racket[mod-path] is not
-@racket[#f]. That is, @racket[mod-path] is converted to a
-@tech{taglet} and added as prefix to an existing @racket[taglet].
-
-If @racket[extra-prefixes] is provided, then its content is added as a
-extra prefix elements before the prefix for @racket[mod-path] is
-added. A @racket[#f] value for @racket[extra-prefixes] is equivalent
-to @racket['()].
-
-If @racket[mod-path] is @racket[#f], then @racket[taglet] is returned
-without a prefix (except adding @racket[extra-prefixes], if provided).}
-
-
-@defproc[(module-path-prefix->string [mod-path module-path?]) string?]{
-
-Converts a module path to a string by resolving it to a path, and
-using @racket[path->main-collects-relative].}
-
-@defproc[(module-path-index->taglet [mpi module-path-index?]) taglet?]{
-
-Converts a module path index to a @tech{taglet}---a normalized
-encoding of the path as an S-expression---that is interned via
-@racket[intern-taglet].
-
-The string form of the @tech{taglet} is used as prefix in a @tech{tag}
-to form cross-references into the document that is implemented by the
-module referenced by @racket[mpi].}
-
-@defproc[(intern-taglet [v any/c]) any/c]{
-
-Returns a value that is @racket[equal?] to @racket[v], where multiple
-calls to @racket[intern-taglet] for @racket[equal?] @racket[v]s
-produce the same (i.e., @racket[eq?]) value.}
-
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/text.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/text.scrbl
deleted file mode 100644
index 2f59871bba..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/text.scrbl
+++ /dev/null
@@ -1,1362 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/core scribble/html-properties scribble/latex-properties
-          (except-in "utils.rkt" splice begin include)
-          (for-label (except-in racket/base begin)
-                     scribble/text
-                     (only-in scribble/text
-                              [begin/text begin]
-                              [include/text include])))
-@initialize-tests
-
-@(define (tech/r s) @tech[s #:doc '(lib "scribblings/reference/reference.scrbl")])
-@(define scribble-doc '(lib "scribblings/scribble/scribble.scrbl"))
-@(define @-form @tech[#:doc scribble-doc]{@"@"-forms})
-
-@(define-syntax-rule (def-rkt t-id)
-   (begin
-    (require (for-label racket/include))
-    (define t-id @racket[include])))
-@(def-rkt rkt-include)
-
-@title[#:tag "text"
-       #:style (make-style #f (list (make-tex-addition "shaded.tex")
-                                    (make-css-addition "shaded.css")))
-      ]{Text Generation}
-
-@defmodulelang[scribble/text]{The @racketmodname[scribble/text]
-language provides everything from @racket[racket/base],
-@racket[racket/promise], @racket[racket/list], and
-@racket[racket/string], but with additions and a changed treatment of
-the module top level to make it suitable as for text generation or a
-preprocessor language:
-
-@itemize[
-
-  @item{The language uses @racket[read-syntax-inside] to read the body
-        of the module, similar to @secref[#:doc scribble-doc "docreader"].  This means that
-        by default, all text is read in as Racket strings; and
-        @seclink[#:doc scribble-doc "reader"]|{@-forms}| can be used to use Racket
-        functions and expression escapes.}
-
-  @item{Values of expressions are printed with a custom @racket[output]
-        function.  This function displays most values in a similar way
-        to @racket[display], except that it is more convenient for a
-        textual output.}]
-
-}
-
-When @racketmodname[scribble/text] is used via @racket[require]
-instead of @hash-lang[], then it does not change the printing of
-values, it does not include the bindings of @racket[racket/base],
-@racket[include] is provided as @racket[include/text], and
-@racket[begin] is provided as @racket[begin/text].
-
-@; TODO:
-@; * make all example sections be subsections,
-@; * add a reference section,
-@; * a section on "scribble/text.rkt"
-@; * maybe a section on additional utilities: begin/text
-
-@;--------------------------------------------------------------------
-@section{Writing Text Files}
-
-The combination of the two features makes text in files in the
-@racket[scribble/text] language be read as strings, which get printed
-out when the module is @racket[require]d, for example, when a file is
-given as an argument to @exec{racket}.  (In these example the left
-part shows the source input, and the right part the printed result.)
-
-@example|-{#lang scribble/text
-           Programming languages should
-           be designed not by piling
-           feature on top of feature, but
-           blah blah blah.
-           ---***---
-           Programming languages should
-           be designed not by piling
-           feature on top of feature, but
-           blah blah blah.}-|
-
-Using @seclink[#:doc scribble-doc "reader"]|{@-forms}|, we can define and use Racket
-functions.
-
-@example|-{#lang scribble/text
-           @(require racket/list)
-           @(define Foo "Preprocessing")
-           @(define (3x . x)
-              ;; racket syntax here
-              (add-between (list x x x) " "))
-           @Foo languages should
-           be designed not by piling
-           feature on top of feature, but
-           @3x{blah}.
-           ---***---
-           Preprocessing languages should
-           be designed not by piling
-           feature on top of feature, but
-           blah blah blah.}-|
-
-As demonstrated in this case, the @racket[output] function simply
-scans nested list structures recursively, which makes them convenient
-for function results.  In addition, @racket[output] prints most values
-similarly to @racket[display] --- notable exceptions are void and
-false values which cause no output to appear.  This can be used for
-convenient conditional output.
-
-@example|-{#lang scribble/text
-           @(define (errors n)
-              (list n
-                    " error"
-                    (and (not (= n 1)) "s")))
-           You have @errors[3] in your code,
-           I fixed @errors[1].
-           ---***---
-           You have 3 errors in your code,
-           I fixed 1 error.}-|
-
-Using the scribble @seclink[#:doc scribble-doc "reader"]|{@-forms}| syntax, you can write
-functions more conveniently too.
-
-@example|-{#lang scribble/text
-           @(define (errors n)
-              ;; note the use of `unless'
-              @list{@n error@unless[(= n 1)]{s}})
-           You have @errors[3] in your code,
-           I fixed @errors[1].
-           ---***---
-           You have 3 errors in your code,
-           I fixed 1 error.}-|
-
-Following the details of the scribble reader, you may notice that in
-these examples there are newline strings after each definition, yet
-they do not show in the output.  To make it easier to write
-definitions, newlines after definitions and indentation spaces before
-them are ignored.
-
-@example|-{#lang scribble/text
-
-           @(define (plural n)
-              (unless (= n 1) "s"))
-
-           @(define (errors n)
-              @list{@n error@plural[n]})
-
-           You have @errors[3] in your code,
-             @(define fixed 1)
-           I fixed @errors[fixed].
-           ---***---
-           You have 3 errors in your code,
-           I fixed 1 error.}-|
-
-These end-of-line newline strings are not ignored when they follow
-other kinds of expressions, which may lead to redundant empty lines in
-the output.
-
-@example|-{#lang scribble/text
-           @(define (count n str)
-              (for/list ([i (in-range 1 (add1 n))])
-                @list{@i @str,@"\n"}))
-           Start...
-           @count[3]{Mississippi}
-           ... and I'm done.
-           ---***---
-           Start...
-           1 Mississippi,
-           2 Mississippi,
-           3 Mississippi,
-
-           ... and I'm done.}-|
-
-There are several ways to avoid having such empty lines in your
-output.  The simplest way is to arrange for the function call's form
-to end right before the next line begins, but this is often not too
-convenient.  An alternative is to use a @litchar|{@;}| comment, which
-makes the scribble reader ignore everything that follows it up to and
-including the newline.  (These methods can be applied to the line that
-precedes the function call too, but the results are likely to have
-what looks like erroneous indentation.  More about this below.)
-
-@example|-{#lang scribble/text
-           @(define (count n str)
-              (for/list ([i (in-range 1 (+ n 1))])
-                @list{@i @str,@"\n"}))
-           Start...
-           @count[3]{Mississippi
-           }... done once.
-
-           Start again...
-           @count[3]{Massachusetts}@;
-           ... and I'm done again.
-           ---***---
-           Start...
-           1 Mississippi,
-           2 Mississippi,
-           3 Mississippi,
-           ... done once.
-
-           Start again...
-           1 Massachusetts,
-           2 Massachusetts,
-           3 Massachusetts,
-           ... and I'm done again.}-|
-
-A better approach is to generate newlines only when needed.
-
-@example|-{#lang scribble/text
-           @(require racket/list)
-           @(define (counts n str)
-              (add-between
-               (for/list ([i (in-range 1 (+ n 1))])
-                 @list{@i @str,})
-               "\n"))
-           Start...
-           @counts[3]{Mississippi}
-           ... and I'm done.
-           ---***---
-           Start...
-           1 Mississippi,
-           2 Mississippi,
-           3 Mississippi,
-           ... and I'm done.}-|
-
-In fact, this is common enough that the @racket[scribble/text]
-language provides a convenient facility: @racket[add-newlines] is a
-function that is similar to @racket[add-between] using a newline
-string as the default separator, except that false and void values are
-filtered out before doing so.
-
-@example|-{#lang scribble/text
-           @(define (count n str)
-              (add-newlines
-               (for/list ([i (in-range 1 (+ n 1))])
-                 @list{@i @str,})))
-           Start...
-           @count[3]{Mississippi}
-           ... and I'm done.
-           ---***---
-           Start...
-           1 Mississippi,
-           2 Mississippi,
-           3 Mississippi,
-           ... and I'm done.}-|
-
-@example|-{#lang scribble/text
-           @(define (count n str)
-              (add-newlines
-               (for/list ([i (in-range 1 (+ n 1))])
-                 @(and (even? i) @list{@i @str,}))))
-           Start...
-           @count[6]{Mississippi}
-           ... and I'm done.
-           ---***---
-           Start...
-           2 Mississippi,
-           4 Mississippi,
-           6 Mississippi,
-           ... and I'm done.}-|
-
-The separator can be set to any value.
-
-@example|-{#lang scribble/text
-           @(define (count n str)
-              (add-newlines #:sep ",\n"
-               (for/list ([i (in-range 1 (+ n 1))])
-                 @list{@i @str})))
-           Start...
-           @count[3]{Mississippi}.
-           ... and I'm done.
-           ---***---
-           Start...
-           1 Mississippi,
-           2 Mississippi,
-           3 Mississippi.
-           ... and I'm done.}-|
-
-
-@;--------------------------------------------------------------------
-@section{Defining Functions and More}
-
-(Note: most of the tips in this section are applicable to any code
-that uses the Scribble @|@-form| syntax.)
-
-Because the Scribble reader is uniform, you can use it in place of any
-expression where it is more convenient.  (By convention, we use a
-plain S-expression syntax when we want a Racket expression escape, and
-an @|@-form| for expressions that render as text, which, in the
-@racket[scribble/text] language, is any value-producing expression.)
-For example, you can use an @|@-form| for a function that you define.
-
-@example|-{#lang scribble/text
-           @(define @bold[text] @list{*@|text|*})
-           An @bold{important} note.
-           ---***---
-           An *important* note.
-           }-|
-
-This is not commonly done, since most functions that operate with text
-will need to accept a variable number of arguments.  In fact, this
-leads to a common problem: what if we want to write a function that
-consumes a number of ``text arguments'' rathen than a single
-``rest-like'' body?  The common solution for this is to provide the
-separate text arguments in the S-expression part of an @|@-form|.
-
-@example|-{#lang scribble/text
-           @(define (choose 1st 2nd)
-              @list{Either @1st, or @|2nd|@"."})
-           @(define who "us")
-           @choose[@list{you're with @who}
-                   @list{against @who}]
-           ---***---
-           Either you're with us, or against us.
-           }-|
-
-You can even use @|@-form|s with a Racket quote or quasiquote as the
-``head'' part to make it shorter, or use a macro to get grouping of
-sub-parts without dealing with quotes.
-
-@example|-{#lang scribble/text
-           @(define (choose 1st 2nd)
-              @list{Either @1st, or @|2nd|@"."})
-           @(define who "us")
-           @choose[@list{you're with @who}
-                   @list{against @who}]
-           @(define-syntax-rule (compare (x ...) ...)
-              (add-newlines
-               (list (list "* " x ...) ...)))
-           Shopping list:
-           @compare[@{apples}
-                    @{oranges}
-                    @{@(* 2 3) bananas}]
-           ---***---
-           Either you're with us, or against us.
-           Shopping list:
-           * apples
-           * oranges
-           * 6 bananas
-           }-|
-
-Yet another solution is to look at the text values and split the input
-arguments based on a specific token.  Using @racket[match] can make it
-convenient --- you can even specify the patterns with @|@-form|s.
-
-@example|-{#lang scribble/text
-           @(require racket/match)
-           @(define (features . text)
-              (match text
-                [@list{@|1st|@...
-                       ---
-                       @|2nd|@...}
-                 @list{>> Pros <<
-                       @1st;
-                       >> Cons <<
-                       @|2nd|.}]))
-           @features{fast,
-                     reliable
-                     ---
-                     expensive,
-                     ugly}
-           ---***---
-           >> Pros <<
-           fast,
-           reliable;
-           >> Cons <<
-           expensive,
-           ugly.
-           }-|
-
-In particular, it is often convenient to split the input by lines,
-identified by delimiting @racket["\n"] strings.  Since this can be
-useful, a @racket[split-lines] function is provided.
-
-@example|-{#lang scribble/text
-           @(require racket/list)
-           @(define (features . text)
-              (add-between (split-lines text)
-                           ", "))
-           @features{red
-                     fast
-                     reliable}.
-           ---***---
-           red, fast, reliable.
-           }-|
-
-Finally, the Scribble reader accepts @emph{any} expression as the head
-part of an @"@"-form --- even an @"@" form.  This makes it possible to
-get a number of text bodies by defining a curried function, where each
-step accepts any number of arguments.  This, however, means that the
-number of body expressions must be fixed.
-
-@example|-{#lang scribble/text
-           @(define ((choose . 1st) . 2nd)
-              @list{Either you're @1st, or @|2nd|.})
-           @(define who "me")
-           @@choose{with @who}{against @who}
-           ---***---
-           Either you're with me, or against me.
-           }-|
-
-
-@;--------------------------------------------------------------------
-@section{Using Printouts}
-
-Because the text language simply displays each toplevel value as the
-file is run, it is possible to print text directly as part of the
-output.
-
-@example|-{#lang scribble/text
-           First
-           @display{Second}
-           Third
-           ---***---
-           First
-           Second
-           Third}-|
-
-Taking this further, it is possible to write functions that output
-some text @emph{instead} of returning values that represent the text.
-
-@example|-{#lang scribble/text
-           @(define (count n)
-              (for ([i (in-range 1 (+ n 1))])
-                (printf "~a Mississippi,\n" i)))
-           Start...
-           @count[3]@; avoid an empty line
-           ... and I'm done.
-           ---***---
-           Start...
-           1 Mississippi,
-           2 Mississippi,
-           3 Mississippi,
-           ... and I'm done.}-|
-
-This can be used to produce a lot of output text, even infinite.
-
-@example|-{#lang scribble/text
-           @(define (count n)
-              (printf "~a Mississippi,\n" n)
-              (count (add1 n)))
-           Start...
-           @count[1]
-           this line is never printed!
-           ---***---
-           Start...
-           1 Mississippi,
-           2 Mississippi,
-           3 Mississippi,
-           4 Mississippi,
-           5 Mississippi,
-           ...}-|
-
-However, you should be careful not to mix returning values with
-printouts, as the results are rarely desirable.
-
-@example|-{#lang scribble/text
-           @list{1 @display{two} 3}
-           ---***---
-           two1  3}-|
-
-Note that you don't need side-effects if you want infinite output.
-The @racket[output] function iterates thunks and (composable)
-promises, so you can create a loop that is delayed in either form.
-@; Note: there is some sfs-related problem in racket that makes it not
-@; run in bounded space, so don't show it for nowx.
-
-@example|-{#lang scribble/text
-           @(define (count n)
-              (cons @list{@n Mississippi,@"\n"}
-                    (lambda ()
-                      (count (add1 n)))))
-           Start...
-           @count[1]
-           this line is never printed!
-           ---***---
-           Start...
-           1 Mississippi,
-           2 Mississippi,
-           3 Mississippi,
-           4 Mississippi,
-           5 Mississippi,
-           ...}-|
-
-
-@;--------------------------------------------------------------------
-@section{Indentation in Preprocessed output}
-
-An issue that can be very important in many text generation applications
-is the indentation of the output.  This can be crucial in some cases, if
-you're generating code for an indentation-sensitive language (e.g.,
-Haskell, Python, or C preprocessor directives).  To get a better
-understanding of how the pieces interact, you may want to review how the
-@seclink[#:doc scribble-doc "reader"]|{Scribble reader}| section, but also remember that
-you can use quoted forms to see how some form is read.
-
-@example|-{#lang scribble/text
-           @(format "~s" '@list{
-                            a
-                              b
-                            c})
-           ---***---
-           (list "a" "\n" "  " "b" "\n" "c")}-|
-
-The Scribble reader ignores indentation spaces in its body.  This is an
-intentional feature, since you usually do not want an expression to
-depend on its position in the source.  But the question is whether we
-@emph{can} render some output text with proper indentation.  The
-@racket[output] function achieves that by introducing @racket[block]s.
-Just like a list, a @racket[block] contains a list of elements, and when
-one is rendered, it is done in its own indentation level.  When a
-newline is part of a @racket[block]'s contents, it causes the following
-text to appear with indentation that corresponds to the column position
-at the beginning of the block.
-
-In addition, lists are also rendered as blocks by default, so they can
-be used for the same purpose.  In most cases, this makes the output
-appear ``as intended'' where lists are used for nested pieces of text
---- either from a literal @racket[list] expression, or an expression
-that evaluates to a list, or when a list is passed on as a value; either
-as a toplevel expression, or as a nested value; either appearing after
-spaces, or after other output.
-
-@example|-{#lang scribble/text
-           foo @block{1
-                      2
-                      3}
-           foo @list{4
-                     5
-                     6}
-           ---***---
-           foo 1
-               2
-               3
-           foo 4
-               5
-               6}-|
-
-@example|-{#lang scribble/text
-           @(define (code . text)
-              @list{begin
-                      @text
-                    end})
-           @code{first
-                 second
-                 @code{
-                   third
-                   fourth}
-                 last}
-           ---***---
-           begin
-             first
-             second
-             begin
-               third
-               fourth
-             end
-             last
-           end}-|
-
-@example|-{#lang scribble/text
-           @(define (enumerate . items)
-              (add-newlines #:sep ";\n"
-               (for/list ([i (in-naturals 1)]
-                          [item (in-list items)])
-                 @list{@|i|. @item})))
-           Todo: @enumerate[@list{Install Racket}
-                            @list{Hack, hack, hack}
-                            @list{Profit}].
-           ---***---
-           Todo: 1. Install Racket;
-                 2. Hack, hack, hack;
-                 3. Profit.}-|
-
-@example[#:hidden]|-{
-  #lang scribble/text
-  @; demonstrates how indentation is preserved inside lists
-  begin
-    a
-    b
-    @list{c
-          d
-          @list{e
-                  f
-                g}
-          h
-            i
-            @list{j
-                    k
-                  l}
-            m
-          n
-          o}
-    p
-    q
-  end
-  ---***---
-  begin
-    a
-    b
-    c
-    d
-    e
-      f
-    g
-    h
-      i
-      j
-        k
-      l
-      m
-    n
-    o
-    p
-    q
-  end
-  }-|
-
-@example[#:hidden]|-{
-  #lang scribble/text
-
-    @list{
-      a
-
-      b
-    }
-
-    c
-  ---***---
-  a
-
-  b
-
-  c
-  }-|
-
-@example[#:hidden]|-{
-  #lang scribble/text
-  @; indentation works even when coming from a function
-  @(define (((if . c) . t) . e)
-     @list{
-       if (@c)
-         @t
-       else
-         @e
-       fi})
-  function foo() {
-    @list{if (1 < 2)
-            something1
-          else
-            @@@if{2<3}{something2}{something3}
-            repeat 3 {
-              @@@if{2<3}{something2}{something3}
-              @@@if{2<3}{
-                @list{something2.1
-                      something2.2}
-              }{
-                something3
-              }
-            }
-          fi}
-    return
-  }
-  ---***---
-  function foo() {
-    if (1 < 2)
-      something1
-    else
-      if (2<3)
-        something2
-      else
-        something3
-      fi
-      repeat 3 {
-        if (2<3)
-          something2
-        else
-          something3
-        fi
-        if (2<3)
-          something2.1
-          something2.2
-        else
-          something3
-        fi
-      }
-    fi
-    return
-  }
-  }-|
-
-@example[#:hidden]|-{
-  #lang scribble/text
-  @; indentation works with a list, even a single string with a newline
-  @; in a list, but not in a string by itself
-  function foo() {
-    prefix
-    @list{if (1 < 2)
-            something1
-          else
-            @list{something2
-                  something3}
-            @'("something4\nsomething5")
-            @"something6\nsomething7"
-          fi}
-    return
-  }
-  @; can be used with a `display', but makes sense only at the top level
-  @; or in thunks (not demonstrated here)
-  @(display 123) foo @list{bar1
-                           bar2
-                           bar2}
-  ---***---
-  function foo() {
-    prefix
-    if (1 < 2)
-      something1
-    else
-      something2
-      something3
-      something4
-      something5
-      something6
-    something7
-    fi
-    return
-  }
-  123 foo bar1
-          bar2
-          bar2
-  }-|
-
-There are, however, cases when you need more refined control over the
-output.  The @racket[scribble/text] language provides a few functions
-for such cases in addition to @racket[block].  The @racket[splice]
-function groups together a number of values but avoids introducing a new
-indentation context.  Furthermore, lists are not always rendered as
-@racket[block]s --- instead, they are rendered as @racket[splice]s when
-they are used inside one, so you essentially use @racket[splice] to
-avoid the ``indentation group'' behavior, and @racket[block] to restore
-it.
-
-@example|-{#lang scribble/text
-           @(define (blah . text)
-              @splice{{
-                blah(@block{@text});
-              }})
-           start
-             @splice{foo();
-                     loop:}
-             @list{if (something) @blah{one,
-                                        two}}
-           end
-           ---***---
-           start
-             foo();
-           loop:
-             if (something) {
-               blah(one,
-                    two);
-             }
-           end
-           }-|
-
-The @racket[disable-prefix] function disables all indentation
-printouts in its contents, including the indentation before the body
-of the @racket[disable-prefix] value itself.  It is useful, for
-example, to print out CPP directives.
-
-@example|-{#lang scribble/text
-           @(define (((IFFOO . var) . expr1) . expr2)
-              (define (array e1 e2)
-                @list{[@e1,
-                       @e2]})
-              @list{var @var;
-                    @disable-prefix{#ifdef FOO}
-                    @var = @array[expr1 expr2];
-                    @disable-prefix{#else}
-                    @var = @array[expr2 expr1];
-                    @disable-prefix{#endif}})
-
-           function blah(something, something_else) {
-             @disable-prefix{#include "stuff.inc"}
-             @@@IFFOO{i}{something}{something_else}
-           }
-           ---***---
-           function blah(something, something_else) {
-           #include "stuff.inc"
-             var i;
-           #ifdef FOO
-             i = [something,
-                  something_else];
-           #else
-             i = [something_else,
-                  something];
-           #endif
-           }
-           }-|
-
-If there are values after a @racket[disable-prefix] value on the same
-line, they @emph{will} get indented to the goal column (unless the
-output is already beyond it).
-
-@example|-{#lang scribble/text
-           @(define (thunk name . body)
-              @list{function @name() {
-                      @body
-                    }})
-           @(define (ifdef cond then else)
-              @list{@disable-prefix{#}ifdef @cond
-                      @then
-                    @disable-prefix{#}else
-                      @else
-                    @disable-prefix{#}endif})
-
-           @thunk['do_stuff]{
-             init();
-             @ifdef["HAS_BLAH"
-               @list{var x = blah();}
-               @thunk['blah]{
-                 @ifdef["BLEHOS"
-                   @list{@disable-prefix{#}@;
-                           include <bleh.h>
-                         bleh();}
-                   @list{error("no bleh");}]
-               }]
-             more_stuff();
-           }
-           ---***---
-           function do_stuff() {
-             init();
-           # ifdef HAS_BLAH
-               var x = blah();
-           # else
-               function blah() {
-           #     ifdef BLEHOS
-           #       include <bleh.h>
-                   bleh();
-           #     else
-                   error("no bleh");
-           #     endif
-               }
-           # endif
-             more_stuff();
-           }
-           }-|
-
-There are cases where each line should be prefixed with some string
-other than a plain indentation.  The @racket[add-prefix] function
-causes its contents to be printed using some given string prefix for
-every line.  The prefix gets accumulated to an existing indentation,
-and indentation in the contents gets added to the prefix.
-
-@example|-{#lang scribble/text
-           @(define (comment . body)
-              @add-prefix["// "]{@body})
-           @comment{add : int int -> string}
-           char *foo(int x, int y) {
-             @comment{
-               skeleton:
-                 allocate a string
-                 print the expression into it
-                 @comment{...more work...}
-             }
-             char *buf = malloc(@comment{FIXME!
-                                         This is bad}
-                                100);
-           }
-           ---***---
-           // add : int int -> string
-           char *foo(int x, int y) {
-             // skeleton:
-             //   allocate a string
-             //   print the expression into it
-             //   // ...more work...
-             char *buf = malloc(// FIXME!
-                                // This is bad
-                                100);
-           }
-           }-|
-
-When combining @racket[add-prefix] and @racket[disable-prefix] there
-is an additional value that can be useful: @racket[flush].  This is a
-value that causes @racket[output] to print the current indentation and
-prefix.  This makes it possible to get the ``ignored as a prefix''
-property of @racket[disable-prefix] but only for a nested prefix.
-
-@example|-{#lang scribble/text
-           @(define (comment . text)
-              (list flush
-                    @add-prefix[" *"]{
-                      @disable-prefix{/*} @text */}))
-           function foo(x) {
-             @comment{blah
-                      more blah
-                      yet more blah}
-             if (x < 0) {
-               @comment{even more
-                        blah here
-                        @comment{even
-                                 nested}}
-               do_stuff();
-             }
-           }
-           ---***---
-           function foo(x) {
-             /* blah
-              * more blah
-              * yet more blah */
-             if (x < 0) {
-               /* even more
-                * blah here
-                * /* even
-                *  * nested */ */
-               do_stuff();
-             }
-           }
-           }-|
-
-@example[#:hidden]|-{
-  #lang scribble/text
-
-  @(begin
-     ;; This is a somewhat contrived example, showing how to use lists
-     ;; and disable-prefix to control the added prefix
-     (define (item . text)
-       ;; notes: the `flush' makes the prefix to that point print so the
-       ;; disable-prefix "* " is printed after it, which overwrites the
-       ;; "| " prefix
-       (list flush (add-prefix "| " (disable-prefix "* ") text)))
-     ;; note that a simple item with spaces is much easier:
-     (define (simple . text) @list{* @text}))
-
-  start
-    @item{blah blah blah
-          blah blah blah
-          @item{more stuff
-                more stuff
-                more stuff}
-          blah blah blah
-          blah blah blah}
-    @simple{more blah
-            blah blah}
-  end
-  ---***---
-  start
-    * blah blah blah
-    | blah blah blah
-    | * more stuff
-    | | more stuff
-    | | more stuff
-    | blah blah blah
-    | blah blah blah
-    * more blah
-      blah blah
-  end
-  }-|
-
-
-@;--------------------------------------------------------------------
-@section{Using External Files}
-
-Using additional files that contain code for your preprocessing is
-trivial: the source text is still source code in a module, so you can
-@racket[require] additional files with utility functions.
-
-@example|-{#lang scribble/text
-           @(require "itemize.rkt")
-           Todo:
-           @itemize[@list{Hack some}
-                    @list{Sleep some}
-                    @list{Hack some
-                          more}]
-           ---***--- itemize.rkt
-           #lang racket
-           (provide itemize)
-           (define (itemize . items)
-             (add-between (map (lambda (item)
-                                 (list "* " item))
-                               items)
-                          "\n"))
-           ---***---
-           Todo:
-           * Hack some
-           * Sleep some
-           * Hack some
-             more
-           }-|
-
-Note that the @seclink[#:doc scribble-doc "at-exp-lang"]{@racket[at-exp] language} can
-often be useful here, since such files need to deal with texts.  Using
-it, it is easy to include a lot of textual content.
-
-@example|-{#lang scribble/text
-           @(require "stuff.rkt")
-           Todo:
-           @itemize[@list{Hack some}
-                    @list{Sleep some}
-                    @list{Hack some
-                          more}]
-           @summary
-           ---***--- stuff.rkt
-           #lang at-exp racket/base
-           (require racket/list)
-           (provide (all-defined-out))
-           (define (itemize . items)
-             (add-between (map (lambda (item)
-                                 @list{* @item})
-                               items)
-                          "\n"))
-           (define summary
-             @list{If that's not enough,
-                   I don't know what is.})
-           ---***---
-           Todo:
-           * Hack some
-           * Sleep some
-           * Hack some
-             more
-           If that's not enough,
-           I don't know what is.
-           }-|
-
-Of course, the extreme side of this will be to put all of your content
-in a plain Racket module, using @|@-form|s for convenience.  However,
-there is no need to use the text language in this case; instead, you can
-@racket[(require scribble/text)], which will get all of the bindings
-that are available in the @racket[scribble/text] language.  Using
-@racket[output], switching from a preprocessed files to a Racket file is
-very easy ---- choosing one or the other depends on whether it is more
-convenient to write a text file with occasional Racket expressions or
-the other way.
-
-@example|-{#lang at-exp racket/base
-           (require scribble/text racket/list)
-           (define (itemize . items)
-             (add-between (map (lambda (item)
-                                 @list{* @item})
-                               items)
-                          "\n"))
-           (define summary
-             @list{If that's not enough,
-                   I don't know what is.})
-           (output
-            @list{
-              Todo:
-              @itemize[@list{Hack some}
-                       @list{Sleep some}
-                       @list{Hack some
-                             more}]
-              @summary
-            })
-           ---***---
-           Todo:
-           * Hack some
-           * Sleep some
-           * Hack some
-             more
-           If that's not enough,
-           I don't know what is.
-           }-|
-
-However, you might run into a case where it is desirable to include a
-mostly-text file from a @racket[scribble/text] source file.  It might be
-because you prefer to split the source text to several files, or because
-you need to use a template file that cannot have a @litchar{#lang}
-header (for example, an HTML template file that is the result of an
-external editor).  In these cases, the @racket[scribble/text] language
-provides an @racket[include] form that includes a file in the
-preprocessor syntax (where the default parsing mode is text).
-
-@example|-{#lang scribble/text
-           @(require racket/list)
-           @(define (itemize . items)
-              (list
-               "<ul>"
-               (add-between
-                (map (lambda (item)
-                       @list{<li>@|item|</li>})
-                     items)
-                "\n")
-               "</ul>"))
-           @(define title "Todo")
-           @(define summary
-              @list{If that's not enough,
-                    I don't know what is.})
-
-           @include["template.html"]
-           ---***--- template.html
-           <html>
-           <head><title>@|title|</title></head>
-           <body>
-             <h1>@|title|</h1>
-             @itemize[@list{Hack some}
-                      @list{Sleep some}
-                      @list{Hack some
-                            more}]
-             <p><i>@|summary|</i></p>
-           </body>
-           </html>
-           ---***---
-           <html>
-           <head><title>Todo</title></head>
-           <body>
-             <h1>Todo</h1>
-             <ul><li>Hack some</li>
-                 <li>Sleep some</li>
-                 <li>Hack some
-                     more</li></ul>
-             <p><i>If that's not enough,
-                   I don't know what is.</i></p>
-           </body>
-           </html>
-           }-|
-
-(Using @racket[require] with a text file in the @racket[scribble/text]
-language will not work as intended: the language will display the text
-is when the module is invoked, so the required file's contents will be
-printed before any of the requiring module's text does.  If you find
-yourself in such a situation, it is better to switch to a
-Racket-with-@"@"-expressions file as shown above.)
-
-@;FIXME: add more text on `restore-prefix', `set-prefix', `with-writer'
-
-@;FIXME: add this to the reference section
-@;@defform[(include filename)]{
-@;
-@;Preprocess the @racket[filename] using the same syntax as
-@;@racket[scribble/text].  This is similar to using @racket[load] in a
-@;namespace that can access names bound in the current file so included
-@;code can refer to bindings from the including module.  Note, however,
-@;that the including module cannot refer to names that are bound the
-@;included file because it is still a plain racket module---for such
-@;uses you should still use @racket[require] as usual.}
-
-
-@; Two random tests
-@example[#:hidden]|-{
-  #lang scribble/text
-
-  @define[name]{Racket}
-
-  Suggested price list for "@name"
-
-  @; test mutual recursion, throwing away inter-definition spaces
-  @; <-- this is needed to get only one line of space above
-  @(define (items-num)
-     (length items))
-
-  @(define average
-     (delay (/ (apply + (map car items)) (length items))))
-
-  @(define items
-     (list @list[99]{Home}
-           @list[149]{Professional}
-           @list[349]{Enterprize}))
-
-  @(for/list ([i items] [n (in-naturals)])
-     @list{@|n|. @name @cadr[i] edition: $@car[i].99
-           @||})@; <-- also needed
-
-  Total: @items-num items
-  Average price: $@|average|.99
-  ---***---
-  Suggested price list for "Racket"
-
-  0. Racket Home edition: $99.99
-  1. Racket Professional edition: $149.99
-  2. Racket Enterprize edition: $349.99
-
-  Total: 3 items
-  Average price: $199.99
-  }-|
-@example[#:hidden]|-{
-  #lang scribble/text
-
-  --*--
-  @(define (angled . body) (list "<" body ">"))
-   @(define (shout . body) @angled[(map string-upcase body)])
-    @define[z]{blah}
-
-  blah @angled{blah @shout{@z} blah} blah
-
-  @(define-syntax-rule @twice[x]
-     (list x ", " x))
-
-  @twice{@twice{blah}}
-
-  @include{inp1}
-
-  @(let ([name "Eli"]) (let ([foo (include "inp2")]) (list foo "\n" foo)))
-  Repeating yourself much?
-  ---***--- inp1
-  Warning: blah overdose might be fatal
-  ---***--- inp2
-  @(define (foo . xs) (bar xs))
-  @(begin (define (isname) @list{is @foo{@name}})
-          (define-syntax-rule (DEF x y) (define x y)))
-  @(DEF (bar x) (list z " " x))
-  @(define-syntax-rule (BEG x ...) (begin x ...))
-  @(BEG (define z "zee"))
-
-  My name @isname
-  @DEF[x]{Foo!}
-
-    ... and to that I say "@x", I think.
-
-  ---***---
-  --*--
-  blah <blah <BLAH> blah> blah
-
-  blah, blah, blah, blah
-
-  Warning: blah overdose might be fatal
-
-  My name is zee Eli
-    ... and to that I say "Foo!", I think.
-  My name is zee Eli
-    ... and to that I say "Foo!", I think.
-  Repeating yourself much?
-  }-|
-
-@;--------------------------------------------------------------------
-@section{Text Generation Functions}
-
-@defthing[outputable/c contract?]{
-
-A contract that (in principle) corresponds to value that can be output
-by @racket[output]. Currently, however, this contract accepts all
-values (to avoid the cost of checking at every boundary).
-
-@history[#:added "1.1"]}
-
-@defproc[(output [v outputable/c] [port output-port? (current-output-port)]) void?]{
-
-Outputs values to @racket[port] as follows for each kind of @racket[v]:
-
- @itemlist[
-
-   @item{@tech/r{strings}, @tech/r{byte strings}, @tech/r{symbols},
-         @tech/r{paths}, @tech/r{keywords}, @tech/r{numbers}, and
-         @tech/r{characters}: converts the value to a string along the
-         same lines as @racket[display], and then passes the string to
-         the @deftech{current writer}, which is initially
-         @racket[display]}
-
-   @item{@|void-const|, @racket[#f], or @racket[null]: no output}
-
-   @item{@tech/r{list}: output depends on the current mode, which is
-         initially @tech{splice mode}:
-
-         @itemlist[
-
-            @item{@deftech{block mode}: each item in order, using the
-                   starting column as the @deftech{current
-                   indentation} (which starts out empty)}
-
-            @item{@deftech{splice mode}: outputs each item in order}
-
-          ]}
-
-   @item{@racket[(block _v2 ...)]: outputs each @racket[_v2] in @tech{block mode}.}
-
-   @item{@racket[(splice _v2 ...)]: outputs each @racket[_v2] in @tech{splice mode}.}
-
-   @item{@racket[(set-prefix _pfx _v2 ...)]: sets the @deftech{current
-         prefix}, which is initially empty, to @racket[_pfx] while
-         outputting each @racket[_v2].}
-
-   @item{@racket[(add-prefix _pfx _v2 ...)]: sets the @tech{current
-         prefix} to by adding @racket[_pfx] while outputting each
-         @racket[_v2].}
-
-   @item{@racket[(disable-prefix _v2 ...)]: sets the @tech{current
-         prefix} to empty while outputting each @racket[_v2].}
-
-   @item{@racket[(restore-prefix _v2 ...)]: rewinds the
-         @tech{current prefix} by one enclosing adjustments while
-         outputting each @racket[_v2].}
-
-   @item{@racket[flush]: outputs the @tech{current indentation} and @tech{current prefix}.}
-
-   @item{@racket[(with-writer _writer _v2 ...)]: sets the @tech{current writer}
-         to @racket[_writer] with outputting each @racket[_v2].}
-
-   @item{@tech/r{promise}: outputs the result of @racket[(force v)]}
-
-   @item{@tech/r{box}: outputs the result of @racket[(unbox v)]}
-
-   @item{procedure of 0 arguments: outputs the result of @racket[(v)]}
-
-]
-
-Any other kind of @racket[v] triggers an exception.}
-
-
-@defproc[(block [v outputable/c] ...) outputable/c]{
-
-Produces a value that outputs each @racket[v] in @tech{block mode}.}
-
-@defproc[(splice [v outputable/c] ...) outputable/c]{
-
-Produces a value that outputs each @racket[v] in @tech{splice mode}.}
-
-@deftogether[(
-@defproc[(disable-prefix [v outputable/c] ...) outputable/c]
-@defproc[(restore-prefix [v outputable/c] ...) outputable/c]
-@defproc[(add-prefix [pfx (or/c string? exact-nonnegative-integer?)] [v outputable/c] ...) outputable/c]
-@defproc[(set-prefix [pfx (or/c string? exact-nonnegative-integer?)] [v outputable/c] ...) outputable/c]
-)]{
-
-Produces a value that outputs with an adjusted @tech{current prefix}.
-An integer as a prefix is equivalent to a string with as many space
-characters.}
-
-
-@defthing[flush void?]{
-
-A value that outputs as the @tech{current indentation} plus @tech{current prefix}.}
-
-
-@defproc[(with-writer [writer (or/c (->* (string? output-port?) 
-                                         (exact-nonnegative-integer?)
-                                         any/c)
-                                    #f)]
-                      [v outputable/c] ...)
-         outputable/c]{
-
-Produces a value that outputs with an adjusted @tech{current writer},
-where @racket[#f] indicates @racket[write-string].}
-
-
-@defproc[(add-newlines [items list?] [#:sep sep an/y "\n"]) list?]{
-
-Like @racket[add-between], but first removes @racket[#f] and @|void-const|
-elements of @racket[items].}
-
-
-@defproc[(split-lines [items list?]) (listof list?)]{
-
-Converts @racket[items] to a list of lists, where consecutive
-non-@racket["\n"] values are kept together in a nested list, and
-@racket["\n"] values are dropped.}
-
-
-@defform[(include/text maybe-char path-spec)
-         #:grammar ([maybe-char code:blank
-                                (code:line #:command-char command-char)])]{
-
-Like @rkt-include from @racketmodname[racket/include], but reads the
-file at @racket[path-spec] in the same way as for
-@racketmodname[scribble/text]. If @racket[command-char] is supplied,
-then it replaces @litchar["@"] as the escape character.
-
-The @racketmodname[scribble/text] language via @hash-lang[] provides
-@racket[include/text] as @racket[include].}
-
-@defform[(begin/text form ...)]{
-
-Like @racket[begin], but the results of expression @racket[forms] are
-collected into a list that is returned as the result of the
-@racket[begin/list] form.
-
-The @racketmodname[scribble/text] language via @hash-lang[] provides
-@racket[begin/text] as @racket[begin].}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/utils.rkt b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/utils.rkt
deleted file mode 100644
index f1acb71dae..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/utils.rkt
+++ /dev/null
@@ -1,230 +0,0 @@
-#lang racket/base
-
-(require scribble/core
-         scribble/html-properties
-         scribble/manual
-         (prefix-in racket: scribble/racket)
-         (prefix-in scribble: scribble/reader))
-
-(define-syntax bounce-for-label
-  (syntax-rules (all-except)
-    [(_ (all-except mod (id ...) (id2 ...)))
-     (begin (require (for-label (except-in mod id ...)))
-            (provide (for-label (except-out (all-from-out mod) id2 ...))))]
-    [(_ mod) (begin (require (for-label mod))
-                    (provide (for-label (all-from-out mod))))]
-    [(_ mod ...) (begin (bounce-for-label mod) ...)]))
-
-(bounce-for-label (all-except racket (abstract link) ())
-                  scribble/core
-                  scribble/base-render
-                  scribble/decode
-                  scribble/manual
-                  scribble/racket
-                  scribble/html-properties
-                  scribble/latex-properties
-                  scribble/eval
-                  scribble/bnf)
-
-(provide scribble-examples litchar/lines doc-render-examples)
-
-(define (as-flow e)
-  (if (block? e) e (make-paragraph plain (list e))))
-
-(define (litchar/lines . strs)
-  (let ([strs (regexp-split #rx"\n" (apply string-append strs))])
-    (if (= 1 (length strs))
-      (litchar (car strs))
-      (make-table
-       plain
-       (map (lambda (s) ; the nbsp is needed for IE
-              (list (as-flow (if (string=? s "") 'nbsp (litchar s)))))
-            strs)))))
-
-(define spacer (hspace 2))
-
-(define ((norm-spacing base) p)
-  (cond [(and (syntax->list p) (not (null? (syntax-e p))))
-         (let loop ([e (syntax->list p)]
-                    [line (syntax-line (car (syntax-e p)))]
-                    [pos base]
-                    [second #f]
-                    [accum null])
-           (if (null? e)
-             (datum->syntax
-              p (reverse accum)
-              (list (syntax-source p) (syntax-line p) base (add1 base)
-                    (- pos base))
-              p)
-             (let* ([v ((norm-spacing (if (= line (syntax-line (car e)))
-                                        pos
-                                        (or second pos)))
-                        (car e))]
-                    [next-pos (+ (syntax-column v) (syntax-span v) 1)])
-               (loop (cdr e)
-                     (syntax-line v)
-                     next-pos
-                     (or second next-pos)
-                     (cons v accum)))))]
-        [else (datum->syntax
-               p (syntax-e p)
-               (list (syntax-source p) (syntax-line p) base (add1 base) 1)
-               p)]))
-
-(define (scribble-examples . lines)
-  (define reads-as (make-paragraph plain (list spacer "reads as" spacer)))
-  (let* ([lines (apply string-append lines)]
-         [p (open-input-string lines)])
-    (port-count-lines! p)
-    (let loop ([r '()] [newlines? #f])
-      (regexp-match? #px#"^[[:space:]]*" p)
-      (let* ([p1  (file-position p)]
-             [stx (scribble:read-syntax #f p)]
-             [p2  (file-position p)])
-        (if (not (eof-object? stx))
-          (let ([str (substring lines p1 p2)])
-            (loop (cons (list str stx) r)
-                  (or newlines? (regexp-match? #rx#"\n" str))))
-          (let* ([r (reverse r)]
-                 [r (if newlines?
-                      (cdr (apply append (map (lambda (x) (list #f x)) r)))
-                      r)])
-            (make-table
-             plain
-             (map (lambda (x)
-                    (let ([@expr (if x (litchar/lines (car x)) "")]
-                          [sexpr (if x
-                                   (racket:to-paragraph
-                                    ((norm-spacing 0) (cadr x)))
-                                   "")]
-                          [reads-as (if x reads-as "")])
-                      (map as-flow (list spacer @expr reads-as sexpr))))
-                  r))))))))
-
-;; stuff for the scribble/text examples
-
-(require racket/list (for-syntax racket/base racket/list))
-
-(define max-textsample-width 45)
-
-(define (textsample-verbatim-boxes line in-text out-text more)
-  (define (split str) (regexp-split #rx"\n" str))
-  (define strs1 (split in-text))
-  (define strs2 (split out-text))
-  (define strsm (map (compose split cdr) more))
-  (define (str->elts str)
-    (let ([spaces (regexp-match-positions #rx"(?:^| ) +" str)])
-      (if spaces
-        (list* (str->elts (substring str 0 (caar spaces)))
-               (smaller (hspace (- (cdar spaces) (caar spaces))))
-               (str->elts (substring str (cdar spaces))))
-        (list (smaller (make-element 'tt str))))))
-  (define (make-line str)
-    (list (as-flow (if (equal? str "")
-                       (smaller (hspace 1))
-                       (str->elts str)))))
-  (define (make-box strs [file #f])
-    (nested #:style 'code-inset
-            (let ([t (make-table plain (map make-line strs))])
-              (if file
-                  (filebox file t)
-                  t))))
-  (define filenames (map car more))
-  (define indent (let ([d (- max-textsample-width
-                             (for*/fold ([m 0])
-                                        ([s (in-list (cons strs1 strsm))]
-                                         [s (in-list s)])
-                               (max m (string-length s))))])
-                   (if (negative? d)
-                     (error 'textsample-verbatim-boxes
-                            "left box too wide for sample at line ~s" line)
-                     (make-element 'tt (list (hspace d))))))
-  ;; Note: the font-size property is reset for every table, so we need it
-  ;; everywhere there's text, and they don't accumulate for nested tables
-  (values
-   (make-table 
-     (make-style #f
-                 (list (make-table-columns (list (make-style #f '(left top))))))
-     (cons (list (as-flow (make-box strs1)))
-           (map (lambda (file strs)
-                  (list (as-flow (make-box strs file))))
-                filenames strsm)))
-   (make-box strs2)))
-
-(define (textsample line in-text out-text more)
-  (define-values (box1 box2)
-    (textsample-verbatim-boxes line in-text out-text more))
-  (make-table 
-   (make-style #f (list (make-table-columns (list (make-style #f '(left vcenter))
-                                                  (make-style "Short" '(left vcenter))
-                                                  (make-style #f '(left vcenter))))))
-    (list (map as-flow (list box1 (make-paragraph plain '(nbsp rarr nbsp)) box2)))))
-
-(define-for-syntax tests-ids #f)
-
-(provide initialize-tests)
-(define-syntax (initialize-tests stx)
-  (set! tests-ids (map (lambda (x) (datum->syntax stx x stx))
-                       '(tests add-to-tests)))
-  (with-syntax ([(tests add-to-tests) tests-ids])
-    #'(begin (provide tests)
-             (define-values (tests add-to-tests)
-               (let ([l '()])
-                 (values (lambda () (reverse l))
-                         (lambda (x) (set! l (cons x l)))))))))
-
-(provide example)
-(define-syntax (example stx)
-  (define sep-rx  #px"^---[*]{3}---(?: +(.*))?$")
-  (define file-rx #rx"^[a-z0-9_.+-]+$")
-  (define-values (body hidden?)
-    (syntax-case stx ()
-      [(_ #:hidden x ...) (values #'(x ...) #t)]
-      [(_          x ...) (values #'(x ...) #f)]))
-  (let loop ([xs body] [text '(#f)] [texts '()])
-    (syntax-case xs ()
-      [("\n" sep "\n" . xs)
-       (and (string? (syntax-e #'sep)) (regexp-match? sep-rx (syntax-e #'sep)))
-       (let ([m (cond [(regexp-match sep-rx (syntax-e #'sep)) => cadr]
-                      [else #f])])
-         (if (and m (not (regexp-match? file-rx m)))
-           (raise-syntax-error #f "bad filename specified" stx #'sep)
-           (loop #'xs
-                 (list (and m (datum->syntax #'sep m #'sep #'sep)))
-                 (cons (reverse text) texts))))]
-      [(x . xs) (loop #'xs (cons #'x text) texts)]
-      [() (let ([texts (reverse (cons (reverse text) texts))]
-                [line  (syntax-line stx)])
-            (define-values (files i/o) (partition car texts))
-            (unless ((length i/o) . = . 2)
-              (raise-syntax-error
-               'example "need at least an input and an output block" stx))
-            (with-syntax ([line  line]
-                          [((in ...) (out ...)) (map cdr i/o)]
-                          [((file text ...) ...) files]
-                          [add-to-tests (cadr tests-ids)])
-              (quasisyntax/loc stx
-                (let* ([in-text  (string-append in ...)]
-                       [out-text (string-append out ...)]
-                       [more (list (cons file (string-append text ...)) ...)])
-                  (add-to-tests (list line in-text out-text more))
-                  #,(if hidden? #'""
-                        #'(textsample line in-text out-text more))))))]
-      [_ (raise-syntax-error #f "no separator found in example text")])))
-
-(provide ltx ltxe ltxd)
-(define (ltx s) (tt "\\" s)) ; command
-(define (ltxe s) (tt s)) ; enviornment
-(define (ltxd n s)
-  (make-element #f (cons (index (list s) (ltx s))
-                         (for/list ([i (in-range n)]) (tt "{}")))))
-
-;; Utility to render examples of scribble documentation forms
-;; Note: it would be nice if this abstracted over the codeblock
-;;       that usually comes along with this too, but that's hard
-;;       because there's a read-time distinction between [...]
-;;       and |{...}|.
-(define-syntax-rule (doc-render-examples e ...)
-  (nested "Renders like:\n"
-          (nested #:style 'inset (nested #:style 'inset e ...))))
-
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/xref.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/xref.scrbl
deleted file mode 100644
index 06a55d188b..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/xref.scrbl
+++ /dev/null
@@ -1,236 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual "utils.rkt"
-          (for-label scribble/xref
-                     scribble/base-render
-                     scribble/html-render
-                     setup/xref))
-
-@title[#:tag "xref"]{Cross-Reference Utilities}
-
-@defmodule[scribble/xref]{The @racketmodname[scribble/xref] library
-provides utilities for querying cross-reference information that was
-collected from a document build.}
-
-@; ------------------------------------------------------------------------
-
-@defproc[(xref? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a cross-reference record created
-by @racket[load-xref], @racket[#f] otherwise.}
-
-
-@defproc[(load-xref [sources (listof (-> (or/c any/c (-> list?))))]
-                    [#:demand-source demand-source 
-                                     (tag? -> (or/c (-> any/c) #f)) 
-                                     (lambda (_tag) #f)]
-                    [#:render% using-render% (implementation?/c render<%>)
-                               (render-mixin render%)]
-                    [#:root root-path (or/c path-string? false/c) #f]
-                    [#:doc-id doc-id-str (or/c path-string? false/c) #f])
-         xref?]{
-
-Creates a cross-reference record given a list of functions,
-@racket[sources]. 
-
-Let @racket[_source] be a function in @racket[sources]. The
-@racket[_source] function normally returns serialized information,
-@racket[_info], which was formerly obtained from @xmethod[render<%>
-serialize-info]. The result of @racket[_source] can optionally be
-another function, which is in turn responsible for returning a list of
-@racket[_info]s. Finally, each @racket[_info] can be either serialized
-information, a @racket[#f] to be ignored, or a value produced by
-@racket[make-data+root] or @racket[make-data+root+doc-id], from which
-@racket[_data] part is used as serialized information, the
-@racket[_root] part overrides @racket[root-path] for deserialization,
-and the @racket[_doc-id] part (if any) overrides
-@racket[doc-id-string] to identify the source document.
-
-The @racket[demand-source] function can effectively add a new source
-to @racket[sources] in response to a search for information on the
-given tag. The @racket[demand-source] function returns @racket[#f]
-to indicate that no new sources satisfy the given tag.
-
-Since the format of serialized information is specific to a rendering
-class, the optional @racket[using-render%] argument accepts the
-relevant class. It defaults to HTML rendering, partly because
-HTML-format information is usable by other formats (including
-Latex/PDF and text).
-
-If @racket[root-path] is not @racket[#f], then file paths that are
-serialized as relative to an instantiation-supplied @racket[root-path]
-are deserialized as relative instead to the given @racket[root-path],
-but a @racket[make-data+root] result for any @racket[_info] supplies
-an alternate path for deserialization of the @racket[_info]'s
-@racket[_data].
-
-If @racket[doc-id-str] is not @racket[#f], it identifies each
-cross-reference entry as originating from @racket[doc-id-str]. This
-identification is used when a rendering link to the cross-reference
-entry as an external query; see the @racket[set-external-tag-path]
-method of @racket[render-mixin].
-
-Use @racket[load-collections-xref] from @racketmodname[setup/xref] to
-get all cross-reference information for installed documentation.
-
-@history[#:changed "1.1" @elem{Added the @racket[#:doc-id] argument.}]}
-
-
-@defproc[(xref-binding->definition-tag [xref xref?]
-                                       [binding (or/c identifier?
-                                                      (list/c (or/c module-path?
-                                                                    module-path-index?)
-                                                              symbol?)
-                                                      (listof module-path-index?
-                                                              symbol?
-                                                              module-path-index?
-                                                              symbol?
-                                                              (one-of/c 0 1)
-                                                              (or/c exact-integer? false/c)
-                                                              (or/c exact-integer? false/c)))]
-                                       [mode (or/c exact-integer? false/c)])
-         (or/c tag? false/c)]{
-
-Locates a tag in @racket[xref] that documents a module export. The
-binding is specified in one of several ways, as described below; all
-possibilities encode an exporting module and a symbolic name. The name
-must be exported from the specified module. Documentation is found
-either for the specified module or, if the exported name is
-re-exported from other other module, for the other module
-(transitively).
-
-The @racket[mode] argument specifies the relevant phase level for the
-binding. The @racket[binding] is specified in one of four ways:
-
-@itemize[
-
- @item{If @racket[binding] is an identifier, then
-       @racket[identifier-binding] is used with @racket[mode] to
-       determine the binding.}
-
- @item{If @racket[binding] is a two-element list, then the first
-       element provides the exporting module and the second the
-       exported name. The @racket[mode] argument is effectively
-       ignored.}
-
- @item{If @racket[binding] is a seven-element list, then it corresponds
-       to a result from @racket[identifier-binding] using
-       @racket[mode].}
-
- @item{If @racket[binding] is a five-element list, then the first
-       element is as for the two-element-list case, and the remain
-       elements are as in the last four elements of the seven-element
-       case.}
-
-]
-
-If a documentation point exists in @racket[xref], a tag is returned,
-which might be used with @racket[xref-tag->path+anchor] or embedded in
-a document rendered via @racket[xref-render]. If no definition point
-is found in @racket[xref], the result is @racket[#f].}
-
-
-@defproc[(xref-tag->path+anchor [xref xref?]
-                                [tag tag?]
-                                [#:external-root-url root-url (or/c string? #f) #f]
-                                [#:render% using-render% (implementation?/c render<%>)
-                                           (render-mixin render%)])
-         (values (or/c false/c path?)
-                 (or/c false/c string?))]{
-
-Returns a path and anchor string designated by the key @racket[tag]
-according the cross-reference @racket[xref]. The first result is
-@racket[#f] if no mapping is found for the given tag. The second
-result is @racket[#f] if the first result is @racket[#f], and it can
-also be @racket[#f] if the tag refers to a page rather than a specific
-point in a page.
-
-If @racket[root-url] is provided, then references to documentation in
-the main installation are redirected to the given URL.
-
-The optional @racket[using-render%] argument is as for
-@racket[load-xref].}
-
-
-@defproc[(xref-tag->index-entry [xref xref?] [tag tag?])
-         (or/c false/c entry?)]{
-
-Extract an @racket[entry] structure that provides addition information
-about the definition (of any) referenced by @racket[tag]. This
-function can be composed with @racket[xref-binding->definition-tag] to
-obtain information about a binding, such as the library that exports
-the binding and its original name.}
-
-
-@defproc[(xref-render [xref xref?]
-                      [doc part?]
-                      [dest (or/c path-string? false/c)]
-                      [#:render% using-render% (implemenation?/c render<%>)
-                                 (render-mixin render%)]
-                      [#:refer-to-existing-files? use-existing? any/c (not dest)])
-         (or/c void? any/c)]{
-
-Renders @racket[doc] using the cross-reference info in @racket[xref]
-to the destination @racket[dest]. For example, @racket[doc] might be a
-generated document of search results using link tags described in
-@racket[xref].
-
-If @racket[dest] is @racket[#f], no file is written, and the result is
-an X-expression for the rendered page. Otherwise, the file
-@racket[dest] is written and the result is @|void-const|.
-
-The optional @racket[using-render%] argument is as for
-@racket[load-xref]. It determines the kind of output that is
-generated.
-
-If @racket[use-existing?] is true, then files referenced during
-rendering (such as image files) are referenced from their existing
-locations, instead of copying to the directory of @racket[dest].}
-
-
-@defproc[(xref-transfer-info [renderer (is-a?/c render<%>)]
-                             [ci collect-info?]
-                             [xref xref?])
-         void?]{
-
-Transfers cross-reference information to @racket[ci], which is the
-initially collected information from @racket[renderer].}
-
-
-@defproc[(xref-index [xref xref?]) (listof entry?)]{
-
-Converts indexing information @racket[xref] into a list of
-@racket[entry] structures.}
-
-
-@defstruct[entry ([words (and/c (listof string?) cons?)]
-                  [content list?]
-                  [tag tag?]
-                  [desc any/c])]{
-
-Represents a single entry in a Scribble document index.
-
-The @racket[words] list corresponds to
-@racket[index-element-plain-seq]. The @racket[content] list
-corresponds to @racket[index-element-entry-seq]. The @racket[desc]
-value corresponds to @racket[index-element-desc]. The @racket[tag] is
-the destination for the index link into the main document.}
-
-
-@deftogether[(
-@defproc[(data+root? [v any/c]) boolean?]
-@defproc[(make-data+root [data any/c] [root (or/c #f path-string?)]) data+root?]
-)]{
-
-A value constructed by @racket[make-data+root] can be returned by a
-source procedure for @racket[load-xref] to specify a path used for
-deserialization.}
-
-@deftogether[(
-@defproc[(data+root+doc-id? [v any/c]) boolean?]
-@defproc[(make-data+root+doc-id [data any/c] [root (or/c #f path-string?)] [doc-id string?]) data+root+doc-id?]
-)]{
-
-Extends @racket[make-data+root+doc-id] to support an
-document-identifying string (see @racket[load-xref]).
-
-@history[#:added "1.1"]}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/autobib.scrbl b/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/autobib.scrbl
deleted file mode 100644
index 0acede1be6..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/autobib.scrbl
+++ /dev/null
@@ -1,234 +0,0 @@
-#lang scribble/manual
-@(require (for-label scribble/struct
-                     scriblib/autobib
-                     scheme/base
-                     scheme/contract))
-
-@title[#:tag "autobib"]{Bibliographies}
-
-@defmodule[scriblib/autobib]
-
-This library provides support for bibliography management in a Scribble
-document. The @racket[define-cite] form is used to bind procedures
-that create in-line citations and generate the bibilography in the
-document.
-
-Individual bibliography entries are created with the @racket[make-bib]
-function. See below for an example.
-
-@codeblock|{
-  #lang scribble/base
-
-  @(require scriblib/autobib)
-
-  @(define-cite ~cite citet generate-bibliography)
-
-  @(define plt-tr1
-     (make-bib
-      #:title    "Reference: Racket"
-      #:author   (authors "Matthew Flatt" "PLT")
-      #:date     "2010"
-      #:location (techrpt-location #:institution "PLT Inc." 
-                                   #:number "PLT-TR-2010-1")
-      #:url      "http://racket-lang.org/tr1/"))
-
-  Racket is fun@~cite[plt-tr1].
-
-  @(generate-bibliography)
-}|
-
-@defform/subs[(define-cite ~cite-id citet-id generate-bibliography-id
-                           option ...)
-              ([option (code:line #:style style-expr)
-                       (code:line #:disambiguate disambiguator-expr)
-                       (code:line #:spaces spaces-expr)
-                       (code:line #:render-date-bib render-date-expr)
-                       (code:line #:render-date-cite render-date-expr)
-                       (code:line #:date<? date-compare-expr)
-                       (code:line #:date=? date-compare-expr)])
-              #:contracts ([style-expr (or/c author+date-style number-style)]
-                           [spaces-expr number]
-                           [disambiguator-expr (or/c #f (-> exact-nonnegative-integer? element?))]
-                           [render-date-expr (or/c #f (-> date? element?))]
-                           [date-compare-expr (or/c #f (-> date? date? boolean?))])]{
-
-Binds @racket[~cite-id], @racket[citet-id], and
-@racket[generate-bibliography-id], which share state to accumulate and
-render citations.
-
-The function bound to @racket[~cite-id] produces a citation referring
-to one or more bibliography entries with a preceding non-breaking
-space, by default sorting the entries to match the bibliography order.
-It has the contract
-
-@racketblock[
-(->* (bib?) (#:sort? any/c) #:rest (listof bib?) element?)
-]
-
-The function bound to @racket[citet-id] generates an element suitable
-for use as a noun---referring to a document or its author---for one
-or more bibliography entries which have the same authors. It has the contract
-
-@racketblock[
-(->* (bib?) () #:rest (listof bib?) element?)
-]
-
-The function bound to @racket[generate-bibliography-id] generates the
-section for the bibliography. It has the contract
-
-@racketblock[
-(->* () (#:tag string? #:sec-title string?) part?)
-]
-
-The default value for the @racket[#:tag] argument is @racket["doc-bibliography"]
-and for @racket[#:sec-title] is @racket["Bibliography"].
-
-The optional @racket[spaces-expr] determines the number of blank lines that appear
-between citations. The default number of lines is 1.
-
-The optional @racket[style-expr] determines the way that citations and
-the bibliography are rendered.@margin-note*{Programmer-defined styles
-may be supported in the future.} Currently, two built-in style are
-provided, and @racket[author+date-style] is the default.
-
-For @racket[author+date-style], 
-if two citations' references would render the same (as judged by equal
-authors and dates that are considered the same) but are different, the
-optionally provided function from @racket[disambiguator-expr] is used
-to add an extra element after the date; the default disambiguator adds
-@litchar{a}, @litchar{b}, @etc until @litchar{z}, and anything more
-ambiguous raises an exception. Date comparison is controlled by
-@racket[date-compare-expr]s. Dates in citations and dates in the
-bibliography may be rendered differently, as specified by the
-optionally given @racket[render-date-expr] functions.}
-
-@deftogether[(
-@defthing[author+date-style any/c]
-@defthing[number-style any/c]
-)]{
-
-Styles for use with @racket[define-cite].}
-
-
-@defproc[(bib? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a value produced by
-@racket[make-bib] or @racket[in-bib], @racket[#f] otherwise.}
-
-
-@defproc[(make-bib [#:title title any/c]
-                   [#:author author any/c #f]
-                   [#:is-book? is-book? any/c #f]
-                   [#:location location any/c #f]
-                   [#:date date (or/c #f date? exact-nonnegative-integer? string?) #f]
-                   [#:url url string? #f]
-                   [#:note note any/c #f])
-         bib?]{
-
-Produces a value that represents a document to cite. Except for
-@racket[is-book?] and @racket[url], the arguments are used as
-content, except that @racket[#f] means that the information is not
-supplied. Functions like @racket[proceedings-location],
-@racket[author-name], and @racket[authors] help produce elements in a
-standard format.
-
-Dates are internally represented as @racket[date] values, so a @racket[date]
-may be given, or a number or string that represent the year.
-
-An element produced by a function like @racket[author-name] tracks
-first, last names, and name suffixes separately, so that names can be
-ordered and rendered correctly. When a string is provided as an author
-name, the last non-empty sequence of alphabetic characters or
-@litchar["-"] after a space is treated as the author name, and the
-rest is treated as the first name.}
-
-@defproc[(in-bib [orig bib?] [where string?]) bib?]{
-
-Extends a bib value so that the rendered citation is suffixed with
-@racket[where], which might be a page or chapter number.}
-
-@defproc[(proceedings-location [location any/c]
-                               [#:pages pages (or (list/c any/c any/c) #f) #f]
-                               [#:series series any/c #f]
-                               [#:volume volume any/c #f])
-         element?]{
-
-Combines elements to generate an element that is suitable for
-describing a paper's location within a conference or workshop
-proceedings.}
-
-@defproc[(journal-location [title any/c]
-                           [#:pages pages (or (list/c any/c any/c) #f) #f]
-                           [#:number number any/c #f]
-                           [#:volume volume any/c #f])
-         element?]{
-
-Combines elements to generate an element that is suitable for
-describing a paper's location within a journal.}
-
-
-@defproc[(book-location [#:edition edition any/c #f]
-                        [#:publisher publisher any/c #f])
-         element?]{
-
-Combines elements to generate an element that is suitable for
-describing a book's location.}
-
-@defproc[(techrpt-location [#:institution institution edition any/c]
-                           [#:number number any/c])
-         element?]{
-
-Combines elements to generate an element that is suitable for
-describing a technical report's location.}
-
-@defproc[(dissertation-location [#:institution institution edition any/c]
-                                [#:degree degree any/c "PhD"])
-         element?]{
-
-Combines elements to generate an element that is suitable for
-describing a dissertation.}
-
-
-@defproc[(author-name [first any/c]
-                      [last any/c]
-                      [#:suffix suffix any/c #f])
-         element?]{
-
-Combines elements to generate an element that is suitable for
-describing an author's name, especially where the last name is not
-merely a sequence of ASCII alphabet letters or where the name has a
-suffix (such as ``Jr.'').}
-
-@defproc[(authors [name content?] [names content?] ...) element?]{
-
-Combines multiple author elements into one, so that it is rendered and
-alphabetized appropriately. Any of @racket[name] or @racket[names]
-that are strings are
-parsed in the same way as by @racket[make-bib].}
-
-@defproc[(org-author-name [name any/c]) element?]{
-
-Converts an element for an organization name to one suitable for use
-as a bib-value author.}
-
-@defproc[(other-authors) element?]{
-
-Generates an element that is suitable for use as a ``others'' author.
-When combined with another author element via @racket[authors], the
-one created by @racket[other-authors] renders as ``et al.''}
-
-@defproc[(editor [name name/c]) element?]{
-
-Takes an author-name element and create one that represents the editor
-of a collection. If a @racket[name] is a string, it is parsed in the
-same way as by @racket[make-bib].}
-
-@defparam[abbreviate-given-names abbreviate? any/c]{
-  Shortens given names in calls to @racket[author] and @racket[make-bib]
-  to just the first initial when the parameter value is not @racket[#f].
-  Otherwise, does not change the author names.
-  
-  Defaults to @racket[#f].
-  
-  @history[#:added "1.5"]
-}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/bibtex.scrbl b/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/bibtex.scrbl
deleted file mode 100644
index c89853abce..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/bibtex.scrbl
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang scribble/manual
-@(require (for-label scribble/struct
-                     scriblib/bibtex
-                     scriblib/autobib
-                     racket/base
-                     racket/contract))
-
-@title[#:tag "bibtex"]{BibTeX Bibliographies}
-
-@defmodule[scriblib/bibtex]
-
-@defform[(define-bibtex-cite bib-pth ~cite-id citet-id generate-bibliography-id . options)]{
-
-This expands into:
-@racketblock[
-(begin
-  (define-cite autobib-cite autobib-citet generate-bibliography-id . options)
-  (define-bibtex-cite* bib-pth
-    autobib-cite autobib-citet
-    ~cite-id citet-id))]
-}
-
-@defform[(define-bibtex-cite* bib-pth autobib-cite autobib-citet ~cite-id citet-id)]{
-
-Parses @racket[bib-pth] as a BibTeX database.
-
-Augments @racket[autobib-cite] and @racket[autobib-citet] into @racket[~cite-id] and @racket[citet-id] functions so that rather than accepting @racket[bib?] structures, they accept citation key strings.
-       
-Each string is broken along spaces into citations keys that are looked up in the BibTeX database and turned into @racket[bib?] structures.
-
-The only BibTeX entries that are supported are: @litchar{misc},
-@litchar{book}, @litchar{article}, @litchar{inproceedings},
-@litchar{webpage}, @litchar{mastersthesis}, and @litchar{techreport}.
-
-}
-
-@defstruct*[bibdb ([raw (hash/c string? (hash/c string? string?))]
-                   [bibs (hash/c string? bib?)])]{
-                                             Represents a BibTeX database. The @racket[_raw] hash table maps the labels in the file to hash tables of the attributes and their values. The @racket[_bibs] hash table maps the same labels to Scribble data-structures representing the same information.
-                                             }
-
-@defproc[(path->bibdb [path path-string?])
-         bibdb?]{
-                 Parses a path into a BibTeX database.
-                 }
-
-@defproc[(bibtex-parse [ip input-port?])
-         bibdb?]{
-                 Parses an input port into a BibTeX database.
-                 }
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/figure.scrbl b/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/figure.scrbl
deleted file mode 100644
index dc7a84be56..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/figure.scrbl
+++ /dev/null
@@ -1,129 +0,0 @@
-#lang scribble/manual
-@(require (for-label scribble/core
-                     scribble/decode
-                     scriblib/figure
-                     scheme/base
-                     scheme/contract))
-
-@(define-syntax-rule (sn s) @racket[s])
-
-@title[#:tag "figure"]{Figures}
-
-@defmodule[scriblib/figure]
-
-@deftogether[(
-@defproc[(figure [tag string?] [caption content?] 
-                 [p pre-flow?] ...
-                 [#:style style style? center-figure-style]
-                 [#:continue? continue? any/c #f]) 
-         block?]
-@defproc[(figure* [tag string?] [caption content?]
-                  [p pre-flow?] ...
-                  [#:style style style? center-figure-style]
-                 [#:continue? continue? any/c #f])
-         block?]
-@defproc[(figure** [tag string?] [caption content?]
-                   [p pre-flow?] ...
-                   [#:style style style? center-figure-style]
-                   [#:continue? continue? any/c #f])
-         block?]
-@defproc[(figure-here [tag string?] [caption content?]
-                      [pre-flow pre-flow?] ...
-                      [#:style style style? center-figure-style]
-                      [#:continue? continue? any/c #f])
-         block?]
-)]{
-
-Creates a figure. The given @racket[tag] is for use with
-@racket[figure-ref] or @racket[Figure-ref]. The @racket[caption] is an
-element. The @racket[pre-flow] is decoded as a flow.
-
-For HTML output, the @racket[figure] and @racket[figure*] functions
-are the same, while @racket[figure**] allows the content to be wider
-than the document body.  For two-column Latex output, @racket[figure*]
-and @racket[figure**] generate a figure that spans columns.
-
-For Latex output, @racket[figure-here] generates a figure to be included at
-the position in the output text where the @racket[figure-here] occurs
-in the source text. For HTML output, all @racket[figure] variants
-place the figure where the use appears in the source text.
-
-By default, @racket[style] is set so that the content of the figure is
-centered.  Use @racket[left-figure-style], @racket[center-figure-style],
-or @racket[right-figure-style] to specify the alignment.
-
-If @racket[continue?] is a true value, then the figure counter is not
-incremented.}
-
-@deftogether[(
-@defthing[left-figure-style style?]
-@defthing[center-figure-style style?]
-@defthing[right-figure-style style?]
-@defthing[left style?]
-)]{
-Implements figure alignments.
-
-The @racket[left] binding is a synonym for @racket[left-figure-style],
-provided for backward compatibility.}
-
-
-@defproc[(figure-ref [tag string?] ...+) element?]{
-
-Generates a reference to one or more figures, using a lowercase word ``figure''.}
-
-
-@defproc[(Figure-ref [tag string?] ...+) element?]{
-
-Generates a reference to one or more figures, capitalizing the word ``Figure''.}
-
-
-@defproc[(Figure-target [tag string?]
-                        [#:continue? continue? any/c #f]) 
-         element?]{
-
-Generates a new figure label. This function is normally not used
-directly, since it is used by @racket[figure].}
-
-
-@defproc[(suppress-floats) element?]{
-
-Produces an empty element that renders in Latex as
-@tt{\suppressfloats}, which discourages the placement of figures in
-the column or page of the surrounding text.}
-
-
-@section{Configuring Output}
-
-Output uses the following style names, which can be adjusted in an
-overriding @filepath{.css} or @filepath{.tex} specification:
-
-@itemize[
-
- @item{@sn{Figure}, @sn{FigureMulti}, @sn{FigureMultiWide}, or
-       @sn{HereFigure} --- used for the outer of three
-       @racket[nested-flow]s for a figure, depending on whether
-       @racket[figure], @racket[figure*], @racket[figure**], or
-       @racket[figure-here] is used to generate the figure.}
-
- @item{@sn{Leftfigure}, @sn{Centerfigure}, or @sn{Rightfigure} ---
-       used for the middle of three @racket[nested-flow]s for a
-       figure, depending on the specified style.}
-
- @item{@sn{FigureInside} --- used for the inner of three
-       @racket[nested-flow]s for a figure.}
-
- @item{@sn{Legend} --- Wraps the caption for a figure.}
-
- @item{@sn{LegendContinued} --- Wraps the caption for a figure that
-       does not increment the figure counter.}
-
- @item{@sn{FigureTarget} --- Wraps the label anchor and text within a
-       figure's caption.  For Latex output, the corresponding command
-       is given a second argument, which is just the generated label
-       (used with @tt{\label} in the command's first argument).}
-
- @item{@sn{FigureRef} --- Wraps a reference to a figure. For Latex
-       output, the corresponding command is given a second argument,
-       which is just the target label.}
-
-]
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/footnote.scrbl b/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/footnote.scrbl
deleted file mode 100644
index c8f3f57e56..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/footnote.scrbl
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang scribble/manual
-@(require (for-label scribble/struct
-                     scriblib/footnote
-                     scheme/base
-                     scheme/contract))
-
-@title[#:tag "footnotes"]{Footnotes}
-
-@defmodule[scriblib/footnote]
-
-@defproc[(note [pre-content pre-content?] ...) element?]{
-
-Creates a margin note for HTML and a footnote for Latex/PDF output.}
-
-@defform[(define-footnote footnote-id footnote-part-id)]{
-
-Binds @racket[footnote-id] to a form like @racket[note] that generates
-a footnote in HTML output as well as Latex/PDF output. To trigger the
-HTML output of the footnotes that are registered through
-@racket[footnote-id], the function bound to @racket[footnote-part-id]
-must be called at a position that corresponds the bottom of the HTML
-page. (The generated section will not show a title or appear in a
-table of contents; it will look like a footnote area.)
-
-Beware that any content passed to @racket[footnote-id] will occur
-twice in at least an intermediate form of the document, and perhaps
-also in the rendered form of the document. Consequently, the content
-passed to @racket[footnote-id] should not bind link targets or include
-other one-time declarations.}
-
-
-
-
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/gui-eval.scrbl b/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/gui-eval.scrbl
deleted file mode 100644
index 29dba0f616..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/gui-eval.scrbl
+++ /dev/null
@@ -1,81 +0,0 @@
-#lang scribble/manual
-@(require (for-label scribble/eval scriblib/gui-eval))
-
-@title[#:tag "gui-eval"]{Examples Using the GUI Toolbox}
-
-@defmodule[scriblib/gui-eval]{The
-@racketmodname[scriblib/gui-eval] library support example
-evaluations that use @racketmodname[racket/gui] facilities (as opposed
-to just @racketmodname[racket/draw]) to generate text and image results.}
-
-The trick is that @racketmodname[racket/gui] is not generally
-available when rendering documentation, because it requires a GUI
-context. Text and image output is rendered to an image file when the
-@envvar{MREVAL} environment variable is set, so run the enclosing
-document once with the environment varibale to generate the
-images. Future runs (with the environment variable unset) use the
-generated image.
-
-@deftogether[(
-@defform*[((gui-interaction datum ...)
-               (gui-interaction 
-                #:eval+opts the-eval get-predicate? get-render 
-                            get-get-width get-get-height
-                datum ...))
-               ]
-@defform*[((gui-interaction-eval datum ...)
-           (gui-interaction-eval 
-            #:eval+opts the-eval get-predicate? get-render 
-                        get-get-width get-get-height
-            datum ... ))]
-@defform*[((gui-interaction-eval-show datum ...)
-           (gui-interaction-eval-show
-            #:eval+opts the-eval get-predicate? get-render 
-                        get-get-width get-get-height
-            datum ...))]
-@defform*[((gui-racketblock+eval datum ...)
-           (gui-racketblock+eval
-            #:eval+opts the-eval get-predicate? get-render 
-                        get-get-width get-get-height
-            datum ...))]
-@defform*[((gui-racketmod+eval datum ...)
-           (gui-racketmod+eval
-            #:eval+opts the-eval get-predicate? get-render 
-                        get-get-width get-get-height
-            datum ...))]
-@defform*[((gui-def+int datum ...)
-           (gui-def+int
-            #:eval+opts the-eval get-predicate? get-render 
-                        get-get-width get-get-height
-            datum ...))]
-@defform*[((gui-defs+int datum ...)
-           (gui-defs+int
-            #:eval+opts the-eval get-predicate? get-render 
-                        get-get-width get-get-height
-            datum ...))]
-)]{
-
-The first option of each of the above is
-like @racket[interaction], etc., but actually evaluating the forms
-only when the @envvar{MREVAL} environment variable is set, and then in
-an evaluator that is initialized with @racketmodname[racket/gui/base]
-and @racketmodname[slideshow].
-
-The second option of each allows you to specify your own evaluator via
-the @racket[the-eval] argument and then to specify four thunks that
-return functions for finding and rendering graphical objects:
-@itemize[
-         @item{@racket[get-predicate? : (-> (-> any/c boolean?))]
-                Determines if a value is a graphical object (and thus handled by the other operations)}
-         @item{@racket[get-render : (-> (-> any/c (is-a?/c dc<%>) number? number? void?))]
-                Draws a graphical object (only called if the predicate returned @racket[#t]; the first
-                argument will be the value for which the predicate holds).}
-         @item{@racket[get-get-width : (-> (-> any/c number?))]
-                Gets the width of a graphical object (only called if the predicate returned @racket[#t]; the first
-                argument will be the value for which the predicate holds).}
-         @item{@racket[get-get-height : (-> (-> any/c number?))]
-                Gets the height of a graphical object (only called if the predicate returned @racket[#t]; the first
-                argument will be the value for which the predicate holds).}
-          ]
-
-}
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/info.rkt b/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/info.rkt
deleted file mode 100644
index a7f9102671..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("scriblib.scrbl" (multi-page))))
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/render-cond.scrbl b/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/render-cond.scrbl
deleted file mode 100644
index 4bcb292449..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/render-cond.scrbl
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang scribble/manual
-@(require (for-label scribble/core
-                     racket/base
-                     scriblib/render-cond))
-
-@(define scribble-doc '(lib "scribblings/scribble/scribble.scrbl"))
-
-@title[#:tag "render-cond"]{Conditional Content}
-
-@defmodule[scriblib/render-cond]
-
-As much as possible, Scribble documents should be independent of the
-target format for rendering the document. To customize generated
-output, use styes plus ``back end'' configurations for each target
-format (see @secref[#:doc scribble-doc "config"] in
-@other-manual[scribble-doc]).
-
-As a last resort, the @racket[cond-element] and @racket[cond-block]
-forms support varying the document content depending on the target
-format. More precisely, they generate parts of a document where
-content is delayed until the @tech[#:doc scribble-doc]{traverse pass}
-of document rendering. Format detection relies on the
-@racket['scribble:current-render-mode] registration that is accessible
-through a @racket[traverse-element] or @racket[traverse-block].
-
-The syntax of @racket[cond-element] and @racket[cond-block] is based
-on SRFI-0.
-
-@defform*/subs[#:literals (and or not else)
-               [(cond-element [feature-requirement body ...+])
-                (cond-element [feature-requirement body ...+] [else body ...+])]
-               ([feature-requirement identifier
-                                     (not feature-requirement)
-                                     (and feature-requirement ...)
-                                     (or feature-requirement ...)])]{
-
-Generates a @racket[traverse-element] whose replacement content is
-produced by the @racket[body] of one of the first matching
-@racket[cond-element] clause.
-
-A @racket[feature-requirement] can be any identifier; a useful
-identifier is one whose symbol form can appear in a
-@racket['scribble:current-render-mode] list. The identifier matches
-when its symbol form is in the @racket['scribble:current-render-mode]
-list.  Typically, the identifier is @racket[html], @racket[latex], or
-@racket[text] to indicate the corresponding rendering target.
-
-A @racket[(not feature-requirement)] test matches when
-@racket[feature-requirement] does not match, and so on. An
-@racket[else] clause always matches. If no @racket[else] clause is
-present and no clause matches, then the @racket[exn:fail:contract]
-exception is raised. Similarly, if the result of the selected
-@racket[body] is not content according to @racket[content?], then the
-@racket[exn:fail:contract] exception is raised.}
-
-@defform*[[(cond-block [feature-requirement body ...+])
-           (cond-block [feature-requirement body ...+] [else body ...+])]]{
-
-Like @racket[cond-element], but generates a @racket[traverse-block]
-where the selected @racket[body] must produce a block according to
-@racket[block?].}
-
-
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/scriblib.scrbl b/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/scriblib.scrbl
deleted file mode 100644
index 55b7fb5bf7..0000000000
--- a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/scriblib.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scribble/manual
-
-@title{Scriblib: Extra Scribble Libraries}
-
-@table-of-contents[]
-
-@include-section["gui-eval.scrbl"]
-@include-section["figure.scrbl"]
-@include-section["autobib.scrbl"]
-@include-section["bibtex.scrbl"]
-@include-section["footnote.scrbl"]
-@include-section["render-cond.scrbl"]
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/LICENSE.txt b/pkgs/scribble-pkgs/scribble-html-lib/LICENSE.txt
deleted file mode 100644
index f31116b71f..0000000000
--- a/pkgs/scribble-pkgs/scribble-html-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-scribble-text-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/info.rkt b/pkgs/scribble-pkgs/scribble-html-lib/info.rkt
deleted file mode 100644
index 3fc25086f6..0000000000
--- a/pkgs/scribble-pkgs/scribble-html-lib/info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base" "at-exp-lib"
-               "scribble-text-lib"))
-
-(define pkg-desc "Language for HTML with embedded Racket code")
-
-(define pkg-authors '(mflatt eli))
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html.rkt b/pkgs/scribble-pkgs/scribble-html-lib/scribble/html.rkt
deleted file mode 100644
index 7d69f7c0ea..0000000000
--- a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require "html/main.rkt")
-(provide (all-from-out "html/main.rkt"))
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/html.rkt b/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/html.rkt
deleted file mode 100644
index 5bc0a1dd04..0000000000
--- a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/html.rkt
+++ /dev/null
@@ -1,471 +0,0 @@
-#lang racket/base
-
-;; (X)HTML elements etc.
-
-(require "xml.rkt" scribble/text)
-
-;; ----------------------------------------------------------------------------
-;; Doctype line
-
-(provide doctype)
-(define (doctype type)
-  (cond [(string? type) (literal "<!DOCTYPE " type ">\n")]
-        [(eq? 'html type) (doctype "html")]
-        [(eq? 'xhtml type)
-         (list (literal "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
-               (doctype (string-append
-                         "html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""
-                         " \"http://www.w3.org/TR/xhtml1/DTD/"
-                         "xhtml1-strict.dtd\"")))]
-        [else (raise-type-error 'doctype
-                                "string or known doctype symbol" type)]))
-
-;; ----------------------------------------------------------------------------
-;; Xhtml toplevel
-
-;; creation of xhtml files requires some extra stuff
-(define xhtml-prefix (doctype 'xhtml))
-(provide xhtml)
-(define (xhtml . body)
-  (list xhtml-prefix
-        (apply html 'xmlns: "http://www.w3.org/1999/xhtml" body)
-        "\n"))
-
-;; ----------------------------------------------------------------------------
-;; Elements
-
-;; For complete reference: http://www.w3.org/TR/html/dtds.html
-;;  (See also http://www.w3schools.com/tags/)
-
-;; The dtds, in increasing size:
-;;   http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd
-;;   http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd
-;;   http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd
-
-;; These are all entities, taked from the DTDs.  The ones marked with "[*]" are
-;; defined later, since they need a different definition.
-(define/provide-elements/not-empty
-  ;; ========== Document Structure
-  html
-  ;; ========== Document Head
-  head
-  ;; The title element is not considered part of the flow of text.
-  ;; It should be displayed, for example as the page header or
-  ;; window title. Exactly one title is required per document.
-  title
-  ;; base ; document base URI, can be empty [*]
-  ;; meta ; generic metainformation, can be empty [*]
-  ;; link ; relationship values, can be empty [*]
-  style ; style info, which may include CDATA sections
-  script ; script statements, which may include CDATA sections
-  noscript ; alternate content container for non script-based rendering
-  ;; ========== Frames
-  frameset ; only one noframes element permitted per document
-  frame ; tiled window within frameset
-  iframe ; inline subwindow
-  noframes ; alternate content container for non frame-based rendering
-  ;; ========== Document Body
-  body
-  div ; generic language/style container
-  ;; ========== Paragraphs
-  p
-  ;; ========== Headings
-  h1
-  h2
-  h3
-  h4
-  h5
-  h6
-  ;; ========== Lists
-  ul ; Unordered list
-  ol ; Ordered (numbered) list
-  menu ; single column list (DEPRECATED)
-  dir ; multiple column list (DEPRECATED)
-  li ; list item
-  dl ; definition lists - dt for term, dd for its definition
-  dt
-  dd
-  ;; ========== Address
-  address ; information on author
-  ;; ========== Horizontal Rule
-  ;; hr ; horizontal rule can be empty [*]
-  ;; ========== Preformatted Text
-  pre
-  ;; ========== Block-like Quotes
-  blockquote
-  ;; ========== Text alignment
-  center ; center content
-  ;; ========== Inserted/Deleted Text
-  ins
-  del
-  ;; ========== The Anchor Element
-  a ; content is inline; except that anchors shouldn't be nested
-  ;; ========== Inline Elements
-  span ; generic language/style container
-  bdo ; I18N BiDi over-ride
-  ;; br ; forced line break, can be empty [*]
-  em ; emphasis
-  strong ; strong emphasis
-  dfn ; definitional
-  code ; program code
-  samp ; sample
-  kbd ; something user would type
-  var ; variable
-  cite ; citation
-  abbr ; abbreviation
-  acronym ; acronym
-  q ; inlined quote
-  sub ; subscript
-  sup ; superscript
-  tt ; fixed pitch font
-  i ; italic font
-  b ; bold font
-  big ; bigger font
-  small ; smaller font
-  u ; underline
-  s ; strike-through
-  strike ; strike-through
-  ;; basefont ; base font size, can be empty [*]
-  font ; local change to font
-  ;; ========== Object
-  object ; embeded objects
-  ;; param ; parameters for objects, can also specify as attrs, can be empty [*]
-  applet ; Java applet
-  ;; ========== Images
-  ;; To avoid accessibility problems for people who aren't
-  ;; able to see the image, you should provide a text
-  ;; description using the alt and longdesc attributes.
-  ;; In addition, avoid the use of server-side image maps.
-  ;; img ; can be empty [*]
-  ;; ========== Client-side image maps
-  ;; map ; collides with scheme, but not really useful
-  ;; area ; can be empty [*]
-  ;; ========== Forms
-  form ; forms shouldn't be nested
-  label ; text that belongs to a form control
-  ;; input ; form control, can be empty [*]
-  select ; option selector
-  optgroup ; option group
-  option ; selectable choice
-  textarea ; multi-line text field
-  fieldset ; group form fields
-  legend ; fieldset label (one per fieldset)
-  button ; push button
-  ;; isindex ; single-line text input control (DEPRECATED), can be empty [*]
-  ;; ========== Tables
-  table ; holds caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+)
-  caption ; caption text
-  thead ; header part, holds tr
-  tfoot ; footer part, holds tr
-  tbody ; body part, holds tr
-  colgroup ; column group, olds col
-  ;; col ; column info, has only attributes, can be empty [*]
-  tr ; holds th or td
-  th ; header cell
-  td ; table cell
-  )
-
-;; [*] empty elements, these are listed with an `EMPTY' content in
-;; http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd
-(define/provide-elements/empty
-  base meta link hr br basefont param img area input isindex col)
-
-;; [*] elements with a cdata/comment body
-(provide script/inline)
-(define (script/inline . args)
-  (define-values [attrs body] (attributes+body args))
-  (make-element
-   'script attrs
-   `("\n" ,(set-prefix 0 (apply cdata #:line-prefix "//" body)) "\n")))
-(provide style/inline)
-(define (style/inline . args)
-  (define-values [attrs body] (attributes+body args))
-  (make-element 'style attrs `("\n" ,body "\n")))
-
-;; ----------------------------------------------------------------------------
-;; Entities
-
-;; The three dtds that define the set of entities are at:
-;;   http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent
-;;   http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent
-;;   http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent
-
-(define/provide-entities
- nbsp ndash mdash bull middot sdot lsquo rsquo sbquo ldquo rdquo bdquo
- lang rang dagger Dagger plusmn deg)
-
-#; ; the complete list
-(define/provide-entities
-  ;; 24.2 Character entity references for ISO 8859-1 characters
-  nbsp     ;00A0 no-break space = non-breaking space
-  iexcl    ;00A1 inverted exclamation mark
-  cent     ;00A2 cent sign
-  pound    ;00A3 pound sign
-  curren   ;00A4 currency sign
-  yen      ;00A5 yen sign = yuan sign
-  brvbar   ;00A6 broken bar = broken vertical bar
-  sect     ;00A7 section sign
-  uml      ;00A8 diaeresis = spacing diaeresis
-  copy     ;00A9 copyright sign
-  ordf     ;00AA feminine ordinal indicator
-  laquo    ;00AB left-pointing double angle quotation mark = left pointing guillemet
-  not      ;00AC not sign
-  shy      ;00AD soft hyphen = discretionary hyphen
-  reg      ;00AE registered sign = registered trade mark sign
-  macr     ;00AF macron = spacing macron = overline = APL overbar
-  deg      ;00B0 degree sign
-  plusmn   ;00B1 plus-minus sign = plus-or-minus sign
-  sup2     ;00B2 superscript two = superscript digit two = squared
-  sup3     ;00B3 superscript three = superscript digit three = cubed
-  acute    ;00B4 acute accent = spacing acute
-  micro    ;00B5 micro sign
-  para     ;00B6 pilcrow sign = paragraph sign
-  middot   ;00B7 middle dot = Georgian comma = Greek middle dot
-  cedil    ;00B8 cedilla = spacing cedilla
-  sup1     ;00B9 superscript one = superscript digit one
-  ordm     ;00BA masculine ordinal indicator
-  raquo    ;00BB right-pointing double angle quotation mark = right pointing guillemet
-  frac14   ;00BC vulgar fraction one quarter = fraction one quarter
-  frac12   ;00BD vulgar fraction one half = fraction one half
-  frac34   ;00BE vulgar fraction three quarters = fraction three quarters
-  iquest   ;00BF inverted question mark = turned question mark
-  Agrave   ;00C0 latin capital letter A with grave = latin capital letter A grave
-  Aacute   ;00C1 latin capital letter A with acute
-  Acirc    ;00C2 latin capital letter A with circumflex
-  Atilde   ;00C3 latin capital letter A with tilde
-  Auml     ;00C4 latin capital letter A with diaeresis
-  Aring    ;00C5 latin capital letter A with ring above = latin capital letter A ring
-  AElig    ;00C6 latin capital letter AE = latin capital ligature AE
-  Ccedil   ;00C7 latin capital letter C with cedilla
-  Egrave   ;00C8 latin capital letter E with grave
-  Eacute   ;00C9 latin capital letter E with acute
-  Ecirc    ;00CA latin capital letter E with circumflex
-  Euml     ;00CB latin capital letter E with diaeresis
-  Igrave   ;00CC latin capital letter I with grave
-  Iacute   ;00CD latin capital letter I with acute
-  Icirc    ;00CE latin capital letter I with circumflex
-  Iuml     ;00CF latin capital letter I with diaeresis
-  ETH      ;00D0 latin capital letter ETH
-  Ntilde   ;00D1 latin capital letter N with tilde
-  Ograve   ;00D2 latin capital letter O with grave
-  Oacute   ;00D3 latin capital letter O with acute
-  Ocirc    ;00D4 latin capital letter O with circumflex
-  Otilde   ;00D5 latin capital letter O with tilde
-  Ouml     ;00D6 latin capital letter O with diaeresis
-  times    ;00D7 multiplication sign
-  Oslash   ;00D8 latin capital letter O with stroke = latin capital letter O slash
-  Ugrave   ;00D9 latin capital letter U with grave
-  Uacute   ;00DA latin capital letter U with acute
-  Ucirc    ;00DB latin capital letter U with circumflex
-  Uuml     ;00DC latin capital letter U with diaeresis
-  Yacute   ;00DD latin capital letter Y with acute
-  THORN    ;00DE latin capital letter THORN
-  szlig    ;00DF latin small letter sharp s = ess-zed
-  agrave   ;00E0 latin small letter a with grave = latin small letter a grave
-  aacute   ;00E1 latin small letter a with acute
-  acirc    ;00E2 latin small letter a with circumflex
-  atilde   ;00E3 latin small letter a with tilde
-  auml     ;00E4 latin small letter a with diaeresis
-  aring    ;00E5 latin small letter a with ring above = latin small letter a ring
-  aelig    ;00E6 latin small letter ae = latin small ligature ae
-  ccedil   ;00E7 latin small letter c with cedilla
-  egrave   ;00E8 latin small letter e with grave
-  eacute   ;00E9 latin small letter e with acute
-  ecirc    ;00EA latin small letter e with circumflex
-  euml     ;00EB latin small letter e with diaeresis
-  igrave   ;00EC latin small letter i with grave
-  iacute   ;00ED latin small letter i with acute
-  icirc    ;00EE latin small letter i with circumflex
-  iuml     ;00EF latin small letter i with diaeresis
-  eth      ;00F0 latin small letter eth
-  ntilde   ;00F1 latin small letter n with tilde
-  ograve   ;00F2 latin small letter o with grave
-  oacute   ;00F3 latin small letter o with acute
-  ocirc    ;00F4 latin small letter o with circumflex
-  otilde   ;00F5 latin small letter o with tilde
-  ouml     ;00F6 latin small letter o with diaeresis
-  divide   ;00F7 division sign
-  oslash   ;00F8 latin small letter o with stroke, = latin small letter o slash
-  ugrave   ;00F9 latin small letter u with grave
-  uacute   ;00FA latin small letter u with acute
-  ucirc    ;00FB latin small letter u with circumflex
-  uuml     ;00FC latin small letter u with diaeresis
-  yacute   ;00FD latin small letter y with acute
-  thorn    ;00FE latin small letter thorn
-  yuml     ;00FF latin small letter y with diaeresis
-
-  ;; 24.3 Character entity references for symbols, mathematical symbols, and
-  ;;      Greek letters
-  ;; Latin Extended-B
-  fnof     ;0192 latin small f with hook = function = florin
-  ;; Greek
-  Alpha    ;0391 greek capital letter alpha
-  Beta     ;0392 greek capital letter beta
-  Gamma    ;0393 greek capital letter gamma
-  Delta    ;0394 greek capital letter delta
-  Epsilon  ;0395 greek capital letter epsilon
-  Zeta     ;0396 greek capital letter zeta
-  Eta      ;0397 greek capital letter eta
-  Theta    ;0398 greek capital letter theta
-  Iota     ;0399 greek capital letter iota
-  Kappa    ;039A greek capital letter kappa
-  Lambda   ;039B greek capital letter lambda
-  Mu       ;039C greek capital letter mu
-  Nu       ;039D greek capital letter nu
-  Xi       ;039E greek capital letter xi
-  Omicron  ;039F greek capital letter omicron
-  Pi       ;03A0 greek capital letter pi
-  Rho      ;03A1 greek capital letter rho
-  Sigma    ;03A3 greek capital letter sigma
-  Tau      ;03A4 greek capital letter tau
-  Upsilon  ;03A5 greek capital letter upsilon
-  Phi      ;03A6 greek capital letter phi
-  Chi      ;03A7 greek capital letter chi
-  Psi      ;03A8 greek capital letter psi
-  Omega    ;03A9 greek capital letter omega
-  alpha    ;03B1 greek small letter alpha
-  beta     ;03B2 greek small letter beta
-  gamma    ;03B3 greek small letter gamma
-  delta    ;03B4 greek small letter delta
-  epsilon  ;03B5 greek small letter epsilon
-  zeta     ;03B6 greek small letter zeta
-  eta      ;03B7 greek small letter eta
-  theta    ;03B8 greek small letter theta
-  iota     ;03B9 greek small letter iota
-  kappa    ;03BA greek small letter kappa
-  lambda   ;03BB greek small letter lambda
-  mu       ;03BC greek small letter mu
-  nu       ;03BD greek small letter nu
-  xi       ;03BE greek small letter xi
-  omicron  ;03BF greek small letter omicron
-  pi       ;03C0 greek small letter pi
-  rho      ;03C1 greek small letter rho
-  sigmaf   ;03C2 greek small letter final sigma
-  sigma    ;03C3 greek small letter sigma
-  tau      ;03C4 greek small letter tau
-  upsilon  ;03C5 greek small letter upsilon
-  phi      ;03C6 greek small letter phi
-  chi      ;03C7 greek small letter chi
-  psi      ;03C8 greek small letter psi
-  omega    ;03C9 greek small letter omega
-  thetasym ;03D1 greek small letter theta symbol
-  upsih    ;03D2 greek upsilon with hook symbol
-  piv      ;03D6 greek pi symbol
-  ;; *** General Punctuation
-  bull     ;2022 bullet = black small circle
-  hellip   ;2026 horizontal ellipsis = three dot leader
-  prime    ;2032 prime = minutes = feet
-  Prime    ;2033 double prime = seconds = inches
-  oline    ;203E overline = spacing overscore
-  frasl    ;2044 fraction slash
-  ;; *** Letterlike Symbols
-  weierp   ;2118 script capital P = power set = Weierstrass p
-  image    ;2111 blackletter capital I = imaginary part
-  real     ;211C blackletter capital R = real part symbol
-  trade    ;2122 trade mark sign
-  alefsym  ;2135 alef symbol = first transfinite cardinal
-  ;; *** Arrows
-  larr     ;2190 leftwards arrow
-  uarr     ;2191 upwards arrow
-  rarr     ;2192 rightwards arrow
-  darr     ;2193 downwards arrow
-  harr     ;2194 left right arrow
-  crarr    ;21B5 downwards arrow with corner leftwards = carriage return
-  lArr     ;21D0 leftwards double arrow
-  uArr     ;21D1 upwards double arrow
-  rArr     ;21D2 rightwards double arrow
-  dArr     ;21D3 downwards double arrow
-  hArr     ;21D4 left right double arrow
-  ;; Mathematical Operators
-  forall   ;2200 for all
-  part     ;2202 partial differential
-  exist    ;2203 there exists
-  empty    ;2205 empty set = null set = diameter
-  nabla    ;2207 nabla = backward difference
-  isin     ;2208 element of
-  notin    ;2209 not an element of
-  ni       ;220B contains as member
-  prod     ;220F n-ary product = product sign
-  sum      ;2211 n-ary sumation
-  minus    ;2212 minus sign
-  lowast   ;2217 asterisk operator
-  radic    ;221A square root = radical sign
-  prop     ;221D proportional to
-  infin    ;221E infinity
-  ang      ;2220 angle
-  and      ;2227 logical and = wedge
-  or       ;2228 logical or = vee
-  cap      ;2229 intersection = cap
-  cup      ;222A union = cup
-  int      ;222B integral
-  there4   ;2234 therefore
-  sim      ;223C tilde operator = varies with = similar to
-  cong     ;2245 approximately equal to
-  asymp    ;2248 almost equal to = asymptotic to
-  ne       ;2260 not equal to
-  equiv    ;2261 identical to
-  le       ;2264 less-than or equal to
-  ge       ;2265 greater-than or equal to
-  sub      ;2282 subset of
-  sup      ;2283 superset of
-  nsub     ;2284 not a subset of
-  sube     ;2286 subset of or equal to
-  supe     ;2287 superset of or equal to
-  oplus    ;2295 circled plus = direct sum
-  otimes   ;2297 circled times = vector product
-  perp     ;22A5 up tack = orthogonal to = perpendicular
-  sdot     ;22C5 dot operator
-  ;; Miscellaneous Technical
-  lceil    ;2308 left ceiling = apl upstile
-  rceil    ;2309 right ceiling
-  lfloor   ;230A left floor = apl downstile
-  rfloor   ;230B right floor
-  lang     ;2329 left-pointing angle bracket = bra
-  rang     ;232A right-pointing angle bracket = ket
-  ;; Geometric Shapes
-  loz      ;25CA lozenge
-  ;; Miscellaneous Symbols
-  spades   ;2660 black spade suit
-  clubs    ;2663 black club suit = shamrock
-  hearts   ;2665 black heart suit = valentine
-  diams    ;2666 black diamond suit
-
-  ;; 24.4 Character entity references for markup-significant and
-  ;;      internationalization characters
-  ;; C0 Controls and Basic Latin
-  quot     ;0022 quotation mark = APL quote
-  amp      ;0026 ampersand
-  lt       ;003C less-than sign
-  gt       ;003E greater-than sign
-  ;; Latin Extended-A
-  OElig    ;0152 latin capital ligature OE
-  oelig    ;0153 latin small ligature oe
-  Scaron   ;0160 latin capital letter S with caron
-  scaron   ;0161 latin small letter s with caron
-  Yuml     ;0178 latin capital letter Y with diaeresis
-  ;; Spacing Modifier Letters
-  circ     ;02C6 modifier letter circumflex accent
-  tilde    ;02DC small tilde
-  ;; General Punctuation
-  ensp     ;2002 en space
-  emsp     ;2003 em space
-  thinsp   ;2009 thin space
-  zwnj     ;200C zero width non-joiner
-  zwj      ;200D zero width joiner
-  lrm      ;200E left-to-right mark
-  rlm      ;200F right-to-left mark
-  ndash    ;2013 en dash
-  mdash    ;2014 em dash
-  lsquo    ;2018 left single quotation mark
-  rsquo    ;2019 right single quotation mark
-  sbquo    ;201A single low-9 quotation mark
-  ldquo    ;201C left double quotation mark
-  rdquo    ;201D right double quotation mark
-  bdquo    ;201E double low-9 quotation mark
-  dagger   ;2020 dagger
-  Dagger   ;2021 double dagger
-  permil   ;2030 per mille sign
-  lsaquo   ;2039 single left-pointing angle quotation mark
-  rsaquo   ;203A single right-pointing angle quotation mark
-  euro     ;20AC euro sign
-  )
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/info.rkt b/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/info.rkt
deleted file mode 100644
index 1536c76ba6..0000000000
--- a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all eli)))
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/lang.rkt b/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/lang.rkt
deleted file mode 100644
index 3caefb4a32..0000000000
--- a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/lang.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(require "main.rkt" (except-in scribble/text/lang #%top)
-         scribble/text/syntax-utils)
-
-(provide (except-out (all-from-out scribble/text/lang) #%module-begin)
-         (rename-out [module-begin #%module-begin])
-         (all-from-out "main.rkt"))
-
-(require (for-syntax racket/base))
-(define-syntax-rule (module-begin expr ...)
-  (#%plain-module-begin
-   (port-count-lines! (current-output-port))
-   (process-begin/text begin output-xml expr ...)))
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/lang/reader.rkt
deleted file mode 100644
index b61bd5098f..0000000000
--- a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/lang/reader.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang s-exp syntax/module-reader
-
-scribble/html/lang
-
-#:read        scribble:read-inside
-#:read-syntax scribble:read-syntax-inside
-#:whole-body-readers? #t
-#:info        (scribble-base-reader-info)
-
-(require (prefix-in scribble: scribble/reader)
-         (only-in scribble/base/reader scribble-base-reader-info))
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/main.rkt b/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/main.rkt
deleted file mode 100644
index 789c4fe3cc..0000000000
--- a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/main.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-
-(require "xml.rkt" "html.rkt" "resource.rkt"
-         ;; includes all of the scribble/text utilities
-         scribble/text)
-
-(provide (all-from-out "xml.rkt" "html.rkt" "resource.rkt" scribble/text)
-         (rename-out [top #%top]))
-
-(require (for-syntax racket/base))
-(define-syntax (top stx)
-  (syntax-case stx ()
-    [(_ . x)
-     (let ([x* (syntax-e #'x)])
-       (if (and (symbol? x*) (regexp-match? #rx":$" (symbol->string x*)))
-         #''x
-         #'(#%top . x)))]))
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/resource.rkt b/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/resource.rkt
deleted file mode 100644
index 454ff63393..0000000000
--- a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/resource.rkt
+++ /dev/null
@@ -1,243 +0,0 @@
-#lang racket/base
-
-;; Resources are renderable & referrable objects, (most are html pages).
-
-;; (resource path renderer) creates and returns a new "resource" value.  The
-;; arguments are:
-;; - `path': the path of the output file, relative to the working directory,
-;;   indicating where the resource file should be put at, also corresponding to
-;;   the URL it will be found at.  It must be a `/'-separated relative string,
-;;   no `..', `.', or `//', and it can end in `/' (which will turn to
-;;   "index.html").
-;; - `renderer': a unary function that renders the resource, receiving the path
-;;   for the file to be created as an argument.  This path will be different
-;;   than the `path' argument because this function is invoked in the target
-;;   directory.
-;; The resulting resource value is a function that returns the URL for the
-;; resource.  The function takes in an optional boolean which defaults to #f,
-;; and when #t is given, the result will be an absolute full URL.  Note that
-;; the function can be used as a value for output, which will use it as a thunk
-;; (that renders as the relative URL for the resource).  The default relative
-;; resulting URL is, of course, a value that depends on the currently rendered
-;; resource that uses this value.  Creating a resource registers the `renderer'
-;; to be executed when rendering is initiated by `render-all'.  Note that more
-;; resources can be created while rendering; they will also be rendered in turn
-;; until no more new resources are created.
-
-(require scribble/text)
-
-;; default file, urls to it will point to its directory instead, a
-;; /-suffixed path will render to this file, and `url-roots' entries
-;; with 'index will append this file name to a rewritten path that
-;; otherwise ends in /
-(define default-file "index.html")
-
-;; the currently rendered directory, as a list
-(define rendered-dirpath (make-parameter '()))
-
-;; A mapping from path prefixes to urls (actually, any string) -- when two
-;; paths are in the same prefix, links from one to the other are relative
-;; (unless absolute links are requested) , but if they're in different
-;; prefixes, the url will be used instead; the roots are expected to be
-;; disjoint (= no "/foo" and "/foo/bar" roots).  Additionally, optional symbol
-;; flags can appear in each entry, currently only 'abs is used below for roots
-;; that should always use absolute links (needed for some skeleton pages that
-;; are used in nested subdirectories).
-(provide url-roots)
-(define url-roots (make-parameter #f))
-
-(define cached-roots '(#f . #f))
-(define (current-url-roots)
-  ;; takes `url-roots', a (listof (list prefix-string url-string . flags)), and
-  ;; produces an alist with lists of strings for the keys; the prefix-strings
-  ;; are split on "/"s, and the url-strings can be anything at all actually
-  ;; (they are put as-is before the path with a "/" between them).
-  (define roots (url-roots))
-  (unless (eq? roots (car cached-roots))
-    (set! cached-roots
-          (cons roots
-                (and (list? roots) (pair? roots)
-                     (map (lambda (root)
-                            (list* (regexp-match* #rx"[^/]+" (car root))
-                                   (regexp-replace #rx"/$" (cadr root) "")
-                                   (cddr root)))
-                          roots)))))
-  (cdr cached-roots))
-
-;; a utility for relative paths, taking the above `default-file' and
-;; `url-roots' into consideration.
-(define (relativize file tgtdir curdir)
-  (define file* (if (equal? file default-file) "" file))
-  (define roots (current-url-roots))
-  (define (find-root path mode)
-    (ormap (lambda (root+url+flags)
-             (let loop ([r (car root+url+flags)] [p path])
-               (if (pair? r)
-                 (and (pair? p) (equal? (car p) (car r))
-                      (loop (cdr r) (cdr p)))
-                 (case mode
-                   [(get-path) `(,(cadr root+url+flags) 
-                                 ,@p 
-                                 ,(if (and (equal? file* "")
-                                           (memq 'index (cddr root+url+flags)))
-                                      default-file
-                                      file*))]
-                   [(get-abs-or-true)
-                    (if (memq 'abs (cddr root+url+flags)) `("" ,@p) #t)]
-                   [else (error 'relativize "internal error: ~e" mode)]))))
-           roots))
-  (define result
-    (let loop ([t tgtdir] [c curdir] [pfx '()])
-      (cond
-        ;; find shared prefix
-        [(and (pair? t) (pair? c) (equal? (car t) (car c)))
-         (loop (cdr t) (cdr c) (cons (car t) pfx))]
-        ;; done with the shared prefix, deal with the root now
-        ;; no roots => always use a relative path (useful for debugging)
-        [(not roots) `(,@(map (lambda (_) "..") c) ,@t ,file*)]
-        ;; share a root => use a relative path unless its an absolute root
-        [(find-root (reverse pfx) 'get-abs-or-true)
-         => (lambda (abs/true)
-              `(;; rel. => as above
-                ,@(if (list? abs/true) abs/true (map (lambda (_) "..") c))
-                ,@t ,file*))]
-        ;; different roots => use the one for the target
-        [(find-root tgtdir 'get-path)]
-        ;; if there isn't any, throw an error
-        [else (error 'relativize "target url is not in any known root: ~a"
-                     (string-join `(,@tgtdir ,file*) "/"))])))
-  (if (equal? '("") result) "." (string-join result "/")))
-
-#;
-(module+ test
-  (require tests/eli-tester)
-  (define R relativize)
-  (let ()
-    (test do (test (R "bleh.txt"   '()        '()       ) => "bleh.txt"
-                   (R "bleh.txt"   '("x")     '()       ) => "x/bleh.txt"
-                   (R "bleh.txt"   '("x" "y") '()       ) => "x/y/bleh.txt"
-                   (R "bleh.txt"   '()        '("x")    ) => "../bleh.txt"
-                   (R "bleh.txt"   '("x")     '("x")    ) => "bleh.txt"
-                   (R "bleh.txt"   '("x" "y") '("x")    ) => "y/bleh.txt"
-                   (R "bleh.txt"   '()        '("x" "y")) => "../../bleh.txt"
-                   (R "bleh.txt"   '("x")     '("x" "y")) => "../bleh.txt"
-                   (R "bleh.txt"   '("x" "y") '("x" "y")) => "bleh.txt"
-                   (R "bleh.txt"   '("x" "y") '("y" "x")) => "../../x/y/bleh.txt"
-                   (R "index.html" '()        '()       ) => "."
-                   (R "index.html" '("x")     '()       ) => "x/"
-                   (R "index.html" '("x" "y") '()       ) => "x/y/"
-                   (R "index.html" '()        '("x")    ) => "../"
-                   (R "index.html" '("x")     '("x")    ) => "."
-                   (R "index.html" '("x" "y") '("x")    ) => "y/"
-                   (R "index.html" '()        '("x" "y")) => "../../"
-                   (R "index.html" '("x")     '("x" "y")) => "../"
-                   (R "index.html" '("x" "y") '("x" "y")) => "."
-                   (R "index.html" '("x" "y") '("y" "x")) => "../../x/y/")
-          do (parameterize ([url-roots '(["/x" "/X/"] ["/y" "/Y/"])])
-               (test (R "bleh.txt"   '()        '()       ) =error> "not in any"
-                     (R "bleh.txt"   '("x")     '()       ) => "/X/bleh.txt"
-                     (R "bleh.txt"   '("x" "y") '()       ) => "/X/y/bleh.txt"
-                     (R "bleh.txt"   '()        '("x")    ) =error> "not in any"
-                     (R "bleh.txt"   '("x")     '("x")    ) => "bleh.txt"
-                     (R "bleh.txt"   '("x" "y") '("x")    ) => "y/bleh.txt"
-                     (R "bleh.txt"   '()        '("x" "y")) =error> "not in any"
-                     (R "bleh.txt"   '("x")     '("x" "y")) => "../bleh.txt"
-                     (R "bleh.txt"   '("x" "y") '("x" "y")) => "bleh.txt"
-                     (R "bleh.txt"   '("x" "y") '("y" "x")) => "/X/y/bleh.txt"
-                     (R "index.html" '()        '()       ) =error> "not in any"
-                     (R "index.html" '("x")     '()       ) => "/X/"
-                     (R "index.html" '("x" "y") '()       ) => "/X/y/"
-                     (R "index.html" '()        '("x")    ) =error> "not in any"
-                     (R "index.html" '("x")     '("x")    ) => "."
-                     (R "index.html" '("x" "y") '("x")    ) => "y/"
-                     (R "index.html" '()        '("x" "y")) =error> "not in any"
-                     (R "index.html" '("x")     '("x" "y")) => "../"
-                     (R "index.html" '("x" "y") '("x" "y")) => "."
-                     (R "index.html" '("x" "y") '("y" "x")) => "/X/y/"))
-          do (parameterize ([url-roots '(["/x" "/X/"] ["/y" "/Y/" abs])])
-               (test (R "foo.txt" '("x" "1") '("x" "2")) => "../1/foo.txt"
-                     (R "foo.txt" '("y" "1") '("y" "2")) => "/1/foo.txt")))))
-
-;; utility for keeping a list of renderer thunks
-(define-values [add-renderer get/reset-renderers]
-  (let ([l '()] [s (make-semaphore 1)])
-    ;; map paths to #t -- used to avoid overwriting files
-    (define t (make-hash))
-    (define-syntax-rule (S body) (call-with-semaphore s (lambda () body)))
-    (values (lambda (path renderer)
-              (S (if (hash-ref t path #f)
-                   (error 'resource "path used for two resources: ~e" path)
-                   (begin (hash-set! t path #t) (set! l (cons renderer l))))))
-            (lambda () (S (begin0 (reverse l) (set! l '())))))))
-
-;; `#:exists' determines what happens when the render destination exists, it
-;; can be one of: #f (do nothing), 'delete-file (delete if a file exists, error
-;; if exists as a directory)
-(provide resource resource?)
-;; use a struct to make resources identifiable as such
-(struct resource (url) #:constructor-name make-resource
-        #:property prop:procedure 0 #:omit-define-syntaxes)
-(define (resource path0 renderer #:exists [exists 'delete-file])
-  (define (bad reason) (error 'resource "bad path, ~a: ~e" reason path0))
-  (unless (string? path0) (bad "must be a string"))
-  (for ([x (in-list '([#rx"^/" "must be relative"]
-                      [#rx"//" "must not have empty elements"]
-                      [#rx"(?:^|/)[.][.]?(?:/|$)"
-                          "must not contain `.' or `..'"]))])
-    (when (regexp-match? (car x) path0) (bad (cadr x))))
-  (define path (regexp-replace #rx"(?<=^|/)$" path0 default-file))
-  (define-values [dirpathlist filename]
-    (let-values ([(l r) (split-at-right (regexp-split #rx"/" path) 1)])
-      (values l (car r))))
-  (define (render)
-    (let loop ([ps dirpathlist])
-      (if (pair? ps)
-        (begin (unless (directory-exists? (car ps))
-                 (if (or (file-exists? (car ps)) (link-exists? (car ps)))
-                   (bad "exists as a file/link")
-                   (make-directory (car ps))))
-               (parameterize ([current-directory (car ps)])
-                 (loop (cdr ps))))
-        (begin (cond [(not exists)] ; do nothing
-                     [(or (file-exists? filename) (link-exists? filename))
-                      (delete-file filename)]
-                     [(directory-exists? filename)
-                      (bad "exists as directory")])
-               (parameterize ([rendered-dirpath dirpathlist])
-                 (printf "  ~a\n" path)
-                 (renderer filename))))))
-  (define absolute-url
-    (lazy (define url (relativize filename dirpathlist '()))
-          (if (url-roots)
-            url
-            ;; we're in local build mode, and insist on an absolute url, so
-            ;; construct a `file://' result
-            (list* "file://" (current-directory) url))))
-  (when renderer
-    (add-renderer path render))
-  (define (url [absolute? #f])
-    ;; be conservative, in case it needs to be extended in the future
-    (case absolute?
-      [(#f) (relativize filename dirpathlist (rendered-dirpath))]
-      [(#t) (force absolute-url)]
-      [else (error 'resource "bad absolute flag value: ~e" absolute?)]))
-  (make-resource url))
-
-;; a convenient utility to create renderers from some output function (like
-;; `output-xml' or `display') and some content
-(provide file-writer)
-(define ((file-writer writer content) file)
-  (call-with-output-file file (lambda (o) (writer content o))))
-
-;; runs all renderers, and any renderers that might have been added on the way
-(provide render-all)
-(define (render-all)
-  (printf "Rendering...\n")
-  (define todo (get/reset-renderers))
-  (if (null? todo)
-    (printf "  Warning: no content to render\n")
-    (let loop ([todo todo])
-      (unless (null? todo)
-        (for-each (lambda (r) (r)) todo)
-        (loop (get/reset-renderers))))) ; if more were created
-  (printf "Rendering done.\n"))
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/xml.rkt b/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/xml.rkt
deleted file mode 100644
index b41d93c5d6..0000000000
--- a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/xml.rkt
+++ /dev/null
@@ -1,162 +0,0 @@
-#lang racket/base
-
-;; XML-like objects and functions, with rendering
-
-(require scribble/text racket/port)
-
-;; ----------------------------------------------------------------------------
-;; Represent attribute names as `foo:' symbols.  They are made self-quoting in
-;; the language.  A different option would be to use the usual racket keyword
-;; arguments, but that tends to have problems like disallowing repeated uses of
-;; the same keyword, sorting the keywords alphabetically, and ambiguity when
-;; some keywords are meant to do the usual thing (customize a function) instead
-;; of representing an attribute.  It's more convenient to just have a separate
-;; mechanism for this, so racket keywords are still used in the same way, and
-;; orthogonal to specifying attributes.  Another possibility is to have a new
-;; type, with `foo:' evaluating to instances -- but it's often convenient to
-;; pass them around as quoted lists.
-
-(define attribute->symbol
-  (let ([t (make-weak-hasheq)])
-    (lambda (x)
-      (and (symbol? x)
-           (hash-ref! t x
-             (lambda ()
-               (define m (regexp-match #rx"^(.*):$" (symbol->string x)))
-               (and m (string->symbol (cadr m)))))))))
-
-(provide attribute?)
-(define attribute? attribute->symbol)
-
-(provide attributes+body)
-(define (attributes+body xs)
-  (let loop ([xs xs] [as '()])
-    (define a (and (pair? xs) (attribute->symbol (car xs))))
-    (cond [(not a) (values (reverse as) xs)]
-          [(null? (cdr xs)) (error 'attriubtes+body
-                                   "missing attribute value for `~s:'" a)]
-          [else (loop (cddr xs) (cons (cons a (cadr xs)) as))])))
-
-;; similar, but keeps the attributes as a list, useful to build new functions
-;; that accept attributes without knowing about the xml structs.
-(provide split-attributes+body)
-(define (split-attributes+body xs)
-  (let loop ([xs xs] [as '()])
-    (if (and (pair? xs) (pair? (cdr xs)) (attribute->symbol (car xs)))
-      (loop (cddr xs) (list* (cadr xs) (car xs) as))
-      (values (reverse as) xs))))
-
-;; ----------------------------------------------------------------------------
-;; An output that handles xml quoting, customizable
-
-;; TODO: make this more conveniently customizable and extensible
-(define (write-string/xml-quote str p [start 0] [end (string-length str)])
-  (let loop ([start start])
-    (when (< start end)
-      (define m (regexp-match-positions #rx"[&<>\"]" str start end p))
-      (when m
-        (write-string (case (string-ref str (caar m))
-                        [(#\&) "&amp;"]
-                        [(#\<) "&lt;"]
-                        [(#\>) "&gt;"]
-                        [(#\") "&quot;"])
-                      p)
-        (loop (cdar m))))))
-
-(provide xml-writer)
-(define xml-writer (make-parameter write-string/xml-quote))
-
-(provide output-xml)
-(define (output-xml content [p (current-output-port)])
-  (output (disable-prefix (with-writer (xml-writer) content)) p))
-
-(provide xml->string)
-(define (xml->string content)
-  (with-output-to-string (lambda () (output-xml content))))
-
-;; ----------------------------------------------------------------------------
-;; Structs for xml data: elements, literals, entities
-
-(provide make-element)
-(struct element (tag attrs body [cache #:auto #:mutable])
-  #:constructor-name make-element
-  #:transparent #:omit-define-syntaxes #:auto-value #f
-  #:property prop:procedure
-  (lambda (e)
-    (unless (element-cache e) (set-element-cache! e (element->output e)))
-    (element-cache e)))
-
-(provide element)
-(define (element tag . args)
-  (define-values [attrs body] (attributes+body args))
-  (make-element tag attrs body))
-
-;; similar to element, but will always have a closing tag instead of using the
-;; short syntax (see also `element->output' below)
-(provide element/not-empty)
-(define (element/not-empty tag . args)
-  (define-values [attrs body] (attributes+body args))
-  (make-element tag attrs (if (null? body) '(#f) body)))
-
-;; convert an element to something output-able
-(define (element->output e)
-  (define tag   (element-tag   e))
-  (define attrs (element-attrs e))
-  (define body  (element-body  e))
-  ;; null body means a lone tag, tags that should always have a closer will
-  ;; have a '(#f) as their body (see below)
-  (list (with-writer #f "<" tag)
-        (map (lambda (attr)
-               (define name (car attr))
-               (define val (cdr attr))
-               (cond [(not val) #f]
-                     ;; #t means just mention the attribute
-                     [(eq? #t val) (with-writer #f (list " " name))]
-                     [else (list (with-writer #f (list " " name "=\""))
-                                 val
-                                 (with-writer #f "\""))]))
-             attrs)
-        (if (null? body)
-          (with-writer #f " />")
-          (list (with-writer #f ">")
-                body
-                (with-writer #f "</" tag ">")))))
-
-;; ----------------------------------------------------------------------------
-;; Literals
-
-;; literal "struct" for things that are not escaped
-(provide literal)
-(define (literal . contents) (with-writer #f contents))
-
-;; entities are implemented as literals
-(provide entity)
-(define (entity x) (literal "&" (and (number? x) "#") x ";"))
-
-;; comments and cdata
-(provide comment)
-(define (comment #:newlines? [newlines? #f] . body)
-  (define newline (and newlines? "\n"))
-  (literal "<!--" newline body newline "-->"))
-(provide cdata)
-(define (cdata #:newlines? [newlines? #t] #:line-prefix [pfx #f] . body)
-  (define newline (and newlines? "\n"))
-  (literal pfx "<![CDATA[" newline body newline pfx "]]>"))
-
-;; ----------------------------------------------------------------------------
-;; Template definition forms
-
-(provide define/provide-elements/empty
-         define/provide-elements/not-empty
-         define/provide-entities)
-(define-syntax-rule (define/provide-elements/empty tag ...)
-  (begin (provide tag ...)
-         (define (tag . args) (apply element 'tag args)) ...))
-(define-syntax-rule (define/provide-elements/not-empty tag ...)
-  (begin (provide tag ...)
-         (define (tag . args) (apply element/not-empty 'tag args)) ...))
-(define-syntax-rule (define/provide-entities ent ...)
-  (begin (provide ent ...)
-         (define ent ; use string-append to make it a little faster
-           (literal (string-append "&" (symbol->string 'ent) ";")))
-         ...))
diff --git a/pkgs/scribble-pkgs/scribble-lib/LICENSE.txt b/pkgs/scribble-pkgs/scribble-lib/LICENSE.txt
deleted file mode 100644
index 1be1003312..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-scribble-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/scribble-pkgs/scribble-lib/help/help.rkt b/pkgs/scribble-pkgs/scribble-lib/help/help.rkt
deleted file mode 100644
index 383c7b3c19..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/help/help.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang scheme/base
-
-(require "search.rkt" scheme/cmdline scheme/list scheme/string
-         raco/command-name) 
-
-;; Minimal command-line arguments, the query string can contain all
-;; kinds of magic.
-(command-line
- #:program (short-program+command-name)
- #:handlers
- (lambda (_ . ts)
-   (if (null? ts)
-     (send-main-page)
-     (perform-search (string-append* (add-between ts " ")))))
- '("search-terms")
- (lambda (help-str)
-   (display help-str)
-   (display " See the search page for the syntax of queries\n")
-   (exit 0)))
-
-(module test racket/base)
diff --git a/pkgs/scribble-pkgs/scribble-lib/help/info.rkt b/pkgs/scribble-pkgs/scribble-lib/help/info.rkt
deleted file mode 100644
index 8525dbf5e1..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/help/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-files '("tests"))
diff --git a/pkgs/scribble-pkgs/scribble-lib/help/search.rkt b/pkgs/scribble-pkgs/scribble-lib/help/search.rkt
deleted file mode 100644
index b3c367420d..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/help/search.rkt
+++ /dev/null
@@ -1,81 +0,0 @@
-#lang racket/base
-
-(require setup/dirs
-         net/sendurl
-         net/uri-codec
-         net/url
-         racket/string)
-(provide perform-search send-main-page)
-
-(define search-dir "search/")
-
-;; Almost nothing to do here -- the real work is done in the browser,
-;; using javascript.
-
-(define (send-main-page #:sub [sub "index.html"]
-                        #:fragment [fragment #f] #:query [query #f]
-                        #:notify [notify void])
-  (define open-url (get-doc-open-url))
-  (cond
-   [open-url
-    (define dest-url (let ([u (string->url open-url)])
-                       (combine-url/relative
-                        u
-                        (string-join
-                         (for/list ([s (explode-path sub)])
-                           (if (path? s)
-                               (path-element->string s)
-                               (format "~a" s)))
-                         "/"))))
-    (notify (url->string dest-url))
-    (send-url (url->string
-               (struct-copy url dest-url
-                            [fragment (or fragment
-                                          (url-fragment dest-url))]
-                            [query (append
-                                    (url-query dest-url)
-                                    (if query
-                                        (url-query
-                                         (string->url
-                                          (format "q?~a" query)))
-                                        null))])))]
-   [else
-    (let* ([path (build-path (find-user-doc-dir) sub)]
-           [path (if (file-exists? path) path (build-path (find-doc-dir) sub))])
-      (notify path)
-      (send-url/file path #:fragment fragment #:query query))]))
-
-;; This is an example of changing this code to use the online manuals.
-;; Normally, it's better to set `doc-open-url` in "etc/config.rktd",
-;; but as a last resort, you can change `send-main-page` to compute a URL.
-;; This may be useful in cases like schools that use systems that have problems
-;; running a browser on local files (like NEU).  If you use this, then
-;; it is a good idea to put the documentation tree somewhere local, to
-;; have better interaction times instead of using the PLT server.
-;; (define (send-main-page #:sub [sub "index.html"]
-;;                         #:fragment [fragment #f] #:query [query #f]
-;;                         #:notify [notify void])
-;;   (define (part pfx x) (if x (string-append pfx x) ""))
-;;   (send-url (string-append
-;;              "http://download.racket-lang.org/docs/" (version) "/html/"
-;;              sub (part "#" fragment) (part "?" query))))
-
-(define (perform-search str [context #f])
-  ;; `context' can be a pre-filter query string to use for a context,
-  ;; optionally a list of one and a label to display for that context.
-  ;; In any case, when a context is specified, the search actually
-  ;; goes through the search-context.html page which tranpolines to
-  ;; the main search page after setting the cookies (so when the
-  ;; search page is refreshed it won't reset the context).
-  (let* ([label   (and (list? context) (= 2 (length context)) (cadr context))]
-         [context (if (pair? context) (car context) context)]
-         [page    (if context "search-context.html" "index.html")]
-         [query   (format "q=~a" (uri-encode str))]
-         [query   (if context
-                    (format "~a&hq=~a~a"
-                            query (uri-encode context)
-                            (if label
-                              (format "&label=~a" (uri-encode label))
-                              ""))
-                    query)])
-    (send-main-page #:sub (string-append search-dir page) #:query query)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/info.rkt b/pkgs/scribble-pkgs/scribble-lib/info.rkt
deleted file mode 100644
index 27965989bf..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/info.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base"
-               "compatibility-lib"
-               "scribble-text-lib"
-               "scribble-html-lib"
-               "planet-lib" ; used dynamically
-	       "net-lib"
-               "at-exp-lib"
-               "draw-lib" 
-               "syntax-color-lib"
-               "sandbox-lib"))
-(define build-deps '("rackunit-lib"
-                     "eli-tester"))
-
-(define implies '("scribble-html-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"scribble\"")
-
-(define pkg-authors '(mflatt eli))
-
-(define version "1.7")
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/HISTORY.txt b/pkgs/scribble-pkgs/scribble-lib/scribble/HISTORY.txt
deleted file mode 100644
index e619f4222c..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/HISTORY.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Version 1.1
-Moved detailed-change recording to documentation
-
-Version 1.0
-Use `doc' submodule when available
-Changed the HTML rendering style of `scribble/manual'
-Changed `verbatim' to support non-string arguments
-Added `--html-tree' option to for rendering to multi-page HTML
- with nested directories for nested parts
-Added `css-style-addition' and `js-style-addition' for adding
- style files that override library-level defaults but can be
- overridden externally
-For HTML rendering, merge generated `style' attributes within
- a single tag
-scribble/base: same change as for racket/runtime-path related
- to "collects"-relative paths
-scribble/base: added `#:indirect' option to `defmodule` and
- `seclink`
-scribble/manual: added `manual-doc-style'
-scribble/manual: changed `deprecated' to a function, and
- generalized it by adding an optional `#:what' argument
-scriblib/autobib: add #:note
-
-Older versions
-See the "Racket core" release notes for a history of changes before
- the "scribble-lib" package was created.
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt
deleted file mode 100644
index 6c2f54403c..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt
+++ /dev/null
@@ -1,1117 +0,0 @@
-#lang scheme/base
-
-(require "core.rkt"
-         "private/render-utils.rkt"
-         mzlib/class
-         mzlib/serialize
-         scheme/file
-         scheme/path
-         setup/collects
-         setup/path-relativize
-         file/convertible
-         net/url-structs
-         "render-struct.rkt")
-
-(provide render%
-         render<%>)
-
-(define render<%>
-  (interface ()
-    traverse
-    collect
-    resolve
-    render
-    serialize-info
-    deserialize-info
-    get-external
-    get-undefined
-    
-    ;; undocumented:
-    current-render-mode
-    get-substitutions
-    render-part
-    render-flow
-    render-intrapara-block
-    render-table
-    render-itemization
-    render-paragraph
-    render-content
-    render-nested-flow
-    render-block
-    render-other
-    get-dest-directory
-    format-number
-    number-depth))
-
-(define render%
-  (class* object% (render<%>)
-
-    (init-field dest-dir
-                [refer-to-existing-files #f]
-                [root-path #f]
-                [prefix-file #f]
-                [style-file #f]
-                [style-extra-files null]
-                [extra-files null]
-                [image-preferences null]
-                [helper-file-prefix #f])
-
-    (define/public (current-render-mode)
-      '())
-
-    (define/public (get-dest-directory [create? #f])
-      (when (and dest-dir create? (not (directory-exists? dest-dir)))
-        (make-directory* dest-dir))
-      dest-dir)
-
-    (define/public (get-substitutions) null)
-
-    (define/public (get-suffix) #".txt")
-
-    (define/public (index-manual-newlines?)
-      #f)
-
-    (define/public (format-number number sep)
-      (if (or (null? number)
-              (andmap (lambda (x) (or (not x) (equal? x "")))
-                      number)
-              (and (not (car number))
-                   (not (ormap number? number))))
-          null
-          (cons (let ([s (string-append
-                          (apply
-                           string-append
-                           (map (lambda (n) (if (number? n) (format "~a." n) ""))
-                                (reverse (cdr number))))
-                          (if (and (car number) 
-                                   (not (equal? "" (car number))))
-                              (format "~a." (car number)) 
-                              ""))])
-                  (substring s 0 (sub1 (string-length s))))
-                sep)))
-
-    (define/public (number-depth number)
-      (if (null? number)
-          0
-          (+ 1 (for/sum ([i (in-list (cdr number))]) (if (not (string? i)) 1 0)))))
-
-    (field [report-output?? #f])
-    (define/public (report-output?) report-output??)
-    (define/public (report-output!) (set! report-output?? #t))
-
-    ;; should work up to 3999:
-    (define/private (number->roman n)
-      (let loop ([n n]
-                 [I #\I] [V #\V]
-                 [X #\X] [L #\L]
-                 [C #\C] [D #\D]
-                 [M #\M])
-        (case n
-          [(0) ""]
-          [(1 2 3) (make-string n I)]
-          [(4) (string I V)]
-          [(5) (string V)]
-          [(6 7 8) (string-append (string V) (make-string (- n 5) I))]
-          [(9) (string I X)]
-          [else 
-           (string-append (loop (quotient n 10) X L C D M D M)
-                          (loop (modulo n 10) I V X L C D M))])))
-
-    ;; ----------------------------------------
-    ;; Methods that really only work on some renderers:
-
-    (define/public (set-external-tag-path p) (void))
-    (define/public (set-external-root-url p) (void))    
-    (define/public (add-extra-script-file s) (void))
-    (define/public (set-directory-depth n) (void))
-
-    ;; ----------------------------------------
-
-    (define/public (extract-part-style-files d ri stop-at-part? pred extract)
-      (let ([ht (make-hash)])
-        (let loop ([p d] [up? #t] [only-up? #f])
-          (let ([s (part-style p)])
-            (when up?
-              (let ([p (collected-info-parent (part-collected-info p ri))])
-                (if p
-                    (loop p #t #t)
-                    null)))
-             (extract-style-style-files (part-style p) ht pred extract)
-             (unless only-up?
-               (extract-content-style-files (part-to-collect p) d ri ht pred extract)
-               (extract-content-style-files (part-title-content p) d ri ht pred extract)
-               (extract-flow-style-files (part-blocks p) d ri ht pred extract))
-             (unless only-up?
-               (for-each (lambda (p)
-                           (unless (stop-at-part? p)
-                             (loop p #f #f)))
-                         (part-parts p)))))
-        (map cdr
-             (sort
-              (for/list ([(k v) (in-hash ht)])
-                (cons v (if (or (bytes? k) (url? k))
-                            k 
-                            (collects-relative->path k))))
-              <
-              #:key car))))
-
-    (define/private (extract-style-style-files s ht pred extract)
-      (for ([v (in-list (style-properties s))])
-        (when (pred v)
-          (hash-update! ht (extract v) values (hash-count ht)))))
-
-    (define/private (extract-flow-style-files blocks d ri ht pred extract)
-      (for ([b (in-list blocks)])
-        (extract-block-style-files b d ri ht pred extract)))
-
-    (define/private (extract-block-style-files p d ri ht pred extract)
-      (cond
-        [(table? p)
-         (extract-style-style-files (table-style p) ht pred extract)
-         (for-each (lambda (blocks)
-                     (for-each (lambda (block)
-                                 (unless (eq? block 'cont)
-                                   (extract-block-style-files block d ri ht pred extract)))
-                               blocks))
-                   (table-blockss p))]
-        [(itemization? p)
-         (extract-style-style-files (itemization-style p) ht pred extract)
-         (for-each (lambda (blocks)
-                     (extract-flow-style-files blocks d ri ht pred extract))
-                   (itemization-blockss p))]
-        [(nested-flow? p) 
-         (extract-style-style-files (nested-flow-style p) ht pred extract)
-         (extract-flow-style-files (nested-flow-blocks p) d ri ht pred extract)]
-        [(compound-paragraph? p)
-         (extract-style-style-files (compound-paragraph-style p) ht pred extract)
-         (extract-flow-style-files (compound-paragraph-blocks p) d ri ht pred extract)]
-        [(delayed-block? p)
-         (let ([v (delayed-block-blocks p ri)])
-           (extract-block-style-files v d ri ht pred extract))]
-        [(traverse-block? p)
-         (extract-block-style-files (traverse-block-block p ri) d ri ht pred extract)]
-        [else
-         (extract-style-style-files (paragraph-style p) ht pred extract)
-         (extract-content-style-files (paragraph-content p) d ri ht pred extract)]))
-
-    (define/public (string-to-implicit-styles e) null)
-
-    (define/private (extract-content-style-files e d ri ht pred extract)
-      (cond
-       [(string? e) (let ([ses (string-to-implicit-styles e)])
-                      (when (pair? ses)
-                        (for ([s (in-list ses)])
-                          (extract-style-style-files s ht pred extract))))]
-       [(element? e)
-        (when (style? (element-style e))
-          (extract-style-style-files (element-style e) ht pred extract))
-        (extract-content-style-files (element-content e) d ri ht pred extract)]
-       [(multiarg-element? e)
-        (when (style? (multiarg-element-style e))
-          (extract-style-style-files (multiarg-element-style e) ht pred extract))
-        (extract-content-style-files (multiarg-element-contents e) d ri ht pred extract)]
-       [(list? e)
-        (for ([e (in-list e)])
-          (extract-content-style-files e d ri ht pred extract))]
-       [(delayed-element? e)
-        (extract-content-style-files (delayed-element-content e ri) d ri ht pred extract)]
-       [(traverse-element? e)
-        (extract-content-style-files (traverse-element-content e ri) d ri ht pred extract)]
-       [(part-relative-element? e)
-        (extract-content-style-files (part-relative-element-content e ri) d ri ht pred extract)]))
-
-    (define/public (extract-version d)
-      (or (ormap (lambda (v)
-                   (and (document-version? v)
-                        (document-version-text v)))
-                 (style-properties (part-style d)))
-          ""))
-
-    (define/public (extract-date d)
-      (ormap (lambda (v)
-               (and (document-date? v)
-                    (document-date-text v)))
-             (style-properties (part-style d))))
-
-    (define/private (extract-pre-paras d sym)
-      (let loop ([l (part-blocks d)])
-        (cond
-         [(null? l) null]
-         [else (let ([v (car l)])
-                 (cond
-                  [(and (paragraph? v)
-                        (eq? sym (style-name (paragraph-style v))))
-                   (cons v (loop (cdr l)))]
-                  [(compound-paragraph? v)
-                   (append (loop (compound-paragraph-blocks v))
-                           (loop (cdr l)))]
-                  [else (loop (cdr l))]))])))
-
-    (define/public (extract-authors d)
-      (extract-pre-paras d 'author))
-
-    (define/public (extract-pretitle d)
-      (extract-pre-paras d 'pretitle))
-    
-    ;; ----------------------------------------
-
-    (define root (make-mobile-root root-path))
-    
-    (define-values (:path->root-relative
-                    :root-relative->path)
-      (if root-path
-          (make-relativize (lambda () root-path)
-                           root
-                           'path->root-relative
-                           'root-relative->path)
-          (values #f #f)))
-
-    (define/public (path->root-relative p)
-      (if root-path
-          (:path->root-relative p)
-          p))
-
-    (define/public (root-relative->path p)
-      (if (root-relative? p)
-          (apply build-path (or (mobile-root-path (car p))
-                                (current-directory))
-                 (map bytes->path-element (cdr p)))
-          p))
-
-    (define/public (root-relative? p)
-      (and (pair? p)
-           (mobile-root? (car p))))
-
-    ;; ----------------------------------------
-
-    (define/public (fresh-tag-collect-context? d ci)
-      #f)
-    (define/public (fresh-tag-resolve-context? d ri)
-      #f)
-    (define/public (fresh-tag-render-context? d ri)
-      #f)
-
-    (define/private (extend-prefix d fresh?)
-      (cond
-       [fresh? null]
-       [(part-tag-prefix d)
-        (cons (part-tag-prefix d) (current-tag-prefixes))]
-       [else (current-tag-prefixes)]))
-
-    ;; ----------------------------------------
-    ;; marshal info
-
-    (define/public (get-serialize-version)
-      4)
-
-    (define/public (serialize-infos ri n d)
-      (if (= n 1)
-          (list (serialize-info ri))
-          (map (lambda (ht) (serialize-one-ht ri ht))
-               (partition-info (resolve-info-ci ri) n d))))
-
-    (define/private (partition-info all-ci n d)
-      ;; partition information in `all-ci' based on `d's:
-      (let ([prefix (part-tag-prefix d)]
-            [new-hts (for/list ([i (in-range n)])
-                       (make-hash))]
-            [covered (make-hash)])
-        ;; Fill in new-hts from parts:
-        (for ([sub-d (in-list (part-parts d))]
-              [i (in-naturals)])
-          (define ht (list-ref new-hts (min (add1 i) (sub1 n))))
-          (define cdi (hash-ref (collect-info-parts all-ci) sub-d #f))
-          (define sub-prefix (part-tag-prefix sub-d))
-          (when cdi
-            (for ([(k v) (in-hash (collected-info-info cdi))])
-              (when (cadr k)
-                (define sub-k (if sub-prefix
-                                  (convert-key sub-prefix k)
-                                  k))
-                (define full-k (if prefix
-                                   (convert-key prefix sub-k)
-                                   sub-k))
-                (hash-set! ht full-k v)
-                (hash-set! covered full-k #t)))))
-        ;; Anything not covered in the new-hts must go in the main hts:
-        (let ([ht0 (car new-hts)])
-          (for ([(k v) (in-hash (collect-info-ht all-ci))])
-            (unless (hash-ref covered k #f)
-              (hash-set! ht0 k v))))
-        ;; Return hts:
-        new-hts))
-
-    (define/public (serialize-info ri)
-      (serialize-one-ht ri (collect-info-ht (resolve-info-ci ri))))
-
-    (define/public (serialize-one-ht ri ht)
-      (parameterize ([current-serialize-resolve-info ri])
-        (let ([rp (mobile-root-path root)])
-          (when rp
-            (set-mobile-root-path! root #f))
-          (begin0
-           (serialize (cons root ht))
-           (when rp
-             (set-mobile-root-path! root rp))))))
-
-    (define/public (deserialize-info v ci #:root [root-path #f] #:doc-id [doc-id #f])
-      (let ([root+ht (deserialize v)]
-            [in-ht (collect-info-ext-ht ci)])
-        (when root-path
-          (set-mobile-root-path! (car root+ht) root-path))
-        (for ([(k v) (cdr root+ht)])
-          (hash-set! in-ht k (if doc-id (known-doc v doc-id) v)))))
-
-    (define/public (get-defined ci)
-      (hash-map (collect-info-ht ci) (lambda (k v) k)))
-
-    (define/public (get-defineds ci n d)
-      (for/list ([ht (partition-info ci n d)])
-        (hash-map ht (lambda (k v) k))))
-
-    (define/public (get-external ri)
-      (hash-map (resolve-info-undef ri) (lambda (k v) k)))
-
-    (define/public (get-undefined ri)
-      (for/list ([(k v) (in-hash (resolve-info-undef ri))]
-                 #:unless (or (eq? v 'found)
-                              (and v
-                                   ;; v is a search key; see if any key in the set was resolved:
-                                   (let ([ht (hash-ref (resolve-info-searches ri) v)])
-                                     (for/or ([k2 (in-hash-keys ht)])
-                                       (eq? 'found (hash-ref (resolve-info-undef ri) k2 #f)))))))
-        k))
-
-    (define/public (transfer-info ci src-ci)
-      (let ([in-ht (collect-info-ext-ht ci)])
-        (for ([(k v) (collect-info-ext-ht src-ci)])
-          (hash-set! in-ht k v)))
-      (set-demand-chain-demands! 
-       (collect-info-ext-demand ci)
-       (cons (collect-info-ext-demand src-ci)
-             (demand-chain-demands (collect-info-ext-demand ci)))))
-
-    ;; ----------------------------------------
-    ;; document-order traversal
-
-    (define/public (traverse ds fns)
-      (let loop ([fp #hasheq()])
-        (let ([fp2 (start-traverse ds fns fp)])
-          (if (equal? fp fp2)
-              fp
-              (loop fp2)))))
-
-    (define/public (start-traverse ds fns fp)
-      (for/fold ([fp fp]) ([d (in-list ds)])
-        (traverse-part d fp)))
-
-    (define/public (traverse-part d fp)
-      (let* ([fp (if (part-title-content d)
-                     (traverse-content (part-title-content d) fp)
-                     fp)]
-             [fp (traverse-content (part-to-collect d) fp)]
-             [fp (traverse-flow (part-blocks d) fp)])
-        (for/fold ([fp fp]) ([p (in-list (part-parts d))])
-          (traverse-part p fp))))
-
-    (define/public (traverse-paragraph p fp)
-      (traverse-content (paragraph-content p) fp))
-
-    (define/public (traverse-flow p fp)
-      (for/fold ([fp fp]) ([p (in-list p)])
-        (traverse-block p fp)))
-
-    (define/public (traverse-block p fp)
-      (cond [(table? p) (traverse-table p fp)]
-            [(itemization? p) (traverse-itemization p fp)]
-            [(nested-flow? p) (traverse-nested-flow p fp)]
-            [(compound-paragraph? p) (traverse-compound-paragraph p fp)]
-            [(delayed-block? p) fp]
-            [(traverse-block? p) (traverse-force fp p 
-                                                 (traverse-block-traverse p) 
-                                                 (lambda (p fp) (traverse-block p fp)))]
-            [else (traverse-paragraph p fp)]))
-
-    (define/public (traverse-table i fp)
-      (for*/fold ([fp fp]) ([ds (in-list (table-blockss i))]
-                            [d (in-list ds)])
-        (if (eq? d 'cont) 
-            fp
-            (traverse-block d fp))))
-
-    (define/public (traverse-itemization i fp)
-      (for/fold ([fp fp]) ([d (in-list (itemization-blockss i))])
-        (traverse-flow d fp)))
-
-    (define/public (traverse-nested-flow i fp)
-      (for/fold ([fp fp]) ([d (in-list (nested-flow-blocks i))])
-        (traverse-block d fp)))
-
-    (define/public (traverse-compound-paragraph i fp)
-      (for/fold ([fp fp]) ([d (in-list (compound-paragraph-blocks i))])
-        (traverse-block d fp)))
-
-    (define/public (traverse-content i fp)
-      (cond
-       [(traverse-element? i) (traverse-force fp i (traverse-element-traverse i)
-                                              (lambda (i fp) (traverse-content i fp)))]
-       [(element? i) (traverse-content (element-content i) fp)]
-       [(list? i) (for/fold ([fp fp]) ([c (in-list i)])
-                    (traverse-content c fp))]
-       [(multiarg-element? i)
-        (for/fold ([fp fp]) ([c (in-list (multiarg-element-contents i))])
-          (traverse-content c fp))]
-       [else fp]))
-
-    (define/private (traverse-force fp p proc again)
-      (let ([v (hash-ref fp p (lambda () proc))])
-        (if (procedure? v)
-            (let ([fp fp])
-              (let ([v2 (v (lambda (key default)
-                             (if (eq? key 'scribble:current-render-mode)
-                                 (current-render-mode)
-                                 (hash-ref fp key default)))
-                           (lambda (key val)
-                             (if (eq? key 'scribble:current-render-mode)
-                                 (raise-mismatch-error 
-                                  'traverse-info-set! 
-                                  "cannot set value for built-in key: "
-                                  key)
-                                 (set! fp (hash-set fp key val)))))])
-                (let ([fp (hash-set fp p v2)])
-                  (if (procedure? v2)
-                      fp
-                      (again v2 fp)))))
-            fp)))
-    
-    ;; ----------------------------------------
-    ;; global-info collection
-
-    (define/public (collect ds fns fp [demand (lambda (key ci) #f)])
-      (let ([ci (make-collect-info fp
-                                   (make-hash)
-                                   (make-hash)
-                                   (make-demand-chain (list demand))
-                                   (make-hasheq)
-                                   (make-hasheq)
-                                   null
-                                   (make-hasheq)
-                                   null)])
-        (start-collect ds fns ci)
-        ci))
-
-    (define/public (start-collect ds fns ci)
-      (map (lambda (d) (collect-part d #f ci null 1))
-           ds))
-
-    (define/public (collect-part d parent ci number init-sub-number)
-      (let ([p-ci (make-collect-info
-                   (collect-info-fp ci)
-                   (make-hash)
-                   (collect-info-ext-ht ci)
-                   (collect-info-ext-demand ci)
-                   (collect-info-parts ci)
-                   (collect-info-tags ci)
-                   (if (part-tag-prefix d)
-                       (append (collect-info-gen-prefix ci)
-                               (list (part-tag-prefix d)))
-                       (collect-info-gen-prefix ci))
-                   (collect-info-relatives ci)
-                   (cons d (collect-info-parents ci)))])
-        (hash-set! (collect-info-parts ci)
-                   d
-                   (make-collected-info number
-                                        parent
-                                        (collect-info-ht p-ci)))
-        (define grouper? (and (pair? number) (part-style? d 'grouper)))
-        (define next-sub-number
-          (parameterize ([current-tag-prefixes
-                          (extend-prefix d (fresh-tag-collect-context? d p-ci))])
-            (when (part-title-content d)
-              (collect-content (part-title-content d) p-ci))
-            (collect-part-tags d p-ci number)
-            (collect-content (part-to-collect d) p-ci)
-            (collect-flow (part-blocks d) p-ci)
-            (let loop ([parts (part-parts d)]
-                       [pos init-sub-number]
-                       [sub-pos 1])
-              (if (null? parts)
-                  pos
-                  (let ([s (car parts)])
-                    (define unnumbered? (part-style? s 'unnumbered))
-                    (define hidden-number? (or unnumbered?
-                                               (part-style? s 'hidden-number)))
-                    (define sub-grouper? (part-style? s 'grouper))
-                    (define next-sub-pos
-                      (collect-part s d p-ci
-                                    (cons (if hidden-number?
-                                              (if sub-grouper?
-                                                  ""
-                                                  #f)
-                                              (if sub-grouper?
-                                                  (number->roman pos)
-                                                  pos))
-                                          (if hidden-number?
-                                              (for/list ([i (in-list number)])
-                                                (if (string? i)
-                                                    i
-                                                    #f))
-                                              number))
-                                    sub-pos))
-                    (loop (cdr parts)
-                          (if unnumbered?
-                              pos
-                              (add1 pos))
-                          (if sub-grouper?
-                              next-sub-pos
-                              1)))))))
-        (let ([prefix (part-tag-prefix d)])
-          (for ([(k v) (collect-info-ht p-ci)])
-            (when (cadr k)
-              (collect-put! ci (if prefix
-                                   (convert-key prefix k) 
-                                   k) 
-                            v))))
-        next-sub-number))
-
-    (define/private (convert-key prefix k)
-      (case (car k)
-        [(part tech cite)
-         (let ([rhs (cadr k)])
-           (if (or (string? rhs) (pair? rhs))
-               (list (car k) (cons prefix (if (pair? rhs) rhs (list rhs))))
-               k))]
-        [(index-entry)
-         (let ([v (convert-key prefix (cadr k))])
-           (if (eq? v (cadr k)) k (list 'index-entry v)))]
-        [else
-         (if (and (pair? (cadr k))
-                  (eq? 'prefixable (caadr k)))
-             (list (car k) (list* 'prefixable prefix (cdadr k)))
-             k)]))
-
-    (define/public (collect-part-tags d ci number)
-      (for ([t (part-tags d)])
-        (let ([t (generate-tag t ci)])
-          (collect-put! ci
-                        t
-                        ;; INFO SHAPE:
-                        ;; The HTML renderer defines its info as an
-                        ;;  extension of this vector's shape, so that
-                        ;;  other renderers can use HTML info.
-                        (vector (or (part-title-content d) '("???")) 
-                                (add-current-tag-prefix t)
-                                number)))))
-
-    (define/public (collect-paragraph p ci)
-      (collect-content (paragraph-content p) ci))
-
-    (define/public (collect-flow p ci)
-      (for ([p (in-list p)])
-        (collect-block p ci)))
-
-    (define/public (collect-block p ci)
-      (cond [(table? p) (collect-table p ci)]
-            [(itemization? p) (collect-itemization p ci)]
-            [(nested-flow? p) (collect-nested-flow p ci)]
-            [(compound-paragraph? p) (collect-compound-paragraph p ci)]
-            [(delayed-block? p) (void)]
-            [(traverse-block? p) (collect-block (traverse-block-block p ci) ci)]
-            [else (collect-paragraph p ci)]))
-
-    (define/public (collect-table i ci)
-      (for ([d (in-list (apply append (table-blockss i)))])
-        (unless (eq? d 'cont) (collect-block d ci))))
-
-    (define/public (collect-itemization i ci)
-      (for ([d (in-list (itemization-blockss i))])
-        (collect-flow d ci)))
-
-    (define/public (collect-nested-flow i ci)
-      (for ([d (in-list (nested-flow-blocks i))])
-        (collect-block d ci)))
-
-    (define/public (collect-compound-paragraph i ci)
-      (for ([d (in-list (compound-paragraph-blocks i))])
-        (collect-block d ci)))
-
-    (define/public (collect-content i ci)
-      (if (part-relative-element? i)
-        (let ([content (or (hash-ref (collect-info-relatives ci) i #f)
-                           (let ([v ((part-relative-element-collect i) ci)])
-                             (hash-set! (collect-info-relatives ci) i v)
-                             v))])
-          (collect-content content ci))
-        (begin (when (target-element? i) (collect-target-element i ci))
-               (when (index-element? i) (collect-index-element i ci))
-               (when (collect-element? i) ((collect-element-collect i) ci))
-               (when (element? i)
-                 (collect-content (element-content i) ci))
-               (when (multiarg-element? i)
-                 (collect-content (multiarg-element-contents i) ci))
-               (when (list? i)
-                 (for ([e (in-list i)]) (collect-content e ci)))
-               (when (toc-element? i)
-                 (collect-content (toc-element-toc-content i) ci))
-               (when (toc-target2-element? i)
-                 (collect-content (toc-target2-element-toc-content i) ci)))))
-
-    (define/public (collect-target-element i ci)
-      (let ([t (generate-tag (target-element-tag i) ci)])
-        (collect-put! ci t
-                      ;; See "INFO SHAPE" above.
-                      (vector (element-content i)
-                              (add-current-tag-prefix t)))))
-
-    (define/public (collect-index-element i ci)
-      (collect-put! ci
-                    `(index-entry ,(generate-tag (index-element-tag i) ci))
-                    (list (index-element-plain-seq i)
-                          (index-element-entry-seq i)
-                          (index-element-desc i))))
-
-    ;; ----------------------------------------
-    ;; global-info resolution
-
-    (define/public (resolve ds fns ci)
-      (let ([ri (make-resolve-info ci (make-hasheq) (make-hash) (make-hash))])
-        (start-resolve ds fns ri)
-        ri))
-
-    (define/public (start-resolve ds fns ri)
-      (map (lambda (d) (resolve-part d ri)) ds))
-
-    (define/public (resolve-part d ri)
-      (parameterize ([current-tag-prefixes
-                      (extend-prefix d (fresh-tag-resolve-context? d ri))])
-        (when (part-title-content d)
-          (resolve-content (part-title-content d) d ri))
-        (resolve-flow (part-blocks d) d ri)
-        (for ([p (part-parts d)])
-          (resolve-part p ri))))
-
-    (define/public (resolve-paragraph p d ri)
-      (resolve-content (paragraph-content p) d ri))
-
-    (define/public (resolve-flow f d ri)
-      (for ([p (in-list f)])
-        (resolve-block p d ri)))
-
-    (define/public (resolve-block p d ri)
-      (cond
-        [(table? p) (resolve-table p d ri)]
-        [(itemization? p) (resolve-itemization p d ri)]
-        [(nested-flow? p) (resolve-nested-flow p d ri)]
-        [(compound-paragraph? p) (resolve-compound-paragraph p d ri)]
-        [(delayed-block? p) 
-         (let ([v ((delayed-block-resolve p) this d ri)])
-           (hash-set! (resolve-info-delays ri) p v)
-           (resolve-block v d ri))]
-        [(traverse-block? p) (resolve-block (traverse-block-block p ri) d ri)]
-        [else (resolve-paragraph p d ri)]))
-
-    (define/public (resolve-table i d ri)
-      (for ([f (in-list (apply append (table-blockss i)))])
-        (unless (eq? f 'cont) (resolve-block f d ri))))
-
-    (define/public (resolve-itemization i d ri)
-      (for ([f (in-list (itemization-blockss i))])
-        (resolve-flow f d ri)))
-    
-    (define/public (resolve-nested-flow i d ri)
-      (for ([f (in-list (nested-flow-blocks i))])
-        (resolve-block f d ri)))
-
-    (define/public (resolve-compound-paragraph i d ri)
-      (for ([f (in-list (compound-paragraph-blocks i))])
-        (resolve-block f d ri)))
-
-    (define/public (resolve-content i d ri)
-      (cond
-        [(part-relative-element? i)
-         (resolve-content (part-relative-element-content i ri) d ri)]
-        [(delayed-element? i)
-         (resolve-content (or (hash-ref (resolve-info-delays ri) i #f)
-                              (let ([v ((delayed-element-resolve i) this d ri)])
-                                (hash-set! (resolve-info-delays ri) i v)
-                                v))
-                          d ri)]
-        [(traverse-element? i)
-         (resolve-content (traverse-element-content i ri) d ri)]
-        [(list? i)
-         (for ([i (in-list i)])
-           (resolve-content i d ri))]
-        [(element? i)
-         (cond
-           [(index-element? i)
-            (let ([e (index-element-desc i)])
-              (when (delayed-index-desc? e)
-                (let ([v ((delayed-index-desc-resolve e) this d ri)])
-                  (hash-set! (resolve-info-delays ri) e v))))]
-           [(link-element? i)
-            (resolve-get d ri (link-element-tag i))])
-         (resolve-content (element-content i) d ri)
-         (cond
-          [(toc-target2-element? i) (resolve-content (toc-target2-element-toc-content i) d ri)]
-          [(toc-element? i) (resolve-content (toc-element-toc-content i) d ri)])]
-        [(multiarg-element? i)
-         (resolve-content (multiarg-element-contents i) d ri)]))
-
-    ;; ----------------------------------------
-    ;; render methods
-
-    (define/public (sort-image-requests reqs prefs)
-      (for/fold ([reqs reqs]) ([pref (in-list (reverse prefs))])
-        (define matches
-          (for/list ([req (in-list reqs)]
-                     #:when (case pref
-                              [(png) (or (eq? req 'png@2x-bytes)
-                                         (eq? req 'png-bytes))]
-                              [(svg) (eq? req 'svg-bytes)]
-                              [(pdf) (eq? req 'pdf-bytes)]
-                              [(ps) (eq? req 'eps-bytes)]
-                              [(gif) (eq? req 'gif-bytes)]
-                              [else #f]))
-            req))
-        (if (null? matches)
-            reqs
-            (append matches (remove* matches reqs)))))
-
-    (define/public (auto-extra-files? v) #f)
-    (define/public (auto-extra-files-paths v) null)
-    (define/public (skip-extra-file? v) #f)
-
-    (define/public (install-extra-files ds)
-      (for ([fn extra-files])
-        (unless (skip-extra-file? fn)
-          (install-file fn #:private-name? #f)))
-      (unless prefix-file
-        (for ([d (in-list ds)])
-          (let ([extras (ormap (lambda (v) (and (auto-extra-files? v) v))
-                               (style-properties (part-style d)))])
-            (when extras
-              (for ([fn (in-list (auto-extra-files-paths extras))])
-                (unless (skip-extra-file? fn)
-                  (install-file (collects-relative->path fn)
-                                #:private-name? #f))))))))
-
-    (define/public (render ds fns ri)
-      ;; maybe this should happen even if fns is empty or all #f?
-      ;; or maybe it should happen for each file rendered (when d is not #f)?
-      (unless (andmap not ds) (install-extra-files ds))
-      (map (lambda (d fn)
-             (define (one) (render-one d ri fn))
-             (when (report-output?) (printf " [Output to ~a]\n" fn))
-             (if fn
-               (with-output-to-file fn #:exists 'truncate/replace one)
-               ;; a #f filename means return the contents as a string
-               (let ([o (open-output-string)])
-                 (parameterize ([current-output-port o])
-                   (one)
-                   (get-output-string o)))))
-           ds
-           fns))
-
-    (define/public (render-one d ri fn)
-      (render-part d ri))
-
-    (define/public (render-part d ri)
-      (parameterize ([current-tag-prefixes
-                      (extend-prefix d (fresh-tag-render-context? d ri))])
-        (render-part-content d ri)))
-
-    (define/public (render-part-content d ri)
-      (list
-       (when (part-title-content d)
-         (render-content (part-title-content d) d ri))
-       (render-flow (part-blocks d) d ri #f)
-       (map (lambda (s) (render-part s ri))
-            (part-parts d))))
-
-    (define/public (render-paragraph p part ri)
-      (render-content (paragraph-content p) part ri))
-
-    (define/public (render-compound-paragraph p part ri starting-item?)
-      (apply append (let loop ([l (compound-paragraph-blocks p)]
-                               [first? #t])
-                      (cond
-                       [(null? l) null]
-                       [else (cons
-                              (render-intrapara-block (car l) part ri first? (null? (cdr l))
-                                                      (and first? starting-item?))
-                              (loop (cdr l) #f))]))))
-
-    (define/public (render-flow p part ri starting-item?)
-      (if (null? p)
-          null
-          (append
-           (render-block (car p)
-                         part ri starting-item?)
-           (apply append
-                  (map (lambda (p)
-                         (render-block p part ri #f))
-                       (cdr p))))))
-
-    (define/public (render-intrapara-block p part ri first? last? starting-item?)
-      (render-block p part ri starting-item?))
-
-    (define/public (render-block p part ri starting-item?)
-      (cond
-       [(table? p) (if (memq 'aux (style-properties (table-style p)))
-                       (render-auxiliary-table p part ri)
-                       (render-table p part ri starting-item?))]
-       [(itemization? p) (render-itemization p part ri)]
-       [(nested-flow? p) (render-nested-flow p part ri starting-item?)]
-       [(compound-paragraph? p) (render-compound-paragraph p part ri starting-item?)]
-       [(delayed-block? p) 
-        (render-block (delayed-block-blocks p ri) part ri starting-item?)]
-       [(traverse-block? p) 
-        (render-block (traverse-block-block p ri) part ri starting-item?)]
-       [else (render-paragraph p part ri)]))
-
-    (define/public (render-auxiliary-table i part ri)
-      null)
-
-    (define/public (render-table i part ri starting-item?)
-      (map (lambda (d) (if (eq? i 'cont) null (render-block d part ri #f)))
-           (apply append (table-blockss i))))
-
-    (define/public (render-itemization i part ri)
-      (map (lambda (d) (render-flow d part ri #t))
-           (itemization-blockss i)))
-
-    (define/public (render-nested-flow i part ri starting-item?)
-      (for/list ([b (in-list (nested-flow-blocks i))]
-                 [pos (in-naturals)])
-        (render-block b part ri (and starting-item? (zero? pos)))))
-
-    (define/public (render-content i part ri)
-      (cond
-        [(string? i) (render-other i part ri)] ; short-cut for common case
-        [(list? i)
-         (apply append (for/list ([i (in-list i)]) (render-content i part ri)))]
-        [(and (link-element? i)
-              (null? (element-content i)))
-         (let ([v (resolve-get part ri (link-element-tag i))])
-           (if v
-               (render-content (strip-aux (or (vector-ref v 0) "???")) part ri)
-               (render-content (list "[missing]") part ri)))]
-        [(element? i)
-         (when (render-element? i)
-           ((render-element-render i) this part ri))
-         (render-content (element-content i) part ri)]
-        [(multiarg-element? i)
-         (render-content (multiarg-element-contents i) part ri)]
-        [(delayed-element? i)
-         (render-content (delayed-element-content i ri) part ri)]
-        [(traverse-element? i)
-         (render-content (traverse-element-content i ri) part ri)]
-        [(part-relative-element? i)
-         (render-content (part-relative-element-content i ri) part ri)]
-        [(convertible? i) (list "???")]
-        [else (render-other i part ri)]))
-
-    (define/public (render-other i part ri)
-      (list i))
-
-    ;; ----------------------------------------
-
-    (define copied-srcs (make-hash))
-    (define copied-dests (make-hash))
-
-    (define/public (install-file fn [content #f] #:private-name? [private-name? #t])
-      (if (and refer-to-existing-files
-               (not content))
-          (if (string? fn)
-              (string->path fn)
-              fn)
-          (let ([normalized (normal-case-path (simplify-path (path->complete-path fn)))])
-            (or (and (not content)
-                     (hash-ref copied-srcs normalized #f))
-                (let ([src-dir (path-only fn)]
-                      [dest-dir (get-dest-directory #t)]
-                      [fn (file-name-from-path fn)])
-                  (let ([src-file (build-path (or src-dir (current-directory)) fn)]
-                        [dest-file (build-path (or dest-dir (current-directory))
-                                               (if (and private-name?
-                                                        helper-file-prefix)
-                                                   (string-append helper-file-prefix
-                                                                  (path-element->string fn))
-                                                   fn))]
-                        [next-file-name (lambda (dest)
-                                          (let-values ([(base name dir?) (split-path dest)])
-                                            (build-path
-                                             base
-                                             (let ([s (path-element->string (path-replace-suffix name #""))])
-                                               (let ([n (regexp-match #rx"^(.*)_([0-9]+)$" s)])
-                                                 (format "~a_~a~a"
-                                                         (if n (cadr n) s)
-                                                         (if n (add1 (string->number (caddr n))) 2)
-                                                         (let ([ext (filename-extension name)])
-                                                           (if ext
-                                                               (bytes-append #"." ext)
-                                                               ""))))))))])
-                    (let-values ([(dest-file normalized-dest-file)
-                                  (let loop ([dest-file dest-file])
-                                    (let* ([normalized-dest-file 
-                                            (normal-case-path (simplify-path (path->complete-path dest-file)))]
-                                           [check-same
-                                            (lambda (src dest-file)
-                                              (call-with-input-file* 
-                                               dest-file
-                                               (lambda (dest)
-                                                 (or (and (not content)
-                                                          (equal? (port-file-identity src)
-                                                                  (port-file-identity dest)))
-                                                     (let loop ()
-                                                       (let ([s (read-bytes 4096 src)]
-                                                             [d (read-bytes 4096 dest)])
-                                                         (and (equal? s d)
-                                                              (or (eof-object? s) (loop)))))))))]
-                                           [same-directories?
-                                            (lambda (s d)
-                                              (let loop ([s s] [d d])
-                                                (cond
-                                                 [(and (file-exists? s) (file-exists? d))
-                                                  (call-with-input-file* s (lambda (in)
-                                                                             (check-same in d)))]
-                                                 [(directory-exists? s)
-                                                  (and (directory-exists? d)
-                                                       (let ([sl (sort (directory-list s) bytes<? #:key path-element->bytes)]
-                                                             [dl (sort (directory-list d) bytes<? #:key path-element->bytes)])
-                                                         (and (equal? sl dl)
-                                                              (andmap loop sl dl))))]
-                                                 [else #f])))]
-                                           [not-same
-                                            (lambda (delete-dest)
-                                              (cond
-                                               [(hash-ref copied-dests normalized-dest-file #f)
-                                                ;; need a different file/directory
-                                                (loop (next-file-name dest-file))]
-                                               [else
-                                                ;; replace the file/directory
-                                                (delete-dest dest-file)
-                                                (values dest-file normalized-dest-file)]))])
-                                      (cond
-                                       [(and (file-exists? src-file)
-                                             (file-exists? dest-file))
-                                        (cond
-                                         [(or (and content
-                                                   (check-same (open-input-bytes content) dest-file))
-                                              (and (not content)
-                                                   (call-with-input-file* src-file (lambda (in) (check-same in dest-file)))))
-                                          ;; same content at that destination
-                                          (values dest-file normalized-dest-file)]
-                                         [else
-                                          (not-same delete-file)])]
-                                       [(and (directory-exists? src-file)
-                                             (directory-exists? dest-file))
-                                        (if (same-directories? src-file dest-file)
-                                            (values dest-file normalized-dest-file)
-                                            (not-same delete-directory/files))]
-                                       [(file-exists? dest-file)
-                                        (not-same delete-file)]
-                                       [(directory-exists? dest-file)
-                                        (not-same delete-directory/files)]
-                                       [else
-                                        ;; new file/directory
-                                        (values dest-file normalized-dest-file)])))])
-                      (unless (or (file-exists? dest-file)
-                                  (directory-exists? dest-file))
-                        (if content
-                            (call-with-output-file*
-                             dest-file
-                             (lambda (dest) (write-bytes content dest)))
-                            (if (directory-exists? src-file)
-                                (copy-directory/files src-file dest-file)
-                                (copy-file src-file dest-file))))
-                      (hash-set! copied-dests normalized-dest-file #t)
-                      (let ([result (path->string (file-name-from-path dest-file))])
-                        (unless content
-                          (hash-set! copied-srcs normalized result))
-                        result))))))))
-
-    ;; ----------------------------------------
-
-    (define/private (do-table-of-contents part ri delta quiet depth)
-      (make-table plain (generate-toc part
-                                      ri
-                                      (+ delta
-                                         (length (collected-info-number
-                                                  (part-collected-info part ri))))
-                                      #t
-                                      quiet
-                                      depth
-                                      null)))
-
-    (define/public (table-of-contents part ri)
-      (do-table-of-contents part ri -1 not +inf.0))
-
-    (define/public (local-table-of-contents part ri style)
-      (do-table-of-contents part ri -1 not (if (eq? style 'immediate-only) 
-                                               1
-                                               +inf.0)))
-
-    (define/public (quiet-table-of-contents part ri)
-      (do-table-of-contents part ri 1 (lambda (x) #t) +inf.0))
-
-    (define/private (generate-toc part ri base-len skip? quiet depth prefixes)
-      (let* ([number (collected-info-number (part-collected-info part ri))]
-             [prefixes (if (part-tag-prefix part)
-                           (cons (part-tag-prefix part) prefixes)
-                           prefixes)]
-             [subs
-              (if (and (quiet (and (part-style? part 'quiet)
-                                   (not (= base-len (sub1 (length number))))))
-                       (positive? depth))
-                  (apply append (map (lambda (p)
-                                       (generate-toc p ri base-len (part-style? p 'toc-hidden) 
-                                                     quiet (sub1 depth) prefixes))
-                                     (part-parts part)))
-                  null)])
-        (if skip?
-            subs
-            (let ([l (cons
-                      (list (make-paragraph
-                             plain
-                             (list
-                              (make-element
-                               'hspace
-                               (list (make-string (* 2 (- (length number)
-                                                          base-len))
-                                                  #\space)))
-                              (make-link-element
-                               (if (= 1 (length number)) "toptoclink" "toclink")
-                               (append
-                                (format-number
-                                 number
-                                 (list (make-element 'hspace '(" "))))
-                                (or (part-title-content part) '("???")))
-                               (for/fold ([t (car (part-tags part))])
-                                   ([prefix (in-list prefixes)])
-                                 (convert-key prefix t))))))
-                      subs)])
-              (if (and (= 1 (length number))
-                       (or (not (car number)) 
-                           (and (number? (car number))
-                                ((car number) . > . 1))
-                           (and (string? (car number))
-                                (not (string=? (car number) "I")))))
-                  (cons (list (make-paragraph
-                               plain
-                               (list (make-element 'hspace (list "")))))
-                        l)
-                  l)))))
-
-    ;; ----------------------------------------
-
-    (super-new)))
-
-
-;; ----------------------------------------
-
-(define-struct demand-chain ([demands #:mutable])
-  #:property prop:procedure (lambda (self key ci)
-                              (for/or ([demand (in-list (demand-chain-demands self))])
-                                (demand key ci))))
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/base.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/base.rkt
deleted file mode 100644
index 5eb7ffcff1..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/base.rkt
+++ /dev/null
@@ -1,965 +0,0 @@
-#lang scheme/base
-
-(require "decode.rkt"
-         "core.rkt"
-         "manual-struct.rkt"
-         "decode-struct.rkt"
-         "html-properties.rkt"
-         "tag.rkt"
-         scheme/list
-         scheme/class
-         racket/contract/base
-         racket/contract/combinator
-         (for-syntax scheme/base))
-
-(provide (all-from-out "tag.rkt"))
-
-;; ----------------------------------------
-
-(define-syntax-rule (title-like-contract)
-  (->* ()
-       (#:tag (or/c #f string? (listof string?))
-              #:tag-prefix (or/c #f string? module-path?)
-              #:style (or/c style? string? symbol? (listof symbol?) #f))
-       #:rest (listof pre-content?)
-       part-start?))
-
-(provide/contract
- [title (->* ()
-             (#:tag (or/c #f string? (listof string?))
-                    #:tag-prefix (or/c #f string? module-path?)
-                    #:style (or/c style? string? symbol? (listof symbol?) #f)
-                    #:version (or/c string? #f)
-                    #:date (or/c string? #f))
-             #:rest (listof pre-content?)
-             title-decl?)]
- [section (title-like-contract)]
- [subsection (title-like-contract)]
- [subsubsection (title-like-contract)]
- [subsubsub*section  (->* ()
-                          (#:tag (or/c #f string? (listof string?)))
-                          #:rest (listof pre-content?)
-                          block?)])
-(provide include-section)
-
-(define (gen-tag content)
-  (datum-intern-literal
-   (regexp-replace* "[^-a-zA-Z0-9_=]" (content->string content) "_")))
-
-(define (prefix->string p)
-  (and p (if (string? p) 
-             (datum-intern-literal p)
-             (module-path-prefix->string p))))
-
-(define (convert-tag tag content)
-  (if (list? tag)
-    (append-map (lambda (t) (convert-tag t content)) tag)
-    `((part ,(or tag (gen-tag content))))))
-
-(define (convert-part-style who s)
-  (cond
-   [(style? s) s]
-   [(not s) plain]
-   [(string? s) (make-style s null)]
-   [(symbol? s) (make-style #f (list s))]
-   [(and (list? s) (andmap symbol? s)) (make-style #f s)]
-   [else (raise-argument-error who "(or/c style? string? symbol? (listof symbol?) #f)" s)]))
-
-(define (title #:tag [tag #f] #:tag-prefix [prefix #f] #:style [style plain]
-               #:version [version #f] #:date [date #f]
-               . str)
-  (let ([content (decode-content str)])
-    (make-title-decl (prefix->string prefix)
-                     (convert-tag tag content)
-                     version
-                     (let ([s (convert-part-style 'title style)])
-                       (if date
-                           (make-style (style-name s)
-                                       (cons (make-document-date date)
-                                             (style-properties s)))
-                           s))
-                     content)))
-
-(define (section #:tag [tag #f] #:tag-prefix [prefix #f] #:style [style plain]
-                 . str)
-  (let ([content (decode-content str)])
-    (make-part-start 0 (prefix->string prefix)
-                     (convert-tag tag content)
-                     (convert-part-style 'section style)
-                     content)))
-
-(define (subsection #:tag [tag #f] #:tag-prefix [prefix #f] #:style [style plain]
-                    . str)
-  (let ([content (decode-content str)])
-    (make-part-start 1
-                     (prefix->string prefix)
-                     (convert-tag tag content)
-                     (convert-part-style 'subsection style)
-                     content)))
-
-(define (subsubsection #:tag [tag #f] #:tag-prefix [prefix #f]
-                       #:style [style plain] . str)
-  (let ([content (decode-content str)])
-    (make-part-start 2
-                     (prefix->string prefix)
-                     (convert-tag tag content)
-                     (convert-part-style 'subsubsection style)
-                     content)))
-
-(define (subsubsub*section #:tag [tag #f] . str)
-  (let ([content (decode-content str)])
-    (make-paragraph plain 
-                    (list
-                     (make-element "SSubSubSubSection"
-                                   (if tag
-                                       (make-target-element #f content `(part ,tag))
-                                       content))))))
-
-(define-syntax (include-section stx)
-  (syntax-case stx ()
-    [(_ mod)
-     (with-syntax ([doc-from-mod (datum->syntax #'mod 'doc)])
-       (unless (module-path? (syntax->datum #'mod))
-         (raise-syntax-error #f
-                             "not a module path"
-                             stx
-                             #'mod))
-       #'(begin
-           (require (only-in mod [doc-from-mod doc]))
-           doc))]))
-
-;; ----------------------------------------
-
-(provide/contract 
- [author (->* (content?) () #:rest (listof content?) block?)]
- [author+email (->* (content? string?) (#:obfuscate? any/c) element?)])
-
-(define (author . auths)
-  (make-paragraph 
-   (make-style 'author null)
-   (let ([nl (make-element 'newline '("\n"))])
-     (case (length auths)
-       [(1) auths]
-       [(2) (list (car auths) nl "and " (cadr auths))]
-       [else (let ([r (reverse auths)])
-               (append (add-between (reverse (cdr r))
-                                    (make-element #f (list "," nl)))
-                       (list "," nl "and " (car r))))]))))
-
-(define (author+email name email #:obfuscate? [obfuscate? #f])
-  (make-element #f
-                (list
-                 name
-                 " <" 
-                 (if obfuscate?
-                     (regexp-replace* #rx"[.]"
-                                      (regexp-replace* #rx"@" email " at ")
-                                      " dot ")
-                     (hyperlink (string-append "mailto:" email) email))
-                 ">")))
-
-;; ----------------------------------------
-
-(define (item? x) (an-item? x))
-
-(define recur-items/c
-  (make-flat-contract 
-   #:name 'items/c
-   #:first-order (lambda (x)
-                   ((flat-contract-predicate items/c) x))))
-
-(define items/c (or/c item?
-                      block?
-                      (listof recur-items/c)
-                      (spliceof recur-items/c)))
-                       
-(provide items/c)
-
-(provide/contract 
- [itemlist (->* () 
-                (#:style (or/c style? string? symbol? #f)) 
-                #:rest (listof items/c)
-                itemization?)]
- [item (->* () 
-            () 
-            #:rest (listof pre-flow?)
-            item?)])
-(provide/contract
- [item? (any/c . -> . boolean?)])
-
-(define (itemlist #:style [style plain] . items)
-  (let ([flows (let loop ([items items])
-                 (cond
-                  [(null? items) null]
-                  [(item? (car items)) (cons (an-item-flow (car items))
-                                             (loop (cdr items)))]
-                  [(block? (car items)) (cons (list (car items))
-                                              (loop (cdr items)))]
-                  [(splice? (car items))
-                   (loop (append (splice-run (car items))
-                                 (cdr items)))]
-                  [else
-                   (loop (append (car items) (cdr items)))]))])
-    (make-itemization (convert-block-style style) flows)))
-
-(define-struct an-item (flow))
-
-(define (item . str)
-  (make-an-item (decode-flow str)))
-
-;; ----------------------------------------
-
-(provide ._ .__ ~ ?- -~-)
-
-(define ._ (make-element (make-style "Sendabbrev" null) "."))
-(define .__ (make-element (make-style "Sendsentence" null) "."))
-(define ~ "\uA0")
-(define ?- "\uAD")
-(define -~- "\u2011")
-
-;; ----------------------------------------
-
-(define elem-like-contract
-  (->* () () #:rest (listof pre-content?) element?))
-
-(provide/contract
- [linebreak (-> element?)]
- [nonbreaking elem-like-contract]
- [hspace (-> exact-nonnegative-integer? element?)]
- [elem (->* ()
-            (#:style element-style?)
-            #:rest (listof pre-content?)
-            element?)]
- [italic elem-like-contract]
- [bold elem-like-contract]
- [smaller elem-like-contract]
- [larger elem-like-contract]
- [emph elem-like-contract]
- [tt elem-like-contract]
- [subscript elem-like-contract]
- [superscript elem-like-contract]
-
- [literal (->* (string?) () #:rest (listof string?) element?)]
-
- [image (->* ((or/c path-string? (cons/c 'collects (listof bytes?))))
-             (#:scale real?
-                      #:suffixes (listof (and/c string? #rx"^[.]"))
-                      #:style element-style?)
-             #:rest (listof content?)
-             image-element?)])
-
-(define hspace-cache (make-vector 100 #f))
-
-(define (hspace n)
-  (if (n . < . (vector-length hspace-cache))
-      (or (vector-ref hspace-cache n)
-          (let ([h (make-element 'hspace (list (make-string n #\space)))])
-            (vector-set! hspace-cache n h)
-            h))
-      (make-element 'hspace (list (make-string n #\space)))))
-
-(define (linebreak)
-  (make-element 'newline '("\n")))
-
-(define (nonbreaking . str)
-  (make-element 'no-break (decode-content str)))
-
-(define (elem #:style [style plain] . str)
-  (make-element style (decode-content str)))
-
-(define (italic . str)
-  (make-element 'italic (decode-content str)))
-
-(define (bold . str)
-  (make-element 'bold (decode-content str)))
-
-(define (smaller . str)
-  (make-element 'smaller (decode-content str)))
-
-(define (larger . str)
-  (make-element 'larger (decode-content str)))
-
-(define (emph . str)
-  (make-element 'italic (decode-content str)))
-
-(define (tt . str)
-  (let* ([l (decode-content str)]
-         [l (let ([m (and (pair? l)
-                          (string? (car l))
-                          (regexp-match-positions #rx"^ +" (car l)))])
-              (if m
-                (list* (hspace (- (cdar m) (caar m)))
-                       (substring (car l) (cdar m))
-                       (cdr l))
-                l))])
-    (if (andmap string? l)
-      (make-element 'tt l)
-      (make-element #f (map (lambda (s)
-                              (if (or (string? s) (symbol? s))
-                                (make-element 'tt (list s))
-                                s))
-                            l)))))
-
-(define (span-class classname . str)
-  (make-element classname (decode-content str)))
-
-(define (subscript . str)
-  (make-element 'subscript (decode-content str)))
-
-(define (superscript . str)
-  (make-element 'superscript (decode-content str)))
-
-(define (literal s . strs)
-  (let ([s (apply string-append s strs)])
-    (make-element #f s)))
-
-(define (image #:scale [scale 1.0] 
-               filename-relative-to-source
-               #:suffixes [suffixes null]
-               #:style [style #f]
-               . alt)
-  (make-image-element style
-                      (decode-content alt)
-                      filename-relative-to-source
-                      suffixes
-                      scale))
-
-;; ----------------------------------------
-
-(define (cell-spec/c c)
-  (define rc
-    (recursive-contract (or/c c
-                              empty
-                              (cons/c rc rc))))
-  rc)
-
-(provide/contract
- [para (->* ()
-            (#:style (or/c style? string? symbol? #f ))
-            #:rest (listof pre-content?)
-            paragraph?)]
- [nested (->* ()
-              (#:style (or/c style? string? symbol? #f ))
-              #:rest (listof pre-flow?)
-              nested-flow?)]
- [compound (->* ()
-                (#:style (or/c style? string? symbol? #f ))
-                #:rest (listof pre-flow?)
-                compound-paragraph?)]
- [tabular (->* ((listof (listof (or/c 'cont block? content?))))
-               (#:style (or/c style? string? symbol? #f)
-                #:sep (or/c content? block? #f)
-                #:column-properties (listof any/c)
-                #:row-properties (listof any/c)
-                #:cell-properties (listof (listof any/c)))
-               table?)])
-
-(define (convert-block-style style)
-  (cond
-   [(style? style) style]
-   [(or (string? style) (symbol? style)) (make-style style null)]
-   [else plain]))
-
-(define (nested #:style [style #f] . c)
-  (make-nested-flow (convert-block-style style)
-                    (decode-flow c)))
-
-(define (para #:style [style #f] . c)
-  (make-paragraph (convert-block-style style)
-                  (decode-content c)))
-
-(define (compound #:style [style #f] . c)
-  (make-compound-paragraph (convert-block-style style)
-                           (decode-flow c)))
-
-(define (tabular #:style [style #f]
-                 #:sep [sep #f]
-                 #:column-properties [column-properties null]
-                 #:row-properties [row-properties null]
-                 #:cell-properties [cell-properties null]
-                 cells)
-  (define (nth-str pos)
-    (case (modulo pos 10)
-      [(1) "st"]
-      [(2) "nd"]
-      [(3) "rd"]
-      [else "th"]))
-  (unless (null? cells)
-    (let ([n (length (car cells))])
-      (for ([row (in-list (cdr cells))]
-            [pos (in-naturals 2)])
-        (unless (= n (length row))
-          (raise-mismatch-error
-           'tabular
-           (format "bad length (~a does not match first row's length ~a) for ~a~a row: "
-                   (length row)
-                   n
-                   pos
-                   (nth-str pos))
-           row)))))
-  (for ([row (in-list cells)]
-        [pos (in-naturals 1)])
-    (when (and (pair? row) (eq? (car row) 'cont))
-      (raise-mismatch-error
-       'tabular
-       (format "~a~a row starts with 'cont: " pos (nth-str pos))
-       row)))
-  (make-table (let ([s (convert-block-style style)])
-                (define n-orig-cols (if (null? cells)
-                                        0
-                                        (length (car cells))))
-                (define n-cols (if sep
-                                   (max 0 (sub1 (* n-orig-cols 2)))
-                                   n-orig-cols))
-                (define n-rows (length cells))
-                (unless (null? cells)
-                  (when ((length column-properties) . > . n-orig-cols)
-                    (raise-mismatch-error
-                     'tabular
-                     "column properties list is too long: "
-                     column-properties)))
-                (when ((length row-properties) . > . n-rows)
-                  (raise-mismatch-error
-                   'tabular
-                   "row properties list is too long: "
-                   row-properties))
-                (when ((length cell-properties) . > . n-rows)
-                  (raise-mismatch-error
-                   'tabular
-                   "cell properties list is too long: "
-                   cell-properties))
-                (unless (null? cells)
-                  (for ([row (in-list cell-properties)])
-                    (when ((length row) . > . n-orig-cols)
-                      (raise-mismatch-error
-                       'tabular
-                       "row list within cell properties list is too long: "
-                       row))))
-                ;; Expand given column and cell properties lists to match
-                ;; the dimensions of the given `cells` by duplicating
-                ;; the last element of a list as needed (and ignoring
-                ;; extra elements):
-                (define (make-full-column-properties column-properties)
-                  (let loop ([column-properties column-properties]
-                             [n 0]
-                             [prev null])
-                    (cond
-                     [(= n n-cols) null]
-                     [(null? column-properties)
-                      (if (or (zero? n) (not sep))
-                          (cons prev (loop null (add1 n) prev))
-                          (list* prev prev (loop null (+ n 2) prev)))]
-                     [else
-                      (define (to-list v) (if (list? v) v (list v)))
-                      (define props (to-list (car column-properties)))
-                      (define rest (loop (cdr column-properties)
-                                         (if (or (zero? n) (not sep))
-                                             (add1 n)
-                                             (+ n 2))
-                                         props))
-                      (if (or (zero? n) (not sep))
-                          (cons props rest)
-                          (list* null props rest))])))
-                (define full-column-properties
-                  (make-full-column-properties column-properties))
-                (define (make-full-cell-properties cell-properties)
-                  (let loop ([cell-properties cell-properties]
-                             [n 0]
-                             [prev (make-list n-cols null)])
-                    (cond
-                     [(= n n-rows) null]
-                     [(null? cell-properties)
-                      (cons prev (loop null (add1 n) prev))]
-                     [else
-                      (define props (make-full-column-properties (car cell-properties)))
-                      (cons props
-                            (loop (cdr cell-properties)
-                                  (add1 n)
-                                  props))])))
-                (define full-cell-properties
-                  (for/list ([c-row (in-list (make-full-cell-properties cell-properties))]
-                             [r-row (in-list (make-full-cell-properties (map list row-properties)))])
-                    (for/list ([c (in-list c-row)]
-                               [r (in-list r-row)])
-                      (append c r))))
-                (define all-cell-properties
-                  (and (or (pair? row-properties)
-                           (pair? cell-properties))
-                       (if (null? column-properties)
-                           full-cell-properties
-                           (for/list ([row (in-list full-cell-properties)])
-                             (for/list ([cell (in-list row)]
-                                        [col (in-list full-column-properties)])
-                               (append cell col))))))
-                (define all-column-properties
-                  (and (pair? column-properties)
-                       full-column-properties))
-                ;; Will werge `cell-properties` and `column-properties` into
-                ;; `s`. Start by finding any existing `table-columns`
-                ;; and `table-cells` properties with the right number of
-                ;; styles:
-                (define props (style-properties s))
-                (define tc (and all-column-properties
-                                (let ([tc (ormap (lambda (v) (and (table-columns? v) v))
-                                                 props)])
-                                  (if (and tc
-                                           (= (length (table-columns-styles tc))
-                                              n-cols))
-                                      tc
-                                      #f))))
-                (define tl (and all-cell-properties
-                                (let ([tl (ormap (lambda (v) (and (table-cells? v) v))
-                                                 props)])
-                                  (if (and tl
-                                           (= (length (table-cells-styless tl))
-                                              n-rows)
-                                           (andmap (lambda (cl)
-                                                     (= (length cl) n-cols))
-                                                   (table-cells-styless tl)))
-                                      tl
-                                      #f))))
-                ;; Merge:
-                (define (cons-maybe v l) (if v (cons v l) l))
-                (make-style (style-name s)
-                            (cons-maybe
-                             (and all-column-properties
-                                  (table-columns
-                                   (if tc
-                                       (for/list ([ps (in-list all-column-properties)]
-                                                  [cs (in-list (table-columns-styles tc))])
-                                         (make-style (style-name cs)
-                                                     (append ps (style-properties cs))))
-                                       (for/list ([ps (in-list all-column-properties)])
-                                         (make-style #f ps)))))
-                             (cons-maybe
-                              (and all-cell-properties
-                                   (table-cells
-                                    (if tl
-                                        (for/list ([pss (in-list all-cell-properties)]
-                                                   [css (in-list (table-cells-styless tl))])
-                                          (for/list ([ps (in-list pss)]
-                                                     [cs (in-list css)])
-                                            (make-style (style-name cs)
-                                                        (append ps (style-properties cs)))))
-                                        (for/list ([pss (in-list all-cell-properties)])
-                                          (for/list ([ps (in-list pss)])
-                                            (make-style #f ps))))))
-                              (remq tc (remq tl props))))))
-              ;; Process cells:
-              (map (lambda (row)
-                     (define (cvt cell)
-                       (cond
-                        [(eq? cell 'cont) cell]
-                        [(block? cell) cell]
-                        [else (make-paragraph plain cell)]))
-                     (define l (map cvt row))
-                     (if sep
-                         (add-between l (cvt sep))
-                         l))
-                   cells)))
-
-;; ----------------------------------------
-
-(provide/contract
- [elemtag (->* ((or/c tag? string?))
-               ()
-               #:rest (listof pre-content?)
-               element?)]
- [elemref (->* ((or/c tag? string?))
-               (#:underline? any/c)
-               #:rest (listof pre-content?)
-               element?)]
- [secref (->* (string?)
-              (#:doc module-path?
-                     #:tag-prefixes (or/c #f (listof string?))
-                     #:underline? any/c)
-              element?)]
- [Secref (->* (string?)
-              (#:doc module-path?
-                     #:tag-prefixes (or/c #f (listof string?))
-                     #:underline? any/c)
-              element?)]
- [seclink (->* (string?)
-               (#:doc module-path?
-                      #:tag-prefixes (or/c #f (listof string?))
-                      #:underline? any/c
-                      #:indirect? any/c)
-               #:rest (listof pre-content?)
-               element?)]
- [other-doc (->* (module-path?)
-                 (#:underline? any/c
-                               #:indirect (or/c #f content?))
-                 element?)])
-
-(define (elemtag t . body)
-  (make-target-element #f (decode-content body) `(elem ,t)))
-(define (elemref #:underline? [u? #t] t . body)
-  (make-link-element (if u? #f "plainlink") (decode-content body) `(elem ,t)))
-
-(define (secref s #:underline? [u? #t] #:doc [doc #f] #:tag-prefixes [prefix #f])
-  (make-link-element (if u? #f "plainlink") null (make-section-tag s #:doc doc #:tag-prefixes prefix)))
-(define (Secref s #:underline? [u? #t] #:doc [doc #f] #:tag-prefixes [prefix #f])
-  (let ([le (secref s #:underline? u? #:doc doc #:tag-prefixes prefix)])
-    (make-link-element
-     (make-style (element-style le) '(uppercase))
-     (element-content le)
-     (link-element-tag le))))
-
-(define normal-indirect (style #f '(indirect-link)))
-(define plain-indirect (style "plainlink" '(indirect-link)))
-
-(define (seclink tag 
-                 #:doc [doc #f] 
-                 #:underline? [u? #t] 
-                 #:tag-prefixes [prefix #f]
-                 #:indirect? [indirect? #f]
-                 . s)
-  (make-link-element (if indirect?
-                         (if u?
-                             normal-indirect
-                             plain-indirect)
-                         (if u? 
-                             #f 
-                             "plainlink"))
-                     (decode-content s)
-                     `(part ,(doc-prefix doc prefix tag))))
-
-(define (other-doc doc 
-                   #:underline? [u? #t]
-                   #:indirect [indirect #f])
-  (if indirect
-      (seclink "top" #:doc doc #:underline? u? #:indirect? #t
-               (list "the " indirect " documentation"))
-      (secref "top" #:doc doc #:underline? u?)))
-
-;; ----------------------------------------
-
-(provide/contract
- [hyperlink (->* ((or/c string? path?))
-                 (#:underline? any/c
-                               #:style element-style?)
-                 #:rest (listof pre-content?)
-                 element?)]
- [url (-> string? element?)]
- [margin-note (->* () (#:left? any/c) #:rest (listof pre-flow?) block?)]
- [margin-note* (->* () (#:left? any/c) #:rest (listof pre-content?) element?)]
- [centered (->* () () #:rest (listof pre-flow?) block?)]
- [verbatim (->* (content?) (#:indent exact-nonnegative-integer?) #:rest (listof content?) block?)])
-
-(define (centered . s)
-  (make-nested-flow (make-style "SCentered" null) (decode-flow s)))
-
-(define (hyperlink url
-                   #:underline? [underline? #t]
-                   #:style [style (if underline? #f "plainlink")]
-                   . str)
-  (make-element (make-style (if (style? style)
-                                (style-name style)
-                                style)
-                            (cons (make-target-url url)
-                                  (if (style? style)
-                                      (style-properties style)
-                                      null)))
-                (decode-content str)))
-
-(define (url str)
-  (hyperlink str (make-element 'url str)))
-
-(define (margin-note #:left? [left? #f] . c)
-  (make-nested-flow
-   (make-style (if left? "refparaleft" "refpara")
-               '(command never-indents))
-   (list
-    (make-nested-flow
-     (make-style (if left? "refcolumnleft" "refcolumn")
-                 null)
-     (list
-      (make-nested-flow
-       (make-style "refcontent" null)
-       (decode-flow c)))))))
-
-(define (margin-note* #:left? [left? #f] . c)
-  (make-element
-   (make-style (if left? "refelemleft" "refelem") null)
-   (make-element
-    (make-style (if left? "refcolumnleft" "refcolumn") null)
-    (make-element
-     (make-style "refcontent" null)
-     (decode-content c)))))
-
-(define (verbatim #:indent [i 0] s . more)
-  (define lines 
-    ;; Break input into a list of lists, where each inner
-    ;; list is a single line. Break lines on "\n" in the
-    ;; input strings, while non-string content is treated
-    ;; as an element within a line.
-    (let loop ([l (cons s more)] [strs null])
-      (cond
-       [(null? l) (if (null? strs)
-                      null
-                      (map
-                       list
-                       (regexp-split
-                        #rx"\n"
-                        (apply string-append (reverse strs)))))]
-       [(string? (car l))
-        (loop (cdr l) (cons (car l) strs))]
-       [else
-        (define post-lines (loop (cdr l) null))
-        (define pre-lines (loop null strs))
-        (define-values (post-line rest-lines)
-          (if (null? post-lines)
-              (values null null)
-              (values (car post-lines) (cdr post-lines))))
-        (define-values (first-lines pre-line)
-          (if (null? pre-lines)
-              (values null null)
-              (values (drop-right pre-lines 1)
-                      (last pre-lines))))
-        (append first-lines
-                (list (append pre-line (list (car l)) post-line))
-                rest-lines)])))
-  (define (str->elts str)
-    ;; Convert a single string in a line to typewriter font,
-    ;; and also convert multiple adjacent spaces to `hspace` so
-    ;; that the space is preserved exactly:
-    (let ([spaces (regexp-match-positions #rx"(?:^| ) +" str)])
-      (if spaces
-        (list* (make-element 'tt (substring str 0 (caar spaces)))
-               (hspace (- (cdar spaces) (caar spaces)))
-               (str->elts (substring str (cdar spaces))))
-        (list (make-element 'tt (list str))))))
-  (define (strs->elts line)
-    ;; Convert strings in the line:
-    (apply append (map (lambda (e) 
-                         (if (string? e) 
-                             (str->elts e) 
-                             (list e)))
-                       line)))
-  (define indent
-    ;; Add indentation to a line:
-    (if (zero? i)
-      values
-      (let ([hs (hspace i)]) (lambda (line) (cons hs line)))))
-  (define (make-nonempty l)
-    ;; If a line has no content, then add a single space:
-    (if (let loop ([l l])
-          (cond
-           [(null? l) #t]
-           [(equal? "" l) #t]
-           [(list? l) (andmap loop l)]
-           [(element? l) (loop (element-content l))]
-           [(multiarg-element? l) (loop (multiarg-element-contents l))]
-           [else #f]))
-        (list l (hspace 1))
-        l))
-  (define (make-line line)
-    ;; Convert a list of line elements --- a mixture of strings
-    ;; and non-strings --- to a paragraph for the line:
-    (let* ([line (indent (strs->elts line))])
-      (list (make-paragraph omitable-style (make-nonempty line)))))
-  (make-table plain (map make-line lines)))
-
-(define omitable-style (make-style 'omitable null))
-
-;; ----------------------------------------
-
-; XXX unknown contract
-(provide get-index-entries)
-(provide/contract
- [index-block (-> delayed-block?)]
- [index (((or/c string? (listof string?))) ()  #:rest (listof pre-content?) . ->* . index-element?)]
- [index* (((listof string?) (listof any/c)) ()  #:rest (listof pre-content?) . ->* . index-element?)] ; XXX first any/c wrong in docs 
- [as-index (() () #:rest (listof pre-content?) . ->* . index-element?)]
- [section-index (() () #:rest (listof string?) . ->* . part-index-decl?)]
- [index-section (() (#:tag (or/c false/c string?)) . ->* . part?)])
-
-(define (section-index . elems)
-  (make-part-index-decl (map content->string elems) elems))
-
-(define (record-index word-seq element-seq tag content)
-  (make-index-element #f
-                      (list (make-target-element #f content `(idx ,tag)))
-                      `(idx ,tag)
-                      word-seq
-                      element-seq
-                      #f))
-
-(define (index* word-seq content-seq . s)
-  (let ([key (make-generated-tag)])
-    (record-index (map clean-up-index-string word-seq)
-                  content-seq key (decode-content s))))
-
-(define (index word-seq . s)
-  (let ([word-seq (if (string? word-seq) (list word-seq) word-seq)])
-    (apply index* word-seq word-seq s)))
-
-(define (as-index . s)
-  (let ([key (make-generated-tag)]
-        [content (decode-content s)])
-    (record-index
-     (list (clean-up-index-string (content->string content)))
-     (if (= 1 (length content)) content (list (make-element #f content)))
-     key
-     content)))
-
-(define (index-section #:title [title "Index"] #:tag [tag #f])
-  (make-part #f
-             `((part ,(or tag "doc-index")))
-             (list title)
-             (make-style 'index '(unnumbered))
-             null
-             (list (index-block))
-             null))
-
-;; returns an ordered list of (list tag (text ...) (element ...) index-desc)
-(define (get-index-entries sec ri)
-  (define (compare-lists xs ys <?)
-    (let loop ([xs xs] [ys ys])
-      (cond [(and (null? xs) (null? ys)) '=]
-            [(null? xs) '<]
-            [(null? ys) '>]
-            [(<? (car xs) (car ys)) '<]
-            [(<? (car ys) (car xs)) '>]
-            [else (loop (cdr ys) (cdr xs))])))
-  ;; string-ci<? as a major key, and string<? next, so "Foo" precedes "foo"
-  ;; (define (string*<? s1 s2)
-  ;;   (or (string-ci<? s1 s2)
-  ;;       (and (not (string-ci<? s2 s1)) (string<? s1 s2))))
-  (define (get-desc entry)
-    (let ([desc (cadddr entry)])
-      (cond [(exported-index-desc? desc)
-             (cons 'libs (map (lambda (l)
-                                (format "~s" l))
-                              (exported-index-desc-from-libs desc)))]
-            [(module-path-index-desc? desc) '(mod)]
-            [(part-index-desc? desc) '(part)]
-            [(delayed-index-desc? desc) '(delayed)]
-            [else '(#f)])))
-  ;; parts first, then modules, then bindings, delayed means it's not
-  ;; the last round, and #f means no desc
-  (define desc-order '(part mod libs delayed #f))
-  ;; this defines an imposed ordering for module names
-  (define lib-order '(#rx"^racket(?:/|$)" #rx"^r.rs(?:/|$)" #rx"^lang(?:/|$)"))
-  (define (lib<? lib1 lib2)
-    (define (lib-level lib)
-      (let loop ([i 0] [rxs lib-order])
-        (if (or (null? rxs) (regexp-match? (car rxs) lib))
-          i (loop (add1 i) (cdr rxs)))))
-    (let ([l1 (lib-level lib1)] [l2 (lib-level lib2)])
-      (if (= l1 l2) (string<? lib1 lib2) (< l1 l2))))
-  (define (compare-desc e1 e2)
-    (let* ([d1 (get-desc e1)] [d2 (get-desc e2)]
-           [t1 (car d1)]      [t2 (car d2)])
-      (cond [(memq t2 (cdr (memq t1 desc-order))) '<]
-            [(memq t1 (cdr (memq t2 desc-order))) '>]
-            [else (case t1 ; equal to t2
-                    [(part) '=] ; will just compare tags
-                    [(mod)  '=] ; the text fields are the names of the modules
-                    [(libs) (compare-lists (cdr d1) (cdr d2) lib<?)]
-                    [(delayed) '>] ; dosn't matter, will run again
-                    [(#f) '=])])))
-  (define (entry<? e1 e2)
-    (let ([text1 (cadr e1)] [text2 (cadr e2)])
-      (case (compare-lists text1 text2 string-ci<?)
-        [(<) #t] [(>) #f]
-        [else (case (compare-desc e1 e2)
-                [(<) #t] [(>) #f]
-                [else (case (compare-lists text1 text2 string<?)
-                        [(<) #t] [(>) #f]
-                        [else
-                         ;; (error 'get-index-entries
-                         ;;        ;; when this happens, revise this code so
-                         ;;        ;; ordering will always be deterministic
-                         ;;        "internal error -- unordered entries: ~e ~e"
-                         ;;        e1 e2)
-                         ;; Instead, just compare the tags
-                         (string<? (format "~a" (car e1))
-                                   (format "~a" (car e2)))])])])))
-  (define l null)
-  (hash-for-each
-   (let ([parent (collected-info-parent (part-collected-info sec ri))])
-     (if parent
-       (collected-info-info (part-collected-info parent ri))
-       (let ([ci (resolve-info-ci ri)])
-         ;; Force all xref info:
-         ((collect-info-ext-demand ci) #f ci)
-         (collect-info-ext-ht ci))))
-   (lambda (k v)
-     (when (and (pair? k) (eq? 'index-entry (car k)))
-       (let ([v (if (known-doc? v) (known-doc-v v) v)])
-         (set! l (cons (cons (cadr k) v) l))))))
-  (sort l entry<?))
-
-(define (index-block)
-  (define alpha (string->list "ABCDEFGHIJKLMNOPQRSTUVWXYZ"))
-  (define (rows . rows)
-    (make-table (make-style 'index null)
-                (map (lambda (row)
-                       (list (make-paragraph plain row)))
-                     rows)))
-  (define contents
-    (lambda (renderer sec ri)
-      (define l (get-index-entries sec ri))
-      (define manual-newlines? (send renderer index-manual-newlines?))
-      (define alpha-starts (make-hasheq))
-      (define alpha-row
-        (let loop ([i l] [alpha alpha])
-          (define (add-letter let l)
-            (list* (make-element "nonavigation" (list (string let))) " " l))
-          (cond [(null? alpha) null]
-                [(null? i) (add-letter (car alpha) (loop i (cdr alpha)))]
-                [else
-                 (let* ([strs (cadr (car i))]
-                        [letter (if (or (null? strs) (string=? "" (car strs)))
-                                  #f
-                                  (char-upcase (string-ref (car strs) 0)))])
-                   (cond [(not letter) (loop (cdr i) alpha)]
-                         [(char-ci>? letter (car alpha))
-                          (add-letter (car alpha) (loop i (cdr alpha)))]
-                         [(char-ci=? letter (car alpha))
-                          (hash-set! alpha-starts (car i) letter)
-                          (list* (make-element
-                                  (make-style #f (list (make-target-url (format "#alpha:~a" letter))))
-                                  (list (string (car alpha))))
-                                 " "
-                                 (loop (cdr i) (cdr alpha)))]
-                         [else (loop (cdr i) alpha)]))])))
-      (define body
-        (let ([br (if manual-newlines? (make-element 'newline '("\n")) "")])
-          (map (lambda (i)
-                 (let ([e (make-link-element
-                           "indexlink"
-                           `(,@(add-between (caddr i) ", ") ,br)
-                           (car i))])
-                   (cond [(hash-ref alpha-starts i #f)
-                          => (lambda (let)
-                               (make-element
-                                (make-style #f (list
-                                                (make-url-anchor
-                                                 (format "alpha:~a" (char-upcase let)))))
-                                (list e)))]
-                         [else e])))
-               l)))
-      (if manual-newlines?
-        (rows alpha-row '(nbsp) body)
-        (apply rows alpha-row '(nbsp) (map list body)))))
-  (make-delayed-block contents))
-
-;; ----------------------------------------
-
-(provide/contract
- [table-of-contents (-> delayed-block?)]
- [local-table-of-contents (() 
-                           (#:style (or/c style? string? symbol? (listof symbol?) #f))
-                           . ->* . delayed-block?)])
-
-(define (table-of-contents)
-  (make-delayed-block
-   (lambda (renderer part ri)
-     (send renderer table-of-contents part ri))))
-
-(define (local-table-of-contents #:style [style plain])
-  (make-delayed-block
-   (lambda (renderer part ri)
-     (send renderer local-table-of-contents part ri style))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/base/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/base/lang.rkt
deleted file mode 100644
index a964276983..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/base/lang.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require scribble/doclang scribble/base)
-(provide (all-from-out scribble/doclang
-                       scribble/base))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/base/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/base/lang/reader.rkt
deleted file mode 100644
index 9c2b200c18..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/base/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang s-exp scribble/base/reader
-scribble/base/lang
-#:wrapper1 (lambda (t) (list* 'doc 'values '() (t)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/basic.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/basic.rkt
deleted file mode 100644
index 43ccbbc6ff..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/basic.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang scheme/base
-
-(require "base.rkt"
-         "core.rkt"
-         "decode.rkt")
-
-(provide title
-         section
-         subsection
-         subsubsection
-         subsubsub*section
-         include-section
-
-         author
-         author+email
-
-         intern-taglet
-         module-path-index->taglet
-         module-path-prefix->string
-         
-         itemize item item?
-
-         hspace
-         elem aux-elem
-         italic bold smaller
-         tt
-         subscript superscript
-
-         section-index index index* as-index index-section
-         get-index-entries index-block
-
-         table-of-contents
-         local-table-of-contents
-
-         span-class)
-
-(define (span-class classname . str)
-  (make-element classname (decode-content str)))
-
-(define (aux-elem . s)
-  (make-element (make-style #f (list 'aux)) (decode-content s)))
-
-(define (itemize #:style [style #f] . items)
-  (let ([items (filter (lambda (v) (not (whitespace? v))) items)])
-    (apply itemlist #:style style items)))
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/blueboxes.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/blueboxes.rkt
deleted file mode 100644
index c74406e4e9..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/blueboxes.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang racket/base
-(require setup/dirs 
-         racket/serialize
-         racket/contract
-         scribble/core)
-
-(provide
- (contract-out
-  [fetch-blueboxes-strs (->* (tag?) (#:blueboxes-cache blueboxes-cache?) 
-                             (or/c #f (non-empty-listof string?)))]
-  [make-blueboxes-cache (-> boolean? blueboxes-cache?)]
-  [blueboxes-cache? (-> any/c boolean?)]))
-
-(struct blueboxes-cache (info) #:mutable)
-(define (make-blueboxes-cache populate?)
-  (blueboxes-cache (and populate? (build-blueboxes-cache))))
-
-(define (fetch-blueboxes-strs tag #:blueboxes-cache [cache (make-blueboxes-cache #f)])
-  (define plain-strs (fetch-strs-for-single-tag tag cache))
-  (cond
-    [(and plain-strs
-          (pair? tag)
-          (eq? (car tag) 'def))
-     (define constructor-strs 
-       (fetch-strs-for-single-tag (cons 'construtor (cdr tag)) cache))
-     (if constructor-strs
-         (append plain-strs 
-                 '("") 
-                 ;; cdr drops the "white label" line (constructor, presumably)
-                 (cdr constructor-strs))
-         plain-strs)]
-    [else
-     plain-strs]))
-
-(define (fetch-strs-for-single-tag tag cache)
-  (unless (blueboxes-cache-info cache)
-    (set-blueboxes-cache-info! cache (build-blueboxes-cache)))
-  (for/or ([ent (in-list (blueboxes-cache-info cache))])
-    (define offset+lens (hash-ref (list-ref ent 2) tag #f))
-    (cond
-      [offset+lens
-       (apply
-        append
-        (for/list ([offset+len (in-list offset+lens)])
-          (define fn (list-ref ent 0))
-          (define offset (list-ref ent 1))
-          (call-with-input-file fn
-            (λ (port)
-              (port-count-lines! port)
-              (file-position port (+ (car offset+len) offset))
-              (for/list ([i (in-range (cdr offset+len))])
-                (read-line port))))))]
-      [else #f])))
-
-;; build-blueboxes-cache : (listof (list file-path int hash[tag -o> (cons int int)]))
-(define (build-blueboxes-cache)
-  (filter
-   values
-   (for*/list ([doc-search-dir (in-list (get-doc-search-dirs))]
-               [doc-dir-name (in-list (if (directory-exists? doc-search-dir)
-                                          (directory-list doc-search-dir)
-                                          '()))])
-     (define x (build-path doc-search-dir doc-dir-name "blueboxes.rktd"))
-     (and (file-exists? x)
-          (call-with-input-file x
-            (λ (port)
-              (port-count-lines! port)
-              (define first-line (read-line port))
-              (define pos (file-position port))
-              (define desed 
-                (with-handlers ([exn:fail? (λ (x) 
-                                             (log-warning "Failed to deserialize ~a: ~a"
-                                                          x
-                                                          (exn-message x))
-                                             #f)])
-                  (deserialize (read port))))
-              (and desed
-                   (list x
-                         (+ (string->number first-line) pos)
-                         desed))))))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/bnf.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/bnf.rkt
deleted file mode 100644
index 91af03e632..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/bnf.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-(module bnf racket
-  (require "struct.rkt"
-           "decode.rkt"
-           (only-in "core.rkt" 
-                    make-style
-                    make-table-columns)
-           mzlib/kw)
-
-  (provide BNF 
-           nonterm
-           BNF-seq BNF-seq-lines
-           BNF-alt  BNF-alt/close ; single-line alternatives
-           BNF-etc
-           BNF-group
-           optional kleenestar kleeneplus kleenerange)
-
-  (define spacer (make-element 'hspace (list " ")))
-  (define equals (make-element 'tt (list spacer "::=" spacer)))
-  (define alt (make-element 'tt (list spacer spacer "|" spacer spacer)))
-
-  (define (as-flow i) (make-flow (list (if (block? i)
-                                           i
-                                           (make-paragraph (list i))))))
-
-
-  (define baseline (make-style #f '(baseline)))
-
-  (define (BNF . defns)
-    (make-table
-     (make-style #f
-                 (list
-                  (make-table-columns
-                   (list baseline baseline baseline baseline))))
-     (apply
-      append
-      (map (lambda (defn)
-             (cons
-              (list (as-flow spacer) (as-flow (car defn)) (as-flow equals) (as-flow (cadr defn)))
-              (map (lambda (i)
-                     (list (as-flow spacer) (as-flow " ") (as-flow alt) (as-flow i)))
-                   (cddr defn))))
-           defns))))
-
-  (define (interleave l spacer)
-    (make-element #f (cons (car l)
-                           (apply append
-                                  (map (lambda (i)
-                                         (list spacer i))
-                                       (cdr l))))))
-
-  (define (BNF-seq . l)
-    (if (null? l)
-        ""
-        (interleave l spacer)))
-
-  (define (BNF-seq-lines . l)
-    (make-table #f (map (lambda (row) (list (as-flow (apply BNF-seq row))))
-                        l)))
-
-  (define (BNF-alt . l)
-    (interleave l alt))
-
-  (define (BNF-alt/close . l)
-    (interleave l (make-element 'roman " | ")))
-
-  (define BNF-etc (make-element 'roman "..."))
-
-  (define/kw (nonterm #:body s)
-    (make-element 'roman (append (list 'lang)
-                                 (list (make-element 'italic (decode-content s)))
-                                 (list 'rang))))
-
-  (define/kw (optional #:body s)
-    (make-element #f (append (list (make-element 'roman "["))
-                             (decode-content s)
-                             (list (make-element 'roman "]")))))
-
-  (define/kw (BNF-group #:body s)
-    (make-element #f (append (list (make-element 'roman "{"))
-                             (list (apply BNF-seq (decode-content s)))
-                             (list (make-element 'roman "}")))))
-
-  (define/kw (kleenestar #:body s)
-    (make-element #f (append (decode-content s) (list (make-element 'roman "*")))))
-
-  (define/kw (kleeneplus #:body s)
-    (make-element #f (append (decode-content s) (list (make-element 'superscript (list "+"))))))
-
-  (define/kw (kleenerange a b #:body s)
-    (make-element #f (append (decode-content s) 
-                             (list (make-element 'roman 
-                                                 (make-element 'superscript 
-                                                               (list (format "{~a,~a}" a b)))))))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/book/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/book/lang.rkt
deleted file mode 100644
index 800fd01a41..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/book/lang.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-(require scribble/doclang
-         scribble/base
-         "../private/defaults.rkt"
-         scribble/latex-prefix)
-
-(provide (except-out (all-from-out scribble/doclang) #%module-begin)
-         (all-from-out scribble/base)
-         (rename-out [module-begin #%module-begin]))
-
-(define-syntax-rule (module-begin id . body)
-  (#%module-begin id (post-process) () . body))
-
-(define ((post-process) doc)
-  (add-defaults doc
-                (string->bytes/utf-8 (string-append "\\documentclass{book}\n"
-                                                    unicode-encoding-packages))
-                (scribble-file "book/style.tex")
-                null
-                #f))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/book/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/book/lang/reader.rkt
deleted file mode 100644
index ada58ad9af..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/book/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang s-exp scribble/base/reader
-scribble/book/lang
-#:wrapper1 (lambda (t) (cons 'doc (t)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/book/style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/book/style.tex
deleted file mode 100644
index f70c1f216a..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/book/style.tex
+++ /dev/null
@@ -1,47 +0,0 @@
-% This style file is used both for `book' and `report' modes
-
-\renewcommand{\ChapRef}[2]{chapter~#1}
-\renewcommand{\ChapRefUC}[2]{Chapter~#1}
-
-% sections
-\renewcommand{\Spart}[2]{\part[#1]{#2}}
-\renewcommand{\Ssection}[2]{\chapter[#1]{#2}}
-\renewcommand{\Ssubsection}[2]{\section[#1]{#2}}
-\renewcommand{\Ssubsubsection}[2]{\subsection[#1]{#2}}
-\renewcommand{\Ssubsubsubsection}[2]{\subsubsection[#1]{#2}}
-\renewcommand{\Ssubsubsubsubsection}[2]{{\bf #2}}
-
-% "star" means unnumbered and not in ToC:
-\renewcommand{\Spartstar}[1]{\part*{#1}}
-\renewcommand{\Ssectionstar}[1]{\chapter*{#1}}
-\renewcommand{\Ssubsectionstar}[1]{\section*{#1}}
-\renewcommand{\Ssubsubsectionstar}[1]{\subsection*{#1}}
-\renewcommand{\Ssubsubsubsectionstar}[1]{\subsubsection*{#1}}
-\renewcommand{\Ssubsubsubsubsectionstar}[1]{\Ssubsubsubsubsection{#1}}
-
-% "starx" means unnumbered but in ToC:
-\renewcommand{\Spartstarx}[2]{\Spartstar{#2}\addcontentsline{toc}{part}{#1}}
-\renewcommand{\Ssectionstarx}[2]{\Ssectionstar{#2}\addcontentsline{toc}{chapter}{#1}}
-\renewcommand{\Ssubsectionstarx}[2]{\Ssubsectionstar{#2}\addcontentsline{toc}{section}{#1}}
-\renewcommand{\Ssubsubsectionstarx}[2]{\Ssubsubsectionstar{#2}\addcontentsline{toc}{subsection}{#1}}
-\renewcommand{\Ssubsubsubsectionstarx}[2]{\Ssubsubsubsectionstar{#2}\addcontentsline{toc}{subsubsection}{#1}}
-\renewcommand{\Ssubsubsubsubsectionstarx}[2]{\Ssubsubsubsubsectionstar{#2}}
-
-% "grouper" is for the 'grouper style variant:
-\renewcommand{\Ssubsectiongrouper}[2]{\setcounter{GrouperTemp}{\value{section}}\Ssubsectionstarx{#1}{#2}\setcounter{section}{\value{GrouperTemp}}}
-\renewcommand{\Ssubsubsectiongrouper}[2]{\setcounter{GrouperTemp}{\value{subsection}}\Ssubsubsectionstarx{#1}{#2}\setcounter{subsection}{\value{GrouperTemp}}}
-\renewcommand{\Ssubsubsubsectiongrouper}[2]{\setcounter{GrouperTemp}{\value{subsubsection}}\Ssubsubsectionstarx{#1}{#2}\setcounter{subsubsection}{\value{GrouperTemp}}}
-\renewcommand{\Ssubsubsubsubsectiongrouper}[2]{\Ssubsubsubsubsectionstarx{#1}{#2}}
-
-\renewcommand{\Ssubsectiongrouperstar}[1]{\setcounter{GrouperTemp}{\value{section}}\Ssubsectionstar{#1}\setcounter{section}{\value{GrouperTemp}}}
-\renewcommand{\Ssubsubsectiongrouperstar}[1]{\setcounter{GrouperTemp}{\value{subsection}}\Ssubsubsectionstar{#1}\setcounter{subsection}{\value{GrouperTemp}}}
-\renewcommand{\Ssubsubsubsectiongrouperstar}[1]{\setcounter{GrouperTemp}{\value{subsubsection}}\Ssubsubsectionstar{#1}\setcounter{subsubsection}{\value{GrouperTemp}}}
-\renewcommand{\Ssubsubsubsubsectiongrouperstar}[1]{\Ssubsubsubsubsectionstar{#1}}
-
-% To increments section numbers:
-\renewcommand{\Sincpart}{\stepcounter{part}}
-\renewcommand{\Sincsection}{\stepcounter{chapter}}
-\renewcommand{\Sincsubsection}{\stepcounter{section}}
-\renewcommand{\Sincsubsubsection}{\stepcounter{subsection}}
-\renewcommand{\Sincsubsubsubsection}{\stepcounter{subsubsection}}
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/comment-reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/comment-reader.rkt
deleted file mode 100644
index 049e8015c4..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/comment-reader.rkt
+++ /dev/null
@@ -1,83 +0,0 @@
-(module comment-reader scheme/base
-  (require (only-in racket/port peeking-input-port))
-
-  (provide (rename-out [*read read]
-                       [*read-syntax read-syntax])
-           make-comment-readtable)
-
-  (define unsyntaxer (make-parameter 'unsyntax))
-
-  (define (*read [inp (current-input-port)])
-    (parameterize ([unsyntaxer (read-unsyntaxer inp)]
-                   [current-readtable (make-comment-readtable)])
-      (read/recursive inp)))
-
-  (define (*read-syntax src [port (current-input-port)])
-    (parameterize ([unsyntaxer (read-unsyntaxer port)]
-                   [current-readtable (make-comment-readtable)])
-      (read-syntax/recursive src port)))
-  
-  (define (read-unsyntaxer port)
-    (let ([p (peeking-input-port port)])
-      (if (eq? (read p) '#:escape-id)  
-          (begin (read port) (read port))
-          'unsyntax)))
-
-  (define (make-comment-readtable #:readtable [rt (current-readtable)])
-    (make-readtable rt
-                    #\; 'terminating-macro
-                    (case-lambda 
-                     [(char port)
-                      (do-comment port (lambda () (read/recursive port #\@)))]
-                     [(char port src line col pos)
-                      (let ([v (do-comment port (lambda () (read-syntax/recursive src port #\@)))])
-                        (let-values ([(eline ecol epos) (port-next-location port)])
-                          (datum->syntax
-                           #f
-                           v
-                           (list src line col pos (and pos epos (- epos pos))))))])))
-
-  (define (do-comment port recur)
-    (let loop ()
-      (when (equal? #\; (peek-char port))
-        (read-char port)
-        (loop)))
-    (when (equal? #\space (peek-char port))
-      (read-char port))
-    `(code:comment
-      (,(unsyntaxer)
-       (t
-        ,@(append-strings
-           (let loop ()
-             (let ([c (read-char port)])
-               (cond
-                [(or (eof-object? c)
-                     (char=? c #\newline))
-                 null]
-                [(char=? c #\@)
-                 (cons (recur) (loop))]
-                [else 
-                 (cons (string c)
-                       (loop))]))))))))
-  
-  (define (append-strings l)
-    (let loop ([l l][s null])
-      (cond
-       [(null? l) (if (null? s)
-                      null
-                      (preserve-space (apply string-append (reverse s))))]
-       [(string? (car l))
-        (loop (cdr l) (cons (car l) s))]
-       [else
-        (append (loop null s)
-                (cons
-                 (car l)
-                 (loop (cdr l) null)))])))
-
-  (define (preserve-space s)
-    (let ([m (regexp-match-positions #rx"  +" s)])
-      (if m
-          (append (preserve-space (substring s 0 (caar m)))
-                  (list `(hspace ,(- (cdar m) (caar m))))
-                  (preserve-space (substring s (cdar m))))
-          (list s)))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/config.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/config.rkt
deleted file mode 100644
index 5822c588ae..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/config.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-(module config mzscheme
-
-  (provide value-color)
-
-  (define value-color "schemevalue"))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/contract-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/contract-render.rkt
deleted file mode 100644
index 3082e2c530..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/contract-render.rkt
+++ /dev/null
@@ -1,183 +0,0 @@
-#lang racket/base
-(require racket/class racket/match
-         (prefix-in text: "text-render.rkt")
-         "base-render.rkt"
-         "core.rkt"
-         file/convertible
-         racket/serialize)
-(provide override-render-mixin-single
-         override-render-mixin-multi)
-
-(define (override-render-mixin multi?)
-  (mixin (render<%>) ()
-    (super-new)
-    (define/override (render srcs dests ri)
-      (super render srcs dests ri)
-      
-      (for ([part (in-list srcs)]
-            [dest (in-list dests)])
-        (define p (open-output-string))
-        (define index-table (make-hash))
-        (port-count-lines! p)
-        (parameterize ([the-renderer text-renderer]
-                       [the-part part]
-                       [the-ri ri]
-                       [the-text-p p])
-          (r-part part 'block index-table))
-        (define table-str (format "~s\n" (serialize index-table)))
-        (define cb.rktd 
-          (cond
-            [multi?
-             (build-path dest "blueboxes.rktd")]
-            [else
-             (define-values (base name dir?) (split-path dest))
-             (build-path base "blueboxes.rktd")]))
-        (call-with-output-file cb.rktd
-          (λ (port)
-            (fprintf port "~a\n" (string-utf-8-length table-str))
-            (display table-str port)
-            (display (get-output-string p) port))
-          #:exists 'truncate)))
-    
-    (inherit get-dest-directory)
-    (define text-renderer (new (text:render-mixin render%)
-                               [dest-dir (get-dest-directory)]))))
-
-(define the-renderer (make-parameter #f))
-(define the-part (make-parameter #f))
-(define the-ri (make-parameter #f))
-(define the-text-p (make-parameter #f))
-
-;; mode is either
-;;     'block -- search for the blue blocks
-;;  or (cons number number) -- search for tags in a block
-(define (r-parts parts mode index-table)
-  (for ([part (in-list parts)])
-    (r-part part mode index-table)))
-
-(define (r-part part mode index-table)
-  (r-blocks (part-blocks part) mode index-table)
-  (r-parts (part-parts part) mode index-table))
-
-(define (r-blocks blocks mode index-table)
-  (for ([block (in-list blocks)])
-    (r-block block mode index-table)))
-
-(define (r-block block mode index-table)
-  (match block
-    [(struct nested-flow (style blocks))
-     (check-and-continue style block mode index-table r-blocks blocks)]
-    [(struct compound-paragraph (style blocks)) 
-     (check-and-continue style block mode index-table r-blocks blocks)]
-    [(paragraph style content)
-     (check-and-continue style block mode index-table r-content content)]
-    [(itemization style blockss)
-     (check-and-continue style block mode index-table r-blockss blockss)]
-    [(table style cells)
-     (check-and-continue style block mode index-table r-blockss+cont cells)]
-    [(delayed-block resolve) 
-     (r-block (delayed-block-blocks block (the-ri)) mode index-table)]))
-
-(define (check-and-continue style block mode index-table sub-f sub-p)
-  (cond
-    [(and (pair? mode) (equal? (style-name style) "RBackgroundLabelInner"))
-     (define background-label-port (car mode))
-     (parameterize ([current-output-port background-label-port])
-       (send (the-renderer) render-block block (the-part) (the-ri) #f))
-     (sub-f sub-p mode index-table)]
-    [(and (eq? mode 'block) (eq? (style-name style) 'boxed) (table? block))
-     (cond
-       [(for/and ([cells (in-list (table-blockss block))])
-          (and (not (null? cells))
-               (null? (cdr cells))
-               (let ([fst (car cells)])
-                 (and (table? fst)
-                      (equal? (style-name (table-style fst)) "together")))))
-        (for ([cells (in-list (table-blockss block))])
-          (handle-one-block style (car cells) mode index-table r-block (car cells)))]
-       [else 
-        (handle-one-block style block mode index-table sub-f sub-p)])]
-    [else
-     (sub-f sub-p mode index-table)]))
-
-(define (handle-one-block style block mode index-table sub-f sub-p)
-  ;(printf "-----\n") ((dynamic-require 'racket/pretty 'pretty-write) block)
-  (define block-port (open-output-string))
-  (define background-label-port (open-output-string))
-  (define ents (make-hash))
-  (define new-mode (cons background-label-port ents))
-  (port-count-lines! block-port)
-  (port-count-lines! background-label-port)
-  (parameterize ([current-output-port block-port])
-    (send (the-renderer) render-block block (the-part) (the-ri) #f))
-  (sub-f sub-p new-mode index-table)
-  
-  ;; we just take the first one here
-  (define background-label-p (open-input-string (get-output-string background-label-port)))
-  (define background-label-line (read-line background-label-p))
-  
-  (define text-p (the-text-p))
-  (define-values (before-line _1 _2) (port-next-location text-p))
-  (define before-position (file-position text-p))
-  (fprintf text-p "~a\n"
-           (if (eof-object? background-label-line)
-               ""
-               background-label-line))
-  
-  ;; dump content of block-port into text-p, but first trim 
-  ;; the spaces that appear at the ends of the lines
-  (let ([p (open-input-string (get-output-string block-port))])
-    (let loop ()
-      (define l (read-line p))
-      (unless (eof-object? l)
-        (display (regexp-replace #rx" *$" l "") text-p)
-        (newline text-p)
-        (loop))))
-  
-  (define-values (after-line _3 _4) (port-next-location text-p))
-  (define txt-loc (cons before-position (- after-line before-line)))
-  (define ri (the-ri))
-  (for ([(k v) (in-hash ents)])
-    (let ([k (tag-key k ri)])
-      (hash-set! index-table k (cons txt-loc (hash-ref index-table k '()))))))
-
-(define (r-blockss+cont blockss mode index-table)
-  (for ([blocks (in-list blockss)])
-    (for ([block (in-list blocks)])
-      (unless (eq? block 'cont)
-        (r-block block mode index-table)))))
-
-(define (r-blockss blockss mode index-table)
-  (for ([blocks (in-list blockss)])
-    (r-blocks blocks mode index-table)))
-
-(define (r-content content mode index-table)
-  (cond
-    [(element? content) (r-element content mode index-table)]
-    [(list? content)
-     (for ([content (in-list content)])
-       (r-content content mode index-table))]
-    [(string? content) (void)]
-    [(symbol? content) (void)]
-    [(convertible? content) (void)]
-    [(delayed-element? content)
-     (r-content (delayed-element-content content (the-ri)) mode index-table)]
-    [(traverse-element? content)
-     (r-content (traverse-element-content content (the-ri)) mode index-table)]
-    [(part-relative-element? content) 
-     (r-content (part-relative-element-content content (the-ri)) mode index-table)]
-    [(multiarg-element? content)
-     (r-content (multiarg-element-contents content) mode index-table)]
-    [else (error 'r-content "unknown content: ~s\n" content)]))
-
-(define (r-element element mode index-table)
-  (when (index-element? element)
-    (when (pair? mode)
-      (define ents (cdr mode))
-      (define key (index-element-tag element))
-      (hash-set! ents (tag-key key (the-ri)) #t)))
-  (r-content (element-content element) mode index-table))
-
-
-(define override-render-mixin-multi (override-render-mixin #t))
-(define override-render-mixin-single (override-render-mixin #f))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/core.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/core.rkt
deleted file mode 100644
index 196c99b07e..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/core.rkt
+++ /dev/null
@@ -1,729 +0,0 @@
-#lang scheme/base
-(require "private/provide-structs.rkt"
-         scheme/serialize
-         racket/contract/base
-         file/convertible)
-
-;; ----------------------------------------
-
-(define-struct collect-info (fp ht ext-ht ext-demand parts tags gen-prefix relatives parents) #:transparent)
-(define-struct resolve-info (ci delays undef searches) #:transparent)
-
-(define (part-collected-info part ri)
-  (hash-ref (collect-info-parts (resolve-info-ci ri))
-            part))
-
-(define (collect-put! ci key val)
-  (let ([ht (collect-info-ht ci)])
-    (let ([old-val (hash-ref ht key #f)])
-      (when old-val
-        (eprintf "WARNING: collected information for key multiple times: ~e; values: ~e ~e\n"
-                 key old-val val))
-      (hash-set! ht key val))))
-
-(define (resolve-get/where part ri key)
-  (let ([key (tag-key key ri)])
-    (let ([v (hash-ref (if part
-                         (collected-info-info (part-collected-info part ri))
-                         (collect-info-ht (resolve-info-ci ri)))
-                       key
-                       #f)])
-      (cond
-        [v (values v #f)]
-        [part (resolve-get/where
-               (collected-info-parent (part-collected-info part ri))
-               ri key)]
-        [else
-         (define ci (resolve-info-ci ri))
-         (define (try-ext)
-           (hash-ref (collect-info-ext-ht ci) key #f))
-         (define v
-           (or (try-ext)
-               (and ((collect-info-ext-demand ci) key ci)
-                    (try-ext))))
-         (if (known-doc? v)
-             (values (known-doc-v v) (known-doc-id v))
-             (values v #t))]))))
-
-(define (resolve-get/ext? part ri key)
-  (define-values (v ext-id) (resolve-get/ext-id* part ri key #f))
-  (values v (and ext-id #t)))
-
-(define (resolve-get/ext-id part ri key)
-  (resolve-get/ext-id* part ri key #f))
-
-(define (resolve-get/ext-id* part ri key search-key)
-  (let-values ([(v ext-id) (resolve-get/where part ri key)])
-    (when ext-id
-      (hash-set! (resolve-info-undef ri) (tag-key key ri) 
-                 (if v 'found search-key)))
-    (values v ext-id)))
-
-(define (resolve-get part ri key)
-  (resolve-get* part ri key #f))
-
-(define (resolve-get* part ri key search-key)
-  (let-values ([(v ext-id) (resolve-get/ext-id* part ri key search-key)])
-    v))
-
-(define (resolve-get/tentative part ri key)
-  (let-values ([(v ext-id) (resolve-get/where part ri key)])
-    v))
-
-(define (resolve-search search-key part ri key)
-  (let ([s-ht (hash-ref (resolve-info-searches ri)
-                        search-key
-                        (lambda ()
-                          (let ([s-ht (make-hash)])
-                            (hash-set! (resolve-info-searches ri)
-                                       search-key s-ht)
-                            s-ht)))])
-    (hash-set! s-ht key #t))
-  (resolve-get* part ri key search-key))
-
-(define (resolve-get-keys part ri key-pred)
-  (for/list ([k (in-hash-keys (if part
-                                  (collected-info-info (part-collected-info part ri))
-                                  (let ([ci (resolve-info-ci ri)])
-                                    ;; Force all xref info:
-                                    ((collect-info-ext-demand ci) #f ci)
-                                    (collect-info-ext-ht ci))))]
-             #:when (key-pred k))
-    k))
-
-(provide (struct-out collect-info)
-         (struct-out resolve-info))
-
-;; ----------------------------------------
-
-(provide tag?)
-(define (tag? s)
-  (and (pair? s)
-       (symbol? (car s))
-       (pair? (cdr s))
-       (or (string? (cadr s))
-           (generated-tag? (cadr s))
-           (and (pair? (cadr s))
-                (list? (cadr s))
-                (serializable? (cadr s))))
-       (null? (cddr s))))
-
-(provide block?)
-(define (block? p)
-  (or (paragraph? p)
-      (table? p)
-      (itemization? p)
-      (nested-flow? p)
-      (compound-paragraph? p)
-      (delayed-block? p)
-      (traverse-block? p)))
-
-(define content-symbols
-  #hasheq([nbsp . #t]
-          [mdash . #t]
-          [ndash . #t]
-          [ldquo . #t]
-          [rdquo . #t]
-          [rsquo . #t]
-          [lsquo . #t]
-          [prime . #t]
-          [rarr . #t]
-          [larr . #t]
-          [alpha . #t]
-          [infin . #t]
-          [lang . #t]
-          [rang . #t]))
-
-(provide content?)
-(define (content? v) 
-  (or (string? v)
-      (element? v)
-      (and (list? v) (andmap content? v))
-      (delayed-element? v)
-      (traverse-element? v)
-      (part-relative-element? v)
-      (multiarg-element? v)
-      (hash-ref content-symbols v #f)
-      (convertible? v)))
-
-(provide element-style?)
-(define (element-style? s)
-  (or (style? s) (not s) (string? s) (symbol? s)))
-
-(define (string-without-newline? s)
-  (and (string? s)
-       (not (regexp-match? #rx"\n" s))))
-
-(define (same-lengths? ls)
-  (or (null? ls)
-      (let ([l1 (length (car ls))])
-        (andmap (λ (l) (= l1 (length l)))
-                (cdr ls)))))
-
-(provide-structs
- [part ([tag-prefix (or/c false/c string?)]
-        [tags (listof tag?)]
-        [title-content (or/c false/c content?)]
-        [style style?]
-        [to-collect list?]
-        [blocks (listof block?)]
-        [parts (listof part?)])]
- [paragraph ([style style?]
-             [content content?])]
- [table ([style style?]
-         [blockss (and/c (listof (listof (or/c block? (one-of/c 'cont))))
-                         same-lengths?)])]
- [delayed-block ([resolve (any/c part? resolve-info? . -> . block?)])]
- [itemization ([style style?]
-               [blockss (listof (listof block?))])]
- [nested-flow ([style style?]
-               [blocks (listof block?)])]
- [compound-paragraph ([style style?]
-                      [blocks (listof block?)])]
-
- [element ([style element-style?]
-           [content content?])]
- [(toc-element element) ([toc-content content?])]
- [(target-element element) ([tag tag?])]
- [(toc-target-element target-element) ()]
- [(toc-target2-element toc-target-element) ([toc-content content?])]
- [(page-target-element target-element) ()]
- [(redirect-target-element target-element) ([alt-path path-string?]
-                                            [alt-anchor string?])]
- [(link-element element) ([tag tag?])]
- [(index-element element) ([tag tag?]
-                           [plain-seq (and/c pair? (listof string-without-newline?))]
-                           [entry-seq (listof content?)]
-                           [desc any/c])]
- [(image-element element) ([path (or/c path-string?
-                                       (cons/c (one-of/c 'collects)
-                                               (listof bytes?)))]
-                           [suffixes (listof #rx"^[.]")]
-                           [scale real?])]
- [multiarg-element ([style element-style?]
-                    [contents (listof content?)])]
-
- [style ([name (or/c string? symbol? #f)]
-         [properties list?])]
- ;; properties:
- [document-version ([text (or/c string? false/c)])]
- [document-date ([text (or/c string? false/c)])]
- [target-url ([addr path-string?])]
- [color-property ([color (or/c string? (list/c byte? byte? byte?))])]
- [background-color-property ([color (or/c string? (list/c byte? byte? byte?))])]
-
- [table-columns ([styles (listof style?)])]
- [table-cells ([styless (listof (listof style?))])]
-
- [box-mode ([top-name string?]
-            [center-name string?]
-            [bottom-name string?])]
-
- [collected-info ([number (listof (or/c false/c exact-nonnegative-integer? string?))]
-                  [parent (or/c false/c part?)]
-                  [info any/c])]
-
- [known-doc ([v any/c]
-             [id string?])])
-
-(provide plain)
-(define plain (make-style #f null))
-
-(define (box-mode* name)
-  (box-mode name name name))
-(provide/contract
- [box-mode* (string? . -> . box-mode?)])
-
-;; ----------------------------------------
-
-;; Traverse block has special serialization support:
-(define-struct traverse-block (traverse)
-  #:property
-  prop:serializable
-  (make-serialize-info
-   (lambda (d)
-     (let ([ri (current-serialize-resolve-info)])
-       (unless ri
-         (error 'serialize-traverse-block
-                "current-serialize-resolve-info not set"))
-       (vector (traverse-block-block d ri))))
-   #'deserialize-traverse-block
-   #f
-   (or (current-load-relative-directory) (current-directory)))
-  #:transparent)
-
-(define block-traverse-procedure/c
-  (recursive-contract
-   ((symbol? any/c . -> . any/c)
-    (symbol? any/c . -> . any)
-    . -> . (or/c block-traverse-procedure/c
-                 block?))))
-
-(provide block-traverse-procedure/c)
-(provide/contract
- (struct traverse-block ([traverse block-traverse-procedure/c])))
-
-(provide deserialize-traverse-block)
-(define deserialize-traverse-block
-  (make-deserialize-info values values))
-
-(define (traverse-block-block b i)
-  (cond
-   [(collect-info? i)
-    (let ([p (hash-ref (collect-info-fp i) b #f)])
-      (if (block? p)
-          p
-          (error 'traverse-block-block
-                 "no block computed for traverse-block: ~e"
-                 b)))]
-   [(resolve-info? i)
-    (traverse-block-block b (resolve-info-ci i))]))
-
-(provide/contract
- [traverse-block-block (traverse-block?
-                        (or/c resolve-info? collect-info?)
-                        . -> . block?)])
-
-;; ----------------------------------------
-
-;; Traverse element has special serialization support:
-(define-struct traverse-element (traverse)
-  #:property
-  prop:serializable
-  (make-serialize-info
-   (lambda (d)
-     (let ([ri (current-serialize-resolve-info)])
-       (unless ri
-         (error 'serialize-traverse-block
-                "current-serialize-resolve-info not set"))
-       (vector (traverse-element-content d ri))))
-   #'deserialize-traverse-element
-   #f
-   (or (current-load-relative-directory) (current-directory)))
-  #:transparent)
-
-(define element-traverse-procedure/c
-  (recursive-contract
-   ((symbol? any/c . -> . any/c)
-    (symbol? any/c . -> . any)
-    . -> . (or/c element-traverse-procedure/c
-                 content?))))
-
-(provide/contract
- (struct traverse-element ([traverse element-traverse-procedure/c])))
-
-(provide deserialize-traverse-element)
-(define deserialize-traverse-element
-  (make-deserialize-info values values))
-
-(define (traverse-element-content e i)
-  (cond
-   [(collect-info? i)
-    (let ([c (hash-ref (collect-info-fp i) e #f)])
-      (if (content? c)
-          c
-          (error 'traverse-block-block
-                 "no block computed for traverse-block: ~e"
-                 e)))]
-   [(resolve-info? i)
-    (traverse-element-content e (resolve-info-ci i))]))
-
-(provide element-traverse-procedure/c)
-(provide/contract
- [traverse-element-content (traverse-element?
-                            (or/c resolve-info? collect-info?)
-                            . -> . content?)])
-
-;; ----------------------------------------
-
-;; Delayed element has special serialization support:
-(define-struct delayed-element (resolve sizer plain)
-  #:property
-  prop:serializable
-  (make-serialize-info
-   (lambda (d)
-     (let ([ri (current-serialize-resolve-info)])
-       (unless ri
-         (error 'serialize-delayed-element
-                "current-serialize-resolve-info not set"))
-       (with-handlers ([exn:fail:contract?
-                        (lambda (exn)
-                          (error 'serialize-delayed-element
-                                 "serialization failed (wrong resolve info? delayed element never rendered?); ~a"
-                                 (exn-message exn)))])
-         (vector (delayed-element-content d ri)))))
-   #'deserialize-delayed-element
-   #f
-   (or (current-load-relative-directory) (current-directory)))
-  #:transparent)
-
-(provide/contract
- (struct delayed-element ([resolve (any/c part? resolve-info? . -> . content?)]
-                          [sizer (-> any)]
-                          [plain (-> any)])))
-
-(module+ deserialize-info
-  (provide deserialize-delayed-element))
-(define deserialize-delayed-element
-  (make-deserialize-info values values))
-
-(provide delayed-element-content)
-(define (delayed-element-content e ri)
-  (hash-ref (resolve-info-delays ri) e))
-
-(provide delayed-block-blocks)
-(define (delayed-block-blocks p ri)
-  (hash-ref (resolve-info-delays ri) p))
-
-(provide current-serialize-resolve-info)
-(define current-serialize-resolve-info (make-parameter #f))
-
-;; ----------------------------------------
-
-;; part-relative element has special serialization support:
-(define-struct part-relative-element (collect sizer plain)
-  #:property
-  prop:serializable
-  (make-serialize-info
-   (lambda (d)
-     (let ([ri (current-serialize-resolve-info)])
-       (unless ri
-         (error 'serialize-part-relative-element
-                "current-serialize-resolve-info not set"))
-       (with-handlers ([exn:fail:contract?
-                        (lambda (exn)
-                          (error 'serialize-part-relative-element
-                                 "serialization failed (wrong resolve info? part-relative element never rendered?); ~a"
-                                 (exn-message exn)))])
-         (vector
-          (part-relative-element-content d ri)))))
-   #'deserialize-part-relative-element
-   #f
-   (or (current-load-relative-directory) (current-directory)))
-  #:transparent)
-
-(provide/contract
- (struct part-relative-element ([collect (collect-info? . -> . content?)]
-                                [sizer (-> any)]
-                                [plain (-> any)])))
-
-(module+ deserialize-info
-  (provide deserialize-part-relative-element))
-(define deserialize-part-relative-element
-  (make-deserialize-info values values))
-
-(provide part-relative-element-content)
-(define (part-relative-element-content e ci/ri)
-  (hash-ref (collect-info-relatives
-             (if (resolve-info? ci/ri) (resolve-info-ci ci/ri) ci/ri))
-            e))
-
-(provide collect-info-parents)
-
-;; ----------------------------------------
-
-;; Delayed index entry also has special serialization support.
-;; It uses the same delay -> value table as delayed-element
-(define-struct delayed-index-desc (resolve)
-  #:mutable
-  #:property
-  prop:serializable 
-  (make-serialize-info
-   (lambda (d)
-     (let ([ri (current-serialize-resolve-info)])
-       (unless ri
-         (error 'serialize-delayed-index-desc
-                "current-serialize-resolve-info not set"))
-       (with-handlers ([exn:fail:contract?
-                        (lambda (exn)
-                          (error 'serialize-index-desc
-                                 "serialization failed (wrong resolve info?); ~a"
-                                 (exn-message exn)))])
-         (vector
-          (delayed-element-content d ri)))))
-   #'deserialize-delayed-index-desc
-   #f
-   (or (current-load-relative-directory) (current-directory)))
-  #:transparent)
-
-(provide/contract
- (struct delayed-index-desc ([resolve (any/c part? resolve-info? . -> . any)])))
-
-(module+ deserialize-info
-  (provide deserialize-delayed-index-desc))
-(define deserialize-delayed-index-desc
-  (make-deserialize-info values values))
-
-;; ----------------------------------------
-
-(define-struct (collect-element element) (collect)
-  #:mutable
-  #:property
-  prop:serializable
-  (make-serialize-info
-   (lambda (d)
-     (vector (make-element
-              (element-style d)
-              (element-content d))))
-   #'deserialize-collect-element
-   #f
-   (or (current-load-relative-directory) (current-directory)))
-  #:transparent)
-
-(module+ deserialize-info
-  (provide deserialize-collect-element))
-(define deserialize-collect-element
-  (make-deserialize-info values values))
-
-(provide/contract
- [struct collect-element ([style element-style?]
-                          [content content?]
-                          [collect (collect-info? . -> . any)])])
-
-;; ----------------------------------------
-
-(define-struct (render-element element) (render)
-  #:property
-  prop:serializable
-  (make-serialize-info
-   (lambda (d)
-     (vector (make-element
-              (element-style d)
-              (element-content d))))
-   #'deserialize-render-element
-   #f
-   (or (current-load-relative-directory) (current-directory)))
-  #:transparent)
-
-(module+ deserialize-info
-  (provide deserialize-render-element))
-(define deserialize-render-element
-  (make-deserialize-info values values))
-
-(provide/contract
- [struct render-element ([style element-style?]
-                         [content content?]
-                         [render (any/c part? resolve-info? . -> . any)])])
-
-;; ----------------------------------------
-
-(define-struct generated-tag ()
-  #:property
-  prop:serializable
-  (make-serialize-info
-   (lambda (g)
-     (let ([ri (current-serialize-resolve-info)])
-       (unless ri
-         (error 'serialize-generated-tag
-                "current-serialize-resolve-info not set"))
-       (let ([t (hash-ref (collect-info-tags (resolve-info-ci ri)) g #f)])
-         (if t
-           (vector t)
-           (error 'serialize-generated-tag
-                  "serialization failed (wrong resolve info?)")))))
-   #'deserialize-generated-tag
-   #f
-   (or (current-load-relative-directory) (current-directory)))
-  #:transparent)
-
-(provide (struct-out generated-tag))
-
-(module+ deserialize-info
-  (provide deserialize-generated-tag))
-(define deserialize-generated-tag
-  (make-deserialize-info values values))
-
-(provide generate-tag tag-key
-         current-tag-prefixes
-         add-current-tag-prefix)
-
-(define (generate-tag tg ci)
-  (if (generated-tag? (cadr tg))
-      (let ([t (cadr tg)])
-        (list (car tg)
-              (let ([tags (collect-info-tags ci)])
-                (or (hash-ref tags t #f)
-                    (let ([key (list* 'gentag
-                                      (hash-count tags)
-                                      (collect-info-gen-prefix ci))])
-                      (hash-set! tags t key)
-                      key)))))
-      tg))
-
-(define (tag-key tg ri)
-  (if (generated-tag? (cadr tg))
-      (list (car tg)
-            (hash-ref (collect-info-tags (resolve-info-ci ri)) (cadr tg)))
-      tg))
-
-(define current-tag-prefixes (make-parameter null))
-(define (add-current-tag-prefix t)
-  (let ([l (current-tag-prefixes)])
-    (if (null? l)
-        t
-        (cons (car t) (append l (cdr t))))))
-
-;; ----------------------------------------
-
-(provide content->string
-         strip-aux)
-
-;; content->port: output-port content -> void
-;; Writes the string content of content into op.
-(define content->port
-  (case-lambda
-    [(op c)
-     (cond
-       [(element? c) (content->port op (element-content c))]
-       [(multiarg-element? c) (content->port op (multiarg-element-contents c))]
-       [(list? c) (for-each (lambda (e) (content->port op e)) c)]
-       [(part-relative-element? c) (content->port op ((part-relative-element-plain c)))]
-       [(delayed-element? c) (content->port op ((delayed-element-plain c)))]
-       [(string? c) (display c op)]
-       [else (display (case c
-                        [(mdash) "---"]
-                        [(ndash) "--"]
-                        [(ldquo rdquo) "\""]
-                        [(rsquo) "'"]
-                        [(rarr) "->"]
-                        [(lang) "<"]
-                        [(rang) ">"]
-                        [else (format "~s" c)])
-                      op)])]
-    [(op c renderer sec ri)
-     (cond
-       [(and (link-element? c)
-             (null? (element-content c)))
-        (let ([dest (resolve-get sec ri (link-element-tag c))])
-          ;; FIXME: this is specific to renderer
-          (if dest
-            (content->port op
-                           (strip-aux
-                            (if (pair? dest) (cadr dest) (vector-ref dest 1)))
-                           renderer sec ri)
-            (display "???" op)))]
-       [(element? c) (content->port op (element-content c) renderer sec ri)]
-       [(multiarg-element? c) (content->port op (multiarg-element-contents c) renderer sec ri)]
-       [(list? c) (for-each (lambda (e)
-                              (content->port op e renderer sec ri))
-                             c)]
-       [(delayed-element? c)
-        (content->port op (delayed-element-content c ri) renderer sec ri)]
-       [(part-relative-element? c)
-        (content->port op (part-relative-element-content c ri) renderer sec ri)]
-       [else (content->port op c)])]))
-
-(define (simple-content->string c)
-  ;; `content->string' is commonly used on a list containing a single string
-  (cond
-   [(string? c) c]
-   [(and (pair? c)
-         (string? (car c))
-         (null? (cdr c)))
-    (car c)]
-   [else #f]))
-
-(define content->string
-  (case-lambda
-    [(c)
-     (or (simple-content->string c)
-         (let ([op (open-output-string)])
-           (content->port op c)
-           (get-output-string op)))]
-    [(c renderer sec ri)
-     (or (simple-content->string c)
-         (let ([op (open-output-string)])
-           (content->port op c renderer sec ri)
-           (get-output-string op)))]))
-
-
-(define (aux-element? e)
-  (and (element? e)
-       (let ([s (element-style e)])
-         (and (style? s)
-              (memq 'aux (style-properties s))))))
-
-(define (strip-aux content)
-  (cond
-    [(null? content) null]
-    [(aux-element? content) null]
-    [(element? content)
-     (define c (element-content content))
-     (define p (strip-aux c))
-     (if (equal? c p)
-         content
-         (struct-copy element content [content p]))]
-    [(list? content) 
-     (define p (map strip-aux content))
-     (if (equal? p content)
-         content
-         p)]
-    [else content]))
-
-;; ----------------------------------------
-
-(provide block-width
-         content-width)
-
-(define (content-width s)
-  (cond
-    [(string? s) (string-length s)]
-    [(list? s) (for/fold ([v 0]) ([s (in-list s)]) (+ v (content-width s)))]
-    [(element? s) (content-width (element-content s))]
-    [(multiarg-element? s) (content-width (multiarg-element-contents s))]
-    [(delayed-element? s) (content-width ((delayed-element-sizer s)))]
-    [(part-relative-element? s) (content-width ((part-relative-element-sizer s)))]
-    [else 1]))
-
-(define (paragraph-width s)
-  (content-width (paragraph-content s)))
-
-(define (flow-width f)
-  (apply max 0 (map block-width f)))
-
-(define (block-width p)
-  (cond
-    [(paragraph? p) (paragraph-width p)]
-    [(table? p) (table-width p)]
-    [(itemization? p) (itemization-width p)]
-    [(nested-flow? p) (nested-flow-width p)]
-    [(compound-paragraph? p) (compound-paragraph-width p)]
-    [(delayed-block? p) 1]
-    [(eq? p 'cont) 0]))
-
-(define (table-width p)
-  (let ([blocks (table-blockss p)])
-    (if (null? blocks)
-      0
-      (let loop ([blocks blocks])
-        (if (null? (car blocks))
-          0
-          (+ (apply max 0 (map block-width (map car blocks)))
-             (loop (map cdr blocks))))))))
-
-(define (itemization-width p)
-  (apply max 0 (map flow-width (itemization-blockss p))))
-
-(define (nested-flow-width p)
-  (+ 4 (apply max 0 (map block-width (nested-flow-blocks p)))))
-
-(define (compound-paragraph-width p)
-  (apply max 0 (map block-width (compound-paragraph-blocks p))))
-
-;; ----------------------------------------
-
-(define (info-key? l)
-  (and (pair? l)
-       (symbol? (car l))
-       (pair? (cdr l))))
-
-(provide info-key?)
-(provide/contract
- [part-collected-info (part? resolve-info? . -> . collected-info?)]
- [collect-put! (collect-info? info-key?  any/c . -> . any)]
- [resolve-get ((or/c part? false/c) resolve-info? info-key? . -> . any)]
- [resolve-get/tentative ((or/c part? false/c) resolve-info? info-key? . -> . any)]
- [resolve-get/ext? ((or/c part? false/c) resolve-info? info-key? . -> . any)]
- [resolve-get/ext-id ((or/c part? false/c) resolve-info? info-key? . -> . any)]
- [resolve-search (any/c (or/c part? false/c) resolve-info? info-key? . -> . any)]
- [resolve-get-keys ((or/c part? false/c) resolve-info? (info-key? . -> . any/c) . -> . any/c)])
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/decode-struct.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/decode-struct.rkt
deleted file mode 100644
index 3a56e267ee..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/decode-struct.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scheme/base
-(require "private/provide-structs.rkt")
-
-(provide-structs
- [part-index-desc ()])
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/decode.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/decode.rkt
deleted file mode 100644
index 463845b9ed..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/decode.rkt
+++ /dev/null
@@ -1,368 +0,0 @@
-#lang scheme/base
-(require "core.rkt"
-         "private/provide-structs.rkt"
-         "decode-struct.rkt"
-         racket/contract/base
-         racket/contract/combinator
-         scheme/list)
-
-(define (pre-content? i)
-  (or (string? i)
-      (content? i)
-      (and (splice? i)
-           (andmap pre-content? (splice-run i)))
-      (and (list? i)
-           (andmap pre-content? i))
-      (void? i)))
-
-(define (pre-flow? i)
-  (or (string? i)
-      (content? i)
-      (block? i)
-      (and (splice? i)
-           (andmap pre-flow? (splice-run i)))
-      (and (list? i)
-           (andmap pre-flow? i))
-      (void? i)))
-
-(define (pre-part? v)
-  (or (pre-flow? v)
-      (title-decl? v)
-      (part-start? v)
-      (part-index-decl? v)
-      (part-collect-decl? v)
-      (part-tag-decl? v)
-      (part? v)
-      (and (splice? v)
-           (andmap pre-part? (splice-run v)))
-      (and (list? v)
-           (andmap pre-part? v))))
-
-(provide-structs
- [title-decl ([tag-prefix (or/c false/c string?)]
-              [tags (listof tag?)]
-              [version (or/c string? false/c)]
-              [style style?]
-              [content content?])]
- [part-start ([depth integer?]
-              [tag-prefix (or/c false/c string?)]
-              [tags (listof tag?)]
-              [style style?]
-              [title content?])]
- [splice ([run list?])]
- [part-index-decl ([plain-seq (listof string?)]
-                   [entry-seq list?])]
- [part-collect-decl ([element (or/c element? part-relative-element?)])]
- [part-tag-decl ([tag tag?])])
-
-(provide whitespace?
-         pre-content?
-         pre-flow?
-         pre-part?)
-
-(provide/contract
- [decode (-> (listof pre-part?)
-             part?)]
- [decode-part  (-> (listof pre-part?)
-                   (listof string?)
-                   (or/c #f content?)
-                   exact-nonnegative-integer?
-                   part?)]
- [decode-flow  (-> (listof pre-flow?)
-                   (listof block?))]
- [decode-paragraph (-> (listof pre-content?)
-                       paragraph?)]
- [decode-compound-paragraph (-> (listof pre-flow?)
-                                block?)]
- [decode-content (-> (listof pre-content?)
-                     content?)]
- [rename decode-content decode-elements
-         (-> (listof pre-content?)
-             content?)]
- [decode-string (-> string? content?)]
- [clean-up-index-string (-> string? string?)])
-
-(define (spliceof c)
-  (define name `(spliceof ,(contract-name c)))
-  (define p (flat-contract-predicate c))
-  (make-flat-contract #:name name
-                      #:first-order (lambda (x)
-                                      (and (splice? x)
-                                           (andmap p (splice-run x))))))
-(provide/contract
- [spliceof (flat-contract? . -> . flat-contract?)])
-
-(define the-part-index-desc (make-part-index-desc))
-
-(define (clean-up-index-string s)
-  ;; Collapse whitespace, and remove leading or trailing spaces, which
-  ;; might appear there due to images or something else that gets
-  ;; dropped in string form.
-  (let* ([s (regexp-replace* #px"\\s+" s " ")]
-         [s (regexp-replace* #rx"^ " s "")]
-         [s (regexp-replace* #rx" $" s "")])
-    (datum-intern-literal s)))
-
-
-(define (decode-string s)
-  (define pattern #rx"(---|--|``|''|'|`)")
-  (let loop ([start 0])
-    (cond
-     [(regexp-match-positions pattern s start)
-      => (lambda (m)
-           (define the-match (substring s (caar m) (cdar m)))
-           (list* (datum-intern-literal (substring s start (caar m)))
-                  (cond
-                   [(string=? the-match "---") 'mdash]
-                   [(string=? the-match "--") 'ndash]
-                   [(string=? the-match "``") 'ldquo]
-                   [(string=? the-match "''") 'rdquo]
-                   [(string=? the-match "'") 'rsquo]
-                   [(string=? the-match "`") 'lsquo])
-                  (loop (cdar m))))]
-     ;; Common case: nothing to decode, so don't copy strings.
-     ;; Assume that the input is already interned.
-     [(= start 0)
-      (list s)]
-     [else
-      (list (datum-intern-literal (substring s start)))])))
-   
-
-(define (line-break? v)
-  (equal? v "\n"))
-
-(define (whitespace? v)
-  (and (string? v) (regexp-match? #px"^[\\s]*$" v)))
-
-(define (decode-accum-para accum)
-  (if (andmap whitespace? accum)
-      null
-      (list (decode-compound-paragraph (reverse (skip-whitespace accum))))))
-
-(define (decode-flow* l keys colls tag-prefix tags vers style title part-depth)
-  (let loop ([l l] [next? #f] [keys keys] [colls colls] [accum null]
-             [title title] [tag-prefix tag-prefix] [tags tags] [vers vers]
-             [style style])
-    (cond
-      [(null? l)
-       (let ([k-tags (map (lambda (k) `(idx ,(make-generated-tag))) keys)]
-             [tags (if (null? tags)
-                     (list `(part ,(make-generated-tag)))
-                     tags)])
-         (make-part
-          tag-prefix
-          (append tags k-tags)
-          title
-          (if vers
-              (make-style (style-name style)
-                          (cons (make-document-version vers)
-                                (style-properties style)))
-              style)
-          (let ([l (append
-                    (map (lambda (k tag)
-                           (make-index-element #f null tag
-                                               (part-index-decl-plain-seq k)
-                                               (part-index-decl-entry-seq k)
-                                               #f))
-                         keys k-tags)
-                     colls)])
-            (if (and title 
-                     (not (memq 'hidden (style-properties style))))
-              (cons (make-index-element
-                     #f null (car tags)
-                     (list (clean-up-index-string
-                            (regexp-replace #px"^\\s+(?:(?:A|An|The)\\s)?"
-                                            (content->string title) "")))
-                     (list (make-element #f title))
-                     the-part-index-desc)
-                    l)
-              l))
-          (decode-accum-para accum)
-          null))]
-      [(void? (car l))
-       (loop (cdr l) next? keys colls accum title tag-prefix tags vers style)]
-      [(title-decl? (car l))
-       (cond [(not part-depth) (error 'decode "misplaced title: ~e" (car l))]
-             [title (error 'decode "found extra title: ~v" (car l))]
-             [else (loop (cdr l) next? keys colls accum
-                         (title-decl-content (car l))
-                         (title-decl-tag-prefix (car l))
-                         (title-decl-tags (car l))
-                         (title-decl-version (car l))
-                         (title-decl-style (car l)))])]
-      #;
-      ;; Blocks are now handled by decode-accum-para
-      [(block? (car l))
-       (let ([para (decode-accum-para accum)]
-             [part (decode-flow* (cdr l) keys colls tag-prefix tags vers style
-                                 title part-depth)])
-         (make-part
-          (part-tag-prefix part)
-          (part-tags part)
-          (part-title-content part)
-          (part-style part)
-          (part-to-collect part)
-          (append para (list (car l)) (part-flow part))
-          (part-parts part)))]
-      [(part? (car l))
-       (let ([para (decode-accum-para accum)]
-             [part (decode-flow* (cdr l) keys colls tag-prefix tags vers style
-                                 title part-depth)])
-         (make-part
-          (part-tag-prefix part)
-          (part-tags part)
-          (part-title-content part)
-          (part-style part)
-          (part-to-collect part)
-          (append para (part-blocks part))
-          (cons (car l) (part-parts part))))]
-      [(part-start? (car l))
-       (unless part-depth
-         (error 'decode "misplaced part; title: ~s" (part-start-title (car l))))
-       (unless ((part-start-depth (car l)) . <= . part-depth)
-         (error 'decode
-                "misplaced part (the part is more than one layer deeper than its container); title: ~s"
-                (part-start-title (car l))))
-       (let ([s (car l)])
-         (let loop ([l (cdr l)] [s-accum null])
-           (if (or (null? l)
-                   (and (part-start? (car l))
-                        ((part-start-depth (car l)) . <= . part-depth))
-                   (part? (car l)))
-             (let ([para (decode-accum-para accum)]
-                   [s (decode-styled-part (reverse s-accum)
-                                          (part-start-tag-prefix s)
-                                          (part-start-tags s)
-                                          (part-start-style s)
-                                          (part-start-title s)
-                                          (add1 part-depth))]
-                   [part (decode-flow* l keys colls tag-prefix tags vers style
-                                       title part-depth)])
-               (make-part (part-tag-prefix part)
-                          (part-tags part)
-                          (part-title-content part)
-                          (part-style part)
-                          (part-to-collect part)
-                          para
-                          (cons s (part-parts part))))
-             (cond
-              [(splice? (car l))
-               (loop (append (splice-run (car l)) (cdr l)) s-accum)]
-              [(list? (car l))
-               (loop (append (car l) (cdr l)) s-accum)]
-              [else
-               (loop (cdr l) (cons (car l) s-accum))]))))]
-      [(splice? (car l))
-       (loop (append (splice-run (car l)) (cdr l))
-             next? keys colls accum title tag-prefix tags vers style)]
-      [(list? (car l))
-       (loop (append (car l) (cdr l))
-             next? keys colls accum title tag-prefix tags vers style)]
-       [(null? (cdr l))
-        (loop null #f keys colls (cons (car l) accum) title tag-prefix tags
-              vers style)]
-       [(part-index-decl? (car l))
-        (loop (cdr l) next? (cons (car l) keys) colls accum title tag-prefix
-              tags vers style)]
-       [(part-collect-decl? (car l))
-        (loop (cdr l) next? keys
-              (cons (part-collect-decl-element (car l)) colls)
-              accum title tag-prefix tags vers style)]
-       [(part-tag-decl? (car l))
-        (loop (cdr l) next? keys colls accum title tag-prefix
-              (append tags (list (part-tag-decl-tag (car l))))
-              vers style)]
-       [(and (pair? (cdr l))
-	     (or (splice? (cadr l))
-                 (list? (cadr l))))
-	(loop (cons (car l) (append ((if (splice? (cadr l)) splice-run values) (cadr l)) (cddr l)))
-              next? keys colls accum title tag-prefix tags vers style)]
-       [(line-break? (car l))
-	(if next?
-          (loop (cdr l) #t keys colls accum title tag-prefix tags vers style)
-          (let ([m (match-newline-whitespace (cdr l))])
-            (if m
-              (let ([part (loop m #t keys colls null title tag-prefix tags vers
-                                style)])
-                (make-part
-                 (part-tag-prefix part)
-                 (part-tags part)
-                 (part-title-content part)
-                 (part-style part)
-                 (part-to-collect part)
-                 (append (decode-accum-para accum)
-                         (part-blocks part))
-                 (part-parts part)))
-              (loop (cdr l) #f keys colls (cons (car l) accum) title tag-prefix
-                    tags vers style))))]
-       [else (loop (cdr l) #f keys colls (cons (car l) accum) title tag-prefix
-                   tags vers style)])))
-
-(define (decode-part l tags title depth)
-  (decode-flow* l null null #f tags #f plain title depth))
-
-(define (decode-styled-part l tag-prefix tags style title depth)
-  (decode-flow* l null null tag-prefix tags #f style title depth))
-
-(define (decode-flow l)
-  (part-blocks (decode-flow* l null null #f null #f plain #f #f)))
-
-(define (match-newline-whitespace l)
-  (cond [(null? l) #f]
-        [(void? (car l)) (match-newline-whitespace (cdr l))]
-        [(line-break? (car l)) (skip-whitespace l)]
-        [(splice? (car l))
-         (match-newline-whitespace (append (splice-run (car l)) (cdr l)))]
-        [(list? (car l))
-         (match-newline-whitespace (append (car l) (cdr l)))]
-        [(whitespace? (car l)) (match-newline-whitespace (cdr l))]
-        [else #f]))
-
-(define (skip-whitespace l)
-  (if (or (null? l) 
-          (not (or (whitespace? (car l))
-                   (void? (car l)))))
-      l
-      (skip-whitespace (cdr l))))
-
-(define (decode l)
-  (decode-part l null #f 0))
-
-(define (decode-paragraph l)
-  (make-paragraph plain (decode-content l)))
-
-(define (decode-content l)
-  (append-map (lambda (s) (cond
-                           [(string? s) (decode-string s)]
-                           [(void? s) null]
-                           [(splice? s) (decode-content (splice-run s))]
-                           [(list? s) (decode-content s)]
-                           [else (list s)]))
-              (skip-whitespace l)))
-
-(define (decode-compound-paragraph l)
-  (define (finish-accum para-accum)
-    (if (null? para-accum)
-        null
-        (list (make-paragraph plain (skip-whitespace (apply append (reverse para-accum)))))))
-  (let ([r (let loop ([l (skip-whitespace l)]
-                      [para-accum null])
-             (cond
-              [(null? l)
-               (finish-accum para-accum)]
-              [else
-               (let ([s (car l)])
-                 (cond
-                  [(block? s) (append
-                               (finish-accum para-accum)
-                               (cons s (loop (skip-whitespace (cdr l)) null)))]
-                  [(string? s) (loop (cdr l)
-                                     (cons (decode-string s) para-accum))]
-                  [else (loop (cdr l)
-                              (cons (list (car l)) para-accum))]))]))])
-    (cond
-     [(null? r)
-      (make-paragraph plain null)]
-     [(null? (cdr r))
-      (car r)]
-     [(make-compound-paragraph plain r)])))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doc.txt b/pkgs/scribble-pkgs/scribble-lib/scribble/doc.txt
deleted file mode 100644
index 40d16d86de..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/doc.txt
+++ /dev/null
@@ -1,708 +0,0 @@
-(The rest of the Scribble documentation is now a separate manual.)
-
-The Scribble Reader
--------------------
-
-The Scribble @-reader is designed to be a convenient facility for
-using free-form text in Scheme code, where "@" is chosen as one of
-the least-used characters in Scheme code.
-
-You can use the reader via Racket's `#reader' form:
-
-  #reader(lib "reader.ss" "scribble")@{This is free-form text!}
-
-Note that the reader will only read @-forms as S-expressions.  The
-meaning of these S-expressions depends on the rest of your own code.
-
-A PLT Scheme manual more likely starts with
-
-  #reader(lib "docreader.ss" "scribble")
-
-which installs a reader, wraps the file content afterward into a
-Racket module, and parses the body into a document using
-"decode.ss".
-
-Another way to use the reader is to use the `use-at-readtable'
-function to switch the current readtable to a readtable that parses
-@-forms.  You can do this in a single command line:
-
-  mzscheme -ile scribble/reader "(use-at-readtable)"
-
-*** Concrete Syntax
-
-Informally, the concrete syntax of @-forms is
-
-  "@" <cmd> "[" <datum> ... "]" "{" <text-body> ... "}"
-
-where all three parts after "@" are optional, but at least one should
-be present.  (Note that spaces are not allowed between the three
-parts.)  "@" is set as a non-terminating reader macro, so it can be
-used as usual in Scheme identifiers unless you want to use it as a
-first character of an identifier; in this case you need to quote with
-a backslash (`\@foo') or quote the whole identifier with bars
-(`|@foo|').
-
-  (define |@foo| '\@bar@baz)
-
-Of course, "@" is not treated specially in Scheme strings, character
-constants, etc.
-
-Roughly, a form matching the above grammar is read as
-
-  (<cmd> <datum> ... <parsed-body> ...)
-
-where <parsed-body> is the translation of each <text-body> in the
-input.  Thus, the initial <cmd> determines the Scheme code that the
-input is translated into.  The common case is when <cmd> is a Scheme
-identifier, which generates a plain Scheme form.
-
-A <text-body> is made of text, newlines, and nested @-forms.  Note
-that the syntax for @-forms is the same in a <text-body> context as in
-a Scheme context.  A <text-body> that isn't an @-form is converted to
-a string expression for its <parsed-body>, and newlines are converted
-to "\n" expressions.
-
-  @foo{bar baz
-       blah}
-  --reads-as-->
-  (foo "bar baz" "\n" "blah")
-
-  @foo{bar @baz[3]
-       blah}
-  --reads-as-->
-  (foo "bar " (baz 3) "\n" "blah")
-
-  @foo{bar @baz{3}
-       blah}
-  --reads-as-->
-  (foo "bar " (baz "3") "\n" "blah")
-
-  @foo{bar @baz[2 3]{4 5}
-       blah}
-  --reads-as-->
-  (foo "bar " (baz 2 3 "4 5") "\n" "blah")
-
-Note that spaces are not allowed before a "[" or a "{", or they will
-be part of the following text (or Scheme code).  (More on using braces
-in body texts below.)
-
-  @foo{bar @baz[2 3] {4 5}}
-  --reads-as-->
-  (foo "bar " (baz 2 3) " {4 5}")
-
-When the above @-forms appear in a Scheme expression context, the
-lexical environment must provide bindings for `foo' (as a procedure or
-a macro).
-
-  (let* ([formatter (lambda (fmt)
-          (lambda args (format fmt (apply string-append args))))]
-         [bf (formatter "*~a*")]
-         [it (formatter "/~a/")]
-         [ul (formatter "_~a_")]
-         [text string-append])
-    @text{@it{Note}: @bf{This is @ul{not} a pipe}.})
-  -->  "/Note/: *This is _not_ a pipe*."
-
-If you want to see the expression that is actually being read, you can
-use Scheme's `quote'.
-
-  '@foo{bar}
-
-** The Command Part
-
-Besides being a Scheme identifier, the <cmd> part of an @-form can
-have Scheme punctuation prefixes, which will end up wrapping the
-*whole* expression.
-
-  @`',@foo{blah}    --reads-as-->    `',@(foo "blah")
-
-When writing Scheme code, this means that @`',@foo{blah} is exactly
-the same as `@',@foo{blah} and `',@@foo{blah}, but unlike the latter
-two, the first construct can appear in body texts with the same
-meaning, whereas the other two would not work (see below).
-
-After the optional punctuation prefix, the <cmd> itself is not limited
-to identifiers; it can be *any* Scheme expression.
-
-  @(lambda (x) x){blah}    --reads-as-->    ((lambda (x) x) "blah")
-  @`(unquote foo){blah}    --reads-as-->    `(,foo "blah")
-
-In addition, the command can be omitted altogether, which will omit it
-from the translation, resulting in an S-expression that usually
-contains, say, just strings:
-
-  @{foo bar     --reads-as-->    ("foo bar" "\n" "baz")
-    baz}
-
-  @'{foo bar    --reads-as-->    '("foo bar" "\n" "baz")
-     baz}
-
-If the command part begins with a ";" (with no newline between the "@"
-and the ";"), then the construct is a comment.  There are two comment
-forms, one for arbitrary-text and possibly nested comments, and
-another one for line comments:
-
-  @;{<anything> ...}
-
-  @;<anything-else-without-newline>
-
-In the first form, the commented body must still parse correctly; see
-the description of the body syntax below.  In the second form, all
-text from the "@;" to the end of the line *and* all following spaces
-(or tabs) are part of the comment (similar to "%" comments in TeX).
-
-  @foo{bar @; comment    --reads-as-->    (foo "bar bazblah")
-       baz@;
-       blah}
-
-Tip: if you're editing in a Scheme-aware editor (like DrRacket or
-Emacs), it is useful to comment out blocks like this:
-
-  @;{
-    ...
-  ;}
-
-so the editor does not treat the file as having unbalanced
-parenthesis.
-
-If only the <cmd> part of an @-form is specified, then the result is
-the command part only, without an extra set of parenthesis.  This
-makes it suitable for Scheme escapes in body texts.  (More on this
-below, in the description of the body part.)
-
-  @foo{x @y z}          --reads-as-->    (foo "x " y " z")
-  @foo{x @(* y 2) z}    --reads-as-->    (foo "x " (* y 2) " z")
-  @{@foo bar}           --reads-as-->    (foo " bar")
-
-Finally, note that there are currently no special rules for using "@"
-in the command itself, which can lead to things like:
-
-  @@foo{bar}{baz}    --reads-as-->    ((foo "bar") "baz")
-
-** The Datum Part
-
-The datum part can contains arbitrary Scheme expressions, which are
-simply stacked before the body text arguments:
-
-  @foo[1 (* 2 3)]{bar}     --reads-as-->    (foo 1 (* 2 3) "bar")
-  @foo[@bar{...}]{blah}    --reads-as-->    (foo (bar "...") "blah")
-
-The body part can still be omitted, which is essentially an
-alternative syntax for plain (non-textual) S-expressions:
-
-  @foo[bar]              --reads-as-->    (foo bar)
-  @foo{bar @f[x] baz}    --reads-as-->    (foo "bar " (f x) " baz")
-
-The datum part can be empty, which makes no difference, except when
-the body is omitted.  It is more common, however, to use an empty body
-for the same purpose.
-
-  @foo[]{bar}    --reads-as-->    (foo "bar")
-  @foo[]         --reads-as-->    (foo)
-  @foo           --reads-as-->    foo
-  @foo{}         --reads-as-->    (foo)
-
-The most common use of the datum part is for Scheme forms that expect
-keyword-value arguments that precede the body of text arguments.
-
-  @foo[#:style 'big]{bar}    --reads-as-->    (foo #:style 'big "bar")
-
-** The Body Part
-
-The syntax of the body part is intended to be as convenient as
-possible for free text.  It can contain almost any text -- the only
-characters with special meaning is "@" for sub-@-forms, and "}" for
-the end of the text.  In addition, a "{" is allowed as part of the
-text, and it makes the matching "}" be part of the text too -- so
-balanced braces are valid text.
-
-  @foo{f{o}o}     --reads-as-->    (foo "f{o}o")
-  @foo{{{}}{}}    --reads-as-->    (foo "{{}}{}")
-
-As described above, the text turns to a sequence of string arguments
-for the resulting form.  Spaces at the beginning and end of lines are
-discarded, and newlines turn to individual "\n" strings (i.e., they
-are not merged with other body parts).  (See also the information
-about newlines and indentation below.)  Spaces are *not* discarded if
-they appear after the open "{" (before the closing "}") when there is
-also text that follows (precedes) it; specifically, they are preserved
-in a single-line body.
-
-  @foo{bar}         --reads-as-->    (foo "bar")
-  @foo{ bar }       --reads-as-->    (foo " bar ")
-  @foo[1]{ bar }    --reads-as-->    (foo 1 " bar ")
-
-If "@" appears in a body, then it is interpreted as Scheme code, which
-means that the @-reader is applied recursively, and the resulting
-syntax appears as part of the S-expression, among other string
-contents.
-
-  @foo{a @bar{b} c}    --reads-as-->    (foo "a " (bar "b") " c")
-
-If the nested "@" construct has only a command -- no body or datum
-parts -- it will not appear in a subform.  Given that the command part
-can be any Scheme expression, this makes "@" a general escape to
-arbitrary Scheme code.
-
-  @foo{a @bar c}        --reads-as-->    (foo "a " bar " c")
-  @foo{a @(bar 2) c}    --reads-as-->    (foo "a " (bar 2) " c")
-
-This is particularly useful with strings, which can be used to include
-arbitrary text.
-
-  @foo{A @"}" marks the end}
-  --reads-as-->
-  (foo "A } marks the end")
-
-Note that the escaped string is (intentionally) merged with the rest
-of the text.  This works for "@" too:
-
-  @foo{The prefix: @"@".}
-  --reads-as-->
-  (foo "The prefix: @.")
-
-  @foo{@"@x{y}" --> (x "y")}
-  --reads-as-->
-  (foo "@x{y} --> (x \"y\")")
-
-* Alternative Body Syntax
-
-In addition to the above, there is an alternative syntax for the body,
-one that specifies a new marker for its end: use "|{" for the opening
-marker to have the text terminated by a "}|".
-
-  @foo|{...}|
-  --reads-as-->
-  (foo "...")
-
-  @foo|{"}" follows "{"}|
-  --reads-as-->
-  (foo "\"}\" follows \"{\"")
-
-  @foo|{Nesting |{is}| ok}|
-  --reads-as-->
-  (foo "Nesting |{is}| ok")
-
-This applies to sub-@-forms too -- the "@" must be prefixed with a
-"|":
-
-  @foo|{Maze
-        |@bar{is}
-        Life!}|
-  --reads-as-->
-  (foo "Maze" "\n" (bar "is") "Life!")
-
-  @t|{In |@i|{sub|@"@"s}| too}|
-  --reads-as-->
-  (t "In " (i "sub@s") " too")
-
-Note that the subform uses its own delimiters, "{...}" or "|{...}|".
-This means that you can copy and paste Scribble text with @-forms
-freely, just prefix the "@" if the immediate surrounding text has a
-prefix.
-
-For even better control, you can add characters in the opening
-delimiter, between the "|" and the "{".  Characters that are put there
-(non alphanumeric ASCII characters only, excluding "{" and "@") should
-also be used for sub-@-forms, and the end-of-body marker should have
-these characters in reverse order with paren-like characters ("(",
-"[", "<") mirrored.
-
-  @foo|<<<{@x{foo} |@{bar}|.}>>>|
-  --reads-as-->
-  (foo "@x{foo} |@{bar}|.")
-
-  @foo|!!{X |!!@b{Y}...}!!|
-  --reads-as-->
-  (foo "X " (b "Y") "...")
-
-Finally, remember that you can use an expression escape with a Scheme
-string for confusing situations.  This works well when you only need
-to quote short pieces, and the above works well when you have larger
-multi-line body texts.
-
-* Scheme Expression Escapes
-
-In some cases, you may want to use a Scheme identifier (or a number or
-a boolean etc.) in a position that touches the following text; in
-these situations you should surround the escaped Scheme expression by
-a pair of "|" characters.  The text inside the bars is parsed as a
-Scheme expression.
-
-  @foo{foo@bar.}      --reads-as-->    (foo "foo" bar.)
-  @foo{foo@|bar|.}    --reads-as-->    (foo "foo" bar ".")
-  @foo{foo@3.}        --reads-as-->    (foo "foo" 3.0)
-  @foo{foo@|3|.}      --reads-as-->    (foo "foo" 3 ".")
-
-This form is a generic Scheme expression escape, there is no body text
-or datum part when you use this form.
-
-  @foo{foo@|(f 1)|{bar}}    --reads-as-->   (foo "foo" (f 1) "{bar}")
-  @foo{foo@|bar|[1]{baz}}   --reads-as-->   (foo "foo" bar "[1]{baz}")
-
-This works for string expressions too, but note that unlike the above,
-the string is (intentionally) not merged with the rest of the text:
-
-  @foo{x@"y"z}      --reads-as-->    (foo "xyz")
-  @foo{x@|"y"|z}    --reads-as-->    (foo "x" "y" "z")
-
-Expression escapes also work with *any* number of expressions,
-
-  @foo{x@|1 (+ 2 3) 4|y}    --reads-as-->    (foo "x" 1 (+ 2 3) 4 "y")
-
-  @foo{x@|*                 --reads-as-->    (foo "x" * * "y")
-          *|y}
-
-It seems that "@||" has no purpose -- but remember that these escapes
-are never merged with the surrounding text, which can be useful when
-you want to control the sub expressions in the form.
-
-  @foo{Alice@||Bob@|    --reads-as-->    (foo "Alice" "Bob" "Carol")
-       |Carol}
-
-Note that "@|{...}|" can be parsed as either an escape expression or
-as a no-command @-form.  The latter is used in this case (since there
-is little point in Scheme code that uses braces.
-
-  @|{blah}|    --reads-as-->    ("blah")
-
-* Comments
-
-As noted above, there are two kinds of Scribble comments: "@;{...}" is
-a (nestable) comment for a whole body of text (following the same
-rules for @-forms), and "@;..." is a line-comment.
-
-  @foo{First line@;{there is still a
-                    newline here;}
-       Second line}
-  --reads-as-->
-  (foo "First line" "\n" "Second line")
-
-One useful property of line-comments is that they continue to the end
-of the line *and* all following spaces (or tabs).  Using this, you can
-get further control of the subforms.
-
-  @foo{A long @;
-       single-@;
-       string arg.}
-  --reads-as-->
-  (foo "A long single-string arg.")
-
-Note how this is different from using "@||"s in that strings around it
-are not merged.
-
-* Spaces, Newlines, and Indentation
-
-The Scribble syntax treats spaces and newlines in a special way is
-meant to be sensible for dealing with text.  As mentioned above,
-spaces at the beginning and end of body lines are discarded, except
-for spaces between a "{" and text, or between text and a "}".
-
-  @foo{bar}         --reads-as-->    (foo "bar")
-
-  @foo{ bar }       --reads-as-->    (foo " bar ")
-
-  @foo{ bar         --reads-as-->    (foo " bar" "\n" "baz ")
-       baz }
-
-A single newline that follows an open brace or precedes a closing
-brace is discarded, unless there are only newlines in the body; other
-newlines are read as a "\n" string
-
-  @foo{bar     --reads-as-->    (foo "bar")
-  }
-
-  @foo{
-    bar        --reads-as-->    (foo "bar")
-  }
-
-  @foo{
-
-    bar        --reads-as-->    (foo "\n" "bar" "\n")
-
-  }
-
-  @foo{
-    bar
-               --reads-as-->    (foo "bar" "\n" "\n" "baz")
-    baz
-  }
-
-  @foo{        --reads-as-->    (foo "\n")
-  }
-
-  @foo{
-               --reads-as-->    (foo "\n" "\n")
-  }
-
-  @foo{ bar    --reads-as-->    (foo " bar" "\n" "baz ")
-       baz }
-
-In the parsed S-expression syntax, a single newline string is used for
-all newlines; you can use `eq?' to identify this line.  This can be
-used to identify newlines in the original <text-body>.
-
-  (let ([nl (car @'{
-                   })])
-    (for-each (lambda (x) (display (if (eq? x nl) "\n... " x)))
-              @`{foo
-                 @,@(list "bar" "\n" "baz")
-                 blah})
-    (newline))
-  --prints-->
-  foo
-  ... bar
-  baz
-  ... blah
-
-Spaces at the beginning of body lines do not appear in the resulting
-S-expressions, but the column of each line is noticed, and all-space
-indentation strings are added so the result has the same indentation.
-A indentation string is added to each line according to its distance
-from the leftmost syntax object (except for empty lines).  (Note: if
-you try these examples on a mzscheme REPL, you should be aware that
-the reader does not know about the "> " prompt.)
-
-  @foo{       --reads-as-->    (foo "bar" "\n"
-    bar                             "baz" "\n"
-    baz                             "blah")
-    blah
-  }
-
-  @foo{       --reads-as-->    (foo "begin" "\n"
-    begin                           "  " "x++;" "\n"
-      x++;                          "end")
-    end}
-
-  @foo{       --reads-as-->    (foo "  " "a" "\n"
-      a                             " " "b" "\n"
-     b                              "c")
-    c}
-
-If the first string came from the openning "{" line, it is not
-prepended with an indentation (but it can affect the leftmost syntax
-object used for indentation).  This makes sense when formatting
-structured code as well as text (see the last example in the following
-block).
-
-  @foo{bar    --reads-as-->    (foo "bar" "\n"
-         baz                        "  " "baz" "\n"
-       bbb}                         "bbb")
-
-  @foo{ bar   --reads-as-->    (foo " bar" "\n"
-          baz                       "   " "baz" "\n"
-        bbb}                        " " "bbb")
-
-  @foo{bar    --reads-as-->    (foo "bar" "\n"
-     baz                            "baz" "\n"
-     bbb}                           "bbb")
-
-  @foo{ bar   --reads-as-->    (foo " bar" "\n"
-     baz                            "baz" "\n"
-     bbb}                           "bbb")
-
-  @foo{ bar   --reads-as-->    (foo " bar" "\n"
-     baz                            "baz" "\n"
-       bbb}                         "  " "bbb")
-
-  @text{Some @b{bold
-    text}, and
-    more text.}
-  --reads-as-->
-  (text "Some " (b "bold" "\n" "text") ", and" "\n" "more text.")
-
-Note that each @-form is parsed to an S-expression that has its own
-indentation.  This means that Scribble source can be indented like
-code, but if indentation matters then you may need to apply
-indentation of the outer item to all lines of the inner one.  For
-example, in
-
-  @code{
-    begin
-      i = 1, r = 1
-      @bold{while i < n do
-              r *= i++
-            done}
-    end
-  }
-  --reads-as-->
-  (code "begin" "\n"
-        "  " "i = 1, r = 1" "\n"
-        "  " (bold "while i < n do" "\n"
-                   "  " "r *= i++" "\n"
-                   "done") "\n"
-        "end")
-
-a formatter will need to apply the 2-space indentation to the
-rendering of the `bold' body.
-
-Note that to get a first-line text to be counted as a leftmost line,
-line and column accounting should be on for the input port
-(`use-at-readtable' turns them on for the current input port).
-Without this,
-
-  @foo{x1
-         x2
-         x3}
-
-will not have 2-space indentations in the parsed S-expression if
-source accounting is not on, but
-
-  @foo{x1
-         x2
-       x3}
-
-will (due to the last line).  Pay attention to this, as it can be a
-problem with Scheme code, for example:
-
-  @code{(define (foo x)
-          (+ x 1))}
-
-For rare situations where spaces at the beginning (or end) of lines
-matter, you can begin (or end) a line with a "@||".
-
-  @foo{
-    @|| bar @||    --reads-as-->    (foo " bar " "\n" " baz")
-    @|| baz}
-
-*** Syntax Properties
-
-The Scribble reader attaches properties to syntax objects.  These
-properties might be useful in rare situations.
-
-Forms that Scribble reads is marked with a 'scribble property, and a
-value of a list of three elements: the first is 'form, the second is
-the number of items that were read from the datum part, and the third
-is the number of items in the body part (strings, sub-forms, and
-escapes).  In both cases, a 0 means an empty datum/body part, and #f
-means that the corresponding part was omitted.  If the form has
-neither parts, the property is not attached to the result.  This
-property can be used to give different meanings to expressions from
-the datum and the body parts, for example, implicitly quoted keywords:
-
-  (define-syntax (foo stx)
-    (let ([p (syntax-property stx 'scribble)])
-      (syntax-case stx ()
-        [(_ x ...)
-         (and (pair? p) (eq? (car p) 'form) (even? (cadr p)))
-         (let loop ([n (/ (cadr p) 2)]
-                    [as '()]
-                    [xs (syntax->list #'(x ...))])
-           (if (zero? n)
-             #`(list 'foo `#,(reverse as) #,@xs)
-             (loop (sub1 n)
-                   (cons #`(#,(car xs) ,#,(cadr xs)) as)
-                   (cddr xs))))])))
-  @foo[x 1 y (* 2 3)]{blah}
-  --> (foo ((x 1) (y 6)) "blah")
-
-In addition, the Scribble parser uses syntax properties to mark syntax
-items that are not physically in the original source -- indentation
-spaces and newlines.  Both of these will have a 'scribble property; an
-indentation string of spaces will have 'indentation as the value of
-the property, and a newline will have a '(newline S) value where S is
-the original newline string including spaces that precede and follow
-it (which includes the indentation for the following item).  This can
-be used to implement a verbatim environment: drop indentation strings,
-and use the original source strings instead of single-newline string.
-Here is an example of this.
-
-  (define-syntax (verb stx)
-    (syntax-case stx ()
-      [(_ cmd item ...)
-       #`(cmd
-          #,@(let loop ([items (syntax->list #'(item ...))])
-               (if (null? items)
-                 '()
-                 (let* ([fst  (car items)]
-                        [prop (syntax-property fst 'scribble)]
-                        [rst  (loop (cdr items))])
-                   (cond [(eq? prop 'indentation) rst]
-                         [(not (and (pair? prop)
-                                    (eq? (car prop) 'newline)))
-                          (cons fst rst)]
-                         [else (cons (datum->syntax-object
-                                      fst (cadr prop) fst)
-                                     rst)])))))]))
-  @verb[string-append]{
-    foo
-      bar
-  }
-  --> "foo\n      bar"
-
-*** Interface
-
-The "reader.ss" module provides very little functionality for advanced
-needs.
-
-> (read [input-port])
-> (read-syntax [source-name] [input-port])
-
-These procedures implement the Scribble reader.  They do so by
-constructing a reader table based on the current one, and using that
-in reading.
-
-> (read-inside [input-port])
-> (read-syntax-inside [source-name] [input-port])
-
-These `-inside' variants parse as if starting inside a "@{...}", and
-they return a (syntactic) list.  Useful for implementing languages
-that are textual by default (see "docreader.ss" for example).
-
-> (make-at-readtable [keyword-args...])
-
-Constructs an @-readtable.  The keyword arguments can customize the
-resulting reader in several ways.
-
-* #:readtable -- a readtable to base the @-readtable on.  Defaults to
-  the current readtable.
-
-* #:command-char -- the character used for @-forms; defaults to `#\@'.
-
-* #:datum-readtable -- determines the readtable used for reading the
-  datum part.  The default (#t) is to use the @-readtable, otherwise
-  it can be a readtable, or a readtable-to-readtable function that
-  will construct one from the @-readtable.  The idea is that you may
-  want to have completely different uses for the datum part, for
-  example, introducing a convenient `key=val' syntax for attributes.
-
-* #:syntax-post-processor -- a function that is applied on each
-  resulting syntax value after it has been parsed (but before it is
-  wrapped quoting punctuations).  You can use this to further control
-  uses of @-forms, for example, making the command be the head of a
-  list:
-
-    (use-at-readtable
-      #:syntax-post-processor
-      (lambda (stx)
-        (syntax-case stx ()
-          [(cmd rest ...) #'(list 'cmd rest ...)]
-          [_else (error "@ forms must have a body")])))
-
-  Beware that the syntax may contain placeholder values at this stage
-  (e.g: the command part), so you can `plant' your own form that will
-  do some plain processing later.  For example, here's a setup that
-  uses a `mk-' prefix for all command names:
-
-    (use-at-readtable
-      #:syntax-post-processor
-      (lambda (stx)
-        (syntax-case stx ()
-          [(cmd rest ...) #'(add-mk cmd rest ...)]
-          [_else (error "@ forms must have a body")])))
-    (define-syntax (add-mk stx)
-      (syntax-case stx ()
-        [(_ cmd rest ...)
-         (identifier? #'cmd)
-         (with-syntax ([mk-cmd (datum->syntax-object
-                                #'cmd
-                                (string->symbol
-                                 (format "mk-~a" (syntax-e #'cmd)))
-                                #'cmd)])
-           (syntax/loc stx (mk-cmd rest ...)))]))
-
-> (use-at-readtable [keyword-args])
-
-Installs the Scribble readtable as the default.  Useful for REPL
-experimentation.  (Note: enables line and column tracking.)  The given
-keyword arguments are used with `make-at-readtable'.
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doc/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/doc/lang/reader.rkt
deleted file mode 100644
index cf56c0226f..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/doc/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang s-exp scribble/base/reader
-scribble/doclang
-#:wrapper1 (lambda (t) (list* 'doc 'values '() (t)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doc/main.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/doc/main.rkt
deleted file mode 100644
index 57a38aa7ae..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/doc/main.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scheme/base
-(define-syntax-rule (out)
-  (begin (require scribble/doclang)
-         (provide (all-from-out scribble/doclang))))
-(out)
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doc/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/doc/reader.rkt
deleted file mode 100644
index c53a50869b..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/doc/reader.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang scheme/base
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doclang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/doclang.rkt
deleted file mode 100644
index f3d781dc88..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/doclang.rkt
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang racket/base
-
-(require "decode.rkt"
-         (for-syntax racket/base
-                     syntax/kerncase))
-
-(provide (except-out (all-from-out racket/base) #%module-begin)
-         (rename-out [*module-begin #%module-begin]))
-
-;; Module wrapper ----------------------------------------
-
-(define-syntax (*module-begin stx)
-  (syntax-case stx ()
-    [(_ id post-process exprs . body)
-     #'(#%module-begin
-        (doc-begin id post-process exprs . body))]))
-
-(define-syntax (doc-begin stx)
-  (syntax-case stx ()
-    [(_ m-id post-process (expr ...))
-     #`(begin
-         (define m-id (post-process (decode (list . #,(reverse (syntax->list #'(expr ...)))))))
-         (provide m-id))]
-    [(_ m-id post-process exprs . body)
-     ;; `body' probably starts with lots of string constants; it's
-     ;; slow to trampoline on every string, so do them in a batch
-     ;; here:
-     (let loop ([body #'body]
-                [accum null])
-       (syntax-case body ()
-         [(s . rest)
-          (string? (syntax-e #'s))
-          (loop #'rest (cons #'s accum))]
-         [()
-          (with-syntax ([(accum ...) accum])
-            #`(doc-begin m-id post-process (accum ... . exprs)))]
-         [(body1 . body)
-          (with-syntax ([exprs (append accum #'exprs)])
-            (let ([expanded (local-expand
-                             #'body1 'module
-                             (append (kernel-form-identifier-list)
-                                     (syntax->list #'(provide
-                                                      require))))])
-              (syntax-case expanded (begin)
-                [(begin body1 ...)
-                 #`(doc-begin m-id post-process exprs body1 ... . body)]
-                [(id . rest)
-                 (and (identifier? #'id)
-                      (ormap (lambda (kw) (free-identifier=? #'id kw))
-                             (syntax->list #'(require
-                                              provide
-                                              define-values
-                                              define-syntaxes
-                                              begin-for-syntax
-                                              module
-                                              module*
-                                              #%require
-                                              #%provide
-                                              #%declare))))
-                 #`(begin #,expanded (doc-begin m-id post-process exprs . body))]
-                [_else
-                 #`(doc-begin m-id post-process 
-                              ((pre-part #,expanded body1) . exprs) 
-                              . body)])))]))]))
-
-(define-syntax (pre-part stx)
-  (syntax-case stx ()
-    [(_ s e)
-     (if (string? (syntax-e #'s))
-         #'s
-         (with-syntax ([src (syntax-source #'e)]
-                       [line (syntax-line #'e)]
-                       [col (syntax-column #'e)]
-                       [pos (syntax-position #'e)]
-                       [span (syntax-column #'e)])
-           #'(check-pre-part e (vector 'src 'line 'col 'pos 'span))))]))
-
-(define (check-pre-part v s)
-  (if (pre-part? v)
-      v
-      (error
-       (format
-        "~a: not valid in document body (need a pre-part for decode) in: ~e"
-        (cond
-         [(and (vector-ref s 0)
-               (vector-ref s 1))
-          (format "~a:~a:~a"
-                  (vector-ref s 0)
-                  (vector-ref s 1)
-                  (vector-ref s 2))]
-         [(and (vector-ref s 0)
-               (vector-ref s 3))
-          (format "~a:::~a"
-                  (vector-ref s 0)
-                  (vector-ref s 1)
-                  (vector-ref s 3))]
-         [else 'document])
-        v))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doclang2.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/doclang2.rkt
deleted file mode 100644
index 523ca36342..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/doclang2.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-
-;; A slightly nicer version of doclang where the parameters are keyword-based
-;; rather than positional.  Delegates off to the original doclang.
-
-(require (prefix-in doclang: "doclang.rkt")
-         (for-syntax racket/base
-                     syntax/parse)) 
-
-(provide (except-out (all-from-out racket/base) #%module-begin)
-         (rename-out [*module-begin #%module-begin]))
-
-;; Module wrapper ----------------------------------------
-
-(define-syntax (*module-begin stx)
-  (syntax-parse stx
-    [(_ (~or (~optional (~seq #:id id))
-             (~optional (~seq #:post-process post-process))
-             (~optional (~seq #:exprs exprs)))
-        ...
-        . body)
-     (with-syntax ([id (or (attribute id) 
-                           #'doc)]
-                   [post-process (or (attribute post-process)
-                                     #'values)]
-                   [exprs (or (attribute exprs)
-                              #'())])
-       #'(doclang:#%module-begin id post-process exprs . body))]))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/eval.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/eval.rkt
deleted file mode 100644
index 79253c7114..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/eval.rkt
+++ /dev/null
@@ -1,712 +0,0 @@
-#lang racket/base
-
-(require "manual.rkt" "struct.rkt" "scheme.rkt" "decode.rkt"
-         (only-in "core.rkt" content?)
-         racket/list
-         file/convertible ;; attached into new namespace via anchor
-         racket/serialize ;; attached into new namespace via anchor
-         racket/pretty ;; attached into new namespace via anchor
-         scribble/private/serialize ;; attached into new namespace via anchor
-         racket/sandbox racket/promise racket/port
-         racket/gui/dynamic
-         (for-syntax racket/base syntax/srcloc unstable/struct)
-         racket/stxparam
-         racket/splicing
-         racket/string
-         scribble/text/wrap)
-
-(provide interaction
-         interaction0
-         interaction/no-prompt
-         interaction-eval
-         interaction-eval-show
-         racketblock+eval (rename-out [racketblock+eval schemeblock+eval])
-         racketblock0+eval
-         racketmod+eval (rename-out [racketmod+eval schememod+eval])
-         def+int
-         defs+int
-         examples
-         examples*
-         defexamples
-         defexamples*
-         as-examples
-
-         make-base-eval
-         make-base-eval-factory
-         make-eval-factory
-         close-eval
-
-         scribble-exn->string
-         scribble-eval-handler
-         with-eval-preserve-source-locations)
-
-(define scribble-eval-handler
-  (make-parameter (lambda (ev c? x) (ev x))))
-
-(define image-counter 0)
-
-(define maxlen 60)
-
-(define-namespace-anchor anchor)
-
-(define (literal-string style s)
-  (let ([m (regexp-match #rx"^(.*)(  +|^ )(.*)$" s)])
-    (if m
-      (make-element #f (list (literal-string style (cadr m))
-                             (hspace (string-length (caddr m)))
-                             (literal-string style (cadddr m))))
-      (make-element style (list s)))))
-
-(define list.flow.list (compose1 list make-flow list))
-
-(define (format-output str style)
-  (if (string=? "" str)
-    '()
-    (list (list.flow.list
-           (let ([s (regexp-split #rx"\n" (regexp-replace #rx"\n$" str ""))])
-             (if (= 1 (length s))
-               (make-paragraph (list (literal-string style (car s))))
-               (make-table
-                #f
-                (map (lambda (s)
-                       (list.flow.list
-                        (make-paragraph (list (literal-string style s)))))
-                     s))))))))
-
-(define (format-output-stream in style)
-  (define (add-string string-accum line-accum)
-    (if string-accum
-      (cons (list->string (reverse string-accum))
-            (or line-accum null))
-      line-accum))
-  (define (add-line line-accum flow-accum)
-    (if line-accum
-      (cons (make-paragraph
-             (map (lambda (s)
-                    (if (string? s) (literal-string style s) s))
-                  (reverse line-accum)))
-            flow-accum)
-      flow-accum))
-  (let loop ([string-accum #f] [line-accum #f] [flow-accum null])
-    (let ([v (read-char-or-special in)])
-      (cond
-        [(eof-object? v)
-         (let* ([line-accum (add-string string-accum line-accum)]
-                [flow-accum (add-line line-accum flow-accum)])
-           (list
-            (list.flow.list
-             (if (= 1 (length flow-accum))
-               (car flow-accum)
-               (make-table
-                #f
-                (map list.flow.list (reverse flow-accum)))))))]
-        [(equal? #\newline v)
-         (loop #f #f (add-line (add-string string-accum line-accum)
-                               flow-accum))]
-        [(char? v)
-         (loop (cons v (or string-accum null)) line-accum flow-accum)]
-        [else
-         (loop #f (cons v (or (add-string string-accum line-accum) null))
-               flow-accum)]))))
-
-(define (string->wrapped-lines str)
-  (apply
-   append
-   (for/list ([line-str (regexp-split #rx"\n" str)])
-     (wrap-line line-str maxlen
-                (λ (word fits)
-                   (if ((string-length word) . > . maxlen)
-                       (values (substring word 0 fits) (substring word fits) #f)
-                       (values #f word #f)))))))
-
-(struct formatted-result (content))
-
-(define (interleave inset? title expr-paras val-list+outputs)
-  (let ([lines
-         (let loop ([expr-paras expr-paras]
-                    [val-list+outputs val-list+outputs]
-                    [first? #t])
-           (if (null? expr-paras)
-             null
-             (append
-              (list (list (let ([p (car expr-paras)])
-                            (if (flow? p) p (make-flow (list p))))))
-              (format-output (cadar val-list+outputs) output-color)
-              (format-output (caddar val-list+outputs) error-color)
-              (cond
-                [(string? (caar val-list+outputs))
-                 ;; Error result case:
-                 (map (lambda (s) 
-                        (define p (format-output s error-color))
-                        (if (null? p)
-                            (list null)
-                            (car p)))
-                      (string->wrapped-lines (caar val-list+outputs)))]
-                [(box? (caar val-list+outputs))
-                 ;; Output written to a port
-                 (format-output-stream (unbox (caar val-list+outputs))
-                                       result-color)]
-                [else
-                 ;; Normal result case:
-                 (let ([val-list (caar val-list+outputs)])
-                   (if (equal? val-list (list (void)))
-                     null
-                     (map (lambda (v)
-                            (list.flow.list
-                             (make-paragraph
-                              (list (if (formatted-result? v)
-                                        (formatted-result-content v)
-                                        (elem #:style result-color
-                                              (to-element/no-color
-                                               v #:expr? (print-as-expression))))))))
-                          val-list)))])
-              (loop (cdr expr-paras) (cdr val-list+outputs) #f))))])
-    (if inset?
-      (let ([p (code-inset (make-table block-color lines))])
-        (if title
-          (make-table block-color (list (list.flow.list title) (list.flow.list p)))
-          p))
-      (make-table block-color (if title (cons (list.flow.list title) lines) lines)))))
-
-;; extracts from a datum or syntax object --- while keeping the
-;; syntax-objectness of the original intact, instead of always
-;; generating a syntax object or always generating a datum
-(define (extract s . ops)
-  (let loop ([s s] [ops ops])
-    (cond [(null? ops) s]
-          [(syntax? s) (loop (syntax-e s) ops)]
-          [else (loop ((car ops) s) (cdr ops))])))
-
-(struct nothing-to-eval ())
-
-(struct eval-results (contents out err))
-(define (make-eval-results contents out err)
-  (unless (and (list? contents)
-               (andmap content? contents))
-    (raise-argument-error 'eval:results "(listof content?)" contents))
-  (unless (string? out)
-    (raise-argument-error 'eval:results "string?" out))
-  (unless (string? err)
-    (raise-argument-error 'eval:results "string?" err))
-  (eval-results contents out err))
-(define (make-eval-result content out err)
-  (unless (content? content)
-    (raise-argument-error 'eval:result "content?" content))
-  (unless (string? out)
-    (raise-argument-error 'eval:result "string?" out))
-  (unless (string? err)
-    (raise-argument-error 'eval:result "string?" err))
-  (eval-results (list content) out err))
-
-(define (extract-to-evaluate s)
-  (let loop ([s s] [expect #f])
-    (syntax-case s (code:line code:comment eval:alts eval:check)
-      [(code:line v (code:comment . rest))
-       (loop (extract s cdr car) expect)]
-      [(code:comment . rest)
-       (values (nothing-to-eval) expect)]
-      [(eval:alts p e)
-       (loop (extract s cdr cdr car) expect)]
-      [(eval:check e expect)
-       (loop (extract s cdr car)
-             (list (syntax->datum (datum->syntax #f (extract s cdr cdr car)))))]
-      [else (values s expect)])))
-
-(define (do-eval ev who)
-  (define (get-outputs)
-    (define (get getter what)
-      (define s (getter ev))
-      (if (string? s)
-        s
-        (error who "missing ~a, possibly from a sandbox without a `sandbox-~a' configured to 'string"
-               what (string-join (string-split what) "-"))))
-    (list (get get-output "output") (get get-error-output "error output")))
-  (define (render-value v)
-    (let-values ([(eval-print eval-print-as-expr?)
-                  (call-in-sandbox-context ev
-                    (lambda () (values (current-print) (print-as-expression))))])
-      (cond [(and (eq? eval-print (current-print))
-                  eval-print-as-expr?)
-             ;; default printer => get result as S-expression
-             (make-reader-graph (copy-value v (make-hasheq)))]
-            [else
-             ;; other printer => go through a pipe
-             ;; If it happens to be the pretty printer, tell it to retain
-             ;; convertible objects (via write-special)
-             (box (call-in-sandbox-context
-                   ev
-                   (lambda ()
-                     (define-values [in out] (make-pipe-with-specials))
-                     (parameterize ((current-output-port out)
-                                    (pretty-print-size-hook
-                                     (lambda (obj _mode _out)
-                                       (and (convertible? obj) 1)))
-                                    (pretty-print-print-hook
-                                     (lambda (obj _mode out)
-                                       (write-special (if (serializable? obj)
-                                                          (make-serialized-convertible
-                                                           (serialize obj))
-                                                          obj)
-                                                      out))))
-                       (map (current-print) v))
-                     (close-output-port out)
-                     in)))])))
-  (define (do-ev s)
-    (with-handlers ([(lambda (x) (not (exn:break? x)))
-                     (lambda (e)
-                       (cons ((scribble-exn->string) e)
-                             (get-outputs)))])
-      (cons (render-value (do-plain-eval ev s #t)) (get-outputs))))
-  (define (do-ev/expect s expect)
-    (define r (do-ev s))
-    (when expect
-      (let ([expect (do-plain-eval ev (car expect) #t)])
-        (unless (equal? (car r) expect)
-          (raise-syntax-error 'eval "example result check failed" s))))
-    r)
-  (lambda (str)
-    (if (eval-results? str)
-        (list (map formatted-result (eval-results-contents str))
-              (eval-results-out str)
-              (eval-results-err str))
-        (let-values ([(s expect) (extract-to-evaluate str)])
-          (if (nothing-to-eval? s)
-              (list (list (void)) "" "")
-              (do-ev/expect s expect))))))
-
-(define scribble-exn->string
-  (make-parameter
-   (λ (e)
-     (if (exn? e)
-         (exn-message e)
-         (format "uncaught exception: ~s" e)))))
-
-;; Since we evaluate everything in an interaction before we typeset,
-;;  copy each value to avoid side-effects.
-(define (copy-value v ht)
-  (define (install v v2) (hash-set! ht v v2) v2)
-  (let loop ([v v])
-    (cond
-      [(and v (hash-ref ht v #f)) => (lambda (v) v)]
-      [(syntax? v) (make-literal-syntax v)]
-      [(string? v) (install v (string-copy v))]
-      [(bytes? v) (install v (bytes-copy v))]
-      [(pair? v)
-       (let ([ph (make-placeholder #f)])
-         (hash-set! ht v ph)
-         (placeholder-set! ph (cons (loop (car v)) (loop (cdr v))))
-         ph)]
-      [(mpair? v)
-       (let ([p (mcons #f #f)])
-         (hash-set! ht v p)
-         (set-mcar! p (loop (mcar v)))
-         (set-mcdr! p (loop (mcdr v)))
-         p)]
-      [(vector? v)
-       (let ([v2 (make-vector (vector-length v))])
-         (hash-set! ht v v2)
-         (for ([i (in-range (vector-length v2))])
-           (vector-set! v2 i (loop (vector-ref v i))))
-         v2)]
-      [(box? v)
-       (let ([v2 (box #f)])
-         (hash-set! ht v v2)
-         (set-box! v2 (loop (unbox v)))
-         v2)]
-      [(hash? v)
-       (let ([ph (make-placeholder #f)])
-         (hash-set! ht v ph)
-         (let ([a (hash-map v (lambda (k v) (cons (loop k) (loop v))))])
-           (placeholder-set!
-            ph
-            (cond [(hash-eq? v) (make-hasheq-placeholder a)]
-                  [(hash-eqv? v) (make-hasheqv-placeholder a)]
-                  [else (make-hash-placeholder a)])))
-         ph)]
-      [else v])))
-
-(define (strip-comments stx)
-  (cond
-    [(syntax? stx)
-     (datum->syntax stx (strip-comments (syntax-e stx)) stx stx stx)]
-    [(pair? stx)
-     (define a (car stx))
-     (define (comment? a)
-       (and (pair? a)
-            (or (eq? (car a) 'code:comment)
-                (and (identifier? (car a))
-                     (eq? (syntax-e (car a)) 'code:comment)))))
-     (if (or (comment? a) (and (syntax? a) (comment? (syntax-e a))))
-       (strip-comments (cdr stx))
-       (cons (strip-comments a)
-             (strip-comments (cdr stx))))]
-    [(eq? stx 'code:blank) (void)]
-    [else stx]))
-
-(define (make-base-eval #:lang [lang '(begin)] #:pretty-print? [pretty-print? #t] . ips)
-  (call-with-trusted-sandbox-configuration
-   (lambda ()
-     (parameterize ([sandbox-output 'string]
-                    [sandbox-error-output 'string]
-                    [sandbox-propagate-breaks #f]
-                    [sandbox-namespace-specs
-                     (append (sandbox-namespace-specs)
-                             (if pretty-print?
-                                 '(racket/pretty)
-                                 '())
-                             '(file/convertible
-                               racket/serialize
-                               scribble/private/serialize))])
-       (let ([e (apply make-evaluator lang ips)])
-         (when pretty-print?
-           (call-in-sandbox-context e
-             (lambda ()
-               (current-print (dynamic-require 'racket/pretty 'pretty-print-handler)))))
-         e)))))
-
-(define (make-base-eval-factory mod-paths
-                                #:lang [lang '(begin)]
-                                #:pretty-print? [pretty-print? #t] . ips)
-  (parameterize ([sandbox-namespace-specs
-                  (cons (λ () (let ([ns
-                          ;; This namespace-creation choice needs to be consistent
-                          ;; with the sandbox (i.e., with `make-base-eval')
-                          (if gui?
-                              ((gui-dynamic-require 'make-gui-empty-namespace))
-                              (make-base-empty-namespace))])
-                     (parameterize ([current-namespace ns])
-                       (for ([mod-path (in-list mod-paths)])
-                         (dynamic-require mod-path #f))
-                       (when pretty-print? (dynamic-require 'racket/pretty #f)))
-                                ns))
-                        (append mod-paths (if pretty-print? '(racket/pretty) '())))])
-    (lambda ()
-      (let ([ev (apply make-base-eval #:lang lang #:pretty-print? #f ips)])
-        (when pretty-print?
-          (call-in-sandbox-context ev
-            (lambda ()
-              (current-print (dynamic-require 'racket/pretty 'pretty-print-handler)))))
-        ev))))
-
-(define (make-eval-factory mod-paths
-                           #:lang [lang '(begin)]
-                           #:pretty-print? [pretty-print? #t] . ips)
-  (let ([base-factory (apply make-base-eval-factory mod-paths #:lang lang #:pretty-print? pretty-print? ips)])
-    (lambda ()
-      (let ([ev (base-factory)])
-        (call-in-sandbox-context
-         ev
-         (lambda ()
-           (for ([mod-path (in-list mod-paths)])
-             (namespace-require mod-path))))
-        ev))))
-
-(define (close-eval e)
-  (kill-evaluator e)
-  "")
-
-(define (do-plain-eval ev s catching-exns?)
-  (parameterize ([sandbox-propagate-breaks #f])
-    (call-with-values
-        (lambda ()
-          ((scribble-eval-handler)
-           ev
-           catching-exns?
-           (let ([s (strip-comments s)])
-             (cond [(syntax? s)
-                    (syntax-case s (module)
-                      [(module . _rest) (syntax->datum s)]
-                      [_else s])]
-                   ;; a sandbox treats strings and byte strings as code
-                   ;; streams, so protect them as syntax objects:
-                   [(string? s) (datum->syntax #f s)]
-                   [(bytes? s) (datum->syntax #f s)]
-                   [else s]))))
-        list)))
-
-(define-syntax-parameter quote-expr-preserve-source? #f)
-
-(define-syntax (with-eval-preserve-source-locations stx)
-  (syntax-case stx ()
-    [(with-eval-preserve-source-locations e ...)
-     (syntax/loc stx
-       (splicing-syntax-parameterize ([quote-expr-preserve-source? #t])
-         e ...))]))
-
-;; Quote an expression to be evaluated or wrap as escaped:
-(define-syntax quote-expr
-  (syntax-rules (eval:alts eval:result eval:results)
-    [(_ (eval:alts e1 e2)) (quote-expr e2)]
-    [(_ (eval:result e)) (make-eval-result (list e) "" "")]
-    [(_ (eval:result e out)) (make-eval-result (list e) out "")]
-    [(_ (eval:result e out err)) (make-eval-result (list e) out err)]
-    [(_ (eval:results es)) (make-eval-results es "" "")]
-    [(_ (eval:results es out)) (make-eval-results es out "")]
-    [(_ (eval:results es out err)) (make-eval-results es out err)]
-    [(_ e) (base-quote-expr e)]))
-
-(define orig-stx (read-syntax 'orig (open-input-string "()")))
-
-(define-syntax (base-quote-expr stx)
-  (syntax-case stx ()
-    [(_ e)
-     (cond [(syntax-parameter-value #'quote-expr-preserve-source?)
-            ;; Preserve source; produce an expression resulting in a
-            ;; syntax object with no lexical context (like strip-context)
-            ;; but with (quotable) source locations.
-            ;; Also preserve syntax-original?, since that seems important
-            ;; to some syntax-based code (eg redex term->pict).
-            (define (get-source-location e)
-              (let* ([src (build-source-location-list e)]
-                     [old-source (source-location-source src)]
-                     [new-source
-                      (cond [(path? old-source) ;; not quotable/writable
-                             ;;(path->string old-source) ;; don't leak build paths
-                             'eval]
-                            [(or (string? old-source)
-                                 (symbol? old-source))
-                             ;; Okay? Or should this be replaced also?
-                             old-source]
-                            [else #f])])
-                (update-source-location src #:source new-source)))
-            (let loop ([e #'e])
-              (cond [(syntax? e)
-                     (let ([src (get-source-location e)]
-                           [original? (syntax-original? (syntax-local-introduce e))])
-                       #`(syntax-property
-                          (datum->syntax #f
-                                         #,(loop (syntax-e e))
-                                         (quote #,src)
-                                         #,(if original? #'orig-stx #'#f))
-                          'paren-shape
-                          (quote #,(syntax-property e 'paren-shape))))]
-                    [(pair? e)
-                     #`(cons #,(loop (car e)) #,(loop (cdr e)))]
-                    [(vector? e)
-                     #`(list->vector #,(loop (vector->list e)))]
-                    [(box? e)
-                     #`(box #,(loop (unbox e)))]
-                    [(prefab-struct-key e)
-                     => (lambda (key)
-                          #`(apply make-prefab-struct
-                                   (quote #,key)
-                                   #,(loop (struct->list e))))]
-                    [else
-                     #`(quote #,e)]))]
-           [else
-            ;; Using quote means that sandbox evaluation works on
-            ;; sexprs; to get it to work on syntaxes, use
-            ;;   (strip-context (quote-syntax e)))
-            ;; while importing
-            ;;   (require syntax/strip-context)
-            #'(quote e)])]))
-
-(define (do-interaction-eval ev e)
-  (let-values ([(e expect) (extract-to-evaluate e)])
-    (unless (nothing-to-eval? e)
-      (parameterize ([current-command-line-arguments #()])
-        (do-plain-eval (or ev (make-base-eval)) e #f)))
-    ""))
-
-(define-syntax interaction-eval
-  (syntax-rules ()
-    [(_ #:eval ev e) (do-interaction-eval ev (quote-expr e))]
-    [(_ e) (do-interaction-eval #f (quote-expr e))]))
-
-(define (show-val v)
-  (elem #:style result-color
-        (to-element/no-color v #:expr? (print-as-expression))))
-
-(define (do-interaction-eval-show ev e)
-  (parameterize ([current-command-line-arguments #()])
-    (show-val (car (do-plain-eval (or ev (make-base-eval)) e #f)))))
-
-(define-syntax interaction-eval-show
-  (syntax-rules ()
-    [(_ #:eval ev e) (do-interaction-eval-show ev (quote-expr e))]
-    [(_ e) (do-interaction-eval-show #f (quote-expr e))]))
-
-(define-syntax racketinput*
-  (syntax-rules (eval:alts code:comment)
-    [(_ #:escape id (code:comment . rest)) (racketblock0 #:escape id (code:comment . rest))]
-    [(_ #:escape id (eval:alts a b)) (racketinput* #:escape id a)]
-    [(_ #:escape id e) (racketinput0 #:escape id e)]))
-
-(define-syntax racketblock*
-  (syntax-rules (eval:alts code:comment)
-    [(_ #:escape id (code:comment . rest)) (racketblock0 #:escape id (code:comment . rest))]
-    [(_ #:escape id (eval:alts a b)) (racketblock #:escape id a)]
-    [(_ #:escape id e) (racketblock0 #:escape id e)]))
-
-(define-code racketblock0+line (to-paragraph/prefix "" "" (list " ")))
-
-(define-syntax (racketdefinput* stx)
-  (syntax-case stx (define define-values define-struct)
-    [(_ #:escape id (define . rest))
-     (syntax-case stx ()
-       [(_ #:escape _ e) #'(racketblock0+line #:escape id e)])]
-    [(_ #:escape id (define-values . rest))
-     (syntax-case stx ()
-       [(_ #:escape _ e) #'(racketblock0+line #:escape id e)])]
-    [(_ #:escape id (define-struct . rest))
-     (syntax-case stx ()
-       [(_ #:escape _ e) #'(racketblock0+line #:escape id e)])]
-    [(_ #:escape id (code:line (define . rest) . rest2))
-     (syntax-case stx ()
-       [(_ #:escape _ e) #'(racketblock0+line #:escape id e)])]
-    [(_ #:escape id e) #'(racketinput* #:escape id e)]))
-
-(define (do-titled-interaction who inset? ev t shows evals)
-  (interleave inset? t shows (map (do-eval ev who) evals)))
-
-(define-syntax titled-interaction
-  (syntax-rules ()
-    [(_ who inset? t racketinput* #:eval ev #:escape unsyntax-id e ...)
-     (do-titled-interaction
-      'who inset? ev t (list (racketinput* #:escape unsyntax-id e) ...) (list (quote-expr e) ...))]
-    [(_ who inset? t racketinput* #:eval ev e ...)
-     (titled-interaction
-      who inset? t racketinput* #:eval ev #:escape unsyntax e ...)]
-    [(_ who inset? t racketinput* #:escape unsyntax-id e ...)
-     (titled-interaction
-      who inset? t racketinput* #:eval (make-base-eval) #:escape unsyntax-id e ...)]
-    [(_ who inset? t racketinput* e ...)
-     (titled-interaction
-      who inset? t racketinput* #:eval (make-base-eval) e ...)]))
-
-(define-syntax (-interaction stx)
-  (syntax-case stx ()
-    [(_ who e ...)
-     (syntax/loc stx
-       (titled-interaction who #f #f racketinput* e ...))]))
-
-(define-syntax (interaction stx)
-  (syntax-case stx ()
-    [(H e ...) (syntax/loc stx (code-inset (-interaction H e ...)))]))
-
-(define-syntax (interaction/no-prompt stx)
-  (syntax-case stx ()
-    [(H e ...)
-     (syntax/loc stx
-       (code-inset (titled-interaction who #f #f racketblock* e ...)))]))
-
-(define-syntax (interaction0 stx)
-  (syntax-case stx ()
-    [(H e ...) (syntax/loc stx (-interaction H e ...))]))
-
-(define-syntax racketblockX+eval
-  (syntax-rules ()
-    [(_ racketblock #:eval ev #:escape unsyntax-id e ...)
-     (let ([eva ev])
-       (#%expression
-        (begin (interaction-eval #:eval eva e) ...
-               (racketblock #:escape unsyntax-id e ...))))]
-    [(_ racketblock #:eval ev e ...)
-     (racketblockX+eval racketblock #:eval ev #:escape unsyntax e ...)]
-    [(_ racketblock #:escape unsyntax-id e ...)
-     (racketblockX+eval racketblock #:eval (make-base-eval) #:escape unsyntax-id e ...)]
-    [(_ racketblock e ...)
-     (racketblockX+eval racketblock #:eval (make-base-eval) #:escape unsyntax e ...)]))
-
-(define-syntax racketblock+eval
-  (syntax-rules ()
-    [(_ e ...)
-     (racketblockX+eval racketblock e ...)]))
-
-(define-syntax racketblock0+eval
-  (syntax-rules ()
-    [(_ e ...)
-     (racketblockX+eval racketblock0 e ...)]))
-
-(define-syntax racketmod+eval
-  (syntax-rules ()
-    [(_ #:eval ev #:escape unsyntax-id name e ...)
-     (let ([eva ev])
-       (#%expression
-        (begin (interaction-eval #:eval eva e) ...
-               (racketmod #:escape unsyntax-id name e ...))))]
-    [(_ #:eval ev name e ...)
-     (racketmod+eval #:eval ev #:escape unsyntax name e ...)]
-    [(_ #:escape unsyntax-id name e ...)
-     (racketmod+eval #:eval (make-base-eval) #:escape unsyntax-id name e ...)]
-    [(_ name e ...)
-     (racketmod+eval #:eval (make-base-eval) #:escape unsyntax name e ...)]))
-
-(define-syntax (defs+int stx)
-  (syntax-case stx ()
-    [(H #:eval ev #:escape unsyntax-id [def ...] e ...)
-     (syntax/loc stx
-       (let ([eva ev])
-         (column (list (racketblock0+eval #:eval eva #:escape unsyntax-id def ...)
-                       blank-line
-                       (-interaction H #:eval eva #:escape unsyntax-id e ...)))))]
-    [(H #:eval ev [def ...] e ...)
-     (syntax/loc stx (defs+int #:eval ev #:escape unsyntax [def ...] e ...))]
-    [(_ #:escape unsyntax-id [def ...] e ...)
-     (syntax/loc stx (defs+int #:eval (make-base-eval) #:escape unsyntax-id [def ...] e ...))]
-    [(_ [def ...] e ...)
-     (syntax/loc stx (defs+int #:eval (make-base-eval) [def ...] e ...))]))
-
-(define-syntax def+int
-  (syntax-rules ()
-    [(H #:eval ev #:escape unsyntax-id def e ...)
-     (defs+int #:eval ev #:escape unsyntax-id [def] e ...)]
-    [(H #:eval ev def e ...)
-     (defs+int #:eval ev [def] e ...)]
-    [(H #:escape unsyntax-id def e ...)
-     (defs+int #:escape unsyntax-id [def] e ...)]
-    [(H def e ...)
-     (defs+int [def] e ...)]))
-
-(define example-title
-  (make-paragraph (list "Example:")))
-(define examples-title
-  (make-paragraph (list "Examples:")))
-
-(define-syntax pick-example-title
-  (syntax-rules ()
-    [(_ e) example-title]
-    [(_ #:eval ev e) example-title]
-    [(_ #:escape id e) example-title]
-    [(_ #:eval ev #:escape id e) example-title]
-    [(_ . _) examples-title]))
-
-(define-syntax (examples stx)
-  (syntax-case stx ()
-    [(H e ...)
-     (syntax/loc stx
-       (titled-interaction
-        H #t (pick-example-title e ...)  racketinput* e ...))]))
-(define-syntax (examples* stx)
-  (syntax-case stx ()
-    [(H example-title e ...)
-     (syntax/loc stx
-       (titled-interaction H #t example-title racketinput* e ...))]))
-(define-syntax (defexamples stx)
-  (syntax-case stx ()
-    [(H e ...)
-     (syntax/loc stx
-       (titled-interaction
-        H #t (pick-example-title e ...)  racketdefinput* e ...))]))
-(define-syntax (defexamples* stx)
-  (syntax-case stx ()
-    [(H example-title e ...)
-     (syntax/loc stx
-       (titled-interaction H #t example-title racketdefinput* e ...))]))
-
-(define blank-line (make-paragraph (list 'nbsp)))
-
-(define (column l)
-  (code-inset (make-table #f (map list.flow.list l))))
-
-(define (do-splice l)
-  (cond [(null? l) null]
-        [(splice? (car l)) `(,@(splice-run (car l)) ,@(do-splice (cdr l)))]
-        [else (cons (car l) (do-splice (cdr l)))]))
-
-(define as-examples
-  (case-lambda
-    [(t) (as-examples examples-title t)]
-    [(example-title t)
-     (make-table #f (list (list.flow.list example-title)
-                          (list (make-flow (do-splice (list t))))))]))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/extract.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/extract.rkt
deleted file mode 100644
index 3ce60272b5..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/extract.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-
-(provide include-extracted
-         provide-extracted
-         include-previously-extracted)
-
-(define-for-syntax (do-include-extracted stx wraps)
-  (syntax-case stx ()
-    [(_ module-path)
-     (with-syntax ([get-docs (syntax-local-lift-require 
-                              #`(only (submod #,@(syntax-case #'module-path (submod)
-                                                   [(submod e ...) #'(e ...)]
-                                                   [e #'(e)])
-                                              srcdoc)
-                                      get-docs)
-                              (datum->syntax stx 'get-docs))]
-                   [(wrap ...) wraps])
-       #'(begin
-           (define-syntax (docs stx)
-             (define docs (get-docs))
-             (if (identifier? docs)
-                 ;; normal:
-                 (with-syntax ([(_ xwrap (... ...)) stx]
-                               [id docs])
-                   #'(xwrap (... ...) id))
-                 ;; delayed:
-                 (with-syntax ([(_ xwrap (... ...)) stx]
-                               [(reqs exprs ((id d) (... ...))) (syntax-local-introduce
-                                                                 (datum->syntax #f (get-docs)))])
-                   #`(begin
-                       (require . reqs)
-                       (begin . exprs)
-                       (xwrap (... ...) (list (cons 'id d) (... ...)))))))
-           (docs wrap ...)))]))
-
-(define-syntax (include-extracted stx)
-  (do-include-extracted stx #'(map cdr)))
-  
-(define-syntax (provide-extracted stx)
-  (syntax-case stx ()
-    [(_ module-path)
-     #`(begin
-         #,(do-include-extracted stx #'(define exported))
-         (provide exported))]))
-  
-(define-syntax-rule (include-previously-extracted module-path regexp)
-  (let ()
-    (local-require (rename-in module-path [exported exported]))
-    (for/list ([p (in-list exported)]
-               #:when (regexp-match regexp (symbol->string (car p))))
-      (cdr p))))
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt
deleted file mode 100644
index 6ba5179072..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang scheme/base
-(require "private/provide-structs.rkt"
-         racket/contract/base
-         xml/xexpr
-         net/url-structs)
-
-(provide-structs
- [body-id ([value string?])]
- [document-source ([module-path module-path?])]
-
- [hover-property ([text string?])]
- [script-property ([type string?]
-                   [script (or/c path-string? (listof string?))])]
- [css-addition ([path (or/c path-string? (cons/c 'collects (listof bytes?)) url? bytes?)])]
- [js-addition ([path (or/c path-string? (cons/c 'collects (listof bytes?)) url? bytes?)])]
- [html-defaults ([prefix-path (or/c bytes? path-string? (cons/c 'collects (listof bytes?)))]
-                 [style-path (or/c bytes? path-string? (cons/c 'collects (listof bytes?)))]
-                 [extra-files (listof (or/c path-string? (cons/c 'collects (listof bytes?))))])]
- [css-style-addition ([path (or/c path-string? (cons/c 'collects (listof bytes?)) url? bytes?)])]
- [js-style-addition ([path (or/c path-string? (cons/c 'collects (listof bytes?)) url? bytes?)])]
-
- [url-anchor ([name string?])]
- [alt-tag ([name (and/c string? #rx"^[a-zA-Z0-9]+$")])]
- [attributes ([assoc (listof (cons/c symbol? string?))])]
- [column-attributes ([assoc (listof (cons/c symbol? string?))])]
-
- [part-link-redirect ([url url?])]
- [install-resource ([path path-string?])]
- [link-resource ([path path-string?])]
-
- [head-extra ([xexpr xexpr/c])]
- [render-convertible-as ([types (listof (or/c 'png-bytes 'svg-bytes))])])
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt
deleted file mode 100644
index 978c5f88fc..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt
+++ /dev/null
@@ -1,2033 +0,0 @@
-#lang scheme/base
-(require "core.rkt"
-         "private/render-utils.rkt"
-         "html-properties.rkt"
-         "private/literal-anchor.rkt"
-         scheme/class
-         scheme/path
-         scheme/file
-         scheme/port
-         scheme/list
-         scheme/string
-         file/convertible
-         mzlib/runtime-path
-         setup/main-doc
-         setup/collects
-         setup/dirs
-         net/url
-         net/uri-codec
-         net/base64
-         scheme/serialize
-         racket/draw/gif
-         (prefix-in xml: xml/xml)
-         (for-syntax scheme/base)
-         "search.rkt"
-         (except-in "base.rkt" url))
-(provide render-mixin
-         render-multi-mixin)
-
-(define as-literal
-  (let ([loc (xml:make-location 0 0 0)])
-    (lambda strings (xml:make-cdata loc loc (string-append* strings)))))
-(define (ref-style path)
-  `(link ([rel "stylesheet"] [type "text/css"] [href ,path] [title "default"])))
-(define (inlined-style . body)
-  `(style ([type "text/css"])
-     ,(apply as-literal
-             `("\n"
-               ,@(map (lambda (x) (if (string? x) x (format "~a" x))) body)
-               "\n"))))
-(define (ref-script path)
-  `(script ([type "text/javascript"] [src ,path])))
-(define (inlined-script . body)
-  `(script ([type "text/javascript"])
-     ,(apply as-literal
-             `("\n"
-               ,@(map (lambda (x) (if (string? x) x (format "~a" x))) body)
-               "\n"))))
-
-(define-runtime-path scribble-css "scribble.css")
-(define-runtime-path scribble-style-css "scribble-style.css")
-(define-runtime-path scribble-prefix-html "scribble-prefix.html")
-(define-runtime-path scribble-js  "scribble-common.js")
-;; utilities for render-one-part
-(define-values (scribble-css-contents scribble-js-contents)
-  (let* ([read-file
-          (lambda (file)
-            (with-input-from-file file
-              (lambda ()
-                ;; note: file-size can be bigger than the string, but
-                ;; that's fine.
-                (read-string (file-size file)))))]
-         [adjust-rel
-          (lambda (depth p)
-            (if (and (relative-path? p)
-                     (positive? depth))
-                (let loop ([d depth] [p p])
-                  (if (zero? d)
-                      p
-                      (loop (sub1 d) (string-append "../" p))))
-                p))]
-         [file-getter
-          (lambda (default-file make-inline make-ref)
-            (let ([c #f])
-              (lambda (file path depth)
-                (cond [(bytes? file)
-                       (make-inline (bytes->string/utf-8 file))]
-                      [(url? file)
-                       (make-ref (url->string* file))]
-                      [(not (eq? 'inline path))
-                       (make-ref (adjust-rel
-                                  depth
-                                  (or path (let-values ([(base name dir?)
-                                                         (split-path file)])
-                                             (path->string name)))))]
-                      [(or (not file) (equal? file default-file))
-                       (unless c
-                         (set! c (make-inline (read-file default-file))))
-                       c]
-                      [else (make-inline (read-file file))]))))])
-    (values (file-getter scribble-css inlined-style  ref-style)
-            (file-getter scribble-js  inlined-script ref-script))))
-
-(define (lookup-path path mapping)
-  (ormap (lambda (p)
-           (and (equal? (car p) path)
-                (cdr p)))
-         mapping))
-
-(define current-subdirectory (make-parameter #f))
-(define current-output-file (make-parameter #f))
-(define current-top-part (make-parameter #f))
-(define on-separate-page-ok (make-parameter #t))
-(define collecting-sub (make-parameter 0))
-(define collecting-whole-page (make-parameter #t))
-(define current-no-links (make-parameter #f))
-(define extra-breaking? (make-parameter #f))
-(define current-version (make-parameter (version)))
-(define current-part-files (make-parameter #f))
-(define current-render-convertible-requests (make-parameter '(png@2x-bytes png-bytes svg-bytes)))
-
-(define (url->string* u)
-  (parameterize ([current-url-encode-mode 'unreserved])
-    (url->string u)))
-
-;; HTML anchors should be case-insensitively unique. To make them
-;;  distinct, add a "." in front of capital letters.  Also clean up
-;;  characters that give browsers trouble (i.e., the ones that are not
-;;  allowed as-is in URI components) by using "~" followed by a hex
-;;  encoding.  (The idea is that the result is still readable, so the
-;;  link can be used as a rough indication of where you'll get to.)
-(define (anchor-name v)
-  (define (encode-byte b)
-    (string-append (if (< b 16) "~0" "~") (number->string b 16)))
-  (define (encode-bytes str)
-    (string->bytes/utf-8 (encode-byte (bytes-ref str 0))))
-  (if (literal-anchor? v)
-    (literal-anchor-string v)
-    (let* ([v (string->bytes/utf-8 (format "~a" v))]
-           [v (regexp-replace* #rx#"[A-Z.]" v #".&")]
-           [v (regexp-replace* #rx#" " v #"._")]
-           [v (regexp-replace* #rx#"\"" v #".'")]
-           [v (regexp-replace* #rx#"[^-a-zA-Z0-9_!+*'()/.,]" v encode-bytes)])
-      (bytes->string/utf-8 v))))
-
-(define (color->string c)
-  (if (string? c)
-      c
-      (string-append*
-       "#"
-       (map (lambda (v)
-              (let ([s (number->string v 16)])
-                (if (< v 16) (string-append "0" s) s)))
-            c))))
-
-(define (merge-styles s cls l)
-  ;; merge multiple 'style and 'class attributes into one
-  (cond
-   [(null? l) (append
-               (if s
-                   (list (list 'style s))
-                   null)
-               (if cls
-                   (list (list 'class cls))
-                   null))]
-   [(eq? 'style (caar l))
-    (merge-styles (if s (string-append s "; " (cadar l)) (cadar l))
-                  cls
-                  (cdr l))]
-   [(eq? 'class (caar l))
-    (merge-styles s
-                  (if cls (string-append cls " " (cadar l)) (cadar l))
-                  (cdr l))]
-   [else (cons (car l) (merge-styles s cls (cdr l)))]))
-
-(define (style->attribs style [extras null])
-  (let ([a (merge-styles
-            #f
-            #f
-            (apply
-             append
-             extras
-             (map (lambda (v)
-                    (cond
-                     [(attributes? v)
-                      (map (lambda (v) (list (car v) (cdr v))) (attributes-assoc v))]
-                     [(color-property? v)
-                      `((style ,(format "color: ~a" (color->string (color-property-color v)))))]
-                     [(background-color-property? v)
-                      `((style ,(format "background-color: ~a" (color->string (background-color-property-color v)))))]
-                     [(hover-property? v)
-                      `((title ,(hover-property-text v)))]
-                     [else null]))
-                  (style-properties style))))])
-    (let ([name (style-name style)])
-      (if (string? name)
-          (if (assq 'class a)
-              (for/list ([i (in-list a)])
-                (if (eq? (car i) 'class)
-                    (list 'class (string-append name " " (cadr i)))
-                    i))
-              (cons `[class ,name]
-                    a))
-          a))))
-
-;; combine a 'class attribute from both `cl' and `al'
-;;  if `cl' starts with one
-(define (combine-class cl al)
-  (cond
-   [(and (pair? cl)
-         (eq? (caar cl) 'class)
-         (for/or ([i (in-list al)])
-           (and (eq? (car i) 'class) (cadr i))))
-    => (lambda (s)
-         (cons
-          `[class ,(string-append (cadar cl) " " s)]
-          (append
-           (cdr cl)
-           (for/list ([i (in-list al)]
-                      #:unless (eq? 'class (car i)))
-             i))))]
-   [else
-    (append cl al)]))
-
-(define (style->tag style)
-  (for/or ([s (in-list (style-properties style))])
-    (and (alt-tag? s)
-         (string->symbol (alt-tag-name s)))))
-
-(define (make-search-box top-path) ; appears on every page
-  (let ([sa         string-append]
-        [emptylabel "...search manuals..."]
-        [dimcolor   "#888"])
-    `(form ([class "searchform"])
-       (input
-        ([class "searchbox"]
-         [style ,(sa "color: "dimcolor";")]
-         [type "text"]
-         [value ,emptylabel]
-         [title "Enter a search string to search the manuals"]
-         [onkeypress ,(format "return DoSearchKey(event, this, ~s, ~s);"
-                              (version) top-path)]
-         [onfocus ,(sa "this.style.color=\"black\"; "
-                       "this.style.textAlign=\"left\"; "
-                       "if (this.value == \""emptylabel"\") this.value=\"\";")]
-         [onblur ,(sa "if (this.value.match(/^ *$/)) {"
-                      " this.style.color=\""dimcolor"\";"
-                      " this.style.textAlign=\"center\";"
-                      " this.value=\""emptylabel"\"; }")])))))
-(define search-box (make-search-box "../"))
-(define top-search-box (make-search-box ""))
-
-(define (part-tags/nonempty p)
-  (define l (part-tags p))
-  (if (null? l)
-      (list `(part "???"))
-      l))
-
-(define (part-parent d ri)
-  (collected-info-parent (part-collected-info d ri)))
-
-(define (with-output-to-file/clean fn thunk)
-  ;; We use 'replace instead of the usual 'truncate/replace
-  ;;  to avoid problems where a filename changes only in case,
-  ;;  in which case some platforms will see the old file
-  ;;  as matching the new name, while others don't. Replacing
-  ;;  the file syncs the case with the current uses.
-  (with-handlers ([exn? ; delete file on breaks, too
-                   (lambda (exn)
-                     (delete-file fn)
-                     (raise exn))])
-    (with-output-to-file fn #:exists 'replace thunk)))
-
-;; ----------------------------------------
-;;  main mixin
-
-(define (render-mixin %)
-  (class %
-    (inherit render-block
-             render-part
-             collect-part
-             install-file
-             get-dest-directory
-             format-number
-             number-depth
-             quiet-table-of-contents
-             extract-part-style-files
-             extract-version
-             extract-authors
-             extract-pretitle)
-    (inherit-field prefix-file style-file style-extra-files image-preferences)
-
-    (init-field [alt-paths null]
-                ;; `up-path' is either a link "up", or #t which goes
-                ;; to the start page (using cookies to get to the
-                ;; user start page). If it's a path, then it's also
-                ;; used for the "top" link on the page.
-                [up-path #f]
-                [script-path #f]
-                [script-file #f]
-                [search-box? #f])
-
-    (define/override (current-render-mode)
-      '(html))
-
-    (define/override (get-suffix) #".html")
-
-    (define/override (index-manual-newlines?)
-      #t)
-
-    (define/override (auto-extra-files? v) (html-defaults? v))
-    (define/override (auto-extra-files-paths v) (html-defaults-extra-files v))
-    (define/override (skip-extra-file? p)
-      (lookup-path (if (path? p)
-                       p
-                       (collects-relative->path p))
-                   alt-paths))
-
-    ;; ----------------------------------------
-
-    (inherit path->root-relative
-             root-relative->path
-             root-relative?)
-
-    (define path-cache (make-hash))
-
-    (define (path->relative p)
-      (let ([p (path->main-doc-relative p)])
-        (if (path? p)
-          (let ([p (path->root-relative p)])
-            (if (path? p)
-              (let ([p (path->collects-relative p #:cache path-cache)])
-                (if (path? p)
-                    p
-                    (intern-taglet p)))
-              (intern-taglet p)))
-          (intern-taglet p))))
-
-    (define (relative->path p)
-      (if (root-relative? p)
-          (root-relative->path p)
-          (let ([p (if (or (not (pair? p))
-                           (eq? (car p) 'doc))
-                       (main-doc-relative->path p)
-                       p)])
-            (if (path? p)
-                p
-                (collects-relative->path p)))))
-    
-    ;; ----------------------------------------
-
-    (define/override (start-collect ds fns ci)
-      (map (lambda (d fn)
-             (parameterize ([current-output-file fn]
-                            [current-top-part d])
-               (collect-part d #f ci null 1)))
-           ds
-           fns))
-
-    (define/public (part-whole-page? p ri)
-      (let ([dest (resolve-get p ri (car (part-tags/nonempty p)))])
-        (and dest (dest-page? dest))))
-
-    (define/public (current-part-whole-page? d)
-      (eq? d (current-top-part)))
-
-    (define/override (fresh-tag-collect-context? d ci)
-      (current-part-whole-page? d))
-    (define/override (fresh-tag-resolve-context? d ri)
-      (part-whole-page? d ri))
-    (define/override (fresh-tag-render-context? d ri)
-      (part-whole-page? d ri))
-
-    (define/override (collect-part-tags d ci number)
-      (define redirect (let ([s (part-style d)])
-                         (and s
-                              (for/or ([p (in-list (style-properties s))])
-                                (and (part-link-redirect? p)
-                                     (part-link-redirect-url p))))))
-      (for ([t (part-tags d)])
-        (let ([key (generate-tag t ci)])
-          (collect-put! ci key
-                        (let ([v (vector (or (part-title-content d) '("???"))
-                                         (add-current-tag-prefix key)
-                                         number ; for consistency with base
-                                         (and (current-output-file)
-                                              (path->relative (current-output-file)))
-                                         (current-part-whole-page? d))])
-                          (if redirect
-                              (list->vector (append (vector->list v)
-                                                    (list (url->string* redirect))))
-                              v))))))
-
-    (define/override (collect-target-element i ci)
-      (let ([key (generate-tag (target-element-tag i) ci)])
-        (collect-put! ci key
-                      (vector (let ([tag (target-element-tag i)])
-                                (if (and (pair? tag) (eq? 'part (car tag)))
-                                    (element-content i)
-                                    #f))
-                              (if (redirect-target-element? i)
-                                  (make-literal-anchor
-                                   (redirect-target-element-alt-anchor i))
-                                  (add-current-tag-prefix key))
-                              #f ; for consistency with 'part info
-                              (path->relative
-                               (let ([p (current-output-file)])
-                                 (if (redirect-target-element? i)
-                                     (let-values ([(base name dir?) (split-path p)])
-                                       (build-path base
-                                                   (redirect-target-element-alt-path i)))
-                                     p)))
-                              (page-target-element? i)))))
-
-    (define (dest-path dest)
-      (vector-ref dest 3))
-    (define (dest-title dest)
-      (vector-ref dest 0))
-    (define (dest-page? dest)
-      (vector-ref dest 4))
-    (define (dest-anchor dest)
-      (vector-ref dest 1))
-    (define (dest-redirect dest)
-      (if ((vector-length dest) . > . 5)
-          (vector-ref dest 5)
-          #f))
-
-    ;; ----------------------------------------
-
-    (define external-tag-path #f)
-    (define/override (set-external-tag-path p)
-      (set! external-tag-path p))
-
-    (define external-root-url #f)
-    (define/override (set-external-root-url p)
-      (set! external-root-url p))
-
-    (define extra-script-files null)
-    (define/override (add-extra-script-file s)
-      (set! extra-script-files (cons s extra-script-files)))
-
-    (define (try-relative-to-external-root dest)
-      (cond
-       [(let ([rel (find-relative-path
-                    (find-doc-dir)
-                    (relative->path (dest-path dest)))])
-          (and (relative-path? rel)
-               rel))
-        => (lambda (rel)
-             (cons
-              (url->string*
-               (struct-copy
-                url
-                (combine-url/relative
-                 (string->url external-root-url)
-                 (string-join (map path-element->string
-                                   (explode-path rel))
-                              "/"))))
-              (and (not (dest-page? dest))
-                   (anchor-name (dest-anchor dest)))))]
-       [else #f]))
-
-    (define/public (tag->path+anchor ri tag)
-      ;; Called externally; not used internally
-      (let-values ([(dest ext?) (resolve-get/ext? #f ri tag)])
-        (cond [(not dest) (values #f #f)]
-              [(and ext? external-root-url
-                    (try-relative-to-external-root dest))
-               => (lambda (p)
-                    (values (car p) (cdr p)))]
-              [(and ext? external-tag-path)
-               (values (string->url external-tag-path) (format "~a" (serialize tag)))]
-              [else (values (relative->path (dest-path dest))
-                            (and (not (dest-page? dest))
-                                 (anchor-name (dest-anchor dest))))])))
-
-    (define/public (tag->url-string ri tag #:absolute? [abs? #f])
-      ;; Called externally; not used internally
-      (let-values ([(dest ext?) (resolve-get/ext? #f ri tag)])
-        (cond [(not dest) ""]
-              [else (dest->url dest abs?)])))
-
-    (define/public (tag->query-string tag)
-      (define (simple? s)
-        (or (symbol? s)
-            (string? s)
-            (number? s)
-            (and (list? s) (andmap simple? s))))
-      (anchor-name (format "~s" (if (simple? tag)
-                                    tag
-                                    (serialize tag)))))
-
-    (define/private (link-element-indirect? e)
-      (memq 'indirect-link 
-            (let ([s (element-style e)])
-              (or (and (style? s)
-                       (style-properties s))
-                  null))))
-
-    (define/override (resolve-content i d ri)
-      (cond
-        [(and (link-element? i)
-              external-tag-path
-              (link-element-indirect? i))
-         ;; don't resolve indirect link
-         (resolve-content (element-content i) d ri)]
-        [else
-         (super resolve-content i d ri)]))
-
-    ;; ----------------------------------------
-
-    (define/private (reveal-subparts? p) ;!!! need to use this
-      (part-style? p 'reveal))
-
-    (define/public (toc-wrap table)
-      null)
-
-    (define/private (dest->url dest [abs? #f])
-      (if dest
-          (or (dest-redirect dest)
-              (format "~a~a~a"
-                      (let ([p (relative->path (dest-path dest))])
-                        (if abs?
-                            (path->url-string (path->complete-path p))
-                            (if (equal? p (current-output-file))
-                                ""
-                                (from-root p (get-dest-directory)))))
-                      (if (dest-page? dest) "" "#")
-                      (if (dest-page? dest)
-                          ""
-                          (uri-unreserved-encode
-                           (anchor-name (dest-anchor dest))))))
-          "???"))
-
-    (define/private (dest->url-in-doc dest ext-id)
-      (and dest
-           (not (dest-redirect dest))
-           (format "~a~a~a"
-                   ;; The path within the document directory is normally
-                   ;; just a single element, but detect nested paths
-                   ;; (for "r5rs-std", for example) when the containing
-                   ;; directory doesn't match `ext-id`:
-                   (let loop ([path (relative->path (dest-path dest))]
-                              [empty-ok? #f])
-                     (let-values ([(base name dir?) (split-path path)])
-                       (cond
-                        [(and empty-ok?
-                              dir? 
-                              (equal? (format "~a" name) (format "~a" ext-id)))
-                         #f]
-                        [(path? base)
-                         (define r (loop base #t))
-                         (if r (build-path r name) name)]
-                        [else name])))
-                   (if (dest-page? dest) "" "#")
-                   (if (dest-page? dest)
-                       ""
-                       (uri-unreserved-encode
-                        (anchor-name (dest-anchor dest)))))))
-
-    (inherit sort-image-requests)
-    (define/override (render ds fns ri)
-      (parameterize ([current-render-convertible-requests
-                      (sort-image-requests (current-render-convertible-requests)
-                                           image-preferences)])
-        (render-top ds fns ri)))
-
-    (define/public (render-top ds fns ri)
-      (super render ds fns ri))
-
-    (define/public (render-toc-view d ri)
-      (define has-sub-parts?
-        (pair? (part-parts d)))
-      (define sub-parts-on-other-page?
-        (and has-sub-parts?
-             (part-whole-page? (car (part-parts d)) ri)))
-      (define toc-chain
-        (let loop ([d d] [r (if has-sub-parts? (list d) '())])
-          (cond [(collected-info-parent (part-collected-info d ri))
-                 => (lambda (p) (loop p (cons p r)))]
-                [(pair? r) r]
-                ;; we have no toc, so use just the current part
-                [else (list d)])))
-      (define top (car toc-chain))
-      (define (toc-item->title+num t show-mine?)
-        (values
-         `((a ([href ,(dest->url (resolve-get t ri (car (part-tags/nonempty t))))]
-               [class ,(if (or (eq? t d) (and show-mine? (memq t toc-chain)))
-                         "tocviewselflink"
-                         "tocviewlink")]
-               [data-pltdoc "x"])
-              ,@(render-content (or (part-title-content t) '("???")) d ri)))
-         (format-number (collected-info-number (part-collected-info t ri))
-                        '(nbsp))))
-      (define (toc-item->block t i)
-        (define-values (title num) (toc-item->title+num t #f))
-        (define children  ; note: might be empty
-          (filter (lambda (p) (not (part-style? p 'toc-hidden)))
-                  (part-parts t)))
-        (define id (format "tocview_~a" i))
-        (define last? (eq? t (last toc-chain)))
-        (define expand? (or (and last? 
-                                 (or (not has-sub-parts?)
-                                     sub-parts-on-other-page?))
-                            (and has-sub-parts?
-                                 (not sub-parts-on-other-page?)
-                                 ;; next-to-last?
-                                 (let loop ([l toc-chain])
-                                   (cond
-                                    [(null? l) #f]
-                                    [(eq? t (car l))
-                                     (and (pair? (cdr l)) (null? (cddr l)))]
-                                    [else (loop (cdr l))])))))
-        (define top? (eq? t top))
-        (define header
-          `(table ([cellspacing "0"] [cellpadding "0"])
-             (tr ()
-               (td ([style "width: 1em;"])
-                 ,(if (null? children)
-                    'bull
-                    `(a ([href "javascript:void(0);"]
-                         [title "Expand/Collapse"]
-                         [class "tocviewtoggle"]
-                         [onclick ,(format "TocviewToggle(this,\"~a\");" id)])
-                       ,(if expand? 9660 9658))))
-               (td () ,@num)
-               (td () ,@title))))
-        `(div ([class ,(if top?
-                           "tocviewlist tocviewlisttopspace"
-                           "tocviewlist")])
-           ,(if top? `(div ([class "tocviewtitle"]) ,header) header)
-           ,(if (null? children)
-              ""
-              `(div ([class ,(cond
-                              [(and top? last?) "tocviewsublistonly"]
-                              [top? "tocviewsublisttop"]
-                              [last? "tocviewsublistbottom"]
-                              [else "tocviewsublist"])]
-                     [style ,(format "display: ~a;" (if expand? 'block 'none))]
-                     [id ,id])
-                 (table ([cellspacing "0"] [cellpadding "0"])
-                   ,@(for/list ([c children])
-                       (let-values ([(t n) (toc-item->title+num c #t)])
-                         `(tr () (td ([align "right"]) ,@n) (td () ,@t)))))))))
-      (define (toc-content)
-        ;; no links -- the code constructs links where needed
-        (parameterize ([current-no-links #t]
-                       [extra-breaking? #t])
-          (for/list ([t toc-chain] [i (in-naturals)])
-            (toc-item->block t i))))
-      `((div ([class "tocset"])
-          ,@(if (part-style? d 'no-toc)
-              null
-              ;; toc-wrap determines if we get the toc or just the title !!!
-              `((div ([class "tocview"]) ,@(toc-content))))
-          ,@(if (part-style? d 'no-sidebar)
-                null
-                (render-onthispage-contents
-                 d ri top (if (part-style? d 'no-toc) "tocview" "tocsub")
-                 sub-parts-on-other-page?))
-          ,@(parameterize ([extra-breaking? #t])
-              (append-map (lambda (e)
-                            (let loop ([e e])
-                              (cond
-                               [(and (table? e)
-                                     (memq 'aux (style-properties (table-style e)))
-                                     (pair? (table-blockss e)))
-                                (render-table e d ri #f)]
-                               [(delayed-block? e)
-                                (loop (delayed-block-blocks e ri))]
-                               [(traverse-block? e)
-                                (loop (traverse-block-block e ri))]
-                               [(compound-paragraph? e)
-                                (append-map loop (compound-paragraph-blocks e))]
-                               [else null])))
-                          (part-blocks d))))))
-
-    (define/public (get-onthispage-label)
-      null)
-
-    (define/public (nearly-top? d ri top)
-      #f)
-
-    (define hidden-memo (make-weak-hasheq))
-    (define/public (all-toc-hidden? p)
-      (hash-ref hidden-memo
-                p
-                (lambda ()
-                  (define h? (and (part-style? p 'toc-hidden)
-                                  (andmap (lambda (s) (all-toc-hidden? s))
-                                          (part-parts p))))
-                  (hash-set! hidden-memo p h?)
-                  h?)))
-
-    (define/private (render-onthispage-contents d ri top box-class sections-in-toc?)
-        (let ([nearly-top? (lambda (d) 
-                             ;; If ToC would be collapsed, then 
-                             ;; no section is nearly the top
-                             (if (not sections-in-toc?)
-                                 #f
-                                 (nearly-top? d ri top)))])
-          (define (flow-targets flow)
-            (append-map block-targets flow))
-          (define (block-targets e)
-            (cond [(table? e) (table-targets e)]
-                  [(paragraph? e) (para-targets e)]
-                  [(itemization? e)
-                   (append-map flow-targets (itemization-blockss e))]
-                  [(nested-flow? e)
-                   (append-map block-targets (nested-flow-blocks e))]
-                  [(compound-paragraph? e)
-                   (append-map block-targets (compound-paragraph-blocks e))]
-                  [(delayed-block? e) null]
-                  [(traverse-block? e) (block-targets (traverse-block-block e ri))]))
-          (define (para-targets para)
-            (let loop ([a (paragraph-content para)])
-              (cond
-                [(list? a) (append-map loop a)]
-                [(toc-target-element? a) (list a)]
-                [(toc-element? a) (list a)]
-                [(element? a) (loop (element-content a))]
-                [(delayed-element? a) (loop (delayed-element-content a ri))]
-                [(traverse-element? a) (loop (traverse-element-content a ri))]
-                [(part-relative-element? a) (loop (part-relative-element-content a ri))]
-                [else null])))
-          (define  (table-targets table)
-            (append-map
-             (lambda (blocks)
-               (append-map (lambda (f) (if (eq? f 'cont) null (block-targets f)))
-                           blocks))
-             (table-blockss table)))
-          (define ps
-            ((if (or (nearly-top? d) (eq? d top)) values (lambda (p) (if (pair? p) (cdr p) null)))
-             (let flatten ([d d] [prefixes null] [top? #t])
-               (let ([prefixes (if (and (not top?) (part-tag-prefix d))
-                                   (cons (part-tag-prefix d) prefixes)
-                                   prefixes)])
-                 (append*
-                  ;; don't include the section if it's in the TOC
-                  (if (or (nearly-top? d) 
-                          (part-style? d 'toc-hidden))
-                      null 
-                      (list (cons d prefixes)))
-                  ;; get internal targets:
-                  (map (lambda (v) (cons v prefixes)) (append-map block-targets (part-blocks d)))
-                  (map (lambda (p) (if (or (part-whole-page? p ri) 
-                                           (and (part-style? p 'toc-hidden)
-                                                (all-toc-hidden? p)))
-                                       null
-                                       (flatten p prefixes #f)))
-                       (part-parts d)))))))
-          (define any-parts? (ormap (compose part? car) ps))
-          (if (null? ps)
-            null
-            `((div ([class ,box-class])
-                ,@(get-onthispage-label)
-                (table ([class "tocsublist"] [cellspacing "0"])
-                  ,@(map (lambda (p)
-                           (let ([p (car p)]
-                                 [prefixes (cdr p)]
-                                 [add-tag-prefixes
-                                  (lambda (t prefixes)
-                                    (if (null? prefixes)
-                                        t
-                                        (cons (car t) (append prefixes (cdr t)))))])
-                             `(tr
-                               (td
-                                ,@(if (part? p)
-                                      `((span ([class "tocsublinknumber"])
-                                              ,@(format-number
-                                                 (collected-info-number
-                                                  (part-collected-info p ri))
-                                                 '((tt nbsp)))))
-                                      '(""))
-                                ,@(if (toc-element? p)
-                                      (render-content (toc-element-toc-content p)
-                                                      d ri)
-                                      (parameterize ([current-no-links #t]
-                                                     [extra-breaking? #t])
-                                        `((a ([href
-                                               ,(format
-                                                 "#~a"
-                                                 (uri-unreserved-encode
-                                                  (anchor-name
-                                                   (add-tag-prefixes
-                                                    (tag-key (if (part? p)
-                                                                 (car (part-tags/nonempty p))
-                                                                 (target-element-tag p))
-                                                             ri)
-                                                    prefixes))))]
-                                              [class
-                                                  ,(cond
-                                                    [(part? p) "tocsubseclink"]
-                                                    [any-parts? "tocsubnonseclink"]
-                                                    [else "tocsublink"])]
-                                              [data-pltdoc "x"])
-                                             ,@(render-content
-                                                (if (part? p)
-                                                    (or (part-title-content p)
-                                                        "???")
-                                                    (if (toc-target2-element? p)
-                                                        (toc-target2-element-toc-content p)
-                                                        (element-content p)))
-                                                d ri)))))))))
-                         ps)))))))
-
-    (define/private (extract-inherited d ri pred extract)
-      (or (ormap (lambda (v)
-                   (and (pred v)
-                        (extract v)))
-                 (style-properties (part-style d)))
-          (let ([p (part-parent d ri)])
-            (and p (extract-inherited p ri pred extract)))))
-
-    (define/public (extract-part-body-id d ri)
-      (extract-inherited d ri body-id? body-id-value))
-
-    (define/public (extract-part-source d ri)
-      (extract-inherited d ri document-source? document-source-module-path))
-
-    (define/public (part-nesting-depth d ri)
-      0)
-
-    (define/public (render-one-part d ri fn number)
-      (parameterize ([current-output-file fn])
-        (let* ([defaults (let loop ([d d])
-                           (or (ormap (lambda (v) (and (html-defaults? v) v))
-                                      (style-properties (part-style d)))
-                               (let ([p (part-parent d ri)])
-                                 (and p (loop p)))))]
-               [prefix-file (or prefix-file 
-                                (and defaults
-                                     (let ([v (html-defaults-prefix-path defaults)])
-                                       (if (bytes? v)
-                                           v
-                                           (collects-relative->path v))))
-                                scribble-prefix-html)]
-               [style-file (or style-file 
-                               (and defaults
-                                    (let ([v (html-defaults-style-path defaults)])
-                                      (if (bytes? v)
-                                          v
-                                          (collects-relative->path v))))
-                               scribble-style-css)]
-               [script-file (or script-file scribble-js)]
-               [title (cond [(part-title-content d)
-                             => (lambda (c)
-                                  `(title ,@(format-number number '(nbsp))
-                                          ,(content->string (strip-aux c) this d ri)))]
-                            [else `(title)])]
-               [dir-depth (part-nesting-depth d ri)]
-               [extract (lambda (pred get) (extract-part-style-files 
-                                            d
-                                            ri
-                                            (lambda (p) (part-whole-page? p ri))
-                                            pred
-                                            get))])
-          (unless (bytes? style-file)
-            (unless (lookup-path style-file alt-paths) 
-              (install-file style-file)))
-          (unless (lookup-path scribble-css alt-paths) 
-            (install-file scribble-css))
-          (unless (lookup-path script-file alt-paths) 
-            (install-file script-file))
-          (if (bytes? prefix-file)
-              (display prefix-file)
-              (call-with-input-file*
-               prefix-file
-               (lambda (in)
-                 (copy-port in (current-output-port)))))
-          (parameterize ([xml:empty-tag-shorthand xml:html-empty-tags])
-            (xml:write-xexpr
-              `(html ,(style->attribs (part-style d))
-                 (head ()
-                   (meta ([http-equiv "content-type"]
-                          [content "text/html; charset=utf-8"]))
-                   ,title
-                   ,(scribble-css-contents scribble-css
-                                           (lookup-path scribble-css alt-paths) 
-                                           dir-depth)
-                   ,@(map (lambda (style-file)
-                            (if (or (bytes? style-file) (url? style-file))
-                                (scribble-css-contents style-file #f dir-depth)
-                                (let ([p (lookup-path style-file alt-paths)])
-                                  (unless p (install-file style-file))
-                                  (scribble-css-contents style-file p dir-depth))))
-                          (append (extract css-addition? css-addition-path)
-                                  (list style-file)
-                                  (extract css-style-addition? css-style-addition-path)
-                                  style-extra-files))
-                   ,(scribble-js-contents script-file
-                                          (lookup-path script-file alt-paths)
-                                          dir-depth)
-                   ,@(map (lambda (script-file)
-                            (if (or (bytes? script-file) (url? script-file))
-                                (scribble-js-contents script-file #f dir-depth)
-                                (let ([p (lookup-path script-file alt-paths)])
-                                  (unless p (install-file script-file))
-                                  (scribble-js-contents script-file p dir-depth))))
-                          (append
-                           (extract js-addition? js-addition-path)
-                           (extract js-style-addition? js-style-addition-path)
-                           (reverse extra-script-files)))
-                   ,(xml:comment "[if IE 6]><style type=\"text/css\">.SIEHidden { overflow: hidden; }</style><![endif]")
-                   ,@(for/list ([p (style-properties (part-style d))]
-                                #:when (head-extra? p))
-                       (head-extra-xexpr p)))
-                 (body ([id ,(or (extract-part-body-id d ri)
-                                 "scribble-racket-lang-org")])
-                   ,@(render-toc-view d ri)
-                   (div ([class "maincolumn"])
-                     (div ([class "main"])
-                       ,@(parameterize ([current-version (extract-version d)])
-                           (render-version d ri))
-                       ,@(navigation d ri #t)
-                       ,@(render-part d ri)
-                       ,@(navigation d ri #f)))
-                   (div ([id "contextindicator"]) nbsp))))))))
-
-    (define (toc-part? d ri)
-      (and (part-style? d 'toc)
-           ;; topmost part doesn't count as toc, since it
-           (part-parent d ri)))
-
-    (define/private (find-siblings d ri)
-      (let ([parent (collected-info-parent (part-collected-info d ri))])
-        (let loop ([l (cond
-                        [parent (part-parts parent)]
-                        [(or (null? (part-parts d))
-                             (not (part-whole-page? (car (part-parts d)) ri)))
-                         (list d)]
-                        [else (list d (car (part-parts d)))])]
-                   [prev #f])
-          (if (eq? (car l) d)
-            (values prev (and (pair? (cdr l)) (cadr l)))
-            (loop (cdr l) (car l))))))
-
-    (define top-content      "top")
-    (define contents-content "contents")
-    (define index-content    "index")
-    (define prev-content     '(larr " prev"))
-    (define up-content       "up")
-    (define next-content     '("next " rarr))
-    (define sep-element      '(nbsp nbsp))
-
-    (define/public (derive-filename d ci ri depth) "bad.html")
-
-    (define/public (include-navigation?) search-box?)
-
-    (define/private (navigation d ri top?)
-      (define parent (part-parent d ri))
-      (define-values (prev0 next0) (find-siblings d ri))
-      (define prev
-        (if prev0
-          (let loop ([p prev0])
-            (if (and (toc-part? p ri) (pair? (part-parts p)))
-              (loop (last (part-parts p)))
-              p))
-          (and parent (toc-part? parent ri) parent)))
-      (define next
-        (cond [(and (toc-part? d ri) (pair? (part-parts d))) (car (part-parts d))]
-              [(not next0)
-               (let loop ([p parent])
-                 (and p 
-                      (toc-part? p ri)
-                      (let-values ([(prev next) (find-siblings p ri)])
-                        (or next
-                            (loop (part-parent p ri))))))]
-              [else next0]))
-      (define index
-        (let loop ([d d])
-          (let ([p (part-parent d ri)])
-            (if p
-              (loop p)
-              (let ([subs (part-parts d)])
-                (and (pair? subs)
-                     (let ([d (last subs)])
-                       (and (eq? (style-name (part-style d)) 'index)
-                            d))))))))
-      (define (render . content)
-        (render-content (filter values content) d ri))
-      (define (titled-url label x #:title-from [tfrom #f] . more)
-        (define-values (url title)
-          (cond [(part? x)
-                 (values
-                  (dest->url (resolve-get x ri (car (part-tags/nonempty x))))
-                  (string-append
-                   "\""
-                   (content->string
-                    (append (format-number (collected-info-number
-                                            (part-collected-info x ri))
-                                           '(" "))
-                            (part-title-content x)))
-                   "\""))]
-                [(equal? x "index.html") (values x "the manual top")]
-                [(equal? x "../index.html") (values x "the documentation top")]
-                [(string? x) (values x #f)]
-                [(path? x) (values (url->string* (path->url x)) #f)]
-                [else (error 'navigation "internal error ~e" x)]))
-        (define title*
-          (if (and tfrom (part? tfrom))
-            (string-append
-             "\"" (content->string (part-title-content tfrom)) "\"")
-            title))
-        (make-style
-         #f
-         (list
-          (make-target-url (if (equal? url "")
-                               "#"
-                               url))
-          (make-attributes
-           `([title . ,(if title* (string-append label " to " title*) label)]
-             [data-pltdoc . "x"]
-             ,@more)))))
-      (define top-link
-        (titled-url
-         "up" (if (path? up-path)
-                  (url->string* (path->url up-path))
-                  "../index.html")
-         `[onclick . ,(format "return GotoPLTRoot(\"~a\");" (version))]))
-      (define navleft
-        `(span ([class "navleft"])
-           ,@(if search-box?
-                 (list (if up-path search-box top-search-box))
-                 (list `(div ([class "nosearchform"]))))
-           ,@(render
-              sep-element
-              (and up-path (make-element top-link top-content))
-              ;; sep-element
-              ;; (make-element
-              ;;  (if parent (make-target-url "index.html" #f) "nonavigation")
-              ;;  contents-content)
-              ;; sep-element
-              ;; (if (or (not index) (eq? d index))
-              ;;   (make-element "nonavigation" index-content)
-              ;;   (make-link-element #f index-content (car (part-tags/nonempty index))))
-              )))
-      (define navright
-        (if (not (or parent up-path next))
-          ""
-          `(span ([class "navright"])
-             ,@(render
-                ;; put space here for text browsers and to avoid an Opera issue
-                sep-element
-                (make-element
-                 (cond [(not parent) "nonavigation"]
-                       [prev (titled-url "backward" prev)]
-                       [else (titled-url "backward" "index.html"
-                                         #:title-from
-                                         (and (part? parent) parent))])
-                 prev-content)
-                sep-element
-                (make-element
-                 (cond
-                   [(and (part? parent) (toc-part? parent ri)
-                         (part-parent parent ri))
-                    (titled-url "up" parent)]
-                   [parent (titled-url "up" "index.html" #:title-from parent)]
-                   ;; up-path = #t => go up to the start page, using
-                   ;; cookies to get to the user's version of it (see
-                   ;; scribblings/main/private/utils for the code that
-                   ;; creates these cookies.)
-                   [(eq? #t up-path) top-link]
-                   [up-path (titled-url "up" up-path)]
-                   [else "nonavigation"])
-                 up-content)
-                sep-element
-                (make-element
-                 (if next (titled-url "forward" next) "nonavigation")
-                 next-content)))))
-      (define navbar
-        `(div ([class ,(if top? "navsettop" "navsetbottom")])
-           ,navleft ,navright nbsp)) ; need nbsp to make the navset bg visible
-      (if (include-navigation?)
-          (list navbar)
-          null))
-
-    (define/override (render-one d ri fn)
-      (render-one-part d ri fn null))
-
-    (define/public (render-version d ri)
-      (let ([v (current-version)])
-        (if (equal? v "")
-            ;; don't show empty version:
-            null
-            ;; show version:
-            `((div ([class "versionbox"])
-                   ,@(render-content
-                      (list (make-element (if (include-navigation?)
-                                              "version"
-                                              "versionNoNav")
-                                          v))
-                      d
-                      ri))))))
-
-    (define/public (extract-render-convertible-as d)
-      (for/or ([v (in-list (style-properties (part-style d)))])
-        (and (render-convertible-as? v)
-             (render-convertible-as-types v))))
-    
-    (define/override (render-part-content d ri)
-      (parameterize ([current-render-convertible-requests (or (extract-render-convertible-as d) 
-                                                              (current-render-convertible-requests))])
-        (let ([number (collected-info-number (part-collected-info d ri))])
-          `(,@(let ([pres (extract-pretitle d)])
-                (append-map (lambda (pre)
-                              (do-render-paragraph pre d ri #f #t))
-                            pres))
-            ,@(cond
-                [(and (not (part-title-content d)) (null? number)) null]
-                [(part-style? d 'hidden)
-                 (map (lambda (t)
-                        `(a ((name ,(format "~a" (anchor-name 
-                                                  (add-current-tag-prefix
-                                                   (tag-key t ri))))))))
-                      (part-tags d))]
-                [else `((,(case (number-depth number)
-                            [(0) 'h2]
-                            [(1) 'h3]
-                            [(2) 'h4]
-                            [else 'h5])
-                         ,(let ([src (extract-part-source d ri)]
-                                [taglet (for/or ([t (in-list (part-tags d))])
-                                          (and (pair? t)
-                                               (eq? 'part (car t))
-                                               (= 2 (length t))
-                                               (cadr t)))])
-                            (if (and src taglet)
-                                `([x-source-module ,(format "~s" src)]
-                                  ,@(let ([prefixes (current-tag-prefixes)])
-                                      (if (null? prefixes)
-                                          null
-                                          `([x-part-prefixes ,(format "~s" prefixes)])))
-                                  [x-part-tag ,(format "~s" taglet)])
-                                '()))
-                         ,@(format-number number '((tt nbsp)))
-                         ,@(map (lambda (t)
-                                  `(a ([name ,(format "~a" (anchor-name
-                                                            (add-current-tag-prefix
-                                                             (tag-key t ri))))])))
-                                (part-tags d))
-                         ,@(if (part-title-content d)
-                               (render-content (part-title-content d) d ri)
-                               null)))])
-            ,@(let ([auths (extract-authors d)])
-                (if (null? auths)
-                    null
-                    `((div ([class "SAuthorListBox"])
-                           (span ([class "SAuthorList"])
-                                 ,@(apply
-                                    append
-                                    (for/list ([auth (in-list auths)]
-                                               [pos (in-naturals)])
-                                      (let ([v (do-render-paragraph auth d ri #f #t)])
-                                        (if (zero? pos)
-                                            v
-                                            (cons '(span ([class "SAuthorSep"]) (br)) v))))))))))
-            ,@(render-flow* (part-blocks d) d ri #f #f)
-            ,@(let loop ([pos 1]
-                         [secs (part-parts d)])
-                (if (null? secs)
-                    null
-                    (append (render-part (car secs) ri)
-                            (loop (add1 pos) (cdr secs)))))))))
-
-    (define/private (render-flow* p part ri starting-item? special-last?)
-      ;; Wrap each table with <p>, except for a trailing table
-      ;;  when `special-last?' is #t
-      (let loop ([f p] [starting-item? starting-item?])
-        (cond
-          [(null? f) null]
-          [(and (table? (car f))
-                (or (not special-last?) (not (null? (cdr f)))))
-           (cons `(p ,@(render-block (car f) part ri starting-item?))
-                 (loop (cdr f) #f))]
-          [else (append (render-block (car f) part ri starting-item?)
-                        (loop (cdr f) #f))])))
-
-    (define/override (render-flow p part ri starting-item?)
-      (render-flow* p part ri starting-item? #t))
-
-    (define/private (do-render-paragraph p part ri flatten-unstyled? show-pre?)
-      (let* ([contents (super render-paragraph p part ri)]
-             [style (paragraph-style p)]
-             [attrs (style->attribs style)])
-        (if (and (not show-pre?)
-                 (or (eq? (style-name style) 'author)
-                     (eq? (style-name style) 'pretitle)))
-            null
-            (if (and flatten-unstyled?
-                     (not (style-name style))
-                     (null? attrs))
-                contents
-                `((,(or (style->tag style)
-                        (if (memq 'div (style-properties style)) 
-                            'div 
-                            'p))
-                   [,@(combine-class
-                       (case (style-name style)
-                         [(author) '([class "author"])]
-                         [(pretitle) '([class "SPretitle"])]
-                         [(wraps) null]
-                         [else null])
-                       attrs)]
-                   ,@contents))))))
-
-    (define/override (render-paragraph p part ri)
-      (do-render-paragraph p part ri #f #f))
-
-    (define/override (render-intrapara-block p part ri first? last? starting-item?)
-      `((div ([class "SIntrapara"])
-             ,@(cond
-                [(paragraph? p) (do-render-paragraph p part ri #t #f)]
-                [else (render-block p part ri starting-item?)]))))
-
-    (define/private (content-style e)
-      (cond
-       [(element? e) (element-style e)]
-       [(multiarg-element? e) (multiarg-element-style e)]
-       [else #f]))
-
-    (define/private (content-attribs e [extras null])
-      (let ([s (content-style e)])
-          (if (style? s)
-              (element-style->attribs (style-name s) s extras)
-              (element-style->attribs s #f extras))))
-
-    (define/override (render-content e part ri)
-      (define (attribs [extras null]) (content-attribs e extras))
-      (cond
-        [(string? e) (super render-content e part ri)] ; short-cut for common case
-        [(list? e) (super render-content e part ri)] ; also a short-cut
-        [(and (convertible? e)
-              (render-as-convertible e (current-render-convertible-requests)))
-         => values]
-        [(image-element? e)
-         (let* ([src (collects-relative->path (image-element-path e))]
-                [suffixes (image-element-suffixes e)]
-                [scale (image-element-scale e)]
-                [to-scaled-num
-                 (lambda (s)
-                   (number->string
-                    (inexact->exact
-                     (floor (* scale (if (number? s)
-                                         s
-                                         (integer-bytes->integer s #f #t)))))))]
-                [src (select-suffix src suffixes '(".png" ".gif" ".svg"))]
-                [svg? (regexp-match? #rx#"[.]svg$" (if (path? src) (path->bytes src) src))]
-                [sz (cond
-                     [svg?
-                      (define (to-scaled-num-from-str s)
-                        (define parts
-                          (regexp-match
-                           #rx"^([+-]?[0-9]*\\.?([0-9]+)?)(em|ex|px|in|cm|mm|pt|pc|%|)$"
-                           s))
-                        (cond
-                          [parts
-                           (string-append
-                            (number->string
-                             (* scale
-                                (string->number (list-ref parts 1))))
-                            (list-ref parts 3))]
-                          [else s]))
-                      (call-with-input-file*
-                       src
-                       (lambda (in)
-                         (with-handlers ([exn:fail? (lambda (exn) 
-                                                      (log-warning
-                                                       (format "warning: error while reading SVG file for size: ~a"
-                                                               (if (exn? exn)
-                                                                   (exn-message exn)
-                                                                   (format "~e" exn))))
-                                                      null)])
-                           (let* ([d (xml:read-xml in)]
-                                  [attribs (xml:element-attributes 
-                                            (xml:document-element d))]
-                                  [check-name (lambda (n)
-                                                (lambda (a)
-                                                  (and (eq? n (xml:attribute-name a))
-                                                       (xml:attribute-value a))))]
-                                  [w (ormap (check-name 'width) attribs)]
-                                  [h (ormap (check-name 'height) attribs)])
-                             (if (and w h)
-                                 `([width ,(to-scaled-num-from-str w)]
-                                   [height ,(to-scaled-num-from-str h)])
-                                 null)))))]
-                     [else
-                      ;; Try to extract file size:
-                      (call-with-input-file*
-                       src
-                       (lambda (in)
-                         (cond
-                          [(regexp-try-match #px#"^\211PNG.{12}" in)
-                           `([width ,(to-scaled-num (read-bytes 4 in))]
-                             [height ,(to-scaled-num (read-bytes 4 in))])]
-                          [(regexp-try-match #px#"^(?=GIF8)" in)
-                           (define-values (w h rows) (gif->rgba-rows in))
-                           `([width ,(to-scaled-num w)]
-                             [height ,(to-scaled-num h)])]
-                          [else
-                           null])))])])
-           (let ([srcref (let ([p (install-file src)])
-                           (if (path? p)
-                               (url->string* (path->url (path->complete-path p)))
-                               p))])
-             `((,(if svg? 'object 'img)
-                ([,(if svg? 'data 'src) ,srcref]
-                 [alt ,(content->string (element-content e))]
-                 ,@(if svg?
-                       `([type "image/svg+xml"])
-                       null)
-                 ,@sz
-                 ,@(attribs))
-                ,@(if svg? 
-                      `((param ([name "src"] [value ,srcref])))
-                      null)))))]
-        [(and (or (element? e) (multiarg-element? e))
-              (ormap (lambda (v) (and (script-property? v) v))
-                     (let ([s (if (element? e)
-                                  (element-style e)
-                                  (multiarg-element-style e))])
-                       (if (style? s) (style-properties s) null))))
-         =>
-         (lambda (v)
-           (let* ([t `[type ,(script-property-type v)]]
-                  [s (script-property-script v)]
-                  [s (if (list? s)
-                         `(script (,t ,@(attribs)) ,(apply as-literal `("\n" ,@s "\n")))
-                         `(script (,t ,@(attribs) [src ,s])))])
-             (list s
-                   `(noscript ,@(render-plain-content e part ri)))))]
-        [(target-element? e)
-         `((a ([name ,(format "~a" (anchor-name (add-current-tag-prefix
-                                                 (tag-key (target-element-tag e)
-                                                          ri))))]
-               ,@(attribs)))
-           ,@(render-content (element-content e) part ri))]
-        [(and (link-element? e) (not (current-no-links)))
-         (parameterize ([current-no-links #t])
-           (define indirect-link? (link-element-indirect? e))
-           (let-values ([(dest ext-id)
-                         (if (and indirect-link?
-                                  external-tag-path)
-                             (values #f #f)
-                             (resolve-get/ext-id part ri (link-element-tag e)))])
-             (if (or indirect-link? dest)
-                 `((a ([href
-                      ,(cond
-                        [(and ext-id external-root-url
-                              (let ([rel (find-relative-path
-                                          (find-doc-dir)
-                                          (relative->path (dest-path dest)))])
-                                (and (relative-path? rel)
-                                     rel)))
-                         => (lambda (rel)
-                              (url->string*
-                               (struct-copy
-                                url
-                                (combine-url/relative
-                                 (string->url external-root-url)
-                                 (string-join (map (lambda (s)
-                                                     (case s
-                                                       [(up) ".."]
-                                                       [(same) "."]
-                                                       [else (path-element->string s)]))
-                                                   (explode-path rel))
-                                              "/"))
-                                [fragment
-                                 (and (not (dest-page? dest))
-                                      (anchor-name (dest-anchor dest)))])))]
-                        [(or indirect-link?
-                             (and ext-id external-tag-path))
-                         ;; Redirected to search:
-                         (url->string*
-                          (let ([u (string->url (or external-tag-path
-                                                    "http://doc.racket-lang.com/"))])
-                            (struct-copy
-                             url
-                             u
-                             [query
-                              (if (string? ext-id)
-                                  (list* (cons 'doc ext-id)
-                                         (cons 'rel (or (dest->url-in-doc dest ext-id) "???"))
-                                         (url-query u))
-                                  (cons (cons 'tag (tag->query-string (link-element-tag e)))
-                                        (url-query u)))])))]
-                        [else
-                         ;; Normal link:
-                         (dest->url dest)])]
-                     ,@(attribs (if (or indirect-link?
-                                        (and ext-id external-tag-path))
-                                    '([class "Sq"])
-                                    null))
-                     [data-pltdoc "x"])
-                    ,@(if (empty-content? (element-content e))
-                          (render-content (strip-aux (dest-title dest)) part ri)
-                          (render-content (element-content e) part ri))))
-               (begin
-                 (when #f
-                   (eprintf "Undefined link: ~s\n"
-                            (tag-key (link-element-tag e) ri)))
-                 `((font ([class "badlink"])
-                     ,@(if (empty-content? (element-content e))
-                         `(,(format "~s" (tag-key (link-element-tag e) ri)))
-                         (render-plain-content e part ri))))))))]
-        [else 
-         (render-plain-content e part ri)]))
-    
-    (define/private (render-as-convertible e requests)
-      (for/or ([request (in-list requests)])
-        (cond
-          [(case request
-             [(png-bytes)
-              (or (convert e 'png-bytes+bounds8)
-                  (convert e 'png-bytes+bounds)
-                  (convert e 'png-bytes))]
-             [(png@2x-bytes)
-              (or (convert e 'png@2x-bytes+bounds8)
-                  (convert e 'png@2x-bytes+bounds)
-                  (convert e 'png@2x-bytes))]
-             [else #f])
-           => 
-           (lambda (cvt)
-             (let* ([bstr (if (list? cvt) (first cvt) cvt)]
-                    [w (if (list? cvt)
-                           (list-ref cvt 1)
-                           (integer-bytes->integer (subbytes bstr 16 20) #f #t))]
-                    [h (if (list? cvt)
-                           (list-ref cvt 2)
-                           (integer-bytes->integer (subbytes bstr 20 24) #f #t))]
-                    [scale (lambda (v)
-                             (if (and (not (list? cvt))
-                                      (equal? request 'png@2x-bytes))
-                                 (/ v 2.0)
-                                 v))]
-                    [number->decimal-string (lambda (s)
-                                              (number->string
-                                               (if (integer? s)
-                                                   s
-                                                   (exact->inexact s))))])
-               (list
-                (add-padding
-                 cvt
-                 `(img ([src ,(install-file "pict.png" bstr)]
-                        [alt "image"]
-                        [width ,(number->decimal-string (scale w))]
-                        [height ,(number->decimal-string (scale h))]))))))]
-          [(case request
-             [(svg-bytes)
-              (or (convert e 'svg-bytes+bounds8)
-                  (convert e 'svg-bytes))]
-             [else #f])
-           => (lambda (cvt)
-                (let* ([bstr (if (list? cvt) (first cvt) cvt)])
-                  (list
-                   (add-padding
-                    cvt
-                    `(object
-                      ([data ,(install-file "pict.svg" bstr)]
-                       [type "image/svg+xml"]))))))]
-          [else #f])))
-
-    ;; Add padding for a bounding-box conversion reply:
-    (define/private (add-padding cvt e)
-      (define descent (and (list? cvt)
-                           ((length cvt) . >= . 5)
-                           (list-ref cvt 3)))
-      (define padding (and (list? cvt)
-                           ((length cvt) . >= . 9)
-                           (take (list-tail cvt 5) 4)))
-      (cond
-       [(and (or (not descent)
-                 (zero? descent))
-             (or (not padding)
-                 (andmap zero? padding)))
-        e]
-       [else
-        ;; Descent and padding:
-        (define-values (left top right bottom) (apply values padding))
-        `(,(car e) ,(cons `[style ,(format "vertical-align: ~apx; margin: ~apx ~apx ~apx ~apx;"
-                                           (- (- descent bottom))
-                                           (- top) (- right)
-                                           (- bottom) (- left))]
-                          (cadr e))
-          ,@(cddr e))]))
-
-    (define/private (render-plain-content e part ri)
-      (define (attribs) (content-attribs e))
-      (let* ([properties (let ([s (content-style e)])
-                           (if (style? s)
-                               (style-properties s)
-                               null))]
-             [name (let ([s (content-style e)])
-                     (if (style? s)
-                         (style-name s)
-                         s))]
-             [alt-tag
-              (let ([s (content-style e)])
-                (and (style? s)
-                     (style->tag s)))]
-             [resources (for/list ([p (in-list properties)]
-                                   #:when (install-resource? p))
-                          (install-resource-path p))]
-             [link-resource (for/or ([p (in-list properties)]
-                                     #:when (link-resource? p))
-                              (link-resource-path p))]
-             [link? (and (or (ormap target-url? properties)
-                             link-resource)
-                         (not (current-no-links)))]
-             [anchor? (ormap url-anchor? properties)]
-             [attribs
-              (append
-               (if (null? properties)
-                   null
-                   (append-map (lambda (v)
-                                 (cond
-                                  [(target-url? v)
-                                   (if (current-no-links)
-                                       null
-                                       `([href ,(let ([addr (target-url-addr v)])
-                                                  (if (path? addr)
-                                                      (from-root addr (get-dest-directory))
-                                                      addr))]))]
-                                  [else null]))
-                               properties))
-               (attribs))]
-             [newline? (eq? name 'newline)]
-             [check-render
-              (lambda ()
-                (when (render-element? e)
-                  ((render-element-render e) this part ri)))])
-        (for ([r (in-list resources)])
-          (install-file r))
-        (let-values ([(content) (cond
-                                 [link?
-                                  (parameterize ([current-no-links #t])
-                                    (super render-content e part ri))]
-                                 [newline? (check-render) null]
-                                 [(eq? 'hspace name)
-                                  (check-render)
-                                  (let ([str (content->string e)])
-                                    (map (lambda (c) 'nbsp) (string->list str)))]
-                                 [else
-                                  (super render-content e part ri)])])
-          (if (and (null? attribs) 
-                   (not link?)
-                   (not anchor?)
-                   (not newline?)
-                   (not alt-tag))
-              content
-              `(,@(if anchor?
-                      (append-map (lambda (v)
-                                    (if (url-anchor? v)
-                                        `((a ([name ,(url-anchor-name v)])))
-                                        null))
-                                  properties)
-                      null)
-                (,(cond
-                   [alt-tag alt-tag]
-                   [link? 'a]
-                   [newline? 'br]
-                   [else 'span]) 
-                 ,(append
-                   (if link-resource
-                       `([href ,(install-file link-resource)])
-                       null)
-                   attribs)
-                 ,@content))))))
-
-    (define/private (element-style->attribs name style [extras null])
-      (combine-class
-       (cond
-        [(symbol? name)
-         (case name
-           [(italic) '([style "font-style: italic"])]
-           [(bold) '([style "font-weight: bold"])]
-           [(tt) '([class "stt"])]
-           [(roman) '([class "sroman"])]
-           [(url) '([class "url"])]
-           [(no-break) '([class "nobreak"])]
-           [(sf) '([class "ssansserif"])]
-           [(superscript) '([style "vertical-align: super; font-size: 80%"])]
-           [(subscript) '([style "vertical-align: sub; font-size: 80%"])]
-           [(smaller) '([class "Smaller"])]
-           [(larger) '([class "Larger"])]
-           [(hspace) '([class "hspace"])]
-           [(newline) '()]
-           [else (error 'html-render "unrecognized style symbol: ~e" name)])]
-        [(string? name) (if style null `([class ,name]))]
-        [else null])
-       (if style
-           (style->attribs style extras)
-           (if (pair? extras)
-               (style->attribs (make-style #f null) extras)
-               null))))
-
-    (define/override (render-table t part ri starting-item?)
-      (define (make-row flows column-styles)
-        `(tr
-          ,@(let loop ([ds flows]
-                       [column-styles column-styles]
-                       [first? #t])
-              (cond
-               [(null? ds) null]
-               [(eq? (car ds) 'cont)
-                (loop (cdr ds) (cdr column-styles) first?)]
-               [else
-                (let ([d (car ds)] [column-style (car column-styles)])
-                  (cons
-                   `(td (,@(cond
-                            [(not column-style) null]
-                            [(memq 'right (style-properties column-style)) '([align "right"])]
-                            [(memq 'left (style-properties column-style)) '([align "left"])]
-                            [(memq 'center (style-properties column-style)) '([align "center"])]
-                            [else null])
-                         ,@(cond
-                            [(not column-style) null]
-                            [(memq 'top (style-properties column-style)) '([valign "top"])]
-                            [(memq 'baseline (style-properties column-style)) '([valign "baseline"])]
-                            [(memq 'vcenter (style-properties column-style)) '([valign "center"])]
-                            [(memq 'bottom (style-properties column-style)) '([valign "bottom"])]
-                            [else null])
-                         ,@(if (and column-style
-                                    (string? (style-name column-style)))
-                               `([class ,(style-name column-style)])
-                               null)
-                         ,@(if (and column-style
-                                    (pair? (style-properties column-style)))
-                               (style->attribs (make-style
-                                                #f
-                                                (filter (lambda (a)
-                                                          (or (attributes? a)
-                                                              (color-property? a)
-                                                              (background-color-property? a)))
-                                                        (style-properties column-style)))
-                                               (let ([ps (style-properties column-style)])
-                                                 (cond
-                                                  [(memq 'border ps)
-                                                   `([style "border: 1px solid black;"])]
-                                                  [else
-                                                   (define (check sym sfx)
-                                                     (if (memq sym ps)
-                                                         `([style ,(format "border-~a: 1px solid black;" sfx)])
-                                                         null))
-                                                   (append
-                                                    (check 'top-border 'top)
-                                                    (check 'bottom-border 'bottom)
-                                                    (check 'left-border 'left)
-                                                    (check 'right-border 'right))])))
-                               null)
-                         ,@(if (and (pair? (cdr ds))
-                                    (eq? 'cont (cadr ds)))
-                               `([colspan
-                                  ,(number->string
-                                    (let loop ([n 2] [ds (cddr ds)])
-                                      (cond [(null? ds) n]
-                                            [(eq? 'cont (car ds))
-                                             (loop (+ n 1) (cdr ds))]
-                                            [else n])))])
-                               null))
-                        ,@(if (and (paragraph? d)
-                                   (memq 'omitable (style-properties (paragraph-style d))))
-                              (render-content (paragraph-content d) part ri)
-                              (render-block d part ri #f)))
-                   (loop (cdr ds) (cdr column-styles) #f)))]))))
-      (define cell-styless (extract-table-cell-styles t))
-      `((table ([cellspacing "0"]
-                [cellpadding "0"]
-                ,@(combine-class
-                   (case (style-name (table-style t))
-                     [(boxed)    '([class "boxed"])]
-                     [(centered) '([align "center"])]
-                     [else '()])
-                   (style->attribs (table-style t)
-                                   (append
-                                    (if starting-item?
-                                        '([style "display: inline-table; vertical-align: text-top;"])
-                                        null)
-                                    (if (for/or ([cell-styles (in-list cell-styless)])
-                                          (for/or ([cell-style (in-list cell-styles)])
-                                            (and cell-style
-                                                 (let ([ps (style-properties cell-style)])
-                                                   (or (memq 'border ps)
-                                                       (memq 'left-border ps)
-                                                       (memq 'right-border ps)
-                                                       (memq 'bottom-border ps)
-                                                       (memq 'top-border ps))))))
-                                        `([style "border-collapse: collapse;"])
-                                        '())))))
-          ,@(let ([columns (ormap (lambda (p)
-                                    (and (table-columns? p)
-                                         (map (lambda (s)
-                                                (ormap (lambda (a)
-                                                         (and (column-attributes? a)
-                                                              a))
-                                                       (style-properties s)))
-                                              (table-columns-styles p))))
-                                  (style-properties (table-style t)))])
-              (if (and columns (ormap values columns))
-                  `((colgroup ,@(for/list ([col (in-list columns)])
-                                  `(col ,(if col
-                                             (map (lambda (v) (list (car v) (cdr v))) (column-attributes-assoc col))
-                                             null)))))
-                  null))
-          ,@(if (null? (table-blockss t))
-                `((tr (td)))
-                (map make-row
-                     (table-blockss t)
-                     cell-styless)))))
-
-    (define/override (render-nested-flow t part ri starting-item?)
-      `((,(or (style->tag (nested-flow-style t)) 'blockquote)
-         [,@(combine-class
-             (cond
-              [(eq? 'code-inset (style-name (nested-flow-style t)))
-               `([class "SCodeFlow"])]
-              [(eq? 'vertical-inset (style-name (nested-flow-style t)))
-               `([class "SVInsetFlow"])]
-              [(and (not (string? (style-name (nested-flow-style t))))
-                    (not (eq? 'inset (style-name (nested-flow-style t)))))
-               `([class "SubFlow"])]
-              [else null])
-             (style->attribs (nested-flow-style t)))]
-         ,@(apply append
-                  (super render-nested-flow t part ri starting-item?)))))
-
-    (define/override (render-compound-paragraph t part ri starting-item?)
-      (let ([style (compound-paragraph-style t)])
-        `((,(or (style->tag style) 'p)
-           ,(style->attribs style)
-           ,@(super render-compound-paragraph t part ri starting-item?)))))
-
-    (define/override (render-itemization t part ri)
-      (let ([style-str (and (string? (style-name (itemization-style t)))
-                            (style-name (itemization-style t)))])
-        `((,(if (eq? 'ordered (style-name (itemization-style t)))
-                'ol
-                'ul)
-           (,@(style->attribs (itemization-style t))
-            ,@(if (eq? 'compact (style-name (itemization-style t)))
-                  `([class "compact"])
-                  '()))
-           ,@(map (lambda (flow) `(li ,(if style-str
-                                           `([class ,(string-append style-str "Item")])
-                                           `())
-                                      ,@(render-flow flow part ri #t)))
-                  (itemization-blockss t))))))
-
-    (define/override (render-other i part ri)
-      (cond
-        [(string? i)
-         (let ([m (and (extra-breaking?)
-                       (regexp-match-positions #rx"[-:/+_](?=.)|[a-z](?=[A-Z])" i))])
-           (if m
-             (list* (substring i 0 (cdar m))
-                    ;; Most browsers wrap after a hyphen. The one that
-                    ;; doesn't, Firefox, pays attention to wbr.  Some
-                    ;; browsers ignore wbr, but at least they don't do
-                    ;; strange things with it.
-                    (if (equal? #\- (string-ref i (caar m)))
-                        '(wbr)
-                        '(span ([class "mywbr"]) " " nbsp))
-                    (render-other (substring i (cdar m)) part ri))
-             (ascii-ize i)))]
-        [(symbol? i)
-         (case i
-           [(mdash) '(#x2014 (wbr))] ;; <wbr> encourages breaking after rather than before
-
-           ;; FIXME: 'lang and 'rang do not match `&rang;' and `&lang;' in HTML 4 or 5.
-           ;; Happened because of the thread:
-           ;;   <http://lists.racket-lang.org/users/archive/2008-June/025126.html>
-           ;; ("Fonts with proper angle brackets")
-           ;;
-           ;; Do we still need this?  See test page at <http://jsbin.com/okizeb/3>.
-           ;; 
-           ;; More background:
-           ;;
-           ;; HTML 4 says (in HTMLsymbol.dtd):
-           ;;
-           ;; <!ENTITY lang     CDATA "&#9001;" -- left-pointing angle bracket = bra,
-           ;;                                      U+2329 ISOtech -->
-           ;; <!-- lang is NOT the same character as U+003C 'less than'
-           ;;      or U+2039 'single left-pointing angle quotation mark' -->
-           ;; <!ENTITY rang     CDATA "&#9002;" -- right-pointing angle bracket = ket,
-           ;;                                      U+232A ISOtech -->
-           ;; <!-- rang is NOT the same character as U+003E 'greater than'
-           ;;      or U+203A 'single right-pointing angle quotation mark' -->
-           ;;
-           ;; HTML 5 says (in <https://github.com/w3c/html/raw/4b354c25cdc7025fef9f561bbc98fee2d9d241c1/entities.json>, dated 2012-10-12):
-           ;;
-           ;;   "&lang;": { "codepoints": [10216], "characters": "\u27E8" },
-           ;;   "&rang;": { "codepoints": [10217], "characters": "\u27E9" },
-           ;;
-           [(lang) '(#x2039)] ; SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-           [(rang) '(#x203a)] ; SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-
-           [else (list i)])]
-        [else 
-         (log-error (format "Unrecognized element in content: ~e" i))
-         (list (format "~s" i))]))
-    
-    (define/private (ascii-ize s)
-      (if (= (string-utf-8-length s) (string-length s))
-          (list s)
-          (let ([m (regexp-match-positions #rx"[^\u01-\u7E]" s)])
-            (if m
-                (append (ascii-ize (substring s 0 (caar m)))
-                        (list (char->integer (string-ref s (caar m))))
-                        (ascii-ize (substring s (cdar m))))
-                (list s)))))
-
-    ;; ----------------------------------------
-
-    (super-new)))
-
-;; ----------------------------------------
-;; multi-file output
-
-(define (render-multi-mixin %)
-  (class %
-    (inherit render-one
-             render-one-part
-             render-content
-             part-whole-page?
-             format-number
-             install-extra-files
-             report-output?
-             all-toc-hidden?)
-
-    (define directory-depth 1)
-    (define/override (set-directory-depth n)
-      (set! directory-depth (max 1 n)))
-
-    (define/override (get-suffix) #"")
-
-    (define/override (get-dest-directory [create? #f])
-      (or (and (current-subdirectory)
-               (let ([d (build-path (or (super get-dest-directory)
-                                        (current-directory))
-                                    (current-subdirectory))])
-                 (when (and create? (not (directory-exists? d)))
-                   (make-directory* d))
-                 d))
-          (super get-dest-directory create?)))
-
-    (define/private (append-part-prefixes d ci ri)
-      (let ([parents (drop-right
-                      (if ci
-                          (cons d (collect-info-parents ci))
-                          (let loop ([d d])
-                            (if d
-                                (cons d
-                                      (loop (collected-info-parent (part-collected-info d ri))))
-                                null)))
-                      1)])
-        (apply
-         string-append
-         (for/list ([p (in-list parents)])
-           (or (part-tag-prefix p) "")))))
-
-    (define/override (part-nesting-depth d ri)
-      (min (part-depth d ri) (sub1 directory-depth)))
-
-    (define/private (part-depth d ri)
-      (define p (collected-info-parent (part-collected-info d ri)))
-      (if (not p)
-          0
-          (add1 (part-depth p ri))))
-
-    (define/override (derive-filename d ci ri depth)
-      (let ([base (regexp-replace*
-                   "[^-a-zA-Z0-9_=]"
-                   (string-append
-                    (append-part-prefixes d ci ri)
-                    (let ([s (cadr (car (part-tags/nonempty d)))])
-                      (cond [(string? s) s]
-                            [(part-title-content d)
-                             (content->string (part-title-content d))]
-                            [else
-                             ;; last-ditch effort to make up a unique name:
-                             (format "???~a" (eq-hash-code d))])))
-                   "_")])
-        (let ([fn (if (depth . < . directory-depth)
-                      (path->string (build-path base "index.html"))
-                      (format "~a.html" base))])
-          (when ((string-length fn) . >= . 48)
-            (error "file name too long (need a tag):" fn))
-          fn)))
-
-    (define/override (include-navigation?) #t)
-
-    (define/override (collect ds fns fp [demand (lambda (key ci) #f)])
-      (super collect 
-             ds 
-             (map (lambda (fn) (build-path fn "index.html")) fns)
-             fp
-             demand))
-
-    (define/override (current-part-whole-page? d)
-      (collecting-whole-page))
-
-    (define/override (start-collect ds fns ci)
-      (parameterize ([current-part-files (make-hash)])
-        (map (lambda (d fn)
-               (parameterize ([collecting-sub
-                               (if (part-style? d 'non-toc)
-                                   1
-                                   0)])
-                 (super start-collect (list d) (list fn) ci)))
-             ds
-             fns)))
-
-    (define/private (check-duplicate-filename orig-s)
-      (let ([s (string-downcase (path->string orig-s))])
-        (when (hash-ref (current-part-files) s #f)
-          (error 'htmls-render "multiple parts have the same filename (modulo case): ~e"
-                 orig-s))
-        (hash-set! (current-part-files) s #t)))
-
-    (define/override (collect-part d parent ci number sub-init-number)
-      (let ([prev-sub (collecting-sub)])
-        (parameterize ([collecting-sub (if (part-style? d 'toc)
-                                           1 
-                                           (add1 prev-sub))]
-                       [collecting-whole-page (prev-sub . <= . 1)])
-          (if (and (current-part-whole-page? d)
-                   (not (eq? d (current-top-part))))
-              (let* ([filename (derive-filename d ci #f (length number))]
-                     [full-filename (build-path (path-only (current-output-file))
-                                                filename)])
-                (make-directory* (path-only full-filename))
-                (check-duplicate-filename full-filename)
-                (parameterize ([current-output-file full-filename])
-                  (super collect-part d parent ci number sub-init-number)))
-            (super collect-part d parent ci number sub-init-number)))))
-
-    (define/override (render-top ds fns ri)
-      (map (lambda (d fn)
-             (when (report-output?)
-               (printf " [Output to ~a/index.html]\n" fn))
-             (unless (directory-exists? fn)
-               (make-directory fn))
-             (parameterize ([current-subdirectory (file-name-from-path fn)]
-                            [current-top-part d])
-               ;; install files for each directory
-               (install-extra-files ds)
-               (let ([fn (build-path fn "index.html")])
-                 (with-output-to-file/clean
-                  fn
-                  (lambda () (render-one d ri fn))))))
-           ds
-           fns))
-
-    (define/override (nearly-top? d ri top)
-      (eq? top (collected-info-parent (part-collected-info d ri))))
-
-    (define/override (get-onthispage-label)
-      `((div ([class "tocsubtitle"]) "On this page:")))
-
-    (define/override (toc-wrap p)
-      (list p))
-
-    (inherit render-table
-             render-paragraph
-             extract-version)
-
-    (define/override (render-part d ri)
-      (parameterize ([current-version (extract-version d)])
-        (let ([number (collected-info-number (part-collected-info d ri))])
-          (if (and (on-separate-page-ok)
-                   (part-whole-page? d ri)
-                   (not (eq? d (current-top-part))))
-            ;; Put the actual content in a new file:
-            (let* ([filename (derive-filename d #f ri (part-depth d ri))]
-                   [full-path (build-path (path-only (current-output-file))
-                                          filename)])
-              (parameterize ([on-separate-page-ok #f]
-                             [current-subdirectory (let ([p (path-only filename)])
-                                                     (if p
-                                                         (build-path (current-subdirectory) p)
-                                                         (current-subdirectory)))])
-                (with-output-to-file/clean
-                 full-path
-                 (lambda () (render-one-part d ri full-path number)))
-                null))
-            (parameterize ([on-separate-page-ok #t])
-              ;; Normal section render
-              (super render-part d ri))))))
-
-    (super-new)))
-
-;; ----------------------------------------
-;; utils
-
-(define (explode p) (explode-path p))
-
-(define in-plt?
-  (let ([roots (map explode (filter values (list (find-doc-dir) (find-collects-dir))))])
-    (lambda (path)
-      (for/or ([root (in-list roots)])
-        (let loop ([path  path] [root root])
-          (or (null? root)
-              (and (pair? path)
-                   (equal? (car path) (car root))
-                   (loop (cdr path) (cdr root)))))))))
-
-(define (from-root p d)
-  (define c-p (path->complete-path p))
-  (define e-p (explode c-p))
-  (define e-d (and d (explode (path->complete-path d))))
-  (define p-in? (in-plt? e-p))
-  (define d-in? (and d (in-plt? e-d)))
-  ;; use an absolute link if the link is from outside the plt tree
-  ;; going in (or if d is #f)
-  (if (not (and d (cond
-                    [(equal? p-in? d-in?) #t]
-                    [d-in? (error 'from-root
-                                  "got a link from the PLT tree going out; ~e"
-                                  p)]
-                    [else #f])))
-    (path->url-string c-p)
-    (let loop ([e-d e-d] [e-p e-p])
-      (cond
-        [(null? e-d)
-         (string-append*
-          (let loop ([e-p e-p])
-            (cond [(null? e-p) '("/")]
-                  [(null? (cdr e-p)) (list (path->string (car e-p)))]
-                  [(eq? 'same (car e-p)) (loop (cdr e-p))]
-                  [(eq? 'up (car e-p)) (cons "../" (loop (cdr e-p)))]
-                  [else (cons (path->string (car e-p)) (cons "/" (loop (cdr e-p))))])))]
-        [(equal? (car e-d) (car e-p)) (loop (cdr e-d) (cdr e-p))]
-        [(eq? 'same (car e-d)) (loop (cdr e-d) e-p)]
-        [(eq? 'same (car e-p)) (loop e-d (cdr e-p))]
-        [else (string-append (string-append* (map (lambda (x) "../") e-d))
-                             (loop null e-p))]))))
-
-(define (path->url-string p)
-  (if (eq? 'unix (path-convention-type p))
-      (let ([p (simplify-path p #f)])
-        (if (regexp-match? #rx#"^[-a-zA-Z0-9_/.]*$" (path->bytes p))
-            (string-append "file://" (path->string p))
-            (url->string (path->url p))))
-      (url->string (path->url p))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/info.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/info.rkt
deleted file mode 100644
index 8cf218cf6d..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang info
-
-(define source-keep-files '("doc"))
-
-(define mzscheme-launcher-names '("scribble"))
-(define mzscheme-launcher-libraries '("run.rkt"))
-
-(define raco-commands
-  '(("scribble" scribble/run "render a Scribble document" #f)))
-
-(define purpose "This collect contains the implementation of scribble.")
-
-(define release-note-files '(("Scribble" "HISTORY.txt")))
-
-(define version "1.1")
-
-(define test-responsibles '(("html.rkt" eli)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp.rkt
deleted file mode 100644
index 8cbe831e6a..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang scheme/base
-(require setup/collects
-         scribble/core
-         (except-in scribble/base author)
-         scribble/decode
-         scribble/html-properties
-         scribble/latex-properties
-         (for-syntax scheme/base))
-
-(provide abstract include-abstract
-         author author/short
-         affiliation affiliation-mark affiliation-sep)
-
-(define jfp-extras
-  (let ([abs (lambda (s)
-               (path->collects-relative
-                (collection-file-path s "scribble" "jfp")))])
-    (list
-     (make-css-addition (abs "jfp.css"))
-     (make-tex-addition (abs "jfp.tex")))))
-
-;; ----------------------------------------
-;; Abstracts:
-
-(define abstract-style (make-style "abstract" jfp-extras))
-
-(define (abstract . strs)
-  (make-nested-flow
-   abstract-style
-   (decode-flow strs)))
-
-(define (extract-abstract p)
-  (unless (part? p)
-    (error 'include-abstract "doc binding is not a part: ~e" p))
-  (unless (null? (part-parts p))
-    (error 'include-abstract "abstract part has sub-parts: ~e" (part-parts p)))
-  (when (part-title-content p)
-    (error 'include-abstract "abstract part has title content: ~e" (part-title-content p)))
-  (part-blocks p))
-
-(define-syntax-rule (include-abstract mp)
-  (begin
-    (require (only-in mp [doc abstract-doc]))
-    (make-nested-flow abstract-style (extract-abstract abstract-doc))))
-
-;; ----------------------------------------
-;; Author
-
-(define (author . long)
-  (apply (apply author/short long) long))
-
-(define ((author/short . short) . long)
-  (make-paragraph
-   (make-style 'author jfp-extras)
-   (list
-    (make-multiarg-element "JFPAuthor" (list (decode-content short)
-                                             (decode-content long))))))
-
-(define (affiliation . txt)
-  (make-element (make-style "Affiliation" jfp-extras) (decode-content txt)))
-
-(define (affiliation-mark . txt)
-  (make-element (make-style "MarkSuperscript" jfp-extras) (decode-content txt)))
-
-(define (affiliation-sep)
-  (hspace 2))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/.gitignore b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/.gitignore
deleted file mode 100644
index d5788f431d..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# to avoid committing it by accident, since we can't distribute it
-/jfp1.cls
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.css b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.tex
deleted file mode 100644
index 815165c0c4..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.tex
+++ /dev/null
@@ -1,5 +0,0 @@
-
-\newcommand{\Affiliation}[1]{\\ #1}
-\newcommand{\MarkSuperscript}[1]{$^{#1}$}
-
-\newcommand{\JFPAuthor}[2]{\author[#1]{#2}}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang.rkt
deleted file mode 100644
index ade07da839..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang scheme/base
-(require scribble/doclang
-         (except-in scribble/base author)
-         scribble/jfp
-         setup/collects
-         "../private/defaults.rkt"
-         net/ftp
-         racket/file
-         scribble/latex-prefix
-         (for-syntax scheme/base))
-(provide (except-out (all-from-out scribble/doclang) #%module-begin)
-         (all-from-out scribble/jfp)
-         (all-from-out scribble/base)
-         (rename-out [module-begin #%module-begin]))
-
-(module test racket/base)
-
-;; No options, currently, but keep in case we want to support some:
-(define-syntax (module-begin stx)
-  (syntax-case* stx () (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
-    [(_ id ws . body)
-     ;; Skip intraline whitespace to find options:
-     (and (string? (syntax-e #'ws))
-          (regexp-match? #rx"^ *$" (syntax-e #'ws)))
-     #'(module-begin id . body)]
-    [(_ id . body)
-     #'(#%module-begin id (post-process) () . body)]))
-
-(define cls-file
-  (let ([p (scribble-file "jfp/jfp1.cls")])
-    (if (file-exists? (collects-relative->path p))
-        p
-        (downloaded-file "jfp1.cls"))))
-
-(define ((post-process) doc)
-  (add-defaults doc
-                (string->bytes/utf-8
-                 (format "\\documentclass{jfp1}\n~a\\usepackage{times}\n\\usepackage{qcourier}\n"
-                         unicode-encoding-packages))
-                (scribble-file "jfp/style.tex")
-                (list cls-file)
-                #f))
-
-(unless (or (not (path? cls-file))
-            (file-exists? cls-file))
-  (log-error (format "File not found: ~a" cls-file))
-  (define site "ftp.cambridge.org")
-  (define path "pub/texarchive/journals/latex/jfp-cls")
-  (define file "jfp1.cls")
-  (log-error (format "Downloading via ftp://~a/~a/~a..." site path file))
-  (define c (ftp-establish-connection site 21 "anonymous" "user@racket-lang.org"))
-  (ftp-cd c path)
-  (let-values ([(base name dir?) (split-path cls-file)])
-    (make-directory* base)
-    (ftp-download-file c base file))
-  (ftp-close-connection c))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang/reader.rkt
deleted file mode 100644
index 09e0da561f..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang s-exp scribble/base/reader
-scribble/jfp/lang
-#:wrapper1 (lambda (t) (cons 'doc (t)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/style.tex
deleted file mode 100644
index 09d7c1569d..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/style.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-
-\renewcommand{\titleAndVersionAndAuthors}[3]{\title[#2]{#1}#3\maketitle}
-\renewcommand{\titleAndEmptyVersionAndAuthors}[3]{\titleAndVersionAndAuthors{#1}{#1}{#3}}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/latex-prefix.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/latex-prefix.rkt
deleted file mode 100644
index 4668497c63..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/latex-prefix.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(provide unicode-encoding-packages)
-
-(define unicode-encoding-packages
-  (string-append
-   "\\usepackage[utf8]{inputenc}\n"
-   "\\usepackage[T1]{fontenc}\n"))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/latex-properties.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/latex-properties.rkt
deleted file mode 100644
index 58e56c1dc3..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/latex-properties.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scheme/base
-(require "private/provide-structs.rkt"
-         racket/contract/base)
-
-(provide-structs
- [tex-addition ([path (or/c path-string? (cons/c 'collects (listof bytes?)) bytes?)])]
- [latex-defaults ([prefix (or/c bytes? path-string? (cons/c 'collects (listof bytes?)))]
-                  [style (or/c bytes? path-string? (cons/c 'collects (listof bytes?)))]
-                  [extra-files (listof (or/c path-string? (cons/c 'collects (listof bytes?))))])]
- [command-extras ([arguments (listof string?)])])
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/latex-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/latex-render.rkt
deleted file mode 100644
index cb889e4bb0..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/latex-render.rkt
+++ /dev/null
@@ -1,1304 +0,0 @@
-#lang at-exp racket/base
-(require "core.rkt"
-         "latex-properties.rkt"
-         "private/render-utils.rkt"
-         racket/class
-         racket/runtime-path
-         racket/port
-         racket/string
-         racket/list
-         setup/collects
-         file/convertible)
-(provide render-mixin
-         make-render-part-mixin)
-
-(define current-table-mode (make-parameter #f))
-(define rendering-tt (make-parameter #f))
-(define show-link-page-numbers (make-parameter #f))
-(define done-link-page-numbers (make-parameter #f))
-(define disable-images (make-parameter #f))
-(define escape-brackets (make-parameter #f))
-(define suppress-newline-content (make-parameter #f))
-
-(define-struct (toc-paragraph paragraph) ())
-
-(define-runtime-path scribble-prefix-tex "scribble-prefix.tex")
-(define-runtime-path scribble-tex "scribble.tex")
-(define-runtime-path scribble-style-tex "scribble-style.tex")
-
-(define (color->string c)
-  (if (string? c)
-      c
-      (format "~a,~a,~a"
-              (/ (car c) 255.0)
-              (/ (cadr c) 255.0)
-              (/ (caddr c) 255.0))))
-
-(define (make-render-part-mixin n)
-  (lambda (%)
-    (class (render-mixin %)
-      (define/override (render-part-depth) n)
-      (super-new))))
-
-(define-runtime-path skull-tex "scribble-skull.tex")
-(define skull-style (make-style #f (list (tex-addition skull-tex))))
-
-(define (render-mixin % #:image-mode [image-mode #f])
-  (class %
-    (super-new)
-
-    (inherit-field prefix-file style-file style-extra-files image-preferences)
-
-    (define/override (current-render-mode)
-      '(latex))
-
-    (inherit sort-image-requests)
-    (define image-reqs 
-      (sort-image-requests (cond
-                            [(eq? image-mode 'pdf)
-                             '(pdf-bytes png@2x-bytes png-bytes)]
-                            [(eq? image-mode 'ps)
-                             '(eps-bytes)]
-                            [else
-                             '(pdf-bytes png@2x-bytes png-bytes eps-bytes)])
-                           image-preferences))
-
-    (define/override (get-suffix) #".tex")
-
-    (inherit render-block
-             render-part
-             install-file
-             format-number
-             number-depth
-             extract-part-style-files
-             extract-version
-             extract-date
-             extract-authors
-             extract-pretitle)
-
-    (define/override (auto-extra-files? v) (latex-defaults? v))
-    (define/override (auto-extra-files-paths v) (latex-defaults-extra-files v))
-
-    (define/public (render-part-depth) #f)
-
-    (define/override (render-one d ri fn)
-      (let* ([defaults (ormap (lambda (v) (and (latex-defaults? v) v))
-                              (style-properties (part-style d)))]
-             [prefix-file (or prefix-file
-                              (and defaults
-                                   (let ([v (latex-defaults-prefix defaults)])
-                                     (cond
-                                      [(bytes? v) v]
-                                      [else (collects-relative->path v)])))
-                              scribble-prefix-tex)]
-             [style-file (or style-file 
-                             (and defaults
-                                  (let ([v (latex-defaults-style defaults)])
-                                    (cond
-                                     [(bytes? v) v]
-                                     [else (collects-relative->path v)])))
-                             scribble-style-tex)]
-             [all-style-files (cons scribble-tex
-                                    (append (extract-part-style-files
-                                             d
-                                             ri
-                                             (lambda (p) #f)
-                                             tex-addition?
-                                             tex-addition-path)
-                                            (list style-file)
-                                            style-extra-files))]
-             [whole-doc? (not (render-part-depth))])
-        (if whole-doc?
-            (for ([style-file (in-list (cons prefix-file all-style-files))])
-              (if (bytes? style-file)
-                  (display style-file)
-                  (with-input-from-file style-file
-                    (lambda ()
-                      (copy-port (current-input-port) (current-output-port))))))
-            (for ([style-file (in-list all-style-files)])
-              (if (bytes? style-file)
-                  (display style-file)
-                  (install-file style-file))))
-        (when whole-doc?
-          (printf "\\begin{document}\n\\preDoc\n")
-          (when (part-title-content d)
-            (let ([vers (extract-version d)]
-                  [date (extract-date d)]
-                  [pres (extract-pretitle d)]
-                  [auths (extract-authors d)])
-              (for ([pre (in-list pres)])
-                (printf "\n\n")
-                (do-render-paragraph pre d ri #t #f))
-              (when date (printf "\\date{~a}\n" date))
-              (printf "\\titleAnd~aVersionAnd~aAuthors{" 
-                      (if (equal? vers "") "Empty" "")
-                      (if (null? auths) "Empty" ""))
-              (render-content (part-title-content d) d ri)
-              (printf "}{~a}{" vers)
-              (unless (null? auths)
-                (printf "\\SNumberOfAuthors{~a}" (length auths)))
-              (for/fold ([first? #t]) ([auth (in-list auths)])
-                (unless first? (printf "\\SAuthorSep{}"))
-                (do-render-paragraph auth d ri #t #f)
-                #f)
-              (printf "}\n"))))
-        (render-part d ri)
-        (when whole-doc?
-          (printf "\n\n\\postDoc\n\\end{document}\n"))))
-
-    (define/override (render-part-content d ri)
-      (let ([number (collected-info-number (part-collected-info d ri))]
-            [completely-hidden?
-             (and (part-style? d 'hidden)
-                  (equal? "" (content->string (part-title-content d))))])
-        (when (and (part-title-content d) 
-                   (or (pair? number)
-                       (let ([d (render-part-depth)])
-                         (and d (positive? d)))))
-          (when (eq? (style-name (part-style d)) 'index)
-            (printf "\\twocolumn\n\\parskip=0pt\n\\addcontentsline{toc}{section}{Index}\n"))
-          (let ([pres (extract-pretitle d)])
-            (for ([pre (in-list pres)])
-              (printf "\n\n")
-              (do-render-paragraph pre d ri #t #f)))
-          (define depth (+ (number-depth number) (or (render-part-depth) 0)))
-          (define grouper? (part-style? d 'grouper))
-          (define (inc-section-number)
-            (printf "\\Sinc~a" (case depth
-                                 [(0 1) (if grouper? "part" "section")]
-                                 [(2) "subsection"]
-                                 [(3) "subsubsection"]
-                                 [(4) "subsubsubsection"]
-                                 [else "subsubsubsubsection"])))
-          (cond
-           [completely-hidden?
-            (printf "\n\n\\notitlesection")
-            (unless (part-style? d 'unnumbered)
-              (inc-section-number))]
-           [else
-            (define no-number? (and (pair? number) 
-                                    (or (not (car number))
-                                        (equal? "" (car number))
-                                        ((length number) . > . 3))))
-            (define no-toc? (part-style? d 'toc-hidden))
-            (define (show-number)
-              (when (and (part-style? d 'grouper)
-                         (depth . > . 1)
-                         (not no-number?))
-                (printf "~a\\quad{}" (car (format-number number null)))))
-            (printf "\n\n\\~a~a~a"
-                    (case depth
-                      [(0 1) (if grouper?
-                                 "partNewpage\n\n\\Spart"
-                                 "sectionNewpage\n\n\\Ssection")]
-                      [(2) "Ssubsection"]
-                      [(3) "Ssubsubsection"]
-                      [(4) "Ssubsubsubsection"]
-                      [else "Ssubsubsubsubsection"])
-                    (if (and grouper?
-                             (depth . > . 1))
-                        "grouper"
-                        "")
-                    (if no-number? 
-                        (if no-toc?
-                            "star"
-                            "starx")
-                        ""))
-            (unless (and no-number? no-toc?)
-              (printf "{")
-              (show-number)
-              (parameterize ([disable-images #t]
-                             [escape-brackets #t])
-                (render-content (part-title-content d) d ri))
-              (printf "}"))
-            (printf "{")
-            (show-number)
-            (render-content (part-title-content d) d ri)
-            (printf "}")
-            (when (and (part-style? d 'hidden-number)
-                       (not (part-style? d 'unnumbered)))
-              (inc-section-number))
-            (when (eq? (style-name (part-style d)) 'index) (printf "\n\n"))]))
-        (for ([t (part-tags d)])
-          (printf "\\label{t:~a}~a" (t-encode (add-current-tag-prefix (tag-key t ri)))
-                  (if completely-hidden? "" "\n\n")))
-        (render-flow (part-blocks d) d ri #f)
-        (for ([sec (part-parts d)]) (render-part sec ri))
-        (when (eq? (style-name (part-style d)) 'index) (printf "\\onecolumn\n\n"))
-        null))
-
-    (define/override (render-paragraph p part ri)
-      (do-render-paragraph p part ri #f #f))
-
-    (define/private (do-render-paragraph p part ri show-pre? as-box-mode)
-      (let* ([sn (style-name (paragraph-style p))]
-             [style (cond
-                     [as-box-mode
-                      (or
-                       (ormap (lambda (a)
-                                (and (box-mode? a)
-                                     ((box-mode-selector as-box-mode) a)))
-                              (style-properties
-                               (paragraph-style p)))
-                       "hbox")]
-                     [(eq? sn 'author) "SAuthor"]
-                     [(eq? sn 'pretitle) #f]
-                     [(eq? sn 'wraps) #f]
-                     [else sn])])
-        (unless (and (not show-pre?)
-                     (or (eq? sn 'author)
-                         (eq? sn 'pretitle)))
-          (let ([use-style? (string? style)])
-            (when use-style?
-              (printf "\\~a{" style))
-            (if (toc-paragraph? p)
-                (printf "\\newpage \\tableofcontents \\newpage")
-                (if as-box-mode
-                    (parameterize ([suppress-newline-content #t])
-                      (super render-paragraph p part ri))
-                    (super render-paragraph p part ri)))
-            (when use-style? (printf "}")))))
-      null)
-
-    (define/private (no-noindent? p ri)
-      (cond
-       [(delayed-block? p)
-        (no-noindent? (delayed-block-blocks p ri) ri)]
-       [(traverse-block? p)
-        (no-noindent? (traverse-block-block p ri) ri)]
-       [else
-        (or
-         (memq 'never-indents 
-               (style-properties 
-                (cond
-                 [(paragraph? p) (paragraph-style p)]
-                 [(compound-paragraph? p) (compound-paragraph-style p)]
-                 [(nested-flow? p) (nested-flow-style p)]
-                 [(table? p) (table-style p)]
-                 [(itemization? p) (itemization-style p)]
-                 [else plain])))
-         (and (nested-flow? p)
-              (pair? (nested-flow-blocks p))
-              (no-noindent? (car (nested-flow-blocks p)) ri))
-         (and (compound-paragraph? p)
-              (pair? (compound-paragraph-blocks p))
-              (no-noindent? (car (compound-paragraph-blocks p)) ri)))]))
-
-    (define/override (render-intrapara-block p part ri first? last? starting-item?)
-      (unless first?
-        (printf "\n\n")
-        (unless (no-noindent? p ri)
-          (printf "\\noindent ")))
-      (super render-intrapara-block p part ri first? last? starting-item?))
-
-    (define/override (render-content e part ri)
-      (let ([part-label? (and (link-element? e)
-                              (pair? (link-element-tag e))
-                              (eq? 'part (car (link-element-tag e)))
-                              (empty-content? (element-content e)))])
-        (parameterize ([done-link-page-numbers (or (done-link-page-numbers)
-                                                   (link-element? e))])
-          (when (target-element? e)
-            (printf "\\label{t:~a}"
-                    (t-encode (add-current-tag-prefix (tag-key (target-element-tag e) ri)))))
-          (when part-label?
-            (define-values (dest ext?) (resolve-get/ext? part ri (link-element-tag e)))
-            (let* ([number (and dest (vector-ref dest 2))]
-                   [formatted-number (and dest
-                                          (list? number)
-                                          (format-number number null))]
-                   [lbl? (and dest 
-                              (not ext?)
-                              (not (show-link-page-numbers)))])
-              (printf "\\~aRef~a~a~a{"
-                      (case (and dest (number-depth number))
-                        [(0) "Book"]
-                        [(1) (if (string? (car number)) "Part" "Chap")]
-                        [else "Sec"])
-                      (if lbl?
-                          "Local"
-                          "")
-                      (if (let ([s (element-style e)])
-                            (and (style? s) (memq 'uppercase (style-properties s))))
-                          "UC"
-                          "")
-                      (if (null? formatted-number)
-                          "UN"
-                          ""))
-              (when lbl?
-                (printf "t:~a}{" (t-encode (vector-ref dest 1))))
-              (unless (null? formatted-number)
-                (render-content
-                 (if dest
-                     (if (list? number)
-                         formatted-number
-                         (begin (eprintf "Internal tag error: ~s -> ~s\n"
-                                         (link-element-tag e)
-                                         dest)
-                                '("!!!")))
-                     (list "???"))
-                 part ri)
-                (printf "}{"))))
-          (let* ([es (cond
-                      [(element? e) (element-style e)]
-                      [(multiarg-element? e) (multiarg-element-style e)]
-                      [else #f])]
-                 [style-name (if (style? es)
-                                 (style-name es)
-                                 es)]
-                 [style (and (style? es) es)]
-                 [check-render
-                  (lambda ()
-                    (when (render-element? e)
-                      ((render-element-render e) this part ri)))]
-                 [core-render (lambda (e tt?)
-                                (cond
-                                 [(and (image-element? e)
-                                       (not (disable-images)))
-                                  (check-render)
-                                  (let ([fn (install-file
-                                             (select-suffix 
-                                              (collects-relative->path
-                                               (image-element-path e))
-                                              (image-element-suffixes e) 
-                                              '(".pdf" ".ps" ".png")))])
-                                    (printf "\\includegraphics[scale=~a]{~a}"
-                                            (image-element-scale e) fn))]
-                                 [(and (convertible? e)
-                                       (not (disable-images))
-                                       (let ([ftag (lambda (v suffix [scale 1]) (and v (list v suffix scale)))]
-                                             [xxlist (lambda (v) (and v (list v #f #f #f #f #f #f #f #f)))]
-                                             [xlist (lambda (v) (and v (append v (list 0 0 0 0))))])
-                                         (for/or ([req (in-list image-reqs)])
-                                           (case req
-                                             [(eps-bytes)
-                                              (or (ftag (convert e 'eps-bytes+bounds8) ".ps")
-                                                  (ftag (xlist (convert e 'eps-bytes+bounds)) ".ps")
-                                                  (ftag (xxlist (convert e 'eps-bytes)) ".ps"))]
-                                             [(pdf-bytes)
-                                              (or (ftag (convert e 'pdf-bytes+bounds8) ".pdf")
-                                                  (ftag (xlist (convert e 'pdf-bytes+bounds)) ".pdf")
-                                                  (ftag (xxlist (convert e 'pdf-bytes)) ".pdf"))]
-                                             [(png@2x-bytes)
-                                              (or (ftag (convert e 'png@2x-bytes+bounds8) ".png" 0.5)
-                                                  (ftag (xxlist (convert e 'png@2x-bytes)) ".png" 0.5))]
-                                             [(png-bytes)
-                                              (or (ftag (convert e 'png-bytes+bounds8) ".png")
-                                                  (ftag (xxlist (convert e 'png-bytes)) ".png"))]))))
-                                  => (lambda (bstr+info+suffix)
-                                       (check-render)
-                                       (let* ([bstr (list-ref (list-ref bstr+info+suffix 0) 0)]
-                                              [suffix (list-ref bstr+info+suffix 1)]
-                                              [scale (list-ref bstr+info+suffix 2)]
-                                              [height (list-ref (list-ref bstr+info+suffix 0) 2)]
-                                              [pad-left (or (list-ref (list-ref bstr+info+suffix 0) 5) 0)]
-                                              [pad-top (or (list-ref (list-ref bstr+info+suffix 0) 6) 0)]
-                                              [pad-right (or (list-ref (list-ref bstr+info+suffix 0) 7) 0)]
-                                              [pad-bottom (or (list-ref (list-ref bstr+info+suffix 0) 8) 0)]
-                                              [descent (and height
-                                                            (- (+ (list-ref (list-ref bstr+info+suffix 0) 3)
-                                                                  (- (ceiling height) height))
-                                                               pad-bottom))]
-                                              [width (let ([w (list-ref (list-ref bstr+info+suffix 0) 1)])
-                                                       (and w (- w pad-left pad-right)))]
-                                              [fn (install-file (format "pict~a" suffix) bstr)])
-                                         (if descent
-                                             (printf "\\raisebox{-~abp}{\\makebox[~abp][l]{\\includegraphics[~atrim=~a ~a ~a ~a]{~a}}}" 
-                                                     descent
-                                                     width
-                                                     (if (= scale 1) "" (format "scale=~a," scale))
-                                                     (/ pad-left scale) (/ pad-bottom scale) (/ pad-right scale) (/ pad-top scale)
-                                                     fn)
-                                             (printf "\\includegraphics{~a}" fn))))]
-                                 [else
-                                  (parameterize ([rendering-tt (or tt? (rendering-tt))])
-                                    (super render-content e part ri))]))]
-                 [wrap (lambda (e s tt?)
-                         (when s (printf "\\~a{" s))
-                         (core-render e tt?)
-                         (when s (printf "}")))])
-            (define (finish tt?)
-              (cond
-               [(symbol? style-name)
-                (case style-name
-                  [(italic) (wrap e "textit" tt?)]
-                  [(bold) (wrap e "textbf" tt?)]
-                  [(tt) (wrap e "Scribtexttt" #t)]
-                  [(url) (wrap e "Snolinkurl" 'url)]
-                  [(no-break) (wrap e "mbox" tt?)]
-                  [(sf) (wrap e "textsf" #f)]
-                  [(roman) (wrap e "textrm" #f)]
-                  [(subscript) (wrap e "textsub" #f)]
-                  [(superscript) (wrap e "textsuper" #f)]
-                  [(smaller) (wrap e "Smaller" #f)]
-                  [(larger) (wrap e "Larger" #f)]
-                  [(hspace)
-                   (check-render)
-                   (let ([s (content->string e)])
-                     (case (string-length s)
-                       [(0) (void)]
-                       [else
-                        (printf "\\mbox{\\hphantom{\\Scribtexttt{~a}}}"
-                                (regexp-replace* #rx"." s "x"))]))]
-                  [(newline) 
-                   (check-render)
-                   (unless (suppress-newline-content)
-                     (printf "\\hspace*{\\fill}\\\\"))]
-                  [else (error 'latex-render
-                               "unrecognzied style symbol: ~s" style)])]
-               [(string? style-name)
-                (let* ([v (if style (style-properties style) null)]
-                       [tt? (cond
-                             [(memq 'tt-chars v) #t]
-                             [(memq 'exact-chars v) 'exact]
-                             [else tt?])])
-                  (cond
-                   [(multiarg-element? e)
-                    (check-render)
-                    (printf "\\~a" style-name)
-                    (if (null? (multiarg-element-contents e))
-                        (printf "{}")
-                        (for ([i (in-list (multiarg-element-contents e))])
-                          (printf "{")
-                          (parameterize ([rendering-tt (or tt? (rendering-tt))])
-                            (render-content i part ri))
-                          (printf "}")))]
-                   [else
-                    (wrap e style-name tt?)]))]
-               [(and (not style-name)
-                     style
-                     (memq 'exact-chars (style-properties style)))
-                (wrap e style-name 'exact)]
-               [else
-                (core-render e tt?)]))
-            (let loop ([l (if style (style-properties style) null)] [tt? #f])
-              (if (null? l)
-                  (finish tt?)
-                  (let ([v (car l)])
-                    (cond
-                     [(target-url? v)
-                      (define target (let* ([s (let ([p (target-url-addr v)])
-                                                 (if (path? p)
-                                                     (path->string p)
-                                                     p))]
-                                            [s (regexp-replace* #rx"\\\\" s "%5c")]
-                                            [s (regexp-replace* #rx"{" s "%7b")]
-                                            [s (regexp-replace* #rx"}" s "%7d")]
-                                            [s (regexp-replace* #rx"%" s "\\\\%")])
-                                       s))
-                      (if (regexp-match? #rx"^[^#]*#[^#]*$" target)
-                          ;; work around a problem with `\href' as an
-                          ;; argument to other macros, such as `\marginpar':
-                          (let ([l (string-split target "#")])
-                            (printf "\\Shref{~a}{~a}{" (car l) (cadr l)))
-                          ;; normal:
-                          (printf "\\href{~a}{" target))
-                      (loop (cdr l) #t)
-                      (printf "}")]
-                     [(color-property? v)
-                      (printf "\\intext~acolor{~a}{"
-                              (if (string? (color-property-color v)) "" "rgb")
-                              (color->string (color-property-color v)))
-                      (loop (cdr l) tt?)
-                      (printf "}")]
-                     [(background-color-property? v)
-                      (printf "\\in~acolorbox{~a}{"
-                              (if (string? (background-color-property-color v)) "" "rgb")
-                              (color->string (background-color-property-color v)))
-                      (loop (cdr l) tt?)
-                      (printf "}")]
-                     [(command-extras? (car l))
-                      (loop (cdr l) tt?)
-                      (for ([l (in-list (command-extras-arguments (car l)))])
-                        (printf "{~a}" l))]
-                     [else (loop (cdr l) tt?)]))))))
-        (when part-label?
-          (printf "}"))
-        (when (and (link-element? e)
-                   (show-link-page-numbers)
-                   (not (done-link-page-numbers)))
-          (printf ", \\pageref{t:~a}"
-                  (t-encode 
-                   (let ([v (resolve-get part ri (link-element-tag e))])
-                     (and v (vector-ref v 1))))))
-        null))
-
-    (define/private (t-encode s)
-      (string-append*
-       (map (lambda (c)
-              (cond
-                [(and (or (char-alphabetic? c) (char-numeric? c))
-                      ((char->integer c) . < . 128))
-                 (string c)]
-                [(char=? c #\space) "_"]
-                [else (format "x~x" (char->integer c))]))
-            (string->list (format "~s" s)))))
-
-    (define/override (render-flow p part ri starting-item? [wrap-each? #f])
-      (if (null? p)
-          null
-          (begin
-            (when wrap-each? (printf "{"))
-            (render-block (car p) part ri starting-item?)
-            (when wrap-each? (printf "}"))
-            (for ([b (in-list (cdr p))])
-              (if wrap-each?
-                  (printf "%\n{")
-                  (printf "\n\n"))
-              (render-block b part ri #f)
-              (when wrap-each? (printf "}")))
-            null)))
-
-    (define/override (render-table t part ri starting-item?)
-      (render-table* t part ri starting-item? "[t]"))
-
-    (define/private (render-table* t part ri starting-item? alignment)
-      (let* ([s-name (style-name (table-style t))]
-             [boxed? (eq? 'boxed s-name)]
-             [index? (eq? 'index s-name)]
-             [tableform
-              (cond [index? "list"]
-                    [(eq? 'block s-name) "tabular"]
-                    [(not (current-table-mode)) "bigtabular"]
-                    [else "tabular"])]
-             [opt (cond [(equal? tableform "bigtabular") ""]
-                        [(equal? tableform "tabular") alignment]
-                        [else ""])]
-             [blockss (if index? (cddr (table-blockss t)) (table-blockss t))]
-             [cell-styless (extract-table-cell-styles t)]
-             [twidth (if (null? (table-blockss t))
-                         1
-                         (length (car (table-blockss t))))]
-             [single-column? (and (= 1 twidth)
-                                  (or (not s-name) (string? s-name))
-                                  (not (ormap (lambda (cell-styles)
-                                                (ormap (lambda (s) 
-                                                         (or (string? (style-name s))
-                                                             (let ([l (style-properties s)])
-                                                               (or (memq 'right l)
-                                                                   (memq 'center l)))))
-                                                       cell-styles))
-                                              cell-styless))
-                                  (not (current-table-mode)))]
-             [inline?
-              (and (not single-column?)
-                   (not boxed?) 
-                   (not index?)
-                   (ormap (lambda (rs) 
-                            (ormap (lambda (cs) (style-name cs)) rs))
-                          cell-styless)
-                   (= 1 twidth)
-                   (let ([m (current-table-mode)])
-                     (and m
-                          (equal? "bigtabular" (car m))
-                          (= 1 (length (car (table-blockss (cadr m))))))))])
-        (if single-column?
-            (begin
-              (when (string? s-name)
-                (printf "\\begin{~a}" s-name))
-              (do-render-nested-flow 
-               (make-nested-flow (make-style "SingleColumn" null) (map car (table-blockss t)))
-               part 
-               ri
-               #t
-               #f)
-              (when (string? s-name)
-                (printf "\\end{~a}" s-name)))
-            (unless (or (null? blockss) (null? (car blockss)))
-              (define all-left-line?s
-                (if (null? cell-styless)
-                    null
-                    (for/list ([i (in-range (length (car cell-styless)))])
-                      (for/and ([cell-styles (in-list cell-styless)])
-                        (let ([cell-style (list-ref cell-styles i)])
-                          (or (memq 'left-border (style-properties cell-style))
-                              (memq 'border (style-properties cell-style))))))))
-              (define all-right-line?
-                (and (pair? cell-styless)
-                     (let ([i (sub1 (length (car cell-styless)))])
-                       (for/and ([cell-styles (in-list cell-styless)])
-                         (let ([cell-style (list-ref cell-styles i)])
-                           (or (memq 'right-border (style-properties cell-style))
-                               (memq 'border (style-properties cell-style))))))))
-              (parameterize ([current-table-mode
-                              (if inline? (current-table-mode) (list tableform t))]
-                             [show-link-page-numbers
-                              (or index? (show-link-page-numbers))])
-                (cond
-                 [index? (printf "\\begin{list}{}{\\parsep=0pt \\itemsep=1pt \\leftmargin=2ex \\itemindent=-2ex}\n")]
-                 [inline? (void)]
-                 [single-column? (printf "\\begin{tabbing}\n")]
-                 [else
-                  (printf "~a~a\\begin{~a}~a{@{~a}~a}\n~a"
-                          (if (and starting-item? (equal? tableform "bigtabular"))
-                              "\\bigtableinlinecorrect"
-                              "")
-                          (if (string? s-name)
-                              (format "\\begin{~a}" s-name)
-                              "")
-                          tableform
-                          opt
-                          (if (equal? tableform "bigtabular")
-                              "\\bigtableleftpad"
-                              "")
-                          (string-append*
-                           (let ([l
-                                  (map (lambda (i cell-style left-line?)
-                                         (format "~a~a@{}"
-                                                 (if left-line? "|@{}" "")
-                                                 (cond
-                                                  [(memq 'center (style-properties cell-style)) "c"]
-                                                  [(memq 'right (style-properties cell-style)) "r"]
-                                                  [else "l"])))
-                                       (car blockss)
-                                       (car cell-styless)
-                                       all-left-line?s)])
-                             (let ([l (if all-right-line? (append l '("|")) l)])
-                               (if boxed? (cons "@{\\SBoxedLeft}" l) l))))
-                          "")])
-                ;; Helper to add row-separating lines:
-                (define (add-clines prev-styles next-styles)
-                  (let loop ([pos 1] [start #f] [prev-styles prev-styles] [next-styles next-styles])
-                    (cond
-                     [(or (and prev-styles (null? prev-styles))
-                          (and next-styles (null? next-styles)))
-                      (when start
-                        (if (= start 1)
-                            (printf "\\hline ")
-                            (printf "\\cline{~a-~a}" start (sub1 pos))))]
-                     [else
-                      (define prev-style (and prev-styles (car prev-styles)))
-                      (define next-style (and next-styles (car next-styles)))
-                      (define line? (or (and prev-style
-                                             (or (memq 'bottom-border (style-properties prev-style))
-                                                 (memq 'border (style-properties prev-style))))
-                                        (and next-style
-                                             (or (memq 'top-border (style-properties next-style))
-                                                 (memq 'border (style-properties next-style))))))
-                      (when (and start (not line?))
-                        (printf "\\cline{~a-~a}" start (sub1 pos)))
-                      (loop (add1 pos) (and line? (or start pos))
-                            (and prev-styles (cdr prev-styles))
-                            (and next-styles (cdr next-styles)))])))
-                ;; Loop through rows:
-                (let loop ([blockss blockss]
-                           [cell-styless cell-styless]
-                           [prev-styles #f]) ; for 'bottom-border styles
-                  (let ([flows (car blockss)]
-                        [cell-styles (car cell-styless)])
-                    (unless index? (add-clines prev-styles cell-styles))
-                    (let loop ([flows flows]
-                               [cell-styles cell-styles]
-                               [all-left-line?s all-left-line?s]
-                               [need-left? #f])
-                      (unless (null? flows)
-                        (define right-line?
-                          (cond
-                           [index?
-                            (printf "\n\\item ")
-                            #f]
-                           [(eq? 'cont (car flows))
-                            #f]
-                           [else
-                            (let ([cnt (let loop ([flows (cdr flows)][n 1])
-                                         (cond [(null? flows) n]
-                                               [(eq? (car flows) 'cont)
-                                                (loop (cdr flows) (add1 n))]
-                                               [else n]))])
-                              (unless (= cnt 1) (printf "\\multicolumn{~a}{l}{" cnt))
-                              (when (and (not (car all-left-line?s))
-                                         (or need-left?
-                                             (memq 'left-border (style-properties (car cell-styles)))
-                                             (memq 'border (style-properties (car cell-styles)))))
-                                (printf "\\vline "))
-                              (render-table-cell (car flows) part ri (/ twidth cnt) (car cell-styles) (not index?))
-                              (define right-line? (or (memq 'right-border (style-properties (list-ref cell-styles (sub1 cnt))))
-                                                      (memq 'border (style-properties (list-ref cell-styles (sub1 cnt))))))
-                              (when (and right-line? (null? (list-tail flows cnt)) (not all-right-line?))
-                                (printf "\\vline "))
-                              (unless (= cnt 1) (printf "}"))
-                              (unless (null? (list-tail flows cnt))
-                                (printf " &\n"))
-                              right-line?)]))
-                        (unless (null? (cdr flows)) (loop (cdr flows)
-                                                          (cdr cell-styles)
-                                                          (cdr all-left-line?s)
-                                                          right-line?))))
-                    (unless (or index?
-                                (and (null? (cdr blockss))
-                                     (not (for/or ([cell-style (in-list cell-styles)])
-                                            (or (memq 'bottom-border (style-properties cell-style))
-                                                (memq 'border (style-properties cell-style)))))))
-                      (printf " \\\\\n"))
-                    (cond
-                     [(null? (cdr blockss))
-                      (unless index? (add-clines cell-styles #f))]
-                     [else
-                      (loop (cdr blockss) (cdr cell-styless) cell-styles)])))
-                (unless inline?
-                  (printf "\\end{~a}~a"
-                          tableform
-                          (if (string? s-name)
-                              (format "\\end{~a}" s-name)
-                              "")))))))
-      null)
-
-    (define/private (render-table-cell p part ri twidth vstyle can-box?)
-      (let* ([top? (or (memq 'top (style-properties vstyle))
-                       (memq 'baseline (style-properties vstyle)))]
-             [bottom? (and (not top?)
-                           (memq 'bottom (style-properties vstyle)))]
-             [center? (and (not bottom?)
-                           (not top?))]
-             [as-box? (and can-box? (boxable? p))])
-        (when (string? (style-name vstyle))
-          (printf "\\~a{" (style-name vstyle)))
-        (let ([minipage? (and can-box? (not as-box?))])
-          (when minipage?
-            (printf "\\begin{minipage}~a{~a\\linewidth}\n"
-                    (cond
-                     [top? "[t]"]
-                     [center? "[c]"]
-                     [else ""])
-                    (/ 1.0 twidth)))
-          (cond
-           [(table? p)
-            (render-table* p part ri #f (cond
-                                         [top? "[t]"]
-                                         [center? "[c]"]
-                                         [else "[b]"]))]
-           [as-box?
-            (render-boxable-block p part ri (cond
-                                             [top? 't]
-                                             [center? 'c]
-                                             [else 'b]))]
-           [else
-            (render-block p part ri #f)])
-          (when minipage?
-            (printf " \\end{minipage}\n")))
-        (when (string? (style-name vstyle))
-          (printf "}"))
-        null))
-
-    (define/private (boxable? p)
-      (or (and (table? p)
-               (for* ([l (in-list (table-blockss p))]
-                      [p (in-list l)])
-                 (boxable? p)))
-          (and (nested-flow? p)
-               (or (and (= 1 (length (nested-flow-blocks p)))
-                        (memq (style-name (nested-flow-style p))
-                              '(code-inset vertical-inset)))
-                   (and
-                    (ormap box-mode? (style-properties (nested-flow-style p)))
-                    (andmap (lambda (p) (boxable? p)) (nested-flow-blocks p)))))
-          (and (paragraph? p)
-               (or (not (style-name (paragraph-style p)))
-                   (ormap box-mode? (style-properties (paragraph-style p)))))))
-
-    (define/private (render-boxable-block p part ri mode)
-      (cond
-       [(table? p)
-        (render-table* p part ri #f (format "[~a]" mode))]
-       [(nested-flow? p)
-        (do-render-nested-flow p part ri #f mode)]
-       [(paragraph? p)
-        (do-render-paragraph p part ri #f mode)]))
-
-    (define/private (box-mode-selector as-box-mode)
-      (case as-box-mode
-        [(t) box-mode-top-name]
-        [(c) box-mode-center-name]
-        [(b) box-mode-bottom-name]))
-
-    (define/override (render-itemization t part ri)
-      (let* ([style-str (let ([s (style-name (itemization-style t))])
-                          (if (eq? s 'compact)
-                              "compact"
-                              s))]
-             [mode (or (and (string? style-str)
-                            style-str)
-                       (if (eq? 'ordered style-str)
-                           "enumerate"
-                           "itemize"))])
-        (printf "\\begin{~a}\\atItemizeStart" mode)
-        (for ([flow (in-list (itemization-blockss t))])
-          (printf "\n\n\\~a" (if (string? style-str)
-                                  (format "~aItem{" style-str)
-                                  "item "))
-          (render-flow flow part ri #t)
-          (when (string? style-str)
-            (printf "}")))
-        (printf "\\end{~a}" mode)
-        null))
-
-    (define/private (do-render-nested-flow t part ri single-column? as-box-mode)
-      (let* ([props (style-properties (nested-flow-style t))]
-             [kind (or (and as-box-mode
-                            (or
-                             (ormap (lambda (a)
-                                      (and (box-mode? a)
-                                           ((box-mode-selector as-box-mode) a)))
-                                    props)
-                             (case (style-name (nested-flow-style t))
-                               [(code-inset) "SCodeInsetBox"]
-                               [(vertical-inset) "SVInsetBox"]
-                               [else (error "unexpected style for box mode")])))
-                       (let ([s (style-name (nested-flow-style t))])
-                         (or (and (string? s) s)
-                             (and (eq? s 'inset) "quote")
-                             (and (eq? s 'code-inset) "SCodeFlow")
-                             (and (eq? s 'vertical-inset) "SVInsetFlow")))
-                       "Subflow")]
-             [multicommand? (memq 'multicommand props)]
-             [command? (or (and as-box-mode (not multicommand?))
-                           (memq 'command props))])
-        (cond
-         [command? (printf "\\~a{" kind)]
-         [multicommand? (printf "\\~a" kind)]
-         [else (printf "\\begin{~a}" kind)])
-        (parameterize ([current-table-mode (if (or single-column?
-                                                   (not (current-table-mode)))
-                                               (current-table-mode)
-                                               (list "nested-flow" t))])
-          (if as-box-mode
-              (for-each (lambda (p) 
-                          (when multicommand? (printf "{"))
-                          (render-boxable-block p part ri as-box-mode)
-                          (when multicommand? (printf "}")))
-                        (nested-flow-blocks t))
-              (render-flow (nested-flow-blocks t) part ri #f multicommand?)))
-        (cond
-         [command? (printf "}")]
-         [multicommand? (void)]
-         [else (printf "\\end{~a}" kind)])
-        null))
-
-    (define/override (render-nested-flow t part ri starting-item?)
-      (do-render-nested-flow t part ri #f #f))
-
-    (define/override (render-compound-paragraph t part ri starting-item?)
-      (let ([kind (style-name (compound-paragraph-style t))]
-            [command? (memq 'command (style-properties (compound-paragraph-style t)))])
-        (when kind
-          (if command?
-              (printf "\\~a{" kind)
-              (printf "\\begin{~a}" kind)))
-        (super render-compound-paragraph t part ri starting-item?)
-        (when kind
-          (if command?
-              (printf "}")
-              (printf "\\end{~a}" kind)))
-        null))
-
-    (define/override (render-other i part ri)
-      (cond
-        [(string? i) (display-protected i)]
-        [(symbol? i)
-         (display (case i
-                    [(nbsp) "~"]
-                    [(mdash) "{---}"]
-                    [(ndash) "{--}"]
-                    [(ldquo) "{``}"]
-                    [(rdquo) "{''}"]
-                    [(rsquo) "{'}"]
-                    [(lsquo) "{`}"]
-                    [(prime) "$'$"]
-                    [(rarr) "$\\rightarrow$"]
-                    [(larr) "$\\leftarrow$"]
-                    [(alpha) "$\\alpha$"]
-                    [(infin) "$\\infty$"]
-                    [(lang) "$\\langle$"]
-                    [(rang) "$\\rangle$"]
-                    [else (error 'render "unknown symbol element: ~e" i)]))]
-        [else (display-protected (format "~s" i))])
-      null)
-
-    (define/override (string-to-implicit-styles e)
-      (for/fold ([ses null]) ([ch (in-string e)])
-        (case ch
-          [(#\☠) (cons skull-style ses)]
-          [else ses])))
-
-    (define/private (display-protected s)
-      (define rtt (rendering-tt))
-      (cond
-       [(eq? rtt 'exact)
-        (display s)]
-       [(eq? rtt 'url)
-        (for ([c (in-string s)])
-          (case c
-            [(#\%) (display "\\%")]
-            [(#\#) (display "\\#")]
-            [(#\\) (display "\\%5c")]
-            [(#\{) (display "\\%7b")]
-            [(#\}) (display "\\%7d")]
-            [else (display c)]))]
-       [else
-        ;; Start by normalizing to "combined" form, so that Racket characters
-        ;; are closer to Unicode characters (e.g., ä is one character, instead
-        ;; of a combining character followed by "a").
-        (let ([s (string-normalize-nfc s)])
-          (let ([len (string-length s)])
-            (let loop ([i 0])
-              (unless (= i len)
-                (display
-                 (let char-loop ([c (string-ref s i)])
-                   (case c
-                     [(#\\) (if (rendering-tt)
-                                "{\\char`\\\\}"
-                                "$\\backslash$")]
-                     [(#\_) (if (rendering-tt)
-                                "{\\char`\\_}"
-                                "$\\_$")]
-                     [(#\^) "{\\char'136}"]
-                     [(#\>) (if (rendering-tt) "{\\Stttextmore}" "$>$")]
-                     [(#\<) (if (rendering-tt) "{\\Stttextless}" "$<$")]
-                     [(#\|) (if (rendering-tt) "{\\Stttextbar}" "$|$")]
-                     [(#\-) "{-}"] ;; avoid en- or em-dash
-                     [(#\`) "{\\textasciigrave}"]
-                     [(#\') "{\\textquotesingle}"]
-                     [(#\? #\! #\. #\:)
-                      (if (rendering-tt) (format "{\\hbox{\\texttt{~a}}}" c) c)]
-                     [(#\~) "$\\sim$"]
-                     [(#\{ #\}) (if (rendering-tt)
-                                    (format "{\\char`\\~a}" c)
-                                    (format "\\~a" c))]
-                     [(#\[ #\]) (if (escape-brackets)
-                                    (if (eq? c #\[)
-                                        "{\\SOpenSq}"
-                                        "{\\SCloseSq}")
-                                    c)]
-                     [(#\# #\% #\& #\$) (format "\\~a" c)]
-                     [(#\uA0) "~"] ; non-breaking space
-                     [(#\uAD) "\\-"] ; soft hyphen; unfortunately, also disables auto-hyphen
-                     [(#\uDF) "{\\ss}"]
-                     [else
-                      (if ((char->integer c) . > . 127)
-                          ;; latex-prefix.rkt enables utf8 input, but this does not work for
-                          ;; all the characters below (e.g. ∞). Some parts of the table
-                          ;; below are therefore necessary, but some parts probably are not.
-                          ;; Which parts are necessary may depend on the latex version,
-                          ;; though, so we keep this table around to avoid regressions.
-                          (case c
-                            [(#\╔ #\═ #\╗ #\║ #\╚ #\╝ #\╦ #\╠ #\╣ #\╬ #\╩) (box-character c)]
-                            [(#\u2011) "\\mbox{-}"] ; non-breaking hyphen
-                            [(#\uB0) "$^{\\circ}$"] ; degree
-                            [(#\uB2) "$^2$"]
-                            [(#\u039A) "K"] ; kappa
-                            [(#\u0391) "A"] ; alpha
-                            [(#\u039F) "O"] ; omicron
-                            [(#\u03A3) "$\\Sigma$"]
-                            [(#\u03BA) "$\\kappa$"]
-                            [(#\u03B1) "$\\alpha$"]
-                            [(#\u03B2) "$\\beta$"]
-                            [(#\u03B3) "$\\gamma$"]
-                            [(#\u03BF) "o"] ; omicron
-                            [(#\u03C3) "$\\sigma$"]
-                            [(#\u03C2) "$\\varsigma$"]
-                            [(#\u03BB) "$\\lambda$"]
-                            [(#\u039B) "$\\Lambda$"]
-                            [(#\u03BC) "$\\mu$"]
-                            [(#\u03C0) "$\\pi$"]
-                            [(#\‘) "{`}"]
-                            [(#\’) "{'}"]
-                            [(#\“) "{``}"]
-                            [(#\”) "{''}"]
-                            [(#\u2013) "{--}"]
-                            [(#\u2014) "{---}"]
-                            [(#\〈) "$\\langle$"]
-                            [(#\〉) "$\\rangle$"]
-                            [(#\∞) "$\\infty$"]
-                            [(#\⇓) "$\\Downarrow$"]
-                            [(#\↖) "$\\nwarrow$"]
-                            [(#\↓) "$\\downarrow$"]
-                            [(#\⇒) "$\\Rightarrow$"]
-                            [(#\→) "$\\rightarrow$"]
-                            [(#\↘) "$\\searrow$"]
-                            [(#\↙) "$\\swarrow$"]
-                            [(#\←) "$\\leftarrow$"]
-                            [(#\↑) "$\\uparrow$"]
-                            [(#\⇐) "$\\Leftarrow$"]
-                            [(#\−) "$\\longrightarrow$"]
-                            [(#\⇑) "$\\Uparrow$"]
-                            [(#\⇔) "$\\Leftrightarrow$"]
-                            [(#\↕) "$\\updownarrow$"]
-                            [(#\↔) "$\\leftrightarrow$"]
-                            [(#\↗) "$\\nearrow$"]
-                            [(#\⇕) "$\\Updownarrow$"]
-                            [(#\א) "$\\aleph$"]
-                            [(#\′) "$\\prime$"]
-                            [(#\∅) "$\\emptyset$"]
-                            [(#\∇) "$\\nabla$"]
-                            [(#\♦) "$\\diamondsuit$"]
-                            [(#\♠) "$\\spadesuit$"]
-                            [(#\♣) "$\\clubsuit$"]
-                            [(#\♥) "$\\heartsuit$"]
-                            [(#\♯) "$\\sharp$"]
-                            [(#\♭) "$\\flat$"]
-                            [(#\♮) "$\\natural$"]
-                            [(#\√) "$\\surd$"]
-                            [(#\∆) "$\\Delta$"] ; no better mapping for than \Delta for "increment"
-                            [(#\u2211) "$\\sum$"] ; better than \Sigma, right?
-                            [(#\u220F) "$\\prod$"] ; better than \Pi, right?
-                            [(#\u2210) "$\\coprod$"]
-                            [(#\u222B) "$\\int$"]
-                            [(#\u222E) "$\\oint$"]
-                            [(#\¬) "$\\neg$"]
-                            [(#\△) "$\\triangle$"]
-                            [(#\∀) "$\\forall$"]
-                            [(#\∃) "$\\exists$"]
-                            [(#\∘) "$\\circ$"]
-                            [(#\θ) "$\\theta$"]
-                            [(#\τ) "$\\tau$"]
-                            [(#\υ) "$\\upsilon$"]
-                            [(#\φ) "$\\phi$"]
-                            [(#\δ) "$\\delta$"]
-                            [(#\ρ) "$\\rho$"]
-                            [(#\ε) "$\\epsilon$"]
-                            [(#\χ) "$\\chi$"]
-                            [(#\ψ) "$\\psi$"]
-                            [(#\ζ) "$\\zeta$"]
-                            [(#\ν) "$\\nu$"]
-                            [(#\ω) "$\\omega$"]
-                            [(#\η) "$\\eta$"]
-                            [(#\ι) "$\\iota$"]
-                            [(#\ξ) "$\\xi$"]
-                            [(#\Γ) "$\\Gamma$"]
-                            [(#\Ψ) "$\\Psi$"]
-                            [(#\Δ) "$\\Delta$"]
-                            [(#\Ξ) "$\\Xi$"]
-                            [(#\Υ) "$\\Upsilon$"]
-                            [(#\Ω) "$\\Omega$"]
-                            [(#\Θ) "$\\Theta$"]
-                            [(#\Π) "$\\Pi$"]
-                            [(#\Φ) "$\\Phi$"]
-                            [(#\±) "$\\pm$"]
-                            [(#\∩) "$\\cap$"]
-                            [(#\◇) "$\\diamond$"]
-                            [(#\⊕) "$\\oplus$"]
-                            [(#\∓) "$\\mp$"]
-                            [(#\∪) "$\\cup$"]
-                            [(#\△) "$\\bigtriangleup$"]
-                            [(#\⊖) "$\\ominus$"]
-                            [(#\×) "$\\times$"]
-                            [(#\⊎) "$\\uplus$"]
-                            [(#\▽) "$\\bigtriangledown$"]
-                            [(#\⊗) "$\\otimes$"]
-                            [(#\÷) "$\\div$"]
-                            [(#\⊓) "$\\sqcap$"]
-                            [(#\▹) "$\\triangleleft$"]
-                            [(#\⊘) "$\\oslash$"]
-                            [(#\∗) "$\\ast$"]
-                            [(#\⊔) "$\\sqcup$"]
-                            [(#\∨) "$\\vee$"]
-                            [(#\∧) "$\\wedge$"]
-                            [(#\◃) "$\\triangleright$"]
-                            [(#\⊙) "$\\odot$"]
-                            [(#\★) "$\\star$"]
-                            [(#\†) "$\\dagger$"]
-                            [(#\•) "$\\bullet$"]
-                            [(#\‡) "$\\ddagger$"]
-                            [(#\≀) "$\\wr$"]
-                            [(#\⨿) "$\\amalg$"]
-                            [(#\≤) "$\\leq$"]
-                            [(#\≥) "$\\geq$"]
-                            [(#\≡) "$\\equiv$"]
-                            [(#\⊨) "$\\models$"]
-                            [(#\≺) "$\\prec$"]
-                            [(#\≻) "$\\succ$"]
-                            [(#\∼) "$\\sim$"]
-                            [(#\⊥) "$\\perp$"]
-                            [(#\≼) "$\\preceq$"]
-                            [(#\≽) "$\\succeq$"]
-                            [(#\≃) "$\\simeq$"]
-                            [(#\≪) "$\\ll$"]
-                            [(#\≫) "$\\gg$"]
-                            [(#\≍) "$\\asymp$"]
-                            [(#\∥) "$\\parallel$"]
-                            [(#\⊂) "$\\subset$"]
-                            [(#\⊃) "$\\supset$"]
-                            [(#\≈) "$\\approx$"]
-                            [(#\⋈) "$\\bowtie$"]
-                            [(#\⊆) "$\\subseteq$"]
-                            [(#\⊇) "$\\supseteq$"]
-                            [(#\≌) "$\\cong$"]
-                            [(#\⊏) "$\\sqsubset$"]
-                            [(#\⊐) "$\\sqsupset$"]
-                            [(#\≠) "$\\neq$"]
-                            [(#\⌣) "$\\smile$"]
-                            [(#\⊑) "$\\sqsubseteq$"]
-                            [(#\⊒) "$\\sqsupseteq$"]
-                            [(#\≐) "$\\doteq$"]
-                            [(#\⌢) "$\\frown$"]
-                            [(#\∈) "$\\in$"]
-                            [(#\∋) "$\\ni$"]
-                            [(#\∝) "$\\propto$"]
-                            [(#\⊢) "$\\vdash$"]
-                            [(#\⊣) "$\\dashv$"]    
-                            [(#\☠) "$\\skull$"]
-                            [(#\☺) "$\\smiley$"]
-                            [(#\☻) "$\\blacksmiley$"]
-                            [(#\☹) "$\\frownie$"]
-                            [(#\ø) "{\\o}"]
-                            [(#\Ø) "{\\O}"]
-                            [(#\ł) "{\\l}"]
-                            [(#\Ł) "{\\L}"]
-                            [(#\uA7) "{\\S}"]
-                            [(#\〚) "$[\\![$"]
-                            [(#\〛) "$]\\!]$"]
-                            [(#\↦) "$\\mapsto$"]
-                            [(#\⊤) "$\\top$"]
-                            [(#\¥) "{\\textyen}"]
-                            [(#\™) "{\\texttrademark}"]
-                            [(#\u2070) "$^0$"]
-                            [(#\u00b9) "$^1$"]
-                            [(#\u00b2) "$^2$"]
-                            [(#\u00b3) "$^3$"]
-                            [(#\u2074) "$^4$"]
-                            [(#\u2075) "$^5$"]
-                            [(#\u2076) "$^6$"]
-                            [(#\u2077) "$^7$"]
-                            [(#\u2078) "$^8$"]
-                            [(#\u2079) "$^9$"]
-                            [(#\u207a) "$^+$"]
-                            [(#\u207b) "$^-$"]
-                            [(#\⋮) "\\vdots"]
-                            [(#\⋱) "$\\ddots$"]
-                            [(#\⋯) "$\\cdots$"]
-                            [(#\⋯) "\\hdots"]
-                            [else
-                             (cond
-                              [(char<=? #\uAC00 c #\uD7AF) ; Korean Hangul
-                               (format "\\begin{CJK}{UTF8}{mj}~a\\end{CJK}" c)]
-                              [else
-                               ;; Detect characters that can be formed with combining characters
-                               ;; and translate them to Latex combinations:
-                               (define s (string-normalize-nfd (string c)))
-                               (define len (string-length s))
-                               (cond
-                                [(len . > . 1)
-                                 (define combiner (case (string-ref s (sub1 len))
-                                                    [(#\u300) "\\`{~a}"]
-                                                    [(#\u301) "\\'{~a}"]
-                                                    [(#\u302) "\\^{~a}"]
-                                                    [(#\u303) "\\~~{~a}"]
-                                                    [(#\u304) "\\={~a}"]
-                                                    [(#\u306) "\\u{~a}"]
-                                                    [(#\u307) "\\.{~a}"]
-                                                    [(#\u308) "\\\"{~a}"]
-                                                    [(#\u30a) "\\r{~a}"]
-                                                    [(#\u30b) "\\H{~a}"]
-                                                    [(#\u30c) "\\v{~a}"]
-                                                    [(#\u327) "\\c{~a}"]
-                                                    [(#\u328) "\\k{~a}"]
-                                                    [else #f]))
-                                 (define base (string-normalize-nfc (substring s 0 (sub1 len))))
-                                 (if (and combiner
-                                          (= 1 (string-length base)))
-                                     (format combiner (char-loop (string-ref base 0)))
-                                     c)]
-                                [else c])])])
-                          c)])))
-                (loop (add1 i))))))]))
-    
-    
-    (define/private (box-character c)
-      (define (combine . args) 
-        (apply string-append
-               "\\setlength{\\unitlength}{0.05em}"
-               (filter (λ (x) (not (regexp-match #rx"^[ \n]*$" x)))
-                       (flatten args))))
-      (define (adjust % v) 
-        (define num (* % (/ v 10) 10))
-        (define i-part (floor num))
-        (define d-part (floor (* 10 (- num i-part))))
-        (format "~a.~a" i-part d-part))
-      (define (x v) (adjust 1 v))
-      (define (y v) (adjust 6/4 v))
-      (define upper-horizontal @list{\put(@x[0],@y[6]){\line(1,0){@x[10]}}})
-      (define lower-horizontal @list{\put(@x[0],@y[4]){\line(1,0){@x[10]}}})
-      (define righter-vertical @list{\put(@x[6],@y[10]){\line(0,-1){@y[10]}}})
-      (define lefter-vertical @list{\put(@x[4],@y[10]){\line(0,-1){@y[10]}}})
-      (define bottom-right @list{\put(@x[6],@y[4]){\line(1,0){@x[4]}}
-                                 \put(@x[6],@y[0]){\line(0,1){@y[4]}}})
-      (define bottom-left @list{\put(@x[0],@y[4]){\line(1,0){@x[4]}}
-                                \put(@x[4],@y[0]){\line(0,1){@y[4]}}})
-      (define upper-right @list{\put(@x[6],@y[6]){\line(1,0){@x[4]}}
-                                \put(@x[6],@y[10]){\line(0,-1){@y[4]}}})
-      (define upper-left @list{\put(@x[0],@y[6]){\line(1,0){@x[4]}}
-                               \put(@x[4],@y[10]){\line(0,-1){@y[4]}}})
-      (define header @list{\begin{picture}(@x[10],@y[10])(0,0)})
-      (define footer @list{\end{picture}})
-                              
-      (case c
-        [(#\╔)
-         @combine{@header
-                   \put(@x[4],@y[6]){\line(1,0){@x[6]}}
-                   \put(@x[4],@y[0]){\line(0,1){@y[6]}}
-                   @bottom-right
-                   @footer}]
-        [(#\═) @combine{@header
-                         @upper-horizontal
-                         @lower-horizontal
-                         @footer}]
-        [(#\╗) @combine{@header
-                         \put(@x[0],@y[6]){\line(1,0){@x[6]}}
-                         \put(@x[6],@y[0]){\line(0,1){@y[6]}}
-                         @bottom-left
-                         @footer}]
-        [(#\║) @combine{@header
-                         @lefter-vertical
-                         @righter-vertical
-                         @footer}]
-        [(#\╚) @combine{@header
-                         @upper-right
-                         \put(@x[4],@y[4]){\line(1,0){@x[6]}}
-                         \put(@x[4],@y[10]){\line(0,-1){@y[6]}}
-                         @footer}]
-        [(#\╝)
-         @combine{@header
-                   @upper-left
-                   \put(@x[0],@y[4]){\line(1,0){@x[6]}}
-                   \put(@x[6],@y[10]){\line(0,-1){@y[6]}}
-                   @footer}]
-        [(#\╣)
-         @combine{@header
-                   @upper-left
-                   @bottom-left
-                   @righter-vertical
-                   @footer}]
-        [(#\╠)
-         @combine{@header
-                   @upper-right
-                   @bottom-right
-                   @lefter-vertical
-                   @footer}]
-        [(#\╩)
-         @combine{@header
-                   @upper-right
-                   @upper-left
-                   @lower-horizontal
-                   @footer}]
-        [(#\╦)
-         @combine{@header
-                   @bottom-right
-                   @bottom-left
-                   @upper-horizontal
-                   @footer}]
-        [(#\╬)
-          @combine{@header
-                   @upper-left
-                   @bottom-left
-                   @upper-right
-                   @bottom-right
-                   @footer}]))
-
-    ;; ----------------------------------------
-
-    (define/override (table-of-contents sec ri)
-      ;; FIXME: isn't local to the section
-      (make-toc-paragraph plain null))
-
-    (define/override (local-table-of-contents part ri style)
-      (make-paragraph plain null))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/.gitignore b/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/.gitignore
deleted file mode 100644
index 6c77022ded..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# to avoid committing it by accident, since we can't distribute it
-/llncs.cls
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang.rkt
deleted file mode 100644
index 11ab79ba4a..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang.rkt
+++ /dev/null
@@ -1,195 +0,0 @@
-#lang racket/base
-(require scribble/doclang
-         scribble/core
-         racket/file
-         (except-in scribble/base author)
-         (prefix-in s/b: scribble/base)
-         scribble/decode
-         "../private/defaults.rkt"
-         setup/collects
-         scribble/html-properties
-         scribble/latex-properties
-         scribble/latex-prefix
-         racket/stxparam
-         net/ftp
-         file/gunzip
-         (for-syntax racket/base
-                     racket/list
-                     racket/stxparam-exptime))
-
-(module test racket/base)
-
-(provide (except-out (all-from-out scribble/doclang) #%module-begin)
-         (all-from-out scribble/base)
-         (rename-out [module-begin #%module-begin])
-         abstract include-abstract
-         authors author
-         institute institutes
-         email)
-
-(define-syntax (module-begin stx)
-  ;; No options, currently, but keep in case we want to support some:
-  (syntax-case* stx () (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
-    [(_ id ws . body)
-     ;; Skip intraline whitespace to find options:
-     (and (string? (syntax-e #'ws))
-          (regexp-match? #rx"^ *$" (syntax-e #'ws)))
-     #'(module-begin id . body)]
-    [(_ id . body)
-     #'(#%module-begin id (post-process) () . body)]))
-
-(define cls-file
-  (let ([p (scribble-file "lncs/llncs.cls")])
-    (if (file-exists? (collects-relative->path p))
-        p
-        (downloaded-file "llncs.cls"))))
-
-(define ((post-process) doc)
-  (add-defaults doc
-                (string->bytes/utf-8 (string-append "\\documentclass{llncs}\n"
-                                                    unicode-encoding-packages))
-                (scribble-file "lncs/style.tex")
-                (list cls-file)
-                #f))
-
-(define lncs-extras
-  (let ([abs (lambda (s)
-               (path->collects-relative
-                (collection-file-path s "scribble" "lncs")))])
-    (list
-     (make-css-addition (abs "lncs.css"))
-     (make-tex-addition (abs "lncs.tex")))))
-
-(unless (or (not (path? cls-file))
-            (file-exists? cls-file))
-  (log-error (format "File not found: ~a" cls-file))
-  (define site "ftp.springer.de")
-  (define path "pub/tex/latex/llncs/latex2e")
-  (define file "llncs2e.zip")
-  (unless (directory-exists? (find-system-path 'addon-dir))
-    (make-directory (find-system-path 'addon-dir)))
-  (log-error (format "Downloading via ftp://~a/~a/~a..." site path file))
-  (define c (ftp-establish-connection site 21 "anonymous" "user@racket-lang.org"))
-  (ftp-cd c path)
-  (make-directory* (find-system-path 'temp-dir))
-  (ftp-download-file c (find-system-path 'temp-dir) file)
-  (ftp-close-connection c)
-  (define z (build-path (find-system-path 'temp-dir) file))
-  ;; Poor man's unzip (replace it when we have an `unzip' library):
-  (define i (open-input-file z))
-  (define (skip n) (file-position i (+ (file-position i) n)))
-  (define (get n) 
-    (define s (read-bytes n i))
-    (unless (and (bytes? s) (= n (bytes-length s)))
-      (error "unexpected end of file"))
-    s)
-  (let loop ()
-    (cond
-     [(equal? #"PK\3\4" (get 4))
-      ;; local file header
-      (skip 2)
-      (define data-desc? (bitwise-bit-set? (bytes-ref (get 1) 0) 3))
-      (skip 11)
-      (define sz (integer-bytes->integer (get 4) #f #f))
-      (skip 4)
-      (define name-sz (integer-bytes->integer (get 2) #f #f))
-      (define extra-sz (integer-bytes->integer (get 2) #f #f))
-      (define name (bytes->string/utf-8 (get name-sz) #\?))
-      (skip extra-sz)
-      (if (equal? name "llncs.cls")
-          (call-with-output-file cls-file
-            (lambda (o)
-              (inflate i o)))
-          (begin
-            (skip sz)
-            (when data-desc?
-              skip 12)
-            (loop)))]
-     [else (error "didn't find file in archive")]))
-  (close-input-port i)
-  (delete-file z))
-
-;; ----------------------------------------
-;; Abstracts:
-
-(define abstract-style (make-style "abstract" lncs-extras))
-
-(define (abstract . strs)
-  (make-nested-flow
-   abstract-style
-   (decode-flow strs)))
-
-(define (extract-abstract p)
-  (unless (part? p)
-    (error 'include-abstract "doc binding is not a part: ~e" p))
-  (unless (null? (part-parts p))
-    (error 'include-abstract "abstract part has sub-parts: ~e" (part-parts p)))
-  (when (part-title-content p)
-    (error 'include-abstract "abstract part has title content: ~e" (part-title-content p)))
-  (part-blocks p))
-
-(define-syntax-rule (include-abstract mp)
-  (begin
-    (require (only-in mp [doc abstract-doc]))
-    (make-nested-flow abstract-style (extract-abstract abstract-doc))))
-
-;; ----------------------------------------
-;; Author
-
-(define-syntax (author stx)
-  (raise-syntax-error 'author "can only be used inside 'authors'" stx))
-(define-syntax (authors stx)
-  (syntax-case stx (author)
-    [(_ (author . args) ...)
-     #`(paragraph
-        (style 'author '())
-        (make-element (style "LNCSauthor" lncs-extras)
-                      (decode-content
-                       (list
-                        #,@(apply 
-                            append
-                            (add-between
-                             (for/list ([stx (in-list (syntax->list #'(args ...)))])
-                               (syntax-case stx ()
-                                 [(#:inst string rest ...)
-                                  (append (syntax->list #'(rest ...))
-                                          (list #'(element (style "LNCSinst" lncs-extras) (decode-content (list string)))))]
-                                 [(rest ...)
-                                  (syntax->list #'(rest ...))]))
-                             (list #'(element (style "LNCSand" lncs-extras) '()))))))))]
-    [(_ . rest)
-     (raise-syntax-error 'authors "expected a sequence of authors" stx)]))
-
-(define-syntax-parameter email-ok #f)
-
-(define-syntax (institute stx)
-  (raise-syntax-error #f "can only be used inside 'institutes'" stx))
-(define-syntax (institutes stx)
-  (syntax-case stx (author)
-    [(_ (inst . args) ...)
-     #`(syntax-parameterize 
-        ((email-ok #t))
-        (paragraph 
-         (style 'author '())
-         (make-element (style "LNCSinstitutes" lncs-extras)
-                       (decode-content
-                        (list
-                         #,@(apply 
-                             append
-                             (add-between
-                              (for/list ([stx (in-list (syntax->list #'(args ...)))])
-                                (syntax-case stx ()
-                                  [(rest ...)
-                                   (syntax->list #'(rest ...))]))
-                              (list #'(element (style "LNCSand" lncs-extras) '())))))))))]
-    [(_ . rest)
-     (raise-syntax-error 'institutes "expected a sequence of institutes" stx)]))
-
-(define-syntax (email stx)
-  (syntax-case stx ()
-    [(_ . args)
-     (begin
-       (unless (syntax-parameter-value #'email-ok)
-         (raise-syntax-error 'email "email can appear inside institutes only"))
-       #'(make-element (style "LNCSemail" lncs-extras)
-                       (decode-content (list . args))))]))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang/reader.rkt
deleted file mode 100644
index 6bac48ba2c..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang s-exp scribble/base/reader
-scribble/lncs/lang
-#:wrapper1 (lambda (t) (cons 'doc (t)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lncs.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lncs.tex
deleted file mode 100644
index 6125813c05..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lncs.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\newcommand{\LNCSand}{\and}
-
-\newcommand{\LNCSauthor}[1]{\author{#1}}
-\newcommand{\LNCSinst}[1]{\inst{#1}}
-
-\newcommand{\LNCSinstitutes}[1]{\institute{#1}}
-\newcommand{\LNCSinstitute}[1]{#1}
-
-\newcommand{\LNCSemail}[1]{\email{#1}}
-
-\renewcommand{\SAuthorSep}{}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/style.tex
deleted file mode 100644
index 9d57aab1e4..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/style.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-
-\renewcommand{\titleAndVersionAndAuthors}[3]{\title{#1}\titlerunning{#2}#3\maketitle}
-\renewcommand{\titleAndEmptyVersionAndAuthors}[3]{\titleAndVersionAndAuthors{#1}{#1}{#3}}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lp-include.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lp-include.rkt
deleted file mode 100644
index d355865202..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/lp-include.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scheme/base
-
-(require scheme/include (for-syntax scheme/base)
-          (only-in scribble/private/lp chunk CHUNK)
-          scribble/manual)
-
-(provide lp-include)
-
-(define-syntax (module stx)
-  (syntax-case stx (#%module-begin)
-    [(module name base (#%module-begin body ...))
-     #'(begin body ...)]
-    [(module name base body ...)
-     (raise-syntax-error #f "missing #%module-begin" stx)]))
-
-(define-syntax (lp-include stx)
-  (syntax-case stx ()
-    [(_ name)
-     (with-syntax ([there (datum->syntax stx 'there)])
-       #'(include-at/relative-to here there name))]))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lp.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lp.rkt
deleted file mode 100644
index 68fbcaf989..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/lp.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require scribble/private/lp)
-(provide chunk CHUNK)
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/lang.rkt
deleted file mode 100644
index 6e1e69e8e1..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/lang.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang racket/base
-
-(provide (except-out (all-from-out racket/base) #%module-begin)
-         (rename-out [module-begin #%module-begin]))
-
-(require (for-syntax racket/base syntax/boundmap racket/list
-                     syntax/strip-context))
-
-(begin-for-syntax
-  (define first-id #f)
-  (define main-id #f)
-  (define (mapping-get mapping id)
-    (free-identifier-mapping-get mapping id (lambda () '())))
-  ;; maps a chunk identifier to its collected expressions
-  (define chunks (make-free-identifier-mapping))
-  ;; maps a chunk identifier to all identifiers that are used to define it
-  (define chunk-groups (make-free-identifier-mapping))
-  (define (get-chunk id) (mapping-get chunks id))
-  (define (add-to-chunk! id exprs)
-    (unless first-id (set! first-id id))
-    (when (eq? (syntax-e id) '<*>) (set! main-id id))
-    (free-identifier-mapping-put!
-     chunk-groups id
-     (cons id (mapping-get chunk-groups id)))
-    (free-identifier-mapping-put!
-     chunks id
-     `(,@(mapping-get chunks id) ,@exprs))))
-
-(define-syntax (tangle stx)
-  (define chunk-mentions '())
-  (define stupid-internal-definition-sytnax
-    (unless first-id
-      (raise-syntax-error 'scribble/lp "no chunks")))
-  (define orig-stx (syntax-case stx () [(_ orig) #'orig]))
-  (define (restore nstx d) (datum->syntax orig-stx d nstx nstx))
-  (define (shift nstx) (replace-context orig-stx nstx))
-  (define body
-    (let ([main-id (or main-id first-id)])
-      (restore
-       main-id
-       (let loop ([block (get-chunk main-id)])
-         (append-map
-          (lambda (expr)
-            (if (identifier? expr)
-                (let ([subs (get-chunk expr)])
-                  (if (pair? subs)
-                      (begin (set! chunk-mentions (cons expr chunk-mentions))
-                             (loop subs))
-                      (list (shift expr))))
-                (let ([subs (syntax->list expr)])
-                  (if subs
-                      (list (restore expr (loop subs)))
-                      (list (shift expr))))))
-          block)))))
-  (with-syntax ([(body ...) body]
-                ;; construct arrows manually
-                [((b-use b-id) ...)
-                 (append-map (lambda (m)
-                               (map (lambda (u)
-                                      (list (syntax-local-introduce m) 
-                                            (syntax-local-introduce u)))
-                                    (mapping-get chunk-groups m)))
-                             chunk-mentions)])
-    #`(begin body ... (let ([b-id (void)]) b-use) ...)))
-
-(define-for-syntax (extract-chunks exprs)
-  (let loop ([exprs exprs])
-    (syntax-case exprs ()
-      [() (void)]
-      [(expr . exprs)
-       (syntax-case #'expr (define-syntax quote-syntax)
-         [(define-values (lifted) (quote-syntax (a-chunk id body ...)))
-          (eq? (syntax-e #'a-chunk) 'a-chunk)
-          (begin
-            (add-to-chunk! #'id (syntax->list #'(body ...)))
-            (loop #'exprs))]
-         [_ 
-          (loop #'exprs)])])))
-
-(define-syntax (module-begin stx)
-  (syntax-case stx ()
-    [(_ id exprs . body)
-     (let ([expanded 
-            (expand `(,#'module scribble-lp-tmp-name scribble/private/lp
-                                ,@(strip-context #'(id exprs . body))))])
-       (syntax-case expanded ()
-         [(module name lang (mb . stuff))
-          (begin (extract-chunks #'stuff)
-                 #'(#%module-begin (tangle id)))]))]))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/reader.rkt
deleted file mode 100644
index bc2e2f8b57..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/reader.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang s-exp syntax/module-reader
-
-scribble/lp/lang/lang
-
-#:read read-inside
-#:read-syntax read-syntax-inside
-#:whole-body-readers? #t
-;; don't use scribble-base-info for the #:info arg, since
-;; scribble/lp files are not directly scribble'able.
-#:language-info (scribble-base-language-info)
-#:info (scribble-base-reader-info)
-(require scribble/reader
-         (only-in scribble/base/reader
-                  scribble-base-reader-info
-                  scribble-base-language-info))
-
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-fonts.css b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-fonts.css
deleted file mode 100644
index 39656bb44e..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-fonts.css
+++ /dev/null
@@ -1,343 +0,0 @@
-@font-face {
-font-family: Miso;
-font-style: normal;
-font-weight: bold;
-font-stretch: normal;
-src: url('data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAHdYABIAAAAA6+QAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABlAAAABsAAAAcWKVOlUdERUYAAAGwAAAAMgAAADgCOwEYR1BPUwAAAeQAAAI9AAAD2oWehkVHU1VCAAAEJAAAACAAAAAgbJF0j09TLzIAAAREAAAATwAAAGBUxfv3Y21hcAAABJQAAAF6AAAByvcaQbFjdnQgAAAGEAAAABQAAAAUBFcDjmZwZ20AAAYkAAABsQAAAmUPtC+nZ2FzcAAAB9gAAAAMAAAADAADAAdnbHlmAAAH5AAAaEkAANdUo5qVqmhlYWQAAHAwAAAANQAAADb072YQaGhlYQAAcGgAAAAjAAAAJAasBCdobXR4AABwjAAAAf0AAAOQU8wbimxvY2EAAHKMAAABvgAAAcrEFY2qbWF4cAAAdEwAAAAgAAAAIAIBAj5uYW1lAAB0bAAAAPcAAAGwIvo+0HBvc3QAAHVkAAABtAAAApckNFmrcHJlcAAAdxgAAABAAAAAQF7Lu3l42mNgYGBkAIJjV/RmgugTL/r/Qul/AFaVCNwAeNpjYGRgYOADYgMGEGBiYGVgZGAHYg4gZGLgZKgFsusYGoDsRobHQDYLWBUDAD8RA1QAAHjabZMxaFNBHMa/u5fWNsVqJZOgCEbEQcWqpAlxizFKkdjSaGsKijgpoah0cnJ0cHASySAO6dqxPBxEguMbzbODSOaHkzj2+bvrM7Yij+/u3b3v++67/92TkZTXCVVkHt9/1tGEcswoTWXpjOyDtadrmn708ElHBT8j3/JF45r2Y6PDGfsSyGtMB/hi6Yu6wvwLvdFRvdU7XdAnnjn1ecoyQcGvdlJNreu5XumDPuu7dkzBVExN6+al+Wh+2Dlbt03alr1H27Qd27Xvbd9+sz/tjnuCXJAPcppUKY1UTmNVQJX35fSXVkAbDNJQ28CoyCjn2zKogGqaaEqH0teaAUXUNWYbzM7TL9Av0ffABtgCFnYCO6EKsxnX8e741RI4CVUopewTVEAVtHEepD1ybLrqwC3B202R+BST/6RIcHYJ3OoJqyfZ6qUs9Qz8TfibOob/cVBk3y5RjbkG+533yUJ2EJIupB4hOUL8hvhF+A11EJcuLl1chrgM/eq7LhEuEQ4R6jhTxV7lKtZD1UMVo4ozVYIqRhWjir2qDfvIHnYEO8qSOnbok97I0jbZxS3gUi/St3zyPqcZ6S4I9p2r9SP3ZrLxgJu6DYJR7VzNpkaVcmdbz77chrcM2mDv+RrvP4EmRBNm9+HPSfzljcPow+jvY7TA2H+1dvRmfG53G0Nmr5GrhYvhbyjqlE7rjM7qnM5rVhd1WSX+mjJ/aVU1XVVdDV3XTS1oUUtqsYMVdrCqnja0pS9U4Otv7MiEyAAAAAABAAAACgAcAB4AAWxhdG4ACAAEAAAAAP//AAAAAAAAeNpjYGJ0YNrDwMrIwrSHqYuBgaEHQjPeZTBi+MWABBoYGNYDKS4Y39/XMYhBkUFBUYlp4X91BiPmMoY7QGFGkBzjTaYJQEqBgQkAurkOAQB42mNgYGBmgGAZBkYGEDgC5DGC+SwMK4C0GoMCkMXGUMfwnzGYsYLpGNMdBS4FQQURBSkFOQUlBTUFfQUrhXiFNYpK//8D1SswLGAMgqpjUBBQEFaQUJCBqrOEqfv/+P+h/wX/ff7+//vqwfEHhx4cfLDvwd4Hux5sf7D+wbIHTQ/M7h+EuocIwMjGAFfMyAQkmNAVAL3IwsrGzsHJxc3Dy8cvICgkLCIqJi4hKSUtIysnr6CopKyiqqauoamlraOrp29gaGRsYmpmbmFpZW1ja2fv4Ojk7OLq5u7h6eXt4+vnHxAYFBwSGhYeERkVHRMbF5+QyNDW3tk9eca8xYuWLFu6fOXqVWvWrl+3YePmrVu27di+Z/fefQxFKamZdyoWFmQ/Lsti6JjFUMzAkF4Odl1ODcOKXY3JeSB2bu3dpKbW6YcOX7l689a16zsZDh5heHT/AVCm8sZthpae5t6u/gkT+6ZOY5gyZ+5shqPHCoFSVUAMAFWlgaEAAP8n//MB2QKQAqEAYABgAFoAVQBReNpdUbtOW0EQ3Q0PA4HE2CA52hSzmZAC74U2SCCuLsLIdmM5QtqNXORiXMAHUCBRg/ZrBmgoU6RNg5ALJD6BT4iUmTWJojQ7O7NzzpkzS8qRqndpveepcxZI4W6DZpt+J6TaRYAH0vWNRkbawSMtNjN65bp9v4/BZjTlThpAec9bykNG006gFu25fzI/g+E+/8s8B4OWZpqeWmchPYTAfDNuafA1o1l3/UFfsTpcDQaGFNNU3PXHVMr/luZcbRm2NjOad3AhIj+YBmhqrY1A0586pHo+jmIJcvlsrA0mpqw/yURwYTJd1VQtM752cJ/sLDrYpEpz4AEOsFWegofjowmF9C2JMktDhIPYKjFCxCSHQk45d7I/KVA+koQxb5LSzrhhrYFx5DUwqM3THL7MZlPbW4cwfhFH8N0vxpIOPrKhNkaE2I5YCmACkZBRVb6hxnMviwG51P4zECVgefrtXycCrTs2ES9lbZ1jjBWCnt823/llxd2qXOdFobt3VTVU6ZTmQy9n3+MRT4+F4aCx4M3nfX+jQO0NixsNmgPBkN6N3v/RWnXEVd4LH9lvNbOxFgAAAAAAAAIABAAC//8AA3jazL0LlBxXdSh6TnV3VX+qqquq/5/p7unu6Z7pnpme6Z5fj+YnaUaSJUuWsWRLsvFHFhBC4jiBGwTkBnwxn4C4sROvPB4kYFYSFi/h5VV1j0mewg0TrhcoCeRyCQwQnFzIJQ8cjFES7kockPT2Pqequ3pmZOOb3LWu7KnPOdXdp/bZZ//P3kQgtRvPkQ8Jv0AkEiGHSYdSUt/0+UjJW6dmtGF6tjclEe/sU1eVPP66FRGfNSMNSxWftWK0bqkR3ehSr4+UE20yNR0vVmbmmvGoB48xPSoWK7O/MFUsThV/Mjuahf+jRbwTVqLZbPT6w3gkhAhkin6OTgmPkRBJkCXSCXtI3SStzZiPhLx1U2yyFvuWmsmGmdi2DBiJoVkBGIUXRpOidRiA0YwPUfzZZToj4SD43exz7Nef5IMQHstGL+BvX4hG+ckZh/fG8/SzwvvIPrJK3kk6UYCJGWrBD1pSuNWyhnzPWnSl2TQLDYssQcMINEzMNpudkUKw3l0bqQXq5nSTmmsNM75t5SrNpqXD2MaX4ZG4jo/EM/BIsWnqmqXCyCeX4JEAPEJm4JGAio8EfPDIQtPaz96IxloAULFOY/y1Ss4ZQb2Pzjpn/rIt58w+I8Ra9MG5SCYTmctU0hvwNx9JpyPz/JiuZDbgj/U/vrFBfxLvfg/vfo8f7c98EJ/+ID/iZwglszeepq8T/oAcI39IzGBjM+8jMkzURmNzil1R89aGObpt3QJzdItmjcObtuBSLmzrlgQXLc0qheqWAJfzTes4rZtz6ctfeeufv57E6kHVrGjmyJZ1zPeCSbZIl4xUjk3CP9q7MtfS1LplVDesRKbdNsd1M9s2JaMTzE+14b6lmwfapmCY+9vEygfhMVGB5g29k5hfxgemDHO8DaCNJ6KSKNkArVQrszPzc/NzrWYijv+1mvNzs5UGrcxWoNkGLLTH8ENiqVit4H+loiTGognaWBTaiSJg10peFHx6SBalSFAfEsWkkRQS/x56oyXo3TfkF3wG6w0pOVGM67E4bU0fvXU6KlcRD6vROd4rUlHPeqkWzQ/rr5k4dst0hD8waszKsijyB1I+GjYy+QjxkeSN7wqLwuPETzSSIsNkH5VJx4cYPNHaDPrIorfeWcSFlWxtDrPbTZVOLCpw4ndDUXY3xO6ouYQ4vJkR8c7MaFae1jcNfgfLToI7jd9pmiXDnYfdWct8Mtu/+a0JPpmzmjm3ZY3BZI7CZI6Ozc7xyXSu2GRm4rrRiSZbODt53Zxom4ZhRVLttqVJMH8+Au2ybi62TY/Rod4KPEesoA+6PPAZU9VNqW1SwxTa1lBUN0yjbQ7rZrxtLhqWDk9PTZdxRQAlmIk352YqRTEq8Nu5phjlTSN8bmlvcgEdKMMH+osPnTjx0ImfHc1kRjMXTuDNqzN4Q/cbosd3/Tv+iN8fCuI1TbLrH8JDxxfm7ae+zm7sz9/JH772SUMSfPxaWIdrQjykcOO79P+DOVwlt5H76EdIxwvzZ93re7aTgJmzbvE9S837G2Zw2zoDS0fH5XQcLs5o1kFYYjmgIw9w8Dc/8NX/ysEva+b+LetOAH9h6/Lnz331m7w5rJkrW9Zt0NzcgpuuEl6J1K3wih8+0FXk/ZH65c/f89W/hodD2K1it3mb1h2+rQnP3db0m3fCzZ0FfI5/aQi7i9jdncYjfmzV+dha72Pw9Wu7vv4OfK57ih1P90YCv3Aaf6ED31p4T+E9JVGHeZ1ud2A0eHVH2zzVNlfbZM2QFTVcGC5ON1dW1/bfdsep03dO7vpHf7zHGD4ePA746E3ci/iY080SYNu9XsArQMBb9G5QHz0MDG9qesSFK6sUSYVNQVo5isgUpnnaJyl4j8cY+1QJSIsHKMwMfLxoU5HIHH4Lu2QEiJ4p3RKNTNWXQp7SLcueZCQ6MlzxeGsbulZor8tGKCL6FFn3CVLlcFDQFM3ricpTvzYmi8qwIKR1yb80pKdLM4th6s3o0cDyPsOXqx0Oq3OT957wjtSrxZGYIUxUisMTY7ecVfOGj/rhO0UltPpKVfMIUTno0VbpfbNhLSRnhUxIU5TrD4mZ2sT60UhCEoeiMvBNivybPMb4d4N0AsirPYxXu6+pKTdM37ZFkNvBn8LYW8Rm1igvPMbZM/2RiylTMnrjg9QvfINUgKZRs9owtW2rJD7bKWnALElJAGY51LRG2be5oYuzwmZjvsnAH+V0G0F7LeTR+OttlIrF0oYc9XgAeJ7QviH4F4crb0QBeN594cFnHrxwd9gTVCJeeOLomXNnzp49Q9g7e2/8NvmW8Hf9cUW3LQrjilIcV1SFcaWdcRnsp6Uiw5UZjiRs4gFhZjnCIMv5Vqm0LkcFNrjgvtzQUG5fkA0MZnW9RM0vvPYn7tIEezC33glDOXfnrfZoPeG7foKNq0BF+jaQYTbId2BchxqmtG2Wmghys9a0DnP6kP/hlcc4IYhqZn3L8ksvmPNbl7/hc5rjmrmxZRWhub3lhbsuiW/AUvZrXck/D6vXfjKEXTHssuIbfviybixaj9S9ZlHrlopt+AQ01bCp/wnoWsAuq9j24xcu4BeSNZVI/mgsXizV6vML7Y2dazfIOnd04VpFJLJZuItww0Kqujh63hGQ+mtREnE1utj5dZB1VmTZJxoBoMzayooG6ypgiKIcWgG5ZxnY8s4unyzTtxxGYelwSaKM68Mj5TL/FD5UOoxyE/TCxwZ7dR+VGH6Ti/QivUIy5BXEVGGJtKyI71mTNDtqBMVBNRiodyJMMowkA7CMsg1T3jajTSZJpZsdScY+yQOPyRJeynqgbg1x6XFQdhyQFekRXGJHYMX1LuhJ9x2/wDEO3/gI+RB5JYxxiZhGY9Nvr2gYSnLb9DU3FZGkQISQ2QloPBPthAYbheU3gHL6gFwm5paRRMIQuGA+MF/eQjpSiGSGM8GA36/7vV5JpD6vXED4TeWmQ16PZAQCAb/OYHYVYHaS6QsmaVg+kMN9yBzlhk1X5vmr4uuXzuB7XGUHTmHYOqmA/vMBcj/oP7OkI1FOp0DRcV9T098w6famj2tC/IQqB/zCHNN0AK5MpVGZloPfW73xn+mbhP8XZLAVWH/phpXhS26p8nfDfG1FNDO6ZUnAe0WQiEDWi3KJyLmysdqWNT1uMEW4PHI24vd5rwI8gv5AJOD1wGUw6Bee4i3Xfgrb+LXwBFwz3Wb0xnP0ItBoBWZxkXQIShYxkCwklCxUBF4WtT5Hr0qCQBECMg0zaCVhAi0JZDAksSA06TMwCKbfeYoinIBTzUFj5QuHzp8/tPHggxu5Wi03VK9Hzx+ip7Dt+scPnRfWa7nrH8ceeipX4zR0DcaUFH6FxEiJdDQYETXjDTOybclASCOI1yTiBWROcF4BwAY2y1awrVzqkvgr6mhWvRjWg8EcTG1KpJ9Rs6PQ4AsNX/skTjr9QkrCt71xlf40yFaz5BLpDOHbx+Htg/j24/j2cw2zsm1p8PappjXP52zhg39Txjkz45OqaWxZJZiz8hbSvEjcAFkliscOHLl4oqJUEmmTTSMSLZU54XoKruP2DZ9ZaxyFXa0y00a5NLJD7wAhQRAlW+cr2pPOeQUKCZxWrQPLF0sHEvFadTkiRdbnqsrj+KrfSIcl31/4PYGUrgdDaT0YkUSZ/ksIT6F9ETFWOJhKjo488qpbMgCrREgJyfQxTQ+FhpSAR0rDt/J5GQI59F7AlRPk1aTTRlgdB1gdb+OEHN8AQjPm4dizKUvtMaVuyQjB2xB/zHDTmgEgTjY7nhmkRh6gX9ZJwKIZD5CBaZCkZIldmDG9kxoqMSjMr1AQAiqMQAEy4bX7fd2kPJGjQDukXQTErbj9SSJXyyFA4JQIBlUlLnMYINyys4VCPL6w0WptLCQS+fxstqewheS4Gg6ckCqppVwNIFTLjSarokcMxPCD/CuaMUVU726PHp6ePrzUvluVlHjT1tjga2IBEeCXArz+FcC1Gvkc6VQBfp0QCkIkWg0pdTPbsghQ+GKzEyUIoWgKyXq9YY5tm7GmVQboZZqd8hj2lQuBejdcHvPXGbmXGlYYloYUZiQfl8a4TV2uPfd+xFSvKQGqiluW7nvBB2Tm8tKPnvs/GNsFRmxEdUBXOPbRFemPbtj0Rzd69McKj8GaT1ZB/i3rVqrC1v580UWEuDwLqDpgcnBYzdGUGhAuiUYw5PcPC9PLwTsBnAWckgJcXIwqYclP/yAS8Alykaof+MPyPdh3D/TxC46Hc4CHbxQukYPkTaSTQTxsAB42MoiHjSpIWIsNS4OWRZQF1xYPQIvSsERExvWGKWybw000VXVUAT+BnNRUNWsGkDEOpG0DDVgCrMVqfQUF/RndHAf0XGwAeq60TU03VbZAkd7tczhpDwNvinw2Lrvx9+5yNvoFfK8nh7Lx2PzGxnwiXsjPuGwBckIJBwKJHENXOSH7w/6ARLXACEU8Hs1eCiLSPbR4ThXleNM2AHB8A+E/9ZCNpqroRVo/Dfj3CKzfOpknD9i0vgVwQnEcrVibIxMkAMt2BCG1wMj+lIgYaU5p1iyAZQzA04bz7JRudAMpMgLqjjmmm2GAz8gEwKfUNod0Kx3DxWuzBLdoNWAfUQFcyDAQaEJRhFOcLfGvbTy4sRCPFwqwAqlom0yUhKwGgsnccBUYx+hSrbZUY2wEVpqoxAZXmkesJs9o5w9dOHSenqrlLiBzuZCDtx0BvPl5wJs8eSvpRNAGkm1Yflhzfm2T2haqAntt0Jk7OQ9iT06G1TTMV9PK1NW/YXQ/C4sptQXs8QUzvGWmtG46lYUlBEf3ElLDqTRbQpt4lXWLpgbXbgB9Bpg5qotz86VY9LWjKJYkwkF6CWmQJI4Ic1OJt9NnstGT0ayhaKJ4bSsakoRQ2eP/6y/dUYiincDh5QkyQlrkNfYMT8EMyzjDRZjhzBiRYYYzOMMzjDD7m9YETHKyaU5oVgteNNe0YtAABBunfALJs4jWM0tGc0sMrSjEyiAdMER7nuFd5tkL8enkVNjDBABOv8VYhJ1wklEq+MLGg63WgxuHzjeb5/9jfYgLBo8x6QBuYGaXkA6PopAweqjZPLQEU/klfGoUD9e/g8clPDAZJg/z+jPw3jWygJwJJQarDG9dZrpgOQuciYkzdQAAaWoSAIAgANpsrhvwsg0NVTJztsmEm0V47wa8txXPwhuP6l1JKzBTttUkAI2xNhMk7fdFkeMma54teRSG7NdGWHwWBaFD52GpMx4jMR4jAYbLCVU1EoDgHAa1ZxgCo5AEq5txE2XH6j6judC7BnBgsit9BmTXMGkP2O7NQGNTsWVXjU17sGlb8E3VubJ0Jk851nrBPl9kMiz/nxvq6Tl2YrBnOgD8ZgZktVuIWWJWX/Y7ZdQCrHC22UQjIOoB/GQWmqZHYzgWa1gjAOtYEqAaaZse3cqVOEtp7sHIuZbQEmwJ++EBrcBARaHGxvXKHZqB31YY6IQtjTN9mFTpw0KKZMlHQR4fYuJlji/z0Rf+/Ms9LTi2ZXlhmQtbl78iOc26ZmrQLPixC9nq5TH5z/8W2WnX4xVAqd3+gX3r84pAF6CxTxc60CaqbbIWEDxen6jp0ZhLn92j0ZH7QQLMU05Gi6Vig9pCL5oI6MPGsYsXjxkhJeoRdOWqrl9VdMETVUL0O/Hw6oULq+G4roaF0BV1Ur0SEsIql/3Jk6AvPcn0pTQxxYYVAmJoNKwEro5kw/ae2DyOCWHzrmuuKV4dPFCSdTtVuB0IYP02gHWO/CnAOt+wCjsBLWimdwt+9gUz7ga0HzRGrx+6VMuAvsjW5dHn/vzPmNwiaF2P4AVYfyVqt/i1rs8PLV2RHSU8duAZF+ihzSWS+9pA2MhaCEAu+Y1IPOETB2wLN+mw52N+ZlWY7Bn3mmhMiKPkw41MU/qtF/VTkVt1mBK03OCUMNuSEjqDM6IcCe89JzLQ8OMgI04BLfsw6czgGl7gGqjhcSQdg0k6wygfAg0rMX7VLZXm1Ppmky/qnGaNoYoGfGwsiU+PIR9b5HCf2P/FT/VcKtUt4AYvmGnQOdOZSpXLfM4Vk/lyJeD2rZn5BUYCGwtAGGVG+SN7yeHMpAZw6DncAEsdRcXAJli+v1bQgrC6meAtlY4b+tzksm+qFQOEmW7FqJCOJqX93CfY8Ge4kM3Mj4anOH2LJG5MtRLZk4huJw+2WrG0z1uIhq/byrZAGjf2CZ8X3kcOgabyO6STFwBuBuq0yBhuBRQfaZorDWsOFZXDUp4rKuZkwzpk6yv7t60mQK65HyWA5iLIh03NCgI8jwLROqox15TStEbgboQD2gNsA7WZo0EQHOOpDRQcj+ud2OQcXo0Y5jwTlA4BAG9FPSfQtuTDcA62TUO3YvE2czwhzPjiQnMMFxWLPdgiT0GBGvlI1eamiTiKoDH+MWTDcwXgN1FonRVed/700pWl06eX5ouhUNQIF3RFzdfC6nwtkZpPFA4fefWrHjty+NUPoSnlofc+ff5BGn0iUSgk5oXa+fdchg9ePD1bDHu1cFiJGGou4AnppdLEtULi8qsPH3nsVZuvPnI4Y0TST7938z3nH7w+WZgsPEQYDvsBhz8G/HiUTNMF0kmjpCW2OhVUdozpdAWUnbEWzoipN6nZbJiFbZS8QYFGlxEaiZggApi63Hn+hxxTi5pZ2rKigKkTW5c/fYI3W9EJP4gtqqluWaPMLwh33fCEGqn7ujqeuH4zARfQMYYtlz/9iuefZ8S5jrfdcda4/Hu8EZ+fxOe7DTz6utN46sCNi3BMtjvwKVdDvY0i8JpM1HC0WBqtj09MNgbtlBp0gR4FnWOsd3ov/wKxjDQurgRiw4hbYp4BOlMtoZ16wOyzAnOfiFQaAmpc9KOCiJq9AqsKtATf74SCfhAuFBSfReFJb6qY8sqgJhhGXBbH+HP4CZodTusj1SzFx/gHhHUtEtGuvy45fmL//hPjSZAtZ25cpY+C7BwFKj4K66oTwMWUhjlMNQD2z5pVpnNRcwztkFYaprPaNNMaY6rFpuUT0Xhp1WB+fTkdXXLEGk2xC+RtUg/3HbUq5pmp1NHNPTdb5aIT3NFHUWy8iCv/4saD99dyR47kakdQAjpCt5jqfuh8NiosRbMgOD2Xq12p5b5Ry5VztU3uM/gufS3Q1mWMJljC8cPAO6NLSB9HpwL1niJEgTygaFgCTFxFW+XQKCzrMOo1KPBO0pdQbND4xT3F87se+6099by4ogaDqOcFAmHVMUsYPsE/NJMvxFX13CLXdXZqeajrXP94qiIJPWuEKMpyMy7DOnTmLExSZJJ0/LZtz4w2rDC+ZLphhra5IKYhr2cRExluVOOCrTMhrQSCX8fJeAaFUjYDWxz8wiWA9aYD94/latfLTC6n7Pfvgd8fIvs5FWAmbIOLGcGG5cFB5Brm0DYLIAk2O5EhZtxLBDC8o7sWCQPTyvMBuZTt1uAZ/bXZ6BUc0vsfxeOj78cjNAj3MC15E/6uoDwSJQPjSqLFE6VkM84gYqoNS8IxpdjsJ2BMarOTQD2QJEIB4AWJCAwo7YjJAxaAnqHj4mh2cDQah4w9kH+OEo6LXFebJ+e5ndmaAFzUPFx12WzOSxrwpaatiQe3rRp6ajRrik9TZ8qLo5qahfGgRj5VQ+NhQUJu40UXN7HK80BLhrOMs3BxuvSSGrlttbV9AkzCQ9NtTx/vhTAogLCoj6OqMsPkvgvZ6JOIGjfXybmZ92GUCnEOngPcfAz0hlXS0XEO/C3mzjaF1mZa0RMKoy7M/AyiucoMsGimCQE9AUIiciM0iqf9qCInDgbfkhmfaJmLobYP8THhfhwrNwD/iDkUhXU8fsfGi+fIE8xfOczxgqmNzEMJ6BCEXwz2PJRx51fgly/yICbny+DrOZ4hHxyC78vBLLOYC2ZZj/lw5mI60Jss+/o8U5QITGqSGf6SgGooIsOvjOylW2IACv9pOjRRrTQmR3SRIukHgUob1fCVn5g4kYjH+8bNYDBSp59zfKczQAf/TxjXGPlV0jHwPZE0dJII/VyLmjXmtVSZwdGqc048k/3Lr3JLYmZSNbNbXrR+qObo1uXPvOZbac6jFc2UeUwH2bIU2Q/T1VXUUWCmY3gkv09kRc1kR8d6fPEpaOnd24L1AOPzSAMTOug1p094BYnZEo3A2yt8iv9vOeLzqoruocFfmw6iI8QPMqZB9Zkr/en+yj9qHhoIRT3esPoXbprwGNHIuG03CdpeEGrqzvx3gswmFFRhggzuWu6jASMApQtsoTMChOt+jSHE1T7Ofwn4zyQ5YtOdbKvjR6hHAeqNhundtsYZITTHNaYkGU0rBSiHi74wDss5FMYIFz+Fy3ABVzZHQwcovbCCHO15QlTu/0RVhWHqiCRlAehKtnRMyYbToqSj2N3waoKSyyuC5p1kiFz10+zQ4tDiLU8OLWapN63bXpOffjBQ8GWzvkLgweu/2qOn36Ufh/cqkCdIR6ZsDXci+F5peK/hhhnetvzIZZqo0SXsmJQiR6zPPPCtCkcs/6SZmMQnYohZCc0SAZOYaxmUaGBR3XgsAbIYHAdUOgz/IE+Jkj8WT9ho1RGleB+hfAyVGtRjg2SGu34jzvIV6btEWCFhafUXswgfMR1mV7EI9frDb6fe6/+Ro07VL2Tffv1H9Of4KtfTLv8Z6tDLfFaRy3GDk8L1aMQe9CBpGouODPK4RCumYZSkKNlRkl4XRRG4A435z2j80vnzl86/p2/0tH1n9G9crjPC+P1zjN8bJEtmuB0MXZ9J4GwJm9sONUxj21JgMIkmrFcrC+OAqUEprc9kuSjGF16kJ4UBj72Iv4w+4Ks2678H+QPIXN9huHGFCVzE9iv+Kn0TwCUL0uI5TmWsAsDFYCGRBpC4TgpBVLFlxti2NQSjGtIQL1hYgo9Li8Uh5GwpAzkb0S0hhCugYNiS40hUcjOyBnWYHFrmPDYEKwBNenFyFHkRk56Co3Gd2+Gu1hhYnzgwvcEZG8pkG74+lB3PpPNeiOvvABgXSI38HOnEGYxbQCLQvAqU08riC9UZSUehZrhpRjRm5cJ3EpuOZ+Zp+dkPMluyDuRU24LZecH0bpGOx6sxDRzOek8DJyPwunKbWYHEHS/c53hMapZajrBMH52q3eX1+SMBfzCo+185xyQgmMKrtsD88amTsb8LBAJBQ/J4/ZEX2CQixTp/6G213AJ6YynJwPu+Gtb2LeQD3BphHYFZPII+PHJkDWYRY3CtEr700YYZ2EYfgTmmWQIKJUAxhSl8UgAd2jrG3/yL039xG+cXkoYuqTq8+TjzeNfHHY83v2LvPhZg724KOiN55pRhxfKIA6UjQAUzk8xPODc/MzvjCrTaU7wRpWgs6pjQbuKl+XbKF3tyiopLjTnNOF5yxWzmJSkZzdDoh5tUXJloG5Hbyn35XS/6pfQ9esXrzcV/a+qg5D8+XvQYq30RKCvRcLTg9WSjv9Val/y3Tpe9xn5Z8YlRpnTlQAKkzPbzMOBWhIDWHETM6gV+sOBr0KskdPPtGdkRc9vqbEpnS3GMCb0Cpv8VbIYvwdU1ZqwTNG6ig98eh9/+BVivKZRVmAXdY8cXmoEWUxUiTEYxCdBlmFuFqwqWiBZxjdlsHYe/TVVLPXp2CQ378Eu44FA4YWuKSSPXZ5jIaEsmOA4NxmHBOIbJJ0knz2QTh0EWG1aJo5Cj/6swGnN4y5IBhdStnrXAklWUPdi6GoKu7NblT9/2/AtMv2dxjEzj/8PvZ1kLCClhVQPGAu0uxgJtLmfOWgBll7CWHRp2W2t3NzqxRy7MytPMgOAieRD5DJDKolzLqx47WmWUSYoGJOFJuViShTv6CvovX/8Hqv5yXzu/9slSicEqeuM54bdhbU7Tx0lnDPFluNURcD3K8VYLLSuOHeWP/+TqjzjAxllgF+OsW5dXGle/zgAm+jHmSjWDW1YVuka2Lv/xf7W7qiN+cwS6StzfpcGn5vmXWarmB57GQiDy0JXrfSpkisC2RT+AeWXh7wXHPAuECFp6zziA7z+jaV1dM/CZK3bLiNYtj5TwmYb9qarWrVRHYLrg+13TBd/tuoMnds1hB74IT/AL7omNgOQQCMIs6kYuXyqPVKqc+OwKE/0xH3QQwDX1KG3sgQINGuKymYchS1uUZFnz5VdX8v5qxY9n7vuLBiXhkr9S9edXVvN4viT4g8IvC1Io+sj1G5Q+MjLCz+gQZCgiXvsktFF6/Qb0CesYV2Yw+vJd+gHAl3nyI9KZw7U1jgeNh3+joom6JIvTXvnvD3B8ETUzvgV66AtmEUT9TzvNfs2c4ua48haX0aYiIElM+fnMx2HG7IdDPPyvDN3RMuuO7eou9bqbcNMsurvhy6d7Xw7d09hN1mCx8LjA8tR0c3CibtplT03Ctp55Btbo4PREBnisfaWLHt97H/F5RB11jkjggQdAuwDmihHej7wX2jHcCtpf9zpsD4V5L01QgT+PisinP40B3qw/eP369Wf5J6BH/8pXdAz3tvnAO2GeyuQrth6q4BQlYIpGmJJQBC5QRAPAWjEPXMBbxEuvBFygYgvVn//vx7hQ7QXxwrcFLOQFU9+63G457UVoB8qpR/zYp5qxrT7Ida1r6BGYBBsNQiDCdKORGEaJ6BHXioK2ARrp9elGJBobLvZn4xN20+AUMLVlAP7CKh2YAD36V6PZd/VhOry2NtyH9rtAR6HDVOnD9cDb3nbABdl/vP7fuJ0lCXrdTwBPzZG3c58/s/VnG5YXmWrfF7XP8+1Ft28/iIEy8pbTzhhHSAb6dRN3fwc6mdc/GLK9/k8FQ7Lj9u/5/Xs+/zD1uKO5VqkxXyoms9GrqbDfe+7NH2MONbw++9Pqx6LCEVBHVEWWtq//Vda+/DIFBLH1ryfJPwvPkBhpsrhHtykrzvZsRUS2ZSrYxDgh+84On0sM2rFcaiwPtp5h5p37QVh4hqm21x7tyQw3i2n8z3/pxDRyi0DK2bIjKyl7y459tafK7xbK6L9zJFhDuurxBvAyYEhefsIG4QmGFOya2VyeJJ9jsFghpr+BKpipNdDwwmAR2gadetPLweHVmJEDhCyvthnibaGGE1bYt4AidGxZ6td3wEV4BjTBMgOM8AuOv3OcvoVeYbrPpwhTBDczPuKHLw83UQNz/MxTqS9f4WDyarhG0f0Jy/C/fJs3W4mYH7Re1YxsWX7oCmyhDhyN4cKcOvTlHzKsTIBWnMCFCUf3woxFdixMfwBWoaMgc+FldyN3QkgZEKxRz+JiDCzMpi01M2rInA1wuazLH1ImlQ/JuqoLQkQdP358XI0Igk7frSYMZVPTNhUjoSqUhltnzrTCQMgIvfGFG/cL5RtbPEaXe5zxzxWj62MIOMxF1x8wKVHG45rtUabk1+nz9IzwJMzxHcQMNza9duxOvGFFaX0z0ENvhPKXp77wEIeyoQEJBFHnBVPaGghws696nNv25rpc7bMzH5MNSjXlghpiF/KFsPC4QkPnlIim2GemH4Zv/COdpn8J8usYeS3oveh79IEknUXSU/U9uzlczBpK3RrGd641zPy240Yc5YZNdNmOMpftqAIEvY7uh2oWhOxc2xouwjnfNn06KAEB1IgNw1RwnhxvIc7QzIARyHbWx2yv4FeG5RAMOWIoqpqvqWomMzaVjlxANyHz/dHYbFnx6YqiltW83xPSD49f346kT188fc528AlkHt7xrPARZmdwYoajaPPwAqoHIwQDbIK2tcGzbUXh/QJN4PMsejjcszYkXIZa20Dt0Z2QoQuRdLqSnmfuy3kcmZKOCKfQVfnh00tbS6fpu69/sZDYShRYDO/zdApgPk5Okk5AsGN44wEEYtwABlnHEeZxRBNsRBmAcYaZ9TOVAC5LaxLBnK8DeCttM653hksjjq8H43z6nIlBGCHNnK/o4kGCyYnXo2NTU2PZrKrW82rWgGURDcnFohyKwqWRVfN1Vc2K+pGJKxNH9JDHX1ANPavqvnD5Sjns09UsgzjAtw7wPb4DvmmM4kL4ShEWwSX14Yt+ioTGiK+/OQhfHmQ221PJ7FgkIGefZJAFEMPks4lXGFg/jBC+9vFImr6bQZdOsvE8T4/Trzk4LQlc4+8UbGPXplop4JyrNk7DmMKI07hBFyWTMO5uDWtW1TZ+1RENeFyZFazCWQJ1PlKAiwxu2rMSaRfo++YoB9wJB94Gvk1rduYdtSnAz3TkgwBrIJh6RFWU4ZqiZpuAsQzg+LKAUfPlsFdTVaWiAKDpY/DW8wmAbujG92kK4D1MbiedHMpbQYA0stFNH8kFFeD5LVzEZqSJWqhZ2EZDTgYj4pudDDNoZdBlJTc7BQxCXSuAbo66KlKT3uYKzljZkAeU9AUEeen0Ep4SBWcTbpq+BQ77lk7DsZDYB8frH8Eueh+3Q9VvVGBOvkyKHOt1wj2XnSHcT0yGUoD1DG9qMOySLQtw5K+ia1ZjMY31JgupH2YGhWF4BbYOXJgzGN42w4CPk7BMd2ASALeP+rrBUX/ehVjpyHWNo31eLXOs39fHMQo05fuMpmScyDVTb9kEJUV7BIXvRUhzgpLWkNwzhB8a9MkwEDsWcOa5jL6xYtMTBs95HajJGZuaXP8qA+xoogAgRthO3Pg++aDwJrYH/jaArYCR2jgk2sB4usmBvfCTfC88nLp+thcejatKg1lV0drrVwb2whvOXvi+WyP2lskC0NZgmg1RCBXw9trfs0E9hkcY042v36iS32RjSgHX60RxTH7CbczucaXZTjggCR0tgbOqhQK4F7c7qXlUZ6DMcJPQ9h6XHWvft+O8nY3ugxw9YYCn7RH+6EcMlPQH2HNdXjrNZB+cx4dgHqvoW8oJtm8JJzPpRV/KqNu3NMZZdOOPvvzADt+SBCpJZevyZ3/4TcUtSValQd9SJVLvVvHo+JZ42FLft+Tc7yFoglrn8i3FdGdLIPMsvYYZW0K4M+u1OT4x71MilOpKWH59MxSSRMMvUp++NfxL+Pocl67/wYdUKitRXXnElsu/Tz4BsEiSEdJJMH8igwF3L2OkaRq30yAlZHNgBxZw3HWbMF8/VMRIG0PzCiJuEwuF9MVhIcJo9fcioaDO95VRDn9hGOhCCb0RbJ9wJN9qgVZgpltc0Crj3j/ck2hSbmzPwmVWs+JwqcGYRjjd6lvwWsNugx5bTfz6cRwUIOn4vjvxCpYVnuhbbEp1CcSGwcXVo1/2eodxpskE53BmuIVeCkaoMgxASQxL1tDRhlQKXRWD6srOMaHIgJKMMxZ97zE49PP7jKehHLpu8zRYSj0Hzov4bTQMDaZiG5hXrL8DKu5sWAWy6A5n/+eLGEj1ZraIdDsg68oS3VdIXEHyeCVBbJmqyuDh8t0wxw1t9KDCub3OfTc6993IPW7vikdwGGakF7TxxkraFvLmH2Jcr/A1Lk7ZTF/wAGxAnnJgU2W8xR6LI3+AqI1JPnZLHjos40zTNZYd/APvdvMLJMcDDALFDiDIfa7g4EkVxpLB/XiML6TYEDopNH2TVNTe+8jZQifNpLq02tvq2AfLoE/A4QmRC5Wi7qMiX0OKOm9jTSRo+HBRwYqTGFvAmGGQg2ogZ26Q3yIdBTEGpPjOsII/OYwcdwohtQ5t68zrsb6EgzvE3CK2kI9uEXTxRpodYZx5RuZgqPb2269/4M/u4dTOx+JhkdphdgSvrzrKVRXninlGRgJMdDIFHXQDc9ywhmroFxleZ/GF6BVBImfvLL6ZT4R5RPgu6L09Ip8yBBq5d8Y3Pjoly2sFUfDadDEY93nDSjjyyjnfRLUlKwexz97NGkx5ffqd4WRK3l9ZE8X2aEkIzfOP4UMRD5XlSDK8v3pAFPeNlUHZ7HfGPHSnTDZkrwYml4FMNoQyWYTLZIpbJsNYJpDCYkwmwxAL3AlbiN1UJhvYoRS3JTTAVi6TpZ3MKIUEnkDpQJmMicgfhosfcna49EPEjQbI7LcDPUniXnekJsjy2MpR+hFFQXTu8xQvMU79B0MI2ProCetbjrDCpHRYJXSUcZmvwuK4j129AakZ+gG+T++F3y6SL5GOX2DuEiacUxT9BKZXbqZFInnrZrZplW0nSvd7v865LgGuW9yyZIl7UY477WgKG9qyNOkF7lHZuvzpT3zv8R1ulKN2y8t0o7hNhKyp18JwOy0AZfVHGWWNvJidUKWAtnFB9BuSCIzQl5qZSfn0YEiUgEELF73JcF6mH4Y+3HftCxinPv7xU0bAh/uu4ZnrD6tGga3tBPBNAdb2LeQqh6GVqrVanUNIceZa6Nx0/Jd//OzVN/ecT7dwsOlbl1cSTvOwBqKL1ZIwicblP/7m1Q86EFNlHeQVDY+XV8JXz7L2Ya1bHEY5psSOZTx24ElXeKnW7sAjroZS2ywDMBUiq5o+XK40W7cUSzvcFS/Syc08/kNsQ9sgfHkUyQpaw1dwZbjud4G9wskLBphI/D7Fd8YjrP1BrxILgJLthynQkt7+vU8L4loPSsIFb1ILY5emBgIpLz6K9/QjQIqDuE0+aJRL4bk7h38mVCqHI5Fw/w4/zqZQvP4w71lrDxdeF+bP8fmkr4A1MU8jwE0F5uFgPg9znHs6vBTtoZsVviwKTcf1sRD95uiA60Niro/PPuc0264P6UVcH/bDN3N9uLv3cH30uv+tXR+WNsdCzh0XCCZDuJkLhOck2ekCaaBH8sL9KBwHUQYOrG/Y8ii033/Bdpf7jMAtR3i73xClUOgTv+eQd5/27/89zKwtxf7eJ/qS9KOPAhvmsqEP5A+kZ1Xy/3Dty8wALSXckoYqhKM4LB/73hO9UILEllXmc/Xpzvee5M0BzfRvWTEJ95VYAb8fngMtLQHrLI5H5wtCZhmAXwboduA4QK8kfyAWTxSdrdrccrq70XEtMS1qbpUOGLEz1Anfx6WDkGyi+DPkK76BQUIKhjTx1uMAu6CCQHpTRamOfQ2oflx/A307ApDTrhsAG4d2SYD4j0xmh3iMxj/SZZCRcuQj9n7YKDBGb4PL+/mGRQBcUnMzyXE93HScHgs3/uZbzOmBXiJhy9IlvjvYbu/vsultE+5G2GbhwW010IZUCeC1KYBsHLHJuuDxou9n97YZO+EE17VcbpCM98CrfhEZ25WUIvkOLEy81chkjCtpRSwo0iOfQYCEZL/yyEN3wWWM55ghN36dEuEbZJS8hjC1m8c3p3CXRwMjjlh0kbaNjI/HoHd8bFugL8RSrnU0H1OT0fjBgtM1Ozg96gcO5NXabTOlQ4M5YlhkiNnEebC6S1oY2KHes/PEzGzWUNFyPXuMn1Xj2Cw/0/fXKpXaM6qRHc0em+VnQ70ye4yd8b2Wb5TJb3h+iuknLAIVZEgMz/b2IlANl4njLDONe34qG/1REn/B853oTtgUGrivF6VnRA7uGWGwGd02vU0WfKU1O0OjCI0hgEZnlMVij5YCzG+EsMEoeAab1IjOoWFGGWz8HFI4u/NueLjhJNoRyNy6cDKbjSh7wUaJ/PNksTh5xQbNFRs0z/RAg/hOPkXfSY+QKXIM7f8YedUJMx9oOA4DL7Jt8MUGMzqaQUyHVcV3nW5YTTTzhjH3myLD6Ku66W2bRQO4aS+xBqdztFJyZRmY6SeMcUX1058Ne6k/v09RxkZAhJGiwZDh8yqy5pUKi7I8UQZ9wueLBqDVp9AlGTtDUyFPNhCgHk2Dz/Lnp0JCxmli+lftxq1sTyXanzaI6Wvg7mQnA6O0jfsoS3w7JWZglD2Sv87UQr3BdDDUVWV90LrDc5LMxF04cyvbLlXhyZWeYbutftFJv0gfQ/w5CvhzShgnLfLTBHeQNng+v0pjM2V7XGaYtakOv13nkdkxFpmNiQpAGoNZEDERU55vJRZDAPdSE3WURgBdTDgFFb1LC8M4TDPFI7umpstxVwK+KjcDr9J+qr2oyBQ4xwgPlGR+ji5k1SQmEQjUpqdrAUwrkMSMH2qcylKhIMk0rqqvhYZUcJTly/PoxyauTBzTPfw2mMKEIWGvUrpSUrxhlcvVV+kl4XGyTi6SjujodgUMsJnxPbuZigJdqptrLUZtFkEP2cDoSszvdABg0G52DuBGvbUDHtw6cGAFUNM44EQ/WocAIgcwjHEd4LEuwkWYLSetbc2kADqVcbYLyHGG2ZwadxT38/W86N76nl4jUZY84fp39IyHigE9nuYZF5ano5GhzGSqH8bm1wNBSdLjPMWPgml/ErrXJ4fCon8k8S64fbR1m+ILRcb7m1DCklfwZXX0Cr+rkmH4GyHvpe8TfGSMTNNNYtKGNY2WlWl8d4ppLCtNc6LBnTQTLP2lAY0pvhdMZjuyO3KDRbZJzD2D+7PRaVCAjkKdaXPlALM52PFNE3d+8S96HD/JoymHti5/8XecZlUDTZpFQYB8YO9/DJkerSt4hoC9BbRuMJAEgeCLn7K7nNB1HvqAYpn9GyF8OIEP48dz+HHnd1icxDA+jB9nMe8d+FrkjYl2B34Jr3IYNuGSMczhdgd+Ca/GQODQBE8gqKiRaCI5lBsu9mPlXXvJXuoRpkE1ZMyQqMMSq8MSi8XZEisYVhqTdljTGEIulaF3Qu/K+UIIe+OGpWUQ6+aKVYmlQVyllZl5NPwD5ZtrJubRQhymcR50K7JNyJg0Md78l1OVDC6gTDSawWWXqexs8LNI2yfxLhJVs5U9PpBVoxFo+XkWkgvrL3LjOcCjx8kBGiSdtd4WhWJrk4prSVh6sy2LwtLb19wM+1lDq8WCHyYAlQ42zAPbIPVYy7AWZ5qdZbb0lmu4FpfbgD1TsD6X2fr0wl2oaa3bsTN2kJMZ5pG5OR5B6IRE+cwJaB/fsrI5P/apmEGxFzqT1bpD2Zw7dCandfM5TFcI7S6ZCdpccuYnQCPO5QvjfREzbLdM7Np3vCPFa/Xm2nGYtnZuTsJZfZLtgVhnx8prMfSIh9G4QmxAuXrtJPbfeis7YnIW+EMX/BdvFnPzRfuBe3p5cxdAhnm/LcMMEWZRDbBcNl6eX2IgQW+PL7mvTzHuZCcAjLq4k/AGN6uC31q98V36AODKSXIv+ahtP0UfpZ0PEHNAzCHhPgptR+ew7egBtM7d1zCb22a8aZ2AMZ3QzHtQXEAL3XjDuoc1OW5Lc6lpnsZeHPb90HZPE9ZQbQrW0AndPAPShPFUoTQ2d/gkrqXTunXodugKAhsmB/xs6/TRkm5s+sembj/D0kT2BA5MTxjdI6ER97VVe4HNIIi8iCEPFDiWP7BBeT5DOp5n6ZsSjeq0oqwO95KpRCM+n6xoQvjhWeymU2NTMvb3Yp1D8EBICXuURclDtUN4oJeS5XhCVatDpapHWB0dFkILvYS0RY8QUiMR5WxtKaxVhwq1/bWiu183BCGkRGOhb0qK1xtV5vmJ4cjrhRB9hPm1wmQfSvCm2NoMMGeWKTTtK5a0IryNMTrYHtIsSlnetcle1gri5F2zJR0aYU6qJ5ndXaiz00OsCXVMD0neeF74feF9ZJ4cJLdh7q8lm7/b9mVzrsFyiMyVEVfmpoBEHG1YB1COPNkw17ZtfEGDN27+7nhy+JwnAs/VWH6Lw9DRBky5Hc6HQSvqLh1YP8rQQEL23l4F5JjTnwoohw4fP4EYUzashTW2W68fW7BruneGI/SxoFQsa/xag15Pc86OCInG6X3pNGjf/qCjqUuxaiKp67VWq6bryUQ1xrOQ+EQjCPo6fcX5B9/7ngfPP/3eS5fYBvFXHT7yGP1tf+pSWhKMfvbDES3gDR2sX6ofDHkD2oiTBxF0vuL1vzv/4IPnafzpa5987E+PHD585E8fY3tCQCoJCpfICJkgd2N01uYEyyoMGj1mJ2H5hScxRmuzznMIg1CJAY0qi9jCNMINAGYdxch4nsmOZgzgOeFnVg1LQfUkhBoaz8S0cyf9jhUWAQoK0Gl9ojKZMg5NHjw4mYl6vao/oEtiMKj5qBgpx2LZTEjTQsK7gkvVLxqpg/cczMR8FORE1Md9AM7hcOD6t+e0uIZ5aMgb6UX6J6CHL9MpgpuIcfcwU7QD34y597E3+D72z177ZoA35zVzGZon/Nilmq0t10fizLZhZyHpfySiYeB1LwuJHz6S++aiKwvJZ//smxfYrejFSGynF4Sp7mRjwv3AdKMFDAoaXQwK2kS1vSN3CXwTy11igG4vstQY+WIJt7O3lvfMrPvjPObKbxJ3kJrbnFiGE47rPtd1bOeTVfoGMZoPJkNBMcmT6axL0hrfEJm83ulf73iKvl8OldvRmhELyVlVFET9LaGk/AYdrtSP9a6yOx8i/fycJ4lG5ogpNTaJjwQBY4mGRpdNid2xnYNcb+8E2H7dQH/nIO3npO9vtgU2t8WY2sls9KKTcNP+vX9tbktvj+blSRV0ulXyCdKZRKq3CuSu0GDhI4UhJl3HgIy12b5+lrW+uc2kqGUewYWpIAtNzAY50tuqhS8+h4sTKN5+jvNX3vmNBMdUTTPDW5YgvWB6tghI3GGNe7OcK+7NAl2oOzrZXmU0srCqG58goeH69OwyEschvVtrzi1xvhndYwtUqe/+lHC72kylVG3GexTR6JPDFv1+u4UWR2Z7DOwPpqNoczo5c/TJohqLqcFLT9sE8KpD/S7Qt62PnGEUDndhaD97DpO7ojvmqL4Ry0a/+/SeFI/FOwqfFMqe7IvEO9KbxDt6sr2pA9qSpI/QovBelsf9fmJ6Gpsyp50ay7u6aGObb3szyGkn9zOBpMwIJzrReWJ0qd22qIrqtx8VARmjDyhLa+dDQ45JAMJkZxJ0WnSlNxeW3YnL2V6/qyxXbQjw6gFbU8Yt/umGqbcw7g59cuk8YlYaDTT5NF7mywEeD5LcRvM7bparNDuRJEtp68GcfM1OkuW6TQYCzHE1xvdEu1IQRV4ykW0/M9FAStuTtkxJ9spsy9YbVagAvKpB3sRqGXhtGE+hIALj3fSLbMGPN0GXYvg+5/+rzoAx1f8CEGjTq3FyPEhJcRnY8aebzE7aV9z8YR1ngW3HDAuDQeJzIADsnXQHFsRVOV+aMVIp4+0pxSddFD0eI+lFXg3czCuIiUZYzWfGgh76VzQyPZ8qp+JyUA7+p1AAEDvY52hjskdLT4QV7herUj8lgHf7yc8RDI7OwmyWG5tjHPkajc0VGzAH0Ae7KXLkW2t2CiKjJJg8R2vCRRUoH6ajFwu60fGMr7Bc/WUMbI1jahxrvwc4esMwZ9rmim4tMkkootJeRs+d78vD0HqmRnR27+DxGCj491QUkpOVcLhWjsCaZ64nPeBXQf7UQgirsF+S/DkX0y88WgjTbwoBITcarS4FfYHwcCjkgw+JgjesUl8sGtIAdqqiqC4xYGEhtcbg9Rvu2GSlsSn0Y5MjsBz9A7HJtS84sckxDeOaQoAyQQyUD4ZidqC8feUwSTvhV6yfaQrLEWiyRqkhy+ELsiZQIySHhSdCVFH0iHzOPvNYCowxwTjOk6STEFg1FR7YJrEqJkBAmC99IN9C3s4LUoJzXmUSFmaYCMDsDaEkFlBwpogTjlPFv4G4Kmcbcwq92DElX8pkeUAVSOP0a+nI9YcjaRCxPuqKo/oSxoXQ8Qjakm58iH5D+CWSYZEAuK3BVwAtPwO8SmWxlirajgI8CCDZ20QcpczsiGGoYZ5VaHDnpB0JsGO7pH2eZOGaQPsSsyLtIKlPZirpafg7+MoH1o+ODg0Jv5SuZK59CLuE8/xMXy/cf3D9gXcv1oUn7Hy5FXqUfID+Eeg2ky4rbs+Y699tzLWTSDvm2iPMREv/yEm3B9/5mzdeS8fJrSQOEgHaZD0+EsAvS7DaMiK8ZFxkcc8avGSSCwZ2VNIg1Zj9HOrrLKkg2/SsZZH6LR8dQWVABgISCQYN/psyDZA/BFoYg19luygC25sC5yv2XolemA+gJUags8x0H0nDOgmISllWlDOqFhDeHRq6/iVcdE9DqyKXlbNcB+R6wXsZj7yVSVNcGzAjDGaLdnUf+NU4Jy9xzQrDYrKVAozJigfsSCzLG7ajs3bU/eHRWBXmh3jdPQdBkn91XAO5XXjvwclLKP1fmvyyFrqE0v6lkB0HBfL8oyDPD5F99DDB2idOHZMFjyOFgzxf3rLmQDifBeH8nxyZvapZxbIfulRrmlXTcH2EJ7uL890e/Y9I/WR3ug9Zx+X5F77xT4PJ7q6Uv/E0a5G0rihhS+8Zllq/7H6G7ZQso0+zWB7YG+m+G/TkwXe6vZ9Mfpd0g3mUK9XpJq/NsqeY/1KPufx/Fdugwb3OLGsex00JmdzNuv+bGC/6k1ExBXKbFA2sSdJ6ICpJoVDqg6mbdH1MDlVXlPFySB5SUHJ/g5wMvQWFekVRhm7SRzy4T1I4KDwO+L5KzlKBdI4hjcy3OmdwL09p/tgZBXCwtVniWJppduZLSFjmWbzXuYZJtjfDHFPDLMTSXGhuDvGGlWZniLmqWIh2kYnbxVFYq3fvrJBzh2ae2rIOAyoc2rq879R3CLc+zoN0MbNl1YBV1LfMea07Nz8DcwxH18z9fq0+M3fo8B2nXE5rbJp3t9kZnXED97G2WWQ2rCHDaq4jZz4zD2w6ZEzybOTuZd3Lsu7bIXw5+Wvnmk4hBScJtOemNXRe5aIPAaQXtIsEIgBXdyYUv/espPl1f8ajSbU4tL0CzY29wjpwbRfWof/coyheh8j8Bjw/ghcjkZDsDzyjS17o8/srkZ/QsVmnP3iRmjuIAwcYDmyQ+8gfks7tiAOFwra+meZVk+5luWHud822U2anP4dnNfPclnUc5vDWrZ6A6DPTMIfJLavqx/g+M611U+kkzCEc3XOYTFVHbz1+9pxrDpOp9GCbaw5vh1lL4yaKu9rmvXo3ZMRXmLp0k8l7ebLly5nBP/sx5dBHX8Zk/syPJ7LS373plMKcRmFO0Ua8n7yOvIOQyL9CrsS0OvHYv8UK+J4jnQpelE59xl7SaQ94KJ2GBZEm6S3/U+vkzS9PpE0xOfif/hUriemuN+ZB7kR/9gJ5PzHnG9wyP88s8/UAHtHgIDV69TXazA9oy3I6T2TaLelU7VXb2JXKVGVGBieVqRpOZ7gE7VyxhTKETrFAEMSEpK4bT3lESSjN2y5y24DssUOj5nrR3LB+YrhN8iYJ/d7JpLMTSz463YqCTDXVinnS0YQk5Y1gLwFX6YShzdH3MHnu2j9MHfVLB6Z7OUzXm61YTvAUDUyb2i8psGp4uK2a5dP0/CTb03qY3kdYnDHmjlpCfjR6eGoJ+NFqi6dhBEn4SMOc45mkxnmEP0DPumVnRs0FzWwDHwGAHdzavUtSwl2S/USbtYN+86CmoqyzwrL0wl135GAZU2RW8WTWtO5o7SBcQMcqtvQTbe7H2+4B1thLtAnPr+Pz3Q08+rqH8dSBG5drdL3dgU+5Gva3zRF0kqK0ES+P1BbaK/sPHFzf2C2TRO1HqqP40Cp76vDkzfI1WKNTgBjFCcbs9tz/SV9uOs5HlQgVNOWCJisRAS/CdPJlJOj0nFMF+Vw4qil4VqP6j555eSk7d+HNa/9X4M0uDVZCDfZ/W7xBdfol8MZ+5MfCG6uISdkizJA2gEF7aukvF4OeU0CZjyiydsG5oLmXg0H3yoKqaNHwOft8beRlYlAfh+4gVXISZOFXkM4BxKHJVucE4tDi2QMnAIdub1mLPox4YdLvkW1rBXBohZfUqAEO3b0Th45q5rEtawkw4rQLWZZO+83TgCxzW9ZJVhgS7rrzp+dwmtt4Mpe07uLSabiAjtuxpY8sd+Bt9xRr7CELPH8nPt+9C4++7lk8deDGhRt3tjvwKVfDHW1zHrP5js7NLx09dhLrAd61IwIDutqL2Hk76z27J3KsHOEVMWb0TiQt4G7tGjAfCZFl8QAgy8yqgyy9LRh2LbhJyqOq+8gz9/LR54+CWhgohxAI6R6PKisBMSeKWSmgyGHBY4QCVFDpgZeDT0cDgUMhwyOEZfjSgN8X9/lioj8QENSQ6oVv/Ffg1waZIHeS++hbSecI4tdMq3MK8WvtviOnAL/uallrgF+rrMSuF3ciNc0MiOJmpWUF7OqXJ7atdcC6dY2Vb5jqF73sY91Jzbx9yzoAqHW3C+sO3O037wasW+L1MCe34K67fPcS4ssqnswDWnftwN1wAR13YUsf687ibfcca+xhHTx/Dz7ffSUefd378NSBGxeS3dPuwKdcDWfb5jJi3eTS8oGTt9959tzd97xyB9ZB1+oadt7Feu/bE+vWT+hYx9Zc1LvecKaCzpMpg/lJ1zBh2uIGCD8FzPCQw/jNgG7FxjFnLG7GZrzPjnLcQ9ABnJMGROGXjZLn0vVgcDjtB2QTgobXq4QwgjIxEQwWsn5R8om8UfVSesfLwcx4RRJiotfjC3uoBN/hk0MjfmyhUq/lWu5lYqfXxs11FpuwQPbTS6RTY9mCWyyWZLO4vzYH2Nlusdx/w02MXiAsegFT8HubzCg+tW1VQHgNV6b8dQxgwK4K37xnQLtkZP2O9Q+9OnYpjoM7cbepma0tqwwIuuzC3fKy31wG3M1tWQssORfcdfPLOcS6YTxhYHuxvAwX0NHGlj7u7sPb7hJr7OEuPL+Cz3dX8ejr7sdTB25cqLrS7sCnXA372mYecVfL5cvN1sK+peWV1R24C13DRexss979e+JuBV0f1bYZ0i0/1mb2GNbsHJyzukV8SDeLNUDcbJVZnO0Ny72Aj5edL32NSeP/wG2sZ14GvglfYCL/K9jxmvQ/iVc/T0K2ZPbWl5DMEC/CPpIGDIk2EL3SqCMNSGsirWO1RXxEYVtmNwm/Iz+uJPe/qcgm30xcA5x6KTGN4ZSB++8Dnn1LzK/ck9KsKNqJRcICbrj7mEWsiyyLIar/kZeNUPsWx0YX22O19kXFH1CUgH/75RCx6Oi+faNj7XbBUBRDvkZeLjMFZfvGd4VTwiUySabJ5+38r0OMQ2KlnWke9o8Bk8R27TeRPJmRJtsN7m926BQL0VUCmBqCx+oCZmLbVClQd4JtF1/7t1/hGwSneK6sCksZ6MPMWLHUFMz84k/9LSvi3I3jbTeBR193Gk8duHHNcrxNnoonUiOVKWczYIzdTu8IDtmd832ZlsI77FXUCX/w6B56aTAV/IfKfh/1G066UyrIhb/Hrn9+vTDezw9/5nYjJLB0qPBkMCisoZP4+scxkx7L2f4a+nPCY+Q41g9gtQJYTpkTbG8n1ucrs9IgGCvROb7MqiIeBrDdhk3H0fCQb7u2+fcM3O5QBgzk6hcQwHq1A/GcGBW/w43z5NyBjXmenj3Yr5cWlBOKEk0ODSUDgWxCDtqWCMwTXlzdz70+iEuaop1d6KVst0tR4dfsLi7QTzKuL0bi3E9kl67SnNy4V+k9oG8OkRZ5ix2DGRjAuoRddyyybQX4ZpxAhMXFKGyrbnctACiHmwUGMzflGPMbBd1ybIt0c6NjLW7bca7YQg9EgHkUmN98jwoBvRRnpaq7Yk9P6H5iEF3sw1Nh2Vbjw7LM1Hg3tthZ/Z8H7dzR0vH8vwIWfT27pSG3H7O3hr8YLKZfGhaePTXVvWFxO2ihQgSdzLY6Gt4DFrSJyqYeVc/Z5z4s7gBYrJNjdlaKDIsPcRWEYLsnpO1eWh22vT9DWRwIz6/DtkxkJFhIhSJbSOWd7zNQG8LDqmgzq3e+F2rL9atKw6EcpQq9x/2SvQISPwC15pwc1oKgQdEAV3uUgKRG8yHQoFSPR59xvTaDg/BGrlkd4nqSF9QipieFtEQA1SSm73BYrAMsMAry4s0wA3P1lFsYZlFiu1NZYOSLYgrGA1bRPVHnsmSAue43S1yexMDJQBVANzbefmm0qDjBtPZ5b4Q4weSfT/M6TbtR4TOuunGcPnhvPEeeZvaoYcyrk8KI/jzzohQbZobVAHIy/PbXPk8SrUvoEX2xrG19U51rcbuz7PyByyDHL6Z4EJDwtNvUBudrx/qlAtzjDvFxY+WbjscZd4h53Z1x99epxuyoWRh3Bsat6ZksH7dz5Yy7X71i1sMNzzuW5AwfZdllB+IX7mIWwsfclh44Y86gv4Zx/x2suwppkhrpjOK4J9m4Ww2ztm1Nw7jRRDNdQxHJn89yS3hv4eyyS8C66dslDFeIR5Ktlhw3N/TXSt/c8A4O6c8OrJCeJSGk2ZaEa63BIhqeG38J7/C8rYNlMOM6wxpWXKAXK15iseIsDQjHom4ongGtKsxXQrhh611dypptDwKWsM6gEBiQMSQuBDAwIskUwMDyxTE+Tmq7/QKOnpFwTdibGXY/yVD8nI1MXJ94A18b/QnC+fgBrP3HQT5LkDFyl12PB/dkwouUeD2soSamJk3YedRCTDbDzCHZZmeE7acbGQaRLDSClyENFr1dfszLs6oNpq10B8TxAj6uRT83+6xdyIeVUi/wcj4z0XQ6OjNQ1OdfMpX0t1ldn99PVzJ/6s6D/3HPBimQE+TbPFt5R8ADVqkzMy3zOJc4l5rmEbTUjLSw3hqrrqawFWOKLJoU957mefG0wWoQ4qSZxJrFGkZKeDERkNf3gtPPEkz7RNyZHNe6iTh6T+HorrIoelldCK9PjCeSTl0IH0t2yVikCHoBFu5K6t2R6aUjaCfJG+YB0BGOo53k6DEWn2/VD8B52jBbbV5IwlVGoifB9SpJeHZ5T1/MlELf1S81obkqUPyDbRrxUAntJYWM214CjX17SUTIuspT6GkvK1jRr1BRFf7etn/AR3fYSKDFtpGQXu1YoHFYB34aJRYP5QXgeS30mK0uiNtYkAQkfeaVI/1KbX2CPamZE1tWEQhfCQgfxn1zwudcMeincMPjVNvU9W7QU6gj9ImBCh+reeOu4cArOJR4QQzP3r6Zi7y+/KHzH7NLzM87Ppee+PYEr03EijpccEo6YHkHj+oS3fBM9oDHRTsLUsyp7KHa8ADBH8OhDR4ZHerDo88ICixF/biE8RqkWxh2qhw4V1xL9bAMn4CNLIrJDGGZ2X5yGDudnYdDgadnc/yUO9jFFzgkzh+y68j+rEtgu8BEOHcNkfPCuquISO0Jt+jGuEgfFncwWBwkt9q4oTu4kbQLa4s8bFDlafmIU0obZ3oRt7ZuBj216f18qq1cob3HZPfejZUMfkmjOA9p6E//VaeU8H9SPT0+tNvsfU5Ww7IbIVxVPmjWLbrtNHED4+rBY4PB45Y91wpWIM/BaaxpziL1W2v1SmTsXkHH4IzrwVo71MYV8VTQk6vwsHcA1FiDOQxmoX9hHvpLWEXSzKGq81Jr5ce35M7P0YscazYe/JiNOFlGZXxSwNOzykq2/VaUJG+IbwxG++1N15bwTzvNsowI+QTJZaglbG8Ch+k6g2mJ1Mmv7AXVegM3f1Y5x88Bxx/vwXMERd8xzvD7sGX1IbBniPcMNTaHOfefQKBjGoNKvc3ij6u1NoY/dYNqzIOg13kxYnPYsPLF9ksRJmOHxLwbnDMuafnmAPvooNBMyRK5RC/QTdCEQhjvaXpam4aPpfGIM4mH7boPNzEeExuTTZRrBiMjZFbFWGKREc4GZx4wYSeGJ1u4X1lUfRGEt58HF6Z37YZ2ulnup5i7m+2RJtAdIaw7uqs70+uGL8/gl2O5TJ8oybiROcZDNFx5bG7W1cvjyHYf4yZllsWGbVC2dyfTO3E/8YEDuLsYjv3rv97Vwq+ZnPmPNz5Df1/4BGBek7TJ/yAdBbGvhXEqiH3juHoXWbrmKUCrKc2aR40KVu8+OyK08c1zHK5Zlv5JA3ovbnUlTYzUu2E88r3BmONpBI/e7hSenA+GutOsFXN1zuPj/Y4FvO3AR112s2m0jnbge/FmoY0ZdDH5D+4aHqlMTc8vDMIz6HRNL+wwj86jQbSkMASnNh9xQrndFGKV2pif4OREwkDa+YoHo2qlOP0wWioXvA9uHBjPBVjOH95w/tC+Fm/4VK72jnh1qP7OuGDyJ16tRZEDjc3rPCEQNoVjuCxY0ztruf/yP4rXs+zEZE5WowZ4cgI05zfbtbYUmyObRovpyP0sa2EMC4YJauwUUGqaObZl5WCC8mhByY/VbAuKfcXgEvRwN1pY71KSrfLt8ebwzkJdcVem1JsIJ+lLWPSmtlSD4492BYVEnfI312cGyuJ45B3xHzve/402fQzD+wecCjmTuAEIc4DAIuyxl8ZOgYRvQUxKuAWRdJO2XEZ7V+z9ZR+zpiEZ9AhtJp3VbSK45+tXe2zZJZJI9BfOu97+k7sCGp7ol/9xv//9OyIXeu9+B0mR/eQo6WXW43MfaTFXW3/uNUxwC++OG07YTGZxh1OXlGb24UwmDGu01m7vTL43kPbW05cwXtQ9/6WNB+HVkMTD6fynmXzxop73m834eeHrPSFjbz87ymIcDusAB8zG/aHdkDBLDbPQY5LZppORO7iDSfahZCY0M489Gd6TaWzmOZPEnBsjPFG3GdQ7UqmCUQxjhlWswjmjWwrKqpphZYfhnNc7kaECPpEwzOiLQ1fgfLImcIY5CMQpxv8eZkzwptDyiH1WaddNfyesjTJZJDd4RdHOEC8nSs19LOmwIj7bUaKoOitB0KKjmLdzLYqGxaWdVVOik1gRBWS2F0B2dy2dBsv9NgJLZ9FdTEWBx+Uta7jkx4+owFD7GSFYfr+SOyNESeuWS8AOO9DuLk9UIu7Ye4XICpZSKZVHGlOLO6KUQkTeq6u3S2iwkoq4u9rK/E3Wa43ncsBKN5juZbAAyx1MfQAllOkRBqLzv9tRcyW7R12W9+0yCbtqFcZIHqsDs6qR/gbbLJhr8DqpOZbE08CY+kLDVJnx04rmmk20bTrliocdq4e7aKGdBDzSqxv9DOoHR7iF5ggKZEcE9fyhpUPnX+3UvMtGT1z/Ui23lKt9rpd39hHhN8k8+VlOac1yiyUXG2pgpV5WlbfKKvEAPUUhjBVwDbECriExgKU7zZBmpjBhBNrZsEhvqohVpIcmYIlY0yFYVrNYzBPXVxF3uHaGp2dZuP1IP1EWj0SepNwR5Oxkj+0wQdhZJOgjD6yjMSc/Pp7Xk2I4bOQ9NK2GFXUoXUmPlUql0ep+6kltPLH+ADSM55/Mj0cLWdGvDHu9KSPoV4vXZZYq+Qdj6xEjVT8R8ozlm6eQ7rC6FsKTjOqsYl6+pMB3eXIChJUtfEWSVOwcfWuM5rgqW4hNLPrZGWVpEkaxjPL+nXx5VsONDav+F8wa8KXazOwq50vOFd8mjOCab5ujurnM1KAmwLBKWGIyy4f1MTwYP9BRwqxiZNIwI207L18/E8DuKhmlql0fIzLIve2k4E+y1Ml7l85gOYzrYTk0WCBEOX3x9J6lNK5gJgr6VjmiK64CIrth/Lv/djDuE7BVDYBrzQKMZ14CxsttK4cJFf6N4bu3x+kl4QtiAO5wDOEOR3ahvgR8v4b7HrWIcs4+O/CdF97N4HuCLrxUdZbbXqw6y9roEVbxwTFcVo99/i3u2Ma1wAvmvq3LX32KN1tr+/zmPh7beCKAGA533YV9GLPYZsdFPF6u/ofPf5QxiTWtu7S2D9qX2XEFjx04unSAJYwY68CnXW2LqA0A86jNLexbWTt67ER7cWl5Z2bYm3fyYOjd5WaYjfzlF5uJDLrddllw0MeQ+MpwKBR1TXs2MzpQkeakgg44TfCAvCihJJUTJVheHkELBbRzoWyIlazxajcrWQNLLezxyChMyaIIwlRcFOWAAHJZRDnk9/fw4s0ML+4if/zi6w61wI3W5p0+0gBZaRXlptv59STIWmdebE2ujR5jjME6a8tV1sYtbSRl3aUDt59CwTRndCYXT7Ot0bvXnIVLjq84a3URWMny0kFcg3fquH/rdqMzfscpXrTmx6d2ds0DW7x1mYaKuxIfzjftVbrndLGpigU1ry8UVL1iqhYMFNJ+v+T37dFmr93dc8bX7v8FDwc1H3yqzM1F/p0N3GaE87ZPeBObt2nQ2n/3xVc0er2mWpvzPLnQeNNR6HG2mJVObm22eYahgQXfnRytq/XNBk83tA/nbhagH2jNIfTbIBc355GlJ4FcdscnpqZZpNG/2SLaISq/1HIJsiRHP8cSHr3UyniYPWVnRfLa/OfjzNeG8PwU6RQF2+qNlSKteYDndHO8CPBE346nsRniYWnhBqY8YWFpANPGtjULYPPNNvysGhc+MatZCxRTAVijsBwWMM0oWRiC5bCgmQouIsqeY+ANoLFT9KBXbsFxxFnz4wDHSRCcmnButM2YbqWybZa9c6jNimhY1AsfkdCl52NxXcQ2yDlZLH58mNPowsmFhZNralRVoxMAceBL0ZtBXHgDPrtwJz6rXrdeFOSE86Hn6b/QvySHyClyD+lyrDWTPJ/92WanjeLmdMs6iUlsm5tHDrUBg83TLSy9bOYBb1/ZMPdvW7cC3t6qWac4og7D3ekmqBvWnbymh3UvnG/dbzs4zVN6x98+2eYWzfgsoxtWEvW4rNEZq48zonOyDY+PY+cRvVsdq+9n3tBDmIs9gLirW3K87cbe4sDmOTvl60C1png/iM6VsQw+tEJbCV6BgD86O9+aZaW6v8rLOJVVRSnUwgDujFFvL9n1nZxaWtiRzWpGBosOjQ3nA0JIPzIxP18BiUCLheTiOcz2RXWn5JMRUQowHSFj1KkE1au4BY1GCAsTsZpR2drUOfY7mjdcfpxVqCCsxthPsRpjq+Ru0hEE2/ISFhCPwzLqKCCOLfFiZ1GN5TsFutIZmcUH0GuL8XWz6Lglsw0umVnRJUBlQFkkJ2a23asay5mmu87YPqFp7zvcHQG2DKhb4nnB3pHBCkwFhnwMCEW/TGmcwzJdWMEMNnoQc9/o1E9rU1P0z7EOGScm+L5XegWykqHEkZF+sQc5kvDyymWAv6weGMipBTJKVshv27UwMAsvC+1JAZWIjngVheWhpuYqS4KEpRnKzU4swLS6AgAkxrJ7sZozazt1gRkW8bXi5xFfY62ZFS6nOldMTo3hpn95jmUCs6aXuClCqSMip7zcfBXVrSzLKTvizp+2E0sRsoJdTGx+TwWAlhzkcFcaA7C+EhZ1sl8UkF8oKbb09yg8Rs+y8itfd5UN5NI/2QXXD9tVaRCu+V6ltZF8r9Laaq/SWrlXaS3NK639/7Vda4wk11W+Vf2q6upHVb+f0z3TO/2Ynume6Zqent6d2Z31rtc7tlc2kdeylyS2ghUkRMA/QHYMBCNhHgqC9R+EFNaQIKIgJFTV0+IpwgQhZJAiLASD+IEQf3jEoITHj8jIO5xz7q3q6tewIOdPTXVVT+s+z/3uud85X13I1RzN4v+r5PvchXY1l7crarPZwQMUuKljWoUdbNFkBVq0QPpsmfwF+mzz8myLIf9bc0050WxbdUD+Kw7s/99U3KT+ArzP2/NnqD3vSEM2Kjjtie4htLZjtm4UoD2Z4HFmuDAStKeUISoszGyUScL2LEN7PjML9mHPCoi+BYj+2AP2W8eKdQxg/+apPVTRVwSfTm4d3wQg/wRdb+N1AvZb+smTrWN4/hRdn8brCK4eYP/kEEDeCP7b8+z20LqFYL/V3xtevnnr+Oknbj/51CzYX/6S+lpCqkseetgu16mDmQ3WIWFFhhYzbIVUQAfzfTs1kWp10dMTp5LLH5qH/2/NdLgzp+5Ax7+uxWTZ0BQ5isD+nq6GdZ8X9//OVN97Z9i7NAy+QLhe9ukaIPtbAPCnUD9iHD4mPktjYpvt4+rrc0ZFUTjUx+H1oo9LzuEJ44453uaYsd+j0OQqiXfhKNFIaEbLwCip6lYHccyGm6MSBw0nulj7+GaXv9ntjvc5lMRAJa0DUFJubyOA3MXohtU1uNuvY5KkXp8W5XiRJ0kKG3YiTavvRbMOmrnvzLy6cyIpziXbC2dcqbXzFWj7Zz0JM6Xbi+Yatjc7p4b+YDqhpnz+n+ffZL9FeY9qyG3Ko/Ibl6C51LVqFMuN6eIWcvuUi7h9drkG1fcPl3L8Qi49Ak9nv+RYYvTHyHjzGlcpSxSlD9HiOn4X+PtJSjb0KpfYYzIrQB3+GuoQhTo8w60v7QCpDkKxbX3WotZ0K3Zq56EOOYw7z+VrIu5c3E2UITxEjsURoq/wchazZPW0iOPsiMQNRwoQSyv/+lxuJ/n8H6Ds/wy27hLrsc+xURfL3pQE169Nmxzk+k1bL647XFHxZPikWCmA7SnjdQRXj50pEo+qUCxXHGk97yfuMmrD0M1xxpxLY5w+N+nIjZDLuk1OnaWncSMfjWn3YrKi6T45pumxUigTh40+GYQHThfKkti138Kv8dkdyQR0jbb0D1tezUTf+d9Bm7wvcsty7iC2CoqAw9bFUkzcs+CMjHDuYJrU3k4kPa04yWUpaxMXd9TocZzPXOQOpgNib2Jrkoc7GNcF4kbu4Mz889JRn/JMt3tC+vFFz6yaEoAUenXyl9ghO2afEjbrOtisK2iznkAZMpIWfLJrHbqBkMdQyn1BMLl5aCTG6Xzxio5+hmPjxBdaD+DtfsJuXibdMFj1R+GQORQmBlBPveGFmtcwOmHiEgCc6uWVxPH0mGdb6g9EniU8HmzfPQjF9HBF0wIBQwtJ/lgyFtL9CrI/opF0MadFAv5EGF/EdA2Xgnerrg2SVyJpfMP/ORL2a/Rfuk9SYlmd3tB/q+nsd7/CpfW4qF616urqoa7oG2wLdls/yUY3sfP3TQDrtIPd7I517rwp9og9bfnNcZqeSNYTXevWmX0d2vK6TvvSPWjL2/D3Om6IWBjw5hXjRE83NrEd9xKjbGWVDPZmA216awM3W2nDCiMuHSUTed6yLpl2yrcyWOKJ8arouUqHcHuf+0NiPink8bWohtfXUlSCauiTtFV1hcTkKvel+DVtmXPlzUW6jRxPfZPwKfK3t9ibfD5RLg/Cpy0EUZ2utUoRjxjk2BY70bkjeEaUlDAYTW1puju7vgrNmKtQ5HTboDB73KvmoytDry7YTCBHyFkcoZESHh3Gz8yB9C/fJWnGr/AU0c/NQPIRF2qECy55Hq3G2XZ4g40qMq8+kZM506tDXGQRnbc+TUWYLB7cAOvQDnHS+XMyozp31A6bsP5DU2Ot7cw63EdzlUkLzDMAkyLjGVqZoCfr2fdN8LS4+RtvC8Dy6MHP8PfhfbcJvC3g1B/Xmm12IGXYqIn170H9KZ3sPtb/kCJf++ha4xHZmBn26uwCFNZhANgMFqCqBz6zqgJwKmYVT+2Yik0Dn07K1SIsTyt0reB1Ap+ZfrLKqvB8ja41vI7gOiWyYK0NR/DfnmeVoVWmg9awFosXy9UahqjOqagtfUl909+G/mh0FOybNvpkm8kt0TdTXu7ZCBTHFb5ksP6I1799b4ED/OWpnvtg4s6+Ne/s/urikez0I9rGIXuc/Twb7WA/XoF+HEh8eUEl1jpx7NFGUvYrP7+P90jZcujmekCqxS70MeY9vzqExWZtY3tAlvGGceJXi1W83U2caDvpPZ7iF4f1SvnScCoMfRQKRodDbyi6xzZmlnqplzXkUaHlcUQ7FjO7OWcx41PG4E5N8dpGMJbTDwLafy9sVL9oUwdzNDCzfFIW2tyOdUD0EXbRR6xHWXDBWlQxlbLwheKbqms5MAe4im+i/E20i35VRCLI/q8CEjmRQwnCH1EEI6XyWg0/qGAuTrRYMidyHHkYivjXt6TVfo1W4FO6fnuqYV6ceIyrD/9iYRv4YGf1ivQ65XvCNhiwSWYnR5pLpRSPlOoJgJd0hkp8PCwDmkMot+6JgjrK1JlJRvfeLxLtY5voHz/gJvn9KR7K7aeXzzvJk30sfP5nUJ5zzu2TsgI9mU6PbMJNnaDyZYLKA2jvgW5vC5VOQfAb3P77r3Gj1aRdS4mn923qJ4GmYPclSwkwP0W84vMWPvfji2185PwCMv0S+AK+MsCvTF7s48cR/J/HSu0PrcBwBD8qaH9JZPoFgolksdRsLWD6Oa/mmX5t7hLbNuw85tpNY9J8ZvtMeKy7kG9aA5Bv7+eZgFlO+0tyEuD23YOttZxqBGEmYZKylnr3oL2epQdanB68na2+GE3jBWFdromZdvn7x7MFGEK5Vtx5Er6VLQyq2c/8UkTaoz+E40hfldbcDnLf1mWeh2EFO7CNC06XgEcT+q6p25vQdwXou+1Z4KHpVvjUTitIel0KPJoAPKzo0NoUoKNAqmfIj1zkGsxMIm6mdVyl+ARyCHbAp4UOM4dj8mUHc4hN6R9wTdcZpdeZ+m8jI6WM9W+ZowzW/xJXN7PyZ3QKsMrNxhbUvzcLOMSCq2Du0aX1X81D/ZWhvQXWA8fbzGLmsoV83j0tl651duK/ObeFfWYizM1Vwz+Y2cV++CvLFG4n9UfMcU0KcMSBWWJItaMr2BDXXMC1LXY+12cBR0S3ossBR+nUNlSa1gQ4SgQ4SgQ4Sv9PwFFaBDgiUSNRqtbKCwHH0pccDF6jvpnqk0mUq3ezLfDFgt6hofrjjqstxrfe5GujnbdAGFO9BWNWoIxZ51qEg4x78x0Hy4JP9BtfDzfYj/LVEHOpNhxVcYkWw8BkMWxTcCISE3245IX4kpfV7SL0ag0e15Ythjjts7iNZYEkIjIVIYYWE2jZWUj2xOp3QeP8NC1wv8oXwOmGuPK8rNHzDn3n6wvrLXMNU5qvh+yMjWoyKc+OLqOKKcX3TcRBJiqmeVIp2wshO2fJLuH3//gP/02M5aJuFU7tOny7cWoXCwrmXyjkmzAgG3idiJvu6Sf9PUwSC9cpiiFuM/KFYr3R3J1J2Std9NIJXV24+5Cn5E9d9dOeV/4U2W3fS+FIEgxBbiRk47l6OVD7YU4FTxuBO08HjXA4RLKxrzeijfpOsgB7FI/FgL8fvv0IGqmFuuMLaEgvyl8kzuEhG0UQBaAIXVrinTJS/eQaIr5h4IzY01qmR+IWOPYMl2+Y9dIM3UPPvOQw9t7mDp0BESboDJG07X0Ua/kFAk3S/Yd/TqCJ7yn5ePmsyDX0vljhuuYoxfiRGgZ/yCbCJhzzQe6J1s6ERwoPfQJc7qEzyY45GVkwVto8KGHg1cct62jzMJnAxqldLinwvZNSsQ1DaAOvkyGk6yf7+gCGEFyn9HH1Yqnc2mh7YIi06CE/V9JgOqby6zg1pQAd4zPPKb2YnkkxQJbp6LojSTryuNDKfICgqm7th3AgcDnwO3e4GDjmOn192r/2PTQyuMZuKKSFF48fyk9+/q/ykXwf0Hyf/QRnXGPAbpcCdjnvWjNx/28ZvXGqyELOyeceuY3FmrTDnSGY3KBEUoilOGrRlXJqm4JJdjZFCnNMd6SSSl+XYbKDOrIaWuhVjAt2j4jEcLMeuGKP7s1aIyjzyCQckUZ/9z1k2m/Vo7npNAcYy5+L1uMkuScCAzMoufrCx+Hy6gsoupqZxAimpM3UinNWKaelvyXmzSHy0DUcr3HTHkIzbPToJNhqmoiyMXrZRPmbI7OqtsfZjl+LukYQUz4coLgaPzPPBVG9D6N9MWNBEiYcGEm7fwC11/xDio+MyiQUYcdX4G/SGFXXauR1M/3oj8WQraxhr+ApijY0ONkmUG8IpV5qtgtYCs7JCfP4TaSnSzoSEO4eDNvzRIR2LFYyYVA9/AYNriAxDGB+N+eJBuKs8uE3ZvxJyF1/y3cTsM0m25VWptnrqDjSNse7fP+EaTr7Lpt9QmE/6URTSnvc43uoXnfc4RHvdXq8wen8exfT3L+zfHbV5bNPLMVvCxq710ikUFWvuwvdV+/AnaHD3QZAIrvBM1c8Crnd3eMK0yK1OEU9EZQ9tHZNURJIa9/gCXx5HguH0A4LylJC+x/RPvNjIkhPYq9J35I+R9j0P5gld62siem6Yri7Xe/aCpjlZJAp0AH1/xscLYLFhlfGd9r/FYnqxlL/19KXbuKNRzjz/T3uz1p6rrsEW7oHt9DGclj6MfJV3WNWnpKjhLgnagWhoMzvozxRysaZ0+JkRfBYNZpHG7ECO5tRqbiGPqcQ7O4w5lNOjAJ+bejJxflIHqfB3tcezbMULMDKc7EzKVz7iDS+PpLfOH+PfUu+5PyGv4vZaXiaTfc3mKtYtdqTLzmKVdJ/paRdV7OKfsefu7AsffEbWBahWz5TnzXpL9k78i+wEuqs+cltpOHEKpN4CguyPOqE9MQdbfpRkrEQItOP49NJhjErm1iWVqQHhWQ1VVgtqirYAsXnUwx/LCEz1HPZLvc0vz+UUBRVNRQpEPDnsDyr0tfZA9KjOWBWgrS3NOHGyp1ZgR5uSqAg4wgvWUS3ZVjS5C4dGUZlKFWCE70O0YVA/SAEjtwzoav+aiEFSJGKpRohvy8k16WAP0LocXtlB8tlhKHIBtdnWT3/InvAPsHLpHbHxUmZ4mdWjtQT81xjBsvk04mMleZl8qehTCqWaTBflIEopvnqVHESWMJPzJRFEUXkWBv6TfoY9Bv6/44ZFkU1x+tUMOyudVHEfWTgIjMCC7bRw1AZa1fH0YFSUnke0ezj8TOMS2OuYJCPp0vdHp1/4ny7JvWhX4tJKF21pKq6oUAlvu39kKD38h71c5z6n9ctgUPD+P6Zz4rzPaorjAmo689SXV/AUWF1TDEwrEs95269R9X1jhLM1ciHB97h8fxqD+Pz8FVLR+I4BkPxql80YgYXvLsGfQUVL64WeS9BHf50/tHsAPNhRdVJp8485n0M4076Lhh3BcDFn2KYsipAoigaRaePM04LEBAOn02mKW6odKic3sU7dFJVe+Mmf9XUed7/LoJiZte2MMN2Fa2zOaPXMKlzOjvfAM73Hng7uUpj4K74O3kj6jY1jgvJvbnKO5NOhl3ab7B/lz7PVGaw50ndSeNqMHHSgiTNIhgIytnY4MIvBh/VPq4UkkRrYAimMrM1V5qPxYU0HwW1iUAwTl8Opt7sPvZYt3PjRo2Ui6TP3yAdo5/T8SPgyBXYp6yxl2kPmWXPsVGAMihkTFNoTtnhRK9HT10RqpxHhAotg8oTidb44DTgU5qDRy7U7JwdZATCcpz0PJfqu4ShvkzXlz0uek8+gwp7jf0JaaT+LpOsCrIuULEw6m+Pwmlkx4YZ7Ieqs7KpH40G6hI1U9WVKfVuYucfOojnQqXS0+VSpBfpjRLHGNrmPdKb+iq0Dcx8JqG02ThF7YPp3Ka1pz5KIamLhaBUV+FptoWmHz6KyFN7qY7Tcrkmvs7J5+9Lvwz78JfYfaFcmscznA4OmzwmxjrGVA0vBf5l3L/cOY7C6mvafUww2Bs/dkgPwiZKOFNq5pe7lnlmX7nR6yFn2/ZpMDNSJv5UqqG2rWd7sLFScIOe0uGXTYobNo/gzaCHmcWZ/dJjgCWfff7jQ6FUWJ5XW1+Sw9PhT84oufcvyAn6T9kVUjt/lWtUrmRFWk8wdSQwEgqX+pVKNjt4vIpfqPKrmxhU5OoMpnhiUHkr2MhtCL32jZkEn5h2tpeJhmL3LrtfcfOD8ty1Ij8o2sGIFJR/ENb5LXadfZoh2eyqiQyAkblPLYYydLVOj+fC3jmzj2DbekTuj6MDaMwjTpMUxxaoUhoVYfuJVTSEuOePGujwtvdNCojiaSqyU2pGh25aOooucIKAiRYpexKhOf0ivROKXQq2U/GUolSL9YKkwFCOZTNxsPE++FwJxZTYP9YLA7T97yIa2JPfUFOmcqWc8kUqD/8KH70jaT5fMJUK+kIKVwDcrMKTwMM3i0lMmlaoFz9IMvY/n3jFMgAAAHjaY2BkYGBgZOo/X/X5Vjy/zVcGeeYXQBGGEy8mMMLo/xf+q7BIMJcxMDNwMDCBRAGzjA5pAAAAeNpjYGRgYFr4X53BiPnF/wv/L7BIMKT8f8eADJ4AAMujCdcAeNptkz1oU2EUht/ztULQiEID1ZbaWNBcjWIC0VRQ7OgPgoKIg4NLQReJtqiDiEqH4iS6VgkURaSDbv4MdhQHyawExUkE6XJH4fqcL7claANP3ptzz7nfOee90bLix07z5dcftdcuqWafNGhtHQxntc1+q8y9mhWV2OYYL0NCbGeuu9GKX8MUVGEMtsMhqMOu/P645+e15TxWs2kVwx8dsFcq2JIado+4awsuwwK/36hBfw16Ldgz9KIaoYB+B3/Ow1zb6B2N2m0V7YX22bK2hncq2XN+P4K7zKSYW0ELlpKTZh10gdm32JyadpwZ5qAFiTZRU7V5NTl/vzrZV57t141whlzidivmN2NNFT3BbF43z0zXVQojGmaOYbumDXaB3nzpHR11pY/Rtd23dRJKMOSQM4keo7eZ8Jm+68y3qPF8ziTGvPfDqMf2QMJcqZ6wjya7GYr+pFrUL2bv1VfDefZ9DmY5a5pa3/s6hCv094CaVu5FDr0O9si+wRd7m6VrPvzPEXvJffeiH/fCPVuiT9/7OoQx9FTuQx+cmXL+CPoDunH/qz78i/dwXxujF/24F+4Zyi6SMEmu95TqZuS9NHCD+Ve1gkddeJxzFV5DPXrYmxUvBn5mHXY+4e+4PvCez2jCZlFHzDSlHbFuhf/CCrN0Y30IT1X8C9kOtRIAAAB42mNggAM3hi5GOcYXTKdY1FhCWBawvGE9wibGFsfWwLaG7Qe7E3sFBx/HOs4gzndceVz3uKO47/FI8JTwfOPV4j3Al8SvJMAjkCfwTFBNsEhwi5CJUJ3QMqFPwjXC60SkRGaI3BNVEZ0gxiG2T+yPuIP4NYl3koekMqRuSYtJJ0gvkjGQCZJZICskGyV7SI5LrkruiryNfJP8GQUFhWUKDxRNFEsU9ygxKXko9Sm7KM9RvqVSo5qi5qR2Sz1C/Yj6M40gjUMahzTZNNu0lLTddNR0YnQtdEv09PTm6U/RP6P/zmCFwRlDKcMWIw6jBUbvjD2MlxlfMOEysTJpM20yazHPs9CyOGX5zJrDxsK2zW6T/T2HPkc5xyVOWk4bnPWcu5yfuXi4rHMVcf3j1uLO5T7Jw8bjhGeNl5/XOW8f7ws+Mb4mvi1+PH77/PMCqgLDAv8FbQruCREK2ReaFlYQLhNeF34nIi3iTGRGFF/UpGih6G8xC2KVYrPifOLOxPskaCQsScxL3JPUlSySvCtlVqpP6j4c8EEaU5pamkfahLRb6SrpszLEMqZk3Ms0AMJ9WX5ZftkS2asAar+djAAAAAEAAADkAIYABQAAAAAAAgABAAIAFgAAAQABtAAAAAB42lWQMU7DQBBFX0hA0FBwAosKJIgCBdSABFVoQPQ2NkkkC0NsIHSUnIAzcBTEGWi5By/LxghZs//Pn535OwZWuaFLp7cGzIxf3lGfRb4kf4m8yzqvkffY4C3yZTZ5j3xF/TPyD2754oSKO56ZMmHEmIaELa7ZFod8qzcU3kw4F5uQlWRGSm62Y2Wfgd8BffmRlVL8m1eHrBAL8dEz9+bQeq33sVGqPKln7lvp1bTVpK1fhe5avQqv2XPGwHPhftj27LY9l/pPgv9ibqJPGpRR2Go+Mw075WqZ/yExG5snnLY9F9zz4KRp2GO+3dm/7krs/wBHYkHrAHjabc81bJVhFAbg5yuF4rS4u+vtLcWtSHF3d3cprsE1EBI2CLYAwTUQYACCW5AAAxMDHgZg5pL+bJzkzTOd9+RIQsFEYsb533xIJEiSR7K88kmRX4HERiGFFVFUManSFFdCSaWUVkZZ5ZRXQUWVVFZFVdVUV0NNtdRWR1311NdAQ4001iRxOV1chqYyNdNcCy210lobbbXTXgdZOuqksy6yddVNdz301EtvffTVT38DDDTIYEMMNcxwI4w0ymhjjE38NT4kOWKDja7b56NNdtluv2OOhjy2eWe9vSE55LUz5LPFLe9DigOO++Wn3w476b67Tplgot0meWiyex546pHHnvhkiheeee60qX7Y47WXXpnmi2+2mmG6mWabZY6D5ppvngUWyrHIYkt8ttRyy6ywykpXHLLGamut89V3V51x1jVvvA35Q4FQMBQKhUORUDQUC6khLRQPJUJJ55x3yWW3XXDRHZudCKXccDOUDmXsSMmZMz0Wy4pFds61YzwyIzIzsuVf47FYLDI9Mh6ZEdk0MjOyWWTzyBaR//qyck2PetOj3nh2rpnZyV1yFsz9AwgEiOO4Af+FsAGNAEuwCFBYsQEBjlmxRgYrWCGwEFlLsBRSWCGwgFkdsAYrXFgAsAUgRbADK0QBsAYgRbADK0RZsBQr') format('woff');
-}
-
-/* Miso license */
-/*
- M     M    I    SSS     OOO
- MM   MM    I   S   S   O   O
- M M M M    I    S      O   O
- M  M  M    I     S     O   O
- M     M    I      S    O   O
- M     M    I   S   S   O   O
- M     M    I    SSS     OOO
-
----------------------------------------
-MISO is an architectural lettering font
-completed in 2006 by Mårten Nettelbladt.
----------------------------------------
-MISO is available in three weights
-(Light, Regular, Bold)
-in TrueType and OpenType format.
----------------------------------------
-
- L I C E N S E   I N F O R M A T I O N
----------------------------------------
-MISO is a free typeface. However,
-there is one important limitation:
-
-MISO MUST ALWAYS REMAIN COMPLETELY FREE
-
-You can use MISO for personal and commercial work.
-You can share MISO with your friends
-as long as you include this text file.
-
-You must not sell MISO.
-You must not charge someone else for using MISO.
-You must not bundle MISO with a sold product.
-
-Use it, share it, but keep it free.
----------------------------------------
-
-Mårten Nettelbladt
-Omkrets arkitektur
-www.omkrets.se
-
-Stockholm, Sweden
-July 9th 2009
-
----------------------------------------
-If you have any comments about MISO
-please let me know:
-miso (a) omkrets.se
----------------------------------------
-
-November 27th 2008
-Converted to OpenType by Torin Hill.
-
-June 24th 2007
-Some small adjustments
-
-October 23rd 2006
-Released
-*/
-
-@font-face {
-font-family: Charter;
-font-style: normal;
-font-weight: normal;
-font-stretch: normal;
-src: url('data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAG0AABEAAAAAygQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABgAAAABwAAAAcaEQHBkdERUYAAAGcAAAAHgAAACABFQAET1MvMgAAAbwAAABRAAAAYIwffPhjbWFwAAACEAAAAaoAAAH63UMlG2N2dCAAAAO8AAAAOgAAADoGwAWGZnBnbQAAA/gAAAGxAAACZVO0L6dnYXNwAAAFrAAAAAgAAAAIAAAAEGdseWYAAAW0AABeIAAAs9xP2KaRaGVhZAAAY9QAAAA0AAAANv9DC6JoaGVhAABkCAAAACAAAAAkB98EJGhtdHgAAGQoAAACRAAAA6DwhiesbG9jYQAAZmwAAAHSAAAB0q+xgpZtYXhwAABoQAAAACAAAAAgAgcBU25hbWUAAGhgAAACZQAABlmMUhFncG9zdAAAasgAAAFtAAAB+tWbg65wcmVwAABsOAAAAMAAAAF2cYil1XdlYmYAAGz4AAAABgAAAAazdVHdAAAAAQAAAADMPaLPAAAAAM4DAEQAAAAAzgNj8njaY2BkYGDgA2IJBhBgYmAEwudAzALmMQAADjcBGgAAeNpjYGLcxjiBgZWBhWkPUxcDA0MPhGa8y2DL8IGBgYmBlZkNRLEA5RgZkEBBZVExgwODwm8mpl//hRhuMV9heAdTw/iQaT6QUmBgBADr+RASAAAAeNpjYGBgZoBgGQZGBhD4AuQxgvksDDeAtBGDApAlxFDHsIbhP6MhoxNjMGMiYwVjHeMkpuNMdxVEFKQU5BSUFNQUDBSsFFwUlZSEHjD8Zvr/H6hXgWEhwzqgHkfGIMYEoJ5aoJ5jTDcUhBUkFGQUFMB6LOF6GP/////4/8H/B/73/2/4X/g/9b//f+//Fv9Y/359cODB3gd7Hux+sOPB+gfLH8y7f/DeJYWnrE+hbiYRMLIxwDUyMgEJJnQFwCBhYWVj5+Dk4ubh5eMXEBQSFhEVE5eQlJKWkZWTV1BUUlZRVVPX0NTS1tHV0zcwNDI2MTUzt7C0sraxtbN3cHRydnF1c/fw9PL28fXzDwgMCg4JDQuPiIyKjomNi09IZGhpbe+cOG3OwgWLlixeunzlilWr165Zt37j5k1btm3dtXP3ntsFySkZd8vm52U9LslkaJvBUMjAkFYKdl12FcOyHfVJuQynGBhyqu8xNDRPPXzk8pUbN69e286w//gjhgcPnz2/U3791v2mrsbujt6+/p7JUxgmzZo988Dpi/lnz52vuHThDABeipnsAAAAAAHhAp8ALgCaACQAKQA1ADkAPgBCAFYAcwAfAFoAdAA2ADsASgBOAFMAWgBeAGIAZQBqAC8ASABRAAB42l1Ru05bQRDdDQ8DgcTYIDnaFLOZkMZ7oQUJxNWNYmQ7heUIaTdykYtxAR9AgUQN2q8ZoKGkSJsGIRdIfEI+IRIza4iiNDs7s3POmTNLypGqd+lrz1PnJJDC3QbNNv1OSLWzAPek6+uNjLSDB1psZvTKdfv+Cwab0ZQ7agDlPW8pDxlNO4FatKf+0fwKhvv8H/M7GLQ00/TUOgnpIQTmm3FLg+8ZzbrLD/qC1eFiMDCkmKbiLj+mUv63NOdqy7C1kdG8gzMR+ck0QFNrbQSa/tQh1fNxFEuQy6axNpiYsv4kE8GFyXRVU7XM+NrBXbKz6GCDKs2BB9jDVnkMHg4PJhTStyTKLA0R9mKrxAgRkxwKOeXcyf6kQPlIEsa8SUo744a1BsaR18CgNk+z/zybTW1vHcL4WRzBd78ZSzr4yIbaGBFiO2IpgAlEQkZV+YYaz70sBuRS+89AlIDl8Y9/nQi07thEPJe1dQ4xVgh6ftvc8suKu1a5zotCd2+qaqjSKc37Xs6+xwOeHgvDQWPBm8/7/kqB+jwsrjRoDgRDejd6/6K16oirvBc+sifTv7FaAAAAAAEAAf//AA942tS9CXwcV5UvfG/1vldV763eW90tdUtqqVutdmu1JMv7bse7YzteYxJngSTOBtkI2QMEmBBCQkgCzGNmqGopyZDhGU/YZkIGeDOM5wFvGJY3kIYwAwNDCGDpO+fe6tZi2U6A3+/7PrDUpWpFfc+5Zz/n/osI5OqZ18kPhE8TK/GQEqlZCMmrOnu95hBIniregkLPKLaianTVFSd7UX00T1SHTpIVqdrd09fbVyr6vB5jKqnrLXo9Jl1Kl7k66Q8kEgF//IQu3B3WBbrxh6RwxcqVYm76DvrOBIH/CaSDfoLGhJfhs72kiyjmgiKXpgQ9MenziqNIFV9BIWdUvaeu6EXVRvOqy1NX/fDx3T3u3hJ8mIumspnK7GVHe06IizHhY7l2mnDFBeHDPT168d/+zWko9tjN8Mo/d+lMXfiU8GXSQmL4uaSguv2lkkp1dVUKF4uKvqC6onDDADcsjiKsJF5QE+xzK+VSJQVffhP78qbYV7YCXyMU3lr6ZPcTf7WlsOGxjYX193+k5+nJrYWNH95S2Dz2wdKf/ajw/sLP5e/+p/RduDgr/gz+Fd5PiI70zzxG/0v4MUmRdlIgnye1JOyCEiupRl1dyRVrSaM1P7k0mbDka8YkXhoFuHTBDqkB+I1ssRZw4e2AB28H8NLlsMD2dRcUyxm1FRhI42ckVQjVlVYRKakZ7ZlisTgVD5Fn9fmaM5CDn5S4qHYCl8Oe+qQn3GnOq+5QXe2BO60W2G19Ve2Mw6u3SlRjEi5IVQlIk5ZwptDqryouWbXL1SpjUYz6SlKm3NsH195S0e9NFWgm5Y1SkBOTN1XOuD3+spO6h2m5N9vfJVtK617Yvz1nHt3f6XJ1dR/be/me3M3Bywqlh3oHrw5+6kpHkBpyD0zsd61e4Xt8r1f67/C21SuPiUeO6OnrW2M/sg5N28zLurcniIHEZn6lK4M8W4gEUhUjafIRUpOBn7UoinbSUK+5gXE1HXJPNNSnzPaozpFXzXAZTLPLoKFOlQyTPatcV6yi6gQeGODSIKL0qwm4TIhqK1y2yHU1C69OqyQ/pzOZBdkLzFBbE/CjOxCMRD3wI1HNsiSrvpZqVRWDkjxpIFYn3Ecx7mPKk8xUPKViuTeVdNMSTTfvymKpKKZim+/ZvOm+TcvXb9y4fiP99ND0VhqYvUW/fdlVV1128KqrDv7VX/3l2RuFJ88e+LJ2h0rTz9A9BGWsPPMr4dPAlwTIWC/5EKnFkB1pS70WwougsV4zIUuKuvqULMVMjrziKamyEVhRZqxIOutKUlRyKEh6dx2VJOfGW2oB6LeAZvbBayEnyc8bTUIs3WZHqbBIShboD4ZAXsJVRZKmiCOSzOJbsqy0VZWiNCVY7PpOxo5KbwWlhhFv8vdVChTkx2Q0xSgITRZMDLDJVypWska3x+fvK/dmUklj+a7Nxx6/dGLdX3RZ5cpXV4Yr63crnYf27z25Z8vStSPfWJ/p7L6s3NlW/uwNgxtXLd+/benAptYXx3rd5rY26/7VuwztgeK2ay6f2Dn4wzKl6Yl8597iQAV4RtE+kXcx+5RA66SZJqrYGnaJfdkXGiRuheJUeLTIrI8J/9bxmWvpHcLXiINUSU2PnNYZ6/CXVCuy2Mn+oskDm0BQfU02S17RFVUX2lq9lSkbk5aK1wlK5PN7u+jx9999ZO++Q3d9gEZe+q6Uk08/r56Scq7vErb2GHxepfF5Rvw8E3yeo6AS7fN0IN3weTorfp4OzIVi1D7PSODzrPB5ftTPTLbM9TZ2aN/eI3e//wN3HZJOqc+flnPSd1869V0X6Fwf3Uw/D5+lB61zEjcJkA5SM1GwYWKJKsGCYj2j2t11NQQCYgdiXtCZBLNL9ARQN4AssKRZ/wj1m/Aq5a/EaIFW/C7aN3Gl/vaY/pC14Mxm40677aB+PHHF8q7bhAF5ud2srtxkupFmhoZu7TZtWhl6fEJeYma03wJG/kvCVmIja0nNiraUFBQTGHgzqHCxRhmLqQ4tpB0XpwhF1SKBSBdrFsYOiwkMqdWCl1ZiyasOvsXlhFSSEt6ElJJuoeZ+app+o586q9Qx/cvq9H9RJ352dmY7+QY5TlxkiCguYLejrugKUxYb8aLoiAVFAGZI9Zpgxz8vuCz5SSIY4UMk5L0OeW9H3vcN0RQqA/eupuyJpWIilMntW32P9yqb1BKM9naPHeb0FsjXqUhl0PIk82bUWscvijpKaH5K5yIWPViwhgfzFr7/9fFxLidrwP+/TK6HnWsnNXPD+zcuqGLFCEA1gN/HLxv7E32aiqaSazK96XSopaUvnW4JpeHvzfzfmafpK8KTsBaJ1CgLImAV/KNNYNvCzH7tFX5/Vs98cTvYJR3YJRP8/mqQGvxgm66u2WcdrEBmKzD76opZs8S+uupGm2sGU6oDY8NMrGiDn6jeQJgl6RNhiaIxqUN70Sdmksb22759223fTq5aPrFq1X2r/4KufOGF6b/+a7r7kUcfpW2Pfhh5cSl8+yqsxU4OarywGJnECLgYKojx05r+OAqKDSyAs17T23Ab9SgwNj1e2qgFv5thR3GxeliWIsD6CPhQ+KlaVajEdthdrpQksGyJ8giVLv1W2H7FtPp2u7A0N3r2EZchlzdKQojvUQ6+vQHripF7SI3gulps9VoLE+OWCHyyF9dnNdVrVi/cI1YXinYcwqkzqiMAWi+qJlhKwA/mhUUHJhBqJSAqUTTmEYgKIgU1Cr4eIgPVAa5KaakqJgk8vRJBs03UFhRLWlWskmoKoJMvlYf1zPyavGiWZ+U0USl5c+t2HuiJrxgu5LyBUPSmXfuvfuKvaafcOTK89tKJ9dkVGwNvc0VDlW1Ht+147v2XPMNobJ/5b/oa0NhN7iW1LqTRDFJg7kJ6zKCqtVakMQQ0hlrxXihmyU95nF2t4LA9JtiSnoKSOKNGQEwiPFjMg8PyI4EZZ10two0IOGWI6WAH/NILRrNTTLW2dTHZQUlS8lXFI6lt7fB+SFYyzB0BVRjLFLmrMZWLs9deY7Lhq0zMQAIb2uMB0Rlr61y2c+3KcFDn1K/ZONFfzknd0Run3vbBLXseuOaSaw76IoZLArvHB0f1A3TZ0MCKyKWOaKB30561N+SN2ya2XTfB9KJl5jtCi/As+B4HuYwwCUQrZiypNiuzVIQJHrHgVjsxzlPsRdUMHllXrJmZ6TKDValZzMygoRUD466aLZo42rQdFSTFwYI2WpIglEU/W5Ja6CX911yz7vXXXxqlH5++dPTHPx6lZS6LxZnXaR30O0reRWrh5j6Fm/sk4j65bfUpnyMswub4IMRw+HARDiaWsYLiOqN6wAJ6WNDqkUEWPXzLgrBTcXj1uGCndAbYCZs0aXT4wmyXHLhLwarikxTPwt2BDUHL7G0mI5liImhxtSWSy3d8o5KgR6b/d7V46Ib337jmwCX+qG6bfdfyDxnp6vV/Jx7fdvBdVZ4XFMEWOcDfS0DdpaQmInVeCLBbwEtbWMSjM9cZBeCsZZA0WVQDqDLasgOgOpNWl2jG8MYBYRLIGuiOV5JrxGGuQvSn0zP2a64cgheTtmAtstFky1j8X3+tO/kh/4bdu66//2t37F23YnjTxqVbhwTqPV2399//7qGb9x2+7/H3XH/r0Q1rd3d6YV9WgLy4YV8sZILb3SmzlbRAbG+mTBYI8t7KVm4J1SHPY2IBG8YYb0FpMMJiKfJYx6xTwgtRF02YVtBXpqe20OXTr4j0N59sO3uTTzi5m8WUHTM/p78V/hIyxzjJk/08zlYDJi2UbEfr3cE+0osBI+piAnIRr6hm4DOtcK8F72FWh3lHBoNmkyAHog623+0B+Jnora5o69zoUDM02jY32ZaFfGI2KOy49/Jr9+48Plh5+PYjx29dd8nKpet3XFMqZDZs2ThW6Z1QT5Y7Tmw8fOnq4vZI8abN17xtz9imVYOVkVzLBI32rIj2bhtcvozJRH7mFYEIf05EEiGbCXdLLSATzgI3O1FGnwTCIHFhMIIwxOBVApaqFmsVk6Sazmmvoix4nMy9Ky0SRFlVLgeMHsGU7avMBrgaFfl7rrj85CvP+3+8dOvY7msvXbeif5l97cTwBvo/j911z8kPTU9PdF3xyez1V2zZmSp3HztxANa7H/z5v9HvEzPEYYU5Ht0O4Zgqo0f3MGNBINhzoXNjft07z69DJt8Uy/3p3gx38ml40Rw9/XRLa2tLKJPhejMKMU8dPtNFQuRyUnPjRwXt9UXCn5aCIp7BQNMHn+0TFTtLSyH0EgoLgiI1DDwURFAovcUdRIUCtQ9ULxAhuWcXPXpilAVLl66OaQufFzQJaxrLp+R2khZOCwViJMRdTnsd1Hu7MDIdoK9Sqfja8Fe+PAL03UIU4Uv0GZB4E1DIIiwzMwcGNAfmgmrRIquENw1ftwirzr4grFKq1b+BPZ//GZVyJy0bvLfTV6cDwkh65MtfGX6tiDysgF19DPyfD3KNA6QWx30L2bU4SAYTK+vQxMpe1OMkCz+sYn1SsgWc4NlczTQVxS8FrzZQHkVGj13TheJM+GRIwlSjda7YsWwchS1PTSB98mwxp7J5dN81u/aW37dq3NhmtA/uTPgDyWTAL6zP9h3cvPxY23Xv77t1fPVBenaGV3eAhrUzR3VHhSkySFaQ50kthBlApKROQBBVLai9Osw/FLmkZsx1dQQMaidwEKOplUyHeiCr7hFRFNUhsBJDoppDhwVhySqaV/pCLw4f/8W3iDdvdSqjojJ2Wk20vKHET5PJeGJ0rAv+R5tXytIQVXNDkrzUYnDIoWhnb6XKXUgvsKCvApZ4YgQSVTPxpnI9IkpXSIJAh9mYYcp4YHLSVHKI8uiG3fRXSkYXNXrnaKhJ+8kPv5bNpCGHH6FZ1Ny17xv4+LYnPrskfaxn9aaxvuVLWo/2FUpyn1XKmv3uzvzyj77z6Stu+eJT993qfOL9n77+aprY0ltub3eal+//9Vfe3Tf4mfdetW3J6DrL1h0r963tqbT4A1v+IuVxB3q33Hn9Y4ferjzz5VXJHde87eNXjf3jEuFdRJj5DQjRfcInwXd5yCiPElnKA3m90SIWi0UmSVMOyBLAKTvQNHsLWi2PAlMEA7onjP3Qt6bKFXfJ7QfhAHpSmH+7Szpz/0/Gfj74w2HTytdWWEcdLx9ttwvXnn3I3t5ucH7+805DO22nXvQLCVhLF/gimYRJljyi+QX0pBRiExToLMYMeGHU1adiIdkMa4qhKLSxxNQNoVsEVuxmuSmEMWCuFDe3ry4/GBZRsaLlSMJ1Epyzv662w1tJN3hauzfEpD3kxRjCBVRlgaqa3pqE24pRUgwsfIWYu0DLiWIzess2A4ly48qYSlQlqUpm/v19Ow/c/a5DrbEjlz6bHXAEL935jClrA7KFrNPY9vFrs/SS1fsOF3Xja+42Fun4ypt0LFbKQzyxFnQ6AvlgLYg8kMA3SkGkSgJF5sptg3s2HUsdTKjc3KM4IW53Mm1QTGAuRWaq0a94nUhXEEmUgrBdfgySsBankxlpTLW1iluSi+eIUMIoPdtF859/fNcVS1yOauWad99/U0de9C05dOTgio176cbHP598bLcceuzdD33MIV71RKqt6xm0S7iX98JeipDVL9diImnOTmIBEmjGLB82TnIyP+hhBogl/LBKkcU84AZVg606h/lNNcuW4hKaIMbt19XTt3Zfu3nLBiq+594NDR6rT0zuaw110eT7H+ZxKK6rFdYVIS9pOVGAryrAIptAC7CXRSEOtsCaw8RCUCtkDU4/MYG8OUEG/U6868e6qdOPl05J2wIgJgDEOEAKWcqkI6xCAlkTUqdIRSyOokxaMXwCS9xisZrBa4nc+7s93NFbJcVWVSwYtxI1QDgn/BKEWBA1Yjqin8uRBG5bylsaoSV2JSXwirGF/tsSp/PHzzithYLV+Qy1O6XeBm/ef4nrrHPV/1npmn5VPPw08CbI8sUnSQv5DKn5kDd+MMGeIosLVRMwhBRrJhYXmvTAELPkow4eyEssXZCcwBCzxAJHGzIkXFCCEPICQ0zFmswEGD1RLSjjZZBgyhv0AYdk5oWwY+AIscRTD8zQAVMiLE5mUaaiRyUEwfCzeF41QcyphlqqWtTJCJ9lAav9AXuyQfq9isvx/QYLpBW/B74IN7Q9vs81/YZz1b+ucs0QMEKcK039+wjoX5I8Tnj5F/VvEaWb8vlZ5dcHbAqCMKfmqiCWGsJOVgcIM4MUDgKhYcipQSlNhZopzBgJ1LOKsBuIrOlsUbQ2kENbkNAor35CBNNSVW1Atkqc8LZOOp/GVsqs9OmiDb196dndh5e44D96+933X9+1RFrx24p0cvvhFZv20I1Pfi7yJGjuh+9+8CnHNzgH/pOrr6YnfwuykCJPaV4hyL1CoCWJXgF1RJFKqhFuWUQ3NgXsMaYfdvQRrUwT4kC+rViLM4bFU0C+GfQiPlcv4iJuMeiL6nPWa74IvudDRsnFWoSlf5EQ/CQW1TQahRj6HJ0PrLPRjnUR7zzDgIQnGixoSkCCVUtQGX45LNEd0vAvtevpT0nDDWVoMzpfe42/nv0WZwbW5+CK240UfIsDP1wQo3C7AcxQnJwRyAXFUmRlOiDbDpTYGc12l0azfQ7NrGI3f9VsrUslaelZ/DZnTWwt+Pn2mV/Rv4bP96FP8BLuAmtGb7Otg4031Q7rcME6/Kz2JYCgCSJGmaiCNZll97ILs3umfxY7yB76RovQ6M94eX/GLrEmndaSAa/WXCjGePYlARDW5YPS+Nlh6di1w/ZPvtOhv/wqepSvefqj997ZlKG3w5rj5GZNhgJMhlR/bHEJCtuZBIXRoycYKyNcgiKMm5G4xs3IXG4mUS4omshQVQlLF5QOqeTWrliQokt554hG5rvGJd8Y+8cfrnr286vnCcb0L6gLryy/nX7R0B6ljv/ETaFgJwnksU9C7HSZJhN27kvspLH588VDXigeFnTmc2VDsYus3iKKrFZJVDvRMv/5ZKCZaxmRpJFfVaUfzLHpKDJfFU8+z/gPpks3xvj/QVJrwfU5PaUSsrfmEIOoxWjYsTZEYIHmImN69IzqF8HDRZmHQ90TirUoc3LRFh5R+UVVRk8NdNiYIGHVEl2ebGtIGO6KKqPFMhgx5CBhjKXcviqrY7IaDVptIGKBsupSulnTHf3m506dGbHbR/5zzPqz/P+Vh/5pUHaA6W6ZttL/is1RVaH37HuFI2e/6za3t5vdQozb8RDI32eA/iC5m9Q8KH+OkuoFUmWNcjOjXDVZsVcbKij+M8j4msioFd2wOX6RsQE3R+ROyQG/4NA3goKa3tGo46otWLYVMSZ2MpKxfqO3uzjJWnGk5J3dxNQs1dnQ5+gl8uA/Dspj03fKg/80JMtAZnCa0DOyBQRPPvuMsGTaPpc8VmP4uaAKCsRYLWQZqTlwhz3goFibKIhVhjCvMgRZdOXHtCjIXapfgnU69LjOIIQcqlmrKlTQpTSymKxWJRFZTeHI7jtu3320lHt4+507jx47efCykycvO3iSbnz24I4dh565avvKzdsOfeK+p56ino89ydcH8QSrLXlIjJwkNReuTzSy4IhVxiMsopgy+10CDyMaxWeQLMVbbAgXBhWzkqXYRNYQwmo+1p1DWCg3Y68UWW+TQfkjIHc1twdkjPNcS02z3ia73bM1s+D/feTO+0/6e3lc8LZu+ZJde/cnkf17rj5wveFLzdBg+rRh25aNawVOW3Zmo/CcoII9jpNbNemylVihmbE/ZgIxK7Ao0iEqLsw6RM2swY74YUf8WrzrqyNJEW1zUG88GODEMD5X9ZCUKBG55pBZYGCWVJeImxYLLbJpRhOGAOj6y1200uxgZC/fc8ede4596HbDvR3FdUtP3f5nx286eOjGG//uRrrpEwe3bz/4iQf+xnuDrV181vM3D9771Me0DYQYfuY3wnth/9pJibyhWXA/s+BKW5EnJt5GQlZi4fJUqiOIOVkK97KXWbuMk80iZJjBy7SjwcvMNXgZ3gjGsL/M8/UvkNee4fl6XFQip1XR9oYin37xb9/4+RDctk1KouzOw3uT0XjEnZ+M4fca3IzfF78vZQTPVK3BO/ACPCTPy3FRikRjXfx/dMHPLOMvZIDfDuBqRxCjCwcwuiTVDNh0mZfzoV5AxEfh34AWYekgyMKiPkiWTpMpLR8hMzfd8PHVETFoFCsDls7EsoQUsIkGz8QyZ6tUXR0L7N62c193w27v2HNHq6cQepsrH85YIq5865A4VBD+A5PjXXR01doxtGeDEAP8EuLSLnIXqXWyGADEzdjZjAE8uBNhuBf2sIAzgDF4oaBIZ9SYrzHMIdWVGA8Kcs76ZCBngfQDLL7aDXdiEhvYUCzSc0aHJ9jayaofxk4eFYBzlXLAHI+s+OZFB72ZbAYYUV4YkPqjej/XvcEBu6Nj2YqNQ5tF855177x8y/ZelyvTO7JqeL2py5uKODoeuOG4R3m75B/rKxdTRn3b6mXbjoc/sk/yjlUKpYROtsheR8fYrquAD5BMChMgl25yJQFfi8kaiKRVy1Mknrixa6LHvgarXYLWuUWWebF+Bvgus6uRqNRcLH1x2TG+mM09sLqpEgdqmmteltHovqVcVBTKFafzMXl8+nfj8mNOp2B47LG9rrNf1cxG2bWXx49ByCk+yXzxTYSPTlgsde6FROaFajqXXCw2fbARFmhkPtiI3ZEoG+WJMp0RcXRA9YIf8rLQwSvDL9i9jZCDmRC7EVYdDFUbDURPrOFwMYZbGNKZjHHcPsiV/ntY3rrv0q3uQfC0UsvI9PdGWliyhFHQh47u33+UHuQOafoDI5via9cmNo7QtzsJnanP/E64leX7HdzSc9qsGm0WO6NNKmDkAGtysYyuu0fHltBC+cQGOH9/vd/2ueesw18Z/tHET7UPNtPfYGhjBx9/NfISmwhPslj46zwWrkkyBDYl9pE1k9kB1/xj7S72sf4ChrloW17a8x8vo21RvF1OxXdaNXreUAynXxzq/Fkv3jYopi6IWMyK8bRTdZvfMCie0y++9PWfDbP/Ru5SPW6z4ob3LGF4zwz/4Rs/17H3JPh74mnVbDGrFvMbTsV6mjxvMFqsotvXMD1LHQajyQy3JNnt8TZuz9ohyAkkjR2lWY7YaEr3vRHz7U8tf+ZG2/jXx59c9uefGP8UcsbsnC4K9rN1+s9Oe1ub8+yfCamz/ypczuRt5nXQkQPAoxgZ1Cy3j+dv3kAUIz8c7VBcJSyk1sxOqThnWk01YJJlY4k1FvR0WbYqvzZWo2vU97C8Zxn7++fGfjFovvMhS/8rS194adnZcdODTxjH2x00SFscsH32r73sAImxTv9u+h/s7e0m5w+/Jxvb2Rp/CWvcB2sMkB2k5mbRC+ixVFxUdIIFxXdGdYFauFha6EKp9zEV9kGkxmICl09rRxHP4vLl1TS3rHO8WrV++FOWoVeGviEumz67TPwKEzbb9M+ozWlra3NMT36f6/A36V6QOTC3QgvL/96uxfpWcH1WFuhbHY1AX4cTCKZG9ZHlg8YzqkFkI2AOnD3A6JEVjxyEz26oDgOGjNjwcUogO6iyVt5kVU04LWlhPogmXDSFvTVW2umkN0//t1us0H+avot22eS+dmG549KP5M5+znHDc8ze3D9zCz0pfJGYSIF1HmCfsfNAjazzgNbQ4K7XDGz9Bh3PpHg7wo/9XPi6/2dPPHGXbmX+rCMHf88x8zT9dWM+g8yfz3CXaMoxRP9iSHjyrB5+t2vmZhpqfLaJjT4ouoKq1z4bMlMjfDZlJo2a+MSS9tklKVWGr64nnnjttV3CL/O/fwH+3t/T53UR4WVixHkqAlFFaYrqiRkbQ/DXzc38jxVFaMmdypr+nsxsn+48O02fp57p1/75nxlPyIyH/mpmPdDgJ7ggYq7j1xxKvAlvgv5q2l7rx98/JiRph/A9+P02/H38UJueEQ78mxJc+BP7D1Wqa4xalfypYwcPFIXvneJxYm7mDfoq/SnkYllyh9b5ToKHDrDymqFekyivrdVMUmOCa0qXDksQRekMvLINmxWDKMqJ7tsaYO67lTKueT28gt1qleRJKRROYkvCK7GqYRqjYC/BqjYXJCdvfle0OYTZ8QuWhswZkys7ae7WT2bL6eyE5DyxZ8NyufygY9/EwMSOfLpr/dt33rhqoi0+VBK3OuTC2LK1098VDa39oytG052dSrzC6TYDA38DvHNCFnCF5qUlrFgguX4IjrEb5qg3hqoE1BbIwBxnsK2LswgOV0NLFBePlC3OOsuxXA5eDvVITNcxlQElwRK9vjEeo7Wj8lSaE+mbb86sWrrzykcevm1LLHDZns1rUmXho7HW6VdT7zxy+93CR8++j+4/uvewyGQlDfv257BvLWSXVoP3mEG3cfVOsEpO1lVzWrQiJ2mWsLErboQ98hVZSG+TsKrnCfIurlZ3Bz0nvmpjFEFLTsqzRTw2GpO+6/IVG2JBn98fHN28Z/3Ska0bjtz8i6vv6+sIRFybnSf27jmW6+25F3ndOvM65FnfY3nWHY1uOkQXThYaGbRlY7aF6gJMNzMTZbZq4z7YaHey/jpLrMBnqjYP5PahZvoVYulXCLNclnOxHonM5ixYpTICW1KzEbHapMpfTmlzSqnyrGRJSGTre69t61l3U0bq/sDa9VtO7Ni8rLykL7l23/dPPmL7XKz17E4Qp96hO27cfjhFt4vXcHlKz7xOT8N+eEiYHNZodDR2JKSrT3ktMpZivWhkInwIF2cGitjg9PEGp+IqqlG49FlxUxyy1tjB5NGCBBDMrZj+GOdsjikxZ1cqJd5hT99xePNldPpzu9ct377rsoO37P5xX7Fn9c+uefDyPR6bbd+V/ZXBe2ri0NINKEsR+Har8CrI0rFG7dBQV0JFLNPpS6pHV1eNsCtGVnYwNgrnujPYwQkAEe5iLaBrdCfguw+TqGZ3Ab4bYF8iaIc8EPYppkbSAjvQaHObssYIVsZxQyJleenSa3YlO9p3j97/gDTcahDpFXGX7aaHE4GsbTD6zlWF6Q/AHrBZjbaZjECA7xnIAQfJGVJzIMMHjPVJl2PAzFrMSmtBzcFLoKBWkPtDbHCzFxZO0GJl3fVJQy82OUJyXQkXlV5RrWKW66lPdnqqcD8u19VhHp/9Onb6ixhP6ZUwBFSQ/PW0vKF0nyaT4Uh3D4uiavyCJW69VjZ1oobAhdZMfQO4e1XpuYCjNVfpR1PokVWXjKoXyOH+GrChrVQkYJEiy5NWT2+VTYj4wSpit7aRwgCjuPkAhYxR7POZ5s2MFCgbGin29UJ63VYtWbur48d3VJc8fCJ8+TbJJuzfvWFw03Xb9m1cOzi6taP/QHtnuG9HH/zb2T1u8fsyVcem6qo94UK+uGyHzy/4XM5K30jP2MSmjsGRfCZikx299Iol4+NXj7O8D0IjIQn6HScf5h4E61gR0Gu7K8RiOdwSr3VRmwrZROwMkyKwqYFYs8cVY/IT4wN9LA7BqV6r1IxnJGujo8MSikCMG12JG10v5NeqNVZdxOw2i1rM6DZ/ct+UubI8OiGXv12QuiqFUbnwnT6J2d+vD65bM/0jEDgUREulOzGt8h+EQ1z3sfauh3jCTrxYR2pqkK3IpoUhC2YTlgZHHRI9VcRhFR+rPViAJIuuUeqGULJZeDAUFZ04KekcThBhFzsdolrASU6ZXKLbw8bMJcVa5bGwFoJxjWI2TYcTLzgxkipLy9+ekfueSXYn4R9ScBxI2gIECPcFE8nuBD+zMlObyZBXgAYZrMA2UrOwKeeCZpDB86k+O6/XGc4w42tgFtdgYgUvbVzD7QJbAKmMi9fwbCD1UxavLxji89Cm3oof0jq2RszpQGLdjXWuTx8or3hHxpMe3BpPf4Iv9plWcUC6j07Cek/sPdo+GtUtb6yYy5wIMhcht3H/h2lqyFBXXX6QOFw+Hn2ALZjSe4IWMLx6x6LyFy0o4TMYp6D8eVnLyxuAvQizfDWMQTDrToe1+UIPFracYYhZzHpWldFEq1TR0lU+05/yzpEr94dNnaeW3qssffw9/bNiFfu0U59Om9/3G0Mm8dL/mJUoXrc3Am12sr0xr2vAmsFi69cmdj2LTeySxWZ1Z7WhscKWmzJy9ScDbFXMufGF8Pp8FWxrN/lHTap9KTxPZABvFkimC63+Ys3GwkMX3M5Z66o+UiwqORHdBZtcBRnv9GDpvtbJxLyzG8W8c66Yd4rsoEkcKIhnG324WpY14bKtFiykMbfvhl9wM4/vRv8SYi3LkB9IxBnYTh1zLEqW9aXjuDE4+uIConOgIVPuUCzbgWpjhBzGUZ2rLzhb6V9gGeYahsYP0T4JJPRI/5rUtf2DExLYCXlX5zK58M/d0o7uMalb063K4Pj4hlWz9uJo01w0r7Xeh5AF3jKbyfJfmXG2JnliaDPNlBds9VbmifUaT7WuE+fpbNdpbssJeBrhIQVEqudJRtFiRjSW+ZBlRNUDm+C3w1rQYVnIosUMJ2fJlb1jE1Lfd7rBbHYvncOHxaxmM1b6NdCOs3yrtNl4u1GLldjRHF4Ps/jqioXXw7CajhNULpDgSUFnMrLCn2zHFoaBNMI6bkuabhDDoFfuvOvlOy9dNzS8bt0ta39x1f0P/J8HHjix7+qr9sMXrsUP8YMe1uInSfJn2hxICDNnyjtPcUsdy7xsyBMNuB/SMgPGbaybLpxBuVRNAdgxt9AUToEJpwDCqejZgE9Em6ZljXSBTwtEIFlitXIRJyoFd5VJrFxV9HLNEWFTPQYM/sD9z9uG2VbBnNzBz3Ziw7ItV77nqkxFWvrTx7rTq/dsHOsaeB6UeRluxx3Hrn/I8knYA+oRT+y55GBS24uM4KSvsfm8G3mfgDUJ2F7EjGwg1AUE24tsPA97A07WGwCXDMHSBbwyTuvhKISq87DkAmefrVKTyhgr2WqjAjwkdwpNGVsYk6c/dPvQZipQufyTEWnt8I4rd21akRgsRNbv/tHJhyQx6daf/QdJ39qql15qfdcNew676HW2KzU9oydhf4PkxBzPHNAUzMEVzF3UOiC2elPTQkzTfFzTfLpG37+m883RNJbv+bgiwUaiCuks3uoC+1LhZeem1pRl2KvuAbMUjcY9scKwtFzTmUuLBcGxLbBq+gdcVfCMBOjKUVh/lryH1DK4fqyIGViLwsCOS+JG+SDelVw+szYKCzm5/YwadM85HxnkZyVSEOy6Uyb8xRBPzYPYidZZ2VTHc3qLyxfNMN0yZHhRXZZq9mgKpdGHUy2srO5noeWcinq2WVDXaQX1XLc9t63UWZ0Y3HPJeLHHnE215bNd5lZvxJ45uGOV/Y5LAp0rM6FYf/fYat81K7yZZDTr00tW2RJdsnxjoyZ9lo4LwxBVXU5qErMSkJhjdYidYa0ZWFXcoEc/CAGVhwVU7LSTp3HaCScgPCys8qA3ZGGUR/OGdkzMXdi0Upyga1jRQs+I9SvMRGaTqrIUHMunH300UYynJ4YHO+izscje44Xp3wz2mNO+rgrVzhyFZn4tRGCvQuR92nySCbJclgpKYNkFTeL4gRvFXmJTxNYiGx8Ocice1DcGj1AQLaBj7iK345amHbcwO26xacPE+iCPfC2S4sPjqqxTZMJKo1hVCI6hVxsen+vT/MS3LIXekSkU+4ZBJuXCB/YsH52gn4ylp5/r643SLXCxHmRxydj6NTSANdHfwbff0e/PraNTrRhqeCt1dMO3yvbrbjP3qQOfWfIU/Vw6rRenP0tXiBgSTa+lz+NnTUP8oYPP8pFPajMlkoxVdBbcOUraR55bQ9/3H6cWqaG/9O2fhXkNXYb77tOqpUWrkYuvnTmnRq47T43cZjBqJfJ5FXKtPq5bvD4uALG77x66/gjQu+Th4RvfM/xujeS/oe+cvoNONMi+efrdlM9G2OHbr4D2+fVxw2x9nGr1ccMF6+NohbTA1D8vQtXq4/bqe+8e+pcuw9bd5u6pJXc9MvjPOcPeI4Zq2vy3X7Cl00brnbc5jOm09TNnzOm0yfzB99lNaVYbn2F59/dB1nNkEREACUCxRgEFKZAWlwLs4WNa6++r6Ciw6OSt5r5a/9+1ru2OZUL7O1s/pTHp72mFMyi0bXMsGA1keg7TGq9508+w+fx3nKfmTc9f8w6B/WAVXoMFTfnFy98ErCQ/W2RqhEc0pRW9S7zobfus01agl0//9F9ctlKR3i6uuz8z/Xbxkke4fRiduYl+XPg8SZOtBFIpNQTuNVVgB2btBdWqHc+OsYMEfjeWg2p+lhH7cbDFVsRAmagpzEB8MT5n564qdlk1iVzFMR4Yor19A9TrpBEKSVYUX3x+LKbCG2ilRy3SeHn3UcfqcnX18qHOzcHja/smdCK1d9CB5UcuWZsWSuObNm50ievXbNlQptn1l1+yZpCy9X9nxkODwu9ZfVqrMqs6qc6+DI3avPSd4dd0r/4+AL+/FOh9qkFvmtfZIwU2tMmjCkav7gzYQDXhZnUkXYJtVJpZbk5vBMMjfYIdb8N41QlhhLvKj/EisZUufMlkcY4CiUWrnURKkQF5unRz59Dy1dXyasfR3eVxyaIXdRN9644H9tHyhi1r1ouujRs3jZeE9NpLjiwfoB10cM0ll6/n+7WdfF/4Kb0WZPw3hA1LmOvY5gmU+HkpLt5ocX42/NI3+ESAX1Q8p1WD+Q0wHi/+4oN/+yy3OIEu1e8xw1tO1SK+odhOv/jT33yhgtMCIHmTZoPVDX7JZp60sCuD1Qxx76TVYnPnX/zpR76wjf2iX5z0+j3u/KQPv7O/FxAn/QH4oQZ/gU8X4HABvI/DBd4qWWoxeMBa2bw+f9NS0aXW5s3AAgPGD0nSqqoLMveBzh4dfNSoucJsly6V3H50W+8uQ8QRFH1e64YrL9udKzknEr2+dd8fXREXrAazXi+sXbpcMgSsNhZjzsXiGOIxJp9WNdvZuD5ksHhuRw6yYXB4YdmLbMPGNjtqZvZo7QF+vsPDSwc4yg/BRvJqPKaByBwCQ+U4IVzrTya6E4mz/x5MoHnNiSsb+BhP0G8IO0mEtOLEGbY4lJYSnsZVEsVagI1SBUJ41i/QGLBSXAUlyQErdMWaixkMF3bkjcwJG1nskWaaEIXYI8pzVV2iWFSDoTqrVWPo5eazw54QztnhKTEIFgNsplFxsSF3Iy/iVOZAS2QzeSoV0bCAFIPFZiMzfslJl159oMs5PNEpJjpMhbTYWVlv79p/zbax6sDSXx+5Rzx8mf+RY57pw+4rH/UePOy489C64yL9kPQ2LtN4mPn3sBe5Rt451cbP0/HY2Fzn+BuYAoVc7ECq15KfMpqIy9GE7kiAr8kXFP0ZCI3VlIedaUixwCWFWB76FCtEsNKvHg85pPgJBxyzbi+qHVitS8Heulj7vw2dVTpTrULaoZ3PL5VRs1PlUuOEyvwWBJY/vR5IeUoJb3q8Y+UKIduyq7h8eyLkklqCYKw+97lDQsFLe6ruvYdThZz7poG2noG8P6a/1HLFzQm54Hh8WGdYq/W/yKeFsvAc6HgrOUIwioiamFW24HxamiUBLWJdaWH4IqoIm4qH/Fog5lepHoxSQpo02bzsJJcoq05WzY1i2uMNwrspaZI69TKDjAA7zc4JjNBMbyVbwZqDv+LHA38mvwnbW1mTm6WumLnmDufzh1OH+8cn+g+lDuVy8K2ycnnl8OqdS0d27bxt59cPVe+pHmo93NFxuPVQZfnEEriG/4Ial+7a/c5du5iP/i0QWBCeJBnECmEzHS1Glvuc27+eisVD1MGKEDE2Uz/VmmI3xJLaygaJqZItKJEzsPmYFDUmoT2oIkUtNdLmoWO45UU+GA3bC9kJFmONjDOpOAsFVNKKo5em6sKgwEU17JlmJxzEIItfxm/2Wh74sKXy2cqJ93564Ec/kFZOT0+4v/W/y0/fc1Brjf8HtbLW+OncsVyNN8drcPkF3OfvzFwCvutv2Fm3CNF6zJAroPNCf4s+rNlflnTMjw0Pf5peO/0QxGHwHf7GyMw76HPC10iVjGFEyhTFDCycM53TWlDzoDp5PMu9NN+G1mGcWYd+GYfSFAPmYzJc94tqFqwB8BSuRsA82ItqGO53sdOkcDEiqjYQtmWoOBCCKO1VtSuLJ7/MLiEUa10yNIpClZBYuJ8HdioZNCaThgR/x8x1yT3bNWimaVGDf85R0wKFfI4VErpMbKISz5pmjSPX9/Yc3Ds60Wnty3VUjaIz7uly3DNaPXZ48/J1Qo+ju7urqrdbAs6k3GF7+6rxtVsf2E5jl5dCw/mJNf7bN0Z7Wu0et122+ozjB3u3+wvbxi6J3b4rVGi1uSWnaJXMXkPfHd2jycr4jt4s08Xjwnp6rzBJLMRNygw3SSpN6eykW4/s0a4axSFDgA0t4DEVV6Bx0nMO7kzz6ng0F4nkoi/yF+E2XyTi80YiXu0VJGJ85h91E8IZIpEE6cfzBCx3c8HORgWecE8t6XEZHHl1CextzxLc255eMIvpDnY3DXc70ni3ox13fIAfpA6xg9RYaiuA5SuIai9sMxjAMu57USlzX2GFTR6E196CJD9n8EXTriUs/+5ZAlvaV1U6pCmrHCKsc56WlSzfU2YV+S7ySolfO7yXZaf3/HM3nB2VouyoVGb86r6H1619b9+JoepVTz32g/zho/c9dNmRw4ceePjg4avuuWrZqrwr3b7i0j3LohVHfuWa4++hWz96bWVwqHL1x9c8tOTKH3zsocOHD19+38OHDx0+9uDld/pPrvG97ZkrPVtvDd7F7WmcrqInhE+weYJ3QdbOTuY45k4PYBMBQqikoT7ld5BrYG/ThSmdg2zCvWXTBFMxicTgPh8okOcNFEjnHyjQhdHqhvj5FC1aOGeYIELPHSaIX3prpC0U63VYtywbKDvajltW9Hb0jsXDyYFt4/TpYk/Yl2+1DVgcia7u8ldt+mB7V7EzFIvd4udymyXj9L30o8RIHHgStuI1+b3aS/aZ665LPn3ddX+38d1jb7ti9N38hWG5/JXwJfo0MZDuxslbSGkY9AGLKYzoX3HKr6bXNdwpVnCINuZXvkVYtYQer/7355Dv+nkyvIJsIt9cTIqXTTB5LY5B7rzMUFdKIIy6+tTwanZ7GHYklcRLZUNJTWF4vnmuJC8Hvo/Cbqws1kaX45pGx8HoLx/Fy+VJ2NhRUV2L591B2jOzwr0FXpdjXLmsqq4dBSF3+aKG/nbcuIykdCEqhVoso3MYXibJta7+5VhsWi1NETnUbsVfS8pqZkX1TQk+RE9FZtr8UcEfpdr5QEGbgsXBsIqE/wUXiwXa0HEItQFE+/6HDh16+J8+PjzQFbI6rDpHW0fO05VwyrLBlW+XbSOfL6+xiLeNDkuWherx8KHDh4/d/95Dh48c7Upemet3mOL2aMoU97eaI/bWPnsiQD9kSrea6P6n6Jb2Tp5XHRH200eEx2dxbix1/JqLc2Nq4tzg7h+hncL+wUGGp0FrtCB8meHMrCccpQITSlNBtRkbKDNT5hA5rM9rQDNThhC5Gf7eebFmiIF1nWWtoJ5tBiUtm67dtOkdbf3tuSXVzf2C8I6NcOO+XLV/M2wfnif3CF8SlgIdLrJvznly7GMYzBj61vQGJsw4s2HQNzqILCd3srTXIbF6q5aD49yXtVhzsjMMTlYUa5xOwkPptJyAkAHhMZg6nH2hAV7kqVbpmuqnPgX/kL9haqfrwCaFyMMah5hFwnifmNBrw0p9YMN9rHLgY1PJLbiiKSs3RFY+c+uWQBvdDW1U3KISBAs1FQiRAfilQGEqyK5YVc6KZwJ97EygWFUCOFdDVB9pFBBUvZun7AyKSoObaR5eL1VK3vA7DxfaY2GnK71pYGT15Td+xR6h9szeY335gnOpZax3pFS+YkfpMtYvpAY6AfR1Yt0xjvT5gD4fttCID5vpbIbLAffSWKjJa0M2+Qa2CVW6MLRTgxKrE+OIUBtcetD8phDQhAX0HhEsEI7CByMNvBmP9JzR7Iin87M4Jm2sBZ9h1eJUI2Obg2ZSZqI0izNTmgc00+IVrVZPMNY5cJnP4SyWuzKtLba4Z+PgwIqDlaG9q5esoSscsq7k7GtbI6TaV+akqkl2xnoqXStC+t720gqEFCLfFJL0UTYXF0cpPP9cHGJ0lUzfPHDw/ULy1CkWM39rpldwU4WUyJOk1o4ZYqqk2i04MFWzt7MZZpxmcYnF4iSxR5B5vawpbgTLaNQOR8n1SbfoMoMphMwhU2CD3aKIzYKpGBcR7SjB8K3/leeFA5eoOE/DLynSaaI6JcjT2Xc2RpLBYWl7O6LsYRPFl6rydvowBbeuHdWHK502njWsQxvIzCM755916uEy689L5ZUlY3v6QKRv1RJr0JPymexGs9HhaV2baOvcs89pdZnsbkn2PiVt+9iG3/08GmzrvPON6bPd7kAkaYt6nHKkY2NPh+345aWrBvt8fq3mrdKXIcdwYCePJfVWji1lZW7Lascs0GrW0HyA/TYG2oVHSszAKlMIFNHcOLHLcNqYzAxQr0lK4f+ToWtv+uJwz1r5h/Tbx/a2Ws8uFb40/TTH+KIieZk+DPFiEqNFxANpgnuRheBes6EhA/fqzdANLQz0g9UzydRMgl4FVz5EyLGx2r0drKiIx6lxakMw4FlFPjHkQ9foR7iRKXuIbMToVER5UiWITjDTtVvAkQkmj9bDc2JB3qMBi/rnqMKcht5UNBJPFU3OtMWWahupxNOq2e9JC28boplkrsfK1jgCdqwAem5HTBqGnAREWx3IbibmLJpqjgRIbwXEy3oeEC/W7x15WDav+Ne1ZuFIMDt9v0UXDOlsdIzHe2G6kt4Ia0L/s1KTANHB/Y+jiXJmkVknV8Ob5J7Hcq7nIQb9PM+T0TxPKhm+7NGDBx8N93cVqvBF//zxA5c9dtl/3b1+/d3r+Tq6IAb7szkxWLbs9/r5S9d11z2dvO66Z8ZHr3jbGERg/AVipoGZn+p2Cs8CP/GEWpT8Oz+jVnMia4USe52Swg4nRETeEvZwFH+xJrEhEQnrRGEW1IbdeNbcwn7NUJoys1BWpU7s8kwRLbCN8U0RL7gp2POBsEmJsOoRnmwPsomHoB8nHtjx9JAEexdv7B2bcph0ukREklKCsuIGXoYlBpGiWtAeR1kPiG+tfO7WMlhObFI2MLLKA/fI5mX/tNIcQ0C7S2j4X1pXrux+/HHhuL91+lmLEAjorLTz7HsQjvPK1p/8pPWOO1r/EiztACG6cY2XHeT3vF+H3a42cKxtjE9tOcsC3pot0jymTSUDeENNgnsKICIsCYCFXcjKzjfLShzcaZFY7QZnB9KgEV6WpnmBiUpaVPLovnPcfecKU3lum7vwoJGe989aJNXZhjOXsupKwmtagkScqOY2TDXSYJEDDfg7PuK9KIMT87x8eZ6bX8Du9MkDHW2RFqcztbY6tPzgO/6nPbwY51PbDxTbOp0Dlni0u9pdPLSlew/Ic0iT5wJ4r2EySn5Hat0ozynkeU9JDSBbUw22TvWOdKeA+0tKai9Idn+x1juCzOkdgvc6zfjeVCczKTVzZyNUUPqKU7IT31NlVO+xghI/02AyBg45uPSikVzA7ZyoDoFkLy2qgyDZlWJtcAjfG+yHvRsaxMshyKjVcZy1apFkxLFLprKd3SztlZRSVR3CEcme4ggbVR7pBWaXqyx+VXOjVexTq1ncKQi10gvjjowWeMxH9psXeZyrCCGPy2L1hFryS7o7RdlZKObT8bDVJcprrl12aW//jhXllU/P1xF6qUPUFZylTCKtS2SSiTaxbBKdkc5Sftyv7850j2WmPztfbwQyOPM6fVL4NJs/OaB1OREn0sYQD214RLsFbWoc/RrHbzA7GWSkDoeGESpJh7N3URefLjHqcKq+hQ2SRtGWEzWOhXSir87WlzFQGKCVWVC5OXX1wV17e9+7ctyUNdojcQRLerRRXv+LOehI4WC276AQ4IV2UH2O06N7lqETBy6I1OObReoJFjiUyhykHuxbBxZF6tGV/CndQrQe58EDxRvORezRPXtqeox6563Lc5F1yRdc1wURhLIQRZ6DIiRDWLkYktCfQ6Q5d10B8D0XWldwdl3hAh+jnrOuIEO1XJRfFWBY1nQOy6wnlp7o27E9fi7XhB+fOvXgg4xxZHZP74U15sG/vvcCa+xorBFhiwKm+mQ6kITw14s19EJBcZ+ZamOI3Eobc3AYBcNP7EhnG0Sckw5J7OBoVUstOr3F7jUnOzmE5RxSO4DUrqqSlFS5rbo4yeXeEkJZDtGSR5NsPpfiPYcL3kui+xzt7bS7NXnQJnqoZREhEqwneocNOqvQ3d8bCQpmYToLrNFrfDkJfMGooY28+wKcCTc5EyoomdKUl5czsYXSzs6S+wNsnAp9VWugzrDB/DJnCXPqMamm07PD1a3ypMVujixkC2FeflF2NENekNHZ+Hc+I+y8Lhp8+egwvzqHDRNapfTsG9RLTY2yaZMPX9D4kCMPvkk+qEl4aSvg4WzWSHKfUWMhVuVLI/WhOusRxdwcXSYtPaf3eHVRnCJW/IvzIMx4oLYl8WC97K8uLh5yE99XV7LRWVxK43yO0PFDy5YVe5a8fHQsH421t8ei+XN4Ej40vqynuGx6E7DEFc3lorFcjs1R/x0ozgTrubSTVzV+hDk//NE0w7Tg07sYPzL8asTkgHzJbmwgbkwls8SIUZCujtbSyPlW8zka45sN3FERs6ocemClraj6PTilV4uzUxpxcPAoVth4FIuNCh6W5FrAZZhbQmaG7qRYCqoZAikNTRUz2zw2HJD1NjZSZGWdBAQoTFKWLKi+LDOFqh0PHiMUKGM1XQzmiV3xLg63lNKSKt1r6ReMFafza/e5rF1dVtd9/+USe6dbqlL9pGHpuq+3W4Sec8CfmvYzR1c1sCUSGgZZL3mOT4BPtTlIj35R9DGlWFDjBjbJybCBMeBJF9QOXRMGXgNFyoJxyvGcDiIWHGEsSKx2Px+wDCHhs4hzFe0FxcxJU7p4MF1EAU3JNZvUgWfavAUEynRjtJKOwmWqADdtGDgSf/VigGZ08Szx/DhnZGH+uCjy2fSB+Vklx0FrBT8UgatX/vSIY8k/CnEM+e8JgE7H4gm0gG6JYY81ZPOPwB6j4BvPhz82fRyCisVByCCuWMCzr/1/lmfR2DyeqTaICf9YrkGcc16uncF4Z1GuYVxB5vGtlXzjT8+39JvlW6K4OOsyGusmY/EkQvP+KeWNB2PnZd4JHpSdn38PPshiMo2HJ4GHWdJD/vNPzUUcyCqUphI8SslBlFI8P1d1mjVNge2cz+FOxuG2ALr5xXldwnp6G+JauhB0SbUiyk++MCui/gB6d3Avb4HJi3R/z8vxK+a1hc+j7hMLm8XM94iItQZyrCNusoHU9NpUNsI22RoVUAdH9TCdUUVnvSaamgNF4KJZ54EVPHHyDUsTookdFCT8gLZuAfKaCPboXU30NbBBZ4PnQrBp59DgbeKCdW26AAqc502hwOG67DjmIrpZvXkhHhzkF6ZZTLhn5mh/Y1ENvffAurphXUbiI1u08x5mI4NQcgoaOorIUeGsDCS15rY2zlLgEKSV9VysJgbixQqsbjwhK1BEUOJFfJbpLFigh+tUW3ONXI8WY56OyLDGHtArCwkCH+/mz9fAFhrOy7AuNiJDuYs4lZBoTiWEiwxK0HGGowM65qIDakGalaEDThp8DpB8EmCH0AyB+mSI3YhByI9BrwOHHHUmkPYYZMBqOMkJmw3gFzJ/9lE6XIClJpVb+Y2m7P7+Gwvpbb4Fe+PScFA9HAXP1UC0lTSZCbPodIoSl4kPgFEdznuxk0hu9oQRPJodLta8bJO8MTAnbnZ2zo1y5OWjX9ZAnePgeV28NonFMrhbRdAe7URaqTwHOzVPWfFMA1DFooxrTxND9fWqtIvDqH7iE3RF92tNHFUERbRN/xjRVH/bzXWVYaxBDhskJURjuQjKGkTTahzS1854DjYnYuIoURrs2nysNWzmdPOktptNeUxl+U/Zi+GwlVkUztoBSrc0qZPdgtbljuRAAPRZnJZaCNGm5tBAhroRPgxnqLIXhGurnDcRPhfI7doFmfAFgd3etzAlRt1hOG+g3yJ78tiKRZHe4oshvSU0pLdJhz4cZTndmwR7Qyt5HsC3VWAsFwd9oy+f4j70/4X1gq08z3qfA8N5nvXaWU9y/nqT51lvarH1ts5Zb+wtrhct6nmWvI4b1vOvmgUrjXXfy9Zdxme8nLNupaOAaCOThWSHmWHSUaVvLiERUKsiV6simwGaauc/tc8SWcHKSVGSn3N4gjF9x3wy1Q7MUsNFNKxJNkV3EcLPqzjn4cXYAu05D1Oy5+qNXuPPScafNCkgWti5HAL30lmainF/01ZkD7+bZRCOGiQC7LFtGL3m4TI/y5oe7ekTk8Aa/Vva/0UiqfMwYM28OOo85B9fJI6i5BESEiaFAWIjZIRmKzgM6zdlTY+8+mq2/mrbq/CvPvZqva0O//BHTaYmBVV4jXghAk4j1izzWPEGx1pMzWfc+RDlRNQeGsCfZofzF6rsZnO5L5j0LsljCaIeKzYO0Rh3cavcIj1nsXlIII3v6fnZFY1d2sAum9bNVnD+iKXv2lHMbP7ozjvXru9vH7rz2M47tm0czo7ccKifRnqXHbp5T/+qwzeNA4MObW/dHzh0+QvPHt7WcXnL8SO1O7bSb2U/Nn1T18fuu2cX4lIiFhvoexzypFsvgsaW/mPR2DIaGttkMJRIMRl5K4BsaIgXB2W7AVGGLgbMRntP/f+LXhy4WJzeH+IUycXovf7UfHqzF6W37Y+lt30Ova1/CL3oCBYn+WbuB94M1eARdBrdJ4HuHOklygUpx+p4sTTVyu1eZ5HV6S7GCfTPmQCbPsQyZjdcdl+MP32ajeRQpnk82qXauxHkIfhW0Qkri1jNxTl34/yZ5Isx8JsLzafAselAhgIkTPZcHJ0uchF0uqiGTlczBsOswXpxhDpUhXNR6r7eUIPFkepuOnWqiZkieBn2cStOrTVz1cC8XHXKHWb1CreuPmVvnYVv56UeyLlUW6g493g2S2N9c4sUPt5bgSycqT6mV2xKwt1Eam/FuWExpqFys2xkHmL7vEP32dmOcqpfFPt/OSxWEKDX1ysOr28Lbdu5Z3/SPSfhGtt1Yt87DBuAAS/qt25av0ZA7JKZN4QJ4d/JGLB59kz6aJFj+eM0eZpJeBqHavsLiL7GjhEAySOeem2EUTsyhofRR5qkjogMCENy1ycTUhGiqWSIRQgV7ZFUVpGdxcAHu+KZAqmIkESpfkwtKhAZTUXTnV1l9HdWSRP9NJa64lWlX5oSdNaWpWw0h3GmMbY37zgBHtBpniQQsl06fE5u83EymJu4+233XLlxhywbc916pzXkSlv3712dXl+0tiSzBWvMH2lNZlxjS6z9XWvzQfNYyuSi97z7yW0bevuFXKvdLdlEi8dQ3jS603PXdm93qycScokeHyhZYY2jM1iZ2NT9nun7ZUMKbA3DtRO+R6IQMeexd8mQ7TIXRbZrbyDbKbFC4ylfqbngdinGxwa4HT7fK+VkcMhqm1WSn5dC4XgimZkzlt7+B+DcsSrQhbHuxsC/3nJBvDvhY6em981i3s3lSRZ4ct9bR/sDo9zgyQUA/zq1+XzkRbKtPc95oQZz1T8W9Q/TqAsi/20D63Nh9D96JVqgubxIky48Dch40X5RXnQ0eREvsN424RDSTV5w39PgRTebh+fykcdHxDL5aE23c6bUgskUM7cdf4iQaGWvC8vJcu6k0xcUFfoD1vlvSkuDP18E/iwho+RfNf4MXpQ/I03+FApqGlK7YrpgZkLGhoWAW1XgVlVUyjh7xZ/TDaycKvOrsjjpKVuded6PKzCOVkWGvsY5OtnhHTbP1loKUx18lAAHh4bLmtClC4P4tOoskfgDakbO5a5aQIT5WLn6Jvh8/qmCC7N+YEFu6LzwHpw9Z9xgWWM/9Np+TLJ5gx4ygE9TZzvScdEdKTR3JFtQqqWpJA+peiEqGGQb0j5PlfGiFS4gw+5qcl3xikoF3ynCO8WCWoGEakibclcTWXSiMcyzO6r45GtVMiGMXQPgufCHyPZs5bOp/M1bi3N7GQ+mPJzJn+A/nc80LtUiqWmfZha+OjvXwHmtczA72UOGyBf/AEvZXcCjNcoAOw9IleGm0QRbiSF5EbxzUXvc1xxZL861pMoSfLczVMcDgmqxnc9DLJGek5K5vImNxnU2mLyIXVUHQB9q7W2d1epbsLGzQxLZORMS81i+QppvdXV8YMKfi8by+Vg0dxELrPLZietmxyZYXv+68D/oT8Ev9QLH/5LU0iyvh9wAh/DVArDeQzm+vxX5WqxZGciL1Ql8L0fSHuB72djkdAdwT0Lu4XOCO0SshGBPIwqBULmIx7Qx7A/ho9+LjLkOiRWHlB5J9WATKiqrPhBrpU+a9MfTAyxvKqchTAqRZLbIw6SaUfJprB3WLeStv0/D5mygyMzncrrUyx/Flven169Zlim1JpZLjuM7Lo33Pb6NTteXblsxsHbbsVX7Ni8Z35pr7Vx91TbqPkV3FcrXJbqTcZ+k8bd7dHDw6D6//f7R3srgqhUT45zH79CLunet4/hOCQ0ntkg+oc1JZLQ5iXPBYlFsowY8x66Embob2FnoHIpwaS6MbJrmcaRrIx/pmgWVVRJMZKU6HnZU05JWfFPapMloMMVENiFP6jzOHGNpCkPvBAio6sw0ByMuhDrrXnwuYlEw2vsWjkSci047/Q/z5yF0HMeVYdUGeEdkPpJrFBKRIEdyDWIHq9B4YgaCuQYZmGtoFswVz34yrGwvjrY9p3PIPn+AodDJC1Fd1ajMT0Z7dQyE9zz4rhgYms6D8boaIsLbF8F5FQ6c+gWHep1HXxjou+HCSLVKdB5954DVJjWwWqQsEo1r+HrmWHUBbSGNtijSFrkYdi0mlovj126H8G4RDNtJrU4+S1sL5JfvXEhbAmgLc9rCQJuvwHp3Gm1hRltklrb0nL2LSM+zvQu28M1TzYGFJCY0EhkYmPe828dCNhc9zw6u57FabpFNpE9jhNbYR71G6yTQGiUZ0o059HxqW/EJlJzaGMNdUbpKUwHu+9uLDJ1RIz1WnPRaCeLfBliaGG8yYbLDGIf72QDGDmpHgD9vHNGV8YRXVpp06GReU5qLTxy7AD7xHL+u8WD2zkJurOUu3MW48Un+wwLJpg03/mVkDJVm6yO/ZZiseAZMRFRj3qM3MEwdBllptTFMVgtDBUXAKmzVO4AbQnNeQsQxCkezVW8psqdKOUxYN7Cx/TewIxgqsWnPwNI1mvcNiC0jqOTlCMGalfqE7506+925AKzNnn2OYX2K89CXF8GOdfJ16s5gF/xC0LFsnYgWy4CBmhixqtOkIZbOx4rFPr62xidAweZhxCa1eg1icdEQrNNI3LhO3sM3sCaqk50uZGc0VDuskxbYiIH1jCrCIkVr82FVVrHZx7drcw94jJsKBicTIruZHbpQqVNDq9fNaew3litwHZEbXE2ynv4Cxupmfg/rbWFYAvgEpIcb/XwG3chjN1FiK3Y5GKRctNnTDxYbNk+DGHA00EcdTYBHh7vZ2wct8buxlR/mPW7VwM+BqH4HayaoYTc+6oTZRJeNFZ+AsPmN/Xmwvey2not7VqNy/QLwgrMfnLdLt8328xMzv6Y/E/6VBCGvvYXU/Eh1BHy8XdCOgOIsg2YhjM1eSYuPHeCIc9hr1itpATJqFrsDNTqOY9lmg80pyn4rx60GyojaiidBPaTxyEfFLk+azC65tem+/BnskhRouaI1TtAG9GlxJZ7YTtx7pb+tteM233Wtm65ZccJ39FN3HTx8294NwyPr23uia3/1tveYqn3rMivaTZHkqrHs8EvP3PzYw1976Zp3HL12zIH6w3BUIU+Nk35E/36zSKpg/tQsZKe92R7YulbMTgfeDLTqZDKig/SzwtPPi+Gs4qPA2zHP7eJJKuI8YLENYazapSmbN9TawyT/HPBVtQcPtiQq1TcDw3r+sfdFAVpvX5CWXhCwVRg6t3PZ8LW/BntgBsvlJ3s1iyA2UFzxiaMWsAMBJl4OH3tmqlsDcg1qAy/4VAS39DzCuVrtNsYIn9hEdGUWTLHNRXZtlsXmobtuByN7/3yEV2HvqemvN1Fe56/XPWe9c1FnWTAXWAx4NqgBz7KVerx+1AADoi3OQ6DlkZvnPEi0PKiZh0Z7GIztAkTa/4VnQ+asFZ88f0hbq7uxVgw8rQxeD9cq+tjZYp+2VmwIixpvfdILuGKbw+piS5bZcaCge3bJ1sYDXGZZPKeoNI/Lu7nd7Z3PaPokKxwtxusvwvqTpJN8SFt/prH+DnwaLRheUL+wK2hmqJ7sCDqWWn31SWsKghHtiAiWW9s5aZM+Qzvcl/h9qTDl40qFR9KlGCLjILH2YCbPZwA6MrN0BtFpW7DEb3dJ2tPBmhRfuLwzjwkbF6hOZAE3XjynhDPV5Ixe48sk8EVm85t3apzxNTiDYSl4+HRpys59UbzYeMCKGxhgcWOUhtUCt8iEErmSMiALowEM1nESk7HLyQ8gh7VTYD42l64ztrBaY9i3GGrygooLJ3tucMYYsJM7IoNG93P8xwb5Zxvh2N0a1bQw2/DXgT8aE74kyHDlIF7SRRRbgZ2y1oAivAVV0rDx9WcQ/s/iwvgCpxk03AsDXyzskKgt+xZh1fQzia5EPOBP4Es3dVarHwjE4TpB93fhvYZMKsD7btB+zA2u0CYtok2d0h4KDJz2QOjr4b1Eq5NP53lwbkCUGdrX8wadw2X2s7M5VhniMwb45eBQskEE6yE+7CsrOlk1mGefN9L0f425AffcuYH0nYernb3J3gN3HR7q7Y/3b98T/Ww8P7KumuwZ2dAG/PXtdu9ddfeJB8IHPUdWvmvNMB0Onpj+Veqq/TuH+ZwbYs+CzQiBR/zgW0GfBTPCTif/YQC0cQ2AVhVa2OjupC8cYRMVGg4tQn9eHIEW7fo5KLQ5HOQ6DxItrZ76o2gO/ylo5qC7k76WsEax6ohU3zTN6BDOoflDOAx2HppvPjWf5gR59C3TnPxDaU4t2Ocp2OdYokF29C2Rjf7lHMq7tJmy8xOPQ2U6jf5JhtfXRT79ljiQKigdpakoN63ZImvfnMOOyRY9GtR4oH5exkzmXPhQynSAHSLKBXibJ96C7PGxQ+I1k91WffNMWWxw4BwOdcwftDoPo751zqSVwLF6NT0pnwetV1MJFO4mYC8EE9rp0gsA96IcLwrey2T5AgC+VzB59sDaLLA2PP/8Pu05XKHGc7gQfN9dUD0GnGvQnn6hCAU27ehjT+JSdQi9f27wzcAnWQju4lUdi4a+zx7BJzD0faMdd8iOE3F4BgFx6Z3s2RGLP6xr7gN65yDve25G2P0T77kqW5FHflKWtnRnEHi/MKA9O6YJuw9htW747Eeb2Ps6bV8asnzl+XZmMbFtOcMkNM6PTM4VwZrej2PxIISTOqPAcClzcs1stTTl8WJQzItJ46I7vEAiL7DXLy86/8eem0N/BBnEjgtWPhikyUUel8OwRSwNJP7Fn4rTqHLMrxVQYtWekx4kV2tPQEDQFzyd4Gmci6kZMH/WI7BW41HcCoUPdTJUK+38DOJQaKdqsGDkKeKJQsSQlkX+ZDjJKfEY3OnRolB3pTlmAgHCnAOTJusB9vD0S0Mn8fnp04kRaRUNjlILHyt5ZTizafob4snn2w3OHxeBBgPQkGe1z+2NJ1kb8BQKe7AhQsQUGNKuzJZt87BzQec+v1oHph4zCZvMHldIVB0+tNrEwhi3ZrdwnY2nNJgMB9fdlNkWupo9QGYNbRujJWDsF6vZNdNf4zL/25J2XvM3ui8JnwRJ7yR1widdAqDnCbxow8ZadP7ZpQ4dO87awWpxHWyEXuD9zimnP6G/8FEwnkykg2CgId0HgqLtxSIr7/mLmInOP0SHWxMWIb4Ot4BZt4qYXuFxJZZaGNOSPKlPtOEYg+r2sA1UrOwxMxbeXfbj6c5YO39AJknDawfEhbk5M7bnPRlr1OZu+YOw8/s3nfzwID25xOn8xgMuPKzkeuBXLrE8fWjlgyc37zt29fPXXPP81XTjxw5uveOm+SeVbr5z64Fn7/3o49T50ce0ePfXOjPr+7SSDvIx7ieVUEmVLHXuM2M6Hvvice1WHT4Eeyrt8GG9OI2FoU4G3BOB7DLCQSydHnZCNsPjYvSKCJSSxBJQSMeJN+CBjow8aZJ8ad4jY9KO2RmeGE6D7X2OWN2BCIscWqVJGk5yrLm+3uZTeOYVjLFrJjTw5wyNsvk7D9ww1H9s8x46fWbHusFVWzeeGF996EB8VbV/5cp3UP8rhY788B3fvf+yy47u81h1l11ZrgwdOkR3n77qqtMnHnIOja3mM2jsedW6Z8H2lskjb+GJ1X1v8onVFe2J1aqen2tbauUPre4u9uKklRpAK1X60zzAGkJorOO+qedYC5X/p7Kri43iusL3zuzu7I93d2bX+++d9e6s1+v98do7GDDgYrdQl5QgQ3FxCmqApNA0pKRFJbRCqdoKKUqMiNSIp7ZRozRRqUJ3bYtUSM1TqRS1jURESZu+IKFK7EuekPJQYfecc2e86x/AefDM7Hh35p5z78z5ued+36GZzd8f3xCdtdy8ePED4gn9nJ+E90s/aOvXG2Uiwdi1bJLB2ggfSaNSJzOGlCTzsrdIRTKKNu4RtCQlgoSgwr1GGXMvyKonuEmaRQRGK1VHN8xPIgt9PYamZEBo6jFsJVILdSRbNZnnWBx8mQpq6dFVmZhlLpkLPcKw99XpmXtUlea8TopNxCl/AiH/vEEnimD+8VmMJpAcydmDE3FNQxc+HGpm3uuxMPoeX9a5nvVfW+b5nbUFrOsXfP5rrT8quIppnWKUnf0CbMWxx7AVxy26hnnJqxJH3sYJi7kYDmt4ixfPixHQyV8s/w67W8jB/wjPBMoxu2EGCgS7DJvL0myEhwIFc7oEIpVfW5C8EEdQd65gpED88VBkdB1mimXpVhBULL4nZOskqpDukGycuZYO8f9Jf4DnfUJgZuIkSY8JLhZm0SkrpRBxQ5omvufSJF+6B2WmhLniFsXniKgNfqWF6E41oRbjJ1JUWEyWtAKl4MqfqGTOnEnlx/YVhqrTNf2tt3g4pT87oudfLERHk0cP/Wf462MH8mNGKh//mvaN6alhY+LYy0Obd2bInzwl5fgrNEdV7uBh9gkeZsQelIPIyryakVlkPE9Zxew5e6115/WqrOGycSQbct2+nqPzegjSyKRRQbKM6j4l1GupFK73grQFrneDaaDTRrDWdIEptngEEBeZ1wkuD9sp4FplMiqIMWjDtZKDG6SlofDYdgu+D1MkLV/or23dMlic2PvkhHTd5y5mMkW3b3LHdiHLDWkfH5L+xHyIlejpwErsIlfJlWjRn9/GSlyGhrqRicYymVg0I/2c9rpOtvMC6OZFGUYni7BdhL6Ii80hWJNlkcID58GbpPlkFUdvUnBYqrRwV3ZTMBLGSWNwXSkRuX7d0YV2aVGplNFL0ok1xUOcXVsqcjTpflZjcxL6OV21poJJ5YCYx9NahCzZVLqIYaAhgZ/mIQqRTVtMsAuWs3FtV2XzqJKMp479Yt/I4I5RR12h6x+Txvgvpb9AfDDJ4OlFH2E+7FLhzSsrgimM37ay0VhuDsNhwS9y0+hZunFBr0wTsbJrmTLyYTnnY6tXY647/yL0/2+a31Ys1nFHe7RDb3hWj3FEm1MufHvm4s5Xj/8ZR/kH9Jwz9jG/z4OCc3wV9rCASB3j8Bq5//HYGLO+L9977Pfle/b3DX6dXZU+hHckPEN+6BZfi+B+RbcIgnfm9AqyHeghv01ULnomZtrqOVqeksb92ZRRlqIzh5+aCLrDajJbx3tk4B5X7HtAO7zWPaTbiCc8J+G8LZMU+x7eZeJOzLwabRTazJQ0gXeoHOXXZ74MNwjFs/XSoSN0j6Uj7Ap7/gvfI7b2HuP+XNIoH3378JfwFgm4xcxhUQvAr/OXSI4Mm0ZtNdImKgyCFntB6kqdobnApyuCWHsEZxxJWhTYqtOCTxA6bTJ1dB2tbnm4lj/EQ6GOFQovdSpfQt3zM+02O2qNbhOVQ0aidx39YPiF9QlpOBtCS8FCMavNIb+1EEPoj9Kpa3vJfGiv/YbanlzTfyv7UsK+5GeoL+02p0Wbw49oMzH9wdkUemYspVptTmGb44l2m4k4fXWvL9fCGOIf7VHwJur6aVL1igHxT7GjUzh3pC39lN+VPoIjL7S7G7lKhK65DydJKLj33l7wJFkB3kIedV7zIHewDyI1X63hNIl+EkN7r49wVyWaEvRgpjKA6SI/aF5DKThIMQ8GOUhxWXhLLKKANYvJhgyBvxEbwfB/8vXXfzgQKJUChUq1L5C8uGcPv1stqsald95ZfEqW9+6d1dVidZAhKuzSeavdHmp3gunMYM9R63XR+p46GCSEWXb5BLdMvtZQbzcidYSCgLFPKa6wqoXGu2TF7esKBKVkKtNLDhC1NgAurpCm6fXjDHpo3tcVT5AAOzkIINtSKIaCWxIljKLItjyT8PddMzA0FCgUAn3Vii3YRfj7HsrG37UkfPf92dm9sguEXHwOpeS/ErJydpnd5e9LKOkg2tgF2YG47daOUInBTrgIzN3aWdjEIdve5i5P79g+PX2Obz138OCO7d8Uc1cnlz6XfwaeMvJipNluixM41GOaZMa7oljlgKfIoOtke51B8pKxMjMIh0EBgZoItnA1FKOA2zK3+XWOTiJEcjLFi9Z+QOxTmwkxOb9ih21U4Jm67/g9+IseQoDM0HrmEfYPUZVG6Z5GlUgfGkSVajNAqc7WgrtLx6yDGw4TfXjYGDGbCWeLVjuL5eBIAuFdxg9GwXAoI01KlgqmcVkTFrBgcmIYDoeJbKNZDokgPEA1iopbCkUwNMpn4WM4nkjrGCU0Nw3DGBqoDhZpRLkRfC+aKlC+R8WICt63AfEwtEOjbqQQgKgbUUPbUByqWVeN2KrPmQOvHNj/6v6v7pua2jeFgKEHebx96k77kH96/PTp48+cPv3M1avvPfgxIoX+1TrDtcW3+ZGrKz4Jv66ffYX9jXCPDWa7pc4g85OfShDbTqKXdRCgSAcrhcVIgdcYhGvcpGtk7WvAj3GI+oV323QJ1CNxBRtT2cJTpnYsPQ2bSelNGK1REQlRwNvhFhigqt8SXioKRvbuLL8k/V26DCOmwh7gbPCcbhRN01zoEmjAnnRvfykfq4OvvOAKJXN9+ZiJKNcIrxyOQwDN1Sbztsghr5LkmsDy1UQU5YbYyk1FW27MH/oJ5M6PrrabMDrQzy4IP7sMnwr047kC4uKPF4rwizIlN8ohxEUSM8I9cMke4qjrAUuLxFdZgoPOZjwCOLgsC66eLFYfxOLdIusOfuc1tz/ak6Vh1QhqzVSFEJmbkZi9tJQyhMRQMQLBG8K0xnBjsVaMKEa/dXT2v0mXsqnwk/5Nbte9E7t2P9vb+7x+JDqT+VZG2r97d9F12xGNOD5xFQdjXQvz/pjzpjMScd767LNbjmjUcVOMm/PcL93gk20/zt3Cv44Owwn389Ie7t+2jfw+xu9w9DfZsJbV8HixF/oQA/pe6R6torpl1V+lRP1VMp23shwOs9ktt7Duas6VteMd2CK+z2BtYcAi9qlRcaNSb+a6iQwwR7n+XB/m+nN2rh+2TvhZjpZ1Ngr1Zry7NZchXKoMRJ+YiSsnWnNlIk4spzwCZRTBH+Z8AaTmbcS1uegALopolEUCN8sJdJam+RvKaHNgEL4c0NQVPL7LtrzfBWFrB8KzoXVAS+bSI6Hx8R8c0PvKT277aFtWrX26OfSJZr6hV3S9ghMPpzKq+qNL6Xg+tDX70p7U4hNWxdWpxTew3Op0Ja1Hojr1Eep2iHR7xdJsWGgWXmNtzeprNGvTKlqaTHdqEra9D9EnxWdYsRlbrti0IG+6QYtYExjLoYeDWOKqQLVHzTXVGJavu0h3q/QV69ST0FyE9GWpaYdyIqqN3h3RqsYTE6/NamZbQ8NDDw5YXPTHk1v1l/fUSEHs/8tKlrF42mNgZGBgYGJgWGKy43k8v81XBnnmF0ARhnPMyZ9h9P/4/yIsK5kPA7kcILUMDAB2yQ1geNpjYGRgYL7yX4iBgeXk//j/CSwrGYAiKOAFAJpXBwp42m2TP2hTURTGv3OulVIrRls0f2zTEkO0jRHF1r+YhBbEpnYQRQepthWVoOgkDkUR1MVFiDjrIIKDg2iGIuIiNHsdJIuREiyCDkYqVrx+9/KspTTw455373n3nPd9J7IR/idHCWM5hqtSQFrnkNM09pvjiOtb9OEZ0vIYRRKXBvpNHpPMT0kWO7gWpGZnmb+NjJKeII6RXQGHSZr08p2zJM87brl73Cp17DHPMaw37U89jW69jl59xTVHIohomc+f0C2DSMhrtOoE95sRM+Po1AqiWuV5hnlVpPQuz9I4qCcQ4nsRLdo58wjQU3Zeh+x3HcJ2eYJ7UsNarhnzGRV+E8hFWWDvMTTLGyS1D1vkC5KSR4euwVbdjTYJs36LfaFNjKOsX2D9vSTG/BQ2aRvzb6BT7qNHRlh7H6Ly1S4YY//IPFrlm7Uyw/p15FmvyjXH7z/pdGfPTvOkjjr97C9/3kCWFM1tDMgkumQKKa+Ze27gvBxhD86LK9hMYtyb0YT9ILOs63xp4CX3s/KA51P81gkc8JzjeZ0aOb1XwIzbae9BLvAggPqHvAeDaCcb6NG6Rf2Xwb5KPi57//7jPMggoWPUkHqvhL7nnNADr/9SwtTFeRCmnmH7W0Ps65/+y3C6+JgeLMV5QK/avRe8i3PUQi+bTI0972Q+Z8f5tzgr9It7q6nlpYDL5B25Q8pkLIjBWQIqSJC4Q0rsteRX979Z79ARPGTehVUu5wdSJIOn9ozpxzXv5UfO6iHO3AA6/gJawdB8AAAAAAAAAAAAAAA+AHoAwgFoAfQCjgK0AuwDIgNqA6gD4gQABCgEQASGBNIFRAXMBhgGhgbkBx4HkAfoCCIIgAiSCLIIxAkmCeQKKgquCxALXAvqDG4M8A14DbgOEg6CDtIPUg/CEBIQgBDyEboSPhKYEwgTPhPQFCIUeBTQFPgVDhU2FVoVchWUFhAWcBbGFzgXlhf0GLYZNhmYGfAaXhqiG1AbzhwUHJQdBB1kHeIeOh6sHuIfYB+wH/IgSiCqIMIhIiHGIgoijCMUI4IkCCQqJNolFiW8JjYmUCZ4J1YndCe6KAYodij+KRwptCnyKhgqaiq0KvgrEiu4LHotVC24LgQuUC6iLy4vsjA8MPAxlDIuMsozbDQuNHo0xjUYNZQ2BDa2Nw43ZjfCOFI40jjsOV451jpOOso7cDvQPE49AD2KPhA+oD9oQB5A2EGEQhxCjEL6Q3BEAERURKhFAEV8RfRGsEcIR15HvkhKSMpJCEl4SfJKbErsS4ZL1ExSTNJNFk14TchOgE8ST6hQOlDOUTJRoFH6UiJSSlKIUrBS9lMmU3BTlFOsU8RT9lQoVFpUtFUOVWhVxFY6VmZWuFd0V5ZXuFfSWJBYqFi0WWJZ7gAAAAEAAADoAFIABwAAAAAAAgABAAIAFgAAAQAA/QAAAAB42sVUy27TUBCdpE6BDUJC4rGzuqFIASUBpLasIKpEkbIJSBFLx7Fjq4kT2Q5V2UQsWPAFiB9C8FecOXecB6RIsKHRvfd4Zu7MmUeviNySb1IT/dvc6zwd3iNy2JO7K7yP8x60Ne8GFIncN1wTz/touA7NJ8N7G9iDTYUbctP7bHhf6t4Xw9fkg/fV8HU5adw2/F3uNHqGf0irES67SZCXUe73o/FiEuT+IBrGs6xcyqGE8lB86cpM5nIpuaQylkRKyNpyLEdYj4iOpSNNSF/CopQCK5dIAplCdiYZ/DymvkvZkJ5G8BVR2pMX0PvyDnEWOAPe9hEpIhoitg/rHJoMviPc9cFItVN4KvBLcTeDdIF9RI36meC3m9UceMY9haxkhHV+Bb5K6NVfYSxDq4LiKfAI1rF9F7AbIlYKqwgMqjt6Kocm2WTknZN/anxS3FswJ42Y8Hx6Becu9Fqb0vI7xK79eQsWc95sY83oT7lklMWsjMup4rAZqcsbrg75X3lTnJvXS9ZU/cwhLWhbRbtgLon5chWosg9xut49X3XlPadDq9Q0rgHvKUoZOYNVadX2TTYBjmmXkmFA377NRTULrospGagutu6F8H11rVz833vywCZFJ1MZT9mf8xUn5XBOthfk52Z+RE3ByAl1ynDIWdGvXznrTK8nLjUPuzLZ7uv2tGz3dZ3pCb4OkNsZLN5g9eUU/489engF1IfsFPs6J9fBsc1wZBO9uw6O15/ehQOsJVcHe4svip7L/8jp39+xAd+rqrq+5TIwNq/RywmlLe7PUP023lHdO5B0IG/Lk59ypQTdAAAAeNptz1VoFQAAQNGzZ8zubmf3s9sZm+3s7nbGzNkxY7aiCPqlWAgqdmJ3J3Z3d/7qw28v3P97BfzjT4wa/sfbkGECkkgqmeTCpZBSKqmlkVY66WWQUSaZZZFVNtnlkFMuueWRVz75FVBQhEIKK6KoYooroaRSSiujrHKCyqugokoqq6KqaqqHWmqqpbY6ItVVT30NRInWUCONNdFUM821EKOlVlpro6122uugo04666KrbrrroadeeltnlkSHLQ/9zLbYAitttN589820zHc/LLLCXCc99s0qm/zy029rbXHeWVv10dcS/VzU3zkXXHXJZVe8M8AN11y3zUBfLXXbTbcM8sEn8wwWa4hhhoqz2nAjjTDKaPHGGGuc98abaIJJpphsvzWmmSrBdB99dsAdz72w3Q4vvXLQa29scNczDzz0yFP3PLHTLnvtc8pue5w2wwlzbHbGEUcdstCXsIBjjofHx8VGB4PBv9TtcTQAAAB42kXOzQ7BUBQEYFepVov+3P4RQSQ29zW0m27Eqk08h4WVjSXPcmrl7ZjIcezmm2SSean3jdS9V5NzaDqlHm1X2abZUNDWpI8I13ZJtjk1PbLWJVlmT4N1+bQmffPFEBj8YAPDC2ME2DuGA4y2DBdwNowx4K4YHjDOGT7gRYwJ4DMUTfnKDO103jedVZ3BAJyFwhAM9sIIDBfCGIz+Ww3GhTABdSZMwSQVZmCaCHMw08ICzGPhHCyELWnzASCeZioAAVHds3QAAA==') format('woff');
-}
-@font-face {
-font-family: Charter;
-font-style: italic;
-font-weight: normal;
-font-stretch: normal;
-src: url('data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAHLUABEAAAAA3yAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABgAAAABwAAAAcaEQHCEdERUYAAAGcAAAAHgAAACABFQAET1MvMgAAAbwAAABSAAAAYI0ffLBjbWFwAAACEAAAAaoAAAH63UMlG2N2dCAAAAO8AAAAKAAAACgEjAQnZnBnbQAAA+QAAAGxAAACZVO0L6dnYXNwAAAFmAAAAAgAAAAIAAAAEGdseWYAAAWgAABkSwAAyfyIjN57aGVhZAAAaewAAAA0AAAANv7xC7VoaGVhAABqIAAAACIAAAAkB3gERmhtdHgAAGpEAAACTAAAA6DlmxNubG9jYQAAbJAAAAHSAAAB0jcKA2RtYXhwAABuZAAAACAAAAAgAgcB5m5hbWUAAG6EAAACYwAABlgm1vBYcG9zdAAAcOgAAAFwAAAB+tWmg65wcmVwAAByWAAAAHQAAACMsPz2Z3dlYmYAAHLMAAAABgAAAAazdVHdAAAAAQAAAADMPaLPAAAAAM4DAEYAAAAAzgNj8njaY2BkYGDgA2IJBhBgYmAEwudAzALmMQAADjcBGgAAeNpjYGJcyjiBgZWBhWkPUxcDA0MPhGa8y2DL8IGBgYmBlZmdgYGTgQUox8iABAoqi4qBIgq/mZh+/RdiuMV8heEdTA3jI6b5QEqBgREA34EPywAAeNpjYGBgZoBgGQZGBhD4AuQxgvksDDeAtBGDApAlxFDHsIbhP6MhoxNjMGMiYwVjHeMkpuNMdxVEFKQU5BSUFNQUDBSsFFwUlZSEHjD8Zvr/H6hXgWEhwzqgHkfGIMYEoJ5aoJ5jTDcUhBUkFGQUFMB6LOF6GP/////4/8H/B/73/2/4X/g/9b//f+//Fv9Y/359cODB3gd7Hux+sOPB+gfLH8y7f/DeJYWnrE+hbiYRMLIxwDUyMgEJJnQFwCBhYWVj5+Dk4ubh5eMXEBQSFhEVE5eQlJKWkZWTV1BUUlZRVVPX0NTS1tHV0zcwNDI2MTUzt7C0sraxtbN3cHRydnF1c/fw9PL28fXzDwgMCg4JDQuPiIyKjomNi09IZGhpbe+cOG3OwgWLlixeunzlilWr165Zt37j5k1btm3dtXP3ntsFySkZd8vm52U9LslkaJvBUMjAkFYKdl12FcOyHfVJuQynGBhyqu8xNDRPPXzk8pUbN69e286w//gjhgcPnz2/U3791v2mrsbujt6+/p7JUxgmzZo988Dpi/lnz52vuHThDABeipnsAAAAAAHiAp8AJgAuAFUATwBRAFUAYgAoAEsAOwAzAEgAOABNACwAIwA1eNpdUbtOW0EQ3Q0PA4HE2CA52hSzmZDGe6EFCcTVjWJkO4XlCGk3cpGLcQEfQIFEDdqvGaChpEibBiEXSHxCPiESM2uIojQ7O7NzzpkzS8qRqnfpa89T5ySQwt0GzTb9Tki1swD3pOvrjYy0gwdabGb0ynX7/gsGm9GUO2oA5T1vKQ8ZTTuBWrSn/tH8Cob7/B/zOxi0NNP01DoJ6SEE5ptxS4PvGc26yw/6gtXhYjAwpJim4i4/plL+tzTnasuwtZHRvIMzEfnJNEBTa20Emv7UIdXzcRRLkMumsTaYmLL+JBPBhcl0VVO1zPjawV2ys+hggyrNgQfYw1Z5DB4ODyYU0rckyiwNEfZiq8QIEZMcCjnl3Mn+pED5SBLGvElKO+OGtQbGkdfAoDZPs/88m01tbx3C+FkcwXe/GUs6+MiG2hgRYjtiKYAJREJGVfmGGs+9LAbkUvvPQJSA5fGPf50ItO7YRDyXtXUOMVYIen7b3PLLirtWuc6LQndvqmqo0inN+17OvscDnh4Lw0FjwZvP+/5Kgfo8LK40aA4EQ3o3ev+iteqIq7wXPrIn07+xWgAAAAABAAH//wAPeNrkvQmAG1eVLly3tJR2VWkr7fvSLbWkbkndavW+2O3dbbf3LbZjO47jbM5OEiAsGSAhgSQEEkIS9mEgMFVqJXkEJjRDyAwMMywzeB7DMOyQZhkgTiAecPd/zq2SuttuOwkD7/3z/15KVSV1695zzj3nO8s9xbDMyPzviJf9BGNm3EyNqRsZJtfQaBmHNlfnWSZHJE9RYk429EYmoM3JIsnJekZwyBZ3rcbIvEZwSJZaZ1e10lMuedwufSKerjqHSLnkdnGakZjojce9Yqwrb4imO4QjnWI8LnpjsfvI6yYG8p7huTcyDMMyHeSjJMJ+mTHBGAqMZChKjnKD1TKcNidZS+oQZK1uVtLyshmGYNfN4lCYzi5nBb/KThKZdHXhtKM9y0b5CPv+bDuJ2aMs+2BXl5b/7ndtulKXxQCvDP3ekflZ9mPss0yAieD3MkXZKZbLMtHOykKwVJK0Rdkehhs6uGG0lmAk0aIco99b7S5XE/Bf5Oh/d4L+z1Th/zCBt0Ye7XzkU1uKk+/dVNx450NdH5reWtz04Jbi1Nj95ff8pHhv8deO//iV8B9wcob/Jfwr3sswGsY9/16WZX/KJJh2ppO8k6nHgRtSpCzrtbNStlSP60256ZF41JiTYiXKHtkL72RgYF1FiZxssHpknMTysgmolNTNTseSJkOuEVXuJ3nZRnINu3Jl5+W8OScHgaxBXnJGTwoNl/KOq9hw0jO5RHJSj/+poRdeeA3jzpm0UoyXbDNSlJfsMzq4mNbHbM7cU0P/eur78L55msPLaSsedfCpaT5qh2svHp8a+vapU/RDPrzUTUfwBX9HfOnvSNOfns7gC/6O7NKf7sTLOnxR9I7oHQm9TXDUpHRNstbq8A5e+GrME5zVZvelOwvKHzJi0XNW3uuLxNOZbPMu/SON+IkchJ+T3R6UaH0cJJqpSV5hmpicwaRYk3iQdkcNhBwYy4ke0Vkg3ZUevPCIXKKaSWe4MAHRB8mrpp0usWojsAK6K+mMO1oxGbuLpXWrbjpga7eOb47kdZZkunNqw81XuLKuIwcn831jtZEV7fmOB6+2+AnRxie7N5zg1q4ioXsPCDz7h9BU35YrrZdcoiX/uTL+U/PEnM0yUcmUBJRfHVOaf0ETh7VrZQQmxOSYKvMppg6ynau3w0EuaGbrdhCSuhYlxa+ZbZhd7VprTjbDabxCT+OaWSL10iXu0DNZYL6Dl70gJJxyxfFyGK46lKsOHiWikaJXcg1kzOsQHHWtWajVanKpA87j7fYaEtIMjJHDHbWa5BLkVAnejlfgDgOUlPyC7OWQos5KVdEbHCoOJykTjatcqvZ0VxJxTk+WvFtd9E6p1LunOlyGw9AYmx8888/9vV3RTLUrliEnlLdqu6tDK3o7Y8rNd102tWfd2KVb9qyd+xT76JmD5M07V287smvN9rkHj03tWQvv7F1b3rWG3oJ16Jp/kX2QfYxJM0XQiQ8x9Qiuw2BZ9mtn60nUkFktEwcNySFhq9rZhtOR5Kw5yV2WnUjQPqqwMrCyMrysBTJ16melTl6uwKmJm5X78ZYWyMEmgRwV4XEunu3IW1HaTI5pm8PphVNGdvgFR4OxxTMd+I5TkK15+HjVMc2atCW4hXq3mu5u6l5O7KkWSXfZzek5Tz9xU7JlFNp5gHgZEEyXCCRMJ+J612PVm/eNT156+P5UydL1zKqRob6LzKss1mQleeTG9ft3r62tW/VYT/mS/nuK6fKKB16/Y2N1w+Vr+oYPRZ6NHeRN2azxNQM72rQkkdu290jf+tpP4qtJZmBD5XiuNMYwBHU683qq02Oo0VV1TiRzU5fT/5azlbiiuaOEfaBENTaHv2ty/hryD+w/MQ6QcIXmes2sxIN2RmI76W+0Alld8NtkOw8rWKhJnIDrWO+QdAqdeuAvEAb+ul0iVyCT/W27dhwzbOkbjlTvMhy48W1v+ciVU5sNWevoqkuefM3febKGB+C755+G7641v9uE3w2rB00FUb+bOynbmt9NwDRKoIJMgmSrSWbFNnL0q5HsmSoqCpbTjxmm+ldEO9eMGw7ccPGuPXdnzePrbpCuuegqU9bwnmsemZub2oLr+xCZIr+A79YyRsbGOBkvswfmT0AW+bKkKUrecoNoGR8sTDeYAF9Rcp6UXCVcyGEQTocTrYVDMObqTgeeOu1GUAMgeg4niJ7ZgsuUgAWXrTa6GMGQZbhhInJ4lhDhUCRV0U4Ordmvv40VrjNOrCwHe22sZatpSHPzWO8b2X7HhMUgr97MvYakBwdf28ltXu1/30pHrwH1E2FuBSP7RXYrYIspoB2uIQboRQedgEHrSnXC4MCIxgiSYSlKppMSW2oY6fglbaluNOHbRg6mYDLiqYmBKVgVoemOCWUh5o4JCeFWYugj3NzpPmKrEevcqdrc84TaeDL/d/M7mHcxlwH9+tDCN4iGuRF+uabYMGoZN0qkvSjpTzYsRsYOOo0H8lj0wEUNEMfYhDfIwsTCQqvpbxJGjO3hSOy6v4qJN1n5cFsyuvpWOmeR+SrREgdokYzyfVqcjPpCAFKgqmWNjBG+TEcnQs2K9XvWr46Pw8/753/P3MNcwxiYbuC1isYE1DUL50QyUnOvM+KV+oImH35bT6Wn5EEc5o+XEgmfNwTHUlyhxT3zH2Kt7KMwNoGpE4ruAOIoo+BA+V7FDg+e+fw+9g9ntBQfBeZfYHlqX0LMCqZuRqPCgwrUqsiDSGG69mzGWcnGyx6gHWeclSPw6kH1b9aiiHl51PtU31eX0ehNnc7pA1t3v2Pboa177t52aO/R7QMhkT+ycyDs4b8p3/2eGy+T73rgpp3vf+3Qic3973/dyJWbgFZTMKl30fHdwtQZHB1AN8lSqhtggJKxLHMGPjpTRG1BJBulvNGIaki2q7jmf5/6EeIam2TkJdOMrOVOS5oZpq7RmhA2qK8UIxgR9erpmtETEAsz1TCoW8rdw8SZ4bqrZU2EuKcu5Q+b7pn13mjckdMLLGdyto+duc+uywL9fwZE1cF4k8zlyngbUS3jB95G6TKIxkHORapitLPTPCMagEEpXNVNChuAsn6gcBpeDUhhMUbNaT2eSFKrG0UFRGqyGWheNzj9NaR6ojqko0rfTpDs3U0m2DRcrAooxrLp4iuHesVapaPk8nrd/tymG7buSQ9dc+Neko/nI8O9q3aMrp1IVWre43aPo6NtzeSq3NbJgzuHt31YWecE7CUD86ow9zH1EvLBAFJiKMGkGAOs7XoSJ+WDe74k3vOFjbmG01ZKAgBxohh1UzHSgb3U8QiwVVBKsX4epu4BcCpnYOI9+F4M5qY3AKQAFSs0eKcvmaXm0maAyeepoczm4E2fQ8o0fZMIAQuomD6u2jptEqRpQCmOo7JJwj7BYc/kNx0f6eM7DEZ+69GBSmfRFrc6fXce2rTnyN41m3rLU5duPHzQH+a2e4+uL/dpe8mu0a6+6AGL313ZuXZ49IioWdlXPgj0V/wNZv7brIX9CNhEKwPonkUp1ZTRmHCmcrlh1jIRkE2tpVSqM2aUCMYAUN9YosJrPCkb9LMtyf33Uy+1JNcKWNzAg+ROaw0awNscHuGNaZPRCpcWPGoYyVogj2u0nMlibWFfwGmKxHR2dVdJWVPmEghpy04L+Uj/pqutV3ds6Pj5S/1/O0o+OHfR6E9/Okq6gd+a+VMsB3okyryGqYdb/A63+I2uScOpRZex4bGGeSu8aJkkaq5YUTKflH1g++PqTD536jDOROILNvQqZKfltE1yzYAld8EanLbzTlcTqTOyFXnsO5urwFRnjItxTT4iBzUxn9nmj7VNnqhbt4yRi2xz32kf7tp+oJTfefO6rZO+mGab/eoNb9CTleu/ImxfVzqcWlMGHkXnXyAvsl8BaxthdjJ1AWcnglYJFpE/APokfREdQvQFUWhdIKkunppVG0wKhdfvAgE1C0YUUJsg6/S4MoMi3GRsxpqiBxESiDbCLXKbXa256KM7t1whsbfJkW07Jg88cs3u47uHqquO3LZh1Pmty7+w7mKxbL3vhuGLt177kZsv3rLn5j3v6Omj6zAP8rUV+GIEX6CuQx6wlAd1VofSxFIzayrismJkHQuU5GAwIokBz2Mc4fLkc3P/ECtGyT8a5nq1KfamPX/ZduZmD4O+qWP+V6C7HmM8YNfKzAmG6li5CyjjKiIuJlKF0kMEeog8GhW5DU7beLkAp2bAv2ZeEnAdh+B2qCgLQK1u+ilqbaWQ8ITB5belcl10MXcB9n2c0ZmFVE5Fuj3Vs1fqIqoVNOCHIb71iNT3AoTr2LFlyx1HJ/duXLui/8HrDlyxdf3QxF67owQeCjfUt2NkdfdArdS/5a6R4+nsth03bRwdOhiKjXXtedOOXX0rtw+5op4Q7+Q0iU0k3N4f9u2qdPVuUtZxcP7vWRPoOwfIyBambkFKhIAS2mJLzKMUGDpBdzkV4bCrwuHkFIgISltrYanS9oAnILFIAZmzo3gAjlf1kqqpWc5JEbyK3YNzVxxaveFgd3Hy0P6jp3+4d2X/+lXO0f4Vl9j2fal6aPPAibbR44c+NfejdeT74xuGJ3s3Tr2OjrsI2OJn5DuALQRm3xJ0AWC6YVGxhQNxWMNGQcW0zobxA0IvJFJsYg0nOjIEHRiw65JOkDVmFHbwlHmY0SIU4mieFBU4Eo+X4vEmKiF3w0UpgWOb/x7gNBybDRDU8WWRmuQpNhzqGL1FiT/ZcCljtLh4GKOeAjhYnU0o54Mx8gDlZA0sOskioFPgcsgO6uefD9q1xhtdwHj9ypgXQz02o4ycMG9gUuwMW2T0DOPsTrmtxP0GdnjOS54jQukXQ3/37DDQ/VZGYr9IPgyriAOdqaJCRMAgMDp6RsBFko1qZCnmTsH/W9k1Z55k10i12mdgwHR9L/quaneedOvcbyDPzXnZ4dTws3839IsS8vii+d+Rv6HxvBjz0aXxPLsqp/WQHTV1KIrqIL4ovDft1jNASY8SBQJyu5UzvSLCDuNs3Y+eBOO3AAxPqPr7K6c+psSGPKDAxRmt7LYqCnza5faINP4iu0QVRrk9wBCjBlkQ0tCVsDR46FTPMZiCCzlHUJlfRKOGXjFuvGj1ln0/FCvBXftu0AzoLeVmRJFt6xheP/6hXdffG7l69bFDhMr7+vmjmqNsgxlgVjF/y9RD6Dn5y/JKcOBqRbkCK9ZKQ41pLZMCSzWsZWIw27yq31dTynQpkY8uXnYDCQZBdw3ycpbkGgYlQrZGpcJlv/mWYo9HeWlsRo7ZTktRIEE0NjpGSdA6o2TIDgqOEaPO6vCH85VqjWo8K8ZHeqq1mrxyWHA8YWDciWwXj55/SJCCCnrGyCrCZxtJxAebaA5vitWyHtCMe5Ga4NQrET6WSacAbA+TDKqP9ff0f3D7I5/uTV3atXZqtGeiN3m0p1h29JiEjEF05nMTD7/uQ5ff+swH7nit7ZF7P3HD1SS2pdLd3m4zTBz47d/d3jPw1++8anvvyHrjtl2r96/vqgZE75bHEi6nt7LlTTe89/C10oefXRPfeeL4B68a+0Yv+3pY2zIwYzXgHgfjBhmmyFcylNGDrnMmoQRwR4NQSFtu2JyMxpqTXGXZhtyhsV+M9CKJZ55/0UKBghbkTDcju3WnJcuMbtrqtgDIceFRA2bP4kZyP67VWawu9yKgYyNUywIcRqTjBKieAOCeSXBw5ixrJqvkxNhxoevb/Vzk1HHD4PDXC2k9+5ozDzh06bTO9rnP2XRpkiBRsIXzP4L5RMDOOpggk2YeafoeIFZuxfeQk3CuLzUifsZgpZGjCNwIwXQyRUk8KfNgF+JoC82AadtUCfrOqTlFgjS8pJ2RnTC9NEwv6EzD9EJ41DDTGq0zTeUJkJwzGEovmqAfJ8jXpAgNPiQdss5M0T+6J0XSHVMMJxxiGRCLJVAYzoLDwmWmEUIuObx7xyNz39iWiHx3w2ZP1RBz7L70bmcyrbexObsuPTC66qDH8Nrvdmj+uq9bV9Ts23BAQ3VTO/iKV4LeiTDHYKUhPdygadwhBB5uH2BCxCOyFe5ZKRixGo25JoYCxYJhR+PCqkJLacTQos4fojbSHYLJBWqSlUZ1dApycSoGUuQS3SjYsCqoxA+zZYoA2zevvezObQeCWUNX7cj6/rErDrXnnR25wLGLbr2HGA9+anB7/L0HnP4V3R85eOk1NuHaRxLvpvad8vcq4C/PBFBeeZyNACPnVTYrPA5o1RPqXgYpY5GfoZZv+QMqrgKIqxawDy9rdKd1mMII6E5rGFmjRbWg0QqBFgsFRUalgID+pRq7ajKwhW0zsKgpyMmR4Ah/3DT6wwcfHe2/+iu56kc2ZYpXnuhpMutNt+58pP+q4rHyfeuPXAxe2nMwr3aYV4joVJkFJ74lvM1gTMCoBjaRWc1oW93KUa6ZwHOziQwHnhus0LpNxLs2AXkZLkquk2riYFpwusCSOBT74aT5CIzroBlSgzrg2mCkYAmpvAqpvAukssIq8PLTNi86MqKXOjIK5WABWG2it7UAZCfCbrvbh7DbIUh+jKXWLQGUH8mIGpSRvSp9RUFyLl4aKEAJroyRGPB+EpoYnnmHhePmEfL1YKf5X7secHhy2Xat5cEeZt4RL0SbJL53m/2Mbc2/r7bNzfJHPgQ0/gnQOAg0DjDfX6QX/KU/iqTBV0/SpvR969RzlKRWIKl3RtbqMLKhO4eWdY3WWzgfNWW7G6yRyUGhEgN6GE6cNVlvFZZKpkI/TYt+qFL9wyCZI+TZSKfpy6W7HGJHLqe13NVlmwBlynbY9OmH9/NzL9lX//tq+7xd10Z1SAZ0yB3gYySZR5XcF9UhTcXR8AfiOitNZFBVmjqP7kgrFBgmL/ytok9FHikQBQpEwCKL3khUscjNMyW+A7Ns6MzwHWhxDYIUhhn73WrKQrYGYM4GhLpnaZ7qEs1DaPzdztLI+7YN17zz6IZQt8ZYKh+ZGlp51a70eNo0+tsRvnjrjlvvJ6aDnxzYGX70IrdvovLhgwdutH3TpstkdLbfJB5U4nWoh34MspRgnlWtpk+xmt5AHK0mSpIklKkwGXkn3GpYIihIUrgsW1QDmizKqaXLrGlhkCLmGQRwf0lFJYS5PdkDd90zNHtniZqdObg9bQ1hWi8cUjNyEbyvYZ7UaM02tycULSzk2eCWxYo3w5HoWXk2ZpEqAxLFlFyFnWhUU+yM4Zmi0V4YsxfJRNEy8sIYD2bp+VF7ee4zFctIc9mldfZf/Up5PfNNECa4T2xzz8MZ0m0WDhuAbnZm+6I1aCst5A4wpsKDD7o8YSyUMGhszRZFVJpnNAixZB50+CIM2oxjPW4ZXTREOjQYz8n5F8i/wng8GEV143j0INd6Ny5aPQvq1orjssC47DAucVEqF1NxjKx3K0lJ6sN0dmWqZbeIhrvaGgPiwWysZHHyozVxwjxyapQfD1x61WrLx15v1R64iRxTBjT30D23wHh+MP8H9l0wnjTzVpU+gVCZSpbsSy0vV3FLiGumCzPFFmY5i3AJSjjdtCUBAjIdT5hVzGJONDGL2RJPLMIsegvMzF07i6JlZRlxxBkm/cSNi6lIqFYJU0LD7HpCxKmfeH7L3Om7+XSHazBUaRevmyhYF5N/7lfEzusybfq5+blfRD1pbaDw419TEVHWFvki0EBgXq/SwLKMLbQ3bWFTaMA5tp9s8ApznGeZLwvoWvMM2i4gBqpW8znCI/N2mp5iZMsCHl08ddShyhqAWV75L45MZwKm0pKoL/E3PUHH/2MAoodoDO7d6vhdfoWHdacn0tIOFspFkH2MvLVCbmdBzZD1tBScad0GIyH5ZmRBf1riZ3CV84LXFwy1Vvk5d5TQHA2Lm2hY3LxkWs6z1jlJmAmcB4b5y8zDX9lDvF8bxkX+y9Wm43N/2XH5pfb+JhMDcxpyOrJokbNdZ+5nLz3zDWVdfR/049eABj7m7ap+dFIKSF519jY6e9nKY+2GvygH1Pl/49Qzi+fvsaPKe2roX079E97WSU5gpGNGNtmpHnhCozWZHW7PovnDtbN1Q50/h2kj45KZB0iTrwk6/Qhl7GO/2msa+cYIf33f3OmD5pZO883pyL+pbH6I7ZizKaIKfixi64fZjwMeDaMGsVFuNy1jAH3VCLWFAthCgabvZSMA0Sjm5wWwYDobQugAWnQjo+bdqdPYdCXVBHHTb2y/qHz3houGj++t3L3xuncd2L/x2IbJiybhQDSP3jK+tjD5tk/cNL72gROHrz9x/YNHrjtxnYqZI1THxZi3LeMRRbTUI+J91CMSy5hIkhwlGoAInpStMN7E8koFHaEYKBWHM4a4BY+KIxRrKhWHU4wtUioRH87ZWluCnUU1YphBNaJZSAYEqUb55uFSR+Wjdxp60tyIN2g9fv3GLdZgkzEOfn3ndfewzwA/SJ49tm/FMKvwpW3+APtZ4EuQyaHX48c5R5t8ycD83MUGT2MLROqgHAoBh0K8nMTwGcw4j1U64NlM69x+JfsvgAfHyLybIi3JL2CoMOqQrDUpI8imJcxTkhVhOK26z8r0q3Ozkbb9wMI9I6XadcdSfeXc8MHhoS2JSODqdx84gEzdN3lsYypH2EdeO762mDox9hdfr63q8ccLqzdpH7z64hsV7va8E32iH87/nt0I/O1iBgir8jcYVq2Gv7OksrlvkVPUyFXCyOxSWc4BMfLA7MGiVFW8pKGlOLXJ7AIwe2Dmqb/9+i/7lNspHpgvu+C2ODPtdomAQFL8dDwVwwqjAj+dLwyAVJTwWIe3F4qC6vAZeGFGTBqtmCoMuNyx+AIeoVBFTOULpbPeUNW0uQocQAiYIzRKJfcxStJPLyznlIU5sWmqMgWSSSt/McG0VNpCKG2rzlx+9NL9fMApmKw6q4bP9xoL3qGwR7SwxG61B/isNVu0jLqt3qNXrZ+0hJuIeWL9hivdWovFZ0vzncb+bErvcw5WTboVTo/FwP4aAxS7yM6NA70sYGkjYI55kM0Kcz9TLzcxhx9ZE1dTbksKxrCyL6WbBeIilpY7dViwIoWwKiysfChcbIQUu4dZOBHTB9qalBLAfktGx+N6lz+eL6MQdwp1AH/UbdeXFeQSF6aJGOrEd/0OGsxSiqmU2L0hQ0uqFvC03u0KEzHMNhetMVYxmfq6N+4Dzatz6L1cSLtn49uu3LUx2qG1ZPMrd8VTZZbVspsmHrjxSPzRa62hTWNGh9VmsOotWjtbXNW75zWhBw45nBt7Y51uLyEsSa8e2Hsz0CkHwn0xyLWTuZGpW5BOVtBaphLNj8sCCDcH1oNeYUbLhhFpEGRXUdKebGgUerhbsvyzJZksTnfaJhlmGNlgRxzAGex8S8A0WupEYSFDNaZ4nU37mLCTXIj1h3u05ruvtI6+ADJzlxBlTfffv89+5hnVEA7Y91GfaWT+RXYGxp9kvqD4TKhxYuAT6tEAgp7VYbzC4yuVWi6TVTfbcpLsL/LKOmMxfyibYZ2ZZhZm4uQl14wcBnwQmJkOhgMYicJjHY6L6u+CuMxYjcnsdAWCofDiZbbsbUoBK2bUleSYjqdiQkOcLSikhC8Xg1yWhnVGLKspBFxlXLNyzz7XKsvo14eFNUZzRFzzlsPHHvAPketV/PeuYnBgZP+l5HL1+s6OjhHvuq2UbhHQZ2+j+G8rU7djzRyyWDKVZQYIpjFaKMEcxSbIm/n0by+lJLEDc/kZWQ/oSAcgT6fnKcjT6ReYS6tTcMjOJpBNaDKRr/dyk8Ru6Pts99xfDR3k2ddQS/871oij0595K3vUAeOCpap5EsYlMq9TfAXJUVZk0WAtq4Oz2OngvEXMcdDBlf7rDB2cGwbngcHpcHBPzew6vVsBNA6475yRjfxpHQikhmno9EanR4UzOr3BeBacac0gQMqB1iTMOI/yyRqXemm099uG/pm+uW/X+ueHS4Iymbl2VjjzHPkPZUJ3sakz32Yvdii+7Cdhnd0E84ozA2f7srGSaj3Q5+Dglon6HERKFNFSArLCTJM13DLoGlUiRLXcTdOK5qJx3zIqnL7JNHJqzL7rCX3taxM/ezM6kPzF/2RC54D4iaCIw1e/Sl/nXpj7hrKmfvITxX9kIjDWN8JY/cztTN1F4xAaBCvLikigKAfV9f/lU+9bHHHggQv2mae+oPnFQ8ptH6hZrwHessk67rSkB2iJYiN6fc3lctb1EmFaAJOcMl0WhArWwe6vm0a+N8bPdVhHTw3z2atNKjN+TAKq3De+q0zwJNlmR178FOY3QP3jFaolN4FtMFGXx2RtujwauKehISqNDoNRir/MAApRakw4TRPvVkkC8zUxjtDAmY8j//slT7wSJp81zmVI2NbWFW9nJ6wXPZQ981nrjY/T9dc1fwv5HPsMwzGraOW1juZPsYCnmQujJP23U/9JBZspSNqCxPCgKk5jXJDwpzXTDNHqFgRWdJa5hKbMdX3gl4ZH7nnEcLtmTe6MNQfflZj/EHmuWffELK17cpZJIlEjb+9lHz2jBdr8C4zrYjquLYxSrkaLilisBpc0tBYccOyyY2QLkr6AtpSDMep5WYNjZDV6bmGMXLXsTFTLmg46wl9+4PYceyr3hydhjF8iT2hC7JcZPdZLMvhVmCQ0IHTkilj4o1YXIvhwEvgtGe5LzPyOufyZOfIEcc394pvfpHRl5l3khfmNMNcQg7lThuYX1ZdF83bH3DHywpyl3qfkFh9n42Qr+z34uTb6c/Dl5iUFa1a1YI2WDFJl7SyLiccPDZTY7z2t4GFh/nfkOfIDJsCkmFuZug9XuavcCCt5NXuprsUMHFA0gWGENDVGQTBGGZWQtzyfVBZKlII+sxmNETNtMkcVqN86UxwuLNFBfJwQpsGWiAgutA5J36oza+XEVISsJMxo1ZkzAyBDqGx6Tz7vqvCepKnHnN+aGZycGFm7ZUfvUKXNtvPajx7a/iaPJ3alXBQLpnBivWHrvp03jRHD4AM4Vx/M9RmgF1Ze36fmCFygFrCop6EBKoIJNsF0GwE6exoe9yplqs2o9y9f2KRMl+ElMiM7QGq4mWmDg0Mri8c6HBdZWUONeZwhnMGhOt5kyZVCE3TywFsAEjgz3XT+rdxqdZFn4Lt+xwMxuyG3c6C25n03TtnbukbKvYVUbkOCvYH3hYv5n6+7aP3tT29u27D18too1vzY539LriE/Bl+7h6mLiDMcSg008hRjJ+hgI0Pt+ln0sxnZghFVjjG53M1S5WbxRoYiPE/TcbFvmTzc1p0I9umGdnYX123ed9H45sfesmdHe0iMkPV3XTG6akvh4MVAczfQ/EWgeRhQ2zNM3dPMywRxOHEq4XUj0t+kYcbgXIdDa0dZU7yvCDcrRRT/2M5R74tiIPMLailVkgfjKFv1mFeEi2kuaQBWpPBYh+MiVnDACs5gsSZTTVYsvqLwxhtBvy4Yb0e5tAvTRpMnTfO8uiBYMyzNa2V0xSrySrMgqd2VasuZA6sWp5C4q+3m4Ww6sfNB/3F9h6O4KTdO1k4NTmwutA2O5zs1gnb1tR8/unF4tfD3pmDozF/F3FlzOLTKyu27aHvf6La5muZ9jErDm2GNikyU2aEgDNVHVcgVRnLFmiXVkpVHZtLKszi8BqzAU7OOd3uVKLnscCJ+CwN+axgYpW59caJazy1mdLVZmuPeldqdLvbe/SZNb+fqnfuOrNq0a/dlYU9+4ydvvyiT68mP7jC6fYMrp4q7939ct64kRg5QDHFsvo3cx/472Oe/YNAdYbWMBxSLj2ppDwiCx4fmymNVUouYRaQM7v2tgSpoLFDwz8gmM9peHajoaU5vAofSz0/7/B6aDtGb/JSdes7k8fkXBRXYsFKm5BMwDeBRLJ++UhWHSNXJDZPWhDN63AqkoUVo7/FcGk3w2XGy3nvN6kSnX5yqxe66v83TvWm99zOdfCB+67UkwsUir7szKbqC2vHUM/m5H7133QlGM//9+TT5Hvkhk2AKTB/zGPgmyJ1ezey0zdJroHKPEb0MABNPsVHSMPegkumnjEvqZ3Gvj9Gck4v62Wld0WgAPaRUVRd5WnXl1GNlkhTGJHQWzrNFOQw8HkAe6wRHnYvlMW/WLTQ8lkypl+4/cMg2gdYrZXBbgi4QzuPtEmZEJJB1o7PYTdnPKaVaarmWCNRQFFBGHyLiWdVuRaJ3ulr+sT4yspK07T0xle98x1HriUmT1froxrsO77hk47qB4Q29r9+7ORnpWJ2M5ie2FUcDenOxlNo6dbUvF4ttvpz4gvrVyeHa3jWbOocriYyv302MbR37xzqKh7Aue/6/yGnQHSnMfaJlkpkU4GkMoy1W2YjwFL0dV/W2YqZU1xhDauA+TTusUQNSahbhn2ORCWucKih4BVU6jV5w4E49e+otzQxLGHChGXEhhjEMKdT1STzW4bhU1z+B/mIonGyFHcnSG4qaSaEXxWpqNGmso8GiOOY/ZZMP7lkdkgs45kJLKaIbXrd6ArQEsbzUPiy2k92VYaIUBWjEt130cMThid2wNpO3JUzAyo3ZNVzO1FPbM8Q+YvDFRq/+xP5cKjD8UN5VMgYig57Ip9vFkak5hPtMbP40M8/OMA6wkbcwdWuzUpRFUSYs1mY3GKqqgYxYOudUDaX9JLgws3W9nWZIsKLUTre+2RkjrUbC8jOfEd10Wmyux/1bVkzT+Zw0TcfIjAGLhE12OlfnOdrVqdQcUVGMvcu/WtMZLGytjej7YxHRE416wPB8zB+du4M3ZuyRxJgzRrK/gfsdUXQN5m+bb2NOs3/DuMASPcXUzYQG2iVnSyMZi2iCQJ6kULHhVecVKUqek3JACcxSvVR48UutvIF9RjaY0WuTdPy0XoeGh8OjZOenrXascLHhsQ5vLbFDdXgTz2xUYKw6vc3eEhi0SYtuqBDB7KSaTNVerAIUVOfa0SLLbZ6j3pjNmj/yQLLXYI2Kkxu8v1Zpg5rLv3vdFMlYxNDc+7oHt8Su1qwuRIA8Cpb0zf+e/JLa6Yebay181loba641I2Fyzfh1WNeizdDnT125eCGFeSDNtD6soxEIHY1A6BYRQl9DVzxEUSJRTpT1EW6uj4VVYBRkT3BhDWiaexIyi6KpRWInvrfsfTh4/NOVpC9aTXZtGl3dKSSmEr3pbbUo+0FdMDRn+1x3yNPmySRX33clFwxseKwyQ+efmP8d8xuYvwvro504f5u6a6KhU6auoU6Im87aAnrXo876pRfeSWetAYlgwV+3UQRcZ410PwI4E/REmZmFwa13OicNtNmcyq4nrSAzvAotlBXOLZL8hOPArgcCJvaIuSp2bq6sGfXsIz8z+cMV65yx6i/ykTgdf3T+vzQ6wAgl0sFQcDXNtLWXkmIZK6HrBly9Wmu53ChSFSmzqVIJ7IrKViKVcVrgMckl0I8lXm5fqAVOYE0m6E83nwD9CfyG1S67ge0VlQBPnhpahInhp8FSY2Lq95Qs7byUnYHfI2Xg5hdO0T2pqrPghMXjwB+Y7irpQTzguCAezIiR6B3OaCyT7VoUm1rmJqVse4k6WlKbIBuKoEXDDsAM8OoG9RlMUXqLAOKwxKQoTJsBMFO7p4gTLekWL6hVE04VhmuiW6be5XNctyadJVesTeUtcTOo2Kn0GkPO2DW+cnTLgDHkL+8ZJg/w/uj+/cWOPYVMrPxQyY66dkBIfToVGNk89xhJdbqDEVS6lHcsC7xLMi8oOF1mkrD2HCrjsMgupvhj4NLGeNXuqaFBZFpSR8FDGKu2gVO8OQyc8sFNXxFZ14wcDn361MRiTiUVTj1z6hbKlAAvBWdkGzDFSqF0IolMgeMipjxB9FZbIJhoBT+WXlNW+JIKK8KCFKNbcQ0i3fYBfh8jO0SaPZZiQt3s8i0ya9x5yb+I6jehTYubK+442DQguD/Yv2uIPGj3xQ4cyKX8ww91W7uMwfCAMwFkjoWn5j6FNs0D+PnzgMus4Ak190QJ4PdRN0jUtNwgm47u2HHhnigd9Yhk18KeKFE4756oBTDk2bT26Ma9mycu27BvW7kwur9SGNv3+G17thzbc/O+zUe3r9pw/9VrNr4b7NFnACv+I/DcC1z/GFN3MGp1mp7QcBVCmQzdUCfFedRAaJi8LdPrUQLD0aWBYe0L31gcGHYDJ5Mz0+DLgQL24bEO54sUsA88IlbjcvuSTY9o8ZVieeJe3JVkjVJOcbhraoFXNA+Z4UR3wumh9W2UVSv7Tcc23u23bB8dGN+WPlJOtcX2//qz+faxgj/R1d6x4rMWMzth8oUHB3dvfcNF2aLzKSFMQoHBxNXXjXUzip+eJv9Efgr+Top5v+rvBBRXEf0drEONYeFFscFrmL1qwwEF83m5Fq4bdr/Yo5DDQSGcRY+ZYbiYdjrC1F2HYx3OF1EkBBQxWxzOZuCbLLlSKBILKPkRtayoulDMC9iLxvgWknpOtdLIN9Z2eU+65u80spce+O2guW1yYmjN5lKud7CzxFnHe0Lpx67f3t3v86VNZ94vRKMWy0/X7d/YMzhA7INkJHG9YqNBrZN3gMy4mG1KDLClHuy0WnxaY7CD18Cq6sHdVA8uHbVWskuJAjKyHU/0NYkVZAKWR9I4aPp/yULU50jGBhY1CAvPFT0w5Yukwpx/1ZC1na63t70tJIaSPYGta35O/bxfwRpbAWOrMIeb+8lghbmIUr5Oc1fCSWxqgA5NVNkmBo4OzUtFYWVN62063B8NeqJuCKHCloqOaZc/kKEOeMiAW0s0gugvUr2dUVJPzY0kC5tMFqWijIrbIoREp9fh7cx1RteGg4dXZ8uRQNYmhNvc3rDWz3n0vNak0VyyeWjVpBh0lBL5Nn+m158PDO1KBNwh0mdKh4SoW9S49AJnN9mtgnFsZyflR8f8abKJHQc5vVeJbDQEupUEt8VqyrIRlrPR0twNSzdAAD+0JQxk1O00cms3G3PNhMCw/oXvLgISOhRYG6hi8GOtCpBQNoFRHatykJEFj4D+gmQR6ozWSesmW9unnVw3xnapa9tSqh2GnqE1pYL7nQ9U9IOxoUsqW7eGU8SuC0cPX5ObezFpGHJFOxR5C8+/xDKgN5PMb5Q9Y7h72ahsg3CXlF1kzmV9A6qdYuARwEz1sZZHEKMeQUz1CPx0s8esxPOyBdxeDLM1DdVdz1+v7E9AWmhn5CSosgSYqr96/vfKfaVsRytbzUAjG614wSK2RMvRIg2tuXlJKebXgyJjjWEkES9IXupoOYGCTowSeGoyYwQp5P3BGBUw8D9ENZ1VdZY1i0IiaqAHPZLww/ywORIY2rRu8ypTSHSkt+UGyKGpfMXQB75IzDb3nW63PzRMjs09VXLwojkYGbFwW0odYopwsGZeAiLXyY/AKt2qWABKSaz/WSAmXcl+3N6DG0qb1TAzH/idvZW2wOSRGeOQzLSeU3dvtM7o3G0mGvYHF8tBTyRC681ZrP3p7NLAogf44+ypZnpwU7+eS1AvP50xHGHbwnr/tWmnz9d951s6bazP4CEf98VKo3P/ed/hm121nu88EEhbvD9bZcM4NihvifyYCTCvbUWS6zacEqu81jVLJYVOLlhsFsDO+P5wVWsFANcDMCs/QGmtP6AWZfkDC3qY8WEAwyx4gF90p0Bdz1momRKAd86eYQKQjk6JKgYM7ySqmmsTntvLA3r3myIuZ9QXuPktfd78vaOGAPmEN87O3XDmBu7OM9K+68VwoPuLMtl38e895O2o374+/xL5T/ITpsCUmXoa59YBVghrf3F+7jKRikW5E2OosTTQOInbCKcZZ6JdVVc06JQuku5qiYLNJtxED8YjtsJtGVraU+wqJNaG25JbjrAcm477dZpDe72xrtyKsZTdk7GnV7d1tgW79nUF44WsMec8uOqumNmbICsvdZq+FBOTrozjwTcEsuZIaPLmo4fDVD+/Yz5DfgTjTzB/wdS9Sj8C5TVWBH3VsKrcWCg9/fzmU2Jru6pBQeuemWm304NlG07PIlTYMBibuUiy6FzhkyUGuIkL1uhGgEBN8iIIVyJOSBNOQ6miECVCeqpl0c3plbTxibC3P78trxmyBrZdrDW2xVxaTWxkn3OynH2D747bkp3vcYe1/Zod21mSX5ngPFGy7hKf9a8++G9+d7g4N5v/fYbO/fn5F2Gd/YzpwJ1/HbjO0iqkwJ4LHhRMO4aPtFomhDTIF3EDJCMH0rj/sz2HKkMrPElYo8XriyZocNhRd7pFKm0ZwqGRF1vbkkUaARYJDd5nFvZJYWmJjew81BttE7sdIbd/azlcKXgAYAzO/eXBtcG0t+oOuIPbesJHRbvgdZI3ekLRkWg00L0jIBq6onOv98WSg8kYXOeMmCMbnb+ZfJD9HPB0K4PLCKusE0VMAgJHZRMC22RRipyU9CVZ1GOlal2MoAYWA6CBzSXkNCMn/MAfTwRhAJbYSxbgFq+EYNC8DpJKTz9x20iI0NIlePEAzImnBxHujRqF8creo9a1Pb1rJwbzU77L1vesJJYO0rfqkm3rU2x5fPPmSTu/cd2WyW6S2Xhs29oBxbZ8e95FfOwfaM6rmbHSUHSgvqg5L1EoC98e+oXmuT941dqJm8kHmnOGyTIaGs/D7b42tbkIzFlzksaZMGBaqmvonDUJmLNNnXMAIwxanLNIQ6E28BaddBvnEMEJVwv4ks5grRBOGJcn4AokQY6MTOUHJ9b29qy1Ht1bGReM4sqeDZd595PuyS3rNvL2yc2bx8tsav22S1b1kY6BtduObYRx72C+z/6cXMP4mTlGcsB6U8yoj3YE0aiZvoW89C+H/vZrLQXvmpF1dlrk8Zv7P/8RpTrAW5BFlwHesslGWvL41M9f+kIVuy1hMMqgMzlzstFsmDbSM53JoOwtNztzT/38oS9spx8U+Wm36AIo7MEj/X1eflr0wkUdfoOywLEsC95HdOxGp1znMhhNZnWXYLNgpHXTu7RghJGtDiXzrPHRnU64VxKXSFivarxMQZOI7zi6vbJbF7L6eI/bNHnFxXuyZdvKWMWz4fujq6KsSWfQatn1IxOCzmsyg38wCFjTzX6CMTJO7H9mwBWN5diY3nIgHV24Yb3BK/3PcA8gb8Y9pdSNcxjUUBoCpDKtwl6IoA0KR5S+Z5dgC7SY6M3wY+R1c2+cGGAPdcbihTj1T7Lzj5Cfs7sAjyfIdtVjt4MARkt1O90JYnegrBWVknEbhT9aIzZPAdgjGbE+y6SONKmUGOpoiSEAwYZXKdzy0h5EDZ1ypaN4uWFSNpU4TeaFTSWOVt+v5o6Bn7yQUzCSFkuC4Wcl70yrFZfk46c1Pi0W4gGr9V6Mzdno0U6PIh6XfNpPPz0dxZeFjl4xvKzDe4ucJ3D2NWALNF6fP9asutXb7KI/GlsSqtFpadxLdjqwKZ0LmWIXFRRrEmQmpO62p9CVlpelE5oSXsHag6sCAd9KdNpI9p4bnHmnc22nu1uXyE92ZTzd4uCoCPc27djWmdu4dv9nbvxr55FDnhOrXHOHnWuvdx86Yj24ubbBQt7tuhfsAngubIL9OBPGXje0t0dQ2XtPz5X9vkr/IEE7i7wwKfscsZ4APfBIEUOfDKxZmIjPX6vJAu5dttqVqhcwbonucnP7JyZQEYpjy6dyzO3eMOaa2MjffaJ3YlNeOzkl/q/P+28gXS7SXuOvuKXwgY+3h0u2Hbe/u/CRcVa3XsnVZ5lPsN3s46BDsBuJJBblsJZqfCN6WClUe5gyQrEI0J4czaJ37D0SwK5BBJaAFBOmOTO4+UqfNJuDZgNFbKeG6YeEME1sWge+awRLYFa6qKUr1UxVpAl6EfcjciKXoZW5Siaoko7rs0dyuSOJI33jK/sOJw5ns3Corp6oHlm7a2R4967bdn31cO2ttcPJIx0dR5KHqxMre+EcfoLoR3bved3u3aAjWZjkpewDTJppqHuJEhpcVVhrEkqrdausn3b5A7WJZXKy3gOXhmLdLLjK8AmjRqlQXrTf4WcvrKSgMg2gMgVuVQjdqvDMU18QfnGFoktZeIebkW2607QtBwcLg2MxtdjgrLZwqhl5ZPVwGQqn0kt2yMgGbIZgp5qtnAGGqxU/rdKfZqNBtQCI/Xb8fXcOVf510LzjS/rOJwfuedsnN/zHD2O28fk17tgv2o+2f97U1qY3zz1P9DZzW5vlc3ALhtbWprPJQKFvz28Du/kZui89wWBNi+JUqlYT67VV+2ls2U8NtaFDQ58g18zdTV7AI5Un7fx15NvsPzFVZgTkvx6npelAwB51N/VoUXKclHvBihLUWUrh6bS312EAbQN3e3l5ECSroJ+dLhcGDTTljEU2ZXgpKInKRkSRx0hRLUmVx7Bo1QvQ3a5z9ygZ6XpX/zBirLKjHohnsS1dYRBoGsXEe0+zGPVx4g2X+4fxJwIOKYS2GhvhKAEAXYZ2XlhUkqqGATRqybUCwbDVBHw8o9d6ujS5YnlCz9sirrxl1+Sa9vRNR4fHfB3azmzXSmPIWbVVy1tXT92yb2VPZfSKa6+64g27/X1pq9tpdZo9XHFn38Gg2JVYt098w6ZwX9ougnNnCI8Vei4NZkdXHyOfzHZHhzetKRSQzh9iN5IvsA1qr7qbvTLB5rto6Eo9o1aLgMtsnEXnGOMjPDh8bsrFBQvV0zr7UMjtCUfcrveFceuW28Veng2Hm/9o/4/x+W9oVrInGYGJMX3Mx9XqC8BI9TCyGpZPo7fLjvvzesFQdfWioeqqGHONVAe9m4K7HSm829FubGaqW4aHp9UFRTBdRdolT2ovNbqV9zIlqZv696rJojnqSlFwPK7zhFP2XqVbSC+wtqcmdYA1dPgZuocvpbT/UcvlPWKrM0zVJaqlMDSiphcpn90JGu5RSi7K1IEav7rnHRvWv7PnysHaVR947w86Dh+94+6Ljxw+cufdhw9f+darVqzJ2VPtqy7auyJcteZWr7vsLWTrw9dUBwarV39w3d29V/zg/e84fOTIpXe+8/CRS47efexN4k3rPMc/fIVr62t9b6ZrxkomyJXsw7Re6mEG8RsYhDDdBgaauKFV4rNcMyDZCCrLMkhbbTWsytJsZp57fv3SkuIp+4WKp2RPEJNHPhrBsAqyK04V93kLqpwvU1CFG+njemtm4EQ0ac9YhADXxiWGwoX+7s7q0Gi2mAmbx7aTmYmBPXa7Z+OtUSHKub3dur7Rwa3F/5U7jrRgxsmj5GFGD2fMMGsnIqccrfanrXcctA7Y/8ZyxwHL32+6fez45aO3Ky+0x9yn2C+SDzE6pmdRZ406Q2j/JC2Kmr5Zq40emlaDb2ixjxzX7CMHuvRWdk0vuaz24mcZRrtE1lcxm5nvLCftK1ZSuS6NgaVYATwrl+RusOxDa+ntIfgE+GhwKk2WGwm1PGPqLKGfAFEeBQW3ulQfncBxjY4bc/WJUTydiAPKG+Xl9fCZNCyM9JJFsAXuTiAcXlGT14/CYrB7wro+WmuUFqQCltnLpW5k6tAK4HShbwI5vVZoMA5/uwk/FnfI6VW1V7RAwBjRUI5HKckvK1ibzRQA73JujFNXBbHVU+BCq+Yd//zBof6C32Q1aaxtHVlXIWZzOHT2XLvDPPy57nVG/rbRIYPjAsuoEL8i22flopZwgouKSUPIkuyxxLzk3VwqyZEDHyBbsnkWfbuH2KPk6+x7QXPRekra1JcWl7YKGrmWX4gV+A8ZSd7IHi1jD6gAePhF9lmwigKzkVEa7WqAxVwRmz/STYDkpLrdWDIoTXV1rS2BtA/ZtAbMPlVN6C5Mg1TqaPBG7S8Tz7SgTmDzNZs3X9fW157trU31sex1m+DGHdla3xRwD3vHuNgvsiMwDztz6dLeMZK5rLaPkYylupa2VdDasNWCFk91nFK1K9nQaVfVhWQo1a3Ui7BqQL5MpbrNSvebYxxVW6IVvkoPGtIdA8gRc6ur48yTzR6LALLJutrHPgb/APf+hljINvaj4L+cYOoOdJw4mkepc7RTDGcxYtdH2mjAS8PUXj8OK4TDQmHGMZkUB8WtKDTMPGpNACEdPiXn6g8Eac7Vq6QcJE6QtW6UXE2zoIz2ceteKDAsgzW3Gx55XToeitnsfCTYs6E6cNsDz4phN7GkD58YjsRtI0av39vRmR28fn/5YrWPHdGRKZhLmfkgQ3vWNXxKun6hbZ3UVWwYlJuGrma/M3DPGk46a7ULFkpDWPG1EDkv6G30vPLKFfa0a2SUKXcvtLXreqVt7Zyvrq2d0tXOKZgtJm+kZyKbMQd1elPvirZ4JGoUDRZh72j3wNhgZ/eq7onKKJngHdqKbSgfibNx0p0JJ1w1jrdEuvOpzCB4S4mRQixFaXYG3v8xrRtudTYyn6fRpRO4cub2Q0+y8aefprG0b81XWCeRgN4fY2jLYilRxjZUUZqVrFvaUV4sOlDVdr5UmmYsIaNCYR1AGz2FNnYl7j/t5DFblVaWZLrpx2I6IAAkV4Ajkpmaytc+n1NMpZ12s+Z5SZgBOgvYqQiP1EKm0f2ytAOAxC27sidBG1txlSFC3Ud1v38rmj+koT3P9TSYhfrRpsUQrJgTuleX9e2pg6GeNb0mnyvh4Sx6g97qSq6PteX37reZ7JzFKTjcHxC2v3/y978O+9rybzo9d6bT6Q3FzWGXzRHq2NTVYb7sWPmqgR6PyNAeoTL5MvsoWMr1DC0lwfgctlM1UeNmgjUHRwMSS+l6aaZskMy0gyS2dsamEZwBP8xpjbQdJm3Di8E5Tkjg37j/mpufGepa7/gh+bdL9yVNZ0bYL859SFknk8TFPEvuZAzYNZ0rqj3EXkFz0lZ3rUmlGxjpUbuTEmZwPkZM8NvduB8bs+pYUeUqot6lDeDNJxsWhacWXtbDLARl6ajNgYb+8dQnFZ6asZMnfIhmu0yY7aJHpWTGTMvDqGsNbhYja1yKS2AGR9VgF6iKFhea4igJTAr3B7lQKNGW0/HupMVoGV4/GP9m0hD0Btnjg6Q3P0TpUgVdaAb9QfuRqj1I1U5mCOQsJexOxqnB8VY/UtOifqQPPf/kkn6kzj+iH6lzST/S6grzGHfgvfxGfY1Y/BozqerN3ra5O40an1KzDxh0M/sIrWcAW0eLlERlvOZiQ1AzcLSmoWFTNJdS1oBihAw4f2WD87yVDcJAdUP/ysHuyb6Vw5l416pMvDRB/mH3cN/a4W1jvasHSj3HNparx7DW7r8AF769iQszgDOrIicqL3oEhHfaOYSHd9jHRy8/Pga4UHlhEMeV53+umWQ/QvujB5kI86LaHd2usIa+NhwhmxEAmwcr1BzYASFYKtUdtG+RA0yVFCg1GIIfQXOr5JlkzkizTnqVldGiFDjZ8Ksqp9SsO25mHiVjwUa5aUVuPjX07uff36yRicxIfh7bbUx7/G6srMAjvDEdDESw4wYeNQysLJM70oyParRGk9vjC4YjS9tryCGH2p+FKAGwZeVBQ8okVU2VuWarz2p5zDTM7bnPvk5fvY42UyfrDcSYKk0YVgW6gu96X4pkvBoTSehMYnLuI0bWO/ct7KF+RfJnP0u+8Y3JTzLUP8R9a+tUWhcQMWMOEjfgZ8HyZ2n/6WyH8SzaM8SxhLCNpA9vNJJnm92zKV7EepWz/CHVlnZeiPitpTSNVFziDU3b+SS2mpQyQr0jr2xfZbI0nYspzkxN2eC/PEVjF0Ii5xJ4yHD/a5Ixf8xqt4cCpbXdfTff+7Q76Fye0Il9l/WHorZ+o+gV2zraei/f3bmXofJNVPkuM1VmjFlJYP1WUL4Rukjd5XPRS6N3vIJNdwdWgLD3grAPj4Gw944jd3pH0N8oNboM+JFGF/3Z6f5K0oBNahtOG73tVBXCxB8Bc6Q8L4/COyPKQukpyatUXqkrgjbPWzmjk0Z4qX9memCkH9bAMB7hjemx0ZVwuQKPGkZaWSCP9w8Mj61YudCziEIog16FUE9QCFWpYkp3NAMM7u6tjVNENY7RAjDs/QZF+9sE2Yyd9Z0OFWEJfzTCcp6zvIiDN5tNvmB5vC1lQsxVGU1Hw2GjV2fhdwyXayN9hdJ4eaxr+JblF98+m0PbaevLhqJslJSSwaijR2+zhLraE6leK8nEBtsjibnPnrUisUfp78gt7CfAnoYRzTpbu/ywKzxjQjfBh0swpCYPlApcg3G2bmAoruWN1LcB+9oIKN0hNQERMJZWwVLRVoagY6G6gp3R4kLD9nzMNKtRducRmdWp60yLcWNvSClW92Epjqm18RdRFbZR6ifVps1Nt/BC8EcetecjZy7vW73lol/GC9j48S9ox8er1hw7RDIdwxtYj5pY0Sg9BzXvpz0Hfa+66+BCr5A/a9dBMymLiWU6D249NFBatvsg2ff0/5S5aTKg+paZmwU8gGXn9ujTZ88t+KrnFiqi+/h/ZG5iIrPc9K6/d3RtdfCa883wrrtac3wznWOG+darmqMUK2KxQRr0eixAK6A8gPaTgRgsTa+yj8ubpH52GPF/G246QP1LQ6k8Vsc0g+ftfwJCySFUrBqjFwudsEgXy8hejnaoNMFjKtPyFMxkLUPGmx27Q9vt7aYsN5CJ7TU5AuyyFH3qpsp4dbSUwBi1VqXrdZSuEaadmXl1lA0XpTYwmkosPQHSlKU9HYNG2oseQZ2lJKdBQ6ZpFVoa2+3lzktE7fmp2NDqmkSkZktUtpbFBNlorr08AdPLBPCXIeElZ8X0lyXg7NI4f5OG/0JpGGLS2FXi1dAQFmAMzlJFbPevtjtt5W1o/b+aVWym1P574peICI7HQfx8wZASK1EoJ2Prl2nRH/BQj+68ZKShuLTLg5G4ZWm4auXhiZWHfR1DHbloZFkC/vTwxMThle8eyuWGsJXI/F1gfK6ivdXaSb/SCVVilI0TIbUnkhzGJmuEuhgEXAzaqoP26wMX3kLLGi1GAGvxTEgPxG0rY8cWKVZqWD14A3shUtl0Lg4l82bqEuOVsLgdYt1AH5xi4BaEdeibp75JSS4Cydt5bNcexXab7TztfCfy01bRQis5LEq/v1i0HS7b8Khh5Gg7ZuMtVo8YjbW1L/JA6HNl6jaXF/GXgAZeMjrqZj9G77CjYqDZQzJCG8KwTkcSsRluJwR3RbZYgWdaDS+0eHbe1pyx7mFWZaPz2kHy9/o+NhQqYptOQczl2rVmbNMpJArRudAwn/nNo+zIm/5lJG1li3Z929KOnWm97dkv2Ixp+K4ptddWTO1j242dfZFnjZyyN3CZDrZSpahsZu9Z3IwyDdTvUiBv15LWlFWM5YOX9ngomu3IV1Bndgmyu0grbRs6K0gsFeNEhaYspZDweKwtmy9iS3zZmkPPOlBbpgnlsu1vncvGMS7UFPft58Q4ztMmd+4DZ8U+WKW3LNjtEBMj+j9Dd9n4q2+FmvhTd5edtrt9UWTan6K9rAYQxAVbzP6YgsDl2sxq3v/0OTTn/j9K84WOvrIfa+z+m0Svvkxf34cpOl2O6OwPAJ8upnmSWP4MNE+9epqn/xxynlDkvO6PxmtnkR387NqrJTxRAPMFaT/3X03sfD76A3pG307hwXXAgwzTRQb/5FzAdHsn3SeHSDAHSLCEpa9y0ki3xmHw09niCcJooSQXjLNNRhWadXnKpam4DM/Kf0qeuZLYq9lTozkiWnjlwLpoudAO68cSVDqoL2GXzC3fw/lstrHLQM0L8vB354DOZRVYx1LYCeuK9uyFdWVnnBfs2usqttqt/Xe79qIGXty59/gihdvsOaqoWnV8H/w/PD5QVovHl1ikm5rjo1qpOb4r6fg8FxyfWMT+J3+q8eGaXjzEty9dwYtHqa5dHOdtsHbtjI9JMO8670hxh1O8jC33cA2GaCNrSTgpe/BxYEpTkqhx9nytrS88F9kjqB1CpYBQN9mwS4AUdchGA83xnT3P5RbB4km/NuxaVuZbMrRU2heeL+ACCjzV7DAGGsjV1F4WtWOqcmLSzDb0OpcF9JQ2UaZPA5a5aEkhSeCkbF9EB7WFLW0EZ+Alt6pPDLwcwQ7wPABs2loAj/DudNSNeYaEO6KoF4PS3pYzuCPRxJLkglv1rCKYFrUHWr3YEtVy9TwPJ8AYaHCE796u2503jfzwwUdG+q/+x1z1o5syhStOVIvvNr4H+7EJhV8ojyp4tA8fVXDvhiMXv1RQ1hzt76t5M0hKjvnxy3b4BdPZiCiRkRSt0k+BbzXdFkkZaC0uRkaCbXg/GDcqDVn9Jxs5RUfnlAh2XIHp+T9fm2A5Bii+YbW5gilahCPQzvqvoHWw85yoybLNhDcvEzc5f3th9syi+IlG6TMMOgT7DMeZVct2Gk4s12k4qXYantbZIjHqwbzyZsPYRey8DYf/GlTy+ZoOs8anzxnzxlc/5gaMOUoLBo24x/xVDR0U9HmH/jvQ1ucbOln39NljT52H3unlxp5ZRO/4q6W3orXPO+67FRV+oaFTVd4a/5vp+DuxD/k545eyxUZSWZNZGpXMRmBN5pNZWJMxZU3G8jSKmcE12bV4shFYkJ3K8uxsTV1Kq/kk9enkcmcEJu6y1bDubToQ02VfLTnOWVfnpczbzllb5yXSJYvjkiqdrqN0amNKzE3LUSpTlLroVn20dx0ltY1GkxjYeChlpD2IVEpMF41eQ07OGmnzpqKR9tCQU1GYuM0F5MgKckD36vp+L1cZfF5qPHyW1TsvLe4/C+sR5j7Gz06z/YyZYWgmH1P6XIa777nnMrPPtT0H/2bHnpttm4V/eEllLTv/BPswi/v4Y0yWOa4+mTHZpCDdF55Ttu3rZhFHt+GTfIEqHbhWsFjChQC5TXiC0wlOk/KYD4tDNhiRRklBabgdEh43WTyMH6Vo4SlD6qZ8ZbOC0qcgU8UqSaKEXVrVktl9lXdMjpaqqerleyt3bVy/YiQ6snNXiqzMla/ekMqOl8aOb5isEO59N69Y49subp36i0/ctGJN6pD30Jq3TI2SF/xXd7/jdOHE9e+5bAhjUbS3L+iHJEjNK+ju297q7pv9n9vdF83BhTv8/gBswivo8qvZ8fT/X2kIzjZ3YRqSLFinV0BE9sGn1d6eC3TMvRI6drTomP8fLIuKqbwwKT+v2MtXSEzM/6m0vA5oWWB6MXJ3YWpK+aJULTfaFNOA1K01qYv9GXFDVg6sAGDYTjjtBp3X9/8imoNdlo1xeM056gaewx053Z2Co+4WPbVXzZHlLNSF2fO1s8zUK+HTD5f6a0o/aJB9P9jvV9ARWtnK93+pIzRGbZbtCv2vWHl7oc7QV9L45g/pM8rxmSpJ5sOLvHPvEu+84QzS50z5y9i0Q3KXGpYkDaRZ1N2DEfqQw1Zo8p9PfWWJJ9V8TpAHnxPkpkc/PSY9rWcGeZpelNni9viTS7zRJPZQ5SO1pY/PYZvb42kf8Myixy4M85dbhoEq1szrbvrLt9pKNm6k0285fuPGKQt9zEeHjWb1Vm7YftU97ATQ5K8XnvNB+46yJvYHzCjzOfXZhm1AhZFWu79eddfkGEA4GrsNK6HBHkCwFuX5oRZe8mOvzZweFmpR9utn5fGl3UltuJ+Xm5H7zaelPtp+o6+/2X5DOaPrytkFsD+UShcQoeSEhtHTVqHtOXvowx/9gizSp72wIzSpLPe2wectftppYKFhqUOpy1Q2tmEDCbWtQPc5rXCqNINkJjayqKFp5w8mNkYDfE9/LDtkFy/ZPDSh9MUp5rqwL86uNeL292Ty5mh0cZ9TsnpisHqtJhMTk9FORzg5trOzbUmTnP5t+o3lrXOn57668XjHCezWjf2k2e/R/VHtuPIu2FEaXCWaFlWbSuf+tE2lcVtN2ytuLY0o5mXaS18EMOb8LabJ3zyt+FhIg+dfOQ0yf1YaZAQp/cppACjk5Vpsg066QJvteQo+lspBxyujQb5Fg8L/ZRoggngZMgwqEOLClFDipyotnqG0qDI/fTladBUbOcX/7srRLZlp8L8ruS7wv9sU/7utgvfbCuh/9zaphgUvmMWuKv53lUcY1yio9QUlufbHEFVOY9NEX02q4tMVpbxjxMhp7aB+4m2Y4JYKAm3dmgiDxmrRXHgVDd3P9eVfhvC953j0F1iR/iU+vcKHBuVDkakxf/9ynCgUpd5yo10BcWWACX2LiY0RnQ4AcR283AWnPXBqKMn9fxSZMyqZOyiZuxzTWiAxNRFCXW931S681fOVkXo5IPYyxF5/FhK7AKnXLAZgTVqfprQugNR/4+VonS/KJXipFpXu771nUXpRWKkCV0oM+I+UaSS2jPto5UonPtNbC/Jsjbe15xX7LOu52rIyLVdLcCudzWUWdcd/BVRXmxZjzRJgm5ej+ZXDu4eHCnlPpjeT6b0AwQd3Dw/vHnpLbzoTCGaonmHnX2KvIz8Ar7nMDGDnRNqnKl5GdRKnGRmlW5WjLHOAAPsAHtJthZwZFckgpXg7ULydl4sg0AB4cKdDBTEQC+dsUa7QW7Qmxq2nDwSTi+34yACTLU0L8f1CXZfENuRytYLt1BxxpciLyyGhGd7tj0STXRWVfikFqdhJgmKYnnP7z2daxMSGazaSarajZ0nYoh8PpfmLb9yz0zU13upMv/eSXdnLpoo9u8erKzjdwT3EorSp33dfcDDkHOKnBjeNjy9qV79r/frqypHObNgfs1T3Yuf68H7wHwzzMfrsBDdoipuV3U31PLp8bcojFPxEeSpXa79TJ20VjW0RUks2O6FqSHlwP6nGRTfx6oVpg9lCHx2HpRJtebq4zS6lT04csF8j5IlmcxfY2KQ573MZDOeUAwWWeVLDkm1Q5M5zn9ugUZ45APYbnzmQZI4u/9QBKVZsPaBq6YMH0uqDB56kDx6IxZNqpweHM1E75+kDcgxbaCReyVMIEKSd90kEPoBn530aAXnr04w6r6+05nXJeeYVf7l5PaHMa2Fa8WWmFcdpxV7JtNADPO+0DgLiOu+0vqziLZzXA+q8MsylF5hX23Lzaj+LX2llYtPArxRdwH/szNSq6/NOzqDgqAvND1CUls7v42C7cX5ZpsLccZ4ZthelchnzF2iyCyXaeHRhutixIgN2OtOaudSB6q3LqHQijVtxU5y3Rh/d6MbWqAGHrAvXVFoUyufS4hXQYDnDe16CcGeZ3PMLtGtpkF7p3T8HMuBgPMyVF+7dD943PrT4Qk37adIC2/TXrQ6lYbnBqmxaZAS1Tb/sZNVnAS/Trh9LNZb06c9gYvDsFv1k1dPNsZNb1LFffuGxu17F2OkjBpYbuYul2YNlR07LVZc8YQDzgmeP/G0Ye6HjXkXH7Xs5muO4/S8z7sACzX21Vz9ydbUtGfxqNTm4zPhV/wTnsAvWloMJMml89uSFn/ogpcr44AdcYFHaaunCz36w85IL15hPaWyDrQISsNww16PHwjWrw4MVtAq8NSC8lc2m2it4HsRyNfVLZl47q7DpHBL88+IVpPQJ/xr7TeBkGjUo7esW0szWBbbZYM6m7M6jjcOTynO1Ubv4dRQWYcLPzSlTi/oFx+Nak553ilRn4CNj6y43gxy0ijgx3lFb6CUupjE/VSTDhOas+MW7b2mPG8/U2JFIUBTvtL0psVF7/eAN9qv3vOPyjXu3VfJje9yh4OTBx2/bv0FXy/emymVXkN9RSOQ/Mff8Y9hz/J3XrF/F3avkBGivefBFk0wPmXgV3eYB3zSyilfamUXedqbAKy1nO8ErzSg6OFPG+5k8gsnqWa3pUwCIetQ9hOdvVI8bwfP/T3PXGtzGdZ3v3QWweBDv9/slPAiQBAiQBCGR1JsSJUWmZMl6UPJDtSJbTl0/MpHj2OmP2hmncepJIzmOM1PnR0aecTI1FoBcW5NxNB170jqJO1FUTSfpTDNxldhtnJlWmjZqa7L3nLsLAgRISkqd6Z/F7oLg3j333nPPOfec74PN4gH+pwMFKEkEQ3/894tgP8Y6SJspc6zgpt4bzwEPqmyKoAdG5LiD/cFN4dd3+7krINqnunetV8K4Fybb3Fw2TRHvnukkqA8PA7ZdF+I900NI2tINeh9VSsMbJk0ghCO3VR0uBwC4L7Qi/j3YZ70w8Hcy3d+Ng0/Pv6m295et9h7s1d7gjbQXXA2ooA52tDqosXPE2eVbDQq/V6u/yvR+d6v/5803u+UcI3PLtTveq90Jpd1NkHOUN1wOR6q30HTQ+L1an+OKv+cL4J4WtP9nTBeYMVvr673af9P5WYtvGmi56bDNpbx3Iy5BevRi0pbsYp7hOZNd4w1lFSlEUzdMt9A9q3oJons69RiK3vY5pEHZvMXWRDPmPA4CK0y3dBKF2kAZynFdCHpGIWC0KAAl3xHQ7pW3r/WXapKNJ4UU0McGKqiGxoRBBlmCrI/MwA2/fS+7stf7V5eYlD3efnopdtwTZJPwtuBgZ2bmA68lgCwhYd1xG56RuwCI91iL7AHArpqlBOgYQShvKkEZsoLVpW3FQGxKAdcTwsz8t+JD8RjArLKPIrVUq6d9MXYep3cPwT11jtXYHEtiZVsKLEMrMrarvRBcZKX06DDLFOhqTDqeb+WBDU2HC1EtzzGzSoOsLzWTQ5YwhSQGFqLdhTmlDWLypXhMTdYZ2lZmJYdEt5hC4gThK0TYGRD4cGIkNDa5Z/t9qcy4f3TTrOtSMLPlWL83vfWYA4Tt2ufYVznBBG47YD9QPV4ZoreFXvjQe+bByQSsyYizz/QI5Dtcu0mkfTaQMAPiFsD2cx8v2P45wRBJpXFS2+yyL1NtIe7TCK4jcgos2cwNgu0HQdGtALg/w72LlUH3wdvolPfVm5V3+v+rvJsg75a4093iToO4UzfKbQBr4gri/gp3iVYWN7hIHfLOk9/eirwHbkneg7+P8Z3jAq/7Mv2Iy+iQndnq7yJ0WM1XkHu25c2tKnpc47nsm0reSvRmpd8rjWW1rmhLbunulZrZVhsFd7DI/qJYaE99+Tg6ChDBYEclb5cFA+CCMbes5uPpLDg5boH1Y6zHsrtCj1WWJl2u1nU/WRLX4dwNbP4kSYY8twJ7A64F2YKKEvCxEjjUUvbamhukcYDctlWpHOgxplFW5XMQLim1M8ifxWQS4PXumN8T7sHYhxysSj4z83rUce0DXC903xOXZav2A7W0fT299tcdbH5MZt4LUF9t9BqwvhqOQTym4Vhnd9ryrph40tWakbmZgsHo8QbTrcoC4AFsu6HIFsICCB6tUmu12D2XJdc6g3SAAwfXL0uvJW42BiIV439NzfUi2BKV8dREu7YCiAvLjyimecfK4ODD/B8u4b5c6jLPYOa7RCNsAlf/LwecnEvZIYu3VsC90BFH3R/yYSzsd2ASIT3m7OpDUr8kgLTq8BQjnXOX8pgs/QVxkHtWjKvRmnOV0KBrlZBmzxhZRzysK/5FKNQ10bcxd+xHSuaYq0dNppc1xaSCFnJAGgCJ4GQFKjTN1M+vYepizcW5UUXtdTYKOqqXXLaGzWVll0441tlXncSo7Dac2apQmQPUuc62yhy8dnVkLPq8uG1OmHB4paTRLmvtSoqZwMx1NcuMGfEi1kmGNtgGp90nSsaNVzfasse9X5i45MgUk2mt9cNMrkoFnmT3w0r/tvl3bY+9pvDH/Cddw3RNiPygjcEctIuC94wUqTVtATFSfZxPXcG0mTp3dQSFInAia70Ng1MBW4MGBCYRs61hMIOA+uAI94Nwv86ObaKh1Tr7Hs4MEMHSG/rMnAqJkwwLHTcUhjAg7hM1PGFTZQkT7Q2j0xfCtU5s0c1XvEujVpLlxASqmeG7nE/2K8yjjvBtdPMoTSP56PXh5MYfjAWBf3SH+84zeY7DcE38tfAKszVK5B1Sj4Kk/ExSCOWfZSd+jCH4Q2w0AdQilvBiKUABankR29JiMuSbVl8CAJmtkKDHSyqUOgo3zTddPKbgsskOU3tR7yJDBlZVuJkW2WDUW7RWrz8aSwyAg+0EfxDIlIFlzhyK8CppYP2TfcAmRVyxFLJJsVHYkBzOAW4UKJgNlWWALRZ531tVGf17Zu5+7EvjLvp4uGjsAXFxr3Xu1Ke/2laZQcUTzcnbPv9oZ83t/nsWizIeacWchAv0PRIhOVKGXTAf2HMhrLpEICGQdUJxjwEBBtIeQXEjyK0c1X4AmC4pzg2R43CrQ4rLDJC2KajN0YQ4SRpb5occTZ3e6ctzaj7Z7YHhlHXibr5J5/YEoql8ezbE8nv4i3ELrboxBr7zyYF9hwqVP/sTsVrcdvDovXeld9z7iaN3lAc2HCkPbpijM4fvD3sGd4MXffRohW+DTUzvLRyenT2xb3oXRi/SLb55gRgWrgmC+E0yQtaRF0m9DOIAGpaAwPfraW0CoU45mUFNQLQ0lSrcAMVJ7LRoq4UhDM1Rl4C2PswHFtAdeMGi16AB5AYMkA0GnSuQGCyPVtaCkIr2RjQ2xCHudWWVvaBBveEiJkjwCCoMHCWCMKTPtPEWtPEXCpy7IJlwloHqIGmIjxiNa0d3HxU1Rq1D55PCmrndX3zw0O7YgKYvN7j1UCJVFgSNMDv9wqnjXxyfeHTszzcmXnrUHJ7dZHCYLXqzrk9jFQrbxuc+G37hDxzO3ePxottHqUDT2yeOPC5+58tf5rYVcDmeZvoOZPjZHmyOsKc6XkZJ9uR0nFQ4HZvA6TjKR05TH06NrYPzguMc0DqitJYSO8qjEAKrrK3eHMWjIqAbZ3p8hkvnJggfhTdAOqKSV/5p5GAZIt9fLbMc6hgHMeUJDKhsCWEwQ5flONNn8Zar1ALA/Fhyz+V4iPWFKNiDMY41LzsdPLffYITc/hVz03s5Oz1z1Z9cSkexUt76611YAr9ihwmlFn6LYokg9iEaIEazCgohwsqLWBCiFkLOvDaeyEYONC5LolqWW6FJK00ypU1V7BYYI36J/sNvPYmRCP2uYT5DI5bscOJdPhr6hWnznd/IffRd86lz4jdxMgjIHfdXbC4MMG178AbY48BjLpZB3YI67eCQk60DrB+YreuFfpAH2ZosF0o3TSGnDPabYJJ7mL/fKoRywr/y+U8XXl04IJSFb5MUYHwDkj6QukjhMlKaysZAqaQiVCWhC9KFFqHFj65+u5UXb7ogR3XXa/4LWnbVkHRQKmCEI1uAGoGoHypX4Hh+6gv/fgBJpSJwWWfHdkdBZ/JHVBxdg04ymvyBcBuMrlJcIWGS/HqaHC0zV6nFDg8EtmU3kxUvndwzPFcctucfPGXpy+d3fCLRv3bbcNFm/YuXfcP53EMjgcjn8qGq/54DPxveOXl7cjLszoe32/bvmx3+yivjlSk/2POnhQSV2XjQkTxgpwPMqgqfLnESO85SoIfOp0RFn+X78qd58AbA1Hk9LiWvs//39/j/sgSgpjv/mab9n+mUohtlALzOe1X4Oe829r9koUL/Tnib2ADj21po6hGWva5Hd0LPDKuawBSQXYWBhQXNoaCIMztQKd/BrRRZzNLsQHXUlLHMzpwSXrK7dcZ4JD60Yws857owQ+8X3iAGeI4escQdHEsctwKMuMDqcB9A+YCloYPG5nrM40skvW7hZCvWL5CLwhB9RdQSPbGTnYBSLvcxvWpXEuw4g4MK0NLN4GAEfldR4vZuHxI4aEk7gUNbCuZFnmPpTkOOpfCHh6emDq9XMykpmVvIEmA1tpJRUhcRE7kA8bK0hpMzMPHpeHIfUC/IBjZQa31gXMsE6bK8zGBU5FkB73OuNJjf6fcIMaM/uPfF7O3R8U1Oj6YkgSyfEybpT4W32BvP4R6Llu+2mRCuzMT8voZFC3RvAjfvBEzYFBAn3oEtWQSQkxZBy0AgEmwhCSau37v2yZ7r2hNr30UWyKtCQqgiR4DE2TggL0AdnEwdGJaOb4RNfvWZI2+sP/fAv8EIh0ANXXifXKS/olbkeVR2juKavPIBlAMK0UCGKWpfH71qujg5Cb/7kFwU/+kGf+fsE3/Zx39Hpul58h/C3xIL09cQx9BhuQ9l02Gx2+o6hMvVGZhXbYP30PWpUwsmQpiWFXU7/XT+oQ1SfyScpB/d/akT2wWzOdi/BudamT3nPfYcMzxHg8PDo0DEC5ebJv4cwQTPEXQKXD9Tn3bOtO0cm6RJUPWopsrsIbm1yafp+U9u0+AjIvd8isngewtHyB+Rk/wZAs7nZZ+hVZ+hF5RnSGOjyRbcsbRReZGnv3VixmwJZpPwCNbPTF70AsorTO4EidWCZUVoNXdJ2XTvlpvC46Dwf9TdoGKI28caARvyVgAcEUQEuu+DjUxrtVu4leVk/Q6e5SLhRLvUo+x0WqN0gADyp99B+Yeg3Q7UxF7ebj2iyvbsB+BTYF0OwO/whS0AX9hcBk5hgjSRlhBuwAI5oSlQ7e4s9arc0XcvPbQRm/xURye2To89wGwJ1p90HPszCOylQqFmKyudinyCod79qrbZr7TZj212sjaH1Q6XTf5qV5eXew+AVkvbRoJ6xppJNGRo4Y/pgvAuOzMyHejiIxwy9ylvKxDsuYHRQ/W3PagMNOA06y1W7jRDUCEIEGIiO5WSXmbOSEO3PSN+rZCdsRg/d9dEZIPFJZ7ZsJe+N5i1JT96h7589uz8IVHctevZiC07iHgy0sKVhSeUthjYGHURP/N8k2QXtsjfapG3BAwWydbIjZdUJmOlXaY+p4vjhchWMH51jobNHo5wcmZoqpMfyl4JD7y9YqvlwVnWchM037PJYpzw326xzVqc4pmNe+9svchJeA/6Mhznnc8+u4u+cvbsyzF4FWG67aUoeZ68x2xKDV8/Dbh+Snz9lDrWT4mvn9KS9ZPNl8Tz+yfW7d//GB1/bN++iXV38NjA2MJ/i9vJI7h+BtgIq0tgRdv85bLC8yGbXMx2g7st4o9gG/EHgMIDXJ2FX1lssI40vZwNJIQtGFOX0jVdJ2MKP0hO+czzzzDShSTajtCvpLRwTfM8szGBeyDMbKkK2Ur2kF8rbA9ILLO5LA+JSLQFxAMY2QeK46bJ1a8x54HWqZkYgdPa7jKEPGoTpTa6rhzHWPVx1gu4kjDxDHLL4GrABlgkzRS/Ys7/OLua5lfTSOHVXI9XyNvlg4QvjckOZnyJmfH1RD8iUKXsNVtV3jXNpuDmCczjh1ykyMD4NIw2l72RKq3fhRnTI6AHYegF7LKvB9cGoNCLLh5DghASXZL2sfiNdtlvSqXxucr6MjtMbUJk+nXjw7FMZTieoQ/zr6qHK1NbxotxfrNYHj+s3NwKN+ALevrk3rmdm+67fW7H/F8CRD196uD2/ccPzdwx//X7987tYN8c2VE+NIO39t+3b8kdGN9mspn8FPk/PES1ZAVOmqLHUdTBEvc3Ki8c8IaQ7y/5nbb9d5kOEpHNLdoQ9ltmtNBnhJcgQsa9R3TG2wyFJJPvL1Ao8FJob36GPif8UHiejcABqgPrqx5JZststvRxZgtDOJbJrWG6hdnSOkcgkVrjLQMxDNCJOH3Muae2JuFen1hS6hfb7DFzG6AvEnbpjcyLNWOY02ziUP3AoSXyX4g2qP1U+JDqaSz9S2fZL/JpOM0Dp3C6xdoAfxPCHdgQMJ6ES/V4CDdho2xdgIBeHhzh/irS0de9Pl5CRthq/Jre7AnFebmO1S4HB9iYpA4Z2Mx5ICBZoEnOEDfKPOgKu+OFg8IaNyolM8rZZ64EdNJI+vHMiF73/ie3bL03FnsgcsRzMHo4KuzZujWru6zxeDSXddkhb1+zYfZqfwzXl37zm0vw+WPUhU9Qs/A23dZu5yU1KvluW/dBGtETzO8wr12Lv4PDFXqF/Y4M2+N2OJ8PsjUW6r6Twj+SAllLfkLqSdCAESAyg3DokFr+LXt8sPci92s+qEmlugdZqzxmA9SFN8sa4tRwustUqwStqFT4xUpAZtleBF7zDFlquQuy0QQBGcXZNTI3N2dr9Oc8iIWtM+YQC5v5r57+XBv7RYppC6ctCWkb8liRqYiIH+tIklhfUeu3N/QhjEnXPDysoVaDS+tpq+ggg5wlS1PBRSQGpC2XK60Ugm+mu3yPbE8WA9691fjZJ9v2h97PekZnd/mEYtTricU83mirDlyKRz//pTVeV0izOfVWcP5P7frFBP75f35x58PiMfaLgVi0VXsfY75DESoswwrOZ63Qqr3PFaDoL8Pu2QoIIBXF7C3Qxx2CzTDB5lXBnp/63tUTeDtuqyUuyC7L9ZqzXdx5WyOXz4C4X2PXrngivwh5weQOdzK5fAfkheyJAnJqOLkGY5G5AmyZ6ANVrP9g4gZ+5DWparfYoehPWipw7Ad3ksu9Q9hZ71NBo3Cc76Nst989PMxE/+xpLu5OIXsCI+Z5QyWAGyvBg/RftGNM5EPzV5iQyf8ChZJNPAB42mNgZGBgYGJg6Dxk4RPPb/OVQZ75BVCE4Rxz8hcY/V/uvwjLNOYrQHUcILUMDABWjwx5eNpjYGRgYL7yX4iBgeXkf7n/8izTGFL+v2VABi8AsigIxAAAeNptk0FIVFEUhv9zrosihih1wpTRmsC0Kckhq4U5IhiRFUgQVMzGNrOSWgRBi4pWQkkYEbRwIVIUFS4CMcgWUs2yiCAkaGq0sShpGKMMOf33UjGIDz7Oe/ede985/3+eRBEuOUR4L71IyUEkdA4pTaDaHUWrPkUV7iIhIzgiI/ZESuhznTgvUXsuHdjAfRslZ9eYX0t6NWGfGYWAONJAtpP1pI57WqTD3vOMi/4cH2UWafcAPZq2Me2xvJ5Ekw4zbraCLNms3kSjvrC87LE5mbQ3eto+SNHybr/N6D3L6RTzY8yfwlY9bh+1Bqt1F7ZxX0oPo95dQlL32n1tRT3r+ySj2Ck5xGXUXrsCsuwJ5JFGsE5+o0YGsFbXoFrukC2WYX85bWSv9dgkEbugypxKxF1L6K1BfiCqFfZYwfWr7PGMzVPThDYhJs/sp2Z5/jt7KdM2KONWZL+d/N40Y4r9H6Pu7TynmbV90bSP0PC+hAoy4i6jizVFZAKRoJl/LuGWHEBt8KLfvks/hGtLGre3kqcnUfpVQjvXd8s59jVhi64PycAp5s6iLui9Ai5jV4IH1L+coH8ZwaN/+i+DdQ0xNgcPyvEeVNGjfZbxeq/IMPsfwKqgfzle/3JK1P2v/ssJunhf6EE53gPvVfDCn8E5kkorunnW/Y35nB3v3/9ZoV+MD/mt62ScjJFf5BU5QQYJ31vBFewrsugmSWRtUobQTZIyxPsSdjBnhvN4gzPXVpFFKxYQwYIt4rbFXBvOhppn+N94bbos8weDchT+AAAAAAAAAAAAAABCAH4AxgHeAooDLANSA5ADzgQuBHAEqATIBPYFDgVeBbYGIga2BxoHiAfmCBQImgj2CUQJoAmyCdYJ6ApuCzILmgwkDIoM9g2oDkYOzg9qD7IP+hB8ENwRXhHSEiQSnhMUE+wUgBTgFXwVyBY0FooW+hc8F3IXiBfEF+gYBBgmGJwZFBlWGfgaVhrMG3QcLhyaHSodqh4KHugfmB/iIHAg/CFKIcQiNCLkI0wjuiQaJJglBCViJX4l2iaAJsAnpCf8KGwo/ikkKdgqFCq+K0QrYCuKLGwsiizQLSAthi4gLj4u2i8aL0QvpjAAMFAwbjEkMd4y7DNsM9o0SDS6NWY2CDaoN4g4JDjeOZg6WjtEO5Q75Dw4PLo9Tj4GPmA+vj8eP7JAOkBUQM5BcEIUQrpDkkQIRJJFTkXQRlJG2EecSFJJDEmySjJKnksKS3pMDExqTMZNKE2sTh5PEE9oT8RQJFCyUTJRdlHoUqBTWFQWVPhVglYgVtZXJle4WExY/lmOWjBavltqW7ZcMFy+XOZdDF1AXWxdsF3mXjJeVl5yXo5ewl70XyZfgl/cYDBgdmDgYQxhYmJQYmxiimKkY2ZjgmOOZFBk/gAAAAEAAADoAFIABwAAAAAAAgABAAIAFgAAAQABkAAAAAB42sVUTW/TQBCdpE6BC0IcCkerF4oUUBJAouUEUSWC6KUgRRztxKlXTZzIdqjKJRw48AsQvwjBv+LN23E+IEWCC41293lmdubNR1dEbsk3qYn+re91nh7vEHkcyN4S7+K8A20tuAFFKncN1yQIPhquQ/PJ8M4aDmBT4YbcDD4b3pV68MXwNfkQfDV8XY4atw1/l73Ga8M/pNWIF900ysskD3tlNHaDsJ/Eo2lWLuRABnJfQunKVGZyKbk4OZNUSsjacihPsR4QHUpHmpC+gEUpBVYuiUQygawnGfw8pL5LWUxPQ/hKKD2R59CH8g5x5jgj3g4RKSGKETuEdQ5NBt8J7oZgpNoJPBX4OdzNIJ1jH1Kjfsb4bWc1A55yd5CVjLDKr8BXCb36K4zlwKqgeAI8hPXIvgvYxYjlYJWAQXVHT+XQJJuMvHPyd8bH4d6cOWnElOfjKzh3odfalJbfAXbtz1uwmPFmG2tKf8olo2zEyvicKg7rkbq84euQ/5U3xbl5vWRN1c8M0oK2VbQL5pKaL1+BKvsBTt+7Z8uuvOd0aJWaxjXiPUWOkTNYlVbt0GRj4BHtHBlG9B3aXFSz4LvoyEB1I+veAL6vrpWP/3tP7tmk6GQq4wn7c77kpBzOyfaC/PzMD6kpGDmlThnGnBX9+pWzzvRq4px52JbJZl83p2Wzr6tMj/C1j9x6sHiDdSrH+H88oYeXQKeQHWNf5eQ7eGYznNhEb6+D5/Wnd2Efa8HVwd7ii6Ln4j9y+vd3rM/3qqpuaLn0jc0r9HJMaYv7E1S/jXdU9w4kHcjb8ugnaqoEVAB42m3P1WsVAABG8d+uMXt2d7fX7pybs2Z3tzNmzu6ps1EEfVIsBBU7sbsTu7s7X/X+AX5wHg+cTwBp+Rurlv/tXYgwAckkl0JK4VJJLU3ISSe9DCJklElmWWSVTXY55JRLbnnklU9+BRRUSGFFFFVMcSWUVEppZZRVTnkVBFVUSWVVVFVNdTXUDLXUVkdd9dTXQEONRGosSrQmYjTVTHMttBSrldbaaKud9jroqJPOuuiqm+566KmX3vpYb7Y5jlgR+jPXEgutsskGCzyQaLkfflpspXlOeeK71Tb77Zc/1tnqgnO26aufpfq7ZIDzLrrmsiuuem+gm667YbtBvlnmjltuG+yjz+YbIs5Qww0Tb40RRhlptDESjDXOeB9MMMlEk001xQFrTTfNDDN98sVBd73w0g47vfLaIW+8tdE9zz30yGPP3PfULrvts99pe+x1xiwnJdnirKOOOWyRr2EBx50IT4iPiwoGg/8A6nRxP3ja28H4v3UDYy+D9waOgIiNjIx9kRvd2LQjFDcIRHpvEAkCMhoiZTewacdEMGxgVnDdwKztsoFFwXUTcziTNojDuIEVKsoOFGWdzKS9kdmtDMhlA3LZU+BcDgXXXQys9f8Z4CKcQAUcmjBu5AYRbQARISnsAAFR3bN0AAA=') format('woff');
-}
-@font-face {
-font-family: Charter;
-font-style: normal;
-font-weight: bold;
-font-stretch: normal;
-src: url('data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAG8MABEAAAAAzIQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABgAAAABwAAAAcaEQHCEdERUYAAAGcAAAAHgAAACABFQAET1MvMgAAAbwAAABRAAAAYI5LgBpjbWFwAAACEAAAAaoAAAH63UMlG2N2dCAAAAO8AAAALAAAACwFzwUmZnBnbQAAA+gAAAGxAAACZVO0L6dnYXNwAAAFnAAAAAgAAAAIAAAAEGdseWYAAAWkAABgaQAAtyh+mEOdaGVhZAAAZhAAAAA1AAAANv+EC6RoaGVhAABmSAAAACAAAAAkCB8EXWhtdHgAAGZoAAACQQAAA6AClCV8bG9jYQAAaKwAAAHSAAAB0id/+cJtYXhwAABqgAAAACAAAAAgAgcBem5hbWUAAGqgAAACYgAABlavNvd5cG9zdAAAbQQAAAFtAAAB+tW1g8hwcmVwAABudAAAAI4AAAC+xbsL43dlYmYAAG8EAAAABgAAAAazdVHdAAAAAQAAAADMPaLPAAAAAM4DAEYAAAAAzgNj8njaY2BkYGDgA2IJBhBgYmAEwudAzALmMQAADjcBGgAAeNpjYGK8wrSHgZWBhWkPUxcDA0MPhGa8yxDN8IGBgYmBg5kdRLEA5RgZkEBBZVExgwKDwm8mpl//hRhuMV9heAdTw/icaT6QUmBgBAAMEBBlAAAAeNpjYGBgZoBgGQZGBhD4AuQxgvksDDeAtBGDApAlxFDHsIbhP6MhoxNjMGMiYwVjHeMkpuNMdxVEFKQU5BSUFNQUDBSsFFwUlZSEHjD8Zvr/H6hXgWEhwzqgHkfGIMYEoJ5aoJ5jTDcUhBUkFGQUFMB6LOF6GP/////4/8H/B/73/2/4X/g/9b//f+//Fv9Y/359cODB3gd7Hux+sOPB+gfLH8y7f/DeJYWnrE+hbiYRMLIxwDUyMgEJJnQFwCBhYWVj5+Dk4ubh5eMXEBQSFhEVE5eQlJKWkZWTV1BUUlZRVVPX0NTS1tHV0zcwNDI2MTUzt7C0sraxtbN3cHRydnF1c/fw9PL28fXzDwgMCg4JDQuPiIyKjomNi09IZGhpbe+cOG3OwgWLlixeunzlilWr165Zt37j5k1btm3dtXP3ntsFySkZd8vm52U9LslkaJvBUMjAkFYKdl12FcOyHfVJuQynGBhyqu8xNDRPPXzk8pUbN69e286w//gjhgcPnz2/U3791v2mrsbujt6+/p7JUxgmzZo988Dpi/lnz52vuHThDABeipnsAAAAAAHmAp8AOAAtADEAPABBAE8AVwB7AEkAewCFAD8ARgBzAHcAbwBRAGEAY3jaXVG7TltBEN0NDwOBxNggOdoUs5mQxnuhBQnE1Y1iZDuF5QhpN3KRi3EBH0CBRA3arxmgoaRImwYhF0h8Qj4hEjNriKI0Ozuzc86ZM0vKkap36WvPU+ckkMLdBs02/U5ItbMA96Tr642MtIMHWmxm9Mp1+/4LBpvRlDtqAOU9bykPGU07gVq0p/7R/AqG+/wf8zsYtDTT9NQ6CekhBOabcUuD7xnNussP+oLV4WIwMKSYpuIuP6ZS/rc052rLsLWR0byDMxH5yTRAU2ttBJr+1CHV83EUS5DLprE2mJiy/iQTwYXJdFVTtcz42sFdsrPoYIMqzYEH2MNWeQweDg8mFNK3JMosDRH2YqvECBGTHAo55dzJ/qRA+UgSxrxJSjvjhrUGxpHXwKA2T7P/PJtNbW8dwvhZHMF3vxlLOvjIhtoYEWI7YimACURCRlX5hhrPvSwG5FL7z0CUgOXxj3+dCLTu2EQ8l7V1DjFWCHp+29zyy4q7VrnOi0J3b6pqqNIpzftezr7HA54eC8NBY8Gbz/v+SoH6PCyuNGgOBEN6N3r/orXqiKu8Fz6yJ9O/sVoAAAAAAQAB//8AD3javL0JgFtXdTf+7tO+Pb2nfd9H0kgz0ow0Go1m9Yzt8RY73mPHSRzvduIkjrORxAGy7yS0oSEhIZCNFhJ4T6MECODPbCnQFiil7lfgK2FpyrTQBZKGlFjzP+feJ83isZNA+Qc8eiPJfveee+45v7Pc3+N47qKZN7n/5p/jLJyHW8XVXRyXb9hNnKDN1zU8lyeytyhbT8pcqSHZOJc2L+taV4qP5BXJKjmmNLzRlPLWOEVjlxyysdbT6+zrL3ncLoMmqUmr1/pkIn1RdmVW213p1pGu0a6uaKSbvzDdmc84Q82PkD3ZU7+JdXfHol1dHMdzneRJkue/xZlhXJdzsrEoO8sN3sQZYAi2Eh0Wd7KhhWFr81MGLWfMN4wWzgefGosNA7vSioqF5Bsi+5JLtMCXnPQjOnaDEUbL1xQXB6+2mixKslDjcPDlkttlJ8lMusrGTq87C0WScqbI0/4uP48X/IcqFZv+lVcMVn8o6NcLcMVxOPaBmV/wT/Evc0Euyt3DyX4YalFxestlhein67wUKpVKsrZY19ijZXhTp59WTLYSTCpWlAMnlTjJy/0BOR0gij9Q+CanBPyFb8I7Lw3/4y/znDtv1skBUdackP2iHD0B11N8QOPMw69TIX/UmddM8ZpQtAD/yUsCnML5YXpuWJRqpVxNwh+vgf5xJ+mfTBX+jBH4aOCxroc/tW5s9e3njK2+49Gux+vrlqy5Zf3Y2q03F279f8N3jv7CcfJfHH8/eufwa+LPX3f8bPhOjtNwIzOP8m7+VS7OZbhu7iWuHgMNksMwK820nC3VYzpzfmpJLGrK13UxvNTxprzcUZQ9ZcWqn5btpXqHFd/vcMJXrB14abWZQPEKRdl0UkmYp2USOykpvGVaTohKisA/ZI2CBBteC9cHaiqEsyhPr6jkYVED5ukpZyAPK+2wcJfCShfhzYQJRKABBdXF4IKryR1Sw+QNpLpBa2WrQ5aYdLweb6VAKn39cO32eN2w6Bl3hIDuGtzJStrp8lYE4hyFb2RGlrp6l+/beejiyrm7xh2RscP7rtxTvT63Odt1Z750YfT5a/38zwMXrl6z17Z6FQk+c8ShOxm6cPW6y4QDB7TkzdX+rxnLzaBhMLfOz+m4jpnXNDv5T3EmTuLcXIxLcc9zdQfIsR6FH0pSO113wl6kG1IRtdMNozWqseUVI1z64/TSr50mKFXYE2YL5wblN4uKAMqvM3Nh3LWi4oHfEuwzJsdGiH6mpEFCghkE46jJOqmuMbhrtZqS8EgOxRmt1eSUpPhdNZCe0QFveULwoQg6NaXjzAIIsL3b9Yl01VUuVfqSCScpk46+/rL6tkMsiR3nf3jH+Y9u37lscnLZCvLkZPMiwp2/9hx47/yL7yE/2H3FkV27rzyy55lnnj51C//EqV0v03eOXEGMzRfJag51rTLzGv99sFVxrpPr4z7KMfF0GKfrAbzw66brBhRRSTPdcEhRgy0vu8qKA0VTQdFQZUqIcg71SQvX2qKSo29RLTGbp5V+eM0lqF2Qi1LDEO3IWlFJzI4pyRHOUCvnD8DnoZosSVOcLZzFjx0OxcqDqEpS3aztBvGBPvVV0xVVBAZvf7VIQKkMekOUgC5l0BpWXZ5yqZrRO10eb3+lL51M6Cv37rj6om2HPvR4p2Ct/O1kfHDHpu/lLr7ygmvfu3F8sPcb/V2FnhWFdLLw+fd1r9qyeud5S9/T+0xlWDIVCrbdy/caenw9m4/cNLk1//0c0SWWdfev6K0V0SYRtKfcHdSeTqI1VU0pkS1z7OjZzalinbWZ861kyzK2DSLcb8fMUXIL/23Oyi3lZHNRMemouDU6WAwbXQyDGZaLw/1uMINJ0JRQXznFhJpoqclaCTeqBu9GNazqFohb9LoLZMej91+4Wbn3MRL+q1f0ZdsXPtt83FXW/ZjNswPuu4redzknW4sKB/fVFxWDel/NSVzmusaM99VY4b569b6cld1XL8EQYCkNzJN5cbunM5UIEfWGjgu2bN1xz6MfuXuH9aUXX/iCuWz4cfPIK3oO9nCFbCTH4b5a2MUC5+R8YA3regK2UCyjs9KUFbcJTBlYeX9RCeAd3V7JUbcJLqouTjDJGW/Vayd4lYQrQ5Hgr5WVl+pujR2ydq5e2VPMSFbbIc3qwCUr87fwQ4FzBHLhOvMxNxkbGbmpx7h2rfupc4JLCMrhGDiir/Obwa+fy9XNaJO5omwAD2ScBhdeJ1TwRIOG1lqUzSdlvtQwWbgOdJuluonKx2QAk2w24aWZM+UVG4waRlopS/A/d1JKSsd+t+l3v9tE+A2ENGc2NJuEx3tHZzZwP+Ju5uzcCCfbYQ20uPYNE9g3VDmxKPMnFasFXCG1/LzdlJ/ieD3cQaIaoIWVsKLs+0dIsr2JYOtcMepOR3Olg1tudl1i9sSiHbXetVeY6bqnuBMkQRJgJbIcTLVBTGjp1BeCqseBxdPYOCNoso5OBK18qnli9278+xMzv+Ve4R6G/VHh6kZEQRoTZwP3Mue6tVv0Ns4J/zZ7wW2B/xgdJUU5E4VYvFiMxworEoXiRKGA45v555mnyD/wT8D4JK5OKLKCMbGBGMBaBskn1jS3X8i/dUpLMUQWbF0KfIIBNBlW0IAGzqyZZj7AqmHaTE4qRtu0bKQ4R9HZplGVFSMBM80bQIctkqLRo+W2wqaa4ohOS+11vwj2WtQnJDDLiexd/3rPPf/6y19+iqz83OebL32O7Gz+gJ+kMr0MfvwH/xecjVvJZEJ3MWgPT8cvFGXLSUVrm65rLbiOWlQXixYvLcSEP42wpHYYkdbSthqValkCExivjBEpc9n/Hbdc1Hxmr9XEd5dXnXpc1JZKegf5pZXt5R4QhAtkEOI+yNU5XAefCZFn3Ue11xeA+zlQHgYDmBIHvMcZrKjR4aJsh40OogEvqIUBuHGQbjpIUGTZLcpB8AGNgIUbB4UPFBtBeqVE0A0giPVRAwQOMeCQ/SBAH2JEAlYBHIcb92u5Qg1DMmFw45rPKmm8Wnb3PPfIRC0UiUfimVsO7b3uY3Xic4yce0d928Rq682OdGzJ9ku37fj09duOs3nmZl7nLfwnuV7ufq5eRDkbAScaizghI2zRegon6YdJ+lP4nj9iAiArFFPg+J0GUIVSUY6fVELgykJMFbpgvpYu/K4F52sRZQ/6vAxoSBk+9oRAHQQx1Un9mQA2XRG7QF+cktKZg1e/Q87UVJ2OEvBSzD0ZKrOX82ZtoCAJ3shlYnZfLBOprV0zFkqYnZNrl1cDEU80lj22Z/d1T+/Y/ch7t195NJwyHravH6ou060k44OVCes1QiYysHHn6hvShs3Lz7tmNei/f+YnfD//DOxHG3cRRzUOLZi+rFjAgoGJ4qjOcSYT00TTSdlaUowgAk2pbqQ2ywgWpW4yUkvGqZpoNDFNBDgJkyY26qkrhNoz9MtlyU9W777yymt+9KMXNpAnmjvP/f73zyVetk7VmTd4G+zhKHcLVw/TdYIdaQy310mCUTZcVEcbXiEswfp4AZ0IXhyDIOJQAeKLJxU3GD+3iO+6nVQf6aoFYHniqK0ijE2noRt4Si94w+1lkgM12SsxNL9wcaS4O+5WtRDRRS5u9SdcwZFNF24cHiF3N78xPnDwxsfft3n/FYEOw5W6TaNL1wnk/IN/4Tm8bf+ty9HmFGd+w3cCRnAAwtrH1UWcoQcweqiomI3MfRtB2xLUfTthdzlFxQ/jtcG4k/Dqd4JDM4tGcGiyTaIz4JQQ4kgOBC2bJfCostYh68GvS7Ku5dczAjHMGbdrdkougRT/+cu5PTc4127cdt2DR66687Zlo6XRlSODvYSQ+IlfkNVa441Hysd2Hr7n4/dec/22tau2+C1hEdbqnJl/4vOwVibAAdTeNowmzoH2nFDd4HAxzHQmJlgME7UoJlhEuhIm3O56GD0x0sgBDVfcDciNxA3nkB83v3gpmWj+2E7+7q/HTz0W4jdeSPFpbua/+CD/PHj/CCBUkKCEEvTqVVia0YPwcvSWLgSfuCOjcOGiaBxxiRzA9wTAoRjKRLUMh6YAh0resJVqQQZAwwuc1iyEE9SWz4OZC0U4D1vm7rzkvZfsPHrtB++67rLbrz2n1j9+3oHRjpXr+oaKuf6p67I9h7ce2n3OwXLfDdsuu3zn2IahYmV5doCYC8uivaury2osts3N/BWfAJsswRw3cswdhTCOKypuVI4onZ8DlMPBlEMPyhGDVweIlCErP8QYdlAImI3bzkLvkKTouRpTCNWOZqr91VmU3JrDA9ddcesPXw52H+9fM7nt6tvXLMt1m5fVSuPks5fd+cD1j781NmE879HM9Vev2+TpK+y+dDsd807w7b8jv6Dx1dB8724DhNaQVO/uwLHL5lJDx1IdQutKcbZ8vBrQiHgFFzsLSwqt/4O3LyTihQLZCD5/ogD3XQY4qAn3tXNe7hKu7sR7eem9FkFFPjBuJ2Wx1LBSWCG7SnU9hUd6gEeyVaQBMF+kMuX1sNFMDi9uNKukOD0oyzPCJoc62GWHh90d0Vzv/s1BOuCbXYeNbRDFZ9io0c7dzHn5E/woB8DWWelw24j7Zn6sOUC+QTTrfnX+Sy9th7kd4x7nv04+B1pv4AKIuCiyREiDWmAEwK9irLi7A/4c41ed+iy/6vENG765ceOCe1Qr3aSic99MvtEc4Me821966fxfrcN1S868SV4AXfNwCe5SllloBGZzU4oE1lfSoPWVXLidk0XZe7IRpks2ZQ57IYgx0SSAHBYRvFJdpFvNy6JdkzSlkQIxurEkiOoUvWmuEmLUj4qXJwbUxLZuwnVy1/r9N35v/IPLRzTdBlsyc14+GuvqjoW7+JHCkv0b/3TZjjtL1w8tvZLEm+loV3c8glktnNOamQOaLXyDGwS79GWu7sMIIVhWlkKM34nX1SKGr4jJxbKSMkwrI4ZpOV9UtBjATNLNVQRFKIqok40hM0XsQ6KShd8gTkuDsq6g+aOXRh//9XHMFgnymCgvOaFETW/KkRPcVCQ6tgSTQ6R9JS8JECU7JDmWmLRW0RfKlypVKhNrCWTSV4GAf+mI5HjRwDnj2SLG/LJPAldErY8qKoEkExWGCaqjpFzyVst6O9G75+xeg/qbF76WSXe4yqUxksFdveYDN372Qy/0pw71nrtmvH+ymtpbKZSkZUZnyui0d2XGP/y+Pztw3Zcevfkmx0ce+MTVl5PMyu5CKmU1DG9+/Vu3HpUfuHLzwMT6teet2r2qtz/gdW/6ZNonuMobrz32Z7uvfP7Jr67Kbrvy0mcvGfvLCv8eXIOZ1+HH4/yzYA1c3DhDljQ00k3X9SaxVCpR9WrYHBymVmwItt1FzJ9woEWIrXUgEY0DdMgFMkhWqs6y00shbSaJ8b2znLEM//TQq0PNX48Zhn8wbB7Ty9t7TfzhUx8y9/bqbZ/8C5uhl6TfQJ8BMIJfB37KASg3zd3N8j6KW4OhYt2IWp6Ca32pEQ04jDCaKI4mQwNZ9MBhGKuTxrIAdmSuhC4Zc5t2+CyBzgRAMOqGkkDfbHUHmNl1MM8SgPjADjYk6lBsVprpqWvNuhrDtwDQi6QSL7XhXYZ5lVkcCFfhIVEcIl3/9MB5O2++8WBC2Lb+z9Ihk2Pd6nutoV6dyLsFXe/j16XJ1tU799X4JSvexw+SsaVX8SwnATHOdtjfEbSONIXjAIzrCOB8HB7AU1oa7MB7VhpVWI24y5mHwQnaaVJLNpYUrwVlRP2MB1yKog3gNB0BhuStNJVAgQdublRZrztZJKh7VCXH+DLi2UyBdB7c+fi+A6udQmf64I3vP+JP2f0r9112+Jx128i5j++5oOMTl0r2P7vtjodN9uufS3UXn6B7GtfwL2AN7WCpLuTqdpyJCLaJXqBW0XX0aNQLPW5lL11CEWYhsq1ssXFBlpjmFJGw9fHAemgsaOX1DoqXZlcF9xwsSbkkiXkSHhHFEZJ6/gs3bnhs0+AvfzmIoneKul7lifpFYwPEhwiW0HH2wzjD3Emm9YoPxsS1RqnmBIIgeIpXQPHZBQy4bjPghzYzRB6ClzOAJgqAa7wCvusF69sCuRIuUYROzgeTs4F++qh+cjTXIvtExQVrJpUwE4/BFyhsEJYtZMHgRTZRnYVrTBlZppUofOR0wYpaQD9ZboiGY6qAAAtraopNgN+0c8WDq5t0l8dImV5J9IpJ6beTdttf3iKYh4bMwi2/sEnL2mq6zfbvwspfrBSab4mXTKG8QCV5EeQVBGnVPRTLQfwLjpnQoBPEQy84zDtSVGnQgngko4eAeCQQj0SDD0kA8RglCjstKJ5QUfYzjGQo1R1+qu5u+I4fQ9glfpSUg2ZvZUupYWNisrFAVgMyCSPkFjBEoLG95KVCUQweFh9wkhxUAet8KbjbcXeA/Pdyu+3LdzAp3CFNNv9xWBT5y3v/fJftTduq6VW2aVAeJhiQA+Yi6hCfxrjHuHoE5SAZ1EyEBS4sGhryQ/Tf8HgjaDI9ICZ/ichxulUFmKhAlZyGqLpSPURNVsgPc3aG8NIJux1jVwOsvKGoJHDVYYbwT0dQ+w2SbMKZRlji1YMzVCxeDCyE2txgYuHGrlaoNtgJDVezf/ns3itWOe2ZriM333a1mBFXk9SgeM2lj3+VbH70i/FPXuIQH7r1joc1fy3g5IXpzq+xuA+mzP8/0IMk93HVW/iZt/AFE+gtcJPIUpnuE5PoxNqENUr3iBUhf4ruhhhIwVKqx6iwYkkT2q26JjZ3b8REXFvYM4oH4ncPxpVLPH7UhlI97MHfwgH4TSwpHWglouiLNID9FL0VbZ57nt3GScdb02+lXOAXuIoMiuIgCQ6LJG4fJgH8rfnqsL35Y3G4ZTjg9Yc/ZK+nfsVe33oLXlvyIKuovVvBtc0HoOW2tZBNJZrmg2lbYSZWOmerXZ2zdc6cacZv/qhxrJEJUZwg+aWiuLS1PWFBTv0bjoBw1pnXyHfh/hRV032Je9FAJWTg0RZR8wXjEEsUWJOTDD2Lihk1C4bkpAlOp4gJTqqMZhuEfoitzTwomQe0je4nDiNZgIo0WxglJer42iNFKGhd5RV4Kz/RJ06S9Ih4xfXLrY3bbGTfUbKVjbr5qftvn9Wjj8G4Y9yNqh75qB4p3ujiWhSyUi0KYQUjTsUZZloUphINx1SJhudKNIG6QThmDCCwOpuGSGUnrUvYCQCYZEVDbURkxG4fIaEhMfSP+oGfTB7/+5Xf+fNBcWjOQjT/hxhscGX4WXNK35skmleYasAcgzRn9wRgq8tV3bAu4mPsLR/TUhbHQmUxwTfmaQqGQJjBEcECYjimWFUfoJdogD5/WmjzgiOSsITERsQTNvvquWr0Y/GGr+FY/QDAdtL1eEgdqytQZjvb6Ym2d7aVrgnod3sRLNNzVmC++DHUoIVxM5h/X8v8y85S3Uc9gA8MPbVvvjDaN6uRAjI9wcyJP8SMHXi++QsVnL+LJU1Sg9f+JYJ1gugf+wgxLbNYljX/bdT83ZV/ZR/tNTh4h03fE2pWyLfCPXq2cVAC/lMf588/9Z8OQ686f/5lmL+fu49V/mVbWXHDVB3MxcnGMjo3xWDG4nQAoysUf12krl7EzBVfqnvFFgZA/CkyP2WDr9m0LchQ19paCWLq7LUiLJ0A8+bckqOh1VusdgwqiKSmWspuOnHUSylJp52kfsv/Kik5Rn4+JB1pPiuO/nzIIYDPCjY7yHNOY7FodJ76FO9v9jqMPT1GBy8JtI9g5j/5v+E/zQngzVdzdStFmeCaKbT0YfI0SHP6dgq/EFK6AYwZWdgfwmQc4kmrFlfJh/VPzlibRZEMhc1LWuk7D1x03/svuO7Si279yJc+dMnGzYcObtpyiGx6Zud56/Y//+SebV/96J2PP3rrXY89QrEjrsEArIELUNntLeyoo8AJc55KGHYPr6KMhtFr520060gxluOkYgF74C7VLRQ5WBBoOGhe1GFny2FhSRgsDSCU8ltogwanGDHFaHGAZQjj/HTOGgUOLgYc1Cg3M4sYnB4s7EIk7CfC/bfdfZO3276i+Y9DDvufBsyPrVzWB+uw89KD12oabdzQ/Bb/sRVr6RwzM+v47/KfgRVIczdBzMuxTRWBqelohAMhrquo2DGNJMoSQkCHjoU5sDJBlowJiooXZgAmAi1BHBbJxBYJoxsrltJ0kRTunzhOQzY56jAxurlSEcw8qeklFpzSvEgErqoUGIyQApm7hJnB/J+ed+f2Gz54PT+xNN978fKDe2760MOXbd544NItmw6Q9VddsHTt2kPP3/qie3jAWnZvPE/j+vx9tz/2yG23P/phmG905k2+AWua5yrcI2pk41GtoGry5Zwa3VXmRAWNdCGAMV4a17efmposTLerVM9Sa5PNo7XJzrU2WVHphfmDGihVeO3NwlQTNpo5Bq/FKWnwA3WNI4GCKUiYaquAH5hvXljq0BvhvREyRFggpINYKE9w/TWqWPIkSmO9nquve25lXHA69fa+sm2gazxjc1kFrY34R1dI4sham3fD2nNWFlr29rzN98akblfPErEz3GOMmr32mDmrWTf8E1AUsouMLx+doH5jaOZ1XgexYDf3Z1y9CyWmB2ip76IZMPTpHhRSxDA9FejyGMGglmmHiPOkErfN6RCJi5h4Ujpt01P+TpMxrwTgzUARFH+a1vjjThoqyCapobd5Il1gdpQAOpI0WuEu5vEhLE53gsAiDjlO0aav5f9bedWCJsMSbHPhJojPyzbO0DmiratreHlf1ZQPpO2Tt1yyY9dKSQh19y/J5Cy7E+c/eP1ezwvvsQuVXGYopHUJXtvQui1HEk8eFOCteMlvyHtqF+44CnIRYQNtAF1yckdU64W4xqzGIBLNDbD8NmfirFqsoxPYTDRDb6EZelr2AMdqtLcikLqdxiV2LH8bZ+MKNy2D20CDjPbanAii7XaSdiLy48sl+3uk8ebfj0vvEUXy74pyqe3UK+q2j9kuhTG7IF54kdZJ3sN2u2IyslgJk1oYLmnsjpLa8BQ+iWm5up46UT1WUcJ66lqphou064CWSygYcDuwS8jdwpO0XGLV0zAfxm6CsbsirbEjQGvjtXILr4FiV6SMi0RHhdXbN07al/xsRDh234fGgxI6EwQ3T+7eduF+skHS9/bqpeYz97x3Y3LrBDlfoHXcf5tp8g/B3ESui1lrNi+zOi+Tlc5LKioOKk27xLIOGjqeIGFdIOC/3cQ5aHn245bhH47/076f0TvbMcVqB0HaTj3O7wU58oBPZLiXh/sHru7Ge0kOV7lcpresG4w27B6jt7Xa6W29RcQemPz7Sv9/bMLkn+wuCLLnhKI3vynrTrw0su1XJ1gHmaEA4aNR1p8QFKf9TZ3sOvHSVz7zq0/Rv+MoKC6nUXbCZyYRPjOeeGnU+5830M8k+PfEE4rRZFRM9jcF2XyCe1GnN5lFp6fA/iNLbDq9wQhvSQ6ny916m/2HqUbm9mnA7lTFUp6VjIUkNTzRjxqPPLjvoUPWiR+MPbLrIx/e9SSIqMcgNHeRnzcl8rRg7e0VTn2M55ocfzHaD3Q0t1GdG1axtYchObcvgkhOj6tkLys6TMcIkqp9qD+cosNAyhJEvemtVJ2aDB2VtzoLjWluD1N7S7764hhETsajt5iqr4y+dGJp85/GDDd8QD/eYyYWEjP39OhsL31WMAACeav5PRu82L7xsqTvobqDecerYIw+rGg6Kd6EvSyVFlUhf1H20DRX3U4DGztqvofuYQ8gL2whUewetO56nro5DtMkeopONHMnYNC03HhFYyHSgOnuB4zDPxg6Li5rfn+peIKqnrX5umjp6bU0v/RDQVcq6YSvkgsYnsdmzDSN9Vp43gzoycy1YiYG4zWa6Sk9ZzCy7g79SUUHtkfHku4CQkGaJ7JxrMUDTBhmUbEWJADYNeLozazADpEcvJqoeyJgb5JYdosjmu8iF/3UKa4gP20+CUGEY2WVL1gvVaqn/k64/iswzrtmjpEP8V/jDFyRViOw/VBbVIiGViPQHOoAkevouHUaFimxEoVXAjMnld13Edujj96mWTlwKlOlc595c+Yp8mqrZ4Ob37OhKZOkYQ15cg3/xCktreEfIwOt+xuKCgf31xQVrXp/iED1cH9CTRsxsH4n9f5lCWYpxXOPPkqE5q/X8j+ovvU5Kvtvkhc1Yf5bnJ6L45xkTRn7WYxYLYI7GNtxHiY/YA85kxnDN//70OvlN94gLxJX85df+QpbQ27GRV6bOQjz8HI4KM40jX/mzMYdd8fJa03rhzfj97fyWVLmX2W9NBraS2NhTTSIx3gbZ1Z7aEC81GPCRi57k1uP7VrGv3qcU/tX3uA95DeAatPcPVw9iJoTBy/gpWBIC0EEacXtNH4wgF9qaFJBEfCPpg3+lAjmENU8thwRscyMknOZWVY7At4Kc0FJ7G8xiP44hhEuiXqDFG4OF+fHZkaqVTZWNa+qDQzJhFoio/HFnI68ikCyN3+m0OsOXlC4cefBTbZK3bZ79eCq27KJ9NCF665fvzIT6S/pL+roXrF+V/OUoOuqTaw6N5mNPOUu0bmbZmb4JP8z8BFB7gqubsMpO2Gm2A6m+I3TtD9Jy3Vr8614mFfTgvaTGDhiC4OdRot2dIISTXMrJhtL/Un2VnKYVqix6A4bBsNgZlGrZUmtyejzJCM5Z8vppod6NizZesVHq1cFrzhmce/Ycs5yf5q/P1Ns/rT7vfuUFT6ev+/UX5CLdm8534h6kJz5Lfku+S+YxXlc3U/tFaygBmchgKUSaOlNMKljh9WSYJEk1sugV0drkdBEufzURLmwFdlLdz3nqbWaGNRgozKbtaOgPPnBK9ecn43FA3Zz/9rNk+Ord11w+LZ/P/rB0WIk7bxEc2DT9v3dKyp3g7w7QNeWgLxdYP1vVysoPhMMkMIlrTpkiKRg2zSMTPBGms82mtWeDBi8G0MpkdpVHbhTxQL71RJox1UBGlcFDCroCLgx+eZgSBuTk2EbxvOcWGvPy1tJqt1Oycqsdkk4zY4HrsqXV32oIJS/sG1yy2V3rBiLl/PR8XN/8Z6HzE9mi6cuFLVdA+N3vH/zhU6yzn6AzZH8krwGODCINQbaWWBtrYZfM91wGSVMvbrQ4LDVMGFvQUk20ZAWF0QWSnRN3CZcE6tE18QKCyTba7JRosnU1pqESXzOWlTLLDDquPfwnsuan9+65tyt+y45cuft/6c7Vxj49dEHrz3s1GzdVV09dM+UZXTJKjVH+Bj/L1wIfR3FgH7ttOwpyU4YW1kRwYmINPEm6tWOrSD2INLOCKFUdwXxM5cD28hcXhB/0IVvBNGDRGiJxEn9BVX4dhEyow/z2JjYAqyR8f3ViXx5cFfmjjvEpc1flwTy0XTkwTW5bDzn2po9Yhwebj5t1xUKOpHs4GgPR2Imw+dB59NciRsFdEE7BJRh7fSU3TYM8YQDtChVVHLwAmirHzNzY9g/qZRh4BxtsoKLstpgpmP91jraYIZX4RJ8ptRgEVy080OO41/phutuACNg1ZYw/PbGoyc+gHhLK4cBcEVPKL2mN+WeE3JYnIqEo858HX7G7ondk9QLEOVyU+FITy8FX3V2QUu6ZTPqqAHsXy0oOV7w2lK5/mFmIRW7Axffm8O+QF2Q2s1+STZgK/OU2VWu0eYSL1hLLOjSpnhQaJCtullho0ZJq+urHToXCTactMPoRLXHVh1ectWepSseOuy5apfTbNQsu/rAw9fuvuyGiVJlojS4JRfs7kh1dyfShfXFIW3QW+iV1lXX7gzX0plVFxK3CCBfGhxZdXDNus6haiYZMQtJctHA+MRAZXSU+jaMj1bD3o9yTzIvg5mFEOx5i+CnuA+Xz2U6k82FrR85qXiZzfVGaCYL2wojNMUV4VD/IkEwwl5REdEImzE5S3uFIHqqi7TRTLSpRsEbYaZZZKbZFcLEQ6R2mnF2t1JaaudWK8ElPtRz5eDdtsrreaGr0DFk73qjLFD7/L2RZ5uv2bXd3Vr7fwz0Sc0X2TXP8iu411L89zkr+Pc9rYy8liaKDdhT4Ck2RNo2QZPhmpNsFpr2LDSmdkpBI04t0wgCTZLTzJEJPCe4aE+NtgfK5lorW9+ybfysCY/0CxP399gHvtUZjedysSiMkGzPFpvrYbT8oSX5XDSex/q7PJPjfg3jRXsN1sGMYzQWGya6PHKkiG2edLQxiiWtMFq1FcZIW2GmgtagkG+4WcrOXcQUEdZOW8HglNkXjmADQ0+vATTYCxEgHa1LT9sUZhs5Eun10eDu+IqHc55YeHtPZ+nTnYlorms096CvQ7ej+xFyLNPTPLrpcGdHPqMZiOfy8WguxzAVOBl+CPQujLlT9I0Y2ga004rdC1pnQq0z0iVouLR+ky0PL3S0i6thpCiHwAMxNXTTkpjbBysTopFuiKohlstoEs8dUnsYXdiyIuB5DKNWxTdUw8rVuUn9DE3qU/1yPJrzPGDo+uvxo08Mnbi611Z6q4/pV+wTFl1Xl/F9zaauK/OFpwVtV5cOtYtwWDhGLGNFrzNHs9Cm6dlE9LrW2rRa7M+sXzrabU+1CowNC71UuD9Hp7yDwsqHu+yDXXqBPyfTc2qnqO/CvnIw0FeBD+zlvqmOxZ3EfL0WvJ830dGT8pbqFgor7fB2HlCuNoyhVIkOqgDSNZbqBTquQi+OqzBnXHJBVDIwtBiMPZZpFenqGVqhy6TgOzGWS3XAF04v2npgcbC1tsBmJmckPEwQo91tfgkcLKfkMcx0xClkqOtNttk+C5w3tm56z2wbZn+LloXx+3surZ3Tee3QvbbKf+eFfG+iT+j+ZaeQL6Z6hJy67YbGJpfNWo1a2dn8nF3X1a2VflMpOagFQT0OYX6J/Bpk+8gZ7afMl5kJLYHHUtX3bU0n+QOMJnybGhwyazbdZzGboQd7rhi+i5pNkMCQgGaTPAISWNxqku0UT/2WT0J8Am6ZW8bVTahNdo2KpyiI8lAQpeabHSqkxRS0A2tpJtrc6sLkOetcnANlVYfYlwbAdP+1V911/7VX3nPvaGVgdOzw6G+uvu/e647cfc81uw7t/8qhg9R+e2Y6+B4Yi5dLYKxEs3wBNV5A2ceY7GMt2QOGUlxazBzQnjdMEwBy0PhgudQEAQrfTqvJNGxIqbkCFHNYmsJiIOvvwpSBHeuDMYBTUybWVLpQ7LPFAANFVXMiCs+fdO9YuuHwg9fHe+1jpPl6v3BDLLZ0/YqRWBEXYHjstoPveVD/MUELEMvOl5pPGQ5uP3ebk8o/zQ/BnNEHXNPC7MY5UN1aROgum0sL8LkdAFKAdnovntGkOmVvoXNOcSAuN5rsqE8+SRZBAixkZRhd727Xxhdi9GceHtytsZeary+xb4Gw6c41E7F0xLVu0z+//wO2suHU5wVtd0ErfL14y7HNOwxkn24v7ieAuuRp2E9+rHS41WAXy39GtpgNgfZ71gU6YMGKR1+MgjHf3laBouxrR4FqBRH7a9TyIVFLaJJPdQKChzU5cbho9OwHOGm2eIZ+WqQyJFu7hS6f7097tOUJwRhL2Po8eX/BvqL5ywrdL/urRV66JxVq/qS9UdQ+rdfJo2B3u7H/geXmNfNy8+7WonkR9IL3tmvZAU7HSbSnND3f4FkjS0zN0Junp3yYoW/42ft+cPvsEAbm6WOOVp7+Bb3gDidpot6Pk0vNSdT7pLqQ7MSVDYNljdXmp+kLmkwLuM7L0mupPneOWMyZ7my3JeSriIP9h3acs2bYbE3EUtlsJRktOO2HL14tPLTV4s7ERa/L6jOGh/MTm/y3r7GIsVA4HpDEsC/pPmc7yMc58zuyl98K+/fS2ciMZp3o4d66ztjKOlEA5mGhGR6z8rSOWWHM46F20cOpjQgmbJznpfkxmizUZF0r8MG0GJ5baMdpNLftXN039tBDyZ6O0HkT5ZjPCiFP7uCx4TerOUNPzCN2d5Mk+nWImSdh//nxLAProYCImW5DCaw/T2g1uKWOWthtPlrO9aG31NI1BK1Gw1O3m9r5SRPdkSZLq87LlBRWUfbUZDs6Q04xSGh0XLBoPISc/loLtbCdNy9kHiHe+3u6yvHK+AcKQt+Xdk/eTR4DRPatoYpIxuBiLehpdcmn/ocjM/8DhtRD/mVuXp6oSVXtWfPy5fl5eX2zz3LwqLF8fPC58z9GPg92y9b8EUkKECQamusI9oXNzAAOycO9PNwn1D0uOTArT0Gfraze8vSc/N5/f25eTl6iOfmvfO9XVZaTd8D7zhOKycFy7iO1X+04LecunCHnbtHp1ZT7vIw7zbfPTnNBnp38ttey4Zq9l20zVL40cNe+K67bezNO2SA0XyF7mo+TuKBn0z7QfASnDnpjATk7Ye5hbomaZ3dTBFZ3eUNtvCCA3sNbRptIRRApIm5lYK9hslh9ARpdIvRRgaq3mqGvqkfPGLxuy9B999b+K61bf175c9X3f6jyr0nttovKXZapvzQWcnrLdTeZugqGZ//B1JUxme+4xwz4cOYt8KM+8ioX4HLcIssPq4/VfqzqgwZIi2sADRAg5PX2VzXaZtl8+DJT5UT/l1N7S6lS33mdHXXyhXxeLzT/mQTs+nze1Myft6s73BUcjm8nx0E+BRDS38IY7Nx1rXy5Zn6+nLB8eV1jaPXtqklzzBZcCq5BR5PEOpMp/05S6JyiMbfOpi1MnNM2mALhn7SZx8l9zTc+b7cuGyVHhU0P9zXvEC94Gsc7cz15hv8yl+J2crRQqpmmzfzwYqGndumx8thJRO4elpvxUEjswVY0c6keozYshuNKU8H6YWDuGENvDsC6AJDUciJY5RHS1z9E3AIJE1qBhxeP151gRXiAFAXX0tLea9yrSsvPWbOiZ7XOpbvqwvIEMdRqKzbvXFfm+5ePnbvJZt18zqpVFVIhGw9uWDVI9fI7My6S5t+iHdWtTLXGwnm1efVFzXR7pbL0nfN+qfnFWz7690Zh/i/A/NM4/zTL24eKihdehKJi17W6rWGq1JU52y182Cer9u+lqQHHjDSnhPCcixbn76X5FMGhmJ01dpIYZ18t4Esa9B2TbBQogg1P6FEgmPUcXd07uWbt0vIq93V7Sks0dq1ronzhVSCIDaSyatXaTVbbpnPHlvfz5bUXb14xSGqDqzYc3EjoXM7jvs//G3kf6P8TyDqBp7WmrBq/ETTGNN1SfbRE/77tK8fY0QCviBZH53wTjMqUUWd25qdM+BM+mHJ7nfCrB3/W4aPZdBOoWR3exit3jfuszgmWx+3xtmwOOe0dVvWzomYQO/PS6JUjurbf0iYT5x3YOrjFkLBHnAHrhoN7t3b1WvvD+Q7H2u/vmAzzVr1Jq1lz/nJJ6zRZdazGcNHMb9vcJcPslHPdjqVwt5o/oCQhsrXUMLAeEkfrirVZu83q4a5qH7bws4zAnOTARZpCX0GXm8wS5CrpGu1aE3CTfc3HOxzJXBc/Eu3qisa6u9lYhmYeJb/l94Ls49glS72CAEoUgXie7lw3ZjEFd6tJGiPlaBmBFOI8m77dKqWnrVJ6LZoFdtIuCGqndr9oIqVSw0N5LxSdDUyaR0RrgGeWHAxGGUtYIwFYCAi47vT52Vk8BEt6dqC9OpfeIimV0ERQfgvaAuOVBDJ029Hq6uVD9lhHKm4fHthWveLO9433D4yduvRey/69fPDB3Y7mUfvBh92aAweN9x5YfdBO7hEPgf5hcifEf4Lr5J5Tz+tm2HldljcwTNPVwdAGD+PZbXmUgFE/LcdLU27OjtXDHLLN1LXYcVZSwsjNUKqHae4nHMfKP+0SsNJ8CJ4GaHXbQUwuZ0v01FwYo7NUB0P7GHZnEDV20AS3NgWhDma/FWu4hn0etLNTPcpbSVbKs6emZgsSmPVEBody3J0fLJDJ5ZrrLl2zM5e0BUX3WJV/obGPLwBeW2nftk3v0w9HQu+9a2lPJG28WrfnsJQbvr9mNOxlOtLBPcsP8S8B5kpyhzkIMJWwAWYIZtbQahPGI8l4YCkgostE6poLYak7sOCgwd2jxdMa0pTB4vJhpCY6FIEixDCCRZcPPk1IU0SQ8KC3bHIoBtrqM0bSfdVMFdMLSCzggekYsOCVMThdHhrLQbizJ5PZ072nsnyysqewN5PZW9hTXQrX6zddu2nz1Zv/bm/lrsre7j3Z7J5udrk3m91LzEMbNw4Nbt7M6qUwyR38E2BLn1C7noK6adm3WH27EY0FCCiAo6xEaU99I5Wkb+CpJ7XZMkObQ9DpOEqtbmjsMrSXWFt0qyc6Cu8lS6w5mlYFPeE5ZfFkjDp6hUthi5jBWDutQG4nKhdOu04OmpDBPwZi6Dfdeqdx4LsD+257svIPfy9ONv9+mfQPf9P72Hsvmlc4f6F0ce+zrHT+bO/FpRfpen9nZgv4pC/QM3KAuVkdGnC/6pHwVI/qm0xt36Sh/um88z5FjjY/QF7Dn/TfKswcJS/z3+H6AXf9DQdhP5Yg6rkkSiCXQf9DSS7qAkUVAj1nME69YNXCJeFmmRI9cdoQ2ZGxqthIM4uRLsIvyjA7bRBgIwuIcgy/3M2+3F1sxNjVsIj8Mmh+JrAXV4sgJAubqjuN58Ns3mTf4Biq3rBEt5gS49TenFyS7UJBmtLG2HcMLPPnbJ1gpRYJd1xE62WsO2qBoUjKXjWk02UwRPeyw62Fa3cf3rXq3Iq5d3O/WYh6SvaVS5fU+novu2jdRjJoK3bn+w0OMeXpE67bumLDhlXnbCaRS8rl9UvX+e7aGOxOCF67y+IzpNZX+rZ5g2O5ZVtid+/wdydsHrfgtPoMtTvzYx09g9mJWIyuwSZ+KfkY/zIHRo2rcNizbCg3bCZO1GIjLB4pFdHruFvtBgjfsOEcszMexp0xy5Qzy4q1Kd3X0dGX/k4HvASCKf62UDodCqbTQfWV1qVGZ76tGeD/kZO4BDcEKIvFbAKA2yjaVK12ujFYFrS2vDIIWlAeRC0o95vyjWwnvtvI0rRDI91Nv5NGXDNM1cNBDw3igROkBOox0wRTj4hMOHKuhNqDH2dLqCQB+IaZHTIcgXn190iOF7SeaFoYpOmk8iCs8UBN7pRe4ByBpLkHVzmLIXurYdZDF9ZADwBWXV71bCCErXg60NNWgva5LELPZY1eceSJNR/o76tdc8VHH77ySM/uPXfdc/Ge3cUbl9yzZ9f+u65YM1Gxh+ITmzeNR+P2vomNl5BNT1x91Ui18sFzH7vuiquOfvyBvfv2Hbz3wb09ffv3/va7t/qvX+84sGnzAfvWm/y0fkKWkQ+C38JehQe5uogQwkDT9XOaE7BP2FtW4uC8PCyVnyo2NPSq1akaYVxL2K/QMLP90m5ZaLgot87bdi1ogmjI/ezQi009Ir+gYyFMTu9YiOy6NdHhlJYnL1yxbtScvcO8upqv7okEwvnJQfLEQG/InU5qJwKx3oFlL5g10WyhXPWF3EftSTxny/WTh8gnOT1nw9O4VTeEX+pL8vnDh73w5+XND27evx9+0BfKLyPzXyfPcDqup3X6t87RQ1AchS76oqw9iW2Fda2mxbuhGFQCmTjAjWP8qg1k84bXn0bfqJ2j33HuHG4r9/NFNbyfau+K1RBjD2qn5ZWlxrJz6VvL4NPUZryUE+VGSs2lnUeXxclU2Ckqa0B/J+k6yGtL9ck1OLDJleBJ1kzi5ZoELPOkqGyAr6XZWqbnKf02WLw1WHheVVM2TILyC56odgllgEpLSlcvYgqHUh1Ev7OsH4JdZ9eSyTX48bnSFBfImvFys6PuOCddqy26KRzi/E3hrZTpAUzTnN5cDevNxdpOVfKyxmz46sJdsnPf3bBLdhaPTdyzp+NHH7nO4rILJovOzJuJNZHS5Zw9EcFltGmEfMZS+2bpIoPtUH/ZZliwd0h389XdB/ftv/+B3b39+weTh8/38ka9Te/Ue/UhPhHo0LtMQVfOmIk9aOlIWci2x8mmTJ7FI1v5C8jH+afAenVy6lE5w3T7Yi4pj6Edn6FybCVr+AtWrKA2103+nFT4b3JGzsGtQeYqPE+CeRwN5uid2FmleiTkerEj4xnzTy5qeJGd0GDk2QlvQIago+x8q6NtidVcfTLh3vyezVveE+nvSPdVOtLkdzds3jI8tOXF1f39qyt0LMc4A/91fi3Mx87tnnPmXbaU8di7bCrVtbQWpsWGER3Nl+kManwvnER/b2MUS8ZSK57XsChaoKhfoMm11qEoPDsP+KTCknx0x5z6LCVcMmzcSDZueOop+D/KOUasZCf/LBfC6oFDtV5YmZvlxMHB+vTTc5hzVJYcFJ6XCU8LwnOz3TGHIMfXJsjxvSuCHOeZCHLK1bI7dnRvPu1y+Bwe/9bl4+ceuvbz1iyxFjdcUsl2GdZavM5MZbyvenBV5SitUREd2c4/wxW5Z7l6EufnY/PzIfzhfGE89oDkCgIrj3TTLh8038buFjcLkXswjYHz6GCnCZAaMscm78a5dtDruptSELohRKOd9UGAj3W9hjbQu6Upo5ChpIEWh5xscbLkarJDUjJZDDkQ46gnEecR55zGmzOPNifk91ht7qCzo9ybE4KuQrmQQmziCWy85dzLhsf3bRpaTdY73NpxU08y3qnJp5OxrGGF0etI9Na6Vnm15c6+Fd0sV/9tPks+RXv3Yi0erMV795ByrGz49q5jj/LZ48cpfv+rmTIfJzJXIhqunsXcXqpMU9meUt1Kjx1Y8cCcTo/ts1OcNYxiLRdl3cmGnplLPS34NSRGLNinEhFs+6+7WLZBJ8rkBHxJLpxo0xPIoijbT8iSKDtOyESc4onOmZ/S0J9a/CkXxClDQQ+/duPPOnxhTipCA3pYq8Mn+Iuhxi0xaQ12B+E13bNJULLYm7RDRq9jzXOiVLems7jGyHAIUSJtHRglAEBU1oL+qrOsgUswzqMatMl6arDxj6DFJQ10iZV9veZULF+y9u+vmnJpv9asN+stojW7dDOf27bHYhKNgtfp9T/m2f7I6v/5ecETTfUNcDPNt/KOri6j12q22wY8kwcOXF6+emjAHaDr6ZxRyDchprKBV2RHbs2Mg8tM3aoZC0hLzEaVBQmW2EIpzvDgj5FRQiBHpsHYOp6MJpIBUXAnBglJ3JIJ59Xv/dpIbVKaJt+9bHfefGoFf7z5MNOnCTDlr5AnODNX4GRTUeVNmUuIRhYnRHPMRtItQjRSmMCXIv67z80EyDVwBze3i1VfG3oT5T0BFbKBhXcWFV6HRzZZU5VbyyqyRpggc+cWdnABjwNiZsQCO7HO6524hlqJFhr06KlFzLx5GCslbMM59czncs7Rbr3Yo7NkcuPVjq7njB1x/kiNZFNd/RY695VgV1eA3bFxB1UGKtalEqQ0uGorB8V/lAoN6RMh0nrHbGjsvAIexpEJhEu2diWkfd5t5QN5w+g/Txj1/PnRruYHzXwkojWTrAF8UQgw66OAWTH3tY5pRsPNhgarZFfHxVhyrQyLsjK2ulVZ2mS2ku2erWQ7+xZhY0roQ5ds27r/0PbNBw8Wsrliz/oieW3D7l2bzr1418Zlq1cuW7p6JfrIPGDJx+ZgyUzF6/ayl/zhw8/5Dh9+vn8OknxwM2C/5TP/obmBfxr+hgQ+LMr9lKOtm3KgTBNGMs9eG46wwNtoY79DS/MKYdp7EXaZkN2JfqYrq6ZfIbwYO1FscKokYq0V6jj7CmFtKwh2K1KiR4fcpXqAtiIGsB0nSNtBgw61yowLqfB4Aj0oTdlFCXm60B+68IBdGBbZSUtf0ZrMnX2dKV0qVttbLGSV5Xd1GoZ+OGbU58hzk80txPPdkZUrV917L78z1Nn8pIkPhTRm4jKc+hBSpe4r/GK6+9prux8Dq78cgsW9qiy70Y5jSQ8LMp2a6XonlVcnHiObJ1ijyTFPeI2kH99oJJkX9SdbrHMLpVp4F1KNIeOshUtp6Ul/ZKNNM++bFuUudMB5BjbyxUYXAxu0EKyFfS056L4OSYodz2V5HIqYrCHmBt8Lou5Eow2IWvG3NhTtiz+jqONzoMlCZLJQ8KnLLs6lbF5X1r9xYmzNviOyNb3oGnSt2dvbkTOsNLsdqd7h3vKuZb2XYFwToLr9DFjPEjfCLSFuxvAnD5XrCVyCnjKCGZSyL9ECM43yaDEB61EtK2VQ9FqpPlpGeY5W4LMuI37W6FIBTlcL4DQcAv3AoS7NeFGOnlSClukW1umksq9bOufSAlLkk2KfuFMt5CN3soTQWEkZgn+gv1QfGsbPhmqwtsNDeDlcNrEckDuIXILxdBGVPyUpiRKIfxiWpN7TO0ozcF2jsBX6aPV6CdZD5E4KmNIZBphSbweYTsdLp++XgN9ltbkCUqq3mLUFHF29+aTDYcv61x1bc7A2evG5tRWfnr+RyAHRpR0xdsejaU02FYt0GMaNHilaqOSWubXFTO94Z/PF+XuL59IzvyWfpXxU9AS/q30aBnuTOTPtEsftFFPLD4z+woA8HzRN3aKm0oV9xjz2Q2Cmly+qdT96KpzHinkMeZinLK5AFGUaRlYvTolhMy+nUamFwZMhLhki1Vlb7ZitXPzt+IPLVGaqXev33/BMHmnVR5U5tFTh4pID5CdL8ljCAJPBOJE0H6cM1D7siDojK5KnxYoku4uzZLZziJFYQ8pixEiasjepOY0cKXds17JDpxMkaT5+vLn0jfljc73N2BxvN7azkTYVCQDi04mb7ACRFyFvehlB89yx+bhgiw9j0bH522NzFGV3Gbv0sUFr3vD8NDG0qOiqILuM4XTpxS7fdvnatedkTxcg/7Pjx2+6aZ4M74dxZrgcxlFnHGe2Pc54kZKOxmmzYxx78VP+uDGveIzTdQ81Fp4QAs88Nvo0MiwKz1D/2YiwKLwLdDoDQp+ySSLNkwQlAOMak9VjjHfm8I2IQzFb0EzMEUOWRlWLioFZ63JphJRVJrZEmJwulc5CZ2y3kOkvZjt2WTqMiwjndak2WqwaxdpooWJu9r7BaVUZ3QwyClIGx1vPIqVQW0qZouwvNxIsDewq0RqWgzVGemkVR0mphI5eEERDA5II4cSjkhwBi+loaI3WsIVmKOaIAMPpyOIiaGcunOXMnIcrLJBAN8sql+Xty9XE8mkbbExNMDf5N0iinWxuyeGrIIcAFwZ9+fBZ5BBsyyFQVOKA2NNFpJAgchYPZzeiDKxHWXbZy9JonUhuiXxkkhisUdqxF7Uutz+goQDK65gyWY2hhQIBNyOHa0o6Dn/P4fTSJM7pwuFbwgGV4NuZnQWi0S7dvWzZ7pq8vTsdwDx74DTJBPYuX17qXd5c/wZZM5BOD2Qob9zLKl9ImutEZBWmrNpl7BVgbLBI5RLpANEQWqwi2A2rV/ma5U52BpUeQLXqWxwnjUQmrAcBJvTTYFnppQ08isfWOudZt9Eil42Sx+ZoJ0a2RJXLWqrHaKttLMxabZ0EuYFahWAHO8rEAIBsxCDKBNemomJEvlNGi6sDJ46a6YDVoNuQEeRiItqLlCR8lFIqJCQlhoArg8YTYJVaNgfxkzOybbFCGrOs0uAwWWmp8QOTdtsXrxPMg4Nm4bofCdKyU6+PiD8+ZBhe9cVeA5+wLyTh6tWJn5HR3PaQAcrlEVD54vq4F1mFsZFlOGgRpji5xBQyLspRnH0fQKmOotKlaT8OQOWQy7BEEOppjqbrWwyL88nl8NEAGYySon0gipzU0MYDHSXU2CRopLULBVWUpkxmt4vqbkcUvpssgkytyMrA+Wpvyz5HFg1Uz8JJZ14Qwy5OUtfctyC0VTnr+sFvhbk4N/3HZIMDL0IbGf6XCOFweVwAkurRWJydSXkn1HBYTNG9LUEcARd7BpK45noAKYszxQFOWSDPf/ujyjPyx5FnJHqaPBV/rPYHShQQ1Zkk+g3EVYtKFIHLfB1Ncf/5R5apHC/TTrd3LNZ46W0km1YlOxWNJZJoJv5XVZXBwTPJ9nwGCs8s3ptuUrlH+wHvoI8vkegfVcI9Rbmj3MgzlBQr0bzxmWUtJ1GYEfBykaKShJdFtHrK5uwW8koWW3+K9Ajl2dejDz7qziILKp54qFFaybol34Nab5L+4AVZrLJ/puVZO7/ifwa7MnZ6HwCPWTWyCvaEhnNyW7m6lmOQAltkLK3ssK0ka4qUBcZAKUbroqFN2AWoQa1pa2nliZ4NFg0gCqKhDTPsLL9mASGfDczfXbOkfGDzToVPY+ZrnUXcDeOzs/GdgR1QFtn43gFBII7PiocQRcnJxreQLBBCI8McwsCvzbErraExi4Ljw/Nsa2B8eojit6vP1TDqaKJvDmsgY1ug+VPzybmEgR7af9TiDMTGfVuJplKdZhQhQtUaK63QaG3BSL1sW66YHSzbi4vKUsOZYaznwf40cX6wgHewDkfFwnqqJF5lCnOW0B0Yyo1wqxOFGjLbScYiaZvLIqmCSTNlkZzSeWwQzXFm2vGrM09PBegbUTMzXjaudXw4it1loQSb2mz4sXAdZhXfzBTcNTvRI6qut7X6rR8tnHP7I1wnu8qp6wDr9IE5HAr0wt560pO/ZY5gCzQIZ8NHPoXoY9bkAG08lyV6qhypkv2lupOeoXGG8FENdAUlVDIny0aa2SFS2qnutNPSAR6qkWoyAWzsocT1LX66Sos3S5+kONfJeHgxH2U/Xxwmyee/+NJnmv9vWLwd2Xjvv5+Mj/yQ0vF+/NMw698130BK3ukRlf/tZYjL/VyR+9HbsvDJnYBpAeV2xmkiFwKMqa54J6xZBELyCD2QE0mpxU6VrO80ej7sZyiy6Jx3wD9ZpJgXk7F9rOHh7Px9WBQNIH+fVAN0C3oR6WSpWEGlWH7XrH7VRWP607n+jsyL6c/K/Hff3OCe7iXKAwj7HnkAI9z6RZgAKbCKnpkMMKaSAU5ZtUH2RI53xgeI5nRRTkAP2NTFeAHJXx/n3umYg3+kMYNJXXTMHwDjuuiYBWpg5485zm1afMxypKw2Ny8+7OScYUfe3bDR7C46cjVPdqbBAyCaM/776fh7uD9ZbPy5opKAPZhL0N5LgEZT3Ykc2k3Yg1FsOFgS7cA92LtggpgW62G7rIflQ2ZTZnMmX8KMEXbWWR2+qDb3bqa/6EZaVBreeXtpUaHEFuwhrSqbm6lsUmCvrlpMOt1F7MDKMl8ULlFTtFAM9CRFTKR9zfgAvtw8AaCF6Yjh6jt82ncz/cUg2KKzd87HX4tO/5KF6Itw93Ei/3/4ZXgGaoxkqthK7TVkDPe98krtlZ/U4OdPXlnduhj8yU9UfXqe/zb/X5yLC4HMLmOVTSWqV/mzA4bWcxtb51uxCoCk/eiB3eiBEfbICekFnSBqfGH2MMK63migtZWowBxVQGqYnZw3hR9rHIrO2C7k0oZvtb3MkKli2yVNPaineDOdLz26ZrLWW3vgsgse3Dg5VKjd9kAXId3DWy9fX5rYcriXrPvYiciu0O6jU0/t25rcH9994MtHt5GX0g83by888v5b14MPo3x/sOejXBJRylkY/2QAzNjo/oeR/qHa6MOsUGKVpnxxGl+9K/4/NMqLcgBegiRWZ+cBJAMqlpw77/edfd6x/615I79F3RdLMMq3dz5h7GRZdMI/xQ6gs0/4Bmrb586XPqni7POVk+VWC/8fMOXswqVOpt/tUo8R6hQWnfzVzCm8/fxpvMzmfzPMH58/+vTZJVAqyplyo5vZwUSJ5hxVWcwKYCqmD4Pn6AAbCKLIYerRTFOPZ5dKv2ohMVbNYd+wXKRtTFaJsSq/c+FUF7OZi4rqwIIu9bOL7OQisSvjPwT98YEt3Pt2DIiyv0hbFM9KghhRiQ1e0Oh5f4DVDN4JDyLuhkW4EL/b2guL8SG+7zjm+WIwh2HKmZ3gHpgT3/rmxbf1BGFp/4YzxFltNHShXA0aGpUplgByNWjaoRlGvZ65KRCPSOcmquQNEQ/tJoHApM35n0ByITGicrsvePyFHUKRuSTOmVZiOTYsCWMkOSHW7rvjnptcPeLERp/lo49ZArPBmFi5+NCBqzUjEK98kf/oQ7zKdzPzW/5y/lVuFM92hehjidt5Iu20PFKqJyltTRIZ0QfU52NQbiyY8pB5uj5EZzs0iqcmh9pTHRKVHtZtI5mnGzELd66WEt5V2APRptLmCuwPPyPGUiSARQ1DvFAeQDoAcwV+EzyhJMNISVYykwekhsbM+4fbZ4yl1uOcWMad8hyrJ7zmnivB5z4zJEEpIRwD5oduPP+gBTSu1xSS/BODl26prRo1+iLpbp1kiYlF8+RIxVzqvFEbK2gFcu0Hnty1Md/LZ+Oi12exZyb6ll/oeuBCey5uc7tsblNAl11VXGGrePtG/6N5q13XxfAm5UkEuWLeOIcaFWw90/jsTInZWabEPHu28VymxAStarSYErEIm0Be3yCqS8aMR3VEfzQW75hz8CD77ukSaaLorJSJy8Cbbj8bbSL/7PHmgTZ14jx5pOfI410xR+bfjjmya8EZDJRGPJPNqdRovs7aH0gfieHT2SgkB8DOnJVGklxy/PhCeaS4bu5hVR7Zt5VHflYeBSqPjrny6KDOpiUP7LPqaOkHPqYxBW5F1ZFklkmlDiiLYo7876EnajbsrKqyjrli39m0hfyCdjTMKkxLPt8D+ZS5Ye5fVPlU31Y+gy35IPFeB4Rz3bTvuzsCTrmnoxuMTgL+jUQPvpnIYjg3QsXYN0eMU+U+fFA2a3VA3rIyu+qjDH+qdKdyrppxNtQrYqkRcy+jFOeDLIMJTEErtTI7DIR7Uskg8Pd1o7wHfw95LxoHOs8q/uXzGybOugr/M691You6Glp1LV6m9YQeboj7uroa+bddjUJ7NWq0TtA3Wyegp9QoD35be7On1weyotLdFjnyKvbjF3rhureo9IOOj7TFHe9AUfYmKa9dHrP//bDn/Sjrwu8h69l0aHv3zyKpRUU9zpDUUibj+1RAdQb7uKzVo5FWLcPLLUSlyltjB3lnuV6uxr2syrvrbeVdbMs7U1QqVOxYKyfyIJU20udHOlG3VY0ui7IZBWrDZSjSRegUlQKeSO8vUZljEyH2dgypckbbWgCVfsEgpjNdcbU5kIm5eLqYlVoFj21Hau9E4OWFEnfgKea+dGJRcV+3vKd32bLdy2xM3tl0XybdfwZpb+9dvry3tHx5M6tK+42BTGYgTeP4/+Z/TH4DyL/EDXAvcfUkZmozZcy8yt0lKmbZVUZJy9XSXGGXg0kUdllHaUE1KMYeFHWNihrTH23Fzoloi1GL8UFZ5RI2ymLZCts9YiVlsCXbDHYaKGI39sQ6FAcedu+T6q5IklroYARJPWM52pFZlmQvk7JicywuXa8qUHfc3SYSmufOOsqIHTtvfLq7V/Rtz12z4+Ke2oYtu0jzlYmNy1dsu+jIxn1bhyff3xFLDJy/nDifWrv52FoQb7UXxFuYrPZffYlW1F4/XFk9tGr1yg2JzshTvuJR4SaOPeMzoHIM93KfZEyKjQ7W07EI0bBcLCoRHfpzOUQ3uJaen+/UsIdgz1IQq9m1NMuuqYTE9Eyz0mVhD8FOIQ9RCM/sZaSpiD9BxRVz1DUCZZTqkhSTC8VJgXasC3RV6MA0lPftiIudi3ZxLEpn/PCC/o3T6Y2bf7ewd0PDuIABEzg5L8Si+xeyAYch7PAxNmAfCibWZgP2UTZg/ywbcLz1rGMXVjde0Fglt8fLqOHeCS0wAkDD4tTAI4D8NpxOD8zvO/4aZQieP4/gYvNYyGocOzOrcVxlNcYZhMK0bVaP7XXvkt4Yw8JFKY4LANhOpzluqDnv2XkEICq8bOE8YjCPIJtHUA0D1XkE6TxCs/NIzVmPkPQiXQ/KloTsHe98WSjespPFV2YFA1ri6YtDPoHwqrU+WnVeL8O8wlwHePQHFs4MQsBGhM0sAnYPgGaw3OhkvttTUjPgdKYRnKnsx/1HHXQRYzqcPKY583BJW7RUKWAG3O9ifAFpqS5p0K7JedYHbbSqj/07w9zndEfOTwvDhwskMcgc8RoqiVtUPzxfXTUt9/tXKBUizqYzWD6DpOhZOxE7f1ktHiySndGQIt0YVuBt5narBB6fM9jaZ7GQVdJmAGtNNLyFEdZqWsX3FhGaBTbSEZVYl3/1+Kn/O5dVl2vX3FfDOKxsHAv5f+k4zsbKSseBlKxTBpsgsnHM42OlFXZ1DJ+FrTCP2BdPD/LIiUafGaAHbVnRqqtraRFToGNw0VK6CGMQza1uhLpZbNXRWR8CntclvE5QZTGnit4aCmHaW2xJJEvr5wuFopn5NYxnjHI1eCCyvq1VO9fSSr+EzjpKi+aB2aJ5ghbNnTBCp61V7K/bnK0i6JTOuaBc7qVvgKumBSssl09pDHYUoOLVsQppCBsr/VFaOdfMr5y3hTurnwJTyC51cnsWMkKcenie5G+bUy9PAhYM8r/g/BA3gyWl8C/c4jNNzT5QIQBbLEAP4ygu9dHAARy40WS1UQcoLTFpDDqLYHd46XF1l0MRKcVMKoxZRW72eZuMQDONVYUiX1XrDHOLMpTIIXnnoc5IJPse32WxDZoPrrnUv/fJO6+49r67R2sDI8mO0JKVvzl8p663Z0XXkpQ22b9mND/0pc+896F7rrx4/2UH9y617sWzbvQZSN8DH1Hh/vVdsdQiXshAcFekhL7FGKxiKVOERUuBCUuV8M1UDoO7/rcls52qeCMAiGMMEMeKjQq7Yhy3cmfpzDS3sijikSaM+qrzCG8b+lSmWKL+9vegvV28br4YGW5XoTN+sb1d7TsbNe7H51X9NIwnF/a1hbODbq1TmXKdLc2iACNANUt9lrFHZcrFMp/I0UfSyx6pYbJp7AIr5jkX5cxtJ5Pm8+ZuA/O3fwF3Lr/3ePM7bf7cuWN0zxnjfDbfwGJsvkH1DGTDpPF4/Spq8L0TXl+KFBZy+y4H07iA3/d7rTzO7BjxSd9b1DF6WmOkwCDMHttlo51sKkqjaWCnKkeAaCaw0A6NigiQ3iroWVycc3Iu8yW6m1nQjgVCJc/S3Mrpcv0ejDnO5bHiQ8fc0RozPgMhWFScsL+C1EoG8TByxBmE/SXC/hLpNhI9uL+62jnKWElOiA0r2zzWIqYqsyoAoofRfGyjQDSvZOnD60xBGtXkOhaf5+IHQk6f9vZ5e0C3cPafm5fT+JIqBa0qg5epbkW5HLL6Uin4W1JA4INnHcqNJHMlSF3FUpAeCKOtHs5InwaKKX0V6U116ENGtQhexOIPzUgiPQXmr2MSzJnytnXgiQdOifgXn/n8zAOd7Vys05r4FuZU+tUZP6I6lfZm4lsQ5wNs0qQwl3foGFfgv85n4MoG0UYfB+F/w0AJflv8F95iQ1IZf33IBYAIDoNZVwl1WKX00Laj9vbzAhLH+FXNR7LBEETYGfZC+A0bPg0RdyiYIY8MZLPwyvTweViDIRonJPE5VLQJLNJaAb+OsaeBxF14X/p0SFpDx4KpC1NpooM+GPIFnc2u8YYW1NAxFUyfhwH7a8rMeZLziujVOUX0OTV059waese91xWLvbni0bsvX9Hb39m393bHJ8Kp/olisDA4Hnztmrvt23ybJ//kqvtcO4M7Vj0wPkiyngPNN+J7Lzi/H3sSkYsXbIMfcPbdZ2Xjjfy+bLxRlY1X4QO03XXKEwzRXoLfh5QXTfVCYt4ebGZalJyXrD7+/+8cGePwlCcQVGeo2EK1dztHNPAL5/jn2Py06BzvOz5/jjF8KsRZ5hj/feeYWLCODVjHSKw1zfDvM010EwtnOqg2S51pstgtpVHn+zLlMyxwz59lxmj/42Wkg0QLGQILWVxMAj5RDmAcGEV67LeXBj4tthO/nzLTh/J0giXtwbNl+FwM3kNPltGnTOCjvN+xSBYtiS8UUPeCDqJFBfWL04rgPOMo5l+lHX1nZimOFhGhvzOWYtTURZmKP4rqeha24muPt/tYOvgS/zP6/IE7Fjx/gD58oP28gdnHl8h88UwPH+De5cMHkIdToM/KWPQxZmd69oDr4S589sADN8R77UtI87WqDZ89sGHFaLzA3wer8LfzHj6g6Tglqw8foPEhW4eX1U62y8+wEot2swVPLuhfox1rMTwHr5W8OtyMHdIUdiTgZQ5gvZk5mneymotq36LLm1yggmdZ6e+d3stGnxlE/pOzchOLZQze5jku8x7isiBZ0EoULMxTEIjF2bPh/dz96ul5AbSMXrjxSZ2uFv8Aeyy0VjctG1qpFPr0cZmUFMFGGyzUoyVINqEeOMHzDK6SLFBGXMVhYfBeEiSWN0JCXGSht0h1YvZSmhgwEiZqC6rtrgnw83OOLxpMF9MnyEu7ou//stW+pmkYkSaJc4LoWdv6Z8a7tza/K97wtV6d+G32jM8m/FhJn0W3u/U0by094kKf/6ApNrRs++iKlCjSQedkMdPH+J7+FG8NPW5AYyqLgz7pUX10NzJiY4KESt2Jo271thj4XSsf7iLropf/f61da2wc1RW+d3Z3Ztf7nH16vet9eLwPP3Ztz67fzgvsGAcbu3mUkJDgOKGxW4eEplCkklJoSnhWINpAS2kphbQRCO2ut7wqIVVAKQUBQlV+NOJHFYXi/qiqKqhVJda959yZzdox4LT9sfbMrD0z59zXuefxfc6ByoUBxwiNXUlb2Hg405sZr7ztEtvbRce5Ls7R+Inhj8JpHAGLvJ4Vi1ljGGJmZn2gsboR1utYedpiVlpWxGr3x7Qq4M+qXO2sxqATPLPF1KbqZayr1q4CR4TZulgwcyQyncc5ZOWjLZIAZ0ssDWBcWL0KbDsW4KcqmHn9KoDAgjltl0skgWE+G2fK5FmRn1m1ylOjanBv0qfvOTFEHx2xy69802EeHDQ7bz3rkIcrV00d23bFyMQjByYm98/8dD+devzVg3ue2OqBEp5RufJv11cXZg61ZZ6Y/e5jP/zO8cdOVveBBuA9aSAJ0g7xfK9GCu40a0NBt2uh3FpBpvBy0uY16LzgGY4JbUdcD3Dj2JgSkypsa1Pc7GXzNIbmYEZiG3SQXC6a/Fi/W5JgGWTqcQIpuhsSiZJeCBfJIbQilFrXjuZdrfKk61EhPeHWhHEhMXH3oaPDIzfuPlh5m2676urx6w7Mbx6fmz9+YnC2fyCfG6R7n59qUS8cvX9y6pavea+dzm8ZmJy875aZ2YPT++Zmm2zHRhE/+xPBZHiSZNge49QaGcAL+Q5Mq7scEvAejQS8aMyiAbXRgjzgHV25fA0XeKFFLqj/T0ZwQy7Qm5OUNRGDXzM+MXHTzrXwgxuePXZMW8ORo0U4j/orXg5LS/d/ydLSo7G0lIzZjn5dlUjV0slVCWwtxWaIr61Q5v/C2qLpcS3kLeu5HtfC4SL8XdOjQctRvJPUM1soQ37xhVmKbKcfy5WT3EAIqZht83kpiwsRp59ntAE8CWQwCOqCgtfSWiqOPwiWhCkMA7KoRDh8ddopu8vmOkuibc1JjquaEqtkPe5YJbNztQTIs6vVIyI/NBu3TuIn31gLQ3TB34F1dZ9LEl2vMVwsCHUuqKa/DJ5oynvISrroyizvDrW00YYnodkFztnBxg7IcM9lsHYELou1A2QyiTxd3y7/WqiTPT4/ysYRw76AxkOTawWbR+VBLlYtq4dwHnszJbaleSEgPEtSZDspCcCOgNDGFrPgsjNrNle0iIvYZ9MgiMZwUQyGmCkfE3VkiZIY0+n9ALiD2R8CpmMDO2gvcloo3Wwd6F1PNQ5WB+WY+XCClq2t58aI98hN/bE9benedXvCMv3J40IifmigRZ3qaNgRvn7inSHPo5ua27LR9sYbwpPDzZ1DfYFTWzaNJbndOC2k6Q8wttRWw4Nt5TzYSPTBEWSXM2JrHtBpLcU7rdf4wP1S7H7n2f0ypCDqGJkFg6rfz1h7PxHijUI/J7mGJpjmKtfUzO43I/TSR4T3iItcSQrODr5u4YgXKRbZYgSOE5JARoIBJ1fwgULGjB58KzqcvMCyO8ARJ9lWFEfvTC7b15vNbX56VPitg4qtsVirSK0TGzfAs18WrqSDwlukDri6OT6jk+MzOqv4jOhHhs8lyIwvJ0MNKTaghTnd2wZj+rjQRG82OJm97iNjiLkLVbFsE4jphMiLpyEiA2ysi2PugigBPYYnSGYDzlMe8K2ZdFhBfTqqKdo5PnxgZOTAcD4FDkD2BsKPtBQcNZROw0zDZCwsxegUezM76eb9GMjhJKiccXCodbauA7CiiWjAipINWdDYbh+Z3lhHzXHoTrBiCiM9ap/VGwrP3T22LtPTbRiWgDtFGKCPCx8wiXdgG0rAViHpHNwLbsnJZmgjs9GMaKQbkTiaq8LHfdm+aqvmNVVYgIXOqLfqan7qa5eXNA6sKLlibTHP+v4ixpgljQXeeLH3s5axrOzzgGInze899PDYHd96CXr9qzgXEPIavUAjnAMePLeWRfjUcMCvo2yqufDa7t2cM568bvj4C//e8PHru3bh36v0fvKh8AobAz2ENQsQfMjGNq3jF0XrIgCTerTuboUxZXDAfG526AzywNSKdBvaSqVOjPn20CFPKprqov/YMBuP9E9axfqGaKqPPa+TPe8sPm+IABdp3cXnCWegfLVgdwHZC0CKSsj6VRQkALlx4Spi0vlSwX2r1GAAdsIjk9F01zVX0dO9W+vE+lA02de5fi7G54740lbyDrmTP9f42c/1rv5cnac1sPK5cfZcd4I9d3zsof4pq+gPs8d2MKlZH2C6pb9BWeNkGrRbiOY0BReCqk4Tc1HHUEsCe+AAuxLmWldqtV6QkSswHICAblRvhSKR+1drh95VGsa/l65zJ6Mp9UM81htp40HWSFNWky8COtuAZ3XYZP3Ql1mb0ZeYHE4SA/4TY0fBmytbuBxQrh1HHdqsEKO72HZ6wK6RXW90lQP8eqCD4+WBboHcsRiw8aXVzfaKCFtiMWo8L9VWriq795JWZ/IwGVirj/1e7wATY/Q0CONdn+zPbpyLYvfzRmJwNgtlIKR5aSt9DvtCHOQxAayb1iFwWW1atS+yE9juFiNWyGMr1/Pr9R3YRtW+Uqy3YwYBoIaE4nqfLdoxQ/KS3nOJQM0oRWyFQNizvNA4TKBYZGBSO8N+ZiTy0rfpOeFddlTH2shLNultRC0afRL6LOrOlC0coNOP5K5QkyHaHE6c8CnT+oIo4RnMRwGfxBbNgEEx9AYkJdANrorRhx6a65JVVc72dLfLoQfHxui5fMaTvvfUqcpOg3F8/IGoJ5PPs/EmsXe6XXsnC75TkESIQr6ObxapvllYZWtfQckBiLAXwVkwIuQ6U/CpZQ/Hpg6o6K/zuGT3RptBMlvZKwsNoWjs4ns7nOibZHsZto8G2m73gtVWH0RRNlAmikGXR1Ik+IlCeUAogy7ZKPvs73Pm8872dldbPpfLt7kamIgPss9cPuNuoc9rsv7yxQceGDeITNzKrJvJS59CqSk5Sc7RFwWQuIq5LPE1XYKppk7HXJY45jKYKtblK3vTSYCu33Eb7btt+/ahwS9z38POpX8ZHiaPstb1sRHIbEIzxvIjuZyG51yEbAq8WgV4RgxLDdkZ5hVAEpX5mcxxE7QZpolj1uMb8ADkqoc7NSzoLJ2oHl2jH402ZTuuyGbjy34R7AeJpQvGvzFb1oIIlVGSIB0kB9kgEGooRcAoyOSKTcbFQpda8jAzlzuqXMbFstkWAe+JmR0GE3BY6MwVg0ZgjKKFvG7N+Lg14wBrhncYE5cvzr+L86TSEP8uhJlr5S7+XZcLMkrLbRxZGWqXHGDMuwHHk+0YfJDoHPcjIVeEA95Bgl/IXQwCR05Xkg3sdBbnYYBK9IeSsMkrumAfaCJ1Dj6Uaswnnl+KKKjVq25XTnUpgZpz1ZXY9djuXT++7obh0dHhUfrU5speSrVLI5s3/3U3HO6avo/+aebwkX0zNx/Z/8wzT396F8Ce/g6vHDlMzZUX6JZn9h2pOcN1UGHr/HuI8wzMRtxsNtmJDe1osJzRGisKRrR+dDaR56pMInCPJLvHB3iPuH4PYEoR8TZ4D1Gz6PAOgCGdnJ9/TsOPxvV4iVkfdFz4Gevdfr5zw016jZmiMC2dQuxXkAttqsP0+8IbwknWk9pJhTAbueRuSuXYKLBx9GOLJ97MWkBldmBJ9EfgGw70XQSOywJ1FYl5EbcL6Iwryxy4WMZtX9mM/pGSGR2hZkDPsCPYnh0iVmZOs2Dg/2FAVCOoCGFnpVb0f7e2s//wtsKh122BPEpIC2czl5Z6VIphoUoMuEoa1VICd2cJBQhquNsv0aoh+BG2Ir5gtnsbYgksbXLKC75osgUxOVjXC2mkjNwPimwi3WzHyabobiDjDADGrKRdl5QUOzr8l4gktTbdobRK0p+j0ZsHBo/EYkfDW6OTEWF8y5Z20/tiMCi+b2p/NSj+wdRgP/0rR4P4lhisl9786KM3xSC0+e2UCm/Q7RftSvMifGoaDNIFbhfGKN22De1QQs/T8+zvSZccl+G4EmJtGGUNeb2wyPpQF3lXw6cMcybSEGAwqqUAbNl9AcCrBnhF4Nv1IWSDz4Z4VOVWbY+E9PAFScVCEq9aUjDioSQh4qHUMsQr6HAtpFRw35RiwSr4YsxVzNgXSxlsi0xYo4KPKWCAODGvoORvRS9Zxl1ogJxyihBgxQDBEEqxtZNNDk63vIwSvjuvgftKKbGR5mpQrBU4qimEiKrOTZv2DW5MtmX3NZ/tzTi6l3LON1z548loOJnuS0EoZm8yYrxnvENpbAl/qf3oUKhytZbytbfyFCQT3htNphsj6TTTOej2IOr255zJEFAuoZaEekCzYNcYc4hhEEWFRm2WNp0mU1NjpFaN7Gd8NWWCR0RmmryU5dqnlX7XgwodNm6yQrZTE0Ry5XpkwcNQ2nJlBbiSMFSocLX5UFmooesHR6/wfCXhHKj8s8fVHL0hfeKEK6/r5nvjalfnp7t4fETYktjaduvQEKqGkP8AOYq0SwAAAHjaY2BkYGBgYmBwVLyeE89v85VBnvkFUIThHHPyFxj9P+q/CMs75sMMjAwcILUMDABVtgzRAAAAeNpjYGRgYL7yX4iBgZX9f9T/aJZ3DEARFPACAIvCBoR42m2ST0iUURTFz72PCGsic6wpM2ds/NQZo74RJEMylIxisoIZUxItZtHKamGLKCv6s4hqW7RrFW2ErF20iNkIURStWtSizVAwRCEjVESv816jiDjw47557373vnfOlST8TwYJ15LHuOSQ0s/o1gHsNRcQaAldeIKUTGOUBFJBl+nDlDQjLgfQwtgvZVtifjs5Q0KSJlvIbrKLHK7updnjJNnPGtdcHRflC5LmHrJ6x87reWzTK7zDG8Y8aUeDzrL2TzRJgbxHRG+jSePYaibZ4wP5wfysj236EHHtRo+OolaLqNdLtmyeQfUyoAXWP4Yd8gK3eOdfjGnzFa/4JpDjmmCfPtTIJyTZO9AI3zvEXm3YrkOolQz7p+yMplAnIWJmir3G0MhvAj2KTbqP+Y+wWV5Sr9OI6ghiKva3iVurUaxVY//Id+yUb6SCd4y9fP+w053a9JAOHWetHO/mzis+L2cm0CsP2LtInZxm7j/vK4ew0XtxFQnSyL232m9fSxlR70sF09w/KE95VkSHuYGBKg3UvNXrvQLmop31HuSrHlSh/uu8BwXEyBp6tH5R/2XwXnf92nmwFOdBFgm9jjqv9woYUD/nQeS/BwtIxs57DzLWkjndw5wF/ZfhdPFr58FS6AG9qvdeZPwc1Uho/5o59h1jPmfH+bc4K/SLvkSo5akqBfKc3CQzZJhMuBniLAEWnSQkzfIRnSQkLTzf4NAjuM+8kVWrETAnSVrx2J4wCZzzXpY4p2c5V5OI/wPgjM9rAAAAAAAAAAAAAAAAAABMAKoBIAHCAlYC9AMsA2gDpAPsBCoEZASEBLQEzAUOBU4FwgZMBpYHBgdsB6YIGAhyCK4JCgkcCTwJTgm4CnoKwAs+C6IL9gyODRINkg4aDloOtg8oD34P/hBwEMARMhGqEkQS0BMqE5gTzhRkFLYVEBVkFY4VpBXOFfIWChYsFqoXDhdiF9QYLBiIGWAZ4ho6GpwbEBtWHAAcfBzCHTwdqB4SHqIe/B9kH5ogGCBmIKghACFkIYAh5iJeIqQjJiO2JCYkriTUJZYl1CaCJwInHCdEKC4oUCiWKOIpUinoKgYq0CsQKzwrjivcLCgsQizoLbAuli8EL1IvoC/0MIYxCjGWMlYy/DOkNE40/jXYNig2eDbON0w3wDh0OM45KDmIOhY6ljqwOyI7njwWPJY9Nj2YPhQ+wD9IP9BAYEEmQd5ClENAQ9pEPkSiRQ5FnkXiRiRGbEbkR1JIEEhiSLRJDkmQShBKUkrCSzRLpkweTLhNAk18TfxONk6oTv5PuFBEUORRiFIgUoJS7lNSU3pTolPgVApUUlSEVNBU9FUMVSRVXFWYVdJWNlaeVwZXUFfKV/ZYVFkcWT5ZYFl6WjhaUFpcWwpblAAAAAEAAADoAFcABwAAAAAAAgABAAIAFgAAAQABHwAAAAB42sVUTW/TQBCdpE6BC+oBerZ6oUgBJQEkWk40qkQr9VKQIm7YsV1bTZzIdqjKgUgc+AWIn4TgX/Hm7TgfkCLBhUa7+zwzO/PmoysiO/JNGqJ/q3uTp8NbRA57cm+Bt3Heh7bh3YEilV3DDfG8j4ab0HwyvLWCPdjUuCV3vc+Gt6XpfTF8Sz54Xw3flsPWjuHvsts6NfxDOq13834aFFVc+EeTUeQP4jCZ5NVc9mUoD8WXvkxkKtdSSCYXkkoFWVcO5DnWI6ID6Ukb0iNYVFJiFRJLIGPITiSHn8fU9ykL6SmCr5jSM3kJvS9vEWeGM+BtH5FiohCxfVgX0OTwHeOuD0aqHcNTiV+GuzmkM+wRNepnhN9mVlPgCfcMsooRlvmV+KqgV3+lsRxaFRSPgSNYJ/Zdwi5ErAxWMRjUd/RUDm2yycm7IP/M+GS4N2NOGjHl+fQGzn3otTaV5bePXfvzBiymvNnFmtCfcskpS1gZl1PNYTVSnzdcHYq/8qa4MK/XrKn6mUJa0raOdsVcUvPlKlBnP8Tpevdi0ZX3nA6tUtu4BrynKGPkHFaVVds32Qg4oV1GhgF9+zYX9Sy4LmZkoLrEujeE75tr5eL/3pMHNik6mcp4zP5cLjgph0uyvSI/N/MRNSUjp9Qpw5Czol+/ctaZXk5cZh42ZbLe1/VpWe/rMtNDfO0htxNYvMY6l2P8P57Rwyugc8iOsS9zch28sBmObaI318Hx+tO7sIc15+ph7/BF0XP+Hzn9+zs24HtVV9e3XAbG5hS9HFHa4f4M1e/iHdW9B0kP8q48+QkdfANlAAB42m3PVWgVAABA0bNnzO5uZ/ez2xmb3d0dmzFzdsyYrSiCfikWgoqd2N2J3d2dv/rw2wv3/14B//gTo73/8TZkmIAkkkomuXAppJRKammklU56GWSUSWZZZJVNdjnklEtueeSVT34FFBShkMKKKKqY4kooqZTSyiirnKDyKqioksqqqKqa6mqoqZba6ohUVz31NRAlWkONNNZEU80010JLrbTWRlvtQv0ddNRJZ1101U13PfTUS299rDNLosOWh35mW2yBlTZab777Zlrmux8WWWGukx77ZpVNfvnpt7W2OO+srfrqZ4n+LhrgnAuuuuSyK94Z6IZrrttmkK+Wuu2mW2J88Mk8g8UaYpih4qw23EgjjDJavDHGGue98SaaYJIpJttvjWmmSjDdR58dcMdzL2y3w0uvHPTaGxvc9cwDDz3y1D1P7LTLXvucstsep81wwhybnXHEUYcs9CUs4Jjj4fFxsdHBYPAvObxxaAAAAHja28H4v3UDYy+D9waOgIiNjIx9kRvd2LQjFDcIRHpvEAkCMhoiZTewacdEMGxgVnDdwKztsoFVwXUTcyCTNpjDAuSw2kM5bCCZaVAOO5DDZgflcAA57FJQDieQwyEO4TBu4IIayw0U5eJl0t7I7FYG5PIouO5i4Kr/zwAX4QUq4HGBcSM3iGgDABesNkgAAAABUd2zdAAA') format('woff');
-}
-
-/* Charter license */
-/* (c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA. You are hereby granted permission under all Bitstream propriety rights to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts for any purpose and without restriction; provided, that this notice is left intact on all copies of such fonts and that Bitstream's trademark is acknowledged as shown below on all unmodified copies of the 4 Charter Type 1 fonts. BITSTREAM CHARTER is a registered trademark of Bitstream Inc. */
-
-
-
-@font-face {
-font-family: Fira;
-font-style: normal;
-font-weight: 300; /* "Light" */
-font-stretch: normal;
-    src: url(data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAGJQABMAAAAA6MQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABqAAAABwAAAAcafiXV0dERUYAAAHEAAAAHgAAACABGAAER1BPUwAAAeQAAA2GAABEdIU+i5xHU1VCAAAPbAAAAh8AAAb2Y6MJv09TLzIAABGMAAAAWAAAAGC8avkuY21hcAAAEeQAAAGTAAAB8kpEps1jdnQgAAATeAAAACIAAAAiBl4DqWZwZ20AABOcAAABsQAAAmVTtC+nZ2FzcAAAFVAAAAAIAAAACP//AANnbHlmAAAVWAAARBwAAIg0O8YyymhlYWQAAFl0AAAANAAAADYCKE83aGhlYQAAWagAAAAgAAAAJAe5AqRobXR4AABZyAAAAhEAAAOszmI4dWxvY2EAAFvcAAABzAAAAdiS47K+bWF4cAAAXagAAAAgAAAAIAIIAZNuYW1lAABdyAAAAgcAAAUoiVWuGnBvc3QAAF/QAAAB9QAAAu6b+3zWcHJlcAAAYcgAAACAAAAApENBdwR3ZWJmAABiSAAAAAYAAAAGVS1ThgAAAAEAAAAAzD2izwAAAADODu7cAAAAAM+sBat42mNgZGBg4ANiCQYQYGJgBMJXQMwC5jEAAA5YAR0AAHja1ZxbcFXVGce/E3JCCJBoeiD3kIRrTdUKomipCglIRKtC8ILTanHUzsgwDHWYsfXBFwQvD53OdIIQq7YWL1TMTBuBAEXtEclLHhofDjUx5rSdM2X2TOe87M6wp939f2uvc9lnry855+REp3vNb1/WfX3rW7fvEChERFX0PB2h8u7Nd/dS4+PP7ttNq57a98TTdNPuHz+zh7qpHHHIdakMj9CUX6uoYsPOTW20qmtDL9+38f2ee+/Gfdu99+Deu20r7lkpyh7f+9O9VP30E/v2UET5kLojhCqoWn2HEMKx59C68H/brsN3FYXhquAbpuV0G8IO0FFqpNfot3QDfQq3jj6Du4VC4R+pOq6mPaF3QidCF0OXQxfLyss6yn5SdqJsbE7jnDvKT5R/Hq4OVyMULhxBvIv4XsF+4RvDt+L7Mocq7lC+1V58db/MOXKK0EX6AVW6FjW6CWoGS91BWo7vlXjvBGvAWnAz/Na5b9IteN7qRul77jitx/v33X7ahOediLMF9IC73DhtxXM72AEecpO0E36PIN4P8XwKfgfw/gI4CA6BF8FL4GXwCsL7wGHwKjgCjoLXwK8R/jp4A7wJfoPyf4fnMfA2eAe8C94Dx8HvkeZ9cAJ8AAbAIDgJToHTYAicAefAJ6hfFHyK9wvgM+T/VzdGX4Bx8CX4J8IvgxBtRS9X0CLEW4zvOrSzwbWpCXFaXIcqKQKfRe5xhDpUj5BGfDchZjOeLagdp7UQmkBaC2kdhI6otHPpKsSpVfEt6sJzDEyASXA11SCXq/FWr9KlcraQs63StyG8HXSAXQjbj2c/OAti+L6kc7FRjo1ybNTERk1s3YIkcrCRg40cbJRvIwcbOdjIwUZdbNTFRl1smp+uaR3a7dWH68L1SARqXqPL9FIsUnKwc8pK5pSVST0vK6VXyxb3SqCMR1DGKGL2Q0JxxO7X/fBvtO8KankFtYxpqbHELOSSpFbUdgloQ9p20AGW43slpNkJ1oC1oCut8RY03oLGW9B2i+5HHtvAdrz34rkDzwfwfBB5PIznLqX5Fu3D937k/TP4PadGQgIjIYGRkMBISGAkJDASEhgJCYwEByPBwUhwMBIcjAQHI8GBbEYxGpxpNN+C5lvQfAuab0HzLWi+RR+i3JN4ngKnwRA4A84iz3N4/gnh58FH4GPwKcq5AP8Y6n8JjKH9E+Ar1G8ST3+f1Ol+ye2TasSKIlZU61lSxaxXIyaJfkj1Jvd/FCmjSBlFyihGGYeUow1RtCGKNoyivlHMrNW0nproZkrQfSqWpe7e2HFQlqNr4iA/B/k5yM9BnNWYhRdAE6/CCKjFCF5MdVRPDZiLm6iZWqiVllAbtVMHZuTbqYs20120nXrpQXqYHqVdtI/203PUT2/RSTpFp2mIztBZOkd/phhdojGaoK9okkKNjWoWX0Adc5+pbK1cN+8v83cv2L/wq+qhuu761oa9oc/VzGuCZ2MTzQI8a5vgmdzESqXXQToF1gisFeDVwgSvICZ4VTHBK40JXn1M8IpkglcpEzyOTfBqZmKLQI8Ar4QmeHU0sV1ghwCvrCZ4tTXBK7AJXpVN8EptgldvEy8IHBQ4JPCiwEsCLwu8oubQIH0ChwVeFTgicFTgNQHe1Zh4XeANgTcFeJdkgtcPE8cE3hZ4R+BdgfcEjgvwLs7E+wInBD4QGBAYFDgpcErgtMCQwBmBcwK8azURFeDdrYkLArwLNsE7YxNfCIwLfCnAO20TlwWuUXsRE7UCvGsw0aX3MLmMCUwITApUpPfdXTn76SfV3t4E7/dN8J7bRIPezefSqHZcQSRZ8JnCBJ8zTPDZw0S7QIfALrVrDsJnGRP9AmcF+Bxk4pLAk+rsYuIqgVqBRQKLBaSebFK9FqRNn6lyaRfoEOgS2C/QL3BWYExgQmBSYGPB457PqibksZQ00qR6IQiffU3M9ryycwodLUxCiwRaVOuClE7nzBIqnc6VRtI3FSFR86iXRjHbNkzMsg6VdSj7iQm2qZi4Wq1OQdj2YoLtMSbYRmOC7TYm6gTq1UgOIq+IlpFmgRbVO0HYhmRiiQDbmky0C3QIsJ3KBNuuTHQKrBFYK8C2MBPyudrMFoEega0CbIMzsU2AbXUm2H5ngm16JtjOZ4JtfybYHmhil9r1BGG7oQm2JZpg+6IJtjmaYDukiQMCLwgcFDgk8KLASwIvC7Cd1ESfwGGBVwWOCBwVYPusCbbZmvj/OYebeV/ghMAHAgMCgwJsyzbB9m0TpwROCwwJnBFgG7oJtqubYFu7ifMCHwl8LMC2exNszzcRU6eiIJcE+LcAExMC/JuBCf4dwUTp9lh1AtLea7b36b3q9xATtQLymTFpRGpxvbIYBJFOOI1qfxRE3rWazwf8u46JMYEJgUmBa9SvPiZqBeS+d4yMCUwITAqU0RyqgiOKUAuF6C24+VTW8Tn/XrRkS3uE7oLmkzvqjru2O+Im4WxgseRpGd4TroMvHgkJ7JuHKYy4cYaKvDh/3BN+P3V3VKij4bokvTB8c71sL15BpTnqPu7GXLa3+HzTZTeoZ9wdxr69RNfUNfVa46tlzUzLQvtYZp4M+c3zTWTH8iSKc8K4ewjtTQALdz61J6aWIWbsErZ/2tTcF+PKJWghzyVaL22qStUUYSPuiK9HW/V7Il16ldIdx1jGoCpjEHIb4hK190LEHwVxbjHyD7vH8YzCbyBTWnZPBiSVLIH2ODNIm1CjJhaspRpXqTGWyO4j+MTTIzMJqSRNfSmNP7+vOx6QSNzvw1qqx2XcfUaVGM9NHSzJK91fb57XCtO0/OYQXTvbN14dCutR5M1Ptg6xdCvVvJUl66RfQ6YrF9o8BBIgBs3kJ8+82qkYw3CjrNXeiEScGC2FZh6DHAego8NIY0Ei5zmuznOklLpYzKhW84yWBupqez3IGqDmKSc1M6XnKK+9EUjhOMJ53vb6vEbNcIngqPPplpWqr0qVDPZl2sdJ91INUg17Es3MG9ONRcQe0TMo592g1isn0yIt/1HVY5mcIlpr8pqjsnQjypJQ7+dRBsvRUlJMejM9wnk+TKTmIMSIYZ4fcftQwyFOrSQScQdSM7l/nPrWphGkycgrnD0DiBpSpdPmNfupGlnuYJaOpNox7s3f8IkpeaZqG/Pe9T2Z3Q96vFlTaWdOWCutz4nQ4Ov19Xo9rlIhreotko5RRau8flQhDfheL6/z06zauetqVREjzJrB6LZnZ32aSZ2ytSKviJuz3tdrHZIl7/XVDirZlVvLmazevmvpjGtmqRWhmKumNH04nazSZTlfn/YWW/Npx3IykMLxhdtTSsHrr/HipK7Wr5y9jaG+DYWNUV7P8pO6Yb92xb8rLVLsDYXrRmbvVWC6qH8FM8onEiirOM0dzaOeNTnaNDp9u4wxqgofKerM/7VeU4yupN5VxWdztSlsBlC7kLxkmnuaKuwsV7LKhwX/VhVW44sXTodE0usleWcP7D6T/pmQ5yzVSludlzP+sZLL/z+ZswLvoM26U6wuoB2x7LRfl/6j1Cv5j073l+6/SlKqd/qx6Ju6GkqwOxzOnhEy56yp9KfoPhryff/DHYQGDivNH/SvIN/8fJlXexK5EvNOzulT83hw/OoTWmLqWS0v+0o8e3dg3lmpslT/so1optLJsjHEZ7VXnMx+ZTp7WeH7FOzmz6XmWO+knHfKY1K/5DOfZHaysyS1eMYeoiwVyXz7l21EBeyEcm1EBc1/nk2tkPOwZyPKbmceO26nuPXHsxGl3vNZf9O2lT6pXlPbiIqbi2ayrupfhIZUa9lCdN7UByU6FUZodQGxW6cMiZR0tDxWgE6wDW1WZ7ysGeY4VsS+9K53ZLoV2aSh02mH+5jaeUcxX1iZ1VaYZ3N+Y8z6tSiZOaOmaqntiF8Efq+IZ1ai/FeB4mxCysLtZORinnf9s5b3W45hH5zMlWuprSXuwAwzWD2D0OC1Na3zcchkJKhValaMq/l/RD7v+mzLySl1M0SV9DdaoL+2qHsPdVE3IJqn4/C1RH3Po41wPcrdqUPL4DuHyvWZq5oqaC5y5dhVYD5yXwjf1F+QfkuXQqqExci3Dk/vL0q9i/+qlNTflXKZ3t+WsiVxGS3HfYVO342cpGsT2Kjfe7L8U36bjanmqH9r4LnUNU+32nM9oFq7WrwvQf0zrl79Zazn+GqCS7XDcz2qRd61FO9LVctrp9WLbrgNcF36vlHJbpOvHS2qL8epM+1zgzoHd6A/OnLyq9RcDxdWjmXfrn0p/WxKa3EqRSdKuVbJqRk9fl26HC5hOVimHCmI1qj7Crhlmu/QWtxZM1bi/l2dvkLnlEqXfc1V9fRbAFZk+WUszO0+V2mUZGXahcG12qn/4wL1z3bL0o6UFrbpNqRcWH17ztOSSviUT9uXFXA3wnXo+/VKdnPRjjJVa673ArgQRkwt/CLqf02og5uLXmpEeDPizkMNOzGeroP06iHn2+HbBfdtaMWddA00bSvadS/dBxlvo1704QP0EGS/kx6ldbSLHqfbaC/cHbQPbgPth9tIz8F10fNw3XSAfoG8fgV3P/XRAHL5A/2RdtOHdI720CcURYoL9Bk9SzGapJ9jFvk70lyGO/g/Q5IxBAAAeNqtlEtrU1EUhb+TVzVtbawxlqASpUqRUrQUqSLBalqkpg9iKFJKaUjVgaGRNKKCKIjOOnDgzAeCDsUf4Fz0Bzjyd3Qo1HXuPem1RUrShM3di3vPXmvvfe45GwPEec1vIrmpfJF0+UmtwvC92p37ZCul+hrzRBTD1paHhhDhpr4MEZtYnMwwdH2iaH3B+pm5vHxhbka+WLgpv1unXKrUSd+tlcpkqrXVNbLrDx+sk/Mi+uR7tzNGidHFAQ6qg256tGJjDnkeDjPIMFfEzFNkiVUq1HnKSzZ4wzs+88WLM+o+JozygU0zbV6Yb967MX98DJ11uOBww+FPH8NxhwWHHx1u+hiZdfjV4S8fozGHI34d0WX11aPOnvGIx/oW5igpjgltlf3CAcb0P+yb4YiiI67rPlmIJCcUc0rWu+eazw5v61ltOqZqdRJaSzHalGaD5zMsl5Z4hrSepJ6L3j4m2uyjsduGEae3dxU4RlIr57WfzXECXko4qtovt8AM2AOKHmNc5/xqi/xAI62zb/NnucbUPlQCpeM60X4tOW7o3u1PK9A7qfvdqGuaWQptKAaqGc2MoMZ5TYfbbeoG2qc1jf6td4FFljugHmQY1LTbWfsSK5puncnh5zGcc5OUJk7//29gpGlmv8ub8Cb7JLe8+W6joSqL81zW7cWndsXb+qKc0Z7DK95K7z2fuMB32Tg/ZJcUEddTlYbT/wutbmRzAHjaY2Bh/M2ow8DKwMLUxRTBwMDgDaEZ4xiMGG24OJi42ZhZGRiYGFgaGJjeOzAs+A1Uo8AABYwNDLy/mZgF/2syMLBIMXEAJSaDxJm4mdaC1XEDAGjQDER42mNgYGBmgGAZBkYGEHgD5DGC+SwMF4C0AYMCkCUAZPEy1DH0Mcxj+M8YzFjBdIzpjgKXgoiClIKcgpKCmoK+gpVCvMIaRSXVP7+Z/v8Hm8UL1AvSsYAxCKqDQUFAQUJBBqrDEq6DEaiD8f+3/0/+X/1/7P/R/8X//f8x/X374NSDow8OPTj4YN+D3Q82P1j1oO2B1f2jt96wvoC6liTAyMYA18bIBPU3igIGBhZWNnYOTi5uHl4+fgFBIWERUTFxCUkpaRlZOXkFRSVlFVU1dQ1NLW0dXT19A0MjYxNTM3MLSytrG1s7ewdHJ2cXVzd3D08vbx9fP/+AwKDgkNCw8IjIqOiY2Lj4hMQkhs6unr5psxcuW7p85YpVa9atXb9h08bNW7bt2L5z9679+w4cZChNz8h5UL2kOO95ZS5D91yGMgaGrCqw6/LrGVbvbUkrBLELGh6mtnbMOnrsxs27927d3sNw5DjDs8dPXr5iqLlzn6G9v21C76TJUybOmMkwff6CeQwnTpYANdUCMQBT6pGUAAAAAgsCrQAyACgALQA2AFQAOQA5AD4AVgA0ADsALwAhAnkAAHjaXVG7TltBEN0NDwOBxNggOdoUs5mQxnuhBQnE1Y1iZDuF5QhpN3KRi3EBH0CBRA3arxmgoaRImwYhF0h8Qj4hEjNriKI0Ozuzc86ZM0vKkap36WvPU+ckkMLdBs02/U5ItbMA96Tr642MtIMHWmxm9Mp1+/4LBpvRlDtqAOU9bykPGU07gVq0p/7R/AqG+/wf8zsYtDTT9NQ6CekhBOabcUuD7xnNussP+oLV4WIwMKSYpuIuP6ZS/rc052rLsLWR0byDMxH5yTRAU2ttBJr+1CHV83EUS5DLprE2mJiy/iQTwYXJdFVTtcz42sFdsrPoYIMqzYEH2MNWeQweDg8mFNK3JMosDRH2YqvECBGTHAo55dzJ/qRA+UgSxrxJSjvjhrUGxpHXwKA2T7P/PJtNbW8dwvhZHMF3vxlLOvjIhtoYEWI7YimACURCRlX5hhrPvSwG5FL7z0CUgOXxj3+dCLTu2EQ8l7V1DjFWCHp+29zyy4q7VrnOi0J3b6pqqNIpzftezr7HA54eC8NBY8Gbz/v+SoH6PCyuNGgOBEN6N3r/orXqiKu8Fz6yJ9O/sVoAAAAAAAAB//8AAnja3b0JYBvndSA83wyAwQ0MboAESAIgwBskQBCEKF46qJMSJeo+LZmyJFv3YcuO78T3lcSWzxzONnactEpnQFpxvG7i2OmmcVLXOao0TdI4bXYdxUlzWdt1YkL73vfNgABEKXKzf7f/2iIwHIAz773vfe9+bziea+A40sI/yQmcyHUohEvNLYg6xy/TikH/w7kFgYdDThHwtB5PF0SD8725BYLnM1KDlMxIsQZi+tnXvsY/OX1VA7+B43huy/lz3Ev8KbiihRvlCiLHtU4JIufTtRZMPNdKZGtKJmem9BbOq2tV3yaNemJsVSzGs4qN4LvkmhQMIh/35znFJEgu2Zjv7Orp7kn7PIZoUspIW0JtoVCbJe9sqgm1hF4nPy/64N4TpEC64N6Iz1KuAGdaZV0Gb2/UtcqGNJGNKVk4M8UbuTY4wTsVznxW5lJ4JJLWKQM7b3AqOjivSykm0sp1drkz3lgOfibmJm+cm+RP/eEPf+A4xLUJXoxwvxqujqziCiHAteD1BTOZTEGEexeMFiscT3EkJNpaJ3mpNhz3ZxROf3bS4w/UxP3pKb2OfiQ4I3X4kR4+MpjMNviIyPUpOXRGCRrPykEKnmI0ni2IRnPr5JCoM7XKRqfig7NeOOv14VmvG856nYoFzlqBlg2kVe4JvTh48N9u57yt5hcHr/y3JjyQQ85JPiS64b701YCvcJNJU9AIBz7npNlnceOlJm1eK3zBSV8l+urBV/yOn34H/ipA/wquWaNdp1a7Thi/MxnRvlmH54UhJy8gkk4JqVAbjtR1VP0nD4WA7LlsJheDn4xIf7wx+hPLwc8ggY+a1tev3hDIBp6Dn1Vlx33P1T93uuNXHX8B/8Hbafiv41ewXoTLnr+a/F4Y5RLco1whCqslN2YUQX+2EBWQftG4qbXgQKZxZRS/cLbg8ONph9MEbJtMydYzSgj4IuRUHEDZeHrKZeQGgF+iadnlVAxA9XrzWaUJ3kNW4FmSlx2SbM7LLuBmkx/WPi8bJDmSl+tdisebB972A28/zxGrx1sPn3Z2DRJfJt2T7U4kO0i2uwco4PX5xUQsavB6fP4I8RhEbyybyMaWH1yxZdm2qzbvXNW5azS28IrhlfO2XrVr75auW0eaRpaPDA6F69cvWLjR8Pjj+qHk3Dm9ud5w/aZP7xUfekDH6bm9538u1PBfgl0icV4uzCW5R7hCGOihNAAxBKCA4tSfnUoEw4KtVUnAoUWkhxb9WSI34QZGZkQOxP2qh0O9U/HDYQQOI04lBoc1wIHN8G6D3fw87maXF3BUYhH41R0I1oY9dHsnGmCz+0I1fvzQaYFfOJ2eUGq4tA3vAaoAUWJRN/GT+AVn9666e9Wqu4PtnVvhXx15va2YJvryc+S1Rzesf3TDf+kcua5zZPoE/2JoemRn2SkOJMbR8+f4b/MvwF6OcSluN1fw4W4OIlHqgBVQdintiH5nSubOKGFghLBTjtefkRQDIG1IKXEjnlJa1N3XBe8tcUDWJATronaKbHud5DrNGSwefzRJUczBItOlziBOor8n54fXWNIQiyZ6EMFc0iDA0g8Qiqnh6NDInK7Ny0e3DI99pS3aG53z5PieLTdvPjh35fCVo28M+5t6F2eHUpm+zwxs6ehZnh5aO35kXfcLIzd5r990/xXX7Lj70KKtf9NCSONAd/tQe2u+j6P7AuQm9zSVmz1Maqoik4AMRGQJIEucUwITjwKsvyY5FX1JQk5Q0Uivlzv/IaITejkr5+aIbKP8IgJJ7PTLPU7A0k6Qo8VEbt14fPHSpYvj418jHWf2B3Z99567/35XYD+9zjBcx15+HeGMYi5dhxElmYsQp0EcZhdZt258Ytff333Pd+ESZ4rfPsOu00g+SB7m3+TsHOfO+ZMZMecX/WJSTOYapY8ae40flR67sn3duvad/Ei29+Mf780231B/++31N1DacA+Sb5JzoM1Wc6gqxIxCBOD3dIEjKB04MwgNwuEhEUxMv5nPyHxaMQE/6NIFkxk/M4nwNbMJD82cqRX3DdItm4EtDsSDXT3xeO/jj/eSpsyTT8I/CvfC83u5l7hxwL8F7z1lEDkTrgqlxJSJ6k4kBtWRCrGCSAGy5BKMn7weB1nY7q/x+YPOgcc+aqv11IS87tgdbM3nkQhZQFbDmkfx2ogU/uCSKxzoQsGCHKCtb7bBO4/wJNLdjX9LdTzAJXLZSg1fdkx1bbWiVxWqpsmZFmc6HK974vxJ8mEhDjDN5yibpVQOnOJL0IBGkxMhAmZJx9c5hRM6vk4UwuMxTzq+Dp/yBNQHQUK4/cKJt7re2i580PreTaivh8+fI7+BPS5yDrQPEFrFIqgSz4HIOymvmoC3TapsA4kuoRQzoU3Ciwa6jx0op4hOz9FNDAyd9jkNUd7pS/c4E9Hhg98+eOiN7tFPjI5+4s/JhuefLz53mkwXXzt5kvQ8gniOwcuvYL+ZuXlcwYBQiMBSQhpMK7SQLCnZeEYRQK8LVNsLeuAdI1VRRgPwjhXgEYxUw+Da5DJSxtuQzUji2Pc7Hy3ecep5vv3W6bu6u/n8XrbWw/DyJpVty7mCXcOaR6wDwtnJGjtvhNvWpmTvGUS44NVTc8IO9wrDgikWO9zMkZdrJEUPeksOuGQO8HYzLrMLYoPYkB3QMRElDm+4Ye2ButT28WVkrVg8sH78yqbw0v7saCO/9MCO8caxZfs3LOtOb9xwZN7S2JzFbR0MxjSszc8Axji3nulmRQAYfQijJJydMpuiPlBAZpTAjSnZcEapg0Wyo/gNwhIlEEzcBbAr6/IAollSamrhHc64PUE4oynX7kQryTElG4uKSYaC6I2APEKhm04u2LV869bRmBjo3z46tG60Ye2Rjftv7l9z21X9B8YbRlc/uCS1ZDi3aH58bMfI9a28af2yTYe7AP4eQOLXAL+du5or2FB3IH2nOJ2Nt4GtBmYfLLE5XdBRUaEzoKhwpGTbGRAlqC9kMV2wWfEzG8gH2epEa3QlWqOpgtWA560gaRQnIqrj6OKjiQQ8DtaRKkJ6vtv1N2+L6Y0b86fayT95inNfeSVz6hSj7yJK37/ggtyNXCGg0deqcj6YMgEr0NcF+t/oopxmQQhDKdlyRnECKzoteNZpA9iczNjxAt1r4B2VNpo5BmlSMLoCaOZ4XbIdtomRLYgXF8Qlyc6yRQDaxyRgGy9bACD9omTf1uWbVi0YzLeT7cbim9mF6w/ctOv6xQ3zJ55dXUeWpN8KH90+cQfu4yWAy7tAaz/Irmu4ggexqQFsdIiNCbCxN3h0gI0dt3SMqrAAUNialgNOJQIgSwB6HM2VAOxjUWdHU0SWJNkAQDfUINASCNO8YkLGF/OyDj8Chu8eIJk0M8jEEuAdBFSQxlFLcteuWjO3Nj20YY9uwYE1B45vXb6nZQ6/dnTxitGhK0nT/sLhVHPy2Tt37r9q/92b7lh+9M6r14+vhvVZATi9DTLBADgBkwD/oDBAriGymFKMuO4E113IM3lMkmQF+XjxW73gwt2QSU1f5+aPgOTsgusUgTZuLgL+CVBHQuqgNWvE6yVxAzVTknhgA3mccj3uIWrCpZR6I55SQkAaO3xKrRtUuGjTxOvBdhFhSf1hKxWCST8ar3qzPRwt2TKoeuiGYqRJ5DyaQWtwgb5nNOpatejE8U8fv+ljN+/Z94H+bcuXbVt77N7w4h2HR4eGnx+4Ityzb8WG8dV7h4ePrLvmmrXDo8sHh4Zau0n00EBscF1uPvO9+s7/mvwS8PRwddwGjonwMGwxUwqFhOxKoWijThSgCj4SOkZotofSaK+hb6R4Oca4DmnSZBdcFKkwcoSBczooSm5VkRrE5ICQi5UwApsNWKDv5k27j576a/vyPZvTer7/2tWH+8aH9gzzq5aNbCD/OHHDJ2564ZVMh7dj6YFlO47vWLF+94GbtnElH5l8n+qhfIUGBZEAtjbTn1QXyca0qjuBfTUtKlVoUb5Cm4bKdCr5lKpa4Z7UloB7WoFinZzsSU051ft40ZqQbWnVoJClNPUrL2pTaPcr2RYuekvNwvDV38G3a/dF++kJcob3Al9LXIEnqN9UdkY2bvTbiDhBNvuK3yA9fjKQfqbjww92IrwT3BtgdxWoLx/SLBQ0TvS4rEbNN8/BTmiEnwmyp/g42fNGd/fnmY2yiXuIfBPMBnpfofK+uXaS03v1m0hP8Rs+srn4zJcf/HDHM+lnNBvh88BXQa4BJXkDrk2YWTdUYfrx9lEU3Ci1J722GnvrVJ26Qk7Fo9oM6AFZbcBLteH6BpQudZLC+0EOelyKyUV9vzD6OnprkHGapkvDJJbtHhCYetI8oOGxo2ObEj3ZRE882x0f6l47vIDSnN+8dVVf61Bz02Dr/GVdi1oaM9Hm7qXT39HID/isPZ8RPgP4dHH93JMcE5ExoGQqpbQIdJ9kYbtYcaeH4aAP9g2KiAG6b5Kwb5JOxQvIpOEw7VR6mWcn1ziVemQS2EqD8N6bBlmgC8RaUriN0FBwOvLo6Basbe15RNfaAputLa/0ZUGMmDintz6Je0wOSHKICg8UrRGeiY0k3WqU5fySR5Ot1GeAzefHDxupZMlJKIvX7v/2Xduf2JG5ciwzJOoa9yzbefvaRQvX5Oaf/tiJ01u/I+++wrn34N+cI/UL8qm51mTH/C2/ven1Dwzuu2/FQ4/1JjccvvK6GxqKvz147PZHvnLgC4cmfxBLNf7qa6vW9NaBwN0NNDQDIf1qTEsGDwmls6ATMc6DQlrmM6isCeh5U0YxUO+A+gFAQRHEqOhUdGiymWl4C0Myc9/9xYM0EsM5ZfKyHb4hW15+8VWRnbXLOqdsflkvC06Zf1k2Oyf1Zp27Fb41aRAxoGLEVzxvwvMCp5gtHR3kC4TXG4wmPC4Po2TcGXcs2SDmMkLM/JNlPxnoK/5L37Lpm3j+1PT4F7/4NnmAQ//3AOBYCzjaQD7Uov+LWKIGZXqoFrSq14M4Kl7cAWGKnR3lalq2O6mNbAZcg8hIOsAU1WwQ1KciGnD5PXYma73gLovAGbUuWQfLDqZresb8SqJD30qydMFbyYGnf33t0Jr7rz18y+lPPnrfgiXPHOVPPXdjDW9etfLK7ekHP9I1v/96KmNGwHe3A497uQxXcGtwU5VgRGB9FFgLQOVHNWoEWKb0nMEpzQj5UpRF46+Rx4/sXRqfu3LLseNb1w81LDly4iRZ/9wX+5szjzz56OO55nlfZPsL6ZajdKvh5lRTrQbvXlsilZ3JByMAQu3qGkofY14lRESA/Y9EGOCz3R0CEODOnvXr5zQm+teNd67ekFm1rDnSvmi4ZZw/5Whb/IFnb16WktLB/g9sXLJvbtwMdABYyBsAi4VGPzlmDDFIdLB+esqjTIAy7tRcVGqTmsDig1fepLqrqo+aoWYaGJhSg/cA2SQWf/a73xFw9dPn08WfpSn98b6vwn1N3JC6O2a9p3mWe87czTJzNwnvdgC9h1/+67/CnYrn0sVX1HVuhXUOcMdYfEaxla3zlEvyYZDKhfcKaksuW6jeVzxgwzo8NJ7ngruhiYNeHPhVPjRPPcCXemRUCYS2YvEwi5XLy0ZXQW8wUweijFGcyCdZWCuJ8sqzx48sj/dv2XbrkSvXzbtf/Nsrj9z4CFn/mRcXNPY8WnzjsTjA/2LvaY1WfIKu0SCjlSyqUkSfmRLMlFrCzApZgFp8GpEA1QV0o3EUbWEwCJ+RYGGkA31kXl9f8Uv8qeLfk9bpcTJWlDntftxnaWynoWxttMgOOJn0R1+64oE+lAvsb/XnT4DOxnUNMM1B11A4Qy0oSykIA38FFpJ+KN03sn5jcHQhv3n6M9u3NMzsjwZ6fxMXUzE2ljDWmEIoXRBhcJOMicQO9OlIzeLiT0n7MgSJHCL9xf9WfEDlt6/BNfUaTopgOKviZShdT5yhkgj0iRjhKvf0UHkBMP01/L2b+41KE9Ho1qS5ojdkAC4PvY4byO+mtKeE96oR9b/7g6dcfLudsvPlF/v1vyjgWb2s7wAR/rJi1b8r215+8eXl7/6IiXUjink9SnsDnF70eyuctsDaTposRnfri4Ov/P44PeN2TrrcTndrAV7r762/N2YAQZEvwLdmfuNO60wWq83pUoU9GTITnd5QcY7pAMIcB0VwUEHjZv/HBNCyAvxvEIWR4dV/rntufF4+5hT5z88p8EZHHRDrl7wbyL7548enf8rXHv5U8RmNf9NAOwe3Wl1Nk7qaYobarEA1B1DNwZxENBBQNzgQAgtYk+AmKjzsJ9kEEOlwxzHgLKoUJJkEMlSMxHxe6cAKsoA39q4s/hXmWaYfuXYHOTk9zl+z83hxH/AWyoNdIA/MoLNGuIKxQvK7cRN5y8WAU7XNfKrTCt8zUtvEjXKY06t7PD3ju1DDI2oYOfk/Hzl5w42PDBx+5dChVw6Ttc/+1YvPPfPSC8+dfPyJk48+8aTG5xLdKxJGdWakIEYvjGxfU2XkKklBcxqjTHYVKjdqBMkMalKv6gOAoyEWJJo2/NjtdxT/cOWebROv7uZP7bz6TPEc6V+8+SlKhz/jPwp0cIKlPKZGeDwaHYJ40xp6U3B7ZYlljfCOtfDuk0AXAh3sInV/PJpGkoNSJUVEP4g+dHuq6PI0+eCSZM8tV1RR59xSfjDTGT89QyKVRp1U9rm5zZXSD5drymylZDIjxJ6S+LOmNRmOdoVXFdyKCewKdMyNaFwi2Qx52S2VWxXA45R8WYz5HPjcv516fdFXb7y2sGHbEf7Ui4/Eil8l3cVvkl0PLh4Cvo6B3f9boGE9t4Ur1GnxEcwGISmJ3EDzP36goJ9xdi0AE4V3v5rrMUjPC2aHJ1SHVm2tS5Gole9RMzySq3a2DI+mT2h2h7JdLLbq4Mrty7fv23J0y/F18ZHt81aPbNuz55b99y1uXrJi4cBQOLp6ydLNS5L9fVfPCddvWLPpAJXVHnj5KbVR57CYYil+IAss8Wk4g24+ajNQgnpQvAUDjfMZiEkLzLqzDWIMFIqHvCF+tY+/vrt7+i6e2VgTsNea4Pp2LscVrEgfvWpb0I3v0MQuGK2ljY8bzoDpWys6kTnUE/VMWwAbTfSRFX3X7tt//B/Jd4qdzz9P3ii277v+BN7Loe4lkbuWeceyIUPzEgUQcRmUzsayvAQ1rpGfTUw6v/LTX/xek84iSGeCVvSL/bXsLDWuBZDCepTCYDvzAgjPSV4wiDM2M5ORQswx9BX+KwM/noeyh98HapGAX8gJApV//40rOJDOZosddQfNmwB8RlPcX5KExEghNM5IQoTwK8t/165B6ChBONDy668z/aED/SG8rNjs7+pl+8svfuWff/04/boFzltfBpLCeT38wed++15JsYiAkgndBoF7HpGx2jS9YOUFUAyiGTSD3XFhmtWtaYSMQPVBsO8W/vHhJ/nbek8ufZR/dDHg/jC/n/6M8zunP4F2AawPT23exIwOQO8Y1onI9hRuViAsynUdk+tugd0Bt6Sg//6XRp7iPzXvKz8aeZF/ger1XxAP6nayuPiCen2OytI0k+paKp+aC0aWTLJQnYyqg8eNxmFAnM+X1g64WD//v/IvDf4YDJriJ8jO4p7i28RDeTkGL9+i1+9Q7QdRix4KzFClxogisjgrGLJUvAAeWdKAoTfYJWR/8QVyT/ERskvs4pdkuqZf6KbX3nT+Ke68UENzIzRBpqdRC6I/q3LtlGjhbFh9kMbtqP0mpNUt6KfGb8a76ZnDh3cJt7a99w9t3PvNjRCWGyGYGxFYbkSozI24c27xRNdbXULA+t5NVuZDPcW9TeEe4DBSwgHcQkrRqXCLZwDEKQMD1uBkjA0yxakhIGoRGT8o7yz8jBw+/MwzeaGp7b1b8frtvIP8QBjiDNQKJLCcQmaKiJyoa60KcKL6qyHotIrtX+788tBjj8GfdhX/7t138TpN5+8jb57/MtDBj3RAAceCpDotGelv8DY0kReKi4e74fsRfi/3Dv8OfL8ev4+3dJQym0g780yWK+cXI/WnPfzL3XujyILtoBO+x/vAs4tzN3M0GSy7MzQfTBPDLt3ZgpWo3gfsHIygC2qGAjY/aAi51knLMMBwB6MI0xRKLW4LE1pADVLBaMXchOxwKT4/crEQhA8dGCcySorJDu9WdJtpcLUP050sZREmmDztIMnsTEgyG4u233DNpr4PLXOuWfX5QMiWaBGzh5at6+/LXdG5/s8/umpt90BfuL3hM9PNcWOToamFbFy3tCe//U7VTgf5LvBvgXz3a7q5YOGY/VLQI5LU7w+UDDw+PWVnGQow9dyqWxtE7Yyuvg2VsaK3IFJeCf0sm5BnJl5OKoXOk2KOJvFjUfFAfmDntm37tm3t1Ym51Y/eu36Af1MsfmfLA7fd9OjqRbdt+smPrlZzwufIS7AmVb4++VN8/eHrr9o8HMktWrph/bJF+dr5W686ToQbH+tJth07sP9QR1PuI4xGeO/vUxoFua0cuLBAI6oKXRoINDoYYjQyUyMYXQY9ddvA7p8yMYqZUjRz4nWgEWq2UiPU78K8g77c1ZT8EisFYCtMY13DB7Zs7c2nxf4d267sX7pgY1/3usVjCO1SUiNO16/c9NAt1xzeRbiNx2Zg/ieglwQ+3H6u4CzlPBFcH9qmLid6zUY985rV0g5XGqs73Ky6g3rLblqVxVucaN/opYJos1O4jWhJc/QXdJn1ednHklM9quHYgNkRSmihgcbNh4+8spcvPq3fvGisv2bhrqv7SDO/ZGTe6jt//+g9J1yeiV3Z5CBJ7tgzwTF9Sz4ENPdyC1imp2BBOW1A4wOliIMWVMlSmi69h2be0WuzpxkDWAhwo4lW3hjzLOM+wwNhkqH2TnDH0kWDc9xd6a6We8UP5skPUxv7R2rb/M1t61LFOPkh0DF2PkN+yedBY+S5vwRIkHy9+rMFHwLRRgUl6o1GsLciKSWN1JyTkqUzSicAw2FUDEVmp1OO4bENjm0pJUZPKVkWVJ001GSNrUoz8G4fnInZWNY1Kw2ZTWadJxJMtKV7qZlu1tHEWjPmqCKNIDJsMaB+WlIc9fDeC8ZnDYtp+IPITf6cWivTSjCqqgbzcUnUbYiR1T6iOT4uLWkD1mj3snWfntM9tmAkO7Z7/ckxKbV5fPe6xrjDt271ynXX7d11aGzRwODCefMGB0h3x1XN7fm2rmhqx+hErMfZPLHyCpslau9d0btsdJBPnVg4H76qxYt+CGta8pTQfqAyxj7jIUks8gH+ilm1npAbzRLVEJxi13JhJYEC60iD5tKB/NDVS+bl27vXLUQZ8q1tYyuL95DdC/qOFO+ne2ITvMr839N4ruo3Fky4jqCHBPGsWqMI0uss/kxaaHUiLXhKVRYp8uA844LM1CoJYN5uCiQCgYQpzz8RDwTigelbeMv0Objv+T+c76b3Rf9nPlfQ4S0tKdkNBpPIXB4WWwG1OhkwSPZWxWahfCJZmOODxvSk3eFys5uKavDFzpcyBfrBVN7Z1tqyhMLwdN2CleTdoim7KB32CrsoOMwPI/8C9MeYTP1MTEZP1AhPVUAmJ7lzGfCmDuQN3xv5wTuLgKjTQRL55dvFNznNN+D+ANezgJ4smFXfQItgCWrACkx0tZAzB1f0qCJhIt/scjtr4hvW8feK04fTYrOjFLfifwdyq5a7UrXRrB6M0ACMFFAMtYNrSzc+C0bXslgWqlwvC/hhLtOmlmNhPNrDsXSuTQKJwClBGngQ1cCDH6UC/MzwUYmfunTzd17jWXDlHfm2jtER+sJbNk5MTHwS+Gr/4JxDxXvVtxLswN8ocxeXxUg0yKuYnMJ8GVxOASzn8i7dvH3A5h2ZtRQayuT7h/IUCib3/wAwiMBrFbUuhOl0ym4o7M20jk+LQiDl7BX1txKrySN6Vuui8fmMjDAMn3j92HWv944vH10zvmx07V3vPfyR9x4hzv1Hjx7cf+QItS0yYFv4wF/wo94smRUzJAHbAoxlzbywMfmNhLFV2hZujM6aaaDWwlEzQ7UurMy68GtkwgJB4FGiWRdduuFd27bseak3uLTlo3dvHPhb/h/W7XjgtptPjhbfJSPNXcy8oHTLgI73UR2/h5tR7waEVdPxIAiq1Dz6np60WhU5U7pB1bwJ1bxeYGreaqT6aDZ1n8tISWk2dS+m81TdL5uP6n7RKqruB6ebjMRTUvfHVb7bR2Hv1yJQCDWCrlgMZzUv3Q5uB08hpB66nac8plJUY7ZSpQNymsG/OFfrtXiDW1O85ei8uYa84YniS5TXI8BnH4d7NnA7uEJ9KW5CtLhJlMVNjKW4SVjNjlbFTWqwAlYOl8dNpjhiddGyWYckSxcPnnhnoieR+gXr+5f2jq9YMTG2eTjUtzg3nF+0bvzI6sPZZC7T0ZnyeRfO6V/a1pJoT7R0uHyLh5aMsj0bBDz28A+BnTGo1kxYNRNDz0wMsdzEYFkMZmJYJaaoOUm2qyZGzouGxYyFmQUTI3+P4YOJ5sYWf1f/4DD5cdtN4ofais92dQSaGpbMJ9sAhr0Aw7fAJXFyaxjn0QDDjK1jAgdYKg+0YE7AlqZRMotzysq4zppSXLhlBAoVOFUGulHUAAzlrAyzK/fm21NrRvIgSK6672FyovjQQO4QuXb63MYJRhO4O/lrgEfEOLtI/XCi+uFqAl7hxEq3O+YY+CT/1NwX5vOWYgs5g3qP2nD8n8F1LoyZkMuPmXzqN89dGDPp/+dffX72mMn5X8dnjZms+81t/1/ETPbzNw1fzx/I37ryGH/tKCCfIP9YTJLvT58jf1fE+jBQi+TLQIPKmAm5VMwkmfFnqOJNxkTzC08vvIm/Zf6nXlh4UniE+N95/fXfFt/6zW/YOoHMehWubefWMt9awTCZWgpDd72OFvbhdkda9vt/8XZZLIyFwsD5NADq9JVlDThz5draiZgcILmYY/BT/Ml+ObJ9i3HZEr8HkI2RH03/bssOe8q+ZBHKBADqToCnKr5C3kd8JUIai78jY8UfkqjYRj7f1VZc3UVxbT//FNEJ9VwY5A2oC8WvP6sVhwC+1IuJlOxHUKs1zPv20EBywVODEU9PANsn0kod5WA/kNyN9jKRFKfEMhN6GxXL2XRPPwFB40VXAYvvfeh5w68JON3eFB9Z2JkMN48kOxeOkAWZRNtbg11ttc0/a8lYBGntz5tr27oGf76S7aVnzj/FfU9oAJsrzGnRB4FuWPVNi17A5nwmvUu4870bVH/3KRLQ8A2zuIw/hZ4bZRoVX+GMbE4rIeq4FYQQrRoNA5L2NLYroNgFCczw9VMWCwGePokm52U7qFQX1Z4U3Vy2g8BbIpZNa+gi8rHhzuRIcxhxjTctH1mYr23++VpJsGRafkYRfastkVn580Hk9U0kQM6QEyDHMhxCKaDGTE8aBLuRGiGyM42CDMUUmDhYPsjlge+oYgSqo+opSU5QQJtcA7G63VJnbSKxPHI1vJPOaKK9LbSwvY3pbBrPE64DfnNeJKKn3ewSHEdy/pxfjJUH9orP11x7bei2iBbgEzZGli2L7KT3ZDx+7sJ7kvd/z3JmL36L3VNjev57kbVrI/vUurE+tW7MAjsdvJVSrfVsTVVmdFsw4jBAIw5TZno0OWAygmNhYcUoitlUZuuVuTGw4dUeK3OHmZxsCdU01Uy/TN4odsL6bjt/Nfku/xxXgxEFGhXzZahBF5SQ84KwvaipBKKN2Zy0dlTQmVpL1RBmWg0hwOYMpNFcQhh9aSyLoE6OYpGojYfZKSNncnu06E1lSwxlEmyJ6SDb9m7tXN4d6V6ydM36xcCc3cu7tu4hwrWPGB9+2NiebDt6cN/hVHO78YH7xYdwX10FL7/nX+DqwGpiqxfW6mExYycaOKutVfZnFFGPNS60klCH5Xi0I8uTLgR1FFc/4KoL0pperOvHusIgeOdKbRgRCKtrL4GaVOwsAZsdgO0Vq45DeGNYZuhtEK9K1g0P71i5dTjZPT8779VXayIkJ6b96dbPpz68fOOSulxf/sOpT3b3eIRu5IkMt5tM8/O4EBfljnDUjVWiehayK9hwEUBaRPSsEFagXhJ6SFi85TSyKthaWumnw3otaVIEKw9NLifASy2xCMpHbxA+jUqTxK6jBV4gIkULK6pOdOeSOeo8ASvTRKGYpKE9F+YJuxPRzHgysTo+3jE8t2t146pk0+rG8c65Q6nx4QU3LFhww33j6Xu7xuPj0ejq2Or0wpHMWHxVfcM4Sd2+fPnty5nsjAOiFv4UeA+HVPtBa+2TXA4OlskM7IdVbOkprw9PKLwhk1G8ehQ71KlwnJHdacp1pnTB7sDlsltBPorpgsNOi0Ik7J1LUyfD7tCyCiXVh8vDaqxx4eAnvkAW5KGX9t1xxx1zb7zxxp38qeIpMl48lVqQeuEFeKH7dUbmiyCj1Pg/aCNV4suG9JTIZH8p9i8JVP6n07vIlcWP81EyUfwYvdbW8y+R7wC/NsOKn+AKbrV4X25KMWnTjXa2zKWVFlhgJ8aYsEyvxamkAKMGjCnguUZYchptcqIfRWg6fsgsmOzuQCTW1J7GtW10Kb46XPkA8MUXOOL0+hrpJxhIKjfA1ThSpRGuVv4KarVv0rC1vm88M5TZMTqwoX/H4u3L6vtH0/2ZTaML1/VNLNnpHL69f/7Ng/Zke0cs2dpUPz+3pCsxMLg0m2xLxZubG+vnZZd3N/YPLiUfA1euOZfq6Wpi8pc/Tlr4V2kNbQploWzPYPAG9SCN4Ti1GA72ppkIjaWolbOalNOc2Ygv7vPFn6Wv/H1Rn0/7R+viHuYL/Pc4I3jzCe4J8A2oUtGdLYSo46pX3VidGj+y6s7K8ZRSB7wXSNG2QRDMZtY5ZXZSyzzMGsXA4MPyKPiA9gyGwSFUJB6zAdIXBKvo9PqjceqB18VBiESxVPK0nrObXWFaUBpygWOZx4o6uaxZLhblPazCPiqWL46mTg989reffe6G6296cM/e+x94I756br4lVJ9szmxLJoLtfUNjZO5vPwtfIfd9+yMf/u5H/tfYpoZ4qH/eLbWxBAbNgB4HYUOe4d/iarl64MXb1b7BiBZZaNKdnYqHsFlQ9maUuP7slEfHbQDcwWGwoRRqofIfGbLBifkQNM4wCtKKbArSctJsCUcQv4RUMNpCedrDIQeADE1ABvDMAhj0ROdGMTtV37mPlHVzlHIjiC4tlNfSIwf3bFnalcsPOBePrBxxei31UUPHlqGlNrK2+A+dbStaFj1AJocWJrraA001C+Z9vaHWEDWAQzlSvKu7m5xu6ViGtaAj3DzyCi9yBrDkOXeWdpLl2NvIM7G774456CtxNr8e+MZrgdfZmxon4/6SfJNs4fRYgc2MVq2LjOpGAzXUsfFHJ5Q0iljqwIplJ8ieHGnqPnX9n9rDpePGuGm+i/8h2C8usGUaua8yzp4SdNy9dLmmbOwonJqq03GHda2FcB0CFcYu41BabkxNeek3iJyg1uwMk7vh3hH2W10a+0GjcMLPTvgrGD+JMR1wMxSsxJEjkoJ9F3IU1CcqHL9UcNpqWIKsIIghGkAJY1jcjgXVk3pzkFMlFubMZqp31CIVrFHxs1oQPzhR3iyrLx27/7X77v3mfU3HPnfo0OeO7Vt+ZMGW3jV1jfMW15G3Jx54YGLXPffsWnv82F9cd90PiH3lXMexgwc/2t5Kc4lPESP/2gy99WdZYneG3qYyeme8kZ/zT6WYLlhGXiP7Yd9grdI8DreDHUSEJ8UShqxOCduArKyWFrMuWKcjWcvqlGh1jp6rqlPq0UJx0WXrT4yPz+1fl8s0N3WmVvMbh0dH5w2PLj+0qSfb3pHlWF09R/sZBZCbO1TLhxgwRy1bMhi3RQ2po4UhOjvYNnpq5uhFE+tIsJ8BrUUDdMZ0wUZVp00AhjCDWrVRtYrdS7inWfAY9195kyOW6T8257HH5mSzrNXxwx9mvNxHBslaoI+PG+RkC3hyOkodHqnjp4kULF6RKGCSBfZFgKb3LLS6RPZIk5xe8pWX0hvEDHalqZX0fYOr80s2H/+eofjrwezSmpZ4Xxf/9KKBdPbANS3x/p7VPf76JO0baCK9ZAXAEec2cQUzijQTyPpalO6xFMp9tOt9M21o2DJT72R1z7TGN4UGYkVDWj1KLKzsKrWiuVU9OksrmqHUi9ZU1zGQyu2uN3rjc1qTvT3B/tG5S9qiiczahWPkSLijPQnGVLwu3hzpGWir7zbypt7m3Aj378h5n65/hb9vb/d6Grs+nyW/ha8EgFMKLrTt7ZQtCi5Kehdnap0JRrF8IQaj/Gk1HkUTJJgvFIjE2txloyS78rIFDEonrffTAyWc+AkL2NICfxqbAmXFTEcQ4gfyO5pXRPK1XR5x/s4lEcH6Df5M8dEbhzrJtcU/W7PJ1DZ8sI/MydzFai4yau36ArUTyEizcWpoRTazejuTc4qjEhH7eE3MLcZ9RiMvRnP53uojEsb/RamDbDqx/0fZo9kjR8m5Vbvfe0AUVrz3RZG3kl2Mb7cQG/hk1+AEjTKP7DKaYF0VbTukqdSzgTHVCPdj8Ctd3BwO2Y0WYbgRjykLk6IWBj0wHK0otyDwOuoy6SSJdWf6e1huPZHMgcvEoqM6V6i+tylpbFvTn0r/nSlibwq4yZFx0/ymVrzvKOxBA/8m6LYaDosyVG1El1XQlTecAmlGP9yc3c8/tKq4nVzdr9oG56fJz2DvGDkr2OrbWIYcy/lQ3DnRj1LFXYDyjY3F99EkwoJiNL1tRCuOcEkF0YhBfdnACkc5xevErls9Z9CmA2SYr8p0vJaNOLh7w/orr/r8OGj1by24dWThwPAIee6140dfu674Wnc371y3cdP6tRvorJIKXT5IwI3xiurbyF13xZ555iP0ddNr36B6nL0BnqPnC8JmwNMA0jzIfYL1U9JauCmLI4B9IO4MzkoAh6LgsGjuxaQhAA65ljrQlYK4IMhkZxr1I/oErnTBH8A/8XthpwXoBIoAyrsadREUgv0TAbCOkE5qMzLKQIMEZoMNKUYweYTbjoZT2HLh6ITGynZRuoJ3k5OtxX0keG/nLXfp23K5Ln4LW9LpB4V673tvTsVI1Fn8n8eOtV51FafifkjFvYG7Ra3Dd+tYLeCUrc6HJZw2HGTi09CNlqNbyzzPQq0TUav1AWqxCtRqpeexi8XmZsavGzuLLE6hFq1eFsyeDTkTmU3sl6M4UKYCepYwFVCJK/nLCzUC4pwEnNdTndDE5bi/5Qo9uN6sNxks3Ob2Hh+seVdGaYY1z6QL7c2IWnvK1DoVE/AzJabDFmZ6aAYVkgCi9F5CfcAppQfYoiM9lWVs0ZkuZHvwqtkMsEVPFg97moF2eQw4IFGa8kpPPdAwkUSmaG+GUy15qoKmQAW1tqGhZJZoXEJ+v6poFuZJXkI7fYQR3FbiKTJ4MXVVfGUWLqN2yvkM+Rb5PhcCqh+ikV43yJFYaiqiSlZWY+UEl95ZqjgFqT7pNTXYW6dqWUdebWqqgQldWnqFXq/OzorQ3QEW6o3EkF4xN2Y5RS8zIfzdA0I/yXg9dl1ZmZAmcWLRiUS2J9ETampvCmEzXnLlsbFNnwr5vDU1Xt9w63Bzck6iszfRF4+HU+Hm7qWRrat4iYbQGD/RfjLhGI3jObgXL7ejzDlbR5n0H9xRpugwlGW10+hIeW8ZiE2xor/scL3iKfWY/U331mgZ7jf/P477VqX+r0q4f3Zr97Iy3K8D3O2g2y+Gu4Pi7pzB3T0b7p6L4u6qwl0q4S4B7lIJdxfg7sBXPO+UGO6SS8Pd4ZRcF+ButFTgDuIX56gI5a2Fc26P3Ba69lpzqcNQ8O7cGVm2bPod8kCJBjuBBn6wMn58ERoEKA2CGg3QcMCubkd60mb2GumcAhlnZNXORprwRUlTU0WaUIk0ISBNqESaGiBNAF/xfDDESBOq0UgTCOJxNWmocWtz0SIXkLR03EGJUD2VKY0KivXW9dctsISD8fr+0CJrJOicIV1wSXurtLi9bfpfaJsm+O2Mfgtp3MsNFPzORSjopBSUShR0pOQQGCXiWdlXTTc1OIa2GJZ/BC104tgfp6a7ipquEjVdQE1XiZpuHCGGr3hecjFqutwaNYHP3LO3rJayEUAtLVZXotoCGq5zAK1yLHDHKGajgTtktpMshFei2ceozHFzYe73lyd1YONN+Vn0CvSIgx5p2UWVdDbw+r3MJPc60YKdkthv0gwB6/6jpVTQW1YlptT64TebU7JSzVYutRIqSRMl47lChl3Rs66nZ50lnA7XhoIlYfapsUxmLHO8u64uVBMBPY3K+ie0H8LNPcyqFmQuU9F4CjbtlN1pVfnRDids6Sm90VpqDAU/X+2seyX0q5cokVwdsqkDx6rphHfRV7PCmw6IojMhLfAVmcnmooPp8FX4ApYRYMt9JS91kQaxwQ82izvjbVARJxbyrFj84vz/9faS/17811Txn0c2Fid4raUV0XxQ7SuO0L7iBOa5sNZYjmcqWovBAWa5lWR5nxnmVnxGNgmuHozzIZNRsIO9VRNj8dxIEGREDRZIF3y1MRrO/KNVyqLqwiVLTl0HqWpRXrgbvbqYj7p4hms+WNGuPKDrRS/PnaQu30brF9R+LPIG2CEWNg/p0h3DzsvoGJYu6BgmoBlnuoaLP6E2AaOzMMRsgv8bcLxN9bMKh5/pZw2O6wAOF1bgXBoO92XAgb65CfPtVhfTmxUQUd1ZBtQXmeYswcX0JuvNB7gWUulVw91wacgQMJD0jgpJfzEwbSYOtKlkofOuVOFPk7CSCROWbuBNlCasib8Sfq4qiVKGyFfL8ykaNrbyvArN2XPvwJpjbiysTrzR0w5eI/UWscXHVApRYVYsBrxzpI9yzbRFbVJ+v9dx43Vg7XN9dNVnrnP+D0DjWlh79Gub1WonozaOS2Rz53Dwlhl0fYEn+jwliMAWES+rZ6u3oU+zd0zqtQXsZyIS1dm4gkNaxTHtnUvhsEnMW9nTWkmmmrNSg2koUTBTr9YAl0WO8K6lul9K7PG+AH3XtCAFQf0FaOVXZxVIQLXDai+ASxNndcBFhMNeADnKZtzVA0TxlOykBW8ugKQuXXBRr90VBSfUSedEOTHe66JRDBwAoTTSmhoXm/ZAJDmQl+vUuo5sachBK5HcM2MOsOPJv75s1sEDfWXDDk6fJks6SXdp4gFZUjxbGnpQLHaqfaVpsCkdXJ22O8q6krFqhtmLk15XGNg9pEdUtNlAVc3KDVXNypO82RlQU95V/cqKNwRoOmnbQ2CW7uVqo6+8mzlcZfNVdzeXLD/kH9rnDDyOuYMA1hTP0ukcnK3TOaR2OmOHr9dPlc8f63XGXVLV77wdNt4FPc9kLUrv/+uwHYXNfCFsbSjRNdiuo7DVXAS22tlgC5fDFrhM2KgkqAJvmAmFCyFs0WQ7g3EnhTGOdsYFMMpRVuVWm54M+aPAv5hbjqe1CEgV6Ily0MOVoCuhOmBYLybW5PBFEani2iqMBqsY90LUOkqci7Y3w28hxa8WMLx+NgxhEWIZJSCyfVmBFybBQhY6dRdL+KNwGK3ENuRDieymkc8IdvnIUVdBcNkvq7W/uhSgCttlZZrsQkyj5SoN7MWj3APkS+QfQconOLX9AdvkjBbscqR5M6zL5dRAJ4fVM0laAYacc/TWWxtvva0RXm+7dfLW2xK3wb9b4ZXyyF1AwxY6q7eRhNUO/3qgoLOUfFfHzVDdxxojUrIhpeZmFR8Q08dC7ThJOkZYBVhypmcU7Oavg1cmYc+oQcRj0UB7RvXMmzO4W1/sv+KXP6IDKiTnpFES3a36SSe+zXwAX3XjVycD+KqfDOIbfj1S8b3JRvy1AF+dGWgBIrTQiHVSeWzpnzS6A420FvcLeqPTHQhGGstHWigxHwphjMQowQiG7nyWWJntjFktorYYoqmc8/jdaE67WbAzOXLyA9FEPNu8aOzkDc3RWLZp0YqBvc9EIjsOPxqI7zi0F9fafKP9tsSz1z/zkvmE/abEp69/Y5jPG58sLjQ+cfKN+WqM8hzfBLIPozl9s3XFu2friveoNW4Fq0NiVkRVZzyKuVJ3/EEQvpUd8vx3NLv5P+L+HwQBW3X/z2n2Mrv/dXB/7+z39812f//M/V0XuT8VpSUQVjEhWgXFc0yCon5kcCwEOHxcBPO21ZAgIOGM4gIBEwQBU1cOFooSj4X2CqENU2uh9XEasOjLBTwXGWFQLTxKEG8pExtVYD9dITN41usOa2jibBd2u9tL3e6OP9rtLsCqaR3v86h7M9P1zgtsycrmlJiBZ5aUzSlh5TtgDeIYQGwINc04OWj78pZ0Gms7EBADiz+CuLBoJa1gw2XqcV6JtzS9q28HEWcGlpz41g/u+a/Ltj7Ncszn+AT/FpfC+iEKgU8b4dlGHZqZOdspWKSUk5YpqunCZjaLB6MvEVo9wkZtx1NAnCDG9G1SQRdtQ23Q7Jq0+Gpw0rYsYjyOU2o4Wkwkt0kF0R1UG5K7tdl7Xk9EmPGye9A6zXajlQqiwysd2LVuyaZANBpo6e9vuWrF4jZfsju3oKVvbku8Ld6XuYWvu3LXknxNR3046gq2xtsWta+4ItzsWzA3kU809sbDnZGucKzr0el/ojzLesvfob3lTdyt76e7vPki3eUtVd3lU0ZrsJFi/3+ovxwFw6V6zJvqT3su3mdOnqdt9f+v4n66/pVL4H4rLa8o4X6O4t7Kfej94N52Edzbq3B/nuLewpCf9PmbmqkZ+KfiT4XypUjAMzl9CSrcvG9fZO3aMjq8SenQzX3mInRIqzNr5bZ0oQWPU3DcnZ6dPtmL0KdnNvq0pRh9Cj4/G1AZA9u44OD8pfJCRiJ8goPSAsJFbrxsUlVZ0JeiGakypy9BvPsr7GpGv1cp/dqAgp+7fE5CRspklCbQhql0FdnQoG6x0MLhGQpOph0N4Hd0wPmOlJK2MJK2JFiqo0OaFIN1GF6W09peuwQxL5OI1br1UkS0lanbS+3BCtWr0VAIqTTswYzc+6DhVCfLDWRTU01qbiBXRcqpDpYN6HAqafithf1WQVs6UbVDJWVa+gKQMtnU2sZGLF+KJ7OdYPYmmlsateHLl0/TmYD/paiaLo//X4ovKzIC6t4WdLyPS4JF08s9zxUakap1GaUV/JIQ272YCsCp9z3pKX+mEakKPu6U0NVY2s55SswmIGYTrWKn/ZZmLLDAItJu1uKtzIH3ptLmTgEvWhtbkRf9roI9iltb7pYKUohOhffAdscCCBy30YqDuWrD0aZ2/HZGkj15AEilcYmgajUEbYetHGaRSNpJibiJfjhubEAXo/36fZtumockvdvv3ZrbMcEXn9VvWrSyv2bhxOCOcHJrP1C4P7trjgN2/wCJCffMW/Xw2Nru64G4V3fl7/yAy7NrIpscnJPu61q/vGfuNV3DRunrE6wXLEJnn1yYjyD/GfIRVWNUBjaV5yPWXlExUqVbKM9HbLI9gHzDZpW8Q2eV1HIH/9i0kvBFppVE1Gklz+O0kmDNnzyvBFX/xWaWtIHJc8HcEjKIls7/P/EBM+ZCfMxovWj4nKP41JUiyBfFp/4i+DSo+Jxm+IQZQpOAUC3lx38PRtQ4uRhSBmaYXIiXUbNHdCpur1Lc6sEqfeLS2CFyyYxSCzo0lqZmaQWqGNyMWM6qte9KAg4TMwRAYzWEzpwpwGJWPI1ZWZx0FG1Cot34758K1SrzYuSQytTlLGtdmacBInD/g9YSl+VXyKXyNE7YEnvzdIjW9GNs9AlcJw6vv7/s62BqIw6s2JWnhckz1zmPDeU+4MGKPA15H3kaC2OGjXn+Hrr60yfVawvnz8O1LbSnqCJPQ/6deRp+ljwNoVRfkw+WNxtN34cgqL+oszt+xv8bFwSqwS7zV3Qn2tSxlGCM+G1sWPCk0W8zlkriasyl8ewedeZYfQ1KD71VcrFAeyyMvOVB4tCBFIrooo4znbKQo9I+gYEzEOs+2tYnlXcaJEERDB9ZNTHkOrC0ZWV+RLyif2F8/pOHr9p6tH/V/OVjZHj70I933bnyk2uWu8frHZ3e+JLIgmPF337oydte+vTuO663X6XmWn8I9r/ENWhRAMzZ1NGBm3qM0xT8dPA4HDekq6enRC82PYWWkqKT78rTKSpTek+QVo7KJhw0zyl6NuRC8dfSL8keNn/+wvkqQnX2pmzeir86e1M5f4V/TDPVBXUOyzt0Dosfn78zyySWwGyTWILqJBb67DSP7zJnsVDZXjmPpRX2Y9VMFrKcueL/KeAbhH1eDZ+fucsl+M5R+EIXga9mNvhqK+DzXzZ8TJNUguhgMqMaSq+mPkpwvknhjGEnbgnOBmRjH7BxTboQxGOw0EBplMEfnw3+xgr4ay+An8a9wWiVfZJcezFsqni4Ci17FRtX4xcreZw6Fb9XKX74jLwbZlkJXIhoRvGDlIykq9AqqyzD7FqDhTYAliPLCg2wATIsAaboqrsUgT494I+v2wW6rxLTUJnKu4DXKt1CjCdzY+SbfDccoR7Ic3SczZSbPaHFkpoS2RHruKPaQH8Gm4/VB6g406oCwJY7Q9VTWibInp+WPaiFNHV3f6klhA9reZq+MV66C2h9C8uYkQB7nhROugOvVA6rnBNS5zJiQQwmepjw95rpk24kNdETVbPyiZlEj1PC5I7knCXRQ+tDaaLH8Ytv03yO0zlpdNJEj8Mpln8AX3XhVyf99DWAr3r8erjie5Nx/LUAXy1L9Phprgc+UXM9YFb5A/EOLdvjgN/C8YpsTxRZA3sbOJrCVMxcvjzV47tEpmf4xO5QXawrcey63cDoXYn8QP/yD3oDo2uvlQKjaxYT/c0Pi4ccRwe/cPMjhmOOa8O3bX6iizxjOFJ8Xnf04MMZaruwuTzvgC3kwWcNXWQyj/dyJvP41Mk8BYfkpub7xafzoKgsn9CzDOR45ZQe/hsoxv+zwLcW5HgVfI+iGNfgOwfw+bWZWrPAF7gc+IKafpcwjDnlcLlp7YBisVJheGl4qWgvBznB5HoV1I8wsS6ocL8KcKNPcOdFIEfA6zKKR0QJTweFMzQmXQIWV/ksVQhNRixGo5rUTlEvoQLDqJrSVhwGFqqtrbv0OlSLvnIEO8vkXvXaVNr5bIbQOzSXOOsUIXdpipDn/8gUIcxXVU0SGsZGxMppQmpfojZDjs2n3cFdOJqWPsa5NEEOG+N4R5o+mqZifhztoLWU5sfZ8+XTaRVerz5Yz18xpTZIqqfUbulhM2r/VjilDamlg+TUMbXYXUvp+aqak/zQhRS9MCfpPDNLIlIbbl7/PohOM5YFXg0QXGwB+Cq+qVqMbeVFfNWLUsk7I+fPCYP8C4BpFG157BrFhwqyB/OFtKIEo1amUI+j/m0eQRv1z57Qp47WD6uZPnO6YAvT9mIrVivanKZWmgUM41Pn9ILR5aGPj1JHOZpt6ND4w2XT9BrEBh/W/RrEBm9DxbPoYvjkgg8k4+RRsfjSOuPLXxa2kbXFHfEEln3s2DgxsXHnISwAsKRXKOmXN6QtLzx38rHHTz722BPMzhPW8T6wRRu5Vu4pNWLszWAVBmh+NvdGzNBnbDWnp2yJoMD64Wj+hpTcMwyC2OAwkcakJvbBm9VUDj6AUBGC1CFT9JivSboKotPLHmtZsLqYYLZFsLPL5fbXs2kJihlnWMVcBdKgp2To6VYnWlYGC5JsOof6FEaDvoGNcNx9V0/2FgxWfka/aYQGK+/P5e7aXbKgyE0kKtwzbwysp9tuo0HKK7NNg3feCXbU4cP/dODQBgxRslpHnhMW0udgBFGSlGe0sSglkFFsIk7Q0Z4u6bDQAjzjTF4Xd6zfwp4ueemkdzUPawnwvRUVqDOJcPJupbGHvdLXkEEaT2jl6ACGTKldWmRDumj1jjqf3KDOJ1d1SUSt2MVIwvi4er07yDzwAxzcXLDbkN15OjuQ7QHWxKIWMauFQbRamU1H5fIyr84prrLcI9UeZ8nFrJgDwVVMefhTPmuCz96kn/kvmC0xM1CiibxA/4R+n3/jj3+ff079/gjv5ab4fwULu5n12WPLtFmdZYUNFhY2oEqk1ZZ6Noyne5BkRDbgYcQ+JxF3hVoC/LCz7uZ7LQF3MEifrQvX/ZJ2XTpf0DBzXQHcEfW6NJ1CWDuTu/TcSgcZoxe1z+G97JpuuDq97vnD3Je4pXDdpPYs5j9yVf8sV32o7KI8wko2Ulj9WJ2IVABJohKC8klAowVuCwxruS1MkZXIgtkgXV52g70gXUCkXNnxmEawp2ahnLuMhhfARYc+WjMqynTibkDDGl07B6ugoXCVCIAzO630cYc2/wVEzsxCmuOzEL58CRCu84fJRroGfm6EPo37T4bKf5lQPTQ7UITbzv0r6SJ/Vd7/b9bNMHOp/9/M+v/NF/T/b+/f0N+/gbRs6Ju7oY/ZDlvOn+N/QZ+v7QBM16iett2XyahzBRSzK52ufNp2oGzQgDrxaMrGfrNRf3DKyxphgxUPD61+Z9MIimWv7FGiNWWvrDcGpIed9s43cJqoZPjhsyxQmNNIm44uffl8HG0yzuzXwHpJlUyla5BSqaTWl6925CMcHfS5BfjcHrAKI5rBgbX1GCmc4kjEZGuVPez5yz64uI6ecLFZJ05msPNnFEN9Oo2PxFWcfjiI0ir2EM2LKXY9rf9CGDLZWC4zMxq3QYzhoNcISee8qFY7rPNXWhd5PrRjeX9Nd8+fRQhv/f3PLD+0rPvEUN/Gr4ff69rWdcPtyZa61+DgwO7s3FZQNWg/kU6B8H8B6x3g7udYU4fJmgGYdfSx4OqMIHz2t9GeTtOCasMZ7PkY0LXO/kAfNTA9FWAp54BT9tefkXAaYA2bBuhnRwFaADdlo7+xmmyc92Zmz33VngdUQzLsiRyJrBATYHsAxMYbUq+78/v2znF3mPndrVfzJv6Dzc1sChq5sfjfSU3xQ19uWV/8BfGu6voy5RncxDbehh31ZfOJS9MwqTbU9C3TGV1Sg4R/Mv077VkAr4MP4Mf8J5aMyVJm9scBuJk08NHWBS8dJ13weZE4PuxX8LJSWEmdOuHyas+TktjzpP7IQwMapJjEHhswtmLRYu+8nt4Uqcn/M31uwMDCxra6lpZ10+fID+mjA9hsYb4J4K7n9rFnS80MGPZVQB9i0Ncyrqyj0EeM6CBgJsmtGonoIboj6LUYapiPLrGRSD5MYuO8DKMpXw72zLj1rFT52INVY7lBbQJ7X35Op/b0g4GFHvP0B7rEFscOfpkH0GGPQfjfsUuElnjaY2BkYGBgYnCyTJk5M57f5iuDPPMLoAjD+TWsq2H0/6//5ZiXM88BcjmAaoEAAHEMDXh42mNgZGBgkfr7g4GB+c//r/+PMC9nAIqggNcAuBsIYXjabZMxa1NRFMf/516DbYNGSiFGJKakagdbolWLWNCI77VFUjIoSGmqQxAKGilZHOwgiJNDEF3EwUWw+AU6+AV0cBA3hw4ODo4iCFbr7768lFAa+HFuzj3nnnPP/z67q1Hxsxoc3mHJXqjpKhqHc/6xVvyg2rZPTYs0DVXb0HH2msRG9kRXQo4b0AN8Vain9gych1mYhwU4DReTGuSGM1IW3bCqfks33KiGXEMtd0qxW8M6tewHdpX/z1nnoaQMcS37qpbP4n/N/jvshdTOY4+pbD814p5yfkk5f1QFt5+8jDL2j72ImvSMjbETMG7DKrpB1lc5e5M7zMIR7jungm2p7CL8WS1advuPfWOdU9MvUQu/myGWvJBjq+x9VNHuUfOSVuyLcu49Z3zQkH1WztbZizRhD/UmzDPcP+kp+FMN8C3DHZiCsRCLbdBL0Zeoc1P36TlOdEAD90h1O0H/FV1LfB3m3EnvFPp6Sw3O1V9qdFTr5aNvLeUkGjST+e8Bb0CJJq6rSQ/0KHdhJnnmu6b8jh67qaid2KBJP2iSaLcAYf574C8zr82uHv2gxyEYQ5NfsO0m8ff02E14a8GiST9Bk0RzrOed+WfEhHfSYFa34ZPkX6FLz57lo/kOL1PasAFT7IXvISW8KfcbDQ4qhnrCeh8d3fJzaEKuXScGwrn0OYkesTvAepo3NKPCf1RHjlIAAAB42mNgYNCCwwyGBYwVjH+Y2phZmHWYA5hLmCcxX2D+xyLD4sFSwbKH5QurG+sy1m9sMWzH2F6xx7HvYf/GYcThx5HH0cXxiXMKFxtXCtcirhfcKtwR3Lu4P/EI8BjxxPDU8ErxJvAu433CZ8HXxveMX4zfh3+WgIyAj0CNwCqBa4JsgmaCUYJFghOE2ISihGYIfRIOEp4mYiNSI7JD5I+oiqif6BrRd2ImYl1iL8SVxNvET0gISJhIbJN4IqkjGSW5TfKSlI5UitQ8qRtSN6RlpOukH8mEyGyQuSYbJztJTkpultwOuQdy/+RnyG+T/6XgptCl8EaRSzFFcZHiGSUOJQ2lBqU5ylLKU1T8VPaoWqnuULNSu6VeoqGkMUGTQdNFs0PzipadVpJWm9YWrR/aKdpXdJR0CnQO6RrprtC9ordA74G+gn6K/iH9XwY2BvsMbQx3GdkZ3TNuMNExuWHqYbrBTMKszVzI3Mw8yrzD/IyFncUmSybLIMtlVmJWPVZnrKdYP7ExsZlgy2YbZrvOTsVulr2WfZP9KvsnOOAnBwYHPgc1BzuHLIdpDgcceRwjHBc5nnGSA0IHpyQgPOJs4RzhvMVFCgCwvpRjAAEAAADrAD4ABQAAAAAAAgABAAIAFgAAAQABUQAAAAB42pVTTU8TURQ90xn5ECXggpguzFsQogmO/QpKw6bBQkgKJtrAxs0AQ2mgH5m2Me2ClSsX/griD3GF/gJXLvwZrjzvzm2hTRtqJu/Neffdc+6bM/cBeILfcOF48wC+ccTYwSpXMU5gET8Vu7jCL8Uecs6h4gdIOl8Uz+CZc614FnXnu+I5lBMpxfPYSXxWvICtRF//EdbdGcWP8dHNKF5E2f2qeAlP3T+Kl/HQ/av4Biuep/gHUl4Sb1FFhaPN0UOIUxiOgOuA6AQNNNFFJFnnjBo8Z/QF3xmkkOb8UlEW64yWmRXyvU9mj6xLPlZpm+uIWnYOpFoDdcYDzqfCC5kZ4kziVdawrA/wUeDYYSTSiGW0iN6RY1AanOw92RV0pF7EenaOqFZl9mj1ELs4JmMNRVYPRbHJzBAXHBFqUqXO2rvIs8o09fMDT7JT5ZuREx9K5dbAmQy/OyV6fbW+llW61ZlcqyrY7rQlw35pTWpdMNag1//7v/wRX80YZ416a+iuucdfIw5Po3m/lvWizZ08XvH5JI8vHT2Z40uH1yZwT4bO1c8tSXfGmvF96UgPW13rdOxngWoB8+LVMMfek/F/e/w5gjtavrhS4e7lkGaLkRL26F0RB+yEotxLqzmpP2476Ij8Y715ti/TwjvSr9snqysnfCN7r3m6DDY5p7Ex6PncP24mztkAeNpt0EdsU0EQxvH/JI6dOL33Qu/g9xwnNt1ObHrvnUAS2xCS4GAgtIDoVSAkbiDaBRCdAAIBB0D0JoqAA2e6OABXcPKWG3P5aXdW34yWKNrrTys6/6svIFESLSaiMRGDGQuxxGElngQSSSKZFFJJI50MMskimxxyySOfAgopopgSOtCRTnSmC13pRnd60JNe9KYPfemHDS0y3U4pDsoox4mL/gxgIIMYzBCG4sZDBZV48TGM4YxgJKMYzRjGMo7xTGAik5jMFKYyjenMYCazmM0c5jKP+VRJjJjFwjE2sZkbHOAjW9jDTg5yguMSyw7es5H9EidWdks827jNB0ngECf5xU9+c5TTPOAeZ1jAQvZSzSNquM9DnvGYJzzlE7W85DkvOIufH+zjDa94TSDyi9/YziKCLGYJddRzmAaW0kiIJsIsYzkr+MxKVtHMatayhqscoYV1rGcDX/nONc5xnuu85Z0kSpIkS4qkSpqkS4ZkSpZkS47kSh4XuMhlrnCHS7Ryl62cknxucksKpJBdUiTFUmL21zU3BjQD3RKuD9pstkpDp9fQpXTblKrvUe89dqVD6WpTjwQpNaWutCtLlQ5lmbJc6VT+y3MbaipX06y1QX84VFNd1RQwrnSfocNn8oZDDe0Hh6+iTZ/H2COi/hdS/KFfAAAAeNrbwfi/dQNjL4P3Bo6AiI2MjH2RG93YtCMUNwhEem8QCQIyGiJlN7Bpx0QwbGBWcN3ArO2ygVXBdRNzHpM2mMMC5LAaQTlsIJmpUA47kMMmAeEwbuCAauZUcN3FwFH/n4FJeyOzWxlQhAuojrMQzuUGcrkkYNzIDSLaACAmL98AAVOGVSwAAA==) format('woff');
-}
-
-@font-face {
-font-family: Fira;
-font-style: italic;
-font-weight: 300; /* "Light" */
-font-stretch: normal;
-    src: url(data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAGnoABMAAAAA+4QAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABqAAAABwAAAAcafiXP0dERUYAAAHEAAAAHgAAACABGAAER1BPUwAAAeQAAA1OAABEJmcT2iJHU1VCAAAPNAAAAh8AAAb2Y6MJv09TLzIAABFUAAAAWQAAAGA5yflUY21hcAAAEbAAAAGTAAAB8kpEps1jdnQgAAATRAAAADQAAAA0BRIGqGZwZ20AABN4AAABsQAAAmVTtC+nZ2FzcAAAFSwAAAAIAAAACP//AANnbHlmAAAVNAAAS3MAAJqEAsj0L2hlYWQAAGCoAAAANAAAADYB9E8kaGhlYQAAYNwAAAAiAAAAJAeRAtBobXR4AABhAAAAAjIAAAOszggtiWxvY2EAAGM0AAABygAAAdicvcH8bWF4cAAAZQAAAAAgAAAAIAIIAYJuYW1lAABlIAAAAhQAAAVYkiSt0XBvc3QAAGc0AAAB+AAAAu6b83zWcHJlcAAAaSwAAAC0AAABHyUrTO93ZWJmAABp4AAAAAYAAAAGVS1ThgAAAAEAAAAAzD2izwAAAADODu7EAAAAAM+sBat42mNgZGBg4ANiCQYQYGJgBMJXQMwC5jEAAA5YAR0AAHjazZxrbBTXFcfPLl6zNsQEy/htY3tDS0nzJCGkpQlgwBCSkjrOi7RKS5SkalCEKKJKhapIFQlJWilfWvJwXjTh5QCWWidgTElSJ6mlyqpKPyyNF8duJSvRSO1+6KrKqJr+z5nZ59xj767XbefqN7Nz349z77n3DIYCRFRJT9JLVLZh0+091PjQE7t30vJHdz/8GK3a+b09j9MGKkMcchwK4hGY9m05la/bvrGNlneu6+F7N9/v2HY77t3b7sC9p3sr7hkpgg/t+uEuqnrs4d2PU434kNwRQuVUJe8BhHDsebQ6ZLU1472SQnCV8A3RMroFYfvpZWqkV+hXdB19CLeaPoa7mQKhbqnjNfT9wKHAUOAS+FewNvjt4KHgH+dVzbuh7FDZ70PBUBChcKFwYCjUGGoD7K4OXOIQ4QbPDw5vfL8kuQ0hdIi+SWEnTo2OTc0g4kRpmTNJX8bvK8FKcCO4CXFWO/10M35/Db+/jucaxPuGM0IbnQR1wW8z2AJuQ/u24nkXuBvcR4toO/weQJu/g+ej8NuPtE+Bp8EB8Ax4FjwHfoa8D4IXwIvgJfAyeAW8Cl4Dr4M3wCGU/xbKPwyOgKPgGDgO+sDbKOsEOAlOgX4wAN4Fp8EZMAjOgnPgA9RvGHyIvD/C+8fI/y94/wTEwCXwGfgclNMSZ4pqUeM6xGxAaU3ovRakDFMNQpY4fQi1qR4hjYjRhJjNeLY4lqS1EDqFtBbS2ggdlbTz6XLEr5bcLOrEcwyMgwmwmBYhzWLkUu/8Q9K5OceRc0LStyG8HXSAHfDfi2cvGAJRvF8EnIuNcmyUY6MmCdQk4bUgjhxs5GAjBxvl28jBRg42crBRFxt1sVEXmxakcuA21Es74lLrFpTVmRN7kVem2zbuuRZfWYmcstLtrsio7aRXxhe+Mh5AGTHE7EUPTSJ2L8YhTksgd7WgDtQ7F6SdjcihWXKxqRVxlkpdYqhLDHWJYQ5EfXOgE/ltRL27kG4z2AK2gm8hbbfIu0U9IvMW3YPnveB+sAN1eRR+u2U0YvRjPPfJHIhiDkQxB6KYA1HMgSjmQBRzIKrOgV6k53nwFupxGBwBR8ExcBz0gbdR1glwEpwC/WAAvCNyb0HuLci9Bbm3IPcW+joG2bfotwg/D94D7wN3DliQmklIzSR6uhc93UufImwCz4osCaoTGY77xqQKsYYRa9iTszhiJjAOcZGWRk/mWvDsRJwxMA4mQEBCytCGYbQhijZcQH1dfwtrahXdSU30IE3RL8VP5g7krBrI3MFzDIyDCRDAWlqJ5+WQ/2qszLWQiHpqwOrbRM3UQq20lNqonTqwBnfSJqxjd1EP3Uv30w7aTXtpH/XSm/QunaYzNEhnaYjO0e8oShdRyjh9ijICjY2yZi+kjvl7wq3h1RV/WrBz4d7LPq0arNtQ39qwK/BnWW1NNMpc9tOswCu1CV69TbA0m7hSYaXCjQqsIUyw1jDBmsQEaxcTrHFMsBYywZrJBGsrE6zBTGxW2KLA2s8Ea0QTdyncrcDa1ARrWBOsdU2wJjbB2tkEa2wTTyk8rXBA4RmFZxWeU+CV08RBhRcUXlR4SeFlhVcUXlV4TeF1hTcUeGdkgndLJg4rHFE4qnBM4bhCnwLv3EycUDipcEqhX2FA4V2F0wpnFAYVziqcU+CdqolhBdbmJniXa4J3viZ4N2ziE4WYwiWFzxQ+V1ghe0oT1Qq8NzDRKXsQP2MK4woTCuWp/VLuHukR2dWb4J2+Cd79m+ATgYlG2WH4aVLg04QJ3i+b4FOHiXaFDoUdsl/2w6cYE70KQwp8AjJxUeERObWYuFyhWmGJnHr81Co0KGgj1iaj4KddoUOhU2GvQq/CkMKYwrjChML6gkeAT6km6hUavDNKLtr60SJnWj9aj5aqJ7ZPI6OFrYxLxGrhp0VOaH5KJ3Pmlbd0MleaFXxVEbN+0oguQ18YmWMZCnaI5cQEW1NMsIXFBFtdTLAlxgRbZ0zUKtQpsGXHhLaOsgXIRLOCpvnYemRiqQJbmUy0K3QoLJOzvp+5PuezFcwEW8ZMsLXMxGaFLQpbFdj6ZqJbga10JthyZ4KteSbYwmfiXoX7Fdg6aIIthibYimiCLYsm2NpoYp8CWyVNPKXwtMIBhWcUnlV4TuH/7ZzPllkT2vmfLbgmDiscUTiqcEzhuEKfAluTTZxQOKlwSqFfYUCBrdgm2LJt4rTCGYVBhbMKbD03wRZ1E2xlN3Fe4T2F9xX0c75lhK37Ji4q8FcAE+MK/LXABH9BMLGqZCerOtnz+9FOUHO9T++RLyEmqhX0M2PcSJ202k+9WAz8aCecRtkf+dF6rkUsA374i46JMYVxhQmFFfK9x0S1gmr7QZiJMYVxhQmFIM2jSjiiGmqhAL0Jt4CCHS/w96Kl1PYH2kw3ETkXnJiTcIadOFwCLs67VYrAdwq/eD9e6YzyE+8xzMZZXY6F9Z2QZ6ZfAtgo2UbZttQALuVvSa0SRZZnyz3mRB22ueSGon3ynHRGod996WbVUrXGbj/nlLVolqVJ2zCWbi/KOIrPVFYvu/3KMy7qHECrMRpCQix/M/YkpLbAnp9lqyadEYwdpI5tk3SVK6OQR6+uIrsXcmpY471Npfq4UuTI1mrvDDjnkU8f+mQwo8cakHuU02DWh5w+PAcRaxBzwdDG7NZKTWy/vHn14jGI5o4e11BGyJYZks45wbMlNZ5xN32unCXTarMu6y27x3LkHvmny446e6TstBTFsiUuV+alvyZz+qM1X/lNzo6C5nY8s2fhF3L+6c0Ay8vPSq0lcbefUm2NZ5eeT8lYKSADKAsrBuRmSlYoi+eShI6w4zXXlUaER/Eege9hxOlH2vNICSl1zktsy8tzdJYzxc5v7Zlxvk0l1ybULeHNm4Qnm6m+kxBudRxjXYN5MoA4UTyn3DVV1iFv/plngdf/VrLe2etUzgjbSfkHi5BmJKlHkrM7O66qeUZFg7n1ioiM2OnyZJWJZc2MhLuWyJyzctYSe0YpGUaPxLz1RTSYyJ9IN8JiXJvUvL0gUtIKv4OoxSBcVPqkxukX6bWy555Bo4wiXTw/HeTVvdJLGc9Xc6FWw+jF/qz5xq2SPkX5UVd/p9YOWXGT625mj3lSJLq9IC3aSmsy3hrSo49rjadDK72w5fK7JuVTCR9PN0hYBD5r9HKnG+FC9OBM+6HS7y9mp5lL2TZ97qeudVlvd7pSPu382iT3rUVVKVKiliV0Xfu/uBRZqJnNLqx4+SqyR+1pdPyUYcWzM+U1S2skpillqph2ia628+jLSCF9mF4rixuN3PrMtINXroZipSSP2W3Qi9k9qeSxvDTnCW8tSRQ4anHTWTGPltcU2SdWMalKcV40yqTt7uBnkMTKOa/hzFKijnqx/VnCcQipIe5paFFWzFBGWI3sZZI1GuHTGs4M8exzkZyKE+588p/NSqzH/53cfWfm6d/PzWKfEC2stqUaJ+xZ7XwkUe69zt9LI9e6beC/dEVK1nsjhdkDZyOTrnUm6zQipTsDmX75SkkpdjezzwNtmsq0xyR3Nq5G4BOVYd8TT2t60+mtUA2ZPoEb9xiJtDZwflKKfvJbJudeh6i2uMRsdzNszTGtvtPPAKdvuj1qfivgXJ8/XFtQ8nf+qzJ6JFH4ydO1MhW+ShQn/64tqBApSs2B4qRkJDmTs+e61iK3NKdXr+M0IfFitWkpvnmIbZQlZ9A06iU9U9bQ9SXReBHPklS6mfPdAqUjnpavOV8RD2PtueD8PLX6D08nkX79k98ccPZ469ywfF8a1sc/W44hP6NmuUzWMinZcrKzfCtWIt+1StMK+c8BzDK2fUb1FTnnq4ud2dbpNE/y22dJx72/BJlcX0SIft0t95tkBmAfnv0FRPrA9bf830YyT8yZvWfqyZwrQGH6Ky3w3lxbYheto/ViiQx7cfhqkfcwrYXrErfRCw3Cdx6Veae2y6ic5suvMFWASuS+EL5Vqb/73OSVxiUsQb61ePLfgSYv/mtQkr8HbZEzIP9NKMlfhUZwv8JLvx45aVcnWOv97srwT/ptMKaaJ/9GwHXJK+y12nVd4DLPLcbvFtQ/7erk71ld51qSGlLtcF2XtMi92vG7XVq+eEbZWA93K9w6775W+q4zqx1N3liuSPlcJyfpdoxHe05+YY9r4ELiuPfbUiOefDakpDmZYgVKuUr6if/O9upUOVzCFaI92K3yNMxKuS+Di3hcSTfiXgGp+BLu13rpy72cTJppvtQz24qwLMOvIxWzLcuFjT2ZHssQuMpzZVLXK7JcJOX4WgrntiHpQvLuugrEYFmPuP+nxbRXOdwNcO3e/Rrpu/kZ7VgFF4RvWNqwEC4g/3YmCB1fg9QsX/PR/40Ib0aZFdKvi9GH12IcV0JCmiAbnbQcM7SLvkJb6Db6Km2jOxGjm3oQ6x66D/G204MoaQc9RGtoF9wttBvuVtoLt5b2wa2jJ+HW0356Hvn9Am4bHaR+5PRr+g39gN6hc7STPqBh2kMf0cf0I4rSBD0BKfwb/ZQ+h9v/H55FCAwAAHjarZRLa1NRFIW/k1c1bW2sMZagEqVKkVK0FKkiwWpapKYPYihSSmlI1YGhkTSigiiIzjpw4MwHgg7FH+Bc9Ac48nd0KNR17j3ptUVK0oTN3Yt7z15r733uORsDxHnNbyK5qXyRdPlJrcLwvdqd+2Qrpfoa80QUw9aWh4YQ4aa+DBGbWJzMMHR9omh9wfqZubx8YW5Gvli4Kb9bp1yq1EnfrZXKZKq11TWy6w8frJPzIvrke7czRonRxQEOqoNuerRiYw55Hg4zyDBXxMxTZIlVKtR5yks2eMM7PvPFizPqPiaM8oFNM21emG/euzF/fAyddbjgcMPhTx/DcYcFhx8dbvoYmXX41eEvH6MxhyN+HdFl9dWjzp7xiMf6FuYoKY4JbZX9wgHG9D/sm+GIoiOu6z5ZiCQnFHNK1rvnms8Ob+tZbTqmanUSWksx2pRmg+czLJeWeIa0nqSei94+Jtrso7HbhhGnt3cVOEZSK+e1n81xAl5KOKraL7fADNgDih5jXOf8aov8QCOts2/zZ7nG1D5UAqXjOtF+LTlu6N7tTyvQO6n73ahrmlkKbSgGqhnNjKDGeU2H223qBtqnNY3+rXeBRZY7oB5kGNS021n7Eiuabp3J4ecxnHOTlCZO//9vYKRpZr/Lm/Am+yS3vPluo6Eqi/Nc1u3Fp3bF2/qinNGewyveSu89n7jAd9k4P2SXFBHXU5WG0/8LrW5kcwB42mNgYfzFqMPAysDC1MUU8f8rgzeIZjBkjGMwYrTi4mDiZmNmZWBgYmBpYGB478CgUM2ABBgbGXh/MzEL/tdkYGCRYuJQYGCYDBJn4mZaC6QUGLgB3/INRQAAAHjaY2BgYGaAYBkGRgYQeAPkMYL5LAwXgLQBgwKQJQBk8TLUMfQxzGP4zxjMWMF0jOmOApeCiIKUgpyCkoKagr6ClUK8whpFJdU/v5n+/webxQvUC9KxgDEIqoNBQUBBQkEGqsMSroMRqIPx/7f/T/5f/X/s/9H/xf/9/zH9ffvg1IOjDw49OPhg34PdDzY/WPWg7YHV/aO33rC+gLqWJMDIxgDXxsgE9TeKAgYGFlY2dg5OLm4eXj5+AUEhYRFRMXEJSSlpGVk5eQVFJWUVVTV1DU0tbR1dPX0DQyNjE1MzcwtLK2sbWzt7B0cnZxdXN3cPTy9vH18//4DAoOCQ0LDwiMio6JjYuPiExCSGzq6evmmzFy5bunzlilVr1q1dv2HTxs1btu3YvnP3rv37DhxkKE3PyHlQvaQ473llLkP3XIYyBoasKrDr8usZVu9tSSsEsQsaHqa2dsw6euzGzbv3bt3ew3DkOMOzx09evmKouXOfob2/bULvpMlTJs6YyTB9/oJ5DCdOlgA11QIxAFPqkZQAAAACCwKtADIAVAAsAC8AMAAxADMANAA2ADkAKAA+ACwAMQA2ADkAPgBWADsAJQAqACECeXjaXVG7TltBEN0NDwOBxNggOdoUs5mQxnuhBQnE1Y1iZDuF5QhpN3KRi3EBH0CBRA3arxmgoaRImwYhF0h8Qj4hEjNriKI0Ozuzc86ZM0vKkap36WvPU+ckkMLdBs02/U5ItbMA96Tr642MtIMHWmxm9Mp1+/4LBpvRlDtqAOU9bykPGU07gVq0p/7R/AqG+/wf8zsYtDTT9NQ6CekhBOabcUuD7xnNussP+oLV4WIwMKSYpuIuP6ZS/rc052rLsLWR0byDMxH5yTRAU2ttBJr+1CHV83EUS5DLprE2mJiy/iQTwYXJdFVTtcz42sFdsrPoYIMqzYEH2MNWeQweDg8mFNK3JMosDRH2YqvECBGTHAo55dzJ/qRA+UgSxrxJSjvjhrUGxpHXwKA2T7P/PJtNbW8dwvhZHMF3vxlLOvjIhtoYEWI7YimACURCRlX5hhrPvSwG5FL7z0CUgOXxj3+dCLTu2EQ8l7V1DjFWCHp+29zyy4q7VrnOi0J3b6pqqNIpzftezr7HA54eC8NBY8Gbz/v+SoH6PCyuNGgOBEN6N3r/orXqiKu8Fz6yJ9O/sVoAAAAAAAAB//8AAnja3X0JeBvXcf++XWAXN7C4DxIgCJAgCZIgAZIgxFMUKYq6b+uwbEm2LMmWLeuwZbuub8dXfJ+JYyc9kjpplOwC9BHXaZg4ztE2TlqnatOmjXvks5m0SVpbkdVa4H/mvQUIgpSsOG6/fn8nWiwWBHZm3ry53rzfcjwX5TjSwn+SEziJa1cJl+rPSzr/v6dVUf/j/rzAwymnCnhZj5fzkhh4vz9P8HpGjsqJjByLEuPb3/42/8kzl0X5LRzHcwMzJ7m/5o9zRs7K7eDyBo5LTgo6zqtL5s08l1QsGaLYUgo5MSm6OY8uWTCLxJBULc5p1U6SSk/w5aHb3vNznqTJppgdimlKsTgU6xSnmqzt7YQeleEg4To6e7p6MmmvW4zVZ10ZYSDk8QaDXo80kOt3NIWCLcHXyc+KdRzSdB/Jk91AE/KZ5oABoEOfmeR0nEGXVHRpohhSCkcpMumSqpEkVZGTnSqvy+XgRq5sRsrAv/tM/ZHL4R/J/zf8B78bgh+Pwe+GuAhZzOWDwGve4w1kMpm8BPfIG8wWOJ/kSFCyJgu8XFMb92VUTpwuuH3+UNyXntTr6EeCIxzBj/TwkWg0WeEjotSllOAJNSBPKwGH6gWaPPJ0weDxgrQkuCilVAO8eByqGT6zyNNqlMlv4J1f/gLl9/LAD395DE+UoKPAByUX3IceRTzCjxaMAQOceB0Fk9cMJx5HweqxwB846FGmRzce8W989G/gW376LfjNUOl3akq/U4t/UwiX/jKC14VhBy8gUw4Zua6pDUfaq/6DAQUxD5FMNpbNaMLOSDH6L5aFf/SjkP6CwfX6Le3d7c/Bv3Vz3g0/N/jcC+2/bP8i/AcvL8B/7b+EsSdc3czlvCis4hLc61w+BiOkNGZUwTidjwmmZGE4FjcmlYZ03o464cyoPvjE7sNP7A74RIZxaEoplhNq0DYNPKsNIOu4Y1qJO1QHnMpwKjtUEU7rbNNqs6bB9763gQq+wVGwNzhAGHFHwRmXQTYxPOL1RrwuFOzOWKMmArUhKDsVU051xGVnQTD6QFtyqijDxXCOU32C7HyeIxa3pw6uo7i8mXRPd1djop10d/WAiCSvT2qM1Yset9cXJh63aCexbGNd05oD6y4a3HHJmiM7nR3O3f2xwX3L1vdt3bv++r1yp/w7q5vXXLC0cyDWsHFofDd5/ClrtnlgpLu9J9a0ZejCI7r77reBHPXcnTPTgoX/Gmfm7KDvCS7D3c3lG0CealI/DbYCTgL66cnOSINgTaqdcOoy0lOXfpooXTi/VIdzWnEwXRbhVHSoNXDaBKdNDrUdTuvBCnTDq9chO/OC3ZjL5dT2Jji3RhrgnFM7kzAt62vgcsAFZyKXA0m4qCHwoCVodBEfEdyaZEAWpOKzbMX1Oy9a0b/8oomhCR8fT575sTHZ0DGA/0ik9EGudIknGy+ZGNm0Z1VxjH+55sxS3p/KTIx0di4rDmkfLNYuoK0Zmzkp7OH3g4xi3AEuH0AJWQzTijGl1linFWdK8WRUlzCtRFOqYADRxKlojCCEmrRidKgRlA7oEmpaxIhysAQo70YLaAKXU2pkxZBTnE6lNqdGqRQiKIVsiVMJ2RzkYS5FpZiNIOODoCHA9NgfHhpd99KLe/b1XHbpBZFrRCKLlw5O33vb7QNPfPLCVTf++g9+MDa4/XbDkb2N6x65NJ3+weu3K+LBifWfxHkENpT7S2pD65kF1cwnUXTUdvI2bhnYTj1JahbzPs1SwnezM3eQJUIvZ+JcHFHMlGE9DLWF/nHWkfWJYBukdpL9efQvdydyA/9Nhor+d4qvv/icf9uXODqPHfAbNZW/wZ9QDeXf8PXIXYksKL1DctBf+Pml75A0/frB4teL8P3V5HbyCv8mB9rsyvoSGSnrk3xSQkpkV8uPGHoNj8hPXtK2eXPbbn5pd+8zz/R2N99Qd9ttdTfgvfdwD5A3yEnQ/fs4hQO7a85kVGKcVnl9Op3nCJoLzgTmwpjOEw7fEcHIHIslpQgnVJ1zumDUCWC5TTDOphQOt2rVjMWd77VQY2ECK20SwDoYHQW9UQfGwoBHvG7G60KB1xvMs/bSlS3ZyVh2j/iUq9f1FD2SpswnPwn/Z3KTZvZzT3IbOAvXhLRPijrOiKNmRcImjdQHqzbQNSPYF4Wgv/NlG7s1ZbITadRT4/UEveuefMRS467xu7zxO/F3R0iYrCDrQR+iVCbENI3/yurgRuUoq0NUGpEIL5FwVxd8NwcxwieAJiPXPTdCqDgnIKbZKEF7QVc3x/PnNK/PPD7S1TrzHPmxEAe6OB/YglZyW3vxxnHhCsf7j9FYYPHMSVLkXwI9qOVGubwF56csTOdFtGB+ARgIU/20g723M1uFaoaz0muHyWYRcS76wSqrBo7Nu0Ehk/a4JZ6aGLAw2R6cbTZhsSXWs2vwK2LTia07+29es8NtuLVzeXPQ8G7XgVt3jcykO4rP3n7ttx/7VE/mWwNbrr2Ijdc6OPwVzDMTt53Lm5A6g2la4dOUQEXKoO6j0muq00pVh29XpHaFd4BmnrYpkkMVzKc5RWgnBV6QDJrKEE4VDTDGOiAaNMcFqp8RMtI68fjSrwd+1rH6CbGL77289eYzd+EYgWkn74KcvNwIl+eQDrdpOm9BKUkoJV9K0VEpqX4QjV0H8vB4UTRujuqRIskFndFkp74qQy0Q2F0pwfTKxktRqUF8+w8GszsubLzy2NqLkpf/7gGy2pZ+4xub0r0b6y9dvzS9+6brd3WhTBphzH4FtDRyu7h8HGkRYMR8SIvTMD1pNsV94GjMIpCVSCniCTUKgxd1KMG6EzIbyBT6b7UJtEc1gZ7DnI2CTVXMslobzqExzbs9wVyu0q0mSbbkLUpUg0OlfhUGurF1+KrxLesnIhb/sksGujZvq7nk4PIda0fIwJLr9o4cXlu/YtuKwaWpC5eksyONq9aMLtrnFZwbe3ce6wR+moCpt6kOPsblrRg18sygWnngQ28A68KBdTHbwLroqD3RiWBPJLAn9pRiPYHRMoTFqmiGwXBMYyRC1SFz8i2qDqJDsU2BGijmKcUGxsQmghkxOwoGs4RmBKyIrRRzWKwY5wo4cDo2cCgC4hNmbUuTntg7Z96OpP1bxa2enOd4G/lHT3HgG9/IHD/OdLZ55iRP+C9yAe4mLu+n42PQdMUuTE86jX4L8OUUp/NGJ3JjRFtpBm6CdLQ8MDQhjYVb33NQFsztir0dMwDVYT6tx5loMZ8WOMUBOm222B0lM0jNFgynZ+7g1UsxVxRUrOz8m1uX7F6zY/y6xW3N5GJb8c3axUMrdt185a3j9UuuvHh8IkIm0m+HL9t8+H60EeOUn5c4D/i6/VzehRwFDFqUYwCNs4ZdGNpYJdC4GDUXXhgRL4tnHMBOHF5rvLJz0iBYXWaYA4pDVkQQcjiA5DrMGNkYQPZwURFkRU8NiTOTZhGcND9owaviuHrTukV1qf51d3m2X7Vs2217tly1aF3/xM6jqX3N/D+eILqW5vovPHb0ok03PH39ngs2X7f37qU9bjZG1wNPNWBXRPTfOtQ5dOKoZ4SmEjg1CGqAkGMGmyTI9SJ5Riz+fi/ZxN+QSZ05JvNH4bcELg7z8QzIx8WFuWbuKi4vo4R8MCcx7VETOBFbqFjcMPncDlWHsQxIKOJQg3Bqg6s2yO1wesbhcjyFflFNwkfBiOx8UeJln6W2PgFy49SED+NenclWW09tSbZr1j1J1ZFdQoRTnxbjxb94ydW7N+1/7O67rrzsyOCGFWv2TFz+6bHBbXeMD46v/ewDw9mdK3evG75mRd/lW67Zu6J32QUjHWNNubc6RuoW72/LjXHUX6yZ+RXPAa9ukNsFHFOBOoE6cTA4EM+pfkNJC0CnVY+T5mS1WhSHiuDhaFyv1Mp5wWmjsVydH0J8ziYy81gKYG1ESgySbIIFbZSnrMbLmrv2bD1wxfN3S0+/7OHr93etvLhvrL9zZ1w3MbJ8D3npykevu+Lubx5tSCWf+h2SSu/ZNDrW01lXv3XzIeQB/e33yY/A37qQhwovC/RPWjV/604p5hOTDpaViw6zITlJ6BuFpEr+10PQB4PJEAygwA4RzqxOmiTP+mTnPO8cmuOlye8xZ83T2ATpsoCXWcwpntSkQ6PFVxGdFGxGiJwmXYwC9DY2mPMqAUesuiBAVh2e3LywZZaIcgAzpFFREcjwbeW4YR/3CfJL3gPzQ+byPOGS5WmB06HBZyXSPpFcLRdfJA01ZDD92Y6HH2gDHrZxPyD/CLEx1haCpUgIgiBVj8GQIYXVBJrcgr+DWbVNJPvE4nGJ7JN+0NX1pS7q31ZzD5K/5s3s3sLce2fbSFYv6VeTieLf15BxsfjQ1+DGn01/Fu69D+bhD0A3Q+CtDzLPOBlhkRTPM5tFlMaU4jihmmXwiGmwp5O1bExrU2hcbZC/2ugZBjp6UNgEjrANpBqJg2P0ygWjmw/QiRiIoM7qbSGms5rKCh6I3EHwgwJzlbOC37fpmrGtHWOjHfpOQ/vISHt355blvKYN/I7t4z2dS5sa+1qcXmMgkh5tqM+1NDYvP/NXLcFQU4jNveUzGeGLwF87twgky+ZeFKTbmlITMAUdKcWYUdMizZx6U6oX7U4ftTtxG03RXcBMCiZkSkurwMj0a47mxlP/wopM3Q6lZ0oNGE8r/imu4A9096BvIeUzjJzUSArMklFweKOJllYqDUcCJnVzTu1Ny84XRAvnCsetmK9HweorEWqnuLIRTxE6pal6+gQRJ7YDhMV7cI5D9gOfNdDpPkRwsi8n1h9/8Xs3bE0tEXTedZ2LN9y6d9VEvdTUOLT9+CPf+NlXntm123Tl3udPkFiuM7XEEenoXLb7C/9Jal55/NmvdDWT5o4d6z72WFPx1z3Zp4ntmeLMX36yUJ9q+PZ3h4Z7I+/7fwdlO/NTULz/BH8gQVZzSIvwBF0mw6pjfGZSNHDEmkQJiyBrPctlIOQTZlOXr7e/8y0mRB1W6vSK4FD4KUxY9CbMX4x4BKdtwkBUbzTN5i4xknHFElEJItBYiHSvuL8vXvzndXuLq3j++JkNX/nKz8n9MKPGgVAf0GjjfFwdZAyMSggpmO8CMzzp9yGVzAZHU4oLNB2G3uxQdOhcauC8JqXqQK/rtXG/+73FNMDg2pW6doVzqHbLaaXOoRJ4sTsKPnsdEO7Ho/A8R+w+f91sjUr1QQagmHOKX1YlMIBKnRZNuzABKEeHiaoAMknGNz7zk2WjZGjs3nsPf+ziS5aPPSF+bM3G1Rv388ef7t8iC9bVi/Zcnd60um9x56ol3dQmjIG/bqYxSEaLQGymUgSCPttL9RyYVX3oug0wZSf1nOiQZz1KuRpU0rGxF27ZP5YYHN/76J41W8Zr1h+44g4SePXHw42Zrx+/7tpc8+ijbN6h3IdA7gawR9s0qRtLUpcx+nfSMBTthUuT6z3vLS/JVaZyNYJAZSpXocARo1wWogw2mwY8KDbvHIGNb7z1gcdfUVasfeDpY8dG+eN33fXa36W/+uXDV7AYBugiJ4EuM0Zlc6nSgS7oqcaqeiTQkirn13e/N16iTFemTMdGfG6qjSOu0xuMlVXJDI0jIRIWotL4RrLNVnw78o74Tj1JiPzx9Ey6+Ha6TNuvaN17J6MNZs7CpJlKBR/MZimFH3uvh1HoUMgU0KTopuaQVUCqqkgSkCQgaJOt+O91vxB/kQBqiifTxW9ourMEdCfA3cDlfVR3jLO6M+ly+iB6VWRWh3KzOFxTplCZpE5KkgxBuGNKr7otkFh6psDuedA4OmS3ZzatdKK/MHMY0mI9Si/mFlDBIQLjLFA1/Oq9Vy5vHLjgiqf3bdg8HP44+V7TniuuuovYv/NPow093/ryoWMN76aLf5J7WJMrv4GO+WeYXPMSll+YbPO8XsQKu2Aq2SpIDEt1F+TIibZAJWD7eTjFBBlOJTiFHFmveYSSntz13hAtmw/d8V6c5SCOgmDmIXUyOAo6gx4NGh7xugmvCwVBV2nUQJ+FKPyD1ANGpq+BjDT0bexrLv5pM3+8+NckeWYDWVtUGE/cCVpLG9J0RSjbXa2AgmYWzGmJdCS2UlUEMntLuNVGtJp0jsycmLmO+yeqh6MQ57OVDqpzOlZzm9W5rrLpFqYUvUMRYXQFERdZ8KgtskgQj8I9IDJtWdJnWN633LJu+9bAqjF++5k/uvjC6Ky9GKD8GLkVJV9i0MZI5fWZTEnrq7gyL8CVyhNapNC4c5GMkcSQx06yZLz4CiFLkVlyhCwqfqP4cHnufQ7ur+cmSnc3T88KVMRCEt4PLtHiHGcEJZg391QBTJUiVA4mzPi+1SRsgzve08NsUB3wqsC9XNyd2thJc/h0Uz5dwKdL0zaIvMzojFDXPJrjzL7zhFa4sYH0Vbt4GjJ2iHBsdhp78OyExR44p/JEb2UFC8WSY4maarbmmBHF/4HS9WRjAvxPFKS6x9fs1/18o9yj14n8fyw6yAd7UsDCv/MuEJz+e0+f+Ve+5t5i8Z9K8+ti4MdeqvOU7BatNTlYLcxJa2GSVguTkSushRFjrkSMYC4Tg0sRlBAJVHPifd4QCfduXP4+r6uJAxEP/+77vz6zgb9qy8+KP9Tq5fxVYKvM4ONBY43Uw5eslQc9nZ/SYLHRkodTy6sC8Oq04I0pDR4khxOrVwMqK/5j+bsP3P7F+w/dPHjxxise3LXuwIPE/J2fPvyxV3714B1XX/3Nl45c9VpJlxN0/ji4I1WW3AGW3EBNjWpASy6XS/dGB5oRGmg4NcX6+Hu75xp1xxSYcwdYEZORLv0Qg2m2jOEwyXNiiSQR4KS7C33ip3710N1X1jUe/n5hL3/8S4dvK54kA1M3Udn9AZWdi4twW0pZeKlOUYuyq6vMwoOa7KKYZ7shXhBMDtmIxQlRVi1WlKMP65pGUw6T1Wp5Sr401ugTC8n1wE5yx3Bb6tptlgM3Vcn30b9oEYYy7Q3k/lkxV8jZCpn1fSVvbi3ZDDdI2mKjkrZgaOehfFhB0lYH1T8MPbyapO9776IKSVsdinuqYLG6QdI2PIKkLTZ3qeAlY8HLgBzqZcUILNtwWcWQU9zynKBEcuFsKo/BFw4e2bPruSXP3tqQvPZbzx3mj29cs+FKW/GbpKv4F2TPHxyhtsEL+dj7MB713EYuX0ftEC4nUoaMrEhgOaH6YDR8bM2wVqsQiFjjEEx2dwjX9kD2ihMrqdqKn+ysXWjFr8K7+kplSW95se/aS25cWV7pu/nA2A0V63wrLh6fXeO7+Ggn0t4P4+Gi+cAmLi9y1G9oJSLTtKqT0myVXKReJK8X0ZDqeSNdLdfCrKWl4qNE/YluSoDvza5WRCFgibn6JfID2zdX9a3ir+/qOnMXfz3cexPYgM1wbyfG+A6qCZoFyOssoBNgiFy0vsKnVcmGyQircSdxYQVDOQvIEJRDdZeNehpp0WkJCbg4/VQ5ELRhR4GZKgrYXEhMWDWUqPhKLa4Fq9lGB04IwUgX3WjZCawsCBuCaReLYzYJi/py/CPPeXN9i2r+YdeVeZeHvFHssAYefJ78oNj2090o10GQ6zCVK/gmCeMXDoVKdMgVbTtQCWiBJsWv+97tK+myNGVTCNLPgZsgKi+VnTJaWZIhscGhozyxDRW/NwKG9TH+gBYDcMs4TkhTmw4WzI5jac7Q24IbMVBxMrtOmDHHG091/9c/lG5sL9345anbT/0bXtUrZnBUlilVFE/rQZYCl+dFCwrteYjAzBZ7ZcTsyrjKTgn/t2xRmv+XxWv413PTE6v4n0wArY/yV9J/G/jdZ55lccubICcPtQeNs1YXqxiKSDtGsDuEU3n0NTrqa2JEYDehE7WOiE8uuZ5/dextZckj/JvkajJQ/DfiLn6reD9ZVnyJyQUSKz5FbftGVgVD341yUXQsQjGcwOCwHJZ8/L29TGEMDsVIC+oYI4lGVBY8suiXw0UVPldinICSdw0/yL89UvxlfV8UQr9nye7ivuLPiRv5LKLxozS0a1ZPgrwOAzU0FoTWFZFTiVXjIXugRWLgN0uiWJaNSrxICsWvSOQesbiKXGrt5CcynWde6mI8ts18mfQJFtC3jbQapdfTahTRT5e6XLSlOWNVpM9yI72R5UbG00Iesg7NaKLYsXzd0elzYd6Rkdr2f1Z/6OJD+nXCjtb3/7uV3Xt45o/JV9namytLpOE2srZV8Nref8LOPg8AbQlK206kDaSPdMGsxphXyFBaxcpunIXo5NuxcUAAOiGcl5BOXpA0OrFrh4WOvmzGFctmhACl8rP717UK+tb3/4DRsYa3kzPCMCdyMRgDQuPvSaLjJF2yqhiOHiFEaxXSmrc7nhg8+jJ8tbP4/dOncSx/OXMf+dLM14BfX/UaqLbyKcGIyRJ5SbqmSxufML+f+2/+XfhOHacIKbytvWIVnXUglZZNfVLY/5qdn+raX49q0wP+5We8FzxmHXcvl3dytJ8KVy3pOUSE07R8qIa1cghHF1ewHo0rvNguJKbLlZA9p7qZkRRhbuun1BDkwzVgEPViqIYaxLyenlCTaPNgT4rTH6bFrzCWrw02zqFV5FlZCx0RlgKzs6FX1oUequfZIxvXdPFOt2OVsGb36KaBgVTLtnhjatGmG7/+9MutxbvNroBfbLKO293HLt+9atWKZcQZ+DTLLTA+5Pm3OAvI+A4uby5VgPTIp0di8aHzhGpgQSHl7JJTrWze0ohAtQJj/FRBsELOVvDhMQ/Hunvr7o2JkLnmFCHHgZ/lBauP2TEy5x2b5RhhQpgA3LqyQjnCTJTjIGns0kXpiw8MTHzi2Nra4fSm6zviO6/w8d+Vip944oJtn//2hO8Ljy8eepnqAI7j6zCOFbUdgzZyBsMH1nayC9Z2ep46sHY03LVk/dGV/WPD/pUbt1z+xiNqpjn56M0bt7Y391zD9If3gixtXJB7icXaiiHD1sCdgkaB3wBakiJKqHIZHFviDI5pMIQ0C6ihglYaQTFEqf27YK3E9u9S0W//9TtM9BAGeKawpUzvEUHsXjzm4Vghdn2Oy+s9XqZq9JWqmtGOqmZx+jEUMsiKCdfbnRjfm8p9Lj6XT4hV6Bmrm/Y8sGtLrql3b9qweu/YpoH+zuTOhnD7+pUHv/7si+PEL52pu+Layy5bvXLNyr9a95Q2n96EcXBxNdw+LX62lEYiaJieNLplXOczWmFQasvBvpv26fi0aDoMrz7ap2OTMUUTZcWudevkOZsdL7lpx06Q2fHZPp0wKQ1eaXlc7Pm9Q0s2qX9KVg6vGvWv2XrhlQOfeqyzfdV133v4pdHu9QcM2zd3JQYPPyVuHqlvvJn6zb+Y6SIvwJgGuUc4FmqagAMROZBcGdpSqOq86bQSpGOqDR3O/kVsoCBEMkypPpgjTlrBLegEAwyYhEeIUwsunxPHD48CVxAMTjotyIuCTjI4XV5fZRMfJLIwS6w5xYR5qlY9wJ6+ssbaCfoPG5G6xnvMg7ukXRb37YuGfd2ZpqRkvtd2+6Bt6YXPRleuIlOpjXfHWmqSqXWp4uI921rQFiRmMuRdzf79IfPg1PjZNJsHyTfrqYriUhZdV64vm4Qmxi4EpjVTqgzsOjBKLYj6GmAvhMc8nFeoZwisgh4mHbOGaBUq31FV9ZhZz4wquFlvFqgr+Gw0j4o5h16IFr7E2dq/jdQLFRqb8K5bfo/ftnrPkm1/eHjLmhH71V+SB9MtOxtjHf2bb/1Ua+sX912/b+eTL7UXmw4cIo+tWLF+1X+FnqX9N3B4C8bdxf1Qq4uZzC6si1HD6EDDOKcUAQ5AsaRp7cuYLpgkmyHJymNs7VUrTAztPTVeYTrhixgGgrL0MFdhdkAUqJgwHHp5aPepKFw1wx8VBBfaVice83Cssq1gTI0WpybFArxzliVodoGoHDnFhtkXpMHodCWahlEr63FLWNnA5W9JGNm7KHPRVVcIXbmMMLjzimb+Tan45FPXOn3Fe8iVftfqV4onmM+AmJv7V/6vwceasWOkXGEjtCCELEu66VKNUCtJYTXQ6J5WCJZq+Iqy4CWnEhW1KT3220H8qRhlCNxypSqVs6sHF73qBydyEz5/o9/fyJvPnOQ/Eff743663vLyTBf3U6DJyMlYvdYRmmEpxpQip1SrjtXUQWntQANdu8BiXam4vvOU7wOLdarejO1JYIMUu6xaHZS22fJdicKl4z2m8dxSmGbfpHQ+G102Tk4XnTDFhD0lcjX9ehf0y4s9KjROtXhL2uWUWAPQbN8D9sIaWC/QQmrkdVAH7EUl8eAxD8e5SoJq4SkrSLm4rDq84A30ZouNBh5OTvPCmVkvLPliCa1BAlWka9PN6aHtGw6NHPvK6KKbQg2oJY88s6hz8WWh6VPpG5bcuqX4DvA3OnOS+zvgT8YarI3mnAY2CA6a4oKQy2VKXEYkOPJGG0iXZzU4I1BOjRwGBOCJfSVX3N21dNuiCyHT8to9lpqGFRfyd0hnDhkNdsksNdtXWMvy5WfAlsVJHZPvpEMOhuJxX1lPqawhc1Oj0rSCDeENbGnTSZc2KW0OWtMGD6TU0KldCEphmNch+BMw9UFW58ak2JmmxRN7uuCwuuEvZHgDeucA5hq1Ibvi1F5W/tbGTqeE0FTalKBDCVTaANkBnkJxYJ748tDt74WoDYiDDYjztMEZhxeOVTZAsDsDNTHNBuSFQKw0wMEQLhlEsZ0Ai09mH6bdURjnvGS05rSqosRsQaVFwJir4mxkotOx4+qL+R0HdurAQOgCgYsvb6avOy9v4s2PPHPIb3vyams92oraQGMtGAt28rXij2btKcYCfzXXnlaOxgJ2tWIcztPElgW9sFUtSfSDrGqhZFPBBDhL1pRn1tQ0z5pmpHnWFAR20WHNmu66gsroGlfJllKplHKOUyAXKxfA+iyNv2VJi799KA62eMR6elDZqCEIwasbl4X05nJdsdwvyS9YoO0J9+8d2XbpA0e37ekfG9p09djgpkN/Nnh4V9/BS5946dDuNRufvHf1+seRpoaZDOQEXohjA9wlJZog6sGh0giDYIBLUdqw9M/Gp5I2XGTIC/YAC8/AwMg+amDMKDJbjhKcN1gFqoA+Jj4t5Bdcs0F/w2Wd9p0H+5ffd9HW/oa29o0rDnTEdx34Hv+3jzyzedvnv7Oy+F9kaONzTy4e+hMmywx5B+i2cH7snqfdnY5S3O014J4OogRYqRPoDGoKs+tUmGa+EuRp7ilVhNhFj9WIgkHCIqcLj3k4r9APV46b1IsGl7scuUilN1o+gy32WmGLBiaSa17W9vtHt6zZuah19Z6lmwcG0i0XNzZgUPL1p77afmaDgeSO7b9k1aq1K4kU+j1t/jwAvNm5GzWPa5+dOzQcNVumqxYUtLlTqkENXXZqgM2M0hywwxyw4xyw4TEPx7lzQBVsVP9t5dIYavogKffRoZY7W7el/W6n09a2rQvc8mcvWq/v1W0/WPx3aodNoN+PA92zNVsdaLejnF3G6Eq3H7Tbz3KfUs1WgiDveZ3Z4SnXbF24EKGjNVur01Wq2WKUP79oW1GzNTWEL2jpX9y9bGLx9rVbV9UNTaQXtY2tX7Jre8+VQ4lQY297QyYUWtrZv7y7JdW+rD0YmcgsXd8KtKeB9u38g5AZP82qAapVmwV0MUrl9NOqwYeVW8iR3eXlUAFXKuyz6fLWX/9zeTHKO6VX9bjWa4RkwAgqZtSXtv/giie4PS+r+hmM3tn8mFapWCcYHJkN4mSIZegCQjYzROgKOqueMh+ZdaXFXXWtrnsst3fyw/GUpzt3ROggP2m9WX9Ha/FzZudIsCV61Okha5i/XAW8/htvhpz521pN05ZhubNRYjOoXCv2lmvF6MbTBUHiDKxUDN7Qjv1jDmqrSlVjXznKci5QNd55yjtPKc12uk0Kj3k4ViilOUcryg6touzQDDPtjza6zlVRjmVpj9AqapBH9m9oz010Wpr3tPcOHAEpHCo+4Xeu/zQZP3Py+iWLh5lM2uHwryCTitoyOUdtufedx86vtuzKkFh7/w7+HwaLM0t4c7GFnDhzEn66F4zYN3hzVV2ZnLOuvOS/eheoK1/13qfm1pWF37yu3LsoSaYWZwUl9901Gf7FlUBoI/m7YoL86MxJ8v1iZ7muTL4NNM+tK5Nz1JVdiYwPu59dsURMqvvJTSO7+KeXvvrwyFGhQPzvvP76fxbf+o//oL/9H2DP/xl+24ZrJtTviMZMBn+Uw1Y0e0rRn6A1Aq1B++vd73ymnIXqpthSCUcXSUhpqQRMs77UhovRe0yrckMIbx/fHvUcGriI/9uh08krL3rWumoUeI6RfzjzzvbdNqDnXSDqs0BPRW0Z7AGmGiwtPo/askUkO4vvSmStWPwMiVpbyZc6W4vrmSy5zpkvk2HBwjVwb3DYVxXST9Oyp5FubzLoWbdhHGIjebrgd8Vh1kXkaSWSUv0y7Sys3LRgww59/ZTqFU5j9BN1FHRRzdZYvRaaKODOQ7hej9fzcKyYZ7ocpBAWPLPmuBd1eovV443Wl2oRZN4VOgvjEewWlXEWchh1uiLg/YlML6GdwqwcnIeEZQobsRPaSUqLbBIm8EME7Hin1NSsDxrGJ/QdSX1QH2shfSREGpL6oWF4JaOZxtY3hjtaa5t+2JIxC/bFNsMJ0Rz2tjal8cw0hHI8NvMF4hF8kJ+u4sr9Ho7ZzgjHbL/Hne+1MZvEtWPlG7sUBFr5JsJpvoBlyrJLp3GKcOxA+sBm4cr3H4X7uGG8YjBecbCZdKD0dDDCRtq3TDfmQU5hOqGGYLzsIROMl1eezQhuPnWmnHVap9R6AVsk4U1Br7PC+FjwqNQ7CoF6P7yN4jEPH1WMkiWXh8t4FtBGyR+oHqXKK3SUvDg02F7HqeEIW5t1yqrJSyMxOkZYPNGGozGWTVcOEw6cW9/Rog+Zx0k/HyRxOjJBUheTVphChmXrWmuaT2ySBXnA4PxheWTekKzR2syaE0N0LfRC4if/QK7jHFyGw9ksgMAM6YIo0Ige3jjSuPiPS/2cajNTew55OLwaUY8w/ijXZSFIvNA7EotcKrdHY6kV4b3wSjrqG9tag2NtdN2EZ2tCwjHac7DwqlDpZueYuULWl/VJsarFoX+pPXBL4P5waY1I2BpesSKyC+6JtuIL/Mm595xjLc7/nlVG488i+2/3PhAu2Q7+b8KbNkWuABYzM33cd8jf0rrMAQ7yoklJ6/e2oKks9XsLRj3ImXNS41LRbjp063vm0mQATzKlw44dGzqx8kQgKuFLZWRBK9XQiZEVeK0AksktWqQLtgaDra+R10zFTn5rS1DrAb9g5nLyS/45LsQ9z3ZuKt6MKovT+YCMy90BnzGp+NM02ADvgf3/ecGMnwg6+ARbZGsqcyFsVfc56GI/boDQw7SurVos90OA69exQqvo09NCKxpBuB7w09Y/QfQGSlGWD+uKck7V62h9EbIVGbeYcEaXu7QyMHcbMFVC3AXcTi6461Jnh3M0N7tEMDLh6JRXbXvjni+ZHnvU0FJaKUiJH7/fwPoZloBe1vIvcrXcs5qGhEArTbQVxjA9Keo5kxUCKx+EmqI4rUpuDDXDKey1plw+9N7HKmvMfkhcXPNrzMCr2+/CpRk80hqzyz9bY3a5ff45NeaQpo9s94GNVgiywLhWZ/ZWFJoleIlKS8QVJvdicbHT/WT7jtpk10RXVnK+Kr7qtAwQkrWmmzf9YerBz7bEI/09gw+mHt/dKHSx3LeP28vr+REuCNnBPi5vxKlRL8KAgg0VWW4gnFBrcOuuQ63DrT9ObesP3aCgww5huSCZPQG6A8ip2miEHPbhZjlIPZV6uUBsOid+agSbZ2Z7mBq7somsD1MFmFy4y8UnJTDxlJxub7qnq7G+b0OicX18Q/vi/s71DesSTesbNnT0D6c2LB69YXT0hvs2pO/t3BDfUF+/PrY+PbY0sza+ri66gaRuW7nytpU4rpuAuX7+OOQNn5iNpbV18EnZaedgVE24eAC6r1od6fSkx0sv8iJc9MBFo1vLKuxU28uphDbiECNDpop7fIxTBZPNCINrxSPGzg47TVrxKDyPsAAVealqw1U2X64c7QkVMABZCg+wafHHhL9b8vZV4p2GO8U7vf3eG8UbDTeKe/jjxeNkQ/F4ajT10ktwwPGb9bMS9wRHQ2JWDSgIPIJOcA5mYuCFaB3jEisV0N5QRzl0LnU3Uzcslt2wCH8IL5yjQDictaDYvIB77eCKrnRFwiswicBC6SANr3R1mssOEXDbLekWezKd3Ey2FT/Hu/Co9VbOfJW8BV9PcjncXeem+zqkaaUF6Mb8dBHtKWq1TRfkVgvwhC3vrQ41g7vp4WKiPmOg61SKmFITMFJ9qJ5YjTHZ6WLVsEkwugORllRnTy/qYcKp1jWglgZAh4Fq2etLdPZS80JXM2ZTWW27TVUTkrYlywXv2UasRGNCHK8bWdXV27pkzchApnfT6h2Q5K7q6Kbv09nta3aausfqLRt7Rt3BjZaWzlRDLBmMLO1sWeZtWjxAs96GWFswsqyzedzXNDiwgtxRnwnYxNax+u6AZG2lcgrz15AW/lUYaTuX4hQpBTqtCrppxZTGF5qawODr3bSyi+uZVjfNUmAQSrXxHu017I17vfHP0SN/X73XW/o/aNJV3KN8nv8b2hvfyN3K5WXqpK0UkMNipZvZIhBnBVOqR882pMJtTXYghHUv1kJEXMvyUL2d7klVa3F1U+Zp5f5FwSI5PL76OC1HReIwH+pzSlAeNnM6PTHZ7EanP4oD5cGJUqY9Vs/T0g1ufawclVIYctXn//Pzz91w/e8+sG//x+//QXx9f64lWJdozlyUaAy09Q2vJf3/+Xn4E3LfXz380A8ffm/ttmg8ODByc02scRtH9/xtBMPxE/4tut+7pdSLjd0O+WZ0h00ZVbJilDTZEOEka1IJZtQGEIMlpcoohiRtQEZ8h1ZtSh099UfMOSTQSqge42kwGXp4VzAk0GA04RG8gdHtSbAilgFPmyo8QQOGh4Gc0izndb5a3FJpkWj5Dj0CBChdPX0k21PewEuDRNrCWC51gdeo3yiRTVLxRwcPLdFLyWzviGnl2LJRY60Q0Mdr+d4Lu8f6ko2remzDv9/VRZ4bWd2YbvU3hZYOf9djqdHFdXV1o8Pd8cYVe0EHR7kRkJGBEyHb5FxDBBEGhng8jupfjXz2QGMreyGO5u8HXv+2/3X2wjGMgS+TN8iFnJ5bT3tj9Bm6kYwv4wuUEAVEtgtHhthDR2MPvqKbubQLg9YuBEVf2XyX3SOSfZ6snTR1Hb+e++328Ou4tdwZvpP/McSPTi4MGeFLbCZMClbuXl0STO2klZ3VpiYjVu6QLpmvjSC9tS5gJJiGzGPSQ/+CJo1ceY7gYksYTiNpJezA9VvVZ6cxVGnG4A41lwm3LeMWnLCsyhZ0pU61Bl2qT847rCEs69qdeUEK0u2WtVaqFkpELuhNAQ6nT4NTtfu0/lZa2aUaQSeQ6JNprdwXS8Q83awDdO3H/+y+e//ivqajX7j66i8cPbDy8OiFvRsjDSPLIuTnl95//6V77rlnz6Zrjn7x2LG/J7Y1/fajBw8+0pak/T5PEzv/Z7MyBu9JxEoZG+fAZoSln0n80ynqvw6TPyeP82/T3uhhDnNsO0wpD1h+/WxftDzbFy0v3Bc9HyWlsux+eOt4duXW0f7l2bZYW2+yvq2PnxjdvrR36daxRYnWwe5EcoDiJoDCIAaGAPb1sdnZj61OFjv2GRinVdGIG9b1dMO6DUbZmoZ8kDaKSvDOkKZGWKK4HQWrQQLHZHPi/kNahZOr4DBsEBHbEGDI6igYrRguWvCI1+02uo9dNFrsFbsvcMZXQGIspjstXxGfdC1yPSk+6Vzk7O5m0BgPPYT9rmSIHAF75uYG6bg49cyC61m3MWIbyLTFmNXuXO5cafmxCtvAVY1tIAIB/bpPXFJfO5StG9vSOXj5La+byVD8tmta/eHu0FhXctHvXN6C86+D9JJ9QEOcW8Mp9SnqRWCQTVbc28jcRwNtucUqig3DEz9Lz8vb3iOo6CZZDdXkMMDMO13+HKtlsAEu7UFbEMOgI9Yy0tmzvdbk6eha3jkYWLKqd3G6idS3bhhPriZHalPp1vFEW6IvWdeTScb6jYIhE+tfWffh+the87/O37e/6wL8bsNMN3mHN8OM+AnDC8C9SJKkLeDwJjOtJdaXtm1gQIZWwSbTbeMOFAQFXkqpDojlTDYXW2hTY+UFkwBzLRDVcVPwdSVK2xViGs4KNnOyNbco5F9RXGCow2MejtVtYYLRUhctt4VVvKNJpovHWoUfdQPXA5Qw1pMmbS5PqIaFTHN6hrWtsqzQm5Bo3aLhslxGmNi+rT3XajKmzaR+bzqetAm81fjn/IniEx7npmfIRPFbE50tbcbm3pBjcG2wjjjl7u1aDfjwjJFfRXunL2Q7ZCGGx1KcIqVpG5crVdEVzTooRdwIZ6PRq/G0Hts9sY2SA29BCqUQlfpXA2ZYnFWzHn1EwKZ43KTek3W1k8P33PzGlT37jqyxbpiQj8jN+/aTX2y97P37JWH1mZsuPxRqT99LVpKdQONOYuWmyBWIMoeRmbb3vAz0QsPyST0DemEv2q7pUmC2k+brpEnbrU31bybM/SvngCgMLKNDM4nOlGKkjiRvNFGgCYMR8XNor71VW8g3GbXkWSitgJXi2gTYDmYgw8Haen9oeU2LbWV/Z+bPG2W/t4Ec3mDsa8rgvY+A7cjyb4KfH+WwYVRzyNg3qgHYeVi2oKOdlTrsVmV1CswBWJ2C18+W3HEXrEs68nRzV3fbUf6htcWLyf5BmFlbwfBaacyFmFsrK6yulZbvlEBKlZDvGkqCQy7Da5lkWmugq3wFQbLybAc37s4z6XKz8dGCHmErDYjevHb3igtvuGj11uyi7Nj2/u6JCyD++adrHt6+7tpHdqwaXHzk8qGRYyxHaeEWk9d4icU9QwSSVzvRXlog3Llb/+rj7GXbbNADLzSuPDKjCsvBx4mciQtwJzV74Jvdh2y2+3EbiAPzUbMeTHIAnIydll3sshFbG0CB6EovGwWsomqVl4Ls84NpcNpn9zUuNDR62uPUfPK5UknG4Zfn9b6xkoyMIWmeDSKuUThcrDrDsldBx4Ae/PIkMZit6B8UWhSEqATCD061m2nPCNacRZhWikGrGDIFQOyyhqyrEntF04k+8uuWopm06453fPpOV6stq89aO638PqYpZz4m1Pnef/P5GKmXi6eOHk1edhlXlu1Vmmwj3B9rK+W1+vLeuEmf04zC9YEuoRDrKoWI8VZwFlbwrKKbFUhJqcuCsMsvEIPR7KFQdkrQqYYjNBzTxOCUC3a3J4jb5omPYaEY5PkSWcC/zpXL8mpvWyWZNfN8r8ClQDZLQTZxronLcm9x+R7Uu+6M0pxSu7Kga22ga+2doGttzahrbSnQtY70gm4aAlii9M7z1Ah30gNC7AZNTHX3gCZ2gCbmNHGW9K3HUWjvSYGCdTsKnd0doG9deMTrWbwuFNo7u7IlFevBzuvG5mQbCrRbVlsTKNC2ZpBeS45GBZMQFSQRo+BDxwUL6GGqKlQYXVkRKtzORqF+rnaSFWcLIIpPLaivPNc7kyGfIT+i2HlXcWjd3IZpJZbSQC1KWHmyrQy6aJanCx6x1pacjDK/0UAzbJCRzu4OsK1tuIBgduaN4RgGS1FZjdSjzGJuhLMwen3MUVMAi0RWg7Qol+9LHqi3Y3SsEsgihuAW/0jd0tqFcCzqto/zNcxdCQxrQThKsRbs54u24CijLcgfJdoCWGVpLuLCjuAr9jLqwne6dtSj7dBovkmj+fr/XZqZAbHlPpD2la8Ev12m/fM7ulZU0H6M0u7kfuf8aHeVaXf/9rSrdtZ/OZf6DAIOzmXglvvDx2oP3FLm4dldu8MrVpR52E15CJXrLefkASeMTZxWXOmCbAvgYh68CaVL4QGyVvsRsMZSIdnLbLhNVty5KkZ75q5/VXHcNBAZNNdGok0DwRFLOFxm/fcm2pLyMrYmptP4H6P8u0ACx89LAjCIwQxkbNOKl/FtBXPhpuYCoYsC7umCLuAB0XwEwvBgFZVgL7BOVr0heA04VV9w3rg3VlUX54rjaGWtsSSKxytrjiVZfIrKwkf3LJ2PLDypyZCV26JLKtHUpJ2eUQtqOaH67bSdCRtHjWmMjxQnW6NCsTScl1iYQPK83qSJw29huXFYzpvtHlp2ieJKrtOSq9aPs8SdcwWzIpdqzvS2t6aTNb5QJOQNRcvi+Vp7ti3e1tvaALFDxOeP4Rrq38PhTbrn0cU9ynAdFS4zByAEQsVJm8NCGPaFDS5Y05N6g6WMzOFOlZo0p37vlI16Z2e7Ymyn0hERLUS1iKfZCjiWKA14hA8LVicFTMaj8CIiiCCs3lx04xiJSlEfeFNXRoqiIKJCrIFcTD5nK34l/p7488RPxeJ/+Iv/dOE13EwXX4IWQXYZxsHYTJjiwTRyh9meISWemQMJg7M/rFWcuRIMDt3r7XWyMnMUwq4XbC53IBTD6rLilVUDRf5DUDollFNcct5bE6PQdB8IJ0O7I3BVqpw8tZMqfJmV+42YPjWyZMp70cE5YDPDul7Mp3wsudpqfqSMJUFOgq9Er/OBKC8QfskfOcqLAF6mCunlT6iLZEMiDDMX+X+V1knqEjVafcwllmk9Rj3iB9JaUTT4KGml/q+K3LdLDlCj2MscIM1fGM1jmgd4/NxUn4ftr1h+/9BMqQHcCSmJCDqaq+KQr7L0Vaz+/RxTr/FrrTT12jj1gE4JrKtvHjqMYSEcFeNCOCoC7WnTl/aomAnVlb6N9Vq8V1Jkds/MR3hPad49G7Q4raSQPIeFlE2gj5ibrmPdi4opkzfwtEOPIjxLJxhcMsNRMTKw5/n3NEk0dVSNBmw3JyXIftQ1AVeQmYLpgQpNuc4YKVwOou9wZEU5xrhK2xNuzuSNPKUGSztOtopoS9O+f7aCWDDoidbbr60lanQiBgioXLnVfw6dZgPWYkSJZ4pTyiyEiu1DQ1Q3bEDq9fRM0w5GsPYGZBcEAS4GX2fhAtyTWlZvFUqYKTArCGfGfYuWAOJUS9Mq700zlCf5BAIolKshpVq7uV3xtKO7wK2yHoqEgyhHvFnAsjsesQrvtXrgbQCPwou8YMYOu8Cc1gwPQkNKWjddCUkjSUKkBPCF6/lB8YJGCvP18aYAA/qKvCC+QCY6SBfifZGJ4jRCfhWLHSWckIshDrZzEe7yeQg1Sm0KcWUVX7rgcdbCmARFXDkqAZ9UAddENeCaAjE6/LQiVsauUT1B1rbslBX/Akg2rqqYthrZ5qb5UW0l0o0QmA1uBYZ5Q/2GD+za+IKoNzULod7Uaqs7BcHoD1IGzgP4Bsvv88FvPg1WYB4ADrlF823/N2hUwGrMp/ECzaeVaDxGaQyfhcbIQjTWVdAYOn8aqU2ZT+aNzMLMp3RzhS9jtO6mtCbwyQDzaFUaUpr6FmqDDQbWapRgD6CYz0JzBQt1c1lQa+tBl/3YNaDUnYuhKp1egLMqrZ7P4tZZvdZpPI5RHiPA5cGFuIQBacyoIbCp9dW84eJlrZu2R+BUbYDThrkc1wYwtzayOo5HOE/op+r+jvmM3l3hmuczuWqOjybcpdzHyQ/I3wOfrNqtPUrg0ocONh98uP6hq5uvfnjy1psbb7m1iR618b8LZNNCI5kYdxnD/cZWXO3ZGcbyoyA0tCaUgEl7DgTFVJeR6RdFwepwGnw1tMCHu7sgfMfVbeyxlQucyRvDTwS2S5LF7ayLjHaQJbIgGB/d3qPtYkqAMBobuzK5a754f0uis6v38ODKn4XqDjx4rb/higdXozDMv2u7fcnzr/zKfL3tpuHn7+/hs8bXilcbvvnSAz0stqT4PWArnJyX+9TZEHx854Xg4//oEHwKRofLQ2fGuUB80PJUA/m8ArZxHpgPP12O+/9/4/d7YGfn8ztVzh0Yv8eA38DZ+Q2eF7+hj5Zf73nwS612NcufYDZ7Ptdfq7DZjO8x4Bs7QF9ZmHNkPJpRvWDQatMlIPCziQG3IPrdtPiCUPF1cFo3K5z4RyMcv/u84KuqrWK1iD5XYRPny+mFqryFYivBnMDnfl20ALqSrYyuZP8N0JVUCYN6E8WmWwBnCdPfSqwlmmXM4i3xAqowX8YRxtxXw5rDKL9UOTNZaA5pgsBZcNJTgSXBC0OI2jV/VMqQH3vvc3PgQhk4KITNdPOuBhRqsjjLUTK6bdpIj5sVNbQ/KVtCmuuz7/zVQ3cfkH2Hvl/Ywx+/7kuHb3v0tambcL/RV2e6eBf/Fsj6Mxqua41hOt+O/kOEWKErRZTulNJQjnsjdBPutJLEBSnMn3rKO93kcmO2bkrtNJ9WOkCXBF1HJ9uCXzpjm9caZGdejLXj8klSnrT6auqbcc3OGKF+h1NrfKwPr13OG93sMRoUeGAWIjzMzykWtQuzgOHYULBkvMe0vEZdujnc0hLuGe7Zvnz9cG1fb2cu1tkZw2vdqVvcyyg0yLJx3vqdke5oV31t3BPs61zXtvKi9ubGgZ5IbzLZE67PhGuaa+panjjz3wgaImiYSe9SzJA4YqR8AGpSw1lQkxo/LGrS84iaFK3XwGzivzl6ElrscyAoXel/zX4OFCVyA4JH/Z+RQ1yTQ/1HLoeDr/lfP5ccxrD5qCSHk1QOCe7+D5RD01nk0Pxh5fAClUOs8cMAaWnO7BxSmHggfE1k/+3nEsToFQfCmzZxZVm8SWXRgXteFpQFtS8xsC9N6XwjnifhvCNdIaPOs8go/VvKqJ0pi9qYzFXJCi6ByYmel8yqspxzCG9502BkyFwTiTYPQrpTGzmXFNeVEx+dJsdXqRybQJKFD9AqVKpURo1DyJBMV4kPG14bISxorJSk0oIWvN09/eFE2liP6zD+HK7WqUKYNp6oyQ4aILDd2uchx+pw4Rxy3FwROZxzSs6JITQ5CkEqx1aul/v8B8mxJTXZwZa4elKTcW2JK1cpTsyi2uzTShvdEqGE0mrCTiWacLB+wpS6CJdGPJqEVBuHpiocb+noQT1LZEA+NVXax57Yo/Z0wJcS0dx5aeFZUtNzSPGWeQtg55LlwXlrYgLnmTkpmHgvfVpjP2olPq9RiWTUJMgumM5biNZ6CW8XpSd9XQ34nCafFeKgND2lTXUDVJ5NNvqUxhR2VkF00ZXGluwsCzDUQXzORpPsnJQsDaYkSsgnT+rE+rZOPM86C3a5JoKnblmpRTiQJKIk1NTWN6XwapeseHNK2ql051RJwMje7s6WLCK28JfaVHyVjzhkM7riYTm4ISUbq9eXwNQ8d9ywzeC6eWSNacv6oZX6Vb+L0GqrGLLa8IWu9LbhZesGuzouXa7Xb/oqWc6Q1m7deEnX9bVt0UWp/RRxbeuWrsRgX89gZuWS1vQVYTAOFg19DXH8whTHb+6aXAWU34dakxMM57Umlz2/NbkqXMCJNXPW5JZvqgQJzAiVS3LbzIc1H/EmxA2IkVdXftbTWVHyomdByavXUPImBZtcG2aNOXl7pK78ZMvfHCuPxgNnwcvbDkHRgph5ZBvF0qzm68rflq/nKV91Gpi2PfI/w9YOiHEWZquBtlaX+TpJ+YphBe7cfMXPwldDJV+R+tKA1UV/qwFj0ctZmMuy0GVh/uIsaNFp/L1K+YuDl3j63Bwig8mMWqdjpdS2KnYRvLEevG19mXMEZaDeljrhlNoCTpc+mjaMe7Rwp0mjrAYFeG1xqiiBDyuNef70LGIZrXCmZxn7OW4Un8ENyWKQ9uZL3HL2tDfMxfUl1AsD9gMpXLr6SRjGhSDvJF3puaCombhaNYCTayI3QXFpzzyJSHdl3D3Sod13Yh7u3gesI8656ULriIitF8dtBIisx7YSwD3jcM8x0HdcR5yoWEck57OOOOeeC6wf4s7MOFNLHTJ8L9XCM49TlgUOwQIG6J5DXD+8pmL9kJx7/dBM1w8NTuy6PY9lxDlk0mVEXpSEsy8jdlJlMQLF11buYTxzHxNduWaToZg6p7harpm7msuHcB5FEf2IPudHhDAgEZIxDJDKD/QLA4VhRqxfe2SfMYxmwuH2hqgH88uKBx/bF6XtlX4RoygHOnWzhZbrFBn/oDQ5fPiAO1qXBqc1W6kuxU7t4NzFzC2bOrcFBX7nhsSm9LB7Te/muvWH775m476+FYuWXmL1r0st2fnq9Q+0J4hXenTpctfqgCPlqlsTntj4x3/+l1ddPLHxrns6ug8Cv4hR9XPId1xgGU/PRXmLIsusXy4fwPMwnMfSC6C/xT8c+lvD/w76WwHGIcqaf/P6QJha6wAMkOLG2AIi2YXB4KqTpGpwuLGqzGgeWBz/ZDkfEjTMuHcpZlwtrsstgBoXXgg1LqKhxhX05mANTZDPBziOeswFwOMuATs1H0COHKQRwHw6V//mdE4CnaFaraRR81uSez3YtgXIXTRbtzgFdg5prePWLkhrdCFa6ytoZUG4gT319nypZU57AYK1WsMCNOe0EkOZ7jcp3c3ctRV0J3Ca1Yj4XMJ8BM/jcN6cruCnZSF+khX8RLRykhqtn8MP2zcdpM9Krz8nd9XFgQXYrK4KLMDv0pLy6zR+X6X8RoHjaxYYKRyopoxaC34hnq5iE8EJI266d0DjuJAwIGRnzI2t8GrCzUQQwd5KGbtPY7Lq05/vcM6LOhZguDJ9X0gh54YbMMZ7uLXkDb6L4rq4uG0VyC6l52G6UpP22ceMWk9MyuwplHqItEoPIccmLWsFvm5BMtlcbAuNandqbjkqiRrlJU5wV7N4mnbie7VtYl1df0oxXchnNGgXqod3wbjczHlgpjfg+iviXqh1pVEJSdOlfcheG4W0jQE5Fu2BmF5cf3WhqF806O1OkztAUxiLkz5Bps7O7GtILlg4fwN+osftL6Vh+IAFWDoEdeFMKrvpgaOhSHd7dmt/95+6A5sObfO6N13dQYfAcMh+TebOJ16SrrFf133n7mby+9LjxR/pn7x3RxOLvRg+3rvAXwARTM+NkBf8DRHyQv87CHkFo4tuxwC50wWFDwTLQ1O6AGDew2D4FwDN4+/TnqPw/4usAmVZ+T60rJ4Br7OQrDbTALskq5Mgq5oPllXtbyir8P+8rChqlRe3oj1vdPn8oZr4ecmKOr0FxHUV83kLSWxTua7OZPYqszWEO7fUUGjxjBoAZ1CX1mzQ2USIOWoI/EBoIWniinAMM1fqPlLoMMqYe/+DAvbpmG0M4c49CuCjAch8gIyrPdECwr6hwhEtqKNz16A1PMZ3ORvnXBiR0VVGZHR/JIiMOKeqUBlfg/lUhcwobNHmEsMtfoviFn+hAre4ArJY4dleVveJElSxtqO9RmtYRuAz1WbRNq3uOhXEgSsINp5iLOHRTo8BPObhSsUI2hGHjyHyC1abPVCC4aNPOym/LzGN4QTtIvLNeeLJHPjjOxZlLr5yHvyxcByB+asBkAVtfF4F/r1cGJ9gUz1CCN1am1GdMBcCadq7x4YL96ojxLzbTVujcHtvjZu28Z33IKpuR+mx5TV+mTnusw1rtWpWDfEXKtRy3lBX12JGZ04Ke/iXOD8Xx51/bo49Qjfvpcv3Rhh8un+j1L1bb5yetNi9tHtXKC/DBkAEAbaeb6Iw7rgMq0YCkHjrBYPbK1OjZsf4jwtgqdiiPYSaNYBFpSjCiGWkmCjBeXVMOPrlO+Ix8ke2YmE5+Zr4Vd9+BPK7KN5w1Y2DF67bc9e2Ffvvo21g6eWP+szpVy5Mmx+84+ChV184cui1ch4l7OS9XIRLcl3Yp1+L9s6fUWMS7kZjhSdTRm2Gt+n0pKO1Vo87urH+2E35q7PRPhhkCjext6ZxHzsuNSAMNm6hbazD2kwtbmaVVQn3WqWceZMHN7UqVlw94FRHDPe+erwMjrkVn8KiNDvz1kYpNxsR+yg2Y9UKQrU8ygsINDL7eEP0uiWjmwullYPRXZ7xuyqiZXIzq9PRMO2uwQlaoNt2QVdicGzojnLUvL78yBaQF+uVGaPPgghgR0pVtww+WBKkZ9WVn87LWmcKfoPZlqSPiJAYJIbPPWsjzrufpmCx0jUEfE6EwJ+ltaZ6L0NFm03znH0Ms+025HRVn2SYv4IM0dpckqO4RZkyTIhEYUIENz5zS3velqg9b0tzvmHmabWam4Y5cieZgFzSzvVzeSt95qqIQBdsDplEnBkaBvGkgf00AnypehN7Ogsvs67IqqQvXF3cmK1lVGIkcXMhkH6Lz5rgs7foZ2d7bhh+pQmfG8a+wr7D/815fId/bvY7V/Me7iT/C8jKElzeRDgKuWHS8DZh2kluiq3JED71NMHqogCSFA7patfKxpwj2OLnB93hm+41+10BH8PeOAq/e7r0u4j/PCnO/q4Ankv7XYMwWzpGsDiG1HqU/qhrJe9hv+mEX2e/65o5xD3FLYffbUAeP/BXfRW/6tJ+9cE5P8qjDMhDlFYft5RJQfFkNEFQffGXZIGTCmMpl5vhKGliUSwwTRDL0YU9uFVCyi4ksKcXkJxzjgx57jDQ9cgsXfQpdJaMxrIiM7oY1/jULTvzfpQuTQA4fS0+XHPARy5VCTlTcX5YE801Cwi+Qlo8yp9kqPzxWbwYjfyWFPnOQpGriqIHFySI6sRe7hckR75aiR1j0s0qchk7xsSwY0zzsGP2DmwZGNhCWrb09W/pY/Y3N3OS/y63AeyvCyJ07VmQqrMmk9EwaVSrL52mV8sgNWF6I5GVLSAcMZPkpIO9c9ANZpNBVsaI0Lv30Oo2BkwLneVCHm8w6PWcqXp1UMSAUMWRygBx5ZIUV87LVZhOo2Y6YeQZ1tzoXHg5+t0W+K5c9V1d5XfnArVsL0OzwHebQU6dELvE8SkbURqwlPBf7RCncCRqsiJWC/gPDNgmRT294M6oogF329LwRTqhOtljZlSnJDvzHh/DZONqKF5S6ZFhSEimBxE+Kx7fEMWIBcIWtNYS9dXNzlFiWOUcq3v84jX90Y7ciqMhoncWDWRa/lvjA8vHjcuWbD4svt/Z2dZ57M6mZN3e3Z2t6c432vobbrmLzrulpEMg/BdBn/zcxzi2kdBowYclWKcVoYy2Jxqx9oa7pgLsobeOyofe5kUKciYShP1ly0psS7XiowUtOxcAvTCmJn3szE/D10krfUefw+xADFiThVW1uoFPOSaHSIY9a7KxW4gJME2AVsMNqddduQP7F7naTfze5OW8kb+9uZlBnZIbiz8loeIdX2u5oPhvxLOu82swZhzFDLKClie0FQ5cwijhcjGHW/K7zG90ylEZv3LmndLz5P4dcpRa7musx1TxZtiCkFl7rlxecnsy7MlyeZ0/kE6nIYWlE8RHnwdVhv+tesRckML/lhc+9IrPgXjiXvqgwCpM4KCj4A4iJnAgWMYEDtJkZdjEQIE9/kCwvX3O7jMEBEaUP7NM9an88LlZhbKTKIQ2c54/ZzavWrl8mS83nuqUTCQ0kRv554pn0C1fuTTWGm7LQsZJfqw9h47KiJdARgnuL7Q+XCfIpqZSSKpUV3r4XgwElEhhJ2FF0+AcycRBMhGQzI5fF2mWF3AowSnVbsGHws+DS447CnXxCH3SUgRF86JggNQtGImXYdWHLSgierEuFm9vrxKTE7t1PTlVTNCypWqu0SbgXIFlBbEUJLEWpnmP7jObV68dGu7brnOwJ11tsa/rX5xJS6a5z/FbvmosYDpzS41Xarbv5YeDIM3SI/3+H/0GcvQAeNpjYGRgYGBicGJ/wi0Wz2/zlUGe+QVQhOH8GtY1MPr/rv+czGuY5wDVcQAxEAAAS4IMbnjaY2BkYGCR+vuDgYH5z/9d/3uZ1zCkMPAxIIPXALYPCGUAAHjabZPNS5RRFMafc25TIpQxfaBODRNpTpI1NjYqzpjORzMI4weMfVHQotBQIpzoA9oE5cYWEgQRbYvmPxiClrUSaVOL2rgRlxK0iJBuz319HSZx4Mdz3nvPeeee87xXZnEM/EmRNNdIyUssaAwhEjFP8cxMICe7sCA59JL9UsUo924xd4/MI03t1wac4towmSDt5ASJkpMkTx6RNjLm8l0t42lylYxqENNmAyN61K7qReZ3IKf3kZcNssrnGT4/Z9xEWu03DVG/Im8CiOgr7r/jftzXDDWEw7KOpM5jUo9g0DSjoMauqKBH/ti/7KOLZx6itlDHtMGuSwvCOoCEDrHf79RhEkRCMnZJ0+jQJHsNYFB22w8Kxo3ImhLSmiLnvLp2VyMz3PuMRrmNs1wvyhec1ir65JNdkWX7U97aX/zfbnmMB9SD7P+adya3vulBnGuXSIYMkEmX6+YoBYRNBHf0Mko8d9bzgR7oE4xLF88fw5zzQRaRJDGvpxTP9R5zfO8NUYS5Xmb9FdZ30t+yzxn22ufNfwdMwP5wnnh+1NNUI07O60O01vzYTgw3PXWe1ENP9DhrRuxHb/47YJI45HkS/B/6kfI8CaCNdGuUs9vyYzuclR8X63GeOO+cmll6+oI57ju5zllNkWXAvKEvW9rDS7NGXvuUSZXEuefugw/nG9XfiMo+3CX3yAGpMK7QiwrjRUyZAvpdrZSQJZ3uve7O0I8Lupdxgt9er136B7RIrOIAAHjaY2Bg0ILDEoYFjEVMYkyrmMWYTZjDmMuYpzB/YpFjsWHJYqliOcXKxxrCuodNha2H7Ru7DPsk9i8cDhxtHIs4jnA84Azg/McVwHWOm4c7gnsZ9xueIJ49PK94VXhTeGfxMfE58XXxPeC3418hwCbgIrBJ4I2gm2CF4C7BV0IaQhZCNUILhHYJ3RAOEt4j/EOkQeSRaIToPbEcsW3ifOJ14vsk2iSFJGMkd0ipSTVJPZAOk34gIyFTJLNA5oWshOwe2Q9yPXJH5P7JWwBhh4KAwgSFP4oFipeU0pRmKYspr1A+psKgIqeySeWCqphqneoBNTk1G7VH6ibqcepz1C9oqGg4aXzQrNPy0Nqizaedo31Ox0/nim6a7jU9L70Fet/0A/RPGbAY2Bk0GNwxDDLcY8RnlGC0zVjDeI7xNhMVkzmmIqYTzNTMSsxumBeZf7OosmSwXGLlYfXBeoGNkE2dzSvbKNs3dhp2SXYL7BnsKxx0HBocrjkaOa5yUnEqc3rmXOMi5LLGNcN1h5uF2yZ3Ffc9HgYeER6TcMAFHus89nhc8/jgKePp4Vnkuc+LwyvIq8brChB+8hYAwirvVz5cPnN8nQBDmZaUAAAAAQAAAOsAPQAFAAAAAAACAAEAAgAWAAABAAFBAAAAAHjalVPLThRBFD093aJENOCCGMOiFoRAMrTMOJFH3EDz1EETnMjGTcO044R5kJ4hBj7EJUvWLPkE5QNcumLpR3Dq9p2B1umAqVTVqVv3nnvrVBWAZ/gNF443DOCMPcEOJrlKcA4juFTs4jt+KfZQdBqKH+CFc6p4CHnnQvFDtJwrxY9Qye0oHsZ6rsf/GG9yfxSPIO9OK36Cz25F8VNU3HPFo3jueYrHiCcU/8C4V1L8E3PeW6yijhp7l/0EEaow7CHXIdE+2jjEMWLx+kqrwTStM5yLmEOB46yiV8jTWqFXxHmbkSeMarBZpoDrmFx2DCVbGy3aQ45ViYvoGeGL2OvMYaM+wscy+zotsVpsRIfoA2MMyv3KtqTmhsQGRDFbm6vOP7kjbGAPO5jCGnNHwndIzwgH7DGakqPFzBtYYo7s7AE2yRHgnfit4EhOXBV1fKpidTF9fe5zCpM6xyepp9NX64a1x9Vjsjw3LLMpluy8dcF2pyseVo2maHdAW5u38b836v+lvRmgvlH9DW/A3HEHRm7hPpx3c1llutxZwku2b9J8efPZMb78gWZG7H6qrp5vWVRPOJMfdSSv3PJapRM9l8kW0i9ZpWPsTxp894PrCG9x+aJKjbuNFGeHljLfRUCV3vMlrMnPtZxZ7yPrVe6SbU9/qt0rCMuunnWbfsdS74LszbPWIhY5FvC6/xtK17f01WF42m3QR2xTQRDG8f8kjp04vfdC7+D3HCc23U5seu+dQBLbEJLgYCC0gOhVICRuINoFEJ0AAgEHQPQmioADZ7o4AOIGDm+5sdLqp9lZfbNaouD3r8huRed/6xNIlESLiWhMxGDGQixxWIkngUSSSCaFVNJIJ4NMssgmh1zyyKeAQooopoR2tKcDHelEZ7rQlW50pwc96UVv+mBDi0y3U4qDMspx4qIv/ejPAAYyiMG48VBBJV58DGEowxjOCEYyitGMYSzjGM8EJjKJyUxhKtOYzgxmMovZzGEuVRIjZrFwhA1s5Br7eM8mdrGd/RzjqMSyjbesZ6/EiZWdEs8WbvJOEjjAcX7wnZ8c5iT3uMMp5jGf3VTzgBrucp8nPOQRj/lALc95yjNO4+cbe3jFC14SiPziF7aygCALWUQd9RykgcU0EqKJMEtYyjI+spwVNLOS1aziModoYQ1rWcdnvnKFM5zlKq95I4mSJMmSIqmSJumSIZmSJdmSI7mSxznOc5FL3OICrdxmMyckn+vckAIpZIcUSbGUmP11zY0BzUC3hOuDNput0tDpNXQp3Tal6nvUfY9d6VC62tQjQUpNqSvtylKlQ1mmLFc6lf/y3IaaytU0a23QHw7VVFc1BYwj3Wfo8Jm84VDD38Lhq2jT5zHeEVH/Awwko1Z42j3OuwrCQBAF0N1ssnka8yrSKLGUrQXtTUCCKFZZsBb8AVttLLXwSyZWYuWfxUHGdPdcBua+eHcFfmM1ONum5fyu20qqZgKRriHbYbjoEUi1bxiIogShlmAW5VPkhvrBQphjgkRYH4KNkA+Cg7APBBfhbAgewl0TfIQ3JwQIf0YYIAJ6yiGkKQm24dFQrahOyBiZrHpGyHjRc4iMpj3Tonyz8NyxvsnwIM3/1JCpL9c1UVIAAVOGVSwAAA==) format('woff');
-}
-
-@font-face {
-font-family: Fira;
-font-style: normal;
-font-weight: 400; /* "Regular" */
-font-stretch: normal;
-    src: url(data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAGWIABMAAAAA6JwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABqAAAABwAAAAcafiXYEdERUYAAAHEAAAAHgAAACABGAAER1BPUwAAAeQAAA2GAABEdIU+i5xHU1VCAAAPbAAAAh8AAAb2Y6MJv09TLzIAABGMAAAAWAAAAGC80vl9Y21hcAAAEeQAAAGTAAAB8kpEps1jdnQgAAATeAAAADQAAAA0Bf8IO2ZwZ20AABOsAAABsQAAAmVTtC+nZ2FzcAAAFWAAAAAIAAAACP//AANnbHlmAAAVaAAARzQAAIgA1kIwZmhlYWQAAFycAAAANAAAADYCJ087aGhlYQAAXNAAAAAgAAAAJAe4AqRobXR4AABc8AAAAiAAAAOs2PUwRGxvY2EAAF8QAAABygAAAdh3HZbWbWF4cAAAYNwAAAAgAAAAIAIIAZBuYW1lAABg/AAAAeUAAATAe2aa+3Bvc3QAAGLkAAAB9QAAAu6b+3zWcHJlcAAAZNwAAAChAAABBky+tBJ3ZWJmAABlgAAAAAYAAAAGVSxThgAAAAEAAAAAzD2izwAAAADODu7mAAAAAM+sBap42mNgZGBg4ANiCQYQYGJgBMJXQMwC5jEAAA5YAR0AAHja1ZxbcFXVGce/E3JCCJBoeiD3kIRrTdUKomipCglIRKtC8ILTanHUzsgwDHWYsfXBFwQvD53OdIIQq7YWL1TMTBuBAEXtEclLHhofDjUx5rSdM2X2TOe87M6wp939f2uvc9lnry855+REp3vNb1/WfX3rW7fvEChERFX0PB2h8u7Nd/dS4+PP7ttNq57a98TTdNPuHz+zh7qpHHHIdakMj9CUX6uoYsPOTW20qmtDL9+38f2ee+/Gfdu99+Deu20r7lkpyh7f+9O9VP30E/v2UET5kLojhCqoWn2HEMKx59C68H/brsN3FYXhquAbpuV0G8IO0FFqpNfot3QDfQq3jj6Du4VC4R+pOq6mPaF3QidCF0OXQxfLyss6yn5SdqJsbE7jnDvKT5R/Hq4OVyMULhxBvIv4XsF+4RvDt+L7Mocq7lC+1V58db/MOXKK0EX6AVW6FjW6CWoGS91BWo7vlXjvBGvAWnAz/Na5b9IteN7qRul77jitx/v33X7ahOediLMF9IC73DhtxXM72AEecpO0E36PIN4P8XwKfgfw/gI4CA6BF8FL4GXwCsL7wGHwKjgCjoLXwK8R/jp4A7wJfoPyf4fnMfA2eAe8C94Dx8HvkeZ9cAJ8AAbAIDgJToHTYAicAefAJ6hfFHyK9wvgM+T/VzdGX4Bx8CX4J8IvgxBtRS9X0CLEW4zvOrSzwbWpCXFaXIcqKQKfRe5xhDpUj5BGfDchZjOeLagdp7UQmkBaC2kdhI6otHPpKsSpVfEt6sJzDEyASXA11SCXq/FWr9KlcraQs63StyG8HXSAXQjbj2c/OAti+L6kc7FRjo1ybNTERk1s3YIkcrCRg40cbJRvIwcbOdjIwUZdbNTFRl1smp+uaR3a7dWH68L1SARqXqPL9FIsUnKwc8pK5pSVST0vK6VXyxb3SqCMR1DGKGL2Q0JxxO7X/fBvtO8KankFtYxpqbHELOSSpFbUdgloQ9p20AGW43slpNkJ1oC1oCut8RY03oLGW9B2i+5HHtvAdrz34rkDzwfwfBB5PIznLqX5Fu3D937k/TP4PadGQgIjIYGRkMBISGAkJDASEhgJCYwEByPBwUhwMBIcjAQHI8GBbEYxGpxpNN+C5lvQfAuab0HzLWi+RR+i3JN4ngKnwRA4A84iz3N4/gnh58FH4GPwKcq5AP8Y6n8JjKH9E+Ar1G8ST3+f1Ol+ye2TasSKIlZU61lSxaxXIyaJfkj1Jvd/FCmjSBlFyihGGYeUow1RtCGKNoyivlHMrNW0nproZkrQfSqWpe7e2HFQlqNr4iA/B/k5yM9BnNWYhRdAE6/CCKjFCF5MdVRPDZiLm6iZWqiVllAbtVMHZuTbqYs20120nXrpQXqYHqVdtI/203PUT2/RSTpFp2mIztBZOkd/phhdojGaoK9okkKNjWoWX0Adc5+pbK1cN+8v83cv2L/wq+qhuu761oa9oc/VzGuCZ2MTzQI8a5vgmdzESqXXQToF1gisFeDVwgSvICZ4VTHBK40JXn1M8IpkglcpEzyOTfBqZmKLQI8Ar4QmeHU0sV1ghwCvrCZ4tTXBK7AJXpVN8EptgldvEy8IHBQ4JPCiwEsCLwu8oubQIH0ChwVeFTgicFTgNQHe1Zh4XeANgTcFeJdkgtcPE8cE3hZ4R+BdgfcEjgvwLs7E+wInBD4QGBAYFDgpcErgtMCQwBmBcwK8azURFeDdrYkLArwLNsE7YxNfCIwLfCnAO20TlwWuUXsRE7UCvGsw0aX3MLmMCUwITApUpPfdXTn76SfV3t4E7/dN8J7bRIPezefSqHZcQSRZ8JnCBJ8zTPDZw0S7QIfALrVrDsJnGRP9AmcF+Bxk4pLAk+rsYuIqgVqBRQKLBaSebFK9FqRNn6lyaRfoEOgS2C/QL3BWYExgQmBSYGPB457PqibksZQ00qR6IQiffU3M9ryycwodLUxCiwRaVOuClE7nzBIqnc6VRtI3FSFR86iXRjHbNkzMsg6VdSj7iQm2qZi4Wq1OQdj2YoLtMSbYRmOC7TYm6gTq1UgOIq+IlpFmgRbVO0HYhmRiiQDbmky0C3QIsJ3KBNuuTHQKrBFYK8C2MBPyudrMFoEega0CbIMzsU2AbXUm2H5ngm16JtjOZ4JtfybYHmhil9r1BGG7oQm2JZpg+6IJtjmaYDukiQMCLwgcFDgk8KLASwIvC7Cd1ESfwGGBVwWOCBwVYPusCbbZmvj/OYebeV/ghMAHAgMCgwJsyzbB9m0TpwROCwwJnBFgG7oJtqubYFu7ifMCHwl8LMC2exNszzcRU6eiIJcE+LcAExMC/JuBCf4dwUTp9lh1AtLea7b36b3q9xATtQLymTFpRGpxvbIYBJFOOI1qfxRE3rWazwf8u46JMYEJgUmBa9SvPiZqBeS+d4yMCUwITAqU0RyqgiOKUAuF6C24+VTW8Tn/XrRkS3uE7oLmkzvqjru2O+Im4WxgseRpGd4TroMvHgkJ7JuHKYy4cYaKvDh/3BN+P3V3VKij4bokvTB8c71sL15BpTnqPu7GXLa3+HzTZTeoZ9wdxr69RNfUNfVa46tlzUzLQvtYZp4M+c3zTWTH8iSKc8K4ewjtTQALdz61J6aWIWbsErZ/2tTcF+PKJWghzyVaL22qStUUYSPuiK9HW/V7Il16ldIdx1jGoCpjEHIb4hK190LEHwVxbjHyD7vH8YzCbyBTWnZPBiSVLIH2ODNIm1CjJhaspRpXqTGWyO4j+MTTIzMJqSRNfSmNP7+vOx6QSNzvw1qqx2XcfUaVGM9NHSzJK91fb57XCtO0/OYQXTvbN14dCutR5M1Ptg6xdCvVvJUl66RfQ6YrF9o8BBIgBs3kJ8+82qkYw3CjrNXeiEScGC2FZh6DHAego8NIY0Ei5zmuznOklLpYzKhW84yWBupqez3IGqDmKSc1M6XnKK+9EUjhOMJ53vb6vEbNcIngqPPplpWqr0qVDPZl2sdJ91INUg17Es3MG9ONRcQe0TMo592g1isn0yIt/1HVY5mcIlpr8pqjsnQjypJQ7+dRBsvRUlJMejM9wnk+TKTmIMSIYZ4fcftQwyFOrSQScQdSM7l/nPrWphGkycgrnD0DiBpSpdPmNfupGlnuYJaOpNox7s3f8IkpeaZqG/Pe9T2Z3Q96vFlTaWdOWCutz4nQ4Ov19Xo9rlIhreotko5RRau8flQhDfheL6/z06zauetqVREjzJrB6LZnZ32aSZ2ytSKviJuz3tdrHZIl7/XVDirZlVvLmazevmvpjGtmqRWhmKumNH04nazSZTlfn/YWW/Npx3IykMLxhdtTSsHrr/HipK7Wr5y9jaG+DYWNUV7P8pO6Yb92xb8rLVLsDYXrRmbvVWC6qH8FM8onEiirOM0dzaOeNTnaNDp9u4wxqgofKerM/7VeU4yupN5VxWdztSlsBlC7kLxkmnuaKuwsV7LKhwX/VhVW44sXTodE0usleWcP7D6T/pmQ5yzVSludlzP+sZLL/z+ZswLvoM26U6wuoB2x7LRfl/6j1Cv5j073l+6/SlKqd/qx6Ju6GkqwOxzOnhEy56yp9KfoPhryff/DHYQGDivNH/SvIN/8fJlXexK5EvNOzulT83hw/OoTWmLqWS0v+0o8e3dg3lmpslT/so1optLJsjHEZ7VXnMx+ZTp7WeH7FOzmz6XmWO+knHfKY1K/5DOfZHaysyS1eMYeoiwVyXz7l21EBeyEcm1EBc1/nk2tkPOwZyPKbmceO26nuPXHsxGl3vNZf9O2lT6pXlPbiIqbi2ayrupfhIZUa9lCdN7UByU6FUZodQGxW6cMiZR0tDxWgE6wDW1WZ7ysGeY4VsS+9K53ZLoV2aSh02mH+5jaeUcxX1iZ1VaYZ3N+Y8z6tSiZOaOmaqntiF8Efq+IZ1ai/FeB4mxCysLtZORinnf9s5b3W45hH5zMlWuprSXuwAwzWD2D0OC1Na3zcchkJKhValaMq/l/RD7v+mzLySl1M0SV9DdaoL+2qHsPdVE3IJqn4/C1RH3Po41wPcrdqUPL4DuHyvWZq5oqaC5y5dhVYD5yXwjf1F+QfkuXQqqExci3Dk/vL0q9i/+qlNTflXKZ3t+WsiVxGS3HfYVO342cpGsT2Kjfe7L8U36bjanmqH9r4LnUNU+32nM9oFq7WrwvQf0zrl79Zazn+GqCS7XDcz2qRd61FO9LVctrp9WLbrgNcF36vlHJbpOvHS2qL8epM+1zgzoHd6A/OnLyq9RcDxdWjmXfrn0p/WxKa3EqRSdKuVbJqRk9fl26HC5hOVimHCmI1qj7Crhlmu/QWtxZM1bi/l2dvkLnlEqXfc1V9fRbAFZk+WUszO0+V2mUZGXahcG12qn/4wL1z3bL0o6UFrbpNqRcWH17ztOSSviUT9uXFXA3wnXo+/VKdnPRjjJVa673ArgQRkwt/CLqf02og5uLXmpEeDPizkMNOzGeroP06iHn2+HbBfdtaMWddA00bSvadS/dBxlvo1704QP0EGS/kx6ldbSLHqfbaC/cHbQPbgPth9tIz8F10fNw3XSAfoG8fgV3P/XRAHL5A/2RdtOHdI720CcURYoL9Bk9SzGapJ9jFvk70lyGO/g/Q5IxBAAAeNqtlEtrU1EUhb+TVzVtbawxlqASpUqRUrQUqSLBalqkpg9iKFJKaUjVgaGRNKKCKIjOOnDgzAeCDsUf4Fz0Bzjyd3Qo1HXuPem1RUrShM3di3vPXmvvfe45GwPEec1vIrmpfJF0+UmtwvC92p37ZCul+hrzRBTD1paHhhDhpr4MEZtYnMwwdH2iaH3B+pm5vHxhbka+WLgpv1unXKrUSd+tlcpkqrXVNbLrDx+sk/Mi+uR7tzNGidHFAQ6qg256tGJjDnkeDjPIMFfEzFNkiVUq1HnKSzZ4wzs+88WLM+o+JozygU0zbV6Yb967MX98DJ11uOBww+FPH8NxhwWHHx1u+hiZdfjV4S8fozGHI34d0WX11aPOnvGIx/oW5igpjgltlf3CAcb0P+yb4YiiI67rPlmIJCcUc0rWu+eazw5v61ltOqZqdRJaSzHalGaD5zMsl5Z4hrSepJ6L3j4m2uyjsduGEae3dxU4RlIr57WfzXECXko4qtovt8AM2AOKHmNc5/xqi/xAI62zb/NnucbUPlQCpeM60X4tOW7o3u1PK9A7qfvdqGuaWQptKAaqGc2MoMZ5TYfbbeoG2qc1jf6td4FFljugHmQY1LTbWfsSK5puncnh5zGcc5OUJk7//29gpGlmv8ub8Cb7JLe8+W6joSqL81zW7cWndsXb+qKc0Z7DK95K7z2fuMB32Tg/ZJcUEddTlYbT/wutbmRzAHjaY2BhYmOcwMDKwMLUxRTBwMDgDaEZ4xiMGG24OJi42ZhZGRiYGFgaGJjeOzAs+A1Uo8AABYwHGHh/MzEL/tdkYGCRYuIASkwGiTPxM20Eq+MGADw5C/x42mNgYGBmgGAZBkYGEHgD5DGC+SwMF4C0AYMCkCUAZPEy1DH0Mcxj+M8YzFjBdIzpjgKXgoiClIKcgpKCmoK+gpVCvMIaRSXVP7+Z/v8Hm8UL1AvSsYAxCKqDQUFAQUJBBqrDEq6DEaiD8f+3/0/+X/1/7P/R/8X//f8x/X374NSDow8OPTj4YN+D3Q82P1j1oO2B1f2jt96wvoC6liTAyMYA18bIBPU3igIGBhZWNnYOTi5uHl4+fgFBIWERUTFxCUkpaRlZOXkFRSVlFVU1dQ1NLW0dXT19A0MjYxNTM3MLSytrG1s7ewdHJ2cXVzd3D08vbx9fP/+AwKDgkNCw8IjIqOiY2Lj4hMQkhs6unr5psxcuW7p85YpVa9atXb9h08bNW7bt2L5z9679+w4cZChNz8h5UL2kOO95ZS5D91yGMgaGrCqw6/LrGVbvbUkrBLELGh6mtnbMOnrsxs27927d3sNw5DjDs8dPXr5iqLlzn6G9v21C76TJUybOmMkwff6CeQwnTpYANdUCMQBT6pGUAAAAAg8CsQBOAD0ARABJAFMAWgB9AFwAgQBTAFUAWABcAGAAZQBPAEwARgA4AFEANgAhAnl42l1Ru05bQRDdDQ8DgcTYIDnaFLOZkMZ7oQUJxNWNYmQ7heUIaTdykYtxAR9AgUQN2q8ZoKGkSJsGIRdIfEI+IRIza4iiNDs7s3POmTNLypGqd+lrz1PnJJDC3QbNNv1OSLWzAPek6+uNjLSDB1psZvTKdfv+Cwab0ZQ7agDlPW8pDxlNO4FatKf+0fwKhvv8H/M7GLQ00/TUOgnpIQTmm3FLg+8ZzbrLD/qC1eFiMDCkmKbiLj+mUv63NOdqy7C1kdG8gzMR+ck0QFNrbQSa/tQh1fNxFEuQy6axNpiYsv4kE8GFyXRVU7XM+NrBXbKz6GCDKs2BB9jDVnkMHg4PJhTStyTKLA0R9mKrxAgRkxwKOeXcyf6kQPlIEsa8SUo744a1BsaR18CgNk+z/zybTW1vHcL4WRzBd78ZSzr4yIbaGBFiO2IpgAlEQkZV+YYaz70sBuRS+89AlIDl8Y9/nQi07thEPJe1dQ4xVgh6ftvc8suKu1a5zotCd2+qaqjSKc37Xs6+xwOeHgvDQWPBm8/7/kqB+jwsrjRoDgRDejd6/6K16oirvBc+sifTv7FaAAAAAAAAAf//AAJ42t19CXhbZ5Xo/9+rfb/aLUuyZFmWbdmWLdmW5cSxkzhOYsfZ9zj70mZruqZpkzRtaaGUtpDS0mU6wGNYBlqm98ruQmkh7LTwppSBDB/wmLI8Hh4oDFCmFGrlnfP/90qy44TO8r5577WxdH0l33vO+c9/9nMuEUicENoiPEpEYiTtCiWZ+UWjLvhaVjHofzi/KApwSBQRT+vxdNFoqHlrfpHi+ZwUl1I5KRGn5l987WvCo9MH4sJmQgQycOF18pKgEDOxkw2kaCIkPSmaiVOXLloEkqayIyPT84rBOoU/ExYDNaUVqzQ1YbNa4Mhum5LtGcVmm1KcNK3Y7JJbMYmFAlEsouSWbYWOzp6unlzW7zUk6sWcmBhoikSbmqKRwAHLmkhfU1Nfs/BCqZsQhGUzfZweA1gQvxFShDNpWZdDcEy6tGzIUtmUkcXzk4KbLIcTgksh0pRMMnhkpOlJAz9vcCk6OK/LKGaaJh2dHsAbfzbvHXpw75CglP5EDaU/wdXr4KYS3K+W1NE1pBgC3Is+f00ulysa4d5Fk9UGx5OEhoz29IQghSMNgZxC9FMT3kCwtiGQndTr2EeiK1qHH+nhI4PZYoePqBzLyKHzSo17Sq5h4Ckm91TRaLKkJwaNOnNaNrkUP5z1wVmfH8/6PHDW51KsSEj3lBKnabkn9NzAlW+sJr605bmBY2/cggdyyDUhhIweuC97NeAr3GTCXGOCA79rwuK3evBSE3afDb7gYq8Se/XiK34nwL4DfxVkfwXXrNWuE9auE8HvTES1b9bheXHQJYiIpEtCKoQj0br2Wf/JgyEge747l0/AT87IfnwJ9pPIw88AhY/qNkZXbfavDNwLPys3RVZt8a303+Nf6d90T/TeTyz5wfBH4b/hHyz5BPy35AfAH5SkLxwQRHENSZGPkmIjrJacyCmiYarYKCL9GpPmdNGJTOPOKQH9VNEZwNNOlzk94Uu6TMDMTRnZdl4JuaYAX2RYOZlV3LBCiazsdikGIHzMNaU0w3vIBuxLC7JTki0F2e2eEM0BWP6CbJDkaEGOuRWvD9lcbITvpQqyTwI+sYVi+JWAW/YC4w9Qfy7b093VmGqn3V09QA+fP2BsTNQbfF5/IEp9XoPRl+huTHcvu3Jg3cDa/fu3j606MNKzcEvP4v7N2w8d2L765hXzhgfn5RbW1O1cOjRuffgh8+Le/mxHurs2snfT2oOWB95vJnqy8cLPxHbhy8RC3MRPoqSBnCXFKNBHieumQC7AgaSbmmwIRUV7WmmAQ7uJHdp1U1ROZmRyXrHCRrYymigGOIQ9FITDOjiscyn1cBiGLd4I706r5J4wiR4/YKrU10nup7w1oUjUB78SpSEOHwJTBPBDCYRBUW8ghQIQw1OWAo15by7b3ZWo99AABeGAZ+tTXjhVv3HbsqXbti1dtm3N2tWr1zroywtLHa9ve9/Wre8zf+Qjgmds+/ij4+MrDh0+NH2v8JnU9NIj8Ouj4588fPgQ8IdIxi+8LkwJL5AwSZJOcjspBnBH47ZWYsAlZiRERg8oZxnKEcuUHHHJjbHzkmKAY0NGaWSnlFbcgXBocyluOPTYp5QcvLfCWj9lFkOxhBOX2SbJ9cgaRZcvWEBeyMQk99PEYPMFE83wBdgCsOps7QF1XO1ATz4Ar4kUJwOwRz7loB7ghgXwLeSM8cFF+eyuzeuuHFmktNRsbOj90E1bt508cmLH8OC2xS9mm33NbbnuXGt755MDO1qyy9qXbt6waN6G1BPDV9YcX3/fqm37tvcOLvlSbBHti+VTdfMbWjqzhO0dkK3ks0y29nDJqopVCnISiUFBYlLXpMhFqAhCX5Ouir4sRTdz8YnXa7pwLa0TR4iTeAiVXUxJmGHvSOzL7q4FQj7goC5g+HahqXYg29m3atmyVX2d2QFq/tR7bhld3HTsXOn8F65qWjx6C16vEa4Xqb6eCDxZvh7Qx9WYykdFr0MwNmpXqsXrHrjqC7Tl3DG8znvYhTm+QXqIflj4CXEQ4skHUjljPmAMGFPGVD5Y+x7nVtc9te8/uHz16Oh+oWPD/Ecemb8hdjR/+x256/Bvx8kp+g/098RK1hJUL8acQsUpWZ8tEooShVhA0FCCh1Q0AwltGdlyXhayihn2iy5bNFvwM7MRvmYx46GFmGG3cTp2wwL6QBTC1h8/u/7++9dTacUHPrDiwQcZ3LkLW8lL5AyxgZSDe08azMSIq2RnFDGDGnYAJ5pBuSrUBkwHtMk3ahzmpLmmMCpY9+KPf9yXjDQ1ReqaHmHX7aduupnugvWvx+siQviDy68Q0J2iFblBW+vuuK+f1lL3ypX4t8xGAJjMJDPTQqg6prKl2lBAJUaqdb+m97nO52t08MLD9ENiC8C0mDCWy6jcOClYEWuEBjSg3BiiYNa0v0iAfdtfpAoV8Fig7S/CpwIFdUORDp6AePAXK//XBvGM+61b0Z7ouvA6nQZ5AACSpRxyxWZQJaLTMMX4DHjfAvrA4sL1UfSc5RS7BQSZaDQJTKw5QRkoeqLKMbaXYf+6YpIr1nX9qzfc8Or1O6ml9K90yxPPPvvEp5999tOln9EwrUUch+ClBPvOQhaRogEhMBqmZDELZhlaV9aMbDqviBYAilkGoh54xsTUmckAPGMDWEQTU0W4LvmclPPFu3OSceiHa+4tXfXJjwlN755+ZGREEPZxmubh5WeAs4+sIEUr3s8kThUFxNgtTk34rALqQX9Gdp5HZItOPdORVrhXAJZMMVmZ2Qb6TNE7CyjeZIJoayIsbox3a8LKmN9w8/Zr3/MROt9aOvD0bYNd6YV1wrpDh9Zv/OKjY8ufUsZ6FtQ3sb39Ov0NwNRAtpFiAmFCpe1neskwNWkxJ/ygjCyGqQlPwo/ggUoynEdVLDtQONdYmOohjO1hD8ZA2iqeBKyJowZAlKQZ6jZN81ztJuqNKQ1sH1O3IHXn9+0YXnVPt7WhZ2RZfuXi7Ibrdh0HOLe96/Dda7JDywduXTq/0D1/IL9m3/L+zRadbsvI1hNI1054+TPg4CBXkKId9QrSdJLo7IIdbDkwC2FZLdmijokFnQHFgjMj28+D2FBsjinZmC3abfiZHWQBahaDG1VO0WbAkzYQKYoLcdQRttpoPwFDg+mkyorOl8ae/ox59aZNWz62kP5jrLRmcnL5xz7G1rwA9P098FgNuYUUgxp9bSqXT7pNQRvQ1w3nTG7GWVaELpSRrecVl2Oq6LLiWZcd4HJxK8gH26AW3l1WlDOWApo9E6LJHUS953PLDtgUJr4YYAUBl0iyq2oJgPIJCTjFp5I/UV9YkN+4aOyWjo5l9LC19MeOeZuO3HnwtrGuRRuXvS9Aty3/RvD43n13wJ7tAVz+zPg3Ro6SogexqdH2rAmwsUc9zHTB7Rtn29cPmtqaBXtVCSPIwCzMXvHjDjbZPQiyCzS8HlV0tAaBdlmRg0xgn8iGgixKsl6zULh9ZizD3ZiPUhUlQ8+9p9bMa2rPj+zQLT6w9qrT4zfesF1YtmT+wLXp1bS7eL55QfS+27dfc/TIOyavuuLaTSse7oK1Gbnwr/QXsDYGkLvAHMA3uPGRW6hszCgmXHKKSy4WuNylKTpCP1j69UZqFQ6MLpm+OyRsBAmZBttGD3TxAF1ayBFSdCNlArimeL1mNGvSjBxe2DZel1yPO0dnYX5QvQVPKTVovsGnzOKxAp3Qzmmsl9zPmATJ7Q/U2Zm0aw6AmUN0Vmddg2rFoIZZQBlNjKrw8/qRKu1iyuAG84Vvt/R7jg1ty244deKB279/y66ld416gr2p5iv8S0fHB3oLzxyf13t139r4pvW7Fgye3Hjsqo19C5f0hFpqw05HJ63fN6+me3WmD+V27sI/07cAVzeJkE2EL30tbC9zRrHop0BoK34kX5Sh6wHcPMxale3gCQPj1qHJBiRVzMi4QUkRXbj0tcgQBjtxMKQ8ZaMstYDmqwyydgpLnXvnzsM3PfVl3zsfMwtdBzdes31Jz3g3HVwyf4R+/8DpB0588eWeJYkPXEHXndy1bGTH4f2rSdmXpq+DvvGQ3AxNKbszk3ZVT3pRT4KoQDUpO9mb4pulLYWL9GbTDP1JP8jVqMDtBbinDSz/NiL7MpMu9T4BtBiQJmA0yO4ss+cvaTdUbli2IHrUO1ZZEkKvqr0pWUeuoz8UUsDXxNOdDNipcR3d31A6RwcbaHTH48vP3reC0WScyPQ79HPMpw9plgfypB6ND5Pmo+eB85PwM05PlO6iJ+SVK89x26PqPvk2mtf79OvoYOlcA91f+qsX3nffisd3PM7u0wJy4zngmRqSwN1Rj7SPcCuFKb8AKL+aeqb8GlAso30/4bLXOsA3sDJL36uq/6Qax5gQApF69GO8MeQlN/JQTQRdGq8NZV5AqtaMDjFCE7BLRK543GV6tmw4tXV/srsnua2hq6sh3zk2L60SVtiyb3ywdbAp2ZeKN7YtaUl2RJvblk2/rtJYIMMX0uLTgFM7aPWH1H0QB+q1ZpQUvElgdeaUTtgR4azck0GXl8q9bFM0wKZo4Chl4DDjYv5LyMb83igcGmH3F+A9l4G9LgbiqVYJ5WRIUhx2wC3qLlqaW5hTI6VAODUXlJ5OcG6MxOGNNtiZkyvJNUw4uHNZTbmmEg7YPZytAhJz81R3FzZWAL+RhJP5bjg5/Ofv3nFufN/u3gGTzjWcX7vtxJ61o0OHPvWI8sVzj+/cXXP1oW+8RZftGI3XJ9/xLy9S3TH58O1/259q7rlh3y3vair9bPOP3//p7z7xqZfrl6be+MoHNv5OAnoBjwj9IGuNYLmD90eYJjTmckzkThpMhILiMCDf2RiVjCALjS5FhzaWNIX2H8Zb+jtfW8jCLMQl03MO+IZsPaefMBgxFmLCV5HI1nY6QQ0mqxruUHRG4BHBjASjaK5ZgDQ5T86TSMWN+ZyYMLx64p/2dZfe6F7xg8M6QZle9elP/4nuhl1xEGDuBZg9sDviaFswqL2azRYHjVcbImBjoASkcn1ZxNdmUaSDzaY4wE2LokgHfJQEnIh6ARirBYEJwSFoa7lWUiyg9OS4WzYiaBIsmlA2jBxCIoWLlabd/O3gZzvXLW9e2jmwqXVsc9fhEw+879QNp+44KihS43Bn/6hVZ1s51rM67V1x423Lrz6I+3QB6Kcm4FU/WUKKXsTBKapa2wxbz+gVTVwmAfg2IHYQFZ8ToXMXZKNUJDYJdbJoZjpZk8/lcInGPws+evPA5nRX/+iGQ1duXLe4c83Nt36IbvnEC/FEf+7Os/e9a96Csc8yeYB0XQt0dZAw6SVFB+HGEKdqGHkgwmBBfeh0oQBWTABWFMEKOwEIk0YmETc30meBgAoPiPNoz9Zt/ammBZs3dA6vaVkymKxtmtcTXy0ozraRU+vW3rIiI40GC1evXrwvH7egnwME+jnAYmVRTcJJwu0AnTg1qeeMqa8wJjjSzI1ktqQZrDV4FcyqS6n6kTlmYKFtGPcdpDdYS3/4xS9oVFBW/HjFr1ao/hW8/COL7Q7y+1buadKze5qQpyxz3LNyN+vMu0kH6VXW0ls//jHc6ZejpVe0tR9ksvdmHnNRHFVrP+kGO9bO3Q9jgLFBSGMDlLsutDfBAXL5mBXqgXsy0xN8rqJZDKCoBWfEaEB2djuYd6IYwUQBel6KYVzIL92wZhLjGeXk0I7W3v7NG67buX2s53brL6+89R0P0S1/+3yyqa9wZ+lH74x9c6z0dP/TKs2EAbZWA5xm4P0zssn63KRoYVQTKytlBaoJWYycgSUH9GN7UFsgDLrnJLCEpYM7aXDnzhIYgqVXaWx6FV1ceqG8RuRFFpeJV62RFpUR4Wr4oy9f8eAulB78b/UXbiDfYusbBNuS/ZmFhQnQCrJqgZNu+CvY6PqF6Z1bti4MDS0Vxqaf3HcwSmbsExGuklAxNpUx1phDLF8QYfDQnJkmDu7UU8OR0p9p8AYEiV5NF5a+Urpb5bufwjX1Gk4ghadUvAzl6xkrVDICfWqtcJWPrGP8BDD9iMnEZ9W/N5pUKV4U9IZcLsesqIrxZ1I1mo9L8C9OvvYIk+BCu0MWzylOz5uy49xz/Tf+uhlP62U9nNedU2zeN2X7uefO9f7pM3jeIZtcsvmcHiW+4ZxInhZ1Zpvd4VSj2nTQIog6vaH6nCr9PdxnUy15qyr7mfwXG7sTIvzvNYoLCrc+pLv/tsJ41Kp7dNuHdeZaYAczfQNot/vOXSWRTl93belDKg8uA/ydZK26ImZ1RYw5LWbhdDC5hc6aycFjFk60ea025qwpAtq+Jrci6goqXIpoLXCZRnONyBQJmvD7pIO3UEln33Jb6XfgyirTT195P109vUpYeuV7SzLwB+7tm2FvW4iLDBMQD7Aadm13u3AjSHwjSCx+jMEpA8hRDJs6wHksmswiMyNcmBkihkK16R1TYygL/vq22x97rPTWY/vptaX76KZPvvDc45/87LOPl35J/TRQ4dMWFkdxYySFaB44urWTZivTkGaUZp5ySAd8QguPaOsBIi9KdjdGN/SqZEcQ0tQnqVGDg5O33vveU5t2rlj7wZ2CcvjQdUem6bLBdffw+y+48IggAx0kEsA8mVPT0qJqXFI5yG7sBjq4uT5BOtSwDA96omanSU0f2IAcXicmyszMjJxFFmMAvFD0Qqqpcy89uGVB380776ym0U9GdQtWdzU/XSEUp9NyoJONeDHaou1nRiovkMpqZ6SyIql8XAwDqexZTRLrAGi/Kn4VixEA1EmyGSC2I+mMBdkryTpOwBjaD8DhiRrKLD0g4VPUsG3kpWue3bzroZGVQMUvjez2lL5FG0o/pEdvGywAb9eq/n0CbZ16JhuAik6Bk3PCXe9UTXTbeSUAkAU4j9dJ3DAPqGkZg/SUaHF6a9FAl+vcisTMcze4N5iGCdThaYBUujgNo/n4LAcjMru1Nj96xeD6gY2H9pzYfWZjz9CmnuH52zoGFtS945qzY/3LBuZ3FmpjW8dW71s9f0G2oy0XdoY7hju2XYOyygUv08zm7OPxPdW/N2KQjyUsDTzQpmdxHj0o1qKBxdwMFDSdWYu3GhOgKFz0Ncvndgq71qyZ/rCwi8n4nbD/FjJZkOdxJ7QTuDAwlYUBiFNZ5ElGixrANGL61Y5+Xh7lPywQUwPAVTt3nr1/163XXnf6VfpKKffhD9P/Xsocvu1WuBcwtdDHcOknRSPioqZgGR7lJAEzmNFTMiO/UOATgxGpT8AGlgXkZCb7xITzgKxTdv3kAIiV54Uh1FoUbAQiJhk+z/JdVLRYHZhxxVtN6PQmc0OgjBe1sPuheDdzIYfifcGJ3/mYeNdx8W73vqlH+f6Fv/7tM+y8Fc7bzoGlD+f1555b8E+vW8ry3Qjy3eySLSDfJ0WD0WbXZDuKdqPFCsJ9pmw3AYKyE9FzzkCPo4j/12w/qrtz/126azbdc+oW3ZkbAd3HhQ3TfyesBTnaPv1trquBto2At500VmQ67krZkMMkO8opoggop3VcTntEfg/cYaL+O188cp/ugQNf+eGRT+g+So/RRRfgoqUvle6h7aVvq9ePM1sgyyMPlbWzsBizkatwUKWoCgS2YKaZCwYcqD/4cd3H9/4IjIzSk3RNaXPpDWpi8NfBy4/Y9ds1nQw6HY0Obg5ZMsxAUIxcFYKRqdpluW4ax7BW3FhHN5e+Sf+q9DjdYF0h+FaPTb+2hl178YV7qFvsAL7rZhECPY8QUB4hwHyA0UosmPHPKnrHFOYqLKwgQN0+AQkN05xv8csnTlwvfnTsrT+s+DfnFyjPL1DML4g8vyDOzC948h7jwZW/WCUG3W/d5uG5mnuowOBeQDCYRwBuMYP2NYPbeB5EwKRBBdalUFDZFOSBS0NA1KIfAVDG3fCTO3Hi5ZebROvYW+N4/ajgpP8sLgO/Fi0zCssp5iapmhCaETxElVZL0d00Rl9Y+8KeO++APy2UvjY1hdeRLlxL37jwBaBDAOmAcOIPy/1wyzIQ98Ul+vNSaGAVu+8t1CrG4Psx/D7e0l7OFCLtzJVMUT5gjGY+Fxa+vfKaTtQ/bSDffyXUgjdbj94ARqNlb06J6MFQyxbtVI3iivGgHS1pTEAn2F6vBdlS68LgHZrRGMVtAG6txQ3BPNc6qWiyY55VdrllP3BvHGMxLuJnoVyMa1kwX2GXmP2V7+qZRys5gAj1omuQ0tLP4BzUt916Yig/r38sOL7+nNvnH/XnD6wa379zWcfAww+t3dycz9QO1T/xx2jENGgZHNmycs/y2xG/PSCPA8KvYR/7ybhqh1hwO7jAudRTrmU1R9dhQe+AFck4eCrZyF1fxWHnaRa3pOiZo+4i/IQXXB2R22l5CSBnMjtlzPt5zty4Z3z+li8f3bstZ7Cml73jxmV54afW0o9WlV479fCinjOLvvHSWlLOCXwZ1sGLstxdttooTwhput/KtT1od7BRZBdYjOCJG5xIZdE9Oyru82peeOHkNduG2vLzFi57d6GvdemW605Q/alHC/Ob9+//Unqg736gE97/d0AnB/gme7jdWLQRnvHhYLAYbg03ZiVmzIKJhtkSsOQxLIO5VHNGCQG1mLUkomVrxnIMovgltCbRxJ0RvJcCUqKyxhICXbh61+bu8TWm3p17D+w9OdLdunxwCTXe/Gg/dVmnI0Or33/rS2uouPAAUWF+DWjmhn1yiABvEWYolcGd9Jhd6Ml69GVzD71mTxY0Cou1GSzc4vOCU1oUra4Cs8WBbx3MBra6eDAGkLAXZA/oTTLD8IuXwxz5HMBeOHHFgWNCSbbdvmx+y6rd153c84Z443UI/N03B4Kf7OwfePBvPo5r7YOXe4DWPrSMvcwGQWHh5EkpCdzTjGJAavszspflqdFvcmR5xs+KCs7MLFNTgeenK2seoTlmmfjWb1o5MBBpy7Q03Go5Pk6/vnTZ0Lraxd5kavnSUi/9OrM96y6kBYcwwuKVzwMkSLYe/VTRj9C0gmAEWupaWX4Mc2CgMpIgMesySlbHI5fSeaUDIGvHYBaF5e9wyQk8tttZlVnCjqeULszuYL0GftSsBjI7JKamla6E5B40my26Om9ja2cP2oFhjFQSxaLjgcy6JPCOPQFLk5UUZxzee9xKWCqwvRcI4YoEcl6/atJiNFMNlOPS+HhaKAWbYR5Vc0Tdbp4MSdTXrVs+/FDH4PDgiq51V++482Btds/6w+OJhL+wfNeVdx35yfF5hwpXdXd3ptYkU72ZXGPn7tUHM+tcutS2lfvM3nB6xbJVqx6j3zq0cDB/HNZ1D6zrb4RfgY25qGLJMxnDsl/c8XIxGYOJOzTHTBbue5ldTCvAxtZyS6o88cFiMrEo7RlftOu948m25X3CTyylV1c9VrqN3tTRsqHE5Nwo3O+boo6YwJMYUPevBdfRlFFE8xQrSKBg2Vqn8GfCrMe6QJuFlyfYzFXZc6wGUXPmItigow29yWSve1x4vCfREKptmL5JcE7/FvnnwhsXWtk9rSC1CoRhiglyLxhHZi6ydOdROky4dHYHSBIrd1WMsLATDqfHy+9mXCAwW9dBjeUbm1Op4HhqoC/Lbn7WHVuUp38oSSM7siHxDIcDZTsAIcI+wlhIbCbFy4EQSyUQkpc8+Rw4QHvGDV+54ivfuwok8bSbxn4zVfq+WnMD8sQJ17ORBsKVBIvx2ctXcuD+01vUaGMerlgWsZvH4x5nsDGZ7btWuMY6farFMOju5zwhCiCjouSwaofZfBgbARg5wcw5JcR2PYWdhTeKwo0E95QcVesNgV98vNgBlyuG8WKB8YjiI9zFs3OPL8SCBkY1aBBAmVDFQAZj5WDPKuPCbVeGlmy7ZzzelFgcGK9PwavgXLZ+/Xpkq+u6WjsbSrfTmzMt+E7KvF0LvL2yKuqkYTGLwRn8szjcxYFGYTqLz3OBmXy+yrh4v8roAFE1m3OZLzgBDgt49sNqjYhdk/kuhMI9O76B0QSPFt8QBVMlvjGzRITpoRjKhcLpH508fdWxU3up613vpsbTDz1w5tTDD5x58aUXCbcp0mBT1DKbYj+pmBMVcoBNAYaxZlbYufRGothnmhV2lShls8JCmBsouyRmXLhV4yLAicSNC59UNi5WGft3funI3s3ZlpHbwbb4rvCzZevRtJj/J7p88EVuWyDN0qDba5luP0oqat2A8GrKEgTFLPUOqwe6EhcQa195+QNT7+ayejfwxbSZmEqqUvOGajWfz0kpaZaav2bXeI9x1Xjv+IG9e0+uyKVHuJof6p0OW6llxdnbv76Kq3mV904y+Pu0mGuZ0hbTFCvc4NYb0piFRRycsCpBq/hMLRiQ9qy2to+Hg1LQ377QKTj3X2PYalg9v/QNvF8I5IAC94ujVRHT6jOcZWOxfna0IyLxRE6ABWFogcc7zE4vry+NuIuSu5axnRiTsEAHVNcEtblZgarT/RfDHjxdF8oNrs3251auWH31hl0jzf3L0vmu4bUbbtp0otDXnU6mmjyepf2L1nYvaGmsi9d7AkuGV61l9PMBPkeFs2BvgGaQmAwSObfKelYfLRuzVcaGGYsQVGPDxtW0TCQwhLixkfehiVFJ8XSDsTF+p/XmSH08megYXrqUvjh8o/X24dJXmpOBgYa1S+l8gGE7wPAzwQnyYz3nQB6SM6jbBsSgJj9A0GJwBIMIVgvbxDZgPVuGbRx0HBAeG5pk4EwZ2HZRgyYIEsZJ0aTcPp5Ij3WNrzIO7D77PnqmdE+udQ29ffq3w6q9bWUxb2d17ITOjJ24/k2xE+ueu3Xv3vnMYcFZGqbPoYJkdp7wZbjHxbET+rZjJ6O/XTtn7OT+307NiJ0Y1NjJJ3/3x/+TsRPf+Hbd4SsO6HZsPnF6l273zYBuH/1qaT798vRvabG0ktFWgJf/AXjPjJ3Qy8VOUrlAjinnVMIoPPORI0d0R6/8b08fO6O7jfrffOGFP5R+/gNeU24FWfYqXNuBFYLqkrFCE0NZDsxaORQHtFxeogPr1MFW0DJzBcH8wMoSWMi7dHftlOuO7bOPDXvrAMF59CvTvx4/YllmHxxkMITg5WGAoSq2AvtJR99ObCXBYysh6v4z3Vd6jfqtS+iplcOlO8Y4X4YunKC14hCpIzsIiGMlyDQJMDpzrlj+L5aRw+dxh/ocsC+yRV+YdSPUYI9CFrsQFF+YeYeAZBDw9oYBbyopLrSZzaD17EzrdWd7+ikIGh96DTyzjG43/N4I5xtDLeHxnT3tjclkY1t+53iYFkbizT9Zt2hpXfI32YxZZ85kf9MYXbpo3Y+b6wHuD194lPxeTLGYRTkbZptiP3ot6iN9eN0B8d63roPvtwCeaQ1PcCnQ8wlmsEAKVpEr8hgriLFmlbCDBSNEhqdYB3g6OZ5hkRlARAkyXgrz8LwJo+BOt2L1MNXJ0cx3t1NEK9Gd9atoMrQTLfk2xLG9B3BsQZwXRhvLCCbrAMGfNMdH6pt/vG4Rrs9S8ic6RU+C9dFJVD9twmmwgjEtcOMDTQ3Cqu4VAgSH02rmgJeeYHkak5uYMTAuzWyqn9/uaoz0awe0bjwczsa2hSM57qNhHE+8D3jNdYlInsQk42UjeTQfyAeMieqAXunBpjO3pN7VrwX2xN1ta9e2HWP3ZPwtBmfecwaHX+6eiRn3rGL00uMtp083vatfY3jhV63btrXeRNRarD5WF4W1IIswOleuU7bN4bhY3FMTjWaTg7U2MdvYwlwYg7HahUEPBvb2QFNfc3NfwL7SQc/iUdP0K/TrpV6+39ZdOACy6gnA+Xo1+uXLMWMu6EJuCwbM3EQC0aVYwTcWWe2lqMOKzFpudkgsWiSCwA5kmZnky7LKRgMGuaysls0F+1D2FGSrVCRYmcTCNSZuIM3oM2HMgV0m7XTdvh0rh3owarP0rr5Ca27pqh17qf7Y+x0PfcDUykI3rYNpy/sfsN/D4kfMF3qBRNDCYytWC746zfKyUkmcmjQaiM2elv05cMCmZG92wklsmLuJopuGkiNoYdssqGOI+wFxXVBz/lmRXhAcNyVUy6qMnCw0ggu+APZVojoIEaFY5eA1+uLGQk94zZortx4f7M8MH/rmN3vpqHW5NK9wc//ptQc3t/cdP95/456obgzW30GWC/XCHlJLkuQkYa6r0qDZqA5cAJAOdbjFGlnKHGVC2MWkgAR2X0qVBhNUb6xFqyouTZhs/hAewlm708MbXupgISaIl3/QAEaY3skKTi2wR20FZoZhACGVZ7YiMDBL8BlTLKjn4XGDxnqDY3OiflPv5u7hpdnNvRsbkpt6t2SHl3Zt3jh488DAzYO3be5ZOty9pXdLPL65d1PP8JLCxt5Nsdhmal+8fPniRSMjnPdcsGYxQQGJeVy1D7QWOskN2jON5WKSDmX8pM/PTgAT+uCEKcviWc7zaJ87QN2Zs0WHE9fKYQPpaMwWnQ5WJi5hh1qWxbgczkoewT9T9eFy8aJlXEf4cV3xEd1Hdp+74d577931nve851pBKX2NFkqf7F/ff8898AJgVuS9EXhONZpQKYnYjcTeKtF+SWSyf926AyAKHhOa8RWuse7CZ+gPgWdbSI68V80uRrQKWeZRdrGr1mWVVlhuPcaPMHzS6lI6ACM/nPO75BCeTsLpJHgnwArd6Gzq0dWLNeNOS0rPmOyeSH1Te46VzLmLXivv/6mPAB3q0H9+Sm8NxfjnJl4MhhuzcQ473KgGlPIVa71HLahNrUvHuw6v3rkyPW9ZuqtjZN3y0e4jm/Yvb+kfSRcyoxuWbem/PrXgero4NeRr7h9a3dPXnIw3tNSEh+YNZ5sGhtbm56eTsWSqJrzw2o2NTcnmlqYWJhujwn10r0hYnWo3QVK7cxjUwWJRFtthJaqYuRjimQuwPiZd7De1UrVS3lipWY3Ga4LxeLBGgZ84HAtPdsTj2j/Wn7WJ3CS8KPwK7usjafI+UvSwPiQdGdGli1HcoTW6qepQRmbSzj6UmzPYtiaHwaVsZbBZ3MQF5y08phEHIRln+WvsAYUPlDY86+eBTRcumOipqU018ya1ZtSlqQJGBp+yuPyGeCMrCXa7tLoE0evXWggMgRlrpjkpm555x+1PP1166+TZI4fPnj185OyWHUsWdiUbmpqznS2ZZH330MhW2kF1z8L3nqGFow89dPSqhx8+umV/U2dkcNHAYH02s4/R5ArYuK8JvyY1wPVJrFoMqbKWO9LYrBcLhETYq56cEtNhJS+G4Ox6Lrl4fAdjO/Vq4sTGhVcUNOmExRpiwqseY9ABNXfiAxLEAhIegMRSXKQ6f8IYdVbmREucsOp0NXlyxVUHutsyHUPB1cs+Gvcu9OVWDq3S09tK3x0rNGVP0WcXLw03J4ILovd+MWXtM+XmLS/dsWoVfX4kvwP4L09y9F+EADGARe8l3JI3Vyx5tCVZt1ZefXsyf+ed+YSMr1S38NuJl19OvMLfuNwbJ++g36E7iZ50aBXGWqcW06sGFjgECVLUiWUFZCx3OiW6x+mJddQ99sP3kv9gr5SOLCa/EhYBj5vAoouQBvISKbpULvcCw4IdYuNH4cxklB0Vw1EEKuwG2VqTlRsyk152Xu3MrGJ1MJEmI/y3aBb7FEFbTfr5CT+LTU3qOftjo6bbgiWpaLtGMCcmx91FVy1LoPmlCYNoYyrL4Wax8TAW21nQkC/IUQnMX3hvcBcdZsyuaSUfHtUGauxBvYUcAmI4i/oMvCyfWjm6+APfefCB8w/mr3vi2us2bHRsOLVow9BIuG7+ggj95eEPfOD8Aw9+4e9uvPHvbip9goY2zPccP3LkkdYmlnP8FM0Iv6nQXD+FP5emeZRKwqeWLEF51kuL9FbYQxaWAcHt4YCN4snw9KKfx+/czPXH0ggwqVjdrGQtN6t7HJdqVUVBwORA755Fi3fvXrxoz1iuIZnNJhtywpplGza+b+PG5e3ZzvHOTqLWuxPgxdcBDyfZrVpOvOJdtuZYZht0q44VgOgcYBLpmXWkNyKfguPuOI/KDvMdpmzRzpSuXcRcCShkO1PImDmBfc77InO4JasbCrF8/uzGs2c3rlhB3dhWeOoU5+ksXUA3CVOw3waYn2FCUZJRBB0PrGM3mG1GN5i/uhvMLU0QvdPLOye0xolcpRXMmO1fO7hi/Y7nzaV/vm5NIpxJCX8zPNTddWz1QP7ggZZwLIMwJGkv3QwwNICPxi0yM8j7MG7/BFss9AP8ak8yNoC5tQYwN+89NsAyKeEIrlh1K5iEnO6pYZzNWsE8+bfRCpbsbOxNta1KmmrqmhqjuXTz4MiiseaGZM/WZVvojenWxtii+ZFIbaSpPb8gE+00i/q+xsIoKefH6952fvxzmVeEJ68eW89ijxfSgg58/TA5QIp+9A+kHC8HRjLYcizMG2EuCgauarMYu8K6DYxGYuW+iEGjICJrlWQ/7mBF8iBF/Og7hTEgzj+m6CFwc8kbFXkoi8lyrNFPGcFr3TMumKRoYLR7PLRRMvhHkguiOut3hZ+VvpdszgRcY/RM6a9WbbNFexrbW2iu/n6EfyvAv5vVsQyRclMWJkd4KEa2nOeJW9ckYTUW2D9r5lFNPR8SAVxlqY6V5+ISphKMUjvdeudN1Lzu6LobztCfb7n2rTut4vy3XrbS39OrGQ8PUBv4dA+B/dCEu1z16C7bgOq+qJGGdpd7WKIXnFQPVrObrCLIesiB2JFi5mWE5mrZq8clcLMyQuYbKqLE4q8Sj7+aJIU6WDiEzbwI8Hx9YyKf09gtGo4m56Vbzf2ZzLLuge/lXE010nXLdB3xTDfCsgj2p0v4KejEWoLFHUxjwf0wfifqqhtAgVSLzvaP7hDeu760ja5Gtx44cS9c5HWQgVaQOwGyRY3K20UW5nHrwbIF/Cp5azR7XTOT1liBoNjsPA+KVZuywQ1WPmMttzQ7WV1tEGDuYO+R7TsOHd6+47AZrIBvHbvqqmOCtPfmE/v33XxTaf2qVYL06KOPkIt1P3OFLdW6f4CCs+Qzqm+o85988q/gVZY3gsL/9sJXEvwNcF50QRH3g84wgOSvAVnL/G3e7GF1Bim3maw6dKCLTqvmwEwYguDys/RESCMzbjLsIHNllYAbbaxigLmqAR+I6CAbIxEEoSgHXOBKkY3AEsAuterSKNTI+swmTWaLHScDKAFJ4j2STlV+GiQwPZh2pZiWBXYBw7S8nDgIIdntCRgr3Z5shU/RB/tLR6jznQuv2W5c0tOzQriCL/n0Y2Is+tarT2ZpJPTHgwf7d+1iPID02KfSo46c4fJF8eh4veCkPeKnfOjDhMGvkSBWTYIQK/ycKoZYrCIELjtziCtIhqSnAEkra6okSsQjuZ/SWV1iCOstefB8LuTMdC6VUY1i9CL1MRNTOjlbmyC+SXX9G0Ae5Mk/kmKPlqVmiiUEB5PNbT0WYITOnNIMjJDLFtuaEbe2jBkERwI/q1I8YFGzOoRZukeOuZQe4I72rNINv3Vki909eJHuHHBHTzce9jQDd3S7JjOcOzIZVpTQA/rqqXBjqindhgTqzgCBWoFwbeCByC0FpsQmQYmlW1nMQGK6Tf73KLM5WOhy+u2dszmLrrqUwit9fg5eE8jCC2n6Ctg5NSRODhI5kMH+DjmeUZvutE4ltb0GxT+mgcyuCZe5zgEOjhV0W0aps/JEVy0GE3SwQRQzMNFT7kA4EoszHotj8TQxen3M9gh0LRD7aQ47cqqcMS04t7DSZtexct7gxpNb9z/KYnWFi7rsOveOCxYWvAM+Yn1j4r0sVugkd13cOWbTOsfActLyK7Oax6RLNo85WfOY05OesOGrSGQnax6zOaubxyYEk4W331KbFgpT+8fQhhCre8gWdTxf+7VyH5k4OHZVZ8lGd7M9wXG5T8Xlzsvg8n8BIsMvZL7lryASPzq2pmRBRKrxcIB+ngMPZwUPz1x4eC+Jh5vh4QY8nPgKeLgZHk73LDysLo4HxialGXjkcJSIpxoV313970qducVZwabu2LG2NWtKpmp8jgM+6Ol/+GJ8QmUe87M25wm7xW9Sa82icyFYd0kEIwzBCCAYwldAMMIQDEVmISjVcgRDzHJU7B50iGoK1aiioAGxwzcaZrpnLKC/cbR+0Oby2wupkdgiPBArBIhs6fAGajZ3eIPT/wpE0Kk0OAo08ICNUk8mLqaCt0wFKSPHQHub0QbWakRVCoBNNOngwSkH09uTUf5btEKdhktSJ8CoE8BZWPgK1Akw6ngDGnWC2GXmR0+4KOh9LLRHvexUFWGq7SAgSb7iNJapU6NGwuI5IEoWDurr4YRKne5gLBasicWmf0R3fx+OO+IxUqYR1uBL4M3Wkb+/mEbuMo1cmckaHk2IZiatatQgNptUAW7EBth8hEk7/81eIVX8kqTyMVL5gFRufAVS+Rip3D6NVOEAaDCr02VB31C2S4rgwaQorz2jWFTqLbChC4rdVJhJPnWMChJPqLjZGu2WD+4bhH/ITrlITTASCdaohFvW2t/f2tbfP/1PdDc1dtXVdUWJcOF1oNufWF+Bh3yIW78yyWFLkNr0aJiadLhsaBSCw+UQMdg5qTfZWOelgcU8tfaxL/yPf3mCEcLWLuvasTHGbHzTIetcitv4ph7eJ/Q6M/YC46vsdk3Y3Wy+Gr5yYfIM5uKxh7x6Ipqi00vcJUvQuDEeiPsSgZwvrjYI26ibfsNa+kYvufDLvp+WvtVc+sPC7T9aqxeU0Z+OvjaK7cJ7ea+lk/XZNpFr1Blo3hxrbNXaLVGtxnTljtvm6lZLnIsRBKeiBd7rbaxQUnR6fbWRZCMTBI3Y6R6Mgho21qJ7/TZ6cssWSKrs8rTT2V26K29gTk86HG2Yn241HrplZsvuiNjK/KAa5hSNe57hfUz056CTUYttuHzXrOwsK+XLN85i8MfM66xnNdBS0EyVJtrS10DBqp20TLuW4bnnvwaeb4Oe1OCpAyVZhuc+gMeNFTCX7yr2vA1gvCowis1duBgcpvCqIHqAq7syUEzXEd7PDnAdBbhQwt/yFyjlY0LeOUPIXxZMFE42MMsn3Vzim6vlP+sYMGPNlNN3MQ5VArtKWFfh9LAmrl+piGqOniarazQ5LZAE4OkE/sR8VUyd7KLHbJuYYckrHe+4MZejQJiySgBfvWcXY6lpt9bHq13rnrd/LQ9eC3iiZRdjh6prXfg9XGsA+AJ9wGa1EsmkjZoyssZINlTKAhZAUaD6AiOUqFo0cF07X9mVu9RFnXaoFxcvvAHXns/W1klCZLNad2UXWKpGDvIckifLEtk2ZvtPGJw2UxpDQUMsFKTmlCZc7LSfrxrmtv3oAHiCHJhq1YrJvspqmbUlunYX1RapvDpv/QwhZb/iIgnAgby32Q0e4hVqPb/HoNY6xIATKahCO5siSfXgvGRZ4FHiFfLAhbFs0SMhF3oS4OhJHjyUMP7q4bN0LJI6l4qVA1lqeBlMZWhAmkqBytgA5MPA2qrZAR/bWTU84Ikn6IJh2laZIEAX/L48Q+DHw+XezmVgQzrB57r1os5gsAEw0DPhc0fBbqzVl6dFzGoVTqitwkWrTW1QeEqwuIO1cZ6tLIq6msKMnmElCspAccXhyO1Tg48X9xGLF1mK1Z3F7osMxdm9xlXmIsoR1ncM+wv7jr1kdI7OY9DYVW0s1c3HfrU4d9IEDjYPVVyu/XiABowzW5AHYZ/ObkN+BfWABtc9/zVwLYE9PxsuGfWBBtd9DK4AWTZnp3ZwLqBqqoHyvg2gmKSYCZeHy4yLQFO1QmU9jzP46sneuehWl0FvZ8LvqQP+DevLnWGzAG6oBjg0E2DFH4YjqX5O0PMXcehMLLwX8ehshP6uikXBVuc4HWU4hUmK3DgXVqGMnMwpXjOKEzaAtoKRhMY5F41gnEfgtwT/LVHBFmfRsnCimeXxxIKcwEqfyy9Sfm5dNxPdwEXqbja6X52t9sD+PERO0q/S72G9KwvRqmM1Dx0/3qv9mzh+vHDjjQV2rK79aaBTDvyZMEmAtOLTWOqASiiS1fle8BvTeeD3GTKsAxxHu0lYksFL3CkPRlp5J7jWtwk29otEcUvYt2kw4rHRwPo2n+s/+es8L10NuuSac0pE96acOKdHg13vNnjSz/WveO0h+IJVllwTJsnoSesnXPhW+QC+6sGvFuE1dnfs7gQmoApF+DK8kadMnmBNJKFOh3hGb3JV/c5sfspqEBSRFYjW1qkzS8pl7AGjZjsbU2A1570BD7ClB3hU6krBYoUTyVXNwysfuz0RZgf71zxU6/3M3VL0M2twqYynfXekPnb8k5813gIHf3Pj8/MEi376e3rq/1wf0xesdxxkKPpECy7uHgezUJujMauB3Kc2kBftLjc3EGY3kaMVUm4kvxrE5cxmcuGbKC0rMNzzfxyGO0A0zoLhcZSMFRjuAxj8ZPlcXfSBuQDAfgqR8LZIozQJ283r56Vd4MTNCQ6TjGWIRrlQnA1UlUzkcB0FuGpJI/YGXESdmozckFM8IDzqQHikNDAnXCIp209VME/UW4xwPszPhzOT9dzCalLnISp2/dyUnFtelFFZeZGomIXVF2ZJCoH3o8O641z57pkd6bI9w1KFalO68y82pYuw0Fpj+nzmClWa04VA2R8SOtW5F8urJunwMhp18oV40eQLRbBn2ewLSe2iYWlvr10qz8nylQeFdGuDQnbuuO3u+07uOji65q+vFJTrj1x1/dVnXhpadz/P774u9Ai/Jh1azLLow0XFlizeAUnlTnZzbHTscDFrDMeD2pgCUNwW8NzdEVCAzXCyOaMYwWLLwgeJDgCJDZ2e1AXjKZYwaHYrvlABuZPV7vCOLfxSq1Q0uoMFbqapa+sQfF513oVWbNYulgfWGXzSnsO7V+1JNCea+/qaj6we7WlItXX2NPUWmgLxeCCd6c0LvoNXrxmMd0ebvIHmRHp5Zv3O+gEwcBPdyWRvQygdqU14Y52Llk//T+Bt1gcuBlkfeCPmot5OJ3jqEp3gTbM6wZ8y2YOJhkY22dOt+JOF/4R2cJQml2kJp5nnI5doC6dfGzuRJWWcA///4Px85r9fCufHbhwbJzPWOQ7+5h0VnBtm49xUwbmF4VwPONe70IPScE5jXIoXrnF3pJGhHY7EONpFf7SO+SZNDf8+xLXI/eVGAHSD3G46fdpwqUkAwtqbbmrdtq3UxCYCVGhAgAYtJEv+W4UGbZwGTWjgAA9MxCJNsLOT+qkqsnRWyJJjZEkDWdIuJVMhCzY8p9FjA7Kgx5aRngaqRGLJFo0s9QlGls62S5JFiWHbc21L4S8QiNvImolsFC9HqXxyBRjMoZpC4yjYy6Ea6yVJtm1zR2vNlo7Wkp0TTafOifgj0KyRtJM+8ukK1Zpnc06bRiK0CntzShT0YRb04TxGr5Q0NVGbQn0Y53ov5UJGUoknu1xyNwaMMvzDTGaymyvF+WhQomdrCTKaFk12Vt/bzcdLYI7238Vi1dELbZ9VnZuTkv1q7Wy8iZHwU5q+nYuW16p6dvp13IefVX8r01Scz+RPK+khz70dCSSnM5MdPInQnZlsVJMI+WqpBDpqsp2nDdqrZdREkwtctckc/yiXmWzi1Ye9OFi0HccKByPJxpY0mxfaJP2lqR1KN+g4pSlReJvCq5xC6CmnDy4jzPQ8odAfCdaEwzXBS8m1v2/r729r7e8f7opGu6Ll/S16hFrSQNpgfz/FK8vlaE5JAVVrOFUxq4CVUJ3ZyfZAPdK2HT5sd8kiFhG0VrZ3EmiaZMkXOZ1V2kHLB7JI1gzOjVA3e7Is93XShMlen0ICtruLTl6BDrwq1URZZSbs/dow2/uBFNYS1MaSzezLWDtQXdY7i6CB2SMnKqRtBNomc5yYS3o5MU8mevZXz6I40b/wpvXb9+1a1+UYfIR24FwKJGhPBxB040ZtPMXWrZtX793etrDp49pMEiebSdJIbuAzSdC4rR5Lgg1q0YpSVN1kbFH3u7lGjFkxa2ES7W5PTW2igXn/mF6Sa7FIsegPoyCU7W93lsmc2YuZ000G1mq5CyzfMo7vrB510qVvq8pcbHPey/iFzREBnYhzRGpxGvHlJ4mELzFJJKJOEpkUra5giA+P+/fOEgFP3Tj3PBEBDJtZM0XeVO0Zjkfg/xE8wFiZhcffqzZKZT1qSBR7Y2biEQE8QhyPEOJRV8YjxPCoVfGIaekaD87TfRqw8fqCNQwf9yTg4w8wdpyJUegyGKnWiDjnsJc+boYIF818Efzc/vjMx1Hm85k1fwTcoiRBMuT+2djVA3Z1HLs6HBWdkdtyih80aAo0aEcZ1brshMeMSrSmnFiJcbwnWgwxON/AzzdkJlu4/uyEjxtg601YXSIbw9fCe6jNVj5yoE66DOYzsueAfnXE6iJSlLVjEonxN5pynEmVHlURlu78+GtlnSgQD+zIEqw97ytScytsoIdJGycyK0njgQ1xx7jwDdgE0/drs0kwl0AF2Atv7zqYtggAQzaNCx8GJqxc58L/hOt0Ajwz8jO0Kj9j+Qv5mVrOFyvHhQ8xPpi+V722eAGHfbUDL1hZRGFYy8/wVhq5ppKfYTu1qr/HZk0rTgvLEris5bxMhKEzOxtTvXQBbWGuHxe0VRE+r9knWxCw8q/qfKW3RBPA1oSx0hoWBTRg1R0OREAY7RnFgVuQZ61xyE+YZ639Fp61DjMzmMkOuV56RjQbXKAJrDx7jQE2P7azmLHgQG9ghoViwooEh1vBMBLTgxh6a8SQWyNI/aoonFrt392VYhMljq/bmhNrtqwYXNm60LslP9zTv3HlmSt2nd4x1DcwKua2dC355ZG7++mNS1bG1vocw97wSGZg/pfPnn74jhs3jh/aWx8b28hnytDfgG/gIjHEWZt0EkWXgEe71WzN7OEn8UsNP0FyYK+7LLGxHjgCxT2p9/hrmZNk4tXfRPGjaSvFCnONRBFnWflVI1J6Ztn0M0emCH+rGvKanhOcwMsWVquybM7pKf65pqcEtBC+KJjcVTmHS81PwUzIjBkqLqa0quao/ImprDJMgf8CmLxMAVXB9DJTP7PoFCQbVZi8GkyByiC0qumxCBPW47r5SGHZBxpHsNmdEhsjq+f1xQHvXBBqemXm8JkhLjisM2bQCAGuTB7gs2g0WAnAih79dSqs2EUZZF2UenxqQhBY1qdXwY9V5tKr/kJUBT+hhjAQ/CiCb3f7Qhr4HmxDi6jgKy5MLFpDsxG5yBudgdHwLF4Nz0QtpjmdNzHkdOqsnz8Cbn6Q4c3kNhW7Gm0lwgbM3smpnOIw83wwj1QEwMW0BlA7SuV0TYgjOdGgD5kqBWgZVU+yUAY2GMkC66gyhVlHFRshE66Zc9Fm+I0MzxlKUcV5uSZyQ4jssxVdqGGd1/TgLsD612VNyJ6PR9rod4QhOLLyJ5SwETQYXbZmJo38QSVEnbsJZNCfl2386SGurNr3iRX/OrXaVlDfseeo1Iy1tPwfdY+NPc+fUvIUvjWpfHUaaP9eNQdk5jkg2ZVjCiCS5Y0A+hx7zktNtioL5D4/4XITRxpzQRjnnnAZrfBbXMJq439DNijyqwt8+HdNu0MOnlMSvjf1cuRcJR00/5e/2jNnOqj8weXTQRMmTzDxb0gFWcnbSgWBOiqcPuavaRxtzs8/fVXYAwe98/d2X++1vfug03VXFy69/ib/6diZDace1p/y3xI7s+n2VnqDULpGfOnWVtBBbFYOyB/MWO+65LQc3+Wn5fi1dIjEPCun24s62OZW7Kz76NKTc9Aeqp6esxRk98wJOsI/ovTW4AwwOHf+R+BEv3fCKTExzkf7yFYucd4+mLtAnM8C8wkm0KvpGSAHLwln8PJw1qj0VKQATmqXJpxu9kxNICmDV1IfMHo5iJmYrwY6ymX8LLgfZzKeywA+N+mPLGPdRN55Cegxa91YyVo3l1GRMJQWKOedKmixQY2TEf5JJKNlsiv4tmiJbCdLZBsuj9pFCSl+XI1rvSYJv60JwVlof0MVfsGKEBT4vB/gMawqH7l44o9nrok/3lkTfybsDqfELIRLDf3BjNWswT8p4KdZw3+Yb1Ce/8Znyu4lF4+TZY84rp7+pgiObHb27Dc3s1YuPfVNEfTqk+UC1aNlq6a/8dGym7Ity3Gw7HfFZ7XJsuXxb6I6L+mPQL8Qz3HMpCByfUNOcQPjRHnG0nl+0seLvqjPCXYDcfEBRC42hlAl8URcrwMtWsuZpjajhnJZyMfn1B5hUxRYD9VlyH4Jtpm1FPsu4pzZC/P5i1kH1mnowuviXvaMm3rs1Hdrz5Rhj7sJqQUMGAXkJQ1YYWaxe0X+bEOtmgVsCbXag83xs2SL9ghr87VhjaPdZeZljJEAiDC92yuqddUmluCz4CN1SSBS6VMOxMGtDuR8CYMx7otXezHoxAx96GRbin7SWnplwPSVr+iH6FBpRbL11Af37127de2mDev20E2f+LxtdPTh0Q+uGrV95lPvfedtD77/He/idqC4QZ3jnCKPVUWScaKSqq+NOXxAkdyYnUzYg4hnAp23plkZLcXuYE9YBn5FzNDDxaqWOnRQgiJ30vR+3nFudDK1YpGKNoml/ZVIkD8jCL4k4ZcS7gkLqa3jM1mqwnqXDGgib+tZiOXU0TP53A3VsYV3dBdOXXVy7zvvuuud9AoeaTn18NGjWlTh8OEHznz9xa9/9ONcdvKc9lE2vyKG8zdnZLVBdERzit2M9gtz33h+G+wVE7C2hbO2JaMO0pjws9M8Vc98OqNLzYHLYUnB8O7cufC5U/VaevzaOWpYq5LlbbPy9NjLfDs9JMaIgaQJG5SQK7czG1mUQOSj0vmscYM6a1xVPahuUrecEZ685pq29esJ742+n14JPr6LzCPozgvgMOgFO85Y0msjPSdN/Jps5BM+aRWEgiqfFKNJm2xVZfgbjNHkivigPVTTm1wRW8jKB2Ww7kNqKdaMmQ1kxkSG/8hnMfjsF+yzwEVzICqDCGL06+xP2PeFf/3L3xfOq9/P09fJl4Q/gzWeIsgZ2hOZ1aeTWfkkKiOrw+SFG56uAZrTHsHoWlyoDzT2JIVcsP6+R1x1oWRSjbPDdb8K1616hrDp8s8Q9lQ/CxCumgrVNkqL6ev8qiFf8j4ev99Hvgp8//avG5jzuo9VXxZ7gunr9CZGhyAZRkrI/pxKDBA1mm8M9MCOFgyOeazcNy6TBo08HQsfO6WLCVU+TlRR7Wl2AABV0y9URUkB6UhPMTrWIFyghe05FWkWRgtpeGO0FMcC+q38sallEqAGBj3s50+qnU3o3JzUOT0X+asohnG0ffRmtg7/aXAF/jJcpzi1XNXLpx7VxBl/rCDfp0P0FWIk7drENTPvzzfreKCUnp/Us/EI6psaMtUaOFcsPbR06SEaPzS89NAwl7kD4LP/gD17WiK1WG/LPHZXKJdT+/4Vmy+bnfkk6rA2CECdXaQ4rSy2iUN7g9YpNbDZUz3DiN3+4qdVv9qMHuyrM5692Vz1qj1zOUcjrKe9kU+z0WQnR1IWs8xQ1qNVpitUzbd5snqkzRzXEivXkoWsRrPytdhIgBmN8mqLPJ85KwTBVqnHORN1moFiFvjD2SYJrTPbmT4nuinZD9fWsRPunKLXocPPzBXhvFyfZU8bDGT5uHWXixXggmpSewYdeomPPIA91p3I5/AxsSzFZswZEzjZlQ0o9LGnQ4acyzc7V/vv2jW+pLWr/67Qb51T551fso0tXTN/YO3BW92/XbC1//ht7QvrP9W/dcH4+uy2httPsv4I2iJ2sOfS1JHPE95IYrbnOOxi+ans+LxskxMLA2L8qTvuSzx1R9Zzz6UOPJM6lxxGz8XsJlEdGzkV5kd1fOs44Tse/ILDTfbq0uVmua7XRlmPmJ3PS/UH3pQD58Cb8mMXIZ2w2f2BsufvCavtAVWP+sGndfBmOJwPx2ahsu2WoGtsN439ynVwi27NEeeomQq6jYt36gRQ3tcMDpY+Q5fCz7tAmZtLN/2D1OCJlX5N3TFPg/QPnH9QoNoFO+ycbh5tVh8YUn2sTSrhql3T8FxDdUpxCS8w/Xt+PXy2wC/BNwngHEB1XsmMxwt4Ko8XANvfz5onfGxAddHPnujnx44JH/dVJHXWBOsjMFjZw7sVs4klAi//GIK4lJD4gwi2jo8tiXX19TTRxm3fwCcRLBle3zBY09g0PP1bnMOIDyNgM4qFJQB3nBzjM5dnDSqu5dBHsti6bsDsQ5ZFMWMMgToLS/7V8SQmWqwYy/Ri2MYQZvYpq8GmfM4DPgvVh1nAmZBXTXPvlmY+TGHb9p55m+udnkBDKjO/o6+n5SbrVSoqHmn6lhbjQndfn9AiAVLa4xX+NzbEmTR42mNgZGBgYGJw0l/V9T6e3+YrgzzzC6AIw/k1rKtg9P+n//mZtzFvBHI5gGqBAACG9w3+eNpjYGRgYJH6+4OBgfnP/6f/jzBvYwCKoIDXALfICGB42m2TwUuUQRjGn5nBaJHMkGVrW9Z1F7dSBNPFbZGUXDM1Dcmlltgw7BAbQdChYxSERKeFCOoQeOwqEXjp3L9QEXXqEEUEBXso2H4zfismfvDjme+deed7v/eZMbfUJx6zCLFtJs1bVe2wemHQPdQlF1PN9Khqzuo45M2mDjNXY+2oearTPsfuV51YAaahCHk4CSUYg3m/H4yGb5DLeNnv49X80YD7qxlb1j57h73GNWEbaEp18xO9x/tLxiNQUIe9iDZVdyniG8xvovORrqB9Omo71G3XtWLndNBN6IgdJC8PMfXyH2VfMzqKpuGQOYFmNWSXtGo+UncFsiqZJcVtF/1YJJ7QeZNoNa1jnFXVXdOqj9tZ1pLnc8x95j4oaW6TN6Or5oc67XvFzWdZ802d9C/Jd5PmidbRAf7/XKjJxyMPot743nVBt18b+vRAaZfRZVvVDXss9LnmPbBrKuNjmvdTIdbQCPSHf1qgrk+6EvqeU5r4FPnXfb57pqmIfjw4E/q/By7Z+h08SW150gY/clu0fkETzxLbfuxmWDeDek924j25QM4ydfr+74Gb1VDwJPs/+NEDCTz5Al/tGPG2H7vxZ80rnuzEexI8R91zTbvHrKEm84hercE7yW3gS1vHuTTf4UXEXXgDBeb8fYjgTGVcQhm1VISSx7xWEUrmFTS04JKa9LmmQrzKOvalziT3LmcPMJ7jDFUU/wcEupKyeNpjYGDQgsMChhWMDUw8TBOY5ZjdmPOYpzFvYf7EIsdiw5LBMoPlFqsQawzrPjYetiK2W2z/2EvYL3BwcbhxRHFUcfRx/OCcwPmKy49rGtcdbgluH+5N3K94OHi0eEJ4Sni+8Frx1vHu4xPiS+I7xfeL34A/if+eAJ+AnUCOwAyBEwI/BGUETQSDBA8JiQmFCW0Q5hEOEP4hYiZSILJB5IYok2ia6CrRN2IuYkvE7oi7iLeJn5NgkKiRWCXxRlJKskyyT/KVlJJUjNQ0ILwkbSY9TUZAJk9mgqyKbILsK7kUuR65LXKX5PPke+QvKcgpJCgcUXik6KTYoLhC8Z0Sn1KSUoeygHKHipvKGlUh1TLVe2oJap/U+zSYNMo09mmyaQZpHtN8oyWk5aA1Q5tBu0z7kA6fTpzOCV0n3Rg9Cb0ovTl6L/TD9Pv0LxmEGVww9DI8Y5RmLGC8xyTB5IqphekcMy6zWWb7zB6ZC5gnmN+y8LCYZHHH0shygZWCVZy1jHWB9REbJZtFNm9snWwP2JnZHbDXsg+y78MB59ivst9hf8H+hYOIg4NDjsMORxbHAMcqxzNA+MlJDAhrnIWcrZynuTAAAMXvjoMAAAABAAAA6wA7AAUAAAAAAAIAAQACABYAAAEAAVEAAAAAeNqVU00vA1EUPTNTX/ERCxGxmpWQMNoiaEQilEh8JDRsLAwd1dBWphVh5UdYWvsF1paC+AF+jvPu3DbadIJM7pvz7rvn3Pfuuw/AIF7hwEr0AHiiRdjCCGcRtjGAF8UOQnwqTmDcWlbcgVHrTHEnhqx7xV0oWw+Ku5GzbcU9WLcPFPdiyX5U3IdJ+0txP46chOIB5JxjxW8Ydp4VvyPpfGANRRRoNdodAuTh0nzOfaJTVHCFW+7cRJ3T62Kc3gn+00gixXFK0Qwm6c0xKuB/m8w7si75GaVVzkNqmdGXbBWU6fc55oUXMDLAmfiLzGFY+/CwQlunJ1SPYVSJdsnZI6OAa8kRMocZQyoUGdGaMcAGTsgYQ5YZA1G5YmSAC1qIkiiXmW8DGerH5cw0zj4TG+O27OxAMlQbp07zTEnRqCvU+YYdr1oUbFZqEmHOUZIMF/RVWL3/3oDXUjW3Td1crZzL2rm/VM+V+v1F83ct0281rmQwze9GPk96NJ7jSc+WYrinTfuqx25Jv0Wa0Qu4lq40uqbSUT1XqOYzLpo1c0znt7/j9vvwf2h5UpUCVy+bNKv0bGGTtctih52QlZdmNA+5eqIvxbzIVMObl3v3+WJN/gVZm2fuNBY5pjDX6N3Zb0bzvroAAAB42m3QR2xTQRDG8f8kjp04vfdC7+D3HCc23U5seu+dQBLbEJLgYCC0gOhVICRuINoFEJ0AAgEHQPQmioADZ7o4AFdw8pYbc/lpd1bfjJYo2utPKzr/qy8gURItJqIxEYMZC7HEYSWeBBJJIpkUUkkjnQwyySKbHHLJI58CCimimBI60JFOdKYLXelGd3rQk170pg996YcNLTLdTikOyijHiYv+DGAggxjMEIbixkMFlXjxMYzhjGAkoxjNGMYyjvFMYCKTmMwUpjKN6cxgJrOYzRzmMo/5VEmMmMXCMTaxmRsc4CNb2MNODnKC4xLLDt6zkf0SJ1Z2SzzbuM0HSeAQJ/nFT35zlNM84B5nWMBC9lLNI2q4z0Oe8ZgnPOUTtbzkOS84i58f7OMNr3hNIPKL39jOIoIsZgl11HOYBpbSSIgmwixjOSv4zEpW0cxq1rKGqxyhhXWsZwNf+c41znGe67zlnSRKkiRLiqRKmqRLhmRKlmRLjuRKHhe4yGWucIdLtHKXrZySfG5ySwqkkF1SJMVSYvbXNTcGNAPdEq4P2my2SkOn19CldNuUqu9R7z12pUPpalOPBCk1pa60K0uVDmWZslzpVP7LcxtqKlfTrLVBfzhUU13VFDCudJ+hw2fyhkMN7QeHr6JNn8fYI6L+F1L8oV8AAAB42j3MrQ7CMBwE8JWybuyzIwsO0hlMXwDQbGZmQa0Jr4AlwWGQ4HmL/1C8HRxQ6u53udyTvS7Erl5LYdcPjN3M0AjdVyRNS+UO4WzmJPS+94irmrjeklD1gx9G+gsfEBuLMeAri+AzO1mEQLCymACh/IFRZG9jtBHagTdHMAHjmWMKJnfHDEzXjjmYVY4SzJVjAcqF4xQsln8aKvUb+YhJnAAAAAABU4ZVKwAA) format('woff');
-}
-
-@font-face {
-font-family: Fira;
-font-style: normal;
-font-weight: 600; /* "Medium" */
-font-stretch: normal;
-    src: url(data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAGaMABMAAAAA5xAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABqAAAABwAAAAcafiXXUdERUYAAAHEAAAAHgAAACABGAAER1BPUwAAAeQAAA2GAABEdIU+i5xHU1VCAAAPbAAAAh8AAAb2Y6MJv09TLzIAABGMAAAAXQAAAGAQmEjcY21hcAAAEewAAAGTAAAB8kpEps1jdnQgAAATgAAAADYAAAA2CdAGy2ZwZ20AABO4AAABsQAAAmVTtC+nZ2FzcAAAFWwAAAAIAAAACP//AANnbHlmAAAVdAAAR+sAAIXs9k76gmhlYWQAAF1gAAAANAAAADYCJE9UaGhlYQAAXZQAAAAgAAAAJAe1AphobXR4AABdtAAAAi0AAAOs294k02xvY2EAAF/kAAABygAAAdg0u1P4bWF4cAAAYbAAAAAgAAAAIAIIAZpuYW1lAABh0AAAAgkAAAUyiuuvC3Bvc3QAAGPcAAAB9QAAAu6b+3zWcHJlcAAAZdQAAACuAAABF9ZTawV3ZWJmAABmhAAAAAYAAAAGVS1ThgAAAAEAAAAAzD2izwAAAADODu7hAAAAAM+sBax42mNgZGBg4ANiCQYQYGJgBMJXQMwC5jEAAA5YAR0AAHja1ZxbcFXVGce/E3JCCJBoeiD3kIRrTdUKomipCglIRKtC8ILTanHUzsgwDHWYsfXBFwQvD53OdIIQq7YWL1TMTBuBAEXtEclLHhofDjUx5rSdM2X2TOe87M6wp939f2uvc9lnry855+REp3vNb1/WfX3rW7fvEChERFX0PB2h8u7Nd/dS4+PP7ttNq57a98TTdNPuHz+zh7qpHHHIdakMj9CUX6uoYsPOTW20qmtDL9+38f2ee+/Gfdu99+Deu20r7lkpyh7f+9O9VP30E/v2UET5kLojhCqoWn2HEMKx59C68H/brsN3FYXhquAbpuV0G8IO0FFqpNfot3QDfQq3jj6Du4VC4R+pOq6mPaF3QidCF0OXQxfLyss6yn5SdqJsbE7jnDvKT5R/Hq4OVyMULhxBvIv4XsF+4RvDt+L7Mocq7lC+1V58db/MOXKK0EX6AVW6FjW6CWoGS91BWo7vlXjvBGvAWnAz/Na5b9IteN7qRul77jitx/v33X7ahOediLMF9IC73DhtxXM72AEecpO0E36PIN4P8XwKfgfw/gI4CA6BF8FL4GXwCsL7wGHwKjgCjoLXwK8R/jp4A7wJfoPyf4fnMfA2eAe8C94Dx8HvkeZ9cAJ8AAbAIDgJToHTYAicAefAJ6hfFHyK9wvgM+T/VzdGX4Bx8CX4J8IvgxBtRS9X0CLEW4zvOrSzwbWpCXFaXIcqKQKfRe5xhDpUj5BGfDchZjOeLagdp7UQmkBaC2kdhI6otHPpKsSpVfEt6sJzDEyASXA11SCXq/FWr9KlcraQs63StyG8HXSAXQjbj2c/OAti+L6kc7FRjo1ybNTERk1s3YIkcrCRg40cbJRvIwcbOdjIwUZdbNTFRl1smp+uaR3a7dWH68L1SARqXqPL9FIsUnKwc8pK5pSVST0vK6VXyxb3SqCMR1DGKGL2Q0JxxO7X/fBvtO8KankFtYxpqbHELOSSpFbUdgloQ9p20AGW43slpNkJ1oC1oCut8RY03oLGW9B2i+5HHtvAdrz34rkDzwfwfBB5PIznLqX5Fu3D937k/TP4PadGQgIjIYGRkMBISGAkJDASEhgJCYwEByPBwUhwMBIcjAQHI8GBbEYxGpxpNN+C5lvQfAuab0HzLWi+RR+i3JN4ngKnwRA4A84iz3N4/gnh58FH4GPwKcq5AP8Y6n8JjKH9E+Ar1G8ST3+f1Ol+ye2TasSKIlZU61lSxaxXIyaJfkj1Jvd/FCmjSBlFyihGGYeUow1RtCGKNoyivlHMrNW0nproZkrQfSqWpe7e2HFQlqNr4iA/B/k5yM9BnNWYhRdAE6/CCKjFCF5MdVRPDZiLm6iZWqiVllAbtVMHZuTbqYs20120nXrpQXqYHqVdtI/203PUT2/RSTpFp2mIztBZOkd/phhdojGaoK9okkKNjWoWX0Adc5+pbK1cN+8v83cv2L/wq+qhuu761oa9oc/VzGuCZ2MTzQI8a5vgmdzESqXXQToF1gisFeDVwgSvICZ4VTHBK40JXn1M8IpkglcpEzyOTfBqZmKLQI8Ar4QmeHU0sV1ghwCvrCZ4tTXBK7AJXpVN8EptgldvEy8IHBQ4JPCiwEsCLwu8oubQIH0ChwVeFTgicFTgNQHe1Zh4XeANgTcFeJdkgtcPE8cE3hZ4R+BdgfcEjgvwLs7E+wInBD4QGBAYFDgpcErgtMCQwBmBcwK8azURFeDdrYkLArwLNsE7YxNfCIwLfCnAO20TlwWuUXsRE7UCvGsw0aX3MLmMCUwITApUpPfdXTn76SfV3t4E7/dN8J7bRIPezefSqHZcQSRZ8JnCBJ8zTPDZw0S7QIfALrVrDsJnGRP9AmcF+Bxk4pLAk+rsYuIqgVqBRQKLBaSebFK9FqRNn6lyaRfoEOgS2C/QL3BWYExgQmBSYGPB457PqibksZQ00qR6IQiffU3M9ryycwodLUxCiwRaVOuClE7nzBIqnc6VRtI3FSFR86iXRjHbNkzMsg6VdSj7iQm2qZi4Wq1OQdj2YoLtMSbYRmOC7TYm6gTq1UgOIq+IlpFmgRbVO0HYhmRiiQDbmky0C3QIsJ3KBNuuTHQKrBFYK8C2MBPyudrMFoEega0CbIMzsU2AbXUm2H5ngm16JtjOZ4JtfybYHmhil9r1BGG7oQm2JZpg+6IJtjmaYDukiQMCLwgcFDgk8KLASwIvC7Cd1ESfwGGBVwWOCBwVYPusCbbZmvj/OYebeV/ghMAHAgMCgwJsyzbB9m0TpwROCwwJnBFgG7oJtqubYFu7ifMCHwl8LMC2exNszzcRU6eiIJcE+LcAExMC/JuBCf4dwUTp9lh1AtLea7b36b3q9xATtQLymTFpRGpxvbIYBJFOOI1qfxRE3rWazwf8u46JMYEJgUmBa9SvPiZqBeS+d4yMCUwITAqU0RyqgiOKUAuF6C24+VTW8Tn/XrRkS3uE7oLmkzvqjru2O+Im4WxgseRpGd4TroMvHgkJ7JuHKYy4cYaKvDh/3BN+P3V3VKij4bokvTB8c71sL15BpTnqPu7GXLa3+HzTZTeoZ9wdxr69RNfUNfVa46tlzUzLQvtYZp4M+c3zTWTH8iSKc8K4ewjtTQALdz61J6aWIWbsErZ/2tTcF+PKJWghzyVaL22qStUUYSPuiK9HW/V7Il16ldIdx1jGoCpjEHIb4hK190LEHwVxbjHyD7vH8YzCbyBTWnZPBiSVLIH2ODNIm1CjJhaspRpXqTGWyO4j+MTTIzMJqSRNfSmNP7+vOx6QSNzvw1qqx2XcfUaVGM9NHSzJK91fb57XCtO0/OYQXTvbN14dCutR5M1Ptg6xdCvVvJUl66RfQ6YrF9o8BBIgBs3kJ8+82qkYw3CjrNXeiEScGC2FZh6DHAego8NIY0Ei5zmuznOklLpYzKhW84yWBupqez3IGqDmKSc1M6XnKK+9EUjhOMJ53vb6vEbNcIngqPPplpWqr0qVDPZl2sdJ91INUg17Es3MG9ONRcQe0TMo592g1isn0yIt/1HVY5mcIlpr8pqjsnQjypJQ7+dRBsvRUlJMejM9wnk+TKTmIMSIYZ4fcftQwyFOrSQScQdSM7l/nPrWphGkycgrnD0DiBpSpdPmNfupGlnuYJaOpNox7s3f8IkpeaZqG/Pe9T2Z3Q96vFlTaWdOWCutz4nQ4Ov19Xo9rlIhreotko5RRau8flQhDfheL6/z06zauetqVREjzJrB6LZnZ32aSZ2ytSKviJuz3tdrHZIl7/XVDirZlVvLmazevmvpjGtmqRWhmKumNH04nazSZTlfn/YWW/Npx3IykMLxhdtTSsHrr/HipK7Wr5y9jaG+DYWNUV7P8pO6Yb92xb8rLVLsDYXrRmbvVWC6qH8FM8onEiirOM0dzaOeNTnaNDp9u4wxqgofKerM/7VeU4yupN5VxWdztSlsBlC7kLxkmnuaKuwsV7LKhwX/VhVW44sXTodE0usleWcP7D6T/pmQ5yzVSludlzP+sZLL/z+ZswLvoM26U6wuoB2x7LRfl/6j1Cv5j073l+6/SlKqd/qx6Ju6GkqwOxzOnhEy56yp9KfoPhryff/DHYQGDivNH/SvIN/8fJlXexK5EvNOzulT83hw/OoTWmLqWS0v+0o8e3dg3lmpslT/so1optLJsjHEZ7VXnMx+ZTp7WeH7FOzmz6XmWO+knHfKY1K/5DOfZHaysyS1eMYeoiwVyXz7l21EBeyEcm1EBc1/nk2tkPOwZyPKbmceO26nuPXHsxGl3vNZf9O2lT6pXlPbiIqbi2ayrupfhIZUa9lCdN7UByU6FUZodQGxW6cMiZR0tDxWgE6wDW1WZ7ysGeY4VsS+9K53ZLoV2aSh02mH+5jaeUcxX1iZ1VaYZ3N+Y8z6tSiZOaOmaqntiF8Efq+IZ1ai/FeB4mxCysLtZORinnf9s5b3W45hH5zMlWuprSXuwAwzWD2D0OC1Na3zcchkJKhValaMq/l/RD7v+mzLySl1M0SV9DdaoL+2qHsPdVE3IJqn4/C1RH3Po41wPcrdqUPL4DuHyvWZq5oqaC5y5dhVYD5yXwjf1F+QfkuXQqqExci3Dk/vL0q9i/+qlNTflXKZ3t+WsiVxGS3HfYVO342cpGsT2Kjfe7L8U36bjanmqH9r4LnUNU+32nM9oFq7WrwvQf0zrl79Zazn+GqCS7XDcz2qRd61FO9LVctrp9WLbrgNcF36vlHJbpOvHS2qL8epM+1zgzoHd6A/OnLyq9RcDxdWjmXfrn0p/WxKa3EqRSdKuVbJqRk9fl26HC5hOVimHCmI1qj7Crhlmu/QWtxZM1bi/l2dvkLnlEqXfc1V9fRbAFZk+WUszO0+V2mUZGXahcG12qn/4wL1z3bL0o6UFrbpNqRcWH17ztOSSviUT9uXFXA3wnXo+/VKdnPRjjJVa673ArgQRkwt/CLqf02og5uLXmpEeDPizkMNOzGeroP06iHn2+HbBfdtaMWddA00bSvadS/dBxlvo1704QP0EGS/kx6ldbSLHqfbaC/cHbQPbgPth9tIz8F10fNw3XSAfoG8fgV3P/XRAHL5A/2RdtOHdI720CcURYoL9Bk9SzGapJ9jFvk70lyGO/g/Q5IxBAAAeNqtlEtrU1EUhb+TVzVtbawxlqASpUqRUrQUqSLBalqkpg9iKFJKaUjVgaGRNKKCKIjOOnDgzAeCDsUf4Fz0Bzjyd3Qo1HXuPem1RUrShM3di3vPXmvvfe45GwPEec1vIrmpfJF0+UmtwvC92p37ZCul+hrzRBTD1paHhhDhpr4MEZtYnMwwdH2iaH3B+pm5vHxhbka+WLgpv1unXKrUSd+tlcpkqrXVNbLrDx+sk/Mi+uR7tzNGidHFAQ6qg256tGJjDnkeDjPIMFfEzFNkiVUq1HnKSzZ4wzs+88WLM+o+JozygU0zbV6Yb967MX98DJ11uOBww+FPH8NxhwWHHx1u+hiZdfjV4S8fozGHI34d0WX11aPOnvGIx/oW5igpjgltlf3CAcb0P+yb4YiiI67rPlmIJCcUc0rWu+eazw5v61ltOqZqdRJaSzHalGaD5zMsl5Z4hrSepJ6L3j4m2uyjsduGEae3dxU4RlIr57WfzXECXko4qtovt8AM2AOKHmNc5/xqi/xAI62zb/NnucbUPlQCpeM60X4tOW7o3u1PK9A7qfvdqGuaWQptKAaqGc2MoMZ5TYfbbeoG2qc1jf6td4FFljugHmQY1LTbWfsSK5puncnh5zGcc5OUJk7//29gpGlmv8ub8Cb7JLe8+W6joSqL81zW7cWndsXb+qKc0Z7DK95K7z2fuMB32Tg/ZJcUEddTlYbT/wutbmRzAHjaY2Bh4mL8wsDKwMLUxRTBwMDgDaEZ4xiMGG24OJi4WZlZGRiYGFgaGJjeOzAs+A1UowDEDAGRQcGMBxh4fzMxC/7XZGBgkWLiUGBgnA+SYxJk2gxWxw0AkX0NwgAAAHjaY2BgYGaAYBkGRgYQeAPkMYL5LAwXgLQBgwKQJQBk8TLUMfQxzGP4zxjMWMF0jOmOApeCiIKUgpyCkoKagr6ClUK8whpFJdU/v5n+/webxQvUC9KxgDEIqoNBQUBBQkEGqsMSroMRqIPx/7f/T/5f/X/s/9H/xf/9/zH9ffvg1IOjDw49OPhg34PdDzY/WPWg7YHV/aO33rC+gLqWJMDIxgDXxsgE9TeKAgYGFlY2dg5OLm4eXj5+AUEhYRFRMXEJSSlpGVk5eQVFJWUVVTV1DU0tbR1dPX0DQyNjE1MzcwtLK2sbWzt7B0cnZxdXN3cPTy9vH18//4DAoOCQ0LDwiMio6JjYuPiExCSGzq6evmmzFy5bunzlilVr1q1dv2HTxs1btu3YvnP3rv37DhxkKE3PyHlQvaQ473llLkP3XIYyBoasKrDr8usZVu9tSSsEsQsaHqa2dsw6euzGzbv3bt3ew3DkOMOzx09evmKouXOfob2/bULvpMlTJs6YyTB9/oJ5DCdOlgA11QIxAFPqkZQAAAACEQKzAGIAmwBTAFgAWwBcAGkAfQBNAIUAgABzAHkAbwCFAIsAogBgAHEARwBCAD8AIQJ5AAB42l1Ru05bQRDdDQ8DgcTYIDnaFLOZkMZ7oQUJxNWNYmQ7heUIaTdykYtxAR9AgUQN2q8ZoKGkSJsGIRdIfEI+IRIza4iiNDs7s3POmTNLypGqd+lrz1PnJJDC3QbNNv1OSLWzAPek6+uNjLSDB1psZvTKdfv+Cwab0ZQ7agDlPW8pDxlNO4FatKf+0fwKhvv8H/M7GLQ00/TUOgnpIQTmm3FLg+8ZzbrLD/qC1eFiMDCkmKbiLj+mUv63NOdqy7C1kdG8gzMR+ck0QFNrbQSa/tQh1fNxFEuQy6axNpiYsv4kE8GFyXRVU7XM+NrBXbKz6GCDKs2BB9jDVnkMHg4PJhTStyTKLA0R9mKrxAgRkxwKOeXcyf6kQPlIEsa8SUo744a1BsaR18CgNk+z/zybTW1vHcL4WRzBd78ZSzr4yIbaGBFiO2IpgAlEQkZV+YYaz70sBuRS+89AlIDl8Y9/nQi07thEPJe1dQ4xVgh6ftvc8suKu1a5zotCd2+qaqjSKc37Xs6+xwOeHgvDQWPBm8/7/kqB+jwsrjRoDgRDejd6/6K16oirvBc+sifTv7FaAAAAAAAAAf//AAJ42tV9B3gb55Xg/DPodQaV6ARAEiQhEiRAEoQaJYoU1UVJlKzerRIXVcuWZclUt2XHTtzt1PUlm43XvsyAlO14k9hpm+LdzWWT1SXZ9HZLO3HieHO5OCZ47/3/DABSlJzLlf3OMtoAnHnv/e9//b3heC7OcaSZf4oTOCPXqhAuM7to1AV+nVUM+u/PLgo8vOUUAQ/r8XDRaAi+M7tI8HhOikupnJSME/O/feUr/FPje+L8eo7juczEm9w3+RHOzNm59VzRxHFpRdCNFS08lyayIyNzVxS9ewwfI3Y9Z0orNnFMtokjIZvVkVYsrjHZklGsrjHFSeA7u+QaEYwmvs5f4BSLILlkW6GtPd/RlfV5PYZEgzsnJDOZPvzfesl5U28ik0nE29r4h0rzOQ7hWUQ+Rs4CPIjjOq4IR9KyLjcq6DiTLi0bsvSI+pHIpowsXBnlRc4NX/KiwjnHZC6D74wkPWpgxw2iooPjuoxiJmmurd0NdMDHohMbP3JiIz9SepM4S2/CeYMAQASuHeJiZBNXhI/potcXyOVyRSNctWiy2vC9nnDpEYPZYq/z5xSdYWxEEKOxOn92lCNBvT09wkvhCH7FwVcef00IviJybUY2XlFM4ljRaLKkR+YZdeb0SMBkBIIGgaDBjBKAF5OoWAkl8YjXZoXvfHDQl1G88HdeH/6d121OK3GSlruCL/Xc/IebOW/a8lLP0T98At/IQXGEDxrd6RGBPhvwWQ6II+aACd74xBGLzwpvvOKI3WuDH4j0WaLPHnzG3/jpb+CvauhfwTlD2nnC2nki+JuRqPbLGB4X5om8gHQRJUQ7HInGWqf8J88LwgLkO3P5JDxyRvrwJukjmYdHD4GvgivDC1d5bvLeBo++wdDC1fB61HOT5/Yj4aMfWP+NDU/Afxu+sf4D8N/6b3CEq53YyTuFtVyKe4QrJmHV5IacIghjsiCO1us4sy5ddCIfuXKK3zQm+8VRiR4d8dZLJuCixoxsu6IEbbAMolIPtHVmlTogvJSV60TFAAtSaxtTmuA1aJNcioUUCkpdPXC6WfDDSheUWoPkKnq80UIBuN4P3yjEVijITkn2APf3EF8u29XZ0ZBqJZ0dXYC91+c3NiQTBq/H548S2BhGb7KzobZv8fau/q5l+3dtW7lrz/IF81a2z+pes333ni27TyxbsSDfNiPvj+9evGi748nHLAsWdaVT9a3B2J51a261P/aIjdNz8yZ+KPTxX4e9LHFeLsbVc09zxSju6IR+DOQDvBH1Y6P1gahgTyv18NZmpm9t+jEiN2RkcmXUwvaMRVQck3aQDz7Vsk+1opKETyH6SUkBWRwWwF9weQF/2SDJJqCID4hQAwSRk5Li9iBd6hNwKOQD2olAxSJHDPDztnZXR1eOCYe8J5ft7Egm3MRPKhIj74GDiXnbly7Zvu0xfvHAwGIL+caaUtub2x/btu2x7bve9z7yhQ/v3LFycIe8fcf28Y/wn86ND3xp5Q48sgP+345yReD6Jt7k/53/Ahfm6rg27jhX9OPuxi2u1ApjRTMSp9UAZGinIi8CzBAR5fraK5JiAOFhyCj1TjykpHF/OseULLxGYN1loaCkYclHzcHapBO4QbZJcgLwrfXDlzUFuVW6zBls3mQjfEdFYZ6yAUPa6O/K++E5mTIkEVfglHzK4Aa+mAs/Qh7p61mQz+zbsfnAwt4PJH0H67v/6qNLt9x58NT5OYVlhdEBd7wh3dxc19BYnL053bG4ZWDz+v5ZQ82Pzt8aP7T6oQWr9+3Iduf+c5bEwm3JUGc82dSE9CAoZ7kvUjnbxU2WqTpKAALYEnFUYEsuAG9o0lXRl6XoIiY+8Xzhif2kWVjNOTk3R2QReUkxw66R6I9dHXP5vN9BRGD8Vj4cmtOVWbW4t3fxqkzXHGJ69oFTa3rye79S+ulX93T3DJ3C84XgfE3V5xOuKNby+YA6YkMqHxU8Dt4Y0s4UwvNu2/NVEv3K3nzPmlMPwImHehi+ItlEnuF/wTk4zp33p3LGvN/oN6aMqbyYOOc+4j6feGDvlsX9W3fzdTfNfujhOTeF9vUPn+69Gf92GXeA/Iw3clZuNYfqxZhTCEgXPSgjgjKZs5jTRcLhWyKYgYS2jGy5IvNZxQxSRJctmi34ndkIP7OY8a2FAyluZ3TszIFAAAEIImDZo7c8+ugtxHTjU0/d+OSTFO7GiSHum9zDcO0UXnvUoOOMOnYJoIgJNDOcRjEJKHOssM2ANvmGTrZ7nKSxKQGaNtD77LM16URrJhGb9Qics4MYyC5yM6x9As+pEPMYPnDpFQ52tuDGa2jr3Bn3dpAMMezZg/BQewHgMXNNVdaC9oaAMVBlMaAy46rVv6r6NbUP51s/8QiRhVaAhfO7/cL6124dWy0MB965G3iyEfasGfasEeTZKq5oxItYBU2SCXA1F+Mz+5hspgJL0dvHFDe8mgkQhDeCsNE74J1gQAkkWkFmEx2npzuxSwSoREPCJaJ4FmGvNd75qxMnfmXq6i50dRW6nyWbX/q70l9/hvy+9G93nSDBO+l65MBGsMC+sXC9XNGAEBlR0WTBzEKDyZqRTVcUwQ5AUjUv6GHNTQK+NRlgzW0Am2ACwUBwqdz5nJTzxjtzkjH3o0MXS2v+5nE+fc+4vGsX+cdNjG9hu5L/ATTwABcWrXg9E1CARwq4BLAvrDxqMG9GdgLVbWNFpx6v5bTCtUBkc4rJSm0w2SMpeieIY5dL5gB5tyZ/4sZ4pypqjE0bLu674+xHSLujtGT0ZKF18Ux+9cFb16564aEbtyof68vkFzGYvBNvkncApjpuE9O3qGyLPoRJEsZGLeakD5SKxTQ24k76ELz6jGy4gkpUdqBADcAiNSBwZsq2tbBK7iS8cwTgnU8CgKvVZprkmfoECFMa2F6qNpMJ79KZG+cMDM90NGXn97Qvn79gy/DeE0sLvesfOPLQUN+CnvzhzZ3Zlo65i264ccncdXad8YZlG48jDnWwjshbDu4AV7SjLkCajnI6O29Pyyaw3mBZLdmijm5rnQG3tTMj26/Atgczd0w2Zos2O35nw91vt+FbO2xrsI0Vg0g1hoiqgqkITtFxdNXR+gE+B8NH3fN1X7752cccB5YvP/nUDeSbTaVdzz2386mnKJ0bgP8J8FqAO8MVazQ625DOTqCzy1RjAzq7TLD/XJTDrAhlMCNbryiic6woWvGoaAegRGbHeEGChuAVd4JCLFRdjwgmVw3qLa9LdgCgQo2EPCKbJIV4GceIVcsBq5CUgGu86lKA2lrROTh74EBrejO531kqtXXfcODBw5dW9/cum3vGT/Zve853x41774H93AT4WIDmfq6WO8IV3YhRUNvPwNaj9pgbzRE7cI7BLSDnxKk4qQHOsWblGlGJIPDAPgnUvgDoiEmwuxF4EfS0Hjd5LAiocSJwksENiFgLbL/pkelR6zLLy1iGvpXPa4g1PXZu3dxcumP+av28zUO3nN0zb8fMyDnhcK5jy2KSL343vSpyx4Hlt91y030dm45k/nmw9z62H2ZPvEV+D+tkAHkKDAO8hMIAOYjIxoxiQlYnHOUDJk9Jiswmny797jgx8IO7Now/Wc93gwSsBfqIQB83FwFpfxtXlJBCfqAQuh9Kg3GM2qpAEA8woEeUo7ibVN8m6sRDSgDNMfg2iV9ZnMxsjerg4jzaYqOSzx82IsEsKBY4pQGslMuczuIIx1X7hKoPSh2jur5gljD71QDv/PguYag9t//spm0nD91/4bajp8/MOTynb+0az6yeJbmtuRePzpp189D2zWu2zl1wfN3RQ5uys2ZnujqjrX+Y0eVrH2jKtgEv1E38ku4/NxdFKUJZIAxbzpxBwSFLGTTViRyrQpfiZgAOroVXD9BTMSMHB6SiINmY6Q2yQ7Gj6R0GduAK2ppTkZGqy6cSyYqZRa2ruvv2Hhn+/DdDRB8jhHRuXXvoNMi9TG52bg757t4zj97x999p37zgJbLorj1985fv2rqw7DOTt0EHurmWihYEbaTYUQd6EGgQHqgC0ZdATeidogmlqTpxsmYk98YzmXgCVCTVg0P0elaw6ps5OL3ixMv40ASQbVm0AsBXUfzXMQSE8uU0k2CAXbDKMuDXla9JuD5uP3kduBJUnLuz3m8nxj5yYkbpS2T2DOK9/dkt953fSf31ZdzT5OfkW9RfD2rWBPKjHg0Kk+Zz54Hr6+GxjDxR2keeeHrv3q/v3TvlOvkWktd79X1kdulLM8iJ0vmvXbx327O3P0uvEwGd83XglyBI7gOq1onqVE1YYx4bCSZ5VdWEQNVgtKI2ZKKmOjosXrQNbFTt0CDFZb4mEk0kcSPUSrKbCj8zcFAwCq6J2YvsJNdICqcvVJSlQ4iQZGfHXB3TRe4ySSMbz+6+ub6zs/6OQH26PtDS1F8IMuryG/dt7ZvRm6rvTAZjqZ76ZLDeF6/vLTVqBhDFbeZEg/AFwC3DdXOPq3shAXuhJaM0CshWsjWnZPXgfmTlfEapQW+tQDcG+iT1DLs2x5jcJiod8DYE6ickKjHkB5AAM+G1ow1wFmoSjS0uxDkkKU4HoBhzFa3Nabp3XI0gI5oLSj4ruZ43cU5vrN6BP62R5CCVC1wuG+WZQEglHQReqJzwS9RtU91Z2Fd++EVdPRzMd8LBmUT/Lzf+9XsKB3Z29xp10kDnDZuO71832L3lI0988sXnP7F9Z+0tx749wZH9y2ZGIuH3vPkqMcy/5YEVF56dnWrqvOPGk+9Nl/5tzffu/8irH//rLyY3N7391Xt637Bz/MSfgHCrQeaiVb4UPBj0+oUcFbyjBhNHQI0YUP7aKJ2MLlDYoqJD68vFTGadEbQHT0xmGqoiqCMsgGfSnXMnU0kjBqr0//qfvvvAjP82o//yeh0/Mr78ox8lOjKf+ZNDcP1+uL4bODLB7VW1mUezzWD5RkNBN9gSSgjlWJLJMdBjoSyKMtyrDgAqhmLaCIxZBwf8Mdi8VguuRtAjoTbGhbLAbpYTLtkI0IG5yBaBGUAOPplC4qdJp2oqDX2rc/2S5kVtc29oGdzSvXHzheGd6wv5Y0ApKTXQPmuZVWdbvqx71Qz3rn0HN2eyG6n+agO9kwP+83L9Kh4Os6aVzWVV7KMoYKTPjwrNgdpVQgOiyFlB3U6vZyss0dD2zJnbb+ibNbBsy8Zlyxf2rB+++DGy6W9eXrwye/LcmVMzB4c+h3sB6bod6OrgamA3FB0cM3bUfY4rGqBwOIGUTlFxIY8DSEEEqcYJAJg0Mgm4Yxl9WnmgjFLYsrWnMdWzcWNn94KXooVZjQv4EbFlyV1rVp9c1uba9fbSG9vclB4AAxkDGKzcAOMsMFTHmE7XwbrqGXvpK+wFji5186itaAYrDHw/5u+pTl4OLKYkNfji3iHyfkfpBz8gIj+y8/M7X93Fla/5fRqHnceuWbmeSU+vZxLK7tXk6/Fm1blU3a3yxaQhco/z37/9bbjQN3aWflxe6xWw1gHuMIuBKI5qC8wFtqmduRYGP132oLbsslWkFq0XnBvRSy1LjEVq5iR4OX6Uml7NEDP40RCzXpcxOmF9JMocL1w4t37R3FWr96xaMy9zq/2dm+954INk4zOfW72k+9SFS3eGijtLct+ny7Til9H16VF3vpHtfFmfGxUslFqCubw6VqAWn0XwwRIDutH9pq0L+5eEf0Pn3zh//g1+pPQ68Y4vJ52lV9Vrcd+lcZJ41bpoURIBzoQPfflsQ+dRUlA4J34/sZv7KYWzBuxC+mfMbTeUATCC7wV/hWEM67zG89FZvZmZgYX9/OLx4sz1M+tFTtsTBygMZi6pYmwqY6wxBcJhLcMRIjmBJIfO63/z4G8I/yEEihwivaWvlC6U+e3XcE69hhdSTMXNUD6fsXy+uHHoPPE44TyfpjGRVoDpV/D3fu7Dk9dA4fU5gKmGnsNvx3Ar0l0xgtUeYHHrL7h/8x0aruZbHbLwiiJ5/iiLr7w01/vbI3hYL+vhuO4VxWH8o+x8hbss6BxOUWIRZPICL+j0lc80pkwUP/OuFCOymqGg2tt2lAVu9i8pgL7KJwX4h6at0Jp/5pTu+LNdp30Gohu++4JOp/fA4kfIz4BSm/b0hL0lPxmr75i1oqSoPDcI+Dq51Sq+ZnUFjDkan0KZ5KQyyaDqXQlenWimWm3U0VJ4NFdNLrAVCyqEimAtMHnlzjUgI1DopKFPjuncx5/7pQ4gGv/25k+QpvHlfPPuj5S+S/kB9/AF2MNW0D59HIiB6l3sFjQLVLG5MFND4TC4qAmqSBjANgt4fTcGRqYYyWgci6hKxNq2v7p030fxcd9HV64qvUI2PPPyZ57FR2n8xL1E0Piym8ZCXBgN4TQvGsXHqNnKofYzIzhuCo6FeXEWkaaK9ACRB6W2y6pKB5TaCESaeCVNnX3tnofff2pwee/C+xfzI7feetuhN8nQ7IETnEqH0/zfAR0kkGZruaJT08CUDgG8MBNeLqCDi+lcpANKLL8LE1VmpwlNHINEXSEPqA9QeNSlmEIYox/EViuZSp6Hya0bVs88ufG+D1UT6fuDurk3zSy8+JxGKY1WW4BWNs6D/o62hym5AOZRq52Sy4pQe9nqAbnsWVxAlLo6ANyHopZmIIwApE6iFqsdyWfEAI+sY0SsRfsA+D0ZINQyAzL+E3Gv6Xv5iY8PrDo9v285P/Lqou2+0hXiBVl39Gh3DvjbATwlAS3jqBdqNXngVMEbcdU6URkkaKbE76K7Gvk8AmAlkZ5aYgSIeRno6gnWImUjrqLkClH7UqhlYQWXNEJsLG3i9FAT4qoMSZWO8KtxHsfA8hsLA4UVB3dc2HvvpgUL1rbPzq/du+f+4x8aXDHQ1Z5uDyS2r1i3f+2y2elUQzoU37px2zEq52xAdwe1E2eyeJ3qm5sxaEcTiAYWONMbUKXpQZkWDTSGZiDmtJYx7ASNCirCxvOOkfP8kv37x5/nl9DzLwG6AUE5kcur1opBlaMgIAj4saoolQUmBjGG7VIdNQy3gGWN8h/wp3oAd+CS87PnnTx/8cTJcz8n3yh1LV70fvL1UvstF87h9QAFfinFZw6LiGopUooLBu5dGLinpi46PGbkHQyGGoy4CpyRRgIwfI//hKThgUd1j1/81odB0Hyd70LNRQAXTshTWfci21VFi9WBmU+81IhOjzZzWegRG70e4mZmQg9F/NxvvvU5KuJ1TMTbjX/Uy45XXvp86q3X6HErHLe9AjY6HNe/8lJP8vfn8LhDNomy8RW9bBZlyysCNyoYjDY7k/zzLCD5DUaL1WZ3TEopMmHvRPSck9BjKOI/8dw63cH7b9Vtu+vUc/t0N30C0P0CP3f8S/xskKy+8dfoWuJGnQ1427mGiozHHSobcpgLR7nFKTzKbR2V2+1uIefP5XMC7jbh1b97+Hbdyfe+/K2HHtDdRw6QvtdfL32xdIn4Sq8xe6AE559HbbwsixpU1s5C48ZGpsKpFlMEni6YScVIYNgAF/IPvU/3vvt/BIZG6YtkTmlN6W2ip/DXwNO/0/O3qjrdCLyIhgczhzBRjxgYVWWpE6iyBKHRSeIYlooba0hf6QfkRRBlCxw3kl/s31OK3azajfeQqNABfNfJYVALrF/08nlhTGW8UaMbc6qY9dA7xzCHYKYJe3UL+SU0SHPetjduu+0O4dnd46Fd9LxV8X933m1cf+trBwRv4J3hIHyXgmt66TXn0mtiSFbIoE1Mr2m8Alt41KBeSGQpK9jPogaKUYs++EGxdsIjddttb7zh5X+5650hGsfmnbwgLIE9Fad5HSE3StT0yqSwHSonsKfALzR6P3v0s8N3HOWdZFbpy1euMHvUPrGT/Gnia4CDn0MAQbjgg+ZTmGXoj3vjdvJGyZXfi7kt/hRJCPMw4oe/x4tay5m3Ud6NeTgt+5L3G0Oz/iHFf3/3cC/qkRiNvddyIa6OO8UVA8il3pwSNY3JnmzRTlQ7XkgE7GgFW8doSAT2aRjkQljE2BmawJKTxULCyMzUw6yViiZ7AC14wBhd4miAvpETkiKBMmShJQt4erJdkq0slTmLVMXlI8SDeW01k0mt+4Qhdub4/PbuOctjuzbccqPkCa8L598zuPXe5XMbWxbNfXxoUzTbGFpfv2nDzyJh01pTz+JNqwfnv6eV6cyVIFvr+bdgP/q57ap9YeFY7odWYSheZAVmamLQE3jP7hiTHcwvxN3EwqEsBeKSFD11rkWOHfBKqDj1LC6bk/ISYEFFcMqIMWGG2srh7vV/f/DGdR0GZ93sg7nc7Fb+F47ST5eWXjv5wQUdlwov7lg3AGuahnX5JqyLG+Uyjdva0IdW10OzyMAEopFAxSZRiSWbwHs2OJDqwlQXyevRPOf0+WO7Fs3MdR+/oyM/a9mW4+eI4eSH5q5IXX6uaWjOY4xWLUArA9AK/eY9zCYs2jhmizEw/Fc5zwAJZjOMdhocMTto9DWILh5aQgJarWZJtmBwyEzDI7JfQhU+CVTJL1UnrzHm03J018rc8CFTfvvuGy90dsydkZp5mJjv+kAXMTvGQz0rHj27c+3Ctzop3Ei3CaCbC9b4Jq4olnN8CLLPODbqNovokbr15ZVG79edxYyfBy065lcoHjNadFbRxyw6YGYHtTusIoukACb2guyeavIa4+UART4HsKfvPnDLcaE06ji6YE5+6Ka7zp77Jr97BzGd+NADJy3ND7Yv73/ib98P622Fjf9xoLcXLV8PtSsAYtmZA4lNK0esGRaA8mVkD80Fu4HMjiwLnlhBI4P1xoolWA64YvZESI5aG9Y1OzYs6q9raWmqPeU4OEwub565dEtsnSeR6t5cWkouU/q5Jhr4Wn4T1wb2zWcAEiRbt2Gs6ENoWkBYGkEDtNAcFianQAU0gBSNZZQOJOisjCxdUdoBsjYMRBFggXaR5Q7sIpifGSUp4iGlC2UF1kHgV81A8tlwoJ0xsdKVlFzzzGaLLuZJteS6cQHCkhzACjAdCyrGGjAwnwSG6pAUZxxeu11KWCrQvKQ/iAviz3l8qrmKkUU1C4Er42WeSQrtwVlE81M63SwrAQRzHZmz4EJTx9LFg93r7t58z4FE9sYNR3bEk2I807Hz5gfvHD70VHZ92+YZ2Y50vD8W724rNGT33bBr1h6XLrVlxW6TCC7XqoFV69asIk9m8l3tu/NMrq+Ep3H+TbCHeisWO5U7dlxZZtuJVO5ggg1NLZOdmXdmkeoNTtHbpUnyxQsLS+WKtHJ4wab3DccS+S7+5/bSz5d+qHSSHEsll5Qu4brOguv9QAjRurwFHBV7RSuuqSnDEu0Omvo2uMfwMWI3EFNasdhpNZ7dzqrx7BZ0aASaDGBlNkg5AezMWS11ydbWZF14mH+ud8aM3pbxYV4a/w3HT/x0IqVe183luKIOL1mV18DghX1sJCBg8Z/I8hrA57i6LnodLaBhMFauGJ3ZNrxhV1q95l3BeYvJa6Xo4VuahAv04lTW09q7t2iMo3YytcsBDnslwJGX3PkcODkrh/UjF4uffxhk8ridxH87VvoOW7sBkCtROJ+Nm8GoxxIS9vKZsFpA4KhYg1WyqJHDPJy5LHcHhiOSPdwyY9aCu/k9jvEHmvQbXQOMLwQbyKwwSixqZ9k8YB2jAKAAg9mI7idIASJHmPKFC/IiVcBIMDWfZafJiDElipuLZ6VEmNdCrWRn3h0JoCQ2qkECP8qISUxUZqYD5gXrd0YXrr9/OBjLtw6Hot2tvNS7atUqZKvDzXWLS/eSo01JeKnm7Vrg7RVVESUNgykMTmGfwuEiAxjlKvI5qfB5bjKIAFr/DpXRAaJqNmfyH9a9lrOAF79CjWXYNfmv1XioQTwrq/HA6BnWeFg5JkQdEsJhwAUE3W6/OqqhFpGBcL9w9Laz5147d+GXh48S86knHx8+/fijZ1944XnN3mgAe6OW2hv7uYqpUSEL2BtgKGqKyM4kOhLHPtnksKvEKZscFhaOkkWJGh50iYlECeZnBGOGh1eqGB4HjXM2//2BnUPtdXMOoN3xPf71+YNodsz8A1mXf37n2gGq9xtA79eC3vdjXoyqfAlgNiDMTIkCzKYyzKrqh5UEHYqLiTWnar1CgPpwmuo3sIW1mRiVJbQEZB/14elXmgGQz0kpqWLzMf2/vsN4YLhz055dF/b3pFX1P6993OsgfP8j557vB+1POHQ2L/IxoHc55l2mtMUyppUfozjjHapI49VyCkpQU5mI2uYwUpZbfsiW3hKp8dX418V4afdh412Gs6WfUL53glz4MtCrltvHFWNaTYWDaJGzOK2e8AFdfCzCEbaxagOflTpNLL7hcAdiVM25iqIUZPGNGItvuKURYpXC+K1jcuVEQ6ph+uCGs7dvaTqXWf7U0e03reia3Z9qyQysXnNm2/DsxZ3JSDzuSd3et757sClSE4p4/YsWDm5ge9gMuJziH+U8GAcv25zUDtGDHWLEIhUaTXKzYjQ7Zg1YWZBmf3IS2EbMAMl70ezQ8jUNnZJ51fBpx5FQJBpv6Vz5UfL8ptuc5zaVXk8lPGsayaeIV4t/kN/xEsiRIcZ9LAxnULdNdRDEXgmC2OlmppXkmUo4xElrJ+2YO7Cp0VstOIKv1MxcMlyT6MkMHzDO3v3QQ+Tu0vvrm3rJifHf9K5iNOHh6Q8AjxHj2iw+QsrxEeoOXh0D4S8d0h05+6nHeKm0iXwc1KAaN/oenMfJ3a9GFjEEQk9W1OlNuRwLgIDTXh31OPm71mmjHovemjcp6mGkUQ+BGxEMLLpBXsDYRnVkA+MaZpOqn64Z17CdHtBtPbtOt+zEkY+u1q35IKBwA/lkaQP5xPhvyMOlW2jc4U/w9HvAZXJcg1w7rpF0p2hcw0hToXr5ww+t191w3xPyIzfp3kP8b8vyfy/94h//kdF7ooHS2wEWqEZqtYiDFkzpaHQNQ5iwZ81szwLTVZHfQYypuSSf5O85qLvt3N/WnjkgLl/kSQMmy8jo+K933mraYsvPxGu54ekZuFZVfAPYDE0U3MTXj28kWXzDTbjXyMkJjujsm8mq3ZtLn9rN+EaaOEbqhIVcjNvKgZek1JjGtGIGwMaE2NRm5PAV3EFeMIRt2aI3TAvyA2BWm7JYk694wxJueVivGqClJ1xA+aSIaOeaXWAKUq3Ume2aQzq68l609FkmFz3nnLeVwPEGqTG0/WB7Q0NnZ0ND+8HtIdK8L5l+eUc/2Ryuk5f02XS2viVyXXgz6d/xcjpJYb848QQ3LjTR+EM5MwUCEx96LfoiXTy2T3j/Owfg93HAtUPDFVwB9FhqMoofcHVmFFHFVbgiW7PU6HdniwLFVYiZaXE84hoWqKHCKTWUbxBXv6SYMDLtdClWN7XpVVQ7GWrJTg1VFfV4FZ6NiHfrdDiq+LN16uJ+S94m9wEvtHMoPEDQjIgGGxi/PHOzmX9Nw+QcAKHwBrVQiNVxRAnIYmreYTjfYOzKb6mbm3H5I46lXVvVdyRyayQcCDbeEokEgyBRaFxN+BjwnQhXvTqyBoIAhRwKsusG10jen/cbk9UxttKp9rNn2i6t0mJtws3da9Z0H2f2COV3oZ5ed3qOv95Fk5MuWsX4pcezZ0633zeobQD+jfyWLflz7JqZibxa22TnFnLV3kZVI5CNNgJZQXyDl4vNKiGrBfwBu9YFZK3qAqJmgmqGYRBN6/5x7XORT6plMOOfIp8v9dD17ZvYScZ4mQtwtzO/WvbnaAGAx4kc6PGZmVkDokuxmsBOpDWOgs5cTlXbbdQcE0Ak+7JaB4MnS9M+1FOxOlFf0+SDqyBbpSJnltQIjIlZNZUWDTUIg/0ZraRv39YdA3ktEJMf2LltDzHc8qj0+KPWVhaNabE+8pj4IOLRDMT08F/gotwt6sphdRvJsvJNLJM1GjibnaJntI7J3uyIk7NhjiWGQhMlSsBOY3oBHWIY8APiuoDmyNMauIAOOyrCiA3V5w668HNhryWnBhS8Sa/H6I0bm7uDy5cf2n2qf1XT/I7mz3++QPqd29yF5UsXH7zhwLbZ3XP7Bxdv3xzT7UZesHGL+Dp+F625ugvsYWS7pFG1LdFkkv0ZJWpkIUbwDMPMw0HpIIlqfBEIfpnojaZAEC2iOHj7FhpivGyzO10eLy2+ifqBXzi3N4A/SYL9pHe6WImiYrIVqAWFEYFUnpp4wM0+D9bu00CdC62DLjSYbUPx2tU9a9sH+rND81YnkmvmDeX6FuaGtha6Oru7O7vuGepY2Nc5NG9tLDY0b03nPfnV89ZEo0Nk8bHe3mPzcc1AxPAZmtM+puY9tPYzyeXkYK0sOUWyouwf9froAWBCLxwwZal57byCNjUGIs3ZooPyq8MGEtOYLTodtCxbgk/eLItKOisxft9kgwRXixUH4zrCg1x6QPfe8y/efOnSpTMXL17cz4+U/itpKj2zaNmi06fhCcCs6AAjF+HUmDwqK1ACGIVHXVCOxEsC1QfHju0j+0uP8434DOfonyiS14Bnm7gs9yDHik5toBvCGSVuwsgCkXN0i6XhnDqMBGHGOy0qGdR9cMwrygE8XAeH68CfAMsI69GcOiy1ijVmcVHrpOdtRlc4nmrBTwFX0W3xUwM6jsozCqsuXdY5A7EW/DU4VNT7wF2Zn856VktUU/lKArFLrVFN9a/oPLRhz+rszEUNLa2LB5cs6zq69ebl7T0LG9tblq5acrR7b2zmXjJrRa553sJ1+WWpWDBaXxPsn7OkPT1/4Q3dg+lYMJasCS44sqQuWZeoa0jingjx95ILgof2JHRyaAIacqNWC5ejqQ+sPslhKJ81JuhdY7Keuc0OF3VaWSQGwyKJrnJ8JNQ0u7Fx9mhzJNbYGIvwxZmNjTObmugzrTVbyt3Cf4f/72r95/tBLtJ+HSs3S5cuRnFXBqxVXmoxRA3vzKjTyi0CsBozShLzAGmaXrCLnA0O2llLV5yJxzh1X1FYwnfKDIDXFZdcL5idgicQamikuzSJBYINBTkqzTMbsIaS84Xrac1wdflAV3k/CtWrpYVUlr587z2f/ew997684sGb3vPAA++5ad6OJQu70smG+pZVMxoaCwMrtxAFf3Hxs5996zuPPPKdx0oTG/e1dodmzjkWn5XdQ+mxHjbr7/i3QEdEwKI9wzo1lZAWNaizjo3W+oMC7E93TqmF/enKoiKzY8QzRRkYi6WjIvp1uEVEEFaNWCYNWnTEYg2G6mjao2iy04om0SV7tX4uLzKwIlbyIU410lCdCQHbRsuD0GpvLRey/sDejsbWTF9k7bJiLLg0kBvsW2UjD5R+ODuXTM1sJ5/uW+qpj/iXxx4upixLjLlZS0tnt20jn5uTWx6nMX4uzif5JGcA3czlO2kHk/rS8sKKs2dXFF7E5z8MfSf3T9/IXmEvtH/pKPk5OcDpwUZXjVqtc4nqTQM10wURLAuhrGCM5e6fZOcy8sQtxLznT48yG+wv7x/Sgf32Q34p/ybYF17w0BoxZu1WuTkO3NwICzhaY+U88D5IqiMCsIKjdvojME5HE+zntQmEtxaMAjkCMrhJa2G0sRZGlcPxUyKLTF4PB4LsQJDWVWgs3wzLXw8sP2qyu2MCrn9QUsJRtvoRXH0troSMIYYtVb2LNKjq8WlNKgYQsFksGQHfydvJyjO7PnDo4JNPHjx0w+F1aw8dWrvu8PZ1p+euWtYXCHXPDJDbf/zUUz9+kphvuP32G9bfccePSOiGgvfY/v0faqyj9A7xHyNz+IkKvY1j+Lg2vUMkwX9s0ybkmTx5hjwIe8XMebjF1J6zW2mlOk0N0kqTqp5PpIie9XXSYhMLCm6jSaACwIUkUCuiq9oztf1uyO+9tBf+3zYjnpgxIxGfwQ8u2bBxydKNm5Y2tbYOtrSo9eIc+TnvAFyc3A7VMiI0l4xFzphVBt2powUYOgeYPHpq/eiNyKcgbB1XUJlhbsKULdqpUrWzesuig3bjOICjZS6r9gnmcPtVN9hh+fmjBx555MCuXUTc/dRTuw8cYDzdDFbTDv5XQKU+Dq1aE6MSr1IJu6vEa3dXuaSi3ulBYcFP6a/KVfVXNc/duGDlyq0vWUvfv3VFrKa5jv9Piwc6cntXLFuwa0d9IDID+yhJF9kCcNRhfAotLiykAileDOMeSNJ1Q7Pfp2Z2sa9KZH1VowG2cmh3BdDrCUdoYCrJAlNmibVaSZgVcAcAVh/rT3bn/4xGq3ChMZtMLU5ZQ6FkbSjTnJ2/euHKxobGjk3Lt5LbO9KJ8Oz+YKAm0NBV6GmLtVsEQyFVWMqp/Iv57p4/O9/9D7N+wr9y966tNE49keJF8PnD3DbVH3CyODUYYzQUG6GaFoNLoSzGl8xVQXUBC198AZbH9BRkm0txSkgTGmUPo3c+YpB8AarF0C7y+H35LhpzQgGORe6phCHpi5CVwwnJn08NB46JRt/8RFeE8MT/Xf610is7JZNOmEWOlz58w3pnuKs+3Uh6B7ZQvJcB7BdpPUmfWtVvomaUGnaRLVdY0lUc5egOxhoEM4s66lm8EzgMV0tfjmfHJYz5G6VWsuzCCTLz8I7Dx4bJT7ccfeduq9D6zg+s5HVyhF47w70DftyHYN8nNC/u2g2a7qnNKGQ5bQXJZNj6TQjECz6oC/tfJcaCGEyzsNI+c7XI1VvTow7Gh5idxZCPIlCaC1Klr8xBIyK0isCvpdrzOY3XQvFoMp9utS5rzy6f0/OTHjHpFe/s07c3ZGdRePKwV2P8L1jdhiGD1RqgwNReZRpgFHTVLZZAsPwTg9s38Q/cUFpPFmTRhtiAgTGQi1aQQ174xCLndtaB5NKDLQt46se0snfRQRMgmHYwOGgFPK0iAE4rYMiXllTKBhdY9Yiq1zVtaSUzBrCdfcPhHTsPHdq56yCq/3/9zGd4966Td+3ec+LO0tC2bbz7ve+97yp930PA//Ea1ZeWM2dWvPDC0/D84otrvvFPue8MXcmyF8AtP/GscJ7/PfydBWykT7HeQdYaEXDWEGYXBajTWXQGNMdkxFBD1ILvMjFxQ9WAkSRmR/3sgCtb9Nfgn/i9IJ1r/Pi2BiUwTlVgXAAcElLXANQUbaQZNZktdmyOpy1atM3QGWCi0yCB1WFH0UnUsgK2YjgFoL7T7TdWWiXpIp4mjw2WbiKmE6v3DFrXZLPb+L1sVcefE+KN7/zoP88jNdHf7t69ZONGTqXFBZUWMe4cV/ThOrutrEZv1B7xYbU46MQRg4+iXzsFfayHAAOxGBQR1aCPjd+owi4oXQbsrLQNkVPcPlY1E5FGdaIQpFkCO21DJAZpKoJmMp2aqEYzcJXKmIwteWmKBkGcQ+r614F9lee+zxW7aOVMlTJxo1UVwAP5li4LMER7TskDQ+SyxZY84tmSMYNdkcTv6HaHba4pne7plA72WHUBo7RmRzvZgbZssbMLT9WZA0bp6sS3XU3AKJ3iaIYxSiajFICUXQ7JdTnckGpMo0uodGaATjOAlC15VjxQUWAjpDY9Q40MoHL7M3XXNKwUmqrO5q0pq7MHp3IYGbyWfit9+Wqeozk58l3yNhfk6rndHIZW3eYx1N1RHZuzgQLFRgUKbhRsVjPTZjV10gRmFFK0jwsQ19F0GxawuEbdNZFokjljbgyZGL0+pro65gpzSM7rceiqGm40qQ5vWyZ1p3UPrT+3++YPtfZh9C3T3UL70yLJVE8d9qcl6nrn79vK12stagLrtRJk2mvl5JZP7bayVbqtxOm6rSS12+oyT0wWm531W9nUeFW53woUv1DVcxWY/WrD5XLflbB818nekps2X2nwKCo8g9eEB+y4/12QqtvAoq/O+jGpgNRxcvemkkvtB1NhehpgcoCe3DQVJmeFRu7pAEJdaVRTmjrpBZ6YLTaHU0ReF1B6AHhOtVhaA0/I53CARTWErvsG72s/c6ahAmTT8ePda9ZQymkwPggwoud8fCqMwTLdfKwJV8zKbtjiciCHLdlEjk4HeWwq5BbRHWAutIAAA+RBamwpdrdaZFHGADeqFo6nXdnVyEhNq5O9VtFnX5geTPTa4I1YwSu1r8Xjr8Wn8XHATafidh5wc3E+sAsuTsXOXcZOysixcswmmKVV7aYrGKEZMTpMsA05F839IKIO1jYQge90Eb+JoYwF7w6T5CoSg7vA8h5eX4FWu/N6Dw1mETcNFlThWilGQCTzlY8avp7mSLSpaXbTBsAy3RyNNDfNblaxnRdpbIxEGxvHf0rm/0l9X8b5n1Wco9xT18ZZzIwGabwIFnHUSt9pzdXqeoLZNFrD5HKNqIThUyVSpK01Bp1rAPERA7G4WZlX0evD5j/QcSN6K+9hO4khr0SxFd9uKlTvqYpMoplXrOHqaEhoNEgMHFw0UOgeSAINWkMzQqEZKgU2tS9c2J5buHD8+2Q+yWQjkWyI5ism3oDN56O16m7uNLPiZC43uWHPIdrQ6JFy2CUzqjfZyu17LF2EqdvP/82bl2iKVmqVda2yBATx/tEh60TF5f2jHl5H9DqcccXJrlYyqtMDFcoTrRSdHhB2I5okboz7QcXAI652kbqIRH7rLP245Y8/b/1l6bnEG4WNfzdfz4/s/MLOV3fSltJeWl8t0B7MFHdHVQ9mPSpurRETh4TFrOV+zMbqxjwwSVQLjTb8x61YkWcSHG5PMFxXzyyTGHCsP1KHrZqGIE5geve2zbIKTZWt9FYypZFz8A5qpmcT0UR3OmO+5e5JXZ0r9A3UcA9TK36H90XWC0PGQJ+g9F71bh2W4rt1WKIsN2u2+JReSwIivNxvWfoU6BS16ZIqFO7/IizOd4Hl06BMNFhyoEkqsDwNsLjeHRb3u8HiKcPimgYWqjsq4NzNNIcGEVMbap8zwHQeYEKpesf1ocJICYhW5yTRel0oZU6UbZgywB4tc1nYUhFrxhwuRlWmAl9V11V5W8HlhCpIf1AWogwpTYpGNQmKNJcAvxpYf5Y3YdM79LQL0kSjokabljehFoqUkyTgog+fpww07lSbPVmuNvBnn8cN53EDB4TO08WvnGfi53CeJcAD6K80qRUsJm20kJFVkOMQIQtYL0We6AuUPJotAKcNs5XsOa8uYvncwsRP4NzLYS0tYKMEuM1snhBNSILTK/tzavYCfDxtiozDBuLGYa3oRAMoQic94FU76ay0jRGEvOLFhkJXDQOoSt1hvqnyMaauzpHzIXV9ygvzzg8R1PJHSlcnPO0C+e4C7tur1oe7BTX3HgHuI5yoA+FemwMHa0yOMp6TWMU1DnHLFt0Ssp27FtwQyY1vJayEdjNmszBmU9sxMRVFq6HKDeRpIvmpZ4E95MiAzoGi1ki+qfOz5xesvZG2kj/1FOlaR1KVfnLS9a0D92FL+ZfWaf1/g2B7OQGP01d1kIJWxjk+ck1WDqHFFc8pXrS4EtP1lSbVvtKi1SayiXuXeYurJoQDXGSTqyjoAoVJDaZKNETrUkCVwWtgmobTqy2xSgtq5io7bGpTapU1Rv1P2p9KZaqb82MP/TQdqjXTdagG1A7VEbPg8TGldf0m1R7iN05pVK2B7Tm1WfW3KOz/g+GKo/cwBa4rKPg1uJjcD2InK4XLq8EVRLhCFC43wOWmIRkKF1hpilttZqmRLpvtDtFFkxcG1g4X9E4fh2LSQpja6XsHEx3RyQ2//F3Mh9intrNq8D4I8EbAwz2iwlurwVsvUFPFQVuSZD/ycySnSKay7xt10exbUsUipabeEIskYOHw+CMaFph4q69VsVAkvzpQdhI2V/HuVYgdb1pdN89WzcIdU3C8s8zBpdUqnjoVT6b7oiCND6mYBjRMo0zlpcoqLwHip5l1voOgtPmxTMbFumXDDNuRekMYDsZctAmjHtDHgZIxF46dEdi+xcar6VatSqSqCFapvzKut6ny1Ucx/IoqYyuYPqxK11Ke4fkzTdoS8FoPkH8hr2FvCw0zqiMSN9122+KjRxfT5xePHl1y7NgS+lHd63cCjbrpHJQ4MbNZatgGA7JZDmUpnbAaFevh/VmaL8+oInrEJnEOsFNcdM7AiM2INUQqYVSxDJa53BAkiii1fo1TJLH1a0QxGPG90dD6NbTb5xx9I86GBvhbHbLvFSXuA3M99ApY8CN6yeBOvzSn69cr4RdWWRRHTKLRndaPOPGl8gX81IU/LcJz7aXaS0kD7O5CEX4ML9yIyeWLsxpNvcnp8vlD8UmjB2IeFLNoeyqBCOqQysrRWhVmPxtT+Ya8x+8GBnUDt0odKVixQLh+X9NDf3UpFMTXe2ff5/Q9fRIes3C59CfCp9e9/szLhpPhM0O//liB/FAYH9cR3ce7UJ/QvmOQZSLnwe6UqzuPvdN1Hvu0pgcJ4/AjDpfbw2q0rmpCRiul0oh8FITqlGZk/jvUgp4Ky8BfCEvR4aL5Mys6Uu8O0FmQplMB+hw1o8vwPA3w+HFq4tXw1EwHT0CFB6RMQaMObSazuhSPt3ANoKgkrcC1konQqaCNlu1pBtt5gC3ENXC7r4YOLa+63KiHCZRYVitZAGhHJAEFCrbfV+AeSVgxZkHbOzNKwsVKGcI4fMVhuAbU0xrQFSSWTjGgp2Lz6lWGNM96m4EHsG7wqu5mR7m72fmu3c0CrLPW4TyTOkmVLme+lS2xak/NUecpLK6azMJKQNSJCsJVExUU3p7NaqrdyGYqcIrHLpXnK3nLQyjKM5XOL77n4QeH1w7N77t3kB85fODgsSPHvz9n0d0sP/km38+/xbViNy6FwquONZTTGUWHSi9DL95qH5NbmdKzOah1gbMMXbCARlcEFrARjLzGjGIEA68Nvki2sjyCTbqs89YEa9O0GqpR7XMPcuzbtFQ0osVNQVeX0sF7PWi7VpVFtQqdHXN5Gh33SiuP3LR+f7wx3thdaDy4bkl+RjKZaq7r6KiL1cfq6jfznpuOru2t7YimPL5UXcuStrU74uvcTanaXKKuuy7REU4Hwk0nxn8JvEx7kYVWnJfONXLnK93IiandyA2VbuQmSo1aFx3LVlfpRsYKjFq0ai3WMAqCOmnEZA/gnAgZ4xbRGNWNCbUpueEvaUqmHtz1G5P3z3o19fK1m5P5u3ed7y3laYuyhn+Liv+5/9P4jyL+MUYAxR/9f4H+za/O+qH1OuhvObdrl4p+Gf96wD/Bpbl7KvjXT8W/qYL/DIp/EvBPimj6afi3INOzAqxwApFOSZeRANG4xgKxWsoC9SoNmv4yGjBH+fpkmAVSPHv6dPg6lFh39mz3li2ljsm0sAEtZnCd3McqtMhMpUVOowUK9hk5WloZZ7M8QfArzSgyuiiRWoBILaLSXiFSHojUohKJJsLapeeBSNE47GCVSnX1lEq5DGqyaeijxFM0HP8udJpiVL8bxeY2r0rOR8O6v3lVYr4tFDBch3br97WCsb0/M6MUUpv9dVX0SwIFu7i/qlCwYSoFm8sU7MzIiZzSZmGOf55SrQ6oFsGQUhze1ImoDlXygaEn5/CbVvimNaPkQP53Y7SUmm1YJtKKRX8NuP1ybAhCc8M1yHh98mk1nmWqVSrFrsFxoG6bZtczor2viVWCTku8rVgX2lgKI+XIj+iHCv0GgX71oIu6ucsV+jVOpd+MMv3qMqNZViSaz4zG1LQAGy3ZAL5KuAHsjdE2lgdoEFFGaaTswNwvq62jAybbwsB8gShGl+UOoGIjTenHcdsmKUPOaLwWQ+LESSUeLrwbS1ZuIlKmqkfrlpyeqgcXHh5YdHAgwMjaFfS1B/2+aal6f66/P5dduHD8fyBd+YZsqCMQVve1EOdruTqgagfOw8H7KSDToRNI762QMo1R2mJ+Acgr57KjGX8UKZzRj8kZURaQ5Wag7OtkQzttdGinDoiZzioZJ3WMMiJV+x77GO21ry/P5dChHkykcHtnXEVnbRPStU0qSgG83YTscRV92AKA028DmBMO1TfR32LBE2urs1xNWP/U4QeVoR0NSNj6HHbHxE7fqRH1jsb8rptuF0qj1tt7e/Lr9t/dM/fEuh33rFzYZKlZt5Ckv8m3d2x/fGhDbXsTUHb58veeCnnf17ayf/36TasHlzV2Nu1buJDW7qQnBDonox57p7XxGJgij1jL8QEcFGah80tHvZWbTNCOz2BBjkmY2bBJrpoQG+DqBW/ZgQTAgdD4C7DdOYNXS0FOO1Vj2sTGpDkbC9a151bM6WlntUjmzbuqhm50GRr02XotqbHT9QCbCUpnWYA9hNm4EHd06jSLoHFs1M+mWfixsihcjo376TSLGnWaRUQN3ONY2hrpsmAVPb4gi4cAKzhYz8TksRb+64y1YJn16UZbvAeMnS9fNd6C70Ub5x/fX41Ty/83ON0CFox0NU61aLhMxqkecApwUcxpTMYpAjgFGU5BfXkGNeIUpDiFVJxqtQQLLaYMSc8jVt6aCEMLrDeHzz8NXsHr4qXm9KdDbQ6zSrxXYxdgxsjXKX46FT8bjSbGuCbu0lQMo4BhiGEY0qPbgSn+pAULwrT4lVkdVYuyq4blZsIMb9kgyg2afo1nUFHQGFYcx7FbRSFaRw1U2sdrtrK295B0bZzLuhKRrjRFXIX+TKoi44j9JVVBTqZCnGnG4vt/oWpF9BPNIHScdL5UVV6GVOVl7FPzO2bYFR8c5l+FXTD+JJ2KgeexwHlE2Ad/3nkw52EBTgwO858EzqucZ+K7cJ4e4L1J+R1Sld+xv0t+J8W4YP4w/zRd9fHH1HMLE1fg3PNh3Y20U2SD6oWbUTd5sOhUcVpwVgmtaQR/3GofG9HT4AGdGZfBdpUROz3gYlN+FRNRb55BpzRqyTheWzEAhy8vWDNdn+XDNeri8M/QZRg/hfCpH7jyzAeH4AF50sidZHaKEgMt0JBRBBMWYOLgGYeh7CyFbbSvjHbh25mnFKaeEh3xIyekFwSzQZSsAVqT4MO2Pk5pwGHKPrQ3zBhP1RuYvWHCtvyi6HIXVHsDo3QNNDwHqgADdqpiUCvbOztSGFNOHx9a1SGEV8xf09veFlw3c6C/sGnN+YN7L54tZLtnC+nFmcJrN9+XJftm9qYG3Ob1YmDp7JlzvvTA3R+5cPuKlZs21MVnLuPUOSdkHNZI5OLoMU87eQOlaDyn+Ew4hKBcghOrJISmGcmBcQXawS3hdB2RjsQwu0b1bl+YupAmSQkEC5WBNIovrNYTXTWwY2oyyFg1wWPdVDt/8kgP/mOaaa/KWT4Cew/zjV68m5tZm06hBWm08tqqac443cOvTU41owXkkoo2h1BgBbYmGmj1SNNN+WAO7qRJH0dgM/9D9bQPvh+129PqzA8Nxpb/SBjvQEExCcYkaqupMNbTGSk1WFtmLk86nTLYy2Wjk069KoxYu+rCnQJymM1mHrHZBZEpqKIJi5XRbvRMD6jqKU+CdSGTPo5J4IaZ+vkIA1iD1wbwYmTguApvVIM3TivM5FAOW82Bh2U7cjiWJFcmpatbPqYiUqeNqqPEjkmjdrcvpOaIFBO9vVg8qmWJRJ/ESsursZnK01PWYNFUvjZOwjBa9lgvUCR1VTiiFZHk7qzO2hE2q5ymOXJKxIKDXAk4WzSFZxsbsbkxjiuyZJ6P4YhqtRbVaggOhzIYIcJ2JdrJjvNXQIUKNTinj825qfFOt2gVv5NiV6VNVTz7qJAOAHIf1HRoGck6pj8vAoavq9Ja4JZxYfJzHrOUOBWnjStKdKaMjk7uMOq0IQk0pq67guNwzG6cGIDhdLUbST/NTS+wEedn1Te+IOY9ez4Yb2vDpgPyitZ9gLx0Jx/hH752fom8a37JNim/ZGP5Jdufm1/if/U3k/NL/in5pdn/8qvYtPml8hf/AfklUFuw5I6ahh2NR87d5hPh9ei5+n0m6eh2m+1wHTGffEp3e/jEwLPDT+hOhO/qL97cSBaR0mP8C3uatBwK+R3Ibszp7L7mZBfv9Se7TE7xKE5Xgfbg2D2Y6MHbblxv0gtN+FRNe1kConzyxBf+eyDLy7C2/J+Etehk6SgbNV//l2HdAiJ9Cqwvgkwvw1pPc1P7rwlrzfVhvSpV5VRTVRq4LGF1XYBZ4qoK5jgT7VPAVqhsZ3qIwY62Sw3I9ZPXgB5HKPlzStiCYkCT54iKC6WbzzUFJ3YLjKCLlTe6qtFEqe9zscFAQYmOdb82Rle3VVcjF6Ny77Iq86bg+Gkq7RpVmcezmTbAT1jJ3X31VBt3eaoNltjpdRIrc77+dBua1po84SYBTDJlyg31FqpmkbHZpzdyV489pbe5rZ5EpvCObHbqHDLasnntCWR6aiby7L5k/uoBqNVzyHAAKh1Dxsaffk94WZt/ygaR4QBUyh+Mbjagm4+rxftXTaYcOtLenBK0sMl4wCbiFcz+4yg8dVz1SESvA82IDieGhFxs9JZHxFprh129KQ+PvVY6lxKMFd6V7PxVXDFlEbZPYoypy/HMJM6gcxkn3hSO8l8ADGOo813a/Uk8WmGIXr2VBqsQiZnHRi12D3raFoHN1cH7mSF+zKHGGXKWbNFO5+vYbWp3URh9ab3LQ00cu6SYaFuZhTbghiviPw5uNFYbG4xxb5z60qLaBTPr6fMdafIpR+lfc+avftXQTQqlJc3Zix+9/wMrBxYvJxs++YpzZ9+pnWcX7XR+hnxq/O077r90h2a7Cdv4WnpXmxT3QdY7JnuYvnWq+taYQyOO2TkNxrHRpL0GMUzqyzcoC9nKtyCyO8fkJOVM3M/o32KFciyEN4gVqFOm6LF6vs41YnR6Gmh7D1jToBoRZ3uEbi8aXYBd4EMeaKgeP3fNSCYaQHoaSDl/+ER394Gbb69EE+4uzLrt6NmLh44cOUS20HgKWEE7drz3FIslbN366Nnnn798icWL1Nz2edpDHUO+rs5uoziI5EbtLF9fw271zLLdI6IRnWn1Htlg7o146QGw8OgqY29nkeDgzILiFdWkuBJCz19Xw24mPF2CfNrsvZYyP3xV8WtV+nzW1MQ99ubeTYaFdq2XEoedEB1G9atmYFc1rqHSCN03eKntzBn++RMn8kND9ByPkJNCFLyTdq7ooPcAMWGDtmxFwx4sYL1pjJIL52LQKRgKr9fmelxVvRVq0kzxptUJ+oZ/vrq+sHr+ADdpusD/zndB+O4N+p3/qpkGlcb6IPk2/RP6e37i3X/P/0L9fTP5CfcVfgL8hRQH3IB326WDxq20fRkrETDqY6TxFr06sbWH5Kh5l2j2z++vi6Tn8Za5mXs+6E7FmijMM8gvuK8Lwv/CvWHdVbeEm1EXmTEvXTOf/IKesSkWab+H0WLGxHbu69ypv/Ces9p5P1p1Wh7xJ/dR/H04VwqMMXNu1EFPTG/E4NfogL0oOAMfQ1A11SRBK0yHt6NUHOJUAuUrbxs0Yj3pm7+wPjpjXnOFaouibfd80NMQa2I2LtCPvJfSz48w4d2CcqMuBpOejfRh+OKMTKxc8biZWi2jjrf4xpurgk3rv4rAuWmIcgohSvsnEZ1BFAtnkU5Ae3I/pX0NwgRa3pZTF4DWZQemwuRld7+6CiYvwFRz1eLkKnd3rAIKXmO1AFXVksG7aHNTrLZV5YlZ3H8hA+RfORPXirP41btFl28abaat/Hrayq++KJZKbzmuy6xlR5fB/2TdzKXLji5dDjsnAz40u5cw3vGyX72TohTK5Wi7us2XzVbdWTiqNa7jSB0LRl/cNCCDRljATRvRJt1hsX6ad5qzyU1+1e66GJ/yCni3gNeZpT3YDRydmUi7zcu4Au9SW1bP0VZNeqfDqoEsfyjPYJl0HqFyHhwapNKrfB7auD6p0Vtt8Wb33uVTYH8k0CqMaXdQpbcvx+YmjsTMdqqvOesYzj/T6+gBFwhhK3b0jdhiZuweArM8QWdp4C2axCy7/xzeoZ3drJ0LqkUCsK86k/ncXKINV81hH4YxiXP08l56M0Cva8Fa99KaB/ZtWdzR0X176Ieuf/mS+29t/T1Lehctv/WC5/XFg4tuO92+JvHIosHFKxe13Vo/fCfdfzHSJPTTe5mEuNc41lBisecY7EL57tp432STM5ul2SXDFXVAyfQ3bEHeMJVvTk/r6UU5iLlqM8timzPaAJgQHXcCPsqok/1Ywp+pswsi6p2qvvTrXbQrzALOv/UVxe//o+x75aU5//ybAywoYGcDPT01f5S9r3CXrTaP1+fX7lSFdyqpfGbufNXdZEKEDtl0J1MN6n2pnCRGNjkO7/qDOLxMt+CCY6uR6HXLBod0emLkd69cWfoy3naCXHr77dKxL+Zmlv5IjHMyXyrfu8TFu2BXpapm6WozNtiEmMmDYtqluIR/Mv4Gx+bZ8zrwN/w4rw575EFvTxpp766MtAe56KMNFl46ALnoo3eD82FXhZf5H5I6lN9Fo1QolCRJMZvoPP7rj76P03ux4fD73XvXrkjluzoaSMPdn8Dp993LtzSsDSQau8Z/Qy6zAfgAN+yHXQB3HHOTtep8kMmzcEMMgUgWx9UZ6IQZGiGqpTjE7DSvF2OCxKKG0j2YPTDgUEsLWN90fgVhkwvwHgheddx0FfhVY8M7pclT/G/c1dF/S9TmCqVbZ/Y15NrrbnVsp/gs2+qWxt/XZNjk6lvA2+3Jxi51rv//BKC0fGAAeNpjYGRgYGBicOrVLf4Qz2/zlUGe+QVQhOH8GtY1MPr/tf/MzIeYLwG5HEC1QAAAfskN33jaY2BkYGCR+vuDgYH5z/9r/3cwH2IAiqCA1wC2VwhReNptk81rU0EUxc+9A9LYaG1KICaRWqqxJsY8UVKwoSj0I62GVo2YIiIuhC7cuNRlrLoNLlRwU9E/wJVSt/0PXAju/KIgiLiwiE3xee70pdTSwC9n3sy9M3fmzMgtDIA/qfFvbQMBSrKCqgZIk4NuAWdcDGOSQ1XGkSUZeYt9HDvP2CF5glOWo11osG+InCRHSZIcIrnou2LzWZ9fAz52zOYxld844NZxWmthW2+jrqMItEVNoi7fqff4vch2kZwIV3Weuo66S+O4vuT4a45fjPQmtYS9mkBcH2NaL2CXq7LmCqCj4V/OmeI+AquZekT3s9Yu7JEKMjqIfs4zIx9R0Msoag4FuYZuzSKhk+xPYURS4WdNsX0Yk+4KZqxfpxjPPMuR+6jJF/TIHcT0LKblD1RXEJefYVvWoLKMPq7bKwt4SB3g/su+JvZ3PIjOJk/iRCyWOi7PkXGDOKcNnvcM6zMf6IE2UZYG6w8w7PtayJOs39ME62p7v0oS0L8WYxqYs3z3CsMRGXpQ9Oe/Ay4If3hPkhuedKAfvaRPiuFX8kkfoWfTj+0EuOrVPNmKeXKJOXOs085/B9wU+r0nuf+hHzGym558IO/pcWHTj+3YXTOlJ1sxT7znVLeIEfeAMaxJnvFMnpJvgHtHXzo6wbfyi7yIuEuWSZlj9h4ieKfSvJ9prCJPjhmyRF+WqG9Ik2sJSpYr13lvbqBo89rbcU3uO8H2LO/ePLr/AT3FpQ8AAAB42mNgYNCCwyKGDYw9TAJM85jVmP2Yy5jnMe9h/sWiwuLEksVSwXKI5RerC+sy1h9sCWxn2D6wp7EfYf/DYcbhxZHFUcfxhrON8xiXDlcR1xaud9xK3C3cu7hvcP/hUeNx49nHy8LrwdvBe49Pj28W3yl+Jn4T/g38DwQEBOwEsgQqBFYInBF4IsgkWCF4TohPKEvomDCX8A7hbyJGInki00SOiKqJZoluEOMSyxBbJM4h7iU+SXybhIyEl0SDxDpJHkkVySbJPZI/pIyAsEjqmrSF9AYZPhkDmUMyf2Rb5BjkZORc5JLk/shLySfJr5P/pBCjUKVwQ1FM0UaxRXGZ4g8lEaVZyiLKV1RsVFpUzqkqqPapcah1qb1TT1Ffpf5Bw0pjlcY5jU+aCppVmve0QrQWaL3RdtHeoWOg46XLpuujO0X3kZ6fXpveKX0P/RMGHgbnDPOM+Ix2GScZXzCxMlliKmI6y3Sf6SMzAbMUs0fmEearzP9YhFgcs7SyrLIys+qxemTtYL3F+ptNgM0hWyPbPXZadj52LTjgJLsFduvsjtnds+ewN7GPs19h/8nBziHDYRcQ3nNkAsIMJz4nPacup28AyY6RugAAAAEAAADrADsABQAAAAAAAgABAAIAFgAAAQABWwAAAAB42pVTTU8TURQ986FCxEZcGMLqLQzBBMe2EISGDdFCTAATbSQxbgYY6wTakmkJgRU/wIUrfoILf4kaVy5d+AP8FZ5757ZpmzbUTN6b8+6759w3Z+4D8AB/EMALpwF84cixhwWucuyjgJ+GA1zht+EQq947w7cw7302fBvO+2r4DpreD8NTqPlrhqex5X8yfBcb/i/DM1gKCobv4X1QMVxALbg2fB9zwV/Ds5gJfcPf8DDscr+jGD7CC6Soc3Q4LpHgCI4j5jomOkQLp7hAplkfGXVYZPQx32UUUeL8xNAylhitMSvhe5fMS7JO+IjSc64zaskca7UWmozHnI+UlzAzwQeNp6whrDeIsMmxxUhmEWG0iV6RI3XkzCnO0MBr4jqRVMxYUeaMeinzh+sn2MYBGQuokp+o5ikzExxzZFSTOk1W30aFdSY7QaXny/KEDDd06rdavd3zp8yvL6piV6+rJlr9SuPrpYplp6MZ8r0NrXbMWIue/+9/i4bcdSP8deawo8fuBped+jyJ5s1a0qUd7lTwlM+5PpH6NJ4Taac3xnAPB87Vzd3RLs0183tzpr0suuJ07ucm1WLm5atBjtyX0f979DniPq1IXalz92RAs83IDl7Suyr22AlVvZ+iOa4/+nton/jA7qDc9ZIy9+37dsm70DOu6d4znq+Mdc4lrPY6f+UfJNDQYQAAAHjabdBHbFNBEMbx/ySOnTi990Lv4PccJzbdTmx6751AEtsQkuBgILSA6FUgJG4g2gUQnQACAQdA9CaKgANnujgAV3Dylhtz+Wl3Vt+Mlija608rOv+rLyBREi0mojERgxkLscRhJZ4EEkkimRRSSSOdDDLJIpsccskjnwIKKaKYEjrQkU50pgtd6UZ3etCTXvSmD33phw0tMt1OKQ7KKMeJi/4MYCCDGMwQhuLGQwWVePExjOGMYCSjGM0YxjKO8UxgIpOYzBSmMo3pzGAms5jNHOYyj/lUSYyYxcIxNrGZGxzgI1vYw04OcoLjEssO3rOR/RInVnZLPNu4zQdJ4BAn+cVPfnOU0zzgHmdYwEL2Us0jarjPQ57xmCc85RO1vOQ5LziLnx/s4w2veE0g8ovf2M4igixmCXXUc5gGltJIiCbCLGM5K/jMSlbRzGrWsoarHKGFdaxnA1/5zjXOcZ7rvOWdJEqSJEuKpEqapEuGZEqWZEuO5EoeF7jIZa5wh0u0cpetnJJ8bnJLCqSQXVIkxVJi9tc1NwY0A90Srg/abLZKQ6fX0KV025Sq71HvPXalQ+lqU48EKTWlrrQrS5UOZZmyXOlU/stzG2oqV9OstUF/OFRTXdUUMK50n6HDZ/KGQw3tB4evok2fx9gjov4XUvyhXwAAAHjaPc07DsIwDAbgpGnTB33TBaFK6ZxbINqlC2JqJFYuwMAKCxOCs7hMiMsVg9xs/n5b/t98ugF/sB6C3TBy/jRjJ/XQQG56qPY4XE0NUh8GBkK1IPQWXNW+ROLoPzyEWxAkwjsRfITcEALVfpjv9Iwc4jKoCREinH8sEBF95xBTZ45pvHb0KLozMkPmjWWKzO6WCTJVlsWvO75MzCYlHhRHyyWyXM00UOkvDZxNYAAAAAFThlUsAAA=) format('woff');
-}
-
-
-/* Fira license */
-/* This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE. */
-
-
-
-@font-face {
-font-family: Source Code Pro;
-font-style: normal;
-font-weight: 300;
-font-stretch: normal;
-src: url('data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAF/sABQAAAAAxAgAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABCQVNFAAABvAAAAD4AAABQiyWUMUZGVE0AAAH8AAAAHAAAABxn9nOiR0RFRgAAAhgAAAAiAAAAKAEXACRHUE9TAAACPAAAADgAAABIM+4scEdTVUIAAAJ0AAAA2wAAAYQFdPuZT1MvMgAAA1AAAABYAAAAYHLzz7RjbWFwAAADqAAAAYgAAAHin9BCKGN2dCAAAAUwAAAAJAAAACQDogXZZnBnbQAABVQAAAGxAAACZVO0L6dnYXNwAAAHCAAAAAgAAAAIAAAAEGdseWYAAAcQAABIJQAAihBOKLdoaGVhZAAATzgAAAAyAAAANv7SqWFoaGVhAABPbAAAAB4AAAAkBkQCo2htdHgAAE+MAAABZQAAA54N41S3bG9jYQAAUPQAAAHHAAAB0ucHxehtYXhwAABSvAAAACAAAAAgAgYBwm5hbWUAAFLcAAAKjQAAJ+QfH7TqcG9zdAAAXWwAAAHlAAAC0c0dvQRwcmVwAABfVAAAAI0AAADCq5N2uXdlYmYAAF/kAAAABgAAAAaAX1J9eNpjYGRgYOAAYhYGPgamzJTU/KL83DwGJhc3nxAGvpzEkjwGFQY2BhBgZGACquRhYPwfxgDShVUUAKcdCXAAAAAAAAEAAAAAzD2izwAAAADNFZ/0AAAAAM6jMN542mNgZGBg4ANiCQYFIMnEwAiEz4GYBcxjYGCEYAAasQE8AAB42mNgZGBg4GIwYHBjYHJx8wlh4MtJLMljkGJgAYoz/P/PAJJHZjMWZ1alMnCAxVIY4AAAfRoJt3jabZC/DgFBEIe/20MhIiLnIoqrRCmhOoVOVEovwCUqRPypdGq1yFUeQCkeQFQewcswt7uEkMnuzH6z85vZxQGyhAxRnW6vT348WE4JSAnn8cAV56B+zm4UTWZ4o/kgIlisZguqknllk93EKdLk8ESxRpOMZnXtFR3pashUe5eYEzccze5WIS+rYrW27Dhy1jdcrVHAf+cderaWj9qiJYYm54RjiZL5qrQl2rAXnZgDDS5iIVexlq7xP2rk7TL3fzVDlby3LHHhi5tuOcmvWbLSP+RRwn8ClQYe8wB42mNgZnJn1GFgZWBh6mKKYGBg8IbQjHEMRowKDAxM3CyczCzMTEwsQA47A4MEIwMUOLo4uQIp3t9MTO/+szEwML9gXJLAwDgZJMf4gAlEKzAwAwDStgvgeNpjYGBgZoBgGQZGBhC4A+QxgvksDAeAtA6DApDFA2TxMtQx/GcMZqxgOsZ0R4FLQURBSkFOQUlBTUFfwUohXmGNotIDht9M//+DzeEF6lvAGARVzaAgoCChIANVbQlXzQhUzfj/6//H/w/9L/jv8/f/31cPjj849GD/g30Pdj/Y8WDDg+UPmh+Y3z+k8JT1KdSFRANGNga4FkYmIMGErgDodRZWNnYOTi5uHl4+fgFBIWERUTFxCUkpaRlZOXkFRSVlFVU1dQ1NLW0dXT19A0MjYxNTM3MLSytrG1s7ewdHJ2cXVzd3D08vbx9fP/+AwKDgkNCw8IjIqOiY2Lj4hESGtvbO7skz5i1etGTZ0uUrV69as3b9ug0bN2/dsm3H9j279+5jKEpJzbxbsbAg+0lZFkPHLIZiBob0crDrcmoYVuxqTM4DsXNr7yU1tU4/dPjqtVu3r9/YyXDwCMPjBw+fPWeovHmHoaWnuberf8LEvqnTGKbMmTub4eixQqCmKiAGAHV0iXMAAAHgApMAJwAjACsANQBgACoAJQAoACoALgBeAB0AIQAaAnl42l1Ru05bQRDdDQ8DgcTYIDnaFLOZkMZ7oQUJxNWNYmQ7heUIaTdykYtxAR9AgUQN2q8ZoKGkSJsGIRdIfEI+IRIza4iiNDs7s3POmTNLypGqd+lrz1PnJJDC3QbNNv1OSLWzAPek6+uNjLSDB1psZvTKdfv+Cwab0ZQ7agDlPW8pDxlNO4FatKf+0fwKhvv8H/M7GLQ00/TUOgnpIQTmm3FLg+8ZzbrLD/qC1eFiMDCkmKbiLj+mUv63NOdqy7C1kdG8gzMR+ck0QFNrbQSa/tQh1fNxFEuQy6axNpiYsv4kE8GFyXRVU7XM+NrBXbKz6GCDKs2BB9jDVnkMHg4PJhTStyTKLA0R9mKrxAgRkxwKOeXcyf6kQPlIEsa8SUo744a1BsaR18CgNk+z/zybTW1vHcL4WRzBd78ZSzr4yIbaGBFiO2IpgAlEQkZV+YYaz70sBuRS+89AlIDl8Y9/nQi07thEPJe1dQ4xVgh6ftvc8suKu1a5zotCd2+qaqjSKc37Xs6+xwOeHgvDQWPBm8/7/kqB+jwsrjRoDgRDejd6/6K16oirvBc+sifTv7FaAAAAAAEAAf//AA942tW9B3xcZ5Uofr97p/c7vfeiOiPNaDSSLcuSm1zl3mXLLa5xCLFjGzudxEkcYCEOgU0gEBKWhLDLvaMxSbyUQGgBwtLWPMqDbBbYiBp4PMALHv/P+b47o1GxY3j79vf+iTXlajTfOec73+nnXI7nYhxHWvhHOIHTclmZcLm+slZl/VVe1qh/2FcWeHjJyQJeVuPlslYj/qWvTPB6QYyJmYKYiBH9a1/6Ev/Ipb0xfhPH8dzvLv+e7OUfg280c1u5spbjWiuClrOpWst6nmslkiUnkQsVtZmzq1qVpzGjmuhaZZ1uXNLlZKNuXLYSeEtEu8xre3tltRFeCZreXk7WC6JdMvV2dHZ3defdTk3cUSy4hMTv4h3xeIfQoo66Z8Xjs+L87qGh6t0Iz2PkVnKelzg1Z+S6OEmdkwyFCtFyWlWrpM0TyZSTuAsVwcwV4IJgkzWktaKn72QzaeU6OnEBbaJEHx9b7kx+En74jZs3f//78MNxuMYOoOMl/gwX4CJkJVf2A85ll9tXKBQkLjfm9HgDSU9BJqrxMV4MhpKevKTKjQm2cAQvq+GyRm8ww2Ugs6F1bECt1beWdUZTPg/wRXOS/4Ls049LPpusRbLox8taHX5Oq9K3Sjqb7IarLrjqcuNVlwOuumyyEa6a9ONyjLRK3f7zc+/+U4ZztRrOzz35x2/hC8lvG+P9WkfrmEAfNfgIi4zpfTp44baNGdxGB37VmNllgg/Y6KNIH534iJ/x0M/AX3npX8F3BmrfE6x9Twg/MxaufTKC14UBGy8g2jYR6RMMhSPZKf9JA34gPxC+lICfgpb+uBL0J1GCn7kEfrVjk2vziD/ue9iX8K1e51q/xZ/w4+umh10PX0h+NPk5+A+eLsB/yY9yhNt5+UFykf8V18Q9yEmZnJQsyIIwXs4ISLtMGmjnzclWYVyy58tWL1602vTAts05yXRBDpjGpYBNTgNNrXk5ZRiXxLyUolwjx0zjcgs8p9KivawXvL29vZJGlF1heI7ZJSdwr5ABRm5KwAWveI4jJqcrlvT0Sla7bHH0AlPPJe5CvrvYlRWKXd3Icm6PNksScY3LGRZcTo3WlSimd3o37ls0vGDXrgWbF2c2LvJn5hb6lizcuWvhdSsyh26MDs3JN81ONc3P9q9Q3/1WzbxgLNibSxYTzYsLg2vU73qXFnlWwwUu/56fwz8Ap8LKebkk1851cvdz5TjwrtykGpfac3IQnvQ52QFPQBNBNU6kPJ4WWUS8Gd9p4KXGJvvgZRpepm1yK7yMGMblAjy7RdEOp0mwWgBNuRUIU4kHs7lOeMfJ7U2ifczqi5jxd14H/E7DZTvwd3DouroLeTdgnIinHSWPlnciYbrS8cZfdNcuZuATgaVz+pYu7ZuzVHfO/VG+u6W5u7juOXyP1zPdzS3d3eviz0TPkV8sX7du+YpNm6qPf8H5Mq+5ZWjolnnVrHLxAfr2zMvBL3AgFYtAo9n8B7go18J1czdz5TBQR/IX5CRwjA6kmdyFRClRosD2SzGbrAa0W0GQtdrkTngJwkwy2mQnHlGQaz3w3Nkq2s/phHCyyYaYO0G4jdk9wTQlSldStH+CUxt9waZ2SokSMEK6qGBt4bVuT3epoIEnbTqDRCghEUrpjIU4nJ5+vtiVBnYpLhxoXza7OMvdE21eeONgqrVlyWCfdf6i1TtWX9++oX/ZgqOL8qV1qZa2pniqJf+RWZs6tiwZWDu/GC72BCO37ll3z9nRoifjm7V299qBVUMHb21aQkr9KyOZ/mgy34/8Q4gG5OoaKlczKFUVkUokTYM8VZ5QbMFJJlSEEk1NftLv4V65vIb8G/990BcOjoD4B+Ugq+Ek6enfuG0lj8bm0b7ymu873/Fp+J6ngk9c+sMTQfa3x+FvTzT+LX9B1tT/1tNty5TcNu1x+MvXXnvwCd7wRPCpS19+iv3tDu4U+ROf5iwgtYlkpX+rhh2ywQ6peVAyxl4U/iVPqeAB9vJoM9pMaYfxGU1U84zxqaOhU6dCR8ld4TkvvjgnPPSM6+mnXc/Q7x3lbgD5koZztYYD6S9pQfCDNFHnyxxBacIZQLgTDl8SAQULKCDDBYnPy3pgFVW+rDfg7/SoAwx6fGng9A26CIgIAhDkwOhzLc8910JK6Zdegn907Zcvt5MT3HE40XmurELNq9dyIu6KjeJnMo2XeRN8J8fD18sifKesVykKFfgK+al2vrQvn1CZjIFYwhdPrl1cnnVKCM+KlHKrj0YY/UZJiVwk2+CUeBBPRBJ/CKg2PAMU2JhrlDwCEKbh86+DXbCfO8bpuSJX1jVYBQ2viWSg3ANWgciMA3hCRcbRc0DhiqdfT+QTyY5kMZxIhEPJJHz3TZd3kJ/xXwRYOA8pkJvIUHv1+Q8Ke//yCMIqcKvhHGtB1mmBMh7uJLNKZCNsiydXcVASAQegHiAg6ZADcS/0NqRQxWXmHCqqUc3IGsAiKOxEPZxaLW+w4hE2u+CNxihY6BH24IFW6zkT/soKcm1MpTMTepi7bYCETRPnbe58ty0dtytGzOqbvnXTkW8MjX5wdPSDvlhbLNb2JOl75pnq5yXyw+pPHnmEBN9d/UpPNNoTpbS/HowOA3878NgqrswhLshiejQrKmoVN4CmTY5yFk9RAcuL8pQReIqnPMUDT8GjinGWrEeG1yLDA3+JiSKIGLHguv4zD2ydHRvL8PawOXDpqQxdeyWszQMt/dxyrmzFtU0C1Q88Ui+Qk1z0HJXVLmrKWGBJl5raJVZYLIgsZ7LCajbUgWOc2uVnAr8u4LpnE1es2C9QSaZduf3QtgPNe3Zu3eP839VVe968u2nlyq0r+PbtO9dktx0bXa9uCm45fGRjy8DwOsaX84HPLgN8CW6Pos0EgaoxAzzZcrILwUzmJM0FOWIaH/NGNGB5mkF2m3OyF86Hmep8sx6ATdHzAQYnHN0IanODKAeC8Gyzl+0O1O8TGjudKLKnuDZTO0GuMKGKar5vzbFlu2678/iN6xbsXBzYeMP6G1fOG9p16/Z7hiNrhucuXJlZ0d89uCg8vHaob6VDZdk0sHoPtStb4MHP38EZQL6NcGU9ah8QKZoC5V1VXuJhl505SX9BMuWp+Szkyzq6wToNEF5PzUQ9yg8XtRzRoLahGW3kYAtIr8SLsBFoZBHccBQrKaA9KSU02hayPfGmN7VWf0b8RCCaROAzAfIP1b2Zz3wm82fboK0zyejdD2dLBbwY5N7MLF9ZBbAZcrITnsScbEF6h0AOXpA9IJrDijX6qf8sUiPUkrVI5hfUsqi+aJHsL3Cy2Z7NkjGzRbQrNiCRPVqA20rhNoC0GgPDyUOZZi4Jk0Kd7I6YK6adsA76fc1bFi4/tHPd4HDESzZVv+FatGD3W+7bNrx3aSTVvAO0fauDtGb+I37ddTuPZim9NwAuVuAdDxfndnNlF2ITADRizCIEpNSITYLqe+QZb14y2xAn2Q64JeE5bAYADWqrC+06uyjrtAh2LIBMZDcDy8gG4H5Zq+ulVk4/X8iDJgeV3QB5aQKrDa3LRrq3LwyUVu84SbYc3HboLWtvuD2r27F5/pY1K/eS+M53rs70h4vv+fCWfaPrjzx24MCJbQtXrMV9WQoI2WBfDNxCJu8UIU0kI90M0JNljRb5QwNqCFw76lEgq5jQrAOSSzqAnCCjCL1Mmmt4baLbXlpKvnjHbm2ndt9RflPG/1D1dy++QAzvADm7GOhnofRr4gqTKNiZk3W4dhclnRc41ctMpWZ42WyTs8xUGgsbszpGzCJcyTaL9mcFHW91BdJMtnYCIc+BeWRPtynWUalYt44mThyziqghnWGmEZhNzDRa/NCeA6u27u1tnzdwfN+B29v2bVi7zRMYzGTthnlDuV07dq0amjv85I3zVb1bF27ctrRtXVQVXTR38ejulXNWLe0NZYMRi0UjRJcSe/+C8Lw1PcvmMx9wGeAuTPCOETG3AeauHCVAVFEviUYCAP9JIfC2dYx3vEBr2WwBAeMQx4w2wUVRdtmUq3IUuUjDOXp7GyxkC58A+xexLU2Yg9RnWHYCeKV12dbu7YsCPcg/I/u3H2wDttmE/LOVfH79Te9/5853rmEMtHnf6Ip1uw4c3wa4UF1Nfgu6WuR6J2lrONEVs6Kr7YiKZMgrelqy1F4hXpM0tk1Rc4rmhn+JfE19k5N9iURfktKQ2i+wLmrpOZMsGEVR03W9qGMkU/SCKPNwBvkc2jWolK9izNQU7SSjxkEBaTRt+OsUYAh3iptFXuO3g83AOYoplxr+P0UOVz9N5pGepmrHK6pXOijMo9w3wQ56kcZQ/DVLiBpBuN26nGKMluD4pJhBVN1LHvlmOv01MItgnRthnf/J1ikVU/C/2nUjmQfrHJ5FF6k2Mf46CnvyHf6jQJkI9yauHEHaBNieuBTlG6UuqtEwPmY3+SytlRANrqD7YUfLxURjAbLJBzQy90pGscIbXP4ICqqQXQ6gm4oCi8pZVwDlrNromaScBU8iXVPMNYoeXbp/1fZMdzGiadKGCt2Z+YPr56yl0Rh++/IN85KDXV0L0s1DxXxftDBv4NK3aXgG8Om7/GY+wh8DPd3GneZQxKK7CUo4A08tzOv0KF5nOz00fvAv/TZqoCfh/CRtSFrZ0ZyHE6QfpyJED97TOcHsCYapX60RpQggYw7CufGHqQrPMJEstQB6BpseTTQPmGiSj7laiKeYyCQscIDS1AenQsOGh8ozcb6KFtL3odtHd0fVKt/KZGnpvWdWrj74tnsPbehzLh15y+MXutrmLTh5/cXyV+/aX/0f/eG2eX2L19gsG2/4ZPXTL3QEe751tqVj1VlxEPe1HR5a+bPUNm1i1pwkFMoEvUuzeryi0XHEDAIZNxjMF5FyU8FRcCQyMa2jAOINdHX7a9nXOpdX/zw88vOWbEAl9vBnLx1+9VWiP3XP6JyPUBv4CLUlzlJvP4ocxCkSii0VFcYrPi9dyodLxSjJbXC+fHnJxhxYOGZjapMTBHQIrodylKXi8IsQiii9DhnHa6MnUPIBnfVA56hdUgNpwbqYJKEzTMG1gk+IL1rJkQ/vu6mvd+m6t95094nrbji898R1u7c8d5A/u2pVcblVZVw9f9vu9PLhRYtSA/PfQu0O1DVR8M0dXBdXtnOMWmUBcdGpx6lZBHa8ESB0oWTQgV4+Rzi1xmqrWeI1zVvf3MWP3rF3YXD2usO33XZw2+LA6ptOfZz0PLcyPP/x6q+fXB3aXov18TGgow5kY49CRX2NiiKSjspFWW+iHoRZOXkoEqnTMIkcE3TY8Z6HHn747MHr7rjttjuu48/+4yOPypnH7j39CMX1dljTCmsaQatPWRGMrYqasQgVOKb64uhKcjWzHx4FveJWKr5kQQR7Cf+H59vJ6epTJF79EdnFn2262FT9UROu+zCs64F19dwAW3fmNQ0zrDmxmnFiNfrzMLmz+jESrr4KK1X/s6n6IrMjZ8N+mmE/fcibHsTR0rCfFbvDI8B6dlzPT9eDrUXRhuLABbaMjfobNjusGIBLNnDCyjrBg2feJcoaNTKnHaxKydUr6xxUummME7EmxgoudroT4AThYZ/9vjv2Lgn0bTp8+6lDox3v/cKCU7e8hyx7H2WJ+888kX85U/3zsvMM/s3wcJnu0VzlFGvZKZbUhYpgoNQSJnYIoefziIAOjABVXtYCk9Q2BoPr4IbB4+YsWZrNVj/Bn63+mMQuHSZLq59g6x2Ch1/R9YYm+YBltbJFteg2T7emwQWUNPkGLxDXVtalrl/MlQBP4NBHP0ru+uhHm/j5TU2XPtUE620D/fMK/xDIj1lc2az4VTSkzyw7G3WpjGhVGqlVqatFGHTgQckcafCWxFgxJjqBwNtSPSOrl1X/jaz46qxdu/yjm7aS92eqPf+jh+GIMms24GjiOhSa6uo0JaArkJAmSkjZgiuhsSoLhl52wsQCKWgdCUHrOpLjycLuf/1t8Yf3ASEfJDf8vrqT3PL3/17j8QCsoQY9xOgoKGdLiWXJAnizAuVqQa2vBbPoJrkebiObQdS+u4nBu5XmAc6Cjn5agVevwKstULsFvs0Dqstjkw2orVgsAf2hvh//cjb1h7TgD6lfkC2Wi5LtBUltG9OoMZxus41ZbRZHaxneRs9EzyQ0wMq9ZbgGT1xFrbFYbTRoTs6pNdraG8V9QhPeQb1XXuxVbPqyyszsSEDE4SmUHMhvXaWEVkgImQQowa2zb8io0odnt6qF9E3RI028Bkj38s03kwJw4cuJNx+rvkRKx+41VwsM9xF4+Avg7uLWKbibFNwNgLub4u4C3G15DKWA5pbUedkEFPDgAUYQrb2SHkAEJ0ky2SWVAqissipgEk8hyxfxYJBMIsy7xJEOQoZ4IvBtHdXL9AWAmL3LNTwQJO8GKL91l3vZ3GB1P5Xb3SBf4iBf9KAxhphNO6Ex7IrGABgNwE8GG01AqZnykK0GEBeCVsdTe9wOmkRWc4oNrli4YBZQQR7XdN///fvhX8fh8mH4R5Y/8vzzjzz6qU89ev+HP3z/fY8/TmE5Bg8uoBX69fMaJasDJKveSGWFXpgEkjE/BSpOdhinaJNW4iM1fXKscvT4qRtPn9y7c3T/Sf7shl2jO6s/JfOWrFo9wOzJ3sv7+DD/Qc7JhUF2MTKEQGpYc7IBqRGhS7thabeNSlRcNwrPATfaWLzBatehjaUWZZOZuuZWZleGxIqaM9m9NdnK9H7dgMpkiR01brcNBG7v6e/fc3xX4mTQoY+Gh6/z7DqeO7hl86FDm7eQ5Y8+//yjD5437ta16IcHTOeJv/rrj3yE2J8A2G9W9JIJoN86WTJg2KFiNFMSGpGErrqUMOclE9MXKkAFkxc2E2ylAc1BlSjp0VI00jiY5BSB/xhhEXgQIgkkLaXszZ/83paVn+guv+2uT2zdehd/9p9WbDVWv05y1W+S9e9cPBfPwnLgNRF4LYNnIU1lCnCaHcHzIG2bcpIV7FkTtWcxdZQAgJrR7fYjbY12VwyzAVJCpFkjj4BOL7E6XQkl7KHEnHKEJoomtFeYjxDFBV4eXvOWVdvnztsTbMn5b9p4ZGVgwe5F613ZUHD34hUnd719Y3TzktmlnkC7yZPuSQxtXRlZMNAdaIlYTW3h5QtX7EE8wMPhm6htCjJfU+dSTsBAEw24a2iwvqym0QM1BhI0NNinwUCCvh4GToBw6SB/+mmWPwT65N38IUVn0ljdWbCkSkosUaMenxAazJASgEwCs/VRXDhQcApUXKBbBeKAufr4Avlrc3br0mXbWm/evu3YH8n7qgeO79t3nLynuueBEyeYnQE4hWBNM/czpsdATskaDarLMrAWoGgwFgoFmqeG1QmsTpi4RlvSysT15y798hkqrjmbZH4BPiBpXjjf9+1feulFg03SvgCqXTK9cP5zf/jli3DRCJ8Z44kGs630UUUf1fh4fo5Av80oaW1jeq0BpDx8ckLKSwLwJxy03jL8cuIyV+H1gkrNpP6Antdo9SZz7UJN+CP9C44w7yl0g4gXErM7T+r9bpPK3Hsy+908iMvbgxuGkqnnyJ2XDrM9sQB9loKeD5M7Wb5LdoUKBVmtGZc1pjyjkUzshUJZT5R9YqKC6Cil0NV06KioQEq98KU/mGqUClNKqV84P2fzr16kFzWg7fw2NWYQQ8JFPA164eL5zz33q7fTX7uykiGL6sKku2hB+efTXTz/wrN/uHmCompKUTWlqBpped2vfkF/q7GN6TR6uPK5R5UrBtuY0WBiOWi3z4UffuzXFfqrkG0sGPJTwqunEr4MX9OgcuFz+ATf1HARvg53BHZBZ3T7/EFBVd8FMiDyajCGDEaTC38VCjf8snGrgHIiyxLr1TQ+zraOsK0DHd3P0y0UsgRdPiFhaR0SrALfzq9pWdeuErR6fkHLwZ7tarta8Ku2lviHqnP8B4Lv0RFPdfwD3uKAnbx46XrS51xh322rfh73ehnstZnaK2lFiloLZZ6nZwLtFRZU4VEL62h+uuAQCh7KTXNJQQAXFL1PK1n2pefzhzVOu0EVcB/OPf+l/FFnsyrmOUrWk/7PGeJhWyHzueoL1X/8SmpBf+tXGJ+B2cCnYG0L5qrwHFLOAoOJJuPMVGRTYW1CfauixR+cWdF4DoCCKFC4wFrP3Sz2mFSmpTe1v5rlz34/eNDluvd71dHf/Y6ttYjqi4dA92cVG08LNp6K5xST3JCjXoqsZVFxsJ7hWYP4FgmYqi4Scy0iZ6t/R56qHiaPBPnVmeAlSbH5Xr+8n1zkPw8ysojRn1r+RZWrEPqKikk4HmoDiEmuVt5B830sSykyi/t1on/11fcKI+G/vBLmJue0HAWSuKmdDLXzX8SMFuFGYc39tTW1uQrH1hRyFdXEmuD9amBNQkUzwTWF+prU0BdjoxgiqP7xpBAN/+VJ+N7bSJx8n3+Mxv0UE1ghTUdngBQciRxJWMlt78m+p3W4oCoMw8dvqd791Xvu+SqjRd/lt/LByzLLCQo5mVOP409DTtADHmAfeaUaXZmFz3+b7yN7KI5N+HnMIVsRehXNAvJmzqJqpX8Ivg3sCMd2PvHt4kia/+IZZseMgA75E/kl5+Yi3FGubENOcuIW+2GLjSCi0EetCCGnER0wFQuTcTQZgXZ4EDhMEPN52QriywrmgZ5miTBQhnYzDdRLQXFMbbQ7qfknOAESkdo9LIhPE/SYf+gntejRpEDRyMc+z7998zZn6s29I1tSav7Q9kU725d3b95ffteJVevE9w7G/O1711ZfXrxuwbyOjo2P2BZSvA6ADeHi/wV2IoCZLGojmjhm4JQ1REFQ46falmAiOUjxsjN/SAQ87DZqXIP3J4cwRSEyI9sD7rAJj5MfUBnTW20qalVgAqghCZFJaEuKmRHXHmgXNo7u2X/XttSmJK/WDa8a3rPqqU38v3xj37q33nTs7clw966hUzu337iJ8cFGgN0Ne9IQmwFYBVLzFWeKzXBkIjYzYdI4a3bjxodv3LHCv3DFjhPHdm5a6llz4MjJn9+3JDxw/NM3L4ysAHph3u83QC8b0GsvVzYgvSw1etGlffjCR/047QS9RFOtlgUdEiVqY9DTbE9IKWEpCyZLL1LMhxTjjCZ1rTQD4Myg29y45yICPv+ebStXC+1pNb9yZMfR3MjKNWuXrVx+8DdvftuCnV+81Dm09u7jO45uIsahWwD2FUAvJ6WXH2EXlawqA9sL7OvUixj9cKpYilWJtjjzCCt6KJhBCNIqMAqsyEqPyjqLlYKtRzsXX4NhK2u43olYp1Mbw2STEtuM0WDninfu2H2Urx7gj25bv8y+afuhB7PkhpGVS24E4I/v85pGjnbFe+5/1+bR62o+ej//A7DE13NlB1KdR7vAUqAJQPD29DnJmGPxS7DFHbTUwa5Dc7xsd+Bu2G1gNjrs+NKBZqMbeUJjpAkoNB9LEyZuiBSoLXnkXVs2L+m39PS/7cc/biHn46pZI9eF4r739Keri8h5Gu9cd9nH54GmaeDBPu48V+5EqobAvowikGYkbZ9qvGzFF3YANZmTW1TjFU9P1Ayk9iCp5+QkNWY45IBufCwTUOvA9gXIuZyc0dE6sFlAcye8dNrkdlYBBhjL/fByVkC0D1gEXme2aj32cLKlo1BkGawWTAXGMrhFIRH8rgK+8oBLGYDnHlHy9Up2e0VrcBZnUS7zsBRXLc/lAQqwI5oBg382qScNlYwXeCjwGzv6o3By163Oz+o9sDQV+vKDvXuXdbTm3nR8ZO07brzhppaRjdtv7hu8qT04nBi+cXj4xpG5eZWvq9Ckyg4v2WVKlRYs2e4OpecXegd3Lx1o713WkYnqW8j7jy5bdnQF7vsBWgfwL8CzKxTbwVAoa5GYVuBcrZWmE6lcYk6sgwW8HKww0aC41kYHKzyQrah6VTUxhKLUhQEJmhkVQfwUthT/sX1wUeeqEkid24rdn63+K0mtHs7Pqj7F9MBOAOptfIVTc1ZuNcsdlQlRvBVLTtZrWZBKxQI6Klrvp8IAmADmIBxwMArM4AXkwOAYx8AVKAuMasPBZ04MgMPySUjunSTUlgw4XX6/y0nOp6tRcv5cS8Df5qewzL0coLBYOR/ARQ1lFHwIhsCKJRxaFsfEkJmuMWQGbsOY2+gGaEQzzZ+7ARp0v40agAaLDkAFWagylHQiGCvAIExOU5WOsNnrUM61z5q1sv+3JLRh7/yPK9B+IRFavpj8NH3pz9t3CetqMGO+i+OBtuBTt0941GqCNsD0QJv6CoG2U+0q0lX6wk8L33yA/5dLr5PY+er3ifGt97H4IdVnZjiNVDqjXq7npC00dYUbY6IbY0JBYKVLGaggkDgR+IRWQIlORWAVxW0/2t/WY1mSewf/dPrSJ2/0J8Lv571MB6FtG4fzH+EOKzaf1QNOC7IEZVN0+zAx68jXLIIICFEeBH/EJntR/RuogYAmKNgG1CKI8JRJWURN3yvZRMkE+xHAeJqg0tfiaWCqA/966kxMebj2vCyp5j351ApHqCu1v3VRJOdrWhjNeckrg5n0+rbmd1afJBsPt+aqDytP9bNG9cOaibNWxwQPXMMpozhMOWYOnmbxJaMoq2hBgpVuoGoSwI0HLq1W5TbXThx5ZSQ/5cBRfcu7AKZJ8bSazrILbxxP43XaqfG00gzxtPmnv3j63s/fmzvwoQPw7zc333ffzUfuu+/I9mPHto8eP84ptlKGwmLnQlgnQ6PTbozi1kkUpLxGpHDdRnLkKaHsrHYVCRVBG4ntMKavtDSqFXRj/ZZBYJaJp0armpHkcYm1Yg2wkkDbp3a279n/1u3JjUmSWR9deR2YSd/jn1+YbEc7KRXZ9XEyO5lgphLSMEN+A3CjzbKLmzBXEOS6zQKGyBRbxQC2irtuq2j1VGqhrWIQcVexgEArgp9Us1c0alODvVIoofVfmm6vrF7Bq1PtwoZNk+2V+aVLQ58bXTdhrxDuCSC6HeC21HIdjNLUKjWivW+l4FowcgNkZlWVrOhIOScSEal2p8xX0+5a8Qmg4Ob7Z6dM+eY7tpJXjt3lzIgPV7+DZ2At8Jsa1oxiTC1Si9NbCCMZTVga61Y9xtSCSnJS48GYmt5iZ6nuoAjWOwd/Q21OsDKCk2NqGaWcpBZS8yjxtLW+9XcMrVy851M7RnJ7E95FW5fN+9CbNh3aetdAdFGpKZn3tm/qWRzzR4ud6TmZwGBX7zCTQ6sA7gh/iHNxow2WHbWR1AWsRqN5GndOcjYWgTppfsaJ6gm2WIAtFnJlvVCrDEW7npNNikHvEiULFY3gDtOEXt1qThfFVQ9qUoS7zM1atmi2afGybcNoLj3wQLr6h2VLffHw7m1EU7PZya/JK3CaNyn+OAVWoxwjGuhx1vIhDQE5jKma9TRz71JCc7IVDFDJjFCB56ZRbM+GYB2+UEzmjW2Di/JrC20ptWrL7k3rzpHW6g9WDxdmkY3V6LYDo0qNGeauATYTnG/mBKkALI4o8QJY2sJCjQWHG88njZP0Z++OBVS6jPGe1n/Ngcv57cXznCN+0l5lNZRG+M4V8J0BckKpW7MHCgX8YlA5GOdCziLWQkHSRi8AsxZkD+yVO187i0pgEOWaTUcdLAx3ffaV1x+rhbsCNNyleuF8v+f1k/SiOit5spLaJvutF5FNtdaL5z978fU59JduGuxy22Sd6iJKTLsKfvmV1/9zItalcrSe7ze9vpJeqaWGzn/298oVnW1MrzOwlguH245dGvTRhY/n+9OvP0s/5reN+fweGutSNYSwJieW4BP4BN/XcBG+DqNirl7J0ct9gtfoHT6nqyHMpVJrtDq9wQ6b4PMH6r+aEuayEupA17dLCW6RycEtY26FU6+KruhcEVUJLs3ytpO9y1UurSokLO2FzXxpde4ODLnfYdnsIyUwv9LW0cAdxuoP2ZmDvdXB3rrrcS1zgR055GJPDvW7EtfS2KkOLGUKHjcLKGk9iQyFwkpWvSAXtuXMqox3S+fY5wp7NZ1mVSq8++J/nBwQ87ET43+8Szdo62i5k8U+UnwQ1nRxrRxjTV0BOZOqQneOnVjUdXhiOdDDtt7eGgm6EHcsOaGFXHNJX/ZtnaKq59bWV72jixIek9ezJy8C1t/aHyGnSfbSTxZsNWR0t7fQOgjA1QLrToltkb8itrWYnKhK5Gz1PvJWL/lQ2lPdnmHn7k4lttXM7eOkeK4SYXEmNNpUcPBzFb0SbmrJSU0XUNb7DNg4I/lsUhDrs1IgH1K0YDWI4ZU8NodwMhcBwvtSVAvILjfN9ykb4ShikgUk8GziYvn4iaIReEOv4q+LXXe+W79xZ9es1T3aVEdHStuzelbXzo16oomuir4tvrgnnO0J3xXNdupV+s5s6lS0JxvuWZw+HV+FvQveyxoywP+axqmUaBNYs+P0h8Wp1CChiLfpP4XX/qLYkxhzu0BpsY2Tmusxt2hOjqiwyq/inqCF6oIk5uUUSEV/nokPcIfj8DakUCBKQ0tIgYgoGw1YowBC0o8U8DA1RGuPsoSiyspk3JQEBVecEaWVjM5a06tLdnQkdb1rAPkNuoce0m3Y2XUy2xM9lVIwj94VppjH3wZ0WRU/nV7cg3lqYiCXyBmQ9bM4LBFwFFDOY9yLpzUEiqSvOPRcn6qVBWk0Jup0yDwW+BiUojBq+1BNQysOtVtTa6PzZntCTfZIeo3yiniOtLfHS5Y3t7cni8xe+93leWQv6HLsERzmqKVT0SrVfTO1B5poe6BZR7WMSWkPNE+0B5pq7YEdnbWyNAxXumptgeqouoW8k1aeVQMYshxicJy8/BPyOv82kBMhbi8H3pbkLNBydn++LGKfxICIzXTGnBRgFBLyNVdNhZ5tuDGSiIkpwZ/Py3Y9cJERXkSo0QPAVXSc3mKtJUSVvq50RkTSYUtXloAl5hEt5OThdYmlfd6uWfN6PQuGExsOZVcuGFxDSrtP6t90mJ8VzArV24VCaI5w/WHdyT3Dew3kVuM+xp+rUebxD3At3EWunEQ5EAM5gC8qKcaqwJj+gsyraNky7DVNj7bmJN0FTNhIznxZR+MxOrQ6wIFowsouw3g51IRXQ36s6AklwPhoU5Jg3/1VGjWXSnJmLZL7BaDQRVB3Y2oNKqrPVn67keobp20MOBb0DTw2KBP4VEMu6xzoDqfLreiSCrxT3lCV4dCB4chHY2g4NolSCy1Y9AbQPrfxWOeD5bEsVpRVTUmI1uIlWrSMiv1wojKrrxesWoPq0MiBgdDstUtX67Uu4aVP61vayK7qioG5RpKKCfpmdyJsXbl1KDB7aa+j1QcnrTnStzauagqE980Jt1D+GeK28yLfDdZ7Cv2OJApdA3PwI0jcdE4SLlDRF7RRB1IE3s2gbYpWElFjY6A4pjO5sQdCQsPJgTglQT4+S9Qmq0PndyvWKUaAMiUPolbyaDFw59Fi/1dGO+EqDa1PpdYHNnTOn5ffENiQTsNDx4L5+fWDq25aBf9ObiwsGCpsCm5ua9sc3FRcOK+4MbipvX3Tz+dv3Dh/wSYldjtIcyW3A07Xs3geRu1sBdkNfGMByZ5Dx9kPbwx57EXQFahB5LggeWYI60nGfC2y54J3vjwLRDvQ41PRjI5fCfs46vpXwD4E1ouQKBbwZzB3gzhbVfTd0P5l+TOf+Uzbpz71qY/zt382fGhn02erUmwo/uEPx4diHN8g17VwomkWRLiABU48dinmZa2h1huWAgPUR6iMb2r6YbWFF8l3q824p3svf438jn8a5HwvdycHuOE5qkcwZ9ET3wJ4tthkFeBigZcWGy3f9uloj26exQTl2Vho0ALoRXoliyjxvVLSPmAwasRgLJPNdZdwy8HN1HuAC/Ks2N4Yg41X6fS+cCRXUsRFKT2Jn2kXqBL/K9Vq3EvI58jaWT5jIXt3xYcGh4e8/f25XN/6dX2d2di6WXsWheesbC/1bdjQ15zvH/G1NefnjHjbWsmOtR3x7YuKkWxbNFmIZxYXcrO8iY7i0Nxgd2cy1RXPLCqmSoEmm70tk+4NNtncOSY7P8ZvIB8DOmEd5GzMQgGTYJF4DiuO88orJYePcrwfrqup71qx0HdKlbhDEdjpfM35/5g77vHE3TL8uOP87XavL+71xn1eu+iFnU2BP1UAmY31sinuVqXD3MhEXCInh5UAGy1lqQiKUk6zri499ZgxpBNgAVxanqlnhzKAVaxanrouzwoGjdXhiiVoiMIbFu0DZqJSczqTWe+yuaOxGdu5hKmVhNQHSz348wfPvnbjrV+/9dav57bP6231pJoK8+YWcjlH95x5mz9G2iqV6neeIxeqr3/kI8T2ZPU76/a1++Nr5y/d2BTsPAS0/jj3F1Lhl4JtGeaOcJIjJ/vgAAZr6EnqnGxQTdTsGOo1O4IV1JDFwAp33PV8VkAsqw1Y/iVZqCku+/BEWi001VXmRBv2qaiFhj4VJcWFjnGITM1wffzgEX44P1scnDe7Jy6QwZ62WU3Nkc6+nevI+q4e00gy2Lxg1pebOnJtoVBuj6GV8s9BbgH5N1LhNGADcKUibbFUng6+w3fbbb559PE/Wp7wPP6E6wn2VOuvJNs4NddRq7avdVZSnayZIcSr1OzRSpTiKHmkmZTSv3npb+ljVHHHyALyKv9l8B8dXJTLcM9zkj5XsbKNiOQqMfqqHInh4hEnSL1gXsrkKi72CccETzbRo2GmNha2ETnhaETZu1heijKh4tXTThFsRNQwawzrhKJOkbWMS0lxTC+EAyhMvPay1R7CXRVFKQi7GsFOI7ONapmyhgvQ+nc7WDbeSR0kSis1zRcIRVbxBD5QwlXEiqdWcuzAiuUHDy5fcSCy8Y6Nm25TL1zhETtTmVyo0BHl1RsOH96w/vrr3/eObdvesaP6h68POKLqDcuX70ulGX3/md9O3s/fBfSNc4rngD+UvhyhLcJ6JcvLZi3886v89iTrBzlPPkMe4z9GY4yLOZaz0QHn2yeIqAQZ9RNBRv3fULR3fv72+fAv3r6oHf7xxe7Bwe7i4GAx1dmZSufzrM+Do329AsidnQ0Vt+A9GAs0lq3Pl1W0+EmFTY8Toxxo2sFyARUQmrC6fNlsoT2GAjCHIV+2mPGdRanFVQr80TNrbPbFthHa8JtKke7UV7+aeknh32fJc+SD/G+5ILeUA8LIVqCPP4dmHm278yiVBx4KjQiAeSiMHiyUDqOBarWz8lA/dmN6gpMaPrQ4bKGodJVrn20fKPSojDqXKWxJ6h5/dUl3ayqWi/PPzurqMNhdVq85YI5qY97ZuV5fNJll8EnkY+RRgC8CXjn2DAgqDFdWdOw4oIOs5OTVrMPDiH6jy0AD7uC1su5LP7KuTpSAy83A5TYXY2BUgMUu1nk50XiprTWBSYHEnCWHc7nBbNSTWtjePSvW1F9IzCfj3uKsOcF4sCvtybVkelyapmhrNgGw/p7vI/fQeoQoreW4Yj0Crl3Q/n6keIjvO3NGiZ8tpf5/GLP11G7yFbD5ETu/HZZacpPF0vT1oqkw5hyC+bwUZoXgblYTi+JaB0pH9vjQOxYlF0bSwFIuuz1BirtHpHkQDKXxLme9uJIK5ozTs7Htnq5N2TbBqzNorbaIl+eX3JBf6FZ/gn+4+oMPdA2TedURPsIn1d3zjoeaTh9kOn3jZYm8THsbTGD/0JpQGjEx15S4jinxWi2epabBZxMR1iUA08ZTh9uCR+8my1vIi9fvqe7cU93E//ulkFIrQ9xkP/l7GqsA40zpKbuG5m/H1OZvsjGcTNLub/zeX1zuIG8C+E1gEWBYglOEg5lVvxsopKzJWdNLJwOAFwAbSP2CX2yb35QI9Q11ly2ppLi8x9WRbNEyeL8LZ2sl/1OwNWYzfmCyvbF7X6mB1I9PKXyU1RqacqFCrZuG3L/b2RRJ80+H9O7qt39L6f0Q6PXPg17Hepv5SBHZrKJJP1qnYmdVEmyAhFXJ8qOXacVxODoB7WfRzDoZWHv5ROYvrcjzhzYNDG7cODiQnbNrzpxdZMMjW7Y8suXVY0uWHFsG6x8HHfzrmg6eS8C/cGmVp+Oge9/xjmfp4+YnHveAAnaxJ9C8CQC+CD6CAFrQzfnhtDzHej0xmGAvVALscNvy5QD1ogNWfeuU3vQYTj1Ag6w25EDFQt0gukFhyk49hovKTtrU4bRjE7mTNpGbgLwY1dcbWKWuSzxHeI8/QGP7TlCKYSSLyYUtBwI1dbAmWWU/xxO9xx9mFcuYY9faJS/1rDza2gaB+1iTtwIYIkKhiFNmzrmfMeSaI6n3/0O8szN57JnoOdfNKlVhLk4PiYZ0HtjMqtn50guhVavI2peDX6j+aPniecg/qkl0aubauQ8pmQvsdMvkZItqfApVslegCloCIohxMUmDEmGgR1LEl8kI0CPXQI+k+CzhTRZ/sKVd8SndrUiRTBCzICaRJJux500VwRk1Le0oV4EebZQerVPpoWgBHdUC3SWl0Ro/UqfKh3L9hV6Vxqx3mgKWmPZDrx71hVLxjqgF6DSJRJ8EJaG3Wx0Wl8lnCmli3tFQPAxa4nk6a0XNgbnAb+YfAD2RAOnQxfVwX+PK7chTyZzUUqjkGJWa8uUcJUIuA6S5oj7preuTeL6uUrC+tB34qyMvtwF/ZfLltnb8qrYWoGd7G75sTwI9sarDhTWYsV65HRzUsVyh2IPUbBPldB6pmUvCb1O0gCMWz6O1jIqqAoqKfbCmqsZAVSmO3BvoKhxyU5rgvwzlPZxrk/Yn5iw9nMsO5KLu1IL27l6mxMywAf9KOfJm5MYITrZ5a4Nea03X9Fr1AmxDO2PQELDmT5DgPHf6cjf5Gfkl7Se9hSsHMAYXqfeT2oR6oRydjcBSauA/Y42yXRuytFZ8rLvUl1P6TGmAw4d2lmBkk4/8EcxE2itqmytAT15IpG5uxEazknaHUt/SL2QKbovQ4DLVoninJzWWrusPYbPpLTSol0/OKzR2lgaWb+BVrLmU1v/QvkohR/1Exxt2Vjpp9mqGzkqh4ElM665MzxppmtRhSZ45+F+4JtoW09ccmXXD5DUHDx6csqbnDddUanpnwLNUQJt/+rotO1p2NC1TLZu29uLFDXRugvUDcHLfPGX9GK4frK2PoSRdgco9AMSIui5Ph3HoLlQCzPMJMF/HznydFPXU4awF0ak5xxuJi7rekh2s+RAN+NYRoWl5tIgKtHkXw9HC1PbYlXwqGlzssLmFkJCKsFe2SS2z/NdSpZ6wP1Xqjfirc2rtsyDLGZ5hSmcfYLrtqpTGZq9YoeLQcEEVKjSKpe0CDpNpYsNk/IBlhL6jWPpxhAxPzJipn2l7JpyW+qtpW9XkjLpcUef74QdeTd6wm0WnU7Q5nTbluQGnHRSnAPiyh6+Ok6+eAUrlKo4JLxbwCrLdC9pQOVfcE55qHPUOT0xmn4M6YinM/bhtrJh8Go6FadVssI3T8NRmk/GOXCKZDYc87lDY5Q5PxvVMMptNptrbU4FQ2O+LhKmthQ8raP+zG2ssTXQiRmGikdZBw/sVi82E6Fpoi6up3uLqwfokTOrUhjRRu0bP17pcWWclyys61LTLtKOzk8RYKFMsuGLFhBZ77CxES+IkduGJJ16p/r687fCHVPaF5lrP7fe+x10m17e+P0z7mztof3OUu6GhvxkbMupNscBkFZ+yDbHGnlgM/aALhYZSAIzFZ3WC2eH1hagQdomSHT1iH2yEC84QLb+tqLla9W1DO6zSGW0l1FDOUKs5S6a0Sa+43g3Gs3bb/NibH6g1x9J+6S2qFmpLh9Gunmt4jvkYtJcZ5BXOnXvDbmbbNXQzi9O6mQmIsoaO5uo3qLhmJBZyB//b4ACZqm2A4ydUgjMw+C8cnAaH443hcF4DHK7p9FBkeyNNvlYX6xMAgUQXFHjCAI8LLINjV4cIAQoVKlYm5rz1UrqrQogGrQmkhMhkISu+rgSYLIxNh34G0deIydenSD0Fn4vTBB7PeqaVPV95la5p2zV1TYs1n9LaO6V7GhlQ6aCufh2Yr9ZGzZjvvw8OZEAFjp8B89XAUJivEQ5HrWt3Rjic1wSHS4GDDm9S1FgjURQurBHmKwoHNkKl2BQMrhoPHrkiZDOyn+lCA2fxrP/hanAjO05nwEbAZ2DAGhJfm8R8dVSmMR8PNgPHZ2jPqo/bp8wHovWSiI4LThVvMgpmwIKlaLHQyI8lbVgUhia4K18209Sz2QveipHGDI2IgZlaTHR+QIBWhaEJrhWVfGi9NVh01MrDUSP5VtB5E+/NsoETTz5JlodUJI1jJ8jy6g9w8sTlGOuvwb5usO9c4MHeN62zG+cZuQvUoU2zrEQkT0sgJnV7I3mbmYXQbMO0eC3OHZ3UCY6TQ91gB0l8rxxpxhqRBKgnfZT2Fb9hN/hMBuD0DvGmGSzAmbvGGy1B4EnaPw5nBWPRHm7JjB3k3pkqXn1KMPocBqOd7msJR2OT0+Q+8vUgRab1kpOtB5mv898JG1ZITYbtcRAt02D77cEZYAtcAbbgTLCFJsHmuUbYqIiZDN9qRdDMBCMKnBqMTRTGDE7BnQYj2ldOlvdO5rA5RArllQxODW5M32QYW2dsCH0lzN6FJ3BCiziDuRsdT9s/zgE+Jg/1aMJwaGlI7w1wLM3A5pPxXTADi0/D/U8NzE19AUaDMKVBCKhwx0xUgI1KFSoeJm+jM1HAx0Svj07FqyTYu8RkCtCqZB1vpwMyE2EcpCmI5ms6GDOI4snIr50kkKcfmdR0PwhncN1LXuPNWBNKw5/KvNcbH388UPv3xEc+Enz66SA8PvWUwtfjfJz/KOXqBNrotOo8DNQS6za6D95paRtlks5KA//BaaLdQjFWcw46jHp/To5NxIyJz6oFs9Wuo3kYyUDj1bIPSPQspzOo7VZ3osFGZ4UgtAgkUwIqeQhyg4N5Tpnu+w+PDpRCfXPhebA32D+3o5XEiqs3Hx7Ah1YkzaLVri1bH3r0U0vWuUa2P3R8NfknMN3fuejD9x9bRWU/7c+HsyuC9J89U4e+e6YOfY9SBly22p29vTN36aOEa+jU3wXibWq3Pv/iwf/LMIB11ADDP4EYmwbDZhBjjTD4ZobBPxMMgQkYXFeBgUqsBji2K+JqJlgU+4jBE6a9oSnuuukQIUCJQsXFDmo4TwsgJiC0w9H0sKPJWmArMfYuNgE9LVPyYFmA5kqwz3AYG/DYMekkTsPm7TPY57QnHOhs4ezYOTq5K9xR7wp3Kl3hZRUWjV6lLxzt30m94RbqgjX0h5Nv1/yw2kwWnCmyrGEmS8MwkYrgnBjjVJ8rIvPmPJ0sUrPCaP+i00zj8ayfrWaDYUa9m05nyZ4+cqJhPMvNOJ/lH15e8sFBKo/2gyzu4H/AdaAUppC4lI5mqS2Hti+ROunyHWBiddjkBBvOhkA0MyAkrY2VWgE8WJCU6ICd9HpoMlFWtcFzs71sYF2IWlF2+VEdUQ9CbsOIt9bu8SpdwfU5k0r1UWPhUbFLGQeocYn7962dvybWHMvNn5/bMn/1oKdvbnE2vnFHou6e/OAy3rXl+uFZiblN3f5IWzg+mJ29Kh9rn9WULkYjpaZARyrV7mvr3bTh0kXkcdrXzX+R9nUn0A+9hs7u5DV0dqemdHafw87uaPxv6+1GMXaV/u4t3VtTV+jx5m1nmH30/w884SBdBc9bRoqHroAnOU3z45PxzFwjnk3XgGfzjHgm/mY8qTi+Cq6Do03bUyCer4LvddfV8f0AxbeD+/RUfOMo1jIFOauaEfdKqlUdB28wWpBTqvpxVygRBYHdwWxLOPwgqCtN7F3TFamEMiADMuCc0emPq1vR8Ao2AXHsvazzFtMyOMWxDG9QJgi0YFFtv1a6dVObtG6SXo2AJd1c/wJrRBcWYnHfAjGquRIl/25LT0+6q6eH2aeMnk9TejaDdnj2GjhIKuSAxpV2VpUYBzVYnErHFLvxS4ret6LSweoUO65Ix268vwc4pLIfzAqpVZSNanBRgx3/haSs61L3RDz8KuTscmOZpFt220W3W7RfiZgv2b1YQOklSfrcSNMvKzTNcy9dC02bcpV2lgXozFUSSvi5MJWuLYwjW2yYna6k2LvUFenaBZdbonT+jZQTP2H0xxOZJjVl09S10lbubIeNSUX/OiqXlEoJzVVovCu7OAv/QqC2wm2RK5H4nzMdHZl0R0faH491x+MgA0TQ4xvJL7k4zWgDx+LoASlYkNN464E8m6BkoU1nUj5fyTmjeiByDo4/30Zf0iouxrMJoFeCcilGhHDoQC6PnkQHKw2gnJmgHU1aypljKn00zYoiyqZwM1KrQyxbaPmQBBR0+PzUdnKmsRHS5w8naGEAH2UiUyWWNVpTL6Nlqp6x9kybGjFxExKg+BxiIakCNjqLRLO/b45j+ZKOAVN+98IlfPUXZGhhV7d9zuDujs2rehe2dbTEVkXFo3uJ6tcHZg/d8o7E37dF8/35G9+yNeDYflM80rx796J5HfnO1r7+gH3BxvN7arNFOuhskQjWp4dqUTTmc9X67D25ildhzGhjXsSv5EXQ+/LX8iIeL96SqZ4XCXmVGaGTsyKlaTNJaFaknhSZMp9kyS53322akfmxQ/f85ub6nJJF2hZXx0Jb2JxOinPVp6lepLM/QC/i7I8wt/+Npn9ErjD9I6pM/6gIJjEQYsOP/8b5H2jUXHEGyDYwaabNASHXnfl/FBeMVl0Rl9vBbJmGyw/OTMcl/sa4JK6AS7IRl/D/KS7UOLkiPgtGM6NomsyEE9gkKgWnpylOKZBJ918dK7Qz2wqVMFOfTaA+c1OwVFzHfuY6puFdK3vXOkEBFFDpGPgUJtErULPsr0PbPqEGS7VegSuSoKSowfexHoLpnGpi+q+ZdRUoc0PeDfus5vToc06aG0JLEqdXkxuV4SA4MrI2GgTrRHAoyHBxJK0MBCGmM8r3P6t8f9s1f3/9e7FMEb+3bWv39cr33nWm9r3foN9rxjnUU77XMtP3WhW48d5yvQ1jTTKK1Yvr7AMeSmOwtL4WcA6eB1zvR8A7as7G+bBHfPKEFWtO8hRwWD+yioMlL7QXKibGDibWLDNt8Aqt9XCzdpBAA9bpGfYcobt58vYqQI5N3dP59D4e3wEuz+AsGC+NzAnYisp8d+ZXKPdyi7EB0tSRwPt0nBM0BpvDy1SCjHYGJ6fCaHO4NL0TvOpJ06gb+MITcbh62UKGjlS440B+a8xz6GHbA92r3Gvnn7aeevCW/aP3tx9eObKFH7p+664f7DnV2XR2ZDi4uCUdTnctDAzc98qJd96+f931t+yxx6+j8S82ZwfnnKfwvNamf3h4ZkkkVOOTJ4FU/FGrBzwHFq2uBX4a5oI4p9pjlRB7F5qYGZJpmBlCZ6FSM2xM67FGlcTeDENDagmYCS9g8hiRdiEe8y+kln8cLH9bRDd1sAi/EO39VJHZ/AKbMQI8PiWvMWnKyBvkNXiddnpeo3SFnMvkWSM74ShPnTdCTpz5b4YLNdhkuO5CtTUFrl+fmQpX4ApwvUGuBeHyXCNcVGhMhm1otImKjxngU+QIg5HNYU5xf9cAYyNL1+AFbrZP5+aGfMOVOLmGGXJyqp5xCSoZl6hy04tpGZfSVTIuE3w9Ged+cGSBr6Ma9Gj9C2xRzVTs/4hsTV1ZlYL/0xT/IFDgjhl2CWe8JQsVD5OmkfwMePuYYFXyLHH2Lj4Zb5pn4XUszxIP036Y6XmW0pXyLJOa8iajPKuxRW/aGemc1LIHez7KHSYX+RS8MsN5KdEafa2WS6lqNyWS3LmKSC/Qg6O6gDeTYXdhxUE9vnoflrYOrFh/NUoe+V/uqLv+Dxu1HqdqwuMhJ5UXCu/9nHeR/z01ZzPJf/Ap83f+i3I2VrtaydmUriFnM//07k39JX/v7Ht3sedcCzEUhlYfGMgvXn2gBSjdPdc1uPDQkfuKc13zFh5Y10MKHSeqf84d376+p9bD8Xvya2q3enA29hUmuXivPsnFp6QuxqwilVLXOMwFZeiUgS7HQIhOHerCHznz/wCsYFhNgfW9YGNNhZWMU3+gEdbAVWANXh3WUAOsnr8KViprp8C7bTsTtjPBTGOQDGa098NcE3f6ClAj0Om6tInl6b1uJ7BAaeNn8sXPijeS7GAmZ8IQb4Ab8QM2ogZrN5KsLOkNEZxoXJkQR1OwXQnn2I32X5lFvKZxVZvdC1YbuO8s0kXvMZTig7BnLrBYZ5jK4s+xiplrnMqC2aQZJ7NkQSHPMJ2FX3jmTMN8Mjqb1I/2KJ1g5KiNcfXS0WQSydVGe9rQVhPz9LY7LmV+Kx3uif3JbHIr3i23rLeoaq1gDYNbcSSZu3ZPvAPtwuaR3Qfv3ja8mgy/b+/qdWs3fU946nvb6dTWBTiMTBnbKii0epr2GDfjrKrJ1MJbJYcKlThjEi8r8vFcwKqpfla2HWHRVDTl6S2A8WZlKjXNfF4rhfna3pcm+GFGih+niufRGkfMRPzjTP00M6Zg+9BMa4AfovdAOqDMWzPSGYAsX++m7XoVrcGCHrAWecRHm7DwPkjKTZAwlKTJl420Hcmox6JGIzYl+ZGTDEY2mVGLt1WU3HY6nxFvNdRQCBwXcI6NCFK/+d5bifu7Tz75b9VXbt20f7/Hs3//GMl/PPNnLGAky+99jF/0KNVbBiWOGODSXDv3KJtXhXVXEbzHYp4qLiysT8Lb1nwlY/Ej/Bk0mLIUfmUEBdYDWwzY+YIzC3C+h9EwTtuHsExb9mPDlAVcci/O2bCP6UQ3bSIyimWzg6bRZUsE21wcTi+tWclgn7GUtI8RY1wzMbq3HiVMTIoSZpTbNQPm6gJ9MuxY1rnM2b5jYCH/ZzJvoKkg9hYPtbbuWd41v69n4cKevvkkcSGbL84+9fN7Fw3e+5atfieNDN599192Hjvx6ePHFqzZvxvow/LGYc4C+xrntk/OHGPtdrRQsbNceCBPYzXWCxUnS3k72RAAJX3qw7IdVgiYvLbZ4zNV5k/KOY9MqU9tyD7z2qlJcMI9z/eRD4DM0oLEQrkgFOptqLrarZWxYVpfu+ENA0rREM8r9je2pV5H5/NK/ELyFNjbIrdA6egERrHS8U1Y/65R1e5YVRGZ8SzSTtSKntXwY7+hjo4VNLGIwTRjWJpm/jI3jtq7jf31XGMj/ZTe+7/ud6u4V3kdcUz07GvG8aehZx9vt7eKPPdqZyd+3gmfX/CGn3fyHcrnXyF3kpv4T4K87uYkS66iU+6iLFI6Gc24HfRGB2yioVpDz4bOgk2HmtrABE/jLT1fWdDr2qYVLb5YPBBpJa8uOhqN9B82xP0BNhOJcP8Oax6tranKVQwTa2ovVMwTa5q1sCbB27gq90Olt8zBnm0603HiZpj/PgLWvp8uuKCXfGDODbBcMNndtuhoBNe7HCNHuZG/fT3PVdf77MRyR6Ioe08Aft+n+MVwgpYlJ0UKCmElHxzKeANtMVaPkaEggyIxmdI43kAFvpy97HR76pQf4zSipz5iaRLxS1MvnJi0G9+Ad9s1M+9NG76Ze319o3juFODxwwk8VDnJVVCIR4VLvIF+WJvrZRKlhkcDNSUvjqKUwngz4VidumO82RFWmvCnELg09cKpRop/8srbHZ6094AD7P0P6d7/38bB83+AwyQWCk/mJ8I9DjvxLHkXyMksvQeCoMXudOVJuQGC0rKuPCmjf7oV3/bxtTeuXXvjSyeHh08Oow4BHZvibqI15zGshtdTKy1SKCj96bLFl8/Tq/WGdcazGtYIqal3NdgnuhqCrDUyUbshaiNPTqiN+tVC3ONOJNye+AvxbBz+vYCv8VohFI+HgolEcMozkx3f4haQt9A+7hhHcBQPa6M3qeg9H3QYEmDjtamko9WN32qcroLf8WP4jtOTv0Pi88rXTHwHwe9QesR/3NgdTmdHAQ3b6Awy8DUySL84WCQRqmiwRJzk0ZnTFGSXCudg4LgKkzKETHVB1rfk83hTJNkVAUL76fwMfxgNLL9H31pW+euBY/DA21D9ReIgjZIpGtjBonGXl81ltov0dtEUWRyclSiyGI5yp+WYK4aDXeFpItmQGewnpH/Qeu+Bjg2BUN+SDYfMpL/6GUKIr/oLy3XDGxaGhq/fcbvtDyGVJeg1hlSnHmiLB+YfPxAzekKW2L6bV/u2nzmBfWbkzfxs/knaD3lE0eB06IneSqeK0kk1Gj1q1TwbJqrMD5jxHko4bQFpH9DTWLWd3nmexeuwL1L2+uhdW8cMVpeHRWbFIhuR7xALEVIAIwWH/Sa0YBx4XH8+lP58oSuiCucLSZVqTWyNSs3fmUhUXyc2+CnctmHDbdWXH9/1zW/uepzyFT68Ql5BHdwpxkR8XY3Cu2G4/hqd+R/lktzblXkXMTZjU7bEC/Xh/+Gc7NVOjM9KXcsNAHAmM8ZakqbxMXfMZQFUzeOYXJJddvSAMNWfjMGrMJ2GjsOZcNM14pXvF9B4xoAw4vC8/t5EwhQMLX/Tm9ouBh3OYNDpCPracTbuoaEltqTl8H56K4GX3IGA2+UPXHoXRR32dy341K8ruB9T7ngQqdVLTLn1gTs3lnFrLMqdyGLXijw6fV5lenEdZU428hTRK6BIxInB6Gsb0SNcu1Ov11nF2dOwq57m/+7SIRwDAjv9/wG8ol4mAAAAeNpjYGRgYGBkibK88kI8nt/mK4M88wugCMO5xQb3EPR/NqZI5gQgl4OBCSQKAGaCC+EAAHjaY2BkYGB+8S8GSCYwMPz/zxTJABRBAc8BgS0F6wAAeNpt088rw3Ecx/HPphwopRzIhURRarUoWSSFMD+abGvWd7vIbIfld5Tl4uwgRyXXld2Ev8GFAzcrRxfJH+D5mRd9+7TDo/e+333en/f78/5sgYLpDiaM8fnCJTLIohNDwUSgkVjFvr7z8Kj4iS0so4BFTGIAY1jFLGYwp/U290j5RewggkFsa62tU8IFRpFEHmmtse9TWMMw9jCCXcwjpByb26LaYUz5erb1j1X7WXvlENcZoqq1ovd2JuPqPa09c1r7F68Rw5L2sTNo1nNEZzthpu2qn/LN/lBznMaE1qyjjF7cYFN5ns78gHs936KCb9WO66wfeMG57rBH+nCquddj1G/JkXd0+O7BVVRMOsLqf0O59bTqDFFH1uGfv8tTjDsiyrGxH03q6c7OMFAxpiFjzH/sMsa84kwKKCNUm5HnY++5Tf+XdznQb8a6snVsLvEJb3bf3/umTrX2ecHEfgDZVaZZAAAAeNpjYGDQgsIihiWMVYz/mCYwyzE7MScw1zGvYn7BIsdixpLCUsJyh1WKNYv1ApsSWwfbO3YN9mUcPBweHH0cizgOcVzjtOM8xPmNK45rFtcVbgFuN+5l3Pd4xHgCeJp4VvCq8Zbx7uH9xxfDt4ZfgN+Bv0qAS5BB0E6wRHCR4DnBO0IcQhpCDkJJQueEdYTThI+IKInkicqJpomuEWMTMxPLE7siLieeIn5AQkYiTGKTJJtkiGSdVI7UMqlH0gLSNdLTpP/I2ABhg8wz2QVyXHIZcl3ycvJR8lcU7BSiFJoUZikaKQYoTlN8pGSk1KG0TJlD2UI5RXmC8gEVBhUZlQ2qbqr/1PLUVqg9UldSn6bBoFGmcU7TSrNO85AWl1aF1h5tBm0f7W06QjrTdJ7oGum26LHptejN0xfQD9Kfon/HwMOgzeCMoZ/hISMzo3XGYSYMJhtMo0wPmWmY9Zn9MG8y32R+z0LMIsfikmWA5RzLF1ZWVrusTawrrF/ZONhMs/lgW2C7xY7NrsLuin2K/Sn7Tw5GOKCDg59DjEOJQ4/DMYd/jmaOsxz/OMU5tTk9cXrizOasAYSrXARcZFxmuXIAALPIhyYAAAEAAADoAD0ABgAAAAAAAgABAAIAFgAAAQABgQAAAAB42t1ay24jxxWtkZ2HHdiIN0ZWRmMMyDMBxZmRx3Y83oQjUSPBFEmLlCcGsqH4ENvTZDPspmT9iL8gyCdkHWSVAFkE+YR8SW6de+vV3aQ4CgwjAUGyWI9b9577rGoqpd5T/1JvqHtvvqWUep/e3L6nfk2/uL2j3lW/lfYb6li1pf2meqa+l/ZP1FL9U9o/Vbv3nkv7Z+ov96bS/rl6uvNA2m+pX+38Xtq/UPs7ubTf+fDPO3+S9rvqeNfM+aX6YPeP0n5Pvb37V2n/Tb2/+w9p/1093v23aqhE5WpM/MzVAK1IXaqeStWK+ob4fUC/Rmh1qS+l75aKadaU5p9R/yXNTWj1Uj1RdfWYPj9TXxDlQ/VcNanlUzO0mNKeR4lXdLBm+/2jAgdfQ5aMxlOSKAo46hJd06NfXxCFlGgMMffKjtVpth6dEcVXRE/PmVBvQlQv1D61PsH7c1DZTrpQopg4jIh6RCNL+tZrZuD/FfWltFtEaIyodYH5PXVDK3LM0itPiF/N9VIt8MmaG4HyHFSnWHdOv2I71qMWz+Td59T7COsjyDgFdhEor2hU8xZjdv1O3HSppfUSkV7r9HksVDUeOc19Rrs/Utd41YEC71AHtRmN5bTTQnBdUHvp6X0fen2sara9f2fUHrwGTw+x4zVwnYr9ZUDuSqgdwZ40j22iMAMvHwUW8BHw0L6XgIKRKqugV4ck/9vW8456G+8+zWLuHUY9cJwToloCJ5/2Ni3vHGhoDlbYk3cxPPZImhZ9d2An84ByK6CgtVYVHZ5U8hfubngawg5j4Uejm1DPNWgzIk47CX2naF3RO0Z8uqDPcWA9A3DcUF+hnZP9RQVbzGhXjeQC9lEH9wl9a+QvabxD61tWgr0f5aV3dproUgRvQ64OffehiRPyYd3bo891eoiIkvblT7F2TGgtSefaKm7Exx9TZP5xpdTvLvlok3R2SrmqRS1jOZw7U9G98URjqbdbqI5DrM2HsAb2hhxWpP03Jv/lPJeLFWkbSMjqtD1xhtSfV2KXC8Qe3ol50fabiCUaz48xP6Jxw9UC2etb6h3C5moeFysa5aiRe7K5tUNwzXRZt2MancgKh8qAZprIpTFw/pMgCumMHovUQ+F8Bvk5JnFk8f2OOWTeryweA3CneRp7c1OriwlQ0Dgxmq9sFLxGLBjCS418mn8daW/E+zUiU9HUKIgBM8uJH1kXmJtTm+1/Cr/244GLpMW4yTZ0BB8bQIs68mSeFsoR0+eb8WGuVzKjJpa1onZse2aoYmJaHRfkYjlZL0tUQyubHwzKCdAZSBRNoUvzmzm98ax7DokjxMpEouqNnTkDnwlQzJAJ+wWLYxuIkdESkcPsOAclzhgxorCzdqNtXj/EbIPOhWSaxCKiObnAr5Ht24RFmB2dbH7cZ+6yUvYLLXgkWAyAklm1LNUcc7HirALblbWHi60QqcbZWUHVesZxCpvkCLT0kDWcML5L6HQMmyhndiOjX1OYOtBEj9DSfX417T8gdiyhNRP/JqKLskcspXpiDy3WGNXVgK6tGGsj2QBxMRHbTQP7S2ntyuPFxUgjfWatNq/APfUqnhjtag24eHFIWemIcm6b3n16d5B59cj9DZXXfUFjIvHHSGJ40rK7XDJBHcIolDXqe3FUWb8fi1fovR7Quodbo2/scCh7LgV3UwMbH8wkY+kYbmwkDmK4HzfG4o2uznYS1iQqxOLHYU3me0aoa5cHnW7ub3ViWKcLY1W+v2fwjWEhYvvS698TOec7rQwrtJLZKt/IwLrx+e/IihhcJKV67jY7MlUI1xemTmCr2nQu4BpggRljLyplQL46Et/FDn1ZT0u5cDtZN2efmdQ+hr8BMouLASksbiRelctIzcYCrdcLqY5ySGvW7qGGDqsNs8rVNamcQ3i2i7iTgpbKaBdr2s2WULMSDpHD5jL30kbkGXBxUY5nmwqzGBU3WYfBPQK/18jac+TRJVYZe/a12wB2U+y2jSYzSDu32W1sJRrbPs7fl1JXzmx/Dnufon4dClrXwM/4ZfksvRBeUk9zkdxXlW099LL1WNW9k0yTotEpZYgezm8dnNt24Sm6fVjKH11wNIO3ufMbR1Xmeiw6ZATmwl0tqMPNaYRr50s5nYd4h7Lru4xcsrSr8FwMK1rmeundTit7L2Bq4BupWZgm18Jjj0NXB4Z18s3GitA/pXA9m2ysslew1uKou3vIXlNajhbmPFe0k4lE4xTVKSPLFjaSk1aKzPvMWs0T5Oo2qhG/RrvdR+di42HEiSUCxLIn174r8ZGqOFSz0awcgXiH2+J2JhoMz3LhGYT50vqaeD6zD+nvvu/2uivyVz6X/DBnkNotp5AxTu/TwPtMTGIP9U+lfNdwtbbi4Ao6lprLnearqz9X62dC0T+5hfXcCLz6Nmqqolz22YPu2LI4Qn8npwW/8puiotMr9qRyH3l3eVPpMVnDz7UOg4UguoDs5gZnJkhyBqmiPkP+575cbjNi2OQIuxltmv2MBCabsn3yDZpfsa8/n6eCbLhPiDNX+rHU3VeYeV1Zca2k0nX+87FEj3QLb7mLr6yEf7Nmm2rbP38wQhmk/A5nuhi1de7l61xujxYbsmGY/4q48P07n+MXNtqyLm6rUsOzDNNg/w/r6bm9i1mIHOOKapwtcuZZiUFnbp9esHUs7L3DfE3NYbTtn0WfAllzPp8XEA/1u+05MQ0yjl/FVdPdZDd8g8c5ObyncPcm/t3iDHPGtv4bYd9M6pqlVPN8A5JDR2Mv1t5m8TWxOx3xFl621nHiFfi7lvh/GVh5uSZkev8dzn40Xo/0Msgq/j3F3TzI2c4nge1srnLKFRNzVlVN1bY+IzHlFTzM2MW6jMt+EcttyM2W9xl+deh2Ci1x3Y633Zv9/9+TbXPK6dtTTpss2JxnNj/vu0C1nNo7ljmevCSerq5oNJa7/cnaU3Sx+ilW1eXbWs74/l2ePp0dqBbxfkJSaFmY92M8S3NP2Xp4PtBXL2nmGcZO8I8H/byqQ3HmBPeCh9SjT749Gb8PC3yJk94xzTsHLaZxRp+a9jfy7CHCb/3rS6B5iLVN9Tt5JtYD1Q61I/DaxZO/pszTK7Qc55CprV5Q33PZr02rzJPCU/DCnPap3+0acnWCHQ1njMwBycCjDaJ9Anqa/xqQ0u225fNIOG0AI025j+eU58D6DL3n9N2lefzcsgGZmds2ZDiicZalCQ5YE8zRAZ6FfoMZL4ivPrjowgZ5Zg0SnuGfL3q93vVL9DJnHdHyGeoYQ6UuWDIfGv+v7c49yN/CUyJjIWU+Imi6hV3PoIWmYN+QZ5o+Ooy9s8Aa/tHRAL8vrA6K/BpqoQ6qbMDs8AJSNIFHC7N7uKE4AKWWXa9XnqG/79Fk62bNtzwMD+T2oqm+ol2bYjkNIBRKwX6g+XdSMM4N+Tyw0cPXcVt0eGA12oEtlVF5CY9rYlYD+uhZFI7gpafC+blnR0aP52KFHctZiK/xFjNvmwjBtMzeoQYP8ZS7JRz2LBq30+Xo9fr/83mEnHuJeqyO9TNqbf43mPuP1UvcPbn6lf/NdYSsyScO/R+vSP0GY58TX/v0ekZVxlP7H6KP/wMbwKaQAAAAeNptz0dM03EUwPHvg9JC2XuLe4///1/KcNJK6957iwJtFQGLVXEbcIPRmHjTuC5q3KJGox7UuFccUQ+e3fGgXrX4/3nzXT55L3mLCP7G7zYM/hcfQCIkkkgsRGHFRjQx2IkljngSSCSJZFJIJY10Msgki2xyyCWPfDpQQEc60ZkudKUb3elBT3rRmz70pR/9GYCGHt7toBAnRRRTQikDGcRghjCUYZThws1wyvHgZQQjGcVoxjCWcYxnAhOZxGSmMJVpTGcGM5nFbOYwl3nMZwELqRALR2lmC9fZH/5oK7vZxQGOc0yi2Mk7mtgnVrHRKtFs5xbvJYaDnOAnP/jFEU5xn7ucZhGL2UMlD6niHg94yiMe84SPVPOCZzznDD6+s5fXvOQVfj7zlR0sIcBSllFDLYeoYzn1BGkgxApWsopPrGYNjaxlPeu4wmE2soFNbOYL37jKWc5xjTe8FbvESpzES4IkSpIkS4qkSpqkS4Zkcp4LXOIyt7lIG3fYxknJ4gY3JVtyaJFcyZN8q6+msd6v20K1AU3Tyk1dmlLlbkPpUDqVpe0a4UalrjSUDmWh0qksUhYrS5T/5rlMdTVX1+3VAV8oWFVZ0eA3S4bX1Om1eELBuvbEo+7wus07whp/ANbdmiQAAAB42tvB+L91A2Mvg/cGjoCIjYyMfZEb3di0IxQ3CER6bxAJAjIaImU3sGnHRDBsYFZw3cCs7bKBRcF1E3MvkzaYwwri9EA5bEAOqxqUww7ksIlCOIwbOKCauYCiHL+YtDcyu5UBuZxALlc2nMut4LqLgaP+PwNchAeogHsmnMsL5PKIwbiRG0S0AX2JOUYAAAAAAVJ9gF4AAA==') format('woff');
-}@font-face {
-font-family: Source Code Pro;
-font-style: normal;
-font-weight: 400;
-font-stretch: normal;
-src: url('data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAGFQABQAAAAAxagAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABCQVNFAAABvAAAAD4AAABQiyWUMUZGVE0AAAH8AAAAHAAAABxn9nOlR0RFRgAAAhgAAAAiAAAAKAEXACRHUE9TAAACPAAAADgAAABIM+4scEdTVUIAAAJ0AAAA2wAAAYQFdPuZT1MvMgAAA1AAAABaAAAAYHNU0PpjbWFwAAADrAAAAYgAAAHin9BCKGN2dCAAAAU0AAAANAAAADQFxAcMZnBnbQAABWgAAAGxAAACZVO0L6dnYXNwAAAHHAAAAAgAAAAIAAAAEGdseWYAAAckAABJfwAAi6wUBijwaGVhZAAAUKQAAAA0AAAANv7JqXBoaGVhAABQ2AAAAB4AAAAkBjoCr2htdHgAAFD4AAABZQAAA54OAEwPbG9jYQAAUmAAAAHGAAAB0gc/5jptYXhwAABUKAAAACAAAAAgAgYB3W5hbWUAAFRIAAAKewAAJ6rLka2ecG9zdAAAXsQAAAHlAAAC0c0dvQRwcmVwAABgrAAAAJwAAADtxPYKy3dlYmYAAGFIAAAABgAAAAaAYVJ9eNpjYGRgYOAAYhYGPgamzJTU/KL83DwGJhc3nxAGvpzEkjwGFQY2BhBgZGACquRhYPwfxgDShVUUAKcdCXAAAAAAAAEAAAAAzD2izwAAAADNFZ/1AAAAAM6jMOB42mNgZGBg4ANiCQYFIMnEwAiEz4GYBcxjYGCEYAAasQE8AAB42mNgZGBg4GIwYHBjYHJx8wlh4MtJLMljkGJgAYoz/P/PAJJHZjMWZ1alMnCAxVIY4AAAfRoJt3jabZC/DgFBEIe/20MhIiLnIoqrRCmhOoVOVEovwCUqRPypdGq1yFUeQCkeQFQewcswt7uEkMnuzH6z85vZxQGyhAxRnW6vT348WE4JSAnn8cAV56B+zm4UTWZ4o/kgIlisZguqknllk93EKdLk8ESxRpOMZnXtFR3pashUe5eYEzccze5WIS+rYrW27Dhy1jdcrVHAf+cderaWj9qiJYYm54RjiZL5qrQl2rAXnZgDDS5iIVexlq7xP2rk7TL3fzVDlby3LHHhi5tuOcmvWbLSP+RRwn8ClQYe8wB42mNgZnJnnMDAysDC1MUUwcDA4A2hGeMYjBgVGBiYuFk5mVmYmZhYgBx2BgYJRgYocHRxcmVwYOD9zcT07j8bAwPzC8YlCQyMk0FyjM+YJgApBQZmAP7hDIgAAHjaY2BgYGaAYBkGRgYQuAPkMYL5LAwHgLQOgwKQxQNk8TLUMfxnDGasYDrGdEeBS0FEQUpBTkFJQU1BX8FKIV5hjaLSA4bfTP//g83hBepbwBgEVc2gIKAgoSADVW0JV80IVM34/+v/x/8P/S/47/P3/99XD44/OPRg/4N9D3Y/2PFgw4PlD5ofmN8/pPCU9SnUhUQDRjYGuBZGJiDBhK4A6HUWVjZ2Dk4ubh5ePn4BQSFhEVExcQlJKWkZWTl5BUUlZRVVNXUNTS1tHV09fQNDI2MTUzNzC0sraxtbO3sHRydnF1c3dw9PL28fXz//gMCg4JDQsPCIyKjomNi4+IREhrb2zu7JM+YtXrRk2dLlK1evWrN2/boNGzdv3bJtx/Y9u/fuYyhKSc28W7GwIPtJWRZDxyyGYgaG9HKw63JqGFbsakzOA7Fza+8lNbVOP3T46rVbt6/f2Mlw8AjD4wcPnz1nqLx5h6Glp7m3q3/CxL6p0ximzJk7m+HosUKgpiogBgB1dIlzAAAB5gKQAEMANgA7AD8ARwB/AFIATgBHAEwAQgBSAFYAhAA0AFQAMQA4ACwAIQAmACMCeXjaXVG7TltBEN0NDwOBxNggOdoUs5mQxnuhBQnE1Y1iZDuF5QhpN3KRi3EBH0CBRA3arxmgoaRImwYhF0h8Qj4hEjNriKI0Ozuzc86ZM0vKkap36WvPU+ckkMLdBs02/U5ItbMA96Tr642MtIMHWmxm9Mp1+/4LBpvRlDtqAOU9bykPGU07gVq0p/7R/AqG+/wf8zsYtDTT9NQ6CekhBOabcUuD7xnNussP+oLV4WIwMKSYpuIuP6ZS/rc052rLsLWR0byDMxH5yTRAU2ttBJr+1CHV83EUS5DLprE2mJiy/iQTwYXJdFVTtcz42sFdsrPoYIMqzYEH2MNWeQweDg8mFNK3JMosDRH2YqvECBGTHAo55dzJ/qRA+UgSxrxJSjvjhrUGxpHXwKA2T7P/PJtNbW8dwvhZHMF3vxlLOvjIhtoYEWI7YimACURCRlX5hhrPvSwG5FL7z0CUgOXxj3+dCLTu2EQ8l7V1DjFWCHp+29zyy4q7VrnOi0J3b6pqqNIpzftezr7HA54eC8NBY8Gbz/v+SoH6PCyuNGgOBEN6N3r/orXqiKu8Fz6yJ9O/sVoAAAAAAQAB//8AD3ja1b0JYFtXlTD87tO+62m1dsmyLdmyLVuyLMu7Y8d27DiLlyzOnrRZmqZN99LQhdKW0hZaIDC0lBQoTMva92S1gbCFZRgKzAwwTD5mY4D5YDDTlo8yzAxMo/zn3Pu02U6bYb6Z///bWMuT7HvOueee/ZzH8VyE40gL/wSn4DRcu0S4ZH9eo3S9nJLUqr/rzyt4eMlJCryswst5jdrzWn+e4PW0EBFiaSEaIbpf/Omf8k9cPBzhd3Acz/3jpX8ht/BnOB1n4a7l8lqOSxQUWs6kTOT1PJcgojUpchcklXUZf5aMKk6bkCzGZdGSlIzG5SWT0aJNFMwmLqRMiOZkwURfSQJJSGaLYJO0fC4nGU3wSqPI5ThJrxBsoinX0Znt6k65nA51fZM9rVFEFf/YMtgC/yJbeH2Pfl19S0t9NJHg795bfJbsADjvJfvJBf45TsUZuAaOiMakqLpQ4C2cH9blrZKBJApa+k4ykQTX0WlPW0g0lqWP915HvD2e/30d7+nx8s9d95OfXAc/HIf4b4cHDf8Q5+NCZBeX9wL+eafLk06nRS655HDX+RrcaYmolpd4wR9ocKdEZXJJYQ2G8LIKLqt1ehNcBpLrE0vDKo0ukdcajKlUiojhpOi9UPAw2niskgZhNHF2oK1Gi9/WKHUJUWuVXPCBk34N1sYPnHb4wMmwMtLfkCIkIXZ7zw2d+re/4ZwJ/bmhe/5dhS9Er3WJ92rsiSUFfVTjI6y2pPNo4YXLuqR3Gez415ZMTiN8wUofBfrowEf8jpt+B36rjv4W/E1f6e/4S38ngN9ZCpa+GcLrimErr0ASWAWklT8QDLWv+E8c9sJ2ZDPpbBR+0hr644zSn2gWfoYIfLR9m31hV13GfR/8bN1u37anrttzf1133cB99vu/kzvdexb+6z2d+w78lzvNEW7h0rt5jn+Ja+bOcGI8KTamJYViOR9XIPniMSCfKyl6kpJVsSzaU3mrB69bBR1wdEtSNF2Q/Lpl0W+VYkBWa0pqMi2LtpTYZJXUwLn1umUpAc9+4FuR5KSmmGDL6xSeXC4nqgUxlBPrbZLThfysiMNXmnOiSyhwxOSvb3DnRI9NdOZEqyA6gM+HiCud6s50tSszXd1ABafLrWkn0Xq10xFUAP9rnNFM00Js7+7eoeT43Hhyx1T/zvHW2GB7qn/dnj3rDmzuP3FDbqwjFmjzR6NDzYNbtfe9VbO+I+hrawq2ReIb0sPbte9+l47j1Jz30r/wg8DLes7MeeCUxLk09yEuXw88LbUql8XOpBSAJ21SssGTOykplMtE7MIDLhpSkgVoYLFKXkC82bS8pGr2wlF3wEVHUlLBU7NVSsJnIXgZS0kZeOmAE76k4I1axFolwLmWmr1Aj8acmBSW/IE4koOTOlsFW8Fg8oaM8FZy2+CdimuMxeEdnFNZDkRBEGTdGrvDhdRqAgLVfmIhDiQk/cS76c0zmwYGNynOhp8xtI4lEiAr/mLmzZs2DQ5sGni242wYLySi9QnyTxu3b984s3NncekLwW+TP+0ZGOjJ9fQUT23ctm3jzOIi2f7tti+8lOvvv7Enh/JAwbUADUf4J7kwcFYX91YuHwTqid601ADcpQWJKKVUQLQMih+pxbC8FGlRAZk44CYuKUXgqYWRyQBkMlglB7x0GpelbnhuiQBtFDnJwAE7WYNNyE4OIW9z+/GV0yZ6gVipBsH2AqcyePzxVkogEJTZJuCdNBLDzGtc7u5sWg1PmqYY0iaLdMnCa7vDPUgY6VpGelu3DPePujqj0cGD3YGNsdH+jHtkctPV209smezuzx5cPzUeTGUCofrYJ/q2JRbG1+2c6AtmuoK+QwszNz10oF0Yc2SnDy90j3ZtPzFCnF1DDYPxUHMGaES434IsPkRlcQAksbokiQPKhPyEkq4sgn+LYtdDxS787ncvbSE/4v8ONJgdflebFAkoF6CPjv6Gy5p1q61uzXd/0vb1r7cRvv25lo8VbR9r4ei6d8DvPlj9u/wFSV3+XXe3NZZ1WTV3wG/+5CcPfIy88rGW5y5+/zn2u/Pc9bySb4WTEYfftSRFxYWCkkrWJbuCNyeQwyUrbJISFZQhh+Bn3dm0G3jSrYlpYtl56zO6Dt0z1o9c23L77S3Xktvbs1/8YrZ9/GPBp54KfgzXWOCO8gpYw8DNcsANogYUh3pZVKXyHEHxw+lBORAOXxIFSiJQYvoLIp+SdMAsylRep8fPdKhD9Dp8qed0ZX2WSYPwAKEJ8mLhhXUvvLCOJAa/9jX4R/H7k0sJ8gj3Ac7KdXCgogp6LWdWwhICpZLJsJznTfAXQdnBX7TBX5T0SlkTAz8hH5VYTK35kzuURk19azv82z3/4exJPtYQbR7r33YqxGi5QBK8ghyD0+JGPBFJ/CGwrqSSgY04F8hnAMJB+P7fgo1xJ/dBsDEyFQvDCMqu6jUR9SiHCior2h7yE+o/rtpU+NvkWBL+TTYlk02NyST87UOX9pPf8t8AWDg3SZNDZHKq+NkPKQ6/9gQ7zxNwngWQiTpOAJl4M1tfMoFWAOXg1C4DgVBxENFL7RyDnp5aOzCC2woy0ipZ4KVKvyz54NluAHnHa40CyjGLG4WfSWOlMs6DJo7BjOdYkFQcPMN7vSVXJeHqm2xWEG7WpnobXoELE2/64ZvuuHDHzOwjs7OPaBu6Ghq6yMhTn/jEU2eee45Ei//6wANEf2/xp/0NDf2NgOtBsFWs/F3AXzNcnkM8COChS1G6g0TXJClLwX7rdMt5HU+ZyQDMxFNm4oGZ4FHJWErS8bD/GmR0YCwhmgGpIqSdB59/cO/QwDNj5ELGHLn4jTHc7/Wwrp7aSJu4vIXST0PpxyPh/EnRdQFJlFdR20VlgRVdKnzpssJaAWQ2E9qCBgHI4hGWOJXLx2S/LNQUmu4+4oxkBhVUfGnW77tp3w3BttmZ/k3N3y8O7T1yMD4xtmUD33zgyEJ04/qdU93qic65Aye2xnJjM4wnc7DPaoAxwh3m8mGEEXYVVZ1OTW1VB4JanxTVF6QACOmAVXSHLwiSEV4bk5Ib6GV0I8hGLYAcRZC1IAjg4AZQNusEyeOFZ4stL9jcuVyVXo9mZH2liTFsNM4goVor17LlyLrtvzh+eKJvYbJ198k9tz44tnj/wUc2dW8c6bp7aKS7PTvStWX79PE2pXlhaO4QtUdj8BCBPdaDjNvN5XWofUCUqNOSQYEyQuRhkx1JUXdBNKYkLbCrIpXX0v3VqoHwOmpY6lBuOGGTtTqgu8WKlgpqHTBmRF4QLahWMgT3G8VJLA2bHzUTTYwM7Th0aNMrrxClytCuFbPkj4o3rxPFdd9IDwrDRqRzD9BZD/DVcTdyeXcVnW2MzkYN0NlD6ewEK8orW61f+v0YNVaN7WbRcF4lWfS/M4vW8wCVtb2dLBmMFqtsKxLJqQaYTWaEGfcA7Cq9w0n5hdGcEdsecUY0SHEkdU/z1kPr9yxM9o+3Osmx4o+F/t4Ddzx84P7p7g1b752O+Ul64oveq79xC7P5ZwAHF/CKE7T8ES5vRyw8gEUoKZnUFBkqESJlieBKoVDwAz2tIAnq0TJESaBVmOxo+VgF8MAQ3JAHWcZqAAaRtGg7qnOiQhBVTAikU6CyQTlrZDmLujtI0jL7zLz/pmMb2jNTC9fycwd3XXvnjhNv26JbGO+dGV+3g8QKz42lU/c+Nnf1/p03P7Vv94FNgyPjlO/hkXdQflnP5TWMWySCm2AABQT60bKcV2uQJ9SgcsAlpH4HsocR0FBrAEgtQE44apowyQ2cEB0k2XHy56cWNdu0e6/jsxPpR1772vOvPUBl6hjQz07p18Aluau4vINSULUstiUlLZpHHZR0LvAPVS50GBvBYXRZpRa0iwxgd+PRE4CUnWgVNQq2Yb1Cy5vtDk8kaqLitA0o+TxYQUI0LhtB2UxZQ8knTDZ90LbmY2D/wDu3bDqOvf3A9dt2X3NgYPjUD+6Z3rFhfJMnnWux6k7EF+a3jA1kRp++ZljZv3PDrr0b58eUocmhqf0HF7rHBtLBRMhtVin6X+rq8/WOdw7nkF9GAV9jhV/wTEpm9CuSkgf4JVjDLy49RRUcYNEHnrnMLy4O5Z8R1YKwpDMr7BRLs47aGqJdEI05KYjco+aEXK7EL4xLwKoBLLMVW4+6D6N3bj/x4OM3Hp0Cnpk/rpg/sOv4pvWj22b0cxO9M+SLwCanC8+NdqXf+ujs1ftHxhf2HNiEuFBdzCtAH9q5XI02Fm3gvcu62EF9An1K1sOipfQKhUqNRhZW6uZaDU0egYdGeINrUxsF1rZyXtBlFSsF5EXBIa/sS4rChYKLLeuyiiZkFR54hk+utGLwPPIC0NUOjhk4YJKjjkYYLmvXKMqw1lg4hIFcY+jw95XhJtztXAd5mT8KdidnzzQ6VfD/7eSW4l+SNtI2eHHzt5Xf3kzlygJ3HuyiH9D4jLdkGVHljMYR6iJGPDhijcxAKs6Sz5wfHLwAZhKscxzW+TFbJ5tphP9VzuOkDda5pYMucnGQya8TsIf/wH8CrK8IxmxQ2xV8NGYjOmWlDJquDjQdRmwCdVp26gJWNPwkFYhlUHCSsY7SSTQIBV7v9IZRkgVski8ExLQJkpYqDacP5BycQ3etvnZHm0q6umLdnNh0zfzhxq5UULVB4+tMNeYyk71ZFtXhd25dmGgY6ugYaoiPpdoz/kR3b9ElB3koTp2XTvL1/CmQKG3cIxzAT11VU1KKg1hJJCV7lcfaTg+aF2xmr5Xa7I3wspFabWANFdQs4KK2ysEWpDx6ZHY4gwWFPlTfguabWgvohwFFUwBYKBQGrOOAtQaeE6Bz9FavruR+IdJCNAYakrFTlgkZJz2M7sq5zJhJ58fectWRlEbpnmzMTt1339T0/rfee/WWAf/m3Xc+8+tEY0/P4cXff/bF+64p/q/eYHyyb2qr1Txz6LkzTxba2rLfezIaH77LnKX0gE3le/jHgBcs3DSz9kRFOk/AAy2otRwxgfDGjWbhOY0FrD+rpAQsFZZlGn1TatBWJVodlTQEsTUCOml72g6oaOxpEJlRtSb893v/fsfgK0PzXw+FI8pImH/s4slvfpMYrjp8222HgZOPUHvkMc7EOcD+OyLbnSD9KCiST7FccDooOE41MwYBHDNYVc6UaKZiUNLDuzo8xkrgPLAGpTozBgY1yF8OeCnqqdGs0QLpfTZRiVAK6RSNjVAJGEunMl0JkmFPRwo/6et5/wM3XH9Ikg7NfvDxbfxjH0rPWJR19+89uO7eWwdvuBrP0jqQ2S3gxzu5tKzhzZrlvAJh1qJ2dDHlDsRyU2PPTIMSaqtQCkqUtHXVLq97+t7jk8nc9L6TJ/fNjnTM3nr3h8nkk5/dkul/9I43v2tDet9ZTpYDHN8INNOCz9Ejexw6oBiPqwu4aza6Oljpos5KjXEVAGJHQARUCSqZBCXsUaslyMKHTj/5gXdtnbzuhpPXT/KPPfvBM58ee/tdd95H7YCbYE0brGngpuQ90mnkPVJqlgsqxjIqRN1YXhxdTq7kJcCjQie7n7LPmRbAyJL/v4m8t/hlYin+mkzzj43/+cQrE3Tdt8G6dbCujhtm6669pn6NNSurGWpXE95G3lX8KjEVfwMr/Wi8+DewTgb20wn76SnbndX7WbDZ3QpYy1blyVmoJ4fiwQm+idVJA4A2WA09OSvYb3mtwp1jDhsz32zIjE5Ux2AswwdaG0ju3FrskImCy0SVy4fvPbYx2bNpz/XX7N/Q/Nbvbrz9rjNk8oNnKU/c+Vjsk+uLL218AeAHDcHr6P4MyadZw06zqEqDUKKUUlR2xwCU4qnVqQWhpkxJGjg7pU3BYD54bPC4eZ7Y5ueLr/CPFV8m9osnSab4beYP7YOH39H1Jkq+ogZ9xbxK3h5Rk1rbWxTVqSqHEdeW16VeYsQZBa9h39NPkyeefnqCV4yPX7w4AettBZ30Mv8u0O29XN5M/QIN/tXSeROoSwBo5dUGao1qS3EItPEljlT5VEIkExGofby1u2duYgRwO3z4pr6jB1LbpreSG8eLI1fd0S37w6OAo5HrkGmqLdOUgO5AQhopISUzroRGrqTQ59jpEtIkrbFHFRrnwXkFcez9i3/a86UbgZBnyYbfF68hC/d/F+kIFi8fgDVUXKtMR4V8rmjkC1ZQAE4KytEKla4U+qKb5HxglqwHgXp2gu3JVppreAz09l/L8OoYvBKvSQPEdfTvuQ007qBHF92wLHmYB/XVn730e+pB8eBBKc9LdtXvROH8uYH1L78FL6tEDVxXn5fMcN1y/tzX2l6qg+sGkbcuKXilPSHarUs2u2BPwJlRhh8KPxRVA7fn8nANnrizCqUa8zX2UtSeDOt5uKapuSg7aG50Fhw5SaenFoRMWJNVJqzdnc7akT+7slELiSZJFNTn1t17Isrw7t0TekVisW2xVWEAUi9fcw1xA9fesP7+Ry5efOTdPcVHkU5zQCcV0MnOzcp0Msj7qkvLtqlk19MDYmcHBFxh8NOox4taXjJbwAMzgM6TlPRkUwCV5gqA7SSDR0gRi4IrIcwt/NU6nug3sycA7OADpieayTyAduYB23vixY9Tud4BMigOMght54lSJKkkhWzI5Qw2PYgevRw5sjCoLHoaKddqqDa2YbAIg0TVwaGsHPmuV3c8/NOHH/nxI9t2vW8X/CPTH3jhhQ988Ny5D556z3tO3fHOd1JYDst6GeNa66olL+iXgpbJE22tqtGnUNuY0TbQlbQN7mCVwk0QD6EedoIcfvHVe0/eenz73OyO4/xjX7nqSPE1MrnuoRy11fbwzfwHqT+0g2PoB0GiWJOSQVNxhCzUEUJpC04o9YJ8LpC6CruO5VHyBmQZjExYAQpzTgwKBTVnstdVVDA128v6N9ZOspX0QOfbbzj59hO7Iyc8dZbGxrmT3n03Liy+b+fO6Y07yfSTL5z9wMMF+4J+1Dw/ITz/jlOnT5+647HHmH6+Ch6aqdxwcLtqJQfGiQoGEyWfAcnnLEsRU0o0Mn2C5HOhEjFijA8tRqUg6tCUNNCQmugQaqwYEDJRpCvV4ld952eb1j+z78wtJ85s3nyCf+yzU3ttxZ8SZ/Gfyc67h7qR/9Hf9ACfNXF7uXxjSeYICJ4L6RtLiuYLkgfo65HzVUDfODx7zCzEoxaeVxgFV6gRbfp6W97uCFNCuxToVRNwtOur4inoPycJ85NKSi7Ih4gcxhpNzR5fP2OJByN733nHnjdtbR3f0TdhS3hCu9dvvPvYOxZ6Z3s766J+i7m554bpQ1u7B7taXVGf0RT3bxndchzxaQF6t1NbFnSDusypnAaDVzSQD6oB3JK8ikYnVBioUNMAohoDFbpySDkKQqWFV/5wnp8CvfMCP8Xk6magF+pWK5eVdY9KltFUYAglMS0qqLRALUQ9IdQ8wHfokoEwcFDVk2aKZ/P8Q8PTW289fOS2fyfvLx7+3I4D5Ini0bfdeReuBx4L30b554dc3ijLJ+ArwEunT6fLuofADhErwo8iAU8eleTSyx+lkpyzisbzZviGqAJBvuXlP8arZjijIMdVIEBEw/lzX/3IyxeoHCdWMOZVmOWlj0p8PDdw+OVf0U/V1iWtWgfCHb5TEe6iAjgzl4dPKte453mVWqtQylL+LL4zGEvvmYCnqRt7kLjT3SDIFdHEjms0LWalvfXYwncPgHQ84zndOvAkOXjxJKO/HuixCXR/iPsJlw8h/d3BNKOI6EjnDQSVZZiRREdJ4mBWWSmpPfCNX41SkgRBiQXOgzn2O1EPyN/8ys1Mubnhet15yaL+nWgCWv3Lr/5PCW2NWg/k0NJHHT5iiKuKBNocnsxh+MhkqQtotLr2ioYz4EV3XSBYfVnWcQ4CZ9sVouIpBFJLZfOyuAwjzCA/RNJuF7wglEQK6kwpovq5DA+KUyWY1ev71mvqlfAutfnA7mmTQSHoJhf5dxWvCl3ntK3rrnv11eB9vmt95MmL1xN7dmguWnwZaAkCAPzgx0C2NsmSyZSmjoOoT6PXwtwVHvWZWqD6zK6ggHQDQApw7RAQC+n++tndux0RZcC2uOPs13cfMiSV7uBBMkcGnm3oG6h/tvjloiQ5Fjp7wPKClTg+BWtauBQ7P2zrcEErFTUmHfMpTei4KdVIFM4s+yn2tJsShOD6mMveccjQaVGauoz7tv3dPP/Y15xHAr7Dnq8WF3/5S1hrBNbyAa/ouHbZntLAWVXynGz+6pPUG5A0LFrN0nFqxDNDwCx0kohzhFxflMjzxcfILSneM566+AvZvvrppaPkX/mvg5wBOYB/skCUXJMSQ6IFFX1FhQ2Ws5hA2HClgg2agWM5RIHZtz8ljr/8y/crdndcVHawv12VZ7KnSfTQFJmc4r+BWSb87Ci5rbQuasOCkq2rSRa4yrrkgqSGdQkVcgTXVZTXpaa1EDn0/e8TR/Glo/xrHa99lK57PfGTZVqfw/kIuO5gTVnI9Y9PPj65rlPZuQ4+vbd4l3j//SJ8t//Szbz/0udZXk6RRAGLP1V5OTd4V/3kx8XwerTZP8cPkBP89+D7cfx+gcg5QyXNxPFWjMjRX5QI7gLHdjv6ucXFIf57p5kuBbufV5BXORec/tu4vBW5h4aDveDw4snHMEVBEXAY0MHB6A0TBG4dtXL9hFLBoqOlB1YTNSIimH1DDteCpSD6BXAZHGgyWG2iDUsuHACMgFqOfoFlyDEmKmdgMFRTE5TZ+tEv8APrZvaEj584cNWoRnHV7om9WwbaN2973x13zS5YsqO9PePH9xQvrNs0vT4Wm7zH2M9w2wO4+flv0nilHPmg4l6yA25qxK0OX9RRTUV0LHoJuAnM50BsBFrcI+lA/GO4UpAtHRe4nEY8Rmit4oU6QdIpZfPUWUkQxKKarJxmqtfsmeU37jxw7C27ZqYUGuvw2Mjc28c38N/86t6p+2+8/dF13Tfmju1Y2gD7ugXg9sGeOLiuUuwD4FQgwFrZpiEs9uEqxT7AKlCVgh/dawU/tjx509ENzcPr548dmZ+Zapg/ccubX3poItNzdH7uyEBmI6VXP/iA/0Hp5eOu5/J6pBdVx47S8h58QUtxFBqkFwsXCZYSoURVqhQV0QP1QBhgvMiFQV4F5lb1GCjnJI8D8yxGzLOU8is0TOeOoY9as/uIRf9bF6c2KGbHNIqp+QM3LmwcnRwZGB3e8eqN7xxa/PzFnuGND7xp+6ENr+aOAg7r0fYC2tlhz49zeQHBN5bAh+0uOHQCRhocmOZg2w2bKzqobY2WPhYk4FY7dWjxGwW0ZtHY1aJPArAbARnRgilF3HcHiHEuVwkzOjQRTAnJUcUINXTXnz505FZF8T7FkS0bJwM7Dp187zzp2jg2sBcQePPRgG1md1t37qEnJzfPwt5jvG4d/wPY+0W293kDzw4h2AYg1M1p3A3RmqJsYKfVBzZq3YIriBtjs4L1ZbfhSztaX5RFDJgr1tHiJy1NEmUr1mKApKlhduThgwcnx+zpwVPf+c5W8vSgqnn3Mf+g++7W0eIe8jTmjSYvhfluoG0T8OUQd57LdyJ1AwCaCak7qFrOW/AFphIbklKLarng7uk0AbXdKDiGabUEcEgGfD8OA4oxA3W0fPCUsUp9WJFkhL2wSm3wEmtxrClpBF5mwM0BHxt8wj6fYDtrcZuCDS0dadwZMNVRpnS2AEdFYhxyVEDI84o0vnKDl+aD5x7YPg2t/rLZlvSOTB89J26WkyolptxABvnUwrnpI+Ucn5ykAtu/Hot05Hf16sktqd7+67c0h168t+341ubmpqtP7Ft83+3Hb5mY27j1cKZ3X7t/sGEk2TE8sndk52C70pfpiinbts4cMA4lsxt32erCPZmBiUMTk7Fkfzzi1daTw+nh4XRqeBj4YA/wgQHOoq1UK4CxBiqzMG6mNldklp0ysY0FnGxy4AEUPtpoehvVvpxk5iqOIpVPTvTvaTZT2DOr3LXn2dlMX/NoO4ijm/Z9vfh9Eh1f15wsfprKhUVQZGf4FzkV+KpbQTNTDwBB4RQ0Z6zTMj9VyYIpSlrDp8Tgk8K6ZFUYzcC/1mVRnZSMVuq4giKBDdXBgWKOAcASq+TLmhZJ12x9Y8Df1OQPNJKnR4te8vTPA9FowB+NIjzZSzEKjwXk1AEur5MFo2imiTwsbLBrWSx7VchKNABEBhdAZLVSXeWyspi2QS0nokA/mamyFLUCGDDAJkyCUwWP4FVl9pqyvp7s+u6fkq491088VYL4swO+kVHy/GjRfPC44mAZbsJdA8APwp4aubaK16qi1vXqYJdqrWBXTOO8ZlZJ1Hu/+ne7l27iv1kMEu4rxb/9zfX3cSyGB37nNzkz18+kt6RS0LI2glrDQssmcYNMdINMKB2sdCk9zSKLnADOL61UQmeKybCMsPXf98W7nFvSm7by949e/Kur3YOBndvIT9FeAXxaQR4EuROyLWhxgd+ArEFZFdwqyavB+k0ihiiCQfAZeFAMQSvawZLLREMMVhpgWZbC8BzkKaPShCvCZBWwmEvyYsmdQqnNyfQAexlO7CBh9oKA6pU9AT/3D2sUzWNTtrpMUzq7OdPeuC7raXCQnw9vnG9p2TRZ/ChZ2DZd/BA8NsSKHyqdNcDDxm2piuuVsMADV3XKKPwrjpmNAY3qrXTYgMWrQa0+bmMa5WLpvJGfz604bkwP836ApyZOVdJhNET+n49TZdeIU/U//K2HH/nmIwsL9N+rtz700K03P/TQzXNHjszNHz1asqHSFBYr58GzVjafKuRxUx4rhe2twMJCihLJyhQq2k40ZC8TyVm2nYzMdnILeaVOQXfWLZNLlsNup+AqGU+g/Wd2HTj6lt0z6/nh++bBdPozfmlw6v6bbnt0aPdHyVDu6E4wnmT6pcl/UJh93NVcxYTRIMwlOwaMkxX2C+yo6CrbLxoTFmRR2aAv2y8aNFaY/SJxxtKFkvWSzqIbkF1tvWyeUGjWzSo3bam1XtZ1X5xZ2jFVtl7wDL8bEED7xcyNlaKCZUrT4JyllKFDGtOjY2aEZRVCcEhoeI4wTV8+KqjpNcK7gYpzD/TE7R0tt28hP7/pbseE8HDxH2HdSeA5M6wbwl0O0piVejlvxmXtamb1G2hJEJa1Y8zKp6Puv+Q0VGJWOrPdE0St7LNJVoHuMSsAMghYMCaaBdFaFbZqilUFrcBUdcsRq8n4zpNDoxPbP3f8wLHF+IbZ26c3HN5909VvGe5el4gEWp3tuwdmBjPpcX/c5h3pHpyjNW4Afz1/Hfjd+6qsPmoyqdKSU8HyJa6k6GAFm3Imy1Eu2HTQlIkDtRbsvgJ2XyE76yWLz4kWH4pH8JRpIWclszhA1j9iGPvVr7Jjfb22LRuu3ob204MPjv7T2IirP3Bs/8/p3s6Aff078nOQM9u4vAn3lgKq1rDjRB12e3WwCyNPtMLNKplMNJuO0kanYP6TCQvBwLdTywFzOQxGi02Ekh09M9fV37y+eXZUo5w7+PHPkvbi34+va+kgW4vehQMAUxpznQCTgQtweQOCowS6YZAMlBMmmMrtGHZXKZ6UnjvpDivT/MnNL+4mPy++1LP9YSW4vV7EEYQVD5zFhcnjcizJGU6nMWElqcypFP3LErFhkC1SHVHCeJ6dFdtgROkre1/961KQLcyCbPz5c4PSb8IsoKRqN4va8yopZP+dWfSeP/eVL/26jX3ihE888InZAZ/o4HeO/vovaLBJZV3SqLT2xLmvfOLXb6FXdNYlPbBsYslAH4300YSP2B/h8jjhrZs+1uHjucHTr56mvxiyLvlCXrjup48B+hjExzwsUZWdgW9hEMufE4Ngl+bysFxVbMuQA29INOXysAi+rwPHMscNC7xGq9O7PN6gwWiiTRkrWzLaybCLV+G3zE78Xih82W9WImI2QrM+lb3ECFiQL21qrJ3EombeQqLa+T6LTmkz9I33q/RGhVLp6Nt0zaFehU2tVOj0qp6DsOf/NN2/2Pbaa462rMVxE/EUvf8q7PebMynPb2GDh4EH3MADtTEw8joxsGysHAPTuEsxsOHPfXLXjD+gbBI2bP/0ucWFeJ0ypd/y2i+PJ2I537Ff//ZkT3jSehLW67yU5GOwnotLcIx19Wk0Bu2oKt1JqQ6Xs6NVZ0UjR14UI4El7EtVWkOkc+42rcOjUbZprtl0YejRBr/gdu5qsQDKv7En+6ynbMR08dWP60c0RxvomZ7A+j1YuyoeBudHSVhh5RXFwybITPGH5EwxT3a0kttGW4tvH2Uxq9vleFgzerJGjEvpWFyqPlkIlSJjEkHfqiUpNl4Q1SnJD76UJYWdMXGQGPEkFp344yja/BEQbfoUNsZwEhcC4nsaqaKgnTCiETbDRoVIBkUzCOY+4mQhBFrJQWUzvKFX8eNM1+3v0m0/ONA1lVLH0+m4OjXVNXBwu+61LjITujs63dsRS/vfFE6ldEpdKhW9OZiOdfRON56KzABuRHNJTbbyr9BYlxyxkhTgeuMPi3WpQIYRzdTvFb94ra4UwztKfkzpAVrdifRwMSo0l+J0oKakkEwP5QXRnJIagR7elFQPxAik8sp66po0Y3eWTIkwsqEGKRESJIOeNnJIZi+1RpiWohVD7YSi3ETLWFyUFG6nTJwEOZSeSqtj6XRMDS8GDmzXvQtIc2DgaCwdvDkqUyD8Jj+lQPTu0AwBGkVONU73Urw2cpd4I3kvWHsdHKb07WlJrabeCa/GnD/ae7RwDwwn6ppIvJWW3bCKLlqDSvUQLSzUbEzurB/Oub0xa6b8irjubGlp7Kx7Mz6yvsFJcgu1MS2oMdEqKmhpDdrKlkELbRnEIiDgZYtueclk0WtpWxtWaRlrWgaN+lLLoKXcMlidI7XDYbO7S62C2CnIk4/VY/9PS8vFb+wlO4rP7mU23A2X/oH8nn8HnOkAdwuHBq/AnAljKu/wUlWNPXaGpOhLY3QEy6hlN0+JXnGwOkpJXU5vKlWwsV48lSGVkkJIUK9Drq8WDUKe05lpZtPGgiTldq+mmID0xU4vmsF0C2Zyww070ht64y2d2VTDyMb0ruu2Dvf0DJPuq+40XnNE2d0VUxSfVSa6cuojR/V3Hh3dYSKbTTvQBgDksPa2nnsbl/fTultAqp5uOq9E2xl1rgZFR5R61OAY5ZWWkke9FLYoYTdchuW8K0xL9O1YhePygS/XAFiGlVg1VufB/KDkwqJ9wYF2mMcPDBPIifWCGM5JRrAYwebWs4xIJlubO5QDIRos5clgR1Js5lD4xv3XjnVkJoYngl/8tHqaTBf7Boa0JNClXIzOXzWdzAxnYvM9vsCeAeVEyrev1xuAPezl5vggPwJWeJQ7zIl1cDZVy4CWpMfgWwP28EgBIy1sREtSgKPfSDCgBGATFexERFjSGl1eNB1xm+y0RrsOEztYzB8VlojKQiu49cB1RlaBghGdWNaN+GTdGsTDrcE+q5jGho4P+D298w3RudbtHUODndtb5xsa5lt3JPH1lrGrxsauumehc3Ssc1vbYmPjYtu2zrGR9ELbzqamnaTz1unpW6fxvGZgD6P8XZwfa5kwWI52pZAuuJkMAvELvpApXfCx94YUdgBgJjNAzc+6lGQHvjSn8nZqftoFXYKyNY3fOVzwDiRWEA0iRyVf46vN19B0ERqhrAUgmknTn4Xd+jazMiPsnj33kbNnz84+//zzH+bv+qR90Xs09Mni+eRIx5kzHSNJesaqZLCGdoJpcUewYIiHTVHTJzm/0QjmpIdQeTw1daHYwQfIt4tIBm7XpfPkIv8pkMk92G0XQY72q2lThgb9hhw9h9hop2wptR63WKUU9RyWlzzOFFxsMNKAoQfW60UnFqNDPNaxNgjDeqPG5o/E2pPdWdabKendNA4bEWwvKPWeYChJP9BgCh9P7QpuxiZNTXUhdqarXZF1gOpH1m7nY+pdu0KbJ7dPxftz8Xjv3HzvYmBx4vqxVG4yluydm+udaO3e4a6PtGZ2uMfI9tmO+mR2Opdpb/AF2iLNU2m80D8z0dYVD4TaI/ENPaEOb6PZEguHUt4mE41XvY/fSL7Kn6P+fB+HZLalsWi7AZjDlJJfUaeeXCioWUu0mjUPW1lLNKvatnWV+iW6y6/eF6xzh0Luuo/ATxBe88c7QuH2MPwLdYRgZ4OXfsv3ghzFOtRG7j2sx6BgUHJuWASOYhBkTh0rz7UkCwp6nYhNFBQdK7/VsQiND1Soj1Y7FlRMjMbwKmiiJY3ewuMemISzaoXBbHdGojT+EIxi5pWLoFStE17QGk06q4sWKttB/hAnlT/dVtAOVnU9LzdXKdas3Qw+/svHH//l8VPfOnXqW5kDY31t9fWRtlx3a7w52DUwvvvTpLVQKP7gs+R7xd9/+MNEfab4D/PHkrHQdN+6mfqW5HGqU57hXiPn+E1glwa4uzha/g9o+0toiyqQTGg8MN0hB6d8LMNlhndma8HCSGJJovpgXQGs7lXIq/T2HG0xAt8MBK4dPrKaaf4LNbZKwUpL9EJZuZR7jgKkNuehfubwCX6srdczMTo42KXie7OtfUMRb3PHabKzK2eYqk+0TAx/rbEt3e6ui89aKW6zXBf5d/J1Ts2ZsPqcdj3KT7OPx+6+Ozbz/vjdd8d/sOVD0Y/9cf2H2FOp55Ec41Roe7CK91K3I9WjahbWNVWHdUvtoRi4zSyQz2AnY/HS1/6A3kIld5IMkV/wLwJ/ClwQOPRFLh9AWyREtyQfCOGiARuViZiPlTm3MVlwsFfWy3Mt+JSFIHsXSmHMEZzLgotdcK3iZBu2WmnAdhGDApY019skv5U2JhSAqT00gGFiPb4BrD5V6Wi2AaxGE/YvNIIKctGGYElJiyFLTYJ8ueRJkWH1RODhRJ1yNfTJE2dOnDgzvnDP/MLQsG7jZqfQ3h5t9ra2+MlnPnX99Z+6nhgeWdw5Mb6r+Nq3R2wh9dz4+OH6CLOHJX4neYZ/N9C6mZNLclTL5ReU5BzgqLByOjkRTIO7Tulf+Z25HLOzniOfJp/gPw2yycltRtlUMDGtZad0pblvWmtd0DPC6ak0KBHOTXuq0ObQaBX0zNsvUxtX6pNSP7fh6NTU0Q2plgj2D0Ra+Nbeiclcz8RETxRQb2xvL9dgYy+uAuTWgVIFLO3GwKiyitrFeSUtMlKadYmq8Q1y0QMqMAyaaFN5E82WmBTU/8mbsQNl2CzXxgpybSx4YtUNutjaQZt0BwdJx+CXvjQoSYzmnyafJX/M/xaoNStnHowgQzAVl0T7jRLLKhcoWClI2MBppYBajboE8311Rta7gb2myGN2OTsv92cQHK6QkZvBNZ/uGu0eaGpqe/CVHRvCgViY/+xAd6enrzGeaRidDPnCLQjXp8inyEcBLj93hBN9tNECj4uWHRLQxgICF6Bt73WYmsX8mwOg1FMbRI9l3EHaKguQuWAfNax9sg55XCvAJfQQzQ7aAUUbEO2oTWn/JA3Qlronmar9VLghO7h/azZWH2zZkOzrmRjLTJOfxhLJdFM6Ud/U1hbLOoT+RIrS9J/5AfIUrWMIo8y4fB0DLprW/PPi4i38wOnTckxtPd8O/jd6CXkP2mJgSGPaA8wrD6W6h9OxICo1wZhsD2D41JdKoemppX4LDbKBWY3hCRTt2gDQwYOnX3Qj6qITaKLywEUf+sx5o8tdiljTyrOskAZ1Va50RHEec7hn5k4kphrnVD6dzmgPNDWoFIMHZ8Pqz/MfLv79g+0jpP9vxAZ+UNvVdyLzwH7K95OXRPIz2ntgxFOtKBXymErd1VpUVOXQIM0V0ZPWRwRYmAA4k3dfmwiffIBs3Eo+f/Lq4uy1xYP8jy+GGf/+LdGQO4mIE2g4ZBDWO1Zu4qZlLiuauHUl44OKM9YmRrqnOjqmkuxv/uhSgtwKu2fkYui/oi9O5bGJVaebKJS0X1lSa6hHiH1+MdhKGlr40Y6heLe3b3bwU8aGesumjCPd3KbGv/tdOGsH+GWAdYCjJU1YD4RaoboHX64+BE6uLTkEGUFbIqnM66aR+e92JVJD/JkWraf4Fz+Hv/dOsAe+BfYA6p5xpIZkUFK3m9a52GiVhRZFiNzjYWLJS5MWcyxqDU/lHXYiLBGliqM55RKVYuUkyzt337d7933e1HwK/pEdT+ze/cTuj2eGhzNdIyMAw36ui1eX9PYQAc/FqZGf9oO+fv/7vwS6+/HHt/3xx6KgtOvZE2hrcB35IfBBFJwBfGQvnJwvcXkn8r+Rmpc+WTum8j4jksVnQXlH66jctLKJxl/1dHtKwwqULPYNxqboTxUczMG3gGNCey8coITzTiotnCjIsCAYK8gloqFNGAXe7PZSLemw5euCIVYt4aSbAPaRxJmw0Nb2PE90bm9QnjgCJ0xjE+uo5+bWKOSNApe0JIkVYMIo0plsVOM/G3lG0dOUHnrf6YlUKnfymc6z9oMqZdvMF4Lf5u0tujrY1KIr9OIXExs2kN3fbvtC8eWe2REOmBFp1S/Tqp5r4j7CJIXkgt0OJyWzcnkFZWKXoQwmgwS4KgTwqlAHBAkI1EDxAEHiNQQJCM/zRrMr2sS8V7EBqBF24WwQ3iiQAHXQlR7kJB37DlCjkVKjYSU1yqNDqrUCfqNMkvenR7sHLe3uxgd/xXSEDqhTQ5g/A51hb+x01ZeUxjeAQsBHWDu4wD8ENApzCa4TfNufcPkW5CNgj1i60CrbW6l8awQxbW0AUlxWv3Sv0i9geVWpGLGONhGLbalCM2OvhlS+uQU/bo4BNVua8WVLBKiZrSgjLPII5qQW8PyXoq2pDFKrWZCSHchhreAHSoF6ZoODM4i92xqWdapjXy1pr7zZ0cUiHq+nuTRZajiX+C9GeQ/Oo6Yp1JQZ3Lc12xwJJlCljY91TTecDT/znfcCO/YeOKBStrY+23GW3BZrTXY1pRKRprZ2MHysA4nUv8BONDPOTABP/gJJD2f/1KV+8hJ5lfaB3srlfWj3hst9oFa5D5Sj9ZuiyYpx7ELAirpxSUO7QtUGWlWhMbCO0Do6w0JBi/MlL3ZEamwgxJ2+EO0NFWineBgdNk5ts8s1MIOKWNplVlS5WhWz7VRjutwN2pvZkOvYeO381be1DCYSgy3xmnbQTK5t6wLvkEN5VJNzfI8iBbLVAF7vzMoOSGOlA9KxVgekU+6ABGmh1RtZTzkx0gh+dQ+kO6pY0QfZtXfH+q01vZCK1MniBtYOWQOXZS24tP8JuHRW2+v3ZqKxsrI/U9ix94aaHk0yd/LkCrjcq+GyVuCqWwsuTxVcBloHCHBZacKnCq5sGl0PzUqaJfdv2T86qhwN1tCN/+rJk2NjZdKVYUwDjB7g2MdWwugtwYg5F6pJU0tmgxuHUOHUqlSJm2XQwe7C2WroU4Br56FuhehLFQR2Taggh7zt0bJxDFZhiTcQhyxUMRlPcGJVsBpNWhYC3JymDb+Y916BcJOqLeqfEsLa9tKLWsz/tKO/qys50NVVHGPYK2Xc2+jsIh/YOQ+uxN5Rxl7AaWYFg4ZzUseTYBamFm2zhWvGcXu0frZQz97VVxBuxqw+IJwnalo46xekOvQx6215XuWkipVgEW1dNdZVZUllBqy6VsK9w+dy+v1Ol69BxvkYvsGLMvKvsXf+YgPjz3fI79HWK9HhOOVTpMMHLnuCcCpAqOyt22WbsIYW6Ej62Xb7V3rn1bSwatB01IJkr/dTHjcZPXaqQF3obOpylVMoNWJmy8V62VacR0V15VaVR7ryjHq6muOZTLy5q83ndPj8dqev9sR+NNbZGYt3dMTr/P46N1KGv3QJHjbTGnwXTrChXSVcuqaJV7SlCmarEcljVmB7rbHcXutOisYLWDejM7K6BGqz6fhShy3r7GSJTKWKdrl2dEZJRI7/pp2RDKIp4BAYQpRk9Ivvec83iq+c2XDoPoU5Z+QfG/+ziV9NfPnLhCcbmx4N0/7qBO2vjnDbuXIbLm6ZV96o+uouXD8r1qInkY5OwaQznkGXUNCaFXYHFThaOIlLKk7tulwPtoVQgz9Grf92sqIfe9Nxe//skHbncP3Jh2r6sneqm6hP0GxsiFhHLEuoO2m/NMhLA1D8DTumrVfQMS2s6pgmIC2ruqaLL4BqkVunQaf8z8CgABVSBcPvqfagIKB4roGh3G15eRgcVwADLdni6FlaSQ9ZfVTTRNq/ef86UB1VQI2Noa5gcLUBXGjdvOn1IcP4SShdsDCR6S1ristBatRx2kTBxuSmTjaM6DvKoTSSZ3HmViFQff7LRk4NOiVZ+Gl/ix/+ldAqyURnlSzkWY+2vP9bX6dL23pFXdpCyUc2sbrY6n5tZEW5Z7soAhuWGrcZH/4PwgHsKMNxiQNeLMFBmXEFTezc/OvA4rgiWJwyLEvYuYQyZhU4lCNLpPmkbMhUg4XsCPzI4GL8GOUevSxkyIqRMiv6UjRP+caQLtl0PCbFGUsakzJzLtXRy0HGm5jc5I0yb0pB5FJfZDWNa7m0/LqE5KdKnPipEjuW0V3FpjxnhU1J0F5HD3eNXBWMtaS0Y8sJaog36pUmcMzSBZ4Ffl0pWstpoHVyJjoJJG+imXUTOrwGGj41INomNh9Ewwo8OYabRpCTyvL8iwQR3KX6eVRW1ukPv+fJJx/76Bybg/Hoo2SkRUXCH3/yg58hIxdxHsbfJQFu2kMOtqada+QeXtVFjpkrN+ZuUkted1SLeW/s4aApgHJz+ZLDjmKikZkUNZ3mSwGDVluxPZKFQCUPoMWkjiVMXfgraz9XrDI4axvSySpzc60W9YrVifxKe9XhHGHO0M1tWLNbvW6tKmCPXAX8PFYBO1xX0q+OflRtz3oUZMyqvnVy4iSbyfg/CRtWhNXCdhPInVWwXTy5Bmy+y8DmXwu2QA1s7iuEjYqfWviCshBaC0amGxmMaQpjI/fIGjC+AX/LoDtImbsbmSvB2Bij2iW0kKMbHXJVDjgSzwNKRndpWBSb6f1G7LGKvWsRdq5i79Wsw1d4Wynj30bxD3EJ7p61KBBIis3pgpvJ4Sig3roSdS8Ttl4rNg4Umti7pgrq2ESE9T1LvNZGJxc3hTHcphFMV3QoLiOGa3EPrRLGq3HPrjYeCPgId5FXeSfoIxb1lcfUHn7iidbSv08+dabtqafazjzV9qEPUd5uu/RTvpX/DOXsKHcD69bEyQ15Nc8KieSqGpFLSQ4L7aTCwhqThRXWOGhhjZ0W1jyvtdrUbj9Lako6A/JB0Ipl7TY65PN5YjApXFHa/AbMoy8X11QKa2hRjd3httNhz8ydirUN9T98w+6h7uRQ3yMnF4czzb7fta6b3tXbOjy9y8Pv2fPoB14Y2Bzes/MdHzw3sJkc2zdMTmbfWXwu+55TO7FslM0CgPNr5Rxc31rTAJxrTQNwydMA8mYBk/BrTQRAIVeZCrAIAm7FZAD+/Mn/1vXBdKqs/wkQYivX31KyoSow1K0Ng2ctGLwVGByXh4EKrAocC7KwWgMWJqsYLG0Ai5+Ll7spqqBBW6EpXXCwgxqGg9pcDZ1gSBTc7Gi6aQC9EGXvohXIcaxkFFWsynwZuC9zFit4bFt1Dldi9NBq24j2zQOdMRKYWdk57yh3zjvlzvklpVpgcx8v2zyP7lptA72OemzVTfTkh6V9vlqeAWMAXpuumgFT0LPwqB47r1lcSVGZZYIU442pVGk6llon9wE7jKXSYrAi5XEwWGbAbK+r52+tHghz3VeuPvy+vxkZH8uxHN4O2Ocu/gcgjd8iQ8KGgqqX8zGedQWURHACdjbBJIs8bhkrDzV6GtKhXdJ6JnwjCRa+Nwh5pTtGA/MNwJ8OT5AFtXB2h+Th2JdiQl4juOX+rtK0dCIP2S/VbnW1K7pKM9Kdwo5r92zc0dbW3N/XvLhhZjTSk4knW/r6Wtra2uM9g7xmz8ltg4mJfr83HogOtQ4vtPXG2ofbg+GejWProk0dMxuKKipXaQ88/z3aAx9FX/UKuuAb3rALvnFFF3xBbXCE6f0F/tA+eBRhr9ML37Rz19Bl+uF53+n/P+EJp+h18Ny+a+fNl8GTvI2WBazANca9+Ypwjb8hrs0rcH2e4cqQlWzR3B+ILpXKr4Oy48DEgSEQ06+D9qFDVXiLFO9O7uwV4I2nOpyWmuBVMilF4SkOQjxVTQu0rzqZadlZTZmlZosf3Kg4+yiexKQeLY8rEywNBIt3glWtdnijBrwhgtTM0V50TgpYscJEsMlTAHhmaVwZyVaZpK9DPIOqNeYdM4d0SVVrk3fMEtJdjozvSPV1d3f2Z7Ms1s1oeY7Sshmo+fUroSYwUUe6EGXVna0rKRkxUEvVzyzVKkomKSUT7KNEspBkr2op2eQG1nNg7XNCkNRgs0l+bPnTtXbS8RpC3tbWQbMD/wXS1hSZ0lqG1yEtL1edfiTYEQx2XI6sL9BiVPavQtf/RenawnVj5cKV0LXQzrIJXclCVA5SZ1dyaYIxIKinzpXO0erT3AMkTYRpkkzshLPsrY8a4vTWAG/IolJXO2xFY/iKmLVyH5TqrMPrkLUvM9vV1dzS1eZ3Ovx+h9N/Ocr+SXM63dySTrd4QiFPXSjEZJ8A9F0gr3L1XDvXxRXYhGHRD2ccc3MpWraGgyRAp4upVCHpCOuAyEnlcoFvpS9pIVuG0jZqXEZTLUHolB2HAYRECv2KDtTzBnZfFGq7qenkXWFJqQs3yUUgxmAzEq5DyJvZLVKAmHacw4+DY5swRe8JRpvxy0kBJKakpBVCRkbTSnmse9Vkjcp9U7qzTUliJtk0tn4L/84vZAZCW6bbBs3pxYmNymJRMZhrSwcG1x1Mz033TWyM13uHPGaeLG799VcXkr1veUfTqeaerkzbwbv32es37Qp1J3bt2ri+qbkp0jLosfYe/MAsR+exJOg8FpYrKU0b+ENyJQqzds1cSfYNcyUr5rdM7bf10VxJ5Ni9r95aGeQyqo1VUiXDOjbvnc5EAV2IM1For/7rT0UJXWYqSlieioKz6ep8gf/yXBQ0Zy47GwWMmeFV81HIjaf/P4wPhqouiw8aLavw+dHpVfjUvzE+0cvg01CDT/D/Bj7ULrksTmiVDK9Tjq6FFzVHQNYz3M5R3Bq4VqwaeD3sELlEuhBk6jMG6rNtBbYY5oow5Rgp477UonZqK5o1WWhhfRPtqDQjcNKAIqw8WScPHXAIb0yA1arwsqRQBKsV4WrGNdWoQHmmygdhz1WcDjRg7UwVOm551TAV7Adhg1M0uqrBKQrYJByYMre4OCTPSiHtp8tr/Pn/jTWwVBPXiCzuvFle44nTlTV+TNcw4azsFWuY11rDIq+B99nL1a5C+Q1Xumo/M3grq8n2La73KvCTitbJHFg5jQYWdKULOsY+thSNQ2suYF4GGcMolxXUwLMkKJTAO07GMRiidmKcDG8TUwataRUnIJC31my6DOqL1TvNZnnU8X8D3B/jDnL5OhqxA0AbkzhgQRSSJbfDp6ftNRF5siJ6GhEfHma13kpHqmKxOFoinNQYRKvEqUaPWsBSN63OZLVXTbt3N+ENr5rAZ66E6sq2R4wOpbjnquS837P/fe772qeatg+8zX3bu99y4uAjM/vGZraQ4d2bFn509ZsTjXfPzTSPRRq6mtvXNw888LdvOv2WYxv2XLsYNC/sxNkgdEaRyNngZL/zMpNTUPra07TRpj5JKy4xp9a4cpqKHeziBmatNZRnqyz5ddhp6mPXfUk5XyM1VUauSL4GON1qlzlET7e6dBuUNeaurPYZaiexqME5WG8KGtpLXsKK2Sz8aMU7ULAZLcD3K3IgNVNa/pAcSPYy+ZnaWS1xOOwr57WQh0//D8OFCq8WrsXFxVtWwvVvp1fC5bsMXH9IXib7OnmZWtjcB8apSFkDPlm2MBhFOS/z9jVgxDEojrTkVVZlaP77kzJr4Zhdxc212JooO6PTq5bZeSXeF6ucXaWMO+tRDICsumct7P001Otm0jVSrmyTMXeynIyf5WRC8K6BvWuoYI5izevEnIzRhnedlBpC9C5swhUNLFqrAbIWbdWKdshVh6Sxuj0S9nyB2w++aBpemeC8ZGn/gkZLwZbv/+JKFgR6gR4cOlWgoGOI2VN4bOSeNtUa99TBPqLfhNpD5X/Y9fZed5AqDnKP/ILx3jLvJxfl3M51bD4MaorywKJSLK4qsaMvJXbQAbPaWGJHZbIoWGJHz4rmOCmIZLWwu7c9r9XbOJbYUQCtNWUbqDqrA8ojKyd23LLW6H/46rmhdGOm75Gr2POC76fx3vXbeprhwQd07ugLDI5fczN7PjrcQbRN1/yy6ej8SKd8zy7yOzj/sDZONrzM9Bv360+/qZOn3+QFO1ZBXtkEHJSetVNwjuzcNbRiEg7/96fL9xb7fwtOMLJq4Xw/+Awr4dwg210VOL2ghy8Hp+/14fTLcC4BnG7WwCtZ6G1x3xBUKmBrwV2Qg5RrgIwCViHDfA5g9oPF8O7LQI1AR9MFF5MyobK1AFgsORRY0eFhp6+C0lK9UcfKbPB6MIkltbK9J2OKJoNHDswGcUqbqLNJ4egbo7raB6hFeqzGBlyJ+u21Zj+dvZ/kYzQu7V1rWo2PbsoVT6vBfNNlJtY0gipea2oNPwgcJM91k2e9LnArxuJ66Eg3kZQnpFnRUhNSKZzpVpqHSye7WuWITWWam6c0CdddOwkXZ7mVYl84Cndm+4Fr7t01uYEMrxtZGBtfv+HPFO99cXvVPLdjO+b3baB6mdEM47BBLo7TSmqphu06gXShnjGMh2Ug6y4U/IwJ/Cwy2Mjse8w1hv04/kLjon7xFVKal3e/onguQ/c7KCM8DSyBwn3NHbi2xBKghpAnIrR2+F3Uo7lezrAa6NxEVg6hxgrJVEGjN6OXrJHLawhsi4VO2XPImTh1Km+grTYGFZZKGnT0EXu1PPSGsQY211KDU9hwyglh3ffpqjLiegVO+BGi9ZF33Em8Xz19+jvFvz7VvW3e6fzEc6TnE+N/MfHKBJm++0Fei91UYDPMk1fhNDcBL3+Y3X0d/C8pjFXwKaq5RG1aaoS3LalCzOxF+GPKciYxqKejIDFSZqZ3pcaS+Di7+TLNIEbB05G82NFihu2pw3t82Za0ggvvAIZpRZOdprqlsJdFcc3Ckr0uSJNPMRu7CVCjkA9E1bmKq18KJ0Zrw4nd5dtTuzGYaDg00z7uSCyum1L8WtmXaUoGevsOtib2zByayaTaurvbUt+XNm37za1vH+i55e59YScNHp48+eCfferw0WePvP8DyLcsv9wmV8q/uTbDjEn8xnTBXtMmwDLOSy6TWUtnPzSzBncXKyb008usXYD1CFjloaWS3yVPCpHqTehZhxpzrzvlXXGZjHpt8nrPqqx6bSqbt61RF0u4Z/kBIoKM0wBXoBxRpMstvXR8O3aka+XGUnbnSgqirFSele10bPFFvUG4M/woOQd2Od4phd5fKS2p6bwKmhjAxhJ6k5SqzhFssmBzAGjHppYOcDQyh36V4Xxmlalc7erVzDTgqocX/Jc+28L9kNeScGVOgmaZ3fazPCcBbzO4hXz2h5OT+H0HfH/sDb/v4Dvk73+P7CVv5j8P8r0bLHnsLDNX7igNtDKw3l4cu8fGRuKdsnJsmDjrRe+iM48qrPG9jWO+A2qjORRrCcdT5MLU7dGOnsPqeLg+McJw+mtY8z55zRX3sNZcKJgqK5o02NvCs7vH6Om0FxMVvSvv+PjXB3HBOC64cZS8s/uoOh6qbx3pmbotiutdCpL7uFN/+HruNdcLx9h6eVwOsaPLYW0z4Pcril8E7+2LVBU9aZmw9AjXV9EWcwECNrgwOKK1lMYueiX4fra8g3aSM8pLnJBbi/bZlRf2TcNmaEywGc0A689gaw5qzCZGKXJh+rbK1mRX7hPPHQE8/k3GYw9STnSmS7fy9DEsyvQr9R0GK1hUUVOsE6hFZcvb7JEydZd4kz0o33ByBYGzKy8cYSyFWEyPfeuA2mSUyT9G3pk9Im/39K2AwtWqyt4DDrD3/0b3/r8bB/d/AYc8okBZqIRChZ8I90fcTeQr5PHqXnwN68XX1PTia1gvvqbci18yRf9oxx07dtzxjXvm5u6Zw/480Mc9HLtXug8riqgHb/Wm6bQhoIxkdKZS5XvG0rPiZ/e1wPHcdOKQZLHSFCmKzTo2G5uTbylQYwVXroTjwUA8HgieiffH4/1Pwas4XAmua2mp/cdkxJ9wXeR+2u8e4QggLU81MChpfhYrwlRsVDmVaLQq8k/o/Bp5cg3+jb+Ev/Ge2r8h8in5z1T+BsG/IffS/2V1Fz3+jV6gVTf/ENcMu5BvQjpFFMt0OkR5bhdJoZ+nTsvti3ineaOiNFtQ0jWnUngPp7yHTh7xuHSJvNJTnnyuSYlKqxSkaYt8kH4lGABLjM4cDGLPcrSB9ixjUtlNByM7cIKVWHFG6Fy2bDRDQz3yracjzghOaAOLrZKtiPX2EdI3bH/HNQcnOnPrNuwyk6biXxFCFBfNO8c2DnZuOXnwbfZ/TiiNdS59q+rW+zcl+w5u79Q5vMaObfsmWve89WYqFy79B7mOH+M/CvzoAx3DNDeOlwRzn05upVOB1DrUp6lUab46nXSy1n2fcEoF6mEfa/T2sXk8AhsWGGBjXvt/9FIPu2uSySqaz0uuut+JzvPcksnsdNE5p+VXdISpD+8IRzshbUJeb3GznDIbaqrIsNsY2IV0iKTBzMFRzFENWBRup+q1/f0vTrT5lN7WiaxGOdEyqdTw13V3XwJGgJ/uG7dsubH4rbcf+/znj70dLiGj/oz8DPV2pxAR8HXRB++6gEh6em8G7Jb/OLs/A7ge5Vs0wBlid0r1a9nsYckcTFdu2BC5khs2YDQcXaswfCdsXbKGvWb0s+hgEq9Vvhu1rdQPGQ6AqKrz+Vlc1GDHahCnl0m1vNblKU34W327hwb5ICvA1e1aNzHREhP8vvVHjswSU6y3qanXOIszjGc2LliHjHtn6D0gvt3T0NDTcPEFcGq8qEdycIbclB5h7nb5bhWhcg3H2retWHIZ1NrEf4IWmOGr0zG8nSW8y3e0uAxyRKiMsM9R5Gw+/xgi55p163QGu3/7KuyKX+YPXzyN41i4/wcLr8GaAHjaY2BkYGBgZIm682hZWjy/zVcGeeYXQBGGc4sNHsDo/7//szGFMmcDuRwMTCBRAKtpDqR42mNgZGBgfvEvBkhm///NwMAUygAUQQHPAYWUBe4AAHjabdO7L0NhGMfx9zAQFhKTiBAJSUXSxrXSwe1oB41ro6lIxTVRDdJF2AxsEgY2KwNpDAZ/gJ2YkBiIyWwy1Pdtf5GTE8Mnz+l73ue9PE+Ps2Gay5LGeHxgH7NIoB4BfOMBu5jRu3vFVywhikW4CKMNfYhjFCMY1nybu6P8DLIIoQlrGNK7HA7RjXGkMal9DvQ8jSBWtcay9gkopx1V6EErBvGuM1ubiOBO681jQmOuzhPTeAq9WNfciMa98UTzXd29E5UY0Pmipbs7Fdp/zFP7beX0l+5cnDOHUzTiAlOqjbWFG+T1+xpX+NI6MdX7Tf07wgIaxNZjT3X/R6GgXuR80j41nj742b50qBdedu8VJFXL/9SqF65Pysdbf7+EYtwnpBwb7XdQrTNd4ty5NaY8Y8xfbDHGvOBYssgjWOxdwsOetw6PeJa0/kfWma2tzdV38GTXLfW88ON8Fp+7TPgXMYWiyQAAAHjaY2Bg0ILCOoZVjG1MAkybmF2Yk5gbmOcxX2DhY3FhiWHpYpnFysBqw9rH+onNiW0JOxe7C/seDiWOBI49HBc4PnCycOZxfuOy4prGdYWbj9uLu477Ho8Yjx9PB88unge8JbwH+Nj4XPiW8H3hj+Hv4T8i4CPwSVBHMElwguA+wTOCv4QEhDSEvIR2CIsIBwhvEhESSRAVE40RXSLGIGYgliF2RlxEPEp8i4SQhJ/EOkkGSS/JIqkSqTVSr6QlpNukF8jwyLgB4TRZJtkK2SdyHnJZcn/kreQPKOgpeCkUKXQpaih6KU5TfKSkp9SjtEpZSNlJOUd5hvIJFS4VNZU9ql5qHGplaofU+dQT1O9pJGm803TTXKb5QktLq0zrhbaOdpH2Ph0rnWm6Yropupv0WPRa9Nn0FfQn6V8yEDGIMjhhyGHoZ3jGyMFom7GR8Q2TFlMT0ztmNmZLzHnMqyzYLCwssiwWWfyyzLB8ZmVkVWd1wdrP+pQNn02dzSVbNdsGOyY7N7s59jz2GfY/HEoc5jjcwQFfOfxwZHOUczRzLHBc4fjAycVpmTOHs4FzExAucT7mfMwlwOWKywPXDNdrACDIjOsAAAABAAAA6ABAAAYAAAAAAAIAAQACABYAAAEAAZkAAAAAeNrdWktvI8cR7pWdxE5g52bkFAzWwNobUNxd+ZF4faIlaqWYImmR8tpHvjnZIYfmDCXLvyenIOcccvIxueYXpfqr6tfMkOIqCIwEBMnmTD+qvvrq0T1USv1a/V29oR68+bZSqkZvbj9Qv6Vf3D5Q76o/SvsN1VLfSPtNVVd/lvbP1Fr9S9o/V797cCLtX6gfHyyl/Zb6+KAu7bfVbw6G0v6VOjr4QdrvvP+3g79K+1119sj0+Yd679FfpP1P9fTRj6qvbtVKpWpGKw+oNVexGqmI2onK1YSuLqmtW5nqUb8NXRnRr0gd068xWl26lqpLas/ofkL91+oZafWUPn+vPlcNdaK+UE1q+TOY8Tz6sDCeR3Uwbve6UWHk15A6Iz1Skj0KJOnSXOaKfn1O+qak3Qh9r+29OvXWdxc04yuaT/eZ0tWEZh2qI2p9gvdnmGV/rUJNYpJSIx3R7Bp9PW6Bfq/oWkorRoTCmFpD9O+RrTLYYoGR5ySzlnwNC67FTmPMvMSsc4y7ol+xvdejlrGoXn1JV59gfAQ958Avwswbuqtli9G7fi9putTS+kdkzzp9nsmsc3rn1Pc5rf5E3eBVBwq8Qh2zLeheDo4ytitqa3lmGB+RLbRtn5KXmfbRvVH78DVkeowVb4DrXDiYAblrme0UnNIytmmGBWT5IGDAB8CjQdgkmMFolVXMV4cm/9vseUf9Eu8+okwWYNSDxDkhqjVw+iWIRxPqlYkEG6zJqxgZe6RNi7474MkymLkVzKCtVhUhnlXKF65uZBqBh7HIo9FN6MoN5mZEnHUS+k7RuqZ3jDgwpM9JwJ4BJG6or9DOiX9RgYsZraqRXIEfdUif0LdGfkb3OzS+ZTU4/EleemVniS5F7jb06tB3H5Y4Jx/WV3v0uc0OEc2kfflTjJ0QWmuyuWbFrfj4U4rOP62W+t0lH22SzS4oR7WoZZijLTsjjdj2xhMNU+9mqI5DbM3HYAN7Qw4Waf+NyX85n+TCIs2BhFin+cSZUX9eCy9XiD28Esui+ZsIE43nx+gf0X0j1QoZ7E90dQTO1TwpNnSXo0bu6ebGjiA1z8u2ndDdqYxwqAyop4lcpu5g/0kQhXTmjEXrkUi+gP4ckziy+H7HErLs1xaPAaTTMk28vqm1xRQoaJwYzVc2Ct5IRTT39NPy60h7K96vEZmLpcZBDFhYSfzIukLfnNrM/zn82o8HLpIW4yZz6BQ+NoAVdeTJPCuUI6YvN+PDUm+kR02YtaF2bK8sUMnENDou6MV6sl3WqIg2Nj8YlBOgM5AomsKW5jdLeuuxewmNI8TKRKLqre25gJwJUMyQCfsFxjEHYmS0RPQwKy4xE2eMGFHYsd1Ym8eP0NugM5RMk1hEtCRD/Brba7uwCLOj082P+yxdVsp+IYPHgsUAKJlR61LNsRQWZxXYbiwfhnshUo2zY0HVeMZxDk5yBFp7yBpJGN81bDoBJ8qZ3ejo1xSmDjTRI2S6L6+e+zvEjjWsZuLfVGxR9oi1VE/socUao7oa0LUVY200GyAuJsLdNOBfSmM3niwuRhrtM8vavAL31Kt4YrSrLeDixQllpVPKuW169+ndQebVdx7uqLweChpTiT9GEyOT1t3lkinqEEahbFHfi6PK+v1MvEKv9SGNe7w3+oaHI1lzLbibGtj4YCYZS8dww5E4iOF+3JiIN7o622lYk6gQix+HNZnvGaGtXR50tnm4145hmy0Mq3x/z+Abo0LE9rXXv6eyq3dWGVVYJbNVvtGBbePL35ERMaRISvXcXTwyVQjXF6ZOYFbt2hdwDbBCj4kXlTIgXx2J78NDX9eLUi7cT9fd2WchtY+Rb4DM4mJACsaNxatyuVOzsUDbdSjVUQ5tzdhD1NBhtWFGubomlX0I93YRd1qwUhntYk27mwk1q+EIOWwpfWc2Ii+Ai4ty3NtUmMWouIsdBvcI8t4gay+RR9cYZfjsW7cB7OZYbR9LZtB2abPbxGo0sdc4f8+krlzY6zn4Pkf9OhK0boCf8cvyXnolsqSe5SI5sypzPfSy7VjVvZ1Mk6LRBWWIHvZvHezbHsFTdPuklD+6kGgBb3P7N46qLPVEbMgILEW6WlCHm90I184z2Z2HeIe667OMXLK0q/BcDCsyc7v2bqWNPRcwNfCt1Cw8J9fCE09CVweGdfLtzorQ36VwPZvsrLI3YGvxrjt7yF5TW44WZj9X5MlUonGK6pSRZYaNZaeVIvM+t6x5hlzdRjXi12h3++hSOB5GnFgiQCxrcu27ER+pikM1G83KEYhXuCtuZ2LBcC8X7kFYLm2vqeczR9D+/uvub7uifOV9yX9nD1K7Yxcywe59HnifiUnsof6ulM8arrdWHFxBx1Jzud18dfXnav1MZvR3bmE9N4asPkdNVZTLOoewHTOLI/T3slvwK785Kjo94lAq97F3ljeXKyZr+LnWYbASRFfQ3ZzgLARJziBVsy+Q//laLqcZMTg5xmrGmmY9o4HJpsxPPkHzK/bt+/NUkA3XCXHmSj+WuvsaPW8qK66NVLrOfz6S6JHu4S338ZWNyG/G7FNt+/sPRiiDlt9jTxejts69fJ3L6dFqRzYM818RFz5/5338ykZbtsVdVWq4l+E52P/Denppz2JWosekohpnRi48lhh0lvbpBbNjZc8dlltqDmNtfy/6MZA1+/NlAfHQvvvuE9Mg4/hVXPW8u3jDJ3ick8NzCndu4p8tLtBnYuu/MdbNpK5ZSzXPJyA5bDTxYu1djK8J73TEW3nZWseJV5DvRuL/LGB5uSbk+f4znP1ovB3pdZBV/HOK+3mQ484nAXd2Vznlioklq6qmanvvkXjmDTzM8GJbxmW/iOU05HbP8wy/OnQrhUzctuJd52b//+dk++xy+naX0yYGm/3M7ud9Q1TLqT1jWeLJS+LZ6pruxnK2P926iy5WP8WqunxayxnfP8vTu7Nj1SLZz0kLrQvLfoZnae4pWw/PB/rqJfW8xL1z/OtBP6/qUJw5x7ngCV3RO9+e3H8IBr7ETu+M+l1hLp7jkj713N/Ks4cIv/WvL4HmCcY21TfyTKyHWTvUjiBrF0/+mtJPj9B6XEGntnpB176Q9do0yjwpvIAsLGmfrrtVQ6nOsaKRjJE5Jh34boPmPsd8Wv4akNLttpXzVCRtACM9cx/PKa+A9SWuXtF3l/rxc8sGdGZp29DhlO6zLk1IwJZgiY7xLPRb9HhBcvUhRRcc5J41aHiJf7zo8XrVL3GVJeuIlS9Rx5hZ6oIly6Hx/9qu3IP+LTwlMgwpyxHB0i2segkrNAX7hjzT9NFh7B0Da/hHRwPyvrA2KMprZgttUMUBs8ILaNEEHi307uGE4hgztex4PfIS1/venMxutnzLw/BYTi+a6itatSnMaQChUAv2Ay2/04JxbsjnsY0evo3bYsNja9EOuFRG5SU8roleDdijZ1E4hZdeiORXHo+MHa+EhR0rWYiv8RbTb58IwXOZtUMLnuApd0sk7Fk07p6Xo9fr/8/nCXLuDPVYHeMX1HqJMyVXl/I/tU6RDXknof+/Fak/4N5ntN4RvZ5T9fCp/W/QR/8GgayfYgB42m3PR0zTcRTA8e+D0kLZe4t7j///X8pw0krr3nuLAm0VAYtVcRtwg9GYeNO4LmrcokajHtS4VxxRD57d8aBetfj/efNdPnkveYsI/sbvNgz+Fx9AIiSSSCxEYcVGNDHYiSWOeBJIJIlkUkgljXQyyCSLbHLIJY98OlBARzrRmS50pRvd6UFPetGbPvSlH/0ZgIYe3u2gECdFFFNCKQMZxGCGMJRhlOHCzXDK8eBlBCMZxWjGMJZxjGcCE5nEZKYwlWlMZwYzmcVs5jCXecxnAQupEAtHaWYL19kf/mgru9nFAY5zTKLYyTua2CdWsdEq0WznFu8lhoOc4Cc/+MURTnGfu5xmEYvZQyUPqeIeD3jKIx7zhI9U84JnPOcMPr6zl9e85BV+PvOVHSwhwFKWUUMth6hjOfUEaSDEClayik+sZg2NrGU967jCYTaygU1s5gvfuMpZznGNN7wVu8RKnMRLgiRKkiRLiqRKmqRLhmRyngtc4jK3uUgbd9jGScniBjclW3JokVzJk3yrr6ax3q/bQrUBTdPKTV2aUuVuQ+lQOpWl7RrhRqWuNJQOZaHSqSxSFitLlP/muUx1NVfX7dUBXyhYVVnR4DdLhtfU6bV4QsG69sSj7vC6zTvCGn8A1t2aJAAAAHjaPcw9EoIwFATghEgg8peC1plYv1ZuYGhoHCoy4zlssbETL+AlHlaOl8OnxnT77ezsky8X5BPrMD0MM+c3N7cShi1q12HdUzi7DUo4DgyFsShgj9LYhxgj+CImyN5jRYgbj+QzmzxSQqJ/4Kj8U0Gtgghm0Z6IObFoAjNifg9cE7NdYGnsi6lxYaGpaFBeAzWx0n86rOENmlNEXgABUn2AYAAA') format('woff');
-}@font-face {
-font-family: Source Code Pro;
-font-style: normal;
-font-weight: 500;
-font-stretch: normal;
-src: url('data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAGJoABQAAAAAxlAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABCQVNFAAABvAAAAD4AAABQiyWUMUZGVE0AAAH8AAAAHAAAABxn9nOhR0RFRgAAAhgAAAAiAAAAKAEXACRHUE9TAAACPAAAADgAAABIM+4scEdTVUIAAAJ0AAAA2wAAAYQFdPuZT1MvMgAAA1AAAABaAAAAYHO30P1jbWFwAAADrAAAAYgAAAHin9BCKGN2dCAAAAU0AAAAPgAAAD4JkQW3ZnBnbQAABXQAAAGxAAACZVO0L6dnYXNwAAAHKAAAAAgAAAAIAAAAEGdseWYAAAcwAABKbwAAi+AkjRtWaGVhZAAAUaAAAAA0AAAANv7GqWxoaGVhAABR1AAAAB4AAAAkBjcCs2htdHgAAFH0AAABYAAAA54OC0g+bG9jYQAAU1QAAAHGAAAB0gkB585tYXhwAABVHAAAACAAAAAgAgYBnW5hbWUAAFU8AAAKkQAAJ+4gZbYicG9zdAAAX9AAAAHlAAAC0c0dvQRwcmVwAABhuAAAAKYAAAETAxE/wndlYmYAAGJgAAAABgAAAAaAXlJ9eNpjYGRgYOAAYhYGPgamzJTU/KL83DwGJhc3nxAGvpzEkjwGFQY2BhBgZGACquRhYPwfxgDShVUUAKcdCXAAAAAAAAEAAAAAzD2izwAAAADNFZ/1AAAAAM6jMNx42mNgZGBg4ANiCQYFIMnEwAiEz4GYBcxjYGCEYAAasQE8AAB42mNgZGBg4GIwYHBjYHJx8wlh4MtJLMljkGJgAYoz/P/PAJJHZjMWZ1alMnCAxVIY4AAAfRoJt3jabZC/DgFBEIe/20MhIiLnIoqrRCmhOoVOVEovwCUqRPypdGq1yFUeQCkeQFQewcswt7uEkMnuzH6z85vZxQGyhAxRnW6vT348WE4JSAnn8cAV56B+zm4UTWZ4o/kgIlisZguqknllk93EKdLk8ESxRpOMZnXtFR3pashUe5eYEzccze5WIS+rYrW27Dhy1jdcrVHAf+cderaWj9qiJYYm54RjiZL5qrQl2rAXnZgDDS5iIVexlq7xP2rk7TL3fzVDlby3LHHhi5tuOcmvWbLSP+RRwn8ClQYe8wB42mNgZnJn/MLAysDC1MUUwcDA4A2hGeMYjBgVGBiYuFk5mVmYmZhYgBx2BgYJRgYocHRxcmVwYOD9zcT07j8bAwPzC8YlCQyMk0FyjC+Z+oGUAgMzACKQDO4AAHjaY2BgYGaAYBkGRgYQuAPkMYL5LAwHgLQOgwKQxQNk8TLUMfxnDGasYDrGdEeBS0FEQUpBTkFJQU1BX8FKIV5hjaLSA4bfTP//g83hBepbwBgEVc2gIKAgoSADVW0JV80IVM34/+v/x/8P/S/47/P3/99XD44/OPRg/4N9D3Y/2PFgw4PlD5ofmN8/pPCU9SnUhUQDRjYGuBZGJiDBhK4A6HUWVjZ2Dk4ubh5ePn4BQSFhEVExcQlJKWkZWTl5BUUlZRVVNXUNTS1tHV09fQNDI2MTUzNzC0sraxtbO3sHRydnF1c3dw9PL28fXz//gMCg4JDQsPCIyKjomNi4+IREhrb2zu7JM+YtXrRk2dLlK1evWrN2/boNGzdv3bJtx/Y9u/fuYyhKSc28W7GwIPtJWRZDxyyGYgaG9HKw63JqGFbsakzOA7Fza+8lNbVOP3T46rVbt6/f2Mlw8AjD4wcPnz1nqLx5h6Glp7m3q3/CxL6p0ximzJk7m+HosUKgpiogBgB1dIlzAAAB6QKPAFAATABEAEkAPwBUAFkAjQBjAJQATgBSAFoAXwBjAGcATAA9AEIAYQA3AF0AJgA6ACgAMgAhAnkAAHjaXVG7TltBEN0NDwOBxNggOdoUs5mQxnuhBQnE1Y1iZDuF5QhpN3KRi3EBH0CBRA3arxmgoaRImwYhF0h8Qj4hEjNriKI0Ozuzc86ZM0vKkap36WvPU+ckkMLdBs02/U5ItbMA96Tr642MtIMHWmxm9Mp1+/4LBpvRlDtqAOU9bykPGU07gVq0p/7R/AqG+/wf8zsYtDTT9NQ6CekhBOabcUuD7xnNussP+oLV4WIwMKSYpuIuP6ZS/rc052rLsLWR0byDMxH5yTRAU2ttBJr+1CHV83EUS5DLprE2mJiy/iQTwYXJdFVTtcz42sFdsrPoYIMqzYEH2MNWeQweDg8mFNK3JMosDRH2YqvECBGTHAo55dzJ/qRA+UgSxrxJSjvjhrUGxpHXwKA2T7P/PJtNbW8dwvhZHMF3vxlLOvjIhtoYEWI7YimACURCRlX5hhrPvSwG5FL7z0CUgOXxj3+dCLTu2EQ8l7V1DjFWCHp+29zyy4q7VrnOi0J3b6pqqNIpzftezr7HA54eC8NBY8Gbz/v+SoH6PCyuNGgOBEN6N3r/orXqiKu8Fz6yJ9O/sVoAAAAAAQAB//8AD3jazb0JfGNXdTB+73va96fVkizZkmzJtmzLlizLGu+ezfZ4vMx49iWzr5kJ2UlIyFJIyNZJW0qYJKShDQmkLO9JylpakkDY0vb7AWVKP6D0a2nBLG1pA01oovmfc++TLC8zSen39fdPxlqeZd1zzj337Oc8IpAIIbRNeJiIRE86FUpSAwW9JvTztKLTfm+gIArwkigiXtbi5YJeF35roEDxekaKSImMFItQ44+/8hXh4bePRYSdhAjkexdfp7cIj8E3WskVpKAnJFkSTcSiSVLZlpLpBUVrWcCfoklLDUnFal+QrSnFZF8omk1WQ7JkcRGbJilbUiUze6XYaVKxWCWnohfyecVkhlc6MZ8nXd29Pb1pr1sXFTN6MSZ+r3NdZ+c6+yHROmaNTXZ2TqaEp0+Un6fjBOG6gc7Tvxc+S7TETJoIhe+XtRdKgpO4YDHBoZhpsmRg7xQrTcKXuzJ2Gkvk2OMNtwr1o/U/Z4/CZ2/44Q9vgB/CvncrPJiFe0mQNNA9pBAAfAserz+TycgkVXT76oJNvoxCtQtFQaoPNfnSsiZVFB3hBryshcs6o8kKl4HEpmRxRGswJgt6syWdTlO5MSUHLpT8nCB+h6JHGNm7gt6An9ZrjEnZ4FC88AsP/4XHi7/wuOAXHo4VJ6gSoUm5N/Di8N1v9BNP0vTi8M3/8R18IQccRSGgdyWLInvU4SOsVjT6DfDC6yiavGYXflvR6rHABxzsUWKPbnzEz/jYZ+Cv6thfwXcGK99TX/meEH6mGK58sgGviyMOQUQSOCSkVX0o3NC57D95JADbkctmcjH4yejZjyfGfmI5+Bmm8Kut26Wte3yD3lvqBn1zO53b99UN1d0KPxtucd761bH7xorwHzx9Ff4bu49QMnvxdwVR+ClpIR8hclNKTmQUUVwoNIlIvqY4kK8updjFBdmZLtjr8KLdYQQebk3JlgtK0LEgBx1KHGhqTyvNrgVZSsvNDkUHvBoxLyht8By0SE6Z5uW4JBvzcrNTEevyeVknyeG8HHEqbg/wsCI2wYdIXq6TitTiiTT58rLdKbvzXd3D1JtJ92Z7OsVsTy9g7/H69J00FtV53GHR49bpPbFsfLbjwK6evpE9e0Z2Ta7fvT6TGGrvzI7s2Ttyxez6q69Zt7Yt1tAZadnQPbzV+Ft3GtevCQdaosHWxpaJzOgO0+/9jhl5WEcCF18XhoV7QA7YSB2JkjjpJk+TAoiHpNKmX5C7Ukq9fqFoqe+CA+uEC76UotcvUDmdkjUXZJJWHEABh0PxANpG10LRb/TAJxNw0ehQOuBiGF42p5UMvPQ4JGdRp6cWxNUoyUJeSfiBCLG83CGV6hsjwTj8hihdbfA5gYT98E5xRuDUUzj1sk8qGTWxZvyMrHfKTYxSPr2IogCoEovGe92ccLGoS70YjbtyPjtVr8ejusDzzU/mpt8/MzM8NLOxJdyQ2NDwyMz7p+HK8JO55+sTDeGWxFBi6wuxr9OvTO3YMbV5z57fujLflztV3jS1c+fU5t276c6v97zw496+vt5cTw8ByjUDDdcKj5BG0koy5B5SCAP15EBGaQKuMghAyW4tUKwHxY7SZlsoRtq0QCMCjERSSgSe2hxKCuhjti7IZofiRlLZF5QsPLdpAXuxBbBPSUVDuMmByJudcjwvu6WC01efR1ZqCgMV6/Nyt/QM0Zr9Le3wKTg3wDxx4KAMUsIm6L2+3lxGB0/6eAKplUOq5OC1y+0bokg1XfNwLrllbHjc0xWN9u3vDuyJrO/L+MfGZ47sPnvFWDqb2bN2aCTY2dUXjv1x//aW7WPr9kwOhLOZcGDH7KbTdxxvdcy5e8ZPbOse6pg5mqeuzv7ImuaxNPIaJT8HOXyayeEQSGFdjRRWn1DKVcXvz98v1o9wkQt/+7WLs/T7wveIkbjgb01Mm+hsCyjl4C/SjpzPBpvs03/t+7lDe/ceygntcmr7q2+8uj3F134f/P252r8XLyiG6t8D+j3xRM7r0L+P/fX3v38H/2P57b+S2d/PkFOCUUjBKWmBv7fj35c0TLoWbaJgSypa14LigA3TiLAVZlRRwHi5jC/n0/v0CX0iNyM9ZewzPiU9fqrrxhu7TtHrenr+5E96ejb8UeSRRyJ/hGvMkaOCHtYwky0EOEPWg/LQLcjadIFQlELEBAqCEnxJRRRIoMhMF2QhjQdP1qQLRhP+zqiHj5mM+NJEjFWdls2AIAHBCbJj7pmpZ56ZovHxl1+Gfwy/ly+20Q/DyXeQLgJqqmQyESvqbSklCxcUq22hIFjhG4kAX6444RsVkwYQtQKbAVchN1UYTad/+RZRa27uTsdTmSt2ne85TZOJeMfk6K5bG/hezNG4oKdn4eT4EE9EEn8orKtoVWAjnjn6LEA4Dp//JtgVd5HPwt5lScGgWhVmUHg1r9mekgslrQXtDfVJ3d1cVRZ8s2eqJzOdmWvJZlta4fBSsu/iAfqfwpcBFjuRaaoGBh/N0H10fHv5+cfFY2+hpbQWzrkHZKWeSMRPbuYWjmIGReFPKR4TiMEUKhIqBxh7GsC8AQXtAj3ss5As6HGfAzdD0cLZDsKzywBnW9AzyVY02x0mPNtWOO46PNN+tHa0BH7rkRSrAZ4dTkVD80DxXgcg5ADjx+1VpZpXNYfW3vK/b7n1O9HNd26Gf1Pxvni874/owNNPl7/0Obr5jltvveP2m29+eCgeH4oD7vvBfnEKtwK/bSYFgrhQwMWYZjQAUa9PMRaD/TeaFwpGgTGXGZhLYMwlAHPBo4azmGIUgB/0yPjAaFIsC7JGynj2K3cfHJ58fI5+fsgee/uv5nD/R2BdK9CxjsyTggXXNRkWQOfK3pQiIP38KdkFxqJjoaB1McvIAou6tPjSZYXlAoz/QMfCEc6jAoXTB89eVKfAPBU+7O2nnkh2CJRoPBbVjxy48eC1H/rtqdYvlvt2Hz3QMjYyOS4kDp3cPvvp23Xza2b2nZyN9w5PAnxZ2GcTwBeBE1loRPhgV2VDSjHCabSnFDfCGE3JugtKyLwgWxovSIoPNH8MwTLA+YfzGgK5DCpO8QfyqNYLktOXz9eo9liW7RzAleDg6j1hypRYtnvm4PDc3x4/uDY3Pd6z/z0Hb/rg2p33HPnd6ZGJNd3XT/Znkunhodmdm090aOzzg/OHuS0ah4dm4f3ERJxkNykYUQOBCNFlGH9q0rIAm+lKycYLsiWtGEDniOmCge2jQQfUNTKj0ojyAtWPwQib6QAuNBNuyQiSbEeVkqW4qyhEEhnY4phOH6fdV11xxb7vflcQtdrBp9fS3ynfPP3009OfzQ8bdrHzjvS0Ap/5ydWkUFdDTyenp8XAzwzQ02NmR4NZqy//+gQzUi2dNtn8klaxO960yY6XACZHZyctmi12h2ojUsWjA2aw2vDc4AYUQWB6mA7k9OaEdkU8Eb3KHEDnrrk9oztm164ZTbvp1eV/svdlD7zvtw99aGpk48TN65obae/8H/uOHjpyA6PvBODgB57wgJY/TgouxMKvWZAbUopVx5BhJz+CQkgxw8n3plGV1wMtHY4FJQrP9XCgiwbR6sJj7pDA00JwG/zILw4zcIdiAFdH1uVlUZK1yMgoUUFZg15eBDueC9OMyjsTD19z5ebe7MaZo+Ls/t1X3rb7zL1XmKaHs+OjA1toq/K5DYPp931w9uiBPdc9tm/Hjo39AyNsP9YBQl7YDxNZz2UYE8K4CWZQOqBXnQsFnR75QSeiS6Jj/gayhgXQ0OkBSANATpE1xDyX1jaqjw3R3Dr6zfduNx4z7D0ltM4PfujfX5V/+QGCNtIY0M8L9POCB5YiB0jBjRQMAOk6UooBhX8XI50PSKfFA9UML0BeojVtti3IIbwmASW70ShqlpzPiQbB5g7ErMxi7AhITjR9pFiLavrkslWNVD1a3OJBw5omwOyBdz5OSN3YBw9cvWvflQcGRm658vQdu7asHZ5Ip4cdxoPNMzMbh3PdQ390fFgztGPT3v2bt45pwpODmw4e2pEe7kvFejxendj7k1Te3zfc2Z9BXhkGXB2Aqw/saeAVM2LqAI73pJQgINwIvKIBhGMM4To4inVMS8gh8L4BwybAsI6o/Cy7QDU4RA/D0mFmKhcUgmzLK41B4BwdcTG54qqaebEoGDKAZW7RxGO+wzCwx33tm/f3ntnU21NhmX3AKesZy9AXgUse2nPfXGuFawZGZoFpAB+mfwUz6F+J5JdoYDAPSlZV/zoRHdmUVnWvbKu8QtyWaGGHqqxUbQyPPVMVlUz3z2azs1l25phNAus6QFMcqrFKQFWU3OqqoCqcF0pevqTXIVuRTwRgGCG13GoBraEITqCrC50xr6S4fXgAL23HCCqcS+wZEwN3iVUj7K3ATMmNpJ3+q3Al2AjElW32aOH/G+lN5e/RJtoy/ta+lzUv72O4zZHnwQb6Hou/BCpWEFO8eBZQ13CiwdFq5sZQeZI++/zExHcnJnCdE7DO/+Hr5LLN8L/Wc4I2wTo3tbNF3hrneuEU7N0/CE8DLzaQK0mhAfcuyGIyyI5M2zamZD9oMgt4eSE/+CUovUIONPJQBWPwQLH4OeOZpWcFkycQxBBGXg6hilC0TlUeeIIoeLVmHzuBqha2ib5YvKKCnSpBT81cue1kU7o7pNmhC6S6mrJdo2uSLIQjbJ/fNtE03Nk5EEus62pPBxLduTJlER2OT8fFq4QY6LkYaSdPENDCSkjPokgJLbhRKcXFXVQRXdQOZoYFwDYOOJht3gT+VRM/a8Z0SceDKzqH0gofAede51BDLEj/Tvh8K3joJdEXiqKQgT8DRE3oxisNjcg51hAwE2kAZkpIihHtuDZnweQIoCj3uZjeZLYaEkKKJWI2ytkrx2WOh51NH/Cci73K2mjHJ+48djJv0Hg3NOcmf+vOifE9t99xcPNQ49Y9t25JRDOZ/XMj9IavfvB0+UJfKDE5MDnnsE3sf/rRhz+X7MnRqxub8tdb05xOAXgYEs4Bf9jJJm7dyWKmQMEbLekMhFpBkOPmO5gQ0jvB2nOAdQmq2bmgSOjH6NEHpwYjkzwUTFXZAuhkXBkXoKJ3ZUCCgvYPfOe675zq+2Hf7DPBhgaNLy6ce/vqz3+emnefuGbXHcDdhwCOJoDDStwkiNKQ2Zk2cIwFdIyD4kLJ4wZzEDxeZPx6Bo4NrCpPWrY5GCQmeFeHx1oDxkEIhaMNLT89boHbxvcETGQ9mshBp6xBKKVMmsVJmM5MZNLZniTN8qdDL/5jf+7377762O4//MPdk+fu3yyc+3h62qbx/9b+QzM3npk4sQ/PF8rwTvDp3SjxmLa3GRcKIsJsMAKgHsZbZiCWl1l9AEeJUJ1DwoOh6m+29Vx/L+718JMfOL2pr3d85+nTu6eG+7becPun6Jrn54bzH7r2+nvWD14BezcLNEsAzQwg+fq4vFWMFYo5cNckRiawyjHIwlwKAIR5ZQ403LQqCSrY9yLes5/4vT947MH1a46f/uYa4dyTf/DYp+duu/l1xPUsrOeC9cxkUt0fo2GBsYqiMSyUtJxdtGggWKoLo7tJKh4BPIpG1fVU/c2MBNaW+v9Z+kj5a1RffpOOCufm/2T+O/NMVt4O69bBukbwCNi6i2satGxNA65pWmXNxdXMS1eTbqcfLb9GdeVfw0qvbSv/I6yTYbbbI2B/vpcUfMv3suR0+URYy6l6boRtKxpvDh6HKTg8uKbDCauh24ZauGAQ0Z5HvuNmnM0HdPeAkEAFY0avzSAxU8653JTjrJCNgZOE6ibzxB0nZ/p6J7efOLJnpOmmb8/cePvjdMPHOEfceHf00S3lf9pcYvTaxPwm3Kdh9UTr+YmWtRlUyEgx0VjdJTNQTGBWqAEEniat6OH8VDaH/x+D/zcdfePo0TeEc+V/p9a3r6bJ8rdxrd3wUGZrbaz4hgb0DQtadYtkfXp171DWpWscRFxXXZN5hRFPDPyH3Y8/Tp94/PF5+qP5+bJ/HnEDPfXvwoPA8WtIwcZ8BCN+K1GZQGLuAaBU0JmZZWqoxCHQ3lcIrXGupEg2IjF7b9NwbnZ0EDC7+tQN/acPgq2zmV4xX15/7H29HEdhI+BoIV0qPQ1VelLQKUhECyOiYsOV0OBVRFM+rxLQldG7YqLes/uoWH7Pa39/lXwSqPgVmn+7fJauu/UrbM9ugzVCsIYW9BWno6ieLRYBgxVEwElkXC1qjZUQGH5/xHPbYdoPAvXVeR432czyDedAly+o8Bo5vIqgzwDEddyCtjHD2YQuuW1B8XNv6ovBn80yb0oAb0rzkuLyvCk7X3px8JF//iRe1sp6uK59SbFp35TtL734yr/97H/BdbMsOIqioHElXxyM/7yeXdE6ijqt3pWEA6RpvLfx3pgOZF++ANcW35HnRI1WZ7M7XZVIPh0xCXhNX3tRdd586Ei484rRxKwMldBWh0poly+TcyGv9uRidhpL0Rio082ntoc1oW2n5q1ix2x6tkOEg1H+1fHj1AQ8PLHpoY/88IcfeWhT+TkeuyOCEejmQs+Y0c2s7rMRqOZmVHM52GFx8cMCLrIJLpgcihaoqU2x6LYLobLZQblrURtqKoBqbIuA9sSzeKzERAxcDmnm6CvDou0KfKQI300f0j/ZRvsAwrs/ZH2srfzlik3zupAE+WQEbbNRlffWioRyqdoGYDQ5GUgOVd57URYByYqi3iAwLe2yqiEjJnBUazu3GPvueOCHD8C/4/Pr1m/deu9WOvnoM88+8rEXXvjYdffdd921d98NsOxXdY+ROMlYrVQG8VgycBljQEnpqkplUxq1kA1tBhAwbjwpTpO0RBEngRgciCTd/61f3X3VVUdnN0/NHRXOvXr85K/ppqHR4V5Oi86Lu4Qu4VGgRIjsIpwE9UYWJjChHAizZb1ACa+DWfRIiQZ4DniREoLTgApYKxVMFjsLjZvs3HStl0paYnGqxqlKHX1FK8cTndSJ0TS0zDrv/eG9J3dFjofdzubktuvr9589Nnfv3OyG9XTyY888++jdim/aNO3YMeEqkos/vv/+HyPd9gLw3UxeusiepdJZcQHpTBZGOhOSzl0VzxYmnu0q6ZDJ7Bj1M+pAf2gkZlVbTDwm4JJqCIpyJ+anaNAARfd+66f3fvzq3z99+MOTk4eFc3/6O23lBWoq/4ruuXFNRrVlQsBfCXKYFOIV2SohaF7krpaUbLug+AEeP09jxYCmrfDst/Hgj056RrRI3kaWeYk5Cy53hNHWKzKrx+aO4S8kSXbVJq+EFOXOVEXvhcUGqnriw2u2Hh3ZYG8ON+69/5aDN833rJ/PjdrtLc7ArvWb7jjzwLZ10z3t3ga/zdrae/3mY1tG+jtbpHrJYzAlgnNr584yeZhQaa5HnaGrcioxYHALnShUGVoQr1oWwdBiMEPHoog6DGYYq6FmVIMJwfStI0L//Pzbrwr9XN5uYnGrc6CTcqpO0hoXFgWHVBHfssikBu4o85pQI4GDju4bCAM3U0kZVSEdvbV/3cEbTp2+8U36kfKRT27ZTh8tn/rg7bfjejHAJ8ts5SdJwYocZMkUCKJkMqN8t7EFKfA+5fIdzU87l++DyZ8nUZDbQELIupe0wFeyBeT7Pf98nEltnaOo15lcyaKBPRrxESM7izIbuE025klRZ9QbmMQu6YwW/pKLaRNVxTOxqjYm+AJh6ssMUZDPYix26rAxbtXYWnWHjv3l9SDu/jh8ri35kIdue/tqRk8j4DcDOj5MYzxHpnhDGY6h7AL8Gjh+ZoYfOGmKG9zPRo7f0Lpf9DL9FQI9FXhJ0YH+MoKe2vbP/8D1lxeu+15S7Lo3Ee+hln/9wiLeRoY3PL748iu/4FrM4ihaLXa4bsPHF4f2/uJRdj3kKNaHAow2xiW0KcBl1HPwVzXXYZdHzEAnuy9QrzdYbTW5azpixV944TehZb9SCcoCaOG84nYx2xEIGwbLUmvy84hOhbjDNOPDV72MyiJzu8SY8Ui7YKSitl4/PDasC4sag6Zt/94rx2xG0W4cPiU8WL6u8Ra996rwP/xDw03ms1l6/9vvoXSkb1usfBH2ogP2Igm85iFxVVpZM8zBkE2wE96U4kM5LqB+00lMv7nEjM8LUAA4IriACIaddrzy7FXbXI2aqHXLqWdfObu3ya1xRXfTLXTw0aahCf+j5T8rFz8x1tIy9glYMwJr5mBNG0lz/uZbj2fJnpKtzNhi2o2VfHC7uobXOBFweQ/Ykad2G7ptmvWaHcf/5ohw7gXpZPhBwwvlHf/0T/zsDjO760HguU7V7tKD3aURuAGGTgXzHBQ9j2/ztJ0O8cxSMB89NOIZpleUX6Ivlj9OjwwIZH6wTFU77LsXT9DXhS+B3Mli5Kak1ZNGTRLjU5S9YqIHOFlrBdHDLDsteCosT8czSxK3gr9L/a+99lFxb9/b7j6yPBdFanNRcDpi+7bT8e3Cl996mMFwBGC4tQKDPlUiHAYxVdIswoA5UoCBMvFHEQaxCgMzxqXIkddeo/7yjw4IP+t76wn43pPUT/9FeAzPapCCqw/Wlp2ePD9/fn6wS9M1CL/9YPl9T9x1F3524OJZof7iF3geT0wpRFzAn9ocGnhkA/Tvyo2jc/D5zwqD9GrhAmbM2eepiX0W03aCBcN57K8UKkpqIifji3325O5J4cJ5ZhtMgTw20F8SL2kg7yMFB3IQDyODc2ymhIU0SmLIbUZHSM9DW2gRO5hFXE8Z/naQL3awomwsX4fRLbQ/wRPMo5EA7oU7z3JtshNrNNwAi8RKNwws725U8+oYUlVTNxjaWYy1Zm106uPPC/2D4/ubrz595MScQTy0a3zfgd7kxMy9V92xdZuteyC3dv2ZQ+X/Pbxp88ZYdPQ6s2r77AT8GoVXQd8EyGnV9mLpMTAgCjrErw54WMcqUnQUE8BBhp/EfRSHdUGWWEGQYgTFgKkHycE0EQY7dRY8TmjD4oU6VpiiqxppnsUEQyKmz1WqKPQ7D4sT2w6cumP39HrR6MkPDUy9f2xYePXzuzfcde17HxzrvSlzYNtTY7C3uDch2BsPGazESwBoEYFm5qK34lhzwWJzcboapALROZDgqqOc61klZhKf+oPrrhzvGhqdOXxwetPGtu1nb3jo9Rvu2zCcOTg9c2DNyKZ7GP36AAbC6Bck15KCCenH1La7Aoof6Cf6ma+lR/rxcJPkrBBO1qYrURUT8AcICYw3eSX0+zAYb5JkC0adTOjkA0Flv4QVPEtgT6Cfu4QjEJm+O3dtWqs5DNwwPnfg2mPrh8fy2eH+2dev/e3BHc++3T8w/qGb5veM/TiN8Z9RwKMeaOnifCAhCpYKCnXA4m6jhBELN1aVcBaADZfdzA5HI1Jn59vvMaJNbJHq0DzTSQWDjdvEFkBItrMSHOAFN8ha5jPkKvmSCKaYOOVzERarHP3IkZPv1ZYf1BzctHFjbM/hax46SgPrhvPbAIHbTnjCG7e0Defve3x04wTwAsb81gnfABt+J+eFggCQy7YMboTsAJs3xYOPHszzIus6gebWdMHJsr1OB2Z7nSzbi3YaC7CZMbtsVA8iWm25RdMyRDPMhDt0z9GjExu8mf5rv/jFQ/T8Jm10z+n6Ce/1TbPl4xRFCMvhNwk5oG0zyQCn/ikpdCF164G6FqTugHahYMMXkmZBjqWUVu1CyZvrsgC1vShQhlgGVZNWerB4B4OScRtjlwA89TiUPPqJ9oViuytvSCqN8CF7WhmGiz1GzPWDXa/kwYx4zua1hGKtqTRuDFj2EhY9tYLyb4yTPJdDgiadZzltRYsp5Jyk6DFtARtqdPXkmRfjwyRXNdHlAyKoJxiOTj+t5gsr/l+SRrHUp1IysHYm3T907ZbWyNduTpzZ2pKIHjxxcO9Hbzl54/z0+NQVmdz2VH1vc//2fvi3c7BDEzrRoumcnTlo2dSamd7lAMutb2j88LqpprZsc9hnaKDHu9as6Ur1q7YzFoTa4Sw6yfhirILJMJuh6j06eYTKqUYruPeoOAlzHvGw6TCyRqSlYsqDoQCWFJV2Htbt3Pvk4VSueagFpNLZ3V8uf4NGRweaW8uf4zJ1BwDzCeFbRAs6dZ4UNMxLQDBAUYFBrRhNPAiu4YEYDasB1GDgSnQUbaLZBqfJsiDrwFyw8MC4qME0rtFqQ5eb+Q/oPVTd7R106HCkbaQN/tHzs2UfPf/vDS0tDY3xOIOn52I7gwer7Y6QglEVkJjBwKS4LwW+M6+AWBHuApO+aDO7ASK7hdchAEToApt1AJHk9PpYEEC08rJCg8TyDz4uzJm2d9fWxfU05LIjme/SoW9NnufwFicCgyP08dmy91vigSrQ/DyPwl5awGqsxsm0FENYK4Nk2mVBshwGyRJ6z6HDml9c9YW/PvPUCeHVcvrfvlT+7o+P3cl5BXVHEL7fRga41Fa0IiuNoygkuGmIm2Nlm2NFmeBgS5lY5kkmkqznaWh0trjcykpTVNwby9ZtT2/ZJtww8/bfHfBM1u/fRV/ja4LKFbpADoTJGdU+tHvBF0HWKOgpCxEpAXAkXemKXxIGZ0RwLchhB6owxWtlIQg0V+3cTVHCAuNUxUu4rHJIWAimUDjwBVFjzKs0QZsejqtqO0ioZvkTMHTvlEF0pRMTzvb1mb79na2R6S5vRKILI82JrVtnJ8pP0PlNa9ljY6z8ROWcAR5OMlsTE0QsVjlsLDG6/LQJK04bsHgV1GXnbc6g2bFPPXB0YWbPivOGOrgR4MG80+RihRTXXXY140S5wqrJXeDBsjJtpdPzWBYGQopUoyVM1FXKvQUeo4n2nfv6uXNfb2V1Trf95P77f3IfnXnswIHHDnA7qo/BgHbUUbJoQi2SBewoZmBz5ekwYw0vI45jqf3kUImzaD9Zau0nWiGVTyWVKn99HmnRggKVv2nnFafu2DM5JuYHBzaDAfVVQRkYRwNqYOfjdJSbUIx2fQJhcAdR71dNF+THqv0CRskyuwV2U/ZW7Ra9FQu3mN1iqtoteknRWqr5MkvFbtHX2i1wUkFI5FbaLbNrReP0Ye2GZXbLaPbtmc9s21C1Wyi5F5BAu8VO1lUih5XjpFiM1WSjnTMi23O7oEZSLYQdEhPqPCoxM3vxqKCS10v3bjGI8bOj2aS3q/WGSbpwzcCYe5vjrvJP8DxjbZ4T1m4gJ9TYgqhRVblLwz0BMysvwtJ4jHEFzTy17TEvxriMNlddGFVy0FlwSH5mK4lhLk5dUpGapSD+1oZ578VAVzxRE+YCo9WnxrjWpnafHBjcMPfcVYdPXtE5tfmq8Y0H97/3xO0jIyPN4WCLO7VveHZkKD0UaHL6x3Ij25hcGgE8YsJ7wHY6VWP5MftJy+0nfboguE1q5V2NDVVJkLmqNaAuY8WGQsYQgb3B6WLWVMUAdKMBiJITvGpWG1o1uQfpyL3WLT/6UXa0P+veMvEKmlN33z37ndEBz0T9X3yHwTpx8XVapgsge7ar/jwDWGfgR41FEly1QTIj+vYY9nRgbQbqPJRARpH7AlYsMQNxqVPD7Gr4jNWySBWbegJkT3y4CQxpzdyBp16kqfLfjg00t9OZsm9uH8DUCTzYBjBZSISf/AKhaowBlmMailhUg8KVcXmr0avOI8f1HRohbj5+xZfeQxfKv3K9X38mRE1lH8MVBJkwB98bpps4fxVc7lAGo1fI4lRyZjLLI1gYEjRa2aFEVnfaq8Gsl9v//X+xYBZxyOGXbPBhWXjpxaFfvH6cx7IwxuV/SdH63pT1L7348jO/mOXX3XDd85Ji8bwpm156cVj7+rd5yE9yyNaXtCDZZRd8zRuvP8BCWVYwF6ySK1m0s0cHPmJ8KxDyw9sge6zHxwI81sS0AsD/+QL8Kb4BJnHkyYhN0OpNFqvD46+32QPBpV0adMSp/trlhg+Ewis/Uol5qTEujaGuEuNSQ0q+xZ1IdFKslbDTmP5wj86hsdh7pnttNo3WJvbsPXRDWiuJGsGh674Odun18Jl1G//xH0cnA1c4qaXs+z+BIw7rgejfsT3Lw56FYc+8S2JcFc4EU6tueYwrl6jGuPQ+FuNCOPLPfurKjbpuTdw2evLpZ6+cjtdpTC268fJPjxgnB+oO//L1E32N0pDxBK7ZcTEjtLM1k6TCemhnulD1VZZ02Vh1JRguilbK1wS3EH+sEmEVXMO04/BZQ9yscTUc3P+NxiNzzWG3x7MzbqULF12HAn07yMW335jfbdqs3x9l+G7Euj5YuybmBbJDQ3nB5buKeW2ka8o/oX9YfpWuy9Ijs9nyo7PcXrpOjXm1kpNYdVNq4PEmNNL0C9ixZVTDTm0pufmCrEsr9TZ0fuR6h9ICh6AlheUn9S0okeojIJFMaSXJTmMDkN/fzMS+4vHCswW2w8mOfxalK8jWfurh8QBW08HEK7xhV/HX2Z7rzhl3HBrt3pjStfX0tOlSG7tHD+0wvjFApxpuik0N9DV1B29oyGSMGmMmE7061N3UNzDVfH1kiuFGyUUd3Sn8M4tjqQEpRYTTij88jqUF+QO21q/FH79VR6rxtx8yehwmcms1/taYUhr0WOlX8i7SQ3NBtqWVZqBHIK1EgRihdEETZY5GK/ZqqZRoREbUIyUaJMVswuoCEIQBZl9wRcNqhzopQznOClq8jBQ+j0qcJD3SvbFL19rT06rr4kQ4x0hzoKk7dHVUpUDDDUGgQP/m2E0NUxRoFLm+eXM/4LSB/Bp06MNEwh4Ac0qWMoqOV+gKWOKaxho/Vsyn6MxMKSqCXeIhMaz2qgYNWGxsQ3pfdCTny9QP8RfpEPXc2dq6rf4OeOC24vcubqK3MFuR9QuihVPSr9ovaGX9ggYzK7S1mheKZqvBkCyZeLWWaUm/oMlQ6Re01vQLVkrPRDhiLp/aL4jtgiK9ZTKVmux8++3jdLz8/HGA68zF79Oy8NtwhkNYsYRBY1lKMUUsWXDbJGyxqwQxeEbSZ2YxRsxaiIF0uuTkAGnN6TSmJ7nKVezuPBbRlYjRFmCmhA4MNIOar1UbveIJqRfIiD1enRRLVCUbPXP1nv7xfCre3p1qG5ju33/2YF8m00ezR2+zHT+izQ5FNeU/0SSGeg1Hj1nef2Jwi42usW2t1ozUCfeQGPmwKhMiBnRnsT3JCJxalwYVjbE6ip1w4AWHbAuFEOtHDMWwyCYUgEdvSIOFgY4FxNrrWCiYWauhGU0LPbA2S2BypwdM5cZInhUH1oE2j5CKeYWekQujIGYQebJNYjZUJouNRwmwO5emCivBDL0n4tnUP6K7/kDohoNn1vdlRgfW+l94ShtpoqOD/j15X92gZia249jmXGagJ7J51O9LjTVq5jl/9ZBpoUlYT/xgC1xJUPqGgI8jKcWk4wX84gUlaGfdfJhBdthZCb8SxAJyqtVj9xkcxaLZU8eSyg5n0WJzupl3EvIBIh4MyETALtTanPgBkxNYlNehADa5RM7Xm8b+Hwyp+fQJXTShV3PM0Z6tsdjWnp1d7+3a2TPf1DTPX24f3j88vP/O+e6xtV3benZFo7t6tqXWjWTm2WuaPrt+/dkNXP6kAMFW4VbwX68hBS/qtjowBDMlP5dDUhp9BHumFNKzLldrGrsBzNxE8V5AQYS2sCNd2zRqSxe8rNTJWwfv6tPMqfV4scTBwHIxoaW5mCEBkzFoNvKOgFg2gz+pY/PmpEVjCHpN84dLjxSLxcOFQuFh4daPe3f57Ll298fLX8kO9T7ySO8Qq/Otkb961hlmwJ3BIJsAm6NjT2rWohnMQD9lsnjnzm+VM0KUfrm8Bvd6+8U/EQThsyCPc+RuAsgrEQ3qJUWP1n8fO6PYeqdpI8DJdjvrucNacg9c9Hu64WITXGxKKX5YDcN4dozzCA2JXtzaJukZi74+0pnFN35n0WnypRgjROpZDk+2SM9oTP6GVK/anMiEYk9ueQIcOEH1EXOVFs+cOyz4WL48odu+q2F+cs+mVD7f3LRmy5Y1u+r3TV27rr93Q3Nbfstcfltbet7X39a9zTtAt25JRbvWTA8MpxoCwdZo22RmS3esY2h2ErzOYH0y2jK5pr6zrtka7Aml6uKWMNDofmGc/rnwCuuB6ydIZierG2tkDKK+YuUJ9EJJx9ujdbyR2MH78zxsF5wsToxY9FZf3R8NBKPRYOAT8BOF18Lpnlis8g92NnjxV8IgyFSsIU+Q82oVuZVxJ6vyKEnsdam50YCx7Wb9QskTYC89el6jQC6oYh5rJjDPHrKyQmUQ+iUtF7dYtBByYnzOIgmsoVZ6TtSD2eqLNbPtamzm7aYB6Vmt2UacdVH8lMdZMNl9+aV1M04HHFVHPCqumpEIPvKzRx79yaOZm796881f7Tu0fk13S2M42dPdFmuJ9faP76PrPlIqfeSh556jdeXyH/wBFR4p/8O2k6mO0Ma+ofGG7o7TsB9PkLfonwpg2wPXX09QDvtZ1xUWHJn0i8UuLhZpCvL0lQ3e2RwlO6cE6GYUXV5mOrACWKmgNWFLAPYSY1jZ70J3ysGCAAWRYL+oYtKywBnXOtUepBBdmrbQPXH4Ss1wZzY0vn54dFAr5LPt/eNhX0vb3XR3zxrzWKQ7Ob725ab2bMrjaZq0c5k7TjoESl8jOtDpJJdl3Y/q0/jHOm67rWMLe3zt0GMtT30y8Rh/qvQ+0rNEi7YHr4avdD0yN1fHQ7TW2hBtpV0UI7DZOfrsZhofL//Hy79Bj6GGnKGD9CfC1xl/hkkzeQXPh8qfcojZu8ipoQamGYMgH51puTlVcvNPSKmSyF5ROc6OzxJOLYX5u4Y0Rg+j2BDIL/g49/JKdCWBMUSsH5UwtRSVCoZ6EXfS5wTnzR/k/AzuGagfKzZSm4mNqyjZj03msg8d+qLWZKcsZrZ4TCtRM5FbjOjaxDxqOfSZq2ZnrrpqZnbd/O1bt95unom1N3d0R+N1rYkA/cynr7760++hlvt37rx/V/ni1xojrba5tWuPNTQyGn9G2E7/WDgPNG4laumNdqH6gpGaAHaihRjU3C5rQ/V8pixsX7uW88vT9BP0c8JniAmsrWkiG1MlG6eoe5GivmVnX1okWR0mOVk9rlHMVwJcajqr0hJTWwMHh/jpqd7c1OYrp/KtgE5rpLFVaOmfnOzPT07mY+3tsaaODt6fQVgvLubiD1YqYFmHBkaGtTpWC6thxUQamzFZGeHAsooOrKdCxWV1odlcsNpY3FpkXg841vjOptbGSmptLHhftQ262O7BmnQnJmjHxAsvTDz5JNf7n6LP008J/0HcZAvIUHTtzCAzQGSDaS7oeU7NfgG7kQtaOwMJm4btDFC7uZJNM5h5GNANDqgdOMy5rHMSoGCGGcqGT+XW5UZ687e+Pj8RCjaHhReG+rpja9NDrUPjIX+oBWB6mn6afhJgqieniRxkzRdYkmDgGwk6WELAQqz9vQ5IYsK8mRsgNLE4lgnLuMNY7oNiyYsxtyCPueklhaKNZcDLoGIVm5ulwFgrogs1KGukZHHWShslV69PR+OZ/O6pTHM02jnZNZjbsDE7SX/Q2ZJMtXUmGjvaU/Fet7M/2cNo+iNhkD7N6hJCXFasWpeAK2b0P9p98iZh8Px5Hv8aE7Lgb4cwWusnrIoJUxcgbtPpgp/R3E+MPAzKQlBh5tVgNCyUZoMk1Moxi4MXMbLKMT9D1cuak7TYeBNE37hg8XIN5VNrynJSRvBU8x1Mcie8vonDR1rGIkd0IaPR6mtobTWIffsmQ1T3Z8JT5b99f7KfrrlIbmsWJo2ZvhOd9+1kZ3Dsokz/lfUbWPAki5UqIGuloxqOr6ythu9YFI0dr34qwdIUABq7/cq26Jm76dQh+tzVx8tTV5WPCT94O8J59puU0LvoiywugVKV9469i8Zt1/LGbbqv0rmN3/udi630Ztg1C1jDGIIgqryw8qp0F4OU9SUrOtYtwiJ/ZtbqBU4H7CZj9u/sGGoZquvfMfYpU3ODYzrj7kmmtPj9fwFn7aTwU/jaQcJKlbC+B7VAbQ++WmUI3Ly0tBBkBGuPZDKvl8XW/6KvtX+T8HDK6C//xd+jPQb6/89B/6M9tpYw1xZOjlPtXuJVoiYXq/lFxxYnDLAS0SU1v85L1PyqWd779921D/5NdUx3wD/6iel9+6Y37927uXtgoDs9OKjmSDsER0VnD1PwWzx69WkH6OqPfewV9jj/yadaQGEn+BNoaj/L898KO2AG6R0gjeTPSMHD6haZaRnkAgCcjCBzm4N2I6uS0vLr2F4ewQkGuFWVgQUaHqwGPMEBKblVKyddcDPHxO2E0+RhUsNjATpjWy1WjYMlwJoxSoLNxx1rt7NQF27g1Q4ethFgGinEioW1zmcEavQFwrxSGM+bHp1VdZqIulmubK4ijUUwX8RMNhfT+5+PP2kAM2jT7z2wI5MZO/tk3/PSLq2mDceFCNYufQA2thxo+trnuzdsoAe+3vNC+fXU9mEC9gXSalilVQTsiz9UO6HBuMUeYpt+YRll4pegDCvrgatSPYtE+IAg9RKLqoHTxkyIRYLUS88IFpsn2szKc9HwJUqDBztlLYJUjxNnFE2d5CwBJ/PPADWaGDViy6mhdvPRJaoBP1ElyYez6/uGo/H4La9vmwiDotABcZbQ5dugOOr64tGh1uGNqDn+HOgD/KdlvetbhXtAfzSSJOkmWfIDUmhDPorgcJ5SO6dKc7rQHkFM25uAFJfUM72X0zPYatsGvNWRLrVy3mpKF1rb8NetCSBlWyu+bIsAKXOqRip4GR8pbUCpYqw9zVzAVklJdSFzteN0mlCUW97hhpRaysSUV5HW8U9X9FfB5u7hXsbldJc+x0zmCvclGOfBadTHo/E0KLV0PBpBpdYHSm1T5/PNT37tgR3p9Npdu7RiW/eTuefp1aqea2hv70z0uqWBZM9PYSMSnC+7gSMXOOlxNtbFYfov9JesP/RaUghiDK6h2h/qEKtFdFbQVlYHtpOwVlE9axXV2VlphN7Oc2lW3hGu6PxMzgIJntU6attFsaC9AYcAEZ3TpdawDImJjNcm1vhWlVjdDUtaRMfy+dnT205ez0J3TWqP6FreI9rbs3WeLrA4Hpww1vsoZkBuYzX+5uXdj5bF7kf3at2PHrX7EaSEwWTh/eXUIvGk32L/oy8mLuuBjJzdPrduSR+kmLmmPMlbIZfAZV8NLsN/AS6jw3n5vky0VZb3Zhq2n712SX8m3XvNNcvg8q2Ey7EIV91qcPlr4DKzBkiAyyHxUVZVuHIZ9Dr0y2lWf+DAgZlhzXBwCd2El6+5ZmysSroqjH0AI0bz7l8OY6ACI0b50CJ2pIs2sw9Y1K3noetoLehgc9XMVnPAO4m/kxbRwlCg38CbLxwgSM3UzVULC4Lxsg45XIsi5qqRiTOs0RcO8vImWY+2uym0yd5gzFZe6Jai/WrPcDqNP+UNFdRBd3Dce9C8IUGSIHcux95dxV5Kyc2ZktlI6pm7qcZNatBWbE6MHzA1EoWX0UWEMXhiA4QLVOfmRWhKnR8dUWdB0HqYKqVYDltXi3PP4mCKKuvVXKtuc4OvrqGhztfQoyJ8BN/gRRXzMn/XUG7mnHlefb+I/1Xq3J1m8sRy/J1V/B2pSsQzliqZFz3yRRqAaVYK8M0OODDCWbLxd7ZFSjAtqudbHwAfxAlUaAQn3Oszs/y/pAguZkhwRnAyt0WJhbA4z2ozMMFWodCiF15hfVeNM1qhz2RvezKXS7Z3qeRxBdyuQMDlDqjk+dmW7u4t6fIcJ47sCwZ93mCQCBfLQJtZsN3txIN9RxY2zSOztIHX5rAgfWwi9vJaqr28Xhxnh4UvRjuvHGBGmlGotNbydk5Wr9vVHXNF1DhvxhPJopyRABXhDTqn3Hffi+Wf/f7o/vdqnHnh3PyL838zXwKTgg5nz6u1+BdbWS91hBwi1bZb2Z8qBdQNitZ23SJnel38/LGRKf4A1x9eqWQQbS4egA/4GSfyAmJvTQGxa2W4zk6ZnZ9gRn8nXdaBvflKqX/7WuPO4ehV91Ybb7EVe6e+ibkCnabmsDTmUJi+ZL3SICvNQPEt79Qt7XgX3dJYGmAkTIov65qmIDFrOqfLT5/dsUVtnwa9sgyWyf9LsCyHAdRILQxvbT97jQoDymiyjCaud6aJ+13A4bk0TVQ1UgvTJ0CFTI9ohmvgGhtDncHh6gG4fCRGbrg8ZBg4iWRKdi46g2mWD7sMpBYjJhKcvIytjkXuWLICc2FOTHPZPfkV0NdIxlzN6yXYVARjKcxfhCt4VURkXVU0Au1Zn7bKA3OX6dR2vKtObaniL1vt+fyynm1kR7Vvu/xHYOlUmrc5L/4PwgEsWYHjl2DRVOBY5MdFWFxY83tJWNzvChaPCkvRapOcvOZ3GTiMIysgPaYaNLVgITsCP3K4Kvx41yUhW5UV3xnSotMoAEtanCzvBZxZrGMXgDEZVwoWlSuVMPJnMLKStJfgzypuFf4rVpiwiuVK5hQIKCOhg/XE+sh1fCYZS6JrKk2xgtmosSZlb6YkqEHfNLMx+VBDrBRzpQsWNtTQ4sWhhpbKUEMsIcPSWz23P4litrDpczinzJGXXbyuBXx4nILh0CWp5FPHYKAOs0ziLIxzTx9hwzDuuosOdGlp+Knylz5NB356282v/wWfP8T6xsHmdIHNce+KznFsD/CBcVmfLgZ8Maz2x0BsumJu8IbyotsFYqLUzE2Mpd3l9eCelkJqCUO10xxtj2a3WgKHNpiPzZp5h05zcYXtuaT33LXC8FytG33R/OS9EqwvHc4R9qXXkYlVO9P9q3WmB9TO9GcwSuXxvavedHSolvWnW0HKrOhRpzdc8z8PG4icZbBdAZJnJWwa5k/VwlZ/CdhCq8EWXgJb3buFjcmfZfAZVDG0KoyqPOJw9jE44+S+VeDEfHidHqPVxWBdE/B4BIubgMcTteB7zMlSnPNx3IGVx5V8VxhQM3PUWgC1OAamDAIWh0glp6vOymYeh52KXsy/G0xX8PjyeQYruHwl9oYqi2tU/HsY/o2kndyyGgXCKbktU6rjsrgpzaZK1aCO9SJOVkKCAZAEvEws7ifOkAp6MDslsJRsRMJJBAlnQS868+8K5UsI5OWbvUIur0R8dLmApuQguZn+h+AH+cyjvuqo2oMPPdRT+fe5Rx7OPvpo9uFH4JHxTOvFHwhpQWaeaIxcxbswQaEsFHRIMb+RFxKJFxQ3tqRxslhVDeTGUS3UxShRcjh1vno+8bRgMJoZPcIOnOXiZI11z1CzVfTG1Copg6laWIP2Pa+qwZQHuFM+F1r7Lk61ROtw/wPX7BrN5kbyD1yzfbQn4/5RS//6rX3xNeu3ujT79j7w6DP56eb9u+/52At9m+npmQG6JXN3+Qvd91030c/tB9b3D+fXAXwxtlrnv2e1zn/sGxBJpa2xaHNyT2WVIQAo6hYHAWwHKbdsGIDwhWv+e3CwGZhgrrjZtGicy7AqHCDWFuH4JEi05XBsvuaaJXAwSbsSDv9qcASW0KME9GASDZto3ZcCh0myRZDmVCG2ClhMhAE/cth6ALZ60oIdVcuhw5FO8UzJzQ9wY5qNcefQFiURbXifsxbuYsxsMGAVCUi9FJuEgSMoWb2XTZtfHfBLnNIaRFYc0OUo3buK/cT65YHuNuLEycdLO+Zd1Y55t9oxX9Rp1ajgpZrmRdjwJY3zehYRrGmep99lRjSfAxNntpu7Mj+OB1sWB5mURB53EsXqhBrcd8GSTlemZ+nM6nw0t6VSagxmZmUkTLY6EubIVb+8C2fCTG3CmTCnv3z8xLkfDI2OZNV50bDHvcI3SAe5XYXEw7q+NTi1T9Hg8p1s+Q7gwA42ml/ROxaKFn0cdjLmYJ2cFgcL/2BfjNOxwMatxzokVjRhkQqaulaM8evjeG48gUYeYyD8961SQe+sU9u3qnM23WHNskouXpeLgQdp7uyh2d2BhkB9W7qtfvfUpnXNPZmmlkRfX2JrW1MmL9D91+waiQw0dbZFvOHGfNPYjuT6pkQ4lAxFcvGO61pjHePryibgb9bzLlxgPe8xcuu76npveseu9+ZlXe8lndndGOVFjr953zvKtcv0vttO7d50if53oeH8Clxv/3+E6zOIayTGkVWc0fxvjC6cpsugu3H3yZsugS696/xyfBPkg+8K35Z3xLdVxReUamO+urvRpuruYhFR7DdFWlKF9GUQPzR/aHJEM3wZ3A8dYrKb4/884N9CuuFk1+DfvgT/VAV/8K2UAGZM08VQgB1uHPeZZnejALK0wqH3taLD1cIN0FYH2mAVGjWgw9WoppSr9MIbUzS0gNGtcwfMMbxzAqvEx1k4SsqBw5klJ4sv4v0qcGSCganUyxBrpaEqXm40xA5dd0twnbXB1Isv1toaTB2rD4sQaG64txd/yhsW50ZoVDq+AnTEO1D0kC/WUrJpCSUTVUo2pOR0phTg1Z8dQMIsI2EESFgXQRKGeAFohN/qpMpmchdSsY3/si1V6uKvFunZi+qyDs6buwknokqgBOA57lQ60iBhuyqkTfxGpK2JplePYfVSfDXqTqkFqTZO01KEv42sIG4bK1Utj6hs+pcBfBtdpO/32TltA038xXdxUrEnpJMHNTKpUkwNdPfWnl6wjEtJzo1JVotc40SterIxI52MsMSa3A2nOmBuRTGm2Cs0DV2OpkqmE34baYzn8+/inDsX7ZiEuzJCXXeZU9+WS7bncu1JMehyBwJuV/BS5/+x+Z6etmTPFXXhcFcojHJAAvrO01+SKOkE7v0wn7kv12eUOObz0gWTOj0Cu8LT6VLK3WgCIqeAyO2Y4WdykXNvzA663qF0YY2EbYGxYqxaGtsljZi0Jpvoq290t6Z4Jq/gwgH9WDcYx1Fm/nCsFX+RwpEMsB7+qaVCrkqhrE/N1seqDS+Ld1OBT6WojeYy2M4tvfdmcSrb37R1ckcks2PjtPbX2jWZzo7YwPpDPVs2Dm7c3dTgy3mtAp0ZX/jc5tbsBya2u88mxrJ79955sD64cS482r5jx/TGaHMk1NJXZ+s99sCk2i/fymat8HxKZYLAb5JPEW2Gd8qn5N4xn7JsOMvkfmf/jjHjjqHIiTtrh7SMGpsr6ZQGx6jpbm6/s1knoANx1gnrxb/8tJOGS0w7aVSnneCcurpg6L897wRNmUvOPLGe3LNpxdwT+t7z/z/GBxsaL4nPBrBUVuDzg/Mr8Imiv395fGKXwKdJxedZjk8DR6gICIUZ+/3XMUqohsglsaJgh2wC53E1zNAA0ai4vQK4hUgTyJ77lmMXBezCHLuwdgE7ajoyJR9XmS2gMlNVbMPpogcTQqUAV4dGpjVLSfau2JCM82IZJpkCHj6zOi4VLZIYZfgb1bkCYekymNcoP06DxQsrqbBLbcjwcmoUVDW4hBr0Z1zn/TXyr5W3aqgzUz4Oe64lRtK7bGYKK9dcMSwF6zXZYBRFb8wvTkURYYtwHso2sPzVYSh08Hx1Lsvf/N9YA8s4cY16YGJ1jSfOL67xI7aGFedoL1vDttoadnWNggHHOy1ZhXEbrnRYNXAXV1PtWVzvP4GfcNaMH/v3l0+bkesyJSNnH5wrElgFgqJF1AAb6Z1qIWDJwllIYpe9vA0Hp1Dj7E12J4MqjPFV2nIQ3huXteaocH+ztkGnOrujHuycAHgjB9T6xDAA3sxuWCEbUxX3Q70FHhuf4OCFI0HCmToiPScadVaHq87MO2sUNEeI0hzGhjnCDRNdlcF9cbw1Ft56azGkVw2AJtgAijsOtc8G/Ls+Un9n92jH9sG766978ANXHXlg346RjZN0zfaJ6b879r547JrZzV1jkYahRGp9V/+Hvn3zR+48tWHbke0h69Qcn63G5hE9T5xw0m+9xKQUvJuAF6yKYLro90bhxGIrL25Uc+0AlaLLiQe9idtqi9NU5CAaxvW8LyG+OFlFCTZhbMZra1CThyvHqqzM3iwZtOJa4SAsG70ijFUcA8aHbAYL8D2vM5tadQqLe7UpLB51CsszOIVFjSVdfg4LnvDaWSyDJ3dPLpnHQjPn/6dhQolQC5MGJMMSmB4+vxIm3yVgqlsNJv8SmFzvDiYmP2rh2qQqqOWwgTSpwPa8Wu/2kApbqAJb5PKVbgBy0LlQNASpoVropna5AvxFSdsA1x38uiOlFr9VK95Y9zTWvJnd9aHGCLeUeSO1EgmthuZKBtYtGdTTBYwbWF/Lwama0T3CdIV9L6ozfDQq/q+oNV8x1M2MAp7qKD9W7SVHMyUzl6ghnicH1F2AotGFqNu4GHXxkU2IeqMWSFUK8uvBVKmRS1QMEtlw/pBecLO7TuLNdYo6j8iTcH7Pqpu7osFqUfByvPtV0etg2J5QBbCK9Y1c+f4nw/mrVTkskjmyW4AtgFdW4Msc623Qm4hfnbegW5C9sGfsAmNQNl+gZFRxTbOEOO9v01aTSlL1FfYW/Rhd294of8QOuAcDkQg4xRH6W+oLfj5+DHtA1VzPCR6BRo1Q3YFK/K0m12Oq5HoIt+giUtEq8kSPidfLhTHpZZd4ksdgchKe5BGdilZfNX1qMzygIHJuH/pfOp+qGfrOHZ0b7m7rGeTPmYFjnm809Yxu7sUHz+vX39+5JjK4/tT19+HzhhP9bb+KHP5B5NBMXwe/lxctw7mHlbG36xKTa3yXn1xTV0lvuNBqLUpuj5cns97FEBv0LpYOsjkAcnPZMBvh788vg3XffwdWnLJTlFxuDqXEy5PeCU6QpEvh/Oiekzcth3OCidMlsAYq3LIKrMHLw1q/hK4loKsvUCWsbJFYg9g7gs2E7VLQt6jidhXwVfuNw/8KwF9P4uR3L4EBItCcKXm51GmsJsMxoeTGhFLJz0/iInrFmMUI18P8ejhVivFXi1hjetyvxmPD7MYhRqfS2PzOW7RaL/ZSvIeWmX/L8b9xhR3IZtiwuHRgtSk2QbZJ736KDWadLjHJJrL71E2rTLMR1pw/X5njps7D3UVWjsLFkQa0doqbIkjp9PIZbl7MKa82vU2dfutbOv12yey2w+KmLQdO37l74zohN9w/fdvo8FfFB16Z37A4u+3g/FNjvJYCacZjsG04dW4p1dDRb62GW7GMIAnewIVKkDXEu4ITXBm1Y212CMck8UhMQmLRvXdLb2EVlrgE/d+33DVYZS9OrOCPEKs5fhCsJi9GBFjG1Wxgt8tmZROgo2VtGlSWDT1nvYFNPkLF7HCyCXs4JMXMRjsUzGxamVmLZZVmI3vEvi42JclkrnSBItaexdtp1VQiR0U3a0IMPXgrrX/hgQe+WL7wvsTDbvfDn6FrPjX/+fnvzNPJN+nPuV41g02xlf4SuKkZ9ujjas+mJ8OcHEeaaTW86W4M3ramS3GrH+GPY3gxyW0qe9XvwdbeeBo7YrBgy2RdYLsWCeIwI7xXNUhYrQ/3DkwKh4cFFU1SweJ08ToHPxdwVqlInD7MNmKA3BSEP4hJBRrRshgt277Vo43iYkzWh7FG87HNu9uS29dNaX6m7euKd0TXDF2R7Ng1bezqSHSlWjq63vr4xplb//neM2fuPBisZ6HF48cpmT1w8LGDVyQf4PTh+eYeYgMKxfFenbUZZzQ0mjIlJ8+jh7nY4xnoosdixaEaTjYryANWVpBdiKh1P1Y7UAUTqKwYhg12VyJYjBhuutyId/ESafUlGez9KzLrS/LZQt2KvDoljwuD9Hlm97ew+yyLGd7yy6a2V9rVjZU7/nDQVJXyuKpEsAUYtAYlDwlj9GWw0yWyniD2IjPCizrRjqWY8Iak1Vsj1rSYYPuJkdvceBYMbE6jhbvyKyzph1bYzkvcvSWzDkjtUIP/1u9myV8JBtq8OD9BXODjWKvzE/DWhLP0+b+aY/f0dcPn173j591Cl/r51+g0vV14EWR7L+9jL9kW7ziN3f68DxjHfJjZaEitjp0cvNEa71XvYVOSFtnitZnx8GGd1Rxta4+1Z+k3pm5q6sse1iajzSl1Zs63Yc371DWX3eNaf6FkXVzRqscuGMGRr9wfUhGsTOAuv0Pkt49UF5wZp3dlj+BynRsGYW1c72KI3kc+9Juv57vsep9Wl1s/uPkmFrfbCvi9wfCLkL2cqrI/oxKWdQNFa2hbmaRQz+GILaU03s1Fk5frnQU36zvnlFeIlF+N9rnlF7bOTFQ3oyP7L+q7SLKjujW9h/jWDNa+4fplP50WRBWPfUg5kNGVW38GORZV+qEErsOKw0UsaqiJmh4tKmfB6YpUqVsUrK6wepPKZQTOLb+w/5DeYYi2IdwzE9/gbxClmQnY7sOa6nb3qW/WD+HeAw4XQ4LI9v7/NQ6+d8aB74SKw+K2zEx8uvfwIgvlat/gefk9chV9lX4M5GQnu8eEaCJ63revr95gAhv29bxvX6+p3FOn4iD/3q7bd+26/Usf2LbtA9tQMoD+HSW/z/rdQ1hVxKotpWCGTSECyigWbzpdvb8sOyt8BI7WsoADCDDSxmZfO1jRk9/CpiYsubfsaq98ybG25Ej719vwKfm1trFk+0hyXVNHR1O0szO67Bnw/gLpoPeyfvgIoTiPh48nMGlYThbrxLR8JjmTaqxq8guP1Uy1Qdr9JXzH+aXfIQtp9WsWv4Pid6i99n8J3/DYY2qXPZtRDfRaI9xDWslH1fs2YdgHKcJ669GSpGk0rXQZnEOD7w1pdVIdGzzYekE2plljijtdCLPW5nAIjayw14jFEbIG86d+DED7q3PP9eo4wjB2NseaWGczppJ9bBKym5nOix4JG9yWi2Vz1UG9On3EE1FHuC3mLhK9/ZT2j7rPnT62IZ8fXLvNRoPlH1D65r/Ztw5P5vOz1xy51/VPaY3Z6zZltNfdOZ3L7ZztMzrrzLnpbWM9+27nvR0X36RnhHHhCeDJIPlWVXvrFxSjHVhHnRikM6JSTafZoGR1OsOq94BCpkJlHKyGyJzVXlAsFWN3zrP97EY+ZrXOgXcYMtezOwwN/FvlstUh215SvME3Zc9L5DmzxWrzeH111eGoK66we/8EDXzSh1NSTHY+1IRVRYpZ3vUNXkkDzYAlhDOZY3qwPYBD3tqz/rWZNr/G3zYzbNCMpcY0BuHo8PAbb7xBc2emp8+Uv/b+KxXlyvcD76DC+wn9Cer2biki4euyF961ABEDwl+xyvRG8gi/P4Mc4nNRFVs4U71JQ31KqTOhkY4982b15ubvfLsGjIhjkV0j2IW2kNeWVAIWfv9zL4420hnA+GvEIKIvWM+Da+Z6kHVGT4DLuoLBq97/aLVbPDRVAo7gALeMTW1ub3MHg2NHjhymcMjb28cch3FQ8fDMbmnSsmuE3ffh20MtLUMtb79IF9goX/V+ey3s/hSN5LZFCjRUyjmW3a3Cmyq6vDpb8r9IBAxc15k56p4K6ijMG/LV21lcAkvKK0zZyekALJOI5ejhw4dp4+E6o9HibVyJZvmvhW1vfwInuxDy/wFBD/VZAHjaY2BkYGBgZInq4vPyi+e3+cogz/wCKMJwbrHBHRj9/+d/NqYQ5nwgl4OBCSQKAGLWDQN42mNgZGBgfvEvBkjm///JwMAUwgAUQQHPAYW3Be8AAHjabdLNK0RRGMfxc8dCYqOUjCwmzWBxUV6ilHkRJsRtykwTiiyQGRuxsGAtKxa2FjYUlpaylFgopcZeKX+AjfE945dut1l8eu6cec59nvOc62yaSChnjM87dpDBHMKI4gsP2MMsPNwrvmARKSwhjgHEFNMYQxKjyrd7d7V/DRtwVW9FebZ+EQfowxTyvriPGfXjqnY3FrS/Q7ntqFNORP+V1PMq1jGCa0wjpziEhPpJaT2Lfq3ZnEGtD/niofLjOrvtqRbD6mEC26GcY1R/3Df7gnq2NXqUM48jtOIck5qbp/wrXOr3hZ4/VDupeb/hSe+xZ2iRmO47XF35R/MqBuQDGnz3ELSMLp3LL6I78zTLahoVEwHZAP/8gzzFdICrPTa2oV49neHUuTWmZsuY/xg1xpRwLAXcoLdyd56P/W6b8IhXyeis1gma7V7iHZ7te/++pfK381l57jTuLxeQnwN42mNgYNCCwjKGRYx1TCxMy5itmCOYK5hnMJ9i4WCxYwljaWGZxcrEasfax/qCzYxtBts/dgv2dRxiHEEcazgOcDzg+MIZw/mBy4RrAtc5bjZuJ+4y7ls8AjwePE08W3hu8ZbxHuPj4fPhW8H3jT+JfxL/KQErQQZBK8ECwXmCpwQfCPEIKQlZCUUJnRLWEM4SPieiJ1IjaiBaIrpHTEzMTaxB7Im4jnie+CkJLYkMiTOSSpI5kjOkiqTWSL2SlpBuk14gwyXjBIR9Ml9ki2QfyLnJZcj9kreQP6Sgo+ChUKDQoaik6KI4QfGOkppSm9IiZTZlM+Uk5UnKh1TYVJRUdqi6qbGo5antUmdTj1C/phGm8UTTTHOO5iMtNa0irSfaGtp52rt0jHQm6QrpJuiu02PSa9Jn0pfR79O/ZCBmkGJwyVDAMMzwipGX0SFjJ+NnJtNM3UzvmbmYrTEXMW+y4LNwsCiyWGXJZVlh+c7KwqrJ6oJ1gPU5GyGbOpsrtlq2XXZ8dkF2K+zl7KscuBzqHJY4PMMBvzgyOQo4ajg6OFY5bnJ85eTntMFZyNnKuQ8INzhfcr7kEuPyweWPa53rBwDS145DAAAAAQAAAOgAPgAGAAAAAAACAAEAAgAWAAABAAFbAAAAAHja3VrNbiPHEe6VncR2YiO+GDkFgzUg7wIUV6u1HXudCy1RK8UUSYuUNz6Kf+J4hxyGM5QsIE+SZwhyzDnHJMcc8hR5iFR/Vf03M6S4CgIjAUGyOdNdXfXVfw+VUu+rf6g31IM331ZKfUBvHj9QNfrF4x31nvpSxm+o36iujN9Uv1Z/kPGP1FL9U8Y/Vo8enMj4J+ovDxYyfkt9vLMv47fVL3ZGMv6pOtj5vYzf/fDPO3+S8XvqZNfM+bn65e4fZfy++tnu32X8V/XBrtn3b2p/91+qoRKVqzHxM1eXGEXqSvVUqlZ0bYjfh/RrhFGXrqX0fUa/RiqmOTN1TuMrGiW0fqmeqrrap89fqS+I9hEh0aSRT89QY1p7AS1e08Gq1+EhKnDxDSTK6G5KckUBV12ibK7o1xdqSrNy2kfPvbb36jRb350RxVdET8+Z0NWEqA7UAY0+wftzUNlWwlCqmHiMiH5EtJf0rVfNIMErupbSfhEhMqLRAPN76pZW5JilV54Sx5rvpVrgkzU4AuU5qE6x7oJ+xfZej0Y8k3ef09UnWB9ByinQi0B5RXc1bzFm1+/FTZdGWjMR6bZOnydCdUrvnOY+p92fqBu86kCBd6iD2ozu5bTTQpBd0Fjzc4X1EWlCa3afPNCMD+6N2qPX4OkxdrwBrlOxwAzIXQu1Y1iU5rFNFGbg5aPAAj4CHtoHE1AwUmUV9OqQ5H/bet5V7+Ddp1nMvcOoB45zQlRL4OTT/qblnQMNzcEKe/IuhsceSdOi7w7sZB5QbgUUtNaq4sPTSv7C3Q1PQ9hhLPxodBO6cgPajIjTTkLfKUbX9I4RoQb0OQ6s5xIcN9TXGOdkf1HBFjPaVSO5gH3UwX1C3xr5K7rfofUtK8HeD/LSOztNdCmKtyFXh7770MQp+bC+2qPPdXqIiJL25U+xdkxoLUnn2ipuxcf3KTb/sFLqd5d8tEk6O6N81aKRsRzOoano3niisdS7LVTHIdbmY1gDe0MOK9L+G5P/cqbLxYq0DSRkddqeOEvqz2uxywViD+/EvGj7TcQSjefHmB/RfcPVAvnrO7o6hM3VPC5WdJejRu7J5tYOwTXTZd2O6e5EVjhULmmmiVwaA+c/CaKQzumxSD0UzmeQn2MSRxbf75hD5v3a4nEJ7jRPY29uanUxAQoaJ0bzlY2CN4gFQ3ipkU/zryPtrXi/RmQqmhoFMWBmOfEj6wJzcxqz/U/h1348cJG0GDfZho7hY5fQoo48maeFcsT0+WZ8mOuVzKiJZa1Qp5grM9QxMa2OC3ItpaLJJLoPaGVu92KUE6BzKVE0hS7Nb+b01rPuOSSOECsTiaq3duYMfCZAMUMm7Bcsjm0gRkZLRA6z4xyUOGPEiMLO2o22ef0Qsw06A8k0iUVEczLAr5G9tgmLMDs62fy4z9xlpewXWvBIsLgESmbVslRzzMWKswpsV9YeBlshUo2zs4Kq9YzjFDbJEWjpIWs4YXyX0OkYNlHO7EZGv6YwdaCJHqGl+/xq2r9D7FhCayb+TUQXZY9YSvXEHlqsMaqrAV1bMdZGskvExURsNw3sL6W1K48XFyON9Jm12rwC99SreGKMqzXg4sURZaVjyrltevfp3UHm1Xcebqi8HgoaE4k/RhLDk5bd5ZIJ6hBGoaxR34ujyvr9RLxC7/WI1j3eGn1jh0PZcym4mxrY+GAmGUvHcGMjcRDD/bgxFm90dbaTsCZRIRY/Dmsy3zNCXbs86HTzcKuOYZ0ujFX5/p7BN4aFiO1Lr39PpN93WhlWaCWzVb6RgXXj89+RFTG4SEr13F12ZKoQri9MncBWtakv4BpggRljLyplQL46Et/HDn1Zz0q5cDtZN2efmdQ+hr9LZBYXA1JY3Ei8Kpc7NRsLtF4HUh3lkNas3UMNHVYbZpWra1LpQ3i2i7iTgpbKaBdr2s2WULMSDpHD5jL3ykbkGXBxUY5nmwqzGBU3WYfBPQK/N8jac+TRJVYZe/a12wB2U+y2jSYzSDu32W1sJRrba5y/r6SunNnrOex9ivp1KGjdAD/jl+VeeiG8pJ7mIjmxKtt66GXrsap7nUyTotEZZYge+rcO+rZdeIoeH5XyRxcczeBtrn/jqMpcj0WHjMBcuKsFdbjpRrh2vpLuPMQ7lF2fZeSSpV2F52JY0TLXS+92WtlzAVMD30rNwjS5Fh57HLo6MKyTbzdWhH6XwvVssrHKXsFai3fd2UP2mtJytDD9XNFOJhKNU1SnjCxb2Eg6rRSZ97m1mqfI1W1UI36NdrePzsXGw4gTSwSIZU+ufVfiI1VxqGajWTkC8Q53xe1MNBj2cmEPwnxpfU08nzmA9Pffd3vdFfkr9yX/nR6kdkcXMkb3Pg28z8Qk9lC/K+Wzhuu1FQdX0LHUXK6br67+XK2fCUW/cwvruRF49W3UVEW57LMH3bFlcYT+XroFv/KboqLTK/akch95Z3lTuWKyhp9rHQYLQXQB2c0JzkyQ5AxSRX2G/M/XcjnNiGGTI+xmtGn2MxKYbMr2ySdofsW+vj9PBdlwnxBnrvRjqbuvMfOmsuJaSaXr/OeZRI90C2+5j6+shH+zZptq2+8/GKEMUn6Pni5GbZ17+TqX06PFhmwY5r8iLnz+zn38wkZb1sVdVWrYyzAN9v+wnp7bs5iFyDGuqMbZImeelRh05vbpBVvHwp47zNfUHEbbfi/6MZA1/fm8gHio3237xDTIOH4VV013k93wCR7n5PCcwp2b+GeLM8wZ2/pvhH0zqWuWUs3zCUgOHY29WHuXxdfE7nTEW3jZWseJV+DvRuL/VWDl5ZqQ6f1nOPvReD3SyyCr+OcU9/MgZzufBLazucopV0zMWVU1Vdu6R2LKK3iYsYt1GZf9IpbTkNstzzP86tDtFFriuh3vOjf7/z8n26bL6dsup00WbPqZzc/7BqiWU3vGMseTl8TT1TXdjeVsf7K2iy5WP8WqunxayxnfP8vT3dmhahHvpySFloV5P8GzNPeUrYfnA331kmae494p/vOgn1d1KM6c4lzwiK7ozrcn9x/CAl+i0zuheRegxTTO6VPT/laePUT4rX99BTSPsLapfivPxHqg2qFxBF67ePLXlHl6hZbjAjK11Qu69qXs16ZV5knhGXhhTvt03e0acnWKHQ1njMwhycB3G0T7FPQ0/zUgpcdty+excNoARppyH88pL4D1Oa5e0HeX5vFzywZkZm7bkOGY7rMsTXDAmmCODvEs9FvMeEF89cFFFzbIM2uQ8Bz/ftHr9a5f4Spz1hEtn6OOMVTqgiXzofH/xu7cg/wtPCUyFlLmI4KmW9j1HFpoCvYNeabpo8PYOwus4R8dDfD7wuqgyK+hFuqgygbMDi8gRRN4tDC7hxOKQ1Bq2fV65Tmu9z2abN2s+ZaH4aGcXjTV17RrUyynAYRCKdgPNP9OCsa5IZ+HNnr4Om6LDg+tRjuwpTIqL+FxTcxqQB89i8IxvPRMOL/w7Mjo8UKssGM5C/E13mLmbRMhmJbZO9TgEZ5yt4TDnkXjbrocvV7/fz5PkHOvUI/VsX5Go83/CPP/ZfUSp0+uguV/dB0jb3LPof/nFanPcO9z4uyAXs+pznhm/0X07N95l6kOAAAAeNptz0dM03EUwPHvg9JC2XuLe4///1/KcNJK6957iwJtFQGLVXEbcIPRmHjTuC5q3KJGox7UuFccUQ+e3fGgXrX4/3nzXT55L3mLCP7G7zYM/hcfQCIkkkgsRGHFRjQx2IkljngSSCSJZFJIJY10Msgki2xyyCWPfDpQQEc60ZkudKUb3elBT3rRmz70pR/9GYCGHt7toBAnRRRTQikDGcRghjCUYZThws1wyvHgZQQjGcVoxjCWcYxnAhOZxGSmMJVpTGcGM5nFbOYwl3nMZwELqRALR2lmC9fZH/5oK7vZxQGOc0yi2Mk7mtgnVrHRKtFs5xbvJYaDnOAnP/jFEU5xn7ucZhGL2UMlD6niHg94yiMe84SPVPOCZzznDD6+s5fXvOQVfj7zlR0sIcBSllFDLYeoYzn1BGkgxApWsopPrGYNjaxlPeu4wmE2soFNbOYL37jKWc5xjTe8FbvESpzES4IkSpIkS4qkSpqkS4Zkcp4LXOIyt7lIG3fYxknJ4gY3JVtyaJFcyZN8q6+msd6v20K1AU3Tyk1dmlLlbkPpUDqVpe0a4UalrjSUDmWh0qksUhYrS5T/5rlMdTVX1+3VAV8oWFVZ0eA3S4bX1Om1eELBuvbEo+7wus07whp/ANbdmiQAAAB42j3NOwrCQBgE4GzWbBLzflgKUbBaW/ECSZo0aiFZsPcG1oJY6ln+WHk7HXXdbr6BYZ7sdSV2szryNv3A2F0NrZD9jFLVUblDOKspCXnoLeJVQ1zW5FbNgy9t+YUA3LWGA4ijxghwVhreZ3PR8AGv1hgDfvIDo0B/hGiD2JYDb09gBIaFYQxGe8MEjOeGKZhMDDMw3RrmYFYaFmC++FNRKd+my0zeAAAAAVJ9gF0AAA==') format('woff');
-}@font-face {
-font-family: Source Code Pro;
-font-style: normal;
-font-weight: 600;
-font-stretch: normal;
-src: url('data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAGIMABQAAAAAxSgAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABCQVNFAAABvAAAAD4AAABQiyWUMUZGVE0AAAH8AAAAHAAAABxn9nOjR0RFRgAAAhgAAAAiAAAAKAEXACRHUE9TAAACPAAAADgAAABIM+4scEdTVUIAAAJ0AAAA2wAAAYQFdPuZT1MvMgAAA1AAAABZAAAAYHQa0d9jbWFwAAADrAAAAYgAAAHin9BCKGN2dCAAAAU0AAAAQAAAAEAHrQkOZnBnbQAABXQAAAGxAAACZVO0L6dnYXNwAAAHKAAAAAgAAAAIAAAAEGdseWYAAAcwAABKAwAAipT5QWKkaGVhZAAAUTQAAAA1AAAANv7EqXNoaGVhAABRbAAAAB4AAAAkBjQCuGhtdHgAAFGMAAABYQAAA54OG0STbG9jYQAAUvAAAAHKAAAB0ttVuoxtYXhwAABUvAAAACAAAAAgAgYBzW5hbWUAAFTcAAAKkgAAKAIjO7g2cG9zdAAAX3AAAAHlAAAC0c0dvQRwcmVwAABhWAAAAKwAAAEijHwg9XdlYmYAAGIEAAAABgAAAAaAXlJ9eNpjYGRgYOAAYhYGPgamzJTU/KL83DwGJhc3nxAGvpzEkjwGFQY2BhBgZGACquRhYPwfxgDShVUUAKcdCXAAAAAAAAEAAAAAzD2izwAAAADNFZ/2AAAAAM6jMN142mNgZGBg4ANiCQYFIMnEwAiEz4GYBcxjYGCEYAAasQE8AAB42mNgZGBg4GIwYHBjYHJx8wlh4MtJLMljkGJgAYoz/P/PAJJHZjMWZ1alMnCAxVIY4AAAfRoJt3jabZC/DgFBEIe/20MhIiLnIoqrRCmhOoVOVEovwCUqRPypdGq1yFUeQCkeQFQewcswt7uEkMnuzH6z85vZxQGyhAxRnW6vT348WE4JSAnn8cAV56B+zm4UTWZ4o/kgIlisZguqknllk93EKdLk8ESxRpOMZnXtFR3pashUe5eYEzccze5WIS+rYrW27Dhy1jdcrVHAf+cderaWj9qiJYYm54RjiZL5qrQl2rAXnZgDDS5iIVexlq7xP2rk7TL3fzVDlby3LHHhi5tuOcmvWbLSP+RRwn8ClQYe8wB42mNgZnJnimBgZWBh6gLSDAzeEJoxjsGIUYGBgYmbjZOZhZmJiQXIYWdgkGBkgAJHFydXBgUG3t9MTO/+szEwML9gXJLAwDgZJMf4mqkPSCkwMAMA55IMNQAAAHjaY2BgYGaAYBkGRgYQuAPkMYL5LAwHgLQOgwKQxQNk8TLUMfxnDGasYDrGdEeBS0FEQUpBTkFJQU1BX8FKIV5hjaLSA4bfTP//g83hBepbwBgEVc2gIKAgoSADVW0JV80IVM34/+v/x/8P/S/47/P3/99XD44/OPRg/4N9D3Y/2PFgw4PlD5ofmN8/pPCU9SnUhUQDRjYGuBZGJiDBhK4A6HUWVjZ2Dk4ubh5ePn4BQSFhEVExcQlJKWkZWTl5BUUlZRVVNXUNTS1tHV09fQNDI2MTUzNzC0sraxtbO3sHRydnF1c3dw9PL28fXz//gMCg4JDQsPCIyKjomNi4+IREhrb2zu7JM+YtXrRk2dLlK1evWrN2/boNGzdv3bJtx/Y9u/fuYyhKSc28W7GwIPtJWRZDxyyGYgaG9HKw63JqGFbsakzOA7Fza+8lNbVOP3T46rVbt6/f2Mlw8AjD4wcPnz1nqLx5h6Glp7m3q3/CxL6p0ximzJk7m+HosUKgpiogBgB1dIlzAAAB6wKOAGIAVwBOAFMASABbAGYAmwB0AKQAWgBfAGYAagBvAHQAeABWAEUAbABKADsAQgBRACsALwA1ACECeXjaXVG7TltBEN0NDwOBxNggOdoUs5mQxnuhBQnE1Y1iZDuF5QhpN3KRi3EBH0CBRA3arxmgoaRImwYhF0h8Qj4hEjNriKI0Ozuzc86ZM0vKkap36WvPU+ckkMLdBs02/U5ItbMA96Tr642MtIMHWmxm9Mp1+/4LBpvRlDtqAOU9bykPGU07gVq0p/7R/AqG+/wf8zsYtDTT9NQ6CekhBOabcUuD7xnNussP+oLV4WIwMKSYpuIuP6ZS/rc052rLsLWR0byDMxH5yTRAU2ttBJr+1CHV83EUS5DLprE2mJiy/iQTwYXJdFVTtcz42sFdsrPoYIMqzYEH2MNWeQweDg8mFNK3JMosDRH2YqvECBGTHAo55dzJ/qRA+UgSxrxJSjvjhrUGxpHXwKA2T7P/PJtNbW8dwvhZHMF3vxlLOvjIhtoYEWI7YimACURCRlX5hhrPvSwG5FL7z0CUgOXxj3+dCLTu2EQ8l7V1DjFWCHp+29zyy4q7VrnOi0J3b6pqqNIpzftezr7HA54eC8NBY8Gbz/v+SoH6PCyuNGgOBEN6N3r/orXqiKu8Fz6yJ9O/sVoAAAAAAQAB//8AD3javX0JYFxXdei7b/Z93uyLZkazSCNpJI00o9FotNuWvMjyJsuy5d1y7Dhx4sS24iRkj7MRggmUkvw0MYFmYQ3vzUwIhAImpRTShf8puL8UKIUWEEtpWiikJeN/zr3vzSLLSfrb/xN5ZvRmNPecc889+zmP47kox5EO/glOxem4bolw6eGiTh3+RUbSar4zXFTx8JKTVHhZg5eLOm3kd8NFgtezQlRIZoV4lBh+8qd/yj/xxtEov4vjeO5bl35FzvLnOQNn41ZxRT3HpcoqI2dWp4hoT4vcRUljXsJ/JbOG06ckm31JtKUls31JEkhKMtsER0ml0/MJb4Hr6c339Wc8bpc21urM6lRx1bcyUxn4CZ9S2aftm5O9vcm2TIa/5VTlq2SA43D9a8k68k/8C5yGM3EJjojmtKi5WOadnFedEnm7ZCKpsp7+JllICpZwZm0knszTx2sfUYWnwr+mj/wLd//4x3fDP/a9m+HByj/MBbkI2cMVA4BX0e3xZ7NZkUuXXF5fMOHNSkSzVOKFplDCmxHV6ZLKHo7gZQ1c1hqMFrgMpDSmSuMavSFV1JnMmUyGiM1pMXCx7HdxFoDRb5d0CCP9rajT46d1akNK1NslD7zhZm+4PfiG2wlvuBlWZvqGFCUpsT/w8tjZ30Y4d8r48tjDv92BL8SAvcQHdM5USUUftfgIq5UMfj288NhLRo/Jid9WsrjN8AE7fRToowsf8TNe+hn4Kx/9K/jOoPI9Tcr3hPAzpbDyyQheV43beRWSwC4grZpC4Uj3sv/E8QDueC6bj8O/rI7+c8fpv3ge/o0ReGvznH1mj3fCfcYz6d6yyz67z7fWd8a71rvljP3MH0/fM/0C/AdPfwz/Td/DEW7q0vt4Lf9Tro37ACcm0mIyK6n0S8WECsmXaAXy+dKSTb8kOjJFmw8v2uwG4NX2tGi+KAWFJTFol1qBpraM1OJaEoWM2GKXtMCqUWFJ6oDnoFlwiKQgtgqioSC2OCSVr1AQtYIYLohRh+RyFwpwihLwIa4g+oQSMbujwN2izSG6Cj29Y8STzfTn+rpVub5+wN7t8eq6STymdbvCKmB9nTuea53qW9iRzozNz4/t2rh19+Rg61iqvWds9/zY3m1bT5zasioeaeqIJtdnxrcbz95rnFwT8sfCvtZI21R2fN78e+81IQ9rOe+lX/Gr+YfgvFs4Nxfh4lyKK3LFMJ7RpI7bBNyXSpf99FXJ7E/pU2WBXXanyzr6ioidaVF9UeQykhWoYaU8KSVcSyVDwgPH2QkXnWnJAE8Ju9SO5IGXsYzUBS+dVkYpg1DU8aZCoSAlPIKj6As3w2uxXRDjQKlUEiQAzwU9SCO/AJ+X3ILgKBvUzbE4XEOKeXWqqmDIuzxIvpizJiryXhuRr3o/2/Hs8Na7t267c9tMvD9+e5m9Hn929LM+/H3+xeTXyFemd+2a3rRnz6Y++O+qyqz8K9n1taEX/4FeQ/qpuGag31qQl81cO5fhHmSUEwNZKaFeKup5LiX1aJaImEWRI3VYl0rRDg3QhAMm4tLIL2KHXeoGQpgsS6LJLrngpRsEXx88d2gE4Jw2oEO3UNKHE3ZE3+QQWwuiS5AcTchEiTDQr6kg9ggvchqTv62TkgNkZL4VeCeL6Ft5ncfbn89q4UnXmtTGKYGymTy8drq8QBLgrOaRXGrHxOppd2eieXBbt+fa+NhgZ2j1+q1X7b3hxEh3unNuNFPwz2YDzZ8Y3tE6Oz65f3osnOuN+LetWXf4noWkZb8jM3HNXFehdeN8hjhTfUODo91w1n4EsvcUlb0hkLzaOskrP6Fkq4rcH9XELPztK5e2kO/w3wW94YS/NaZFclHS2pZQssFf9NvzXivsqVf3yrfHD+zadWBczSdezM298qtX5nKwN4S7Hf7+A/V/r7oo6at/7x0lfa3JvMeuu53+9be/fTv72xff+M6L9O+nuCMg33s5KxeGv7fh35fVTKLaYXvUKiC9CVUScFc+6817dV5dUpfMTzmfNY4bn3Wevzp35kzuanLjUO9LL/UOTX6o5QMfaPkQR797M3eYN8J3m7gZDjhB1IGi0C6JmkyRIyhxOCMoA8LhS6JC4QNKy3hR5DOSARhFnSkajPieQQcfMxrwpZEzVPVXLgtCA4QkyInNxV3F4i7SPPv5z8MPXfvzl9rJU9xnOTvFS0iL/EXJYl0q8hb4Ho6Hr5QcjET9eeQWhZG0us/fRTSGtv6Btlz+qv3vy15N0h1tvVvW7bk7QnEizbyRLMKp8CJOiBD+I6D2JI0MWNS9mfwRQDMLn/8a2AXv4b4AlkaOK+pkq8CIGq72moh63PeyxsyZgGfYk2RgHIDHG0731wbmBgbmunYVCrsKCMfcpYM8z38F4OC8JEvmyIbDlZeeVh393RPszI7DmfWBzNOBPeLlbmZrSyYQ+N605DRS4wMUAgE1gCwHLIOKVkBF6+Q8aqpdgdCSBnjJD8+CHs4pr4Nz6hYkkxGeLXButXg8vSZ4S8PBJacgWfQFFPGSmhQKyL8AvV0bUzGx1OyQsRm/43t33Pkdz7p3rKv8dqxtsK1t8MNk9CMfqbzyAtl0x5kzd/yi8pvxZHI8yfhoN9ggbv524KNNILcRDwJ4GDKU5rolUZemrAM7bDAtFQ08ZRoTMA1PmYYHpoFHNWMdycADS+uQpYGBhHgOpIaQde/+xP2HV80+uZ98eL0Qf+MH+3HdYVjXDjT0ACcXzbiuUbUkutISj4TzpkUBrDphqagRqGljhhUFDb4ULLCWD/ZPMoKSlPTWAkqzEqcRPFR0ORVe6x8i7mhulOT6WuMx3fDBdyzcfN/ZuXC50vvC+8aGJtfxrQvHd216/oxuYc3v/+FEdmgdpUcG9tYCcDXDuSpGEC7YSeAhyQCnC4xNK+wwQhhNi9qLUpMJhG7zRUHymJakGAKlh0MtERCtkj0Cr0weeEV1lFCnl+O5DIMqyYDVucMEQI7HMv0b9w9P/9XnR7Ib1w4fOnnVbfes3vHI0fdvnlrb13nd7NG2ruF1W+e3HOlS22eGZ69CG7IFHtr4OzgjyKjdXNGA2gPEgTYrmdR4zkUeNtCVFg0XRXNG0oNlrMoU9XTv9FogqoEagwY8+27YQL0BQLUD45k4pld5QbShQsgR3EkUCMksbGvcSnQtJHH/7t3XffWrRKMxdRuf2UzeVbl7/pln5h/3HXVM2Bh/ZYGeNuAvP3eGK/rq6OnQMiNdBcQMUGK6gYZB2dL8/L/nqIFp7raKpgsayeZ53SraLwBc9u5uUjKZbXbZviOSWwuEtlipSeRjJpFeKBIjGElVmjNqO6PuqE7mj3gsm9u2Y3TL1Gh+LO8iN1d+Yc2lD972nqsenp6aWH3jWCJOBg894T6ycNXNSOcJwKMJ+AJtnKu5ohMx8QOFw2nJoqUI0RPfTN0Rk53q4iYgqB10MZjPwClgb+hVFie1QewC+EMIcNgPsHN2PPIC6AJR7xC1BVEliBpkZZSboHJBvdagbs2HiYzQxJOnT24azUxOHVBv2TV//b17rnvPDcYNA72rh/PTJPXCp9av7Tl5+6YjB/ctfnB+25ZVNxZgP1YDMj563ieZJ0UFLW4CnHL9RUkHp1x2EEBtFPU6yimyapB0IKnAIuXAsYMXqgKTyGAgxEdJfjW5OLMrpr3JsOtqPnho7Z6PffyBj//z3XXy0gMWc5Y7zhVdSL0AkK03LelRwPdRsnlBUGrwNLXDC69s1liXxBBeE8A0zsGFdjBqRB5NmrIrEE/qmU0j739vQHCgHSMkFTsmn6uqn+opY+YLtY+T3XxSC7+iFYN0Hr/nwOLu/ScODI3fceK6e45Ojwyutgc6OsNqtU61I7Zh49hgtqvwh0dG1SO7pvft37x9VB2aHpk+dGh3ejDb6Wr2ugUj4XmS+Vln1p8dSvWnkXeGAX8n4O8CfXkNO6Mgy8E9SEs+IEIIeEcNRIhQIniAdzx2aiBogXea4dkDxAZ9jdYtcE5Zb1E5AujLShY8rcaC6KC848OTK4aAtbiCwj3UegUjBdClqrifGm7oCwzfs+f6c0/+w6bRLPLPtrnd110LbDOO/EM+s3fx/OMviJR/po88fuPgxq1bAA+qb8Hq0nECV2jQuCAZyyZZ3zqQj8CYL1uorgUZpGhdZ4PWrZnbTP/KP0wNk5dTg4OpzsFBpB+1N2BdOxfgtnKiP112yWsFUU+UPWwhj120IKfwwDJ8erlFgoeRB6NfcvqBjB5BcoFLtZKNUoOrwVpxMPAajBb+/iqUKOvOcEnyL/xJoA/nzLW4NfD/GXJ75R9JkMRnfnf8M+rPHJf9fhHsnH+gMZKAYulQhYtnAXUNJVQejlYLM3gqE+SPxNnZ74PZA+schXV+wNbJ51rgf437KAnCOrcn6SK/m2HxhWOwXz/hPwY2ShRPXTPuV5DGTcD5Yoo2lhZ9F6UQhk5CPvArTHDyQnY031D7SnEMn6BMtcAhEz7NG92BYKQZj1zIIRnseOTcQWBOjcmLzAnKgqupYKvKG28dVTFNV3Oljm05sfO6eG9PSH1E6+9OxzMdo/1hFoPhZ+d2bEyMdHUOxlpXpzvSvkRnX6VfDskwnNouneAT/N1cguvinuAAfikEVoolLbVplsDTlJw6aoWpdIBcNz1QAXAWA+xAobMNnjbwIVg4ZS0LjmjtUgdc7wAdZJdDJLgHaXSgWkBoq7yhmAVQlpwcO21aQYo0I+qWEFyIFMQ2QTKg9ZZyFIFFqdbJM3YS4knQlIy98kzCuOkJ9CLPtdCXOStpe/7eY8fHDWrP6tb8hnvvWj+567a7DkwPJ3bO3/VJoo9HunrmNvzu83/6wHWVi/2hlk1DG7fabRO7n3ny8Y+2D+X/5zNN0cz1li5GHxCt/AR/jtqmG5lFJ6qyRQKeZFmr54gFxApuPIubgbQXdXYwKEEtO1m0TK1DX5noDVTCEBT4ZkAo68w6ARmdM5tsTca1Otc3H/rmbZlvZzc95/XF1IFm/twbpySJmLfuvOfaE8DZ+wCOJMBhAYiC3EmuaEGpZ9XDmUSnNqhfKrtdFh7AcSPTN1FwrACOO4MRAITECM6t0S6q8Uz74B1fWlKDiRCCt3xWNP10uAkuK9sVMJ11aB8HHaIa4RWyGRrpoFozmQWDK0Vy7Gnfl34ylP+9h07u2/b+929bfc+dk/y5D/Vusar99x44tPvEVdsP7mDnGeV2L/jmbm5E1vhWw1JRhfDrDQC0hyl7IJwXTT+rk5p5aHxwWjueB5VjuR6v2/3hj91/7dZVuYntR47uWD80vv3mez9KJp/6zMz63N3X33D3qnUHSrifG6l9h/tp5QZlT0OvUNGKO2mjUOhN1Mkw4cEFgOwUIPQr1JqCTA5wFhRCbPzo733o6XND3V/+cjd/7pnKhY/t//mPGM7HYD0XrGcC75X5AwbVEmUf8FeXyhrGQhrZYOCoW0DdSU7xDOBRZZBdS9mfzApgeMn/HyMfrnyDcJc4MsCfW3h+4UsLdN1bYV0/rGvgxtm6tTX1GrqmHtc0rrBmbTVTw2px4VbydOWb3KVLsNBnFyq/xHV6qB33BNijt8v2aP2elh1OnwrWcshWKaHbi7acncVVinY3rml3wGpBNO/ArCvqMTpHOZAZdVaUmG6qlsEWdTqoYSeAkK+xBDhvjSyRi4PDhKKi57mzxzePZ9duWdg3NxQ6+e34NcP3PE+GX6J8cfLO0LsPVL4f66Q0W099KNyrMfmk69hJFzVZVMxINZWhulMmoBqfQWT0BNUynv7qBrH/4/D/+sXvLy5+nz9XeZ3o3jhFYpXv4VqgeHg1XWud4ieq0E8sauRtEnWZlT1FUZupcxZxXXlN6iHiNmXds+fPE/H8+QXy6sJCpX8B1lsLuut1WM+GXG+lfoMKv5WTGcFOXQZAqag14Xdr9bAjQtUD40jN9s8J0VxUQMNv7dqBjSOFym/IHSduvf/gui2rNpCNhypTV9/BeH874LgR1jRzPTI99VV6EtAxSEQzJaJkxZXQCJZURvl8CSAidc64SufefpNq6Z6v/d09f3gAqPjXpP1S5STpu+mLdI1bYI0wrKHhOmU6quTzRaNbsIIKcFJRzlZpDEp4C78/6r7lNMmCoP3mAoN3A3yXDb7Lyy3J8BoYvBKvy2Zp+AGtais1po3onltpwAE9rFd++PMK9bB48LDUFySn93XRceHlkS/+sh0va0QdXNdckKy610XbhZdfufCLG+C6SeTtJRWvdqZeHrnqFz+lVzT2klajc6bgEKmbH25+OK4FiVwowrXab9xLKrVGa7U5nEpknowbebymq78oO3ReVLSugmQwUstDJrTFLhM6QrJjBHm1Lx+3kXiaxEHRbrhlS5MquOmWA1ZVenJgbbcKCFM5fLiCHLzxhaf/7M+efnkMOZnF5TDvcg7k+oxMN7O8z8asItXdoHzcdrTEJJNABbzkRihs6KsZwMi0FKjfoaYnngKotskAOr3Zbj6Hx0mVjId5tzB15lMjKt6guUF+BtAefZdr/3SUNAF8Jx/27JlurvyA6u8UyKcukE8Yc1zHPDQw82UJ5cDD7KLwGZ2oHCWbLO/Rd7cZMc/F63VUczsscuSI6p/GwHZrTJt690/efe5H527eeOdG+CFTT5bLTz712c8+deLs2RPX33knhWUnPHRSmSyA38ikMtU7AmhvvZFD7a1HFeSoSmVjRjSw4BaqajT4JQF3sU4lp4hbQC3UmiI7v/P6wzccO/Do2ik4Ka8eu+6fyaabh3tlOszxeaCDC/zteY6hH1LRkIGx5mi7TXSXAjIV0NEOuCkVHNQx1AhFoxm2BehhtDEzNiSUNZzZ4WXBIpkyuqpWTnYThUggm1OP/OiRIzujh/wBd0vPrneE9l53ZurODRvGxjcwit0n+jeY54X5je7iO284e/aG6++6E2BHWVmgstLJ7alJZko6J5DOaKako3i4qqLZTEWzTSYd3VAM/hlQa6gFUQ84mJGUWowF1hEUZU7cT2SSzn77tXufPPvIwu53Ta7dzZ975VxX5ZdU2+69EZxRwg0CfzUDXVtA0xcTVP4Ad9kQNBdyVyvNUXlNVGbQlBQAk4Rnr5yS0govqow2VziB9I06ioIjUqjPRrkwG+VQslH1Ua/WNGFulqL3wsTriRDZKR+cmDk4NJYZnn/k7sPv2DW8dmt2qDmR0KjmJqbO3nBudstUV7Il4U3mb95yzfapgfaENy5YedIS3L5m5kbAC1Dh+6idBPpCW7UfOBUGvGgQGNSFBkSrRksDihjc0NKAohaDG4ZqeBlVYIK3/+Ui37mw8MY3+U4mM9YD3VDXWtHzpbasxsDkNigJxQgD0S2qaK4VjVdqM+hQG5kt1NXMg0hwwT7hExzG9YsnF2+46Ts3/zt5f+Xw44+TpyrX3XfvWVirCXAZprbzCFuryCnCyUrXIXD4CRPpaH0izxiJso7EwclndmfWCSTOjpK8M6uKN92219BiVlva1Htu/rN3ggh6qfmR9s7/YScb3jjFcATjkt8G60ZIXI59esPZLFvclVXOHDHRxWmiSVhScsOjH/yXr1J9Ega9Ebwgad2viwbQG5FffoTpEy9c912QbOrXRfOFl0fnXztHtYfWXtJpDc5USY+PL3/pfa8xrWK2lyxmG1y34uPLo4//y3P0etheCoWDoG3gr2r6BU5HES6j3oG/qrtuLXDjJq3BbPMFQzq9xVqXGybjFnzDC++El70l6yEa5IoUJLcLnj1I2Qj6ukbm4lWpC8rIW0dn6h+BXtLdlCB6otI2qQtTA5qAVs3rSOzE/G2DFr3KZMrfCjtwf9P1wcgp5ze/6TsRDt/gJbe9ceqXQ2Mben/J9kPhaQ/XKksRK5MioimLMXIWBudR9+gcVPc4VQyUfoBJ5VRASVwo37PJkNCqg86p28oX7t4RbFJ7QjNkGxl5r7DOPNr63soXKuUnsgOZwhO4bhDWHaG8nqnnPwPjcws1gihzm6mOUVeZTk3J4vXIVFG547ngbTOBdrUqZ9l2y18v8ufEwn79qfCnKjt++EOG4wisFaE6plu2h3RgD6l5ZhihwU+teknH4tEsaaZFXHMEzDo3ibpHyJbK18mFikhm15IfH1pbCcj20bcuHSP/yn+Z5odELl3W6LgxDEily4S+omIBq0csIBaoxaUBL4LmyFj6SmDW6bdI+E/+5HHV3rE3YmPL8kPOLInPHSYbDvNf+R2l3VFY8z5lTV26zLE1VemyurYm5iFhTUJFEcE1VdU1qVEsRI9++cskXPnBPP+9sd89A9+7QLzk32gNDBck4IqD1WMjC08cfOLQQFqdHoB3H6zc+tiDDz5G/dZjfNOlV1geTZWWOP0S/qvLo3nBPxom3680j+6Gzz/Dj5Az/N/C51vo54mRfhZIU+bNGGijfwUGP5XwdIvjz9yye47/2/NUV6/DnAn5DdhTYYzy25BjWIAcHFUjQVmpr8U3BRrfxEA/II0eP7j7NivV7EqwU/bkBThrzkJBViSc5AcVLtmFAtXrnK4J3zI64OzLCetqQgXDLrU0dc5K1n2wrDux+kDH6euPXr/foDowv37vDb3JVRvvPHrf9jnLwb5NE9dfXfnuyIatGyLNw8cMcqxpBvCK86/QuONx2f6hqSonsKgW8fLhC1rhoSUGFo8EFAXmI9gtS6LAihkMIKUxACnYgYRWGn7UmvHY0JiSFWs4sNBDWzWU3LWAfzKuy8tpo5huZlG9dmb/8XvmN06ojP7eof6JU4OD/Cufnlv14Klb37u6/+6uXdueHELfAGCPwJ64uFEldgGboSKcbLK5FecW4auPXZQ4oqWFAoqnulLwYsOHzly/IT84NrV394bJdT07Tt185z+9a3J9evfUht39U1NAuxysr6W0C3LXckUj0o66cS6VDIZfVY37CE6FUuAsUjsSjEgj8AScfgz3eDBuq8JMn1GQNJRwLiNm1+Al1nNwVWhp3M2bRNeygQUQ/Nw9uzaMaxYPGFSTWw6eunm0MJLpKeTW//r0ewa3F98YLUy+89Yts0Pf7UKzlxsF+MNAPyfbewFBN6tl0H3qpbLLIGCkwIXVGcGq/eui9q9bDt7jlrsNaI+aBR/SVCsU9VZmj5oBJ9GGvgTuv8shR+3zSrIiimkeZpPmo9QYHX3syPFbNZU/0O6ZWL0+ufeq0//jJkJGBvs2/Xrx3D3HAuFV69vWF9717OD4OOz/XkBiLf+XsP+72P4XeUIViOTSL4l2sDXTLBAIjOCkdQEOAN+SKTqcyM4OO9hHTge+dKJ9RJnExNPsD9Yh6WnqJ18z50IkS02nvQ8dOza91tfff93nPneKPDqnCe65PrjDfTy0p3IjeZTlz0cvJfkC0LaV6wPu/CzoGCTqiAbsUHzhUC+JibTUoaH5oRBLqw9gQHeM1jBoMlIOy18wLpi0UjcoCE85uzQI9HbZlkpdrkE9LaYCRKVxuJgzyhl2aRCMhJdsXks40dGTxS1xCaIDM0cdoNqjXBJlSkgo8qosvvKCegvC8wDsm86PVxyOktGVG6Teg5dll5QUkxcoIB9ZOCpDpJqwk7NNYJ3HsGJGccFGN2eGxm7a0Rn92unoibmW1vC+qw4dfPKuY7ccnJpYuyvdtznj72nJbe3Pb+6fG21Xh3J97erU9pkD5h3Jri07Lc5AujA2ddWaLdHWdDTo1ofINV25XFdnfz/qoRkax3uFc3Dra7EBKrOseO6clGMdLCLkkKMDoNXRqnNwVJXDWQNFy0loSDWIJTe63jQpKcws6mb3PrvYkYkNJEAKXTP7p5X/SaLD+eaWisRkKCYsPsF/h9OANbGdK6qpZY5ggELCZLrByEKYahb4UNMaOjUGilT2klNltoJBYMYyBMlsZkaHSo3ZMMz3FZjJDuC00lMDRvUsWX86mo4nurvXk0f3VNzk0e9MdHZOpCgsvZcyFBYr6MXDXNEgC0PMHqgYlzmMrGrjstASuGYlp8kN0NjNWAcguc2sdsOkBWgcHi/zgSxK+hlMFeAPJrepQnfFYw4FyN54f3a451tk/d9seh+D9ZPb/YUR8u49lfBfqwZlgFltxgTsoZnrqsWjNARDRZcHozTLglF5DEYlde7di+rv3v2Fv7rzif38K5W1P/xK5W+/t/9uZh+to7HQV4Aew0xCo56m6Sg5rmxhm2Khm2JBOUDjyhp0Q/UFkRNEHUsBo1vDZFVOWEesuxI9wZnCjt381Xve+Nke546mw3tJma3ZAzjl4Ow3cdfL9p7VDT4GsgRlT/ByUDOIDnDaQhTJJnAyeNeS2MRUqdtCXX70eazwThhz6zzlUBqgQbhsgmjEoIwftkal1hdkmoBZDIdUNhAE1KbKU89Og6p17XpH27q+wvXtiabdHbEm8rOxjTMz26Yqz5Dtq0YqH2WPXPVsAQ4Obmtd3E3BYNkBo+nI5SeMbzhhBLMZKnU9mPVn7IBBPbtPPmTkZ1Nzl50x1LVxgKchZqRoe4f+rWNGcm10fcwov0LMKPfeP38v/Nw8eWZy4paJX5955JEzNz3yyE1T8/NTG+fnFZtplMKCNtMRrmYu1cgDNhPwmKI07Sasf6VEsjfaSnaZSDVbyVxvKxGFZF6ZZLLo9bqFmrUEun7D7IFr75lfP6buHcyjsfQK/8mBiQdP3/ro4NwTZDUzlygNR3kthTuI+r5qqugQbsVeAXtkmckCuyp6qiaLzkIlVYj6/4rJoquaLFaaS5MNFl29wQKnFaRE/nKDZeu4yrhnUbNmU6PBMt73xvZnZ1ZVDRbC3YtxZYDfyk0o+ZMqxU2GaprIyhiSClIrIzCr9YGDYkD9Rphurx4X1O064d4DRtXms/3tvp720xPkZzfc5jpku7fyGqyLdpIb1o1gPClM40lgJVlxWaeaxelM1TgdxpOCJhanc5tq8SSD1ekLozIOOop2wc9kaZjJUqdQIiYhiO9ascChLp6UrAsngW3qlSNJo/27rxoYWLP5xdNHr13ITU1fPTm5f/87rjs7vmG0OehPuHr2rd62al1vv6/Z4V9dWD1Hz/QQ4JHgT4K9dK1i7WGWjdDgP7WZdJki7zLK1W51dpOSjHJW6ymdBsVuQqZQAWuDU0UtKMXoc6HRh5ITvGRaZ1m1rEfI0EO2A9//ft9IPueZmf4qmlAPPLDn1dEB12zTN16lsK4FWFXkZyB/5mT/nAKslY8ZDRQ56wNSGMVGXWG2Y1UE6juUQgYVs/ktWOIFeh4Pv5XGsGmgitaMCIohvfZ0Ryaej57eb1BvOvTM50hP5e+G89E2srHi3ow+ZDvwXxpgMnFRrmiiMQMix8bMaZrxkThTQ4ign0ZL2hcPWBLqhOXAiS+eJT+7FD95Ms5dqrgpnlr4zhn4zjB5mPFW0eUOZTEihaxNHM4sZjki9VEpxNToomIOaxicrIIGA1QXXv/V39MAFWcXwxes8GFRc+Hlsa5ff4nFp0LdVtF/QdL6Xhf1F17+0gP/EmbX3XDdc0GyeF8XTRdevvAPv96N162iD6SVW49vmXSvixb4qsivj7O3HHbRekEjOu2iC/7if//6wzRyRewlnmicqZfH2uQrVnvJZnVgWwR9FPBRDNlLgZAffg3SxyZ8BD7U1KVW4P26EFewIDYVivBF+Iu9gJ7yuJ3XaPUmi1Xw+PxNNnsguLwxgoy7lI+43PihUHiljymhMNi8MLX96eYpESYW6KkGvazERuLaU10aC682W7rnuu0mNbzuunbPgymtoOat2o77YYuDR81bRr/+9elVwQU7bvVfRE/Y9sf/HGsFYb9bYL/91XiXPcuOoCWL6VgMGsjxLr2bxbuSAA0vh5t03niym9CIV7b43B3jOodXqzbENIO3Pl+6Y52+3aQOe8e5Sz/fZ26KG+xDxr2//ddD5mFbT9tBWLvtUj/fC2u7af8CY108KFR9etIsw4/6EY8vJ0hqe6HGyRjrwtwtLbQaI22nj5hSanPL/PV/ETsy29rs8TpmY2bys9cCZ1qvfe2NS/N7jLt1sxFmg2HeG9ati3+B3FETVij5tuJf60iy8h/k+cr/Jr2jZGbPSOWFvczWOinHv9q501gpU46wWBQaeDoQBumyQQ5JdaTFlovoejdhHCaDplYbqLK2NJaONLWhNGuKgjQzZqQUnKq2FtgBt6cgR0QlfwtVHPSSaAZPlgYj8zmU0SChh4ibBQ9oPQYV0vALvYpv5/pOvtu4a2Gye6JLk+rrS2m6JronF3YZ/3UtmYosxjeNjMW6g6ciuaxBbcjmojc0dcfGRja1nGyeQhxfv6QlB/h/orEuOWglqWxL9J8c6wIZ9vrRf1f95Hc+OT73Y0qT6zmxvRqfa05LEaCJO1321GiivihaM1IL0CSQkWJAkFCmqI5RB6Ude6QYNVpiGIkwIjWaaewKqRGRC7ndIFID1EphKovWAXUTinYrLUjxUHJ43TKBUuQoEqIjl+tghNhpfPe7jTsXJudj3U03RGUqRE4FKRXii5EpAnRqPtmyaYTu+Tj3K95HnuYE8Bmoj69dKtm0JnCHeS3N1LGkHKaWQLvCReVYgyKtRhywPlA33rcQG+/39IbWshc9YeJ6qK1tNvogPHCsL28TOUvtTtqXh1YSpgVX6Muz0b48o4lGdGwmVmnUYHvWZymdIFKcXqUvD9vyVOSptkymLdnb+8ZfnyIDla+eYvVtf8uraHy8iTvA0aAxWroC9SCo/naZcbdcTlTYzJvwCjSz5URH0p/JlB2sH0NjymTQlwAV7aJnXFKD91DmDCZrQMkUyo1UrUmhH6iEPVSYK/QKVnLs9L41U7n+eGtHd8/QpjUHbzx5oLuX9B2923ZkQZ1bF1FX/lyT2JDTHz5svueaxTBpsW1S8vch/iEuzj0mn/0o2JhBWr3tA27UZ7DviRb5JKiHHLItFUO01y8Ux6KXUMCACkP0YCjEBJjBhnuEpaKJNvKZ0GFroflEFrcBS7o5ivENh+gDbo3KJd5BzCZi9aiBdhmYMMAqm1pZWj+fBNO0MXOnhDp07qh7w8C45tRu/62Hb1g7nh4pjLpLH1RHoiS/zrcz7/BOala1zF+zeSw9kImPTDm9qZGwegH2Ls1t4Nv5Kc7HNXNnOJSwTdolPIYGLauuV12UAjZauYcuns1G6+ulAIi/F4laq/PSeFpYKBncHj1LNr5oNFkEp4t6Mk0e4C0H58I0r9gslNQWIuBLg6Ok0RnNcs9Xa18+mff2Z7D1BmNuXl1SG0vqHOjxgMOTnonHtg3t6lns2TU0E09sH5rvPpPetXdobmho7v7tvXdntg/vjkR2D2/vXTWaZa9J9uj4+NFVTP52wP5287dzIe4UV3SjPvOmRUe27NNxdqyZzeBeW7PlJva7OYOV+2i8hdOi+6Loz0guE8pjMHsoGztgty2ZoptaoW4v/BbMSBGMebmx/EBPBXJTNfnnraanVGhisur9eC6L/zrOTJvbjWDImqdPv/D7oiie/tSnPvV+/vbHfPMuxx7fY5W/HBoafvzx4aEh2KuajNXRLiw97g4W8vCwQVr6pJSsgrnoJyhvjx79X5Uc30YuVMaprNh26dO8jv8U0GSAe5ADJ0qKqqklqkcvoUDPZsq6VNKklA7elF3KoJ8AF/3uDFxM2Ghc0A+rYaDPpkGvJZJHryUhfNqib4om0/20ww+23uTtoYwQRXqE0ch9UWPyR3ry+AE9VgyyM93gQmBzpE72I+WYe7c67wILA1/xSe22dDK8a9Oebf2F/OrCtpnCzsCBbbeumehfHWttG1k30rbQ1rPNk23r3u7uI5vb1niivaNbRzakM762WMfG7Ewm1jW+ffNwX8TvSfjirWv6AilvwhxIB+HJFKR0OsuvId/iX6X1mzSDhAyiMnIhNapf+RUVr+QievGihhm9Fla+CXug9AEpddZnWwZbWwc/0jrY0jLIXzOYTOKv+Ehjsb5L/8aPyzUeSe4P5O5qC+VIWnWB7ZrwutzSrMd4d4tuqewO0JduDMm20TSRiZXNmpjVHXLRImIbSZU1TLxi02YIDNSS3izw9LQKL+lUFrvbG2+h29QMJkXRZI3jZgawQsPhi+Hn3I6i0eYtNFaxKOdTtWJdpe/8z8/Dz8CtX7n11q8MXTU50tMVamrv6W6NtLXmCxsOkInHSqXHPvCZzxB35Q/+oPJ45Sc7ru3JBNfkBidCA53HYQ8+xP2OXOC3gS3YxN3EoQz20U4oUZOWjIg0UyUeF81kBeRMFm1dLdsYJWxpKrZqyazA8mSWz4nulp0GCIoqLoitq0aNwNJZzvp0VohUcxkYGdB+6NC16uH2fGRyanxiUssPZLsGt/W0tLyD7O0bNA02D3RsmPxiPJXvaW2mTTg8N8q18ibyDfCnLFgxTvsM5afRD2fvuis7Rx//+NRT3R/5aNdT7EnpMSSLnIbrUarUle5C6gJrWdjWVR+2VdoxMSyb20z+aCdpnq38kvUN/uf6+9TctWSI/ALOghG88mbwCV7iREO6bGXSMpIuRxmXRqK4eCRETTKxNV32sk8402UVfUXE5DIudQNrNrPfohmx2S4l4EKtWd4Ov7HqcKlNCVUYUI9ITiz7SjiksIpmnsp6hzUYoh092EUL4gbs4bLWZOdowKJVEP0NnRh1wTRvjhbvgM8Sd8PLvhS59sZtMzee/PCN6Zm7Z+Bn7czWRGd/c9zbEvfz/M6TJ3fOnTw5N7lz5+TaXbue/9NVSfuWVauODANdP8bPkhf4p4GuMUZXzRL+o3TlABWVmdPLSVxG4o8RNT87PY288Sx5ipT5T4K8cWAnqS5dNjHqCTXqOWkHpYGRx2DHeLNysDGOYKUZLq2OxRAFIFaJU2sI1bGKMGpVciDx2LNbTm3efMrW1hxpa4s0k6Vbpqdvmf7YRCoVi6dqcxGwt1UFMvCQUm1KOyREUxabJLDuVE2Ld9RWQ0oZf6AzMMFopa6MxYIGVNFipbFrFfVeilbsBxm3ynWoglyHCl5UfcMrtlvQptft20lqe6m0/cknmT5/jnyGfIL/LXDjdg4NWb0OOxZFTRbNal7Hkmk2EMtwIjQ2ChN24doopDaTkkbTG1kc0IVxF4l3KFl1pQEFwKi2LT5XmCisyWZO/fvm6SZ/vIl/eXSgN7a6a213fkPQG2xlcH2EfIJ8HOBqQjuDWuFB1mIPu6lnu2lNo78nyP32IdpN7sM4CVqOLoDXSI0KI1ZRo+ByaeSSF1q/RHwgnKxBeGWkLp4gugoiNZOxd9mDpWe0pbGuo5Fp0Y+0JHuys+vSsUSie3PveH5iQ/80+U6upTWV7oiFMql0MucShlM5hscP+BHgRaxDCDE+XrEOAZfM6n6w+5bb+ZHz51k8bJwfxjgRSGs6RUN0ZTEaJtmETKYYoFUWAc6QqkXHIlR9YnQsDE6vnQbJaDUVVkTLXVdG9LQDaDlIXh8t9gSsOUkbYA3zRCha8DqLQFfDZaCJqqWEKLSTHu/a06nulqHwor7ZYLB6W1Jpoyo3tyZA9Bf4j2MUrS1H8v92Rys/Z+zNLbTedphjPWMi+XfQy3rODL4q1cQUcpr4wYYqONGK7sdyHCujDHrbAqxNAKThu69LJY4/RKZPkfLpqytrT1eu4b/3RozR+mvc6+Q9BOtUuumpZ31cb6Np2tHQNE0yuwYHsWsav/Mbl5LkDtg9M1j3yG6cLD8srCrcRaGkPcKSlvZucGbaAY9NWOBlwK5S/v/G3EjbWu/QnrXPGxNh++Zed19nrwa//1U4fyf5n8PXjnC0JAnreFAD1Pe5y5V+wNKN5X0gN2jLIhWB/TTe/upgx5o5/vdzBn/lz78L3/dO0PtfB71vgBO+hsMmIIuOjp5QyWcbKzVd1XYAWIMmLLAHoJZDca5Ud9tfE3/vPPDQAfjZ2ZZoSSZbEuS5LXv3btm0b9/t+/P5dM8A7v0m0NcBRV+PEXBR3Dr5aRPo6Q9/+E/o4/aPfqQblHUXewIt7YE/Xg/+hoozwesA6MwvyH6HmfodQcXvKAapXxy0GWg1lIZdx1bvKGbYcauUoQBqFsQGhSk2Zcou2bqpd0kUf8QMdEYXDau2wQqgDRFl3uoNUFXowpkcrFLU7KYbAX6nxKE6VTte5InBGwizil1QmZgc8SlTOeTNcubyioRWgemiyubycZ3nsx3PWgqpNTsefeDqTGb6+LOjn7Vv06iTOIKD1+X0AdjYSrj9q5/rX7OGXPW1oRcrryf3jHFgWyCtVsu0wqklH+KKHprz0dGGTKtuaRllElegDHaBCHBVCNLudA8QJEh71oNe2f2uESQovMibra5mnDmC8jMK1Ai5MM7AC8EI9pipwW8tAyOzjwAxYpQY0eXEWK4rQPLi+1V6vGdoTWE10xt9iaAa6NJAku/WqZFM6zeAMBzwD/aSz/APgR5p5lJwhnPcj7liB/JPFIfclHsYNVoyxR5qcvUk0AWldkKjtqlTNf1vpmowiN4BnNWbKbczzkpkiu0d+HZ7EgjZ0Y4vO6JAyLyslIoeykVShw8OXbwzjV6e2C4Uu7J9lLl6okDsUIyVj4UjWbkNCxNuQon4OtOy/+dBNVa0urqZb/FmSkyXp+by5dzXsoJ2y8MO/MkDV2ez03uA6M3bNKokue5yhfdD2I2Wy/mS505eWkVeI7+hPZu3cMUgavPmas+mXe7ZBEFkEcB9tmMJKG3f1NH2TS065GlJZ2OtmxbWpS1pfVTOAgk+rbHXtXDSonI7HkcnWrdFDiO3tLBlVJXMeqyqOreqJsxONjRvjuRXYUPnaRatiyRGO7sKte7N4bkdvE4O3VF/k/YnqvpAhmN1/KblHYrmWoeia6UORbfcoQgSQ280W1iPolmQo1XVHkVvXLWsT9F25+y+fEOvoqpvsTLN2hUb4LKtBJf+PwGXwe54895JFWi65f2TZPbOmxp6KMlVi4vL4PJeDpe9BpdvJbj8dXCZ7AKDyy6wMVFVuPJZdEN0y2lmPHjjwd3D6mFvA934C4uL4+NV0lVhHAEY/cC19y2HMaDAiKTTZ1G2lrxWF3Yb67BCS+FoGXT9Za6YQH8rqQW7nmGFvG0H3i7zWhdTLwJOTADUAjTaU4faKIGjDDycpW242Ii8DEm1tq81PG0NG0aUF+ZGdP+4sKqnp7Cqt7eyQUEZ9AfDeUjelwh37xV3BjPv4WzZZOBigFIgo9TRy+jKwRs8y7hZISeNnSj7h5ly7PIvEtZR6hfo8C84u0VeI1CJd9l2Khaagqnye3Vbo32xWF9MxvJArC8a7ZNx/Ud8J1pZzzjwnfS3enwX0aTjfOBnPr8cX6GKrz2tRDSjijdJxPgynOu2GPyNspX9Zq1hnkDNqWP9Ln6hSLDutyCGHUW3hw5CsApF3obiCuwHtvcC7bqkEb+SwWLVUwe0jiis+Eph8lodnkKXoUJ312Bhb1ImjMPf6ocfmTK/mM1mZ7OVGUaZz3n8fo87EKD+6qWK3Ddh49zY72OmUzWytHGWV5pYrXYz9vxY9dhDS1/SHloPFllhAYzBxqoIqINq4JWWVtZCSbOPPb1xZ1SO42bd0RzKEwEQ4X9KDj53332fqiw9PDh/XKUd5c8tPLfwysLHPkY0pMdVUnqZk7SXOcotcNV2VxylEJA3KKY0MyuTSzwudtBwcknJH8Cpg5hCKOtVVjnIHvALaKexhmfPmzc82wi1V5LU0O8my5qfp4/bwd43zo3Ebni4oQl6py5Ozf8MugJr7J9icw2w/gpkogkoPvNWXcr2t9GljNkoA0el9bJuZQKSsa5jufJBUCNy2zLoj2WwTP03wbIcBlAX9TD8K1UVFAaUxdwymjjfmiautwGH+8o0kdVFPUxPyKqiDq7xcdQNDK4hCleQu/PNIcNIUyBbtjFR6ckoxVZXgtRiwGQBlmLJRdd+J01IYAGWgZazOAuoGyQUFMuw4JaFyRuwoRLycVkyMoyYaIwykch6/NTyvm97k45o+9vqiBYUv9hiKxSW9UYjC8r90ZXfB/ZTmqQZ//1/hAPYUIFjCVhQgaPGgzVYnPD6yrC43hYsbhmWksUqOFiKeBk4lAsVkB6VObAeLGRB4EEGl8KDD1wRshXZ760hLQkGXi8r8TRyY8lNLwAzUk7kkRORAyU/aHLJE7yMtMt5sYpTHR9W8WpgREp3A80zYt+6T+m1oPWftIvKBRqHNxvVlpTozZZ5ppjdgJsfK/OwgM1C+xaKFlrsbAGvtWiyKPljNEuQKXSAS4BW3+DQNZ1QYPX/AnNDU0Rg9Q0pgurJsP6j7/vw0+c+tdh94MiXu++4g+T7NaTp2Q8+/TGS/5ubbv7RF4YY3LQPG+xGN5fk3ndZJzZqJE9WagJrsaUphvTUYbhOTjnJDdpiErzKsodZD550Ocle1Tq3xTB+IFJLQyVxPChvo9ZUWJD86CpGHEW1xlJ4G53cqsvsyeW93S2X2ZMrd3vX7ErKo7TvG86OgbOAPblVruIVlM5vj6Fq4VudtGXKKVfxotFolSfTOIVPY/+3yWKm+pm2zSwPRVHnaHkb+AmQK9ctawXnH1ysPFxrB2+A0VkHY2N3um+lSmO/XO1BoXO5vXJsw/PWbeoY6m1sVd8IoueydnViYDKoHkYBzvpOGUa3AmPAUG06cjhpXbZXhjGkdD4AHb3CSwip2WqiRQMaNoUAO8svJ6fiOy0n6TWyPJpeTlYndZ9qlFVgHgGYg1wL934Z5ogCcwIMNQ8WBkh2OAt+O87ExcAklsi3shJ5kDnGJtCF5SDj/yY79RwAr5JTE4XrrMxFdKTLTnYUsKU7iIEpPY9dLcKLFk84EqdN3U444Co6GzayEsKXnYDLUD982RFoX04ET9WpelAhhFqmw5C8d3HurhV2D8eNxrJlC5PRKA4Sym6WTA5aO9Cwr6WoxquX3aq0FIWNbpE760u83oW1PVI0hPFbt87PjNqVdllxoWqoKleU3aby2MnQ/DiVzzVkB5hX9YDCrN1V2U24fdzN5D/4JtBNLNIrD4Hd9/73Dyk/pQ88hqUYj31g+LHHKI+3XvoOP8AXqTaLczdyRTtSKQxU0iKV/AZWMKS6KLkAbRfjBYuMukuF3qSDpqKjQsmu9TbhplscRb3BREVg2I4DVBzU23yRmCwqDw1GaoFXjGyqilw0wapmMMkB3pTXiea+k8W5k61jg+9enB/Lja3qP3d6x1jfqO2bidzYxlwsO7bRrN03f+7Jcv/mjgPzDzz12b5pcmIiR/Jdd1b+InX2xGgP1Q203x7OsZVzcGtW6rh3rtRxj+lIFceKNHVC2WyxK6bDst57lIJK//02EH6NPfj85xf/azBg1gxWt9FIELZ5CCvBALJNgeFZkGrLYNiwuNgAgwf9i8th8K4Eg6+BDi8iHdjgSaMDu91WAoVKMQWcaVl4XQ4SNamABxlcQxSuMHficshQZIWyZQc7qP6MUqgNkJbsKjyoyJw1mEtNRh1c9DnpoC+QaDQJ57KzqR0+jO+ITbI3sgz65RUvVSzqzKdlmJxoNKJ41vMu73Vuede7s9r17pK73ksatRzlu1LjOwb5GprfNdRtq2uAJ9+lSqs2ZwXt0411069wUAhhg0LKKicb59QwMwSssUx1aoiWTQ2R+2S0csOeMnIlp4xcWTz2+jtvPLb/0bVT+/lzx1695vhD/3jzUIbNxYE9HeD/kuvk7pChcNNBnWosBZbUuHQXXboTuK3TTsWJzr5UMutaYOdi9iUcx2eGCyF6wWFfoiM8Y50Ajxfj7SW1L9KGIldHK4gDKG0CHHu3TSjqHD65V6s6eVweWK/UY7GJ9vIgPWHqxqOz+7whb0tfX8veTRsm2tO94Tj+srG1OZ0l/3Fgce/q6FAs5fLEQ4mxjjXz7Vuisb62cHSgJXWyrbljYqxiR16m/ev834Id6udi3G31Heyhhg52FsQKCLQsMbJSBztGrRCjok5PAyIR4UWN0en1+avzUDgp1NjG3vyWbeyyyXbFVvarb53fcdOK7ez8Y+crW+WW9no8w4DnXVfu1I+/Zad+YlmnPmIZaY5VsRStAs1u/d+37KN0vHLbfn73Lbev3LpPHjh/vgHXENeK0dkartEGXGlpkBRGT8GO8a7LccUSoHDdnsaFT9M9DYQa0PVj+U8juom33tqa+XjF7d17eGFhBwjjNStuMXn9/PlDh6q7XOPnC9Sv6uGeqMc9VYe72JKWfapSk5+eYPgFvd5eSpI2kMmeNjQqZaeqzU7vuKAKZyiFZKeqjlBYrtmVFBwvapx+YyyFBz3CWjI5SWPDNKfOLnTLGvFNaLKShXlF6mzX5zoCk+aIaUSX6whOWCLG2Mp0emNkdX//8Jr+/sp0lVZqmVavynzSwz15JU4R02mxKVvuYKWYPkYm70UpCDZmOOit3ZMhzO7v0cBKYhcmP9ucVJB2OZeWES3oxbm0WJrdJkgaMLKkLoVuRicynj2hTBVdgV7VeL9CJSXWHY+tQK91LVgIqmI0erYlHGppCYWXi40WWiBamZKPVFGpF1Xo9Q9UhrRxfdwXryRF4GCVO1m0IZMux+Qoc65esoAEVfK+7fVyppSwBoHt0uytdLqcWM5p/TgIGofxOKO0Yz8tFDV+Y4HV5sVasVrpMsZrqjKelAGNBN5N4W1IoXqfVCnh0F5ZLgUKewvwMxhwOgIBhzNwBRn1Z539/Z2p/v6UJxTyeEMhZlPZgbbbyW9ANndyGTy3OLEXmE5qxe70DCUtTnBA6vZkyl2uZiOYBF06dn8QoGscVHCczc0WrOweIPGqkO4Wxo0ao9XlbWpWtXWxCoSi0x+gNn9rM3wsEJZn6fvjqKXFLockpKgsk1Q6KskkvXk50bxyrjxe7R6pv0NImmjzWbw/iP2mWzRreoY7dq2fjWVn12/R/Ks2393R2Ta8dqFv2+To+msiTV0pC0/O/v2Tk4n0Axvm3IdaN+V27LjvsKt1fF1oY9fs7NapSLQvmfH6Ju9azeYfXkrSGScsp6F08//f5DRUVv1b5TTyb5nTWDYUZd1BgeU0osfu/vXNtekoo8ZELaWxyvyAMhPjV3wY9BVGVsLc4vKJI03qpbKPTRzxaaqzdDAu7qMTR/x148INbHwieG+fVpkFt4c5eFrHFUaP+N5s9Ag1Pa40fuQ02B23rTCChN97vvLjQRb/r+EVALxueKtJKpErTFJpliepIEa+YFOYDVMpAUYhum3/+Wkq2DB4xYkqfWBeXDZV5e+w2rARpyCc1TPLcWoGnJoYTk2aqjWFODVRnEIyTom6vQoJL9G98gWb2WYhat4VUGt6091SrIkr7dixw4cOoymxYYVdI1+ghgTdOLWM46uAY4hLgDy6fzmWMcAyzLAMa5YwppbKlr1MOyYziqdgoCWWJTdN1ARYoqYVJ2uD1ox0tOoZJVBgtQbgSJoFFbUhOxBXTjLIHf9h4U2Qrmk7GW1FH16O/oys7niG/odpZ0QjEX7KNN/fAxWISVF78hyTZ2DPNZyB6182x4SOJb5sgAmdxYzDSiSdoW5UiQrTOWT96Z237J6TR5SQjeera/zwv2MNLKXENXzzt94hr/HJ87U1/omuYcFJhsvWsK60hk1eo6TT086p+mVYCgaWWgDOmgPOqi136FA19wJ8pKF1EscvnwAjerJlA2MbDGj6VoCgZFap9TQHQefAAOsI9IK7rsBFMlhB67uxWtnhXWEyTLyWXAFob5EZ4aOUA2SY/6axN4bN1YjwfwdeYQv2F3plhxCbkOgNG1jwNWin9h6NVghsVmYQla4Bh1M1w7nWayw2h9fIqiCpd8BJiRB8woX39ZHv9cHUSyve/glvKlWLrVVrR5PA27l7Du7u82//QPNdXaPZXYMPRU695/5TR84d3zq8apIMbF7990dvX3PthuncqnBoXXtqsn/wwb+67bGzH793896ZoGWCzuegc4EucA441e+5wvQSlMLOLPoGpZg/AoT2gGMQhM1pWTbURExgcoVFlLHdQrbT2LQTbE6D419uYgHn1trcE8mYAG7SeqwRKuDogCHVysNPLs+3NIxDaZVtfjT+U8E18GLZgBR+FVr8aPkDL9I5KcD7y3IsyqQUj/7t5lh0en6FHEv+CjkWeWzKDXDgFxtHp/B7zlc+o4xPqYevIb/SMMnlLfIrANkV8ysrjXRBLdg41qUfVd+y0S5voPCoh68ht6LAF9C/3dwKQHnl3Er+TXIrMqiHDy9QYbO6kZzk81SDfaY2kEaB+cLy3IoCc4IajHI6pWS3+GVuN/5/zK3k31ZuRUZ9j+LlVt3d6DIifAk5nvq55Soh1DIdXr08t1K3e0puhUnj/1JuBdiwllvRuVWX5Vbyl+VWnJflVmSUN1MhrWZoPkP7GKvILjF1XZQxJe1Mequ4zdwsb+TH6H0pvVye9iPoGGLy/VY86bIgd1P65F7/soHd09WZwSMlN0tpqpAK1VfYI/S9JK4l/2DH2sNNLS1NoFbI/fILxn8/Abqr5VzNtXKcPKxQ3S83d3MNuRqjkquRQ/hRoWRRMTPeyIrdwnCsi+DZsprAkpFjORqVo6jR6Wt3IKlP0YBiybu86LdpvbJGyb336Jaxnu7MyHuPbhtNw/PNti82dw9N9kbhwQ5ETg0khtZdc9MjnfA8eU1v6w9C+74Z3rsxy/QjnUMD8sDBebBP6wqTaLxvPommmqpwoolbwnEkLB/1NobSoJxtHEwzD0J22XAa/sfn/zthxak5JQGYlUKJLVyiGesO3xJWsMkaYX0crLPlsG5gPkY9vAGcrHQFeINvDm9TA23LQFtvoEpcbOPyvB2wqQxuBH3zAhPAK4CPZh/wPYP/VYC/CSyNh6+AASIQz5Y97GBGqiYGYuTCkJnfuQw1MYaXw05657WYsx5btDD8LjbTKIyT1USDQ4okCm+Jo+MyG7ER2wGwFFvAYvwoDZ0tx/mmRrOR3qOon++V8wkrTJNRBtm8zWkymEhaeaJME6jqy6bK8Pnz55U5bPLs2nnu8rG1OGqA1E9hk3ghk1k+g82DqeCVpq/Jk2q9jZNqG2avLarXb91//N5da9aoegdza3H0muq+z21b9eDpW97LZq/Nb8XZayqZXiwGm8S76zVSDBVxU7YcrUVe25TIKxreOAAhAfC2y4HUooW4WeqFjqYWEywO+DapzddyiTJPrEz726ke+ojMGZfvwuEGruBhF1iNsB200RF5vpwJKx4zcoGPHm/eCirKih61TlU19eRBc5h4NNFxC0UT7Z8xabAM0mSgj9h75adjgtDs4ATl/m919cJo9dHewMD77iBh6YEHPlf5q9vec/O7HI53kanzzx36yMKXFj7+wZ+Tb7AYhwnO7wz5DWitJHj/T8l9ZP4stqDAQaXaC2862wK/pjLlNosb4W7TVXOE2FUJphJ2hFlcS2JbBkvJcI+MFjkt2ISjg1T01oeSxot3awZTwe5OsTht0UxrFGr9KfAp9OzENgeouyYaJmip953eJA4ph229GIk0Hdu8qy21fXKz+ifaXGdLR9vg6j2prrnNR6/paEu0tyfaOl577/jaf7v54SNH7jscbqKxx/37H75len73xqnd87G7GH1YvljJf9/UmDFeMffNMsgll9kCNpPdSaeIgs4v+egFJeGNFQtF4kAOlnwueby61GTGLIA/XHizUev8sjR4Q/Z5f0NJa10WmueX1RMS7nF+hFwA+aXj2ui9hVVZ1opLp6VjN7lO7gZlE/JpxbesJh6XLXNszQVNQLhH+VXkq2B/C9wkR++LS+falLQqGyBthl+4jHz/ELnNA5kdW0BYuzl1wfR0lqKZefWXmciPXmYRM6cP/3HL5g5w9QMG/kvvbeW+zgOYtVkG+iU2NrU6ywBv37eVfObre/fi513w+Ym3/LyL75E//2XY1fv5l0Fe5MBSp445boHABhmwhlyctcFmN2q0lDP0OEiU08qnH4cU1W4b+uWZzdEjWoMl0ZVu7Rkgf775tpax3EF1V6ItsxF7d2G999H1RjiEySivpqu7laP8RNe16JBPeTu7twpGoPCOONjFvux2it84ojNZ4t09LT0DM5vIncqSq2F91jMcJO/jPvBfXtf7pus+17gs1tWQMZ5QfKPcXkZhlG5AZGqGxOrojMkDvHlzE4Mi3kh1bD1SY1y26JKnAOMulDitUL3FTONG5JdfWN+wM799k31a3bBpFI85wMNaxQO75d1ZJCKN18Qa6Sj3C4pCphyu4VJHUSnsw2nGmImUqVviLc6wfF/lZQTOL78wV0/xv77yto81bgbgcCnIWykP/D/GwftfwOG5N0EB5Rx3Hfkqebq+n17H+ul1Df30OtZPr7vsJuSP7rl3z557//iBnTsf2ImTL0D/buCelvvLJuU7/1k92aykMi5JRkcmwy6pjNUbjWvMtXFA5iWldFueVF231PJnW/fa7u615+seW6Z6ext/EMeXuVbyHtqXHuUIzsNhkwjw/q+qDAptOoQaR8qiNKOVjC/XT5ZhcwdayfnG7xD5jPw1te8g+B1yz/vX6rvdlXtKj/EPce1An2KrnKjHoVlctcedZNCX02bLLva7PgNCBUfCyYP9JL9pqeinc0P82LKt9lfnjusyotoutlM3g1XGh2kbcjgERhYO/GtXyzdBDmOvcTxBC2DwlsReOq/YRQ1keTpGnk5Oy8dzedRb8r2co+6oPEOtlsVIZguEFMbdv3f82PpVA0Ojm61EqPyEkH/+iX3T4Lr8qtmTR97t/vsBtdHtMgyoT9+9eSy7ZcOIXvCaRtZNjw3vu/0k60X7DbmO38g/A3wTBD2jaG/dkmSwAcfI03u0BlSqGdbgIE9LWPG+SMhOqIzl0FeQzneSFTVG9eid5F7/+cvKSFTRe0EyhfAOP1zJZPb66KjR6it6U50gdsX6MSxWNNpoghUj4W6q3FU51mLtrd3kDfuswbDwug1v7Nr8FzvbfGpvcuekXj2aGVUb+H3r1r322mtk4Nj09LHKVxdPPP/8iUWmn/Hhp+SnqLt7haiAryseOlkE76f5PTpRKMGdZ/dGEKNszqhkjWWrN0gA/9JnXCppfWHsVEXOaXk7t0rA+BjGcBLwmYS95EwErfQMYvt2EI4ieqluB7pVehBWCWShMN6JWDI5lbsrFPXuYKFwpTsskL6a6nCCDxtavXV7T4cnGBg7ePA0ifQmWnp6WhK9TYs4Oji77YAwZ96eY3dfuBTv7IzHOjvf+D3yMzpjl+dicJYK9D4RzRgTpNQIZdndnwLKBOTaXSM86ZLdo7XKBIm+XYJgGtdnYiP8qsijKxkpVG8rcSV0Wa0nPSWx1VsQ1UBwFFFtP+3HgSqtN1yGaOWf+Ik3Po0TVTju/wCZCPCBAHjaY2BkYGBgZIlSy4iaHs9v85VBnvkFUITh3GKDuzD6//f/bEzBzCUMjAwcDEwgUQBv8g1XAAAAeNpjYGRgYH7xLwZIlvz/zsDAFMwAFEEBzwGF8wXxAAB42m3SwSuDcRzH8d8okgOHhYxCtoYDIxdmLWlj8sSskbg46ElSSqKcOLmtXFwVkpPzykUuHFeOLg4O/gG5mPdvPtPT0w6vvnue5/f9fX+/73eBHdNbt2qMxyu24SCDdvTgA4841nv7/UHxGXkksYY4RhHGGGYwre9xrbe5B8rfgosogtjQunm9P8IIZpFDCss4xJzOM4QVRbtmAv3K6UKjnkOY0j3zqr2peldII6t9x5HAumJWe8d0z7TOldXaajzR+kmddQAN6kVUeXv4Vv2kp/euag9jUGuWcIoOXGpvR+ys7nCt5xvc4l21q/0u4QVnWECbhHWWYG3lH+3h+uR8mjxz8LPzjGgWXiHNLKOe1NKqfiR8/PW9/fdzFFM+UeXY2IlmnekChUDRmPp9Y/5jxBjzhnPZxT1ildk5Hovq35P6XtJ981JAi80lFu187L5//4/yV+Cz8rvb9P0CPzKdZgAAAHjaY2Bg0ILCLIZpjEWMP5hmMGswuzGnMbcxb2H+xCLHYsaSxFLEcoNVhDWBdQcbB1sO2wV2LvYu9nccWhx1HJM4NnEc4zTgPMDFwpXGtYLrAbcMdwD3Nu43PCo8cTwTeLbxBvEu4H3Gp8LXxHeB34Y/h38R/z2BZQKPBCUE3QSLBBsE1wgeErwl+EsoTeiIMItwivARESGRI6Icon6iy0SviQmIFYntEmcQjxHfI/5DIkZik8QfSTUpOakYqRlSx6QtpAOkD0h/k/4mYyYzTVZEtk32lRyP3AK5G/JJ8qfknynwKagp7FK4oaikmKe4S0lOyUppidIVpX/KespxyouU96mEqNxTXaAmoBajtkLtl3qJ+huNKo0zmkaaFZp7tDi0SrR2aP3T9tLepSOmM0fnna6D7iw9Ob0Zepv0VfTT9FfofzGIMZhlcM8wyvCckYvRIeMI4w8m80zNTOeYcZgVmT0xzzGfZ37BgsMizeKCpZ/lPMt3Vh5WZ6xdrDusv9n42CyxZbFtsj1iJ2XXY/fEvsT+kQOHgxcOGOGQ5lDi0OOwxOGOo4RjiOMOJymnGqclTu+c3jkLOBsB4QEXF5cAlxuuXgCs6JH2AAAAAQAAAOgAPwAGAAAAAAACAAEAAgAWAAABAAGKAAAAAHja3VpLbyPHEe6VnYcT2LAvRk7BYANovQDF3dXasb2+mJaolWCKpEXKGx8pPidLchjOULJu/gH+FfkROQVBjsk1xxxzzK9I9VfVr5nhQwoCw4FAqmemu7rqq3cPlVLvqX+oN9SDN99SSr1PHx4/UE/pisd76h11IuM3VFN1Zfym+lz9UcY/UUv1Lxn/VFUemDk/U3998J2Mf64+3Ptcxm+pX+1lMv6lOtz7XsZv/+ZPe3+R8TvqdN/MeVf9ev/PMn5Pvbv/Txn/Tb2//28Z/109faRUTU1VpobEz1z1MIrUWHVUolZ0r4/rI7oaYNSmewn979DVTMXqiq6m9OyCrse0Yko0luqZqhIez9TH6jOif6y+UHUa+TQNRaZ3UKDH61pYeVdeohw3X0O6lGYkJGMUcNem1eaO/vtMTWhWRnvpudf2WZVm66czovia6Ok5I7o7xb6HNPoIn09B5S6ShtLFxGdEe0REf0n/B5itpXhN9xLaMyJkBjS6wvyOuqUVGWbplWfEteZ9qRb4Zo0OQHkOqhOsu6Sr2D7r0Ihn8u5zuvsE6yNIOgGCESiv6KnmLcbs6r24adNIayciHVfp+1SoTuiT0dwXtPsTdYO/KlDgHaqgNqNnGe20EHQXNNb8jLE+Im1o7T5VFTs+vDdqH9yBp8fY8Qa4TsQKUyB3LdROYFWaxyZRmIGXR4EFPAIe2ienoGCkSkvoVSHJj9t63la/wKdLs5h7h1EHHGeEqJbAyad9Tss7BxqagxX25F0Mjx2SpkH/W7CTeUC5EVDQWiuLEc9K+Qt3Nzz1YYex8KPRndKdG9BmRJx2pvQ/weiaPjGi1BV9DwPr6YHjmvoK44zsL8rZYkq7aiQXsI8quJ/Sf438mJ63aH3DSnDwg/zpnZ0m2hTNm5CrhbyoNXFGPqzvduh7nR4ioqR9+bdYOyS0lqRzbRW34uNPKT7/sFLqT5t8tE46O6e81aCRsRzOqYno3niisdTtFqrjEGvzMayBvSGDFWn/jcl/OdtlYkXaBnR20fbE2VJ/X4tdLhB7eCfmpY9sxJZoPD/G/IieG64WyGG/p7t92FzF42JFTzlqZJ5sbm0fXDNd1u2Qno5khUOlRzNN5NIYOP+ZIgrpvB6L1H3hfAb5OSZxZPH9jjlk3q8tHj1wp3kaenMTq4sRUNA4MZqvbRS8QSzow0uNfJp/HWlvxfs1IhPR1CCIATPLiR9ZF5ib0ZjtfwK/9uOBi6T5uMk2dAIf60GLOvKknhaKEdPnm/FhrlcyoyKWtaJxbO/MUMvEtDrOycVysl6WqG5WNj8YlKdApydRNIEuzTVzeutZ9xwSR4iVU4mqt3bmDHxOgWKKTNjNWRzbQIyMNhU5zI5zUOKMESMKO2s32ub1fcw26FxJpplaRDQnV7ga2HubsAizo5PNj/vMXVrIfqEFDwSLHlAyq5aFmmMuVpyWYLuy9nC1EyLlODsrKFvPOE5gkxyBlh6yhhPGdwmdDmETxcxuZPRrClMHmugRWrrPr6b9B8SOJbRm4t9IdFH0iKVUT+yh+RqjvBrQtRVjbSTrIS5OxXaTwP4SWrvyeHEx0kifWqvNSnBPvIonxrhcAy5eHFNWOqGc26RPlz4tZF795OGGyuuhoDGS+GMkMTxp2V0uGaEOYRSKGvW9OCqt30/FK/ReH9C6xzujb+ywL3suBXdTAxsfTCVj6RhubCQOYrgfN4bija7OdhJWJCrE4sdhTeZ7Rqhrlwedbh7u1DGs04WxKt/fU/hGPxexfen19Uj6f6eVfolWUlvlGxlYNz7/LVkRg4tpoZ7bZkemCuH6wtQJbFWb+gKuARaYMfSiUgrkyyPxfezQl/W8kAt3k3Vz9plJ7WP46yGzuBiQwOIG4lWZPKnYWKD1eiXVUQZpzdoD1NBhtWFWubomkT6EZ7uIO8ppqYh2vqbdbAkVK2EfOWwuc8c2Is+Ai4tyPNtUmPmouMk6DO4R+L1B1p4jjy6xytizr90asJtgt100mULauc1uQyvR0N7j/D2WunJm72ew9wnq176gdQP8jF8We+mF8JJ4movk1Kpo66GXrceq6nUydYpG55QhOujfWujb9uEpenxcyB9tcDSDt7n+jaMqcz0UHTICc+GuEtThphvh2nks3XmIdyi7PsvIJEu7Cs/FsLxlrpfe7bSy5wKmBr6VmoVpci089Dh0dWBYJ99urAj9LoXr2enGKnsFa80/dWcP6R2l5Whh+rm8nYwkGieoThlZtrCBdFoJMu8LazXPkKubqEb8Gm27j87FxsOIE0sEiGVPrn1X4iNlcahio1kxAvEO2+J2KhoMe7mwB2G+tL5Gns8cQvr777u77vL8FfuS/00PUtnShQzRvU8C7zMxiT3U70r5rOF6bcXBFXQsNZfr5surP1frp0LR79zCem4AXn0bNVVRJvscQHdsWRyhv5Vuwa/8Jqjo9IoDqdwH3lneRO6YrOHnWofBQhBdQHZzgjMTJDmDlFGfIf/zvUxOM2LY5AC7GW2a/YwEJpuyffIJml+xr+/PE0E23CfEmSv9WOrua8y8Ka24VlLpOv95LtEj2cFb7uMrK+HfrNml2vb7D0YohZTfoqeLUVtnXr7O5PRosSEbhvkvjwufv3Mfv7DRlnWxrUoNexmmwf4f1tNzexazEDmGJdU4W+TMsxKDzty+vWDrWNhzh/mamsNo2+9FPwSypj+f5xAP9btrn5gEGcev4srpbrIbPsHjnByeU7hzE/9scYY5Q1v/DbBvKnXNUqp5PgHJoKOhF2u3WXxF7E5HvIWXrXWceA3+biT+jwMrL9aETO+/w9mPxuuRXgZZxT+nuJ8HOdv5KLCdzVVOsWJizsqqqcrOPRJTXsHDjF2sy7jsF7GchtzueJ7hV4dup9AS1+247dzs//+cbJcup2u7nCZZsOlnNr/vu0K1nNgzljnevEw9XV3T01jO9kdru+h89ZOvqountZzx/bM83Z0dqQbxfkZSaFmY91O8S3Nv2Tp4P9BVr2jmBZ6d4XcP+n1Vi+LMGc4Fj+mO7nw78vwhLPAVOr1TmncJWkzjgr417W/k3UOEa331JdA8xtq6+p28E+uAaovGEXht481fXebpFVqOS8jUVC/p3heyX5NWmTeF5+CFOe3SfbdryNUZdjScMTJHJAM/rRHtM9DT/FeAlB43LZ8nwmkNGGnKXbynvATWF7h7Sf/bNI/fW9YgM3PbhAwn9JxlqYMD1gRzdIR3od9gxkviqwsu2rBBnlmBhBf4FYxer3f9EneZs5Zo+QJ1jKFSFSyZD43/13bnDuRv4C2RsZAiHxE03cCuF9BCXbCvyTtNHx3G3llgBb/oqIHfl1YHeX4NtVAHZTZgdngJKerAo4HZHZxQHIFSw67XKy9wv+vRZOtmzTc8DI/k9KKuvqJd62I5NSAUSsF+oPl3UjDONfk+stHD13FTdHhkNdqCLRVReQWPq2NWDfroWBRO4KXnwvmlZ0dGj5dihS3LWYiv8RYzb5cIwbTM3qEGj/GWuyEcdiwa2+ly9Lr773yeIOeOUY9VsX5Go82/DMv/0uoVTqBcFcu/7DpB7uS+Q//eK1Kf4NmnxN0h/b2gWuO5/SXR8/8AHMWs+QAAeNptz0dM03EUwPHvg9JC2XuLe4///1/KcNJK6957iwJtFQGLVXEbcIPRmHjTuC5q3KJGox7UuFccUQ+e3fGgXrX4/3nzXT55L3mLCP7G7zYM/hcfQCIkkkgsRGHFRjQx2IkljngSSCSJZFJIJY10Msgki2xyyCWPfDpQQEc60ZkudKUb3elBT3rRmz70pR/9GYCGHt7toBAnRRRTQikDGcRghjCUYZThws1wyvHgZQQjGcVoxjCWcYxnAhOZxGSmMJVpTGcGM5nFbOYwl3nMZwELqRALR2lmC9fZH/5oK7vZxQGOc0yi2Mk7mtgnVrHRKtFs5xbvJYaDnOAnP/jFEU5xn7ucZhGL2UMlD6niHg94yiMe84SPVPOCZzznDD6+s5fXvOQVfj7zlR0sIcBSllFDLYeoYzn1BGkgxApWsopPrGYNjaxlPeu4wmE2soFNbOYL37jKWc5xjTe8FbvESpzES4IkSpIkS4qkSpqkS4Zkcp4LXOIyt7lIG3fYxknJ4gY3JVtyaJFcyZN8q6+msd6v20K1AU3Tyk1dmlLlbkPpUDqVpe0a4UalrjSUDmWh0qksUhYrS5T/5rlMdTVX1+3VAV8oWFVZ0eA3S4bX1Om1eELBuvbEo+7wus07whp/ANbdmiQAAAB42kXNuwrCQBQE0GzWvMz70SgoEcsFSzs7k8IgiFUW/AvB2sZSG3/kxsq/01HXTXfPMMx9steF2NVoyN21HWM32dW2aGeUyIaKPY6znJAtDq1BvKyIizW5ZfXgW1N84QDuWMEGnJWCBdhHhQFgLRS8z8BdYQh44Q+MfPUjQOrnpuh4fQJDMOgZgeFGMwajqWYCxn05BZOlZgamc80czEaaBZiXf0oqxBtIPVDjAAFSfYBdAAA=') format('woff');
-}
-
-/* Source Code Pro license */
-/* Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-
-This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE. */
\ No newline at end of file
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-prefix.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-prefix.tex
deleted file mode 100644
index 480671a3d7..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-prefix.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-% This is the prefix for PLT Scheme manuals
-\documentclass{article}
-
-\parskip=10pt
-\parindent=0pt
-\partopsep=0pt
-
-% Adjust margins to match HTML width for
-% fixed-width font
-\advance \oddsidemargin by -0.15in
-\advance \evensidemargin by -0.15in
-\advance \textwidth by 0.3in
-
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-racket.css b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-racket.css
deleted file mode 100644
index 18c936071c..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-racket.css
+++ /dev/null
@@ -1,319 +0,0 @@
-/* See the beginning of "manual.css". */
-
-/* Monospace: */
-
-.RktIn, .RktRdr, .RktPn, .RktMeta,
-.RktMod, .RktKw, .RktVar, .RktSym,
-.RktRes, .RktOut, .RktCmt, .RktVal,
-.RktBlk, .RktErr {
-  font-family: 'Source Code Pro', monospace;
-  white-space: inherit;
-    font-size: 1rem;
-}
-
-/* this selctor grabs the first linked Racket symbol
-in a definition box (i.e., the symbol being defined) */
-a.RktValDef, a.RktStxDef, a.RktSymDef,
-span.RktValDef, span.RktStxDef, span.RktSymDef
-{
-    font-size: 1.15rem;
-    color: black;
-    font-weight: 600;
-}
-
-
-.inheritedlbl {
-  font-family: 'Fira', sans;
-}
-
-.RBackgroundLabelInner {
-  font-family: inherit;
-}
-
-/* ---------------------------------------- */
-/* Inherited methods, left margin */
-
-.inherited {
-  width: 95%;
-  margin-top: 0.5em;
-  text-align: left;
-  background-color: inherit;
-}
-
-.inherited td {
-  font-size: 82%;
-  padding-left: 0.5rem;
-  line-height: 1.3;
-  text-indent: 0;
-  padding-right: 0;
-}
-
-.inheritedlbl {
-  font-style: normal;
-}
-
-/* ---------------------------------------- */
-/* Racket text styles */
-
-.RktIn {
-  color: #cc6633;
-  background-color: #eee;
-}
-
-.RktInBG {
-  background-color: #eee;
-}
-
-
-.refcolumn .RktInBG {
-  background-color: white;
-}
-
-.RktRdr {
-}
-
-.RktPn {
-  color: #843c24;
-}
-
-.RktMeta {
-  color: black;
-}
-
-.RktMod {
-  color: inherit;
-}
-
-.RktOpt {
-  color: black;
-}
-
-.RktKw {
-  color: black;
-}
-
-.RktErr {
-  color: red;
-  font-style: italic;
-  font-weight: 400;
-}
-
-.RktVar {
-    position: relative;
-    left: -1px; font-style: italic;
-    color: #444;
-}
-
-.SVInsetFlow .RktVar {
-    font-weight: 400;
-    color: #444;
-}
-
-
-.RktSym {
-   color: inherit;
-}
-
-
-
-.RktValLink, .RktStxLink, .RktModLink {
-  text-decoration: none;
-    color: #07A;
-    font-weight: 500;
-    font-size: 1rem;
-}
-
-/* for syntax links within headings */
-h2 a.RktStxLink, h3 a.RktStxLink, h4 a.RktStxLink, h5 a.RktStxLink,
-h2 a.RktValLink, h3 a.RktValLink, h4 a.RktValLink, h5 a.RktValLink,
-h2 .RktSym, h3 .RktSym, h4 .RktSym, h5 .RktSym,
-h2 .RktMod, h3 .RktMod, h4 .RktMod, h5 .RktMod,
-h2 .RktVal, h3 .RktVal, h4 .RktVal, h5 .RktVal,
-h2 .RktPn, h3 .RktPn, h4 .RktPn, h5 .RktPn {
-    color: #333;
-    font-size: 1.65rem;
-    font-weight: 400;
-}
-
-.toptoclink .RktStxLink, .toclink .RktStxLink,
-.toptoclink .RktValLink, .toclink .RktValLink,
-.toptoclink .RktModLink, .toclink .RktModLink {
-    color: inherit;
-}
-
-.tocset .RktValLink, .tocset .RktStxLink, .tocset .RktModLink {
-    color: black;
-  font-weight: 400;
-    font-size: 0.9rem;
-}
-
-.tocset td a.tocviewselflink .RktValLink,
-.tocset td a.tocviewselflink .RktStxLink,
-.tocset td a.tocviewselflink .RktMod,
-.tocset td a.tocviewselflink .RktSym {
-    font-weight: lighter;
-    color: white;
-}
-
-
-.RktRes {
-  color: #0000af;
-}
-
-.RktOut {
-  color: #960096;
-}
-
-.RktCmt {
-  color: #c2741f;
-}
-
-.RktVal {
-  color: #228b22;
-}
-
-/* ---------------------------------------- */
-/* Some inline styles */
-
-.together { /* for definitions grouped together in one box */
-  width: 100%;
-  border-top: 2px solid white;
-}
-
-tbody > tr:first-child > td > .together {
-  border-top: 0px; /* erase border on first instance of together */
-}
-
-.RktBlk {
-  white-space: pre;
-  text-align: left;
-}
-
-.highlighted {
-    font-size: 1rem;
-    background-color: #fee;
-}
-
-.defmodule {
-    font-family: 'Source Code Pro';
-    padding: 0.25rem 0.75rem 0.25rem 0.5rem;
-    margin-bottom: 1rem;
-    width: 100%;
-    background-color: hsl(60, 29%, 94%);
-}
-
-.defmodule a {
-    color: #444;
-}
-
-
-.defmodule td span.hspace:first-child {
-  position: absolute;
-  width: 0;
-  display: inline-block;
-}
-
-.defmodule .RpackageSpec .Smaller,
-.defmodule .RpackageSpec .stt {
-    font-size: 1rem;
-}
-
-
-.specgrammar {
-    float: none;
-    padding-left: 1em;
-}
-
-
-.RBibliography td {
-  vertical-align: text-top;
-  padding-top: 1em;
-}
-
-.leftindent {
- margin-left: 2rem;
- margin-right: 0em;
-}
-
-.insetpara {
- margin-left: 1em;
- margin-right: 1em;
-}
-
-.SCodeFlow .Rfilebox {
-    margin-left: -1em; /* see 17.2 of guide, module languages */
-}
-
-.Rfiletitle {
-  text-align: right;
-  background-color: #eee;
-}
-
-.SCodeFlow .Rfiletitle {
-  border-top: 1px dotted gray;
-  border-right: 1px dotted gray;
-}
-
-
-.Rfilename {
-  border-top: 0;
-  border-right: 0;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-  background-color: inherit;
-}
-
-.Rfilecontent {
-  margin: 0.5em;
-}
-
-.RpackageSpec {
-  padding-right: 0;
-}
-
-/* ---------------------------------------- */
-/* For background labels */
-
-.RBackgroundLabel {
-   float: right;
-   width: 0px;
-   height: 0px;
-}
-
-.RBackgroundLabelInner {
-   position: relative;
-   width: 25em;
-   left: -25.5em;
-   top: 0.20rem; /* sensitive to monospaced font choice */
-   text-align: right;
-   z-index: 0;
-   font-weight: 300;
-   font-family: 'Source Code Pro';
-   font-size: 0.9rem;
-    color: gray;
-}
-
-
-.RpackageSpec .Smaller {
-   font-weight: 300;
-   font-family: 'Source Code Pro';
-   font-size: 0.9rem;
-}
-
-.RForeground {
-   position: relative;
-   left: 0px;
-   top: 0px;
-   z-index: 1;
-}
-
-/* ---------------------------------------- */
-/* For section source modules & tags */
-
-.RPartExplain {
-    background: #eee;
-    font-size: 0.9rem;
-    margin-top: 0.2rem;
-    padding: 0.2rem;
-    text-align: left;
-}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-racket.js b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-racket.js
deleted file mode 100644
index 203d6d3086..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-racket.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/* For the Racket manual style */
-
-AddOnLoad(function() {
-    /* Look for header elements that have x-source-module and x-part tag.
-       For those elements, add a hidden element that explains how to
-       link to the section, and set the element's onclick() to display
-       the explanation. */
-    var tag_names = ["h1", "h2", "h3", "h4", "h5"];
-    for (var j = 0; j < tag_names.length; j++) {
-        elems = document.getElementsByTagName(tag_names[j]);
-        for (var i = 0; i < elems.length; i++) {
-            var elem = elems.item(i);
-            AddPartTitleOnClick(elem);
-        }
-    }
-})
-
-function AddPartTitleOnClick(elem) {
-    var mod_path = elem.getAttribute("x-source-module");
-    var tag = elem.getAttribute("x-part-tag");
-    if (mod_path && tag) {
-        // Might not be present:
-        var prefixes = elem.getAttribute("x-part-prefixes");
-
-        var info = document.createElement("div");
-        info.className = "RPartExplain";
-
-        /* The "top" tag refers to a whole document: */
-        var is_top = (tag == "\"top\"");
-        info.appendChild(document.createTextNode("Link to this "
-                                                 + (is_top ? "document" : "section")
-                                                 + " with "));
-
-        /* Break `secref` into two lines if the module path and tag
-           are long enough: */
-        var is_long = (is_top ? false : ((mod_path.length
-                                          + tag.length
-                                          + (prefixes ? (16 + prefixes.length) : 0))
-                                         > 60));
-
-        var line1 = document.createElement("div");
-        var line1x = ((is_long && prefixes) ? document.createElement("div") : line1);
-        var line2 = (is_long ? document.createElement("div") : line1);
-
-        function add(dest, str, cn) {
-            var s = document.createElement("span");
-            s.className = cn;
-            s.style.whiteSpace = "nowrap";
-            s.appendChild(document.createTextNode(str));
-            dest.appendChild(s);
-        }
-        /* Construct a `secref` call with suitable syntax coloring: */
-        add(line1, "\xA0@", "RktRdr");
-        add(line1, (is_top ? "other-doc" : "secref"), "RktSym");
-        add(line1, "[", "RktPn");
-        if (!is_top)
-            add(line1, tag, "RktVal");
-        if (is_long) {
-            /* indent additional lines: */
-            if (prefixes)
-                add(line1x, "\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0", "RktPn");
-            add(line2, "\xA0\xA0\xA0\xA0\xA0\xA0\xA0\xA0", "RktPn");
-        }
-        if (prefixes) {
-            add(line1x, " #:tag-prefixes ", "RktPn");
-            add(line1x, "'", "RktVal");
-            add(line1x, prefixes, "RktVal");
-        }
-        if (!is_top)
-            add(line2, " #:doc ", "RktPn");
-        add(line2, "'", "RktVal");
-        add(line2, mod_path, "RktVal");
-        add(line2, "]", "RktPn");
-
-        info.appendChild(line1);
-        if (is_long)
-            info.appendChild(line1x);
-        if (is_long)
-            info.appendChild(line2);
-
-        info.style.display = "none";
-
-        /* Add the new element afterthe header: */
-        var n = elem.nextSibling;
-        if (n)
-            elem.parentNode.insertBefore(info, n);
-        else
-            elem.parentNode.appendChild(info);
-
-        /* Clicking the header shows the explanation element: */
-        elem.onclick = function () {
-            if (info.style.display == "none")
-                info.style.display = "block";
-            else
-                info.style.display = "none";
-        }
-    }
-}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-struct.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-struct.rkt
deleted file mode 100644
index ef1f2f3f9d..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-struct.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scheme/base
-(require "core.rkt"
-         "private/provide-structs.rkt"
-         racket/contract/base)
-
-(provide-structs
- [module-path-index-desc ()]
- [exported-index-desc ([name symbol?]
-                       [from-libs (listof module-path?)])]
- [(method-index-desc exported-index-desc) ([method-name symbol?]
-                                           [class-tag tag?])]
- [(constructor-index-desc exported-index-desc) ([class-tag tag?])]
- [(procedure-index-desc exported-index-desc) ()]
- [(thing-index-desc exported-index-desc) ()]
- [(struct-index-desc exported-index-desc) ()]
- [(form-index-desc exported-index-desc) ()]
- [(class-index-desc exported-index-desc) ()]
- [(interface-index-desc exported-index-desc) ()]
- [(mixin-index-desc exported-index-desc) ()])
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.css b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.css
deleted file mode 100644
index fa7e8cc83e..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.css
+++ /dev/null
@@ -1,743 +0,0 @@
-
-/* See the beginning of "scribble.css".
-   This file is used by the `scribble/manual` language, along with
-   "manual-racket.css". */
-
-@import url("manual-fonts.css");
-
-* {
-    margin: 0;
-    padding: 0;
-}
-
-@media all {html {font-size: 15px;}}
-@media all and (max-width:940px){html {font-size: 14px;}}
-@media all and (max-width:850px){html {font-size: 13px;}}
-@media all and (max-width:830px){html {font-size: 12px;}}
-@media all and (max-width:740px){html {font-size: 11px;}}
-
-/* CSS seems backward: List all the classes for which we want a
-   particular font, so that the font can be changed in one place.  (It
-   would be nicer to reference a font definition from all the places
-   that we want it.)
-
-   As you read the rest of the file, remember to double-check here to
-   see if any font is set. */
-
-/* Monospace: */
-.maincolumn, .refpara, .refelem, .tocset, .stt, .hspace, .refparaleft, .refelemleft {
-    font-family: 'Source Code Pro', monospace;
-    white-space: inherit;
-    font-size: 1rem;
-}
-
-.stt {
-    font-weight: 500;
-}
-
-h2 .stt {
-    font-size: 2.7rem;
-}
-
-.toptoclink .stt {
-    font-size: inherit;
-}
-.toclink .stt {
-    font-size: 90%;
-}
-
-.RpackageSpec .stt {
-    font-weight: 300;
-    font-family: 'Source Code Pro';
-    font-size: 0.9rem;
-}
-
-h3 .stt, h4 .stt, h5 .stt {
-    color: #333;
-    font-size: 1.65rem;
-    font-weight: 400;
-}
-
-
-/* Serif: */
-.main, .refcontent, .tocview, .tocsub, .sroman, i {
-    font-family: 'Charter', serif;
-    font-size: 1.18rem;
-}
-
-
-/* Sans-serif: */
-.version, .versionNoNav, .ssansserif {
-    font-family: 'Fira', sans-serif;
-}
-.ssansserif {
-    font-family: 'Fira';
-    font-weight: 500;
-    font-size: 0.9em;
-}
-
-.tocset .ssansserif {
-    font-size: 100%;
-}
-
-/* ---------------------------------------- */
-
-p, .SIntrapara {
-    display: block;
-    margin: 0 0 1em 0;
-    line-height: 1.4;
-}
-
-.compact {
-  padding: 0 0 1em 0;
-}
-
-li {
-    list-style-position: outside;
-    margin-left: 1.2em;
-}
-
-h1, h2, h3, h4, h5, h6, h7, h8 {
-    font-family: 'Fira';
-    font-weight: 300;
-    font-size: 1.6rem;
-    color: #333;
-    margin-top: inherit;
-    margin-bottom: 1rem;
-    line-height: 1.25;
-    -moz-font-feature-settings: 'tnum=1';
-    -moz-font-feature-settings: 'tnum' 1;
-    -webkit-font-feature-settings: 'tnum' 1;
-    -o-font-feature-settings: 'tnum' 1;
-    -ms-font-feature-settings: 'tnum' 1;
-    font-feature-settings: 'tnum' 1;
-
-}
-
-h3, h4, h5, h6, h7, h8 {
-    border-top: 1px solid black;
-}
-
-
-
-h2 { /* per-page main title */
-    font-family: 'Miso';
-    font-weight: bold;
-    margin-top: 4rem;
-    font-size: 3rem;
-    line-height: 1.1;
-    width: 90%;
-}
-
-h3, h4, h5, h6, h7, h8 {
-    margin-top: 2em;
-    padding-top: 0.1em;
-    margin-bottom: 0.75em;
-}
-
-/* ---------------------------------------- */
-/* Main */
-
-body {
-    color: black;
-    background-color: white;
-}
-
-.maincolumn {
-    width: auto;
-    margin-top: 4rem;
-    margin-left: 17rem;
-    margin-right: 2rem;
-    margin-bottom: 10rem; /* to avoid fixed bottom nav bar */
-    max-width: 700px;
-    min-width: 370px; /* below this size, code samples don't fit */
-}
-
-a {
-    text-decoration: inherit;
-}
-
-a, .toclink, .toptoclink, .tocviewlink, .tocviewselflink, .tocviewtoggle, .plainlink, 
-.techinside, .techoutside:hover, .techinside:hover {
-    color: #07A;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-
-/* ---------------------------------------- */
-/* Navigation */
-
-.navsettop, .navsetbottom {
-    left: 0;
-    width: 15rem;
-    height: 6rem;
-    font-family: 'Fira';
-    font-size: 0.9rem;
-    border-bottom: 0px solid hsl(216, 15%, 70%);
-    background-color: inherit;
-    padding: 0;
-}
-
-.navsettop {
-    position: absolute;
-    top: 0;
-    left: 0;
-    margin-bottom: 0;
-    border-bottom: 0;
-}
-
-.navsettop a, .navsetbottom a {
-    color: black;
-}
-
-.navsettop a:hover, .navsetbottom a:hover {
-    background: hsl(216, 78%, 95%);
-    text-decoration: none;
-}
-
-.navleft, .navright {
-    position: static;
-    float: none;
-    margin: 0;
-    white-space: normal;
-}
-
-
-.navleft a {
-    display: inline-block;
-}
-
-.navright a {
-    display: inline-block;
-    text-align: center;
-}
-
-.navleft a, .navright a, .navright span {
-    display: inline-block;
-    padding: 0.5rem;
-    min-width: 1rem;
-}
-
-
-.navright {
-    height: 2rem;
-    white-space: nowrap;
-}
-
-
-.navsetbottom {
-    display: none;
-}
-
-.nonavigation {
-    color: #889;
-}
-
-.searchform {
-    display: block;
-    margin: 0;
-    padding: 0;
-    border-bottom: 1px solid #eee;
-    height: 4rem;
-}
-
-.nosearchform {
-    margin: 0;
-    padding: 0;
-    height: 4rem;
-}
-
-.searchbox {
-    font-size: 1rem;
-    width: 12rem;
-    margin: 1rem;
-    padding: 0.25rem;
-    vertical-align: middle;
-    background-color: white;
-}
-
-#search_box {
-    font-size: 0.8rem;
-}
-
-/* ---------------------------------------- */
-/* Version */
-
-.versionbox {
-    position: absolute;
-    float: none;
-    top: 0.25rem;
-    left: 17rem;
-    z-index: 11000;
-    height: 2em;
-    font-size: 70%;
-    font-weight: lighter;
-    width: inherit;
-    margin: 0;
-}
-.version, .versionNoNav {
-    font-size: inherit;
-}
-.version:before, .versionNoNav:before {
-    content: "v.";
-}
-
-
-/* ---------------------------------------- */
-/* Margin notes */
-
-/* cancel scribble.css styles: */
-.refpara, .refelem {
-  position: static;
-  float: none;
-  height: auto;
-  width: auto;
-  margin: 0;
-}
-
-.refcolumn {
-    position: static;
-    display: block;
-    width: auto;
-    font-size: inherit;
-    margin: 2rem;
-    margin-left: 2rem;
-    padding: 0.5em;
-    padding-left: 0.75em;
-    padding-right: 1em;
-    background: hsl(60, 29%, 94%);
-    border: 1px solid #ccb;
-    border-left: 0.4rem solid #ccb;
-}
-
-
-/* slightly different handling for margin-note* on narrow screens */
-@media all and (max-width:1260px) {
-     span.refcolumn {
-         float: right;
-         width: 50%;
-         margin-left: 1rem;
-         margin-bottom: 0.8rem;   
-         margin-top: 1.2rem; 
-     }
-
-}
-
-.refcontent, .refcontent p {
-    line-height: 1.5;
-    margin: 0;
-}
-
-.refcontent p + p {
-    margin-top: 1em;
-}
-
-.refcontent a {
-    font-weight: 400;
-}
-
-.refpara, .refparaleft {
-    top: -1em;
-}
-
-
-@media all and (max-width:600px) {
-    .refcolumn {
-        margin-left: 0;
-        margin-right: 0;
-    }
-}
-
-
-@media all and (min-width:1260px) {
-    .refcolumn {
-        position: absolute;
-        left: 66rem; right: 3em;
-        margin: 0;
-        float: right;
-        max-width: 18rem;
-    }
-}
-
-.refcontent {
-    font-family: 'Fira';
-    font-size: 1rem;
-    line-height: 1.6;
-    margin: 0 0 0 0;
-}
-
-
-.refparaleft, .refelemleft {
-    position: relative;
-    float: left;
-    right: 2em;
-    height: 0em;
-    width: 13em;
-    margin: 0em 0em 0em -13em;
-}
-
-.refcolumnleft {
-    background-color: hsl(60, 29%, 94%);
-    display: block;
-    position: relative;
-    width: 13em;
-    font-size: 85%;
-    border: 0.5em solid hsl(60, 29%, 94%);
-    margin: 0 0 0 0;
-}
-
-
-/* ---------------------------------------- */
-/* Table of contents, left margin */
-
-.tocset {
-    position: absolute;
-    float: none;
-    left: 0;
-    top: 0rem;
-    width: 14rem;
-    padding: 7rem 0.5rem 0.5rem 0.5rem;
-    background-color: hsl(216, 15%, 70%);
-    margin: 0;
-
-}
-
-.tocset td {
-    vertical-align: text-top;
-    padding-bottom: 0.4rem;
-    padding-left: 0.2rem;
-    line-height: 1.1;
-    font-family: 'Fira';
-    -moz-font-feature-settings: 'tnum=1';
-    -moz-font-feature-settings: 'tnum' 1;
-    -webkit-font-feature-settings: 'tnum' 1;
-    -o-font-feature-settings: 'tnum' 1;
-    -ms-font-feature-settings: 'tnum' 1;
-    font-feature-settings: 'tnum' 1;
-
-}
-
-.tocset td a {
-    color: black;
-    font-weight: 400;
-}
-
-
-.tocview {
-    text-align: left;
-    background-color: inherit;
-}
-
-
-.tocview td, .tocsub td {
-    line-height: 1.3;
-}
-
-
-.tocview table, .tocsub table {
-    width: 90%;
-}
-
-.tocset td a.tocviewselflink {
-    font-weight: lighter;
-    font-size: 110%; /* monospaced styles below don't need to enlarge */
-    color: white;
-}
-
-.tocviewselflink {
-    text-decoration: none;
-}
-
-.tocsub {
-    text-align: left;
-    margin-top: 0.5em;
-    background-color: inherit;
-}
-
-.tocviewlist, .tocsublist {
-    margin-left: 0.2em;
-    margin-right: 0.2em;
-    padding-top: 0.2em;
-    padding-bottom: 0.2em;
-}
-.tocviewlist table {
-    font-size: 82%;
-}
-
-.tocviewlisttopspace {
-    margin-bottom: 1em;
-}
-
-.tocviewsublist, .tocviewsublistonly, .tocviewsublisttop, .tocviewsublistbottom {
-    margin-left: 0.4em;
-    border-left: 1px solid #99a;
-    padding-left: 0.8em;
-}
-.tocviewsublist {
-    margin-bottom: 1em;
-}
-.tocviewsublist table,
-.tocviewsublistonly table,
-.tocviewsublisttop table,
-.tocviewsublistbottom table,
-table.tocsublist {
-    font-size: 1rem;
-}
-
-.tocviewsublist td, .tocviewsublistbottom td, .tocviewsublisttop td, .tocsub td,
-.tocviewsublistonly td {
-    font-size: 90%;
-}
-
-
-.tocviewtoggle {
-    font-size: 75%; /* looks better, and avoids bounce when toggling sub-sections due to font alignments */
-}
-
-.tocsublist td {
-    padding-left: 0.5rem;
-    padding-top: 0.25rem;
-    text-indent: 0;
-}
-
-.tocsublinknumber {
-    font-size: 100%;
-}
-
-.tocsublink {
-    font-size: 82%;
-    text-decoration: none;
-}
-
-.tocsubseclink {
-    font-size: 100%;
-    text-decoration: none;
-}
-
-.tocsubnonseclink {
-    font-size: 82%;
-    text-decoration: none;
-    margin-left: 1rem;
-    padding-left: 0;
-    display: inline-block;
-}
-
-/* the label "on this page" */
-.tocsubtitle {
-    display: block;
-    font-size: 62%;
-    font-family: 'Fira';
-    font-weight: bolder;
-    font-style: normal;
-    letter-spacing: 2px;
-    text-transform: uppercase;
-    margin: 0.5em;
-}
-
-.toptoclink {
-    font-weight: bold;
-    font-size: 110%;
-    margin-bottom: 0.5rem;
-    margin-top: 1.5rem;
-    display: inline-block;
-}
-
-.toclink {
-    font-size: inherit;
-}
-
-/* ---------------------------------------- */
-/* Some inline styles */
-
-.indexlink {
-    text-decoration: none;
-}
-
-pre {
-  margin-left: 2em;
-}
-
-blockquote {
-  margin-left: 2em;
-  margin-right: 2em;
-  margin-bottom: 1em;
-}
-
-.SCodeFlow {
-    border-left: 1px dotted black;
-    padding-left: 1em;
-    padding-right: 1em;
-    margin-top: 1em;
-    margin-bottom: 1em;
-    margin-left: 0em;
-    margin-right: 2em;
-    white-space: nowrap;
-    line-height: 1.5;
-}
-
-.SCodeFlow img {
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
-}
-
-.boxed {
-    margin: 0;
-    margin-top: 2em;
-    padding: 0.25em;
-    padding-bottom: 0.5em;
-    background: #f3f3f3;
-    box-sizing:border-box;
-    border-top: 1px solid #99b;
-    background: hsl(216, 78%, 95%);
-    background: -moz-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%);
-    background: -webkit-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%);
-    background: -o-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%);
-    background: -ms-linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%);
-    background: linear-gradient(to bottom left, hsl(0, 0%, 99%) 0%, hsl(216, 78%, 95%) 100%);
-}
-
-blockquote > blockquote.SVInsetFlow {
-/* resolves issue in e.g. /reference/notation.html */
-    margin-top: 0em;
-}
-
-.leftindent .SVInsetFlow { /* see e.g. section 4.5 of Racket Guide */
-    margin-top: 1em;
-    margin-bottom: 1em;
-}
-
-.SVInsetFlow a, .SCodeFlow a {
-    color: #07A;
-    font-weight: 500;
-}
-
-.SubFlow {
-    display: block;
-    margin: 0em;
-}
-
-.boxed {
-    width: 100%;
-    background-color: inherit;
-}
-
-.techoutside       { text-decoration: none; }
-
-.SAuthorListBox {
-    position: static;
-    float: none;
-    font-family: 'Fira';
-    font-weight: 300;
-    font-size: 110%;
-    margin-top: 1rem;
-    margin-bottom: 3rem;
-    width: 30rem;
-    height: auto;
-}
-
-.author > a { /* email links within author block */
-    font-weight: inherit;
-    color: inherit;
-}
-
-.SAuthorList {
-    font-size: 82%;
-}
-.SAuthorList:before {
-    content: "by ";
-}
-.author {
-    display: inline;
-    white-space: nowrap;
-}
-
-/* phone + tablet styles */
-
-@media all and (max-width:720px){
-
-
-    @media all and (max-width:720px){
-
-        @media all {html {font-size: 15px;}}
-        @media all and (max-width:700px){html {font-size: 14px;}}
-        @media all and (max-width:630px){html {font-size: 13px;}}
-        @media all and (max-width:610px){html {font-size: 12px;}}
-        @media all and (max-width:550px){html {font-size: 11px;}}
-        @media all and (max-width:520px){html {font-size: 10px;}}
-
-        .navsettop, .navsetbottom {
-            display: block;
-            position: absolute;
-            width: 100%;
-            height: 4rem;
-            border: 0;
-            background-color: hsl(216, 15%, 70%);
-        }
-
-        .searchform {
-            display: inline;
-            border: 0;
-        }
-
-        .navright {
-            position: absolute;
-            right: 1.5rem;
-            margin-top: 1rem;
-            border: 0px solid red;
-        }
-
-        .navsetbottom {
-            display: block;
-            margin-top: 8rem;
-        }
-
-        .tocset {
-            display: none;
-        }
-
-        .tocset table, .tocset tbody, .tocset tr, .tocset td {
-            display: inline;
-        }
-
-        .tocview {
-            display: none;
-        }
-
-        .tocsub .tocsubtitle {
-            display: none;
-        }
-
-        .versionbox {
-            top: 4.5rem;
-            left: 1rem; /* same distance as main-column */
-            z-index: 11000;
-            height: 2em;
-            font-size: 70%;
-            font-weight: lighter;
-        }
-
-
-        .maincolumn {
-            margin-left: 1em;
-            margin-top: 7rem;
-            margin-bottom: 0rem;
-        }
-
-    }
-
-}
-
-/* print styles : hide the navigation elements */
-@media print {
-    .tocset,
-    .navsettop,
-    .navsetbottom { display: none; }
-    .maincolumn {
-        width: auto;
-        margin-right: 13em;
-        margin-left: 0;
-    }
-}
\ No newline at end of file
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.tex
deleted file mode 100644
index 50a42aa1ef..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Re-definitions for the PLT Scheme manual style
-
-\renewcommand{\sectionNewpage}{\newpage}
-
-\renewcommand{\preDoc}{\sloppy}
-
-\renewcommand{\ChapRef}[2]{\SecRef{#1}{#2}}
-\renewcommand{\SecRef}[2]{\S#1 ``#2''}
-\renewcommand{\ChapRefUC}[2]{\SecRefUC{#1}{#2}}
-\renewcommand{\SecRefUC}[2]{\SecRef{#1}{#2}}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/manual.rkt
deleted file mode 100644
index a6fa700473..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang scheme/base
-(require "base.rkt"
-         "private/manual-style.rkt"
-         "private/manual-scheme.rkt"
-         "private/manual-code.rkt"
-         "private/manual-mod.rkt"
-         "private/manual-tech.rkt"
-         "private/manual-bib.rkt"
-         "private/manual-proc.rkt"
-         "private/manual-form.rkt"
-         "private/manual-class.rkt"
-         "private/manual-unit.rkt"
-         "private/manual-vars.rkt"
-         "private/manual-bind.rkt"
-         "private/manual-utils.rkt"
-         "private/manual-defaults.rkt"
-         "private/manual-history.rkt")
-
-(provide unsyntax
-         make-binding-redirect-elements
-         defidentifier
-         current-display-width
-         manual-doc-style
-         (all-from-out "base.rkt"
-                       "private/manual-style.rkt"
-                       "private/manual-scheme.rkt"
-                       "private/manual-code.rkt"
-                       "private/manual-mod.rkt"
-                       "private/manual-tech.rkt"
-                       "private/manual-bib.rkt"
-                       "private/manual-form.rkt"
-                       "private/manual-class.rkt"
-                       "private/manual-unit.rkt"
-                       "private/manual-history.rkt")
-         (except-out (all-from-out "private/manual-vars.rkt")
-                     *deftogether)
-         (except-out (all-from-out "private/manual-proc.rkt")
-                     *defthing))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang.rkt
deleted file mode 100644
index b7f7a83ba4..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scheme/base
-(require scribble/doclang 
-         scribble/manual
-         scribble/html-properties
-         "../private/manual-defaults.rkt")
-(provide (except-out (all-from-out scribble/doclang) #%module-begin)
-         (all-from-out scribble/manual)
-         (rename-out [module-begin #%module-begin])
-         manual-doc-style)
-
-(define-syntax-rule (module-begin id . body)
-  (#%module-begin id post-process () . body))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang/reader.rkt
deleted file mode 100644
index ec831697ce..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang s-exp scribble/base/reader
-scribble/manual/lang
-#:wrapper1 (lambda (t) (cons 'doc (t)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/markdown-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/markdown-render.rkt
deleted file mode 100644
index 2772d45d03..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/markdown-render.rkt
+++ /dev/null
@@ -1,282 +0,0 @@
-#lang racket/base
-(require "core.rkt"
-         "base-render.rkt"
-         "private/render-utils.rkt"
-         racket/class racket/port racket/list racket/string racket/match
-         scribble/text/wrap)
-(provide render-mixin)
-
-(define current-preserve-spaces (make-parameter #f))
-
-(define current-indent (make-parameter 0))
-(define (make-indent amt)
-  (+ amt (current-indent)))
-(define (indent)
-  (define i (current-indent))
-  (unless (zero? i) (display (make-string i #\space))))
-(define (indented-newline)
-  (newline)
-  (indent))
-
-(define table-ticks-depth (make-parameter 0))
-(define phrase-ticks-depth (make-parameter 0))
-(define note-depth (make-parameter 0))
-
-(define (render-mixin %)
-  (class %
-    
-    (define/override (current-render-mode)
-      '(markdown))
-
-    (define/override (get-suffix) #".md")
-
-    (define/override (get-substitutions)
-      '((#rx"---" "\U2014")
-        (#rx"--" "\U2013")
-        (#rx"``" "\U201C")
-        (#rx"''" "\U201D")
-        (#rx"'" "\U2019")))
-
-    (inherit render-block
-             format-number
-             number-depth)
-
-    (define/override (render-part d ht)
-      (let ([number (collected-info-number (part-collected-info d ht))])
-        (unless (part-style? d 'hidden)
-          (printf (string-append (make-string (add1 (number-depth number)) #\#) " "))
-          (let ([s (format-number number '())])
-            (unless (null? s)
-              (printf "~a.~a" 
-                      (car s)
-                      (if (part-title-content d)
-                          " "
-                          "")))
-            (when (part-title-content d)
-              (render-content (part-title-content d) d ht))
-            (when (or (pair? number) (part-title-content d))
-              (newline)
-              (newline))))
-        (render-flow (part-blocks d) d ht #f)
-        (let loop ([pos 1]
-                   [secs (part-parts d)]
-                   [need-newline? (pair? (part-blocks d))])
-          (unless (null? secs)
-            (when need-newline? (newline))
-            (render-part (car secs) ht)
-            (loop (add1 pos) (cdr secs) #t)))))
-
-    (define/override (render-flow f part ht starting-item?)
-      (if (null? f)
-          null
-          (append*
-           (render-block (car f) part ht starting-item?)
-           (for/list ([p (in-list (cdr f))])
-             (indented-newline)
-             (render-block p part ht #f)))))
-
-    (define/override (render-intrapara-block p part ri first? last? starting-item?)
-      (unless first? (indented-newline))
-      (super render-intrapara-block p part ri first? last? starting-item?))
-
-    (define/override (render-table i part ht inline?)
-      (define flowss (table-blockss i))
-      (unless (null? flowss)
-        ;; Set table-ticks-depth prior to render-block calls
-        (define tick? (member (style-name (table-style i))
-                              (list 'boxed "defmodule" "RktBlk")))
-        (when tick?
-          (when (zero? (table-ticks-depth))
-            (displayln "```racket"))
-          (table-ticks-depth (add1 (table-ticks-depth))))
-        (define strs (map (lambda (flows)
-                            (map (lambda (d)
-                                   (if (eq? d 'cont)
-                                       d
-                                       (let ([o (open-output-string)])
-                                         (parameterize ([current-indent 0]
-                                                        [current-output-port o])
-                                           (render-block d part ht #f))
-                                         (regexp-split
-                                          #rx"\n"
-                                          (regexp-replace #rx"\n$"
-                                                          (get-output-string o)
-                                                          "")))))
-                                 flows))
-                          flowss))
-        (define widths (map (lambda (col)
-                              (for/fold ([d 0]) ([i (in-list col)])
-                                (if (eq? i 'cont)
-                                    0
-                                    (apply max d (map string-length i)))))
-                            (apply map list strs)))
-        (define x-length (lambda (col) (if (eq? col 'cont) 0 (length col))))
-        (for/fold ([indent? #f]) ([row (in-list strs)])
-          (let ([h (apply max 0 (map x-length row))])
-            (let ([row* (for/list ([i (in-range h)])
-                          (for/list ([col (in-list row)])
-                            (if (i . < . (x-length col))
-                                (list-ref col i)
-                                "")))])
-              (for/fold ([indent? indent?]) ([sub-row (in-list row*)])
-                (when indent? (indent))
-                (for/fold ([space? #f])
-                    ([col (in-list sub-row)]
-                     [w (in-list widths)])
-                  (let ([col (if (eq? col 'cont) "" col)])
-                    (display (regexp-replace* #rx"\uA0" col " "))
-                    (display (make-string (max 0 (- w (string-length col))) #\space)))
-                  #t)
-                (newline)
-                #t)))
-          #t)
-        (when tick?
-          (table-ticks-depth (sub1 (table-ticks-depth)))
-          (when (zero? (table-ticks-depth))
-            (displayln "```"))))
-      null)
-
-    (define/override (render-itemization i part ht)
-      (let ([flows (itemization-blockss i)])
-        (if (null? flows)
-            null
-            (append*
-             (begin (printf "* ")
-                    (parameterize ([current-indent (make-indent 2)])
-                      (render-flow (car flows) part ht #t)))
-             (for/list ([d (in-list (cdr flows))])
-               (indented-newline)
-               (printf "* ")
-               (parameterize ([current-indent (make-indent 2)])
-                 (render-flow d part ht #f)))))))
-
-    (define/override (render-paragraph p part ri)
-      (define (write-note)
-        (write-string (make-string (note-depth) #\>))
-        (unless (zero? (note-depth))
-          (write-string " ")))
-      (define o (open-output-string))
-      (parameterize ([current-output-port o])
-        (super render-paragraph p part ri))
-      ;; 1. Remove newlines so we can re-wrap the text.
-      ;;
-      ;; 2. Combine adjacent code spans into one. These result from
-      ;; something like @racket[(x y)] being treated as multiple
-      ;; RktXXX items rather than one. (Although it would be
-      ;; more-correct to handle them at that level, I don't easily see
-      ;; how. As a result I'm handling it after-the-fact, at the
-      ;; text/Markdown stage.)
-      (define to-wrap (regexp-replaces (get-output-string o)
-                                       '([#rx"\n" " "]   ;1
-                                         [#rx"``" ""]))) ;2
-      (define lines (wrap-line (string-trim to-wrap) (- 72 (current-indent))))
-      (write-note)
-      (write-string (car lines))
-      (for ([line (in-list (cdr lines))])
-        (newline) (indent) (write-note) (write-string line))
-      (newline)
-      null)
-
-    (define/private (content-style e)
-      (cond
-       [(element? e) (element-style e)]
-       [(multiarg-element? e) (multiarg-element-style e)]
-       [else #f]))
-
-    (define/override (render-content i part ri)
-      (define tick?
-        (and (zero? (table-ticks-depth))
-             (element? i)
-             (let ([s (element-style i)])
-               (or (eq? 'tt s)
-                   (and (style? s)
-                        (style-name s)
-                        (regexp-match? #rx"^Rkt[A-Z]" (style-name s)))))))
-      (when tick?
-        (when (zero? (phrase-ticks-depth))
-          (display "`"))
-        (phrase-ticks-depth (add1 (phrase-ticks-depth))))
-      (define properties (let ([s (content-style i)])
-                           (if (style? s) (style-properties s) '())))
-      (define targ (for/or ([p properties])
-                    (if (target-url? p) p #f)))
-      (define url (and targ (target-url-addr targ)))
-      (begin0
-          (cond [url (define new-i
-                       (match (element-content i)
-                         [(list (? string? s))
-                          (element (element-style i)
-                            (list (format "[~a](~a)" s url)))]
-                         [else i]))
-                     (super render-content new-i part ri)]
-                [(and (element? i)
-                      (let ([s (element-style i)])
-                        (or (eq? 'hspace s)
-                            (and (style? s)
-                                 (eq? 'hspace (style-name s))))))
-                 (parameterize ([current-preserve-spaces #t])
-                   (super render-content i part ri))]
-                [else (define style (and (element? i) (element-style i)))
-                      (define bold?   (eq? style 'bold))
-                      (define italic? (eq? style 'italic))
-                      (cond [bold?   (display "**")]
-                            [italic? (display "_")])
-                      (begin0
-                          (super render-content i part ri)
-                        (cond [bold?   (display "**")]
-                              [italic? (display "_")]))])
-        (when tick?
-          (phrase-ticks-depth (sub1 (phrase-ticks-depth)))
-          (when (zero? (phrase-ticks-depth))
-            (display "`")))))
-
-    (define/override (render-nested-flow i part ri starting-item?)
-      (define s (nested-flow-style i))
-      (unless (memq 'decorative (style-properties s))
-        (define note? (equal? (style-name s) "refcontent"))
-        (when note?
-          (note-depth (add1 (note-depth))))
-        (begin0 (super render-nested-flow i part ri starting-item?)
-          (when note?
-            (note-depth (sub1 (note-depth)))))))
-
-    (define/override (render-other i part ht)
-      (cond
-        [(symbol? i)
-         (display (case i
-                    [(mdash) "\U2014"]
-                    [(ndash) "\U2013"]
-                    [(ldquo) "\U201C"]
-                    [(rdquo) "\U201D"]
-                    [(lsquo) "\U2018"]
-                    [(rsquo) "\U2019"]
-                    [(lang) ">"]
-                    [(rang) "<"]
-                    [(rarr) "->"]
-                    [(nbsp) "\uA0"]
-                    [(prime) "'"]
-                    [(alpha) "\u03B1"]
-                    [(infin) "\u221E"]
-                    [else (error 'markdown-render "unknown element symbol: ~e"
-                                 i)]))]
-        [(string? i)
-         (let* ([i (if (or (not (zero? (phrase-ticks-depth)))
-                           (not (zero? (table-ticks-depth))))
-                       (regexp-replace** i '([#rx"``" . "\U201C"]
-                                             [#rx"''" . "\U201D"]))
-                       (regexp-replace* #px"([#_*`]{1})" i "\\\\\\1"))]
-                [i (if (current-preserve-spaces)
-                       (regexp-replace* #rx" " i "\uA0")
-                       i)])
-           (display i))]
-        [else (write i)])
-      null)
-
-    (super-new)))
-
-(define (regexp-replace** str ptns&reps)
-  (for/fold ([str str])
-            ([ptn (map car ptns&reps)]
-             [rep (map cdr ptns&reps)])
-    (regexp-replace* ptn str rep)))
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/pdf-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/pdf-render.rkt
deleted file mode 100644
index fd66cdb1e6..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/pdf-render.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scheme/base
-
-(require "private/indirect-renderer.rkt" "private/run-pdflatex.rkt"
-         (prefix-in latex: "latex-render.rkt"))
-
-(provide render-mixin
-         dvi-render-mixin)
-
-(define render-mixin
-  (make-indirect-renderer-mixin
-   (λ (%) (latex:render-mixin % #:image-mode 'pdf)) #".tex" #".pdf"
-   run-pdflatex))
-
-(define dvi-render-mixin
-  (make-indirect-renderer-mixin
-   (λ (%) (latex:render-mixin % #:image-mode 'ps)) #".tex" #".pdf"
-   run-dvipdf-latex))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/defaults.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/defaults.rkt
deleted file mode 100644
index c4b4be2a08..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/defaults.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang scheme/base
-(require scribble/core
-         scribble/latex-properties
-         scribble/html-properties
-         setup/collects)
-
-(provide scribble-file
-         downloaded-file
-         add-defaults)
-
-(define (add-property properties pred new)
-  (if (ormap pred properties)
-      properties
-      (cons new properties)))
-
-(define (scribble-file s)
-  (path->collects-relative (collection-file-path s "scribble")))
-
-(define (downloaded-file s)
-  (build-path (find-system-path 'addon-dir) s))
-
-(define (add-defaults doc pfx styl extras version?
-                      #:html [html #f]
-                      #:properties [properties null])
-  (struct-copy part doc [style (make-style (style-name (part-style doc))
-                                           ((if version? add-property (lambda (x y z) x))
-                                            (add-property
-                                             ((if html add-property (lambda (x y z) x))
-                                              (append
-                                               (style-properties (part-style doc))
-                                               properties)
-                                              html-defaults?
-                                              html)
-                                             latex-defaults?
-                                             (make-latex-defaults
-                                              pfx
-                                              styl
-                                              extras))
-                                            document-version?
-                                            (make-document-version (version))))]))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/indirect-renderer.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/indirect-renderer.rkt
deleted file mode 100644
index 68371ecfd4..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/indirect-renderer.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-
-(require racket/class racket/file racket/path)
-
-(provide make-indirect-renderer-mixin)
-
-(define (dotless bytes) (regexp-replace #rx#"[.]" bytes #""))
-
-(define ((make-indirect-renderer-mixin
-          base-renderer base-suffix target-suffix convert)
-         %renderer)
-  (class (base-renderer %renderer)
-    ;; set to a temp directory when doing the sub-rendering
-    (define tmp-dest-dir #f)
-    (define/override (get-dest-directory create?)
-      (or tmp-dest-dir (super get-dest-directory create?)))
-    (define/override (report-output?)
-      (and (not tmp-dest-dir) (super report-output?)))
-    (define/override (get-suffix) target-suffix)
-    (define/override (render srcs dests ri)
-      (define tmp-dir
-        (make-temporary-file
-         (format "scribble-~a-to-~a-~~a"
-                 (dotless base-suffix) (dotless target-suffix))
-         'directory))
-      (define (cleanup)
-        (when (directory-exists? tmp-dir) (delete-directory/files tmp-dir)))
-      (with-handlers ([void (lambda (e) (cleanup) (raise e))])
-        (define tmp-dests
-          (map (lambda (dest)
-                 (build-path tmp-dir
-                             (path-replace-suffix (file-name-from-path dest)
-                                                  base-suffix)))
-               dests))
-        (set! tmp-dest-dir tmp-dir)
-        ;; it would be better if it's ok to change current-directory for this
-        (super render srcs tmp-dests ri)
-        (for ([tmp tmp-dests] [dst dests])
-          (parameterize ([current-directory tmp-dir])
-            (convert (file-name-from-path tmp)))
-          (when (super report-output?) ; use the original
-            (printf " [Output to ~a]\n" dst))
-          (copy-file (build-path tmp-dir (file-name-from-path dst))
-                     dst
-                     #t))
-        (cleanup)))
-    (super-new)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/literal-anchor.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/literal-anchor.rkt
deleted file mode 100644
index e7b445642b..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/literal-anchor.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require racket/serialize)
-
-(provide (all-defined-out))
-
-(define-serializable-struct literal-anchor (string)
-  #:transparent)
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/lp.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/lp.rkt
deleted file mode 100644
index 3416ce08e3..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/lp.rkt
+++ /dev/null
@@ -1,85 +0,0 @@
-#lang scheme/base
-
-(require (for-syntax scheme/base syntax/boundmap)
-         scribble/scheme scribble/decode scribble/manual scribble/struct)
-
-(begin-for-syntax
-  ;; maps chunk identifiers to a counter, so we can distinguish multiple uses
-  ;; of the same name
-  (define chunk-numbers (make-free-identifier-mapping))
-  (define (get-chunk-number id)
-    (free-identifier-mapping-get chunk-numbers id (lambda () #f)))
-  (define (inc-chunk-number id)
-    (free-identifier-mapping-put! chunk-numbers id (+ 1 (free-identifier-mapping-get chunk-numbers id))))
-  (define (init-chunk-number id)
-    (free-identifier-mapping-put! chunk-numbers id 2)))
-
-(define-syntax-rule (define-chunk chunk-id racketblock)
-  (define-syntax (chunk-id stx)
-    (syntax-case stx ()
-      [(_ name expr (... ...)) 
-       ;; no need for more error checking, using chunk for the code will do that
-       (identifier? #'name)
-       (let* ([n (get-chunk-number (syntax-local-introduce #'name))]
-              [str (symbol->string (syntax-e #'name))]
-              [tag (format "~a:~a" str (or n 1))])
-         
-         (when n
-           (inc-chunk-number (syntax-local-introduce #'name)))
-         
-         (syntax-local-lift-expression #'(quote-syntax (a-chunk name expr (... ...))))
-         
-         (with-syntax ([tag tag]
-                       [str str]
-                       [((for-label-mod (... ...)) (... ...))
-                        (map (lambda (expr)
-                               (syntax-case expr (require)
-                                 [(require mod (... ...))
-                                  (let loop ([mods (syntax->list #'(mod (... ...)))])
-                                    (cond
-                                      [(null? mods) null]
-                                      [else 
-                                       (syntax-case (car mods) (for-syntax)
-                                         [(for-syntax x (... ...))
-                                          (append (loop (syntax->list #'(x (... ...))))
-                                                  (loop (cdr mods)))]
-                                         [x
-                                          (cons #'x (loop (cdr mods)))])]))]
-                                 [else null]))
-                             (syntax->list #'(expr (... ...))))]
-                       
-                       [(rest (... ...)) (if n
-                                     #`((subscript #,(format "~a" n)))
-                                     #`())])
-           #`(begin
-               (require (for-label for-label-mod (... ...) (... ...)))
-               #,@(if n
-                    #'()
-                    #'((define-syntax name (make-element-id-transformer
-                                            (lambda (stx) #'(chunkref name))))
-                       (begin-for-syntax (init-chunk-number #'name))))
-               (make-splice
-                (list (make-toc-element
-                       #f
-                       (list (elemtag '(chunk tag)
-                                      (bold (italic (racket name)) " ::=")))
-                       (list (smaller (elemref '(chunk tag) #:underline? #f
-                                               str
-                                               rest (... ...)))))
-                      (racketblock expr (... ...)))))))])))
-
-(define-chunk chunk racketblock)
-(define-chunk CHUNK RACKETBLOCK)
-
-(define-syntax (chunkref stx)
-  (syntax-case stx ()
-    [(_ id)
-     (identifier? #'id)
-     (with-syntax ([tag (format "~a:1" (syntax-e #'id))]
-                   [str (format "~a" (syntax-e #'id))])
-       #'(elemref '(chunk tag) #:underline? #f str))]))
-
-
-(provide (all-from-out scheme/base
-                       scribble/manual)
-         chunk CHUNK)
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bib.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bib.rkt
deleted file mode 100644
index 08b257411b..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bib.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang scheme/base
-(require racket/contract/base
-         "../decode.rkt"
-         "../struct.rkt"
-         "../basic.rkt"
-         "on-demand.rkt"
-         (only-in "../core.rkt" make-style)
-         "manual-sprop.rkt"
-         "manual-utils.rkt"
-         "manual-style.rkt")
-
-(define-struct a-bib-entry (key val))
-
-(provide/contract
- [cite ((string?) () #:rest (listof string?) . ->* . element?)]
- [bib-entry ((#:key string? #:title (or/c false/c pre-content?))
-             (#:is-book? boolean? #:author (or/c false/c pre-content?) 
-                         #:location (or/c false/c pre-content?) 
-                         #:date (or/c false/c pre-content?) 
-                         #:url (or/c false/c pre-content?))
-             . ->* .
-             a-bib-entry?)]
- [rename a-bib-entry? bib-entry? (any/c . -> . boolean?)]
- [bibliography (() (#:tag string?) #:rest (listof a-bib-entry?) . ->* . part?)]) 
-
-(define (cite key . keys)
-  (make-element
-   #f
-   (list "["
-         (let loop ([keys (cons key keys)])
-           (if (null? (cdr keys))
-             (make-link-element
-              #f
-              (list (car keys))
-              `(cite ,(car keys)))
-             (make-element
-              #f
-              (list (loop (list (car keys)))
-                    ", "
-                    (loop (cdr keys))))))
-         "]")))
-
-(define (bib-entry #:key key
-                   #:title title
-                   #:is-book? [is-book? #f]
-                   #:author [author #f]
-                   #:location [location #f]
-                   #:date [date #f]
-                   #:url [url #f])
-  (make-a-bib-entry
-   key
-   (make-element
-    "bibentry"
-    (append
-     (if author `(,@(decode-content (list author)) ", ") null)
-     (if is-book? null '(ldquo))
-     (if is-book?
-       (list (italic title))
-       (decode-content (list title)))
-     (if location '(",") '("."))
-     (if is-book? null '(rdquo))
-     (if location
-       `(" " ,@(decode-content (list location)) ,(if date "," "."))
-       null)
-     (if date `(" " ,@(decode-content (list date)) ".") null)
-     (if url `(" " ,(link url (tt url))) null)))))
-
-(define-on-demand bib-style (make-style "RBibliography" scheme-properties))
-
-(define (bibliography #:tag [tag "doc-bibliography"] . citations)
-  (make-unnumbered-part
-   #f
-   `((part ,tag))
-   '("Bibliography")
-   '()
-   null
-   (make-flow
-    (list
-     (make-table
-      bib-style
-      (map (lambda (c)
-             (let ([key (a-bib-entry-key c)]
-                   [val (a-bib-entry-val c)])
-               (list
-                (to-flow (make-target-element #f `("[" ,key "]") `(cite ,key)))
-                flow-spacer
-                (to-flow val))))
-           citations))))
-   null))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt
deleted file mode 100644
index 3cf3ece923..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt
+++ /dev/null
@@ -1,265 +0,0 @@
-#lang scheme/base
-(require racket/string
-         racket/format
-         "../struct.rkt"
-         "../scheme.rkt"
-         "../search.rkt"
-         "../basic.rkt"
-         "../manual-struct.rkt"
-         (only-in "../core.rkt" make-style)
-         "../html-properties.rkt"
-         "manual-ex.rkt"
-         racket/contract/base
-         (for-syntax scheme/base)
-         (for-label scheme/base
-                    scheme/class))
-
-(provide definition-site
-         libs->taglet
-         annote-exporting-library
-         with-exporting-libraries
-         id-to-target-maker
-         id-to-form-target-maker
-         *sig-elem
-         (struct-out sig)
-         ;; public:
-         ; XXX unknown contract
-         make-binding-redirect-elements
-         sigelem)
-(provide/contract
- ; XXX What is return type?
- [defidentifier ((identifier?) (#:form? boolean? #:index? boolean? #:show-libs? boolean?) . ->* . any/c)])
-
-(define (gen-absolute-tag)
-  `(abs ,(make-generated-tag)))
-
-(define-struct sig (id))
-
-(define-syntax-rule (sigelem sig elem)
-  (*sig-elem (quote-syntax sig) 'elem))
-
-(define (*sig-elem sig elem #:defn? [defn? #f])
-  (let ([s (to-element/no-color elem)])
-    (make-delayed-element
-     (lambda (renderer sec ri)
-       (let* ([tag (find-scheme-tag sec ri sig #f)]
-              [taglet (and tag (append (cadr tag) (list elem)))]
-              [vtag (and tag `(sig-val ,taglet))]
-              [stag (and tag `(sig-form ,taglet))]
-              [sd (and stag (resolve-get/tentative sec ri stag))])
-         (make-element
-          symbol-color
-          (list
-           (cond [sd (make-link-element (if defn? syntax-def-color syntax-link-color) (list s) stag)]
-                 [vtag (make-link-element (if defn? value-def-color value-link-color) (list s) vtag)]
-                 [else s])))))
-     (lambda () s)
-     (lambda () s))))
-
-(define hovers (make-weak-hasheq))
-(define (intern-hover-style text)
-  (let ([text (datum-intern-literal text)])
-    (or (hash-ref hovers text #f)
-        (let ([s (make-style #f (list (make-hover-property text)))])
-          (hash-set! hovers text s)
-          s))))
-
-(define (annote-exporting-library e)
-  (make-delayed-element
-   (lambda (render p ri)
-     (let ([from (resolve-get/tentative p ri '(exporting-libraries #f))])
-       (if (and from (pair? from))
-           (make-element
-            (intern-hover-style
-             (string-append
-              "Provided from: "
-              (string-join (map ~s from) ", ")
-              (let ([from-pkgs (resolve-get/tentative p ri '(exporting-packages #f))])
-                (if (and from-pkgs (pair? from-pkgs))
-                    (string-append
-                     " | Package: "
-                     (string-join (map ~a from-pkgs) ", "))
-                    ""))))
-            e)
-           e)))
-   (lambda () e)
-   (lambda () e)))
-
-(define (get-exporting-libraries render p ri)
-  (resolve-get/tentative p ri '(exporting-libraries #f)))
-
-(define (with-exporting-libraries proc)
-  (make-delayed-index-desc
-   (lambda (render part ri)
-     (proc (or (get-exporting-libraries render part ri) null)))))
-
-(define (definition-site name stx-id form?)
-  (let ([sig (current-signature)])
-    (define (gen defn?)
-      (if sig
-          (*sig-elem #:defn? defn? (sig-id sig) name)
-          ((if defn? annote-exporting-library values)
-           (to-element #:defn? defn? (make-just-context name stx-id)))))
-    (values (gen #t) (gen #f))))
-
-(define checkers (make-hash))
-
-(define (libs->taglet id libs source-libs)
-  (let ([lib
-         (or (ormap (lambda (lib)
-                      (let ([checker
-                             (hash-ref
-                              checkers lib
-                              (lambda ()
-                                (let ([ns-id 
-                                       (let ([ns (make-base-empty-namespace)])
-                                         (parameterize ([current-namespace ns])
-                                           (namespace-require `(for-label ,lib))
-                                           (namespace-syntax-introduce (datum->syntax #f 'x))))])
-                                  (let ([checker
-                                         (lambda (id)
-                                           (free-label-identifier=?
-                                            (datum->syntax ns-id (syntax-e id))
-                                            id))])
-                                    (hash-set! checkers lib checker)
-                                    checker))))])
-                        (and (checker id) lib)))
-                    (or source-libs null))
-             (and (pair? libs) (car libs)))])
-    (and lib (module-path-index->taglet
-              (module-path-index-join lib #f)))))
-
-(define (id-to-target-maker id dep?)
-  (*id-to-target-maker 'def id dep?))
-
-(define (id-to-form-target-maker id dep?)
-  (*id-to-target-maker 'form id dep?))
-
-(define (*id-to-target-maker sym id dep?)
-  (let ([sig (current-signature)])
-    (lambda (content mk)
-      (make-part-relative-element
-       (lambda (ci)
-         (let ([e (ormap (lambda (p)
-                           (ormap (lambda (e)
-                                    (and (exporting-libraries? e) e))
-                                  (part-to-collect p)))
-                         (collect-info-parents ci))])
-           (unless e
-             ;; Call raise-syntax-error to capture error message:
-             (with-handlers ([exn:fail:syntax?
-                              (lambda (exn)
-                                (eprintf "~a\n" (exn-message exn)))])
-               (raise-syntax-error
-                'WARNING
-                "no declared exporting libraries for definition" id)))
-           (if e
-             (let* ([lib-taglet (libs->taglet
-                                 (if sig (sig-id sig) id)
-                                 (exporting-libraries-libs e)
-                                 (exporting-libraries-source-libs e))]
-                    [tag (intern-taglet
-                          (list (if sig
-                                  (case sym
-                                    [(def) 'sig-val]
-                                    [(form) 'sig-def])
-                                  sym)
-                                `(,lib-taglet
-                                  ,@(if sig (list (syntax-e (sig-id sig))) null)
-                                  ,(syntax-e id))))])
-               (if (or sig (not dep?))
-                   (mk tag)
-                   (make-dep (list lib-taglet (syntax-e id))
-                             (mk tag))))
-             content)))
-       (lambda () content)
-       (lambda () content)))))
-
-(define (defidentifier id 
-                       #:form? [form? #f]
-                       #:index? [index? #t]
-                       #:show-libs? [show-libs? #t])
-  ;; This function could have more optional argument to select
-  ;; whether to index the id, include a toc link, etc.
-  (let ([dep? #t])
-    (let ([maker (if form?
-                     (id-to-form-target-maker id dep?)
-                     (id-to-target-maker id dep?))])
-      (define-values (elem elem-ref)
-        (if show-libs?
-            (definition-site (syntax-e id) id form?)
-            (values (to-element id #:defn? #t)
-                    (to-element id))))
-      (if maker
-          (maker elem
-                 (lambda (tag)
-                   (let ([elem
-                          (if index?
-                              (make-index-element
-                               #f (list elem) tag
-                               (list (datum-intern-literal (symbol->string (syntax-e id))))
-                               (list elem)
-                               (and show-libs?
-                                    (with-exporting-libraries
-                                     (lambda (libs)
-                                       (make-exported-index-desc (syntax-e id)
-                                                                 libs)))))
-                              elem)])
-                     (make-target-element #f (list elem) tag))))
-          elem))))
-
-(define (make-binding-redirect-elements mod-path redirects)
-  (let ([taglet (module-path-index->taglet 
-                 (module-path-index-join mod-path #f))])
-    (make-element
-     #f
-     (map
-      (lambda (redirect)
-        (let ([id (car redirect)]
-              [form? (cadr redirect)]
-              [path (caddr redirect)]
-              [anchor (cadddr redirect)])
-          (let ([make-one
-                 (lambda (kind)
-                   (make-redirect-target-element
-                    #f
-                    null
-                    (intern-taglet (list kind (list taglet id)))
-                    path
-                    anchor))])
-            (make-element
-             #f
-             (list (make-one (if form? 'form 'def))
-                   (make-dep (list taglet id) null)
-                   (let ([str (datum-intern-literal (symbol->string id))])
-                     (make-index-element #f
-                                         null
-                                         (intern-taglet
-                                          (list (if form? 'form 'def)
-                                                (list taglet id)))
-                                         (list str)
-                                         (list
-                                          (make-element
-                                           symbol-color
-                                           (list
-                                            (make-element
-                                             (if form?
-                                                 syntax-link-color
-                                                 value-link-color)
-                                             (list str)))))
-                                         ((if form?
-                                              make-form-index-desc
-                                              make-procedure-index-desc)
-                                          id
-                                          (list mod-path)))))))))
-      redirects))))
-
-
-(define (make-dep t content)
-  (make-collect-element
-   #f
-   content
-   (lambda (ci)
-     (collect-put! ci 
-                   (intern-taglet (list 'dep t))
-                   #t))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class-struct.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class-struct.rkt
deleted file mode 100644
index 40c41dbf92..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class-struct.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require racket/serialize)
-
-(provide (all-defined-out))
-
-(define-serializable-struct cls/intf
-  (name-element app-mixins super intfs methods)
-  #:transparent)
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt
deleted file mode 100644
index a9358f2c5a..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt
+++ /dev/null
@@ -1,530 +0,0 @@
-#lang scheme/base
-(require "../decode.rkt"
-         "../struct.rkt"
-         "../scheme.rkt"
-         "../search.rkt"
-         "../basic.rkt"
-         "../manual-struct.rkt"
-         "qsloc.rkt"
-         scheme/serialize
-         scheme/stxparam
-         "manual-utils.rkt"
-         "manual-style.rkt"
-         "manual-scheme.rkt"
-         "manual-bind.rkt"
-         "manual-method.rkt"
-         "manual-proc.rkt"
-         "manual-vars.rkt"
-         "manual-class-struct.rkt"
-         scheme/list
-         (for-syntax scheme/base)
-         (for-label scheme/base
-                    scheme/class))
-
-(provide defclass
-         defclass/title
-         definterface
-         definterface/title
-         defmixin
-         defmixin/title
-         defconstructor
-         defconstructor/make
-         defconstructor*/make
-         defconstructor/auto-super
-         defmethod
-         defmethod*
-         methspec
-         methimpl
-         this-obj
-         method xmethod (rename-out [method ::]))
-
-(define-syntax-parameter current-class #f)
-
-(define-struct decl (name super app-mixins intfs ranges mk-head body))
-(define-struct constructor (def))
-(define-struct meth (names mode def))
-(define-struct spec (def))
-(define-struct impl (def))
-
-(define (id-info id)
-  (let ([b (identifier-label-binding id)])
-    (if b
-      (list (caddr b)
-            (list-ref b 3)
-            (list-ref b 4)
-            (list-ref b 5)
-            (list-ref b 6))
-      (error 'scribble "no class/interface/mixin information for identifier: ~e"
-             id))))
-
-(define (make-inherited-table r d ri decl)
-  (define start
-    (let ([key (find-scheme-tag d ri (decl-name decl) #f)])
-      (if key (list (cons key (lookup-cls/intf d ri key))) null)))
-  (define supers
-    (if (null? start)
-      null
-      (cdr
-       (let loop ([supers start][accum null])
-         (cond
-           [(null? supers) (reverse accum)]
-           [(assoc (caar supers) accum)
-            (loop (cdr supers) accum)]
-           [else
-            (let ([super (car supers)])
-              (loop (append (filter-map
-                             (lambda (i)
-                               (let ([key (find-scheme-tag d ri i #f)])
-                                 (and key
-                                      (cons key (lookup-cls/intf d ri key)))))
-                             (append
-                              (reverse (cls/intf-intfs (cdr super)))
-                              (if (cls/intf-super (cdr super))
-                                (list (cls/intf-super (cdr super)))
-                                null)
-                              (reverse (cls/intf-app-mixins (cdr super)))))
-                            (cdr supers))
-                    (cons super accum)))])))))
-  (define ht
-    (let ([ht (make-hasheq)])
-      (for* ([i (decl-body decl)]
-             #:when (meth? i)
-             [name (meth-names i)])
-        (hash-set! ht name #t))
-      ht))
-  (define inh
-    (append-map
-     (lambda (super)
-       (let ([inh (filter-map
-                   (lambda (k)
-                     (if (hash-ref ht k #f)
-                       #f
-                       (begin (hash-set! ht k #t)
-                              (cons (datum-intern-literal (symbol->string k))
-                                    (**method k (car super))))))
-                   (cls/intf-methods (cdr super)))])
-         (if (null? inh)
-           null
-           (cons (make-element #f (list (make-element "inheritedlbl" '("from "))
-                                        (cls/intf-name-element (cdr super))))
-                 (map cdr (sort inh string<? #:key car))))))
-     supers))
-  (if (null? inh)
-    (make-auxiliary-table "inherited" null)
-    (make-auxiliary-table
-     "inherited"
-     (map (lambda (i) (list (to-flow i)))
-          (cons (make-element "inheritedlbl" '("Inherited methods:")) inh)))))
-
-(define (make-decl-collect decl link?)
-  (if link?
-      (make-part-collect-decl
-       ((id-to-target-maker (decl-name decl) #f)
-        (list "ignored")
-        (lambda (tag)
-          (make-collect-element
-           #f null
-           (lambda (ci)
-             (collect-put!
-              ci
-              `(cls/intf ,(cadr tag))
-              (make-cls/intf
-               (make-element
-                symbol-color
-                (list (make-link-element
-                       value-link-color
-                       (list (datum-intern-literal
-                              (symbol->string (syntax-e (decl-name decl)))))
-                       tag)))
-               (map id-info (decl-app-mixins decl))
-               (and (decl-super decl)
-                    (not (free-label-identifier=? (quote-syntax object%)
-                                                  (decl-super decl)))
-                    (id-info (decl-super decl)))
-               (map id-info (decl-intfs decl))
-               (append-map (lambda (m)
-                             (let loop ([l (meth-names m)])
-                               (cond [(null? l) null]
-                                     [(memq (car l) (cdr l)) (loop (cdr l))]
-                                     [else (cons (car l) (loop (cdr l)))])))
-                           (filter meth? (decl-body decl))))))))))
-      null))
-
-(define (build-body decl body)
-  `(,@(map (lambda (i)
-             (cond [(constructor? i) ((constructor-def i))]
-                   [(meth? i) ((meth-def i))]
-                   [else i]))
-           body)
-    ,(make-delayed-block (lambda (r d ri) (make-inherited-table r d ri decl)))))
-
-(define (*include-class/title decl link?)
-  (make-splice
-   (list* (title #:style 'hidden (to-element (decl-name decl)))
-          (make-decl-collect decl link?)
-          (build-body decl (append ((decl-mk-head decl) #t)
-                                   (decl-body decl))))))
-
-(define (*include-class decl link?)
-  (make-splice
-   (cons
-    (make-decl-collect decl link?)
-    (append
-     ((decl-mk-head decl) #f)
-     (let-values ([(pre post)
-                   (let loop ([l (decl-body decl)][accum null])
-                     (cond
-                      [(null? l) (values (reverse accum) null)]
-                      [(or (constructor? (car l)) (meth? (car l)))
-                       (values (reverse accum) l)]
-                      [else (loop (cdr l) (cons (car l) accum))]))])
-       (append
-        (flow-paragraphs (decode-flow pre))
-        (list
-         (make-blockquote
-          "leftindent"
-          (flow-paragraphs
-           (decode-flow (build-body decl post)))))))))))
-
-(define (*class-doc kind stx-id super intfs ranges whole-page? make-index-desc link?)
-  (make-table
-   boxed-style
-   (append
-    (list
-     (list 
-      ((add-background-label (symbol->string kind))
-       (make-flow
-        (list
-         (make-omitable-paragraph
-          (list (if link?
-                    (let ([target-maker (id-to-target-maker stx-id #t)]
-                          [content (annote-exporting-library
-                                    (to-element #:defn? #t stx-id))]
-                          [ref-content (to-element stx-id)])
-                      (if target-maker
-                          (target-maker
-                           content
-                           (lambda (tag)
-                             ((if whole-page?
-                                  make-page-target-element
-                                  (lambda (s c t)
-                                    (make-toc-target2-element s c t ref-content)))
-                              #f
-                              (list
-                               (make-index-element
-                                #f content tag
-                                (list (datum-intern-literal
-                                       (symbol->string (syntax-e stx-id))))
-                                (list ref-content)
-                                (with-exporting-libraries
-                                 (lambda (libs)
-                                   (make-index-desc (syntax-e stx-id) libs)))))
-                              tag)))
-                          content))
-                    (to-element stx-id))
-                spacer ":" spacer
-                (case kind
-                  [(class) (racket class?)]
-                  [(interface) (racket interface?)]
-                  [(mixin) (racketblockelem (class? . -> . class?))]))))))))
-    (if super
-      (list
-       (list (make-flow
-              (list (t (hspace 2) "superclass:" spacer (to-element super))))))
-      null)
-    (let ([show-intfs
-           (lambda (intfs range?)
-             (if (null? intfs)
-               null
-               (list
-                (list
-                 (make-flow
-                  (list
-                   (make-table
-                    #f
-                    (cons
-                     (list (make-flow
-                            (list (make-omitable-paragraph
-                                   (list (hspace 2)
-                                         (case kind
-                                           [(interface) "implements:"]
-                                           [(class) "extends:"]
-                                           [(mixin)
-                                            (if range?
-                                              "result implements:"
-                                              "argument extends/implements:")])
-                                         spacer))))
-                           (to-flow (to-element (car intfs))))
-                     (map (lambda (i)
-                            (list flow-spacer (to-flow (to-element i))))
-                          (cdr intfs))))))))))])
-      (append (show-intfs intfs #f) (show-intfs ranges #t))))))
-
-(define-syntax extract-super
-  (syntax-rules ()
-    [(_ (mixin base)) (extract-super base)]
-    [(_ super) (quote-syntax/loc super)]))
-
-(define-syntax extract-app-mixins
-  (syntax-rules ()
-    [(_ (mixin base)) (cons (quote-syntax/loc mixin) (extract-app-mixins base))]
-    [(_ super) null]))
-
-(define (flatten-splices l)
-  (let loop ([l l])
-    (cond [(null? l) null]
-          [(splice? (car l)) (append (splice-run (car l)) (loop (cdr l)))]
-          [else (cons (car l) (loop (cdr l)))])))
-
-(define-syntax-rule (*defclass *include-class link-target? name super (intf ...) body ...)
-  (let ([link? link-target?])
-    (*include-class
-     (syntax-parameterize ([current-class (quote-syntax name)])
-       (make-decl (quote-syntax/loc name)
-                  (extract-super super)
-                  (extract-app-mixins super)
-                  (list (quote-syntax/loc intf) ...)
-                  null
-                  (lambda (whole-page?)
-                    (list (*class-doc 'class
-                                      (quote-syntax/loc name)
-                                      (quote-syntax/loc super)
-                                      (list (quote-syntax intf) ...)
-                                      null
-                                      whole-page?
-                                      make-class-index-desc
-                                      link?)))
-                  (flatten-splices (list body ...))))
-     link?)))
-
-(define-syntax defclass
-  (syntax-rules ()
-    [(_ #:link-target? link-target? name super (intf ...) body ...)
-     (*defclass *include-class link-target? name super (intf ...) body ...)]
-    [(_ name super (intf ...) body ...)
-     (defclass #:link-target? #t name super (intf ...) body ...)]))
-
-(define-syntax defclass/title
-  (syntax-rules ()
-    [(_ #:link-target? link-target? name super (intf ...) body ...)
-     (*defclass *include-class/title link-target? name super (intf ...) body ...)]
-    [(_ name super (intf ...) body ...)
-     (defclass/title #:link-target? #t name super (intf ...) body ...)]))
-
-(define-syntax-rule (*definterface *include-class name (intf ...) body ...)
-  (let ([link? #t])
-    (*include-class
-     (syntax-parameterize ([current-class (quote-syntax name)])
-       (make-decl (quote-syntax/loc name)
-                  #f
-                  null
-                  (list (quote-syntax/loc intf) ...)
-                  null
-                  (lambda (whole-page?)
-                    (list
-                     (*class-doc 'interface
-                                 (quote-syntax/loc name)
-                                 #f
-                                 (list (quote-syntax intf) ...)
-                                 null
-                                 whole-page?
-                                 make-interface-index-desc
-                                 link?)))
-                  (list body ...)))
-     link?)))
-
-(define-syntax-rule (definterface name (intf ...) body ...)
-  (*definterface *include-class name (intf ...) body ...))
-
-(define-syntax-rule (definterface/title name (intf ...) body ...)
-  (*definterface *include-class/title name (intf ...) body ...))
-
-(define-syntax-rule (*defmixin *include-class name (domain ...) (range ...)
-                               body ...)
-  (let ([link? #t])
-    (*include-class
-     (syntax-parameterize ([current-class (quote-syntax name)])
-       (make-decl (quote-syntax/loc name)
-                  #f
-                  null
-                  (list (quote-syntax/loc domain) ...)
-                  (list (quote-syntax/loc range) ...)
-                  (lambda (whole-page?)
-                    (list
-                     (*class-doc 'mixin
-                                 (quote-syntax/loc name)
-                                 #f
-                                 (list (quote-syntax domain) ...)
-                                 (list (quote-syntax range) ...)
-                                 whole-page?
-                                 make-mixin-index-desc
-                                 link?)))
-                  (list body ...)))
-     link?)))
-
-(define-syntax-rule (defmixin name (domain ...) (range ...) body ...)
-  (*defmixin *include-class name (domain ...) (range ...) body ...))
-
-(define-syntax-rule (defmixin/title name (domain ...) (range ...) body ...)
-  (*defmixin *include-class/title name (domain ...) (range ...) body ...))
-
-(define-syntax (defconstructor*/* stx)
-  (syntax-case stx ()
-    [(_ mode ((arg ...) ...) desc ...)
-     (let ([n (syntax-parameter-value #'current-class)])
-       (with-syntax ([name n]
-                     [result
-                      (datum->syntax
-                       #f
-                       (list
-                        (datum->syntax #'is-a?/c 'is-a?/c (list 'src 1 1 2 1))
-                        (datum->syntax n (syntax-e n) (list 'src 1 3 4 1)))
-                       (list 'src 1 0 1 5))]
-                     [(((kw ...) ...) ...)
-                      (map (lambda (ids)
-                             (map (lambda (arg)
-                                    (if (and (pair? (syntax-e arg))
-                                             (eq? (syntax-e #'mode) 'new))
-                                      (list (string->keyword
-                                             (symbol->string
-                                              (syntax-e
-                                               (car (syntax-e arg))))))
-                                      null))
-                                  (syntax->list ids)))
-                           (syntax->list #'((arg ...) ...)))])
-         #'(make-constructor (lambda ()
-                               (defproc* #:mode mode #:within name
-                                 [[(make [kw ... . arg] ...) result] ...]
-                                 desc ...)))))]))
-
-(define-syntax (defconstructor stx)
-  (syntax-case stx ()
-    [(_ ([id . arg-rest] ...) desc ...)
-     #'(defconstructor*/* new (([id . arg-rest] ...)) desc ...)]))
-
-(define-syntax (defconstructor/make stx)
-  (syntax-case stx ()
-    [(_ ([id . arg-rest] ...) desc ...)
-     #'(defconstructor*/* make (([id . arg-rest] ...)) desc ...)]))
-
-(define-syntax (defconstructor*/make stx)
-  (syntax-case stx ()
-    [(_ (([id . arg-rest] ...) ...) desc ...)
-     #'(defconstructor*/* make (([id . arg-rest] ...) ...) desc ...)]))
-
-(define-syntax (defconstructor/auto-super stx)
-  (syntax-case stx ()
-    [(_ ([id . arg-rest] ...) desc ...)
-     #'(defconstructor*/* new (([id . arg-rest] ... _...superclass-args...))
-         desc ...)]))
-
-(define-syntax (defmethod* stx)
-  (syntax-case stx ()
-    [(_ #:mode mode #:link-target? link-target? ([(name arg ...) result-type] ...) desc ...)
-     (with-syntax ([cname (syntax-parameter-value #'current-class)]
-                   [name1 (car (syntax->list #'(name ...)))])
-       (with-syntax ([(extra ...)
-                      (let ([finality
-                             (lambda ()
-                               (case (syntax-e #'mode)
-                                 [(override-final public-final extend-final)
-                                  #'(" This method is final, so it cannot be overiddden.")]
-                                 [(augment-final)
-                                  #'(" This method is final, so it cannot be augmented.")]
-                                 [else null]))])
-                        (case (syntax-e #'mode)
-                          [(pubment)
-                           #'((t "Refine this method with "
-                                 (racket augment) "."))]
-                          [(override override-final extend augment)
-                           #`((t (case (syntax-e #'mode)
-                                   [(override override-final) "Overrides "]
-                                   [(extend extend-final) "Extends "]
-                                   [(augment augment-final) "Augments "])
-                                 (*xmethod/super (quote-syntax/loc cname) 'name1)
-                                 "."
-                                 #,@(finality)))]
-                          [else null]))])
-         #'(make-meth '(name ...)
-                      'mode
-                      (lambda ()
-                        (defproc* #:link-target? link-target? #:mode send #:within cname
-                          ([(name arg ...) result-type] ...)
-                          (make-splice
-                           (append-map (lambda (f)
-                                         (cond [(impl? f) ((impl-def f))]
-                                               [(spec? f) ((spec-def f))]
-                                               [else (list f)]))
-                                       (list extra ... desc ...))))))))]
-    [(_ #:mode mode ([(name arg ...) result-type] ...) desc ...)
-     #'(defmethod* #:mode mode #:link-target? #t ([(name arg ...) result-type] ...) desc ...)]
-    [(_ #:link-target? link-target? ([(name arg ...) result-type] ...) desc ...)
-     #'(defmethod* #:mode public #:link-target? link-target? ([(name arg ...) result-type] ...) desc ...)]
-    [(_ ([(name arg ...) result-type] ...) desc ...)
-     #'(defmethod* #:mode public ([(name arg ...) result-type] ...) desc ...)]))
-
-(define-syntax defmethod
-  (syntax-rules ()
-    [(_ #:mode mode #:link-target? link-target? (name arg ...) result-type desc ...)
-     (defmethod* #:mode mode #:link-target? link-target? ([(name arg ...) result-type]) desc ...)]
-    [(_ #:mode mode (name arg ...) result-type desc ...)
-     (defmethod #:mode mode #:link-target? #t (name arg ...) result-type desc ...)]
-    [(_ #:link-target? link-target? (name arg ...) result-type desc ...)
-     (defmethod #:mode public #:link-target? link-target? (name arg ...) result-type desc ...)]
-    [(_ (name arg ...) result-type desc ...)
-     (defmethod #:mode public #:link-target? #t (name arg ...) result-type desc ...)]))
-
-(define-syntax-rule (methimpl body ...)
-  (make-impl (lambda () (list (italic "Default implementation:") " " body ...))))
-
-(define-syntax-rule (methspec body ...)
-  (make-spec (lambda () (list (italic "Specification:") " " body ...))))
-
-(define (*this-obj cname)
-  (name-this-object cname))
-
-(define-syntax (this-obj stx)
-  (syntax-case stx ()
-    [(_)
-     (with-syntax ([cname (syntax-parameter-value #'current-class)])
-       #'(*this-obj 'cname))]))
-
-(define (*xmethod/super cname name)
-  (let ([get
-         (lambda (d ri key)
-           (if key
-             (let ([v (lookup-cls/intf d ri key)])
-               (if v
-                 (append (cls/intf-app-mixins v)
-                         (cons (cls/intf-super v)
-                               (cls/intf-intfs v)))
-                 null))
-             null))])
-    (make-delayed-element
-     (lambda (r d ri)
-       (let loop ([search (get d ri (find-scheme-tag d ri cname #f))])
-         (cond
-           [(null? search)
-            (list (make-element #f '("<method not found>")))]
-           [(not (car search))
-            (loop (cdr search))]
-           [else
-            (let* ([a-key (find-scheme-tag d ri (car search) #f)]
-                   [v (and a-key (lookup-cls/intf d ri a-key))])
-              (if v
-                (if (member name (cls/intf-methods v))
-                  (list
-                   (make-element #f
-                                 (list (**method name a-key)
-                                       " in "
-                                       (cls/intf-name-element v))))
-                  (loop (append (cdr search)
-                                (get d ri (find-scheme-tag d ri (car search)
-                                                           #f)))))
-                (loop (cdr search))))])))
-     (lambda () (format "~a in ~a" (syntax-e cname) name))
-     (lambda () (format "~a in ~a" (syntax-e cname) name)))))
-
-(define (lookup-cls/intf d ri tag)
-  (let ([v (resolve-get d ri `(cls/intf ,(cadr tag)))])
-    (or v (make-cls/intf "unknown" null #f null null))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-code.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-code.rkt
deleted file mode 100644
index 82ebccb2d8..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-code.rkt
+++ /dev/null
@@ -1,357 +0,0 @@
-#lang racket/base
-(require syntax/strip-context
-         syntax-color/module-lexer
-         syntax-color/lexer-contract
-         "../racket.rkt"
-         "../base.rkt"
-         "manual-scheme.rkt"
-         "manual-style.rkt"
-         scribble/core
-         (for-syntax racket/base
-                     syntax/parse))
-
-(provide codeblock
-         codeblock0
-         typeset-code
-         code)
-
-(define-for-syntax (do-codeblock stx)
-  (syntax-parse stx
-    [(_ (~seq (~or (~optional (~seq #:expand expand-expr:expr)
-                              #:defaults ([expand-expr #'#f])
-                              #:name "#:expand keyword")
-                   (~optional (~seq #:indent indent-expr:expr)
-                              #:defaults ([indent-expr #'0])
-                              #:name "#:expand keyword")
-                   (~optional (~seq #:keep-lang-line? keep-lang-line?-expr:expr)
-                              #:defaults ([keep-lang-line?-expr #'#t])
-                              #:name "#:keep-lang-line? keyword")
-                   (~optional (~seq #:context context-expr:expr)
-                              #:name "#:context keyword")
-                   (~optional (~seq #:line-numbers line-numbers:expr)
-                              #:defaults ([line-numbers #'#f])
-                              #:name "#:line-numbers keyword")
-                   (~optional (~seq #:line-number-sep line-number-sep:expr)
-                              #:defaults ([line-number-sep #'1])
-                              #:name "#:line-number-sep keyword"))
-              ...)
-        str ...)
-     #`(typeset-code str ...
-                     #:expand expand-expr
-                     #:keep-lang-line? keep-lang-line?-expr
-                     #:indent indent-expr
-                     #:context #,(if (attribute context-expr)
-                                     #'context-expr
-                                     (or
-                                      (let ([v #'(str ...)])
-                                        (and (pair? (syntax-e v))
-                                             #`#'#,(car (syntax-e v))))
-                                      #'#f))
-                     #:line-numbers line-numbers
-                     #:line-number-sep line-number-sep)]))
-
-(define-syntax (codeblock stx) #`(code-inset #,(do-codeblock stx)))
-(define-syntax (codeblock0 stx) (do-codeblock stx))
-
-(define (typeset-code #:context [context #f]
-                      #:expand [expand #f]
-                      #:indent [indent 2]
-                      #:keep-lang-line? [keep-lang-line? #t]
-                      #:line-numbers [line-numbers #f]
-                      #:line-number-sep [line-number-sep 1]
-                      #:block? [block? #t]
-                      . strs)
-  (define-values (tokens bstr) (get-tokens strs context expand))
-  (define default-color meta-color)
-  ((if block? table (lambda (style lines) (make-element #f lines)))
-   block-color
-   ((if keep-lang-line? values cdr) ; FIXME: #lang can span lines
-    (list->lines
-     indent
-     #:line-numbers line-numbers
-     #:line-number-sep line-number-sep
-     #:block? block?
-     (let loop ([pos 0]
-                [tokens tokens])
-       (cond
-         [(null? tokens) (split-lines default-color (substring bstr pos))]
-         [(eq? (caar tokens) 'white-space) (loop pos (cdr tokens))]
-         [(= pos (cadar tokens))
-          (append (let ([style (caar tokens)]
-                        [get-str (lambda ()
-                                   (substring bstr (cadar tokens) (caddar tokens)))])
-                    (cond
-                      [(symbol? style)
-                       (let ([scribble-style
-                              (case style
-                                [(symbol) symbol-color]
-                                [(parenthesis hash-colon-keyword) paren-color]
-                                [(constant string) value-color]
-                                [(comment) comment-color]
-                                [else default-color])])
-                         (split-lines scribble-style (get-str)))]
-                      [(procedure? style)
-                       (list (style (get-str)))]
-                      [else (list style)]))
-                  (loop (caddar tokens) (cdr tokens)))]
-         [(> pos (cadar tokens))
-          (loop pos (cdr tokens))]
-         [else (append
-                (split-lines default-color (substring bstr pos (cadar tokens)))
-                (loop (cadar tokens) tokens))]))))))
-
-;; (listof string) boolean boolean -> tokens string
-;; tokens is a
-;; (cons metadata (listof (list T natural natural natural)))
-;; T being a symbol returned as a token type from the languages lexer
-;;   OR a function created by get-tokens
-;; the first number being the start position
-;; the second being the end position
-;; the third 0 if T is a symbol, and 1 if its a function
-;; the tokens are sorted by the start end end positions
-(define (get-tokens strs context expand)
-  (let* ([xstr (apply string-append strs)]
-         [bstr (regexp-replace* #rx"(?m:^$)" xstr "\xA0")]
-         [in (open-input-string bstr)])
-    (port-count-lines! in)
-    (let* ([tokens
-            (let loop ([mode #f])
-              (let-values ([(lexeme type data start end backup-delta mode)
-                            (module-lexer in 0 mode)])
-                (if (equal? type 'eof)
-                    null
-                    (cons (list type (sub1 start) (sub1 end) 0)
-                          (loop (if (dont-stop? mode)
-                                    (dont-stop-val mode)
-                                    mode))))))]
-           [e (parameterize ([read-accept-reader #t])
-                ((or expand 
-                     (lambda (stx) 
-                       (if context
-                           (replace-context context stx)
-                           stx)))
-                 (let ([p (open-input-string bstr)])
-                   (port-count-lines! p)
-                   (let loop ()
-                     (let ([v (read-syntax 'prog p)])
-                       (cond
-                        [expand v]
-                        [(eof-object? v) null]
-                        [else (datum->syntax #f (cons v (loop)) v v)]))))))]
-           [ids (let loop ([e e])
-                  (cond
-                   [(and (identifier? e)
-                         (syntax-original? e))
-                    (let ([pos (sub1 (syntax-position e))])
-                      (list (list (lambda (str)
-                                    (to-element (syntax-property
-                                                 e
-                                                 'display-string
-                                                 str)
-                                                #:escapes? #f))
-                                  pos
-                                  (+ pos (syntax-span e))
-                                  1)))]
-                   [(syntax? e) (append (loop (syntax-e e))
-                                        (loop (or (syntax-property e 'origin)
-                                                  null))
-                                        (loop (or (syntax-property e 'disappeared-use)
-                                                  null)))]
-                   [(pair? e) (append (loop (car e)) (loop (cdr e)))]
-                   [else null]))]
-           [link-mod (lambda (mp-stx priority #:orig? [always-orig? #f])
-                       (if (or always-orig?
-                               (syntax-original? mp-stx))
-                           (let ([mp (syntax->datum mp-stx)]
-                                 [pos (sub1 (syntax-position mp-stx))])
-                             (list (list (racketmodname #,mp)
-                                         pos
-                                         (+ pos (syntax-span mp-stx))
-                                         priority)))
-                           null))]
-           ;; This makes sense when `expand' actually expands, and
-           ;; probably not otherwise:
-           [mods (let loop ([e e])
-                   (syntax-case e (module #%require begin)
-                     [(module name lang (mod-beg form ...))
-                      (apply append
-                             (link-mod #'lang 2)
-                             (map loop (syntax->list #'(form ...))))]
-                     [(#%require spec ...)
-                      (apply append
-                             (map (lambda (spec)
-                                    ;; Need to add support for renaming forms, etc.:
-                                    (if (module-path? (syntax->datum spec))
-                                        (link-mod spec 2)
-                                        null))
-                                  (syntax->list #'(spec ...))))]
-                     [(begin form ...)
-                      (apply append
-                             (map loop (syntax->list #'(form ...))))]
-                     [else null]))]
-           [has-hash-lang? (regexp-match? #rx"^#lang " bstr)]
-           [language (if has-hash-lang?
-                         (let ([m (regexp-match #rx"^#lang ([-0-9a-zA-Z/._+]+)" bstr)])
-                           (if m
-                               (link-mod
-                                #:orig? #t
-                                (datum->syntax #f
-                                               (string->symbol (cadr m))
-                                               (vector 'in 1 6 7 (string-length (cadr m))))
-                                3)
-                               null))
-                         null)]
-           [tokens (sort (append ids
-                                 mods
-                                 language
-                                 (filter (lambda (x) (not (eq? (car x) 'symbol)))
-                                         (if has-hash-lang?
-                                             ;; Drop #lang entry:
-                                             (cdr tokens)
-                                             tokens)))
-                         (lambda (a b)
-                           (or (< (cadr a) (cadr b))
-                               (and (= (cadr a) (cadr b))
-                                    (> (cadddr a) (cadddr b))))))])
-      (values tokens bstr))))
-
-(define (typeset-code-line context expand lang-line . strs)
-  (typeset-code
-   #:context context
-   #:expand expand
-   #:keep-lang-line? (not lang-line)
-   #:block? #f
-   #:indent 0
-   (let ([s (regexp-replace* #px"(?:\\s*(?:\r|\n|\r\n)\\s*)+" (apply string-append strs) " ")])
-     (if lang-line
-         (string-append "#lang " lang-line "\n" s)
-         s))))
-
-(define-syntax (code stx)
-  (syntax-parse stx
-    [(_ (~seq (~or (~optional (~seq #:expand expand-expr:expr)
-                              #:defaults ([expand-expr #'#f])
-                              #:name "#:expand keyword")
-                   (~optional (~seq #:context context-expr:expr)
-                              #:name "#:context keyword")
-                   (~optional (~seq #:lang lang-line-expr:expr)
-                              #:defaults ([lang-line-expr #'#f])
-                              #:name "#:lang-line keyword"))
-              ...)
-        str ...)
-     #`(typeset-code-line #,(if (attribute context-expr)
-                                #'context-expr
-                                (or
-                                 (let ([v #'(str ...)])
-                                   (and (pair? (syntax-e v))
-                                        #`#'#,(car (syntax-e v))))
-                                 #'#f))
-                          expand-expr
-                          lang-line-expr
-                          str ...)]))
-
-(define (split-lines style s)
-  (cond
-   [(regexp-match-positions #rx"(?:\r\n|\r|\n)" s)
-    => (lambda (m)
-         (append (split-lines style (substring s 0 (caar m)))
-                 (list 'newline)
-                 (split-lines style (substring s (cdar m)))))]
-   [(regexp-match-positions #rx" +" s)
-    => (lambda (m)
-         (append (split-lines style (substring s 0 (caar m)))
-                 (list (hspace (- (cdar m) (caar m))))
-                 (split-lines style (substring s (cdar m)))))]
-   [else (list (element style s))]))
-
-(define omitable (make-style #f '(omitable)))
-
-(define (list->lines indent-amt l 
-                     #:line-numbers line-numbers
-                     #:line-number-sep line-number-sep
-                     #:block? block?)
-  (define indent-elem (if (zero? indent-amt)
-                          ""
-                          (hspace indent-amt)))
-  ;(list of any) delim -> (list of (list of any))
-  (define (break-list lst delim)
-    (let loop ([l lst] [n null] [c null])
-      (cond
-       [(null? l) (reverse (if (null? c) n (cons (reverse c) n)))]
-       [(eq? delim (car l)) (loop (cdr l) (cons (reverse c) n) null)]
-       [else (loop (cdr l) n (cons (car l) c) )])))
-
-  (define lines (break-list l 'newline))
-  (define line-cnt (length lines))
-  (define line-cntl (string-length (format "~a" (+ line-cnt (or line-numbers 0)))))
-
-  (define (prepend-line-number n r)
-    (define ln (format "~a" n))
-    (define lnl (string-length ln))
-    (define diff (- line-cntl lnl))
-    (define l1 (list (tt ln) (hspace line-number-sep)))
-    (cons (make-element 'smaller 
-                        (make-element 'smaller  
-                                      (if (not (zero? diff))
-                                          (cons (hspace diff) l1)
-                                          l1)))
-          r))
-
-  (define (make-line accum-line line-number)
-    (define rest (cons indent-elem accum-line))
-    (list ((if block? paragraph (lambda (s e) e))
-           omitable 
-           (if line-numbers
-               (prepend-line-number line-number rest)
-               rest))))
-
-  (for/list ([l (break-list l 'newline)]
-             [i (in-naturals (or line-numbers 1))])
-    (make-line l i)))
-
-
-;; ----------------------------------------
-
-(module+ test
-  (require racket/list
-           racket/match
-           tests/eli-tester)
-
-  (define (tokens strs)
-    (define-values (toks _) (get-tokens strs #f #f))
-    (for/list ([tok (rest toks)])
-      (match tok
-        [(list _ start end 1)
-         (list 'function start end 1)]
-        [_ tok])))
-
-  (define (make-test-result  lst)
-    (define-values (res _)
-      (for/fold ([result null] [count 12])
-                ([p lst])
-        (define next (+ count (second p)))
-        (define r (if (eq? (first p) 'function) 1 0))
-        (values
-         (cons (list (first p) count next r) result)
-         next)))
-    (cons `(function 6 12 1) (reverse res)))
-
-  (test
-   (tokens (list "#lang racket\n1"))
-   => `((function 6 12 1) (white-space 12 13 0) (constant 13 14 0))
-   (tokens (list "#lang racket\n" "(+ 1 2)"))
-   => (make-test-result
-       '((white-space 1)
-         (parenthesis 1) (function 1)
-         (white-space 1) (constant 1) (white-space 1) (constant 1)
-         (parenthesis 1)))
-   (tokens (list "#lang racket\n(apply x (list y))"))
-   => (make-test-result
-       '((white-space 1)
-         (parenthesis 1)
-         (function 5) (white-space 1);apply
-         (function 1) (white-space 1);x
-         (parenthesis 1)
-         (function 4) (white-space 1) (function 1);list y
-         (parenthesis 1)
-         (parenthesis 1)))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-defaults.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-defaults.rkt
deleted file mode 100644
index 809d18dd7a..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-defaults.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang scheme/base
-(require scribble/core
-         scribble/html-properties
-         "defaults.rkt"
-         "on-demand.rkt")
-
-(provide post-process
-         manual-doc-style)
-
-(define (post-process doc)
-  (add-defaults doc
-                (scribble-file "manual-prefix.tex")
-                (scribble-file "manual-style.tex")
-                null
-                #:html (html-defaults (scribble-file "scribble-prefix.html")
-                                      (scribble-file "manual-style.css")
-                                      (list
-                                       (scribble-file "manual-fonts.css")))
-                #:properties (list
-                              (css-style-addition
-                               (scribble-file "manual-racket.css"))
-                              (js-style-addition
-                               (scribble-file "manual-racket.js")))
-                #t))
-
-(define-on-demand manual-doc-style
-  (part-style (post-process (part #f null #f plain null null null))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-ex.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-ex.rkt
deleted file mode 100644
index 3cf64453e9..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-ex.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scheme/base
-(require "../struct.rkt")
-
-; XXX unknown contracts
-(provide (struct-out exporting-libraries)
-         current-signature)
-
-(define-struct (exporting-libraries element) (libs source-libs pkgs))
-
-(define current-signature (make-parameter #f))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-form.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-form.rkt
deleted file mode 100644
index e4c45ae01a..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-form.rkt
+++ /dev/null
@@ -1,450 +0,0 @@
-#lang scheme/base
-(require "../decode.rkt"
-         "../struct.rkt"
-         "../scheme.rkt"
-         "../basic.rkt"
-         "../manual-struct.rkt"
-         "qsloc.rkt"
-         "manual-utils.rkt"
-         "manual-vars.rkt"
-         "manual-scheme.rkt"
-         "manual-bind.rkt"
-         scheme/list
-         (for-syntax scheme/base
-                     syntax/parse
-                     racket/syntax)
-         (for-label scheme/base))
-
-(provide defform defform* defform/subs defform*/subs defform/none
-         defidform defidform/inline
-         specform specform/subs
-         specsubform specsubform/subs specspecsubform specspecsubform/subs
-         specsubform/inline
-         defsubform defsubform*
-         racketgrammar racketgrammar*
-         (rename-out [racketgrammar schemegrammar]
-                     [racketgrammar* schemegrammar*])
-         var svar
-         (for-syntax kind-kw id-kw link-target?-kw
-                     literals-kw subs-kw contracts-kw))
-
-(begin-for-syntax
- (define-splicing-syntax-class kind-kw
-   #:description "#:kind keyword"
-   (pattern (~seq #:kind kind))
-   (pattern (~seq)
-            #:with kind #'#f))
-
- (define-splicing-syntax-class id-kw
-   #:description "#:id keyword"
-   (pattern (~seq #:id [defined-id:id defined-id-expr]))
-   (pattern (~seq #:id defined-id:id)
-            #:with defined-id-expr #'(quote-syntax defined-id))
-   (pattern (~seq #:id [#f #f])
-            #:with defined-id #'#f
-            #:with defined-id-expr #'#f)
-   (pattern (~seq)
-            #:with defined-id #'#f
-            #:with defined-id-expr #'#f))
-
- (define-splicing-syntax-class link-target?-kw
-   #:description "#:link-target? keyword"
-   (pattern (~seq #:link-target? expr))
-   (pattern (~seq)
-            #:with expr #'#t))
-
- (define-splicing-syntax-class literals-kw
-   #:description "#:literals keyword"
-   (pattern (~seq #:literals (lit:id ...)))
-   (pattern (~seq)
-            #:with (lit ...) #'()))
-
- (define-splicing-syntax-class contracts-kw
-   #:description "#:contracts keyword"
-   (pattern (~seq #:contracts (~and cs ([contract-nonterm:id contract-expr] ...))))
-   (pattern (~seq)
-            #:with (~and cs ((contract-nonterm contract-expr) ...)) #'()))
-
- (define-syntax-class grammar
-   #:description "grammar"
-   (pattern ([non-term-id:id non-term-form ...+] ...)))
-
- (define-splicing-syntax-class subs-kw
-   #:description "#:grammar keyword"
-   #:attributes (g (g.non-term-id 1) (g.non-term-form 2))
-   (pattern (~seq #:grammar g:grammar))
-   (pattern (~seq) #:with g:grammar #'()))
- )
-
-(define-syntax (defform*/subs stx)
-  (syntax-parse stx
-    [(_ k:kind-kw lt:link-target?-kw d:id-kw l:literals-kw [spec spec1 ...]
-        g:grammar
-        c:contracts-kw
-        desc ...)
-     (with-syntax* ([defined-id (if (syntax-e #'d.defined-id)
-                                    #'d.defined-id
-                                    (syntax-case #'spec ()
-                                      [(spec-id . _) #'spec-id]))]
-                    [defined-id-expr (if (syntax-e #'d.defined-id-expr)
-                                         #'d.defined-id-expr
-                                         #'(quote-syntax defined-id))]
-                    [(new-spec ...)
-                     (for/list ([spec (in-list (syntax->list #'(spec spec1 ...)))])
-                       (let loop ([spec spec])
-                         (if (and (identifier? spec)
-                                  (free-identifier=? spec #'defined-id))
-                             (datum->syntax #'here '(unsyntax x) spec spec)
-                             (syntax-case spec ()
-                               [(a . b)
-                                (datum->syntax spec
-                                               (cons (loop #'a) (loop #'b))
-                                               spec
-                                               spec)]
-                               [_ spec]))))])
-       #'(with-togetherable-racket-variables
-            (l.lit ...)
-            ([form [defined-id spec]] [form [defined-id spec1]] ...
-             [non-term (g.non-term-id g.non-term-form ...)] ...)
-            (*defforms k.kind lt.expr defined-id-expr
-                       '(spec spec1 ...)
-                       (list (lambda (x) (racketblock0/form new-spec)) ...)
-                       '((g.non-term-id g.non-term-form ...) ...)
-                       (list (list (lambda () (racket g.non-term-id))
-                                   (lambda () (racketblock0/form g.non-term-form))
-                                   ...)
-                             ...)
-                       (list (list (lambda () (racket c.contract-nonterm))
-                                   (lambda () (racketblock0 c.contract-expr)))
-                             ...)
-                       (lambda () (list desc ...)))))]))
-
-(define-syntax (defform* stx)
-  (syntax-parse stx
-    [(_ k:kind-kw lt:link-target?-kw d:id-kw l:literals-kw [spec ...]
-        subs:subs-kw c:contracts-kw desc ...)
-     (syntax/loc stx
-       (defform*/subs #:kind k.kind 
-         #:link-target? lt.expr
-         #:id [d.defined-id d.defined-id-expr] 
-         #:literals (l.lit ...)
-         [spec ...] subs.g #:contracts c.cs desc ...))]))
-
-(define-syntax (defform stx)
-  (syntax-parse stx
-    [(_ k:kind-kw lt:link-target?-kw d:id-kw l:literals-kw spec
-        subs:subs-kw c:contracts-kw desc ...)
-     (syntax/loc stx
-       (defform*/subs #:kind k.kind
-         #:link-target? lt.expr
-         #:id [d.defined-id d.defined-id-expr] 
-         #:literals (l.lit ...)
-         [spec] subs.g #:contracts c.cs desc ...))]))
-
-(define-syntax (defform/subs stx)
-  (syntax-parse stx
-    [(_ k:kind-kw lt:link-target?-kw d:id-kw l:literals-kw spec subs desc ...)
-     (syntax/loc stx
-       (defform*/subs #:kind k.kind 
-         #:link-target? lt.expr
-         #:id [d.defined-id d.defined-id-expr] 
-         #:literals (l.lit ...)
-         [spec] subs desc ...))]))
-
-(define-syntax (defform/none stx)
-  (syntax-parse stx
-    [(_ k:kind-kw lt:link-target?-kw l:literals-kw spec subs:subs-kw c:contracts-kw desc ...)
-     (syntax/loc stx
-       (with-togetherable-racket-variables
-        (l.lit ...)
-        ([form/none spec]
-         [non-term (subs.g.non-term-id subs.g.non-term-form ...)] ...)
-        (*defforms k.kind lt.expr #f
-                   '(spec)
-                   (list (lambda (ignored) (racketblock0/form spec)))
-                   '((subs.g.non-term-id subs.g.non-term-form ...) ...)
-                   (list (list (lambda () (racket subs.g.non-term-id))
-                               (lambda () (racketblock0/form subs.g.non-term-form))
-                               ...)
-                         ...)
-                   (list (list (lambda () (racket c.contract-nonterm))
-                               (lambda () (racketblock0 c.contract-expr)))
-                         ...)
-                   (lambda () (list desc ...)))))]))
-
-(define-syntax (defidform/inline stx)
-  (syntax-case stx (unsyntax)
-    [(_ id)
-     (identifier? #'id)
-     #'(defform-site (quote-syntax id))]
-    [(_ (unsyntax id-expr))
-     #'(defform-site id-expr)]))
-
-(define-syntax (defidform stx)
-  (syntax-parse stx
-    [(_ k:kind-kw lt:link-target?-kw spec-id desc ...)
-     #'(with-togetherable-racket-variables
-        ()
-        ()
-        (*defforms k.kind lt.expr (quote-syntax/loc spec-id)
-                   '(spec-id)
-                   (list (lambda (x) (make-omitable-paragraph (list x))))
-                   null
-                   null
-                   null
-                   (lambda () (list desc ...))))]))
-
-(define (into-blockquote s)
-  (make-blockquote "leftindent"
-                   (if (splice? s)
-                     (flow-paragraphs (decode-flow (splice-run s)))
-                     (list s))))
-
-(define-syntax (defsubform stx)
-  (syntax-case stx ()
-    [(_ . rest) #'(into-blockquote (defform . rest))]))
-
-(define-syntax (defsubform* stx)
-  (syntax-case stx ()
-    [(_ . rest) #'(into-blockquote (defform* . rest))]))
-
-(define-syntax (spec?form/subs stx)
-  (syntax-parse stx
-    [(_ has-kw? l:literals-kw spec g:grammar
-        c:contracts-kw
-        desc ...)
-     (syntax/loc stx
-       (with-racket-variables
-        (l.lit ...)
-        ([form/maybe (has-kw? spec)]
-         [non-term (g.non-term-id g.non-term-form ...)] ...)
-        (*specsubform 'spec '(l.lit ...) (lambda () (racketblock0/form spec))
-                      '((g.non-term-id g.non-term-form ...) ...)
-                      (list (list (lambda () (racket g.non-term-id))
-                                  (lambda () (racketblock0/form g.non-term-form))
-                                  ...)
-                            ...)
-                      (list (list (lambda () (racket c.contract-nonterm))
-                                  (lambda () (racketblock0 c.contract-expr)))
-                            ...)
-                      (lambda () (list desc ...)))))]))
-
-(define-syntax (specsubform stx)
-  (syntax-parse stx
-    [(_ l:literals-kw spec subs:subs-kw c:contracts-kw desc ...)
-     (syntax/loc stx
-       (spec?form/subs #f #:literals (l.lit ...) spec subs.g #:contracts c.cs desc ...))]))
-
-(define-syntax (specsubform/subs stx)
-  (syntax-parse stx
-    [(_ l:literals-kw spec g:grammar desc ...)
-     (syntax/loc stx
-       (spec?form/subs #f #:literals (l.lit ...) spec 
-                       ([g.non-term-id g.non-term-form ...] ...) 
-                       desc ...))]))
-
-(define-syntax-rule (specspecsubform spec desc ...)
-  (make-blockquote "leftindent" (list (specsubform spec desc ...))))
-
-(define-syntax-rule (specspecsubform/subs spec subs desc ...)
-  (make-blockquote "leftindent" (list (specsubform/subs spec subs desc ...))))
-
-(define-syntax (specform stx)
-  (syntax-parse stx
-    [(_ l:literals-kw spec subs:subs-kw c:contracts-kw desc ...)
-     (syntax/loc stx
-       (spec?form/subs #t #:literals (l.lit ...) spec subs.g #:contracts c.cs desc ...))]))
-
-(define-syntax (specform/subs stx)
-  (syntax-parse stx
-    [(_ l:literals-kw spec g:grammar
-        desc ...)
-     (syntax/loc stx
-       (spec?form/subs #t #:literals (l.lit ...) spec ([g.non-term-id g.non-term-form ...] ...)
-                       desc ...))]))
-
-(define-syntax-rule (specsubform/inline spec desc ...)
-  (with-racket-variables
-   ()
-   ([form/maybe (#f spec)])
-   (*specsubform 'spec null #f null null null (lambda () (list desc ...)))))
-
-(define-syntax racketgrammar
-  (syntax-rules ()
-    [(_ #:literals (lit ...) id clause ...)
-     (racketgrammar* #:literals (lit ...) [id clause ...])]
-    [(_ id clause ...) (racketgrammar #:literals () id clause ...)]))
-
-(define-syntax racketgrammar*
-  (syntax-rules ()
-    [(_ #:literals (lit ...) [id clause ...] ...)
-     (with-racket-variables
-      (lit ...)
-      ([non-term (id clause ...)] ...)
-      (*racketgrammar '(lit ...)
-                      '(id ... clause ... ...)
-                      (lambda ()
-                        (list (list (racket id)
-                                    (racketblock0/form clause) ...)
-                              ...))))]
-    [(_ [id clause ...] ...)
-     (racketgrammar* #:literals () [id clause ...] ...)]))
-
-(define-syntax-rule (var id)
-  (*var 'id))
-
-(define-syntax-rule (svar id)
-  (*var 'id))
-
-
-(define (meta-symbol? s) (memq s '(... ...+ ?)))
-
-(define (defform-site kw-id)
-  (let ([target-maker (id-to-form-target-maker kw-id #t)])
-    (define-values (content ref-content) (definition-site (syntax-e kw-id) kw-id #t))
-    (if target-maker
-        (target-maker
-         content
-         (lambda (tag)
-           (make-toc-target2-element
-            #f
-            (if kw-id
-                (make-index-element
-                 #f content tag
-                 (list (datum-intern-literal (symbol->string (syntax-e kw-id))))
-                 (list ref-content)
-                 (with-exporting-libraries
-                  (lambda (libs)
-                    (make-form-index-desc (syntax-e kw-id)
-                                          libs))))
-                content)
-            tag
-            ref-content)))
-        content)))
-
-(define (*defforms kind link? kw-id forms form-procs subs sub-procs contract-procs content-thunk)
-  (parameterize ([current-meta-list '(... ...+)])
-    (make-box-splice
-     (cons
-      (make-blockquote
-       vertical-inset-style
-       (list
-        (make-table
-         boxed-style
-         (append
-          (for/list ([form (in-list forms)]
-                     [form-proc (in-list form-procs)]
-                     [i (in-naturals)])
-            (list
-             ((if (zero? i) (add-background-label (or kind "syntax")) values)
-              (list
-               ((or form-proc
-                    (lambda (x)
-                      (make-omitable-paragraph
-                       (list (to-element `(,x . ,(cdr form)))))))
-                (and kw-id
-                     (if (eq? form (car forms))
-                         (if link?
-                             (defform-site kw-id)
-                             (to-element #:defn? #t kw-id))
-                         (to-element #:defn? #t kw-id))))))))
-          (if (null? sub-procs)
-              null
-              (list (list flow-empty-line)
-                    (list (make-flow
-                           (list (let ([l (map (lambda (sub)
-                                                 (map (lambda (f) (f)) sub))
-                                               sub-procs)])
-                                   (*racketrawgrammars "specgrammar"
-                                                       (map car l)
-                                                       (map cdr l))))))))
-          (make-contracts-table contract-procs)))))
-      (content-thunk)))))
-
-(define (*specsubform form lits form-thunk subs sub-procs contract-procs content-thunk)
-  (parameterize ([current-meta-list '(... ...+)])
-    (make-blockquote
-     "leftindent"
-     (cons
-      (make-blockquote
-       vertical-inset-style
-       (list
-        (make-table
-         boxed-style
-         (cons
-          (list
-           (make-flow
-            (list
-             (if form-thunk
-                 (form-thunk)
-                 (make-omitable-paragraph (list (to-element form)))))))
-          (append
-           (if (null? sub-procs)
-               null
-               (list (list flow-empty-line)
-                     (list (make-flow
-                            (list (let ([l (map (lambda (sub)
-                                                  (map (lambda (f) (f)) sub))
-                                                sub-procs)])
-                                    (*racketrawgrammars "specgrammar"
-                                                        (map car l)
-                                                        (map cdr l))))))))
-           (make-contracts-table contract-procs))))))
-      (flow-paragraphs (decode-flow (content-thunk)))))))
-
-(define (*racketrawgrammars style nonterms clauseses)
-  (make-table
-   `((valignment baseline baseline baseline baseline baseline)
-     (alignment right left center left left)
-     (style ,style))
-   (cdr
-    (append-map
-     (lambda (nonterm clauses)
-       (list*
-        (list flow-empty-line flow-empty-line flow-empty-line
-              flow-empty-line flow-empty-line)
-        (list (to-flow nonterm) flow-empty-line (to-flow "=") flow-empty-line
-              (make-flow (list (car clauses))))
-        (map (lambda (clause)
-               (list flow-empty-line flow-empty-line
-                     (to-flow "|") flow-empty-line
-                     (make-flow (list clause))))
-             (cdr clauses))))
-     nonterms clauseses))))
-
-(define (*racketrawgrammar style nonterm clause1 . clauses)
-  (*racketrawgrammars style (list nonterm) (list (cons clause1 clauses))))
-
-(define (*racketgrammar lits s-expr clauseses-thunk)
-  (let ([l (clauseses-thunk)])
-    (*racketrawgrammars #f
-                        (map (lambda (x)
-                               (make-element #f
-                                             (list (hspace 2)
-                                                   (car x))))
-                             l)
-                        (map cdr l))))
-
-(define (*var id)
-  (to-element (*var-sym id)))
-
-(define (*var-sym id)
-  (string->symbol (format "_~a" id)))
-
-(define (make-contracts-table contract-procs)
-  (if (null? contract-procs)
-      null
-      (append
-       (list (list flow-empty-line))
-       (list (list (make-flow
-                    (map (lambda (c)
-                           (make-table
-                            "argcontract"
-                            (list
-                             (list (to-flow (hspace 2))
-                                   (to-flow ((car c)))
-                                   flow-spacer
-                                   (to-flow ":")
-                                   flow-spacer
-                                   (make-flow (list ((cadr c))))))))
-                         contract-procs)))))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-history.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-history.rkt
deleted file mode 100644
index c08283ea68..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-history.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     syntax/parse)
-         version/utils
-         scribble/base
-         scribble/core
-         "manual-sprop.rkt"
-         "manual-ex.rkt"
-         "manual-style.rkt")
-
-(provide history)
-
-(struct history-entry (what vers vers-stx expl))
-
-(begin-for-syntax
- (define-splicing-syntax-class clause
-   #:attributes (e)
-   [pattern (~seq #:added vers)
-            #:attr e #'(history-entry "Added" vers (quote-syntax vers) '("."))]
-   [pattern (~seq #:changed vers content)
-            #:attr e #'(history-entry "Changed" vers (quote-syntax vers)
-                                      (list ": " content))]))
-
-(define-syntax (history stx)
-  (syntax-parse stx
-    [(_ c:clause ...)
-     #'(make-history (list c.e ...))]))
-
-(define (make-history es)
-  (for ([e (in-list es)])
-    (define vers (history-entry-vers e))
-    (unless (valid-version? vers)
-      (raise-syntax-error 'history
-                          (format "not a valid version: ~e"
-                                  vers)
-                          (history-entry-vers-stx e))))
-  (delayed-block
-   (lambda (renderer p ri)
-     (define pkg
-       (let ([from (resolve-get/tentative p ri '(exporting-packages #f))])
-         (and from
-              (pair? from)
-              (car from))))
-     (para
-      #:style (style "SHistory" (list scheme-properties))
-      (for/list ([e (in-list (sort es (lambda (a b) (version<? a b))
-                                   #:key history-entry-vers))]
-                 [i (in-naturals)])
-        (define vers (history-entry-vers e))
-        (list (if (zero? i)
-                  null
-                  (list null ; needed to avoid " " dropped as whitespace
-                        " "))
-              (history-entry-what e)
-              " in version "
-              vers
-              (if (and pkg (zero? i))
-                  (list " of package " (tt pkg))
-                  null)
-              (history-entry-expl e)))))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-method.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-method.rkt
deleted file mode 100644
index 9e5a75d15f..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-method.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang scheme/base
-(require "../struct.rkt"
-         "../search.rkt"
-         "../scheme.rkt"
-         "../basic.rkt"
-         "manual-scheme.rkt"
-         (for-syntax scheme/base))
-
-(provide ;; public:
-         method xmethod)
-; XXX unknown contracts
-(provide *method **method
-         method-tag
-         constructor-tag
-         name-this-object)
-
-(define-syntax-rule (method class/interface method-name)
-  (*method 'method-name (quote-syntax class/interface)))
-
-(define-syntax-rule (xmethod class/intf-id method-id)
-  (elem (method class/intf-id method-id) " in " (racket class/intf-id)))
-
-(define (*method sym id
-                 #:defn? [defn? #f])
-  (**method sym id #:defn? defn?))
-
-(define (**method sym id/tag
-                  #:defn? [defn? #f])
-  (define content (list (symbol->string sym)))
-  (define (mk tag)
-    (make-element symbol-color
-                  (list (make-link-element (if defn?
-                                               value-def-color 
-                                               value-link-color)
-                                           content
-                                           (method-tag tag sym)))))
-  (if (identifier? id/tag)
-      (make-delayed-element
-       (λ (ren p ri)
-         (let ([tag (find-scheme-tag p ri id/tag #f)])
-           (if tag (list (mk tag)) content)))
-       (λ () (car content))
-       (λ () (car content)))
-      (mk id/tag)))
-
-(define (method-tag vtag sym)
-  (list 'meth (list (cadr vtag) sym)))
-
-(define (constructor-tag vtag)
-  (list 'constructor (cadr vtag)))
-
-(define (name-this-object type-sym)
-  (to-element
-   (string->symbol
-    (regexp-replace
-     #rx"(%|<%>|-mixin)$"
-     (format "_a~a-~s"
-             (if (member (string-ref (symbol->string type-sym) 0)
-                         '(#\a #\e #\i #\o #\u))
-               "n"
-               "")
-             type-sym)
-     ""))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-mod.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-mod.rkt
deleted file mode 100644
index 65eff1349f..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-mod.rkt
+++ /dev/null
@@ -1,325 +0,0 @@
-#lang scheme/base
-(require "../decode.rkt"
-         "../struct.rkt"
-         "../basic.rkt"
-         "../manual-struct.rkt"
-         (only-in "../core.rkt" table-columns)
-         "manual-ex.rkt"
-         "manual-style.rkt"
-         "manual-scheme.rkt"
-         "manual-utils.rkt"
-         setup/main-collects
-         pkg/path
-         racket/list
-         (for-syntax scheme/base
-                     syntax/parse)
-         (for-label scheme/base))
-
-(provide defmodule defmodule* 
-         defmodulelang defmodulelang* 
-         defmodulereader defmodulereader*
-         defmodule*/no-declare defmodulelang*/no-declare defmodulereader*/no-declare
-         declare-exporting)
-
-;; ---------------------------------------------------------------------------------------------------
-(provide deprecated)
-
-(require (only-in scribble/core make-style make-background-color-property)
-         (only-in scribble/base para nested))
-
-;; @deprecated[Precontent]{Precontent ... }
-;; produces a nested paragraph with a yellow NOTE label to warn readers of deprecated modules 
-(define (deprecated #:what [what "library"]
-                    replacement
-                    . additional-notes)
-  (apply nested #:style 'inset
-         (yellow (bold "NOTE:"))
-         " This " what
-         " is deprecated; use "
-         replacement
-         ", instead. "
-         additional-notes))
-
-(define (yellow . content)
-  (make-element (make-style #f (list (make-background-color-property "yellow"))) content))
-;; ---------------------------------------------------------------------------------------------------
-
-(define-syntax (defmodule stx)
-  (syntax-parse stx
-    [(_ (~or (~seq #:require-form req)
-             (~seq))
-        (~or (~seq #:multi (name2 ...))
-             name)
-        (~or (~optional (~seq #:link-target? link-target-expr)
-                        #:defaults ([link-target-expr #'#t]))
-             (~optional (~and #:indirect indirect))
-             (~optional (~seq #:use-sources (pname ...)))
-             (~optional (~seq #:module-paths (modpath ...)))
-             (~optional (~seq #:packages (pkg ...)))
-             (~optional (~and #:no-declare no-declare))
-             (~optional (~or (~and #:lang language)
-                             (~and #:reader readr))))
-        ...
-        . content)
-     (with-syntax ([(name2 ...) (if (attribute name)
-                                    #'(name)
-                                    #'(name2 ...))]
-                   [(pname ...) (if (attribute pname)
-                                    #'(pname ...)
-                                    #'())]
-                   [(indirect-kw ...) (if (attribute indirect)
-                                          #'(#:indirect)
-                                          #'())])
-       (with-syntax ([(decl-exp ...)
-                      (if (attribute no-declare)
-                          #'()
-                          (with-syntax ([(mod ...)
-                                         (if (attribute modpath)
-                                             #'(modpath ...)
-                                             #'(name2 ...))]
-                                        [(pkg-decl ...)
-                                         (if (attribute pkg)
-                                             #'(#:packages (pkg ...))
-                                             #'())])
-                            #'((declare-exporting mod ... pkg-decl ... #:use-sources (pname ...)))))]
-                     [kind (cond
-                            [(attribute language) #'#t]
-                            [(attribute readr) #''reader]
-                            [else #'#f])]
-                     [modpaths (if (attribute modpath)
-                                   #'(list (racketmodname modpath indirect-kw ...) ...)
-                                   #'#f)]
-                     [packages (if (attribute pkg)
-                                   #'(list pkg ...)
-                                   #'#f)]
-                     [module-path (let ([l (syntax->list 
-                                            (if (attribute modpath)
-                                                #'(modpath ...)
-                                                #'(name2 ...)))])
-                                    (and (pair? l)
-                                         (car l)))]
-                     [req (if (attribute req)
-                              #'req
-                              #'(racket require))]
-                     [(show-name ...)
-                      (if (attribute modpath)
-                          #'(name2 ...)
-                          #'((racketmodname name2 indirect-kw ...) ...))])
-         #'(begin
-             decl-exp ...
-             (*defmodule (list show-name ...)
-                         modpaths
-                         'module-path
-                         packages
-                         link-target-expr
-                         kind
-                         (list . content)
-                         req))))]))
-
-;; ----------------------------------------
-;; old forms for backward compatibility:
-
-(define-syntax defmodule*/no-declare
-  (syntax-rules ()
-    [(_ #:require-form req (name ...) . content)
-     (defmodule #:require-form req
-       #:names (name ...)
-       #:no-declare
-       . content)]
-    [(_ (name ...) . content)
-     (defmodule #:multi (name ...)
-       #:no-declare
-       . content)]))
-
-(define-syntax defmodule*
-  (syntax-rules ()
-    [(_ #:require-form req (name ...) . options+content)
-     (defmodule #:require-form req #:multi (name ...)
-       . options+content)]
-    [(_ (name ...) . options+content)
-     (defmodule #:multi (name ...) . options+content)]))
-
-(define-syntax defmodulelang*/no-declare
-  (syntax-rules ()
-    [(_ (lang ...) . options+content)
-     (defmodule #:multi (lang ...)
-       #:lang
-       #:no-declare
-       . options+content)]))
-
-(define-syntax defmodulelang*
-  (syntax-rules ()
-    [(_ (name ...) . options+content)
-     (defmodule #:multi (name ...)
-       #:lang
-       . options+content)]))
-
-(define-syntax defmodulelang
-  (syntax-rules ()
-    [(_ lang #:module-path modpath . options+content)
-     (defmodule lang
-       #:module-paths (modpath)
-       #:lang
-       . options+content)]
-    [(_ lang . options+content)
-     (defmodule lang
-       #:lang
-       . options+content)]))
-
-(define-syntax-rule (defmodulereader*/no-declare (lang ...) . options+content)
-  (defmodule #:multi (lang ...)
-    #:reader
-    #:no-declare
-    . options+content))
-
-(define-syntax defmodulereader*
-  (syntax-rules ()
-    [(_ (name ...) . options+content)
-     (defmodule #:multi (name ...)
-       #:reader
-       . options+content)]))
-
-(define-syntax-rule (defmodulereader lang . options+content)
-  (defmodule lang
-    #:reader
-    . options+content))
-
-;; ----------------------------------------
-
-(define (compute-packages module-path)
-  (let* ([path (with-handlers ([exn:missing-module? (lambda (exn) #f)])
-                 (and module-path
-                      (resolved-module-path-name
-                       (module-path-index-resolve (module-path-index-join module-path #f)))))]
-         [pkg (and path
-                   (path? path)
-                   (or (path->pkg path)
-                       (let ([c (path->main-collects-relative path)])
-                         (and c
-                              "base"))))])
-    (if pkg
-        (list pkg)
-        null)))
-
-(define (*defmodule names modpaths module-path packages link-target? lang content req)
-  (let ([modpaths (or modpaths names)])
-    (define pkg-spec
-      (let ([pkgs (or packages
-                      (compute-packages module-path))])
-        (and pkgs
-             (pair? pkgs)
-             (make-flow
-              (list
-               (make-omitable-paragraph
-                (list (elem #:style "RpackageSpec"
-                            (list* (smaller 'nbsp
-                                            (format "package~a:" 
-                                                    (if (null? (cdr pkgs))
-                                                        ""
-                                                        "s")))
-                                   " "
-                                   (add-between (map tt pkgs) ", "))))))))))
-    (define (flow-width f) (apply max (map block-width f)))
-    (define libs-specs
-      (map
-       (lambda (name modpath)
-         (define modname (if link-target?
-                             (make-defracketmodname name modpath)
-                             name))
-         (list
-          (make-flow
-           (list
-            (make-omitable-paragraph
-             (cons
-              spacer
-              (case lang
-                [(#f)
-                 (list (racket (#,req #,modname)))]
-                [(#t)
-                 (list (hash-lang) spacer modname)]
-                [(reader)
-                 (list (racketmetafont "#reader") spacer modname)]
-                [(just-lang)
-                 (list (hash-lang) spacer modname)]
-                [else (error 'defmodule "unknown mode: ~e" lang)])))))
-          'cont))
-       names
-       modpaths))
-
-    (make-splice
-     (cons
-      (make-table
-       (make-style "defmodule"
-                   (list (table-columns (list
-                                         (make-style #f '(left))
-                                         (make-style #f '(right))))))
-       (if pkg-spec
-           (if ((+ (flow-width (caar libs-specs))
-                   (flow-width pkg-spec)
-                   8)
-                . < . (current-display-width))
-               (cons
-                (cons (car (car libs-specs))
-                      (list pkg-spec))
-                (cdr libs-specs))
-               (append
-                libs-specs
-                (list (list (make-flow (list (make-omitable-paragraph (list 'nbsp))))
-                            pkg-spec))))
-           libs-specs))
-      (append (if link-target?
-                  (map (lambda (modpath)
-                         (make-part-tag-decl 
-                          (intern-taglet
-                           `(mod-path ,(datum-intern-literal
-                                        (element->string modpath))))))
-                       modpaths)
-                  null)
-              (flow-paragraphs (decode-flow content)))))))
-
-(define the-module-path-index-desc (make-module-path-index-desc))
-
-(define (make-defracketmodname mn mp)
-  (let ([name-str (datum-intern-literal (element->string mn))]
-        [path-str (datum-intern-literal (element->string mp))])
-    (make-index-element #f
-                        (list mn)
-                        (intern-taglet `(mod-path ,path-str))
-                        (list name-str)
-                        (list mn)
-                        the-module-path-index-desc)))
-
-(define-syntax (declare-exporting stx)
-  (syntax-parse stx
-    [(_ lib:expr ... 
-        (~optional (~seq #:packages (pkg ...)))
-        (~optional (~seq #:use-sources (plib ...))))
-     (with-syntax ([(plib ...) (if (attribute plib)
-                                   #'(plib ...)
-                                   #'())]
-                   [packages (if (attribute pkg)
-                                 #'(list pkg ...)
-                                 #'#f)])
-       (let ([libs (syntax->list #'(lib ... plib ...))])
-         (for ([l libs])
-           (unless (module-path? (syntax->datum l))
-             (raise-syntax-error #f "not a module path" stx l)))
-         (when (null? libs)
-           (raise-syntax-error #f "need at least one module path" stx))
-         #'(*declare-exporting '(lib ...) '(plib ...) packages)))]))
-
-(define (*declare-exporting libs source-libs in-pkgs)
-  (define pkgs (or in-pkgs
-                   (if (null? libs)
-                       null
-                       (compute-packages (car libs)))))
-  (make-splice
-   (list
-    (make-part-collect-decl
-     (make-collect-element
-      #f null
-      (lambda (ri)
-        (collect-put! ri '(exporting-libraries #f) libs)
-        (collect-put! ri '(exporting-packages #f) pkgs))))
-    (make-part-collect-decl
-     (make-exporting-libraries #f null (and (pair? libs) libs) source-libs pkgs)))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt
deleted file mode 100644
index c34e053f4b..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt
+++ /dev/null
@@ -1,1171 +0,0 @@
-#lang racket/base
-(require "../struct.rkt"
-         "../scheme.rkt"
-         "../basic.rkt"
-         "../manual-struct.rkt"
-         (only-in "../core.rkt" 
-                  make-style make-table-columns)
-         "../html-properties.rkt"
-         "qsloc.rkt"
-         "manual-utils.rkt"
-         "manual-vars.rkt"
-         "manual-style.rkt"
-         "manual-scheme.rkt"
-         "manual-bind.rkt"
-         "manual-method.rkt"
-         "manual-ex.rkt"
-         "on-demand.rkt"
-         scheme/string
-         scheme/list
-         (for-syntax racket/base
-                     syntax/parse)
-         (for-label racket/base
-                    racket/contract
-                    racket/class))
-
-(provide defproc defproc* defstruct defstruct*
-         defparam defparam* defboolparam
-         defthing defthing* 
-         defthing/proc ; XXX unknown contract
-         ;; private:
-         *defthing) ; XXX unknown contract
-
-(define-on-demand dots0
-  (make-element meta-color (list "...")))
-(define-on-demand dots1
-  (make-element meta-color (list "...+")))
-
-(define (make-openers n)
-  (racketparenfont
-   (case n [(1) "("] [(0) ""] [(2) "(("] [else (make-string n #\()])))
-(define (make-closers n)
-  (racketparenfont
-   (case n [(1) ")"] [(0) ""] [(2) "))"] [else (make-string n #\()])))
-
-(define-syntax (arg-contract stx)
-  (syntax-case stx (... ...+ _...superclass-args...)
-    [(_ [id contract])
-     (identifier? #'id)
-     #'(racketblock0 contract)]
-    [(_ [id contract val])
-     (identifier? #'id)
-     #'(racketblock0 contract)]
-    [(_ [kw id contract])
-     (and (keyword? (syntax-e #'kw)) (identifier? #'id))
-     #'(racketblock0 contract)]
-    [(_ [kw id contract val])
-     (and (keyword? (syntax-e #'kw)) (identifier? #'id))
-     #'(racketblock0 contract)]
-    [(_ (... ...)) #'#f]
-    [(_ (... ...+)) #'#f]
-    [(_ _...superclass-args...) #'#f]
-    [(_ arg) (raise-syntax-error 'defproc "bad argument form" #'arg)]))
-
-(define-syntax (arg-default stx)
-  (syntax-case stx (... ...+ _...superclass-args...)
-    [(_ [id contract])
-     (identifier? #'id)
-     #'#f]
-    [(_ [id contract val])
-     (identifier? #'id)
-     #'(racketblock0 val)]
-    [(_ [kw id contract])
-     (keyword? (syntax-e #'kw))
-     #'#f]
-    [(_ [kw id contract val])
-     (keyword? (syntax-e #'kw))
-     #'(racketblock0 val)]
-    [_ #'#f]))
-
-(define-syntax (extract-proc-id stx)
-  (syntax-case stx ()
-    [(_ k e id)
-     (identifier? #'id)
-     (if (and (syntax-e #'k)
-              (free-identifier=? #'k #'id))
-         #'e
-         #`(quote-syntax/loc id))]
-    [(_ k e (proto arg ...))
-     #'(extract-proc-id k e proto)]
-    [(_ thing) (raise-syntax-error 'defproc "bad prototype" #'thing)]))
-
-(define-syntax (arg-contracts stx)
-  (syntax-case stx ()
-    [(_ id arg ...)
-     (identifier? #'id)
-     #'(list (lambda () (arg-contract arg)) ...)]
-    [(_ (proto arg1 ...) arg ...)
-     #'(arg-contracts proto arg1 ... arg ...)]
-    [_ (raise-syntax-error 'defproc "bad prototype" stx)]))
-
-(define-syntax (arg-defaults stx)
-  (syntax-case stx ()
-    [(_ id arg ...)
-     (identifier? #'id)
-     #'(list (lambda () (arg-default arg)) ...)]
-    [(_ (proto arg1 ...) arg ...)
-     #'(arg-defaults proto arg1 ... arg ...)]
-    [_ (raise-syntax-error 'defproc "bad prototype" stx)]))
-
-(define-syntax (result-contract stx)
-  (syntax-case stx (values)
-    [(_ (values c ...))
-     #'(list (racketblock0 c) ...)]
-    [(_ c)
-     (if (string? (syntax-e #'c))
-       (raise-syntax-error 'defproc
-                           "expected a result contract, found a string" #'c)
-       #'(racketblock0 c))]))
-
-(define no-value #f)
-
-(define-syntax (result-value stx)
-  (syntax-case stx (no-value let)
-    [(_ no-value)  #'#f]
-    [(_ (let () e ...))  #'(racketblock0 e ...)]
-    [(_ v)  #'(racketblock0 v)]))
-
-(begin-for-syntax
- (define-splicing-syntax-class kind-kw
-   #:description "#:kind keyword"
-   (pattern (~optional (~seq #:kind kind)
-                       #:defaults ([kind #'#f]))))
-
- (define-splicing-syntax-class value-kw
-   #:description "#:value keyword"
-   (pattern (~optional (~seq #:value value)
-                       #:defaults ([value #'no-value]))))
- 
- (define-splicing-syntax-class link-target?-kw
-   #:description "#:link-target? keyword"
-   (pattern (~seq #:link-target? expr))
-   (pattern (~seq)
-            #:with expr #'#t))
-
- (define-syntax-class id-or-false
-   (pattern i:id)
-   (pattern #f #:with i #'#f))
-   
- (define-splicing-syntax-class id-kw
-   #:description "#:id keyword"
-   (pattern (~optional (~seq #:id [key:id-or-false expr])
-                       #:defaults ([key #'#f]
-                                   [expr #'#f]))))
- 
- (define-splicing-syntax-class mode-kw
-   #:description "#:mode keyword"
-   (pattern (~optional (~seq #:mode m:id)
-                       #:defaults ([m #'procedure]))))
-
- (define-splicing-syntax-class within-kw
-   #:description "#:within keyword"
-   (pattern (~optional (~seq #:within cl:id)
-                       #:defaults ([cl #'#f]))))
- )
-
-(define-syntax (defproc stx)
-  (syntax-parse stx
-    [(_ kind:kind-kw
-        lt:link-target?-kw
-        i:id-kw
-        (id arg ...)
-        result
-        value:value-kw
-        desc ...)
-     (syntax/loc stx
-       (defproc*
-         #:kind kind.kind
-         #:link-target? lt.expr
-         #:id [i.key i.expr]
-         [[(id arg ...) result #:value value.value]]
-         desc ...))]))
-
-(define-syntax (defproc* stx)
-  (syntax-parse stx
-    [(_ kind:kind-kw
-        lt:link-target?-kw
-        d:id-kw
-        mode:mode-kw
-        within:within-kw
-        [[proto result value:value-kw] ...]
-        desc ...)
-     (syntax/loc stx
-       (with-togetherable-racket-variables
-        ()
-        ([proc proto] ...)
-        (let ([alt-id d.expr])
-          (*defproc kind.kind
-                    lt.expr
-                    'mode.m (quote-syntax/loc within.cl)
-                    (list (extract-proc-id d.key alt-id proto) ...)
-                    'd.key
-                    '[proto ...]
-                    (list (arg-contracts proto) ...)
-                    (list (arg-defaults proto) ...)
-                    (list (lambda () (result-contract result)) ...)
-                    (lambda () (list desc ...))
-                    (list (result-value value.value) ...)))))]))
-
-(define-struct arg
-  (special? kw id optional? starts-optional? ends-optional? num-closers))
-
-(define (*defproc kind link? mode within-id
-                  stx-ids sym prototypes arg-contractss arg-valss result-contracts content-thunk
-                  [result-values (map (lambda (x) #f) result-contracts)])
-  (define max-proto-width (current-display-width))
-  (define ((arg->elem show-opt-start?) arg)
-    (let* ([e (cond [(not (arg-special? arg))
-                     (if (arg-kw arg)
-                       (if (eq? mode 'new)
-                         (make-element
-                          #f (list (racketparenfont "[")
-                                   (racketidfont (datum-intern-literal (keyword->string (arg-kw arg))))
-                                   spacer
-                                   (to-element (make-var-id (arg-id arg)))
-                                   (racketparenfont "]")))
-                         (make-element
-                          #f (list (to-element (arg-kw arg))
-                                   spacer
-                                   (to-element (make-var-id (arg-id arg))))))
-                       (to-element (make-var-id (arg-id arg))))]
-                    [(eq? (arg-id arg) '...+) dots1]
-                    [(eq? (arg-id arg) '...) dots0]
-                    [(eq? (arg-id arg) '_...superclass-args...) (to-element (arg-id arg))]
-                    [else (to-element (make-var-id (arg-id arg)))])]
-           [e (if (arg-ends-optional? arg)
-                (make-element #f (list e "]"))
-                e)]
-           [e (if (zero? (arg-num-closers arg))
-                e
-                (make-element
-                 #f (list e (make-closers (arg-num-closers arg)))))])
-      (if (and show-opt-start? (arg-starts-optional? arg))
-        (make-element #f (list "[" e))
-        e)))
-  (define (prototype-depth p)
-    (let loop ([p (car p)])
-      (if (symbol? p) 0 (+ 1 (loop (car p))))))
-  (define (prototype-args p)
-    (define (parse-arg v in-optional? depth next-optional? next-special-dots?)
-      (let* ([id (if (pair? v) ((if (keyword? (car v)) cadr car) v) v)]
-             [kw (and (pair? v) (keyword? (car v)) (car v))]
-             [default? (and (pair? v) (pair? ((if kw cdddr cddr) v)))])
-        (make-arg (symbol? v) kw id default?
-                  (and default? (not in-optional?))
-                  (or (and (not default?)
-                           in-optional?) ; => must be special
-                      (and default?
-                           (not next-optional?)
-                           (not next-special-dots?)))
-                  depth)))
-    (let loop ([p p] [last-depth 0])
-      (append
-       (if (symbol? (car p))
-         null
-         (loop (car p) (add1 last-depth)))
-       (let loop ([p (cdr p)][in-optional? #f])
-         (cond
-           [(null? p) null]
-           [(null? (cdr p))
-            (list (parse-arg (car p) in-optional? last-depth #f #f))]
-           [else
-            (let ([a (parse-arg
-                      (car p)
-                      in-optional?
-                      0
-                      (let ([v (cadr p)])
-                        (and (pair? v)
-                             (not
-                              (null? ((if (keyword? (car v)) cdddr cddr) v)))))
-                      (and (not (pair? (cadr p)))
-                           (not (eq? '_...superclass-args... (cadr p)))))])
-              (cons a (loop (cdr p)
-                            (and (arg-optional? a)
-                                 (not (arg-ends-optional? a))))))])))))
-  (define (prototype-size args first-combine next-combine special-combine?)
-    (let loop ([s args] [combine first-combine])
-      (if (null? s)
-        0
-        (combine
-         (loop (cdr s) next-combine)
-         (let ([a (car s)])
-           (+ (arg-num-closers a)
-              (if (arg-special? a)
-                (string-length (symbol->string (arg-id a)))
-                (+ (if (arg-kw a)
-                     (+ (if (eq? mode 'new) 2 0)
-                        (string-length (keyword->string (arg-kw a)))
-                        3
-                        (string-length (symbol->string (arg-id a))))
-                     (string-length (symbol->string (arg-id a))))
-                   (if (and special-combine?
-                            (pair? (cdr s))
-                            (arg-special? (cadr s))
-                            (not (eq? '_...superclass-args...
-                                      (arg-id (cadr s)))))
-                     (+ 1 (string-length (symbol->string (arg-id (cadr s)))))
-                     0)))))))))
-  (define (extract-id p stx-id)
-    (let loop ([p p])
-      (if (symbol? (car p)) 
-          (let ([s (car p)])
-            (if (eq? s sym)
-                (syntax-e stx-id)
-                (car p)))
-          (loop (car p)))))
-  (define (do-one stx-id prototype args arg-contracts arg-vals result-contract result-value
-                  first? add-background-label?)
-    (let ([names (remq* '(... ...+) (map arg-id args))])
-      (unless (= (length names) (length (remove-duplicates names eq?)))
-        (error 'defproc "duplicate argument names in prototype for ~s: ~s"
-               (syntax->datum stx-id) names)))
-    (define tagged
-      (cond
-        [(or (eq? mode 'new)
-             (eq? mode 'make))
-         (define content
-           (list (if (eq? mode 'new)
-                     (racket new)
-                     (racket make-object))))
-         (define new-elem
-           (if (and first? link?)
-               (let* ([target-maker (id-to-target-maker within-id #f)])
-                 (if target-maker
-                     (target-maker
-                      content
-                      (lambda (ctag)
-                        (let ([tag (constructor-tag ctag)])
-                          (make-toc-target-element
-                           #f
-                           (list (make-index-element
-                                  #f
-                                  content
-                                  tag
-                                  (list (datum-intern-literal (symbol->string (syntax-e within-id))) 
-                                        (if (eq? mode 'new)
-                                            "new"
-                                            "make-object"))
-                                  content
-                                  (with-exporting-libraries
-                                   (lambda (libs)
-                                     (make-constructor-index-desc
-                                      (syntax-e within-id)
-                                      libs ctag)))))
-                           tag))))
-                     (car content)))
-               (car content)))
-         (make-element #f (list new-elem spacer (to-element within-id)))]
-        [(eq? mode 'send)
-         (make-element
-          #f
-          (list (racket send) spacer
-                (name-this-object (syntax-e within-id)) spacer
-                (if (and first? link?)
-                  (let* ([mname (extract-id prototype stx-id)]
-                         [target-maker (id-to-target-maker within-id #f)]
-                         [content (*method mname within-id #:defn? #t)]
-                         [ref-content (*method mname within-id)])
-                    (if target-maker
-                      (target-maker
-                       content
-                       (lambda (ctag)
-                         (let ([tag (method-tag ctag mname)])
-                           (make-toc-target2-element
-                            #f
-                            (list (make-index-element
-                                   #f
-                                   content
-                                   tag
-                                   (list (datum-intern-literal (symbol->string mname)))
-                                   (list ref-content)
-                                   (with-exporting-libraries
-                                    (lambda (libs)
-                                      (make-method-index-desc
-                                       (syntax-e within-id)
-                                       libs mname ctag)))))
-                            tag
-                            ref-content))))
-                      content))
-                  (*method (extract-id prototype stx-id) within-id #:defn? #t))))]
-        [(and first? link?)
-         (define the-id (extract-id prototype stx-id))
-         (let ([target-maker (id-to-target-maker stx-id #t)])
-           (define-values (content ref-content) (definition-site the-id stx-id #f))
-           (if target-maker
-               (target-maker
-                content
-                (lambda (tag)
-                  (make-toc-target2-element
-                   #f
-                   (make-index-element
-                    #f content tag
-                    (list (datum-intern-literal (symbol->string the-id)))
-                    (list ref-content)
-                    (with-exporting-libraries
-                     (lambda (libs)
-                       (make-procedure-index-desc the-id libs))))
-                   tag
-                   ref-content)))
-               content))]
-        [else
-         (define the-id (extract-id prototype stx-id))
-         ((if link? annote-exporting-library values)
-          (let ([sig (current-signature)])
-            (if sig
-              (*sig-elem #:defn? #t (sig-id sig) the-id)
-              (to-element #:defn? #t (make-just-context the-id stx-id)))))]))
-    (define p-depth (prototype-depth prototype))
-    (define flat-size (+ (prototype-size args + + #f)
-                         p-depth
-                         (element-width tagged)))
-    (define short? (or (flat-size . < . 40) ((length args) . < . 2)))
-    (define res
-      (let ([res (result-contract)])
-        (if (list? res)
-          ;; multiple results
-          (if (null? res)
-            'nbsp
-            (let ([w (apply + (map block-width res))])
-              (if (or (ormap table? res) (w . > . 40))
-                (make-table
-                 #f (map (lambda (fe) (list (make-flow (list fe)))) res))
-                (make-table
-                 #f
-                 (list (let loop ([res res])
-                         (if (null? (cdr res))
-                           (list (make-flow (list (car res))))
-                           (list* (make-flow (list (car res)))
-                                  flow-spacer
-                                  (loop (cdr res))))))))))
-          res)))
-    (define tagged+arg-width (+ (prototype-size args max max #t)
-                                p-depth
-                                (element-width tagged)))
-    (define result-next-line?
-      ((+ (if short? flat-size tagged+arg-width) (block-width res))
-       . >= . (- max-proto-width 7)))
-    (define end (list flow-spacer (to-flow 'rarr)
-                      flow-spacer (make-flow (list res))))
-    (define (get-label)
-      (case mode
-        [(new make) "constructor"]
-        [(send) "method"]
-        [else (or kind "procedure")]))
-    (append
-     (list
-      (list
-       ((if add-background-label? (add-background-label (get-label)) values)
-        (make-flow
-         (if short?
-             ;; The single-line case:
-             (make-table-if-necessary
-              "prototype"
-              (list
-               (cons
-                (to-flow
-                 (make-element
-                  #f
-                  `(,(make-openers (add1 p-depth))
-                    ,tagged
-                    ,@(if (null? args)
-                          (list (make-closers p-depth))
-                          (append-map (lambda (arg)
-                                        (list spacer ((arg->elem #t) arg)))
-                                      args))
-                    ,(racketparenfont ")"))))
-                (if result-next-line? null end))))
-             ;; The multi-line case:
-             (let ([not-end (if result-next-line?
-                                (list flow-spacer)
-                                (list flow-spacer flow-spacer
-                                      flow-spacer flow-spacer))]
-                   [one-ok? (and (not (eq? mode 'new)) (tagged+arg-width . < . (- max-proto-width 5)))])
-               (list
-                (make-table
-                 "prototype"
-                 (cons
-                  (cons
-                   (to-flow
-                    (make-element
-                     #f
-                     (list
-                      (make-openers (add1 p-depth))
-                      tagged)))
-                   (if one-ok?
-                       (list*
-                        (if (arg-starts-optional? (car args))
-                            (to-flow (make-element #f (list spacer "[")))
-                            flow-spacer)
-                        (to-flow ((arg->elem #f) (car args)))
-                        not-end)
-                       (list* 'cont 'cont not-end)))
-                  (let loop ([args (if one-ok? (cdr args) args)])
-                    (if (null? args)
-                        null
-                        (let ([dots-next?
-                               (or (and (pair? (cdr args))
-                                        (arg-special? (cadr args))
-                                        (not (eq? '_...superclass-args...
-                                                  (arg-id (cadr args))))))])
-                          (cons
-                           (list*
-                            (if (eq? mode 'new)
-                                (flow-spacer/n 3)
-                                flow-spacer)
-                            (if (arg-starts-optional? (car args))
-                                (to-flow (make-element #f (list spacer "[")))
-                                flow-spacer)
-                            (let ([a ((arg->elem #f) (car args))]
-                                  [next (if dots-next?
-                                            (make-element
-                                             #f (list spacer
-                                                      ((arg->elem #f)
-                                                       (cadr args))))
-                                            "")])
-                              (to-flow
-                               (cond
-                                [(null? ((if dots-next? cddr cdr) args))
-                                 (make-element
-                                  #f
-                                  (list a next (racketparenfont ")")))]
-                                [(equal? next "") a]
-                                [else
-                                 (make-element #f (list a next))])))
-                            (if (and (null? ((if dots-next? cddr cdr) args))
-                                     (not result-next-line?))
-                                end
-                                not-end))
-                           (loop ((if dots-next? cddr cdr)
-                                  args)))))))))))))))
-     (if result-next-line?
-       (list (list (make-flow (make-table-if-necessary "prototype"
-                                                       (list end)))))
-       null)
-     (append-map
-      (lambda (arg arg-contract arg-val)
-        (cond
-          [(not (arg-special? arg))
-           (let* ([arg-cont (arg-contract)]
-                  [base-len (+ 5 (string-length (symbol->string (arg-id arg)))
-                               (block-width arg-cont))]
-                  [arg-val (and arg-val (arg-val))]
-                  [def-len (if (arg-optional? arg) (block-width arg-val) 0)]
-                  [base-list
-                   (list (to-flow (hspace 2))
-                         (to-flow (to-element (make-var-id (arg-id arg))))
-                         flow-spacer
-                         (to-flow ":")
-                         flow-spacer
-                         (make-flow (list arg-cont)))])
-             (list
-              (list
-               (make-flow
-                (if (and (arg-optional? arg)
-                         ((+ base-len 3 def-len) . >= . max-proto-width))
-                  (list
-                   (make-table
-                    "argcontract"
-                    (list base-list (list flow-spacer flow-spacer flow-spacer
-                                          (to-flow "=") flow-spacer
-                                          (make-flow (list arg-val))))))
-                  (make-table-if-necessary
-                   "argcontract"
-                   (list
-                    (append
-                     base-list
-                     (if (and (arg-optional? arg)
-                              ((+ base-len 3 def-len) . < . max-proto-width))
-                       (list flow-spacer (to-flow "=") flow-spacer
-                             (make-flow (list arg-val)))
-                       null)))))))))]
-          [else null]))
-      args
-      arg-contracts
-      arg-vals)
-     (if result-value
-         (let ([result-block  (if (block? result-value)
-                                  result-value
-                                  (make-omitable-paragraph (list result-value)))])
-           (list (list (list (make-table
-                              "argcontract"
-                              (list (list
-                                     (to-flow (make-element #f (list spacer "=" spacer)))
-                                     (make-flow (list result-block)))))))))
-         null)))
-  (define all-args (map prototype-args prototypes))
-  (define var-list
-    (filter-map (lambda (a) (and (not (arg-special? a)) (arg-id a)))
-                (append* all-args)))
-  (make-box-splice
-   (cons
-    (make-blockquote
-     vertical-inset-style
-     (list
-      (make-table
-       boxed-style
-       (append-map
-        do-one
-        stx-ids prototypes all-args arg-contractss arg-valss result-contracts result-values
-        (let loop ([ps prototypes] [stx-ids stx-ids] [accum null])
-          (cond [(null? ps) null]
-                [(ormap (lambda (a) (eq? (extract-id (car ps) (car stx-ids)) a)) accum)
-                 (cons #f (loop (cdr ps) (cdr stx-ids) accum))]
-                [else (cons #t (loop (cdr ps)
-                                     (cdr stx-ids)
-                                     (cons (extract-id (car ps) (car stx-ids)) accum)))]))
-        (for/list ([p (in-list prototypes)]
-                   [i (in-naturals)])
-          (= i 0))))))
-    (content-thunk))))
-
-(define-syntax (defparam stx)
-  (syntax-parse stx
-    [(_ lt:link-target?-kw id arg contract value:value-kw desc ...)
-     #'(defproc* #:kind "parameter" #:link-target? lt.expr
-         ([(id) contract] [(id [arg contract]) void? #:value value.value]) 
-         desc ...)]))
-(define-syntax (defparam* stx)
-  (syntax-parse stx
-    [(_ lt:link-target?-kw id arg in-contract out-contract value:value-kw desc ...)
-     #'(defproc* #:kind "parameter" #:link-target? lt.expr
-         ([(id) out-contract] [(id [arg in-contract]) void? #:value value.value])
-         desc ...)]))
-(define-syntax (defboolparam stx)
-  (syntax-parse stx
-    [(_ lt:link-target?-kw id arg value:value-kw desc ...)
-     #'(defproc* #:kind "parameter" #:link-target? lt.expr
-         ([(id) boolean?] [(id [arg any/c]) void? #:value value.value])
-         desc ...)]))
-
-;; ----------------------------------------
-
-(begin-for-syntax
-  (define-splicing-syntax-class mutable-kw
-    #:description "#:mutable keyword"
-    (pattern (~seq #:mutable)
-             #:with immutable? #'#f)
-    (pattern (~seq)
-             #:with immutable? #'#t))
-  
-  (define-splicing-syntax-class opacity-kw
-    #:description "#:prefab, #:transparent, or #:inspector keyword"
-    (pattern (~seq #:prefab)
-             #:with opacity #''prefab)
-    (pattern (~seq #:transparent)
-             #:with opacity #''transparent)
-    (pattern (~seq #:inspector #f)
-             #:with opacity #''transparent)
-    (pattern (~seq)
-             #:with opacity #''opaque))
-  
-  (define-splicing-syntax-class constructor-kw
-    #:description "#:constructor-name, #:extra-constructor-name, or #:omit-constructor keyword"
-    (pattern (~seq #:constructor-name id)
-             #:with omit? #'#f
-             #:with given? #'#t
-             #:with extra? #'#f)
-    (pattern (~seq #:extra-constructor-name id)
-             #:with omit? #'#f
-             #:with given? #'#t
-             #:with extra? #'#t)
-    (pattern (~seq #:omit-constructor)
-             #:with omit? #'#t
-             #:with id #'#f
-             #:with given? #'#f
-             #:with extra? #'#f)
-    (pattern (~seq)
-             #:with omit? #'#f
-             #:with id #'#f
-             #:with given? #'#f
-             #:with extra? #'#f)))
-
-(define-syntax-rule (define-defstruct defstruct default-extra?)
-  (...
-   (define-syntax (defstruct stx)
-     (syntax-parse stx
-       [(_ lt:link-target?-kw name fields 
-           m:mutable-kw o:opacity-kw c:constructor-kw 
-           desc ...)
-        #`(**defstruct lt.expr name fields 
-                       m.immutable? o.opacity
-                       c.id c.given? c.extra? default-extra? c.omit?
-                       desc ...)]))))
-
-(define-defstruct defstruct #t)
-(define-defstruct defstruct* #f)
-
-(define-syntax-rule (**defstruct link? name ([field field-contract] ...) 
-                                 immutable? opacity 
-                                 cname cname-given? extra-cname? default-extra? omit-constructor?
-                                 desc ...)
-  (with-togetherable-racket-variables
-   ()
-   ()
-   (*defstruct link? (quote-syntax/loc name) 'name 
-               (quote-syntax/loc cname) cname-given? extra-cname? default-extra? omit-constructor?
-               '([field field-contract] ...)
-               (list (lambda () (racketblock0 field-contract)) ...)
-               immutable? opacity
-               (lambda () (list desc ...)))))
-
-(define (*defstruct link? stx-id name 
-                    alt-cname-id cname-given? extra-cname? default-extra? omit-constructor?
-                    fields field-contracts 
-                    immutable? opacity
-                    content-thunk)
-  (define transparent? (or (eq? opacity 'transparent)
-                           (eq? opacity 'prefab)))
-  (define prefab? (eq? opacity 'prefab))
-  (define max-proto-width (current-display-width))
-  (define (field-name f) ((if (pair? (car f)) caar car) f))
-  (define (field-view f)
-    (if (pair? (car f)) (make-shaped-parens (car f) #\[) (car f)))
-  (define cname-id
-    (cond
-     [omit-constructor? #f]
-     [(identifier? alt-cname-id) alt-cname-id]
-     [(not default-extra?) #f]
-     [else (let ([name-id (if (identifier? stx-id)
-                              stx-id
-                              (car (syntax-e stx-id)))])
-             (datum->syntax name-id
-                            (string->symbol (format "make-~a" (syntax-e name-id)))
-                            name-id
-                            name-id))]))
-  (define keyword-modifiers? (or (not immutable?)
-                                 transparent?
-                                 cname-id))
-  (define keyword-spacer (hspace 4)) ; 2 would match DrRacket indentation, but 4 looks better with field contracts after
-  (define main-table
-    (make-table
-     boxed-style
-     (append
-      ;; First line in "boxed" table is struct name and fields:
-      (list
-       (list
-        ((add-background-label "struct")
-         (list
-          (let* ([the-name
-                  (let ([just-name
-                         (let ([name-id (if (pair? name)
-                                            (make-just-context (car name)
-                                                               (car (syntax-e stx-id)))
-                                            stx-id)])
-                           (if link?
-                               (let ()
-                                 (define (gen defn?)
-                                   ((if defn? annote-exporting-library values)
-                                    (to-element #:defn? defn? name-id)))
-                                 (define content (gen #t))
-                                 (define ref-content (gen #f))
-                                 (make-target-element*
-                                  (lambda (s c t)
-                                    (make-toc-target2-element s c t ref-content))
-                                  (if (pair? name)
-                                      (car (syntax-e stx-id))
-                                      stx-id)
-                                  content
-                                  (let ([name (if (pair? name) (car name) name)])
-                                    (list* (list 'info name)
-                                           (list 'type 'struct: name)
-                                           (list 'predicate name '?)
-                                           (append
-                                            (if cname-id
-                                                (list (list 'constructor (syntax-e cname-id)))
-                                                null)
-                                            (map (lambda (f)
-                                                   (list 'accessor name '-
-                                                         (field-name f)))
-                                                 fields)
-                                            (filter-map
-                                             (lambda (f)
-                                               (if (or (not immutable?)
-                                                       (and (pair? (car f))
-                                                            (memq '#:mutable
-                                                                  (car f))))
-                                                   (list 'mutator 'set- name '-
-                                                         (field-name f) '!)
-                                                   #f))
-                                             fields))))))
-                               (to-element #:defn? #t name-id)))])
-                    (if (pair? name)
-                        (make-element
-                         #f
-                         (list just-name
-                               (hspace 1)
-                               (to-element
-                                (make-just-context
-                                 (cadr name)
-                                 (cadr (syntax-e stx-id))))))
-                        just-name))]
-                 [sym-length (lambda (s)
-                               (string-length (symbol->string s)))]
-                 [short-width
-                  (apply +
-                         (length fields) ; spaces between field names
-                         8 ; "struct" + "(" + ")"
-                         (append
-                          (map sym-length
-                               (append (if (pair? name) name (list name))
-                                       (map field-name fields)))
-                          (map (lambda (f)
-                                 (if (pair? (car f))
-                                     (+ 3 2 (string-length (keyword->string
-                                                            (cadar f))))
-                                     0))
-                               fields)))])
-            (if (and (short-width . < . max-proto-width)
-                     (not keyword-modifiers?))
-                ;; All on one line:
-                (make-omitable-paragraph
-                 (list
-                  (to-element
-                   `(,(racket struct)
-                     ,the-name
-                     ,(map field-view fields)))))
-                ;; Multi-line view (leaving out last paren if keywords follow):
-                (let* ([one-right-column?
-                        ;; Does the struct name and fields fit on a single line?
-                        (or (null? fields)
-                            (short-width . < . max-proto-width))]
-                       [split-field-line?
-                        ;; start fields on the line after "struct"?
-                        (max-proto-width . < . (+ 8
-                                                  (if (pair? name)
-                                                      (+ (sym-length (car name))
-                                                         1
-                                                         (sym-length (cadr name)))
-                                                      (sym-length name))
-                                                  1
-                                                  (if (pair? fields)
-                                                      (sym-length (field-name (car fields)))
-                                                      0)
-                                                  1))])
-                  (make-table
-                   #f
-                   ;; First four columns: "(struct" <space> <name><space> (
-                   ;;   If all fields on the first line, extra columns follow;
-                   ;;   If only first field on same line, filds are in fourth column
-                   ;;   If no field is on the first line, no fourth column after all
-                   ;;    and fields are in the second column
-                   (append
-                    (list
-                     (append
-                      (list (to-flow (make-element #f 
-                                                   (list
-                                                    (racketparenfont "(")
-                                                    (racket struct))))
-                            flow-spacer)
-                      (if one-right-column?
-                          ;; struct name and fields on one line:
-                          (list (to-flow (list the-name
-                                               spacer
-                                               (to-element (map field-view
-                                                                fields))
-                                               (if (and immutable?
-                                                        (not transparent?)
-                                                        (not cname-id))
-                                                   (racketparenfont ")")
-                                                   null))))
-                          (if split-field-line?
-                              ;; Field start on line after "struct":
-                              (list (to-flow (make-element 'no-break the-name)))
-                              ;; First field on the same line as "struct":
-                              (list (to-flow (make-element 'no-break the-name))
-                                    (to-flow (make-element
-                                              #f (list spacer (racketparenfont "("))))
-                                    (to-flow (make-element 'no-break
-                                                           (let ([f (to-element (field-view (car fields)))])
-                                                             (if (null? (cdr fields))
-                                                                 (list f (racketparenfont ")"))
-                                                                 f)))))))))
-                    (if split-field-line?
-                        ;; First field, which starts on the next line:
-                        (list
-                         (list flow-spacer flow-spacer
-                               (to-flow (list
-                                         (racketparenfont "(")
-                                         (make-element 'no-break 
-                                                       (let ([f (to-element (field-view (car fields)))])
-                                                         (if (null? (cdr fields))
-                                                             (list f (racketparenfont ")"))
-                                                             f)))))))
-                        null)
-                    ;; Remaining fields:
-                    (if one-right-column?
-                        null
-                        (let loop ([fields (if (null? fields)
-                                               fields
-                                               (cdr fields))])
-                          (if (null? fields)
-                              null
-                              (cons
-                               (let ([fld (car fields)])
-                                 (append
-                                  (list flow-spacer flow-spacer)
-                                  (if split-field-line? null (list flow-spacer flow-spacer))
-                                  (list (to-flow
-                                         (list
-                                          (if split-field-line? spacer null)
-                                          (let ([e (to-element (field-view fld))])
-                                            (if (null? (cdr fields))
-                                                (list e
-                                                      (racketparenfont
-                                                       (if (and immutable?
-                                                                (not transparent?)
-                                                                (not cname-id))
-                                                           "))" 
-                                                           ")")))
-                                                e)))))))
-                               (loop (cdr fields)))))))))))))))
-      ;; Next lines at "boxed" level are construct-name keywords:
-      (if cname-id
-          (let ([kw (to-element (if (if cname-given?
-                                        extra-cname?
-                                        default-extra?)
-                                    '#:extra-constructor-name
-                                    '#:constructor-name))]
-                [nm (to-element cname-id)]
-                [close? (and immutable?
-                             (not transparent?))])
-            (if (max-proto-width . < . (+ (element-width keyword-spacer)
-                                          1 ; space between kw & name
-                                          (element-width kw) 
-                                          (element-width nm)
-                                          (if close? 1 0)))
-                ;; use two lines for #:constructor-name
-                (list (list (to-flow (list keyword-spacer kw)))
-                      (list (to-flow
-                             (list
-                              keyword-spacer
-                              (if close?
-                                  (make-element #f (list nm (racketparenfont ")")))
-                                  nm)))))
-                ;; use one line for #:constructor-name
-                (list (list 
-                       (to-flow (make-element 
-                                 #f
-                                 (list
-                                  keyword-spacer
-                                  kw (hspace 1) nm
-                                  (if close?
-                                      (racketparenfont ")")
-                                      null))))))))
-          null)
-      ;; Next lines at "boxed" level are prefab/transparent/mutable
-      (cond
-       [(and (not immutable?) transparent?)
-        (list
-         (list (to-flow (list keyword-spacer (to-element '#:mutable))))
-         (list (to-flow (list keyword-spacer
-                              (if prefab?
-                                  (to-element '#:prefab)
-                                  (to-element '#:transparent))
-                              (racketparenfont ")")))))]
-       [(not immutable?)
-        (list
-         (list (to-flow (list keyword-spacer
-                              (to-element '#:mutable)
-                              (racketparenfont ")")))))]
-       [transparent?
-        (list
-         (list (to-flow (list keyword-spacer
-                              (if prefab?
-                                  (to-element '#:prefab)
-                                  (to-element '#:transparent))
-                              (racketparenfont ")")))))]
-       [else null])
-      ;; Remaining lines at "boxed" level are field contracts:
-      (map (lambda (v field-contract)
-             (cond
-              [(pair? v)
-               (list
-                (make-table-if-necessary
-                 "argcontract"
-                 (list (list (to-flow (hspace 2))
-                             (to-flow (to-element (field-name v)))
-                             flow-spacer
-                             (to-flow ":")
-                             flow-spacer
-                             (make-flow (list (field-contract)))))))]
-              [else null]))
-           fields field-contracts))))
-  (make-box-splice
-   (cons
-    (make-blockquote
-     vertical-inset-style
-     (list main-table))
-    (content-thunk))))
-
-;; ----------------------------------------
-
-(define-syntax (defthing stx)
-  (syntax-parse stx
-    [(_ kind:kind-kw 
-        lt:link-target?-kw 
-        (~optional (~seq #:id id-expr)
-                   #:defaults ([id-expr #'#f]))
-        id 
-        result 
-        value:value-kw
-        desc ...)
-     #'(with-togetherable-racket-variables
-        ()
-        ()
-        (*defthing kind.kind
-                   lt.expr
-                   (list (or id-expr (quote-syntax/loc id))) (list 'id) #f
-                   (list (racketblock0 result))
-                   (lambda () (list desc ...))
-                   (list (result-value value.value))))]))
-
-(define-syntax (defthing* stx)
-  (syntax-parse stx
-    [(_ kind:kind-kw lt:link-target?-kw ([id result value:value-kw] ...) desc ...)
-     #'(with-togetherable-racket-variables
-        ()
-        ()
-        (*defthing kind.kind
-                   lt.expr
-                   (list (quote-syntax/loc id) ...) (list 'id ...) #f
-                   (list (racketblock0 result) ...)
-                   (lambda () (list desc ...))
-                   (list (result-value value.value) ...)))]))
-
-(define (*defthing kind link? stx-ids names form? result-contracts content-thunk
-                   [result-values (map (lambda (x) #f) result-contracts)])
-  (define max-proto-width (current-display-width))
-  (make-box-splice
-   (cons
-    (make-blockquote
-     vertical-inset-style
-     (list
-      (make-table
-       boxed-style
-       (append*
-        (for/list ([stx-id (in-list stx-ids)]
-                   [name (in-list names)]
-                   [result-contract (in-list result-contracts)]
-                   [result-value (in-list result-values)]
-                   [i (in-naturals)])
-          (let* ([result-block
-                  (and result-value
-                       (if (block? result-value)
-                           result-value
-                           (make-omitable-paragraph (list result-value))))]
-                 [contract-block
-                  (if (block? result-contract)
-                      result-contract
-                      (make-omitable-paragraph (list result-contract)))]
-                 [name+contract-width (+ (string-length (format "~a" name))
-                                         3
-                                         (block-width contract-block))]
-                 [total-width (+ name+contract-width
-                                 (if result-block
-                                     (+ (block-width result-block) 3)
-                                     0))]
-                 [thing-id (let ([target-maker
-                                  (and link?
-                                       ((if form? id-to-form-target-maker id-to-target-maker)
-                                        stx-id #t))])
-                             (define-values (content ref-content) 
-                               (if link?
-                                   (definition-site name stx-id form?)
-                                   (let ([s (make-just-context name stx-id)])
-                                     (values (to-element #:defn? #t s)
-                                             (to-element s)))))
-                             (if target-maker
-                                 (target-maker
-                                  content
-                                  (lambda (tag)
-                                    (make-toc-target2-element
-                                     #f
-                                     (make-index-element
-                                      #f
-                                      content
-                                      tag
-                                      (list (datum-intern-literal (symbol->string name)))
-                                      (list ref-content)
-                                      (with-exporting-libraries
-                                       (lambda (libs) (make-thing-index-desc name libs))))
-                                     tag
-                                     ref-content)))
-                                 content))]
-                 [contract-on-first-line? (name+contract-width . < . max-proto-width)]
-                 [single-line? (and contract-on-first-line?
-                                    (total-width . < . max-proto-width)
-                                    (not (table? result-value)))])
-            (append
-             (list
-              (list
-               ((if (zero? i) (add-background-label (or kind "value")) values)
-                (make-table-if-necessary
-                 "argcontract"
-                 (append
-                  (list
-                   (append
-                    (list (list (make-omitable-paragraph
-                                 (list thing-id))))
-                    (if contract-on-first-line?
-                        (list
-                         (to-flow (list spacer ":" spacer))
-                         (list contract-block))
-                        null)
-                    (if (and result-block single-line?)
-                        (list
-                         (to-flow (list spacer "=" spacer))
-                         (list result-block))
-                        null))))))))
-             (if contract-on-first-line?
-                 null
-                 (list (list (make-table-if-necessary
-                              "argcontract"
-                              (list 
-                               (list (to-flow (list spacer ":" spacer))
-                                     (list contract-block)))))))
-             (if (or single-line? (not result-block))
-                 null
-                 (list (list (make-table-if-necessary
-                              "argcontract"
-                              (list (list
-                                     (to-flow (list spacer "=" spacer))
-                                     (list result-block))))))))))))))
-     (content-thunk))))
-
-(define (defthing/proc kind id contract descs)
-  (*defthing kind #t (list id) (list (syntax-e id)) #f (list contract)
-             (lambda () descs)))
-
-(define (make-target-element* inner-make-target-element stx-id content wrappers)
-  (if (null? wrappers)
-    content
-    (make-target-element*
-     make-target-element
-     stx-id
-     (let* ([name (datum-intern-literal (string-append* (map symbol->string (cdar wrappers))))]
-            [target-maker
-             (id-to-target-maker (datum->syntax stx-id (string->symbol name))
-                                 #t)])
-       (if target-maker
-         (target-maker
-          content
-          (lambda (tag)
-            (inner-make-target-element
-             #f
-             (make-index-element
-              #f
-              content
-              tag
-              (list name)
-              (list (racketidfont (make-element value-link-color
-                                                (list name))))
-              (with-exporting-libraries
-               (lambda (libs)
-                 (let ([name (string->symbol name)])
-                   (if (eq? 'info (caar wrappers))
-                       (make-struct-index-desc name libs)
-                       (make-procedure-index-desc name libs))))))
-             tag)))
-         content))
-     (cdr wrappers))))
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-scheme.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-scheme.rkt
deleted file mode 100644
index 26c70f3440..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-scheme.rkt
+++ /dev/null
@@ -1,266 +0,0 @@
-#lang racket/base
-(require "../decode.rkt"
-         "../struct.rkt"
-         "../scheme.rkt"
-         "../search.rkt"
-         "../basic.rkt"
-         (only-in "../core.rkt" style style-properties)
-         "manual-style.rkt"
-         "manual-utils.rkt" ;; used via datum->syntax
-         "on-demand.rkt"
-         (for-syntax racket/base)
-         (for-label racket/base))
-
-(provide racketblock RACKETBLOCK racketblock/form
-         racketblock0 RACKETBLOCK0 racketblock0/form
-         racketresultblock racketresultblock0
-         RACKETRESULTBLOCK RACKETRESULTBLOCK0
-         racketblockelem
-         racketinput RACKETINPUT
-         racketinput0 RACKETINPUT0
-         racketmod
-         racketmod0
-         racket RACKET racket/form racketresult racketid 
-         racketmodname
-         racketmodlink indexed-racket
-         racketlink
-         
-         (rename-out [racketblock schemeblock]
-                     [RACKETBLOCK SCHEMEBLOCK]
-                     [racketblock/form schemeblock/form]
-                     [racketblock0 schemeblock0]
-                     [RACKETBLOCK0 SCHEMEBLOCK0]
-                     [racketblock0/form schemeblock0/form]
-                     [racketblockelem schemeblockelem]
-                     [racketinput schemeinput]
-                     [racketmod schememod]
-                     [racket scheme]
-                     [RACKET SCHEME]
-                     [racket/form scheme/form]
-                     [racketresult schemeresult]
-                     [racketid schemeid]
-                     [racketmodname schememodname]
-                     [racketmodlink schememodlink]
-                     [indexed-racket indexed-scheme]
-                     [racketlink schemelink]))
-
-(define-code racketblock0 to-paragraph)
-(define-code racketblock to-block-paragraph)
-(define-code RACKETBLOCK to-block-paragraph UNSYNTAX)
-(define-code RACKETBLOCK0 to-paragraph UNSYNTAX)
-
-(define (to-block-paragraph v)
-  (code-inset (to-paragraph v)))
-
-(define (to-result-paragraph v)
-  (to-paragraph v 
-                #:color? #f 
-                #:wrap-elem
-                (lambda (e) (make-element result-color e))))
-(define (to-result-paragraph/prefix a b c)
-  (let ([to-paragraph (to-paragraph/prefix a b c)])
-    (lambda (v)
-      (to-paragraph v 
-                    #:color? #f 
-                    #:wrap-elem
-                    (lambda (e) (make-element result-color e))))))
-
-(define-code racketresultblock0 to-result-paragraph)
-(define-code racketresultblock (to-result-paragraph/prefix (hspace 2) (hspace 2) ""))
-(define-code RACKETRESULTBLOCK (to-result-paragraph/prefix (hspace 2) (hspace 2) "")
-  UNSYNTAX)
-(define-code RACKETRESULTBLOCK0 to-result-paragraph UNSYNTAX)
-
-(define interaction-prompt (make-element 'tt (list "> " )))
-(define-code racketinput to-input-paragraph/inset)
-(define-code RACKETINPUT to-input-paragraph/inset)
-(define-code racketinput0 to-input-paragraph)
-(define-code RACKETINPUT0 to-input-paragraph)
-
-(define to-input-paragraph
-  (to-paragraph/prefix
-   (make-element #f interaction-prompt)
-   (hspace 2)
-   ""))
-  
-(define to-input-paragraph/inset
-  (lambda (v)
-    (code-inset (to-input-paragraph v))))
-
-(define-syntax (racketmod0 stx)
-  (syntax-case stx ()
-    [(_ #:file filename #:escape unsyntax-id lang rest ...)
-     (with-syntax ([modtag (datum->syntax
-                            #'here
-                            `(unsyntax (make-element
-                                        #f
-                                        (list (hash-lang)
-                                              spacer
-                                              ,(if (identifier? #'lang)
-                                                   `(as-modname-link
-                                                     ',#'lang
-                                                     (to-element ',#'lang)
-                                                     #f)
-                                                   #'(racket lang)))))
-                            #'lang)])
-       (if (syntax-e #'filename)
-           (quasisyntax/loc stx
-             (filebox
-              filename
-              #,(syntax/loc stx (racketblock0 #:escape unsyntax-id modtag rest ...))))
-           (syntax/loc stx (racketblock0 #:escape unsyntax-id modtag rest ...))))]
-    [(_ #:file filename lang rest ...)
-     (syntax/loc stx (racketmod0 #:file filename #:escape unsyntax lang rest ...))]
-    [(_ lang rest ...)
-     (syntax/loc stx (racketmod0 #:file #f lang rest ...))]))
-
-(define-syntax-rule (racketmod rest ...)
-  (code-inset (racketmod0 rest ...)))
-
-(define (to-element/result s)
-  (make-element result-color (list (to-element/no-color s))))
-(define (to-element/id s)
-  (make-element symbol-color (list (to-element/no-color s))))
-
-(define-syntax (keep-s-expr stx)
-  (syntax-case stx (quote)
-    [(_ ctx '#t #(src line col pos 5))
-     #'(make-long-boolean #t)]
-    [(_ ctx '#f #(src line col pos 6))
-     #'(make-long-boolean #f)]
-    [(_ ctx s srcloc)
-     (let ([sv (syntax-e
-                (syntax-case #'s (quote)
-                  [(quote s) #'s]
-                  [_ #'s]))])
-       (if (or (number? sv)
-               (boolean? sv)
-               (and (pair? sv)
-                    (identifier? (car sv))
-                    (or (free-identifier=? #'cons (car sv))
-                        (free-identifier=? #'list (car sv)))))
-           ;; We know that the context is irrelvant
-           #'s
-           ;; Context may be relevant:
-           #'(*keep-s-expr s ctx)))]))
-(define (*keep-s-expr s ctx)
-  (if (symbol? s)
-    (make-just-context s ctx)
-    s))
-
-(define (add-sq-prop s name val)
-  (if (eq? name 'paren-shape)
-    (make-shaped-parens s val)
-    s))
-
-(define-code racketblockelem to-element)
-
-(define-code racket to-element unsyntax keep-s-expr add-sq-prop)
-(define-code RACKET to-element UNSYNTAX keep-s-expr add-sq-prop)
-(define-code racketresult to-element/result unsyntax keep-s-expr add-sq-prop)
-(define-code racketid to-element/id unsyntax keep-s-expr add-sq-prop)
-(define-code *racketmodname to-element unsyntax keep-s-expr add-sq-prop)
-
-(define-syntax (**racketmodname stx)
-  (syntax-case stx ()
-    [(_ form)
-     (let ([stx #'form])
-       #`(*racketmodname
-          ;; We want to remove lexical context from identifiers
-          ;; that correspond to module names, but keep context
-          ;; for `lib' or `planet' (which are rarely used)
-          #,(if (identifier? stx)
-                (datum->syntax #f (syntax-e stx) stx stx)
-                (if (and (pair? (syntax-e stx))
-                         (memq (syntax-e (car (syntax-e stx))) '(lib planet file)))
-                    (let ([s (car (syntax-e stx))]
-                          [rest (let loop ([a (cdr (syntax-e stx))] [head? #f])
-                                  (cond
-                                   [(identifier? a) (datum->syntax #f (syntax-e a) a a)]
-                                   [(and head? (pair? a) (and (identifier? (car a))
-                                                              (free-identifier=? #'unsyntax (car a))))
-                                    a]
-                                   [(pair? a) (cons (loop (car a) #t) 
-                                                    (loop (cdr a) #f))]
-                                   [(syntax? a) (datum->syntax a
-                                                               (loop (syntax-e a) head?)
-                                                               a 
-                                                               a)]
-                                   [else a]))])
-                      (datum->syntax stx (cons s rest) stx stx))
-                    stx))))]))
-
-(define-syntax racketmodname
-  (syntax-rules (unsyntax)
-    [(racketmodname #,n)
-     (let ([sym n])
-       (as-modname-link sym (to-element sym) #f))]
-    [(racketmodname n)
-     (as-modname-link 'n (**racketmodname n) #f)]
-    [(racketmodname #,n #:indirect)
-     (let ([sym n])
-       (as-modname-link sym (to-element sym) #t))]
-    [(racketmodname n #:indirect)
-     (as-modname-link 'n (**racketmodname n) #t)]))
-
-(define-syntax racketmodlink
-  (syntax-rules (unsyntax)
-    [(racketmodlink n content ...)
-     (*as-modname-link 'n (elem #:style #f content ...) #f)]))
-
-(define (as-modname-link s e indirect?)
-  (if (symbol? s)
-      (*as-modname-link s e indirect?)
-      e))
-
-(define-on-demand indirect-module-link-color
-  (struct-copy style module-link-color
-               [properties (cons 'indirect-link
-                                 (style-properties module-link-color))]))
-
-(define (*as-modname-link s e indirect?)
-  (make-link-element (if indirect?
-                         indirect-module-link-color
-                         module-link-color)
-                     (list e)
-                     `(mod-path ,(datum-intern-literal (format "~s" s)))))
-
-(define-syntax-rule (indexed-racket x)
-  (add-racket-index 'x (racket x)))
-
-(define (add-racket-index s e)
-  (let ([k (cond [(and (pair? s) (eq? (car s) 'quote)) (format "~s" (cadr s))]
-                 [(string? s) s]
-                 [else (format "~s" s)])])
-    (index* (list k) (list e) e)))
-
-(define-syntax-rule (define-/form id base)
-  (define-syntax (id stx)
-    (syntax-case stx ()
-      [(_ a)
-       (with-syntax ([ellipses (datum->syntax #'a '(... ...))])
-         #'(let ([ellipses #f])
-             (base a)))])))
-
-(define-/form racketblock0/form racketblock0)
-(define-/form racketblock/form racketblock)
-(define-/form racket/form racket)
-
-(define (*racketlink stx-id id style . s)
-  (let ([content (decode-content s)])
-    (make-delayed-element
-     (lambda (r p ri)
-       (make-link-element
-        style
-        content
-        (or (find-racket-tag p ri stx-id #f)
-            `(undef ,(format "--UNDEFINED:~a--" (syntax-e stx-id))))))
-     (lambda () content)
-     (lambda () content))))
-
-(define-syntax racketlink
-  (syntax-rules ()
-    [(_ id #:style style . content)
-     (*racketlink (quote-syntax id) 'id style . content)]
-    [(_ id . content)
-     (*racketlink (quote-syntax id) 'id #f . content)]))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-sprop.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-sprop.rkt
deleted file mode 100644
index 29bde67ed8..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-sprop.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scheme/base
-(require "../html-properties.rkt"
-         "../latex-properties.rkt"
-         "on-demand.rkt"
-         setup/collects)
-
-(provide scheme-properties)
-
-(define-on-demand scheme-properties
-  (let ([abs (lambda (s)
-               (path->collects-relative (collection-file-path s "scribble")))])
-    (list (make-css-addition (abs "racket.css"))
-          (make-tex-addition (abs "racket.tex")))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-style.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-style.rkt
deleted file mode 100644
index 15f756a095..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-style.rkt
+++ /dev/null
@@ -1,256 +0,0 @@
-#lang racket/base
-(require "../decode.rkt"
-         "../struct.rkt"
-         "../base.rkt"
-         (only-in "../basic.rkt" aux-elem itemize)
-         "../scheme.rkt"
-         (only-in "../core.rkt" make-style plain
-                  make-nested-flow nested-flow? box-mode box-mode*
-                  [element? core:element?])
-         "manual-utils.rkt"
-         "on-demand.rkt"
-         "manual-sprop.rkt"
-         racket/list
-         racket/contract/base
-         racket/string)
-
-(provide (rename-out [hyperlink link])
-         (rename-out [other-doc other-manual])
-         (rename-out [centered centerline])
-         image
-         (rename-out [image image/plain])
-         itemize
-         aux-elem
-         code-inset)
-(provide/contract [filebox (((or/c core:element? string?)) () #:rest (listof pre-flow?) . ->* . block?)])
-
-(define styling-f/c
-  (() () #:rest (listof pre-content?) . ->* . element?))
-(define-syntax-rule (provide-styling id ...)
-  (provide/contract [id styling-f/c] ...))
-(provide-styling racketmodfont racketoutput
-                 racketerror racketfont racketplainfont racketvalfont racketidfont racketvarfont
-                 racketcommentfont racketparenfont racketkeywordfont racketmetafont
-                 onscreen defterm filepath exec envvar Flag DFlag PFlag DPFlag math
-                 procedure
-                 indexed-file indexed-envvar idefterm pidefterm)
-(provide
- (contract-out [racketresultfont (->* () (#:decode? boolean?) #:rest (listof pre-content?) element?)]))
-(define-syntax-rule (provide-scheme-styling [rid sid] ...)
-  (provide/contract [rename rid sid styling-f/c] ...))
-(provide-scheme-styling [racketmodfont schememodfont]
-                        [racketoutput schemeoutput]
-                        [racketerror schemeerror]
-                        [racketfont schemefont]
-                        [racketvalfont schemevalfont]
-                        [racketresultfont schemeresultfont]
-                        [racketidfont schemeidfont]
-                        [racketvarfont schemevarfont]
-                        [racketparenfont schemeparenfont]
-                        [racketkeywordfont schemekeywordfont]
-                        [racketmetafont schememetafont])
-
-(provide void-const
-         undefined-const)
-(provide/contract
- [PLaneT element?]
- [hash-lang (-> element?)]
- [etc element?]
- [inset-flow (() () #:rest (listof pre-content?) . ->* . nested-flow?)]
- [litchar (() () #:rest (listof string?) . ->* . element?)]
- [t (() () #:rest (listof pre-content?) . ->* . paragraph?)]
- [commandline (() () #:rest (listof pre-content?) . ->* . paragraph?)]
- [menuitem (string? string? . -> . element?)])
-
-(define PLaneT (make-element "planetName" '("PLaneT")))
-
-(define etc (make-element #f (list "etc" ._)))
-
-(define (litchar . strs)
-  (let ([s (string-append* (map (lambda (s) (regexp-replace* "\n" s " "))
-                                strs))])
-    (if (regexp-match? #rx"^ *$" s)
-      (make-element input-background-color (list (hspace (string-length s))))
-      (let ([^spaces (car (regexp-match-positions #rx"^ *" s))]
-            [$spaces (car (regexp-match-positions #rx" *$" s))])
-        (make-element
-         input-background-color
-         (list (hspace (cdr ^spaces))
-               (make-element input-color
-                             (list (substring s (cdr ^spaces) (car $spaces))))
-               (hspace (- (cdr $spaces) (car $spaces)))))))))
-
-(define (onscreen . str)
-  (make-element 'sf (decode-content str)))
-(define (menuitem menu item)
-  (make-element 'sf (list menu "|" item)))
-(define (defterm . str)
-  (make-element 'italic (decode-content str)))
-(define (idefterm . str)
-  (let ([c (decode-content str)])
-    (make-element 'italic c)))
-(define (racketfont . str)
-  (apply tt str))
-(define (racketplainfont . str)
-  (make-element 'tt (decode-content str)))
-(define (racketvalfont . str)
-  (make-element value-color (decode-content str)))
-(define (racketresultfont #:decode? [decode? #t] . str)
-  (make-element result-color (if decode? (decode-content str) str)))
-(define (racketidfont . str)
-  (make-element symbol-color (decode-content str)))
-(define (racketvarfont . str)
-  (make-element variable-color (decode-content str)))
-(define (racketparenfont . str)
-  (make-element paren-color (decode-content str)))
-(define (racketmetafont . str)
-  (make-element meta-color (decode-content str)))
-(define (racketcommentfont . str)
-  (make-element comment-color (decode-content str)))
-(define (racketmodfont . str)
-  (make-element module-color (decode-content str)))
-(define (racketkeywordfont . str)
-  (make-element keyword-color (decode-content str)))
-(define (filepath . str)
-  (make-element 'tt (append (list "\"") (decode-content str) (list "\""))))
-(define (indexed-file . str)
-  (let* ([f (apply filepath str)]
-         [s (element->string f)])
-    (index* (list (datum-intern-literal
-                   (clean-up-index-string
-                    (substring s 1 (sub1 (string-length s))))))
-            (list f)
-            f)))
-(define (exec . str)
-  (if (andmap string? str)
-    (make-element 'tt str)
-    (make-element #f (map (lambda (s)
-                            (if (string? s)
-                              (make-element 'tt (list s))
-                              s))
-                          str))))
-(define (Flag . str)
-  (make-element 'no-break
-                (list (make-element 'tt (cons "-" (decode-content str))))))
-(define (DFlag . str)
-  (make-element 'no-break
-                (list (make-element 'tt (cons "--" (decode-content str))))))
-(define (PFlag . str)
-  (make-element 'no-break
-                (list (make-element 'tt (cons "+" (decode-content str))))))
-(define (DPFlag . str)
-  (make-element 'no-break
-                (list (make-element 'tt (cons "++" (decode-content str))))))
-(define (envvar . str)
-  (make-element 'tt (decode-content str)))
-(define (indexed-envvar . str)
-  (let* ([f (apply envvar str)]
-         [s (element->string f)])
-    (index* (list s) (list f) f)))
-(define (procedure . str)
-  (make-element result-color `("#<procedure:" ,@(decode-content str) ">")))
-
-(define (racketoutput . str)
-  (make-element output-color (decode-content str)))
-(define (racketerror . str)
-  (make-element error-color (decode-content str)))
-
-(define (t . str)
-  (decode-paragraph str))
-
-(define (inset-flow . c)
-  (make-blockquote "insetpara" (flow-paragraphs (decode-flow c))))
-
-(define code-inset-style 
-  (make-style 'code-inset null))
-(define (code-inset b)
-  (make-blockquote code-inset-style (list b)))
-
-(define (commandline . s)
-  (make-paragraph (cons (hspace 2) (map (lambda (s)
-                                          (if (string? s)
-                                            (make-element 'tt (list s))
-                                            s))
-                                        s))))
-
-(define (pidefterm . s)
-  (let ([c (apply defterm s)])
-    (index (string-append (content->string (element-content c)) "s")
-           c)))
-
-(define (hash-lang)
-  (make-link-element
-   module-link-color
-   (list (racketmodfont "#lang"))
-   `(part ,(doc-prefix '(lib "scribblings/guide/guide.scrbl") "hash-lang"))))
-
-(define (make-v+u-link p)
-  (make-link-element
-   module-link-color
-   p
-   `(part ,(doc-prefix '(lib "scribblings/guide/guide.scrbl") "void+undefined"))))
-
-(define-on-demand void-const
-  (make-v+u-link
-   (nonbreaking (racketresultfont "#<void>"))))
-(define-on-demand undefined-const
-  (make-v+u-link
-   (nonbreaking (racketresultfont "#<undefined>"))))
-
-(define (link url 
-              #:underline? [underline? #t]
-              #:style [style (if underline? #f "plainlink")]
-              . str)
-  (apply hyperlink url #:style (if style (make-style style null) plain) str))
-
-(define (math . s)
-  (let ([c (decode-content s)])
-    (make-element
-     #f
-     (append-map
-      (lambda (i)
-        (let loop ([i i])
-          (cond
-            [(string? i)
-             (cond
-               [(regexp-match #px"^(.*)_([a-zA-Z0-9]+)(.*)$" i)
-                => (lambda (m)
-                     (append (loop (cadr m))
-                             (list (make-element 'subscript
-                                                 (loop (caddr m))))
-                             (loop (cadddr m))))]
-               [(regexp-match #px"^(.*)\\^([a-zA-Z0-9]+)(.*)$" i)
-                => (lambda (m)
-                     (append (loop (cadr m))
-                             (list (make-element 'superscript
-                                                 (loop (caddr m))))
-                             (loop (cadddr m))))]
-               [(regexp-match #px"^(.*)([()0-9{}\\[\\]\u03C0])(.*)$" i)
-                => (lambda (m)
-                     (append (loop (cadr m))
-                             (list (caddr m))
-                             (loop (cadddr m))))]
-               [else
-                (list (make-element 'italic (list i)))])]
-            [(eq? i 'rsquo) (list 'prime)]
-            [else (list i)])))
-      c))))
-
-(define (filebox filename . inside)
-  (make-nested-flow 
-   (make-style "Rfilebox" (list* 'multicommand
-                                 (box-mode "RfileboxBoxT" "RfileboxBoxC" "RfileboxBoxB") 
-                                 scheme-properties))
-   (list
-    (make-styled-paragraph 
-     (list (make-element
-            (make-style "Rfilename" scheme-properties)
-            (if (string? filename)
-                (filepath filename)
-                filename)))
-     (make-style "Rfiletitle" (cons (box-mode* "RfiletitleBox") scheme-properties)))
-    (make-nested-flow 
-     (make-style "Rfilecontent" (cons (box-mode* "RfilecontentBox") scheme-properties))
-     (decode-flow inside)))))
-
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-tech.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-tech.rkt
deleted file mode 100644
index 3779a824b3..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-tech.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang scheme/base
-(require racket/contract/base
-         "../decode.rkt"
-         "../struct.rkt"
-         "manual-utils.rkt"
-         "manual-style.rkt")
-
-(provide/contract
- [deftech (() (#:normalize? any/c
-               #:style? any/c
-               #:key (or/c string? #f))
-           #:rest (listof pre-content?) . ->* . element?)]
- [tech (() 
-        (#:doc (or/c module-path? false/c) 
-         #:tag-prefixes (or/c (listof string?) false/c) 
-         #:key (or/c string? #f)
-         #:normalize? any/c)
-        #:rest (listof pre-content?) 
-        . ->* . element?)]
- [techlink (() 
-            (#:doc (or/c module-path? false/c) 
-             #:tag-prefixes (or/c (listof string?) false/c) 
-             #:key (or/c string? #f)
-             #:normalize? any/c)
-            #:rest (listof pre-content?) 
-            . ->* . element?)])
-
-(define (*tech make-elem style doc prefix s key normalize?)
-  (let* ([c (decode-content s)]
-         [s (or key (content->string c))]
-         [s (if normalize?
-                (let* ([s (string-foldcase s)]
-                       [s (regexp-replace #rx"ies$" s "y")]
-                       [s (regexp-replace #rx"s$" s "")]
-                       [s (regexp-replace* #px"[-\\s]+" s " ")])
-                  s)
-                s)]
-         [s (datum-intern-literal s)])
-    (make-elem style c (list 'tech (doc-prefix doc prefix s)))))
-
-(define (deftech #:style? [style? #t] 
-          #:normalize? [normalize? #t] 
-          #:key [key #f]
-          . s)
-  (let* ([e (if style?
-                (apply defterm s)
-                (make-element #f (decode-content s)))]
-         [t (*tech make-target-element #f #f #f (list e) key normalize?)])
-    (make-index-element #f
-                        (list t)
-                        (target-element-tag t)
-                        (list (datum-intern-literal
-                               (clean-up-index-string (element->string e))))
-                        (list e)
-                        'tech)))
-
-(define (tech #:doc [doc #f] 
-              #:tag-prefixes [prefix #f] 
-              #:key [key #f] 
-              #:normalize? [normalize? #t] 
-              . s)
-  (*tech (lambda (style c tag)
-           (make-link-element
-            style
-            (list (make-element "techinside" c))
-            tag))
-         "techoutside"
-         doc prefix s key
-         normalize?))
-
-(define (techlink #:doc [doc #f] 
-                  #:tag-prefixes [prefix #f] 
-                  #:key [key #f] 
-                  #:normalize? [normalize? #t] 
-                  . s)
-  (*tech make-link-element #f doc prefix s key normalize?))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-unit.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-unit.rkt
deleted file mode 100644
index 29d889331e..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-unit.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang scheme/base
-(require "../decode.rkt"
-         "../struct.rkt"
-         "manual-vars.rkt"
-         "manual-bind.rkt"
-         "manual-ex.rkt"
-         "manual-proc.rkt"
-         racket/contract/base
-         (for-syntax scheme/base)
-         (for-label scheme/base))
-
-(provide defsignature
-         defsignature/splice
-         sigelem)
-
-(define-syntax-rule (defsignature name (super ...) body ...)
-  (with-togetherable-racket-variables
-   ()
-   ()
-   (*defsignature (quote-syntax name)
-                  (list (quote-syntax super) ...)
-                  (lambda () (list body ...))
-                  #t)))
-
-(define-syntax-rule (defsignature/splice name (super ...) body ...)
-  (with-togetherable-racket-variables
-   ()
-   ()
-   (*defsignature (quote-syntax name)
-                  (list (quote-syntax super) ...)
-                  (lambda () (list body ...))
-                  #f)))
-
-(define-struct sig-desc (in))
-(define (signature-desc . l)
-  (make-sig-desc l))
-
-(provide/contract
- [signature-desc (() () #:rest (listof pre-flow?) . ->* . sig-desc?)])
-
-(define (*defsignature stx-id supers body-thunk indent?)
-  (*defthing
-   "signature"
-   #t
-   (list stx-id)
-   (list (syntax-e stx-id))
-   #t
-   (list (make-element #f '("signature")))
-   (lambda ()
-     (define in
-       (parameterize ([current-signature (make-sig stx-id)]) (body-thunk)))
-     (if indent?
-       (let-values ([(pre-body post-body)
-                     (let loop ([in in][pre-accum null])
-                       (cond [(null? in) (values (reverse pre-accum) null)]
-                             [(whitespace? (car in))
-                              (loop (cdr in) (cons (car in) pre-accum))]
-                             [(sig-desc? (car in))
-                              (loop (cdr in)
-                                    (append (reverse (sig-desc-in (car in)))
-                                            pre-accum))]
-                             [else (values (reverse pre-accum) in)]))])
-         `(,@pre-body
-           ,(make-blockquote
-             "leftindent"
-             (flow-paragraphs (decode-flow post-body)))))
-       in))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-utils.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-utils.rkt
deleted file mode 100644
index 05c476849e..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-utils.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang scheme/base
-(require "../struct.rkt"
-         "../base.rkt"
-         (only-in "../core.rkt"
-                   content?)
-         racket/contract/base
-         scheme/list)
-
-(provide doc-prefix)
-(provide/contract
- [spacer element?]
- [to-flow (content? . -> . flow?)]
- [flow-spacer flow?]
- [flow-spacer/n (-> exact-nonnegative-integer? flow?)]
- [flow-empty-line flow?]
- [make-table-if-necessary (content? list? . -> . (list/c (or/c omitable-paragraph? table?)))]
- [current-display-width (parameter/c exact-nonnegative-integer?)])
-
-(define spacer (hspace 1))
-
-(define (to-flow e)
-  (make-flow (list (make-omitable-paragraph (list e)))))
-(define flow-spacer (to-flow spacer))
-(define (flow-spacer/n n) (to-flow (hspace n)))
-(define flow-empty-line (to-flow (tt 'nbsp)))
-
-(define (make-table-if-necessary style content)
-  (if (= 1 (length content))
-    (let ([paras (append-map flow-paragraphs (car content))])
-      (if (andmap paragraph? paras)
-        (list (make-omitable-paragraph (append-map paragraph-content paras)))
-        (list (make-table style content))))
-    (list (make-table style content))))
-
-(define current-display-width (make-parameter 65))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-vars.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-vars.rkt
deleted file mode 100644
index dd2158d4ef..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-vars.rkt
+++ /dev/null
@@ -1,218 +0,0 @@
-#lang scheme/base
-(require "../decode.rkt"
-         "../scheme.rkt"
-         "../struct.rkt"
-         (only-in "../core.rkt" 
-                  make-style style-name style-properties
-                  nested-flow? nested-flow-blocks nested-flow-style
-                  make-nested-flow)
-         "../html-properties.rkt"
-         racket/contract/base
-         (for-syntax scheme/base
-                     syntax/kerncase
-                     syntax/boundmap)
-         (for-label scheme/base
-                    scheme/class))
-
-(define-struct (box-splice splice) ())
-
-(provide/contract
- [struct (box-splice splice) ([run list?])]) ; XXX ugly copying
-(provide deftogether *deftogether
-         with-racket-variables
-         with-togetherable-racket-variables
-         vertical-inset-style
-         boxed-style
-         add-background-label)
-
-(define vertical-inset-style 
-  (make-style 'vertical-inset null))
-
-(define boxed-style 
-  (make-style 'boxed (list (make-attributes (list (cons 'class "RBoxed"))))))
-
-(define ((add-background-label what) l)
-  (list
-   (make-nested-flow
-    (make-style "RBackgroundLabel" (list 'decorative 'command (alt-tag "div")
-                                         (make-attributes '((class . "SIEHidden")))))
-    (list
-     (make-nested-flow
-      (make-style "RBackgroundLabelInner" (list (alt-tag "div")))
-      (list (make-omitable-paragraph what)))))
-   (let* ([a (car l)]
-          [remake (if (paragraph? a)
-                      (lambda (sa)
-                        (paragraph
-                         (sa (paragraph-style a))
-                         (paragraph-content a)))
-                      (lambda (sa)
-                        (table
-                         (sa (table-style a))
-                         (table-blockss a))))])
-     (remake
-      (lambda (s)
-        (make-style (style-name s)
-                    (let ([p (style-properties s)])
-                      (if (ormap attributes? p)
-                          (for/list ([i (in-list p)])
-                            (if (attributes? i)
-                                (let ([al (attributes-assoc i)])
-                                  (if (assq 'class al)
-                                      (for/list ([a (in-list al)])
-                                        (if (eq? (car a) 'class)
-                                            (cons 'class (string-append (cdr a) " RForeground"))
-                                            a))
-                                      (attributes (cons '(class . "RForeground")
-                                                        al))))
-                                i))
-                          (cons (attributes '((class . "RForeground")))
-                                p)))))))))
-
-(begin-for-syntax (define-struct deftogether-tag () #:omit-define-syntaxes))
-
-(define-syntax (with-togetherable-racket-variables stx)
-  (syntax-case stx ()
-    [(_ lits vars decl)
-     (with-syntax ([vars (syntax-property #'vars 'taint-mode 'none)])
-       (syntax-property
-        #'(with-togetherable-racket-variables* lits vars decl)
-        'taint-mode
-        'transparent))]))
-
-(define-syntax-rule (with-togetherable-racket-variables* . rest)
-  (with-racket-variables . rest))
-
-(define-syntax (with-racket-variables stx)
-  (syntax-case stx ()
-    [(_ lits ([kind s-exp] ...) body)
-     (let ([ht (make-bound-identifier-mapping)]
-           [lits (syntax->datum #'lits)])
-       (for-each (lambda (kind s-exp)
-                   (case (syntax-e kind)
-                     [(proc)
-                      (letrec ([do-proc
-                                (lambda (s-exp)
-                                  (let ([s-exp (syntax->list s-exp)])
-                                    (for-each
-                                     (lambda (arg)
-                                       (if (identifier? arg)
-                                           (unless (or (eq? (syntax-e arg) '...)
-                                                       (eq? (syntax-e arg) '...+)
-                                                       (eq? (syntax-e arg) '_...superclass-args...)
-                                                       (memq (syntax-e arg) lits))
-                                             (bound-identifier-mapping-put! ht arg #t))
-                                           (syntax-case arg ()
-                                             [(kw arg . rest)
-                                              (and (keyword? (syntax-e #'kw))
-                                                   (identifier? #'arg))
-                                              (bound-identifier-mapping-put! ht #'arg #t)]
-                                             [(arg . rest)
-                                              (identifier? #'arg)
-                                              (bound-identifier-mapping-put! ht #'arg #t)]
-                                             [else (void)])))
-                                     (cdr s-exp))
-                                    (unless (identifier? (car s-exp))
-                                      ;; Curried:
-                                      (do-proc (car s-exp)))))])
-                        (do-proc s-exp))]
-                     [(form form/none form/maybe non-term)
-                      (define skip-id (case (syntax-e kind)
-                                         [(form) 
-                                          (syntax-case s-exp ()
-                                            [(defined-id actual-s-exp) (let ([id #'defined-id])
-                                                                         (and (identifier? id)
-                                                                              id))]
-                                            [_ #f])]
-                                         [else #f]))
-                      (let loop ([form (case (syntax-e kind)
-                                         [(form) 
-                                          (syntax-case s-exp ()
-                                            [(defined-id actual-s-exp) #'actual-s-exp])]
-                                         [(form/none) s-exp]
-                                         [(form/maybe)
-                                          (syntax-case s-exp ()
-                                            [(#f form) #'form]
-                                            [(#t (id . form)) #'form])]
-                                         [(non-term) s-exp])])
-                        (if (identifier? form)
-                            (unless (or (and skip-id
-                                             (free-identifier=? skip-id form))
-                                        (eq? (syntax-e form) '...)
-                                        (eq? (syntax-e form) '...+)
-                                        (eq? (syntax-e form) 'code:line)
-                                        (eq? (syntax-e form) 'code:blank)
-                                        (eq? (syntax-e form) 'code:comment)
-                                        (eq? (syntax-e form) '?)
-                                        (memq (syntax-e form) lits))
-                              (bound-identifier-mapping-put! ht form #t))
-                            (syntax-case form (unsyntax)
-                              [(unsyntax _) (void)]
-                              [(a . b) (loop #'a) (loop #'b)]
-                              [#(a ...) (loop #'(a ...))]
-                              [_ (void)])))]
-                     [else
-                      (raise-syntax-error
-                       #f
-                       "unknown variable mode"
-                       stx
-                       kind)]))
-                 (syntax->list #'(kind ...))
-                 (syntax->list #'(s-exp ...)))
-       (with-syntax ([(id ...) (bound-identifier-mapping-map ht (lambda (k v) k))])
-         #'(letrec-syntaxes ([(id) (make-variable-id 'id)] ...)
-             body)))]))
-
-
-(define (*deftogether boxes body-thunk)
-  (make-box-splice
-   (cons
-    (make-blockquote 
-     vertical-inset-style
-     (list
-      (make-table
-       boxed-style
-       (map
-        (lambda (box)
-          (unless (and (box-splice? box)
-                       (= 1 (length (splice-run box)))
-                       (nested-flow? (car (splice-run box)))
-                       (eq? vertical-inset-style (nested-flow-style (car (splice-run box))))
-                       (let ([l (nested-flow-blocks (car (splice-run box)))])
-                         (= 1 (length l))
-                         (table? (car l))
-                         (eq? boxed-style (table-style (car l)))))
-            (error 'deftogether
-                   "element is not a boxing splice containing a single nested-flow with a single table: ~e"
-                   box))
-          (list (make-flow (list (make-table
-                                  "together"
-                                  (table-flowss (car (nested-flow-blocks (car (splice-run box))))))))))
-        boxes))))
-    (body-thunk))))
-
-(define-syntax (deftogether stx)
-  (syntax-case stx ()
-    [(_ (def ...) . body)
-     (with-syntax ([((_ (lit ...) (var ...) decl) ...)
-                    (map (lambda (def)
-                           (let ([exp-def (local-expand 
-                                           def
-                                           (list (make-deftogether-tag))
-                                           (cons
-                                            #'with-togetherable-racket-variables*
-                                            (kernel-form-identifier-list)))])
-                             (syntax-case exp-def (with-togetherable-racket-variables*)
-                               [(with-togetherable-racket-variables* lits vars decl)
-                                exp-def]
-                               [_
-                                (raise-syntax-error
-                                 #f
-                                 "sub-form is not a documentation form that can be combined"
-                                 stx
-                                 def)])))
-                         (syntax->list #'(def ...)))])
-       #'(with-togetherable-racket-variables
-          (lit ... ...)
-          (var ... ...)
-          (*deftogether (list decl ...) (lambda () (list . body)))))]))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/on-demand.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/on-demand.rkt
deleted file mode 100644
index 4ba95a92f4..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/on-demand.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require racket/promise
-         (for-syntax racket/base))
-(provide define-on-demand)
-
-(define-syntax-rule (define-on-demand id rhs)
-  (begin
-    (define define-on-demand-bound-promise (delay rhs))
-    (define-syntax (id stx)
-      (if (identifier? stx)
-          #'(force define-on-demand-bound-promise)
-          (raise-syntax-error #f "bad syntax" stx)))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/provide-structs.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/provide-structs.rkt
deleted file mode 100644
index 2d58d3715d..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/provide-structs.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang scheme/base
-(require scheme/serialize
-         racket/contract/base
-         (for-syntax scheme/base))
-
-(provide provide-structs)
-
-(define-syntax (provide-structs stx)
-  (syntax-case stx ()
-    [(_ (id ([field ct] ...)) ...)
-     #`(begin
-         (define-serializable-struct id (field ...) #:transparent) ...
-         (provide/contract
-          #,@(let ([ids (syntax->list #'(id ...))]
-                   [fields+cts (syntax->list #'(([field ct] ...) ...))])
-               (define (get-fields super-id)
-                 (ormap (lambda (id  fields+cts)
-                          (if (identifier? id)
-                            (and (free-identifier=? id super-id)
-                                 fields+cts)
-                            (syntax-case id ()
-                              [(my-id next-id)
-                               (free-identifier=? #'my-id super-id)
-                               #`[#,@(get-fields #'next-id)
-                                  #,@fields+cts]]
-                              [_else #f])))
-                        ids fields+cts))
-               (map (lambda (id fields+cts)
-                      (if (identifier? id)
-                        #`[struct #,id #,fields+cts]
-                        (syntax-case id ()
-                          [(id super)
-                           #`[struct id (#,@(get-fields #'super) 
-                                         #,@fields+cts)]])))
-                    ids
-                    fields+cts))))]))
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/qsloc.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/qsloc.rkt
deleted file mode 100644
index 59d156267b..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/qsloc.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang scheme/base
-(require (for-syntax scheme/base))
-
-(provide quote-syntax/loc)
-
-(define-syntax (quote-syntax/loc stx)
-  (syntax-case stx ()
-    [(_ id)
-     (with-syntax ([loc (let ([s #'id])
-                          (vector (syntax-source s)
-                                  (syntax-line s)
-                                  (syntax-column s)
-                                  (syntax-position s)
-                                  (syntax-span s)))])
-       #'(let ([s (*quote-syntax/loc id)])
-           (datum->syntax s (syntax-e s) 'loc s)))]))
-
-(define-syntax *quote-syntax/loc
-  (syntax-rules ()
-    [(_ (sub ...)) (datum->syntax #f (list (quote-syntax/loc sub) ...))]
-    [(_ id) (quote-syntax id)]))
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/render-utils.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/render-utils.rkt
deleted file mode 100644
index 1abd03e7ba..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/render-utils.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang scheme/base
-(require "../core.rkt")
-
-(provide part-style?
-         select-suffix
-         extract-table-cell-styles
-         empty-content?)
-
-(define (part-style? p s)
-  (memq s (style-properties (part-style p))))
-
-(define (select-suffix path suggested-suffixes accepted-suffixes)
-  (or (ormap (lambda (suggested)
-               (and (member suggested accepted-suffixes)
-                    (let ([p (bytes->path 
-                              (bytes-append (path->bytes (if (string? path)
-                                                             (string->path path)
-                                                             path))
-                                            (string->bytes/utf-8 suggested)))])
-                      (and (file-exists? p)
-                           p))))
-             suggested-suffixes)
-      path))
-
-(define (extract-table-cell-styles t)
-  (let ([vars (style-properties (table-style t))])
-    (or (let ([l (ormap (lambda (v)
-                          (and (table-cells? v)
-                               (table-cells-styless v)))
-                        vars)])
-          (and l
-               (unless (= (length l) (length (table-blockss t)))
-                 (error 'table 
-                        "table-cells property list's length does not match row count: ~e vs. ~e"
-                        l (length (table-blockss t))))
-               (for-each (lambda (l row)
-                           (unless (= (length l) (length row))
-                             (error 'table
-                                    "table-cells property list contains a row whose length does not match the content: ~e vs. ~e"
-                                    l (length row))))
-                         l (table-blockss t))
-               l))
-        (let ([cols (ormap (lambda (v) (and (table-columns? v) v)) vars)])
-          (and cols
-               (let ([cols (table-columns-styles cols)])
-                 (map (lambda (row)
-                        (unless (= (length cols) (length row))
-                          (error 'table
-                                 "table-columns property list's length does not match a row length: ~e vs. ~e"
-                                 cols (length row)))
-                        cols)
-                      (table-blockss t)))))
-        (map (lambda (row) (map (lambda (c) plain) row)) (table-blockss t)))))
-
-(define (empty-content? c) (null? c))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/run-pdflatex.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/run-pdflatex.rkt
deleted file mode 100644
index 4f601c5f29..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/run-pdflatex.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang scheme/base
-
-(require scheme/system scheme/port)
-
-(provide run-pdflatex run-dvipdf-latex)
-
-(define (run-pdflatex file [notify void]) (run file notify #f))
-(define (run-dvipdf-latex file [notify void]) 
-  (parameterize ([function-name 'run-dvipdf-latex])
-    (run file notify #t)))
-
-(define max-runs 5)
-(define (run file notify via-dvipdf?)
-  (define latex-cmd-name (if via-dvipdf? "latex" "pdflatex"))
-  (define cmd
-    (list (get-latex-binary latex-cmd-name)
-          "-interaction=batchmode"
-          (format "~a" file)))
-  (define logfile (path-replace-suffix file #".log"))
-  (define (run)
-    (unless (parameterize ([current-output-port (open-output-nowhere)])
-              (apply system* cmd))
-      (unless (file-exists? logfile)
-        (err "did not generate a log file at ~a" logfile))
-      (call-with-input-file* logfile
-        (lambda (log) (copy-port log (current-error-port))))
-      (err "got error exit code")))
-  (let loop ([n 0])
-    (when (= n max-runs)
-      (err "didn't get a stable result after ~a runs" n))
-    (if (zero? n)
-      (notify "running ~a on ~a" latex-cmd-name file)
-      (notify " running ~a~a time"
-              (add1 n) 
-              (case (normalize-for-suffix (add1 n)) [(2) 'nd] [(3) 'rd] [else 'th])))
-    (run)
-    ;; see if we get a "Rerun" note, these seem to come in two flavors
-    ;; * Label(s) may have changed. Rerun to get cross-references right.
-    ;; * Package longtable Warning: Table widths have changed. Rerun LaTeX.
-    (cond [(call-with-input-file* logfile
-             (lambda (log) (regexp-match? #px#"changed\\.\\s+Rerun" log)))
-           (loop (add1 n))]
-          [(zero? n)
-           (notify "WARNING: no \"Rerun\" found in first run of pdflatex for ~a"
-                   file)]))
-  (when via-dvipdf?
-    (define dvi-file (path-replace-suffix file #".dvi"))
-    (define ps-file (path-replace-suffix file #".ps"))
-    (unless (file-exists? dvi-file) (err "didn't find .dvi file"))
-    (define dvips (get-latex-binary "dvips"))
-    (define pstopdf (get-latex-binary "pstopdf"))
-    (notify "running dvips on ~a" dvi-file)
-    (define stderr (open-output-bytes))
-    (unless (parameterize ([current-output-port (open-output-nowhere)]
-                           [current-error-port stderr])
-              (system* dvips dvi-file))
-      (displayln (get-output-bytes stderr))
-      (err "got error exit code"))
-    (unless (parameterize ([current-output-port (open-output-nowhere)]
-                           [current-error-port stderr])
-              (system* pstopdf ps-file))
-      (displayln (get-output-bytes stderr))
-      (err "got error exit code")))
-  (path-replace-suffix file #".pdf"))
-
-(define (normalize-for-suffix n)
-  (cond
-    [(<= 10 n 20) 0]
-    [else (modulo n 10)]))
-
-(define (get-latex-binary name)
-  (define ans
-    (case (system-type)
-      [(macosx) (or (find-executable-path name)
-                    (for/or ([macosx-candidate-dir (in-list macosx-candidate-dirs)])
-                      (define macosx-candidate (build-path macosx-candidate-dir name))
-                      (and (file-exists? macosx-candidate)
-                           macosx-candidate)))]
-      [(windows) (or (find-executable-path name)
-                     (find-executable-path (format "~a.exe" name)))]
-      [(unix) (find-executable-path name)]))
-  (unless ans
-    (err (format "could not find a `~a' executable" name)))
-  ans)
-
-(define function-name (make-parameter 'run-pdflatex))
-(define (err fmt . args) (apply error (function-name) fmt args))
-
-;; under mac os x, gui apps do not get started with
-;; a good path environment, so put likely candidates
-;; for directories holding latex/pdflatex binaries
-;; here so that the "scribble pdf" button is more 
-;; likely to work in drracket
-(define macosx-candidate-dirs
-  '("/usr/texbin"))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/serialize.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/serialize.rkt
deleted file mode 100644
index cc3f26f189..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/serialize.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/base
-(require racket/serialize
-         file/convertible)
-
-(provide make-serialized-convertible)
-
-(struct serialized-convertible (ser [deser #:mutable])
-  #:property prop:convertible (lambda (v mode default)
-                                (unless (serialized-convertible-deser v)
-                                  (set-serialized-convertible-deser!
-                                   v
-                                   (deserialize (serialized-convertible-ser v))))
-                                (convert (serialized-convertible-deser v) mode default)))
-
-(define (make-serialized-convertible ser)
-  (serialized-convertible ser #f))
-
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/provide-doc-transform.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/provide-doc-transform.rkt
deleted file mode 100644
index 81451633d1..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/provide-doc-transform.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require "srcdoc.rkt")
-
-(provide define-provide/doc-transformer
-         (for-syntax
-          provide/doc-transformer?
-          provide/doc-transformer-proc))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/racket.css b/pkgs/scribble-pkgs/scribble-lib/scribble/racket.css
deleted file mode 100644
index b44fef59cf..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/racket.css
+++ /dev/null
@@ -1,249 +0,0 @@
-
-/* See the beginning of "scribble.css". */
-
-/* Monospace: */
-.RktIn, .RktRdr, .RktPn, .RktMeta,
-.RktMod, .RktKw, .RktVar, .RktSym,
-.RktRes, .RktOut, .RktCmt, .RktVal,
-.RktBlk {
-  font-family: monospace;
-  white-space: inherit;
-}
-
-/* Serif: */
-.inheritedlbl {
-  font-family: serif;
-}
-
-/* Sans-serif: */
-.RBackgroundLabelInner {
-  font-family: sans-serif;
-}
-
-/* ---------------------------------------- */
-/* Inherited methods, left margin */
-
-.inherited {
-  width: 100%;
-  margin-top: 0.5em;
-  text-align: left;
-  background-color: #ECF5F5;
-}
-
-.inherited td {
-  font-size: 82%;
-  padding-left: 1em;
-  text-indent: -0.8em;
-  padding-right: 0.2em;
-}
-
-.inheritedlbl {
-  font-style: italic;
-}
-
-/* ---------------------------------------- */
-/* Racket text styles */
-
-.RktIn {
-  color: #cc6633;
-  background-color: #eeeeee;
-}
-
-.RktInBG {
-  background-color: #eeeeee;
-}
-
-.RktRdr {
-}
-
-.RktPn {
-  color: #843c24;
-}
-
-.RktMeta {
-  color: black;
-}
-
-.RktMod {
-  color: black;
-}
-
-.RktOpt {
-  color: black;
-}
-
-.RktKw {
-  color: black;
-}
-
-.RktErr {
-  color: red;
-  font-style: italic;
-}
-
-.RktVar {
-  color: #262680;
-  font-style: italic;
-}
-
-.RktSym {
-  color: #262680;
-}
-
-.RktSymDef { /* used with RktSym at def site */
-}
-
-.RktValLink {
-  text-decoration: none;
-  color: blue;
-}
-
-.RktValDef { /* used with RktValLink at def site */
-}
-
-.RktModLink {
-  text-decoration: none;
-  color: blue;
-}
-
-.RktStxLink {
-  text-decoration: none;
-  color: black;
-}
-
-.RktStxDef { /* used with RktStxLink at def site */
-}
-
-.RktRes {
-  color: #0000af;
-}
-
-.RktOut {
-  color: #960096;
-}
-
-.RktCmt {
-  color: #c2741f;
-}
-
-.RktVal {
-  color: #228b22;
-}
-
-/* ---------------------------------------- */
-/* Some inline styles */
-
-.together {
-  width: 100%;
-}
-
-.prototype, .argcontract, .RBoxed {
-  white-space: nowrap;
-}
-
-.prototype td {
-  vertical-align: text-top;
-}
-
-.RktBlk {
-  white-space: inherit;
-  text-align: left;
-}
-
-.RktBlk tr {
-  white-space: inherit;
-}
-
-.RktBlk td {
-  vertical-align: baseline;
-  white-space: inherit;
-}
-
-.argcontract td {
-  vertical-align: text-top;
-}
-
-.highlighted {
-  background-color: #ddddff;
-}
-
-.defmodule {
-  width: 100%;
-  background-color: #F5F5DC;
-}
-
-.specgrammar {
-  float: right;
-}
-
-.RBibliography td {
-  vertical-align: text-top;
-}
-
-.leftindent {
- margin-left: 1em;
- margin-right: 0em;
-}
-
-.insetpara {
- margin-left: 1em;
- margin-right: 1em;
-}
-
-.Rfilebox {
-}
-
-.Rfiletitle {
-  text-align: right;
-  margin: 0em 0em 0em 0em;
-}
-
-.Rfilename {
-  border-top: 1px solid #6C8585;
-  border-right: 1px solid #6C8585;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-  background-color: #ECF5F5;
-}
-
-.Rfilecontent {
-  margin: 0em 0em 0em 0em;
-}
-
-.RpackageSpec {
-  padding-right: 0.5em;
-}
-
-/* ---------------------------------------- */
-/* For background labels */
-
-.RBackgroundLabel {
-   float: right;
-   width: 0px;
-   height: 0px;
-}
-
-.RBackgroundLabelInner {
-   position: relative;
-   width: 25em;
-   left: -25.5em;
-   top: 0px;
-   text-align: right;
-   color: white;
-   z-index: 0;
-   font-weight: bold;
-}
-
-.RForeground {
-   position: relative;
-   left: 0px;
-   top: 0px;
-   z-index: 1;
-}
-
-/* ---------------------------------------- */
-/* History */
-
-.SHistory {
-  font-size: 82%;
-}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/racket.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/racket.rkt
deleted file mode 100644
index 551164806a..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/racket.rkt
+++ /dev/null
@@ -1,1373 +0,0 @@
-(module racket racket/base
-  (require "core.rkt"
-           "basic.rkt"
-           "search.rkt"
-           "private/manual-sprop.rkt"
-           "private/on-demand.rkt"
-           "html-properties.rkt"
-           file/convertible
-           racket/extflonum
-           (for-syntax racket/base))
-  
-  (provide define-code
-           to-element
-           to-element/no-color
-           to-paragraph
-           to-paragraph/prefix
-           syntax-ize
-           syntax-ize-hook
-           current-keyword-list
-           current-variable-list
-           current-meta-list
-
-           input-color
-           output-color
-           input-background-color
-           no-color
-           reader-color
-           result-color
-           keyword-color
-           comment-color
-           paren-color
-           meta-color
-           value-color
-           symbol-color
-           variable-color
-           opt-color
-           error-color
-           syntax-link-color
-           value-link-color
-           syntax-def-color
-           value-def-color
-           module-color
-           module-link-color
-           block-color
-           highlighted-color
-
-           (struct-out var-id)
-           (struct-out shaped-parens)
-           (struct-out long-boolean)
-           (struct-out just-context)
-           (struct-out alternate-display)
-           (struct-out literal-syntax)
-           (for-syntax make-variable-id
-                       variable-id?
-                       make-element-id-transformer
-                       element-id-transformer?))
-
-  (define (make-racket-style s 
-                             #:tt? [tt? #t]
-                             #:extras [extras null])
-    (make-style s (if tt?
-                      (cons 'tt-chars 
-                            (append extras
-                                    scheme-properties))
-                      (append extras
-                              scheme-properties))))
-
-  (define-on-demand output-color (make-racket-style "RktOut"))
-  (define-on-demand input-color (make-racket-style "RktIn"))
-  (define-on-demand input-background-color (make-racket-style "RktInBG"))
-  (define-on-demand no-color (make-racket-style "RktPlain"))
-  (define-on-demand reader-color (make-racket-style "RktRdr"))
-  (define-on-demand result-color (make-racket-style "RktRes"))
-  (define-on-demand keyword-color (make-racket-style "RktKw"))
-  (define-on-demand comment-color (make-racket-style "RktCmt"))
-  (define-on-demand paren-color (make-racket-style "RktPn"))
-  (define-on-demand meta-color (make-racket-style "RktMeta"))
-  (define-on-demand value-color (make-racket-style "RktVal"))
-  (define-on-demand symbol-color (make-racket-style "RktSym"))
-  (define-on-demand symbol-def-color (make-racket-style "RktSymDef"
-                                                        #:extras (list (attributes '((class . "RktSym"))))))
-  (define-on-demand variable-color (make-racket-style "RktVar"))
-  (define-on-demand opt-color (make-racket-style "RktOpt"))
-  (define-on-demand error-color (make-racket-style "RktErr" #:tt? #f))
-  (define-on-demand syntax-link-color (make-racket-style "RktStxLink"))
-  (define-on-demand value-link-color (make-racket-style "RktValLink"))
-  (define-on-demand syntax-def-color (make-racket-style "RktStxDef"
-                                                        #:extras (list (attributes '((class . "RktStxLink"))))))
-  (define-on-demand value-def-color (make-racket-style "RktValDef"
-                                                       #:extras (list (attributes '((class . "RktValLink"))))))
-  (define-on-demand module-color (make-racket-style "RktMod"))
-  (define-on-demand module-link-color (make-racket-style "RktModLink"))
-  (define-on-demand block-color (make-racket-style "RktBlk"))
-  (define-on-demand highlighted-color (make-racket-style "highlighted" #:tt? #f))
-
-  (define current-keyword-list 
-    (make-parameter null))
-  (define current-variable-list 
-    (make-parameter null))
-  (define current-meta-list 
-    (make-parameter null))
-
-  (define defined-names (make-hasheq))
-
-  (define-struct (sized-element element) (length))
-
-  (define-struct (spaces element) (cnt))
-
-  ;; We really don't want leading hypens (or minus signs) to
-  ;; create a line break after the hyphen. For interior hyphens,
-  ;; line breaking is usually fine.
-  (define (nonbreak-leading-hyphens s)
-    (let ([m (regexp-match-positions #rx"^-+" s)])
-      (if m
-          (if (= (cdar m) (string-length s))
-              (make-element 'no-break s)
-              (let ([len (add1 (cdar m))])
-                (make-element #f (list (make-element 'no-break (substring s 0 len))
-                                       (substring s len)))))
-          s)))
-
-  (define (literalize-spaces i [leading? #f])
-    (let ([m (regexp-match-positions #rx"  +" i)])
-      (if m
-          (let ([cnt (- (cdar m) (caar m))])
-            (make-spaces #f
-                         (list
-                          (literalize-spaces (substring i 0 (caar m)) #t)
-                          (hspace cnt)
-                          (literalize-spaces (substring i (cdar m))))
-                         cnt))
-          (if leading?
-              (nonbreak-leading-hyphens i)
-              i))))
-
-
-  (define line-breakable-space (make-element 'tt " "))
-
-  ;; These caches intentionally record a key with the value.
-  ;; That way, when the value is no longer used, the key
-  ;; goes away, and the entry is gone.
-
-  (define id-element-cache (make-weak-hash))
-  (define element-cache (make-weak-hash))
-
-  (define-struct (cached-delayed-element delayed-element) (cache-key))
-  (define-struct (cached-element element) (cache-key))
-
-  (define qq-ellipses (string->uninterned-symbol "..."))
-
-  (define (make-id-element c s defn?)
-    (let* ([key (and id-element-cache
-                     (let ([b (identifier-label-binding c)])
-                       (vector (syntax-e c)
-                               (module-path-index->taglet (caddr b))
-                               (cadddr b)
-                               (list-ref b 5)
-                               (syntax-property c 'display-string)
-                               defn?)))])
-      (or (and key
-               (let ([b (hash-ref id-element-cache key #f)])
-                 (and b
-                      (weak-box-value b))))
-          (let ([e (make-cached-delayed-element
-                    (lambda (renderer sec ri)
-                      (let* ([tag (find-racket-tag sec ri c #f)])
-                        (if tag
-                            (let ([tag (intern-taglet tag)])
-                              (list
-                               (case (car tag)
-                                 [(form)
-                                  (make-link-element (if defn?
-                                                         syntax-def-color
-                                                         syntax-link-color)
-                                                     (nonbreak-leading-hyphens s) 
-                                                     tag)]
-                                 [else
-                                  (make-link-element (if defn?
-                                                         value-def-color
-                                                         value-link-color)
-                                                     (nonbreak-leading-hyphens s)
-                                                     tag)])))
-                            (list 
-                             (make-element "badlink"
-                                           (make-element value-link-color s))))))
-                    (lambda () s)
-                    (lambda () s)
-                    (intern-taglet key))])
-            (when key
-              (hash-set! id-element-cache key (make-weak-box e)))
-            e))))
-
-  (define (make-element/cache style content)
-    (if (and element-cache 
-             (string? content))
-        (let ([key (vector style content)])
-          (let ([b (hash-ref element-cache key #f)])
-            (or (and b (weak-box-value b))
-                (let ([e (make-cached-element style content key)])
-                  (hash-set! element-cache key (make-weak-box e))
-                  e))))
-        (make-element style content)))
-
-  (define (to-quoted obj expr? quote-depth out color? inc!)
-    (if (and expr? 
-             (zero? quote-depth)
-             (quotable? obj))
-        (begin
-          (out "'" (and color? value-color))
-          (inc!)
-          (add1 quote-depth))
-        quote-depth))
-
-  (define (to-unquoted expr? quote-depth out color? inc!)
-    (if (or (not expr?) (zero? quote-depth))
-        quote-depth
-        (begin
-          (out "," (and color? meta-color))
-          (inc!)
-          (to-unquoted expr? (sub1 quote-depth) out color? inc!))))
-
-  (define iformat
-    (case-lambda
-     [(str val) (datum-intern-literal (format str val))]
-     [(str . vals) (datum-intern-literal (apply format str vals))]))
-
-  (define (typeset-atom c out color? quote-depth expr? escapes? defn?)
-    (if (and (var-id? (syntax-e c))
-             (zero? quote-depth))
-        (out (iformat "~s" (let ([v (var-id-sym (syntax-e c))])
-                             (if (syntax? v)
-                                 (syntax-e v)
-                                 v)))
-             variable-color)
-        (let*-values ([(is-var?) (and (identifier? c)
-                                      (memq (syntax-e c) (current-variable-list)))]
-                      [(s it? sub?)
-                       (let ([sc (syntax-e c)])
-                         (let ([s (cond
-                                    [(syntax-property c 'display-string) => values]
-                                    [(literal-syntax? sc) (iformat "~s" (literal-syntax-stx sc))]
-                                    [(var-id? sc) (iformat "~s" (var-id-sym sc))]
-                                    [(eq? sc #t) 
-                                     (if (equal? (syntax-span c) 5)
-                                         "#true"
-                                         "#t")]
-                                    [(eq? sc #f) 
-                                     (if (equal? (syntax-span c) 6)
-                                         "#false"
-                                         "#f")]
-                                    [else (iformat "~s" sc)])])
-                           (if (and escapes?
-                                    (symbol? sc)
-                                    ((string-length s) . > . 1)
-                                    (char=? (string-ref s 0) #\_)
-                                    (not (or (identifier-label-binding c)
-                                             is-var?)))
-                               (values (substring s 1) #t #f)
-                               (values s #f #f))))])
-          (let ([quote-depth (if (and expr? (identifier? c) (not (eq? qq-ellipses (syntax-e c))))
-                                 (let ([quote-depth
-                                        (if (and (quote-depth . < . 2)
-                                                 (memq (syntax-e c) '(unquote unquote-splicing)))
-                                            (to-unquoted expr? quote-depth out color? void)
-                                            quote-depth)])
-                                   (to-quoted c expr? quote-depth out color? void))
-                                 quote-depth)])
-            (if (or (element? (syntax-e c))
-                    (delayed-element? (syntax-e c))
-                    (part-relative-element? (syntax-e c))
-                    (convertible? (syntax-e c)))
-                (out (syntax-e c) #f)
-                (out (if (and (identifier? c)
-                              color?
-                              (quote-depth . <= . 0)
-                              (not (or it? is-var?)))
-                         (if (pair? (identifier-label-binding c))
-                             (make-id-element c s defn?)
-                             (let ([c (nonbreak-leading-hyphens s)])
-                               (if defn?
-                                   (make-element symbol-def-color c)
-                                   c)))
-                         (literalize-spaces s #t))
-                     (cond
-                      [(positive? quote-depth) value-color]
-                      [(let ([v (syntax-e c)])
-                         (or (number? v)
-                             (string? v)
-                             (bytes? v)
-                             (char? v)
-                             (regexp? v)
-                             (byte-regexp? v)
-                             (boolean? v)
-                             (extflonum? v)))
-                       value-color]
-                      [(identifier? c) 
-                       (cond
-                        [is-var?
-                         variable-color]
-                        [(and (identifier? c)
-                              (memq (syntax-e c) (current-keyword-list)))
-                         keyword-color]
-                        [(and (identifier? c)
-                              (memq (syntax-e c) (current-meta-list)))
-                         meta-color]
-                        [it? variable-color]
-                        [else symbol-color])]
-                      [else paren-color])
-                     (string-length s)))))))
-
-  (define omitable (make-style #f '(omitable)))
-
-  (define (gen-typeset c multi-line? prefix1 prefix suffix color? expr? escapes? defn? elem-wrap)
-    (let* ([c (syntax-ize c 0 #:expr? expr?)]
-           [content null]
-           [docs null]
-           [first (if escapes?
-                      (syntax-case c (code:line)
-                        [(code:line e . rest) #'e]
-                        [else c])
-                      c)]
-           [init-col (or (syntax-column first) 0)]
-           [src-col init-col]
-           [inc-src-col (lambda () (set! src-col (add1 src-col)))]
-           [dest-col 0]
-           [highlight? #f]
-           [col-map (make-hash)]
-           [next-col-map (make-hash)]
-           [line (or (syntax-line first) 0)])
-      (define (finish-line!)
-        (when multi-line?
-          (set! docs (cons (make-paragraph omitable 
-                                           (if (null? content)
-                                               (list (hspace 1))
-                                               (reverse content)))
-                           docs))
-          (set! content null)))
-      (define out
-        (case-lambda
-         [(v cls)
-          (out v cls (let sz-loop ([v v])
-                       (cond
-                        [(string? v) (string-length v)]
-                        [(list? v) (for/fold ([s 0]) ([v (in-list v)]) (+ s (sz-loop v)))]
-                        [(sized-element? v) (sized-element-length v)]
-                        [(element? v)
-                         (sz-loop (element-content v))]
-                        [(delayed-element? v)
-                         (content-width v)]
-                        [(part-relative-element? v)
-                         (content-width v)]
-                        [(spaces? v)
-                         (+ (sz-loop (car (element-content v)))
-                            (spaces-cnt v)
-                            (sz-loop (caddr (element-content v))))]
-                        [else 1])))]
-         [(v cls len)
-          (unless (equal? v "")
-            (cond
-             [(spaces? v)
-              (out (car (element-content v)) cls 0)
-              (out (cadr (element-content v)) #f 0)
-              (out (caddr (element-content v)) cls len)]
-             [(equal? v "\n")
-              (if multi-line?
-                  (begin
-                    (finish-line!)
-                    (out prefix cls))
-                  (out " " cls))]
-             [else
-              (set! content (cons (elem-wrap
-                                   ((if highlight?
-                                        (lambda (c)
-                                          (make-element highlighted-color c))
-                                        values)
-                                    (if (and color? cls)
-                                        (make-element/cache cls v)
-                                        v)))
-                                  content))
-              (set! dest-col (+ dest-col len))]))]))
-      (define advance
-        (case-lambda
-         [(c init-line! srcless-step delta)
-          (let ([c (+ delta (or (syntax-column c)
-                                (if srcless-step
-                                    (+ src-col srcless-step)
-                                    0)))]
-                [l (syntax-line c)])
-            (let ([new-line? (and l (l . > . line))])
-              (when new-line?
-                (for ([i (in-range (- l line))])
-                  (out "\n" #f))
-                (set! line l)
-                (set! col-map next-col-map)
-                (set! next-col-map (make-hash))
-                (init-line!))
-              (let ([d-col (let ([def-val (+ dest-col (- c src-col))])
-                             (if new-line?
-                                 (hash-ref col-map c def-val)
-                                 def-val))])
-                (let ([amt (- d-col dest-col)])
-                  (when (positive? amt)
-                    (let ([old-dest-col dest-col])
-                      (out (if (and (= 1 amt) (not multi-line?))
-                               line-breakable-space ; allows a line break to replace the space
-                               (hspace amt))
-                           #f)
-                      (set! dest-col (+ old-dest-col amt))))))
-              (set! src-col c)
-              (hash-set! next-col-map src-col dest-col)))]
-         [(c init-line! srcless-step) (advance c init-line! srcless-step 0)]
-         [(c init-line!) (advance c init-line! #f 0)]))
-      (define (for-each/i f l v)
-        (unless (null? l)
-          (f (car l) v)
-          (for-each/i f (cdr l) 1)))
-      (define (convert-infix c quote-depth expr?)
-        (let ([l (syntax->list c)])
-          (and l
-               ((length l) . >= . 3)
-               ((or (syntax-position (car l)) -inf.0)
-                . > .
-                (or (syntax-position (cadr l)) +inf.0))
-               (let ([a (car l)])
-                 (let loop ([l (cdr l)]
-                            [prev null])
-                   (cond
-                    [(null? l) #f] ; couldn't unwind
-                    [else (let ([p2 (syntax-position (car l))])
-                            (if (and p2
-                                     (p2 . > . (syntax-position a)))
-                                (datum->syntax c
-                                               (append 
-                                                (reverse prev)
-                                                (list
-                                                 (datum->syntax 
-                                                  a
-                                                  (let ([val? (positive? quote-depth)])
-                                                    (make-sized-element 
-                                                     (if val? value-color #f)
-                                                     (list
-                                                      (make-element/cache (if val? value-color paren-color) '". ")
-                                                      (typeset a #f "" "" "" (not val?) expr? escapes? defn? elem-wrap)
-                                                      (make-element/cache (if val? value-color paren-color) '" ."))
-                                                     (+ (syntax-span a) 4)))
-                                                  (list (syntax-source a)
-                                                        (syntax-line a)
-                                                        (- (syntax-column a) 2)
-                                                        (- (syntax-position a) 2)
-                                                        (+ (syntax-span a) 4))
-                                                  a))
-                                                l)
-                                               c
-                                               c)
-                                (loop (cdr l)
-                                      (cons (car l) prev))))]))))))
-      (define (no-fancy-chars s)
-        (cond
-         [(eq? s 'rsquo) "'"]
-         [else s]))
-      (define (loop init-line! quote-depth expr? no-cons?)
-        (lambda (c srcless-step)
-          (cond
-           [(and escapes? (eq? 'code:blank (syntax-e c)))
-            (advance c init-line! srcless-step)]
-           [(and escapes?
-                 (pair? (syntax-e c))
-                 (eq? (syntax-e (car (syntax-e c))) 'code:comment))
-            (let ([l (syntax->list c)])
-              (unless (and l (= 2 (length l)))
-                (raise-syntax-error
-                 #f
-                 "does not have a single sub-form"
-                 c)))
-            (advance c init-line! srcless-step)
-            (out ";" comment-color)
-            (out 'nbsp comment-color)
-            (let ([v (syntax->datum (cadr (syntax->list c)))])
-              (if (paragraph? v)
-                  (map (lambda (v) 
-                         (let ([v (no-fancy-chars v)])
-                           (if (or (string? v) (symbol? v))
-                               (out v comment-color)
-                               (out v #f))))
-                       (paragraph-content v))
-                  (out (no-fancy-chars v) comment-color)))]
-           [(and escapes?
-                 (pair? (syntax-e c))
-                 (eq? (syntax-e (car (syntax-e c))) 'code:contract))
-            (advance c init-line! srcless-step)
-            (out "; " comment-color)
-            (let* ([l (cdr (syntax->list c))]
-                   [s-col (or (syntax-column (car l)) src-col)])
-              (set! src-col s-col)
-              (for-each/i (loop (lambda ()
-                                  (set! src-col s-col)
-                                  (set! dest-col 0)
-                                  (out "; " comment-color))
-                                0
-                                expr?
-                                #f)
-                          l
-                          #f))]
-           [(and escapes?
-                 (pair? (syntax-e c))
-                 (eq? (syntax-e (car (syntax-e c))) 'code:line))
-            (let ([l (cdr (syntax->list c))])
-              (for-each/i (loop init-line! quote-depth expr? #f) 
-                          l
-                          #f))]
-           [(and escapes?
-                 (pair? (syntax-e c))
-                 (eq? (syntax-e (car (syntax-e c))) 'code:hilite))
-            (let ([l (syntax->list c)]
-                  [h? highlight?])
-              (unless (and l (= 2 (length l)))
-                (error "bad code:redex: ~.s" (syntax->datum c)))
-              (advance c init-line! srcless-step)
-              (set! src-col (syntax-column (cadr l)))
-              (hash-set! next-col-map src-col dest-col)
-              (set! highlight? #t)
-              ((loop init-line! quote-depth expr? #f) (cadr l) #f)
-              (set! highlight? h?)
-              (set! src-col (add1 src-col)))]
-           [(and escapes?
-                 (pair? (syntax-e c))
-                 (eq? (syntax-e (car (syntax-e c))) 'code:quote))
-            (advance c init-line! srcless-step)
-            (let ([quote-depth (to-quoted c expr? quote-depth out color? inc-src-col)])
-              (out "(" (if (positive? quote-depth) value-color paren-color))
-              (set! src-col (+ src-col 1))
-              (hash-set! next-col-map src-col dest-col)
-              ((loop init-line! quote-depth expr? #f) 
-               (datum->syntax #'here 'quote (car (syntax-e c)))
-               #f)
-              (for-each/i (loop init-line! (add1 quote-depth) expr? #f)
-                          (cdr (syntax->list c))
-                          1)
-              (out ")" (if (positive? quote-depth) value-color paren-color))
-              (set! src-col (+ src-col 1))
-              #;
-              (hash-set! next-col-map src-col dest-col))]
-           [(and (pair? (syntax-e c))
-                 (memq (syntax-e (car (syntax-e c))) 
-                       '(quote quasiquote unquote unquote-splicing
-                               quasisyntax syntax unsyntax unsyntax-splicing))
-                 (let ([v (syntax->list c)])
-                   (and v (= 2 (length v))))
-                 (or (not expr?)
-                     (positive? quote-depth)
-                     (quotable? c)))
-            (advance c init-line! srcless-step)
-            (let ([quote-depth (to-quoted c expr? quote-depth out color? inc-src-col)])
-              (let-values ([(str quote-delta)
-                            (case (syntax-e (car (syntax-e c)))
-                              [(quote) (values "'" +inf.0)]
-                              [(unquote) (values "," -1)]
-                              [(unquote-splicing) (values ",@" -1)]
-                              [(quasiquote) (values "`" +1)]
-                              [(syntax) (values "#'" 0)]
-                              [(quasisyntax) (values "#`" 0)]
-                              [(unsyntax) (values "#," 0)]
-                              [(unsyntax-splicing) (values "#,@" 0)])])
-                (out str (if (positive? (+ quote-depth quote-delta))
-                             value-color
-                             reader-color))
-                (let ([i (cadr (syntax->list c))])
-                  (set! src-col (or (syntax-column i) src-col))
-                  (hash-set! next-col-map src-col dest-col)
-                  ((loop init-line! (max 0 (+ quote-depth quote-delta)) expr? #f) i #f))))]
-           [(and (pair? (syntax-e c))
-                 (or (not expr?) 
-                     (positive? quote-depth)
-                     (quotable? c))
-                 (convert-infix c quote-depth expr?))
-            => (lambda (converted)
-                 ((loop init-line! quote-depth expr? #f) converted srcless-step))]
-           [(or (pair? (syntax-e c))
-                (mpair? (syntax-e c))
-                (forced-pair? (syntax-e c))
-                (null? (syntax-e c))
-                (vector? (syntax-e c))
-                (and (struct? (syntax-e c))
-                     (prefab-struct-key (syntax-e c)))
-                (struct-proxy? (syntax-e c)))
-            (let* ([sh (or (syntax-property c 'paren-shape)
-                           (if (and (mpair? (syntax-e c))
-                                    (not (and expr? (zero? quote-depth))))
-                               #\{
-                               #\())]
-                   [quote-depth (if (and (not expr?)
-                                         (zero? quote-depth)
-                                         (or (vector? (syntax-e c))
-                                             (struct? (syntax-e c))))
-                                    1
-                                    quote-depth)]
-                   [p-color (if (positive? quote-depth) 
-                                value-color
-                                (if (eq? sh #\?)
-                                    opt-color
-                                    paren-color))])
-              (advance c init-line! srcless-step)
-              (let ([quote-depth (if (struct-proxy? (syntax-e c))
-                                     quote-depth
-                                     (to-quoted c expr? quote-depth out color? inc-src-col))])
-                (when (and expr? (zero? quote-depth))
-                  (out "(" p-color)
-                  (unless no-cons?
-                    (out (let ([s (cond 
-                                   [(pair? (syntax-e c))
-                                    (if (syntax->list c)
-                                        "list"
-                                        (if (let ([d (cdr (syntax-e c))])
-                                              (or (pair? d)
-                                                  (and (syntax? d)
-                                                       (pair? (syntax-e d)))))
-                                            "list*"
-                                            "cons"))]
-                                   [(vector? (syntax-e c)) "vector"]
-                                   [(mpair? (syntax-e c)) "mcons"]
-                                   [else (iformat "~a"
-                                                  (if (struct-proxy? (syntax-e c)) 
-                                                      (syntax-e (struct-proxy-name (syntax-e c)))
-                                                      (object-name (syntax-e c))))])])
-                           (set! src-col (+ src-col (if (struct-proxy? (syntax-e c)) 
-                                                        1 
-                                                        (string-length s))))
-                           s)
-                         symbol-color)
-                    (unless (and (struct-proxy? (syntax-e c))
-                                 (null? (struct-proxy-content (syntax-e c))))
-                      (out " " #f))))
-                (when (vector? (syntax-e c))
-                  (unless (and expr? (zero? quote-depth))
-                    (let ([vec (syntax-e c)])
-                      (out "#" p-color)
-                      (if (zero? (vector-length vec))
-                          (set! src-col (+ src-col (- (syntax-span c) 2)))
-                          (set! src-col (+ src-col (- (syntax-column (vector-ref vec 0))
-                                                      (syntax-column c)
-                                                      1)))))))
-                (when (struct? (syntax-e c))
-                  (unless (and expr? (zero? quote-depth))
-                    (out "#s" p-color)
-                    (set! src-col (+ src-col 2))))
-                (unless (and expr? (zero? quote-depth))
-                  (out (case sh
-                         [(#\[ #\?) "["]
-                         [(#\{) "{"]
-                         [else "("])
-                       p-color))
-                (set! src-col (+ src-col 1))
-                (hash-set! next-col-map src-col dest-col)
-                (let lloop ([l (cond
-                                [(vector? (syntax-e c))
-                                 (vector->short-list (syntax-e c) syntax-e)]
-                                [(struct? (syntax-e c))
-                                 (let ([l (vector->list (struct->vector (syntax-e c)))])
-                                   ;; Need to build key datum, syntax-ize it internally, and
-                                   ;;  set the overall width to fit right:
-                                   (if (and expr? (zero? quote-depth))
-                                       (cdr l)
-                                       (cons (let ([key (syntax-ize (prefab-struct-key (syntax-e c))
-                                                                    (+ 3 (or (syntax-column c) 0))
-                                                                    (or (syntax-line c) 1))]
-                                                   [end (if (pair? (cdr l))
-                                                            (and (equal? (syntax-line c) (syntax-line (cadr l)))
-                                                                 (syntax-column (cadr l)))
-                                                            (and (syntax-column c)
-                                                                 (+ (syntax-column c) (syntax-span c))))])
-                                               (if end
-                                                   (datum->syntax #f
-                                                                  (syntax-e key)
-                                                                  (vector #f (syntax-line key)
-                                                                          (syntax-column key)
-                                                                          (syntax-position key)
-                                                                          (max 1 (- end 1 (syntax-column key)))))
-                                                   end))
-                                             (cdr l))))]
-                                [(struct-proxy? (syntax-e c))
-                                 (struct-proxy-content (syntax-e c))]
-                                [(forced-pair? (syntax-e c))
-                                 (syntax-e c)]
-                                [(mpair? (syntax-e c))
-                                 (syntax-e c)]
-                                [else c])]
-                            [first-expr? (and expr? 
-                                              (or (zero? quote-depth)
-                                                  (not (struct-proxy? (syntax-e c))))
-                                              (not no-cons?))]
-                            [dotted? #f]
-                            [srcless-step #f])
-                  (cond
-                   [(and (syntax? l)
-                         (pair? (syntax-e l))
-                         (not dotted?)
-                         (not (and (memq (syntax-e (car (syntax-e l)))
-                                         '(quote unquote syntax unsyntax quasiquote quasiunsyntax))
-                                   (let ([v (syntax->list l)])
-                                     (and v (= 2 (length v))))
-                                   (or (not expr?)
-                                       (quote-depth . > . 1)
-                                       (not (memq (syntax-e (car (syntax-e l))) 
-                                                  '(unquote unquote-splicing)))))))
-                    (lloop (syntax-e l) first-expr? #f srcless-step)]
-                   [(and (or (null? l)
-                             (and (syntax? l)
-                                  (null? (syntax-e l)))))
-                    (void)]
-                   [(and (pair? l) (not dotted?))
-                    ((loop init-line! quote-depth first-expr? #f) (car l) srcless-step)
-                    (lloop (cdr l) expr? #f 1)]
-                   [(forced-pair? l)
-                    ((loop init-line! quote-depth first-expr? #f) (forced-pair-car l) srcless-step)
-                    (lloop (forced-pair-cdr l) expr? #t 1)]
-                   [(mpair? l)
-                    ((loop init-line! quote-depth first-expr? #f) (mcar l) srcless-step)
-                    (lloop (mcdr l) expr? #t 1)]
-                   [else
-                    (unless (and expr? (zero? quote-depth))
-                      (advance l init-line! (and srcless-step (+ srcless-step 3)) -2)
-                      (out ". " (if (positive? quote-depth) value-color paren-color))
-                      (set! src-col (+ src-col 3)))
-                    (hash-set! next-col-map src-col dest-col)
-                    ((loop init-line! quote-depth first-expr? #f) l (if (and expr? (zero? quote-depth))
-                                                                        srcless-step
-                                                                        #f))]))
-                (out (case sh
-                       [(#\[ #\?) "]"]
-                       [(#\{) "}"]
-                       [else ")"])
-                     p-color)
-                (set! src-col (+ src-col 1))))]
-           [(box? (syntax-e c))
-            (advance c init-line! srcless-step)
-            (let ([quote-depth (to-quoted c expr? quote-depth out color? inc-src-col)])
-              (if (and expr? (zero? quote-depth))
-                  (begin
-                    (out "(" paren-color)
-                    (out "box" symbol-color)
-                    (out " " #f)
-                    (set! src-col (+ src-col 5)))
-                  (begin
-                    (out "#&" value-color)
-                    (set! src-col (+ src-col 2))))
-              (hash-set! next-col-map src-col dest-col)
-              ((loop init-line! (if expr? quote-depth +inf.0) expr? #f) (unbox (syntax-e c)) #f)
-              (when (and expr? (zero? quote-depth))
-                (out ")" paren-color)))]
-           [(hash? (syntax-e c))
-            (advance c init-line! srcless-step)
-            (let ([equal-table? (hash-equal? (syntax-e c))]
-                  [eqv-table? (hash-eqv? (syntax-e c))]
-                  [quote-depth (to-quoted c expr? quote-depth out color? inc-src-col)])
-              (unless (and expr? (zero? quote-depth))
-                (out (if equal-table?
-                         "#hash"
-                         (if eqv-table?
-                             "#hasheqv"
-                             "#hasheq"))
-                     value-color))
-              (let ([delta (+ 5 (if equal-table? 0 (if eqv-table? 3 2))
-                              (if (and expr? (zero? quote-depth)) 1 0))]
-                    [orig-col src-col])
-                (set! src-col (+ src-col delta))
-                (hash-set! next-col-map src-col dest-col)
-                ((loop init-line! (if expr? quote-depth +inf.0) expr? (and expr? (zero? quote-depth)))
-                 (let*-values ([(l) (sort (hash-map (syntax-e c) cons)
-                                          (lambda (a b)
-                                            (< (or (syntax-position (cdr a)) -inf.0)
-                                               (or (syntax-position (cdr b)) -inf.0))))]
-                               [(sep cap) (if (and expr? (zero? quote-depth))
-                                              (values 1 0)
-                                              (values 3 1))]
-                               [(col0) (+ (syntax-column c) delta cap 1)]
-                               [(l2 pos line) (for/fold ([l2 null][col col0][line (syntax-line c)]) 
-                                                  ([p (in-list l)])
-                                                (let* ([tentative (syntax-ize (car p) 0
-                                                                              #:expr? (and expr? (zero? quote-depth)))]
-                                                       [width (syntax-span tentative)]
-                                                       [col (if (= line (syntax-line (cdr p)))
-                                                                col
-                                                                col0)])
-                                                  (let ([key
-                                                         (let ([e (syntax-ize (car p)
-                                                                              (max 0 (- (syntax-column (cdr p)) 
-                                                                                        width
-                                                                                        sep))
-                                                                              (syntax-line (cdr p))
-                                                                              #:expr? (and expr? (zero? quote-depth)))])
-                                                           (if ((syntax-column e) . <= . col)
-                                                               e
-                                                               (datum->syntax #f 
-                                                                              (syntax-e e)
-                                                                              (vector (syntax-source e)
-                                                                                      (syntax-line e)
-                                                                                      col
-                                                                                      (syntax-position e)
-                                                                                      (+ (syntax-span e) (- (syntax-column e) col))))))])
-                                                    (let ([elem
-                                                           (datum->syntax
-                                                            #f
-                                                            (make-forced-pair key (cdr p))
-                                                            (vector 'here 
-                                                                    (syntax-line (cdr p))
-                                                                    (max 0 (- (syntax-column key) cap))
-                                                                    (max 1 (- (syntax-position key) cap))
-                                                                    (+ (syntax-span (cdr p)) (syntax-span key) sep cap cap)))])
-                                                      (values (cons elem l2)
-                                                              (+ (syntax-column elem) (syntax-span elem) 2)
-                                                              (syntax-line elem))))))])
-                   (if (and expr? (zero? quote-depth))
-                       ;; constructed:
-                       (let ([l (apply append
-                                       (map (lambda (p) 
-                                              (let ([p (syntax-e p)])
-                                                (list (forced-pair-car p) 
-                                                      (forced-pair-cdr p))))
-                                            (reverse l2)))])
-                         (datum->syntax 
-                          #f
-                          (cons (let ([s (if equal-table?
-                                             'hash
-                                             (if eqv-table?
-                                                 'hasheqv
-                                                 'hasheq))])
-                                  (datum->syntax #f 
-                                                 s
-                                                 (vector (syntax-source c)
-                                                         (syntax-line c)
-                                                         (+ (syntax-column c) 1)
-                                                         (+ (syntax-position c) 1)
-                                                         (string-length (symbol->string s)))))
-                                l)
-                          c))
-                       ;; quoted:
-                       (datum->syntax #f (reverse l2) (vector (syntax-source c)
-                                                              (syntax-line c)
-                                                              (+ (syntax-column c) delta)
-                                                              (+ (syntax-position c) delta)
-                                                              (max 1 (- (syntax-span c) delta))))))
-                 #f)
-                (set! src-col (+ orig-col (syntax-span c)))))]
-           [(graph-reference? (syntax-e c))
-            (advance c init-line! srcless-step)
-            (out (iformat "#~a#" (unbox (graph-reference-bx (syntax-e c)))) 
-                 (if (positive? quote-depth) 
-                     value-color
-                     paren-color))
-            (set! src-col (+ src-col (syntax-span c)))]
-           [(graph-defn? (syntax-e c))
-            (advance c init-line! srcless-step)
-            (let ([bx (graph-defn-bx (syntax-e c))])
-              (out (iformat "#~a=" (unbox bx))
-                   (if (positive? quote-depth) 
-                       value-color
-                       paren-color))
-              (set! src-col (+ src-col 3))
-              ((loop init-line! quote-depth expr? #f) (graph-defn-r (syntax-e c)) #f))]
-           [(and (keyword? (syntax-e c)) expr?)
-            (advance c init-line! srcless-step)
-            (let ([quote-depth (to-quoted c expr? quote-depth out color? inc-src-col)])
-              (typeset-atom c out color? quote-depth expr? escapes? defn?)
-              (set! src-col (+ src-col (or (syntax-span c) 1))))]
-           [else
-            (advance c init-line! srcless-step)
-            (typeset-atom c out color? quote-depth expr? escapes? defn?)
-            (set! src-col (+ src-col (or (syntax-span c) 1)))
-            #;
-            (hash-set! next-col-map src-col dest-col)])))
-      (out prefix1 #f)
-      (set! dest-col 0)
-      (hash-set! next-col-map init-col dest-col)
-      ((loop (lambda () (set! src-col init-col) (set! dest-col 0)) 0 expr? #f) c #f)
-      (if (list? suffix)
-          (map (lambda (sfx)
-                 (finish-line!)
-                 (out sfx #f))
-               suffix)
-          (out suffix #f))
-      (unless (null? content)
-        (finish-line!))
-      (if multi-line?
-          (if (= 1 (length docs))
-              (car docs)
-              (make-table block-color (map list (reverse docs))))
-          (make-sized-element #f (reverse content) dest-col))))
-
-  (define (typeset c multi-line? prefix1 prefix suffix color? expr? escapes? defn? elem-wrap)
-    (let* ([c (syntax-ize c 0 #:expr? expr?)]
-           [s (syntax-e c)])
-      (if (or multi-line?
-              (and escapes? (eq? 'code:blank s))
-              (pair? s)
-              (mpair? s)
-              (vector? s)
-              (struct? s)
-              (box? s)
-              (null? s)
-              (hash? s)
-              (graph-defn? s)
-              (graph-reference? s)
-              (struct-proxy? s)
-              (and expr? (or (identifier? c)
-                             (keyword? (syntax-e c)))))
-          (gen-typeset c multi-line? prefix1 prefix suffix color? expr? escapes? defn? elem-wrap)
-          (typeset-atom c 
-                        (letrec ([mk
-                                  (case-lambda 
-                                   [(elem color)
-                                    (mk elem color (or (syntax-span c) 1))]
-                                   [(elem color len)
-                                    (elem-wrap
-                                     (if (and (string? elem)
-                                              (= len (string-length elem)))
-                                         (make-element/cache (and color? color) elem)
-                                         (make-sized-element (and color? color) elem len)))])])
-                          mk)
-                        color? 0 expr? escapes? defn?))))
-  
-  (define (to-element c
-                      #:expr? [expr? #f]
-                      #:escapes? [escapes? #t]
-                      #:defn? [defn? #f])
-    (typeset c #f "" "" "" #t expr? escapes? defn? values))
-
-  (define (to-element/no-color c
-                               #:expr? [expr? #f]
-                               #:escapes? [escapes? #t])
-    (typeset c #f "" "" "" #f expr? escapes? #f values))
-
-  (define (to-paragraph c 
-                        #:expr? [expr? #f] 
-                        #:escapes? [escapes? #t] 
-                        #:color? [color? #t]
-                        #:wrap-elem [elem-wrap (lambda (e) e)])
-    (typeset c #t "" "" "" color? expr? escapes? #f elem-wrap))
-
-  (define ((to-paragraph/prefix pfx1 pfx sfx) c 
-           #:expr? [expr? #f] 
-           #:escapes? [escapes? #t] 
-           #:color? [color? #t]
-           #:wrap-elem [elem-wrap (lambda (e) e)])
-    (typeset c #t pfx1 pfx sfx color? expr? escapes? #f elem-wrap))
-
-  (begin-for-syntax 
-   (define-struct variable-id (sym) 
-     #:omit-define-syntaxes
-     #:property prop:procedure (lambda (self stx)
-                                 (raise-syntax-error
-                                  #f
-                                  (string-append
-                                   "misuse of an identifier (not in `racket', etc.) that is"
-                                   " bound as a code-typesetting variable")
-                                  stx)))
-   (define-struct element-id-transformer (proc) 
-     #:omit-define-syntaxes
-     #:property prop:procedure (lambda (self stx)
-                                 (raise-syntax-error
-                                  #f
-                                  (string-append
-                                   "misuse of an identifier (not in `racket', etc.) that is"
-                                   " bound as an code-typesetting element transformer")
-                                  stx))))
-
-  (define-syntax (define-code stx)
-    (syntax-case stx ()
-      [(_ code typeset-code uncode d->s stx-prop)
-       (syntax/loc stx
-	 (define-syntax (code stx)
-           (define (wrap-loc v ctx e)
-             `(,#'d->s ,ctx
-                       ,e
-                       #(code
-                         ,(syntax-line v)
-                         ,(syntax-column v)
-                         ,(syntax-position v)
-                         ,(syntax-span v))))
-           (define (stx->loc-s-expr/esc v uncode-id)
-             (define (stx->loc-s-expr v)
-               (let ([slv (and (identifier? v)
-                               (syntax-local-value v (lambda () #f)))])
-                 (cond
-                  [(variable-id? slv)
-                   (wrap-loc v #f `(,#'make-var-id ',(variable-id-sym slv)))]
-                  [(element-id-transformer? slv)
-                   (wrap-loc v #f ((element-id-transformer-proc slv) v))]
-                  [(syntax? v)
-                   (let ([mk (wrap-loc
-                              v
-                              `(quote-syntax ,(datum->syntax v 'defcode))
-                              (syntax-case v ()
-                                [(esc e) 
-                                 (and (identifier? #'esc)
-                                      (free-identifier=? #'esc uncode-id))
-                                 #'e]
-                                [else (stx->loc-s-expr (syntax-e v))]))])
-                     (let ([prop (syntax-property v 'paren-shape)])
-                       (if prop
-                           `(,#'stx-prop ,mk 'paren-shape ,prop)
-                           mk)))]
-                  [(null? v) 'null]
-                  [(list? v) `(list . ,(map stx->loc-s-expr v))]
-                  [(pair? v) `(cons ,(stx->loc-s-expr (car v))
-                                    ,(stx->loc-s-expr (cdr v)))]
-                  [(vector? v) `(vector ,@(map
-                                           stx->loc-s-expr
-                                           (vector->list v)))]
-                  [(and (struct? v) (prefab-struct-key v))
-                   `(make-prefab-struct (quote ,(prefab-struct-key v))
-                                        ,@(map
-                                           stx->loc-s-expr
-                                           (cdr (vector->list (struct->vector v)))))]
-                  [(box? v) `(box ,(stx->loc-s-expr (unbox v)))]
-                  [(hash? v) `(,(cond
-                                 [(hash-eq? v) 'make-immutable-hasheq]
-                                 [(hash-eqv? v) 'make-immutable-hasheqv]
-                                 [else 'make-immutable-hash])
-                               (list
-                                ,@(hash-map
-                                   v
-                                   (lambda (k v)
-                                     `(cons (quote ,k)
-                                            ,(stx->loc-s-expr v))))))]
-                  [else `(quote ,v)])))
-             (stx->loc-s-expr v))
-	   (define (cvt s uncode-id)
-	     (datum->syntax #'here (stx->loc-s-expr/esc s uncode-id) #f))
-           (if (eq? (syntax-local-context) 'expression)
-               (syntax-case stx ()
-                 [(_ #:escape uncode-id expr) #`(typeset-code #,(cvt #'expr #'uncode-id))]
-                 [(_ expr) #`(typeset-code #,(cvt #'expr #'uncode))]
-                 [(_ #:escape uncode-id expr (... ...))
-                  #`(typeset-code #,(cvt #'(code:line expr (... ...)) #'uncode-id))]
-                 [(_ expr (... ...))
-                  #`(typeset-code #,(cvt #'(code:line expr (... ...)) #'uncode))])
-               (quasisyntax/loc stx
-                 (#%expression #,stx)))))]
-      [(_ code typeset-code uncode d->s)
-       #'(define-code code typeset-code uncode d->s syntax-property)]
-      [(_ code typeset-code uncode)
-       #'(define-code code typeset-code uncode datum->syntax syntax-property)]
-      [(_ code typeset-code) #'(define-code code typeset-code unsyntax)]))
-
-  
-  (define syntax-ize-hook (make-parameter (lambda (v col) #f)))
-
-  (define (vector->short-list v extract)
-    (vector->list v)
-    #;
-    (let ([l (vector->list v)])
-      (reverse (list-tail
-                (reverse l)
-                (- (vector-length v)
-                   (let loop ([i (sub1 (vector-length v))])
-                     (cond
-                      [(zero? i) 1]
-                      [(eq? (extract (vector-ref v i))
-                            (extract (vector-ref v (sub1 i))))
-                       (loop (sub1 i))]
-                      [else (add1 i)])))))))
-
-  (define (short-list->vector v l)
-    (list->vector
-     (let ([n (length l)])
-       (if (n . < . (vector-length v))
-           (reverse (let loop ([r (reverse l)][i (- (vector-length v) n)])
-                      (if (zero? i)
-                          r
-                          (loop (cons (car r) r) (sub1 i)))))
-           l))))
-
-  (define-struct var-id (sym))
-  (define-struct shaped-parens (val shape))
-  (define-struct long-boolean (val))
-  (define-struct just-context (val ctx))
-  (define-struct alternate-display (id string))
-  (define-struct literal-syntax (stx))
-  (define-struct struct-proxy (name content))
-
-  (define-struct graph-reference (bx))
-  (define-struct graph-defn (r bx))
-
-  (define (syntax-ize v col [line 1] #:expr? [expr? #f])
-    (do-syntax-ize v col line (box #hasheq()) #f (and expr? 0) #f))
-
-  (define (graph-count ht graph?)
-    (and graph?
-         (let ([n (hash-ref (unbox ht) '#%graph-count 0)])
-           (set-box! ht (hash-set (unbox ht) '#%graph-count (add1 n)))
-           n)))
-
-  (define-struct forced-pair (car cdr))
-
-  (define (quotable? v)
-    (define graph (make-hasheq))
-    (let quotable? ([v v])
-      (if (hash-ref graph v #f)
-          #t
-          (begin
-            (hash-set! graph v #t)
-            (cond
-             [(syntax? v) (quotable? (syntax-e v))]
-             [(pair? v) (and (quotable? (car v))
-                             (quotable? (cdr v)))]
-             [(vector? v) (andmap quotable? (vector->list v))]
-             [(hash? v) (for/and ([(k v) (in-hash v)])
-                          (and (quotable? k)
-                               (quotable? v)))]
-             [(box? v) (quotable? (unbox v))]
-             [(and (struct? v)
-                   (prefab-struct-key v))
-              (andmap quotable? (vector->list (struct->vector v)))]
-             [(struct? v) (if (custom-write? v)
-                              (case (or (and (custom-print-quotable? v)
-                                             (custom-print-quotable-accessor v))
-                                        'self)
-                                [(self always) #t]
-                                [(never) #f]
-                                [(maybe)
-                                 (andmap quotable? (vector->list (struct->vector v)))])
-                              #f)]
-             [(struct-proxy? v) #f]
-             [(mpair? v) #f]
-             [else #t])))))
-
-  (define (do-syntax-ize v col line ht graph? qq no-cons?)
-    (cond
-     [((syntax-ize-hook) v col)
-      => (lambda (r) r)]
-     [(shaped-parens? v)
-      (syntax-property (do-syntax-ize (shaped-parens-val v) col line ht #f qq #f)
-                       'paren-shape
-                       (shaped-parens-shape v))]
-     [(long-boolean? v)
-      (datum->syntax #f
-                     (and (long-boolean-val v) #t) 
-                     (vector #f line col (+ 1 col) (if (long-boolean-val v) 5 6)))]
-     [(just-context? v)
-      (let ([s (do-syntax-ize (just-context-val v) col line ht #f qq #f)])
-        (datum->syntax (just-context-ctx v)
-                       (syntax-e s)
-                       s
-                       s
-                       (just-context-ctx v)))]
-     [(alternate-display? v)
-      (let ([s (do-syntax-ize (alternate-display-id v) col line ht #f qq #f)])
-        (syntax-property s
-                         'display-string
-                         (alternate-display-string v)))]
-     [(hash-ref (unbox ht) v #f)
-      => (lambda (m)
-           (unless (unbox m)
-             (set-box! m #t))
-           (datum->syntax #f
-                          (make-graph-reference m)
-                          (vector #f line col (+ 1 col) 1)))]
-     [(and qq 
-           (zero? qq)
-           (or (pair? v)
-               (forced-pair? v)
-               (vector? v)
-               (hash? v)
-               (box? v)
-               (and (struct? v)
-                    (prefab-struct-key v)))
-           (quotable? v)
-           (not no-cons?))
-      ;; Add a quote:
-      (let ([l (do-syntax-ize v (add1 col) line ht #f 1 #f)])
-        (datum->syntax #f
-                       (syntax-e l)
-                       (vector (syntax-source l)
-                               (syntax-line l)
-                               (sub1 (syntax-column l))
-                               (max 0 (sub1 (syntax-position l)))
-                               (add1 (syntax-span l)))))]
-     [(and (list? v)
-           (pair? v)
-           (or (not qq)
-               (positive? qq)
-               (quotable? v))
-           (let ([s (let ([s (car v)])
-                      (if (just-context? s)
-                          (just-context-val s)
-                          s))])
-             (memq s '(quote unquote unquote-splicing)))
-           (not no-cons?))
-      => (lambda (s)
-           (let* ([delta (if (and qq (zero? qq))
-                             1
-                             0)]
-                  [c (do-syntax-ize (cadr v) (+ col delta) line ht #f qq #f)])
-             (datum->syntax #f
-                            (list (do-syntax-ize (car v) col line ht #f qq #f)
-                                  c)
-                            (vector #f line col (+ 1 col)
-                                    (+ delta
-                                       (syntax-span c))))))]
-     [(or (list? v)
-          (vector? v)
-          (and (struct? v)
-               (or (and qq 
-                        ;; Watch out for partially transparent subtypes of `element'
-                        ;;  or convertible values:
-                        (not (convertible? v))
-                        (not (element? v)))
-                   (prefab-struct-key v))))
-      (let ([orig-ht (unbox ht)]
-            [graph-box (box (graph-count ht graph?))])
-        (set-box! ht (hash-set (unbox ht) v graph-box))
-        (let* ([graph-sz (if graph? 
-                             (+ 2 (string-length (format "~a" (unbox graph-box)))) 
-                             0)]
-               [vec-sz (cond
-                        [(vector? v)
-                         (if (and qq (zero? qq)) 0 1)]
-                        [(struct? v)
-                         (if (and (prefab-struct-key v)
-                                  (or (not qq) (positive? qq)))
-                             2
-                             0)]
-                        [else 0])]
-               [delta (if (and qq (zero? qq))
-                          (cond
-                           [(vector? v) 8] ; `(vector '
-                           [(struct? v) 1] ; '('
-                           [no-cons? 1]    ; '('
-                           [else 6])       ; `(list '
-                          1)]
-               [r (let ([l (let loop ([col (+ col delta vec-sz graph-sz)]
-                                      [v (cond
-                                          [(vector? v)
-                                           (vector->short-list v values)]
-                                          [(struct? v)
-                                           (cons (let ([pf (prefab-struct-key v)])
-                                                   (if pf
-                                                       (prefab-struct-key v)
-                                                       (object-name v)))
-                                                 (cdr (vector->list (struct->vector v qq-ellipses))))]
-                                          [else v])])
-                             (if (null? v)
-                                 null
-                                 (let ([i (do-syntax-ize (car v) col line ht #f qq #f)])
-                                   (cons i
-                                         (loop (+ col 1 (syntax-span i)) (cdr v))))))])
-                    (datum->syntax #f
-                                   (cond
-                                    [(vector? v) (short-list->vector v l)]
-                                    [(struct? v) 
-                                     (let ([pf (prefab-struct-key v)])
-                                       (if pf
-                                           (apply make-prefab-struct (prefab-struct-key v) (cdr l))
-                                           (make-struct-proxy (car l) (cdr l))))]
-                                    [else l])
-                                   (vector #f line 
-                                           (+ graph-sz col) 
-                                           (+ 1 graph-sz col) 
-                                           (+ 1
-                                              vec-sz
-                                              delta
-                                              (if (zero? (length l))
-                                                  0
-                                                  (sub1 (length l)))
-                                              (apply + (map syntax-span l))))))])
-          (unless graph?
-            (set-box! ht (hash-set (unbox ht) v #f)))
-          (cond
-           [graph? (datum->syntax #f
-                                  (make-graph-defn r graph-box)
-                                  (vector #f (syntax-line r)
-                                          (- (syntax-column r) graph-sz)
-                                          (- (syntax-position r) graph-sz)
-                                          (+ (syntax-span r) graph-sz)))]
-           [(unbox graph-box)
-            ;; Go again, this time knowing that there will be a graph:
-            (set-box! ht orig-ht)
-            (do-syntax-ize v col line ht #t qq #f)]
-           [else r])))]
-     [(or (pair? v)
-          (mpair? v)
-          (forced-pair? v))
-      (let ([carv (if (pair? v) (car v) (if (mpair? v) (mcar v) (forced-pair-car v)))]
-            [cdrv (if (pair? v) (cdr v) (if (mpair? v) (mcdr v) (forced-pair-cdr v)))]
-            [orig-ht (unbox ht)]
-            [graph-box (box (graph-count ht graph?))])
-        (set-box! ht (hash-set (unbox ht) v graph-box))
-        (let* ([delta (if (and qq (zero? qq) (not no-cons?))
-                          (if (mpair? v)
-                              7 ; "(mcons "
-                              (if (or (list? cdrv)
-                                      (not (pair? cdrv)))
-                                  6 ; "(cons "
-                                  7)) ; "(list* "
-                          1)]
-               [inc (if graph? 
-                        (+ 2 (string-length (format "~a" (unbox graph-box)))) 
-                        0)]
-               [a (do-syntax-ize carv (+ col delta inc) line ht #f qq #f)]
-               [sep (if (and (pair? v)
-                             (pair? cdrv)
-                             ;; FIXME: what if it turns out to be a graph reference?
-                             (not (hash-ref (unbox ht) cdrv #f)))
-                        0 
-                        (if (and qq (zero? qq))
-                            1
-                            3))]
-               [b (do-syntax-ize cdrv (+ col delta inc (syntax-span a) sep) line ht #f qq #t)])
-          (let ([r (datum->syntax #f
-                                  (if (mpair? v)
-                                      (mcons a b)
-                                      (cons a b))
-                                  (vector #f line (+ col inc) (+ delta col inc)
-                                          (+ 1 delta
-                                             (if (and qq (zero? qq)) 1 0)
-                                             sep (syntax-span a) (syntax-span b))))])
-            (unless graph?
-              (set-box! ht (hash-set (unbox ht) v #f)))
-            (cond
-             [graph? (datum->syntax #f
-                                    (make-graph-defn r graph-box)
-                                    (vector #f line col (+ delta col)
-                                            (+ inc (syntax-span r))))]
-             [(unbox graph-box)
-              ;; Go again...
-              (set-box! ht orig-ht)
-              (do-syntax-ize v col line ht #t qq #f)]
-             [else r]))))]
-     [(box? v)
-      (let* ([delta (if (and qq (zero? qq))
-                        5 ; "(box "
-                        2)] ; "#&"
-             [a (do-syntax-ize (unbox v) (+ col delta) line ht #f qq #f)])
-        (datum->syntax #f
-                       (box a)
-                       (vector #f line col (+ 1 col)
-                               (+ delta (if (and qq (zero? qq)) 1 0) (syntax-span a)))))]
-     [(hash? v)
-      (let* ([delta (cond
-                     [(hash-eq? v) 7]
-                     [(hash-eqv? v) 8]
-                     [else 6])]
-             [undelta (if (and qq (zero? qq))
-                          (- delta 1)
-                          0)]
-             [pairs (if (and qq (zero? qq))
-                        (let ([ls (do-syntax-ize (apply append (hash-map v (lambda (k v) (list k v))))
-                                                 (+ col delta -1) line ht #f qq #t)])
-                          (datum->syntax 
-                           #f
-                           (let loop ([l (syntax->list ls)])
-                             (if (null? l)
-                                 null
-                                 (cons (cons (car l) (cadr l)) (loop (cddr l)))))
-                           ls))
-                        (do-syntax-ize (hash-map v make-forced-pair) (+ col delta) line ht #f qq #f))])
-        (datum->syntax #f
-                       ((cond
-                         [(hash-eq? v) make-immutable-hasheq]
-                         [(hash-eqv? v) make-immutable-hasheqv]
-                         [else make-immutable-hash])
-                        (map (lambda (p)
-                               (let ([p (syntax-e p)])
-                                 (cons (syntax->datum (car p))
-                                       (cdr p))))
-                             (syntax->list pairs)))
-                       (vector (syntax-source pairs)
-                               (syntax-line pairs)
-                               (max 0 (- (syntax-column pairs) undelta))
-                               (max 1 (- (syntax-position pairs) undelta))
-                               (+ (syntax-span pairs) undelta))))]
-     [else
-      (datum->syntax #f v (vector #f line col (+ 1 col) 1))])))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/racket.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/racket.tex
deleted file mode 100644
index fae0ceb72c..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/racket.tex
+++ /dev/null
@@ -1,74 +0,0 @@
-
-% Redefine \SColorize to produce B&W Scheme text
-\newcommand{\SColorize}[2]{\color{#1}{#2}}
-
-\newcommand{\inColor}[2]{{\Scribtexttt{\SColorize{#1}{#2}}}}
-\definecolor{PaleBlue}{rgb}{0.90,0.90,1.0}
-\definecolor{LightGray}{rgb}{0.90,0.90,0.90}
-\definecolor{CommentColor}{rgb}{0.76,0.45,0.12}
-\definecolor{ParenColor}{rgb}{0.52,0.24,0.14}
-\definecolor{IdentifierColor}{rgb}{0.15,0.15,0.50}
-\definecolor{ResultColor}{rgb}{0.0,0.0,0.69}
-\definecolor{ValueColor}{rgb}{0.13,0.55,0.13}
-\definecolor{OutputColor}{rgb}{0.59,0.00,0.59}
-
-\newcommand{\RktPlain}[1]{\inColor{black}{#1}}
-\newcommand{\RktKw}[1]{{\SColorize{black}{\Scribtexttt{#1}}}} % no \textbf anymore
-\newcommand{\RktStxLink}[1]{\RktKw{#1}}
-\newcommand{\RktStxDef}[1]{\RktStxLink{#1}}
-\newcommand{\RktCmt}[1]{\inColor{CommentColor}{#1}}
-\newcommand{\RktPn}[1]{\inColor{ParenColor}{#1}}
-\newcommand{\RktInBG}[1]{\inColor{ParenColor}{#1}}
-\newcommand{\RktSym}[1]{\inColor{IdentifierColor}{#1}}
-\newcommand{\RktSymDef}[1]{\RktSym{#1}}
-\newcommand{\RktVal}[1]{\inColor{ValueColor}{#1}}
-\newcommand{\RktValLink}[1]{\inColor{blue}{#1}}
-\newcommand{\RktValDef}[1]{\RktValLink{#1}}
-\newcommand{\RktModLink}[1]{\inColor{blue}{#1}}
-\newcommand{\RktRes}[1]{\inColor{ResultColor}{#1}}
-\newcommand{\RktOut}[1]{\inColor{OutputColor}{#1}}
-\newcommand{\RktMeta}[1]{\inColor{IdentifierColor}{#1}}
-\newcommand{\RktMod}[1]{\inColor{black}{#1}}
-\newcommand{\RktRdr}[1]{\inColor{black}{#1}}
-\newcommand{\RktVarCol}[1]{\inColor{IdentifierColor}{#1}}
-\newcommand{\RktVar}[1]{{\RktVarCol{\textsl{#1}}}}
-\newcommand{\RktErrCol}[1]{\inColor{red}{#1}}
-\newcommand{\RktErr}[1]{{\RktErrCol{\textrm{\textit{#1}}}}}
-\newcommand{\RktOpt}[1]{#1}
-\newcommand{\RktIn}[1]{\incolorbox{LightGray}{\RktInBG{#1}}}
-\newcommand{\highlighted}[1]{\colorbox{PaleBlue}{\hspace{-0.5ex}\RktInBG{#1}\hspace{-0.5ex}}}
-
-\newenvironment{RktBlk}{}{}
-\newenvironment{defmodule}{}{}
-\newenvironment{prototype}{}{}
-\newenvironment{argcontract}{}{}
-\newenvironment{together}{}{}
-
-\newenvironment{specgrammar}{}{}
-
-
-\newenvironment{RBibliography}{}{}
-\newcommand{\bibentry}[1]{\parbox[t]{0.8\linewidth}{#1}}
-
-\newenvironment{leftindent}{\begin{quote}}{\end{quote}}
-\newenvironment{insetpara}{\begin{quote}}{\end{quote}}
-
-\newcommand{\Rfilebox}[2]{\begin{list}{}{\topsep=0pt\partopsep=0pt%
-\listparindent=0pt\itemindent=0pt\labelwidth=0pt\leftmargin=0ex\rightmargin=0ex%
-\itemsep=0pt\parsep=0pt}\item #1
-
-#2\end{list}}
-\newcommand{\RfileboxBox}[3]{#3{\halign{\hfil##\cr #1 \cr #2 \cr}}}
-\newcommand{\RfileboxBoxT}[2]{\RfileboxBox{#1}{#2}{\vtop}}
-\newcommand{\RfileboxBoxC}[2]{\RfileboxBox{#1}{#2}{\Svcenter}}
-\newcommand{\RfileboxBoxB}[2]{\RfileboxBox{#1}{#2}{\vbox}}
-\newcommand{\Rfiletitle}[1]{\hfill \fbox{#1}}
-\newcommand{\RfiletitleBox}[1]{\fbox{#1}}
-\newcommand{\Rfilename}[1]{#1}
-\newenvironment{Rfilecontent}{}{}
-\newcommand{\RfilecontentBox}[1]{#1}
-
-\newcommand{\RBackgroundLabel}[1]{}
-\newenvironment{RBackgroundLabelInner}{}{}
-
-\newcommand{\RpackageSpec}[1]{\hspace{5ex} #1}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/render-struct.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/render-struct.rkt
deleted file mode 100644
index 24b27b5404..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/render-struct.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang scheme/base
-
-(require scheme/serialize)
-(provide (struct-out mobile-root))
-
-(define-serializable-struct mobile-root (path) 
-  #:mutable 
-  #:transparent)
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/render.rkt
deleted file mode 100644
index 75bf432205..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/render.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang racket/base
-
-(require "core.rkt"
-         "base-render.rkt"
-         "xref.rkt"
-         racket/file
-         racket/class
-         racket/contract/base
-         (prefix-in html:  "html-render.rkt"))
-
-(provide/contract 
- [render (((listof part?)
-           (listof path-string?))
-          (#:render-mixin
-           (class? . -> . class?)
-           #:dest-dir (or/c #f path-string?)
-           #:helper-file-prefix (or/c #f string?)
-           #:prefix-file (or/c #f path-string?)
-           #:style-file (or/c #f path-string?)
-           #:style-extra-files (listof path-string?)
-           #:extra-files (listof path-string?)
-           #:image-preferences (listof (or/c 'ps 'pdf 'png 'svg 'gif))
-           #:redirect (or/c #f string?)
-           #:redirect-main (or/c #f string?)
-           #:directory-depth exact-nonnegative-integer?
-           #:xrefs (listof xref?)
-           #:info-in-files (listof path-string?)
-           #:info-out-file (or/c #f path-string?)
-           #:quiet? any/c
-           #:warn-undefined? any/c)
-          . ->* . void?)])
-
-(define (render docs
-                names
-                #:render-mixin [render-mixin html:render-mixin]
-                #:dest-dir [dest-dir #f]
-                #:helper-file-prefix [helper-file-prefix #f]
-                #:prefix-file [prefix-file #f]
-                #:style-file [style-file #f]
-                #:style-extra-files [style-extra-files null]
-                #:extra-files [extra-files null]
-                #:image-preferences [image-preferences null]
-                #:redirect [redirect #f]
-                #:redirect-main [redirect-main #f]
-                #:directory-depth [directory-depth 0]
-                #:xrefs [xrefs null]
-                #:info-in-files [info-input-files null]
-                #:info-out-file [info-output-file #f]
-                #:quiet? [quiet? #t]
-                #:warn-undefined? [warn-undefined? (not quiet?)])
-  (when dest-dir (make-directory* dest-dir))
-  (let ([renderer (new (render-mixin render%)
-                       [dest-dir dest-dir]
-                       [prefix-file prefix-file]
-                       [style-file style-file]
-                       [style-extra-files style-extra-files]
-                       [extra-files extra-files]
-                       [image-preferences image-preferences]
-                       [helper-file-prefix helper-file-prefix])])
-    (when redirect
-      (send renderer set-external-tag-path redirect))
-    (when redirect-main
-      (send renderer set-external-root-url redirect-main))
-    (unless (zero? directory-depth)
-      (send renderer set-directory-depth directory-depth))
-    (unless quiet?
-      (send renderer report-output!))
-    (let* ([fns (map (lambda (fn)
-                       (let-values ([(base name dir?) (split-path fn)])
-                         (let ([fn (path-replace-suffix
-                                    name
-                                    (send renderer get-suffix))])
-                           (if dest-dir (build-path dest-dir fn) fn))))
-                     names)]
-           [fp (send renderer traverse docs fns)]
-           [info (send renderer collect docs fns fp)])
-      (for ([file (in-list info-input-files)])
-        (let ([s (with-input-from-file file read)])
-          (send renderer deserialize-info s info)))
-      (for ([xr (in-list xrefs)])
-        (xref-transfer-info renderer info xr))
-      (let ([r-info (send renderer resolve docs fns info)])
-        (send renderer render docs fns r-info)
-        (when info-output-file
-          (let ([s (send renderer serialize-info r-info)])
-            (with-output-to-file info-output-file
-              #:exists 'truncate/replace
-              (lambda () (write s)))))
-        (when warn-undefined?
-          (let ([undef (send renderer get-undefined r-info)])
-            (unless (null? undef)
-              (eprintf "Warning: some cross references may be broken due to undefined tags:\n")
-              (for ([t (in-list undef)])
-                (eprintf " ~s\n" t))))))
-      (void))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/report/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/report/lang.rkt
deleted file mode 100644
index 90dbae9be6..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/report/lang.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-(require scribble/doclang
-         scribble/base
-         "../private/defaults.rkt"
-         scribble/latex-prefix)
-
-(provide (except-out (all-from-out scribble/doclang) #%module-begin)
-         (all-from-out scribble/base)
-         (rename-out [module-begin #%module-begin]))
-
-(define-syntax-rule (module-begin id . body)
-  (#%module-begin id (post-process) () . body))
-
-(define ((post-process) doc)
-  (add-defaults doc
-                (string->bytes/utf-8 (string-append "\\documentclass{report}\n"
-                                                    unicode-encoding-packages))
-                (scribble-file "book/style.tex")
-                null
-                #f))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/report/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/report/lang/reader.rkt
deleted file mode 100644
index 51db5d6621..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/report/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang s-exp scribble/base/reader
-scribble/report/lang
-#:wrapper1 (lambda (t) (cons 'doc (t)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/run.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/run.rkt
deleted file mode 100644
index a3297d009e..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/run.rkt
+++ /dev/null
@@ -1,183 +0,0 @@
-#lang racket/base
-(require "xref.rkt"
-         "render.rkt"
-         scheme/cmdline
-         raco/command-name
-         (prefix-in text:     "text-render.rkt")
-         (prefix-in markdown: "markdown-render.rkt")
-         (prefix-in html:     "html-render.rkt")
-         (prefix-in latex:    "latex-render.rkt")
-         (prefix-in pdf:      "pdf-render.rkt"))
-
-(module test racket/base)
-
-(define multi-html:render-mixin
-  (lambda (%) (html:render-multi-mixin (html:render-mixin %))))
-
-(define current-render-mixin       (make-parameter html:render-mixin))
-(define current-html               (make-parameter #t))
-(define current-dest-directory     (make-parameter #f))
-(define current-dest-name          (make-parameter #f))
-(define current-info-output-file   (make-parameter #f))
-(define current-info-input-files   (make-parameter null))
-(define current-xref-input-modules (make-parameter null))
-(define current-prefix-file        (make-parameter #f))
-(define current-style-file         (make-parameter #f))
-(define current-style-extra-files  (make-parameter null))
-(define current-extra-files        (make-parameter null))
-(define current-redirect           (make-parameter #f))
-(define current-redirect-main      (make-parameter #f))
-(define current-directory-depth    (make-parameter 0))
-(define current-quiet              (make-parameter #f))
-(define helper-file-prefix         (make-parameter #f))
-(define doc-command-line-arguments (make-parameter null))
-(define current-image-prefs        (make-parameter null)) ; reverse order
-
-(define (read-one str)
-  (let ([i (open-input-string str)])
-    (with-handlers ([exn:fail:read? (lambda (x) #f)])
-      (let ([v (read i)])
-        (and (eof-object? (read i)) v)))))
-
-(define (run)
-  (command-line
-   #:program (short-program+command-name)
-   #:once-any
-   [("--html") "generate HTML-format output file (the default)"
-    (current-html #t)
-    (current-render-mixin html:render-mixin)]
-   [("--htmls") "generate HTML-format output directory"
-    (current-html #t)
-    (current-render-mixin multi-html:render-mixin)]
-   [("--html-tree") n "generate HTML-format output directories <n> deep"
-    (let ([nv (string->number n)])
-      (unless (exact-nonnegative-integer? nv)
-        (raise-user-error 'scribble
-                          "invalid depth: ~a"
-                          n))
-      (current-directory-depth nv)
-      (current-html #t)
-      (current-render-mixin (if (zero? nv)
-                                html:render-mixin
-                                multi-html:render-mixin)))]
-   [("--latex") "generate LaTeX-format output"
-    (current-html #f)
-    (current-render-mixin latex:render-mixin)]
-   [("--pdf") "generate PDF-format output (via PDFLaTeX)"
-    (current-html #f)
-    (current-render-mixin pdf:render-mixin)]
-   [("--dvipdf") "generate PDF-format output (via LaTeX, dvips, and pstopdf)"
-    (current-html #f)
-    (current-render-mixin pdf:dvi-render-mixin)]
-   [("--latex-section") n "generate LaTeX-format output for section depth <n>"
-    (current-html #f)
-    (let ([v (string->number n)])
-      (unless (exact-nonnegative-integer? v)
-        (raise-user-error 'scribble (format "bad section depth: ~a" n)))
-      (current-render-mixin (latex:make-render-part-mixin v)))]
-   [("--text") "generate text-format output"
-    (current-html #f)
-    (current-render-mixin text:render-mixin)]
-   [("--markdown") "generate markdown-format output"
-    (current-html #f)
-    (current-render-mixin markdown:render-mixin)]
-   #:once-each
-   [("--dest") dir "write output in <dir>"
-    (current-dest-directory dir)]
-   [("--dest-name") name "write output as <name>"
-    (current-dest-name name)]
-   [("--dest-base") prefix "start support-file names with <prefix>"
-    (helper-file-prefix prefix)]
-   #:multi
-   [("++convert") fmt ("prefer image conversion to <fmt> (in given order)"
-                       " <fmt> as one of: ps pdf svg png gif")
-    (define sym (string->symbol fmt))
-    (unless (member sym '(ps pdf svg png gif))
-      (raise-user-error 'scribble "bad format for ++convert: ~s" fmt))
-    (current-image-prefs (cons sym (current-image-prefs)))]
-   [("++style") file "add given .css/.tex file after others"
-    (current-style-extra-files (cons file (current-style-extra-files)))]
-   #:once-each
-   [("--style") file "use given base .css/.tex file"
-    (current-style-file file)]
-   [("--prefix") file "use given .html/.tex prefix (for doctype/documentclass)"
-    (current-prefix-file file)]
-   #:multi
-   [("++extra") file "add given file"
-    (current-extra-files (cons file (current-extra-files)))]
-   [("--redirect-main") url "redirect main doc links to <url>"
-    (current-redirect-main url)]
-   [("--redirect") url "redirect external links to tag search via <url>"
-    (current-redirect url)]
-   [("+m" "++main-xref-in") ("load format-speficic cross-ref info for"
-                             "all installed library collections")
-    (current-xref-input-modules
-     (cons (cons 'setup/xref 'load-collections-xref) (current-xref-input-modules)))]
-   [("++xref-in") module-path proc-id ("load format-specific cross-ref info by"
-                                       "calling <proc-id> as exported by <module-path>")
-    (let ([mod (read-one module-path)]
-          [id (read-one proc-id)])
-      (unless (module-path? mod)
-        (raise-user-error
-         'scribble "bad module path for ++ref-in: ~s" module-path))
-      (unless (symbol? id)
-        (raise-user-error
-         'scribble "bad procedure identifier for ++ref-in: ~s" proc-id))
-      (current-xref-input-modules
-       (cons (cons mod id) (current-xref-input-modules))))]
-   [("--info-out") file "write format-specific cross-ref info to <file>"
-    (current-info-output-file file)]
-   [("++info-in") file "load format-specific cross-ref info from <file>"
-    (current-info-input-files
-     (cons file (current-info-input-files)))]
-   [("++arg") arg "add <arg> to current-command-line-arguments"
-    (doc-command-line-arguments
-     (cons arg (doc-command-line-arguments)))]
-   #:once-each
-   [("--quiet") "suppress output-file and undefined-tag reporting"
-    (current-quiet #t)]
-   #:args (file . another-file)
-   (let ([files (cons file another-file)])
-     (parameterize ([current-command-line-arguments
-                     (list->vector (reverse (doc-command-line-arguments)))])
-       (build-docs (map (lambda (file) 
-                          ;; Try `doc' submodule, first:
-                          (if (module-declared? `(submod (file ,file) doc) #t)
-                              (dynamic-require `(submod (file ,file) doc) 'doc)
-                              (dynamic-require `(file ,file) 'doc)))
-                        files)
-                   files)))))
-
-(define (build-docs docs files)
-  (when (and (current-dest-name)
-             ((length files) . > . 1))
-    (raise-user-error 'scribble "cannot supply a destination name with multiple inputs"))
-  (render docs
-          (map (lambda (fn)
-                 (let-values ([(base name dir?) (split-path fn)])
-                   (or (current-dest-name) name)))
-               files)
-          #:dest-dir (current-dest-directory)
-          #:render-mixin (current-render-mixin)
-          #:image-preferences (reverse (current-image-prefs))
-          #:prefix-file (current-prefix-file)
-          #:style-file (current-style-file)
-          #:style-extra-files (reverse (current-style-extra-files))
-          #:extra-files (reverse (current-extra-files))
-          #:helper-file-prefix (helper-file-prefix)
-          #:redirect (and (current-html) (current-redirect))
-          #:redirect-main (and (current-html) (current-redirect-main))
-          #:directory-depth (current-directory-depth)
-          #:quiet? (current-quiet)
-          #:info-in-files (reverse (current-info-input-files))
-          #:xrefs (for/list ([mod+id (in-list (reverse (current-xref-input-modules)))])
-                    (let* ([get-xref (dynamic-require (car mod+id) (cdr mod+id))]
-                           [xr (get-xref)])
-                      (unless (xref? xr)
-                        (raise-user-error
-                         'scribble "result from `~s' of `~s' is not an xref: ~e"
-                         (cdr mod+id) (car mod+id) xr))
-                      xr))
-          #:info-out-file (current-info-output-file)))
-
-(run)
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scheme.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/scheme.rkt
deleted file mode 100644
index e7b113194c..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/scheme.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "racket.rkt")
-(provide (all-from-out "racket.rkt"))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-common.js b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-common.js
deleted file mode 100644
index 1ec7da5839..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-common.js
+++ /dev/null
@@ -1,170 +0,0 @@
-// Common functionality for PLT documentation pages
-
-// Page Parameters ------------------------------------------------------------
-
-var page_query_string = location.search.substring(1);
-
-var page_args =
-  ((function(){
-      if (!page_query_string) return [];
-      var args = page_query_string.split(/[&;]/);
-      for (var i=0; i<args.length; i++) {
-        var a = args[i];
-        var p = a.indexOf('=');
-        if (p >= 0) args[i] = [a.substring(0,p), a.substring(p+1)];
-        else args[i] = [a, false];
-      }
-      return args;
-    })());
-
-function GetPageArg(key, def) {
-  for (var i=0; i<page_args.length; i++)
-    if (page_args[i][0] == key) return decodeURIComponent(page_args[i][1]);
-  return def;
-}
-
-function MergePageArgsIntoLink(a) {
-  if (page_args.length == 0 ||
-      (!a.attributes["data-pltdoc"]) || (a.attributes["data-pltdoc"].value == ""))
-    return;
-  a.href = MergePageArgsIntoUrl(a.href);
-}
-
-function MergePageArgsIntoUrl(href) {
-    var mtch = href.match(/^([^?#]*)(?:\?([^#]*))?(#.*)?$/);
-    if (mtch == undefined) { // I think this never happens
-        return "?" + page_query_string;
-    }
-    if (!mtch[2]) {
-        return mtch[1] + "?" + page_query_string + (mtch[3] || "");
-    }
-    // need to merge here, precedence to arguments that exist in `a'
-    var i, j;
-    var prefix = mtch[1], str = mtch[2] || "", suffix = mtch[3] || "";
-    var args = str.split(/[&;]/);
-    for (i=0; i<args.length; i++) {
-      j = args[i].indexOf('=');
-      if (j) args[i] = args[i].substring(0,j);
-    }
-    var additions = "";
-    for (i=0; i<page_args.length; i++) {
-      var exists = false;
-      for (j=0; j<args.length; j++)
-        if (args[j] == page_args[i][0]) { exists = true; break; }
-      if (!exists) str += "&" + page_args[i][0] + "=" + page_args[i][1];
-    }
-    return prefix + "?" + str + suffix;
-}
-
-// Cookies --------------------------------------------------------------------
-
-// Actually, try localStorage (a la HTML 5), first.
-
-function GetCookie(key, def) {
-  try {
-    var v = localStorage[key];
-    if (!v) v = def;
-    return v;
-  } catch (e) {
-    var i, cookiestrs;
-    try {
-      if (document.cookie.length <= 0) return def;
-      cookiestrs = document.cookie.split(/; */);
-    } catch (e) { return def; }
-    for (i = 0; i < cookiestrs.length; i++) {
-      var cur = cookiestrs[i];
-      var eql = cur.indexOf('=');
-      if (eql >= 0 && cur.substring(0,eql) == key)
-        return unescape(cur.substring(eql+1));
-    }
-    return def;
-  }
-}
-
-function SetCookie(key, val) {
-  try {
-    localStorage[key] = val;
-  } catch(e) {
-    var d = new Date();
-    d.setTime(d.getTime()+(365*24*60*60*1000));
-    try {
-      document.cookie =
-        key + "=" + escape(val) + "; expires="+ d.toGMTString() + "; path=/";
-    } catch (e) {}
-  }
-}
-
-// note that this always stores a directory name, ending with a "/"
-function SetPLTRoot(ver, relative) {
-  var root = location.protocol + "//" + location.host
-           + NormalizePath(location.pathname.replace(/[^\/]*$/, relative));
-  SetCookie("PLT_Root."+ver, root);
-}
-
-// adding index.html works because of the above
-function GotoPLTRoot(ver, relative) {
-  var u = GetCookie("PLT_Root."+ver, null);
-  if (u == null) return true; // no cookie: use plain up link
-  // the relative path is optional, default goes to the toplevel start page
-  if (!relative) relative = "index.html";
-  location = u + relative;
-  return false;
-}
-
-// Utilities ------------------------------------------------------------------
-
-var normalize_rxs = [/\/\/+/g, /\/\.(\/|$)/, /\/[^\/]*\/\.\.(\/|$)/];
-function NormalizePath(path) {
-  var tmp, i;
-  for (i = 0; i < normalize_rxs.length; i++)
-    while ((tmp = path.replace(normalize_rxs[i], "/")) != path) path = tmp;
-  return path;
-}
-
-// `noscript' is problematic in some browsers (always renders as a
-// block), use this hack instead (does not always work!)
-// document.write("<style>mynoscript { display:none; }</style>");
-
-// Interactions ---------------------------------------------------------------
-
-function DoSearchKey(event, field, ver, top_path) {
-  var val = field.value;
-  if (event && event.keyCode == 13) {
-    var u = GetCookie("PLT_Root."+ver, null);
-    if (u == null) u = top_path; // default: go to the top path
-    u += "search/index.html?q=" + encodeURIComponent(val);
-    u = MergePageArgsIntoUrl(u);
-    location = u;
-    return false;
-  }
-  return true;
-}
-
-function TocviewToggle(glyph, id) {
-  var s = document.getElementById(id).style;
-  var expand = s.display == "none";
-  s.display = expand ? "block" : "none";
-  glyph.innerHTML = expand ? "&#9660;" : "&#9658;";
-}
-
-// Page Init ------------------------------------------------------------------
-
-// Note: could make a function that inspects and uses window.onload to chain to
-// a previous one, but this file needs to be required first anyway, since it
-// contains utilities for all other files.
-var on_load_funcs = [];
-function AddOnLoad(fun) { on_load_funcs.push(fun); }
-window.onload = function() {
-  for (var i=0; i<on_load_funcs.length; i++) on_load_funcs[i]();
-};
-
-AddOnLoad(function(){
-    var links = document.getElementsByTagName("a");
-    for (var i=0; i<links.length; i++) MergePageArgsIntoLink(links[i]);
-    var label = GetPageArg("ctxtname",false);
-    if (!label) return;
-    var indicator = document.getElementById("contextindicator");
-    if (!indicator) return;
-    indicator.innerHTML = label;
-    indicator.style.display = "block";
-  });
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.html b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.html
deleted file mode 100644
index f77a1b6e06..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.html
+++ /dev/null
@@ -1 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.tex
deleted file mode 100644
index e57dd4f9a3..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.tex
+++ /dev/null
@@ -1,5 +0,0 @@
-% This is the default prefix for Scribble-generated Latex
-\documentclass{article}
-
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-skull.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-skull.tex
deleted file mode 100644
index 3834c40a99..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-skull.tex
+++ /dev/null
@@ -1 +0,0 @@
-\usepackage{skull}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.css b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.tex
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.css b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.css
deleted file mode 100644
index 9733e69d6c..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.css
+++ /dev/null
@@ -1,484 +0,0 @@
-
-/* This file is used by default by all Scribble documents.
-   See also "manual.css", which is added by default by the
-   `scribble/manual` language. */
-
-/* CSS seems backward: List all the classes for which we want a
-   particular font, so that the font can be changed in one place.  (It
-   would be nicer to reference a font definition from all the places
-   that we want it.)
-
-   As you read the rest of the file, remember to double-check here to
-   see if any font is set. */
-
-/* Monospace: */
-.maincolumn, .refpara, .refelem, .tocset, .stt, .hspace, .refparaleft, .refelemleft {
-  font-family: monospace;
-}
-
-/* Serif: */
-.main, .refcontent, .tocview, .tocsub, .sroman, i {
-  font-family: serif;
-}
-
-/* Sans-serif: */
-.version, .versionNoNav, .ssansserif {
-  font-family: sans-serif;
-}
-.ssansserif {
-  font-size: 80%;
-  font-weight: bold;
-}
-
-/* ---------------------------------------- */
-
-p, .SIntrapara {
-  display: block;
-  margin: 1em 0;
-}
-
-h2 { /* per-page main title */
-  margin-top: 0;
-}
-
-h3, h4, h5, h6, h7, h8 {
-  margin-top: 1.75em;
-  margin-bottom: 0.5em;
-}
-
-.SSubSubSubSection {
-  font-weight: bold;
-  font-size: 0.83em; /* should match h5; from HTML 4 reference */
-}
-
-/* Needed for browsers like Opera, and eventually for HTML 4 conformance.
-   This means that multiple paragraphs in a table element do not have a space
-   between them. */
-table p {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-/* ---------------------------------------- */
-/* Main */
-
-body {
-  color: black;
-  background-color: #ffffff;
-}
-
-table td {
-  padding-left: 0;
-  padding-right: 0;
-}
-
-.maincolumn {
-  width: 43em;
-  margin-right: -40em;
-  margin-left: 15em;
-}
-
-.main {
-  text-align: left;
-}
-
-/* ---------------------------------------- */
-/* Navigation */
-
-.navsettop, .navsetbottom {
-  background-color: #f0f0e0;
-  padding: 0.25em 0 0.25em 0;
-}
-
-.navsettop {
-  margin-bottom: 1.5em;
-  border-bottom: 2px solid #e0e0c0;
-}
-
-.navsetbottom {
-  margin-top: 2em;
-  border-top: 2px solid #e0e0c0;
-}
-
-.navleft {
-  margin-left: 1ex;
-  position: relative;
-  float: left;
-  white-space: nowrap;
-}
-.navright {
-  margin-right: 1ex;
-  position: relative;
-  float: right;
-  white-space: nowrap;
-}
-.nonavigation {
-  color: #e0e0e0;
-}
-
-.searchform {
-  display: inline;
-  margin: 0;
-  padding: 0;
-}
-
-.nosearchform {
-  display: none;
-}
-
-.searchbox {
-  width: 16em;
-  margin: 0px;
-  padding: 0px;
-  background-color: #eee;
-  border: 1px solid #ddd;
-  text-align: center;
-  vertical-align: middle;
-}
-
-#contextindicator {
-  position: fixed;
-  background-color: #c6f;
-  color: #000;
-  font-family: monospace;
-  font-weight: bold;
-  padding: 2px 10px;
-  display: none;
-  right: 0;
-  bottom: 0;
-}
-
-/* ---------------------------------------- */
-/* Version */
-
-.versionbox {
-  position: relative;
-  float: right;
-  left: 2em;
-  height: 0em;
-  width: 13em;
-  margin: 0em -13em 0em 0em;
-}
-.version {
-  font-size: small;
-}
-.versionNoNav {
-  font-size: xx-small; /* avoid overlap with author */
-}
-
-.version:before, .versionNoNav:before {
-  content: "Version ";
-}
-
-/* ---------------------------------------- */
-/* Margin notes */
-
-.refpara, .refelem {
-  position: relative;
-  float: right;
-  left: 2em;
-  height: 0em;
-  width: 13em;
-  margin: 0em -13em 0em 0em;
-}
-
-.refpara, .refparaleft {
-  top: -1em;
-}
-
-.refcolumn {
-  background-color: #F5F5DC;
-  display: block;
-  position: relative;
-  width: 13em;
-  font-size: 85%;
-  border: 0.5em solid #F5F5DC;
-  margin: 0 0 0 0;
-}
-
-.refcontent {
-  margin: 0 0 0 0;
-}
-
-.refcontent p {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.refparaleft, .refelemleft {
-  position: relative;
-  float: left;
-  right: 2em;
-  height: 0em;
-  width: 13em;
-  margin: 0em 0em 0em -13em;
-}
-
-.refcolumnleft {
-  background-color: #F5F5DC;
-  display: block;
-  position: relative;
-  width: 13em;
-  font-size: 85%;
-  border: 0.5em solid #F5F5DC;
-  margin: 0 0 0 0;
-}
-
-
-/* ---------------------------------------- */
-/* Table of contents, inline */
-
-.toclink {
-  text-decoration: none;
-  color: blue;
-  font-size: 85%;
-}
-
-.toptoclink {
-  text-decoration: none;
-  color: blue;
-  font-weight: bold;
-}
-
-/* ---------------------------------------- */
-/* Table of contents, left margin */
-
-.tocset {
-  position: relative;
-  float: left;
-  width: 12.5em;
-  margin-right: 2em;
-}
-.tocset td {
-  vertical-align: text-top;
-}
-
-.tocview {
-  text-align: left;
-  background-color: #f0f0e0;
-}
-
-.tocsub {
-  text-align: left;
-  margin-top: 0.5em;
-  background-color: #f0f0e0;
-}
-
-.tocviewlist, .tocsublist {
-  margin-left: 0.2em;
-  margin-right: 0.2em;
-  padding-top: 0.2em;
-  padding-bottom: 0.2em;
-}
-.tocviewlist table {
-  font-size: 82%;
-}
-
-.tocviewlisttopspace {
-  margin-bottom: 1em;
-}
-
-.tocviewsublist, .tocviewsublistonly, .tocviewsublisttop, .tocviewsublistbottom {
-  margin-left: 0.4em;
-  border-left: 1px solid #bbf;
-  padding-left: 0.8em;
-}
-.tocviewsublist {
-  margin-bottom: 1em;
-}
-.tocviewsublist table,
-.tocviewsublistonly table,
-.tocviewsublisttop table,
-.tocviewsublistbottom table {
-  font-size: 75%;
-}
-
-.tocviewtitle * {
-  font-weight: bold;
-}
-
-.tocviewlink {
-  text-decoration: none;
-  color: blue;
-}
-
-.tocviewselflink {
-  text-decoration: underline;
-  color: blue;
-}
-
-.tocviewtoggle {
-  text-decoration: none;
-  color: blue;
-  font-size: 75%; /* looks better, and avoids bounce when toggling sub-sections due to font alignments */
-}
-
-.tocsublist td {
-  padding-left: 1em;
-  text-indent: -1em;
-}
-
-.tocsublinknumber {
-  font-size: 82%;
-}
-
-.tocsublink {
-  font-size: 82%;
-  text-decoration: none;
-}
-
-.tocsubseclink {
-  font-size: 82%;
-  text-decoration: none;
-}
-
-.tocsubnonseclink {
-  font-size: 82%;
-  text-decoration: none;
-  padding-left: 0.5em;
-}
-
-.tocsubtitle {
-  font-size: 82%;
-  font-style: italic;
-  margin: 0.2em;
-}
-
-/* ---------------------------------------- */
-/* Some inline styles */
-
-.indexlink {
-  text-decoration: none;
-}
-
-.nobreak {
-  white-space: nowrap;
-}
-
-pre { margin-left: 2em; }
-blockquote { margin-left: 2em; }
-
-ol          { list-style-type: decimal; }
-ol ol       { list-style-type: lower-alpha; }
-ol ol ol    { list-style-type: lower-roman; }
-ol ol ol ol { list-style-type: upper-alpha; }
-
-.SCodeFlow {
-  display: block;
-  margin-left: 1em;
-  margin-bottom: 0em;
-  margin-right: 1em;
-  margin-top: 0em;
-  white-space: nowrap;  
-}
-
-.SVInsetFlow {
-  display: block;
-  margin-left: 0em;
-  margin-bottom: 0em;
-  margin-right: 0em;
-  margin-top: 0em;
-}
-
-.SubFlow {
-  display: block;
-  margin: 0em;
-}
-
-.boxed {
-  width: 100%;
-  background-color: #E8E8FF;
-}
-
-.hspace {
-}
-
-.slant {
-  font-style: oblique;
-}
-
-.badlink {
-  text-decoration: underline;
-  color: red;
-}
-
-.plainlink {
-  text-decoration: none;
-  color: blue;
-}
-
-.techoutside       { text-decoration: underline; color: #b0b0b0; }
-.techoutside:hover { text-decoration: underline; color: blue; }
-
-/* .techinside:hover doesn't work with FF, .techinside:hover>
-   .techinside doesn't work with IE, so use both (and IE doesn't
-   work with inherit in the second one, so use blue directly) */
-.techinside                    { color: black; }
-.techinside:hover              { color: blue; }
-.techoutside:hover>.techinside { color: inherit; }
-
-.SCentered {
-  text-align: center;
-}
-
-.imageleft {
-  float: left;
-  margin-right: 0.3em;
-}
-
-.Smaller {
-  font-size: 82%;
-}
-
-.Larger {
-  font-size: 122%;
-}
-
-/* A hack, inserted to break some Scheme ids: */
-.mywbr {
-  display: inline-block;
-  height: 0;
-  width: 0;
-  font-size: 1px;
-}
-
-.compact li p {
-  margin: 0em;
-  padding: 0em;
-}
-
-.noborder img {
-  border: 0;
-}
-
-.SAuthorListBox {
-  position: relative;
-  float: right;
-  left: 2em;
-  top: -2.5em;
-  height: 0em;
-  width: 13em;
-  margin: 0em -13em 0em 0em;
-}
-.SAuthorList {
-  font-size: 82%;
-}
-.SAuthorList:before {
-  content: "by ";
-}
-.author {
-  display: inline;
-  white-space: nowrap;
-}
-
-/* print styles : hide the navigation elements */
-@media print {
-  .tocset,
-  .navsettop,
-  .navsetbottom { display: none; }
-  .maincolumn {
-    width: auto;
-    margin-right: 13em;
-    margin-left: 0;
-  }
-}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.tex
deleted file mode 100644
index f29ddfcc6c..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.tex
+++ /dev/null
@@ -1,395 +0,0 @@
-% This is the default style configuration for Scribble-generated Latex
- 
-\usepackage{graphicx}
-\usepackage{hyperref}
-\renewcommand{\rmdefault}{ptm}
-\usepackage{relsize}
-\usepackage{wasysym}
-\usepackage{textcomp}
-\usepackage{framed}
-\usepackage[htt]{hyphenat}
-\usepackage[usenames,dvipsnames]{color}
-\hypersetup{bookmarks=true,bookmarksopen=true,bookmarksnumbered=true}
-\IfFileExists{tocstyle.sty}{\usepackage{tocstyle}\usetocstyle{standard}}{}
-\IfFileExists{CJK.sty}{\usepackage{CJK}}{}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Configuration that is especially meant to be overridden:
-
-% Inserted before every ``chapter'', useful for starting each one on a new page:
-\newcommand{\sectionNewpage}{}
-% Inserted before every book ``part''
-\newcommand{\partNewpage}{\sectionNewpage}
-
-% Hooks for actions within the `document' environment:
-\newcommand{\preDoc}{}
-\newcommand{\postDoc}{}
-
-% Generated by `secref'; first arg is section number, second is section title:
-\newcommand{\BookRef}[2]{\emph{#2}}
-\newcommand{\ChapRef}[2]{\SecRef{#1}{#2}}
-\newcommand{\SecRef}[2]{section~#1}
-\newcommand{\PartRef}[2]{part~#1}
-% Generated by `Secref':
-\newcommand{\BookRefUC}[2]{\BookRef{#1}{#2}}
-\newcommand{\ChapRefUC}[2]{\SecRefUC{#1}{#2}}
-\newcommand{\SecRefUC}[2]{Section~#1}
-\newcommand{\PartRefUC}[2]{Part~#1}
-
-% Variants of the above with a label for an internal reference:
-\newcommand{\BookRefLocal}[3]{\hyperref[#1]{\BookRef{#2}{#3}}}
-\newcommand{\ChapRefLocal}[3]{\hyperref[#1]{\ChapRef{#2}{#3}}}
-\newcommand{\SecRefLocal}[3]{\hyperref[#1]{\SecRef{#2}{#3}}}
-\newcommand{\PartRefLocal}[3]{\hyperref[#1]{\PartRef{#2}{#3}}}
-\newcommand{\BookRefLocalUC}[3]{\hyperref[#1]{\BookRefUC{#2}{#3}}}
-\newcommand{\ChapRefLocalUC}[3]{\hyperref[#1]{\ChapRefUC{#2}{#3}}}
-\newcommand{\SecRefLocalUC}[3]{\hyperref[#1]{\SecRefUC{#2}{#3}}}
-\newcommand{\PartRefLocalUC}[3]{\hyperref[#1]{\PartRefUC{#2}{#3}}}
-
-% Variants of the above with a section number is empty (i.e., UnNumbered):
-\newcommand{\BookRefUN}[1]{\BookRef{}{#1}}
-\newcommand{\ChapRefUN}[1]{\SecRefUN{#1}}
-\newcommand{\SecRefUN}[1]{``#1''}
-\newcommand{\PartRefUN}[1]{\SecRefUN{#1}}
-\newcommand{\BookRefUCUN}[1]{\BookRefUN{#1}}
-\newcommand{\ChapRefUCUN}[1]{\ChapRefUN{#1}}
-\newcommand{\SecRefUCUN}[1]{\SecRefUN{#1}}
-\newcommand{\PartRefUCUN}[1]{\PartRefUN{#1}}
-
-\newcommand{\BookRefLocalUN}[2]{\hyperref[#1]{\BookRefUN{#2}}}
-\newcommand{\ChapRefLocalUN}[2]{\SecRefLocalUN{#1}{#2}}
-\newcommand{\SecRefLocalUN}[2]{\SecRefUN{#2} on page~\pageref{#1}}
-\newcommand{\PartRefLocalUN}[2]{\SecRefLocalUN{#1}{#2}}
-\newcommand{\BookRefLocalUCUN}[2]{\BookRefLocalUN{#1}{#2}}
-\newcommand{\ChapRefLocalUCUN}[2]{\ChapRefLocalUN{#1}{#2}}
-\newcommand{\SecRefLocalUCUN}[2]{\SecRefLocalUN{#1}{#2}}
-\newcommand{\PartRefLocalUCUN}[2]{\PartRefLocalUN{#1}{#2}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Fonts
-
-% Font commands used by generated text:
-\newcommand{\Scribtexttt}[1]{{\texttt{#1}}}
-\newcommand{\textsub}[1]{$_{\hbox{\textsmaller{#1}}}$}
-\newcommand{\textsuper}[1]{$^{\hbox{\textsmaller{#1}}}$}
-\newcommand{\intextcolor}[2]{\textcolor{#1}{#2}}
-\newcommand{\intextrgbcolor}[2]{\textcolor[rgb]{#1}{#2}}
-\newcommand{\incolorbox}[2]{{\fboxrule=0pt\fboxsep=0pt\colorbox{#1}{#2}}}
-\newcommand{\inrgbcolorbox}[2]{{\fboxrule=0pt\fboxsep=0pt\colorbox[rgb]{#1}{#2}}}
-\newcommand{\plainlink}[1]{#1}
-\newcommand{\techoutside}[1]{#1}
-\newcommand{\techinside}[1]{#1}
-\newcommand{\badlink}[1]{#1}
-\newcommand{\indexlink}[1]{#1}
-\newcommand{\noborder}[1]{#1}
-\newcommand{\Smaller}[1]{\textsmaller{#1}}
-\newcommand{\Larger}[1]{\textlarger{#1}}
-\newcommand{\planetName}[1]{PLane\hspace{-0.1ex}T}
-\newcommand{\slant}[1]{{\textsl{#1}}}
-
-% Used for <, >, and | in tt mode. For some fonts and installations,
-% there seems to be an encoding issue, so pick T1 explicitly:
-\newcommand{\Stttextmore}{{\fontencoding{T1}\selectfont>}}
-\newcommand{\Stttextless}{{\fontencoding{T1}\selectfont<}}
-\newcommand{\Stttextbar}{{\fontencoding{T1}\selectfont|}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Tables
-
-% The `stabular' environment seems to be the lesser of evils among 
-%  page-breaking table environments (and we've made a copy as ``pltstabular'
-%  to make sure that it doesn't change).
-
-\makeatletter
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\message{pltstabular is a modification of stabular}
-%% A renamed vsetion of:
-%% stabular.sty
-%% Copyright 1998 Sigitas Tolu\v sis
-%% VTeX Ltd., Akademijos 4, Vilnius, Lithuania
-%% e-mail sigitas@vtex.lt
-%% http://www.vtex.lt/tex/download/macros/
-%%
-% This program can redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or (at your option) any later version.
-%
-% PURPOSE:   Improve tabular environment.
-%
-% SHORT DESCRIPTION:
-%
-% Changed internal commands: \@mkpream, \@addamp, \@xhline
-%
-% Provides new commands in tabular (used after command \\):
-% \emptyrow[#1] 
-% -------------
-%    Adds empty row, #1 - height of the row 
-%
-% \tabrow{#1}[#2] 
-% ---------------
-%    Adds row of natural height: #1\\[#2]
-%
-% Provides new environments: pltstabular and pltstabular* 
-%                            --------     ---------
-%            One more multi-page version of tabular
-%
-%
-\def\empty@finalstrut#1{%
-  \unskip\ifhmode\nobreak\fi\vrule\@width\z@\@height\z@\@depth\z@}
-\def\no@strut{\global\setbox\@arstrutbox\hbox{%
-    \vrule \@height\z@
-           \@depth\z@
-           \@width\z@}%
-    \gdef\@endpbox{\empty@finalstrut\@arstrutbox\par\egroup\hfil}%
-}%
-\def\yes@strut{\global\setbox\@arstrutbox\hbox{%
-    \vrule \@height\arraystretch \ht\strutbox
-           \@depth\arraystretch \dp\strutbox
-           \@width\z@}%
-    \gdef\@endpbox{\@finalstrut\@arstrutbox\par\egroup\hfil}%
-}%
-\def\@mkpream#1{\@firstamptrue\@lastchclass6
-  \let\@preamble\@empty\def\empty@preamble{\add@ins}%
-  \let\protect\@unexpandable@protect
-  \let\@sharp\relax\let\add@ins\relax
-  \let\@startpbox\relax\let\@endpbox\relax
-  \@expast{#1}%
-  \expandafter\@tfor \expandafter
-    \@nextchar \expandafter:\expandafter=\reserved@a\do
-       {\@testpach\@nextchar
-    \ifcase \@chclass \@classz \or \@classi \or \@classii \or \@classiii
-      \or \@classiv \or\@classv \fi\@lastchclass\@chclass}%
-  \ifcase \@lastchclass \@acol
-      \or \or \@preamerr \@ne\or \@preamerr \tw@\or \or \@acol \fi}
-\def\@addamp{%
-  \if@firstamp
-    \@firstampfalse
-    \edef\empty@preamble{\add@ins}%
-  \else
-    \edef\@preamble{\@preamble &}%
-    \edef\empty@preamble{\expandafter\noexpand\empty@preamble &\add@ins}%
-  \fi}
-\newif\iftw@hlines \tw@hlinesfalse
-\def\@xhline{\ifx\reserved@a\hline
-               \tw@hlinestrue
-             \else\ifx\reserved@a\Hline
-               \tw@hlinestrue
-             \else
-               \tw@hlinesfalse
-             \fi\fi
-      \iftw@hlines
-        \aftergroup\do@after
-      \fi
-      \ifnum0=`{\fi}%
-}
-\def\do@after{\emptyrow[\the\doublerulesep]}
-\def\emptyrow{\noalign\bgroup\@ifnextchar[\@emptyrow{\@emptyrow[\z@]}}
-\def\@emptyrow[#1]{\no@strut\gdef\add@ins{\vrule \@height\z@ \@depth#1 \@width\z@}\egroup%
-\empty@preamble\\
-\noalign{\yes@strut\gdef\add@ins{\vrule \@height\z@ \@depth\z@ \@width\z@}}%
-}
-\def\tabrow#1{\noalign\bgroup\@ifnextchar[{\@tabrow{#1}}{\@tabrow{#1}[]}}
-\def\@tabrow#1[#2]{\no@strut\egroup#1\ifx.#2.\\\else\\[#2]\fi\noalign{\yes@strut}}
-%
-\def\endpltstabular{\crcr\egroup\egroup \egroup}
-\expandafter \let \csname endpltstabular*\endcsname = \endpltstabular
-\def\pltstabular{\let\@halignto\@empty\@pltstabular}
-\@namedef{pltstabular*}#1{\def\@halignto{to#1}\@pltstabular}
-\def\@pltstabular{\leavevmode \bgroup \let\@acol\@tabacol
-   \let\@classz\@tabclassz
-   \let\@classiv\@tabclassiv \let\\\@tabularcr\@stabarray}
-\def\@stabarray{\m@th\@ifnextchar[\@sarray{\@sarray[c]}}
-\def\@sarray[#1]#2{%
-  \bgroup
-  \setbox\@arstrutbox\hbox{%
-    \vrule \@height\arraystretch\ht\strutbox
-           \@depth\arraystretch \dp\strutbox
-           \@width\z@}%
-  \@mkpream{#2}%
-  \edef\@preamble{%
-    \ialign \noexpand\@halignto
-      \bgroup \@arstrut \@preamble \tabskip\z@skip \cr}%
-  \let\@startpbox\@@startpbox \let\@endpbox\@@endpbox
-  \let\tabularnewline\\%
-%    \let\par\@empty
-    \let\@sharp##%
-    \set@typeset@protect
-    \lineskip\z@skip\baselineskip\z@skip
-    \@preamble}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\makeatother
-
-\newenvironment{bigtabular}{\begin{pltstabular}}{\end{pltstabular}}
-% For the 'boxed table style:
-\newcommand{\SBoxedLeft}{\textcolor[rgb]{0.6,0.6,1.0}{\vrule width 3pt\hspace{3pt}}}
-% Formerly used to keep the horizontal line for a definition on the same page:
-\newcommand{\SEndFirstHead}[0]{ \nopagebreak \\ }
-% Corrects weirdness when a table is the first thing in
-%  an itemization:
-\newcommand{\bigtableinlinecorrect}[0]{~
-
-\vspace{-\baselineskip}\vspace{\parskip}}
-% Used to indent the table correctly in an itemization, since that's
-%  one of the things stabular gets wrong:
-\newlength{\stabLeft}
-\newcommand{\bigtableleftpad}{\hspace{\stabLeft}}
-\newcommand{\atItemizeStart}[0]{\addtolength{\stabLeft}{\labelsep}
-                                \addtolength{\stabLeft}{\labelwidth}}
-
-
-% For a single-column table in simple environments, it's better to
-%  use the `list' environment instead of `stabular'.
-\newenvironment{SingleColumn}{\begin{list}{}{\topsep=0pt\partopsep=0pt%
-\listparindent=0pt\itemindent=0pt\labelwidth=0pt\leftmargin=0pt\rightmargin=0pt%
-\itemsep=0pt\parsep=0pt}\item}{\end{list}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Etc.
-
-% ._ and .__
-\newcommand{\Sendabbrev}[1]{#1\@}
-\newcommand{\Sendsentence}[1]{\@#1}
-
-% Default style for a nested flow:
-\newenvironment{Subflow}{\begin{list}{}{\topsep=0pt\partopsep=0pt%
-\listparindent=0pt\itemindent=0pt\labelwidth=0pt\leftmargin=0pt\rightmargin=0pt%
-\itemsep=0pt}\item}{\end{list}}
-
-% The 'inset nested-flow style uses the `quote' environment
-
-% Indent a 'code-inset nested flow:
-\newcommand{\SCodePreSkip}{\vskip\abovedisplayskip}
-\newcommand{\SCodePostSkip}{\vskip\belowdisplayskip}
-\newenvironment{SCodeFlow}{\SCodePreSkip\begin{list}{}{\topsep=0pt\partopsep=0pt%
-\listparindent=0pt\itemindent=0pt\labelwidth=0pt\leftmargin=2ex\rightmargin=2ex%
-\itemsep=0pt\parsep=0pt}\item}{\end{list}\SCodePostSkip}
-\newcommand{\SCodeInsetBox}[1]{\setbox1=\hbox{\hbox{\hspace{2ex}#1\hspace{2ex}}}\vbox{\SCodePreSkip\vtop{\box1\SCodePostSkip}}}
-
-% Inset a 'vertical-inset nested flow:
-\newcommand{\SVInsetPreSkip}{\vskip\abovedisplayskip}
-\newcommand{\SVInsetPostSkip}{\vskip\belowdisplayskip}
-\newenvironment{SVInsetFlow}{\SVInsetPreSkip\begin{list}{}{\topsep=0pt\partopsep=0pt%
-\listparindent=0pt\itemindent=0pt\labelwidth=0pt\leftmargin=0pt\rightmargin=0pt%
-\itemsep=0pt\parsep=0pt}\item}{\end{list}\SVInsetPostSkip}
-\newcommand{\SVInsetBox}[1]{\setbox1=\hbox{\hbox{#1}}\vbox{\SCodePreSkip\vtop{\box1\SCodePostSkip}}}
-
-% The 'compact itemization style:
-\newenvironment{compact}{\begin{itemize}}{\end{itemize}}
-\newcommand{\compactItem}[1]{\item #1}
-
-% The nested-flow style for `centerline':
-\newenvironment{SCentered}{\begin{trivlist}\item \centering}{\end{trivlist}}
-
-% The \refpara command corresponds to `margin-note'. The
-% refcolumn and refcontent environments also wrap the note,
-% because they simplify the CSS side.
-\newcommand{\refpara}[1]{\normalmarginpar\marginpar{\raggedright \footnotesize #1}}
-\newcommand{\refelem}[1]{\refpara{#1}}
-\newenvironment{refcolumn}{}{}
-\newenvironment{refcontent}{}{}
-
-\newcommand{\refparaleft}[1]{\reversemarginpar\marginpar{\raggedright \footnotesize #1}}
-\newcommand{\refelemleft}[1]{\refparaleft{#1}}
-\newenvironment{refcolumnleft}{}{}
-
-% Macros used by `title' and `author':
-\newcommand{\titleAndVersionAndAuthors}[3]{\title{#1\\{\normalsize \SVersionBefore{}#2}}\author{#3}\maketitle}
-\newcommand{\titleAndVersionAndEmptyAuthors}[3]{\title{#1\\{\normalsize \SVersionBefore{}#2}}#3\maketitle}
-\newcommand{\titleAndEmptyVersionAndAuthors}[3]{\title{#1}\author{#3}\maketitle}
-\newcommand{\titleAndEmptyVersionAndEmptyAuthors}[3]{\title{#1}\maketitle}
-\newcommand{\SAuthor}[1]{#1}
-\newcommand{\SAuthorSep}[1]{\qquad}
-\newcommand{\SVersionBefore}[1]{Version }
-
-% Useful for some styles, such as sigalternate:
-\newcommand{\SNumberOfAuthors}[1]{}
-
-\let\SOriginalthesubsection\thesubsection
-\let\SOriginalthesubsubsection\thesubsubsection
-
-% sections
-\newcommand{\Spart}[2]{\part[#1]{#2}}
-\newcommand{\Ssection}[2]{\section[#1]{#2}\let\thesubsection\SOriginalthesubsection}
-\newcommand{\Ssubsection}[2]{\subsection[#1]{#2}\let\thesubsubsection\SOriginalthesubsubsection}
-\newcommand{\Ssubsubsection}[2]{\subsubsection[#1]{#2}}
-\newcommand{\Ssubsubsubsection}[2]{{\bf #2}}
-\newcommand{\Ssubsubsubsubsection}[2]{\Ssubsubsubsection{#1}{#2}}
-
-% "star" means unnumbered and not in ToC:
-\newcommand{\Spartstar}[1]{\part*{#1}}
-\newcommand{\Ssectionstar}[1]{\section*{#1}\renewcommand*\thesubsection{\arabic{subsection}}\setcounter{subsection}{0}}
-\newcommand{\Ssubsectionstar}[1]{\subsection*{#1}\renewcommand*\thesubsubsection{\arabic{section}.\arabic{subsubsection}}\setcounter{subsubsection}{0}}
-\newcommand{\Ssubsubsectionstar}[1]{\subsubsection*{#1}}
-\newcommand{\Ssubsubsubsectionstar}[1]{{\bf #1}}
-\newcommand{\Ssubsubsubsubsectionstar}[1]{\Ssubsubsubsectionstar{#1}}
-
-% "starx" means unnumbered but in ToC:
-\newcommand{\Spartstarx}[2]{\Spartstar{#2}\addcontentsline{toc}{part}{#1}}
-\newcommand{\Ssectionstarx}[2]{\Ssectionstar{#2}\addcontentsline{toc}{section}{#1}}
-\newcommand{\Ssubsectionstarx}[2]{\Ssubsectionstar{#2}\addcontentsline{toc}{subsection}{#1}}
-\newcommand{\Ssubsubsectionstarx}[2]{\Ssubsubsectionstar{#2}\addcontentsline{toc}{subsubsection}{#1}}
-\newcommand{\Ssubsubsubsectionstarx}[2]{\Ssubsubsubsectionstar{#2}}
-\newcommand{\Ssubsubsubsubsectionstarx}[2]{\Ssubsubsubsubsectionstar{#2}}
-
-% "grouper" is for the 'grouper style variant --- on subsections and lower,
-%  because \Spart is used for grouper at the section level. Grouper implies
-%  unnumbered.
-\newcounter{GrouperTemp}
-\newcommand{\Ssubsectiongrouper}[2]{\setcounter{GrouperTemp}{\value{subsection}}\Ssubsectionstarx{#1}{#2}\setcounter{subsection}{\value{GrouperTemp}}}
-\newcommand{\Ssubsubsectiongrouper}[2]{\setcounter{GrouperTemp}{\value{subsubsection}}\Ssubsubsectionstarx{#1}{#2}\setcounter{subsubsection}{\value{GrouperTemp}}}
-\newcommand{\Ssubsubsubsectiongrouper}[2]{\Ssubsubsubsectionstarx{#1}{#2}}
-\newcommand{\Ssubsubsubsubsectiongrouper}[2]{\Ssubsubsubsubsectionstarx{#1}{#2}}
-
-\newcommand{\Ssubsectiongrouperstar}[1]{\setcounter{GrouperTemp}{\value{subsection}}\Ssubsectionstar{#1}\setcounter{subsection}{\value{GrouperTemp}}}
-\newcommand{\Ssubsubsectiongrouperstar}[1]{\setcounter{GrouperTemp}{\value{subsubsection}}\Ssubsubsectionstar{#1}\setcounter{subsubsection}{\value{GrouperTemp}}}
-\newcommand{\Ssubsubsubsectiongrouperstar}[1]{\Ssubsubsubsectionstar{#1}}
-\newcommand{\Ssubsubsubsubsectiongrouperstar}[1]{\Ssubsubsubsubsectionstar{#1}}
-
-\newcommand{\Ssubsectiongrouperstarx}[2]{\setcounter{GrouperTemp}{\value{subsection}}\Ssubsectionstarx{#1}{#2}\setcounter{subsection}{\value{GrouperTemp}}}
-\newcommand{\Ssubsubsectiongrouperstarx}[2]{\setcounter{GrouperTemp}{\value{subsubsection}}\Ssubsubsectionstarx{#1}{#2}\setcounter{subsubsection}{\value{GrouperTemp}}}
-\newcommand{\Ssubsubsubsectiongrouperstarx}[2]{\Ssubsubsubsectionstarx{#1}{#2}}
-\newcommand{\Ssubsubsubsubsectiongrouperstarx}[2]{\Ssubsubsubsubsectionstarx{#1}{#2}}
-
-% Generated by `subsubsub*section':
-\newcommand{\SSubSubSubSection}[1]{\Ssubsubsubsubsectionstar{#1}}
-
-% For hidden parts with an empty title:
-\newcommand{\notitlesection}{\vspace{2ex}\phantomsection\noindent}
-
-% To increments section numbers:
-\newcommand{\Sincpart}{\stepcounter{part}}
-\newcommand{\Sincsection}{\stepcounter{section}}
-\newcommand{\Sincsubsection}{\stepcounter{subsection}}
-\newcommand{\Sincsubsubsection}{\stepcounter{subsubsection}}
-\newcommand{\Sincsubsubsubsection}{}
-\newcommand{\Sincsubsubsubsubsection}{}
-
-% When brackets appear in section titles:
-\newcommand{\SOpenSq}{[}
-\newcommand{\SCloseSq}{]}
-
-% Helper for box-mode macros:
-\newcommand{\Svcenter}[1]{$\vcenter{#1}$}
-
-% Helper to work around a problem with "#"s for URLs within \href
-% within other macros:
-\newcommand{\Shref}[3]{\href{#1\##2}{#3}}
-
-% For URLs:
-\newcommand{\Snolinkurl}[1]{\nolinkurl{#1}}
-
-% History note:
-\newcommand{\SHistory}[1]{\begin{smaller}#1\end{smaller}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% Scribble then generates the following:
-%
-%  \begin{document}
-%  \preDoc
-%  \titleAndVersion{...}{...}
-%  ... document content ...
-%  \postDoc
-%  \end{document}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/search.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/search.rkt
deleted file mode 100644
index 458056dc5b..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/search.rkt
+++ /dev/null
@@ -1,179 +0,0 @@
-(module search racket/base
-  (require "struct.rkt"
-           "basic.rkt"
-           syntax/modcode)
-
-  (provide find-racket-tag
-           (rename-out [find-racket-tag find-scheme-tag]))
-
-  (define module-info-cache (make-hasheq))
-
-  (define (module-path-index-rejoin mpi rel-to)
-    (let-values ([(name base) (module-path-index-split mpi)])
-      (cond
-       [(not name) rel-to]
-       [(not base) mpi]
-       [else
-        (module-path-index-join name 
-                                (module-path-index-rejoin base rel-to))])))
-
-  (define (try thunk fail-thunk)
-    (with-handlers* ([exn:fail? (lambda (exn) (fail-thunk))])
-      (thunk)))
-
-  (define (find-racket-tag part ri stx/binding phase-level)
-    ;; The phase-level argument is used only when `stx/binding'
-    ;; is an identifier.
-    ;;
-    ;; Note: documentation keys currently don't distinguish different
-    ;; phase definitions of an identifier from a source module.
-    ;; That is, there's no way to document (define x ....) differently
-    ;; from (define-for-syntax x ...). This isn't a problem in practice,
-    ;; because no one uses the same name for different-phase exported
-    ;; bindings.
-    ;;
-    ;; Formerly, we assumed that bindings are defined as originating from some
-    ;; module at phase 0. [Maybe it's defined at phase 1 and re-exported
-    ;; later for phase 0 (after a require-for-template), in which case the
-    ;; re-exporting module is the one we find.] That assumption has been
-    ;; lifted, however; search for "GONE" below.
-    (let ([b (cond
-              [(identifier? stx/binding)
-               (identifier-binding stx/binding phase-level)]
-              [(and (list? stx/binding)
-                    (= 7 (length stx/binding)))
-               stx/binding]
-              [else
-               (and (not (symbol? (car stx/binding)))
-                    (list #f
-                          (cadr stx/binding)
-                          (car stx/binding)
-                          (cadr stx/binding)
-                          (if (= 2 (length stx/binding))
-                              0
-                              (caddr stx/binding))
-                          (if (= 2 (length stx/binding))
-                              0
-                              (cadddr stx/binding))
-                          (if (= 2 (length stx/binding))
-                              0
-                              (cadddr (cdr stx/binding)))))])])
-      (and 
-       (pair? b)
-       (let ([seen (make-hash)]
-             [search-key #f])
-         (let loop ([queue (list (list (caddr b) (cadddr b) (list-ref b 4) (list-ref b 5) (list-ref b 6)))]
-                    [rqueue null]
-                    [need-result? #t])
-           (cond
-            [(null? queue)
-             (if (null? rqueue)
-                 ;; Not documented
-                 #f
-                 (loop (reverse rqueue) null need-result?))]
-            [else
-             (let ([mod (list-ref (car queue) 0)]
-                   [id (list-ref (car queue) 1)]
-                   [defn-phase (list-ref (car queue) 2)]
-                   [import-phase (list-ref (car queue) 3)]
-                   [export-phase (list-ref (car queue) 4)]
-                   [queue (cdr queue)])
-               (let* ([rmp (module-path-index-resolve mod)]
-                      [eb (and ;; GONE: (equal? 0 export-phase) ;; look for the phase-0 export; good idea?
-                               (list (module-path-index->taglet mod)
-                                     id))])
-                 (when (and eb
-                            (not search-key))
-                   (set! search-key eb))
-                 (let ([v (and eb (resolve-search search-key part ri `(dep ,eb)))])
-                   (let* ([here-result
-                           (and need-result?
-                                v
-                                (let ([v (resolve-get/tentative part ri `(form ,eb))])
-                                  (or (and v `(form ,eb))
-                                      `(def ,eb))))]
-                          [need-result? (and need-result? (not here-result))])
-                     ;; Even if we've found `here-result', look deeper so that we have 
-                     ;; consistent `dep' results.
-                     (let ([nest-result
-                            ;; Maybe it's re-exported from this module...
-                            ;; Try a shortcut:
-                            (if (eq? rmp (and (car b) (module-path-index-resolve (car b))))
-                                ;; Not defined through this path, so keep looking
-                                (loop queue rqueue need-result?)
-                                ;; Check parents, if we can get the source:
-                                (if (and (path? (resolved-module-path-name rmp))
-                                         (not (hash-ref seen (cons export-phase rmp) #f)))
-                                    (let ([exports
-                                           (hash-ref
-                                            module-info-cache
-                                            rmp
-                                            (lambda ()
-                                              (let-values ([(valss stxess)
-                                                            (try
-                                                             (lambda ()
-                                                               ;; First, try using bytecode:
-                                                               (module-compiled-exports 
-                                                                (get-module-code (resolved-module-path-name rmp)
-                                                                                 #:choose (lambda (src zo so) 'zo))))
-                                                             (lambda ()
-                                                               (try
-                                                                (lambda ()
-                                                                  ;; Bytecode not available. Declaration in the
-                                                                  ;; current namespace?
-                                                                  (module->exports rmp))
-                                                                (lambda ()
-                                                                  (values null null)))))])
-                                                (let ([t 
-                                                       ;; Merge the two association lists:
-                                                       (let loop ([base valss]
-                                                                  [stxess stxess])
-                                                         (cond
-                                                          [(null? stxess) base]
-                                                          [(assoc (caar stxess) base)
-                                                           => (lambda (l)
-                                                                (loop (cons (cons (car l)
-                                                                                  (append (cdar stxess)
-                                                                                          (cdr l)))
-                                                                            (remq l base))
-                                                                      (cdr stxess)))]
-                                                          [else (loop (cons (car stxess)
-                                                                            base)
-                                                                      (cdr stxess))]))])
-                                                  (hash-set! module-info-cache rmp t)
-                                                  t))))])
-                                      (hash-set! seen (cons export-phase rmp) #t)
-                                      (let ([a (assq id (let ([a (assoc export-phase exports)])
-                                                          (if a
-                                                              (cdr a) 
-                                                              null)))])
-                                        (if a
-                                            (loop queue
-                                                  (append (map (lambda (m)
-                                                                 (if (pair? m)
-                                                                     (list (module-path-index-rejoin (car m) mod)
-                                                                           (list-ref m 2)
-                                                                           defn-phase
-                                                                           (list-ref m 1)
-                                                                           (list-ref m 3))
-                                                                     (list (module-path-index-rejoin m mod)
-                                                                           id
-                                                                           defn-phase
-                                                                           import-phase
-                                                                           export-phase)))
-                                                               (reverse (cadr a)))
-                                                          rqueue)
-                                                  need-result?)
-                                            (begin
-                                              ;; A dead end may not be our fault: the files could
-                                              ;; have changed in inconsistent ways. So just say #f
-                                              ;; for now.
-                                              #;
-                                              (error 'find-racket-tag
-                                                     "dead end when looking for binding source: ~e"
-                                                     id)
-                                              (loop queue rqueue need-result?)))))
-                                    ;; Can't get the module source, so continue with queue:
-                                    (loop queue rqueue need-result?)))])
-                       (or here-result
-                           nest-result))))))])))))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan.rkt
deleted file mode 100644
index 3ec7771bf2..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan.rkt
+++ /dev/null
@@ -1,167 +0,0 @@
-#lang scheme/base
-(require setup/collects
-         racket/contract/base
-         scribble/core
-         scribble/base
-         scribble/decode
-         scribble/html-properties
-         scribble/latex-properties
-         (for-syntax scheme/base))
-
-(provide/contract
- [abstract 
-  (->* () () #:rest (listof pre-content?)
-       block?)]
- [subtitle
-  (->* () () #:rest (listof pre-content?)
-       content?)]
- [authorinfo
-  (-> pre-content? pre-content? pre-content?
-      block?)]
- [conferenceinfo
-  (-> pre-content? pre-content?
-      block?)]
- [copyrightyear
-  (->* () () #:rest (listof pre-content?)
-       block?)]
- [copyrightdata
-  (->* () () #:rest (listof pre-content?)
-       block?)]
- [exclusive-license
-  (->* () ()
-       block?)]
- [doi
-  (->* () () #:rest (listof pre-content?)
-       block?)]
- [category
-  (->* (pre-content? pre-content? pre-content?)
-       ((or/c false/c pre-content?))
-       content?)]
- [terms
-  (->* () () #:rest (listof pre-content?)
-       content?)]
- [keywords
-  (->* () () #:rest (listof pre-content?)
-       content?)])
-
-(provide preprint 10pt nocopyright onecolumn noqcourier notimes
-         include-abstract)
-
-(define-syntax-rule (defopts name ...)
-  (begin (define-syntax (name stx)
-           (raise-syntax-error #f
-                               "option must appear on the same line as `#lang scribble/sigplan'"
-                               stx))
-         ...
-         (provide name ...)))
-(defopts preprint 10pt nocopyright onecolumn noqcourier notimes)
-
-(define sigplan-extras
-  (let ([abs (lambda (s)
-               (path->collects-relative
-                (collection-file-path s "scribble" "sigplan")))])
-    (list
-     (make-css-addition (abs "sigplan.css"))
-     (make-tex-addition (abs "sigplan.tex")))))
-
-;; ----------------------------------------
-;; Abstracts:
-
-(define abstract-style (make-style "abstract" sigplan-extras))
-
-(define (abstract . strs)
-  (make-nested-flow
-   abstract-style
-   (decode-flow strs)))
-
-(define (extract-abstract p)
-  (unless (part? p)
-    (error 'include-abstract "doc binding is not a part: ~e" p))
-  (unless (null? (part-parts p))
-    (error 'include-abstract "abstract part has sub-parts: ~e" (part-parts p)))
-  (when (part-title-content p)
-    (error 'include-abstract "abstract part has title content: ~e" (part-title-content p)))
-  (part-blocks p))
-
-(define-syntax-rule (include-abstract mp)
-  (begin
-    (require (only-in mp [doc abstract-doc]))
-    (make-nested-flow abstract-style (extract-abstract abstract-doc))))
-
-;; ----------------------------------------
-;; Authors and conference info:
-
-(define (authorinfo name affiliation e-mail)
-  ;; The \SAuthor macro in "style.tex" looks specifically
-  ;; for an \SAuthorinfo as its argument, and handles it
-  ;; specially in that case:
-  (author
-   (make-multiarg-element
-    (make-style "SAuthorinfo" sigplan-extras)
-    (list
-     (make-element #f (decode-content (list name)))
-     (make-element (make-style "SAuthorPlace" sigplan-extras)
-                   (decode-content (list affiliation)))
-     (make-element (make-style "SAuthorEmail" sigplan-extras)
-                   (decode-content (list e-mail)))))))
-
-(define (subtitle . str)
-  (make-element (make-style "SSubtitle" (append '(aux) sigplan-extras))
-                (decode-content str)))
-
-(define (conferenceinfo what where)
-  (make-paragraph
-   (make-style 'pretitle null)
-   (make-multiarg-element
-    (make-style "SConferenceInfo" sigplan-extras)
-    (list
-     (make-element #f (decode-content (list what)))
-     (make-element #f (decode-content (list where)))))))
-
-(define (copyrightyear . when)
-  (make-paragraph
-   (make-style 'pretitle null)
-   (make-element
-    (make-style "SCopyrightYear" sigplan-extras)
-    (decode-content when))))
-
-(define (copyrightdata . what)
-  (make-paragraph
-   (make-style 'pretitle null)
-   (make-element
-    (make-style "SCopyrightData" sigplan-extras)
-    (decode-content what))))
-
-(define (doi . what)
-  (make-paragraph
-   (make-style 'pretitle null)
-   (make-element
-    (make-style "Sdoi" sigplan-extras)
-    (decode-content what))))
-
-(define (exclusive-license . what)
-  (make-paragraph
-   (make-style 'pretitle null)
-   (make-element
-    (make-style "SPexclusivelicense" sigplan-extras)
-    (decode-content what))))
-
-;; ----------------------------------------
-;; Categories, terms, and keywords:
-
-(define (category sec title sub [more #f])
-  (make-multiarg-element
-   (make-style (format "SCategory~a" (if more "Plus" "")) sigplan-extras)
-   (list*
-    (make-element #f (decode-content (list sec)))
-    (make-element #f (decode-content (list title)))
-    (make-element #f (decode-content (list sub)))
-    (if more
-        (list (make-element #f (decode-content (list more))))
-        null))))
-
-(define (terms . str)
-  (make-element (make-style "STerms" sigplan-extras) (decode-content str)))
-
-(define (keywords . str)
-  (make-element (make-style "SKeywords" sigplan-extras) (decode-content str)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang.rkt
deleted file mode 100644
index 92c00a85c6..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang scheme/base
-(require scribble/doclang
-         scribble/core
-         scribble/base
-         scribble/sigplan
-         scribble/latex-prefix
-         racket/list
-         "../private/defaults.rkt"
-         (for-syntax scheme/base))
-(provide (except-out (all-from-out scribble/doclang) #%module-begin)
-         (all-from-out scribble/sigplan)
-         (all-from-out scribble/base)
-         (rename-out [module-begin #%module-begin]))
-
-(define-syntax (module-begin stx)
-  (syntax-case stx ()
-    [(_ id . body)
-     (let ([preprint? #f]
-           [10pt? #f]
-           [onecolumn? #f]
-           [nocopyright? #f]
-           [times? #t]
-           [qcourier? #t])
-       (let loop ([stuff #'body])
-         (syntax-case* stuff (onecolumn preprint 10pt nocopyright notimes noqcourier) (lambda (a b) (eq? (syntax-e a) (syntax-e b)))
-           [(ws . body)
-            ;; Skip intraline whitespace to find options:
-            (and (string? (syntax-e #'ws))
-                 (regexp-match? #rx"^ *$" (syntax-e #'ws)))
-            (loop #'body)]
-           [(preprint . body)
-            (set! preprint? "preprint")
-            (loop #'body)]
-           [(onecolumn . body)
-            (set! onecolumn? "onecolumn")
-            (loop #'body)]
-           [(nocopyright . body)
-            (set! nocopyright? "nocopyrightspace")
-            (loop #'body)]
-           [(10pt . body)
-            (set! 10pt? "10pt")
-            (loop #'body)]
-           [(noqcourier . body)
-            (set! qcourier? #f)
-            (loop #'body)]
-           [(notimes . body)
-            (set! times? #f)
-            (loop #'body)]
-           [body
-            #`(#%module-begin id (post-process #,times? #,qcourier? #,preprint? #,10pt? #,nocopyright? #,onecolumn?) () . body)])))]))
-#|
-
-The docs for the times.sty package suggests that it should not be used
-so maybe we want to disable it permanently (or replace it with something else).
-
-Read here for more:
-
-  http://www.ctan.org/tex-archive/macros/latex/required/psnfss/psnfss2e.pdf
-
-|#
-
-(define ((post-process times? qcourier? . opts) doc)
-  (let ([options
-         (if (ormap values opts)
-             (format "[~a]" (apply string-append (add-between (filter values opts) ", ")))
-             "")])
-    (add-sigplan-styles 
-     (add-defaults doc
-                   (string->bytes/utf-8
-                    (format "\\documentclass~a{sigplanconf}\n~a~a~a"
-                            options
-                            unicode-encoding-packages
-                            (if times? 
-                                "\\usepackage{times}\n"
-                                "")
-                            (if qcourier? 
-                                "\\usepackage{qcourier}\n"
-                                "")))
-                   (scribble-file "sigplan/style.tex")
-                   (list (scribble-file "sigplan/sigplanconf.cls"))
-                   #f))))
-
-(define (add-sigplan-styles doc)
-  ;; Ensure that "sigplan.tex" is used, since "style.tex"
-  ;; re-defines commands.
-  (struct-copy part doc [to-collect
-                         (cons (terms)
-                               (part-to-collect doc))]))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang/reader.rkt
deleted file mode 100644
index 3963d6e58f..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang s-exp scribble/base/reader
-scribble/sigplan/lang
-#:wrapper1 (lambda (t) (cons 'doc (t)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.css b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.css
deleted file mode 100644
index e46ab8cca0..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Support for styles in scribble/sigplan */
-
-.SAuthorPlace, .SAuthorEmail,
-.SConferenceInfo, .SCopyrightYear, .SCopyrightData,
-.Sdoi, .SPexclusivelicense,
-.SCategory, .SCategoryPlus, .STerms, .SKeywords {
-  display: none;
-}
-
-.SSubtitle {
-  display: block;
-  font-size: smaller;
-}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.tex
deleted file mode 100644
index fc2e1f5293..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.tex
+++ /dev/null
@@ -1,23 +0,0 @@
-
-% Support for styles in scribble/sigplan
-
-% These are replaced by scribble/sigplan/style.tex,
-%  which is used in combination with sigplanconf.sty
-
-\newcommand{\SAuthorinfo}[3]{#1}
-\newcommand{\SAuthorPlace}[1]{#1}
-\newcommand{\SAuthorEmail}[1]{#1}
-
-\newcommand{\SConferenceInfo}[2]{}
-\newcommand{\SCopyrightYear}[1]{}
-\newcommand{\SCopyrightData}[1]{}
-\newcommand{\Sdoi}[1]{}
-\newcommand{\SPexclusivelicense}[0]{}
-
-\newcommand{\SCategory}[3]{}
-\newcommand{\SCategoryPlus}[4]{}
-\newcommand{\STerms}[1]{}
-\newcommand{\SKeywords}[1]{}
-
-% Normally gets re-written by the title macro:
-\newcommand{\SSubtitle}[1]{{\bf #1}}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplanconf.cls b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplanconf.cls
deleted file mode 100644
index 2dcfeb64ef..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplanconf.cls
+++ /dev/null
@@ -1,1311 +0,0 @@
-%-----------------------------------------------------------------------------
-%
-%               LaTeX Class/Style File
-%
-% Name:         sigplanconf.cls
-%
-% Purpose:      A LaTeX 2e class file for SIGPLAN conference proceedings.
-%               This class file supercedes acm_proc_article-sp,
-%               sig-alternate, and sigplan-proc.
-%
-% Author:       Paul C. Anagnostopoulos
-%               Windfall Software
-%               978 371-2316
-%               paul [atsign] windfall.com
-%
-% Created:      12 September 2004
-%
-% Revisions:    See end of file.
-%
-% This work is licensed under the Creative Commons Attribution License.
-% To view a copy of this license, visit
-%   http://creativecommons.org/licenses/by/3.0/
-% or send a letter to Creative Commons, 171 2nd Street, Suite 300,
-% San Francisco, California, 94105, U.S.A.
-%
-%-----------------------------------------------------------------------------
-
-
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{sigplanconf}[2013/07/02 v2.8 ACM SIGPLAN Proceedings]
-
-% The following few pages contain LaTeX programming extensions adapted
-% from the ZzTeX macro package.
-
-%                       Token Hackery
-%                       ----- -------
-
-
-\def \@expandaftertwice {\expandafter\expandafter\expandafter}
-\def \@expandafterthrice {\expandafter\expandafter\expandafter\expandafter
-                          \expandafter\expandafter\expandafter}
-
-% This macro discards the next token.
-
-\def \@discardtok #1{}%                                  token
-
-% This macro removes the `pt' following a dimension.
-
-{\catcode `\p = 12 \catcode `\t = 12
-
-\gdef \@remover #1pt{#1}
-
-} % \catcode
-
-% This macro extracts the contents of a macro and returns it as plain text.
-% Usage: \expandafter\@defof \meaning\macro\@mark
-
-\def \@defof #1:->#2\@mark{#2}
-
-%                       Control Sequence Names
-%                       ------- -------- -----
-
-
-\def \@name #1{%                                        {\tokens}
-  \csname \expandafter\@discardtok \string#1\endcsname}
-
-\def \@withname #1#2{%                                  {\command}{\tokens}
-  \expandafter#1\csname \expandafter\@discardtok \string#2\endcsname}
-
-%                       Flags (Booleans)
-%                       ----- ----------
-
-% The boolean literals \@true and \@false are appropriate for use with
-% the \if command, which tests the codes of the next two characters.
-
-\def \@true {TT}
-\def \@false {FL}
-
-\def \@setflag #1=#2{\edef #1{#2}}%              \flag = boolean
-
-%                       IF and Predicates
-%                       -- --- ----------
-
-% A "predicate" is a macro that returns \@true or \@false as its value.
-% Such values are suitable for use with the \if conditional.  For example:
-%
-%   \if \@oddp{\x} <then-clause> \else <else-clause> \fi
-
-% A predicate can be used with \@setflag as follows:
-%
-%   \@setflag \flag = {<predicate>}
-
-% Here are the predicates for TeX's repertoire of conditional
-% commands.  These might be more appropriately interspersed with
-% other definitions in this module, but what the heck.
-% Some additional "obvious" predicates are defined.
-
-\def \@eqlp   #1#2{\ifnum #1 = #2\@true \else \@false \fi}
-\def \@neqlp  #1#2{\ifnum #1 = #2\@false \else \@true \fi}
-\def \@lssp   #1#2{\ifnum #1 < #2\@true \else \@false \fi}
-\def \@gtrp   #1#2{\ifnum #1 > #2\@true \else \@false \fi}
-\def \@zerop  #1{\ifnum #1 = 0\@true \else \@false \fi}
-\def \@onep   #1{\ifnum #1 = 1\@true \else \@false \fi}
-\def \@posp   #1{\ifnum #1 > 0\@true \else \@false \fi}
-\def \@negp   #1{\ifnum #1 < 0\@true \else \@false \fi}
-\def \@oddp   #1{\ifodd #1\@true \else \@false \fi}
-\def \@evenp  #1{\ifodd #1\@false \else \@true \fi}
-\def \@rangep #1#2#3{\if \@orp{\@lssp{#1}{#2}}{\@gtrp{#1}{#3}}\@false \else
-                                                          \@true \fi}
-\def \@tensp  #1{\@rangep{#1}{10}{19}}
-
-\def \@dimeqlp   #1#2{\ifdim #1 = #2\@true \else \@false \fi}
-\def \@dimneqlp  #1#2{\ifdim #1 = #2\@false \else \@true \fi}
-\def \@dimlssp   #1#2{\ifdim #1 < #2\@true \else \@false \fi}
-\def \@dimgtrp   #1#2{\ifdim #1 > #2\@true \else \@false \fi}
-\def \@dimzerop  #1{\ifdim #1 = 0pt\@true \else \@false \fi}
-\def \@dimposp   #1{\ifdim #1 > 0pt\@true \else \@false \fi}
-\def \@dimnegp   #1{\ifdim #1 < 0pt\@true \else \@false \fi}
-
-\def \@vmodep     {\ifvmode \@true \else \@false \fi}
-\def \@hmodep     {\ifhmode \@true \else \@false \fi}
-\def \@mathmodep  {\ifmmode \@true \else \@false \fi}
-\def \@textmodep  {\ifmmode \@false \else \@true \fi}
-\def \@innermodep {\ifinner \@true \else \@false \fi}
-
-\long\def \@codeeqlp #1#2{\if #1#2\@true \else \@false \fi}
-
-\long\def \@cateqlp #1#2{\ifcat #1#2\@true \else \@false \fi}
-
-\long\def \@tokeqlp  #1#2{\ifx #1#2\@true \else \@false \fi}
-\long\def \@xtokeqlp #1#2{\expandafter\ifx #1#2\@true \else \@false \fi}
-
-\long\def \@definedp #1{%
-  \expandafter\ifx \csname \expandafter\@discardtok \string#1\endcsname
-                   \relax \@false \else \@true \fi}
-
-\long\def \@undefinedp #1{%
-  \expandafter\ifx \csname \expandafter\@discardtok \string#1\endcsname
-                   \relax \@true \else \@false \fi}
-
-\def \@emptydefp #1{\ifx #1\@empty \@true \else \@false \fi}%       {\name}
-
-\let \@emptylistp = \@emptydefp
-
-\long\def \@emptyargp #1{%                               {#n}
-  \@empargp #1\@empargq\@mark}
-\long\def \@empargp #1#2\@mark{%
-  \ifx #1\@empargq \@true \else \@false \fi}
-\def \@empargq {\@empargq}
-
-\def \@emptytoksp #1{%                                   {\tokenreg}
-  \expandafter\@emptoksp \the#1\@mark}
-
-\long\def \@emptoksp #1\@mark{\@emptyargp{#1}}
-
-\def \@voidboxp #1{\ifvoid #1\@true \else \@false \fi}
-\def \@hboxp #1{\ifhbox #1\@true \else \@false \fi}
-\def \@vboxp #1{\ifvbox #1\@true \else \@false \fi}
-
-\def \@eofp #1{\ifeof #1\@true \else \@false \fi}
-
-
-% Flags can also be used as predicates, as in:
-%
-%   \if \flaga <then-clause> \else <else-clause> \fi
-
-
-% Now here we have predicates for the common logical operators.
-
-\def \@notp #1{\if #1\@false \else \@true \fi}
-
-\def \@andp #1#2{\if #1%
-                  \if #2\@true \else \@false \fi
-                \else
-                  \@false
-                \fi}
-
-\def \@orp #1#2{\if #1%
-                 \@true
-               \else
-                 \if #2\@true \else \@false \fi
-               \fi}
-
-\def \@xorp #1#2{\if #1%
-                  \if #2\@false \else \@true \fi
-                \else
-                  \if #2\@true \else \@false \fi
-                \fi}
-
-%                       Arithmetic
-%                       ----------
-
-\def \@increment #1{\advance #1 by 1\relax}%             {\count}
-
-\def \@decrement #1{\advance #1 by -1\relax}%            {\count}
-
-%                       Options
-%                       -------
-
-
-\@setflag \@authoryear = \@false
-\@setflag \@blockstyle = \@false
-\@setflag \@copyrightwanted = \@true
-\@setflag \@explicitsize = \@false
-\@setflag \@mathtime = \@false
-\@setflag \@natbib = \@true
-\@setflag \@ninepoint = \@true
-\newcount{\@numheaddepth} \@numheaddepth = 3
-\@setflag \@onecolumn = \@false
-\@setflag \@preprint = \@false
-\@setflag \@reprint = \@false
-\@setflag \@tenpoint = \@false
-\@setflag \@times = \@false
-
-% Note that all the dangerous article class options are trapped.
-
-\DeclareOption{9pt}{\@setflag \@ninepoint = \@true
-                    \@setflag \@explicitsize = \@true}
-
-\DeclareOption{10pt}{\PassOptionsToClass{10pt}{article}%
-                     \@setflag \@ninepoint = \@false
-                     \@setflag \@tenpoint = \@true
-                     \@setflag \@explicitsize = \@true}
-
-\DeclareOption{11pt}{\PassOptionsToClass{11pt}{article}%
-                     \@setflag \@ninepoint = \@false
-                     \@setflag \@explicitsize = \@true}
-
-\DeclareOption{12pt}{\@unsupportedoption{12pt}}
-
-\DeclareOption{a4paper}{\@unsupportedoption{a4paper}}
-
-\DeclareOption{a5paper}{\@unsupportedoption{a5paper}}
-
-\DeclareOption{authoryear}{\@setflag \@authoryear = \@true}
-
-\DeclareOption{b5paper}{\@unsupportedoption{b5paper}}
-
-\DeclareOption{blockstyle}{\@setflag \@blockstyle = \@true}
-
-\DeclareOption{cm}{\@setflag \@times = \@false}
-
-\DeclareOption{computermodern}{\@setflag \@times = \@false}
-
-\DeclareOption{executivepaper}{\@unsupportedoption{executivepaper}}
-
-\DeclareOption{indentedstyle}{\@setflag \@blockstyle = \@false}
-
-\DeclareOption{landscape}{\@unsupportedoption{landscape}}
-
-\DeclareOption{legalpaper}{\@unsupportedoption{legalpaper}}
-
-\DeclareOption{letterpaper}{\@unsupportedoption{letterpaper}}
-
-\DeclareOption{mathtime}{\@setflag \@mathtime = \@true}
-
-\DeclareOption{natbib}{\@setflag \@natbib = \@true}
-
-\DeclareOption{nonatbib}{\@setflag \@natbib = \@false}
-
-\DeclareOption{nocopyrightspace}{\@setflag \@copyrightwanted = \@false}
-
-\DeclareOption{notitlepage}{\@unsupportedoption{notitlepage}}
-
-\DeclareOption{numberedpars}{\@numheaddepth = 4}
-
-\DeclareOption{numbers}{\@setflag \@authoryear = \@false}
-
-%%%\DeclareOption{onecolumn}{\@setflag \@onecolumn = \@true}
-
-\DeclareOption{preprint}{\@setflag \@preprint = \@true}
-
-\DeclareOption{reprint}{\@setflag \@reprint = \@true}
-
-\DeclareOption{times}{\@setflag \@times = \@true}
-
-\DeclareOption{titlepage}{\@unsupportedoption{titlepage}}
-
-\DeclareOption{twocolumn}{\@setflag \@onecolumn = \@false}
-
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
-
-\ExecuteOptions{9pt,indentedstyle,times}
-\@setflag \@explicitsize = \@false
-\ProcessOptions
-
-\if \@onecolumn
-  \if \@notp{\@explicitsize}%
-    \@setflag \@ninepoint = \@false
-    \PassOptionsToClass{11pt}{article}%
-  \fi
-  \PassOptionsToClass{twoside,onecolumn}{article}
-\else
-  \PassOptionsToClass{twoside,twocolumn}{article}
-\fi
-\LoadClass{article}
-
-\def \@unsupportedoption #1{%
-  \ClassError{proc}{The standard '#1' option is not supported.}}
-
-% This can be used with the 'reprint' option to get the final folios.
-
-\def \setpagenumber #1{%
-  \setcounter{page}{#1}}
-
-\AtEndDocument{\label{sigplanconf@finalpage}}
-
-%                       Utilities
-%                       ---------
-
-
-\newcommand{\setvspace}[2]{%
-  #1 = #2
-  \advance #1 by -1\parskip}
-
-%                       Document Parameters
-%                       -------- ----------
-
-
-% Page:
-
-\setlength{\hoffset}{-1in}
-\setlength{\voffset}{-1in}
-
-\setlength{\topmargin}{1in}
-\setlength{\headheight}{0pt}
-\setlength{\headsep}{0pt}
-
-\if \@onecolumn
-  \setlength{\evensidemargin}{.75in}
-  \setlength{\oddsidemargin}{.75in}
-\else
-  \setlength{\evensidemargin}{.75in}
-  \setlength{\oddsidemargin}{.75in}
-\fi
-
-% Text area:
-
-\newdimen{\standardtextwidth}
-\setlength{\standardtextwidth}{42pc}
-
-\if \@onecolumn
-  \setlength{\textwidth}{40.5pc}
-\else
-  \setlength{\textwidth}{\standardtextwidth}
-\fi
-
-\setlength{\topskip}{8pt}
-\setlength{\columnsep}{2pc}
-\setlength{\textheight}{54.5pc}
-
-% Running foot:
-
-\setlength{\footskip}{30pt}
-
-% Paragraphs:
-
-\if \@blockstyle
-  \setlength{\parskip}{5pt plus .1pt minus .5pt}
-  \setlength{\parindent}{0pt}
-\else
-  \setlength{\parskip}{0pt}
-  \setlength{\parindent}{12pt}
-\fi
-
-\setlength{\lineskip}{.5pt}
-\setlength{\lineskiplimit}{\lineskip}
-
-\frenchspacing
-\pretolerance = 400
-\tolerance = \pretolerance
-\setlength{\emergencystretch}{5pt}
-\clubpenalty = 10000
-\widowpenalty = 10000
-\setlength{\hfuzz}{.5pt}
-
-% Standard vertical spaces:
-
-\newskip{\standardvspace}
-\setvspace{\standardvspace}{5pt plus 1pt minus .5pt}
-
-% Margin paragraphs:
-
-\setlength{\marginparwidth}{36pt}
-\setlength{\marginparsep}{2pt}
-\setlength{\marginparpush}{8pt}
-
-
-\setlength{\skip\footins}{8pt plus 3pt minus 1pt}
-\setlength{\footnotesep}{9pt}
-
-\renewcommand{\footnoterule}{%
-  \hrule width .5\columnwidth height .33pt depth 0pt}
-
-\renewcommand{\@makefntext}[1]{%
-  \noindent \@makefnmark \hspace{1pt}#1}
-
-% Floats:
-
-\setcounter{topnumber}{4}
-\setcounter{bottomnumber}{1}
-\setcounter{totalnumber}{4}
-
-\renewcommand{\fps@figure}{tp}
-\renewcommand{\fps@table}{tp}
-\renewcommand{\topfraction}{0.90}
-\renewcommand{\bottomfraction}{0.30}
-\renewcommand{\textfraction}{0.10}
-\renewcommand{\floatpagefraction}{0.75}
-
-\setcounter{dbltopnumber}{4}
-
-\renewcommand{\dbltopfraction}{\topfraction}
-\renewcommand{\dblfloatpagefraction}{\floatpagefraction}
-
-\setlength{\floatsep}{18pt plus 4pt minus 2pt}
-\setlength{\textfloatsep}{18pt plus 4pt minus 3pt}
-\setlength{\intextsep}{10pt plus 4pt minus 3pt}
-
-\setlength{\dblfloatsep}{18pt plus 4pt minus 2pt}
-\setlength{\dbltextfloatsep}{20pt plus 4pt minus 3pt}
-
-% Miscellaneous:
-
-\errorcontextlines = 5
-
-%                       Fonts
-%                       -----
-
-
-\if \@times
-  \renewcommand{\rmdefault}{ptm}%
-  \if \@mathtime
-    \usepackage[mtbold,noTS1]{mathtime}%
-  \else
-%%%    \usepackage{mathptm}%
-  \fi
-\else
-  \relax
-\fi
-
-\if \@ninepoint
-
-\renewcommand{\normalsize}{%
-  \@setfontsize{\normalsize}{9pt}{10pt}%
-  \setlength{\abovedisplayskip}{5pt plus 1pt minus .5pt}%
-  \setlength{\belowdisplayskip}{\abovedisplayskip}%
-  \setlength{\abovedisplayshortskip}{3pt plus 1pt minus 2pt}%
-  \setlength{\belowdisplayshortskip}{\abovedisplayshortskip}}
-
-\renewcommand{\tiny}{\@setfontsize{\tiny}{5pt}{6pt}}
-
-\renewcommand{\scriptsize}{\@setfontsize{\scriptsize}{7pt}{8pt}}
-
-\renewcommand{\small}{%
-  \@setfontsize{\small}{8pt}{9pt}%
-  \setlength{\abovedisplayskip}{4pt plus 1pt minus 1pt}%
-  \setlength{\belowdisplayskip}{\abovedisplayskip}%
-  \setlength{\abovedisplayshortskip}{2pt plus 1pt}%
-  \setlength{\belowdisplayshortskip}{\abovedisplayshortskip}}
-
-\renewcommand{\footnotesize}{%
-  \@setfontsize{\footnotesize}{8pt}{9pt}%
-  \setlength{\abovedisplayskip}{4pt plus 1pt minus .5pt}%
-  \setlength{\belowdisplayskip}{\abovedisplayskip}%
-  \setlength{\abovedisplayshortskip}{2pt plus 1pt}%
-  \setlength{\belowdisplayshortskip}{\abovedisplayshortskip}}
-
-\renewcommand{\large}{\@setfontsize{\large}{11pt}{13pt}}
-
-\renewcommand{\Large}{\@setfontsize{\Large}{14pt}{18pt}}
-
-\renewcommand{\LARGE}{\@setfontsize{\LARGE}{18pt}{20pt}}
-
-\renewcommand{\huge}{\@setfontsize{\huge}{20pt}{25pt}}
-
-\renewcommand{\Huge}{\@setfontsize{\Huge}{25pt}{30pt}}
-
-\else\if \@tenpoint
-
-\relax
-
-\else
-
-\relax
-
-\fi\fi
-
-%                       Abstract
-%                       --------
-
-
-\renewenvironment{abstract}{%
-  \section*{Abstract}%
-  \normalsize}{%
-  }
-
-%                       Bibliography
-%                       ------------
-
-
-\renewenvironment{thebibliography}[1]
-     {\section*{\refname
-        \@mkboth{\MakeUppercase\refname}{\MakeUppercase\refname}}%
-      \list{\@biblabel{\@arabic\c@enumiv}}%
-           {\settowidth\labelwidth{\@biblabel{#1}}%
-            \leftmargin\labelwidth
-            \advance\leftmargin\labelsep
-            \@openbib@code
-            \usecounter{enumiv}%
-            \let\p@enumiv\@empty
-            \renewcommand\theenumiv{\@arabic\c@enumiv}}%
-      \bibfont
-      \clubpenalty4000
-      \@clubpenalty \clubpenalty
-      \widowpenalty4000%
-      \sfcode`\.\@m}
-     {\def\@noitemerr
-       {\@latex@warning{Empty `thebibliography' environment}}%
-      \endlist}
-
-\if \@natbib
-
-\if \@authoryear
-  \typeout{Using natbib package with 'authoryear' citation style.}
-  \usepackage[authoryear,square]{natbib}
-  \bibpunct{(}{)}{;}{a}{}{,}    % Change fences to parentheses;
-                                % citation separator to semicolon;
-                                % eliminate comma between author and year.
-  \let \cite = \citep
-\else
-  \typeout{Using natbib package with 'numbers' citation style.}
-  \usepackage[numbers,sort&compress,square]{natbib}
-\fi
-\setlength{\bibsep}{3pt plus .5pt minus .25pt}
-
-\fi
-
-\def \bibfont {\small}
-
-%                       Categories
-%                       ----------
-
-
-\@setflag \@firstcategory = \@true
-
-\newcommand{\category}[3]{%
-  \if \@firstcategory
-    \paragraph*{Categories and Subject Descriptors}%
-    \@setflag \@firstcategory = \@false
-  \else
-    \unskip ;\hspace{.75em}%
-  \fi
-  \@ifnextchar [{\@category{#1}{#2}{#3}}{\@category{#1}{#2}{#3}[]}}
-
-\def \@category #1#2#3[#4]{%
-  {\let \and = \relax
-   #1 [\textit{#2}]%
-   \if \@emptyargp{#4}%
-     \if \@notp{\@emptyargp{#3}}: #3\fi
-   \else
-     :\space
-     \if \@notp{\@emptyargp{#3}}#3---\fi
-     \textrm{#4}%
-   \fi}}
-
-%                       Copyright Notice
-%                       --------- ------
-
-
-\def \ftype@copyrightbox {8}
-\def \@toappear {}
-\def \@permission {}
-\def \@reprintprice {}
-
-\def \@copyrightspace {%
-  \@float{copyrightbox}[b]%
-  \vbox to 1.2in{%
-    \vfill
-    \parbox[b]{20pc}{%
-      \scriptsize
-      \if \@preprint
-        [Copyright notice will appear here
-         once 'preprint' option is removed.]\par
-      \else
-        \@toappear
-      \fi
-      \if \@reprint
-        \noindent Reprinted from \@conferencename,
-        \@proceedings,
-        \@conferenceinfo,
-        pp.~\number\thepage--\pageref{sigplanconf@finalpage}.\par
-      \fi}}%
-  \end@float}
-
-\newcommand{\reprintprice}[1]{%
-  \gdef \@reprintprice {#1}}
-
-\reprintprice{\$15.00}
-
-\long\def \toappear #1{%
-  \def \@toappear {#1}}
-
-\toappear{%
-  \noindent \@permission \par
-  \vspace{2pt}
-  \noindent \textsl{\@conferencename}, \quad \@conferenceinfo. \par
-  \noindent Copyright \copyright\ \@copyrightyear\ ACM \@copyrightdata
-    \dots \@reprintprice.\par
-  \noindent http://dx.doi.org/10.1145/\@doi }
-
-\newcommand{\permission}[1]{%
-  \gdef \@permission {#1}}
-
-\permission{%
-  Permission to make digital or hard copies of all or part of this work for
-  personal or classroom use is granted without fee provided that copies are
-  not made or distributed for profit or commercial advantage and that copies
-  bear this notice and the full citation on the first page. Copyrights for
-  components of this work owned by others than ACM must be honored.
-  Abstracting with credit is permitted. To copy otherwise, or republish, to
-  post on servers or to redistribute to lists, requires prior specific
-  permission and/or a fee. Request permissions from permissions@acm.org.}
-
-% These are two new rights management and bibstrip text blocks.
-
-\newcommand{\exclusivelicense}{%
-  \permission{%
-    Permission to make digital or hard copies of all or part of this work for
-    personal or classroom use is granted without fee provided that copies are
-    not made or distributed for profit or commercial advantage and that copies
-    bear this notice and the full citation on the first page. Copyrights for
-    components of this work owned by others than the author(s) must be honored.
-    Abstracting with credit is permitted. To copy otherwise, or republish, to
-    post on servers or to redistribute to lists, requires prior specific
-    permission and/or a fee. Request permissions from permissions@acm.org.}
-  \toappear{%
-    \noindent \@permission \par
-    \vspace{2pt}
-    \noindent \textsl{\@conferencename}, \quad \@conferenceinfo. \par
-    \noindent Copyright is held by the owner/author(s). Publication rights licensed to ACM. \par
-    \noindent ACM \@copyrightdata \dots \@reprintprice.\par
-    \noindent http://dx.doi.org/10.1145/\@doi}}
-
-\newcommand{\permissiontopublish}{%
-  \permission{%
-    Permission to make digital or hard copies of part or all of this work for
-    personal or classroom use is granted without fee provided that copies are
-    not made or distributed for profit or commercial advantage and that copies
-    bear this notice and the full citation on the first page. Copyrights for
-    third-party components of this work must be honored. 
-    For all other uses, contact the owner/author(s).}%
-  \toappear{%
-    \noindent \@permission \par
-    \vspace{2pt}
-    \noindent \textsl{\@conferencename}, \quad \@conferenceinfo. \par
-    \noindent Copyright is held by the owner/author(s). \par
-    \noindent ACM \@copyrightdata.\par
-    \noindent http://dx.doi.org/10.1145/\@doi}}
-
-% The following permission notices are
-% for the traditional copyright transfer agreement option.
-
-% Exclusive license and permission-to-publish 
-% give more complicated permission notices.
-% These are not covered here.
-
-\newcommand{\ACMCanadapermission}{%
-  \permission{%
-    ACM acknowledges that this contribution was authored or
-    co-authored by an affiliate of the Canadian National
-    Government. As such, the Crown in Right of Canada retains an equal
-    interest in the copyright. Reprint requests should be forwarded to
-    ACM.}}
-
-\newcommand{\ACMUSpermission}{%
-  \permission{%
-    ACM acknowledges that this contribution was authored or
-    co-authored by a contractor or affiliate of the United States
-    Government. As such, the United States Government retains a
-    nonexclusive, royalty-free right to publish or reproduce this
-    article, or to allow others to do so, for Government purposes
-    only.}}
-
-\newcommand{\USpublicpermission}{%
-  \permission{%
-    This paper is authored by an employee(s) of the United States
-    Government and is in the public domain. Non-exclusive copying or
-    redistribution is allowed, provided that the article citation is
-    given and the authors and the agency are clearly identified as its
-    source.}%
-  \toappear{%
-    \noindent \@permission \par
-    \vspace{2pt}
-    \noindent \textsl{\@conferencename}, \quad \@conferenceinfo. \par
-    \noindent ACM \@copyrightdata.\par
-    \noindent http://dx.doi.org/10.1145/\@doi}}
-
-\newcommand{\authorversion}[4]{%
-  \permission{%
-  Copyright \copyright\ ACM, #1. This is the author's version of the work.
-  It is posted here by permission of ACM for your personal use.
-  Not for redistribution. The definitive version was published in
-  #2, #3, http://dx.doi.org/10.1145/#4.}}
-
-%                       Enunciations
-%                       ------------
-
-
-\def \@begintheorem #1#2{%                      {name}{number}
-  \trivlist
-  \item[\hskip \labelsep \textsc{#1 #2.}]%
-  \itshape\selectfont
-  \ignorespaces}
-
-\def \@opargbegintheorem #1#2#3{%               {name}{number}{title}
-  \trivlist
-  \item[%
-    \hskip\labelsep \textsc{#1\ #2}%
-    \if \@notp{\@emptyargp{#3}}\nut (#3).\fi]%
-  \itshape\selectfont
-  \ignorespaces}
-
-%                       Figures
-%                       -------
-
-
-\@setflag \@caprule = \@true
-
-\long\def \@makecaption #1#2{%
-  \addvspace{4pt}
-  \if \@caprule
-    \hrule width \hsize height .33pt
-    \vspace{4pt}
-  \fi
-  \setbox \@tempboxa = \hbox{\@setfigurenumber{#1.}\nut #2}%
-  \if \@dimgtrp{\wd\@tempboxa}{\hsize}%
-    \noindent \@setfigurenumber{#1.}\nut #2\par
-  \else
-    \centerline{\box\@tempboxa}%
-  \fi}
-
-\newcommand{\nocaptionrule}{%
-  \@setflag \@caprule = \@false}
-
-\def \@setfigurenumber #1{%
-  {\rmfamily \bfseries \selectfont #1}}
-
-%                       Hierarchy
-%                       ---------
-
-
-\setcounter{secnumdepth}{\@numheaddepth}
-
-\newskip{\@sectionaboveskip}
-\setvspace{\@sectionaboveskip}{10pt plus 3pt minus 2pt}
-
-\newskip{\@sectionbelowskip}
-\if \@blockstyle
-  \setlength{\@sectionbelowskip}{0.1pt}%
-\else
-  \setlength{\@sectionbelowskip}{4pt}%
-\fi
-
-\renewcommand{\section}{%
-  \@startsection
-    {section}%
-    {1}%
-    {0pt}%
-    {-\@sectionaboveskip}%
-    {\@sectionbelowskip}%
-    {\large \bfseries \raggedright}}
-
-\newskip{\@subsectionaboveskip}
-\setvspace{\@subsectionaboveskip}{8pt plus 2pt minus 2pt}
-
-\newskip{\@subsectionbelowskip}
-\if \@blockstyle
-  \setlength{\@subsectionbelowskip}{0.1pt}%
-\else
-  \setlength{\@subsectionbelowskip}{4pt}%
-\fi
-
-\renewcommand{\subsection}{%
-  \@startsection%
-    {subsection}%
-    {2}%
-    {0pt}%
-    {-\@subsectionaboveskip}%
-    {\@subsectionbelowskip}%
-    {\normalsize \bfseries \raggedright}}
-
-\renewcommand{\subsubsection}{%
-  \@startsection%
-    {subsubsection}%
-    {3}%
-    {0pt}%
-    {-\@subsectionaboveskip}
-    {\@subsectionbelowskip}%
-    {\normalsize \bfseries \raggedright}}
-
-\newskip{\@paragraphaboveskip}
-\setvspace{\@paragraphaboveskip}{6pt plus 2pt minus 2pt}
-
-\renewcommand{\paragraph}{%
-  \@startsection%
-    {paragraph}%
-    {4}%
-    {0pt}%
-    {\@paragraphaboveskip}
-    {-1em}%
-    {\normalsize \bfseries \if \@times \itshape \fi}}
-
-\renewcommand{\subparagraph}{%
-  \@startsection%
-    {subparagraph}%
-    {4}%
-    {0pt}%
-    {\@paragraphaboveskip}
-    {-1em}%
-    {\normalsize \itshape}}
-
-% Standard headings:
-
-\newcommand{\acks}{\section*{Acknowledgments}}
-
-\newcommand{\keywords}{\paragraph*{Keywords}}
-
-\newcommand{\terms}{\paragraph*{General Terms}}
-
-%                       Identification
-%                       --------------
-
-
-\def \@conferencename {}
-\def \@conferenceinfo {}
-\def \@copyrightyear {}
-\def \@copyrightdata {[to be supplied]}
-\def \@proceedings {[Unknown Proceedings]}
-
-
-\newcommand{\conferenceinfo}[2]{%
-  \gdef \@conferencename {#1}%
-  \gdef \@conferenceinfo {#2}}
-
-\newcommand{\copyrightyear}[1]{%
-  \gdef \@copyrightyear {#1}}
-
-\let \CopyrightYear = \copyrightyear
-
-\newcommand{\copyrightdata}[1]{%
-  \gdef \@copyrightdata {#1}}
-
-\let \crdata = \copyrightdata
-
-\newcommand{\doi}[1]{%
-  \gdef \@doi {#1}}
-
-\newcommand{\proceedings}[1]{%
-  \gdef \@proceedings {#1}}
-
-%                       Lists
-%                       -----
-
-
-\setlength{\leftmargini}{13pt}
-\setlength\leftmarginii{13pt}
-\setlength\leftmarginiii{13pt}
-\setlength\leftmarginiv{13pt}
-\setlength{\labelsep}{3.5pt}
-
-\setlength{\topsep}{\standardvspace}
-\if \@blockstyle
-  \setlength{\itemsep}{1pt}
-  \setlength{\parsep}{3pt}
-\else
-  \setlength{\itemsep}{1pt}
-  \setlength{\parsep}{3pt}
-\fi
-
-\renewcommand{\labelitemi}{{\small \centeroncapheight{\textbullet}}}
-\renewcommand{\labelitemii}{\centeroncapheight{\rule{2.5pt}{2.5pt}}}
-\renewcommand{\labelitemiii}{$-$}
-\renewcommand{\labelitemiv}{{\Large \textperiodcentered}}
-
-\renewcommand{\@listi}{%
-  \leftmargin = \leftmargini
-  \listparindent = 0pt}
-%%%  \itemsep = 1pt
-%%%  \parsep = 3pt}
-%%%  \listparindent = \parindent}
-
-\let \@listI = \@listi
-
-\renewcommand{\@listii}{%
-  \leftmargin = \leftmarginii
-  \topsep = 1pt
-  \labelwidth = \leftmarginii
-  \advance \labelwidth by -\labelsep
-  \listparindent = \parindent}
-
-\renewcommand{\@listiii}{%
-  \leftmargin = \leftmarginiii
-  \labelwidth = \leftmarginiii
-  \advance \labelwidth by -\labelsep
-  \listparindent = \parindent}
-
-\renewcommand{\@listiv}{%
-  \leftmargin = \leftmarginiv
-  \labelwidth = \leftmarginiv
-  \advance \labelwidth by -\labelsep
-  \listparindent = \parindent}
-
-%                       Mathematics
-%                       -----------
-
-
-\def \theequation {\arabic{equation}}
-
-%                       Miscellaneous
-%                       -------------
-
-
-\newcommand{\balancecolumns}{%
-  \vfill\eject
-  \global\@colht = \textheight
-  \global\ht\@cclv = \textheight}
-
-\newcommand{\nut}{\hspace{.5em}}
-
-\newcommand{\softraggedright}{%
-  \let \\ = \@centercr
-  \leftskip = 0pt
-  \rightskip = 0pt plus 10pt}
-
-%                       Program Code
-%                       ------- ----
-
-
-\newcommand{\mono}[1]{%
-  {\@tempdima = \fontdimen2\font
-   \texttt{\spaceskip = 1.1\@tempdima #1}}}
-
-%                       Running Heads and Feet
-%                       ------- ----- --- ----
-
-
-\def \@preprintfooter {}
-
-\newcommand{\preprintfooter}[1]{%
-  \gdef \@preprintfooter {#1}}
-
-\if \@preprint
-
-\def \ps@plain {%
-  \let \@mkboth = \@gobbletwo
-  \let \@evenhead = \@empty
-  \def \@evenfoot {\scriptsize
-                   \rlap{\textit{\@preprintfooter}}\hfil
-                   \thepage \hfil
-                   \llap{\textit{\@formatyear}}}%
-  \let \@oddhead = \@empty
-  \let \@oddfoot = \@evenfoot}
-
-\else\if \@reprint
-
-\def \ps@plain {%
-  \let \@mkboth = \@gobbletwo
-  \let \@evenhead = \@empty
-  \def \@evenfoot {\scriptsize \hfil \thepage \hfil}%
-  \let \@oddhead = \@empty
-  \let \@oddfoot = \@evenfoot}
-
-\else
-
-\let \ps@plain = \ps@empty
-\let \ps@headings = \ps@empty
-\let \ps@myheadings = \ps@empty
-
-\fi\fi
-
-\def \@formatyear {%
-  \number\year/\number\month/\number\day}
-
-%                       Special Characters
-%                       ------- ----------
-
-
-\DeclareRobustCommand{\euro}{%
-  \protect{\rlap{=}}{\sf \kern .1em C}}
-
-%                       Title Page
-%                       ----- ----
-
-
-\@setflag \@addauthorsdone = \@false
-
-\def \@titletext {\@latex@error{No title was provided}{}}
-\def \@subtitletext {}
-
-\newcount{\@authorcount}
-
-\newcount{\@titlenotecount}
-\newtoks{\@titlenotetext}
-
-\def \@titlebanner {}
-
-\renewcommand{\title}[1]{%
-  \gdef \@titletext {#1}}
-
-\newcommand{\subtitle}[1]{%
-  \gdef \@subtitletext {#1}}
-
-\newcommand{\authorinfo}[3]{%           {names}{affiliation}{email/URL}
-  \global\@increment \@authorcount
-  \@withname\gdef {\@authorname\romannumeral\@authorcount}{#1}%
-  \@withname\gdef {\@authoraffil\romannumeral\@authorcount}{#2}%
-  \@withname\gdef {\@authoremail\romannumeral\@authorcount}{#3}}
-
-\renewcommand{\author}[1]{%
-  \@latex@error{The \string\author\space command is obsolete;
-                use \string\authorinfo}{}}
-
-\newcommand{\titlebanner}[1]{%
-  \gdef \@titlebanner {#1}}
-
-\renewcommand{\maketitle}{%
-  \pagestyle{plain}%
-  \if \@onecolumn
-    {\hsize = \standardtextwidth
-     \@maketitle}%
-  \else
-    \twocolumn[\@maketitle]%
-  \fi
-  \@placetitlenotes
-  \if \@copyrightwanted \@copyrightspace \fi}
-
-\def \@maketitle {%
-  \begin{center}
-  \@settitlebanner
-  \let \thanks = \titlenote
-  {\leftskip = 0pt plus 0.25\linewidth
-   \rightskip = 0pt plus 0.25 \linewidth
-   \parfillskip = 0pt
-   \spaceskip = .7em
-   \noindent \LARGE \bfseries \@titletext \par}
-  \vskip 6pt
-  \noindent \Large \@subtitletext \par
-  \vskip 12pt
-  \ifcase \@authorcount
-    \@latex@error{No authors were specified for this paper}{}\or
-    \@titleauthors{i}{}{}\or
-    \@titleauthors{i}{ii}{}\or
-    \@titleauthors{i}{ii}{iii}\or
-    \@titleauthors{i}{ii}{iii}\@titleauthors{iv}{}{}\or
-    \@titleauthors{i}{ii}{iii}\@titleauthors{iv}{v}{}\or
-    \@titleauthors{i}{ii}{iii}\@titleauthors{iv}{v}{vi}\or
-    \@titleauthors{i}{ii}{iii}\@titleauthors{iv}{v}{vi}%
-                  \@titleauthors{vii}{}{}\or
-    \@titleauthors{i}{ii}{iii}\@titleauthors{iv}{v}{vi}%
-                  \@titleauthors{vii}{viii}{}\or
-    \@titleauthors{i}{ii}{iii}\@titleauthors{iv}{v}{vi}%
-                  \@titleauthors{vii}{viii}{ix}\or
-    \@titleauthors{i}{ii}{iii}\@titleauthors{iv}{v}{vi}%
-                  \@titleauthors{vii}{viii}{ix}\@titleauthors{x}{}{}\or
-    \@titleauthors{i}{ii}{iii}\@titleauthors{iv}{v}{vi}%
-                  \@titleauthors{vii}{viii}{ix}\@titleauthors{x}{xi}{}\or
-    \@titleauthors{i}{ii}{iii}\@titleauthors{iv}{v}{vi}%
-                  \@titleauthors{vii}{viii}{ix}\@titleauthors{x}{xi}{xii}%
-  \else
-    \@latex@error{Cannot handle more than 12 authors}{}%
-  \fi
-  \vspace{1.75pc}
-  \end{center}}
-
-\def \@settitlebanner {%
-  \if \@andp{\@preprint}{\@notp{\@emptydefp{\@titlebanner}}}%
-    \vbox to 0pt{%
-      \vskip -32pt
-      \noindent \textbf{\@titlebanner}\par
-      \vss}%
-    \nointerlineskip
-  \fi}
-
-\def \@titleauthors #1#2#3{%
-  \if \@andp{\@emptyargp{#2}}{\@emptyargp{#3}}%
-    \noindent \@setauthor{40pc}{#1}{\@false}\par
-  \else\if \@emptyargp{#3}%
-    \noindent \@setauthor{17pc}{#1}{\@false}\hspace{3pc}%
-              \@setauthor{17pc}{#2}{\@false}\par
-  \else
-    \noindent \@setauthor{12.5pc}{#1}{\@false}\hspace{2pc}%
-              \@setauthor{12.5pc}{#2}{\@false}\hspace{2pc}%
-              \@setauthor{12.5pc}{#3}{\@true}\par
-    \relax
-  \fi\fi
-  \vspace{20pt}}
-
-\def \@setauthor #1#2#3{%                       {width}{text}{unused}
-  \vtop{%
-    \def \and {%
-      \hspace{16pt}}
-    \hsize = #1
-    \normalfont
-    \centering
-    \large \@name{\@authorname#2}\par
-    \vspace{5pt}
-    \normalsize \@name{\@authoraffil#2}\par
-    \vspace{2pt}
-    \textsf{\@name{\@authoremail#2}}\par}}
-
-\def \@maybetitlenote #1{%
-  \if \@andp{#1}{\@gtrp{\@authorcount}{3}}%
-    \titlenote{See page~\pageref{@addauthors} for additional authors.}%
-  \fi}
-
-\newtoks{\@fnmark}
-
-\newcommand{\titlenote}[1]{%
-  \global\@increment \@titlenotecount
-  \ifcase \@titlenotecount \relax \or
-    \@fnmark = {\ast}\or
-    \@fnmark = {\dagger}\or
-    \@fnmark = {\ddagger}\or
-    \@fnmark = {\S}\or
-    \@fnmark = {\P}\or
-    \@fnmark = {\ast\ast}%
-  \fi
-  \,$^{\the\@fnmark}$%
-  \edef \reserved@a {\noexpand\@appendtotext{%
-                       \noexpand\@titlefootnote{\the\@fnmark}}}%
-  \reserved@a{#1}}
-
-\def \@appendtotext #1#2{%
-  \global\@titlenotetext = \expandafter{\the\@titlenotetext #1{#2}}}
-
-\newcount{\@authori}
-
-\iffalse
-\def \additionalauthors {%
-  \if \@gtrp{\@authorcount}{3}%
-    \section{Additional Authors}%
-    \label{@addauthors}%
-    \noindent
-    \@authori = 4
-    {\let \\ = ,%
-     \loop 
-       \textbf{\@name{\@authorname\romannumeral\@authori}},
-       \@name{\@authoraffil\romannumeral\@authori},
-       email: \@name{\@authoremail\romannumeral\@authori}.%
-       \@increment \@authori
-     \if \@notp{\@gtrp{\@authori}{\@authorcount}} \repeat}%
-    \par
-  \fi
-  \global\@setflag \@addauthorsdone = \@true}
-\fi
-
-\let \addauthorsection = \additionalauthors
-
-\def \@placetitlenotes {
-  \the\@titlenotetext}
-
-%                       Utilities
-%                       ---------
-
-
-\newcommand{\centeroncapheight}[1]{%
-  {\setbox\@tempboxa = \hbox{#1}%
-   \@measurecapheight{\@tempdima}%         % Calculate ht(CAP) - ht(text)
-   \advance \@tempdima by -\ht\@tempboxa   %           ------------------
-   \divide \@tempdima by 2                 %                   2
-   \raise \@tempdima \box\@tempboxa}}
-
-\newbox{\@measbox}
-
-\def \@measurecapheight #1{%                            {\dimen}
-  \setbox\@measbox = \hbox{ABCDEFGHIJKLMNOPQRSTUVWXYZ}%
-  #1 = \ht\@measbox}
-
-\long\def \@titlefootnote #1#2{%
-  \insert\footins{%
-    \reset@font\footnotesize
-    \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth \@parboxrestore
-%%%    \protected@edef\@currentlabel{%
-%%%       \csname p@footnote\endcsname\@thefnmark}%
-    \color@begingroup
-      \def \@makefnmark {$^{#1}$}%
-      \@makefntext{%
-        \rule\z@\footnotesep\ignorespaces#2\@finalstrut\strutbox}%
-    \color@endgroup}}
-
-%                       LaTeX Modifications
-%                       ----- -------------
-
-\def \@seccntformat #1{%
-  \@name{\the#1}%
-  \@expandaftertwice\@seccntformata \csname the#1\endcsname.\@mark
-  \quad}
-
-\def \@seccntformata #1.#2\@mark{%
-  \if \@emptyargp{#2}.\fi}
-
-%                       Revision History
-%                       -------- -------
-
-
-%  Date         Person  Ver.    Change
-%  ----         ------  ----    ------
-
-%  2004.09.12   PCA     0.1--4  Preliminary development.
-
-%  2004.11.18   PCA     0.5     Start beta testing.
-
-%  2004.11.19   PCA     0.6     Obsolete \author and replace with
-%                               \authorinfo.
-%                               Add 'nocopyrightspace' option.
-%                               Compress article opener spacing.
-%                               Add 'mathtime' option.
-%                               Increase text height by 6 points.
-
-%  2004.11.28   PCA     0.7     Add 'cm/computermodern' options.
-%                               Change default to Times text.
-
-%  2004.12.14   PCA     0.8     Remove use of mathptm.sty; it cannot
-%                               coexist with latexsym or amssymb.
-
-%  2005.01.20   PCA     0.9     Rename class file to sigplanconf.cls.
-
-%  2005.03.05   PCA     0.91    Change default copyright data.
-
-%  2005.03.06   PCA     0.92    Add at-signs to some macro names.
-
-%  2005.03.07   PCA     0.93    The 'onecolumn' option defaults to '11pt',
-%                               and it uses the full type width.
-
-%  2005.03.15   PCA     0.94    Add at-signs to more macro names.
-%                               Allow margin paragraphs during review.
-
-%  2005.03.22   PCA     0.95    Implement \euro.
-%                               Remove proof and newdef environments.
-
-%  2005.05.06   PCA     1.0     Eliminate 'onecolumn' option.
-%                               Change footer to small italic and eliminate
-%                               left portion if no \preprintfooter.
-%                               Eliminate copyright notice if preprint.
-%                               Clean up and shrink copyright box.
-
-%  2005.05.30   PCA     1.1     Add alternate permission statements.
-
-%  2005.06.29   PCA     1.1     Publish final first edition of guide.
-
-%  2005.07.14   PCA     1.2     Add \subparagraph.
-%                               Use block paragraphs in lists, and adjust
-%                               spacing between items and paragraphs.
-
-%  2006.06.22   PCA     1.3     Add 'reprint' option and associated
-%                               commands.
-
-%  2006.08.24   PCA     1.4     Fix bug in \maketitle case command.
-
-%  2007.03.13   PCA     1.5     The title banner only displays with the
-%                               'preprint' option.
-
-%  2007.06.06   PCA     1.6     Use \bibfont in \thebibliography.
-%                               Add 'natbib' option to load and configure
-%                                 the natbib package.
-
-%  2007.11.20   PCA     1.7     Balance line lengths in centered article
-%                                 title (thanks to Norman Ramsey).
-
-%  2009.01.26   PCA     1.8     Change natbib \bibpunct values.
-
-%  2009.03.24   PCA     1.9     Change natbib to use the 'numbers' option.
-%                               Change templates to use 'natbib' option.
-
-%  2009.09.01   PCA     2.0     Add \reprintprice command (suggested by
-%                                 Stephen Chong).
-
-%  2009.09.08   PCA     2.1     Make 'natbib' the default; add 'nonatbib'.
-%               SB              Add 'authoryear' and 'numbers' (default) to
-%                               control citation style when using natbib.
-%                               Add \bibpunct to change punctuation for
-%                               'authoryear' style.
-
-%  2009.09.21   PCA     2.2     Add \softraggedright to the thebibliography
-%                               environment. Also add to template so it will
-%                               happen with natbib.
-
-%  2009.09.30   PCA     2.3     Remove \softraggedright from thebibliography.  
-%                               Just include in the template.
-
-%  2010.05.24   PCA     2.4     Obfuscate class author's email address.
-
-%  2011.11.08   PCA     2.5     Add copyright notice to this file.
-%                               Remove 'sort' option from natbib when using
-%                                 'authoryear' style.
-%                               Add the \authorversion command.
-
-%  2013.02.22   PCA     2.6     Change natbib fences to parentheses when
-%                                 using 'authoryear' style.
-
-%  2013.05.17   PCA     2.7     Change standard and author copyright text.
-
-%  2013.07.02   TU      2.8     More changes to permission/copyright notes.
-%                               Replaced ambiguous \authorpermission with
-%                               \exclusivelicense and \permissiontopublish
- 
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/style.tex
deleted file mode 100644
index 2ebb8aacec..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/style.tex
+++ /dev/null
@@ -1,41 +0,0 @@
-
-% Define \SXtitle to lift \SSubtitle out:
-\def\SXtitle#1{\title{\let\SSubtitle\SSubtitleDrop#1}\SExtractSubtitle#1\SExtractSubtitleDone}
-\def\SSubtitleDrop#1{}
-\def\SExtractSubtitleDone {}
-\def\SExtractSubtitle{\futurelet\next\SExtractSubtitleX}
-\def\SExtractSubtitleX#1{\ifx#1\SSubtitle \let\Snext\SWithSubtitle \else \let\Snext\SExtractSubtitleY \fi \Snext}
-\def\SExtractSubtitleY{\ifx\next\SExtractSubtitleDone \let\Snext\relax \else \let\Snext\SExtractSubtitle \fi \Snext}
-\def\SWithSubtitle#1{\subtitle{#1}\SExtractSubtitle}
-
-\renewcommand{\titleAndVersionAndAuthors}[3]{\SXtitle{#1}#3\maketitle}
-\renewcommand{\titleAndEmptyVersionAndAuthors}[3]{\titleAndVersionAndAuthors{#1}{#2}{#3}}
-\renewcommand{\titleAndVersionAndEmptyAuthors}[3]{\SXtitle{#1}\authorinfo{Anonymous}{}{}\maketitle}
-\renewcommand{\titleAndEmptyVersionAndEmptyAuthors}[3]{\titleAndVersionAndEmptyAuthors{#1}{#2}{#3}}
-
-% Support plain `author' while enabling `authorinfo': for each
-% use of \SAuthor, check whether it contains an \SAuthorinfo form:
-\def\SAuthor#1{\SAutoAuthor#1\SAutoAuthorDone{#1}}
-\def\SAutoAuthorDone#1{}
-\def\SAutoAuthor{\futurelet\next\SAutoAuthorX}
-\def\SAutoAuthorX{\ifx\next\SAuthorinfo \let\Snext\relax \else \let\Snext\SToAuthorDone \fi \Snext}
-\def\SToAuthorDone{\futurelet\next\SToAuthorDoneX}
-\def\SToAuthorDoneX#1{\ifx\next\SAutoAuthorDone \let\Snext\SAddAuthorInfo \else \let\Snext\SToAuthorDone \fi \Snext}
-\newcommand{\SAddAuthorInfo}[1]{\authorinfo{#1}{}{}}
-
-\renewcommand{\SAuthorinfo}[3]{\authorinfo{#1}{#2}{#3}}
-\renewcommand{\SAuthorSep}[1]{}
-
-\renewcommand{\SConferenceInfo}[2]{\conferenceinfo{#1}{#2}}
-\renewcommand{\SCopyrightYear}[1]{\copyrightyear{#1}}
-\renewcommand{\SCopyrightData}[1]{\copyrightdata{#1}}
-\renewcommand{\Sdoi}[1]{\doi{#1}}
-\renewcommand{\SPexclusivelicense}[0]{\exclusivelicense}
-
-\renewcommand{\SCategory}[3]{\category{#1}{#2}{#3}}
-\renewcommand{\SCategoryPlus}[4]{\category{#1}{#2}{#3}[#4]}
-\renewcommand{\STerms}[1]{\terms{#1}}
-\renewcommand{\SKeywords}[1]{\keywords{#1}}
-
-% A later \doi will replace this one:
-\doi{}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/srcdoc.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/srcdoc.rkt
deleted file mode 100644
index 232cdad95f..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/srcdoc.rkt
+++ /dev/null
@@ -1,694 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         (for-syntax racket/base
-                     racket/require-transform
-                     racket/provide-transform
-                     syntax/stx
-                     syntax/private/modcollapse-noctc
-                     syntax/parse))
-
-(provide for-doc require/doc
-         provide/doc ; not needed anymore
-         thing-doc
-         parameter-doc
-         proc-doc
-         proc-doc/names
-         struct-doc
-         struct*-doc
-         form-doc
-         generate-delayed-documents
-         begin-for-doc)
-
-(begin-for-syntax
- (define requires null)
- (define doc-body null)
- (define doc-exprs null)
- (define generated? #f)
- (define delayed? #f)
-
- (define (add-requires!/decl specs)
-   (unless delayed?
-     (syntax-local-lift-module-end-declaration
-      #`(begin-for-syntax (add-relative-requires! (#%variable-reference)
-                                                  (quote-syntax #,specs)))))
-   (add-requires! (syntax-local-introduce specs)))
-
- (define (add-relative-requires! varref specs)
-   (define mpi (variable-reference->module-path-index varref))
-   (define-values (name base) (module-path-index-split mpi))
-   (if name
-       (add-requires!
-        (with-syntax ([(spec ...) specs]
-                      [rel-to (collapse-module-path-index 
-                               mpi
-                               (build-path (or (current-load-relative-directory)
-                                               (current-directory))
-                                           "here.rkt"))])
-          #'((relative-in rel-to spec) ...)))
-       (add-requires! specs)))
-
- (define (add-requires! specs)
-   (set! requires (cons specs requires)))
- 
- (define (generate-doc-submodule!)
-   (unless generated?
-     (set! generated? #t)
-     (syntax-local-lift-module-end-declaration #'(doc-submodule)))))
-
-(define-syntax for-doc
-  (make-require-transformer
-   (lambda (stx)
-     (syntax-case stx ()
-       [(_ spec ...)
-        (add-requires!/decl #'(spec ...))])
-     (values null null))))
-
-(define-syntax (doc-submodule stx)
-  (with-syntax ([((req ...) ...)
-                 (map syntax-local-introduce (reverse requires))]
-                [(expr ...) (map syntax-local-introduce (reverse doc-exprs))]
-                [doc-body
-                 (map (lambda (s) (syntax-local-introduce
-                                   (syntax-shift-phase-level s #f)))
-                      (reverse doc-body))])
-    ;; This module will be required `for-template':
-    (if delayed?
-        ;; delayed mode: return syntax objects to drop into context:
-        #'(begin-for-syntax
-           (module* srcdoc #f
-             (require (for-syntax racket/base syntax/quote))
-             (begin-for-syntax
-              (provide get-docs)
-              (define (get-docs)
-                (list (quote-syntax (req ... ...))
-                      (quote-syntax (expr ...))
-                      (quote-syntax/keep-srcloc #:source 'doc doc-body))))))
-        ;; normal mode: return an identifier that holds the document:
-        (with-syntax ([((id d) ...) #'doc-body])
-          #'(begin-for-syntax
-             (module* srcdoc #f
-               (require req ... ...)
-               expr ...
-               (define docs (list (cons 'id d) ...))
-               (require (for-syntax racket/base))
-               (begin-for-syntax
-                (provide get-docs)
-                (define (get-docs)
-                  #'docs))))))))
-
-(define-syntax (require/doc stx)
-  (syntax-case stx ()
-    [(_ spec ...)
-     (add-requires!/decl #'(spec ...))
-     #'(begin)]))
-
-(define-for-syntax (do-provide/doc stx modes)
-  (let ([forms (list stx)])
-    (with-syntax ([((for-provide/contract (req ...) d id) ...)
-                   (map (lambda (form)
-                          (syntax-case form ()
-                            [(id . _)
-                             (identifier? #'id)
-                             (let ([t (syntax-local-value #'id (lambda () #f))])
-                               (unless (provide/doc-transformer? t)
-                                 (raise-syntax-error
-                                  #f
-                                  "not bound as a provide/doc transformer"
-                                  stx
-                                  #'id))
-                               (let* ([i (make-syntax-introducer)]
-                                      [i2 (lambda (x) (syntax-local-introduce (i x)))])
-                                 (let-values ([(p/c d req/d id)
-                                               ((provide/doc-transformer-proc t)
-                                                (i (syntax-local-introduce form)))])
-                                   (list (i2 p/c) (i req/d) (i d) (i id)))))]
-                            [_
-                             (raise-syntax-error
-                              #f
-                              "not a provide/doc sub-form"
-                              stx
-                              form)]))
-                        forms)])
-      (with-syntax ([(p/c ...)
-                     (map (lambda (form f)
-                            (if (identifier? f)
-                                f
-                                (quasisyntax/loc form
-                                  (contract-out #,f))))
-                          forms
-                          (syntax->list #'(for-provide/contract ...)))])
-        (generate-doc-submodule!)
-        (set! doc-body (append (reverse (syntax->list #'((id d) ...)))
-                               doc-body))
-        (set! requires (cons #'(req ... ...) requires))
-        (pre-expand-export #'(combine-out p/c ...) modes)))))
-
-(define-syntax (begin-for-doc stx)
-  (syntax-case stx ()
-    [(_ d ...)
-     (set! doc-exprs (append (reverse (syntax->list 
-                                       (syntax-local-introduce
-                                        #'(d ...))))
-                             doc-exprs))
-     #'(begin)]))
-
-(define-syntax-rule (provide/doc form ...)
-  (provide form ...))
-
-
-
-(provide define-provide/doc-transformer
-         (for-syntax
-          provide/doc-transformer?
-          provide/doc-transformer-proc))
-
-(begin-for-syntax
- (define-struct provide/doc-transformer (proc)
-   #:property 
-   prop:provide-pre-transformer
-   (lambda (self)
-     (lambda (stx mode)
-       (do-provide/doc stx mode)))))
-
-(define-syntax-rule (define-provide/doc-transformer id rhs)
-  (define-syntax id
-    (make-provide/doc-transformer rhs)))
-
-(module transformers racket/base
-  (require (for-template racket/base racket/contract)
-           racket/contract)
-  (provide proc-doc-transformer proc-doc/names-transformer)
-  
-  (define (remove->i-deps stx-lst arg?)
-    (let loop ([stx-lst stx-lst])
-      (cond
-        [(null? stx-lst) '()]
-        [else
-         (define fst (car stx-lst))
-         (syntax-case fst ()
-           [kwd
-            (and arg? (keyword? (syntax-e #'kwd)))
-            (let ()
-              (when (null? (cdr stx-lst))
-                (raise-syntax-error 'proc-doc "expected something to follow keyword" stx-lst))
-              (define snd (cadr stx-lst))
-              (syntax-case snd ()
-                [(id (id2 ...) ctc)
-                 (cons #'(kwd id ctc) (loop (cddr stx-lst)))]
-                [(id ctc)
-                 (cons #'(kwd id ctc) (loop (cddr stx-lst)))]
-                [else
-                 (raise-syntax-error 'proc-doc "unknown argument spec in ->i" snd)]))]
-           [(id (id2 ...) ctc)
-            (cons #'(id ctc) (loop (cdr stx-lst)))]
-           [(id ctc)
-            (cons #'(id ctc) (loop (cdr stx-lst)))]
-           [else
-            (raise-syntax-error 'proc-doc (if arg? "unknown argument spec in ->i" "unknown result spec in ->i") fst)])])))
-  
-  (define (proc-doc-transformer stx)
-    (syntax-case stx ()
-      [(_ id contract . desc+stuff)
-       (let ()
-         (define (one-desc desc+stuff)
-           (syntax-case desc+stuff ()
-             [(desc) #'desc]
-             [() (raise-syntax-error 'proc-doc "expected a description expression" stx)]
-             [(a b . c) (raise-syntax-error 'proc-doc "expected just a single description expression" stx #'a)]))
-         (define (parse-opts opts desc+stuff)
-           (syntax-case opts ()
-             [() #`(() #,(one-desc desc+stuff))]
-             [(opt ...)
-              (with-syntax ([(opt ...) (remove->i-deps (syntax->list #'(opt ...)) #t)])
-                (syntax-case desc+stuff ()
-                  [((defaults ...) . desc+stuff)
-                   (let ()
-                     (define def-list (syntax->list #'(defaults ...)))                
-                     (define opt-list (syntax->list #'(opt ...)))
-                     (unless (= (length def-list) (length opt-list))
-                       (raise-syntax-error 'proc-doc
-                                           (format "expected ~a default values, but got ~a"
-                                                   (length opt-list) (length def-list))
-                                           stx
-                                           opts))
-                     #`(#,(for/list ([opt (in-list opt-list)]
-                                     [def (in-list def-list)])
-                            (syntax-case opt ()
-                              [(id ctc)
-                               #`(id ctc #,def)]
-                              [(kwd id ctc)
-                               #`(kwd id ctc #,def)]))
-                        #,(one-desc #'desc+stuff)))]))]))
-         (define-values (header result body-extras desc)
-           (syntax-case #'contract (->d ->i -> values)
-             [(->d (req ...) () (values [name res] ...))
-              (values #'(id req ...) #'(values res ...) #'() (one-desc #'desc+stuff))]
-             [(->d (req ...) () #:pre-cond condition (values [name res] ...))
-              (values #'(id req ...) #'(values res ...) #'((bold "Pre-condition: ") (racket condition) "\n" "\n") (one-desc #'desc+stuff))]
-             [(->d (req ...) () [name res])
-              (values #'(id req ...) #'res #'() (one-desc #'desc+stuff))]
-             [(->d (req ...) () #:pre-cond condition [name res])
-              (values #'(id req ...) #'res #'((bold "Pre-condition: ")  (racket condition) "\n" "\n" ) (one-desc #'desc+stuff))]
-             [(->d (req ...) () #:rest rest rest-ctc [name res])
-              (values #'(id req ... [rest rest-ctc] (... ...)) #'res #'() (one-desc #'desc+stuff))]
-             [(->d (req ...) (one more ...) whatever)
-              (raise-syntax-error
-               #f
-               (format "unsupported ->d contract form for ~a, optional arguments non-empty, must use proc-doc/names"
-                       (syntax->datum #'id))
-               stx
-               #'contract)]
-             [(->d whatever ...) 
-              (raise-syntax-error
-               #f
-               (format "unsupported ->d contract form for ~a" (syntax->datum #'id))
-               stx
-               #'contract)]
-             
-             [(->i (req ...) (opt ...) (values ress ...))
-              (with-syntax ([(req ...) (remove->i-deps (syntax->list #'(req ...)) #t)]
-                            [((opt ...) desc) (parse-opts #'(opt ...) #'desc+stuff)]
-                            [([name res] ...) (remove->i-deps (syntax->list #'(req ...)) #f)])
-                (values #'(id req ... opt ...) #'(values res ...) #'() #'desc))]
-             [(->i (req ...) (opt ...) #:pre (pre-id ...) condition (values ress ...))
-              (with-syntax ([(req ...) (remove->i-deps (syntax->list #'(req ...)) #t)]
-                            [((opt ...) desc) (parse-opts #'(opt ...) #'desc+stuff)]
-                            [([name res] ...) (remove->i-deps (syntax->list #'(req ...)) #f)])
-                (values #'(id req ... opt ...) #'(values res ...) #'((bold "Pre-condition: ") (racket condition) "\n" "\n") #'desc))]
-             [(->i (req ...) (opt ...) res)
-              (with-syntax ([(req ...) (remove->i-deps (syntax->list #'(req ...)) #t)]
-                            [((opt ...) desc) (parse-opts #'(opt ...) #'desc+stuff)]
-                            [([name res]) (remove->i-deps (list #'res) #f)])
-                (values #'(id req ... opt ...) #'res #'() #'desc))]
-             [(->i (req ...) (opt ...) #:pre (pre-id ...) condition [name res])
-              (with-syntax ([(req ...) (remove->i-deps (syntax->list #'(req ...)) #t)]
-                            [((opt ...) desc) (parse-opts #'(opt ...) #'desc+stuff)]
-                            [([name res]) (remove->i-deps (list #'res) #f)])
-                (values #'(id req ... opt ...) #'res #'((bold "Pre-condition: ")  (racket condition) "\n" "\n" ) #'desc))]
-             [(->i (req ...) (opt ...) #:rest rest res)
-              (with-syntax ([(req ...) (remove->i-deps (syntax->list #'(req ...)) #t)]
-                            [((opt ...) desc) (parse-opts #'(opt ...) #'desc+stuff)]
-                            [([name-t rest-ctc]) (remove->i-deps (list #'rest) #t)]
-                            [([name res]) (remove->i-deps (list #'res) #f)])
-                (values #'(id req ... opt ... [name-t rest-ctc] (... ...)) #'res #'() #'desc))]
-             [(->i whatever ...) 
-              (raise-syntax-error
-               #f
-               (format "unsupported ->i contract form for ~a" (syntax->datum #'id))
-               stx
-               #'contract)]
-             
-             [(-> result)
-              (values #'(id) #'result #'() (one-desc #'desc+stuff))]
-             [(-> whatever ...) 
-              (raise-syntax-error
-               #f
-               (format "unsupported -> contract form for ~a, must use proc-doc/names if there are arguments"
-                       (syntax->datum #'id))
-               stx
-               #'contract)]
-             [(id whatever ...)
-              (raise-syntax-error
-               #f
-               (format "unsupported ~a contract form (unable to synthesize argument names)" (syntax->datum #'id))
-               stx
-               #'contract)]))
-         (values
-          #'[id contract]
-          #`(defproc #,header #,result #,@body-extras #,@desc)
-          #'(scribble/manual
-             racket/base) ; for `...'
-          #'id))]))
-  
-  (define (proc-doc/names-transformer stx)
-    (syntax-case stx ()
-      [(_ id contract names desc)
-       (with-syntax ([header                      
-                      (syntax-case #'(contract names) (->d -> ->* values case->)
-                        [((-> ctcs ... result) (arg-names ...))
-                         (begin
-                           (unless (= (length (syntax->list #'(ctcs ...)))
-                                      (length (syntax->list #'(arg-names ...))))
-                             (raise-syntax-error #f "mismatched argument list and domain contract count" stx))
-                           #'([(id (arg-names ctcs) ...) result]))]
-                        
-                        [((->* (mandatory ...) (optional ...) result) 
-                          names)
-                         (syntax-case #'names ()
-                           [((mandatory-names ...)
-                             ((optional-names optional-default) ...))
-                            
-                            (let ([build-mandatories/optionals
-                                   (λ (names contracts extras)
-                                     (let ([names-length (length names)]
-                                           [contracts-length (length contracts)])
-                                       (let loop ([contracts contracts]
-                                                  [names names]
-                                                  [extras extras])
-                                         (cond
-                                           [(and (null? names) (null? contracts)) '()]
-                                           [(or (null? names) (null? contracts))
-                                            (raise-syntax-error #f
-                                                                (format "mismatched ~a argument list count and domain contract count (~a)"
-                                                                        (if extras "optional" "mandatory")
-                                                                        (if (null? names)
-                                                                            "ran out of names"
-                                                                            "ran out of contracts"))
-                                                                stx)]
-                                           [else
-                                            (let ([fst-name (car names)]
-                                                  [fst-ctc (car contracts)])
-                                              (if (keyword? (syntax-e fst-ctc))
-                                                  (begin
-                                                    (unless (pair? (cdr contracts))
-                                                      (raise-syntax-error #f
-                                                                          "keyword not followed by a contract"
-                                                                          stx))
-                                                    (cons (if extras
-                                                              (list fst-ctc fst-name (cadr contracts) (car extras))
-                                                              (list fst-ctc fst-name (cadr contracts)))
-                                                          (loop (cddr contracts)
-                                                                (cdr names)
-                                                                (if extras
-                                                                    (cdr extras)
-                                                                    extras))))
-                                                  (cons (if extras 
-                                                            (list fst-name fst-ctc (car extras))
-                                                            (list fst-name fst-ctc))
-                                                        (loop (cdr contracts) (cdr names) (if extras
-                                                                                              (cdr extras)
-                                                                                              extras)))))]))))])
-                            
-                              #`([(id #,@(build-mandatories/optionals (syntax->list #'(mandatory-names ...))
-                                                                      (syntax->list #'(mandatory ...))
-                                                                      #f)
-                                      #,@(build-mandatories/optionals (syntax->list #'(optional-names ...))
-                                                                      (syntax->list #'(optional ...))
-                                                                      (syntax->list #'(optional-default ...))))
-                                result]))]
-                           [(mandatory-names optional-names)
-                            (begin
-                              (syntax-case #'mandatory-names ()
-                                [(mandatory-names ...)
-                                 (andmap identifier? (syntax->list #'(mandatory-names ...)))]
-                                [x
-                                 (raise-syntax-error #f "mandatory names should be a sequence of identifiers" 
-                                                     stx 
-                                                     #'mandatory-names)])
-                              (syntax-case #'optional-names ()
-                                [((x y) ...)
-                                 (andmap identifier? (syntax->list #'(x ... y ...)))]
-                                [((x y) ...)
-                                 (for-each
-                                  (λ (var) 
-                                    (unless (identifier? var)
-                                      (raise-syntax-error #f "expected an identifier in the optional names" stx var)))
-                                  (syntax->list #'(x ... y ...)))]
-                                [(a ...)
-                                 (for-each
-                                  (λ (a)
-                                    (syntax-case stx ()
-                                      [(x y) (void)]
-                                      [other
-                                       (raise-syntax-error #f "expected an sequence of two idenfiers" stx #'other)]))
-                                  (syntax->list #'(a ...)))]))]
-                           [x
-                            (raise-syntax-error
-                             #f
-                             "expected two sequences, one of mandatory names and one of optionals"
-                             stx
-                             #'x)])]
-                        [((case-> (-> doms ... rng) ...)
-                          ((args ...) ...))
-                         (begin
-                           (unless (= (length (syntax->list #'((doms ...) ...)))
-                                      (length (syntax->list #'((args ...) ...))))
-                             (raise-syntax-error #f
-                                                 "number of cases and number of arg lists do not have the same size"
-                                                 stx))
-                           (for-each
-                            (λ (doms args)
-                              (unless (= (length (syntax->list doms))
-                                         (length (syntax->list args)))
-                                (raise-syntax-error #f "mismatched case argument list and domain contract" stx
-                                                    #f 
-                                                    (list doms args))))
-                            (syntax->list #'((doms ...) ...))
-                            (syntax->list #'((args ...) ...)))
-                           #'([(id (args doms) ...) rng] ...))]
-                        [else
-                         (raise-syntax-error
-                          #f
-                          "unsupported procedure contract form (no argument names)"
-                          stx
-                          #'contract)])])
-         (values
-          #'[id contract]
-          #'(defproc* header . desc)
-          #'((only-in scribble/manual defproc*))
-          #'id))])))
-
-(require (for-syntax (submod "." transformers)))
-(define-provide/doc-transformer proc-doc proc-doc-transformer)
-(define-provide/doc-transformer proc-doc/names proc-doc/names-transformer)
-
-(define-provide/doc-transformer parameter-doc
-  (lambda (stx)
-    (syntax-case stx (parameter/c)
-      [(_ id (parameter/c contract) arg-id desc)
-       (begin
-         (unless (identifier? #'arg-id)
-           (raise-syntax-error 'parameter-doc 
-                               "expected an identifier"
-                               stx
-                               #'arg-id))
-         (unless (identifier? #'id)
-           (raise-syntax-error 'parameter-doc 
-                               "expected an identifier"
-                               stx
-                               #'id))
-         (values
-          #'[id (parameter/c contract)]
-          #'(defparam id arg-id contract . desc)
-          #'((only-in scribble/manual defparam))
-          #'id))])))
-
-(define-for-syntax (struct-doc-transformer stx result-form)
-  (syntax-case stx ()
-    [(_ struct-name ([field-name contract-expr-datum] ...) . stuff)
-     (let ()
-       (define the-name #f)
-       (syntax-case #'struct-name ()
-         [x (identifier? #'x) (set! the-name #'x)]
-         [(x y) (and (identifier? #'x) (identifier? #'y)) 
-                (set! the-name #'x)]
-         [_
-          (raise-syntax-error #f 
-                              "expected an identifier or sequence of two identifiers"
-                              stx
-                              #'struct-name)])
-       (for ([f (in-list (syntax->list #'(field-name ...)))])
-         (unless (identifier? f)
-           (raise-syntax-error #f 
-                               "expected an identifier"
-                               stx
-                               f)))
-       (define omit-constructor? #f)
-       (define-values (ds-args desc)
-         (let loop ([ds-args '()]
-                    [stuff #'stuff])
-           (syntax-case stuff ()
-             [(#:mutable . more-stuff)
-              (loop (cons (stx-car stuff) ds-args)
-                    #'more-stuff)]
-             [(#:inspector #f . more-stuff)
-              (loop (list* (stx-car (stx-cdr stuff))
-                           (stx-car stuff)
-                           ds-args)
-                    #'more-stuff)]
-             [(#:prefab . more-stuff) 
-              (loop (cons (stx-car stuff) ds-args)
-                    #'more-stuff)]
-             [(#:transparent . more-stuff)
-              (loop (cons (stx-car stuff) ds-args)
-                    #'more-stuff)]
-             [(#:constructor-name id . more-stuff)
-              (loop (list* (stx-car (stx-cdr stuff))
-                           (stx-car stuff)
-                           ds-args)
-                    #'more-stuff)]
-             [(#:extra-constructor-name id . more-stuff)
-              (loop (list* (stx-car (stx-cdr stuff))
-                           (stx-car stuff)
-                           ds-args)
-                    #'more-stuff)]
-             [(#:omit-constructor . more-stuff)
-              (begin
-                (set! omit-constructor? #t)
-                (loop (cons (stx-car stuff) ds-args)
-                      #'more-stuff))]
-             [(x . more-stuff)
-              (keyword? (syntax-e #'x))
-              (raise-syntax-error #f
-                                  "unknown keyword"
-                                  stx
-                                  (stx-car stuff))]
-             [(desc)
-              (values (reverse ds-args) #'desc)]
-             [_
-              (raise-syntax-error #f "bad syntax" stx)])))
-       (values
-        #`(struct struct-name ((field-name contract-expr-datum) ...) 
-            #,@(if omit-constructor?
-                   '(#:omit-constructor)
-                   '()))
-        #`(#,result-form struct-name ([field-name contract-expr-datum] ...)
-                         #,@(reverse ds-args)
-                         #,@desc)
-        #`((only-in scribble/manual #,result-form))
-        the-name))]))
-
-(define-provide/doc-transformer struct-doc
-  (λ (stx) 
-    (struct-doc-transformer stx #'defstruct)))
-(define-provide/doc-transformer struct*-doc
-  (λ (stx) 
-    (struct-doc-transformer stx #'defstruct*)))
-
-(define-provide/doc-transformer thing-doc
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ id contract desc)
-       (begin
-         (unless (identifier? #'id)
-           (raise-syntax-error 'parameter/doc 
-                               "expected an identifier"
-                               stx
-                               #'id))
-         (values
-          #'[id contract]
-          #'(defthing id contract . desc)
-          #'((only-in scribble/manual defthing))
-          #'id))])))
-
-(begin-for-syntax
- (define-splicing-syntax-class kind-kw
-   #:description "#:kind keyword"
-   (pattern (~seq #:kind kind)
-            #:with (kind-seq ...) #'(#:kind kind))
-   (pattern (~seq)
-            #:with (kind-seq ...) #'()))
-
- (define-splicing-syntax-class link-target?-kw
-   #:description "#:link-target? keyword"
-   (pattern (~seq #:link-target? expr)
-            #:with (link-target-seq ...) #'(#:link-target? expr))
-   (pattern (~seq)
-            #:with (link-target-seq ...) #'()))
-
- (define-splicing-syntax-class id-kw
-   #:description "#:id keyword"
-   (pattern (~seq #:id [defined-id:id defined-id-expr])
-            #:with (id-seq ...) #'(#:id [defined-id:id defined-id-expr]))
-   (pattern (~seq #:id defined-id:id)
-            #:with (id-seq ...) #'(#:id defined-id))
-   (pattern (~seq #:id other)
-            #:with defined-id #'#f
-            #:with (id-seq ...) #'(#:id other))
-   (pattern (~seq)
-            #:with defined-id #'#f
-            #:with (id-seq ...) #'()))
-
- (define-splicing-syntax-class literals-kw
-   #:description "#:literals keyword"
-   (pattern (~seq #:literals l)
-            #:with (literals-seq ...) #'(#:literals l))
-   (pattern (~seq)
-            #:with (literals-seq ...) #'()))
-
- (define-splicing-syntax-class subs-kw
-   #:description "#:grammar keyword"
-   (pattern (~seq #:grammar g)
-            #:with (grammar-seq ...) #'(#:grammar g))
-   (pattern (~seq)
-            #:with (grammar-seq ...) #'()))
-
- (define-splicing-syntax-class contracts-kw
-   #:description "#:contracts keyword"
-   (pattern (~seq #:contracts c)
-            #:with (contracts-seq ...) #'(#:contracts c))
-   (pattern (~seq)
-            #:with (contracts-seq ...) #'())))
-
-(define-provide/doc-transformer form-doc
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ k:kind-kw lt:link-target?-kw d:id-kw l:literals-kw spec
-          subs:subs-kw c:contracts-kw desc)
-       (with-syntax ([id (if (syntax-e #'d.defined-id)
-                             #'d.defined-id
-                             (syntax-case #'spec ()
-                               [(id . rest)
-                                (identifier? #'id)
-                                #'id]
-                               [_ #'unknown]))])
-         (values
-          #'id
-          #'(defform 
-              k.kind-seq ...
-              lt.link-target-seq ...
-              d.id-seq ...
-              l.literals-seq ...
-              spec
-              subs.grammar-seq ...
-              c.contracts-seq ...
-              . desc)
-          #'((only-in scribble/manual defform))
-          #'id))])))
-
-(define-syntax (generate-delayed-documents stx)
-  (syntax-case stx () 
-    [(_) 
-     (begin
-       (set! delayed? #t)
-       #'(begin))]))
-
-
-(module+ test
-  (require (submod ".." transformers) 
-           rackunit
-           racket/contract)
-  
-  (define (try-docs transformer input) 
-    (define-values (_0 docs _1 _2) (transformer input))
-    (syntax->datum docs))
-  
-  (check-equal? (try-docs proc-doc-transformer #'(_ f (-> void?) ()))
-                '(defproc (f) void?))
-  (check-equal? (try-docs proc-doc-transformer #'(_ f (->i ([x integer?]) () [result void?]) ()))
-                '(defproc (f [x integer?]) void?))
-  (check-equal? (try-docs proc-doc-transformer #'(_ f (->i ([x integer?] #:y [y boolean?]) () [res void?]) ()))
-                '(defproc (f [x integer?] [#:y y boolean?]) void?))
-  (check-equal? (try-docs proc-doc-transformer #'(_ f (->i ([x integer?]) ([y boolean?] [z char?]) [result void?]) (#t #\x) ()))
-                '(defproc (f [x integer?] [y boolean? #t] [z char? #\x]) void?))
-  (check-equal? (try-docs proc-doc-transformer #'(_ f (->i ([x integer?] #:y [y boolean?]) ([z char?] #:w [w string?]) [res void?]) (#\a "b") ()))
-                '(defproc (f [x integer?] [#:y y boolean?] [z char? #\a] [#:w w string? "b"]) void?))
-  
-  (check-equal? (try-docs proc-doc-transformer
-                          #'(_ g
-                               (->i ([str string?])
-                                    ()
-                                    #:rest [rest (listof any/c)]
-                                    [res (str) integer?])
-                               ()))
-                '(defproc (g (str string?) (rest (listof any/c)) ...) integer?))
-  
-  (check-equal? (try-docs proc-doc/names-transformer #'(_ f (-> integer? char? boolean?) (a b) ()))
-                '(defproc* (((f [a integer?] [b char?]) boolean?))))
-  (check-equal? (try-docs proc-doc/names-transformer #'(_ f (->* (integer? char?) () boolean?) ((a b) ()) ()))
-                '(defproc* (((f [a integer?] [b char?]) boolean?))))
-  (check-equal? (try-docs proc-doc/names-transformer #'(_ f (->* (integer? char?) (string? number?) boolean?) ((a b) ((c "a") (d 11))) ()))
-                '(defproc* (((f [a integer?] [b char?] [c string? "a"] [d number? 11]) boolean?))))
-  (check-equal? (try-docs proc-doc/names-transformer #'(_ f (case-> (-> integer? char?) (-> string? number? boolean? void?)) ((a) (b c d)) ()))
-                '(defproc* (((f [a integer?]) char?)
-                            ((f [b string?] [c number?] [d boolean?]) void?)))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/struct.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/struct.rkt
deleted file mode 100644
index 3b4304546b..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/struct.rkt
+++ /dev/null
@@ -1,429 +0,0 @@
-#lang scheme/base
-(require (rename-in (except-in "core.rkt"
-                               target-url struct:target-url target-url? target-url-addr)
-                    [make-target-url core:make-target-url])
-         "private/provide-structs.rkt"
-         "html-properties.rkt"
-         scheme/provide-syntax
-         scheme/struct-info
-         racket/contract/base
-         (for-syntax scheme/base))
-
-(define-provide-syntax (compat**-out stx)
-  (syntax-case stx ()
-    [(_ struct-out o) 
-     (let ([id (syntax-case #'o ()
-                 [(id (field-id ...)) #'id]
-                 [id #'id])])
-       (with-syntax ([make-id (datum->syntax id
-                                             (string->symbol (format "make-~a" (syntax-e id)))
-                                             id)]
-                     [make-id/compat (datum->syntax id
-                                                    (string->symbol (format "make-~a/compat" (syntax-e id)))
-                                                    id)])
-         #'(combine-out
-            (except-out (struct-out o) make-id)
-            (rename-out [make-id/compat make-id]))))]
-    [(_ struct-out o ...) #'(combine-out (compat**-out struct-out o) ...)]))
-
-(define-provide-syntax (compat-out stx)
-  (syntax-case stx ()
-    [(_ . outs) #'(compat**-out struct-out . outs)]))
-
-(define-provide-syntax (compat*-out stx)
-  (syntax-case stx ()
-    [(_ . outs) #'(compat**-out struct*-out . outs)]))
-
-(define-provide-syntax (struct*-out stx)
-  (syntax-case stx ()
-    [(_ [id (field-id ...)]) 
-     (with-syntax ([id? (datum->syntax #'id
-                                       (string->symbol (format "~a?" (syntax-e #'id)))
-                                       #'id)]
-                   [struct:id (datum->syntax #'id
-                                             (string->symbol (format "struct:~a" (syntax-e #'id)))
-                                             #'id)]
-                   [make-id (datum->syntax #'id
-                                           (string->symbol (format "make-~a" (syntax-e #'id)))
-                                           #'id)]
-                   [(sel-id ...)
-                    (map (lambda (field-id)
-                           (datum->syntax field-id
-                                          (string->symbol (format "~a-~a" (syntax-e #'id) (syntax-e field-id)))
-                                          field-id))
-                         (syntax->list #'(field-id ...)))])
-              #'(combine-out
-                 id struct:id make-id id? sel-id ...))]
-    [(_ [id (field-id ...)]...)
-     #'(combine-out (struct*-out [id (field-id ...)]) ...)]))
-
-(provide (struct-out collect-info)
-         (struct-out resolve-info)
-         tag? block?
-         
-         make-flow flow? flow-paragraphs
-
-         (except-out (compat-out part) part-title-content)
-         (rename-out [part-blocks part-flow]
-                     [part-title-content/compat part-title-content])
-         make-versioned-part versioned-part?
-         make-unnumbered-part unnumbered-part?
-
-         (except-out (compat-out paragraph) paragraph-content)
-         (rename-out [paragraph-content/compat paragraph-content])
-         make-styled-paragraph
-         (rename-out [paragraph? styled-paragraph?]
-                     [paragraph-style styled-paragraph-style])
-         make-omitable-paragraph omitable-paragraph?
-
-         (compat-out table) 
-         table-flowss
-         make-auxiliary-table auxiliary-table?
-
-         (struct-out delayed-block)
-
-         (compat-out itemization)
-         (rename-out [itemization-blockss itemization-flows]
-                     [itemization? styled-itemization?]
-                     [itemization-style styled-itemization-style])
-         make-styled-itemization
-
-         make-blockquote
-
-         (compat-out compound-paragraph)
-
-         (except-out (compat-out element) element? element-style element-content)
-         (rename-out [element?/compat element?]
-                     [element-style/compat element-style]
-                     [element-content/compat element-content])
-         (except-out (compat*-out [toc-element (toc-content)])
-                     toc-element-toc-content)
-         (rename-out [toc-element-toc-content/compat toc-element-toc-content])
-         (compat*-out [target-element (tag)]
-                      [toc-target-element ()]
-                      [toc-target2-element (toc-content)])
-         (compat*-out [page-target-element ()]
-                      [redirect-target-element (alt-path alt-anchor)]
-                      [link-element (tag)]
-                      [index-element (tag plain-seq entry-seq desc)])
-         make-aux-element aux-element?
-         make-hover-element hover-element? hover-element-text
-         make-script-element script-element? script-element-type script-element-script
-
-         (struct-out collected-info)
-
-         (struct-out delayed-element)
-         ; delayed-element-content delayed-block-blocks current-serialize-resolve-info
-         
-         (struct-out part-relative-element)
-         ; part-relative-element-content collect-info-parents
-
-         (struct-out delayed-index-desc)
-
-         (struct*-out [collect-element (collect)])
-
-         (struct*-out [render-element (render)])
-
-         (struct-out generated-tag)
-         ; generate-tag tag-key current-tag-prefixes add-current-tag-prefix
-
-         content->string
-         (rename-out [content->string element->string]
-                     [content-width element-width])
-         ; strip-aux
-
-         block-width
-
-         info-key? part-collected-info collect-put!
-         resolve-get resolve-get/tentative resolve-get/ext? resolve-search resolve-get-keys)
-
-(provide-structs
- [with-attributes ([style any/c]
-                   [assoc (listof (cons/c symbol? string?))])]
- [image-file ([path (or/c path-string?
-                          (cons/c (one-of/c 'collects)
-                                  (listof bytes?)))]
-              [scale real?])]
- [target-url ([addr path-string?] [style any/c])])
-
-(define (make-flow l) l)
-(define (flow? l) (and (list? l) (andmap block? l)))
-(define (flow-paragraphs l) l)
-
-(define (list->content l)
-  (if (and (pair? l) (null? (cdr l)))
-      (car l)
-      l))
-
-(define (content->list v)
-  (if (list? v)
-      v
-      (list v)))
-
-(define (make-part/compat tag-prefix tags title-content orig-style to-collect flow parts)
-  (make-part tag-prefix 
-             tags
-             (list->content title-content)
-             (convert-style orig-style)
-             to-collect 
-             (flow-paragraphs flow)
-             parts))
-
-(define (part-title-content/compat p)
-  (list (part-title-content p)))
-
-(define (make-versioned-part tag-prefix tags title-content orig-style to-collect flow parts version)
-  (make-part tag-prefix 
-             tags
-             (list->content title-content)
-             (let ([s (convert-style orig-style)])
-               (make-style (style-name s)
-                           (cons
-                            (make-document-version version)
-                            (style-properties s))))
-             to-collect 
-             (flow-paragraphs flow)
-             parts))
-(define (versioned-part? p)
-  (and (part? p) (ormap document-version? (style-properties (part-style p)))))
-
-(define (make-unnumbered-part tag-prefix tags title-content orig-style to-collect flow parts)
-  (make-part tag-prefix 
-             tags
-             (list->content title-content)
-             (let ([s (convert-style orig-style)])
-               (make-style (style-name s)
-                           (cons 'unnumbered (style-properties s))))
-             to-collect 
-             (flow-paragraphs flow)
-             parts))
-(define (unnumbered-part? p)
-  (and (part? p) (memq 'unnumbered (style-properties (part-style p)))))
-
-(define (make-paragraph/compat content)
-  (make-paragraph plain (list->content content)))
-(define (paragraph-content/compat p)
-  (content->list (paragraph-content p)))
-(define (make-styled-paragraph content style)
-  (make-paragraph (convert-style style) (list->content content)))
-
-(define (make-omitable-paragraph content)
-  (make-paragraph (make-style #f '(omitable)) (list->content content)))
-(define (omitable-paragraph? p)
-  (and (paragraph? p) (memq 'omitable (style-properties (paragraph-style p)))))
-
-(define (make-table/compat style cellss)
-  (make-table (convert-style style)
-              (map (lambda (cells)
-                     (map (lambda (cell)
-                            (cond
-                             [(eq? cell 'cont) 'cont]
-                             [(= 1 (length cell)) (car cell)]
-                             [else (make-nested-flow plain cell)]))
-                          cells))
-                   cellss)))
-(define (table-flowss t)
-  (map (lambda (row) (map (lambda (c) (make-flow (list c))) row))
-       (table-blockss t)))
-
-(define (make-auxiliary-table style cells)
-  (let ([t (make-table/compat style cells)])
-    (make-table (make-style (style-name (table-style t))
-                            (cons 'aux
-                                  (style-properties (table-style t))))
-                (table-blockss t))))
-
-(define (auxiliary-table? t)
-  (ormap (lambda (v) (eq? v 'aux) (style-properties (table-style t)))))
-
-(define (make-itemization/compat flows)
-  (make-itemization plain flows))
-(define (make-styled-itemization style flows)
-  (make-itemization (convert-style style) flows))
-
-(define (make-blockquote style blocks)
-  (make-nested-flow (convert-style (or style 'inset)) blocks))
-
-(define (make-compound-paragraph/compat style blocks)
-  (make-compound-paragraph (convert-style style) blocks))
-
-(define (element-style-name s)
-  (if (style? s)
-      (style-name s)
-      s))
-(define (element-style-properties s)
-  (if (style? s)
-      (style-properties s)
-      null))
-
-(define (add-element-property v e)
-  (make-element (make-style (element-style-name (element-style e))
-                            (cons v
-                                  (element-style-properties (element-style e))))
-                (element-content e)))
-(define (check-element-style e pred)
-  (ormap pred (style-properties (element-style e))))
-
-(define (handle-image-style ctr style . args)
-  (if (image-file? style)
-      (make-image-element #f (list (apply ctr #f args)) 
-                          (image-file-path style)
-                          null
-                          (image-file-scale style))
-      (apply ctr (convert-element-style style) args)))
-
-(define (convert-element-style style)
-  (cond
-   [(not style) style]
-   [(string? style) style]
-   [(symbol? style) style]
-   [else (convert-style style)]))
-
-(define (element?/compat e)
-  (or (element? e) (and (list? e) (content? e))))
-(define (element-content/compat e)
-  (cond
-   [(element? e) (content->list (element-content e))]
-   [else e]))
-(define (element-style/compat e)
-  (cond
-   [(element? e) (element-style e)]
-   [else #f]))
-
-(define (make-element/compat style content)
-  (handle-image-style make-element style (list->content content)))
-(define (make-toc-element/compat style content toc-content)
-  (handle-image-style make-toc-element style (list->content content) (list->content toc-content)))
-(define (toc-element-toc-content/compat e)
-  (content->list (toc-element-toc-content e)))
-(define (make-target-element/compat style content tag)
-  (handle-image-style make-target-element style (list->content content) tag))
-(define (make-toc-target-element/compat style content tag)
-  (handle-image-style make-toc-target-element style (list->content content) tag))
-(define (make-toc-target2-element/compat style content tag toc-content)
-  (handle-image-style make-toc-target2-element style (list->content content) tag toc-content))
-(define (make-page-target-element/compat style content tag)
-  (handle-image-style make-page-target-element style (list->content content) tag))
-(define (make-redirect-target-element/compat style content tag alt-path alt-anchor)
-  (handle-image-style make-redirect-target-element style (list->content content) tag alt-path alt-anchor))
-(define (make-link-element/compat style content tag)
-  (handle-image-style make-link-element style (list->content content) tag))
-(define (make-index-element/compat style content tag plain-seq etry-seq desc)
-  (handle-image-style make-index-element style (list->content content) tag plain-seq etry-seq desc))
-
-(define (make-aux-element style content)
-  (add-element-property 'aux (make-element/compat style content)))
-(define (aux-element? e)
-  (check-element-style e (lambda (v) (eq? v 'aux))))
-
-(define (make-hover-element style content text)
-  (add-element-property (make-hover-property text)
-                        (make-element/compat style content)))
-(define (hover-element? e)
-  (check-element-style e hover-property?))
-(define (hover-element-text e)
-  (ormap (lambda (v)
-           (and (hover-property? v) (hover-property-text e)))
-         (style-properties (element-style e))))
-
-(define (make-script-element style content type script)
-  (add-element-property (make-script-property type script)
-                        (make-element/compat style content)))
-(define (script-element? e)
-  (check-element-style e script-property?))
-(define (script-element-type e)
-  (ormap (lambda (v)
-           (and (script-property? v) (script-property-type e)))
-         (style-properties (element-style e))))
-(define (script-element-script e)
-  (ormap (lambda (v)
-           (and (script-property? v) (script-property-script e)))
-         (style-properties (element-style e))))
-
-;; ----------------------------------------
-
-(define (convert-style s)
-  (cond
-   [(not s) plain]
-   [(style? s) s]
-   [(string? s) (make-style s null)]
-   [(symbol? s) (make-style s null)]
-   [(and (list? s) (andmap symbol? s)) (make-style #f s)]
-   [(with-attributes? s) (let* ([wa (flatten-style s)]
-                                [s (convert-style (with-attributes-style wa))])
-                           (make-style (style-name s)
-                                       (cons
-                                        (make-attributes (with-attributes-assoc wa))
-                                        (style-properties s))))]
-   [(target-url? s) (let ([s (convert-style (target-url-style s))])
-                      (make-style (style-name s)
-                                       (cons
-                                        (core:make-target-url (target-url-addr s))
-                                        (style-properties s))))]
-   [(image-file? s) (make-style #f null)]
-   [(and (list? s) (pair? s) (eq? (car s) 'color))
-    (make-style #f (list (make-color-property
-                          (if (string? (cadr s)) (cadr s) (cdr s)))))]
-   [(and (list? s) (pair? s) (eq? (car s) 'bg-color))
-    (make-style #f (list (make-background-color-property
-                          (if (string? (cadr s)) (cadr s) (cdr s)))))]
-   [(and (pair? s)
-         (list? s)
-         (andmap (lambda (v) (and (pair? v) 
-                                  (memq (car v) '(alignment valignment row-styles style))))
-                 s))
-    (let ([gen-columns (lambda (sn a va)
-                         (map (lambda (sn a va)
-                                (make-style sn
-                                            (append (if a (list a) null)
-                                                    (if va (list va) null))))
-                              (cdr (or sn (map (lambda (x) #f) (or va a))))
-                              (cdr (or a (map (lambda (x) #f) (or va sn))))
-                              (cdr (or va (map (lambda (x) #f) (or a sn))))))])
-      (make-style (let ([s (assq 'style s)])
-                    (and s (cadr s)))
-                  (let ([a (assq 'alignment s)]
-                        [va (assq 'valignment s)])
-                    (if (or a va)
-                        (list (make-table-columns (gen-columns #f a va)))
-                        (let ([l (cdr (assq 'row-styles s))])
-                          (list
-                           (make-table-cells
-                            (map (lambda (row)
-                                   (let ([sn (assq 'style row)]
-                                         [a (assq 'alignment row)]
-                                         [va (assq 'valignment row)])
-                                     (if (or sn a va)
-                                         (gen-columns sn a va)
-                                         (error 'convert-style "no row style found"))))
-                                 l))))))))]
-   [else (error 'convert-style "unrecognized style: ~e" s)]))
-
-(define (flatten-style s)
-  (cond
-   [(with-attributes? s)
-    (let ([rest (flatten-style (with-attributes-style s))])
-      (if (with-attributes? rest)
-          ;; collapse nested with-attributes
-          (make-with-attributes 
-           (with-attributes-style rest)
-           (append (with-attributes-assoc s)
-                   (with-attributes-assoc rest)))
-          ;; rebuild with flattened inner:
-          (make-with-attributes 
-           rest
-           (with-attributes-assoc s))))]
-   [(target-url? s)
-    (let ([rest (flatten-style (target-url-style s))])
-      (if (with-attributes? rest)
-          ;; lift nested attributes out:
-          (make-with-attributes 
-           (make-target-url
-            (target-url-addr s)
-            (with-attributes-style rest))
-           (with-attributes-assoc rest))
-          ;; rebuild with flattened inner:
-          (make-target-url
-           (target-url-addr s)
-           rest)))]
-   [else s]))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/tag.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/tag.rkt
deleted file mode 100644
index 1ed133e8bf..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/tag.rkt
+++ /dev/null
@@ -1,113 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         syntax/modcollapse
-         setup/collects
-         scribble/core
-         ;; Needed to normalize planet version numbers:
-         (only-in planet/resolver get-planet-module-path/pkg)
-         (only-in planet/private/data pkg-maj pkg-min))
-
-(provide
- (contract-out
-  [make-section-tag ((string?) 
-                     (#:doc (or/c #f module-path?)
-                      #:tag-prefixes (or/c #f (listof string?)))
-                     . ->* .
-                     tag?)]
-  [make-module-language-tag (-> symbol? tag?)]
-  [taglet? (any/c . -> . boolean?)]
-  [module-path-prefix->string (module-path? . -> . string?)]
-  [module-path-index->taglet (module-path-index? . -> . taglet?)]
-  [intern-taglet (any/c . -> . any/c)]
-  [doc-prefix (case->
-               ((or/c #f module-path?) taglet? . -> . taglet?)
-               ((or/c #f module-path?) (or/c #f (listof string?)) taglet? . -> . taglet?))]))
-
-(define (make-section-tag s #:doc [doc #f] #:tag-prefixes [prefix #f])
-  `(part ,(doc-prefix doc prefix s)))
-
-(define (make-module-language-tag langname)
-  `(mod-path ,(symbol->string langname)))
-
-(define (taglet? v)
-  (and (not (generated-tag? v))
-       (tag? (list 'something (list v)))))
-
-(define interned (make-weak-hash))
-  
-(define (intern-taglet v)
-  (let ([v (if (list? v)
-               (map intern-taglet v)
-               (datum-intern-literal v))])
-    (if (or (string? v)
-            (bytes? v)
-            (list? v))
-        (let ([b (hash-ref interned v #f)])
-          (if b
-              (or (weak-box-value b)
-                  ;; just in case the value is GCed before we extract it:
-                  (intern-taglet v))
-              (begin
-                (hash-set! interned v (make-weak-box v))
-                v)))
-        v)))
-
-(define (do-module-path-index->taglet mod)
-  ;; Derive the name from the module path:
-  (let ([p (collapse-module-path-index
-            mod
-            (lambda () (build-path (current-directory) "dummy")))])
-    (if (path? p)
-        ;; If we got a path back anyway, then it's best to use the resolved
-        ;; name; if the current directory has changed since we 
-        ;; the path-index was resolved, then p might not be right. Also,
-        ;; the resolved path might be a symbol instead of a path.
-        (let ([rp (resolved-module-path-name 
-                   (module-path-index-resolve mod))])
-          (if (path? rp)
-              (intern-taglet 
-               (path->collects-relative rp))
-              rp))
-        (let ([p (if (and (pair? p)
-                          (eq? (car p) 'planet))
-                     ;; Normalize planet verion number based on current
-                     ;; linking:
-                     (let-values ([(path pkg)
-                                   (get-planet-module-path/pkg p #f #f)])
-                       (list* 'planet
-                              (cadr p)
-                              (list (car (caddr p))
-                                    (cadr (caddr p))
-                                    (pkg-maj pkg)
-                                    (pkg-min pkg))
-                              (cdddr p)))
-                     ;; Otherwise the path is fully normalized:
-                     p)])
-          (intern-taglet p)))))
-
-(define collapsed (make-weak-hasheq))
-(define (module-path-index->taglet mod)
-  (or (hash-ref collapsed mod #f)
-      (let ([v (do-module-path-index->taglet mod)])
-        (hash-set! collapsed mod v)
-        v)))
-
-(define (module-path-prefix->string p)
-  (datum-intern-literal
-   (format "~a" (module-path-index->taglet (module-path-index-join p #f)))))
-
-(define doc-prefix
-  (case-lambda
-   [(doc s)
-    (if doc
-        (if (list? s)
-            (cons (module-path-prefix->string doc) s)
-            (list (module-path-prefix->string doc) s))
-        s)]
-   [(doc prefix s)
-    (doc-prefix doc (if prefix
-                        (append prefix (if (list? s)
-                                           s
-                                           (list s)))
-                        s))]))
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/text-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/text-render.rkt
deleted file mode 100644
index 22f3718ccb..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/text-render.rkt
+++ /dev/null
@@ -1,305 +0,0 @@
-#lang racket/base
-(require "core.rkt" 
-         "base-render.rkt"
-         "private/render-utils.rkt"
-         racket/class racket/port racket/list racket/string
-         scribble/text/wrap)
-(provide render-mixin)
-
-(define current-preserve-spaces (make-parameter #f))
-
-(define current-indent (make-parameter 0))
-(define (make-indent amt)
-  (+ amt (current-indent)))
-(define (indent)
-  (define i (current-indent))
-  (unless (zero? i) (display (make-string i #\space))))
-(define (indented-newline)
-  (newline)
-  (indent))
-
-(define render-mixin
-  (mixin (render<%>) ()
-
-    (define/override (current-render-mode)
-      '(text))
-
-    (define/override (get-substitutions)
-      '((#rx"---" "\U2014")
-        (#rx"--" "\U2013")
-        (#rx"``" "\U201C")
-        (#rx"''" "\U201D")
-        (#rx"'" "\U2019")))
-
-    (inherit render-block
-             format-number)
-
-    (define/override (render-part d ht)
-      (let ([number (collected-info-number (part-collected-info d ht))])
-        (unless (part-style? d 'hidden)
-          (let ([s (format-number number '())])
-            (unless (null? s)
-              (printf "~a.~a" 
-                      (car s)
-                      (if (part-title-content d)
-                          " "
-                          "")))
-            (when (part-title-content d)
-              (render-content (part-title-content d) d ht))
-            (when (or (pair? number) (part-title-content d))
-              (newline)
-              (newline))))
-        (render-flow (part-blocks d) d ht #f)
-        (let loop ([pos 1]
-                   [secs (part-parts d)]
-                   [need-newline? (pair? (part-blocks d))])
-          (unless (null? secs)
-            (when need-newline? (newline))
-            (render-part (car secs) ht)
-            (loop (add1 pos) (cdr secs) #t)))))
-
-    (define/override (render-flow f part ht starting-item?)
-      (if (null? f)
-          null
-          (append*
-           (render-block (car f) part ht starting-item?)
-           (for/list ([p (in-list (cdr f))])
-             (indented-newline)
-             (render-block p part ht #f)))))
-
-    (define/override (render-intrapara-block p part ri first? last? starting-item?)
-      (unless first? (indented-newline))
-      (super render-intrapara-block p part ri first? last? starting-item?))
-
-    (define/override (render-table i part ht inline?)
-      (define flowss (table-blockss i))
-      (if (null? flowss)
-          null
-          (let* ([strs (map (lambda (flows)
-                              (map (lambda (d)
-                                     (if (eq? d 'cont)
-                                         d
-                                         (let ([o (open-output-string)])
-                                           (parameterize ([current-indent 0]
-                                                          [current-output-port o])
-                                             (render-block d part ht #f))
-                                           (regexp-split
-                                            #rx"\n"
-                                            (regexp-replace #rx"\n$" (get-output-string o) "")))))
-                                   flows))
-                            flowss)]
-                 [extract-align
-                  (lambda (s)
-                    (define p (style-properties s))
-                    (cond
-                     [(member 'right p) 'right]
-                     [(member 'center p) 'center]
-                     [else 'left]))]
-                 [alignss
-                  (cond
-                   [(ormap (lambda (v) (and (table-cells? v) v)) (style-properties (table-style i)))
-                    => (lambda (tc)
-                         (for/list ([l (in-list (table-cells-styless tc))])
-                           (for/list ([s (in-list l)])
-                             (extract-align s))))]
-                   [(ormap (lambda (v) (and (table-columns? v) v)) (style-properties (table-style i)))
-                    => (lambda (tc)
-                         (make-list
-                          (length flowss)
-                          (for/list ([s (in-list (table-columns-styles tc))])
-                            (extract-align s))))]
-                   [else
-                    (if (null? flowss)
-                        null
-                        (make-list (length flowss) (make-list (length (car flowss)) 'left)))])]
-                 [extract-border
-                  (lambda (s)
-                    (define p (style-properties s))
-                    (cond
-                     [(memq 'border p) '#(#t #t #t #t)]
-                     [else
-                      (vector (memq 'left-border p) (memq 'right-border p)
-                              (memq 'top-border p) (memq 'bottom-border p))]))]
-                 [borderss
-                  ;; A border is (vector left? right? top? bottom?)
-                  (cond
-                   [(ormap (lambda (v) (and (table-cells? v) v)) (style-properties (table-style i)))
-                    => (lambda (tc)
-                         (for/list ([l (in-list (table-cells-styless tc))])
-                           (for/list ([s (in-list l)])
-                             (extract-border s))))]
-                   [(ormap (lambda (v) (and (table-columns? v) v)) (style-properties (table-style i)))
-                    => (lambda (tc)
-                         (make-list
-                          (length flowss)
-                          (for/list ([s (in-list (table-columns-styles tc))])
-                            (extract-border s))))]
-                   [else
-                    (if (null? flowss)
-                        null
-                        (make-list (length flowss) (make-list (length (car flowss)) '#(#f #f #f #f))))])]
-                 [border-left? (lambda (v) (vector-ref v 0))]
-                 [border-right? (lambda (v) (vector-ref v 1))]
-                 [border-top? (lambda (v) (vector-ref v 2))]
-                 [border-bottom? (lambda (v) (vector-ref v 3))]
-                 [col-borders ; has only left and right
-                  (for/list ([i (in-range (length (car borderss)))])
-                    (for/fold ([v '#(#f #f)]) ([borders (in-list borderss)])
-                      (define v2 (list-ref borders i))
-                      (vector (or (border-left? v) (border-left? v2))
-                              (or (border-right? v) (border-right? v2)))))]
-                 [widths (map (lambda (col)
-                                (for/fold ([d 0]) ([i (in-list col)])
-                                  (if (eq? i 'cont)
-                                      d
-                                      (apply max d (map string-length i)))))
-                              (apply map list strs))]
-                 [x-length (lambda (col) (if (eq? col 'cont) 0 (length col)))])
-
-            (define (show-row-border prev-borders borders)
-              (when (for/or ([prev-border (in-list prev-borders)]
-                             [border (in-list borders)])
-                      (or (border-bottom? prev-border)
-                          (border-top? border)))
-                (define-values (end-h-border? end-v-border?)
-                  (for/fold ([left-border? #f]
-                             [prev-border? #f])
-                      ([w (in-list widths)]
-                       [prev-border (in-list prev-borders)]
-                       [border (in-list borders)]
-                       [col-border (in-list col-borders)])
-                    (define border? (or (and prev-border (border-bottom? prev-border))
-                                        (border-top? border)))
-                    (when (or left-border? (border-left? col-border))
-                      (display (if (or prev-border? border?) "-" " ")))
-                    (display (make-string w (if border? #\- #\space)))
-                    (values (border-right? col-border) border?)))
-                (when end-h-border?
-                  (display (if end-v-border? "-" " ")))
-                (newline)))
-
-            (define-values (last-indent? last-borders)
-              (for/fold ([indent? #f] [prev-borders #f]) ([row (in-list strs)]
-                                                          [aligns (in-list alignss)]
-                                                          [borders (in-list borderss)])
-                (values
-                 (let ([h (apply max 0 (map x-length row))])
-                   (let ([row* (for/list ([i (in-range h)])
-                                 (for/list ([col (in-list row)])
-                                   (if (i . < . (x-length col))
-                                       (list-ref col i)
-                                       (if (eq? col 'cont)
-                                           'cont
-                                           ""))))])
-                     (for/fold ([indent? indent?]) ([sub-row (in-list row*)]
-                                                    [pos (in-naturals)])
-                       (when indent? (indent))
-
-                       (when (zero? pos)
-                         (show-row-border (or prev-borders (map (lambda (b) '#(#f #f #f #f)) borders))
-                                          borders))
-
-                       (define-values (end-border? end-col-border?)
-                         (for/fold ([left-border? #f] [left-col-border? #f])
-                             ([col (in-list sub-row)]
-                              [w (in-list widths)]
-                              [align (in-list aligns)]
-                              [border (in-list borders)]
-                              [col-border (in-list col-borders)])
-                           (when (or left-col-border? (border-left? col-border))
-                             (display (if (and (or left-border? (border-left? border))
-                                               (not (eq? col 'cont)))
-                                          "|"
-                                          " ")))
-                           (let ([col (if (eq? col 'cont) "" col)])
-                             (define gap (max 0 (- w (string-length col))))
-                             (case align
-                               [(right) (display (make-string gap #\space))]
-                               [(center) (display (make-string (quotient gap 2) #\space))])
-                             (display col)
-                             (case align
-                               [(left) (display (make-string gap #\space))]
-                               [(center) (display (make-string (- gap (quotient gap 2)) #\space))]))
-                           (values (border-right? border)
-                                   (border-right? col-border))))
-                       (when end-col-border?
-                         (display (if end-border? "|" " ")))
-                       (newline)
-                       #t)))
-                 borders)))
-
-            (show-row-border last-borders (map (lambda (b) '#(#f #f #f #f)) last-borders))
-
-            null)))
-
-    (define/override (render-itemization i part ht)
-      (let ([flows (itemization-blockss i)])
-        (if (null? flows)
-            null
-            (append*
-             (begin (printf "* ")
-                    (parameterize ([current-indent (make-indent 2)])
-                      (render-flow (car flows) part ht #t)))
-             (for/list ([d (in-list (cdr flows))])
-               (indented-newline)
-               (printf "* ")
-               (parameterize ([current-indent (make-indent 2)])
-                 (render-flow d part ht #f)))))))
-
-    (define/override (render-paragraph p part ri)
-      (define o (open-output-string))
-      (parameterize ([current-output-port o])
-        (super render-paragraph p part ri))
-      (define to-wrap (regexp-replace* #rx"\n" (get-output-string o) " "))
-      (define lines (wrap-line (string-trim to-wrap) (- 72 (current-indent))))
-      (write-string (car lines))
-      (for ([line (in-list (cdr lines))])
-        (newline) (indent) (write-string line))
-      (newline)
-      null)
-
-    (define/override (render-content i part ri)
-      (if (and (element? i)
-               (let ([s (element-style i)])
-                 (or (eq? 'hspace s)
-                     (and (style? s)
-                          (eq? 'hspace (style-name s))))))
-          (parameterize ([current-preserve-spaces #t])
-            (super render-content i part ri))
-          (super render-content i part ri)))
-
-    (define/override (render-nested-flow i part ri starting-item?)
-      (define s (nested-flow-style i))
-      (unless (memq 'decorative (style-properties s))
-        (if (and s (or (eq? (style-name s) 'inset)
-                       (eq? (style-name s) 'code-inset)))
-            (begin (printf "  ")
-                   (parameterize ([current-indent (make-indent 2)])
-                     (super render-nested-flow i part ri starting-item?)))
-            (super render-nested-flow i part ri starting-item?))))
-
-    (define/override (render-other i part ht)
-      (cond
-        [(symbol? i)
-         (display (case i
-                    [(mdash) "\U2014"]
-                    [(ndash) "\U2013"]
-                    [(ldquo) "\U201C"]
-                    [(rdquo) "\U201D"]
-                    [(lsquo) "\U2018"]
-                    [(rsquo) "\U2019"]
-                    [(lang) ">"]
-                    [(rang) "<"]
-                    [(rarr) "->"]
-                    [(nbsp) "\uA0"]
-                    [(prime) "'"]
-                    [(alpha) "\u03B1"]
-                    [(infin) "\u221E"]
-                    [else (error 'text-render "unknown element symbol: ~e" i)]))]
-        [(string? i) (if (current-preserve-spaces)
-                         (display (regexp-replace* #rx" " i "\uA0"))
-                         (display i))]
-        [else (write i)])
-      null)
-
-    (super-new)))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/urls.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/urls.rkt
deleted file mode 100644
index c680cbceda..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/urls.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-
-(provide (all-defined-out)
-         (rename-out [url:drracket url:drscheme]
-                     [url:download-drracket url:download-drscheme]))
-
-(define url:drracket "http://racket-lang.org/")
-(define url:download-drracket "http://download.racket-lang.org/")
-
-(define url:planet "http://planet.racket-lang.org/")
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/xref.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/xref.rkt
deleted file mode 100644
index b0ae6fa8f1..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scribble/xref.rkt
+++ /dev/null
@@ -1,173 +0,0 @@
-#lang scheme/base
-
-(require scribble/struct
-         (only-in scribble/core known-doc? known-doc-v)
-         scribble/base-render
-         scribble/search
-         (prefix-in html: scribble/html-render)
-         scheme/class
-         scheme/path)
-
-(provide load-xref
-         xref?
-         xref-render
-         xref-index
-         xref-binding->definition-tag
-         xref-tag->path+anchor
-         xref-tag->index-entry
-         xref-transfer-info
-         (struct-out entry)
-         make-data+root
-         data+root?
-         make-data+root+doc-id
-         data+root+doc-id?)
-
-(define-struct entry
-  (words    ; list of strings: main term, sub-term, etc.
-   content  ; Scribble content to the index label
-   tag      ; for generating a Scribble link
-   desc))   ; further info that depends on the kind of index entry
-
-(define-struct data+root (data root))
-(define-struct (data+root+doc-id data+root) (doc-id))
-
-;; Private:
-(define-struct xrefs (renderer ri))
-
-(define (xref? x) (xrefs? x))
-
-;; ----------------------------------------
-;; Xref loading
-
-(define-namespace-anchor here)
-
-(define (load-xref sources
-                   #:demand-source [demand-source (lambda (key) #f)]
-                   #:render% [render% (html:render-mixin render%)]
-                   #:root [root-path #f]
-                   #:doc-id [doc-id-str #f])
-  (let* ([renderer (new render% [dest-dir (find-system-path 'temp-dir)])]
-         [fp (send renderer traverse null null)]
-         [load-source (lambda (src ci)
-                        (parameterize ([current-namespace
-                                        (namespace-anchor->empty-namespace here)])
-                          (let ([vs (src)])
-                            (for ([v (in-list (if (procedure? vs) (vs) (list vs)))])
-                              (when v
-                                (define data (if (data+root? v) (data+root-data v) v))
-                                (define root (if (data+root? v) (data+root-root v) root-path))
-                                (define doc-id (or (and (data+root+doc-id? v) (data+root+doc-id-doc-id v))
-                                                   doc-id-str))
-                                (send renderer deserialize-info data ci
-                                      #:root root
-                                      #:doc-id doc-id))))))]
-         [ci (send renderer collect null null fp
-                   (lambda (key ci)
-                     (define src (demand-source key))
-                     (and src
-                          (load-source src ci))))])
-    (for ([src sources])
-      (load-source src ci))
-    (make-xrefs renderer (send renderer resolve null null ci))))
-
-;; ----------------------------------------
-;; Xref reading
-
-(define (xref-index xrefs)
-  (define ci (resolve-info-ci (xrefs-ri xrefs)))
-  ;; Force all xref info:
-  ((collect-info-ext-demand ci) #f ci)
-  ;; look for `index-entry' keys:
-  (for/list ([(k v) (in-hash (collect-info-ext-ht ci))]
-             #:when
-             (and (pair? k)
-                  (eq? (car k) 'index-entry)))
-    (let ([v (if (known-doc? v)
-                 (known-doc-v v)
-                 v)])
-      (make-entry (car v) (cadr v) (cadr k) (caddr v)))))
-
-;; dest-file can be #f, which will make it return a string holding the
-;; resulting html
-(define (xref-render xrefs doc dest-file
-                     #:render% [render% (html:render-mixin render%)]
-                     #:refer-to-existing-files? [use-existing? (not dest-file)])
-  (let* ([dest-file (if (string? dest-file) (string->path dest-file) dest-file)]
-         [renderer (new render%
-                        [dest-dir (and dest-file (path-only dest-file))]
-                        [refer-to-existing-files use-existing?]
-                        [css-path    'inline]
-                        [script-path 'inline])]
-         [ci (send renderer collect (list doc) (list dest-file))]
-         [_ (send renderer transfer-info ci (resolve-info-ci (xrefs-ri xrefs)))]
-         [ri (send renderer resolve (list doc) (list dest-file) ci)]
-         [xs (send renderer render (list doc) (list dest-file) ri)])
-    (if dest-file
-        (void)
-        (car xs))))
-
-(define (xref-transfer-info renderer ci xrefs)
-  (send renderer transfer-info ci (resolve-info-ci (xrefs-ri xrefs))))
-
-;; Returns (values <tag-or-#f> <form?>)
-(define xref-binding-tag
-  (case-lambda
-   [(xrefs id/binding mode)
-    (let ([search
-           (lambda (id/binding)
-             (let ([tag (find-scheme-tag #f (xrefs-ri xrefs) id/binding mode)])
-               (if tag
-                   (values tag (eq? (car tag) 'form))
-                   (values #f #f))))])
-      (cond
-        [(identifier? id/binding)
-         (search id/binding)]
-        [(and (list? id/binding)
-              (= 7 (length id/binding)))
-         (search id/binding)]
-        [(and (list? id/binding)
-              (= 2 (length id/binding)))
-         (let loop ([src (car id/binding)])
-           (cond
-            [(module-path-index? src)
-             (search (list src (cadr id/binding)))]
-            [(module-path? src)
-             (loop (module-path-index-join src #f))]
-            [else
-             (raise-argument-error 'xref-binding-definition->tag
-                                   "(list/c (or/c module-path? module-path-index?) any/c)"
-                                   src)]))]
-        [else (raise-argument-error 'xref-binding-definition->tag
-                                    (string-append
-                                     "(or/c identifier? (lambda (l)\n"
-                                     "                    (and (list? l)\n"
-                                     "                         (or (= (length l) 2)\n"
-                                     "                             (= (length l) 7)))))")
-                                    id/binding)]))]))
-
-(define (xref-binding->definition-tag xrefs id/binding mode)
-  (let-values ([(tag form?) (xref-binding-tag xrefs id/binding mode)])
-    tag))
-
-(define (xref-tag->path+anchor xrefs tag
-                               #:render% [render% (html:render-mixin render%)]
-                               #:external-root-url [redirect-main #f])
-  (send (let ([r (new render% [dest-dir (find-system-path 'temp-dir)])])
-          (when redirect-main
-            (send r set-external-root-url redirect-main))
-          r)
-        tag->path+anchor (xrefs-ri xrefs) tag))
-
-(define (xref-tag->index-entry xrefs tag)
-  (let ([v (hash-ref
-            (collect-info-ext-ht (resolve-info-ci (xrefs-ri xrefs)))
-            `(index-entry ,tag)
-            #f)])
-    (let ([v (if (known-doc? v)
-                 (known-doc-v v)
-                 v)])
-      (cond [v (make-entry (car v) (cadr v) (cadr tag) (caddr v))]
-            [(and (pair? tag) (eq? 'form (car tag)))
-             ;; Try again with 'def:
-             (xref-tag->index-entry xrefs (cons 'def (cdr tag)))]
-            [else #f]))))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.css b/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.css
deleted file mode 100644
index 8a0830295c..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.css
+++ /dev/null
@@ -1,9 +0,0 @@
-
-.AutoBibliography p {
-  padding-left: 1em;
-  text-indent: -1em;
-}
-
-.AutoBibliography td {
-  vertical-align: text-top;
-}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.rkt b/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.rkt
deleted file mode 100644
index 30bbad6e1f..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.rkt
+++ /dev/null
@@ -1,608 +0,0 @@
-#lang at-exp racket/base
-(require scribble/manual
-         racket/list
-         racket/date
-         racket/class
-         scribble/core
-         scribble/decode
-         scribble/html-properties
-         scribble/latex-properties
-         (for-syntax syntax/parse
-                     racket/base)
-         scheme/string
-         setup/main-collects
-         racket/contract)
-
-(provide define-cite
-         author+date-style number-style
-         make-bib in-bib (rename-out [auto-bib? bib?])
-         proceedings-location journal-location book-location
-         techrpt-location dissertation-location
-         author-name org-author-name 
-         (contract-out
-          [authors (->* (content?) #:rest (listof content?) element?)])
-         other-authors
-         editor
-         abbreviate-given-names)
-
-(define abbreviate-given-names (make-parameter #f))
-
-(define autobib-style-extras
-  (let ([abs (lambda (s)
-               (path->main-collects-relative
-                (collection-file-path s "scriblib")))])
-    (list
-     (make-css-addition (abs "autobib.css"))
-     (make-tex-addition (abs "autobib.tex")))))
-
-(define bib-single-style (make-style "AutoBibliography" autobib-style-extras))
-(define bib-columns-style (make-style #f autobib-style-extras))
-
-(define bibentry-style (make-style "Autobibentry" autobib-style-extras))
-(define colbibnumber-style (make-style "Autocolbibnumber" autobib-style-extras))
-(define colbibentry-style (make-style "Autocolbibentry" autobib-style-extras))
-
-(define-struct auto-bib (author date title location url note is-book? key specific))
-(define-struct bib-group (ht))
-
-(define-struct (author-element element) (names cite))
-(define-struct (other-author-element author-element) ())
-
-(define (author-element-names* x)
-  (and x (author-element-names x)))
-
-;; render the use of a citation.
-(define (add-cite group bib-entry which with-specific? disambiguation style)
-  (let ([key (auto-bib-key bib-entry)])
-    (when disambiguation
-      (for ([bib disambiguation])
-        (hash-set! (bib-group-ht group) (auto-bib-key bib) bib)))
-    (hash-set! (bib-group-ht group) key bib-entry)
-    (make-delayed-element
-     (lambda (renderer part ri)
-       ;; (list which key) should be mapped to the bibliography element.
-       (define s (resolve-get part ri `(,which ,key)))
-       (make-link-element #f
-                          (list (or s "???")
-                                (cond [(not (send style disambiguate-date?)) '()]
-                                      [disambiguation ;; should be a list of bib-entries with same author/date
-                                       (define disambiguation*
-                                         (add-between (for/list ([bib (in-list disambiguation)])
-                                                        (define key (auto-bib-key bib))
-                                                        (define maybe-disambiguation
-                                                          (resolve-get part ri `(autobib-disambiguation ,key)))
-                                                        (case maybe-disambiguation
-                                                          [(#f) #f]
-                                                          [(unambiguous) #f]
-                                                          [else (make-link-element #f maybe-disambiguation `(autobib ,key))]))
-                                                      ","))
-                                       (cond [(not (car disambiguation*)) '()] ;; the bib was unambiguous
-                                             [else disambiguation*])]
-                                      [else '()])
-                                (if with-specific?
-                                    (auto-bib-specific bib-entry)
-                                    ""))
-                          `(autobib ,(auto-bib-key bib-entry))))
-     (lambda () "(???)")
-     (lambda () "(???)"))))
-
-(define (add-date-cites group bib-entries delimiter style sort? maybe-date<? maybe-date=?)
-  (define date<? (or maybe-date<? default-date<?))
-  (define date=? (or maybe-date=? default-date=?))
-  (define sorted-by-date (if sort?
-                             (sort bib-entries date<?)
-                             bib-entries))
-  (define partitioned-by-ambiguity
-    (let-values ([(last last-ambiguous-list partition)
-                  (for/fold ([last #f]
-                             [currently-ambiguous '()]
-                             [partition '()])
-                      ([bib (reverse sorted-by-date)])
-                    (cond [(and (send style collapse-for-date?)
-                                last (date=? last bib) 
-                                (equal? (auto-bib-specific bib) "")
-                                (equal? (auto-bib-specific last) ""))
-                           ;; can group
-                           (values bib (cons bib currently-ambiguous) partition)]
-                          ;; first element.
-                          [(not last) (values bib (list bib) partition)]
-                          ;; not ambiguous. Start next group.
-                          [else (values bib (list bib) (cons currently-ambiguous partition))]))])
-      (cons last-ambiguous-list partition)))
-  (cond [(null? bib-entries) '()]
-        [else
-         (add-between
-          (for/list ([part (in-list partitioned-by-ambiguity)])
-            (add-cite group (car part) 'autobib-date #t part style))
-          delimiter)]))
-
-(define all-equal?
-  (case-lambda
-   [(a) #t]
-   [(a b) (equal? a b)]
-   [(a . bs) (andmap (lambda (v) (equal? a v)) bs)]))
-
-(define (add-inline-cite group bib-entries style bib-date<? bib-date=?)
-  (for ([i bib-entries])
-    (hash-set! (bib-group-ht group) (auto-bib-key i) i))
-  (when (and (pair? (cdr bib-entries))
-             (not (apply all-equal? (map (compose author-element-names* auto-bib-author) bib-entries))))
-    (error 'citet "citet must be used with identical authors, given ~a"
-           (map (compose author-element-names* auto-bib-author) bib-entries)))
-  (make-element
-   #f
-   (list (add-cite group (car bib-entries) 'autobib-author #f #f style)
-         'nbsp
-         (send style get-cite-open)
-         (add-date-cites group bib-entries 
-                         (send style get-group-sep)
-                         style #t bib-date<? bib-date=?)
-         (send style get-cite-close))))
-
-;; This allows citing multiple sources in one @cite. Groups of citations are separated by semicolons.
-(define (add-cites group bib-entries sort? style bib-date<? bib-date=?)
-  (define-values (groups keys)
-    (for/fold ([h (hash)] [ks null]) ([b (reverse bib-entries)])
-      (let ([k (author-element-names* (auto-bib-author b))])
-        (values (hash-update h k (lambda (cur) (cons b cur)) null)
-                (cons k (remove k ks))))))
-  (make-element
-   #f
-   (append
-    (list 'nbsp (send style get-cite-open))
-    (add-between
-     (for/list ([k (if sort? (sort keys (lambda (x y) (if (not (and x y)) x (string-ci<? x y)))) keys)])
-       (let ([v (hash-ref groups k)])
-         (make-element
-          #f
-          (send style
-                render-author+dates
-                (add-cite group (car v) 'autobib-author #f #f style)
-                (add-date-cites group v (send style get-item-sep) style sort? bib-date<? bib-date=?)))))
-     (send style get-group-sep))
-    (list (send style get-cite-close)))))
-
-(define (extract-bib-author b)
-  (or (auto-bib-author b)
-      (org-author-name (auto-bib-title b))))
-
-(define (extract-bib-key b)
-  (author-element-names (extract-bib-author b)))
-
-;; Defaults only care about the year.
-(define (default-render-date-bib date)
-  (make-element #f (list (number->string (date-year date)))))
-(define (default-render-date-cite date)
-  (make-element #f (list (number->string (date-year date)))))
-(define (default-date<? b0 b1)
-  (and (auto-bib-date b0) (auto-bib-date b1)
-       (< (date-year (auto-bib-date b0)) (date-year (auto-bib-date b1)))))
-(define (default-date=? b0 b1)
-  (and (auto-bib-date b0) (auto-bib-date b1)
-       (= (date-year (auto-bib-date b0)) (date-year (auto-bib-date b1)))))
-
-;; 0 -> a, 1 -> b, etc.
-(define (default-disambiguation n)
-  (when (>= n 26)
-    (error 'default-disambiguation "Citations too ambiguous for default disambiguation scheme."))
-  (make-element #f (list (format "~a" (integer->char (+ 97 n))))))
-
-(define author+date-style
-  (new
-   (class object%
-     (define/public (bibliography-table-style) bib-single-style)
-     (define/public (entry-style) bibentry-style)
-     (define/public (disambiguate-date?) #t)
-     (define/public (collapse-for-date?) #t)
-     (define/public (get-cite-open) "(")
-     (define/public (get-cite-close) ")")
-     (define/public (get-group-sep) "; ")
-     (define/public (get-item-sep) ", ")
-     (define/public (render-citation date-cite i) date-cite)
-     (define/public (render-author+dates author dates) (list* author " " dates))
-     (define/public (bibliography-line i e) (list e))
-     (super-new))))
-
-(define number-style
-  (new
-   (class object%
-     (define/public (bibliography-table-style) bib-columns-style)
-     (define/public (entry-style) colbibentry-style)
-     (define/public (disambiguate-date?) #f)
-     (define/public (collapse-for-date?) #f)
-     (define/public (get-cite-open) "[")
-     (define/public (get-cite-close) "]")
-     (define/public (get-group-sep) ", ")
-     (define/public (get-item-sep) ", ")
-     (define/public (render-citation date-cite i) (number->string i))
-     (define/public (render-author+dates author dates) dates)
-     (define/public (bibliography-line i e)
-       (list (make-paragraph plain
-                             (make-element colbibnumber-style (list "[" (number->string i) "]")))
-             e))
-     (super-new))))
-
-(define (gen-bib tag group sec-title 
-                 style maybe-disambiguator 
-                 maybe-render-date-bib maybe-render-date-cite 
-                 maybe-date<? maybe-date=?
-                 spaces)
-  (define disambiguator (or maybe-disambiguator default-disambiguation))
-  (define date<? (or maybe-date<? default-date<?))
-  (define date=? (or maybe-date=? default-date=?))
-  (define render-date-bib (or maybe-render-date-bib default-render-date-bib))
-  (define render-date-cite (or maybe-render-date-cite default-render-date-cite))
-  (define (author/date<? a b)
-    ;; Compare author names, then date, then full key
-    (or (string-ci<? (extract-bib-key a) (extract-bib-key b))
-        (and (string-ci=? (extract-bib-key a) (extract-bib-key b))
-             (cond
-              [(not (auto-bib-date a))
-               (if (auto-bib-date b)
-                   #f
-                   (string-ci<? (auto-bib-key a) (auto-bib-key b)))]
-              [(not (auto-bib-date b)) #t]
-              [(date<? a b) #t]
-              [(date<? b a) #f]
-              [else (string-ci<? (auto-bib-key a) (auto-bib-key b))]))))
-  (define (ambiguous? a b)
-    (and (string-ci=? (author-element-cite (extract-bib-author a))
-                      (author-element-cite (extract-bib-author b)))
-         (auto-bib-date a)
-         (auto-bib-date b)
-         (date=? a b)))
-  (define bibs (sort (hash-values (bib-group-ht group))
-                     author/date<?))
-  (define disambiguated
-    (let ()
-      (define (bib->para bib disambiguation i)
-        (define collect-target
-          (list (make-target-element
-                  #f
-                  (bib->entry bib style disambiguation render-date-bib i)
-                  `(autobib ,(auto-bib-key bib)))))
-        ;; Communicate to scribble's resolve step.
-        (define (collect ci)
-          ;; store the author
-          (collect-put! ci
-                        `(autobib-author ,(auto-bib-key bib)) ;; (list which key)
-                        (make-element
-                         #f
-                         (list (author-element-cite (extract-bib-author bib)))))
-          ;; store the date
-          (when (auto-bib-date bib)
-            (collect-put! ci
-                          `(autobib-date ,(auto-bib-key bib)) ;; (list which key)
-                          (make-element #f (list 
-                                            (send style
-                                                  render-citation
-                                                  (render-date-cite (auto-bib-date bib))
-                                                  i)))))
-          ;; store how to disambiguate it from other like citations.
-          (collect-put! ci
-                        `(autobib-disambiguation ,(auto-bib-key bib))
-                        (or disambiguation 'unambiguous)))
-        (send style
-              bibliography-line
-              i
-              (make-paragraph plain
-                              (list (make-collect-element #f collect-target collect)))))
-      ;; create the bibliography with disambiguations added.
-      (define-values (last num-ambiguous rev-disambiguated*)
-        (for/fold ([last #f] [num-ambiguous 0] [rev-disambiguated '()]) ([bib (in-list bibs)]
-                                                                         [i (in-naturals 1)])
-          (define ambiguous?? (and (send style disambiguate-date?)
-                                   last 
-                                   (ambiguous? last bib)))
-          (define num-ambiguous*
-            (cond [ambiguous?? (add1 num-ambiguous)]
-                  [else 0]))
-          ;; the current entry is ambiguous with the last. Modify the last
-          ;; to have the first disambiguation.
-          (define rev-disambiguated*
-            (cond [(and ambiguous?? (= 0 num-ambiguous))
-                   (cons (bib->para last (disambiguator num-ambiguous) i)
-                         (cdr rev-disambiguated))]
-                  [else rev-disambiguated]))
-          (define para*
-            (bib->para bib (and ambiguous?? (disambiguator num-ambiguous*)) i))
-          (values bib num-ambiguous* (cons para* rev-disambiguated*))))
-      (reverse rev-disambiguated*)))
-
-  (define (make-space)
-    (list
-      (make-paragraph (make-style #f '()) '(""))
-      (make-paragraph (make-style #f '()) '(""))))
-
-  (make-part #f
-             `((part ,tag))
-             (list sec-title)
-             (make-style #f '(unnumbered))
-             null
-             (list (make-table (send style bibliography-table-style)
-                               (add-between #:splice? #t
-                                            disambiguated
-                                            (for/list ([i (in-range 1 spaces)])
-                                              (make-space)))))
-             null))
-
-(define (bib->entry bib style disambiguation render-date-bib i)
-  (define-values (author date title location url note is-book?)
-    (values (auto-bib-author bib)
-            (auto-bib-date bib)
-            (auto-bib-title bib)
-            (auto-bib-location bib)
-            (auto-bib-url bib)
-            (auto-bib-note bib)
-            (auto-bib-is-book? bib)))
-  (make-element (send style entry-style)
-                (append
-                 (if author
-                     `(,author
-                       ,@(if (ends-in-punc? author)
-                             '(" ")
-                             '(". ")))
-                     null)
-                 ;; (if is-book? null '(ldquo))
-                 (if is-book?
-                     (list (italic title))
-                     (decode-content (list title)))
-                 (if (ends-in-punc? title)
-                     null
-                     '("."))
-                 ;; (if is-book? null '(rdquo))
-                 (if location
-                     `(" " ,@(decode-content (list location)) ,(if date "," "."))
-                     null)
-                 (if date `(" "
-                            ,@(if disambiguation
-                                  `(,@(decode-content (list (render-date-bib date))) ,disambiguation)
-                                  (decode-content (list (render-date-bib date))))
-                            ".")
-                     null)
-                 (if url `(" " ,(link url (make-element 'url (list url)))) null)
-                 (if note `(" " ,note) null))))
-
-(define-syntax (define-cite stx)
-  (syntax-parse stx
-    [(_ (~var ~cite) citet generate-bibliography
-        (~or (~optional (~seq #:style style) #:defaults ([style #'author+date-style]))
-             (~optional (~seq #:disambiguate fn) #:defaults ([fn #'#f]))
-             (~optional (~seq #:render-date-in-bib render-date-bib) #:defaults ([render-date-bib #'#f]))
-             (~optional (~seq #:spaces spaces) #:defaults ([spaces #'1]))
-             (~optional (~seq #:render-date-in-cite render-date-cite) #:defaults ([render-date-cite #'#f]))
-             (~optional (~seq #:date<? date<?) #:defaults ([date<? #'#f]))
-             (~optional (~seq #:date=? date=?) #:defaults ([date=? #'#f]))) ...)
-     (syntax/loc stx
-       (begin
-         (define group (make-bib-group (make-hasheq)))
-         (define the-style style)
-         (define (~cite #:sort? [sort? #t] bib-entry . bib-entries)
-           (add-cites group (cons bib-entry bib-entries) sort? the-style date<? date=?))
-         (define (citet bib-entry . bib-entries)
-           (add-inline-cite group (cons bib-entry bib-entries) the-style date<? date=?))
-         (define (generate-bibliography #:tag [tag "doc-bibliography"] #:sec-title [sec-title "Bibliography"])
-           (gen-bib tag group sec-title the-style fn render-date-bib render-date-cite date<? date=? spaces))))]))
-
-(define (ends-in-punc? e)
-  (regexp-match? #rx"[.!?,]$" (content->string e)))
-
-(define (understand-date inp)
-  ;; Currently there is no string->date function.
-  ;; Common usage of autobib has assumed that this should be the year.
-  (cond [(or (string? inp) (number? inp))
-         (define year
-           (cond [(string? inp) (string->number inp)]
-                 [else inp]))
-         (date 0 0 0 1 1 ;; second/minute/hour/day/month
-               year
-               ;; week-day/year-day/daylight savings time?/timezone offset
-               0 0 #f 0)]
-        [(date? inp) inp]
-        [(not inp) #f] ;; no date is fine too.
-        [else (error 'make-bib "Not given a value that represents a date.")]))
-
-;; We delay making the element for the bib-entry because we may need to add
-;; disambiguations during gen-bib.
-(define (make-bib #:title title
-                  #:author [author #f]
-                  #:is-book? [is-book? #f]
-                  #:location [location #f]
-                  #:date [date #f]
-                  #:url [url #f]
-                  #:note [note #f])
-  (define author*
-    (cond [(not author) #f]
-          [(author-element? author) author]
-          [else (parse-author author)]))
-  (define parsed-date (understand-date date))
-  (make-auto-bib author* parsed-date title location url note is-book?
-                 (content->string
-                  (make-element #f
-                                (append
-                                 (if author* (list author*) null)
-                                 (list title)
-                                 (if location (decode-content (list location)) null)
-                                 (if date (decode-content (list (default-render-date-bib parsed-date))) null)
-                                 (if url (list (link url (make-element 'url (list url)))) null)
-                                 (if note (list note) null))))
-                 ""))
-
-(define (in-bib bib where)
-  (make-auto-bib
-   (auto-bib-author bib)
-   (auto-bib-date bib)
-   (auto-bib-title bib)
-   (auto-bib-location bib)
-   (auto-bib-url bib)
-   (auto-bib-note bib)
-   (auto-bib-is-book? bib)
-   (auto-bib-key bib)
-   ;; "where" is the only specific part of auto-bib elements currently.
-   (string-append (auto-bib-specific bib) where)))
-
-(define (parse-author a)
-  (cond [(author-element? a) a]
-        [else
-         (define s (content->string a)) ;; plain text rendering
-         (define m (regexp-match #px"^(.*) (([\\-]|\\p{L})+)$" s))
-         (define given-names (and m (cadr m)))
-         (define family-name (and m (caddr m)))
-         (define names
-           (cond [m (string-append family-name " " given-names)]
-                 [else s]))
-         (define cite
-           (cond [m (caddr m)]
-                 [else s]))
-         (define element-content
-           (cond
-             [(and given-names (abbreviate-given-names))
-              (string-append (given-names->initials given-names) family-name)]
-             [else a]))
-         (make-author-element #f (list element-content) names cite)]))
-
-(define (given-names->initials str)
-  (regexp-replace* #rx"(.)[^ ]*( |$)" str "\\1. "))
-
-(module+ test
-  (require rackunit)
-  (check-equal? (given-names->initials "Matthew") "M. ")
-  (check-equal? (given-names->initials "Matthew R.") "M. R. ")
-  (check-equal? (given-names->initials "Matthew Raymond") "M. R. "))
-         
-(define (proceedings-location
-         location
-         #:pages [pages #f]
-         #:series [series #f]
-         #:volume [volume #f])
-  (let* ([s @elem{In @italic{@elem{Proc. @|location|}}}]
-         [s (if series
-                @elem{@|s|, @(format "~a" series)}
-                s)]
-         [s (if volume
-                @elem{@|s| volume @(format "~a" volume)}
-                s)]
-         [s (if pages
-                @elem{@|s|, pp. @(to-string (car pages))--@(to-string (cadr pages))}
-                s)])
-    s))
-
-(define (journal-location
-         location
-         #:pages [pages #f]
-         #:number [number #f]
-         #:volume [volume #f])
-  (let* ([s @italic{@|location|}]
-         [s (if volume
-                @elem{@|s| @(to-string volume)}
-                s)]
-         [s (if number
-                @elem{@|s|(@(to-string number))}
-                s)]
-         [s (if pages
-                @elem{@|s|, pp. @(to-string (car pages))--@(to-string (cadr pages))}
-                s)])
-    s))
-
-(define (book-location
-         #:edition [edition #f]
-         #:publisher [publisher #f])
-  (let* ([s (if edition
-                @elem{@(string-titlecase edition) edition}
-                #f)]
-         [s (if publisher
-                (if s
-                   @elem{@|s|. @|publisher|}
-                   publisher)
-                s)])
-    (unless s
-      (error 'book-location "no arguments"))
-    s))
-
-(define (techrpt-location
-         #:institution org
-         #:number num)
-  @elem{@|org|, @|num|})
-
-(define (dissertation-location
-         #:institution org
-         #:degree [degree "PhD"])
-  @elem{@|degree| dissertation, @|org|})
-
-;; ----------------------------------------
-
-(define (author-name first last #:suffix [suffix #f])
-  (make-author-element
-   #f
-   (list
-    (format "~a ~a~a" 
-            (if (abbreviate-given-names)
-                (given-names->initials first)
-                first)
-            last 
-            (if suffix
-                (format " ~a" suffix)
-                "")))
-   (format "~a ~a~a" last first (if suffix
-                                    (format " ~a" suffix)
-                                    ""))
-   last))
-
-(define (org-author-name org)
-  (make-author-element
-   #f
-   (list org)
-   org
-   org))
-
-(define (other-authors)
-  (make-other-author-element
-   #f
-   (list "Alia")
-   "al."
-   "al."))
-
-(define (authors name . names*)
-  (define names (map parse-author (cons name names*)))
-  (define slash-names (string-join (map author-element-names names) " / "))
-  (define cite
-    (case (length names)
-      [(1) (author-element-cite (car names))]
-      [(2) (if (other-author-element? (cadr names))
-               (format "~a et al." (author-element-cite (car names)))
-               (format "~a and ~a"
-                       (author-element-cite (car names))
-                       (author-element-cite (cadr names))))]
-      [else (format "~a et al." (author-element-cite (car names)))]))
-  (make-author-element
-     #f
-     (let loop ([names names] [prefix 0])
-       (cond [(null? (cdr names))
-              (case prefix
-                [(0) names]
-                [(1) (if (other-author-element? (car names))
-                         (list " et al.")
-                         (list " and " (car names)))]
-                [else (if (other-author-element? (car names))
-                          (list ", et al.")
-                          (list ", and " (car names)))])]
-             [else
-              (case prefix
-                [(0) (list* (car names)
-                            (loop (cdr names) (add1 prefix)))]
-                [else (list* ", "
-                             (car names)
-                             (loop (cdr names) (add1 prefix)))])]))
-     slash-names
-     cite))
-
-(define (editor name)
-  (let ([name (parse-author name)])
-    (make-author-element
-     #f
-     (append (element-content name)
-             '(" (Ed.)"))
-     (author-element-names name)
-     (author-element-cite name))))
-
-(define (to-string v) (format "~a" v))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.tex b/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.tex
deleted file mode 100644
index ac67197ddd..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-
-\newenvironment{AutoBibliography}{\begin{small}}{\end{small}}
-\newcommand{\Autobibentry}[1]{\hspace{0.05\linewidth}\parbox[t]{0.95\linewidth}{\parindent=-0.05\linewidth#1\vspace{1.0ex}}}
-
-\usepackage{calc}
-\newlength{\ABcollength}
-\newcommand{\Autocolbibnumber}[1]{\parbox[t]{5ex}{\hfill#1~~\vspace{1.0ex}}}
-\newcommand{\Autocolbibentry}[1]{\setlength{\ABcollength}{\linewidth-5ex}\parbox[t]{\ABcollength}{#1\vspace{1.0ex}}}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/bibtex.rkt b/pkgs/scribble-pkgs/scribble-lib/scriblib/bibtex.rkt
deleted file mode 100644
index 54c1b2820b..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/bibtex.rkt
+++ /dev/null
@@ -1,331 +0,0 @@
-#lang at-exp racket/base
-(require racket/function
-         racket/match
-         racket/list)
-
-(struct bibdb (raw bibs))
-
-(define (bibtex-parse ip)
-  (define STRING-DB (make-hash))
-  (define ENTRY-DB (make-hash))
-
-  (define (perror ip sym fmt . args)
-    (define loc (call-with-values (λ () (port-next-location ip)) list))
-    (apply error sym (string-append fmt " @ line ~a column ~a byte ~a") (append args loc)))
-
-  (define (read-while pred ip)
-    (list->string
-     (let loop ()
-       (match (peek-char ip)
-         [(and (? char?) (? pred))
-          (cons (read-char ip)
-                (loop))]
-         [_
-          empty]))))
-
-  (define (read-until pred ip)
-    (read-while (negate pred) ip))
-
-  (define (slurp-whitespace ip)
-    (read-while (λ (c) (and (char? c) (char-whitespace? c))) ip))
-
-  (define (read-entries ip)
-    (slurp-whitespace ip)
-    (match (read-char ip)
-      [#\%
-       (read-line ip)
-       (read-entries ip)]
-      [#\@
-       (read-entry ip)
-       (read-entries ip)]
-      [(? eof-object?)
-       (void)]
-      [c
-       ;; All other characters are comments.
-       (read-entries ip)]))
-
-  (define (read-entry ip)
-    (match (read-until (λ (c) (or (char=? c #\{)
-                                  (char=? c #\()))
-                       ip)
-      [(app string-downcase "string")
-       (slurp-whitespace ip)
-       (match (read-char ip)
-         [#\{
-          (void)]
-         [c
-          (perror ip 'read-entry "Parsing entry, expected {, got ~v" c)])
-       (define tag (read-tag ip))
-       (slurp-whitespace ip)
-       (match (read-char ip)
-         [#\=
-          (slurp-whitespace ip)
-          (define string (read-value ip))
-          (slurp-whitespace ip)
-          (match (read-char ip)
-            [#\}
-             (hash-set! STRING-DB tag string)]
-            [c
-             (perror ip 'read-entry "Parsing string, expected }, got ~v; tag is ~v; string is ~v" c tag string)])]
-         [c
-          (perror ip 'read-entry "Parsing string, expected =, got ~v; tag is ~v" c tag)])]
-      [(or (app string-downcase "comment")
-           (app string-downcase "preamble"))
-       (read-char ip)
-       (let loop ()
-         (read-until (λ (c) (or (char=? c #\{) (char=? c #\}))) ip)
-         (match (read-char ip)
-           [#\{
-            (loop) (loop)]
-           [#\}
-            (void)]))]
-      [typ
-       (read-char ip)
-       (slurp-whitespace ip)
-       (define label (read-until (λ (c) (char=? c #\,)) ip))
-       (read-char ip)
-       (define alist
-         (let loop ()
-           (slurp-whitespace ip)
-           (define atag (read-tag ip))
-           (cond
-             [(string=? "" atag)
-              (read-char ip)
-              (hash)]
-             [else
-              (slurp-whitespace ip)
-              (match (read-char ip)
-                [#\=
-                 (slurp-whitespace ip)
-                 (define aval (read-value ip))
-                 (slurp-whitespace ip)
-                 (match (read-char ip)
-                   [#\,
-                    (hash-set (loop) atag aval)]
-                   [#\}
-                    (hash atag aval)]
-                   [c
-                    (perror ip 'read-entry "Parsing entry, expected , or }, got ~v; label is ~v; atag is ~v; aval is ~v" c label atag aval)])]
-                [c
-                 (perror ip 'read-entry "Parsing entry tag, expected =, got ~v; label is ~v; atag is ~v" c label atag)])])))
-       (hash-set! ENTRY-DB label
-                  (hash-set alist 'type typ))]))
-
-  (define (read-tag ip)
-    (slurp-whitespace ip)
-    (string-downcase
-     (read-until
-      (λ (c) (or (char-whitespace? c)
-                 (char=? c #\=)
-                 (char=? c #\{)
-                 (char=? c #\})))
-      ip)))
-
-  (define (read-braced-value ip)
-    (read-char ip)
-    (let loop ()
-      (define first-part (read-until (λ (c) (or (char=? c #\{) (char=? c #\})))
-                                     ip))
-      (match (peek-char ip)
-        [#\{
-         (string-append first-part (read-value ip) (loop))]
-        [#\}
-         (read-char ip)
-         first-part])))
-
-  (define (read-value ip)
-    (slurp-whitespace ip)
-    (define first-part (read-value-single ip))
-    (slurp-whitespace ip)
-    (match (peek-char ip)
-      [#\#
-       (read-char ip)
-       (string-append first-part (read-value ip))]
-      [_
-       first-part]))
-
-  (define (read-value-single ip)
-    (slurp-whitespace ip)
-    (match (peek-char ip)
-      [#\{
-       (read-braced-value ip)]
-      [#\"
-       (read-char ip)
-       (let loop ()
-         (define first-part (read-until (λ (c) (or (char=? c #\{) (char=? c #\")))
-                                        ip))
-         (match (peek-char ip)
-           [#\{
-            (string-append first-part (read-braced-value ip) (loop))]
-           [#\"
-            (read-char ip)
-            first-part]))]
-      [(? char-numeric?)
-       (read-while char-numeric? ip)]
-      [(? char-alphabetic?)
-       (define string-tag (read-until (λ (c) (or (char-whitespace? c)
-                                                 (char=? c #\,)))
-                                      ip))
-       (hash-ref STRING-DB string-tag
-                 (λ () string-tag))]
-      [c
-       (perror ip 'read-value "Parsing value, expected {, got ~v" c)]))
-
-  (read-entries ip)
-
-  (bibdb ENTRY-DB (make-hash)))
-
-(define (path->bibdb pth)
-  (define bibdb
-    (with-input-from-file
-        pth
-      (λ ()
-        (port-count-lines! (current-input-port))
-        (bibtex-parse (current-input-port)))))
-  bibdb)
-
-(require scriblib/autobib
-         scribble/manual)
-
-(define-syntax-rule
-  (define-bibtex-cite bib-pth
-    ~cite-id citet-id generate-bibliography-id . options)
-  (begin
-    (define-cite autobib-cite autobib-citet generate-bibliography-id . options)
-    (define-bibtex-cite* bib-pth
-      autobib-cite autobib-citet
-      ~cite-id citet-id)))
-
-(define-syntax-rule
-  (define-bibtex-cite* bib-pth
-    autobib-cite autobib-citet
-    ~cite-id citet-id)
-  (begin
-    (define bibtex-db (path->bibdb bib-pth))
-    (define ((make-citer citer) f . r)
-      (apply citer
-             (filter-map
-              (λ (key)
-                (and (not (string=? "\n" key))
-                     (generate-bib bibtex-db key)))
-              (append-map (curry regexp-split #rx" +")
-                          (cons f r)))))
-    (define ~cite-id (make-citer autobib-cite))
-    (define citet-id (make-citer autobib-citet))))
-
-(define (parse-author as)
-  (and as
-      (apply authors
-         (for/list ([a (in-list (regexp-split #rx" +and *" as))])
-           (match (regexp-split #rx" +" a)
-             [(list one) (org-author-name one)]
-             [(list one two) (author-name one two)]
-             [(list-rest first rest) 
-              (author-name first (apply string-append (add-between rest " ")))])))))
-
-(module+ test
-  (require rackunit)
-  
-  ;; use this as a predicate to hack around lack of 
-  ;; ability to use equal? on author element structs
-  (define (print-as-equal-string? a b)
-    (equal? (format "~s" a)
-            (format "~s" b)))
-  
-  (check 
-   print-as-equal-string? 
-   (parse-author "James Earl Jones")
-   (authors
-    (author-name "James Earl" "Jones")))
-  
-  (check
-   print-as-equal-string?
-   (parse-author "Tim Robbins and Morgan Freeman")
-   (authors (author-name "Tim" "Robbins")
-            (author-name "Morgan" "Freeman")))
-  
-  (check
-   print-as-equal-string? 
-   (parse-author "Edward L. Deci and Robert J. Vallerand and Luc G. Pelletier and Richard M. Ryan")
-   (authors (author-name "Edward L." "Deci")
-            (author-name "Robert J." "Vallerand")
-            (author-name "Luc G." "Pelletier")
-            (author-name "Richard M." "Ryan"))))
-
-(define (parse-pages ps)
-  (match ps
-    [(regexp #rx"^([0-9]+)\\-+([0-9]+)$" (list _ f l))
-     (list f l)]
-    [#f
-     #f]
-    [_
-     (error 'parse-pages "Invalid page format ~e" ps)]))
-
-(define (generate-bib db key)
-  (match-define (bibdb raw bibs) db)
-  (hash-ref! bibs key
-             (λ ()
-               (define the-raw (hash-ref raw key (λ () (error 'bibtex "Unknown citation ~e" key))))
-               (define (raw-attr a [def #f])
-                 (hash-ref the-raw a def))
-               (define (raw-attr* a)
-                 (hash-ref the-raw a
-                           (λ () (error 'bibtex "Key ~a is missing attribute ~a, has ~a"
-                                        key a the-raw))))
-               (match (raw-attr 'type)
-                 ["misc"
-                  (make-bib #:title (raw-attr "title")
-                            #:author (parse-author (raw-attr "author"))
-                            #:date (raw-attr "year")
-                            #:url (raw-attr "url"))]
-                 ["book"
-                  (make-bib #:title (raw-attr "title")
-                            #:author (parse-author (raw-attr "author"))
-                            #:date (raw-attr "year")
-                            #:is-book? #t
-                            #:url (raw-attr "url"))]
-                 ["article"
-                  (make-bib #:title (raw-attr "title")
-                            #:author (parse-author (raw-attr "author"))
-                            #:date (raw-attr "year")
-                            #:location (journal-location (raw-attr* "journal")
-                                                         #:pages (parse-pages (raw-attr "pages"))
-                                                         #:number (raw-attr "number")
-                                                         #:volume (raw-attr "volume"))
-                            #:url (raw-attr "url"))]
-                 ["inproceedings"
-                  (make-bib #:title (raw-attr "title")
-                            #:author (parse-author (raw-attr "author"))
-                            #:date (raw-attr "year")
-                            #:location (proceedings-location (raw-attr "booktitle"))
-                            #:url (raw-attr "url"))]
-                 ["webpage"
-                  (make-bib #:title (raw-attr "title")
-                            #:author (parse-author (raw-attr "author"))
-                            #:date (raw-attr "year")
-                            #:url (raw-attr "url"))]                 
-                 ["mastersthesis"
-                  (make-bib #:title (raw-attr "title")
-                            #:author (parse-author (raw-attr "author"))
-                            #:date (raw-attr "year")
-                            #:location (raw-attr "school")
-                            #:url (raw-attr "url"))]
-                 ["techreport"
-                  (make-bib #:title (raw-attr "title")
-                            #:author (parse-author (raw-attr "author"))
-                            #:date (raw-attr "year")
-                            #:location
-                            (match* ((raw-attr "institution") (raw-attr "number"))
-                              [(#f #f) @elem{}]
-                              [(l #f) @elem{@|l|}]
-                              [(#f n) @elem{@|n|}]
-                              [(l n) @elem{@|l|, @|n|}])
-                            #:url (raw-attr "url"))]
-                 [_
-                  (make-bib #:title (format "~v" the-raw))]))))
-
-(provide (struct-out bibdb)
-         path->bibdb
-         bibtex-parse
-         define-bibtex-cite
-         define-bibtex-cite*)
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.css b/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.css
deleted file mode 100644
index 905d5b6702..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.css
+++ /dev/null
@@ -1,37 +0,0 @@
-
-.Centertext {
-  text-align: center;
-  margin: 0 0 0 0;
-}
-
-.Figure, .FigureMulti, .FigureMultiWide, .Herefigure {
-  margin: 1em 0 1em 0;
-  border: 1px solid #1818FF;
-}
-
-.Figure, .FigureMulti, .Herefigure {
-  width: 100%;
-}
-
-.FigureMultiWide {
-  width: 125%;
-}
-
-.Centerfigure {
-  text-align: center;
-  margin: 0 0 0 0;
-}
-
-.Leftfigure {
-  text-align: left;
-  margin: 0 0 0 0;
-}
-
-.Rightfigure {
-  text-align: right;
-  margin: 0 0 0 0;
-}
-
-.FigureInside {
-  margin: 1em 1em 1em 1em;
-}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.js b/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.js
deleted file mode 100644
index b85af46cd7..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.js
+++ /dev/null
@@ -1,27 +0,0 @@
-
-AddOnLoad(function () {
-    /* Lift figure targets to the start of the figure's blockquote,
-       so that clicking on a target reference shows the figure
-       content, instead of scrolling the figure caption to the
-       top of the page. */
-    var targets = document.getElementsByTagName("a");
-    for (var i = 0; i < targets.length; i++) {
-        var a = targets[i];
-        var n = a.attributes["x-target-lift"];
-        if (n) {
-            var s = n.value;
-            var p = a.parentNode;
-            while (p && (p.className != s)) {
-                p = p.parentNode;
-            }
-            if (p) {
-                var cs = p.children;
-                a.parentNode.removeChild(a);
-                if (cs.length > 0)
-                    p.insertBefore(a, cs[0]);
-                else
-                    p.appendChild(a);
-            }
-        }
-    }
-});
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.rkt b/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.rkt
deleted file mode 100644
index b965a1845f..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.rkt
+++ /dev/null
@@ -1,139 +0,0 @@
-#lang scheme/base
-
-(require scribble/manual
-         scribble/core
-         scribble/decode
-         scribble/html-properties
-         scribble/latex-properties
-         setup/main-collects
-         "private/counter.rkt")
-
-(provide figure
-         figure*
-         figure**
-         figure-here
-         Figure-target 
-         Figure-ref
-         figure-ref
-         left-figure-style
-         center-figure-style
-         right-figure-style
-         suppress-floats
-         (rename-out [left-figure-style left]))
-
-(define figure-style-extras
-  (let ([abs (lambda (s)
-               (path->main-collects-relative
-                (collection-file-path s "scriblib")))])
-    (list (make-css-addition (abs "figure.css"))
-          (make-tex-addition (abs "figure.tex")))))
-
-;; outer layer:
-(define herefigure-style  (make-style "Herefigure" figure-style-extras))
-(define figure-style (make-style "Figure" figure-style-extras))
-(define figuremulti-style (make-style "FigureMulti" figure-style-extras))
-(define figuremultiwide-style (make-style "FigureMultiWide" figure-style-extras))
-
-;; middle layer:
-(define center-figure-style (make-style "Centerfigure" figure-style-extras))
-(define left-figure-style (make-style "Leftfigure" figure-style-extras))
-(define right-figure-style (make-style "Rightfigure" figure-style-extras))
-
-;; inner layer:
-(define figureinside-style (make-style "FigureInside" figure-style-extras))
-
-(define legend-style (make-style "Legend" figure-style-extras))
-(define legend-continued-style (make-style "LegendContinued" figure-style-extras))
-
-(define centertext-style (make-style "Centertext" figure-style-extras))
-
-;; See "figure.js":
-(define figure-target-style
-  (make-style #f
-              (list
-               (make-attributes '((x-target-lift . "Figure")))
-               (make-js-addition
-                (path->main-collects-relative
-                 (collection-file-path "figure.js" "scriblib"))))))
-
-(define (make-figure-ref c s)
-  (element (style "FigureRef" (list* (command-extras (list s))
-                                     figure-style-extras))
-    c))
-(define (make-figure-target c s)
-  (element (style "FigureTarget" (cons (command-extras (list s))
-                                       figure-style-extras))
-    c))
-
-(define (figure tag caption 
-                #:style [style center-figure-style]
-                #:continue? [continue? #f]
-                . content)
-  (figure-helper figure-style style tag caption content continue?))
-
-(define (figure-here tag caption 
-                     #:style [style center-figure-style] 
-                     #:continue? [continue? #f]
-                     . content)
-  (figure-helper herefigure-style style tag caption content continue?))
-
-(define (figure* tag caption 
-                 #:style [style center-figure-style]
-                 #:continue? [continue? #f]
-                 . content)
-  (figure-helper figuremulti-style style tag caption content continue?))
-(define (figure** tag caption 
-                  #:style [style center-figure-style] 
-                  #:continue? [continue? #f]
-                  . content)
-  (figure-helper figuremultiwide-style style tag caption content continue?))
-
-(define (figure-helper figure-style content-style tag caption content continue?)
-  (make-nested-flow 
-   figure-style 
-   (list
-    (make-nested-flow
-     content-style
-     (list (make-nested-flow figureinside-style (decode-flow content))))
-    (make-paragraph
-     centertext-style
-     (list (make-element (if continue?
-                             legend-continued-style
-                             legend-style)
-                         (list (Figure-target tag #:continue? continue?) caption)))))))
-
-(define figures (new-counter "figure" 
-                             #:target-wrap make-figure-target
-                             #:ref-wrap make-figure-ref))
-(define (Figure-target tag #:continue? [continue? #f])
-  (counter-target figures tag 
-                  "Figure" 
-                  (if continue? " (continued): " ": ")
-                  #:target-style figure-target-style
-                  #:continue? continue?))
-
-(define (ref-proc initial)
-  (case-lambda 
-   [(tag)
-    (make-element #f (list (counter-ref figures tag (string-append initial "igure"))))]
-   [(tag1 tag2)
-    (make-element #f (list (counter-ref figures tag1 (string-append initial "igures"))
-                           " and "
-                           (counter-ref figures tag2 #f)))]
-   [(tag . tags)
-    (make-element #f (cons (counter-ref figures tag (string-append initial "igures"))
-                           (let loop ([tags tags])
-                             (cond
-                              [(null? (cdr tags))
-                               (list ", and "
-                                     (counter-ref figures (car tags) #f))]
-                              [else
-                               (list* ", "
-                                      (counter-ref figures (car tags) #f)
-                                      (loop (cdr tags)))]))))]))
-
-(define Figure-ref (ref-proc "F"))
-(define figure-ref (ref-proc "f"))
-
-(define (suppress-floats)
-  (make-element "suppressfloats" null))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.tex b/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.tex
deleted file mode 100644
index 22d7bdc4c6..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-\usepackage{ccaption}
-
-% \legend relies on \belowcaptionskip, which is not defined
-% by the JFP class file:
-\makeatletter
-\@ifundefined{belowcaptionskip}{\newlength{\belowcaptionskip}}{}
-\makeatother
-
-\newcommand{\Legend}[1]{~
-
-                        \hrule width \hsize height .33pt
-                        \vspace{4pt}
-                        \legend{#1}}
-
-\newcommand{\LegendContinued}[1]{\Legend{#1}}
-
-\newcommand{\FigureTarget}[2]{#1}
-\newcommand{\FigureRef}[2]{\hyperref[#2]{#1}}
-
-\newlength{\FigOrigskip}
-\FigOrigskip=\parskip
-
-% Put this before the figure content, so that a hyperref goes to
-% the start of the content:
-\newcommand{\FigureSetRef}{\refstepcounter{figure}}
-
-\newenvironment{Figure}{\begin{figure}\FigureSetRef}{\end{figure}}
-\newenvironment{FigureMulti}{\begin{figure*}[t!p]\FigureSetRef}{\end{figure*}}
-\newenvironment{FigureMultiWide}{\begin{FigureMulti}\FigureSetRef}{\end{FigureMulti}}
-\newenvironment{Herefigure}{\begin{figure}[ht!]\FigureSetRef\centering}{\end{figure}}
-
-\newenvironment{Centerfigure}{\begin{Xfigure}\centering\item}{\end{Xfigure}}
-\newenvironment{Leftfigure}{\begin{Xfigure}\item}{\end{Xfigure}}
-\newenvironment{Rightfigure}{\begin{Xfigure}\item}{\end{Xfigure}}
-
-\newenvironment{Xfigure}{\begin{list}{}{\leftmargin=0pt\topsep=0pt\parsep=\FigOrigskip\partopsep=0pt}}{\end{list}}
-
-\newenvironment{FigureInside}{}{}
-
-\newcommand{\Centertext}[1]{\begin{center}#1\end{center}}
-
-
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.css b/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.css
deleted file mode 100644
index 5d9ebcdf12..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.css
+++ /dev/null
@@ -1,27 +0,0 @@
-
-.NoteBox {
-  position: relative;
-  float: right;
-  left: 2em;
-  height: 0em;
-  width: 13em;
-  margin: 0em -13em 0em 0em;
-}
-
-.NoteContent {
-  margin: 0 0 0 0;
-  font-size: 85%;
-}
-
-.FootnoteContent {
-  display: none;
-}
-
-.FootnoteBlock {
-  border-top: 1px solid black;
-}
-
-.FootnoteBlockContent {
-  padding-left: 1em;
-  text-indent: -0.5em;
-}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.rkt b/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.rkt
deleted file mode 100644
index 81dda9672c..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.rkt
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang scheme/base
-
-(require scribble/core
-         scribble/decode
-         scribble/html-properties
-         scribble/latex-properties
-         racket/promise
-         setup/main-collects
-         "private/counter.rkt")
-
-(provide note
-         define-footnote)
-
-(define footnote-style-extras
-  (let ([abs (lambda (s)
-               (path->main-collects-relative
-                (collection-file-path s "scriblib")))])
-    (list (make-css-addition (abs "footnote.css"))
-          (make-tex-addition (abs "footnote.tex")))))
-
-
-(define note-box-style (make-style "NoteBox" footnote-style-extras))
-(define note-content-style (make-style "NoteContent" footnote-style-extras))
-
-(define (note . text)
-  (make-element 
-   note-box-style
-   (make-element note-content-style
-                 (decode-content text))))
-
-
-(define footnote-style (make-style "Footnote" footnote-style-extras))
-(define footnote-ref-style (make-style "FootnoteRef" footnote-style-extras))
-(define footnote-content-style (make-style "FootnoteContent" footnote-style-extras))
-(define footnote-target-style (make-style "FootnoteTarget" footnote-style-extras))
-(define footnote-block-style (make-style "FootnoteBlock" footnote-style-extras))
-(define footnote-block-content-style (make-style "FootnoteBlockContent" footnote-style-extras))
-
-(define-syntax-rule (define-footnote footnote footnote-part)
-  (begin
-    (define footnotes (new-counter "footnote"))
-    (define id (gensym))
-    (define (footnote . text) (do-footnote footnotes id text))
-    (define (footnote-part . text) (do-footnote-part footnotes id))))
-
-(define (do-footnote footnotes id text)
-  (let ([tag (generated-tag)]
-        [content (decode-content text)])
-    (make-traverse-element
-     (lambda (get set)
-       (set id (cons (cons
-                      (make-element footnote-target-style
-                                    (make-element
-                                     'superscript
-                                     (counter-target footnotes tag #f)))
-                      content)
-                     (get id null)))
-       (make-element footnote-style
-                     (list
-                      (make-element 
-                       footnote-ref-style
-                       (make-element
-                        'superscript
-                        (counter-ref footnotes tag #f)))
-                      (make-element
-                       footnote-content-style
-                       content)))))))
-
-(define (do-footnote-part footnotes id)
-  (make-part
-   #f
-   (list `(part ,(generated-tag)))
-   #f
-   (make-style #f '(hidden toc-hidden))
-   null
-   (list
-    (make-traverse-block
-     (lambda (get set)
-       (make-compound-paragraph
-        footnote-block-style
-        (map (lambda (content)
-               (make-paragraph
-                footnote-block-content-style
-                content))
-             (reverse (get id null)))))))
-   null))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.tex b/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.tex
deleted file mode 100644
index ad0676b9ec..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-
-\newcommand{\NoteBox}[1]{\footnote{#1}}
-\newcommand{\NoteContent}[1]{#1}
-
-\newcommand{\Footnote}[1]{\footnote{#1}}
-\newcommand{\FootnoteRef}[1]{}
-\newcommand{\FootnoteTarget}[1]{}
-\newcommand{\FootnoteContent}[1]{#1}
-
-% Redefine \noindent to avoid generating any output at all:
-\newenvironment{FootnoteBlock}{\renewcommand{\noindent}{}}{}
-\newcommand{\FootnoteBlockContent}[1]{}
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/gui-eval.rkt b/pkgs/scribble-pkgs/scribble-lib/scriblib/gui-eval.rkt
deleted file mode 100644
index 69b3ee3576..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/gui-eval.rkt
+++ /dev/null
@@ -1,174 +0,0 @@
-#lang racket/base
-
-(require scribble/eval
-         scribble/core
-         scribble/scheme
-         racket/class
-         racket/file
-         racket/runtime-path
-         racket/serialize
-         "private/gui-eval-exn.rkt"
-         racket/system
-         racket/sandbox
-         (for-syntax racket/base))
-
-(define-syntax define-mr
-  (syntax-rules ()
-    [(_ mr orig)
-     (begin
-       (provide mr)
-       (define-syntax (mr stx)
-         (syntax-case stx ()
-           [(_ #:eval+opts the-eval get-predicate? get-render get-get-width get-get-height x (... ...))
-            #'(let ([the-eval-x the-eval])
-                (parameterize ([scribble-eval-handler (gui-eval-handler the-eval-x
-                                                                        get-predicate?
-                                                                        get-render
-                                                                        get-get-width
-                                                                        get-get-height)])
-                  (orig #:eval the-eval-x x (... ...))))]
-           [(_ x (... ...))
-            #'(parameterize ([scribble-eval-handler (gui-eval-handler gui-eval
-                                                                      (λ () (gui-eval 'pict?))
-                                                                      (λ () (gui-eval 'draw-pict))
-                                                                      (λ () (gui-eval 'pict-width))
-                                                                      (λ () (gui-eval 'pict-height)))])
-                (orig #:eval gui-eval x (... ...)))])))]))
-
-(define gui-eval (make-base-eval #:pretty-print? #f))
-
-(define mred? (getenv "MREVAL"))
-(define-namespace-anchor anchor)
-
-(when mred?
-  (call-in-sandbox-context gui-eval
-                           (lambda ()
-                             (namespace-attach-module (namespace-anchor->namespace anchor)
-                                                      'racket/class)))
-  (gui-eval '(require racket/gui/base))
-  (gui-eval '(require slideshow)))
-
-(define-mr gui-interaction interaction)
-(define-mr gui-interaction-eval interaction-eval)
-(define-mr gui-interaction-eval-show interaction-eval-show)
-(define-mr gui-def+int def+int)
-(define-mr gui-defs+int defs+int)
-(define-mr gui-racketmod+eval racketmod+eval)
-(define-mr gui-racketblock+eval racketblock+eval)
-
-(provide (rename-out [gui-racketmod+eval gui-schememod+eval]
-                     [gui-racketblock+eval gui-schemeblock+eval]))
-
-;; This one needs to be relative, because it ends up in the
-;;  exprs.dat file:
-(define img-dir "images") ; relative to src dir
-
-;; This one can be absolute:
-(define exprs-dat-file (build-path "images"
-                                   "exprs.dat"))
-
-(define gui-eval-handler
-  (if mred?
-      (let ([eh (scribble-eval-handler)]
-            [log-file (open-output-file exprs-dat-file #:exists 'truncate/replace)])
-        (λ (gui-eval get-predicate? get-render get-get-width get-get-height)
-          (lambda (ev catching-exns? expr)
-            (write (serialize (if (syntax? expr) (syntax->datum expr) expr)) log-file)
-            (newline log-file)
-            (flush-output log-file)
-            (let ([result
-                   (with-handlers ([exn:fail?
-                                    (lambda (exn)
-                                      (make-gui-exn (exn-message exn)))])
-                     ;; put the call to fixup-picts in the handlers
-                     ;; so that errors in the user-supplied predicates & 
-                     ;; conversion functions show up in the rendered output
-                     (fixup-picts (get-predicate?) (get-render) (get-get-width) (get-get-height)
-                                  (eh ev catching-exns? expr)))])
-              (write (serialize result) log-file)
-              (newline log-file)
-              (flush-output log-file)
-              (if (gui-exn? result)
-                  (raise (make-exn:fail
-                          (gui-exn-message result)
-                          (current-continuation-marks)))
-                  result)))))
-      (let ([log-file (with-handlers ([exn:fail:filesystem?
-                                       (lambda (exn)
-                                         (open-input-string ""))])
-                        (open-input-file exprs-dat-file))])
-        (λ (gui-eval get-predicate? get-render get-get-width get-get-height)
-          (lambda (ev catching-exns? expr)
-            (with-handlers ([exn:fail? (lambda (exn)
-                                         (if catching-exns?
-                                             (raise exn)
-                                             (void)))])
-              (let ([v (read log-file)])
-                (if (eof-object? v)
-                    (error "expression not in log file")
-                    (let ([v (deserialize v)])
-                      (if (equal? v (if (syntax? expr)
-                                        (syntax->datum expr)
-                                        expr))
-                          (let ([v (read log-file)])
-                            (if (eof-object? v)
-                                (error "expression result missing in log file")
-                                (let ([v (deserialize v)])
-                                  (if (gui-exn? v)
-                                      (raise (make-exn:fail
-                                              (gui-exn-message v)
-                                              (current-continuation-marks)))
-                                      v))))
-                          (error 'mreval
-                                 "expression does not match log file: ~e versus: ~e"
-                                 expr
-                                 v)))))))))))
-
-(define image-counter 0)
-
-;; This path will be marshaled for use on multiple platforms
-(define (build-string-path a b) (string-append a "/" b))
-
-(define (fixup-picts predicate? render get-width get-height v)
-  (let loop ([v v])
-    (cond
-      [(predicate? v)
-       (let ([fn (build-string-path img-dir
-                                    (format "img~a.png" image-counter))])
-         (set! image-counter (add1 image-counter))
-         (let ([dc (let ([pss (make-object (gui-eval 'ps-setup%))])
-                     (send pss set-mode 'file)
-                     (send pss set-file (path-replace-suffix fn #".pdf"))
-                     (parameterize ([(gui-eval 'current-ps-setup) pss])
-                       (let ([xb (box 0)]
-                             [yb (box 0)])
-                         (send pss get-scaling xb yb)
-                         (new (gui-eval 'pdf-dc%) 
-                              [interactive #f]
-                              [width (* (unbox xb) (get-width v))]
-                              [height (* (unbox yb) (get-height v))]))))])
-           (send dc start-doc "Image")
-           (send dc start-page)
-           (render v dc 0 0)
-           (send dc end-page)
-           (send dc end-doc))
-         (let* ([bm (make-object (gui-eval 'bitmap%)
-                      (inexact->exact (ceiling (get-width v)))
-                      (inexact->exact (ceiling (get-height v))))]
-                [dc (make-object (gui-eval 'bitmap-dc%) bm)])
-           (send dc set-smoothing 'aligned)
-           (send dc clear)
-           (render v dc 0 0)
-           (send bm save-file fn 'png)
-           (make-image-element
-            #f
-            (list "[image]")
-            ;; Be sure to use a string rather than a path, because
-            ;; it gets recorded in "exprs.dat".
-            (path->string (path-replace-suffix fn #""))
-            '(".pdf" ".png")
-            1.0)))]
-      [(pair? v) (cons (loop (car v))
-                       (loop (cdr v)))]
-      [(serializable? v) v]
-      [else (make-element #f (list (format "~s" v)))])))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/info.rkt b/pkgs/scribble-pkgs/scribble-lib/scriblib/info.rkt
deleted file mode 100644
index ed05f03a81..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define purpose "This collect contains auxiliary scribble libraries, they have their own documentation linked from the top level.")
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/private/counter.rkt b/pkgs/scribble-pkgs/scribble-lib/scriblib/private/counter.rkt
deleted file mode 100644
index ff85a68543..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/private/counter.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang racket/base
-(require scribble/core
-         scribble/decode)
-
-(provide new-counter
-         counter-target
-         counter-ref
-         counter-collect-value)
-
-(define-struct counter ([n #:mutable] name target-wrap ref-wrap))
-
-(define (new-counter name
-                     #:target-wrap [target-wrap (lambda (c s) c)]
-                     #:ref-wrap [ref-wrap (lambda (c s) c)])
-  (make-counter 0 name target-wrap ref-wrap))
-
-(define (tag->counter-tag counter tag . kind)
-  (if (generated-tag? tag)
-      `(,(string->symbol (format "counter-~a" kind)) ,tag)
-      `(counter (,(counter-name counter) ,tag ,@kind))))
-
-(define (counter-target counter tag label
-                        #:target-style [target-style #f]
-                        #:continue? [continue? #f]
-                        . content)
-  (let ([content (decode-content content)])
-    (define c
-      (make-target-element
-       target-style
-       (list
-        (make-collect-element
-         #f
-         (list
-          (make-delayed-element
-           (lambda (renderer part ri)
-             (let ([n (resolve-get part ri (tag->counter-tag counter tag "value"))])
-               (let ([l (cons (format "~a" n) content)])
-                 (if label
-                     (list* label 'nbsp l)
-                     l))))
-           (lambda () (if label
-                          (list* label 'nbsp "N" content)
-                          (cons "N" content)))
-           (lambda () (if label
-                          (list* label 'nbsp "N" content)
-                          (cons "N" content)))))
-         (lambda (ci)
-           (let ([n (if continue?
-                        (counter-n counter)
-                        (add1 (counter-n counter)))])
-             (set-counter-n! counter n)
-             (collect-put! ci (generate-tag (tag->counter-tag counter tag "value") ci) n)))))
-       (tag->counter-tag counter tag)))
-    (if (counter-target-wrap counter)
-        ((counter-target-wrap counter)
-         c
-         (format "t:~a" (t-encode (tag->counter-tag counter tag))))
-        c)))
-
-(define (t-encode s)
-  (apply
-   string-append
-   (map (lambda (c)
-          (cond
-            [(and (or (char-alphabetic? c) (char-numeric? c))
-                  ((char->integer c) . < . 128))
-             (string c)]
-            [(char=? c #\space) "_"]
-            [else (format "x~x" (char->integer c))]))
-        (string->list (format "~s" s)))))
-
-(define (counter-ref counter tag label)
-  (let ([n (make-delayed-element
-            (lambda (renderer part ri)
-              (let ([n (resolve-get part ri (tag->counter-tag counter tag "value"))])
-                (if (counter-ref-wrap counter)
-                    (let ([id (format "t:~a" (t-encode (list 'counter (list (counter-name counter) tag))))])
-                      ((counter-ref-wrap counter)
-                       (format "~a" n) 
-                       id))
-                    (list (format "~a" n)))))
-            (lambda () (if label
-                           (list label 'nbsp "N")
-                           (list "N")))
-            (lambda () (if label
-                           (list label 'nbsp "N")
-                           (list "N"))))])
-    (make-link-element
-     #f
-     (if label
-         (list
-          label
-          'nbsp
-          n)
-         n)
-     (tag->counter-tag counter tag))))
-
-(define (counter-collect-value counter)
-  (counter-n counter))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/private/gui-eval-exn.rkt b/pkgs/scribble-pkgs/scribble-lib/scriblib/private/gui-eval-exn.rkt
deleted file mode 100644
index daad531f69..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/private/gui-eval-exn.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scheme/base
-(require mzlib/serialize)
-
-(define-serializable-struct gui-exn (message))
-
-(provide (struct-out gui-exn))
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/render-cond.rkt b/pkgs/scribble-pkgs/scribble-lib/scriblib/render-cond.rkt
deleted file mode 100644
index b76eabd8ea..0000000000
--- a/pkgs/scribble-pkgs/scribble-lib/scriblib/render-cond.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket/base
-(require scribble/core
-         (for-syntax racket/base))
-
-(provide cond-element
-         cond-block)
-
-(define-for-syntax (render-cond stx mk check-result no-matching-case)
-  (syntax-case stx ()
-    [(_ [test body0 body ...] ...)
-     (let ([tests (syntax->list #'(test ...))])
-       (with-syntax ([(test-expr ...)
-                      (for/list ([test (in-list tests)]
-                                 [pos (in-naturals)])
-                        (let loop ([test test])
-                          (syntax-case test (else and or not)
-                            [else
-                             (unless (= pos (sub1 (length tests)))
-                               (raise-syntax-error
-                                #f
-                                "found `else' not in last clause"
-                                stx
-                                test))
-                             #'#t]
-                            [(and test ...)
-                             #`(and . #,(map loop (syntax->list #'(test ...))))]
-                            [(or test ...)
-                             #`(or . #,(map loop (syntax->list #'(test ...))))]
-                            [(not test)
-                             #`(not #,(loop #'test))]
-                            [id
-                             (identifier? #'id)
-                             #'(memq 'id mode)])))]
-                     [mk mk]
-                     [check-result check-result]
-                     [no-matching-case no-matching-case])
-         #'(mk
-            (lambda (get put)
-              (let ([mode (get 'scribble:current-render-mode 'text)])
-                (cond
-                 [test-expr (check-result (let () body0 body ...))]
-                 ...
-                 [else (no-matching-case)]))))))]))
-
-(define-syntax (cond-block stx)
-  (render-cond stx #'traverse-block #'check-block #'no-block-case))
-                           
-(define-syntax (cond-element stx)
-  (render-cond stx #'traverse-element #'check-content #'no-element-case))
-
-(define (check-block v)
-  (unless (block? v)
-    (raise-mismatch-error
-     'cond-block
-     "clause result is not a block: "
-     v))
-  v)
-
-(define (check-content v)
-  (unless (content? v)
-    (raise-mismatch-error
-     'cond-element
-     "clause result is not content: "
-     v))
-  v)
-
-(define (no-block-case)
-  (raise (make-exn:fail:contract
-          "cond-element: no clause matched"
-          (current-continuation-marks))))
-
-(define (no-element-case)
-  (raise (make-exn:fail:contract
-          "cond-element: no clause matched"
-          (current-continuation-marks))))
diff --git a/pkgs/scribble-pkgs/scribble-test/LICENSE.txt b/pkgs/scribble-pkgs/scribble-test/LICENSE.txt
deleted file mode 100644
index 614b7cd931..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-scribble-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/scribble-pkgs/scribble-test/info.rkt b/pkgs/scribble-pkgs/scribble-test/info.rkt
deleted file mode 100644
index 4122e1b9f9..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/info.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("at-exp-lib"
-               "base"
-               "eli-tester"
-               "rackunit-lib"
-               "sandbox-lib"
-               "scribble-doc" ;; because some tests are examples from the docs
-               "scribble-lib"
-               "scribble-text-lib"))
-
-(define pkg-desc "tests for \"scribble\"")
-
-(define pkg-authors '(mflatt eli))
-(define build-deps '("racket-index"))
-(define update-implies '("scribble-lib"))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/help/test-docs-complete2.rkt b/pkgs/scribble-pkgs/scribble-test/tests/help/test-docs-complete2.rkt
deleted file mode 100644
index 7ce64afcc9..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/help/test-docs-complete2.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote help/search))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/decode.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/decode.rkt
deleted file mode 100644
index 4594fd4031..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/decode.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-(require scribble/decode
-         scribble/core
-         rackunit
-         racket/contract/base)
-
-(check-true (pre-content? "x"))
-(check-true (pre-content? null))
-(check-true (pre-content? '("x")))
-(check-true (pre-content? (list (element plain "x") "x")))
-(check-true (pre-content? (splice (list (element plain "x") "x"))))
-(check-true (not (pre-content? 11)))
-(check-true (not (pre-content? '(11))))
-
-(check-true (pre-flow? "x"))
-(check-true (pre-flow? '("x")))
-(check-true (pre-flow? (list (element plain "x") "x")))
-(check-true (pre-flow? (list (paragraph plain (element plain "x")) (element plain "x") "x")))
-(check-true (pre-flow? (splice (list (paragraph plain (element plain "x")) (element plain "x") "x"))))
-(check-true (not (pre-flow? 11)))
-(check-true (not (pre-flow? '(11))))
-
-(check-true (pre-part? "x"))
-(check-true (pre-part? '("x")))
-(check-true (pre-part? (list (element plain "x") "x")))
-(check-true (pre-part? (list (paragraph plain (element plain "x")) (element plain "x") "x")))
-(check-true (pre-part? (list (paragraph plain (element plain "x")) (element plain "x") "x"
-                             (decode-part '("x") null #f 0)
-                             (part-start 0 #f null plain "start")
-                             (part-index-decl '("a" "b") '("a"))
-                             (part-collect-decl (element plain "x"))
-                             (part-tag-decl '(something "x"))
-                             (void)
-                             (title-decl #f null #f plain "title"))))
-(check-true (not (pre-part? 11)))
-(check-true (not (pre-part? '(11))))
-
-(check-true (part? (decode '("x"))))
-(check-true (part? (decode-part '("x") null #f 0)))
-(check-true (andmap block? (decode-flow '("x"))))
-(check-true (block? (decode-compound-paragraph '("x"))))
-(check-true (paragraph? (decode-paragraph '("x"))))
-(check-true (content? (decode-content '("x"))))
-(check-true (content? (decode-elements '("x"))))
-(check-true (content? (decode-string "x")))
-
-(check-true (whitespace? " \n\t\r"))
-(check-true (not (whitespace? " \n\t\rx ")))
-
-(check-equal? "a b c" (clean-up-index-string "  a  b   c   "))
-
-(check-true (contract? (spliceof integer?)))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs.rkt
deleted file mode 100644
index 9cd61641e9..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs.rkt
+++ /dev/null
@@ -1,81 +0,0 @@
-#lang racket/base
-
-;; Use text renderer to check some Scribble functionality
-
-(require scribble/base-render
-         (prefix-in text: scribble/text-render)
-         (prefix-in html: scribble/html-render)
-         (prefix-in latex: scribble/latex-render)
-         (prefix-in markdown: scribble/markdown-render)
-         racket/file 
-         racket/class
-         racket/runtime-path
-         tests/eli-tester)
-
-(define-runtime-path source-dir "docs")
-(define work-dir (build-path (find-system-path 'temp-dir)
-                             "scribble-docs-tests"))
-
-(define (build-doc render% src-file dest-file)
-  (let* ([renderer (new render% [dest-dir work-dir])]
-         [docs     (list (dynamic-require src-file 'doc))]
-         [fns      (list (build-path work-dir dest-file))]
-         [fp       (send renderer traverse docs fns)]
-         [info     (send renderer collect  docs fns fp)]
-         [r-info   (send renderer resolve  docs fns info)])
-    (send renderer render docs fns r-info)
-    (send renderer get-undefined r-info)))
-
-(define (build-text-doc src-file dest-file)
-  (build-doc (text:render-mixin render%) src-file dest-file))
-
-(define (build-html-doc src-file dest-file)
-  (build-doc (html:render-mixin render%) src-file dest-file))
-
-(define (build-htmls-doc src-file dest-file)
-  (build-doc (html:render-multi-mixin (html:render-mixin render%)) src-file dest-file))
-
-(define (build-latex-doc src-file dest-file)
-  (build-doc (latex:render-mixin render%) src-file dest-file))
-
-(define (build-markdown-doc src-file dest-file)
-  (build-doc (markdown:render-mixin render%) src-file dest-file))
-
-(provide docs-tests)
-(module+ main (docs-tests))
-(define (docs-tests)
-  (when (or (file-exists? work-dir) (directory-exists? work-dir))
-    (delete-directory/files work-dir))
-  (dynamic-wind
-    (λ() (make-directory work-dir))
-    (λ()
-      (define files (map path-element->string (directory-list source-dir)))
-      (test do
-        (for ([scrbl (in-list files)]
-              #:when (regexp-match? #rx"\\.scrbl$" scrbl)
-              [txt   (in-value (regexp-replace #rx"\\.scrbl$" scrbl ".txt"))]
-              #:when (member txt files))
-          ;; (printf "Testing ~s -> ~s\n" scrbl txt)
-          (define src-file (build-path source-dir scrbl))
-          (define expect-file (build-path source-dir txt))
-          (define generated-file (build-path work-dir "gen.txt"))
-          (define (contents file)
-            (regexp-replace #rx"\n+$" (file->string file) ""))
-          (define undefineds (build-text-doc src-file "gen.txt"))
-          (for ([u (in-list undefineds)])
-            (when (eq? 'tech (car u))
-              (test #:failure-message
-                    (format "undefined tech: ~e" u)
-                    #f)))
-          (test #:failure-message
-                (format
-                 "mismatch for: \"~a\", expected text in: \"~a\", got:\n~a"
-                 scrbl txt (contents generated-file))
-                (string=? (contents expect-file) (contents generated-file)))
-
-          ;; Make sure the document at least renders in other modes:
-          (void (build-html-doc src-file "gen.html"))
-          (void (build-htmls-doc src-file "gen"))
-          (void (build-latex-doc src-file "gen.tex"))
-          (void (build-markdown-doc src-file "gen.md")))))
-    (λ() (delete-directory/files work-dir))))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-broken.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-broken.scrbl
deleted file mode 100644
index d6c73646b8..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-broken.scrbl
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scribble/base
-@(require scriblib/autobib)
-
-@(define-cite cite citet gen)
-
-@(define redex
-  (make-bib
-    #:author (authors "Matthias Felleisen" "Robert Bruce Findler" "Matthew Flatt")
-    #:title "Semantics Engineering with PLT Redex"
-    #:location (book-location #:publisher "MIT Press")
-    #:is-book? #t
-    #:date "2010"))
-
-Since there's no bibliography, this link won't work:
-@cite[redex].
-
-
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-broken.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-broken.txt
deleted file mode 100644
index 6f97337c1c..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-broken.txt
+++ /dev/null
@@ -1 +0,0 @@
-Since there’s no bibliography, this link won’t work:  (??? ???).
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.scrbl
deleted file mode 100644
index 468bbbd7d6..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.scrbl
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scribble/base
-@(require scriblib/autobib)
-@(define-cite cite citet gen-bib)
-
-@(define a (make-bib #:title "Diss A"
-                     #:is-book? #t
-                     #:location (dissertation-location #:institution "NEU")
-                     #:author (authors "Little" "Bo" "Peep")
-                     #:date "2012"))
-@(define b (make-bib #:title "Diss B"
-                     #:is-book? #t
-                     #:location (dissertation-location #:institution "NEU")
-                     #:author (authors "Little" "Bo" "Peep")
-                     #:date "2012"))
-@;{Citing ambiguous entries without other single citations}
-@;{should not cause a warning}
-@cite[a b]
-
-@gen-bib[]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.txt
deleted file mode 100644
index c07dc3af86..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.txt
+++ /dev/null
@@ -1,6 +0,0 @@
- (Little et al. 2012a,b)
-
-Bibliography
-
-Little, Bo, and Peep. Diss A. PhD dissertation, NEU, 2012a.
-Little, Bo, and Peep. Diss B. PhD dissertation, NEU, 2012b.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-more.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-more.scrbl
deleted file mode 100644
index 6677262848..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-more.scrbl
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang scribble/manual
-@(require scriblib/autobib)
-
-@(define-cite ~cite citet generate-bibliography)
-
-@(define a1
-   (make-bib
-    #:title    "One"
-    #:author   "A"
-    #:date     "2012"
-    #:location "There"))
-
-@(define a2
-   (make-bib
-    #:title    "Two"
-    #:author   "A"
-    #:date     "2012"
-    #:location "Here"))
-
-@(define a2x
-   (make-bib
-    #:title    "Twoish"
-    #:author   "A"
-    #:date     "2012"
-    #:location "HereX"))
-
-@(define a3
-   (make-bib
-    #:title    "Three"
-    #:author   "A"
-    #:date     "2013"
-    #:location "Where?"))
-
-@(define b1
-   (make-bib
-    #:title    "Uno"
-    #:author   "B"
-    #:date     "2012"
-    #:location "Ici"))
-
-A1@~cite[a1 a2 b1].
-
-A1@~cite[a1 a2 a3].
-
-@citet[a1 a2 a3].
-
-In A2@~cite[(in-bib a2 " p. 17")]
-
-In A2 and A3@~cite[(in-bib a2 " p. 17") a3]
-
-In A1 and more@~cite[a1 (in-bib a2 " p. 17") a3]
-
-B&B@~cite[b1 a1].
-
-
-@generate-bibliography[]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-more.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-more.txt
deleted file mode 100644
index e4d867dfe6..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-more.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-A1 (A 2012a,b; B 2012).
-
-A1 (A 2012a,b, 2013).
-
-A (2012a,b; 2013).
-
-In A2 (A 2012b p. 17)
-
-In A2 and A3 (A 2012b p. 17, 2013)
-
-In A1 and more (A 2012a, 2012b p. 17, 2013)
-
-B&B (A 2012a; B 2012).
-
-Bibliography
-
-A. One. There, 2012a.  
-A. Two. Here, 2012b.   
-A. Three. Where?, 2013.
-B. Uno. Ici, 2012.     
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation.scrbl
deleted file mode 100644
index 7aea6a2182..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation.scrbl
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang scribble/base
-@(require scriblib/autobib)
-@(define-cite cite citet gen-bib)
-
-@(define a (make-bib #:title "Diss 1"
-                     #:is-book? #t
-                     #:location (dissertation-location #:institution "NEU")
-                     #:author (authors "Little" "Bo" "Peep")
-                     #:date "2012"))
-@(define b (make-bib #:title "Diss 2"
-                     #:is-book? #t
-                     #:location (dissertation-location #:institution "NEU")
-                     #:author (authors "Little" "Bo" "Peep")
-                     #:date "2012"))
-@(define c (make-bib #:title "Diss 3"
-                     #:is-book? #t
-                     #:location (dissertation-location #:institution "NEU")
-                     #:author (authors "Little" "Bo" "Peep" "Peep2")
-                     #:date "2012"))
-According to the following people,
-@cite[a]
-@cite[b]
-@cite[c]
-@citet[a]
-@citet[b]
-@citet[c]
-@cite[a b]
-@cite[b a]
-@citet[a b]
-@citet[b a]
-
-@gen-bib[]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation.txt
deleted file mode 100644
index 656e127ba4..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-According to the following people,  (Little et al. 2012a)  (Little et
-al. 2012b)  (Little et al. 2012c) Little et al. (2012a) Little et
-al. (2012b) Little et al. (2012c)  (Little et al. 2012a,b)  (Little et
-al. 2012b,a) Little et al. (2012a,b) Little et al. (2012b,a)
-
-Bibliography
-
-Little, Bo, and Peep. Diss 1. PhD dissertation, NEU, 2012a.       
-Little, Bo, and Peep. Diss 2. PhD dissertation, NEU, 2012b.       
-Little, Bo, Peep, and Peep2. Diss 3. PhD dissertation, NEU, 2012c.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-numbered.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-numbered.scrbl
deleted file mode 100644
index 455e68a72d..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-numbered.scrbl
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang scribble/manual
-@(require scriblib/autobib)
-
-@(define-cite ~cite citet generate-bibliography
-              #:style number-style)
-
-@(define a1
-   (make-bib
-    #:title    "One"
-    #:author   "A"
-    #:date     "2012"
-    #:location "There"))
-
-@(define a2
-   (make-bib
-    #:title    "Two"
-    #:author   "A"
-    #:date     "2012"
-    #:location "Here"))
-
-@(define a2x
-   (make-bib
-    #:title    "Twoish"
-    #:author   "A"
-    #:date     "2012"
-    #:location "HereX"))
-
-@(define a3
-   (make-bib
-    #:title    "Three"
-    #:author   "A"
-    #:date     "2013"
-    #:location "Where?"))
-
-@(define b1
-   (make-bib
-    #:title    "Uno"
-    #:author   "B"
-    #:date     "2012"
-    #:location "Ici"))
-
-A1@~cite[a1 a2 b1].
-
-A1@~cite[a1 a2 a3].
-
-@citet[a1 a2 a3].
-
-In A2@~cite[(in-bib a2 " p. 17")]
-
-In A2 and A3@~cite[(in-bib a2 " p. 17") a3]
-
-In A1 and more@~cite[a1 (in-bib a2 " p. 17") a3]
-
-B&B@~cite[b1 a1].
-
-
-@generate-bibliography[]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-numbered.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-numbered.txt
deleted file mode 100644
index 123f238437..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-numbered.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-A1 [1, 2, 4].
-
-A1 [1, 2, 3].
-
-A [1, 2, 3].
-
-In A2 [2 p. 17]
-
-In A2 and A3 [2 p. 17, 3]
-
-In A1 and more [1, 2 p. 17, 3]
-
-B&B [1, 4].
-
-Bibliography
-
-[1]A. One. There, 2012.   
-[2]A. Two. Here, 2012.    
-[3]A. Three. Where?, 2013.
-[4]B. Uno. Ici, 2012.     
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-order.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-order.scrbl
deleted file mode 100644
index 3d96a0e8a1..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-order.scrbl
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scribble/base
-@(require scriblib/autobib)
-@(define-cite cite citet gen)
-
-@(define a (make-bib #:title "Diss 1"
-                     #:is-book? #t
-                     #:location (dissertation-location #:institution "NEU")
-                     #:author (authors (author-name "Little Bo" "Peep") (author-name "Samwise" "Gamgee"))
-                     #:date "2012"))
-@(define b (make-bib #:title "Diss 2"
-                     #:is-book? #t
-                     #:location (dissertation-location #:institution "NEU")
-                     #:author (authors (author-name "Ayo" "Shucks"))
-                     #:date "2012"))
-Order matters. Must sort by last names.
-@cite[b]
-@cite[a]
-
-@(gen)
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-order.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-order.txt
deleted file mode 100644
index b2e6261a2e..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-order.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Order matters. Must sort by last names.  (Shucks 2012)  (Peep and Gamgee
-2012)
-
-Bibliography
-
-Little Bo Peep and Samwise Gamgee. Diss 1. PhD dissertation, NEU, 2012.
-Ayo Shucks. Diss 2. PhD dissertation, NEU, 2012.                       
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib.scrbl
deleted file mode 100644
index 2a4f173a06..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib.scrbl
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang scribble/base
-@(require scriblib/autobib)
-
-@(define-cite cite citet gen)
-
-@(define redex
-  (make-bib
-    #:author (authors "Matthias Felleisen" "Robert Bruce Findler" "Matthew Flatt")
-    #:title "Semantics Engineering with PLT Redex"
-    #:location (book-location #:publisher "MIT Press")
-    #:is-book? #t
-    #:date "2010"))
-
-@(define schelog ; tests that urls work
-  (make-bib #:title "Programming in Schelog"
-            #:author "Dorai Sitaram"
-            #:url "http://www.ccs.neu.edu/~dorai/schelog/schelog.html"
-            #:date "1993"))
-
-
-@cite[redex]
-@cite[(in-bib redex ", part I")]
-@cite[(in-bib redex ", part II")]
-@cite[redex]
-
-@cite[schelog]
-
-@cite[(make-bib #:title "Look ma, no authors")]
-
-@cite[(make-bib #:title "Look ma, no authors" #:author "And no date")]
-
-@(gen)
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib.txt
deleted file mode 100644
index 43f236c2cc..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib.txt
+++ /dev/null
@@ -1,17 +0,0 @@
- (Felleisen et al. 2010)  (Felleisen et al. 2010, part I)  (Felleisen et
-al. 2010, part II)  (Felleisen et al. 2010)
-
- (Sitaram 1993)
-
- (Look ma, no authors ???)
-
- (date ???)
-
-Bibliography
-
-And no date. Look ma, no authors.                                     
-Matthias Felleisen, Robert Bruce Findler, and Matthew Flatt. Semantics
-Engineering with PLT Redex. MIT Press, 2010.                          
-Look ma, no authors.                                                  
-Dorai Sitaram. Programming in Schelog. 1993.                          
-http://www.ccs.neu.edu/~dorai/schelog/schelog.html                    
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-quote.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-quote.scrbl
deleted file mode 100644
index 81a1826621..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-quote.scrbl
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scribble/manual
-@(require (for-label racket/base))
-
-@; Make sure this id's typesetting doesn't affect ' below:
-@racket[quote]
-
-@codeblock|{
-           @itemlist[#:style 'ordered
-                     @item{Eat cookie.}]
-         }|
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-quote.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-quote.txt
deleted file mode 100644
index b87b3a376f..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-quote.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-quote
-
-  @itemlist[#:style 'ordered   
-            @item{Eat cookie.}]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-utf8.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-utf8.scrbl
deleted file mode 100644
index 9fa8346598..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-utf8.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scribble/base
-@(require scribble/manual)
-
-@defmodulereader[scribble/manual]
-
-@codeblock|{
-#lang scribble/manual
-(λ x x)
-@interaction[1
-
-             42]
-}|
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-utf8.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-utf8.txt
deleted file mode 100644
index c5b01f4aeb..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-utf8.txt
+++ /dev/null
@@ -1,7 +0,0 @@
- #reader scribble/manual package: scribble-lib
-
-  #lang scribble/manual
-  (λ x x)              
-  @interaction[1       
-                       
-               42]     
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/cond.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/cond.scrbl
deleted file mode 100644
index 949b62b120..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/cond.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/base
-@(require scriblib/render-cond)
-
-@(cond-element
-  [text "Text!"]
-  [html "HTML!"]
-  [latex "Latex!"]
-  [markdown "Markdown!"])
-
-@(cond-element
-  [(or text html) "Text or HTML!"]
-  [else "Latex!"])
-
-@(cond-element
-  [(and text html) "Text and HTML?!"]
-  [else "Other!"])
-
-@(cond-element
-  [(not text) "Not Text!"]
-  [else "Text!"])
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/cond.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/cond.txt
deleted file mode 100644
index 6fc7dfaf73..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/cond.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Text!
-
-Text or HTML!
-
-Other!
-
-Text!
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/decode.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/decode.scrbl
deleted file mode 100644
index 271cc19628..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/decode.scrbl
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scribble/base
-
-``To make your so--so document look `pretty,' use fancy quotes,'' he
-said---with practically audible quotes.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/decode.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/decode.txt
deleted file mode 100644
index c666d56a25..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/decode.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-“To make your so–so document look ‘pretty,’ use fancy quotes,” he
-said—with practically audible quotes.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.rkt
deleted file mode 100644
index 28a203d078..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-(require (only-in scribble/reader make-at-readtable))
-
-(provide (rename-out [diamond-read read]
-                     [diamond-read-syntax read-syntax]))
-
-(define diamond-readtable (make-at-readtable #:command-char #\◇))
-
-(define (diamond-read p)
-  (parameterize ([current-readtable diamond-readtable])
-    (read p)))
-
-(define (diamond-read-syntax name p)
-  (parameterize ([current-readtable diamond-readtable])
-    (read-syntax name p)))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.scrbl
deleted file mode 100644
index f8a257b884..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.scrbl
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scribble/base
-@#reader "diamond.rkt"
-
-◇begin{
-  
- This example checks that @ is not an escape character
- if we make a reader that uses a different escape character.
-
- ◇(define ch "diamond")
-
- It also makes sure that a non-ASCII character like ◇ch
- is ok as an escape character.
-
- }
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.txt
deleted file mode 100644
index ef48f8a9b4..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This example checks that @ is not an escape character if we make a
-reader that uses a different escape character.
-
-It also makes sure that a non-ASCII character like diamond is ok as an
-escape character.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/empty-onthispage.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/empty-onthispage.scrbl
deleted file mode 100644
index b155cbf622..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/empty-onthispage.scrbl
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang scribble/manual
-
-@title[#:style '(unnumbered)]{Example}
-
-Content.
-
-@section[#:style '(toc unnumbered)]{X}
-
-@subsection[#:style '(toc-hidden unnumbered)]{A}
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/empty-onthispage.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/empty-onthispage.txt
deleted file mode 100644
index d3b85c98d9..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/empty-onthispage.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Example
-
-Content.
-
-X
-
-A
-
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-false.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-false.scrbl
deleted file mode 100644
index fb82995df3..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-false.scrbl
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval)
-
-@examples[#f]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-false.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-false.txt
deleted file mode 100644
index 68ee0ab27b..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-false.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Example:
-  > #f  
-  #f    
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-special.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-special.scrbl
deleted file mode 100644
index bcb12e5397..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-special.scrbl
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval)
-
-@interaction[
- (+ 1 2)
- (code:line (+ 1 2) (code:comment "three"))
- (eval:alts (+ 1 2) 5)
- (eval:result @bold{example})
- (eval:alts (+ 1 2) (eval:result @bold{same}))
- (eval:alts (+ 1 2) (eval:result @elem{really the same} "Again..."))
- (eval:alts (+ 1 2) (eval:result @bold{still the same} "!" "error: too many repeats"))
- (eval:alts (+ 1 2) (eval:results (list @racketresult[1] @elem{2} "3") "counting"))
-]
-
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-special.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-special.txt
deleted file mode 100644
index 3007283361..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-special.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-  > (+ 1 2)                       
-  3                               
-  > (+ 1 2) ; three               
-  3                               
-  > (+ 1 2)                       
-  5                               
-  > (eval:result (bold "example"))
-  example                         
-  > (+ 1 2)                       
-  same                            
-  > (+ 1 2)                       
-  Again...                        
-  really the same                 
-  > (+ 1 2)                       
-  !                               
-  error: too many repeats         
-  still the same                  
-  > (+ 1 2)                       
-  counting                        
-  1                               
-  2                               
-  3                               
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/figure.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/figure.scrbl
deleted file mode 100644
index ab443ad945..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/figure.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/base
-@(require scriblib/figure)
-
-@title{Waterfowl}
-
-@figure[
-"one"
-"The Figure"
-@para{Duck}]
-
-@figure[
-#:continue? #t
-"two"
-"More of The Figure"
-@para{Duck}]
-
-@figure[
-"three"
-"A Different Figure"
-@para{Goose!}]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/figure.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/figure.txt
deleted file mode 100644
index 85ccafe0ee..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/figure.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Waterfowl
-
-Duck
-Figure 1: The Figure
-
-Duck
-Figure 1 (continued): More of The Figure
-
-Goose!
-Figure 2: A Different Figure
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/filebox.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/filebox.scrbl
deleted file mode 100644
index 3ab95b5db1..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/filebox.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scribble/manual
-
-@; An empty filebox
-@filebox["zero.txt"]
-
-@filebox["one.txt"]{
-A file box with one thing in it.
-}
-
-@filebox["two.txt" 
-(tt "A filebox ")
-(tt "with multiple things in it.")]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/filebox.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/filebox.txt
deleted file mode 100644
index e50efdd5d8..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/filebox.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-"zero.txt"
-
-"one.txt"
-A file box with one thing in it.
-
-"two.txt"
-A filebox with multiple things in it.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/footnote.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/footnote.scrbl
deleted file mode 100644
index dfa908e3e1..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/footnote.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scribble/base
-@(require scriblib/footnote)
-
-@(define-footnote footnote generate-footnotes)
-
-@title{Document}
-
-Left.@footnote{A}
-
-Right.@footnote{A♯}
-
-@generate-footnotes[]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/footnote.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/footnote.txt
deleted file mode 100644
index 23f3b1da74..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/footnote.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Document
-
-Left.1A
-
-Right.2A♯
-
-1A
-
-2A♯
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper-sub.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper-sub.scrbl
deleted file mode 100644
index 28cf7a8508..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper-sub.scrbl
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang scribble/manual
-
-@title{Hello}
-
-@table-of-contents[]
-
-@section{One}
-
-@subsection{A Section}
-
-@subsubsection{A Subsection}
-
-This is some prose.
-
-@subsubsection{A Subsection, Revisited}
-
-This is also some prose.
-
-
-@section{Two}
-
-@subsection[#:style 'grouper]{Another Section}
-
-@subsubsection{Another Subsection}
-
-More prose.
-
-@subsubsection{Another Subsection, Revisited}
-
-More prose, also.
-
-@subsection[#:style 'grouper]{Third Section}
-
-@subsubsection{Yet Another Subsection}
-
-Yet more prose.
-
-@subsubsection{Yet Another Subsection, Revisited}
-
-Yet more prose, also.
-
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper-sub.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper-sub.txt
deleted file mode 100644
index dda44f58f1..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper-sub.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Hello
-
-    1 One                                    
-      1.1 A Section                          
-        1.1.1 A Subsection                   
-        1.1.2 A Subsection, Revisited        
-                                             
-    2 Two                                    
-      2.I Another Section                    
-        2.1 Another Subsection               
-        2.2 Another Subsection, Revisited    
-      2.II Third Section                     
-        2.3 Yet Another Subsection           
-        2.4 Yet Another Subsection, Revisited
-
-1. One
-
-1.1. A Section
-
-1.1.1. A Subsection
-
-This is some prose.
-
-1.1.2. A Subsection, Revisited
-
-This is also some prose.
-
-2. Two
-
-2.I. Another Section
-
-2.1. Another Subsection
-
-More prose.
-
-2.2. Another Subsection, Revisited
-
-More prose, also.
-
-2.II. Third Section
-
-2.3. Yet Another Subsection
-
-Yet more prose.
-
-2.4. Yet Another Subsection, Revisited
-
-Yet more prose, also.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper.scrbl
deleted file mode 100644
index f3b8054d8e..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper.scrbl
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang scribble/manual
-
-@title{Hello}
-
-@table-of-contents[]
-
-@section[#:style 'grouper]{One}
-
-@subsection{A Section}
-
-@subsubsection{A Subsection}
-
-This is some prose.
-
-@subsubsection{A Subsection, Revisited}
-
-This is also some prose.
-
-
-@section[#:style 'grouper]{Two}
-
-@subsection{Another Section}
-
-@subsubsection{Another Subsection}
-
-More prose.
-
-@subsubsection[#:style 'unnumbered]{>> Unnumbered Subsection}
-
-Nothing to see here.
-
-@subsubsection{Another Subsection, Revisited}
-
-More prose, also.
-
-@subsubsection[#:style 'hidden-number]{>> Hidden Number}
-
-Nothing to see here, either.
-
-@subsubsection{Last Subsection}
-
-The last subsection has some prose.
-
-@subsection[#:style '(hidden toc-hidden)]{}
-
-This is actually in a hidden section.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper.txt
deleted file mode 100644
index 7d7ee1b84e..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Hello
-
-    I One                                
-      1 A Section                        
-        1.1 A Subsection                 
-        1.2 A Subsection, Revisited      
-                                         
-    II Two                               
-      2 Another Section                  
-        2.1 Another Subsection           
-        >> Unnumbered Subsection         
-        2.2 Another Subsection, Revisited
-        >> Hidden Number                 
-        2.4 Last Subsection              
-
-I. One
-
-1. A Section
-
-1.1. A Subsection
-
-This is some prose.
-
-1.2. A Subsection, Revisited
-
-This is also some prose.
-
-II. Two
-
-2. Another Section
-
-2.1. Another Subsection
-
-More prose.
-
->> Unnumbered Subsection
-
-Nothing to see here.
-
-2.2. Another Subsection, Revisited
-
-More prose, also.
-
->> Hidden Number
-
-Nothing to see here, either.
-
-2.4. Last Subsection
-
-The last subsection has some prose.
-
-This is actually in a hidden section.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/include-section.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/include-section.scrbl
deleted file mode 100644
index b09b87a259..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/include-section.scrbl
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scribble/base
-
-@; Check that a macro-introduced `include-section' works:
-@(define-syntax-rule (inc) (include-section "diamond.scrbl"))
-
-@(inc)
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/include-section.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/include-section.txt
deleted file mode 100644
index 2da76d8689..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/include-section.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-1.
-
-This example checks that @ is not an escape character if we make a
-reader that uses a different escape character.
-
-It also makes sure that a non-ASCII character like diamond is ok as an
-escape character.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/itemlist.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/itemlist.scrbl
deleted file mode 100644
index 9a0b240846..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/itemlist.scrbl
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scribble/base
-@(require scribble/decode)
-
-@itemlist[
- (list @item{a}
-       (list @item{b}))
- @para{c}
- @item{d}
- (splice (list @item{e} (list @para{f})))
-]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/itemlist.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/itemlist.txt
deleted file mode 100644
index 29bac4c9e3..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/itemlist.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-* a
-
-* b
-
-* c
-
-* d
-
-* e
-
-* f
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/list-section.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/list-section.scrbl
deleted file mode 100644
index bbc8a90a1c..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/list-section.scrbl
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang scribble/base
-
-@title{A}
-
-@section{B}
-
-@(list @subsection{C})
-
-@(list @subsection{D})
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/list-section.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/list-section.txt
deleted file mode 100644
index ee3c33c078..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/list-section.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-A
-
-1. B
-
-1.1. C
-
-
-1.2. D
-
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual-ex.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual-ex.rkt
deleted file mode 100644
index 2f3a0b28ff..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual-ex.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-
-(provide (all-defined-out))
-
-(define (f) 10)
-(define (g x y) (void))
-(define (h x #:y y) (void))
-(define (i x #:y [y #f]) (void))
-(define (j) (void))
-
-(define-syntax-rule (m x) 'x)
-
-(define-syntax n (lambda (stx) #`(quote #,stx)))
-
-(define p (make-parameter 10))
-(define q (make-parameter #f))
-
-(define-struct pt (x y))
-(struct pn (x y))
-
-(define v 10)
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual.scrbl
deleted file mode 100644
index 564d74dba7..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual.scrbl
+++ /dev/null
@@ -1,135 +0,0 @@
-#lang scribble/manual
-@(require (for-label racket/base
-                     "manual-ex.rkt"))
-
-@defmodule["manual-ex.rkt" #:packages ("manual-test")]
-
-@defproc[(f) integer?]{A function.}
-
-@defproc[(g [x void?] [y void?]) integer?]{A function with two arguments.}
-
-@defproc[#:kind "function" (h [x void?] [#:y y void?]) integer?]{A ``function'' with a keyword argument.}
-
-@defproc[(i [x void?] [#:y y void? (void)]) integer?]{A function with an optional keyword argument.}
-
-@defproc[#:link-target? #f (f) integer?]{A function, again, not a link target.}
-
-@defproc[#:link-target? #f (f) integer? #:value 10]{A function, again, not a link target, documented to return @racket[10].}
-
-@defproc[#:link-target? #f (f) integer? #:value (let ()
-                                                  (define x 10)
-                                                  x)]{
-A function, again, not a link target, documented to return @racket[10] using a definition.
-}
-
-@defproc[#:kind "function" #:link-target? #f (g [x void?]) integer?]{A ``function,'' again, not a link target.}
-
-@defproc[#:id [i #'j] (i) void?]{Source is @racket[i], documents @racket[j].}
-
-@defproc*[#:link-target? #f ([(f) integer?] [(g [x void?] [y void?]) void?])]{Functions, yet again.}
-
-
-@defform[(m datum)]{A syntactic form.}
-
-@defform[#:link-target? #f (m datum)]{A syntactic form, again.}
-
-@defform[#:kind "macro" #:link-target? #f (m datum)]{A ``macro,'' again.}
-
-@defform*[#:kind "macro" #:link-target? #f [(m datum) (m same-datum)]]{A ``macro,'' yet again.}
-
-@defform/none[(m datum)]{Yet again.}
-
-@defidform[n]{An identifier form.}
-
-@defidform[#:link-target? #f n]{An identifier form, again.}
-
-@specform[(m datum)]{Specification of @racket[m].}
-
-
-@defparam[p k integer?]{A parameter}
-
-@defparam[#:link-target? #f p k integer?]{A parameter, again.}
-
-@defparam[#:link-target? #f p k integer? #:value 10]{A parameter, again, with a documented default value.}
-
-@defparam*[#:link-target? #f p k real? integer?]{A parameter, yet again.}
-
-@defparam*[#:link-target? #f p k real? integer? #:value 10]{A parameter, yet again, with a documented default value.}
-
-@defboolparam[q on?]{A boolean parameter.}
-
-@defboolparam[#:link-target? #f q still-on?]{A boolean parameter, again.}
-
-@defboolparam[#:link-target? #f q still-on? #:value #f]{A boolean parameter, again, with a documented default value.}
-
-
-@defthing[v integer?]{A thing.}
-
-@defthing[#:link-target? #f v integer?]{A thing, again.}
-
-@defthing[#:link-target? #f v integer? #:value 10]{A thing, again, with a documented value.}
-
-@defthing[#:link-target? #f v integer? #:value 12345678901234567890123456789012345678901234567890]{A thing, again, with a documented value that's too wide to fit on one line.}
-
-
-@defstruct[pt ([x real?] [y real?])]{A structure type with extra name.}
-
-@defstruct*[pn ([x real?] [y real?])]{A structure type.}
-
-@defstruct*[#:link-target? #f pn ([x real?] [y real?])]{A structure type, again.}
-
-@defstruct*[#:link-target? #f pn ([x real?] [y real?]) #:transparent]{A transparent structure type, again.}
-
-@defstruct*[#:link-target? #f pn ([x real?] [y real?]) #:inspector #f]{A transparent structure type, again.}
-
-@defstruct*[#:link-target? #f pn ([x real?] [y real?]) #:prefab]{A prefab structure type, again.}
-
-@defstruct*[#:link-target? #f pn ([x real?] [y real?]) #:constructor-name pt]{A structure type with name, again.}
-
-@defstruct*[#:link-target? #f pn ([x real?] [y real?]) #:extra-constructor-name pt]{A structure type with extra name, again.}
-
-@defstruct[#:link-target? #f pt ([x real?] [y real?]) #:mutable]{A mutable structure type with extra name, again.}
-
-
-@defmodule["manual-ex0.rkt" #:no-declare #:link-target? #f #:packages ()]
-@defmodule["manual-ex0.rkt" #:lang #:no-declare #:link-target? #f #:packages ()]
-@defmodule["manual-ex0.rkt" #:reader #:no-declare #:link-target? #f #:packages ()]
-
-@section{Sub2}
-@defmodule["manual-ex2.rkt" #:no-declare #:packages ()]
-
-@section{Sub2a}
-@defmodule*/no-declare[("manual-ex2a.rkt") #:packages ()]
-
-@section{Sub3}
-@defmodule["manual-ex3.rkt" #:lang #:no-declare #:packages ()]
-
-@section{Sub3a}
-@defmodulelang*/no-declare[("manual-ex3a.rkt") #:packages ()]
-
-@section{Sub4-5}
-@defmodule[#:multi ("manual-ex4.rkt" "manual-ex5.rkt") #:packages ()]
-
-@section{Sub4a-5a}
-@defmodule*[("manual-ex4a.rkt" "manual-ex5a.rkt") #:packages ()]
-
-@section{Sub6}
-@defmodule[#:require-form (racket load) "manual-ex6.rkt" #:packages ()]
-
-@section{Sub6a}
-@defmodule*[#:require-form (racket load) ("manual-ex6a.rkt") #:packages ()]
-
-@section{Sub7}
-@defmodule["manual-ex7.rkt" #:use-sources (racket/base) #:packages ()]
-
-@section{Sub7a}
-@defmodule*[("manual-ex7a.rkt") #:use-sources (racket/base) #:packages ()]
-
-@section{Sub8}
-@defmodule["manual-ex8.rkt" #:reader #:packages ()]
-
-@section{Sub8a}
-@defmodulereader["manual-ex8a.rkt" #:packages ()]
-
-@section{Sub8b}
-@defmodulereader*[("manual-ex8b.rkt") #:packages ()]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual.txt
deleted file mode 100644
index 5f2ed82ebe..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual.txt
+++ /dev/null
@@ -1,278 +0,0 @@
- (require "manual-ex.rkt") package: manual-test
-
-(f) -> integer?
-
-A function.
-
-(g x y) -> integer?
-  x : void?        
-  y : void?        
-
-A function with two arguments.
-
-(h x #:y y) -> integer?
-  x : void?            
-  y : void?            
-
-A “function” with a keyword argument.
-
-(i x [#:y y]) -> integer?
-  x : void?              
-  y : void? = (void)     
-
-A function with an optional keyword argument.
-
-(f) -> integer?
-
-A function, again, not a link target.
-
-(f) -> integer?
- = 10          
-
-A function, again, not a link target, documented to return 10.
-
-(f) -> integer? 
- = (define x 10)
-   x            
-
-A function, again, not a link target, documented to return 10 using a
-definition.
-
-(g x) -> integer?
-  x : void?      
-
-A “function,” again, not a link target.
-
-(j) -> void?
-
-Source is i, documents j.
-
-(f) -> integer? 
-(g x y) -> void?
-  x : void?     
-  y : void?     
-
-Functions, yet again.
-
-(m datum)
-
-A syntactic form.
-
-(m datum)
-
-A syntactic form, again.
-
-(m datum)
-
-A “macro,” again.
-
-(m datum)     
-(m same-datum)
-
-A “macro,” yet again.
-
-(m datum)
-
-Yet again.
-
-n
-
-An identifier form.
-
-n
-
-An identifier form, again.
-
-(m datum)
-Specification of m.
-
-(p) -> integer?
-(p k) -> void? 
-  k : integer? 
-
-A parameter
-
-(p) -> integer?
-(p k) -> void? 
-  k : integer? 
-
-A parameter, again.
-
-(p) -> integer?
-(p k) -> void? 
-  k : integer? 
- = 10          
-
-A parameter, again, with a documented default value.
-
-(p) -> integer?
-(p k) -> void? 
-  k : real?    
-
-A parameter, yet again.
-
-(p) -> integer?
-(p k) -> void? 
-  k : real?    
- = 10          
-
-A parameter, yet again, with a documented default value.
-
-(q) -> boolean? 
-(q on?) -> void?
-  on? : any/c   
-
-A boolean parameter.
-
-(q) -> boolean?       
-(q still-on?) -> void?
-  still-on? : any/c   
-
-A boolean parameter, again.
-
-(q) -> boolean?       
-(q still-on?) -> void?
-  still-on? : any/c   
- = #f                 
-
-A boolean parameter, again, with a documented default value.
-
-v : integer?
-
-A thing.
-
-v : integer?
-
-A thing, again.
-
-v : integer? = 10
-
-A thing, again, with a documented value.
-
-v : integer?                                         
- = 12345678901234567890123456789012345678901234567890
-
-A thing, again, with a documented value that’s too wide to fit on one
-line.
-
-(struct pt (x y)                     
-    #:extra-constructor-name make-pt)
-  x : real?                          
-  y : real?                          
-
-A structure type with extra name.
-
-(struct pn (x y))
-  x : real?      
-  y : real?      
-
-A structure type.
-
-(struct pn (x y))
-  x : real?      
-  y : real?      
-
-A structure type, again.
-
-(struct pn (x y)  
-    #:transparent)
-  x : real?       
-  y : real?       
-
-A transparent structure type, again.
-
-(struct pn (x y)  
-    #:transparent)
-  x : real?       
-  y : real?       
-
-A transparent structure type, again.
-
-(struct pn (x y)
-    #:prefab)   
-  x : real?     
-  y : real?     
-
-A prefab structure type, again.
-
-(struct pn (x y)          
-    #:constructor-name pt)
-  x : real?               
-  y : real?               
-
-A structure type with name, again.
-
-(struct pn (x y)                
-    #:extra-constructor-name pt)
-  x : real?                     
-  y : real?                     
-
-A structure type with extra name, again.
-
-(struct pt (x y)                    
-    #:extra-constructor-name make-pt
-    #:mutable)                      
-  x : real?                         
-  y : real?                         
-
-A mutable structure type with extra name, again.
-
- (require "manual-ex0.rkt")
-
- #lang "manual-ex0.rkt"
-
- #reader "manual-ex0.rkt"
-
-1. Sub2
-
- (require "manual-ex2.rkt")
-
-2. Sub2a
-
- (require "manual-ex2a.rkt")
-
-3. Sub3
-
- #lang "manual-ex3.rkt"
-
-4. Sub3a
-
- #lang "manual-ex3a.rkt"
-
-5. Sub4-5
-
- (require "manual-ex4.rkt")
- (require "manual-ex5.rkt")
-
-6. Sub4a-5a
-
- (require "manual-ex4a.rkt")
- (require "manual-ex5a.rkt")
-
-7. Sub6
-
- (load "manual-ex6.rkt")
-
-8. Sub6a
-
- (load "manual-ex6a.rkt")
-
-9. Sub7
-
- (require "manual-ex7.rkt")
-
-10. Sub7a
-
- (require "manual-ex7a.rkt")
-
-11. Sub8
-
- #reader "manual-ex8.rkt"
-
-12. Sub8a
-
- #reader "manual-ex8a.rkt"
-
-13. Sub8b
-
- #reader "manual-ex8b.rkt"
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/print-lines.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/print-lines.scrbl
deleted file mode 100644
index 20f4fc997d..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/print-lines.scrbl
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval)
-
-@title{Pretty-Print-Handler Bug Example}
-
-@(define the-eval (make-base-eval))
-@(interaction-eval
-  #:eval the-eval
-  (begin
-    (require racket/pretty)
-    (current-print pretty-print-handler)))
-
-@examples[#:eval the-eval
-'((x "positional 1") 
-    (rest ("positional 2" "positional 3"))
-    (a ())
-    (b ("b-arg"))
-    (c (("first c1" "second c1") ("first c2" "second c2")))
-    (d #f)
-    (e ()))]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/print-lines.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/print-lines.txt
deleted file mode 100644
index eeec2c61cd..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/print-lines.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Pretty-Print-Handler Bug Example
-
-Example:                                                       
-  > '((x "positional 1")                                       
-        (rest ("positional 2" "positional 3"))                 
-        (a ())                                                 
-        (b ("b-arg"))                                          
-        (c (("first c1" "second c1") ("first c2" "second c2")))
-        (d #f)                                                 
-        (e ()))                                                
-  '((x "positional 1")                                         
-    (rest ("positional 2" "positional 3"))                     
-    (a ())                                                     
-    (b ("b-arg"))                                              
-    (c (("first c1" "second c1") ("first c2" "second c2")))    
-    (d #f)                                                     
-    (e ()))                                                    
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/read-alts.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/read-alts.scrbl
deleted file mode 100644
index 42f941d8de..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/read-alts.scrbl
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scribble/manual
-@(require scribble/manual)
-@; test that various alternatives in reader syntax get
-@; turned into the right things when rendered
-@racketblock[#t
-             #true
-             #f
-             #false
-             (a . < . b)
-             (< a b)
-             "abcdef"
-             ([{}])]
-
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/read-alts.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/read-alts.txt
deleted file mode 100644
index 1bf94c16d8..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/read-alts.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-  #t         
-  #true      
-  #f         
-  #false     
-  (a . < . b)
-  (< a b)    
-  "abcdef"   
-  ([{}])     
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref.scrbl
deleted file mode 100644
index 384ac20249..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref.scrbl
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang scribble/base
-
-@title[#:tag "top"]{Title}
-
-@section[#:tag "1" #:style 'grouper]{Section One}
-
-This is @secref["1"] in @secref["top"].
-
-See @secref["2"] and @secref["2.1"].
-
-See @secref["3"], @secref["3.1"], @secref["3.2"], @secref["3.2.1"], and
-@secref["3.3"].
-
-
-@section[#:tag "2" #:style 'grouper]{Section Two}
-
-@subsection[#:tag "2.1"]{Section Two.One}
-
-[content a]
-
-
-@section[#:style '(grouper unnumbered) #:tag "3"]{Section Three}
-
-@subsection[#:tag "3.1"]{Section Three.One}
-
-[content b]
-
-@subsection[#:tag "3.2"]{Section Three.Two}
-
-@subsubsection[#:tag "3.2.1"]{Section Three.Two.One}
-
-[content c]
-
-@subsection[#:tag "3.3" #:style 'unnumbered]{Section Three.Three}
-
-[content d]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref.txt
deleted file mode 100644
index ab7b425656..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Title
-
-I. Section One
-
-This is Section One in Title.
-
-See Section Two and Section Two.One.
-
-See Section Three, Section Three.One, Section Three.Two, Section
-Three.Two.One, and Section Three.Three.
-
-II. Section Two
-
-1. Section Two.One
-
-[content a]
-
-Section Three
-
-2. Section Three.One
-
-[content b]
-
-3. Section Three.Two
-
-3.1. Section Three.Two.One
-
-[content c]
-
-Section Three.Three
-
-[content d]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref2.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref2.scrbl
deleted file mode 100644
index 3985fe71a2..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref2.scrbl
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang scribble/base
-
-@title[#:tag "top"]{Title}
-
-@table-of-contents[]
-
-@section[#:tag "1"]{Section One}
-
-This is @secref["1"] in @secref["top"].
-
-See @secref["2"] and @secref["2.1"].
-
-See @secref["3"], @secref["3.1"], @secref["3.1.1"], @secref["3.2"],
-@secref["3.2.1"], and @secref["3.3"].
-
-See @secref["4"].
-
-See @secref["5"] and @secref["5.1"].
-
-@section[#:tag "2"]{Section Two}
-
-@subsection[#:tag "2.1"]{Section Two.One}
-
-[content a]
-
-
-@section[#:style '(unnumbered) #:tag "3"]{Section Three}
-
-@subsection[#:tag "3.1" #:style 'grouper]{Section Three.One}
-
-@subsubsection[#:tag "3.1.1"]{Section Three.One.One}
-
-[content b]
-
-@subsection[#:tag "3.2" #:style 'grouper]{Section Three.Two}
-
-@subsubsection[#:tag "3.2.1"]{Section Three.Two.One}
-
-[content c]
-
-@subsection[#:tag "3.3" #:style '(unnumbered grouper)]{Section Three.Three}
-
-[content d]
-
-
-@section[#:style '(unnumbered) #:tag "4"]{Section Four}
-
-[content e]
-
-
-@section[#:tag "5"]{Section Five}
-
-@subsection[#:tag "5.1"]{Section Five.One}
-
-[content f]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref2.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref2.txt
deleted file mode 100644
index e44443ea93..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref2.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-Title
-
-    1 Section One              
-                               
-    2 Section Two              
-      2.1 Section Two.One      
-                               
-    Section Three              
-      I Section Three.One      
-        1 Section Three.One.One
-      II Section Three.Two     
-        2 Section Three.Two.One
-      Section Three.Three      
-                               
-    Section Four               
-                               
-    3 Section Five             
-      3.1 Section Five.One     
-
-1. Section One
-
-This is Section One in Title.
-
-See Section Two and Section Two.One.
-
-See Section Three, Section Three.One, Section Three.One.One, Section
-Three.Two, Section Three.Two.One, and Section Three.Three.
-
-See Section Four.
-
-See Section Five and Section Five.One.
-
-2. Section Two
-
-2.1. Section Two.One
-
-[content a]
-
-Section Three
-
-I. Section Three.One
-
-1. Section Three.One.One
-
-[content b]
-
-II. Section Three.Two
-
-2. Section Three.Two.One
-
-[content c]
-
-Section Three.Three
-
-[content d]
-
-Section Four
-
-[content e]
-
-3. Section Five
-
-3.1. Section Five.One
-
-[content f]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref3.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref3.scrbl
deleted file mode 100644
index a946dafcaf..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref3.scrbl
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang scribble/base
-
-@title[#:tag "top"]{Title}
-
-@table-of-contents[]
-
-@section[#:tag "1"]{Section One}
-
-This is @secref["1"] in @secref["top"].
-
-See @secref["2"] and @secref["2.1"].
-
-See @secref["3"], @secref["3.1"], @secref["3.1.1"], @secref["3.2"],
-@secref["3.2.1"], and @secref["3.3"].
-
-See @secref["4"].
-
-See @secref["5"] and @secref["5.1"].
-
-@section[#:tag "2"]{Section Two}
-
-@subsection[#:tag "2.1"]{Section Two.One}
-
-[content a]
-
-
-@section[#:tag "3"]{Section Three}
-
-@subsection[#:tag "3.1" #:style 'grouper]{Section Three.One}
-
-@subsubsection[#:tag "3.1.1"]{Section Three.One.One}
-
-[content b]
-
-@subsection[#:tag "3.2" #:style 'grouper]{Section Three.Two}
-
-@subsubsection[#:tag "3.2.1"]{Section Three.Two.One}
-
-[content c]
-
-@subsection[#:tag "3.3" #:style '(unnumbered grouper)]{Section Three.Three}
-
-[content d]
-
-
-@section[#:style '(unnumbered) #:tag "4"]{Section Four}
-
-[content e]
-
-
-@section[#:tag "5"]{Section Five}
-
-@subsection[#:tag "5.1"]{Section Five.One}
-
-[content f]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref3.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref3.txt
deleted file mode 100644
index 6860e29242..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref3.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-Title
-
-    1 Section One                
-                                 
-    2 Section Two                
-      2.1 Section Two.One        
-                                 
-    3 Section Three              
-      3.I Section Three.One      
-        3.1 Section Three.One.One
-      3.II Section Three.Two     
-        3.2 Section Three.Two.One
-      Section Three.Three        
-                                 
-    Section Four                 
-                                 
-    4 Section Five               
-      4.1 Section Five.One       
-
-1. Section One
-
-This is Section One in Title.
-
-See Section Two and Section Two.One.
-
-See Section Three, Section Three.One, Section Three.One.One, Section
-Three.Two, Section Three.Two.One, and Section Three.Three.
-
-See Section Four.
-
-See Section Five and Section Five.One.
-
-2. Section Two
-
-2.1. Section Two.One
-
-[content a]
-
-3. Section Three
-
-3.I. Section Three.One
-
-3.1. Section Three.One.One
-
-[content b]
-
-3.II. Section Three.Two
-
-3.2. Section Three.Two.One
-
-[content c]
-
-Section Three.Three
-
-[content d]
-
-Section Four
-
-[content e]
-
-4. Section Five
-
-4.1. Section Five.One
-
-[content f]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.rkt
deleted file mode 100644
index d271d6750e..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket
-(require scribble/srcdoc
-         (for-doc racket/base
-                  scribble/manual))
-
-(provide
- (proc-doc f (-> integer?) ["Stuff"])
- (form-doc #:id a #:literals (foo) (expr foo a) ["Returns " (racket expr) "."]))
-
-(define (f) 5)
-
-(define-syntax-rule (a x) x)
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.scrbl
deleted file mode 100644
index 132dc2cf11..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.scrbl
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scribble/manual
-@(require scribble/extract)
-
-@defmodule["srcdoc.rkt" #:packages ("manual-test")]
-
-@(include-extracted "srcdoc.rkt")
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.txt
deleted file mode 100644
index 7d1e664979..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.txt
+++ /dev/null
@@ -1,9 +0,0 @@
- (require "srcdoc.rkt") package: manual-test
-
-(f) -> integer?
-
-Stuff
-
-(expr foo a)
-
-Returns expr.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/stxobj.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/stxobj.scrbl
deleted file mode 100644
index 330cdfb3b5..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/stxobj.scrbl
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval)
-
-@interaction[
-(syntax-e #'(+ 1 2))
-]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/stxobj.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/stxobj.txt
deleted file mode 100644
index bab5ef768a..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/stxobj.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  > (syntax-e #'(+ 1 2))                            
-  '(#<syntax:1:0 +> #<syntax:1:0 1> #<syntax:1:0 2>)
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table-border.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table-border.scrbl
deleted file mode 100644
index cab4b72c08..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table-border.scrbl
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang scribble/base
-@(require scribble/decode)
-
-@(define sub-table (tabular #:row-properties (list null '(border))
-                            '(("B" "B2") ("T" cont))))
-
-@tabular[#:column-properties (list null '(border) '(bottom-border right-border))
-  (list (list "Apple" sub-table "Cat") (list "C" "D" "Elephant"))
-]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table-border.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table-border.txt
deleted file mode 100644
index 1341cabcae..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table-border.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-     --------         
-Apple| B B2 |Cat     |
-     |------|        |
-     ||T   ||        |
-     |------|        |
-     -----------------
-C    |D     |Elephant|
-     -----------------
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table.scrbl
deleted file mode 100644
index 392c97bbd2..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/manual
-
-@(tabular #:column-properties (list 'left 'center 'right)
-          #:sep "-"
-          (list (list "A" "B" "C" "D")
-                (list "apple" "banana" "coconut" "donut")))
-
-
-@(tabular #:cell-properties (list (list 'right 'center 'left)
-                                  (list))
-          #:sep "-"
-          (list (list "A" "B" "C" "D")
-                (list "apple" "banana" "coconut" "donut")
-                (list "a" "b" "c" "d")))
-
-@(tabular #:column-properties (list '() '() 'left)
-          #:cell-properties (list (list 'right 'center '()))
-          #:sep "-"
-          (list (list "A" "B" "C" "D")
-                (list "apple" "banana" "coconut" "donut")))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table.txt
deleted file mode 100644
index c907d34e10..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-A    -  B   -      C-    D
-apple-banana-coconut-donut
-
-    A-  B   -C      -D    
-apple-banana-coconut-donut
-a    -b     -c      -d    
-
-    A-  B   -C      -D    
-apple-banana-coconut-donut
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/tech.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/tech.scrbl
deleted file mode 100644
index 1d78262e66..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/tech.scrbl
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang scribble/manual
-
-Check case and ``s'' normalization:
-Here is @deftech{apple}.
-@tech{Apples} are great!
-We all like the
-@techlink[#:key "APPLE"]{fruit of an apple tree}.
-
-Check case and ``ies'' normalization:
-Here is @deftech{cherry}.
-@tech{CHERRIES} are great!
-
-Check non-normalization:
-Here is @deftech[#:normalize? #f]{egGPlant}.
-No one likes @tech[#:normalize? #f]{egGPlant}.
-It's the @techlink[#:key "egGPlant" #:normalize? #f]{fruit of an egGPlant plant}.
-Here is @deftech[#:normalize? #f]{EGgpLANT},
-which is completely different.
-
-Check space and hyphen normalization:
-Here is @deftech{granola bar}.
-A @tech{granola-bar} breakfast is good enough.
-A @tech{granola--bar} combination is close enough.
-You can eat a spacey @tech{granola  bar}, too.
-
-
-
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/tech.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/tech.txt
deleted file mode 100644
index eb99d00018..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/tech.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Check case and “s” normalization: Here is apple. Apples are great! We
-all like the fruit of an apple tree.
-
-Check case and “ies” normalization: Here is cherry. CHERRIES are great!
-
-Check non-normalization: Here is egGPlant. No one likes egGPlant. It’s
-the fruit of an egGPlant plant. Here is EGgpLANT, which is completely
-different.
-
-Check space and hyphen normalization: Here is granola bar. A granola-bar
-breakfast is good enough. A granola–bar combination is close enough. You
-can eat a spacey granola  bar, too.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/text.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/text.scrbl
deleted file mode 100644
index 051cfbbf07..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/text.scrbl
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang scribble/manual
-@(require (for-label racket/base))
-
-@title{Document}
-
-This document exercises various constructs to check text output.
-
-@section{Part A}
-
-Scribble is a collection of tools for creating prose documents---papers, books, library documentation, etc.---in HTML or PDF (via Latex)
-form. More generally, Scribble helps you 
-write programs that are rich
-in textual content, whether the content is prose to be typeset or any
-other form of text to be generated 
-programmatically.
-
-@subsection{A Subsection}
-
-Here's some Racket code:
-
-@racketblock[
- (define half (lambda (x) 
-                (x x)))
- (x x)
-]
-
-@subsection{Another Subsection}
-
-@defmodule[racket/base]
-
-@defproc[(cons [car (or/c #f 
-                          other?)]
-               [cdr any?])
-         stuff?]{
-
-Ok?}
-
-@section{B}
-
-       @itemlist[
-
-         @item{Run
-                @commandline{scribble --pdf mouse.scrbl}
-               to generate PDF as @filepath{mouse.pdf}. This will
-               work only if you have @exec{pdflatex} installed.
-               If you'd like to see the intermediate Latex, try
-                @commandline{scribble --latex mouse.scrbl}
-               to generate @filepath{mouse.tex}.}
-
-         @item{Run
-               @commandline{scribble --html mouse.scrbl}
-              to generate HTML as @filepath{mouse.html}.  You may
-              notice that the apostrophe in ``he's'' turned into a
-              curly apostrophe.}
-
-         @item{Run
-               @commandline{scribble --htmls mouse.scrbl}
-              to generate HTML as @filepath{mouse/index.html}.
-              Sub-sections (which we add next) will appear as separate
-              HTML files in the @filepath{mouse} directory.}
-
-          ]
-
-Run the @exec{scribble} command(s) from the old section
-again. You may notice the curly double-quotes in the output, and
-the @litchar{---} turned into an em dash.
-
-@section{C}
-
-@subsection{Inside C}
-
-Section C had no text before its subsections.
-
-@subsection{Inside C, Again}
-
-But the subsections have text.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/text.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/text.txt
deleted file mode 100644
index 5d481d97ac..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/text.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Document
-
-This document exercises various constructs to check text output.
-
-1. Part A
-
-Scribble is a collection of tools for creating prose documents—papers,
-books, library documentation, etc.—in HTML or PDF (via Latex) form. More
-generally, Scribble helps you write programs that are rich in textual
-content, whether the content is prose to be typeset or any other form of
-text to be generated programmatically.
-
-1.1. A Subsection
-
-Here’s some Racket code:
-
-  (define half (lambda (x)
-                 (x x)))  
-  (x x)                   
-
-1.2. Another Subsection
-
- (require racket/base) package: base
-
-(cons car cdr) -> stuff?
-  car : (or/c #f        
-              other?)   
-  cdr : any?            
-
-Ok?
-
-2. B
-
-* Run
-
-    scribble --pdf mouse.scrbl
-
-  to generate PDF as "mouse.pdf". This will work only if you have
-  pdflatex installed. If you’d like to see the intermediate Latex, try
-
-    scribble --latex mouse.scrbl
-
-  to generate "mouse.tex".
-
-* Run
-
-    scribble --html mouse.scrbl
-
-  to generate HTML as "mouse.html".  You may notice that the apostrophe
-  in “he’s” turned into a curly apostrophe.
-
-* Run
-
-    scribble --htmls mouse.scrbl
-
-  to generate HTML as "mouse/index.html". Sub-sections (which we add
-  next) will appear as separate HTML files in the "mouse" directory.
-
-Run the scribble command(s) from the old section again. You may notice
-the curly double-quotes in the output, and the --- turned into an em
-dash.
-
-3. C
-
-3.1. Inside C
-
-Section C had no text before its subsections.
-
-3.2. Inside C, Again
-
-But the subsections have text.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/traverse.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/traverse.scrbl
deleted file mode 100644
index f5e8bf48c7..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/traverse.scrbl
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang scribble/base
-@(require scribble/core)
-
-@(traverse-element
-  (lambda (get set)
-   ;; Not delayed, and so result is "not ready, yet"
-   (get 'glossary "not ready, yet")))
-
-@(traverse-element
-  (lambda (get set)
-   ;; Delayed until second traversal:
-   (lambda (get set)
-    (get 'glossary "BROKEN"))))
-
-@; Same thing, but with blocks:
-
-@(traverse-block
-  (lambda (get set)
-    ;; Not delayed:
-    (para "The glossary is " 
-          (get 'glossary "not ready, yet"))))
-
-@(traverse-block
-  (lambda (get set)
-    ;; Delayed:
-    (lambda (get set)
-      (para "The glossary is " 
-            (get 'glossary "BROKEN")))))
-
-@(traverse-block
-  (lambda (get set)
-    ;; Adding a `delayed-block' doesn't delay:
-    (traverse-block
-      (lambda (get set)
-        (para "The glossary is "
-              (get 'glossary "not ready, yet"))))))
-
-@(traverse-block
-  (lambda (get set)
-    (set 'glossary "ready")
-    (para "Here is the glossary.")))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/traverse.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/traverse.txt
deleted file mode 100644
index 06ca4e034d..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/traverse.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-not ready, yet
-
-ready
-
-The glossary is not ready, yet
-
-The glossary is ready
-
-The glossary is not ready, yet
-
-Here is the glossary.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/verbatim.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/verbatim.scrbl
deleted file mode 100644
index 443782e736..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/verbatim.scrbl
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang scribble/base
-
-@verbatim{One fish.}
-
-@verbatim{
-  One fish.
-  Two fish.
-}
-
-@verbatim[#:indent 3]{
-  One fish.
-  Two fish.
-}
-
-@verbatim[#:indent 3]{
-  One fish.
-  Two fish.
-  @bold{Red} fish.
-}
-
-@verbatim[#:indent 3]|{
-  One fish.
-  Two fish.
-  @bold{Red} fish.
-}|
-
-@verbatim[#:indent 3]|{
-  One fish.
-  Two fish.
-  |@bold{Red} fish.
-}|
-
-@verbatim[@bold{One fish.} "\nTwo fish."]
-
-@verbatim["One fish\n" @bold{Two fish.}]
-
-@verbatim[@bold{One fish.}]
-
-@verbatim["One fish\n" @bold{Two fish.} "\nRed fish."]
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/verbatim.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/verbatim.txt
deleted file mode 100644
index c288791208..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/verbatim.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-One fish.
-
-One fish.
-Two fish.
-
-   One fish.
-   Two fish.
-
-   One fish.
-   Two fish.
-   Red fish.
-
-   One fish.       
-   Two fish.       
-   @bold{Red} fish.
-
-   One fish.
-   Two fish.
-   Red fish.
-
-One fish.
-Two fish.
-
-One fish 
-Two fish.
-
-One fish.
-
-One fish 
-Two fish.
-Red fish.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/wrap.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/wrap.scrbl
deleted file mode 100644
index 4df4cbacbb..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/wrap.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/manual
-@(require (for-label racket/base))
-
-@title{Document}
-
-@itemlist[
-  @item{WHEN Zarathustra was thirty years old, he left his home and the
-    lake of his home, and went into the mountains.  There he enjoyed his
-    xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-    spirit and his solitude, and for ten years did not weary of it.  But
-    at last his heart changed, - and rising one morning with the rosy
-    dawn, he went before the sun, and spake thus unto it: Thou great
-    star!  What would be thy happiness if thou hadst not those for whom
-    thou shinest!}]
-
-Some text xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx@;
-xxxxxxxxxxxxxxx some more text
-
-   x xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx@;
-xxxxxxxxxxxxxxx blah blah
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/wrap.txt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/wrap.txt
deleted file mode 100644
index 9686a5683c..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/wrap.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Document
-
-* WHEN Zarathustra was thirty years old, he left his home and the lake
-  of his home, and went into the mountains.  There he enjoyed his
-  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-  spirit and his solitude, and for ten years did not weary of it.  But
-  at last his heart changed, - and rising one morning with the rosy
-  dawn, he went before the sun, and spake thus unto it: Thou great star!
-  What would be thy happiness if thou hadst not those for whom thou
-  shinest!
-
-Some text
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-some more text
-
-x
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-blah blah
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/eval.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/eval.rkt
deleted file mode 100644
index e303ad9e1a..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/eval.rkt
+++ /dev/null
@@ -1,71 +0,0 @@
-#lang racket/base
-(require scribble/eval scribble/core rackunit racket/match)
-
-(check-not-exn (λ () (make-base-eval)))
-(check-not-exn (λ () (make-base-eval #:pretty-print? #t #:lang 'racket/base)))
-(check-not-exn (λ () (make-base-eval #:pretty-print? #t #:lang 'racket)))
-(check-not-exn (λ () (make-base-eval #:pretty-print? #t #:lang 'typed/racket)))
-(check-not-exn (λ () (make-base-eval #:pretty-print? #t #:lang 'lazy)))
-(check-not-exn (λ () (make-base-eval #:pretty-print? #f #:lang 'racket/base)))
-(check-not-exn (λ () (make-base-eval #:pretty-print? #f #:lang 'racket)))
-(check-not-exn (λ () (make-base-eval #:pretty-print? #f #:lang 'typed/racket)))
-(check-not-exn (λ () (make-base-eval #:pretty-print? #f #:lang 'lazy)))
-
-(check-not-exn (λ () ((make-base-eval-factory '() #:pretty-print? #t))))
-(check-not-exn (λ () ((make-base-eval-factory '() #:pretty-print? #t #:lang 'racket/base))))
-(check-not-exn (λ () ((make-base-eval-factory '() #:pretty-print? #t #:lang 'racket))))
-(check-not-exn (λ () ((make-base-eval-factory '() #:pretty-print? #t #:lang 'typed/racket))))
-(check-not-exn (λ () ((make-base-eval-factory '() #:pretty-print? #t #:lang 'lazy))))
-
-(check-not-exn (λ () ((make-eval-factory '() #:pretty-print? #t))))
-(check-not-exn (λ () ((make-eval-factory '() #:pretty-print? #t #:lang 'racket/base))))
-(check-not-exn (λ () ((make-eval-factory '() #:pretty-print? #t #:lang 'racket))))
-(check-not-exn (λ () ((make-eval-factory '() #:pretty-print? #t #:lang 'typed/racket))))
-(check-not-exn (λ () ((make-eval-factory '() #:pretty-print? #t #:lang 'lazy))))
-
-(define (get-result-blocks nf)
-  (match (nested-flow-blocks nf) [(list (table _ (list _ res))) res]))
-
-(define filter-datum '(define (filter p? lst) 
-                        (if (null? lst) 
-                            null 
-                            (let ([x (car lst)]) 
-                              (if (p? x)
-                                  (cons x (filter p? (cdr lst)))
-                                  (filte p? (cdr lst)))))))
-;; check that pretty printing is working
-(define pp-blocks
-  (car
-   (get-result-blocks
-    (interaction #:eval (make-base-eval #:pretty-print? #t #:lang 'racket)
-                 '(define (filter p? lst) 
-                    (if (null? lst) 
-                        null 
-                        (let ([x (car lst)])
-                          (if (p? x) 
-                              (cons x (filter p? (cdr lst)))
-                              (filter p? (cdr lst))))))))))
-(check-true (table? pp-blocks)) ; multiple line result gets put in a table of paragraphs
-(check-equal? (length (table-blockss pp-blocks)) 5) ;; pretty printed into 5 lines
-
-(define non-pp-blocks
-  (car
-   (get-result-blocks
-    (interaction #:eval (make-base-eval #:pretty-print? #f #:lang 'racket) 
-                 '(define (filter p? lst)
-                    (if (null? lst) 
-                        null 
-                        (let ([x (car lst)]) 
-                          (if (p? x) 
-                              (cons x (filter p? (cdr lst)))
-                              (filter p? (cdr lst))))))))))
-(check-true (paragraph? non-pp-blocks)) ;; single line result is just 1 paragraph
-
-;; check that different evaluators do not share a single namespace
-(define e1 (make-base-eval))
-(define e2 (make-base-eval))
-(check-exn exn:fail:contract:variable? (λ () (e1 '(current-date))))
-(check-exn exn:fail:contract:variable? (λ () (e2 '(current-date))))
-(e1 '(require racket/date))
-(check-not-exn (λ () (e1 '(current-date))))
-(check-exn exn:fail:contract:variable? (λ () (e2 '(current-date))))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/exe.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/exe.rkt
deleted file mode 100644
index a36018e12f..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/exe.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require racket/file
-         compiler/embed
-         racket/system)
-
-;; Check that `scribble/manual` can be embedded in an executable
-
-(define src (make-temporary-file))
-(define exe (make-temporary-file))
-
-(call-with-output-file src
-  #:exists 'truncate
-  (lambda (o)
-    (write '(module m racket/base
-              (require scribble/manual))
-           o)))
-
-(define mod-sym (string->symbol
-                 (format "~a"
-                         (let-values ([(base name dir?)
-                                       (split-path src)])
-                           (path->bytes (path-replace-suffix name #""))))))
-
-(create-embedding-executable exe
-                             #:cmdline '("-U")
-                             #:collects-path null
-                             #:modules `((#f ,src))
-                             #:configure-via-first-module? #t
-                             #:literal-expression
-                             (parameterize ([current-namespace (make-base-namespace)])
-                               (compile `(namespace-require '',mod-sym))))
-
-(system* exe)
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/main.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/main.rkt
deleted file mode 100644
index cb542ae1ee..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/main.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester
-         "reader.rkt" "text-collect.rkt" "text-lang.rkt" "text-wrap.rkt"
-         "docs.rkt" "render.rkt" "xref.rkt" "markdown.rkt")
-
-(test do (reader-tests)
-      do (begin/collect-tests)
-      do (text-lang-tests)
-      do (wrap-tests)
-      do (docs-tests)
-      do (render-tests)
-      do (xref-tests)
-      do (markdown-tests))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown-docs/example.md b/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown-docs/example.md
deleted file mode 100644
index 4bd5488681..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown-docs/example.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Title
-
-## 1. Section
-
-This is a top-level section.
-
-### 1.1. Subsection
-
-This is a subsection.
-
-#### 1.1.1. Subsubsection
-
-This is a subsubsection.
-
-Here is an itemize:
-
-* Item 1.
-
-* Item 2.
-
-Here is a hyperlink:
-
-[I am a hyperlink to Racket.](http://racket-lang.org/)
-
-_Italic_. \_Just underlines\_.
-
-**Bold**. \*Just asterisks.\*
-
-“Dobule quoted”. ‘Single quoted’.
-
-This should NOT be ‘code‘ in Markdown.
-
-Example of vebatim:
-
-`Hi, world.`  
-`A “quote”.`  
-`Second line.`
-`Last line.`  
-
-Another example of verbatim, with ticks/quotes:
-
-`THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS`   
-`“AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT`     
-`LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR` 
-`A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT`  
-`HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,`
-`SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT`      
-`LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,` 
-`DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY` 
-`THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT`   
-`(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE` 
-`OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.`  
-
-Example of a defmodule:
-
-```racket
- (require racket/string)
-```
-
-Example of a defproc:
-
-```racket
-(make-string k [char]) -> string?
-  k : exact-nonnegative-integer? 
-  char : char? = #\nul           
-```
-
-Returns a new mutable string of length `k` where each position in the
-string is initialized with the character `char`
-
-Blah blah `(or/c string? bytes?)`.
-
-Example of Scribble `examples`:
-
-```racket
-Examples:      
-> (define x 0) 
-               
-> (displayln x)
-0              
-               
-```
-
-Example of Scribble `interaction`:
-
-```racket
-> (define x 0)
-              
-> x           
-0             
-```
-
-> Note: This is a note. Let’s make it long enough that the markdown output
-> will have to line-wrap, to make sure the > mark starts each line
-> properly.
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown-docs/example.scrbl b/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown-docs/example.scrbl
deleted file mode 100644
index 493ad6a98c..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown-docs/example.scrbl
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          (for-label racket/base racket/contract racket/string))
-@(define my-eval (make-base-eval))
-@(my-eval '(require racket/base))
-
-@title{Title}
-
-@section{Section}
-
-This is a top-level section.
-
-@subsection{Subsection}
-
-This is a subsection.
-
-@subsubsection{Subsubsection}
-
-This is a subsubsection.
-
-Here is an itemize:
-
-@itemize[
-@item{Item 1.}
-@item{Item 2.}
-]
-
-Here is a hyperlink:
-
-@hyperlink["http://racket-lang.org/" "I am a hyperlink to Racket."]
-
-@italic{Italic}.
-_Just underlines_.
-
-@bold{Bold}.
-*Just asterisks.*
-
-``Dobule quoted''.
-`Single quoted'.
-
-This should NOT be `code` in Markdown.
-
-Example of vebatim:
-
-@verbatim{
-Hi, world.
-A ``quote''.
-Second line.
-Last line.
-}
-
-Another example of verbatim, with ticks/quotes:
-
-@verbatim{
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-}
-
-Example of a defmodule:
-
-@defmodule[racket/string #:packages ()]
-
-Example of a defproc:
-
-@defproc[(make-string [k exact-nonnegative-integer?][char char? #\nul]) string?]{
-
-Returns a new mutable string of length @racket[k] where each position in the
-string is initialized with the character @racket[char]
-
-Blah blah @racket[(or/c string? bytes?)].
-
-}
-
-Example of Scribble @racket[examples]:
-
-@examples[#:eval my-eval
-(define x 0)
-(displayln x)
-]
-
-Example of Scribble @racket[interaction]:
-
-@interaction[#:eval my-eval
-(define x 0)
-x
-]
-
-@margin-note{Note: This is a note. Let's make it long enough that the
-markdown output will have to line-wrap, to make sure the > mark starts
-each line properly.}
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown.rkt
deleted file mode 100644
index 8cc7dd7033..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-
-;; Use text renderer to check some Scribble functionality
-
-(require scribble/base-render (prefix-in markdown: scribble/markdown-render)
-         racket/file racket/class racket/runtime-path tests/eli-tester)
-
-(define-runtime-path source-dir "markdown-docs")
-(define work-dir (build-path (find-system-path 'temp-dir)
-                             "scribble-docs-tests"))
-
-(define (build-markdown-doc src-file dest-file)
-  (let* ([renderer (new (markdown:render-mixin render%) [dest-dir work-dir])]
-         [docs     (list (dynamic-require src-file 'doc))]
-         [fns      (list (build-path work-dir dest-file))]
-         [fp       (send renderer traverse docs fns)]
-         [info     (send renderer collect  docs fns fp)]
-         [r-info   (send renderer resolve  docs fns info)])
-    (send renderer render docs fns r-info)
-    (send renderer get-undefined r-info)))
-
-(provide markdown-tests)
-(module+ main (markdown-tests))
-(define (markdown-tests)
-  (when (or (file-exists? work-dir) (directory-exists? work-dir))
-    (delete-directory/files work-dir))
-  (dynamic-wind
-    (λ() (make-directory work-dir))
-    (λ()
-      (define files (map path-element->string (directory-list source-dir)))
-      (test do
-        (for ([scrbl (in-list files)]
-              #:when (regexp-match? #rx"\\.scrbl$" scrbl)
-              [md    (in-value (regexp-replace #rx"\\.scrbl$" scrbl ".md"))]
-              #:when (member md files))
-          ;; (printf "Testing ~s -> ~s\n" scrbl md)
-          (define src-file (build-path source-dir scrbl))
-          (define expect-file (build-path source-dir md))
-          (define generated-file (build-path work-dir "gen.md"))
-          (define (contents file)
-            (regexp-replace #rx"\n+$" (file->string file) ""))
-          (define undefineds (build-markdown-doc src-file "gen.md"))
-          (for ([u (in-list undefineds)])
-            (when (eq? 'tech (car u))
-              (test #:failure-message
-                    (format "undefined tech: ~e" u)
-                    #f)))
-          (test #:failure-message
-                (format
-                 "mismatch for: \"~a\", expected text in: \"~a\", got:\n~a"
-                 scrbl md (contents generated-file))
-                (string=? (contents expect-file) (contents generated-file))))))
-    (λ() (delete-directory/files work-dir))))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/reader.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/reader.rkt
deleted file mode 100644
index 5b225963d0..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/reader.rkt
+++ /dev/null
@@ -1,966 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester (prefix-in scr: scribble/reader) racket/list)
-
-(define the-tests #<<END-OF-TESTS
-
-;; format:
-;; * a line with only `-'s marks the boundary between tests
-;; * -<token>-> marks a <token> kind of reader test
-;;   (put on a new line if whitespace matters)
-;; * lines with semicolon comments flushed at the left column ignored,
-
----
-;; -------------------- simple uses, test identifiers
----
-@foo  -@->  foo
----
-@foo{}  -@->  (foo)
----
-@foo[]  -@->  (foo)
----
-@foo[]{}  -@->  (foo)
----
-foo@  -@->  foo@
----
-fo@o  -@->  fo@o
----
-\@foo  -@->  @foo
----
-|@foo|  -@->  @foo
----
-@foo@bar  -@-> foo@bar
----
-@foo@bar.  -@-> foo@bar.
----
-@foo@bar:  -@-> foo@bar:
----
-@foo@bar;  -@-> foo@bar
----
-@foo[]@bar{}  -@-> (foo) (bar)
----
-@foo{foo@|bar|.}
--@->
-(foo "foo" bar ".")
----
-@foo{foo@bar;}
--@->
-(foo "foo" bar ";")
----
-(define |@foo| '\@bar@baz)  -@-> (define @foo '@bar@baz)
----
-@foo{foo@2.}
--@->
-(foo "foo" 2.0)
----
-;; -------------------- simple args and texts
----
-@foo{bar}  -@->  (foo "bar")
----
-@foo[]{bar}  -@->  (foo "bar")
----
-@foo[bar]  -@->  (foo bar)
----
-@foo[bar]{}  -@->  (foo bar)
----
-@foo[bar][baz]  -@->  (foo bar) [baz]
----
-@foo[bar]{baz}  -@->  (foo bar "baz")
----
-@foo[bar]{baz}[blah]  -@->  (foo bar "baz") [blah]
----
-@foo[bar]{baz}@foo[blah]  -@->  (foo bar "baz") (foo blah)
----
-@foo[#:x y]{bar}  -@->  (foo #:x y "bar")
----
-@foo[1 (* 2 3)]{bar}  -@->  (foo 1 (* 2 3) "bar")
----
-@foo[@bar{...}]{blah}
--@->
-(foo (bar "...") "blah")
----
-;; -------------------- no exprs or text
----
-@{}  -@->  ()
----
-@[]  -@->  ()
----
-@{foo}  -@->  ("foo")
----
-@[foo]  -@->  (foo)
----
-@{@foo bar}  -@->  (foo " bar")
----
-@|{blah}|  -@->  ("blah")
----
-@|{blah|@foo bleh}|  -@-> ("blah" foo " bleh")
----
-@|{|@meh blah|@foo bleh}|  -@-> (meh " blah" foo " bleh")
----
-;; -------------------- newlines and spaces in text
----
-@foo{bar baz}  -@->  (foo "bar baz")
----
-@foo{bar  baz}  -@->  (foo "bar  baz")
----
-@foo{ bar }  -@->  (foo " bar ")
----
-@foo{  bar   }  -@->  (foo "  bar   ")
----
-@foo{ }  -@->  (foo " ")
----
-@foo{  }  -@->  (foo "  ")
----
-@foo[1]{bar baz}  -@->  (foo 1 "bar baz")
----
-@foo[1]{bar  baz}  -@->  (foo 1 "bar  baz")
----
-@foo[1]{ bar }  -@->  (foo 1 " bar ")
----
-@foo[1]{  bar   }  -@->  (foo 1 "  bar   ")
----
-@foo[1]{ }  -@->  (foo 1 " ")
----
-@foo[1]{  }  -@->  (foo 1 "  ")
----
-@foo{bar baz
-     blah}
--@->
-(foo "bar baz" "\n" "blah")
----
-@foo[1]{bar baz
-        blah}
--@->
-(foo 1 "bar baz" "\n" "blah")
----
-@foo{bar baz
-
-     blah}
--@->
-(foo "bar baz" "\n" "\n" "blah")
----
-@foo{bar baz
-
-
-     blah}
--@->
-(foo "bar baz" "\n" "\n" "\n" "blah")
----
-@foo{bar
-     }
--@->
-(foo "bar")
----
-@foo{
-     bar}
--@->
-(foo "bar")
----
-@foo{
-     bar
-     }
--@->
-(foo "bar")
----
-@foo{
-
-     bar
-     }
--@->
-(foo "\n" "bar")
----
-@foo{
-     bar
-
-     }
--@->
-(foo "bar" "\n")
----
-@foo{
-
-     bar
-
-     }
--@->
-(foo "\n" "bar" "\n")
----
-@foo{
-     }
--@->
-(foo "\n")
----
-@foo{
-
-     }
--@->
-(foo "\n" "\n")
----
-@foo{
-
-
-     }
--@->
-(foo "\n" "\n" "\n")
----
-;; -------------------- nested forms
----
-@foo{@bar}  -@->  (foo bar)
----
-@foo{@bar{}}  -@->  (foo (bar))
----
-@foo{111@bar{222}333}  -@->  (foo "111" (bar "222") "333")
----
-@foo{111@bar[222]333}  -@->  (foo "111" (bar 222) "333")
----
-@foo[111 @bar{222} 333]  -@->  (foo 111 (bar "222") 333)
----
-@foo[111 @bar{222}333]  -@->  (foo 111 (bar "222") 333)
----
-@foo[111 @bar[222]333]  -@->  (foo 111 (bar 222) 333)
----
-@foo[111 @bar 222]  -@->  (foo 111 bar 222)
----
-@foo{111 @bar 222}  -@->  (foo "111 " bar " 222")
----
-@foo{@bar 111}  -@->  (foo bar " 111")
----
-@foo{111 @bar}  -@->  (foo "111 " bar)
----
-@foo{ @bar }  -@->  (foo " " bar " ")
----
-@foo{bar @baz[3]
-     blah}
--@->
-(foo "bar " (baz 3) "\n" "blah")
----
-@foo{bar @baz{3}
-     blah}
--@->
-(foo "bar " (baz "3") "\n" "blah")
----
-@foo{bar @baz[2 3]{4 5}
-     blah}
--@->
-(foo "bar " (baz 2 3 "4 5") "\n" "blah")
----
-@foo{bar @baz[2 3] {4 5}}
--@->
-(foo "bar " (baz 2 3) " {4 5}")
----
-;; -------------------- cannot have spaces before args or text
----
-@foo [bar]  -@-> foo (bar)
----
-@foo {bar}  -@-> foo (bar)
----
-@foo[bar] {baz}  -@-> (foo bar) (baz)
----
-@foo{bar @baz {bleh}}  -@-> (foo "bar " baz " {bleh}")
----
-;; -------------------- expression escapes, operators, currying
----
-@foo{1 @(+ 2 3) 4}  -@-> (foo "1 " (+ 2 3) " 4")
----
-@(lambda (x) x){blah}  -@->  ((lambda (x) x) "blah")
----
-@(lambda (x) x)[blah]  -@->  ((lambda (x) x) blah)
----
-@foo{bar}{baz}  -@->  (foo "bar") (baz)
----
-@@foo{bar}{baz}  -@->  ((foo "bar") "baz")
----
-@@foo{bar} {baz}  -@->  (foo "bar") (baz)
----
-@@foo{bar}{baz}{}  -@->  ((foo "bar") "baz") ()
----
-@@@foo{bar}{baz}{}  -@->  (((foo "bar") "baz"))
----
-@@@foo[]{}[][]  -@->  (((foo)))
----
-@@@foo[]{}[][][]  -@->  (((foo))) ()
----
-@foo{foo@|3|.}
--@->
-(foo "foo" 3 ".")
----
-@foo{foo@|(f 1)|{bar}}
--@->
-(foo "foo" (f 1) "{bar}")
----
-@foo{foo@|bar|[1]{baz}}
--@->
-(foo "foo" bar "[1]{baz}")
----
-;; -------------------- pulling punctuations outside
----
-@'foo  -@->  'foo
----
-@'foo[1 2]  -@->  '(foo 1 2)
----
-@'foo{bar}  -@->  '(foo "bar")
----
-@`foo{bar}  -@->  `(foo "bar")
----
-@,foo{bar}  -@->  ,(foo "bar")
----
-@,@foo{bar}  -@->  ,@(foo "bar")
----
-@`',foo{bar}  -@->  `',(foo "bar")
----
-@`',`',foo{bar}  -@->  `',`',(foo "bar")
----
-@``'',,foo{bar}  -@->  ``'',,(foo "bar")
----
-@`',@foo{bar}  -@->  `',@(foo "bar")
----
-@`',@`',@foo{bar}  -@->  `',@`',@(foo "bar")
----
-@``'',@,@foo{bar}  -@->  ``'',@,@(foo "bar")
----
-@``'',,,@,@foo{bar}  -@->  ``'',,,@,@(foo "bar")
----
-@#'foo{bar}  -@->  #'(foo "bar")
----
-@#`foo{bar}  -@->  #`(foo "bar")
----
-@#,foo{bar}  -@->  #,(foo "bar")
----
-@#''foo{bar}  -@->  #''(foo "bar")
----
-@#`'#,foo{bar}  -@->  #`'#,(foo "bar")
----
-@`foo{123 @,bar{456} 789}
--@->
-`(foo "123 " ,(bar "456") " 789")
----
-@`(unquote foo){blah}
--@->
-`(,foo "blah")
----
-;; -------------------- balanced braces are allowed
----
-@foo{f{o}o}  -@->  (foo "f{o}o")
----
-@foo{{{}}{}}  -@->  (foo "{{}}{}")
----
-@foo{f[o]o}  -@->  (foo "f[o]o")
----
-@foo{[{}]{}}  -@->  (foo "[{}]{}")
----
-;; -------------------- string escapes
----
-@foo{x@"y"z}  -@->  (foo "xyz")
----
-@foo{A @"}" marks the end}
--@->
-(foo "A } marks the end")
----
-@foo{The prefix is: @"@".}
--@->
-(foo "The prefix is: @.")
---
-@foo{@"@x{y}" => (x "y")}
--@->
-(foo "@x{y} => (x \"y\")")
----
-;; -------------------- alternative delimiters
----
-@foo|{...}|  -@->  (foo "...")
----
-@foo|{"}" after "{"}|  -@->  (foo "\"}\" after \"{\"")
----
-@foo|{Nesting |{is}| ok}|  -@->  (foo "Nesting |{is}| ok")
----
-@foo|{Nested @form{not}}|  -@->  (foo "Nested @form{not}")
----
-@foo|{Nested |@form|{yes}|}|  -@->  (foo "Nested " (form "yes"))
----
-@foo|{Nested |@form{indep@{end}ence}}|
--@->
-(foo "Nested " (form "indep" ("end") "ence"))
----
-@foo|{Nested |@|name|}|  -@->  (foo "Nested " name)
----
-@foo|{With
-      |@bar{multiple}
-      lines.}|
--@->
-(foo "With" "\n" (bar "multiple") "\n" "lines.")
----
-@t|{In |@i|{sub|@"@"s}| too}|  -@->  (t "In " (i "sub@s") " too")
----
-@foo|<<<{@x{foo} |@{bar}|.}>>>|  -@->  (foo "@x{foo} |@{bar}|.")
----
-@foo|<<<{@x{foo} |<<<@{bar}|.}>>>|  -@->  (foo "@x{foo} " ("bar") "|.")
----
-@foo|!!{X |!!@b{Y}...}!!|  -@->  (foo "X " (b "Y") "...")
----
-;; -------------------- comments
----
-(1 2 @; comment
- 3 4)
--@->
-(1 2 3 4)
----
-@foo{bar @; comment
-     baz@;
-     blah}
--@->
-(foo "bar bazblah")
----
-@foo{bar @; comment, with space and newline
-
-     baz}
--@->
-(foo "bar " "\n" "baz")
----
-hello @; comment at eof
--@->
-hello
----
-@foo{bar @;{a balanced comment} baz}
--@->
-(foo "bar  baz")
----
-@foo|{bar @;{a non-comment} baz}|
--@->
-(foo "bar @;{a non-comment} baz")
----
-@foo|{bar |@;{a balanced comment again} baz}|
--@->
-(foo "bar  baz")
----
-@foo{First line@;{there is still a
-                  newline here;}
-     Second line}
--@->
-(foo "First line" "\n" "Second line")
----
-@foo{A long @;
-     single-@;
-     string arg.}
--@->
-(foo "A long single-string arg.")
----
-;; -------------------- indentation management
----
-@foo{ bar
-     baz }
--@->
-(foo " bar" "\n" "baz ")
----
-@foo{bar
-}
--@->
-(foo "bar")
----
-@foo{
-bar}
--@->
-(foo "bar")
----
-@foo{
-  bar
-}
--@->
-(foo "bar")
----
-@foo{
-
-  bar
-
-}
--@->
-(foo "\n" "bar" "\n")
----
-@foo{
-  bar
-
-  baz
-}
--@->
-(foo "bar" "\n" "\n" "baz")
----
-@foo{
-}
--@->
-(foo "\n")
----
-@foo{
-  bar
-  baz
-  blah
-}
--@->
-(foo "bar" "\n" "baz" "\n" "blah")
----
-@foo{
-  begin
-    x++;
-  end}
--@->
-(foo "begin" "\n" "  " "x++;" "\n" "end")
----
-@foo{
-    a
-   b
-  c}
--@->
-(foo "  " "a" "\n" " " "b" "\n" "c")
----
-@foo{bar
-       baz
-     bbb}
--@->
-(foo "bar" "\n" "  " "baz" "\n" "bbb")
----
-;; requires location tracking
-@foo{ bar
-        baz
-      bbb}
--@->
-(foo " bar" "\n" "   " "baz" "\n" " " "bbb")
----
-@foo{bar
-   baz
-   bbb}
--@->
-(foo "bar" "\n" "baz" "\n" "bbb")
----
-@foo{ bar
-   baz
-   bbb}
--@->
-(foo " bar" "\n" "baz" "\n" "bbb")
----
-@foo{ bar
-   baz
-     bbb}
--@->
-(foo " bar" "\n" "baz" "\n" "  " "bbb")
----
-@text{Some @b{bold
-  text}, and
-  more text.}
--@->
-(text "Some " (b "bold" "\n" "text") ", and" "\n" "more text.")
----
-@code{
-  begin
-    i = 1, r = 1
-    @bold{while i < n do
-            r *= i++
-          done}
-  end
-}
--@->
-(code "begin" "\n"
-      "  " "i = 1, r = 1" "\n"
-      "  " (bold "while i < n do" "\n"
-                 "  " "r *= i++" "\n"
-                 "done") "\n"
-      "end")
----
-@foo{x1
-     x2@;
-              y2
-     x3@;{
-              ;}y3
-     x4@|
-              |y4
-     x5}
--@->
-(foo "x1" "\n" "x2y2" "\n" "x3y3" "\n" "x4" "y4" "\n" "x5")
----
-;; -------------------- ||-quotes for artificial separators and multi-exprs
----
-@foo{x@||z}  -@->  (foo "x" "z")
----
-@foo{x@|"y"|z}  -@->  (foo "x" "y" "z")
----
-@foo{x@|"y" "z"|}  -@->  (foo "x" "y" "z")
----
-@foo{x@|1 (+ 2 3) 4|y}  -@->  (foo "x" 1 (+ 2 3) 4 "y")
----
-@foo{x@|*
-        *|y}
--@->
-(foo "x" * * "y")
----
-@foo{Alice@||Bob@|
-     |Carol}
--@->
-(foo "Alice" "Bob" "Carol")
----
-@foo{Alice@||Bob@| x
-     |Carol}
--@->
-(foo "Alice" "Bob" x "Carol")
----
-@foo{@||
-     bar
-     @||}
--@->
-(foo "\n" "bar" "\n")
----
-@foo{
-  @|| bar @||
-  @|| baz}
--@->
-(foo " bar " "\n" " baz")
----
-@foo{bar
-     @|baz| bbb
-     @|x1 x2| x3 x4
-     @|| waaaah
-    }
--@->
-(foo "bar" "\n" baz " bbb" "\n" x1 x2 " x3 x4" "\n" " waaaah")
----
-;; -------------------- inside-reader
----
-foo bar baz  -@i->  "foo bar baz"
----
-foo @bar baz  -@i->  "foo " bar " baz"
----
-foo @bar{blah} baz  -@i-> "foo " (bar "blah") " baz"
----
-{{{  -@i->  "{{{"
----
-}}}  -@i->  "}}}"
----
-foo
-  bar
-baz
--@i->
-"foo" "\n" "  " "bar" "\n" "baz"
----
-  foo
-    bar
-  baz
--@i->
-"  foo" "\n" "    " "bar" "\n" "  " "baz"
----
-;; -------------------- using a different command character
----
-\foo
--\->
-foo
----
-\foo[1]{bar
-          baz \nested|{\form{}}|
-        blah}
--\->
-(foo 1 "bar" "\n" "  " "baz " (nested "\\form{}") "\n" "blah")
----
-\foo
--\i->
-foo
----
-\foo[1]{bar
-          baz \nested|{\form{}}|
-        blah}
-\bar[]
--\i->
-(foo 1 "bar" "\n" "  " "baz " (nested "\\form{}") "\n" "blah") "\n" (bar)
----
-;; -------------------- syntax information
----
-foo
--@syntax-> (stx: line= 1 column= 0 position= 1 span= 3)
----
-\foo
-|foo|
--@syntax->
-(stx: line= 1 column= 0 position= 1 span= 4)
-(stx: line= 2 column= 0 position= 6 span= 5)
----
-(foo bar)
--@syntax-> ((stx: line= 1 column= 1 position= 2 span= 3)
-            (stx: line= 1 column= 5 position= 6 span= 3))
----
-;; this test should break soon
-@foo
--@syntax->
-(stx: line= 1 column= 1 position= 2 span= 3)
-;; NOT this: (stx: line= 1 column= 0 position= 1 span= 4)
----
-;; -------------------- errors
----
-(  -@error-> "inp:1:0: read: expected a `)' to close `('" ; check -@error->
----
-@foo{ -@error-> #rx":1:0: missing closing `}'$"
----
-\foo{ -\error-> #rx":1:0: missing closing `}'$"
----
-@foo{@bar{ -@error-> #rx":1:5: missing closing `}'$"
----
-\foo{\bar{ -\error-> #rx":1:5: missing closing `}'$"
----
-@foo{@bar{} -@error-> #rx":1:0: missing closing `}'$"
----
-@foo{@bar|{} -@error-> #rx":1:5: missing closing `}\\|'$"
----
-@foo{@bar|-{} -@error-> #rx":1:5: missing closing `}-\\|'$"
----
-@foo{@bar|-{} -@error-> #rx":1:5: missing closing `}-\\|'$"
----
-\foo{\bar|-{} -\error-> #rx":1:5: missing closing `}-\\|'$"
----
-@foo{@" -@error-> #rx":1:6: read: expected a closing '\"'$"
-;; " <-- (balance this file)
----
-\foo{\" -\error-> #rx":1:6: read: expected a closing '\"'$"
----
-@|1 2|
--@error->
-#rx"a @|...| form in Scheme mode must have exactly one escaped expression"
----
-@||
--@error->
-#rx"a @|...| form in Scheme mode must have exactly one escaped expression"
----
-\|1 2|
--\error->
-#rx"a \\\\|...| form in Scheme mode must have exactly one escaped expression"
----
-\||
--\error->
-#rx"a \\\\|...| form in Scheme mode must have exactly one escaped expression"
----
-;; -------------------- some code tests
----
-@string-append{1 @(number->string (+ 2 3)) 4}  -@eval-> "1 5 4"
----
-(let* ([formatter (lambda (fmt)
-                    (lambda args (format fmt (apply string-append args))))]
-       [bf (formatter "*~a*")]
-       [it (formatter "/~a/")]
-       [ul (formatter "_~a_")]
-       [text string-append])
-  @text{@it{Note}: @bf{This is @ul{not} a pipe}.})
--@eval->
-"/Note/: *This is _not_ a pipe*."
----
-(require (for-syntax scheme/base))
-(let-syntax ([foo
-              (lambda (stx)
-                (let ([p (syntax-property stx 'scribble)])
-                  (syntax-case stx ()
-                    [(_ x ...)
-                     (and (pair? p) (eq? (car p) 'form) (even? (cadr p)))
-                     (let loop ([n (/ (cadr p) 2)]
-                                [as '()]
-                                [xs (syntax->list #'(x ...))])
-                       (if (zero? n)
-                         #`(list 'foo `#,(reverse as) #,@xs)
-                         (loop (sub1 n)
-                               (cons #`(#,(car xs) ,#,(cadr xs)) as)
-                               (cddr xs))))])))])
-  @foo[x 1 y (* 2 3)]{blah})
--@eval->
-(foo ((x 1) (y 6)) "blah")
----
-(let-syntax ([verb
-              (lambda (stx)
-                (syntax-case stx ()
-                  [(_ cmd item ...)
-                   #`(cmd
-                      #,@(let loop ([items (syntax->list #'(item ...))])
-                           (if (null? items)
-                             '()
-                             (let* ([fst  (car items)]
-                                    [prop (syntax-property fst 'scribble)]
-                                    [rst  (loop (cdr items))])
-                               (cond [(eq? prop 'indentation) rst]
-                                     [(not (and (pair? prop)
-                                                (eq? (car prop)
-                                                     'newline)))
-                                      (cons fst rst)]
-                                     [else (cons (datum->syntax
-                                                  fst (cadr prop) fst)
-                                                 rst)])))))]))])
-  @verb[string-append]{
-    foo
-      bar
-  })
--@eval->
-"foo\n      bar"
----
-;; -------------------- empty input tests
----
-
--@->
-
----
-
--@i->
-
----
-
--\->
-
----
-
--\i->
-
----
-
-
-END-OF-TESTS
-)
-
-;; get a tester function
-
-(define-namespace-anchor anchor)
-(define ns (namespace-anchor->namespace anchor))
-(define (string->tester name) (eval (string->symbol name) ns))
-
-;; reader utilities
-
-(define the-name (string->path "inp"))
-
-(define (read-all str reader [whole? #f])
-  (define i (open-input-string str the-name))
-  (if whole?
-    (reader i)
-    (let loop ()
-      (let ([x (reader i)])
-        (if (eof-object? x) '() (cons x (loop)))))))
-
-(define read/BS (scr:make-at-reader #:command-char #\\ #:syntax? #f))
-(define read-syntax/BS (scr:make-at-reader #:command-char #\\ #:syntax? #t))
-
-(define read-inside/BS
-  (scr:make-at-reader #:inside? #t #:command-char #\\ #:syntax? #f))
-
-;; tester makers
-
-(define (x . (mk-reader-test reader) . y)
-  (values (read-all x reader) (read-all y read)))
-
-(define (x . (mk-inside-reader-test inside-reader) . y)
-  (values (read-all x inside-reader #t) (read-all y read)))
-
-(define (x . (mk-eval-test syntax-reader) . y)
-  (define r (void))
-  (for ([x (read-all x (lambda (i) (syntax-reader 'test i)))])
-    (set! r (call-with-values (lambda () (eval x ns)) list)))
-  (values r (read-all y read)))
-
-(define (x . (mk-syntax-test syntax-reader) . y)
-  (let ([x (read-all x (lambda (i) (syntax-reader 'test i)))]
-        [y (read-all y read)])
-    (define (check x y)
-      (cond [(or (equal? x y) (eq? y '_)) #t]
-            [(not (pair? y)) #f]
-            [(eq? 'stx: (car y)) (check-stx x (cdr y))]
-            [(pair? x) (and (check (car x) (car y)) (check (cdr x) (cdr y)))]
-            [(syntax? x) (check (syntax-e x) y)]
-            [else #f]))
-    (define (check-stx x y)
-      (cond [(null? y) #t]
-            [(null? (cdr y)) (check x (car y))]
-            [(check
-              ((case (car y)
-                 [(line=)     syntax-line]
-                 [(column=)   syntax-column]
-                 [(position=) syntax-position]
-                 [(span=)     syntax-span]
-                 [else (error 'syntax-test "unknown test form: ~.s" (car y))])
-               x)
-              (cadr y))
-             (check-stx x (cddr y))]
-            [else #f]))
-    (values #t (check x y))))
-
-(define (x . (mk-error-test reader) . y)
-  (define (get-exn-data e)
-    (cons (exn-message e)
-          null #;
-          (append-map (lambda (s) (list (srcloc-line s) (srcloc-column s)))
-                      (exn:fail:read-srclocs e))
-          ))
-  (values (with-handlers ([exn:fail:read? get-exn-data])
-            (read-all x reader) "no error!")
-          (read-all y read)))
-
-;; testers
-
-(define -@->        (mk-reader-test scr:read))
-(define -\\->       (mk-reader-test read/BS))
-(define -@i->       (mk-inside-reader-test scr:read-inside))
-(define -\\i->      (mk-inside-reader-test read-inside/BS))
-(define -@eval->    (mk-eval-test scr:read-syntax))
-(define -\\eval->   (mk-eval-test read-syntax/BS))
-(define -@syntax->  (mk-syntax-test scr:read-syntax))
-(define -\\syntax-> (mk-syntax-test read-syntax/BS))
-(define -@error->   (mk-error-test scr:read))
-(define -\\error->  (mk-error-test read/BS))
-
-(define (make-@+-readtable #:command-readtable [command-readtable (current-readtable)]
-                           #:datum-readtable [datum-readtable (current-readtable)])
-  (make-readtable (scr:make-at-readtable #:command-readtable command-readtable
-                                         #:datum-readtable datum-readtable)
-                  #\+ 'terminating-macro (lambda args 'PLUS)))
-(define @+-readtable (make-@+-readtable))
-(define @c+-readtable (make-@+-readtable #:command-readtable 'dynamic))
-(define @d+-readtable (make-@+-readtable #:datum-readtable 'dynamic))
-(define @cd+-readtable (make-@+-readtable #:command-readtable 'dynamic
-                                          #:datum-readtable 'dynamic))
-
-(define-syntax-rule (@+checker a b readtable)
-  (equal? (parameterize ([current-readtable readtable])
-            (read (open-input-string a)))
-          b))
-(define-syntax-rule (a . -@+> . b) (@+checker a b @+-readtable))
-(define-syntax-rule (a . -@c+> . b) (@+checker a b @c+-readtable))
-(define-syntax-rule (a . -@d+> . b) (@+checker a b @d+-readtable))
-(define-syntax-rule (a . -@cd+> . b) (@+checker a b @cd+-readtable))
-
-;; running the tests
-(provide reader-tests)
-(module+ main (reader-tests))
-(define (reader-tests)
-  (define (matching? x y)
-    (cond [(equal? x y) #t]
-          [(pair? x) (and (pair? y)
-                          (matching? (car x) (car y))
-                          (matching? (cdr x) (cdr y)))]
-          [(and (regexp? x) (string? y)) (matching? y x)]
-          [(and (string? x) (regexp? y)) (regexp-match? y x)]
-          [(procedure? x) (x y)]
-          [(procedure? y) (y x)]
-          [else #f]))
-  (test do
-    (let* ([ts the-tests]
-           ;; remove all comment lines
-           [ts (regexp-replace* #px"(?m:^;.*\r?\n)" ts "")]
-           ;; split the tests
-           [ts (regexp-split #px"(?m:^)-+(?:$|\r?\n)" ts)])
-      (parameterize ([port-count-lines-enabled #t])
-        (for ([t ts] #:unless (regexp-match? #px"^\\s*$" t))
-          (let ([m (or (regexp-match #px"^(.*)\n\\s*(-\\S+->)\\s*\n(.*)$"
-                                     t)
-                       (regexp-match #px"^(.*\\S)\\s+(-\\S+->)\\s+(\\S.*)$"
-                                     t))])
-            (if (not (and m (= 4 (length m))))
-              (error 'bad-test "~a" t)
-              (let-values ([(x y)
-                            ((string->tester (caddr m)) (cadr m) (cadddr m))])
-                (test #:failure-message
-                      (format "bad result in\n    ~a\n  results:\n    ~s != ~s"
-                              (regexp-replace* #rx"\n" t "\n    ")
-                              x y)
-                      (matching? x y))))))))
-
-    ;; Check static versus dynamic readtable for command (dynamic when "c" in the
-    ;; name) and datum (dynamic when "d" in the name) parts:
-    (-@+> "10" 10)
-    (-@+> "(+ @+[+] +)" '(PLUS (+ +) PLUS))
-    (-@+> "@+[+]" '(+ +))
-    (-@d+> "@+[+]" '(+ PLUS))
-    (-@d+> "(+ @+[+])" '(PLUS (+ PLUS)))
-    (-@c+> "@+[+]" '(PLUS +))
-    (-@c+> "@|+|" 'PLUS)
-    (-@cd+> "@+[+]" '(PLUS PLUS))))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/render.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/render.rkt
deleted file mode 100644
index 78f20ff8b6..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/render.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(require scribble/render
-         scribble/text-render
-         scribble/core
-         racket/file
-         tests/eli-tester)
-
-(provide render-tests)
-(module+ main (render-tests))
-(define (render-tests)
-  (dynamic-wind
-    (λ() (render (list (part #f
-                             null
-                             (list "Render")
-                             (style #f null)
-                             null
-                             (list (paragraph (style #f null) "The content."))
-                             null))
-                 (list "example-for-render-test")
-                 #:render-mixin render-mixin))
-    (λ() (test (file->string "example-for-render-test.txt")
-               => "Render\n\nThe content.\n"))
-    (λ() (delete-file "example-for-render-test.txt"))))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-collect.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-collect.rkt
deleted file mode 100644
index cbc19619a5..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-collect.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester scribble/text/syntax-utils)
-
-(provide begin/collect-tests)
-(module+ main (begin/collect-tests))
-(define (begin/collect-tests)
-  (test
-
-   ;; begin/collect scope etc
-   (begin/collect 1) => 1
-   (begin/collect 1 2 3) => '(1 2 3)
-   (begin/collect) => '()
-   (begin/collect (define x 1) x) => 1
-   (begin/collect (define x 1)) => '()
-   (begin/collect (define x 1) x x x) => '(1 1 1)
-   (begin/collect (define x 1) (define y 2) x y x y) => '(1 2 1 2)
-   (begin/collect (define x 1) x (define y 2) y) => '(1 2)
-   (begin/collect (define x 1) x (define y 2)) => '(1)
-   (begin/collect (define x 1) x x (define y 2) y y) => '(1 1 2 2)
-   (begin/collect (define x 1) x (define x 2) x) => '(1 2)
-   (begin/collect (define x 1) x x (define x 2) x x) => '(1 1 2 2)
-   (begin/collect (define (x) y) (define y 1) (x) (x) (x)) => '(1 1 1)
-   (begin/collect (define x 1) x (define y 2) x) => '(1 1)
-   (begin/collect (define x 1) x x (define y 2) x x) => '(1 1 1 1)
-   (begin/collect (define x 1) x x (define y x) y y) => '(1 1 1 1)
-   (begin/collect (define (x) y) (define y 1) (x) (x)
-                  (define (x) y) (define y 2) (x) (x))
-   => '(1 1 2 2)
-   (begin/collect (define-syntax-rule (DEF x y) (define x y)) (DEF x 1) x x)
-   => '(1 1)
-   (begin/collect (define-syntax-rule (DEF x y) (define x y)) 1 (DEF x 2) x)
-   => '(1 2)
-   (begin/collect (define-syntax-rule (DEF x y) (define x y))
-                  (DEF x 1) x x
-                  (DEF x 2) x x)
-   => '(1 1 2 2)
-   (begin/collect (define (x) y)
-                  (define-syntax-rule (DEF x y) (define x y))
-                  (DEF y 1) (x) (x)
-                  (DEF y 2) (x) (x))
-   => '(1 1 1 1)
-   (let ([y 1]) (begin/collect y y (define x y) x y x)) => '(1 1 1 1 1)
-   (let ([y 1]) (begin/collect y y (define y 2) y y)) => '(1 1 2 2)
-   (let ([y 1]) (begin/collect (define (x) y) (x) (x))) => '(1 1)
-   (let ([y 1]) (begin/collect (define (x) y) (define y 2) (x) (x))) => '(2 2)
-   (let ([y 1]) (begin/collect (define (x) y) (x) (x) (define y 2) y y))
-   => '(1 1 2 2)
-   (let ([y 1]) (begin/collect (define (x) y) (x) (x) (define y 2) y y (x)))
-   => '(1 1 2 2 1)
-   (let ([y 1]) (begin/collect (define (x) y) (x) (x) (define y 2) (x) y y))
-   => '(1 1 1 2 2)
-   (begin/collect (begin (define (x) y)
-                         (define-syntax-rule (DEF x y) (define x y))
-                         (define y 2))
-                  (x) (x))
-   => '(2 2)
-   (begin/collect (define (x) y)
-                  (begin (define-syntax-rule (DEF x y) (define x y))
-                         (define y 2))
-                  (x) (x))
-   => '(2 2)
-   (begin/collect (define (x) y)
-                  (define-syntax-rule (DEF x y) (define x y))
-                  (begin (define y 2))
-                  (x) (x))
-   => '(2 2)
-   (begin/collect (begin (begin (begin (define (x) y))
-                                (begin (define-syntax-rule (DEF x y)
-                                         (define x y))))
-                         (begin (begin (define y 2))
-                                (begin (x)))
-                         (begin (x))))
-   => '(2 2)
-   (begin/collect 1
-                  (define (f x #:< [< "<"] #:> [> ">"]) (list < x >))
-                  (f 1)
-                  (f #:< "[" 2)
-                  (f 3 #:> "]" #:< "["))
-   => '(1 ("<" 1 ">") ("[" 2 ">") ("[" 3 "]"))
-
-   ))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-lang.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-lang.rkt
deleted file mode 100644
index e9111bc963..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-lang.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester racket/runtime-path racket/port racket/sandbox
-         (prefix-in doc: (lib "scribblings/scribble/text.scrbl")))
-
-(provide text-lang-tests)
-(module+ main (text-lang-tests))
-(define (text-lang-tests)
-  ;; (sample-file-tests)
-  (test do (in-documentation-tests)))
-
-;; unused now
-(define-runtime-path text-dir "text")
-(define (sample-file-tests)
-  (parameterize ([current-directory text-dir])
-    (for ([ifile (map path->string (directory-list))]
-          #:when (and (file-exists? ifile)
-                      (regexp-match? #rx"^i[0-9]+\\.ss$" ifile)))
-      (define ofile (regexp-replace #rx"^i([0-9]+)\\..*$" ifile "o\\1.txt"))
-      (define expected (call-with-input-file ofile
-                         (lambda (i) (read-bytes (file-size ofile) i))))
-      (define o (open-output-bytes))
-      (parameterize ([current-output-port o])
-        (dynamic-require (path->complete-path ifile) #f))
-      (test (get-output-bytes o) => expected))))
-
-(define-runtime-path this-dir ".")
-(define (in-documentation-tests)
-  (define (text-test line in-text out-text more)
-    (define-values (i o) (make-pipe 512))
-    (define-values (expected len-to-read)
-      (let ([m (regexp-match-positions #rx"\n\\.\\.\\.$" out-text)])
-        (if m
-          (values (substring out-text 0 (caar m)) (caar m))
-          (values out-text #f))))
-    ;; test with name indicating the source
-    (define-syntax-rule (t . stuff)
-      (test ;; #:failure-message
-            ;; (format "text-lang test failure at line ~s" line)
-            . stuff))
-    (parameterize ([current-directory this-dir]
-                   [sandbox-output o]
-                   [sandbox-error-output current-output-port]
-                   [sandbox-eval-limits '(2 10)])
-      (define exn #f)
-      (define thd #f)
-      (define (run)
-        ;; only need to evaluate the module, so we have its output; but do that
-        ;; in a thread, since we might want to look at just a prefix of an
-        ;; infinite output
-        (with-handlers ([void (lambda (e) (set! exn e))])
-          (make-module-evaluator in-text)
-          (close-output-port o)))
-      (for ([m more])
-        (call-with-output-file (car m) #:exists 'truncate
-          (lambda (o) (display (cdr m) o))))
-      (set! thd (thread run))
-      (t (if len-to-read (read-string len-to-read i) (port->string i))
-         => expected)
-      (t (begin (kill-thread thd) (cond [exn => raise] [else #t])))
-      (for ([m more])
-        (when (file-exists? (car m)) (delete-file (car m))))))
-  (call-with-trusted-sandbox-configuration
-    (lambda ()
-      (for ([t (in-list (doc:tests))])
-        (begin (apply text-test t))))))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-wrap.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-wrap.rkt
deleted file mode 100644
index 0d2c489d23..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-wrap.rkt
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang racket/base
-
-(require tests/eli-tester scribble/text/wrap)
-
-#; ; generate test cases from Emacs
-(defmacro wrap-line (str col &rest dummy)
-  (let ((r (with-temp-buffer
-            (fundamental-mode)
-            (insert str)
-            (let (; straightforward filling, no fanciness
-                  (left-margin 0) (fill-column col)
-                  (adaptive-fill-regexp "\\`\\'")
-                  (adaptive-fill-first-line-regexp "\\`\\'")
-                  (filladapt-mode nil))
-              (fill-region-as-paragraph (point-min) (point-max) nil t)
-              (format "'%S" (split-string
-                             (buffer-substring (point-min) (point-max))
-                             "\n"))))))
-    `(insert ,r)))
-
-(provide wrap-tests)
-(module+ main (wrap-tests))
-(define (wrap-tests)
-  (define (w line width result1 result2)
-    (test (wrap-line line width) => result1
-          (wrap-line line width
-                     (λ (w n) (values (substring w 0 n) (substring w n) #f)))
-          => result2))
-  (test (w "eli barzilay maze is life" 25
-           '("eli barzilay maze is life")
-           '("eli barzilay maze is life"))
-        (w "eli barzilay maze is life" 10
-           '("eli" "barzilay" "maze is" "life")
-           '("eli barzil" "ay maze is" "life"))
-        (w "eli barzilay maze is life" 11
-           '("eli" "barzilay" "maze is" "life")
-           '("eli barzila" "y maze is l" "ife"))
-        (w "eli barzilay maze is life" 12
-           '("eli barzilay" "maze is life")
-           '("eli barzilay" "maze is life"))
-        (w "eli barzilay maze is life" 13
-           '("eli barzilay" "maze is life")
-           '("eli barzilay" "maze is life"))
-        (w "eli barzilay maze is life" 14
-           '("eli barzilay" "maze is life")
-           '("eli barzilay m" "aze is life"))
-        (w "eli  barzilay maze is life" 15
-           '("eli  barzilay" "maze is life")
-           '("eli  barzilay m" "aze is life"))
-        (w "eli barzilay  maze is life" 15
-           '("eli barzilay" "maze is life")
-           '("eli barzilay  m" "aze is life"))
-        (w "eli barzilay maze  is life" 15
-           '("eli barzilay" "maze  is life")
-           '("eli barzilay ma" "ze  is life"))
-        (w "0123456789" 10
-           '("0123456789")
-           '("0123456789"))
-        (w "     xxxxx" 10
-           '("     xxxxx")
-           '("     xxxxx"))
-        (w "     xxxxxx" 10
-           '("     xxxxxx")
-           '("     xxxxx" "x"))
-        (w "     xxxxxxxxxxx" 10
-           '("     xxxxxxxxxxx")
-           '("     xxxxx" "xxxxxx"))
-        (w "xxxxx     " 10
-           '("xxxxx     ")
-           '("xxxxx     "))
-        (w "xxxxxx     " 10
-           '("xxxxxx     ")
-           '("xxxxxx    " " "))
-        (w " xxxxx     " 10
-           '(" xxxxx     ")
-           '(" xxxxx    " " "))
-        (w "     x     " 10
-           '("     x     ")
-           '("     x    " " "))
-        (w "" 10
-           '("")
-           '(""))
-        (w "     " 10
-           '("     ")
-           '("     "))
-        (w "          " 10
-           '("          ")
-           '("          "))
-        (w "           " 10
-           '("           ")
-           '("          " " "))
-        (w "xxxxxxxxxxx     " 10
-           '("xxxxxxxxxxx     ")
-           '("xxxxxxxxxx" "x     "))
-        (w "     xxxxxxxxxxx " 10
-           '("     xxxxxxxxxxx ")
-           '("     xxxxx" "xxxxxx "))
-        (w "     xxxxxxxxxxx  " 10
-           '("     xxxxxxxxxxx  ")
-           '("     xxxxx" "xxxxxx  "))
-        (w "     xxxxxxxxxxx x" 10
-           '("     xxxxxxxxxxx" "x")
-           '("     xxxxx" "xxxxxx x"))
-        (w "     xxxxxxxxxxx  x" 10
-           '("     xxxxxxxxxxx" "x")
-           '("     xxxxx" "xxxxxx  x"))
-        (w "x x x x x x x x x x x" '(10 . 8)
-           '("x x x x x" "x x x x" "x x")
-           '("x x x x x" "x x x x" "x x"))
-        (w "xx x x x x x x x x x x" '(10 . 8)
-           '("xx x x x x" "x x x x" "x x")
-           '("xx x x x x" "x x x x" "x x"))
-        (w "x x x x xxx x x x x x" '(10 . 8)
-           '("x x x x" "xxx x x" "x x x")
-           '("x x x x xx" "x x x x" "x x"))
-        (w "xxxx xxxx xxxx xxxx" '(10 . 5)
-           '("xxxx xxxx" "xxxx" "xxxx")
-           '("xxxx xxxx" "xxxx" "xxxx"))
-        (w "xxxx xxxxxxxx xxxx" '(10 . 5)
-           '("xxxx" "xxxxxxxx" "xxxx")
-           '("xxxx xxxxx" "xxx x" "xxx"))))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/xref.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scribble/xref.rkt
deleted file mode 100644
index accf998de5..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scribble/xref.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/base
-(require scribble/xref
-         racket/fasl
-         setup/dirs
-         tests/eli-tester)
-
-;; FIXME: need to look for out<i>.sxref files
-
-(provide xref-tests)
-(module+ main (xref-tests))
-(define (xref-tests)
-  (define sxref (build-path (find-doc-dir) "reference" "out.sxref"))
-  (when (file-exists? sxref)
-    (define xref
-      (load-xref (list (λ () (cadr (call-with-input-file* sxref fasl->s-exp))))))
-    (test (xref-binding->definition-tag
-           xref (list '(lib "contract.rkt" "racket") '->) #f)
-          => '(form ((lib "racket/contract/base.rkt") ->)))))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.normal.txt b/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.normal.txt
deleted file mode 100644
index c29bdb9689..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.normal.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Bibliography
-
-Ran Canetti. Universally Composable Security: A New Paradigm for     
-Cryptographic Protocols. 2000.                                       
-Michael Salib. Starkiller: A Static Type Inferencer and Compiler for 
-Python. Massachusetts Institute of Technology, 2004.                 
-Sam Tobin-Hochstadt, Vincent St-Amour, Ryan Culpepper, Matthew Flatt,
-and Matthias Felleisen. Languages as Libraries. In Proc. PLDI, 2011. 
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.number.txt b/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.number.txt
deleted file mode 100644
index de687b0346..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.number.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Bibliography
-
-[1]Ran Canetti. Universally Composable Security: A New Paradigm for     
-   Cryptographic Protocols. 2000.                                       
-[2]Michael Salib. Starkiller: A Static Type Inferencer and Compiler for 
-   Python. Massachusetts Institute of Technology, 2004.                 
-[3]Sam Tobin-Hochstadt, Vincent St-Amour, Ryan Culpepper, Matthew Flatt,
-   and Matthias Felleisen. Languages as Libraries. In Proc. PLDI, 2011. 
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.rkt
deleted file mode 100644
index a73089ef9a..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang racket
-(require racket/runtime-path
-         tests/eli-tester
-         scriblib/bibtex
-         scriblib/autobib
-         scribble/render
-         (prefix-in text: scribble/text-render))
-
-(define-runtime-path example.bib "example.bib")
-
-(define-runtime-path normal-expected-path "bibtex.normal.txt")
-(define-runtime-path number-expected-path "bibtex.number.txt")
-
-(define-syntax-rule (test-render* definer expected-path body generate-bibliography-id)
-  (let ()
-    definer
-
-    body
-
-    (define actual-path
-      (make-temporary-file "~a-bibtex.txt"))
-
-    (render (list (generate-bibliography-id))
-            (list actual-path)
-            #:dest-dir (path-only actual-path)
-            #:render-mixin text:render-mixin)
-
-    (test
-     (file->string actual-path) => (file->string expected-path))))
-
-(define-syntax-rule (test-render expected-path options body)
-  (begin
-    (test-render* (define-bibtex-cite example.bib
-                    ~cite-id citet-id generate-bibliography-id . options)
-                  expected-path
-                  (body ~cite-id citet-id)
-                  generate-bibliography-id)
-    (test-render* (begin
-                    (define-cite autobib-cite autobib-citet
-                      generate-bibliography-id . options)
-                    (define-bibtex-cite* example.bib
-                      autobib-cite autobib-citet
-                      ~cite-id citet-id))
-                  expected-path
-                  (body ~cite-id citet-id)
-                  generate-bibliography-id)))
-
-(test
- (let ()
-   (define example (path->bibdb example.bib))
-   (define raw (bibdb-raw example))
-
-   (test
-    (hash-ref (hash-ref raw "sweig42") "month") => "march"
-    (hash-ref (hash-ref raw "sweig42a") "month") => "1~mar"
-    (hash-ref (hash-ref raw "sweig42b") "month") => "1~march"
-    (hash-ref (hash-ref raw "sweig42c") "month") => "1~marcha"))
-
- (test-render normal-expected-path ()
-              (λ (~cite-id citet-id)
-                (~cite-id "salib:starkiller")
-                (~cite-id "cryptoeprint:2000:067")
-                (~cite-id "Tobin-Hochstadt:2011fk")
-                (~cite-id "cryptoeprint:2000:067" "Tobin-Hochstadt:2011fk")
-                (~cite-id "cryptoeprint:2000:067 Tobin-Hochstadt:2011fk")
-
-                (citet-id "salib:starkiller")
-                (citet-id "cryptoeprint:2000:067")
-                (citet-id "Tobin-Hochstadt:2011fk")
-                (citet-id "Tobin-Hochstadt:2011fk" "Tobin-Hochstadt:2011fk")
-                (citet-id "Tobin-Hochstadt:2011fk Tobin-Hochstadt:2011fk")))
- (test-render number-expected-path (#:style number-style)
-              (λ (~cite-id citet-id)
-                (citet-id "salib:starkiller")
-                (citet-id "cryptoeprint:2000:067")
-                (citet-id "Tobin-Hochstadt:2011fk"))))
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/example.bib b/pkgs/scribble-pkgs/scribble-test/tests/scriblib/example.bib
deleted file mode 100644
index 9d5d44b0e0..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/example.bib
+++ /dev/null
@@ -1,407 +0,0 @@
-%% This BibTeX bibliography file was created using BibDesk.
-%% http://bibdesk.sourceforge.net/
-
-
-%% Created for Jay McCarthy at 2011-05-13 19:46:09 -0600 
-
-
-%% Saved with string encoding Unicode (UTF-8) 
-
-
-@string{aadebug = {International Workshop on Automated and Algorithmic Debugging}}
-
-@string{acm = {Association for Computing Machinery}}
-
-@string{addison-wesley = {Addison-Wesley}}
-
-@string{addison-wesley-longman = {Addison Wesley Longman}}
-
-@string{aosd = {International Conference on Aspect-Oriented Software Development}}
-
-@string{ase = {{IEEE} International Symposium on Automated Software Engineering}}
-
-@string{asej = {Automated Software Engineering}}
-
-@string{aspnetpro = {asp.net{PRO}}}
-
-@string{aug = {August}}
-
-@string{brown-cs = {Computer Science Department, Brown University}}
-
-@string{cacm = {Communications of the {ACM}}}
-
-@string{cbse = {{ICSE} Workshop on Component-Based Software Engineering}}
-
-@string{cc = {Compiler Construction}}
-
-@string{computing-surveys = {{ACM} Computing Surveys}}
-
-@string{cup = {Cambridge University Press}}
-
-@string{dec = {December}}
-
-@string{dr-dobbs = {{Dr.\ Dobb's Journal}}}
-
-@string{dsl = {{USENIX} Conference on Domain-Specific Languages}}
-
-@string{ecoop = {European Conference on Object-Oriented Programming}}
-
-@string{esec/fse = {Joint European Software Engineering Conference and {ACM SIGSOFT} Symposium on the Foundations of Software Engineering}}
-
-@string{esop = {European Symposium on Programming}}
-
-@string{fdpe = {Functional and Declarative Programming in Education}}
-
-@string{foal = {Foundations of Aspect-Oriented Languages}}
-
-@string{fool = {Foundations of Object-Oriented Languages}}
-
-@string{fse = {{ACM SIGSOFT} International Symposium on the Foundations of Software Engineering}}
-
-@string{fsf = {Free Software Foundation}}
-
-@string{gcse = {International Symposium on Generative and Component-Based Software Engineering}}
-
-@string{gpce = {International Conference on Generative Programming and Component Engineering}}
-
-@string{hosc = {Higher-Order and Symbolic Computation}}
-
-@string{ic = {Information \& Computation}}
-
-@string{icalp = {International Conference on Automata, Languages and Programming}}
-
-@string{iccc = {Internationl Conference on Compiler Construction}}
-
-@string{icfp = {{ACM SIGPLAN} International Conference on Functional Programming}}
-
-@string{icse = {International Conference on Software Engineering}}
-
-@string{icsr = {International Conference on Software Reuse}}
-
-@string{ieee-software = {{IEEE} Software}}
-
-@string{ieee-tose = {{IEEE} Transactions on Software Engineering}}
-
-@string{info-proc-let = {Information Processing Letters}}
-
-@string{j-jucs = {Journal of Universal Computer Science}}
-
-@string{jan = {January}}
-
-@string{jcss = {Journal of Computer and System Sciences}}
-
-@string{jfp = {Journal of Functional Programming}}
-
-@string{jul = {July}}
-
-@string{jun = {June}}
-
-@string{lasc = {Lisp and Symbolic Computation}}
-
-@string{lfp = {{ACM} Symposium on Lisp and Functional Programming}}
-
-@string{lics = {{IEEE} Symposium on Logic in Computer Science}}
-
-@string{lncs = {Lecture Notes in Computer Science}}
-
-@string{manuscript = {Unpublished manuscript}}
-
-@string{mar = {March}}
-
-@string{mcgraw-hill = {McGraw-Hill}}
-
-@string{mit-lcs = {MIT Laboratory for Computer Science}}
-
-@string{mit-press = {{MIT} Press}}
-
-@string{monterey2001 = {Monterey Workshop on Engineering Automation for Software Intensive System Integration}}
-
-@string{nytimes = {New York Times}}
-
-@string{oopsla = {{ACM SIGPLAN} Conference on Object-Oriented Programming Systems, Languages \& Applications}}
-
-@string{padl = {Symposium on the Practical Aspects of Declarative Languages}}
-
-@string{paste = {Workshop on Program Analysis for Software Tools and Engineering}}
-
-@string{pepm = {{ACM SIGPLAN} Symposium on Partial Evaluation and Semantics-Based Program Manipulation}}
-
-@string{personal = {Personal communication}}
-
-@string{pldi = {{ACM SIGPLAN} Conference on Programming Language Design and Implementation}}
-
-@string{plilp = {International Symposium on Programming Languages: Implementations, Logics, and Programs}}
-
-@string{plop = {Pattern Languages of Program Design}}
-
-@string{pls = {Programming Languages and Systems}}
-
-@string{popl = {{ACM SIGPLAN-SIGACT} Symposium on Principles of Programming Languages}}
-
-@string{prentice-hall = {Prentice-Hall}}
-
-@string{pws = {{PWS} Publishing}}
-
-@string{schemecookbook = {Scheme Cookbook}}
-
-@string{scp = {Science of Computer Programming}}
-
-@string{sigplan-notices = {{ACM SIGPLAN} Notices}}
-
-@string{sosp = {Symposium on Operating System Principles}}
-
-@string{spe = {Software--Practice and Experience}}
-
-@string{spin-sw-mc = {{SPIN} Workshop on Software Model Checking}}
-
-@string{springer = {Springer-Verlag}}
-
-@string{sw = {Scheme Workshop}}
-
-@string{swconfmgmt = {International Workshop on Software Configuration Management}}
-
-@string{sws = {{ACM} Workshop on Secure Web Services (SWS)}}
-
-@string{tacas = {Conference on Tools and Algorithms for the Construction and Analysis of Systems}}
-
-@string{tcs = {Theoretical Computer Science}}
-
-@string{tocs = {{ACM} Transactions on Computer Systems}}
-
-@string{toit = {{ACM} Transactions on Internet Technology}}
-
-@string{tools-symp = {Technology of Object-Oriented Languages and Systems}}
-
-@string{toplas = {{ACM} Transactions on Programming Languages and Systems}}
-
-@string{tose = {{IEEE} Transactions on Software Engineering}}
-
-@string{tosem = {{ACM} Transactions on Software Engineering and Methodology}}
-
-@string{tr = {Technical Report}}
-
-@string{w3c = {{W}orld {W}ide {W}eb {C}onsortium}}
-
-@string{wiley = {Wiley}}
-
-
-@misc{cryptoeprint:2000:067,
-	Author = {Ran Canetti},
-	Date-Added = {2011-04-11 11:28:01 -0600},
-	Date-Modified = {2011-04-11 11:29:32 -0600},
-	Howpublished = {Cryptology ePrint Archive, Report 2000/067},
-	Title = {Universally Composable Security: A New Paradigm for Cryptographic Protocols},
-	Year = {2000}}
-
-@inproceedings{Tobin-Hochstadt:2011fk,
-	Author = {Sam Tobin-Hochstadt and Vincent St-Amour and Ryan Culpepper and Matthew Flatt and Matthias Felleisen},
-	Booktitle = {PLDI},
-	Date-Added = {2011-04-11 10:04:33 -0600},
-	Date-Modified = {2011-04-11 10:28:07 -0600},
-	Read = {1},
-	Title = {Languages as Libraries},
-	Year = {2011},
-	Bdsk-File-1 = {YnBsaXN0MDDUAQIDBAUIJidUJHRvcFgkb2JqZWN0c1gkdmVyc2lvblkkYXJjaGl2ZXLRBgdUcm9vdIABqAkKFRYXGyIjVSRudWxs0wsMDQ4RFFpOUy5vYmplY3RzV05TLmtleXNWJGNsYXNzog8QgASABqISE4ACgAOAB1lhbGlhc0RhdGFccmVsYXRpdmVQYXRo0hgNGRpXTlMuZGF0YU8RAc4AAAAAAc4AAgAADE1hY2ludG9zaCBIRAAAAAAAAAAAAAAAAAAAAMkCFiVIKwAAAC/hFxFwbGRpMTEtdGhhY2ZmLnBkZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAT5pXyakRQgAAAAAAAAAAAAgABwAACSAAAAAAAAAAAAAAAAAAAAAFLVRtcC0AABAACAAAyQJ4lQAAABEACAAAyallogAAAAEAGAAv4RcACE4PAAhODgAAYloAAADYAAAA1gACAFdNYWNpbnRvc2ggSEQ6cHJpdmF0ZTp2YXI6Zm9sZGVyczpBLTpBLU5pTGNGSEdCaWw5bWJFYUR0dkYrKysrVEk6LVRtcC06cGxkaTExLXRoYWNmZi5wZGYAAA4AJAARAHAAbABkAGkAMQAxAC0AdABoAGEAYwBmAGYALgBwAGQAZgAPABoADABNAGEAYwBpAG4AdABvAHMAaAAgAEgARAASAEpwcml2YXRlL3Zhci9mb2xkZXJzL0EtL0EtTmlMY0ZIR0JpbDltYkVhRHR2RisrKytUSS8tVG1wLS9wbGRpMTEtdGhhY2ZmLnBkZgATAAEvAP//AACABdIcHR4fWCRjbGFzc2VzWiRjbGFzc25hbWWjHyAhXU5TTXV0YWJsZURhdGFWTlNEYXRhWE5TT2JqZWN0XxBaLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vdmFyL2ZvbGRlcnMvQS0vQS1OaUxjRkhHQmlsOW1iRWFEdHZGKysrK1RJLy1UbXAtL3BsZGkxMS10aGFjZmYucGRm0hwdJCWiJSFcTlNEaWN0aW9uYXJ5EgABhqBfEA9OU0tleWVkQXJjaGl2ZXIACAARABYAHwAoADIANQA6ADwARQBLAFIAXQBlAGwAbwBxAHMAdgB4AHoAfACGAJMAmACgAnICdAJ5AoICjQKRAp8CpgKvAwwDEQMUAyEDJgAAAAAAAAIBAAAAAAAAACgAAAAAAAAAAAAAAAAAAAM4}}
-
-@unpublished{cite-key,
-	Date-Added = {2011-04-11 10:04:14 -0600},
-	Date-Modified = {2011-04-11 10:04:14 -0600}}
-
-@inproceedings{Braberman:2008:PPH:1375634.1375655,
-	Acmid = {1375655},
-	Address = {New York, NY, USA},
-	Author = {Braberman, V\'{\i}ctor and Fern\'{a}ndez, Federico and Garbervetsky, Diego and Yovine, Sergio},
-	Booktitle = {Proceedings of the 7th international symposium on Memory management},
-	Date-Added = {2011-02-18 10:02:51 -0700},
-	Date-Modified = {2011-02-18 10:16:34 -0700},
-	Doi = {http://doi.acm.org/10.1145/1375634.1375655},
-	Isbn = {978-1-60558-134-7},
-	Keywords = {heap consumption, heap space analysis, java, memory regions, Games, To-implement},
-	Location = {Tucson, AZ, USA},
-	Numpages = {10},
-	Pages = {141--150},
-	Publisher = {ACM},
-	Read = {1},
-	Series = {ISMM '08},
-	Title = {Parametric prediction of heap memory requirements},
-	Url = {http://doi.acm.org/10.1145/1375634.1375655},
-	Year = {2008},
-	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1375634.1375655}}
-
-@inproceedings{Henglein:2011:REC:1926385.1926429,
-	Acmid = {1926429},
-	Address = {New York, NY, USA},
-	Author = {Henglein, Fritz and Nielsen, Lasse},
-	Booktitle = {Proceedings of the 38th annual ACM SIGPLAN-SIGACT symposium on Principles of programming languages},
-	Date-Added = {2011-02-16 12:26:15 -0700},
-	Date-Modified = {2011-02-16 13:03:08 -0700},
-	Doi = {http://doi.acm.org/10.1145/1926385.1926429},
-	Isbn = {978-1-4503-0490-0},
-	Keywords = {axiomatization, coercion, coinduction, computational interpretation, containment, equivalence, regular expression, type, To-implement},
-	Location = {Austin, Texas, USA},
-	Numpages = {14},
-	Pages = {385--398},
-	Publisher = {ACM},
-	Read = {1},
-	Series = {POPL '11},
-	Title = {Regular expression containment: coinductive axiomatization and computational interpretation},
-	Url = {http://doi.acm.org/10.1145/1926385.1926429},
-	Year = {2011},
-	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1926385.1926429}}
-
-@inproceedings{Hofmann:2011:SL:1926385.1926428,
-	Acmid = {1926428},
-	Address = {New York, NY, USA},
-	Author = {Hofmann, Martin and Pierce, Benjamin and Wagner, Daniel},
-	Booktitle = {Proceedings of the 38th annual ACM SIGPLAN-SIGACT symposium on Principles of programming languages},
-	Date-Added = {2011-02-15 13:41:22 -0700},
-	Date-Modified = {2011-02-15 14:17:16 -0700},
-	Doi = {http://doi.acm.org/10.1145/1926385.1926428},
-	Isbn = {978-1-4503-0490-0},
-	Keywords = {algebra, category theory, lens, view-update},
-	Location = {Austin, Texas, USA},
-	Numpages = {14},
-	Pages = {371--384},
-	Publisher = {ACM},
-	Read = {1},
-	Series = {POPL '11},
-	Title = {Symmetric lenses},
-	Url = {http://doi.acm.org/10.1145/1926385.1926428},
-	Year = {2011},
-	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1926385.1926428}}
-
-@inproceedings{Novark:2010:DSH:1866307.1866371,
-	Acmid = {1866371},
-	Address = {New York, NY, USA},
-	Author = {Novark, Gene and Berger, Emery D.},
-	Booktitle = {Proceedings of the 17th ACM conference on Computer and communications security},
-	Date-Added = {2011-02-14 12:53:15 -0700},
-	Date-Modified = {2011-02-14 12:53:16 -0700},
-	Doi = {http://doi.acm.org/10.1145/1866307.1866371},
-	Isbn = {978-1-4503-0245-6},
-	Keywords = {buffer overflow, dangling pointer, dynamic memory allocation, memory errors},
-	Location = {Chicago, Illinois, USA},
-	Numpages = {12},
-	Pages = {573--584},
-	Publisher = {ACM},
-	Read = {1},
-	Series = {CCS '10},
-	Title = {DieHarder: securing the heap},
-	Url = {http://doi.acm.org/10.1145/1866307.1866371},
-	Year = {2010},
-	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1866307.1866371}}
-
-@inproceedings{Felleisen:1987:CAH:41625.41654,
-	Acmid = {41654},
-	Address = {New York, NY, USA},
-	Author = {Felleisen, Mattias and Friedman, D. P.},
-	Booktitle = {Proceedings of the 14th ACM SIGACT-SIGPLAN symposium on Principles of programming languages},
-	Date-Added = {2011-02-11 13:56:52 -0700},
-	Date-Modified = {2011-02-11 13:56:52 -0700},
-	Doi = {http://doi.acm.org/10.1145/41625.41654},
-	Isbn = {0-89791-215-2},
-	Location = {Munich, West Germany},
-	Pages = {314--},
-	Publisher = {ACM},
-	Series = {POPL '87},
-	Title = {A calculus for assignments in higher-order languages},
-	Url = {http://doi.acm.org/10.1145/41625.41654},
-	Year = {1987},
-	Bdsk-Url-1 = {http://doi.acm.org/10.1145/41625.41654}}
-
-@article{hochreiter_long_1997,
-    author = {Hochreiter, S. and Schmidhuber, J.},
-    title = {Long {Short-Term} Memory},
-    volume = {9},
-    number = {8},
-    journal = {Neural Computation},
-    year = {1997},
-    pages = {1735--1780}
-}
-
-@Article{py03,
-     author = {Xavier D\'ecoret},
-     title  = "PyBiTex",
-     year   = 2003
-}
-
-@Article{key03,
-  title = "A {bunch {of} braces {in}} title"
-}
-
-@Article{key01,
-  author = "Simon {"}the {saint"} Templar", 
-}
-
-@Article{key01,
-  title = "The history of @ sign"
-}
-
-Some {{comments} with unbalanced braces
-....and a "commented" entry...
-
-Book{landru21,
-  author =	 {Landru, Henri D\'esir\'e},
-  title =	 {A hundred recipes for you wife},
-  publisher =	 {Culinary Expert Series},
-  year =	 1921
-}
-
-..some other comments..before a valid entry...
-
-@Book{steward03,
-  author =	 { Martha Steward },
-  title =	 {Cooking behind bars},
-  publisher =	 {Culinary Expert Series},
-  year =	 2003
-}
-
-...and finally an entry commented by the use of the special @Comment entry type.
-
-@Comment{steward03,
-  author =	 {Martha Steward},
-  title =	 {Cooking behind bars},
-  publisher =	 {Culinary Expert Series},
-  year =	 2003
-}
-
-@Comment{
-  @Book{steward03,
-    author =	 {Martha Steward},
-    title =	 {Cooking behind bars},
-    publisher =	 {Culinary Expert Series},
-    year =	 2003
-  }
-}
-
-@String{mar = "march"}
-
-@Book{sweig42,
-  Author =	 { Stefan Sweig },
-  title =	 { The impossible book },
-  publisher =	 { Dead Poet Society},
-  year =	 1942,
-  month =        mar
-}
-
-@Book{sweig42a,
-  month =        "1~mar"
-}
-
-@Book{sweig42b,
-  month =        "1~" # mar
-}
-
-@Book{sweig42c,
-  month =        "1~" # mar # "a"
-}
-
-@preamble{"This bibliography was generated on \today"}
-
-@mastersthesis{salib:starkiller,
-  author = "Michael Salib",
-  title = "Starkiller: A Static Type Inferencer and Compiler for Python",
-  school = "Massachusetts Institute of Technology",
-  month = "May",
-  year = 2004
-}
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/info.rkt b/pkgs/scribble-pkgs/scribble-test/tests/scriblib/info.rkt
deleted file mode 100644
index 629436e3f0..0000000000
--- a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all mflatt)))
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/LICENSE.txt b/pkgs/scribble-pkgs/scribble-text-lib/LICENSE.txt
deleted file mode 100644
index f31116b71f..0000000000
--- a/pkgs/scribble-pkgs/scribble-text-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-scribble-text-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/info.rkt b/pkgs/scribble-pkgs/scribble-text-lib/info.rkt
deleted file mode 100644
index d75dabcc6a..0000000000
--- a/pkgs/scribble-pkgs/scribble-text-lib/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base" "at-exp-lib"))
-
-(define pkg-desc "Language for text with embedded Racket code")
-
-(define pkg-authors '(mflatt eli))
-
-(define version "1.1")
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/info.rkt b/pkgs/scribble-pkgs/scribble-text-lib/scribble/info.rkt
deleted file mode 100644
index 4ef453581a..0000000000
--- a/pkgs/scribble-pkgs/scribble-text-lib/scribble/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '(("text.rkt" eli)))
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text.rkt b/pkgs/scribble-pkgs/scribble-text-lib/scribble/text.rkt
deleted file mode 100644
index 36f57156f8..0000000000
--- a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require "text/main.rkt")
-(provide (all-from-out "text/main.rkt"))
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/lang.rkt b/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/lang.rkt
deleted file mode 100644
index 1a8bf8362c..0000000000
--- a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/lang.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-
-(require "syntax-utils.rkt" "output.rkt"
-         racket/promise racket/list racket/string)
-
-(provide (except-out (all-from-out racket/base) #%module-begin)
-         (all-from-out "output.rkt" racket/promise racket/list racket/string)
-         (rename-out [module-begin/text #%module-begin]
-                     [begin/text text] [include/text include]))
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/lang/reader.rkt
deleted file mode 100644
index 19581ab14e..0000000000
--- a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/lang/reader.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang s-exp syntax/module-reader
-
-scribble/text/lang
-
-#:read        scribble:read-inside
-#:read-syntax scribble:read-syntax-inside
-#:whole-body-readers? #t
-#:info        (scribble-base-reader-info)
-
-(require (prefix-in scribble: scribble/reader)
-         (only-in scribble/base/reader scribble-base-reader-info))
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/main.rkt b/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/main.rkt
deleted file mode 100644
index b6cdb1e95b..0000000000
--- a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/main.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-(require "output.rkt" "syntax-utils.rkt"
-         racket/promise racket/list racket/string)
-
-(provide (all-from-out "output.rkt" racket/promise racket/list racket/string)
-         begin/text include/text)
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/output.rkt b/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/output.rkt
deleted file mode 100644
index b1519341c0..0000000000
--- a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/output.rkt
+++ /dev/null
@@ -1,329 +0,0 @@
-#lang racket/base
-(require racket/promise
-         racket/contract/base)
-
-(provide
- outputable/c
- (contract-out 
-  [output (->* (outputable/c) (output-port?) void?)]))
-;; See also `provide-special` below
-
-;; Outputs values for the `scribble/text' language:
-;; - several atomic values are printed as in `display',
-;; - promises, thunks, and boxes are indirections for the value they contain
-;;   (useful in various cases),
-;; - some "special" values are used for controlling output (eg, flushing,
-;;   prefix changes, etc),
-;; - specifically, `block's delimit indentation levels, `splice's do not,
-;; - lists (more generally, pairs) are like either one depending on the context
-;;   (same as blocks/splices when inside a `block'/`splice'), at the toplevel
-;;   they default to blocks.
-;;
-;; Uses global state because `output' is wrapped around each expression in a
-;; scribble/text file so this is much more convenient than wrapping the whole
-;; module's body in a `list' (which will be difficult with definitions etc).
-;; The state is a pair of prefixes -- one that is the prefix for the current
-;; value (which gets extended with nested blocks), and the other is the prefix
-;; for the current "line" (which is reset after a newline).  The line-prefix is
-;; needed because a line can hold a block, which means that the line-prefix
-;; will apply for the contents of the block including newlines in it.  This
-;; state is associated with a port via a hash table.  Another state that is
-;; used is the port's column position, which is maintained by the system (when
-;; line counts are enabled) -- this is used to tell what part of a prefix is
-;; already displayed.
-;;
-;; Each prefix is either an integer (for a number of spaces) or a string.  The
-;; prefix mechanism can be disabled by using #f for the global prefix, and in
-;; this case the line prefix can have (cons pfx lpfx) so it can be restored --
-;; used by `disable-prefix' and `restore-prefix' resp.  (This is different from
-;; a 0 prefix -- #f means that no prefix will be accumulated).
-;;
-(define (output x [p (current-output-port)])
-  ;; these are the global prefix and the one that is local to the current line
-  (define pfxs (port->state p))
-  ;; the current mode for lists
-  (define list=block? #t)
-  ;; the low-level string output function (can change with `with-writer')
-  (define write write-string)
-  ;; to get the output column
-  (define (getcol) (let-values ([(line col pos) (port-next-location p)]) col))
-  ;; total size of the two prefixes
-  (define (2pfx-length pfx1 pfx2)
-    (if (and pfx1 pfx2)
-      (+ (if (number? pfx1) pfx1 (string-length pfx1))
-         (if (number? pfx2) pfx2 (string-length pfx2)))
-      0))
-  ;; combines a prefix with a target column to get to
-  (define (pfx+col pfx)
-    (and pfx (let ([col (getcol)])
-               (cond [(number? pfx) (max pfx col)]
-                     [(>= (string-length pfx) col) pfx]
-                     [else (string-append
-                            pfx (make-spaces (- col (string-length pfx))))]))))
-  ;; adds two prefixes
-  (define (pfx+ pfx1 pfx2)
-    (and pfx1 pfx2
-         (if (and (number? pfx1) (number? pfx2)) (+ pfx1 pfx2)
-             (string-append (if (number? pfx1) (make-spaces pfx1) pfx1)
-                            (if (number? pfx2) (make-spaces pfx2) pfx2)))))
-  ;; prints two prefixes
-  (define (output-pfx col pfx1 pfx2)
-    (define-syntax-rule (->str pfx) (if (number? pfx) (make-spaces pfx) pfx))
-    (define-syntax-rule (show pfx) ; optimize when not needed
-      (unless (eq? pfx 0) (write (->str pfx) p)))
-    (when (and pfx1 pfx2)
-      (if (eq? 0 col)
-        (begin (show pfx1) (show pfx2))
-        (let ([len1 (if (number? pfx1) pfx1 (string-length pfx1))])
-          (cond [(< col len1) (write (->str pfx1) p col) (show pfx2)]
-                [(= col len1) (show pfx2)]
-                [(eq? 0 pfx2)]
-                [else
-                 (let ([col (- col len1)]
-                       [len2 (if (number? pfx2) pfx2 (string-length pfx2))])
-                   (when (< col len2) (write (->str pfx2) p col)))])))))
-  ;; the basic printing unit: strings
-  (define (output-string x)
-    (define pfx (mcar pfxs))
-    (if (not pfx) ; prefix disabled?
-      (write x p)
-      (let ([len (string-length x)]
-            [nls (regexp-match-positions* #rx"\n" x)])
-        (let loop ([start 0] [nls nls] [lpfx (mcdr pfxs)] [col (getcol)])
-          (cond [(pair? nls)
-                 (define nl (car nls))
-                 (if (regexp-match? #rx"^ *$" x start (car nl))
-                   (newline p) ; only spaces before the end of the line
-                   (begin (output-pfx col pfx lpfx)
-                          (write x p start (cdr nl))))
-                 (loop (cdr nl) (cdr nls) 0 0)]
-                ;; last substring from here (always set lpfx state when done)
-                [(start . = . len)
-                 (set-mcdr! pfxs lpfx)]
-                [(col . > . (2pfx-length pfx lpfx))
-                 (set-mcdr! pfxs lpfx)
-                 ;; the prefix was already shown, no accumulation needed
-                 (write x p start)]
-                [else
-                 (define m (regexp-match-positions #rx"^ +" x start))
-                 ;; accumulate spaces to lpfx, display if it's not all spaces
-                 (define lpfx* (if m (pfx+ lpfx (- (cdar m) (caar m))) lpfx))
-                 (set-mcdr! pfxs lpfx*)
-                 (unless (and m (= len (cdar m)))
-                   (output-pfx col pfx lpfx*)
-                   ;; the spaces were already added to lpfx
-                   (write x p (if m (cdar m) start)))])))))
-  ;; blocks and splices
-  (define (output-block c)
-    (define pfx  (mcar pfxs))
-    (define lpfx (mcdr pfxs))
-    (define npfx (pfx+col (pfx+ pfx lpfx)))
-    (set-mcar! pfxs npfx) (set-mcdr! pfxs 0)
-    (if (list? c)
-      (for ([c (in-list c)]) (loop c))
-      (begin (loop (car c)) (loop (cdr c))))
-    (set-mcar! pfxs pfx) (set-mcdr! pfxs lpfx))
-  (define (output-splice c)
-    (for-each loop c))
-  ;; main loop
-  (define (loop x)
-    (cond
-      ;; no output for these
-      [(or (void? x) (not x) (null? x)) (void)]
-      ;; for lists and pairs the current line prefix is added to the global
-      ;; one, then output the contents recursively (no need to change the
-      ;; state, since we pass the values in the loop, and we'd need to restore
-      ;; it afterwards anyway)
-      [(pair? x) (if list=block? (output-block x) (output-splice x))]
-      ;; delayed values
-      [(and (procedure? x) (procedure-arity-includes? x 0)) (loop (x))]
-      [(promise? x) (loop (force x))]
-      [(box?     x) (loop (unbox x))]
-      ;; special output wrappers
-      [(special? x)
-       (define c (special-contents x))
-       (case (special-flag x)
-         ;; preserve tailness & avoid `set!' for blocks/splices if possible
-         [(block) (if list=block?
-                    (output-block c)
-                    (begin (set! list=block? #t)
-                           (output-block c)
-                           (set! list=block? #f)))]
-         [(splice) (if list=block?
-                     (begin (set! list=block? #f)
-                            (output-splice c)
-                            (set! list=block? #t))
-                     (output-splice c))]
-         [(flush) ; useful before `disable-prefix'
-          (output-pfx (getcol) (mcar pfxs) (mcdr pfxs))]
-         [(disable-prefix) ; save the previous pfxs
-          (define pfx  (mcar pfxs))
-          (define lpfx (mcdr pfxs))
-          (set-mcar! pfxs #f)  (set-mcdr! pfxs (cons pfx lpfx))
-          (for-each loop c)
-          (set-mcar! pfxs pfx) (set-mcdr! pfxs lpfx)]
-         [(restore-prefix) ; restore the previous pfxs
-          (define pfx  (mcar pfxs))
-          (define lpfx (mcdr pfxs))
-          (define npfx (pfx+col (if (and (not pfx) (pair? lpfx))
-                                  (pfx+ (car lpfx) (cdr lpfx))
-                                  (pfx+ pfx lpfx))))
-          (set-mcar! pfxs npfx)  (set-mcdr! pfxs 0)
-          (for-each loop c)
-          (set-mcar! pfxs pfx) (set-mcdr! pfxs lpfx)]
-         [(add-prefix) ; add to the current prefix (unless it's #f)
-          (define pfx  (mcar pfxs))
-          (define lpfx (mcdr pfxs))
-          (define npfx (pfx+ (pfx+col (pfx+ pfx lpfx)) (car c)))
-          (set-mcar! pfxs npfx) (set-mcdr! pfxs 0)
-          (for-each loop (cdr c))
-          (set-mcar! pfxs pfx) (set-mcdr! pfxs lpfx)]
-         [(set-prefix)
-          (define pfx  (mcar pfxs))
-          (define lpfx (mcdr pfxs))
-          (set-mcar! pfxs (car c)) (set-mcdr! pfxs 0)
-          (for-each loop (cdr c))
-          (set-mcar! pfxs pfx) (set-mcdr! pfxs lpfx)]
-         [(with-writer)
-          (define old write)
-          (set! write (or (car c) write-string))
-          (for-each loop (cdr c))
-          (set! write old)]
-         #; ; no need for this hack yet
-         [(with-writer-change)
-          ;; The function gets the old writer and return a new one (useful to
-          ;; save the current writer and restore it inside).  Could also be
-          ;; used to extend a writer, but that shows why a customizable writer
-          ;; is a bad choice: instead, it should be a list of substitutions
-          ;; that can be extended more conveniently.  A simple implementation
-          ;; would be to chain functions that do substitutions.  But that runs
-          ;; into problems when functions want to substitute the same thing,
-          ;; and worse: when the output of one function would get substituted
-          ;; again by another.  Another approach would be to join matcher
-          ;; regexps with "|" after wrapping each one with parens, then find
-          ;; out which one matched by looking at the result and applying its
-          ;; substitution, but the problem with that is that is that it forbids
-          ;; having parens in the regexps -- this could be fixed by not
-          ;; parenthesizing each expression, and instead running the found
-          ;; match against each of the input regexps to find the matching one,
-          ;; but that can be very inefficient.  Yet another issue is that in
-          ;; some cases we might *want* the "worse" feature mentioned earlier:
-          ;; for example, when we want to do some massaging of the input texts
-          ;; yet still have the result encoded for HTML output -- so perhaps
-          ;; the simple approach is still better.  The only difference from the
-          ;; current `with-writer' is using a substituting function, so it can
-          ;; be composed with the current one instead of replacing it
-          ;; completely.
-          (define old write)
-          (set! write ((car c) write))
-          (for-each loop (cdr c))
-          (set! write old)]
-         [else (error 'output "unknown special value flag: ~e"
-                      (special-flag x))])]
-      [else
-       (output-string
-        (cond [(string?  x) x]
-              [(bytes?   x) (bytes->string/utf-8 x)]
-              [(symbol?  x) (symbol->string      x)]
-              [(path?    x) (path->string        x)]
-              [(keyword? x) (keyword->string     x)]
-              [(number?  x) (number->string      x)]
-              [(char?    x) (string              x)]
-              ;; generic fallback: throw an error (could use `display' so new
-              ;; values can define how they're shown, but the same
-              ;; functionality can be achieved with thunks and prop:procedure)
-              [else (error 'output "don't know how to render value: ~v" x)]))]))
-  ;;
-  (port-count-lines! p)
-  (loop x)
-  (void))
-
-(define port->state
-  (let ([t (make-weak-hasheq)]
-        [last '(#f #f)]) ; cache for the last port, to avoid a hash lookup
-    (λ (p)
-      (if (eq? p (car last)) (cdr last)
-          (let ([s (or (hash-ref t p #f)
-                       (let ([s (mcons 0 0)]) (hash-set! t p s) s))])
-            (set! last (cons p s))
-            s)))))
-
-;; special constructs
-
-(define-struct special (flag contents))
-
-(define-syntax define/provide-special
-  (syntax-rules ()
-    [(_ (name))
-     (begin (provide (contract-out [name (->* () () #:rest (listof outputable/c) any/c)]))
-            (define (name . contents)
-              (make-special 'name contents)))]
-    [(_ (name [x ctc] ...))
-     (begin (provide (contract-out [name (->* (ctc ...) () #:rest (listof outputable/c) any/c)]))
-            (define (name x ... . contents)
-              (make-special 'name (list* x ... contents))))]
-    [(_ name)
-     (begin (provide name)
-            (define name (make-special 'name #f)))]))
-
-(define/provide-special (block))
-(define/provide-special (splice))
-(define/provide-special flush)
-(define/provide-special (disable-prefix))
-(define/provide-special (restore-prefix))
-(define/provide-special (add-prefix [pfx (or/c string? exact-nonnegative-integer?)]))
-(define/provide-special (set-prefix [pfx (or/c string? exact-nonnegative-integer?)]))
-(define/provide-special (with-writer [writer (or/c #f (->* (string? output-port?) (exact-nonnegative-integer?) any/c))]))
-#; ; no need for this hack yet
-(define/provide-special (with-writer-change writer))
-
-(define make-spaces ; (efficiently)
-  (let ([t (make-hasheq)] [v (make-vector 200 #f)])
-    (λ (n)
-      (or (if (< n 200) (vector-ref v n) (hash-ref t n #f))
-          (let ([spaces (make-string n #\space)])
-            (if (< n 200) (vector-set! v n spaces) (hash-set! t n spaces))
-            spaces)))))
-
-;; Convenient utilities
-
-(provide add-newlines)
-(define (add-newlines list #:sep [sep "\n"])
-  (define r
-    (let loop ([list list])
-      (if (null? list)
-        null
-        (let ([1st (car list)])
-          (if (or (not 1st) (void? 1st))
-            (loop (cdr list))
-            (list* sep 1st (loop (cdr list))))))))
-  (if (null? r) r (cdr r)))
-
-(provide split-lines)
-(define (split-lines list)
-  (let loop ([list list] [cur '()] [r '()])
-    (cond
-      [(null? list) (reverse (cons (reverse cur) r))]
-      [(equal? "\n" (car list)) (loop (cdr list) '() (cons (reverse cur) r))]
-      [else (loop (cdr list) (cons (car list) cur) r)])))
-
-(define outputable/c
-  (lambda (v) #t)
-  ;; too expensive:
-  #;
-  (recursive-contract
-   (or/c void?
-         #f
-         null?
-         (cons/c outputable/c outputable/c)
-         (-> outputable/c)
-         promise?
-         (box/c outputable/c)
-         special?
-         string?
-         bytes?
-         symbol?
-         path?
-         keyword?
-         number?
-         char?)))
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/syntax-utils.rkt b/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/syntax-utils.rkt
deleted file mode 100644
index da3a41777c..0000000000
--- a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/syntax-utils.rkt
+++ /dev/null
@@ -1,203 +0,0 @@
-#lang scheme/base
-
-(require "output.rkt" (for-syntax scheme/base syntax/kerncase))
-
-(provide module-begin/text begin/text include/text begin/collect
-         process-begin/text)
-
-(begin-for-syntax
-  (define definition-ids ; ids that don't require forcing
-    (syntax->list #'(define-values define-syntaxes begin-for-syntax
-                     require provide #%require #%provide #%declare)))
-  (define stoplist (append definition-ids (kernel-form-identifier-list)))
-  (define (definition-id? id)
-    (and (identifier? id)
-         (ormap (λ (i) (free-identifier=? id i)) definition-ids)))
-  (define (definition? x)
-    (syntax-case x () [(id . rest) (and (definition-id? #'id) #'id)] [_ #f]))
-  (define (begin?->list x)
-    (syntax-case x (begin) [(begin x ...) (syntax->list #'(x ...))] [_ #f]))
-  ;; This function is used to group a syntax list into triplets of consecutive
-  ;; scribble indentation syntaxes, an input expression, and scribble newlines.
-  ;; It is used to ignore indentations before a definition and newlines after
-  ;; it.  See the following test cases for how it works.
-  (define (group-by pred? xs fun)
-    (let loop ([xs xs] [before '()] [cur #f] [after '()] [r '()])
-      (define (add) (cons (fun (reverse before) cur (reverse after)) r))
-      (if (null? xs)
-        (reverse (if (or cur (pair? before) (pair? after)) (add) r))
-        (let* ([x (car xs)] [xs (cdr xs)] [p (pred? x)])
-          (cond [(eq? '> p) (loop xs before cur (cons x after) r)]
-                [(eq? '< p) (if (or cur (pair? after))
-                              (loop xs (list x) #f '() (add))
-                              (loop xs (cons x before) cur after r))]
-                [(or cur (pair? after)) (loop xs '() x '() (add))]
-                [else (loop xs before x '() r)])))))
-  (define (group-stxs stxs fun)
-    (group-by (λ (stx)
-                (define p (syntax-property stx 'scribble))
-                (cond [(and (pair? p) (eq? (car p) 'newline)) '>]
-                      [(eq? 'indentation p) '<]
-                      [else #f]))
-              stxs fun))
-  #; ; tests for this
-  (for-each
-   (λ (t)
-     (define r (group-by (λ (x)
-                           (cond [(number? x) '<] [(symbol? x) '>] [else #f]))
-                         (car t)
-                         list))
-     (unless (equal? r (cadr t)) (printf "FAILURE: ~s -> ~s\n" (car t) r)))
-   '([() ()]
-     [("a") ((() "a" ()))]
-     [("a" "b") ((() "a" ()) (() "b" ()))]
-     [(1 "a" x) (((1) "a" (x)))]
-     [(1 2 3 "a" x y z) (((1 2 3) "a" (x y z)))]
-     [(1 2 3 "a" "b" x y z) (((1 2 3) "a" ()) (() "b" (x y z)))]
-     [(1 2 "a" x 3 "b" y z) (((1 2) "a" (x)) ((3) "b" (y z)))]
-     [(1 2 "a" 3 "b" y z) (((1 2) "a" ()) ((3) "b" (y z)))]
-     [(1 2 "a" 3 x "b" y z) (((1 2) "a" ()) ((3) #f (x)) (() "b" (y z)))]
-     [(1 2 "a" 3 4 x "b" y z) (((1 2) "a" ()) ((3 4) #f (x)) (() "b" (y z)))]
-     [(1 2 "a" 3 w x "b" y z) (((1 2) "a" ()) ((3) #f (w x)) (() "b" (y z)))]
-     [(1) (((1) #f ()))]
-     [(x) ((() #f (x)))]
-     [(1 2 3) (((1 2 3) #f ()))]
-     [(x y z) ((() #f (x y z)))]
-     [(1 2 3 x y z) (((1 2 3) #f (x y z)))]
-     [(1 x 2 y 3 z) (((1) #f (x)) ((2) #f (y)) ((3) #f (z)))]
-     [(1 x y 2 3 z) (((1) #f (x y)) ((2 3) #f (z)))]
-     [(1 2 x 3) (((1 2) #f (x)) ((3) #f ()))]
-     [(w x 3 y z) ((() #f (w x)) ((3) #f (y z)))])))
-
-(define-syntax (toplevel-decorate stx)
-  (define context (syntax-local-context))
-  (syntax-case stx ()
-    [(this decor (pre ...) expr (post ...))
-     (let ([expr* (local-expand #'expr context stoplist)])
-       (define pre?  (not (null? (syntax-e #'(pre ...)))))
-       (define post? (not (null? (syntax-e #'(post ...)))))
-       (define (wrap expr)
-         (if (or pre? post?)
-           #`(begin #,@(if pre?  #'((decor 'pre)  ...) #'())
-                    #,expr
-                    #,@(if post? #'((decor 'post) ...) #'()))
-           expr))
-       (cond [(begin?->list expr*)
-              => (λ (xs)
-                   (if (null? xs)
-                     (if (or pre? post?)
-                       #'(begin (decor 'pre) ... (decor 'post) ...)
-                       expr*)
-                     #`(process-begin/text begin decor
-                                           pre ... #,@xs post ...)))]
-             [(definition? expr*) expr*] ; dump pre/post
-             [else (wrap #`(decor #,expr*))]))]))
-
-(define-syntax (process-begin/text stx)
-  (define (process-body decor body)
-    (group-stxs
-     (syntax->list body)
-     (λ (pre expr post)
-       (with-syntax ([decor decor])
-         (if (not expr) ; no need to decorate these
-           (with-syntax ([(x ...) (append pre post)]) #`(decor '(x ...)))
-           (with-syntax ([pre  pre]
-                         [post post])
-             #`(toplevel-decorate decor pre #,expr post)))))))
-  (syntax-case stx ()
-    [(_ beginner decor expr ...)
-     ;; add a dummy define and throw it away, to get rid of initial newlines
-     (with-syntax ([(_ expr ...) (process-body #'decor #'((define) expr ...))])
-       #'(beginner expr ...))]))
-
-;; module-begin for text files
-(define-syntax-rule (module-begin/text expr ...)
-  (#%plain-module-begin
-   (port-count-lines! (current-output-port))
-   (process-begin/text begin output expr ...)))
-
-;; `begin'-like utility that allows definitions and collects values
-(define-for-syntax (split-collect-body exprs ctx)
-  (let loop ([exprs exprs]      ; expressions to scan
-             [ds '()] [es '()]) ; collected definitions and expressions
-    (if (null? exprs)
-      (values (reverse ds) (reverse es) '())
-      (let ([expr* (local-expand (car exprs) ctx stoplist (car ctx))])
-        (syntax-case expr* (begin define-syntaxes define-values)
-          [(begin x ...)
-           (loop (append (syntax->list #'(x ...)) (cdr exprs)) ds es)]
-          [(define-syntaxes (id ...) rhs)
-           (andmap identifier? (syntax->list #'(id ...)))
-           (if (null? es)
-             (let ([ids (syntax->list #'(id ...))])
-               (syntax-local-bind-syntaxes
-                ids (local-transformer-expand #'rhs 'expression '()) (car ctx))
-               (loop (cdr exprs) (cons expr* ds) es))
-             ;; return the unexpanded expr, to be re-expanded later, in the
-             ;; right contexts
-             (values (reverse ds) (reverse es) exprs))]
-          [(define-values (id ...) rhs)
-           (andmap identifier? (syntax->list #'(id ...)))
-           (if (null? es)
-             (begin (syntax-local-bind-syntaxes
-                     (syntax->list #'(id ...)) #f (car ctx))
-                    (loop (cdr exprs) (cons expr* ds) es))
-             ;; same note here
-             (values (reverse ds) (reverse es) exprs))]
-          [_ (loop (cdr exprs) ds (cons expr* es))])))))
-(define-syntax (begin/collect* stx) ; helper, has a boolean flag first
-  (define-values [exprs always-list?]
-    (let ([exprs (syntax->list stx)])
-      (if (and (pair? exprs) (pair? (cdr exprs)))
-        (values (cddr exprs) (syntax-e (cadr exprs)))
-        (raise-syntax-error #f "bad syntax" stx))))
-  (define context
-    (cons (syntax-local-make-definition-context)
-          (let ([old (syntax-local-context)]) (if (list? old) old '()))))
-  (define-values (defns nondefns rest) (split-collect-body exprs context))
-  (define body
-    (cond [(pair? rest) #`(list* #,@nondefns (begin/collect* #t #,@rest))]
-          [(and (not always-list?) (= 1 (length nondefns))) (car nondefns)]
-          [else #`(list #,@nondefns)]))
-  (begin0
-   (local-expand (if (null? defns) body #`(let () #,@defns #,body))
-                 context stoplist (car context))
-   (internal-definition-context-seal (car context))))
-(define-syntax-rule (begin/collect x ...) (begin/collect* #f x ...))
-
-;; begin for templates (allowing definition blocks)
-(define-syntax (begin/text stx)
-  (syntax-case stx ()
-    [(begin/text expr ...)
-     #'(process-begin/text begin/collect begin expr ...)]))
-
-;; include for templates
-(require (for-syntax scheme/base (prefix-in scribble: scribble/reader) syntax/parse)
-         scheme/include)
-(define-syntax (include/text stx)
-  (syntax-case stx ()
-    [(_ path-spec)
-     (syntax/loc stx
-       (include/text #:command-char #f path-spec))]
-    [(_ #:command-char command-char path-spec)
-     (syntax/loc stx
-       (begin/text
-        (include-at/relative-to/reader 
-         path-spec path-spec path-spec
-         (let ([xs #f]
-               [command-char-v command-char])
-           (λ (src inp)
-             (unless xs
-               (set! xs (if command-char-v
-                          (scribble:read-syntax-inside #:command-char command-char-v src inp)
-                          (scribble:read-syntax-inside src inp)))
-               (when (syntax? xs) (set! xs (or (syntax->list xs) (list xs)))))
-             (if (null? xs)
-               eof
-               (let ([x (car xs)])
-                 (set! xs (cdr xs))
-                 (if (and (null? xs)
-                          (let ([p (syntax-property x 'scribble)])
-                            (and (pair? p) (eq? (car p) 'newline))))
-                   eof ; throw away the last newline from the included file
-                   x))))))))]))
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/wrap.rkt b/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/wrap.rkt
deleted file mode 100644
index b7336856f7..0000000000
--- a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/wrap.rkt
+++ /dev/null
@@ -1,105 +0,0 @@
-#lang racket/base
-
-(provide wrap-width wrap-line)
-
-;; The default wrap width for `wrape-line'.
-(define wrap-width (make-parameter 79))
-
-;; `wrap-line' wraps the `line' string into a list of strings that fit `width'
-;; characters.
-;;
-;; This is intended to be a building block for fancier wrappers -- for
-;; examples, ones that have a prefix for all lines, that indent/outdent of the
-;; first line, that treat some prefix regexp as a known indentation, that
-;; "squeeze" all whitespaces, that can be used as part of some other output and
-;; use the starting column to set the width, or even ones that take a multiline
-;; string and identify paragraphs to wrap individually.  For now, it's not
-;; intended to be used directly so it's only documented here -- this is likely
-;; to change if the interface is stable enough.
-;;
-;; `width' can be either a width or an improper list of widths, where the last
-;; element is used for the rest.  For example, (cons 72 70) indicates a width
-;; of 72 characters for the first line, and 70 for the rest.
-;;
-;; `split-word' controls what happens when a word is split: it is invoked with
-;; the word that is to be split, and an integer indicating how many characters
-;; could fit on the first line.  In most cases the string will be just a word,
-;; but if it was the first/last word with only spaces before/after it, then the
-;; string will have these spaces too.  It is expected to return three values:
-;; the first two are a string to put on the current line and a string that goes
-;; first on the next one.  Either of these can be `#f' to indicate nothing
-;; (this is different from returning "", since that will keep the spaces next
-;; to it).  The third result is relevant when the second result is longer than
-;; the wrapping width: #t indicates that the second result is considered a word
-;; and should not be rewrapped, and #f indicates that it can.  Spaces from the
-;; original string are preserved, even if there are more than one space between
-;; words; spaces between a word that moves to the next line and the preceding
-;; word are usually dropped, but they can be preserved too if the first result
-;; is "" rather than #f (and same for the space between a word that stays on
-;; the same line when the following word moves down).  If the first result is
-;; `#f' and it was the only word on the line, then the line that would
-;; otherwise be empty is dropped.  Note that depending on what `split-word'
-;; chooses to do, the result may still have lines that are longer than `width'
-;; characters.  The default `split-word' returns (values #f the-word #t).
-;;
-;; Side note: never returns an empty list.
-;;
-;; Caveats: considers only spaces as whitespace; not too efficient since it
-;; constructs intermediate strings for its processing; the need for the third
-;; boolean result from `split-word' is suspicious and might be dropped or
-;; changed.
-;;
-(define (wrap-line line [width* (wrap-width)] [split-word #f])
-  (define (loop str strs width*)
-    (define width (if (pair? width*) (car width*) width*))
-    (define strlen (string-length str))
-    (define (do-word s1 w1 w2 s2) ; s1--spaces--w1--word--w2--spaces--s2
-      (define w1* (if (eq? 0 s1) 0 w1))       ;\ w1*..w2* includes spaces
-      (define w2* (if (eq? strlen s2) s2 w2)) ;/ for first/last word
-      (define word (substring str w1* w2*))
-      (define-values [r1 r2 r3]
-        (if split-word (split-word word (- width w1*)) (values #f word #t)))
-      (let* ([1st (cond [r1 (string-append (substring str 0 w1*) r1)]
-                        [(eq? w1* 0) #f]
-                        [else (substring str 0 s1)])]
-             [strs (if 1st (cons 1st strs) strs)]
-             [width* (cond [(not r1) width*]
-                           [(pair? width*) (cdr width*)]
-                           [else width*])]
-             [2nd (and r2 r3
-                       (>= (string-length r2)
-                           (if (pair? width*) (car width*) width*))
-                       r2)]
-             [strs (if 2nd (cons 2nd strs) strs)]
-             [width* (cond [(not r2) width*]
-                           [(pair? width*) (cdr width*)]
-                           [else width*])]
-             [rst (cond [(and (not 2nd) r2)
-                         (string-append r2 (substring str w2*))]
-                        [(eq? w2* strlen) #f]
-                        [else (substring str s2)])])
-        (if rst (loop rst strs width*) (reverse strs))))
-    (cond
-      [(strlen . <= . width) (reverse (cons str strs))]
-      ;; wrapping point is inside a word
-      [(regexp-match-positions #rx"^([^ ][^ ]+) *" str (sub1 width))
-       => (λ (m2)
-            (define m1 (regexp-match-positions #rx" *([^ ]+)$" str 0 width))
-            (do-word (caar m1) (caadr m1) (cdadr m2) (cdar m2)))]
-      ;; wrapping point is probably between words
-      [(regexp-match-positions #rx" *([^ ]+) *$" str 0 width)
-       => (λ (m1)
-            (define m2 (regexp-match-positions #rx"[^ ]" str width))
-            (if m2 ; there is a following word, so we are between words
-              (loop (substring str (caar m2))
-                    (cons (substring str 0 (cdadr m1)) strs)
-                    (if (pair? width*) (cdr width*) width*))
-              ;; no following word, so the following spaces are part of a word
-              ;; that does need to be split
-              (do-word (caar m1) (caadr m1) strlen strlen)))]
-      ;; all spaces in first line => part of the following word
-      [(regexp-match-positions #rx"([^ ]+) *" str width)
-       => (λ (m) (do-word 0 (caar m) (cdadr m) (cdar m)))]
-      ;; no word at all => split the whole "word" (which is all spaces)
-      [else (do-word 0 0 strlen strlen)]))
-  (loop line '() width*))
diff --git a/pkgs/scribble-pkgs/scribble/LICENSE.txt b/pkgs/scribble-pkgs/scribble/LICENSE.txt
deleted file mode 100644
index ba83018dff..0000000000
--- a/pkgs/scribble-pkgs/scribble/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-scribble
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/scribble-pkgs/scribble/info.rkt b/pkgs/scribble-pkgs/scribble/info.rkt
deleted file mode 100644
index 79e4d45908..0000000000
--- a/pkgs/scribble-pkgs/scribble/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scribble-lib"
-               "scribble-doc"))
-(define implies '("scribble-lib"
-                  "scribble-doc"))
-
-(define pkg-desc "Racket documentatation and typesetting tool")
-
-(define pkg-authors '(mflatt eli))
diff --git a/pkgs/serialize-cstruct-lib/ffi/serialize-cstruct.rkt b/pkgs/serialize-cstruct-lib/ffi/serialize-cstruct.rkt
deleted file mode 100644
index d78402980f..0000000000
--- a/pkgs/serialize-cstruct-lib/ffi/serialize-cstruct.rkt
+++ /dev/null
@@ -1,248 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     racket/syntax
-                     racket/serialize
-                     syntax/parse
-                     syntax/stx)
-         racket/promise
-         racket/serialize
-         racket/runtime-path
-         ffi/unsafe
-         (only-in '#%foreign ctype-c->scheme))
-
-(provide (rename-out [prop:serialize-cstruct? serializable-cstruct?])
-         define-serializable-cstruct)
-
-
-(define-values (prop:serialize-cstruct prop:serialize-cstruct? prop:serialize-cstruct-ref)
-  (make-struct-type-property 'serialize-cstruct))
-
-
-(define cpointer-mapping (make-weak-hash))
-
-
-(define-syntax (define-serializable-cstruct stx)
-  (syntax-parse stx
-    [(_ _ID:id ([field-id:id type-expr:expr] ...)
-        (~or (~optional (~seq #:malloc-mode malloc-mode:expr)
-                        #:name "#:malloc-mode" #:defaults ([malloc-mode #'(quote atomic)]))
-             (~optional (~seq (~and #:serialize-inplace serialize-inplace-kw))
-                        #:name "#:serialize-inplace")
-             (~optional (~seq (~and #:deserialize-inplace deserialize-inplace-kw))
-                        #:name "#:deserialize-inplace")
-             (~optional (~seq #:alignment align-expr:expr)
-                        #:name "#:alignment")
-             (~seq #:property prop-expr:expr propval-expr:expr))
-        ...)
-
-     (unless (eq? (syntax-local-context) 'module)
-       (raise-syntax-error #f "only allowed in module context" stx))
-     (unless (stx-pair? #'(type-expr ...))
-       (raise-syntax-error #f "expected [field-id ctype] ..." stx))
-
-     (define id (string->symbol (cadr (or (regexp-match #rx"^_(.*)$" (symbol->string (syntax-e #'_ID)))
-                                          (raise-syntax-error #f "id must start with '_'" stx #'_ID)))))
-
-     (with-syntax ([_ID-pointer (format-id #'_ID "~a-pointer" #'_ID)]
-
-                   [(align ...)
-                    (if (attribute align-expr)
-                        (list '#:alignment (attribute align-expr))
-                        null)]
-                   [((props ...) ...)
-                    (map (lambda (p v)
-                           (when (free-identifier=? #'prop:serializable p)
-                             (raise-syntax-error #f "#:property prop:serializable not allowed" stx p))
-                           (list '#:property p v))
-                         (attribute prop-expr) (attribute propval-expr))]
-
-                   [(acc-list ...) (stx-map (lambda (e) (format-id #'_ID "~a-~a" id e))
-                                            #'(field-id ...))]
-                   [(mod-list ...) (stx-map (lambda (e) (format-id #'_ID "set-~a-~a!" id e))
-                                            #'(field-id ...))]
-
-                   [deser-ID (format-id #'_ID "deserialize:cstruct:~a" id)]
-                   [make-ID/mode (format-id #'_ID "make-~a/mode" id)]
-
-                   [serialize-inplace (and (attribute serialize-inplace-kw) #t)]
-                   [deserialize-inplace (and (attribute deserialize-inplace-kw) #t)])
-
-       (quasisyntax/loc stx
-         (begin
-           ;; the wrapped cstruct
-           (define-cstruct _ID ([field-id type-expr] ...)
-             align ...
-             props ... ...
-             #:property prop:serializable
-             (make-serialize-info
-              (lambda (s)
-                (force check-all-serializable)
-                (hash-set! cpointer-mapping s s)
-                (define inplace-bs (make-sized-byte-string s (ctype-sizeof _ID)))
-                (define bs
-                  (if serialize-inplace
-                      inplace-bs
-                      (let ([mem (malloc _ID 'atomic)])
-                        (memcpy mem inplace-bs 1 _ID)
-                        (make-sized-byte-string mem (ctype-sizeof _ID)))))
-                (vector bs (serialize-cstruct-pointers s)))
-              (quote-syntax deser-ID)
-              #t
-              (or (current-load-relative-directory) (current-directory)))
-             #:property prop:serialize-cstruct
-             (lambda () (values _ID (list acc-list ...) (list mod-list ...))))
-
-           ;; malloc according to malloc-mode
-           (define (malloc-ID)
-             (if (procedure? malloc-mode)
-                 (malloc-mode (ctype-sizeof _ID))
-                 (malloc _ID malloc-mode)))
-
-           ;; deserialization proc
-           #,@(if (eq? (syntax-local-context) 'module)
-                  #`((runtime-require (submod "." deserialize-info))
-                     (module+ deserialize-info (provide deser-ID)))
-                  null)
-           (define deser-ID (id->deserialize-info _ID _ID-pointer deserialize-inplace malloc-ID))
-
-           ;; mode-aware make-ID
-           (define (make-ID/mode field-id ...)
-             (define s (ptr-ref (malloc-ID) _ID))
-             (mod-list s field-id) ...
-             s)
-
-           ;; ctype serializable check (must be delayed to handle cyclic structs)
-           (define check-all-serializable
-             (delay
-               (let ([ctypes (list type-expr ...)])
-                 (for ([ct (in-list ctypes)]
-                       [t (in-list (ctype->layout _ID))]
-                       [n '(field-id ...)])
-                   (define base (ctype-layout-base-type t))
-
-                   ;; fpointer never possible
-                   (when (eq? base 'fpointer)
-                     (error 'serialize-cstruct "~a::~a of type ~a is not serializable" '_ID n t))
-
-                   ;; struct (ptr, embedded), maybe in array
-                   (when (or (list? base)
-                             (eq? base 'pointer))
-
-                     (define c->s (ctype-c->scheme (array-base-type ct)))
-                     (unless (and c->s (prop:serialize-cstruct? (c->s (malloc _pointer))))
-                       (error 'serialize-cstruct "~a::~a of type ~a is not serializable" '_ID n t)))))))  )))]))
-
-
-(define (array-base-type ct)
-  (if (vector? (ctype->layout ct))
-      (array-base-type (array-type ((ctype-c->scheme ct) #f)))
-      ct))
-
-
-(define (ctype-layout-base-type v)
-  (if (vector? v)
-      (ctype-layout-base-type (vector-ref v 0))
-      v))
-
-
-(define (id->deserialize-info _ID _ID-pointer deserialize-inplace malloc-ID)
-  (make-deserialize-info
-   (lambda (bs ptrs)
-     (define s
-       (if deserialize-inplace
-           (cast bs _bytes _ID-pointer)
-           (let ([mem (malloc-ID)])
-             (memcpy mem bs 1 _ID)
-             (cast mem _pointer _ID-pointer))))
-     (deserialize-cstruct-pointers s ptrs)
-     s)
-
-   (lambda ()
-     (define s (malloc-ID))
-     (values (cast s _pointer _ID-pointer)
-             (lambda (s0)
-               (memcpy s s0 1 _ID))))))
-
-
-(define ptr-types '(bytes string/ucs-4 string/utf-16 pointer))
-
-
-(define (serialize-cstruct-pointers o)
-  (define who 'serialize-cstruct-pointers)
-  (unless (prop:serialize-cstruct? o)
-    (raise-argument-error who "serializable-cstruct?" o))
-
-  (define-values (_ID accs mods) ((prop:serialize-cstruct-ref o)))
-
-  (define (serialize-basic t o)
-    (cond
-     [(list? t)
-      (and o (serialize-cstruct-pointers o))]
-
-     [(memq t ptr-types)
-      (unless (serializable? o)
-        (raise-argument-error who "serializable?" o))
-      (hash-ref! cpointer-mapping o o)]))
-
-  (for/vector ([t (in-list (ctype->layout _ID))]
-               [acc (in-list accs)]
-               #:when (let ([base (ctype-layout-base-type t)])
-                        (when (eq? base 'fpointer)
-                          (raise-argument-error who "serializable?" 'fpointer))
-                        (or (list? base)
-                            (memq base ptr-types))))
-
-    (define base (ctype-layout-base-type t))
-
-    (cond
-     [(vector? t)
-      (let loop ([ar (acc o)])
-        (define len (array-length ar))
-        (for/vector #:length len ([i (in-range len)])
-          (define v (array-ref ar i))
-          (if (array? v)
-              (loop v)
-              (serialize-basic base v))))]
-
-     [else
-      (serialize-basic t (acc o))])))
-
-
-(define (deserialize-cstruct-pointers o ptrs)
-  (unless (prop:serialize-cstruct? o)
-    (raise-argument-error 'deserialize-cstruct-pointers "serializable-cstruct?" o))
-
-  (define-values (_ID accs mods) ((prop:serialize-cstruct-ref o)))
-
-  (for ([acc (in-list accs)]
-        [mod (in-list mods)]
-        [t (in-list (ctype->layout _ID))]
-        [p (in-vector ptrs)])
-
-    (define base (ctype-layout-base-type t))
-    (cond
-     [(and (vector? t)
-           (or (memq base ptr-types)
-               (list? base)))
-
-      (let loop ([ar (acc o)]
-                 [pvec p]
-                 [sub-t t])
-        (define len (array-length ar))
-        (if (vector? (vector-ref sub-t 0))
-            (for ([i (in-range len)]
-                  [pv (in-vector pvec)])
-              (loop (array-ref ar i) pv (vector-ref sub-t 0)))
-            (for ([i (in-range len)]
-                  [pv (in-vector pvec)])
-              (if (list? base)
-                  (deserialize-cstruct-pointers (array-ref ar i) pv)
-                  (array-set! ar i pv)))))]
-
-
-     [(list? t)
-      (deserialize-cstruct-pointers (acc o) p)]
-
-     [(and p (memq t ptr-types))
-      (mod o p)])))
diff --git a/pkgs/serialize-cstruct-lib/info.rkt b/pkgs/serialize-cstruct-lib/info.rkt
deleted file mode 100644
index 9fa5a91edc..0000000000
--- a/pkgs/serialize-cstruct-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "serialization support for C structs")
-
-(define pkg-authors '("tobias.hammer@dlr.de"))
diff --git a/pkgs/sgl/LICENSE.txt b/pkgs/sgl/LICENSE.txt
deleted file mode 100644
index 83d7fed675..0000000000
--- a/pkgs/sgl/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-sgl
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/sgl/bitmap.rkt b/pkgs/sgl/bitmap.rkt
deleted file mode 100644
index 764fa02fa9..0000000000
--- a/pkgs/sgl/bitmap.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-
-(module bitmap mzscheme
-  (require mred
-           mzlib/class
-           sgl/gl-vectors
-           sgl
-           sgl/gl
-           mzlib/kw)
-  
-  (provide bitmap->gl-list)
-  
-  (define (argb->rgba argb)
-    (let* ((length (bytes-length argb))
-           (rgba (make-gl-ubyte-vector length)))
-      (let loop ((i 0))
-        (when (< i length)
-          (gl-vector-set! rgba (+ i 0) (bytes-ref argb (+ i 1)))
-          (gl-vector-set! rgba (+ i 1) (bytes-ref argb (+ i 2)))
-          (gl-vector-set! rgba (+ i 2) (bytes-ref argb (+ i 3)))
-          (gl-vector-set! rgba (+ i 3) (bytes-ref argb (+ i 0)))
-          (loop (+ i 4))))
-      rgba))
-  
-  (define (bitmap->argb bmp bmp-mask)
-    (let* ((width (send bmp get-width))
-           (height (send bmp get-height))
-           (argb (make-bytes (* 4 width height) 255)))
-      (send bmp get-argb-pixels 0 0 width height argb #f)
-      (when bmp-mask
-        (send bmp-mask get-argb-pixels 0 0 width height argb #t))
-      argb))
-  
-  (define/kw (bitmap->gl-list bm 
-                              #:key 
-                              [with-gl (lambda (f) (f))]
-                              [mask (send bm get-loaded-mask)])
-    (define w (send bm get-width))
-    (define h (send bm get-height))
-    (define rgba (argb->rgba (bitmap->argb bm mask)))
-    (with-gl
-     (lambda ()
-       (let ((tex (gl-vector-ref (glGenTextures 1) 0))
-             (list-id (gl-gen-lists 1)))
-         (glBindTexture GL_TEXTURE_2D tex)
-         (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MIN_FILTER GL_LINEAR)
-         (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MAG_FILTER GL_LINEAR)
-         (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_WRAP_S GL_CLAMP)
-         (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_WRAP_T GL_CLAMP)
-         (glTexImage2D GL_TEXTURE_2D 0 GL_RGBA w h 0
-                       GL_RGBA GL_UNSIGNED_BYTE rgba)
-         
-         (gl-new-list list-id 'compile)
-         (gl-enable 'texture-2d)
-         (glBindTexture GL_TEXTURE_2D tex)
-         (gl-material-v 'front 'ambient-and-diffuse
-                        (gl-float-vector 1 1 1 1))
-         (gl-begin 'polygon)
-         (gl-tex-coord 0.0 0.0)
-         (gl-vertex 0.0 0.0 0.0)
-         (gl-tex-coord 1.0 0.0)
-         (gl-vertex 1.0 0.0 0.0)
-         (gl-tex-coord 1.0 1.0)
-         (gl-vertex 1.0 1.0 0.0)
-         (gl-tex-coord 0.0 1.0)
-         (gl-vertex 0.0 1.0 0.0)
-         (gl-end)
-         (gl-disable 'texture-2d)
-         (gl-end-list)
-         
-         list-id)))))
diff --git a/pkgs/sgl/examples/alpha.rkt b/pkgs/sgl/examples/alpha.rkt
deleted file mode 100644
index c99a06b628..0000000000
--- a/pkgs/sgl/examples/alpha.rkt
+++ /dev/null
@@ -1,153 +0,0 @@
-;; By Brendan Burns
-(module alpha mzscheme
-  ;; Standard requires
-  (require 
-   mred
-   sgl/gl
-   sgl/gl-vectors
-   "gl-frame.rkt")
-  
-  ;; texture
-  ;; This needs to be here and not in gl-init because of some weirdness in the
-  ;; threading on windows causes the window to attempt to be drawn prior to the
-  ; texture being fully loaded.
-  (define *texture* (image->gl-vector (get-file)))
-  
-  ;; Init function
-  (define (my-gl-init)
-    (let ((res *texture*))
-      ;; Same texture, three smoothing styles...
-      (init-textures 3)
-      (unless (gl-load-texture (list-ref res 2) (list-ref res 0) (list-ref res 1)
-                               GL_NEAREST GL_NEAREST 0)
-        (error "Couldn't load texture"))
-      (unless (gl-load-texture (list-ref res 2) (list-ref res 0) (list-ref res 1)
-                               GL_LINEAR GL_LINEAR 1)
-        (error "Couldn't load texture"))
-      (unless (gl-load-texture (list-ref res 2) (list-ref res 0) (list-ref res 1)
-                               GL_LINEAR GL_LINEAR_MIPMAP_NEAREST 2)
-        (error "Couldn't load texture"))
-      
-      ;; Set-up alpha blending 50% transparency
-      (glColor4d 1 1 1 0.5)
-      (glBlendFunc GL_SRC_ALPHA GL_ONE)
-      (glEnable GL_BLEND)
-      
-      ;; Standard Init
-      (glEnable GL_TEXTURE_2D)
-      (glShadeModel GL_SMOOTH)
-      (glClearColor 0.0 0.0 0.0 0.5)
-      (glClearDepth 1)
-      (glEnable GL_DEPTH_TEST)
-      (glDepthFunc GL_LEQUAL)
-      (glHint GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST)
-      
-      ;; default light
-      (glEnable GL_LIGHT0)
-      (glEnable GL_LIGHTING)))
-  
-  ;; Our user interaction variables
-  (define *xrot* 0)
-  (define *yrot* 0)
-  (define *zrot* 0)
-  (define *z* -5)
-  (define *blend* #f)
-  (define *tex* 0)
-  
-  ;; Our main function that does the drawing
-  (define (my-gl-draw)
-    ;; erase the background
-    (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
-    ;; turn blending on/off
-    (if *blend* (glEnable GL_BLEND) (glDisable GL_BLEND))
-    
-    ;; draw cube.
-    (glLoadIdentity)
-    (glTranslated 0 0 *z*)
-    (glRotated *xrot* 1 0 0)
-    (glRotated *yrot* 0 1 0)
-    (glRotated *zrot* 0 0 1)
-    (glBindTexture GL_TEXTURE_2D (get-texture *tex*))
-    (glBegin GL_QUADS)
-    ; front
-    (glNormal3d 0 0 1)
-    (glTexCoord2i 0 0)
-    (glVertex3i -1 -1 1)
-    (glTexCoord2i 1 0)
-    (glVertex3i 1 -1 1)
-    (glTexCoord2i 1 1)
-    (glVertex3i 1 1 1)
-    (glTexCoord2i 0 1)
-    (glVertex3i -1 1 1)
-    ; back
-    (glNormal3d 0 0 -1)
-    (glTexCoord2i 1 0)
-    (glVertex3i -1 -1 -1)
-    (glTexCoord2i 1 1)
-    (glVertex3i 1 -1 -1)
-    (glTexCoord2i 0 1)
-    (glVertex3i 1 1 -1)
-    (glTexCoord2i 0 0)
-    (glVertex3i -1 1 -1)
-    ; top
-    (glNormal3d 0 1 0)
-    (glTexCoord2i 0 1)
-    (glVertex3i -1 1 -1)
-    (glTexCoord2i 0 0)
-    (glVertex3i 1 1 -1)
-    (glTexCoord2i 1 0)
-    (glVertex3i 1 1 1)
-    (glTexCoord2i 1 1)
-    (glVertex3i -1 1 1)
-    ; bottom
-    (glNormal3d 0 -1 0)
-    (glTexCoord2i 1 1)  
-    (glVertex3i -1 -1 -1)
-    (glTexCoord2i 0 1)
-    (glVertex3i -1 -1 1)
-    (glTexCoord2i 0 0)
-    (glVertex3i 1 -1 1)
-    (glTexCoord2i 1 0)
-    (glVertex3i 1 -1 -1)
-    ; right
-    (glNormal3d 1 0 0)
-    (glTexCoord2i 1 0)
-    (glVertex3i 1 -1 -1)
-    (glTexCoord2i 1 1)
-    (glVertex3i 1 -1 1)
-    (glTexCoord2i 0 1)
-    (glVertex3i 1 1 1)
-    (glTexCoord2i 0 0)
-    (glVertex3i 1 1 -1)
-    ;left
-    (glNormal3d -1 0 0)
-    (glTexCoord2i 0 0)
-    (glVertex3i -1 -1 -1)
-    (glTexCoord2i 1 0)
-    (glVertex3i -1 1 -1)
-    (glTexCoord2i 1 1)
-    (glVertex3i -1 1 1)
-    (glTexCoord2i 0 1)
-    (glVertex3i -1 -1 1)
-    
-    (glEnd)
-    (set! *xrot* (+ *xrot* 0.3))
-    (set! *yrot* (+ *yrot* 0.2))
-    (set! *zrot* (+ *zrot* 0.4))
-    
-    (glFlush))
-  
-  ;; Move forward
-  (add-key-mapping #\i (lambda () (set! *z* (+ *z* 0.3))))
-  ;; Move backward
-  (add-key-mapping #\k (lambda () (set! *z* (- *z* 0.3))))
-  ;; Turn blending on/off
-  (add-key-mapping #\b (lambda () (set! *blend* (not *blend*))))
-  ;; Cycle textures
-  (add-key-mapping #\t (lambda () (set! *tex* (modulo (+ *tex* 1) 3))))
-  
-  ;; Set the init function
-  (set-gl-init-fn my-gl-init)
-  ;; Set the draw function
-  (set-gl-draw-fn my-gl-draw)
-  (gl-run))
diff --git a/pkgs/sgl/examples/gears-bitmap.rkt b/pkgs/sgl/examples/gears-bitmap.rkt
deleted file mode 100644
index 3a9ba2841a..0000000000
--- a/pkgs/sgl/examples/gears-bitmap.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-(require racket/draw
-         racket/gui/base
-         racket/class
-         "gears.rkt")
-
-(define w 400)
-(define h 400)
-
-(define bm (make-gl-bitmap w h (new gl-config%)))
-(define gears (new gears%
-                   [with-gl-context
-                    (lambda (thunk)
-                      (send (send (send bm make-dc) get-gl-context)
-                            call-as-current
-                            thunk))]
-                   [swap-gl-buffers void]
-                   [refresh void]
-                   [verbose? #f]))
-(send gears set-size w h)
-(void (send gears draw))
-
-(define dest (build-path (find-system-path 'temp-dir) "gears.png"))
-(when (send bm save-file dest 'png)
-  (printf "wrote to ~a\n" dest))
diff --git a/pkgs/sgl/examples/gears.rkt b/pkgs/sgl/examples/gears.rkt
deleted file mode 100644
index be41e10f2d..0000000000
--- a/pkgs/sgl/examples/gears.rkt
+++ /dev/null
@@ -1,413 +0,0 @@
-#lang racket/base
-;; $Id: gears.rkt,v 1.8 2005/01/12 12:49:10 mflatt Exp $
-;;
-;; This is a version of the venerable "gears" demo for PLT Scheme 200 using
-;; Scott Owens' SGL OpenGL bindings.  It was ported from "glxgears.c" 1.3 from
-;; XFree86, which had the following notices:
-;;
-;;     Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
-;;
-;;     Permission is hereby granted, free of charge, to any person obtaining a
-;;     copy of this software and associated documentation files (the
-;;     "Software"), to deal in the Software without restriction, including
-;;     without limitation the rights to use, copy, modify, merge, publish,
-;;     distribute, sublicense, and/or sell copies of the Software, and to
-;;     permit persons to whom the Software is furnished to do so, subject to
-;;     the following conditions:
-;;
-;;     The above copyright notice and this permission notice shall be included
-;;     in all copies or substantial portions of the Software.
-;;
-;;     XFree86: xc/programs/glxgears/glxgears.c,v 1.3 2001/11/03 17:29:20 dawes
-;;
-;;     This is a port of the infamous "gears" demo to straight GLX (i.e. no
-;;     GLUT).  Port by Brian Paul 23 March 2001.
-;;
-;; To run, evaluate this file in DrRacket in the "module" language level,
-;; or execute "mred -qu gears.rkt" from your OS shell.
-;;
-;; Scheme port by Neil W. Van Dyke <neil@neilvandyke.org>, 23 November 2002.
-;; Originally called glxgears.rkt.  Minor modifications since.
-;; See "http://www.neilvandyke.org/opengl-plt/" for more information.
-;;
-;; Updated to newer sgl interface by Scott Owens
-
-(require racket/draw
-         racket/class
-         racket/math
-         sgl
-         sgl/gl-vectors)
-
-(provide gears%)
-
-(define controls? #t)
-
-(define gears%
-  (class object%
-    (init-field with-gl-context
-                swap-gl-buffers
-                refresh
-                verbose?)
-
-    (super-new)
-
-    (define rotation 0.0)
-
-    (define view-rotx 20.0)
-    (define view-roty 30.0)
-    (define view-rotz 0.0)
-
-    (define gear1 #f)
-    (define gear2 #f)
-    (define gear3 #f)
-
-    (define step? #f)
-
-    (define/public (ready?)
-      (and gear1 #t))
-
-    (define/public (run)
-      (set! step? #t)
-      (refresh))
-
-    (define/public (move-left)
-      (set! view-roty (+ view-roty 5.0))
-      (refresh))
-
-    (define/public (move-right)
-      (set! view-roty (- view-roty 5.0))
-      (refresh))
-
-    (define/public (move-up)
-      (set! view-rotx (+ view-rotx 5.0))
-      (refresh))
-
-    (define/public (move-down)
-      (set! view-rotx (- view-rotx 5.0))
-      (refresh))
-
-    (define (build-gear inner-radius    ; radius of hole at center
-                        outer-radius    ; radius at center of teeth
-                        width           ; width of gear
-                        teeth           ; number of teeth
-                        tooth-depth)    ; depth of tooth
-      (let* ((r0             inner-radius)
-             (r1             (- outer-radius (/ tooth-depth 2.0)))
-             (r2             (+ outer-radius (/ tooth-depth 2.0)))
-             (da             (/ (* 2.0 pi) teeth 4.0))
-             (da2            (* da 2))
-             (da3            (* da 3))
-             (half-width     (* width 0.5))
-             (neg-half-width (- half-width)))
-
-        ;; TODO: Generalize away some more redundant program text.
-
-        (gl-shade-model 'flat)
-
-        (gl-normal 0.0 0.0 1.0)
-
-	;; Draw front face.
-        (gl-begin 'quad-strip)
-        (do ((i 0 (+ 1 i))) ((> i teeth))
-          (let* ((angle     (/ (* i 2.0 pi) teeth))
-                 (cos-angle (cos angle))
-                 (sin-angle (sin angle)))
-            (gl-vertex (* r0 cos-angle) (* r0 sin-angle) half-width)
-            (gl-vertex (* r1 cos-angle) (* r1 sin-angle) half-width)
-            (when (< i teeth)
-              (gl-vertex (* r0 cos-angle)
-                            (* r0 sin-angle)
-                            (* half-width))
-              (gl-vertex (* r1 (cos (+ angle da3)))
-                            (* r1 (sin (+ angle da3)))
-                            half-width))))
-        (gl-end)
-
-        ;; Draw front sides of teeth.
-        (gl-begin 'quads)
-        (do ((i 0 (+ 1 i))) ((= i teeth))
-          (let ((angle (/ (* i 2.0 pi) teeth)))
-            (gl-vertex (* r1 (cos angle))
-                       (* r1 (sin angle))
-                       half-width)
-            (gl-vertex (* r2 (cos (+ angle da)))
-                       (* r2 (sin (+ angle da)))
-                       half-width)
-            (gl-vertex (* r2 (cos (+ angle da2)))
-                       (* r2 (sin (+ angle da2)))
-                       half-width)
-            (gl-vertex (* r1 (cos (+ angle da3)))
-                       (* r1 (sin (+ angle da3)))
-                       half-width)))
-        (gl-end)
-
-        (gl-normal 0.0 0.0 -1.0)
-
-        ;; Draw back face.
-        (gl-begin 'quad-strip)
-        (do ((i 0 (+ 1 i))) ((> i teeth))
-          (let* ((angle     (/ (* i 2.0 pi) teeth))
-                 (cos-angle (cos angle))
-                 (sin-angle (sin angle)))
-            (gl-vertex (* r1 cos-angle) (* r1 sin-angle) neg-half-width)
-            (gl-vertex (* r0 cos-angle) (* r0 sin-angle) neg-half-width)
-            (when (< i teeth)
-              (gl-vertex (* r1 (cos (+ angle da3)))
-                         (* r1 (sin (+ angle da3)))
-                         neg-half-width)
-              (gl-vertex (* r0 cos-angle)
-                         (* r0 sin-angle)
-                         neg-half-width))))
-        (gl-end)
-
-        ;; Draw back sides of teeth.
-        (gl-begin 'quads)
-        (do ((i 0 (+ 1 i))) ((= i teeth))
-          (let ((angle (/ (* i 2.0 pi) teeth)))
-            (gl-vertex (* r1 (cos (+ angle da3)))
-                       (* r1 (sin (+ angle da3)))
-                       neg-half-width)
-            (gl-vertex (* r2 (cos (+ angle da2)))
-                       (* r2 (sin (+ angle da2)))
-                       neg-half-width)
-            (gl-vertex (* r2 (cos (+ angle da)))
-                       (* r2 (sin (+ angle da)))
-                       neg-half-width)
-            (gl-vertex (* r1 (cos angle))
-                       (* r1 (sin angle))
-                       neg-half-width)))
-        (gl-end)
-
-        ;; Draw outward faces of teeth.
-        (gl-begin 'quad-strip)
-        (do ((i 0 (+ 1 i))) ((= i teeth))
-          (let* ((angle     (/ (* i 2.0 pi) teeth))
-                 (cos-angle (cos angle))
-                 (sin-angle (sin angle)))
-
-            (gl-vertex (* r1 cos-angle) (* r1 sin-angle) half-width)
-            (gl-vertex (* r1 cos-angle) (* r1 sin-angle) neg-half-width)
-
-            (let* ((u   (- (* r2 (cos (+ angle da))) (* r1 cos-angle)))
-                   (v   (- (* r2 (sin (+ angle da))) (* r1 sin-angle)))
-                   (len (sqrt (+ (* u u) (* v v)))))
-              (gl-normal (/ v len) (- (/ u len)) 0.0))
-
-            (gl-vertex (* r2 (cos (+ angle da)))
-                       (* r2 (sin (+ angle da)))
-                       half-width)
-            (gl-vertex (* r2 (cos (+ angle da)))
-                       (* r2 (sin (+ angle da)))
-                       neg-half-width)
-            (gl-normal cos-angle sin-angle 0.0)
-            (gl-vertex (* r2 (cos (+ angle da2)))
-                       (* r2 (sin (+ angle da2)))
-                       half-width)
-            (gl-vertex (* r2 (cos (+ angle da2)))
-                       (* r2 (sin (+ angle da2)))
-                       neg-half-width)
-
-            (let ((u (- (* r1 (cos (+ angle da3)))
-                        (* r2 (cos (+ angle da2)))))
-                  (v (- (* r1 (sin (+ angle da3)))
-                        (* r2 (sin (+ angle da2))))))
-              (gl-normal v (- u) 0.0))
-
-            (gl-vertex (* r1 (cos (+ angle da3)))
-                       (* r1 (sin (+ angle da3)))
-                       half-width)
-            (gl-vertex (* r1 (cos (+ angle da3)))
-                       (* r1 (sin (+ angle da3)))
-                       neg-half-width)
-            (gl-normal cos-angle sin-angle 0.0)))
-
-        (gl-vertex (* r1 (cos 0)) (* r1 (sin 0)) half-width)
-        (gl-vertex (* r1 (cos 0)) (* r1 (sin 0)) neg-half-width)
-        (gl-end)
-
-        (gl-shade-model 'smooth)
-
-        ;; Draw inside radius cylinder.
-        (gl-begin 'quad-strip)
-        (do ((i 0 (+ 1 i))) ((> i teeth))
-          (let* ((angle     (/ (* i 2.0 pi) teeth))
-                 (cos-angle (cos angle))
-                 (sin-angle (sin angle)))
-            (gl-normal (- cos-angle) (- sin-angle) 0.0)
-            (gl-vertex (* r0 cos-angle) (* r0 sin-angle) neg-half-width)
-            (gl-vertex (* r0 cos-angle) (* r0 sin-angle) half-width)))
-        (gl-end)))
-
-    (define/public (set-size width height)
-      (with-gl-context
-       (lambda ()
-
-         (when verbose?
-           (unless gear1
-             (printf "  RENDERER:   ~A\n" (gl-get-string 'renderer))
-             (printf "  VERSION:    ~A\n" (gl-get-string 'version))
-             (printf "  VENDOR:     ~A\n" (gl-get-string 'vendor))
-             (printf "  EXTENSIONS: ~A\n" (gl-get-string 'extensions))))
-
-         (gl-viewport 0 0 width height)
-         (gl-matrix-mode 'projection)
-         (gl-load-identity)
-         (let ((h (/ height width)))
-           (gl-frustum -1.0 1.0 (- h) h 5.0 60.0))
-         (gl-matrix-mode 'modelview)
-         (gl-load-identity)
-         (gl-translate 0.0 0.0 -40.0)
-
-         (gl-light-v 'light0 'position (vector->gl-float-vector
-                                        (vector 5.0 5.0 10.0 0.0)))
-         (gl-enable 'cull-face)
-         (gl-enable 'lighting)
-         (gl-enable 'light0)
-         (gl-enable 'depth-test)
-
-         (unless gear1
-
-           (set! gear1 (gl-gen-lists 1))
-           (gl-new-list gear1 'compile)
-           (gl-material-v 'front
-                           'ambient-and-diffuse
-                           (vector->gl-float-vector (vector 0.8 0.1 0.0 1.0)))
-           (build-gear 1.0 4.0 1.0 20 0.7)
-           (gl-end-list)
-
-           (set! gear2 (gl-gen-lists 1))
-           (gl-new-list gear2 'compile)
-           (gl-material-v 'front
-                           'ambient-and-diffuse
-                           (vector->gl-float-vector (vector 0.0 0.8 0.2 1.0)))
-           (build-gear 0.5 2.0 2.0 10 0.7)
-           (gl-end-list)
-
-           (set! gear3 (gl-gen-lists 1))
-           (gl-new-list gear3 'compile)
-           (gl-material-v 'front
-                           'ambient-and-diffuse
-                           (vector->gl-float-vector (vector 0.2 0.2 1.0 1.0)))
-           (build-gear 1.3 2.0 0.5 10 0.7)
-           (gl-end-list)
-
-           (gl-enable 'normalize))))
-      (refresh))
-    
-    (define/public (draw)
-      (when gear1
-	(when step?
-	  ;; TODO: Don't increment this infinitely.
-	  (set! rotation (+ 2.0 rotation)))
-	(with-gl-context
-	 (lambda ()
-
-	   (gl-clear-color 0.0 0.0 0.0 0.0)
-	   (gl-clear 'color-buffer-bit 'depth-buffer-bit)
-
-	   (gl-push-matrix)
-	   (gl-rotate view-rotx 1.0 0.0 0.0)
-	   (gl-rotate view-roty 0.0 1.0 0.0)
-	   (gl-rotate view-rotz 0.0 0.0 1.0)
-
-	   (gl-push-matrix)
-	   (gl-translate -3.0 -2.0 0.0)
-	   (gl-rotate rotation 0.0 0.0 1.0)
-	   (gl-call-list gear1)
-	   (gl-pop-matrix)
-
-	   (gl-push-matrix)
-	   (gl-translate 3.1 -2.0 0.0)
-	   (gl-rotate (- (* -2.0 rotation) 9.0) 0.0 0.0 1.0)
-	   (gl-call-list gear2)
-	   (gl-pop-matrix)
-
-	   (gl-push-matrix)
-	   (gl-translate -3.1 4.2 0.0)
-	   (gl-rotate (- (* -2.0 rotation) 25.0) 0.0 0.0 1.0)
-	   (gl-call-list gear3)
-	   (gl-pop-matrix)
-
-	   (gl-pop-matrix)
-
-	   (swap-gl-buffers)
-	   (gl-flush))))
-      (cond
-       [step?
-        (set! step? #f)
-        #t]
-       [else #f]))))
-
-(module+ main
-  (require racket/gui/base)
-  
-  (define gears-canvas%
-    (class* canvas% ()
-      (inherit refresh with-gl-context swap-gl-buffers get-parent
-               get-top-level-window)
-
-      (define gears (new gears%
-                         [with-gl-context
-                          (lambda (thunk)
-                            (with-gl-context
-                             #:fail (lambda () (report-no-gl))
-                             thunk))]
-                         [swap-gl-buffers
-                          (lambda () (swap-gl-buffers))]
-                         [refresh
-                          (lambda () (refresh))]
-                         [verbose? #t]))
-
-      (define/public (get-gears) gears)
-      
-      (super-new [style '(gl no-autoclear)])
-
-      (define/private (report-no-gl)
-        (message-box "Gears"
-                     (string-append
-                      "There was an error initializing OpenGL. "
-                      "Maybe OpenGL is not supported on the current platform.")
-                     (get-top-level-window)
-                     '(ok stop))
-        (exit 1))
-
-      (define/override (on-size width height)
-        (send gears set-size width height))
-
-      (define sec (current-seconds))
-      (define frames 0)
-      
-      (define/override (on-paint)
-        (when (send gears ready?)
-          (when (>= (- (current-seconds) sec) 5)
-            (send (get-parent) set-status-text (format "~a fps" (/ (exact->inexact frames) 5)))
-            (set! sec (current-seconds))
-            (set! frames 0))
-          (set! frames (add1 frames))
-          
-          (when (send gears draw)
-            (queue-callback (lambda x (send gears run)) #f))))))
-
-  (let* ((f (new frame% [label "gears.rkt"]))
-         (c (new gears-canvas% (parent f) (min-width 300) (min-height 300))))
-    (define g (send c get-gears))
-    (send f create-status-line)
-    (when controls?
-      (let ((h (instantiate horizontal-panel% (f)
-                 (alignment '(center center)) (stretchable-height #f))))
-        (instantiate button%
-          ("Start" h (lambda (b e) (send b enable #f) (send g run)))
-          (stretchable-width #t) (stretchable-height #t))
-        (let ((h (instantiate horizontal-panel% (h)
-                   (alignment '(center center)))))
-          (instantiate button% ("Left" h (lambda x (send g move-left)))
-            (stretchable-width #t))
-          (let ((v (instantiate vertical-panel% (h)
-                     (alignment '(center center)) (stretchable-width #f))))
-            (instantiate button% ("Up" v (lambda x (send g move-up)))
-              (stretchable-width #t))
-            (instantiate button% ("Down" v (lambda x (send g move-down)))
-              (stretchable-width #t)))
-          (instantiate button% ("Right" h (lambda x (send g move-right)))
-            (stretchable-width #t)))))
-    (send f show #t)))
diff --git a/pkgs/sgl/examples/gl-frame.rkt b/pkgs/sgl/examples/gl-frame.rkt
deleted file mode 100644
index 59d098d2bc..0000000000
--- a/pkgs/sgl/examples/gl-frame.rkt
+++ /dev/null
@@ -1,151 +0,0 @@
-;; By Brendan Burns, with modifications by Scott Owens
-(module gl-frame racket/gui
-  (require sgl/gl
-           sgl/gl-vectors)
-  (provide set-gl-draw-fn
-           set-gl-init-fn
-           init-textures
-           image->gl-vector
-           bitmap->gl-vector
-           gl-load-texture
-           get-texture
-           add-key-mapping
-           clear-key-mappings
-           gl-run)
-  
-  (define gl-draw void)
-  (define gl-init 
-    (lambda ()
-      (glShadeModel GL_SMOOTH)
-      (glClearColor 0.0 0.0 0.0 0.5)
-      (glClearDepth 1)
-      (glEnable GL_DEPTH_TEST)
-      (glDepthFunc GL_LEQUAL)
-      (glHint GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST)))
-  
-  (define (set-gl-draw-fn fn)
-    (set! gl-draw fn))
-  
-  (define (set-gl-init-fn fn)
-    (set! gl-init fn))
-    
-  ;; A function that recorrects for a new aspect ratio when the window is resized
-  (define (gl-resize width height)
-    (glViewport 0 0 width height)
-    
-    (glMatrixMode GL_PROJECTION)
-    (glLoadIdentity)
-    (gluPerspective 45 (/ width height) 0.1 100)
-    
-    (glMatrixMode GL_MODELVIEW)
-    (glLoadIdentity))
-  
-  (define (recursive-handle-key list code)
-    (cond
-      ((empty? list) void)
-      ((equal? (caar list) code) ((car (cdr (car list)))))
-      (else (recursive-handle-key (rest list) code))))
-  
-  (define *key-mappings* '())
-  
-  (define (add-key-mapping key fn)
-    (set! *key-mappings* (cons (list key fn) *key-mappings*)))
-  
-  (define (clear-key-mappings)
-    (set! *key-mappings* '()))
-  
-  (define (gl-handlekey key)
-    (recursive-handle-key *key-mappings* (send key get-key-code)))
-  
-  (define glcanvas%
-    (class canvas%
-      (inherit refresh with-gl-context swap-gl-buffers)
-
-      (define init? #f)
-      (define/override (on-paint)
-        (with-gl-context 
-         (lambda ()
-           (unless init?
-             (gl-init)
-             (set! init? #t))
-           (gl-draw)
-           (swap-gl-buffers)))
-        (queue-callback (lambda () (refresh)) #f))
-      
-      (define/override (on-size w h)
-        (with-gl-context 
-         (lambda ()
-           (gl-resize w h)))
-        (refresh))
-      
-      (define/override (on-char key)
-        (gl-handlekey key)
-        (refresh))
-      (super-new (style '(gl no-autoclear)))))
-  
-  (define (gl-run)
-    (let* ((frame (new frame% (label "OpenGL Window") 
-                              (width 640) 
-                              (height 480)))
-           (glcanvas (new glcanvas% (parent frame))))
-      (unless (send (send (send glcanvas get-dc) get-gl-context) ok?)
-        (display "Error: OpenGL context failed to initialize")
-        (newline)
-        (exit))
-      (send frame show #t)))
-  
-  (define *textures* '())
-  
-  (define init-textures
-    (lambda (count)
-      (set! *textures* (glGenTextures count))))
-  
-  (define (bitmap->gl-vector bmp)
-    (let* (
-           (dc (instantiate bitmap-dc% (bmp)))
-           (pixels (* (send bmp get-width) (send bmp get-height)))
-           (vec (make-gl-ubyte-vector (* pixels 3)))
-           (data (make-bytes (* pixels 4)))
-           (i 0)
-           )
-      (send dc get-argb-pixels 0 0 (send bmp get-width) (send bmp get-height) data)
-      (letrec
-          ([loop
-            (lambda ()
-              (when (< i pixels)
-                  (begin
-                    (gl-vector-set! vec (* i  3) 
-                                    (bytes-ref data (+ (* i 4) 1)))
-                    (gl-vector-set! vec (+ (* i 3) 1) 
-                                    (bytes-ref data (+ (* i 4) 2)))
-                    (gl-vector-set! vec (+ (* i 3) 2) 
-                                    (bytes-ref data (+ (* i 4) 3)))
-                    (set! i (+ i 1))
-                    (loop))))])
-        (loop))
-      (send dc set-bitmap #f)
-      (list (send bmp get-width) (send bmp get-height) vec)))
-  
-  (define (image->gl-vector file) (bitmap->gl-vector (make-object bitmap% file 'unknown #f)))
-  
-  (define gl-load-texture
-    (lambda (image-vector width height min-filter mag-filter ix)
-      (glBindTexture GL_TEXTURE_2D (gl-vector-ref *textures* ix))
-      (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MIN_FILTER min-filter)
-      (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MAG_FILTER mag-filter)
-      (let* ((new-width 128)
-             (new-height 128)
-             (new-img-vec (make-gl-ubyte-vector (* new-width new-height 3))))
-        (gluScaleImage GL_RGB
-                       width height GL_UNSIGNED_BYTE image-vector
-                       new-width new-height GL_UNSIGNED_BYTE new-img-vec)
-        (if (or (= min-filter GL_LINEAR_MIPMAP_NEAREST)
-                (= mag-filter GL_LINEAR_MIPMAP_NEAREST))
-            (gluBuild2DMipmaps GL_TEXTURE_2D 3 new-width new-height GL_RGB GL_UNSIGNED_BYTE new-img-vec)
-            (glTexImage2D GL_TEXTURE_2D 0 3 new-width new-height 0 GL_RGB GL_UNSIGNED_BYTE new-img-vec))))
-    )
-  
-  (define get-texture
-    (lambda (ix)
-      (gl-vector-ref *textures* ix)))
-  )
diff --git a/pkgs/sgl/gl-types.rkt b/pkgs/sgl/gl-types.rkt
deleted file mode 100644
index 163159ce86..0000000000
--- a/pkgs/sgl/gl-types.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/base
-(require ffi/unsafe
-         ffi/cvector)
-
-(provide (all-defined-out))
-
-(define _float*
-  (make-ctype _float 
-              (lambda (n)
-                (if (exact? n)
-                    (exact->inexact n)
-                    n))
-              #f))
-
-(define (make-gl-vector-type t)
-  (make-ctype _cvector
-              (lambda (sval)
-                (unless (cvector? sval)
-                  (raise-type-error 'Scheme->C "cvector" sval))
-                (unless (eq? (cvector-type sval) t)
-                  (error 'Scheme->C "wrong kind of cvector"))
-                sval)
-              #f))
-
-;; Beware of problems with these type definitions.
-;; They seem to be right for all currently supported
-;; platforms, but in principle they can differ.
-
-(define _gl-byte _int8)
-(define _gl-ubyte _uint8)
-(define _gl-short _int16)
-(define _gl-ushort _uint16)
-(define _gl-int _int)
-(define _gl-uint _uint)
-(define _gl-boolean (make-ctype _int8
-                                (lambda (x)
-                                  (if x 1 0))
-                                (lambda (x) (not (= x 0)))))
-(define _gl-sizei _int)
-(define _gl-enum _int)
-(define _gl-bitfield _uint)
-(define _gl-float _float*)
-(define _gl-double _double*)
-(define _gl-clampf _float*)
-(define _gl-clampd _double*)
-
-(define _gl-bytev (make-gl-vector-type _gl-byte))
-(define _gl-ubytev (make-gl-vector-type _gl-ubyte))
-(define _gl-shortv (make-gl-vector-type _gl-short))
-(define _gl-ushortv (make-gl-vector-type _gl-ushort))
-(define _gl-intv (make-gl-vector-type _gl-int))
-(define _gl-uintv (make-gl-vector-type _gl-uint))
-(define _gl-booleanv (make-gl-vector-type _gl-boolean))
-(define _gl-floatv (make-gl-vector-type _gl-float))
-(define _gl-doublev (make-gl-vector-type _gl-double))
-(define _gl-voidv _cvector)
-
diff --git a/pkgs/sgl/gl-vectors.rkt b/pkgs/sgl/gl-vectors.rkt
deleted file mode 100644
index 2e92eb84a1..0000000000
--- a/pkgs/sgl/gl-vectors.rkt
+++ /dev/null
@@ -1,143 +0,0 @@
-(module gl-vectors mzscheme
-  (require mzlib/foreign
-           (only racket/base for/list in-list in-naturals)
-           "gl-types.rkt")
-  
-  (define-syntax gl-vector-binop
-    (syntax-rules ()
-      ((_ op name make-res)
-       (case-lambda
-         ((v)
-          (unless (gl-vector? v)
-            (raise-argument-error name "gl-vector?" v))
-          (let* ((l (cvector-length v))
-                 (res (make-res l)))
-            (let loop ((i 0))
-              (when (< i l)
-                (cvector-set! res i (op (cvector-ref v i)))
-                (loop (add1 i)))
-              res)))
-         ((v1 v2)
-          (unless (gl-vector? v1)
-           (raise-argument-error name "gl-vector?" 0 v1 v2))
-          (unless (gl-vector? v2)
-            (raise-argument-error name "gl-vector?" 1 v1 v2))
-          (unless (= (cvector-length v1) (cvector-length v2))
-            (raise-arguments-error name 
-                                   "given gl-vector arguments of unequal lengths" 
-                                   "first argument length" (cvector-length v1)
-                                   "second argument length" (cvector-length v2)))
-          (let* ((l (cvector-length v1))
-                 (t (cvector-type v1))
-                 (res (make-res l)))
-            (let loop ((i 0))
-              (when (< i l)
-                (cvector-set! res i (op (cvector-ref v1 i) (cvector-ref v2 i)))
-                (loop (add1 i))))
-            res))
-         ((v . vs)
-          (let ((all-v (cons v vs)))
-            (unless (andmap gl-vector? all-v)
-              (let loop ((i 0)
-                         (to-check all-v))
-                (unless (null? to-check)
-                  (unless (gl-vector? (car to-check))
-                    (apply raise-argument-error (list* name "gl-vector?" i all-v)))
-                  (loop (add1 i) (cdr to-check)))))
-            (let ((l (cvector-length v)))
-              (unless (andmap (lambda (x) (= l (cvector-length x))) vs)
-                (apply raise-arguments-error name 
-                       "given gl-vector arguments of unequal lengths"
-                       (apply
-                        append
-                        (for/list ([v (in-list all-v)]
-                                   [i (in-naturals 1)])
-                          (list (format "argument ~a" i)
-                                v)))))
-              (let ((res (make-res l)))
-                (let loop ((i 0))
-                  (when (< i l)
-                    (cvector-set! res i (apply op (map (lambda (x) (cvector-ref x i))
-                                                      all-v)))
-                    (loop (add1 i))))
-                res))))))))
-                    
-  (define-for-syntax (d->so stx str)
-    (datum->syntax-object stx (string->symbol str)))
-  
-  (define-syntax (define-gl-vector stx)
-    (syntax-case stx ()
-      ((_ type)
-       (let ((t (syntax-object->datum #'type)))
-         (with-syntax (((v? make-v v vector->v list->v v+ v- v*)
-                        (map
-                         (lambda (fmt)
-                           (d->so #'type (format fmt t)))
-                         '("gl-~a-vector?" "make-gl-~a-vector" "gl-~a-vector"
-                           "vector->gl-~a-vector" "list->gl-~a-vector"
-                           "gl-~a-vector+" "gl-~a-vector-" "gl-~a-vector*")))
-                       (gl-type (d->so #'type (format "_gl-~a" t)))
-                       (gl-vtype (d->so #'type (format "_gl-~av" t))))
-           #'(begin
-               (provide v? make-v v vector->v list->v v+ v- v*)
-               (define (v? v)
-                 (and (cvector? v)
-                      (eq? (cvector-type v) gl-type)))
-               (define (make-v len)
-                 (make-cvector gl-type len))
-               (define (v . args)
-                 (apply cvector (cons gl-type args)))
-               (define (vector->v v)
-                 (unless (vector? v)
-                   (raise-argument-error 'vector->v "vector?" v))
-                 (list->cvector (vector->list v) gl-type))
-               (define (list->v l)
-                 (list->cvector l gl-type))
-               (define v+ (gl-vector-binop + 'v+ make-v))
-               (define v- (gl-vector-binop - 'v- make-v))
-               (define (v* n v)
-                 (unless (real? n)
-                   (raise-argument-error 'gl-vector* "real?" 0 n v))
-                 (unless (gl-vector? v)
-                   (raise-argument-error 'gl-vector* "gl-vector?" 1 n v))
-                 (let* ((l (cvector-length v))
-                        (t (cvector-type v))
-                        (res (make-v l)))
-                   (let loop ((i 0))
-                     (when (< i l)
-                       (cvector-set! res i (* n (cvector-ref v i)))
-                       (loop (add1 i))))
-                   res))))))))
-  
-  (define-syntax define-gl-vectors
-    (syntax-rules ()
-      ((_ type)
-       (define-gl-vector type))
-      ((_ type rest ...)
-       (begin
-         (define-gl-vector type)
-         (define-gl-vectors rest ...)))))
-  
-  (define-gl-vectors byte ubyte short ushort int uint
-                     float double boolean)
-  (provide gl-vector->vector gl-vector->list gl-vector-length gl-vector-ref
-           gl-vector-set! gl-vector? gl-vector-norm)
-  (define (gl-vector->vector v)
-    (list->vector (cvector->list v)))
-  (define gl-vector->list cvector->list)
-  (define gl-vector-length cvector-length)
-  (define gl-vector-ref cvector-ref)
-  (define gl-vector-set! cvector-set!)
-  (define gl-vector? cvector?)
-  (define (gl-vector-norm v)
-    (unless (gl-vector? v)
-      (raise-argument-error 'gl-vector-norm "gl-vector?" v))
-    (let ((l (gl-vector-length v)))
-      (let loop ((i 0)
-                 (res 0))
-        (cond
-          ((< i l)
-           (loop (add1 i) (+ (expt (gl-vector-ref v i) 2) res)))
-          (else
-           (sqrt res))))))
-)
diff --git a/pkgs/sgl/gl.rkt b/pkgs/sgl/gl.rkt
deleted file mode 100644
index 6a2b014909..0000000000
--- a/pkgs/sgl/gl.rkt
+++ /dev/null
@@ -1,1853 +0,0 @@
-#lang mzscheme
-(require mzlib/foreign
-         "gl-types.rkt"
-         "gl-vectors.rkt"
-         "init.rkt")
-
-(unsafe!)
-
-(define stype (system-type))
-
-(define gl-lib (case stype
-                 [(windows) (ffi-lib "opengl32")]
-                 [(macosx) (ffi-lib "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL")]
-                 [else (ffi-lib "libGL" '("1" ""))]))
-(define glu-lib (case stype
-                  [(windows) (ffi-lib "glu32")]
-                  [(macosx) (ffi-lib "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU")]
-                  [else (ffi-lib "libGLU" '("1" ""))]))
-
-(define win32?
-  (and (eq? 'windows stype)
-       (equal? "win32\\i386" (path->string (system-library-subpath #f)))))
-
-(define-syntax _fun*
-  (syntax-rules ()
-    [(_fun* x ...)
-     (if win32? (_fun #:abi 'stdcall x ...) (_fun x ...))]))
-
-(define wglGetProcAddress
-  (if (eq? 'windows stype)
-      (get-ffi-obj 'wglGetProcAddress gl-lib (_fun* _string -> _fpointer))
-      (lambda (x) #f)))
-
-(define (unavailable name fun-type)
-  (if (eq? 'windows stype)
-      ;; Windows: try to get proc via wglGetProcAddress;
-      ;; note that we need to delay the lookup until the
-      ;; function is called, because wglGetProcAddress is
-      ;; sensitive to the current GL context
-      (lambda ()
-	 (let ([sname (symbol->string name)])
-	   (lambda args
-	     (let ([f (wglGetProcAddress sname)])
-	       (if f
-		   (apply (function-ptr f fun-type) args)
-		   (error name "unavailable on this system"))))))
-      ;; Other platforms: proc is not available
-      (lambda () (lambda x (error name "unavailable on this system")))))
-
-(define-syntax define-foreign-lib
-  (syntax-rules (->)
-    [(_ lib name type ... ->)
-     (define-foreign-lib lib name type ... -> _void)]
-    [(_ lib name type ...)
-     (begin
-       ;; (printf "~a\n" 'name)
-       (provide name)
-       (define name
-	 (let ([fun-type (_fun* type ...) ])
-	   (get-ffi-obj 'name lib fun-type
-			(unavailable 'name fun-type)))))]))
-
-(define-syntax define-foreign
-  (syntax-rules ()
-    [(_ args ...) (define-foreign-lib gl-lib args ...)]))
-
-(define-for-syntax (get-type x err)
-  (case (syntax-object->datum x)
-    [(b) #'_gl-byte]
-    [(s) #'_gl-short]
-    [(i) #'_gl-int]
-    [(f) #'_gl-float]
-    [(d) #'_gl-double]
-    [(ub) #'_gl-ubyte]
-    [(us) #'_gl-ushort]
-    [(ui) #'_gl-uint]
-    [(bv) #'_gl-bytev]
-    [(sv) #'_gl-shortv]
-    [(iv) #'_gl-intv]
-    [(fv) #'_gl-floatv]
-    [(dv) #'_gl-doublev]
-    [(ubv) #'_gl-ubytev]
-    [(usv) #'_gl-ushortv]
-    [(uiv) #'_gl-uintv]
-    [else (raise-syntax-error #f "unknown GL type abbreviation" err x)]))
-
-(define-for-syntax (get-vtype x err)
-  (case (syntax-object->datum x)
-    [(bv) #'_gl-byte]
-    [(sv) #'_gl-short]
-    [(iv) #'_gl-int]
-    [(fv) #'_gl-float]
-    [(dv) #'_gl-double]
-    [(ubv) #'_gl-ubyte]
-    [(usv) #'_gl-ushort]
-    [(uiv) #'_gl-uint]
-    [else (raise-syntax-error #f "unknown GL type abbreviation" err x)]))
-
-(define-for-syntax (type-map type convert)
-  (syntax-case type (: =)
-    [(label : type) #`(label : #,(type-map #'type convert))]
-    [(type = expr) #`(#,(type-map #'type convert) = expr)]
-    [(label : type = expr) #`(label : #,(type-map #'type convert) = expr)]
-    [_ (convert type)]))
-
-(define-syntax (define-foreign-tparm stx)
-  (syntax-case stx (->)
-    [(_ name (suffix ...) type ...)
-     (let* ([name-sym (syntax-object->datum #'name)]
-            [build-def
-             (lambda (suffix)
-               (with-syntax ([new-name
-                              (datum->syntax-object
-                               #'name
-                               (string->symbol
-                                (format "~a~a"
-                                        name-sym
-                                        (syntax-object->datum suffix)))
-                               #'name)]
-                             [(new-type ...)
-                              (map
-                               (lambda (type)
-                                 (type-map
-                                  type
-                                  (lambda (type)
-                                    (syntax-case type (T outT)
-                                      [T (get-type suffix stx)]
-                                      [(T n)
-                                       #`(_cvector o
-                                                   #,(get-vtype suffix stx)
-                                                   n)]
-                                      [_ type]))))
-                               (syntax->list #'(type ...)))])
-                 #'(define-foreign new-name new-type ...)))])
-       (with-syntax ([(defs ...)
-                      (map build-def (syntax->list #'(suffix ...)))])
-         #'(begin defs ...)))]))
-
-;; 2.5
-(define-foreign glGetError -> _gl-enum)
-
-;; 2.6.1
-(define-foreign glBegin _gl-enum ->)
-(define-foreign glEnd ->)
-
-;; 2.6.2
-(define-foreign glEdgeFlag _gl-boolean ->)
-(define-foreign glEdgeFlagv _gl-booleanv ->)
-
-;; 2.7
-(define-foreign-tparm glVertex2 (s i f d) T T ->)
-(define-foreign-tparm glVertex3 (s i f d) T T T ->)
-(define-foreign-tparm glVertex4 (s i f d) T T T T ->)
-(define-foreign-tparm glVertex2 (sv iv fv dv) T ->)
-(define-foreign-tparm glVertex3 (sv iv fv dv) T ->)
-(define-foreign-tparm glVertex4 (sv iv fv dv) T ->)
-(define-foreign-tparm glTexCoord1 (s i f d) T ->)
-(define-foreign-tparm glTexCoord2 (s i f d) T T ->)
-(define-foreign-tparm glTexCoord3 (s i f d) T T T ->)
-(define-foreign-tparm glTexCoord4 (s i f d) T T T T ->)
-(define-foreign-tparm glTexCoord1 (sv iv fv dv) T ->)
-(define-foreign-tparm glTexCoord2 (sv iv fv dv) T ->)
-(define-foreign-tparm glTexCoord3 (sv iv fv dv) T ->)
-(define-foreign-tparm glTexCoord4 (sv iv fv dv) T ->)
-(define-foreign-tparm glMultiTexCoord1 (s i f d) _gl-enum T ->)
-(define-foreign-tparm glMultiTexCoord2 (s i f d) _gl-enum T T ->)
-(define-foreign-tparm glMultiTexCoord3 (s i f d) _gl-enum T T T ->)
-(define-foreign-tparm glMultiTexCoord4 (s i f d) _gl-enum T T T T ->)
-(define-foreign-tparm glMultiTexCoord1 (sv iv fv dv) _gl-enum T ->)
-(define-foreign-tparm glMultiTexCoord2 (sv iv fv dv) _gl-enum T ->)
-(define-foreign-tparm glMultiTexCoord3 (sv iv fv dv) _gl-enum T ->)
-(define-foreign-tparm glMultiTexCoord4 (sv iv fv dv) _gl-enum T ->)
-(define-foreign-tparm glNormal3 (b s i f d) T T T ->)
-(define-foreign-tparm glNormal3 (bv sv iv fv dv) T ->)
-(define-foreign-tparm glFogCoord (f d) T ->)
-(define-foreign-tparm glFogCoord (fv dv) T ->)
-(define-foreign-tparm glColor3 (b s i f d ub us ui) T T T ->)
-(define-foreign-tparm glColor4 (b s i f d ub us ui) T T T T ->)
-(define-foreign-tparm glColor3 (bv sv iv fv dv ubv usv uiv) T ->)
-(define-foreign-tparm glColor4 (bv sv iv fv dv ubv usv uiv) T ->)
-(define-foreign-tparm glSecondaryColor3 (b s i f d ub us ui) T T T ->)
-(define-foreign-tparm glSecondaryColor3 (bv sv iv fv dv ubv usv uiv) T ->)
-(define-foreign-tparm glIndex (s i f d ub) T ->)
-(define-foreign-tparm glIndex (sv iv fv dv ubv) T ->)
-
-;; 2.8
-#|
-(define-foreign glVertexPointer _gl-int _gl-enum _gl-sizei _gl-voidv ->)
-(define-foreign glNormalPointer _gl-enum _gl-sizei _gl-voidv ->)
-(define-foreign glColorPointer _gl-int _gl-enum _gl-sizei _gl-voidv ->)
-(define-foreign glSecondaryColorPointer
-  _gl-int _gl-enum _gl-sizei _gl-voidv ->)
-(define-foreign glIndexPointer _gl-enum _gl-sizei _gl-voidv ->)
-(define-foreign glFogCoordPointer _gl-enum _gl-sizei _gl-voidv ->)
-(define-foreign glTexCoordPointer _gl-int _gl-enum _gl-sizei _gl-voidv ->)
-(define-foreign glEdgeFlagPointer _gl-sizei _gl-voidv ->)
-(define-foreign glEnableClientState _gl-enum ->)
-(define-foreign glDisableClientState _gl-enum ->)
-(define-foreign glClientActiveTexture _gl-enum ->)
-(define-foreign glArrayElement _gl-int ->)
-(define-foreign glDrawArrays _gl-enum _gl-int _gl-sizei ->)
-(define-foreign glMultiDrawArrays _gl-enum _gl-intv _gl-sizeiv _gl-sizei ->)
-(define-foreign glDrawElements _gl-enum _gl-sizei _gl-enum _gl-voidv ->)
-(define-foreign glMultiDrawElements
-  _gl-enum _gl-sizeiv _gl-enum _gl-voidvv _gl-sizei ->)
-(define-foreign glDrawRangeElements
-  _gl-enum _gl-uint _gl-uint _gl-sizei _gl-enum _gl-voidv ->)
-(define-foreign glInterleavedArrays _gl-enum _gl-sizei _gl-voidv)
-|#
-
-;; 2.9
-#|
-(define-foreign glBindBuffer _gl-enum _gl-uint ->)
-(define-foreign glDeleteBuffers _gl-sizei gl_uintv ->)
-(define-foreign glGenBuffers _gl-sizei gl_uintv ->)
-(define-foreign glBufferData _gl-enum _gl-sizeiptr _gl_voidv _gl-enum ->)
-(define-foreign glBufferSubData _gl-enum _gl-intptr _gl-sizeiptr _gl_voidv ->)
-(define-foreign glMapBuffer _gl-enum _gl-enum -> _gl-voidv)
-(define-foreign glUnmapBuffer _gl-enum -> _gl-boolean)
-|#
-
-;; 2.10
-(define-foreign-tparm glRect (s i f d) T T T T ->)
-(define-foreign-tparm glRect (sv iv fv dv) T ->)
-
-;; 2.11.1
-(define-foreign glDepthRange _gl-clampd _gl-clampd ->)
-(define-foreign glViewport _gl-int _gl-int _gl-sizei _gl-sizei ->)
-
-;; 2.11.2
-(define-foreign glMatrixMode _gl-enum ->)
-(define-foreign glLoadMatrixf _gl-floatv ->)
-(define-foreign glLoadMatrixd _gl-doublev ->)
-(define-foreign glMultMatrixf _gl-floatv ->)
-(define-foreign glMultMatrixd _gl-doublev ->)
-(define-foreign glLoadTransposeMatrixf _gl-floatv ->)
-(define-foreign glLoadTransposeMatrixd _gl-doublev ->)
-(define-foreign glMultTransposeMatrixf _gl-floatv ->)
-(define-foreign glMultTransposeMatrixd _gl-doublev ->)
-(define-foreign glLoadIdentity ->)
-(define-foreign-tparm glRotate (f d) T T T T ->)
-(define-foreign-tparm glTranslate (f d) T T T ->)
-(define-foreign-tparm glScale (f d) T T T ->)
-(define-foreign glFrustum _gl-double _gl-double _gl-double
-                          _gl-double _gl-double _gl-double ->)
-(define-foreign glOrtho _gl-double _gl-double _gl-double
-                        _gl-double _gl-double _gl-double ->)
-(define-foreign glActiveTexture _gl-enum ->)
-(define-foreign glPushMatrix ->)
-(define-foreign glPopMatrix ->)
-
-;; 2.11.3
-(define-foreign glEnable _gl-enum ->)
-(define-foreign glDisable _gl-enum ->)
-
-;; 2.11.4
-(define-foreign-tparm glTexGen (i f d) _gl-enum _gl-enum T ->)
-(define-foreign-tparm glTexGen (iv fv dv) _gl-enum _gl-enum T ->)
-
-;; 2.12
-(define-foreign glClipPlane _gl-enum _gl-doublev ->)
-
-;; 2.13
-(define-foreign-tparm glRasterPos2 (s i f d) T T ->)
-(define-foreign-tparm glRasterPos3 (s i f d) T T T ->)
-(define-foreign-tparm glRasterPos4 (s i f d) T T T T ->)
-(define-foreign-tparm glRasterPos2 (sv iv fv dv) T ->)
-(define-foreign-tparm glRasterPos3 (sv iv fv dv) T ->)
-(define-foreign-tparm glRasterPos4 (sv iv fv dv) T ->)
-(define-foreign-tparm glWindowPos2 (s i f d) T T ->)
-(define-foreign-tparm glWindowPos3 (s i f d) T T T ->)
-(define-foreign-tparm glWindowPos2 (sv iv fv dv) T ->)
-(define-foreign-tparm glWindowPos3 (sv iv fv dv) T ->)
-
-;; 2.14.1
-(define-foreign glFrontFace _gl-enum ->)
-
-;; 2.14.2
-(define-foreign-tparm glMaterial (i f) _gl-enum _gl-enum T ->)
-(define-foreign-tparm glMaterial (iv fv) _gl-enum _gl-enum T ->)
-(define-foreign-tparm glLight (i f) _gl-enum _gl-enum T ->)
-(define-foreign-tparm glLight (iv fv) _gl-enum _gl-enum T ->)
-(define-foreign-tparm glLightModel (i f) _gl-enum T ->)
-(define-foreign-tparm glLightModel (iv fv) _gl-enum T ->)
-
-;; 2.14.3
-(define-foreign glColorMaterial _gl-enum _gl-enum ->)
-
-;; 2.14.7
-(define-foreign glShadeModel _gl-enum ->)
-
-;; 3.3
-(define-foreign glPointSize _gl-float ->)
-(define-foreign-tparm glPointParameter (i f) _gl-enum _gl-float ->)
-(define-foreign-tparm glPointParameter (iv fv) _gl-enum _gl-floatv ->)
-
-;; 3.4
-(define-foreign glLineWidth _gl-float ->)
-
-;; 3.4.2
-(define-foreign glLineStipple _gl-int _gl-ushort ->)
-
-;; 3.5.1
-(define-foreign glCullFace _gl-enum ->)
-
-;; 3.5.2
-(define-foreign glPolygonStipple _gl-ubytev ->)
-
-;; 3.5.4
-(define-foreign glPolygonMode _gl-enum _gl-enum ->)
-
-;; 3.5.5
-(define-foreign glPolygonOffset _gl-float _gl-float ->)
-
-;; 3.6.1
-(define-foreign-tparm glPixelStore (i f) _gl-enum T ->)
-
-;; 3.6.3
-(define-foreign-tparm glPixelTransfer (i f) _gl-enum T ->)
-(define-foreign-tparm glPixelMap (uiv usv fv)
-                      _gl-enum [_gl-sizei = (cvector-length l)] [l : T] ->)
-(define-foreign glColorTable
-                _gl-enum _gl-enum _gl-sizei _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign-tparm glColorTableParameter (iv fv) _gl-enum _gl-enum T ->)
-(define-foreign glCopyColorTable
-                _gl-enum _gl-enum _gl-int _gl-int _gl-sizei ->)
-(define-foreign glColorSubTable
-                _gl-enum _gl-sizei _gl-sizei _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glCopyColorSubTable
-                _gl-enum _gl-sizei _gl-int _gl-int _gl-sizei ->)
-(define-foreign glConvolutionFilter2D _gl-enum _gl-enum _gl-sizei _gl-sizei
-                                      _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign-tparm glConvolutionParameter (iv fv) _gl-enum _gl-enum T ->)
-(define-foreign glConvolutionFilter1D
-                _gl-enum _gl-enum _gl-sizei _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glSeparableFilter2D _gl-enum _gl-enum _gl-sizei _gl-sizei
-                                    _gl-enum _gl-enum _gl-voidv _gl-voidv ->)
-(define-foreign glCopyConvolutionFilter2D
-                _gl-enum _gl-enum _gl-int _gl-int _gl-sizei _gl-sizei ->)
-(define-foreign glCopyConvolutionFilter1D
-                _gl-enum _gl-enum _gl-int _gl-int _gl-sizei ->)
-(define-foreign glHistogram _gl-enum _gl-sizei _gl-enum _gl-boolean ->)
-(define-foreign glMinmax _gl-enum _gl-enum _gl-boolean ->)
-
-;; 3.6.4
-(define-foreign glDrawPixels
-                _gl-sizei _gl-sizei _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glPixelZoom _gl-float _gl-float ->)
-
-;; 3.6.5
-(define-foreign-tparm  glConvolutionParameter (i f) _gl-enum _gl-enum T ->)
-
-;; 3.7
-(define-foreign glBitmap _gl-sizei _gl-sizei _gl-float _gl-float _gl-float
-                         _gl-float _gl-ubytev ->)
-
-;; 3.8.1
-(define-foreign glTexImage3D _gl-enum _gl-int _gl-int _gl-sizei _gl-sizei
-                             _gl-sizei _gl-int _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glTexImage2D _gl-enum _gl-int _gl-int _gl-sizei _gl-sizei
-                             _gl-int _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glTexImage1D _gl-enum _gl-int _gl-int _gl-sizei _gl-int 
-                             _gl-enum _gl-enum _gl-voidv ->)
-
-;; 3.8.2
-(define-foreign glCopyTexImage2D _gl-enum _gl-int _gl-enum _gl-int _gl-int
-                                 _gl-sizei _gl-sizei _gl-int ->)
-(define-foreign glCopyTexImage1D _gl-enum _gl-int _gl-enum _gl-int _gl-int
-                                 _gl-sizei _gl-int ->)
-(define-foreign glTexSubImage3D
-                _gl-enum _gl-int _gl-int _gl-int _gl-int _gl-sizei _gl-sizei 
-                _gl-sizei _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glTexSubImage2D
-                _gl-enum _gl-int _gl-int _gl-int _gl-sizei _gl-sizei 
-                _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glTexSubImage1D _gl-enum _gl-int _gl-int _gl-sizei 
-                                _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glCopyTexSubImage3D
-                _gl-enum _gl-int _gl-int _gl-int _gl-int _gl-int _gl-int 
-                _gl-sizei _gl-sizei ->)
-(define-foreign glCopyTexSubImage2D
-                _gl-enum _gl-int _gl-int _gl-int _gl-int _gl-int
-                _gl-sizei _gl-sizei ->)
-(define-foreign glCopyTexSubImage1D
-                _gl-enum _gl-int _gl-int _gl-int _gl-int _gl-sizei ->)
-
-;; 3.8.3
-(define-foreign glCompressedTexImage1D
-                _gl-enum _gl-int _gl-enum _gl-sizei _gl-int _gl-sizei
-                _gl-voidv ->)
-(define-foreign glCompressedTexImage2D
-                _gl-enum _gl-int _gl-enum _gl-sizei _gl-sizei _gl-int
-                _gl-sizei _gl-voidv ->)
-(define-foreign glCompressedTexImage3D
-                _gl-enum _gl-int _gl-enum _gl-sizei _gl-sizei _gl-sizei
-                _gl-int _gl-sizei _gl-voidv ->)
-(define-foreign glCompressedTexSubImage1D
-                _gl-enum _gl-int _gl-int _gl-sizei _gl-enum _gl-sizei
-                _gl-voidv ->)
-(define-foreign glCompressedTexSubImage2D
-                _gl-enum _gl-int _gl-int _gl-int _gl-sizei _gl-sizei _gl-enum
-                _gl-sizei _gl-voidv ->)
-(define-foreign glCompressedTexSubImage3D
-                _gl-enum _gl-int _gl-int _gl-int _gl-int _gl-sizei _gl-sizei
-                _gl-sizei _gl-enum _gl-sizei _gl-voidv ->)
-
-;; 3.8.4
-(define-foreign-tparm glTexParameter (i f) _gl-enum _gl-enum T ->)
-(define-foreign-tparm glTexParameter (iv fv) _gl-enum _gl-enum T ->)
-
-;; 3.8.12
-(define-foreign glBindTexture _gl-enum _gl-uint ->)
-(define-foreign glDeleteTextures
-                [_gl-sizei = (cvector-length v)] [v : _gl-uintv] ->)
-(define-foreign glGenTextures
-                [n : _gl-sizei] [r : (_cvector o _gl-uint n)] -> _void -> r)
-(define-foreign glAreTexturesResident
-                [n : _gl-sizei = (cvector-length v)] [v : _gl-uintv]
-                [r : (_cvector o _gl-boolean n)] ->
-                [r2 : _gl-boolean] -> (values r2 r))
-
-;; 3.8.13
-(define-foreign-tparm glTexEnv (i f) _gl-enum _gl-enum T ->)
-(define-foreign-tparm glTexEnv (iv fv) _gl-enum _gl-enum T ->)
-
-;; 3.10
-(define-foreign-tparm glFog (i f) _gl-enum T ->)
-(define-foreign-tparm glFog (iv fv) _gl-enum T ->)
-
-;; 4.1.2
-(define-foreign glScissor _gl-int _gl-int _gl-sizei _gl-sizei ->)
-
-;; 4.1.3
-(define-foreign glSampleCoverage _gl-clampf _gl-boolean ->)
-
-;; 4.1.4
-(define-foreign glAlphaFunc _gl-enum _gl-clampf ->)
-
-;; 4.1.5
-(define-foreign glStencilFunc _gl-enum _gl-int _gl-uint ->)
-(define-foreign glStencilOp _gl-enum _gl-enum _gl-enum ->)
-
-;; 4.1.6
-(define-foreign glDepthFunc _gl-enum ->)
-
-;; 4.1.7
-(define-foreign glBeginQuery _gl-enum _gl-uint ->)
-(define-foreign glEndQuery _gl-enum ->)
-(define-foreign glGenQueries
-                [n : _gl-sizei] [r : (_cvector o _gl-uint n)] -> _void -> r)
-(define-foreign glDeleteQueries [_gl-sizei = (cvector-length v)]
-                                [v : _gl-uintv] ->)
-
-;; 4.1.8
-(define-foreign glBlendEquation _gl-enum ->)
-(define-foreign glBlendFuncSeparate _gl-enum _gl-enum _gl-enum _gl-enum ->)
-(define-foreign glBlendFunc _gl-enum _gl-enum ->)
-(define-foreign glBlendColor _gl-clampf _gl-clampf _gl-clampf _gl-clampf ->)
-
-;; 4.1.10
-(define-foreign glLogicOp _gl-enum ->)
-
-;; 4.2.1
-(define-foreign glDrawBuffer _gl-enum ->)
-
-;; 4.2.2
-(define-foreign glIndexMask _gl-uint ->)
-(define-foreign glColorMask
-                _gl-boolean _gl-boolean _gl-boolean _gl-boolean ->)
-(define-foreign glDepthMask _gl-boolean ->)
-(define-foreign glStencilMask _gl-uint ->)
-
-;; 4.2.3
-(define-foreign glClear _gl-bitfield ->)
-(define-foreign glClearColor _gl-clampf _gl-clampf _gl-clampf _gl-clampf ->)
-(define-foreign glClearIndex _gl-float ->)
-(define-foreign glClearDepth _gl-clampd ->)
-(define-foreign glClearStencil _gl-int ->)
-(define-foreign glClearAccum _gl-float _gl-float _gl-float _gl-float ->)
-
-;; 4.2.4
-(define-foreign glAccum _gl-enum _gl-float ->)
-
-;; 4.3.2
-(define-foreign glReadPixels _gl-int _gl-int _gl-sizei _gl-sizei
-                             _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glReadBuffer _gl-enum ->)
-
-;; 4.3.3
-(define-foreign glCopyPixels _gl-int _gl-int _gl-sizei _gl-sizei _gl-enum ->)
-
-;; 5.1
-;; Map1 and 2 appear to have a bug in the spec where the last argument is not
-;; declared as a pointer
-(define-foreign-tparm glMap1 (f) _gl-enum T T _gl-int _gl-int _gl-floatv ->)
-(define-foreign-tparm glMap1 (d) _gl-enum T T _gl-int _gl-int _gl-doublev ->)
-(define-foreign-tparm glMap2 (f)
-                      _gl-enum T T _gl-int _gl-int T T _gl-int _gl-int
-                      _gl-floatv ->)
-(define-foreign-tparm glMap2 (d)
-                      _gl-enum T T _gl-int _gl-int T T _gl-int _gl-int
-                      _gl-doublev ->)
-(define-foreign-tparm glEvalCoord1 (f d) T ->)
-(define-foreign-tparm glEvalCoord2 (f d) T T ->)
-(define-foreign-tparm glEvalCoord1 (fv dv) T ->)
-(define-foreign-tparm glEvalCoord2 (fv dv) T ->)
-(define-foreign-tparm glMapGrid1 (f d) _gl-int T T ->)
-(define-foreign-tparm glMapGrid2 (f d) _gl-int T T _gl-int T T ->)
-(define-foreign glEvalMesh1 _gl-enum _gl-int _gl-int ->)
-(define-foreign glEvalMesh2 _gl-enum _gl-int _gl-int _gl-int _gl-int ->)
-(define-foreign glEvalPoint1 _gl-int ->)
-(define-foreign glEvalPoint2 _gl-int _gl-int ->)
-
-;; 5.2
-(define-foreign glInitNames ->)
-(define-foreign glPopName ->)
-(define-foreign glPushName _gl-uint ->)
-(define-foreign glLoadName _gl-uint ->)
-(define-foreign glRenderMode _gl-enum -> _gl-int)
-(define-struct select-buffer-object (ptr len))
-(provide select-buffer->gl-uint-vector)
-(define (select-buffer->gl-uint-vector sbo)
-  (unless (select-buffer-object? sbo)
-    (raise-type-error 'select-buffer->gl-uint-vector "select-buffer-object" sbo))
-  (let* ([l (select-buffer-object-len sbo)]
-         [p (select-buffer-object-ptr sbo)]
-         [v (make-gl-uint-vector l)])
-    (let loop ([i 0])
-      (when (< i l)
-        (gl-vector-set! v i (ptr-ref p _gl-uint i))
-        (loop (add1 i))))
-    v))
-
-(define-foreign glSelectBuffer
-  [n : _gl-sizei] [mem : _pointer = (malloc n _gl-uint 'raw)] ->
-  _void ->
-  (let ([o (make-select-buffer-object mem n)])
-    (register-finalizer o (lambda (sbo) (free (select-buffer-object-ptr sbo))))
-    o))
-
-;; 5.3
-(define-struct feedback-buffer-object (ptr len))
-(provide feedback-buffer->gl-float-vector)
-(define (feedback-buffer->gl-float-vector fbo)
-  (unless (feedback-buffer-object? fbo)
-    (raise-type-error 'feedback-buffer->gl-uint-vector
-                      "feedback-buffer-object" fbo))
-  (let* ([l (feedback-buffer-object-len fbo)]
-         [p (feedback-buffer-object-ptr fbo)]
-         [v (make-gl-float-vector l)])
-    (let loop ([i 0])
-      (when (< i l)
-        (gl-vector-set! v i (ptr-ref p _gl-float i))
-        (loop (add1 i))))
-    v))
-(define-foreign glFeedbackBuffer
-  [n : _gl-sizei] _gl-enum [mem : _pointer = (malloc _gl-float n 'raw)] ->
-  _void ->
-  (let ([o (make-feedback-buffer-object mem n)])
-    (register-finalizer o (lambda (fbo) (free (feedback-buffer-object-ptr fbo))))
-    o))
-(define-foreign glPassThrough _gl-float ->)
-
-;; 5.4
-(define-foreign glNewList _gl-uint _gl-enum ->)
-(define-foreign glEndList ->)
-(define-foreign glCallList _gl-uint ->)
-(define-foreign glCallLists _gl-sizei _gl-enum _gl-voidv ->)
-(define-foreign glListBase _gl-uint ->)
-(define-foreign glGenLists _gl-sizei -> _gl-uint)
-(define-foreign glIsList _gl-uint -> _gl-boolean)
-(define-foreign glDeleteLists _gl-uint _gl-sizei ->)
-
-;; 5.5
-(define-foreign glFlush ->)
-(define-foreign glFinish ->)
-
-;; 5.6
-(define-foreign glHint _gl-enum _gl-enum ->)
-
-;; 6.1.1
-(define-foreign glGetBooleanv
-  _gl-enum [n : _?] [r : (_cvector o _gl-boolean n)] ->
-  _void -> r)
-(define-foreign glGetIntegerv
-  _gl-enum [n : _?] [r : (_cvector o _gl-int n)] -> _void -> r)
-(define-foreign glGetFloatv
-  _gl-enum [n : _?] [r : (_cvector o _gl-float n)] ->
-  _void -> r)
-(define-foreign glGetDoublev
-  _gl-enum [n : _?] [r : (_cvector o _gl-double n)] ->
-  _void -> r)
-(define-foreign glIsEnabled _gl-enum -> _gl-boolean)
-
-;; 6.1.3
-(define-foreign glGetClipPlane
-  _gl-enum [r : (_cvector o _gl-double 4)] -> _void -> r)
-(define-foreign-tparm glGetLight (iv fv)
-  _gl-enum _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-(define-foreign-tparm glGetMaterial (iv fv)
-  _gl-enum _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-(define-foreign-tparm glGetTexEnv (iv fv)
-  _gl-enum _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-(define-foreign-tparm glGetTexGen (iv fv dv)
-  _gl-enum _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-(define-foreign-tparm glGetTexParameter (iv fv)
-  _gl-enum _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-(define-foreign-tparm glGetTexLevelParameter (iv fv)
-                      _gl-enum _gl-int _gl-enum [n : _?] [r : (T n)] ->
-                      _void -> r)
-(define-foreign-tparm glGetPixelMap (uiv usv fv)
-                      _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-(define-foreign-tparm glGetMap (iv fv dv)
-                      _gl-enum _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-(define-foreign-tparm glGetBufferParameter (iv)
-                      _gl-enum _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-
-
-;; 6.1.4
-(define-foreign glGetTexImage _gl-enum _gl-int _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glGetCompressedTexImage _gl-enum _gl-int _gl-voidv ->)
-(define-foreign glIsTexture _gl-uint -> _gl-boolean)
-
-;; 6.1.5
-(define-foreign glGetPolygonStipple _gl-voidv ->)
-
-;; 6.1.7
-(define-foreign glGetColorTable _gl-enum _gl-enum _gl-enum _gl-voidv ->)
-
-;; 6.1.8
-(define-foreign glGetConvolutionFilter
-  _gl-enum _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glGetSeparableFilter
-  _gl-enum _gl-enum _gl-enum _gl-voidv _gl-voidv _gl-voidv ->)
-(define-foreign-tparm glGetConvolutionParameter (iv fv)
-  _gl-enum _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-
-;; 6.1.9
-(define-foreign glGetHistogram
-  _gl-enum _gl-boolean _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glResetHistogram _gl-enum ->)
-(define-foreign-tparm glGetHistogramParameter (iv fv)
-  _gl-enum _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-
-;; 6.1.10
-(define-foreign glGetMinmax
-  _gl-enum _gl-boolean _gl-enum _gl-enum _gl-voidv ->)
-(define-foreign glResetMinmax _gl-enum ->)
-(define-foreign-tparm glGetMinmaxParameter (iv fv)
-  _gl-enum _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-
-;; 6.1.11
-#|
-(define-foreign glGetPointerv _gl-enum _gl-voidvv ->)
-|#
-(define-foreign glGetString _gl-enum -> _string)
-
-;; 6.1.12
-(define-foreign glIsQuery _gl-uint -> _gl-boolean)
-(define-foreign-tparm glGetQuery (iv)
-  _gl-enum _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-(define-foreign-tparm glGetQueryObject (iv uiv)
-  _gl-uint _gl-enum [n : _?] [r : (T n)] -> _void -> r)
-
-;; 6.1.13
-(define-foreign glIsBuffer _gl-uint -> _gl-boolean)
-#|
-(define-foreign glGetBufferSubData
-  _gl-enum _gl-intptr _gl-sizeiptr _gl-voidv ->)
-(define-foreign glGetBufferPointerv _gl-enum _gl-enum _gl-voidvv ->)
-|#
-
-;; 6.1.14
-(define-foreign glPushAttrib _gl-bitfield ->)
-(define-foreign glPushClientAttrib _gl-bitfield ->)
-(define-foreign glPopAttrib ->)
-(define-foreign glPopClientAttrib ->)
-
-(define-syntax define-foreignu
-  (syntax-rules ()
-    [(_ args ...) (define-foreign-lib glu-lib args ...)]))
-
-;; 2
-(define-foreignu gluGetString _gl-enum -> _string)
-(define-foreignu gluCheckExtension _string _string -> _gl-boolean)
-
-;; 3.1
-(define-foreignu gluScaleImage _gl-enum _gl-sizei _gl-sizei _gl-enum _gl-voidv
-                               _gl-sizei _gl-sizei _gl-enum _gl-voidv ->)
-
-;; 3.2
-(define-foreignu gluBuild1DMipmaps
-  _gl-enum _gl-int _gl-sizei _gl-enum _gl-enum _gl-voidv ->)
-(define-foreignu gluBuild2DMipmaps
-  _gl-enum _gl-int _gl-sizei _gl-sizei _gl-enum _gl-enum
-  _gl-voidv ->)
-(define-foreignu gluBuild3DMipmaps
-  _gl-enum _gl-int _gl-sizei _gl-sizei _gl-sizei
-  _gl-enum _gl-enum _gl-voidv ->)
-(define-foreignu gluBuild1DMipmapLevels
-  _gl-enum _gl-int _gl-sizei _gl-enum _gl-enum
-  _gl-int _gl-int _gl-int _gl-voidv ->)
-(define-foreignu gluBuild2DMipmapLevels
-  _gl-enum _gl-int _gl-sizei _gl-sizei _gl-enum _gl-enum
-  _gl-int _gl-int _gl-int _gl-voidv ->)
-(define-foreignu gluBuild3DMipmapLevels
-  _gl-enum _gl-int _gl-sizei _gl-sizei _gl-sizei
-  _gl-enum _gl-enum _gl-int _gl-int _gl-int _gl-voidv ->)
-
-;; 4.1
-(define-foreignu gluOrtho2D _gl-double _gl-double _gl-double _gl-double ->)
-(define-foreignu gluPerspective
-  _gl-double _gl-double _gl-double _gl-double ->)
-(define-foreignu gluLookAt _gl-double _gl-double _gl-double
-                           _gl-double _gl-double _gl-double
-                           _gl-double _gl-double _gl-double ->)
-(define-foreignu gluPickMatrix
-  _gl-double _gl-double _gl-double _gl-double _gl-intv ->)
-
-;; 4.2
-(define-foreignu gluProject _gl-double _gl-double _gl-double
-                            _gl-doublev _gl-doublev _gl-intv
-                            [r1 : (_ptr o _gl-double)]
-                            [r2 : (_ptr o _gl-double)]
-                            [r3 : (_ptr o _gl-double)] ->
-                            _void -> (gl-double-vector r1 r2 r3))
-(define-foreignu gluUnProject _gl-double _gl-double _gl-double
-                              _gl-doublev _gl-doublev _gl-intv
-                              [r1 : (_ptr o _gl-double)]
-                              [r2 : (_ptr o _gl-double)]
-                              [r3 : (_ptr o _gl-double)] ->
-                              _void -> (gl-double-vector r1 r2 r3))
-(define-foreignu gluUnProject4 _gl-double _gl-double _gl-double _gl-double
-                               _gl-doublev _gl-doublev _gl-intv
-                               _gl-clampd _gl-clampd
-                               [r1 : (_ptr o _gl-double)]
-                               [r2 : (_ptr o _gl-double)]
-                               [r3 : (_ptr o _gl-double)]
-                               [r4 : (_ptr o _gl-double)] ->
-                               _void -> (gl-double-vector r1 r2 r3 r4))
-
-;; 5.1
-#|
-(define-foreignu gluNewTess -> _glu-tessalator*)
-(define-foreignu gluDeleteTess _glu-tessalator* ->)
-|#
-
-;; 5.2
-#|
-(define-foreignu gluTessBeginPolygon _glu-tessalator* _gl-voidv ->)
-(define-foreignu gluTessBeginContour _glu-tessalator* ->)
-(define-foreignu gluTessVertex _glu-tessalator* _gl-doublev _gl-voidv ->)
-(define-foreignu gluTessEndContour _glu-tessalator* ->)
-(define-foreignu gluTessEndPolygon _glu-tessalator* ->)
-|#
-
-;; 5.3
-#|
-(define-foreignu gluTessCallback _glu-tessalator _gl-enum ??? ->)
-|#
-
-;; 5.4
-#|
-(define-foreignu gluTessProperty _glu-tessalator* _gl-enum _gl-double ->)
-(define-foreignu gluGetTessProperty _glu-tessalator* _gl-enum _gl-doublev ->)
-(define-foreignu gluTessNormal _glu-tessalator* _gl-double _gl-double _gl-double ->)
-|#
-
-;; 5.7
-#|
-(define-foreignu gluBeginPolygon _glu-tessalator* ->)
-(define-foreignu gluNextContour _glu-tessalator* _gl-enum ->)
-(define-foreignu gluEndPolygon _glu-tessalator* ->)
-|#
-
-  ;; 6.1
-(define _glu-quadric
-  (_cpointer 'quadric _pointer #f
-             (lambda (q*) (register-finalizer q* gluDeleteQuadric) q*)))
-
-(define-foreignu gluNewQuadric -> _glu-quadric)
-
-;; Don't use define-foreign, because this shouldn't be provided
-(define gluDeleteQuadric
-  (with-handlers ([exn:fail:filesystem?
-                   (lambda (ex)
-                     (lambda x
-                       (error 'gluDeleteQuadric
-                              "unavailable on this system")))])
-    (get-ffi-obj 'gluDeleteQuadric glu-lib (_fun* _glu-quadric -> _void))))
-
-;; 6.2
-;;(define-foreignu gluQuadricCallback
-;;                 _glu-quadric [_gl-enum = GLU_ERROR] (_fun* _gl-enum -> _void) ->)
-
-;; 6.3
-(define-foreignu gluQuadricNormals _glu-quadric _gl-enum ->)
-(define-foreignu gluQuadricTexture _glu-quadric _gl-boolean ->)
-(define-foreignu gluQuadricOrientation _glu-quadric _gl-enum ->)
-(define-foreignu gluQuadricDrawStyle _glu-quadric _gl-enum ->)
-
-;; 6.4
-(define-foreignu gluSphere _glu-quadric _gl-double _gl-int _gl-int ->)
-(define-foreignu gluCylinder
-  _glu-quadric _gl-double _gl-double _gl-double _gl-int _gl-int ->)
-(define-foreignu gluDisk _glu-quadric _gl-double _gl-double _gl-int _gl-int ->)
-(define-foreignu gluPartialDisk
-  _glu-quadric _gl-double _gl-double _gl-int _gl-int _gl-double _gl-double ->)
-
-;; 7.1
-(define _glu-nurbs
-  (_cpointer 'nurbs _pointer #f
-             (lambda (q*) (register-finalizer q* gluDeleteNurbsRenderer) q*)))
-
-(define-foreignu gluNewNurbsRenderer -> _glu-nurbs)
-(define-foreignu gluDeleteNurbsRenderer _glu-nurbs ->)
-
-
-;; 7.2
-#|
-(define-foreignu gluNurbsCallback _glu-nurbs* _gl-enum ??? ->)
-(define-foreignu gluNurbsCallbackData _glu-nurbs* _gl-voidv ->)
-|#
-
-;; 7.3
-(define-foreignu gluBeginCurve _glu-nurbs ->)
-(define-foreignu gluNurbsCurve
-  _glu-nurbs _gl-int _gl-floatv _gl-int _gl-floatv _gl-int _gl-enum ->)
-(define-foreignu gluEndCurve _glu-nurbs ->)
-
-;; 7.4
-
-(define-foreignu gluBeginSurface _glu-nurbs ->)
-(define-foreignu gluNurbsSurface
-  _glu-nurbs _gl-int _gl-floatv _gl-int _gl-floatv _gl-int
-  _gl-int _gl-floatv _gl-int _gl-int _gl-enum ->)
-(define-foreignu gluEndSurface _glu-nurbs ->)
-
-
-;; 7.5
-#|
-(define-foreignu gluBeginTrim _glu-nurbs* ->)
-(define-foreignu gluPwlCurve _glu-nurbs* _gl-int _gl-floatv _gl-int _gl-enum ->)
-(define-foreignu gluEndTrim _glu-nurbs* ->)
-|#
-
-;; 7.6
-(define-foreignu gluNurbsProperty _glu-nurbs _gl-enum _gl-float ->)
-#|
-(define-foreignu gluLoadSamplingMatrix _glu-nurbs* _gl-floatv _gl-floatv _gl-intv ->)
-(define-foreignu gluGetNurbsProperty _glu-nurbs* _gl-enum _gl-floatv ->)
-|#
-
-;; 8
-(define-foreignu gluErrorString _gl-enum -> _string)
-
-
-(define-syntax define-enum
-  (syntax-rules ()
-    [(_ d v)   (begin (provide d) (define d v))]
-    [(_ _ d v) (define-enum d v)]))
-
-;; Enumeration constants for version 1.0 and 1.1
-;; These values are all taken from MESA's gl.h.
-;; Although the standard doesn't define these, they seem to be used on all
-;; platforms.
-(define-enum GL_FALSE #x0)
-(define-enum GL_TRUE #x1)
-(define-enum GL_BYTE #x1400)
-(define-enum GL_UNSIGNED_BYTE #x1401)
-(define-enum GL_SHORT #x1402)
-(define-enum GL_UNSIGNED_SHORT #x1403)
-(define-enum GL_INT #x1404)
-(define-enum GL_UNSIGNED_INT #x1405)
-(define-enum GL_FLOAT #x1406)
-(define-enum GL_DOUBLE #x140A)
-(define-enum GL_2_BYTES #x1407)
-(define-enum GL_3_BYTES #x1408)
-(define-enum GL_4_BYTES #x1409)
-(define-enum GL_POINTS #x0000)
-(define-enum GL_LINES #x0001)
-(define-enum GL_LINE_LOOP #x0002)
-(define-enum GL_LINE_STRIP #x0003)
-(define-enum GL_TRIANGLES #x0004)
-(define-enum GL_TRIANGLE_STRIP #x0005)
-(define-enum GL_TRIANGLE_FAN #x0006)
-(define-enum GL_QUADS #x0007)
-(define-enum GL_QUAD_STRIP #x0008)
-(define-enum GL_POLYGON #x0009)
-(define-enum GL_VERTEX_ARRAY #x8074)
-(define-enum GL_NORMAL_ARRAY #x8075)
-(define-enum GL_COLOR_ARRAY #x8076)
-(define-enum GL_INDEX_ARRAY #x8077)
-(define-enum GL_TEXTURE_COORD_ARRAY #x8078)
-(define-enum GL_EDGE_FLAG_ARRAY #x8079)
-(define-enum GL_VERTEX_ARRAY_SIZE #x807A)
-(define-enum GL_VERTEX_ARRAY_TYPE #x807B)
-(define-enum GL_VERTEX_ARRAY_STRIDE #x807C)
-(define-enum GL_NORMAL_ARRAY_TYPE #x807E)
-(define-enum GL_NORMAL_ARRAY_STRIDE #x807F)
-(define-enum GL_COLOR_ARRAY_SIZE #x8081)
-(define-enum GL_COLOR_ARRAY_TYPE #x8082)
-(define-enum GL_COLOR_ARRAY_STRIDE #x8083)
-(define-enum GL_INDEX_ARRAY_TYPE #x8085)
-(define-enum GL_INDEX_ARRAY_STRIDE #x8086)
-(define-enum GL_TEXTURE_COORD_ARRAY_SIZE #x8088)
-(define-enum GL_TEXTURE_COORD_ARRAY_TYPE #x8089)
-(define-enum GL_TEXTURE_COORD_ARRAY_STRIDE #x808A)
-(define-enum GL_EDGE_FLAG_ARRAY_STRIDE #x808C)
-(define-enum GL_VERTEX_ARRAY_POINTER #x808E)
-(define-enum GL_NORMAL_ARRAY_POINTER #x808F)
-(define-enum GL_COLOR_ARRAY_POINTER #x8090)
-(define-enum GL_INDEX_ARRAY_POINTER #x8091)
-(define-enum GL_TEXTURE_COORD_ARRAY_POINTER #x8092)
-(define-enum GL_EDGE_FLAG_ARRAY_POINTER #x8093)
-(define-enum GL_V2F #x2A20)
-(define-enum GL_V3F #x2A21)
-(define-enum GL_C4UB_V2F #x2A22)
-(define-enum GL_C4UB_V3F #x2A23)
-(define-enum GL_C3F_V3F #x2A24)
-(define-enum GL_N3F_V3F #x2A25)
-(define-enum GL_C4F_N3F_V3F #x2A26)
-(define-enum GL_T2F_V3F #x2A27)
-(define-enum GL_T4F_V4F #x2A28)
-(define-enum GL_T2F_C4UB_V3F #x2A29)
-(define-enum GL_T2F_C3F_V3F #x2A2A)
-(define-enum GL_T2F_N3F_V3F #x2A2B)
-(define-enum GL_T2F_C4F_N3F_V3F #x2A2C)
-(define-enum GL_T4F_C4F_N3F_V4F #x2A2D)
-(define-enum GL_MATRIX_MODE #x0BA0)
-(define-enum GL_MODELVIEW #x1700)
-(define-enum GL_PROJECTION #x1701)
-(define-enum GL_TEXTURE #x1702)
-(define-enum GL_POINT_SMOOTH #x0B10)
-(define-enum GL_POINT_SIZE #x0B11)
-(define-enum GL_POINT_SIZE_GRANULARITY #x0B13)
-(define-enum GL_POINT_SIZE_RANGE #x0B12)
-(define-enum GL_LINE_SMOOTH #x0B20)
-(define-enum GL_LINE_STIPPLE #x0B24)
-(define-enum GL_LINE_STIPPLE_PATTERN #x0B25)
-(define-enum GL_LINE_STIPPLE_REPEAT #x0B26)
-(define-enum GL_LINE_WIDTH #x0B21)
-(define-enum GL_LINE_WIDTH_GRANULARITY #x0B23)
-(define-enum GL_LINE_WIDTH_RANGE #x0B22)
-(define-enum GL_POINT #x1B00)
-(define-enum GL_LINE #x1B01)
-(define-enum GL_FILL #x1B02)
-(define-enum GL_CW #x0900)
-(define-enum GL_CCW #x0901)
-(define-enum GL_FRONT #x0404)
-(define-enum GL_BACK #x0405)
-(define-enum GL_POLYGON_MODE #x0B40)
-(define-enum GL_POLYGON_SMOOTH #x0B41)
-(define-enum GL_POLYGON_STIPPLE #x0B42)
-(define-enum GL_EDGE_FLAG #x0B43)
-(define-enum GL_CULL_FACE #x0B44)
-(define-enum GL_CULL_FACE_MODE #x0B45)
-(define-enum GL_FRONT_FACE #x0B46)
-(define-enum GL_POLYGON_OFFSET_FACTOR #x8038)
-(define-enum GL_POLYGON_OFFSET_UNITS #x2A00)
-(define-enum GL_POLYGON_OFFSET_POINT #x2A01)
-(define-enum GL_POLYGON_OFFSET_LINE #x2A02)
-(define-enum GL_POLYGON_OFFSET_FILL #x8037)
-(define-enum GL_COMPILE #x1300)
-(define-enum GL_COMPILE_AND_EXECUTE #x1301)
-(define-enum GL_LIST_BASE #x0B32)
-(define-enum GL_LIST_INDEX #x0B33)
-(define-enum GL_LIST_MODE #x0B30)
-(define-enum GL_NEVER #x0200)
-(define-enum GL_LESS #x0201)
-(define-enum GL_EQUAL #x0202)
-(define-enum GL_LEQUAL #x0203)
-(define-enum GL_GREATER #x0204)
-(define-enum GL_NOTEQUAL #x0205)
-(define-enum GL_GEQUAL #x0206)
-(define-enum GL_ALWAYS #x0207)
-(define-enum GL_DEPTH_TEST #x0B71)
-(define-enum GL_DEPTH_BITS #x0D56)
-(define-enum GL_DEPTH_CLEAR_VALUE #x0B73)
-(define-enum GL_DEPTH_FUNC #x0B74)
-(define-enum GL_DEPTH_RANGE #x0B70)
-(define-enum GL_DEPTH_WRITEMASK #x0B72)
-(define-enum GL_DEPTH_COMPONENT #x1902)
-(define-enum GL_LIGHTING #x0B50)
-(define-enum GL_LIGHT0 #x4000)
-(define-enum GL_LIGHT1 #x4001)
-(define-enum GL_LIGHT2 #x4002)
-(define-enum GL_LIGHT3 #x4003)
-(define-enum GL_LIGHT4 #x4004)
-(define-enum GL_LIGHT5 #x4005)
-(define-enum GL_LIGHT6 #x4006)
-(define-enum GL_LIGHT7 #x4007)
-(define-enum GL_SPOT_EXPONENT #x1205)
-(define-enum GL_SPOT_CUTOFF #x1206)
-(define-enum GL_CONSTANT_ATTENUATION #x1207)
-(define-enum GL_LINEAR_ATTENUATION #x1208)
-(define-enum GL_QUADRATIC_ATTENUATION #x1209)
-(define-enum GL_AMBIENT #x1200)
-(define-enum GL_DIFFUSE #x1201)
-(define-enum GL_SPECULAR #x1202)
-(define-enum GL_SHININESS #x1601)
-(define-enum GL_EMISSION #x1600)
-(define-enum GL_POSITION #x1203)
-(define-enum GL_SPOT_DIRECTION #x1204)
-(define-enum GL_AMBIENT_AND_DIFFUSE #x1602)
-(define-enum GL_COLOR_INDEXES #x1603)
-(define-enum GL_LIGHT_MODEL_TWO_SIDE #x0B52)
-(define-enum GL_LIGHT_MODEL_LOCAL_VIEWER #x0B51)
-(define-enum GL_LIGHT_MODEL_AMBIENT #x0B53)
-(define-enum GL_FRONT_AND_BACK #x0408)
-(define-enum GL_SHADE_MODEL #x0B54)
-(define-enum GL_FLAT #x1D00)
-(define-enum GL_SMOOTH #x1D01)
-(define-enum GL_COLOR_MATERIAL #x0B57)
-(define-enum GL_COLOR_MATERIAL_FACE #x0B55)
-(define-enum GL_COLOR_MATERIAL_PARAMETER #x0B56)
-(define-enum GL_NORMALIZE #x0BA1)
-(define-enum GL_CLIP_PLANE0 #x3000)
-(define-enum GL_CLIP_PLANE1 #x3001)
-(define-enum GL_CLIP_PLANE2 #x3002)
-(define-enum GL_CLIP_PLANE3 #x3003)
-(define-enum GL_CLIP_PLANE4 #x3004)
-(define-enum GL_CLIP_PLANE5 #x3005)
-(define-enum GL_ACCUM_RED_BITS #x0D58)
-(define-enum GL_ACCUM_GREEN_BITS #x0D59)
-(define-enum GL_ACCUM_BLUE_BITS #x0D5A)
-(define-enum GL_ACCUM_ALPHA_BITS #x0D5B)
-(define-enum GL_ACCUM_CLEAR_VALUE #x0B80)
-(define-enum GL_ACCUM #x0100)
-(define-enum GL_ADD #x0104)
-(define-enum GL_LOAD #x0101)
-(define-enum GL_MULT #x0103)
-(define-enum GL_RETURN #x0102)
-(define-enum GL_ALPHA_TEST #x0BC0)
-(define-enum GL_ALPHA_TEST_REF #x0BC2)
-(define-enum GL_ALPHA_TEST_FUNC #x0BC1)
-(define-enum GL_BLEND #x0BE2)
-(define-enum GL_BLEND_SRC #x0BE1)
-(define-enum GL_BLEND_DST #x0BE0)
-(define-enum GL_ZERO #x0)
-(define-enum GL_ONE #x1)
-(define-enum GL_SRC_COLOR #x0300)
-(define-enum GL_ONE_MINUS_SRC_COLOR #x0301)
-(define-enum GL_SRC_ALPHA #x0302)
-(define-enum GL_ONE_MINUS_SRC_ALPHA #x0303)
-(define-enum GL_DST_ALPHA #x0304)
-(define-enum GL_ONE_MINUS_DST_ALPHA #x0305)
-(define-enum GL_DST_COLOR #x0306)
-(define-enum GL_ONE_MINUS_DST_COLOR #x0307)
-(define-enum GL_SRC_ALPHA_SATURATE #x0308)
-(define-enum GL_FEEDBACK #x1C01)
-(define-enum GL_RENDER #x1C00)
-(define-enum GL_SELECT #x1C02)
-(define-enum GL_2D #x0600)
-(define-enum GL_3D #x0601)
-(define-enum GL_3D_COLOR #x0602)
-(define-enum GL_3D_COLOR_TEXTURE #x0603)
-(define-enum GL_4D_COLOR_TEXTURE #x0604)
-(define-enum GL_POINT_TOKEN #x0701)
-(define-enum GL_LINE_TOKEN #x0702)
-(define-enum GL_LINE_RESET_TOKEN #x0707)
-(define-enum GL_POLYGON_TOKEN #x0703)
-(define-enum GL_BITMAP_TOKEN #x0704)
-(define-enum GL_DRAW_PIXEL_TOKEN #x0705)
-(define-enum GL_COPY_PIXEL_TOKEN #x0706)
-(define-enum GL_PASS_THROUGH_TOKEN #x0700)
-(define-enum GL_FEEDBACK_BUFFER_POINTER #x0DF0)
-(define-enum GL_FEEDBACK_BUFFER_SIZE #x0DF1)
-(define-enum GL_FEEDBACK_BUFFER_TYPE #x0DF2)
-(define-enum GL_SELECTION_BUFFER_POINTER #x0DF3)
-(define-enum GL_SELECTION_BUFFER_SIZE #x0DF4)
-(define-enum GL_FOG #x0B60)
-(define-enum GL_FOG_MODE #x0B65)
-(define-enum GL_FOG_DENSITY #x0B62)
-(define-enum GL_FOG_COLOR #x0B66)
-(define-enum GL_FOG_INDEX #x0B61)
-(define-enum GL_FOG_START #x0B63)
-(define-enum GL_FOG_END #x0B64)
-(define-enum GL_LINEAR #x2601)
-(define-enum GL_EXP #x0800)
-(define-enum GL_EXP2 #x0801)
-(define-enum GL_LOGIC_OP #x0BF1)
-(define-enum GL_INDEX_LOGIC_OP #x0BF1)
-(define-enum GL_COLOR_LOGIC_OP #x0BF2)
-(define-enum GL_LOGIC_OP_MODE #x0BF0)
-(define-enum GL_CLEAR #x1500)
-(define-enum GL_SET #x150F)
-(define-enum GL_COPY #x1503)
-(define-enum GL_COPY_INVERTED #x150C)
-(define-enum GL_NOOP #x1505)
-(define-enum GL_INVERT #x150A)
-(define-enum GL_AND #x1501)
-(define-enum GL_NAND #x150E)
-(define-enum GL_OR #x1507)
-(define-enum GL_NOR #x1508)
-(define-enum GL_XOR #x1506)
-(define-enum GL_EQUIV #x1509)
-(define-enum GL_AND_REVERSE #x1502)
-(define-enum GL_AND_INVERTED #x1504)
-(define-enum GL_OR_REVERSE #x150B)
-(define-enum GL_OR_INVERTED #x150D)
-(define-enum GL_STENCIL_TEST #x0B90)
-(define-enum GL_STENCIL_WRITEMASK #x0B98)
-(define-enum GL_STENCIL_BITS #x0D57)
-(define-enum GL_STENCIL_FUNC #x0B92)
-(define-enum GL_STENCIL_VALUE_MASK #x0B93)
-(define-enum GL_STENCIL_REF #x0B97)
-(define-enum GL_STENCIL_FAIL #x0B94)
-(define-enum GL_STENCIL_PASS_DEPTH_PASS #x0B96)
-(define-enum GL_STENCIL_PASS_DEPTH_FAIL #x0B95)
-(define-enum GL_STENCIL_CLEAR_VALUE #x0B91)
-(define-enum GL_STENCIL_INDEX #x1901)
-(define-enum GL_KEEP #x1E00)
-(define-enum GL_REPLACE #x1E01)
-(define-enum GL_INCR #x1E02)
-(define-enum GL_DECR #x1E03)
-(define-enum GL_NONE #x0)
-(define-enum GL_LEFT #x0406)
-(define-enum GL_RIGHT #x0407)
-(define-enum GL_FRONT_LEFT #x0400)
-(define-enum GL_FRONT_RIGHT #x0401)
-(define-enum GL_BACK_LEFT #x0402)
-(define-enum GL_BACK_RIGHT #x0403)
-(define-enum GL_AUX0 #x0409)
-(define-enum GL_AUX1 #x040A)
-(define-enum GL_AUX2 #x040B)
-(define-enum GL_AUX3 #x040C)
-(define-enum GL_COLOR_INDEX #x1900)
-(define-enum GL_RED #x1903)
-(define-enum GL_GREEN #x1904)
-(define-enum GL_BLUE #x1905)
-(define-enum GL_ALPHA #x1906)
-(define-enum GL_LUMINANCE #x1909)
-(define-enum GL_LUMINANCE_ALPHA #x190A)
-(define-enum GL_ALPHA_BITS #x0D55)
-(define-enum GL_RED_BITS #x0D52)
-(define-enum GL_GREEN_BITS #x0D53)
-(define-enum GL_BLUE_BITS #x0D54)
-(define-enum GL_INDEX_BITS #x0D51)
-(define-enum GL_SUBPIXEL_BITS #x0D50)
-(define-enum GL_AUX_BUFFERS #x0C00)
-(define-enum GL_READ_BUFFER #x0C02)
-(define-enum GL_DRAW_BUFFER #x0C01)
-(define-enum GL_DOUBLEBUFFER #x0C32)
-(define-enum GL_STEREO #x0C33)
-(define-enum GL_BITMAP #x1A00)
-(define-enum GL_COLOR #x1800)
-(define-enum GL_DEPTH #x1801)
-(define-enum GL_STENCIL #x1802)
-(define-enum GL_DITHER #x0BD0)
-(define-enum GL_RGB #x1907)
-(define-enum GL_RGBA #x1908)
-(define-enum GL_MAX_LIST_NESTING #x0B31)
-(define-enum GL_MAX_ATTRIB_STACK_DEPTH #x0D35)
-(define-enum GL_MAX_MODELVIEW_STACK_DEPTH #x0D36)
-(define-enum GL_MAX_NAME_STACK_DEPTH #x0D37)
-(define-enum GL_MAX_PROJECTION_STACK_DEPTH #x0D38)
-(define-enum GL_MAX_TEXTURE_STACK_DEPTH #x0D39)
-(define-enum GL_MAX_EVAL_ORDER #x0D30)
-(define-enum GL_MAX_LIGHTS #x0D31)
-(define-enum GL_MAX_CLIP_PLANES #x0D32)
-(define-enum GL_MAX_TEXTURE_SIZE #x0D33)
-(define-enum GL_MAX_PIXEL_MAP_TABLE #x0D34)
-(define-enum GL_MAX_VIEWPORT_DIMS #x0D3A)
-(define-enum GL_MAX_CLIENT_ATTRIB_STACK_DEPTH #x0D3B)
-(define-enum GL_ATTRIB_STACK_DEPTH #x0BB0)
-(define-enum GL_CLIENT_ATTRIB_STACK_DEPTH #x0BB1)
-(define-enum GL_COLOR_CLEAR_VALUE #x0C22)
-(define-enum GL_COLOR_WRITEMASK #x0C23)
-(define-enum GL_CURRENT_INDEX #x0B01)
-(define-enum GL_CURRENT_COLOR #x0B00)
-(define-enum GL_CURRENT_NORMAL #x0B02)
-(define-enum GL_CURRENT_RASTER_COLOR #x0B04)
-(define-enum GL_CURRENT_RASTER_DISTANCE #x0B09)
-(define-enum GL_CURRENT_RASTER_INDEX #x0B05)
-(define-enum GL_CURRENT_RASTER_POSITION #x0B07)
-(define-enum GL_CURRENT_RASTER_TEXTURE_COORDS #x0B06)
-(define-enum GL_CURRENT_RASTER_POSITION_VALID #x0B08)
-(define-enum GL_CURRENT_TEXTURE_COORDS #x0B03)
-(define-enum GL_INDEX_CLEAR_VALUE #x0C20)
-(define-enum GL_INDEX_MODE #x0C30)
-(define-enum GL_INDEX_WRITEMASK #x0C21)
-(define-enum GL_MODELVIEW_MATRIX #x0BA6)
-(define-enum GL_MODELVIEW_STACK_DEPTH #x0BA3)
-(define-enum GL_NAME_STACK_DEPTH #x0D70)
-(define-enum GL_PROJECTION_MATRIX #x0BA7)
-(define-enum GL_PROJECTION_STACK_DEPTH #x0BA4)
-(define-enum GL_RENDER_MODE #x0C40)
-(define-enum GL_RGBA_MODE #x0C31)
-(define-enum GL_TEXTURE_MATRIX #x0BA8)
-(define-enum GL_TEXTURE_STACK_DEPTH #x0BA5)
-(define-enum GL_VIEWPORT #x0BA2)
-(define-enum GL_AUTO_NORMAL #x0D80)
-(define-enum GL_MAP1_COLOR_4 #x0D90)
-(define-enum GL_MAP1_GRID_DOMAIN #x0DD0)
-(define-enum GL_MAP1_GRID_SEGMENTS #x0DD1)
-(define-enum GL_MAP1_INDEX #x0D91)
-(define-enum GL_MAP1_NORMAL #x0D92)
-(define-enum GL_MAP1_TEXTURE_COORD_1 #x0D93)
-(define-enum GL_MAP1_TEXTURE_COORD_2 #x0D94)
-(define-enum GL_MAP1_TEXTURE_COORD_3 #x0D95)
-(define-enum GL_MAP1_TEXTURE_COORD_4 #x0D96)
-(define-enum GL_MAP1_VERTEX_3 #x0D97)
-(define-enum GL_MAP1_VERTEX_4 #x0D98)
-(define-enum GL_MAP2_COLOR_4 #x0DB0)
-(define-enum GL_MAP2_GRID_DOMAIN #x0DD2)
-(define-enum GL_MAP2_GRID_SEGMENTS #x0DD3)
-(define-enum GL_MAP2_INDEX #x0DB1)
-(define-enum GL_MAP2_NORMAL #x0DB2)
-(define-enum GL_MAP2_TEXTURE_COORD_1 #x0DB3)
-(define-enum GL_MAP2_TEXTURE_COORD_2 #x0DB4)
-(define-enum GL_MAP2_TEXTURE_COORD_3 #x0DB5)
-(define-enum GL_MAP2_TEXTURE_COORD_4 #x0DB6)
-(define-enum GL_MAP2_VERTEX_3 #x0DB7)
-(define-enum GL_MAP2_VERTEX_4 #x0DB8)
-(define-enum GL_COEFF #x0A00)
-(define-enum GL_DOMAIN #x0A02)
-(define-enum GL_ORDER #x0A01)
-(define-enum GL_FOG_HINT #x0C54)
-(define-enum GL_LINE_SMOOTH_HINT #x0C52)
-(define-enum GL_PERSPECTIVE_CORRECTION_HINT #x0C50)
-(define-enum GL_POINT_SMOOTH_HINT #x0C51)
-(define-enum GL_POLYGON_SMOOTH_HINT #x0C53)
-(define-enum GL_DONT_CARE #x1100)
-(define-enum GL_FASTEST #x1101)
-(define-enum GL_NICEST #x1102)
-(define-enum GL_SCISSOR_TEST #x0C11)
-(define-enum GL_SCISSOR_BOX #x0C10)
-(define-enum GL_MAP_COLOR #x0D10)
-(define-enum GL_MAP_STENCIL #x0D11)
-(define-enum GL_INDEX_SHIFT #x0D12)
-(define-enum GL_INDEX_OFFSET #x0D13)
-(define-enum GL_RED_SCALE #x0D14)
-(define-enum GL_RED_BIAS #x0D15)
-(define-enum GL_GREEN_SCALE #x0D18)
-(define-enum GL_GREEN_BIAS #x0D19)
-(define-enum GL_BLUE_SCALE #x0D1A)
-(define-enum GL_BLUE_BIAS #x0D1B)
-(define-enum GL_ALPHA_SCALE #x0D1C)
-(define-enum GL_ALPHA_BIAS #x0D1D)
-(define-enum GL_DEPTH_SCALE #x0D1E)
-(define-enum GL_DEPTH_BIAS #x0D1F)
-(define-enum GL_PIXEL_MAP_S_TO_S_SIZE #x0CB1)
-(define-enum GL_PIXEL_MAP_I_TO_I_SIZE #x0CB0)
-(define-enum GL_PIXEL_MAP_I_TO_R_SIZE #x0CB2)
-(define-enum GL_PIXEL_MAP_I_TO_G_SIZE #x0CB3)
-(define-enum GL_PIXEL_MAP_I_TO_B_SIZE #x0CB4)
-(define-enum GL_PIXEL_MAP_I_TO_A_SIZE #x0CB5)
-(define-enum GL_PIXEL_MAP_R_TO_R_SIZE #x0CB6)
-(define-enum GL_PIXEL_MAP_G_TO_G_SIZE #x0CB7)
-(define-enum GL_PIXEL_MAP_B_TO_B_SIZE #x0CB8)
-(define-enum GL_PIXEL_MAP_A_TO_A_SIZE #x0CB9)
-(define-enum GL_PIXEL_MAP_S_TO_S #x0C71)
-(define-enum GL_PIXEL_MAP_I_TO_I #x0C70)
-(define-enum GL_PIXEL_MAP_I_TO_R #x0C72)
-(define-enum GL_PIXEL_MAP_I_TO_G #x0C73)
-(define-enum GL_PIXEL_MAP_I_TO_B #x0C74)
-(define-enum GL_PIXEL_MAP_I_TO_A #x0C75)
-(define-enum GL_PIXEL_MAP_R_TO_R #x0C76)
-(define-enum GL_PIXEL_MAP_G_TO_G #x0C77)
-(define-enum GL_PIXEL_MAP_B_TO_B #x0C78)
-(define-enum GL_PIXEL_MAP_A_TO_A #x0C79)
-(define-enum GL_PACK_ALIGNMENT #x0D05)
-(define-enum GL_PACK_LSB_FIRST #x0D01)
-(define-enum GL_PACK_ROW_LENGTH #x0D02)
-(define-enum GL_PACK_SKIP_PIXELS #x0D04)
-(define-enum GL_PACK_SKIP_ROWS #x0D03)
-(define-enum GL_PACK_SWAP_BYTES #x0D00)
-(define-enum GL_UNPACK_ALIGNMENT #x0CF5)
-(define-enum GL_UNPACK_LSB_FIRST #x0CF1)
-(define-enum GL_UNPACK_ROW_LENGTH #x0CF2)
-(define-enum GL_UNPACK_SKIP_PIXELS #x0CF4)
-(define-enum GL_UNPACK_SKIP_ROWS #x0CF3)
-(define-enum GL_UNPACK_SWAP_BYTES #x0CF0)
-(define-enum GL_ZOOM_X #x0D16)
-(define-enum GL_ZOOM_Y #x0D17)
-(define-enum GL_TEXTURE_ENV #x2300)
-(define-enum GL_TEXTURE_ENV_MODE #x2200)
-(define-enum GL_TEXTURE_1D #x0DE0)
-(define-enum GL_TEXTURE_2D #x0DE1)
-(define-enum GL_TEXTURE_WRAP_S #x2802)
-(define-enum GL_TEXTURE_WRAP_T #x2803)
-(define-enum GL_TEXTURE_MAG_FILTER #x2800)
-(define-enum GL_TEXTURE_MIN_FILTER #x2801)
-(define-enum GL_TEXTURE_ENV_COLOR #x2201)
-(define-enum GL_TEXTURE_GEN_S #x0C60)
-(define-enum GL_TEXTURE_GEN_T #x0C61)
-(define-enum GL_TEXTURE_GEN_MODE #x2500)
-(define-enum GL_TEXTURE_BORDER_COLOR #x1004)
-(define-enum GL_TEXTURE_WIDTH #x1000)
-(define-enum GL_TEXTURE_HEIGHT #x1001)
-(define-enum GL_TEXTURE_BORDER #x1005)
-(define-enum GL_TEXTURE_COMPONENTS #x1003)
-(define-enum GL_TEXTURE_RED_SIZE #x805C)
-(define-enum GL_TEXTURE_GREEN_SIZE #x805D)
-(define-enum GL_TEXTURE_BLUE_SIZE #x805E)
-(define-enum GL_TEXTURE_ALPHA_SIZE #x805F)
-(define-enum GL_TEXTURE_LUMINANCE_SIZE #x8060)
-(define-enum GL_TEXTURE_INTENSITY_SIZE #x8061)
-(define-enum GL_NEAREST_MIPMAP_NEAREST #x2700)
-(define-enum GL_NEAREST_MIPMAP_LINEAR #x2702)
-(define-enum GL_LINEAR_MIPMAP_NEAREST #x2701)
-(define-enum GL_LINEAR_MIPMAP_LINEAR #x2703)
-(define-enum GL_OBJECT_LINEAR #x2401)
-(define-enum GL_OBJECT_PLANE #x2501)
-(define-enum GL_EYE_LINEAR #x2400)
-(define-enum GL_EYE_PLANE #x2502)
-(define-enum GL_SPHERE_MAP #x2402)
-(define-enum GL_DECAL #x2101)
-(define-enum GL_MODULATE #x2100)
-(define-enum GL_NEAREST #x2600)
-(define-enum GL_REPEAT #x2901)
-(define-enum GL_CLAMP #x2900)
-(define-enum GL_S #x2000)
-(define-enum GL_T #x2001)
-(define-enum GL_R #x2002)
-(define-enum GL_Q #x2003)
-(define-enum GL_TEXTURE_GEN_R #x0C62)
-(define-enum GL_TEXTURE_GEN_Q #x0C63)
-(define-enum GL_VENDOR #x1F00)
-(define-enum GL_RENDERER #x1F01)
-(define-enum GL_VERSION #x1F02)
-(define-enum GL_EXTENSIONS #x1F03)
-(define-enum GL_NO_ERROR #x0)
-(define-enum GL_INVALID_VALUE #x0501)
-(define-enum GL_INVALID_ENUM #x0500)
-(define-enum GL_INVALID_OPERATION #x0502)
-(define-enum GL_STACK_OVERFLOW #x0503)
-(define-enum GL_STACK_UNDERFLOW #x0504)
-(define-enum GL_OUT_OF_MEMORY #x0505)
-(define-enum GL_CURRENT_BIT #x00000001)
-(define-enum GL_POINT_BIT #x00000002)
-(define-enum GL_LINE_BIT #x00000004)
-(define-enum GL_POLYGON_BIT #x00000008)
-(define-enum GL_POLYGON_STIPPLE_BIT #x00000010)
-(define-enum GL_PIXEL_MODE_BIT #x00000020)
-(define-enum GL_LIGHTING_BIT #x00000040)
-(define-enum GL_FOG_BIT #x00000080)
-(define-enum GL_DEPTH_BUFFER_BIT #x00000100)
-(define-enum GL_ACCUM_BUFFER_BIT #x00000200)
-(define-enum GL_STENCIL_BUFFER_BIT #x00000400)
-(define-enum GL_VIEWPORT_BIT #x00000800)
-(define-enum GL_TRANSFORM_BIT #x00001000)
-(define-enum GL_ENABLE_BIT #x00002000)
-(define-enum GL_COLOR_BUFFER_BIT #x00004000)
-(define-enum GL_HINT_BIT #x00008000)
-(define-enum GL_EVAL_BIT #x00010000)
-(define-enum GL_LIST_BIT #x00020000)
-(define-enum GL_TEXTURE_BIT #x00040000)
-(define-enum GL_SCISSOR_BIT #x00080000)
-(define-enum GL_ALL_ATTRIB_BITS #x000FFFFF)
-(define-enum GL_PROXY_TEXTURE_1D #x8063)
-(define-enum GL_PROXY_TEXTURE_2D #x8064)
-(define-enum GL_TEXTURE_PRIORITY #x8066)
-(define-enum GL_TEXTURE_RESIDENT #x8067)
-(define-enum GL_TEXTURE_BINDING_1D #x8068)
-(define-enum GL_TEXTURE_BINDING_2D #x8069)
-(define-enum GL_TEXTURE_INTERNAL_FORMAT #x1003)
-(define-enum GL_ALPHA4 #x803B)
-(define-enum GL_ALPHA8 #x803C)
-(define-enum GL_ALPHA12 #x803D)
-(define-enum GL_ALPHA16 #x803E)
-(define-enum GL_LUMINANCE4 #x803F)
-(define-enum GL_LUMINANCE8 #x8040)
-(define-enum GL_LUMINANCE12 #x8041)
-(define-enum GL_LUMINANCE16 #x8042)
-(define-enum GL_LUMINANCE4_ALPHA4 #x8043)
-(define-enum GL_LUMINANCE6_ALPHA2 #x8044)
-(define-enum GL_LUMINANCE8_ALPHA8 #x8045)
-(define-enum GL_LUMINANCE12_ALPHA4 #x8046)
-(define-enum GL_LUMINANCE12_ALPHA12 #x8047)
-(define-enum GL_LUMINANCE16_ALPHA16 #x8048)
-(define-enum GL_INTENSITY #x8049)
-(define-enum GL_INTENSITY4 #x804A)
-(define-enum GL_INTENSITY8 #x804B)
-(define-enum GL_INTENSITY12 #x804C)
-(define-enum GL_INTENSITY16 #x804D)
-(define-enum GL_R3_G3_B2 #x2A10)
-(define-enum GL_RGB4 #x804F)
-(define-enum GL_RGB5 #x8050)
-(define-enum GL_RGB8 #x8051)
-(define-enum GL_RGB10 #x8052)
-(define-enum GL_RGB12 #x8053)
-(define-enum GL_RGB16 #x8054)
-(define-enum GL_RGBA2 #x8055)
-(define-enum GL_RGBA4 #x8056)
-(define-enum GL_RGB5_A1 #x8057)
-(define-enum GL_RGBA8 #x8058)
-(define-enum GL_RGB10_A2 #x8059)
-(define-enum GL_RGBA12 #x805A)
-(define-enum GL_RGBA16 #x805B)
-(define-enum GL_CLIENT_PIXEL_STORE_BIT #x00000001)
-(define-enum GL_CLIENT_VERTEX_ARRAY_BIT #x00000002)
-(define-enum GL_ALL_CLIENT_ATTRIB_BITS #xFFFFFFFF)
-(define-enum GL_CLIENT_ALL_ATTRIB_BITS #xFFFFFFFF)
-
-;; These values are taken from SGI's glext.h.
-(define-enum 12 GL_UNSIGNED_BYTE_3_3_2 #x8032)
-(define-enum 12 GL_UNSIGNED_SHORT_4_4_4_4 #x8033)
-(define-enum 12 GL_UNSIGNED_SHORT_5_5_5_1 #x8034)
-(define-enum 12 GL_UNSIGNED_INT_8_8_8_8 #x8035)
-(define-enum 12 GL_UNSIGNED_INT_10_10_10_2 #x8036)
-(define-enum 12 GL_RESCALE_NORMAL #x803A)
-(define-enum 12 GL_TEXTURE_BINDING_3D #x806A)
-(define-enum 12 GL_PACK_SKIP_IMAGES #x806B)
-(define-enum 12 GL_PACK_IMAGE_HEIGHT #x806C)
-(define-enum 12 GL_UNPACK_SKIP_IMAGES #x806D)
-(define-enum 12 GL_UNPACK_IMAGE_HEIGHT #x806E)
-(define-enum 12 GL_TEXTURE_3D #x806F)
-(define-enum 12 GL_PROXY_TEXTURE_3D #x8070)
-(define-enum 12 GL_TEXTURE_DEPTH #x8071)
-(define-enum 12 GL_TEXTURE_WRAP_R #x8072)
-(define-enum 12 GL_MAX_3D_TEXTURE_SIZE #x8073)
-(define-enum 12 GL_UNSIGNED_BYTE_2_3_3_REV #x8362)
-(define-enum 12 GL_UNSIGNED_SHORT_5_6_5 #x8363)
-(define-enum 12 GL_UNSIGNED_SHORT_5_6_5_REV #x8364)
-(define-enum 12 GL_UNSIGNED_SHORT_4_4_4_4_REV #x8365)
-(define-enum 12 GL_UNSIGNED_SHORT_1_5_5_5_REV #x8366)
-(define-enum 12 GL_UNSIGNED_INT_8_8_8_8_REV #x8367)
-(define-enum 12 GL_UNSIGNED_INT_2_10_10_10_REV #x8368)
-(define-enum 12 GL_BGR #x80E0)
-(define-enum 12 GL_BGRA #x80E1)
-(define-enum 12 GL_MAX_ELEMENTS_VERTICES #x80E8)
-(define-enum 12 GL_MAX_ELEMENTS_INDICES #x80E9)
-(define-enum 12 GL_CLAMP_TO_EDGE #x812F)
-(define-enum 12 GL_TEXTURE_MIN_LOD #x813A)
-(define-enum 12 GL_TEXTURE_MAX_LOD #x813B)
-(define-enum 12 GL_TEXTURE_BASE_LEVEL #x813C)
-(define-enum 12 GL_TEXTURE_MAX_LEVEL #x813D)
-(define-enum 12 GL_LIGHT_MODEL_COLOR_CONTROL #x81F8)
-(define-enum 12 GL_SINGLE_COLOR #x81F9)
-(define-enum 12 GL_SEPARATE_SPECULAR_COLOR #x81FA)
-(define-enum 12 GL_SMOOTH_POINT_SIZE_RANGE #x0B12)
-(define-enum 12 GL_SMOOTH_POINT_SIZE_GRANULARITY #x0B13)
-(define-enum 12 GL_SMOOTH_LINE_WIDTH_RANGE #x0B22)
-(define-enum 12 GL_SMOOTH_LINE_WIDTH_GRANULARITY #x0B23)
-(define-enum 12 GL_ALIASED_POINT_SIZE_RANGE #x846D)
-(define-enum 12 GL_ALIASED_LINE_WIDTH_RANGE #x846E)
-
-(define-enum 'img GL_CONSTANT_COLOR #x8001)
-(define-enum 'img GL_ONE_MINUS_CONSTANT_COLOR #x8002)
-(define-enum 'img GL_CONSTANT_ALPHA #x8003)
-(define-enum 'img GL_ONE_MINUS_CONSTANT_ALPHA #x8004)
-(define-enum 'img GL_BLEND_COLOR #x8005)
-(define-enum 'img GL_FUNC_ADD #x8006)
-(define-enum 'img GL_MIN #x8007)
-(define-enum 'img GL_MAX #x8008)
-(define-enum 'img GL_BLEND_EQUATION #x8009)
-(define-enum 'img GL_FUNC_SUBTRACT #x800A)
-(define-enum 'img GL_FUNC_REVERSE_SUBTRACT #x800B)
-(define-enum 'img GL_CONVOLUTION_1D #x8010)
-(define-enum 'img GL_CONVOLUTION_2D #x8011)
-(define-enum 'img GL_SEPARABLE_2D #x8012)
-(define-enum 'img GL_CONVOLUTION_BORDER_MODE #x8013)
-(define-enum 'img GL_CONVOLUTION_FILTER_SCALE #x8014)
-(define-enum 'img GL_CONVOLUTION_FILTER_BIAS #x8015)
-(define-enum 'img GL_REDUCE #x8016)
-(define-enum 'img GL_CONVOLUTION_FORMAT #x8017)
-(define-enum 'img GL_CONVOLUTION_WIDTH #x8018)
-(define-enum 'img GL_CONVOLUTION_HEIGHT #x8019)
-(define-enum 'img GL_MAX_CONVOLUTION_WIDTH #x801A)
-(define-enum 'img GL_MAX_CONVOLUTION_HEIGHT #x801B)
-(define-enum 'img GL_POST_CONVOLUTION_RED_SCALE #x801C)
-(define-enum 'img GL_POST_CONVOLUTION_GREEN_SCALE #x801D)
-(define-enum 'img GL_POST_CONVOLUTION_BLUE_SCALE #x801E)
-(define-enum 'img GL_POST_CONVOLUTION_ALPHA_SCALE #x801F)
-(define-enum 'img GL_POST_CONVOLUTION_RED_BIAS #x8020)
-(define-enum 'img GL_POST_CONVOLUTION_GREEN_BIAS #x8021)
-(define-enum 'img GL_POST_CONVOLUTION_BLUE_BIAS #x8022)
-(define-enum 'img GL_POST_CONVOLUTION_ALPHA_BIAS #x8023)
-(define-enum 'img GL_HISTOGRAM #x8024)
-(define-enum 'img GL_PROXY_HISTOGRAM #x8025)
-(define-enum 'img GL_HISTOGRAM_WIDTH #x8026)
-(define-enum 'img GL_HISTOGRAM_FORMAT #x8027)
-(define-enum 'img GL_HISTOGRAM_RED_SIZE #x8028)
-(define-enum 'img GL_HISTOGRAM_GREEN_SIZE #x8029)
-(define-enum 'img GL_HISTOGRAM_BLUE_SIZE #x802A)
-(define-enum 'img GL_HISTOGRAM_ALPHA_SIZE #x802B)
-(define-enum 'img GL_HISTOGRAM_LUMINANCE_SIZE #x802C)
-(define-enum 'img GL_HISTOGRAM_SINK #x802D)
-(define-enum 'img GL_MINMAX #x802E)
-(define-enum 'img GL_MINMAX_FORMAT #x802F)
-(define-enum 'img GL_MINMAX_SINK #x8030)
-(define-enum 'img GL_TABLE_TOO_LARGE #x8031)
-(define-enum 'img GL_COLOR_MATRIX #x80B1)
-(define-enum 'img GL_COLOR_MATRIX_STACK_DEPTH #x80B2)
-(define-enum 'img GL_MAX_COLOR_MATRIX_STACK_DEPTH #x80B3)
-(define-enum 'img GL_POST_COLOR_MATRIX_RED_SCALE #x80B4)
-(define-enum 'img GL_POST_COLOR_MATRIX_GREEN_SCALE #x80B5)
-(define-enum 'img GL_POST_COLOR_MATRIX_BLUE_SCALE #x80B6)
-(define-enum 'img GL_POST_COLOR_MATRIX_ALPHA_SCALE #x80B7)
-(define-enum 'img GL_POST_COLOR_MATRIX_RED_BIAS #x80B8)
-(define-enum 'img GL_POST_COLOR_MATRIX_GREEN_BIAS #x80B9)
-(define-enum 'img GL_POST_COLOR_MATRIX_BLUE_BIAS #x80BA)
-(define-enum 'img GL_POST_COLOR_MATRIX_ALPHA_BIAS #x80BB)
-(define-enum 'img GL_COLOR_TABLE #x80D0)
-(define-enum 'img GL_POST_CONVOLUTION_COLOR_TABLE #x80D1)
-(define-enum 'img GL_POST_COLOR_MATRIX_COLOR_TABLE #x80D2)
-(define-enum 'img GL_PROXY_COLOR_TABLE #x80D3)
-(define-enum 'img GL_PROXY_POST_CONVOLUTION_COLOR_TABLE #x80D4)
-(define-enum 'img GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE #x80D5)
-(define-enum 'img GL_COLOR_TABLE_SCALE #x80D6)
-(define-enum 'img GL_COLOR_TABLE_BIAS #x80D7)
-(define-enum 'img GL_COLOR_TABLE_FORMAT #x80D8)
-(define-enum 'img GL_COLOR_TABLE_WIDTH #x80D9)
-(define-enum 'img GL_COLOR_TABLE_RED_SIZE #x80DA)
-(define-enum 'img GL_COLOR_TABLE_GREEN_SIZE #x80DB)
-(define-enum 'img GL_COLOR_TABLE_BLUE_SIZE #x80DC)
-(define-enum 'img GL_COLOR_TABLE_ALPHA_SIZE #x80DD)
-(define-enum 'img GL_COLOR_TABLE_LUMINANCE_SIZE #x80DE)
-(define-enum 'img GL_COLOR_TABLE_INTENSITY_SIZE #x80DF)
-(define-enum 'img GL_CONSTANT_BORDER #x8151)
-(define-enum 'img GL_REPLICATE_BORDER #x8153)
-(define-enum 'img GL_CONVOLUTION_BORDER_COLOR #x8154)
-
-(define-enum 13 GL_TEXTURE0 #x84C0)
-(define-enum 13 GL_TEXTURE1 #x84C1)
-(define-enum 13 GL_TEXTURE2 #x84C2)
-(define-enum 13 GL_TEXTURE3 #x84C3)
-(define-enum 13 GL_TEXTURE4 #x84C4)
-(define-enum 13 GL_TEXTURE5 #x84C5)
-(define-enum 13 GL_TEXTURE6 #x84C6)
-(define-enum 13 GL_TEXTURE7 #x84C7)
-(define-enum 13 GL_TEXTURE8 #x84C8)
-(define-enum 13 GL_TEXTURE9 #x84C9)
-(define-enum 13 GL_TEXTURE10 #x84CA)
-(define-enum 13 GL_TEXTURE11 #x84CB)
-(define-enum 13 GL_TEXTURE12 #x84CC)
-(define-enum 13 GL_TEXTURE13 #x84CD)
-(define-enum 13 GL_TEXTURE14 #x84CE)
-(define-enum 13 GL_TEXTURE15 #x84CF)
-(define-enum 13 GL_TEXTURE16 #x84D0)
-(define-enum 13 GL_TEXTURE17 #x84D1)
-(define-enum 13 GL_TEXTURE18 #x84D2)
-(define-enum 13 GL_TEXTURE19 #x84D3)
-(define-enum 13 GL_TEXTURE20 #x84D4)
-(define-enum 13 GL_TEXTURE21 #x84D5)
-(define-enum 13 GL_TEXTURE22 #x84D6)
-(define-enum 13 GL_TEXTURE23 #x84D7)
-(define-enum 13 GL_TEXTURE24 #x84D8)
-(define-enum 13 GL_TEXTURE25 #x84D9)
-(define-enum 13 GL_TEXTURE26 #x84DA)
-(define-enum 13 GL_TEXTURE27 #x84DB)
-(define-enum 13 GL_TEXTURE28 #x84DC)
-(define-enum 13 GL_TEXTURE29 #x84DD)
-(define-enum 13 GL_TEXTURE30 #x84DE)
-(define-enum 13 GL_TEXTURE31 #x84DF)
-(define-enum 13 GL_ACTIVE_TEXTURE #x84E0)
-(define-enum 13 GL_CLIENT_ACTIVE_TEXTURE #x84E1)
-(define-enum 13 GL_MAX_TEXTURE_UNITS #x84E2)
-(define-enum 13 GL_TRANSPOSE_MODELVIEW_MATRIX #x84E3)
-(define-enum 13 GL_TRANSPOSE_PROJECTION_MATRIX #x84E4)
-(define-enum 13 GL_TRANSPOSE_TEXTURE_MATRIX #x84E5)
-(define-enum 13 GL_TRANSPOSE_COLOR_MATRIX #x84E6)
-(define-enum 13 GL_MULTISAMPLE #x809D)
-(define-enum 13 GL_SAMPLE_ALPHA_TO_COVERAGE #x809E)
-(define-enum 13 GL_SAMPLE_ALPHA_TO_ONE #x809F)
-(define-enum 13 GL_SAMPLE_COVERAGE #x80A0)
-(define-enum 13 GL_SAMPLE_BUFFERS #x80A8)
-(define-enum 13 GL_SAMPLES #x80A9)
-(define-enum 13 GL_SAMPLE_COVERAGE_VALUE #x80AA)
-(define-enum 13 GL_SAMPLE_COVERAGE_INVERT #x80AB)
-(define-enum 13 GL_MULTISAMPLE_BIT #x20000000)
-(define-enum 13 GL_NORMAL_MAP #x8511)
-(define-enum 13 GL_REFLECTION_MAP #x8512)
-(define-enum 13 GL_TEXTURE_CUBE_MAP #x8513)
-(define-enum 13 GL_TEXTURE_BINDING_CUBE_MAP #x8514)
-(define-enum 13 GL_TEXTURE_CUBE_MAP_POSITIVE_X #x8515)
-(define-enum 13 GL_TEXTURE_CUBE_MAP_NEGATIVE_X #x8516)
-(define-enum 13 GL_TEXTURE_CUBE_MAP_POSITIVE_Y #x8517)
-(define-enum 13 GL_TEXTURE_CUBE_MAP_NEGATIVE_Y #x8518)
-(define-enum 13 GL_TEXTURE_CUBE_MAP_POSITIVE_Z #x8519)
-(define-enum 13 GL_TEXTURE_CUBE_MAP_NEGATIVE_Z #x851A)
-(define-enum 13 GL_PROXY_TEXTURE_CUBE_MAP #x851B)
-(define-enum 13 GL_MAX_CUBE_MAP_TEXTURE_SIZE #x851C)
-(define-enum 13 GL_COMPRESSED_ALPHA #x84E9)
-(define-enum 13 GL_COMPRESSED_LUMINANCE #x84EA)
-(define-enum 13 GL_COMPRESSED_LUMINANCE_ALPHA #x84EB)
-(define-enum 13 GL_COMPRESSED_INTENSITY #x84EC)
-(define-enum 13 GL_COMPRESSED_RGB #x84ED)
-(define-enum 13 GL_COMPRESSED_RGBA #x84EE)
-(define-enum 13 GL_TEXTURE_COMPRESSION_HINT #x84EF)
-(define-enum 13 GL_TEXTURE_COMPRESSED_IMAGE_SIZE #x86A0)
-(define-enum 13 GL_TEXTURE_COMPRESSED #x86A1)
-(define-enum 13 GL_NUM_COMPRESSED_TEXTURE_FORMATS #x86A2)
-(define-enum 13 GL_COMPRESSED_TEXTURE_FORMATS #x86A3)
-(define-enum 13 GL_CLAMP_TO_BORDER #x812D)
-(define-enum 13 GL_COMBINE #x8570)
-(define-enum 13 GL_COMBINE_RGB #x8571)
-(define-enum 13 GL_COMBINE_ALPHA #x8572)
-(define-enum 13 GL_SOURCE0_RGB #x8580)
-(define-enum 13 GL_SOURCE1_RGB #x8581)
-(define-enum 13 GL_SOURCE2_RGB #x8582)
-(define-enum 13 GL_SOURCE0_ALPHA #x8588)
-(define-enum 13 GL_SOURCE1_ALPHA #x8589)
-(define-enum 13 GL_SOURCE2_ALPHA #x858A)
-(define-enum 13 GL_OPERAND0_RGB #x8590)
-(define-enum 13 GL_OPERAND1_RGB #x8591)
-(define-enum 13 GL_OPERAND2_RGB #x8592)
-(define-enum 13 GL_OPERAND0_ALPHA #x8598)
-(define-enum 13 GL_OPERAND1_ALPHA #x8599)
-(define-enum 13 GL_OPERAND2_ALPHA #x859A)
-(define-enum 13 GL_RGB_SCALE #x8573)
-(define-enum 13 GL_ADD_SIGNED #x8574)
-(define-enum 13 GL_INTERPOLATE #x8575)
-(define-enum 13 GL_SUBTRACT #x84E7)
-(define-enum 13 GL_CONSTANT #x8576)
-(define-enum 13 GL_PRIMARY_COLOR #x8577)
-(define-enum 13 GL_PREVIOUS #x8578)
-(define-enum 13 GL_DOT3_RGB #x86AE)
-(define-enum 13 GL_DOT3_RGBA #x86AF)
-
-(define-enum 14 GL_BLEND_DST_RGB #x80C8)
-(define-enum 14 GL_BLEND_SRC_RGB #x80C9)
-(define-enum 14 GL_BLEND_DST_ALPHA #x80CA)
-(define-enum 14 GL_BLEND_SRC_ALPHA #x80CB)
-(define-enum 14 GL_POINT_SIZE_MIN #x8126)
-(define-enum 14 GL_POINT_SIZE_MAX #x8127)
-(define-enum 14 GL_POINT_FADE_THRESHOLD_SIZE #x8128)
-(define-enum 14 GL_POINT_DISTANCE_ATTENUATION #x8129)
-(define-enum 14 GL_GENERATE_MIPMAP #x8191)
-(define-enum 14 GL_GENERATE_MIPMAP_HINT #x8192)
-(define-enum 14 GL_DEPTH_COMPONENT16 #x81A5)
-(define-enum 14 GL_DEPTH_COMPONENT24 #x81A6)
-(define-enum 14 GL_DEPTH_COMPONENT32 #x81A7)
-(define-enum 14 GL_MIRRORED_REPEAT #x8370)
-(define-enum 14 GL_FOG_COORDINATE_SOURCE #x8450)
-(define-enum 14 GL_FOG_COORDINATE #x8451)
-(define-enum 14 GL_FRAGMENT_DEPTH #x8452)
-(define-enum 14 GL_CURRENT_FOG_COORDINATE #x8453)
-(define-enum 14 GL_FOG_COORDINATE_ARRAY_TYPE #x8454)
-(define-enum 14 GL_FOG_COORDINATE_ARRAY_STRIDE #x8455)
-(define-enum 14 GL_FOG_COORDINATE_ARRAY_POINTER #x8456)
-(define-enum 14 GL_FOG_COORDINATE_ARRAY #x8457)
-(define-enum 14 GL_COLOR_SUM #x8458)
-(define-enum 14 GL_CURRENT_SECONDARY_COLOR #x8459)
-(define-enum 14 GL_SECONDARY_COLOR_ARRAY_SIZE #x845A)
-(define-enum 14 GL_SECONDARY_COLOR_ARRAY_TYPE #x845B)
-(define-enum 14 GL_SECONDARY_COLOR_ARRAY_STRIDE #x845C)
-(define-enum 14 GL_SECONDARY_COLOR_ARRAY_POINTER #x845D)
-(define-enum 14 GL_SECONDARY_COLOR_ARRAY #x845E)
-(define-enum 14 GL_MAX_TEXTURE_LOD_BIAS #x84FD)
-(define-enum 14 GL_TEXTURE_FILTER_CONTROL #x8500)
-(define-enum 14 GL_TEXTURE_LOD_BIAS #x8501)
-(define-enum 14 GL_INCR_WRAP #x8507)
-(define-enum 14 GL_DECR_WRAP #x8508)
-(define-enum 14 GL_TEXTURE_DEPTH_SIZE #x884A)
-(define-enum 14 GL_DEPTH_TEXTURE_MODE #x884B)
-(define-enum 14 GL_TEXTURE_COMPARE_MODE #x884C)
-(define-enum 14 GL_TEXTURE_COMPARE_FUNC #x884D)
-(define-enum 14 GL_COMPARE_R_TO_TEXTURE #x884E)
-
-(define-enum 15 GL_BUFFER_SIZE #x8764)
-(define-enum 15 GL_BUFFER_USAGE #x8765)
-(define-enum 15 GL_QUERY_COUNTER_BITS #x8864)
-(define-enum 15 GL_CURRENT_QUERY #x8865)
-(define-enum 15 GL_QUERY_RESULT #x8866)
-(define-enum 15 GL_QUERY_RESULT_AVAILABLE #x8867)
-(define-enum 15 GL_ARRAY_BUFFER #x8892)
-(define-enum 15 GL_ELEMENT_ARRAY_BUFFER #x8893)
-(define-enum 15 GL_ARRAY_BUFFER_BINDING #x8894)
-(define-enum 15 GL_ELEMENT_ARRAY_BUFFER_BINDING #x8895)
-(define-enum 15 GL_VERTEX_ARRAY_BUFFER_BINDING #x8896)
-(define-enum 15 GL_NORMAL_ARRAY_BUFFER_BINDING #x8897)
-(define-enum 15 GL_COLOR_ARRAY_BUFFER_BINDING #x8898)
-(define-enum 15 GL_INDEX_ARRAY_BUFFER_BINDING #x8899)
-(define-enum 15 GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING #x889A)
-(define-enum 15 GL_EDGE_FLAG_ARRAY_BUFFER_BINDING #x889B)
-(define-enum 15 GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING #x889C)
-(define-enum 15 GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING #x889D)
-(define-enum 15 GL_WEIGHT_ARRAY_BUFFER_BINDING #x889E)
-(define-enum 15 GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING #x889F)
-(define-enum 15 GL_READ_ONLY #x88B8)
-(define-enum 15 GL_WRITE_ONLY #x88B9)
-(define-enum 15 GL_READ_WRITE #x88BA)
-(define-enum 15 GL_BUFFER_ACCESS #x88BB)
-(define-enum 15 GL_BUFFER_MAPPED #x88BC)
-(define-enum 15 GL_BUFFER_MAP_POINTER #x88BD)
-(define-enum 15 GL_STREAM_DRAW #x88E0)
-(define-enum 15 GL_STREAM_READ #x88E1)
-(define-enum 15 GL_STREAM_COPY #x88E2)
-(define-enum 15 GL_STATIC_DRAW #x88E4)
-(define-enum 15 GL_STATIC_READ #x88E5)
-(define-enum 15 GL_STATIC_COPY #x88E6)
-(define-enum 15 GL_DYNAMIC_DRAW #x88E8)
-(define-enum 15 GL_DYNAMIC_READ #x88E9)
-(define-enum 15 GL_DYNAMIC_COPY #x88EA)
-(define-enum 15 GL_SAMPLES_PASSED #x8914)
-(define-enum 15 GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE)
-(define-enum 15 GL_FOG_COORD GL_FOG_COORDINATE)
-(define-enum 15 GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE)
-(define-enum 15 GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE)
-(define-enum 15 GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE)
-(define-enum 15 GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER)
-(define-enum 15 GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY)
-(define-enum 15 GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING)
-(define-enum 15 GL_SRC0_RGB GL_SOURCE0_RGB)
-(define-enum 15 GL_SRC1_RGB GL_SOURCE1_RGB)
-(define-enum 15 GL_SRC2_RGB GL_SOURCE2_RGB)
-(define-enum 15 GL_SRC0_ALPHA GL_SOURCE0_ALPHA)
-(define-enum 15 GL_SRC1_ALPHA GL_SOURCE1_ALPHA)
-(define-enum 15 GL_SRC2_ALPHA GL_SOURCE2_ALPHA)
-
-;; These values are taken from SGI's glu.h.
-(define-enum GLU_FALSE 0)
-(define-enum GLU_TRUE 1)
-(define-enum GLU_VERSION 100800)
-(define-enum GLU_EXTENSIONS 100801)
-(define-enum GLU_INVALID_ENUM 100900)
-(define-enum GLU_INVALID_VALUE 100901)
-(define-enum GLU_OUT_OF_MEMORY 100902)
-(define-enum GLU_INVALID_OPERATION 100904)
-(define-enum GLU_OUTLINE_POLYGON 100240)
-(define-enum GLU_OUTLINE_PATCH 100241)
-(define-enum GLU_NURBS_ERROR 100103)
-(define-enum GLU_ERROR 100103)
-(define-enum GLU_NURBS_BEGIN 100164)
-(define-enum GLU_NURBS_BEGIN_EXT 100164)
-(define-enum GLU_NURBS_VERTEX 100165)
-(define-enum GLU_NURBS_VERTEX_EXT 100165)
-(define-enum GLU_NURBS_NORMAL 100166)
-(define-enum GLU_NURBS_NORMAL_EXT 100166)
-(define-enum GLU_NURBS_COLOR 100167)
-(define-enum GLU_NURBS_COLOR_EXT 100167)
-(define-enum GLU_NURBS_TEXTURE_COORD 100168)
-(define-enum GLU_NURBS_TEX_COORD_EXT 100168)
-(define-enum GLU_NURBS_END 100169)
-(define-enum GLU_NURBS_END_EXT 100169)
-(define-enum GLU_NURBS_BEGIN_DATA 100170)
-(define-enum GLU_NURBS_BEGIN_DATA_EXT 100170)
-(define-enum GLU_NURBS_VERTEX_DATA 100171)
-(define-enum GLU_NURBS_VERTEX_DATA_EXT 100171)
-(define-enum GLU_NURBS_NORMAL_DATA 100172)
-(define-enum GLU_NURBS_NORMAL_DATA_EXT 100172)
-(define-enum GLU_NURBS_COLOR_DATA 100173)
-(define-enum GLU_NURBS_COLOR_DATA_EXT 100173)
-(define-enum GLU_NURBS_TEXTURE_COORD_DATA 100174)
-(define-enum GLU_NURBS_TEX_COORD_DATA_EXT 100174)
-(define-enum GLU_NURBS_END_DATA 100175)
-(define-enum GLU_NURBS_END_DATA_EXT 100175)
-(define-enum GLU_NURBS_ERROR1 100251)
-(define-enum GLU_NURBS_ERROR2 100252)
-(define-enum GLU_NURBS_ERROR3 100253)
-(define-enum GLU_NURBS_ERROR4 100254)
-(define-enum GLU_NURBS_ERROR5 100255)
-(define-enum GLU_NURBS_ERROR6 100256)
-(define-enum GLU_NURBS_ERROR7 100257)
-(define-enum GLU_NURBS_ERROR8 100258)
-(define-enum GLU_NURBS_ERROR9 100259)
-(define-enum GLU_NURBS_ERROR10 100260)
-(define-enum GLU_NURBS_ERROR11 100261)
-(define-enum GLU_NURBS_ERROR12 100262)
-(define-enum GLU_NURBS_ERROR13 100263)
-(define-enum GLU_NURBS_ERROR14 100264)
-(define-enum GLU_NURBS_ERROR15 100265)
-(define-enum GLU_NURBS_ERROR16 100266)
-(define-enum GLU_NURBS_ERROR17 100267)
-(define-enum GLU_NURBS_ERROR18 100268)
-(define-enum GLU_NURBS_ERROR19 100269)
-(define-enum GLU_NURBS_ERROR20 100270)
-(define-enum GLU_NURBS_ERROR21 100271)
-(define-enum GLU_NURBS_ERROR22 100272)
-(define-enum GLU_NURBS_ERROR23 100273)
-(define-enum GLU_NURBS_ERROR24 100274)
-(define-enum GLU_NURBS_ERROR25 100275)
-(define-enum GLU_NURBS_ERROR26 100276)
-(define-enum GLU_NURBS_ERROR27 100277)
-(define-enum GLU_NURBS_ERROR28 100278)
-(define-enum GLU_NURBS_ERROR29 100279)
-(define-enum GLU_NURBS_ERROR30 100280)
-(define-enum GLU_NURBS_ERROR31 100281)
-(define-enum GLU_NURBS_ERROR32 100282)
-(define-enum GLU_NURBS_ERROR33 100283)
-(define-enum GLU_NURBS_ERROR34 100284)
-(define-enum GLU_NURBS_ERROR35 100285)
-(define-enum GLU_NURBS_ERROR36 100286)
-(define-enum GLU_NURBS_ERROR37 100287)
-(define-enum GLU_AUTO_LOAD_MATRIX 100200)
-(define-enum GLU_CULLING 100201)
-(define-enum GLU_SAMPLING_TOLERANCE 100203)
-(define-enum GLU_DISPLAY_MODE 100204)
-(define-enum GLU_PARAMETRIC_TOLERANCE 100202)
-(define-enum GLU_SAMPLING_METHOD 100205)
-(define-enum GLU_U_STEP 100206)
-(define-enum GLU_V_STEP 100207)
-(define-enum GLU_NURBS_MODE 100160)
-(define-enum GLU_NURBS_MODE_EXT 100160)
-(define-enum GLU_NURBS_TESSELLATOR 100161)
-(define-enum GLU_NURBS_TESSELLATOR_EXT 100161)
-(define-enum GLU_NURBS_RENDERER 100162)
-(define-enum GLU_NURBS_RENDERER_EXT 100162)
-(define-enum GLU_OBJECT_PARAMETRIC_ERROR 100208)
-(define-enum GLU_OBJECT_PARAMETRIC_ERROR_EXT 100208)
-(define-enum GLU_OBJECT_PATH_LENGTH 100209)
-(define-enum GLU_OBJECT_PATH_LENGTH_EXT 100209)
-(define-enum GLU_PATH_LENGTH 100215)
-(define-enum GLU_PARAMETRIC_ERROR 100216)
-(define-enum GLU_DOMAIN_DISTANCE 100217)
-(define-enum GLU_MAP1_TRIM_2 100210)
-(define-enum GLU_MAP1_TRIM_3 100211)
-(define-enum GLU_POINT 100010)
-(define-enum GLU_LINE 100011)
-(define-enum GLU_FILL 100012)
-(define-enum GLU_SILHOUETTE 100013)
-(define-enum GLU_SMOOTH 100000)
-(define-enum GLU_FLAT 100001)
-(define-enum GLU_NONE 100002)
-(define-enum GLU_OUTSIDE 100020)
-(define-enum GLU_INSIDE 100021)
-(define-enum GLU_TESS_BEGIN 100100)
-(define-enum GLU_BEGIN 100100)
-(define-enum GLU_TESS_VERTEX 100101)
-(define-enum GLU_VERTEX 100101)
-(define-enum GLU_TESS_END 100102)
-(define-enum GLU_END 100102)
-(define-enum GLU_TESS_ERROR 100103)
-(define-enum GLU_TESS_EDGE_FLAG 100104)
-(define-enum GLU_EDGE_FLAG 100104)
-(define-enum GLU_TESS_COMBINE 100105)
-(define-enum GLU_TESS_BEGIN_DATA 100106)
-(define-enum GLU_TESS_VERTEX_DATA 100107)
-(define-enum GLU_TESS_END_DATA 100108)
-(define-enum GLU_TESS_ERROR_DATA 100109)
-(define-enum GLU_TESS_EDGE_FLAG_DATA 100110)
-(define-enum GLU_TESS_COMBINE_DATA 100111)
-(define-enum GLU_CW 100120)
-(define-enum GLU_CCW 100121)
-(define-enum GLU_INTERIOR 100122)
-(define-enum GLU_EXTERIOR 100123)
-(define-enum GLU_UNKNOWN 100124)
-(define-enum GLU_TESS_WINDING_RULE 100140)
-(define-enum GLU_TESS_BOUNDARY_ONLY 100141)
-(define-enum GLU_TESS_TOLERANCE 100142)
-(define-enum GLU_TESS_ERROR1 100151)
-(define-enum GLU_TESS_ERROR2 100152)
-(define-enum GLU_TESS_ERROR3 100153)
-(define-enum GLU_TESS_ERROR4 100154)
-(define-enum GLU_TESS_ERROR5 100155)
-(define-enum GLU_TESS_ERROR6 100156)
-(define-enum GLU_TESS_ERROR7 100157)
-(define-enum GLU_TESS_ERROR8 100158)
-(define-enum GLU_TESS_MISSING_BEGIN_POLYGON 100151)
-(define-enum GLU_TESS_MISSING_BEGIN_CONTOUR 100152)
-(define-enum GLU_TESS_MISSING_END_POLYGON 100153)
-(define-enum GLU_TESS_MISSING_END_CONTOUR 100154)
-(define-enum GLU_TESS_COORD_TOO_LARGE 100155)
-(define-enum GLU_TESS_NEED_COMBINE_CALLBACK 100156)
-(define-enum GLU_TESS_WINDING_ODD 100130)
-(define-enum GLU_TESS_WINDING_NONZERO 100131)
-(define-enum GLU_TESS_WINDING_POSITIVE 100132)
-(define-enum GLU_TESS_WINDING_NEGATIVE 100133)
-(define-enum GLU_TESS_WINDING_ABS_GEQ_TWO 100134)
-(define-enum GLU_TESS_MAX_COORD 1.0e150)
diff --git a/pkgs/sgl/info.rkt b/pkgs/sgl/info.rkt
deleted file mode 100644
index ac799dd422..0000000000
--- a/pkgs/sgl/info.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang info
-
-(define collection "sgl")
-
-(define compile-omit-paths '("examples"))
-(define test-omit-paths '("examples"))
-
-(define scribblings '(("scribblings/sgl.scrbl" (multi-page) (gui-library))))
-(define deps '("scheme-lib"
-               "base"
-               "compatibility-lib"
-               "gui-lib"))
-(define build-deps '("draw-doc"
-                     "gui-doc"
-                     "racket-doc"
-                     "scribble-lib"))
-
-(define pkg-desc "Legacy OpenGL library")
-
-(define pkg-authors '(jay))
diff --git a/pkgs/sgl/init.rkt b/pkgs/sgl/init.rkt
deleted file mode 100644
index 1451f7a850..0000000000
--- a/pkgs/sgl/init.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-(require ffi/unsafe)
-
-;; Apple's GL implementation seg faults when GL commands are used
-;; without a context --- which is fair according to the GL spec, but
-;; not nice for Racket users. To avoid crashes, install a dummy
-;; context if none is already current. On other platforms, this
-;; module ends up doing nothing.
-
-(when (eq? (system-type) 'macosx)
-  (define agl-lib (ffi-lib "/System/Library/Frameworks/AGL.framework/AGL"))
-
-  (define _GLint _int)
-  (define _GLboolean _bool)
-  (define _AGLPixelFormat (_cpointer/null 'AGLPixelFormat))
-  (define _AGLContext (_cpointer/null 'AGLContext))
-
-  (define-syntax-rule (define-agl name type)
-    (define name (get-ffi-obj 'name agl-lib type (lambda () void))))
-
-  (define-agl aglSetCurrentContext (_fun _AGLContext -> _GLboolean))
-  (define-agl aglGetCurrentContext (_fun -> _AGLContext))
-
-  (define-agl aglChoosePixelFormat (_fun _pointer _GLint (_list i _GLint) -> _AGLPixelFormat))
-
-  (define-agl aglCreateContext (_fun _AGLPixelFormat _AGLContext -> _AGLContext))
-
-  (define AGL_NONE                   0)
-  (define AGL_RGBA                   4)
-  (define AGL_PIXEL_SIZE            50)
-  (define AGL_OFFSCREEN             53)
-
-  (unless (aglGetCurrentContext)
-    (let ([fmt (aglChoosePixelFormat
-                #f
-                0
-                (list AGL_RGBA
-                      AGL_PIXEL_SIZE 32
-                      AGL_OFFSCREEN
-                      AGL_NONE))])
-      (when fmt
-           (let ([d (aglCreateContext fmt #f)])
-             (when d
-               (void (aglSetCurrentContext d))))))))
-
diff --git a/pkgs/sgl/main.rkt b/pkgs/sgl/main.rkt
deleted file mode 100644
index 8d3bfd815a..0000000000
--- a/pkgs/sgl/main.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang scheme/base
-(require (prefix-in gl- "sgl.rkt"))
-(provide (all-from-out "sgl.rkt"))
diff --git a/pkgs/sgl/scribblings/bitmap.scrbl b/pkgs/sgl/scribblings/bitmap.scrbl
deleted file mode 100644
index a1754b8960..0000000000
--- a/pkgs/sgl/scribblings/bitmap.scrbl
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label racket/class))
-
-@title[#:tag "bitmaps"]{Bitmaps}
-
-@defmodule[sgl/bitmap]
-
-
-@defproc[(bitmap->gl-list [bitmap (is-a?/c bitmap%)]
-                          [#:with-gl with-gl-proc ((-> any) . -> . any)
-                                     (lambda (f) (f))]
-                          [#:mask mask (or/c (is-a?/c bitmap%) false/c)
-                                       (send bitmap get-loaded-mask)])
-         exact-integer?]{
-
-Converts the given bitmap into an OpenGL list that can be rendered
-with @racket[gl-call-list] or @racket[glCallList]. The rendered object
-is a square on the @math{z=0} plane with corners at @math{(0,0)} and
-@math{(1,1)}.
-
-The @racket[with-gl-proc] must accept a thunk and call it while the
-relevant OpenGL context is selected. Otherwise, the relevant OpenGL
-context must be selected already.
-
-If @racket[mask] is not @racket[#f], it is used as the mask bitmap for
-extracting alpha values.}
-
diff --git a/pkgs/sgl/scribblings/common.rkt b/pkgs/sgl/scribblings/common.rkt
deleted file mode 100644
index 66c5178efb..0000000000
--- a/pkgs/sgl/scribblings/common.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scheme/base
-
-
-(require scribble/manual
-         scribble/bnf
-         (for-label scheme/base
-                    scheme/contract
-                    scheme/gui/base
-                    (except-in scheme/foreign ->)
-                    sgl
-                    sgl/gl
-                    sgl/gl-vectors))
-(provide (all-from-out scribble/manual)
-         (for-label (all-from-out scheme/base
-                                  scheme/contract
-                                  scheme/gui/base
-                                  scheme/foreign
-                                  sgl
-                                  sgl/gl
-                                  sgl/gl-vectors)))
diff --git a/pkgs/sgl/scribblings/gl-vectors.scrbl b/pkgs/sgl/scribblings/gl-vectors.scrbl
deleted file mode 100644
index 4fcb077360..0000000000
--- a/pkgs/sgl/scribblings/gl-vectors.scrbl
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/bnf (for-syntax racket/base))
-
-@title[#:tag "gl-vectors"]{OpenGL Vectors}
-
-@defmodule[sgl/gl-vectors]
-
-The @racketmodname[sgl/gl-vectors] module supports OpenGL programming
-with @racket[cvector]s.  In this document and in the error messages, a
-``gl-vector'' is just a @racket[cvector], while a
-``gl-@nonterm{type}-vector'' is a @racket[cvector] with an appropriate
-type. Use the @racketmodname[sgl/gl-vectors] module vectors instead of
-a Racket @racket[cvector] directly, because they are specialized to
-handle the OpenGL types correctly.
-
-@deftogether[(
-@defproc[(gl-vector? [v any/c]) boolean?]
-@defproc[(gl-vector->vector [vec cvector?]) vector?]
-@defproc[(gl-vector->list [vec cvector?]) list?]
-@defproc[(gl-vector-length [vec cvector?]) exact-nonnegative-integer?]
-@defproc[(gl-vector-ref [vec cvector?][pos exact-nonnegative-integer?]) any/v]
-@defproc[(gl-vector-set! [vec cvector?][pos exact-nonnegative-integer?][v any/v]) void?]
-)]{
-
-Synonyms for @racket[cvector?], @racket[cvector->vector], @racket[cvector-length], etc.}
-
-@(define-syntax (define-gl-vector stx)
-  (syntax-case stx ()
-    [(_ type)
-     (let ([mk (lambda s
-                 (string->symbol (apply string-append s)))]
-           [type (symbol->string (syntax-e #'type))]
-           [locs (lambda (l)
-                   (datum->syntax #'here
-                                  (list
-                                   (datum->syntax #'here
-                                                  (car l)
-                                                  #("?" 1 1 2 1))
-                                   (datum->syntax #'here
-                                                  (cadr l)
-                                                  #("?" 1 3 4 1)))
-                                  #("?" 1 0 1 3)))])
-       (with-syntax ([<type> (mk type)]
-                     [<type>? (mk type "?")]
-                     [gl-<type>-vector? (mk "gl-" type "-vector?")]
-                     [gl-<type>-vector (mk "gl-" type "-vector")]
-                     [make-gl-<type>-vector (mk "make-gl-" type "-vector")]
-                     [vector->gl-<type>-vector (mk "vector->gl-" type "-vector")]
-                     [list->gl-<type>-vector (mk "list->gl-" type "-vector")]
-                     [gl-<type>-vector+ (mk "gl-" type "-vector+")]
-                     [gl-<type>-vector- (mk "gl-" type "-vector-")]
-                     [gl-<type>-vector* (mk "gl-" type "-vector*")]
-                     [vectorof-<type>? (locs `(vectorof ,(mk type "?")))]
-                     [listof-<type>? (locs `(listof ,(mk type "?")))])
-         #'(...
-            @deftogether[(
-             @defproc[(gl-<type>-vector? [v any/c]) boolean?]
-             @defproc[(make-gl-<type>-vector [pos exact-nonnegative-integer?]) gl-<type>-vector?]
-             @defproc[(gl-<type>-vector [v <type>?] ...) gl-<type>-vector?]
-             @defproc[(vector->gl-<type>-vector [v vectorof-<type>?] ...) gl-<type>-vector?]
-             @defproc[(list->gl-<type>-vector [v listof-<type>?] ...) gl-<type>-vector?]
-             @defproc[(gl-<type>-vector+ [vec  gl-<type>-vector?] ...+) gl-<type>-vector?]
-             @defproc[(gl-<type>-vector- [vec  gl-<type>-vector?] ...+) gl-<type>-vector?]
-             @defproc[(gl-<type>-vector* [x real?][vec gl-<type>-vector?]) gl-<type>-vector?]
-             )]{
-
-             Operations on vectors of @racket[<type>] elements. The @racket[gl-<type>-vector+]
-             and @racket[gl-<type>-vector-] functions compute the element-by-element sum and
-             difference of the given vectors, respectively. The @racket[gl-<type>-vector*] function
-             multiplies each element of @racket[vec] by @racket[x].})))]))
-
-@(define-gl-vector byte)
-@(define-gl-vector ubyte)
-@(define-gl-vector short)
-@(define-gl-vector ushort)
-@(define-gl-vector int)
-@(define-gl-vector uint)
-@(define-gl-vector float)
-@(define-gl-vector double)
-@(define-gl-vector boolean)
-
-@defproc[(gl-vector-norm [vec gl-vector?]) real?]{
-
-Returns the square root of the sum of the squares of the elements
-of @racket[vec].}
-
diff --git a/pkgs/sgl/scribblings/gl.scrbl b/pkgs/sgl/scribblings/gl.scrbl
deleted file mode 100644
index 42b4322f95..0000000000
--- a/pkgs/sgl/scribblings/gl.scrbl
+++ /dev/null
@@ -1,1638 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/bnf scribble/eval (for-syntax racket/base))
-
-@title[#:tag "gl"]{C-Style OpenGL}
-
-@defmodule[sgl/gl]
-
-The @racketmodname[sgl/gl] module provides a direct interface to the
-system's GL library closely following the conventions of the
-C-language OpenGL API.  It provides a binding for each @tt{#defined}
-constant (these start with @racketidfont{GL_}) and for the functions
-in the GL 1.5 and GLU 1.3 specifications, except for the following:
-
-@itemize[#:style 'compact
- @item{Vertex arrays           (GL 1.5, Section 2.8)}
- @item{Buffer objects          (GL 1.5, Section 2.9)}
- @item{@tt{glGetPointerv}      (GL 1.5, Section 6.1.11)}
- @item{Buffer object queries   (GL 1.5, Section 6.1.13)}
- @item{Polygon tessellation    (GLU 1.3, Section 5)}
- @item{@tt{gluQuadricCallback} (GLU 1.3, Section 6.2)}
- @item{NURBS callbacks         (GLU 1.3, Section 7.2)}
-]
-
-If one of the provided functions is not present on your system
-(e.g. if your system supports only GL 1.3), then the corresponding
-@racketmodname[sgl/gl] function raises a run-time exception when
-invoked.
-
-The functions provided by @racketmodname[sgl/gl] perform comparable
-checking to their C-language counterparts; they check the types of
-their arguments, but do not check the length of array arguments.  The
-following details the kinds of Racket values that can be provided for
-each primitive OpenGL type:
-
-@itemize[
-
- @item{@as-index{@tt{GLbyte}},
-       @as-index{@tt{GLshort}},
-       @as-index{@tt{GLint}}:
-       exact integer in the proper range}
-
- @item{@as-index{@tt{GLubyte}},
-       @as-index{@tt{GLushort}},
-       @as-index{@tt{GLuint}}:
-       exact non-negative integer in the proper range}
-
- @item{@as-index{@tt{GLsizei}},
-       @as-index{@tt{GLenum}},
-       @as-index{@tt{GLbitfield}}:
-       exact non-negative integer in the proper range}
-
- @item{@as-index{@tt{GFfloat}},
-       @as-index{@tt{GLdouble}}:
-       real number}
-
- @item{@as-index{@tt{GFclampf}},
-       @as-index{@tt{GLclampd}}:
-       real number}
-
- @item{@as-index{@tt{GLboolean}}: any value, where @racket[#f] means
-       @as-index{@tt{GL_FALSE}} and all other values mean
-       @as-index{@tt{GL_TRUE}}; do not use @racket[GL_FALSE] or
-       @racket[GL_TRUE], since they are bound to integers, both will
-       end up being converted to GL_TRUE.}
-
-]
-				    
-OpenGL functions that take vector arguments accept @racket[cvector]
-values. The type of the @racket[cvector] is checked; for example,
-@tt{glVertex3fv} expects a vector of @tt{GLfloats}, so
-@racket[glVertex3fv] accepts only a @racket[cvector] containing reals.
-See also @racketmodname[sgl/gl-vectors]. Functions that accept arrays
-of type @tt{void*} accept any @racket[cvector]; you must ensure that
-you supply the proper kind of vector, as in the C-language OpenGL API.
-
-@as-examples[
-@racketblock[
-(require sgl/gl
-         sgl/gl-vectors)
-(glBegin GL_TRIANGLES)
-(glVertex3i 1 2 3)
-(glVertex4fv (gl-float-vector 1 2 3 4))
-(glEnd)
-]]
-
-@(define-syntax-rule (def-C-gl (id ...) body ...)
-   @deftogether[(
-    @defthing[id procedure?] ...
-   ) body ...])
-
-@def-C-gl[(
-   glPixelMapfv
-   glPixelMapuiv
-   glPixelMapusv
-   glDeleteTextures
-   glDeleteQueries
-)]{
-
-These functions do not take a size argument, because it is derived
-from the length of the argument vector.}
-
-@def-C-gl[(
-   glGenTextures
-   glGenQueries
-)]{
-
-These functions do not take vector arguments.  Instead, they allocate
-a vector of the requested size and return it.}
-
-@def-C-gl[(
-   glAreTexturesResident
-)]{
-
-This function takes in a @tt{GLuint} vector and textures, and it
-returns 2 values: the specified boolean and a boolean vector of
-residences.}
-
-@def-C-gl[(
-   glGetBooleanv
-   glGetIntegerv
-   glGetFloatv
-   glGetDoublev
-   glGetLightfv
-   glGetLightiv
-   glGetMaterialfv
-   glGetMaterialiv
-   glGetTexEnvfv
-   glGetTexEnviv
-   glGetTexGendv
-   glGetTexGenfv
-   glGetTexGeniv
-   glGetTexParameterfv
-   glGetTexParameteriv
-   glGetTexLevelParameterfv
-   glGetTexLevelParameteriv
-   glGetPixelMapfv
-   glGetPixelMapuiv
-   glGetPixelMapusv
-   glGetMapdv
-   glGetMapfv
-   glGetMapiv
-   glGetBufferParameteriv
-   glGetConvolutionParameterfv
-   glGetConvolutionParameteriv
-   glGetHistogramParameterfv
-   glGetHistogramParameteriv
-   glGetMinmaxParameterfv
-   glGetMinmaxParameteriv
-   glGetQueryiv
-   glGetQueryObjectiv
-   glGetQueryObjectuiv
-)]{
-
-Instead of taking a vector argument, these function take an integer argument
-that specifies the size of the vector that is returned.}
-
-@def-C-gl[(
-   glGetClipPlane
-)]{
-
-This function does not take a vector argument and returns a @tt{GLdouble} vector of
-length 4.}
-
-@def-C-gl[(
-   glGetString
-   gluCheckExtension
-   gluErrorString
-   gluGetString
-)]{
-These functions deal with strings instead of @tt{GLubyte} vectors.}
-
-@def-C-gl[(
-   gluProject
-   gluUnProject
-   gluUnProject4
-)]{
-
-Instead of taking pointers to @tt{GLdoubles} for return values, these
-function directly return @tt{GLdouble} vectors.}
-
-@def-C-gl[(
-   glSelectBuffer
-   glFeedbackBuffer
-)]{
-
-These functions do not take vectors, instead they return a
-@racket[selection-buffer-object] or @racket[feedback-buffer-object].
-The @racket[select-buffer->gl-uint-vector] and
-@racket[feedback-buffer->gl-float-vector] functions copy the contents
-of the buffer into a vector.  Because the OpenGL library writes to the
-buffer-object on OpenGL function calls after @tt{glSelectBuffer} or
-@tt{glFeedbackBuffer} has returned, if the buffer is garbage collected
-before OpenGL is finished writing to it, the entire Racket system can
-crash.  The @racket[gl-process-selection] function in
-@racketmodname[sgl] helps interpret the results of @tt{glSelectBuffer}
-in a Racket-friendly format.}
-
-@def-C-gl[(
-glAccum
-glActiveTexture
-glAlphaFunc
-glBegin
-glBeginQuery
-glBindTexture
-glBitmap
-glBlendColor
-glBlendEquation
-glBlendFunc
-glBlendFuncSeparate
-glCallList
-glCallLists
-glClear
-glClearAccum
-glClearColor
-glClearDepth
-glClearIndex
-glClearStencil
-glClipPlane
-glColor3b
-glColor3bv
-glColor3d
-glColor3dv
-glColor3f
-glColor3fv
-glColor3i
-glColor3iv
-glColor3s
-glColor3sv
-glColor3ub
-glColor3ubv
-glColor3ui
-glColor3uiv
-glColor3us
-glColor3usv
-glColor4b
-glColor4bv
-glColor4d
-glColor4dv
-glColor4f
-glColor4fv
-glColor4i
-glColor4iv
-glColor4s
-glColor4sv
-glColor4ub
-glColor4ubv
-glColor4ui
-glColor4uiv
-glColor4us
-glColor4usv
-glColorMask
-glColorMaterial
-glColorSubTable
-glColorTable
-glColorTableParameterfv
-glColorTableParameteriv
-glCompressedTexImage1D
-glCompressedTexImage2D
-glCompressedTexImage3D
-glCompressedTexSubImage1D
-glCompressedTexSubImage2D
-glCompressedTexSubImage3D
-glConvolutionFilter1D
-glConvolutionFilter2D
-glConvolutionParameterf
-glConvolutionParameterfv
-glConvolutionParameteri
-glConvolutionParameteriv
-glCopyColorSubTable
-glCopyColorTable
-glCopyConvolutionFilter1D
-glCopyConvolutionFilter2D
-glCopyPixels
-glCopyTexImage1D
-glCopyTexImage2D
-glCopyTexSubImage1D
-glCopyTexSubImage2D
-glCopyTexSubImage3D
-glCullFace
-glDeleteLists
-glDepthFunc
-glDepthMask
-glDepthRange
-glDisable
-glDrawBuffer
-glDrawPixels
-glEdgeFlag
-glEdgeFlagv
-glEnable
-glEnd
-glEndList
-glEndQuery
-glEvalCoord1d
-glEvalCoord1dv
-glEvalCoord1f
-glEvalCoord1fv
-glEvalCoord2d
-glEvalCoord2dv
-glEvalCoord2f
-glEvalCoord2fv
-glEvalMesh1
-glEvalMesh2
-glEvalPoint1
-glEvalPoint2
-glFinish
-glFlush
-glFogCoordd
-glFogCoorddv
-glFogCoordf
-glFogCoordfv
-glFogf
-glFogfv
-glFogi
-glFogiv
-glFrontFace
-glFrustum
-glGenLists
-glGetColorTable
-glGetCompressedTexImage
-glGetConvolutionFilter
-glGetError
-glGetHistogram
-glGetMinmax
-glGetPolygonStipple
-glGetSeparableFilter
-glGetTexImage
-glHint
-glHistogram
-glIndexMask
-glIndexd
-glIndexdv
-glIndexf
-glIndexfv
-glIndexi
-glIndexiv
-glIndexs
-glIndexsv
-glIndexub
-glIndexubv
-glInitNames
-glIsBuffer
-glIsEnabled
-glIsList
-glIsQuery
-glIsTexture
-glLightModelf
-glLightModelfv
-glLightModeli
-glLightModeliv
-glLightf
-glLightfv
-glLighti
-glLightiv
-glLineStipple
-glLineWidth
-glListBase
-glLoadIdentity
-glLoadMatrixd
-glLoadMatrixf
-glLoadName
-glLoadTransposeMatrixd
-glLoadTransposeMatrixf
-glLogicOp
-glMap1d
-glMap1f
-glMap2d
-glMap2f
-glMapGrid1d
-glMapGrid1f
-glMapGrid2d
-glMapGrid2f
-glMaterialf
-glMaterialfv
-glMateriali
-glMaterialiv
-glMatrixMode
-glMinmax
-glMultMatrixd
-glMultMatrixf
-glMultTransposeMatrixd
-glMultTransposeMatrixf
-glMultiTexCoord1d
-glMultiTexCoord1dv
-glMultiTexCoord1f
-glMultiTexCoord1fv
-glMultiTexCoord1i
-glMultiTexCoord1iv
-glMultiTexCoord1s
-glMultiTexCoord1sv
-glMultiTexCoord2d
-glMultiTexCoord2dv
-glMultiTexCoord2f
-glMultiTexCoord2fv
-glMultiTexCoord2i
-glMultiTexCoord2iv
-glMultiTexCoord2s
-glMultiTexCoord2sv
-glMultiTexCoord3d
-glMultiTexCoord3dv
-glMultiTexCoord3f
-glMultiTexCoord3fv
-glMultiTexCoord3i
-glMultiTexCoord3iv
-glMultiTexCoord3s
-glMultiTexCoord3sv
-glMultiTexCoord4d
-glMultiTexCoord4dv
-glMultiTexCoord4f
-glMultiTexCoord4fv
-glMultiTexCoord4i
-glMultiTexCoord4iv
-glMultiTexCoord4s
-glMultiTexCoord4sv
-glNewList
-glNormal3b
-glNormal3bv
-glNormal3d
-glNormal3dv
-glNormal3f
-glNormal3fv
-glNormal3i
-glNormal3iv
-glNormal3s
-glNormal3sv
-glOrtho
-glPassThrough
-glPixelStoref
-glPixelStorei
-glPixelTransferf
-glPixelTransferi
-glPixelZoom
-glPointParameterf
-glPointParameterfv
-glPointParameteri
-glPointParameteriv
-glPointSize
-glPolygonMode
-glPolygonOffset
-glPolygonStipple
-glPopAttrib
-glPopClientAttrib
-glPopMatrix
-glPopName
-glPushAttrib
-glPushClientAttrib
-glPushMatrix
-glPushName
-glRasterPos2d
-glRasterPos2dv
-glRasterPos2f
-glRasterPos2fv
-glRasterPos2i
-glRasterPos2iv
-glRasterPos2s
-glRasterPos2sv
-glRasterPos3d
-glRasterPos3dv
-glRasterPos3f
-glRasterPos3fv
-glRasterPos3i
-glRasterPos3iv
-glRasterPos3s
-glRasterPos3sv
-glRasterPos4d
-glRasterPos4dv
-glRasterPos4f
-glRasterPos4fv
-glRasterPos4i
-glRasterPos4iv
-glRasterPos4s
-glRasterPos4sv
-glReadBuffer
-glReadPixels
-glRectd
-glRectdv
-glRectf
-glRectfv
-glRecti
-glRectiv
-glRects
-glRectsv
-glRenderMode
-glResetHistogram
-glResetMinmax
-glRotated
-glRotatef
-glSampleCoverage
-glScaled
-glScalef
-glScissor
-glSecondaryColor3b
-glSecondaryColor3bv
-glSecondaryColor3d
-glSecondaryColor3dv
-glSecondaryColor3f
-glSecondaryColor3fv
-glSecondaryColor3i
-glSecondaryColor3iv
-glSecondaryColor3s
-glSecondaryColor3sv
-glSecondaryColor3ub
-glSecondaryColor3ubv
-glSecondaryColor3ui
-glSecondaryColor3uiv
-glSecondaryColor3us
-glSecondaryColor3usv
-glSeparableFilter2D
-glShadeModel
-glStencilFunc
-glStencilMask
-glStencilOp
-glTexCoord1d
-glTexCoord1dv
-glTexCoord1f
-glTexCoord1fv
-glTexCoord1i
-glTexCoord1iv
-glTexCoord1s
-glTexCoord1sv
-glTexCoord2d
-glTexCoord2dv
-glTexCoord2f
-glTexCoord2fv
-glTexCoord2i
-glTexCoord2iv
-glTexCoord2s
-glTexCoord2sv
-glTexCoord3d
-glTexCoord3dv
-glTexCoord3f
-glTexCoord3fv
-glTexCoord3i
-glTexCoord3iv
-glTexCoord3s
-glTexCoord3sv
-glTexCoord4d
-glTexCoord4dv
-glTexCoord4f
-glTexCoord4fv
-glTexCoord4i
-glTexCoord4iv
-glTexCoord4s
-glTexCoord4sv
-glTexEnvf
-glTexEnvfv
-glTexEnvi
-glTexEnviv
-glTexGend
-glTexGendv
-glTexGenf
-glTexGenfv
-glTexGeni
-glTexGeniv
-glTexImage1D
-glTexImage2D
-glTexImage3D
-glTexParameterf
-glTexParameterfv
-glTexParameteri
-glTexParameteriv
-glTexSubImage1D
-glTexSubImage2D
-glTexSubImage3D
-glTranslated
-glTranslatef
-glVertex2d
-glVertex2dv
-glVertex2f
-glVertex2fv
-glVertex2i
-glVertex2iv
-glVertex2s
-glVertex2sv
-glVertex3d
-glVertex3dv
-glVertex3f
-glVertex3fv
-glVertex3i
-glVertex3iv
-glVertex3s
-glVertex3sv
-glVertex4d
-glVertex4dv
-glVertex4f
-glVertex4fv
-glVertex4i
-glVertex4iv
-glVertex4s
-glVertex4sv
-glViewport
-glWindowPos2d
-glWindowPos2dv
-glWindowPos2f
-glWindowPos2fv
-glWindowPos2i
-glWindowPos2iv
-glWindowPos2s
-glWindowPos2sv
-glWindowPos3d
-glWindowPos3dv
-glWindowPos3f
-glWindowPos3fv
-glWindowPos3i
-glWindowPos3iv
-glWindowPos3s
-glWindowPos3sv
-gluBuild1DMipmapLevels
-gluBuild1DMipmaps
-gluBuild2DMipmapLevels
-gluBuild2DMipmaps
-gluBuild3DMipmapLevels
-gluBuild3DMipmaps
-gluCylinder
-gluDisk
-gluLookAt
-gluNewQuadric
-gluOrtho2D
-gluPartialDisk
-gluPerspective
-gluPickMatrix
-gluQuadricDrawStyle
-gluQuadricNormals
-gluQuadricOrientation
-gluQuadricTexture
-gluScaleImage
-gluSphere
-)]{
-
-These functions are all direct translations of the C OpenGL API.}
-
-@(define-syntax def-one-thing
-   (syntax-rules ()
-    [(_ [id pred]) @defthing[id pred]]
-    [(_ id) @defthing[id exact-integer?]]))
-
-@(define-syntax-rule (def-C-const (decl ...) body ...)
-  @deftogether[(
-   @def-one-thing[decl] ...
-  ) body ...])
-
-@def-C-const[(
-  GL_FALSE 
-  GL_TRUE 
-  GL_BYTE 
-  GL_UNSIGNED_BYTE 
-  GL_SHORT 
-  GL_UNSIGNED_SHORT 
-  GL_INT 
-  GL_UNSIGNED_INT 
-  GL_FLOAT 
-  GL_DOUBLE 
-  GL_2_BYTES 
-  GL_3_BYTES 
-  GL_4_BYTES 
-  GL_POINTS 
-  GL_LINES 
-  GL_LINE_LOOP 
-  GL_LINE_STRIP 
-  GL_TRIANGLES 
-  GL_TRIANGLE_STRIP 
-  GL_TRIANGLE_FAN 
-  GL_QUADS 
-  GL_QUAD_STRIP 
-  GL_POLYGON 
-  GL_VERTEX_ARRAY 
-  GL_NORMAL_ARRAY 
-  GL_COLOR_ARRAY 
-  GL_INDEX_ARRAY 
-  GL_TEXTURE_COORD_ARRAY 
-  GL_EDGE_FLAG_ARRAY 
-  GL_VERTEX_ARRAY_SIZE 
-  GL_VERTEX_ARRAY_TYPE 
-  GL_VERTEX_ARRAY_STRIDE 
-  GL_NORMAL_ARRAY_TYPE 
-  GL_NORMAL_ARRAY_STRIDE 
-  GL_COLOR_ARRAY_SIZE 
-  GL_COLOR_ARRAY_TYPE 
-  GL_COLOR_ARRAY_STRIDE 
-  GL_INDEX_ARRAY_TYPE 
-  GL_INDEX_ARRAY_STRIDE 
-  GL_TEXTURE_COORD_ARRAY_SIZE 
-  GL_TEXTURE_COORD_ARRAY_TYPE 
-  GL_TEXTURE_COORD_ARRAY_STRIDE 
-  GL_EDGE_FLAG_ARRAY_STRIDE 
-  GL_VERTEX_ARRAY_POINTER 
-  GL_NORMAL_ARRAY_POINTER 
-  GL_COLOR_ARRAY_POINTER 
-  GL_INDEX_ARRAY_POINTER 
-  GL_TEXTURE_COORD_ARRAY_POINTER 
-  GL_EDGE_FLAG_ARRAY_POINTER 
-  GL_V2F 
-  GL_V3F 
-  GL_C4UB_V2F 
-  GL_C4UB_V3F 
-  GL_C3F_V3F 
-  GL_N3F_V3F 
-  GL_C4F_N3F_V3F 
-  GL_T2F_V3F 
-  GL_T4F_V4F 
-  GL_T2F_C4UB_V3F 
-  GL_T2F_C3F_V3F 
-  GL_T2F_N3F_V3F 
-  GL_T2F_C4F_N3F_V3F 
-  GL_T4F_C4F_N3F_V4F 
-  GL_MATRIX_MODE 
-  GL_MODELVIEW 
-  GL_PROJECTION 
-  GL_TEXTURE 
-  GL_POINT_SMOOTH 
-  GL_POINT_SIZE 
-  GL_POINT_SIZE_GRANULARITY 
-  GL_POINT_SIZE_RANGE 
-  GL_LINE_SMOOTH 
-  GL_LINE_STIPPLE 
-  GL_LINE_STIPPLE_PATTERN 
-  GL_LINE_STIPPLE_REPEAT 
-  GL_LINE_WIDTH 
-  GL_LINE_WIDTH_GRANULARITY 
-  GL_LINE_WIDTH_RANGE 
-  GL_POINT 
-  GL_LINE 
-  GL_FILL 
-  GL_CW 
-  GL_CCW 
-  GL_FRONT 
-  GL_BACK 
-  GL_POLYGON_MODE 
-  GL_POLYGON_SMOOTH 
-  GL_POLYGON_STIPPLE 
-  GL_EDGE_FLAG 
-  GL_CULL_FACE 
-  GL_CULL_FACE_MODE 
-  GL_FRONT_FACE 
-  GL_POLYGON_OFFSET_FACTOR 
-  GL_POLYGON_OFFSET_UNITS 
-  GL_POLYGON_OFFSET_POINT 
-  GL_POLYGON_OFFSET_LINE 
-  GL_POLYGON_OFFSET_FILL 
-  GL_COMPILE 
-  GL_COMPILE_AND_EXECUTE 
-  GL_LIST_BASE 
-  GL_LIST_INDEX 
-  GL_LIST_MODE 
-  GL_NEVER 
-  GL_LESS 
-  GL_EQUAL 
-  GL_LEQUAL 
-  GL_GREATER 
-  GL_NOTEQUAL 
-  GL_GEQUAL 
-  GL_ALWAYS 
-  GL_DEPTH_TEST 
-  GL_DEPTH_BITS 
-  GL_DEPTH_CLEAR_VALUE 
-  GL_DEPTH_FUNC 
-  GL_DEPTH_RANGE 
-  GL_DEPTH_WRITEMASK 
-  GL_DEPTH_COMPONENT 
-  GL_LIGHTING 
-  GL_LIGHT0 
-  GL_LIGHT1 
-  GL_LIGHT2 
-  GL_LIGHT3 
-  GL_LIGHT4 
-  GL_LIGHT5 
-  GL_LIGHT6 
-  GL_LIGHT7 
-  GL_SPOT_EXPONENT 
-  GL_SPOT_CUTOFF 
-  GL_CONSTANT_ATTENUATION 
-  GL_LINEAR_ATTENUATION 
-  GL_QUADRATIC_ATTENUATION 
-  GL_AMBIENT 
-  GL_DIFFUSE 
-  GL_SPECULAR 
-  GL_SHININESS 
-  GL_EMISSION 
-  GL_POSITION 
-  GL_SPOT_DIRECTION 
-  GL_AMBIENT_AND_DIFFUSE 
-  GL_COLOR_INDEXES 
-  GL_LIGHT_MODEL_TWO_SIDE 
-  GL_LIGHT_MODEL_LOCAL_VIEWER 
-  GL_LIGHT_MODEL_AMBIENT 
-  GL_FRONT_AND_BACK 
-  GL_SHADE_MODEL 
-  GL_FLAT 
-  GL_SMOOTH 
-  GL_COLOR_MATERIAL 
-  GL_COLOR_MATERIAL_FACE 
-  GL_COLOR_MATERIAL_PARAMETER 
-  GL_NORMALIZE 
-  GL_CLIP_PLANE0 
-  GL_CLIP_PLANE1 
-  GL_CLIP_PLANE2 
-  GL_CLIP_PLANE3 
-  GL_CLIP_PLANE4 
-  GL_CLIP_PLANE5 
-  GL_ACCUM_RED_BITS 
-  GL_ACCUM_GREEN_BITS 
-  GL_ACCUM_BLUE_BITS 
-  GL_ACCUM_ALPHA_BITS 
-  GL_ACCUM_CLEAR_VALUE 
-  GL_ACCUM 
-  GL_ADD 
-  GL_LOAD 
-  GL_MULT 
-  GL_RETURN 
-  GL_ALPHA_TEST 
-  GL_ALPHA_TEST_REF 
-  GL_ALPHA_TEST_FUNC 
-  GL_BLEND 
-  GL_BLEND_SRC 
-  GL_BLEND_DST 
-  GL_ZERO 
-  GL_ONE 
-  GL_SRC_COLOR 
-  GL_ONE_MINUS_SRC_COLOR 
-  GL_SRC_ALPHA 
-  GL_ONE_MINUS_SRC_ALPHA 
-  GL_DST_ALPHA 
-  GL_ONE_MINUS_DST_ALPHA 
-  GL_DST_COLOR 
-  GL_ONE_MINUS_DST_COLOR 
-  GL_SRC_ALPHA_SATURATE 
-  GL_FEEDBACK 
-  GL_RENDER 
-  GL_SELECT 
-  GL_2D 
-  GL_3D 
-  GL_3D_COLOR 
-  GL_3D_COLOR_TEXTURE 
-  GL_4D_COLOR_TEXTURE 
-  GL_POINT_TOKEN 
-  GL_LINE_TOKEN 
-  GL_LINE_RESET_TOKEN 
-  GL_POLYGON_TOKEN 
-  GL_BITMAP_TOKEN 
-  GL_DRAW_PIXEL_TOKEN 
-  GL_COPY_PIXEL_TOKEN 
-  GL_PASS_THROUGH_TOKEN 
-  GL_FEEDBACK_BUFFER_POINTER 
-  GL_FEEDBACK_BUFFER_SIZE 
-  GL_FEEDBACK_BUFFER_TYPE 
-  GL_SELECTION_BUFFER_POINTER 
-  GL_SELECTION_BUFFER_SIZE 
-  GL_FOG 
-  GL_FOG_MODE 
-  GL_FOG_DENSITY 
-  GL_FOG_COLOR 
-  GL_FOG_INDEX 
-  GL_FOG_START 
-  GL_FOG_END 
-  GL_LINEAR 
-  GL_EXP 
-  GL_EXP2 
-  GL_LOGIC_OP 
-  GL_INDEX_LOGIC_OP 
-  GL_COLOR_LOGIC_OP 
-  GL_LOGIC_OP_MODE 
-  GL_CLEAR 
-  GL_SET 
-  GL_COPY 
-  GL_COPY_INVERTED 
-  GL_NOOP 
-  GL_INVERT 
-  GL_AND 
-  GL_NAND 
-  GL_OR 
-  GL_NOR 
-  GL_XOR 
-  GL_EQUIV 
-  GL_AND_REVERSE 
-  GL_AND_INVERTED 
-  GL_OR_REVERSE 
-  GL_OR_INVERTED 
-  GL_STENCIL_TEST 
-  GL_STENCIL_WRITEMASK 
-  GL_STENCIL_BITS 
-  GL_STENCIL_FUNC 
-  GL_STENCIL_VALUE_MASK 
-  GL_STENCIL_REF 
-  GL_STENCIL_FAIL 
-  GL_STENCIL_PASS_DEPTH_PASS 
-  GL_STENCIL_PASS_DEPTH_FAIL 
-  GL_STENCIL_CLEAR_VALUE 
-  GL_STENCIL_INDEX 
-  GL_KEEP 
-  GL_REPLACE 
-  GL_INCR 
-  GL_DECR 
-  GL_NONE 
-  GL_LEFT 
-  GL_RIGHT 
-  GL_FRONT_LEFT 
-  GL_FRONT_RIGHT 
-  GL_BACK_LEFT 
-  GL_BACK_RIGHT 
-  GL_AUX0 
-  GL_AUX1 
-  GL_AUX2 
-  GL_AUX3 
-  GL_COLOR_INDEX 
-  GL_RED 
-  GL_GREEN 
-  GL_BLUE 
-  GL_ALPHA 
-  GL_LUMINANCE 
-  GL_LUMINANCE_ALPHA 
-  GL_ALPHA_BITS 
-  GL_RED_BITS 
-  GL_GREEN_BITS 
-  GL_BLUE_BITS 
-  GL_INDEX_BITS 
-  GL_SUBPIXEL_BITS 
-  GL_AUX_BUFFERS 
-  GL_READ_BUFFER 
-  GL_DRAW_BUFFER 
-  GL_DOUBLEBUFFER 
-  GL_STEREO 
-  GL_BITMAP 
-  GL_COLOR 
-  GL_DEPTH 
-  GL_STENCIL 
-  GL_DITHER 
-  GL_RGB 
-  GL_RGBA 
-  GL_MAX_LIST_NESTING 
-  GL_MAX_ATTRIB_STACK_DEPTH 
-  GL_MAX_MODELVIEW_STACK_DEPTH 
-  GL_MAX_NAME_STACK_DEPTH 
-  GL_MAX_PROJECTION_STACK_DEPTH 
-  GL_MAX_TEXTURE_STACK_DEPTH 
-  GL_MAX_EVAL_ORDER 
-  GL_MAX_LIGHTS 
-  GL_MAX_CLIP_PLANES 
-  GL_MAX_TEXTURE_SIZE 
-  GL_MAX_PIXEL_MAP_TABLE 
-  GL_MAX_VIEWPORT_DIMS 
-  GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 
-  GL_ATTRIB_STACK_DEPTH 
-  GL_CLIENT_ATTRIB_STACK_DEPTH 
-  GL_COLOR_CLEAR_VALUE 
-  GL_COLOR_WRITEMASK 
-  GL_CURRENT_INDEX 
-  GL_CURRENT_COLOR 
-  GL_CURRENT_NORMAL 
-  GL_CURRENT_RASTER_COLOR 
-  GL_CURRENT_RASTER_DISTANCE 
-  GL_CURRENT_RASTER_INDEX 
-  GL_CURRENT_RASTER_POSITION 
-  GL_CURRENT_RASTER_TEXTURE_COORDS 
-  GL_CURRENT_RASTER_POSITION_VALID 
-  GL_CURRENT_TEXTURE_COORDS 
-  GL_INDEX_CLEAR_VALUE 
-  GL_INDEX_MODE 
-  GL_INDEX_WRITEMASK 
-  GL_MODELVIEW_MATRIX 
-  GL_MODELVIEW_STACK_DEPTH 
-  GL_NAME_STACK_DEPTH 
-  GL_PROJECTION_MATRIX 
-  GL_PROJECTION_STACK_DEPTH 
-  GL_RENDER_MODE 
-  GL_RGBA_MODE 
-  GL_TEXTURE_MATRIX 
-  GL_TEXTURE_STACK_DEPTH 
-  GL_VIEWPORT 
-  GL_AUTO_NORMAL 
-  GL_MAP1_COLOR_4 
-  GL_MAP1_GRID_DOMAIN 
-  GL_MAP1_GRID_SEGMENTS 
-  GL_MAP1_INDEX 
-  GL_MAP1_NORMAL 
-  GL_MAP1_TEXTURE_COORD_1 
-  GL_MAP1_TEXTURE_COORD_2 
-  GL_MAP1_TEXTURE_COORD_3 
-  GL_MAP1_TEXTURE_COORD_4 
-  GL_MAP1_VERTEX_3 
-  GL_MAP1_VERTEX_4 
-  GL_MAP2_COLOR_4 
-  GL_MAP2_GRID_DOMAIN 
-  GL_MAP2_GRID_SEGMENTS 
-  GL_MAP2_INDEX 
-  GL_MAP2_NORMAL 
-  GL_MAP2_TEXTURE_COORD_1 
-  GL_MAP2_TEXTURE_COORD_2 
-  GL_MAP2_TEXTURE_COORD_3 
-  GL_MAP2_TEXTURE_COORD_4 
-  GL_MAP2_VERTEX_3 
-  GL_MAP2_VERTEX_4 
-  GL_COEFF 
-  GL_DOMAIN 
-  GL_ORDER 
-  GL_FOG_HINT 
-  GL_LINE_SMOOTH_HINT 
-  GL_PERSPECTIVE_CORRECTION_HINT 
-  GL_POINT_SMOOTH_HINT 
-  GL_POLYGON_SMOOTH_HINT 
-  GL_DONT_CARE 
-  GL_FASTEST 
-  GL_NICEST 
-  GL_SCISSOR_TEST 
-  GL_SCISSOR_BOX 
-  GL_MAP_COLOR 
-  GL_MAP_STENCIL 
-  GL_INDEX_SHIFT 
-  GL_INDEX_OFFSET 
-  GL_RED_SCALE 
-  GL_RED_BIAS 
-  GL_GREEN_SCALE 
-  GL_GREEN_BIAS 
-  GL_BLUE_SCALE 
-  GL_BLUE_BIAS 
-  GL_ALPHA_SCALE 
-  GL_ALPHA_BIAS 
-  GL_DEPTH_SCALE 
-  GL_DEPTH_BIAS 
-  GL_PIXEL_MAP_S_TO_S_SIZE 
-  GL_PIXEL_MAP_I_TO_I_SIZE 
-  GL_PIXEL_MAP_I_TO_R_SIZE 
-  GL_PIXEL_MAP_I_TO_G_SIZE 
-  GL_PIXEL_MAP_I_TO_B_SIZE 
-  GL_PIXEL_MAP_I_TO_A_SIZE 
-  GL_PIXEL_MAP_R_TO_R_SIZE 
-  GL_PIXEL_MAP_G_TO_G_SIZE 
-  GL_PIXEL_MAP_B_TO_B_SIZE 
-  GL_PIXEL_MAP_A_TO_A_SIZE 
-  GL_PIXEL_MAP_S_TO_S 
-  GL_PIXEL_MAP_I_TO_I 
-  GL_PIXEL_MAP_I_TO_R 
-  GL_PIXEL_MAP_I_TO_G 
-  GL_PIXEL_MAP_I_TO_B 
-  GL_PIXEL_MAP_I_TO_A 
-  GL_PIXEL_MAP_R_TO_R 
-  GL_PIXEL_MAP_G_TO_G 
-  GL_PIXEL_MAP_B_TO_B 
-  GL_PIXEL_MAP_A_TO_A 
-  GL_PACK_ALIGNMENT 
-  GL_PACK_LSB_FIRST 
-  GL_PACK_ROW_LENGTH 
-  GL_PACK_SKIP_PIXELS 
-  GL_PACK_SKIP_ROWS 
-  GL_PACK_SWAP_BYTES 
-  GL_UNPACK_ALIGNMENT 
-  GL_UNPACK_LSB_FIRST 
-  GL_UNPACK_ROW_LENGTH 
-  GL_UNPACK_SKIP_PIXELS 
-  GL_UNPACK_SKIP_ROWS 
-  GL_UNPACK_SWAP_BYTES 
-  GL_ZOOM_X 
-  GL_ZOOM_Y 
-  GL_TEXTURE_ENV 
-  GL_TEXTURE_ENV_MODE 
-  GL_TEXTURE_1D 
-  GL_TEXTURE_2D 
-  GL_TEXTURE_WRAP_S 
-  GL_TEXTURE_WRAP_T 
-  GL_TEXTURE_MAG_FILTER 
-  GL_TEXTURE_MIN_FILTER 
-  GL_TEXTURE_ENV_COLOR 
-  GL_TEXTURE_GEN_S 
-  GL_TEXTURE_GEN_T 
-  GL_TEXTURE_GEN_MODE 
-  GL_TEXTURE_BORDER_COLOR 
-  GL_TEXTURE_WIDTH 
-  GL_TEXTURE_HEIGHT 
-  GL_TEXTURE_BORDER 
-  GL_TEXTURE_COMPONENTS 
-  GL_TEXTURE_RED_SIZE 
-  GL_TEXTURE_GREEN_SIZE 
-  GL_TEXTURE_BLUE_SIZE 
-  GL_TEXTURE_ALPHA_SIZE 
-  GL_TEXTURE_LUMINANCE_SIZE 
-  GL_TEXTURE_INTENSITY_SIZE 
-  GL_NEAREST_MIPMAP_NEAREST 
-  GL_NEAREST_MIPMAP_LINEAR 
-  GL_LINEAR_MIPMAP_NEAREST 
-  GL_LINEAR_MIPMAP_LINEAR 
-  GL_OBJECT_LINEAR 
-  GL_OBJECT_PLANE 
-  GL_EYE_LINEAR 
-  GL_EYE_PLANE 
-  GL_SPHERE_MAP 
-  GL_DECAL 
-  GL_MODULATE 
-  GL_NEAREST 
-  GL_REPEAT 
-  GL_CLAMP 
-  GL_S 
-  GL_T 
-  GL_R 
-  GL_Q 
-  GL_TEXTURE_GEN_R 
-  GL_TEXTURE_GEN_Q 
-  GL_VENDOR 
-  GL_RENDERER 
-  GL_VERSION 
-  GL_EXTENSIONS 
-  GL_NO_ERROR 
-  GL_INVALID_VALUE 
-  GL_INVALID_ENUM 
-  GL_INVALID_OPERATION 
-  GL_STACK_OVERFLOW 
-  GL_STACK_UNDERFLOW 
-  GL_OUT_OF_MEMORY 
-  GL_CURRENT_BIT 
-  GL_POINT_BIT 
-  GL_LINE_BIT 
-  GL_POLYGON_BIT 
-  GL_POLYGON_STIPPLE_BIT 
-  GL_PIXEL_MODE_BIT 
-  GL_LIGHTING_BIT 
-  GL_FOG_BIT 
-  GL_DEPTH_BUFFER_BIT 
-  GL_ACCUM_BUFFER_BIT 
-  GL_STENCIL_BUFFER_BIT 
-  GL_VIEWPORT_BIT 
-  GL_TRANSFORM_BIT 
-  GL_ENABLE_BIT 
-  GL_COLOR_BUFFER_BIT 
-  GL_HINT_BIT 
-  GL_EVAL_BIT 
-  GL_LIST_BIT 
-  GL_TEXTURE_BIT 
-  GL_SCISSOR_BIT 
-  GL_ALL_ATTRIB_BITS 
-  GL_PROXY_TEXTURE_1D 
-  GL_PROXY_TEXTURE_2D 
-  GL_TEXTURE_PRIORITY 
-  GL_TEXTURE_RESIDENT 
-  GL_TEXTURE_BINDING_1D 
-  GL_TEXTURE_BINDING_2D 
-  GL_TEXTURE_INTERNAL_FORMAT 
-  GL_ALPHA4 
-  GL_ALPHA8 
-  GL_ALPHA12 
-  GL_ALPHA16 
-  GL_LUMINANCE4 
-  GL_LUMINANCE8 
-  GL_LUMINANCE12 
-  GL_LUMINANCE16 
-  GL_LUMINANCE4_ALPHA4 
-  GL_LUMINANCE6_ALPHA2 
-  GL_LUMINANCE8_ALPHA8 
-  GL_LUMINANCE12_ALPHA4 
-  GL_LUMINANCE12_ALPHA12 
-  GL_LUMINANCE16_ALPHA16 
-  GL_INTENSITY 
-  GL_INTENSITY4 
-  GL_INTENSITY8 
-  GL_INTENSITY12 
-  GL_INTENSITY16 
-  GL_R3_G3_B2 
-  GL_RGB4 
-  GL_RGB5 
-  GL_RGB8 
-  GL_RGB10 
-  GL_RGB12 
-  GL_RGB16 
-  GL_RGBA2 
-  GL_RGBA4 
-  GL_RGB5_A1 
-  GL_RGBA8 
-  GL_RGB10_A2 
-  GL_RGBA12 
-  GL_RGBA16 
-  GL_CLIENT_PIXEL_STORE_BIT 
-  GL_CLIENT_VERTEX_ARRAY_BIT 
-  GL_ALL_CLIENT_ATTRIB_BITS 
-  GL_CLIENT_ALL_ATTRIB_BITS 
-  
-  GL_UNSIGNED_BYTE_3_3_2 
-  GL_UNSIGNED_SHORT_4_4_4_4 
-  GL_UNSIGNED_SHORT_5_5_5_1 
-  GL_UNSIGNED_INT_8_8_8_8 
-  GL_UNSIGNED_INT_10_10_10_2 
-  GL_RESCALE_NORMAL 
-  GL_TEXTURE_BINDING_3D 
-  GL_PACK_SKIP_IMAGES 
-  GL_PACK_IMAGE_HEIGHT 
-  GL_UNPACK_SKIP_IMAGES 
-  GL_UNPACK_IMAGE_HEIGHT 
-  GL_TEXTURE_3D 
-  GL_PROXY_TEXTURE_3D 
-  GL_TEXTURE_DEPTH 
-  GL_TEXTURE_WRAP_R 
-  GL_MAX_3D_TEXTURE_SIZE 
-  GL_UNSIGNED_BYTE_2_3_3_REV 
-  GL_UNSIGNED_SHORT_5_6_5 
-  GL_UNSIGNED_SHORT_5_6_5_REV 
-  GL_UNSIGNED_SHORT_4_4_4_4_REV 
-  GL_UNSIGNED_SHORT_1_5_5_5_REV 
-  GL_UNSIGNED_INT_8_8_8_8_REV 
-  GL_UNSIGNED_INT_2_10_10_10_REV 
-  GL_BGR 
-  GL_BGRA 
-  GL_MAX_ELEMENTS_VERTICES 
-  GL_MAX_ELEMENTS_INDICES 
-  GL_CLAMP_TO_EDGE 
-  GL_TEXTURE_MIN_LOD 
-  GL_TEXTURE_MAX_LOD 
-  GL_TEXTURE_BASE_LEVEL 
-  GL_TEXTURE_MAX_LEVEL 
-  GL_LIGHT_MODEL_COLOR_CONTROL 
-  GL_SINGLE_COLOR 
-  GL_SEPARATE_SPECULAR_COLOR 
-  GL_SMOOTH_POINT_SIZE_RANGE 
-  GL_SMOOTH_POINT_SIZE_GRANULARITY 
-  GL_SMOOTH_LINE_WIDTH_RANGE 
-  GL_SMOOTH_LINE_WIDTH_GRANULARITY 
-  GL_ALIASED_POINT_SIZE_RANGE 
-  GL_ALIASED_LINE_WIDTH_RANGE 
-  
-  GL_CONSTANT_COLOR 
-  GL_ONE_MINUS_CONSTANT_COLOR 
-  GL_CONSTANT_ALPHA 
-  GL_ONE_MINUS_CONSTANT_ALPHA 
-  GL_BLEND_COLOR 
-  GL_FUNC_ADD 
-  GL_MIN 
-  GL_MAX 
-  GL_BLEND_EQUATION 
-  GL_FUNC_SUBTRACT 
-  GL_FUNC_REVERSE_SUBTRACT 
-  GL_CONVOLUTION_1D 
-  GL_CONVOLUTION_2D 
-  GL_SEPARABLE_2D 
-  GL_CONVOLUTION_BORDER_MODE 
-  GL_CONVOLUTION_FILTER_SCALE 
-  GL_CONVOLUTION_FILTER_BIAS 
-  GL_REDUCE 
-  GL_CONVOLUTION_FORMAT 
-  GL_CONVOLUTION_WIDTH 
-  GL_CONVOLUTION_HEIGHT 
-  GL_MAX_CONVOLUTION_WIDTH 
-  GL_MAX_CONVOLUTION_HEIGHT 
-  GL_POST_CONVOLUTION_RED_SCALE 
-  GL_POST_CONVOLUTION_GREEN_SCALE 
-  GL_POST_CONVOLUTION_BLUE_SCALE 
-  GL_POST_CONVOLUTION_ALPHA_SCALE 
-  GL_POST_CONVOLUTION_RED_BIAS 
-  GL_POST_CONVOLUTION_GREEN_BIAS 
-  GL_POST_CONVOLUTION_BLUE_BIAS 
-  GL_POST_CONVOLUTION_ALPHA_BIAS 
-  GL_HISTOGRAM 
-  GL_PROXY_HISTOGRAM 
-  GL_HISTOGRAM_WIDTH 
-  GL_HISTOGRAM_FORMAT 
-  GL_HISTOGRAM_RED_SIZE 
-  GL_HISTOGRAM_GREEN_SIZE 
-  GL_HISTOGRAM_BLUE_SIZE 
-  GL_HISTOGRAM_ALPHA_SIZE 
-  GL_HISTOGRAM_LUMINANCE_SIZE 
-  GL_HISTOGRAM_SINK 
-  GL_MINMAX 
-  GL_MINMAX_FORMAT 
-  GL_MINMAX_SINK 
-  GL_TABLE_TOO_LARGE 
-  GL_COLOR_MATRIX 
-  GL_COLOR_MATRIX_STACK_DEPTH 
-  GL_MAX_COLOR_MATRIX_STACK_DEPTH 
-  GL_POST_COLOR_MATRIX_RED_SCALE 
-  GL_POST_COLOR_MATRIX_GREEN_SCALE 
-  GL_POST_COLOR_MATRIX_BLUE_SCALE 
-  GL_POST_COLOR_MATRIX_ALPHA_SCALE 
-  GL_POST_COLOR_MATRIX_RED_BIAS 
-  GL_POST_COLOR_MATRIX_GREEN_BIAS 
-  GL_POST_COLOR_MATRIX_BLUE_BIAS 
-  GL_POST_COLOR_MATRIX_ALPHA_BIAS 
-  GL_COLOR_TABLE 
-  GL_POST_CONVOLUTION_COLOR_TABLE 
-  GL_POST_COLOR_MATRIX_COLOR_TABLE 
-  GL_PROXY_COLOR_TABLE 
-  GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 
-  GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 
-  GL_COLOR_TABLE_SCALE 
-  GL_COLOR_TABLE_BIAS 
-  GL_COLOR_TABLE_FORMAT 
-  GL_COLOR_TABLE_WIDTH 
-  GL_COLOR_TABLE_RED_SIZE 
-  GL_COLOR_TABLE_GREEN_SIZE 
-  GL_COLOR_TABLE_BLUE_SIZE 
-  GL_COLOR_TABLE_ALPHA_SIZE 
-  GL_COLOR_TABLE_LUMINANCE_SIZE 
-  GL_COLOR_TABLE_INTENSITY_SIZE 
-  GL_CONSTANT_BORDER 
-  GL_REPLICATE_BORDER 
-  GL_CONVOLUTION_BORDER_COLOR 
-
- GL_TEXTURE0 
- GL_TEXTURE1 
- GL_TEXTURE2 
- GL_TEXTURE3 
- GL_TEXTURE4 
- GL_TEXTURE5 
- GL_TEXTURE6 
- GL_TEXTURE7 
- GL_TEXTURE8 
- GL_TEXTURE9 
- GL_TEXTURE10 
- GL_TEXTURE11 
- GL_TEXTURE12 
- GL_TEXTURE13 
- GL_TEXTURE14 
- GL_TEXTURE15 
- GL_TEXTURE16 
- GL_TEXTURE17 
- GL_TEXTURE18 
- GL_TEXTURE19 
- GL_TEXTURE20 
- GL_TEXTURE21 
- GL_TEXTURE22 
- GL_TEXTURE23 
- GL_TEXTURE24 
- GL_TEXTURE25 
- GL_TEXTURE26 
- GL_TEXTURE27 
- GL_TEXTURE28 
- GL_TEXTURE29 
- GL_TEXTURE30 
- GL_TEXTURE31 
- GL_ACTIVE_TEXTURE 
- GL_CLIENT_ACTIVE_TEXTURE 
- GL_MAX_TEXTURE_UNITS 
- GL_TRANSPOSE_MODELVIEW_MATRIX 
- GL_TRANSPOSE_PROJECTION_MATRIX 
- GL_TRANSPOSE_TEXTURE_MATRIX 
- GL_TRANSPOSE_COLOR_MATRIX 
- GL_MULTISAMPLE 
- GL_SAMPLE_ALPHA_TO_COVERAGE 
- GL_SAMPLE_ALPHA_TO_ONE 
- GL_SAMPLE_COVERAGE 
- GL_SAMPLE_BUFFERS 
- GL_SAMPLES 
- GL_SAMPLE_COVERAGE_VALUE 
- GL_SAMPLE_COVERAGE_INVERT 
- GL_MULTISAMPLE_BIT 
- GL_NORMAL_MAP 
- GL_REFLECTION_MAP 
- GL_TEXTURE_CUBE_MAP 
- GL_TEXTURE_BINDING_CUBE_MAP 
- GL_TEXTURE_CUBE_MAP_POSITIVE_X 
- GL_TEXTURE_CUBE_MAP_NEGATIVE_X 
- GL_TEXTURE_CUBE_MAP_POSITIVE_Y 
- GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 
- GL_TEXTURE_CUBE_MAP_POSITIVE_Z 
- GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 
- GL_PROXY_TEXTURE_CUBE_MAP 
- GL_MAX_CUBE_MAP_TEXTURE_SIZE 
- GL_COMPRESSED_ALPHA 
- GL_COMPRESSED_LUMINANCE 
- GL_COMPRESSED_LUMINANCE_ALPHA 
- GL_COMPRESSED_INTENSITY 
- GL_COMPRESSED_RGB 
- GL_COMPRESSED_RGBA 
- GL_TEXTURE_COMPRESSION_HINT 
- GL_TEXTURE_COMPRESSED_IMAGE_SIZE 
- GL_TEXTURE_COMPRESSED 
- GL_NUM_COMPRESSED_TEXTURE_FORMATS 
- GL_COMPRESSED_TEXTURE_FORMATS 
- GL_CLAMP_TO_BORDER 
- GL_COMBINE 
- GL_COMBINE_RGB 
- GL_COMBINE_ALPHA 
- GL_SOURCE0_RGB 
- GL_SOURCE1_RGB 
- GL_SOURCE2_RGB 
- GL_SOURCE0_ALPHA 
- GL_SOURCE1_ALPHA 
- GL_SOURCE2_ALPHA 
- GL_OPERAND0_RGB 
- GL_OPERAND1_RGB 
- GL_OPERAND2_RGB 
- GL_OPERAND0_ALPHA 
- GL_OPERAND1_ALPHA 
- GL_OPERAND2_ALPHA 
- GL_RGB_SCALE 
- GL_ADD_SIGNED 
- GL_INTERPOLATE 
- GL_SUBTRACT 
- GL_CONSTANT 
- GL_PRIMARY_COLOR 
- GL_PREVIOUS 
- GL_DOT3_RGB 
- GL_DOT3_RGBA 
-  
- GL_BLEND_DST_RGB 
- GL_BLEND_SRC_RGB 
- GL_BLEND_DST_ALPHA 
- GL_BLEND_SRC_ALPHA 
- GL_POINT_SIZE_MIN 
- GL_POINT_SIZE_MAX 
- GL_POINT_FADE_THRESHOLD_SIZE 
- GL_POINT_DISTANCE_ATTENUATION 
- GL_GENERATE_MIPMAP 
- GL_GENERATE_MIPMAP_HINT 
- GL_DEPTH_COMPONENT16 
- GL_DEPTH_COMPONENT24 
- GL_DEPTH_COMPONENT32 
- GL_MIRRORED_REPEAT 
- GL_FOG_COORDINATE_SOURCE 
- GL_FOG_COORDINATE 
- GL_FRAGMENT_DEPTH 
- GL_CURRENT_FOG_COORDINATE 
- GL_FOG_COORDINATE_ARRAY_TYPE 
- GL_FOG_COORDINATE_ARRAY_STRIDE 
- GL_FOG_COORDINATE_ARRAY_POINTER 
- GL_FOG_COORDINATE_ARRAY 
- GL_COLOR_SUM 
- GL_CURRENT_SECONDARY_COLOR 
- GL_SECONDARY_COLOR_ARRAY_SIZE 
- GL_SECONDARY_COLOR_ARRAY_TYPE 
- GL_SECONDARY_COLOR_ARRAY_STRIDE 
- GL_SECONDARY_COLOR_ARRAY_POINTER 
- GL_SECONDARY_COLOR_ARRAY 
- GL_MAX_TEXTURE_LOD_BIAS 
- GL_TEXTURE_FILTER_CONTROL 
- GL_TEXTURE_LOD_BIAS 
- GL_INCR_WRAP 
- GL_DECR_WRAP 
- GL_TEXTURE_DEPTH_SIZE 
- GL_DEPTH_TEXTURE_MODE 
- GL_TEXTURE_COMPARE_MODE 
- GL_TEXTURE_COMPARE_FUNC 
- GL_COMPARE_R_TO_TEXTURE 
-  
-  GL_BUFFER_SIZE 
-  GL_BUFFER_USAGE 
-  GL_QUERY_COUNTER_BITS 
-  GL_CURRENT_QUERY 
-  GL_QUERY_RESULT 
-  GL_QUERY_RESULT_AVAILABLE 
-  GL_ARRAY_BUFFER 
-  GL_ELEMENT_ARRAY_BUFFER 
-  GL_ARRAY_BUFFER_BINDING 
-  GL_ELEMENT_ARRAY_BUFFER_BINDING 
-  GL_VERTEX_ARRAY_BUFFER_BINDING 
-  GL_NORMAL_ARRAY_BUFFER_BINDING 
-  GL_COLOR_ARRAY_BUFFER_BINDING 
-  GL_INDEX_ARRAY_BUFFER_BINDING 
-  GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 
-  GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 
-  GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 
-  GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 
-  GL_WEIGHT_ARRAY_BUFFER_BINDING 
-  GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 
-  GL_READ_ONLY 
-  GL_WRITE_ONLY 
-  GL_READ_WRITE 
-  GL_BUFFER_ACCESS 
-  GL_BUFFER_MAPPED 
-  GL_BUFFER_MAP_POINTER 
-  GL_STREAM_DRAW 
-  GL_STREAM_READ 
-  GL_STREAM_COPY 
-  GL_STATIC_DRAW 
-  GL_STATIC_READ 
-  GL_STATIC_COPY 
-  GL_DYNAMIC_DRAW 
-  GL_DYNAMIC_READ 
-  GL_DYNAMIC_COPY 
-  GL_SAMPLES_PASSED 
-  GL_FOG_COORD_SRC
-  GL_FOG_COORD
-  GL_CURRENT_FOG_COORD
-  GL_FOG_COORD_ARRAY_TYPE
-  GL_FOG_COORD_ARRAY_STRIDE
-  GL_FOG_COORD_ARRAY_POINTER
-  GL_FOG_COORD_ARRAY
-  GL_FOG_COORD_ARRAY_BUFFER_BINDING
-  GL_SRC0_RGB
-  GL_SRC1_RGB
-  GL_SRC2_RGB
-  GL_SRC0_ALPHA
-  GL_SRC1_ALPHA
-  GL_SRC2_ALPHA
-
-  GLU_FALSE
-  GLU_TRUE
-  GLU_VERSION
-  GLU_EXTENSIONS
-  GLU_INVALID_ENUM
-  GLU_INVALID_VALUE
-  GLU_OUT_OF_MEMORY
-  GLU_INVALID_OPERATION
-  GLU_OUTLINE_POLYGON
-  GLU_OUTLINE_PATCH
-  GLU_NURBS_ERROR
-  GLU_ERROR
-  GLU_NURBS_BEGIN
-  GLU_NURBS_BEGIN_EXT
-  GLU_NURBS_VERTEX
-  GLU_NURBS_VERTEX_EXT
-  GLU_NURBS_NORMAL
-  GLU_NURBS_NORMAL_EXT
-  GLU_NURBS_COLOR
-  GLU_NURBS_COLOR_EXT
-  GLU_NURBS_TEXTURE_COORD
-  GLU_NURBS_TEX_COORD_EXT
-  GLU_NURBS_END
-  GLU_NURBS_END_EXT
-  GLU_NURBS_BEGIN_DATA
-  GLU_NURBS_BEGIN_DATA_EXT
-  GLU_NURBS_VERTEX_DATA
-  GLU_NURBS_VERTEX_DATA_EXT
-  GLU_NURBS_NORMAL_DATA
-  GLU_NURBS_NORMAL_DATA_EXT
-  GLU_NURBS_COLOR_DATA
-  GLU_NURBS_COLOR_DATA_EXT
-  GLU_NURBS_TEXTURE_COORD_DATA
-  GLU_NURBS_TEX_COORD_DATA_EXT
-  GLU_NURBS_END_DATA
-  GLU_NURBS_END_DATA_EXT
-  GLU_NURBS_ERROR1
-  GLU_NURBS_ERROR2
-  GLU_NURBS_ERROR3
-  GLU_NURBS_ERROR4
-  GLU_NURBS_ERROR5
-  GLU_NURBS_ERROR6
-  GLU_NURBS_ERROR7
-  GLU_NURBS_ERROR8
-  GLU_NURBS_ERROR9
-  GLU_NURBS_ERROR10
-  GLU_NURBS_ERROR11
-  GLU_NURBS_ERROR12
-  GLU_NURBS_ERROR13
-  GLU_NURBS_ERROR14
-  GLU_NURBS_ERROR15
-  GLU_NURBS_ERROR16
-  GLU_NURBS_ERROR17
-  GLU_NURBS_ERROR18
-  GLU_NURBS_ERROR19
-  GLU_NURBS_ERROR20
-  GLU_NURBS_ERROR21
-  GLU_NURBS_ERROR22
-  GLU_NURBS_ERROR23
-  GLU_NURBS_ERROR24
-  GLU_NURBS_ERROR25
-  GLU_NURBS_ERROR26
-  GLU_NURBS_ERROR27
-  GLU_NURBS_ERROR28
-  GLU_NURBS_ERROR29
-  GLU_NURBS_ERROR30
-  GLU_NURBS_ERROR31
-  GLU_NURBS_ERROR32
-  GLU_NURBS_ERROR33
-  GLU_NURBS_ERROR34
-  GLU_NURBS_ERROR35
-  GLU_NURBS_ERROR36
-  GLU_NURBS_ERROR37
-  GLU_AUTO_LOAD_MATRIX
-  GLU_CULLING
-  GLU_SAMPLING_TOLERANCE
-  GLU_DISPLAY_MODE
-  GLU_PARAMETRIC_TOLERANCE
-  GLU_SAMPLING_METHOD
-  GLU_U_STEP
-  GLU_V_STEP
-  GLU_NURBS_MODE
-  GLU_NURBS_MODE_EXT
-  GLU_NURBS_TESSELLATOR
-  GLU_NURBS_TESSELLATOR_EXT
-  GLU_NURBS_RENDERER
-  GLU_NURBS_RENDERER_EXT
-  GLU_OBJECT_PARAMETRIC_ERROR
-  GLU_OBJECT_PARAMETRIC_ERROR_EXT
-  GLU_OBJECT_PATH_LENGTH
-  GLU_OBJECT_PATH_LENGTH_EXT
-  GLU_PATH_LENGTH
-  GLU_PARAMETRIC_ERROR
-  GLU_DOMAIN_DISTANCE
-  GLU_MAP1_TRIM_2
-  GLU_MAP1_TRIM_3
-  GLU_POINT
-  GLU_LINE
-  GLU_FILL
-  GLU_SILHOUETTE
-  GLU_SMOOTH
-  GLU_FLAT
-  GLU_NONE
-  GLU_OUTSIDE
-  GLU_INSIDE
-  GLU_TESS_BEGIN
-  GLU_BEGIN
-  GLU_TESS_VERTEX
-  GLU_VERTEX
-  GLU_TESS_END
-  GLU_END
-  GLU_TESS_ERROR
-  GLU_TESS_EDGE_FLAG
-  GLU_EDGE_FLAG
-  GLU_TESS_COMBINE
-  GLU_TESS_BEGIN_DATA
-  GLU_TESS_VERTEX_DATA
-  GLU_TESS_END_DATA
-  GLU_TESS_ERROR_DATA
-  GLU_TESS_EDGE_FLAG_DATA
-  GLU_TESS_COMBINE_DATA
-  GLU_CW
-  GLU_CCW
-  GLU_INTERIOR
-  GLU_EXTERIOR
-  GLU_UNKNOWN
-  GLU_TESS_WINDING_RULE
-  GLU_TESS_BOUNDARY_ONLY
-  GLU_TESS_TOLERANCE
-  GLU_TESS_ERROR1
-  GLU_TESS_ERROR2
-  GLU_TESS_ERROR3
-  GLU_TESS_ERROR4
-  GLU_TESS_ERROR5
-  GLU_TESS_ERROR6
-  GLU_TESS_ERROR7
-  GLU_TESS_ERROR8
-  GLU_TESS_MISSING_BEGIN_POLYGON
-  GLU_TESS_MISSING_BEGIN_CONTOUR
-  GLU_TESS_MISSING_END_POLYGON
-  GLU_TESS_MISSING_END_CONTOUR
-  GLU_TESS_COORD_TOO_LARGE
-  GLU_TESS_NEED_COMBINE_CALLBACK
-  GLU_TESS_WINDING_ODD
-  GLU_TESS_WINDING_NONZERO
-  GLU_TESS_WINDING_POSITIVE
-  GLU_TESS_WINDING_NEGATIVE
-  GLU_TESS_WINDING_ABS_GEQ_TWO
-  [GLU_TESS_MAX_COORD real?]
-)]{
-All OpenGL-defined constants.}
-
-@defproc[(feedback-buffer->gl-float-vector [buf feedback-buffer-object?])
-         gl-float-vector?]{
-
-Converts a result from @racket[glFeedbackBuffer] to a vector.}
-
-@defproc[(select-buffer->gl-uint-vector [buf select-buffer-object?])
-         gl-uint-vector?]{
-
-Converts a result from @racket[glSelectBuffer] to a vector.}
diff --git a/pkgs/sgl/scribblings/init.scrbl b/pkgs/sgl/scribblings/init.scrbl
deleted file mode 100644
index d09ecbf290..0000000000
--- a/pkgs/sgl/scribblings/init.scrbl
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" (for-label racket/class))
-
-@title[#:tag "init"]{Initialization}
-
-@defmodule[sgl/init]
-
-Requiring the @racketmodname[sgl/init] library initializes
-platform-specific OpenGL state to help avoid crashes when OpenGL
-commands are incorrectly used without a current context.  This library
-is @racket[require]d by @racketmodname[sgl] and
-@racketmodname[sgl/gl], so it normally does not need to be
-@racket[require]d explicitly.
-
-On Mac OS X, @racketmodname[sgl/init] checks whether any GL context is
-current, and if not, it creates a dummy context and sets it as the
-current context.
diff --git a/pkgs/sgl/scribblings/main.scrbl b/pkgs/sgl/scribblings/main.scrbl
deleted file mode 100644
index cac8a62f02..0000000000
--- a/pkgs/sgl/scribblings/main.scrbl
+++ /dev/null
@@ -1,214 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt" scribble/eval (for-syntax racket/base))
-
-@title[#:tag "main"]{Racket-Style OpenGL}
-
-@defmodule[sgl]
-
-The functions in @racketmodname[sgl] use Racket style names instead of
-C style names.  To convert a C OpenGL name to a Racket OpenGL name,
-change the @tt{gl} prefix to @racketidfont{gl-}, separate adjacent
-words with hyphens, and convert to all lower case.  Functions that
-have several variants to accommodate different numbers and types of
-arguments are collapsed into one or two functions in
-@racketmodname[sgl].  For example, @racketmodname[sgl] provides two
-vertex functions: @racket[vertex] and @racket[vertex-v].  The
-@racket[vertex] function accepts 2, 3 or 4 numerical arguments, and
-the @racket[vertex-v] function accepts @racket[gl-vector]s of length
-2, 3 or 4.  The C language OpenGL interface, in contrast, has 24
-vertex functions: @tt{glVertex3i}, @tt{glVertex4fv}, etc.
-
-Functions in @racketmodname[sgl] take symbols instead of integers for
-@tt{GLenum} arguments.  Each function checks that the given symbol is
-an acceptable argument and raises an exception if it is not.  Given
-the name of a C-language @tt{#define} constant, determine the
-corresponding symbolic argument by removing the leading @tt{GL_},
-converting the letters to lower-case and replacing each @tt{_} with
-@racketidfont{-}.  For example, @tt{GL_TRIANGLES} becomes
-@racket['triangles], and @tt{GL_TRIANGLE_STRIP} becomes
-@racket['triangle-strip].  Additionally, the functions check the
-length of any array arguments to ensure that OpenGL does not attempt
-to write or read after the array.
-
-The @racketmodname[sgl] module is not as complete as the
-@racketmodname[sgl/gl] module.
-
-@as-examples[
-@racketblock[
-(require sgl sgl/gl-vectors)
-(gl-begin 'triangles)
-(gl-vertex 1 2 3)
-(gl-vertex-v (gl-float-vector 1 2 3 4))
-(gl-end)
-]]
-
-@defstruct[gl-selection-record ([min-z real?] [max-z real?] [stack ....])]{
-
-Represents a selection.}
-
-@(define-syntax-rule (def-racket-gl (id ...) body ...)
-   @deftogether[(
-    @defthing[id procedure?] ...
-   ) body ...])
-
-@def-racket-gl[(
-gl-accum
-gl-active-texture
-gl-alpha-func
-gl-begin
-gl-begin-query
-gl-blend-color
-gl-blend-equation
-gl-blend-func
-gl-blend-func-separate
-gl-call-list
-gl-check-extension
-gl-clear
-gl-clear-accum
-gl-clear-color
-gl-clear-depth
-gl-clear-index
-gl-clear-stencil
-gl-clip-plane
-gl-color
-gl-color-mask
-gl-color-material
-gl-color-v
-gl-copy-pixels
-gl-cull-face
-gl-cylinder
-gl-delete-lists
-gl-delete-queries
-gl-depth-func
-gl-depth-mask
-gl-depth-range
-gl-disable
-gl-disk
-gl-edge-flag
-gl-enable
-gl-end
-gl-end-list
-gl-end-query
-gl-eval-coord
-gl-eval-coord-v
-gl-eval-mesh
-gl-eval-point
-gl-feedback-buffer->gl-float-vector
-gl-finish
-gl-flush
-gl-front-face
-gl-frustum
-gl-gen-lists
-gl-gen-queries
-gl-get-error
-gl-get-string
-gl-hint
-gl-index
-gl-index-mask
-gl-index-v
-gl-init-names
-gl-is-buffer
-gl-is-enabled
-gl-is-list
-gl-is-query
-gl-light
-gl-light-model
-gl-light-model-v
-gl-light-v
-gl-line-stipple
-gl-line-width
-gl-list-base
-gl-load-identity
-gl-load-matrix
-gl-load-name
-gl-load-transpose-matrix
-gl-look-at
-gl-map-grid
-gl-material
-gl-material-v
-gl-matrix-mode
-gl-mult-matrix
-gl-mult-transpose-matrix
-gl-multi-tex-coord
-gl-multi-tex-coord-v
-gl-new-list
-gl-new-quadric
-gl-normal
-gl-normal-v
-gl-ortho
-gl-ortho-2d
-gl-partial-disk
-gl-pass-through
-gl-perspective
-gl-pick-matrix
-gl-pixel-store
-gl-point-parameter
-gl-point-parameter-v
-gl-point-size
-gl-polygon-mode
-gl-polygon-offset
-gl-pop-attrib
-gl-pop-client-attrib
-gl-pop-matrix
-gl-pop-name
-gl-project
-gl-push-matrix
-gl-push-name
-gl-quadric-draw-style
-gl-quadric-normals
-gl-quadric-orientation
-gl-quadric-texture
-gl-raster-pos
-gl-raster-pos-v
-gl-rect
-gl-rect-v
-gl-render-mode
-gl-rotate
-gl-sample-coverage
-gl-scale
-gl-scissor
-gl-secondary-color
-gl-secondary-color-v
-gl-select-buffer->gl-uint-vector
-gl-shade-model
-gl-sphere
-gl-stencil-func
-gl-stencil-mask
-gl-stencil-op
-gl-tex-coord
-gl-tex-coord-v
-gl-tex-gen
-gl-tex-gen-v
-gl-translate
-gl-u-get-string
-gl-un-project
-gl-un-project4
-gl-vertex
-gl-vertex-v
-gl-viewport
-gl-window-pos
-gl-window-pos-v
-)]{
-
-Racket-style variants of the OpenGL functions.}
-
-
-@defproc[(gl-process-selection [vec gl-uint-vector?]
-                               [hits exact-nonnegative-integer?])
-         (listof gl-selection-record?)]{
-
-Parses the contents of @racket[vec] from the format used by
-@racket[glSelectBuffer].  The second argument should be the number of
-hits as returned by @racket[glRenderMode].}
-
-
-@defproc[(gl-get-gl-version-number) exact-nonnegative-integer?]{
-
-Returns the run-time OpenGL version number as an integer: @racket[10],
-@racket[11], @racket[12], @racket[13], @racket[14], @racket[15], or
-@racket[20].}
-
-@defproc[(gl-get-glu-version-number) exact-nonnegative-integer?]{
-
-Returns the run-time GLU version number as an integer: @racket[10],
-@racket[11], @racket[12], or @racket[13].}
diff --git a/pkgs/sgl/scribblings/overview.scrbl b/pkgs/sgl/scribblings/overview.scrbl
deleted file mode 100644
index 230a733c06..0000000000
--- a/pkgs/sgl/scribblings/overview.scrbl
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title[#:tag "overview"]{Using OpenGL}
-
-The @racketmodname[sgl/gl] library provides direct access to the
-C-style OpenGL API, whereas the @racketmodname[sgl] library provides a
-more Racket-like interface.  The @racketmodname[sgl/gl] library
-provides a binding for each @tt{#defined} constant and for most
-functions in OpenGL 1.5 and GLU 1.3.  The functions perform comparable
-checking to their C-language counterparts; they check the types of
-their arguments, but do not check the length of array arguments.  The
-@racketmodname[sgl] library provides wrappers around many of the
-functions in the @racketmodname[sgl/gl] library to present a more
-Racket-friendly interface, including function names that follow Racket
-conventions, and checked, symbolic enumeration arguments, and
-array-length checks.
-
-@bold{Warning on Safety:} OpenGL programming is inherently unsafe,
-even when using only the @racketmodname[sgl] library.  Although
-@racketmodname[sgl] checks the arguments to each function call,
-violation of higher-level assumptions of the system's OpenGL library
-can cause it to crash, bringing the entire Racket system down.  For
-example, sending a large number of vertices in a single @tt{glBegin}
-causes at least some GL implementations to crash.
-
-Some examples are available in the @filepath{examples} directory of
-the @filepath{sgl} collection in the Racket installation.  For
-@filepath{alpha.rkt}, try choosing the @filepath{sk.jpg} image distritbuted
-with Racket in the @filepath{icons} collection; you may have to
-press the @tt{t} key a few times if the spinning cube is blank.
diff --git a/pkgs/sgl/scribblings/sgl.scrbl b/pkgs/sgl/scribblings/sgl.scrbl
deleted file mode 100644
index 03771b43f5..0000000000
--- a/pkgs/sgl/scribblings/sgl.scrbl
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang scribble/doc
-@(require "common.rkt")
-
-@title{GL: 3-D Graphics}
-
-@author["Scott Owens"]
-
-The @racketmodname[sgl] libraries provide access to the rendering
-functions of @as-index{OpenGL} 1.5 and @as-index{GLU} 1.3
-libraries. The @racketmodname[sgl] libraries to not address
-system-level concerns, such as the attachment of GL rendering contexts
-to displays. Instead, the libraries should work with any Racket
-extension that provides GL with access to the system (such as a
-binding for @tt{glx}). Notably, the @racketmodname[racket/gui/base]
-library provides support for rendering contexts via the
-@racket[canvas%] class and its @method[canvas% with-gl-context]
-method.
-
-@table-of-contents[]
-
-@include-section["overview.scrbl"]
-@include-section["gl.scrbl"]
-@include-section["main.scrbl"]
-@include-section["gl-vectors.scrbl"]
-@include-section["bitmap.scrbl"]
-@include-section["init.scrbl"]
-
-@index-section[]
diff --git a/pkgs/sgl/sgl.rkt b/pkgs/sgl/sgl.rkt
deleted file mode 100644
index 720113af69..0000000000
--- a/pkgs/sgl/sgl.rkt
+++ /dev/null
@@ -1,972 +0,0 @@
-;; sgl -- An OpenGL extension of Racket
-;;
-;; Copyright (C) 2007-2014 PLT Design Inc.
-;; Copyright (C) 2003-2007 Scott Owens <sowens@cs.utah.edu>
-;;
-;; This  library is  free  software; you  can  redistribute it  and/or
-;; modify it under the terms  of the GNU Lesser General Public License
-;; as published by the Free Software Foundation; either version 2.1 of
-;; the License, or (at your option) any later version.
-;;
-;; This library is distributed in the hope that it will be useful, but
-;; WITHOUT  ANY  WARRANTY;  without   even  the  implied  warranty  of
-;; MERCHANTABILITY or  FITNESS FOR A  PARTICULAR PURPOSE. See  the GNU
-;; Lesser General Public License for more details.
-
-#lang mzscheme
-
-(require mzlib/etc
-         "gl-vectors.rkt"
-         "gl.rkt")
-
-(define-syntax (_provide stx)
-  (syntax-case stx ()
-    [(_ x ...)
-     (begin
-       #;
-       (for-each
-        (lambda (x)
-          (syntax-case x (rename)
-            [(rename _ n)
-             (display (syntax-object->datum #'n))]
-            [_ (display (syntax-object->datum x))])
-          (newline))
-        (syntax->list #'(x ...)))
-       #'(provide x ...))]))
-
-(define (combine-syms strs)
-    (string-append "(or/c" 
-                   (apply
-                    string-append
-                    (map (lambda (s)
-                           (format " '~s" s))
-                         strs))
-                   ")"))
-
-(define-syntax-set (multi-arg multi-type-v)
-
-  (define (iota n)
-    (if (= 0 n) null (cons n (iota (sub1 n)))))
-
-  (define (get-possible-types-v ts)
-    (combine-str
-     (map (lambda (t)
-            (case t
-              [(iv) "gl-int-vector?"]
-              [(sv) "gl-short-vector?"]
-              [(bv) "gl-byte-vector?"]
-              [(uiv) "gl-uint-vector?"]
-              [(usv) "gl-ushort-vector?"]
-              [(ubv) "gl-ubyte-vector?"]
-              [(dv) "gl-double-vector?"]
-              [(fv) "gl-float-vector?"]
-              [else (error (format "~a?" t))]))
-          ts)))
-
-  (define (combine-str strs)
-    (string-append "(or/c" 
-                   (apply
-                    string-append
-                    (map (lambda (s)
-                           (string-append " " s))
-                         strs))
-                   ")"))
-
-  (define (multi-arg/proc stx)
-    (syntax-case stx ()
-      [(_ name gl-name ((pre-arg-name pre-arg) ...) (num-arg ...))
-       (let ([build-clause
-              (lambda (num-arg)
-                (with-syntax ([(arg ...)
-                               (generate-temporaries (iota num-arg))]
-                              [gl-name
-                               (datum->syntax-object
-                                #'gl-name
-                                (string->symbol
-                                 (format "~a~ad"
-                                         (syntax-object->datum #'gl-name)
-                                         num-arg))
-                                #'gl-name
-                                #'gl-name)])
-                  #`((pre-arg-name ... arg ...)
-                     (if (and (real? arg) ...)
-                       (gl-name pre-arg ... arg ...)
-                       (raise-argument-error
-                        'name "(listof real?)" (list arg ...))))))])
-         (with-syntax ([(clauses ...)
-                        (map build-clause
-                             (syntax-object->datum  #'(num-arg ...)))])
-           #`(define name
-               (case-lambda clauses ...))))]))
-
-  (define (multi-type-v/proc stx)
-    (syntax-case stx ()
-      [(_ name gl-name ((pre-arg-name pre-arg ) ...)
-          (length ...) (type ...) num? )
-       (with-syntax ([arg (car (generate-temporaries (list #'name)))])
-         (let* ([num? (syntax-object->datum #'num?)]
-                [lengths (syntax-object->datum #'(length ...))]
-                [build-clause
-                 (lambda (type)
-                   (with-syntax ([pred?
-                                  (case type
-                                    [(dv) #'gl-double-vector?]
-                                    [(fv) #'gl-float-vector?]
-                                    [(iv) #'gl-int-vector?]
-                                    [(sv) #'gl-short-vector?]
-                                    [(bv) #'gl-byte-vector?]
-                                    [(uiv) #'gl-uint-vector?]
-                                    [(usv) #'gl-ushort-vector?]
-                                    [(ubv) #'gl-ubyte-vector?])]
-                                 [(clause ...)
-                                  (map
-                                   (lambda (length)
-                                     (with-syntax ([name
-                                                    (datum->syntax-object
-                                                     #'gl-name
-                                                     (string->symbol
-                                                      (format "~a~a~a"
-                                                              (syntax-object->datum #'gl-name)
-                                                              (if num? length "")
-                                                              type))
-                                                     #'gl-name
-                                                     #'gl-name)])
-                                       #`((#,length) (name pre-arg ... arg))))
-                                   lengths)])
-                     #`((pred? arg)
-                        (case (gl-vector-length arg)
-                          clause ...
-                          [else (error
-                                 'name
-                                 "expects vector with length in ~a: given vector has length ~a"
-                                 '(length ...)
-                                 (gl-vector-length arg))]))))]
-                [types (syntax-object->datum #'(type ...))])
-           (with-syntax ([(clause ...) (map build-clause types)])
-             #`(define (name pre-arg-name ... arg)
-                 (cond
-                   clause ...
-                   [else
-                    (raise-argument-error 'name
-                                      #,(get-possible-types-v types)
-                                      arg)])))))])))
-
-(define-for-syntax (translate-cname name)
-  (let* ([r (symbol->string name)]
-         [r (regexp-replace* #rx"_" r "-")]
-         [r (regexp-replace #rx"^GLU?-" r "")]
-         [r (string-downcase r)])
-    (string->symbol r)))
-
-(define-syntax (make-enum-table stx)
-  (syntax-case stx ()
-    [(_ name const ...)
-     (with-syntax ([(sym ...)
-                    (map translate-cname
-                         (syntax-object->datum #'(const ...)))])
-       (if (< (length (syntax->list #'(const ...))) 8)
-         (quasisyntax/loc stx
-           (define name
-             (let ([l `((sym . ,const) ...)])
-               (lambda (enum-sym name)
-                 (let ([v (assq enum-sym l)])
-                   (unless v
-                     (raise-argument-error name
-                                           (combine-syms '(sym ...))
-                                           enum-sym))
-                   (cdr v))))))
-         (quasisyntax/loc stx
-           (define name
-             (let ([ht (make-hash-table)])
-               (for-each (lambda (key value)
-                           (hash-table-put! ht key value))
-                         '(sym ...) (list const ...))
-               (lambda (enum-sym name)
-                 (let ([v (hash-table-get ht enum-sym (lambda () #f))])
-                   (unless v
-                     (raise-argument-error name
-                                           (combine-syms '(sym ...))
-                                           enum-sym))
-                   v)))))))]))
-
-(define-syntax (make-inv-enum-table stx)
-  (syntax-case stx ()
-    [(_ name const ...)
-     (with-syntax ([(sym ...)
-                    (map translate-cname
-                         (syntax-object->datum #'(const ...)))])
-       (quasisyntax/loc stx
-         (define name
-           (let ([l `((,const . sym) ...)])
-             (lambda (enum-val)
-               (cdr (assq enum-val l)))))))]))
-
-(define check-length
-  (case-lambda
-    [(name v desired-length sym)
-     (unless (= desired-length (gl-vector-length v))
-       (error name "expects vector of length ~a for ~a: argument vector has length ~a"
-              desired-length sym (gl-vector-length v)))]
-    [(name v desired-length)
-     (unless (= desired-length (gl-vector-length v))
-       (error name "expects vector of length ~a: argument vector has length ~a"
-              desired-length (gl-vector-length v)))]))
-
-;; 2.5
-(_provide get-error)
-(make-inv-enum-table get-error-table
-                     GL_NO_ERROR
-                     GL_INVALID_ENUM
-                     GL_INVALID_VALUE
-                     GL_INVALID_OPERATION
-                     GL_STACK_OVERFLOW
-                     GL_STACK_UNDERFLOW
-                     GL_OUT_OF_MEMORY)
-(define (get-error)
-  (get-error-table (glGetError)))
-
-;; 2.6.1
-(_provide (rename gl-begin begin) (rename glEnd end))
-(make-enum-table begin-table
-                 GL_LINES
-                 GL_LINE_LOOP
-                 GL_LINE_STRIP
-                 GL_POINTS
-                 GL_POLYGON
-                 GL_QUADS
-                 GL_QUAD_STRIP
-                 GL_TRIANGLES
-                 GL_TRIANGLE_FAN
-                 GL_TRIANGLE_STRIP)
-(define (gl-begin enum)
-  (glBegin (begin-table enum 'begin)))
-
-;; 2.6.2
-(_provide (rename glEdgeFlag edge-flag))
-
-;; 2.7
-(_provide vertex vertex-v
-          tex-coord tex-coord-v
-          multi-tex-coord multi-tex-coord-v
-          (rename glNormal3d normal) normal-v
-          color color-v
-          (rename glSecondaryColor3d secondary-color) secondary-color-v
-          (rename glIndexd index) index-v)
-
-(multi-arg vertex glVertex () (2 3 4))
-(multi-type-v vertex-v glVertex () (2 3 4) (dv iv fv sv) #t)
-(multi-arg tex-coord glTexCoord () (1 2 3 4))
-(multi-type-v tex-coord-v glTexCoord () (1 2 3 4) (dv iv fv sv) #t)
-(make-enum-table multi-tex-coord-table
-                 GL_TEXTURE0 GL_TEXTURE1 GL_TEXTURE2 GL_TEXTURE3 GL_TEXTURE4
-                 GL_TEXTURE5 GL_TEXTURE6 GL_TEXTURE7 GL_TEXTURE8 GL_TEXTURE9
-                 GL_TEXTURE10 GL_TEXTURE11 GL_TEXTURE12 GL_TEXTURE13
-                 GL_TEXTURE14 GL_TEXTURE15 GL_TEXTURE16 GL_TEXTURE17
-                 GL_TEXTURE18 GL_TEXTURE19 GL_TEXTURE20 GL_TEXTURE21
-                 GL_TEXTURE22 GL_TEXTURE23 GL_TEXTURE24 GL_TEXTURE25
-                 GL_TEXTURE26 GL_TEXTURE27 GL_TEXTURE28 GL_TEXTURE29
-                 GL_TEXTURE30 GL_TEXTURE31)
-(multi-arg multi-tex-coord glMultiTexCoord
-           ((e (multi-tex-coord-table e 'multi-tex-coord)))
-           (1 2 3 4))
-(multi-type-v multi-tex-coord-v glMultiTexCoord
-              ((e (multi-tex-coord-table e 'multi-tex-coord)))
-              (1 2 3 4)
-              (sv iv fv dv)
-              #t)
-(multi-type-v normal-v glNormal () (3) (dv iv fv sv bv) #t)
-(multi-arg color glColor () (3 4))
-(multi-type-v color-v glColor () (3 4) (dv iv uiv fv ubv bv usv sv) #t)
-(multi-type-v secondary-color-v glSecondaryColor () (3) (bv sv iv fv dv ubv usv uiv) #t)
-(multi-type-v index-v glIndex () (1) (dv iv fv sv ubv) #f)
-
-;; 2.8, 2.9 not implemented
-
-;; 2.10
-(_provide (rename glRectd rect) rect-v)
-(multi-type-v rect-v glRect () (4) (dv iv fv sv) #f)
-
-;; 2.11.1
-(_provide (rename glDepthRange depth-range) (rename glViewport viewport))
-
-;; 2.11.2
-(_provide matrix-mode load-matrix mult-matrix
-          load-transpose-matrix mult-transpose-matrix
-          (rename glLoadIdentity load-identity)
-          (rename glRotated rotate)
-          (rename glTranslated translate)
-          (rename glScaled scale)
-          (rename glFrustum frustum)
-          (rename glOrtho ortho)
-          active-texture
-          (rename glPushMatrix push-matrix)
-          (rename glPopMatrix pop-matrix))
-
-(make-enum-table matrix-mode-table
-                 GL_MODELVIEW GL_PROJECTION GL_TEXTURE GL_COLOR)
-(define (matrix-mode x)
-  (glMatrixMode (matrix-mode-table x 'matrix-mode)))
-(define-values (glLoadMatrixfv glLoadMatrixdv glMultMatrixfv glMultMatrixdv
-                glLoadTransposeMatrixfv glLoadTransposeMatrixdv
-                glMultTransposeMatrixfv glMultTransposeMatrixdv)
-  (values glLoadMatrixf glLoadMatrixd glMultMatrixf glMultMatrixd
-          glLoadTransposeMatrixf glLoadTransposeMatrixd
-          glMultTransposeMatrixf glMultTransposeMatrixd))
-(multi-type-v load-matrix glLoadMatrix () (16) (fv dv) #f)
-(multi-type-v mult-matrix glMultMatrix () (16) (fv dv) #f)
-(multi-type-v load-transpose-matrix glLoadTransposeMatrix () (16) (fv dv) #f)
-(multi-type-v mult-transpose-matrix glMultTransposeMatrix () (16) (fv dv) #f)
-
-(define (active-texture texture)
-  (glActiveTexture (multi-tex-coord-table texture 'active-texture texture)))
-
-;; 2.11.3
-(_provide enable disable)
-(make-enum-table enable-table
-                 GL_VERTEX_ARRAY GL_NORMAL_ARRAY GL_FOG_COORD_ARRAY
-                 GL_COLOR_ARRAY GL_SECONDARY_COLOR_ARRAY GL_INDEX_ARRAY
-                 GL_TEXTURE_COORD_ARRAY GL_EDGE_FLAG_ARRAY
-                 GL_NORMALIZE GL_RESCALE_NORMAL
-                 GL_CLIP_PLANE0 GL_CLIP_PLANE1 GL_CLIP_PLANE2 GL_CLIP_PLANE3
-                 GL_CLIP_PLANE4 GL_CLIP_PLANE5
-                 GL_FOG GL_COLOR_SUM
-                 GL_LIGHTING GL_COLOR_MATERIAL
-                 GL_LIGHT0 GL_LIGHT1 GL_LIGHT2 GL_LIGHT3 GL_LIGHT4
-                 GL_LIGHT5 GL_LIGHT6 GL_LIGHT7
-                 GL_POINT_SMOOTH GL_LINE_SMOOTH GL_LINE_STIPPLE GL_CULL_FACE
-                 GL_POLYGON_SMOOTH GL_POLYGON_OFFSET_POINT
-                 GL_POLYGON_OFFSET_LINE GL_POLYGON_OFFSET_FILL
-                 GL_POLYGON_STIPPLE
-                 GL_MULTISAMPLE GL_SAMPLE_ALPHA_TO_COVERAGE
-                 GL_SAMPLE_ALPHA_TO_ONE GL_SAMPLE_COVERAGE
-                 GL_TEXTURE_1D GL_TEXTURE_2D GL_TEXTURE_3D
-                 GL_TEXTURE_CUBE_MAP
-                 GL_TEXTURE_GEN_S GL_TEXTURE_GEN_T
-                 GL_TEXTURE_GEN_R GL_TEXTURE_GEN_Q
-                 GL_SCISSOR_TEST GL_ALPHA_TEST GL_STENCIL_TEST
-                 GL_DEPTH_TEST GL_BLEND GL_DITHER
-                 GL_INDEX_LOGIC_OP GL_LOGIC_OP GL_COLOR_LOGIC_OP
-                 GL_COLOR_TABLE GL_POST_CONVOLUTION_COLOR_TABLE
-                 GL_POST_COLOR_MATRIX_COLOR_TABLE
-                 GL_CONVOLUTION_1D GL_CONVOLUTION_2D GL_SEPARABLE_2D
-                 GL_HISTOGRAM GL_MINMAX
-                 GL_MAP1_VERTEX_3 GL_MAP1_VERTEX_4 GL_MAP1_INDEX
-                 GL_MAP1_COLOR_4 GL_MAP1_NORMAL
-                 GL_MAP1_TEXTURE_COORD_1 GL_MAP1_TEXTURE_COORD_2
-                 GL_MAP1_TEXTURE_COORD_3 GL_MAP1_TEXTURE_COORD_4
-                 GL_MAP2_VERTEX_3 GL_MAP2_VERTEX_4 GL_MAP2_INDEX
-                 GL_MAP2_COLOR_4 GL_MAP2_NORMAL
-                 GL_MAP2_TEXTURE_COORD_1 GL_MAP2_TEXTURE_COORD_2
-                 GL_MAP2_TEXTURE_COORD_3 GL_MAP2_TEXTURE_COORD_4
-                 GL_AUTO_NORMAL)
-(define (enable x)
-  (glEnable (enable-table x 'enable)))
-(define (disable x)
-  (glDisable (enable-table x 'disable)))
-
-;; 2.11.4
-(_provide tex-gen tex-gen-v)
-(make-enum-table tex-gen-coord-table GL_S GL_T GL_R GL_Q)
-(make-enum-table tex-gen-pname-table
-                 GL_TEXTURE_GEN_MODE GL_OBJECT_PLANE GL_EYE_PLANE)
-(make-enum-table tex-gen-param-table
-                 GL_OBJECT_LINEAR GL_EYE_LINEAR GL_SPHERE_MAP
-                 GL_REFLECTION_MAP GL_NORMAL_MAP)
-(define (tex-gen c p n)
-  (let ([cv (tex-gen-coord-table c 'tex-gen)]
-        [pv (tex-gen-pname-table p 'tex-gen)])
-    (unless (= pv GL_TEXTURE_GEN_MODE)
-      (error 'tex-gen "does not accept ~a, use tex-gen-v instead" p))
-    (glTexGeni cv pv (tex-gen-param-table n 'tex-gen))))
-(define (tex-gen-v c p v)
-  (let ([cv (tex-gen-coord-table c 'tex-gen-v)]
-        [pv (tex-gen-pname-table p 'tex-gen-v)])
-    (when (= pv GL_TEXTURE_GEN_MODE)
-      (error 'tex-gen-v "does not accept ~a, use tex-gen instead" p))
-    (let ([f (cond [(gl-int-vector? v) glTexGeniv]
-                   [(gl-float-vector? v) glTexGenfv]
-                   [(gl-double-vector? v) glTexGendv]
-                   [else (raise-argument-error
-                          'tex-gen-v
-                          "(or/c gl-int-vector? gl-float-vector? gl-double-vector?)"
-                          2 c p v)])])
-      (check-length 'tex-gen-v v 4)
-      (f cv pv v))))
-
-;; 2.12
-(_provide clip-plane)
-(make-enum-table clip-plane-table
-                 GL_CLIP_PLANE0 GL_CLIP_PLANE1 GL_CLIP_PLANE2
-                 GL_CLIP_PLANE3 GL_CLIP_PLANE4 GL_CLIP_PLANE5)
-(define (clip-plane p eqn)
-  (let ([v (clip-plane-table p 'clip-plane)])
-    (unless (gl-double-vector? eqn)
-      (raise-argument-error 'clip-plane "gl-double-vector?" 1 p eqn))
-    (check-length 'clip-plane eqn 4)
-    (glClipPlane v eqn)))
-
-;; 2.13
-(_provide raster-pos raster-pos-v
-          window-pos window-pos-v)
-(multi-arg raster-pos glRasterPos () (2 3 4))
-(multi-type-v raster-pos-v glRasterPos () (2 3 4) (dv iv fv sv) #t)
-(multi-arg window-pos glWindowPos () (2 3))
-(multi-type-v window-pos-v glWindowPos () (2 3) (dv iv fv sv) #t)
-
-;; 2.14.1
-(_provide front-face)
-(make-enum-table front-face-table GL_CCW GL_CW)
-(define (front-face x)
-  (glFrontFace (front-face-table x 'front-face)))
-
-;; 2.14.2
-(_provide material material-v light light-v light-model light-model-v)
-(make-enum-table face-table GL_FRONT GL_BACK GL_FRONT_AND_BACK)
-(make-enum-table material-pname-table
-                 GL_AMBIENT GL_DIFFUSE GL_AMBIENT_AND_DIFFUSE
-                 GL_SPECULAR GL_EMISSION GL_SHININESS GL_COLOR_INDEXES)
-
-(define (get-f v iv fv name a1 a2)
-  (cond [(gl-int-vector? v) iv]
-        [(gl-float-vector? v) fv]
-        [else (raise-argument-error name
-                                    "(or/c gl-int-vector? gl-float-vector?)"
-                                    2 a1 a2 v)]))
-(define (do-f n v0 v1 i f name a0 a1)
-  (unless (real? n)
-    (raise-argument-error name "real?" 2 a0 a1 n))
-  (if (exact-integer? n)
-    (i v0 v1 n)
-    (f v0 v1 n)))
-
-(define (material face pname param)
-  (let ([v0 (face-table face 'material)]
-        [v1 (material-pname-table pname 'material)])
-    (unless (= v1 GL_SHININESS)
-      (error 'material "does not accept ~a, use material-v instead" pname))
-    (do-f param v0 v1 glMateriali glMaterialf 'material face pname)))
-
-(define (material-v face pname params)
-  (let ([v0 (face-table face 'material-v)]
-        [v1 (material-pname-table pname 'material-v)]
-        [f (get-f params glMaterialiv glMaterialfv 'material-v face pname)])
-    (check-length 'material-v params
-                  (cond [(= GL_SHININESS v1)     1]
-                        [(= GL_COLOR_INDEXES v1) 3]
-                        [else                    4])
-                  pname)
-    (f v0 v1 params)))
-
-(make-enum-table light-light-table
-                 GL_LIGHT0 GL_LIGHT1 GL_LIGHT2 GL_LIGHT3
-                 GL_LIGHT4 GL_LIGHT5 GL_LIGHT6 GL_LIGHT7)
-(make-enum-table light-pname-table
-                 GL_AMBIENT GL_DIFFUSE GL_SPECULAR GL_POSITION
-                 GL_SPOT_DIRECTION
-                 GL_SPOT_EXPONENT GL_SPOT_CUTOFF
-                 GL_CONSTANT_ATTENUATION GL_LINEAR_ATTENUATION
-                 GL_QUADRATIC_ATTENUATION)
-(define (light light pname param)
-  (let ([v0 (light-light-table light 'light)]
-        [v1 (light-pname-table pname 'light)])
-    (unless (memv v1 `(,GL_SPOT_EXPONENT ,GL_SPOT_CUTOFF
-                       ,GL_CONSTANT_ATTENUATION ,GL_LINEAR_ATTENUATION
-                       ,GL_QUADRATIC_ATTENUATION))
-      (error 'light "does not accept ~a, use light-v instead" pname))
-    (do-f param v0 v1 glLighti glLightf 'light light pname)))
-
-(define (light-v light pname params)
-  (let ([v0 (light-light-table light 'light-v)]
-        [v1 (light-pname-table pname 'light-v)]
-        [f (get-f params glLightiv glLightfv 'light-v light pname)])
-    (check-length
-     'light-v params
-     (cond [(= GL_SPOT_DIRECTION v1) 3]
-           [(memv v1 `(,GL_AMBIENT ,GL_DIFFUSE ,GL_SPECULAR ,GL_POSITION)) 4]
-           [else 1])
-     pname)
-    (f v0 v1 params)))
-
-(make-enum-table light-model-table
-                 GL_LIGHT_MODEL_AMBIENT
-                 GL_LIGHT_MODEL_COLOR_CONTROL
-                 GL_LIGHT_MODEL_LOCAL_VIEWER
-                 GL_LIGHT_MODEL_TWO_SIDE)
-
-(define (light-model pname param)
-  (let ([v (light-model-table pname 'light-model)])
-    (when (= GL_LIGHT_MODEL_AMBIENT v)
-      (error 'light-model "does not accept ~a, use light-model-v instead" pname))
-    (unless (real? param)
-      (raise-argument-error 'light-model "real?" 1 pname param))
-    (if (exact-integer? param)
-      (glLightModeli v param)
-      (glLightModelf v param))))
-
-(define (light-model-v pname params)
-  (let ([v (light-model-table pname 'light-model-v)]
-        [f (cond [(gl-int-vector? params) glLightModeliv]
-                 [(gl-float-vector? params) glLightModelfv]
-                 [else (raise-argument-error 'light-model-v
-                                             "(or/c gl-int-vector? gl-float-vector?)"
-                                             1 pname params)])])
-    (check-length 'light-model-v params
-                  (if (= GL_LIGHT_MODEL_AMBIENT v) 4 1)
-                  pname)
-    (f v params)))
-
-;; 2.14.3
-(_provide color-material)
-(make-enum-table color-material-mode-table
-                 GL_EMISSION GL_AMBIENT GL_DIFFUSE
-                 GL_SPECULAR GL_AMBIENT_AND_DIFFUSE)
-(define (color-material x y)
-  (glColorMaterial (face-table x 'color-material)
-                   (color-material-mode-table y 'color-material)))
-
-;; 2.14.7
-(_provide shade-model)
-(make-enum-table shade-model-table GL_FLAT GL_SMOOTH)
-(define (shade-model x)
-  (glShadeModel (shade-model-table x 'shade-model)))
-
-;; 3.3
-(_provide (rename glPointSize point-size)
-          point-parameter point-parameter-v)
-(make-enum-table point-parameter-table
-                 GL_POINT_SIZE_MIN GL_POINT_SIZE_MAX
-                 GL_POINT_DISTANCE_ATTENUATION
-                 GL_POINT_FADE_THRESHOLD_SIZE)
-(define (point-parameter pname param)
-  (let ([v (point-parameter-table pname 'point-parameter)])
-    (when (= GL_POINT_DISTANCE_ATTENUATION v)
-      (error 'point-parameter
-             "does not accept ~a, use point-parameter-v instead" pname))
-    (unless (real? param)
-      (raise-argument-error 'point-parameter "real?" 1 pname param))
-    (if (exact-integer? param)
-      (glPointParameteri v param)
-      (glPointParameterf v param))))
-(define (point-parameter-v pname params)
-  (let ([v (point-parameter-table pname 'point-parameter)]
-        [f (cond [(gl-int-vector? params) glPointParameteriv]
-                 [(gl-float-vector? params) glPointParameterfv]
-                 [else (raise-argument-error 'point-parameter-v
-                                             "(or/c gl-int-vector? gl-float-vector?)"
-                                             1 pname params)])])
-    (check-length 'point-parameter-v
-                  (if (= GL_POINT_DISTANCE_ATTENUATION v) 3 1)
-                  pname)
-    (f v params)))
-
-;; 3.4
-(_provide (rename glLineWidth line-width))
-
-;; 3.4.2
-(_provide (rename glLineStipple line-stipple))
-
-;; 3.5.1
-(_provide cull-face)
-(define (cull-face x)
-  (glCullFace (face-table x)))
-
-;; 3.5.2
-;; polygon-stipple
-
-;;3.5.4
-(_provide polygon-mode)
-(make-enum-table polygon-mode-mode-table GL_POINT GL_LINE GL_FILL)
-(define (polygon-mode x y)
-  (glPolygonMode (face-table x 'polygon-mode)
-                 (polygon-mode-mode-table y 'polygon-mode)))
-
-;; 3.5.5
-(_provide (rename glPolygonOffset polygon-offset))
-
-;; 3.6.1
-(_provide pixel-store)
-(make-enum-table pixel-store-table
-                 GL_UNPACK_SWAP_BYTES GL_UNPACK_LSB_FIRST
-                 GL_UNPACK_ROW_LENGTH GL_UNPACK_SKIP_ROWS
-                 GL_UNPACK_SKIP_PIXELS GL_UNPACK_ALIGNMENT
-                 GL_UNPACK_IMAGE_HEIGHT GL_UNPACK_SKIP_IMAGES)
-(define (pixel-store pname param)
-  (let ([v (pixel-store-table pname 'pixel-store)])
-    (unless (real? param)
-      (raise-argument-error 'pixel-store "real?" 1 pname param))
-    (if (exact-integer? param)
-      (glPixelStorei v param)
-      (glPixelStoref v param))))
-
-;; 3.6.3, 3.6.4, 3.6.5, 3.7, 3.8, 3.10 not implemented
-
-;; 4.1.2
-(_provide (rename glScissor scissor))
-
-;; 4.1.3
-(_provide (rename glSampleCoverage sample-coverage))
-
-;; 4.1.4
-(_provide alpha-func)
-(make-enum-table func-table
-                 GL_NEVER GL_ALWAYS GL_LESS GL_LEQUAL GL_EQUAL
-                 GL_GEQUAL GL_GREATER GL_NOTEQUAL)
-(define (alpha-func func ref)
-  (glAlphaFunc (func-table func 'alpha-func) ref))
-
-;; 4.1.5
-(_provide stencil-func stencil-op)
-(define (stencil-func func ref mask)
-  (glStencilFunc (func-table func 'stencil-func) ref mask))
-
-(make-enum-table stencil-op-table
-                 GL_KEEP GL_ZERO GL_REPLACE GL_INCR GL_DECR GL_INVERT
-                 GL_INCR_WRAP GL_DECR_WRAP)
-(define (stencil-op sfail dpfail dppass)
-  (glStencilOp (stencil-op-table sfail 'stencil-op)
-               (stencil-op-table dpfail 'stencil-op)
-               (stencil-op-table dppass 'stencil-op)))
-
-;; 4.1.6
-(_provide depth-func)
-(define (depth-func func)
-  (glDepthFunc (func-table func 'depth-func)))
-
-;; 4.1.7
-(_provide begin-query end-query
-          (rename glGenQueries gen-queries)
-          (rename glDeleteQueries delete-queries))
-(make-enum-table query-table GL_SAMPLES_PASSED)
-(define (begin-query target id)
-  (glBeginQuery (query-table target 'begin-query) id))
-(define (end-query target)
-  (glEndQuery (query-table target 'end-query)))
-
-
-;; 4.1.8
-(_provide blend-equation blend-func blend-func-separate
-          (rename glBlendColor blend-color))
-
-(make-enum-table blend-equation-table
-                 GL_FUNC_ADD GL_FUNC_SUBTRACT GL_FUNC_REVERSE_SUBTRACT
-                 GL_MIN GL_MAX)
-(define (blend-equation func)
-  (glBlendEquation (blend-equation-table func 'blend-equation)))
-
-(make-enum-table blend-func-table
-                 GL_ZERO GL_ONE
-                 GL_SRC_COLOR GL_ONE_MINUS_SRC_COLOR
-                 GL_DST_COLOR GL_ONE_MINUS_DST_COLOR
-                 GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
-                 GL_DST_ALPHA GL_ONE_MINUS_DST_ALPHA
-                 GL_CONSTANT_COLOR GL_ONE_MINUS_CONSTANT_COLOR
-                 GL_CONSTANT_ALPHA GL_ONE_MINUS_CONSTANT_ALPHA
-                 GL_SRC_ALPHA_SATURATE)
-(define (blend-func src dest)
-  (glBlendFunc (blend-func-table src 'blend-func)
-               (blend-func-table dest 'blend-func)))
-
-(define (blend-func-separate src dest src-alpha dst-alpha)
-  (glBlendFuncSeparate (blend-func-table src 'blend-func)
-                       (blend-func-table dest 'blend-func)
-                       (blend-func-table src-alpha 'blend-func)
-                       (blend-func-table dst-alpha 'blend-func)))
-
-;; 4.1.10
-(provide logic-op)
-(make-enum-table logic-op-table
-                 GL_CLEAR GL_AND GL_AND_REVERSE GL_COPY GL_AND_INVERTED
-                 GL_NOOP GL_XOR GL_OR GL_NOR GL_EQUIV GL_INVERT GL_OR_REVERSE
-                 GL_COPY_INVERTED GL_OR_INVERTED GL_NAND GL_SET)
-(define (logic-op op)
-  (glLogicOp logic-op-table op 'logic-op))
-
-;; 4.2.1
-(provide draw-buffer)
-(make-enum-table draw-buffer-table
-                 GL_NONE GL_FRONT_LEFT GL_FRONT_RIGHT GL_BACK_LEFT
-                 GL_BACK_RIGHT GL_FRONT GL_BACK GL_LEFT GL_RIGHT
-                 GL_FRONT_AND_BACK
-                 GL_AUX0 GL_AUX1 GL_AUX2 GL_AUX3)
-(define (draw-buffer buf)
-  (glDrawBuffer (draw-buffer-table buf 'draw-buffer)))
-
-;; 4.2.2
-(_provide (rename glIndexMask index-mask)
-          (rename glColorMask color-mask)
-          (rename glDepthMask depth-mask)
-          (rename glStencilMask stencil-mask))
-
-;; 4.2.3
-(_provide clear
-          (rename glClearColor clear-color)
-          (rename glClearIndex clear-index)
-          (rename glClearDepth clear-depth)
-          (rename glClearStencil clear-stencil)
-          (rename glClearAccum clear-accum))
-(make-enum-table clear-table
-                 GL_ACCUM_BUFFER_BIT GL_COLOR_BUFFER_BIT
-                 GL_DEPTH_BUFFER_BIT GL_STENCIL_BUFFER_BIT)
-(define (clear . x)
-  (glClear (apply bitwise-ior (map (lambda (x) (clear-table x 'clear)) x))))
-
-;; 4.2.4
-(_provide accum)
-(make-enum-table accum-table
-                 GL_ACCUM GL_MULT GL_RETURN GL_MULT GL_ADD)
-(define (accum op value)
-  (glAccum (accum-table op 'accum) value))
-
-;; 4.3.2 not implemented
-
-;; 4.3.3
-(_provide copy-pixels)
-(make-enum-table copy-pixels-table
-                 GL_COLOR GL_STENCIL GL_DEPTH)
-(define (copy-pixels a b c d e)
-  (glCopyPixels a b c d (copy-pixels-table e 'copy-pixels)))
-
-;; 5.1
-(_provide ;map1 map2
- eval-coord eval-coord-v map-grid eval-mesh eval-point)
-(multi-arg eval-coord glEvalCoord () (1 2))
-(multi-type-v eval-coord-v glEvalCoord () (1 2) (dv fv) #t)
-(define map-grid
-  (case-lambda
-    [(n a b) (glMapGrid1d n a b)]
-    [(m a b n c d) (glMapGrid2d m a b n c d)]))
-(make-enum-table eval-mesh-table GL_POINT GL_LINE)
-(define eval-mesh
-  (case-lambda
-    [(e a b) (glEvalMesh1 (eval-mesh-table e 'eval-mesh) a b)]
-    [(e a b c d) (glEvalMesh2 (eval-mesh-table e 'eval-mesh) a b c d)]))
-(define eval-point
-  (case-lambda
-    [(x) (glEvalPoint1 x)]
-    [(x y) (glEvalPoint2 x y)]))
-
-;; 5.2
-(_provide (rename glInitNames init-names)
-          (rename glPopName pop-name)
-          (rename glPushName push-name)
-          (rename glLoadName load-name)
-          render-mode
-          select-buffer->gl-uint-vector)
-(make-enum-table render-mode-table GL_RENDER GL_SELECT GL_FEEDBACK)
-(define (render-mode x)
-  (glRenderMode (render-mode-table x 'render-mode)))
-
-;; 5.3
-(_provide feedback-buffer->gl-float-vector
-          (rename glPassThrough pass-through))
-
-;; 5.4
-(_provide new-list
-          (rename glEndList end-list)
-          (rename glCallList call-list)
-          ;; call-lists
-          (rename glListBase list-base)
-          (rename glGenLists gen-lists)
-          (rename glIsList is-list)
-          (rename glDeleteLists delete-lists))
-(make-enum-table new-list-table GL_COMPILE GL_COMPILE_AND_EXECUTE)
-(define (new-list n mode)
-  (glNewList n (new-list-table mode 'new-list)))
-
-;; 5.5
-(_provide (rename glFlush flush)
-          (rename glFinish finish))
-
-;; 5.6
-(_provide hint)
-(make-enum-table hint-target-table
-                 GL_PERSPECTIVE_CORRECTION_HINT GL_POINT_SMOOTH_HINT
-                 GL_LINE_SMOOTH_HINT GL_POLYGON_SMOOTH_HINT GL_FOG_HINT
-                 GL_GENERATE_MIPMAP_HINT GL_TEXTURE_COMPRESSION_HINT)
-(make-enum-table hint-hint-table GL_FASTEST GL_NICEST GL_DONT_CARE)
-(define (hint target hint)
-  (glHint (hint-target-table target 'hint)
-          (hint-hint-table hint 'hint)))
-
-;; 6.1.1
-(_provide ;glGetBooleanv glGetIntegerv glGetFloatv glGetDoublev
- is-enabled)
-(define (is-enabled e)
-  (glIsEnabled (enable-table e 'is-enabled)))
-
-;; 6.1.3, 6.1.4, 6.1.5, 6.1.7, 6.1.8, 6.1.9, 6.1.10 not implemented
-
-;; 6.1.11
-(_provide ;get-pointer-v
-          get-string)
-
-(make-enum-table get-string-table
-                 GL_VENDOR GL_RENDERER GL_VERSION GL_EXTENSIONS)
-(define (get-string x)
-  (glGetString (get-string-table x 'get-string)))
-
-;; 6.1.12
-(_provide (rename glIsQuery is-query)
-          ;; get-query get-query-object
-          )
-
-;; 6.1.13
-(_provide (rename glIsBuffer is-buffer)
-          ;; get-buffer-sub-data get-buffer-pointer-v
-          )
-
-;; 6.1.14
-(_provide push-attrib push-client-attrib
-          (rename glPopAttrib pop-attrib)
-          (rename glPopClientAttrib pop-client-attrib))
-(make-enum-table push-attrib-table
-                 GL_ACCUM_BUFFER_BIT GL_COLOR_BUFFER_BIT GL_CURRENT_BIT
-                 GL_DEPTH_BUFFER_BIT GL_ENABLE_BIT GL_EVAL_BIT GL_FOG_BIT GL_HINT_BIT
-                 GL_LIGHTING_BIT GL_LINE_BIT GL_LIST_BIT GL_MULTISAMPLE_BIT
-                 GL_PIXEL_MODE_BIT GL_POINT_BIT GL_POLYGON_BIT GL_POLYGON_STIPPLE_BIT
-                 GL_SCISSOR_BIT GL_STENCIL_BUFFER_BIT GL_TEXTURE_BIT
-                 GL_TRANSFORM_BIT GL_VIEWPORT_BIT GL_ALL_ATTRIB_BITS)
-(define (push-attrib . x)
-  (glPushAttrib
-   (apply bitwise-ior (map (lambda (x) (push-attrib-table x 'clear)) x))))
-(make-enum-table push-client-attrib-table
-                 GL_CLIENT_VERTEX_ARRAY_BIT
-                 GL_CLIENT_PIXEL_STORE_BIT
-                 GL_CLIENT_ALL_ATTRIB_BITS)
-(define (push-client-attrib . x)
-  (glPushClientAttrib
-   (apply bitwise-ior
-          (map (lambda (x) (push-client-attrib-table x 'clear)) x))))
-
-;; 2
-(_provide u-get-string
-          (rename gluCheckExtension check-extension))
-(make-enum-table u-get-string-table GLU_VERSION GLU_EXTENSIONS)
-(define (u-get-string x)
-  (gluGetString (u-get-string-table x 'u-get-string)))
-
-;; 3 not implemented
-
-;; 4.1
-(_provide (rename gluOrtho2D ortho-2d)
-          (rename gluPerspective perspective)
-          (rename gluLookAt look-at)
-          pick-matrix)
-(define (pick-matrix a b c d v)
-  (unless (gl-int-vector? v)
-    (raise-argument-error 'pick-matrix
-                          "gl-int-vector?"
-                          4 a b c d v))
-  (check-length 'pick-matrix v 4)
-  (gluPickMatrix a b c d v))
-
-;; 4.2
-(_provide project un-project un-project4)
-(define (project a b c d e f)
-  (unless (gl-double-vector? d)
-    (raise-argument-error 'project "gl-double-vector?" 3 a b c d e f))
-  (unless (gl-double-vector? e)
-    (raise-argument-error 'project "gl-double-vector?" 4 a b c d e f))
-  (unless (gl-int-vector? f)
-    (raise-argument-error 'project "gl-double-vector?" 5 a b c d e f))
-  (check-length 'project d 16)
-  (check-length 'project e 16)
-  (check-length 'project f 4)
-  (gluProject a b c d e f))
-
-(define (un-project a b c d e f)
-  (unless (gl-double-vector? d)
-    (raise-argument-error 'un-project "gl-double-vector?" 3 a b c d e f))
-  (unless (gl-double-vector? e)
-    (raise-argument-error 'un-project "gl-double-vector?" 4 a b c d e f))
-  (unless (gl-int-vector? f)
-    (raise-argument-error 'un-project "gl-double-vector?" 5 a b c d e f))
-  (check-length 'un-project d 16)
-  (check-length 'un-project e 16)
-  (check-length 'un-project f 4)
-  (gluUnProject a b c d e f))
-
-(define (un-project4 a b c d e f g h i)
-  (unless (gl-double-vector? e)
-    (raise-argument-error 'un-project "gl-double-vector?" 4 a b c d e f g h i))
-  (unless (gl-double-vector? f)
-    (raise-argument-error 'un-project "gl-double-vector?" 5 a b c d e f g h i))
-  (unless (gl-int-vector? g)
-    (raise-argument-error 'un-project "gl-double-vector?" 6 a b c d e f g h i))
-  (check-length 'un-project4 e 16)
-  (check-length 'un-project4 f 16)
-  (check-length 'un-project4 g 4)
-  (gluUnProject4 a b c d e f g h i))
-
-;; 5 not implemented
-
-;; 6.1
-(_provide (rename gluNewQuadric new-quadric))
-
-;; 6.2 not implemented
-
-;; 6.3
-(_provide quadric-normals
-          (rename gluQuadricTexture quadric-texture)
-          quadric-orientation quadric-draw-style)
-
-(make-enum-table quadric-normals-table GLU_NONE GLU_FLAT GLU_SMOOTH)
-(define (quadric-normals q e)
-  (gluQuadricNormals q (quadric-normals-table e 'quadric-normals)))
-
-(make-enum-table quadric-orientation-table GLU_INSIDE GLU_OUTSIDE)
-(define (quadric-orientation q e)
-  (gluQuadricOrientation q (quadric-orientation-table e 'quadric-normals)))
-
-(make-enum-table quadric-draw-style-table
-                 GLU_POINT GLU_LINE GLU_SILHOUETTE GLU_FILL)
-(define (quadric-draw-style q e)
-  (gluQuadricDrawStyle q (quadric-draw-style-table e 'quadric-draw-style)))
-
-;; 6.4
-(_provide (rename gluCylinder cylinder)
-          (rename gluDisk disk)
-          (rename gluSphere sphere)
-          (rename gluPartialDisk partial-disk))
-
-;; 7 not implemented
-
-;; 8
-(_provide ;error-string
-          )
-
-;; Utils
-
-(_provide process-selection (struct selection-record (min-z max-z stack)))
-;; A selection-record is
-;; (make-selection-record number number (listof positive-int))
-(define-struct selection-record (min-z max-z stack))
-
-;; process-selection : gl-uint-vector int -> (listof selection-record)
-(define (process-selection v hits)
-  (unless (gl-uint-vector? v)
-    (raise-argument-error 'process-selection "gl-uint-vector?" 0 v hits))
-  (let ([index 0])
-    (let loop ([hit 0])
-      (if (>= hit hits)
-        null
-        (let ([stack-size (gl-vector-ref v index)])
-          (cons (make-selection-record
-                 (gl-vector-ref v (add1 index))
-                 (gl-vector-ref v (+ index 2))
-                 (begin (set! index (+ 3 index))
-                        (let loop ([j 0])
-                          (if (< j stack-size)
-                            (cons (gl-vector-ref v index)
-                                  (begin (set! index (add1 index))
-                                         (loop (add1 j))))
-                            null))))
-                (loop (add1 hit))))))))
-
-(provide get-gl-version-number get-glu-version-number)
-(define (get-gl-version-number)
-  (let ([x (regexp-match "^([0-9]*)\\.([0-9*])" (get-string 'version))])
-    (string->number (string-append (cadr x) (caddr x)))))
-(define (get-glu-version-number)
-  (let ([x (regexp-match "^([0-9]*)\\.([0-9*])" (u-get-string 'version))])
-    (string->number (string-append (cadr x) (caddr x)))))
diff --git a/pkgs/shell-completion/LICENSE.txt b/pkgs/shell-completion/LICENSE.txt
deleted file mode 100644
index 2012fa6c91..0000000000
--- a/pkgs/shell-completion/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-shell-completion
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/shell-completion/info.rkt b/pkgs/shell-completion/info.rkt
deleted file mode 100644
index 17b8eddcbb..0000000000
--- a/pkgs/shell-completion/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection "shell-completion")
-(define deps '("base"))
-
-(define pkg-desc "Completion scribpts for bash and zsh")
-
-(define pkg-authors '(samth sstrickl stamourv))
-
-(define test-responsibles '(("racket-completion.zsh" eli)))
diff --git a/pkgs/shell-completion/list-collects.rkt b/pkgs/shell-completion/list-collects.rkt
deleted file mode 100644
index 286f8d62f7..0000000000
--- a/pkgs/shell-completion/list-collects.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-
-(provide get-top-level-collection-paths)
-
-(require racket/string racket/list racket/path setup/dirs setup/link)
-
-(define (add-directory-collections c s)
-  (if (directory-exists? c)
-      (for/fold ([s s]) ([p (in-list (directory-list c))]
-                         #:when (directory-exists? (build-path c p))
-                         #:when (regexp-match? #rx#"^[a-zA-Z_%+-]*$" p))
-        (hash-set s (build-path c (path-element->string p)) #t))
-      s))
-
-(define (get-top-level-collection-paths)
-  (hash-keys
-   (for/fold ([s (hash)]) ([l (in-list
-                               (current-library-collection-links))])
-     (cond
-      [(not l)
-       (for/fold ([s s]) ([c (in-list
-                              (current-library-collection-paths))])
-         (add-directory-collections c s))]
-      [(path? l)
-       (let ([s (for*/fold ([s s]) ([c (in-list (links #:file l #:root? #f #:with-path? #t))])
-                  (hash-set s (cdr c) #t))])
-         (for*/fold ([s s]) ([c (in-list (links #:file l #:root? #t))])
-           (add-directory-collections c s)))]
-      [else (error 'get-top-level-collection-paths
-                   "unexpected value in `current-library-collection-links': ~e"
-                   l)]))))
-
-(module+ main
-  (define var "RACKET_COMPLETION_CLIENT")
-  (define shell (getenv var))
-  (cond [(equal? shell "bash")
-         (for ([p (get-top-level-collection-paths)])
-           (define-values [base name dir?] (split-path p))
-           (displayln name))]
-        [(equal? shell "zsh")
-         (for-each displayln
-                   (remove-duplicates
-                    (map path-only (get-top-level-collection-paths))))]
-        [else (error 'list-collects "unknown shell (missing ~a envvar)" var)]))
diff --git a/pkgs/shell-completion/racket-completion.bash b/pkgs/shell-completion/racket-completion.bash
deleted file mode 100644
index 0b6a9ca3cc..0000000000
--- a/pkgs/shell-completion/racket-completion.bash
+++ /dev/null
@@ -1,183 +0,0 @@
-# -*- mode: shell-script; sh-basic-offset: 2; indent-tabs-mode: nil -*-
-# ex: ts=2 sw=2 noet filetype=sh
-
-# To enable this, add the following line to ~/.bash_completion
-#
-#     source $PLTHOME/collects/meta/contrib/completion/racket-completion.bash
-#
-# Change $PLTHOME to whatever references your Racket installation.  You
-# will need to make sure that you have bash completions enabled, usually
-# with "source /etc/bash_completion".
-
-# Identify bash as the completion client
-export RACKET_COMPLETION_CLIENT=bash
-
-# This completes only *.{rkt,ss,scm,scrbl} files unless there are none,
-# in which case it completes other things.
-_racket_filedir() {
-  COMPREPLY=()
-  _filedir "@(rkt|rktl|ss|scm|scrbl)"
-  if [[ "${#COMPREPLY[@]}" -eq 0 ]]; then _filedir; fi
-}
-
-_find_exe() {
-  local exename="$1"
-  local dir="$(dirname "${COMP_WORDS[0]}")"
-  local exe="$(basename "${COMP_WORDS[0]}")"
-  if [[ "$dir" != "." || "${COMP_WORDS[0]}" = "$dir/$exe" ]]; then
-    echo "$dir/$exename"
-  else
-    echo "$exename"
-  fi
-}
-
-_racket() {
-  local cur prev singleopts doubleopts
-  COMPREPLY=()
-  cur="$(_get_cword)"
-  prev="${COMP_WORDS[COMP_CWORD-1]}"
-  doubleopts="--help --version --eval --load --require --lib --script"
-  doubleopts+=" --require-script --main --repl --no-lib --version --warn"
-  doubleopts+=" --syslog --collects --search --addon --no-compiled"
-  doubleopts+=" --no-init-file"
-  singleopts="-h -e -f -t -l -p -r -u -k -m -i -n -v -W -L -X -S -A -I -U"
-  singleopts+=" -N -j -d -b -c -q"
-  warnlevels="none fatal error warning info debug"
-
-  # if "--" is already given, complete all kind of files, but no options
-  for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
-    if [[ "${COMP_WORDS[i]}" == "--" ]]; then _racket_filedir; return; fi
-  done
-
-  # -k takes *two* integer arguments
-  if [[ 2 < "${#COMP_WORDS[@]}" ]]; then
-    if [[ "${COMP_WORDS[COMP_CWORD-2]}" == "-k" ]]; then return; fi
-  fi
-
-  case "$cur" in
-    "--"* )
-      COMPREPLY=( $(compgen -W "$doubleopts" -- "$cur") )
-      ;;
-    "-"* )
-      COMPREPLY=( $(compgen -W "$singleopts" -- "$cur") )
-      ;;
-    * )
-      case "$prev" in
-        # these do not take anything completable as arguments
-        "--help" | "-h" | "-e" | "--eval" | "-p" | "-k" )
-          ;;
-        # these take dirs (not files) as arguments
-        "-X" | "-S" | "-A" | "--collects" | "--search" | "--addon" )
-          _filedir -d
-          ;;
-        # these take warnlevels as arguments
-        "-W" | "--warn" | "-L" | "--syslog" )
-          COMPREPLY=( $(compgen -W "$warnlevels" -- "$cur") )
-          ;;
-        # otherwise, just a file
-        * )
-          _racket_filedir
-          ;;
-      esac
-      ;;
-  esac
-}
-
-complete -F _racket racket
-complete -F _racket gracket
-complete -F _racket gracket-text
-
-_raco_cmd="$(_find_exe "raco")"
-
-_raco_planet() {
-  local cur="${COMP_WORDS[COMP_CWORD]}"
-  local planetcmds=$(
-    printf '%s\n' "--help"
-    "${_raco_cmd}" planet --help 2>&1 | awk '/^  *raco planet / { print $3 }'
-  )
-  COMPREPLY=( $(compgen -W "$planetcmds" -- "$cur") )
-}
-
-_raco_cmds=$()
-_racket_cmd="$(_find_exe "racket")"
-
-_raco_help() {
-  local cur="${COMP_WORDS[COMP_CWORD]}"
-  if [[ ${#_raco_cmds[@]} -eq 0 ]]; then
-    _raco_cmds=$(
-      echo "help"
-      "$_racket_cmd" -e '(begin (require raco/all-tools)
-                                (for ([(k v) (all-tools)]) (printf "~a\n" k)))'
-    )
-  fi
-  COMPREPLY=( $(compgen -W "$_raco_cmds" -- "$cur") )
-}
-
-_racket_collects=()
-
-_complete_collects() {
-  local cur="$1"
-  if [[ "${#_racket_collects[@]}" -eq 0 ]]; then
-    _racket_collects=(
-      $( $_racket_cmd -e '(require (submod shell-completion/list-collects main))' )
-    )
-  fi
-  local wordlist=""
-  for dir in "${_racket_collects[@]}"; do
-    wordlist="$wordlist $dir"
-  done
-  COMPREPLY=( $(compgen -W "$wordlist" -- "$cur") )
-}
-
-_raco_setup()
-{
-  local cur="${COMP_WORDS[COMP_CWORD]}"
-  local prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-  if [[ "$COMP_CWORD" -eq 2 ]]; then
-    _complete_collects ${cur}
-  else
-    case "${prev}" in
-      # specifying a particular collection
-      "-l" ) _complete_collects "$cur" ;;
-      *    ) _filedir ;;
-    esac
-  fi
-}
-
-_raco() {
-  COMPREPLY=()
-  local cur="${COMP_WORDS[COMP_CWORD]}"
-
-  #
-  #  Complete the arguments to some of the basic commands.
-  #
-  local makeopts="--disable-inline --no-deps -p --prefix --no-prim -v -vv --help -h"
-
-  if [[ "$COMP_CWORD" -eq 1 ]]; then
-    # removing the empty string on the next line breaks things.  such as my brain.
-    _raco_cmds="$(
-      echo "help"
-      $_racket_cmd -e '(begin (require raco/all-tools)
-                              (for ([(k v) (all-tools)]) (printf "~a\n" k)))')"
-    COMPREPLY=($(compgen -W "$_raco_cmds" -- "$cur"))
-  elif [[ "$COMP_CWORD" -ge 2 ]]; then
-    # Here we'll handle the main raco commands
-    local prev="${COMP_WORDS[1]}"
-    case "$prev" in
-      "make" )
-        case "$cur" in
-          "-"* ) COMPREPLY=( $(compgen -W "$makeopts" -- "$cur") ) ;;
-          *    ) _filedir ;;
-        esac ;;
-      "planet" ) _raco_planet ;;
-      "help"   ) _raco_help ;;
-      "setup"  ) _raco_setup ;;
-      *        ) _filedir ;;
-    esac
-  else
-    _filedir
-  fi
-}
-
-complete -F _raco raco
diff --git a/pkgs/shell-completion/racket-completion.zsh b/pkgs/shell-completion/racket-completion.zsh
deleted file mode 100644
index 6dfb432ac5..0000000000
--- a/pkgs/shell-completion/racket-completion.zsh
+++ /dev/null
@@ -1,611 +0,0 @@
-#compdef racket raco
-
-#
-# This file defines zsh completions for `racket' and `raco'.
-#
-# To give it a quick try, load this file with the "source" command.
-#
-# The proper way to install it is to copy it to a file called "_racket" in one
-# the zsh function directories which you can find with "echo $fpath".  For
-# example: "cp racket-completion.zsh ${fpath[1]}/_racket".  If all of the
-# $fpath entries are system directories that you can't write to, you can add
-# your own path by adding something like "fpath+=~/.zsh" in your ".zshrc" file.
-# You can also use "source" as described above, but then it's not auto-loaded.
-# (Note that sourcing this file will load the completion system if it's not
-# already done.)
-#
-# These completions include useful hints for flags, and for types of arguments.
-# To see the latter, you can something like add the following to your ".zshrc":
-#   zstyle ':completion:*' verbose yes
-#   zstyle ':completion:*:descriptions' format '--- %U%d%u ---'
-#
-# The completions below cover all of the `racket' and `raco' commands.  It also
-# includes a simple test facility: if you run "_racket --self-test", it will go
-# over all --help outputs, and compare them with the outputs that were in
-# effect when this script was updated.  This a simple checksum test, and
-# failures are usually due to added flags and text tweaks.  (It is mostly
-# useful to keep track of command-line changes between releases.)
-#
-# If you want to include a new raco command, you need to define a function that
-# is called "_raco_cmd_<new-command>", see below for many examples.  To have
-# your code autoloaded, place the function's *body* in a file that has the
-# function's name, in one of the "$fpath" directories, and make sure that the
-# first line is "#autoload".  (Autoloaded functions in zsh have their body
-# saved in a file that has the function name.  This file uses a common trick:
-# it defines the `_racket' function which zsh will not overwrite, and it calls
-# the function since it's loaded on first use.)
-#
-
-# Identify zsh as the completion client
-export RACKET_COMPLETION_CLIENT=zsh
-
-###############################################################################
-
-_racket_file_expander() {
-  if [[ -d "$REPLY" ]]; then return 0
-  elif [[ "$REPLY" = *.(rkt|ss) ]]; then reply="${REPLY%.*}"
-  elif [[ "$REPLY" = *.(scrbl|scm) ]]; then return 0
-  else return 1; fi
-}
-
-_racket_call() {
-  local tag="$1"; shift; local prog="$*"
-  local -a flags; local f
-  flags=()
-  if [[ "$service" = "racket" ]]; then
-    for f in "-"{X,S,A,C,U} "--"{collects,search,addon,links,no-user-path}; do
-      (( $+opt_args[$f] )) && flags+=("$f" "${opt_args[$f]}")
-    done
-  fi
-  _call_program "$tag" racket "${(@)flags}" -I racket/base -q -e '$prog'
-}
-
-_racket_read_libfile_or_collect() {
-  local -a dirs
-  dirs=(
-    "${(f)$(_racket_call directories '(require (submod shell-completion/list-collects main))')}"
-  )
-  local -a ignored
-  ignored=('*.dep' '*.zo' 'compiled' '*/compiled')
-  case "$1" in
-  ( "dir" ) _wanted collections expl collection _files -W dirs -F ignored -/ \
-            && return 0 ;;
-  ( "file" ) _wanted libraries expl library-file _files \
-               -W dirs -F ignored -g '*(+_racket_file_expander)' \
-             && return 0 ;;
-  esac
-  return 1
-}
-_racket_read_libfile() { _racket_read_libfile_or_collect file; }
-_racket_read_collect() { _racket_read_libfile_or_collect dir; }
-_racket_read_path()    { _files; }
-
-_racket_do_state() {
-  if [[ -n $state ]] && (( $+functions[_racket_read_$state] )); then
-    _racket_read_$state
-  else
-    return 1
-  fi
-}
-
-RACKET_CHECKSUMS=()
-_racket_self_test() {
-  if (( $# )) { RACKET_CHECKSUMS+="$*"; } else
-    echo "Testing..."
-    local t command expected filter checksum
-    for t in $RACKET_CHECKSUMS; do
-      cmd=${t%%:*}
-      expected=${t#*:}
-      if [[ $expected = *:* ]]; then
-        filter=${expected#*:}
-        expected=${expected%%:*}
-      else
-        filter=cat
-      fi
-      # leave only alphanumerics, so it's insensitive to space & punctuations
-      checksum=$(${(Q)"${(z)cmd}"} --help |& ${(Q)"${(z)filter}"} \
-                   |& tr -cd '[:alnum:]' | cksum)
-      checksum=${${(z)checksum}[1]}
-      printf '  %s: ' "$cmd"
-      if [[ "$checksum" = "$expected" ]]; then printf 'ok\n'
-      else printf '*** error, expected: %s, got %s\n' "$expected" "$checksum"
-      fi
-    done
-    echo "Done."
-  fi
-}
-
-###############################################################################
-
-_racket_self_test 'racket:3785877773:grep -v "Welcome to Racket"'
-
-RACKET_COMMON=( -C -s -w -S : '(- : *)'{-h,--help}'[Display help]' )
-RACKET_ARGS=( "$RACKET_COMMON[@]" )
-
-# File and expression options:
-RACKET_ARGS+=(
-  '*'{-e,--eval}'[Evaluate expression]:expression: '
-  '*'{-f,--load}'+[Load a file]:file:_files'
-  '*'{-t,--require}'+[Require a file]:file:_files'
-  '*'{-l,--lib}'+[Require a library file]:library-file:->libfile'
-  '*'-p'+[Require a planet package]:planet-package: '
-  '(- *)'{-r,--script}'+[Load a script (same as -f F -n F --)]:file:_files'
-  '(- *)'{-u,--require-script}'+[Require a script (same as -tN- F -N F --)]:file:_files'
-  # No need to do `-k' -- it's for internal use by launchers
-  '(-m --main)'{-m,--main}'[Call `main'"'"' with command-line arguments]'
-)
-
-# Interaction options:
-RACKET_ARGS+=(
-  '(-i --repl)'{-i,--repl}'[Run interactive read-eval-print loop]'
-  '(-n --no-lib)'{-n,--no-lib}'[Skip requiring init-lib for -i/-e/-f/-r]'
-  '(-v --version)'{-v,--version}'[Show version]'
-  '(-V --no-yield)'{-V,--no-yield}'[Skip yield handler on exit]'
-)
-
-# Configuration options:
-RACKET_ARGS+=(
-  '(-c --no-compiled)'{-c,--no-compiled}'[Disable loading of compiled files]'
-  '(-q --no-init-file)'{-q,--no-init-file}'[Skip loading ~/.racketrc for -i]'
-  '(-I)'-I'+[Set init-lib]:library-file:->libfile'
-  '(-X --collects)'{-X,--collects}'+[Main collects dir ("" disables all)]:directory:_files -/'
-  '*'{-S,--search}'+[More collects dir (after main)]:directory:_files -/'
-  '(-A --addon)'{-A,--addon}'+[Addon directory]:directory:_files -/'
-  '(-R --compiled)'{-A,--addon}'+[Set compiled-file search roots to directory]:directory:_files -/'
-  '(-C --links)'{-C,--links}'+[User-specific collection links file]:file:_files'
-  '(-U --no-user-path)'{-U,--no-user-path}'[Ignore user-specific collects, etc.]'
-  '(-N --name)'{-N,--name}'+[Sets (find-system-path '"'"'run-file)]:file:_files'
-  '(-j --no-jit)'{-j,--no-jit}'[Disable the just-in-time compiler]'
-  '(-d --no-delay)'{-d,--no-delay}'[Disable on-demand loading of syntax and code]'
-  '(-b --binary)'{-b,--binary}'[Read stdin and write stdout/stderr in binary mode]'
-  '(-W --warn)'{-W,--warn}'+[Set stderr logging level]:log-level:(none fatal error warning info debug)'
-  '(-L --syslog)'{-L,--syslog}'+[Set syslog logging level]:log-level:(none fatal error warning info debug)'
-)
-
-# Main arguments:
-RACKET_ARGS+=(
-  '(-)1:racket-file:_files'
-  '*::script-argument: _normal'
-)
-
-_racket_main() {
-  _arguments "${RACKET_ARGS[@]}" && return 0
-  _racket_do_state
-}
-
-###############################################################################
-
-_racket_self_test 'raco:3382393175'
-_raco() {
-  if (( CURRENT > 2 )); then
-    local subcmd="${words[2]}"
-    curcontext="${curcontext%:*:*}:raco-$subcmd"
-    (( CURRENT-- ))
-    shift words
-    if [[ $subcmd = -(h|-help) ]]; then _message 'no more arguments'
-    elif (( $+functions[_raco_cmd_$subcmd] )); then _raco_cmd_$subcmd
-    else _normal
-    fi
-  else
-    local hline
-    local -a cmdlist
-    cmdlist=(
-      {-h,--help}:'Display help'
-      "${(f)$(_racket_call raco-command '
-               (require raco/all-tools)
-               (hash-for-each (all-tools)
-                              (lambda (k v) (printf "~a:~a\n" k (caddr v))))')}"
-    )
-    _describe -t raco-commands 'raco command' cmdlist
-  fi
-}
-
-_racket_self_test 'raco docs:2277531825'
-_raco_cmd_docs() {
-  _arguments "$RACKET_COMMON[@]" \
-    '*:search-term: ' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco setup:2092236815:tail -n +2' # full path for this one
-_raco_cmd_setup() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-c --clean)'{-c,--clean}'[Delete existing compiled files; implies -nxi]' \
-    '(-j --workers)'{-j,--workers}'+[Use N parallel jobs]:cores: ' \
-    '(-n --no-zo)'{-n,--no-zo}'[Do not produce .zo files]' \
-    '(-x --no-launcher)'{-x,--no-launcher}'[Do not produce launcher programs]' \
-    '(-i --no-install)'{-i,--no-install}'[Do not call collection-specific pre-installers]' \
-    '(-I --no-post-install)'{-I,--no-post-install}'[Do not call collection-specific post-installers]' \
-    '(-d --no-info-domain)'{-d,--no-info-domain}'[Do not produce info-domain caches]' \
-    '(-D --no-docs)'{-D,--no-docs}'[Do not compile .scrbl files and do not build documentation]' \
-    '(-U --no-user)'{-U,--no-user}'[Do not setup user-specific collections (implies --no-planet)]' \
-    '(--no-planet)'--no-planet'[Do not setup PLaneT packages]' \
-    '(--avoid-main)'--avoid-main'[Do not make main-installation files]' \
-    '(-v --verbose)'{-v,--verbose}'[See names of compiled files and info printfs]' \
-    '(-m --make-verbose)'{-m,--make-verbose}'[See make and compiler usual messages]' \
-    '(-r --compile-verbose)'{-r,--compile-verbose}'[See make and compiler verbose messages]' \
-    '(--trust-zos)'--trust-zos'[Trust existing .zos (use only with prepackaged .zos)]' \
-    '(-p --pause)'{-p,--pause}'[Pause at the end if there are any errors]' \
-    '(--force)'--force'[Treat version mismatches for archives as mere warnings]' \
-    '(-a --all-users)'{-a,--all-users}'[Install archives to main (not user-specific) installation]' \
-    '(--mode)'--mode'+[Select a compilation mode]:log-level:(errortrace)' \
-    '(--doc-pdf)'--doc-pdf'+[Write doc PDF to directory]:directory:_files -/' \
-    '(-l)'-l'+[Setup specific collections only]:*:collection:->collect' \
-    '(-A)'-A'+[Unpack and install .plt archives]:plt-archive:_files -g \*.plt' \
-    '*'-P'+[Setup specified PLaneT packages only]:owner: :package-name: :major-version: :minor-version: ' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco scribble:611326287'
-_raco_cmd_scribble() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(--html --htmls --latex --pdf --latex-section --text --markdown)'--html'[Generate HTML-format output file (default)]' \
-    '(--html --htmls --latex --pdf --latex-section --text --markdown)'--htmls'[Generate HTML-format output directory]' \
-    '(--html --htmls --latex --pdf --latex-section --text --markdown)'--pdf'[Generate PDF-format output (with PDFLaTeX)]' \
-    '(--html --htmls --latex --pdf --latex-section --text --markdown)'--latex'[Generate LaTeX-format output]' \
-    '(--html --htmls --latex --pdf --latex-section --text --markdown)'--latex-section'+[Generate LaTeX-format output for section depth N]:section-depth: ' \
-    '(--html --htmls --latex --pdf --latex-section --text --markdown)'--text'[Generate text-format output]' \
-    '(--html --htmls --latex --pdf --latex-section --text --markdown)'--markdown'[Generate markdown-format output]' \
-    '(--dest)'--dest'+[Write output in directory]:directory:_files -/' \
-    '(--dest-name)'--dest-name'+[Write output as name]:name: ' \
-    '(--dest-base)'--dest-base'+[Start support-file names with prefix]:prefix: ' \
-    '*'++style'+[Add given .css/.tex file after others]:style-file:_files -g \*.\(css\|tex\)' \
-    '*'--style'+[Use given base .css/.tex file]:style-file:_files -g \*.\(css\|tex\)' \
-    '*'--prefix'+[Use given .html/.tex prefix (for doctype/documentclass)]:prefix-file:_files -g \*.\(html\|htm\|tex\)' \
-    '*'++extra'+[Add given file]:file:_files' \
-    '*'--redirect-main'+[Redirect main doc links to url]:url: ' \
-    '*'--redirect'+[Redirect external links to tag search via url]:url: ' \
-    '(+m ++main-xref-in)'{+m,++main-xref-in}'[load format-speficic cross-ref info for all installed library collections]' \
-    '*'++xref-in'+[Load format-specific cross-ref info by]:module-path:->libfile:proc-id: ' \
-    '*'--info-out'+[Write format-specific cross-ref info to file]:file:_file' \
-    '*'++info-in'+[Load format-specific cross-ref info from file]:file:_file' \
-    '(--quiet)'--quiet'[Suppress output-file and undefined-tag reporting]' \
-    '*:scribble-file:_files -g \*.scrbl' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco exe:614832725'
-_raco_cmd_exe() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-o)'-o'+[Write executable as file]:output-executable:_files' \
-    '(--gui)'--gui'+[Generate GUI executable]' \
-    '(-l --launcher)'{-l,--launcher}'[Generate a launcher]' \
-    '(--collects-path)'--collects-path'+[Set path as main collects for executable]:collection:->collect' \
-    '(--collects-dest)'--collects-dest'+[Write collection code to directory]:directory:_files -/' \
-    '(--ico)'--ico'+[Set Windows icon for executable]:ico-file:_files -g \*.ico' \
-    '(--icns)'--icns'+[Set Mac OS X icon for executable]:icns-file:_files -g \*.icns' \
-    '(--orig-exe)'--orig-exe'[Use original executable instead of stub]' \
-    '(--3m --cgc)'--3m'[Generate using 3m variant]' \
-    '(--3m --cgc)'--cgc'[Generate using CGC variant]' \
-    '*'++aux'+[Extra executable info (based on aux-file suffix)]:aux-file:_files' \
-    '*'++lib'+[Embed lib in executable]:lib-file:_files' \
-    '*'++exf'+[Add flag to embed in executable]:flag: ' \
-    '*'--exf'+[Remove flag to embed in executable]:flag: ' \
-    '*'--exf-clear'[Clear flags to embed in executable]' \
-    '*'--exf-show'[Show flags to embed in executable]' \
-    '(-v)'-v'[Verbose mode]' \
-    '(--vv)'--vv'[Very verbose mode]' \
-    '*:source-file:_files -g \*.\(rkt\|ss\|scm\)' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco make:3358542168'
-_raco_cmd_make() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-j)'-j'+[Use N parallel jobs]:cores: ' \
-    '(--disable-inline)'--disable-inline'[Disable procedure inlining during compilation]' \
-    '(--disable-constant)'--disable-constant'[Disable enforcement of module constants]' \
-    '(--no-deps)'--no-deps'[Compile immediate files without updating dependencies]' \
-    '(-p --prefix)'{-p,--prefix}'+[Add elaboration-time prefix file for --no-deps]:prefix-file:_files' \
-    '(--no-prim)'--no-prim'[Do not assume `scheme'"'"' bindings at top level for --no-deps]' \
-    '(-v)'-v'[Verbose mode]' \
-    '(--vv)'--vv'[Very verbose mode]' \
-    '*:source-files:_files' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco ctool:1038338951'
-_raco_cmd_ctool() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(--cc --ld -x --xform --c-mods)'--xx'[Compile arbitrary file(s) for an extension: .c -> .o]' \
-    '(--cc --ld -x --xform --c-mods)'--ld'+[Link arbitrary file(s) to create extension: .o -> .so]:extension-file:_files' \
-    '(--cc --ld -x --xform --c-mods)'{-x,--xform}'[Convert for 3m compilation: .c -> .c]' \
-    '(--cc --ld -x --xform --c-mods)'--c-mods'+[Write C-embeddable module bytecode to file]:file:_files' \
-    '(--3m --cgc)'--3m'[Compile/link for 3m (default)]' \
-    '(--3m --cgc)'--cgc'[Compile/link for CGC]' \
-    '(-n --name)'{-n,--name}'+[Use name as extra part of public low-level names]:name: ' \
-    '(-d --destination)'{-d,--destination}'+[Output --cc/--ld/-x file(s) to directory]:destination-directory:_files -/' \
-    '(--tool)'--tool'+[Use pre-defined tool as C compiler/linker]:tool:(gcc cc)' \
-    '(--compiler)'--compiler'+[Use specified C compiler]:compiler-path:_files' \
-    '*'++ccf'+[Add C compiler flag]:flag: ' \
-    '*'--ccf'+[Remove C compiler flag]:flag: ' \
-    '*'--ccf-clear'[Clear C compiler flags]' \
-    '*'--ccf-show'[Show C compiler flags]' \
-    '(--linker)'--linker'+[Use specified C linker]:linker-path:_files' \
-    '*'++ldf'+[Add C linker flag]:flag: ' \
-    '*'--ldf'+[Remove C linker flag]:flag: ' \
-    '*'--ldf-clear'[Clear C linker flags]' \
-    '*'--ldf-show'[Show C linker flags]' \
-    '*'++ldl'+[Add C linker library]:library-file:_files' \
-    '*'--ldl-show'[Show C linker libraries]' \
-    '*'++cppf'+[Add C preprocess (xform) flag]:flag: ' \
-    '*'--cppf'+[Remove C preprocess (xform) flag]:flag: ' \
-    '*'--cppf-clear'[Clear C preprocess (xform) flags]' \
-    '*'--cppf-show'[Show C preprocess (xform) flags]' \
-    '*'++lib'+[Embed lib in --c-mods output]:lib-file:_files' \
-    '(-v)'-v'[Slightly verbose mode, including version banner and output files]' \
-    '(--vv)'--vv'[Very verbose mode]' \
-    '*:file:_files' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco distribute:1034282712'
-_raco_cmd_distribute() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(--collects-path)'--collects-path'+[Set path as main collects for executables]:collection:->collect' \
-    '*'++collects-copy'+[Add collects in dir to directory]:collection:->collect' \
-    '(-v)'-v'[Verbose mode]' \
-    '1:destination-directory:_files -/' \
-    '*:executable:_files' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco link:1334896662'
-_raco_cmd_link() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-l --list)'{-l,--list}'[Show the link table (after changes)]' \
-    '(-n --name -d --root)'{-n,--name}'+[Collection name to add (single dir) or remove]:name: ' \
-    '(-n --name -d --root)'{-d,--root}'[Treat dir as a collection root]' \
-    '(-x --version-regexp)'{-x,--version-regexp}'+[Set the version pregexp]:regexp: ' \
-    '(-r --remove)'{-r,--remove}'[Remove links for the specified directories]' \
-    '(-u --user -i --installation -f --file)'{-u,--user}'[Adjust/list user-specific links]' \
-    '(-u --user -i --installation -f --file)'{-i,--installation}'[Adjust/list installation-wide links]' \
-    '(-u --user -i --installation -f --file)'{-f,--file}'+[Select an alternate link file]:file:_files -g \*.rktd' \
-    '(--repair)'--repair'[Enable repair mode to fix existing links]' \
-    '*:directory:_files -/' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco pack:1977512558'
-_raco_cmd_pack() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(--collect)'--collect'[paths specify collections instead of files/dirs]' \
-    '(--plt-name)'--plt-name'+[Set the printed name describing the archive]:archive-name: ' \
-    '(--replace)'--replace'[Files in archive replace existing files when unpacked]' \
-    '(--at-plt)'--at-plt'[Files/dirs in archive are relative to user'"'"'s add-ons directory]' \
-    '(--all-users --force-all-users)'--all-users'[Files/dirs in archive go to PLT installation if writable]' \
-    '(--all-users --force-all-users)'--force-all-users'[Files/dirs forced to PLT installation]' \
-    '(--include-compiled)'--include-compiled'[Include "compiled" subdirectories in the archive]' \
-    '*'++setup'+[Setup given collect after the archive is unpacked]:collection:->collect' \
-    '(-v)'-v'[Verbose mode]' \
-    '1:destination-archive:_files -g \*.plt' \
-    '*:file-or-directory:->rest' \
-  && return 0
-  echo "$state" > /tmp/zzz
-  if [[ "$state" = "rest" ]]; then
-    if (( $+opt_args[--collect] )); then state="collect"; else state="path"; fi
-  fi
-  _racket_do_state
-}
-
-_racket_self_test 'raco unpack:2639538734'
-_raco_cmd_unpack() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-l --list)'{-l,--list}'[List archive content]' \
-    '(-c --config)'{-c,--config}'[Show archive configuration]' \
-    '(-f --force)'{-f,--force}'[Replace existing files when unpacking]' \
-    '*:plt-archive:_files -g \*.plt' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco expand:1935188678'
-_raco_cmd_expand() {
-  _arguments "$RACKET_COMMON[@]" \
-    '*:source-file:_files' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco decompile:1342114717'
-_raco_cmd_decompile() {
-  _arguments "$RACKET_COMMON[@]" \
-    '*:source-or-bytecode-file:_files' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco demodularize:33137783'
-_raco_cmd_demodularize() {
-  _arguments "$RACKET_COMMON[@]" \
-    '*'{-e,--exclude-modules}'+[Exclude module from flattening]:module-path:->libfile' \
-    '(-o)'-o'+[Write output as dest-filename]:dest-filename:_files' \
-    '*:file:_files' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco test:2458495009'
-_raco_cmd_test() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-s --submodule)'{-s,--submodule}'+[Runs submodule name (defaults to `test'"'"')]:submodule: ' \
-    '(-r --run-if-absent -x --no-run-if-absent)'{-r,--run-if-absent}'[Require module if submodule is absent (on by default)]' \
-    '(-r --run-if-absent -x --no-run-if-absent)'{-x,--no-run-if-absent}'[Require nothing if submodule is absent]' \
-    '(-q --quiet)'{-q,--quiet}'+[Suppress `Running ...'"'"' message]' \
-    '(-c --collection)'{-c,--collection}'+[Interpret arguments as collections]' \
-    '(-p --package)'{-p,--package}'+[Interpret arguments as packages]' \
-    '*:source-file-or-directory:_files' \
-  && return 0
-  _racket_do_state
-}
-
-_racket_self_test 'raco planet:1582997403'
-_raco_cmd_planet() {
-  if (( CURRENT > 2 )); then
-    local subcmd="${words[2]}"
-    curcontext="${curcontext%:*:*}:raco-planet-$subcmd"
-    (( CURRENT-- ))
-    shift words
-    if [[ $subcmd = -(h|-help) ]]; then _message 'no more arguments'
-    elif (( $+functions[_raco_cmd_planet_$subcmd] )); then _raco_cmd_planet_$subcmd
-    else _normal
-    fi
-  else
-    local hline
-    local -a cmdlist
-    local pfx='^  raco planet '
-    cmdlist=(
-      {-h,--help}:'Display help'
-      ${(f)"$(raco planet | grep "$pfx" \
-                          | sed -e "s/$pfx"'\([^ ]*\) *\(.*\)/\1:\2/')"}
-    )
-    _describe -t raco-planet-commands 'raco planet command' cmdlist
-  fi
-}
-
-_racket_self_test 'raco planet clearlinks:145158300'
-_raco_cmd_planet_clearlinks() {
-  _arguments "$RACKET_COMMON[@]" \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet create:3318289542'
-_raco_cmd_planet_create() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-f --force)'{-f,--force}'[force a package to be created even if its info.rkt file contains errors.]' \
-    '1:destination-archive:_files -g \*.plt' \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet fetch:4273560882'
-_raco_cmd_planet_fetch() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-):owner: ' \
-    ':package-name: ' \
-    ':major-version: ' \
-    ':minor-version: ' \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet fileinject:3090983232'
-_raco_cmd_planet_fileinject() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-):owner: ' \
-    ':plt-archive:_files -g \*.plt' \
-    ':major-version: ' \
-    ':minor-version: ' \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet install:1001510693'
-_raco_cmd_planet_install() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-):owner: ' \
-    ':package-name: ' \
-    ':major-version: ' \
-    ':minor-version: ' \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet link:2118742145'
-_raco_cmd_planet_link() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-):owner: ' \
-    ':package-name: ' \
-    ':major-version: ' \
-    ':minor-version: ' \
-    ':directory:_files -/' \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet open:4239735370'
-_raco_cmd_planet_open() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-):plt-archive:_files -g \*.plt' \
-    ':target-directory:_files -/' \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet print:2975791845'
-_raco_cmd_planet_print() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-):plt-archive:_files -g \*.plt' \
-    ':path-in-plt-aarchive: ' \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet remove:3543578058'
-_raco_cmd_planet_remove() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-e --erase)'{-e,--erase}'[also remove the package'"'"'s distribution file from the uninstalled-package cache]' \
-    '(-):owner: ' \
-    ':package-name: ' \
-    ':major-version: ' \
-    ':minor-version: ' \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet show:3911537255'
-_raco_cmd_planet_show() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-p --packages -l --linkage -a --all)'{-p,--packages}'[show packages only (default)]' \
-    '(-p --packages -l --linkage -a --all)'{-l,--linkage}'[show linkage table only]' \
-    '(-p --packages -l --linkage -a --all)'{-a,--all}'[show packages and linkage]' \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet structure:561630587'
-_raco_cmd_planet_structure() {
-  _arguments "$RACKET_COMMON[@]" \
-    ':plt-archive:_files -g \*.plt' \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet unlink:1307144701'
-_raco_cmd_planet_unlink() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-q --quiet)'{-q,--quiet}'[don'"'"'t signal an error on nonexistent links]' \
-    '(-):owner: ' \
-    ':package-name: ' \
-    ':major-version: ' \
-    ':minor-version: ' \
-  && return 0
-  _racket_do_state
-}
-_racket_self_test 'raco planet url:3825697949'
-_raco_cmd_planet_url() {
-  _arguments "$RACKET_COMMON[@]" \
-    '(-):owner: ' \
-    ':package-name: ' \
-    ':major-version: ' \
-    ':minor-version: ' \
-  && return 0
-  _racket_do_state
-}
-
-###############################################################################
-
-_racket() {
-  if [[ $1 = --self-test ]]; then _racket_self_test; return; fi
-  local curcontext="$curcontext" context state line
-  typeset -A opt_args
-  case "$service" in
-  ( "racket" ) _racket_main "$@" ;;
-  ( "raco"   ) _raco "$@" ;;
-  ( * ) return 1 ;;
-  esac
-}
-
-if [[ -n $service ]]; then _racket "$@"
-else # loaded directly => define the completion (load if needed)
-  if (( ! $+functions[compdef] )); then autoload -U compinit; compinit; fi
-  compdef _racket racket raco
-fi
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/LICENSE.txt b/pkgs/slideshow-pkgs/slideshow-doc/LICENSE.txt
deleted file mode 100644
index 4867b1eac9..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-slideshow-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/info.rkt b/pkgs/slideshow-pkgs/slideshow-doc/info.rkt
deleted file mode 100644
index 438a040db2..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/info.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("scheme-lib"
-                     "draw-doc"
-                     "gui-doc"
-                     "pict-doc"
-                     "scribble-doc"
-                     "web-server-doc"
-                     "base"
-                     "gui-lib"
-                     "pict-lib"
-                     "scribble-lib"
-                     "slideshow-lib"
-                     "racket-doc"))
-(define update-implies '("slideshow-lib"))
-
-(define pkg-desc "documentation part of \"slideshow\"")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/art.png b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/art.png
deleted file mode 100644
index 2c56b69431..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/art.png and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/README.txt b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/README.txt
deleted file mode 100644
index 21bbe89fef..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Except for this one, the files in this directory are generated by
-building the "quick" document with the environment variable MREVAL
-set. Otherwise, the doc build uses the information here.
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/exprs.dat b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/exprs.dat
deleted file mode 100644
index 79b5962469..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/exprs.dat
+++ /dev/null
@@ -1,30 +0,0 @@
-((2) 0 () 0 () () (c require c (c planet c schematics/random:1:0/random)))
-((2) 0 () 0 () () (void))
-((2) 0 () 0 () () (c random-gaussian))
-((2) 0 () 0 () () 0.7386912134436788)
-((2) 0 () 0 () () (c require c slideshow/code))
-((2) 0 () 0 () () (void))
-((2) 0 () 0 () () (c code c (c circle c 10)))
-((2) 1 (((lib "scribble/core.rkt") . deserialize-info:image-element-v0)) 0 () () (0 #f (c "[image]") (u . "images/img0") (c ".pdf" c ".png") 1.0))
-((2) 0 () 0 () () (c define-syntax c pict+code c (c syntax-rules c () c (c (c pict+code c expr) c (c hc-append c 10 c expr c (c code c expr))))))
-((2) 0 () 0 () () (void))
-((2) 0 () 0 () () (c pict+code c (c circle c 10)))
-((2) 1 (((lib "scribble/core.rkt") . deserialize-info:image-element-v0)) 0 () () (0 #f (c "[image]") (u . "images/img1") (c ".pdf" c ".png") 1.0))
-((2) 0 () 0 () () (c require c racket/class c racket/gui/base))
-((2) 0 () 0 () () (void))
-((2) 0 () 0 () () (c define c f c (c new c frame% c (c label c "My Art") c (c width c 300) c (c height c 300) c (c alignment c (c quote c (c center c center))))))
-((2) 0 () 0 () () (void))
-((2) 0 () 0 () () (c send c f c show c #t))
-((2) 0 () 0 () () (void))
-((2) 0 () 0 () () (c send c f c show c #f))
-((2) 0 () 0 () () (void))
-((2) 0 () 0 () () (c require c pict/flash))
-((2) 0 () 0 () () (void))
-((2) 0 () 0 () () (c define c (c add-drawing c p) c (c let c (c (c drawer c (c make-pict-drawer c p))) c (c new c canvas% c (c parent c f) c (c style c (c quote c (c border))) c (c paint-callback c (c lambda c (c self c dc) c (c drawer c dc c 0 c 0)))))))
-((2) 0 () 0 () () (void))
-((2) 0 () 0 () () (c add-drawing c (c pict+code c (c circle c 10))))
-((2) 1 (((lib "scribble/core.rkt") . deserialize-info:element-v0)) 0 () () (0 #f (c (u . "#(struct:object:canvas% ...)"))))
-((2) 0 () 0 () () (c add-drawing c (c colorize c (c filled-flash c 50 c 30) c "yellow")))
-((2) 1 (((lib "scribble/core.rkt") . deserialize-info:element-v0)) 0 () () (0 #f (c (u . "#(struct:object:canvas% ...)"))))
-((2) 0 () 0 () () (c scale c (c bitmap c (c build-path c (c collection-path c "scribblings/quick") c "art.png")) c 0.5))
-((2) 1 (((lib "scribble/core.rkt") . deserialize-info:image-element-v0)) 0 () () (0 #f (c "[image]") (u . "images/img2") (c ".pdf" c ".png") 1.0))
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img0.pdf b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img0.pdf
deleted file mode 100644
index afb602a349..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img0.pdf and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img0.png b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img0.png
deleted file mode 100644
index f479d36f93..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img0.png and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img1.pdf b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img1.pdf
deleted file mode 100644
index 3d41a8b569..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img1.pdf and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img1.png b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img1.png
deleted file mode 100644
index 5f2c07464f..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img1.png and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img2.pdf b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img2.pdf
deleted file mode 100644
index 2dd53420f7..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img2.pdf and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img2.png b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img2.png
deleted file mode 100644
index c048bd63d9..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/images/img2.png and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/info.rkt b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/info.rkt
deleted file mode 100644
index 2dac5ec571..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("quick.scrbl" () (tutorial 9))))
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/keep.rkt b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/keep.rkt
deleted file mode 100644
index cd0be1fe0d..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/keep.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scheme/base
-
-(require scribble/struct
-         scheme/class)
-
-(provide keep-file)
-
-(define (keep-file file)
-  (make-render-element
-   #f
-   null
-   (lambda (r s i) (send r install-file file))))
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/mreval.rkt b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/mreval.rkt
deleted file mode 100644
index 39a05a3a98..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/mreval.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-(require scribble/eval
-         scriblib/gui-eval)
-
-(provide (rename-out [gui-interaction mr-interaction]
-                     [gui-interaction-eval mr-interaction-eval]
-                     [gui-racketmod+eval mr-racketmod+eval]
-                     [gui-racketblock+eval mr-racketblock+eval]
-                     [gui-def+int mr-def+int]
-                     [gui-defs+int mr-defs+int]
-                     [gui-interaction-eval-show mr-interaction-eval-show]))
-
-(define ss-eval (make-base-eval))
-(void (interaction-eval #:eval ss-eval (require pict)))
-
-(define-syntax-rule (ss-interaction e ...)
-  (interaction #:eval ss-eval e ...))
-(define-syntax-rule (ss-interaction-eval e ...)
-  (interaction-eval #:eval ss-eval e ...))
-(define-syntax-rule (ss-racketmod+eval e ...)
-  (racketmod+eval #:eval ss-eval e ...))
-(define-syntax-rule (ss-racketblock+eval e ...)
-  (racketblock+eval #:eval ss-eval e ...))
-(define-syntax-rule (ss-def+int e ...)
-  (def+int #:eval ss-eval e ...))
-
-(provide ss-interaction
-         ss-interaction-eval
-         ss-racketmod+eval
-         ss-racketblock+eval
-         ss-def+int)
-
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/quick.scrbl b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/quick.scrbl
deleted file mode 100644
index 8711ed7226..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/quick/quick.scrbl
+++ /dev/null
@@ -1,609 +0,0 @@
-#lang scribble/doc
-
-@title{Quick: An Introduction to Racket with Pictures}
-
-@author["Matthew Flatt"]
-
-@; ----------------------------------------------------------------------
-
-@(require scribble/manual
-          "mreval.rkt"
-          "keep.rkt"
-          scribble/urls
-          scribble/struct
-          racket/class
-
-          (for-label racket/base
-                     racket/gui/base
-                     racket/class
-                     slideshow pict
-                     slideshow/code
-                     pict/flash)
-
-          (for-syntax racket/base))
-
-@; ----------------------------------------------------------------------
-
-This tutorial provides a brief introduction to the Racket
-programming language by using one of its picture-drawing
-libraries. Even if you don't intend to use Racket for your artistic
-endeavours, the picture library supports interesting and enlightening
-examples. After all, a picture is worth five hundred ``hello world''s.
-
-Along the same lines, we assume that you will run the examples using
-@link[url:download-drracket]{DrRacket}. Using DrRacket is the fastest
-way to get a sense of what the language and system feels like, even if
-you eventually use Racket with Emacs, vi, or some other editor.
-
-@; ----------------------------------------------------------------------
-@section{Ready...}
-
-@link[url:download-drracket]{Download Racket}, install, and then
-start DrRacket.
-
-@; ----------------------------------------------------------------------
-@section{Set...}
-
-@margin-note{See @seclink[#:indirect? #t
-                          #:doc '(lib "scribblings/drracket/drracket.scrbl") 
-                                "interface-essentials"]{the DrRacket documentation}
-                                for a brief overview of
-                                the DrRacket IDE.}
-To draw pictures, we must first load some picture functions, which are
-part of a library for creating slide presentations.  Copy the
-following into the @defterm{definitions area}, which is the top text
-area that you see in DrRacket:
-
-@racketmod[slideshow]
-
-Then click the @onscreen{Run} button. You'll see the text caret move
-to the bottom text area, which is the @defterm{interactions area}.
-
-If you've used DrRacket before, you might need to reset DrRacket to
-use the language declared in the source via the @menuitem["Language"
-"Choose Language..."] menu item before clicking @onscreen{Run}.
-
-@; ----------------------------------------------------------------------
-@section{Go!}
-
-When you type an expression after the @onscreen{>} in the interactions
-window and hit Enter, DrRacket evaluates the expression and prints its
-result. An expression can be just a value, such as the number
-@racket[5] or the string @racket["art gallery"]:
-
-@ss-interaction[5 "art gallery"]
-
-An expression can also be a function call. To call a function, put
-an open parenthesis before the function name, then expressions for the
-function arguments, and then a close parenthesis, like this:
-
-@ss-interaction[(circle 10)]
-
-A result from the @racket[circle] function is a picture value, which
-prints as an expression result in much the same way that numbers or
-strings print.  The argument to @racket[circle] determines the
-circle's size in pixels.  As you might guess, there's a
-@racket[rectangle] function that takes two arguments instead of one:
-
-@ss-interaction[(rectangle 10 20)]
-
-Try giving @racket[circle] the wrong number of arguments, just to see
-what happens:
-
-@ss-interaction[(circle 10 20)]
-
-Note that DrRacket highlights in pink the expression that triggered
-the error (but pink highlighting is not shown in this documentation).
-
-In addition to basic picture constructors like @racket[circle] and
-@racket[rectangle], there's a @racket[hc-append] function that
-combines pictures. When you start composing function calls in Racket,
-it looks like this:
-
-@ss-interaction[(hc-append (circle 10) (rectangle 10 20))]
-
-The hyphen in the name @racket[hc-append] is just a part of the
-identifier; it's not @racketidfont{hc} minus
-@racketidfont{append}. The function name starts with @racket[h]
-because it combines pictures horizontally, and the next letter is
-@racket[c] because the pictures are centered vertically.
-
-If you wonder what other functions exist---perhaps a way to stack
-pictures vertically and left-aligned?---move the text caret to the
-name @racket[hc-append] and press the F1 key in DrRacket. A browser
-window will open, and it will give you a link to the documentation for
-@racket[hc-append]. Click the link, and you'll see lots of other
-functions.
-
-If you're reading this in HTML form, you can also just click on
-@racket[hc-append] or any other imported identifier that is used in
-this tutorial.
-
-@; ----------------------------------------------------------------------
-@section{Definitions}
-
-To use a particular circle and rectangle picture many times, it's
-simpler to give them names. Move back to the definitions area (the top
-area) and add two definitions, so that the complete content of the
-definitions area looks like this:
-
-@ss-racketmod+eval[
-slideshow
-(define c (circle 10))
-(define r (rectangle 10 20))
-]
-
-Then click @onscreen{Run} again. Now, you can just type @racket[c] or
-@racket[r]:
-
-@ss-interaction[r (hc-append c r) (hc-append 20 c r c)]
-
-As you can see, the @racket[hc-append] function accepts an optional
-number argument before the picture arguments, and it accepts any
-number of picture arguments. When a number is provided, it specifies
-the amount of space to add between pictures.
-
-We could have evaluated the @racket[define] forms for @racket[c] and
-@racket[r] in the interactions area instead of the definitions
-area. In practice, though, the definitions area is where your program
-lives---it's the file that you save---while the interaction area is
-for transient explorations and debugging tasks.
-
-Let's add a function definition to the program. A function definition
-uses @racket[define], just like our shape definitions, but with an
-open parenthesis before the function name, and names for the function
-arguments before the matching close parenthesis:
-
-@ss-racketblock+eval[
-(define (square n)
-  (code:comment @#,t{A semi-colon starts a line comment.})
-  (code:comment @#,t{The expression below is the function body.})
-  (filled-rectangle n n))
-]
-
-The syntax of the definition mirrors the syntax of a function
-call:
-
-@ss-interaction[(square 10)]
-
-In the same way that definitions can be evaluated in the interactions
-area, expressions can be included in the definitions area. When a
-program is run, expression results from the definition area are shown
-in the interaction area. From now on, we'll write our example
-definitions and expressions together, and you can put them in
-whichever area you prefer. The examples will build on each other,
-however, so it's best to put at least the definitions in the
-definition area.
-
-@; ----------------------------------------------------------------------
-@section{Local Binding}
-
-The @racket[define] form can be used in some places to create local
-bindings. For example, it can be used inside a function body:
-
-@ss-def+int[
-(define (four p)
-  (define two-p (hc-append p p))
-  (vc-append two-p two-p))
-(four (circle 10))
-]
-
-More typically, Racketeers use the @racket[let] or @racket[let*] form
-for local binding. An advantage of @racket[let] is that it can be used
-in any expression position. Also, it binds many identifiers at once,
-instead of requiring a separate @racket[define] for each identifier:
-
-@ss-def+int[
-(define (checker p1 p2)
-  (let ([p12 (hc-append p1 p2)]
-        [p21 (hc-append p2 p1)])
-    (vc-append p12 p21)))
-(checker (colorize (square 10) "red")
-         (colorize (square 10) "black"))
-]
-
-A @racket[let] form binds many identifiers at the same time, so the
-bindings cannot refer to each other. The @racket[let*] form, in
-contrast, allows later bindings to use earlier bindings:
-
-@ss-def+int[
-(define (checkerboard p)
-  (let* ([rp (colorize p "red")]
-         [bp (colorize p "black")]
-         [c (checker rp bp)]
-         [c4 (four c)])
-    (four c4)))
-(checkerboard (square 10))
-]
-
-@; ----------------------------------------------------------------------
-@section{Functions are Values}
-
-Instead of calling @racket[circle] as a function, try evaluating just
-@racket[circle] as an expression:
-
-@ss-interaction[circle]
-
-That is, the identifier @racket[circle] is bound to a function
-(a.k.a. ``procedure''), just like @racket[c] is bound to a
-circle. Unlike a circle picture, there's not a simple way of
-completely printing the function, so DrRacket just prints
-@procedure{circle}.
-
-This example shows that functions are values, just like numbers and
-pictures (even if they don't print as nicely). Since functions are
-values, you can define functions that expect other functions as
-arguments:
-
-@ss-def+int[
-(define (series mk)
-  (hc-append 4 (mk 5) (mk 10) (mk 20)))
-(series circle)
-(series square)
-]
-
-When calling a function that accepts a function argument, the
-argument function often isn't needed anywhere else. Having to write
-down the function via @racket[define] would be a hassle, because you
-have to make up a name and find a place to put the function
-definition. The alternative is to use @racket[lambda], which creates an
-anonymous function:
-
-@ss-interaction[(series (lambda (size) (checkerboard (square size))))]
-
-The parenthesized names after a @racket[lambda] are the arguments to
-the function, and the expression after the argument names is the
-function body. Using the word ``lambda'' instead of ``function'' or
-``procedure'' is part of Racket's history and culture.
-
-A @racket[define] form for a function is really a shorthand for a
-simple @racket[define] using @racket[lambda] as the value. For
-example, the @racket[series] definition could be written as
-
-@racketblock[
-(define series
-  (lambda (mk)
-    (hc-append 4 (mk 5) (mk 10) (mk 20))))
-]
-
-Most Racketeers prefer to use the shorthand function form with
-@racket[define] instead of expanding to @racket[lambda].
-
-@; ----------------------------------------------------------------------
-@section{Lexical Scope}
-
-Racket is a lexically scoped language, which means that whenever an
-identifier is used as an expression, something in the textual
-environment of the expression determines the identifier's
-binding. This rule applies to identifiers in a @racket[lambda] body as
-well as anywhere else.
-
-In the following @racket[rgb-series] function, the uses
-of @racket[mk] in each @racket[lambda] form refer to the argument of
-@racket[rgb-series], since that's the binding that is textually in
-scope:
-
-@ss-def+int[
-(define (rgb-series mk)
-  (vc-append
-   (series (lambda (sz) (colorize (mk sz) "red")))
-   (series (lambda (sz) (colorize (mk sz) "green")))
-   (series (lambda (sz) (colorize (mk sz) "blue")))))
-(rgb-series circle)
-(rgb-series square)
-]
-
-Here's another example, where @racket[rgb-maker] takes a function and
-returns a new one that remembers and uses the original function.
-
-@ss-def+int[
-(define (rgb-maker mk)
-  (lambda (sz)
-    (vc-append (colorize (mk sz) "red")
-               (colorize (mk sz) "green")
-               (colorize (mk sz) "blue"))))
-(series (rgb-maker circle))
-(series (rgb-maker square))
-]
-
-Note how composing functions via @racket[rgb-maker] creates a
-different alignment of objects within the picture compared to using
-@racket[rgb-series].
-
-@; ----------------------------------------------------------------------
-@section{Lists}
-
-Racket inherits much of its style from the language Lisp, whose name
-originally stood for ``LISt Processor,'' and lists remain an important
-part of Racket.
-
-The @racket[list] function takes any number of arguments and returns
-a list containing the given values:
-
-@ss-interaction[(list "red" "green" "blue")
-                (list (circle 10) (square 10))]
-
-As you can see, a list prints as a single quote and then pair of parentheses wrapped around
-the printed form of the list elements. There's room for confusion
-here, because parentheses are used for both expressions, such as
-@racket[(circle 10)], and printed results, such as
-@racketresult['("red" "green" "blue")]. The quote is the key difference,
-as @seclink[#:doc '(lib "scribblings/guide/guide.scrbl") "quoting-lists"]{discussed
-elsewhere}. To help emphasize the difference, in the documentation and in DrRacket, 
-result parentheses are printed in blue, unlike expression parentheses.
-
-If you have a list, then you'll eventually want to do something with
-each of the elements. The @racket[map] function takes a list and a
-function to apply to each element of the list; it returns a new list
-to combine the function's results:
-
-@ss-def+int[
-(define (rainbow p)
-  (map (lambda (color)
-         (colorize p color))
-       (list "red" "orange" "yellow" "green" "blue" "purple")))
-(rainbow (square 5))
-]
-
-Another function that works with lists is @racket[apply]. Like
-@racket[map], it takes a function and a list, but a function given
-to @racket[apply] should take all of the arguments at once, instead of
-each one individually. The @racket[apply] function is especially
-useful with functions that take any number of arguments, such as
-@racket[vc-append]:
-
-@ss-interaction[
-(apply vc-append (rainbow (square 5)))
-]
-
-Note that @racket[(vc-append (rainbow (square 5)))] would not work,
-because @racket[vc-append] does not want a list as an argument; it
-wants a picture as an argument, and it is willing to accept any number
-of them. The @racket[apply] function bridges the gap between a
-function that wants many arguments and a list of those arguments as a
-single value.
-
-@; ----------------------------------------------------------------------
-@section{Modules}
-
-Since your program in the definitions window starts with
-
-@racketmod[slideshow]
-
-all of the code that you put in the definitions window is inside a
-module. Furthermore, the module initially imports everything from the
-module designated by @racketmodname[slideshow], which exports
-picture-making functions as well as more commonly used functions
-such as @racket[list] and @racket[map].
-
-To import additional libraries, use the @racket[require] form. For
-example, the library @racketmodname[pict/flash] provides a
-@racket[filled-flash] function:
-
-@ss-def+int[
-(require pict/flash)
-(filled-flash 40 30)
-]
-
-Modules are named and distributed in various ways:
-
-@itemize[
-
- @item{Some modules are packaged in the Racket distribution or
-       otherwise installed into a hierarchy of
-       @defterm{collections}. For example, the module name
-       @racketmodname[pict/flash] means ``the module implemented
-       in the file @filepath{flash.rkt} that is located in the
-       @filepath{pict} collection.'' When a module name includes
-       no slash, then it refers to a @filepath{main.rkt} file.}
-
- @item{Some modules are distributed through the
-       @link[url:planet]{@PLaneT} server, and they can be
-       downloaded automatically on demand. For example, the first time
-       that you evaluate the following fragment:
-
-       @mr-def+int[
-        (require (planet schematics/random:1:0/random))
-        (random-gaussian)
-       ]
-
-       DrRacket automatically downloads version 1.0 of the
-       @filepath{random.plt} library by @filepath{schematics} and then
-       imports the @filepath{random.rkt} module.}
-
- @item{@margin-note{To save your definitions, use DrRacket's
-                    @seclink[#:indirect? #t
-                             #:doc '(lib "scribblings/drracket/drracket.scrbl") 
-                             "menu:file"]{@onscreen{Save Definitions}}
-                    menu item.}
-       Some modules live relative to other modules, without
-       necessarily belonging to any particular collection or package.
-       For example, in DrRacket, if you save your definitions so far in a
-       file @filepath{quick.rkt} and add the line
-
-        @racketblock[(provide rainbow square)]
-
-       then you can open a new tab or window in DrRacket, type the new
-       program @filepath{use.rkt} in the same directory as
-       @filepath{quick.rkt}:
-
-        @racketmod[
-         racket
-         (require "quick.rkt")
-         (rainbow (square 5))
-        ]
-
-        and when you run @filepath{use.rkt}, a rainbow list of squares
-        is the output. Note that @filepath{use.rkt} is written using
-        the initial import @racketmodname[racket], which does not
-        supply any picture-making functions itself---but does provide
-        @racket[require] and the function-calling syntax.}
-
-]
-
-Racketeers typically write new programs and libraries as modules that
-import each other through relative paths, and that use existing
-libraries from collections and @racket[planet]. When a program or
-library developed this way seems useful to others, it can be uploaded
-as a @PLaneT package or distributed in the more old-fashioned way as
-an installable collection archive (in either case without modifying
-the internal relative references among modules).
-
-@; ----------------------------------------------------------------------
-@section{Macros}
-
-Here's another library to try:
-
-@mr-def+int[
-(require slideshow/code)
-(code (circle 10))
-]
-
-Instead of a circle, the result is a picture of the code that, if it
-were used as an expression, would produce a circle. In other words,
-@racket[code] is not a function, but instead a new syntactic form for
-creating pictures; the bit between the opening parenthesis with
-@racket[code] is not an expression, but instead manipulated by the
-@racket[code] syntactic form.
-
-This helps explain what we meant in the previous section when we said
-that @racketmodname[racket] provides @racket[require] and the
-function-calling syntax. Libraries are not restricted to exporting
-values, such as functions; they can also define new syntactic
-forms. In this sense, Racket isn't exactly a language at all; it's
-more of an idea for how to structure a language so that you can extend
-it or create entirely new languages.
-
-One way to introduce a new syntactic form is through
-@racket[define-syntax] with @racket[syntax-rules]:
-
-@mr-def+int[
-(define-syntax pict+code
-  (syntax-rules ()
-    [(pict+code expr)
-     (hc-append 10
-                expr
-                (code expr))]))
-(pict+code (circle 10))
-]
-
-This kind of definition is a macro. The @racket[(pict+code expr)] part
-is a pattern for uses of the macro; instances of the pattern in a
-program are replaced by instances of the corresponding template, which
-is @racket[(hc-append 10 expr (code expr))].  In particular,
-@racket[(pict+code (circle 10))] matches the pattern with
-@racket[(circle 10)] as @racket[expr], so it is replaced with
-@racket[(hc-append 10 (circle 10) (code (circle 10)))].
-
-Of course, this sort of syntactic extension cuts both ways: inventing
-a new language can make it easier to say what you want, but harder for
-others to understand. As it happens, the developers of Racket are
-constantly giving talks and writing papers that involve Racket code,
-and it's worthwhile for everyone who works on those products to know
-about @racket[code].
-
-In fact, you might want to take a look at the @keep-file["quick.scrbl"]
-@link["quick.scrbl"]{source of this document}. You'll see that it
-starts with @racketfont{#lang}, but otherwise doesn't look a lot
-like Racket; nevertheless, we build this document by running its
-source as a Racket program. We have to use a lot more than
-@racket[syntax-rules] to extend Racket's syntax enough for writing
-documents, but Racket's syntactic extension can take you a long way.
-
-@; ----------------------------------------------------------------------
-@section{Objects}
-
-An object system is another example of a sophisticated language
-extension that is worth learning and using for Racket users. Objects
-are sometimes better than functions, even when you have
-@racket[lambda], and objects work especially well for graphical user
-interfaces. The API for Racket's GUI and graphics system is expressed
-in terms of objects and classes.
-
-The class system itself is implemented by the
-@racketmodname[racket/class] library, and the
-@racketmodname[racket/gui/base] library provides the GUI and drawing
-classes. By convention, the classes are given names that end with
-@racket[%]:
-
-@mr-defs+int[
-[(require racket/class
-          racket/gui/base)
- (define f (new frame% [label "My Art"]
-                       [width 300]
-                       [height 300]
-                       [alignment '(center center)]))]
-(send f show #t)
-]
-
-@(mr-interaction-eval (send f show #f))
-
-The @racket[new] form creates an instance of a class, where
-initialization arguments like @racket[label] and @racket[width] are
-provided by name. The @racket[send] form calls a method of the object,
-such as @racket[show], with arguments after the method name; the
-argument @racket[#t] in this case is the boolean constant ``true.''
-
-Pictures generated with @racketmodname[slideshow] encapsulate a
-function that uses the graphics toolbox's drawing commands to render
-the picture to a drawing context, such as a canvas in a frame. The
-@racket[make-pict-drawer] function from @racketmodname[slideshow]
-exposes a picture's drawing function. We can use
-@racket[make-pict-drawer] in a canvas-painting callback to draw a
-picture into a canvas:
-
-@(mr-interaction-eval (require pict/flash))
-
-@mr-def+int[
-(define (add-drawing p)
-  (let ([drawer (make-pict-drawer p)])
-    (new canvas% [parent f]
-                 [style '(border)]
-                 [paint-callback (lambda (self dc)
-                                   (drawer dc 0 0))])))
-(add-drawing (pict+code (circle 10)))
-(add-drawing (colorize (filled-flash 50 30) "yellow"))
-]
-
-@centerline{
-@(mr-interaction-eval-show (scale
-                            (bitmap
-                             (build-path
-                              (collection-path "scribblings/quick") 
-                              "art.png"))
-                            0.5))}
-
-Each canvas stretches to fill an equal portion of the frame, because
-that's how a frame manages its children by default.
-
-@; ----------------------------------------------------------------------
-@section{Where to Go From Here}
-
-This introduction to Racket purposely avoids many of the
-traditional ways of introducing and distinguishing Lisp or Scheme:
-prefix arithmetic notation, symbols, quoting and quasiquoting lists,
-@racket[eval], first-class continuations, and the idea that all syntax
-is really just a @racket[lambda] in disguise. While those are all part
-of Racket, they are not the main ingredients of day-to-day programming
-in Racket.
-
-Instead, Racket programmers typically program with functions,
-records, objects, exceptions, regular expressions, modules, and
-threads. That is, instead of a ``minimalist'' language---which is the
-way that Scheme is often described---Racket offers a rich language
-with an extensive set of libraries and tools.
-
-If you are new to programming or if you have the patience to work
-through a textbook, we recommend reading
-@italic{@link["http://www.htdp.org/"]{How to Design Programs}}. If you
-have already read it, or if you want to see where the book will take
-you, then see @other-manual['(lib
-"web-server/scribblings/tutorial/continue.scrbl")].
-
-For experienced programmers, to continue touring Racket from a
-systems-oriented perspective instead of pictures, your next stop is
-@other-manual['(lib "scribblings/more/more.scrbl")].
-
-To instead start learning about the full Racket language and tools
-in depth, move on to @other-manual['(lib "guide.scrbl"
-"scribblings/guide")].
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/code.scrbl b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/code.scrbl
deleted file mode 100644
index 8f0dd1e340..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/code.scrbl
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scribble/doc
-@(require "ss.rkt" 
-          scribble/eval
-          (for-label slideshow/code
-                     racket/gui/base))
-
-@title{Typesetting Racket Code in Slideshow}
-
-@defmodule[slideshow/code]{
-The @racketmodname[slideshow/code] library
-provides all of the exports of
-@racketmodname[pict/code] and also initializes
-@racket[get-current-code-font-size] to @racket[current-font-size].}
-
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/guide.scrbl b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/guide.scrbl
deleted file mode 100644
index 348a0d12fb..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/guide.scrbl
+++ /dev/null
@@ -1,271 +0,0 @@
-#lang scribble/doc
-@(require "ss.rkt"
-          scribble/struct
-          scribble/decode)
-
-@(define (control-table . l)
-   (make-table
-    #f
-    (map (lambda (p)
-           (list (make-flow (list (make-paragraph (list (hspace 2)))))
-                 (make-flow (list (make-paragraph (list (car p)))))
-                 (make-flow (list (make-paragraph (list (hspace 1) ":" (hspace 1)))))
-                 (make-flow (list (decode-paragraph (list (cadr p)))))))
-         l)))
-
-
-@title{Creating Slide Presentations}
-
-The @racketmodname[slideshow] module acts as a language that includes:
-
-@itemize[
-
- @item{all of @racketmodname[racket] except for @racket[printable<%>];}
-
- @item{pict-creating functions from @racketmodname[pict]; and}
-
- @item{slide-composing functions from @racketmodname[slideshow/base].}
-
-]
-
-The @racketmodname[slideshow] and @racketmodname[slideshow/base]
-module initialization also check the
-@racket[current-command-line-arguments] parameter to configure the
-slide mode (e.g., printing).
-
-The rest of this section repeats information that is presented by the
-tutorial slideshow, which can be viewed by running the
-@exec{slideshow} executable and clicking the @onscreen{Run Tutorial}
-link.
-
-@section{Slide Basics}
-
-The main Slideshow function is @racket[slide], which adds a slide to
-the presentation with a given content. For example, the ``Hello
-World'' presentation can be defined by the following module:
-
-@racketmod[
-slideshow
-
-(slide
- #:title "How to Say Hello"
- (t "Hello World!"))
-]
- 
-The @racket[t] function in this example creates a pict containing the
-given text using the default font and style.
-
-Executing the above module pops up a slide-presentation window. Type
-Alt-q (or Meta-q) to end the slides. Here are more controls:
-
-@control-table[
-  (list "Alt-q, Meta-q, or Cmd-q"             "end slide show")
-  (list "Esc"                                 "if confirmed, end show")
-  (list "Right arrow, Space, f, n, or click"  "next slide")
-  (list "Left arrow, Backspace, Delete, or b" "previous slide")
-  (list "g"                                   "last slide")
-  (list "1"                                   "first slide")
-  (list "s"                                   "next slide with a different title/name")
-  (list "a"                                   "previous slide starting different title/name")
-  (list "Alt-g, Cmd-g, or Meta-g"             "select a slide")
-  (list "Alt-p, Cmd-p, or Meta-p"             "show/hide slide number")
-  (list "Alt-c, Cmd-c, or Meta-c"             "show/hide commentary")
-  (list "Alt-d, Cmd-d, or Meta-d"             "show/hide preview")
-  (list "Alt-m, Cmd-m, or Meta-m"             "show/hide mouse cursor")
-  (list "Alt-l, Cmd-l, or Meta-l"             "show/hide ``spotlight''")
-  (list "Shift with arrow"                    "move window 1 pixel")
-  (list "Alt, Meta, or Cmd with arrow"        "move window 10 pixels")
-]
-
-The @racket[slide] function accepts any number of arguments. Each
-argument is a pict to be centered on the slide. The picts are stacked
-vertically with @racket[(current-gap-size)] separation between each pict, and
-the total result is centered (as long as there's a gap of at least
-@racket[(* 2 (current-gap-size))] between the title and content).
-
-@racketmod[
-slideshow
-
-(slide
- #:title "How to Say Hello"
- (t "Hello World!")
- (t "Goodbye Dlrow!"))
-]
-
-Various functions format paragraphs and generate bulleted items for
-lists. For example, @racket[item] creates a bulleted paragraph that
-spans (by default) the middle @math{2/3} of the slide:
-
-@racketmod[
-slideshow
-
-(slide
- #:title "How to Say Hello"
- (item "If you want to create an example, you"
-      "can always do something with" (bt "Hello World!"))
- (item "It's a bit silly, but a follow-up example"
-       "could be" (bt "Goodbye Dlrow!")))
-]
-
-As the example illustrates, the @racket[item] function accepts a
-mixture of strings and picts, and it formats them as a paragraph.
-
-@; ------------------------------------------------------------------------
-
-@section[#:tag "staging"]{Staging Slides}
-
-The @racket[slide] function creates a slide as a side effect. It can
-be put inside a function to abstract over a slide:
-
-@racketmod[
-slideshow
-
-(define (slide-n n)
-  (slide
-   #:title "How to Generalize Slides"
-   (item "This is slide number" (number->string n))))
-
-(slide-n 1)
-(slide-n 2)
-(slide-n 3)]
-
-The @racket[slide] function also has built-in support for some common
-multi-slide patterns. Each element argument to @racket[slide] is
-usually a pict, but there are a few other possibilities:
-
-@itemize[
-
-  @item{If an element is @racket['next], then a slide is generated
-    containing only the preceding elements, and then the elements are
-    re-processed without the @racket['next]. Multiple @racket['next]
-    elements generate multiple slides.}
-
-  @item{If an element is @racket['alts], then the next element must be
-    a list of element lists. Each list up to the last one is appended
-    to the elements before @racket['alts] and the resulting list of
-    elements is processed. The last lists is appended to the preceding
-    elements along with the remaining elements (after the list of
-    lists) and the result is re-processed.}
-
- @item{A @racket['nothing] element is ignored (useful as a result of a
-    branching expression).}
-
- @item{A @racket['next!] element is like @racket['next], except that
-    it is preserved when condensing (via the @DFlag{condense} flag).}
-
- @item{A @racket['alts~] element is like @racket['alts], except that
-    it is @italic{not} preserved when condensing.}
-
-  @item{A comment produced by @racket[comment] is ignored, except when
-    commentary is displayed.}
-
-]
-
-Here's an example to illustrate how @racket['next] and @racket['alts]
-work:
-
-@racketmod[
-slideshow
-
-(slide
- #:title "Example"
- (item "First step")
- 'next
- (item "Second step")
- 'next
- 'alts
- (list (list (item "Tentative third step")
-             'next
-             (item "This isn't working... back up"))
-       (list (item "Third step that works")))
- 'next
- (item "Fourth step"))
-]
-
-@; ------------------------------------------------------------------------
-
-@section[#:tag "display-size"]{Display Size and Fonts}
-
-Slideshow is configured for generating slides in @math{1024} by
-@math{768} pixel format. When the current display has a different
-size as Slideshow is started, the Slideshow display still
-occupies the entire screen, and pictures are scaled just before
-they are displayed. Thus, one picture unit reliably corresponds
-to a ``pixel'' that occupies @math{1/1024} by @math{1/768} of the
-screen.
-
-The @racket[text] form for generating text pictures takes into
-account any expected scaling for the display when measuring
-text. (All Slideshow text functions, such as @racket[t] and
-@racket[item] are built on @racket[text].) In particular, scaling
-the picture causes a different font size to be used for drawing
-the slide---rather than bitmap-scaling the original font---and
-changing the font size by a factor of @math{k} does not
-necessarily scale all text dimensions equally by a factor of
-@math{k}---because, for most devices, each character must have
-integer dimensions. Nevertheless, especially if you use the
-@racket[current-expected-text-scale] parameter, Slideshow is
-usually able to produce good results when the slide is scaled.
-
-More generally, different font sets on different platforms can
-change the way a slide is rendered. For example, the @racket[tt]
-font on one platform might be slightly wider than on another,
-causing different line breaks, and so on. Beware.
-
-Beware also of using bitmaps in slides when the presentation
-screen is not @math{1024} by @math{768}. In that case, consider
-using @racket[size-in-pixels] (with the caveat that the resulting
-picture will take up different amounts of the slide on different
-displays).
-
-@; ------------------------------------------------------------------------
-
-@section{Command-line Options}
-
-@defmodule[slideshow/start]
-
-The @exec{slideshow} executable instantiates the
-@racketmodname[slideshow/start] module, which inspects the command
-line as reported by @racket[current-command-line-arguments] to get
-another module to @racket[require] for the slide content.The @racketmodname[slideshow/start]
-module also initializes
-variables like @racket[printing?] and @racket[condense?] based on
-flags supplied on the command line.
-
-Thus, if the above example is in @filepath{multi-step.rkt}, then the
-command
-
-@commandline{slideshow multi-step.rkt}
-
-runs the slides.
-
-If the module given to @exec{slideshow} has a @racketidfont{slideshow}
-submodule, then @racketmodname[slideshow/start] @racket[require]s the
-@racketidfont{slideshow} submodule after @racket[require]ing the
-module. If the module has no @racketidfont{slideshow} but has a
-@racketidfont{main} submodule, then the @racketidfont{main} submodule
-is @racket[require]d.
-
-The @exec{slideshow} executable accepts a number of command-line
-flags.  Use the @DFlag{help} flag to obtain a list of other
-flags.
-
-
-@; ------------------------------------------------------------------------
-
-@section{Printing}
-
-The @Flag{p} or @DFlag{print} command-line flag causes Slideshow to
-print slides instead of showing them on the screen using the current
-platform's printing system. The @Flag{P} or @DFlag{ps} generates
-PostScript directly, while @Flag{D} or @DFlag{pdf} generates
-PDF directly.
-
-PS-to-PDF converters vary on how well they handle landscape
-mode. Here's a Ghostscript command that converts slides reliably
-(when you replace @filepath{src.ps} and @filepath{dest.pdf} with your
-file names):
-
-@commandline{gs -q -dAutoRotatePages=/None -dSAFER -dNOPAUSE -dBATCH 
-     -sOutputFile=dest.pdf -sDEVICE=pdfwrite -c .setpdfwrite 
-     -c "<</Orientation 3>> setpagedevice" -f src.ps}
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/info.rkt b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/info.rkt
deleted file mode 100644
index 33930c9054..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("slideshow.scrbl" (multi-page) (tool))))
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/legacy.scrbl b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/legacy.scrbl
deleted file mode 100644
index e19bb5d8a6..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/legacy.scrbl
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scribble/doc
-@(require "ss.rkt")
-
-@title[#:tag "legacy"]{Legacy Libraries}
-
-@defmodule[slideshow/pict #:no-declare]{
-
-The @racketmodname[slideshow/pict] library re-exports @racketmodname[pict].}
-
-@defmodule[slideshow/code-pict #:no-declare]{
-
-The @racketmodname[slideshow/code-pict] library re-exports @racketmodname[pict/code].}
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/play.scrbl b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/play.scrbl
deleted file mode 100644
index 1db2ced46d..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/play.scrbl
+++ /dev/null
@@ -1,137 +0,0 @@
-#lang scribble/doc
-@(require "ss.rkt" (for-label slideshow/play slideshow/code))
-
-@title[#:tag "play"]{Animations}
-
-@defmodule[slideshow/play]{The @racketmodname[slideshow/play] module
-provides tools for generating animations as multiple, automatically
-advanced slides.}
-
-Many of the tools are based on a function that takes a number between
-@racket[0.0] and @racket[1.0] inclusive and produces a
-pict. The pict produced for the input @racket[0.0] is
-the starting image of the animation, and the pict produced for
-@racket[1.0] is the ending image, while intermediate values produced
-intermediate images. For example,
-
-@racketblock[
-(lambda (n)
-  (cellophane (t "Hello") n))
-]
-
-corresponds to an animation that fades in the word ``Hello.''
-
-@; --------------------------------------------------
-
-@section{Generating Animated Slides}
-
-@defproc[(play [gen ((real-in 0.0 1.0) . -> . pict?)]
-               [#:steps steps exact-positive-integer? 10]
-               [#:delay delay-secs real? 0.05]
-               [#:skip-first? skip-first? any/c #f]
-               [#:title title (or/c string? pict? #f 
-                                    ((real-in 0.0 1.0) . -> . (or/c string? pict? #f)))
-                        #f]
-               [#:name name (or/c string? #f
-                                  ((real-in 0.0 1.0) . -> . (or/c string? #f)))
-                       title]
-               [#:layout layout (or/c 'auto 'center 'top 'tall) 'auto])
-         void?]{
-
-Generates @math{@racket[steps]+1} slides by calling @racket[gen] on
-equally-spaced values from @racket[0.0] (inclusve) to @racket[1.0]
-(exclusive). Except for the first of the slides, each slide has a
-timeout of @racket[delay-secs], so that the next slide appears
-automatically.
-
-Normally, @racket[play] is called via @racket[play-n], which
-effectively calls @racket[gen] on @racket[1.0] without a timeout to
-complete the animation and stop the auto-advance of slides. The
-@racket[play-n] function also manages with multi-step animations.
-
-If @racket[skip-first?] is @racket[#f], then one fewer slide is
-generated, because @racket[gen] is not called on @racket[0.0].
-
-The @racket[title], @racket[name], and @racket[layout] arguments are
-passed on to @racket[slide], at least when @racket[title] and/or
-@racket[name] are not functions. When @racket[title] or @racket[name]
-is a function, the function is applied to the value used to produce
-the slide content, and the resulting title or name is passed on to
-@racket[slide].
-
-In condensed mode (i.e., when @racket[condense?] is @racket[#t]), any
-slide that would be registered with a timeout is instead skipped.}
-
-
-@defproc[(play-n [gen* (() (listof (real-in 0.0 1.0)) . ->* . pict?)]
-                 [#:steps steps (or/c exact-positive-integer?
-                                      (improper-listof exact-positive-integer?))
-                          10]
-                 [#:delay delay-secs real? 0.05]
-                 [#:skip-first? skip-first? any/c #f]
-                 [#:skip-last? skip-last? any/c #f]
-                 [#:title title (or/c string? pict? #f 
-                                      ((real-in 0.0 1.0) . -> . (or/c string? pict? #f)))
-                          #f]
-                 [#:name name (or/c string? #f
-                                    ((real-in 0.0 1.0) . -> . (or/c string? #f)))
-                         title]
-                 [#:layout layout (or/c 'auto 'center 'top 'tall) 'auto])
-          void?]{
-
-Generates a sequence of slides by calling @racket[gen*] with, for each
-of its arguments, numbers from @racket[0.0] to @racket[1.0]. If
-@racket[gen*] accepts @math{n} arguments, then result is a sequence of
-animations with a pause (i.e., not auto-advanced) between each of
-@math{n} segments.
-
-If @racket[gen*] accepts a single argument, then @racket[play-n] is
-like @racket[play], except that @racket[gen*] is also called with
-@racket[1.0] to generate a slide with no timeout. If @racket[gen*]
-accepts multiple arguments, then slides are generated by calling
-@racket[gen*] with the first argument varying from @racket[0.0] to
-@racket[1.0] while all other arguments are @racket[0.0]. Then, the
-first argument is held at @racket[1.0] while the second argument varies
-from @racket[0.0] to @racket[1.0], and so on.
-
-For example,
-
-@racketblock[
-(play-n 
- (lambda (n1 n2)
-   (cellophane (t "Hello")
-               (* n1 (- 1.0 n2)))))
-]
-
-generates an animation to fade in the word ``Hello,'' and then pauses
-for a manual advance, and then fades ``Hello'' back out.
-
-If @racket[skip-first?] is @racket[#t], then the very first slide of
-the sequence is skipped. Similarly, if @racket[skip-last?] is
-@racket[#t], then the last slide of the sequence is skipped.
-
-The @racket[steps] argument controls how many steps happen in each
-phase on the animation. If it is a number, then that number is used for
-each phase. If it is a pair of two numbers, then the first number is used
-for the first phase, and the second number is used for the rest of the
-phases. Similarly, if it is @racket[(cons num_1 (cons num_2 num_3))],
-@racket[num_1] and @racket[num_2] are used for the first two phases
-and @racket[num_3] is used for the rest.
-
-The @racket[delay-msecs], @racket[title],
-@racket[name], and @racket[layout] arguments are passed on to
-@racket[play] for each of the @math{n} segments of animation.}
-
-
-@defproc[(animate-slide [element (flat-rec-contract elem/c
-                                   (or/c pict? 'next 'alts
-                                        (listof (listof elem/c))))]
-                        ...)
-         (() (listof (real-in 0.0 1.0)) . ->* . pict?)]{
-
-Accepts slide content similar to @racket[slide] with @racket['next]
-and @racket['alts] and produces a procedure suitable for use with
-@racket[play-n]. The result is similar to using @racket[slide], but
-with fades for @racket['next] and @racket['alts] transitions (to
-better fit the style, perhaps, of surrounding animations).}
-
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/slides.scrbl b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/slides.scrbl
deleted file mode 100644
index df5445093e..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/slides.scrbl
+++ /dev/null
@@ -1,653 +0,0 @@
-#lang scribble/doc
-@(require "ss.rkt"
-          (for-label (except-in racket/gui drop)
-                     slideshow/step
-                     slideshow/slides-to-picts))
-
-@(define d=> @elem['rarr])
-
-@title[#:style 'toc]{Making Slides}
-
-@declare-exporting[slideshow/base slideshow]
-
-@defmodule*/no-declare[(slideshow/base)]{The
-@racketmodname[slideshow/base] module, which is re-provided by
-@racketmodname[slideshow], provides the functions for creating slides.}
-
-@local-table-of-contents[]
-
-@; ----------------------------------------------------------------------
-
-@section{Primary Slide Functions}
-
-@defproc[(slide [#:title title (or/c #f string? pict?) #f]
-                [#:name  name (or/c #f string?) title]
-                [#:layout layout (or/c 'auto 'center 'top 'tall) 'auto]
-                [#:gap-size sep-gap-size real? (current-gap-size)]
-                [#:inset inset slide-inset? (make-slide-inset 0 0 0 0)]
-                [#:timeout secs (or/c #f real?) #f]
-                [#:condense? condense? any/c (and timeout #t)]
-                [element (flat-rec-contract elem/c
-                           (or/c pict? 
-                                'next 'next! 'alts 'alts~ 'nothing
-                                comment?
-                                (listof (listof elem/c))))] ...)
-          void?]{
-
-Creates and registers a slide. See @secref["staging"] for
-information about @racket[element]s. Multiple @racket[element] picts are
-separated by @racket[sep-gap-size] vertical space.
-
-When this function is first called in non-printing mode, then the
-viewer window is opened. Furthermore, each call to the function
-@racket[yield]s, so that the viewer window can be refreshed, and so
-the user can step through slides.
-
-If @racket[title] is not @racket[#f], then a title is shown for the
-slide. The @racket[name] is used in the slide-navigation dialog, and
-it defaults to @racket[title].
-
-If @racket[layout] is @racket['top], then the content is top-aligned,
-with @racket[(* 2 sep-gap-size)] space between the title and the
-content. The @racket['tall] layout is similar, but with only
-@racket[sep-gap-size] space. The @racket['center] mode centers the content
-(ignoring space consumed by the title). The @racket['auto] mode is
-like @racket['center], except when @racket[title] is non-@racket[#f]
-and when the space between the title and content would be less than
-@racket[(* 2 sep-gap-size)], in which case it behaves like @racket['top].
-
-The @racket[inset] argument supplies an inset that makes the
-slide-viewing window smaller when showing the slide. See
-@racket[make-slide-inset] for more information.
-
-If @racket[secs] argument for @racket[#:timeout] is not @racket[#f],
-then the viewer automatically advances from this slide to the next
-after @racket[secs] seconds, and manual advancing skips this slide.
-
-If @racket[condense?] is true, then in condense mode (as specified by
-the @Flag{c} command-line flag), the slide is not created and
-registered.}
-
-
-@defproc[(t [str string?]) pict?]{
-
-The normal way to make plain text. Returns @racket[(text str
-(current-main-font) (current-font-size))].}
-
-@defproc[(it [str string?]) pict?]{
-
-The normal way to make italic text. Returns @racket[(text str (cons
-'italic (current-main-font)) (current-font-size))].}
-
-@defproc[(bt [str string?]) pict?]{
-
-The normal way to make bold text. Returns @racket[(text str (cons
-'bold (current-main-font)) (current-font-size))].}
-
-@defproc[(bit [str string?]) pict?]{
-
-Bold-italic text. Returns @racket[(text str (list* 'bold 'italic
-(current-main-font)) (current-font-size))].}
-
-@defproc[(tt [str string?]) pict?]{
-
-The normal way to make monospaced text. Returns @racket[(text str
-`(bold . modern) (current-font-size))].}
-
-@defproc[(rt [str string?]) pict?]{
-
-The normal way to make serif text. Returns @racket[(text str 'roman
-(current-font-size))].}
-
-@defproc[(titlet [str string?]) pict?]{
-
-Creates title text. Returns @racket[((current-titlet) str)].}
-
-@defproc[(para [#:width width real? (current-para-width)]
-               [#:align align (or/c 'left 'center 'right) 'left]
-               [#:fill? fill? any/c #t]
-               [#:decode? decode? any/c #t]
-               [element (flat-rec-contract elem/c
-                          (or/c string? pict? (listof elem/c)))] ...)
-         pict?]{
-
-Generates a paragraph pict that is no wider than @racket[width] units,
-and that is exactly @racket[width] units if @racket[fill?] is true. If
-@racket[fill?] is @racket[#f], then the result pict is as wide as the
-widest line.
-
-Each list within @racket[element]s is spliced into the sequence of
-string and pict elements. If @racket[decode?] is true, then strings
-among the @racket[element]s are decoded by performing the following
-substitutions: @litchar{---} @d=> @litchar["\u2014"], @litchar{--}
-@d=> @litchar["\u2013"], @litchar{``} @d=> @litchar["\u201C"],
-@litchar{''} @d=> @litchar["\u201D"], @litchar{'} @d=>
-@litchar["\u2019"]. In addition, to better work with
-@racketmodname[at-exp] notation, if an @racket[element] is @racket["\n"],
-then it is dropped along with any spaces at the start of the next
-element.
-
-Strings are split at spaces for word-wrapping to fit the page, and a
-space is added between elements. If a string element starts with one
-of the following punctuation marks (after decoding), however, no space
-is added before the string:
-
-@t{
- @hspace[2] @litchar{-} @litchar{'} @litchar{,} @litchar{.} @litchar{ } @litchar{:} 
- @litchar{;} @litchar{?} @litchar{!} @litchar{)} @litchar["\u201D"] @litchar["\u2019"]
-}
-
-The @racket[align] argument specifies how to align lines within the
-paragraph.
-
-See the spacing between lines is determined by the
-@racket[current-line-sep] parameter.}
-
-
-@defproc[(item [#:width width real? (current-para-width)]
-               [#:gap-size sep-gap-size real? (current-gap-size)]
-               [#:bullet blt pict? (scale bullet (/ sep-gap-size gap-size))]
-               [#:align align (or/c 'left 'center 'right) 'left]
-               [#:fill? fill? any/c #t]
-               [#:decode? decode? any/c #t]
-               [element (flat-rec-contract elem/c
-                          (or/c string? pict? (listof elem/c)))] ...)
-         pict?]{
-
-Like @racket[para], but with @racket[blt] followed by @racket[(/
-sep-gap-size 2)] space appended horizontally to the resulting paragraph,
-aligned with the top line. The paragraph width of @racket[blt] plus
-@racket[(/ sep-gap-size 2)] is subtracted from the maximum width of the
-paragraph.}
-
-
-@defproc[(subitem [#:width width real? (current-para-width)]
-                  [#:gap-size sep-gap-size real? (current-gap-size)]
-                  [#:bullet blt pict? (scale o-bullet (/ sep-gap-size gap-size))]
-                  [#:align align (or/c 'left 'center 'right) 'left]
-                  [#:fill? fill? any/c #t]
-                  [#:decode? decode? any/c #t]
-                  [element (flat-rec-contract elem/c
-                             (or/c string? pict? (listof elem/c)))] ...)
-         pict?]{
-
-Like @racket[item], but an additional @racket[(* 2 sep-gap-size)] is
-subtracted from the paragraph width and added as space to the left of
-the pict. Also, @racket[o-bullet] is the default bullet, instead of
-@racket[bullet].}
-
-
-@defproc[(clickback [pict pict?] [thunk (-> any)])
-         pict?]{
-
-Creates a pict that embeds the given one, and is the same size as the
-given pict, but that when clicked during a presentation calls
-@racket[thunk].}
-
-
-@defproc[(interactive [pict pict?] [proc (frame% . -> . (-> any))])
-         pict?]{
-
-Creates a pict that embeds the given one, but that creates a floating
-frame at the pict's location on the screen during a
-presentation. After the floating frame is created (and before it is shown),
-@racket[proc] is applied to the frame. The result from @racket[proc]
-must be a procedure that is called when the window is removed (because
-the slide changes, for example).}
-
-
-@defproc[(size-in-pixels [pict pict?]) pict?]{
-
-Scales @racket[pict] so that it is displayed on the screen as
-@racket[(pict-width pict)] pixels wide and @racket[(pict-height pict)]
-pixels tall. The result is @racket[pict] when using a 1024 by 768
-display.}
-
-
-@defproc[(pict->pre-render-pict [pict pict?]) pict?]{
-
-Produces a pict that is like @racket[pict], but optimized for drawing
-on some platforms (currently Mac OS X). This function may be useful
-to reduce drawing times for for large bitmaps or complex drawings.
-
-@history[#:added "1.1"]}
-
-
-@defproc[(make-outline [name (or/c symbol? (listof symbol?))]
-                       [title (or/c string? pict?)]
-                       [subitems (or/c #f null?
-                                       (symbol? . -> . pict?))]
-                       ...)
-          (symbol? . -> . void?)]{
-
-Returns a function that takes a symbol and generates an outline
-slide.
-
-The @racket[...] above applies to all three arguments together.  Each
-trio of arguments defines a section for the outline:
-
-@itemize[
-
- @item{The section @racket[name] is either a symbol or a list of symbols. When
-        the outline function is called later to make an outline, the
-        given symbol is compared to the section's symbol(s), and the
-        section is marked as current if the symbol matches.}
-
- @item{The @racket[title] is used as the displayed name of the
-       section.}
-
- @item{The @racket[subitems] are displayed when the section is
-       active. It can be @racket[#f] or @racket[null] (for historical
-       reasons) if no subitems are to be displayed. Otherwise, it
-       should be a function that takes a symbol (the same one passed
-       to the outline maker) and produces a pict.}
-
-]}
-
-@defproc[(comment [text (or/c string? pict?)] ...)
-         comment?]{
-
-Combines strings and picts to be used as a slide element for (usually
-hidden) commentary. Use the result as an argument to @racket[slide].}
-
-@defproc[(comment? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a comment produced by
-@racket[comment].}
-
-@; ------------------------------------------------------------------------
-
-@section{Slide Registration}
-
-@defproc[(slide? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a slide produced by
-@racket[most-recent-slide] or @racket[retract-most-recent-slide].}
-
-@defproc[(most-recent-slide) slide?]{
-
-Returns a slide structure that be supplied @racket[re-slide] to make a
-copy of the slide or @racket[slide->pict] to re-extract the entire
-slide as a pict.}
-
-@defproc[(retract-most-recent-slide) slide?]{
-
-Cancels the most recently created slide, and also returns a slide
-structure that be supplied to @racket[re-slide] to restore the slide
-(usually in a later position).}
-
-@defproc[(re-slide [slide slide?] [pict pict? (blank)])
-         void?]{
-
-Re-inserts a slide, @racket[lt-superimpose]ing the given additional
-@racket[pict].}
-
-@defproc[(slide->pict [slide slide?])
-         pict?]{
-
-Converts a complete slide to a @racket[pict]. The bounding box of the
-result corresponds to the slide within its margins.}
-
-@; ------------------------------------------------------------------------
-
-@section{Viewer Control}
-
-@defproc[(start-at-recent-slide) void?]{
-
-Sets the starting slide for the talk to the most recently created
-slide. If this function is used multiple times, the last use overrides
-the earlier uses.}
-
-
-@defproc[(enable-click-advance! [on? any/c]) void?]{
-
-Enables or disables slide advance as a result of a mouse click.}
-
-
-@defproc[(set-use-background-frame! [on? any/c]) void?]{
-
-Enables or disables the creation of a background frame, which is
-typically useful only when @racket[make-slide-inset] is used are
-active. The last enable/disable before the first slide registration
-takes effect once and for all.}
-
-@defproc[(set-page-numbers-visible! [on? any/c]) void?]{
-
-Determines whether slide numbers are initially visible in the viewer.}
-
-
-@defparam[current-page-number-font font (is-a?/c font%)]{
-
-Parameter that determines the font used to draw the page number (if
-visible).}
-
-
-@defparam[current-page-number-color color (or/c string? (is-a?/c color%))]{
-
-Parameter that determines the color used to draw the page number (if
-visible).}
-
-@defparam[current-page-number-adjust proc (-> number? string? string?)]{ 
-Parameter that controls the precise text
-that appears to indicate the page numbers (if visible). The
-input to the function is the default string and the slide
-number, and the result is what is drawn in the bottom right
-corner. The default parameter value just returns its first
-argument.
-}
-
-@defproc[(set-spotlight-style! [#:size size (or/c #f (>=/c 0)) #f]
-                               [#:color color (or/c #f string? (is-a?/c color%)) #f])
-         void?]{
-
-Adjusts the size and color of the ``spotlight,'' which can be enabled
-in Slideshow as an alternative to the mouse. Note that the color
-normally should have alpha value less than 1 (to make it partially
-transparent). If @racket[size] or @racket[color] is @racket[#f], the
-corresponding setting is unchanged.}
-
-@; ------------------------------------------------------------------------
-
-@section{Constants and Layout Variables}
-
-@defthing[gap-size 24]{
-
-A width commonly used for layout.}
-
-
-@defparam[current-gap-size sep-gap-size real?]{
-
-A parameter whose value is a width used for the separation between
-items by @racket[slide], the size and spacing of a bullet for
-@racket[item], the space between a slide title and content in
-@racket['tall] mode, etc.  The default value is @racket[gap-size].}
-
-
-@defthing[bullet pict?]{
-
-A filled bullet used by default by @racket[item].
-
-It is either @racket[(t "\u2022")], if that character
-is available in the font that @racket[t] uses,
-or it uses an implementation similar to @racket[o-bullet],
-but not hollow (using @racket[disk], not @racket[circle]).
-}
-
-
-@defthing[o-bullet pict?]{
-
-A hollow bullet used by default by @racket[subitem].
-
-It's implementation is:
-@racketblock[(baseless
-              (cc-superimpose 
-               (circle (/ gap-size 2)) 
-               (blank 0 gap-size)))]
-}
-
-
-@defidform[client-w]{
-
-Produces the width of the display area, minus @racket[margin]s. The
-result of the form changes if the margin is adjusted via
-@racket[set-margin!].}
-
-
-@defidform[client-h]{
-
-Produces the height of the display area, minus @racket[margin]s, but
-including the title area). The result of the form changes if the
-margin is adjusted via @racket[set-margin!].}
-
-
-@defidform[full-page]{
-
-Produces an empty pict that is the same size as the client area, which
-is like @racket[(blank client-w client-h)].}
-
-
-@defidform[titleless-page]{
-
-Produces an empty pict that is the same size as the client area minus
-the title area in @racket['top] layout mode, which is like
-@racket[(blank client-w (- client-h title-h (* 2 gap-size)))].}
-
-
-@defidform[margin]{
-
-Produces a number that corresponds to the current margin, which
-surrounds every side of the slide. The client area for a slide
-corresponds to the display area (which is always 1024 by 768) minus
-this margin on each side. The default margin is @racket[20].
-
-The margin can be adjusted via @racket[set-margin!].}
-
-
-@defidform[title-h]{
-
-Produces a number that corresponds to the height of a title created by
-@racket[titlet].
-
-If @racket[titlet] is changed via the @racket[current-titlet]
-parameter, the title height should be updated via
-@racket[set-title-h!].}
-
-
-@defthing[printing? boolean?]{
-
-The value is @racket[#t] if slides are being generated for printed
-output, @racket[#f] for normal on-screen display. Printing mode is
-normally triggered via the @DFlag{print} or @DFlag{ps} command-line
-flag.}
-
-
-@defthing[condense? boolean?]{
-
-The value is @racket[#t] if slides are being generated in condensed
-mode, @racket[#f] for normal mode. Condensed mode is normally
-triggered via the @DFlag{condense} command-line flag.}
-
-@; ------------------------------------------------------------------------
-
-@section{Configuration}
-
-@defparam[current-font-size n exact-nonnegative-integer?]{
-
-Parameter that determines the font size used by @racket[t],
-@racket[para], etc. The default size is @racket[32].}
-
-
-@defparam[current-main-font style text-style/c]{
-
-Parameter that determines the font size used by @racket[t],
-@racket[para], etc.  The default is platform-specific; possible
-initial values include @racket['swiss], @racket["Verdana"], and
-@racket["Gill Sans"].}
-
-
-@defparam[current-line-sep n exact-nonnegative-integer?]{
-
-Parameter that controls the amount of space used between lines by
-@racket[para], @racket[item], and @racket[subitem].}
-
-
-@defparam[current-para-width n exact-nonnegative-integer?]{
-
-Parameter that controls the width of a pict created by
-@racket[para], @racket[item], and @racket[subitem].}
-
-
-@defparam[current-title-color color (or/c string? (is-a?/c color%))]{
-
-Parameter used by the default @racket[current-titlet] to colorize the
-title. The default is @racket["black"].}
-
-
-@defparam[current-slide-assembler proc ((or/c string? #f)
-                                        exact-nonnegative-integer?
-                                        pict?
-                                        . -> .
-                                        pict?)]{
-
-Parameter whose value is a function for assembling slide content into
-a single pict; the assembling function takes a string for the title
-(or @racket[#f]), a separation for the title (if any) and pict, and a
-pict for the slide content (not counting the title).
-
-The result is of the assembler is @racket[ct-superimpose]d with the
-client area, but the result pict might draw outside the client region
-to paint the screen margins, too.
-
-The default assembler uses @racket[titlet] to turn a title string (if
-any) to a pict. See also @racket[current-titlet] and
-@racket[set-title-h!].
-
-The slide assembler is @emph{not} responsible for adding page
-numbers to the slide; that job belongs to the viewer. See also
-@racket[current-page-number-font], @racket[current-page-number-color],
-and @racket[set-page-numbers-visible!].}
-
-
-@defparam[current-titlet proc (string? . -> . pict?)]{
-
-Parameter to configure @racket[titlet]. The default is
-
-@racketblock[
- (lambda (s)
-   (colorize (text s (current-main-font) 40)
-             (current-title-color)))
-]
-
-If this parameter is changed such that the result is a different
-height, then @racket[set-title-h!] should be called to update the
-value produced by @racket[title-h], @racket[titleless-page], etc.}
-
-
-@defproc[(set-margin! [amt real?]) void?]{
-
-Changes the margin that surrounds the client area. See also
-@racket[margin].}
-
-
-@defproc[(set-title-h! [amt real?]) void?]{
-
-Changes the expected height of a title, which adjusts @racket[title-h],
-@racket[client-h], @racket[full-page], and @racket[titleless-page].}
-
-
-@defproc[(make-slide-inset [left-inset exact-nonnegative-integer?]
-                           [top-inset exact-nonnegative-integer?]
-                           [right-inset exact-nonnegative-integer?]
-                           [bottom-inset exact-nonnegative-integer?])
-          slide-inset?]{
-
-Creates a slide inset, which describes a number of pixels to inset the
-viewer for a slide on each side.}
-
-
-@defproc[(slide-inset? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a slide inset created by
-@racket[make-slide-inset], @racket[#f] otherwise.}
-
-@; ----------------------------------------------------------------------
-
-@section{Pict-Staging Helper}
-
-@defmodule[slideshow/step]{The @racketmodname[slideshow/step] library
-provides syntax for breaking a complex slide into steps that are more
-complex than can be handled with @racket['next] and @racket['alts] in
-a @racket[slide] sequence.}
-
-@defform[(with-steps (id ...) body ...)]{
-
-Evaluates the @racket[body]s once for each @racket[id], skipping an
-@racket[id] if its name ends with @litchar{~} and @racket[condense?]
-is true. The results of the last @racket[body] for each iteration are
-collected into a list, which is the result of the @racket[with-steps]
-form.
-
-Within the @racket[body]s, several keywords are bound non-hygienically
-(using the first @racket[body]'s lexical context):
-
-@itemize[
-
- @item{@racket[(only? id)] --- returns @racket[#t] during the
-    @racket[id] step (i.e., during the evaluation of the
-    @racket[body]s for @racket[id]), @racket[#f] otherwise.}
-
- @item{@racket[(vonly id)] --- returns the identity function during
-    the @racket[id] step, @racket[ghost] otherwise.}
-
- @item{@racket[(only id _then-expr)] returns the result of
-    @racket[_then-expr] during the @racket[id] step, @racket[values]
-    otherwise.}
-
- @item{@racket[(only id _then-expr _else-expr)] returns the result
-    of @racket[_then-expr] during the @racket[id] step, the result of
-    @racket[_else-expr] otherwise.}
-
- @item{@racket[(before? id)] --- returns @racket[#t] before the
-    @racket[id] step, @racket[#f] starting for the @racket[id] and
-    afterward.}
-
- @item{@racket[(vbefore id)], @racket[(before id _then-expr)], or
-    @racket[(before id _then-expr _else-expr)] --- analogous to
-    @racket[vonly] and @racket[only].}
-    
- @item{@racket[(after? id)] --- returns @racket[#t] after the
-    @racket[id] step, @racket[#f] through the @racket[id] step.}
-
- @item{@racket[(vafter id)], @racket[(after id _then-expr)], or
-    @racket[(after id _then-expr _else-expr)] --- analogous to
-    @racket[vonly] and @racket[only].}
-    
- @item{@racket[(between? _a-id _b-id)] --- returns @racket[#t]
-    starting from the @racket[_a-id] step through the @racket[_b-id]
-    step, @racket[#f] otherwise.}
-
- @item{@racket[(vbetween _a-id _b-id)], @racket[(between _a-id
-    _b-id _then-expr)], or @racket[(between _a-id _b-id _then-expr
-    _else-expr)] --- analogous to @racket[vonly] and @racket[only].}
-
- @item{@racket[(between-excel? _a-id _b-id)] --- returns
-    @racket[#t] starting from the @racket[_a-id] step through steps
-    before the @racket[_b-id] step, @racket[#f] for the @racket[_b-id]
-    step and afterward.}
-
- @item{@racket[(vbetween-excl _a-id _b-id)], @racket[(between-excl
-    _a-id _b-id _then-expr)], or @racket[(between-excl _a-id _b-id
-    _then-expr _else-expr)] --- analogous to @racket[vonly] and
-    @racket[only].}
-]}
-
-
-@defform[(with-steps~ (id ...) body ...)]{
-
-Like @racket[with-steps], but when @racket[condense?] is true, then
-@racket[expr] is evaluated only for the last @racket[id] (independent
-of whether the name of the last @racket[id] name ends in @litchar{~}).
-}
-
-@; ----------------------------------------------------------------------
-
-@section{Slides to Picts}
-
-@defmodule[slideshow/slides-to-picts]
-
-@defproc[(get-slides-as-picts [path path-string?]
-                              [width real?]
-                              [height real?]
-                              [condense? any/c]
-                              [stop-after (or/c #f exact-nonnegative-integer?) #f])
-         (listof pict?)]{
-
-Executes the Slideshow program indicated by @racket[path] in a fresh
-namespace, and returns a list of picts for the slides. Each pict has
-the given @racket[width] and @racket[height], and @racket[condense?]
-determines whether the Slideshow program is executed in condense
-mode.
-
-If @racket[stop-after] is not @racket[#f], then the list is truncated
-after @racket[stop-after] slides are converted to picts.}
-
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/slideshow.scrbl b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/slideshow.scrbl
deleted file mode 100644
index 896c3b980c..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/slideshow.scrbl
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang scribble/doc
-@(require "ss.rkt" (for-syntax racket/class))
-
-@(define paper-url "http://www.cs.utah.edu/plt/publications/jfp05-ff.pdf")
-
-@title{Slideshow: Figure and Presentation Tools}
-
-@author["Matthew Flatt" "Robert Bruce Findler"]
-
-Slideshow is a library for creating presentation slides. Unlike
-Powerpoint, Slideshow provides no WYSIWYG interface for constructing
-slides. Instead, like SliTeX, a presentation is generated by a
-program.
-
-To get started, run the @exec{slideshow} executable, and click the
-@onscreen{Run Tutorial} link.
-
-To learn more about Slideshow, see also ``Slideshow:
-Functional Presentations'' @cite["Findler06"].
-
-@defmodulelang*/no-declare[(slideshow)]{Most of the bindings defined
-in the manual are provided by the @racketmodname[slideshow] language,
-which also re-exports all of @racketmodname[racket] except for
-@racket[printable<%>] (due to backward-compatibility issues)
-and all of @racketmodname[pict].}
-
-@table-of-contents[]
-
-@; ------------------------------------------------------------------------
-
-@include-section["guide.scrbl"]
-@include-section["slides.scrbl"]
-@include-section["code.scrbl"]
-@include-section["play.scrbl"]
-@include-section["legacy.scrbl"]
-
-@(bibliography
-  (bib-entry #:key "Findler06" 
-             #:title "Slideshow: Functional Presentations"
-             #:author "Robert Bruce Findler and Matthew Flatt" 
-             #:location @elem{@italic{Journal of Functional Programming}, 16(4-5), pp. 583--619} 
-             #:date "2006" 
-             #:url paper-url))
-
-@index-section[]
diff --git a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/ss.rkt b/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/ss.rkt
deleted file mode 100644
index dcb9f77b62..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-doc/scribblings/slideshow/ss.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require scribble/manual)
-(provide (all-from-out scribble/manual))
-
-(require (for-label (except-in racket only drop)
-                    slideshow/base
-                    pict))
-(provide (for-label (all-from-out racket
-                                  slideshow/base
-                                  pict)))
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/LICENSE.txt b/pkgs/slideshow-pkgs/slideshow-exe/LICENSE.txt
deleted file mode 100644
index dc48efe83d..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-exe/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-slideshow-exe
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/info.rkt b/pkgs/slideshow-pkgs/slideshow-exe/info.rkt
deleted file mode 100644
index 4350632254..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-exe/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "compatibility-lib"
-               "gui-lib"
-               "pict-lib"
-               "slideshow-lib"))
-(define implies '("slideshow-lib"))
-
-(define pkg-desc "executables for \"slideshow\"")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/examples/big-explosion.jpg b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/examples/big-explosion.jpg
deleted file mode 100644
index fe74961360..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/examples/big-explosion.jpg and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/examples/interlocking-components.scm b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/examples/interlocking-components.scm
deleted file mode 100644
index 3968d039ca..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/examples/interlocking-components.scm
+++ /dev/null
@@ -1,328 +0,0 @@
-
-(module interlocking-components slideshow/run
-  (require mzlib/class
-           mred
-           scheme/list)
-  
-  (define-struct posn (x y) (make-inspector))
-  
-  (define between-space 20)
-
-  (define main-piece-width 200)
-  (define main-piece-height 200)
-  (define right-piece-width 200)
-  (define right-piece-height 200)
-  (define below-piece-width (+ right-piece-width between-space main-piece-width))
-  (define below-piece-height 200)
-  (define below-interpose-piece-width below-piece-width)
-  (define below-interpose-piece-height 50)
-
-  (define main-piece-dark-color "crimson")
-  (define main-piece-light-color "pink")
-  (define right-piece-dark-color "medium blue")
-  (define right-piece-light-color "sky blue")
-  (define below-piece-dark-color "forest green")
-  (define below-piece-light-color "pale green")
-  (define below-interpose-piece-dark-color "purple")
-  (define below-interpose-piece-light-color "plum")
-  
-  (define square-tooth-offset 50)
-  (define square-tooth-height 60)
-  (define square-tooth-width 50)
-  (define square-tooth-accept-space 15)
-  
-  (define pointy-tooth-offset 50)
-  (define pointy-tooth-width 100)
-  (define pointy-tooth-height 50)
-  (define pointy-tooth-accept-space 5)
-
-  (define hex-tooth-offset 50)
-  (define hex-tooth-width 100)
-  (define hex-tooth-height 50)
-  (define hex-tooth-accept-space 10)
-  (define hex-tooth-inset 20)
-
-  (slide/center
-   (page-para/c
-    "The following slide sequences was extracted"
-    "from a talk on components and contracts"))
-  
-  (define (interlocking-components)
-    (slide (make-orig #t #f ghost ghost ghost ghost ghost
-                      "A day in the life of a component software developer."
-                      "We start with one component (from web or somewhere)"))
-    
-    (slide (make-orig #t #f ident ident ghost ghost ghost
-                      "... and compose it with other software to build a system."))
-    
-    (slide (make-orig #t #f ident ghost ident ghost ghost
-                      "Except, of course, the composed pieces might not fit,"))
-    
-    (slide (make-orig #t #f ident ghost ghost ident ghost
-                      "... so the programmers develop adapters."
-                      "Now the program can be run, but what"
-                      "happens when you run it?"))
-    
-    (slide (make-orig #t #f ghost ghost ghost ghost ident
-                      "KABOOM!"))
-    
-    (slide (make-orig #t #f ident ghost ghost ident ghost
-                      "What happened? Which component failed?"))
-    
-    (slide (make-orig #f #f ident ghost ghost ident ghost
-                      "To figure that out, the programmer shouldn't have"
-                      "to understand the details of all of the"
-                      "component implementations."))
-    
-    (slide (make-orig #f #t ident ghost ghost ident ghost
-                      "Instead the grey area, where the interface"
-                      "contract specs are, should have enough"
-                      "information to figure that out.")))
-  
-  (define (make-orig dark? bkg? right bot-hex bot-pointy bot-combined explosion . text)
-    (let* ([below-pointy (below-pointy-piece dark?)]
-           [components
-            (lt-superimpose
-             (at 0
-                 0
-                 (main-piece dark?))
-             (at (+ main-piece-width between-space)
-                 0 
-                 (right (right-piece dark?)))
-             (at 0 
-                 (+ main-piece-height between-space)
-                 (bot-hex (below-hex-piece dark?)))
-             (at 0 
-                 (+ main-piece-height between-space)
-                 (bot-pointy (below-pointy-piece dark?)))
-             (at 0
-                 (+ main-piece-height between-space) 
-                 (bot-combined (below-interpose-piece dark?)))
-             (at 0
-                 (+ main-piece-height between-space below-interpose-piece-height between-space) 
-                 (bot-combined
-                  below-pointy)))]
-           [combined
-            (cc-superimpose
-             (if bkg?
-                 (overlay-background 
-                  "light gray"
-                  (overlay-striped-background
-                   "dark gray"
-                   10 
-                   components))
-                 components)
-             (explosion big-explosion-pict))])
-      (vc-append
-       40
-       combined
-       (apply page-para text))))
-
-                                   
-  (define big-explosion-pict (bitmap "big-explosion.jpg"))
-
-  (define (at x y pict) (hc-append (blank x 0) (vc-append (blank 0 y) pict)))
-  
-  (define (main-piece dark?)
-    (polygon
-     (if dark? main-piece-dark-color main-piece-light-color)
-     (make-posn 0 0)
-     (make-posn main-piece-width 0)
-     (offset-posns main-piece-width square-tooth-offset (square-tooth #t))
-     (make-posn main-piece-width main-piece-height)
-     (offset-posns pointy-tooth-offset main-piece-height (reverse (hex-tooth #t)))
-     (make-posn 0 main-piece-height)
-     (make-posn 0 0)))
-  
-  (define (below-pointy-piece dark?)
-    (polygon
-     (if dark? below-piece-dark-color below-piece-light-color)
-     (make-posn 0 0)
-     (offset-posns pointy-tooth-offset 0 (pointy-tooth #f))
-     (make-posn below-piece-width 0)
-     (make-posn below-piece-width below-piece-height)
-     (make-posn 0 below-piece-height)
-     (make-posn 0 0)))
-  
-  (define (below-hex-piece dark?)
-    (polygon
-     (if dark? below-piece-dark-color below-piece-light-color)
-     (make-posn 0 0)
-     (offset-posns hex-tooth-offset 0 (hex-tooth #f))
-     (make-posn below-piece-width 0)
-     (make-posn below-piece-width below-piece-height)
-     (make-posn 0 below-piece-height)
-     (make-posn 0 0)))
-  
-  (define (below-interpose-piece dark?)
-    (polygon
-     (if dark? below-interpose-piece-dark-color below-interpose-piece-light-color)
-     (make-posn 0 0)
-     (offset-posns pointy-tooth-offset 0 (hex-tooth #f))
-     (make-posn below-interpose-piece-width 0)
-     (make-posn below-interpose-piece-width below-interpose-piece-height)
-     (offset-posns hex-tooth-offset below-interpose-piece-height (reverse (pointy-tooth #t)))
-     (make-posn 0 below-interpose-piece-height)
-     (make-posn 0 0)))
-  
-  (define (right-piece dark?)
-    (polygon
-     (if dark? right-piece-dark-color right-piece-light-color)
-     (make-posn 0 0)
-     (offset-posns 0 square-tooth-offset (square-tooth #f))
-     (make-posn 0 right-piece-height)
-     (make-posn right-piece-width right-piece-height)
-     (make-posn right-piece-width 0)
-     (make-posn 0 0)))
-  
-  (define (polygon color . points)
-    (let ([flat-points (flatten points)])
-      (when (null? flat-points)
-        (error 'polygon "expected at least one point"))
-      (dc
-       (lambda (dc x y)
-         (let ([old-brush (send dc get-brush)])
-           (send dc set-brush (send the-brush-list find-or-create-brush color 'solid))
-           (send dc draw-polygon 
-                 (map (lambda (p) (make-object point% (posn-x p) (posn-y p))) flat-points)
-                 x 
-                 y)
-           (send dc set-brush old-brush)))
-       (get-width flat-points)
-       (get-height flat-points)
-       0
-       0)))
-  
-  (define (get-width points) (apply max (map posn-x points)))
-  (define (get-height points) (apply max (map posn-y points)))
-       
-  (define (square-tooth accept?) 
-    (list (make-posn 0
-                     (if accept?
-                         (- square-tooth-accept-space)
-                         0))
-          (make-posn (- square-tooth-width)
-                     (if accept?
-                         (- square-tooth-accept-space)
-                         0))
-          (make-posn (- square-tooth-width)
-                     (if accept?
-                         (+ square-tooth-height square-tooth-accept-space)
-                         square-tooth-height))
-          (make-posn 0 
-                     (if accept?
-                         (+ square-tooth-height square-tooth-accept-space)
-                         square-tooth-height))))
-  
-  (define (hex-tooth accept?)
-    (list (make-posn (if accept?
-                         (- hex-tooth-accept-space)
-                         0) 
-                     0)
-          (make-posn (if accept? 
-                         (- hex-tooth-inset hex-tooth-accept-space)
-                         hex-tooth-inset)
-                     (- hex-tooth-height))
-          (make-posn (if accept? 
-                         (+ (- hex-tooth-width hex-tooth-inset) hex-tooth-accept-space)
-                         (- hex-tooth-width hex-tooth-inset))
-                     (- hex-tooth-height))
-          (make-posn (if accept?
-                         (+ hex-tooth-width hex-tooth-accept-space)
-                         hex-tooth-width) 
-                     0)))
-  
-  (define (pointy-tooth accept?)
-    (list
-     (make-posn (if accept? (- pointy-tooth-accept-space) 0)
-                0)
-     (make-posn (/ pointy-tooth-width 2)
-                (if accept? 
-                    (- (+ pointy-tooth-height pointy-tooth-accept-space))
-                    (- pointy-tooth-height)))
-     (make-posn (if accept?
-                    (+ pointy-tooth-accept-space pointy-tooth-width)
-                    pointy-tooth-width)
-                0)))
-
-  (define (offset-posns x y posns)
-    (map (lambda (pt) (make-posn (+ x (posn-x pt)) (+ y (posn-y pt)))) posns))
-
-  (define (overlay-striped-background color diameter pict)
-    (let* ([w (pict-width pict)]
-           [h (pict-height pict)]
-           [pt1 (make-object point% 0 0)]
-           [pt2 (make-object point% 0 0)]
-           [pt3 (make-object point% 0 0)]
-           [poly (list pt1 pt2 pt3)]
-           [bkg
-            (dc
-             (lambda (dc dx dy)
-               (let ([old-pen (send dc get-pen)]
-                     [old-brush (send dc get-brush)]
-                     [pen (send the-pen-list find-or-create-pen color 1 'solid)]
-                     [brush (send the-brush-list find-or-create-brush color 'solid)])
-                 (unless pen
-                   (error "unknown color: ~s" color))
-                 (send dc set-pen pen)
-                 (send dc set-brush brush)
-                 (let loop ([x 0]
-                            [t #f])
-                   (when (< x w)
-                     (let loop ([y 0]
-                                [t t])
-                       (when (< y h)
-                         (if t
-                             (begin
-                               (send pt1 set-x (+ x dx))
-                               (send pt1 set-y (+ y dy))
-                               (send pt2 set-x (+ x dx diameter))
-                               (send pt2 set-y (+ y dy))
-                               (send pt3 set-x (+ x dx))
-                               (send pt3 set-y (+ y dy diameter)))
-                             (begin
-                               (send pt1 set-x (+ x dx))
-                               (send pt1 set-y (+ y dy diameter))
-                               (send pt2 set-x (+ x dx diameter))
-                               (send pt2 set-y (+ y dy))
-                               (send pt3 set-x (+ x dx diameter))
-                               (send pt3 set-y (+ y dy diameter))))
-                         (send dc draw-polygon poly)
-                         (loop (+ y diameter)
-                               (not t))))
-                     (loop (+ x diameter)
-                           (not t))))
-                 (send dc set-pen old-pen)
-                 (send dc set-brush old-brush)))
-             w
-             h
-             0
-             0)])
-      (cc-superimpose bkg pict)))
-  
-  (define (overlay-background color pict)
-    (let* ([w (pict-width pict)]
-           [h (pict-height pict)]
-           [bkg
-            (dc
-             (lambda (dc x y)
-               (let ([old-pen (send dc get-pen)]
-                     [old-brush (send dc get-brush)]
-                     [pen (send the-pen-list find-or-create-pen color 1 'solid)]
-                     [brush (send the-brush-list find-or-create-brush color 'solid)])
-                 (unless pen
-                   (error "unknown color: ~s" color))
-                 (send dc set-pen pen)
-                 (send dc set-brush brush)
-                 (send dc draw-rectangle x y w h)
-                 (send dc set-pen old-pen)
-                 (send dc set-brush old-brush)))
-             w
-             h
-             0
-             0)])
-      (cc-superimpose bkg pict)))
-  
-  (define (ident x) x)
-
-  (interlocking-components))
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/info.rkt b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/info.rkt
deleted file mode 100644
index 896dd47b4d..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define mred-launcher-libraries (list "start.rkt"))
-(define mred-launcher-names (list "Slideshow"))
-(define compile-omit-paths '("initial-ones.rkt" "examples"))
-(define test-omit-paths '("tutorial-show.rkt"))
-
-(define binary-keep-files '("tutorial-show.rkt"
-                            "initial-ones.rkt"
-                            "examples"))
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/initial-ones.rkt b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/initial-ones.rkt
deleted file mode 100644
index 874423aa2f..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/initial-ones.rkt
+++ /dev/null
@@ -1,167 +0,0 @@
-#lang racket/base
-
-;; Instead of using the `slideshow' language,
-;;  we can use scheme/base and import slideshow/base, etc.
-
-(require slideshow/base
-         pict
-         slideshow/code
-         racket/class
-         racket/list
-         racket/path
-         racket/gui/base
-         racket/runtime-path)
-
-(define-runtime-path tutorial-show "tutorial-show.rkt")
-
-(provide do-initial-slides)
-
-(define (do-initial-slides)
-
-  (slide
-   #:name "Title Slide"
-   (titlet "Slideshow Tutorial")
-   (blank)
-   (size-in-pixels
-    (bitmap (collection-file-path "PLT-206.png" "icons")))
-   (blank)
-   (colorize (it "Press the spacebar to continue") "blue")
-   (comment "Welcome to Slideshow"))
-
-  (slide
-   #:title "About Slideshow"
-   (para (bt "Slideshow")
-         "is a library for creating slide presentations")
-   (item "A Slideshow presentation is a Racket program")
-   (item "Instead of a WYSIWYG interface,"
-         "you get the power of Racket"))
-
-  (define sym:rightarrow (t "→"))
-  (define sym:leftarrow (t "←"))
-
-  (define (meta key)
-    (hbl-append (t "Alt-")
-                (if (pict? key) key (tt key))
-                (t ", Cmd-")
-                (if (pict? key) key (tt key))
-                (t ", or Meta-")
-                (if (pict? key) key (tt key))))
-
-  (slide
-   #:title "How to Control this Viewer"
-   (scale/improve-new-text
-    (table 3
-      (append-map
-       (lambda (s) (list (para #:fill? #f (car s)) (t ":") (t (cadr s))))
-       `(((,(meta "q")) "end show")
-         (("Esc") "if confirmed, end show")
-         ((,sym:rightarrow ", Space," ,(tt "f") "," ,(tt "n") ", or click") "next slide")
-         ((,sym:leftarrow ", Backspace, Delete, or" ,(tt "b")) "previous slide")
-         ((,(tt "1") "/" ,(tt "g")) "first/last slide")
-         ((,(tt "a") "/" ,(tt "s")) "previous/next slide name")
-         ((,(meta "g")) "select a slide")
-         ((,(meta "p")) "show/hide slide number")
-         ((,(meta "c")) "show/hide commentary")
-         ((,(meta "d")) "show/hide preview")
-         ((,(meta "m")) "show/hide mouse cursor")
-         ((,(hbl-append (t "Shift-") sym:rightarrow) ", etc.") "move window 1 pixel")
-         ((,(meta sym:rightarrow) ", etc.") "move window 10 pixels")))
-      lbl-superimpose lbl-superimpose
-      gap-size (/ gap-size 2))
-    0.9)
-   (comment "This window shows comments for each slide. "
-            "The comments are typically fill in the details of what "
-            "the slide presenter says when giving the talk."))
-
-  (define mytalk.rkt (tt "mytalk.rkt"))
-
-  (slide
-   #:title "Slideshow Programs"
-   (para "A Slideshow program has the form")
-   (scale/improve-new-text
-    (code #,(tt "#lang") slideshow
-          ... #,(it "code to generate slide content") ...)
-    0.9)
-   (colorize (hline (* 3/4 client-w) gap-size) "green")
-   'alts
-   (list (list (para "To run a Slideshow program,")
-               (item "Double-click the" (bt "Slideshow") "executable or run" 
-                     (tt "slideshow") "on the command line")
-               (item "Click the" (bt "Open File...") "link and select the"
-                     "Slideshow program file, such as" mytalk.rkt))
-         (list (para "Alternately, run a Slideshow program in DrRacket:")
-               (item "Open" mytalk.rkt "in DrRacket")
-               (item #:bullet (blank (+ (pict-width bullet) gap-size) 0)
-                     "DrRacket's language should change automatically to"
-                     (bt "Module"))
-               (item "Click" (bt "Run") "in DrRacket")
-               (colorize (bt "Use DrRacket only if you trust the program") "red"))
-         (parameterize ([current-para-width client-w])
-           (list (para (colorize (bt "Important security information:") "red"))
-                 (para "A slideshow program has access to the"
-                       (it "full") (it "Racket") (it "language"))
-                 (para "If you don't know the creator of a slide program"
-                       "(or if you don't trust them), run the slides through the"
-                       (bt "Slideshow") "executable or"
-                       (tt "slideshow") "command line")
-                 (colorize
-                  (para
-                   "When run in" (bt "Slideshow") "instead of DrRacket,"
-                   "a slide program cannot write files"
-                   "or make network connections")
-                  "blue")))
-         (list (para "When using a command line, you can specify the program directly:")
-               (hbl-append (tt "slideshow ") mytalk.rkt)
-               (blank)
-               (para "To print the talk:")
-               (hbl-append (tt "slideshow --print ") mytalk.rkt)
-               (blank)
-               (colorize
-                (para #:align 'right (it "Run") (tt "slideshow --help") (it "for more options"))
-                "blue"))))
-
-  (define (sub-para . l)
-    (colorize (para #:width (* 3/4 (current-para-width)) l) "blue"))
-
-  (slide
-   #:title "Slides and Picts"
-   (para "The body of a Slideshow program")
-   (item #:bullet (bt " 1.")
-         "Makes and combines" (hbl-append (bit "pict") (t "s")))
-   (sub-para "For example,")
-   (code (t "Hello"))
-   (sub-para "creates a pict like this:")
-   (colorize (t "Hello") "black")
-   (item #:bullet (bt " 2.") "Registers certain picts as slides")
-   (sub-para "For example,")
-   (code (slide (t "Hello")))
-   (sub-para "registers a slide containing only" (colorize (t "Hello") "black")))
-
-  (slide
-   #:title "The Rest of the Tutorial"
-   (para "The rest of this tutorial (starting with the next slide) is meant to"
-         "be viewed while reading the program source")
-   (blank)
-   (para #:width client-w "The source is")
-   (let ([s (path->string tutorial-show)])
-     (clickback
-      (scale/improve-new-text
-       (let ([p (tt s)])
-         (colorize
-          (pin-over p 0 (pict-height p)
-                    (linewidth 2 (hline (pict-width p) 2)))
-          "blue"))
-       (min 1 (/ (* 0.8 client-w ) (pict-width (tt s)))))
-      (lambda ()
-        (let* ([f (new frame% [label (path-element->string
-                                      (file-name-from-path tutorial-show))]
-                       [width 600] [height 400])]
-               [e (new text%)]
-               [c (new editor-canvas% [parent f] [editor e])])
-          (send e load-file s)
-          (send e change-style
-                (make-object style-delta% 'change-family 'modern)
-                0 'end)
-          (send f show #t))))))
-
-  )
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.creator b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.creator
deleted file mode 100644
index 8dfd6081c3..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.creator
+++ /dev/null
@@ -1,2 +0,0 @@
-PSlS
-(This code is registered with Apple.)
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.desktop b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.desktop
deleted file mode 100644
index 3bc95da9f7..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Slideshow
-GenericName=Slide-presentation tool
-Comment=Slideshow is a Racket-based tool for writing slide presentations as programs
-Terminal=false
-Type=Application
-Categories=Graphics;Presentation;
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.icns b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.icns
deleted file mode 100644
index 581e34f7bd..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.icns and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.ico b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.ico
deleted file mode 100644
index 5cdbffdb2d..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.ico and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.rkt b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.rkt
deleted file mode 100644
index 0dc47a62cd..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/start.rkt
+++ /dev/null
@@ -1,127 +0,0 @@
-(module start slideshow/slideshow
-  (require slideshow/start-param
-           planet/config
-           mred
-           mzlib/class)
-
-  (module test racket/base)
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; Path utilities
-
-  (define (resolve-path/complete p base)
-    (let ([p2 (resolve-path p)])
-      (if (complete-path? p2)
-	  p2
-	  (path->complete-path p2 base))))
-
-  (define (normal-path p)
-    (let loop ([p (simplify-path (expand-path (path->complete-path p)))])
-      (let-values ([(base name dir?) (split-path p)])
-	(if (path? base)
-	    (let ([base (loop base)])
-	      (let ([p (build-path base name)])
-		(resolve-path/complete p base)))
-	    (resolve-path/complete p base)))))
-
-  (define (same-path? a b)
-    (let-values ([(abase aname adir?) (split-path a)]
-		 [(bbase bname bdir?) (split-path b)])
-      (and (equal? aname bname)
-	   (or (equal? abase bbase)
-	       (and (path? abase)
-		    (path? bbase)
-		    (same-path? abase bbase))))))
-
-  (define (sub-path? a b)
-    (let-values ([(abase aname adir?) (split-path a)]
-		 [(bbase bname bdir?) (split-path b)])
-      (or (and (equal? aname bname)
-	       (or (and (not abase) (not bbase))
-		   (and (path? abase)
-			(path? bbase)
-			(same-path? abase bbase))))
-	  (and (path? abase)
-	       (sub-path? abase b)))))
-      
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; Loader with security guard
-
-  (define (load-content content)
-    (unless (trust-me?)
-      (current-security-guard
-       (make-security-guard (current-security-guard)
-			    (lambda (who what mode)
-                              (when (memq 'write mode)
-                                (unless (let ([np-what (normal-path what)])
-                                          (or (sub-path? np-what (normal-path (find-system-path 'temp-dir)))
-                                              (equal? np-what (normal-path (LINKAGE-FILE)))))
-                                  (error 'slideshow
-                                         "slide program attempted to write to filesystem: ~e"
-                                         what)))
-			      (when (memq 'execute mode)
-                                (error 'slideshow
-				       "slide program attempted to execute external code: ~e"
-				       what)))
-			    (lambda (who where-name where-port-num mode)
-			      (error 'slideshow
-				     "slide program attempted to make a network connection")))))
-    (define content-path (path->complete-path content))
-    (dynamic-require content-path #f)
-    (ormap (lambda (sm)
-             (define submod-path `(submod ,content-path ,sm))
-             (and (module-declared? submod-path #t)
-                  (begin
-                    (dynamic-require submod-path #f)
-                    #t)))
-           '(slideshow main)))
-
-  (when (file-to-load)
-    (load-content (string->path (file-to-load))))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; Run tutorial
-
-  (unless (most-recent-slide)
-    (let ([link (lambda (label thunk)
-		  (clickback (colorize 
-			      (let ([p (t label)])
-				(refocus (vc-append p
-						    (linewidth 2 (hline (pict-width p) 2)))
-					 p))
-			      "blue")
-			     thunk))])
-      (slide/center
-       (hc-append
-	(* 4 gap-size)
-	(titlet "Welcome to Slideshow")
-	(vl-append
-	 gap-size
-	 (page-para* (link "Run Tutorial"
-			   (lambda ()
-			     (retract-most-recent-slide)
-			     (load-content
-			      (collection-file-path "tutorial-show.rkt" "slideshow")))))
-	 (page-para* (link "Open File..."
-			   (lambda ()
-			     (let ([file (get-file)])
-			       (when file
-				 (retract-most-recent-slide)
-				 (let-values ([(base name dir?) (split-path file)])
-				   (current-directory base))
-				 (load-content file))))))
-	 (blank)
-	 (page-para* (link "Quit"
-			   (lambda ()
-			     (exit))))))
-       (blank)
-       (blank)
-       (parameterize ([current-main-font `(italic . ,main-font)]
-		      [current-font-size (floor (* #e0.8 (current-font-size)))])
-	 (if (eq? (system-type) 'unix)
-	     (page-para* "To start a talk directly,"
-			 "provide the talk file as a command-line" 
-			 "argument")
-	     (page-para* "To start a talk directly,"
-			 "drag the talk file onto the" (bt "Slideshow")
-			 "application icon")))))))
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/tutorial-show.rkt b/pkgs/slideshow-pkgs/slideshow-exe/slideshow/tutorial-show.rkt
deleted file mode 100644
index 8c69ad6b81..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-exe/slideshow/tutorial-show.rkt
+++ /dev/null
@@ -1,882 +0,0 @@
-#lang slideshow
-
-;; This example slideshow code is meant to be read while
-;;  running the example show.
-
-;; The first few slides are not to be read
-;; until you have seen the rest of the tutorial,
-;; so we put them in a separate file
-(require "initial-ones.rkt")
-(do-initial-slides)
-
-;; The rest is meant for reading, as you view the slides
-
-;; The first slide that's meant to be read
-(slide
- (t "Part I: Basic Concepts"))
-
-;; The second slide
-(slide
- (t "This slide shows how four picts")
- (t "get vertically appended by the")
- (tt "slide")
- (t "function to create and install a slide"))
-
-;; Etc.
-(slide
- (t "See how the")
- (tt "t")
- (t "function takes a string and")
- (t "produces a pict with a normal sans-serif font, but")
- (tt "tt")
- (t "produces a pict with a fixed-width font?"))
-
-(slide
- #:layout 'top
- (t "The")
- (tt "#:layout 'top") 
- (t "option for")
- (tt "slide")
- (t "aligns the slide to the screen top"))
-
-(slide
- #:title "Titles"
- (t "The")
- (tt "#:title") 
- (t "option for")
- (tt "slide")
- (t "supplies a title string"))
-
-(slide
- #:title "Paragraphs"
- (para "Breaking up text into lines is painful, so"
-       "the" (tt "para")
-       "function takes a mixture of strings and"
-       "picts and puts them into a pagaraph")
- (para "It doesn't matter how strings are broken into"
-       "parts in the code")
- (para "The" (tt "para") "function puts space"
-       "between separate strings"
-       ", but not before punctuation" "!"))
-
-(slide
- #:title "Paragraph Alignment"
- (para "The" (tt "slide") "function centers"
-       "body picts horizontally, but" (tt "para")
-       "makes a picture with left-aligned text")
- (frame (para "The" (tt "frame") "function wraps a frame"
-              "around a pict to create a new pict,"
-              "so you can easily see this individual pict")))
-
-(slide
- #:title "More Paragraph Alignment"
- (frame
-  (para #:align 'center
-        "The" (tt "#:align 'center") "option for" (tt "para") "generates"
-        "a paragraph with centered lines of text"))
- (frame
-  (para #:fill? #f "This line uses the" (tt "#:fill? #f") "option"))
- (para "The" (tt "#:fill? #f") "option creates a paragraph"
-            "that is wrapped to fit the slide, but it allows"
-            "the resulting pict to be more narrow than the slide"))
-
-(parameterize ([current-para-width (* 4/5 client-w)])
-  (let ([apply-para-to-example
-         (lambda (fill?)
-           (para #:fill? fill? #:align 'right
-                 "This paragraph is right-aligned using" 
-                 (tt "#:align 'right") ", and" (tt "#:fill?")
-                 "is" (tt "#f") "the first time and"
-                 (tt "#t") "the second time"))])
-    (slide
-     #:title "More Alignment"
-     (frame
-      (para #:align 'right "Of course, there's also" (tt "#:align 'right")))
-     (frame (apply-para-to-example #f))
-     (para "For comparision, the same text using the default" (tt "#:fill?") ":")
-     (frame (apply-para-to-example #t))
-     (para "Unless your font happens to make the"
-           "first line exactly as the allowed width, the last box will be slightly"
-           "wider with extra space to the left"))))
-
-(slide
- #:title "Paragraph Width"
- (para "The" (tt "para") "function by default makes the"
-       "paragraph take 2/3 of the slide width")
- (para #:width 300 
-       "The" (tt "para") "function also accepts an explicit"
-       (tt "#:width") "option, which is 300 for this paragraph"))
-
-(slide
- #:title "Spacing"
- (para "The" (tt "slide") "functions insert space"
-            "between each body pict")
- (para "The amount of space is" (number->string (current-gap-size))
-            ", which is the value of" (tt "(current-gap-size)")
-            ", which defaults to" (tt "gap-size")))
-
-(slide
- #:title "Controlling Space"
- (vc-append (* gap-size 2)
-            (para "If you want to control the space,"
-                       "simply append the picts yourself to create"
-                       "one body pict")
-            (para "The first argument to" (tt "vc-append")
-                       "determines the space between pictures")
-            (para "If the first argument is a pict instead of"
-                       "a number, then 0 is used")
-            (para "For text in one paragraph, the"
-                       (tt "para") "function uses" (tt "(current-line-sep)")
-                       ", which returns" (number->string (current-line-sep)))))
-
-(slide
- #:title "Appending Picts"
- (vl-append (current-line-sep)
-            (frame (t "This is")) (frame (tt "vl-append")))
- (vc-append (current-line-sep)
-            (frame (t "This is")) (frame (tt "vc-append")))
- (vr-append (current-line-sep)
-            (frame (t "This is")) (frame (tt "vr-append"))))
-
-(slide
- #:title "Horizontal Appending"
- (hc-append (frame (t "This is")) (frame (vr-append (tt "hc-append")
-                                                    (t "obviously"))))
- (ht-append (frame (t "This is")) (frame (vr-append (tt "ht-append")
-                                                    (t "obviously"))))
- (hb-append (frame (t "This is")) (frame (vr-append (tt "hb-append")
-                                                    (t "obviously")))))
-
-(slide
- #:title "Text Alignment"
- (hbl-append (frame (scale (tt "hbl-append") 1.5))
-             (frame (t "aligns text baselines")))
- (para "It's especially useful for font mixtures")
- (hbl-append (frame (scale (tt "htl-append") 1.5))
-             (frame (t "is the same for single lines")))
- (para "The difference between" (tt "htl-append")
-            "and" (tt "hbl-append") "shows up with multiple lines:")
- (hbl-append (frame (scale (t "bottom lines align") 1.5))
-             (frame (vl-append (t "when using") (tt "hbl-append"))))
- (htl-append (frame (scale (t "top lines align") 1.5))
-             (frame (vl-append (t "when using") (tt "htl-append")))))
-
-(slide
- #:title "Superimposing"
- (cc-superimpose (t "X") (t "O"))
- (para "The" (tt "cc-superimpose") 
-            "function puts picts on top of each other, centered")
- (para "Each of" (tt "l") "," (tt "r") ", and" (tt "c")
-            "is matched with each of"
-            (tt "t") "," (tt "b") "," (tt "c") "," (tt "bl") ", and" (tt "tl")
-            "in all combinations with" (tt "-superimpose"))
- (para "For example," (tt "cbl-superimpose") ":")
- (cbl-superimpose (frame (scale (t "one line") 1.5))
-                  (frame
-                   (colorize (vl-append (t "two")
-                                        (t "lines"))
-                             "blue"))))
-
-(slide
- (cc-superimpose 
-  (frame (blank client-w client-h))
-  (vc-append gap-size
-             (t "By definition, the screen is 1024 x 768 units")
-             (t "If you have more or less pixels, the image is scaled")
-             (para #:fill? #f
-                   "There's a margin, so the ``client'' area is"
-              (number->string client-w) "x" (number->string client-h))
-             (para #:fill? #f
-                   "The font size is" (number->string (current-font-size))))))
-
-(slide
- #:title "Titled Client Area"
- (rb-superimpose
-  (cc-superimpose
-   (frame titleless-page)
-   (para #:fill? #f
-         "If you use a title, then" (tt "titleless-page")
-         "is the same size as the area left for the body"))
-  (t "It's useful")))
-
-(slide
- #:title "Text and Styles"
- (para "Functions exist for" (bt "bold") ","
-            (it "italic") ", and even" (bit "bold-italic") "text")
- (para "The" (tt "text") "function gives you more direct control over the"
-            (text "font" '(italic . modern) (current-font-size)) ","
-            (text "size" (current-main-font) 24) ", and even"
-            (text "angle" (current-main-font) (current-font-size) (/ 3.14159 4))))
-
-(require slideshow/code)
-(slide
- #:title "Racket Code"
- (para "For Racket code, the" (code slideshow/code)
-            "library provides a handy" (code code) "macro for"
-            "typesetting literal code")
- (para "The" (code code) "macro uses source-location information"
-            "to indent code")
- (code (define (length l)
-         (cond
-          [(null? l) 0]
-          [else (+ 1 (length (cdr l)))]))))
-
-(slide
- #:title "Colors"
- (para "Use the" (colorize (tt "colorize") "blue")
-            "function to color most things, including text")
- (frame
-  (colorize (para "A" (code colorize)
-                       "applies only to sub-picts that do not"
-                       "already have a" (colorize (t "color") "green"))
-            "red")))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Part II starts here
-
-(define outline 
-  (let ([sub-para (lambda l
-                    (para #:width (* 3/4 (current-para-width)) l))])
-    (make-outline
-     'one "Part I: Basic Concepts" 
-     #f
-     
-     'two "Part II: Practical Slides" 
-     (lambda (tag)
-       (sub-para "Using" (code make-outline) "and more..."))
-     
-     'three "Part III: Fancy Picts" 
-     (lambda (tag)
-       (sub-para "Creating interesting graphics"))
-     
-     'four "Part IV: Advanced Slides" 
-     (lambda (tag)
-       (sub-para "Beyond" (code 'next) "and" (code 'alts)))
-     
-     'background "Part V: Controlling the Background"
-     (lambda (tag)
-       (sub-para "Changing the overall look of your talk"))
-
-     'printing "Part VI: Printing"
-     (lambda (tag)
-       (sub-para "Exporting slides as PostScript"))
-
-     'end "Conclusion" 
-     (lambda (tag)
-       (sub-para "This is the end")))))
-
-
-(outline 'two)
-
-(slide
- #:title "Itemize"
- (item "Bulleted sequences are common in slides")
- (item "The" (code item) "function makes a bulleted"
-            "paragraph that is as wide as the slide")
- (item #:bullet (colorize (tt "+") "green")
-       "You can set the bullet, if you like, by using the"
-       (code #:bullet) "argment to" (code item))
- (subitem "Naturally, there is also" (code subitem)))
-
-(slide
- #:title "Itemize"
- (para "You could write" (code item) "yourself:")
- (code (define (item . l)
-         (let ([w (- client-w
-                     (pict-width bullet) 
-                     (/ gap-size 2))])
-           (htl-append (/ gap-size 2)
-                       bullet
-                       (para #:width w l)))))
- (para "where" (code bullet) "is a constant pict:" bullet))
-
-(slide
- #:title "Grouping and Space"
- (para "Sometimes you want to group items on a slide")
- (item "A bullet goes with a statement")
- (item "And another does, too")
- (blank)
- (para "Creating a zero-sized pict with" (code (blank))
-            "effectively doubles the gap, making a space that"
-            "often looks right"))
-
-(slide
- #:title "Steps"
- (item "Suppose you want to show only one item at a time")
- 'next
- (item "In addition to body picts, the" (code slide) 
-            "functions recognize certain staging symbols")
- (item "Use" (code 'next) "in a sequence of" (code slide)
-            "arguments to create multiple slides, one"
-            "containing only the preceding content, and another"
-            "with the remainder")
- 'next
- (blank)
- (colorize
-  (para #:fill? #f
-        (code 'next) "is not tied to" (code item)
-        ", though it's often used with items")
-  "blue"))
-
-
-(slide
- #:title "Alternatives"
- (para "Steps can break up a linear slide, but sometimes"
-            "you need to replace one thing with something else")
- 'alts 
- (list (list 
-        (para #:fill? #f "For example, replace this..."))
-       (list
-        (para #:fill? #f "... with something else")
-        'next
-        (blank)
-        (item "An" (code 'alts) "in a sequence"
-                   "must be followed by a list of lists")
-        (item "Each list is a sequence, a different conclusion for the slide's sequence")))
- (item "Anything after the list of lists is folded into the last alternative")
- 'next
- (blank)
- (para "Of course, you can mix" (code 'alts) "and"
-            (code 'next) "in interesting ways"))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Part III starts here
-(outline 'three)
-
-(slide
- #:title "Fancy Picts"
- (para "In part I, we saw some basic pict constructors:" 
-            (code t) "," (code vl-append) ", etc.")
- (blank)
- (para "Slideshow provides many more..."))
-
-(slide
- #:title "Bitmaps"
- (para "For example, the" (code bitmap) "function loads a bitmap to display")
- (blank)
- (bitmap (build-path (collection-path "icons") "plt.gif")))
-
-(require mred) ; for message-box
-(slide
- #:title "Clickbacks"
- (para "The" (code clickback)
-            "function attaches an arbitrary thunk to a pict"
-            "for interactive slides")
- (blank)
- (clickback (frame (t "Click Me"))
-            (lambda ()
-              (message-box "Clicked" "Thanks!"))))
-
-(define (note . l)
-  (colorize (para #:align 'right l) "blue"))
-
-(slide
- #:title "Tables"
- (para "The" (code table) "function makes rows and columns")
- (frame
-  (inset
-   (table 3 ; three columns
-          (list (t "First") (standard-fish (* 2 gap-size) gap-size) (code cons)
-                (t "Second") (jack-o-lantern (* 4 gap-size)) (code car)
-                (t "Third") (cloud (* 3 gap-size) gap-size) (code cdr)
-                (t "Fourth") (file-icon (* 2 gap-size) (* 3 gap-size) #t) (code null?))
-          (list* lc-superimpose  ; left-align first column
-                 cc-superimpose) ; h-center the rest
-          cc-superimpose ; v-center all rows
-          gap-size  ; separate all columns by gap-size
-          gap-size) ; separate all rows by gap-size
-   gap-size))
- (note "The above also uses" (code standard-fish) ","
-       (code jack-o-lantern) "," (code cloud) ", and"
-       (code file-icon)))
-
-(define orientations 
-  (map (lambda (x) (* pi x)) '(0 1/4 1/2 3/4 1 5/4 6/4 7/4)))
-(define (show-arrows code-arrow t-arrow arrow)
-  (slide
-   #:title "Arrows"
-   (para "The" code-arrow "function creates an"
-              t-arrow "of a given size and orientation (in radians)")
-   (blank)
-   (para "Simple: " (arrow gap-size pi))
-   (blank)
-   (para "Fun:")
-   (apply
-    vc-append
-    (current-line-sep)
-    (map (lambda (shift)
-           (colorize
-            (apply hc-append gap-size (map (lambda (o) 
-                                             ;; Here's the other use of arrow
-                                             (arrow gap-size (+ o (* shift pi 1/32))))
-                                           orientations))
-            (scale-color (add1 shift) "green")))
-         '(0 1 2 3 4 5 6 7)))
-   (blank)
-   (note "(That's 64 uses of " code-arrow ")")))
-(show-arrows (code arrow) (t "arrow") arrow)
-(show-arrows (code arrowhead) (t "arrowhead") arrowhead)
-
-(require pict/face)
-(slide
- #:title "Faces"
- (para "The" (code pict/face)
-            "library makes faces")
- (blank)
- (hc-append
-  (* 3 gap-size)
-  (face 'happy "yellow")
-  (face 'badly-embarrassed)))
-
-
-(slide
- #:title "Arbitrary Drawing"
- (para "The" (code dc) "function provides an escape hatch to the underlying"
-            (code racket/draw) "library")
- (para "For example," (code (disk 100)) "is the same as")
- (code
-  (dc (lambda (dc dx dy)
-        (send dc draw-ellipse dx dy 100 100))
-      100 100 0 0))
- (dc (lambda (dc dx dy)
-       (send dc draw-ellipse dx dy 100 100))
-     100 100 0 0)
- (disk 100))
-
-(slide
- #:title "Frames"
- (item "As we've already seen, the" (code frame)
-            "function wraps a" (frame (t "frame"))
-            "around a pict")
- (item "The" (code #:color)
-            "option wraps a" (frame (t "colored frame") #:color "red")
-            "; compare to" (code frame) "followed by" (code colorize)
-            "," (colorize (frame (t "like this")) "red"))
- (blank)
- (item "One way to increase the" (linewidth 3 (frame (t "line thickness")))
-            "is to use" (code linewidth))
- (blank)
- (item "It's often useful to" (frame (inset (t "add space") 3))
-            "around a pict with" (code inset) "before framing it"))
-
-(define (bound-frame p)
-  (frame p #:color "green"))
-
-(slide
- #:title "Lines and Pict Dimensions"
- (item "The" (code hline) "function creates a horizontal line, given a bounding width and height:")
- (bound-frame (hline (* 2 gap-size) gap-size))
- (note "(The" (code hline) "result is framed in green above)")
- (item "Naturally, there's also" (code vline) ":")
- (bound-frame (vline (* 2 gap-size) gap-size))
- (blank)
- (item "To" (let ([p (t "underline")])
-                   (vc-append p (hline (pict-width p) 1)))
-            "a pict, get its width using" (code pict-width)
-            ", then use" (code hline) "and" (code vc-append))
- (item "If the pict is text, you can restore the"
-            (let ([p (t "baseline")])
-              (refocus 
-               (vc-append p (hline (pict-width p) 1))
-               p))
-            "using" (code refocus)))
-
-(slide
- #:title "Placing Picts"
- (item "Another" (let ([p (t "underline strategy")])
-                        (pin-over p 0 (pict-height p) (hline (pict-width p) 1)))
-            "is to use" (code pin-over) ", which places one pict on"
-            "top of another to generate a new pict")
- (item "The new pict has the"
-            (bound-frame
-             (let ([p (t "original")])
-               (pin-over p 0 (pict-height p) (hline (pict-width p) 1))))
-            "pict's bounding box and baselines")
- (note "(The green frame is the ``bounding box'' of the result)")
- (blank)
- (item "The" (code pin-over) "function is useful with" (code pip-arrow-line)
-            "to draw an"
-            (let ([p (bound-frame (inset (t "outgoing arrow") 2))])
-              (pin-over p (/ (pict-width p) 2)  (/ (pict-height p) 2) 
-                        ;; pip-arrow-line creates a pict where the
-                        ;; "bounding box" corresponds to the non-arrow end
-                        (linewidth 3 (colorize (pip-arrow-line 50 50 gap-size) "orange"))))
-            "without changing the layout"))
-
-(define blue-fish (standard-fish (* 3 gap-size) (* 2 gap-size) 
-                                 #:direction 'right 
-                                 #:color "blue" 
-                                 #:eye-color "white"))
-(define plain-file (file-icon (* 2 gap-size) (* 3 gap-size) #t))
-(define fish-file-scene (bound-frame 
-                         (inset (ht-append (* 4 gap-size) 
-                                           blue-fish 
-                                           (inset plain-file 0 (* 2 gap-size) 0 0))
-                                gap-size)))
-
-(slide
- #:title "Finding Picts"
- (para "Typically, an arrow needs to go from one pict to another")
- (para "Functions like" (code rc-find) "locate a point of a pict (such as ``right center'') inside a larger pict")
- (let-values ([(fdx fdy) (rc-find fish-file-scene blue-fish)]
-              [(adx ady) (lt-find fish-file-scene plain-file)])
-   (pin-over fish-file-scene
-             fdx fdy
-             (colorize
-              (pip-arrow-line (- adx fdx) (- ady fdy) gap-size)
-              "orange")))
- (para "There's a" (code -find) "function for every combination of"
-            (code l) "," (code c) ", and" (code r)
-            "with" (code t) "," (code c) "," (code b)
-            "," (code bl) ", and" (code tl)))
-
-(slide
- #:title "Connecting with Arrows"
- (para "Actually, straight-arrow combinations are so common that"
-            "Slideshow provides"
-            (code pin-arrow-line))
- (pin-arrow-line gap-size fish-file-scene
-                 blue-fish rc-find
-                 plain-file lt-find
-                 #:color "orange"))
-
-(require pict/balloon)
-(slide
- #:title "Balloons"
- (para "The" (code pict/balloon)
-            "library provides cartoon balloons ---"
-            "another reason to use" (code -find) "functions")
- (let* ([orig fish-file-scene]
-        [w/fish (pin-balloon (wrap-balloon (t "Fish") 'ne 0 (- gap-size))
-                             orig blue-fish cb-find)]
-        [w/file (pin-balloon (wrap-balloon (t "File") 'nw (* -2 gap-size) 0)
-                             w/fish
-                             plain-file rc-find)])
-   w/file))
-
-(slide
- #:title "Ghosting"
- (para "The" (code ghost) "function turns a picture invisible")
- (para "For example, the figure on the left and the"
-            "figure on the right are the same size, because the"
-            "right one uses the" (code ghost) "of the left one")
- (let ([big-circle (circle 350)]
-       [small-circle (circle 200)])
-   (hc-append
-    30
-    (bound-frame big-circle)
-    (bound-frame
-     (lt-superimpose
-      small-circle
-      (rt-superimpose
-       small-circle
-       (lb-superimpose
-        small-circle
-        (rb-superimpose
-         small-circle
-         (ghost big-circle)))))))))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Utilities for running additional examples
-
-(define (mk-link s)
-  (let ([p (t s)])
-    (colorize
-     (pin-over p 0 (pict-height p)
-               (linewidth 2 (hline (pict-width p) 2)))
-     "blue")))
-
-(define (run-example-talk f)
-  (let ([c (make-custodian)])
-    (parameterize ([current-namespace (make-gui-namespace)]
-                   [current-command-line-arguments
-                    (vector (path->string
-                             (build-path (collection-path "slideshow")
-                                         "examples"
-                                         f)))]
-                   [current-custodian c]
-                   [exit-handler (lambda (v)
-                                   (custodian-shutdown-all c))]
-                   [current-directory (build-path (collection-path "slideshow")
-                                                  "examples")])
-      (parameterize ([current-eventspace (make-eventspace)])
-        (queue-callback
-         (lambda () (dynamic-require 'slideshow/start #f)))))))
-
-(require mred/edit)
-(define (show-example-code f)
-  (new-text-frame (path->string (build-path (collection-path "slideshow")
-                                            "examples"
-                                            f))))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Part IV
-(outline 'four)
-
-(define (in-picture-slide show-fish show-file show-link)
-  (slide
-   #:title "In-Picture Sequences"
-   (para "Although" (code 'next) "and" (code 'alts)
-              "can create simple sequences, use procedure"
-              "abstraction and" (code ghost) "to create"
-              "complex sequences inside pict assemblies")
-   (let* ([orig fish-file-scene]
-          [w/fish (pin-balloon (wrap-balloon (t "Fish") 'ne 0 (- gap-size))
-                               (ghost orig) blue-fish cb-find)]
-          [w/file (pin-balloon (wrap-balloon (t "File") 'nw (* -2 gap-size) 0)
-                               (ghost w/fish) plain-file rc-find)])
-     (cc-superimpose orig
-                     (show-fish w/fish)
-                     (show-file w/file)))
-   (blank)
-   (blank)
-   (blank)
-   (show-link
-    (para #:align 'right
-          "Larger example:" 
-          (clickback (mk-link "run")
-                     (lambda ()
-                       (run-example-talk "interlocking-components.scm")))
-          (clickback (mk-link "code")
-                     (lambda ()
-                       (show-example-code "interlocking-components.scm")))))))
-
-(define (ident x) x)
-(in-picture-slide ghost ghost ghost)
-(in-picture-slide ident ghost ghost)
-(in-picture-slide ident ident ident)
-
-(define (encloud p)
-  (refocus
-   (cc-superimpose
-    (cloud (* 9/8 (pict-width p))
-           (* 3/2 (pict-height p))
-           "light gray")
-    p)
-   p))
-
-(require slideshow/step)
-(void
- (with-steps
-  (intro basic-stx example-steps with-vonly with-vafter the-rest)
-  (slide
-   #:title "Named Steps"
-   (para "The" (code slideshow/step)
-              "library provides a" (code with-steps)
-              "form to better express complex sequences")
-   (lt-superimpose
-    ((vonly basic-stx)
-     (code (with-steps
-            (_step-name ...)
-            _slide-expr)))
-    ((vonly example-steps)
-     (code (with-steps
-            (intro detail conclusion)
-            _slide-expr)))
-    ((vafter with-vonly)
-     (code (with-steps
-            (intro detail conclusion)
-            code:blank
-            #,(encloud
-               (cc-superimpose
-                ((vonly with-vonly)
-                 (code ((vonly intro)
-                        (t "For a start..."))))
-                ((vafter with-vafter)
-                 (code ((vafter detail)
-                        (t "like this"))))))))))
-   (blank)
-   (lt-superimpose
-    ((vonly basic-stx)
-     (para "A" (code with-steps) "form has a sequences of step names"
-                "followed by an expression to evaluate once for each step"))
-    ((vonly example-steps)
-     (para "For example, the above has three steps:"
-                (code intro) "," (code detail)
-                ", and" (code conclusion)))
-    ((vonly with-vonly)
-     (vl-append
-      gap-size
-      (para "In the body expression, use"
-                 (code ((vonly _step-name) _pict-expr))
-                 "to make" (code _pict-expr)
-                 "visible only during" (code _step-name))
-      (para "The expression" (code (vonly _step-name))
-                 "produces either" (code ghost)
-                 "or the identity function")))
-    ((vonly with-vafter)
-     (para "Use"
-                (code ((vafter _step-name) _pict-expr))
-                "to make" (code _pict-expr)
-                "visible after" (code _step-name)))
-    ((vonly the-rest)
-     (para "There's also" (code vbefore) "," (code vbetween) ", and more"))))))
-
-
-(define smiley (face 'happy))
-(define desc (para "The" (code #:timeout)
-                        "option causes a slide to auto-advance,"
-                        "which can be used for animations."))
-
-(define (scroll-slide timeout t)
-  (slide
-   #:title "Animations"
-   #:timeout timeout
-   desc
-   (let ([p (hc-append (* 3 gap-size) 
-                       (ghost smiley)
-                       (ghost smiley))])
-     (pin-over p
-               (* t (- (pict-width p) (pict-width smiley)))
-               0
-               smiley))
-   (blank)
-   ((if (equal? t 1) values ghost)
-    (para "(The face moved from left to right)"))))
-(scroll-slide #f 0)
-(for ([i (in-range 9)])
-  (scroll-slide 0.05 (/ (add1 i) 10.0)))
-(scroll-slide #f 1)
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Background
-
-;; A pict to use behind the main content
-(define fade-bg
-  (let ([w (+ (* 2 margin) client-w)]
-        [h (+ (* 2 margin) client-h)]
-        [trans (make-object brush% "white" 'transparent)]
-        [inside (make-object brush% "white" 'solid)])
-    (inset (dc (lambda (dc x y)
-                 (let ([b (send dc get-brush)]
-                       [p (send dc get-pen)]
-                       [draw-one
-                        (lambda (i)
-                          (send dc draw-rectangle
-                                (+ x i) (+ y i)
-                                (- w (* 2 i)) (- h (* 2 i))))])
-                   (send dc set-brush trans)
-                   (color-series 
-                    dc margin 1
-                    (make-object color% "black")
-                    (make-object color% "white")
-                    draw-one
-                    #t #t)
-                   (send dc set-brush inside)
-                   (draw-one margin)
-                   (send dc set-pen p)
-                   (send dc set-brush b)))
-               w h 0 0)
-           (- margin))))
-
-(define orig-assembler (current-slide-assembler))
-
-;; Normally, you'd set the slide assembler at the beginning
-;;  of a talk and never change it
-(current-slide-assembler
- (lambda (s v-sep c)
-   (lt-superimpose
-    fade-bg
-    (let ([c (colorize c "darkred")])
-      (if s
-          (vc-append v-sep 
-                     ;; left-aligns the title:
-                     (para (titlet s)) 
-                     c)
-          c)))))
-
-(outline 'background)
-
-(slide
- #:title "Controlling the Background"
- (para "The" (code current-slide-assembler)
-            "parameter lets you change the overall look of a slide")
- (para "For this slide and the previous one, the assembler")
- (item "Colorizes the uncolored content as dark red")
- (item "Left-aligns the title")
- (item "Draws a fading box around the slide"))
-
-(current-slide-assembler orig-assembler)
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Printing and Condensing
-(outline 'printing)
-
-(slide
- #:title "Printing"
- (para "To export a set of slides as PostScript, "
-            "use the" (tt "slideshow") "command-line program:")
- (tt "slideshow --print mytalk.rkt")
- (blank)
- (para "Slideshow steps through slides while producing PostScript pages")
- (para "The slides will look bad on the screen --- because"
-            "text is measured for printing instead of screen display"
-            "--- but the PostScript will be fine"))
-
-(slide
- #:title "Condensing"
- (para "Often, it makes sense to eliminate" (code 'step)
-            "staging when printing slides:")
- (tt "slideshow --print --condense mytalk.rkt")
- (blank)
- 'next
- (para "You can also condense without printing")
- (tt "slideshow --condense mytalk.rkt")
- 'next
- (blank)
- (para "For example, in condensed form, this slide appears"
-            "without steps"))
-
-(slide
- #:title "Steps and Condensing"
- (para "If you condense these slides,"
-            "the previous slide's steps will be skipped")
- 'next!
- (para "Not this slide's steps, because it uses" (code 'next!)))
-
-(slide
- #:title "Condensing Alternatives"
- (para "Condensing" (it "does not") "merge" (code 'alts) "alternatives")
- (para "But sometimes you want condensing to just use the last alternative")
- 'alts~
- (list (list (t "um..."))
-       (list (para
-              (code 'alts~) "creates alternatives where only the last one"
-              "is used when condensing"))))
-
-(slide
- #:title "Condensing Steps"
- (para "The" (code slideshow/step)
-            "provides" (code with-steps~)
-            "where only the last step is included when condensing")
- (para "Also, a" (code with-steps) "step name that"
-            "ends with" (code ~) "is skipped when condensing"))
-
-(slide
- #:title "Printing and Condensing Your Own Abstractions"
- (para "You can customize your slides using" (code printing?)
-            "and" (code condensing?))
- (blank)
- (para "This particular slide is"
-            (if printing? "printed" "not printed")
-            "and"
-            (if condense? "condensed" "not condensed"))
- (blank)
- (para "When you skip a whole slide, use"
-            (code skip-slides) "to keep page numbers in sync"))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Conclusion starts here
-(outline 'end)
-
-(slide
- #:title "Your Own Slides"
- (para "A Slideshow presentation is a Racket program in a module,"
-            "so to make your own:")
- (scale/improve-new-text ; a macro that improves font selection
-  (code #,(tt "#lang") slideshow
-        ... #,(it "your code here") ...)
-  0.9)
- (blank)
- (para "For further information, search for"
-            (tt "slideshow") "in the documentation"))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/LICENSE.txt b/pkgs/slideshow-pkgs/slideshow-lib/LICENSE.txt
deleted file mode 100644
index fb21c67b0c..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-slideshow-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/info.rkt b/pkgs/slideshow-pkgs/slideshow-lib/info.rkt
deleted file mode 100644
index 62aabf3970..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/info.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base"
-               "compatibility-lib"
-               "draw-lib"
-               "pict-lib"
-               "gui-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"slideshow\"")
-
-(define pkg-authors '(mflatt robby))
-
-(define version "1.1")
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/HISTORY.txt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/HISTORY.txt
deleted file mode 100644
index 14839ef1d0..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/HISTORY.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Version 1.1
-Moved detailed-change recording to documentation
-
-Version 1.0
-Added "spotlight" support in viewer
-slideshow/base: added set-spotlight-style!
-slideshow/pict: added 'outline style for text
-
-Older versions
-See the "Racket core" release notes for a history of changes before
- the "slideshow-lib" package was created.
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/balloon.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/balloon.rkt
deleted file mode 100644
index c540d0a1ec..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/balloon.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pict/balloon)
-(provide (all-from-out pict/balloon))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/base.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/base.rkt
deleted file mode 100644
index 20ad947c97..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/base.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-(module base scheme/base
-  (require "slide.rkt"
-           scheme/gui/base
-           (only-in "core.rkt"
-                    sliderec?
-                    just-a-comment?))
-
-  (current-line-sep 5)
-
-  (case (system-type)
-    [(macosx)
-     (current-main-font '("Gill Sans" . swiss))]
-    [(windows)
-     (current-main-font '("Tahoma" . swiss))])
-  (current-para-width (* 3/4 client-w))
-
-  (current-titlet (lambda (s)
-                    (colorize (text s (current-main-font) 40)
-                              (current-title-color))))
-  (set-title-h! (pict-height (titlet "Hi")))
-  (current-title-color "black")
-
-  (provide (rename-out [slide/kw slide]
-                       [sliderec? slide?]
-                       [just-a-comment? comment?])
-           comment
-           most-recent-slide retract-most-recent-slide re-slide slide->pict start-at-recent-slide
-	   make-outline
-	   (rename-out [item/kw item]
-                       [subitem/kw subitem]
-                       [para/kw para])
-	   gap-size current-gap-size current-font-size current-line-sep
-	   current-main-font current-title-color
-	   size-in-pixels
-	   t it bt bit tt titlet tt* rt
-	   bullet o-bullet
-	   margin set-margin! 
-	   client-w client-h
-	   full-page titleless-page
-	   printing? condense?
-	   skip-slides
-	   set-use-background-frame!
-	   enable-click-advance!
-	   title-h set-title-h! current-slide-assembler
-	   current-page-number-font current-page-number-color current-page-number-adjust
-           current-titlet current-para-width
-	   set-page-numbers-visible! done-making-slides
-           set-spotlight-style!
-           pict->pre-render-pict
-           clickback interactive make-slide-inset slide-inset? apply-slide-inset))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/cmdline.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/cmdline.rkt
deleted file mode 100644
index 5626248ff5..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/cmdline.rkt
+++ /dev/null
@@ -1,226 +0,0 @@
-(module cmdline racket/base
-  (require mzlib/class
-           mzlib/unit
-           mzlib/file
-           mzlib/contract
-           mred
-           racket/cmdline
-           texpict/mrpict
-           texpict/utils
-           mzlib/math
-           "sig.rkt"
-           (prefix-in start: "start-param.rkt"))
-
-  (provide cmdline@)
-
-  (define-unit cmdline@
-    (import)
-    (export (prefix final: cmdline^))
-    
-    (define-values (screen-w screen-h) (values 1024 768))
-    (define base-font-size 32)
-
-    (define-values (actual-screen-w actual-screen-h) (get-display-size #t))
-    (define-values (use-screen-w use-screen-h) (values actual-screen-w actual-screen-h))
-
-    (define condense? #f)
-    (define printing-mode #f)
-    (define commentary? #f)
-    (define commentary-on-slide? #f)
-    (define show-gauge? #f)
-    (define keep-titlebar? #f)
-    (define show-page-numbers? #t)
-    (define show-time? #f)
-    (define quad-view? #f)
-    (define pixel-scale (if quad-view? 1/2 1))
-    (define print-slide-seconds? #f)
-    (define use-offscreen? #t)
-    (define use-transitions? use-offscreen?)
-    (define talk-duration-minutes #f)
-    (define trust-me? #f)
-    (define no-squash? #t)
-    (define two-frames? #f)
-    (define use-prefetch? #t)
-    (define use-prefetch-in-preview? #f)
-    (define print-target #f)
-    (define smoothing? #t)
-    (define screen-number 0)
-    (define right-half-screen? #f)
-    (define zero-margins? #f)
-    (define letterbox-color "black")
-    
-    (define init-page 0)
-
-    (define no-stretch? #f)
-    (define screen-set? #f)
-    
-    (define (die name . args)
-      (eprintf "~a: ~a\n" name (apply format args))
-      (exit -1))
-    
-    (define file-to-load
-      (command-line
-       #:program "slideshow"
-       #:once-each
-       (("-M" "--monitor") monitor "display to <monitor> (count from 0)"
-	 (let ([n (string->number monitor)])
-	   (unless (and n (exact-nonnegative-integer? n))
-	     (die 'slideshow "argument to -M is not an exact non-negative integer: ~a" monitor))
-	   (set! screen-number n)))
-        (("-d" "--preview") "show next-slide preview (useful on a non-mirroring display)" 
-         (set! two-frames? #t))
-        (("-p" "--print") "print"
-         (set! printing-mode 'print))
-        (("-P" "--ps") "print to PostScript"
-         (set! printing-mode 'ps))
-        (("-D" "--pdf") "print to PDF"
-         (set! printing-mode 'pdf))
-        (("-o") file "set output file for PostScript or PDF printing"
-         (set! print-target file))
-        (("-c" "--condense") "condense"
-         (set! condense? #t))
-        (("-t" "--start") page "set the starting page"
-         (let ([n (string->number page)])
-           (unless (and n (exact-positive-integer? n))
-             (die 'slideshow "argument to -t is not a positive exact integer: ~a" page))
-           (set! init-page (sub1 n))))
-        (("-q" "--quad") "show four slides at a time"
-         (set! quad-view? #t)
-         (set! pixel-scale 1/2))
-        (("-n" "--no-stretch") "don't stretch the slide window to fit the screen"
-                               (set! no-stretch? #t))
-        (("-s" "--size") w h "use a <w> by <h> window"
-         (let ([nw (string->number w)]
-               [nh (string->number h)])
-           (unless (and nw (< 0 nw 10000))
-             (die 'slideshow "bad width: ~e" w))
-           (unless (and nh (< 0 nh 10000))
-             (die 'slideshow "bad height: ~e" h))
-           (set! screen-set? #t)
-           (set! actual-screen-w nw)
-           (set! actual-screen-h nh)))
-        (("-a" "--squash") "scale to full window, even if not 4:3 aspect"
-         (set! no-squash? #f))
-        (("-z" "--zero-margins") "when printing, draw the slides right to the edge of the page"
-                                 (set! zero-margins? #t))
-        (("-m" "--no-smoothing") 
-         "disable anti-aliased drawing (usually faster)"
-         (set! smoothing? #f))
-        (("-i" "--immediate") "no transitions"
-         (set! use-transitions? #f))
-        (("--trust") "allow slide program to write files and make network connections"
-         (set! trust-me? #t))
-        (("--no-prefetch") "disable next-slide prefetch"
-         (set! use-prefetch? #f))
-        (("--preview-prefetch") "use prefetch for next-slide preview"
-         (set! use-prefetch-in-preview? #t))
-        (("--keep-titlebar") "give the slide window a title bar and resize border"
-         (set! keep-titlebar? #t))
-        (("--right-half-screen") "display slides on right half of the screen"
-         (set! right-half-screen? #t)
-         (set! keep-titlebar? #t)
-         (set! actual-screen-w (/ actual-screen-w 2)))
-        (("--comment") "display commentary in window"
-         (set! commentary? #t))
-        (("--comment-on-slide") "display commentary on slide"
-         (set! commentary? #t)
-         (set! commentary-on-slide? #t))
-        (("--letterbox") color
-                         "set the color of the letter box; default to black"
-                         (set! letterbox-color color))
-        (("--time") "time seconds per slide" (set! print-slide-seconds? #t))
-        (("--clock") "show clock" (set! show-time? #t))
-        #:ps
-        "After requiring <slide-module-file>, if a `slideshow' submodule exists,"
-        " it is required. Otherwise, if a `main' submodule exists, it is required."
-        #:args ([slide-module-file #f])
-        slide-module-file))
-
-    (define printing? (and printing-mode #t))
-
-    (unless (zero? screen-number)
-      (define-values (w h) (get-display-size #t #:monitor screen-number))
-      (unless screen-set?
-        (set!-values (actual-screen-w actual-screen-h) (values w h)))
-      (set!-values (use-screen-w use-screen-h) (values w h)))
-
-    (when no-stretch?
-      (when (> actual-screen-w screen-w)
-        (set! actual-screen-w screen-w)
-        (set! actual-screen-h screen-h)))
-
-    (when (or printing-mode condense?)
-      (set! use-transitions? #f))
-
-    (when printing-mode
-      (set! use-offscreen? #f)
-      (set! use-prefetch? #f)
-      (set! keep-titlebar? #t))
-
-    (when (and (not printing-mode) zero-margins?)
-      (raise-user-error 'slideshow "The --zero and -z flags may be used only when printing"))
-    
-    (dc-for-text-size
-     (if printing-mode
-         (let ([p (let ([pss (make-object ps-setup%)])
-                    (send pss set-mode 'file)
-                    (send pss set-file
-                          (if print-target
-                              print-target
-                              (let ([suffix
-                                     (if (eq? printing-mode 'pdf)
-                                         "pdf"
-                                         "ps")])
-                                (if file-to-load
-                                    (path-replace-suffix (file-name-from-path file-to-load)
-                                                         (format
-                                                          (if quad-view?
-                                                              "-4u.~a"
-                                                              ".~a")
-                                                          suffix))
-                                    (format "untitled.~a" suffix)))))
-                    (when zero-margins? (send pss set-margin 0 0))
-                    (send pss set-orientation 'landscape)
-                    (parameterize ([current-ps-setup pss])
-                      (case printing-mode
-                        [(print)
-                         ;; Make printer-dc%
-                         (when (can-get-page-setup-from-user?)
-                           (let ([v (get-page-setup-from-user)])
-                             (if v
-                                 (send pss copy-from v)
-                                 (exit))))
-                         (make-object printer-dc% #f)]
-                        [(ps)
-                         (make-object post-script-dc% (not print-target) #f #t #f)]
-                        [(pdf)
-                         (make-object pdf-dc% (not print-target) #f #t #f)])))])
-           ;; Init page, set "screen" size, etc.:
-           (unless (send p ok?) (exit))
-           (send p start-doc "Slides")
-           (send p start-page)
-           (set!-values (actual-screen-w actual-screen-h) (send p get-size))
-           p)
-         
-         ;; Bitmaps give same size as the screen:
-         (make-object bitmap-dc% (make-object bitmap% 1 1))))
-
-    (start:trust-me? trust-me?)
-    (start:file-to-load file-to-load)
-
-    (set!-values (use-screen-w use-screen-h)
-                 (if no-squash?
-                     (if (< (/ actual-screen-w screen-w)
-                            (/ actual-screen-h screen-h))
-                         (values actual-screen-w
-                                 (floor (* (/ actual-screen-w screen-w) screen-h)))
-                         (values (floor (* (/ actual-screen-h screen-h) screen-w))
-                                 actual-screen-h))
-                     (values actual-screen-w actual-screen-h)))
-
-    ;; We need to copy all exported bindings into the final:
-    ;; form. Accumulating a unit from context and then invoking
-    ;; it is one way to do that...
-    (define-unit-from-context final@ cmdline^)
-    (define-values/invoke-unit final@ (import) (export (prefix final: cmdline^)))))
-
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/code-pict.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/code-pict.rkt
deleted file mode 100644
index 03e88fa744..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/code-pict.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pict/code)
-(provide (all-from-out pict/code))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/code.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/code.rkt
deleted file mode 100644
index 1276e88f7d..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/code.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require "slide.rkt"
-         "code-pict.rkt")
-
-(provide (all-from-out "code-pict.rkt"))
-
-(get-current-code-font-size current-font-size)
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/core.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/core.rkt
deleted file mode 100644
index 94660504fc..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/core.rkt
+++ /dev/null
@@ -1,1119 +0,0 @@
-
-(module core scheme/base
-  (require scheme/class
-           scheme/unit
-           scheme/file
-           racket/draw
-           texpict/mrpict
-           texpict/utils
-           scheme/math
-	   "sig.ss"
-	   "private/utils.ss")
-
-  (provide core@ 
-	   zero-inset)
-
-  ;; We create structs just once, so that all instances of the 
-  ;; core share the types.
-  (define/provide-struct sliderec (drawer        ; dc<%> x y -> void
-				   title         ; string
-				   comment       ; #f or just-a-comment
-				   page          ; int
-				   page-count    ; int
-				   inset         ; sinset
-				   [transitions  ; canvas% bitmap% -> 'went or delay-msecs
-                                    #:mutable]
-                                   timeout))     ; msecs
-  (define/provide-struct just-a-comment (content)) ; content is list of strings and picts
-  (define/provide-struct sinset (l t r b))
-  (define/provide-struct click-region (left top right bottom thunk show-click?))
-  (define/provide-struct interact (left top right bottom proc)
-    ;; transparent for hashing:
-    #:transparent)
-
-  (define zero-inset (make-sinset 0 0 0 0))
-      
-  (define-unit core@
-      (import config^ (prefix viewer: viewer^))
-      (export (rename core^ 
-                      (local:condense? condense?)
-                      (local:printing? printing?)))
-
-      ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;                    Setup                      ;;
-      ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-      (define local:condense? condense?)
-      (define local:printing? printing?)
-
-      (define font-size base-font-size)
-      (define gap-size (* 3/4 font-size))
-      (define current-gap-size (make-parameter gap-size))
-      (define line-sep 2)
-      (define title-size (+ font-size 4))
-      (define main-font (if (and (not printing?)
-				 (string=? (get-family-builtin-face 'default) " Sans"))
-			    'default
-			    'swiss))
-      (define current-main-font (make-parameter main-font))
-
-      (define current-line-sep (make-parameter line-sep))
-
-      (define commentary-content-scale 0.8)
-
-      (when (not (and (= use-screen-w screen-w)
-		      (= use-screen-h screen-h)
-		      (= pixel-scale 1)
-		      (not commentary-on-slide?)))
-	(let ([c-scale (if commentary-on-slide?
-			   commentary-content-scale
-			   1)])
-	  (current-expected-text-scale (list (* (/ use-screen-w screen-w) pixel-scale c-scale)
-					     (* (/ use-screen-h screen-h) pixel-scale c-scale)))))
-
-      (define red "red")
-      (define green "forest green")
-      (define blue "blue")
-      (define purple "purple")
-      (define orange "orange")
-
-      (define current-font-size (make-parameter 
-				 font-size
-				 (lambda (x)
-				   (unless (and (number? x)
-						(integer? x)
-						(exact? x)
-						(positive? x))
-				     (raise-argument-error 'current-font-size "nonnegative-exact-integer?" x))
-				   x)))
-
-      (define current-title-color (make-parameter
-				   green
-				   (lambda (x)
-				     (unless (or (string? x)
-						 (x . is-a? . color%))
-				       (raise-argument-error 'current-title-color
-                                                             "(or/c string? (is-a?/c color%))"
-                                                             x))
-				     x)))
-
-      (define (t s) (text s (current-main-font) (current-font-size)))
-      (define (it s) (text s `(italic . ,(current-main-font)) (current-font-size)))
-      (define (bt s) (text s `(bold . ,(current-main-font)) (current-font-size)))
-      (define (bit s) (text s `(bold italic . ,(current-main-font)) (current-font-size)))
-      (define (tt s) (text s '(bold . modern) (current-font-size)))
-      (define (rt s) (text s 'roman (current-font-size)))
-
-      (define current-titlet
-        (make-parameter
-         (lambda (s)
-           (colorize (text s 
-                           `(bold . ,(current-main-font)) 
-                           title-size)
-                     (current-title-color)))))
-          
-      (define (titlet s) ((current-titlet) s))
-
-      (define (with-font f k)
-	(parameterize ([current-main-font f])
-	  (k)))
-
-      (define (tt* . l) (apply vl-append (current-line-sep) (map tt l)))
-
-      (define bullet (if (send (dc-for-text-size) glyph-exists? #\u2022)
-			 (t "\u2022")
-			 (baseless
-			  (cc-superimpose (disk (/ gap-size 2)) 
-					  (blank 0 gap-size)))))
-      (define o-bullet (baseless
-			(cc-superimpose (circle (/ gap-size 2)) 
-					(blank 0 gap-size))))
-
-
-      (define margin 20)
-      (define-values (client-w client-h) (values (- screen-w (* margin 2))
-						 (- screen-h (* margin 2))))
-      (define full-page (blank client-w client-h))
-      (define title-h (pict-height (titlet "Hi")))
-      (define (mk-titleless-page)
-	(inset full-page 0 (- 0 title-h (* 2 gap-size)) 0 0))
-      (define titleless-page (mk-titleless-page))
-
-      (define (set-margin! m)
-	(set! margin m)
-	(set! client-w (- screen-w (* 2 margin)))
-	(set! client-h (- screen-h (* 2 margin)))
-	(set! full-page (blank client-w client-h))
-	(set! titleless-page (mk-titleless-page)))
-      (define (get-margin) margin)
-      (define (get-client-w) client-w)
-      (define (get-client-h) client-h)
-      (define (get-full-page) full-page)
-      (define (get-titleless-page) titleless-page)
-
-      (define (set-title-h! h)
-	(set! title-h h)
-	(set! titleless-page (mk-titleless-page)))
-      (define (get-title-h) title-h)
-
-      (define (set-use-background-frame! on?)
-	(viewer:set-use-background-frame! (and on? #t)))
-
-      (define (enable-click-advance! on?)
-	(viewer:enable-click-advance! (and on? #t)))
-
-      (define (set-page-numbers-visible! on?)
-	(viewer:set-page-numbers-visible! (and on? #t)))
-
-      (define (set-spotlight-style! #:size [size #f] #:color [color #f])
-        (viewer:set-spotlight-style! #:size size #:color color))
-
-      (define (pict->pre-render-pict p)
-        (viewer:pict->pre-render-pict p))
-
-      (define current-page-number-font 
-	(make-parameter
-	 (make-object font% 10 'default 'normal 'normal)
-	 (lambda (f)
-	   (unless (f . is-a? . font%)
-	     (raise-argument-error 'current-page-number-font "(is-a?/c font%)" f))
-	   f)))
-      (define current-page-number-color 
-	(make-parameter (make-object color% "black")
-			(lambda (s)
-			  (unless (s . is-a? . color%)
-			    (raise-argument-error 'current-page-number-color "(is-a?/c color%)" s))
-			  s)))
-      (define current-page-number-adjust (make-parameter 
-                                          (λ (n s) s)
-                                          (lambda (f)
-                                            (unless (procedure-arity-includes? f 2)
-                                              (raise-argument-error 'current-page-number-adjust "(procedure-arity-includes/c 2)" f))
-                                            f)))
-      
-      (define page-number 1)
-
-      (define (add-commentary p comment)
-	(if commentary-on-slide?
-	    (let ([p (scale (frame
-			     (inset (let ([tp (launder full-page)])
-				      (refocus (lt-superimpose p tp) tp))
-				    margin))
-			    commentary-content-scale)]
-		  [t (if comment
-			 (let ([comments (let loop ([l (just-a-comment-content comment)]
-						    [current-line null])
-					   (cond
-					    [(null? l) (list (reverse current-line))]
-					    [(pict? (car l))
-					     (loop (cdr l) (cons (car l) current-line))]
-					    [else (let ([m (regexp-match #rx"^(.*?)(?:\n|\r\n|\r)[ \t]*(.*)$" (car l))])
-						    (if m
-							(cons
-							 (reverse (cons (cadr m) current-line))
-							 (loop (cons (caddr m) (cdr l))
-							       null))
-							(loop (cdr l) (cons (car l) current-line))))]))])
-			   (parameterize ([current-font-size 9])
-			     (apply vl-append
-				    1
-				    (map (lambda (l) 
-					   (apply para (- (* screen-w (- 1 commentary-content-scale))
-							  margin margin 2)
-						  l))
-					 comments))))
-			 (blank))])
-	      (ht-append 2 p t))
-	    p))
-
-      (define (add-slide! pict title comment page-count inset timeout)
-	(viewer:add-talk-slide! 
-	 (make-sliderec (make-pict-drawer (add-commentary pict
-							  comment))
-			title 
-			comment
-			page-number
-			page-count
-			inset
-			null
-                        timeout))
-	(set! page-number (+ page-number page-count)))
-
-      (define (skip-slides n)
-	(set! page-number (+ page-number n)))
-
-      (define (evenize-width p)
-	(let ([w (pict-width p)])
-	  ;; Force even size:
-	  (inset p 0 0 (+ (- (ceiling w) w)
-			  (modulo (ceiling w) 2)) 0)))
-
-      (define (apply-slide-inset sinset pict)
-	(inset pict 
-	       (- (sinset-l sinset))
-	       (- (sinset-t sinset))
-	       (- (sinset-r sinset))
-	       (- (sinset-b sinset))))
-
-      (define (do-add-slide! content title comment page-count inset timeout)
-	(add-slide!
-	 (ct-superimpose
-	  (apply-slide-inset inset full-page)
-	  content)
-	 title
-	 comment
-	 page-count
-	 inset
-         timeout))
-
-      (define default-slide-assembler
-	(lambda (s v-sep p)
-	  (apply vc-append v-sep
-		 (if s
-		     (list (evenize-width (if (pict? s) s (titlet s))) p)
-		     (list p)))))
-
-      (define current-slide-assembler
-	(make-parameter default-slide-assembler))
-
-      (define-struct name-only (title))
-      (define-struct name+title (name title))
-
-      (define (one-slide/title/inset do-add-slide! use-assem? process v-sep skipped-pages s inset timeout a-gap-size . x) 
-	(let-values ([(x c)
-		      (let loop ([x x][c #f][r null])
-			(cond
-			 [(null? x) (values (reverse r) c)]
-			 [(just-a-comment? (car x))
-			  (loop (cdr x) (car x) r)]
-			 [else
-			  (loop (cdr x) c (cons (car x) r))]))])
-	  (let ([content ((if use-assem?
-			      (current-slide-assembler)
-			      default-slide-assembler)
-                          (if (name+title? s)
-                              (name+title-title s)
-                              (and (not (name-only? s)) 
-                                   s))
-			  v-sep
-			  (apply vc-append 
-				 a-gap-size
-				 (map evenize-width (process x))))])
-	    (do-add-slide!
-	     content
-	     (cond
-              [(name-only? s) (name-only-title s)]
-              [(name+title? s) (name+title-name s)]
-              [else s])
-	     c
-	     (+ 1 skipped-pages)
-	     inset
-             timeout))))
-
-      (define (slide-error nested string . args)
-	(apply error
-	       (let loop ([nested nested])
-		 (if (null? nested)
-		     'slide*
-		     (string->symbol (format "~a of ~a" (car nested) (loop (cdr nested))))))
-	       string
-	       args))
-
-      (define (do-slide/title/tall/inset do-add-slide! use-assem? skip-ok? skip-all? process v-sep s 
-                                         inset timeout a-gap-size . x)
-	;; Check slides:
-	(let loop ([l x][nested null])
-	  (or (null? l)
-	      (cond
-	       [(pict? (car l)) (loop (cdr l) nested)]
-	       [(just-a-comment? (car l)) (loop (cdr l) nested)]
-	       [(memq (car l) '(next next!)) (and (or (pair? l) 
-						      (slide-error nested "argument sequence contains 'next at end"))
-						  (loop (cdr l) nested))]
-	       [(memq (car l) '(alts alts~)) (and (or (pair? (cdr l))
-						      (slide-error nested "argument sequence contains '~a at end" (car l)))
-						  (let ([a (cadr l)])
-						    (and (or (list? a)
-							     (slide-error nested "non-list after '~a: ~e" (car l) a))
-							 (andmap (lambda (sl)
-								   (unless (list? sl)
-								     (slide-error nested "non-list in list after '~a: ~e" 
-										  (car l) sl))
-								   (loop sl (cons (car l) nested)))
-								 a)))
-						  (loop (cddr l) nested))]
-	       [(eq? (car l) 'nothing) (loop (cdr l) nested)]
-	       [else #f])
-	      (slide-error nested "argument sequence contains a bad element: ~e" (car l))))
-
-        (skip-slides
-         (let loop ([l x][r null][comment #f][skip-all? skip-all?][skipped 0])
-           (cond
-            [(null? l) 
-             (if skip-all?
-                 (add1 skipped)
-                 (begin
-                   (apply one-slide/title/inset do-add-slide! use-assem? process v-sep skipped s 
-                          inset timeout a-gap-size (reverse r))
-                   0))]
-            [(memq (car l) '(nothing))
-             (loop (cdr l) r comment skip-all? skipped)]
-            [(memq (car l) '(next next!))
-             (let ([skip? (or skip-all? (and condense? skip-ok? (eq? (car l) 'next)))])
-               (let ([skipped (if skip?
-                                  (add1 skipped)
-                                  (begin
-                                    (apply one-slide/title/inset do-add-slide! use-assem? process v-sep skipped s 
-                                           inset timeout a-gap-size (reverse r))
-                                    0))])
-                 (loop (cdr l) r comment skip-all? skipped)))]
-            [(memq (car l) '(alts alts~)) 
-             (let ([rest (cddr l)])
-               (let aloop ([al (cadr l)][skipped skipped])
-                 (cond
-                  [(null? al) ;; only happens when al starts out null
-                   (loop rest r comment skip-all? skipped)]
-                  [(null? (cdr al))
-                   (loop (append (car al) rest) r comment skip-all? skipped)]
-                  [else
-                   (let ([skip? (or skip-all? (and condense? skip-ok? (eq? (car l) 'alts~)))])
-                     (let ([skipped (loop (car al) r comment skip? skipped)])
-                       (aloop (cdr al) skipped)))])))]
-            [else (loop (cdr l) (cons (car l) r) comment skip-all? skipped)]))))
-
-      (define slide/kw 
-        (let ([slide (lambda (#:title [s #f]
-                                      #:name [name s]
-                                      #:inset [inset zero-inset]
-                                      #:timeout [timeout #f]
-                                      #:layout [layout 'auto]
-                                      #:condense? [condense-this? timeout]
-                                      #:gap-size [a-gap-size (current-gap-size)]
-                                      . body)
-                       (let ([t (if s
-                                    (if (equal? name s)
-                                        (if (string? s)
-                                            (decode s)
-                                            s)
-                                        (make-name+title name 
-                                                         (if (string? s)
-                                                             (decode s)
-                                                             s)))
-                                    (if name
-                                        (make-name-only name)
-                                        #f))])
-                         (case layout
-                           [(tall top)
-                            (apply do-slide/title/tall/inset 
-                                   do-add-slide! #t #t (and condense? condense-this?) values
-                                   (if (eq? layout 'tall)
-                                       a-gap-size 
-                                       (* 2 a-gap-size))
-                                   t
-                                   inset
-                                   timeout
-                                   a-gap-size
-                                   body)]
-                           [else ; center, auto
-                            (apply slide/title/center/inset/timeout/gap 
-                                   (or (not s) (eq? layout 'center))
-                                   (and condense? condense-this?)
-                                   t
-                                   inset 
-                                   timeout 
-                                   a-gap-size
-                                   body)]))
-                       (void))])
-          slide))
-
-      (define (make-slide-inset l t r b)
-	(make-sinset l t r b))
-
-      (define (slide/title/tall/inset/gap v-sep s inset . x)
-	(apply do-slide/title/tall/inset do-add-slide! #t #t #f values v-sep s inset #f gap-size x))
-
-      (define (slide/title/tall/inset s inset . x)
-	(apply slide/title/tall/inset/gap gap-size s inset x))
-
-      (define (slide/name/tall/inset s inset . x)
-	(apply slide/title/tall/inset (make-name-only s) inset x))
-
-      (define (slide/title/tall/gap v-sep s timeout . x)
-	(apply do-slide/title/tall/inset do-add-slide! #t #t #f values v-sep s zero-inset timeout gap-size x))
-
-      (define (slide/title/tall s . x)
-	(apply slide/title/tall/gap gap-size s #f x))
-
-      (define (slide/name/tall s . x)
-	(apply slide/title/tall (make-name-only s) x))
-
-      (define (slide/title s . x)
-	(apply slide/title/tall/gap (* 2 gap-size) s #f x))
-
-      (define (slide/title/timeout s timeout . x)
-	(apply slide/title/tall/gap (* 2 gap-size) s timeout x))
-
-      (define (slide/name s . x)
-	(apply slide/title (make-name-only s) x))
-
-      (define (slide . x)
-	(apply slide/title #f x))
-
-      (define (slide/title/inset s inset . x)
-	(apply slide/title/tall/inset/gap (* 2 gap-size) s inset x))
-
-      (define (slide/name/inset s inset . x)
-	(apply slide/title/inset (make-name-only s) inset x))
-
-      (define (slide/title/center/inset s inset . x)
-        (apply slide/title/center/inset/timeout #t #f s inset #f x))
-
-      (define (slide/title/center/inset/timeout always-center? skip-all? s inset timeout . x)
-        (apply slide/title/center/inset/timeout/gap always-center? skip-all? s inset timeout gap-size x))
-
-      (define (slide/title/center/inset/timeout/gap always-center? skip-all? s inset timeout a-gap-size . x)
-	(let ([max-width 0]
-	      [max-height 0]
-	      [combine (lambda (x)
-			 (apply vc-append a-gap-size
-				(map
-				 evenize-width
-				 x)))])
-	  ;; Run through all the slides once to measure (don't actually create slides):
-	  (apply do-slide/title/tall/inset
-		 (lambda (content title comment page-count inset timeout)
-		   (set! max-width (max max-width (pict-width content)))
-		   (set! max-height (max max-height (pict-height content))))
-		 #f
-		 #f
-                 #f
-		 (lambda (x) (list (combine x)))
-		 0 #f inset timeout a-gap-size x)
-          (let ([center? (or always-center?
-                             (max-height . < . (- client-h 
-                                                  (* 2
-                                                     (+ (* 2 a-gap-size)
-                                                        title-h)))))])
-            (apply do-slide/title/tall/inset
-                   do-add-slide!
-                   #t
-                   #t
-                   skip-all?
-                   (if center?
-                       (lambda (x)
-                         (list
-                          (cc-superimpose
-                           (apply-slide-inset inset (if (and s (not (name-only? s)))
-                                                        titleless-page 
-                                                        full-page))
-                           (ct-superimpose
-                            (blank max-width max-height)
-                            (combine x)))))
-                       values)
-                   (if center? 0 (* 2 a-gap-size))
-                   s inset timeout a-gap-size x))))
-
-      (define (slide/name/center/inset s inset . x)
-	(apply slide/title/center/inset (make-name-only s) inset x))
-
-      (define (slide/title/center s . x)
-	(apply slide/title/center/inset s zero-inset x))
-
-      (define (slide/name/center s . x)
-	(apply slide/title/center (make-name-only s) x))
-
-      (define (slide/timeout timeout . x) (apply slide/title/timeout #f timeout x))
-      (define (slide/inset inset . x) (apply slide/title/inset #f inset x))
-
-      (define (slide/center . x) (apply slide/title/center #f x))
-      (define (slide/center/inset inset . x) (apply slide/title/center/inset #f inset x))
-
-      (define (slide/center/timeout t . x)
-        (apply slide/title/center/inset/timeout #t #f #f zero-inset t x))
-
-      (define (slide/title/center/timeout s t . x)
-        (apply slide/title/center/inset/timeout #t #f s zero-inset t x))
-
-      (define most-recent-slide
-	(case-lambda
-	 [() (most-recent-slide 0)]
-	 [(n) (viewer:most-recent-talk-slide)]))
-
-      (define retract-most-recent-slide
-	(lambda ()
-	  (let ([slide (viewer:most-recent-talk-slide)])
-	    (when slide
-	      (set! page-number (sliderec-page slide))
-	      (viewer:retract-talk-slide!)
-	      slide))))
-      
-      (define re-slide
-	(lambda (s [addition #f])
-	  (unless (sliderec? s)
-	    (raise-argument-error 're-slide "slide?" s))
-	  (viewer:add-talk-slide!
-	   (make-sliderec
-	    (let ([orig (sliderec-drawer s)]
-		  [extra (if addition
-			     (make-pict-drawer 
-			      (add-commentary addition
-					      #f))
-			     void)])
-	      (lambda (dc x y)
-		(orig dc x y)
-		(extra dc x y)))
-	    (sliderec-title s)
-	    (sliderec-comment s)
-	    page-number
-	    1
-	    (sliderec-inset s)
-	    null
-            (sliderec-timeout s)))
-	  (set! page-number (+ page-number 1))))
-      
-      (define (slide->pict s)
-        (unless (sliderec? s)
-          (raise-argument-error 'slide->pict "slide?" s))
-        (let ([orig (sliderec-drawer s)])
-          (dc orig client-w client-h)))
-
-      (define (start-at-recent-slide)
-	(viewer:set-init-page! (max 0 (- page-number 2))))
-
-      (define (done-making-slides)
-	(viewer:done-making-slides))
-
-      (define (make-outline . l)
-	(define ah (arrowhead gap-size 0))
-	(define current-item (colorize (hc-append (- (/ gap-size 2)) ah ah) blue))
-	(define other-item (rc-superimpose (ghost current-item) (colorize ah "light gray")))
-        (define (to-next l)
-          (let ([l (cdddr l)])
-            (if (and (pair? l) (number? (car l)))
-                (cdr l)
-                l)))
-	(lambda (which)
-	  (slide/name
-	   (format "--~a--"
-		   (let loop ([l l])
-		     (cond
-		      [(null? l) "<unknown>"]
-		      [(eq? (car l) which)
-		       (cadr l)]
-		      [else (loop (to-next l))])))
-	   (blank (+ title-h gap-size))
-	   (lc-superimpose
-	    (blank (current-para-width) 0)
-	    (let loop ([l l])
-	      (cond
-	       [(null? l) (blank)]
-	       [else
-		(let ([current? (or (eq? which (car l)) 
-				    (and (list? (car l))
-					 (memq which (car l))))])
-		  (vc-append
-                   gap-size
-		   (page-para
-		    (hbl-append
-		     (quotient gap-size 2)
-		     (if current?
-			 current-item
-			 other-item)
-		     (let ([p (cadr l)])
-		       (if (pict? p)
-			   p
-			   (bt p)))))
-		   (let* ([rest (let ([p (loop (to-next l))]
-                                      [l (cdddr l)])
-                                  (if (and (pair? l) (number? (car l)))
-                                      (inset p 0 (car l) 0 0)
-                                      p))]
-                          [sub-items (caddr l)])
-		     (if (and current?
-			      sub-items
-			      (not (null? sub-items)))
-			 (vc-append
-			  gap-size
-			  (sub-items which)
-			  rest)
-			 rest))))]))))
-          (void)))
-
-      (define (comment . s) 
-	(make-just-a-comment s))
-
-      ;; ----------------------------------------
-
-      ;; Move separators (that shouldn't be preceded by extra space)
-      ;; at the front of a string to the end of the previous item
-      (define (shift-no-sep l)
-	(let loop ([l 
-		    ;; Flatten l, first:
-		    (let loop ([l l])
-		      (cond
-		       [(null? l) null]
-		       [(pair? (car l)) (append (loop (car l)) (loop (cdr l)))]
-		       [else (cons (car l) (loop (cdr l)))]))]
-		   [a null])
-	  ;; Combine strings:
-	  (cond
-	   [(null? l) (reverse a)]
-	   [(null? a) (loop (cdr l) (list (car l)))]
-	   [(and (string? (car l)) 
-		 (regexp-match #rx"^[-',. :;?!)\U201D\U2019]" (car l)))
-	    (let ([m (regexp-match #rx"^([^ ]*) (.*)$" (car l))])
-	      (if m
-                  (if (string? (car a))
-		      (loop (cdr l)
-			    (list* (caddr m)
-				   (string-append (car a) (cadr m))
-				   (cdr a)))
-		      (loop (cdr l)
-			    (list* (caddr m)
-				   (hbl-append (car a) (t (cadr m)))
-				   (cdr a))))
-		  (if (string? (car a))
-		      (loop (cdr l)
-			    (cons (string-append (car a) (car l))
-				  (cdr a)))
-		      (loop (cdr l)
-			    (cons (hbl-append (car a) (t (car l)))
-				  (cdr a))))))]
-	   [else (loop (cdr l) (cons (car l) a))])))
-
-      (define current-para-width (make-parameter client-w))
-
-      (define para/kw
-        (let ([para (lambda (#:width [width (current-para-width)]
-                                     #:align [align 'left]
-                                     #:fill? [fill? #t]
-                                     #:decode? [decode? #t]
-                                     . s)
-                      (let ([p (para*/align (case align
-                                              [(right) vr-append]
-                                              [(center) vc-append]
-                                              [else vl-append])
-                                            width
-                                            (if decode?
-                                                (decode s)
-                                                s))])
-                        (if fill?
-                            ((case align
-                               [(right) rtl-superimpose]
-                               [(center) ctl-superimpose]
-                               [else ltl-superimpose])
-                             (blank width 0)
-                             p)
-                            p)))])
-          para))
-
-      (define (decode s)
-        (let loop ([s s])
-          (cond
-           [(list? s) 
-            (map 
-             decode
-             ;; Remove "\n", and also cancel extra spaces after "\n":
-             (let loop ([s s])
-               (cond
-                [(null? s) null]
-                [(equal? (car s) "\n")
-                 (let nloop ([s (cdr s)])
-                   (if (and (pair? s)
-                            (string? (car s)))
-                       (let ([a (regexp-replace #rx"^ +" (car s) "")])
-                         (if (string=? a "")
-                             (nloop (cdr s))
-                             (loop (cons a (cdr s)))))
-                       (loop s)))]
-                [else (cons (car s) (loop (cdr s)))])))]
-           [(not (string? s)) s]
-           [(regexp-match-positions #rx"---" s)
-            => (lambda (m)
-                 (string-append (loop (substring s 0 (caar m)))
-                                "\u2014"
-                                (loop (substring s (cdar m)))))]
-           [(regexp-match-positions #rx"--" s)
-            => (lambda (m)
-                 (string-append (loop (substring s 0 (caar m)))
-                                "\u2013"
-                                (loop (substring s (cdar m)))))]
-           [(regexp-match-positions #px"``" s)
-            => (lambda (m)
-                 (string-append (loop (substring s 0 (caar m)))
-                                "\u201C"
-                                (loop (substring s (cdar m)))))]
-           [(regexp-match-positions #px"''" s)
-            => (lambda (m)
-                 (string-append (loop (substring s 0 (caar m)))
-                                "\u201D"
-                                (loop (substring s (cdar m)))))]
-           [(regexp-match-positions #rx"'" s)
-            => (lambda (m)
-                 (string-append (loop (substring s 0 (caar m)))
-                                "\u2019"
-                                (loop (substring s (cdar m)))))]           
-           [else s])))
-
-      (define (para*/align v-append w . s)
-	(define space (t " "))
-	(let loop ([pre #f][s (shift-no-sep s)][rest null])
-	  (cond
-	   [(null? s)
-	    (if (null? rest)
-		(or pre (blank))
-		(loop pre (car rest) (cdr rest)))]
-	   [(list? s) (loop pre (car s) (append (cdr s) rest))]
-	   [else
-	    (let* ([p (if (string? s) (t s) s)])
-	      (cond
-	       [(< (+ (if pre (pict-width pre) 0)
-		      (if pre (pict-width space) 0)
-		      (pict-width p)) 
-		   w)
-		;; small enough
-		(loop (if pre 
-			  (hbl-append pre space p) 
-			  p)
-		      rest null)]
-	       [(and (string? s) (regexp-match "(.*) (.*)" s))
-		;; can break on string
-		=> (lambda (m)
-		     (loop pre
-			   (cadr m) 
-			   (cons
-			    (caddr m)
-			    rest)))]
-	       [(not pre)
-		(if (null? rest)
-		    p
-		    (v-append
-		     (current-line-sep)
-		     p
-		     (loop #f rest null)))]
-	       [else
-		(v-append
-		 (current-line-sep)
-		 pre
-		 (loop p rest null))]))])))
-
-      (define (para* w . s)
-	(para*/align vl-append w s))
-
-      (define (para*/r w . s)
-	(para*/align vr-append w s))
-
-      (define (para*/c w . s)
-	(para*/align vc-append w s))
-
-
-      (define (para/align superimpose v-append w . s)
-	(superimpose (para*/align v-append w s)
-		     (blank w 0)))
-
-      (define (para w . s)
-	(para/align lbl-superimpose vl-append w s))
-
-      (define (para/r w . s)
-	(para/align rbl-superimpose vr-append w s))
-
-      (define (para/c w . s)
-	(para/align cbl-superimpose vc-append w s))
-
-
-      (define (page-para*/align v-append . s)
-	(para*/align v-append (current-para-width) s))
-
-      (define (page-para* . s)
-	(page-para*/align vl-append s))
-
-      (define (page-para*/r . s)
-	(page-para*/align vr-append s))
-
-      (define (page-para*/c . s)
-	(page-para*/align vc-append s))
-
-
-      (define (page-para/align superimpose v-append . s)
-	(para/align superimpose v-append (current-para-width) s))
-
-      (define (page-para . s)
-	(page-para/align lbl-superimpose vl-append s))
-
-      (define (page-para/r . s)
-	(page-para/align rbl-superimpose vr-append s))
-
-      (define (page-para/c . s)
-	(page-para/align cbl-superimpose vc-append s))
-
-      ;; ----------------------------------------
-
-      (define (l-combiner para w l)
-	(apply
-	 vl-append
-	 gap-size
-	 (map (lambda (x) (para w x)) l)))
-
-      ;; ----------------------------------------
-
-      (define item/kw
-        (let ([item (lambda (#:gap-size [a-gap-size (current-gap-size)]
-                                        #:bullet [bullet (if (eq? a-gap-size gap-size)
-                                                             bullet
-                                                             (scale bullet (/ a-gap-size gap-size)))]
-                                        #:width [width (current-para-width)]
-                                        #:align [align 'left]
-                                        #:fill? [fill? #t]
-                                        #:decode? [decode? #t]
-                                      . s)
-                      (htl-append (/ a-gap-size 2)
-                                  bullet 
-                                  (para/kw #:width (- width
-                                                      (pict-width bullet) 
-                                                      (/ a-gap-size 2)) 
-                                           #:align align
-                                           #:fill? fill?
-                                           #:decode? decode?
-                                           s)))])
-          item))
-
-      (define (item*/bullet bullet w . s)
-	(htl-append (/ gap-size 2)
-		    bullet 
-		    (para* (- w
-			      (pict-width bullet) 
-			      (/ gap-size 2)) 
-			   s)))
-
-      (define (item* w . s)
-	(apply item*/bullet bullet w s))
-
-      (define (item w . s)
-	(lbl-superimpose (item* w s)
-			 (blank w 0)))
-
-      (define (item/bullet b w . s)
-	(lbl-superimpose (item*/bullet b w s)
-			 (blank w 0)))
-
-      (define (page-item* . s)
-	(item* (current-para-width) s))
-
-      (define (page-item . s)
-	(item (current-para-width) s))
-
-      (define (page-item*/bullet b . s)
-	(item*/bullet b (current-para-width) s))
-
-      (define (page-item/bullet b . s)
-	(item/bullet b (current-para-width) s))
-
-      ;; ----------------------------------------
-
-      (define subitem/kw
-        (let ([subitem (lambda (#:gap-size [a-gap-size (current-gap-size)]
-                                           #:bullet [bullet (if (eq? gap-size a-gap-size)
-                                                                o-bullet
-                                                                (scale o-bullet (/ a-gap-size gap-size)))]
-                                           #:width [width (current-para-width)]
-                                           #:align [align 'left]
-                                           #:fill? [fill? #t]
-                                           #:decode? [decode? #t]
-                                           . s)
-                         (inset (htl-append (/ a-gap-size 2)
-                                            bullet 
-                                            (para/kw #:width (- width
-                                                                (* 2 a-gap-size)
-                                                                (pict-width bullet) 
-                                                                (/ a-gap-size 2)) 
-                                                     #:align align
-                                                     #:fill? fill?
-                                                     #:decode? decode?
-                                                     s))
-                                (* 2 a-gap-size) 0 0 0))])
-          subitem))
-
-      (define (subitem* w . s)
-	(inset (htl-append (/ gap-size 2)
-			   o-bullet 
-			   (para* (- w
-				     (* 2 gap-size)
-				     (pict-width bullet) 
-				     (/ gap-size 2)) 
-				  s))
-	       (* 2 gap-size) 0 0 0))
-
-      (define (subitem w . s)
-	(lbl-superimpose (subitem* w s)
-			 (blank w 0)))
-
-      (define (page-subitem* . s)
-	(subitem* (current-para-width) s))
-
-      (define (page-subitem . s)
-	(subitem (current-para-width) s))
-
-      ;; ----------------------------------------
-
-      (define (paras* w . l)
-	(l-combiner para* w l))
-
-      (define (paras w . l)
-	(l-combiner para w l))
-
-      (define (page-paras* . l)
-	(l-combiner (lambda (x y) (page-para* y)) (current-para-width) l))
-
-      (define (page-paras . l)
-	(l-combiner (lambda (x y) (page-para y)) (current-para-width) l))
-
-      ;; ----------------------------------------
-
-      (define (itemize w . l)
-	(l-combiner item w l))
-
-      (define (itemize* w . l)
-	(l-combiner item* w l))
-
-      (define (page-itemize . l)
-	(l-combiner (lambda (x y) (page-item y)) (current-para-width) l))
-
-      (define (page-itemize* . l)
-	(l-combiner (lambda (x y) (page-item* y)) (current-para-width) l))
-
-      ;; ----------------------------------------
-
-      (define (size-in-pixels p)
-	(if (not (and (= use-screen-w screen-w)
-		      (= use-screen-h screen-h)))
-	    (scale p 
-		   (/ screen-w use-screen-w)
-		   (/ screen-h use-screen-h))
-	    p))
-
-      ;; ----------------------------------------
-
-      (define clickback
-	(lambda (pict thunk [show-click? #t])
-	  (let ([w (pict-width pict)]
-		[h (pict-height pict)])
-	    (cons-picture*
-	     pict
-	     `((place 
-		0 0
-		,(dc (lambda (dc x y)
-		       (let-values ([(sx sy) (send dc get-scale)]
-				    [(dx dy) (send dc get-origin)])
-			 (viewer:add-click-region!
-			  (make-click-region (+ (* x sx) dx)
-					     (+ (* y sy) dy)
-					     (+ (* (+ x w) sx) dx)
-					     (+ (* (+ y h) sy) dy)
-					     thunk
-					     show-click?))))
-		     w h
-		     (pict-ascent pict)
-		     (pict-descent pict))))))))
-
-      (define interactive
-	(lambda (pict window-proc)
-	  (let ([w (pict-width pict)]
-		[h (pict-height pict)])
-	    (cons-picture*
-	     pict
-	     `((place 
-		0 0
-		,(dc (lambda (dc x y)
-		       (let-values ([(sx sy) (send dc get-scale)]
-				    [(dx dy) (send dc get-origin)])
-			 (viewer:add-interactive!
-			  (make-interact (+ (* x sx) dx)
-                                         (+ (* y sy) dy)
-                                         (+ (* (+ x w) sx) dx)
-                                         (+ (* (+ y h) sy) dy)
-                                         window-proc))))
-		     w h
-		     (pict-ascent pict)
-		     (pict-descent pict))))))))
-
-      ;; ----------------------------------------
-
-      (define (add-transition! who trans)
-	(let ([slide (viewer:most-recent-talk-slide)])
-	  (when slide
-	    (set-sliderec-transitions! slide 
-				       (append (sliderec-transitions slide)
-						(list trans))))))
-      
-      (define scroll-bm #f)
-      (define scroll-dc (make-object bitmap-dc%))
-
-      (define scroll-transition
-	(lambda (x y w h dx dy [duration 0.20] [steps 12])
-	  (add-transition! 'scroll-transition
-			   (lambda (offscreen-dc)
-			     (let* ([steps-done 0]
-				    [xs (/ use-screen-w screen-w)]
-				    [ys (/ use-screen-h screen-h)]
-				    [bcw (send (send offscreen-dc get-bitmap) get-width)]
-				    [bch (send (send offscreen-dc get-bitmap) get-height)]
-				    [mx (- margin (/ (- use-screen-w bcw) 2 xs))]
-				    [my (- margin (/ (- use-screen-h bch) 2 ys))]
-				    [x-space (ceiling (* xs (/ (abs dx) steps)))]
-				    [y-space (ceiling (* ys (/ (abs dy) steps)))]
-				    [x-in (if (positive? dx)
-					      x-space
-					      0)]
-				    [y-in (if (positive? dy)
-					      y-space
-					      0)])
-			       (unless (and scroll-bm
-					    (>= (send scroll-bm get-width) 
-						(+ x-space (* xs w)))
-					    (>= (send scroll-bm get-height) 
-						(+ y-space (* ys h))))
-				 (set! scroll-bm (make-bitmap
-						  (inexact->exact (ceiling (+ x-space (* xs w))))
-						  (inexact->exact (ceiling (+ y-space (* ys h))))))
-				 (if (send scroll-bm ok?)
-				     (send scroll-dc set-bitmap scroll-bm)
-				     (set! scroll-bm #f)))
-
-			       (when scroll-bm
-				 (send scroll-dc clear)
-				 (send scroll-dc draw-bitmap-section (send offscreen-dc get-bitmap)
-				       x-in y-in
-				       (* (+ x mx) xs) (* (+ y my) ys)
-				       (* w xs) (* h ys)))
-			       
-			       (lambda (canvas offscreen-dc)
-				 (if (or (not scroll-bm) (= steps-done steps))
-				     'done
-				     (let*-values ([(cw ch) (send canvas get-client-size)])
-				       (let ([xm (- margin (/ (- use-screen-w bcw) 2 xs))]
-					     [ym (- margin (/ (- use-screen-h bch) 2 ys))])
-					 (set! steps-done (add1 steps-done))
-					 (let ([draw
-						(lambda (dc xm ym)
-						  (send dc draw-bitmap-section
-							scroll-bm
-							(- (* (+ x xm (* dx (/ steps-done steps))) xs) x-in)
-							(- (* (+ y ym (* dy (/ steps-done steps))) ys) y-in)
-							0 0 
-							(ceiling (* xs (+ w (/ (abs dx) steps))))
-							(ceiling (* ys (+ h (/ (abs dy) steps))))))])
-					   (draw (send canvas get-dc) xm ym)
-					   (draw offscreen-dc mx my)))
-				       (/ duration steps)))))))))
-
-      (define pause-transition
-	(lambda (time)
-	  (add-transition! 'pause-transition
-			   (lambda (offscreen-dc)
-			     (let ([done? #f])
-			       (lambda (canvas offscreen-dc)
-				 (if done?
-				     'done
-				     (begin
-				       (set! done? #t)
-				       time))))))))))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/doc.txt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/doc.txt
deleted file mode 100644
index ed3075bf68..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/doc.txt
+++ /dev/null
@@ -1,683 +0,0 @@
-
-_Slideshow_ Quick Start
-=======================
-
-Stand-alone:
-
- 1. Double-click the "Slideshow" executable, or run "slideshow"
-    from the command line.
-
- 2. Click the "Tutorial" button.
-
-In DrRacket:
-
- 1. Open "tutorial-show.rkt", which is in the "slideshow" collection.
-
-    The path depends on your PLT install directory:
-       <plt install dir>/collects/slideshow/tutorial-show.rkt
-
- 2. Set DrRacket's language to "(module ...)".
-
-    Use the "Choose Language" menu item in the "Language" menu.
-
- 3. Click DrRacket's "Execute" button.
-
-
-     ---------- !! IMPORTANT SECURITY INFORMATION !! ----------
-
-   Do not run any Slideshow program in DrRacket unless you know the
-   creator of the slide program and/or trust the slide
-   program. Instead, run untrusted programs with the "Slideshow"
-   executable or "slideshow" command-line program.
-
-   A Slideshow program has access to the full PLT Scheme language,
-   which means that it can write to files and establish network
-   connections (possibly sending your private information elsewhere).
-
-   When you use the "Slideshow" executable or "slideshow" command-line
-   program, however, the slide program is prevented from writing to
-   the filesystem or creating network connections, except that writes
-   to the system temporary directory are allowed.
-
-   (The system temporary directory is determined by calling
-   `find-system-path' with 'temp-dir; file writes are checked by
-   expanding the file path to resolve all symbolic links, and then
-   checking that the path starts with the tempoary-directory path.)
-
-
-Slideshow Overview
-==================
-
-Slideshow is a library for creating presentation slides. Unlike
-Powerpoint, Slideshow provides no WYSIWYG interface for constructing
-slides. Instead, like SliTeX, a presentation is generated by a
-program.
-
-For constructing slide images, Slideshow builds on the "texpict"
-collection's utilities for constructing images. More specifically,
-all of the functions provided by `texpict/mrpict'
-are available for creating images.
-
-In addition to the "mrpict.rkt" functions, Slideshow provides functions
-for constructing paragraphs and bulleted lists, staging parts of a
-slide, managing fonts, viewing the slides, and scaling slides for a
-particular display.
-
-For boring text slides, the functions listed in this document are
-sufficient to construct slides. More interesting slides --- with
-images and diagrams --- require the more general picture-construction
-functions in "texpict".
-
-Slideshow Modules
-=================
-
-The _slideshow.rkt_ module acts as a language that includes:
-
- - the Slideshow function for creating slides (defined here)
- - all of Racket
- - texpict/mrpict
- - texpict/utils
-
-The _slide.rkt_ module is like "slideshow.rkt", but it does not
-re-provide Racket. Thus, "slide.rkt" is a non-language version of
-"slideshow.rkt", and it can be imported with `require' into a module in
-any language.
-
-The _run.rkt_ module is the same as "slideshow.rkt" for backward
-compatibility.
-
-  [The "slideshow.rkt" and "slide.rkt" modules also check the Racket
-   parameter `current-command-line-arguments' to configure the slide
-   mode.]
-
-The rest of this section repeats much of the information that is in
-"tutorial-show.rkt" (see "Quick Start" at the top of this
-documentation).
-
-The main Slideshow function is `slide/title', which adds a slide to
-the presentation with a given title and content. For example, the
-Hello World presentation can be defined by the following module:
-
- (module hello-world slideshow/slideshow
-   (slide/title
-    "How to Say Hello"
-    (t "Hello World!")))
- 
-The `t' function creates a pict containing the given text in the
-default font and style.
-
-Executing the above module pops up a slide-presentation window. Type
-Alt-q (or Meta-q) to end the slides. More controls:
-
-   Alt-q, Meta-q, or Cmd-q             :  end slide show
-   Esc                                 :  if confirmed, end show
-   Right arrow, Space, f, n, or click  :  next slide
-   Left arrow, Backspace, Delete, or b :  previous slide
-   g                                   :  last slide
-   1                                   :  first slide
-   Alt-g, Cmd-g, or Meta-g             :  select a slide
-   Alt-p, Cmd-p, or Meta-p             :  show/hide slide number
-   Alt-c, Cmd-c, or Meta-c             :  show/hide commentary
-   Alt-d, Cmd-d, or Meta-d             :  show/hide preview
-   Alt-m, Cmd-m, or Meta-m             :  show/hide mouse cursor
-   Shift with arrow                    :  move window 1 pixel
-   Alt, Meta, or Cmd with arrow        :  move window 10 pixels
-
-In general, each element after the title string for `slide/title' is a
-pict that will be centered on the slide. The picts are stacked
-vertically and top-aligned, with `gap-size' separation between each
-pict.
-
- (module hello-world slideshow/slideshow
-   (slide/title
-    "How to Say Hello"
-    (t "Hello World!")
-    (t "Goodbye Dlrow!")))
-
-The `slide/title/center' form centers the stacked picts vertically
-instead of putting them at the top of the slide:
-
- (module hello-world slideshow/slideshow
-   (slide/title/center
-    "How to Say Hello"
-    (t "Hello World!")
-    (t "Goodbye Dlrow!")))
-
-Various functions format paragraphs and generate bulleted items for
-lists. For example, `page-item' creates a bulleted paragraph that
-spaces the width of the slide:
-
- (module hello-world slideshow/slideshow
-   (slide/title
-    "How to Say Hello"
-    (page-item "If you want to create an example, you"
-               "can always do something with" (bt "Hello World!"))
-    (page-item "It's a bit silly, but a follow-up example"
-               "could be" (bt "Goodbye Dlrow!"))))
-
-In this example, `bt' is like `t', except that it makes the text bold.
-The `page-item' function accepts a mixture of strings and picts, and
-it formats them as a paragraph.
-
-Staging Slides
-==============
-
-The `slide/title' function creates a slide as a side effect. It can be
-put inside a function to abstract over a slide:
-
- (module hello-world slideshow/slideshow
-   (define (make-slide-n n)
-     (slide/title
-      "How to Generalize Slides"
-      (page-item "This is slide number" (number->string n))))
-
-   (make-slide-n 1)
-   (make-slide-n 2)
-   (make-slide-n 3))
-
-The `slide/title' function also has built-in support for some common
-multi-slide patterns. Each element argument to `slide/title' after the
-title is usually a pict, but there are a few other possibilities:
-
-  * If an element is 'next, then a slide is generated containing only
-    the preceding elements, and then the <elems> are re-processed
-    without the 'next. Multiple 'next elements generate multiple slides.
-
-  * If an element is 'alts, then the next element must be a list of
-    element lists. Each list up to the last one is appended to the
-    elements before 'alts and the resulting list of elements is
-    processed. The last lists is appended to the preceding elements
-    along with the remaining elements (after the list of lists) and the
-    result is re-processed.
-
-  * A 'nothing element is ignored (useful as a result of a branching
-    expression).
-
-  * 'next! is like 'next, except that it is preserved when condensing
-    (see below on the --condense flag).
-
-  * 'alts~ is like 'alts, except that it is *not* preserved when
-    condensing (see below on the --condense flag).
-
-  * A comment produced by `comment' is ignored, except when commentary
-    is displayed.
-
-Here's an example to illustrate how 'next and 'alts work:
-
- (module multi-step slideshow/slideshow
-  (slide/title
-   "Example"
-   (page-item "First step")
-   'NEXT
-   (page-item "Second step")
-   'NEXT
-   'ALTS
-   (list (list (page-item "Tentative third step")
-               'NEXT
-               (page-item "This isn't working... back up"))
-         (list (page-item "Third step that works")))
-   'NEXT
-   (page-item "Fourth step")))
-
-[The code above is case-insensitive; 'NEXT and 'ALTS are capitalized
- merely to stand out.]
-
-Display Size and Fonts
-======================
-
-Slideshow is configured for generating slides in 1024x768 pixel
-format. When the current display has a different size as Slideshow is
-started, the Slideshow display still occupies the entire screen, and
-pictures are scaled just before they are displayed. Thus, one picture
-unit reliably corresponds to a "pixel" that occupies 1/1024 x 1/768 of
-the screen.
-
-The `text' form for generating text pictures takes into account any
-expected scaling for the display when measuring text. (All Slideshow
-text functions, such as `t' and `page-para', are built on `text'.) In
-particular, scaling the picture causes a different font size to be
-used for drawing the slide (rather than bitmap-scaling the original
-font), and changing the font size by a factor of K does not
-necessarily scale all text dimensions equally by a factor of K
-(because, for most devices, each character must have integer
-dimensions). Nevertheless, using the `current-expected-text-scale'
-parameter, Slideshow is usually able to produce good results when the
-slide is scaled.
-
-More generally, different font sets on different platforms can change
-the way a slide is rendered. For example, the `tt' font on one
-platform might be slightly wider than on another, causing different
-line breaks, etc. Beware.
-
-Beware also of using bitmaps in slides when the presentation screen
-will not be 1024x768. In that case, consider using `size-in-pixels'
-(with the caveat that the resulting picture will take up different
-amounts of the slide on different displays).
-
-Transition Animations
-=====================
-
-Any number of transition actions can be installed after a slide is
-created and before the next slide is created. The first animation
-applies to the most recently created slide, and during presentation
-time, it starts when the next slide is requested; after all animations
-complete, the next slide appears immediately.
-
-If the presenter requests the next slide before an animation sequence
-completes, Slideshow breaks all animations and continues immediately
-to the next slide. Animations are not execute when jumping to a slide
-or moving backward through the slide set.
-
-Command-line Options
-====================
-
-The _start.rkt_ module can be invoked directly, in which case a module
-file name should be provided on the command line to provide the slide
-content. Setup PLT creates a "Slideshow" executable that runs
-"start.rkt".
-
-Thus, if the above example is in multi-step.rkt, then
-
-   slideshow multi-step.rkt
-
-runs the slides.
-
-The "Slideshow" executable accepts a number of command-line flags.
-Use the --help flag to obtain a list of other flags.
-
-Printing
-========
-
-The -p or --print command-line flag causes slideshow to print slides
-instead of showing them on the screen. On Unix, the result is
-always PostScript. For all platforms, -P or --ps generates PostScript.
-
-PS-to-PDF converters vary on how well they handle landscape
-mode. Here's a Ghostscript command that converts slides reliably
-(replace "src.ps" and "dest.pdf" with your file names, and put the
-command all on one line):
-
-  gs -q -dAutoRotatePages=/None -dSAFER -dNOPAUSE -dBATCH 
-     -sOutputFile=dest.pdf -sDEVICE=pdfwrite -c .setpdfwrite 
-     -c "<</Orientation 3>> setpagedevice" -f src.ps
-
-Procedure Reference
-===================
-
-> (slide/title title-string element ...) - Creates a titled slide. See
-  the overview for information about `element's. The space between the
-  title and content is twice `gap-size'.
-
-  When this function (or one of its variants) is first called in
-  non-printing mode, then the viewer window is opened. Furthermore,
-  each call to the function (or a variant) `yield's, so that the
-  viewer window can be refreshed, and so the user can step through
-  slides.
-
-> (slide/title/tall title-string element ...) - Like `slide/title',
-  except that the space is inserted between the title and the slide
-  content is only `gap-size'.
-
-> (slide/title/center title-string element ...) - Like `slide/title',
-  except that the slide content is centered vertically under the
-  title. If the content has steps an alternatives, each individual
-  slide's content is center-top aligned with the largest individual
-  slide's bounding box.
-
-> (slide element ...) - Like `slide/title', but without the title.
-
-> (slide/center element ...) - Like `slide/title/center', but without
-  the title.
-
-> (slide/title/inset title-string slide-inset element ...)
-> (slide/title/tall/inset title-string slide-inset element ...)
-> (slide/title/center/inset title-string slide-inset element ...)
-> (slide/inset slide-inset element ...)
-> (slide/center/inset slide-inset element ...)
-  Like `slide/title', etc., except that an inset is supplied. A slide
-  inset is created with `make-slide-inset'.
-
-> (slide/name title-string element ...)
-> (slide/name/tall title-string element ...)
-> (slide/name/center title-string element ...)
-> (slide/name/inset title-string slide-inset element ...)
-> (slide/name/tall/inset title-string slide-inset element ...)
-> (slide/name/center/inset title-string slide-inset element ...)
-  Like `slide/title', etc., except that the title string is used only
-  for naming the slide, as in the Alt-g dialog, and does not appear at
-  the top of the slide. The content area is therefore the same size as
-  `client-page'.
-
-> (slide/timeout secs element ...)
-> (slide/center/timeout secs element ...)
-> (slide/title/timeout title-string secs element ...)
-> (slide/title/center/timeout title-string secs element ...)
-  Like the versions without `/timeout', but if the slide is not
-  advanced before `secs' seconds, it advances automatically.
-  Also, manual advances (forward or backward) skip the slide.
-
-> (make-slide-inset left-inset top-inset right-inset bottom-inset) -
-  Creates a slide inset, which describes a number of pixels to inset
-  a slide on each side. Each inset must be an exact, non-negative
-  integer.
-
-> (t string) - Same as (text string (current-main-font) (current-font-size))
-> (it string) - Same as (text string `(italic . ,(current-main-font)) (current-font-size))
-> (bt string) - Same as (text string `(bold . ,(current-main-font)) (current-font-size))
-> (bit string) - Same as (text string `(bold italic . ,(current-main-font)) (current-font-size))
-> (tt string) - Same as (text string `(bold . modern) (current-font-size))
-> (rt string) - Same as (text string `roman (current-font-size))
-> (titlet string) - Like `t', but using the default slide-title font and color.
-
-> (para width-n ielement ...) - Generates a paragraph picture of width
-  `width-n'. Each ielement is either a string or a pict; strings are
-  split at spaces for word-wrapping to fit the page, and space is
-  added between elements. However, if a string element starts with a
-  punctuation mark (e.g., a comma), no space is added before the
-  element.
-
-> (para* width-n ielement ...) - Like `para, except that the
-  paragraph is only as wide as necessary, which may be less than
-  `width-n'.
-
-> (page-para ielement ...) - Like `para, except that the width
-   is `client-w' (see below).
-
-> (page-para* ielement ...) - Like `para*', except that the width
-   is `client-w' (see below).
-
-> (item width-n ielement ...)
-> (item* width-n ielement ...)
-> (page-item ielement ...)
-> (page-item* ielement ...)
-  Like `para, etc., except that a bullet is placed in front of the
-  paragraph, and the paragraph is indented on the left.
-
-> (item/bullet bullet-pict width-n ielement ...)
-> (item*/bullet bullet-pict width-n ielement ...)
-> (page-item/bullet bullet-pict ielement ...)
-> (page-item*/bullet bullet-pict ielement ...)
-  Like `item', etc., but with a given bullet pict.
-
-> (subitem width-n ielement ...)
-> (subitem* width-n ielement ...)
-> (page-subitem ielement ...)
-> (page-subitem* ielement ...)
-  Like `item', etc., except that a hollow bullet is used, and the
-  width for the `page-' versions is inset from `client-w'.
-
-
-> (para/c width-n ielement ...)
-> (para*/c width-n ielement ...)
-> (page-para/c ielement ...)
-> (page-para*/c ielement ...)
-  Like `para, etc., except that text is centered within the paragraph.
-
-> (para/r width-n ielement ...)
-> (para*/r width-n ielement ...)
-> (page-para/r ielement ...)
-> (page-para*/r ielement ...)
-  Like `para, etc., except that text is right-aligned within the
-  paragraph.
-
-> (clickback pict thunk)
-  Creates a pict that embeds the given one, and is the same size as
-  the given pict, but that when clicked during a presentation calls
-  `thunk'.
-
-> (most-recent-slide) - Returns a slide structure that be supplied to
-  `re-slide' to make a copy of the slide. Transition animations before
-  or after the slide (if any) are not included in the resulting slide.
-
-> (retract-most-recent-slide) - Cancels the most recently created
-  slide, and also returns a slide structure that be supplied to
-  `re-slide' to restore the slide (usually in a later position).
-  Transition animations after the slide (if any) are lost, while
-  transitions before the slide remain in place (but are not part of
-  the returned slide).
-
-> (re-slide slide [pict]) - [Re-]inserts a slide, optionally
-  `lt-superimpose'ing the given additional pict.
-
-> (start-at-recent-slide) - Sets the starting slide for the talk to
-  the most recently created slide. If this function is used multiple
-  times, the last use overrides the earlier uses.
-
-> (scroll-transition x y w h dx dy [secs steps-k]) - inserts a scroll
-  animation that shifts the screen rectangle (x, y, x+w, y+h) by `dx'
-  and `dy', taking `secs' time and animating with `steps-k' steps.
-  See also "Transition Animations", above.
-
-> (pause-transition secs) - inserts a delay "animation" with no
-  drawing effect.   See also "Transition Animations", above.
-
-> (comment string-or-pict ...) - Combines strings and picts to be used
-  as a slide element for (usually hidden) commentary. Use the result
-  as an argument to `slide', `slide/title', etc.
-
-> (make-outline { symbol/s string-or-pict subitems } ...)  - Returns a
-  function that takes a symbol and generates an outline slide. Each
-  trio of arguments defines a section for the outline:
-
-   - The symbol/s names the section, either with a single symbol or a
-     list of symbols. When the outline function is called later to
-     make an outline, the given symbol is compared to the section's
-     symbol(s), and the section is marked as current if the symbol
-     matches.
-
-   - The string-or-pict is used as the displayed name of the
-     section.
-
-   - The subitems are displayed when the section is active. It can be
-     #f or null (for historical reasons) if no subitems are to be
-     displayed. Otherwise, it should be a procedure that takes a symbol
-     (the same one passed to the outline maker) and produces a pict.
-
-> (size-in-pixels p) - Scales p so that p is displayed on the screen
-  as (pict-width p) wide and (pict-height p) tall. The result is just
-  p for a 1024x768 display.
-
-
-> font-size - The default font size, 32. This size is in pixels for a
-  1024x768 screen; see also the "Display Size and Fonts" section, above.
-> gap-size - (* 3/4 font-size)
-
-> current-font-size - Parameter for the font size used by `t', etc.,
-  initialized to `font-size'.
-> current-line-sep - Parameter for the amount of separation between
-  paragraph lines.
-> line-sep - Default for `current-line-sep'.
-> title-size - Font size used for slide titles, derived from `font-size'.
-> current-main-font - Parameter for the font specification
-  used for `t'. Its argument must be a text-style (see
-  texpict for details).
-> main-font - Default for `current-main-font'
-> current-title-color - Parameter for the color used by titles/`titlet'
-
-> (with-font f thunk) - Calls `thunk' with
-  `current-main-font' set to `f', which must be a
-  text-style (see texpict for details)
-
-> red - a color name like "red", possibly selected by the user.
-> green - a color name like "green"
-> blue - ...
-> purple - ...
-> orange - ...
-
-> bullet - a bullet pict
-> o-bullet - a hollow bullet pict
-
-> client-w - (syntax) usable width of the screen
-> client-h - (syntax) usable height of the screen
-> get-client-w - returns usable width of the screen
-> get-client-h - returns usable height of the screen
-
-> full-page - (syntax) an empty pict that is the same size as the
-              client area
-> titleless-page - (syntax) an empty pict that is the same size as
-                   the client ares minus the title area
-> get-full-page - returns full-page
-> get-titleless-page - returns titleless-page
-
-> margin - (syntax) client margin within the full screen, 20
-> get-margin - returns client margin within the full screen, 20
-> set-margin! - sets `margin' and updates `client-w', `client-h',
-                `full-page', and `titleless-page'
-
-> title-h - (syntax) the height of a title string
-> get-title-h - returns the height of a title string
-
-> set-title-h! - sets `title-h' and updates `titleless-page'; this
-  usually makes sense only in combination with a change to
-  `current-slide-assembler'
-
-> current-slide-assembler - a parameter whose value is a function for
-  assembling slide content into a single pict; the assembling function
-  takes a string-or-false for the title, a separation for the title
-  and pict (if any), and a pict for the slide content (not counting
-  the title); the result is 'lt-superimpose'd with the client area
-  (but the result pict might draw outside the client region to paint
-  the screen margins, too); see also `set-title-h!',
-  `current-page-number-font', `current-page-number-color', and
-  `set-page-numbers-visible!'
-
-> current-page-number-font - font used to draw slide numbers
-> current-page-number-color - color used to draw slide numbers
-> set-page-numbers-visible! - determines whether slide numbers are
-  initially visible
-
-> printing? - #t if the slides are being directed to PostScript output
-> condense? - #t if slides are being condensed (see overview)
-> (skip-slides n) - increment the slide counter by `n' without adding
-  any slides.
-
-> (done-making-slides)
-  Notifies the slide viewer that no further slides will be registered,
-  which is mainly useful in printing mode. This procedure is called
-  automatically after loading a file when Slideshow is run as a
-  application.
-
-> (set-use-background-frame! on?) - enables or disables the creation
-  of a background frame, which is typically useful only when insets
-  are active. The last enable/disable during slide creation takes
-  effect once and for all.
-
-> (enable-click-advance! on?) - enables or disables slide advance
-  as a result of a mouse click.
-
-------------------------------------------------------------
-_code.rkt_
-------------------------------------------------------------
-
-The "code.rkt" module provides functions and syntax for typesetting
-Scheme code a la SlaTeX. It instantiates `code@' from `(lib "code.rkt"
-"typeset")', providing Slideshow's `current-font-size' and `line-sep'
-to the unit, and re-exporting the unit's exports from the module.
-
-The "code.rkt" module also exports a `code' macro generated by
-`define-code' from `(lib "code.rkt" "typeset")':
-
-> (code datum ...) - typesets the `datum' sequence to produce a pict;
-                     see `define-code' from "code.s"" in the "texpict"
-                     collection for more information; `unsyntax' is
-                     the escape identifier.
-
-See documentation for "code.rkt" in the "texpict" collection for more
-information.
-
-
-Finally, "code.rkt" exports a `define-code/string/scale' macro:
-
-> (define-exec-code (pict-id runnable-id string-id)
-    datum ...)
-
-The `pict-id' is bound to the result of `(code datum ...)', except
-that if an underscore by itself appears anywhere in a `datum', then
-the underscore and the following expression are not included for
-`code'.
-
-Meanwhile, `runnable-id' is bound to a syntax object that wraps the
-`datum's in a `begin'. In this case, underscores are removed from the
-`datum's, but not the following expression. Thus, an underscore is
-used to comment out an expression from the pict, but have it present
-in the syntax object for evaluation.
-
-The `string-id' is bound to a string representation of the code that is
-in the pict. This string is useful for copying to the clipboard with
-`(send the-clipboard set-clipboard-string string-id 0)'.
-
-
-> (define-exec-code/scale scale-expr (pict-id runnable-id string-id)
-    datum ...)
-
-Like `define-exec-code', but with a scale to use when generating the
-pict.
-
-
-
-------------------------------------------------------------
-_step.rkt_
-------------------------------------------------------------
-
-The "step.rkt" module provides syntax for breaking a complex slide into
-steps (that are more complex than can be handled with 'next and 'alts
-in a `slide' sequence).
-
-> (with-steps (id ...) expr) - evaluates `expr' once for each `id',
-  skipping an `id' if it ends with "~" and `condense?' from
-  "slideshow.rkt" is true
-
-  Within `expr', several keywords are bound:
-
->   (only? id) - returns #t during the evaluation of `expr' for
-    `id', #f otherwise
->   (vonly id) - returns the identity function during the evaluation of
-    `expr' for `id', `ghost' otherwise
->   (only id then-expr)
->   (only id then-expr else-expr) - returns the result of `then-expr'
-    for step `id', the result of `else-expr' (defaults to `values')
-    otherwise.
-
->   (before? id) - returns #t before ... for `id'
->   (vbefore id) - returns the identify function ... `ghost' otherwise
->   (before id then-expr)
->   (before id then-expr else-expr) - returns the result of `then-expr'
-    before step `id', ...
-    
-
->   (after? id) - return #t during and after ... for `id'
->   (vafter id) - ...
->   (after id then-expr)
->   (after id then-expr else-expr) - returns the result of `then-expr'
-    during and after step `id', ...
-
->   (between? a-id b-id) - returns #t during and after ... for `a-id',
-    but #f after evaluation for `b-id'
->   (vbetween a-id b-id) - ...
->   (between a-id b-id then-expr)
->   (between a-id b-id then-expr else-expr) - returns the result of 
-    `then-expr' during and after step `a-id' and before step `b-id', 
-    ...
-
->   (between-excl? a-id b-id) - returns #t during and after ... for
-    `a-id', but #f during and after evaluation for `b-id'
->   (vbetween-excl a-id b-id) - ...
->   (between-excl a-id b-id then-expr)
->   (between-excl a-id b-id then-expr else-expr) - returns the result of 
-    `then-expr' after step `a-id' and before step `b-id', ...
-
-> (with-steps~ (id ...) expr) - like `with-steps', but when
-  `condense?' from "slideshow.rkt" is true, then `expr' is evaluated
-  only for the last `id' (independent of whether its name ends in "~")
-
-
-------------------------------------------------------------
-_slides-to-picts.rkt_
-------------------------------------------------------------
-
-> (get-slides-as-picts path width height condense?) - executes the
-  Slideshow program indicated by `path' in a fresh namespace, and
-  returns a list of picts for the slides. Each pict have the given
-  `width' and `height', and `condense?' determines whether the program
-  is executed in condense mode.
-
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/face.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/face.rkt
deleted file mode 100644
index 206aea1a24..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/face.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pict/face)
-(provide (all-from-out pict/face))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/flash.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/flash.rkt
deleted file mode 100644
index 4dab0c5665..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/flash.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pict/flash)
-(provide (all-from-out pict/flash))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/info.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/info.rkt
deleted file mode 100644
index 0172480e37..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/info.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("pict-snipclass.rkt"))
-
-(define release-note-files '(("Slideshow" "HISTORY.txt")))
-
-(define version "1.2")
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/lang/reader.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/lang/reader.rkt
deleted file mode 100644
index 412529f4dd..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/lang/reader.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-;; This module is preserved only for backward compatiblity
-(module reader '#%kernel
-  (#%require (submod slideshow reader))
-  (#%provide (all-from (submod slideshow reader))))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/main.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/main.rkt
deleted file mode 100644
index 590bbcfc36..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/main.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket
-(require "base.rkt"
-         "pict.rkt")
-(provide (except-out (all-from-out racket
-                                   "base.rkt"
-                                   "pict.rkt")
-                     printable<%>))
-
-(module reader syntax/module-reader
-  slideshow)
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/mask.xbm b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/mask.xbm
deleted file mode 100644
index fe839e645c..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/mask.xbm
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Created with The GIMP */
-#define mask_width 32
-#define mask_height 32
-static unsigned char mask_bits[] = {
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0x7f,
-   0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
-   0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
-   0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
-   0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
-   0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
-   0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
-   0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
-   0x00, 0x80, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xe0, 0x03, 0x00,
-   0x00, 0xb0, 0x06, 0x00, 0x00, 0x98, 0x0c, 0x00, 0x00, 0x8c, 0x18, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/param.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/param.rkt
deleted file mode 100644
index 9e364a0b1a..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/param.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-(module param mzscheme
-  (require mzlib/unit
-           "sig.rkt"
-           "cmdline.rkt"
-           "viewer.rkt")
-
-  (provide current-slideshow-linker)
-
-  (define current-slideshow-linker 
-    (make-parameter 
-     (lambda (core@)
-       (compound-unit
-	(import)
-	(export CORE CMDLINE VIEWER)
-	(link [((CONFIG : config^) (CMDLINE : cmdline^)) cmdline@]
-	      [((CORE : core^)) core@ CMDLINE VIEWER]
-	      [((VIEWER : viewer^)) viewer@ CMDLINE CORE]))))))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/pict-convert.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/pict-convert.rkt
deleted file mode 100644
index b5334bb6d6..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/pict-convert.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pict/convert)
-(provide (all-from-out pict/convert))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/pict-snipclass.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/pict-snipclass.rkt
deleted file mode 100644
index e92ccb5fa7..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/pict-snipclass.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang racket/base
-(require racket/class racket/gui/base)
-
-(provide snip-class)
-(require "private/pict-box-lib.rkt")
-
-(define pict-snip%
-  (class* editor-snip% (readable-snip<%>)
-    (define/public (read-special file line col pos)
-      (build-lib-pict-stx 
-       (lambda (ids) (syntax (void)))
-       (get-snp/poss this)))
-    (super-new)))
-
-(define lib-pict-snipclass%
-  (class snip-class%
-    (define/override (read stream-in)
-      (let* ([snip (new pict-snip%)]
-             [editor (new pasteboard%)]
-             [show-picts? (not (zero? (send stream-in get-exact)))]
-             [up-to-date? (not (zero? (send stream-in get-exact)))])
-        (send snip set-editor editor)
-        (send editor read-from-file stream-in #f)
-        snip))
-    (super-new)))
-
-(define snip-class (make-object lib-pict-snipclass%))
-(send snip-class set-version 2)
-(send snip-class set-classname (format "~s" '(lib "pict-snipclass.ss" "slideshow")))
-(send (get-the-snip-class-list) add snip-class)
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/pict.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/pict.rkt
deleted file mode 100644
index 06cffd52bc..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/pict.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pict)
-(provide (all-from-out pict))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/play.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/play.rkt
deleted file mode 100644
index 1d2c6ac6f8..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/play.rkt
+++ /dev/null
@@ -1,163 +0,0 @@
-#lang scheme/base
-(require slideshow/base
-         pict
-         scheme/list
-         scheme/math)
-
-(provide play play-n
-         fade-pict
-         slide-pict
-         fade-around-pict
-         sequence-animations
-         reverse-animations
-         animate-slide
-         fast-start
-         fast-end
-         fast-edges
-         fast-middle
-         split-phase)
-
-(define (fail-gracefully t)
-  (with-handlers ([exn:fail? (lambda (x) (values 0 0))])
-    (t)))
-
-(define single-pict (lambda (p) (if (list? p) (last p) p)))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Animation player
-
-;; Create a slide sequence where `mid' takes a number from 0.0 to 1.0.
-;; The 0.0 slide will wit until you advance, but the remaining ones will
-;; time out automatically to create the animation.
-(define (play #:title [title #f]
-              #:name [name title]
-              #:layout [layout 'auto] 
-              #:steps [N 10]
-              #:delay [secs 0.05]
-              #:skip-first? [skip-first? #f]
-              mid)
-  (unless skip-first?
-    (slide #:title (if (procedure? title) (title 0) title) 
-           #:name (if (procedure? name) (name 0) name)
-           #:layout layout 
-           (mid 0)))
-  (if condense?
-      (skip-slides N)
-      (map (lambda (n)
-             (slide #:title (if (procedure? title) (title n) title)
-                    #:name (if (procedure? name) (name n) name)
-                    #:layout layout 
-                    #:timeout secs
-                    (mid n)))
-           (let ([cnt N])
-             (let loop ([n cnt])
-               (if (zero? n)
-                   null
-                   (cons (/ (- cnt -1 n) 1.0 cnt)
-                         (loop (sub1 n)))))))))
-
-;; Create a sequences of N `play' sequences, where `mid' takes
-;; N arguments, each a number between 0.0 and 1.0. Initially, all
-;; arguments will be 0.0. The first argument goes from 0.0 to 1.0
-;; for the first `play' sequence, and then it stays at 1.0 while
-;; the second goes from 0.0 to 1.0 for the second sequence, etc.
-(define (play-n #:title [title #f] 
-                #:name [name title] 
-                #:layout [layout 'auto]
-                #:steps [N 10]
-                #:delay [secs 0.05]
-                #:skip-last? [skip-last? #f]
-                #:skip-first? [skip-first? #f]
-                mid)
-  (let ([n (procedure-arity mid)])
-    (let loop ([post (vector->list (make-vector n))]
-               [pre null]
-               [skip? skip-first?]
-               [Ns N])
-      (if (null? post)
-          (unless skip-last?
-            (slide #:title (if (procedure? title) (apply title pre) title)
-                   #:name (if (procedure? name) (apply name pre) name)
-                   #:layout layout
-                   (apply mid pre)))
-          (begin
-            (play #:title (if (procedure? title)
-                              (lambda (n)
-                                (apply title (append pre (list n) (cdr post))))
-                              title)
-                  #:name (if (procedure? name)
-                             (lambda (n)
-                               (apply name (append pre (list n) (cdr post))))
-                             name)
-                  #:layout layout 
-                  #:steps (if (pair? Ns) (car Ns) Ns)
-                  #:delay secs
-                  #:skip-first? skip?
-                  (lambda (n)
-                    (apply mid (append pre (list n) (cdr post)))))
-            (loop (cdr post) (cons 1.0 pre) #f (if (pair? Ns) (cdr Ns) Ns)))))))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Like `slide', supports 'next and 'alts, but produces as a
-;; function of N number arguments (for N stages)
-(define (animate-slide . content)
-  (let ([n (let loop ([content content])
-             (cond
-               [(null? content) 1]
-               [(eq? (car content) 'next)
-                (add1 (loop (cdr content)))]
-               [(eq? (car content) 'alts)
-                (+ (apply + (map (lambda (alt)
-                                   (loop alt))
-                                 (cadr content)))
-                   (sub1 (loop (cddr content))))]
-               [else (loop (cdr content))]))])
-    (procedure-reduce-arity
-     (lambda ns
-       (let loop ([content content]
-                  [ns (cons 1.0 ns)]
-                  [k (lambda (p ns) (or p (blank)))])
-         (cond
-           [(null? content) (k #f ns)]
-           [(eq? 'next (car content))
-            (loop (cdr content)
-                  (cdr ns)
-                  k)]
-           [(eq? 'alts (car content))
-            (let aloop ([l (cadr content)]
-                        [p (blank)]
-                        [ns ns])
-              (if (null? l)
-                  (loop (cddr content)
-                        ns 
-                        (lambda (p2 ns)
-                          (k (if p2 (vc-append gap-size p p2) p) ns)))
-                  (loop (car l) 
-                        ns
-                        (lambda (p2 ns2)
-                          (aloop (cdr l)
-                                 (cellophane
-                                  (if p2
-                                      (ct-superimpose
-                                       p
-                                       p2)
-                                      p)
-                                  (if (null? (cdr l))
-                                      1.0
-                                      (- 1.0 (min 1.0 (* 2 (cadr ns2))))))
-                                 (if (null? (cdr l))
-                                     ns2
-                                     (let ([ns (cdr ns2)])
-                                       (cons (max 0.0 (* 2 (- (car ns) 0.5)))
-                                             (cdr ns)))))))))]
-           [else (vc-append
-                  gap-size
-                  (let ([p (cellophane (car content) (car ns))])
-                    (loop (cdr content) ns
-                          (lambda (p2 ns)
-                            (k (if p2 (vc-append gap-size p p2) p) ns)))))])))
-     (sub1 n))))
-
-
-
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/private/image-snipr.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/private/image-snipr.rkt
deleted file mode 100644
index abd21fa484..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/private/image-snipr.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-(require racket/gui/base
-         racket/class)
-
-(provide snipclass
-         image-snip/r%)
-
-(define image-snip/r%
-  (class image-snip%
-    (init bitmap)
-    (init-field orig-snip)
-    (define/public (get-orig-snip) orig-snip)
-    
-    (inherit get-bitmap)
-    (define/override (copy) (make-object image-snip/r% (get-bitmap) orig-snip))
-    
-    (super-make-object bitmap)
-    
-    (inherit set-snipclass set-bitmap)
-    (set-snipclass snipclass)
-    
-    (define/override (write stream-out)
-      (super write stream-out)
-      (let* ([sc (send orig-snip get-snipclass)]
-             [cn-bytes (string->bytes/utf-8 (send sc get-classname))])
-        (send stream-out put (+ (bytes-length cn-bytes) 1) cn-bytes)
-        (send orig-snip write stream-out)))))
-
-(define image-snip/r-snipclass%
-  (class snip-class%
-    (define/override (read stream-in)
-      (let* ([is-sc (send (get-the-snip-class-list) find "wximage")]
-             [bs (send is-sc read stream-in)]
-             [bm (send bs get-bitmap)])
-        (send bs set-bitmap (make-object bitmap% 1 1)) ;; ugh
-        (let* ([name (bytes->string/utf-8 (send stream-in get-bytes))]
-               [sc (send (get-the-snip-class-list) find name)])
-          (unless sc
-            (error 'ack! "did not find a snipclass ~s, so cannot continue parsing stream" name))
-          (let* ([hidden-snip (send sc read stream-in)])
-            (make-object image-snip/r% bm hidden-snip)))))
-    (super-new)))
-
-(define snipclass (new image-snip/r-snipclass%))
-(send snipclass set-classname (format "~s" '(lib "image-snipr.ss" "slideshow" "private")))
-(send snipclass set-version 1)
-(send (get-the-snip-class-list) add snipclass)
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/private/pict-box-lib.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/private/pict-box-lib.rkt
deleted file mode 100644
index 48f45f8c35..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/private/pict-box-lib.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-(module pict-box-lib mzscheme
-  (require mred
-           mzlib/class
-           texpict/mrpict
-           "image-snipr.rkt")
-  
-  (provide get-snp/poss
-           build-lib-pict-stx
-           snip-location
-           (struct snp/pos (snp x y))
-           generate-ids)
-  
-  (define-struct snp/pos (snp x y))
-  
-  ;; get-snip/poss : editor-snip -> (listof snp/pos)
-  ;; called on drscheme's thread
-  (define (get-snp/poss es)
-    (let ([pb (send es get-editor)])
-      (let loop ([snip (send pb find-first-snip)])
-        (cond
-          [(not snip) null]
-          [(is-a? snip image-snip/r%)
-           (let ([real-snip (send snip get-orig-snip)])
-             (let-values ([(x y) (snip-location pb snip)])
-               (cons (make-snp/pos real-snip x y)
-                     (loop (send snip next)))))]
-          [(is-a? snip readable-snip<%>)
-           (let-values ([(x y) (snip-location pb snip)])
-             (cons (make-snp/pos snip x y)
-                   (loop (send snip next))))]
-          [else (loop (send snip next))]))))
-  
-  ;; build-lib-pict-stx : syntax (listof snp/pos) -> syntax
-  ;; called on the user's thread
-  (define (build-lib-pict-stx send-back snp/poss)
-    (with-syntax ([(subpicts ...) (map (lambda (snp/pos) (send (snp/pos-snp snp/pos) read-special #f 0 0 0))
-                                       snp/poss)]
-                  [(ids ...) (generate-ids "snip-id" (map snp/pos-snp snp/poss))]
-                  [(x ...) (map snp/pos-x snp/poss)]
-                  [(y ...) (map snp/pos-y snp/poss)])
-      (with-syntax ([send-back (send-back (syntax (ids ...)))])
-        (syntax
-         (let ([ids subpicts] ...)
-           send-back
-           (let ([max-h (max 0 (+ y (pict-height ids)) ...)])
-             (panorama (picture 0 0 `((place ,(- x (/ (pict-height ids) 2))
-                                             ,(- max-h y (/ (pict-height ids) 2))
-                                             ,ids)
-                                      ...)))))))))
-  
-  (define (generate-ids pre lst)
-    (let loop ([i 0]
-               [l lst])
-      (cond
-        [(null? l) null]
-        [else (cons (datum->syntax-object #'here (string->symbol (format "~a~a" pre i)))
-                    (loop (+ i 1)
-                          (cdr l)))])))
-  
-  (define (snip-location pb snip)
-    (let ([x (box 0)]
-          [y (box 0)])
-      (send pb get-snip-location snip x y)
-      (values (unbox x) (unbox y)))))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/private/utils.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/private/utils.rkt
deleted file mode 100644
index 35f1825192..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/private/utils.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-(module utils racket/base
-  (require mred
-	   mzlib/class)
-
-  (provide define-accessor
-	   define/provide-struct)
-
-  (define-syntax define-accessor
-    (syntax-rules ()
-      [(_ margin get-margin)
-       (define-syntax margin
-	 (syntax-id-rules ()
-	   [(margin arg) ((get-margin) arg...)]
-	   [margin (get-margin)]))]))
-  
-
-  (define-syntax define/provide-struct
-    (syntax-rules ()
-      [(_ id flds flags ...)
-       (begin
-	 (define-struct id flds flags ...)
-	 (provide (struct-out id)))])))
-
-
-
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/run.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/run.rkt
deleted file mode 100644
index c9c573f25d..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/run.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-(module run "slideshow.rkt"
-  (provide (all-from "slideshow.rkt")))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/sig.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/sig.rkt
deleted file mode 100644
index 5feccccd3f..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/sig.rkt
+++ /dev/null
@@ -1,118 +0,0 @@
-
-(module sig mzscheme
-  (require mzlib/unit)
-
-  (provide config^ viewer^ core^
-	   cmdline^)
-
-  ;; Configuration inputs to the core unit:
-  (define-signature config^
-    (base-font-size             ; normally 32
-     screen-w screen-h          ; logical size, normally 1024x768
-     use-screen-w use-screen-h  ; "pixel" size
-     pixel-scale                ; amount the "pixels" are scaled (e.g., for quad)
-     condense? printing?        ; mode
-     smoothing?
-     commentary-on-slide?))
-     
-  ;; Viewer inputs to the core unit:
-  (define-signature viewer^
-    (;; Registering slides:
-     add-talk-slide!
-     retract-talk-slide!
-     most-recent-talk-slide
-     ;; Pass-through of slide-program requests:
-     set-init-page!
-     set-use-background-frame!
-     enable-click-advance!
-     set-page-numbers-visible!
-     done-making-slides
-     set-spotlight-style!
-     ;; Called when a clickback-containing slide is rendered:
-     add-click-region!
-     ;; Called when a interactive-containing slide is rendered:
-     add-interactive!
-     ;; To potentially speed up display:
-     pict->pre-render-pict))
-
-  ;; The core unit's exports, which are the functions used by a 
-  ;; Slideshow program:
-  (define-signature core^
-    (slide/kw
-     slide
-     slide/title
-     slide/title/tall
-     slide/center
-     slide/title/center 
-     slide/inset
-     slide/title/inset
-     slide/title/tall/inset
-     slide/center/inset
-     slide/title/center/inset
-     slide/name 
-     slide/name/tall 
-     slide/name/center 
-     slide/name/inset
-     slide/name/tall/inset
-     slide/name/center/inset
-     slide/timeout
-     slide/title/timeout
-     slide/center/timeout
-     slide/title/center/timeout
-     
-     most-recent-slide retract-most-recent-slide re-slide slide->pict start-at-recent-slide
-     scroll-transition pause-transition
-     comment make-outline
-     item/kw item item* page-item page-item*
-     item/bullet item*/bullet page-item/bullet page-item*/bullet
-     subitem/kw subitem subitem* page-subitem page-subitem*
-     itemize itemize* page-itemize page-itemize*
-     para/kw para para* page-para page-para*
-     para/c para/r para*/c para*/r page-para/c page-para/r page-para*/c page-para*/r
-     font-size gap-size current-gap-size current-font-size current-line-sep line-sep title-size 
-     main-font current-main-font with-font current-title-color
-     red green blue purple orange size-in-pixels
-     t it bt bit tt titlet tt* rt
-     bullet o-bullet
-     get-margin set-margin! get-client-w get-client-h
-     get-full-page get-titleless-page
-     skip-slides
-     set-use-background-frame!
-     enable-click-advance!
-     get-title-h set-title-h! current-slide-assembler
-     current-page-number-font current-page-number-color current-page-number-adjust
-     current-titlet current-para-width
-     set-page-numbers-visible! done-making-slides
-     set-spotlight-style!
-     pict->pre-render-pict
-     clickback
-     interactive
-     make-slide-inset
-     apply-slide-inset
-     condense?
-     printing?))
-
-  ;; ----------------------------------------
-
-  ;; Extra cmdline inputs to a viewer:
-  (define-signature cmdline^ extends config^
-    (file-to-load ; #f or a path/string
-     init-page
-     use-transitions? 
-     print-slide-seconds?
-     show-page-numbers?
-     show-time?
-     commentary?
-     use-offscreen?
-     actual-screen-w actual-screen-h ; actual size (center use- within here)
-     trust-me?
-     quad-view?
-     keep-titlebar?
-     right-half-screen? 
-     two-frames?
-     use-prefetch?
-     use-prefetch-in-preview?
-     print-target
-     talk-duration-minutes
-     screen-number
-     letterbox-color)))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slide.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slide.rkt
deleted file mode 100644
index ecb077f182..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slide.rkt
+++ /dev/null
@@ -1,156 +0,0 @@
-(module slide racket/base
-  (require racket/unit
-           racket/contract
-           racket/class
-           racket/gui/base
-           texpict/mrpict
-           texpict/utils
-           "sig.rkt"
-           "core.rkt"
-           "private/utils.rkt"
-           "param.rkt")
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;       Link Config and Viewer with Core        ;;
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-  ;; The actual config and viewer units are determined by a parameter
-  ;;  in "param.rkt". This somewhat strange technqiue allows the units
-  ;;  to be changed as this module is loaded in a new namespace; see
-  ;;  "slides-to-picts.rkt". Such namespace games are not necessary if
-  ;;  talks are written as units and linked to the core.rkt unit.
-
-  (define-values/invoke-unit ((current-slideshow-linker) core@)
-    (import)
-    (export core^
-            (prefix config: config^)
-            (prefix viewer: viewer^)))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;                Contracts                      ;;
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-  ;; Let the contract check always pass for now. We do more specific checking.
-  (define (slide-sequence? l) #t)
-
-  (define slide-contract
-    (() () #:rest slide-sequence? . ->* . any))
-  (define slide/title-contract
-    ((string?) () #:rest slide-sequence? . ->* . any))
-  (define slide/inset-contract
-    ((sinset?) () #:rest slide-sequence? . ->* . any))
-  (define slide/title/inset-contract
-    ((string? sinset?) () #:rest slide-sequence? . ->* . any))
-
-  (define (side-inset? n) (and (number? n)
-			       (exact? n)
-			       (integer? n)
-			       (n . >= . 0)))
-
-  (define elem/c (flat-rec-contract elem/c (or/c string? pict? (listof elem/c))))
-  (define item-contract (() (#:bullet pict?
-                                      #:width real? 
-                                      #:align (or/c 'left 'center 'right)
-                                      #:fill? any/c 
-                                      #:decode? any/c)
-                         #:rest elem/c
-                         . ->* . pict?))
-
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;                 Exports                       ;;
-  ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-  ;; Mostly we re-export core^, but we also add contracts.
-
-  ;; Create macros for `get-margin', etc.
-  (define-accessor margin get-margin)
-  (define-accessor title-h get-title-h)
-  (define-accessor client-w get-client-w)
-  (define-accessor client-h get-client-h)
-  (define-accessor full-page get-full-page)
-  (define-accessor titleless-page get-titleless-page)
-
-  (provide/contract [slide slide-contract]
-		    [slide/title slide/title-contract]
-		    [slide/title/tall slide/title-contract]
-		    [slide/center slide-contract]
-		    [slide/title/center slide/title-contract]
-		    [slide/inset slide/inset-contract]
-		    [slide/title/inset slide/title/inset-contract]
-		    [slide/title/tall/inset slide/title/inset-contract]
-		    [slide/center/inset slide/inset-contract]
-		    [slide/title/center/inset slide/title/inset-contract]
-		    [slide/name slide/title-contract]
-		    [slide/name/tall slide/title-contract]
-		    [slide/name/center slide/title-contract]
-		    [slide/name/inset slide/title/inset-contract]
-		    [slide/name/tall/inset slide/title/inset-contract]
-		    [slide/name/center/inset slide/title/inset-contract]
-		    [comment (() () #:rest (listof (or/c string? pict?)) . ->* . any)]
-                    [para/kw (() (#:width real? 
-                                          #:align (or/c 'left 'center 'right)
-                                          #:fill? any/c 
-                                          #:decode? any/c)
-                              #:rest elem/c
-                             . ->* . pict?)]
-                    [item/kw item-contract]
-                    [subitem/kw item-contract]
-                    [t (string? . -> . pict?)]
-                    [bt (string? . -> . pict?)]
-                    [it (string? . -> . pict?)]
-                    [bit (string? . -> . pict?)]
-                    [tt (string? . -> . pict?)]
-                    [titlet (string? . -> . pict?)]
-                    [rt (string? . -> . pict?)]
-                    [tt* (() () #:rest (listof string?) . ->* . pict?)])
-  (provide slide/kw
-           most-recent-slide retract-most-recent-slide re-slide slide->pict start-at-recent-slide
-	   scroll-transition pause-transition
-	   make-outline
-	   item item* page-item page-item*
-	   item/bullet item*/bullet page-item/bullet page-item*/bullet
-	   subitem subitem* page-subitem page-subitem*
-	   itemize itemize* page-itemize page-itemize*
-	   para para* page-para page-para*
-	   para/c para/r para*/c para*/r page-para/c page-para/r page-para*/c page-para*/r
-	   font-size gap-size current-gap-size current-font-size current-line-sep line-sep title-size 
-	   main-font current-main-font with-font current-title-color
-	   red green blue purple orange size-in-pixels
-	   bullet o-bullet
-	   margin get-margin set-margin! 
-	   client-w client-h get-client-w get-client-h
-	   full-page titleless-page get-full-page get-titleless-page
-	   printing? condense?
-	   skip-slides
-	   set-use-background-frame!
-	   enable-click-advance!
-	   title-h get-title-h set-title-h! current-slide-assembler
-	   current-page-number-font current-page-number-color current-page-number-adjust
-           current-titlet current-para-width
-	   set-page-numbers-visible! done-making-slides
-           set-spotlight-style!
-           pict->pre-render-pict
-           slide/timeout
-           slide/title/timeout
-           slide/center/timeout
-           slide/title/center/timeout
-           (rename-out [sinset? slide-inset?]))
-  (provide/contract [clickback 
-		     ((pict? (-> any))
-		      (any/c)
-		      . ->* .
-		      pict?)]
-		    [interactive
-		     (pict? 
-                      ((is-a?/c frame%) . -> . (-> any))
-                      . -> .
-		      pict?)]
-		    [make-slide-inset
-		     (side-inset? side-inset? side-inset? side-inset?
-				  . -> .
-				  sinset?)]
-		    [apply-slide-inset
-		     (sinset? pict? . -> . pict?)])
-  ;; Things not at all in the core unit:
-  (provide (all-from-out texpict/mrpict)
-	   (all-from-out texpict/utils)))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slides-to-picts.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slides-to-picts.rkt
deleted file mode 100644
index cdbf0fa64f..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slides-to-picts.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-(module slides-to-picts scheme/base
-  (require racket/draw
-           scheme/class
-           scheme/unit
-           "sig.rkt"
-           "param.rkt"
-           "core.rkt"
-           texpict/mrpict)
-
-  (provide get-slides-as-picts)
-
-  (define-namespace-anchor anchor)
-
-  (define get-slides-as-picts
-    (lambda (file w h c? [stop-after #f])
-      (let ([ns (make-base-namespace)]
-	    [orig-ns (namespace-anchor->empty-namespace anchor)]
-	    [slides null]
-	    [xs (/ w 1024)]
-	    [ys (/ h 768)]
-	    [escape void])
-	(parameterize ([current-namespace ns])
-	  (namespace-attach-module orig-ns 'slideshow/param)
-	  (namespace-attach-module orig-ns 'slideshow/core))
-	(current-slideshow-linker
-	 (lambda (core@)
-	   (compound-unit
-	    (import)
-	    (export CORE CONFIG VIEWER)
-	    (link [((CONFIG : config^)) (unit 
-                                          (import)
-                                          (export config^)
-                                          (define base-font-size 32)
-                                          (define screen-w 1024)
-                                          (define screen-h 768)
-                                          (define use-screen-w w)
-                                          (define use-screen-h h)
-                                          (define pixel-scale 1)
-                                          (define condense? c?)
-                                          (define printing? #f)
-                                          (define smoothing? #t)
-                                          (define commentary-on-slide? #f))]
-		  [((CORE : core^)) core@ CONFIG VIEWER]
-		  [((VIEWER : viewer^)) (unit
-                                          (import (prefix c: core^))
-                                          (export viewer^)
-                                          (define (add-talk-slide! s)
-                                            (set! slides (cons (list s (c:get-margin)) slides))
-                                            (when (and stop-after
-                                                       ((length slides) . >= . stop-after))
-                                              (escape (void))))
-                                          (define (retract-talk-slide!)
-                                            (set! slides (cdr slides)))
-                                          (define (most-recent-talk-slide)
-                                            (and (pair? slides) (caar slides)))
-                                          (define display-progress void)
-                                          (define set-init-page! void)
-                                          (define set-use-background-frame! void)
-                                          (define enable-click-advance! void)
-                                          (define set-page-numbers-visible! void)
-                                          (define add-click-region! void)
-                                          (define add-interactive! void)
-                                          (define (set-spotlight-style! #:size [size #f] 
-                                                                        #:color [color #f])
-                                            (void))
-                                          (define (pict->pre-render-pict p) p)
-                                          (define done-making-slides void))
-                   CORE]))))
-	(parameterize ([current-namespace ns])
-	  (let/ec k
-	    (set! escape k)
-	    (dynamic-require `(file ,file) #f)))
-	(map (lambda (s)
-	       (let ([drawer (sliderec-drawer (car s))]
-                     [margin (cadr s)])
-		 (dc (lambda (dc x y)
-		       (let-values ([(orig-xs orig-ys) (send dc get-scale)])
-			 (send dc set-scale (* orig-xs xs) (* orig-ys ys))
-			 (drawer dc (+ (/ x xs) margin) (+ (/ y ys) margin))
-			 (send dc set-scale orig-xs orig-ys)))
-		     w h 0 0)))
-	     (reverse slides))))))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slideshow.bmp b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slideshow.bmp
deleted file mode 100644
index 06bbf338f3..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slideshow.bmp and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slideshow.png b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slideshow.png
deleted file mode 100644
index 388e0d5bb1..0000000000
Binary files a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slideshow.png and /dev/null differ
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slideshow.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slideshow.rkt
deleted file mode 100644
index dac5db8c7b..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/slideshow.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-(module slideshow mzscheme
-  (require slideshow/slide)
-  (provide (all-from slideshow/slide)
-	   (all-from mzscheme)))
-
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/start-param.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/start-param.rkt
deleted file mode 100644
index 328a0079ce..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/start-param.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-(module start-param mzscheme
-  (provide file-to-load
-	   trust-me?)
-
-  (define file-to-load (make-parameter #f))
-  (define trust-me? (make-parameter #t)))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/step.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/step.rkt
deleted file mode 100644
index 401fd93e91..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/step.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-
-(module step slideshow/slideshow
-  (require mzlib/list
-	   mzlib/etc)
-
-  (provide with-steps with-steps~)
-  
-  (define-syntax (with-steps stx)
-    (syntax-case stx ()
-      [(_ (step-name ...) expr0 expr ...)
-       #'(do-with-steps #f (step-name ...) expr0 expr ...)]))
-
-  (define-syntax (with-steps~ stx)
-    (syntax-case stx ()
-      [(_ (step-name ...) expr0 expr ...)
-       #'(do-with-steps #t (step-name ...) expr0 expr ...)]))
-
-  (define-syntax (define-step stx)
-    (syntax-case stx ()
-      [(_ func id steps (arg ...) 
-	  (((extra-arg ...) (def-arg ...)) ... 
-	   ((all-extra-arg ...) ())) 
-	  body)
-       (syntax/loc stx
-	 (begin
-	   (define func 
-	     (lambda (arg ... all-extra-arg ...)
-	       body))
-	   (define-syntax (id istx)
-	     (syntax-case istx ()
-	       [(_ arg ... extra-arg ...)
-		(syntax/loc istx (_ arg ... extra-arg ... def-arg ...))]
-	       ...
-	       [(_ arg ... all-extra-arg ...)
-		(begin
-		  (unless (ormap (lambda (i)
-				   (and (identifier? #'arg)
-					(module-identifier=? i #'arg)))
-				 (syntax->list (quote-syntax steps)))
-		    (raise-syntax-error
-		     #f
-		     "unknown step name"
-		     istx
-		     #'arg))
-		  ...
-		  (syntax/loc istx (func (quote arg) ... all-extra-arg ...)))]))))]))
-
-  (define-syntax (define-predicate/vproc stx)
-    (syntax-case stx ()
-      [(_ pred pred/p vproc proc steps (arg ...) body)
-       #'(begin
-	   (define-step pred/p pred steps (arg ...) ((() ())) body)
-	   (define-step v proc steps (arg ...) (((f) (values))
-						((f else-f) ()))
-	     (if (pred/p arg ...) 
-		 f
-		 else-f))
-	   (define-step v2 vproc steps (arg ...) ((() ()))
-	     (if (pred/p arg ...) 
-		 (let ([vproc (lambda (x) x)]) vproc)
-		 (let ([vproc (lambda (x) (ghost x))]) vproc))))]))
-       
-  (define-syntax (do-with-steps stx)
-    (syntax-case stx ()
-      [(_ condensing (step-name ...) expr0 expr ...)
-       (let ([capturing (lambda (s)
-			  (datum->syntax-object #'expr0 s))])
-	 (with-syntax ([only? (capturing 'only?)]
-		       [vonly (capturing 'vonly)]
-		       [only (capturing 'only)]
-		       [except? (capturing 'except?)]
-		       [vexcept (capturing 'vexcept)]
-		       [except (capturing 'except)]
-		       [before? (capturing 'before?)]
-		       [vbefore (capturing 'vbefore)]
-		       [before (capturing 'before)]
-		       [after? (capturing 'after?)]
-		       [vafter (capturing 'vafter)]
-		       [after (capturing 'after)]
-		       [between? (capturing 'between?)]
-		       [vbetween (capturing 'vbetween)]
-		       [between (capturing 'between)]
-		       [between-excl? (capturing 'between-excl?)]
-		       [vbetween-excl (capturing 'vbetween-excl)]
-		       [between-excl (capturing 'between-excl)])
-	   #'(let ([steps '(step-name ...)])
-	       (map (lambda (step)
-		      (define-predicate/vproc only? only?/p vonly only (step-name ...)
-			(p)
-			(eq? step p))
-		      (define-predicate/vproc except? except?/p vexcept except (step-name ...)
-			(p)
-			(not (eq? step p)))
-		      (define-predicate/vproc after? after?/p vafter after (step-name ...)
-			(p)
-			(memq step (or (memq p steps) null)))
-		      (define-predicate/vproc before? vbefore?/p vbefore before (step-name ...)
-			(p)
-			(not (after?/p p)))
-		      (define-predicate/vproc between? between?/p vbetween between (step-name ...)
-			(p1 p2)
-			(and (after?/p p1) (or (eq? step p2) (not (after?/p p2)))))
-		      (define-predicate/vproc between-excl? between-excl?/p vbetween-excl between-excl (step-name ...)
-			(p1 p2)
-			(and (after?/p p1) (not (after?/p p2))))
-		      (let () expr0 expr ...))
-		    (if (and condensing condense?)
-                        (begin
-                          (skip-slides (sub1 (length steps)))
-                          (last-pair steps))
-			(if condense?
-                            (let ([l (filter (lambda (id)
-                                               (not (regexp-match #rx"~$" (symbol->string id))))
-                                             steps)])
-                              (skip-slides (- (length steps) (length l)))
-                              l)
-			    steps))))))])))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/viewer.rkt b/pkgs/slideshow-pkgs/slideshow-lib/slideshow/viewer.rkt
deleted file mode 100644
index f3d9367f58..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/slideshow/viewer.rkt
+++ /dev/null
@@ -1,1504 +0,0 @@
-
-(module viewer scheme/base
-  (require scheme/class
-           scheme/unit
-	   scheme/contract
-	   (only-in scheme/list last)
-           scheme/path
-           scheme/file
-	   mred
-	   texpict/mrpict
-	   texpict/utils
-	   scheme/math
-	   mrlib/include-bitmap
-           racket/format
-	   "sig.rkt"
-	   "core.rkt"
-	   "private/utils.rkt")
-
-  (provide viewer@)
-
-  ;; Needed for browsing
-  (define original-security-guard (current-security-guard))
-  (define orig-err-string-handler (error-value->string-handler))
-
-  (define-logger slideshow)
-      
-  (define-unit viewer@
-      (import (prefix config: cmdline^) core^)
-      (export (rename viewer^
-                      (viewer:set-use-background-frame! set-use-background-frame!)
-                      (viewer:enable-click-advance! enable-click-advance!)
-                      (viewer:set-page-numbers-visible! set-page-numbers-visible!)
-                      (viewer:set-spotlight-style! set-spotlight-style!)
-                      (viewer:pict->pre-render-pict pict->pre-render-pict)
-                      (viewer:done-making-slides done-making-slides)))
-              
-      (define-accessor margin get-margin)
-      (define-accessor client-w get-client-w)
-      (define-accessor client-h get-client-h)
-
-      (define target-page config:init-page)
-      (define current-page (if config:printing? config:init-page 0))
-      (define use-background-frame? #f)
-      (define show-page-numbers? #t)
-      (define click-to-advance? #t)
-      (define blank-cursor-allowed? #t)
-      (define spotlight-on? #f)
-      (define spotlight-shown? #f)
-      (define spotlight-size 36)
-      (define spotlight-color (make-color 230 230 0 0.5))
-      (define click-regions null)
-      (define interactives #hash())
-      (define talk-slide-list null)
-      (define given-talk-slide-list null)
-      (define talk-slide-reverse-cell-list null)
-      (define given-slide-count 0)
-      (define slide-count 0)
-
-      (define error-on-slide? #f)
-
-      (define empty-slide
-	(make-sliderec (lambda (dc x y) (void))
-		       "<Empty>"
-		       #f
-		       0
-		       1
-		       zero-inset
-		       null
-                       #f))
-
-      (define (talk-list-ref n)
-	(if (n . < . slide-count)
-	    (list-ref talk-slide-list n)
-	    empty-slide))
-
-      (define (mlist->list l)
-        (cond
-         [(null? l) null]
-         [else (cons (mcar l) (mlist->list (mcdr l)))]))
-
-      (define (given->main!)
-	(if config:quad-view?
-	    (begin
-	      ;; WARNING: This make slide creation O(n^2) for n slides
-	      (set! talk-slide-list (make-quad (mlist->list given-talk-slide-list)))
-	      (set! slide-count (length talk-slide-list)))
-	    (begin
-	      (set! talk-slide-list (mlist->list given-talk-slide-list))
-	      (set! slide-count given-slide-count))))
-
-      (define (add-talk-slide! s)
-	(when error-on-slide?
-	  (error "slide window has been closed"))
-	(let ([p (mcons s null)])
-	  (if (null? talk-slide-reverse-cell-list)
-	      (set! given-talk-slide-list p)
-	      (set-mcdr! (car talk-slide-reverse-cell-list) p))
-	  (set! talk-slide-reverse-cell-list (cons p talk-slide-reverse-cell-list)))
-	(set! given-slide-count (add1 given-slide-count))
-	(given->main!)
-	(if config:printing?
-	    (send progress-display set-label (number->string slide-count))
-	    (begin
-	      (send f slide-changed (sub1 slide-count))
-	      (when (and target-page (= target-page (sub1 slide-count)))
-		(set-init-page! target-page)
-		(set! target-page #f))
-	      (yield))))
-
-      (define (retract-talk-slide!)
-	(unless (null? talk-slide-reverse-cell-list)
-	  (set! talk-slide-reverse-cell-list (cdr talk-slide-reverse-cell-list))
-	  (if (null? talk-slide-reverse-cell-list)
-	      (set! given-talk-slide-list null)
-	      (set-mcdr! (car talk-slide-reverse-cell-list) null)))
-	(set! given-slide-count (sub1 given-slide-count))
-	(given->main!)
-	(unless config:printing?
-	  (send f slide-changed slide-count)
-	  (yield)))
-
-      (define (most-recent-talk-slide)
-	(and (pair? talk-slide-reverse-cell-list)
-	     (mcar (car talk-slide-reverse-cell-list))))
-      
-      (define (set-init-page! p)
-	(set! current-page p)
-	(refresh-page))
-      
-      (define (viewer:set-use-background-frame! on?)
-	(set! use-background-frame? (and on? #t)))
-      
-      (define (viewer:enable-click-advance! on?)
-	(set! click-to-advance? (and on? #t)))
-      
-      (define (viewer:set-page-numbers-visible! on?)
-	(set! show-page-numbers? (and on? #t)))
-      (viewer:set-page-numbers-visible! config:show-page-numbers?)
-
-      (define (viewer:set-spotlight-style! #:size [size #f]
-                                           #:color [color #f])
-        (when size (set! spotlight-size size))
-        (when color (set! spotlight-color color)))
-      
-      (define adjust-cursor (lambda () (send f set-blank-cursor #f)))
-
-      (define (add-click-region! cr)
-	(adjust-cursor)
-	(set! click-regions (cons cr click-regions)))
-
-      (define (add-interactive! ir)
-        (set! interactives (hash-set interactives ir #t))
-        (send c queue-interactive-check))
-
-      (define (make-quad l)
-	(cond
-	 [(null? l) null]
-	 [(< (length l) 4)
-	  (make-quad (append l (vector->list
-				(make-vector
-				 (- 4 (length l))
-				 (make-sliderec void #f #f 
-						(sliderec-page (last l))
-						1 
-						zero-inset 
-						null
-                                                #f)))))]
-	 [else (let ([a (car l)]
-		     [b (cadr l)]
-		     [c (caddr l)]
-		     [d (cadddr l)]
-		     [untitled "(untitled)"])
-		 (cons (make-sliderec
-			(lambda (dc x y)
-			  (define-values (orig-sx orig-sy) (send dc get-scale))
-			  (define-values (orig-ox orig-oy) (send dc get-origin))
-			  (define scale (min (/ (- (/ client-h 2) margin) client-h)
-					     (/ (- (/ client-w 2) margin) client-w)))
-			  (define (set-origin x y)
-			    (send dc set-origin (+ orig-ox (* x orig-sx)) (+ orig-oy (* y orig-sy))))
-                          (define (call-with-clipping thunk)
-                            (let ([clip-rgn (send dc get-clipping-region)])
-                              (send dc set-clipping-rect 
-                                    (- margin)
-                                    (- margin)
-                                    (+ client-w (* 2 margin))
-                                    (+ client-h (* 2 margin)))
-                              (thunk)
-                              (send dc set-clipping-region clip-rgn)))
-			  (send dc set-scale (* orig-sx scale) (* orig-sy scale))
-			  (set-origin x y)
-                          (call-with-clipping
-                           (lambda ()
-                             ((sliderec-drawer a) dc 0 0)))
-			  (set-origin (+ x (/ client-w 2) margin) y)
-                          (call-with-clipping
-                           (lambda ()
-                             ((sliderec-drawer b) dc 0 0)))
-			  (set-origin x (+ y (/ client-h 2) margin))
-                          (call-with-clipping
-                           (lambda ()
-                             ((sliderec-drawer c) dc 0 0)))
-			  (set-origin (+ x (/ client-w 2) margin) (+ y (/ client-h 2) margin))
-                          (call-with-clipping
-                           (lambda ()
-                             ((sliderec-drawer d) dc 0 0)))
-			  (send dc set-scale orig-sx orig-sy)
-			  (set-origin x y)
-			  (send dc draw-line (/ client-w 2) 0 (/ client-w 2) client-h)
-			  (send dc draw-line 0 (/ client-h 2) client-w (/ client-h 2))
-			  (send dc set-origin orig-ox orig-oy))
-			(format "~a | ~a | ~a | ~a"
-				(or (sliderec-title a) untitled)
-				(or (sliderec-title b) untitled)
-				(or (sliderec-title c) untitled)
-				(or (sliderec-title d) untitled))
-			#f
-			(sliderec-page a)
-			(- (+ (sliderec-page d) (sliderec-page-count d)) (sliderec-page a))
-			zero-inset
-			null
-                        (sliderec-timeout a))
-		       (make-quad (list-tail l 4))))]))
-
-      ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;                   Main GUI                    ;;
-      ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      
-      (define GAUGE-WIDTH 100)
-      (define GAUGE-HEIGHT 4)
-
-      (define talk-start-seconds (current-seconds))
-      (define slide-start-seconds (current-seconds))
-      
-      (define blank-cursor (make-object cursor% 'blank))
-
-      (application-quit-handler (lambda ()
-				  (send f stop-show)))
-
-      (define talk-frame%
-	(class frame% 
-	  (init-field closeable?)
-	  (init-field close-bg?)
-	  (define/augment can-close? (lambda () (and closeable? (inner #t can-close?))))
-	  (define/override on-superwindow-show (lambda (on?)
-						 (unless on?
-						   (when (and close-bg? background-f)
-						     (send background-f show #f))
-                                                   (stop-time-update!))))
-
-	  (define/override on-subwindow-char
-	    (lambda (w e)
-	      (let ([k (send e get-key-code)])
-		(case k
-		  [(right)
-		   (shift e 1 0 (lambda () (next)))]
-		  [(left)
-		   (shift e -1 0 (lambda () (prev)))]
-		  [(up)
-		   (shift e 0 -1 void)]
-		  [(down)
-		   (shift e 0 1 void)]
-		  [(#\space #\f #\n next)
-		   (next)
-		   #t]
-		  [(#\b #\backspace #\rubout prior)
-		   (prev)
-		   #t]
-                  [(#\s)
-                   (next-title add1 #f)]
-                  [(#\a)
-                   (next-title sub1 #t)]
-		  [(#\g)
-		   (stop-transition)
-		   (send f set-blank-cursor #f)
-		   (if (send e get-meta-down)
-		       (get-page-from-user)
-		       (begin
-			 (set! current-page (max 0 (sub1 slide-count)))
-			 (refresh-page)))
-		   (send f set-blank-cursor blank-cursor-allowed?)
-		   #t]
-		  [(#\1)
-		   (stop-transition)
-		   (set! current-page 0)
-		   (refresh-page)
-		   #t]
-		  [(#\q #\u0153)  ; #\u0153 is for Mac OS
-		   (stop-transition)
-		   (when (or (send e get-meta-down)
-			     (send e get-alt-down))
-		     (stop-show))
-		   #t]
-		  [(escape)
-		   (send f set-blank-cursor #f)
-		   (when (equal? 1 (send
-                                    c
-                                    call-with-suspended-interactive
-                                    (lambda ()
-                                      (message-box/custom
-                                       "Quit"
-                                       "Really quit the slide show?"
-                                       "&Quit"
-                                       "&Cancel"
-                                       #f
-                                       this
-                                       '(default=1 caution)))))
-		     (stop-show))
-		   (send f set-blank-cursor blank-cursor-allowed?)
-		   #t]
-		  [(#\p)
-		   (when (or (send e get-meta-down)
-			     (send e get-alt-down))
-		     (set! show-page-numbers? (not show-page-numbers?))
-		     (stop-transition)
-		     (refresh-page))
-		   #t]
-		  [(#\d)
-		   (when (or (send e get-meta-down)
-			     (send e get-alt-down))
-		     (stop-transition)
-		     (send f-both show (not (send f-both is-shown?)))
-		     (refresh-page))
-		   #t]
-		  [(#\c)
-		   (when (or (send e get-meta-down)
-			     (send e get-alt-down))
-		     (stop-transition)
-		     (send c-frame show (not (send c-frame is-shown?))))
-		   #t]
-		  [(#\m)
-		   (when (or (send e get-meta-down)
-			     (send e get-alt-down))
-		     (set! blank-cursor-allowed? (not blank-cursor-allowed?))
-		     (send f set-blank-cursor blank-cursor-allowed?))]
-		  [(#\l)
-		   (when (or (send e get-meta-down)
-			     (send e get-alt-down))
-		     (set! spotlight-on? (not spotlight-on?))
-                     (when spotlight-on?
-                       (set! spotlight-shown? #t))
-                     (send c refresh))]
-		  [else
-		   #f]))))
-
-	  (define/public (stop-show)
-	    (send c-frame show #f)
-	    (send f-both show #f)
-	    (when use-background-frame?
-	      (send f show #f))
-            (stop-time-update!)
-	    (send f show #f)
-	    (when config:print-slide-seconds?
-	      (printf "Total Time: ~a seconds\n"
-		      (- (current-seconds) talk-start-seconds)))
-	    ;; In case slides are still building, tell them to stop. We
-	    ;;  prefer not to `exit' directly if we don't have to.
-	    (set! error-on-slide? #t))
-	  
-	  (define/private (shift e xs ys otherwise)
-	    (cond
-	     [(or (send e get-meta-down)
-		  (send e get-alt-down))
-	      (move-over (* xs 20) (* ys 20))]
-	     [(send e get-shift-down)
-	      (move-over xs ys)]
-	     [else
-	      (otherwise)])
-	    #t)
-	  
-	  (inherit get-x get-y move)
-	  (define/private (move-over dx dy)
-	    (let ([x (get-x)]
-		  [y (get-y)])
-	      (move (+ x dx) (+ y dy)))
-	    (when background-f
-	      (let ([x (send background-f get-x)]
-		    [y (send background-f get-y)])
-		(send background-f move (+ x dx) (+ y dy)))))
-	  
-	  (define/public (prev)
-	    (stop-transition)
-	    (set! current-page 
-                  (let loop ([pos (max (sub1 current-page) 0)])
-                    (cond
-                     [(zero? pos) pos]
-                     [(sliderec-timeout (talk-list-ref pos)) (loop (sub1 pos))]
-                     [else pos])))
-	    (refresh-page))
-	  
-	  (define/public (next)
-	    (if (pair? current-transitions)
-		(stop-transition)
-                (if (sliderec-timeout (talk-list-ref current-page))
-                    ;; skip to a slide without a timeout:
-                    (change-slide
-                     (- (let loop ([pos (add1 current-page)])
-                          (cond
-                           [(= pos slide-count) (sub1 slide-count)]
-                           [(sliderec-timeout (talk-list-ref pos)) (loop (add1 pos))]
-                           [else pos]))
-                        current-page))
-                    ;; normal step:
-                    (change-slide 1))))
-
-          (define/public (next-one)
-            (if (pair? current-transitions)
-		(stop-transition)
-                (change-slide 1)))
-
-          (define/public (next-title d1 far-end?)
-            ;; skip to next slide that has a different title
-            (stop-transition)
-            (define current-title (sliderec-title (talk-list-ref current-page)))
-            (change-slide
-             (- (let loop ([pos (d1 current-page)])
-                  (cond
-                   [(negative? pos) 0]
-                   [(= pos slide-count) (sub1 slide-count)]
-                   [(equal? current-title (sliderec-title (talk-list-ref pos))) (loop (d1 pos))]
-                   [far-end?
-                    (define new-title (sliderec-title (talk-list-ref pos)))
-                    (let loop ([prev-pos pos] [pos (d1 pos)])
-                      (cond
-                       [(negative? pos) 0]
-                       [(= pos slide-count) (sub1 slide-count)]
-                       [(equal? new-title (sliderec-title (talk-list-ref pos))) (loop pos (d1 pos))]
-                       [else prev-pos]))]
-                   [else pos]))
-                current-page)))
-
-	  (define/public (slide-changed pos)
-	    (when (or (= pos current-page)
-		      (and (or config:use-prefetch?
-			       (send f-both is-shown?))
-			   (= pos (add1 current-page))))
-	      (stop-transition)
-	      (set! prefetched-page #f)
-	      (change-slide 0)
-	      (when (and (= pos 0)
-			 (not config:printing?))
-		(when use-background-frame?
-		  (send f show #f)
-		  (yield)
-		  (send background-f show #t))
-                (start-time-update!)
-		(send f show #t)
-		(when config:two-frames?
-		  (send f-both show #t)))))
-
-	  (define/private (change-slide n)
-	    (let ([old (talk-list-ref current-page)])
-	      (set! current-page (max 0
-				      (min (+ n current-page)
-					   (sub1 slide-count))))
-	      (when config:print-slide-seconds?
-		(let ([slide-end-seconds (current-seconds)])
-		  (printf "Slide ~a: ~a seconds\n" current-page
-			  (- slide-end-seconds slide-start-seconds))
-		  (set! slide-start-seconds slide-end-seconds)))
-	      ;; Refresh screen, and start transitions from old, if any
-	      (do-transitions (if config:use-transitions?
-				  (sliderec-transitions old)
-				  null)
-			      (send c get-offscreen))))
-
-	  (define blank-cursor? #f)
-	  (define activated? #f)
-
-	  (inherit set-cursor)
-
-	  (define/override (on-activate on?)
-	    (set! activated? on?)
-	    (when blank-cursor?
-	      (set-cursor (if (and blank-cursor? on? blank-cursor-allowed?)
-			      blank-cursor
-			      #f))))
-	  (define/public (set-blank-cursor b?)
-	    (set! blank-cursor? (and b? #t))
-	    (when activated?
-	      (set-cursor (if (and blank-cursor? blank-cursor-allowed?)
-			      blank-cursor
-			      #f))))
-
-	  (super-new)))
-
-      (define-values (screen-left-inset screen-top-inset)
-	(if config:keep-titlebar?
-	    (values 0 0)
-	    (get-display-left-top-inset #:monitor config:screen-number)))
-
-      (when config:right-half-screen?
-        (set! screen-left-inset (- screen-left-inset config:actual-screen-w)))
-
-      (define fullscreen?
-        (and (not config:keep-titlebar?)
-             (let-values ([(w h) (get-display-size #t #:monitor config:screen-number)])
-               (and (= config:actual-screen-w w)
-                    (= config:actual-screen-h h)))))
-
-      (define background-f
-	(make-object (class frame%
-		       (inherit is-shown?)
-		       (define/override (on-activate on?)
-			 (when (and on? (is-shown?))
-			   (send f show #t)))
-		       (super-new
-			[label "Slideshow Background"]
-			[x (- screen-left-inset)] [y (- screen-top-inset)]
-			[width (inexact->exact (floor config:actual-screen-w))]
-			[height (inexact->exact (floor config:actual-screen-h))]
-			[style (append
-                                (if fullscreen? '(hide-menu-bar) null)
-                                '(no-caption no-resize-border))]))))
-
-      (send background-f enable #f)
-
-      (define f (new talk-frame%
-		     [closeable? config:keep-titlebar?]
-		     [close-bg? #t]
-		     [label (if config:file-to-load
-				(format "~a: slideshow" (file-name-from-path config:file-to-load))
-				"Slideshow")]
-		     [x (- screen-left-inset)] [y (- screen-top-inset)]
-		     [width (inexact->exact (floor config:actual-screen-w))]
-		     [height (inexact->exact (floor config:actual-screen-h))]
-		     [style (if config:keep-titlebar?
-				null
-                                (append
-                                 (if fullscreen? '(hide-menu-bar) null)
-                                 '(no-caption no-resize-border)))]))
-      
-      (define f-both (new talk-frame%
-			  [closeable? #t]
-			  [close-bg? #f]
-			  [label "Slideshow Preview"]
-			  [x 0] [y 0]
-			  [width (inexact->exact (floor (* config:actual-screen-w 8/10 1)))]
-			  [height (inexact->exact (floor (* config:actual-screen-h 8/10 2/3)))]
-			  [style '()]))
-      
-      (define current-sinset zero-inset)
-      (define resizing-frame? #f)
-      (define (reset-display-inset! sinset dc)
-	(unless (and (= (sinset-l current-sinset) (sinset-l sinset))
-		     (= (sinset-t current-sinset) (sinset-t sinset))
-		     (= (sinset-r current-sinset) (sinset-r sinset))
-		     (= (sinset-b current-sinset) (sinset-b sinset)))
-	  (set! resizing-frame? #t) ; hack --- see yield below
-          (send dc clear)
-	  (send f resize 
-		(max 1 (- (inexact->exact (floor config:actual-screen-w)) 
-			  (inexact->exact (floor (* (+ (sinset-l sinset) (sinset-r sinset))
-						    (/ config:actual-screen-w config:screen-w))))))
-		(max 1 (- (inexact->exact (floor config:actual-screen-h)) 
-			  (inexact->exact (floor (* (+ (sinset-t sinset) (sinset-b sinset))
-						    (/ config:actual-screen-h config:screen-h)))))))
-	  (send f move 
-		(inexact->exact (- (floor (* (sinset-l sinset) 
-					     (/ config:actual-screen-w config:screen-w))) 
-				   screen-left-inset))
-		(inexact->exact (- (floor (* (sinset-t sinset) 
-					     (/ config:actual-screen-h config:screen-h))) 
-				   screen-top-inset)))
-	  (set! current-sinset sinset)
-	  ;; FIXME: This yield is here so that the frame
-	  ;;  and its children can learn about their new
-	  ;;  sizes, and so that the generated on-size callback
-	  ;;  can be ignored. Obviously, using yield creates a
-	  ;;  kind of race condition for incoming events from the user.
-	  (let loop () (when (yield) (loop)))
-	  (set! resizing-frame? #f)))
-      
-
-      (define c-frame (new (class talk-frame%
-			     (define/override (on-move x y)
-			       (super on-move x y)
-			       (parameterize ([current-security-guard original-security-guard]
-                                              [error-value->string-handler orig-err-string-handler])
-				 (with-handlers ([void void]) ; also prevents exn handler from grabbing security guard
-				   (put-preferences '(slideshow:commentary-x slideshow:commentary-y)
-						    (list x y)
-						    void))))
-			     (define/override (on-size w h)
-			       (super on-size w h)
-			       (parameterize ([current-security-guard original-security-guard]
-                                              [error-value->string-handler orig-err-string-handler])
-				 (with-handlers ([void void]) ; also prevents exn handler from grabbing security guard
-				   (put-preferences '(slideshow:commentary-width slideshow:commentary-height)
-						    (list w h)
-						    void))))
-			     (super-new))
-			   [closeable? #t]
-			   [close-bg? #f]
-			   [label "Commentary"]
-			   [width (get-preference 'slideshow:commentary-width (lambda () 400))]
-			   [height (get-preference 'slideshow:commentary-height (lambda () 100))]
-			   [x (get-preference 'slideshow:commentary-x (lambda () #f))]
-			   [y (get-preference 'slideshow:commentary-y (lambda () #f))]))
-      (define commentary (make-object text%))
-      (send (new (class editor-canvas% 
-		   (define/override (on-event e)
-		     (super on-event e)
-		     (when click-to-advance?
-                       (when (send e button-up? 'left)
-                         (send f next))
-                       (when (send e button-up? 'right)
-                         (send f prev))))
-		   (super-new))
-		 [parent c-frame] 
-		 [editor commentary] 
-		 [style (if (eq? (system-type) 'macosx)
-			    '(auto-hscroll resize-corner)
-			    '(auto-hscroll auto-vscroll))])
-	    set-line-count 3)
-      (send commentary auto-wrap #t)
-      (send c-frame reflow-container)
-      (define SCROLL-STEP-SIZE 20)
-      (define pict-snip%
-	(class snip%
-	  (init-field pict)
-	  (define drawer (make-pict-drawer pict))
-	  (define/override (draw dc x y left top right bottom dx dy draw-caret)
-	    (drawer dc x y))
-	  (define/private (set-box/f b v)
-	    (when b (set-box! b v)))
-	  (define/override (get-extent dc x y wbox hbox descent space lspace rspace)
-	    (set-box/f wbox (pict-width pict))
-	    (set-box/f hbox (pict-height pict))
-	    (set-box/f descent (pict-descent pict))
-	    (set-box/f space 0)
-	    (set-box/f lspace 0)
-	    (set-box/f rspace 0))
-	  (define/override (get-num-scroll-steps)
-	    (inexact->exact (ceiling (/ (pict-height pict) SCROLL-STEP-SIZE))))
-	  (define/override (find-scroll-step y)
-	    (inexact->exact (floor (/ (max 0 y) SCROLL-STEP-SIZE))))
-	  (define/override (get-scroll-step-offset n)
-	    (* n SCROLL-STEP-SIZE))
-	  (super-new)
-	  (inherit set-snipclass)
-	  (set-snipclass pict-snipclass)))
-      (define pict-snipclass (new snip-class%))
-
-      
-      (define start-time #f)
-      
-      (define clear-brush (make-object brush% "WHITE" 'transparent))
-      (define white-brush (make-object brush% "WHITE" 'solid))
-      (define gray-brush (make-object brush% "GRAY" 'solid))
-      (define green-brush (make-object brush% "GREEN" 'solid))
-      (define red-brush (make-object brush% "RED" 'solid))
-      (define letterbox-brush (make-object brush% config:letterbox-color 'solid))
-      (define black-pen (make-object pen% "BLACK" 1 'solid))
-      (define clear-pen (make-object pen% "BLACK" 1 'transparent))
-      (define red-color (make-object color% "RED"))
-      (define green-color (make-object color% "GREEN"))
-      (define black-color (make-object color% "BLACK"))
-
-      (define (slide-page-string slide)
-        (let ([s ((current-page-number-adjust)
-                  (sliderec-page slide)
-                  (if (= 1 (sliderec-page-count slide))
-                      (format "~a" (sliderec-page slide))
-                      (format "~a-~a" (sliderec-page slide) (+ (sliderec-page slide)
-                                                               (sliderec-page-count slide)
-                                                               -1))))])
-          (unless (string? s)
-            (error 'current-page-number-adjust "expected a procedure that returned a string, but it returned ~s" s))
-          s))
-      
-      (define (calc-progress)
-	(if (and start-time config:talk-duration-minutes)
-	    (values (min 1 (/ (- (current-seconds) start-time) (* 60 config:talk-duration-minutes)))
-		    (/ current-page (max 1 (sub1 slide-count))))
-	    (values 0 0)))
-      
-      (define (show-time dc w h)
-	(let* ([left (- w GAUGE-WIDTH)]
-	       [top (- h GAUGE-HEIGHT)]
-	       [b (send dc get-brush)]
-	       [p (send dc get-pen)])
-	  (send dc set-pen black-pen)
-	  (send dc set-brush (if start-time gray-brush clear-brush))
-	  (send dc draw-rectangle left top GAUGE-WIDTH GAUGE-HEIGHT)
-	  (when start-time
-	    (let-values ([(duration distance) (calc-progress)])
-	      (send dc set-brush (if (< distance duration)
-				     red-brush
-				     green-brush))
-	      (send dc draw-rectangle left top (floor (* GAUGE-WIDTH distance)) GAUGE-HEIGHT)
-	      (send dc set-brush clear-brush)
-	      (send dc draw-rectangle left top (floor (* GAUGE-WIDTH duration)) GAUGE-HEIGHT)))
-	  (send dc set-pen p)
-	  (send dc set-brush b)))
-      
-      (define c%
-	(class canvas%
-	  (inherit get-dc get-client-size make-bitmap
-                   client->screen refresh)
-
-	  (define clicking #f)
-	  (define clicking-hit? #f)
-
-          (define mouse-x 0)
-          (define mouse-y 0)
-	  
-	  (define/override (on-paint)
-	    (let ([dc (get-dc)])
-	      (stop-transition/no-refresh)
-	      (cond
-	       [config:use-offscreen?
-		(let ([bm (send offscreen get-bitmap)])
-		  (send (get-dc) draw-bitmap bm 0 0))]
-	       [else
-		(send dc clear)
-		(paint-slide this dc)])
-              (show-spotlight dc)
-              (show-time dc)))
-
-          (define/private (show-spotlight dc)
-            (when (and spotlight-on? spotlight-shown?)
-              (define old-p (send dc get-pen))
-              (define old-b (send dc get-brush))
-              (send dc set-pen "black" 0 'transparent)
-              (send dc set-brush spotlight-color 'solid)
-              (send dc draw-ellipse 
-                    (- mouse-x (/ spotlight-size 2))
-                    (- mouse-y (/ spotlight-size 2))
-                    spotlight-size
-                    spotlight-size)
-              (send dc set-pen old-p)
-              (send dc set-brush old-b)))
-
-          (define/private (show-time dc)
-            (when config:show-time?
-              (define c (send dc get-text-foreground))
-              (define f (send dc get-font))
-              (define time-size 10)
-              (send dc set-text-foreground (make-color 100 100 100))
-              (send dc set-font (make-font #:size time-size #:size-in-pixels? #t))
-              (let-values ([(cw ch) (get-client-size)])
-                (let ([dx (floor (/ (- cw config:use-screen-w) 2))]
-                      [dy (floor (/ (- ch config:use-screen-h) 2))]
-                      [d (seconds->date (current-seconds))])
-                  (send dc draw-text 
-                        (~a (let ([h (modulo (date-hour d) 12)])
-                              (if (zero? h) 12 h))
-                            ":" 
-                            (~a #:width 2 #:align 'right #:pad-string "0" 
-                                (date-minute d)))
-                        (+ dx 5)
-                        (+ dy (- config:use-screen-h time-size 5)))))
-              (send dc set-text-foreground c)
-              (send dc set-font f)))
-	  
-	  (inherit get-top-level-window)
-	  (define/override (on-event e)
-            (unless (and (= mouse-x (send e get-x))
-                         (= mouse-y (send e get-y)))
-              (set! mouse-x (send e get-x))
-              (set! mouse-y (send e get-y))
-              (when spotlight-on?
-                (set! spotlight-shown? #t)
-                (refresh)))
-	    (cond
-	     [(send e button-down?)
-	      (let ([c (ormap
-			(lambda (c) (and (click-hits? e c) c))
-			click-regions)])
-		(when c
-		  (if (click-region-show-click? c)
-		      (begin
-			(set! clicking c)
-			(set! clicking-hit? #t)
-			(invert-clicking! #t))
-		      ((click-region-thunk c)))))]
-	     [(and clicking (send e dragging?))
-	      (let ([hit? (click-hits? e clicking)])
-		(unless (eq? hit? clicking-hit?)
-		  (set! clicking-hit? hit?)
-		  (invert-clicking! hit?)))]
-	     [(and clicking (send e button-up?))
-	      (let ([hit? (click-hits? e clicking)]
-		    [c clicking])
-		(unless (eq? hit? clicking-hit?)
-		  (set! clicking-hit? hit?)
-		  (invert-clicking! hit?))
-		(when clicking-hit?
-		  (invert-clicking! #f))
-		(set! clicking #f)
-		(when hit?
-		  ((click-region-thunk c))))]
-	     [(send e button-up? 'left)
-	      (when click-to-advance?
-		(send (get-top-level-window) next))]
-	     [(send e button-up? 'right)
-	      (when click-to-advance?
-		(send (get-top-level-window) prev))]
-	     [else 
-	      (when (and clicking clicking-hit?)
-		(invert-clicking! #f))
-	      (set! clicking #f)]))
-
-	  
-	  (define/private (click-hits? e c)
-	    (let ([x (send e get-x)]
-		  [y (send e get-y)])
-	      (and (<= (click-region-left c) x (click-region-right c))
-		   (<= (click-region-top c) y (click-region-bottom c)))))
-	  (define/private (invert-clicking! on?)
-	    (let ([dc (get-dc)]
-		  [x (click-region-left clicking)]
-		  [y (click-region-top clicking)]
-		  [w (- (click-region-right clicking) (click-region-left clicking))]
-		  [h (- (click-region-bottom clicking) (click-region-top clicking))])
-              (let ([x (floor x)]
-                    [y (floor y)]
-                    [w (- (floor (+ x w)) (floor x))]
-                    [h (- (floor (+ y h)) (floor y))])
-                (if (or on?
-                        (not config:use-offscreen?)
-                        (not offscreen))
-                    (let* ([b (send dc get-brush)]
-                           [p (send dc get-pen)])
-                      (send dc set-pen (send the-pen-list find-or-create-pen "white" 1 'transparent))
-                      (send dc set-brush  (send the-brush-list find-or-create-brush "black" 
-                                                (if config:use-offscreen?
-                                                    'hilite
-                                                    'xor)))
-                      (send dc draw-rectangle x y w h)
-                      (send dc set-pen p)
-                      (send dc set-brush b))
-                    (send dc draw-bitmap-section
-                          (send offscreen get-bitmap)
-                          x y x y
-                          w h)))))
-	  
-	  (define offscreen #f)
-	  (define/public get-offscreen (lambda () offscreen))
-	  
-	  (define/private (shift-click-region cr dx dy)
-	    (make-click-region (+ dx (click-region-left cr))
-			       (+ dy (click-region-top cr))
-			       (+ dx (click-region-right cr))
-			       (+ dy (click-region-bottom cr))
-			       (click-region-thunk cr)
-			       (click-region-show-click? cr)))
-	  
-	  (define/private (shift-interact cr dx dy)
-	    (make-interact (+ dx (interact-left cr))
-                           (+ dy (interact-top cr))
-                           (+ dx (interact-right cr))
-                           (+ dy (interact-bottom cr))
-                           (interact-proc cr)))
-
-	  (define/private (paint-prefetch dc)
-	    (let-values ([(cw ch) (get-client-size)])
-              (paint-letterbox dc cw ch config:use-screen-w config:use-screen-h #f)
-	      (let ([dx (floor (/ (- cw config:use-screen-w) 2))]
-		    [dy (floor (/ (- ch config:use-screen-h) 2))])
-		(send dc draw-bitmap prefetch-bitmap dx dy)
-		(set! click-regions (map (lambda (cr)
-					   (shift-click-region cr dx dy))
-					 prefetched-click-regions))
-                (set! interactives (for/hash ([k (in-hash-keys prefetched-interactives)])
-                                     (values (shift-interact k dx dy)
-                                             #t)))
-                (when (positive? (hash-count prefetched-interactives))
-                  (queue-interactive-check))
-		(send f set-blank-cursor (null? click-regions)))))
-	  (define/override (on-size w h)
-	    (unless resizing-frame?
-	      (redraw)))
-
-	  (define/public (redraw)
-	    (unless printing?
-              (define now (current-milliseconds))
-	      (reset-display-inset! (sliderec-inset (talk-list-ref current-page)) (get-dc))
-	      (send commentary lock #f)
-	      (send commentary begin-edit-sequence)
-	      (send commentary erase)
-	      (let ([s (talk-list-ref current-page)])
-		(when (just-a-comment? (sliderec-comment s))
-		  (for-each (lambda (v)
-			      (send commentary insert (if (string? v)
-							  v
-							  (make-object pict-snip% v))))
-			    (just-a-comment-content (sliderec-comment s)))))
-	      (send commentary scroll-to-position 0 #f 'same 'start)
-	      (send commentary end-edit-sequence)
-	      (send commentary lock #t)
-	      (set! click-regions null)
-              (define old-interactives interactives)
-	      (set! interactives #hash())
-	      (set! clicking #f)
-	      (stop-transition/no-refresh)
-              (when (sliderec-timeout (talk-list-ref current-page))
-                (let ([key (gensym)])
-                  (set! current-timeout-key key)
-                  (define interval
-                    (inexact->exact
-                     (floor 
-                      (* (sliderec-timeout (talk-list-ref current-page))
-                         1000))))
-                  (new timer%
-                       [interval interval]
-                       [just-once? #t]
-                       [notify-callback 
-                        (lambda ()
-                          (when (eq? current-timeout-key key)
-			    ;; run as low priority:
-			    (queue-callback
-			     (lambda ()
-                               (when (send f is-shown?)
-                                 (log-slideshow-debug "Timeout vs. requested: ~s vs. ~s"
-                                                      (- (current-milliseconds) now) 
-                                                      interval)
-                                 (send c-frame next-one)))
-			     #f)))])))
-	      (cond
-	       [config:use-offscreen?
-		(let-values ([(cw ch) (get-client-size)])
-		  (when (and offscreen
-			     (let ([bm (send offscreen get-bitmap)])
-			       (not (and (= cw (send bm get-width))
-					 (= ch (send bm get-height))))))
-		    (send offscreen set-bitmap #f)
-		    (set! offscreen #f))
-		  (unless offscreen
-		    (set! offscreen (make-object bitmap-dc% 
-						 (make-bitmap cw ch)))))
-		(send offscreen clear)
-		(cond
-		 [(equal? prefetched-page current-page)
-		  (paint-prefetch offscreen)]
-		 [else
-		  (paint-slide this offscreen)])
-		(let ([bm (send offscreen get-bitmap)])
-		  (send (get-dc) draw-bitmap bm 0 0))]
-	       [(equal? prefetched-page current-page)
-		(paint-prefetch (get-dc))]
-	       [else
-		(let ([dc (get-dc)])
-		  (send dc clear)
-		  (paint-slide this dc))])
-              (show-spotlight (get-dc))
-              (show-time (get-dc))
-              (swap-interactives! old-interactives interactives)
-              (log-slideshow-debug "Redraw time: ~s"
-                                   (- (current-milliseconds) now))))
-
-          (define interactive-state (make-hash))
-          (define/private (swap-interactives! old new-i)
-            (define shared (for/hash ([k (in-hash-keys old)]
-                                      #:when (hash-ref new-i k #f))
-                             (values k #t)))
-            (for ([k (in-hash-keys old)])
-              (unless (hash-ref shared k #f)
-                (define proc+win (hash-ref interactive-state k #f))
-                (when proc+win
-                  (hash-remove! interactive-state k)
-                  ((car proc+win))
-                  (send (cdr proc+win) show #f))))
-            (for ([k (in-hash-keys new-i)])
-              (unless (hash-ref shared k #f)
-                (define win (new frame%
-                                 [label "Interactive"]
-                                 [style '(float no-resize-border no-caption no-system-menu)]))
-                (define-values (left top) (client->screen (inexact->exact (floor (interact-left k)))
-                                                          (inexact->exact (floor (interact-top k)))))
-                (define-values (right bottom) (client->screen (inexact->exact (ceiling (interact-right k)))
-                                                              (inexact->exact (ceiling (interact-bottom k)))))
-                (define-values (dx dy) (get-display-left-top-inset))
-                (send win move (- left dx) (- top dy))
-                (send win resize (- right left) (- bottom top))
-                (define cancel ((interact-proc k) win))
-                (hash-set! interactive-state k (cons cancel win))
-                (send win show #t)))
-            (set! interactives new-i))
-
-          (define/override on-superwindow-show 
-            (lambda (on?)
-              (unless on?
-                (swap-interactives! interactives #hash()))))
-
-          (define/public (queue-interactive-check)
-            ;; If a superwindow is hidden before we ere get a notification
-            ;; that the superwindow was visible, then we don't get a
-            ;; notification that the window is hidden. Use a low-priority
-            ;; callback to double-check.
-            (queue-callback (lambda ()
-                              (when (positive? (hash-count interactives))
-                                (let loop ([p this])
-                                  (cond
-                                   [(not p) (void)]
-                                   [(send p is-shown?) (loop (send p get-parent))]
-                                   [else
-                                    ;; some superwindow is hidden
-                                    (swap-interactives! interactives #hash())]))))
-                            #f))
-
-          (define/public (call-with-suspended-interactive thunk)
-            (define i interactives)
-            (swap-interactives! i #hash())
-            (begin0
-             (thunk)
-             (swap-interactives! #hash() i)))
-
-          (super-new [style '(no-autoclear)])))
-
-      (define two-c%
-	(class canvas%
-	  (inherit get-dc)
-
-	  (define/public (paint-prefetched)
-	    (let ([dc (get-dc)])
-	      (let*-values ([(cw ch) (send dc get-size)])
-		(send dc set-scale 
-		      (/ (* cw 1/2) (send prefetch-bitmap get-width))
-		      (/ ch (send prefetch-bitmap get-height)))
-		(send dc set-origin (/ cw 2) 0)
-		(send dc draw-bitmap prefetch-bitmap 0 0)
-		(send dc set-origin 0 0)
-		(send dc set-scale 1 1)
-		(send dc draw-line (/ cw 2) 0 (/ cw 2) ch))))
-
-	  (define/override (on-paint)
-	    (let ([dc (get-dc)])
-	      (send dc clear)
-	      (let*-values ([(cw ch) (send dc get-size)])
-		(cond
-		 [(and config:use-prefetch? config:use-prefetch-in-preview?)
-		  (let* ([now-bm (send (send c get-offscreen) get-bitmap)]
-			 [bw (send now-bm get-width)]
-			 [bh (send now-bm get-height)])
-		    (send dc set-scale (/ (/ cw 2) bw) (/ ch bh))
-		    (send dc draw-bitmap now-bm 0 0)
-		    (cond
-		     [(equal? prefetched-page (add1 current-page))
-		      (send dc set-origin (/ cw 3) 0)
-		      (send dc draw-bitmap prefetch-bitmap 0 0)]
-		     [else
-		      (when (< (add1 current-page) slide-count)
-			(let ([b (send dc get-brush)])
-			  (send dc set-brush gray-brush)
-			  (send dc draw-rectangle bw 0 bw bh)
-			  (send dc set-brush b)))])
-		    (send dc set-scale 1 1))]
-		 [else
-		  (paint-slide this dc current-page 2/3 1 cw ch cw ch #f)
-		  (let ([pen (send dc get-pen)]
-			[brush (send dc get-brush)])
-		    (send dc set-pen "black" 1 'solid)
-		    (send dc set-brush "black" 'solid)
-		    (send dc draw-rectangle
-			  (* cw 2/3)
-			  0
-			  (* cw 1/3)
-			  (* ch 1/6))
-		    (send dc draw-rectangle
-			  (* cw 2/3)
-			  (* ch 5/6)
-			  (* cw 1/3)
-			  (* ch 1/6))
-		    (send dc set-pen pen)
-		    (send dc set-brush brush))
-		  (send dc set-origin (* cw 2/3) (* ch 1/6))
-		  (when (< (add1 current-page) slide-count)
-		    (send dc draw-rectangle (* cw 2/3) 0 (* cw 1/3) ch)
-                    (paint-slide this
-                                 dc
-				 (+ current-page 1)
-				 1/3 1/2
-				 cw ch cw ch
-				 #f))])
-		(send dc set-origin 0 0)
-		(send dc draw-line (* cw 2/3) 0 (* cw 2/3) ch))))
-	  
-	  (inherit get-top-level-window)
-	  (define/override (on-event e)
-	    (cond
-	     [(send e button-up?)
-	      (send (get-top-level-window) next)]))
-	  
-	  (define/public (redraw) (unless printing? (on-paint)))
-	  (super-new)))
-
-      (define (paint-letterbox dc cw ch usw ush clip?)
-	(and (or (< usw cw)
-                 (< ush ch))
-             (let ([b (send dc get-brush)]
-                   [p (send dc get-pen)])
-               (send dc set-brush letterbox-brush)
-               (send dc set-pen clear-pen)
-               (when (< usw cw)
-                 (let ([half (/ (- cw usw) 2)])
-                   (send dc draw-rectangle 0 0 half ch)
-                   (send dc draw-rectangle (- cw half) 0 half ch)))
-               (when (< ush ch)
-                 (let ([half (/ (- ch ush) 2)])
-                   (send dc draw-rectangle 0 0 cw half)
-                   (send dc draw-rectangle 0 (- ch half) cw half)))
-               (send dc set-brush b)
-               (send dc set-pen p)
-               (and clip?
-                    (begin0
-                     (box (send dc get-clipping-region))
-                     (send dc set-clipping-rect 
-                           (/ (- cw usw) 2) 
-                           (/ (- ch ush) 2)
-                           usw ush))))))
-
-      (define paint-slide
-	(case-lambda
-	 [(canvas dc) (paint-slide canvas dc current-page)]
-	 [(canvas dc page) 
-	  (let-values ([(cw ch) (send dc get-size)])
-	    (paint-slide canvas dc page 1 1 cw ch config:use-screen-w config:use-screen-h #t))]
-	 [(canvas dc page extra-scale-x extra-scale-y cw ch usw ush to-main?)
-	  (let* ([slide (if (sliderec? page)
-                            page
-                            (talk-list-ref page))]
-		 [ins (sliderec-inset slide)]
-		 [cw (if to-main?
-			 (+ cw (sinset-l ins) (sinset-r ins))
-			 cw)]
-		 [ch (if to-main?
-			 (+ ch (sinset-t ins) (sinset-b ins))
-			 ch)]
-		 [sx (/ usw config:screen-w)]
-		 [sy (/ ush config:screen-h)]
-		 [mx (/ (- cw usw) 2)]
-		 [my (/ (- ch ush) 2)])
-	    (define clip-rgn (paint-letterbox dc cw ch usw ush #t))
-	    
-            (when config:smoothing?
-              (send dc set-smoothing 'aligned))
-            (send dc set-scale (* extra-scale-x sx) (* extra-scale-y sy))
-
-	    ;; Draw the slide
-	    ;;  It's important to set the origin based on
-	    ;;  the floor of my and mx. That way, when we pre-fetch
-	    ;;  into a bitmap, we don't change roundoff in
-	    ;;  the drawing
-	    (let-values ([(ox oy) (send dc get-origin)])
-	      (send dc set-origin 
-		    (+ ox (* extra-scale-x (floor mx))) 
-		    (+ oy (* extra-scale-y (floor my))))
-	      ((sliderec-drawer slide) dc margin margin)
-	      (send dc set-origin ox oy))
-	    
-	    ;; reset the scale
-	    (send dc set-scale 1 1)
-
-	    ;; Slide number
-	    (when (and to-main? show-page-numbers?)
-	      (let ([f (send dc get-font)]
-		    [s (slide-page-string slide)]
-		    [c (send dc get-text-foreground)])
-		(send dc set-font (current-page-number-font))
-		(send dc set-text-foreground (current-page-number-color))
-		(let-values ([(w h d a) (send dc get-text-extent s)])
-		  (send dc draw-text s
-			(- cw w 5 (* sx (sinset-r ins)) (/ (- cw usw) 2))
-			(- ch h 5 (* sy (sinset-b ins)) (/ (- ch ush) 2))))
-		(send dc set-text-foreground c)
-		(send dc set-font f)))
-
-            (when clip-rgn
-              (send dc set-clipping-region (unbox clip-rgn))))]))
-
-      ;; prefetched-page : (union #f number)
-      (define prefetched-page #f)
-      ;; prefetch-bitmap : (union #f bitmap)
-      (define prefetch-bitmap #f)
-      ;; prefetch-bitmap : (union #f bitmap-dc)
-      (define prefetch-dc #f)
-      ;; prefetch-schedule-cancel-box : (box boolean)
-      (define prefetch-schedule-cancel-box (box #f))
-      ;; prefetched-click-regions : list
-      (define prefetched-click-regions null)
-      ;; prefetched-interactives : hash
-      (define prefetched-interactives #hash())
-
-      (define (prefetch-slide canvas n)
-	(set! prefetched-page #f)
-	
-	(unless prefetch-dc
-	  (set! prefetch-dc (new bitmap-dc%)))
-
-	;; try to re-use existing bitmap
-	(unless (and (is-a? prefetch-bitmap bitmap%)
-		     (= config:use-screen-w (send prefetch-bitmap get-width))
-		     (= config:use-screen-h (send prefetch-bitmap get-height)))
-	  (send prefetch-dc set-bitmap #f)
-	  (set! prefetch-bitmap (send canvas make-bitmap config:use-screen-w config:use-screen-h))
-	  (when (send prefetch-bitmap ok?)
-	    (send prefetch-dc set-bitmap prefetch-bitmap)))
-
-	(when (send prefetch-dc ok?)
-	  (send prefetch-dc clear)
-	  (let ([old-click-regions click-regions]
-                [old-interactives interactives]
-		[old-adjust adjust-cursor])
-	    (set! click-regions null)
-	    (set! interactives #hash())
-	    (set! adjust-cursor void)
-	    (paint-slide canvas prefetch-dc n)
-	    (set! prefetched-click-regions click-regions)
-	    (set! prefetched-interactives interactives)
-	    (set! click-regions old-click-regions)
-	    (set! interactives old-interactives)
-            (set! adjust-cursor old-adjust))
-	  (set! prefetched-page n)
-	  (when (and config:use-prefetch-in-preview?
-		     (send f-both is-shown?))
-	    (send c-both paint-prefetched))))
-
-      (define (schedule-slide-prefetch canvas n delay-msec)
-	(cancel-prefetch)
-	(when (and config:use-prefetch?
-		   (not (equal? n prefetched-page)))
-	  (let ([b (box #t)])
-	    (set! prefetch-schedule-cancel-box b)
-	    (new timer% [interval delay-msec] [just-once? #t]
-		 [notify-callback (lambda ()
-				    (when (unbox b)
-				      (if (pair? current-transitions)
-					  ;; try again to wait for transition to end
-					  (schedule-slide-prefetch canvas n delay-msec)
-					  ;; Build next slide...
-					  (prefetch-slide canvas n))))]))))
-
-
-      (define (cancel-prefetch)
-	(set-box! prefetch-schedule-cancel-box #f))
-
-      (define c (make-object c% f))
-      (define c-both (make-object two-c% f-both))
-
-      (define (viewer:pict->pre-render-pict p)
-        (case (system-type)
-          [(macosx)
-           (let ([bm (send c make-bitmap
-                           (inexact->exact (ceiling (pict-width p)))
-                           (inexact->exact (ceiling (pict-height p))))])
-             (define dc (send bm make-dc))
-             ((make-pict-drawer p) dc 0 0)
-             (send dc set-bitmap #f)
-             (refocus (lt-superimpose (ghost p) (bitmap bm)) p))]
-          [else (refocus (cc-superimpose (blank) p) p)]))
-
-      (define time-update-thread #f)
-      (define (start-time-update!)
-        (when config:show-time?
-          (unless time-update-thread
-            (set! time-update-thread
-                  (thread (lambda ()
-                            (let loop ([prev-minute #f])
-                              (define m (date-minute (seconds->date (current-seconds))))
-                              (unless (equal? m prev-minute)
-                                (queue-callback
-                                 (lambda () (send c refresh))))
-                              (sleep 1)
-                              (loop m))))))))
-      (define (stop-time-update!)
-        (when time-update-thread
-          (kill-thread time-update-thread)
-          (set! time-update-thread #f)))
-      
-      (define refresh-page
-	(lambda ([immediate-prefetch? #f])
-	  (hide-cursor-until-moved)
-          (set! spotlight-shown? #f)
-	  (send f set-blank-cursor #t)
-	  (when (= current-page 0)
-	    (set! start-time #f)
-	    (unless start-time
-	      (set! start-time (current-seconds))))
-	  (send c redraw)
-	  (when (and c-both (send f-both is-shown?))
-	    (send c-both redraw))
-	  (when (< current-page (- slide-count 1))
-	    (schedule-slide-prefetch c
-                                     (+ current-page 1)
-				     (if immediate-prefetch?
-					 50
-					 500)))))
-
-      (define current-transitions null)
-      (define current-transitions-key #f)
-      (define current-timeout-key #f)
-
-      (define (do-transitions transes offscreen)
-	(let ([key (cons 1 2)])
-	  (set! current-transitions (map (lambda (mk) (mk offscreen)) transes))
-	  (set! current-transitions-key key)
-	  (if (null? transes)
-	      (refresh-page #t)
-	      (let do-trans ()
-		(when (and (eq? current-transitions-key key)
-			   (pair? current-transitions))
-		  (let ([went ((car current-transitions) c offscreen)])
-		    (if (eq? went 'done)
-			(begin
-			  (set! current-transitions (cdr current-transitions))
-			  (if (null? current-transitions)
-			      (refresh-page #t)
-			      (do-trans)))
-			(new timer% 
-			     [just-once? #t]
-			     [interval (inexact->exact (floor (* 1000 went)))]
-			     [notify-callback (lambda ()
-						;; Going through queue-callback
-						;;  avoids blocking events
-						(queue-callback
-						 do-trans
-						 #f))]))))))))
-
-      (define (stop-transition)
-	(cancel-prefetch)
-	(unless (null? current-transitions)
-	  (stop-transition/no-refresh)
-	  (refresh-page)))
-      
-      (define (stop-transition/no-refresh)
-	(set! current-transitions null)
-	(set! current-transitions-key #f)
-        (set! current-timeout-key #f))
-      
-      (define (get-page-from-user)
-	(unless (zero? slide-count)
-	  (letrec ([d (make-object dialog% "Goto Page" f 200 250)]
-		   [short-slide-list 
-		    (let loop ([slides talk-slide-list][n 1][last-title #f])
-		      (cond
-		       [(null? slides) null]
-		       [(and last-title
-			     (equal? last-title (or (sliderec-title (car slides))
-						    "(untitled)")))
-			(loop (cdr slides) (+ n 1) last-title)]
-		       [else
-			(let ([title (or (sliderec-title (car slides))
-					 "(untitled)")])
-			  (cons (cons
-				 n
-				 (format "~a. ~a" 
-					 (slide-page-string (car slides))
-					 title))
-				(loop (cdr slides) (add1 n) title)))]))]
-		   [long-slide-list (let loop ([slides talk-slide-list][n 1])
-				      (if (null? slides)
-					  null
-					  (cons (cons
-						 n
-						 (format "~a. ~a" 
-							 (slide-page-string (car slides))
-							 (or (sliderec-title (car slides))
-							     "(untitled)")))
-						(loop (cdr slides) (add1 n)))))]
-		   [slide-list short-slide-list]
-		   [l (make-object list-box% #f (map cdr slide-list)
-				   d (lambda (l e)
-				       (when (eq? (send e get-event-type) 'list-box-dclick)
-					 (ok-action))))]
-		   [p (make-object horizontal-pane% d)]
-		   [ok-action (lambda ()
-				(send d show #f)
-				(let ([i (send l get-selection)])
-				  (when i
-				    (set! current-page (sub1 (car (list-ref slide-list i))))
-				    (refresh-page))))])
-	    (send d center)
-	    (send p stretchable-height #f)
-	    (make-object check-box% "&All Pages" p
-			 (lambda (c e)
-			   (set! slide-list (if (send c get-value)
-						long-slide-list
-						short-slide-list))
-			   (send l set (map cdr slide-list))))
-	    (make-object pane% p)
-	    (make-object button% "Cancel" p (lambda (b e) (send d show #f)))
-	    (make-object button% "Ok" p (lambda (b e) (ok-action)) '(border))
-	    (send l focus)
-	    (send d reflow-container)
-	    (let ([now (let loop ([l slide-list][n 0])
-			 (if (null? l)
-			     (sub1 n)
-			     (if (> (sub1 (caar l)) current-page)
-				 (sub1 n)
-				 (loop (cdr l) (add1 n)))))])
-	      (send l set-selection (max 0 now))
-	      (send l set-first-visible-item (max 0 (- now 3))))
-	    (send d show #t))))
-      
-      (send f reflow-container)
-      (send f-both reflow-container)
-
-      (refresh-page)
-      
-      (define slideshow-bm
-	(include-bitmap (lib "slideshow/slideshow.png")))
-      (define slideshow-mbm
-	(include-bitmap (lib "slideshow/mask.xbm")))
-
-      (let* ([bm slideshow-bm]
-	     [mbm slideshow-mbm])
-	(when (send bm ok?)
-	  (send f set-icon bm (and (send mbm ok?) mbm) 'both)))
-      
-      (when (and config:commentary?
-		 (not config:commentary-on-slide?))
-	(send c-frame show #t)
-	(message-box "Instructions"
-		     (format "Keybindings:~
-                     \n  {Meta,Alt}-q - quit~
-                     \n  Right, Space, f or n - next slide~
-                     \n  Left, b - prev slide~
-                     \n  g - last slide~
-                     \n  1 - first slide~
-                     \n  {Meta,Alt}-g - select slide~
-                     \n  p - show/hide slide number~
-                     \n  {Meta,Alt}-c - show/hide commentary~
-                     \n  {Meta,Alt,Shift}-{Right,Left,Up,Down} - move window~
-                     \nAll bindings work in all windows")))
-      
-      (define (do-print)
-	(let ([ps-dc (dc-for-text-size)])
-	  (when config:smoothing?
-	    (send ps-dc set-smoothing 'aligned)) ; for printer-dc%
-	  (let loop ([start? #f][l (list-tail talk-slide-list current-page)][n current-page])
-	    (unless (null? l)
-	      (set! current-page n)
-	      (refresh-page)
-	      (when start?
-		(send ps-dc start-page))
-	      (let ([slide (car l)])
-		(let ([xs (/ config:use-screen-w config:screen-w)]
-		      [ys (/ config:use-screen-h config:screen-h)])
-		  (send ps-dc set-scale xs ys)
-                  (let ([clip (send ps-dc get-clipping-region)]
-                        [dx (/ (- config:actual-screen-w config:use-screen-w) 2 xs)]
-                        [dy (/ (- config:actual-screen-h config:use-screen-h) 2 ys)])
-                    (send ps-dc set-clipping-rect dx dy config:screen-w config:screen-h)
-                    ((sliderec-drawer slide) ps-dc (+ margin dx) (+ margin dy))
-                    (send ps-dc set-clipping-region clip)))
-		(when show-page-numbers?
-		  (send ps-dc set-scale 1 1)
-		  (let ([s (slide-page-string slide)])
-		    (let-values ([(w h) (send ps-dc get-size)]
-				 [(sw sh sd sa) (send ps-dc get-text-extent s)]
-				 [(hm vm) (values margin margin)])
-		      (send ps-dc draw-text s (- w hm sw) (- h vm sh))))))
-	      (send ps-dc end-page)
-	      (loop #t (cdr l) (add1 n))))
-	  (parameterize ([current-security-guard original-security-guard])
-	    (send ps-dc end-doc))
-	  (exit)))
-
-      ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;                Progress for Print             ;;
-      ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-      (define-values (progress-window progress-display)
-	(if config:printing?
-	    (parameterize ([current-eventspace (make-eventspace)])
-	      (let* ([f (make-object (class frame% 
-				       (define/augment (on-close) (exit))
-				       (super-instantiate ()))
-				     "Progress")]
-		     [h (instantiate horizontal-panel% (f)
-				     (stretchable-width #f)
-				     (stretchable-height #f))])
-		(make-object message% "Building slide: " h)
-		(let ([d (make-object message% "0000" h)])
-		  (send d set-label "1")
-		  (send f center)
-		  (send f show #t)
-		  (values f d))))
-	    (values #f #f)))
-
-      (define (viewer:done-making-slides)
-	(when config:printing?
-	  (do-print)))
-
-      (when config:printing?
-        ;; Just before exiting normally, print the slides:
-        (let ([h (executable-yield-handler)])
-          (executable-yield-handler
-           (lambda (v)
-             (viewer:done-making-slides)
-             (h v)))))
-
-      (let ([eh (uncaught-exception-handler)])
-	(uncaught-exception-handler
-	 (lambda (exn)
-	   (send f show #f)
-	   (when f-both
-	     (send f-both show #f))
-	   (when background-f
-	     (send background-f show #f))
-           (stop-time-update!)
-	   (eh exn))))))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/texpict/slideshow-run.rkt b/pkgs/slideshow-pkgs/slideshow-lib/texpict/slideshow-run.rkt
deleted file mode 100644
index c88de6e1e5..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/texpict/slideshow-run.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-(module slideshow-run "slideshow.rkt"
-  (require (prefix slideshow: slideshow/run))
-
-  (provide (all-from-except "slideshow.rkt" #%module-begin)
-           (rename slideshow:#%module-begin #%module-begin)))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/texpict/slideshow.rkt b/pkgs/slideshow-pkgs/slideshow-lib/texpict/slideshow.rkt
deleted file mode 100644
index 4db725cb82..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/texpict/slideshow.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-(module slideshow slideshow/slideshow
-  (provide (all-from slideshow/slideshow)))
diff --git a/pkgs/slideshow-pkgs/slideshow-lib/texpict/symbol.rkt b/pkgs/slideshow-pkgs/slideshow-lib/texpict/symbol.rkt
deleted file mode 100644
index a4baeae7e7..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-lib/texpict/symbol.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-(module symbol slideshow/slideshow
-  
-  (provide symbol
-	   sym:in sym:rightarrow sym:leftarrow sym:infinity sym:times 
-	   sym:implies sym:emdash 
-	   sym:therefore)
-  
-  (define (symbol n)
-    (text (string (integer->char n)) 'symbol font-size))
-
-  (define sym:in (symbol #x2208))
-  (define sym:rightarrow (symbol #x2192))
-  (define sym:leftarrow (symbol #x2190))
-  (define sym:infinity (symbol #x221E))
-  (define sym:times (symbol 215))
-  (define sym:implies (symbol #x21D2))
-  (define sym:emdash (symbol #x2014))
-  (define sym:therefore (symbol #x2234)))
-
-
diff --git a/pkgs/slideshow-pkgs/slideshow-plugin/LICENSE.txt b/pkgs/slideshow-pkgs/slideshow-plugin/LICENSE.txt
deleted file mode 100644
index 212f187c86..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-plugin/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-slideshow-plugin
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/slideshow-pkgs/slideshow-plugin/info.rkt b/pkgs/slideshow-pkgs/slideshow-plugin/info.rkt
deleted file mode 100644
index afd96c99b5..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-plugin/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "slideshow-lib"
-               "pict-lib"
-               "string-constants-lib"
-               "compatibility-lib"
-               "drracket-plugin-lib"
-               "gui-lib"))
-
-(define pkg-desc "Slideshow's DrRacket plugin")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/slideshow-pkgs/slideshow-plugin/slideshow/info.rkt b/pkgs/slideshow-pkgs/slideshow-plugin/slideshow/info.rkt
deleted file mode 100644
index da97959f2b..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-plugin/slideshow/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define tools (list '("tool.rkt")))
-(define tool-names (list "Slideshow"))
-(define tool-icons (list (list "slideshow.png" "slideshow")))
diff --git a/pkgs/slideshow-pkgs/slideshow-plugin/slideshow/tool.rkt b/pkgs/slideshow-pkgs/slideshow-plugin/slideshow/tool.rkt
deleted file mode 100644
index a25786e3be..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-plugin/slideshow/tool.rkt
+++ /dev/null
@@ -1,374 +0,0 @@
-#|
-
-todo:
-
-pict snip :
-- snipclass for running snips outside of drscheme
-- need to toggle the picts back to scheme code when
-  important things happen (save, execute, etc).
-- should save the true pict size when it gets recorded.
-- show the true size in the GUI
-- when a snip is deleted from inside the pasteboard, remove it from the caches
-- check that when a snip is inserted, things revert (?).
-   maybe something better should happen?
-- test up-to-date? flag
-|#
-
-(module tool racket/base
-  (require drscheme/tool
-           mred
-           mzlib/class
-           mzlib/unit
-           mzlib/contract
-           string-constants
-           framework
-           texpict/mrpict
-           texpict/pict-value-snip
-           mzlib/list
-           slideshow/private/pict-box-lib
-           slideshow/private/image-snipr)
-
-  (provide tool@
-           get-snp/poss
-           build-lib-pict-stx)
-
-  (define orig-inspector (variable-reference->module-declaration-inspector
-                          (#%variable-reference)))
-  (define orig-lcp (current-library-collection-paths))
-
-  (define tool@
-    (unit 
-      (import drscheme:tool^)
-      (export drscheme:tool-exports^)
-      (define original-output-port (current-output-port))
-      (define (oprintf . args) (apply fprintf original-output-port args))
-      
-      (define sc-hide-picts (string-constant slideshow-hide-picts))
-      (define sc-show-picts (string-constant slideshow-show-picts))
-      (define sc-cannot-show-picts (string-constant slideshow-cannot-show-picts))
-      (define sc-insert-pict-box (string-constant slideshow-insert-pict-box))
-      
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;; pict box
-      ;;
-      
-      
-      (define pict-pasteboard%
-        (class pasteboard%
-          (inherit get-admin)
-          
-          (define/augment (after-insert snip before x y)
-            (let ([admin (get-admin)])
-              (when (is-a? admin editor-snip-editor-admin<%>)
-                (send (send admin get-snip) inserted-snip)))
-            (inner (void) after-insert snip before x y))
-          
-          (super-new)))
-      
-      (define pict-snip%
-        (class* decorated-editor-snip% (readable-snip<%>)
-          (inherit get-editor)
-
-          (define show-picts? #f)
-          
-          ;; only for use in the copy method and the read snipclass method
-          (define/public (set-show-picts b) (set! show-picts? b))
-          
-          ;; bitmap-table : hash[snip -o> bitmap]
-          ;; maps from the true (Scheme) snip to its current bitmap
-          (define bitmap-table (make-hasheq))
-          
-          ;; only for use in the copy method and the read snipclass method
-          (define/public (set-bitmap-table bt) (set! bitmap-table bt))
-          
-          (define/override (make-editor) (make-object pict-pasteboard%))
-          (define/override (get-corner-bitmap) slideshow-bm)
-          
-          (define/override (copy)
-            (let* ([cp (make-object pict-snip%)]
-                   [ed (send cp get-editor)])
-              (send (get-editor) copy-self-to ed)
-              (send cp set-show-picts show-picts?)
-              ;; initially, share the bitmap table:
-              (send cp set-bitmap-table bitmap-table)
-              cp))
-          
-          
-          (define/override (get-menu)
-            (let ([menu (instantiate popup-menu% () (title #f))])
-              (cond
-                [show-picts?
-                 (make-object checkable-menu-item%
-                   sc-hide-picts
-                   menu
-                   (lambda (x y)
-                     (hide-picts)))]
-                [(and bitmap-table
-                      (positive? (hash-count bitmap-table)))
-                 (make-object checkable-menu-item%
-                   sc-show-picts
-                   menu
-                   (lambda (x y)
-                     (show-picts)))]
-                [else
-                 (let ([m (make-object menu-item%
-                            sc-cannot-show-picts
-                            menu
-                            (lambda (x y) void))])
-                   (send m enable #f))])
-              menu))
-          
-          (define/public (update-bitmap-table sub-snips sub-bitmaps)
-            (let ([hidden-table (make-hasheq)]
-                  [position-table (make-hasheq)])
-              (let loop ([snip (send (get-editor) find-first-snip)] [pos 0])
-                (cond
-                  [snip
-                   (hash-set! position-table snip pos)
-                   (when (is-a? snip image-snip/r%)
-                     (hash-set! hidden-table (send snip get-orig-snip) snip))
-                   (loop (send snip next) (add1 pos))]
-                  [else (void)]))
-              (for-each (lambda (snip bitmap) 
-                          (hash-set! bitmap-table (hash-ref position-table snip #f) bitmap)
-                          (let ([showing (hash-ref hidden-table snip (lambda () #f))])
-                            (when showing
-                              (send showing set-bitmap bitmap))))
-                        sub-snips
-                        sub-bitmaps)))
-          
-          (define/private (show-picts)
-            (let ([pb (get-editor)])
-              (set! show-picts? #t)
-              (send pb begin-edit-sequence)
-              
-              (set! system-insertion? #t)
-              (let ([position-table (make-hasheq)])
-                (let loop ([snip (send (get-editor) find-first-snip)] [pos 0])
-                  (cond
-                   [snip
-                    (hash-set! position-table pos snip)
-                    (loop (send snip next) (add1 pos))]
-                   [else (void)]))
-                (hash-for-each 
-                 bitmap-table
-                 (lambda (pos bitmap)
-                   (let ([snip (hash-ref position-table pos #f)])
-                     (when snip
-                       (let ([bm-snip (make-object image-snip/r% bitmap snip)])
-                         (let-values ([(x y) (snip-location pb snip)])
-                           (send snip release-from-owner)
-                           (send pb insert bm-snip x y))))))))
-              (set! system-insertion? #f)
-              
-              (send pb end-edit-sequence)))
-          
-          (define/private (hide-picts)
-            (let ([pb (get-editor)])
-              (set! show-picts? #f)
-              
-              (send pb begin-edit-sequence)
-              
-              (let ([all-snips (let loop ([snip (send pb find-first-snip)])
-                                 (cond
-                                   [snip (cons snip (loop (send snip next)))]
-                                   [else null]))])
-                (set! system-insertion? #t)
-                (for-each (lambda (snip)
-                            (when (is-a? snip image-snip/r%)
-                              (let ([real-snip (send snip get-orig-snip)])
-                                (let-values ([(x y) (snip-location pb snip)])
-                                  (send snip release-from-owner)
-                                  (send pb insert real-snip x y)))))
-                          all-snips)
-                (set! system-insertion? #f))
-              
-              (send pb end-edit-sequence)))
-          
-          ;; called on user thread
-          (define/public (read-special file line col pos)
-            (let ([ans-chan (make-channel)])
-              (parameterize ([current-eventspace drs-eventspace])
-                (queue-callback
-                 (lambda ()
-                   (channel-put ans-chan (get-snp/poss this)))))
-              (let ([snp/poss (channel-get ans-chan)])
-                (build-lib-pict-stx 
-                 (lambda (ids)
-                   (with-syntax ([(ids ...) ids]
-                                 [this this]
-                                 [build-bitmap/check build-bitmap/check]
-                                 [drs-eventspace drs-eventspace]
-                                 [current-eventspace current-eventspace]
-                                 [queue-callback queue-callback]
-                                 [(subsnips ...) (map snp/pos-snp snp/poss)]
-                                 [(bitmap-ids ...) (generate-ids "drawer-id" (map snp/pos-snp snp/poss))])
-                     (syntax
-                      (let ([bitmap-ids (build-bitmap/check ids (pict-width ids) (pict-height ids) draw-pict pict?)] ...)
-                        (parameterize ([current-eventspace drs-eventspace])
-                          (queue-callback 
-                           (lambda () ;; drs eventspace
-                             (send this update-bitmap-table 
-                                   (list subsnips ...)
-                                   (list bitmap-ids ...)))))))))
-                 snp/poss))))
-          
-          (define/override (write stream-out)
-            (send stream-out put (if show-picts? 1 0))
-            (send stream-out put 0)
-            (send (get-editor) write-to-file stream-out))
-          (define/override (make-snip) (new pict-snip%))
-          
-          (define system-insertion? #f)
-          (define/public (inserted-snip)
-            (unless system-insertion?
-              (set-bitmap-table (make-hasheq))
-              (when show-picts?
-                (hide-picts))))
-          
-          (inherit show-border set-snipclass)
-          (super-new)
-          (show-border #t)
-          (set-snipclass lib-pict-snipclass)))
-      
-      (define lib-pict-snipclass%
-        (class snip-class%
-          (define/override (read stream-in)
-            (let* ([snip (new pict-snip%)]
-                   [editor (send snip get-editor)]
-                   [show-picts? (not (zero? (send stream-in get-exact)))]
-                   [up-to-date? (not (zero? (send stream-in get-exact)))])
-              (send editor read-from-file stream-in #f)
-              (send snip set-show-picts show-picts?)
-              (let ([bt (make-hasheq)])
-                (let loop ([snip (send editor find-first-snip)])
-                  (cond
-                    [(is-a? snip snip%)
-                     (when (is-a? snip image-snip/r%)
-                       (let ([orig (send snip get-orig-snip)]
-                             [bm (send snip get-bitmap)])
-                         (hash-set! bt orig bm)))
-                     (loop (send snip next))]
-                    [else (void)]))
-                (send snip set-bitmap-table bt))
-              snip))
-          (super-new)))
-      
-      ;; build-bitmap/check : pict number number (pict dc number number -> void) (any -> boolean) -> bitmap
-      ;; called on user-thread with a pict that the user made
-      (define (build-bitmap/check pict w h draw-pict pict?)
-        (unless (pict? pict) 
-          (error 'pict-snip "expected a pict to be the result of each embedded snip, got ~e"
-                 pict))
-        (let* ([bm (make-object bitmap% 
-                     (max 1 (add1 (inexact->exact (ceiling w))))
-                     (max 1 (add1 (inexact->exact (ceiling h)))))]
-               [bdc (make-object bitmap-dc% bm)])
-          (send bdc clear)
-          (send bdc set-smoothing 'aligned)
-          (draw-pict pict bdc 0 0)
-          (send bdc set-bitmap #f)
-          bm))
-      
-      (define (set-box/f b v) (when (box? b) (set-box! b v)))
-      
-      (define slideshow-bm
-        (let ([bm (make-object bitmap% (build-path (collection-path "slideshow") "slideshow.bmp"))])
-          (and (send bm ok?)
-               bm)))
-      
-      (define drs-eventspace (current-eventspace))
-      
-      (define (add-special-menu-item menu frame)
-        (let* ([find-insertion-point ;; -> (union #f editor<%>)
-                ;; returns the editor (if there is one) with the keyboard focus
-                (lambda ()
-                  (let ([editor (send frame get-edit-target-object)])
-                    (and editor
-                         (is-a? editor editor<%>)
-                         (let loop ([editor editor])
-                           (let ([focused (send editor get-focus-snip)])
-                             (if (and focused
-                                      (is-a? focused editor-snip%))
-                                 (loop (send focused get-editor))
-                                 editor))))))]
-               [insert-snip
-                (lambda (make-obj)
-                  (let ([editor (find-insertion-point)])
-                    (when editor
-                      (let ([snip (make-obj)])
-                        (send editor insert snip)
-                        (send editor set-caret-owner snip 'display)))))]
-               [demand-callback ;; : menu-item% -> void
-                ;; enables the menu item when there is an editor available.
-                (lambda (item)
-                  (send item enable (find-insertion-point)))])
-          (instantiate menu:can-restore-menu-item% ()
-            (label sc-insert-pict-box)
-            (parent menu)
-            (demand-callback demand-callback)
-            (callback 
-             (lambda (menu evt)
-               (insert-snip 
-                (lambda () (new pict-snip%))))))))
-      
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;
-      ;;  wire it up
-      ;;
-      
-      (define (phase1) (void))
-      (define (phase2) (void))
-
-      (define (pict-box-mixin %)
-        (class %
-          (inherit get-insert-menu)
-          (super-new)
-          (add-special-menu-item (get-insert-menu) this)))
-
-      (when (getenv "PLTPICTBOX")
-        (drscheme:get/extend:extend-unit-frame pict-box-mixin))
-      
-      (define orig-namespace (current-namespace))
-      
-      (define (pict->image-snip p)
-        (let* ([pict-width  (dynamic-require 'texpict/mrpict 'pict-width)]
-               [pict-height (dynamic-require 'texpict/mrpict 'pict-height)]
-               [draw-pict   (dynamic-require 'texpict/mrpict 'draw-pict)]
-               [bm (make-object bitmap%
-                     (max 1 (add1 (inexact->exact (ceiling (pict-width p)))))
-                     (max 1 (add1 (inexact->exact (ceiling (pict-height p))))))]
-               [bdc (make-object bitmap-dc% bm)])
-          (send bdc clear)
-          (send bdc set-smoothing 'aligned)
-          (draw-pict p bdc 0 0)
-          (send bdc set-bitmap #f)
-          (make-object image-snip% bm)))
-      
-      ;; do not add this anymore, since it is covered internally
-      ;; by drracket's use of the pict/convert library
-      #;
-      (drscheme:language:add-snip-value
-       ;; Convert to print?
-       (lambda (x) 
-         ;; if the require fails, then we cannot display the pict.
-         ;; this can happen when, for example, there is no mred module
-         ;; in the namespace
-         (let ([pict? (with-handlers ((exn:fail? (λ (x) #f)))
-                        (dynamic-require 'texpict/mrpict 'pict?))])
-           (and pict?
-                (pict? x))))
-       ;; Converter:
-       pict->image-snip
-       ;; Namespace setup:
-       (λ () 
-         (with-handlers ((exn:fail? void))
-           ;; code running in this thunk cannot fail, or else drscheme gets wedged.
-           (dynamic-require 'texpict/mrpict #f))))
-        
-      (define lib-pict-snipclass (make-object lib-pict-snipclass%))
-      (send lib-pict-snipclass set-version 2)
-      (send lib-pict-snipclass set-classname (format "~s" '(lib "pict-snipclass.ss" "slideshow")))
-      (send (get-the-snip-class-list) add lib-pict-snipclass))))
diff --git a/pkgs/slideshow-pkgs/slideshow-plugin/texpict/face-demo.rkt b/pkgs/slideshow-pkgs/slideshow-plugin/texpict/face-demo.rkt
deleted file mode 100644
index 406c44c418..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-plugin/texpict/face-demo.rkt
+++ /dev/null
@@ -1,175 +0,0 @@
-(module face-demo mzscheme
-  (require mred
-           mzlib/class
-           texpict/utils
-           texpict/mrpict
-           texpict/face)
-
-  (module test racket/base)
-
-  (define f (new frame% (label "frame")))
-
-  (define canvas-scale 1)
-  
-  (define c (new canvas%
-                 (parent f)
-                 (paint-callback
-                  (lambda (x dc) 
-                    (send dc set-scale canvas-scale canvas-scale)
-                    (send dc set-smoothing 'aligned)
-                    (cb dc)))))
-  
-  
-  (define shading-parameters
-    (list #:mouth-shading?
-          #:eye-shading?
-          #:eyebrow-shading?
-          #:tongue-shading?
-          #:face-background-shading?
-          #:teeth?))
-  
-  (define moods
-    '(unhappiest
-      unhappier
-      unhappy
-      sortof-unhappy
-      sortof-happy
-      happy
-      happier
-      happiest
-      embarrassed
-      badly-embarrassed
-      mad
-      mean
-      surprised))
-  
-  (new button%
-       (label "Face Color...")
-       (parent f)
-       (callback (lambda (b e) 
-                   (let ([c (get-color-from-user "Face Color" f face-color)])
-                     (when c
-                       (set! face-color c)
-                       (new-face-callback))))))
-  (new choice%
-       (label #f)
-       (choices (append (map symbol->string moods) (list "Custom")))
-       (parent f)
-       (callback (lambda (c e) 
-                   (let ([v (send c get-selection)])
-                     (set! face-mood (and (v . < . (length moods))
-                                          (list-ref moods v)))
-                     (new-face-callback)))))
-  
-  (define custom-panel (new group-box-panel% (label "Custom") (parent f)))
-  (define hp (new horizontal-panel% (parent custom-panel)))
-  (define custom-left-panel (new vertical-panel% (parent hp)))
-  (define custom-right-panel (new vertical-panel% (parent hp) (alignment '(left top))))
-  
-  (define shading-checkboxes
-    (map
-     (λ (parameter)
-       (new check-box%
-            (label (format "~a" parameter))
-            (parent custom-right-panel)
-            (value #t)
-            (callback (λ (cb _) (new-face-callback)))))
-     shading-parameters))
-  
-  (let ([choices '(none normal worried angry raised)])
-    (new choice%
-         (label "Eyebrows")
-         (choices (map symbol->string choices)) 
-         (parent custom-left-panel)
-         (callback (lambda (c e)
-                     (set! face-eyebrow-kind (list-ref choices (send c get-selection)))
-                     (new-face-callback)))))
-  (let ([choices '(plain narrow medium large huge grimace oh tongue)])
-    (new choice%
-         (label "Mouth")
-         (choices (map symbol->string choices)) 
-         (parent custom-left-panel)
-         (callback (lambda (c e)
-                     (set! face-mouth-kind (list-ref choices (send c get-selection)))
-                     (new-face-callback)))))
-  (new check-box%
-       (label "Frown")
-       (parent custom-left-panel)
-       (callback (lambda (c e)
-                   (set! face-frown? (send c get-value))
-                   (new-face-callback))))
-  (new slider%
-       (label "Eye Inset")
-       (parent custom-left-panel)
-       (min-value -10)
-       (max-value 10)
-       (init-value 0)
-       (callback (lambda (s e)
-                   (set! face-eye-inset (send s get-value))
-                   (new-face-callback))))
-  (new slider%
-       (label "Eyebrow Y")
-       (parent custom-left-panel)
-       (min-value -5)
-       (max-value 5)
-       (init-value 0)
-       (callback (lambda (s e)
-                   (set! face-eyebrow-dy (send s get-value))
-                   (new-face-callback))))
-  (let ([pupils
-         (lambda (label setter hi)
-           (new slider%
-                (label label)
-                (parent custom-left-panel)
-                (min-value (- hi))
-                (max-value hi)
-                (init-value 0)
-                (callback (lambda (s e)
-                            (setter (send s get-value))
-                            (new-face-callback)))))])
-    (pupils "Pupil X" (lambda (v) (set! face-pupils-dx v)) 10)
-    (pupils "Pupil Y" (lambda (v) (set! face-pupils-dy v)) 15))
-  
-  
-  (send custom-panel enable #f)
-  
-  (dc-for-text-size (send c get-dc))
-  
-  (define face-color default-face-color)
-  (define face-mood (car moods))
-  (define face-eyebrow-kind 'none)
-  (define face-mouth-kind 'plain)
-  (define face-frown? #f)
-  (define face-eye-inset 0)
-  (define face-eyebrow-dy 0)
-  (define face-pupils-dx 0)
-  (define face-pupils-dy 0)
-  
-  (define the-pict (face face-mood face-color))
-  
-  (define (new-face-callback)
-    (send custom-panel enable (not face-mood))
-    (set! the-pict (if face-mood
-                       (face face-mood face-color)
-                       (apply face*
-                              face-eyebrow-kind
-                              face-mouth-kind
-                              face-frown?
-                              face-color
-                              face-eye-inset
-                              face-eyebrow-dy
-                              face-pupils-dx
-                              face-pupils-dy
-                              (apply
-                               append
-                               (map (λ (kw cb) (list kw (send cb get-value)))
-                                    shading-parameters
-                                    shading-checkboxes)))))
-    (send c on-paint))
-  
-  (define (cb dc) (draw-pict the-pict dc 0 0))
-  
-  (send c min-width (inexact->exact (floor (* canvas-scale (pict-width the-pict)))))
-  (send c min-height (inexact->exact (floor (* canvas-scale (pict-height the-pict)))))
- 
-  (send f show #t))
diff --git a/pkgs/slideshow-pkgs/slideshow-plugin/texpict/pict-value-snip.rkt b/pkgs/slideshow-pkgs/slideshow-plugin/texpict/pict-value-snip.rkt
deleted file mode 100644
index 37596fd35e..0000000000
--- a/pkgs/slideshow-pkgs/slideshow-plugin/texpict/pict-value-snip.rkt
+++ /dev/null
@@ -1,349 +0,0 @@
-#|
-
-TODO: copying/pasting of pict snips doesn't preserve all of the information.
-It only preserves the look, for now. The bounding boxes for children, in particular,
-are gone.
-
-When pressing or releasing the modifier keys, the snip doesn't update immediately;
-the user has to move the mouse first.
-
-|#
-
-(module pict-value-snip mzscheme
-  (require texpict/mrpict
-           texpict/utils
-           mzlib/class
-           racket/gui/base
-           mzlib/etc
-           mzlib/list)
-  
-  (provide pict-value-snip%)
-
-  (define pict-value-snip%
-    (class snip%
-      (init-field pict)
-      (define top-align? #t)
-      (define white? #f)
-      (define pict-drawer (make-pict-drawer pict))
-      (define/override (draw dc x y left top right bottom dx dy draw-caret)
-	(let ([smoothing (send dc get-smoothing)])
-	  (send dc set-smoothing 'aligned)
-	  (pict-drawer dc x y)
-	  (send dc set-smoothing smoothing))
-        (let ([old-pen (send dc get-pen)]
-              [old-brush (send dc get-brush)])
-          (send dc set-brush (send the-brush-list find-or-create-brush "black" 'transparent))
-          (send dc set-pen (send the-pen-list find-or-create-pen
-                                 (if white? "white" "black")
-                                 1
-                                 'solid))
-          (for-each (lambda (child)
-                      (send dc draw-rectangle
-                            (+ x (hbox-x child))
-                            (+ y (hbox-y child))
-                            (hbox-w child)
-                            (hbox-h child)))
-                    highlight-children)
-          (send dc set-pen old-pen)
-          (send dc set-brush old-brush)))
-      (define/override (get-extent dc x y w h descent space lspace rspace)
-        (set-box/f! w (pict-width pict))
-        (set-box/f! h (pict-height pict))
-        (cond
-          [top-align?
-           (set-box/f! descent (- (pict-height pict) (pict-ascent pict)))
-           (set-box/f! space 0)]
-          [else
-           (set-box/f! descent (pict-descent pict))
-           (set-box/f! space 0)])
-        (set-box/f! lspace 0)
-        (set-box/f! rspace 0))
-      
-      (define highlight-children '())
-      
-      (define/override (on-event dc x y editorx editory evt)
-        (let* ([sx (- (send evt get-x) x)]
-               [sy (- (send evt get-y) y)]
-               [needs-update? #f]
-               [update-children
-                (lambda (children)
-                  (unless (equal? children highlight-children)
-                    (set! needs-update? #t)
-                    (set! highlight-children children)))])
-          
-          (unless (equal? white? (send evt get-shift-down))
-            (set! white? (send evt get-shift-down))
-            (set! needs-update? #t))
-          
-          (cond
-            [(send evt get-control-down)
-             (update-children (all-boxes pict))]
-            [(or (send evt get-alt-down)
-                 (send evt get-meta-down))
-             (update-children (included-boxes pict sx sy))]
-            [else
-             (update-children (minimal-boxes pict sx sy))])
-          
-          (when needs-update?
-            (refresh))))
-      
-      ;; this doesn't work at all.
-      (define/override (on-char dc x y editorx editory evt)
-        (cond
-          [(eq? (send evt get-key-code) 'shift)
-           (set! white? (eq? 'press (send evt get-key-release-code)))
-           (refresh)]
-          [else (void)]))
-      
-      (define/override (adjust-cursor dc x y editorx editory event)
-        arrow-cursor)
-      
-      (inherit get-admin)
-      (define/private (refresh)
-        (let ([admin (get-admin)])
-          (when admin
-            (send admin needs-update this 0 0 (pict-width pict) (pict-height pict)))))
-          
-      (define/override (copy) (new pict-value-snip% (pict pict)))
-      
-      (define/override (write in)
-        (let ([w (inexact->exact (ceiling (pict-width pict)))]
-              [h (inexact->exact (ceiling (pict-height pict)))])
-          (send in put h)
-          (cond
-            [(or (= w 0)
-                 (= h 0))
-             (send in put 1 #"")]
-            [else
-             (let* ([bm (make-object bitmap% w h)]
-                    [str (make-bytes (* w h 4))]
-                    [bdc (make-object bitmap-dc% bm)])
-               (send bdc clear)
-               (send bdc set-smoothing 'aligned)
-               (pict-drawer bdc 0 0)
-               (send bdc get-argb-pixels 0 0 w h str)
-               (send bdc set-bitmap #f)
-               (send in put (+ 1 (bytes-length str)) str))])))
-      
-      (super-new)
-      (inherit set-snipclass set-flags get-flags)
-      (set-snipclass pict-snipclass)
-      (set-flags (cons 'handles-events (get-flags)))))
-  
-  (define arrow-cursor (make-object cursor% 'arrow))
-
-  (define pict-snip-class%
-    (class snip-class%
-      (define/override (read in)
-        (define pict
-          (let ([h (send in get-exact)]
-                [bitmap-bstr (send in get-bytes)])
-            (cond
-              [(and (number? h)
-                    (bytes? bitmap-bstr)
-                    (or (zero? h)
-                        (zero? (modulo (bytes-length bitmap-bstr) (* 4 h)))))
-               (if (zero? h)
-                   (blank)
-                   (let* ([w (quotient (bytes-length bitmap-bstr) (* 4 h))]
-                          [bm (make-object bitmap% w h)]
-                          [bdc (make-object bitmap-dc% bm)])
-                     (send bdc set-argb-pixels 0 0 w h bitmap-bstr)
-                     (send bdc set-bitmap #f)
-                     (bitmap bm)))]
-              [else (x-out (ellipse 10 10))])))
-        (new pict-value-snip% (pict pict)))
-      (super-new)))
-  
-  (define (x-out p)
-    (cc-superimpose
-     p
-     (dc (lambda (dc dx dy)
-           (send dc draw-line dx dy (+ dx (pict-width p)) (+ dy (pict-height p)))
-           (send dc draw-line dx (+ dy (pict-height p)) (+ dx (pict-width p)) dy))
-         (pict-width p)
-         (pict-height p)
-         0
-         0)))
-  
-  (define pict-snipclass (new pict-snip-class%))
-  (send pict-snipclass set-classname "drscheme:pict-value-snip%")
-  (send pict-snipclass set-version 0)
-  (send (get-the-snip-class-list) add pict-snipclass)
-  
-  (define (set-box/f! b v) (when (box? b) (set-box! b v)))
-  
-  (define (minimal-boxes pict x y)
-    (minimal-boxes/a '() (included-boxes pict x y)))
-  
-  (define (minimal-boxes/a minimal included)
-    (cond
-      [(null? included) minimal]
-      [else (minimal-boxes/a (adjust-minimal minimal (car included))
-                             (cdr included))]))
-  
-  (define (adjust-minimal minimal candidate)
-    (cond
-      [(ormap (lambda (x) (inside? x candidate)) minimal)
-       minimal]
-      [(ormap (lambda (x) (inside? candidate x)) minimal)
-       (cons
-        candidate
-        (filter (lambda (x) (not (inside? candidate x)))
-                minimal))]
-      [else (cons candidate minimal)]))
-       
-  (define (inside? c1 c2)
-    (and (<= (hbox-x c2)
-             (hbox-x c1)
-             (+ (hbox-x c1) (hbox-w c1))
-             (+ (hbox-x c2) (hbox-w c2)))
-         (<= (hbox-y c2)
-             (hbox-y c1)
-             (+ (hbox-y c1) (hbox-h c1))
-             (+ (hbox-y c2) (hbox-h c2)))))
-  
-  (define (test)
-    
-    (define (same-boxes? l1 l2)
-      (and (list? l1)
-           (list? l2)
-           (andmap hbox? l1)
-           (andmap hbox? l2)
-           (andmap (lambda (e1) (memf (same-box? e1) l2)) l1)
-           (andmap (lambda (e2) (memf (same-box? e2) l1)) l2)
-           #t))
-    (define ((same-box? b1) b2)
-      (and (= (hbox-x b1) (hbox-x b2))
-           (= (hbox-y b1) (hbox-y b2))
-           (= (hbox-w b1) (hbox-w b2))
-           (= (hbox-h b1) (hbox-h b2))))
-    
-    (define (chk l1 l2)
-      (cond
-        [(same-boxes? l1 l2) #t]
-        [else
-         (printf "got ~s expected ~s\n" (map conv l1) (map conv l2))
-         #f]))
-    
-    (list (chk (minimal-boxes/a '() (list (make-hbox 1 1 10 10)))
-               (list (make-hbox 1 1 10 10)))
-          (chk (minimal-boxes/a '() (list (make-hbox 5 5 10 10)
-                                          (make-hbox 0 0 20 20)))
-               (list (make-hbox 5 5 10 10)))
-          (chk (minimal-boxes/a '() (list (make-hbox 5 5 10 10)
-                                          (make-hbox 6 6 10 10)))
-               (list (make-hbox 5 5 10 10)
-                     (make-hbox 6 6 10 10)))
-          (chk (minimal-boxes/a '() (list (make-hbox 0 0 10 10)
-                                          (make-hbox 0 0 20 20)))
-               (list (make-hbox 0 0 10 10)))
-          (chk (minimal-boxes/a '() (list (make-hbox 0 0 20 20)
-                                          (make-hbox 0 0 10 10)))
-               (list (make-hbox 0 0 10 10)))))
-
-  (define (conv x)
-    (list (hbox-x x) (hbox-y x) (hbox-w x) (hbox-h x)))
-  
-  
-  (define (included-boxes pict x y)
-    (filter (lambda (child)
-              (and (<= (hbox-x child)
-                       x
-                       (+ (hbox-x child) (hbox-w child)))
-                   (<= (hbox-y child)
-                       y
-                       (+ (hbox-y child) (hbox-h child)))))
-            (all-boxes pict)))
-    
-  ;; y coordinates is from top going down (not bottom going up, which is what picts do)
-  (define-struct hbox (x y w h))
-  
-  (define (make-hbox/conv orig-pict x y w h)
-    (make-hbox x
-               (- (pict-height orig-pict) y h)
-               w
-               h))
-  
-  ;; all-boxes : pict -> (listof hbox)
-  (define (all-boxes orig-pict)
-    (let loop ([pict orig-pict]
-               [adx 0]
-               [ady 0]
-               [boxes (list (make-hbox 0 0 (pict-width orig-pict) (pict-height orig-pict)))])
-      (let ([children (pict-children pict)])
-        (let i-loop ([children children]
-                     [boxes boxes])
-          (cond
-            [(null? children) boxes]
-            [else 
-             (let ([child (car children)])
-               (i-loop (cdr children)
-                       (loop (child-pict child)
-                             (+ adx (child-dx child))
-                             (+ ady (child-dy child))
-                             (cons 
-                              (make-hbox/conv
-                               orig-pict
-                               (+ adx (child-dx child))
-                               (+ ady (child-dy child))
-                               (pict-width (child-pict child))
-                               (pict-height (child-pict child)))
-                              boxes))))])))))
-
-  #|
-  (define (fish color open?)
-    (standard-fish 30 20 'left color "black" open?))
-  
-  (define lunch-fish (fish "orange" #f))
-  (define small-fish (fish "blue" #f))
-  (define small-aaah-fish (fish "blue" #t))
-  
-  (define spacer (blank 10 0))
-  
-  (define fc 6)
-
-  (define meal-fish 
-    (build-list (- fc 1) 
-                (lambda (i) (launder lunch-fish))))
-  (define eating-fish 
-    (build-list fc
-                (lambda (i) (launder (scale small-fish (sqrt (+ i 1)))))))
-  (define eating-aaah-fish 
-    (build-list fc
-                (lambda (i) (launder (scale small-aaah-fish (sqrt (+ i 1)))))))
-  
-  (define (on set pict) (if (memq pict set) pict (ghost pict)))
-
-  (define (main-characters active)
-    (foldl (lambda (meal-fish eating-fish eating-aaah-fish rest-of-scene)
-             (lc-superimpose
-              (on active eating-fish)
-              (on active eating-aaah-fish)
-              (hc-append (on active meal-fish)
-                         spacer
-                         rest-of-scene)))
-           (cc-superimpose (on active (car eating-fish))
-                           (on active (car eating-aaah-fish)))
-           meal-fish
-           (cdr eating-fish)
-           (cdr eating-aaah-fish)))
-
-  
-  (dc-for-text-size (make-object bitmap-dc% (make-object bitmap% 1 1)))
-  
-  (define txt (vc-append (text "yXy" 'roman 12) (text "y" 'roman 12)))
-  
-  (all-boxes txt)
-  
-  (define t (new text%))
-  (send t insert (new pict-snip% (pict (main-characters (append meal-fish eating-fish eating-aaah-fish)))))
-  (send t copy #f 0 0 1)
-  (send t insert "\n")
-  (send t paste)
-  (define f (new frame% (label "") (width 600) (height 200)))
-  (define ec (new editor-canvas% (editor t) (parent f)))
-  (send f show #t)
-
-|#
-  )
diff --git a/pkgs/slideshow-pkgs/slideshow/LICENSE.txt b/pkgs/slideshow-pkgs/slideshow/LICENSE.txt
deleted file mode 100644
index 8b4e360129..0000000000
--- a/pkgs/slideshow-pkgs/slideshow/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-slideshow
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/slideshow-pkgs/slideshow/info.rkt b/pkgs/slideshow-pkgs/slideshow/info.rkt
deleted file mode 100644
index 01c4398de3..0000000000
--- a/pkgs/slideshow-pkgs/slideshow/info.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("slideshow-lib" 
-               "slideshow-exe"
-               "slideshow-plugin"
-               "slideshow-doc"))
-(define implies '("slideshow-lib" 
-                  "slideshow-exe"
-                  "slideshow-plugin"
-                  "slideshow-doc"))
-
-(define pkg-desc "Slide-presentation tool")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/snip-pkgs/snip-lib/LICENSE.txt b/pkgs/snip-pkgs/snip-lib/LICENSE.txt
deleted file mode 100644
index 7b1cfbf1f3..0000000000
--- a/pkgs/snip-pkgs/snip-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-snip-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/snip-pkgs/snip-lib/info.rkt b/pkgs/snip-pkgs/snip-lib/info.rkt
deleted file mode 100644
index 1d52773c66..0000000000
--- a/pkgs/snip-pkgs/snip-lib/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "draw-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"snip\"")
-
-(define pkg-authors '(mflatt))
-
-(define version "1.1")
diff --git a/pkgs/snip-pkgs/snip-lib/racket/snip.rkt b/pkgs/snip-pkgs/snip-lib/racket/snip.rkt
deleted file mode 100644
index dc4558fa2d..0000000000
--- a/pkgs/snip-pkgs/snip-lib/racket/snip.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         "snip/private/contract.rkt"
-         "snip/private/snip.rkt"
-	 "snip/private/snip-admin.rkt"
-	 "snip/private/style.rkt")
-
-(provide mult-color<%>
-         add-color<%>
-         style<%>
-         the-style-list
-
-         (except-out (all-from-out "snip/private/snip.rkt")
-                     snip%
-                     snip-class%
-                     string-snip%
-                     tab-snip%
-                     image-snip%))
-
-(provide/contract [style-delta%  style-delta%/c]
-                  [style-list%   style-list%/c]
-                  [snip%         snip%/c]
-                  [snip-class%   snip-class%/c]
-                  [string-snip%  string-snip%/c]
-                  [tab-snip%     tab-snip%/c]
-                  [image-snip%   image-snip%/c]
-                  [snip-admin%   snip-admin%/c])
diff --git a/pkgs/snip-pkgs/snip-lib/racket/snip/private/contract.rkt b/pkgs/snip-pkgs/snip-lib/racket/snip/private/contract.rkt
deleted file mode 100644
index 9d5c9f3a03..0000000000
--- a/pkgs/snip-pkgs/snip-lib/racket/snip/private/contract.rkt
+++ /dev/null
@@ -1,578 +0,0 @@
-#lang racket/base
-
-;; Contract definitions for racket/snip
-
-(require racket/class
-         racket/contract/base
-         racket/draw
-         "snip.rkt"
-         "snip-admin.rkt"
-         "style.rkt")
-
-(provide (all-defined-out))
-
-;; dummy definitions for contracts
-(define-values (cursor% mouse-event% key-event% pasteboard%
-                editor-stream-in% editor-stream-out% text% popup-menu%)
-  (values object% object% object% object%
-          object% object% object% object%))
-
-;; interfaces:
-(define (equal<%>/c cls)
-  (class/c
-   (equal-to? (->m (is-a?/c cls) (-> any/c any/c boolean?) boolean?))
-   (equal-hash-code-of (->m (-> any/c exact-integer?) exact-integer?))
-   (equal-secondary-hash-code-of (->m (-> any/c exact-integer?) exact-integer?))
-   (override
-     (equal-to? (->m (is-a?/c cls) (-> any/c any/c boolean?) boolean?))
-     (equal-hash-code-of (->m (-> any/c exact-integer?) exact-integer?))
-     (equal-secondary-hash-code-of (->m (-> any/c exact-integer?) exact-integer?)))))
-
-(define readable-snip<%>/c
-  (class/c
-    (read-special
-      (->m any/c
-           (or/c exact-nonnegative-integer? #f)
-           (or/c exact-nonnegative-integer? #f)
-           (or/c exact-nonnegative-integer? #f)
-           any/c))))
-
-;; contract utilities:
-(define alignment/c
-  (or/c 'base 'top 'center 'bottom))
-
-(define tab-snip-filetype/c
-  (or/c 'unknown 'unknown/mask 'unknown/alpha
-        'gif 'gif/mask 'gif/alpha
-        'jpeg 'png 'png/mask 'png/alpha
-        'xbm 'xpm 'bmp 'pict))
-
-(define style-delta%/c
-  (class/c
-    (collapse (->m (is-a?/c style-delta%) boolean?))
-    (copy (->m (is-a?/c style-delta%) void?))
-    (equal? (->m (is-a?/c style-delta%) boolean?))
-    (get-alignment-off (->m alignment/c))
-    (get-alignment-on  (->m alignment/c))
-    (get-background-add (->m (is-a?/c add-color<%>)))
-    (get-background-mult (->m (is-a?/c mult-color<%>)))
-    (get-face (->m (or/c string? false/c)))
-    (get-family (->m (or/c 'base font-family/c)))
-    (get-foreground-add  (->m (is-a?/c add-color<%>)))
-    (get-foreground-mult (->m (is-a?/c mult-color<%>)))
-    (get-size-add (->m byte?))
-    (get-size-in-pixels-off (->m boolean?))
-    (get-size-in-pixels-on  (->m boolean?))
-    (get-size-mult (->m real?))
-    (get-smoothing-off (->m (or/c 'base font-smoothing/c)))
-    (get-smoothing-on (->m (or/c 'base font-smoothing/c)))
-    (get-style-off (->m (or/c 'base font-style/c)))
-    (get-style-on  (->m (or/c 'base font-style/c)))
-    (get-transparent-text-backing-off (->m boolean?))
-    (get-transparent-text-backing-on  (->m boolean?))
-    (get-underlined-off (->m boolean?))
-    (get-underlined-on  (->m boolean?))
-    (get-weight-off (->m (or/c 'base font-weight/c)))
-    (get-weight-on  (->m (or/c 'base font-weight/c)))
-    (set-alignment-off (->m alignment/c void?))
-    (set-alignment-on  (->m alignment/c void?))
-    (set-delta (case->m
-                 (-> (is-a?/c style-delta%))
-                 (-> (or/c 'change-nothing
-                           'change-normal
-                           'change-toggle-underline
-                           'change-toggle-size-in-pixels
-                           'change-normal-color
-                           'change-italic
-                           'change-bold)
-                     (is-a?/c style-delta%))
-                 (-> (or/c 'change-family
-                           'change-style
-                           'change-toggle-style
-                           'change-weight
-                           'change-toggle-weight
-                           'change-smoothing
-                           'change-toggle-smoothing
-                           'change-alignment
-                           'change-size
-                           'change-bigger
-                           'change-smaller
-                           'change-underline
-                           'change-size-in-pixels)
-                     any/c
-                     (is-a?/c style-delta%))))
-    (set-delta-background (->m (or/c string? (is-a?/c color%))
-                               (is-a?/c style-delta%)))
-    (set-delta-face (->*m (string?) ((or/c 'base font-family/c))
-                          (is-a?/c style-delta%)))
-    (set-delta-foreground (->m (or/c string? (is-a?/c color%))
-                               (is-a?/c style-delta%)))
-    (set-face (->m (or/c string? false/c) void?))
-    (set-family (->m (or/c 'base font-family/c) void?))
-    (set-size-add (->m byte? void?))
-    (set-size-in-pixels-off (->m any/c void?))
-    (set-size-in-pixels-on  (->m any/c void?))
-    (set-size-mult (->m real? void?))
-    (set-smoothing-off (->m (or/c 'base font-smoothing/c) void?))
-    (set-smoothing-on  (->m (or/c 'base font-smoothing/c) void?))
-    (set-style-off (->m (or/c 'base font-style/c) void?))
-    (set-style-on  (->m (or/c 'base font-style/c) void?))
-    (set-transparent-text-backing-off (->m any/c void?))
-    (set-transparent-text-backing-on  (->m any/c void?))
-    (set-underlined-off (->m any/c void?))
-    (set-underlined-on  (->m any/c void?))
-    (set-weight-off (->m (or/c 'base font-weight/c) void?))
-    (set-weight-on  (->m (or/c 'base font-weight/c) void?))))
-
-(define style-list%/c
-  (class/c
-    (basic-style (->m (is-a?/c style<%>)))
-    (convert (->m (is-a?/c style<%>) (is-a?/c style<%>)))
-    (find-named-style (->m string? (or/c (is-a?/c style<%>) false/c)))
-    (find-or-create-join-style (->m (is-a?/c style<%>) (is-a?/c style<%>) (is-a?/c style<%>)))
-    (find-or-create-style (->m (is-a?/c style<%>) (is-a?/c style-delta%) (is-a?/c style<%>)))
-    (forget-notification (->m any/c void?))
-    (index-to-style (->m exact-nonnegative-integer? (or/c (is-a?/c style<%>) false/c)))
-    (new-named-style (->m string? (is-a?/c style<%>) (is-a?/c style<%>)))
-    (notify-on-change (->m (-> (or/c (is-a?/c style<%>) false/c) any) any/c))
-    (number (->m exact-nonnegative-integer?))
-    (replace-named-style (->m string? (is-a?/c style<%>) (is-a?/c style<%>)))
-    (style-to-index (->m (is-a?/c style<%>) (or/c exact-nonnegative-integer? false/c)))))
-
-;; snip% utils
-(define snip%-edit-operation/c
-  (or/c 'undo 'redo 'clear 'cut
-        'copy 'paste 'kill 'select-all
-        'insert-text-box 'insert-pasteboard-box 'insert-image))
-
-;; snip% methods
-(define snip%-adjust-cursor/c
-  (->m (is-a?/c dc<%>)
-       real?
-       real?
-       real?
-       real?
-       (is-a?/c mouse-event%)
-       (or/c (is-a?/c cursor%) false/c)))
-
-(define snip%-blink-caret/c
-  (->m (is-a?/c dc<%>) real? real? void?))
-
-(define snip%-can-do-edit-operation/c
-  (->*m (snip%-edit-operation/c)
-        (any/c)
-        boolean?))
-
-(define snip%-copy/c
-  (->m (is-a?/c snip%)))
-
-(define snip%-draw/c
-  (->m (is-a?/c dc<%>)
-       real?
-       real?
-       real?
-       real?
-       real?
-       real?
-       real?
-       real?
-       (or/c 'no-caret 'show-inactive-caret 'show-caret
-             (cons/c exact-nonnegative-integer?
-                     exact-nonnegative-integer?))
-       void?))
-
-(define snip%-other-equal-to?/c
-  (->m (is-a?/c snip%) (-> any/c any/c boolean?) boolean?))
-
-(define snip%-find-scroll-step/c
-  (->m real? exact-nonnegative-integer?))
-
-(define snip%-get-admin/c
-  (->m (or/c (is-a?/c snip-admin%) false/c)))
-
-(define snip%-get-count/c
-  (->m exact-nonnegative-integer?))
-
-(define snip%-get-extent/c
-  (->*m ((is-a?/c dc<%>) real? real?)
-        ((or/c (box/c (>=/c 0)) false/c)
-         (or/c (box/c (>=/c 0)) false/c)
-         (or/c (box/c (>=/c 0)) false/c)
-         (or/c (box/c (>=/c 0)) false/c)
-         (or/c (box/c (>=/c 0)) false/c)
-         (or/c (box/c (>=/c 0)) false/c))
-        void?))
-
-(define snip%-get-extent-override/c
-  (->m (is-a?/c dc<%>)
-       real?
-       real?
-       (or/c (box/c (>=/c 0)) false/c)
-       (or/c (box/c (>=/c 0)) false/c)
-       (or/c (box/c (>=/c 0)) false/c)
-       (or/c (box/c (>=/c 0)) false/c)
-       (or/c (box/c (>=/c 0)) false/c)
-       (or/c (box/c (>=/c 0)) false/c)
-       void?))
-
-(define snip%-get-flags/c
-  (->m (listof symbol?)))
-
-(define snip%-get-num-scroll-steps/c
-  (->m exact-nonnegative-integer?))
-
-(define snip%-get-scroll-step-offset/c
-  (->m exact-nonnegative-integer?
-       (>=/c 0)))
-
-(define snip%-get-snipclass/c
-  (->m (or/c #f (is-a?/c snip-class%))))
-
-(define snip%-get-style/c
-  (->m (is-a?/c style<%>)))
-
-(define snip%-get-text/c
-  (->*m (exact-nonnegative-integer? exact-nonnegative-integer?)
-        (any/c)
-        string?))
-
-(define snip%-get-text-override/c
-  (->m exact-nonnegative-integer?
-       exact-nonnegative-integer?
-       any/c
-       string?))
-
-(define snip%-get-text!/c
-  (->m
-    (and/c string? (not/c immutable?))
-    exact-nonnegative-integer?
-    exact-nonnegative-integer?
-    exact-nonnegative-integer?
-    void?))
-
-(define snip%-is-owned?/c
-  (->m boolean?))
-
-(define snip%-match?/c
-  (->m (is-a?/c snip%) boolean?))
-
-(define snip%-merge-with/c
-  (->m (is-a?/c snip%) (or/c (is-a?/c snip%) false/c)))
-
-(define snip%-next/c
-  (->m (or/c (is-a?/c snip%) false/c)))
-
-(define snip%-on-char/c
-  (->m (is-a?/c dc<%>)
-       real? real? real? real?
-       (is-a?/c key-event%)
-       void?))
-
-(define snip%-on-event/c
-  (->m (is-a?/c dc<%>)
-       real? real? real? real?
-       (is-a?/c mouse-event%)
-       void?))
-
-(define snip%-own-caret/c
-  (->m any/c void?))
-
-(define snip%-partial-offset/c
-  (->m (is-a?/c dc<%>)
-       real? real?
-       exact-nonnegative-integer?
-       real?))
-
-(define snip%-previous/c
-  (->m (or/c (is-a?/c snip%) false/c)))
-
-(define snip%-release-from-owner/c
-  (->m boolean?))
-
-(define snip%-resize/c
-  (->m (>=/c 0)
-       (>=/c 0)
-       boolean?))
-
-(define snip%-set-admin/c
-  (->m (or/c (is-a?/c snip-admin%) false/c) void?))
-
-(define snip%-set-count/c
-  (->m exact-positive-integer? void?))
-
-(define snip%-set-flags/c
-  (->m (listof symbol?) void?))
-
-(define snip%-set-snipclass/c
-  (->m (is-a?/c snip-class%) void?))
-
-(define snip%-set-style/c
-  (->m (is-a?/c style<%>) void?))
-
-(define snip%-set-unmodified/c
-  (->m void?))
-
-(define snip%-size-cache-invalid/c
-  (->m void?))
-
-(define snip%-split/c
-  (->m exact-nonnegative-integer?
-       (box/c (is-a?/c snip%))
-       (box/c (is-a?/c snip%))
-       void?))
-
-(define snip%-write/c
-  (->m (is-a?/c editor-stream-out%) void?))
-
-;; snip% class contract
-(define snip%/c
-  (and/c
-    (equal<%>/c snip%)
-    (class/c
-      (adjust-cursor             snip%-adjust-cursor/c)
-      (blink-caret               snip%-blink-caret/c)
-      (can-do-edit-operation?    snip%-can-do-edit-operation/c)
-      (copy                      snip%-copy/c)
-      (draw                      snip%-draw/c)
-      (other-equal-to?           snip%-other-equal-to?/c)
-      (find-scroll-step          snip%-find-scroll-step/c)
-      (get-admin                 snip%-get-admin/c)
-      (get-count                 snip%-get-count/c)
-      (get-extent                snip%-get-extent/c)
-      (get-flags                 snip%-get-flags/c)
-      (get-num-scroll-steps      snip%-get-num-scroll-steps/c)
-      (get-scroll-step-offset    snip%-get-scroll-step-offset/c)
-      (get-snipclass             snip%-get-snipclass/c)
-      (get-style                 snip%-get-style/c)
-      (get-text                  snip%-get-text/c)
-      (get-text!                 snip%-get-text!/c)
-      (is-owned?                 snip%-is-owned?/c)
-      (match?                    snip%-match?/c)
-      (merge-with                snip%-merge-with/c)
-      (next                      snip%-next/c)
-      (on-char                   snip%-on-char/c)
-      (on-event                  snip%-on-event/c)
-      (own-caret                 snip%-own-caret/c)
-      (partial-offset            snip%-partial-offset/c)
-      (previous                  snip%-previous/c)
-      (release-from-owner        snip%-release-from-owner/c)
-      (resize                    snip%-resize/c)
-      (set-admin                 snip%-set-admin/c)
-      (set-count                 snip%-set-count/c)
-      (set-flags                 snip%-set-flags/c)
-      (set-snipclass             snip%-set-snipclass/c)
-      (set-style                 snip%-set-style/c)
-      (set-unmodified            snip%-set-unmodified/c)
-      (size-cache-invalid        snip%-size-cache-invalid/c)
-      (split                     snip%-split/c)
-      (write                     snip%-write/c)
-      (override
-        (adjust-cursor           snip%-adjust-cursor/c)
-        (draw                    snip%-draw/c)
-        (other-equal-to?         snip%-other-equal-to?/c)
-        (find-scroll-step        snip%-find-scroll-step/c)
-        (get-extent              snip%-get-extent-override/c)
-        (get-num-scroll-steps    snip%-get-num-scroll-steps/c)
-        (get-scroll-step-offset  snip%-get-scroll-step-offset/c)
-        (get-text                snip%-get-text-override/c)
-        (get-text!               snip%-get-text!/c)
-        (match?                  snip%-match?/c)
-        (merge-with              snip%-merge-with/c)
-        (on-char                 snip%-on-char/c)
-        (on-event                snip%-on-event/c)
-        (own-caret               snip%-own-caret/c)
-        (partial-offset          snip%-partial-offset/c)
-        (release-from-owner      snip%-release-from-owner/c)
-        (resize                  snip%-resize/c)
-        (set-count               snip%-set-count/c)
-        (set-flags               snip%-set-flags/c)
-        (set-unmodified          snip%-set-unmodified/c)
-        (size-cache-invalid      snip%-size-cache-invalid/c)
-        (split                   snip%-split/c)))))
-
-
-;; snip-class% method contracts
-(define snip-class%-get-classname/c
-  (->m string?))
-
-(define snip-class%-get-version/c
-  (->m exact-integer?))
-
-(define snip-class%-read/c
-  (->m (is-a?/c editor-stream-in%)
-       (or/c (is-a?/c snip%) false/c)))
-
-(define snip-class%-read-header/c
-  (->m (is-a?/c editor-stream-in%) boolean?))
-
-(define snip-class%-reading-version/c
-  (->m (is-a?/c editor-stream-in%) exact-integer?))
-
-(define snip-class%-set-classname/c
-  (->m string? void?))
-
-(define snip-class%-set-version/c
-  (->m exact-integer? void?))
-
-(define snip-class%-write-header/c
-  (->m (is-a?/c editor-stream-out%) boolean?))
-
-;; snip-class% class contract
-(define snip-class%/c
-  (class/c
-    (get-classname    snip-class%-get-classname/c)
-    (get-version      snip-class%-get-version/c)
-    (read             snip-class%-read/c)
-    (read-header      snip-class%-read-header/c)
-    (reading-version  snip-class%-reading-version/c)
-    (set-classname    snip-class%-set-classname/c)
-    (set-version      snip-class%-set-version/c)
-    (write-header     snip-class%-write-header/c)
-    (override
-      (read          snip-class%-read/c)
-      (read-header   snip-class%-read-header/c)
-      (write-header  snip-class%-write-header/c))))
-
-(define string-snip%/c
-  (class/c
-    (insert (->*m (string? exact-nonnegative-integer?)
-                  (exact-nonnegative-integer?)
-                  void?))
-    (read (->m exact-nonnegative-integer?
-               (is-a?/c editor-stream-in%)
-               void?))))
-
-(define tab-snip%/c
-  (class/c))
-
-(define image-snip%/c
-  (class/c
-    (equal-hash-code-of (->m (any/c . -> . exact-integer?) exact-integer?))
-    (equal-secondary-hash-code-of (->m (any/c . -> . exact-integer?) exact-integer?))
-    (get-bitmap (->m (or/c (is-a?/c bitmap%) #f)))
-    (get-bitmap-mask (->m (or/c (is-a?/c bitmap%) #f)))
-    (get-filename (->*m () ((or/c (box/c any/c) #f)) (or/c path-string? #f)))
-    (get-filetype (->m tab-snip-filetype/c))
-    (load-file (->*m ((or/c path-string? input-port? #f))
-                     (tab-snip-filetype/c any/c any/c)
-                     void?))
-    (other-equal-to? (->m (is-a?/c image-snip%)
-                          (any/c any/c . -> . boolean?)
-                          boolean?))
-    (resize (->m (>=/c 0)
-                 (>=/c 0)
-                 boolean?))
-    (set-bitmap (->*m ((is-a?/c bitmap%)) ((or/c (is-a?/c bitmap%) #f)) void?))
-    (set-offset (->m real? real? void?))))
-
-;; snip-admin% method contracts
-(define snip-admin%-get-view/c
-  (->*m ((or/c (box/c real?) false/c)
-         (or/c (box/c real?) false/c)
-         (or/c (box/c (>=/c 0)) false/c)
-         (or/c (box/c (>=/c 0)) false/c))
-        ((or/c (is-a?/c snip%) false/c))
-        void?))
-
-(define snip-admin%-get-view-size/c
-  (->m (or/c (box/c (>=/c 0)) false/c)
-       (or/c (box/c (>=/c 0)) false/c)
-       void?))
-
-(define snip-admin%-modified/c
-  (->m (is-a?/c snip%) any/c void?))
-
-(define snip-admin%-needs-update/c
-  (->m (is-a?/c snip%)
-       real?
-       real?
-       (>=/c 0)
-       (>=/c 0)
-       void?))
-
-(define snip-admin%-popup-menu/c
-  (->m (is-a?/c popup-menu%)
-       (is-a?/c snip%)
-       real?
-       real?
-       boolean?))
-
-(define snip-admin%-recounted/c
-  (->m (is-a?/c snip%) any/c void?))
-
-(define snip-admin%-release-snip/c
-  (->m (is-a?/c snip%) boolean?))
-
-(define snip-admin%-resized/c
-  (->m (is-a?/c snip%) any/c void?))
-
-(define snip-admin%-scroll-to/c
-  (->*m ((is-a?/c snip%)
-         real?
-         real?
-         (>=/c 0)
-         (>=/c 0)
-         any/c)
-        ((or/c 'start 'end 'none))
-        boolean?))
-
-(define snip-admin%-set-caret-owner/c
-  (->m (is-a?/c snip%)
-       (or/c 'immediate 'display 'global)
-       void?))
-
-(define snip-admin%-update-cursor/c
-  (->m void?))
-
-(define snip-admin%-get-line-spacing/c
-  (->m (>=/c 0)))
-
-(define snip-admin%-get-selected-text-color/c
-  (->m (or/c (is-a?/c color%) #f)))
-
-(define snip-admin%-call-with-busy-cursor/c
-  (->m (-> any) any))
-
-(define snip-admin%-get-tabs/c
-  (->*m ()
-        ((or/c (box/c exact-nonnegative-integer?) false/c)
-         (or/c (box/c real?) false/c)
-         (or/c (box/c real?) false/c))
-        (listof real?)))
-
-(define snip-admin%/c
-  (class/c
-    (get-dc (->m (or/c (is-a?/c dc<%>) false/c)))
-    (get-editor (->m (or/c (is-a?/c text%) (is-a?/c pasteboard%))))
-    (get-view snip-admin%-get-view/c)
-    (get-view-size snip-admin%-get-view-size/c)
-    (modified snip-admin%-modified/c)
-    (needs-update snip-admin%-needs-update/c)
-    (popup-menu snip-admin%-popup-menu/c)
-    (recounted snip-admin%-recounted/c)
-    (release-snip snip-admin%-release-snip/c)
-    (resized snip-admin%-resized/c)
-    (scroll-to snip-admin%-scroll-to/c)
-    (set-caret-owner snip-admin%-set-caret-owner/c)
-    (update-cursor snip-admin%-update-cursor/c)
-    (get-line-spacing snip-admin%-get-line-spacing/c)
-    (get-selected-text-color snip-admin%-get-selected-text-color/c)
-    (call-with-busy-cursor snip-admin%-call-with-busy-cursor/c)
-    (get-tabs snip-admin%-get-tabs/c)
-    (override
-      (get-view snip-admin%-get-view/c)
-      (get-view-size snip-admin%-get-view-size/c)
-      (modified snip-admin%-modified/c)
-      (needs-update snip-admin%-needs-update/c)
-      (popup-menu snip-admin%-popup-menu/c)
-      (recounted snip-admin%-recounted/c)
-      (release-snip snip-admin%-release-snip/c)
-      (resized snip-admin%-resized/c)
-      (scroll-to snip-admin%-scroll-to/c)
-      (set-caret-owner snip-admin%-set-caret-owner/c)
-      (update-cursor snip-admin%-update-cursor/c)
-      (get-line-spacing snip-admin%-get-line-spacing/c)
-      (get-selected-text-color snip-admin%-get-selected-text-color/c)
-      (call-with-busy-cursor snip-admin%-call-with-busy-cursor/c)
-      (get-tabs snip-admin%-get-tabs/c))))
-
diff --git a/pkgs/snip-pkgs/snip-lib/racket/snip/private/load-one.rkt b/pkgs/snip-pkgs/snip-lib/racket/snip/private/load-one.rkt
deleted file mode 100644
index abe55c86bd..0000000000
--- a/pkgs/snip-pkgs/snip-lib/racket/snip/private/load-one.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-
-(require racket/class)
-(provide load-one)
-
-;; loaders used for snip-class% and editor-data-class%
-(define (ok-string-element? m)
-  (and (string? m)
-       (regexp-match? #rx"^[-a-zA-Z0-9_. ]+$" m)
-       (not (string=? m ".."))
-       (not (string=? m "."))))
-
-(define (ok-lib-path? m)
-  (and (pair? m)
-       (eq? 'lib (car m))
-       (pair? (cdr m))
-       (list? m)
-       (andmap ok-string-element? (cdr m))))
-
-(define load-one
-  (lambda (str id %)
-    (let ([m (with-handlers ([exn:fail:read? (lambda (x) #f)])
-               (and (regexp-match #rx"^[(].*[)]$" str)
-                    (let* ([p (open-input-string str)]
-                           [m (read p)])
-                      (and (eof-object? (read p))
-                           m))))])
-      (if (or (ok-lib-path? m)
-              (and (list? m)
-                   (= (length m) 2)
-                   (ok-lib-path? (car m))
-                   (ok-lib-path? (cadr m))))
-          (let ([m (if (ok-lib-path? m)
-                       m
-                       (car m))])
-            (let ([result (dynamic-require m id)])
-              (if (is-a? result %)
-                  result
-                  (error 'load-class "not a ~a% instance" id))))
-          #f))))
-  
diff --git a/pkgs/snip-pkgs/snip-lib/racket/snip/private/prefs.rkt b/pkgs/snip-pkgs/snip-lib/racket/snip/private/prefs.rkt
deleted file mode 100644
index a6e4cdd369..0000000000
--- a/pkgs/snip-pkgs/snip-lib/racket/snip/private/prefs.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-(require racket/file)
-
-(provide get-preference*
-         put-preferences*)
-
-(define (old-name sym)
-  (string->symbol
-   (regexp-replace #rx"gracket"
-                   (regexp-replace #rx"^GRacket" 
-                                   (symbol->string sym) 
-                                   "MrEd")
-                   "mred")))
-
-(define (get-preference* sym [fail-thunk (lambda () #f)])
-  (get-preference
-   sym
-   ;; on fail, fall back to old name of pref:
-   (lambda () (get-preference (old-name sym)
-                              fail-thunk
-                              #:timeout-lock-there (lambda (fn) (fail-thunk))))
-   #:timeout-lock-there (lambda (fn) (fail-thunk))))
-
-(define (put-preferences* syms vals)
-  (put-preferences syms
-                   vals
-                   ;; Locked? Too bad.
-                   (lambda (fn) (void))))
diff --git a/pkgs/snip-pkgs/snip-lib/racket/snip/private/private.rkt b/pkgs/snip-pkgs/snip-lib/racket/snip/private/private.rkt
deleted file mode 100644
index 761c12e12d..0000000000
--- a/pkgs/snip-pkgs/snip-lib/racket/snip/private/private.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/base
-(require racket/class)
-
-(provide (all-defined-out))
-
-;; standard-snip-class-list%, editor-data-class-list%
-(define-local-member-name
-  reset-header-flags
-  find-by-map-position)
-
-;; snip% and editor%
-(define-local-member-name
-  s-admin)
-
-;; snip%
-(define-local-member-name
-  s-prev set-s-prev
-  s-next set-s-next
-  s-count
-  s-style set-s-style
-  s-line set-s-line
-  s-snipclass set-s-snipclass
-  s-flags set-s-flags
-  s-dtext get-s-dtext
-  s-buffer get-s-buffer
-  str-w set-str-w
-  s-set-flags
-  do-copy-to)
-
-;; string-snip%
-(define-local-member-name
-  insert-with-offset)
-
-;; snip-class%
-(define-local-member-name
-  get-s-required?
-  s-read)
-
-;; editor-stream%
-(define-local-member-name
-  get-sl
-  get-dl
-  set-sl
-  set-dl
-  add-sl
-  add-dl
-  set-s-sll
-  get-s-sll
-  get-s-scl
-  get-s-bdl
-  get-s-style-count
-  set-s-style-count
-  do-reading-version
-  do-map-position
-  do-get-header-flag
-  do-set-header-flag
-  get-wxme-version)
diff --git a/pkgs/snip-pkgs/snip-lib/racket/snip/private/snip-admin.rkt b/pkgs/snip-pkgs/snip-lib/racket/snip/private/snip-admin.rkt
deleted file mode 100644
index c16fe88e2a..0000000000
--- a/pkgs/snip-pkgs/snip-lib/racket/snip/private/snip-admin.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/draw/private/syntax
-         "snip.rkt")
-
-(provide snip-admin%)
-
-;; for contract only
-(define fake-popup-menu% object%)
-
-(defclass snip-admin% object%
-  (super-new)
-
-  (def/public (get-editor) #f)
-  (def/public (get-dc) #f)
-  (def/public (get-view-size [maybe-box? w] [maybe-box? h])
-    #f)
-
-  (def/public (get-view [maybe-box? x] [maybe-box? y] [maybe-box? w] [maybe-box? h] 
-                        [(make-or-false snip%) [snip #f]])
-    #f)
-
-  (def/public (scroll-to [snip% s]
-                         [real? x] [real? y]
-                         [nonnegative-real? w] [nonnegative-real? h]
-                         [any? refresh?]
-                         [(symbol-in start end none) [bias 'none]])
-    #f)
-
-  (def/public (set-caret-owner [snip% s] [(symbol-in imeditorte display global) dist])
-    (void))
-
-  (def/public (resized [snip% s] [any? redraw?]) (void))
-
-  (def/public (recounted [snip% s] [any? redraw?]) (void))
-
-  (def/public (needs-update [snip% s] [real? x] [real? y]
-                            [nonnegative-real? w] [nonnegative-real? h])
-    (void))
-
-  (def/public (release-snip [snip% s]) #f)
-
-  (def/public (update-cursor) (void))
-
-  (def/public (popup-menu [fake-popup-menu% p][snip% snip][real? x][real? y])
-    #f)
-
-  (def/public (modified [snip% s] [any? modified?])
-    (void))
-  
-  (def/public (get-line-spacing)
-    0.0)
-  
-  (def/public (get-selected-text-color)
-    #f)
-  
-  (def/public (call-with-busy-cursor [procedure? thunk])
-    (void))
-  
-  (def/public (get-tabs [maybe-box? [length #f]] [maybe-box? [tab-width #f]] [maybe-box? [in-units #f]])
-    #f))
-
diff --git a/pkgs/snip-pkgs/snip-lib/racket/snip/private/snip-flags.rkt b/pkgs/snip-pkgs/snip-lib/racket/snip/private/snip-flags.rkt
deleted file mode 100644
index ac0de3526d..0000000000
--- a/pkgs/snip-pkgs/snip-lib/racket/snip/private/snip-flags.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-
-(provide (all-defined-out))
-
-(define NO-FLAGS 0)
-
-(define IS-TEXT #x1)
-(define CAN-APPEND #x2)
-(define INVISIBLE #x4)
-(define NEWLINE #x8) ;; Soft newline, typically inserted by text%
-(define HARD-NEWLINE #x10) ;; => Snip must be follwed by newline 
-(define HANDLES-EVENTS #x20)
-(define WIDTH-DEPENDS-ON-X #x40)
-(define HEIGHT-DEPENDS-ON-Y #x80)
-(define WIDTH-DEPENDS-ON-Y #x100)
-(define HEIGHT-DEPENDS-ON-X #x200)
-(define ANCHORED #x400)
-(define USES-BUFFER-PATH #x800)
-(define CAN-SPLIT #x1000) ;; safety feature
-(define OWNED #x2000)
-(define CAN-DISOWN #x4000)
-(define HANDLES-ALL-MOUSE-EVENTS #x8000)
-
-(define-syntax-rule (has-flag? flags flag)
-  (not (zero? (bitwise-and flags flag))))
-
-(define-syntax-rule (add-flag flags flag)
-  (bitwise-ior flags flag))
-
-(define-syntax-rule (remove-flag flags flag)
-  (bitwise-and flags (bitwise-not flag)))
-
-(define (copy-flag from to flag)
-  (if (has-flag? from flag)
-      (add-flag to flag)
-      (remove-flag to flag)))
-
-(define (flags->symbols flag)
-  (let-syntax ([syms
-                (lambda (stx)
-                  (syntax-case stx ()
-                    [(_ id ...)
-                     (with-syntax ([(sym ...)
-                                    (map (lambda (s)
-                                           (string->symbol
-                                            (string-downcase
-                                             (symbol->string
-                                              (syntax-e s)))))
-                                         (syntax->list #'(id ...)))])
-                       #'(append
-                          (if (has-flag? flag id)
-                              '(sym)
-                              null)
-                          ...))]))])
-    (syms IS-TEXT 
-          CAN-APPEND 
-          INVISIBLE 
-          NEWLINE 
-          HARD-NEWLINE 
-          HANDLES-EVENTS 
-          WIDTH-DEPENDS-ON-X 
-          HEIGHT-DEPENDS-ON-Y 
-          WIDTH-DEPENDS-ON-Y 
-          HEIGHT-DEPENDS-ON-X
-          HANDLES-ALL-MOUSE-EVENTS)))
-
-(define (symbols->flags symbols)
-  (let-syntax ([syms
-                (lambda (stx)
-                  (syntax-case stx ()
-                    [(_ id ...)
-                     (with-syntax ([(sym ...)
-                                    (map (lambda (s)
-                                           (string->symbol
-                                            (string-downcase
-                                             (symbol->string
-                                              (syntax-e s)))))
-                                         (syntax->list #'(id ...)))])
-                       #'(bitwise-ior
-                          (if (memq 'sym symbols)
-                              id
-                              0)
-                          ...))]))])
-    (syms IS-TEXT 
-          CAN-APPEND 
-          INVISIBLE 
-          NEWLINE 
-          HARD-NEWLINE 
-          HANDLES-EVENTS 
-          WIDTH-DEPENDS-ON-X 
-          HEIGHT-DEPENDS-ON-Y 
-          WIDTH-DEPENDS-ON-Y 
-          HEIGHT-DEPENDS-ON-X
-          HANDLES-ALL-MOUSE-EVENTS)))
diff --git a/pkgs/snip-pkgs/snip-lib/racket/snip/private/snip.rkt b/pkgs/snip-pkgs/snip-lib/racket/snip/private/snip.rkt
deleted file mode 100644
index 13078c42cf..0000000000
--- a/pkgs/snip-pkgs/snip-lib/racket/snip/private/snip.rkt
+++ /dev/null
@@ -1,1433 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/file file/convertible
-         "snip-flags.rkt"
-         "load-one.rkt"
-         "style.rkt"
-         "private.rkt"
-         racket/draw/private/syntax
-         racket/draw)
-
-(provide snip%
-         snip-class%
-         string-snip%
-         tab-snip%
-         image-snip%
-         snip-class-list<%>
-         get-the-snip-class-list
-         
-         get-snip-class
-
-         the-snip-class-list ;; parameter
-         make-the-snip-class-list
-         
-         (struct-out snip-class-link)
-
-         snip->admin
-         snip->count
-         snip->next
-         snip->prev
-         snip->flags
-         snip->line
-         snip->loc
-         snip->style
-         snip->snipclass
-
-         set-snip-admin!
-         set-snip-line!
-         set-snip-loc!
-         set-snip-style!
-         set-snip-flags!
-         set-snip-count!
-         set-snip-prev!
-         set-snip-next!
-
-         snip%-get-text
-
-         string-snip-buffer
-         string-snip-dtext
-
-         caret-status?
-
-         readable-snip<%>
-
-         image-type?
-         int->img-type)
-
-;; these are used only in contracts
-;; we don't want the real definitions b/c they require the gui
-(define-values (editor-stream-in% editor-stream-out% snip-admin% mouse-event% key-event%)
-  (values object% object% object% object% object%))
-
-(define (symbol-list? l)
-  (and (list? l) (andmap symbol? l)))
-(define (mutable-string? s)
-  (and (string? s) (not (immutable? s))))
-
-(define (caret-status? v)
-  (or (eq? v 'no-caret)
-      (eq? v 'show-inactive-caret)
-      (eq? v 'show-caret)
-      (and (pair? v)
-           (exact-nonnegative-integer? (car v))
-           (exact-nonnegative-integer? (cdr v))
-           ((car v) . <= . (cdr v)))))
-
-;; ------------------------------------------------------------
-
-(define MAX-WASTE 3)
-(define MIN-WASTE-CHECK 24)
-(define IMAGE-PIXELS-PER-SCROLL 20.0)
-(define IMAGE-VOID-SIZE 20.0)
-
-(define (replace-nuls s)
-  (if (for/or ([c (in-string s)]) (or (eq? #\nul c)
-                                      (eq? #\page c)))
-      (regexp-replace* #rx"\f"
-                       (regexp-replace* #rx"\0" s " ")
-                       "^L")
-      s))
-
-;; ------------------------------------------------------------
-
-(defclass snip-class% object%
-  (define classname "wxbad")
-  (def/public (set-classname [string? s])
-    (set! classname (string->immutable-string s)))
-  (def/public (get-classname) classname)
-  
-  (properties [[exact-nonnegative-integer? version] 0])
-  (field [s-required? #f])
-  (define/public (get-s-required?) s-required?)
-
-  (super-new)
-
-  (def/public (read-header [editor-stream-in% f]) #t)
-  (def/public (write-header [editor-stream-out% f]) #t)
-  (def/public (reading-version [editor-stream-in% f])
-    (send f do-reading-version this))
-  
-  (def/public (read [editor-stream-in% f]) (error "should have been overridden")))
-
-;; ------------------------------------------------------------
-
-(defclass* snip% object% (equal<%>)
-  ;; For use only by the owning editor:
-  (field [s-prev #f]
-         [s-next #f]
-         [s-line #f]) ; used for line by text%, loc by pastebpard%
-  (define/public (set-s-prev p) (set! s-prev p))
-  (define/public (set-s-next p) (set! s-next p))
-  (define/public (set-s-line l) (set! s-line l))
-
-  (field [s-admin #f]
-         [s-count 1]
-         [s-flags NO-FLAGS]
-         [s-snipclass #f]
-         [s-style (send the-style-list basic-style)])
-  (define/public (set-s-admin a) (set! s-admin a))
-  (define/public (set-s-count v) (set! s-count v))
-  (define/public (set-s-flags v) (set! s-flags v))
-  (define/public (set-s-snipclass v) (set! s-snipclass v))
-  (define/public (set-s-style s) (set! s-style s))
-
-  (def/public (set-snipclass [snip-class% c])
-    (set! s-snipclass c))
-  (def/public (get-snipclass) s-snipclass)
-
-  (def/public (get-count) s-count)
-  (def/public (get-flags) (flags->symbols s-flags))
-
-  (super-new)
-
-  (def/public (next) s-next)
-  (def/public (previous) s-prev)
-  (def/public (get-admin) s-admin)
-
-  (def/public (set-admin [(make-or-false snip-admin%) a])
-    (unless (and (not (eq? a s-admin))
-                 (has-flag? s-flags OWNED)
-                 (or a 
-                     (not (has-flag? s-flags CAN-DISOWN))))
-      (set! s-admin a)
-      (size-cache-invalid)
-      (if (not a)
-          (begin
-            (set! s-prev #f)
-            (set! s-next #f)
-            (set! s-line #f))
-          (set! s-flags (add-flag OWNED s-flags)))))
-
-  (def/public (set-count [exact-nonnegative-integer? new-count])
-    (let ([old-count s-count]
-          [new-count (max new-count 1)])
-      (set! s-count new-count)
-      (when s-admin
-        (unless (send s-admin recounted this #t)
-          (set! s-count old-count)))))
-
-  (def/public (set-flags [(make-list (symbol-in is-text 
-                                                can-append 
-                                                invisible 
-                                                newline 
-                                                hard-newline 
-                                                handles-events 
-                                                width-depends-on-x 
-                                                height-depends-on-y 
-                                                width-depends-on-y 
-                                                height-depends-on-x
-                                                handles-all-mouse-events)) 
-                          new-flags])
-    (s-set-flags (symbols->flags new-flags)))
-  
-  (define/public (s-set-flags new-flags)
-    (let* (;; make sure that wxSNIP-HARD_NEWLINE implies a wxSNIP-NEWLINE
-           [new-flags (if (has-flag? new-flags HARD-NEWLINE)
-                          (add-flag new-flags NEWLINE)
-                          (remove-flag new-flags NEWLINE))]
-           ;; make sure ownership and splitness flags don't change
-           [new-flags (copy-flag s-flags new-flags OWNED)]
-           [new-flags (copy-flag s-flags new-flags CAN-DISOWN)]
-           [new-flags (copy-flag s-flags new-flags CAN-SPLIT)])
-      (set! s-flags new-flags)
-      (when s-admin
-        (send s-admin resized this #t))))
-
-  (def/public (on-event [dc<%> dc] [real? x] [real? y] [real? ex] [real? ey] [mouse-event% event])
-    (void))
-  (def/public (on-goodbye-event [dc<%> dc] [real? x] [real? y] [real? ex] [real? ey] [mouse-event% event])
-    (on-event dc x y ex ey event))
-
-  (def/public (adjust-cursor [dc<%> dc] [real? x] [real? y] [real? ex] [real? ey] [mouse-event% event])
-    #f)
-
-  (def/public (on-char [dc<%> dc] [real? x] [real? y] [real? ex] [real? ey] [key-event% event])
-    (void))
-
-  (def/public (do-edit-operation [symbol? op] [any? [recur? #t]] [exact-integer? [timestamp 0]])
-    (void))
-
-  (def/public (can-do-edit-operation? [symbol? op] [any? [recur? #t]])
-    #f)
-
-  (def/public (match? [snip% other])
-    (and (eq? s-snipclass (snip->snipclass other))
-         (= s-count (get-field s-count other))))
-  
-  (def/public (own-caret [any? own?])
-    (void))
-
-  (def/public (blink-caret [dc<%> dc] [real? ex] [real? ey])
-    (void))
-
-  (def/public (size-cache-invalid)
-    (void))
-
-  (def/public (get-extent [dc<%> dc] [real? ex] [real? ey] 
-                          [maybe-box? [w #f]] [maybe-box? [h #f]] 
-                          [maybe-box? [descent #f]] [maybe-box? [space #f]]
-                          [maybe-box? [lspace #f]] [maybe-box? [rspace #f]])
-    (when w (set-box! w 0.0))
-    (when h (set-box! h 0.0))
-    (when descent (set-box! descent 0.0))
-    (when space (set-box! space 0.0))
-    (when lspace (set-box! lspace 0.0))
-    (when rspace (set-box! rspace 0.0)))
-
-  (def/public (partial-offset [dc<%> dc] [real? ex] [real? ey] [exact-nonnegative-integer? offset])
-    (if (zero? offset)
-        0.0
-        (let-boxes ([w 0.0])
-            (get-extent dc ex ey w #f #f #f #f #f)
-          w)))
-
-  (def/public (draw [dc<%> dc] [real? x] [real? y] 
-                    [real? left] [real? top] [real? bottom] [real? right] 
-                    [real? dx] [real? dy] [caret-status? caret])
-    (void))
-
-  (def/public (split [exact-nonnegative-integer? position] [box? first] [box? second])
-    (let ([snip (new snip%)])
-      (send snip set-s-count position)
-      (set! s-count (- s-count position))
-
-      (set-box! first snip)
-      (set-box! second this)
-
-      (when (and (not (has-flag? s-flags CAN-SPLIT)) s-admin)
-        (send s-admin resized this #t))))
-
-  (def/public (merge-with [snip% other])
-    #f)
-
-  (def/public (get-text! [mutable-string? s] [exact-nonnegative-integer? offset] 
-                         [exact-integer? num] [exact-nonnegative-integer? dt])
-    (unless (num . <= . 0)
-      (let ([str (get-text (+ offset dt) num #f)])
-        (if (not str)
-            (for ([i (in-range num)])
-              (string-set! s i #\.))
-            (string-copy! s 0 str 0 (min num (string-length str) (string-length s)))))))
-
-  (def/public (get-text [exact-nonnegative-integer? offset] [exact-integer? num] 
-                        [any? [flattened? #f]])
-    (make-string (min num (max 0 (- s-count (max 0 offset)))) #\.))
-
-  (def/public (set-style [style<%> s])
-    (unless (has-flag? s-flags OWNED)
-      (set! s-style s)))
-
-  (def/public (get-style)
-    s-style)
-
-  (def/public (copy)
-    (let ([s (new snip%)])
-      (do-copy-to s)
-      s))
-
-  (define/public (do-copy-to dest)
-    (send dest set-s-count s-count)
-    (send dest set-s-flags
-          (remove-flag (remove-flag (remove-flag s-flags OWNED)
-                                    CAN-DISOWN)
-                       CAN-SPLIT))
-    (send dest set-s-snipclass s-snipclass)
-    (send dest set-s-style s-style))
-
-  (def/public (write [editor-stream-out% f])
-    (void))
-
-  (def/public (resize [real? w] [real? h]) 
-    #f)
-
-  (def/public (get-num-scroll-steps)
-    1)
-
-  (def/public (find-scroll-step [real? n])
-    0)
-
-  (def/public (get-scroll-step-offset [exact-integer? n])
-    0)
-
-  (def/public (is-owned?)
-    (has-flag? s-flags OWNED))
-
-  (def/public (release-from-owner)
-    (if (not (has-flag? s-flags OWNED))
-        #t
-        (if (not s-admin)
-            #f
-            (if (send s-admin release-snip this)
-                (not (has-flag? s-flags OWNED))
-                #f))))
-
-  (def/public (set-unmodified)
-    (void))
-  
-  (def/public (equal-to? [snip% that] [any? recur]) 
-    (send that other-equal-to? this recur))
-  (def/public (other-equal-to? [snip% that] [any? recur]) (eq? this that))
-  (define/public (equal-hash-code-of recur) (eq-hash-code this))
-  (define/public (equal-secondary-hash-code-of recur) 1))
- 
-(defclass internal-snip% snip%
-  (super-new)
-  (def/override (set-count [exact-integer? c])
-    ;; reject change
-    (void)))
-;; ------------------------------------------------------------
-
-(defclass string-snip-class% snip-class%
-  (inherit set-classname
-           set-version)
-  (inherit-field s-required?)
-
-  (super-new)
-
-  (set-classname "wxtext")
-  (set-version 3)
-  (set! s-required? #t)
-
-  (def/override (read [editor-stream-in% f])
-    (s-read (make-object string-snip% 0) f))
-
-  (def/public (s-read [string-snip% snip] [editor-stream-in% f])
-    (let ([flags (send f get-exact)])
-      (let ([pos (send f tell)])
-        (let ([count (send f get-exact)])
-          (send f jump-to pos)
-          (let ([count (if (count . < . 0)
-                           10; this is a failure; we make up something
-                           count)])
-            (send snip s-read count f))
-          (send snip set-s-flags flags)
-          snip)))))
-
-;; ------------------------------------------------------------
-
-(defclass string-snip% internal-snip%
-  (inherit-field s-style
-                 s-count
-                 s-flags
-                 s-admin
-                 s-snipclass)
-
-  (init-rest args)
-
-  (field [str-metric #f] ; a number (in which case height, decsent, and space matches style) or a vector
-         [s-dtext 0]
-         [s-buffer ""])
-
-  (super-new)
-  (set! s-count 0)
-
-  (define/public (set-str-w v) (set! str-metric v))
-  (define/public (get-s-dtext) s-dtext)
-
-  (let-values ([(str len)
-                (cond
-                 ;; handle common case for split, first:
-                 [(and (pair? args)
-                       (exact-nonnegative-integer? (car args))
-                       (null? (cdr args)))
-                  (values "" (car args))]
-                 [else
-                  (case-args
-                   args
-                   [() (values "" 0)]
-                   [([exact-nonnegative-integer? len])
-                    (values "" len)]
-                   [([string? str])
-                    (values str (string-length str))]
-                   [([string? str] [exact-nonnegative-integer? len])
-                    (values str len)]
-                   (init-name 'string-snip%))])])
-
-    (set! s-flags (add-flag (add-flag s-flags IS-TEXT) CAN-APPEND))
-    
-    (let ([len (if (equal? str "\n")
-                   1 ;; string snips that are just created to be newlines don't need extra space
-                   (max 8 (* 2 (min len 5000))))])
-      (set! s-buffer (make-string len)))
-    
-    (set! s-snipclass the-string-snip-class)
-    
-    (unless (equal? str "")
-      (insert str (min (string-length str) len) 0)))
-
-  (def/override (size-cache-invalid)
-    (set! str-metric #f))
-
-  (define/private (get-text-extent dc count)
-    (let ([font (send s-style get-font)])
-      (send dc get-text-extent (replace-nuls (substring s-buffer s-dtext (+ s-dtext count)))
-            font #f)))
-
-  (def/override (get-extent [dc<%> dc] [real? ex] [real? ey] 
-                            [maybe-box? [wo #f]] [maybe-box? [ho #f]]
-                            [maybe-box? [dso #f]] [maybe-box? [so #f]]
-                            [maybe-box? [ls #f]] [maybe-box? [rs #f]])
-    (unless str-metric
-      (let ([count s-count])
-        (if (or (has-flag? s-flags INVISIBLE)
-                (zero? count)
-                (and (= count 1) 
-                     (or (eq? (string-ref s-buffer s-dtext) #\newline)
-                         (eq? (string-ref s-buffer s-dtext) #\tab))))
-            (if (and (= count 1) 
-                     (eq? (string-ref s-buffer s-dtext) #\tab))
-                (set! str-metric (send s-style get-text-width dc))
-                (set! str-metric 0.0))
-            (let-values ([(w h d s) (get-text-extent dc count)])
-              (if (and (= h (send s-style get-text-height dc))
-                       (= d (send s-style get-text-descent dc))
-                       (= s (send s-style get-text-space dc)))
-                  (set! str-metric w)
-                  (set! str-metric (vector w h d s)))))))
-
-    (when wo (set-box! wo (if (vector? str-metric)
-                              (vector-ref str-metric 0)
-                              str-metric)))
-    (when (or ho dso so)
-      (send s-style reset-text-metrics dc))
-    (when ho
-      (set-box! ho (if (vector? str-metric)
-                       (vector-ref str-metric 1)
-                       (style->cached-text-height s-style))))
-    (when dso
-      (set-box! dso (if (vector? str-metric)
-                        (vector-ref str-metric 2)
-                        (style->cached-text-descent s-style))))
-    (when so
-      (set-box! so (if (vector? str-metric)
-                       (vector-ref str-metric 3)
-                       (style->cached-text-space s-style))))
-    (when ls (set-box! ls 0.0))
-    (when rs (set-box! rs 0.0)))
-
-  (def/override (partial-offset [dc<%> dc] [real? ex] [real? ey] 
-                                [exact-nonnegative-integer? offset])
-    (let-values ([(w h d a) (get-text-extent dc (min offset s-count))])
-      w))
-
-  (def/override (draw [dc<%> dc] [real? x] [real? y] 
-                      [real? left] [real? top] [real? bottom] [real? right] 
-                      [real? dx] [real? dy] [caret-status? caret])
-    (unless (has-flag? s-flags INVISIBLE)
-      (if (and (pair? caret)
-               (or (and s-admin (send s-admin get-selected-text-color))
-                   (eq? 'solid (send dc get-text-mode))))
-          ;; Draw three parts: before selection, selection, after selection
-          (let ([before (replace-nuls
-                         (substring s-buffer 
-                                    s-dtext 
-                                    (+ s-dtext (min (car caret) s-count))))]
-                [sel (replace-nuls
-                      (substring s-buffer 
-                                 (+ s-dtext (min (car caret) s-count))
-                                 (+ s-dtext (min (cdr caret) s-count))))]
-                [after (replace-nuls
-                        (substring s-buffer 
-                                   (+ s-dtext (min (cdr caret) s-count))
-                                   (+ s-dtext s-count)))])
-            (let-values ([(bw bh bd ba) (if (string=? before "")
-                                            (values 0.0 0.0 0.0 0.0)
-                                            (send dc get-text-extent before))]
-                         [(sw sh sd sa) (send dc get-text-extent sel)]
-                         [(aw ah ad aa) (if (string=? after "")
-                                            (values 0.0 0.0 0.0 0.0)
-                                            (send dc get-text-extent after))])
-              (define (baseline-delta h d)
-                (- (max (- bh bd) (- sh sd) (- ah ad)) (- h d)))
-              (unless (string=? before "")
-                (send dc draw-text before x (+ y (baseline-delta bh bd)) #f))
-              (let ([col (send dc get-text-foreground)]
-                    [mode (send dc get-text-mode)])
-                (when (and s-admin (send s-admin get-selected-text-color))
-                  (send dc set-text-foreground (send s-admin get-selected-text-color)))
-                (send dc set-text-mode 'transparent)
-                (send dc draw-text sel (+ x bw) (+ y (baseline-delta sh sd)) #f)
-                (send dc set-text-foreground col)
-                (send dc set-text-mode mode)
-                (unless (string=? after "")
-                  (send dc draw-text after (+ x bw sw) (+ y (baseline-delta ah ad)) #f)))))
-          ;; Just draw the string
-          (send dc draw-text (replace-nuls (substring s-buffer s-dtext (+ s-dtext s-count))) x y #f))))
-
-  (def/override (split [exact-nonnegative-integer? position] [box? first] [box? second])
-    (let ([count s-count])
-      (unless (or (position . < . 0)
-                  (position . > . count))
-        
-        (let ([snip (if (and (= 1 position)
-                             (equal? (string-ref s-buffer s-dtext) #\newline))
-                        ;; making a newline snip, so signal string-snip% this fact by passing "\n"
-                        (make-object string-snip% "\n")
-                        (make-object string-snip% position))])
-          
-          (set! str-metric #f)
-
-          (let ([s (string-snip-buffer snip)])
-            (unless ((string-length s) . >= . position)
-              (set-string-snip-buffer! snip (make-string position))))
-          
-          (string-copy! (string-snip-buffer snip)
-                        0
-                        s-buffer
-                        s-dtext
-                        (+ position s-dtext))
-          (set-snip-count! snip position)
-          (set! s-dtext (+ s-dtext position))
-
-          (let ([count (- count position)])
-            (set! s-count count)
-
-            (when ((string-length s-buffer) . > . (max MIN-WASTE-CHECK (* MAX-WASTE (add1 count))))
-              (let ([s (make-string count)])
-                (string-copy! s 0 s-buffer s-dtext (+ s-dtext count))
-                (set! s-dtext 0)
-                (set! s-buffer s))))
-
-          (set-box! first snip)
-          (set-box! second this)
-          
-          (when (and s-admin (not (has-flag? s-flags CAN-SPLIT)))
-            (send s-admin resized this #t))))))
-
-  (def/override (merge-with [snip% pred])
-    (set! str-metric #f)
-    (insert-with-offset (string-snip-buffer pred)
-                        (snip->count pred)
-                        (string-snip-dtext pred)
-                        0)
-    (when (not (has-flag? s-flags CAN-SPLIT))
-      (send s-admin resized this #t))
-    this)
-
-  (define/public (insert-with-offset s len delta pos)
-    (unless (or (len . <= . 0)
-                (pos . < . 0))
-      (let ([count s-count])
-        (cond
-         [((string-length s-buffer) . < . (+ count len))
-          (let ([s (make-string (* 2 (+ count len)))])
-            (string-copy! s 0 s-buffer s-dtext (+ s-dtext count))
-            (set! s-buffer s)
-            (set! s-dtext 0))]
-         [((+ s-dtext count len) . > . (string-length s-buffer))
-          (string-copy! s-buffer 0 s-buffer s-dtext (+ s-dtext count))
-          (set! s-dtext 0)])
-
-        (when (pos . < . count)
-          (string-copy! s-buffer (+ s-dtext pos len)
-                        s-buffer (+ s-dtext pos)
-                        (+ s-dtext count)))
-        (string-copy! s-buffer
-                      (+ s-dtext pos)
-                      s
-                      delta 
-                      (+ delta len))
-        (set! s-count (+ count len))
-        (set! str-metric #f)
-        (when (not (has-flag? s-flags CAN-SPLIT))
-          (when s-admin
-            (unless (send s-admin recounted this #t)
-              (set! s-count count)))))))
-
-  (def/public (insert [string? str] [exact-nonnegative-integer? len] 
-                      [exact-nonnegative-integer? [pos 0]])
-    (insert-with-offset str len 0 pos))
-
-  (def/override  (get-text! [mutable-string? s] [exact-nonnegative-integer? offset] 
-                            [exact-integer? num] [exact-nonnegative-integer? dt])
-    (when (positive? num)
-      (string-copy! s dt s-buffer (+ s-dtext offset) (+ s-dtext (min (+ offset num) s-count)))))
-
-  (def/override (get-text [exact-nonnegative-integer? offset] [exact-integer? num] 
-                          [any? [flat? #f]])
-    (let ([num (min num (max 0 (- s-count offset)))])
-      (if (num . <= . 0)
-          ""
-          (let ([s (make-string num)])
-            (get-text! s offset num 0)
-            s))))
-
-  (def/override (copy)
-    (let ([snip (new string-snip%)])
-      (do-copy-to snip)
-      snip))
-
-  (def/override (do-copy-to [snip% snip])
-    (super do-copy-to snip)
-    (set-snip-count! snip 0)
-    (send snip insert-with-offset s-buffer s-count s-dtext 0))
-
-  (def/override (write [editor-stream-out% f])
-    (let* ([write-flags s-flags]
-           [write-flags (remove-flag write-flags OWNED)]
-           [write-flags (remove-flag write-flags CAN-DISOWN)]
-           [write-flags (remove-flag write-flags CAN-SPLIT)])
-      (send f put write-flags)
-      (let ([bytes (string->bytes/utf-8 s-buffer 0 s-dtext (+ s-dtext s-count))])
-        (send f put (bytes-length bytes) bytes))))
-
-  (def/public (read [exact-nonnegative-integer? len]
-                    [editor-stream-in% f])
-    (s-read len f))
-
-  (define/public (s-read len f)
-    (unless (len . < . 0) ; tolerate a 0-length snip, to be filtered out later
-      (when ((string-length s-buffer) . < . len)
-        (set! s-buffer (make-string (* 2 len))))
-      (set! s-dtext 0)
-      (let ([rv (send f do-reading-version the-string-snip-class)])
-        (cond
-         [(not (= rv 2))
-          ;; read latin-1 (version < 2) or utf-8 (version > 2)
-          (let ([b (make-bytes len)]
-                [l2 (box len)])
-            (send f get-unterminated-bytes! l2 b)
-            (let ([len (unbox l2)]
-                  [s (if (rv . < . 2)
-                         (bytes->string/latin-1 b #\? 0 len)
-                         (bytes->string/utf-8 b #\? 0 len))])
-              (string-copy! s-buffer 0 s 0 (string-length s))
-              (set! s-count (string-length s))))]
-         [else
-          ;; version 2 wrote out UTF-32 directly -- bad idea,
-          ;; because it uses the machine's endianness.
-          (let ([b (make-bytes (* len 4))]
-                [l2 (box len)]
-                [big? (system-big-endian?)])
-            (send f get-unterminated-bytes! len b)
-            (let ([len (unbox l2)])
-              (for ([i (in-range len)])
-                (let ([c (integer-bytes->integer b #f big? (* i 4) (* (add1 i) 4))])
-                  (string-set! s-buffer i (char->integer c))))))]))
-      (set! str-metric #f))))
-
-(define string-snip-buffer (class-field-accessor string-snip% s-buffer))
-(define string-snip-dtext (class-field-accessor string-snip% s-dtext))
-(define set-string-snip-buffer! (class-field-mutator string-snip% s-buffer))
-
-;; ------------------------------------------------------------
-
-(defclass tab-snip-class% string-snip-class%
-  (inherit set-classname
-           set-version
-           s-read)
-  (inherit-field s-required?)
-
-  (super-new)
-
-  (set-classname "wxtab")
-  (set-version 1)
-  (set! s-required? #t)
-
-  (def/override (read [editor-stream-in% f])
-    (let ([ts (new tab-snip%)])
-      (s-read ts f))))
-
-;; ------------------------------------------------------------
-
-(defclass tab-snip% string-snip%
-  (inherit-field s-snipclass
-                 s-flags
-                 s-admin
-                 str-metric)
-  (inherit set-str-w
-           set-s-snipclass
-           do-copy-to)
-
-  (super-new)
-
-  (set-s-snipclass the-tab-snip-class)
-  (set! s-flags (remove-flag (add-flag s-flags WIDTH-DEPENDS-ON-X)
-                             CAN-APPEND))
-
-  (def/override (get-extent [dc<%> dc] [real? ex] [real? ey] 
-                            [maybe-box? [wi #f]] [maybe-box? [h #f]] 
-                            [maybe-box? [descent #f]] [maybe-box? [space #f]]
-                            [maybe-box? [lspace #f]] [maybe-box? [rspace #f]])
-    (let* ([old-w str-metric]
-           [changed? (not old-w)])
-      (super get-extent dc ex ey wi h descent space lspace rspace)
-
-      (when changed?
-        ;; w is now width of a space
-        (let* ([admin s-admin]
-               [media (and admin
-                           (send admin get-editor))])
-          (let-values ([(n tabs tabspace mult)
-                        (let-boxes ([n 0]
-                                    [space 0]
-                                    [units? #f]
-                                    [tabs null])
-                            (set-box! tabs (send admin get-tabs n space units?))
-                          (values n
-                                  tabs ;; a list
-                                  space
-                                  (if units? 
-                                      1 
-                                      (if (zero? str-metric)
-                                          1.0
-                                          str-metric))))])
-            (set-str-w
-             (let loop ([i 0])
-               (if (= i n)
-                   (let ([base (if (zero? n)
-                                   0
-                                   (list-ref tabs (- n 1)))])
-                     (let ([tabspace (* tabspace mult)])
-                       (+ base (- (->long tabspace)
-                                  (modulo (->long (- ex base))
-                                          (->long tabspace))))))
-                   (let ([v (list-ref tabs i)])
-                     (if ((* mult v) . > . ex)
-                         (- (* mult v) ex)
-                         (loop (add1 i))))))))))
-
-      (when wi (set-box! wi str-metric))))
-
-  (def/override (partial-offset [dc<%> dc] [real? x] [real? y] 
-                                [exact-nonnegative-integer? offset])
-    (if (zero? offset)
-        0.0
-        (let-boxes ([w 0.0])
-            (get-extent dc x y w #f #f #f #f #f)
-          w)))
-
-  (def/override (draw [dc<%> dc] [real? x] [real? y] 
-                      [real? left] [real? top] [real? bottom] [real? right] 
-                      [real? dx] [real? dy] [caret-status? caret])
-    ;; draw nothing
-    (void))
-
-  (def/override (copy)
-    (let ([snip (new tab-snip%)])
-      (do-copy-to snip)
-      snip)))
-
-;; ------------------------------------------------------------
-
-(define IMG-MOVE-BUF-SIZE 500)
-
-(define (int->img-type type)
-  (case type
-    [(#x2) 'bmp]
-    [(#x8) 'xbm]
-    [(#x200) 'xpm]
-    [(#x1000) 'gif]
-    [(#x11000) 'gif/mask]
-    [(#x4000) 'jpeg]
-    [(#x8000) 'png]
-    [(#x18000) 'png/mask]
-    [(#x12000) 'unknown/mask]
-    [else 'unknown]))
-
-(define (img-type->int type)
-  (case type
-    [(bmp) #x2]
-    [(xbm) #x8]
-    [(xpm) #x200]
-    [(gif) #x1000]
-    [(gif/mask) #x11000]
-    [(jpeg) #x4000]
-    [(png) #x8000]
-    [(png/mask) #x18000]
-    [(unknown/mask) #x12000]
-    [else #x2000]))
-
-(defclass image-snip-class% snip-class%
-  (inherit set-classname
-           set-version)
-  (inherit-field s-required?)
-
-  (super-new)
-  
-  (set-classname "wximage")
-  (set-version 2)
-  
-  (def/override (read [editor-stream-in% f])
-    (let ([scl (get-the-snip-class-list)]
-          [can-inline? ((send f do-reading-version this) . > . 1)])
-      (let ([filename (send f get-bytes #f)])
-        (let-boxes ([type 0]
-                    [w 0.0]
-                    [h 0.0]
-                    [dx 0.0]
-                    [dy 0.0]
-                    [relative 0])
-            (begin
-              (send f get type)
-              (send f get w)
-              (send f get h)
-              (send f get dx)
-              (send f get dy)
-              (send f get relative))
-
-          (let-values ([(loadfile
-                         type
-                         inlined?
-                         backing-scale)
-                        (if (and (equal? filename #"")
-                                 can-inline?
-                                 (positive? type))
-                            ;; read inlined image
-                            (let-boxes ([len 0])
-                                (send f get-fixed len)
-                              (if (and (len . > . 0)
-                                       (send f ok?))
-                                  (let-values ([(in out) (make-pipe)]
-                                               [(backing-scale)
-                                                (if (= type 4)
-                                                    (send f get-inexact)
-                                                    1.0)])
-                                    (for ([i (in-range len)])
-                                      (display (send f get-unterminated-bytes) out))
-                                    (close-output-port out)
-                                    (values in
-                                            'unknown/alpha
-                                            #t
-                                            backing-scale))
-                                  (values filename
-                                          (int->img-type type)
-                                          #f
-                                          1.0)))
-                            (values filename
-                                    (int->img-type type)
-                                    #f
-                                    1.0))])
-            ;; the call to create an image-snip% object
-            ;; here should match the way that super-make-object
-            ;; is called in wxme/image.rkt
-            (let ([snip (make-object image-snip% 
-                                     (if (equal? loadfile #"")
-                                         #f
-                                         (if (bytes? loadfile)
-                                             (bytes->path loadfile)
-                                             loadfile))
-                                     type
-                                     (positive? relative) 
-                                     inlined?
-                                     backing-scale)])
-              (send snip resize w h)
-              (send snip set-offset dx dy)
-
-              snip)))))))
-
-;; ------------------------------------------------------------
-
-;; old implementation prevented bitmap modifications while installed 
-;; in an image snip
-(define (marked-as-selected? bm) #f)
-(define (mark-as-selected bm) (void))
-(define (unmark-as-selected bm) (void))
-
-(define black-color (make-object color% 0 0 0))
-
-(define image-type?
-  (symbol-in unknown unknown/mask unknown/alpha
-             gif gif/mask gif/alpha
-             jpeg png png/mask png/alpha
-             xbm xpm bmp pict))
-
-(define png-convertible<%>
-  (interface* ()
-              ([prop:convertible
-                (lambda (img format default)
-                  (cond
-                    [(or (eq? format 'png-bytes)
-                         (and (eq? format 'png@2x-bytes)
-                              (= 2 (send (send img get-bitmap) get-backing-scale))))
-                     (let ([s (open-output-bytes)])
-                       (send (send img get-bitmap) save-file s 'png
-                             #:unscaled? (eq? format 'png@2x-bytes))
-                       (get-output-bytes s))]
-                    [else default]))])))
-
-(defclass* image-snip% internal-snip% (png-convertible<%>)
-  (inherit-field s-admin
-                 s-flags)
-  (inherit set-snipclass)
-
-  (init-rest args)
-
-  (define filename #f)
-  (define filetype 0) ; file != #f => type of file, otherwise loaded 1 => XBM and 2 => XPM
-  (define bm #f)
-  (define mask #f)
-  (define is-relative-path? #f)
-
-  (define w 0.0)
-  (define h 0.0)
-  (define vieww -1.0)
-  (define viewh -1.0)
-  (define viewdx 0.0)
-  (define viewdy 0.0)
-  (define contents-changed? #f)
-
-  (super-new)
-
-  (set-snipclass the-image-snip-class)
-
-  (case-args
-   args
-   [([bitmap% bm] [(make-or-false bitmap%) [mask #f]])
-    (set-bitmap bm mask)]
-   [([(make-or-false (make-alts path-string? input-port?)) [name #f]]
-     [image-type? [kind 'unknown]]
-     [bool? [relative-path? #f]]
-     [bool? [inline? #t]]
-     [positive-real? [backing-scale 1.0]])
-    (load-file name kind relative-path? inline? backing-scale)]
-   (init-name 'bitmap%))
-
-  (define/private (size-cache-invalid)
-    (set! contents-changed? #t))
-
-  (def/override (get-extent [dc<%> dc] [real? ex] [real? ey] 
-                            [maybe-box? [wi #f]] [maybe-box? [hi #f]] 
-                            [maybe-box? [descent #f]] [maybe-box? [space #f]]
-                            [maybe-box? [lspace #f]] [maybe-box? [rspace #f]])
-    (when contents-changed?
-     (let-values ([(_w _h)
-                   (if (and bm (send bm ok?))
-                       (values
-                        (if (vieww . < . 0)
-                            (send bm get-width)
-                            vieww)
-                        (if (viewh . < . 0)
-                            (send bm get-height)
-                            viewh))
-                       (values 0 0))])
-       (set! w (if (zero? _w)
-                   IMAGE-VOID-SIZE
-                   _w))
-       (set! h (if (zero? _h)
-                   IMAGE-VOID-SIZE
-                   _h))))
-    (when wi (set-box! wi w))
-    (when hi (set-box! hi h))
-    (when descent
-      (if (or (not bm)
-              (not (send bm ok?)))
-          (set-box! descent 1.0)
-          (set-box! descent 0.0)))
-    (when space (set-box! space 0.0))
-    (when lspace (set-box! lspace 0.0))
-    (when rspace (set-box! rspace 0.0)))
-
-  (def/override (draw [dc<%> dc] [real? x] [real? y] 
-                      [real? left] [real? top] [real? bottom] [real? right] 
-                      [real? dx] [real? dy] [caret-status? caret])
-    (if (or (not bm)
-            (not (send bm ok?)))
-        (begin
-          (send dc draw-rectangle
-                (+ x 1) (+ y 1)
-                (- w 2) (- h 2))
-          (send dc draw-line
-                (+ x 1) (+ y 1)
-                (+ x w -2) (+ y h -2))
-          (send dc draw-line
-                (+ x 1) (+ y h -2)
-                (+ x w -2) (+ y 1)))
-        (let ([msk (or mask
-                       (let ([mask (send bm get-loaded-mask)])
-                         (and mask
-                              (send mask ok?)
-                              (= w (send mask get-width))
-                              (= h (send mask get-height))
-                              mask)))]
-              [alpha (send dc get-alpha)])
-          (when (pair? caret)
-            (send dc set-alpha (* 0.5 alpha)))
-          (send dc draw-bitmap-section bm x y 0 0 w h
-                'solid black-color msk)
-          (when (pair? caret)
-            (send dc set-alpha alpha)))))
-
-  (def/override (copy)
-    (let ([s (new image-snip%)])
-      (do-copy-to s)
-      s))
-
-  (def/override (write [editor-stream-out% f])
-    (send f put (if (path? filename)
-                    (path->bytes filename)
-                    #""))
-    (let ([write-mode
-           (if filename
-               (begin
-                 (send f put (img-type->int filetype))
-                 #f)
-               (cond
-                [(not bm) (send f put 0) #f]
-                [(= (send bm get-depth) 1)
-                 (send f put 1)
-                 'bm]
-                [(= 1 (send bm get-backing-scale))
-                 (send f put 2)
-                 'pm]
-                [else
-                 (send f put 4)
-                 'scaled-pm]))])
-      (send f put vieww)
-      (send f put viewh)
-      (send f put viewdx)
-      (send f put viewdy)
-      (send f put (if is-relative-path? 1 0))
-      
-      (when write-mode
-        ;; inline the image
-        (let ([lenpos (send f tell)])
-          (send f put-fixed 0)
-
-          (when (eq? write-mode 'scaled-pm)
-            (send f put (send bm get-backing-scale)))
-
-          (let ([num-lines
-                 (let-values ([(in out) (make-pipe)])
-                   (send bm save-file out 'png #:unscaled? #t)
-                   (close-output-port out)
-                   (let loop ([numlines 0])
-                     (let ([s (read-bytes IMG-MOVE-BUF-SIZE in)])
-                       (if (eof-object? s)
-                           numlines
-                           (begin
-                             (send f put-unterminated s)
-                             (loop (add1 numlines)))))))])
-            
-            (let ([end (send f tell)])
-              (send f jump-to lenpos)
-              (send f put-fixed num-lines)
-              (send f jump-to end)))))))
-  
-  (def/public (load-file [(make-or-false (make-alts path-string? input-port?)) [name #f]]
-                         [image-type? [kind 'unknown]]
-                         [bool? [rel-path? #f]]
-                         [bool? [inline? #t]]
-                         [positive-real? [backing-scale 1.0]])
-    (do-set-bitmap #f #f #f)
-    
-    (let* ([rel-path? (and rel-path?
-                           (path-string? name)
-                           (relative-path? name))]
-           [name (if rel-path?
-                     name
-                     (and name 
-                          (if (path-string? name)
-                              (path->complete-path name)
-                              name)))])
-      (set! s-flags
-            (if rel-path?
-                (add-flag s-flags USES-BUFFER-PATH)
-                (remove-flag s-flags USES-BUFFER-PATH)))
-
-      (let ([orig-name name]
-            [name (and name
-                       (path-string? name)
-                       (if (string? name)
-                           (string->path name)
-                           name))])
-        (unless inline?
-          (set! filename name)
-          (set! filetype kind))
-
-        (when orig-name
-          (let ([fullpath (if (input-port? orig-name)
-                              orig-name
-                              (if rel-path?
-                                  (path->complete-path
-                                   name
-                                   (or (and s-admin
-                                            (let ([e (send s-admin get-editor)])
-                                              (and e
-                                                   (let ([fn (send e get-filename)])
-                                                     (and fn
-                                                          (let-values ([(base name dir?) (split-path fn)])
-                                                            (and (path? base)
-                                                                 (path->complete-path base))))))))
-                                       (current-directory)))
-                                  name))])
-            (let ([nbm (if s-admin
-                           (send s-admin call-with-busy-cursor
-                                 (lambda ()
-                                   (make-object bitmap% fullpath kind)))
-                           (make-object bitmap% fullpath kind #f #f backing-scale))])
-              (when (send nbm ok?)
-                (do-set-bitmap nbm #f #f))))))
-      ;; for refresh:
-      (set-bitmap bm mask)))
-
-  (define/override (do-copy-to d)
-    (if (d . is-a? . snip%)
-        ((send d do-copy-to #f)
-         filename
-         filetype
-         is-relative-path?
-         vieww
-         viewh
-         viewdx
-         viewdy
-         bm mask)
-        (lambda (-filename -filetype -relative-path?
-                           -vieww -viewh -viewdx -viewdy
-                           -bm -mask)
-          (set! filename -filename)
-          (set! filetype -filetype)
-          (set! is-relative-path? -relative-path?)
-          (set! vieww -vieww)
-          (set! viewh -viewh)
-          (set! viewdx -viewdx)
-          (set! viewdy -viewdy)
-          (set! bm -bm)
-          (set! mask -mask)
-          (mark-as-selected bm)
-          (mark-as-selected mask))))
-
-  (def/public (get-filename [maybe-box? [rel? #f]])
-    (when rel?
-      (set-box! rel? (and filename is-relative-path?)))
-    filename)
-  
-  (def/public (get-filetype)
-    (if filename
-        filetype
-        'unknown))
-
-  (def/public (set-bitmap [(make-or-false bitmap%) map]
-                          [(make-or-false bitmap%) [msk #f]])
-    (do-set-bitmap map msk #t))
-
-  (define/private (do-set-bitmap map msk refresh?)
-    (unless (or (marked-as-selected? map)
-                (marked-as-selected? msk))
-      (unmark-as-selected bm)
-      (unmark-as-selected mask)
-
-      (set! bm #f)
-      (set! mask #f)
-
-      (let ([map (and map (send map ok?) map)]
-            [msk (and msk (send msk ok?) msk)])
-        (set! bm map)
-        (set! mask msk)
-
-        (mark-as-selected bm)
-        (mark-as-selected msk))
-
-      (when refresh?
-        (set! contents-changed? #t)
-        (when s-admin 
-          (send s-admin resized this #t)))))
-
-  (def/public (get-bitmap)
-    bm)
-
-  (def/public (get-bitmap-mask)
-    mask)
-
-  (def/override (other-equal-to? [image-snip% other] [any? recur])
-    (let* ([bm (send this get-bitmap)]
-           [bm2 (send other get-bitmap)])
-      (and
-       bm (send bm ok?)
-       bm2 (send bm ok?)
-       (= (send bm get-depth) (send bm2 get-depth))
-       (let ([w (send bm get-width)]
-             [h (send bm get-height)])
-         (and
-          (= w (send bm2 get-width))
-          (= h (send bm2 get-height))
-          (let ([s1 (make-bytes (* w h 4))]
-                [s2 (make-bytes (* w h 4))])
-            (send bm get-argb-pixels 0 0 w h s1 #f)
-            (send bm2 get-argb-pixels 0 0 w h s2 #f)
-            (let ([mask (send this get-bitmap-mask)])
-              (when (and mask
-                         (send mask ok?)
-                         (= w (send mask get-width))
-                         (= h (send mask get-height)))
-                (send mask get-argb-pixels 0 0 w h s1 #t)))
-            (let ([mask2 (send other get-bitmap-mask)])
-              (when (and mask2
-                         (send mask2 ok?)
-                         (= w (send mask2 get-width))
-                         (= h (send mask2 get-height)))
-                (send mask2 get-argb-pixels 0 0 w h s2 #t)))
-            (equal? s1 s2)))))))
-
-  (define/private (do-hash-code hash-code)
-    (if (and bm 
-             (send bm ok?))
-        (let ([w (send bm get-width)]
-              [h (send bm get-height)])
-          (let ([s1 (make-bytes (* w h 4))])
-            (send bm get-argb-pixels 0 0 w h s1 #f)
-            (when (and mask
-                       (send mask ok?)
-                       (= w (send mask get-width))
-                       (= h (send mask get-height)))
-              (send mask get-argb-pixels 0 0 w h s1 #t))
-            (hash-code s1)))
-        0))
-
-  (def/override (equal-hash-code-of [any? recur])
-    (do-hash-code equal-hash-code))
-  (def/override (equal-secondary-hash-code-of [any? recur])
-    (do-hash-code equal-secondary-hash-code))
-
-  (def/public (set-offset [real? x] [real? y])
-    (set! viewdx x)
-    (set! viewdy y)
-    (set! contents-changed? #t)
-    (when s-admin
-      (send s-admin needs-update this 0 0 w h)))
-
-  (def/override (resize [real? w] [real? h])
-    (set! vieww w)
-    (set! viewh h)
-    (set! contents-changed? #t)
-    (when s-admin
-      (send s-admin resized this #t))
-    #t)
-
-  (def/override (get-num-scroll-steps)
-    (max (->long (/ h IMAGE-PIXELS-PER-SCROLL))
-         1))
-  
-  (def/override (find-scroll-step [real? y])
-    (->long (/ y IMAGE-PIXELS-PER-SCROLL)))
-
-  (def/override (get-scroll-step-offset [exact-integer? i])
-    (* i IMAGE-PIXELS-PER-SCROLL))
-
-  (def/override (set-admin [(make-or-false snip-admin%) a])
-    (when (not (eq? a s-admin))
-      (super set-admin a))
-    (when (and s-admin is-relative-path? filename)
-      (load-file filename filetype #t))))
-
-
-;; ------------------------------------------------------------
-
-(defclass snip-class-list% object%
-  (define ht (make-hash))
-  (define pos-ht (make-hash))
-  (define rev-pos-ht (make-hash))
-
-  (super-new)
-
-  (def/public (find [string? name])
-    (let ([c (hash-ref ht name #f)])
-      (or c
-          (let ([c (get-snip-class name)])
-            (when c (add c))
-            c))))
-  
-  (def/public (find-position [snip-class% c])
-    (hash-ref pos-ht c -1))
-  
-  (def/public (add [snip-class% c])
-    (let ([name (send c get-classname)])
-      (let ([old (hash-ref ht name #f)])
-        (hash-set! ht name c)
-        (let ([n (if old
-                     (hash-ref pos-ht old)
-                     (hash-count pos-ht))])
-          (when old (hash-remove! pos-ht old))
-          (hash-set! pos-ht c n)
-          (hash-set! rev-pos-ht n c)))))
-    
-  (def/public (number) (hash-count ht))
-
-  (def/public (nth [exact-nonnegative-integer? n]) (hash-ref rev-pos-ht n #f)))
-
-(define snip-class-list<%> (class->interface snip-class-list%))
-
-;; ------------------------------------------------------------
-
-(define the-string-snip-class (new string-snip-class%))
-(define the-tab-snip-class (new tab-snip-class%))
-(define the-image-snip-class (new image-snip-class%))
-
-(define-struct snip-class-link ([c #:mutable] [name #:mutable] [header-flag #:mutable] map-position reading-version))
-
-(defclass standard-snip-class-list% snip-class-list%
-  (inherit add
-           number
-           nth
-           find)
-  (super-new)
-
-  (add the-string-snip-class)
-  (add the-tab-snip-class)
-  ;(add the-editor-snip-class)
-  (add the-image-snip-class)
-
-  (define/public (reset-header-flags s)
-    (send s set-sl null)
-    (send s set-dl null))
-
-  (def/public (write [editor-stream-out% f])
-    (let ([n (number)])
-      (send f put n)
-      (for ([i (in-range n)])
-        (let ([c (nth i)])
-          (send f put (string->bytes/utf-8 (send c get-classname)))
-          (send f put (send c get-version))
-          (send f put (if (send c get-s-required?) 1 0))
-
-          (send f add-sl (make-snip-class-link c
-                                               #f
-                                               0
-                                               i
-                                               0)))))
-    #t)
-
-  (def/public (read [editor-stream-in% f])
-    (let-boxes ([count 0])
-        (send f get count)
-      (for/and ([i (in-range count)])
-        (let ([s (send f get-bytes)])
-          (let-boxes ([version 0]
-                      [required 0])
-              (begin
-                (send f get version)
-                (send f get required))
-            (and (send f ok?)
-                 (send f add-sl (make-snip-class-link
-                                 #f
-                                 (bytes->string/utf-8 s #\?)
-                                 0
-                                 i
-                                 version))
-                 #t))))))
-
-  (define/public (find-by-map-position f n)
-    (ormap (lambda (s)
-             (and (= n (snip-class-link-map-position s))
-                  (begin
-                    (when (snip-class-link-name s)
-                      (let ([c (find (snip-class-link-name s))])
-                        (cond
-                          [(not c)
-                           (log-error (format "unknown snip class: ~e (version: ~e)" 
-                                              (snip-class-link-name s)
-                                              (snip-class-link-reading-version s)))]
-                          [((send c get-version) . < . (snip-class-link-reading-version s))
-                           ;; unknown class/version;
-                           ;; since we #f out sl->name, error is only shown once
-                           (log-error (format "unknown snip class: ~e; found version: ~e, need at least version ~e" 
-                                              (snip-class-link-name s)
-                                              (send c get-version)
-                                              (snip-class-link-reading-version s)))]
-                          [else
-                           ;; no prolems
-                           (void)])
-                        (set-snip-class-link-name! s #f)
-                        (set-snip-class-link-c! s c)))
-                    (snip-class-link-c s))))
-           (send f get-sl))))
-
-(define (make-the-snip-class-list)
-  (new standard-snip-class-list%))
-
-(define the-snip-class-list (make-parameter (make-the-snip-class-list)))
-
-(define (get-the-snip-class-list)
-  (the-snip-class-list))
-
-;; ------------------------------------------------------------
-
-(define snip->admin (class-field-accessor snip% s-admin))
-(define snip->count (class-field-accessor snip% s-count))
-(define snip->next (class-field-accessor snip% s-next))
-(define snip->prev (class-field-accessor snip% s-prev))
-(define snip->flags (class-field-accessor snip% s-flags))
-(define snip->line (class-field-accessor snip% s-line))
-(define snip->loc (class-field-accessor snip% s-line))
-(define snip->style (class-field-accessor snip% s-style))
-(define snip->snipclass (class-field-accessor snip% s-snipclass))
-
-(define set-snip-admin! (class-field-mutator snip% s-admin))
-(define set-snip-line! (class-field-mutator snip% s-line))
-(define set-snip-loc! (class-field-mutator snip% s-line))
-(define set-snip-style! (class-field-mutator snip% s-style))
-(define set-snip-flags! (class-field-mutator snip% s-flags))
-(define set-snip-count! (class-field-mutator snip% s-count))
-(define set-snip-prev! (class-field-mutator snip% s-prev))
-(define set-snip-next! (class-field-mutator snip% s-next))
-
-(define snip%-get-text (generic snip% get-text))
-
-;; install the getters:
-(define get-snip-class
- (lambda (name)
-   (load-one name 'snip-class snip-class%)))
-
-(define readable-snip<%>
-  (interface ()
-    read-special))
diff --git a/pkgs/snip-pkgs/snip-lib/racket/snip/private/style.rkt b/pkgs/snip-pkgs/snip-lib/racket/snip/private/style.rkt
deleted file mode 100644
index 90cfcc0bdd..0000000000
--- a/pkgs/snip-pkgs/snip-lib/racket/snip/private/style.rkt
+++ /dev/null
@@ -1,1506 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/file
-         (for-syntax racket/base)
-         racket/draw
-         racket/draw/private/syntax
-         racket/draw/private/font-syms
-         (only-in racket/draw/private/color color-red color-blue color-green)
-         racket/snip/private/private
-         "prefs.rkt")
-
-(provide mult-color<%>
-         add-color<%>
-         style-delta%
-         style<%>
-         style-list%
-         the-style-list
-         setup-style-reads-writes
-         done-style-reads-writes
-         read-styles-from-file
-         write-styles-to-file
-         (protect-out style->alignment
-                      style->cached-text-width
-                      style->cached-text-height
-                      style->cached-text-descent
-                      style->cached-text-space))
-
-;; for contracts
-(define editor-stream-out% object%)
-
-(define default-size 
-  (or (get-preference* 'GRacket:default-font-size)
-      (case (system-type)
-        [(windows) 10]
-        [else 12])))
-
-(define black-color (make-object color% 0 0 0))
-
-(defclass mult-color% object%
-  (define r 0.0)
-  (define g 0.0)
-  (define b 0.0)
-
-  (super-new)
-
-  (def/public (get [box? rb] [box? gb] [box? bb])
-    (set-box! rb r)
-    (set-box! gb g)
-    (set-box! bb b))
-
-  (def/public (set [real? rf] [real? gf] [real? bf])
-    (set! r rf)
-    (set! g gf)
-    (set! b bf))
-
-  (def/public (get-r) r)
-  (def/public (get-g) g)
-  (def/public (get-b) b)
-
-  (def/public (set-r [real? v])
-    (set! r v))
-  (def/public (set-g [real? v])
-    (set! g v))
-  (def/public (set-b [real? v])
-    (set! b v)))
-
-(define mult-color<%> (class->interface mult-color%))
-
-
-(defclass add-color% object%
-  (define r 0)
-  (define g 0)
-  (define b 0)
-
-  (super-new)
-
-  (def/public (get [box? rb] [box? gb] [box? bb])
-    (set-box! rb r)
-    (set-box! gb g)
-    (set-box! bb b))
-
-  (def/public (set [exact-integer? rf] [exact-integer? gf] [exact-integer? bf])
-    (set! r rf)
-    (set! g gf)
-    (set! b bf))
-
-  (def/public (get-r) r)
-  (def/public (get-g) g)
-  (def/public (get-b) b)
-
-  (def/public (set-r [exact-integer? v])
-    (set! r v))
-  (def/public (set-g [exact-integer? v])
-    (set! g v))
-  (def/public (set-b [exact-integer? v])
-    (set! b v)))
-
-(define add-color<%> (class->interface add-color%))
-
-(define-syntaxes (-on -off -set-on! -set-off! -don -doff -d -send-get define-delta)
-  (let ([mk (lambda (form)
-              (lambda (stx)
-                (syntax-case stx () 
-                  [(_ fld)
-                   (datum->syntax #'fld
-                                  (string->symbol (format form (syntax-e #'fld)))
-                                  #'fld)])))]
-        [mk-set (lambda (mk-id)
-                  (lambda (stx)
-                    (syntax-case stx ()
-                      [(_ fld val)
-                       #`(set! #,(mk-id #'(_ fld)) val)])))])
-    (values (mk "~a-on")
-            (mk "~a-off")
-            (mk-set (mk "~a-on"))
-            (mk-set (mk "~a-off"))
-            (mk "style-delta-~a-on")
-            (mk "style-delta-~a-off")
-            (mk "style-delta-~a")
-            (let ([mk-id (mk "get-~a")])
-              (lambda (stx)
-                (syntax-case stx ()
-                  [(_ fld obj)
-                   #`(send obj #,(mk-id #'(* fld)))])))
-            (let ([mk-id (mk "style-delta-~a")])
-              (lambda (stx)
-                (syntax-case stx ()
-                  [(_ fld)
-                   #`(define #,(mk-id stx)
-                       (class-field-accessor style-delta% fld))]))))))
-
-;; style-delta fields directly accessible only within this module:
-(define-local-member-name 
-  family
-  face
-  size-mult
-  size-add
-  weight-on
-  weight-off
-  style-on
-  style-off
-  smoothing-on
-  smoothing-off
-  underlined-on
-  underlined-off
-  size-in-pixels-on
-  size-in-pixels-off
-  transparent-text-backing-on
-  transparent-text-backing-off
-  foreground-mult
-  background-mult
-  foreground-add
-  background-add
-  alignment-on
-  alignment-off)
-
-(define (family-delta? s)
-  (or (eq? s 'base) (family-symbol? s)))
-(define (style-delta? s)
-  (or (eq? s 'base) (style-symbol? s)))
-(define (weight-delta? s)
-  (or (eq? s 'base) (weight-symbol? s)))
-(define (smoothing-delta? s)
-  (or (eq? s 'base) (smoothing-symbol? s)))
-(define (alignment-delta? s)
-  (memq s '(base top bottom center)))
-
-(define not-supplied (string->uninterned-symbol "[not-supplied]"))
-
-(defclass style-delta% object%
-  (field-properties [[family-delta? family] 'base]
-                    [[(make-or-false string?) face] #f]
-                    [[real? size-mult] 1.0]
-                    [[exact-integer? size-add] 0]
-                    [[weight-delta? weight-on] 'base]
-                    [[weight-delta? weight-off] 'base]
-                    [[style-delta? style-on] 'base]
-                    [[style-delta? style-off] 'base]
-                    [[smoothing-delta? smoothing-on] 'base]
-                    [[smoothing-delta? smoothing-off] 'base]
-                    [[bool? underlined-on] #f]
-                    [[bool? underlined-off] #f]
-                    [[bool? size-in-pixels-on] #f]
-                    [[bool? size-in-pixels-off] #f]
-                    [[bool? transparent-text-backing-on] #f]
-                    [[bool? transparent-text-backing-off] #f]
-                    [[alignment-delta? alignment-on] 'base]
-                    [[alignment-delta? alignment-off] 'base])
-
-  (field [foreground-mult (new mult-color%)]
-         [background-mult (new mult-color%)]
-         [foreground-add (new add-color%)]
-         [background-add (new add-color%)])
-
-  (def/public (get-foreground-mult) foreground-mult)
-  (def/public (get-background-mult) background-mult)
-  (def/public (get-foreground-add) foreground-add)
-  (def/public (get-background-add) background-add)
-
-  (send background-mult set 1.0 1.0 1.0)
-  (send foreground-mult set 1.0 1.0 1.0)
-
-  (init [change-command 'change-nothing]
-        [param not-supplied])
-  (super-new)
-  (do-set-delta change-command param
-                (lambda () (init-name 'style-delta%)))
-
-  (def/public (set-delta [symbol? [change-command 'change-nothing]]
-                         [any? [param not-supplied]])
-    (do-set-delta change-command param (lambda () (method-name 'style-delta% 'set-delta))))
-
-  (define/private (do-set-delta change-command param get-who)
-    (define (check-no-param)
-      (unless (eq? param not-supplied)
-        (raise-mismatch-error (get-who)
-                              (format "no extra argument expected for '~a command: " change-command)
-                              param)))
-    (define (check-param pred)
-      (unless (pred param)
-        (if (eq? param not-supplied)
-            (raise-mismatch-error (get-who)
-                                  "missing argument for command: "
-                                  change-command)
-            (raise-mismatch-error (get-who)
-                                  (format "bad argument for '~a command: " change-command)
-                                  param))))
-    (case change-command
-      [(change-nothing)
-       (check-no-param)
-       (set! family 'base)
-       (set! face #f)
-       (set! size-mult 1)
-       (set! size-add 0)
-       (set! weight-on 'base)
-       (set! weight-off 'base)
-       (set! style-on 'base)
-       (set! style-off 'base)
-       (set! smoothing-on 'base)
-       (set! smoothing-off 'base)
-       (set! underlined-on #f)
-       (set! underlined-off #f)
-       (set! size-in-pixels-off #f)
-       (set! size-in-pixels-on #f)
-       (set! transparent-text-backing-off #f)
-       (set! transparent-text-backing-on #f)
-       (set! foreground-mult (new mult-color%))
-       (send foreground-mult set 1 1 1)
-       (set! foreground-add (new add-color%))
-       (set! background-mult (new mult-color%))
-       (send background-mult set 1 1 1)
-       (set! background-add (new add-color%))
-       (set! alignment-on 'base)
-       (set! alignment-off 'base)]
-      [(change-style)
-       (check-param style-delta?)
-       (set! style-on param)
-       (set! style-off 'base)]
-      [(change-weight)
-       (check-param weight-delta?)
-       (set! weight-on param)
-       (set! weight-off 'base)]
-      [(change-smoothing)
-       (check-param smoothing-delta?)
-       (set! smoothing-on param)
-       (set! smoothing-off 'base)]
-      [(change-underline)
-       (check-param bool?)
-       (set! underlined-on param)
-       (set! underlined-off (not param))]
-      [(change-size-in-pixels)
-       (check-param bool?)
-       (set! size-in-pixels-on param)
-       (set! size-in-pixels-off (not param))]
-      [(change-size)
-       (check-param exact-integer?)
-       (set! size-mult 0)
-       (set! size-add param)]
-      [(change-family)
-       (check-param family-delta?)
-       (set! family param)
-       (set! face #f)]
-      [(change-alignment)
-       (check-param alignment-delta?)
-       (set! alignment-on param)
-       (set! alignment-off 'base)]
-      [(change-bold)
-       (check-no-param)
-       (set! weight-on 'bold)
-       (set! weight-off 'base)]
-      [(change-italic)
-       (check-no-param)
-       (set! style-on 'italic)
-       (set! style-off 'base)]
-      [(change-toggle-style)
-       (check-param style-delta?)
-       (set! style-on param)
-       (set! style-off param)]
-      [(change-toggle-weight)
-       (check-param weight-delta?)
-       (set! weight-on param)
-       (set! weight-off param)]
-      [(change-toggle-smoothing)
-       (check-param smoothing-delta?)
-       (set! smoothing-on param)
-       (set! smoothing-off param)]
-      [(change-toggle-underline)
-       (check-no-param)
-       (set! underlined-on #t)
-       (set! underlined-off #t)]
-      [(change-toggle-size-in-pixels)
-       (check-no-param)
-       (set! size-in-pixels-on #t)
-       (set! size-in-pixels-off #t)]
-      [(change-bigger)
-       (check-param exact-integer?)
-       (set! size-mult 1)
-       (set! size-add param)]
-      [(change-smaller)
-       (check-param exact-integer?)
-       (set! size-mult 1)
-       (set! size-add (- param))]
-      [(change-normal)
-       (check-no-param)
-       (set! family 'default)
-       (set! face #f)
-       (set! size-mult 0)
-       (set! size-add default-size)
-       (set! weight-on 'normal)
-       (set! weight-off 'base)
-       (set! style-on 'normal)
-       (set! style-off 'base)
-       (set! smoothing-on 'default)
-       (set! smoothing-off 'base)
-       (set! underlined-on #f)
-       (set! underlined-off #t)
-       (set! size-in-pixels-on #f)
-       (set! size-in-pixels-off #t)
-       (set! alignment-on 'bottom)
-       (set! alignment-off 'base)
-       (set-delta 'change-normal-color)]
-      [(change-normal-color)
-       (check-no-param)
-       (send foreground-mult set 0 0 0)
-       (send foreground-add set 0 0 0)
-       (send background-mult set 0 0 0)
-       (send background-add set 255 255 255)]
-      [else
-       (raise-type-error (get-who)
-                         "change-command symbol"
-                         change-command)])
-    this)
-
-  (def/public (set-delta-face [string? name] [symbol? [fam 'default]])
-    (set! face (and name (string->immutable-string name)))
-    (set! family fam)
-    this)
-
-  (def/public (set-delta-background [(lambda (x) (or (string? x) (x . is-a? . color%))) col])
-    (let ([col (if (string? col)
-                   (or (send the-color-database find-color col)
-                       black-color)
-                   col)])
-      (set! transparent-text-backing-on #f)
-      (set! transparent-text-backing-off #t)
-      (send background-mult set 0 0 0)
-      (send background-add set (send col red) (send col green) (send col blue))
-      this))
-
-  (def/public (set-delta-foreground [(lambda (x) (or (string? x) (x . is-a? . color%))) col])
-    (let ([col (if (string? col)
-                   (or (send the-color-database find-color col)
-                       black-color)
-                   col)])
-      (send foreground-mult set 0 0 0)
-      (send foreground-add set (send col red) (send col green) (send col blue))
-      this))
-
-  (def/public (collapse [style-delta% delta-in])
-    (define-syntax noncollapsable?
-      (syntax-rules ()
-        [(_ fld base)
-         (not (or (and (eq? (-on fld) ((-don fld) delta-in)) (eq? (-off fld) ((-doff fld) delta-in)))
-                  (and (eq? (-on fld) base) (eq? (-off fld) base))
-                  (and (eq? ((-don fld) delta-in) base) (eq? ((-doff fld) delta-in) base))
-                  (and (eq? (-on fld) base) (not (eq? (-off fld) base)))
-                  (and (eq? (-off fld) base) (not (eq? (-on fld) base)))))]))
-
-    ;; is collapsing possible?
-    ;; it may not be if add & multiply sequence occurs,
-    ;; or certain toggling settings conflict
-    (if (and (not (zero? size-mult))
-             (not (= size-mult 1.0))
-             (not (zero? (style-delta-size-add delta-in))))
-        #f ; no collapse
-        (let-boxes ([ambr 0] [ambb 0] [ambg 0]
-                    [amfr 0] [amfb 0] [amfg 0]
-                    [babr 0] [babb 0] [babg 0]
-                    [bafr 0] [bafb 0] [bafg 0])
-            (begin
-              (send foreground-mult get amfr amfb amfg)
-              (send background-mult get ambr ambb ambg)
-              (send (style-delta-foreground-add delta-in) get bafr bafb bafg)
-              (send (style-delta-background-add delta-in) get babr babb babg))
-          (cond
-           [(or (and (not (zero? amfr)) (not (= amfr 1.0)) (not (zero? bafr)))
-                (and (not (zero? amfg)) (not (= amfg 1.0)) (not (zero? bafg)))
-                (and (not (zero? amfb)) (not (= amfb 1.0)) (not (zero? bafb)))
-                (and (not (zero? ambr)) (not (= ambr 1.0)) (not (zero? babr)))
-                (and (not (zero? ambg)) (not (= ambg 1.0)) (not (zero? babg)))
-                (and (not (zero? ambb)) (not (= ambb 1.0)) (not (zero? babb))))
-            #f] ; no collapse
-           ;; cases: simple or double toggle
-           ;;        no further change
-           ;;        formerly no change
-           ;;        style definitely on
-           ;;        style definitely off
-           [(noncollapsable? style 'base) #f]
-           [(noncollapsable? weight 'base) #f]
-           [(noncollapsable? smoothing 'base) #f]
-           [(noncollapsable? alignment 'base) #f]
-           [(noncollapsable? underlined #f) #f]
-           [(noncollapsable? size-in-pixels #f) #f]
-           [(noncollapsable? transparent-text-backing #f) #f]
-           [else
-            ;; collapsing is possible
-            (let-boxes ([bmbr 0] [bmbb 0] [bmbg 0]
-                        [bmfr 0] [bmfb 0] [bmfg 0]
-                        [aabr 0] [aabb 0] [aabg 0]
-                        [aafr 0] [aafb 0] [aafg 0])
-                (begin (send (style-delta-foreground-mult delta-in) get bmfr bmfb bmfg)
-                       (send (style-delta-background-mult delta-in) get bmbr bmbb bmbg)
-                       (send foreground-add get aafr aafb aafg)
-                       (send background-add get aabr aabb aabg))
-              
-              (set! size-add (+ size-add
-                                (->long (* size-mult (style-delta-size-add delta-in)))))
-              (set! size-mult (* size-mult (style-delta-size-mult delta-in)))
-
-              (send foreground-mult set (* amfr bmfr) (* amfb bmfb) (* amfg bmfg))
-              (send background-mult set (* ambr bmbr) (* ambb bmbb) (* ambg bmbg))
-              (send foreground-add set 
-                    (+ aafr (->long (* amfr bafr)))
-                    (+ aafb (->long (* amfb bafb)))
-                    (+ aafg (->long (* amfg bafg))))
-              (send background-add set 
-                    (+ aabr (->long (* ambr babr)))
-                    (+ aabb (->long (* ambb babb)))
-                    (+ aabg (->long (* ambg babg))))
-
-              (when (eq? family 'base)
-                (set! family (style-delta-family delta-in))
-                (when (not face)
-                  (set! face (style-delta-face delta-in))))
-
-              (let-syntax ([update! 
-                            (syntax-rules ()
-                              [(_ fld base)
-                               (cond
-                                [(and (eq? (-on fld) base) (eq? (-off fld) base))
-                                 (-set-on! fld ((-don fld) delta-in))
-                                 (-set-off! fld ((-doff fld) delta-in))]
-                                [(and (not (eq? (-on fld) base)) (not (eq? (-off fld) base)))
-                                 (when (and (eq? (-on fld) (-off fld))
-                                            (or (not (eq? ((-don fld) delta-in) 'base))
-                                                (not (eq? ((-doff fld) delta-in) 'base))))
-                                   ;; double toggle
-                                   (-set-on! fld 'base)
-                                   (-set-off! fld 'base))])])])
-                (update! style 'base)
-                (update! weight 'base)
-                (update! smoothing 'base)
-                (update! alignment 'base)
-                (update! underlined #f)
-                (update! size-in-pixels #f)
-                (update! transparent-text-backing #f)
-                
-                #t))]))))
-
-  (def/public (equal? [style-delta% delta-in])
-    (define-syntax-rule (same? fld)
-      (and (eq? (-on fld) ((-don fld) delta-in))
-           (eq? (-off fld) ((-doff fld) delta-in))))
-    (define-syntax-rule (same-color? fld)
-      (let-boxes ([r1 0] [g1 0] [b1 0]
-                  [r2 0] [g2 0] [b2 0])
-          (begin
-            (send fld get r1 g1 b1)
-            (send ((-d fld) delta-in) get r2 g2 b2))
-        (and (= r1 r2) (= g1 g2) (= b1 b2))))
-    (and (eq? family (style-delta-family delta-in))
-         (or (eq? face (style-delta-face delta-in))
-             (and (string? face)
-                  (string? (style-delta-face delta-in))
-                  (string=? face (style-delta-face delta-in))))
-         (= size-mult (style-delta-size-mult delta-in))
-         (= size-add (style-delta-size-add delta-in))
-         (same? weight)
-         (same? style)
-         (same? smoothing)
-         (same? alignment)
-         (same? underlined)
-         (same? size-in-pixels)
-         (same? transparent-text-backing)
-         (same-color? foreground-mult)
-         (same-color? background-mult)
-         (same-color? foreground-add)
-         (same-color? background-add)))
-
-  (def/public (copy [style-delta% in])
-    (define-syntax-rule (DCOPY fld)
-      (set! fld ((-d fld) in)))
-    (define-syntax-rule (DCOPY/c fld)
-      (let-boxes ([r 0][g 0][b 0])
-          (send ((-d fld) in) get r g b)
-        (send fld set r g b)))
-    (DCOPY family)
-    (DCOPY face)
-    (DCOPY size-mult)
-    (DCOPY size-add)
-    (DCOPY weight-on)
-    (DCOPY weight-off)
-    (DCOPY smoothing-on)
-    (DCOPY smoothing-off)
-    (DCOPY style-on)
-    (DCOPY style-off)
-    (DCOPY underlined-on)
-    (DCOPY underlined-off)
-    (DCOPY size-in-pixels-on)
-    (DCOPY size-in-pixels-off)
-    (DCOPY transparent-text-backing-on)
-    (DCOPY transparent-text-backing-off)
-    (DCOPY/c foreground-mult)
-    (DCOPY/c foreground-add)
-    (DCOPY/c background-mult)
-    (DCOPY/c background-add)
-    (DCOPY alignment-on)
-    (DCOPY alignment-off)))
-
-(define-delta family)
-(define-delta face)
-(define-delta size-mult)
-(define-delta size-add)
-(define-delta weight-on)
-(define-delta weight-off)
-(define-delta style-on)
-(define-delta style-off)
-(define-delta smoothing-on)
-(define-delta smoothing-off)
-(define-delta  underlined-on)
-(define-delta underlined-off)
-(define-delta size-in-pixels-on)
-(define-delta size-in-pixels-off)
-(define-delta transparent-text-backing-on)
-(define-delta transparent-text-backing-off)
-(define-delta foreground-mult)
-(define-delta background-mult)
-(define-delta foreground-add)
-(define-delta background-add)
-(define-delta alignment-on)
-(define-delta alignment-off)
-
-;; ------------------------------------------------------------
-
-(define-local-member-name
-  s-add-child
-  s-remove-child
-  s-set-as-basic
-  s-update
-  s-font
-  get-s-font
-  get-s-pen
-  get-s-brush
-  get-s-alignment
-  get-s-trans-text?
-  s-foreground
-  get-s-foreground
-  s-background
-  get-s-background
-  get-s-base-style
-  get-s-join-shift-style
-  get-s-nonjoin-delta
-  get-s-name
-  set-s-font
-  set-s-alignment
-  set-s-style-list
-  set-s-base-style
-  set-s-join-shift-style
-  set-s-nonjoin-delta
-  set-s-name
-  set-s-cached-sizes
-  set-s-pen
-  set-s-brush
-  set-s-shift-style
-  s-alignment
-  s-text-width
-  s-text-height
-  s-text-descent
-  s-text-space)
-
-(defclass style% object%
-  (define style-list #f) ;; points back to the list owning the style
-  (define/public (set-s-style-list sl) (set! style-list sl))
-
-  (define name #f)
-
-  (define base-style #f)
-
-  (define join-shift-style #f)
-  (define nonjoin-delta #f)
-
-  ;; cache computation:
-  (define trans-text? #f)
-  (field [s-foreground (new color%)]
-         [s-background (new color%)]
-         [s-font #f])
-  (define pen #f)
-  (define brush #f)
-  (field [s-alignment 'bottom])
-
-  (define cached-sizes 0)
-
-  (field [s-text-width 0.0]
-         [s-text-height 0.0]
-         [s-text-descent 0.0]
-         [s-text-space 0.0])
-
-  (define children null)
-
-  (super-new)
-
-  (define/public (get-s-name) name)
-  (define/public (set-s-name v) (set! name v))
-  (define/public (get-s-base-style) base-style)
-  (define/public (set-s-base-style v) (set! base-style v))
-  (define/public (get-s-join-shift-style) join-shift-style)
-  (define/public (get-s-nonjoin-delta) nonjoin-delta)
-  (define/public (set-s-join-shift-style v) (set! join-shift-style v))
-  (define/public (set-s-nonjoin-delta v) (set! nonjoin-delta v))
-
-  (define/public (set-s-cached-sizes v) (set! cached-sizes v))
-  (define/public (s-set-as-basic slist)
-    (set! style-list slist)
-
-    (set! name "Basic")
-    (set! base-style #f)
-
-    (set! nonjoin-delta (new style-delta%))
-    (send nonjoin-delta set-delta 'change-normal)
-
-    (set! s-font (send the-font-list find-or-create-font
-                     default-size 'default 'normal 'normal))
-    (send s-foreground set 0 0 0)
-    (send s-background set 255 255 255)
-    (set! pen (send the-pen-list find-or-create-pen s-foreground 0 'solid))
-    (set! brush (send the-brush-list find-or-create-brush s-background 'solid))
-    (set! s-alignment 'bottom)
-    (set! trans-text? #t))
-
-  (define/public (s-update basic target propagate? top-level? send-notify?)
-    (let ([base (if basic
-                    (if (or (not style-list)
-                            (eq? base-style (send style-list basic-style)))
-                        basic
-                        (begin
-                          (send base-style s-update basic target #f #f #t)
-                          target))
-                    base-style)]
-          [target (or target this)])
-
-      (if join-shift-style
-
-          ;; join style
-          (when style-list
-            (if (not (eq? join-shift-style
-                          (send style-list basic-style)))
-                (send join-shift-style s-update base target #f top-level? #t)
-                (begin
-                  (send target set-s-alignment (send base get-s-alignment))
-                  (send target set-s-font (send base get-s-font))
-                  (send target set-s-pen (send base get-s-pen))
-                  (send target set-s-brush (send base get-s-brush))
-                  (send target set-s-cached-sizes 0)
-                  (send (send target get-s-foreground) copy-from (send base get-s-foreground))
-                  (send (send target get-s-background) copy-from (send base get-s-background))
-                  
-                  (send style-list style-was-changed target)
-                  (when top-level?
-                    (send style-list style-was-changed #f)))))
-          
-          ;; not a join style
-          (let ()
-            (define-syntax-rule (match-field* fld default fld-src)
-              (let* ([v (-send-get fld fld-src)]
-                     [match? (eq? v ((-doff fld) nonjoin-delta))]
-                     [v (if match? default v)])
-                (if (or (not match?)
-                        (and match? 
-                             (not (eq? ((-don fld) nonjoin-delta)
-                                       ((-doff fld) nonjoin-delta)))))
-                    (if (not (eq? ((-don fld) nonjoin-delta) 'base))
-                        ((-don fld) nonjoin-delta)
-                        v)
-                    v)))
-            (define-syntax-rule (match-field fld default)
-              (match-field* fld default (send base get-s-font)))
-            (define-syntax-rule (match-bool fld orig)
-              (cond
-               [(and ((-doff fld) nonjoin-delta) 
-                     ((-don fld) nonjoin-delta))
-                (not orig)]
-               [((-doff fld) nonjoin-delta)
-                #f]
-               [((-don fld) nonjoin-delta)
-                #t]
-               [else orig]))
-            
-            (let ([size (min 255
-                             (max 1
-                                  (+ (->long (* (style-delta-size-mult nonjoin-delta)
-                                                (send (send base get-s-font) get-point-size)))
-                                     (style-delta-size-add nonjoin-delta))))]
-                  [fam+face (if (and (not (style-delta-face nonjoin-delta))
-                                     (eq? (style-delta-family nonjoin-delta) 'base))
-                                (let ([font (send base get-s-font)])
-                                  (cons (send font get-family)
-                                        (send font get-face)))
-                                (let ([fam (style-delta-family nonjoin-delta)])
-                                  (cons (if (eq? fam 'base)
-                                            (send (send base get-s-font) get-family)
-                                            fam)
-                                        (style-delta-face nonjoin-delta))))]
-                  [style (match-field style 'normal)]
-                  [weight (match-field weight 'normal)]
-                  [smoothing (match-field smoothing 'default)]
-                  [alignment (match-field* alignment 'bottom target)]
-                  [underlined (match-bool underlined (-send-get underlined (send base get-s-font)))]
-                  [size-in-pixels (match-bool size-in-pixels (-send-get size-in-pixels (send base get-s-font)))])
-              
-              (send target set-s-alignment alignment)
-
-              (let ([font (if (cdr fam+face)
-                              (send the-font-list
-                                    find-or-create-font
-                                    size (cdr fam+face) (car fam+face) 
-                                    style weight underlined smoothing size-in-pixels)
-                              (send the-font-list
-                                    find-or-create-font
-                                    size (car fam+face) 
-                                    style weight underlined smoothing size-in-pixels))])
-                (send target set-s-font font)
-                (send target set-s-cached-sizes 0)
-
-                (set! trans-text? (match-bool transparent-text-backing
-                                              (send base get-s-trans-text?)))
-
-                (let ([combine-colors! (lambda (src-col src-mul src-add dest)
-                                         (let ([r (send src-col red)]
-                                               [g (send src-col green)]
-                                               [b (send src-col blue)])
-                                           (let-boxes ([rm 0.0] [gm 0.0] [bm 0.0]
-                                                       [rp 0] [gp 0] [bp 0])
-                                               (begin
-                                                 (send src-mul get rm gm bm)
-                                                 (send src-add get rp gp bp))
-                                             (let ([->color
-                                                    (lambda (v)
-                                                      (max (min 255 (->long v)) 0))])
-                                               (send dest set
-                                                     (->color (+ (* r rm) rp))
-                                                     (->color (+ (* g gm) gp))
-                                                     (->color (+ (* b bm) bp)))))))])
-                  (combine-colors! (send base get-s-foreground)
-                                   (style-delta-foreground-mult nonjoin-delta)
-                                   (style-delta-foreground-add nonjoin-delta)
-                                   (send target get-s-foreground))
-                  (combine-colors! (send base get-s-background)
-                                   (style-delta-background-mult nonjoin-delta)
-                                   (style-delta-background-add nonjoin-delta)
-                                   (send target get-s-background))
-
-                  (send target set-s-pen 
-                        (send the-pen-list find-or-create-pen s-foreground 0 'solid))
-                  (send target set-s-brush
-                        (send the-brush-list find-or-create-brush s-background 'solid))
-
-                  (when propagate?
-                    (for-each (lambda (child)
-                                (send child s-update #f #f #t #f #t))
-                              children))
-
-                  (when send-notify?
-                    (when style-list
-                      (send style-list style-was-changed target)
-                      (when top-level?
-                        (send style-list style-was-changed #f)))))))))))
-  
-  (def/public (get-name) name)
-  (def/public (get-family) (send s-font get-family))
-  (def/public (get-face) (send s-font get-face))
-  (def/public (get-font) s-font)
-  (def/public (get-size) (send s-font get-point-size))
-  (def/public (get-weight) (send s-font get-weight))
-  (def/public (get-style) (send s-font get-style))
-  (def/public (get-smoothing) (send s-font get-smoothing))
-  (def/public (get-underlined) (send s-font get-underlined))
-  (def/public (get-size-in-pixels) (send s-font get-size-in-pixels))
-  (def/public (get-transparent-text-backing) trans-text?)
-  (def/public (get-foreground) (make-object color% s-foreground))
-  (def/public (get-background) (make-object color% s-background))
-  (def/public (get-alignment) s-alignment)
-  (def/public (is-join?) (and join-shift-style #t))
-
-  (def/public (get-delta [style-delta% d])
-    (if join-shift-style
-        (send d set-delta 'change-nothing)
-        (send d copy nonjoin-delta)))
-
-  (def/public (set-delta [style-delta% d])
-    (unless (or join-shift-style
-                (and style-list
-                     (eq? this (send style-list basic-style))))
-      (send nonjoin-delta copy d)
-      (s-update #f #f #t #t #t)))
-
-  (def/public (get-shift-style)
-    (or join-shift-style
-        (and style-list
-             (send style-list basic-style))
-        (send the-style-list basic-style)))
-
-  (def/public (set-shift-style [style<%> style])
-    (unless (or (not join-shift-style)
-                (not style-list)
-                (not (send style-list style-to-index style))
-                (send style-list check-for-loop this style))
-      (when join-shift-style
-        (send join-shift-style s-remove-child this))
-      (send style s-add-child this)
-
-      (set! join-shift-style style)
-      (send style-list style-has-new-child style this)
-      (s-update #f #f #t #t #t)
-      
-      ;; Why twice? Was this a typo in the original code?
-      (set! join-shift-style style)
-      (s-update #f #f #t #t #t)))
-
-  (define/public (set-s-shift-style s)
-    (set! join-shift-style s))
-
-  (def/public (get-base-style)
-    base-style)
-
-  (def/public (set-base-style [(make-or-false style<%>) style])
-    (when (and style-list
-               (not (eq? this (send style-list basic-style))))
-      (let ([style (or style
-                       (send style-list basic-style))])
-        (unless (not (send style-list style-to-index style))
-          (unless (send style-list check-for-loop this style)
-            (when base-style
-              (send base-style s-remove-child this))
-            
-            (set! base-style style)
-            (send style s-add-child this)
-
-            (send style-list style-has-new-child style this)
-
-            (s-update #f #f #t #t #t))))))
-
-  (define/private (color->rgb c)
-    (values (color-red c) (color-green c) (color-blue c)))
-
-  (def/public (switch-to [dc<%> dc] [(make-or-false style<%>) old-style])
-    (let-values ([(afr afg afb) (if old-style (color->rgb (style->foreground old-style)) (values 0 0 0))]
-                 [(bfr bfg bfb) (color->rgb s-foreground)]
-                 [(abr abg abb) (if old-style (color->rgb (style->background old-style)) (values 0 0 0))]
-                 [(bbr bbg bbb) (color->rgb s-background)])
-      (when (or (not old-style)
-                (not (eq? (send old-style get-s-font) s-font)))
-        (send dc set-font s-font))
-      (when (or (not old-style)
-                (not (= afr bfr))
-                (not (= afb bfb))
-                (not (= afg bfg)))
-        (send dc set-text-foreground s-foreground))
-      (when (or (not old-style)
-                (not (= abr bbr))
-                (not (= abb bbb))
-                (not (= abg bbg)))
-        (send dc set-text-background s-background))
-      (when (or (not old-style)
-                (not (eq? (send old-style get-s-pen) pen)))
-        (send dc set-pen pen))
-      (when (or (not old-style)
-                (not (eq? (send old-style get-s-trans-text?) trans-text?)))
-        (send dc set-text-mode (if trans-text? 'transparent 'solid)))))
-
-  (def/public (reset-text-metrics [dc<%> dc])
-    (let ([can-cache (send dc cache-font-metrics-key)])
-      (unless (and (not (zero? cached-sizes))
-                   (eq? cached-sizes can-cache))
-        (let-values ([(w h d s) (send dc get-text-extent " " s-font)])
-          (set! s-text-width w)
-          (set! s-text-height h)
-          (set! s-text-descent d)
-          (set! s-text-space s)
-          (set! cached-sizes can-cache)))))
-
-  (def/public (get-text-width [dc<%> dc])
-    (reset-text-metrics dc)
-    s-text-width)
-
-  (def/public (get-text-height [dc<%> dc])
-    (reset-text-metrics dc)
-    s-text-height)
-
-  (def/public (get-text-descent [dc<%> dc])
-    (reset-text-metrics dc)
-    s-text-descent)
-
-  (def/public (get-text-space [dc<%> dc])
-    (reset-text-metrics dc)
-    s-text-space)
-
-  (define/public (s-add-child c)
-    (set! children (cons c children)))
-
-  (define/public (s-remove-child c)
-    (set! children (remq c children)))
-
-  (define/public (get-s-font) s-font)
-  (define/public (set-s-font v) (set! s-font v))
-  (define/public (get-s-pen) pen)
-  (define/public (set-s-pen v) (set! pen v))
-  (define/public (get-s-brush) brush)
-  (define/public (set-s-brush v) (set! brush v))
-  (define/public (get-s-alignment) s-alignment)
-  (define/public (set-s-alignment v) (set! s-alignment v))
-  (define/public (get-s-trans-text?) trans-text?)
-  (define/public (get-s-foreground) s-foreground)
-  (define/public (get-s-background) s-background))
-
-(define style<%> (class->interface style%))
-
-(define style->foreground (class-field-accessor style% s-foreground))
-(define style->background (class-field-accessor style% s-background))
-(define style->font (class-field-accessor style% s-font))
-(define style->alignment (class-field-accessor style% s-alignment))
-
-(define style->cached-text-width (class-field-accessor style% s-text-width))
-(define style->cached-text-height (class-field-accessor style% s-text-height))
-(define style->cached-text-descent (class-field-accessor style% s-text-descent))
-(define style->cached-text-space (class-field-accessor style% s-text-space))
-
-;; ----------------------------------------
-
-(define-local-member-name
-  do-named-style
-  check-for-loop
-  get-s-members)
-
-(define-struct notify-key (f))
-
-(defclass style-list% object%
-
-  (super-new)
-
-  (define notifications (make-weak-hash))
-
-  (define basic (new style%))
-  ;; note: the file-reader relies on having a new `basic' when the
-  ;; list is cleared:
-
-  (send basic s-set-as-basic this)
-
-  ;; children are before parents (reverse order used for reading
-  ;; and writing a style list to a stream):
-  (define members (list basic))
-  (define member-count 1)
-  (define/public (get-s-members) members)
-
-  (define (add-member s)
-    (set! members (cons s members))
-    (set! member-count (add1 member-count)))
-
-  (def/public (copy [style-list% other])
-    (map (lambda (k) (convert k #t))
-         (send other get-s-members)))
-  
-  (define/public-final (basic-style) basic)
-
-  (def/public (find-or-create-style [(make-or-false style<%>) base-style]
-                                    [style-delta% deltain])
-    (let ([base-style
-           (if (or (not base-style)
-                   (not (style-to-index base-style)))
-               basic
-               base-style)])
-
-      ;; collapse deltas:
-      (let ([delta (new style-delta%)])
-        (send delta copy deltain)
-        (let loop ([base-style base-style])
-          (if (and (not (send base-style get-s-name))
-                   (not (send base-style get-s-join-shift-style))
-                   (send delta collapse (send base-style get-s-nonjoin-delta)))
-              (loop (send base-style get-s-base-style))
-              
-              (or
-               ;; Find existing style that matches:
-               (for/or ([s (in-list members)])
-                 (and (not (send s get-s-name))
-                      (not (send s get-s-join-shift-style))
-                      (eq? (send s get-s-base-style) base-style)
-                      (send delta equal? (send s get-s-nonjoin-delta))
-                      s))
-               
-               ;; Create style
-               (let ([s (new style%)])
-                 (send s set-s-style-list this)
-                 (send s set-s-name #f)
-                 (send s set-s-nonjoin-delta delta)
-                 (send s set-s-base-style base-style)
-                 (send base-style s-add-child s)
-                 (send s s-update #f #f #f #f #f) ;; no need to propagate/notify, because we just created it
-                 (add-member s)
-                 s)))))))
-
-  (def/public (find-or-create-join-style [style% base-style]
-                                         [style% shift-style])
-    (let ([base-style (if (or (not base-style)
-                              (not (style-to-index base-style)))
-                          basic
-                          base-style)]
-          [shift-style (if (or (not shift-style)
-                               (not (style-to-index shift-style)))
-                           basic
-                           shift-style)])
-
-      (or (for/or ([s (in-list members)])
-            (and (not (send s get-s-name))
-                 (eq? (send s get-s-base-style) base-style)
-                 (eq? (send s get-s-join-shift-style) shift-style)
-                 s))
-          (let ([s (new style%)])
-            (send s set-s-style-list this)
-            (send s set-s-name #f)
-            (send s set-s-shift-style shift-style)
-            (send shift-style s-add-child s)
-            (send s set-s-base-style base-style)
-            (send base-style s-add-child s)
-            (send s s-update #f #f #t #t #t)
-            (add-member s)
-            s))))
-
-  (def/public (find-named-style [string? name])
-    (for/or ([s (in-list members)])
-      (and (equal? name (send s get-s-name))
-           s)))
-
-  (define/public (do-named-style name plain-style replac?)
-    (let ([plain-style (if (or (not plain-style)
-                               (not (style-to-index plain-style)))
-                           basic
-                           plain-style)]
-          [name (string->immutable-string name)])
-      
-      (let ([style (for/or ([s (in-list members)])
-                     (and (equal? name (send s get-s-name))
-                          s))])
-        (if (or (and style (not replac?))
-                ;; can't replace basic style:
-                (eq? style basic))
-            style
-
-            (let ([found-style style]
-                  [style (or style
-                             (let ([s (new style%)])
-                               (send s set-s-name name)
-                               (send s set-s-style-list this)
-                               (send s set-s-base-style basic)
-                               s))])
-              
-              ;; plain-style must not depend on this style
-              ;; (otherwise, we'd create a dependency cycle)
-              (if (check-for-loop style plain-style)
-                  style
-
-                  (begin
-                    (let ([base (send style get-s-base-style)])
-                      (send base s-remove-child style))
-                    (let ([shift (send style get-s-join-shift-style)])
-                      (when shift
-                        (send shift s-remove-child style)))
-                    
-                    (let ([shift (send plain-style get-s-join-shift-style)])
-                      (if shift
-                          (begin
-                            (send style set-s-join-shift-style shift)
-                            (send shift s-add-child style))
-                          (let ([delta (new style-delta%)])
-                            (send style set-s-nonjoin-delta delta)
-                            (unless (eq? plain-style basic)
-                              (send delta copy (send plain-style get-s-nonjoin-delta))))))
-
-                    (let ([base (if (eq? plain-style basic)
-                                    basic
-                                    (send plain-style get-s-base-style))])
-                      (send style set-s-base-style base)
-                      (send base s-add-child style))
-
-                    (send style s-update #f #f #t #t #t)
-
-                    (unless found-style
-                      (add-member style))
-                    
-                    style)))))))
-
-  (def/public (new-named-style [string? name] [style<%> plain-style])
-    (do-named-style name plain-style #f))
-
-  (def/public (replace-named-style [string? name] [style<%> plain-style])
-    (do-named-style name plain-style #t))
-
-  (def/public (convert [style% style] [any? [overwrite? #f]])
-    (or
-     (and (style-to-index style)
-          style)
-     (and (send style get-s-name)
-          (not overwrite?)
-          (find-named-style (send style get-s-name)))
-
-     (let ([base (or (let ([s (send style get-s-base-style)])
-                       (and s (convert s)))
-                     (basic-style))])
-       
-       (let ([newstyle
-              (let ([shift (send style get-s-join-shift-style)])
-                (if shift
-                    (find-or-create-join-style
-                     base
-                     (convert shift))
-                    (find-or-create-style base (send style get-s-nonjoin-delta))))])
-
-         (let ([name (send style get-s-name)])
-           (if name
-               (if overwrite?
-                   (replace-named-style name newstyle)
-                   (new-named-style name newstyle))
-               newstyle))))))
-
-  (def/public (style-was-changed [(make-or-false style%) which])
-    (for ([k (in-hash-keys notifications)])
-      (k which)))
-
-  (def/public (notify-on-change [procedure? f])
-    (hash-set! notifications f 
-               ;; In case `f' has a contract, retain `f' as long
-               ;; as the pre-contract value is reachable:
-               (impersonator-ephemeron f))
-    (make-notify-key f))
-
-  (def/public (forget-notification [notify-key? id])
-    (hash-remove! notifications (notify-key-f id)))
-
-  (def/public (check-for-loop [style<%> s] [style<%> p])
-    (or (eq? s p)
-        (let ([base (send p get-s-base-style)])
-          (cond
-           [(not base) #f]
-           [(send p get-s-join-shift-style)
-            => (lambda (j)
-                 (or (check-for-loop s (send p get-s-base-style))
-                     (check-for-loop s j)))]
-           [else (check-for-loop s base)]))))
-
-  (def/public (style-has-new-child [style<%> s] [style<%> c])
-    ;; need to maintain the invariant that children are in the list
-    ;; before parents...
-    (let ([new-members
-           (let loop ([members members][insert? #f])
-             (let ([m (car members)])
-               (cond
-                [(eq? m c) (if insert?
-                               (cons c (cons s (cdr members)))
-                               #f)]
-                [(eq? m s) (loop (cdr members) #t)]
-                [else (let ([rest (loop (cdr members) insert?)])
-                        (and rest (cons m rest)))])))])
-      (when new-members
-        (set! members new-members)
-        ;; May have moved parent after its own parents
-        (style-has-new-child (send s get-s-base-style) s)
-        (let ([join (send s get-s-join-style)])
-          (when join
-            (style-has-new-child join s))))))
-  
-  (def/public (number) member-count)
-
-  (def/public (index-to-style [exact-nonnegative-integer? i])
-    (and (i . < . member-count)
-         (list-ref members (- member-count i 1))))
-
-  (def/public (style-to-index [style<%> s])
-    (let loop ([members members][i (sub1 member-count)])
-      (cond
-       [(null? members) #f]
-       [(eq? (car members) s) i]
-       [else (loop (cdr members) (sub1 i))])))
-
-
-  (def/public (write-to-file [editor-stream-out% f])
-    (write-styles-to-file this f))
-
-  (define/public (map-index-to-style s i list-id)
-    (let loop ([sll (send s get-s-sll)])
-      (cond
-       [(null? sll)
-        (error 'map-index-to-style "bad style list index for snip")]
-       [(= (style-list-link-list-id (car sll)) list-id)
-        (if (eq? (style-list-link-basic (car sll)) basic)
-            ;; if basic changes, that means list was cleared
-            (if (and (style-list-link-style-map (car sll))
-                     (i . < . (style-list-link-num-mapped-styles (car sll))))
-                (vector-ref (style-list-link-style-map (car sll)) i)
-                (error 'map-index-to-style "bad style index for snip"))
-            basic)]
-       [else (loop (cdr sll))])))
-
-  (define/public (read-style-list f)
-    (read-styles-from-file (new style-list%) f 0 (box 0))))
-
-(define the-style-list (new style-list%))
-
-;; ----------------------------------------
-
-(define-struct style-list-link (style-list
-                                list-id
-                                basic
-                                num-mapped-styles
-                                style-map))
-
-(define (setup-style-reads-writes s)
-  (send s set-s-sll null))
-
-(define (done-style-reads-writes s)
-  (send s set-s-sll null))
-
-(define (invert ht)
-  (make-immutable-hasheq
-   (hash-map ht (lambda (k v) (cons v k)))))
-
-(define family-ints
-  #hasheq((base . -1)
-          (decorative . 71)
-          (roman . 72)
-          (script . 73)
-          (swiss . 74)
-          (modern . 75)
-          (teletype . 76)
-          (system . 77)
-          (symbol . 78)
-          (default . 70)))
-(define int-families (invert family-ints))
-
-(define (family-standard-to-this v)
-  (hash-ref int-families v 'default))
-(define (family-this-to-standard v)
-  (hash-ref family-ints v 70))
-
-(define weight-ints
-  #hasheq((base . -1)
-          (light . 91)
-          (bold . 92)
-          (normal . 90)))
-(define int-weights (invert weight-ints))
-
-(define (weight-standard-to-this v)
-  (hash-ref int-weights v 'normal))
-(define (weight-this-to-standard v)
-  (hash-ref weight-ints v 90))
-
-(define style-ints
-  #hasheq((base . -1)
-          (italic . 93)
-          (slant . 94)
-          (normal . 90)))
-(define int-styles (invert style-ints))
-
-(define (style-standard-to-this v)
-  (hash-ref int-styles v 'normal))
-(define (style-this-to-standard v)
-  (hash-ref style-ints v 90))
-
-(define smoothing-ints
-  #hasheq((base . -1)
-          (partly-smoothed . 0)
-          (smoothed . 1)
-          (unsmoothed . 2)
-          (default . 3)))
-(define int-smoothings (invert smoothing-ints))
-
-(define (smoothing-standard-to-this v)
-  (hash-ref int-smoothings v 'default))
-(define (smoothing-this-to-standard v)
-  (hash-ref smoothing-ints v 3))
-
-(define align-ints
-  #hasheq((base . -1)
-          (top . 0)
-          (bottom . 1)
-          (center . 2)))
-(define int-aligns (invert align-ints))
-
-(define (align-standard-to-this v)
-  (hash-ref int-aligns v 'bottom))
-(define (align-this-to-standard v)
-  (hash-ref align-ints v 1))
-
-(define (read-styles-from-file style-list f overwritename? _list-id)
-  (let-boxes ([list-id 0])
-      (send f get list-id)
-    (set-box! _list-id list-id)
-
-    (or
-     (ormap (lambda (sll)
-              (and (= (style-list-link-list-id sll) list-id)
-                   (style-list-link-style-list sll)))
-            (send f get-s-sll))
-
-     (let ([nms (send f get-exact)])
-
-       (let* ([map-vec (make-vector nms)]
-              [sll (make-style-list-link style-list
-                                         list-id
-                                         (send style-list basic-style)
-                                         nms
-                                         map-vec)])
-         (send f set-s-sll (cons sll (send f get-s-sll)))
-
-         (vector-set! map-vec 0 (send style-list basic-style))
-
-         (for ([i (in-range 1 nms)])
-           (let ([base-index (send f get-exact)])
-
-             (when (base-index . >= . i)
-               (error 'map-index-to-style "bad style index"))
-
-             (let ([name (bytes->string/utf-8 (send f get-bytes))])
-               (let ([is-join (send f get-exact)])
-                 (if (positive? is-join)
-                     (let ([shift-index (send f get-exact)])
-                       (when (shift-index . >= . i)
-                         (error 'map-index-to-style "bad shift-style index"))
-                       (let ([js
-                              (send style-list
-                                    find-or-create-join-style
-                                    (vector-ref map-vec base-index)
-                                    (vector-ref map-vec shift-index))])
-                         (vector-set! map-vec i js)))
-                     (let ([delta (new style-delta%)]
-                           [get-float (lambda (f) (send f get-inexact))]
-                           [get-int (lambda (f) (send f get-exact))])
-                       (let ([fam (send f get-exact)])
-                         
-                         (send delta set-family (family-standard-to-this fam))
-                         (let ([name (bytes->string/utf-8 (send f get-bytes))])
-                           (when (not (equal? name ""))
-                             (send delta set-face (string->immutable-string name))))
-                         
-                         (send delta set-size-mult (get-float f))
-                         (send delta set-size-add (get-int f))
-                         (send delta set-weight-on (weight-standard-to-this (get-int f)))
-                         (send delta set-weight-off (weight-standard-to-this (get-int f)))
-                         (send delta set-style-on (style-standard-to-this (get-int f)))
-                         (send delta set-style-off (style-standard-to-this (get-int f)))
-                         (unless (<= 1 (send f get-wxme-version) 4)
-                           (send delta set-smoothing-on (smoothing-standard-to-this (get-int f)))
-                           (send delta set-smoothing-off (smoothing-standard-to-this (get-int f))))
-                         (send delta set-underlined-on (positive? (get-int f)))
-                         (send delta set-underlined-off (positive? (get-int f)))
-                         (unless (<= 1 (send f get-wxme-version) 5)
-                           (send delta set-size-in-pixels-on (positive? (get-int f)))
-                           (send delta set-size-in-pixels-off (positive? (get-int f))))
-                         (unless (<= 1 (send f get-wxme-version) 2)
-                           (send delta set-transparent-text-backing-on (positive? (get-int f)))
-                           (send delta set-transparent-text-backing-off (positive? (get-int f))))
-
-                         (let ([r (send f get-inexact)]
-                               [g (send f get-inexact)]
-                               [b (send f get-inexact)])
-                           (send (send delta get-foreground-mult) set r g b))
-                         (let ([r (send f get-inexact)]
-                               [g (send f get-inexact)]
-                               [b (send f get-inexact)])
-                           (send (send delta get-background-mult) set r g b))
-                         (let ([r (send f get-exact)]
-                               [g (send f get-exact)]
-                               [b (send f get-exact)])
-                           (send (send delta get-foreground-add) set r g b))
-                         (let ([r (send f get-exact)]
-                               [g (send f get-exact)]
-                               [b (send f get-exact)])
-                           (send (send delta get-background-add) set r g b)
-
-                           (when (<= 1 (send f get-wxme-version) 2)
-                             (when (or (positive? r) (positive? g) (positive? b))
-                               (send delta set-transparent-text-backing-off #t))))
-                         
-                         (send delta set-alignment-on (align-standard-to-this (get-int f)))
-                         (send delta set-alignment-off (align-standard-to-this (get-int f)))
-                         
-                         (vector-set! map-vec i (send style-list find-or-create-style 
-                                                      (vector-ref map-vec base-index)
-                                                      delta))))))
-
-               (when (not (equal? name ""))
-                 (let ([ns
-                        (if overwritename?
-                            (send style-list replace-named-style name (vector-ref map-vec i))
-                            (send style-list new-named-style name (vector-ref map-vec i)))])
-                   (vector-set! map-vec i ns)))))))
-       style-list))))
-
-(define (write-styles-to-file style-list f)
-  (or
-   (ormap (lambda (sll)
-            (and (eq? (style-list-link-style-list sll) style-list)
-                 (begin
-                   (send f put (style-list-link-list-id sll))
-                   #t)))
-          (send f get-s-sll))
-   (let ([lid (send f get-s-style-count)])
-     (send f set-s-style-count (add1 lid))
-
-     (let ([sll (make-style-list-link style-list
-                                      lid
-                                      #f
-                                      #f
-                                      #f)])
-       (send f set-s-sll (cons sll (send f get-s-sll)))
-
-       (send f put lid)
-
-       (let ([count (send style-list number)])
-         (send f put count)
-
-         (for ([i (in-range 1 count)])
-           (let ([style (send style-list index-to-style i)])
-
-             (send f put (send style-list style-to-index (send style get-base-style)))
-
-             (send f put (let ([name (send style get-name)])
-                           (if name
-                               (string->bytes/utf-8 name)
-                               #"")))
-
-             (if (send style is-join?)
-                 (begin
-                   (send f put 1)
-                   (send f put (send style-list style-to-index (send style get-shift-style))))
-                 (let ([delta (new style-delta%)])
-                   (send style get-delta delta)
-      
-                   (send f put 0)
-
-                   (send f put (family-this-to-standard (style-delta-family delta)))
-                   (send f put (let ([face (style-delta-face delta)])
-                                 (if face
-                                     (string->bytes/utf-8 face)
-                                     #"")))
-                   
-                   (send f put (style-delta-size-mult delta))
-                   (send f put (style-delta-size-add delta))
-                   (send f put (weight-this-to-standard (style-delta-weight-on delta)))
-                   (send f put (weight-this-to-standard (style-delta-weight-off delta)))
-                   (send f put (style-this-to-standard (style-delta-style-on delta)))
-                   (send f put (style-this-to-standard (style-delta-style-off delta)))
-                   (send f put (smoothing-this-to-standard (style-delta-smoothing-on delta)))
-                   (send f put (smoothing-this-to-standard (style-delta-smoothing-off delta)))
-                   (send f put (if (style-delta-underlined-on delta) 1 0))
-                   (send f put (if (style-delta-underlined-off delta) 1 0))
-                   (send f put (if (style-delta-size-in-pixels-on delta) 1 0))
-                   (send f put (if (style-delta-size-in-pixels-off delta) 1 0))
-                   (send f put (if (style-delta-transparent-text-backing-on delta) 1 0))
-                   (send f put (if (style-delta-transparent-text-backing-off delta) 1 0))
-
-                   (let-boxes ([r 0.0][g 0.0][b 0.0])
-                       (send (style-delta-foreground-mult delta) get r g b)
-                     (send f put r) (send f put g) (send f put b))
-                   (let-boxes ([r 0.0][g 0.0][b 0.0])
-                       (send (style-delta-background-mult delta) get r g b)
-                     (send f put r) (send f put g) (send f put b))
-                   (let-boxes ([r 0][g 0][b 0])
-                       (send (style-delta-foreground-add delta) get r g b)
-                     (send f put r) (send f put g) (send f put b))
-                   (let-boxes ([r 0][g 0][b 0])
-                       (send (style-delta-background-add delta) get r g b)
-                     (send f put r) (send f put g) (send f put b))
-
-                   (send f put (align-this-to-standard (style-delta-alignment-on delta)))
-                   (send f put (align-this-to-standard (style-delta-alignment-off delta)))))))
-
-         #t)))))
diff --git a/pkgs/snip-pkgs/snip/LICENSE.txt b/pkgs/snip-pkgs/snip/LICENSE.txt
deleted file mode 100644
index ce78e1449b..0000000000
--- a/pkgs/snip-pkgs/snip/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-snip
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/snip-pkgs/snip/info.rkt b/pkgs/snip-pkgs/snip/info.rkt
deleted file mode 100644
index 6659aff3b6..0000000000
--- a/pkgs/snip-pkgs/snip/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("snip-lib"
-               "gui-doc"))
-
-(define pkg-desc "Text and graphics editor extension protocol")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/srfi-pkgs/srfi-doc/LICENSE.txt b/pkgs/srfi-pkgs/srfi-doc/LICENSE.txt
deleted file mode 100644
index 4436fd37c4..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-srfi-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/srfi-pkgs/srfi-doc/info.rkt b/pkgs/srfi-pkgs/srfi-doc/info.rkt
deleted file mode 100644
index 183db10e9a..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/info.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("mzscheme-doc"
-                     "scheme-lib"
-                     "base"
-                     "scribble-lib"
-                     "srfi-lib"
-                     "racket-doc"
-                     "r5rs-doc"
-                     "r6rs-doc"
-                     "compatibility-lib"))
-(define update-implies '("srfi-lib"))
-
-(define pkg-desc "documentation part of \"srfi\"")
-
-(define pkg-authors '(mflatt noel chongkai jay))
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/info.rkt b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/info.rkt
deleted file mode 100644
index 563ac82169..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("srfi.scrbl" (multi-page) (library 100))))
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/index.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/index.html
deleted file mode 100644
index 6f03f9ba71..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/index.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <title>SRFI documents inside Racket</title>
-  </head>
-
-  <body>
-    <h1>SRFI documents inside Racket</h1>
-
-    <h1>Scheme Requests for Implementation</h1>
-
-    <p>The "Scheme Requests for Implementation" (<em>SRFI</em>) process
-    is a new approach to helping Scheme users to write portable and
-    yet useful code.  It is a forum for people interested in
-    coordinating libraries and other additions to the Scheme language
-    between implementations.</p>
-
-    <p>This manual includes the <em style="font-style: normal">original</em> documentation of all
-    the SRFIs already ported to Racket.  For more information on
-    the SRFI process, please <a href="http://srfi.schemers.org">follow
-    this link</a>.</p>
-
-
-    <h2>Loading</h2>
-
-    <p>To load a SRFI with name conflicts (currently SRFIs 1, 5, 13, 17, 19, 43,
-    45, 48, 61, 63, 69 and 87) in a module,<br>
-    please see the note below.<br>
-    <br>
-    To load a SRFI, use the following form:<br>
-    <br>
-&nbsp;&nbsp;&nbsp;&nbsp; (require srfi/N)<br>
-    <br>
-    if you know the number of the SRFI you want to load. This is the preferred
-    method.  Alternatively, use this one:<br>
-    <br>
-&nbsp;&nbsp;&nbsp;&nbsp; (require srfi/N/NAME)<br>
-    <br>
-    if you know the `informative name' of the SRFI.<br>
-    <br>
-    N, is a number corresponding to the sub-collection that holds a particular
-    SRFI, and NAME is a more descriptive name we assigned to the main file in
-    which the SRFI is defined. For instance, to load SRFI-34 you have to do
-    either one of:<br>
-    <br>
-&nbsp;&nbsp;&nbsp;&nbsp; (require srfi/34)<br>
-    <br>
-    or,<br>
-    <br>
-&nbsp;&nbsp;&nbsp;&nbsp; (require srfi/34/exception)<br>
-    <br>
-    </p>
-
-
-    <p>
-    <b><font color="#FF0000">NOTE on SRFIs with name conflicts</font><br>
-    </b><br>
-    Certain SRFIs (currently SRFIs 1, 5, 13, 17, 19, 43, 45, 48, 61, 63, 69 and
-    87) provide names which conflict with names provided by the <tt>racket</tt>
-    language. Attempting to require one of these SRFIs in a module written in
-    the <tt>racket</tt> language will result in an error.<br>
-    <br>
-    To address this problem, the Racket implementations of these SRFIs provide a
-    different module which renames the problematic exports to avoid these
-    conflicts. For SRFI 1, this library is called list, and should be
-    required like this:<br>
-    <br>
-&nbsp;&nbsp;&nbsp;&nbsp; (require srfi/1/list)<br>
-    <br>
-    which supplies the colliding names with a prefix of 's:' (e.g. &quot;s:map&quot;,
-    &quot;s:reverse!&quot;) and is therefore suitable for requires in a module.<br>
-    <br>
-    For SRFI 19, this library is called time, and should be required like
-    this:<br>
-    <br>
-&nbsp;&nbsp;&nbsp;&nbsp; (require srfi/19/time)<br>
-    <br>
-    which supplies the colliding names with a prefix of 'srfi:' (e.g.
-    &quot;srfi:date?&quot;, &quot;srfi:date-second&quot;) and is therefore<br>
-    suitable for requires in a module.<br>
-    <br>
-    </p>
-
-
-    <p>
-    <b>Supported SRFIs</b><br>
-    </p>
-
-
-    <p>SRFI&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; File
-    name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    Sub-collection<br>
-    SRFI-1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; list.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    1<br>
-    SRFI-2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; and-let.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    2<br>
-    SRFI-4(*1)&nbsp;&nbsp;&nbsp;&nbsp; 4.rkt<br>
-    SRFI-5&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; let.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    5<br>
-    SRFI-6(+)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 6.rkt<br>
-    SRFI-7&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; program.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    7<br>
-    SRFI-8&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; receive.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    8<br>
-    SRFI-9&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; record.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    9<br>
-    SRFI-11(+)&nbsp;&nbsp;&nbsp;&nbsp; 11.rkt<br>
-    SRFI-13&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; string.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    13<br>
-    SRFI-14&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; char-set.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    14<br>
-    SRFI-16(+)&nbsp;&nbsp;&nbsp;&nbsp; 16.rkt<br>
-    SRFI-17&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; set.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    17<br>
-    SRFI-19(*2)&nbsp;&nbsp;&nbsp; time.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    19<br>
-    SRFI-23(+)&nbsp;&nbsp;&nbsp;&nbsp; 23.rkt<br>
-    SRFI-25&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; array.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    25<br>
-    SRFI-26&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cut.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    26<br>
-    SRFI-27&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; random-bits.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    27<br>
-    SRFI-28(+)&nbsp;&nbsp;&nbsp;&nbsp; 28.rkt<br>
-    SRFI-29&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; localization.rkt&nbsp;&nbsp;&nbsp;&nbsp;
-    29<br>
-    SRFI-30(+)&nbsp;&nbsp;&nbsp;&nbsp; 30.rkt<br>
-    SRFI-31&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; rec.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    31<br>
-    SRFI-32&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; sort.scm&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    32<br>
-    SRFI-34&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; exception.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    34<br>
-    SRFI-35&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; condition.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    35<br>
-    SRFI-38(+)&nbsp;&nbsp;&nbsp;&nbsp; 38.rkt<br>
-    SRFI-39(+)&nbsp;&nbsp;&nbsp;&nbsp; 39.rkt<br>
-    SRFI-40&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; stream.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    40<br>
-    SRFI-42&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; comprehensions.rkt&nbsp;&nbsp;
-    42<br>
-    SRFI-43&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; vector-lib.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    43<br>
-    SRFI-45(*3)&nbsp;&nbsp;&nbsp; lazy.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    45<br>
-    SRFI-48&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; format.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    48<br>
-    SRFI-54&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cat.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    54<br>
-    SRFI-57&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; records.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    57<br>
-    SRFI-59&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; vicinity.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    59<br>
-    SRFI-60&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 60.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    60<br>
-    SRFI-61&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; cond.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    61<br>
-    SRFI-62(+)<br>
-    SRFI-63&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 63.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    63<br>
-    SRFI-64&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; testing.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    64<br>
-    SRFI-66&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 66.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    66<br>
-    SRFI-67&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; compare.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    67<br>
-    SRFI-69&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; hash.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    69<br>
-    SRFI-71&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; letvalues.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    71<br>
-    SRFI-74&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 74.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    74<br>
-    SRFI-78&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; check.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    78<br>
-    SRFI-86&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 86.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    86<br>
-    SRFI-87&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; case.rkt&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    87<br>
-    </p>
-
-
-    <p><b>Notes:</b></p>
-
-
-    <p>+ Supported by the Racket core<br>
-    <br>
-    *1 The functionality is all part of racket available
-    via (require ffi/unsafe), the only missing part is the i/o
-    syntax.<br>
-    <br>
-    *2 The time module does not export its time structure
-    (you have to use the time-* procedures.) It renames all
-    the date-* accessors to tm:date-* so that you won't get
-    errors when including this code in other modules. Care
-    most be taken NOT to confuse the internal date structure
-    with the Racket one, they are not the same, and all
-    procedures from this library expect the former.<br>
-    <br>
-    *3 This port also provides promise? / srfi-45-promise?.<br>
-    </p>
-
-
-    <h2>Ported SRFIs: original documents</h2>
-
-    <ul>
-      <li><a href="srfi-1.html">SRFI 1: List Library</a></li>
-      <li><a href="srfi-2.html">SRFI 2: AND-LET*: an AND with local bindings, a guarded LET* special form</a></li>
-      <li><a href="srfi-4.html">SRFI 4: Homogeneous numeric vector datatypes</a></li>
-      <li><a href="srfi-5.html">SRFI 5: A compatible let form with signatures and rest arguments</a></li>
-      <li><a href="srfi-6.html">SRFI 6: Basic String Ports</a></li>
-      <li><a href="srfi-7.html">SRFI 7: Feature-based program configuration language</a></li>
-      <li><a href="srfi-8.html">SRFI 8: RECEIVE: Binding to multiple values</a></li>
-      <li><a href="srfi-9.html">SRFI 9: Defining Record Types</a></li>
-      <li><a href="srfi-11.html">SRFI 11: Syntax for receiving multiple values</a></li>
-      <li><a href="srfi-13.html">SRFI 13: String Libraries</a></li>
-      <li><a href="srfi-14.html">SRFI 14: Character-set Library</a></li>
-      <li><a href="srfi-16.html">SRFI 16: Syntax for procedures of variable arity</a></li>
-      <li><a href="srfi-17.html">SRFI 17:  Generalized set!</a></li>
-      <!-- SRFI 18 is partially supported.  I'm not moving the document so as not to give false hopes! -->
-      <li><a href="srfi-19.html">SRFI 19: Time Data Types and Procedures</a></li>
-      <li><a href="srfi-23.html">SRFI 23: Error reporting mechanism</a></li>
-      <li><a href="srfi-25.html">SRFI 25: Multi-dimensional Array Primitives</a></li>
-      <li><a href="srfi-26.html">SRFI 26: Notation for Specializing Parameters without Currying</a></li>
-      <li><a href="srfi-27.html">SRFI 27: Sources of Random Bits</a></li>
-      <li><a href="srfi-28.html">SRFI 28: Basic Format Strings</a></li>
-      <li><a href="srfi-29.html">SRFI 29: Localization</a></li>
-      <li><a href="srfi-30.html">SRFI 30: Nested Multi-line Comments</a></li>
-      <li><a href="srfi-31.html">SRFI 31: A special form rec for recursive evaluation</a></li>
-      <li><a href="srfi-34.html">SRFI 34: Exception Handling for Programs</a></li>
-      <li><a href="srfi-35.html">SRFI 35: Conditions</a></li>
-      <li><a href="srfi-38.html">SRFI 38: External Representation for Data With Shared Structure</a></li>
-      <li><a href="srfi-39.html">SRFI 39: Parameter objects</a></li>
-      <li><a href="srfi-40.html">SRFI 40: A Library of Streams</a></li>
-      <li><a href="srfi-42.html">SRFI 42: Eager Comprehensions</a></li>
-      <li><a href="srfi-43.html">SRFI 43: Vector Library</a></li>
-      <li><a href="srfi-45.html">SRFI 45: Primitives for Expressing Iterative Lazy Algorithms</a></li>
-      <li><a href="srfi-48.html">SRFI 48: Intermediate Format Strings</a></li>
-      <li><a href="srfi-54.html">SRFI 54: Formatting</a></li>
-      <li><a href="srfi-57.html">SRFI 57: Records</a></li>
-      <li><a href="srfi-59.html">SRFI 59: Vicinity</a></li>
-      <li><a href="srfi-60.html">SRFI 60: Integers as Bits</a></li>
-      <li><a href="srfi-61.html">SRFI 61: A more general cond clause</a></li>
-      <li><a href="srfi-62.html">SRFI 62: S-expression comments</a></li>
-      <li><a href="srfi-63.html">SRFI 63: Homogeneous and Heterogeneous Arrays</a></li>
-      <li><a href="srfi-64.html">SRFI 64: A Scheme API for test suites</a></li>
-      <li><a href="srfi-66.html">SRFI 66: Octet Vectors</a></li>
-      <li><a href="srfi-67/srfi-67.html">SRFI 67: Compare Procedures</a></li>
-      <li><a href="srfi-69.html">SRFI 69: Basic hash tables</a></li>
-      <li><a href="srfi-71.html">SRFI 71: Extended LET-syntax for multiple values</a></li>
-      <li><a href="srfi-74.html">SRFI 74: Octet-Addressed Binary Blocks</a></li>
-      <li><a href="srfi-78.html">SRFI 78: Lightweight testing</a></li>
-      <li><a href="srfi-86.html">SRFI  86: MU and NU simulating VALUES &amp;
-      CALL-WITH-VALUES, and their related LET-syntax</a></li>
-      <li><a href="srfi-87.html">SRFI 87: =&gt; in case clauses</a></li>
-    </ul>
-
-    </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-1.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-1.html
deleted file mode 100644
index 773c03b624..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-1.html
+++ /dev/null
@@ -1,3246 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
-  'http://www.w3.org/TR/REC-html40/strict.dtd'>
-
-<!-- Is there a portable way to write an em-dash?
-     Can I have bangs, plusses, or slashes in #tags? Spaces?
-	Yes: plus, bang, star   No: space  Yes: slash, question, ampersand
-	You can't put sharp in a path, so anything goes, really.
-	Nonetheless, some of these confuse Netscape, so I'll avoid them.
- -->
-
-<!--========================================================================-->
-<html lang=en-US>
-  <head>
-    <meta name="keywords" content="Scheme, programming language, list processing, SRFI, youthful devotees of intra-gender communion">
-    <link rev=made href="mailto:shivers@ai.mit.edu">
-    <title>SRFI 1: List Library</title>
-
-    <!-- Should have a media=all to get, for example, printing to work.
-      == But my Netscape will completely ignore the tag if I do that.
-      -->
-    <style type="text/css">
-	   /* A little general layout hackery for headers & the title. */
-           body { margin-left: +7%;
-	          font-family: "Helvetica", sans-serif;
-		  }
-           /* Netscape workaround: */
-	   td, th { font-family: "Helvetica", sans-serif; }
-
-	   code, pre { font-family: "courier new", "courier"; }
-
-           h1 { margin-left: -5%; }
-	   h1, h2 { clear: both; }
-	   h1, h2, h3, h4, h5, h6 { color: blue }
-	   div.title-text { font-size: large; font-weight: bold; }
-
-	   div.indent { margin-left: 2em; }	  /* General indentation */
-	   pre.code-example { margin-left: 2em; } /* Indent code examples. */
-
-	   /* This stuff is for definition lists of defined procedures.
-           ** A proc-def2 is used when you want a stack of procs to go
-	   ** with one <dd> ... </dd> body. In this case, make the first
-	   ** proc a proc-def1, following ones proc-defi's, and the last one
-           ** a proc-defn.
-           **
-           ** Unfortunately, Netscape has huge bugs with respect to style
-           ** sheets and dl list rendering. We have to set truly random
-           ** values here to get the rendering to come out. The proper values
-           ** are in the following style sheet, for Internet Explorer.
-	   ** In the following settings, the *comments* say what the 
-           ** setting *really* causes Netscape to do.
-	   **
-           ** Ugh. Professional coders sacrifice their self-respect,
-           ** that others may live.
-           */
-	   /* m-t ignored; m-b sets top margin space. */
-	   dt.proc-def1 { margin-top: 0ex; margin-bottom: 3ex; }
-	   dt.proc-defi { margin-top: 0ex; margin-bottom: 0ex; }
-	   dt.proc-defn { margin-top: 0ex; margin-bottom: 0ex; }
-
-	   /* m-t works weird depending on whether or not the last line
-           ** of the previous entry was a pre. Set to zero.
-           */
-	   dt.proc-def  { margin-top: 0ex; margin-bottom: 3ex; }
-
-	   /* m-b sets space between dd & dt; m-t ignored. */
-	   dd.proc-def { margin-bottom: 0.5ex; margin-top: 0ex; } 
-
-
-	   /* Boldface the name of a procedure when it's being defined. */
-	   code.proc-def { font-weight: bold; font-size: 110%}
-
-	   /* For the index of procedures. 
-           ** Same hackery as for dt.proc-def, above.
-           */
-	   /* m-b sets space between dd & dt; m-t ignored. */
-	   dd.proc-index  { margin-bottom: 0ex; margin-top: 0ex; } 
-	   /* What the fuck? */
-	   pre.proc-index { margin-top: -2ex; }
-
-	   /* Pull the table of contents back flush with the margin.
-	   ** Both NS & IE screw this up in different ways.
-	   */
-	   #toc-table { margin-top: -2ex; margin-left: -5%; }
-
-	   /* R5RS proc names are in italic; extended R5RS names 
-           ** in italic boldface.
-	   */
-	   span.r5rs-proc { font-weight: bold; }
-	   span.r5rs-procx { font-style: italic; font-weight: bold; }
-
-	   /* Spread out bibliographic lists. */
-	   /* More Netscape-specific lossage; see the following stylesheet
-	   ** for the proper values (used by IE).
-           */
-	   dt.biblio { margin-bottom: 1ex; }
-
-	   /* Links to draft copies (e.g., not at the official SRFI site)
-	   ** are colored in red, so people will use them during the 
-	   ** development process and kill them when the document's done.
-	   */
-           a.draft { color: red; }
-    </style>
-
-    <style type="text/css"; media=all>
-	   /* Nastiness: Here, I'm using a bug to work around a bug.
-	   ** Netscape rendering bugs mean you need bogus <dt> and <dd>
-	   ** margin settings -- settings which screw up IE's proper rendering.
-	   ** Fortunately, Netscape has *another* bug: it will ignore this
-	   ** media=all style sheet. So I am placing the (proper) IE values
-	   ** here. Perhaps, one day, when these rendering bugs are fixed,
-	   ** this gross hackery can be removed.
-	   */
-	   dt.proc-def1 { margin-top: 3ex; margin-bottom: 0ex; }
-	   dt.proc-defi { margin-top: 0ex; margin-bottom: 0ex; }
-	   dt.proc-defn { margin-top: 0ex; margin-bottom: 0.5ex; }
-	   dt.proc-def  { margin-top: 3ex; margin-bottom: 0.5ex; }
-
-	   pre { margin-top: 1ex; }
-
-	   dd.proc-def { margin-bottom: 2ex; margin-top: 0.5ex; } 
-
-	   /* For the index of procedures. 
-           ** Same hackery as for dt.proc-def, above.
-           */
-	   dd.proc-index { margin-top: 0ex; } 
-	   pre.proc-index { margin-top: 0ex; }
-
-	   /* Spread out bibliographic lists. */
-	   dt.biblio { margin-top: 3ex; margin-bottom: 0ex; }
-	   dd.biblio { margin-bottom: 1ex; }
-    </style>
-  </head>
-
-<body>
-
-<!--========================================================================-->
-<H1>Title</H1><div class=title-text>
-SRFI-1: List Library
-</div>
-
-<!--========================================================================-->
-<H1>Author</H1>
-
-Olin Shivers
-
-    <address>
-      <a href="http://www.ai.mit.edu/~shivers/">http://www.ai.mit.edu/~shivers/</A> /
-      <a href="mailto:shivers@ai.mit.edu">shivers@ai.mit.edu</A>
-    </address>
-
-<!--========================================================================-->
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion via <A HREF="http://srfi.schemers.org/srfi-1/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P>
-<UL>
-    <LI>Received: 1998/11/08</LI>
-    <LI>Draft: 1998/12/22-1999/03/09</LI>
-    <LI>Revised: several times</LI>
-    <LI>Final: 1999/10/09</LI>
-</UL>
-
-<!--========================================================================-->
-<h1>Table of contents</H1>
-
-<!-- A bug in netscape (?) keeps the first link in this UL from being active.
-==== So the Abstract link be dead. 99/8/22 -Olin
--->
-<ul id=toc-table>
-<li><a href="#Abstract">Abstract</a>
-<li><a href="#Rationale">Rationale</a>
-<li><a href="#ProcedureIndex">Procedure index</a>
-<li><a href="#GeneralDiscussion">General discussion</a>
-  <ul>
-  <li><a href="#LinearUpdateProcedures">"Linear update" procedures</a>
-  <li><a href="#ImproperLists">Improper lists</a>
-  <li><a href="#Errors">Errors</a>
-  <li><a href="#NotIncludedInThisLibrary">Not included in this library</a>
-  </ul>
-<li><a href="#TheProcedures">The procedures</a>
-  <ul>
-  <li><a href="#Constructors">Constructors</a>
-  <li><a href="#Predicates">Predicates</a>
-  <li><a href="#Selectors">Selectors</a>
-  <li><a href="#Miscellaneous">Miscellaneous: length, append, reverse, zip &amp; count</a>
-  <li><a href="#FoldUnfoldMap">Fold, unfold, and map</a>
-  <li><a href="#FilteringPartitioning">Filtering &amp; partitioning</a>
-  <li><a href="#Searching">Searching</a>
-  <li><a href="#Deletion">Deletion</a>
-  <li><a href="#AssociationLists">Association lists</a>
-  <li><a href="#SetOperationsOnLists">Set operations on lists</a>
-  <li><a href="#PrimitiveSideEffects">Primitive side-effects</a>
-  </ul>
-<li><a href="#Acknowledgements">Acknowledgements</a>
-<li><a href="#ReferencesLinks">References &amp; links</a>
-<li><a href="#Copyright">Copyright</a>
-</ul>
-
-
-<!--========================================================================-->
-<h1><a name="Abstract">Abstract</a></H1>
-<p>
-<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> Scheme has an impoverished set of list-processing utilities, which is a
-problem for authors of portable code.  This <abbr title="Scheme Request for Implementation">SRFI</abbr> proposes a coherent and
-comprehensive set of list-processing procedures; it is accompanied by a
-reference implementation of the spec. The reference implementation is
-<ul>
-<li>portable
-<li>efficient
-<li>completely open, public-domain source
-</ul>
-
-<!--========================================================================-->
-<h1><a name="Rationale">Rationale</a></h1>
-<p>
-The set of basic list and pair operations provided by R4RS/<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> Scheme is far
-from satisfactory. Because this set is so small and basic, most
-implementations provide additional utilities, such as a list-filtering
-function, or a "left fold" operator, and so forth. But, of course, this
-introduces incompatibilities -- different Scheme implementations provide
-different sets of procedures.
-
-<p>
-I have designed a full-featured library of procedures for list processing.
-While putting this library together, I checked as many Schemes as I could get
-my hands on. (I have a fair amount of experience with several of these
-already.) I missed Chez -- no on-line manual that I can find -- but I hit most
-of the other big, full-featured Schemes. The complete list of list-processing
-systems I checked is:
-<div class=indent>
-    <abbr title="Revised^4 Report on Scheme">R4RS</abbr>/<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> Scheme, MIT Scheme, Gambit, RScheme, MzScheme, slib, 
-    <a href="#CommonLisp">Common Lisp</a>, Bigloo, guile, T, APL and the SML standard basis
-</div>
-<p>
-As a result, the library I am proposing is fairly rich.
-<p>
-Following this initial design phase, this library went through several
-months of discussion on the SRFI mailing lists, and was altered in light
-of the ideas and suggestions put forth during this discussion.
-<p>
-In parallel with designing this API, I have also written a reference
-implementation. I have placed this source on the Net with an unencumbered,
-"open" copyright. A few notes about the reference implementation:
-
-<ul>
-<li>Although I got procedure names and specs from many Schemes, I wrote this
-    code myself. Thus, there are <em>no</em> entanglements. 
-    Any Scheme implementor
-    can pick this library up with no worries about copyright problems -- both
-    commercial and non-commercial systems.
-
-<li>The code is written for portability and should be trivial to port to
-    any Scheme. It has only four deviations from <abbr title="Revised^4 Report on Scheme">R4RS</abbr>, clearly discussed
-    in the comments: <ul>
-	<li>Use of an <code>error</code> procedure;
-	<li>Use of the <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> <code>values</code> and a simple <code>receive</code> macro for producing
-	  and consuming multiple return values;
-	<li>Use of simple <code>:optional</code> and <code>let-optionals</code> macros for optional
-	  argument parsing and defaulting;
-	<li>Use of a simple <code>check-arg</code> procedure for argument checking.
-        </ul>
-
-<li>It is written for clarity and well-commented. The current source is
-    768 lines of source code and 826 lines of comments and white space.
-
-<li>It is written for efficiency. Fast paths are provided for common
-    cases. Side-effecting procedures such as <code>filter!</code> avoid unnecessary,
-    redundant <code>set-cdr!</code>s which would thrash a generational GC's write barrier
-    and the store buffers of fast processors. Functions reuse longest common
-    tails from input parameters to construct their results where
-    possible. Constant-space iterations are used in preference to recursions;
-    local recursions are used in preference to consing temporary intermediate
-    data structures.
-<p>
-    This is not to say that the implementation can't be tuned up for
-    a specific Scheme implementation. There are notes in comments addressing
-    ways implementors can tune the reference implementation for performance.
-</ul>
-<p>
-In short, I've written the reference implementation to make it as painless
-as possible for an implementor -- or a regular programmer -- to adopt this
-library and get good results with it.
-
-
-<!--========================================================================-->
-<h1><a name="ProcedureIndex">Procedure Index</a></h1>
-<p>
-Here is a short list of the procedures provided by the list-lib package.
-<a href="#R5RS">R5RS</a></abbr> procedures are shown in 
-<span class=r5rs-proc>bold</span class=r5rs-proc>;
-extended <a href="#R5RS">R5RS</a></abbr> 
-         procedures, in <span class=r5rs-procx>bold italic</span>.
-<div class=indent>
-<dl>
-<dt class=proc-index> Constructors
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-proc><a href="#cons">cons</a> <a href="#list">list</a></span>
-<a href="#xcons">xcons</a> <a href="#cons*">cons*</a> <a href="#make-list">make-list</a> <a href="#list-tabulate">list-tabulate</a> 
-<a href="#list-copy">list-copy</a> <a href="#circular-list">circular-list</a> <a href="#iota">iota</a>
-</pre>
-
-<dt class=proc-index> Predicates
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-proc><a href="#pair-p">pair?</a> <a href="#null-p">null?</a></span>
-<a href="#proper-list-p">proper-list?</a> <a href="#circular-list-p">circular-list?</a> <a href="#dotted-list-p">dotted-list?</a> 
-<a href="#not-pair-p">not-pair?</a> <a href="#null-list-p">null-list?</a>
-<a href="#list=">list=</a>
-</pre>
-
-<dt class=proc-index> Selectors
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-proc><a href="#car">car</a> <a href="#cdr">cdr</a> ... <a href="#cddadr">cddadr</a> <a href="#cddddr">cddddr</a> <a href="#list-ref">list-ref</a></span>
-<a href="#first">first</a> <a href="#second">second</a> <a href="#third">third</a> <a href="#fourth">fourth</a> <a href="#fifth">fifth</a> <a href="#sixth">sixth</a> <a href="#seventh">seventh</a> <a href="#eighth">eighth</a> <a href="#ninth">ninth</a> <a href="#tenth">tenth</a>
-<a href="#car+cdr">car+cdr</a>
-<a href="#take">take</a>       <a href="#drop">drop</a>
-<a href="#take-right">take-right</a> <a href="#drop-right">drop-right</a>
-<a href="#take!">take!</a>      <a href="#drop-right!">drop-right!</a> 
-<a href="#split-at">split-at</a>   <a href="#split-at!">split-at!</a> 
-<a href="#last">last</a> <a href="#last-pair">last-pair</a>
-</pre>
-
-<dt class=proc-index> Miscellaneous: length, append, concatenate, reverse, zip &amp; count
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-proc><a href="#length">length</a></span> <a href="#length+">length+</a>
-<span class=r5rs-proc><a href="#append">append</a></span>  <a href="#concatenate">concatenate</a>  <span class=r5rs-proc><a href="#reverse">reverse</a></span>
-<a href="#append!">append!</a> <a href="#concatenate!">concatenate!</a> <a href="#reverse!">reverse!</a>
-<a href="#append-reverse">append-reverse</a> <a href="#append-reverse!">append-reverse!</a>
-<a href="#zip">zip</a> <a href="#unzip1">unzip1</a> <a href="#unzip2">unzip2</a> <a href="#unzip3">unzip3</a> <a href="#unzip4">unzip4</a> <a href="#unzip5">unzip5</a>
-<a href="#count">count</a>
-</pre>
-
-<dt class=proc-index> Fold, unfold &amp; map
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-procx><a href="#map">map</a> <a href="#for-each">for-each</a></span>
-<a href="#fold">fold</a>       <a href="#unfold">unfold</a>       <a href="#pair-fold">pair-fold</a>       <a href="#reduce">reduce</a> 
-<a href="#fold-right">fold-right</a> <a href="#unfold-right">unfold-right</a> <a href="#pair-fold-right">pair-fold-right</a> <a href="#reduce-right">reduce-right</a> 
-<a href="#append-map">append-map</a> <a href="#append-map!">append-map!</a>
-<a href="#map!">map!</a> <a href="#pair-for-each">pair-for-each</a> <a href="#filter-map">filter-map</a> <a href="#map-in-order">map-in-order</a>
-</pre>
-
-<dt class=proc-index> Filtering &amp; partitioning
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#filter">filter</a>  <a href="#partition">partition</a>  <a href="#remove">remove</a>
-<a href="#filter!">filter!</a> <a href="#partition!">partition!</a> <a href="#remove!">remove!</a> 
-</pre>
-
-<dt class=proc-index> Searching
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-procx><a href="#member">member</a></span> <span class=r5rs-proc><a href="#memq">memq</a> <a href="#memv">memv</a></span>
-<a href="#find">find</a> <a href="#find-tail">find-tail</a> 
-<a href="#any">any</a> <a href="#every">every</a>
-<a href="#list-index">list-index</a>
-<a href="#take-while">take-while</a> <a href="#drop-while">drop-while</a> <a href="#take-while!">take-while!</a>
-<a href="#span">span</a> <a href="#break">break</a> <a href="#span!">span!</a> <a href="#break!">break!</a>
-</pre>
-
-<dt class=proc-index> Deleting
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#delete">delete</a>  <a href="#delete-duplicates">delete-duplicates</a> 
-<a href="#delete!">delete!</a> <a href="#delete-duplicates!">delete-duplicates!</a>
-</pre>
-
-<dt class=proc-index> Association lists
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-procx><a href="#assoc">assoc</a></span> <span class=r5rs-proc><a href="#assq">assq</a> <a href="#assv">assv</a></span>
-<a href="#alist-cons">alist-cons</a> <a href="#alist-copy">alist-copy</a>
-<a href="#alist-delete">alist-delete</a> <a href="#alist-delete!">alist-delete!</a>
-</pre>
-
-<dt class=proc-index> Set operations on lists
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#lset<=">lset&lt;=</a> <a href="#lset=">lset=</a> <a href="#lset-adjoin">lset-adjoin</a>
-<a href="#lset-union">lset-union</a>			<a href="#lset-union!">lset-union!</a>
-<a href="#lset-intersection">lset-intersection</a>		<a href="#lset-intersection!">lset-intersection!</a>
-<a href="#lset-difference">lset-difference</a>		        <a href="#lset-difference!">lset-difference!</a>
-<a href="#lset-xor">lset-xor</a>			<a href="#lset-xor!">lset-xor!</a>
-<a href="#lset-diff+intersection">lset-diff+intersection</a>	        <a href="#lset-diff+intersection!">lset-diff+intersection!</a>
-</pre>
-
-<dt class=proc-index> Primitive side-effects
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-proc><a href="#set-car!">set-car!</a> <a href="#set-cdr!">set-cdr!</a></span>
-</pre>
-</dl>
-</div>
-
-<p>
-Four <abbr title="Revised^4 Report on Scheme">R4RS</abbr>/<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> list-processing procedures are extended by this library in
-backwards-compatible ways:
-<div class=indent>
-<table cellspacing=0>
-<tr valign=baseline><td><code>map for-each</code> 
-    <td>(Extended to take lists of unequal length) 
-<tr valign=baseline><td><code>member assoc</code> 
-    <td>(Extended to take an optional comparison procedure.)
-</table>
-</div>
-
-<p>
-The following <abbr title="Revised^4 Report on Scheme">R4RS</abbr>/<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> list- and pair-processing procedures are also part of
-list-lib's exports, as defined by the <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>:
-<div class=indent>
-<pre>
-cons pair? null?
-car cdr ... cdddar cddddr 
-set-car! set-cdr! 
-list append reverse
-length list-ref
-memq memv assq assv
-</pre>
-</div>
-    
-<p>
-The remaining two <abbr title="Revised^4 Report on Scheme">R4RS</abbr>/<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> list-processing 
-procedures are <em>not</em> part of
-this library:
-<div class=indent>
-<table cellspacing=0>
-<tr><td><code>list-tail</code> 
-    <td>(renamed <code>drop</code>)
-<tr valign=baseline><td><code>list?</code>
-    <td>(see <code>proper-list?</code>,
-             <code>circular-list?</code> and 
-             <code>dotted-list?</code>)
-</table>
-</div>
-
-<!--========================================================================-->
-<h1><a name="GeneralDiscussion">General discussion</a></h1>
-<p>
-
-A set of general criteria guided the design of this library.
-
-<p>
-
-I don't require "destructive" (what I call "linear update") procedures to 
-alter and recycle cons cells from the argument lists. They are allowed to, but
-not required to. (And the reference implementations I have written <em>do</em>
-recycle the argument lists.)
-
-<p>
-List-filtering procedures such as <code>filter</code> or <code>delete</code> do not disorder
-lists. Elements appear in the answer list in the same order as they appear in
-the argument list. This constrains implementation, but seems like a desirable
-feature, since in many uses of lists, order matters.  (In particular,
-disordering an alist is definitely a bad idea.)
-<p>
-Contrariwise, although the reference implementations of the list-filtering
-procedures share longest common tails between argument and answer lists,
-it not is part of the spec.
-<p>
-Because lists are an inherently sequential data structure (unlike, say,
-vectors), list-inspection functions such as <code>find</code>, <code>find-tail</code>, <code>for-each</code>, <code>any</code>
-and <code>every</code> commit to a left-to-right traversal order of their argument list.
-<p>
-However, constructor functions, such as <code><code>list-tabulate</code></code> and the mapping
-procedures (<code>append-map</code>, <code>append-map!</code>, <code>map!</code>, <code>pair-for-each</code>, <code>filter-map</code>,
-<code>map-in-order</code>), do <em>not</em> specify the dynamic order in which their procedural
-argument is applied to its various values.
-<p>
-Predicates return useful true values wherever possible.  Thus <code>any</code> must return
-the true value produced by its predicate, and <code>every</code>  returns the final true
-value produced by applying its predicate argument to the last element of its
-argument list.
-<p>
-Functionality is provided both in pure and linear-update (potentially
-destructive) forms wherever this makes sense.
-<p>
-No special status accorded Scheme's built-in equality functions.
-Any functionality provided in terms of <code>eq?</code>, <code>eqv?</code>, <code>equal?</code> is also
-available using a client-provided equality function.
-<p>
-Proper design counts for more than backwards compatibility, but I have tried,
-<em>ceteris paribus</em>, 
-to be as backwards-compatible as possible with existing
-list-processing libraries, in order to facilitate porting old code to run as a
-client of the procedures in this library. Name choices and semantics are, for
-the most part, in agreement with existing practice in many current Scheme
-systems. I have indicated some incompatibilities in the following text.
-<p>
-These procedures are <em>not</em> "sequence generic" -- <em>i.e.</em>, procedures that
-operate on either vectors and lists. They are list-specific. I prefer to
-keep the library simple and focussed.
-<p>
-I have named these procedures without a qualifying initial "list-" lexeme,
-which is in keeping with the existing set of list-processing utilities in
-Scheme.
-I follow the general Scheme convention (vector-length, string-ref) of
-placing the type-name before the action when naming procedures -- so
-we have <code>list-copy</code> and <code>pair-for-each</code> rather than the perhaps
-more fluid, but less consistent, <code>copy-list</code> or <code>for-each-pair</code>.
-<p>
-I have generally followed a regular and consistent naming scheme, composing
-procedure names from a set of basic lexemes.
-
-<!--========================================================================-->
-<h2><a name="LinearUpdateProcedures">"Linear update" procedures</a></h2>
-<p>
-
-Many procedures in this library have "pure" and "linear update" variants.  A
-"pure" procedure has no side-effects, and in particular does not alter its
-arguments in any way. A "linear update" procedure is allowed -- but <em>not</em>
-required -- to side-effect its arguments in order to construct its
-result. "Linear update" procedures are typically given names ending with an
-exclamation point. So, for example, <code>(append! list1 list2)</code> is allowed to
-construct its result by simply using <code>set-cdr!</code> to set the cdr of the last pair
-of <var>list<sub>1</sub></var> to point to <var>list<sub>2</sub></var>, and then returning <var>list<sub>1</sub></var> (unless <var>list<sub>1</sub></var> is the
-empty list, in which case it would simply return <var>list<sub>2</sub></var>). However, <code>append!</code> may
-also elect to perform a pure append operation -- this is a legal definition
-of <code>append!</code>:
-<pre class=code-example>
-(define append! append)
-</pre>
-<p>
-This is why we do not call these procedures "destructive" -- because they
-aren't <em>required</em> to be destructive. They are <em>potentially</em> destructive.
-<p>
-What this means is that you may only apply linear-update procedures to
-values that you know are "dead" -- values that will never be used again
-in your program. This must be so, since you can't rely on the value passed
-to a linear-update procedure after that procedure has been called. It
-might be unchanged; it might be altered.
-<p>
-The "linear" in "linear update" doesn't mean "linear time" or "linear space"
-or any sort of multiple-of-n kind of meaning. It's a fancy term that
-type theorists and pure functional programmers use to describe
-systems where you are only allowed to have exactly one reference to each
-variable. This provides a guarantee that the value bound to a variable is
-bound to no other variable. So when you <em>use</em> a variable in a variable
-reference, you "use it up." Knowing that no one else has a pointer to that
-value means the a system primitive is free to side-effect its arguments to
-produce what is, observationally, a pure-functional result.
-<p>
-In the context of this library, "linear update" means you, the programmer,
-know there are <em>no other</em> live references to the value passed to the
-procedure -- after passing the value to one of these procedures, the
-value of the old pointer is indeterminate. Basically, you are licensing
-the Scheme implementation to alter the data structure if it feels like
-it -- you have declared you don't care either way.
-<p>
-You get no help from Scheme in checking that the values you claim are "linear"
-really are. So you better get it right. Or play it safe and use the non-!
-procedures -- it doesn't do any good to compute quickly if you get the wrong
-answer.
-<p>
-Why go to all this trouble to define the notion of "linear update" and use it
-in a procedure spec, instead of the more common notion of a "destructive"
-operation?  First, note that destructive list-processing procedures are almost
-always used in a linear-update fashion. This is in part required by the
-special case of operating upon the empty list, which can't be side-effected.
-This means that destructive operators are not pure side-effects -- they have
-to return a result. Second, note that code written using linear-update
-operators can be trivially ported to a pure, functional subset of Scheme by
-simply providing pure implementations of the linear-update operators. Finally,
-requiring destructive side-effects ruins opportunities to parallelise these
-operations -- and the places where one has taken the trouble to spell out
-destructive operations are usually exactly the code one would want a
-parallelising compiler to parallelise: the efficiency-critical kernels of the
-algorithm.  Linear-update operations are easily parallelised. Going with a
-linear-update spec doesn't close off these valuable alternative implementation
-techniques. This list library is intended as a set of low-level, basic
-operators, so we don't want to exclude these possible implementations.
-<p>
-The linear-update procedures in this library are
-<div class=indent><code>
-take! drop-right! split-at!
-append! concatenate! reverse! append-reverse!
-append-map! map!
-filter! partition! remove! 
-take-while! span! break!
-delete! alist-delete! delete-duplicates!
-lset-adjoin! lset-union! lset-intersection! 
-lset-difference! lset-xor! lset-diff+intersection!
-</code></div>
-
-
-<!--========================================================================-->
-<h2><a name="ImproperLists">Improper Lists</a></h2>
-<p>
-
-Scheme does not properly have a list type, just as C does not have a string
-type. Rather, Scheme has a binary-tuple type, from which one can build binary
-trees. There is an <em>interpretation</em> of Scheme values that allows one to
-treat these trees as lists. Further complications ensue from the fact that
-Scheme allows side-effects to these tuples, raising the possibility of lists
-of unbounded length, and trees of unbounded depth (that is, circular data
-structures).
-
-<p>
-However, there is a simple view of the world of Scheme values that considers
-every value to be a list of some sort. that is, every value is either
-<ul>
-    <li>a "proper list" -- a finite, nil-terminated list, such as:<br>
-          <code>(a b c)</code><br>
-          <code>()</code><br>
-          <code>(32)</code><br>
-    <li>a "dotted list" -- a finite, non-nil terminated list, such as:<br>
-          <code>(a b c . d)</code><br>
-          <code>(x . y)</code><br>
-          <code>42</code><br>
-          <code>george</code><br>
-    <li>or a "circular list" -- an infinite, unterminated list.
-</ul>
-<p>
-Note that the zero-length dotted lists are simply all the non-null, non-pair
-values.
-
-<p>
-This view is captured by the predicates <code>proper-list?</code>, <code>dotted-list?</code>, and
-<code>circular-list?</code>. List-lib users should note that dotted lists are not commonly
-used, and are considered by many Scheme programmers to be an ugly artifact of
-Scheme's lack of a true list type. However, dotted lists do play a noticeable
-role in the <em>syntax</em> of Scheme, in the "rest" parameters used by n-ary
-lambdas: <code>(lambda (x y . rest) ...)</code>.
-
-<p>
-Dotted lists are <em>not</em> fully supported by list-lib. Most procedures are
-defined only on proper lists -- that is, finite, nil-terminated lists.  The
-procedures that will also handle circular or dotted lists are specifically
-marked. While this design decision restricts the domain of possible arguments
-one can pass to these procedures, it has the benefit of allowing the
-procedures to catch the error cases where programmers inadvertently pass
-scalar values to a list procedure by accident, 
-<em>e.g.</em>, by switching the arguments to a procedure call.
-
-<!--========================================================================-->
-<h2><a name="Errors">Errors</a></h2>
-<p>
-
-Note that statements of the form "it is an error" merely mean "don't
-do that." They are not a guarantee that a conforming implementation will
-"catch" such improper use by, for example, raising some kind of exception.
-Regrettably, <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> Scheme requires no firmer guarantee even for basic operators such
-as <code>car</code> and <code>cdr</code>, so there's little point in requiring these procedures to do
-more.  Here is the relevant section of the <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>:
-<blockquote>
-    <p>
-    When speaking of an error situation, this report uses the phrase "an
-    error is signalled" to indicate that implementations must detect and
-    report the error.  If such wording does not appear in the discussion
-    of an error, then implementations are not required to detect or
-    report the error, though they are encouraged to do so.  An error
-    situation that implementations are not required to detect is usually
-    referred to simply as "an error."
-    <p>
-    For example, it is an error for a procedure to be passed an argument
-    that the procedure is not explicitly specified to handle, even though
-    such domain errors are seldom mentioned in this report.
-    Implementations may extend a procedure's domain of definition to
-    include such arguments.
-</blockquote>
-
-
-<!--========================================================================-->
-<h2><a name="NotIncludedInThisLibrary">Not included in this library</a></h2>
-<p>
-The following items are not in this library:
-<ul>
-<li>Sort routines
-<li>Destructuring/pattern-matching macro
-<li>Tree-processing routines
-</ul>
-<p>
-They should have their own <abbr title="Scheme Request for Implementation">SRFI</abbr> specs.
-<p>
-
-
-<!--========================================================================-->
-<h1><a name="TheProcedures">The procedures</a></h1>
-<p>
-
-In a Scheme system that has a module or package system, these procedures
-should be contained in a module named "list-lib".
-
-The templates given below obey the following conventions for procedure formals:
-<table>
-<tr valign=baseline><th align=left> <var>list</var>	
-    <td> A proper (finite, nil-terminated) list
-<tr valign=baseline><th align=left> <var>clist</var>
-    <td> A proper or circular list
-<tr valign=baseline><th align=left> <var>flist</var>
-    <td> A finite (proper or dotted) list
-<tr valign=baseline><th align=left> <var>pair</var>
-    <td> A pair
-<tr valign=baseline>
-    <th align=left> <var>x</var>, <var>y</var>, <var>d</var>, <var>a</var>
-    <td> Any value
-<tr valign=baseline><th align=left> <var>object</var>, <var>value</var>
-    <td> Any value
-<tr valign=baseline><th align=left> <var>n</var>, <var>i</var>
-    <td> A natural number (an integer &gt;= 0)
-<tr valign=baseline><th align=left> <var>proc</var>
-    <td> A procedure
-<tr valign=baseline><th align=left> <var>pred</var>
-    <td> A procedure whose return value is treated as a boolean
-<tr valign=baseline><th align=left> <var>=</var>
-    <td> A boolean procedure taking two arguments
-</table>
-
-<p>
-It is an error to pass a circular or dotted list to a procedure not
-defined to accept such an argument.
-
-<!--========================================================================-->
-<h2><a name="Constructors">Constructors</a></h2>
-<p>
-
-<dl>
-
-<!--
-==== cons
-============================================================================-->
-<dt class=proc-def>
-<a name="cons"></a>
-<code class=proc-def>cons</code> <var>a d -&gt; pair</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-    The primitive constructor.  Returns a newly allocated pair whose car is 
-    <var>a</var> and whose cdr is <var>d</var>.  
-    The pair is guaranteed to be different (in the sense of <code>eqv?</code>)
-    from every existing object.
-<pre class=code-example>
-(cons 'a '())        => (a)
-(cons '(a) '(b c d)) => ((a) b c d)
-(cons "a" '(b c))    => ("a" b c)
-(cons 'a 3)          => (a . 3)
-(cons '(a b) 'c)     => ((a b) . c)
-</pre>
-
-<!--
-==== list
-============================================================================-->
-<dt class=proc-def>
-<a name="list"></a>
-<code class=proc-def>list</code> <var>object ... -&gt; list</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-    Returns a newly allocated list of its arguments.
-<pre class=code-example>
-(list 'a (+ 3 4) 'c) =>  (a 7 c)
-(list)               =>  ()
-</pre>
-
-<!--
-==== xcons
-============================================================================-->
-<dt class=proc-def>
-<a name="xcons"></a>
-<code class=proc-def>xcons</code> <var>d a -&gt; pair</var>
-<dd class=proc-def>
-<pre>
-(lambda (d a) (cons a d))
-</pre>
-    Of utility only as a value to be conveniently passed to higher-order 
-    procedures.
-
-<pre class=code-example>
-(xcons '(b c) 'a) =&gt; (a b c)
-</pre>
-
-    The name stands for "eXchanged CONS."
-
-<!--
-==== cons*
-============================================================================-->
-<a name="cons*"></a>
-<dt class=proc-def><code class=proc-def>cons*</code><var> elt<sub>1</sub> elt<sub>2</sub> ... -&gt; object</var>
-<dd class=proc-def>
-
-    Like <code>list</code>, 
-    but the last argument provides the tail of the constructed list,
-    returning
-    <div class=indent><code>
-(cons <var>elt<sub>1</sub></var> (cons <var>elt<sub>2</sub></var> (cons ... <var>elt<sub>n</sub></var>)))
-    </code></div>
-    This function is called <code>list*</code> in <a href="#CommonLisp">Common Lisp</a> and about 
-    half of the Schemes that provide it,
-    and <code>cons*</code> in the other half.
-<pre class=code-example>
-(cons* 1 2 3 4) =&gt; (1 2 3 . 4)
-(cons* 1) =&gt; 1
-</pre>
-
-<!--
-==== make-list
-============================================================================-->
-<a name="make-list"></a>
-<dt class=proc-def> <code class=proc-def>make-list</code> <var>n [fill] -&gt; list</var>
-<dd class=proc-def>
-    Returns an <var>n</var>-element list, 
-    whose elements are all the value <var>fill</var>.
-    If the <var>fill</var> argument is not given, the elements of the list may
-    be arbitrary values.
-<pre class=code-example>
-(make-list 4 'c) =&gt; (c c c c)
-</pre>
-
-<!--
-==== list-tabulate
-============================================================================-->
-<a name="list-tabulate"></a>
-<dt class=proc-def><code class=proc-def>list-tabulate</code><var> n init-proc -&gt; list</var>
-<dd class=proc-def>
-    Returns an <var>n</var>-element list. Element <var>i</var> of the list, where 0 &lt;= <var>i</var> &lt; <var>n</var>,
-    is produced by <code>(<var>init-proc</var> <var>i</var>)</code>. No guarantee is made about the dynamic
-    order in which <var>init-proc</var> is applied to these indices.
-
-<pre class=code-example>
-(list-tabulate 4 values) =&gt; (0 1 2 3)
-</pre>
-
-<!--
-==== list-copy
-============================================================================-->
-<a name="list-copy"></a>
-<dt class=proc-def><code class=proc-def>list-copy</code><var> flist -&gt; flist</var>
-<dd class=proc-def>
-    Copies the spine of the argument.
-    
-<!--
-==== circular-list
-============================================================================-->
-<a name="circular-list"></a>
-<dt class=proc-def><code class=proc-def>circular-list</code><var> elt<sub>1</sub> elt<sub>2</sub> ... -&gt; list</var>
-<dd class=proc-def>
-    Constructs a circular list of the elements.
-<pre class=code-example>
-(circular-list 'z 'q) =&gt; (z q z q z q ...)
-</pre>
-
-<!--
-==== iota
-============================================================================-->
-<a name="iota"></a>
-<dt class=proc-def><code class=proc-def>iota</code><var> count [start step] -&gt; list</var>
-<dd class=proc-def>
-    Returns a list containing the elements
-<pre class=code-example>
-(<var>start</var> <var>start</var>+<var>step</var> ... <var>start</var>+(<var>count</var>-1)*<var>step</var>)
-</pre>
-    The <var>start</var> and <var>step</var> parameters default to 0 and 1, respectively.
-    This procedure takes its name from the APL primitive.
-
-<pre class=code-example>
-(iota 5) =&gt; (0 1 2 3 4)
-(iota 5 0 -0.1) =&gt; (0 -0.1 -0.2 -0.3 -0.4)
-</pre>
-</dl>
-
-<!--========================================================================-->
-<h2><a name="Predicates">Predicates</a></h2>
-<p>
-Note: the predicates <code>proper-list?</code>, <code>circular-list?</code>, and <code>dotted-list?</code>
-partition the entire universe of Scheme values.
-
-<dl>
-<!--
-==== proper-list?
-============================================================================-->
-<dt class=proc-def>
-<code class=proc-def>proper-list?</code><var> x -&gt; boolean</var>
-<a name="proper-list-p"></a>
-<dd class=proc-def>
-    Returns true iff <var>x</var> is a proper list -- a finite, nil-terminated list.
-<p>
-    More carefully: The empty list is a proper list. A pair whose cdr is a 
-    proper list is also a proper list:
-<pre>
-&lt;proper-list&gt; ::= ()                            (Empty proper list)
-              |   (cons &lt;x&gt; &lt;proper-list&gt;)      (Proper-list pair)
-</pre>
-    Note that this definition rules out circular lists. This
-    function is required to detect this case and return false.
-<p>
-    Nil-terminated lists are called "proper" lists by <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> and <a href="#CommonLisp">Common Lisp</a>.
-    The opposite of proper is improper.
-<p>
-    <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> binds this function to the variable <code>list?</code>.
-<p>
-<pre>
-(not (proper-list? <var>x</var>)) = (or (dotted-list? <var>x</var>) (circular-list? <var>x</var>))
-</pre>
-
-<!--
-==== circular-list?
-============================================================================-->
-<a name="circular-list-p"></a>
-<dt class=proc-def><code class=proc-def>circular-list?</code><var> x -&gt; boolean</var>
-<dd class=proc-def>
-    True if <var>x</var> is a circular list. A circular list is a value such that
-    for every <var>n</var> &gt;= 0, cdr<sup><var>n</var></sup>(<var>x</var>) is a pair.
-<p>
-    Terminology: The opposite of circular is finite.
-<pre>
-(not (circular-list? <var>x</var>)) = (or (proper-list? <var>x</var>) (dotted-list? <var>x</var>))
-</pre>
-
-<!--
-==== dotted-list?
-============================================================================-->
-<a name="dotted-list-p"></a>
-<dt class=proc-def><code class=proc-def>dotted-list?</code><var> x -&gt; boolean</var>
-<dd class=proc-def>
-    True if <var>x</var> is a finite, non-nil-terminated list. That is, there exists
-    an <var>n</var> &gt;= 0 such that cdr<sup><var>n</var></sup>(<var>x</var>) is neither a pair nor (). 
-    This includes
-    non-pair, non-() values (<em>e.g.</em> symbols, numbers), 
-    which are considered to be dotted lists of length 0.
-<pre>
-(not (dotted-list? <var>x</var>)) = (or (proper-list? <var>x</var>) (circular-list? <var>x</var>))
-</pre>
-
-<!--
-==== pair?
-============================================================================-->
-<a name="pair-p"></a>
-<dt class=proc-def><code class=proc-def>pair?</code><var> object -&gt; boolean</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-    Returns #t if <var>object</var> is a pair; otherwise, #f.
-<pre class=code-example>
-(pair? '(a . b)) =>  #t
-(pair? '(a b c)) =>  #t
-(pair? '())      =>  #f
-(pair? '#(a b))  =>  #f
-(pair? 7)        =>  #f
-(pair? 'a)       =>  #f
-</pre>
-
-<!--
-==== null?
-============================================================================-->
-<a name="null-p"></a>
-<dt class=proc-def><code class=proc-def>null?</code><var> object -&gt; boolean</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-    Returns #t if <var>object</var> is the empty list; otherwise, #f.
-
-<!--
-==== null-list?
-============================================================================-->
-<a name="null-list-p"></a>
-<dt class=proc-def><code class=proc-def>null-list?</code><var> list -&gt; boolean</var>
-<dd class=proc-def>
-    <var>List</var> is a proper or circular list. This procedure returns true if
-    the argument is the empty list (), and false otherwise. It is an
-    error to pass this procedure a value which is not a proper or
-    circular list.
-
-    This procedure is recommended as the termination condition for 
-    list-processing procedures that are not defined on dotted lists.
-
-<!--
-==== not-pair?
-============================================================================-->
-<dt class=proc-def>
-<a name="not-pair-p"></a>
-<code class=proc-def>not-pair?</code><var> x -&gt; boolean</var>
-<dd class=proc-def>
-    <pre>(lambda (x) (not (pair? x)))</pre>
-    Provided as a procedure as it can be useful as the termination condition
-    for list-processing procedures that wish to handle all finite lists,
-    both proper and dotted.
-
-<!--
-==== list=
-============================================================================-->
-<dt class=proc-def>
-<a name="list="></a>
-<code class=proc-def>list=</code><var> elt= list<sub>1</sub> ... -&gt; boolean</var>
-<dd class=proc-def>
-    Determines list equality, given an element-equality procedure.
-    Proper list <var>A</var> equals proper list <var>B</var> 
-    if they are of the same length,
-    and their corresponding elements are equal, 
-    as determined by <var>elt=</var>. 
-    If the element-comparison procedure's first argument is
-    from <var>list<sub>i</sub></var>, 
-    then its second argument is from <var>list<sub>i+1</sub></var>, 
-    <em>i.e.</em> it is always called as
-        <code>(<var>elt=</var> <var>a</var> <var>b</var>)</code>
-    for <var>a</var> an element of list <var>A</var>, 
-    and <var>b</var> an element of list <var>B</var>.
-<p>
-    In the <var>n</var>-ary case, 
-    every <var>list<sub>i</sub></var> is compared to 
-    <var>list<sub>i+1</sub></var> 
-    (as opposed, for example, to comparing 
-    <var>list<sub>1</sub></var> to every <var>list<sub>i</sub></var>, 
-    for <var>i</var>>1). 
-    If there are no list arguments at all, 
-    <code>list=</code> simply returns true.
-<p>
-    It is an error to apply <code>list=</code> to anything except proper lists.
-    While
-    implementations may choose to extend it to circular lists, note that it
-    cannot reasonably be extended to dotted lists, as it provides no way to
-    specify an equality procedure for comparing the list terminators.
-<p>
-    Note that the dynamic order in which the <var>elt=</var> procedure is
-    applied to pairs of elements is not specified. 
-    For example, if <code>list=</code> is applied
-    to three lists, <var>A</var>, <var>B</var>, and <var>C</var>, 
-    it may first completely compare <var>A</var> to <var>B</var>,
-    then compare <var>B</var> to <var>C</var>, 
-    or it may compare the first elements of <var>A</var> and <var>B</var>,
-    then the first elements of <var>B</var> and <var>C</var>, 
-    then the second elements of <var>A</var> and <var>B</var>, and so forth.
-<p>
-    The equality procedure must be consistent with <code>eq?</code>. 
-    That is, it must be the case that
-<div class=indent>
-        <code>(eq? <var>x</var> <var>y</var>)</code> => <code>(<var>elt=</var> <var>x</var> <var>y</var>)</code>.
-</div>
-    Note that this implies that two lists which are <code>eq?</code> 
-    are always <var>list=</var>, as well; implementations may exploit this
-    fact to "short-cut" the element-by-element comparisons.
-<pre class=code-example>
-(list= eq?) => #t       ; Trivial cases
-(list= eq? '(a)) => #t
-</pre>
-
-</dl>
-
-
-<!--========================================================================-->
-<h2><a name="Selectors">Selectors</a></h2>
-<dl>
-
-<!--
-==== car cdr
-============================================================================-->
-<a name="car"></a>
-<a name="cdr"></a>
-<dt class=proc-def1><code class=proc-def>car</code><var> pair -&gt; value</var>
-<dt class=proc-defn><code class=proc-def>cdr</code><var> pair -&gt; value</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-    These functions return the contents of the car and cdr field of their
-    argument, respectively.
-    Note that it is an error to apply them to the empty list.
-<pre class=code-example>
-(car '(a b c))     =>  a             (cdr '(a b c))     =>  (b c)  
-(car '((a) b c d)) =>  (a)	     (cdr '((a) b c d)) =>  (b c d)
-(car '(1 . 2))     =>  1	     (cdr '(1 . 2))     =>  2      
-(car '())          =>  *error*	     (cdr '())          =>  *error*
-</pre>
-
-
-
-<!--
-==== caar cadr ... cdddar cddddr
-============================================================================-->
-<a name="caar"></a>
-<a name="cadr"></a>
-<a name="cdddar"></a>
-<a name="cddddr"></a>
-<dt class=proc-def1><code class=proc-def>caar</code><var> pair -&gt; value</var>
-<dt class=proc-defi><code class=proc-def>cadr</code><var> pair -&gt; value</var>
-<dt class=proc-defi><code class=proc-def>:</code>
-<dt class=proc-defi><code class=proc-def>cdddar</code><var> pair -&gt; value</var>
-<dt class=proc-defn><code class=proc-def>cddddr</code><var> pair -&gt; value</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-    These procedures are compositions of <code>car</code> and <code>cdr</code>,
-    where for example <code>caddr</code> could be defined by
-<pre class=code-example>    
-(define caddr (lambda (x) (car (cdr (cdr x))))).
-</pre>
-    Arbitrary compositions, up to four deep, are provided.  There are
-    twenty-eight of these procedures in all.
-
-<!--
-==== list-ref
-============================================================================-->
-<a name="list-ref"></a>
-<dt class=proc-def><code class=proc-def>list-ref</code><var> clist i -&gt; value</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-    Returns the <var>i</var><sup>th</sup> element of <var>clist</var>.  
-    (This is the same as the car of 
-        <code>(drop <var>clist</var> <var>i</var>)</code>.)
-    It is an error if <var>i</var> >= <var>n</var>, 
-    where <var>n</var> is the length of <var>clist</var>.
-<pre class=code-example>    
-(list-ref '(a b c d) 2) => c
-</pre>    
-
-<!--
-==== tenth
-==== ninth
-==== eighth
-==== seventh
-==== sixth
-==== fifth
-==== fourth
-==== third
-==== second
-==== first
-============================================================================-->
-<dt class=proc-def1>
-<a name="first"></a>
-<code class=proc-def>first&nbsp;&nbsp;&nbsp;</code><var>pair -&gt; object </var>
-<dt class=proc-defi>
-<a name="second"></a>
-<code class=proc-def>second&nbsp;&nbsp;</code><var>pair -&gt; object </var>
-<dt class=proc-defi>
-<a name="third"></a>
-<code class=proc-def>third&nbsp;&nbsp;&nbsp;</code><var>pair -&gt; object </var>
-<dt class=proc-defi>
-<a name="fourth"></a>
-<code class=proc-def>fourth&nbsp;&nbsp;</code><var>pair -&gt; object </var>
-<dt class=proc-defi>
-<a name="fifth"></a>
-<code class=proc-def>fifth&nbsp;&nbsp;&nbsp;</code><var>pair -&gt; object </var>
-<dt class=proc-defi>
-<a name="sixth"></a>
-<code class=proc-def>sixth&nbsp;&nbsp;&nbsp;</code><var>pair -&gt; object </var>
-<dt class=proc-defi>
-<a name="seventh"></a>
-<code class=proc-def>seventh&nbsp;</code><var>pair -&gt; object </var>
-<dt class=proc-defi>
-<a name="eighth"></a>
-<code class=proc-def>eighth&nbsp;&nbsp;</code><var>pair -&gt; object </var>
-<dt class=proc-defi>
-<a name="ninth"></a>
-<code class=proc-def>ninth&nbsp;&nbsp;&nbsp;</code><var>pair -&gt; object </var>
-<dt class=proc-defn>
-<a name="tenth"></a>
-<code class=proc-def>tenth&nbsp;&nbsp;&nbsp;</code><var>pair -&gt; object  </var>
-<dd class=proc-def>
-    Synonyms for <code>car</code>, <code>cadr</code>, <code>caddr</code>, ... 
-
-<pre class=code-example>
-(third '(a b c d e)) =&gt; c
-</pre>
-
-<!--
-==== car+cdr
-============================================================================-->
-<dt class=proc-def>
-<a name="car+cdr"></a>
-<code class=proc-def>car+cdr</code><var> pair -&gt; [x y]</var>
-<dd class=proc-def>
-    The fundamental pair deconstructor:
-<pre class=code-example>
-(lambda (p) (values (car p) (cdr p)))
-</pre>
-    This can, of course, be implemented more efficiently by a compiler.
-
-<!--
-==== drop
-==== take
-============================================================================-->
-<dt class=proc-def1>
-<a name="take"></a>
-<code class=proc-def>take</code><var> x i -&gt; list</var>
-<dt class=proc-defn>
-<a name="drop"></a>
-<code class=proc-def>drop</code><var> x i -&gt; object</var>
-<dd class=proc-def>
-    <code>take</code> returns the first <var>i</var> elements of list <var>x</var>.<br>
-    <code>drop</code> returns all but the first <var>i</var> elements of list <var>x</var>.
-<pre class=code-example>
-(take '(a b c d e)  2) =&gt; (a b)
-(drop '(a b c d e)  2) =&gt; (c d e)
-</pre>
-    <var>x</var> may be any value -- a proper, circular, or dotted list:
-<pre class=code-example>
-(take '(1 2 3 . d) 2) =&gt; (1 2)
-(drop '(1 2 3 . d) 2) =&gt; (3 . d)
-(take '(1 2 3 . d) 3) =&gt; (1 2 3)
-(drop '(1 2 3 . d) 3) =&gt; d
-</pre>
-    For a legal <var>i</var>, <code>take</code> and <code>drop</code> partition the list in a manner which
-    can be inverted with <code>append</code>:
-<pre class=code-example>
-(append (take <var>x</var> <var>i</var>) (drop <var>x</var> <var>i</var>)) = <var>x</var>
-</pre>
-    <code>drop</code> is exactly equivalent to performing <var>i</var> cdr operations on <var>x</var>;
-    the returned value shares a common tail with <var>x</var>.
-
-    If the argument is a list of non-zero length, <code>take</code> is guaranteed to
-    return a freshly-allocated list, even in the case where the entire
-    list is taken, <em>e.g.</em> <code>(take lis (length lis))</code>.
-
-<!--
-==== drop-right
-==== take-right
-============================================================================-->
-<dt class=proc-def1>
-<a name="take-right"></a>
-<code class=proc-def>take-right</code><var> flist i -&gt; object</var>
-<dt class=proc-defn>
-<a name="drop-right"></a>
-<code class=proc-def>drop-right</code><var> flist i -&gt; list</var>
-<dd class=proc-def>
-    <code>take-right</code> returns the last <var>i</var> elements of <var>flist</var>.<br>
-    <code>drop-right</code> returns all but the last <var>i</var> elements of <var>flist</var>.
-<pre class=code-example>
-(take-right '(a b c d e) 2) =&gt; (d e)
-(drop-right '(a b c d e) 2) =&gt; (a b c)
-</pre>
-    The returned list may share a common tail with the argument list.
-<p>
-    <var>flist</var> may be any finite list, either proper or dotted:
-<pre class=code-example>
-(take-right '(1 2 3 . d) 2) =&gt; (2 3 . d)
-(drop-right '(1 2 3 . d) 2) =&gt; (1)
-(take-right '(1 2 3 . d) 0) =&gt; d
-(drop-right '(1 2 3 . d) 0) =&gt; (1 2 3)
-</pre>
-    For a legal <var>i</var>, <code>take-right</code> and <code>drop-right</code> partition the list in a manner 
-    which can be inverted with <code>append</code>:
-<pre class=code-example>
-(append (take <var>flist</var> <var>i</var>) (drop <var>flist</var> <var>i</var>)) = <var>flist</var>
-</pre>
-    <code>take-right</code>'s return value is guaranteed to share a common tail with <var>flist</var>.
-
-    If the argument is a list of non-zero length, <code>drop-right</code> is guaranteed to
-    return a freshly-allocated list, even in the case where nothing is
-    dropped, <em>e.g.</em> <code>(drop-right lis 0)</code>.
-
-<!--
-==== drop-right!
-==== take!
-============================================================================-->
-<dt class=proc-def1>
-<a name="take!"></a>
-<code class=proc-def>take!</code><var>        x     i -&gt; list</var>
-<dt class=proc-defn>
-<a name="drop-right!"></a>
-<code class=proc-def>drop-right!</code><var>  flist i -&gt; list</var>
-<dd class=proc-def>
-    <code>take!</code> and <code>drop-right!</code> are "linear-update" variants of <code>take</code> and
-    <code>drop-right</code>: the procedure is allowed, but not required, to alter the
-    argument list to produce the result.
-<p>
-    If <var>x</var> is circular, <code>take!</code> may return a shorter-than-expected list:
-<pre class=code-example>
-(take! (circular-list 1 3 5) 8) =&gt; (1 3)
-(take! (circular-list 1 3 5) 8) =&gt; (1 3 5 1 3 5 1 3)
-</pre>
-
-
-<!--
-==== split-at! 
-==== split-at
-============================================================================-->
-<dt class=proc-def1>
-<a name="split-at"></a>
-<code class=proc-def>split-at&nbsp;</code><var> x i -&gt; [list object]</var>
-<dt class=proc-defn>
-<a name="split-at!"></a>
-<code class=proc-def>split-at!</code><var> x i -&gt; [list object]</var>
-<dd class=proc-def>
-    <code>split-at</code> splits the list <var>x</var> 
-    at index <var>i</var>, returning a list of the 
-    first <var>i</var> elements, and the remaining tail. It is equivalent
-    to
-<pre class=code-example>
-(values (take x i) (drop x i))
-</pre>
-    <code>split-at!</code> is the linear-update variant. It is allowed, but not
-    required, to alter the argument list to produce the result.
-<pre class=code-example>
-(split-at '(a b c d e f g h) 3) =>
-    (a b c)
-    (d e f g h)
-</pre>
-
-
-<!--
-==== last-pair
-==== last
-============================================================================-->
-<dt class=proc-def1>
-<a name="last"></a>
-<code class=proc-def>last</code><var> pair -&gt; object</var>
-<dt class=proc-defn>
-<a name="last-pair"></a>
-<code class=proc-def>last-pair</code><var> pair -&gt; pair</var>
-<dd class=proc-def>
-    <code>last</code> returns the last element of the non-empty, 
-    finite list <var>pair</var>.
-    <code>last-pair</code> returns the last pair in the non-empty,
-    finite list <var>pair</var>.
-
-<pre class=code-example>
-(last '(a b c)) =&gt; c
-(last-pair '(a b c)) =&gt; (c)
-</pre>
-
-</dl>
-
-<!--========================================================================-->
-<h2><a name="Miscellaneous">Miscellaneous: length, append, concatenate, reverse, zip &amp; count</a></h2>
-
-<dl>
-<!--
-==== length+
-==== length
-============================================================================-->
-<dt class=proc-def1>
-<a name="length"></a>
-<code class=proc-def>length&nbsp;&nbsp;</code><var>list -&gt; integer</var>
-<dt class=proc-defn>
-<a name="length+"></a>
-<code class=proc-def>length+&nbsp;</code><var>clist -&gt; integer or #f</var>
-<dd class=proc-def>
-    Both <code>length</code> and <code>length+</code> return the length of the argument.
-    It is an error to pass a value to <code>length</code> which is not a proper
-    list (finite and nil-terminated). In particular, this means an
-    implementation may diverge or signal an error when <code>length</code> is
-    applied to a circular list.
-<p>    
-    <code>length+</code>, on the other hand, returns <code>#F</code> when applied to a circular
-    list.
-<p>    
-    The length of a proper list is a non-negative integer <var>n</var> such that <code>cdr</code> 
-    applied <var>n</var> times to the list produces the empty list.
-
-
-<!--
-==== append append!
-============================================================================-->
-<dt class=proc-def1>
-<a name="append"></a>
-<code class=proc-def>append&nbsp;</code><var> list<sub>1</sub> ... -&gt; list</var>
-<dt class=proc-defn>
-<a name="append!"></a>
-<code class=proc-def>append!</code><var> list<sub>1</sub> ... -&gt; list</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-    <code>append</code> returns a list consisting of the elements 
-    of <var>list<sub>1</sub></var>
-    followed by the elements of the other list parameters.
-<pre class=code-example>
-(append '(x) '(y))        =>  (x y)
-(append '(a) '(b c d))    =>  (a b c d)
-(append '(a (b)) '((c)))  =>  (a (b) (c))
-</pre>
-    The resulting list is always newly allocated, except that it
-    shares structure with the final <var>list<sub>i</sub></var> argument.  
-    This last argument may be any value at all; 
-    an improper list results if it is not
-    a proper list. All other arguments must be proper lists.
-<pre class=code-example>
-(append '(a b) '(c . d))  =>  (a b c . d)
-(append '() 'a)           =>  a
-(append '(x y))           =>  (x y)
-(append)                  =>  ()
-</pre>
-
-    <code>append!</code> is the "linear-update" variant of <code>append</code>
-    -- it is allowed, but not required, to alter cons cells in the argument
-    lists to construct the result list. 
-    The last argument is never altered; the result
-    list shares structure with this parameter.
-
-<!--
-==== concatenate concatenate!
-============================================================================-->
-<dt class=proc-def1>
-<a name="concatenate"></a>
-<code class=proc-def>concatenate&nbsp;</code><var> list-of-lists -&gt; value</var>
-<dt class=proc-defn>
-<a name="concatenate!"></a>
-<code class=proc-def>concatenate!</code><var> list-of-lists -&gt; value</var>
-<dd class=proc-def>
-    These functions append the elements of their argument together.
-    That is, <code>concatenate</code> returns
-<pre class=code-example>
-(apply append list-of-lists)
-</pre>
-    or, equivalently,
-<pre class=code-example>
-(reduce-right append '() list-of-lists)
-</pre>
-
-    <code>concatenate!</code> is the linear-update variant, defined in
-    terms of <code>append!</code> instead of <code>append</code>.
-    
-<p>
-    Note that some Scheme implementations do not support passing more than a
-    certain number (<em>e.g.</em>, 64) of arguments to an n-ary procedure.  
-    In these implementations, the <code>(apply append ...)</code> idiom
-    would fail when applied to long lists, 
-    but <code>concatenate</code> would continue to function properly.
-
-<p>
-    As with <code>append</code> and <code>append!</code>, 
-    the last element of the input list may be any value at all.
-
-<!--
-==== reverse reverse!
-============================================================================-->
-<dt class=proc-def1>
-<a name="reverse"></a>
-<code class=proc-def>reverse&nbsp;</code><var> list -&gt; list</var>
-<dt class=proc-defn>
-<a name="reverse!"></a>
-<code class=proc-def>reverse!</code><var> list -&gt; list</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-
-    <code>reverse</code> returns a newly allocated list consisting of
-    the elements of <var>list</var> in reverse order.
-<pre class=code-example>
-(reverse '(a b c)) =>  (c b a)
-(reverse '(a (b c) d (e (f))))
-    =>  ((e (f)) d (b c) a)
-</pre>
-    <code>reverse!</code> is the linear-update variant of <code>reverse</code>.
-    It is permitted, but not required, to alter the argument's cons cells 
-    to produce the reversed list.
-
-
-<!--
-==== append-reverse!
-==== append-reverse
-============================================================================-->
-<dt class=proc-def1>
-<a name="append-reverse"></a>
-<code class=proc-def>append-reverse&nbsp;&nbsp;</code><var>rev-head tail -&gt; list</var>
-<dt class=proc-defn>
-<a name="append-reverse!"></a>
-<code class=proc-def>append-reverse!&nbsp;</code><var>rev-head tail -&gt; list</var>
-<dd class=proc-def>
-    <code>append-reverse</code> returns
-	<code>(append (reverse <var>rev-head</var>) <var>tail</var>)</code>.
-    It is provided because it is a common operation -- a common
-    list-processing style calls for this exact operation to transfer values
-    accumulated in reverse order onto the front of another list, and because
-    the implementation is significantly more efficient than the simple
-    composition it replaces. (But note that this pattern of iterative 
-    computation followed by a reverse can frequently be rewritten as a 
-    recursion, dispensing with the <code>reverse</code> and <code>append-reverse</code> steps, and 
-    shifting temporary, intermediate storage from the heap to the stack, 
-    which is typically a win for reasons of cache locality and eager storage 
-    reclamation.)
-<p>
-    <code>append-reverse!</code> is just the linear-update variant -- it is allowed, but
-    not required, to alter <var>rev-head</var>'s cons cells to construct the result.
-
-<!--
-==== zip
-============================================================================-->
-<a name="zip"></a>
-<dt class=proc-def><code class=proc-def>zip</code> <var>clist<sub>1</sub> clist<sub>2</sub> ... -&gt; list</var>
-<dd class=proc-def>
-<pre>(lambda lists (apply map list lists))
-</pre>
-    If <code>zip</code> is passed <var>n</var> lists, it returns a list as long as the shortest
-    of these lists, each element of which is an <var>n</var>-element list comprised
-    of the corresponding elements from the parameter lists.
-
-<pre class=code-example>
-(zip '(one two three) 
-     '(1 2 3)
-     '(odd even odd even odd even odd even))
-    =&gt; ((one 1 odd) (two 2 even) (three 3 odd))
-
-(zip '(1 2 3)) =&gt; ((1) (2) (3))
-</pre>
-    At least one of the argument lists must be finite:
-<pre class=code-example>
-(zip '(3 1 4 1) (circular-list #f #t)) 
-    => ((3 #f) (1 #t) (4 #f) (1 #t))
-</pre>
-
-<!--
-==== unzip5
-==== unzip4
-==== unzip3
-==== unzip2
-==== unzip1
-============================================================================-->
-<a name="unzip1"></a>
-<dt class=proc-def1>  <code class=proc-def>unzip1</code><var> list -&gt; list</var>
-<a name="unzip2"></a>
-<dt class=proc-defi> <code class=proc-def>unzip2</code><var> list -&gt; [list list]</var>
-<a name="unzip3"></a>
-<dt class=proc-defi> <code class=proc-def>unzip3</code><var> list -&gt; [list list list]</var>
-<a name="unzip4"></a>
-<dt class=proc-defi> <code class=proc-def>unzip4</code><var> list -&gt; [list list list list]</var>
-<a name="unzip5"></a>
-<dt class=proc-defn> <code class=proc-def>unzip5</code><var> list -&gt; [list list list list list]</var>
-<dd class=proc-def>
-    <code>unzip1</code> takes a list of lists, 
-    where every list must contain at least one element, 
-    and returns a list containing the initial element of each such list. 
-    That is, it returns <code>(map car lists)</code>.  
-    <code>unzip2</code> takes a list of lists, where every list must contain at least
-    two elements, and returns two values: a list of the first elements,
-    and a list of the second elements. <code>unzip3</code> does the same for the first
-    three elements of the lists, and so forth.
-
-<pre class=code-example>
-(unzip2 '((1 one) (2 two) (3 three))) =&gt;
-    (1 2 3) 
-    (one two three)
-</pre>
-
-<!--
-==== count
-============================================================================-->
-<dt class=proc-def>
-<a name="count"></a>
-<code class=proc-def>count</code><var> pred clist<sub>1</sub> clist<sub>2</sub> -&gt; integer</var>
-<dd class=proc-def>
-    <var>pred</var> is a procedure taking as many arguments as there
-    are lists and returning a single value. It is applied 
-    element-wise to the elements of the <var>list</var>s, and a count is
-    tallied of the number of elements that produce a true value. This count
-    is returned. <code>count</code> is "iterative" in that it is guaranteed
-    to apply <var>pred</var> to the <var>list</var> elements in a
-    left-to-right order.
-    The counting stops when the shortest list expires.
-<pre class=code-example>
-(count even? '(3 1 4 1 5 9 2 5 6)) => 3
-(count < '(1 2 4 8) '(2 4 6 8 10 12 14 16)) => 3
-</pre>
-    At least one of the argument lists must be finite:
-<pre class=code-example>
-(count < '(3 1 4 1) (circular-list 1 10)) => 2
-</pre>
-
-</dl>
-
-<!--========================================================================-->
-<h2><a name="FoldUnfoldMap">Fold, unfold &amp; map</a></h2>
-<dl>
-<!--
-==== fold
-============================================================================-->
-<dt class=proc-def>
-<a name="fold"></a>
-<code class=proc-def>fold</code><var> kons knil clist<sub>1</sub> clist<sub>2</sub> ... -&gt; value</var>
-<dd class=proc-def>
-    The fundamental list iterator. 
-<p>
-    First, consider the single list-parameter case. If <var>clist<sub>1</sub></var> = (<var>e<sub>1</sub></var> <var>e<sub>2</sub></var> ... <var>e<sub>n</sub></var>),
-    then this procedure returns
-<div class=indent>
-<code>(<var>kons</var> <var>e<sub>n</sub></var> ... (<var>kons</var> <var>e<sub>2</sub></var> (<var>kons</var> <var>e<sub>1</sub></var> <var>knil</var>)) ... )</code>
-</div>
-    That is, it obeys the (tail) recursion
-<pre class=code-example>
-(fold <var>kons</var> <var>knil</var> <var>lis</var>) = (fold <var>kons</var> (<var>kons</var> (car <var>lis</var>) <var>knil</var>) (cdr <var>lis</var>))
-(fold <var>kons</var> <var>knil</var> '()) = <var>knil</var>
-</pre>
-
-    Examples:
-<pre class=code-example>
-(fold + 0 lis)			; Add up the elements of LIS.
-
-(fold cons '() lis)		; Reverse LIS.
-
-(fold cons tail rev-head)	; See APPEND-REVERSE.
-
-;; How many symbols in LIS?
-(fold (lambda (x count) (if (symbol? x) (+ count 1) count))
-      0
-      lis)
-
-;; Length of the longest string in LIS:
-(fold (lambda (s max-len) (max max-len (string-length s)))
-      0
-      lis)
-</pre>
-
-    If <var>n</var> list arguments are provided, then the <var>kons</var> function must take
-    <var>n</var>+1 parameters: one element from each list, and the "seed" or fold
-    state, which is initially <var>knil</var>. The fold operation terminates when
-    the shortest list runs out of values:
-<pre class=code-example>
-(fold cons* '() '(a b c) '(1 2 3 4 5)) =&gt; (c 3 b 2 a 1)
-</pre>
-    At least one of the list arguments must be finite.
-
-<!--
-==== fold-right
-============================================================================-->
-<dt class=proc-def>
-<a name="fold-right"></a>
-<code class=proc-def>fold-right</code><var> kons knil clist<sub>1</sub> clist<sub>2</sub> ... -&gt; value</var>
-<dd class=proc-def>
-    The fundamental list recursion operator. 
-<p>
-    First, consider the single list-parameter case. If <var>clist<sub>1</sub></var> = <code>(<var>e<sub>1</sub></var> <var>e<sub>2</sub></var> ... <var>e<sub>n</sub></var>)</code>, 
-    then this procedure returns
-<div class=indent><code>
-(<var>kons</var> <var>e<sub>1</sub></var> (<var>kons</var> <var>e<sub>2</sub></var> ... (<var>kons</var> <var>e<sub>n</sub></var> <var>knil</var>)))
-</code></div>
-    That is, it obeys the recursion
-<pre class=code-example>
-(fold-right <var>kons</var> <var>knil</var> <var>lis</var>) = (<var>kons</var> (car <var>lis</var>) (fold-right <var>kons</var> <var>knil</var> (cdr <var>lis</var>)))
-(fold-right <var>kons</var> <var>knil</var> '()) = <var>knil</var>
-</pre>
-        
-    Examples:
-<pre class=code-example>
-(fold-right cons '() lis)		; Copy LIS.
-
-;; Filter the even numbers out of LIS.
-(fold-right (lambda (x l) (if (even? x) (cons x l) l)) '() lis))
-</pre>
-
-    If <var>n</var> list arguments are provided, then the <var>kons</var> function must take
-    <var>n</var>+1 parameters: one element from each list, and the "seed" or fold
-    state, which is initially <var>knil</var>. The fold operation terminates when
-    the shortest list runs out of values:
-<pre class=code-example>
-(fold-right cons* '() '(a b c) '(1 2 3 4 5)) =&gt; (a 1 b 2 c 3)
-</pre>
-    At least one of the list arguments must be finite.
-
-<!--
-==== pair-fold
-============================================================================-->
-<dt class=proc-def>
-<a name="pair-fold"></a>
-<code class=proc-def>pair-fold</code><var> kons knil clist<sub>1</sub> clist<sub>2</sub> ... -&gt; value</var>
-<dd class=proc-def>
-    Analogous to <code>fold</code>, but <var>kons</var> is applied to successive sublists of the 
-    lists, rather than successive elements -- that is, <var>kons</var> is applied to the
-    pairs making up the lists, giving this (tail) recursion:
-<pre class=code-example>
-(pair-fold <var>kons</var> <var>knil</var> <var>lis</var>) = (let ((tail (cdr <var>lis</var>)))
-                              (pair-fold <var>kons</var> (<var>kons</var> <var>lis</var> <var>knil</var>) tail))
-(pair-fold <var>kons</var> <var>knil</var> <code>'()</code>) = <var>knil</var>
-</pre>
-    For finite lists, the <var>kons</var> function may reliably apply
-    <code>set-cdr!</code> to the pairs it is given
-    without altering the sequence of execution.
-<p>
-    Example:
-<pre class=code-example>
-;;; Destructively reverse a list.
-(pair-fold (lambda (pair tail) (set-cdr! pair tail) pair) '() lis))
-</pre>
-
-    At least one of the list arguments must be finite.
-
-    
-<!--
-==== pair-fold-right
-============================================================================-->
-<dt class=proc-def>
-<a name="pair-fold-right"></a>
-<code class=proc-def>pair-fold-right</code><var> kons knil clist<sub>1</sub> clist<sub>2</sub> ... -&gt; value</var>
-<dd class=proc-def>
-    Holds the same relationship with <code>fold-right</code> that <code>pair-fold</code> holds with <code>fold</code>.
-    Obeys the recursion
-<pre class=code-example>
-(pair-fold-right <var>kons</var> <var>knil</var> <var>lis</var>) = 
-    (<var>kons</var> <var>lis</var> (pair-fold-right <var>kons</var> <var>knil</var> (cdr <var>lis</var>)))
-(pair-fold-right <var>kons</var> <var>knil</var> <code>'()</code>) = <var>knil</var>
-</pre>
-    
-    Example:
-<pre class=code-example>
-(pair-fold-right cons '() '(a b c)) =&gt; ((a b c) (b c) (c))
-</pre>
-
-    At least one of the list arguments must be finite.
-
-<!--
-==== reduce
-============================================================================-->
-<dt class=proc-def>
-<a name="reduce"></a>
-<code class=proc-def>reduce</code><var> f ridentity list -&gt; value</var>
-<dd class=proc-def>
-    <code>reduce</code> is a variant of <code>fold</code>. 
-<p>
-    <var>ridentity</var> should be a "right identity" of the procedure <var>f</var> -- that is, 
-    for any value <var>x</var> acceptable to <var>f</var>,
-<pre class=code-example>
-(<var>f</var> <var>x</var> <var>ridentity</var>) = <var>x</var>
-</pre>
-    
-    <code>reduce</code> has the following definition:
-<div class=indent>
-If <var>list</var> = (),  return <var>ridentity</var>;<br>
-Otherwise,    return <code>(fold <var>f</var> (car <var>list</var>) (cdr <var>list</var>))</code>.
-</div>
-    ...in other words, we compute 
-    <code>(fold <var>f</var> <var>ridentity</var> <var>list</var>)</code>.
-<p>
-    Note that <var>ridentity</var> is used <em>only</em> in the empty-list case.
-    You typically use <code>reduce</code> when applying <var>f</var> is expensive and you'd
-    like to avoid the extra application incurred when <code>fold</code> applies
-    <var>f</var> to the head of <var>list</var> and the identity value,
-    redundantly producing the same value passed in to <var>f</var>. 
-    For example, if <var>f</var> involves searching a file directory or 
-    performing a database query, this can be significant. 
-    In general, however, <code>fold</code> is useful in many contexts where <code>reduce</code> is not
-    (consider the examples given in the <code>fold</code> definition -- only one of the
-    five folds uses a function with a right identity. 
-    The other four may not be performed with <code>reduce</code>).
-
-<p>
-    Note: MIT Scheme and Haskell flip F's arg order for their <code>reduce</code> and
-    <code>fold</code> functions.
-
-<pre class=code-example>
-;; Take the max of a list of non-negative integers.
-(reduce max 0 nums) ; i.e., (apply max 0 nums)
-</pre>
-
-<!--
-==== reduce-right
-============================================================================-->
-<dt class=proc-def>
-<a name="reduce-right"></a>
-<code class=proc-def>reduce-right</code><var> f ridentity list -&gt; value</var>
-<dd class=proc-def>
-    <code>reduce-right</code> is the fold-right variant of <code>reduce</code>.
-    It obeys the following definition:
-<pre class=code-example>
-(reduce-right <var>f</var> <var>ridentity</var> '()) = <var>ridentity</var>
-(reduce-right <var>f</var> <var>ridentity</var> '(<var>e<sub>1</sub></var>)) = (<var>f</var> <var>e<sub>1</sub></var> <var>ridentity</var>) = <var>e<sub>1</sub></var>
-(reduce-right <var>f</var> <var>ridentity</var> '(<var>e<sub>1</sub></var> <var>e<sub>2</sub></var> ...)) =
-    (<var>f</var> <var>e<sub>1</sub></var> (reduce <var>f</var> <var>ridentity</var> (<var>e<sub>2</sub></var> ...)))
-</pre>
-    ...in other words, we compute 
-    <code>(fold-right <var>f</var> <var>ridentity</var> <var>list</var>)</code>.
-    
-<pre class=code-example>
-;; Append a bunch of lists together.
-;; I.e., (apply append list-of-lists)
-(reduce-right append '() list-of-lists)
-</pre>
-
-<!--
-==== unfold
-============================================================================-->
-<dt class=proc-def>
-<a name="unfold"></a>
-<code class=proc-def>unfold</code><var> p f g seed [tail-gen] -&gt; list</var>
-<dd class=proc-def>
-<code>unfold</code> is best described by its basic recursion:
-<pre class=code-example>
-(unfold <var>p</var> <var>f</var> <var>g</var> <var>seed</var>) = 
-    (if (<var>p</var> <var>seed</var>) (<var>tail-gen</var> <var>seed</var>)
-        (cons (<var>f</var> <var>seed</var>)
-              (unfold <var>p</var> <var>f</var> <var>g</var> (<var>g</var> <var>seed</var>))))
-</pre>
-<dl>
-<dt> <var>p</var> <dd> Determines when to stop unfolding.
-<dt> <var>f</var> <dd> Maps each seed value to the corresponding list element.
-<dt> <var>g</var> <dd> Maps each seed value to next seed value.
-<dt> <var>seed</var> <dd> The "state" value for the unfold.
-<dt> <var>tail-gen</var> <dd> Creates the tail of the list; 
-                              defaults to <code>(lambda (x) '())</code>
-</dl>
-<p>
-    In other words, we use <var>g</var> to generate a sequence of seed values
-<div class=indent>
-<var>seed</var>, <var>g</var>(<var>seed</var>), <var>g<sup>2</sup></var>(<var>seed</var>), <var>g<sup>3</sup></var>(<var>seed</var>), ...
-</div>
-    These seed values are mapped to list elements by <var>f</var>, 
-    producing the elements of the result list in a left-to-right order. 
-    <var>P</var> says when to stop.
-
-<p>
-    <code>unfold</code> is the fundamental recursive list constructor, 
-    just as <code>fold-right</code> is 
-    the fundamental recursive list consumer.
-    While <code>unfold</code> may seem a bit abstract
-    to novice functional programmers, it can be used in a number of ways:
-
-<pre class=code-example>
-;; List of squares: 1^2 ... 10^2
-(unfold (lambda (x) (&gt; x 10))
-        (lambda (x) (* x x))
-	(lambda (x) (+ x 1))
-	1)
-		
-(unfold null-list? car cdr lis) ; Copy a proper list.
-
-;; Read current input port into a list of values.
-(unfold eof-object? values (lambda (x) (read)) (read))
-
-;; Copy a possibly non-proper list:
-(unfold not-pair? car cdr lis 
-              values)
-
-;; Append HEAD onto TAIL:
-(unfold null-list? car cdr head 
-              (lambda (x) tail))
-</pre>
-
-    Interested functional programmers may enjoy noting that 
-    <code>fold-right</code> and <code>unfold</code>
-    are in some sense inverses. 
-    That is, given operations <var>knull?</var>, <var>kar</var>, 
-    <var>kdr</var>, <var>kons</var>, and <var>knil</var> satisfying
-<div class=indent>
-<code>(<var>kons</var> (<var>kar</var> <var>x</var>) (<var>kdr</var> <var>x</var>))</code> = <code>x</code>
-    and 
-<code>(<var>knull?</var> <var>knil</var>)</code> = <code>#t</code>
-</div>
-    then
-<div class=indent>
-<code>(fold-right <var>kons</var> <var>knil</var> (unfold <var>knull?</var> <var>kar</var> <var>kdr</var> <var>x</var>))</code> = <var>x</var>
-</div>
-    and
-<div class=indent>
-<code>(unfold <var>knull?</var> <var>kar</var> <var>kdr</var> (fold-right <var>kons</var> <var>knil</var> <var>x</var>))</code> = <var>x</var>.
-</div>
-
-    This combinator sometimes is called an "anamorphism;" when an
-    explicit <var>tail-gen</var> procedure is supplied, it is called an
-    "apomorphism."
-
-
-<!--
-==== unfold-right
-============================================================================-->
-<dt class=proc-def>
-<a name="unfold-right"></a>
-<code class=proc-def>unfold-right</code><var> p f g seed [tail] -&gt; list</var>
-<dd class=proc-def>
-    <code>unfold-right</code> constructs a list with the following loop:
-<pre class=code-example>
-(let lp ((seed seed) (lis tail))
-  (if (p seed) lis
-      (lp (g seed)
-          (cons (f seed) lis))))
-</pre>
-<dl>
-<dt> <var>p</var> <dd> Determines when to stop unfolding.
-<dt> <var>f</var> <dd> Maps each seed value to the corresponding list element.
-<dt> <var>g</var> <dd> Maps each seed value to next seed value.
-<dt> <var>seed</var> <dd> The "state" value for the unfold.
-<dt> <var>tail</var> <dd> list terminator; defaults to <code>'()</code>.
-</dl>
-<p>
-    In other words, we use <var>g</var> to generate a sequence of seed values
-<div class=indent>
-<var>seed</var>, <var>g</var>(<var>seed</var>), <var>g<sup>2</sup></var>(<var>seed</var>), <var>g<sup>3</sup></var>(<var>seed</var>), ...
-</div>
-    These seed values are mapped to list elements by <var>f</var>, 
-    producing the elements of the result list in a right-to-left order. 
-    <var>P</var> says when to stop.
-
-<p>
-    <code>unfold-right</code> is the fundamental iterative list constructor, 
-    just as <code>fold</code> is the
-    fundamental iterative list consumer. 
-    While <code>unfold-right</code> may seem a bit abstract
-    to novice functional programmers, it can be used in a number of ways:
-<pre class=code-example>
-;; List of squares: 1^2 ... 10^2
-(unfold-right zero? 
-              (lambda (x) (* x x))
-              (lambda (x) (- x 1))
-              10)
-	
-;; Reverse a proper list.
-(unfold-right null-list? car cdr lis)
-
-;; Read current input port into a list of values.
-(unfold-right eof-object? values (lambda (x) (read)) (read))
-
-;; (append-reverse rev-head tail)
-(unfold-right null-list? car cdr rev-head tail)
-</pre>
-
-    Interested functional programmers may enjoy noting that 
-    <code>fold</code> and <code>unfold-right</code>
-    are in some sense inverses. 
-    That is, given operations <var>knull?</var>, <var>kar</var>, 
-    <var>kdr</var>, <var>kons</var>, and <var>knil</var> satisfying
-<div class=indent>
-<code>(<var>kons</var> (<var>kar</var> <var>x</var>) (<var>kdr</var> <var>x</var>))</code> = <code>x</code>
-    and 
-<code>(<var>knull?</var> <var>knil</var>)</code> = <code>#t</code>
-</div>
-    then
-<div class=indent>
-<code>(fold <var>kons</var> <var>knil</var> (unfold-right <var>knull?</var> <var>kar</var> <var>kdr</var> <var>x</var>))</code> = <var>x</var>
-</div>
-    and
-<div class=indent>
-<code>(unfold-right <var>knull?</var> <var>kar</var> <var>kdr</var> (fold <var>kons</var> <var>knil</var> <var>x</var>))</code> = <var>x</var>.
-</div>
-
-    This combinator presumably has some pretentious mathematical name;
-    interested readers are invited to communicate it to the author.
-
-<!--
-==== map
-============================================================================-->
-<dt class=proc-def>
-<a name="map"></a>
-<code class=proc-def>map</code><var> proc clist<sub>1</sub> clist<sub>2</sub> ... -&gt; list</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>+]
-
-     <var>proc</var> is a procedure taking as many arguments 
-     as there are list arguments and returning a single value.  
-     <code>map</code> applies <var>proc</var> element-wise to the elements
-     of the lists and returns a list of the results, 
-     in order.  
-     The dynamic order in which <var>proc</var> 
-     is applied to the elements of the lists is unspecified.
-    
-<pre class=code-example>
-(map cadr '((a b) (d e) (g h))) =>  (b e h)
-
-(map (lambda (n) (expt n n))
-     '(1 2 3 4 5))
-    =>  (1 4 27 256 3125)
-
-(map + '(1 2 3) '(4 5 6)) =>  (5 7 9)
-
-(let ((count 0))
-  (map (lambda (ignored)
-         (set! count (+ count 1))
-         count)
-       '(a b))) =>  (1 2) <em>or</em> (2 1)
-</pre>
-
-    This procedure is extended from its 
-    <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>
-    specification to allow the arguments to be of unequal length; 
-    it terminates when the shortest list runs out. 
-<p>
-    At least one of the argument lists must be finite:
-<pre class=code-example>
-(map + '(3 1 4 1) (circular-list 1 0)) => (4 1 5 1)
-</pre>
-
-<!--
-==== for-each
-============================================================================-->
-<dt class=proc-def>
-<a name="for-each"></a>
-<code class=proc-def>for-each</code><var> proc clist<sub>1</sub> clist<sub>2</sub> ... -&gt; unspecified</var>
-<dd class=proc-def>
-     [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>+]
-
-     The arguments to <code>for-each</code> are like the arguments to 
-     <code>map</code>, but
-     <code>for-each</code> calls <var>proc</var> for its side effects rather
-     than for its values.  
-     Unlike <code>map</code>, <code>for-each</code> is guaranteed to call 
-     <var>proc</var> on the elements of the lists in order from the first
-     element(s) to the last, 
-     and the value returned by <code>for-each</code> is unspecified.
-<pre class=code-example>
-(let ((v (make-vector 5)))
-  (for-each (lambda (i)
-              (vector-set! v i (* i i)))
-            '(0 1 2 3 4))
-  v)  =>  #(0 1 4 9 16)
-</pre>
-    
-    This procedure is extended from its
-    <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>
-    specification to allow the arguments to be of unequal length; 
-    it terminates when the shortest list runs out. 
-<p>
-    At least one of the argument lists must be finite.
-
-<!--
-==== append-map!
-==== append-map
-============================================================================-->
-<dt class=proc-def1>
-<a name="append-map"></a>
-<code class=proc-def>append-map&nbsp;&nbsp;</code><var>f clist<sub>1</sub> clist<sub>2</sub> ... -&gt; value</var>
-<dt class=proc-defn>
-<a name="append-map!"></a>
-<code class=proc-def>append-map!&nbsp;</code><var>f clist<sub>1</sub> clist<sub>2</sub> ... -&gt; value</var>
-<dd class=proc-def>
-    Equivalent to 
-<div class=indent><code>
-(apply append  (map <var>f</var> <var>clist<sub>1</sub></var> <var>clist<sub>2</sub></var> ...))
-</code></div>
-    and
-<div class=indent><code>
-(apply append! (map <var>f</var> <var>clist<sub>1</sub></var> <var>clist<sub>2</sub></var> ...))
-</code></div>
-
-    Map <var>f</var> over the elements of the lists, just as in the <code>map</code> function.
-    However, the results of the applications are appended together to
-    make the final result. <code>append-map</code> uses <code>append</code> to append the results
-    together; <code>append-map!</code> uses <code>append!</code>.
-<p>
-    The dynamic order in which the various applications of <var>f</var> are made is
-    not specified.
-<p>
-    Example:
-<pre class=code-example>
-(append-map! (lambda (x) (list x (- x))) '(1 3 8))
-    =&gt; (1 -1 3 -3 8 -8)
-</pre>
-
-    At least one of the list arguments must be finite.
-
-<!--
-==== map!
-============================================================================-->
-<dt class=proc-def>
-<a name="map!"></a>
-<code class=proc-def>map!</code><var> f list<sub>1</sub> clist<sub>2</sub> ... -&gt; list</var>
-<dd class=proc-def>
-    Linear-update variant of <code>map</code> -- <code>map!</code> is allowed, but not required, to 
-    alter the cons cells of <var>list<sub>1</sub></var> to construct the result list.
-<p>
-    The dynamic order in which the various applications of <var>f</var> are made is
-    not specified.
-    
-    In the n-ary case, <var>clist<sub>2</sub></var>, <var>clist<sub>3</sub></var>, ... must have at least as many
-    elements as <var>list<sub>1</sub></var>.
-
-<!--
-==== map-in-order
-============================================================================-->
-<dt class=proc-def>
-<a name="map-in-order"></a>
-<code class=proc-def>map-in-order </code><var>f</var> <var>clist<sub>1</sub> clist<sub>2</sub> ... -&gt; list</var>
-<dd class=proc-def>
-    A variant of the <code>map</code> procedure that guarantees to apply <var>f</var> across
-    the elements of the <var>list<sub>i</sub></var> arguments in a left-to-right order. This
-    is useful for mapping procedures that both have side effects and
-    return useful values.
-<p>
-    At least one of the list arguments must be finite.
-
-<!--
-==== pair-for-each
-============================================================================-->
-<dt class=proc-def>
-<a name="pair-for-each"></a>
-<code class=proc-def>pair-for-each </code><var>f clist<sub>1</sub> clist<sub>2</sub> ... -&gt; unspecific</var>
-<dd class=proc-def>
-    Like <code>for-each</code>, but <var>f</var> is applied to successive sublists of the argument
-    lists. That is, <var>f</var> is applied to the cons cells of the lists, rather
-    than the lists' elements. These applications occur in left-to-right
-    order.
-<p>
-    The <var>f</var> procedure may reliably apply <code>set-cdr!</code> to the pairs it is given
-    without altering the sequence of execution.
-
-<pre class=code-example>
-(pair-for-each (lambda (pair) (display pair) (newline)) '(a b c)) ==&gt;
-    (a b c)
-    (b c)
-    (c)
-</pre>
-
-    At least one of the list arguments must be finite.
-
-<!--
-==== filter-map
-============================================================================-->
-<dt class=proc-def>
-<a name="filter-map"></a>
-<code class=proc-def>filter-map</code><var> f clist<sub>1</sub> clist<sub>2</sub> ... -&gt; list</var>
-<dd class=proc-def>
-    Like <code>map</code>, but only true values are saved.
-<pre class=code-example>
-(filter-map (lambda (x) (and (number? x) (* x x))) '(a 1 b 3 c 7))
-    =&gt; (1 9 49)
-</pre>
-    The dynamic order in which the various applications of <var>f</var> are made is
-    not specified.
-<p>
-    At least one of the list arguments must be finite.
-</dl>
-
-<!--========================================================================-->
-<h2><a name="FilteringPartitioning">Filtering &amp; partitioning</a></h2>
-<dl>
-
-<!--
-==== filter
-============================================================================-->
-<dt class=proc-def>
-<a name="filter"></a>
-<code class=proc-def>filter</code><var> pred list -&gt; list</var>
-<dd class=proc-def>
-    Return all the elements of <var>list</var> that satisfy predicate <var>pred</var>.
-    The list is not disordered -- elements that appear in the result list
-    occur in the same order as they occur in the argument list.
-    The returned list may share a common tail with the argument list.
-    The dynamic order in which the various applications of <var>pred</var> are made is
-    not specified.
-    
-<pre class=code-example>
-(filter even? '(0 7 8 8 43 -4)) =&gt; (0 8 8 -4)
-</pre>
-
-<!--
-==== partition
-============================================================================-->
-<dt class=proc-def>
-<a name="partition"></a>
-<code class=proc-def>partition</code><var> pred list -&gt; [list list]</var>
-<dd class=proc-def>
-    Partitions the elements of <var>list</var> with predicate <var>pred</var>, and returns two
-    values: the list of in-elements and the list of out-elements.
-    The list is not disordered -- elements occur in the result lists
-    in the same order as they occur in the argument list.
-    The dynamic order in which the various applications of <var>pred</var> are made is
-    not specified. One of the returned lists may share a common tail with the
-    argument list.
-
-<pre class=code-example>
-(partition symbol? '(one 2 3 four five 6)) =&gt; 
-    (one four five)
-    (2 3 6)
-</pre>
-
-<!--
-==== remove
-============================================================================-->
-<dt class=proc-def>
-<a name="remove"></a>
-<code class=proc-def>remove</code><var> pred list -&gt; list</var>
-<dd class=proc-def>
-    Returns <var>list</var> without the elements that satisfy predicate <var>pred</var>:
-<pre class=code-example>
-(lambda (pred list) (filter (lambda (x) (not (pred x))) list))
-</pre>
-    The list is not disordered -- elements that appear in the result list
-    occur in the same order as they occur in the argument list.
-    The returned list may share a common tail with the argument list.
-    The dynamic order in which the various applications of <var>pred</var> are made is 
-    not specified.
-    
-<pre class=code-example>
-(remove even? '(0 7 8 8 43 -4)) =&gt; (7 43)
-</pre>
-
-<!--
-==== remove!
-==== partition!
-==== filter!
-============================================================================-->
-<dt class=proc-def1>
-<a name="filter!"></a>
-<code class=proc-def>filter!&nbsp;&nbsp;&nbsp;&nbsp;</code><var>pred list -&gt; list</var>
-<dt class=proc-defi>
-<a name="partition!"></a>
-<code class=proc-def>partition!&nbsp;</code><var>pred list -&gt; [list list]</var>
-<dt class=proc-defn>
-<a name="remove!"></a>
-<code class=proc-def>remove!&nbsp;&nbsp;&nbsp;&nbsp;</code><var>pred list -&gt; list</var>
-<dd class=proc-def>
-    Linear-update variants of <code>filter</code>, <code>partition</code> and <code>remove</code>.
-    These procedures are allowed, but not required, to alter the cons cells
-    in the argument list to construct the result lists.
-
-</dl>
-
-<!--========================================================================-->
-<h2><a name="Searching">Searching</a></h2>
-<p>
-
-The following procedures all search lists for a leftmost element satisfying
-some criteria. This means they do not always examine the entire list; thus,
-there is no efficient way for them to reliably detect and signal an error when
-passed a dotted or circular list. Here are the general rules describing how
-these procedures work when applied to different kinds of lists:
-
-<dl>
-    <dt> Proper lists: 
-    <dd> The standard, canonical behavior happens in this case.
-
-    <dt> Dotted lists: 
-    <dd> It is an error to pass these procedures a dotted list
-                  that does not contain an element satisfying the search
-                  criteria. That is, it is an error if the procedure has
-                  to search all the way to the end of the dotted list.
-		  However, this <abbr title="Scheme Request for Implementation">SRFI</abbr> does <em>not</em> specify anything at all
-                  about the behavior of these procedures when passed a
-                  dotted list containing an element satisfying the search
-                  criteria. It may finish successfully, signal an error,
-                  or perform some third action. Different implementations
-                  may provide different functionality in this case; code
-                  which is compliant with this <abbr title="Scheme Request for Implementation">SRFI</abbr> may not rely on any
-                  particular behavior. Future <abbr title="Scheme Request for Implementation">SRFI</abbr>'s may refine SRFI-1
-                  to define specific behavior in this case.
-                  <p>
-		  In brief, SRFI-1 compliant code may not pass a dotted
-                  list argument to these procedures.
-
-    <dt> Circular lists: 
-    <dd> It is an error to pass these procedures a circular list
-                  that does not contain an element satisfying the search
-                  criteria. Note that the procedure is not required to 
-                  detect this case; it may simply diverge. It is, however,
-                  acceptable to search a circular list <em>if the search is
-                  successful</em> -- that is, if the list contains an element
-                  satisfying the search criteria.
-</dl>
-<p>
-Here are some examples, using the <code>find</code> and <code>any</code> procedures as canonical
-representatives:
-<pre class=code-example>
-;; Proper list -- success
-(find even? '(1 2 3))	=&gt; 2
-(any  even? '(1 2 3))	=&gt; #t
-
-;; proper list -- failure
-(find even? '(1 7 3))	=&gt; #f
-(any  even? '(1 7 3))	=&gt; #f
-
-;; Failure is error on a dotted list.
-(find even? '(1 3 . x))	=&gt; error
-(any  even? '(1 3 . x))	=&gt; error
-
-;; The dotted list contains an element satisfying the search.
-;; This case is not specified -- it could be success, an error, 
-;; or some third possibility.
-(find even? '(1 2 . x))	=&gt; error/undefined
-(any  even? '(1 2 . x))	=&gt; error/undefined ; success, error or other.
-
-;; circular list -- success
-(find even? (circular-list 1 6 3)) =&gt; 6
-(any  even? (circular-list 1 6 3)) =&gt; #t
-
-;; circular list -- failure is error. Procedure may diverge.
-(find even? (circular-list 1 3)) =&gt; error
-(any  even? (circular-list 1 3)) =&gt; error
-</pre>
-
-<dl>
-<!--
-==== find
-============================================================================-->
-<dt class=proc-def>
-<a name="find"></a>
-<code class=proc-def>find</code><var> pred clist -&gt; value</var>
-<dd class=proc-def>
-    Return the first element of <var>clist</var> that satisfies predicate <var>pred</var>;
-    false if no element does.
-
-<pre class=code-example>
-(find even? '(3 1 4 1 5 9)) =&gt; 4
-</pre>
-
-    Note that <code>find</code> has an ambiguity in its lookup semantics -- if <code>find</code>
-    returns <code>#f</code>, you cannot tell (in general) if it found a <code>#f</code> element
-    that satisfied <var>pred</var>, or if it did not find any element at all. In
-    many situations, this ambiguity cannot arise -- either the list being
-    searched is known not to contain any <code>#f</code> elements, or the list is
-    guaranteed to have an element satisfying <var>pred</var>. However, in cases
-    where this ambiguity can arise, you should use <code>find-tail</code> instead of
-    <code>find</code> -- <code>find-tail</code> has no such ambiguity:
-<pre class=code-example>
-(cond ((find-tail pred lis) =&gt; (lambda (pair) ...)) ; Handle (CAR PAIR)
-      (else ...)) ; Search failed.
-</pre>
-
-<!--
-==== find-tail
-============================================================================-->
-<dt class=proc-def>
-<a name="find-tail"></a>
-<code class=proc-def>find-tail</code><var> pred clist -&gt; pair or false</var>
-<dd class=proc-def>
-    Return the first pair of <var>clist</var> whose car satisfies <var>pred</var>. If no pair does,
-    return false.
-<p>
-    <code>find-tail</code> can be viewed as a general-predicate variant of the <code>member</code>
-    function.
-<p>
-    Examples: 
-<pre class=code-example>
-(find-tail even? '(3 1 37 -8 -5 0 0)) =&gt; (-8 -5 0 0)
-(find-tail even? '(3 1 37 -5)) =&gt; #f
-
-;; MEMBER X LIS:
-(find-tail (lambda (elt) (equal? x elt)) lis)
-</pre>
-
-    In the circular-list case, this procedure "rotates" the list.
-
-<p>
-    <code>Find-tail</code> is essentially <code>drop-while</code>, 
-    where the sense of the predicate is inverted: 
-    <code>Find-tail</code> searches until it finds an element satisfying
-    the predicate; <code>drop-while</code> searches until it finds an 
-    element that <em>doesn't</em> satisfy the predicate.
-
-<!--
-==== take-while take-while!
-============================================================================-->
-<dt class=proc-def1>
-<a name="take-while"></a>
-<code class=proc-def>take-while&nbsp;</code><var> pred clist -&gt; list</var>
-<dt class=proc-defn>
-<a name="take-while!"></a>
-<code class=proc-def>take-while!</code><var> pred clist -&gt; list</var>
-<dd class=proc-def>
-
-Returns the longest initial prefix of <var>clist</var> whose elements all
-satisfy the predicate <var>pred</var>.
-
-<p>
-<code>Take-while!</code> is the linear-update variant. It is allowed, but not
-required, to alter the argument list to produce the result.
-
-<pre class=code-example>
-(take-while even? '(2 18 3 10 22 9)) => (2 18)
-</pre>
-
-<!--
-==== drop-while
-============================================================================-->
-<dt class=proc-def>
-<a name="drop-while"></a>
-<code class=proc-def>drop-while</code><var> pred clist -&gt; list</var>
-<dd class=proc-def>
-Drops the longest initial prefix of <var>clist</var> whose elements all
-satisfy the predicate <var>pred</var>, and returns the rest of the list.
-
-<pre class=code-example>
-(drop-while even? '(2 18 3 10 22 9)) => (3 10 22 9)
-</pre>
-The circular-list case may be viewed as "rotating" the list.
-
-
-<!--
-==== span span! break break!
-============================================================================-->
-<dt class=proc-def1>
-<a name="span"></a>
-<code class=proc-def>span&nbsp;&nbsp;</code><var> pred clist -&gt; [list clist]</var>
-<dt class=proc-defi>
-<a name="span!"></a>
-<code class=proc-def>span!&nbsp;</code><var> pred list&nbsp; -&gt; [list list]</var>
-<dt class=proc-defi>
-<a name="break"></a>
-<code class=proc-def>break&nbsp;</code><var> pred clist -&gt; [list clist]</var>
-<dt class=proc-defn>
-<a name="break!"></a>
-<code class=proc-def>break!</code><var> pred list&nbsp; -&gt; [list list]</var>
-<dd class=proc-def>
-
-<code>Span</code> splits the list into the longest initial prefix whose
-elements all satisfy <var>pred</var>, and the remaining tail. 
-<code>Break</code> inverts the sense of the predicate: 
-the tail commences with the first element of the input list
-that satisfies the predicate.
-
-<p>
-In other words: 
-<code>span</code> finds the initial span of elements 
-satisfying <var>pred</var>, 
-and <code>break</code> breaks the list at the first element satisfying 
-<var>pred</var>.
-
-<p>
-<code>Span</code> is equivalent to 
-<pre class=code-example>
-(values (take-while <var>pred</var> <var>clist</var>) 
-        (drop-while <var>pred</var> <var>clist</var>))
-</pre>
-
-<p>
-<code>Span!</code> and <code>break!</code> are the linear-update variants. 
-They are allowed, but not required, 
-to alter the argument list to produce the result.
-
-<pre class=code-example>
-(span even? '(2 18 3 10 22 9)) =>
-  (2 18)
-  (3 10 22 9)
-
-(break even? '(3 1 4 1 5 9)) =>
-  (3 1)
-  (4 1 5 9)
-</pre>
-
-
-<!--
-==== any
-============================================================================-->
-<dt class=proc-def>
-<a name="any"></a>
-<code class=proc-def>any</code><var> pred clist<sub>1</sub> clist<sub>2</sub> ... -&gt; value</var>
-<dd class=proc-def>
-    Applies the predicate across the lists, returning true if the predicate
-    returns true on any application.
-<p>
-    If there are <var>n</var> list arguments <var>clist<sub>1</sub></var> ... <var>clist<sub>n</sub></var>, then <var>pred</var> must be a
-    procedure taking <var>n</var> arguments and returning a boolean result.
-<p>
-    <code>any</code> applies <var>pred</var> to the first elements of the <var>clist<sub>i</sub></var> parameters.
-    If this application returns a true value, <code>any</code> immediately returns
-    that value. Otherwise, it iterates, applying <var>pred</var> to the second
-    elements of the <var>clist<sub>i</sub></var> parameters, then the third, and so forth.
-    The iteration stops when a true value is produced or one of the lists runs
-    out of values; in
-    the latter case, <code>any</code> returns <code>#f</code>. 
-    The application of <var>pred</var> to the last element of the
-    lists is a tail call.
-<p>
-    Note the difference between <code>find</code> and <code>any</code> -- <code>find</code> returns the element
-    that satisfied the predicate; <code>any</code> returns the true value that the
-    predicate produced.
-<p>
-    Like <code>every</code>, <code>any</code>'s name does not end with a question mark -- this is to
-    indicate that it does not return a simple boolean (<code>#t</code> or <code>#f</code>), but a
-    general value.
-
-<pre class=code-example>
-(any integer? '(a 3 b 2.7))   =&gt; #t
-(any integer? '(a 3.1 b 2.7)) =&gt; #f
-(any &lt; '(3 1 4 1 5)
-       '(2 7 1 8 2)) =&gt; #t
-</pre>
-
-<!--
-==== every
-============================================================================-->
-<dt class=proc-def>
-<a name="every"></a>
-<code class=proc-def>every</code><var> pred clist<sub>1</sub> clist<sub>2</sub> ... -&gt; value</var>
-<dd class=proc-def>
-    Applies the predicate across the lists, returning true if the predicate
-    returns true on every application.
-<p>
-    If there are <var>n</var> list arguments <var>clist<sub>1</sub></var> ... <var>clist<sub>n</sub></var>, then <var>pred</var> must be a
-    procedure taking <var>n</var> arguments and returning a boolean result.
-<p>
-    <code>every</code> applies <var>pred</var> to the first elements of the <var>clist<sub>i</sub></var> parameters.
-    If this application returns false, <code>every</code> immediately returns false.
-    Otherwise, it iterates, applying <var>pred</var> to the second elements of the
-    <var>clist<sub>i</sub></var> parameters, then the third, and so forth. The iteration stops
-    when a false value is produced or one of the lists runs out of values.
-    In the latter case, <code>every</code> returns
-    the true value produced by its final application of <var>pred</var>. 
-    The application of <var>pred</var> to the last element of the lists 
-    is a tail call.
-<p>
-    If one of the <var>clist<sub>i</sub></var> has no elements, <code>every</code> simply returns <code>#t</code>.
-<p>
-    Like <code>any</code>, <code>every</code>'s name does not end with a question mark -- this is to
-    indicate that it does not return a simple boolean (<code>#t</code> or <code>#f</code>), but a
-    general value.
-
-<!--
-==== list-index
-============================================================================-->
-<dt class=proc-def>
-<a name="list-index"></a>
-<code class=proc-def>list-index</code><var> pred clist<sub>1</sub> clist<sub>2</sub> ... -&gt; integer or false</var>
-<dd class=proc-def>
-    Return the index of the leftmost element that satisfies <var>pred</var>.
-<p>
-    If there are <var>n</var> list arguments <var>clist<sub>1</sub></var> ... <var>clist<sub>n</sub></var>, then <var>pred</var> must be a
-    function taking <var>n</var> arguments and returning a boolean result.
-<p>
-    <code>list-index</code> applies <var>pred</var> to the first elements of the <var>clist<sub>i</sub></var> parameters.
-    If this application returns true, <code>list-index</code> immediately returns zero.
-    Otherwise, it iterates, applying <var>pred</var> to the second elements of the
-    <var>clist<sub>i</sub></var> parameters, then the third, and so forth. When it finds a tuple of
-    list elements that cause <var>pred</var> to return true, it stops and returns the
-    zero-based index of that position in the lists.
-<p>
-    The iteration stops when one of the lists runs out of values; in this
-    case, <code>list-index</code> returns <code>#f</code>.
-
-<pre class=code-example>
-(list-index even? '(3 1 4 1 5 9)) =&gt; 2
-(list-index &lt; '(3 1 4 1 5 9 2 5 6) '(2 7 1 8 2)) =&gt; 1
-(list-index = '(3 1 4 1 5 9 2 5 6) '(2 7 1 8 2)) =&gt; #f
-</pre>
-
-<!--
-==== member memq memv
-============================================================================-->
-<dt class=proc-def1>
-<a name="member"></a>
-<code class=proc-def>member</code><var> x list [=] -&gt; list</var>
-<dt class=proc-defi>
-<a name="memq"></a>
-<code class=proc-def>memq</code><var> x list -&gt; list</var>
-<dt class=proc-defn>
-<a name="memv"></a>
-<code class=proc-def>memv</code><var> x list -&gt; list</var>
-<dd class=proc-def>
-     [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>+]
-
-    These procedures return the first sublist of <var>list</var> whose car is
-    <var>x</var>, where the sublists of <var>list</var> are the 
-    non-empty lists returned by 
-        <code>(drop <var>list</var> <var>i</var>)</code>
-    for <var>i</var> less than the length of <var>list</var>.  
-    If <var>x</var> does
-    not occur in <var>list</var>, then <code>#f</code> is returned.  
-    <code>memq</code> uses <code>eq?</code> to compare <var>x</var>
-    with the elements of <var>list</var>, 
-    while <code>memv</code> uses <code>eqv?</code>, and
-    <code>member</code> uses <code>equal?</code>.
-
-<pre class=code-example>
-    (memq 'a '(a b c))          =>  (a b c)
-    (memq 'b '(a b c))          =>  (b c)
-    (memq 'a '(b c d))          =>  #f
-    (memq (list 'a) '(b (a) c)) =>  #f
-    (member (list 'a)
-            '(b (a) c))         =>  ((a) c)
-    (memq 101 '(100 101 102))   =>  *unspecified*
-    (memv 101 '(100 101 102))   =>  (101 102)
-</pre>
-
-    <code>member</code> is extended from its 
-    <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>
-    definition to allow the client to pass in
-    an optional equality procedure <var>=</var> used to compare keys. 
-
-<p>
-    The comparison procedure is used to compare the elements <var>e<sub>i</sub></var> of <var>list</var>
-    to the key <var>x</var> in this way:
-<div class=indent><code>
-(= <var>x</var> <var>e<sub>i</sub></var>)		; list is (E1 ... En)
-</code></div>
-    That is, the first argument is always <var>x</var>, and the second argument is
-    one of the list elements. Thus one can reliably find the first element
-    of <var>list</var> that is greater than five with
-	<code>(member 5 <var>list</var> &lt;)</code>
-
-<p>
-    Note that fully general list searching may be performed with
-    the <code>find-tail</code> and <code>find</code> procedures, <em>e.g.</em>
-<pre class=code-example>
-(find-tail even? list) ; Find the first elt with an even key.
-</pre>
-
-</dl>
-
-<!--========================================================================-->
-<h2><a name="Deletion">Deletion</a></h2>
-<p>
-
-<dl>
-<!--
-==== delete!
-==== delete
-============================================================================-->
-<dt class=proc-def1>
-<a name="delete"></a>
-<code class=proc-def>delete&nbsp;&nbsp;</code><var>x list [=] -&gt; list</var>
-<dt class=proc-defn>
-<a name="delete!"></a>
-<code class=proc-def>delete!&nbsp;</code><var>x list [=] -&gt; list</var>
-<dd class=proc-def>
-    <code>delete</code> uses the comparison procedure =, which defaults to <code>equal?</code>, to find
-    all elements of <var>list</var> that are equal to <var>x</var>, and deletes them from <var>list</var>. The
-    dynamic order in which the various applications of <var>=</var> are made is not
-    specified.
-
-<p>
-    The list is not disordered -- elements that appear in the result list
-    occur in the same order as they occur in the argument list.
-    The result may share a common tail with the argument list.
-
-<p>
-    Note that fully general element deletion can be performed with the <code>remove</code>
-    and <code>remove!</code> procedures, <em>e.g.</em>:
-<pre class=code-example>
-;; Delete all the even elements from LIS:
-(remove even? lis)
-</pre>
-
-    The comparison procedure is used in this way:
-	<code>(= <var>x</var> <var>e<sub>i</sub></var>)</code>.
-    That is, <var>x</var> is always the first argument, 
-    and a list element is always the
-    second argument. The comparison procedure will be used to compare each
-    element of <var>list</var> exactly once; the order in which it is applied to the
-    various <var>e<sub>i</sub></var> is not specified.  Thus, one can reliably remove all the
-    numbers greater than five from a list with
-	<code>(delete 5 list &lt;)</code>
-
-<p>
-    <code>delete!</code> is the linear-update variant of <code>delete</code>.
-    It is allowed, but not required, to alter the cons cells in
-    its argument list to construct the result.    
-
-<!--
-==== delete-duplicates!
-==== delete-duplicates
-============================================================================-->
-<dt class=proc-def1>
-<a name="delete-duplicates"></a>
-<code class=proc-def>delete-duplicates&nbsp;&nbsp;</code><var>list [=] -&gt; list</var>
-<dt class=proc-defn>
-<a name="delete-duplicates!"></a>
-<code class=proc-def>delete-duplicates!&nbsp;</code><var>list [=] -&gt; list</var>
-<dd class=proc-def>
-    <code>delete-duplicates</code> removes duplicate elements from the
-    list argument.
-    If there are multiple equal elements in the argument list, the result list
-    only contains the first or leftmost of these elements in the result.
-    The order of these surviving elements is the same as in the original
-    list -- <code>delete-duplicates</code> does not disorder the list (hence it is useful
-    for "cleaning up" association lists).
-<p>
-    The <var>=</var> parameter is used to compare the elements of the list; it defaults
-    to <code>equal?</code>. If <var>x</var> comes before <var>y</var> in <var>list</var>, then the comparison is performed 
-	<code>(= <var>x</var> <var>y</var>)</code>.
-    The comparison procedure will be used to compare each pair of elements in 
-    <var>list</var> no more than once; 
-    the order in which it is applied to the various pairs is not specified.
-<p>
-    Implementations of <code>delete-duplicates</code>
-    are allowed to share common tails
-    between argument and result lists -- for example, if the list argument
-    contains only unique elements, it may simply return exactly
-    this list.
-<p>
-    Be aware that, in general, <code>delete-duplicates</code>
-    runs in time O(n<sup>2</sup>) for <var>n</var>-element lists.
-    Uniquifying long lists can be accomplished in O(n lg n) time by sorting
-    the list to bring equal elements together, then using a linear-time
-    algorithm to remove equal elements. Alternatively, one can use algorithms
-    based on element-marking, with linear-time results.
-
-<p>
-    <code>delete-duplicates!</code> is the linear-update variant of <code>delete-duplicates</code>; it
-    is allowed, but not required, to alter the cons cells in its argument
-    list to construct the result.
-<pre class=code-example>
-(delete-duplicates '(a b a c a b c z)) =&gt; (a b c z)
-
-;; Clean up an alist:
-(delete-duplicates '((a . 3) (b . 7) (a . 9) (c . 1))
-                   (lambda (x y) (eq? (car x) (car y))))
-    =&gt; ((a . 3) (b . 7) (c . 1))
-</pre>
-</dl>
-
-<!--========================================================================-->
-<h2><a name="AssociationLists">Association lists</a></h2>
-<p>
-An "association list" (or "alist") is a list of pairs. The car of each pair
-contains a key value, and the cdr contains the associated data value. They can
-be used to construct simple look-up tables in Scheme. Note that association
-lists are probably inappropriate for performance-critical use on large data;
-in these cases, hash tables or some other alternative should be employed.
-
-<dl>
-<!--
-==== assoc assq assv
-============================================================================-->
-<dt class=proc-def1>
-<a name="assoc"></a>
-<code class=proc-def>assoc</code><var> key alist [=] -&gt; pair or #f</var>
-<dt class=proc-defi>
-<a name="assq"></a>
-<code class=proc-def>assq</code><var> key alist -&gt; pair or #f</var>
-<dt class=proc-defn>
-<a name="assv"></a>
-<code class=proc-def>assv</code><var> key alist -&gt; pair or #f</var>
-<dd class=proc-def>
-
-     [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>+]
-    <var>alist</var> must be an association list -- a list of pairs.  
-    These procedures
-    find the first pair in <var>alist</var> whose car field is <var>key</var>, 
-    and returns that pair.  
-    If no pair in <var>alist</var> has <var>key</var> as its car, 
-    then <code>#f</code> is returned.  
-    <code>assq</code> uses <code>eq?</code> to compare <var>key</var> 
-    with the car fields of the pairs in <var>alist</var>, 
-    while <code>assv</code> uses <code>eqv?</code> 
-    and <code>assoc</code> uses <code>equal?</code>.
-<pre class=code-example>
-(define e '((a 1) (b 2) (c 3)))
-(assq 'a e)                            =>  (a 1)
-(assq 'b e)                            =>  (b 2)
-(assq 'd e)                            =>  #f
-(assq (list 'a) '(((a)) ((b)) ((c))))  =>  #f
-(assoc (list 'a) '(((a)) ((b)) ((c)))) =>  ((a))
-(assq 5 '((2 3) (5 7) (11 13)))	   =>  *unspecified*
-(assv 5 '((2 3) (5 7) (11 13)))	   =>  (5 7)
-</pre>
-
-    <code>assoc</code> is extended from its 
-    <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> 
-    definition to allow the client to pass in
-    an optional equality procedure <var>=</var> used to compare keys.
-
-<p>
-    The comparison procedure is used to compare the elements <var>e<sub>i</sub></var> of <var>list</var>
-    to the <var>key</var> parameter in this way:
-<div class=indent><code>
-(= <var>key</var> (car <var>e<sub>i</sub></var>))	; list is (E1 ... En)
-</code></div>
-    That is, the first argument is always <var>key</var>, 
-    and the second argument is one of the list elements. 
-    Thus one can reliably find the first entry
-    of <var>alist</var> whose key is greater than five with
-	<code>(assoc 5 <var>alist</var> &lt;)</code>
-     
-<p>
-    Note that fully general alist searching may be performed with
-    the <code>find-tail</code> and <code>find</code> procedures, <em>e.g.</em>
-<pre class=code-example>
-;; Look up the first association in <var>alist</var> with an even key:
-(find (lambda (a) (even? (car a))) alist)
-</pre>
-
-
-<!--
-==== alist-cons
-============================================================================-->
-<dt class=proc-def>
-<a name="alist-cons"></a>
-<code class=proc-def>alist-cons</code><var> key datum alist -&gt; alist</var>
-<dd class=proc-def>
-<pre>
-(lambda (key datum alist) (cons (cons key datum) alist))
-</pre>
-    Cons a new alist entry mapping <var>key</var> -&gt; <var>datum</var> onto <var>alist</var>.
-
-<!--
-==== alist-copy
-============================================================================-->
-<dt class=proc-def>
-<a name="alist-copy"></a>
-<code class=proc-def>alist-copy</code><var> alist -&gt; alist</var>
-<dd class=proc-def>
-    Make a fresh copy of <var>alist</var>. This means copying each pair that
-    forms an association as well as the spine of the list, <em>i.e.</em>
-<pre>
-(lambda (a) (map (lambda (elt) (cons (car elt) (cdr elt))) a))
-</pre>
-
-<!--
-==== alist-delete!
-==== alist-delete
-============================================================================-->
-<dt class=proc-def1>
-<a name="alist-delete"></a>
-<code class=proc-def>alist-delete&nbsp;&nbsp;</code><var>key alist [=] -&gt; alist</var>
-<dt class=proc-defn>
-<a name="alist-delete!"></a>
-<code class=proc-def>alist-delete!&nbsp;</code><var>key alist [=] -&gt; alist</var>
-<dd class=proc-def>
-    <code>alist-delete</code> deletes all associations from <var>alist</var> with the given <var>key</var>, 
-    using key-comparison procedure =, which defaults to <code>equal?</code>. 
-    The dynamic order in which the various applications of <var>=</var> are made is not 
-    specified. 
-<p>
-    Return values may share common tails with the <var>alist</var> argument.
-    The alist is not disordered -- elements that appear in the result alist
-    occur in the same order as they occur in the argument alist.
-<p>
-    The comparison procedure is used to compare the element keys <var>k<sub>i</sub></var> of <var>alist</var>'s
-    entries to the <var>key</var> parameter in this way:
-	<code>(= <var>key</var> <var>k<sub>i</sub></var>)</code>.
-    Thus, one can reliably remove all entries of <var>alist</var> whose key is greater
-    than five with
-	<code>(alist-delete 5 <var>alist</var> &lt;)</code>
-<p>
-    <code>alist-delete!</code> is the linear-update variant of <code>alist-delete</code>.
-    It is allowed, but not required,
-    to alter cons cells from the <var>alist</var> parameter to construct the result.
-
-</dl>
-
-
-<!--========================================================================-->
-<h2><a name="SetOperationsOnLists">Set operations on lists</a></h2>
-<p>
-These procedures implement operations on sets represented as lists of elements.
-They all take an <var>=</var> argument used to compare elements of lists. 
-This equality procedure is required to be consistent with <code>eq?</code>. 
-That is, it must be the case that
-<div class=indent>
-        <code>(eq? <var>x</var> <var>y</var>)</code> => <code>(<var>=</var> <var>x</var> <var>y</var>)</code>.
-</div>
-Note that this implies, in turn, that two lists that are <code>eq?</code> are
-also set-equal by any legal comparison procedure. This allows for
-constant-time determination of set operations on <code>eq?</code> lists.
-
-<p>
-Be aware that these procedures typically run in time 
-O(<var>n</var> * <var>m</var>) 
-for <var>n</var>- and <var>m</var>-element list arguments.  
-Performance-critical applications
-operating upon large sets will probably wish to use other data
-structures and algorithms.
-
-<dl>
-<!--
-==== lset<=
-============================================================================-->
-<dt class=proc-def>
-<a name="lset<="></a>
-<code class=proc-def>lset&lt;=</code><var> = list<sub>1</sub> ... -&gt; boolean</var>
-<dd class=proc-def>
-    Returns true iff every <var>list<sub>i</sub></var> is a subset of <var>list<sub>i+1</sub></var>, using <var>=</var> for
-    the element-equality procedure. 
-    List <var>A</var> is a subset of list <var>B</var> if every
-    element in <var>A</var> is equal to some element of <var>B</var>. 
-    When performing an element comparison, 
-    the <var>=</var> procedure's first argument is an element
-    of <var>A</var>; its second, an element of <var>B</var>.
-<pre class=code-example>
-(lset&lt;= eq? '(a) '(a b a) '(a b c c)) =&gt; #t
-
-(lset<= eq?) => #t             ; Trivial cases
-(lset<= eq? '(a)) => #t
-</pre>
-
-<!--
-==== lset=
-============================================================================-->
-<dt class=proc-def>
-<a name="lset="></a>
-<code class=proc-def>lset=</code><var> = list<sub>1</sub> list<sub>2</sub> ... -&gt; boolean</var>
-<dd class=proc-def>
-    Returns true iff every <var>list<sub>i</sub></var> is set-equal to <var>list<sub>i+1</sub></var>, using <var>=</var> for
-    the element-equality procedure. "Set-equal" simply means that
-    <var>list<sub>i</sub></var> is a subset of <var>list<sub>i+1</sub></var>, and <var>list<sub>i+1</sub></var> is a subset of <var>list<sub>i</sub></var>.
-    The <var>=</var> procedure's first argument is an element of <var>list<sub>i</sub></var>; its second is an element of
-    <var>list<sub>i+1</sub></var>.
-<pre class=code-example>
-(lset= eq? '(b e a) '(a e b) '(e e b a)) =&gt; #t
-
-(lset= eq?) => #t               ; Trivial cases
-(lset= eq? '(a)) => #t
-</pre>
-
-<!--
-==== lset-adjoin
-============================================================================-->
-<dt class=proc-def>
-<a name="lset-adjoin"></a>
-<code class=proc-def>lset-adjoin</code><var> = list elt<sub>1</sub> ... -&gt; list</var>
-<dd class=proc-def>
-    Adds the <var>elt<sub>i</sub></var> elements not already in the list parameter to the 
-    result list. The result shares a common tail with the list parameter.
-    The new elements are added to the front of the list, but no guarantees
-    are made about their order. The <var>=</var> parameter is an equality procedure
-    used to determine if an <var>elt<sub>i</sub></var> is already a member of <var>list</var>. Its first 
-    argument is an element of <var>list</var>; its second is one of the <var>elt<sub>i</sub></var>.
-<p>
-    The list parameter is always a suffix of the result -- even if the list
-    parameter contains repeated elements, these are not reduced.
-<pre class=code-example>
-(lset-adjoin eq? '(a b c d c e) 'a 'e 'i 'o 'u) =&gt; (u o i a b c d c e)
-</pre>
-
-<!--
-==== lset-union
-============================================================================-->
-<dt class=proc-def>
-<a name="lset-union"></a>
-<code class=proc-def>lset-union</code><var> = list<sub>1</sub> ... -&gt; list</var>
-<dd class=proc-def>
-    Returns the union of the lists, using <var>=</var> for the element-equality
-    procedure.
-<p>
-    The union of lists <var>A</var> and <var>B</var> is constructed as follows:
-    <ul>
-        <li> If <var>A</var> is the empty list, 
-             the answer is <var>B</var> (or a copy of <var>B</var>).
-        <li> Otherwise, the result is initialised to be list <var>A</var> 
-             (or a copy of <var>A</var>).
-	<li> Proceed through the elements of list <var>B</var> 
-             in a left-to-right order.
-	     If <var>b</var> is such an element of <var>B</var>, 
-             compare every element <var>r</var> of the current result list 
-             to <var>b</var>: 
-             <code>(= <var>r</var> <var>b</var>)</code>. 
-             If all comparisons fail, 
-             <var>b</var> is consed onto the front of the result.
-    </ul>
-    However, there is no guarantee that = will be applied to every pair
-    of arguments from <var>A</var> and <var>B</var>. 
-    In particular, if <var>A</var> is <code>eq</code>? to <var>B</var>, 
-    the operation may immediately terminate.
-
-<p>
-    In the n-ary case, the two-argument list-union operation is simply
-    folded across the argument lists.
-
-<pre class=code-example>
-(lset-union eq? '(a b c d e) '(a e i o u)) => 
-    (u o i a b c d e)
-
-;; Repeated elements in LIST1 are preserved.
-(lset-union eq? '(a a c) '(x a x)) => (x a a c)
-
-;; Trivial cases
-(lset-union eq?) => ()
-(lset-union eq? '(a b c)) => (a b c)
-</pre>
-
-<!--
-==== lset-intersection
-============================================================================-->
-<dt class=proc-def>
-<a name="lset-intersection"></a>
-<code class=proc-def>lset-intersection</code><var> = list<sub>1</sub> list<sub>2</sub> ... -&gt; list</var>
-<dd class=proc-def>
-    Returns the intersection of the lists, 
-    using <var>=</var> for the element-equality procedure.
-<p>
-    The intersection of lists <var>A</var> and <var>B</var>
-    is comprised of every element of <var>A</var> that is <var>=</var> 
-    to some element of <var>B</var>: 
-        <code>(<var>=</var> <var>a</var> <var>b</var>)</code>, 
-    for <var>a</var> in <var>A</var>, and <var>b</var> in <var>B</var>.
-    Note this implies that an element which appears in <var>B</var> 
-    and multiple times in list <var>A</var>
-    will also appear multiple times in the result.
-<p>
-    The order in which elements appear in the result is the same as
-    they appear in <var>list<sub>1</sub></var> -- 
-    that is, <code>lset-intersection</code> essentially filters 
-    <var>list<sub>1</sub></var>, 
-    without disarranging element order. 
-    The result may
-    share a common tail with <var>list<sub>1</sub></var>.
-<p>
-    In the n-ary case, the two-argument list-intersection operation is simply
-    folded across the argument lists. However, the dynamic order in which the
-    applications of <var>=</var> are made is not specified. 
-    The procedure may check an
-    element of <var>list<sub>1</sub></var> for membership 
-    in every other list before proceeding to
-    consider the next element of <var>list<sub>1</sub></var>, 
-    or it may completely intersect <var>list<sub>1</sub></var>
-    and <var>list<sub>2</sub></var> 
-    before proceeding to <var>list<sub>3</sub></var>, 
-    or it may go about its work in some third order.
-
-<pre class=code-example>
-(lset-intersection eq? '(a b c d e) '(a e i o u)) =&gt; (a e)
-
-;; Repeated elements in LIST1 are preserved.
-(lset-intersection eq? '(a x y a) '(x a x z)) => '(a x a)
-
-(lset-intersection eq? '(a b c)) => (a b c)     ; Trivial case
-</pre>
-
-<!--
-==== lset-difference
-============================================================================-->
-<dt class=proc-def>
-<a name="lset-difference"></a>
-<code class=proc-def>lset-difference</code><var> = list<sub>1</sub> list<sub>2</sub> ... -&gt; list</var>
-<dd class=proc-def>
-    Returns the difference of the lists, using <var>=</var> for the element-equality
-    procedure -- all the elements of <var>list<sub>1</sub></var> that are not
-    <var>=</var> to any element from one of the
-    other <var>list<sub>i</sub></var> parameters. 
-<p>
-    The <var>=</var> procedure's first argument is 
-    always an element of <var>list<sub>1</sub></var>; 
-    its second is an element of one of the other <var>list<sub>i</sub></var>.
-    Elements that are repeated multiple times in the 
-    <var>list<sub>1</sub></var> parameter 
-    will occur multiple times in the result. 
-
-    The order in which elements appear in the result is the same as
-    they appear in <var>list<sub>1</sub></var> -- 
-    that is, <code>lset-difference</code> essentially
-    filters <var>list<sub>1</sub></var>, without disarranging element order. 
-    The result may share a common tail with <var>list<sub>1</sub></var>. 
-
-    The dynamic order in which the applications of <var>=</var> are made is not
-    specified. 
-    The procedure may check an element of <var>list<sub>1</sub></var>
-    for membership in every other list before proceeding to consider the
-    next element of <var>list<sub>1</sub></var>,
-    or it may completely compute the difference of 
-    <var>list<sub>1</sub></var> and <var>list<sub>2</sub></var> before
-    proceeding to <var>list<sub>3</sub></var>, 
-    or it may go about its work in some third order.
-
-<pre class=code-example>
-(lset-difference eq? '(a b c d e) '(a e i o u)) =&gt; (b c d)
-
-(lset-difference eq? '(a b c)) => (a b c) ; Trivial case
-</pre>
-
-<!--
-==== lset-xor
-============================================================================-->
-<dt class=proc-def>
-<a name="lset-xor"></a>
-<code class=proc-def>lset-xor</code><var> = list<sub>1</sub> ... -&gt; list</var>
-<dd class=proc-def>
-    Returns the exclusive-or of the sets, 
-    using <var>=</var> for the element-equality procedure. 
-    If there are exactly two lists, this is all the elements
-    that appear in exactly one of the two lists. The operation is associative,
-    and thus extends to the n-ary case -- the elements that appear in an
-    odd number of the lists. The result may share a common tail with any of
-    the <var>list<sub>i</sub></var> parameters.
-<p>
-    More precisely, for two lists <var>A</var> and <var>B</var>, 
-    <var>A</var> xor <var>B</var> is a list of
-    <ul>
-     <li> every element <var>a</var> of <var>A</var>
-          such that there is no element <var>b</var> of <var>B</var>
-          such that <code>(<var>=</var> <var>a</var> <var>b</var>)</code>, and
-     <li> every element <var>b</var> of <var>B</var> 
-          such that there is no element <var>a</var> of <var>A</var>
-          such that <code>(<var>=</var> <var>b</var> <var>a</var>)</code>.
-    </ul>
-    However, an implementation is allowed to assume that <var>=</var> is
-    symmetric -- that is, that
-<div class=indent>
-	<code>(<var>=</var> <var>a</var> <var>b</var>)</code> =&gt; 
-        <code>(<var>=</var> <var>b</var> <var>a</var>)</code>.
-</div>
-    This means, for example, that if a comparison 
-    <code>(<var>=</var> <var>a</var> <var>b</var>)</code> produces
-    true for some <var>a</var> in <var>A</var> 
-    and <var>b</var> in <var>B</var>,
-    both <var>a</var> and <var>b</var> may be removed from
-    inclusion in the result.
-<p>
-    In the n-ary case, the binary-xor operation is simply folded across
-    the lists.
-
-<pre class=code-example>
-(lset-xor eq? '(a b c d e) '(a e i o u)) =&gt; (d c b i o u)
-
-;; Trivial cases.
-(lset-xor eq?) => ()
-(lset-xor eq? '(a b c d e)) => (a b c d e)
-</pre>
-
-
-<!--
-==== lset-diff+intersection
-============================================================================-->
-<dt class=proc-def>
-<a name="lset-diff+intersection"></a>
-<code class=proc-def>lset-diff+intersection</code><var> = list<sub>1</sub> list<sub>2</sub> ... -&gt; [list list]</var>
-<dd class=proc-def>
-    Returns two values -- the difference and the intersection of the lists.
-    Is equivalent to 
-<pre class=code-example>
-(values (lset-difference <var>=</var> <var>list<sub>1</sub></var> <var>list<sub>2</sub></var> ...)
-        (lset-intersection <var>=</var> <var>list<sub>1</sub></var>
-                             (lset-union <var>=</var> <var>list<sub>2</sub></var> ...)))
-</pre>
-    but can be implemented more efficiently.
-<p>
-    The <var>=</var> procedure's first argument is an element of <var>list<sub>1</sub></var>; its second
-    is an element of one of the other <var>list<sub>i</sub></var>.
-<p>
-    Either of the answer lists may share a 
-    common tail with <var>list<sub>1</sub></var>.
-    This operation essentially partitions <var>list<sub>1</sub></var>.
-
-<!--
-==== lset-diff+intersection! 
-==== lset-xor!
-==== lset-difference!
-==== lset-intersection!
-==== lset-union!
-============================================================================-->
-<dt class=proc-def1>
-<a name="lset-union!"></a>
-<code class=proc-def>lset-union!&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code><var>= list<sub>1</sub> ... -&gt; list</var>
-<dt class=proc-defi>
-<a name="lset-intersection!"></a>
-<code class=proc-def>lset-intersection!&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code><var>= list<sub>1</sub> list<sub>2</sub> ... -&gt; list</var>
-<dt class=proc-defi>
-<a name="lset-difference!"></a>
-<code class=proc-def>lset-difference!&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code><var>= list<sub>1</sub> list<sub>2</sub> ... -&gt; list</var>
-<dt class=proc-defi>
-<a name="lset-xor!"></a>
-<code class=proc-def>lset-xor!&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code><var>= list<sub>1</sub> ... -&gt; list</var>
-<dt class=proc-defn>
-<a name="lset-diff+intersection!"></a>
-<code class=proc-def>lset-diff+intersection!&nbsp;</code><var>= list<sub>1</sub> list<sub>2</sub> ... -&gt; [list list]</var>
-<dd class=proc-def>
-    These are linear-update variants. They are allowed, but not required,
-    to use the cons cells in their first list parameter to construct their
-    answer. <code>lset-union!</code> is permitted to recycle cons cells from <em>any</em> 
-    of its list arguments.
-</dl>
-
-<!--========================================================================-->
-<h2><a name="PrimitiveSideEffects">Primitive side-effects</a></h2>
-<p>
-These two procedures are the primitive, 
-<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> 
-side-effect operations on pairs.
-
-<dl>
-<!--
-==== set-car!
-============================================================================-->
-<dt class=proc-def1>
-<a name="set-car!"></a>
-<code class=proc-def>set-car!</code><var> pair object -&gt; unspecified</var>
-<dt class=proc-defn>
-<a name="set-cdr!"></a>
-<code class=proc-def>set-cdr!</code><var> pair object -&gt; unspecified</var>
-<dd class=proc-def>
-     [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-     These procedures store <var>object</var> in the car and cdr field
-     of <var>pair</var>, respectively.
-     The value returned is unspecified.
-<pre class=code-example>
-(define (f) (list 'not-a-constant-list))
-(define (g) '(constant-list))
-(set-car! (f) 3) =>  *unspecified*
-(set-car! (g) 3) =>  *error*
-</pre>
-</dl>
-
-<!--========================================================================-->
-<h1><a name="Acknowledgements">Acknowledgements</a></h1>
-<p>
-The design of this library benefited greatly from the feedback provided during
-the <abbr title="Scheme Request for Implementation">SRFI</abbr> discussion phase. Among those contributing thoughtful commentary and
-suggestions, both on the mailing list and by private discussion, were Mike
-Ashley, Darius Bacon, Alan Bawden, Phil Bewig, Jim Blandy, Dan Bornstein, Per
-Bothner, Anthony Carrico, Doug Currie, Kent Dybvig, Sergei Egorov, Doug Evans,
-Marc Feeley, Matthias Felleisen, Will Fitzgerald, Matthew Flatt, Dan Friedman,
-Lars Thomas Hansen, Brian Harvey, Erik Hilsdale, Wolfgang Hukriede, Richard
-Kelsey, Donovan Kolbly, Shriram Krishnamurthi, Dave Mason, Jussi Piitulainen,
-David Pokorny, Duncan Smith, Mike Sperber, Maciej Stachowiak, Harvey J. Stein,
-John David Stone, and Joerg F. Wittenberger. I am grateful to them for their
-assistance.
-<p>
-I am also grateful the authors, implementors and documentors of all the systems
-mentioned in the rationale.  Aubrey Jaffer and Kent Pitman should be noted
-for their work in producing Web-accessible versions of the R5RS and 
-<a href="#CommonLisp">Common Lisp</a> spec, which was a tremendous aid.
-<p>
-This is not to imply that these individuals necessarily endorse the final
-results, of course. 
-
-
-<!--========================================================================-->
-<h1><a name="ReferencesLinks">References &amp; links</a></h1>
-<p>
-
-<dl>
-<dt class=biblio>This document, in HTML:
-<dd><a href="srfi-1.html">
-    http://srfi.schemers.org/srfi-1/srfi-1.html</a>
-
-<dt class=biblio>Source code for the reference implementation:
-<dd><a HREF="http://srfi.schemers.org/srfi-1/srfi-1-reference.scm">
-    http://srfi.schemers.org/srfi-1/srfi-1-reference.scm</a>
-
-<dt class=biblio>Archive of SRFI-1 discussion-list email:
-<dd><a href="http://srfi.schemers.org/srfi-1/mail-archive/maillist.html">
-    http://srfi.schemers.org/srfi-1/mail-archive/maillist.html</a>
-
-<dt class=biblio>SRFI web site:
-<dd><a href="http://srfi.schemers.org/">
-    http://srfi.schemers.org/</a>
-</dl>
-
-<p>
-
-<dl>
-<dt class=biblio><strong><a name="CommonLisp">[CommonLisp]</a></strong></dt>
-<dd><em>Common Lisp: the Language</em><br>
-Guy L. Steele Jr. (editor).<br>
-Digital Press, Maynard, Mass., second edition 1990.<br>
-Available at <a href="http://www.elwood.com/alu/table/references.htm#cltl2">
-http://www.elwood.com/alu/table/references.htm#cltl2</a>.
-<p>
-
-The Common Lisp "HyperSpec," produced by Kent Pitman, is essentially
-the ANSI spec for Common Lisp:
-<a href="http://www.harlequin.com/education/books/HyperSpec/">
-http://www.harlequin.com/education/books/HyperSpec/</a>.
-
-<dt class=biblio><strong><a name="R5RS">[R5RS]</a></strong></dt>
-<dd>Revised<sup>5</sup> report on the algorithmic language Scheme.<br>
-    R. Kelsey, W. Clinger, J. Rees (editors). <br>
-    Higher-Order and Symbolic Computation, Vol. 11, No. 1, September, 1998. <br>
-    and ACM SIGPLAN Notices, Vol. 33, No. 9, October, 1998. <br>
-    Available at <a href="http://www.schemers.org/Documents/Standards/">
-    http://www.schemers.org/Documents/Standards/</a>.
-
-</dl>
-
-
-
-<!--========================================================================-->
-<h1><a name="Copyright">Copyright</a></h1>
-<p>
-
-Certain portions of this document -- the specific, marked segments of text
-describing the R5RS procedures -- were adapted with permission from the R5RS
-report.
-<p>
-    
-All other text is copyright (C) Olin Shivers (1998, 1999). 
-All Rights Reserved. 
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-</body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-11.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-11.html
deleted file mode 100644
index 987edd5714..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-11.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 11: Syntax for receiving multiple values</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 11: Syntax for receiving multiple values
-
-<H1>Author</H1>
-
-Lars T Hansen
-
-<H1>Status</H1>
-This SRFI is currently in ``final'' status.  To see an explanation of each status 
-that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion via <A HREF="http://srfi.schemers.org/srfi-11/mail-archive/maillist.html">the archive of 
-the mailing list</A>.
-<P><UL>
-<LI>Received: 1999/09/10
-<LI>Draft: 1999/09/14-1999/11/12
-<LI>Revised: 1999/11/01
-<LI>Revised: 2000/03/15
-<LI>Final: 2000/03/15
-</UL>
-
-<H1>Abstract</H1>
-
-The SRFI introduces syntactic forms LET-VALUES and LET*-VALUES that bind the values of
-expressions that return multiple values.
-
-<H1>Issues</H1>
-
-None.
-
-<H1>Rationale</H1>
-
-LET-VALUES and LET*-VALUES reduce the clutter of the CALL-WITH-VALUES notation for
-receiving multiple values.
-
-
-<H1>Specification</H1>
-
-<dl>
-<dt><a name="let-values"></a>
-<tt>(LET-VALUES ((&lt;formals&gt; &lt;expression&gt;) ...) &lt;body&gt;)</tt>
-<br>Syntax
-<dd>
-<p>Each &lt;formals&gt; should be a formal arguments list as for a LAMBDA 
-   expression, cf section 4.1.4 of the R5RS.</p>
-
-<p>The &lt;expression&gt;s are evaluated in the current environment, the 
-   variables of the &lt;formals&gt; are bound to fresh locations, the return 
-   values of the &lt;expression&gt;s are stored in the variables, the &lt;body&gt; 
-   is evaluated in the extended environment, and the values of the
-   last expression of &lt;body&gt; are returned.  The &lt;body&gt; is a 
-   &lt;tail body&gt;, cf section 3.5 of the R5RS.</p>
-
-<p>The matching of each &lt;formals&gt; to values is as for the matching of 
-   &lt;formals&gt; to arguments in a LAMBDA expression, and it is an
-   error for an &lt;expression&gt; to return a number of values that does
-   not match its corresponding &lt;formals&gt;.</p>
-
-<p>
-<pre>
-             (let-values (((a b . c) (values 1 2 3 4)))
-               (list a b c))            --&gt; (1 2 (3 4))
-
-             (let ((a 'a) (b 'b) (x 'x) (y 'y))
-               (let-values (((a b) (values x y))
-                            ((x y) (values a b)))
-                 (list a b x y)))       --&gt; (x y a b)
-</pre>
-</p>
-
-<dt><a name="let*-values"></a>
-<tt>(LET*-VALUES ((&lt;formals&gt; &lt;expression&gt;) ...) &lt;body&gt;)</tt>
-<br>Syntax
-<dd>
-<p>Each &lt;formals&gt; should be a formal arguments list as for a LAMBDA 
-   expression, cf section 4.1.4 of the R5RS.</p>
-
-<p>LET*-VALUES is similar to LET-VALUES, but the bindings are performed
-   sequentially from left to right, and the region of a binding indicated
-   by (&lt;formals&gt; &lt;expression&gt;) is that part of the LET*-VALUES
-   expression to the right of the binding.  Thus the second binding is done in
-   an environment in which the first binding is visible, and so on.</p>
-
-<p>
-<pre>
-             (let ((a 'a) (b 'b) (x 'x) (y 'y))
-               (let*-values (((a b) (values x y))
-                             ((x y) (values a b)))
-                 (list a b x y)))       --&gt; (x y x y)
-</pre>
-</p>
-</dl>
-
-<H1>Implementation</H1>
-
-The following implementation is written in R5RS Scheme.  It is not
-compatible with the IEEE Scheme standard because the IEEE standard does
-not contain the high-level macro system.
-
-<p>The implementation assumes that some top-level names defined by the
-R5RS are bound to their original values.
-
-<p>
-<pre>
-;; This code is in the public domain.
-
-(define-syntax let-values
-  (syntax-rules ()
-    ((let-values (?binding ...) ?body0 ?body1 ...)
-     (let-values "bind" (?binding ...) () (begin ?body0 ?body1 ...)))
-    
-    ((let-values "bind" () ?tmps ?body)
-     (let ?tmps ?body))
-    
-    ((let-values "bind" ((?b0 ?e0) ?binding ...) ?tmps ?body)
-     (let-values "mktmp" ?b0 ?e0 () (?binding ...) ?tmps ?body))
-    
-    ((let-values "mktmp" () ?e0 ?args ?bindings ?tmps ?body)
-     (call-with-values 
-       (lambda () ?e0)
-       (lambda ?args
-         (let-values "bind" ?bindings ?tmps ?body))))
-    
-    ((let-values "mktmp" (?a . ?b) ?e0 (?arg ...) ?bindings (?tmp ...) ?body)
-     (let-values "mktmp" ?b ?e0 (?arg ... x) ?bindings (?tmp ... (?a x)) ?body))
-    
-    ((let-values "mktmp" ?a ?e0 (?arg ...) ?bindings (?tmp ...) ?body)
-     (call-with-values
-       (lambda () ?e0)
-       (lambda (?arg ... . x)
-         (let-values "bind" ?bindings (?tmp ... (?a x)) ?body))))))
-
-(define-syntax let*-values
-  (syntax-rules ()
-    ((let*-values () ?body0 ?body1 ...)
-     (begin ?body0 ?body1 ...))
-
-    ((let*-values (?binding0 ?binding1 ...) ?body0 ?body1 ...)
-     (let-values (?binding0)
-       (let*-values (?binding1 ...) ?body0 ?body1 ...)))))
-</pre>
-
-<H1>Copyright</H1>
-<p>Copyright (C) Lars T Hansen (1999). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-<!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-<!-- hhmts start -->
-Last modified: Tue Sep 28 10:59:57 MST 2004
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-13.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-13.html
deleted file mode 100644
index 2f744dc119..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-13.html
+++ /dev/null
@@ -1,2972 +0,0 @@
-<!doctype html public '-//W3C//DTD HTML 4.01//EN'
-  'http://www.w3.org/TR/REC-html4/strict.dtd'>
-<!-- Can I have bangs, plusses, or slashes in #tags? Spaces?
-        Yes: plus, bang, star   No: space  Yes: slash, question, ampersand
-        You can't put sharp in a path, so anything goes, really.
-        Nonetheless, some of these confuse Netscape, so I'll avoid them.
- -->
-
-<!--========================================================================-->
-<html lang=en-US>
-  <head>
-    <meta name="keywords" content="Scheme, programming language, list processing, SRFI, youthful devotees of intra-gender communion">
-    <link rev=made href="mailto:shivers@ai.mit.edu">
-    <title>SRFI 13: String Libraries</title>
-
-    <!-- Should have a media=all to get, for example, printing to work.
-      == But my Netscape will completely ignore the tag if I do that.
-      -->
-    <style type="text/css">
-           /* A little general layout hackery for headers & the title. */
-           body { margin-left: +7%;
-                  font-family: "Helvetica", sans-serif;
-                  }
-           /* Netscape workaround: */
-           td, th { font-family: "Helvetica", sans-serif; }
-
-           code, pre { font-family: "courier new", "courier"; }
-
-           div.inset { margin-left: +5%; }
-
-           h1 { margin-left: -5%; }
-           h1, h2 { clear: both; }
-           h1, h2, h3, h4, h5, h6 { color: blue }
-           div.title-text { font-size: large; font-weight: bold; }
-	   h3 { margin-top: 2em; margin-bottom: 0em }
-
-	   /* "Continue" class marks text that isn't really the start
-	   ** of a new paragraph -- e.g., continuing a para after a 
-	   ** code sample.
-	   */
-	   p.continue { text-indent: 0em; margin-top: 0em}
-
-           div.indent { margin-left: 2em; }       /* General indentation */
-           pre.code-example { margin-left: 2em; } /* Indent code examples. */
-
-           /* This stuff is for definition lists of defined procedures.
-           ** A proc-def1 is used when you want a stack of procs to go
-           ** with one dd body. In this case, make the first
-           ** proc a proc-def1, following ones proc-defi's, and the last one
-           ** a proc-defn.
-           **
-           ** Unfortunately, Netscape has huge bugs with respect to style
-           ** sheets and dl list rendering. We have to set truly random
-           ** values here to get the rendering to come out. The proper values
-           ** are in the following style sheet, for Internet Explorer.
-           ** In the following settings, the *comments* say what the 
-           ** setting *really* causes Netscape to do.
-           **
-           ** Ugh. Professional coders sacrifice their self-respect,
-           ** that others may live.
-           */
-           /* m-t ignored; m-b sets top margin space. */
-           dt.proc-def1 { margin-top: 0ex; margin-bottom: 3ex; }
-           dt.proc-defi { margin-top: 0ex; margin-bottom: 0ex; }
-           dt.proc-defn { margin-top: 0ex; margin-bottom: 0ex; }
-
-           /* m-t works weird depending on whether or not the last line
-           ** of the previous entry was a pre. Set to zero.
-           */
-           dt.proc-def  { margin-top: 0ex; margin-bottom: 3ex; }
-
-           /* m-b sets space between dd & dt; m-t ignored. */
-           dd.proc-def { margin-bottom: 0.5ex; margin-top: 0ex; } 
-
-
-           /* Boldface the name of a procedure when it's being defined. */
-           code.proc-def { font-weight: bold; font-size: 110%}
-
-           /* For the index of procedures. 
-           ** Same hackery as for dt.proc-def, above.
-           */
-           /* m-b sets space between dd & dt; m-t ignored. */
-           dd.proc-index  { margin-bottom: 0ex; margin-top: 0ex; } 
-           /* What the fuck? */
-           pre.proc-index { margin-top: -2ex; }
-
-           /* Pull the table of contents back flush with the margin.
-           ** Both NS & IE screw this up in different ways.
-           */
-           #toc-table { margin-top: -2ex; margin-left: -5%; }
-
-           /* R5RS proc names are in italic; extended R5RS names 
-           ** in italic boldface.
-           */
-           span.r5rs-proc { font-weight: bold; }
-           span.r5rs-procx { font-style: italic; font-weight: bold; }
-
-           /* Spread out bibliographic lists. */
-           /* More Netscape-specific lossage; see the following stylesheet
-           ** for the proper values (used by IE).
-           */
-           dt.biblio { margin-bottom: 3ex; }
-
-           /* Links to draft copies (e.g., not at the official SRFI site)
-           ** are colored in red, so people will use them during the 
-           ** development process and kill them when the document's done.
-           */
-           a.draft { color: red; }
-    </style>
-
-    <style type="text/css" media=all>
-           /* Nastiness: Here, I'm using a bug to work around a bug.
-           ** Netscape rendering bugs mean you need bogus <dt> and <dd>
-           ** margin settings -- settings which screw up IE's proper rendering.
-           ** Fortunately, Netscape has *another* bug: it will ignore this
-           ** media=all style sheet. So I am placing the (proper) IE values
-           ** here. Perhaps, one day, when these rendering bugs are fixed,
-           ** this gross hackery can be removed.
-           */
-           dt.proc-def1 { margin-top: 3ex; margin-bottom: 0ex; }
-           dt.proc-defi { margin-top: 0ex; margin-bottom: 0ex; }
-           dt.proc-defn { margin-top: 0ex; margin-bottom: 0.5ex; }
-           dt.proc-def  { margin-top: 3ex; margin-bottom: 0.5ex; }
-
-           pre { margin-top: 1ex; }
-
-           dd.proc-def { margin-bottom: 2ex; margin-top: 0.5ex; } 
-
-           /* For the index of procedures. 
-           ** Same hackery as for dt.proc-def, above.
-           */
-           dd.proc-index { margin-top: 0ex; } 
-           pre.proc-index { margin-top: 0ex; }
-
-           /* Spread out bibliographic lists. */
-           dt.biblio { margin-top: 3ex; margin-bottom: 0ex; }
-           dd.biblio { margin-bottom: 1ex; }
-    </style>
-  </head>
-
-<body>
-
-<!--========================================================================-->
-<H1>Title</H1>
-
-<div class=title-text>SRFI 13: String Libraries</div>
-
-<!--========================================================================-->
-<H1>Author</H1>
-
-Olin Shivers
-
-<H1>Status</H1>
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion via <A HREF="http://srfi.schemers.org/srfi-13/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P><UL>
-<LI>Received: 1999/10/17
-<LI>Draft: 1999/10/18-1999/12/16
-<LI>Revised: 1999/10/31
-<LI>Revised: 1999/11/13
-<LI>Revised: 1999/11/22
-<LI>Revised: 2000/04/30
-<LI>Revised: 2000/06/09
-<LI>Revised: 2000/12/23
-</UL>
-
-<h1>Table of contents</H1>
-
-<!-- A bug in netscape (?) keeps the first link in this UL from being active.
-==== So the Abstract link be dead. 99/8/22 -Olin
--->
-<ul id=toc-table>
-<li><a href="#Abstract">Abstract</a>
-<li><a href="#ProcedureIndex">Procedure index</a>
-<li><a href="#Rationale">Rationale</a>
-  <ul>
-  <li><a href="#StringsAreCodePointSeqs">Strings are code-point sequences</a>
-  <li><a href="#NoLocales">String operations are locale- and context-independent</a>
-  <li><a href="#Unicode">Internationalisation &amp; super-ASCII character types</a>
-    <ul>
-    <li><a href="#Case">Case mapping and case folding</a>
-    <li><a href="#Eq">String equality &amp; string normalisation</a>
-    <li><a href="#Ineq">String inequality</a>    
-    </ul>
-  <li><a href="#NamingConventions">Naming conventions</a>
-  <li><a href="#SharedStorage">Shared storage</a>
-  <li><a href="#R5RS-procs">R4RS/R5RS procedures</a>
-  <li><a href="#ExtraSRFI">Extra-SRFI recommendations</a>
-  </ul>
-
-<li><a href="#Procedures">Procedure specification</a>
-  <ul>
-  <li><a href="#MainProcs">Main procedures</a>
-    <ul>
-    <li><a href="#Predicates">Predicates</a>
-    <li><a href="#Constructors">Constructors</a>
-    <li><a href="#List2String">List &amp; string conversion</a>
-    <li><a href="#Selection">Selection</a>
-    <li><a href="#Modification">Modification</a>
-    <li><a href="#Comparison">Comparison</a>
-    <li><a href="#PrefixesSuffixes">Prefixes &amp; suffixes</a>
-    <li><a href="#Searching">Searching</a>
-    <li><a href="#CaseMapping">Alphabetic case mapping</a>
-    <li><a href="#ReverseAppend">Reverse &amp; append</a>
-    <li><a href="#FoldUnfoldMap">Fold, unfold &amp; map</a>
-    <li><a href="#ReplicateRotate">Replicate &amp; rotate</a>
-    <li><a href="#Miscellaneous">Miscellaneous: insertion, parsing</a>
-    <li><a href="#FilterDelete">Filtering &amp; deleting</a>
-    </ul>
-
-  <li><a href="#LowLevelProcs">Low-level procedures</a>
-    <ul>
-    <li><a href="#ArgUtils">Start/end optional argument parsing &amp; checking utilities</a>
-    <li><a href="#KMP">Knuth-Morris-Pratt searching</a>
-    </ul>
-  </ul>
-
-<li><a href="#ReferenceImp">Reference implementation</a>
-<li><a href="#Acknowledgements">Acknowledgements</a>
-<li><a href="#Links">References &amp; Links</a>
-<li><a href="#Copyright">Copyright</a>
-</ul>
-
-<!--========================================================================-->
-<h1><a name="Abstract">Abstract</a></H1>
-<p>
-
-<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>
-Scheme has an impoverished set of string-processing utilities, which is a
-problem for authors of portable code. This <abbr title="Scheme Request for
-Implementation">SRFI</abbr> proposes a coherent and comprehensive set of
-string-processing procedures; it is accompanied by a reference implementation
-of the spec. The reference implementation is
-<ul>
-<li>portable
-<li>efficient
-<li>open source
-</ul>
-<p>
-The routines in this SRFI are backwards-compatible with the string-processing
-routines of
-<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>.
-
-<!--========================================================================-->
-<h1><a name="ProcedureIndex">Procedure Index</a></h1>
-<p>
-Here is a list of the procedures provided by the string-lib 
-and string-lib-internals packages.
-<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>
-procedures are shown in 
-<span class=r5rs-proc>bold</span>;
-extended <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>
-
-         procedures, in <span class=r5rs-procx>bold italic</span>.
-<div class=indent>
-<dl>
-<dt class=proc-index> Predicates
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-proc><a href="#string-p">string?</a></span> <a href="#string-null-p">string-null?</a> 
-<a href="#string-every">string-every</a> <a href="#string-any">string-any</a>
-</pre>
-
-<dt class=proc-index> Constructors
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-proc><a href="#make-string">make-string</a> <a href="#string">string</a></span> <a href="#string-tabulate">string-tabulate</a>
-</pre>
-
-<dt class=proc-index> List &amp; string conversion
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-procx><a href="#string2list">string->list</a></span> <span class=r5rs-proc><a href="#list2string">list->string</a></span>
-<a href="#reverse-list2string">reverse-list->string</a> <a href="#string-join">string-join</a>
-</pre>
-
-<dt class=proc-index> Selection
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-proc><a href="#string-length">string-length</a>
-<a href="#string-ref">string-ref</a></span>
-<span class=r5rs-procx><a href="#string-copy">string-copy</a></span>
-<a href="#substring/shared">substring/shared</a>
-<a href="#string-copy!">string-copy!</a> 
-<a href="#string-take">string-take</a> <a href="#string-take-right">string-take-right</a>
-<a href="#string-drop">string-drop</a> <a href="#string-drop-right">string-drop-right</a>
-<a href="#string-pad">string-pad</a>  <a href="#string-pad-right">string-pad-right</a> 
-<a href="#string-trim">string-trim</a> <a href="#string-trim-right">string-trim-right</a> <a href="#string-trim-both">string-trim-both</a> 
-</pre>
-
-<dt class=proc-index>Modification
-<dd class=proc-index>
-<pre class=proc-index>
-<span class=r5rs-proc><a href="#string-set!">string-set!</a></span> <span class=r5rs-procx><a href="#string-fill!">string-fill!</a></span>
-</pre>
-
-<dt class=proc-index>Comparison
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#string-compare">string-compare</a> <a href="#string-compare-ci">string-compare-ci</a>
-<a href="#string<>">string&lt;&gt;</a>     <a href="#string=">string=</a>    <a href="#string<">string&lt;</a>    <a href="#string>">string&gt;</a>    <a href="#string<=">string&lt;=</a>    <a href="#string>=">string&gt;=</a>
-<a href="#string-ci<>">string-ci&lt;&gt;</a>  <a href="#string-ci=">string-ci=</a> <a href="#string-ci<">string-ci&lt;</a> <a href="#string-ci>">string-ci&gt;</a> <a href="#string-ci<=">string-ci&lt;=</a> <a href="#string-ci>=">string-ci&gt;=</a>
-<a href="#string-hash">string-hash</a>  <a href="#string-hash-ci">string-hash-ci</a>
-</pre>
-
-<dt class=proc-index>Prefixes &amp; suffixes
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#string-prefix-length">string-prefix-length</a>    <a href="#string-suffix-length">string-suffix-length</a>
-<a href="#string-prefix-length-ci">string-prefix-length-ci</a> <a href="#string-suffix-length-ci">string-suffix-length-ci</a>
-
-<a href="#string-prefix-p">string-prefix?</a>    <a href="#string-suffix-p">string-suffix?</a>    
-<a href="#string-prefix-ci-p">string-prefix-ci?</a> <a href="#string-suffix-ci-p">string-suffix-ci?</a> 
-</pre>
-
-<dt class=proc-index>Searching
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#string-index">string-index</a> <a href="#string-index-right">string-index-right</a>
-<a href="#string-skip">string-skip</a>  <a href="#string-skip-right">string-skip-right</a> 
-<a href="#string-count">string-count</a> 
-<a href="#string-contains">string-contains</a> <a href="#string-contains-ci">string-contains-ci</a>
-</pre>
-
-<dt class=proc-index>Alphabetic case mapping
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#string-titlecase">string-titlecase</a>  <a href="#string-upcase">string-upcase</a>  <a href="#string-downcase">string-downcase</a>
-<a href="#string-titlecase!">string-titlecase!</a> <a href="#string-upcase!">string-upcase!</a> <a href="#string-downcase!">string-downcase!</a>
-</pre>
-
-<dt class=proc-index>Reverse &amp; append
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#string-reverse">string-reverse</a> <a href="#string-reverse!">string-reverse!</a>
-<span class=r5rs-proc><a href="#string-append">string-append</a></span>
-<a href="#string-concatenate">string-concatenate</a>
-<a href="#string-concatenate/shared">string-concatenate/shared</a> <a href="#string-append/shared">string-append/shared</a>
-<a href="#string-concatenate-reverse">string-concatenate-reverse</a> <a href="#string-concatenate-reverse/shared">string-concatenate-reverse/shared</a>
-</pre>
-
-<dt class=proc-index>Fold, unfold &amp; map
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#string-map">string-map</a>      <a href="#string-map!">string-map!</a>
-<a href="#string-fold">string-fold</a>     <a href="#string-fold-right">string-fold-right</a>
-<a href="#string-unfold">string-unfold</a>   <a href="#string-unfold-right">string-unfold-right</a>
-<a href="#string-for-each">string-for-each</a> <a href="#string-for-each-index">string-for-each-index</a>
-</pre>
-
-<dt class=proc-index>Replicate &amp; rotate
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#xsubstring">xsubstring</a> <a href="#string-xcopy!">string-xcopy!</a>
-</pre>
-
-<dt class=proc-index>Miscellaneous: insertion, parsing
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#string-replace">string-replace</a> <a href="#string-tokenize">string-tokenize</a>
-</pre>
-
-<dt class=proc-index>Filtering &amp; deleting
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#string-filter">string-filter</a> <a href="#string-delete">string-delete</a> 
-</pre>
-
-<dt class=proc-index>Low-level procedures
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#string-parse-start+end">string-parse-start+end</a>
-<a href="#string-parse-final-start+end">string-parse-final-start+end</a>
-<a href="#let-string-start+end">let-string-start+end</a>
-
-<a href="#check-substring-spec">check-substring-spec</a>
-<a href="#substring-spec-ok-p">substring-spec-ok?</a>
-
-<a href="#make-kmp-restart-vector">make-kmp-restart-vector</a> <a href="#kmp-step">kmp-step</a> <a href="#string-kmp-partial-search">string-kmp-partial-search</a>
-</pre>
-
-</dl>
-</div>
-
-<!--========================================================================-->
-<h1><a name="Rationale">Rationale</a></h1>
-<p>
-
-This SRFI defines two libraries that provide a rich set of operations for
-manipulating strings. These are frequently useful for scripting and other
-text-manipulation applications. The library's design was influenced by the
-string libraries found in MIT Scheme, Gambit, RScheme, MzScheme, slib, Common
-Lisp, Bigloo, guile, Chez, APL, Java, and the SML standard basis.
-<p>
-
-All procedures involving character comparison are available in
-both case-sensitive and case-insensitive forms.
-<p>
-
-All functionality is available in substring and full-string forms.
-
-<!--========================================================================-->
-<h2><a name="StringsAreCodePointSeqs">Strings are code-point sequences</a></h2>
-<p>
-This SRFI considers strings simply to be a sequence of "code points" or
-character encodings. Operations such as comparison or reversal are always done
-code point by code point. See the comments below on super-ASCII character
-types for implications that follow.
-<p>
-
-It's entirely possible that a legal string might not be a sensible "text"
-sequence. For example, consider a string comprised entirely of zero-width
-Unicode accent characters with no preceding base character to modify --
-this is a legal string, albeit one that does not make a great deal of sense
-when interpreted as a sequence of natural-language text. The routines in
-this SRFI do not handle these "text" concerns; they restrict themselves
-to the underlying view of strings as merely a sequence of "code points."
-
-<!--========================================================================-->
-<h2><a name="NoLocales">String operations are locale- and context-independent</a></h2>
-<p>
-
-This SRFI defines string operations that are locale- and context-independent.
-While it is certainly important to have a locale-sensitive comparison or
-collation procedure when processing text, it is also important to have a suite
-of operations that are reliably invariant for basic string processing ---
-otherwise, a change of locale could cause data structures such as hash tables,
-b-trees, symbol tables, directories of filenames, <em>etc.</em> 
-to become corrupted.
-
-<p>
-Locale- and context-sensitive text operations, such as collation, are
-explicitly deferred to a subsequent, companion "text" SRFI.
-
-<!--========================================================================-->
-<h2><a name="Unicode">Internationalisation &amp; super-ASCII character types</a></h2>
-
-<p>
-The major issue confronting this SRFI is the existence of super-ASCII
-character encodings, such as eight-bit Latin-1 or 16- and 32-bit Unicode.  It
-is a design goal of this SRFI for the API to be portable across string
-implementations based on at least these three standard encodings.
-Unfortunately, this places strong limitations on the API design. Here are
-some relevant issues. Be warned that life in a super-ASCII world is
-significantly more complex; there are no easy answers for many of these issues.
-
-<!--========================================================================-->
-<h3><a name="Case">Case mapping and case-folding</a></h3>
-
-<p>
-Upper- and lower-casing characters is complex in super-ASCII encodings.
-
-<ul>
-<li> Some characters case-map to more than one character. For example,
-  the Latin-1 German eszet character upper-cases to "SS." 
-  <ul>
-  <li> This means that the <abbr title="Revised^5 Report on Scheme">
-    <a href="#R5RS">R5RS</a></abbr> function <code>char-upcase</code> is not well-defined, 
-    since it is defined to produce a (single) character result. 
-
-  <li> It means that an in-place <code>string-upcase!</code> procedure cannot be reliably
-    defined, since the original string may not be long enough to contain
-    the result -- an N-character string might upcase to a 2N-character result.
-
-  <li> It means that case-insensitive string-matching or searching is quite
-    tricky. For example, an n-character string <var>s</var> might match a 2N-character
-    string <var>s'</var>.
-  </ul>
-
-<li> Some characters case-map in different ways depending upon their surrounding
-  context. For example, the Unicode Greek capital sigma character downcases
-  differently depending upon whether or not it is the final character in a
-  word. Again, this spells trouble for the simple <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> <code>char-downcase</code> function.
-
-<li> Unicode defines three cases: lowercase, uppercase and titlecase. The
-  distinction between uppercase and titlecase arises in the presence of
-  Unicode's compound characters. For example, Unicode has a single character
-  representing the compound pair "dz." Uppercasing the "dz" character produces
-  the compound character "DZ", while titlecasing (or, as Americans say,
-  capitalizing) it produces compound character "Dz".
-
-<li> Turkish actually has different case-mappings from other languages.
-</ul>
-
-<p>
-The Unicode Consortium's web site
-<div class=inset>
-    <a href="http://www.unicode.org/">http://www.unicode.org/</a>
-</div>
-<p class=continue>
-has detailed discussions of the issues. See in particular technical report
-21 on case mappings
-<div class=inset>
-    <a href="http://www.unicode.org/unicode/reports/tr21/">http://www.unicode.org/unicode/reports/tr21/</a>
-</div>
-
-<p>
-SRFI 13 makes no attempt to deal with these issues; it uses a simple 1-1
-locale- and context-independent case-mapping, specifically Unicode's 1-1
-case-mappings given in
-<div class=inset>
-    <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-</div>
-<p class=continue>
-The format of this file is explained in
-<div class=inset>
-    <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.html">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.html</a>
-</div>
-<p class=continue>
-Note that this means that German eszet upper-cases to itself, not "SS".
-
-<p>
-Case-mapping and case-folding operations in SRFI 13 are locale-independent so
-that shifting locales won't wreck hash tables, b-trees, symbol tables, <em>etc.</em>
-
-
-<!--========================================================================-->
-<h3><a name="Eq">String equality &amp; string normalisation</a></h3>
-
-<p>
-Comparing strings for equality is complicated because in some cases Unicode
-actually provides multiple encodings for the "same" character, and because
-what we usually think of as a "character" can be represented in Unicode as a
-<em>sequence</em> of several code-points. For example, consider the letter "e" with
-an acute accent. There is a single Unicode character for this. However,
-Unicode also allows one to represent this with a two-character sequence: the
-"e" character followed by a zero-width acute-accent character. As another
-example, Unicode provides some Asian characters in "narrow" and "full" widths.
-
-<p>
-There are multiple ways we might want to compare strings for equality. In
-(roughly) decreasing order of precision,
-
-<ul>
-<li> we might want a precise comparison of the actual encoding, so that
-  &lt;e-acute&gt; would <em>not</em> compare equal to &lt;e, acute&gt;.
-
-<li> We might want a "normalised" comparison, where these two sequences 
-     would compare equal.
-
-<li> We might want an even more-permissive normalisation, where visually-distinct
-  properties of "the same" character would be ignored. For example, we might
-  want narrow/full-width versions of the same Asian character to compare equal.
-
-<li> We might want comparisons that are insensitive to accents and diacritical
-  marks.
-
-<li> We might want comparisons that are case-insensitive.
-
-<li> We might want comparisons that are insensitive to several of the above
-  properties.
-
-<li> We might want ways to "normalise" strings into various canonical forms.
-</ul>
-
-<p>
-This library does not address these complexities. SRFI 13 string equality is
-simply based upon comparing the encoding values used for the characters.
-Accent-insensitive and other types of comparison are not provided; only
-a simple form of case-insensitive comparison is provided, which uses the
-1-1 case mappings specified by Unicode in
-<div class=inset>
-    <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-</div>
-<p class=continue>
-These are adequate for "program" or "systems" use of strings (<em>e.g.</em>, to 
-manipulate program identifiers and operating-system filenames).
-
-<!--========================================================================-->
-<h3><a name="Ineq">String inequality</a></h3>
-
-<p>
-Above and beyond the issues arising in string-equality, when we attempt
-to order strings there are even further considerations.
-
-<ul>
-<li> French orders accents with right-to-left significance -- the reverse of
-  the significance of the characters.
-
-<li> Case-insensitive ordering is not well defined by simple "code-point"
-  considerations, even for simple ASCII: there are punctuation characters
-  between the ASCII's upper-case range of letters and its lower-case range
-  (left-bracket, backslash, right-bracket, caret, underbar and backquote).
-  Does left-bracket compare less-than or greater-than "a" in a
-  case-insensitive comparison? 
-
-<li> The German eszet character should sort as if it were the <em>pair</em> of
-  letters "ss".
-</ul>
-
-<p>
-Unicode defines a complex set of machinery for ordering or "collating"
-strings, which involves mapping each string to a multi-byte sort key,
-and then doing simple lexicographic sorting with these keys. These rules
-can be overlaid by additional domain- or language-specific rules. Again,
-this SRFI does not address these issues. SRFI 13 string ordering is strictly
-based upon a character-by-character comparison of the values used for
-representing the string.
-
-<!--========================================================================-->
-<h2><a name="NamingConventions">Naming conventions</a></h2>
-
-<p>
-This library contains a large number of procedures, but they follow
-a consistent naming scheme, and are consistent with the conventions
-developed in SRFI 1. The names are composed of smaller lexemes
-in a regular way that exposes the structure and relationships between the
-procedures. This should help the programmer to recall or reconstitute the name
-of the particular procedure that he needs when writing his own code. In
-particular
-
-<ul>
-    <li> Procedures whose names end in "-ci" are case-insensitive variants.
-
-    <li> Procedures whose names end in "!" are side-effecting variants.
-      What values these procedures return is usually not specified.
-
-    <li> The order of common parameters is consistent across the
-      different procedures.
-
-    <li> Left/right/both directionality:
-      Procedures that have left/right directional variants
-      use the following convention:
-          <div class=indent>
-          <table cellspacing=0 cellpadding=0>
-          <tr align=left><th>Direction</th>
-                         <th>&nbsp;&nbsp;</th>
-                         <th>Suffix</th></tr>
-          <tr><td>left-to-right</td><td></td><td><em>none</em></td></tr>
-          <tr><td>right-to-left</td><td></td><td><code>-right</code></td></tr>
-          <tr><td>both         </td><td></td><td><code>-both</code></td></tr>
-          </table>
-          </div>
-
-      This is a general convention that was established in SRFI 1.
-      The value of a convention is proportional to the extent of its 
-      use.
-</ul>
-      
-<!--========================================================================-->
-<h2><a name="SharedStorage">Shared storage</a></h2>
-
-<p>
-Some Scheme implementations, <em>e.g.</em> guile and T, provide ways to construct
-substrings that share storage with other strings. This facility is called
-"shared-text substrings." Shared-text substrings can be used to eliminate the
-allocation and copying time and space required to produce substrings, which
-can be a tremendous savings for some applications, reducing a linear-time
-operation to constant time.  Additionally, some algorithms rely on the sharing
-property of these substrings -- the application assumes that if the underlying
-storage is mutated, then all strings sharing that storage will show the
-change.  However, shared-text substrings are not a common feature; most Scheme
-implementations do not provide them.
-
-<p>
-SRFI 13 takes a middle ground with respect to shared-text substrings.  In
-particular, a Scheme implementation does not need to have shared-text
-substrings in order to implement this SRFI.
-
-<p>
-There is an additional form of storage sharing enabled by some SRFI 13
-procedures, even without the benefit of shared-text substrings. In 
-some cases, some SRFI 13 routines are allowed to return as a result one
-of the strings that was passed in as a parameter. For example, when
-constructing a substring with the <code>substring/shared</code> procedure, if the
-requested substring is the entire string, the procedure is permitted
-simply to return the original value. That is,
-<pre class=code-example>
-(eq? s (substring/shared s 0 (string-length s))) =&gt; true or false
-</pre>
-<p class=continue>
-whereas the <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> 
-<code>substring</code> function is required to allocate a fresh copy
-<pre class=code-example>
-(eq? s (substring s 0 (string-length s))) =&gt; false.
-</pre>
-<p>
-In keeping with SRFI 13's general approach to sharing, compliant
-implementations are allowed, but not required, to provide this kind of
-sharing. Hence, procedures may not <em>rely</em> upon sharing in these cases.
-<p class=continue>
-Most procedures that permit results to share storage with inputs have
-equivalent procedures that require allocating fresh storage for results. 
-If an application wishes to be sure a new, fresh string is allocated, then 
-these "pure" procedures should be used.
-<div class=inset>
-<table cellpadding=0 cellspacing=0>
-<tr align=left><th>Fresh copy guaranteed</th>
-               <th>Sharing permitted</th></tr>
-<tr><td><code>string-copy</code></td>
-    <td><code>substring/shared</code></td></tr>
-<tr><td><code>string-copy</code></td>
-    <td><code>string-take string-take-right</code></td></tr>
-<tr><td><code>string-copy</code></td>
-    <td><code>string-drop string-drop-right</code></tr>
-<tr><td><code>string-concatenate</code></td>
-    <td><code>string-concatenate/shared</code></tr>
-<tr><td><code>string-append</code></td> 
-    <td><code>string-append/shared</code></td></tr>
-<tr><td><code>string-concatenate-reverse</code>
-    <td><code>string-concatenate-reverse/shared</code></td></tr>
-<tr><td></td>
-    <td><code>string-pad string-pad-right</code></td></tr>
-<tr><td></td>
-    <td><code>string-trim string-trim-right</code></td></tr>
-<tr><td></td>
-    <td><code>string-trim-both</code></td></tr> <!-- netscape blows up. -->
-<tr><td></td>
-    <td><code>string-filter string-delete</code></td></tr>
-</table>
-</div>
-
-<p>
-On the other hand, the functionality is present to allow one to write
-efficient code <em>without</em> shared-text substrings. You can write efficient code
-that works by passing around start/end ranges indexing into a string instead
-of simply building a shared-text substring. The API would be much simpler
-without this consideration -- if we had cheap shared-text substrings, all the
-start/end index parameters would vanish. However, since SRFI 13 does not
-require implementations to provide shared-text substrings, the extended
-API is provided.
-
-<!--========================================================================-->
-<h2><a name="R5RS-procs">R4RS/R5RS procedures</a></h2>
-
-<p>
-The R4RS and <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> reports define 22 string procedures. The string-lib
-package includes 8 of these exactly as defined, 3 in an extended,
-backwards-compatible way, and drops the remaining 11 (whose functionality
-is available via other bindings).
-
-<p>
-The 8 procedures provided exactly as documented in the reports are
-    <code>string?</code>,
-    <code>make-string</code>,
-    <code>string</code>,
-    <code>string-length</code>,
-    <code>string-ref</code>,
-    <code>string-set!</code>,
-    <code>string-append</code>, and
-    <code>list-&gt;string</code>.
-
-<p>
-The eleven functions not included are
-    <code>string=?</code>, <code>string-ci=?</code>,
-    <code>string&lt;?</code>,  <code>string-ci&lt;?</code>,
-    <code>string&gt;?</code>,  <code>string-ci&gt;?</code>,
-    <code>string&lt;=?</code>, <code>string-ci&lt;=?</code>,
-    <code>string&gt;=?</code>, <code>string-ci&gt;=?</code>, and
-    <code>substring</code>.
-The string-lib package provides alternate bindings and extended functionality.
-
-<p>
-Additionally, the three extended procedures are
-<pre class=code-example>
-string-fill! <var>s char [start end] -&gt; unspecified</var>
-string-&gt;list <var>s [start end] -&gt; char-list</var>
-string-copy  <var>s [start end] -&gt; string</var>
-</pre>
-<p class=continue>
-They are uniformly extended to take optional start/end parameters specifying
-substring ranges.
-
-<!--========================================================================-->
-<h2><a name="ExtraSRFI">Extra-SRFI recommendations</a></h2>
-
-<p>
-This SRFI recommends the following
-
-<ul>
-<li> A SRFI be defined for shared-text substrings, allowing programs to
-  be written that actually rely on the shared-storage properties of these data
-  structures.
-
-<li> A SRFI be defined for manipulating Unicode text -- various normalisation
-  operations, collation, searching, <em>etc.</em> Collation operations might be
-  parameterised by a "collation" structure representing collation rules
-  for a particular locale or language. Alternatively, a data structure
-  specifying collation rules could be activated with dynamic scope by
-  special procedures, possibly overridden by allowing collation rules
-  to be optional arguments to procedures that need to order strings, <em>e.g.</em>
-<pre class=code-example>
-(with-locale* denmark-locale
-  (lambda () 
-    (f x)
-    (g 42)))
-
-(with-locale taiwan-locale
-  (f x)
-  (h denmark-locale)
-  (g 42))
-
-(set-locale! denmark-locale)
-</pre>
-
-<li> A SRFI be defined for manipulating characters that is portable across
-  at least ASCII, Latin-1 and Unicode. 
-
-  <ul>
-  <li> For backwards-compatibility, <code>char-upcase</code> and <code>char-downcase</code> should 
-    be defined to use the 1-1 locale- and context-insensitive case
-    mappings given by Unicode's UnicodeData.txt table.
-  
-  <li> numeric codes for standard functions that map between characters and
-    integers should be required to use the Unicode/Latin-1/ASCII mapping. This
-    allows programmers to write portable code.
-
-  <li> <code>char-titlecase</code> be added to <code>char-upcase</code> and <code>char-downcase</code>.
-
-  <li> <code>char-titlecase?</code> be added to <code>char-upcase?</code> and <code>char-downcase?</code>.
-
-  <li> Title/up/down-case functions be added to the character-processing suite
-    which allow 1-&gt;n case maps by returning immutable,
-    possibly-multi-character strings instead of single characters. These case
-    mappings need not be locale- or context-sensitive.
-  </ul>
-</ul>
-
-<p>
-  These recommendations are not a part of the SRFI 13 spec. Note also that
-  requiring a Unicode/Latin-1/ASCII interface to integer/char mapping
-  functions does not imply anything about the actual underlying encodings of
-  characters.
-
-
-<!--========================================================================-->
-<h1><a name="Procedures">Procedure Specification</a></h1>
-
-<p>
-In the following procedure specifications:
-<ul>
-    <li> An <var>s</var> parameter is a string.
-
-    <li> A <var>char</var> parameter is a character.
-
-    <li> <var>Start</var> and <var>end</var> parameters are half-open string indices specifying 
-      a substring within a string parameter; when optional, they default
-      to 0 and the length of the string, respectively. When specified, it
-      must be the case that 0 &lt;= <var>start</var> &lt;= <var>end</var> 
-      &lt;= <code>(string-length <var>s</var>)</code>, for
-      the corresponding parameter <var>s</var>. They typically restrict a procedure's
-      action to the indicated substring.
-
-    <li> A <var>pred</var> parameter is a unary character predicate procedure, returning 
-      a true/false value when applied to a character.
-
-    <li> A <var>char/char-set/pred</var> parameter is a value used to select/search
-      for a character in a string. If it is a character, it is used in
-      an equality test; if it is a character set, it is used as a
-      membership test; if it is a procedure, it is applied to the 
-      characters as a test predicate.
-
-    <li> An <var>i</var> parameter is an exact non-negative integer specifying an index
-      into a string.
-    
-    <li> <var>Len</var> and <var>nchars</var> parameters are exact non-negative integers specifying a
-      length of a string or some number of characters.
-
-    <li> An <var>obj</var> parameter may be any value at all.
-</ul>
-<p class=continue>
-Passing values to procedures with these parameters that do not satisfy these
-types is an error.
-
-<p>
-Parameters given in square brackets are optional. Unless otherwise noted in the
-text describing the procedure, any prefix of these optional parameters may
-be supplied, from zero arguments to the full list. When a procedure returns
-multiple values, this is shown by listing the return values in square
-brackets, as well. So, for example, the procedure with signature
-<pre class=code-example>
-halts? <var>f [x init-store]</var> -> <var>[boolean integer]</var>
-</pre>
-would take one (<var>f</var>), two (<var>f</var>, <var>x</var>) 
-or three (<var>f</var>, <var>x</var>, <var>init-store</var>) input parameters, 
-and return two values, a boolean and an integer.
-
-<p>
-A parameter followed by "<code>...</code>" means zero-or-more elements. 
-So the procedure with the signature
-<pre class=code-example>
-sum-squares <var>x ... </var> -> <var>number</var>
-</pre>
-takes zero or more arguments (<var>x ...</var>), 
-while the procedure with signature
-<pre class=code-example>
-spell-check <var>doc dict<sub>1</sub> dict<sub>2</sub> ...</var> -> <var>string-list</var>
-</pre>
-takes two required parameters 
-(<var>doc</var> and <var>dict<sub>1</sub></var>) 
-and zero or more optional parameters (<var>dict<sub>2</sub> ...</var>).
-
-<p>
-If a procedure is said to return "unspecified," this means that nothing at
-all is said about what the procedure returns. Such a procedure is not even
-required to be consistent from call to call. It is simply required to
-return a value (or values) that may be passed to a command continuation,
-<em>e.g.</em> as the value of an expression appearing as a non-terminal 
-subform of a <code>begin</code> expression. 
-Note that in 
-    <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>,
-this restricts such a procedure to returning a single value; 
-non-R5RS systems may not even provide this restriction.
-
-<!--========================================================================-->
-<h2><a name="MainProcs">Main procedures</a></h2>
-
-<p>
-In a Scheme system that has a module or package system, these procedures
-should be contained in a module named "string-lib".
-
-<!--========================================================================-->
-<h3><a name="Predicates">Predicates</a></h3>
-
-<dl>
-<!--
-==== string?
-============================================================================-->
-<dt class=proc-def>
-<a name="string-p"></a>
-<code class=proc-def>string?</code><var> obj -&gt; boolean</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-Returns <code>#t</code> if <var>obj</var> is a string, otherwise returns <code>#f</code>.
-
-<!--
-==== string-null?
-============================================================================-->
-<dt class=proc-def>
-<a name="string-null-p"></a>
-<code class=proc-def>string-null?</code><var> s -> boolean</var>
-<dd class=proc-def>
-    Is <var>s</var> the empty string?
-</dd>
-
-<!--
-==== string-every string-any
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-every"></a>
-<a name="string-any"></a>
-<code class=proc-def>string-every</code><var> char/char-set/pred s [start end] -> value</var>
-<dt class=proc-defn><code class=proc-def>string-any</code><var> char/char-set/pred s [start end] -> value</var>
-<dd class=proc-def>
-    Checks to see if the given criteria is true of every / any character in <var>s</var>,
-    proceeding from left (index <var>start</var>) to right (index <var>end</var>).
-
-<p>
-    If <var>char/char-set/pred</var> is a character, it is tested for equality with
-    the elements of <var>s</var>.
-
-<p>
-    If <var>char/char-set/pred</var> is a character set, the elements of <var>s</var> are tested
-    for membership in the set.
-
-<p>
-    If <var>char/char-set/pred</var> is a predicate procedure, it is applied to the 
-    elements of <var>s</var>. The predicate is "witness-generating:"
-
-    <ul>
-      <li> If <code>string-any</code> returns true, the returned true value is the one produced
-        by the application of the predicate.
-    
-      <li> If <code>string-every</code> returns true, the returned true value is the one
-        produced by the final application of the predicate to <var>s</var>[<var>end</var>]. 
-        If <code>string-every</code> is applied to an empty sequence of characters, 
-        it simply returns <code>#t</code>.
-    </ul>
-      If <code>string-every</code> or <code>string-any</code> apply the predicate to the final element
-      of the selected sequence (<em>i.e.</em>, <var>s</var>[<var>end</var>-1]), that final application is a
-      tail call.
-
-<p>
-    The names of these procedures do not end with a question mark -- this is to
-    indicate that, in the predicate case, they do not return a simple boolean
-    (<code>#t</code> or <code>#f</code>), but a general value.
-</dl>
-
-
-<!--========================================================================-->
-<h3><a name="Constructors">Constructors</a></h3>
-
-<dl>
-<!--
-==== make-string
-============================================================================-->
-<dt class=proc-def>
-<a name="make-string"></a>
-<code class=proc-def>make-string</code> <var>len [char] -&gt; string</var>
-<dd class=proc-def>
-  [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-  <code>make-string</code> returns a newly allocated string of length <var>len</var>.  If
-  <var>char</var> is given, then all elements of the string are initialized
-  to <var>char</var>, otherwise the contents of the string are unspecified.
-
-<!--
-==== string
-============================================================================-->
-<dt class=proc-def>
-<a name="string"></a>
-<code class=proc-def>string</code><var> char<sub>1</sub> ... -> string</var>
-<dd class=proc-def>
-  [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-  Returns a newly allocated string composed of the argument characters.
-    
-<!--
-==== string-tabulate
-============================================================================-->
-<dt class=proc-def>
-<a name="string-tabulate"></a>
-<code class=proc-def>string-tabulate</code><var> proc len -> string</var>
-<dd class=proc-def>
-    <var>Proc</var> is an integer->char procedure. Construct a string of size <var>len</var>
-    by applying <var>proc</var> to each index to produce the corresponding string
-    element. The order in which <var>proc</var> is applied to the indices is not
-    specified.
-
-</dl>
-
-<!--========================================================================-->
-<h3><a name="List2String">List &amp; string conversion</a></h3>
-
-<dl>
-
-<!--
-==== string->list list->string
-============================================================================-->
-<dt class=proc-def1>
-<a name="string2list"></a>
-<a name="list2string"></a>
-<code class=proc-def>string-&gt;list</code><var> s [start end] -> char-list</var>
-<dt class=proc-defn><code class=proc-def>list-&gt;string</code><var> char-list -> string</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>+]
-    <code>string->list</code> returns a newly allocated list of the characters
-    that make up the given string.  <code>list->string</code> returns a newly
-    allocated string formed from the characters in the list <var>char-list</var>,
-    which must be a list of characters. <code>string->list</code> and <code>list->string</code> 
-    are inverses so far as <code>equal?</code> is concerned.
-
-    <p>
-    <code>string->list</code> is extended from the <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> definition to take optional
-    <var>start/end</var> arguments.
-
-<!--
-==== reverse-list->string
-============================================================================-->
-<dt class=proc-def>
-<a name="reverse-list2string"></a>
-<code class=proc-def>reverse-list-&gt;string</code><var> char-list -> string</var>
-<dd class=proc-def>
-    An efficient implementation of <code>(compose list->string reverse)</code>:
-<pre class=code-example>
-(reverse-list->string '(#\a #\B #\c)) -> "cBa"
-</pre>
-    This is a common idiom in the epilog of string-processing loops
-    that accumulate an answer in a reverse-order list. (See also
-    <code>string-concatenate-reverse</code> for the "chunked" variant.)
-
-<!--
-==== string-join
-============================================================================-->
-<dt class=proc-def>
-<a name="string-join"></a>
-<code class=proc-def>string-join</code><var> string-list [delimiter grammar] -> string</var>
-<dd class=proc-def>
-    This procedure is a simple unparser --- it pastes strings together using
-    the delimiter string. 
-
-    <p>
-    The <var>grammar</var> argument is a symbol that determines how the delimiter is
-    used, and defaults to <code>'infix</code>.
-    
-<ul>
-      <li> <code>'infix</code> means an infix or separator grammar: 
-        insert the delimiter
-        between list elements.  An empty list will produce an empty string --
-        note, however, that parsing an empty string with an infix or separator
-        grammar is ambiguous. Is it an empty list, or a list of one element,
-        the empty string?
-    
-      <li> <code>'strict-infix</code> means the same as <code>'infix</code>, 
-        but will raise an error if given an empty list.
-    
-      <li> <code>'suffix</code> means a suffix or terminator grammar: 
-        insert the delimiter
-        after every list element. This grammar has no ambiguities.
-
-      <li> <code>'prefix</code> means a prefix grammar: insert the delimiter
-        before every list element. This grammar has no ambiguities.
-</ul>
-
-    The delimiter is the string used to delimit elements; it defaults to
-    a single space "&nbsp;".
-<pre class=code-example>
-(string-join '("foo" "bar" "baz") ":")         =&gt; "foo:bar:baz"
-(string-join '("foo" "bar" "baz") ":" 'suffix) =&gt; "foo:bar:baz:"
-
-;; Infix grammar is ambiguous wrt empty list vs. empty string,
-(string-join '()   ":") =&gt; ""
-(string-join '("") ":") =&gt; ""
-
-;; but suffix &amp; prefix grammars are not.
-(string-join '()   ":" 'suffix) =&gt; ""
-(string-join '("") ":" 'suffix) =&gt; ":"
-</pre>
-</dl>
-
-
-<!--========================================================================-->
-<h3><a name="Selection">Selection</a></h3>
-
-<dl>
-<!--
-==== string-length
-============================================================================-->
-<dt class=proc-def>
-<a name="string-length"></a>
-<code class=proc-def>string-length</code><var> s -> integer</var>
-<dd class=proc-def>
-  [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-  Returns the number of characters in the string <var>s</var>.
-
-<!--
-==== string-ref
-============================================================================-->
-<dt class=proc-def>
-<a name="string-ref"></a>
-<code class=proc-def>string-ref</code><var> s i -> char</var>
-<dd class=proc-def>
-  [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-  Returns character <var>s[i]</var> using zero-origin indexing.
-  <var>I</var> must be a valid index of <var>s</var>.  
-
-<!--
-==== string-copy substring/shared
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-copy"></a>
-<a name="substring/shared"></a>
-<code class=proc-def>string-copy</code><var>      s [start end] -> string</var>
-<dt class=proc-defn><code class=proc-def>substring/shared</code><var> s start [end] -> string</var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>+]
-    <code>substring/shared</code> returns a string whose contents are the characters of <var>s</var>
-    beginning with index <var>start</var> (inclusive) and ending with index <var>end</var>
-    (exclusive). It differs from the <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> <code>substring</code> in two ways:
-    <ul>
-      <li> The <var>end</var> parameter is optional, not required.
-      <li> <code>substring/shared</code> may return a value that shares memory with <var>s</var> or
-        is <code>eq?</code> to <var>s</var>.
-    </ul>
-
-    <p>
-    <code>string-copy</code> is extended from its <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> definition by the addition of
-    its optional <var>start/end</var> parameters. In contrast to <code>substring/shared</code>,
-    it is guaranteed to produce a freshly-allocated string.
-
-    <p>
-    Use <code>string-copy</code> when you want to indicate explicitly in your code that you
-    wish to allocate new storage; use <code>substring/shared</code> when you don't care if 
-    you get a fresh copy or share storage with the original string.
-<pre class=code-example>
-(string-copy "Beta substitution") =&gt; "Beta substitution"
-(string-copy "Beta substitution" 1 10) 
-    =&gt; "eta subst"
-(string-copy "Beta substitution" 5) =&gt; "substitution"
-</pre>
-
-<!--
-==== string-copy!
-============================================================================-->
-<dt class=proc-def>
-<a name="string-copy!"></a>
-<code class=proc-def>string-copy!</code><var> target tstart s [start end] -> unspecified</var>
-<dd class=proc-def>
-    Copy the sequence of characters from index range [<var>start</var>,<var>end</var>) in
-    string <var>s</var> to string <var>target</var>, beginning at index <var>tstart</var>. The characters 
-    are copied left-to-right or right-to-left as needed -- the copy is
-    guaranteed to work, even if <var>target</var> and <var>s</var> are the same string.
-
-    <p>
-    It is an error if the copy operation runs off the end of the target
-    string, <em>e.g.</em>
-<pre class=code-example>
-(string-copy! (string-copy "Microsoft") 0
-              "Regional Microsoft Operating Companies") =&gt; <em>error</em>
-</pre>
-
-
-<!--
-==== string-take string-drop string-take-right string-drop-right
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-take"></a>
-<a name="string-drop"></a>
-<a name="string-take-right"></a>
-<a name="string-drop-right"></a>
-<code class=proc-def>string-take</code><var> s nchars -> string</var>
-<dt class=proc-defi><code class=proc-def>string-drop</code><var> s nchars -> string</var>
-<dt class=proc-defi><code class=proc-def>string-take-right</code><var> s nchars -> string</var>
-<dt class=proc-defn><code class=proc-def>string-drop-right</code><var> s nchars -> string</var>
-<dd class=proc-def>
-    <code>string-take</code> returns the first <var>nchars</var> of <var>s</var>; 
-    <code>string-drop</code> returns all but the first <var>nchars</var> of <var>s</var>.
-    <code>string-take-right</code> returns the last <var>nchars</var> of <var>s</var>;
-    <code>string-drop-right</code> returns all but the last <var>nchars</var> of <var>s</var>.
-    If these procedures produce the entire string, they may return either
-    <var>s</var> or a copy of <var>s</var>; in some implementations, proper substrings may share
-    memory with <var>s</var>.
-<pre class=code-example>
-(string-take "Pete Szilagyi" 6) =&gt; "Pete S"
-(string-drop "Pete Szilagyi" 6) =&gt; "zilagyi"
-
-(string-take-right "Beta rules" 5) =&gt; "rules"
-(string-drop-right "Beta rules" 5) =&gt; "Beta "
-</pre>
-
-    It is an error to take or drop more characters than are in the string:
-<pre class=code-example>
-(string-take "foo" 37) =&gt; <em>error</em>
-</pre>
-
-<!--
-==== string-pad string-pad-right
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-pad"></a>
-<a name="string-pad-right"></a>
-<code class=proc-def>string-pad</code><var>       s len [char start end] -> string</var>
-<dt class=proc-defn><code class=proc-def>string-pad-right</code><var> s len [char start end] -> string</var>
-<dd class=proc-def>
-    Build a string of length <var>len</var> comprised of <var>s</var> padded on the left (right)
-    by as many occurrences of the character <var>char</var> as needed. If <var>s</var> has more
-    than <var>len</var> chars, it is truncated on the left (right) to length <var>len</var>. <var>Char</var>
-    defaults to #\space.
-
-    <p>
-    If <var>len</var> &lt;= <var>end</var>-<var>start</var>, the returned value is allowed to share storage
-    with <var>s</var>, or be exactly <var>s</var> (if <var>len</var> = <var>end</var>-<var>start</var>).
-<pre class=code-example>
-(string-pad     "325" 5) =&gt; "  325"
-(string-pad   "71325" 5) =&gt; "71325"
-(string-pad "8871325" 5) =&gt; "71325"
-</pre>
-
-<!--
-==== string-trim string-trim-right string-trim-both
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-trim"></a>
-<a name="string-trim-right"></a>
-<a name="string-trim-both"></a>
-<code class=proc-def>string-trim&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</code><var> s [char/char-set/pred start end] -> string</var>
-<dt class=proc-defi><code class=proc-def>string-trim-right</code><var> s [char/char-set/pred start end] -> string</var>
-<dt class=proc-defi><code class=proc-def>string-trim-both&nbsp;</code><var> s [char/char-set/pred start end] -> string</var>
-<dd class=proc-defn>
-    Trim <var>s</var> by skipping over all characters on the left / on the right /
-    on both sides that satisfy the second parameter <var>char/char-set/pred</var>:
-    <ul>
-        <li> if it is a character <var>char</var>, characters equal to <var>char</var> are trimmed;
-        <li> if it is a char set <var>cs</var>, characters contained in <var>cs</var> are trimmed;
-        <li> if it is a predicate <var>pred</var>, it is a test predicate that is applied
-          to the characters in <var>s</var>; a character causing it to return true
-          is skipped.
-    </ul>
-    <var>Char/char-set/pred</var> defaults to the character set <code>char-set:whitespace</code>
-    defined in <a href="#SRFI-14">SRFI 14</a>.
-
-    <p>
-    If no trimming occurs, these functions may return either <var>s</var> or a copy of <var>s</var>;
-    in some implementations, proper substrings may share memory with <var>s</var>.
-
-<pre class=code-example>
-(string-trim-both "  The outlook wasn't brilliant,  \n\r")
-    =&gt; "The outlook wasn't brilliant,"
-</pre>
-</dl>
-
-
-<!--========================================================================-->
-<h3><a name="Modification">Modification</a></h3>
-
-<dl>
-
-<!--
-==== string-set!
-============================================================================-->
-<dt class=proc-def>
-<a name="string-set!"></a>
-<code class=proc-def>string-set!</code><var> s i char -> unspecified                                     </var>
-<dd class=proc-def>
-  [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-  <var>I</var> must be a valid index of <var>s</var>.  <code>string-set!</code> stores <var>char</var> in
-  element <var>i</var> of <var>s</var>. Constant string literals appearing in code are 
-  immutable; it is an error to use them in a <code>string-set!.</code>
-
-<pre class=code-example>
-(define (f) (make-string 3 #\*))
-(define (g) "***")
-(string-set! (f) 0 #\?)                ==&gt;  <em>unspecified</em>
-(string-set! (g) 0 #\?)                ==&gt;  <em>error</em>
-(string-set! (symbol->string 'immutable)
-             3
-             #\?)                      ==&gt;  <em>error</em>
-</pre>
-
-<!--
-==== string-fill!
-============================================================================-->
-<dt class=proc-def>
-<a name="string-fill!"></a>
-<code class=proc-def>string-fill!</code><var> s char [start end] -> unspecified                          </var>
-<dd class=proc-def>
-    [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>+]
-    Stores <var>char</var> in every element of <var>s</var>.
-
-    <p>
-    <code>string-fill</code> is extended from the <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> definition to take optional
-    <var>start/end</var> arguments.
-
-</dl>
-
-<!--========================================================================-->
-<h3><a name="Comparison">Comparison</a></h3>
-
-<dl>
-
-<!--
-==== string-compare string-compare-ci
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-compare"></a>
-<a name="string-compare-ci"></a>
-<code class=proc-def>string-compare&nbsp;&nbsp;&nbsp;</code><var> s1 s2 proc&lt; proc= proc&gt; [start1 end1 start2 end2] -> values</var>
-<dt class=proc-defi><code class=proc-def>string-compare-ci</code><var> s1 s2 proc&lt; proc= proc&gt; [start1 end1 start2 end2] -> values</var>
-<dd class=proc-defn>
-Apply <var>proc&lt;</var>, <var>proc=</var>, or <var>proc&gt;</var>
- to the mismatch index, depending
-upon whether <var>s1</var> is less than, equal to, or greater than <var>s2</var>.
-The "mismatch index" is the largest index <var>i</var> such that for
-every 0 &lt;= <var>j</var> &lt; <var>i</var>, 
-<var>s1[j]</var> = <var>s2[j]</var>
--- that is, <var>i</var> is the first position that doesn't match.
-
-<p>
-<code>string-compare-ci</code> is the case-insensitive variant. Case-insensitive
-comparison is done by case-folding characters with the operation
-<pre class=code-example>
-(char-downcase (char-upcase <var>c</var>))
-</pre>
-where the two case-mapping operations are assumed to be 1-1, locale- and
-context-insensitive, and compatible with the 1-1 case mappings specified
-by Unicode's UnicodeData.txt table:
-<div class=inset>
-    <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-</div>
-
-<p>
-The optional start/end indices restrict the comparison to the indicated
-substrings of <var>s1</var> and <var>s2</var>. The mismatch index is always an index into <var>s1</var>;
-in the case of <var>proc=</var>, it is always <var>end1</var>; 
-we observe the protocol
-in this redundant case for uniformity.
-
-<pre class=code-example>
-(string-compare "The cat in the hat" "abcdefgh" 
-                values values values
-                4 6         ; Select "ca" 
-                2 4)        ; &amp; "cd"
-    =&gt; 5    ; Index of S1's "a"
-</pre>
-
-Comparison is simply done on individual code-points of the string. 
-True text collation is not handled by this SRFI.
-
-<!--
-==== string= string<> string< string> string<= string>=
-============================================================================-->
-<dt class=proc-def1>
-<a name="string="></a>
-<a name="string<>"></a>
-<a name="string<"></a>
-<a name="string>"></a>
-<a name="string<="></a>
-<a name="string>="></a>
-<code class=proc-def>string=&nbsp;</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defi><code class=proc-def>string&lt;&gt;</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defi><code class=proc-def>string&lt;&nbsp;</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defi><code class=proc-def>string&gt;&nbsp;</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defi><code class=proc-def>string&lt;=</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defn><code class=proc-def>string&gt;=</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dd class=proc-def>
-    These procedures are the lexicographic extensions to strings of the
-    corresponding orderings on characters.  For example, <code>string&lt;</code> is the
-    lexicographic ordering on strings induced by the ordering <code>char&lt;?</code> on
-    characters.  If two strings differ in length but are the same up to 
-    the length of the shorter string, the shorter string is considered to 
-    be lexicographically less than the longer string.
-
-    <p>
-    The optional start/end indices restrict the comparison to the indicated
-    substrings of <var>s1</var> and <var>s2</var>. 
-
-    <p>
-    Comparison is simply done on individual code-points of the string. 
-    True text collation is not handled by this SRFI.
-
-<!--
-==== string-ci= string-ci<> string-ci< string-ci> string-ci<= string-ci>=
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-ci="></a>
-<a name="string-ci<>"></a>
-<a name="string-ci<"></a>
-<a name="string-ci>"></a>
-<a name="string-ci<="></a>
-<a name="string-ci>="></a>
-<code class=proc-def>string-ci=&nbsp;</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defi><code class=proc-def>string-ci&lt;&gt;</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defi><code class=proc-def>string-ci&lt;&nbsp;</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defi><code class=proc-def>string-ci&gt;&nbsp;</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defi><code class=proc-def>string-ci&lt;=</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defn><code class=proc-def>string-ci&gt;=</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dd class=proc-def>
-    Case-insensitive variants.
-
-    <p>
-    Case-insensitive comparison is done by case-folding characters with 
-    the operation
-<pre class=code-example>
-(char-downcase (char-upcase <var>c</var>))
-</pre>
-    where the two case-mapping operations are assumed to be 1-1, locale- and
-    context-insensitive, and compatible with the 1-1 case mappings specified
-    by Unicode's UnicodeData.txt table:
-<div class=inset>
-        <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-</div>
-
-<!--
-==== string-hash string-hash-ci
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-hash"></a>
-<a name="string-hash-ci"></a>
-<code class=proc-def>string-hash&nbsp;&nbsp;&nbsp;</code><var> s [bound start end] -> integer</var>
-<dt class=proc-defn><code class=proc-def>string-hash-ci</code><var> s [bound start end] -> integer</var>
-<dd class=proc-def>
-Compute a hash value for the string <var>s</var>. 
-<var>Bound</var> is a non-negative
-exact integer specifying the range of the hash function. A positive
-value restricts the return value to the range [0,<var>bound</var>).
-
-<p>
-If <var>bound</var> is either zero or not given, the implementation may use
-an implementation-specific default value, chosen to be as large as
-is efficiently practical. For instance, the default range might be chosen
-for a given implementation to map all strings into the range of
-integers that can be represented with a single machine word.
-
-<p>
-The optional start/end indices restrict the hash operation to the 
-indicated substring of <var>s</var>.
-
-<p>
-<code>string-hash-ci</code> is the case-insensitive variant. Case-insensitive
-comparison is done by case-folding characters with the operation
-<pre class=code-example>
-(char-downcase (char-upcase <var>c</var>))
-</pre>
-where the two case-mapping operations are assumed to be 1-1, locale- and
-context-insensitive, and compatible with the 1-1 case mappings specified
-by Unicode's UnicodeData.txt table:
-<div class=inset>
-     <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">
-         ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-</div>
-
-<p>
-Invariants:
-<pre class=code-example>
-(&lt;= 0 (string-hash s b) (- b 1)) ; When B > 0.
-(string=    s1 s2)  =&gt;  (= (string-hash s1 b)    (string-hash s2 b))
-(string-ci= s1 s2)  =&gt;  (= (string-hash-ci s1 b) (string-hash-ci s2 b))
-</pre>
-
-<p>
-A legal but nonetheless discouraged implementation:
-<pre class=code-example>
-(define (string-hash    s . other-args) 1)
-(define (string-hash-ci s . other-args) 1)
-</pre>
-
-<p>
-    Rationale: allowing the user to specify an explicit bound simplifies user
-    code by removing the mod operation that typically accompanies every hash
-    computation, and also may allow the implementation of the hash function to
-    exploit a reduced range to efficiently compute the hash value. 
-    <em>E.g.</em>, for
-    small bounds, the hash function may be computed in a fashion such that
-    intermediate values never overflow into bignum integers, allowing the
-    implementor to provide a fixnum-specific "fast path" for computing the
-    common cases very rapidly.
-
-
-</dl>
-
-<!--========================================================================-->
-<h3><a name="PrefixesSuffixes">Prefixes &amp; suffixes</a></h3>
-
-<dl>
-<!--
-==== string-prefix-length    string-suffix-length
-==== string-prefix-length-ci string-suffix-length-ci
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-prefix-length"></a>
-<a name="string-suffix-length"></a>
-<a name="string-prefix-length-ci"></a>
-<a name="string-suffix-length-ci"></a>
-<code class=proc-def>string-prefix-length&nbsp;&nbsp;&nbsp;</code><var> s1 s2 [start1 end1 start2 end2] -> integer</var>
-<dt class=proc-defi><code class=proc-def>string-suffix-length&nbsp;&nbsp;&nbsp;</code><var> s1 s2 [start1 end1 start2 end2] -> integer</var>
-<dt class=proc-defi><code class=proc-def>string-prefix-length-ci</code><var> s1 s2 [start1 end1 start2 end2] -> integer</var>
-<dt class=proc-defn><code class=proc-def>string-suffix-length-ci</code><var> s1 s2 [start1 end1 start2 end2] -> integer</var>
-<dd class=proc-def>
-Return the length of the longest common prefix/suffix of the two strings.
-For prefixes, this is equivalent to the "mismatch index" for the strings
-(modulo the <var>start</var>i index offsets).
-
-<p>
-The optional start/end indices restrict the comparison to the indicated
-substrings of <var>s1</var> and <var>s2</var>.
-
-<p>
-<code>string-prefix-length-ci</code> and <code>string-suffix-length-ci</code> are the
-case-insensitive variants. Case-insensitive comparison is done by
-case-folding characters with the operation
-<pre class=code-example>
-(char-downcase (char-upcase c))
-</pre>
-where the two case-mapping operations are assumed to be 1-1, locale- and
-context-insensitive, and compatible with the 1-1 case mappings specified
-by Unicode's UnicodeData.txt table:
-<div class=inset>
-        <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-</div>
-Comparison is simply done on individual code-points of the string. 
-
-<!--
-==== string-prefix? string-suffix? string-prefix-ci? string-suffix-ci?
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-prefix-p"></a>
-<a name="string-suffix-p"></a>
-<a name="string-prefix-ci-p"></a>
-<a name="string-suffix-ci-p"></a>
-<code class=proc-def>string-prefix?&nbsp;&nbsp;&nbsp;</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defi><code class=proc-def>string-suffix?&nbsp;&nbsp;&nbsp;</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defi><code class=proc-def>string-prefix-ci?</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dt class=proc-defn><code class=proc-def>string-suffix-ci?</code><var> s1 s2 [start1 end1 start2 end2] -> boolean</var>
-<dd class=proc-def>
-Is <var>s1</var> a prefix/suffix of <var>s2</var>?
-
-<p>
-The optional start/end indices restrict the comparison to the indicated
-substrings of <var>s1</var> and <var>s2</var>.
-
-<p>
-<code>string-prefix-ci?</code> and <code>string-suffix-ci?</code> are the case-insensitive variants.
-Case-insensitive comparison is done by case-folding characters with the
-operation
-<pre class=code-example>
-(char-downcase (char-upcase c))
-</pre>
-where the two case-mapping operations are assumed to be 1-1, locale- and
-context-insensitive, and compatible with the 1-1 case mappings specified
-by Unicode's UnicodeData.txt table:
-<div class=inset>
-    <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-</div>
-
-<p>
-Comparison is simply done on individual code-points of the string. 
-
-</dl>
-
-<!--========================================================================-->
-<h3><a name="Searching">Searching</a></h3>
-
-<dl>
-
-<!--
-==== string-index string-index-right string-skip string-skip-right
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-index"></a>
-<a name="string-index-right"></a>
-<a name="string-skip"></a>
-<a name="string-skip-right"></a>
-<code class=proc-def>string-index</code><var>       s char/char-set/pred [start end] -> integer or #f</var>
-<dt class=proc-defi><code class=proc-def>string-index-right</code><var> s char/char-set/pred [start end] -> integer or #f</var>
-<dt class=proc-defi><code class=proc-def>string-skip</code><var> s char/char-set/pred [start end] -> integer or #f</var>
-<dt class=proc-defn><code class=proc-def>string-skip-right</code><var> s char/char-set/pred [start end] -> integer or #f</var>
-<dd class=proc-def>
-<code>string-index</code> (<code>string-index-right</code>) searches through the string from the 
-left (right), returning the index of the first occurrence of a character 
-which
-<ul>
-    <li> equals <var>char/char-set/pred</var> (if it is a character);
-    <li> is in <var>char/char-set/pred</var> (if it is a character set);
-    <li> satisfies the predicate <var>char/char-set/pred</var> (if it is a procedure).
-</ul>
-If no match is found, the functions return false.
-
-<p>
-The <var>start</var> and <var>end</var> parameters specify the beginning and end indices of
-the search; the search includes the start index, but not the end index.
-Be careful of "fencepost" considerations: when searching right-to-left, 
-the first index considered is
-<div class=inset>
-    <var>end</var>-1
-</div>
-whereas when searching left-to-right, the first index considered is
-<div class=inset>
-      <var>start</var>
-</div>
-That is, the start/end indices describe a same half-open interval
-[<var>start</var>,<var>end</var>) in these procedures that they do
-in all the other SRFI 13 procedures.
-
-<p>
-The skip functions are similar, but use the complement of the criteria:
-they search for the first char that <em>doesn't</em> satisfy the test. <em>E.g.</em>, 
-to skip over initial whitespace, say
-<pre class=code-example>
-(cond ((string-skip s char-set:whitespace) =&gt;
-       (lambda (i) ...)) ; s[i] is not whitespace.
-      ...)
-</pre>
-
-<!--
-==== string-count
-============================================================================-->
-<dt class=proc-def>
-<a name="string-count"></a>
-<code class=proc-def>string-count</code><var> s char/char-set/pred [start end] -> integer</var>
-<dd class=proc-def>
-    Return a count of the number of characters in <var>s</var> that satisfy the
-    <var>char/char-set/pred</var> argument. If this argument is a procedure, 
-    it is applied to the character as a predicate; if it is a character set, 
-    the character is tested for membership; if it is a character, it is 
-    used in an equality test.
-
-<!--
-==== string-contains string-contains-ci
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-contains"></a>
-<a name="string-contains-ci"></a>
-<code class=proc-def>string-contains&nbsp;&nbsp;&nbsp;</code><var> s1 s2 [start1 end1 start2 end2] -> integer or false</var>
-<dt class=proc-defn><code class=proc-def>string-contains-ci</code><var> s1 s2 [start1 end1 start2 end2] -> integer or false</var>
-<dd class=proc-def>
-Does string <var>s1</var> contain string <var>s2</var>?
-
-<p>
-Return the index in <var>s1</var> where <var>s2</var> occurs as a substring, or false.
-The optional start/end indices restrict the operation to the
-indicated substrings.
-
-<p>
-The returned index is in the range [<var>start1</var>,<var>end1</var>). 
-A successful match must lie entirely in the 
-[<var>start1</var>,<var>end1</var>) range of <var>s1</var>.
-
-<p>
-<pre class=code-example>
-(string-contains "eek -- what a geek." "ee"
-                 12 18) ; Searches "a geek"
-    =&gt; 15
-</pre>
-
-<p>
-<code>string-contains-ci</code> is the case-insensitive variant. Case-insensitive
-comparison is done by case-folding characters with the operation
-<pre class=code-example>
-(char-downcase (char-upcase <var>c</var>))
-</pre>
-where the two case-mapping operations are assumed to be 1-1, locale- and
-context-insensitive, and compatible with the 1-1 case mappings specified
-by Unicode's UnicodeData.txt table:
-<div class=inset>
-    <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-</div>
-
-<p>
-Comparison is simply done on individual code-points of the string. 
-
-<p>
-The names of these procedures do not end with a question mark -- this is to
-indicate that they do not return a simple boolean (<code>#t</code> or <code>#f</code>). Rather,
-they return either false (<code>#f</code>) or an exact non-negative integer.
-
-</dl>
-
-<!--========================================================================-->
-<h3><a name="CaseMapping">Alphabetic case mapping</a></h3>
-
-<dl>
-
-<!--
-==== string-titlecase string-titlecase!
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-titlecase"></a>
-<a name="string-titlecase!"></a>
-<code class=proc-def>string-titlecase&nbsp;</code><var> s [start end] -> string</var>
-<dt class=proc-defn><code class=proc-def>string-titlecase!</code><var> s [start end] -> unspecified</var>
-<dd class=proc-def>
-For every character <var>c</var> in the selected range of <var>s</var>, 
-if <var>c</var> is preceded by a cased character, it is downcased; 
-otherwise it is titlecased.
-
-<p>
-<code>string-titlecase</code> returns the result string and does not alter its <var>s</var>
-parameter. <code>string-titlecase!</code> is the in-place side-effecting variant.
-
-<p>
-<pre class=code-example>
-(string-titlecase "--capitalize tHIS sentence.") =&gt;
-  "--Capitalize This Sentence."
-
-(string-titlecase "see Spot run. see Nix run.") =&gt;
-  "See Spot Run. See Nix Run."
-
-(string-titlecase "3com makes routers.") =&gt;
-  "3Com Makes Routers."
-</pre>
-
-<p>
-Note that if a <var>start</var> index is specified, then the character
-preceding <var>s</var>[<var>start</var>] has no effect on the titlecase decision for
-character <var>s</var>[<var>start</var>]:
-<pre class=code-example>
-(string-titlecase "greasy fried chicken" 2) =&gt; "Easy Fried Chicken"
-</pre>
-
-<p>
-Titlecase and cased information must be compatible with the Unicode
-specification.
-
-<!--
-==== string-upcase string-upcase! string-downcase string-downcase!
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-upcase"></a>
-<a name="string-upcase!"></a>
-<a name="string-downcase"></a>
-<a name="string-downcase!"></a>
-<code class=proc-def>string-upcase&nbsp;</code><var> s [start end] -> string</var>
-<dt class=proc-defi><code class=proc-def>string-upcase!</code><var> s [start end] -> unspecified</var>
-<dt class=proc-defi><code class=proc-def>string-downcase&nbsp;</code><var> s [start end] -> string</var>
-<dt class=proc-defn><code class=proc-def>string-downcase!</code><var> s [start end] -> unspecified</var>
-<dd class=proc-def>
-    Raise or lower the case of the alphabetic characters in the string.
-
-    <p>
-    <code>string-upcase</code> and <code>string-downcase</code> return the result string and do not
-    alter their <var>s</var> parameter. <code>string-upcase!</code> and <code>string-downcase!</code> are the
-    in-place side-effecting variants.    
-
-    <p>
-    These procedures use the locale- and context-insensitive 1-1 case mappings
-    defined by Unicode's UnicodeData.txt table:
-    <div class=inset>
-         <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-    </div>
-
-</dl>
-
-<!--========================================================================-->
-<h3><a name="ReverseAppend">Reverse &amp; append</a></h3>
-
-<dl>
-
-<!--
-==== string-reverse string-reverse!
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-reverse"></a>
-<a name="string-reverse!"></a>
-<code class=proc-def>string-reverse&nbsp;</code><var> s [start end] -> string</var>
-<dt class=proc-defn><code class=proc-def>string-reverse!</code><var> s [start end] -> unspecified</var>
-<dd class=proc-def>
-Reverse the string.
-
-<p>
-<code>string-reverse</code> returns the result string 
-and does not alter its <var>s</var> parameter. 
-<code>string-reverse!</code> is the in-place side-effecting variant.
-
-<pre class=code-example>
-(string-reverse "Able was I ere I saw elba.") 
-    =&gt; ".able was I ere I saw elbA"
-
-;;; In-place rotate-left, the Bell Labs way:
-(lambda (s i)
-  (let ((i (modulo i (string-length s))))
-    (string-reverse! s 0 i)
-    (string-reverse! s i)
-    (string-reverse! s)))
-</pre>
-
-<p>
-Unicode note: Reversing a string simply reverses the sequence of
-code-points it contains. So a zero-width accent character <var>a</var> 
-coming <em>after</em> a base character <var>b</var> in string <var>s</var> 
-would come out <em>before</em> <var>b</var> in the reversed result.
-
-<!--
-==== string-append
-============================================================================-->
-<dt class=proc-def>
-<a name="string-append"></a>
-<code class=proc-def>string-append</code><var> s<sub>1</sub> ... -> string</var>
-<dd class=proc-def>
-  [<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>]
-  Returns a newly allocated string whose characters form the
-  concatenation of the given strings.
-
-<!--
-==== string-concatenate
-============================================================================-->
-<dt class=proc-def>
-<a name="string-concatenate"></a>
-<code class=proc-def>string-concatenate</code><var> string-list -> string</var>
-<dd class=proc-def>
-    Append the elements of <code>string-list</code> together into a single string.
-    Guaranteed to return a freshly allocated string.
-
-    <p>
-    Note that the <code>(apply string-append <var>string-list</var>)</code>
-    idiom is
-    not robust for long lists of strings, as some Scheme implementations
-    limit the number of arguments that may be passed to an n-ary procedure.
-
-<!--
-==== string-concatenate/shared string-append/shared
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-concatenate/shared"></a>
-<a name="string-append/shared"></a>
-<code class=proc-def>string-concatenate/shared</code><var> string-list -> string</var>
-<dt class=proc-defn><code class=proc-def>string-append/shared</code><var> s<sub>1</sub> ... -> string</var>
-<dd class=proc-def>
-    These two procedures are variants of <code>string-concatenate</code> 
-    and <code>string-append</code>
-    that are permitted to return results that share storage with their
-    parameters. 
-    In particular, if <code>string-append/shared</code> is applied to just 
-    one argument, it may return exactly that argument, 
-    whereas <code>string-append</code> is required to allocate a fresh string.
-
-<!--
-==== string-concatenate-reverse string-concatenate-reverse/shared
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-concatenate-reverse"></a>
-<a name="string-concatenate-reverse/shared"></a>
-<code class=proc-def>string-concatenate-reverse</code><var>        string-list [final-string end] -> string</var>
-<dt class=proc-defn><code class=proc-def>string-concatenate-reverse/shared</code><var> string-list [final-string end] -> string</var>
-<dd class=proc-def>
-With no optional arguments, these functions are equivalent to
-<pre class=code-example>
-(string-concatenate (reverse <var>string-list</var>))
-</pre>
-and
-<pre class=code-example>
-(string-concatenate/shared (reverse <var>string-list</var>))
-</pre>
-respectively.
-
-<p>
-If the optional argument <var>final-string</var> is specified, it is consed
-onto the beginning of <var>string-list</var>
-before performing the list-reverse and string-concatenate operations.
-
-</p>
-If the optional argument <var>end</var> is given, 
-only the first <var>end</var> characters
-of <var>final-string</var> are added to the string list, thus producing
-<pre class=code-example>
-(string-concatenate 
-  (reverse (cons (substring/shared <var>final-string</var> 0 <var>end</var>)
-                 <var>string-list</var>)))
-</pre>
-<em>E.g.</em>
-<pre class=code-example>
-(string-concatenate-reverse '(" must be" "Hello, I") " going.XXXX" 7)
-  =&gt; "Hello, I must be going."
-</pre>
-
-<p>
-This procedure is useful in the construction of procedures that 
-accumulate character data into lists of string buffers, and wish to
-convert the accumulated data into a single string when done.
-
-<p>
-Unicode note: Reversing a string simply reverses the sequence of
-code-points it contains. 
-So a zero-width accent character <var>ac</var> coming <em>after</em>
-a base character <var>bc</var> in string <var>s</var> would come out 
-<em>before</em> <var>bc</var> in the reversed result.
-
-</dl>
-
-<!--========================================================================-->
-<h3><a name="FoldUnfoldMap">Fold, unfold &amp; map</a></h3>
-
-<dl>
-
-<!--
-==== string-map string-map!
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-map"></a>
-<a name="string-map!"></a>
-<code class=proc-def>string-map&nbsp;</code><var> proc s [start end] -> string</var>
-<dt class=proc-defn><code class=proc-def>string-map!</code><var> proc s [start end] -> unspecified</var>
-<dd class=proc-def>
-    <var>Proc</var> is a char->char procedure; it is mapped over <var>s</var>.
-    
-    <p>
-    <code>string-map</code> returns the result string and does not alter its <var>s</var> parameter.
-    <code>string-map!</code> is the in-place side-effecting variant.
-
-    <p>
-    Note: The order in which <var>proc</var> is applied to the elements of
-    <var>s</var> is not specified.
-
-<!--
-==== string-fold string-fold-right
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-fold"></a>
-<a name="string-fold-right"></a>
-<code class=proc-def>string-fold</code><var>       kons knil s [start end] -> value</var>
-<dt class=proc-defn><code class=proc-def>string-fold-right</code><var> kons knil s [start end] -> value</var>
-<dd class=proc-def>
-These are the fundamental iterators for strings.
-
-<p>
-The left-fold operator maps the <var>kons</var> procedure across the
-string from left to right
-<pre class=code-example>
-(... (<var>kons</var> <var>s</var>[2] (<var>kons</var> <var>s</var>[1] (<var>kons</var> <var>s</var>[0] <var>knil</var>))))
-</pre>
-In other words, <code>string-fold</code> obeys the (tail) recursion
-<pre class=code-example>
-(string-fold <var>kons</var> <var>knil</var> <var>s</var> <var>start</var> <var>end</var>) =
-    (string-fold <var>kons</var> (<var>kons</var> <var>s</var>[<var>start</var>] <var>knil</var>) <var>start+1</var> <var>end</var>)
-</pre>
-
-<p>
-The right-fold operator maps the <var>kons</var> procedure across the
-string from right to left
-<pre class=code-example>
-(<var>kons</var> <var>s</var>[0] (... (<var>kons</var> <var>s</var>[<var>end-3</var>] (<var>kons</var> <var>s</var>[<var>end-2</var>] (<var>kons</var> <var>s</var>[<var>end-1</var>] <var>knil</var>)))))
-</pre>
-obeying the (tail) recursion
-<pre class=code-example>
-(string-fold-right <var>kons</var> <var>knil</var> <var>s</var> <var>start</var> <var>end</var>) =
-    (string-fold-right <var>kons</var> (<var>kons</var> <var>s</var>[<var>end-1</var>] <var>knil</var>) <var>start</var> <var>end-1</var>)
-</pre>
-    
-<p>
-Examples: 
-<pre class=code-example>
-;;; Convert a string to a list of chars.
-(string-fold-right cons '() s)
-
-;;; Count the number of lower-case characters in a string.
-(string-fold (lambda (c count)
-               (if (char-lower-case? c)
-                   (+ count 1)
-                   count))
-             0
-             s)
-
-;;; Double every backslash character in S.
-(let* ((ans-len (string-fold (lambda (c sum)
-                               (+ sum (if (char=? c #\\) 2 1)))
-                             0 s))
-       (ans (make-string ans-len)))
-  (string-fold (lambda (c i)
-                 (let ((i (if (char=? c #\\)
-                              (begin (string-set! ans i #\\) (+ i 1))
-                              i)))
-                   (string-set! ans i c)
-                   (+ i 1)))
-               0 s)
-  ans)
-</pre>
-
-<p>
-The right-fold combinator is sometimes called a "catamorphism."
-
-<!--
-==== string-unfold
-============================================================================-->
-<dt class=proc-def>
-<a name="string-unfold"></a>
-<code class=proc-def>string-unfold</code><var> p f g seed [base make-final] -> string</var>
-<dd class=proc-def>
-This is a fundamental constructor for strings. 
-<ul>
-<li> <var>G</var> is used to generate a series of "seed" values from the initial seed:
-<div class=inset>
-    <var>seed</var>, (<var>g</var> <var>seed</var>), (<var>g<sup>2</sup></var> <var>seed</var>), (<var>g<sup>3</sup></var> <var>seed</var>), ...
-</div>
-<li> <var>P</var> tells us when to stop -- when it returns true when applied to one 
-  of these seed values.
-<li> <var>F</var> maps each seed value to the corresponding character 
-  in the result string. These chars are assembled into the
-  string in a left-to-right order.
-<li> <var>Base</var> is the optional initial/leftmost portion of the constructed string;
-  it defaults to the empty string "".
-<li> <var>Make-final</var> is applied to the terminal seed value (on which <var>p</var> returns
-  true) to produce the final/rightmost portion of the constructed string.
-  It defaults to <code>(lambda (x) "")</code>.
-</ul>
-
-<p>
-More precisely, the following (simple, inefficient) definitions hold:
-
-<pre class=code-example>
-;;; Iterative
-(define (string-unfold p f g seed base make-final)
-  (let lp ((seed seed) (ans base))
-    (if (p seed) 
-        (string-append ans (make-final seed))
-        (lp (g seed) (string-append ans (string (f seed)))))))
-                                    
-;;; Recursive
-(define (string-unfold p f g seed base make-final)
-  (string-append base
-                 (let recur ((seed seed))
-                   (if (p seed) (make-final seed)
-                       (string-append (string (f seed))
-                                      (recur (g seed)))))))
-</pre>
-<p>
-<code>string-unfold</code> is a fairly powerful string constructor -- you can use it to
-convert a list to a string, read a port into a string, reverse a string,
-copy a string, and so forth. Examples:
-<pre class=code-example>
-(port->string p) = (string-unfold eof-object? values
-                                  (lambda (x) (read-char p))
-                                  (read-char p))
-
-(list->string lis) = (string-unfold null? car cdr lis)
-
-(string-tabulate f size) = (string-unfold (lambda (i) (= i size)) f add1 0)
-</pre>
-<p>
-To map <var>f</var> over a list <var>lis</var>, producing a string:
-<pre class=code-example>
-(string-unfold null? (compose f car) cdr lis)
-</pre>
-<p>
-Interested functional programmers may enjoy noting that 
-<code>string-fold-right</code> 
-and <code>string-unfold</code> are in some sense inverses. That is, given operations 
-<var>knull?</var>, <var>kar</var><var>, kdr</var>, <var>kons</var>, and <var>knil</var> satisfying
-<pre class=code-example>
-(<var>kons</var> (<var>kar</var> x) (<var>kdr</var> x)) = x  and (<var>knull?</var> <var>knil</var>) = #t
-</pre>
-then
-<pre class=code-example>
-(string-fold-right <var>kons</var> <var>knil</var> (string-unfold <var>knull?</var> <var>kar</var> <var>kdr</var> <var>x</var>)) = <var>x</var>
-</pre>
-and
-<pre class=code-example>
-(string-unfold <var>knull?</var> <var>kar</var> <var>kdr</var> (string-fold-right <var>kons</var> <var>knil</var> <var>s</var>)) = <var>s</var>.
-</pre>
-
-The final string constructed does not share storage with either <var>base</var>
-or the value produced by <var>make-final</var>.
-
-<p>
-This combinator sometimes is called an "anamorphism."
-
-<p>
-Note: implementations should take care that runtime stack limits do not
-cause overflow when constructing large (<em>e.g.</em>, megabyte) strings with
-<code>string-unfold</code>.
-
-
-<!--
-==== string-unfold-right
-============================================================================-->
-<dt class=proc-def>
-<a name="string-unfold-right"></a>
-<code class=proc-def>string-unfold-right</code><var> p f g seed [base make-final] -> string</var>
-<dd class=proc-def>
-    This is a fundamental constructor for strings. 
-    <ul>
-    <li> <var>G</var> is used to generate a series of "seed" values from the initial seed:
-        <var>seed</var>, (<var>g</var> <var>seed</var>), (<var>g<sup>2</sup></var> <var>seed</var>), (<var>g<sup>3</sup></var> <var>seed</var>), ...
-    <li> <var>P</var> tells us when to stop -- when it returns true when applied to one 
-      of these seed values.
-    <li> <var>F</var> maps each seed value to the corresponding character 
-      in the result string. These chars are assembled into the
-      string in a right-to-left order.
-    <li> <var>Base</var> is the optional initial/rightmost portion of the constructed string;
-      it defaults to the empty string "".
-    <li> <var>Make-final</var> is applied to the terminal seed value (on which <var>P</var> returns
-      true) to produce the final/leftmost portion of the constructed string.
-      It defaults to <code>(lambda (x) "")</code>.
-    </ul>
-
-    <p>
-    More precisely, the following (simple, inefficient) definitions hold:
-<pre class=code-example>
-;;; Iterative
-(define (string-unfold-right p f g seed base make-final)
-  (let lp ((seed seed) (ans base))
-    (if (p seed) 
-        (string-append (make-final seed) ans)
-        (lp (g seed) (string-append (string (f seed)) ans)))))
-
-;;; Recursive
-(define (string-unfold-right p f g seed base make-final)
-  (string-append (let recur ((seed seed))
-                   (if (p seed) (make-final seed)
-                       (string-append (recur (g seed))
-                                      (string (f seed)))))
-                 base))
-</pre>
-    Interested functional programmers may enjoy noting that 
-    <code>string-fold</code>
-    and <code>string-unfold-right</code> are in some sense inverses. 
-    That is, given operations <var>knull?</var>, <var>kar</var>, <var>kdr</var>, <var>kons</var>, and <var>knil</var> satisfying
-<div class=inset>
-<code>(<var>kons</var> (<var>kar</var> <var>x</var>) (<var>kdr</var> <var>x</var>))</code> = <var>x</var>  and <code>(<var>knull?</var> <var>knil</var>)</code> = #t
-</div>
-    then
-<pre class=code-example>
-(string-fold <var>kons</var> <var>knil</var> (string-unfold-right <var>knull?</var> <var>kar</var> <var>kdr</var> <var>x</var>)) = <var>x</var>
-</pre>
-    and
-<pre class=code-example>
-(string-unfold-right <var>knull?</var> <var>kar</var> <var>kdr</var> (string-fold <var>kons</var> <var>knil</var> <var>s</var>)) = <var>s</var>.
-</pre>
-
-    The final string constructed does not share storage with either <var>base</var>
-    or the value produced by <var>make-final</var>.
-
-    <p>
-    Note: implementations should take care that runtime stack limits do not
-    cause overflow when constructing large (<em>e.g.</em>, megabyte) strings with
-    <code>string-unfold-right.</code>
-
-
-<!--
-==== string-for-each
-============================================================================-->
-<dt class=proc-def>
-<a name="string-for-each"></a>
-<code class=proc-def>string-for-each</code><var>  proc s [start end] -> unspecified</var>
-<dd class=proc-def>
-    Apply <var>proc</var> to each character in <var>s</var>.
-    <code>string-for-each</code> is required to iterate from <var>start</var> to <var>end</var>
-    in increasing order.
-
-<!--
-==== string-for-each-index
-============================================================================-->
-<dt class=proc-def>
-<a name="string-for-each-index"></a>
-<code class=proc-def>string-for-each-index</code><var> proc s [start end] -> unspecified</var>
-<dd class=proc-def>
-Apply <var>proc</var> to each index of <var>s</var>, in order. The optional <var>start/end</var>
-pairs restrict the endpoints of the loop. This is simply a
-method of looping over a string that is guaranteed to be safe
-and correct.
-
-Example:
-<pre class=code-example>
-(let* ((len (string-length s))
-       (ans (make-string len)))
-  (string-for-each-index
-      (lambda (i) (string-set! ans (- len i) (string-ref s i)))
-      s)
-  ans)
-</pre>
-
-</dl>
-
-<!--========================================================================-->
-<h3><a name="ReplicateRotate">Replicate &amp; rotate</a></h3>
-
-<dl>
-
-<!--
-==== xsubstring
-============================================================================-->
-<dt class=proc-def>
-<a name="xsubstring"></a>
-<code class=proc-def>xsubstring</code><var> s from [to start end] -> string</var>
-<dd class=proc-def>
-    This is the "extended substring" procedure that implements replicated
-    copying of a substring of some string.
-
-    <p>
-    <var>S</var> is a string; <var>start</var> and <var>end</var> are optional arguments that demarcate
-    a substring of <var>s</var>, defaulting to 0 and the length of <var>s</var> (<em>i.e.</em>, the whole
-    string). Replicate this substring up and down index space, in both the
-    positive and negative directions. For example, if <var>s</var> = "abcdefg", <var>start</var>=3, 
-    and <var>end</var>=6, then we have the conceptual bidirectionally-infinite string
-<div class=inset>
-<table>
-<tr align=right>
-<td>...  <td>d  <td>e  <td>f  <td>d  <td>e  <td>f  <td>d  <td>e  <td>f  <td>d  <td>e  <td>f  <td>d  <td>e  <td>f  <td>d  <td>e  <td>f  <td>d  <td>...
-</tr>
-<tr align=right>
-<td>... <td>-9 <td>-8 <td>-7 <td>-6 <td>-5 <td>-4 <td>-3 <td>-2 <td>-1  <td>0  <td>+1  <td>+2  <td>+3  <td>+4  <td>+5  <td>+6  <td>+7  <td>+8  <td>+9 <td>...
-</tr>
-</table>
-</div>
-
-    <code>xsubstring</code> returns the substring of this string beginning at index <var>from</var>,
-    and ending at <var>to</var> 
-    (which defaults to <var>from</var>+(<var>end</var>-<var>start</var>)).
-
-    <p>
-    You can use <code>xsubstring</code> to perform a variety of tasks:
-    <ul>
-    <li> To rotate a string left:  <code>(xsubstring "abcdef" 2)</code>  =&gt; <code>"cdefab"</code>
-    <li> To rotate a string right: <code>(xsubstring "abcdef" -2)</code> =&gt; <code>"efabcd"</code>
-    <li> To replicate a string:    <code>(xsubstring "abc" 0 7)</code> =&gt; <code>"abcabca"</code>
-    </ul>
-
-    <p>
-    Note that 
-      <ul>
-      <li> The <var>from</var>/<var>to</var> indices give a half-open range -- the characters from
-        index <var>from</var> up to, but not including, index <var>to</var>.
-      <li> The <var>from</var>/<var>to</var> indices are not in terms of the index space for string <var>s</var>.
-        They are in terms of the replicated index space of the substring
-        defined by <var>s</var>, <var>start</var>, and <var>end</var>.
-      </ul>
-
-    <p>
-    It is an error if <var>start</var>=<var>end</var> -- although this is allowed by special
-    dispensation when <var>from</var>=<var>to</var>.
-
-<!--
-==== string-xcopy!
-============================================================================-->
-<dt class=proc-def>
-<a name="string-xcopy!"></a>
-<code class=proc-def>string-xcopy!</code><var> target tstart s sfrom [sto start end] -> unspecified</var>
-<dd class=proc-def>
-    Exactly the same as <code>xsubstring,</code> but the extracted text is written
-    into the string <var>target</var> starting at index <var>tstart</var>.
-    This operation is not defined if <code>(eq? <var>target</var> <var>s</var>)</code>
-    or these two arguments
-    share storage -- you cannot copy a string on top of itself.
-
-</dl>
-
-<!--========================================================================-->
-<h3><a name="Miscellaneous">Miscellaneous: insertion, parsing</a></h3>
-
-<dl>
-
-<!--
-==== string-replace
-============================================================================-->
-<dt class=proc-def>
-<a name="string-replace"></a>
-<code class=proc-def>string-replace</code><var> s1 s2 start1 end1 [start2 end2] -> string</var>
-<dd class=proc-def>
-    Returns
-<pre class=code-example>
-(string-append (substring/shared <var>s1</var> 0 <var>start1</var>)
-               (substring/shared <var>s2</var> <var>start2</var> <var>end2</var>)
-               (substring/shared <var>s1</var> <var>end1</var> (string-length <var>s1</var>)))
-</pre>
-
-    That is, the segment of characters in <var>s1</var> from <var>start1</var> to <var>end1</var>
-    is replaced by the segment of characters in <var>s2</var> from <var>start2</var> to <var>end2</var>.
-    If <var>start1</var>=<var>end1</var>, this simply splices the <var>s2</var> characters into <var>s1</var> at the
-    specified index.
-
-    <p>
-    Examples:
-<pre class=code-example>
-(string-replace "The TCL programmer endured daily ridicule."
-                "another miserable perl drone" 4 7 8 22 ) =&gt;
-    "The miserable perl programmer endured daily ridicule."
-
-(string-replace "It's easy to code it up in Scheme." "lots of fun" 5 9) =&gt;
-    "It's lots of fun to code it up in Scheme."
-
-(define (string-insert s i t) (string-replace s t i i))
-
-(string-insert "It's easy to code it up in Scheme." 5 "really ") =&gt;
-    "It's really easy to code it up in Scheme."
-</pre>
-
-<!--
-==== string-tokenize
-============================================================================-->
-<dt class=proc-def>
-<a name="string-tokenize"></a>
-<code class=proc-def>string-tokenize</code><var> s [token-set start end] -> list</var>
-<dd class=proc-def>
-   Split the string <var>s</var> into a list of substrings, where each substring is
-   a maximal non-empty contiguous sequence of characters from the character set
-   <var>token-set</var>.
-    <ul>
-       <li> <var>token-set</var> defaults to <code>char-set:graphic</code> 
-         (see <a href="#SRFI-14">SRFI 14</a> 
-          for more on character sets and <code>char-set:graphic</code>).
-       <li> If <var>start</var> or <var>end</var> indices are provided, they restrict 
-         <code>string-tokenize</code> to operating on the indicated substring of <var>s</var>.
-    </ul>
-
-    <p>
-    This function provides a minimal parsing facility for simple applications.
-    More sophisticated parsers that handle quoting and backslash effects can
-    easily be constructed using regular-expression systems; be careful not
-    to use <code>string-tokenize</code> in contexts where more serious parsing is needed.
-
-<pre class=code-example>
-(string-tokenize "Help make programs run, run, RUN!") =&gt;
-  ("Help" "make" "programs" "run," "run," "RUN!")
-</pre>
-
-</dl>
-
-<!--========================================================================-->
-<h3><a name="FilterDelete">Filtering &amp; deleting</a></h3>
-
-<dl>
-
-<!--
-==== string-filter string-delete
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-filter"></a>
-<a name="string-delete"></a>
-<code class=proc-def>string-filter</code><var> char/char-set/pred s [start end] -> string</var>
-<dt class=proc-defn><code class=proc-def>string-delete</code><var> char/char-set/pred s [start end] -> string</var>
-<dd class=proc-def>
-    Filter the string <var>s</var>, retaining only those characters that
-    satisfy / do not satisfy the <var>char/char-set/pred</var> argument. If
-    this argument is a procedure, it is applied to the character
-    as a predicate; if it is a char-set, the character is tested
-    for membership; if it is a character, it is used in an equality test.
-
-    <p>
-    If the string is unaltered by the filtering operation, these
-    functions may return either <var>s</var> or a copy of <var>s</var>.
-
-
-</dl>
-
-<!--========================================================================-->
-<h2><a name="LowLevelProcs">Low-level procedures</a></h2>
-<p>
-The following procedures are useful for writing other string-processing
-functions. In a Scheme system that has a module or package system, these
-procedures should be contained in a module named "string-lib-internals".
-
-<!--========================================================================-->
-<h3><a name="ArgUtils">Start/end optional-argument parsing &amp; checking utilities</a></h3>
-
-
-<dl>
-
-<!--
-==== string-parse-start+end string-parse-final-start+end
-============================================================================-->
-<dt class=proc-def1>
-<a name="string-parse-start+end"></a>
-<a name="string-parse-final-start+end"></a>
-<code class=proc-def>string-parse-start+end</code><var> proc s args -> [rest start end]</var>
-<dt class=proc-defn><code class=proc-def>string-parse-final-start+end</code><var> proc s args -> [start end]</var>
-<dd class=proc-def>
-    <code>string-parse-start+end</code> may be used to parse a pair of optional <var>start/end</var> 
-    arguments from an argument list, defaulting them to 0 and the length of 
-    some string <var>s</var>, respectively. Let the length of string <var>s</var> be <var>slen</var>.
-    <ul>
-    <li> If <var>args</var> = (), the function returns 
-         <code>(values '() 0 <var>slen</var>)</code>
-    <li> If <var>args</var> = (<var>i</var>), <var>i</var> is checked to ensure it is an exact integer, and
-      that 0 &lt;= i &lt;= <var>slen</var>. 
-      Returns <code>(values (cdr <var>args</var>) <var>i</var> <var>slen</var>)</code>.
-    <li> If <var>args</var> = <code>(<var>i</var> <var>j</var> ...)</code>, 
-         <var>i</var> and <var>j</var> are checked to ensure they are exact
-      integers, and that 0 &lt;= <var>i</var> &lt;= <var>j</var> &lt;=
-         <var>slen</var>. 
-      Returns <code>(values (cddr <var>args</var>) <var>i</var> <var>j</var>)</code>.
-    </ul>
-
-    <p>
-    If any of the checks fail, an error condition is raised, and <var>proc</var> is used
-    as part of the error condition -- it should be the client procedure whose
-    argument list <code>string-parse-start+end</code> is parsing.
-    
-    <p>
-    <code>string-parse-final-start+end</code> is exactly the same, except that the args list
-    passed to it is required to be of length two or less; if it is longer,
-    an error condition is raised. It may be used when the optional <var>start/end</var> 
-    parameters are final arguments to the procedure.
-
-    <p>
-    Note that in all cases, these functions ensure that <var>s</var> is a string
-    (by necessity, since all cases apply <code>string-length</code> to <var>s</var> either to
-    default <var>end</var> or to bounds-check it).
-
-<dt class=proc-def>
-<a name="let-string-start+end"></a>
-<code class=proc-def>let-string-start+end</code><var> (start end [rest]) proc-exp s-exp args-exp body ... -> value(s)</var>
-<dd class=proc-def>
-
-    [Syntax]
-    Syntactic sugar for an application of <code>string-parse-start+end</code> or
-    <code>string-parse-final-start+end.</code>
-      
-    <p>
-    If a <var>rest</var> variable is given, the form is equivalent to
-<pre class=code-example>
-(call-with-values
-    (lambda () (string-parse-start+end <var>proc-exp</var> <var>s-exp</var> <var>args-exp</var>))
-  (lambda (<var>rest</var> <var>start</var> <var>end</var>) <var>body</var> ...))
-</pre>
-        
-    <p>
-    If no <var>rest</var> variable is given, the form is equivalent to
-<pre class=code-example>
-(call-with-values
-    (lambda () (string-parse-final-start+end <var>proc-exp</var> <var>s-exp</var> <var>args-exp</var>))
-  (lambda (<var>start</var> <var>end</var>) <var>body</var> ...))
-</pre>
-
-<!--
-==== check-substring-spec substring-spec-ok?
-============================================================================-->
-<dt class=proc-def1>
-<a name="check-substring-spec"></a>
-<a name="substring-spec-ok-p"></a>
-<code class=proc-def>check-substring-spec</code><var> proc s start end -> unspecified</var>
-<dt class=proc-defn><code class=proc-def>substring-spec-ok?</code><var> s start end -> boolean</var>
-<dd class=proc-def>
-    Check values <var>s</var>, <var>start</var> and <var>end</var> to ensure they specify a valid substring.
-    This means that <var>s</var> is a string, <var>start</var> and <var>end</var> are exact integers, and 
-        0 &lt;= <var>start</var> &lt;= <var>end</var> &lt;= 
-        <code>(string-length <var>s</var>)</code>
-
-    <p>
-    If the values are not proper
-        <ul>
-        <li> <code>check-substring-spec</code> raises an error condition. <var>proc</var> is used
-          as part of the error condition, and should be the procedure whose 
-          parameters we are checking.
-        <li> <code>substring-spec-ok?</code> returns false.
-        </ul>
-    Otherwise, <code>substring-spec-ok?</code> returns true, and <code>check-substring-spec</code>
-    simply returns (what it returns is not specified).
-
-</dl>
-
-
-<!--========================================================================-->
-<h3><a name="KMP">Knuth-Morris-Pratt searching</a></h3>
-<p>
-The Knuth-Morris-Pratt string-search algorithm is a method of rapidly scanning
-a sequence of text for the occurrence of some fixed string.  It has the
-advantage of never requiring backtracking -- hence, it is useful for searching
-not just strings, but also other sequences of text that do not support
-backtracking or random-access, such as input ports.  These routines package up
-the initialisation and searching phases of the algorithm for general use. They
-also support searching through sequences of text that arrive in buffered
-chunks, in that intermediate search state can be carried across applications
-of the search loop from the end of one buffer application to the next.
-
-<p>
-A second critical property of KMP search is that it requires the allocation of
-auxiliary memory proportional to the length of the pattern, but <em>constant</em>
-in the size of the character type. Alternate searching algorithms frequently
-require the construction of a table with an entry for every possible
-character -- which can be prohibitively expensive in a 16- or 32-bit character
-representation.
-
-<dl>
-<!--
-==== make-kmp-restart-vector
-============================================================================-->
-<dt class=proc-def>
-<a name="make-kmp-restart-vector"></a>
-<code class=proc-def>make-kmp-restart-vector</code><var> s [c= start end] -> integer-vector</var>
-<dd class=proc-def>
-Build a Knuth-Morris-Pratt "restart vector," which is useful for quickly
-searching character sequences for the occurrence of string <var>s</var> (or the
-substring of <var>s</var> demarcated by the optional <var>start/end</var> parameters, if
-provided). <var>C=</var> is a character-equality function used to construct the
-restart vector. It defaults to <code>char=?</code>; use <code>char-ci=?</code> instead for
-case-folded string search.
-
-<p>
-The definition of the restart vector <var>rv</var> for string <var>s</var> is:
-If we have matched chars 0..<var>i</var>-1 of <var>s</var> against some search string <var>ss</var>, and
-<var>s</var>[<var>i</var>] doesn't match <var>ss</var>[<var>k</var>], then reset <var>i</var> := <var>rv</var>[<var>i</var>], and try again to
-match <var>ss</var>[<var>k</var>].  
-If <var>rv</var>[<var>i</var>] = -1, 
-then punt <var>ss</var>[<var>k</var>] completely, and move on to
-<var>ss</var>[<var>k</var>+1] and <var>s</var>[0].
-
-<p>
-In other words, if you have matched the first <var>i</var> chars of <var>s</var>, but
-the <var>i</var>+1'th char doesn't match, 
-<var>rv</var>[<var>i</var>] tells you what the next-longest
-prefix of <var>s</var> is that you have matched.
-
-<p>
-The following string-search function shows how a restart vector is used to
-search.  Note the attractive feature of the search process: it is "on
-line," that is, it never needs to back up and reconsider previously seen
-data. It simply consumes characters one-at-a-time until declaring a complete
-match or reaching the end of the sequence. Thus, it can be easily adapted to
-search other character sequences (such as ports) that do not provide random
-access to their contents.
-
-<pre class=code-example>
-(define (find-substring pattern source start end)
-  (let ((plen (string-length pattern))
-        (rv (make-kmp-restart-vector pattern)))
-
-    ;; The search loop. SJ &amp; PJ are redundant state.
-    (let lp ((si start) (pi 0)
-             (sj (- end start))     ; (- end si)  -- how many chars left.
-             (pj plen))             ; (- plen pi) -- how many chars left.
-
-      (if (= pi plen) (- si plen)                   ; Win.
-
-          (and (&lt;= pj sj)                           ; Lose.
-
-               (if (char=? (string-ref source si)           ; Test.
-                           (string-ref pattern pi))
-                   (lp (+ 1 si) (+ 1 pi) (- sj 1) (- pj 1)) ; Advance.
-
-                   (let ((pi (vector-ref rv pi)))           ; Retreat.
-                     (if (= pi -1)
-                         (lp (+ si 1)  0   (- sj 1)  plen)  ; Punt.
-                         (lp si        pi  sj        (- plen pi))))))))))
-</pre>
-
-<p>
-The optional <var>start/end</var> parameters restrict the restart vector to the
-indicated substring of <var>pat</var>; <var>rv</var> is <var>end</var> - <var>start</var> elements long. If <var>start</var> &gt; 0,
-then <var>rv</var> is offset by <var>start</var> elements from <var>pat</var>.
-That is,  <var>rv[i]</var> describes
-pattern element <var>pat[i + start]</var>. 
-Elements of <var>rv</var> are themselves indices
-that range just over [0, <var>end</var>-<var>start</var>), 
-<em>not</em> [<var>start</var>, <var>end</var>).
-
-<p>
-Rationale: the actual value of <var>rv</var> is "position independent" -- it
-does not depend on where in the <var>pat</var> string the pattern occurs, but
-only on the actual characters comprising the pattern.
-
-<!--
-==== kmp-step
-============================================================================-->
-<dt class=proc-def>
-<a name="kmp-step"></a>
-<code class=proc-def>kmp-step</code><var> pat rv c i c= p-start -> integer</var>
-<dd class=proc-def>
-This function encapsulates the work performed by one step of the
-KMP string search; it can be used to scan strings, input ports,
-or other on-line character sources for fixed strings. 
-
-<p>
-<var>Pat</var> is the non-empty string specifying the text for which we are searching.
-<var>Rv</var> is the Knuth-Morris-Pratt restart vector for the pattern, 
-as constructed by <code>make-kmp-restart-vector.</code> 
-The pattern begins at <var>pat</var>[<var>p-start</var>], and is
-<code>(string-length <var>rv</var>)</code> characters long.
-<var>C=</var> is the character-equality function used to construct the
-restart vector, typically <code>char=?</code> or <code>char-ci=?</code>.
-
-<p>
-Suppose the pattern is N characters in length: 
-<var>pat</var>[<var>p-start</var>, <var>p-start</var> + <var>n</var>).
-We have already matched <var>i</var> characters: 
-<var>pat[p-start, p-start + i)</var>. 
-(<var>P-start</var> is typically zero.) 
-<var>C</var> is the next character in the input stream. <code>kmp-step</code>
-returns the new <var>i</var> value -- that is, how much of the pattern we have
-matched, <em>including</em> character <var>c</var>. 
-When <var>i</var> reaches <var>n</var>, the entire pattern has been matched.
-
-<p>
-Thus a typical search loop looks like this:
-<pre class=code-example>
-(let lp ((i 0))
-  (or (= i n)                           ; Win -- #t
-      (and (not (end-of-stream))        ; Lose -- #f
-           (lp (kmp-step pat rv (get-next-character) i char=? 0)))))
-</pre>
-
-<p>
-Example:
-<pre class=code-example>
-;; Read chars from IPORT until we find string PAT or hit EOF.
-(define (port-skip pat iport)
-  (let* ((rv (make-kmp-restart-vector pat))
-         (patlen (string-length pat)))
-    (let lp ((i 0) (nchars 0))
-      (if (= i patlen) nchars                    ; Win -- nchars skipped
-          (let ((c (read-char iport)))
-            (if (eof-object? c) c                ; Fail -- EOF
-                (lp (kmp-step pat rv c i char=? 0) ; Continue
-                    (+ nchars 1))))))))
-</pre>
-
-<p>
-This procedure could be defined as follows:
-<pre class=code-example>
-(define (kmp-step pat rv c i c= p-start)
-  (let lp ((i i))
-    (if (c= c (string-ref pat (+ i p-start)))     ; Match =&gt;
-        (+ i 1)                                   ;   Done.
-        (let ((i (vector-ref rv i)))              ; Back up in PAT.
-          (if (= i -1) 0                          ; Can't back up more.
-              (lp i)))))))                        ; Keep going.
-</pre>
-
-<p>
-Rationale: this procedure takes no optional arguments because it
-is intended as an inner-loop primitive and we do not want any
-run-time penalty for optional-argument parsing and defaulting,
-nor do we wish barriers to procedure integration/inlining.
-
-<!--
-==== string-kmp-partial-search
-============================================================================-->
-<dt class=proc-def>
-<a name="string-kmp-partial-search"></a>
-<code class=proc-def>string-kmp-partial-search</code><var> pat rv s i [c= p-start s-start s-end] -> integer</var>
-<dd class=proc-def>
-Applies <code>kmp-step</code> across <var>s</var>; 
-optional <var>s-start</var>/<var>s-end</var> bounds parameters 
-restrict search to a substring of <var>s</var>. 
-The pattern is <code>(vector-length <var>rv</var>)</code> characters long; 
-optional <var>p-start</var> index indicates non-zero start of pattern 
-in <var>pat</var>.
-
-<p>
-Suppose <var>plen</var> = <code>(vector-length <var>rv</var>)</code>
-is the length of the pattern.
-<var>I</var> is an integer index into the pattern 
-(that is, 0 &lt;= <var>i</var> &lt; <var>plen</var>)
-indicating how much of the pattern has already been matched. 
-(This means the pattern must be non-empty -- <var>plen</var> &gt; 0.)
-
-<ul>
-<li> On success, returns -<var>j</var>, 
-where <var>j</var> is the index in <var>s</var> bounding
-  the <em>end</em> of the pattern -- <em>e.g.</em>, a value that could be used as 
-  the <var>end</var> parameter in a call to <code>substring/shared</code>.
-
-<li> On continue, returns the current search state <var>i'</var> 
-(an index into <var>rv</var>)
-  when the search reached the end of the string. This is a non-negative
-  integer.
-</ul>
-
-Hence:
-<ul>
-<li> A negative return value indicates success, and says
-  where in the string the match occured.
-
-<li> A non-negative return value provides the <var>i</var> to use for
-  continued search in a following string.
-</ul>
-
-<p>
-This utility is designed to allow searching for occurrences of a fixed
-string that might extend across multiple buffers of text. This is
-why, for example, we do not provide the index of the <em>start</em> of the
-match on success -- it may have occurred in a previous buffer.
-
-<p>
-To search a character sequence that arrives in "chunks," write a
-loop of this form:
-<pre class=code-example>
-(let lp ((i 0))
-  (and (not (end-of-data?))             ; Lose -- return #f.
-       (let* ((buf (get-next-chunk))    ; Get or fill up the buffer.
-              (i (string-kmp-partial-search pat rv buf i)))
-         (if (&lt; i 0) (- i)              ; Win -- return end index.
-             (lp i)))))                 ; Keep looking.
-</pre>
-Modulo start/end optional-argument parsing, this procedure could
-be defined as follows:
-<pre class=code-example>
-(define (string-kmp-partial-search pat rv s i c= p-start s-start s-end)
-  (let ((patlen (vector-length rv)))
-    (let lp ((si s-start)       ; An index into S.
-             (vi i))            ; An index into RV.
-      (cond ((= vi patlen) (- si))      ; Win.
-            ((= si end) vi)             ; Ran off the end.
-            (else (lp (+ si 1)          ; Match s[si] &amp; loop.
-                      (kmp-step pat rv (string-ref s si)
-                                vi c= p-start)))))))
-</pre>
-</dl>
-
-<!--========================================================================-->
-<h1><a name="ReferenceImp">Reference implementation</a></h1>
-
-<p>
-This SRFI comes with a reference implementation. It can be found at:
-<div class=inset>
-    <a href="http://srfi.schemers.org/srfi-13/srfi-13.scm">http://srfi.schemers.org/srfi-13/srfi-13.scm</a>
-</div>
-<p class=continue>
-I have placed this source on the Net with an unencumbered, "open" copyright.
-The prefix/suffix and comparison routines in this code had (extremely distant)
-origins in MIT Scheme's string lib, and were substantially reworked by myself.
-Being derived from that code, they are covered by the MIT Scheme copyright,
-which is a generic BSD-style open-source copyright. See the source file for
-details.
-
-<p>
-The KMP string-search code was influenced by implementations written by
-Stephen Bevan, Brian Denheyer and Will Fitzgerald. However, this version was
-written from scratch by myself.
-
-<p>
-The remainder of the code was written by myself for scsh or for this SRFI; I
-have placed this code under the scsh copyright, which is also a generic
-BSD-style open-source copyright.
-
-<p>
-The code is written for portability and should be straightforward to port to
-any Scheme. The source comments contains detailed notes describing the non-<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>
-dependencies.
-
-<p>
-The library is written for clarity and well-commented; the current source is
-approximately 1000 lines of source code and 1000 lines of comments and white
-space. It is also written for efficiency. Fast paths are provided for common
-cases. This is not to say that the implementation can't be tuned up for a
-specific Scheme implementation. There are notes in the comments addressing
-ways implementors can tune the reference implementation for performance.
-
-<p>
-In short, I've written the reference implementation to make it as painless
-as possible for an implementor -- or a regular programmer -- to adopt this
-library and get good results with it.
-
-
-<!--========================================================================-->
-<h1><a name="Acknowledgements">Acknowledgements</a></h1>
-
-<p>
-The design of this library benefited greatly from the feedback provided during
-the SRFI discussion phase. Among those contributing thoughtful commentary and
-suggestions, both on the mailing list and by private discussion, were Paolo
-Amoroso, Lars Arvestad, Alan Bawden, Jim Bender, Dan Bornstein, Per Bothner,
-Will Clinger, Brian Denheyer, Mikael Djurfeldt, Kent Dybvig, Sergei Egorov,
-Marc Feeley, Matthias Felleisen, Will Fitzgerald, Matthew Flatt, Arthur A.
-Gleckler, Ben Goetter, Sven Hartrumpf, Erik Hilsdale, Richard Kelsey, Oleg
-Kiselyov, Bengt Kleberg, Donovan Kolbly, Bruce Korb, Shriram Krishnamurthi,
-Bruce Lewis, Tom Lord, Brad Lucier, Dave Mason, David Rush, Klaus Schilling,
-Jonathan Sobel, Mike Sperber, Mikael Staldal, Vladimir Tsyshevsky, Donald
-Welsh, and Mike Wilson. I am grateful to them for their assistance.
-
-<p>
-I am also grateful the authors, implementors and documentors of all the systems
-mentioned in the introduction. Aubrey Jaffer and Kent Pitman should be noted
-for their work in producing Web-accessible versions of the <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> and Common
-Lisp spec, which was a tremendous aid.
-
-<p>
-This is not to imply that these individuals necessarily endorse the final
-results, of course. 
-
-<p>
-During this document's long development period, great patience was exhibited
-by Mike Sperber, who is the editor for the SRFI, and by Hillary Sullivan,
-who is not.
-
-<!--========================================================================-->
-<h1><a name="Links">References &amp; links</a></h1>
-
-<dl>
-
-<dt class=biblio><strong><a name="Case-map">[Case-map]</a></strong>
-<dd>
-    Case mappings. <br>
-    Unicode Technical Report 21. <br>
-    <a href="http://www.unicode.org/unicode/reports/tr21/">http://www.unicode.org/unicode/reports/tr21/</a>
-
-<dt class=biblio><strong><a name="CommonLisp">[CommonLisp]</a></strong></dt>
-<dd><em>Common Lisp: the Language.</em><br>
-Guy L. Steele Jr. (editor).<br>
-Digital Press, Maynard, Mass., second edition 1990.<br>
-Available at <a href="http://www.elwood.com/alu/table/references.htm#cltl2">
-http://www.elwood.com/alu/table/references.htm#cltl2</a>.
-<p>
-
-The Common Lisp "HyperSpec," produced by Kent Pitman, is essentially
-the ANSI spec for Common Lisp:
-<a href="http://www.harlequin.com/education/books/HyperSpec/">
-http://www.harlequin.com/education/books/HyperSpec/</a>.
-
-<dt class=biblio><strong><a name="Java">[Java]</a></strong>
-<dd>
-    The following URLs provide documentation on relevant Java classes. <br>
-
-    <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/Character.html">http://java.sun.com/products/jdk/1.2/docs/api/java/lang/Character.html</a>
-    <br>
-    <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/String.html">http://java.sun.com/products/jdk/1.2/docs/api/java/lang/String.html</a>
-    <br>
-    <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/StringBuffer.html">http://java.sun.com/products/jdk/1.2/docs/api/java/lang/StringBuffer.html</a>
-    <br>
-    <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/text/Collator.html">http://java.sun.com/products/jdk/1.2/docs/api/java/text/Collator.html</a>
-    <br>
-    <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/text/package-summary.html">http://java.sun.com/products/jdk/1.2/docs/api/java/text/package-summary.html</a>
-
-<dt class=biblio><strong><a name="MIT-Scheme">[MIT-Scheme]</a></strong>
-<dd>
-    <a href="http://www.swiss.ai.mit.edu/projects/scheme/">http://www.swiss.ai.mit.edu/projects/scheme/</a>
-
-<dt class=biblio><strong><a name="R5RS">[R5RS]</a></strong></dt>
-<dd>Revised<sup>5</sup> report on the algorithmic language Scheme.<br>
-    R. Kelsey, W. Clinger, J. Rees (editors). <br>
-    Higher-Order and Symbolic Computation, Vol. 11, No. 1, September, 1998. <br>
-    and ACM SIGPLAN Notices, Vol. 33, No. 9, October, 1998. <br>
-    Available at <a href="http://www.schemers.org/Documents/Standards/">
-    http://www.schemers.org/Documents/Standards/</a>.
-
-<dt class=biblio><strong>[SRFI]</strong></dt>
-<dd>
-    The SRFI web site. <br>
-    <a href="http://srfi.schemers.org/">http://srfi.schemers.org/</a>
-
-<dt class=biblio><strong>[SRFI-13]</strong></dt>
-<dd>
-    SRFI-13: String libraries. <br>
-    <a href="http://srfi.schemers.org/srfi-13/">http://srfi.schemers.org/srfi-13/</a>
-
-    <dl>    
-    <dt>
-      This document, in HTML:
-    <dd><a href="http://srfi.schemers.org/srfi-13/srfi-13.html">
-        http://srfi.schemers.org/srfi-13/srfi-13.html</a>
-
-    <dt>
-      This document, in plain text format:
-    <dd><a href="http://srfi.schemers.org/srfi-13/srfi-13.txt">
-        http://srfi.schemers.org/srfi-13/srfi-13.txt</a>
-
-    <dt> Source code for the reference implementation:
-    <dd>
-      <a href="http://srfi.schemers.org/srfi-13/srfi-13.scm">
-         http://srfi.schemers.org/srfi-13/srfi-13.scm</a>
-
-    <dt> Scheme 48 module specification, with typings:
-    <dd>
-      <a href="http://srfi.schemers.org/srfi-13/srfi-13-s48-module.scm">
-        http://srfi.schemers.org/srfi-13/srfi-13-s48-module.scm</a>
-    </dl>
-</dd>
-
-<dt class=biblio><strong><a name=SRFI-14>[SRFI-14]</a></strong>
-<dd>
-    SRFI-14: Character-set library. <br>
-    <a href="http://srfi.schemers.org/srfi-14/">http://srfi.schemers.org/srfi-14/</a> <br>
-    The SRFI 14 char-set library defines a character-set data type,
-    which is used by some procedures in this library.
-
-<dt class=biblio><strong><a name="Unicode">[Unicode]</a></strong>
-<dd>
-    <a href="http://www.unicode.org/">http://www.unicode.org/</a>
-
-<dt class=biblio><strong><a name="UnicodeData">[UnicodeData]</a></strong>
-<dd>
-    The Unicode character database. <br>
-    <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-    <br>
-    <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.html">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.html</a>
-
-</dl>
-
-<!--========================================================================-->
-<h1><a name="Copyright">Copyright</a></h1>
-
-<p>
-Certain portions of this document -- the specific, marked segments of text
-describing the <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> procedures -- were adapted with permission from the R5RS
-report.
-    
-<p>
-All other text is copyright (C) Olin Shivers (1998, 1999, 2000). 
-All Rights Reserved. 
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-</body>
-</html>
-
-<!--
-  LocalWords:  SRFI refs HTML css hackery sans Netscape td pre div init doc
-  LocalWords:  proc def procs defi's defn dl dt defi dd NS RS rs procx dict
-  LocalWords:  stylesheet IE biblio IE's Internationalisation  subform maillist
-  LocalWords:  normalisation lib ref ci ok titlecase upcase downcase Djurfeldt
-  LocalWords:  xsubstring xcopy tokenize kmp slib RScheme MzScheme html
-  LocalWords:  Bigloo Chez APL SML Unicode API eszet SS dz downcases
-  LocalWords:  titlecasing normalised normalise underbar ss eq vs
-  LocalWords:  backquote parameterised denmark taiwan UnicodeData txt
-  LocalWords:  pred nchars obj len cBa epilog foo baz wrt subst tstart
-  LocalWords:  Szilagyi zilagyi cs abcdefgh ca cd cond eek ee tHIS com
-  LocalWords:  elba elbA ary consed XXXX ac bc kons knil ans fixnum
-  LocalWords:  catamorphism lp eof lis cdr knull kar kdr anamorphism
-  LocalWords:  abcdefg sfrom sto TCL perl slen rv exp initialisation
-  LocalWords:  plen SJ PJ si sj pj IPORT iport patlen DF buf Bevan
-  LocalWords:  Denheyer scsh Paolo Amoroso Arvestad Bawden Dybvig
-  LocalWords:  Bornstein Bothner Egorov Feeley Matthias Felleisen
-  LocalWords:  Flatt ucs Gleckler Goetter Sven Hartrumpf Hilsdale
-  LocalWords:  Kiselyov Bengt Korb Kleberg Kolbly Shriram
-  LocalWords:  Krishnamurthi Lucier Schilling Sobel Mikael Staldal
-  LocalWords:  Tsyshevsky documentors Jaffer Sperber cltl AE
-  LocalWords:  CommonLisp HyperSpec Clinger Rees SIGPLAN uniquified
-  LocalWords:  cset EA DrScheme IEC conformant JIS xor diff Posix URL
-  LocalWords:  FFF DIAERESIS abcdefghijklmnopqrstuvwxyz EB EC EF ETH
-  LocalWords:  FA FB FC FD FF Ll AA diaeresis isLowerCase BA CB CC CE
-  LocalWords:  CF DA DC Lt CARON PSILI Lu PROSGEGRAMMENI DASIA VARIA
-  LocalWords:  OXIA PERISPOMENI FAA FAB FAC FAE FAF FBC FFC Lm Lo
-  LocalWords:  abcdefABCDEF Zs Zl Zp OGHAM IDEOGRAPHIC Pc recognised
-  LocalWords:  tokenizers iso Pd Ps Pe Pf AB BB BF Sm Sc Sk AF MACRON
-  LocalWords:  PILCROW soh nul ops Shiro Kawai para bignum
--->
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-14.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-14.html
deleted file mode 100644
index 4167ab3d65..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-14.html
+++ /dev/null
@@ -1,2023 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-            "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
- - Do a paragraph check <p>
- - The Unicode char tables are messed up, but it can't be fixed w/o CSS2
-   support, which I do not currently find in web browsers.
- - Can I have bangs, plusses, or slashes in #tags? Spaces?
-        Yes: plus, bang, star   No: space  Yes: slash, question, ampersand
-        You can't put sharp in a path, so anything goes, really.
-        Nonetheless, some of these confuse Netscape, so I'll avoid them.
- -->
-
-<!--========================================================================-->
-<html lang=en-US>
-  <head>
-    <meta name="keywords" content="Scheme, programming language, list processing, SRFI, youthful devotees of intra-gender communion">
-    <link rev=made href="mailto:shivers@ai.mit.edu">
-    <title>SRFI 14: Character-set Library</title>
-
-    <!-- Should have a media=all to get, for example, printing to work.
-      == But my Netscape will completely ignore the tag if I do that.
-      -->
-    <style type="text/css">
-           /* A little general layout hackery for headers & the title. */
-           body { margin-left: +7%;
-                  font-family: "Helvetica", sans-serif;
-                  }
-           /* Netscape workaround: */
-           td, th { font-family: "Helvetica", sans-serif; }
-
-           code, pre { font-family: "courier new", "courier"; }
-
-           div.inset { margin-left: +5%; }
-
-           h1 { margin-left: -5%; }
-           h1, h2 { clear: both; }
-           h1, h2, h3, h4, h5, h6 { color: blue }
-           div.title-text { font-size: large; font-weight: bold; }
-	   h3 { margin-top: 2em; margin-bottom: 0em }
-
-           div.indent { margin-left: 2em; }       /* General indentation */
-           pre.code-example { margin-left: 2em; } /* Indent code examples. */
-
-	   /* "Continue" class marks text that isn't really the start
-	   ** of a new paragraph -- e.g., continuing a para after a 
-	   ** code sample.
-	   */
-	   p.continue { text-indent: 0em; margin-top: 0em}
-
-           /* This stuff is for definition lists of defined procedures.
-           ** A proc-def1 is used when you want a stack of procs to go
-           ** with one dd body. In this case, make the first
-           ** proc a proc-def1, following ones proc-defi's, and the last one
-           ** a proc-defn.
-           **
-           ** Unfortunately, Netscape has huge bugs with respect to style
-           ** sheets and dl list rendering. We have to set truly random
-           ** values here to get the rendering to come out. The proper values
-           ** are in the following style sheet, for Internet Explorer.
-           ** In the following settings, the *comments* say what the 
-           ** setting *really* causes Netscape to do.
-           **
-           ** Ugh. Professional coders sacrifice their self-respect,
-           ** that others may live.
-           */
-           /* m-t ignored; m-b sets top margin space. */
-           dt.proc-def1 { margin-top: 0ex; margin-bottom: 3ex; }
-           dt.proc-defi { margin-top: 0ex; margin-bottom: 0ex; }
-           dt.proc-defn { margin-top: 0ex; margin-bottom: 0ex; }
-
-           /* m-t works weird depending on whether or not the last line
-           ** of the previous entry was a pre. Set to zero.
-           */
-           dt.proc-def  { margin-top: 0ex; margin-bottom: 3ex; }
-
-           /* m-b sets space between dd & dt; m-t ignored. */
-           dd.proc-def { margin-bottom: 0.5ex; margin-top: 0ex; } 
-
-
-           /* Boldface the name of a procedure when it's being defined. */
-           code.proc-def { font-weight: bold; font-size: 110%}
-
-           /* For the index of procedures. 
-           ** Same hackery as for dt.proc-def, above.
-           */
-           /* m-b sets space between dd & dt; m-t ignored. */
-           dd.proc-index  { margin-bottom: 0ex; margin-top: 0ex; } 
-           /* What the fuck? */
-           pre.proc-index { margin-top: -2ex; }
-
-           /* Pull the table of contents back flush with the margin.
-           ** Both NS & IE screw this up in different ways.
-           */
-           #toc-table { margin-top: -2ex; margin-left: -5%; }
-
-           /* R5RS proc names are in italic; extended R5RS names 
-           ** in italic boldface.
-           */
-           span.r5rs-proc { font-weight: bold; }
-           span.r5rs-procx { font-style: italic; font-weight: bold; }
-
-           /* Spread out bibliographic lists. */
-           /* More Netscape-specific lossage; see the following stylesheet
-           ** for the proper values (used by IE).
-           */
-           dt.biblio { margin-bottom: 3ex; }
-
-           /* Links to draft copies (e.g., not at the official SRFI site)
-           ** are colored in red, so people will use them during the 
-           ** development process and kill them when the document's done.
-           */
-           a.draft { color: red; }
-
-    </style>
-
-    <style type="text/css" media=all>
-           /* Nastiness: Here, I'm using a bug to work around a bug.
-           ** Netscape rendering bugs mean you need bogus <dt> and <dd>
-           ** margin settings -- settings which screw up IE's proper rendering.
-           ** Fortunately, Netscape has *another* bug: it will ignore this
-           ** media=all style sheet. So I am placing the (proper) IE values
-           ** here. Perhaps, one day, when these rendering bugs are fixed,
-           ** this gross hackery can be removed.
-           */
-           dt.proc-def1 { margin-top: 3ex; margin-bottom: 0ex; }
-           dt.proc-defi { margin-top: 0ex; margin-bottom: 0ex; }
-           dt.proc-defn { margin-top: 0ex; margin-bottom: 0.5ex; }
-           dt.proc-def  { margin-top: 3ex; margin-bottom: 0.5ex; }
-
-           pre { margin-top: 1ex; }
-
-           dd.proc-def { margin-bottom: 2ex; margin-top: 0.5ex; } 
-
-           /* For the index of procedures. 
-           ** Same hackery as for dt.proc-def, above.
-           */
-           dd.proc-index { margin-top: 0ex; } 
-           pre.proc-index { margin-top: 0ex; }
-
-           /* Spread out bibliographic lists. */
-           dt.biblio { margin-top: 3ex; margin-bottom: 0ex; }
-           dd.biblio { margin-bottom: 1ex; }
-    </style>
-  </head>
-
-<body>
-
-<!--========================================================================-->
-<H1>Title</H1>
-
-<div class=title-text>SRFI 14: Character-set Library</div>
-
-<!--========================================================================-->
-<H1>Author</H1>
-
-Olin Shivers
-
-<H1>Status</H1>
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion via <A HREF="http://srfi.schemers.org/srfi-14/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P><UL>
-<LI>Received: 1999/10/17
-<LI>Draft: 1999/10/30-1999/12/30
-<LI>Revised: 2000/04/30
-<LI>Revised: 2000/04/30
-<LI>Revised: 2000/06/09
-<LI>Revised: 2000/12/23
-</UL>
-
-<!--========================================================================-->
-<h1>Table of contents</H1>
-
-<!-- A bug in netscape (?) keeps the first link in this UL from being active.
-==== So the Abstract link be dead. 99/8/22 -Olin
--->
-<ul id=toc-table>
-<li><a href="#Abstract">Abstract</a>
-<li><a href="#VariableIndex">Variable index</a>
-<li><a href="#Rationale">Rationale</a>
-  <ul>
-  <li><a href="#LinearUpdateOperations">"Linear-update" operations</a>
-  <li><a href="#ExtraSRFI">Extra-SRFI recommendations</a>
-  </ul>
-
-<li><a href="#Specification">Specification</a>
-  <ul>
-  <li><a href="#GeneralProcs">General procedures</a>
-  <li><a href="#Iterating">Iterating over character sets</a>
-  <li><a href="#Creating">Creating character sets</a>
-  <li><a href="#Querying">Querying character sets</a>
-  <li><a href="#Algebra">Character set algebra</a>
-  <li><a href="#StandardCharsets">Standard character sets</a>
-  </ul>
-
-<li><a href="#StandardCharsetDefs">Unicode, Latin-1 and ASCII definitions of the standard character sets</a>
-<li><a href="#ReferenceImp">Reference implementation</a>
-<li><a href="#Acknowledgements">Acknowledgements</a>
-<li><a href="#Links">References &amp; Links</a>
-<li><a href="#Copyright">Copyright</a>
-</ul>
-
-<!--========================================================================-->
-<h1><a name="Abstract">Abstract</a></H1>
-<p>
-
-The ability to efficiently represent and manipulate sets of characters is an
-unglamorous but very useful capability for text-processing code -- one that
-tends to pop up in the definitions of other libraries.  Hence it is useful to
-specify a general substrate for this functionality early.  This SRFI defines a
-general library that provides this functionality. 
-
-It is accompanied by a reference implementation for the spec. The reference
-implementation is fairly efficient, straightforwardly portable, and has a
-"free software" copyright. The implementation is tuned for "small" 7 or 8
-bit character types, such as ASCII or Latin-1; the data structures and
-algorithms would have to be altered for larger 16 or 32 bit character types
-such as Unicode -- however, the specs have been carefully designed with these
-larger character types in mind.
-
-Several forthcoming SRFIs can be defined in terms of this one:
-<ul>
-    <li> string library
-    <li> delimited input procedures (<em>e.g.</em>, <code>read-line</code>)
-    <li> regular expressions
-</ul>
-
-
-<!--========================================================================-->
-<h1><a name="VariableIndex">Variable Index</a></h1>
-<p>
-Here is the complete set of bindings -- procedural and otherwise --
-exported by this library. In a Scheme system that has a module or package 
-system, these procedures should be contained in a module named "char-set-lib".
-
-<div class=indent>
-<dl>
-<dt class=proc-index> Predicates &amp; comparison
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#char-set-p">char-set?</a> <a href="#char-set=">char-set=</a> <a href="#char-set<=">char-set<=</a> <a href="#char-set-hash">char-set-hash</a>
-</pre>
-
-<dt class=proc-index> Iterating over character sets
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#char-set-cursor">char-set-cursor</a> <a href="#char-set-ref">char-set-ref</a> <a href="#char-set-cursor-next">char-set-cursor-next</a> <a href="#end-of-char-set-p">end-of-char-set?</a> 
-<a href="#char-set-fold">char-set-fold</a> <a href="#char-set-unfold">char-set-unfold</a> <a href="#char-set-unfold!">char-set-unfold!</a>
-<a href="#char-set-for-each">char-set-for-each</a> <a href="#char-set-map">char-set-map</a>
-</pre>
-
-<dt class=proc-index> Creating character sets
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#char-set-copy">char-set-copy</a> <a href="#char-set">char-set</a>
-
-<a href="#list->char-set">list->char-set</a>  <a href="#string->char-set">string->char-set</a>
-<a href="#list->char-set!">list->char-set!</a> <a href="#string->char-set!">string->char-set!</a>
-    
-<a href="#char-set-filter">char-set-filter</a>  <a href="#ucs-range->char-set">ucs-range->char-set</a> <a href="#
-char-set-filter!">
-char-set-filter!</a> <a href="#ucs-range->char-set!">ucs-range->char-set!</a>
-
-<a href="#->char-set">->char-set</a>
-</pre>
-
-<dt class=proc-index> Querying character sets
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#char-set->list">char-set->list</a> <a href="#char-set->string">char-set->string</a>
-<a href="#char-set-size">char-set-size</a> <a href="#char-set-count">char-set-count</a> <a href="#char-set-contains-p">char-set-contains?</a>
-<a href="#char-set-every">char-set-every</a> <a href="#char-set-any">char-set-any</a>
-</pre>
-
-<dt class=proc-index> Character-set algebra
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#char-set-adjoin">char-set-adjoin</a>  <a href="#char-set-delete">char-set-delete</a>
-<a href="#char-set-adjoin!">char-set-adjoin!</a> <a href="#char-set-delete!">char-set-delete!</a>
-
-<a href="#char-set-complement">char-set-complement</a>  <a href="#char-set-union">char-set-union</a>  <a href="#char-set-intersection">char-set-intersection</a>
-<a href="#char-set-complement!">char-set-complement!</a> <a href="#char-set-union!">char-set-union!</a> <a href="#char-set-intersection!">char-set-intersection!</a>
-
-<a href="#char-set-difference">char-set-difference</a>  <a href="#char-set-xor">char-set-xor</a>  <a href="#char-set-diff+intersection">char-set-diff+intersection</a>
-<a href="#char-set-difference!">char-set-difference!</a> <a href="#char-set-xor!">char-set-xor!</a> <a href="#char-set-diff+intersection!">char-set-diff+intersection!</a>
-</pre>
-
-<dt class=proc-index> Standard character sets
-<dd class=proc-index>
-<pre class=proc-index>
-<a href="#char-set:lower-case">char-set:lower-case</a>  <a href="#char-set:upper-case">char-set:upper-case</a>  <a href="#char-set:title-case">char-set:title-case</a>
-<a href="#char-set:letter">char-set:letter</a>      <a href="#char-set:digit">char-set:digit</a>       <a href="#char-set:letter+digit">char-set:letter+digit</a>
-<a href="#char-set:graphic">char-set:graphic</a>     <a href="#char-set:printing">char-set:printing</a>    <a href="#char-set:whitespace">char-set:whitespace</a>
-<a href="#char-set:iso-control">char-set:iso-control</a> <a href="#char-set:punctuation">char-set:punctuation</a> <a href="#char-set:symbol">char-set:symbol</a>
-<a href="#char-set:hex-digit">char-set:hex-digit</a>   <a href="#char-set:blank">char-set:blank</a>       <a href="#char-set:ascii">char-set:ascii</a>
-<a href="#char-set:empty">char-set:empty</a>       <a href="#char-set:full">char-set:full</a>
-</pre>
-
-</dl>
-</div>
-
-<!--========================================================================-->
-<h1><a name="Rationale">Rationale</a></h1>
-
-<p>
-The ability to efficiently manipulate sets of characters is quite
-useful for text-processing code. Encapsulating this functionality in
-a general, efficiently implemented library can assist all such code.
-This library defines a new data structure to represent these sets, called
-a "char-set." The char-set type is distinct from all other types.
-
-<p>
-This library is designed to be portable across implementations that use
-different character types and representations, especially ASCII, Latin-1
-and Unicode. Some effort has been made to preserve compatibility with Java
-in the Unicode case (see the definition of <code>char-set:whitespace</code> for the
-single real deviation).
-
-<!--========================================================================-->
-<h2><a name="LinearUpdateOperations">Linear-update operations</a></h2>
-
-<p>
-The procedures of this SRFI, by default, are "pure functional" -- they do not
-alter their parameters. However, this SRFI defines a set of "linear-update"
-procedures which have a hybrid pure-functional/side-effecting semantics: they
-are allowed, but not required, to side-effect one of their parameters in order
-to construct their result. An implementation may legally implement these
-procedures as pure, side-effect-free functions, or it may implement them using
-side effects, depending upon the details of what is the most efficient or
-simple to implement in terms of the underlying representation.
-
-<p>
-The linear-update routines all have names ending with "!".
-
-<p>
-Clients of these procedures <em>may not</em> rely upon these procedures working by
-side effect. For example, this is not guaranteed to work:
-<pre class=code-example>
-(let* ((cs1 (char-set #\a #\b #\c))      ; cs1 = {a,b,c}.
-       (cs2 (char-set-adjoin! cs1 #\d))) ; Add d to {a,b,c}.
-  cs1) ; Could be either {a,b,c} or {a,b,c,d}.
-</pre>
-<p class=continue>
-However, this is well-defined:
-<pre class=code-example>
-(let ((cs (char-set #\a #\b #\c)))
-  (char-set-adjoin! cs #\d)) ; Add d to {a,b,c}.
-</pre>
-
-<p>
-So clients of these procedures write in a functional style, but must
-additionally be sure that, when the procedure is called, there are no other
-live pointers to the potentially-modified character set (hence the term
-"linear update").
-
-<p>
-There are two benefits to this convention:
-<ul>
-  <li> Implementations are free to provide the most efficient possible
-    implementation, either functional or side-effecting.
-  <li> Programmers may nonetheless continue to assume that character sets
-    are purely functional data structures: they may be reliably shared
-    without needing to be copied, uniquified, and so forth.
-</ul>
-
-<p>
-Note that pure functional representations are the right thing for
-ASCII- or Latin-1-based Scheme implementations, since a char-set can
-be represented in an ASCII Scheme with 4 32-bit words. Pure set-algebra
-operations on such a representation are very fast and efficient. Programmers
-who code using linear-update operations are guaranteed the system will
-provide the best implementation across multiple platforms.
-
-<p>
-In practice, these procedures are most useful for efficiently constructing
-character sets in a side-effecting manner, in some limited local context, 
-before passing the character set outside the local construction scope to be
-used in a functional manner.
-
-<p>
-Scheme provides no assistance in checking the linearity of the potentially
-side-effected parameters passed to these functions --- there's no linear
-type checker or run-time mechanism for detecting violations. (But
-sophisticated programming environments, such as DrScheme, might help.)
-
-<!--========================================================================-->
-<h2><a name="ExtraSRFI">Extra-SRFI recommendations</a></h2>
-<p>
-Users are cautioned that the R5RS predicates 
-<div class=inset><code>
-char-alphabetic? <br>
-char-numeric? <br>
-char-whitespace? <br>
-char-upper-case? <br>
-char-lower-case? <br>
-</code>
-</div>
-<p class=continue>
-may or may not be in agreement with the SRFI 14 base character sets
-<div class=inset>
-<code>
-char-set:letter<br>
-char-set:digit<br>
-char-set:whitespace<br>
-char-set:upper-case<br>
-char-set:lower-case<br>
-</code>
-</div>
-<p class=continue>
-Implementors are strongly encouraged to bring these predicates into
-agreement with the base character sets of this SRFI; not to do so risks
-major confusion.
-
-
-<!--========================================================================-->
-<h1><a name="Specification">Specification</a></h1>
-<p>
-In the following procedure specifications:
-<ul>
-    <li> A <var>cs</var> parameter is a character set.
-
-    <li> An <var>s</var> parameter is a string.
-
-    <li> A <var>char</var> parameter is a character.
-
-    <li> A <var>char-list</var> parameter is a list of characters.
-
-    <li> A <var>pred</var> parameter is a unary character predicate procedure, returning 
-      a true/false value when applied to a character.
-
-    <li> An <var>obj</var> parameter may be any value at all.
-</ul>
-
-<p>
-Passing values to procedures with these parameters that do not satisfy these
-types is an error.
-
-<p>
-Unless otherwise noted in the specification of a procedure, procedures
-always return character sets that are distinct (from the point of view
-of the linear-update operations) from the parameter character sets. For
-example, <code>char-set-adjoin</code> is guaranteed to provide a fresh character set,
-even if it is not given any character parameters.
-
-<p>
-Parameters given in square brackets are optional. Unless otherwise noted in the
-text describing the procedure, any prefix of these optional parameters may
-be supplied, from zero arguments to the full list. When a procedure returns
-multiple values, this is shown by listing the return values in square
-brackets, as well. So, for example, the procedure with signature
-<pre class=code-example>
-halts? <var>f [x init-store]</var> -> <var>[boolean integer]</var>
-</pre>
-would take one (<var>f</var>), two (<var>f</var>, <var>x</var>) 
-or three (<var>f</var>, <var>x</var>, <var>init-store</var>) input parameters, 
-and return two values, a boolean and an integer.
-
-<p>
-A parameter followed by "<code>...</code>" means zero-or-more elements. 
-So the procedure with the signature
-<pre class=code-example>
-sum-squares <var>x ... </var> -> <var>number</var>
-</pre>
-takes zero or more arguments (<var>x ...</var>), 
-while the procedure with signature
-<pre class=code-example>
-spell-check <var>doc dict<sub>1</sub> dict<sub>2</sub> ...</var> -> <var>string-list</var>
-</pre>
-takes two required parameters 
-(<var>doc</var> and <var>dict<sub>1</sub></var>) 
-and zero or more optional parameters (<var>dict<sub>2</sub> ...</var>).
-
-
-<!--========================================================================-->
-<h2><a name="GeneralProcs">General procedures</a></h2>
-<dl>
-
-<!--
-==== char-set?
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set-p"></a>
-<code class=proc-def>char-set?</code><var> obj -> boolean</var>
-<dd class=proc-def>
-
-    Is the object <var>obj</var> a character set?
-
-<!--
-==== char-set=
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set="></a>
-<code class=proc-def>char-set=</code><var> cs<sub>1</sub> ... -> boolean</var>
-<dd class=proc-def>
-    Are the character sets equal?
-<p>
-    Boundary cases:
-<pre class=code-example>
-(char-set=) => <var>true</var>
-(char-set= cs) => <var>true</var>
-</pre>
-
-<p>
-    Rationale: transitive binary relations are generally extended to n-ary
-    relations in Scheme, which enables clearer, more concise code to be
-    written. While the zero-argument and one-argument cases will almost
-    certainly not arise in first-order uses of such relations, they may well
-    arise in higher-order cases or macro-generated code. 
-    <em>E.g.,</em> consider
-<pre class=code-example>
-(apply char-set= cset-list)
-</pre>
-<p class=continue>
-    This is well-defined if the list is empty or a singleton list. Hence
-    we extend these relations to any number of arguments. Implementors
-    have reported actual uses of n-ary relations in higher-order cases
-    allowing for fewer than two arguments. The way of Scheme is to handle the
-    general case; we provide the fully general extension.
-<p>
-    A counter-argument to this extension is that 
-    <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>'s
-    transitive binary arithmetic relations 
-    (<code>=</code>, <code>&lt;</code>, <em>etc.</em>) 
-    require at least two arguments, hence
-    this decision is a break with the prior convention -- although it is
-    at least one that is backwards-compatible.
-
-<!--
-==== char-set<=
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set<="></a>
-<code class=proc-def>char-set<=</code><var> cs<sub>1</sub> ... -> boolean</var>
-<dd class=proc-def>
-    Returns true if every character set <var>cs<sub>i</sub></var> is 
-    a subset of character set <var>cs<sub>i+1</sub></var>.
-
-<p>
-Boundary cases:
-<pre class=code-example>
-(char-set<=) => <var>true</var>
-(char-set<= cs) => <var>true</var>
-</pre>
-<p>
-Rationale: See <code>char-set=</code> for discussion of zero- and one-argument
-applications. Consider testing a list of char-sets for monotonicity
-with 
-<pre class=code-example>
-(apply char-set<= cset-list)
-</pre>
-
-<!--
-==== char-set-hash
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set-hash"></a>
-<code class=proc-def>char-set-hash</code><var> cs [bound] -> integer</var>
-<dd class=proc-def>
-    Compute a hash value for the character set <var>cs</var>. 
-    <var>Bound</var> is a non-negative
-    exact integer specifying the range of the hash function. A positive
-    value restricts the return value to the range [0,<var>bound</var>).
-
-    <p>
-    If <var>bound</var> is either zero or not given, the implementation may use
-    an implementation-specific default value, chosen to be as large as
-    is efficiently practical. For instance, the default range might be chosen
-    for a given implementation to map all strings into the range of
-    integers that can be represented with a single machine word.
-
-
-    <p>
-    Invariant:
-<pre class=code-example>
-(char-set= cs<sub>1</sub> cs<sub>2</sub>) => (= (char-set-hash cs<sub>1</sub> b) (char-set-hash cs<sub>2</sub> b))
-</pre>
-
-    <p>
-    A legal but nonetheless discouraged implementation:
-<pre class=code-example>
-(define (char-set-hash cs . maybe-bound) 1)
-</pre>
-
-<p>
-    Rationale: allowing the user to specify an explicit bound simplifies user
-    code by removing the mod operation that typically accompanies every hash
-    computation, and also may allow the implementation of the hash function to
-    exploit a reduced range to efficiently compute the hash value. 
-    <em>E.g.</em>, for
-    small bounds, the hash function may be computed in a fashion such that
-    intermediate values never overflow into bignum integers, allowing the
-    implementor to provide a fixnum-specific "fast path" for computing the
-    common cases very rapidly.
-
-</dl>
-
-<!--========================================================================-->
-<h2><a name="Iterating">Iterating over character sets</a></h2>
-
-<dl>
-<!--
-==== char-set-cursor char-set-ref char-set-cursor-next end-of-char-set?
-============================================================================-->
-<dt class=proc-def1>
-<a name="char-set-cursor"></a>
-<a name="char-set-ref"></a>
-<a name="char-set-cursor-next"></a>
-<a name="end-of-char-set-p"></a>
-<code class=proc-def>char-set-cursor</code><var> cset -> cursor</var>
-<dt class=proc-defi>
-<code class=proc-def>char-set-ref</code><var> cset cursor -> char</var>
-<dt class=proc-defi>
-<code class=proc-def>char-set-cursor-next</code><var> cset cursor -> cursor</var>
-<dt class=proc-defn>
-<code class=proc-def>end-of-char-set?</code><var> cursor -> boolean</var>
-<dd class=proc-def>
-    Cursors are a low-level facility for iterating over the characters in a
-    set. A cursor is a value that indexes a character in a char set.
-    <code>char-set-cursor</code> produces a new cursor for a given char set. 
-    The set element indexed by the cursor is fetched with 
-    <code>char-set-ref</code>. 
-    A cursor index is incremented with <code>char-set-cursor-next</code>; 
-    in this way, code can step through every character in a char set. 
-    Stepping a cursor "past the end" of a char set produces a cursor that 
-    answers true to <code>end-of-char-set?</code>. 
-    It is an error to pass such a cursor to <code>char-set-ref</code> or to
-    <code>char-set-cursor-next</code>.
-
-<p>
-    A cursor value may not be used in conjunction with a different character
-    set; if it is passed to <code>char-set-ref</code> or 
-    <code>char-set-cursor-next</code> with
-    a character set other than the one used to create it, the results and
-    effects are undefined.
-
-<p>
-    Cursor values are <em>not</em> necessarily distinct from other types. 
-    They may be
-    integers, linked lists, records, procedures or other values. This license
-    is granted to allow cursors to be very "lightweight" values suitable for
-    tight iteration, even in fairly simple implementations.
-
-<p>
-    Note that these primitives are necessary to export an iteration facility
-    for char sets to loop macros.
-
-<p>
-    Example:
-<pre class=code-example>
-(define cs (char-set #\G #\a #\T #\e #\c #\h))
-
-;; Collect elts of CS into a list.
-(let lp ((cur (char-set-cursor cs)) (ans '()))
-  (if (end-of-char-set? cur) ans
-      (lp (char-set-cursor-next cs cur)
-          (cons (char-set-ref cs cur) ans))))
-  => (#\G #\T #\a #\c #\e #\h)
-
-;; Equivalently, using a list unfold (from SRFI 1):
-(unfold-right end-of-char-set? 
-              (curry char-set-ref cs)
-	      (curry char-set-cursor-next cs)
-	      (char-set-cursor cs))
-  => (#\G #\T #\a #\c #\e #\h)
-</pre>
-
-<p>
-    Rationale: Note that the cursor API's four functions "fit" the functional
-    protocol used by the unfolders provided by the list, string and char-set
-    SRFIs (see the example above). By way of contrast, here is a simpler, 
-    two-function API that was rejected for failing this criterion. Besides 
-    <code>char-set-cursor</code>, it provided a single
-    function that mapped a cursor and a character set to two values, the
-    indexed character and the next cursor. If the cursor had exhausted the
-    character set, then this function returned false instead of the character
-    value, and another end-of-char-set cursor. In this way, the other three
-    functions of the current API were combined together.
-
-<!--
-==== char-set-fold
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set-fold"></a>
-<code class=proc-def>char-set-fold</code><var> kons knil cs -> object</var>
-<dd class=proc-def>
-    This is the fundamental iterator for character sets.  Applies the function
-    <var>kons</var> across the character set <var>cs</var> using initial state value <var>knil</var>.  That is,
-    if <var>cs</var> is the empty set, the procedure returns <var>knil</var>.  Otherwise, some
-    element <var>c</var> of <var>cs</var> is chosen; 
-    let <var>cs'</var> be the remaining, unchosen characters.
-    The procedure returns
-<pre class=code-example>
-(char-set-fold <var>kons</var> (<var>kons</var> <var>c</var> <var>knil</var>) <var>cs'</var>)
-</pre>
-    <p>
-    Examples:
-<pre class=code-example>
-;; CHAR-SET-MEMBERS
-(lambda (cs) (char-set-fold cons '() cs))
-
-;; CHAR-SET-SIZE
-(lambda (cs) (char-set-fold (lambda (c i) (+ i 1)) 0 cs))
-
-;; How many vowels in the char set?
-(lambda (cs) 
-  (char-set-fold (lambda (c i) (if (vowel? c) (+ i 1) i))
-                 0 cs))
-</pre>
-
-<!--
-==== char-set-unfold char-set-unfold!
-============================================================================-->
-<dt class=proc-def1>
-<a name="char-set-unfold"></a>
-<a name="char-set-unfold!"></a>
-<code class=proc-def>char-set-unfold&nbsp;</code><var> f p g seed [base-cs] -> char-set</var>
-<dt class=proc-defn><code class=proc-def>char-set-unfold!</code><var> f p g seed base-cs -> char-set</var>
-<dd class=proc-def>
-    This is a fundamental constructor for char-sets. 
-<ul>
-    <li> <var>G</var> is used to generate a series of "seed" values from the initial seed:
-        <var>seed</var>, (<var>g</var> <var>seed</var>), (<var>g<sup>2</sup></var> <var>seed</var>), (<var>g<sup>3</sup></var> <var>seed</var>), ...
-    <li> <var>P</var> tells us when to stop -- when it returns true when applied to one 
-      of these seed values.
-    <li> <var>F</var> maps each seed value to a character. These characters are added
-      to the base character set <var>base-cs</var> to form the result; <var>base-cs</var> defaults to
-      the empty set. <code>char-set-unfold!</code> adds the characters to <var>base-cs</var> in a 
-      linear-update -- it is allowed, but not required, to side-effect
-      and use <var>base-cs</var>'s storage to construct the result.
-</ul>
-
-    <p>
-    More precisely, the following definitions hold, ignoring the
-    optional-argument issues:
-
-<pre class=code-example>
-(define (char-set-unfold p f g seed base-cs) 
-  (char-set-unfold! p f g seed (char-set-copy base-cs)))
-
-(define (char-set-unfold! p f g seed base-cs)
-  (let lp ((seed seed) (cs base-cs))
-        (if (p seed) cs                                 ; P says we are done.
-            (lp (g seed)                                ; Loop on (G SEED).
-                (char-set-adjoin! cs (f seed))))))      ; Add (F SEED) to set.
-</pre>
-
-    (Note that the actual implementation may be more efficient.)
-
-    <p>
-    Examples:
-<pre class=code-example>                         
-(port->char-set p) = (char-set-unfold eof-object? values
-                                      (lambda (x) (read-char p))
-                                      (read-char p))
-
-(list->char-set lis) = (char-set-unfold null? car cdr lis)
-</pre>
-<!--
-==== char-set-for-each
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set-for-each"></a>
-<code class=proc-def>char-set-for-each</code><var> proc cs -> unspecified</var>
-<dd class=proc-def>
-    Apply procedure <var>proc</var> to each character in the character set <var>cs</var>.
-    Note that the order in which <var>proc</var> is applied to the characters in the
-    set is not specified, and may even change from one procedure application
-    to another.
-
-    <p>
-    Nothing at all is specified about the value returned by this procedure; it
-    is not even required to be consistent from call to call. It is simply
-    required to be a value (or values) that may be passed to a command
-    continuation, <em>e.g.</em> as the value of an expression appearing as a
-    non-terminal subform of a <code>begin</code> expression. 
-    Note that in 
-    <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>,
-    this restricts the procedure to returning a single value; 
-    non-R5RS systems may not even provide this restriction.
-
-<!--
-==== char-set-map
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set-map"></a>
-<code class=proc-def>char-set-map</code><var> proc cs -> char-set</var>
-<dd class=proc-def>
-    <var>proc</var> is a char->char procedure. Apply it to all the characters in
-    the char-set <var>cs</var>, and collect the results into a new character set.
-
-    <p>
-    Essentially lifts <var>proc</var> from a char->char procedure to a char-set ->
-    char-set procedure.
-
-    <p>
-    Example:
-<pre class=code-example>
-(char-set-map char-downcase cset)
-</pre>
-</dl>
-
-
-<!--========================================================================-->
-<h2><a name="Creating">Creating character sets</a></h2>
-<dl>
-
-<!--
-==== char-set-copy
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set-copy"></a>
-<code class=proc-def>char-set-copy</code><var> cs -> char-set</var>
-<dd class=proc-def>
-    Returns a copy of the character set <var>cs</var>.  "Copy" means that if either the
-    input parameter or the result value of this procedure is passed to one of
-    the linear-update procedures described below, the other character set is
-    guaranteed not to be altered.  
-
-    <p>
-    A system that provides pure-functional implementations of the
-    linear-operator suite could implement this procedure as the identity
-    function -- so copies are <em>not</em> guaranteed to be distinct by <code>eq?</code>.
-
-<!--
-==== char-set
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set"></a>
-<code class=proc-def>char-set</code><var> char<sub>1</sub> ... -> char-set</var>
-<dd class=proc-def>
-    Return a character set containing the given characters.
-
-<!--
-==== list->char-set list->char-set
-============================================================================-->
-<dt class=proc-def1>
-<a name="list->char-set"></a>
-<a name="list->char-set!"></a>
-<code class=proc-def>list->char-set&nbsp;</code><var> char-list [base-cs] -> char-set</var>
-<dt class=proc-defn><code class=proc-def>list->char-set!</code><var> char-list base-cs -> char-set</var>
-<dd class=proc-def>
-    Return a character set containing the characters in the list of
-    characters <var>char-list</var>.
-
-    <p>
-    If character set <var>base-cs</var> is provided, the characters from <var>char-list</var>
-    are added to it. <code>list->char-set!</code> is allowed, but not required,
-    to side-effect and reuse the storage in <var>base-cs</var>; 
-    <code>list->char-set</code> produces a fresh character set.
-
-<!--
-==== string->char-set string->char-set!
-============================================================================-->
-<dt class=proc-def1>
-<a name="string->char-set"></a>
-<a name="string->char-set!"></a>
-<code class=proc-def>string->char-set&nbsp;</code><var> s [base-cs] -> char-set</var>
-<dt class=proc-defn><code class=proc-def>string->char-set!</code><var> s base-cs -> char-set</var>
-<dd class=proc-def>
-
-    Return a character set containing the characters in the string <var>s</var>.
-
-    <p>
-    If character set <var>base-cs</var> is provided, the characters from <var>s</var> are added to
-    it. <code>string->char-set!</code> is allowed, but not required, to side-effect and
-    reuse the storage in <var>base-cs</var>; <code>string->char-set</code> produces a fresh character
-    set.
-
-<!--
-==== char-set-filter char-set-filter!
-============================================================================-->
-<dt class=proc-def1>
-<a name="char-set-filter"></a>
-<a name="char-set-filter!"></a>
-<code class=proc-def>char-set-filter&nbsp;</code><var> pred cs [base-cs] -> char-set</var>
-<dt class=proc-defn><code class=proc-def>char-set-filter!</code><var> pred cs base-cs -> char-set</var>
-<dd class=proc-def>
-
-    Returns a character set containing every character <var>c</var> 
-    in <var>cs</var> such that <code>(<var>pred</var> <var>c</var>)</code> 
-    returns true.
-
-<p>
-    If character set <var>base-cs</var> is provided, the characters specified 
-    by <var>pred</var> are added to it. 
-    <code>char-set-filter!</code> is allowed, but not required,
-    to side-effect and reuse the storage in <var>base-cs</var>; 
-    <code>char-set-filter</code> produces a fresh character set.
-
-<p>
-    An implementation may not save away a reference to <var>pred</var> and
-    invoke it after <code>char-set-filter</code> or 
-    <code>char-set-filter!</code> returns -- that is, "lazy,"
-    on-demand implementations are not allowed, as <var>pred</var> may have
-    external dependencies on mutable data or have other side-effects.
-
-<p>
-    Rationale: This procedure provides a means of converting a character
-    predicate into its equivalent character set; the <var>cs</var> parameter
-    allows the programmer to bound the predicate's domain. Programmers should
-    be aware that filtering a character set such as <code>char-set:full</code>
-    could be a very expensive operation in an implementation that provided an
-    extremely large character type, such as 32-bit Unicode. An earlier draft
-    of this library provided a simple <code>predicate->char-set</code>
-    procedure, which was rejected in favor of <code>char-set-filter</code> for
-    this reason.
-
-
-<!--
-==== ucs-range->char-set ucs-range->char-set!
-============================================================================-->
-<dt class=proc-def1>
-<a name="ucs-range->char-set"></a>
-<a name="ucs-range->char-set!"></a>
-<code class=proc-def>ucs-range->char-set&nbsp;</code><var> lower upper [error? base-cs] -> char-set</var>
-<dt class=proc-defn><code class=proc-def>ucs-range->char-set!</code><var> lower upper error? base-cs -> char-set</var>
-<dd class=proc-def>
-    <var>Lower</var> and <var>upper</var> are exact non-negative integers; 
-    <var>lower</var> <= <var>upper</var>.
-
-    <p>
-    Returns a character set containing every character whose ISO/IEC 10646
-    UCS-4 code lies in the half-open range [<var>lower</var>,<var>upper</var>).
-
-<ul>
-    <li> If the requested range includes unassigned UCS values, these are
-      silently ignored (the current UCS specification has "holes" in the
-      space of assigned codes).
-    
-    <li> If the requested range includes "private" or "user space" codes, these
-      are handled in an implementation-specific manner; however, a UCS- or
-      Unicode-based Scheme implementation should pass them through
-      transparently.
-    
-    <li> If any code from the requested range specifies a valid, assigned
-      UCS character that has no corresponding representative in the
-      implementation's character type, then (1) an error is raised if <var>error?</var>
-      is true, and (2) the code is ignored if <var>error?</var> is false (the default).
-      This might happen, for example, if the implementation uses ASCII
-      characters, and the requested range includes non-ASCII characters.
-</ul>
-
-    <p>
-    If character set <var>base-cs</var> is provided, the characters specified by the
-    range are added to it. <code>ucs-range->char-set!</code> is allowed, but not required,
-    to side-effect and reuse the storage in <var>base-cs</var>; 
-    <code>ucs-range->char-set</code> produces a fresh character set.
-
-    <p>
-    Note that ASCII codes are a subset of the Latin-1 codes, which are in turn
-    a subset of the 16-bit Unicode codes, which are themselves a subset of the
-    32-bit UCS-4 codes. We commit to a specific encoding in this routine,
-    regardless of the underlying representation of characters, so that client
-    code using this library will be portable. <em>I.e.</em>, a conformant Scheme
-    implementation may use EBCDIC or SHIFT-JIS to encode characters; it must
-    simply map the UCS characters from the given range into the native
-    representation when possible, and report errors when not possible.
-
-<!--
-==== ->char-set
-============================================================================-->
-<dt class=proc-def>
-<a name="->char-set"></a>
-<code class=proc-def>->char-set</code><var> x -> char-set</var>
-<dd class=proc-def>
-    Coerces <var>x</var> into a char-set. 
-    <var>X</var> may be a string, character or
-    char-set. A string is converted to the set of its constituent characters;
-    a character is converted to a singleton set; a char-set is returned
-    as-is.
-    This procedure is intended for use by other procedures that want to 
-    provide "user-friendly," wide-spectrum interfaces to their clients.
-
-</dl>
-
-<!--========================================================================-->
-<h2><a name="Querying">Querying character sets</a></h2>
-<dl>
-
-<!--
-==== char-set-size
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set-size"></a>
-<code class=proc-def>char-set-size</code><var> cs -> integer</var>
-<dd class=proc-def>
-    Returns the number of elements in character set <var>cs</var>.
-
-<!--
-==== char-set-count
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set-count"></a>
-<code class=proc-def>char-set-count</code><var> pred cs -> integer</var>
-<dd class=proc-def>
-    Apply <var>pred</var> to the chars of character set <var>cs</var>, and return the number
-    of chars that caused the predicate to return true.
-
-<!--
-==== char-set->list
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set->list"></a>
-<code class=proc-def>char-set->list</code><var> cs -> character-list</var>
-<dd class=proc-def>
-    This procedure returns a list of the members of character set <var>cs</var>.
-    The order in which <var>cs</var>'s characters appear in the list is not defined,
-    and may be different from one call to another.
-
-<!--
-==== char-set->string
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set->string"></a>
-<code class=proc-def>char-set->string</code><var> cs -> string</var>
-<dd class=proc-def>
-    This procedure returns a string containing the members of character set <var>cs</var>.
-    The order in which <var>cs</var>'s characters appear in the string is not defined,
-    and may be different from one call to another.
-
-<!--
-==== char-set-contains?
-============================================================================-->
-<dt class=proc-def>
-<a name="char-set-contains-p"></a>
-<code class=proc-def>char-set-contains?</code><var> cs char -> boolean</var>
-<dd class=proc-def>
-    This procedure tests <var>char</var> for membership in character set <var>cs</var>.
-
-    <p>
-    The MIT Scheme character-set package called this procedure
-    <var>char-set-member?</var>, but the argument order isn't consistent with the name.
-
-<!--
-==== char-set-every char-set-any
-============================================================================-->
-<dt class=proc-def1>
-<a name="char-set-every"></a>
-<a name="char-set-any"></a>
-<code class=proc-def>char-set-every</code><var> pred cs -> boolean</var>
-<dt class=proc-defn><code class=proc-def>char-set-any&nbsp;&nbsp;</code><var> pred cs -> boolean</var>
-<dd class=proc-def>
-    The <code>char-set-every</code> procedure returns true if predicate <var>pred</var>
-    returns true of every character in the character set <var>cs</var>.
-    Likewise, <code>char-set-any</code> applies <var>pred</var> to every character in
-    character set <var>cs</var>, and returns the first true value it finds.
-    If no character produces a true value, it returns false.
-    The order in which these procedures sequence through the elements of
-    <var>cs</var> is not specified.
-
-    <p>
-    Note that if you need to determine the actual character on which a 
-    predicate returns true, use <code>char-set-any</code> and arrange for the predicate 
-    to return the character parameter as its true value, <em>e.g.</em>
-<pre class=code-example>
-(char-set-any (lambda (c) (and (char-upper-case? c) c)) 
-              cs)
-</pre>
-</dl>
-
-<!--========================================================================-->
-<h2><a name="Algebra">Character-set algebra</a></h2>
-<dl>
-
-<!--
-==== char-set-adjoin char-set-delete
-============================================================================-->
-<dt class=proc-def1>
-<a name="char-set-adjoin"></a>
-<a name="char-set-delete"></a>
-<code class=proc-def>char-set-adjoin</code><var> cs char<sub>1</sub> ... -> char-set</var>
-<dt class=proc-defn><code class=proc-def>char-set-delete</code><var> cs char<sub>1</sub> ... -> char-set</var>
-<dd class=proc-def>
-    Add/delete the <var>char<sub>i</sub></var> characters to/from character set <var>cs</var>.
-
-<!--
-==== char-set-adjoin! char-set-delete!
-============================================================================-->
-<dt class=proc-def1>
-<a name="char-set-adjoin!"></a>
-<a name="char-set-delete!"></a>
-<code class=proc-def>char-set-adjoin!</code><var> cs char<sub>1</sub> ... -> char-set</var>
-<dt class=proc-defn><code class=proc-def>char-set-delete!</code><var> cs char<sub>1</sub> ... -> char-set</var>
-<dd class=proc-def>
-
-    Linear-update variants. These procedures are allowed, but not
-    required, to side-effect their first parameter.
-
-<!--
-==== char-set-complement char-set-union char-set-intersection 
-==== char-set-difference char-set-xor char-set-diff+intersection
-============================================================================-->
-<dt class=proc-def1>
-<a name="char-set-complement"></a>
-<a name="char-set-union"></a>
-<a name="char-set-intersection"></a>
-<a name="char-set-difference"></a>
-<a name="char-set-xor"></a>
-<a name="char-set-diff+intersection"></a>
-<code class=proc-def>char-set-complement</code><var> cs                     -> char-set</var>
-<dt class=proc-defi><code class=proc-def>char-set-union</code><var> cs<sub>1</sub> ...                 -> char-set</var>
-<dt class=proc-defi><code class=proc-def>char-set-intersection</code><var> cs<sub>1</sub> ...          -> char-set</var>
-<dt class=proc-defi><code class=proc-def>char-set-difference</code><var> cs<sub>1</sub> cs<sub>2</sub> ...        -> char-set</var>
-<dt class=proc-defi><code class=proc-def>char-set-xor</code><var> cs<sub>1</sub> ...                   -> char-set</var>
-<dt class=proc-defn><code class=proc-def>char-set-diff+intersection</code><var> cs<sub>1</sub> cs<sub>2</sub> ... -> [char-set char-set]</var>
-<dd class=proc-def>
-    These procedures implement set complement, union, intersection,
-    difference, and exclusive-or for character sets. The union, intersection
-    and xor operations are n-ary. The difference function is also n-ary,
-    associates to the left (that is, it computes the difference between
-    its first argument and the union of all the other arguments),
-    and requires at least one argument.
-
-    <p>
-    Boundary cases:
-<pre class=code-example>
-(char-set-union) => char-set:empty
-(char-set-intersection) => char-set:full
-(char-set-xor) => char-set:empty
-(char-set-difference <var>cs</var>) => <var>cs</var>
-</pre>
-
-    <p>
-    <code>char-set-diff+intersection</code> returns both the difference and the
-    intersection of the arguments -- it partitions its first parameter.
-    It is equivalent to 
-<pre class=code-example>
-(values (char-set-difference <var>cs<sub>1</sub></var> <var>cs<sub>2</sub></var> ...)
-        (char-set-intersection <var>cs<sub>1</sub></var> (char-set-union <var>cs<sub>2</sub></var> ...)))
-</pre>
-    but can be implemented more efficiently.
-
-<p>
-    Programmers should be aware that <code>char-set-complement</code> could potentially
-    be a very expensive operation in Scheme implementations that provide
-    a very large character type, such as 32-bit Unicode. If this is a
-    possibility, sets can be complimented with respect to a smaller
-    universe using <code>char-set-difference</code>.
-
-
-<!--
-==== char-set-complement! char-set-union! char-set-intersection! 
-==== char-set-difference! char-set-xor! char-set-diff+intersection!
-============================================================================-->
-<dt class=proc-def1>
-<a name="char-set-complement!"></a>
-<a name="char-set-union!"></a>
-<a name="char-set-intersection!"></a>
-<a name="char-set-difference!"></a>
-<a name="char-set-xor!"></a>
-<a name="char-set-diff+intersection!"></a>
-<code class=proc-def>char-set-complement!</code><var> cs                     -> char-set</var>
-<dt class=proc-defi><code class=proc-def>char-set-union!</code><var>  cs<sub>1</sub> cs<sub>2</sub> ...                   -> char-set</var>
-<dt class=proc-defi><code class=proc-def>char-set-intersection!</code><var>  cs<sub>1</sub> cs<sub>2</sub> ...          -> char-set</var>
-<dt class=proc-defi><code class=proc-def>char-set-difference!</code><var>  cs<sub>1</sub> cs<sub>2</sub> ...            -> char-set</var>
-<dt class=proc-defi><code class=proc-def>char-set-xor!</code><var>  cs<sub>1</sub> cs<sub>2</sub> ...                   -> char-set</var>
-<dt class=proc-defn><code class=proc-def>char-set-diff+intersection!</code><var>  cs<sub>1</sub> cs<sub>2</sub> cs<sub>3</sub> ... -> [char-set char-set]</var>
-<dd class=proc-def>
-    These are linear-update variants of the set-algebra functions.
-    They are allowed, but not required, to side-effect their first (required)
-    parameter.
-
-    <p>
-    <code>char-set-diff+intersection!</code> is allowed to side-effect both
-    of its two required parameters, <var>cs<sub>1</sub></var>
-    and <var>cs<sub>2</sub></var>.
-</dl>
-
-<!--========================================================================-->
-<h2><a name="StandardCharsets">Standard character sets</a></h2>
-<p>
-Several character sets are predefined for convenience:
-<a name="char-set:lower-case"></a>
-<a name="char-set:lower-case"></a>
-<a name="char-set:upper-case"></a>
-<a name="char-set:title-case"></a>
-<a name="char-set:letter"></a>
-<a name="char-set:digit"></a>
-<a name="char-set:letter+digit"></a>
-<a name="char-set:graphic"></a>
-<a name="char-set:printing"></a>
-<a name="char-set:whitespace"></a>
-<a name="char-set:iso-control"></a>
-<a name="char-set:punctuation"></a>
-<a name="char-set:symbol"></a>
-<a name="char-set:hex-digit"></a>
-<a name="char-set:blank"></a>
-<a name="char-set:ascii"></a>
-<a name="char-set:empty"></a>
-<a name="char-set:full"></a>
-<div class=inset>
-<table cellpadding=0 cellspacing=0>
-<tr><td><code>char-set:lower-case</code> </td><td>Lower-case letters</td></tr>
-<tr><td><code>char-set:upper-case</code> </td><td>Upper-case letters</td></tr>
-<tr><td><code>char-set:title-case</code> </td><td>Title-case letters</td></tr>
-<tr><td><code>char-set:letter</code> </td><td>Letters</td></tr>
-<tr><td><code>char-set:digit</code> </td><td>Digits</td></tr>
-<tr><td><code>char-set:letter+digit</code> </td><td>Letters and digits</td></tr>
-<tr><td><code>char-set:graphic</code> </td><td>Printing characters except spaces</td></tr>
-<tr><td><code>char-set:printing</code> </td><td>Printing characters including spaces</td></tr>
-<tr><td><code>char-set:whitespace</code> </td><td>Whitespace characters </td></tr>
-<tr><td><code>char-set:iso-control</code> </td><td>The ISO control characters </td></tr>
-<tr><td><code>char-set:punctuation</code> </td><td>Punctuation characters</td></tr>
-<tr><td><code>char-set:symbol</code> </td><td>Symbol characters</td></tr>
-<tr><td><code>char-set:hex-digit</code> </td><td>A hexadecimal digit: 0-9, A-F, a-f </td></tr>
-<tr><td><code>char-set:blank</code> </td><td>Blank characters -- horizontal whitespace</td></tr>
-<tr><td><code>char-set:ascii</code> </td><td>All characters in the ASCII set. </td></tr>
-<tr><td><code>char-set:empty</code> </td><td>Empty set </td></tr>
-<tr><td><code>char-set:full</code> </td><td>All characters </td></tr>
-</table>
-</div>
-
-<p>
-Note that there may be characters in <code>char-set:letter</code> that are neither upper or
-lower case---this might occur in implementations that use a character type
-richer than ASCII, such as Unicode. A "graphic character" is one that would
-put ink on your page. While the exact composition of these sets may vary
-depending upon the character type provided by the underlying Scheme system,
-here are the definitions for some of the sets in an ASCII implementation:
-<div class=inset>
-<table cellpadding=0 cellspacing=0>
-<tr><td><code>char-set:lower-case</code> </td><td>a-z </td></tr>
-<tr><td><code>char-set:upper-case</code> </td><td>A-Z </td></tr>
-<tr><td><code>char-set:letter</code> </td><td>A-Z and a-z </td></tr>
-<tr><td><code>char-set:digit</code> </td><td>0123456789</td></tr>
-<tr><td><code>char-set:punctuation</code> </td><td><code>!"#%&amp;'()*,-./:;?@[\]_{}</code></td></tr>
-<tr><td><code>char-set:symbol</code> </td><td><code>$+&lt;=&gt;^`|~</code></td></tr>
-<tr><td><code>char-set:whitespace</code> </td><td>Space, newline, tab, form feed, </td></tr>
-<tr><td></td><td>                               vertical tab, carriage return </td></tr>
-<tr><td><code>char-set:blank</code> </td><td>Space and tab </td></tr>
-<tr><td><code>char-set:graphic</code> </td><td>letter + digit + punctuation + symbol</td></tr>
-<tr><td><code>char-set:printing</code> </td><td>graphic + whitespace</td></tr>
-<tr><td><code>char-set:iso-control</code> </td><td>ASCII 0-31 and 127 </td></tr>
-</table>
-</div>
-
-<p>
-Note that the existence of the <code>char-set:ascii</code> set implies that the underlying
-character set is required to be at least as rich as ASCII (including
-ASCII's control characters).
-
-<p>
-Rationale: The name choices reflect a shift from the older "alphabetic/numeric"
-terms found in 
-<abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr>
-and Posix to newer, Unicode-influenced "letter/digit" lexemes.
-
-<!--========================================================================-->
-<h1><a name="StandardCharsetDefs">
-    Unicode, Latin-1 and ASCII definitions of the standard character sets</a>
-</h1>
-<p>
-In Unicode Scheme implementations, the base character sets are compatible with
-Java's Unicode specifications. For ASCII or Latin-1, we simply restrict the
-Unicode set specifications to their first 128 or 256 codes, respectively.
-Scheme implementations that are not based on ASCII, Latin-1 or Unicode should
-attempt to preserve the sense or spirit of these definitions.
-
-<p>
-The following descriptions frequently make reference to the "Unicode character
-database." This is a file, available at URL
-<div class=inset>
-<a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">
-ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-</div>
-<p class=continue>
-Each line contains a description of a Unicode character. The first
-semicolon-delimited field of the line gives the hex value of the character's
-code; the second field gives the name of the character, and the third field
-gives a two-letter category. Other fields give simple 1-1 case-mappings for
-the character and other information; see
-<div class=inset>
-<a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.html">
-ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.html</a>
-</div>
-<p class=continue>
-for further description of the file's format. Note in particular the
-two-letter category specified in the third field, which is referenced
-frequently in the descriptions below.
-
-<!--========================================================================-->
-<h2><a name="lower-case-def">char-set:lower-case</a></h2>
-<p>
-For Unicode, we follow Java's specification: a character is lowercase if
-<ul>
-<li> it is not in the range [U+2000,U+2FFF], and
-<li> the Unicode attribute table does not give a lowercase mapping for it, and
-<li> at least one of the following is true:
-  <ul>
-  <li> the Unicode attribute table gives a mapping to uppercase 
-    for the character, or
-  <li> the name for the character in the Unicode attribute table contains
-    the words "SMALL LETTER" or "SMALL LIGATURE".
-  </ul>
-</ul>
-
-<p>
-The lower-case ASCII characters are 
-<div class=inset>
-    abcdefghijklmnopqrstuvwxyz
-</div>
-<p class=continue>
-Latin-1 adds another 33 lower-case characters to the ASCII set:
-<div class=inset>
-<table cellpadding=0 cellspacing=0>
-<tr><td>00B5</td> <td>MICRO SIGN</td></tr>
-<tr><td>00DF</td> <td>LATIN SMALL LETTER SHARP S</td></tr>
-<tr><td>00E0</td> <td>LATIN SMALL LETTER A WITH GRAVE</td></tr>
-<tr><td>00E1</td> <td>LATIN SMALL LETTER A WITH ACUTE</td></tr>
-<tr><td>00E2</td> <td>LATIN SMALL LETTER A WITH CIRCUMFLEX</td></tr>
-<tr><td>00E3</td> <td>LATIN SMALL LETTER A WITH TILDE</td></tr>
-<tr><td>00E4</td> <td>LATIN SMALL LETTER A WITH DIAERESIS</td></tr>
-<tr><td>00E5</td> <td>LATIN SMALL LETTER A WITH RING ABOVE</td></tr>
-<tr><td>00E6</td> <td>LATIN SMALL LETTER AE</td></tr>
-<tr><td>00E7</td> <td>LATIN SMALL LETTER C WITH CEDILLA</td></tr>
-<tr><td>00E8</td> <td>LATIN SMALL LETTER E WITH GRAVE</td></tr>
-<tr><td>00E9</td> <td>LATIN SMALL LETTER E WITH ACUTE</td></tr>
-<tr><td>00EA</td> <td>LATIN SMALL LETTER E WITH CIRCUMFLEX</td></tr>
-<tr><td>00EB</td> <td>LATIN SMALL LETTER E WITH DIAERESIS</td></tr>
-<tr><td>00EC</td> <td>LATIN SMALL LETTER I WITH GRAVE</td></tr>
-<tr><td>00ED</td> <td>LATIN SMALL LETTER I WITH ACUTE</td></tr>
-<tr><td>00EE</td> <td>LATIN SMALL LETTER I WITH CIRCUMFLEX</td></tr>
-<tr><td>00EF</td> <td>LATIN SMALL LETTER I WITH DIAERESIS</td></tr>
-<tr><td>00F0</td> <td>LATIN SMALL LETTER ETH</td></tr>
-<tr><td>00F1</td> <td>LATIN SMALL LETTER N WITH TILDE</td></tr>
-<tr><td>00F2</td> <td>LATIN SMALL LETTER O WITH GRAVE</td></tr>
-<tr><td>00F3</td> <td>LATIN SMALL LETTER O WITH ACUTE</td></tr>
-<tr><td>00F4</td> <td>LATIN SMALL LETTER O WITH CIRCUMFLEX</td></tr>
-<tr><td>00F5</td> <td>LATIN SMALL LETTER O WITH TILDE</td></tr>
-<tr><td>00F6</td> <td>LATIN SMALL LETTER O WITH DIAERESIS</td></tr>
-<tr><td>00F8</td> <td>LATIN SMALL LETTER O WITH STROKE</td></tr>
-<tr><td>00F9</td> <td>LATIN SMALL LETTER U WITH GRAVE</td></tr>
-<tr><td>00FA</td> <td>LATIN SMALL LETTER U WITH ACUTE</td></tr>
-<tr><td>00FB</td> <td>LATIN SMALL LETTER U WITH CIRCUMFLEX</td></tr>
-<tr><td>00FC</td> <td>LATIN SMALL LETTER U WITH DIAERESIS</td></tr>
-<tr><td>00FD</td> <td>LATIN SMALL LETTER Y WITH ACUTE</td></tr>
-<tr><td>00FE</td> <td>LATIN SMALL LETTER THORN</td></tr>
-<tr><td>00FF</td> <td>LATIN SMALL LETTER Y WITH DIAERESIS</td></tr>
-</table>
-</div>
-<p class=continue>
-Note that three of these have no corresponding Latin-1 upper-case character:
-<div class=inset>
-<table cellpadding=0 cellspacing=0>
-<tr><td>00B5</td> <td>MICRO SIGN</td></tr>
-<tr><td>00DF</td> <td>LATIN SMALL LETTER SHARP S</td></tr>
-<tr><td>00FF</td> <td>LATIN SMALL LETTER Y WITH DIAERESIS</td></tr>
-</table>
-</div>
-<p class=continue>
-(The compatibility micro character uppercases to the non-Latin-1 Greek capital
-mu; the German sharp s character uppercases to the pair of characters "SS,"
-and the capital y-with-diaeresis is non-Latin-1.)
-
-<p>
-(Note that the Java spec for lowercase characters given at
-<div class=inset>
-<a href="http://java.sun.com/docs/books/jls/html/javalang.doc4.html#14345">
-http://java.sun.com/docs/books/jls/html/javalang.doc4.html#14345</a>
-</div>
-<p class=continue>
-is inconsistent. U+00B5 MICRO SIGN fulfills the requirements for a lower-case
-character (as of Unicode 3.0), but is not given in the numeric list of
-lower-case character codes.)
-
-<p>
-(Note that the Java spec for <code>isLowerCase()</code> given at
-<div class=inset>
-<a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/Character.html#isLowerCase(char)">
-http://java.sun.com/products/jdk/1.2/docs/api/java/lang/Character.html#isLowerCase(char)</a>
-</div>
-<p class=continue>
-gives three mutually inconsistent definitions of "lower case." The first is
-the definition used in this SRFI. Following text says "A character is
-considered to be lowercase if and only if it is specified to be lowercase by
-the Unicode 2.0 standard (category Ll in the Unicode specification data
-file)." The former spec excludes U+00AA FEMININE ORDINAL INDICATOR and
-U+00BA MASCULINE ORDINAL INDICATOR; the later spec includes them. Finally,
-the spec enumerates a list of characters in the Latin-1 subset; this list
-excludes U+00B5 MICRO SIGN, which is included in both of the previous specs.) 
-
-<!--========================================================================-->
-<h2><a name="upper-case-def">char-set:upper-case</a></h2>
-<p>
-For Unicode, we follow Java's specification: a character is uppercase if
-<ul>
-<li> it is not in the range [U+2000,U+2FFF], and
-<li> the Unicode attribute table does not give an uppercase mapping for it
-(this excludes titlecase characters), and
-<li> at least one of the following is true:
-  <ul>
-  <li> the Unicode attribute table gives a mapping to lowercase 
-    for the character, or
-  <li> the name for the character in the Unicode attribute table contains
-    the words "CAPITAL LETTER" or "CAPITAL LIGATURE".
-  </ul>
-</ul>
-
-<p>
-The upper-case ASCII characters are 
-<div class=inset>
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
-</div>
-<p class=continue>
-Latin-1 adds another 30 upper-case characters to the ASCII set:
-<div class=inset>
-<table cellspacing=0 cellpadding=0>
-<tr><td>00C0</td> <td>LATIN CAPITAL LETTER A WITH GRAVE</td></tr>
-<tr><td>00C1</td> <td>LATIN CAPITAL LETTER A WITH ACUTE</td></tr>
-<tr><td>00C2</td> <td>LATIN CAPITAL LETTER A WITH CIRCUMFLEX</td></tr>
-<tr><td>00C3</td> <td>LATIN CAPITAL LETTER A WITH TILDE</td></tr>
-<tr><td>00C4</td> <td>LATIN CAPITAL LETTER A WITH DIAERESIS</td></tr>
-<tr><td>00C5</td> <td>LATIN CAPITAL LETTER A WITH RING ABOVE</td></tr>
-<tr><td>00C6</td> <td>LATIN CAPITAL LETTER AE</td></tr>
-<tr><td>00C7</td> <td>LATIN CAPITAL LETTER C WITH CEDILLA</td></tr>
-<tr><td>00C8</td> <td>LATIN CAPITAL LETTER E WITH GRAVE</td></tr>
-<tr><td>00C9</td> <td>LATIN CAPITAL LETTER E WITH ACUTE</td></tr>
-<tr><td>00CA</td> <td>LATIN CAPITAL LETTER E WITH CIRCUMFLEX</td></tr>
-<tr><td>00CB</td> <td>LATIN CAPITAL LETTER E WITH DIAERESIS</td></tr>
-<tr><td>00CC</td> <td>LATIN CAPITAL LETTER I WITH GRAVE</td></tr>
-<tr><td>00CD</td> <td>LATIN CAPITAL LETTER I WITH ACUTE</td></tr>
-<tr><td>00CE</td> <td>LATIN CAPITAL LETTER I WITH CIRCUMFLEX</td></tr>
-<tr><td>00CF</td> <td>LATIN CAPITAL LETTER I WITH DIAERESIS</td></tr>
-<tr><td>00D0</td> <td>LATIN CAPITAL LETTER ETH</td></tr>
-<tr><td>00D1</td> <td>LATIN CAPITAL LETTER N WITH TILDE</td></tr>
-<tr><td>00D2</td> <td>LATIN CAPITAL LETTER O WITH GRAVE</td></tr>
-<tr><td>00D3</td> <td>LATIN CAPITAL LETTER O WITH ACUTE</td></tr>
-<tr><td>00D4</td> <td>LATIN CAPITAL LETTER O WITH CIRCUMFLEX</td></tr>
-<tr><td>00D5</td> <td>LATIN CAPITAL LETTER O WITH TILDE</td></tr>
-<tr><td>00D6</td> <td>LATIN CAPITAL LETTER O WITH DIAERESIS</td></tr>
-<tr><td>00D8</td> <td>LATIN CAPITAL LETTER O WITH STROKE</td></tr>
-<tr><td>00D9</td> <td>LATIN CAPITAL LETTER U WITH GRAVE</td></tr>
-<tr><td>00DA</td> <td>LATIN CAPITAL LETTER U WITH ACUTE</td></tr>
-<tr><td>00DB</td> <td>LATIN CAPITAL LETTER U WITH CIRCUMFLEX</td></tr>
-<tr><td>00DC</td> <td>LATIN CAPITAL LETTER U WITH DIAERESIS</td></tr>
-<tr><td>00DD</td> <td>LATIN CAPITAL LETTER Y WITH ACUTE</td></tr>
-<tr><td>00DE</td> <td>LATIN CAPITAL LETTER THORN</td></tr>
-</table>
-</div>
-<!--========================================================================-->
-<h2><a name="title-case-def">char-set:title-case</a></h2>
-<p>
-In Unicode, a character is titlecase if it has the category Lt in
-the character attribute database. There are very few of these characters;
-here is the entire 31-character list as of Unicode 3.0:
-<div class=inset>
-<table cellspacing=0 cellpadding=0>
-<tr><td>01C5 </td><td nowrap> LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
-</td></tr>
-<tr><td>01C8 </td><td nowrap> LATIN CAPITAL LETTER L WITH SMALL LETTER J
-</td></tr>
-<tr><td>01CB </td><td nowrap> LATIN CAPITAL LETTER N WITH SMALL LETTER J
-</td></tr>
-<tr><td>01F2 </td><td nowrap> LATIN CAPITAL LETTER D WITH SMALL LETTER Z
-</td></tr>
-<tr><td>1F88 </td><td nowrap> GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F89 </td><td nowrap> GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F8A </td><td nowrap>GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F8B </td><td nowrap> GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F8C </td><td nowrap> GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F8D </td><td nowrap> GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F8E </td><td nowrap> GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F8F </td><td nowrap> GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F98 </td><td nowrap> GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F99 </td><td nowrap> GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F9A </td><td nowrap> GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F9B </td><td nowrap> GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F9C </td><td nowrap> GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F9D </td><td nowrap> GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F9E </td><td nowrap> GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1F9F </td><td nowrap> GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1FA8 </td><td nowrap> GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1FA9 </td><td nowrap> GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1FAA </td><td nowrap> GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1FAB </td><td nowrap> GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1FAC </td><td nowrap> GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1FAD </td><td nowrap> GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1FAE </td><td nowrap> GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1FAF </td><td nowrap> GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-</td></tr>
-<tr><td>1FBC </td><td nowrap> GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-</td></tr>
-<tr><td>1FCC </td><td nowrap> GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
-</td></tr>
-<tr><td>1FFC </td><td nowrap> GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
-</td></tr>
-</table>
-</div>
-<p>
-There are no ASCII or Latin-1 titlecase characters.
-
-
-<!--========================================================================-->
-<h2><a name="letter-def">char-set:letter</a></h2>
-<p>
-In Unicode, a letter is any character with one of the letter categories
-(Lu, Ll, Lt, Lm, Lo) in the Unicode character database. 
-
-<p>
-There are 52 ASCII letters
-<div class=indent>
-    abcdefghijklmnopqrstuvwxyz <br>
-    ABCDEFGHIJKLMNOPQRSTUVWXYZ <br>
-</div>
-<p>
-There are 117 Latin-1 letters. These are the 115 characters that are
-members of the Latin-1 <code>char-set:lower-case</code> and <code>char-set:upper-case</code> sets, 
-plus
-<div class=inset>
-<table cellspacing=0 cellpadding=0>
-<tr><td>00AA</td> <td>FEMININE ORDINAL INDICATOR</td></tr>
-<tr><td>00BA</td> <td>MASCULINE ORDINAL INDICATOR</td></tr>
-</table>
-</div>
-<p class=continue>
-(These two letters are considered lower-case by Unicode, but not by
-Java or SRFI 14.)
-
-<!--========================================================================-->
-<h2><a name="digit-def">char-set:digit</a></h2>
-
-<p>
-In Unicode, a character is a digit if it has the category Nd in
-the character attribute database. In Latin-1 and ASCII, the only
-such characters are 0123456789. In Unicode, there are other digit
-characters in other code blocks, such as Gujarati digits and Tibetan
-digits.
-
-
-<!--========================================================================-->
-<h2><a name="hex-digit-def">char-set:hex-digit</a></h2>
-<p>
-The only hex digits are 0123456789abcdefABCDEF.
-
-
-<!--========================================================================-->
-<h2><a name="letter+digit-def">char-set:letter+digit</a></h2>
-<p>
-The union of <code>char-set:letter</code> and <code>char-set:digit.</code>
-
-<!--========================================================================-->
-<h2><a name="graphic-def">char-set:graphic</a></h2>
-<p>
-A graphic character is one that would put ink on paper. The ASCII and Latin-1
-graphic characters are the members of
-<div class=inset>
-<table cellspacing=0 cellpadding=0>
-<tr><td><code>char-set:letter</code></td></tr>
-<tr><td><code>char-set:digit</code></td></tr>
-<tr><td><code>char-set:punctuation</code></td></tr>
-<tr><td><code>char-set:symbol</code></td></tr>
-</table>
-</div>
-
-<!--========================================================================-->
-<h2><a name="printing-def">char-set:printing</a></h2>
-<p>
-A printing character is one that would occupy space when printed, <em>i.e.</em>,
-a graphic character or a space character. <code>char-set:printing</code> is the union
-of <code>char-set:whitespace</code> and <code>char-set:graphic.</code>
-
-<!--========================================================================-->
-<h2><a name="whitespace-def">char-set:whitespace</a></h2>
-<p>
-In Unicode, a whitespace character is either
-<ul>
-  <li> a character with one of the space, line, or paragraph separator categories
-    (Zs, Zl or Zp) of the Unicode character database.
-  <li> U+0009 Horizontal tabulation (\t control-I)
-  <li> U+000A Line feed (\n control-J)
-  <li> U+000B Vertical tabulation (\v control-K)
-  <li> U+000C Form feed (\f control-L)
-  <li> U+000D Carriage return (\r control-M)
-</ul>
-
-<p>
-There are 24 whitespace characters in Unicode 3.0:
-<div class=inset>
-<table cellspacing=0 cellpadding=0>
-<tr><td>0009</td> <td>HORIZONTAL TABULATION </td> <td>  \t control-I</td></tr>
-<tr><td>000A</td> <td>LINE FEED         </td> <td> \n control-J</td></tr>
-<tr><td>000B</td> <td>VERTICAL TABULATION       </td> <td> \v control-K</td></tr>
-<tr><td>000C</td> <td>FORM FEED         </td> <td> \f control-L</td></tr>
-<tr><td>000D</td> <td>CARRIAGE RETURN   </td> <td> \r control-M</td></tr>
-<tr><td>0020</td> <td>SPACE                     </td> <td> Zs</td></tr>
-<tr><td>00A0</td> <td>NO-BREAK SPACE    </td> <td> Zs</td></tr>
-<tr><td>1680</td> <td>OGHAM SPACE MARK  </td> <td> Zs</td></tr>
-<tr><td>2000</td> <td>EN QUAD           </td> <td> Zs</td></tr>
-<tr><td>2001</td> <td>EM QUAD           </td> <td> Zs</td></tr>
-<tr><td>2002</td> <td>EN SPACE          </td> <td> Zs</td></tr>
-<tr><td>2003</td> <td>EM SPACE          </td> <td> Zs</td></tr>
-<tr><td>2004</td> <td>THREE-PER-EM SPACE        </td> <td> Zs</td></tr>
-<tr><td>2005</td> <td>FOUR-PER-EM SPACE </td> <td> Zs</td></tr>
-<tr><td>2006</td> <td>SIX-PER-EM SPACE  </td> <td> Zs</td></tr>
-<tr><td>2007</td> <td>FIGURE SPACE              </td> <td> Zs</td></tr>
-<tr><td>2008</td> <td>PUNCTUATION SPACE </td> <td> Zs</td></tr>
-<tr><td>2009</td> <td>THIN SPACE                </td> <td> Zs</td></tr>
-<tr><td>200A</td> <td>HAIR SPACE                </td> <td> Zs</td></tr>
-<tr><td>200B</td> <td>ZERO WIDTH SPACE  </td> <td> Zs</td></tr>
-<tr><td>2028</td> <td>LINE SEPARATOR    </td> <td> Zl</td></tr>
-<tr><td>2029</td> <td>PARAGRAPH SEPARATOR       </td> <td> Zp</td></tr>
-<tr><td>202F</td> <td>NARROW NO-BREAK SPACE     </td> <td> Zs</td></tr>
-<tr><td>3000</td> <td>IDEOGRAPHIC SPACE </td> <td> Zs</td></tr>
-</table>
-</div>
-<p>
-The ASCII whitespace characters are the first six characters in the above list
--- line feed, horizontal tabulation, vertical tabulation, form feed, carriage
-return, and space. These are also exactly the characters recognised by the
-Posix <code>isspace()</code> procedure. Latin-1 adds the no-break space.
-
-<p>
-Note: Java's <code>isWhitespace()</code> method is incompatible, including
-<div class=inset>
-<table cellspacing=0 cellpadding=0>
-<tr><td>0009</td> <td>HORIZONTAL TABULATION </td> <td>  (\t control-I)</td></tr>
-<tr><td>001C</td> <td>FILE SEPARATOR   </td> <td> (control-\)</td></tr>
-<tr><td>001D</td> <td>GROUP SEPARATOR  </td> <td>(control-])</td></tr>
-<tr><td>001E</td> <td>RECORD SEPARATOR </td> <td>(control-^)</td></tr>
-<tr><td>001F</td> <td>UNIT SEPARATOR   </td> <td>(control-_)</td></tr>
-</table>
-</div>
-<p class=continue>
-and excluding
-<div class=inset>
-<table cellspacing=0 cellpadding=0>
-<tr><td>00A0</td> <td>NO-BREAK SPACE</td></tr>
-</table>
-</div>
-<p>
-Java's excluding the no-break space means that tokenizers can simply break
-character streams at "whitespace" boundaries. However, the exclusion introduces
-exceptions in other places, <em>e.g.</em> <code>char-set:printing</code> is no longer simply the
-union of <code>char-set:graphic</code> and <code>char-set:whitespace.</code>
-
-
-<!--========================================================================-->
-<h2><a name="iso-control-def">char-set:iso-control</a></h2>
-<p>
-The ISO control characters are the Unicode/Latin-1 characters in the ranges
-[U+0000,U+001F] and [U+007F,U+009F].
-
-<p>
-ASCII restricts this set to the characters in the range [U+0000,U+001F] 
-plus the character U+007F.
-
-<p>
-Note that Unicode defines other control characters which do not belong to this
-set (hence the qualifying prefix "iso-" in the name). This restriction is
-compatible with the Java <code>IsISOControl()</code> method.
-
-
-<!--========================================================================-->
-<h2><a name="punctuation-def">char-set:punctuation</a></h2>
-<p>
-In Unicode, a punctuation character is any character that has one of the
-punctuation categories in the Unicode character database (Pc, Pd, Ps,
-Pe, Pi, Pf, or Po.)
-
-<p>
-ASCII has 23 punctuation characters:
-<pre class=code-example>
-!"#%&amp;'()*,-./:;?@[\]_{}
-</pre>
-<p>
-Latin-1 adds six more:
-<div class=inset>
-<table cellspacing=0 cellpadding=0>
-<tr><td>00A1 </td> <td> INVERTED EXCLAMATION MARK
-<tr><td>00AB </td> <td> LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-<tr><td>00AD </td> <td> SOFT HYPHEN
-<tr><td>00B7 </td> <td> MIDDLE DOT
-<tr><td>00BB </td> <td> RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-<tr><td>00BF </td> <td> INVERTED QUESTION MARK
-</table>
-</div>
-
-<p>
-Note that the nine ASCII characters <code>$+<=>^`|~</code> are <em>not</em>
-punctuation. They are "symbols."
-
-
-<!--========================================================================-->
-<h2><a name="symbol-def">char-set:symbol</a></h2>
-<p>
-In Unicode, a symbol is any character that has one of the symbol categories
-in the Unicode character database (Sm, Sc, Sk, or So). There
-are nine ASCII symbol characters:
-<pre class=code-example>
-$+&lt;=&gt;^`|~
-</pre>
-<p>
-Latin-1 adds 18 more:
-<div class=inset>
-<table cellspacing=0 cellpadding=0>
-<tr><td>00A2 </td> <td> CENT SIGN </td></tr>
-<tr><td>00A3 </td> <td> POUND SIGN </td></tr>
-<tr><td>00A4 </td> <td> CURRENCY SIGN </td></tr>
-<tr><td>00A5 </td> <td> YEN SIGN </td></tr>
-<tr><td>00A6 </td> <td> BROKEN BAR </td></tr>
-<tr><td>00A7 </td> <td> SECTION SIGN </td></tr>
-<tr><td>00A8 </td> <td> DIAERESIS </td></tr>
-<tr><td>00A9 </td> <td> COPYRIGHT SIGN </td></tr>
-<tr><td>00AC </td> <td> NOT SIGN </td></tr>
-<tr><td>00AE </td> <td> REGISTERED SIGN </td></tr>
-<tr><td>00AF </td> <td> MACRON </td></tr>
-<tr><td>00B0 </td> <td> DEGREE SIGN </td></tr>
-<tr><td>00B1 </td> <td> PLUS-MINUS SIGN </td></tr>
-<tr><td>00B4 </td> <td> ACUTE ACCENT </td></tr>
-<tr><td>00B6 </td> <td> PILCROW SIGN </td></tr>
-<tr><td>00B8 </td> <td> CEDILLA </td></tr>
-<tr><td>00D7 </td> <td> MULTIPLICATION SIGN </td></tr>
-<tr><td>00F7 </td> <td> DIVISION SIGN </td></tr>
-</table>
-</div>
-
-<!--========================================================================-->
-<h2><a name="blank-def">char-set:blank</a></h2>
-
-<p>
-Blank chars are horizontal whitespace. In Unicode, a blank character is either
-<ul>
-  <li> a character with the space separator category (Zs) in the Unicode 
-    character database.
-  <li> U+0009 Horizontal tabulation (\t control-I)
-</ul>
-
-<p>
-There are eighteen blank characters in Unicode 3.0:
-<div class=inset>
-<table cellspacing=0 cellpadding=0>
-<tr><td>0009 </td> <td> HORIZONTAL TABULATION   </td> <td> \t control-I </td></tr>
-<tr><td>0020 </td> <td> SPACE                   </td> <td> Zs </td></tr>
-<tr><td>00A0 </td> <td> NO-BREAK SPACE  </td> <td> Zs </td></tr>
-<tr><td>1680 </td> <td> OGHAM SPACE MARK        </td> <td> Zs </td></tr>
-<tr><td>2000 </td> <td> EN QUAD         </td> <td> Zs </td></tr>
-<tr><td>2001 </td> <td> EM QUAD         </td> <td> Zs </td></tr>
-<tr><td>2002 </td> <td> EN SPACE                </td> <td> Zs </td></tr>
-<tr><td>2003 </td> <td> EM SPACE                </td> <td> Zs </td></tr>
-<tr><td>2004 </td> <td> THREE-PER-EM SPACE      </td> <td> Zs </td></tr>
-<tr><td>2005 </td> <td> FOUR-PER-EM SPACE       </td> <td> Zs </td></tr>
-<tr><td>2006 </td> <td> SIX-PER-EM SPACE        </td> <td> Zs </td></tr>
-<tr><td>2007 </td> <td> FIGURE SPACE            </td> <td> Zs </td></tr>
-<tr><td>2008 </td> <td> PUNCTUATION SPACE       </td> <td> Zs </td></tr>
-<tr><td>2009 </td> <td> THIN SPACE              </td> <td> Zs </td></tr>
-<tr><td>200A </td> <td> HAIR SPACE              </td> <td> Zs </td></tr>
-<tr><td>200B </td> <td> ZERO WIDTH SPACE        </td> <td> Zs </td></tr>
-<tr><td>202F </td> <td> NARROW NO-BREAK SPACE   </td> <td> Zs </td></tr>
-<tr><td>3000 </td> <td> IDEOGRAPHIC SPACE       </td> <td> Zs </td></tr>
-</table>
-</div>
-<p>
-The ASCII blank characters are the first two characters above --
-horizontal tab and space. Latin-1 adds the no-break space.
-
-<p>
-Java doesn't have the concept of "blank" characters, so there are no
-compatibility issues.
-
-
-<!--========================================================================-->
-<h1><a name="ReferenceImp">Reference implementation</a></h1>
-<p>
-This SRFI comes with a reference implementation. It resides at:
-<div class=inset>
-    <a href="http://srfi.schemers.org/srfi-14/srfi-14.scm">
-http://srfi.schemers.org/srfi-14/srfi-14.scm</a>
-</div>
-<p class=continue>
-I have placed this source on the Net with an unencumbered, "open" copyright.
-Some of the code in the reference implementation bears a distant family
-relation to the MIT Scheme implementation, and being derived from that code,
-is covered by the MIT Scheme copyright (which is a generic BSD-style
-open-source copyright -- see the source file for details). The remainder of
-the code was written by myself for scsh or for this SRFI; I have placed this
-code under the scsh copyright, which is also a generic BSD-style open-source
-copyright.
-
-<p>
-The code is written for portability and should be simple to port to
-any Scheme. It has only the following deviations from R4RS, clearly
-discussed in the comments:
-<ul>
-  <li> an <code>error</code> procedure;
-  <li> the R5RS <code>values</code> procedure for producing multiple return values;
-  <li> a simple <code>check-arg</code> procedure for argument checking;
-  <li> <code>let-optionals*</code> and <code>:optional</code> macros for for parsing, checking and defaulting
-    optional arguments from rest lists;
-  <li> The SRFI-19 <code>define-record-type</code> form;
-  <li> <code>bitwise-and</code> for the hash function;
-  <li> <code>%latin1->char</code> and <code>%char->latin1</code>.
-</ul>
-
-<p>
-The library is written for clarity and well-commented; the current source is
-about 375 lines of source code and 375 lines of comments and white space.
-It is also written for efficiency. Fast paths are provided for common cases.
-
-<p>
-This is not to say that the implementation can't be tuned up for
-a specific Scheme implementation. There are notes in comments addressing
-ways implementors can tune the reference implementation for performance.
-
-<p>
-In short, I've written the reference implementation to make it as painless
-as possible for an implementor -- or a regular programmer -- to adopt this
-library and get good results with it.
-
-<p>
-The code uses a rather simple-minded, inefficient representation for
-ASCII/Latin-1 char-sets -- a 256-character string. The character whose code is
-<var>i</var> is in the set if <var>s[i]</var> = ASCII 1 (soh, or ^a); 
-not in the set if <var>s[i]</var> = ASCII 0 (nul). 
-A much faster and denser representation would be 16 or 32 bytes worth
-of bit string. A portable implementation using bit sets awaits standards for
-bitwise logical-ops and byte vectors.
-
-<p>
-"Large" character types, such as Unicode, should use a sparse representation,
-taking care that the Latin-1 subset continues to be represented with a
-dense 32-byte bit set.
-
-
-<!--========================================================================-->
-<h1><a name="Acknowledgements">Acknowledgements</a></h1>
-<p>
-The design of this library benefited greatly from the feedback provided during
-the SRFI discussion phase. Among those contributing thoughtful commentary and
-suggestions, both on the mailing list and by private discussion, were Paolo
-Amoroso, Lars Arvestad, Alan Bawden, Jim Bender, Dan Bornstein, Per Bothner,
-Will Clinger, Brian Denheyer, Kent Dybvig, Sergei Egorov, Marc Feeley,
-Matthias Felleisen, Will Fitzgerald, Matthew Flatt, Arthur A. Gleckler, Ben
-Goetter, Sven Hartrumpf, Erik Hilsdale, Shiro Kawai, Richard Kelsey, Oleg
-Kiselyov, Bengt Kleberg, Donovan Kolbly, Bruce Korb, Shriram Krishnamurthi,
-Bruce Lewis, Tom Lord, Brad Lucier, Dave Mason, David Rush, Klaus Schilling,
-Jonathan Sobel, Mike Sperber, Mikael Staldal, Vladimir Tsyshevsky, Donald
-Welsh, and Mike Wilson. I am grateful to them for their assistance.
-
-<p>
-I am also grateful the authors, implementors and documentors of all the
-systems mentioned in the introduction. Aubrey Jaffer should be noted for his
-work in producing Web-accessible versions of the R5RS spec, which was a
-tremendous aid.
-
-<p>
-This is not to imply that these individuals necessarily endorse the final
-results, of course. 
-
-<p>
-During this document's long development period, great patience was exhibited
-by Mike Sperber, who is the editor for the SRFI, and by Hillary Sullivan,
-who is not.
-
-<!--========================================================================-->
-<h1><a name="Links">References &amp; links</a></h1>
-
-<dl>
-<dt class=biblio><strong><a name="Java">[Java]</a></strong>
-<dd>
-    The following URLs provide documentation on relevant Java classes. <br>
-
-    <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/Character.html">http://java.sun.com/products/jdk/1.2/docs/api/java/lang/Character.html</a>
-    <br>
-    <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/String.html">http://java.sun.com/products/jdk/1.2/docs/api/java/lang/String.html</a>
-    <br>
-    <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/StringBuffer.html">http://java.sun.com/products/jdk/1.2/docs/api/java/lang/StringBuffer.html</a>
-    <br>
-    <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/text/Collator.html">http://java.sun.com/products/jdk/1.2/docs/api/java/text/Collator.html</a>
-    <br>
-    <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/text/package-summary.html">http://java.sun.com/products/jdk/1.2/docs/api/java/text/package-summary.html</a>
-
-<dt class=biblio><strong><a name="MIT-Scheme">[MIT-Scheme]</a></strong>
-<dd>
-    <a href="http://www.swiss.ai.mit.edu/projects/scheme/">http://www.swiss.ai.mit.edu/projects/scheme/</a>
-
-<dt class=biblio><strong><a name="R5RS">[R5RS]</a></strong></dt>
-<dd>Revised<sup>5</sup> report on the algorithmic language Scheme.<br>
-    R. Kelsey, W. Clinger, J. Rees (editors). <br>
-    Higher-Order and Symbolic Computation, Vol. 11, No. 1, September, 1998. <br>
-    and ACM SIGPLAN Notices, Vol. 33, No. 9, October, 1998. <br>
-    Available at <a href="http://www.schemers.org/Documents/Standards/">
-    http://www.schemers.org/Documents/Standards/</a>.
-
-<dt class=biblio><strong>[SRFI]</strong></dt>
-<dd>
-    The SRFI web site. <br>
-    <a href="http://srfi.schemers.org/">http://srfi.schemers.org/</a>
-
-<dt class=biblio><strong>[SRFI-14]</strong></dt>
-<dd>
-    SRFI-14: String libraries. <br>
-    <a href="http://srfi.schemers.org/srfi-14/">http://srfi.schemers.org/srfi-14/</a>
-
-    <dl>    
-    <dt>
-      This document, in HTML:
-    <dd><a href="http://srfi.schemers.org/srfi-14/srfi-14.html">
-        http://srfi.schemers.org/srfi-14/srfi-14.html</a>
-
-    <dt>
-      This document, in plain text format:
-    <dd><a href="http://srfi.schemers.org/srfi-14/srfi-14.txt">
-        http://srfi.schemers.org/srfi-14/srfi-14.txt</a>
-
-    <dt> Source code for the reference implementation:
-    <dd>
-      <a href="http://srfi.schemers.org/srfi-14/srfi-14.scm">
-         http://srfi.schemers.org/srfi-14/srfi-14.scm</a>
-
-    <dt> Scheme 48 module specification, with typings:
-    <dd>
-      <a href="http://srfi.schemers.org/srfi-14/srfi-14-s48-module.scm">
-        http://srfi.schemers.org/srfi-14/srfi-14-s48-module.scm</a>
-
-    <dt> Regression-test suite:
-    <dd> <a href="http://srfi.schemers.org/srfi-14/srfi-14-tests.scm">
-         http://srfi.schemers.org/srfi-14/srfi-14-tests.scm</a>
-
-    </dl>
-</dd>
-
-<dt class=biblio><strong><a name="Unicode">[Unicode]</a></strong>
-<dd>
-    <a href="http://www.unicode.org/">http://www.unicode.org/</a>
-
-<dt class=biblio><strong><a name="UnicodeData">[UnicodeData]</a></strong>
-<dd>
-    The Unicode character database. <br>
-    <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt</a>
-    <br>
-    <a href="ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.html">ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.html</a>
-</dl>
-
-<!--========================================================================-->
-<h1><a name="Copyright">Copyright</a></h1>
-
-<p>
-Certain portions of this document -- the specific, marked segments of text
-describing the <abbr title="Revised^5 Report on Scheme"><a href="#R5RS">R5RS</a></abbr> procedures -- were adapted with permission from the R5RS
-report.
-    
-<p>
-All other text is copyright (C) Olin Shivers (1998, 1999, 2000). 
-All Rights Reserved. 
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-</body>
-</html>
-<!--
-  LocalWords:  SRFI refs HTML css hackery sans Netscape td pre div para
-  LocalWords:  proc def procs defi's defn dl dt defi dd NS RS rs procx
-  LocalWords:  stylesheet IE biblio IE's Internationalisation ascii doc
-  LocalWords:  normalisation lib ref ci ok titlecase upcase downcase
-  LocalWords:  xsubstring xcopy tokenize kmp slib RScheme MzScheme init
-  LocalWords:  Bigloo Chez APL SML Unicode API eszet SS dz downcases
-  LocalWords:  titlecasing normalised normalise underbar ss eq vs dict
-  LocalWords:  backquote parameterised denmark taiwan UnicodeData txt
-  LocalWords:  pred nchars obj len cBa epilog foo baz wrt subst tstart
-  LocalWords:  Szilagyi zilagyi cs abcdefgh ca cd cond eek ee tHIS com
-  LocalWords:  elba elbA ary consed XXXX ac bc kons knil ans plusses 
-  LocalWords:  catamorphism lp eof lis cdr knull kar kdr anamorphism
-  LocalWords:  abcdefg sfrom sto TCL perl slen rv exp initialisation
-  LocalWords:  plen SJ PJ si sj pj IPORT iport patlen DF buf Bevan
-  LocalWords:  Denheyer scsh Paolo Amoroso Arvestad Bawden Dybvig
-  LocalWords:  Bornstein Bothner Egorov Feeley Matthias Felleisen
-  LocalWords:  Flatt ucs Gleckler Goetter Sven Hartrumpf Hilsdale
-  LocalWords:  Kiselyov Bengt Korb Kleberg Kolbly Shriram  bignum
-  LocalWords:  Krishnamurthi Lucier Schilling Sobel Mikael Staldal
-  LocalWords:  Tsyshevsky documentors Jaffer Sperber cltl AE fixnum
-  LocalWords:  CommonLisp HyperSpec Clinger Rees SIGPLAN uniquified
-  LocalWords:  cset EA DrScheme IEC conformant JIS xor diff Posix URL
-  LocalWords:  FFF DIAERESIS abcdefghijklmnopqrstuvwxyz EB EC EF ETH
-  LocalWords:  FA FB FC FD FF Ll AA diaeresis isLowerCase BA CB CC CE
-  LocalWords:  CF DA DC Lt CARON PSILI Lu PROSGEGRAMMENI DASIA VARIA
-  LocalWords:  OXIA PERISPOMENI FAA FAB FAC FAE FAF FBC FFC Lm Lo
-  LocalWords:  abcdefABCDEF Zs Zl Zp OGHAM IDEOGRAPHIC Pc recognised
-  LocalWords:  tokenizers iso Pd Ps Pe Pf AB BB BF Sm Sc Sk AF MACRON
-  LocalWords:  PILCROW soh nul ops Shiro Kawai subform
--->
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-16.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-16.html
deleted file mode 100644
index a335320b87..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-16.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 16: Syntax for procedures of variable arity</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 16: Syntax for procedures of variable arity.
-
-<H1>Author</H1>
-
-Lars T Hansen
-
-<H1>Status</H1>
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion via <A HREF="http://srfi.schemers.org/srfi-16/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P><UL>
-<LI>Received: 1999/11/01
-<LI>Draft: 1999/11/06-2000/01/07
-<LI>Final: 2000/03/10
-</UL>
-
-<H1>Abstract</H1>
-
-CASE-LAMBDA, a syntax for procedures with a variable number of arguments,
-is introduced.
-
-<H1>Rationale</H1>
-
-CASE-LAMBDA reduces the clutter of procedures that execute different
-code depending on the number of arguments they were passed; it is 
-a pattern-matching mechanism that matches on the number of arguments.
-CASE-LAMBDA is available in some Scheme systems.
-
-<p>While CASE-LAMBDA can be implemented as a macro using only facilities
-available in R5RS Scheme, it admits considerable implementation-specific
-optimization.
-
-
-<H1>Specification</H1>
-
-<dl>
-<dt><a name="case-lambda"></a>
-(CASE-LAMBDA &lt;clause&gt; ...)
-<br> Syntax
-<dd>
-<p>Each &lt;clause&gt; should have the form (&lt;formals&gt; &lt;body&gt;), where 
-   &lt;formals&gt; is a formal arguments list as for LAMBDA, cf section
-   4.1.4 of the R5RS.  Each &lt;body&gt; is a &lt;tail-body&gt;, cf section
-   3.5 of the R5RS.
-
-<p>A CASE-LAMBDA expression evaluates to a procedure that accepts
-   a variable number of arguments and is lexically scoped in the
-   same manner as procedures resulting from LAMBDA expressions.  
-   When the procedure is called with some arguments V1 .. Vk, then
-   the first &lt;clause&gt; for which the arguments agree with &lt;formals&gt; 
-   is selected, where agreement is specified as for the &lt;formals&gt; 
-   of a LAMBDA expression.  The variables of &lt;formals&gt; are bound 
-   to fresh locations, the values V1 .. Vk are stored in those 
-   locations, the &lt;body&gt; is evaluated in the extended environment,
-   and the results of &lt;body&gt; are returned as the results of the 
-   procedure call.
-
-<p>It is an error for the arguments not to agree with the &lt;formals&gt;
-   of any &lt;clause&gt;.
-
-<pre>
-             (define plus
-               (case-lambda 
-                 (() 0)
-                 ((x) x)
-                 ((x y) (+ x y))
-                 ((x y z) (+ (+ x y) z))
-                 (args (apply + args))))
-
-             (plus)                     --&gt; 0
-             (plus 1)                   --&gt; 1
-             (plus 1 2 3)               --&gt; 6
-
-             ((case-lambda 
-               ((a) a)
-               ((a b) (* a b)))
-              1 2 3)                    --&gt; error
-</pre>
-</dl>
-
-<H1>Implementation</H1>
-
-The following implementation is written in R5RS Scheme.  It is not
-compatible with the IEEE Scheme standard because the IEEE standard does
-not contain the high-level macro system.
-
-<p>The implementation assumes that some top-level names defined by the
-R5RS are bound to their original values.
-
-<p>
-<pre>
-;; This code is in the public domain.
-
-(define-syntax case-lambda
-  (syntax-rules ()
-    ((case-lambda 
-      (?a1 ?e1 ...) 
-      ?clause1 ...)
-     (lambda args
-       (let ((l (length args)))
-         (case-lambda "CLAUSE" args l 
-           (?a1 ?e1 ...)
-           ?clause1 ...))))
-    ((case-lambda "CLAUSE" ?args ?l 
-      ((?a1 ...) ?e1 ...) 
-      ?clause1 ...)
-     (if (= ?l (length '(?a1 ...)))
-         (apply (lambda (?a1 ...) ?e1 ...) ?args)
-         (case-lambda "CLAUSE" ?args ?l 
-           ?clause1 ...)))
-    ((case-lambda "CLAUSE" ?args ?l
-      ((?a1 . ?ar) ?e1 ...) 
-      ?clause1 ...)
-     (case-lambda "IMPROPER" ?args ?l 1 (?a1 . ?ar) (?ar ?e1 ...) 
-       ?clause1 ...))
-    ((case-lambda "CLAUSE" ?args ?l 
-      (?a1 ?e1 ...)
-      ?clause1 ...)
-     (let ((?a1 ?args))
-       ?e1 ...))
-    ((case-lambda "CLAUSE" ?args ?l)
-     (error "Wrong number of arguments to CASE-LAMBDA."))
-    ((case-lambda "IMPROPER" ?args ?l ?k ?al ((?a1 . ?ar) ?e1 ...)
-      ?clause1 ...)
-     (case-lambda "IMPROPER" ?args ?l (+ ?k 1) ?al (?ar ?e1 ...) 
-      ?clause1 ...))
-    ((case-lambda "IMPROPER" ?args ?l ?k ?al (?ar ?e1 ...) 
-      ?clause1 ...)
-     (if (>= ?l ?k)
-         (apply (lambda ?al ?e1 ...) ?args)
-         (case-lambda "CLAUSE" ?args ?l 
-           ?clause1 ...)))))
-</pre>
-
-<H1>Copyright</H1>
-<p>Copyright (C) Lars T Hansen (1999). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@schemers.org">Mike Sperber</a></address>
-<!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-<!-- hhmts start -->
-Last modified: Mon Apr 19 20:38:48 CEST 2004
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-17.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-17.html
deleted file mode 100644
index dc06d9d8d6..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-17.html
+++ /dev/null
@@ -1,285 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 17:  Generalized set!</title>
-  </head>
-
-<body>
-
-<H1>Title</H1>
-
-SRFI 17: Generalized <code>set!</code>
-
-<H1>Author</H1>
-
-Per Bothner
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion via <A HREF="http://srfi.schemers.org/srfi-17/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P><UL>
-<LI>Received: 1999/12/08
-<LI>Draft: 2000/01/16-2000/03/17
-<LI>Revised: 2000/04/28
-<LI>Final: 2000/07/24
-</UL>
-
-<H1>Abstract</H1>
-
-This is a proposal to allow procedure calls that evaluate
-to the "value of a location" to be used to <em>set</em>
-the value of the location, when used as the first
-operand of <code>set!</code>.
-For example:
-<pre>
-(set! (car x) (car y))
-</pre>
-becomes equivalent to
-<pre>
-(set-car! x (car y))
-</pre>
-
-<p>
-      Many programming languages have the concept of an <i>lvalue</i>.
-that is an "expression" that "evaluates" to a location, and
-which can appear on the left-hand-side of an assignment.
-Common Lisp has a related concept of "generalized variables"
-which can be used in <code>setf</code> and some other special forms.
-However, the Common Lisp concept is based on the idea of
-compile-time recognition of special "location-producing" functions;
-this does not seem to be in the "spirit of Scheme".
-<p>
-This SRFI proposes an extension of <code>set!</code>
-so that it provides similar functionality as Common Lisp's <code>setf</code>,
-except that the updater is associated with a procedure value,
-rather than a name.
-
-<H1>Rationale</H1>
-
-There is ample precedent for general "lvalues" on the
-left-hand side of an assignment.  This includes most statically
-typed languages, and many dynamically typed languages (including APL
-and Common Lisp).  That suggests this is a natural idiom for people.
-One reason may be that there are fewer procedure names to learn.
-Another is that it becomes visually clearer which expression is the new value,
-and which are parameters.  Also, the visual consistency between
-an expression evaluated for its value and one evaluated to yield
-a location seems natural to people.
-<p>
-For most languages, the set of lvalue-producing operators is limited
-(typically array indexing and field selection).  Some languages have
-general lvalues as first class values.  For example Algol 68 has
-expressions that have reference type.  However, this is made convenient
-by using automatic dereferencing coercions, which would not work for
-a dynamically typed language like Scheme.  ML goes further:  All
-mutable variables are first-class "cells", and accessing the
-contents of a cell requires an explicit operator.  This is also not
-compatible with Scheme.  Instead we need to stick to the model
-where using a variable in most contexts means using its value,
-but referring to a variable in certain lvalue contexts (lhs of
-assignment) refers to its actual location.  Sticking to this model
-for general "lvalue expressions" in <code>set!</code> means
-that "evaluation" must be done differently from normal
-evaluation when in an "lvalue context".  That is what this proposal does.
-<p>
-This is a controversial issue. This srfi does not wish to imply that
-all Scheme implementations should support this feature; it only
-requests that implementations that <em>do</em> implement
-generalized <code>set!</code> should be compatible with this srfi.
-
-<H1><a name="!set">Specification</a></H1>
-
-The special form <code>set!</code> is extended so the first operand
-can be a procedure application, and not just a variable.
-The procedure is typically one that extracts a component from
-some data structure.  Informally, when the procedure is called
-in the first operand of <code>set!</code>, it causes the corresponding
-component to be <em>replaced</em> by the second operand.
-For example,
-<pre>
-(set (vector-ref x i) v)
-</pre>
-would be equivalent to:
-<pre>
-(vector-set! x i v)
-</pre>
-<p>
-Each procedure that may be used as the first operand to <code>set!</code>
-must have a corresponding "setter" procedure.
-The builtin procedure <code>setter</code> takes a procedure and returns the
-corresponding setter procedure.
-<p>
-We define:
-<pre>
-(set! (proc arg ...) value)
-</pre>
-as:
-<pre>
-((setter proc) arg ... value)
-</pre>
-<p><strong>Note:</strong>
-This definition matches
-the existing Scheme convention for setter procedures, where
-the new value is given last.  For example we can define
-<code>(setter car)</code> to be <code>set-car!</code>.
-An alternative definition would be:
-<pre>
-((setter proc) value arg ...) ;; Not the actual definition.
-</pre>
-This definition would work better when you consider
-procedures that take a variable number of arguments.
-This is because it is straight-forward to add one extra
-initial fixed argument, but if you add an extra fixed
-argument to the end of an argument list that has
-a "rest" parameter, then things get more messy.
-However, consistency with the existing new-value-last convention
-seems more valuable.
-
-<h2>Standard setters</h2>
-
-The following standard procedures have pre-defined setters:
-<pre>
-(set! (car x) v) == (set-car! x v)
-(set! (cdr x) v) == (set-cdr! x v)
-(set! (caar x) v) == (set-car! (car x) v)
-(set! (cadr x) v) == (set-car! (cdr x) v)
-....
-(set! (caXXr x) v) == (set-car! (cXXr x) v)
-(set! (cdXXr x) v) == (set-cdr! (cXXr x) v)
-(set! (string-ref x i) v) == (string-set! x i v)
-(set! (vector-ref x i) v) == (vector-set! x i v)
-</pre>
-
-<!--
-<p>
-One useful addition:
-<pre>
-(set! (substring x i j) v) == ....
-</pre>
-(Of course this is more useful if Scheme had
-variable-length mutable strings.)
--->
-
-<h2>Setting setters;  properties</h2>
-
-A setter procedure is a special case of the concept of procedures having
-associated <dfn>properties</dfn>.  Other properties might include
-the procedures's name or usage documentation.
-As a <em>hypothetical</em> example (i.e. not part of this SRFI),
-we can use the Common Lisp <code>documentation</code> function,
-where for example:
-<pre>
-(documentation sqrt)
-</pre>
-returns the "documentation string" (if defined) for <code>sqrt</code>.
-Such properties should also be settable using generalized <code>set!</code>.
-For example:
-<pre>
-(set! (documentation sqrt) "Calculates the square root.")
-</pre>
-
-<p>
-This SRFI does
-not propose a general "procedure properties" feature, but it
-should be compatible with it.  It does specify the special case
-for the <code>setter</code> property.  This is defined such that:
-<pre>
-(set! (setter <var>proc</var>) <var>setter</var>)
-</pre>
-sets the setter procedure associated with <var>proc</var>
-to <var>setter</var>.
-For example, we can assume
-<pre>
-(set! (setter car) set-car!)
-</pre>
-has been executed by the Scheme prologue.
-
-<h2>Efficiency Issues</h2>
-
-If <code>(set! (foo ..) ...)</code> is to be the preferred idiom,
-we want to make  <code>((setter foo) ...)</code> as efficient
-as <code>(set-foo! ...)</code>.
-This is only possible when the compiler knows both what function
-the symbol <code>foo</code> is bound to, <em>and</em> the setter
-associated with that function.  Scheme (as opposed to Common Lisp)
-does not say anything about a compiler or what it can inline,
-so we cannot say much here.  A compiler that does whole-program
-analysis can safely inline calls using a variable bound unchangably
-to a known procedure; it can make the same deduction if the
-procedure's setter is set.  If separate compilation is supported,
-then a compiler cannot safely make such deductions for either
-plain calls or setter calls, without extra information, such as
-a module system, compiler switches, or other non-standard declarations.
-Thus my belief is that this srfi does not inherently make efficient
-compilation more difficult.  However, the next section does define
-a way to inherently tie a setter to a procedure, which does reduce
-the problem of inlining generalized <code>set!</code> to the
-standard inlining problem.
-
-<h2><code>getter-with-setter</code></h2>
-<p>The function <code>getter-with-setter</code> can be used
-to define a procedure with associated properties. 
-Specifically: <a name="getter-with-setter"></a>
-<pre>
-(getter-with-setter <var>getter</var> <var>setter</var>)
-</pre>
-This evaluates to a new anonymous procedure which when 
-applied invokes <var>getter</var>, and whose setter is <var>setter</var>.
-It is an error for a program to subsequently try to modify
-the setter of the resulting compound.
-<p>
-For example, we could define:
-<pre>
-(define car (getter-with-setter %primitive-car %primitive-set-car!))
-(define set-car! %primitive-set-car!)
-</pre>
-The advantage of this approach that whenever a compiler can inline
-<code>car</code>, it can also inline <code>(setter car)</code>.
-
-<H1>Implementation</H1>
-
-<a href="http://srfi.schemers.org/srfi-17/srfi-17-twobit.scm">Here</a> is a sample implementation
-for Twobit.
-<p>Here is a sample definition of  <code>getter-with-setter</code>:
-<pre>
-(define (getter-with-setter get set)
-  (let ((proc (lambda args (apply get args))))
-    (set! (setter proc) set)
-    proc))
-</pre>
-
-<H1>Copyright</H1>
-<p>Copyright (C) Per Bothner (1999, 2000). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@schemers.org">Mike Sperber</a></address>
-<!-- Created: Wed Nov 10 03:14:43 PST 1999 -->
-<!-- hhmts start -->
-Last modified: Mon Jul 24 12:00:06 MST 2000
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-19.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-19.html
deleted file mode 100644
index b2a612ea64..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-19.html
+++ /dev/null
@@ -1,666 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <title>SRFI 19: Time Data Types and Procedures</title>
-    <meta name="keywords" content="Scheme, programming language, time
-    processing, date processing, Julian Day, SRFI, overdone temporal smut">
-    <link rev=made href="mailto:will.fitzgerald@pobox.com">
- <!-- This style sheet is from the SRFI-1 description (Olin Shivers), but modified to taste.
-      -->
-    <style type="text/css">
-	   /* A little general layout hackery for headers & the title. */
-           body { margin-left: +7%;
-	          font-family: "Georgia", "Times Roman", serif;
-		  }
-           /* Netscape workaround: */
-	   td, th { font-family: "Georgia", "Times Roman", serif; }
-
-	   code, pre { font-family: "courier new", "courier"; }
-
-           h1 { margin-left: -5%; }
-	   h1, h2 { clear: both; }
-	   h1, h2, h3, h4, h5, h6 { color: black }
-	   div.title-text { font-size: large; font-weight: bold; }
-
-	   div.indent { margin-left: 2em; }	  /* General indentation */
-	   pre.code-example { margin-left: 2em; } /* Indent code examples. */
-
-	   /* This stuff is for definition lists of defined procedures.
-           ** A proc-def2 is used when you want a stack of procs to go
-	   ** with one <dd> ... </dd> body. In this case, make the first
-	   ** proc a proc-def1, following ones proc-defi's, and the last one
-           ** a proc-defn.
-           **
-           ** Unfortunately, Netscape has huge bugs with respect to style
-           ** sheets and dl list rendering. We have to set truly random
-           ** values here to get the rendering to come out. The proper values
-           ** are in the following style sheet, for Internet Explorer.
-	   ** In the following settings, the *comments* say what the 
-           ** setting *really* causes Netscape to do.
-	   **
-           ** Ugh. Professional coders sacrifice their self-respect,
-           ** that others may live.
-           */
-	   /* m-t ignored; m-b sets top margin space. */
-	   dt.proc-def1 { margin-top: 0ex; margin-bottom: 3ex; }
-	   dt.proc-defi { margin-top: 0ex; margin-bottom: 0ex; }
-	   dt.proc-defn { margin-top: 0ex; margin-bottom: 0ex; }
-
-	   /* m-t works weird depending on whether or not the last line
-           ** of the previous entry was a pre. Set to zero.
-           */
-	   dt.proc-def  { margin-top: 0ex; margin-bottom: 3ex; }
-
-	   /* m-b sets space between dd & dt; m-t ignored. */
-	   dd.proc-def { margin-bottom: 0.5ex; margin-top: 0ex; } 
-
-
-	   /* Boldface the name of a procedure when it's being defined. */
-	   code.proc-def { font-weight: bold; }
-
-	   /* For the index of procedures. 
-           ** Same hackery as for dt.proc-def, above.
-           */
-	   /* m-b sets space between dd & dt; m-t ignored. */
-	   dd.proc-index  { margin-bottom: 0ex; margin-top: 0ex; } 
-
-	   pre.proc-index { margin-top: -2ex; }
-
-	   /* Pull the table of contents back flush with the margin.
-	   ** Both NS & IE screw this up in different ways.
-	   */
-	   #toc-table { margin-top: -2ex; margin-left: -5%; }
-
-	   /* R5RS proc names are in italic; extended R5RS names 
-           ** in italic boldface.
-	   */
-	   span.r5rs-proc { font-weight: bold; }
-	   span.r5rs-procx { font-style: italic; font-weight: bold; }
-
-	   /* Spread out bibliographic lists. */
-	   /* More Netscape-specific lossage; see the following stylesheet
-	   ** for the proper values (used by IE).
-           */
-	   dt.biblio { margin-bottom: 1ex; }
-
-	   /* Links to draft copies (e.g., not at the official SRFI site)
-	   ** are colored in red, so people will use them during the 
-	   ** development process and kill them when the document's done.
-	   */
-           a.draft { color: red; }
-    </style>
-
-    <style type="text/css"; media=all>
-	   /* Nastiness: Here, I'm using a bug to work around a bug.
-	   ** Netscape rendering bugs mean you need bogus <dt> and <dd>
-	   ** margin settings -- settings which screw up IE's proper rendering.
-	   ** Fortunately, Netscape has *another* bug: it will ignore this
-	   ** media=all style sheet. So I am placing the (proper) IE values
-	   ** here. Perhaps, one day, when these rendering bugs are fixed,
-	   ** this gross hackery can be removed.
-	   */
-	   dt.proc-def1 { margin-top: 3ex; margin-bottom: 0ex; }
-	   dt.proc-defi { margin-top: 0ex; margin-bottom: 0ex; }
-	   dt.proc-defn { margin-top: 0ex; margin-bottom: 0.5ex; }
-	   dt.proc-def  { margin-top: 3ex; margin-bottom: 0.5ex; }
-
-	   pre { margin-top: 1ex; }
-
-	   dd.proc-def { margin-bottom: 2ex; margin-top: 0.5ex; } 
-
-	   /* For the index of procedures. 
-           ** Same hackery as for dt.proc-def, above.
-           */
-	   dd.proc-index { margin-top: 0ex; } 
-	   pre.proc-index { margin-top: 0ex; }
-
-	   /* Spread out bibliographic lists. */
-	   dt.biblio { margin-top: 3ex; margin-bottom: 0ex; }
-	   dd.biblio { margin-bottom: 1ex; }
-    </style>
-  </head>
-
-<body>
-
-<H1>Title</H1>
-
-SRFI 19: Time Data Types and Procedures
-
-<H1>Author</H1>
-
-Will Fitzgerald
-
-<H1>Status</H1>
-
-<p>This SRFI is currently in ``final'' status. To see an explanation of
-each status that a SRFI can hold, see <a
-href="http://srfi.schemers.org/srfi-process.html">here</a>.  You can
-access the discussion via <a
-href="http://srfi.schemers.org/srfi-19/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-
-
-<UL>
-<LI>Draft: 2000-02-28 to 2000-08-28 </LI>
-<LI>Final: 2000-08-31</LI>
-<LI>Fixed reference implementation: 2003-02-28</LI>
-<LI>Documentation bug for <code>~D</code> fixed: 2003-05-30</LI>
-<LI>Various Documentation bugs fixed: 2004-03-15</LI>
-</UL>
-
-<H1>Abstract</H1>
-
-Points in time are represented a the number of seconds (with
-nanosecond precision) since "the epoch," a zero point in time. Several
-standard variants are defined, including UTC (universal coordinated
-time), TAI (international atomic time), and monotonic time. A point in time can also be
-represented as a Julian Day or Modified Julian Day number. Time
-durations, including time spent in a process or thread, are defined. Conversion
-routines are provided. The procedure CURRENT-TIME queries the current
-time in a specified variant, with a system-dependent
-resolution. Procedures for time arithmetic and time comparisons are
-also provided. 
-
-<p>A date is a representation of a point in time in the Gregorian
-calendar, a 24 hour clock (with nanosecond precision) and a
-time zone offset from UTC. Procedures for 
-converting between time and dates are provided, as well as for reading
-and writing string representations of dates.
-
-<H1>Issues</H1>[None currently]
-
-
-<H1>Rationale</H1>
-
-R5RS Scheme does not provide standard data types for time. This
-SRFI addresses this lack by specifying data types for time and
-associated procedures.
-
-
-<H1>Specification</H1>
-
-<p>A <b>Time</b> object, which is distinct from all existing types,
-defines a point in time or a time duration in some standard time
-system. The standard <a name="#timesystem">time systems</a> are:
-
-<ul>
-  <li>Universal Coordinated Time (UTC),
-  <li>International Atomic Time (TAI),
-  <li>monotonic time (a monotonically increasing point in time from some
-      epoch, which is implementation-dependent), 
-  <li>CPU time in current thread (implementation dependent),
-  <li>CPU time in current process (implementation dependent),
-  <li>Time duration.
-</ul>
-
-Implementations are required to implement UTC, monotonic time, CPU
-time in current process, and time duration. Implementations are
-allowed to create extensions (for example, amount of time spent in
-garbage collection).
-
-<p>A <a name="timeobject">time object</a> consists of three components: 
-<ul>
-  <li><b>Time type</b>, a symbol representing the time system
-  representation used. The constants <code>TIME-TAI</code>,
-  <code>TIME-UTC</code>, <code>TIME-MONOTONIC</code>,
-  <code>TIME-THREAD</code>, <code>TIME-PROCESS</code>, and
-  <code>TIME-DURATION</code> must be provided for these
-  symbols. Implementations should provide constants for time type
-  extensions.  
-  <li><b>Second</b>, an integer representing the number
-  of whole seconds from "the epoch."  
-  <li><b>Nanosecond</b>, an
-  integer of the number of nanoseconds in the fractional
-  portion. Although a time object has nanosecond precision, clocks
-  may have a lower resolution.
-</ul>
-
-<p>A <a name="dateobject"><b>Date</b></a> object, which is distinct from all existing
-types, represents a point in time as represented by the Gregorian
-calendar as well as by a time zone. Dates are immutable.  A date
-consists of the following components:
-  
-<ul>
-<li><b>Nanosecond</b>, an integer between 0 and 9,999,999, inclusive.
-<li><b>Second</b>, an integer 0 and 60, inclusive, 
-    (60 represents a leap second)
-<li><b>Minute</b>, an integer between 0 and 59, inclusive,
-<li><b>Hour</b>, an integer between 0 and 23, inclusive,
-<li><b>Day</b>, an integer between 0 and 31, inclusive, the upper limit depending
-on the month and year of the point in time,
-<li><b>Month</b>, an integer between 1 and 12, inclusive; in which 1 means
-January, 2 February, and so on.
-<li><b>Year</b>, an integer representing the year.
-<li><b>Time zone</b>, an integer representing the number of seconds east of GMT for this timezone.
-</ul>
-
-<p>A <b>Julian Day</b> represents a point in time as a real number
-of days since -4714-11-24T12:00:00Z (November 24, -4714 at noon,
-UTC).
-
-<p>A <b>Modified Julian Day</b> represents a point in time as a
-real number of days since 1858-11-17T00:00:00Z (November 17,
-1858 at midnight, UTC).
-
-<h2>Constants</h2>
-<P>The following constants are required: 
-
-<DL>
-  <DT class=proc-def><CODE class=proc-def><a name="time-duration">time-duration</a></CODE> 
-  <DD class=proc-def>Symbol representing Time duration.
-  <DT class=proc-def><CODE class=proc-def><a name="time-monotonic">time-monotonic</a></CODE>
-  <DD class=proc-def>Symbol representing monotonic time.
-  <DT class=proc-def><CODE class=proc-def><a name="time-process">time-process</a></CODE>
-  <DD class=proc-def>Symbol representing time spent in current process.
-  <DT class=proc-def><CODE class=proc-def><a name="time-tai">time-tai</a></CODE>
-  <DD class=proc-def>Symbol representing TAI time.
-  <DT class=proc-def><CODE class=proc-def><a name="time-thread">time-thread</a></CODE>
-  <DD class=proc-def>Symbol representing time spent in current thread.
-  <DT class=proc-def><CODE class=proc-def><a name="time-utc">time-utc</a></CODE>
-  <DD class=proc-def>Symbol representting UTC time.
-</DL>
-<h2>Current time and clock resolution</h2>
-<P>The following procedures are required:
-
-<DL>
-  <DT class=proc-def><CODE class=proc-def><a name="current-date">current-date</a></CODE> [<VAR>tz-offset</VAR>] -> <VAR>date</VAR>
-  <DD class=proc-def>Date corresponding to the current UTC time. 
-  <DT class=proc-def><CODE class=proc-def><a name="current-julian-day">current-julian-day</a></CODE> -> <VAR>jdn</VAR>
-  <DD class=proc-def>Current Julian Day.
-  <DT class=proc-def><CODE class=proc-def><a name="current-modified-julian-day">current-modified-julian-day</a></CODE> -> <VAR>mjdn</VAR>
-  <DD class=proc-def>Current Modified Julian Day.
-  <DT class=proc-def><CODE class=proc-def><a name="current-time">current-time</a></CODE> [<VAR>time-type</VAR>] -> <VAR>time</VAR>
-  <DD class=proc-def>Current time, of type <code>time-type</code> system, which defaults to <code>TIME-UTC</code>.
-  <DT class=proc-def><CODE class=proc-def><a name="time-resolution">time-resolution</a></CODE> [<VAR>time-type</VAR>] -> <VAR>integer</VAR>
-  <DD class=proc-def>Clock resolution, in nanoseconds, of the system clock of type type <code>time-type</code> system, which defaults to <code>TIME-UTC</code>.
-</DL>
-<h2>Time object and accessors</h2>
-<P>The following procedures are required:
-<DL>
-  <DT class=proc-def><CODE class=proc-def><a name="make-time">make-time</a></CODE> <VAR>type nanosecond second</VAR> -> <VAR>time</VAR>
-  <DD class=proc-def>Creates a time object.
-  <DT class=proc-def><CODE class=proc-def><a name="time-p">time?</a></CODE> <VAR>object</VAR> -> <VAR>boolean</VAR>
-  <DD class=proc-def><code>#t</code> if object is a time object, otherwise, <code>#f</code>.
-  <DT class=proc-def><CODE class=proc-def><a name="time-type">time-type</a></CODE> <VAR>time</VAR> -> <VAR>time-type</VAR>
-  <DD class=proc-def>Time type.
-  <DT class=proc-def><CODE class=proc-def><a name="time-nanosecond">time-nanosecond</a></CODE> <VAR>time</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>Time nanosecond.
-  <DT class=proc-def><CODE class=proc-def><a name="time-second">time-second</a></CODE> <VAR>time</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>Time second.
-  <DT class=proc-def><CODE class=proc-def><a name="set-time-type!">set-time-type!</a></CODE> <VAR>time time-type</VAR>
-  <DD class=proc-def>Changes time type. Note: This changes the semantics of the time object. To convert a time to another
-                     system of representation, use one of the conversion procedures.
-  <DT class=proc-def><CODE class=proc-def><a name="set-time-nanosecond!">set-time-nanosecond!</a></CODE> <VAR>time integer</VAR>
-  <DD class=proc-def>Changes time nanosecond.
-  <DT class=proc-def><CODE class=proc-def><a name="set-time-second!">set-time-second!</a></CODE> <VAR>time integer</VAR>
-  <DD class=proc-def>Changes time second.
-  <DT class=proc-def><CODE class=proc-def><a name="copy-time">copy-time</a></CODE> <VAR>time1</VAR> -> <VAR>time2</VAR>
-  <DD class=proc-def>Creates a new time object, with the same time type, nanosecond, and second as <var>time1</var>.
-</DL>
-
-<h2>Time comparison procedures</h2>
-
-<P>All of the time comparison procedures require the time objects to
-be of the same type. It is an error to use these procedures on time
-objects of different types. For the point-in-time measurements (e.g.,
-<code>TIME-TAI</code> and <code>TIME-UTC</code>), the semantics are
-described in plain text. For durations, (e.g.,
-<code>TIME-DURATION</code>, <code>TIME-CPU</code>, the semantics are
-described in parentheses.
-
-<p> The following procedures are required:
-<DL>
-  <DT class=proc-def><CODE class=proc-def><a name="time<=-p">time&lt;=?</a></CODE> <VAR>time1 time2</VAR> -> <VAR>boolean</VAR>
-  <DD class=proc-def><code>#t</code> if <var>time1</var> is before or at (less than or equal to) <var>time2</var>, <code>#f</code> otherwise. 
-  <DT class=proc-def><CODE class=proc-def><a name="time<-p">time&lt;?</a></CODE> <VAR>time1 time2</VAR> -> <VAR>boolean</VAR>
-  <DD class=proc-def><code>#t</code> if <var>time1</var> is before (less than) <var>time2</var>, <code>#f</code> otherwise. 
-  <DT class=proc-def><CODE class=proc-def><a name="time=-p">time=?</a></CODE> <VAR>time1 time2</VAR> -> <VAR>boolean</VAR>
-  <DD class=proc-def><code>#t</code> if <var>time1</var> at (equal) <var>time2</var>, <code>#f</code> otherwise. 
-  <DT class=proc-def><CODE class=proc-def><a name="time>=-p">time&gt;=?</a></CODE> <VAR>time1 time2</VAR> -> <VAR>boolean</VAR>
-  <DD class=proc-def><code>#t</code> if <var>time1</var> is at or after (greater than or equal to) <var>time2</var>, <code>#f</code> otherwise. 
-  <DT class=proc-def><CODE class=proc-def><a name="time>-p">time&gt;?</a></CODE> <VAR>time1 time2</VAR> -> <VAR>boolean</VAR>
-  <DD class=proc-def><code>#t</code> if <var>time1</var> is after (greater than) <var>time2</var>, <code>#f</code> otherwise. 
-</DL>
-
-<h2>Time arithmetic procedures</h2>
-
-<P>The following procedures are required.
-<DL>
-  <DT class=proc-def><CODE class=proc-def><a name="time-difference">time-difference</a></CODE> <VAR>time1 time2</VAR> -> <VAR>time-duration</VAR>
-  <DD class=proc-def>The <code>TIME-DURATION</code> between <VAR>time1</VAR> and <VAR>time2</VAR>. It is an error if <VAR>time1</VAR> and <VAR>time2</VAR> are of different time types. A new time object is created.
-  <DT class=proc-def><CODE class=proc-def><a name="time-difference!">time-difference!</a></CODE> <VAR>time1 time2</VAR> -> <VAR>time-duration</VAR>
-  <DD class=proc-def>The <code>TIME-DURATION</code> between <VAR>time1</VAR> and <VAR>time2</VAR>. It is an error if <VAR>time1</VAR> and <VAR>time2</VAR> are of different time types. <var>Time1</var> may be used to create the resulting <code>TIME-DURATION</code> object.
-  <DT class=proc-def><CODE class=proc-def><a name="add-duration">add-duration</a></CODE> <VAR>time1 time-duration</VAR> -> <VAR>time</VAR>
-  <DD class=proc-def>The time resulting from adding <VAR>time-duration</VAR> to  <VAR>time1</VAR>, which is a time object of the same time type as  <VAR>time1</VAR>. A new time object is created.
-  <DT class=proc-def><CODE class=proc-def><a name="add-duration!">add-duration!</a></CODE> <VAR>time1 time-duration</VAR> -> <VAR>time</VAR>
-  <DD class=proc-def>The time resulting from adding <VAR>time-duration</VAR> to  <VAR>time1</VAR>, which is a time object of the same time type as  <VAR>time1</VAR>. <var>Time1</var> may used to create the resulting time object.
-  <DT class=proc-def><CODE class=proc-def><a name="subtract-duration">subtract-duration</a></CODE> <VAR>time1 time-duration</VAR> -> <VAR>time</VAR>
-  <DD class=proc-def>The time resulting from subtracting <VAR>time-duration</VAR> to  <VAR>time1</VAR>, which is a time object of the same time type as  <VAR>time1</VAR>. A new time object is created.
-  <DT class=proc-def><CODE class=proc-def><a name="subtract-duration!">subtract-duration!</a></CODE> <VAR>time1 time-duration</VAR> -> <VAR>time</VAR>
-  <DD class=proc-def>The time resulting from subtracting <VAR>time-duration</VAR> to  <VAR>time1</VAR>, which is a time object of the same time type as  <VAR>time1</VAR>. <var>Time1</var> may used to create the resulting time object.
-</DL>
-
-<h2>Date object and accessors</h2>
-
-<P>Date objects are immutable once created. The following procedures are required.
-<DL>
-
-  <DT class=proc-def><CODE class=proc-def><a name="make-date">make-date</a></CODE> <VAR>nanosecond second minute hour day month year zone-offset</VAR> -> <VAR>date</VAR>
-  <DD class=proc-def>Creates a date object.
-  <DT class=proc-def><CODE class=proc-def><a name="date-p">date?</a></CODE> <VAR>date </VAR> -> <VAR>boolean</VAR>
-  <DD class=proc-def><code>#t</code> if object is a time object, otherwise, <code>#f</code>.
-  <DT class=proc-def><CODE class=proc-def><a name="date-nanosecond">date-nanosecond</a></CODE> <VAR>date</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>Date nanosecond.
-  <DT class=proc-def><CODE class=proc-def><a name="date-second">date-second</a></CODE> <VAR>date</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>Date second.
-  <DT class=proc-def><CODE class=proc-def><a name="date-minute">date-minute</a></CODE> <VAR>date</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>Date minute.
-  <DT class=proc-def><CODE class=proc-def><a name="date-hour">date-hour</a></CODE> <VAR>date</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>Date hour.
-  <DT class=proc-def><CODE class=proc-def><a name="date-day">date-day</a></CODE> <VAR>date</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>Date day.
-  <DT class=proc-def><CODE class=proc-def><a name="date-month">date-month</a></CODE> <VAR>date</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>Date month.
-  <DT class=proc-def><CODE class=proc-def><a name="date-year">date-year</a></CODE> <VAR>date</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>Date year.
-  <DT class=proc-def><CODE class=proc-def><a name="date-zone-offset">date-zone-offset</a></CODE> <VAR>date</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>Date time zone offset.
-  <DT class=proc-def><CODE class=proc-def><a name="date-year-day">date-year-day</a></CODE> <VAR>date</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>The ordinal day of the year of this date. January 1 is 1, etc.
-  <DT class=proc-def><CODE class=proc-def><a name="date-week-day">date-week-day</a></CODE> <VAR>date</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>The day of the week of this date, where Sunday=0, Monday=1, etc.
-  <DT class=proc-def><CODE class=proc-def><a name="date-week-number">date-week-number</a></CODE> <VAR>date day-of-week-starting-week</VAR> -> <VAR>integer</VAR>
-  <DD class=proc-def>The ordinal week of the year which holds this date, ignoring a first partial week. 'Day-of-week-starting-week' is the integer corresponding to the day of the week which is to be considered the first day of the week (Sunday=0, Monday=1, etc.).
-</DL>
-
-<H2>Time/Date/Julian Day/Modified Julian Day Converters</h2>
-
-The following conversion procedures are required.
-<DL>
-  <DT class=proc-def><CODE class=proc-def><a name="date->julian-day">date->julian-day</a></CODE> <VAR>date</VAR> -> <VAR>jd</VAR>
-  <DD class=proc-def>Convert date to Julian Day.
-  <DT class=proc-def><CODE class=proc-def><a name="date->modified-julian-day">date->modified-julian-day</a></CODE> <VAR>date</VAR> -> <VAR>mjd</VAR>
-  <DD class=proc-def>Convert date to Modified Julian Day.
-  <DT class=proc-def><CODE class=proc-def><a name="date->time-monotonic">date->time-monotonic</a></CODE> <VAR>date</VAR> -> <VAR>time-monotonic</VAR>
-  <DD class=proc-def>Convert date to monotonic time.
-  <DT class=proc-def><CODE class=proc-def><a name="date->time-tai">date->time-tai</a></CODE> <VAR>date</VAR> -> <VAR>time-tai</VAR>
-  <DD class=proc-def>Convert date to TAI time.
-  <DT class=proc-def><CODE class=proc-def><a name="date->time-utc">date->time-utc</a></CODE> <VAR>date</VAR> -> <VAR>time-utc</VAR>
-  <DD class=proc-def>Convert date to UTC time.
-  <DT class=proc-def><CODE class=proc-def><a name="julian-day->date">julian-day->date</a></CODE> <VAR>jd</VAR>  [<VAR>tz-offset</VAR>] -> <VAR>date</VAR>
-  <DD class=proc-def>Convert Julian Day to date, , using time zone offset, which defaults to the local time zone.
-  <DT class=proc-def><CODE class=proc-def><a name="julian-day->time-monotonic">julian-day->time-monotonic</a></CODE> <VAR>jd</VAR> -> <VAR>time-monotonic</VAR>
-  <DD class=proc-def>Convert Julian Day to monotonic time.
-  <DT class=proc-def><CODE class=proc-def><a name="julian-day->time-tai">julian-day->time-tai</a></CODE> <VAR>jd</VAR> -> <VAR>time-tai</VAR>
-  <DD class=proc-def>Convert Julian Day to TAI time.
-  <DT class=proc-def><CODE class=proc-def><a name="julian-day->time-utc">julian-day->time-utc</a></CODE> <VAR>jd</VAR> -> <VAR>time-utc</VAR>
-  <DD class=proc-def>Convert Julian Day to UTC time.
-  <DT class=proc-def><CODE class=proc-def><a name="modified-julian-day->date">modified-julian-day->date</a></CODE> <VAR>mjd</VAR> [<VAR>tz-offset</VAR>] -> <VAR>date</VAR>
-  <DD class=proc-def>Convert Modified Julian Day to date, using time zone offset, which defaults to the local time zone.
-  <DT class=proc-def><CODE class=proc-def><a name="modified-julian-day->time-monotonic">modified-julian-day->time-monotonic</a></CODE> <VAR>mjd</VAR> -> <VAR>time-monotonic</VAR>
-  <DD class=proc-def>Convert Modified Julian Day to monotonic time.
-  <DT class=proc-def><CODE class=proc-def><a name="modified-julian-day->time-tai">modified-julian-day->time-tai</a></CODE> <VAR>mjd</VAR> -> <VAR>time-tai</VAR>
-  <DD class=proc-def>Convert Modified Julian Day to TAI time.
-  <DT class=proc-def><CODE class=proc-def><a name="modified-julian-day->time-utc">modified-julian-day->time-utc</a></CODE> <VAR>mjd</VAR> -> <VAR>time-utc</VAR>
-  <DD class=proc-def>Convert Modified Julian Day to UTC time.
-  <DT class=proc-def><CODE class=proc-def><a name="time-monotonic->date">time-monotonic->date</a></CODE> <VAR>time-monotonic</VAR> [<VAR>tz-offset</VAR>] -> <VAR>date</VAR>
-  <DD class=proc-def>Convert monotonic time to date, using time zone offset, which defaults to the local time zone.
-  <DT class=proc-def><CODE class=proc-def><a name="time-monotonic->julian-day">time-monotonic->julian-day</a></CODE> <VAR>time-monotonic</VAR> -> <VAR>jd</VAR>
-  <DD class=proc-def>Convert monotonic time to Julian Day.
-  <DT class=proc-def><CODE class=proc-def><a name="time-monotonic->modified-julian-day">time-monotonic->modified-julian-day</a></CODE> <VAR>time-monotonic</VAR> -> <VAR>mjd</VAR>
-  <DD class=proc-def>Convert monotonic time to Modified Julian Day.
-  <DT class=proc-def><CODE class=proc-def><a name="time-monotonic->time-tai">time-monotonic->time-tai</a></CODE> <VAR>time-monotonic</VAR> -> <VAR>time-tai</VAR>
-  <DD class=proc-def>Convert monotonic time to TAI time.
-  <DT class=proc-def><CODE class=proc-def><a name="time-monotonic->time-tai!">time-monotonic->time-tai!</a></CODE> <VAR>time-monotonic</VAR> -> <VAR>time-tai</VAR>
-  <DD class=proc-def>Convert monotonic time to TAI time. The time structure may be reused.
-  <DT class=proc-def><CODE class=proc-def><a name="time-monotonic->time-utc">time-monotonic->time-utc</a></CODE> <VAR>time-monotonic</VAR> -> <VAR>time-utc</VAR>
-  <DD class=proc-def>Convert monotonic time to UTC time.
-  <DT class=proc-def><CODE class=proc-def><a name="time-monotonic->time-utc!">time-monotonic->time-utc!</a></CODE> <VAR>time-monotonic</VAR> -> <VAR>time-utc</VAR>
-  <DD class=proc-def>Convert monotonic time to UTC time.  The time structure may be reused.
-  <DT class=proc-def><CODE class=proc-def><a name="time-tai->date">time-tai->date</a></CODE> <VAR>time-tai [tz-offset]</VAR> -> <VAR>date</VAR>
-  <DD class=proc-def>Convert TAI time to date, using time zone offset, which defaults to the local time zone.
-  <DT class=proc-def><CODE class=proc-def><a name="time-tai->julian-day">time-tai->julian-day</a></CODE> <VAR>time-tai</VAR> -> <VAR>jd</VAR>
-  <DD class=proc-def>Convert TAI time to Julian Day.
-  <DT class=proc-def><CODE class=proc-def><a name="time-tai->modified-julian-day">time-tai->modified-julian-day</a></CODE> <VAR>time-tai</VAR> -> <VAR>mjd</VAR>
-  <DD class=proc-def>Convert TAI time to Modified Julian Day.
-  <DT class=proc-def><CODE class=proc-def><a name="time-tai->time-monotonic">time-tai->time-monotonic</a></CODE> <VAR>time-tai</VAR> -> <VAR>time-monotonic</VAR>
-  <DD class=proc-def>Convert TAI time to monotonic time.
-  <DT class=proc-def><CODE class=proc-def><a name="time-tai->time-monotonic!">time-tai->time-monotonic!</a></CODE> <VAR>time-tai</VAR> -> <VAR>time-monotonic</VAR>
-  <DD class=proc-def>Convert TAI time to monotonic time. The time structure may be reused.
-  <DT class=proc-def><CODE class=proc-def><a name="time-tai->time-utc">time-tai->time-utc</a></CODE> <VAR>time-tai</VAR> -> <VAR>time-utc</VAR>
-  <DD class=proc-def>Convert TAI time to monotonic time.
-  <DT class=proc-def><CODE class=proc-def><a name="time-tai->time-utc!">time-tai->time-utc!</a></CODE> <VAR>time-tai</VAR> -> <VAR>time-utc</VAR>
-  <DD class=proc-def>Convert TAI time to monotonic time. The time structure may be reused.
-  <DT class=proc-def><CODE class=proc-def><a name="time-utc->date">time-utc->date</a></CODE> <VAR>time-utc [tz-offset]</VAR> -> <VAR>time-utc</VAR>
-  <DD class=proc-def>Convert UTC time to date, using time zone offset, which defaults to the local time zone.
-  <DT class=proc-def><CODE class=proc-def><a name="time-utc->julian-day">time-utc->julian-day</a></CODE> <VAR>time-utc</VAR> -> <VAR>jd</VAR>
-  <DD class=proc-def>Convert UTC time to Julian Day
-  <DT class=proc-def><CODE class=proc-def><a name="time-utc->modified-julian-day">time-utc->modified-julian-day</a></CODE> <VAR>time-utc</VAR> -> <VAR>mjd</VAR>
-  <DD class=proc-def>Convert UTC time to Modified Julian Day.
-  <DT class=proc-def><CODE class=proc-def><a name="time-utc->time-monotonic">time-utc->time-monotonic</a></CODE> <VAR>time-utc</VAR> -> <VAR>time-monotonic</VAR>
-  <DD class=proc-def>Convert UTC time to monotonic time.
-  <DT class=proc-def><CODE class=proc-def><a name="time-utc->time-monotonic!">time-utc->time-monotonic!</a></CODE> <VAR>time-utc</VAR> -> <VAR>time-monotonic</VAR>
-  <DD class=proc-def>Convert UTC time to monotonic time. The time structure may be reused.
-  <DT class=proc-def><CODE class=proc-def><a name="time-utc->time-tai">time-utc->time-tai</a></CODE> <VAR>time-utc</VAR> -> <VAR>time-tai</VAR>
-  <DD class=proc-def>Convert UTC time to TAI time.
-  <DT class=proc-def><CODE class=proc-def><a name="time-utc->time-tai!">time-utc->time-tai!</a></CODE> <VAR>time-utc</VAR> -> <VAR>time-tai</VAR>
-  <DD class=proc-def>Convert UTC time to TAI time. The time structure may be reused.
-</DL>
-
-<h2>Date to String/String to Date Converters</h2>
-
-These procedures provide conversion to and from strings. They are required. The specification below describes a 'locale;' the
-specification of locales is beyond this SRFI.
-
-<DL>
-  <DT class=proc-def><CODE class=proc-def><a name="date->string">date->string</a></CODE> <VAR>date</VAR> [<VAR>format-string</VAR>] -> <VAR>string</VAR>
-  <DD class=proc-def>Converts a date to a string, using the format string. The format string is copied as is; except
-escape characters (indicated by the tilde) are replaced with specific conversions. Table 1 lists the required conversion specifiers;
-implementations are free to extend this list.
-  <DT class=proc-def><CODE class=proc-def><a name="string->date">string->date</a></CODE> <VAR>input-string template-string</VAR> -> <VAR>date</VAR>
-  <DD class=proc-def>Converts an input string to a date, using the template string. The input string must match the template
-sting as is; except escape characters (indicate by the tilde) indicate special converters which (1) move to the next character in the input string fulfilling a criterion; (2) read a value, and (3) act on this value in some way. Table 2 lists the required 
-converters; implementations are free to extend this list.
-</DL>
-
-<H3>PLT-specific extensions</H3>
-
-<p>The <code>~?</code> wildcard is specific to the PLT implementation of <code>string-&gt;date</code>: it parses 1 and 2 digit years like <code>~y</code> and 3 and 4 digit years like <code>~Y</code>.</p>
-
-<TABLE ALIGN="CENTER" WIDTH="80%" summary="DATE->STRING conversion specifiers">
-<TR><TD COLSPAN="2"><HR WIDTH="100%"></TD></TR>
-<TR><TH>Ch</TH><TH>Conversion</TH></TR>
-<TR><TD COLSPAN="2"><HR WIDTH="100%"></TD></TR>
-<TR><TD width="5%"><code>~~</code></TD><TD WIDTH="95%">a literal <CODE>~</CODE></TD></TR>
-<TR><TD width="5%"><code>~a</code></TD><TD WIDTH="95%">locale's abbreviated weekday name (Sun...Sat)</TD></TR>
-<TR><TD width="5%"><code>~A</code></TD><TD WIDTH="95%">locale's full weekday name (Sunday...Saturday)</TD></TR>
-<TR><TD width="5%"><code>~b</code></TD><TD WIDTH="95%">locale's abbreviate month name (Jan...Dec)</TD></TR>
-<TR><TD width="5%"><code>~B</code></TD><TD WIDTH="95%">locale's full month day (January...December)</TD></TR>
-<TR><TD width="5%"><code>~c</code></TD><TD WIDTH="95%">locale's date and time (e.g., "Fri Jul 14 20:28:42-0400 2000") </TD></TR>
-<TR><TD width="5%"><code>~d</code></TD><TD WIDTH="95%">day of month, zero padded (01...31)</TD></TR>
-<TR><TD width="5%"><code>~D</code></TD><TD WIDTH="95%">date (mm/dd/yy)</TD></TR>
-<TR><TD width="5%"><code>~e</code></TD><TD WIDTH="95%">day of month, blank padded ( 1...31)</TD></TR>
-<TR><TD width="5%"><code>~f</code></TD><TD WIDTH="95%">seconds+fractional seconds, using locale's decimal separator (e.g. 5.2).</TD></TR>
-<TR><TD width="5%"><code>~h</code></TD><TD WIDTH="95%">same as ~b</TD></TR>
-<TR><TD width="5%"><code>~H</code></TD><TD WIDTH="95%">hour, zero padded, 24-hour clock (00...23)</TD></TR>
-<TR><TD width="5%"><code>~I</code></TD><TD WIDTH="95%">hour, zero padded, 12-hour clock (01...12)</TD></TR>
-<TR><TD width="5%"><code>~j</code></TD><TD WIDTH="95%">day of year, zero padded</TD></TR>
-<TR><TD width="5%"><code>~k</code></TD><TD WIDTH="95%">hour, blank padded, 24-hour clock (00...23)</TD></TR>
-<TR><TD width="5%"><code>~l</code></TD><TD WIDTH="95%">hour, blank padded, 12-hour clock (01...12)</TD></TR>
-<TR><TD width="5%"><code>~m</code></TD><TD WIDTH="95%">month, zero padded (01...12)</TD></TR>
-<TR><TD width="5%"><code>~M</code></TD><TD WIDTH="95%">minute, zero padded (00...59)</TD></TR>
-<TR><TD width="5%"><code>~n</code></TD><TD WIDTH="95%">new line</TD></TR>
-<TR><TD width="5%"><code>~N</code></TD><TD WIDTH="95%">nanosecond, zero padded</TD></TR>
-<TR><TD width="5%"><code>~p</code></TD><TD WIDTH="95%">locale's AM or PM</TD></TR>
-<TR><TD width="5%"><code>~r</code></TD><TD WIDTH="95%">time, 12 hour clock, same as "~I:~M:~S ~p"</TD></TR>
-<TR><TD width="5%"><code>~s</code></TD><TD WIDTH="95%">number of full seconds since "the epoch" (in UTC)</TD></TR>
-<TR><TD width="5%"><code>~S</code></TD><TD WIDTH="95%">second, zero padded (00...60)</TD></TR>
-<TR><TD width="5%"><code>~t</code></TD><TD WIDTH="95%">horizontal tab</TD></TR>
-<TR><TD width="5%"><code>~T</code></TD><TD WIDTH="95%">time, 24 hour clock, same as "~H:~M:~S"</TD></TR>
-<TR><TD width="5%"><code>~U</code></TD><TD WIDTH="95%">week  number  of  year  with Sunday as first day of week (00...53)</TD></TR>
-<TR><TD width="5%"><code>~V</code></TD><TD WIDTH="95%">week number of year with Monday  as  first  day  of week (01...52)</TD></TR>
-<TR><TD width="5%"><code>~w</code></TD><TD WIDTH="95%"> day of week (0...6)</TD></TR>
-<TR><TD width="5%"><code>~W</code></TD><TD WIDTH="95%">week  number  of  year  with Monday as first day of week (01...52)</TD></TR>
-<TR><TD width="5%"><code>~x</code></TD><TD WIDTH="95%">week  number  of  year  with Monday as first day of week (00...53)</TD></TR>
-<TR><TD width="5%"><code>~X</code></TD><TD WIDTH="95%">locale's date representation, for example: "07/31/00" </TD></TR>
-<TR><TD width="5%"><code>~y</code></TD><TD WIDTH="95%">last two digits of year (00...99)</TD></TR>
-<TR><TD width="5%"><code>~Y</code></TD><TD WIDTH="95%">year</TD></TR>
-<TR><TD width="5%"><code>~z</code></TD><TD WIDTH="95%">time zone in RFC-822 style</TD></TR>
-<TR><TD width="5%"><code>~Z</code></TD><TD WIDTH="95%">symbol time zone (not-implemented)</TD></TR>
-<TR><TD width="5%"><code>~1</code></TD><TD WIDTH="95%">ISO-8601 year-month-day format</TD></TR>
-<TR><TD width="5%"><code>~2</code></TD><TD WIDTH="95%">ISO-8601 hour-minute-second-timezone format</TD></TR>
-<TR><TD width="5%"><code>~3</code></TD><TD WIDTH="95%">ISO-8601 hour-minute-second format</TD></TR>
-<TR><TD width="5%"><code>~4</code></TD><TD WIDTH="95%">ISO-8601 year-month-day-hour-minute-second-timezone format</TD></TR>
-<TR><TD width="5%"><code>~5</code></TD><TD WIDTH="95%">ISO-8601 year-month-day-hour-minute-second format</TD></TR>
-<TR><TD COLSPAN="2"><HR WIDTH="100%"></TD></TR>
-<TR><TH COLSPAN="2">Table 1: <code>DATE->STRING</code> conversion specifiers</TH></TR>
-<TR><TD COLSPAN="2"><HR WIDTH="100%"></TD></TR>
-</TABLE>
-
-<p>
-<TABLE ALIGN="CENTER" WIDTH="80%" summary="STRING->DATE conversion specifiers">
-<TR><TD COLSPAN="4"><HR WIDTH="100%"></TD></TR>
-<TR><TH>Ch</TH><TH>Skip to</TH><TH>Read</TH><TH>Set</TH></TR>
-<TR><TD COLSPAN="4"><HR WIDTH="100%"></TD></TR>
-<TR><TD width="6%"><code>~~</code></TD><TD WIDTH="23%">any</TD><TD WIDTH="50%">read literal <code>~</code></TD><TD WIDTH="23%">nothing</TD></TR>
-<TR><TD width="6%"><code>~a</code></TD><TD WIDTH="23%">char-alphabetic?</TD><TD WIDTH="50%">abbreviated weekday in locale</TD><TD WIDTH="23%">nothing</TD></TR>
-<TR><TD width="6%"><code>~A</code></TD><TD WIDTH="23%">char-alphabetic?</TD><TD WIDTH="50%">full weekday in locale</TD><TD WIDTH="23%">nothing</TD></TR>
-<TR><TD width="6%"><code>~b</code></TD><TD WIDTH="23%">char-alphabetic?</TD><TD WIDTH="50%">abbreviated month name in locale</TD><TD WIDTH="23%">nothing</TD></TR>
-<TR><TD width="6%"><code>~B</code></TD><TD WIDTH="23%">char-alphabetic?</TD><TD WIDTH="50%">full month name in locale</TD><TD WIDTH="23%">nothing</TD></TR>
-<TR><TD width="6%"><code>~d</code></TD><TD WIDTH="23%">char-numeric?</TD><TD WIDTH="50%">day of month</TD><TD WIDTH="23%"><code>date-day</code></TD></TR>
-<TR><TD width="6%"><code>~e</code></TD><TD WIDTH="23%">any</TD><TD WIDTH="50%">day of month, blank padded</TD><TD WIDTH="23%"><code>date-day</code></TD></TR>
-<TR><TD width="6%"><code>~h</code></TD><TD WIDTH="23%">char-alphabetic?</TD><TD WIDTH="50%">same as ~b</TD><TD WIDTH="23%">nothing</TD></TR>
-<TR><TD width="6%"><code>~H</code></TD><TD WIDTH="23%">char-numeric?</TD><TD WIDTH="50%">hour</TD><TD WIDTH="23%"><code>date-hour</code></TD></TR>
-<TR><TD width="6%"><code>~k</code></TD><TD WIDTH="23%">any</TD><TD WIDTH="50%">hour, blank padded</TD><TD WIDTH="23%"><code>date-hour</code></TD></TR>
-<TR><TD width="6%"><code>~m</code></TD><TD WIDTH="23%">char-numeric?</TD><TD WIDTH="50%">month</TD><TD WIDTH="23%"><code>date-month</code></TD></TR>
-<TR><TD width="6%"><code>~M</code></TD><TD WIDTH="23%">char-numeric?</TD><TD WIDTH="50%">minute</TD><TD WIDTH="23%"><code>date-minute</code></TD></TR>
-<TR><TD width="6%"><code>~S</code></TD><TD WIDTH="23%">char-numeric?</TD><TD WIDTH="50%">second</TD><TD WIDTH="23%"><code>date-second</code></TD></TR>
-<TR><TD width="6%"><code>~y</code></TD><TD WIDTH="23%">any</TD><TD WIDTH="50%">2-digit year</TD><TD WIDTH="23%"><code>date-year</code> within 50 years</TD></TR>
-<TR><TD width="6%"><code>~Y</code></TD><TD WIDTH="23%">char-numeric?</TD><TD WIDTH="50%">year</TD><TD WIDTH="23%"><code>date-year</code></TD></TR>
-<TR><TD width="6%"><code>~z</code></TD><TD WIDTH="23%">any</TD><TD WIDTH="50%">time zone</TD><TD WIDTH="23%"><code>date-zone-offset</code></TD></TR>
-<TR><TD width="6%"><code>~?</code></TD><TD WIDTH="23%">char-numeric?</TD><TD WIDTH="50%">2-digit or 4-digit year (PLT-specific extension)</TD><TD WIDTH="23%"><code>date-year</code></TD></TR>
-<TR><TD COLSPAN="4"><HR WIDTH="100%"></TD></TR>
-<TR><TH COLSPAN="4">Table 2: <code>STRING->DATE</code> conversion specifiers</TH></TR>
-<TR><TD COLSPAN="4"><HR WIDTH="100%"></TD></TR>
-</TABLE>
-
-<H1>Implementation</H1>
-
-This SRFI cannot be written in completely standard Scheme. In
-particular, there must be some system-independent method of finding
-the values for <code>CURRENT-TIME</code>. The GNU C function,
-<code>gettimeofday</code> might prove useful to implementors. 
-
-<p>The difference between TAI and UTC is not determinate, and
-implementations must provide some method for getting TAI. A procedure
-is provided in the accompany implmentation for reading the leap second
-table provided by the Time Service of the US Naval Observatory
-(available at <a
-href="ftp://maia.usno.navy.mil/ser7/tai-utc.dat">ftp://maia.usno.navy.mil/ser7/tai-utc.dat</a>). 
-
-<P>The accompanying implementation assumes <a
-href="http://srfi.schemers.org/srfi-6/">SRFI 6 Basic String Ports</a>.
-The accompanying implementation also assumes an <CODE>error</CODE>
-procedure.  The accompanying implementation also assumes <a
-href="http://srfi.schemers.org/srfi-8/">SRFI 8 RECEIVE: Binding to
-multiple values</a>.  which is easy to implement with the following
-syntax:
-
-<CODE>
-<PRE>
-(define-syntax receive
-  (syntax-rules ()
-    ((receive formals expression body ...)
-     (call-with-values (lambda () expression)
-                       (lambda formals body ...)))))
-</PRE>
-</CODE>
-
-<p>Note that it contains TAI-UTC.DAT reader.
-
-<P>The <a href="http://srfi.schemers.org/srfi-19/srfi-19.scm">accompanying 
-implementation</a> is written in MzScheme.  MzScheme provides the procedure 
-<CODE>current-seconds</CODE>, which returns the number of seconds (UTC)
-since 1970-01-01T00:00:00Z+00:00, and
-<code>current-milliseconds</code>, which is a monotonic time
-clock. Combining these provides an implementation of
-<code>(current-time time-utc)</code>. Monontonic time, in this
-implementation, is the same as TAI time; differences between TAI and
-UTC are resolved through a leap second table. According to the
-International Earth Rotation Service, there will be no leap second in
-December, 2000. Thus, the leap second table is guaranteed to be
-correct through June, 2000. 
-
-<p>Also, MzScheme (as of version 102, I believe) provides a method for
-returning the current time zone offset, via its SECONDS-&gt;DATE and
-CURRENT-DATE procedures. 
-
-<p>MzScheme's <code>DEFINE-STRUCT</code> was used to define the time
-and date objects. <a
-href="http://srfi.schemers.org/srfi-9/">SRFI 9</a>, Defining Record
-Types, could be used instead.
-
-<p>Procedures meant to be used internally have names beginning with
-<code>TM:</code>. Locale-related constants and procedures have
-<code>locale</code> in their name; if a 'locale' SRFI is ever written,
-it might be good to use that code instead.
-
-<p>From this, the rest of the implementation was built. 
-
-<p>There is also a <a href="http://srfi.schemers.org/srfi-19/srfi-19-test-suite.scm">test suite</a>.
-
-<h1>Acknowledgements</h1>
-
-Claus Tøndering's<a href="http://www.tondering.dk/claus/calendar.html"> Frequently Asked Questions</a> about calendars was a very
-useful resource. The implementation of Julian Day, Modified Julian
-Day, and Year Day comes from his FAQ. Markus Kuhn has a <a
-href="http://www.cl.cam.ac.uk/~mgk25/iso-time.html">useful
-description</a> of the <a
-href="http://www.iso.ch/markete/8601.pdf">ISO Standard 8601</a> for
-Date/Time notation; The W3 Consortium also has a <a
-href="http://www.w3.org/TR/NOTE-datetime">useful Note</a>.
-
-<p>Mike Sperber, Marc Feely, Dave Mason, and "Prfnoff" all made useful
-comments on previous versions of this draft. Thanks to Shriram 
-Krishnamurthi for his editing help.
-
-<p>The <code>DATE->STRING</code> procedure uses a format string, based on
-GNU C's <code>date</code> procedure, as well as <code>scsh</code>'s
-<code>FORMAT-DATE</code> procedure. 
-
-
-<H1>Copyright</H1>
-
-<p>Copyright (C) Neodesic Corporation (2000). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-<HR>
-
-<ADDRESS>Editor: <A href="mailto:srfi-editors@srfi.schemers.org">Shriram 
-Krishnamurthi</A></ADDRESS>
-Last 
-modified by the author:<BR><CODE>(display (date->string (current-date 0)
-"~4"))</CODE>: 2004-03-15T02:21:15Z
-</BODY></HTML>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-2.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-2.html
deleted file mode 100644
index 18b6ba769f..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-2.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head><title>SRFI 2: AND-LET*: an AND with local bindings, a guarded LET* special form</title></head>
-
-<body>
-<H1>Title</H1>
-
-SRFI-2: AND-LET*: an AND with local bindings, a guarded LET* special form
-
-<H1>Author</H1>
-
-Oleg Kiselyov
-
-<H1>Status</H1>
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion on this SRFI via <A HREF="http://srfi.schemers.org/srfi-2/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P><UL>
-      <LI>Received: 1998/12/28
-      <LI>Revised: 1999/02/09
-      <LI>Draft: 1998/12/28-1999/02/28
-      <LI>Final: 1999/03/01
-</UL>
-
-<H1>Abstract</H1>
-
-<P>Like an ordinary AND, an AND-LET* special form evaluates its arguments --
-expressions -- one after another in order, till the first one that
-yields #f. Unlike AND, however, a non-#f result of one expression can
-be bound to a fresh variable and used in the subsequent expressions.
-AND-LET* is a cross-breed between LET* and AND.
-
-<H1>Rationale</H1>
-
-<P>In case of an ordinary AND formed of proper boolean expressions:<BR>
-(AND E1 E2 ...)<BR>
-expression E2, if it gets to be evaluated, knows that E1 has returned
-non-#f. Moreover, E2 knows exactly what the result of E1 was -- #t --
-which E2 can use to its advantage. If E1 however is an extended
-boolean expression, E2 can no longer tell which particular non-#f
-value E1 has returned. Chances are it took a lot of work to evaluate
-E1, and the produced result (a number, a vector, a string, etc) may be
-of value to E2. Alas, the AND form merely checks that the result is
-not an #f, and throws it away. If E2 needs it, it has to compute that
-value anew. This proposed AND-LET* special form lets constituent
-expressions get hold of the results of already evaluated expressions,
-without re-doing their work.
-
-<P>AND-LET* can be thought of as a combination of LET* and AND, or a
-generalization of COND's send operator =&gt;. An AND-LET* form can also be
-considered a sequence of guarded expressions. In a regular program,
-forms may produce results, bind them to variables and let other forms
-use these results. AND-LET* differs in that it checks to make sure that
-every produced result "makes sense" (that is, not an #f). The first
-"failure" triggers the guard and aborts the rest of the sequence
-(which presumably would not make any sense to execute anyway).
-
-Examples:
-<PRE>
-(AND-LET* ((my-list (compute-list)) ((not (null? my-list))))
-          (do-something my-list))
-
-(define (look-up key alist)
-  (and-let* ((x (assq key alist))) (cdr x)))
-
-(or
-  (and-let* ((c (read-char))
-    ((not (eof-object? c))))
-    (string-set! some-str i c)  
-    (set! i (+ 1 i)))
-  (begin (do-process-eof)))
-
-			; A more realistic example
-                        ; Parse the 'timestamp' ::= 'token1' 'token2'
-                        ;   token1 ::= 'YY' 'MM' 'J'
-                        ;   token2 ::= 'GG' 'gg' "/"
-(define (parse-full-timestamp token1 token2)
-  (AND-LET* (((= 5 (string-length token1)))
-             ((= 5 (string-length token2)))
-             (timestamp
-               (OS:string-&gt;time "%m/%d/%y %H:%M"
-                 (string
-                   (string-ref token1 2) (string-ref token1 3) #\/
-                   (string-ref token1 0) (string-ref token1 1) #\/
-                   (case (string-ref token1 4)
-                     ((#\8 #\9) #\9) (else #\0))
-                   (string-ref token1 4) #\space
-                   (string-ref token2 0) (string-ref token2 1) #\:
-                   (string-ref token2 2) (string-ref token2 3))))
-             ((positive? timestamp)))
-           timestamp))
-</PRE>
-
-<P>
-AND-LET* is also similar to an "anaphoric AND" LISP macro [Rob Warnock,
-comp.lang.scheme, 26 Feb 1998 09:06:43 GMT, Message-ID:
-6d3bb3$3804h@fido.asd.sgi.com]. AND-LET* allows however more than one
-intermediate result, each of which continues to be bound through the
-rest of the form.
-
-
-<H1>Specification</H1>
-
-<H2><a name="and-let">Syntax and Informal Semantics</a></H2>
-
-<PRE>
-AND-LET* (CLAWS) BODY
-
-CLAWS ::= '() | (cons CLAW CLAWS)
-CLAW  ::=  (VARIABLE EXPRESSION) | (EXPRESSION) |
-           BOUND-VARIABLE
-</PRE>
-
-<UL>
-<LI>The CLAWS are evaluated in the strict left-to-right order
-<LI>For each CLAW, the EXPRESSION part is evaluated first (or BOUND-VARIABLE is looked up)
-<LI>If the result is #f, AND-LET* immediately returns #f
-<LI>Otherwise, if  the CLAW is of the form (VARIABLE EXPRESSION)
-the EXPRESSION's value is bound to a freshly made VARIABLE
-<LI>The VARIABLE is available for the rest of the CLAWS , and the BODY
-<LI>As usual, all VARIABLEs must be unique (like in let*)
-</UL>
-
-<H2>Formal (Denotational) Semantics</H2>
-
-<PRE>
-eval[ (AND-LET* (CLAW1 ...) BODY), env] =
-   eval_claw[ CLAW1, env ] andalso
-   eval[ (AND-LET* ( ...) BODY), ext_claw_env[CLAW1, env]]
-
-eval[ (AND-LET* (CLAW) ), env] = eval_claw[ CLAW, env ]
-eval[ (AND-LET* () FORM1 ...), env] = eval[ (BEGIN FORM1 ...), env ]
-eval[ (AND-LET* () ), env] = #t
-
-eval_claw[ BOUND-VARIABLE, env ] =
-   eval[ BOUND-VARIABLE, env ]
-eval_claw[ (EXPRESSION), env ] =
-   eval[ EXPRESSION, env ]
-eval_claw[ (VARIABLE EXPRESSION), env ] =
-   eval[ EXPRESSION, env ]
-
-ext_claw_env[ BOUND-VARIABLE, env ] = env
-ext_claw_env[ (EXPRESSION), env ] =
-   env-after-eval[ EXPRESSION, env ]
-ext_claw_env[ (VARIABLE EXPRESSION), env ] =
-   extend-env[ env-after-eval[ EXPRESSION, env ],
-              VARIABLE boundto eval[ EXPRESSION, env ]]
-</PRE>
-
-<H1>Implementation</H1>
-
-<P>The full implementation plus the validation code are available <A href="http://srfi.schemers.org/srfi-2/vland-gambit.scm">here</A> (which is a copy of
-<A href="http://pobox.com/~oleg/ftp/Scheme/vland.scm">
-http://pobox.com/~oleg/ftp/Scheme/vland.scm</A>).
-
-<P>This is an implementation of AND-LET* as a (Gambit) low-level macro that
-re-writes AND-LET* as a "tree" of AND and LET forms. A validation code is
-also presented, which verifies not only that everything works as
-expected, but also that AND-LET* finds syntax errors where expected.
-
-<H1>Copyright</H1>
-Copyright (C) Oleg Kiselyov (1998). All Rights Reserved. 
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-<address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Dave Mason</a></address>
-<!-- Created: Mon Dec 28 13:49:00 PST 1998 -->
-<P>
-<!-- hhmts start -->
-Last modified: Wed Feb  6 17:21:57 MET 2002
-<!-- hhmts end -->
-</body>
-</html>
-<!-- <code><a href="mailto:oleg@pobox.com">&lt;oleg@pobox.com&gt;</A></code>, <code>&lt;oleg@acm.org&gt;</code>, <code>&lt;oleg@computer.org&gt;</code>-->
-
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-23.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-23.html
deleted file mode 100644
index 8ac31ca2af..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-23.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 23: Error reporting mechanism</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 23: Error reporting mechanism
-
-<H1>Author</H1>
-
-Stephan Houben
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status. To see an explanation of
-each status that a SRFI can hold, see <a
-href="http://srfi.schemers.org/srfi-process.html">here</a>.  
-You can access
-the discussion via
-<a href="http://srfi.schemers.org/srfi-23/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-<P>
-<UL>
-<LI>Draft: 2001/03/09-2001/06/09</LI>
-<LI>Revised: 2001/03/22
-<LI>Revised: 2001/04/26
-</UL>
-</P>
-
-<H1>Abstract</H1>
-
-A mechanism is proposed to allow Scheme code to report errors and abort
-execution.
-The proposed mechanism is already implemented in several Scheme systems
-and can be implemented, albeit imperfectly, in any R5RS conforming Scheme.
-
-<H1>Rationale</H1>
-
-<p>
-R5RS Scheme requires certain operations to signal an error when they fail.
-"Signalling an error" means that implementations must detect and report
-the error.
-Moreover, R5RS encourages, but not requires, 
-implementations to signal an error in many more circumstances.
-
-<p>
-However, there is no direct way for the Scheme application programmer to report
-an error that occurred in his or her own application. 
-This means that Scheme procedures created by applications or libraries are
-in this respect not on equal footing with procedures provided by the
-Scheme system.
-
-<p>
-Many Scheme systems already provide a mechanism that allows application code
-to report an error. At least the following implementations support
-such a mechanism: Bigloo, Guile, MIT Scheme, PLT Scheme, RScheme, Scsh, SCM,
-all implementations supported by SLIB.
-Of these implementations, the following have an error mechanism compatible
-with this SRFI: Guile, MIT Scheme, PLT Scheme, RScheme, Scsh.
-The implementation in SLIB has a different name than the
-one proposed in this SRFI.
-
-<p>
-To summarise, many implementations already have the error reporting
-mechanism described in this SRFI and others are easily made compatible
-with this SRFI. This shows that the proposed mechanism is considered useful
-and that it is easy to implement in most major implementations.
-
-<H1>Specification</H1>
-
-<p>
-The following procedure should be provided:
-<p><a name="error"></a>
-<code>(error</code> &lt;reason&gt;<code> [&lt;arg1&gt; [&lt;arg2&gt; ...]])</code>
-<p>
-The argument &lt;reason&gt; should be a string.
-The procedure <code>error</code> will <em>signal an error</em>,
-as described in R5RS, and it will report the message &lt;reason&gt;
-and the objects &lt;arg1&gt, &lt;arg2&gt, .... 
-What exactly constitutes "signalling" and "reporting" is not prescribed, because of the large variation in Scheme systems. So it is left to the implementor
-to do something reasonable. To that end, a few examples of possible behaviour
-are given.
-<ol>
- <li>
-   Display &lt;reason&gt; and &lt;arg1&gt;... on the screen and terminate
-   the Scheme program. (This might be suitable for a Scheme system
-   implemented as a batch compiler.)
- <li>  
-  Display &lt;reason&gt; and &lt;arg1&gt;... on the screen and  
-  go back to the read-evaluate-print loop. (This might be suitable for
-  an interactive implementation).
- <li>
-  In the case of a multi-threaded system: terminate the current
-  thread, but do not terminate the other threads. Possibly make the
-  arguments to <code>error</code> available to other threads in some
-  way. See the <code>thread-join!</code> mechanism in SRFI-18 on
-  how this could be done.
- <li>
-  Package &lt;reason&gt; and &lt;arg1&gt;... up into an error object
-  and pass this error object to an exception handler. The default
-  exception handler then might do something as described in points 1 to 3.
- <li>
-  In the case of a Scheme system that runs completely unattended
-  and that has no way to notify a human, the only reasonable
-  course of action might be to do nothing at all. However, this should
-  be considered a last resort. Clearly, if all implementors would choose
-  this strategy, this SRFI would not be very useful.
-</ol>  
-An implementation might report more information than just 
-&lt;reason&gt; and &lt;arg1&gt;... . For instance, it might report the procedure name in which
-the error occurred or even print a stack trace.
-However, this will require additional support in the Scheme implementation.
-
-
-<H1>Why <code>error</code> is a procedure</H1>
-
-It is conceivable to allow <code>error</code> to be a special form,
-such as a macro, rather than a procedure. This might make providing
-information such as the source code location easier. This possibility
-has been considered, but rejected, for two reasons.
-<ol>
- <li>
-  Since <code>error</code> accepts a variable number of arguments,
-  it could occasionally be useful to use <code>apply</code> to call
-  <code>error</code>. However, this is not possible if <code>error</code>
-  was allowed to be a special form.
- <li>
-  Since <code>error</code> is currently a procedure in all Scheme
-  implementations mentioned above, it doesn't seem all that
-  worthwhile to allow it to be a special form.
-</ol>
-
-<H1>Implementation</H1>
-
-An implementation that works in almost any R5RS Scheme is the following:
-<pre>
-  (define (error reason . args)
-      (display "Error: ")
-      (display reason)
-      (for-each (lambda (arg) 
-                  (display " ")
-		  (write arg))
-		args)
-      (newline)
-      (scheme-report-environment -1))  ;; we hope that this will signal an error
-</pre>
-This implementation has a flaw,
-namely, in many implementations this
-will actually print 2 messages.
-<ol>
- <li> The message <code>message</code>, followed by <code>objs</code>, and
- <li> A message about <code>scheme-report-environment</code> getting an invalid argument. 
-</ol> 
-This might be confusing to the user.
-
-<p>
-The <a href="http://www.swiss.ai.mit.edu/~jaffer/SLIB.html">SLIB</a> procedure <code>slib:error</code> works like the <code>error</code>
-procedure described in this document.
-Thus, when SLIB is loaded, <code>error</code> can be defined as:
-<pre>
-  (define error slib:error)
-</pre>  
-
-<p>
-If <a href="http://srfi.schemers.org/srfi-18/">SRFI 18</a> is supported, it is allowed 
-(but not required) to implement <code>error</code> in
-terms of the exception mechanism of SRFI 18.
-<pre>
-  (define (error reason . args)
-    (raise (make-error-exception reason args)))
-</pre>
-Here, <code>make-error-exception</code> is implementation dependent.
-
-<H1>Copyright</H1>
-<p>Copyright (C) <a href="mailto:stephanh@win.tue.nl">Stephan Houben</a> (2001). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a
-    href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-<!-- Created: Thu Mar  8 15:33:07 CET 2001 -->
-<!-- hhmts start -->
-Last modified: Mon Feb  4 14:46:29 MET 2002
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-25.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-25.html
deleted file mode 100644
index 4d81d03530..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-25.html
+++ /dev/null
@@ -1,531 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 25: Multi-dimensional Array Primitives</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 25: Multi-dimensional Array Primitives
-
-<H1>Author</H1>
-
-Jussi Piitulainen
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status. To see an explanation of
-each status that a SRFI can hold, see <a
-href="http://srfi.schemers.org/srfi-process.html">here</a>.  You can access
-the discussion via
-<a href="http://srfi.schemers.org/srfi-25/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-<P>
-<UL>
-<LI>Draft: 2001/11/12-2002/01/11 </LI>
-<LI>Revised: 2002/02/03</LI>
-<LI>Final: 2002/05/21</LI>
-</UL>
-</P>
-
-<H1>Abstract</H1>
-
-<p>
-A core set of procedures for creating and manipulating heterogeneous
-multidimensional arrays is proposed. The design is consistent with the
-rest of Scheme and independent of other container data types. It
-provides easy sharing of parts of an array as other arrays without
-copying, encouraging a declarative style of programming.
-</p>
-
-<p>
-The specification is based on an original contribution by Alan Bawden
-in 1993.
-</p>
-
-<H1>Rationale</H1>
-
-<p>
-The proposed arrays encourage a natural declarative programming
-style. They allow sharing of most any rectangular part of an array
-through an affine index mapping, without copying. But imperative style
-is equally natural.
-</p>
-
-<p>
-The design is consistent with the two indexed data structures of
-Scheme: vectors and strings. The design makes arrays a self-contained
-type. These statements are illustrated in the following paragraphs.
-</p>
-
-<p>
-First, in the one-dimensional case, the arguments of the following
-relevant calls match exactly.
-</p>
-
-<pre>
-    (vector-set! v k o)
-    (string-set! s k c)
-    (array-set! a k o)
-</pre>
-
-<p>
-Likewise, <code>make-array</code> matches <code>make-vector</code> and
-<code>make-string</code>. An analogue to <code>vector</code>,
-<code>string</code> and <code>list</code> is provided, alleviating the
-lack of an external representation. Index bounds are specified as for
-<code>substring</code>, lower bound included and upper bound excluded.
-</p>
-
-<p>
-Array shapes are specified as arrays. These can be made with a special
-procedure <code>shape</code> that does not have a shape argument. An
-array does not retain a dependence to the shape array. For example,
-mutation of a shape array is allowed.
-</p>
-
-<p>
-Index mappings return multiple values as multiple values.
-</p>
-
-<p>
-Array dimensions can begin at any index. In particular, the choice
-between <code>0</code> and <code>1</code> is left to the user.
-(Shapes and index objects are zero based, though.)
-</p>
-
-<p>
-The ability to pack an index sequence in a vector is useful for
-implementing higher level operations. (The ability to pack it in a
-one-dimensional array lets one use, say, a row of a matrix as an
-index.)
-</p>
-
-<p>
-It is not required that vectors not be arrays. It is not required that
-they be, either.
-</p>
-
-<H1>Specification</H1>
-
-<p>
-Arrays are heterogeneous data structures whose elements are indexed by
-integer sequences of fixed length.  The length of a valid index
-sequence is the <dfn>rank</dfn> or the number of <dfn>dimensions</dfn>
-of an array. The <dfn>shape</dfn> of an array consists of bounds for
-each index.
-</p>
-
-<p>
-The lower bound <var>b</var> and the upper bound <var>e</var> of a
-dimension are exact integers with
-<code>(&lt;=&nbsp;<var>b</var>&nbsp;<var>e</var>)</code>. A valid
-index along the dimension is an exact integer <var>k</var> that
-satisfies both
-<code>(&lt;=&nbsp;<var>b</var>&nbsp;<var>k</var>)</code> and
-<code>(&lt;&nbsp;<var>k</var>&nbsp;<var>e</var>)</code>. The length of
-the array along the dimension is the difference
-<code>(-&nbsp;<var>e</var>&nbsp;<var>b</var>)</code>. The
-<dfn>size</dfn> of an array is the product of the lengths of its
-dimensions.
-</p>
-
-<p>
-A shape is specified as an even number of exact integers. These are
-alternately the lower and upper bounds for the dimensions of an array.
-</p>
-
-<p>
-The following ten procedures should be implemented.
-</p>
-
-<p><a name="array-p"></a>
-<code>(array? <var>obj</var>)</code><br> 
-
-Returns <samp>#t</samp> if <var>obj</var> is an array, otherwise
-returns <samp>#f</samp>.
-</p>
-
-<p>
-Note: there is no reasonable way to implement this procedure
-accurately in R5RS; <a href="http://srfi.schemers.org/srfi-9/">SRFI
-9</a> (Defining Record Types) specifies a way, and many Scheme
-implementations provide something similar.
-</p>
-
-<p><a name="make-array"></a>
-<code>(make-array <var>shape</var>)</code><br>
-<code>(make-array <var>shape</var> <var>obj</var>)</code><br>
-
-Returns a newly allocated array whose shape is given by
-<var>shape</var>.  If <var>obj</var> is provided, then each element is
-initialized to it. Otherwise the initial contents of each element is
-unspecified. The array does not retain a dependence to
-<var>shape</var>.
-</p>
-
-<p><a name="shape"></a>
-<code>(shape <var>bound ...</var>)</code><br> 
-
-Returns a shape. The sequence <var>bound ...</var> must consist of an
-even number of exact integers that are pairwise not decreasing. Each
-pair gives the lower and upper bound of a dimension. If the shape is
-used to specify the dimensions of an array and <var>bound ...</var> is
-the sequence <var>b0 e0 ... bk ek ...</var> of <var>n</var> pairs of
-bounds, then a valid index to the array is any sequence <var>j0 ... jk
-...</var> of <var>n</var> exact integers where each <var>jk</var>
-satisfies <code>(&lt;=&nbsp;<var>bk</var>&nbsp;<var>jk</var>)</code>
-and <code>(&lt;&nbsp;<var>jk</var>&nbsp;<var>ek</var>)</code>.
-</p>
-
-<p>
-The shape of a <var>d</var>-dimensional array is a
-<var>d</var>&nbsp;&times;&nbsp;<var>2</var> array where the element at
-<var>k 0</var> contains the lower bound for an index along dimension
-<var>k</var> and the element at <var>k 1</var> contains the
-corresponding upper bound, where <var>k</var> satisfies
-<code>(&lt;=&nbsp;0&nbsp;<var>k</var>)</code> and
-<code>(&lt;&nbsp;<var>k</var>&nbsp;<var>d</var>)</code>.
-</p>
-
-<p><a name="array"></a>
-<code>(array <var>shape</var> <var>obj ...</var>)</code><br>
-
-Returns a new array whose shape is given by <var>shape</var> and the
-initial contents of the elements are <var>obj ...</var> in row major
-order. The array does not retain a dependence to <var>shape</var>.
-</p>
-
-<p><a name="array-rank"></a>
-<code>(array-rank <var>array</var>)</code><br>
-
-Returns the number of dimensions of <var>array</var>.
-<pre>
-    (array-rank
-       (make-array (shape 1 2 3 4)))
-</pre>
-
-<p>
-Returns <samp>2</samp>.
-</p>
-
-<p><a name="array-start"></a>
-<code>(array-start <var>array</var> <var>k</var>)</code><br>
-
-Returns the lower bound for the index along dimension <var>k</var>.
-</p>
-
-<p><a name="array-end"></a>
-<code>(array-end <var>array</var> <var>k</var>)</code><br>
-
-Returns the upper bound for the index along dimension <var>k</var>.
-</p>
-
-<!--
-<p>
-<code>(array-shape <var>array</var>)</code><br>
-
-Returns a newly allocated shape of <var>array</var>.
-</p>
-
-<pre>
-    (= (array-rank a)
-       (array-ref (array-shape (array-shape a)) 0 1))
-</pre>
-
-<p>
-Returns <samp>#t</samp>.
-</p>
-
-<p>
-Implementation note: <code>array-shape</code> has <code>(shape 0 2 0
-2)</code> as a fixed point which is reached in two or three iterations
-from any array.
-</p>
--->
-
-<p><a name="array-ref"></a>
-<code>(array-ref <var>array</var> <var>k ...</var>)</code><br>
-<code>(array-ref <var>array</var> <var>index</var>)</code><br>
-
-Returns the contents of the element of <var>array</var> at index
-<var>k ...</var>. The sequence <var>k ...</var> must be a valid index
-to <var>array</var>. In the second form, <var>index</var> must be
-either a vector or a 0-based 1-dimensional array containing <var>k
-...</var>.
-</p>
-
-<pre>
-    (array-ref (array (shape 0 2 0 3)
-                  'uno 'dos 'tres
-                  'cuatro 'cinco 'seis)
-       1 0)
-</pre>
-
-<p>
-Returns <samp>cuatro</samp>.
-</p>
-
-<pre>
-    (let ((a (array (shape 4 7 1 2) 3 1 4)))
-       (list (array-ref a 4 1)
-             (array-ref a (vector 5 1))
-             (array-ref a (array (shape 0 2)
-                             6 1))))
-</pre>
-
-<p>
-Returns <samp>(3 1 4)</samp>.
-</p>
-
-<p><a name="array-set!"></a>
-<code>(array-set! <var>array</var> <var>k ...</var> <var>obj</var>)</code><br>
-<code>(array-set! <var>array</var> <var>index</var> <var>obj</var>)</code><br>
-
-Stores <var>obj</var> in the element of <var>array</var> at index
-<var>k ...</var>. Returns an unspecified value. The sequence <var>k
-...</var> must be a valid index to <var>array</var>. In the second
-form, <var>index</var> must be either a vector or a 0-based
-1-dimensional array containing <var>k ...</var>.
-
-<pre>
-    (let ((a (make-array
-                (shape 4 5 4 5 4 5))))
-       (array-set! a 4 4 4 'huuhkaja)
-       (array-ref a 4 4 4))
-</pre>
-
-<p>
-Returns <samp>huuhkaja</samp>.
-</p>
-
-<p><a name="share-array"></a>
-<code>(share-array <var>array</var> <var>shape</var> <var>proc</var>)</code>
-<br> 
-
-Returns a new array of shape <var>shape</var> that shares elements of
-<var>array</var> through <var>proc</var>. The procedure
-<var>proc</var> must implement an affine function that returns indices
-of <var>array</var> when given indices of the array returned by
-<code>share-array</code>. The array does not retain a dependence to
-<var>shape</var>.
-</p>
-
-<pre>
-    (define i_4
-       (let* ((i (make-array
-                    (shape 0 4 0 4)
-                    0))
-              (d (share-array i
-                    (shape 0 4)
-                    (lambda (k)
-                       (values k k)))))
-          (do ((k 0 (+ k 1)))
-              ((= k 4))
-             (array-set! d k 1))
-          i))
-</pre>
-
-<p>
-Note: the affinity requirement for <var>proc</var> means that each
-value must be a sum of multiples of the arguments passed to
-<var>proc</var>, plus a constant.
-</p>
-
-<p>
-Implementation note: arrays have to maintain an internal index mapping
-from indices <var>k1 ... kd</var> to a single index into a backing
-vector; the composition of this mapping and <var>proc</var> can be
-recognised as <code>(+ n0 (* n1 <var>k1</var>) ... (* nd
-<var>kd</var>))</code> by setting each index in turn to <code>1</code>
-and others to <code>0</code>, and all to <code>0</code> for the
-constant term; the composition can then be compiled away, together
-with any complexity that the user introduced in their procedure.
-</p>
-
-<p>
-This document does not specify any external representation for arrays.
-This document does not specify when arrays are <code>equal?</code>.
-(Indeed, R5RS <code>equal?</code> will do the wrong thing.)
-</p>
-
-<h1>Examples</h1>
-
-<p>
-The reference implementation comes with a number of files that
-illustrate some ways to use the proposed system (and are very useful
-in <em>testing</em> an implementation; that is their origin).
-</p>
-
-<ol>
-
-<li> A library <a href="http://srfi.schemers.org/srfi-25/arlib.scm">arlib.scm</a> that contains, among
-     several other things, <code>tabulate-array</code> for a more
-     useful initialization of a new array, an
-     <code>array-equal?</code>, and a <code>transpose</code> that can
-     permute the dimensions of an array any which way.
-
-<li> A test suite <a href="http://srfi.schemers.org/srfi-25/test.scm">test.scm</a> for <em>array</em>,
-     and another test suite <a href="http://srfi.schemers.org/srfi-25/list.scm">list.scm</a> for
-     <em>arlib</em>.
-
-<li> A rudimentary display procedure <code>(play array)</code> in <a
-     href="http://srfi.schemers.org/srfi-25/play.scm">play.scm</a>, for playing around with the system.
-
-</ol>
-
-<H1>Implementation</H1>
-
-<p>
-A portable reference implementation is provided. It uses a minimal
-error reporting mechanism that conforms to <a
-href="http://srfi.schemers.org/srfi-23/">SRFI 23</a> (Error reporting
-mechanism). Type disjointness requires support from the host
-implementation, such as support for <a
-href="http://srfi.schemers.org/srfi-9/">SRFI 9</a> (Defining Record
-Types). All names not defined in this proposal are in the prefix
-"<code>array:</code>", which serves as a module system.
-</p>
-
-<p>
-You can get <a href="http://srfi.schemers.org/srfi-25/srfi-25-reference.scm">source for the reference
-implementation</a> as a single file and stop reading. But there are
-variations. This single file represents arrays as procedures (so the
-type predicate is very approximate); it represents index mapping as
-vectors of coefficients; map recognition is not optimised for any
-number of dimensions as that would be redundant in this
-representation.
-</p>
-
-<p>
-The real source comes in too many files. A working installation
-consists of the following parts, each in its own file.
-</p>
-
-<ol>
-
-<li> a <dfn>record type definition</dfn>, either system specific for
-     type disjointness, or portable as procedures, in a file
-     <em>as-*.scm</em>, and
-
-<li> <dfn>indexing operations</dfn> to match the type, in a file
-     <em>ix-*.scm</em>, and
-
-<li> an <dfn>affine recogniser</dfn> of one of three types, optimised
-     up to some number of dimensions, in a file <em>op-*.scm</em>, and
-
-<li> the main source file <a href="http://srfi.schemers.org/srfi-25/array.scm">array.scm</a>.
-
-</ol>
-
-<p>
-Affine recognisers are made by a program <a href="http://srfi.schemers.org/srfi-25/opt.scm">opt.scm</a>
-but one of each type is also available here, optimized for 0, 1, 2 and
-3 dimensions. Choose one type: pick a recogniser with matching index
-procedures; load <tt>as-</tt>, <tt>ix-</tt> and <tt>op-</tt> and
-<tt>array</tt>.)
-</p>
-
-<ol>
-
-<li> In the <a href="http://srfi.schemers.org/srfi-25/op-mbda.scm">mbda</a> type representation, index
-     mappings are procedures that accept an optional argument.  The
-     matching <a href="http://srfi.schemers.org/srfi-25/ix-mbda.scm">access procedures</a> apply the
-     mapping to the arguments of <code>array-ref</code> and
-     <code>array-set!</code>.
-
-<li> In the <a href="http://srfi.schemers.org/srfi-25/op-tter.scm">tter</a> type representation, index
-     mappings are pairs of procedures: one takes exactly the indices,
-     the other takes indices and an object. The matching <a
-     href="http://srfi.schemers.org/srfi-25/ix-tter.scm">access procedures</a> apply the first
-     procedure to the argumets of <code>array-ref</code> and the
-     second procedure to the arguments of <code>array-set!</code>.
-
-<li> In <a href="http://srfi.schemers.org/srfi-25/op-ctor.scm">ctor</a> representation, index mappings
-     are coefficient vectors. The <a href="http://srfi.schemers.org/srfi-25/ix-ctor.scm">access
-     procedures</a> compute the sum of products of coefficients and
-     indexes in a loop on the list.
-
-</ol>
-
-<p>
-Record implementations are available <a href="http://srfi.schemers.org/srfi-25/as-procedure.scm">for
-generic Scheme</a> (arrays are not disjoint from procedures), <a
-href="http://srfi.schemers.org/srfi-25/as-srfi-9-record.scm">for SRFI 9</a> (Defining Record Types)
-(<em>not tested</em>), and <a href="http://srfi.schemers.org/srfi-25/as-plt-struct.scm">for PLT
-Scheme</a> (arrays belong to a struct type).
-</p>
-
-<p>
-With the three files from above, the <a href="http://srfi.schemers.org/srfi-25/array.scm">main source
-file</a> should work in any Scheme implementation without need of
-modification.
-</p>
-
-<p>
-Error checking in the implementation may be a tad expensive. The
-places where it occurs are cleanly separated from the surrounding
-code. (Sharing uses a check that is exponential in the number of
-dimensions. It is disabled above a threshold rank.)
-</p>
-
-<h1>Acknowledgements</h1>
-
-<p>
-The original concept comes from a message to the Usenet newsgroup
-<tt>comp.lang.scheme</tt> by Alan Bawden in 1993. A variant of that
-implementation by Richard Kelsey in the Scheme 48 system was also an
-influence. Apart from the origins, the main design goal has been
-consistency with the core types of Scheme.
-</p>
-
-<p>
-Alan Bawden and Mark K. Gardner gave useful comments at an earlier
-attempt to make this specification public. (There was at least one
-other. Notes have gone missing.) SRFI feedback led to improved
-wording, hidden shapes, and two kinds of index objects.
-</p>
-
-<p>
-The exact title of the proposal comes from a <a href="http://zurich.ai.mit.edu/pipermail/rrrs-authors/1998-May/002349.html">message titled "a process that might work"</a> by William D. Clinger to the <tt>rrrs-authors</tt>
-mailing list in 1998. That appears to be a part of the past of the <a
-href="http://srfi.schemers.org">SRFI process</a>.
-</p>
-
-<H1>Copyright</H1>
-<p>Copyright (C) Jussi Piitulainen (2001). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a
-    href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-<!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-<!-- hhmts start -->
-Last modified: Tue May 28 18:46:09 MST 2002
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-26.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-26.html
deleted file mode 100644
index a6cf4878c9..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-26.html
+++ /dev/null
@@ -1,403 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 26: Notation for Specializing Parameters without Currying</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 26: Notation for Specializing Parameters without Currying
-
-<H1>Author</H1>
-
-Sebastian Egner
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status. To see an explanation of
-each status that a SRFI can hold, see <a
-href="http://srfi.schemers.org/srfi-process.html">here</a>.  You can access
-the discussion via
-<a href="http://srfi.schemers.org/srfi-26/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-
-<UL>
-<LI>Draft: 2002/02/06-2002/04/06 </LI>
-<LI>Revised: 2002/02/15</LI>
-<LI>Revised: 2002/02/28</LI>
-<LI>Revised: 2002/06/04</LI>
-<LI>Revised: 2002/06/06</LI>
-<LI>Final: 2002/06/14</LI>
-</UL>
-
-<H1>Abstract</H1>
-
-When programming in functional style,
-it is frequently necessary to specialize some of the
-parameters of a multi-parameter procedure.
-For example, from the binary operation <code>cons</code> 
-one might want to obtain the unary operation 
-<code>(lambda (x) (cons 1 x))</code>.
-This specialization of parameters is also known as
-"partial application", "operator section" or "projection".<p>
-
-The mechanism proposed here allows to write this sort
-of specialization in a simple and compact way.
-The mechanism is best explained by a few examples:<p>
-
-<TABLE>
-<TR>
-<TD><code>(cut cons (+ a 1) &lt;&gt;)</code> 
-<TD>is the same as
-<TD><code>(lambda (x2) (cons (+ a 1) x2))</code>
-</TR>
-<TR>
-<TD><code>(cut list 1 &lt;&gt; 3 &lt;&gt; 5)</code> 
-<TD>is the same as
-<TD><code>(lambda (x2 x4) (list 1 x2 3 x4 5))</code>
-</TR>
-<TR>
-<TD><code>(cut list)</code> 
-<TD>is the same as
-<TD><code>(lambda () (list))</code>
-</TR>
-<TR>
-<TD><code>(cut list 1 &lt;&gt; 3 &lt;...&gt;)</code> 
-<TD>is the same as
-<TD><code>(lambda (x2 . xs) (apply list 1 x2 3 xs))</code>
-</TR>
-<TR>
-<TD><code>(cut &lt;&gt; a b)</code> 
-<TD>is the same as
-<TD><code>(lambda (f) (f a b))</code>
-</TR>
-</TABLE><p>
-
-As you see, the macro <code>cut</code> specializes some of the 
-parameters of its first argument. 
-The parameters that are to show up as formal
-variables of the result are indicated by the symbol <code>&lt;&gt;</code>, 
-pronouced as "slot". In addition, the symbol <code>&lt;...&gt;</code>,
-pronounced as "rest-slot", matches all residual arguments of a variable 
-argument procedure.
-As you can see from the last example above, the first argument can also
-be a slot, as one should expect in Scheme.<p>
-
-In addition to <code>cut</code>, there is a variant called <code>cute</code>
-(a mnemonic for "<code>cut</code> with evaluated non-slots") which evaluates
-the non-slot expressions at the time the procedure is specialized, not at 
-the time the specialized procedure is called.
-For example,<p>
-
-<TABLE>
-<TR>
-<TD><code>(cute cons (+ a 1) &lt;&gt;)</code> 
-<TD>is the same as
-<TD><code>(let ((a1 (+ a 1))) (lambda (x2) (cons a1 x2)))</code>
-</TR>
-</TABLE><p>
-
-As you see from comparing this example with the first example above,
-the <code>cute</code>-variant will evaluate <code>(+ a 1)</code>
-once, while the <code>cut</code>-variant will evaluate it during
-every invokation of the resulting procedure.<p>
-
-The mechanism proposed in this SRFI allows specializing any subset 
-of the variables of a procedure.
-The result can be of fixed arity or of variable arity.
-The mechanism does not allow permutation, omission, duplication
-or any other processing of the arguments;
-for this it is necessary to write to use a different
-mechanism such as <code>lambda</code>.
-
-<H1>Rationale</H1>
-
-A particularly elegant way to deal with specialization is known 
-as <em>currying</em> (Sch&ouml;nfinkel 1924, Curry 1958).
-The idea of currying is to reduce multi-argument functions to
-single-argument functions by regarding an <i>n</i>-ary 
-function as a unary function mapping its first argument into 
-an (<i>n</i>-1)-ary function (which is curried in turn).
-This point of view, apart from its theoretical elegance, 
-allows an extremely compact notation for specializing the 
-first argument of a function.
-In the first example, one could simply write <code>(cons 1)</code>.<p>
-
-Yet, Scheme is not a curried language---the
-number of arguments passed to a procedure must match
-the number of its parameters at all times.
-This allows zero- and variable-arity procedures 
-but in order to specialize parameters
-one usually has to write down a lambda-expression
-and invent some irrelevant identifiers for its 
-formal variables (<code>x</code> in the example).
-For this reason, the mechanism proposed in this SRFI 
-provides a simple and compact notation for specializing
-any subset of the parameters of a procedure.<p>
-
-Note: <em>The mechanism proposed here is not currying!</em><p>
-
-The purpose of the mechanism proposed here is to make the benefits
-of currying available within the programming language Scheme.
-There are two primary benefits of currying in practice:
-Higher-order types are substantially simplified and
-there is a simple notation for specializing parameters.
-The type aspect is irrelevant as Scheme has latent typing.
-The specialization aspect is largly covered with this SRFI.<p>
-
-Here are a few more examples for illustration:
-
-<TABLE>
-<TR>
-<TD><code>(map (cut * 2 &lt;&gt;) '(1 2 3 4))</code> 
-</TR>
-<TR>
-<TD><code>(map (cut vector-set! x &lt;&gt; 0) indices)</code> 
-</TR>
-<TR>
-<TD><code>(for-each (cut write &lt;&gt; port) exprs)</code> 
-</TR>
-<TR>
-<TD><code>(map (cut &lt;&gt; x y z) (list min max))</code> 
-</TR>
-<TR>
-<TD><code>(for-each (cut &lt;&gt;) thunks)</code> 
-</TR>
-</TABLE>
-
-<H1>Specification</H1>
-
-<a name="cut"></a><a name="cute"></a>
-The formal syntax of a specialized expression, in the style of the 
-<a href="http://www.schemers.org/Documents/Standards/R5RS/"><I>Revised^5 Report on the Algorithmic Language Scheme</I></a>:<p>
-
-<TABLE>
-<TR>
-<TD><a name="cut"></a><a name="cute"></a><code>&lt;cut-expression&gt;</code>
-<TD><code>--></code>
-<TD><TD><code>(cut &lt;slot-or-expr&gt; &lt;slot-or-expr&gt;*)</code>
-<TD>
-</TR>
-<TR>
-<TD><TD><TD>|<TD><code>(cut &lt;slot-or-expr&gt; &lt;slot-or-expr&gt;* &lt;...&gt;)</code>
-<TD>; with "rest-slot"
-</TR>
-<TR>
-<TD><TD><TD>|<TD><code>(cute &lt;slot-or-expr&gt; &lt;slot-or-expr&gt;*)</code>
-<TD>; evaluate non-slots at specialization time
-</TR>
-<TR>
-<TD><TD><TD>|<TD><code>(cute &lt;slot-or-expr&gt; &lt;slot-or-expr&gt;* &lt;...&gt;)</code>
-<TD>; with "rest-slot"
-</TR>
-<TR>
-<TD><code>&lt;slot-or-expr&gt;</code>
-<TD><code>--></code>
-<TD><TD><code>&lt;&gt;</code><TD>; a "slot"
-</TR>
-<TR>
-<TD><TD><TD>|<TD> <code>&lt;expression&gt;</code><TD>; a "non-slot expression"
-</TR>
-</TABLE><p>
-
-The macro <code>cut</code> transforms a <code>&lt;cut-expression&gt;</code> 
-into a <code>&lt;lambda expression&gt;</code> with as many formal variables
-as there are slots in the list <code>&lt;slot-or-expr&gt;*</code>.
-The body of the resulting <code>&lt;lambda expression&gt;</code> calls
-the first <code>&lt;slot-or-expr&gt;</code> with arguments from
-<code>&lt;slot-or-expr&gt;*</code> in the order they appear.
-In case there is a rest-slot symbol, the resulting procedure is also of 
-variable arity, and the body calls the first <code>&lt;slot-or-expr&gt;</code>
-with all arguments provided to the actual call of the specialized procedure.<p>
-
-The macro <code>cute</code> is similar to the macro <code>cut</code>,
-except that it first binds new variables to the result of evaluating
-the non-slot expressions (in an unspecific order) and then substituting 
-the variables for the non-slot expressions.
-In effect, <code>cut</code> evaluates non-slot expressions at the time
-the resulting procedure is called, whereas <code>cute</code> evaluates
-the non-slot expressions at the time the procedure is constructed.<p>
-
-<H1>Implementation</H1>
-
-The reference implementation defines the two macros
-<code>cut</code> and <code>cute</code> using macro 
-mechanism of R5RS.
-It does not use any other SRFI or any library.
-The implementation makes use of internal macros to
-run through the list of <code>&lt;slot-or-expr;&gt;</code>s.
-As macros in R5RS are hygienic and referentially transparent,
-the macro mechanism makes sure the names of the newly
-introduced formal variables are unique and do not clash.
-The template <code>(param ... slot)</code>, see 
-<a href="http://www.schemers.org/Documents/Standards/R5RS/HTML/r5rs-Z-H-10.html#%_sec_7.1.5">Sect. 7.1.5. of R5RS</a>,
-allows to preserve the order of arguments---which would get
-reversed otherwise.
-
-The reference implementation has been written by
-Al Petrofsky. It can be found <a href="http://srfi.schemers.org/srfi-26/cut.scm">here</a>.<p>
-
-Finally, there is a small collection of 
-<a href="http://srfi.schemers.org/srfi-26/check.scm">confidence tests</a>.
-It checks some special cases of the mechanism defined
-in this SRFI and signals an error in case something is wrong.
-Passing the tests does not mean a correct implementation.
-
-
-<H1>Design Rationale</H1>
-
-<H3>Why not real currying/uncurrying?</H3>
-
-It is possible in Scheme to implement a macro turning a multi-argument 
-procedure into a nesting of single-argument procedures and back.
-These operations are usually called "curry" and "uncurry" in
-other programming languages.
-Yet, Scheme remains an inherently uncurried language and is not
-prepared to deal with curried procedures in a convenient way.
-Hence, a "by the book" implementation of currying would only be useful
-if you apply it in the sequence "curry, specialize some arguments,
-and uncurry again"---which is exactly the purpose of the macro 
-<code>cut</code> specified in this document.
-The primary relevance of currying/uncurrying in Scheme is to
-teach concepts of combinatory logic.<p>
-
-<H3>Why not a more general mechanism, also allowing permutation,
-omission and duplication of arguments?</H3>
-
-The reason is that I, the author of this SRFI, consider more general 
-mechanisms too dangerous to mix them with the mechanism proposed here.
-In particular, as soon as parameters are being rearranged it
-is usually necessary to be aware of the meaning of the parameters;
-unnamed variables can be quite harmful then.
-The mechanism proposed here is designed to prevent this.
-Please refer to the discussion threads
-<a href="http://srfi.schemers.org/srfi-26/mail-archive/msg00018.html">"OK, how about...,"</a> (Alan Bawden),
-<a href="http://srfi.schemers.org/srfi-26/mail-archive/msg00038.html">"is that useful?"</a> (Walter C. Pelissero), and
-<a href="http://srfi.schemers.org/srfi-26/mail-archive/msg00040.html">"l, the ultimate curry that is not curry"</a> (Al Petrofsky).<p>
-
-<H3>Why are the macro called <code>cut/cute</code> and not 
-[<em>enter your favourite here</em>]?</H3>
-
-Well, the original name proposed for this SRFI was <code>curry</code>
-which immediately stirred some emotions as it does not what is
-commonly known as currying.
-Some alternatives have been discussed, such as <code>section</code>,
-<code>specialise</code>, <code>specialize</code>, <code>partial-apply</code>, 
-<code>partial-call</code>, <code>partial-lambda</code>, 
-<code>_j</code>, <code>_i</code>, <code>$</code>,
-<code>&amp;</code>, <code>srfi-26</code>, <code>foobar</code>, 
-<code>xyz</code>, <code>schoenfinkelize</code>, 
-<code>curry-which-isnt-curry</code>, <code>tandoori</code>, 
-and it has also been suggested to pick a five letter symbol uniformly
-at random and fix this as a name.
-To be fair, not all of these name have been put forward as serious proposals,
-some of them were merely to illustrate a point in the discussion.
-In addition, I have played with the game of the name quite a bit 
-and considered other candidates not listed here.
-Despite the fact that the discussion list only represents a highly
-biased random sample of people's opinion (motivation to post a message
-is higher if you disagree, for example) it told me that the SRFI
-could potentially benefit from a different name---however impractical
-it may be to go for unanimous popularity.
-The name <code>cut</code> refers to "operator section", as the
-concept is often called in other programming languages, 
-but I tend to remember it as the acronym for "Curry Upon This" ;-).
-The names for the evaluating version of <code>cut</code> that
-have been proposed were <code>cut!</code>, <code>cutlet</code>,
-<code>cut*</code>, and <code>cute</code>.<p>
-
-<H3>Is it possible to implement the SRFI without macros?</H3>
-
-Not really.
-As Stephan Houben has pointed out during the discussion (refer to
-<a href="http://srfi.schemers.org/srfi-26/mail-archive/msg00008.html">"Implementing it as a procedure"</a>) it is possible to implement the 
-<code>cute</code>-mechanism as a procedure.
-Refer also to Al Petrofsky's posting 
-<a href="http://srfi.schemers.org/srfi-26/mail-archive/msg00048.html">"Problems with "curry"'s formal specification"</a> for details.
-However, the procedural implementation comes with a slight performance
-penalty and it is not possible the implement the <code>cut</code>-mechanism 
-as a procedure, too.
-As both are needed, we rely on macros to implement the SRFI.
-
-<H3>Why is there another symbol for the rest-slot when lambda-expressions
-use the dotted notation for variable length argument lists?</H3>
-There are two reasons.
-The first one is the existence of a procedural implementation
-of a related mechanism (refer to the previous paragraph).
-For a procedure, however, it is not possible to have dotted notation.
-The second reason is the way the hygienic macro mechanism in R5RS
-is defined to deal with dotted notation, as Felix Winkelmann has pointed out.
-Refer to the discussion threads
-<a href="http://srfi.schemers.org/srfi-26/mail-archive/msg00001.html">"Improper lists in macros [WAS: none]"</a>.<p>
-
-<H3>Why is it impossible to specify when a non-slot is evaluated individually 
-per non-slot?</H3>
-<code>Cut</code> evaluates all non-slots at the time the specialized
-procedure is called and <code>cute</code> evaluates all non-slots at
-the time the procedure is being specialized.
-These are only the two extremes and it is possible to define a 
-syntax that allows to choose per non-slot.
-However, I am convinced that the benefit of the greater flexibility
-is not worth the risk of confusion.
-If a piece of code really depends on the distinction, it might be
-better to make this explicit through <code>let</code> and 
-<code>lambda</code>.<p>
-
-<H3>Why is <code>(cut if &lt;&gt; 0 1)</code> etc. illegal?</H3>
-
-It is specified that a <code>&lt;slot-or-expr&gt;</code> must be
-either the slot symbol or an <code>&lt;expression&gt;</code> in the sense
-of <a href="http://www.schemers.org/Documents/Standards/R5RS/HTML/r5rs-Z-H-10.html#%_sec_7.1.3"><I>R5RS, 
-Section 7.1.3</I></a>.
-As <code>if</code> is no <code>&lt;expression&gt;</code>,
-the above case is illegal.
-The reason why <code>cut</code> and <code>cute</code> are
-restricted in this sense is the difficulty of defining
-the meaning of such generalized expressions.
-Please refer to the discussion archive for details.
-
-<H1>Acknowledgements</H1>
-
-An important part of this SRFI is based on the contribution
-of other people, mostly through the discussion archive.
-In particular, the semantics and the design rationale have
-been greatly improved in the course of the discussion.
-I would like to thank all who have contributed.
-
-<H1>Copyright</H1>
-<p>Copyright (C) Sebastian Egner (2002). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-    <address>Author: <a href="mailto:sebastian.egner@philips.com">Sebastian Egner</a></address>
-<!-- Created: Mon Feb 4 15:20:00 EST 2002 -->
-<!-- hhmts start -->
-Last modified: Wed Jun 19 10:54:36 MST 2002
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-27.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-27.html
deleted file mode 100644
index 14a88ff7d9..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-27.html
+++ /dev/null
@@ -1,821 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 27: Sources of Random Bits</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 27: Sources of Random Bits
-
-<H1>Author</H1>
-
-Sebastian Egner
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status. To see an explanation of
-each status that a SRFI can hold, see <a
-href="http://srfi.schemers.org/srfi-process.html">here</a>.  
-You can access
-previous messages via
-<a href="http://srfi.schemers.org/srfi-27/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-
-<UL>
-<LI>Draft: 2002/02/12-2002/04/12</LI>
-<LI>Revised: 2002/04/04
-<LI>Revised: 2002/04/10
-<LI>Revised: 2002/04/10
-<LI>Final: 2002/06/03
-</UL>
-
-<H1>Abstract</H1>
-
-This document specifies an interface to sources of random bits,
-or "random sources" for brevity.
-In particular, there are three different ways to use the interface,
-with varying demands on the quality of the source and the
-amout of control over the production process:
-
-<UL>
-<LI>
-The "no fuss" interface specifies that 
-<code>(random-integer </code><I>n</I><code>)</code>
-produces the next random integer in {0, ..., <I>n</I>-1} and
-<code>(random-real)</code> produces the next random
-real number between zero and one.
-The details of how these random values are produced may not be
-very relevant, as long as they appear to be sufficiently random.
-<LI>
-For simulation purposes, on the contrary, it is usually necessary
-to know that the numbers are produced deterministically by a pseudo 
-random number generator of high quality and to have explicit access 
-to its state.
-In addition, one might want to use several independent sources of
-random numbers at the same time and it can be useful to have some
-simple form of randomization.
-<LI>
-For security applications a serious form of true randomization
-is essential, in the sense that it is difficult for an adversary to 
-exploit or introduce imperfections into the distribution of random bits.
-Moreover, the linear complexity of the stream of random bits is more 
-important than its statistical properties.
-In these applications, an entropy source (producing truly random
-bits at a low rate) is used to randomize a pseudo random number
-generator to increase the rate of available bits.
-</UL>
-<p>
-
-Once random sources provide the infrastructure to obtain 
-random bits, these can be used to construct other random deviates.
-Most important are floating point numbers of various distributions
-and random discrete structures, such as permutations or graphs.
-As there is an essentially unlimited number of such objects (with 
-limited use elsewhere), we do not include them in this SRFI.
-In other words, this SRFI is <em>not</em> about making
-all sorts of random objects---it is about obtaining random
-bits in a portable, flexible, reliable, and efficient way.
-
-<H1>Rationale</H1>
-
-This SRFI defines an interface for sources of random bits 
-computed by a pseudo random number generator.
-The interface provides range-limited integer and real numbers.
-It allows accessing the state of the underlying generator.
-Moreover, it is possible to obtain a large number of 
-independent generators and to invoke a mild form of true
-randomization.<p>
-
-The design aims at sufficient flexibility to cover the
-usage patterns of many applications as diverse as
-discrete structures, numerical simulations, and cryptographic protocols.
-At the same time, the interface aims at simplicity,
-which is important for occasional use.
-As there is no "one size fits all" random number generator,
-the design necessarily represents some form of compromise
-between the needs of the various applications.<p>
-
-Although strictly speaking not part of the specification,
-the emphasis of this proposal is on <em>high quality</em>
-random numbers and on <em>high performance</em>.
-As the state of the art in pseudo random number generators
-is still advancing considerably, the choice of method for
-the reference implementation should essentially be 
-considered preliminary.
-
-<H1>Specification</H1>
-
-<DL>
-
-<DT><a name="random-integer"></a>
-<code>(random-integer </code><I>n</I><code>) -> </code><I>x</I><code></code>
-</DT>
-
-<DD>
-The next integer <I>x</I> in {0, ..., <I>n</I>-1} 
-obtained from <code>default-random-source</code>.
-Subsequent results of this procedure appear to be independent
-uniformly distributed over the range {0, ..., <I>n</I>-1}.
-The argument <I>n</I> must be a positive integer,
-otherwise an error is signalled.
-</DD>
-
-</DL>
-
-<DL>
-
-<DT><a name="random-real"></a>
-<code>(random-real) -> </code><I>x</I><code></code>
-</DT>
-
-<DD>
-The next number 0 < <I>x</I> < 1 obtained from
-<code>default-random-source</code>.
-Subsequent results of this procedure appear to be 
-independent uniformly distributed.
-The numerical type of the results and the 
-quantization of the output range depend on the implementation;
-refer to <code>random-source-make-reals</code> for details.
-</DD>
-
-</DL>
-
-<DL>
-
-<DT><a name="default-random-source"></a>
-<code>default-random-source</code>
-</DT>
-
-<DD>
-A random source from which <code>random-integer</code> and 
-<code>random-real</code> have been derived using
-<code>random-source-make-integers</code> and
-<code>random-source-make-reals</code>.
-Note that an assignment to <code>default-random-source</code> 
-does not change <code>random</code> or <code>random-real</code>;
-it is also strongly recommended not to assign a new value.
-</DD>
-
-</DL>
-<HR ALIGN=left WIDTH="10%">
-<DL>
-
-<DT><a name="make-random-source"></a>
-<code>(make-random-source) -> </code><I>s</I><code></code>
-</DT>
-
-<DD>
-Creates a new random source <I>s</I>.
-Implementations may accept additional, optional arguments in 
-order to create different types of random sources.
-A random source created with <code>make-random-source</code>
-represents a deterministic stream of random bits generated
-by some form of pseudo random number generator.
-Each random source obtained as <code>(make-random-source)</code>
-generates the same stream of values, unless the state is modified
-with one of the procedures below.
-</DD>
-
-</DL>
-
-<DL>
-
-<DT><a name="random-source-p"></a>
-<code>(random-source? </code><I>obj</I><code>)  ->  </code><I>bool</I><code></code>
-</DT>
-
-<DD>
-Tests if <I>obj</I> is a random source.
-Objects of type random source are distinct from all
-other types of objects.
-</DD>
-
-</DL>
-
-<DL>
-
-<DT><a name="random-source-state-ref"></a>
-<code>(random-source-state-ref </code><I>s</I><code>)  ->  </code><I>state</I><code></code><br>
-<code>(random-source-state-set! </code><I>s</I><code> </code><I>state</I><code>)</code>
-</DT>
-
-<DD>
-Get and set the current state of a random source <I>s</I>.  The
-structure of the object <I>state</I> depends on the implementation;
-the only portable use of it is as argument to 
-<code>random-source-state-set!</code>.
-It is, however, required that a state possess an external
-representation.
-</DD>
-
-</DL>
-
-<DL>
-<DT><a name="random-source-randomize!"></a>
-<code>(random-source-randomize! </code><I>s</I><code>)</code>
-</DT>
-
-<DD>
-Makes an effort to set the state of the random 
-source <I>s</I> to a truly random state.
-The actual quality of this randomization depends on the implementation
-but it can at least be assumed that the procedure sets <I>s</I> to a 
-different state for each subsequent run of the Scheme system.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="random-source-pseudo-randomize!"></a>
-<code>(random-source-pseudo-randomize! </code><I>s</I><code> <I>i</I> <I>j</I>)</code>
-</DT>
-
-<DD>
-Changes the state of the random source <I>s</I> into the initial
-state of the (<I>i</I>, <I>j</I>)-th independent random source,
-where <I>i</I> and <I>j</I> are non-negative integers.
-This procedure provides a mechanism to obtain a large number of 
-independent random sources (usually all derived from the same backbone
-generator), indexed by two integers.
-In contrast to <code>random-source-randomize!</code>,
-this procedure is entirely deterministic.
-</DD>
-</DL>
-
-
-<HR ALIGN=left WIDTH="10%">
-
-<DL>
-
-<DT><a name="random-source-make-integers"></a>
-<code>(random-source-make-integers </code><I>s</I><code>)  ->  </code><I>rand</I><code></code>
-</DT>
-
-<DD>
-Obtains a procedure <I>rand</I> to generate random integers 
-using the random source <I>s</I>.
-<I>Rand</I> takes a single argument <I>n</I>,
-which must be a positive integer, and returns the next uniformly
-distributed random integer from the interval {0, ..., <I>n</I>-1}
-by advancing the state of the source <I>s</I>.<p>
-
-If an application obtains and uses several generators for the same 
-random source <I>s</I>, a call to any of these generators advances 
-the state of <I>s</I>. Hence, the generators <em>do not</em> produce 
-the same sequence of random integers each but rather share a state.
-This also holds for all other types of generators derived from
-a fixed random sources.
-Implementations that support concurrency make sure that
-the state of a generator is properly advanced.<p>
-</DD>
-
-</DL>
-
-<DL>
-
-<DT><a name="random-source-make-reals"></a>
-<code>(random-source-make-reals </code><I>s</I><code>)  ->  </code><I>rand</I><code></code><br>
-<code>(random-source-make-reals </code><I>s</I><code> </code><I>unit</I><code>)  ->  </code><I>rand</I><code></code><br>
-</DT>
-
-<DD>
-Obtains a procedure <I>rand</I> to generate random real numbers
-0 < <I>x</I> < 1 using the random source <I>s</I>.
-The procedure <I>rand</I> is called without arguments.<p>
-
-The optional parameter <I>unit</I> determines the type of numbers
-being produced by <I>rand</I> and the quantization of the output.
-<I>Unit</I> must be a number such that 0 < <I>unit</I> < 1.
-The numbers created by <I>rand</I> are of the same numerical
-type as <I>unit</I> and the potential output values are
-spaced by at most <I>unit</I>. One can imagine <I>rand</I>
-to create numbers as <I>x</I>*<I>unit</I> where <I>x</I>
-is a random integer in {1, ..., floor(1/<I>unit</I>)-1}.
-Note, however, that this need not be the way the values
-are actually created and that the actual resolution of
-<I>rand</I> can be much higher than <I>unit</I>.
-In case <I>unit</I> is absent it defaults to a reasonably
-small value (related to the width of the mantissa of an
-efficient number format).
-</DD>
-
-</DL>
-
-
-<H1>Design Rationale</H1>
-
-<H3>Why not combine <code>random-integer</code> and
-<code>random-real</code>?</H3>
-
-The two procedures are not combined into a single variable-arity 
-procedures to save a little time and space during execution.
-Although some Scheme systems can deal with variable arity as
-efficiently as with fixed arity this is not always the case
-and time efficiency is very important here.
-
-<H3>Why not some object-oriented interface?</H3>
-
-There are many alternatives to the interface as specified in this SRFI. 
-In particular, every framework for object-orientation can be used to
-define a class for random sources and specify the interface for the
-methods on random sources.
-However, as the object-oriented frameworks differ considerably
-in terms of syntax and functionality, this SRFI does not make
-use of any particular framework.
-
-<H3>Why is there not just a generator with a fixed range?</H3>
-
-A bare fixed-range generator is of very limited use.
-Nearly every application has to add some functionality 
-to make use of the random numbers.
-The most fundamental task in manipulating 
-random numbers is to change the range and quantization.
-This is exactly what is provided by 
-<code>random-integer</code> and <code>random-real</code>.
-In addition, is saves the user from the pitfall of changing
-the range with a simple <code>modulo</code>-computation
-which may substantially reduce the quality of the
-numbers being produced.<p>
-
-The design of the interface is based on three prototype applications:
-<OL>
-<LI>
-Repeatedly choose from relatively small sets:
-As the size of the set is likely to vary from call to call,
-<code>random-integer</code> accepts a range argument <I>n</I> in every call.
-The implementation should try to avoid boxing/unboxing of values
-if the ranges fit into immediate integers.
-<LI>
-Generate a few large integers with a fixed number of bits:
-As generating the random number itself is expensive, 
-passing the range argument in every call does not hurt performance.
-Hence, the same interface as in the first application can be used.
-<LI>
-Generate real numbers:
-Unlike the choose-from-set case, 
-the range and the quantization is constant over a 
-potentially very large number of calls.
-In addition, there are usually just a few distinct instances of
-quantization and number type, most likely corresponding to
-underlying <code>float</code> and <code>double</code> 
-representations.
-Therefore,
-<code>random-real</code> does not accept any parameters but
-the procedure <code>random-source-make-reals</code> creates
-a properly configured <code>random-real</code> procedure.
-</OL>
-
-<H3>Why bother about floating point numbers at all?</H3>
-
-A proper floating point implementation of a random number generator
-is potentially much more efficient that an integer implementation
-because it can use more powerful arithmetics hardware.
-If in addition the application needs floating point random numbers
-it would be an intolerable waste to run an integer generator to
-produce floating point random numbers.
-A secondary reason is to save the user from the 'not as easy as
-it seems' task of converting an integer generator into a real 
-generator.
-
-<H3>Why are zero and one excluded from <code>random-real</code>?</H3>
-
-The procedure <code>random-real</code> does not return 
-<I>x</I> = 0 or <I>x</I> = 1 in order to allow 
-<code>(log </code><I>x</I><code>)</code> and 
-<code>(log (- 1 </code><I>x</I>)<code>)</code>
-without the danger of a numerical exception.
-
-<H1>Implementation</H1>
-
-<H3>Choice of generator</H3>
-
-The most important decision about the implementation is 
-the choice of the random number generator.
-The basic principle here is: <em>Let quality prevail!</em>
-In the end, a performance penalty of a better generator may be 
-a cheap price to pay for some avoided catastrophes.
-It may be unexpected, but I have also seen many examples
-where the better generator was also the faster.
-Simple linear congruential generator cannot be recommended
-as they tend to be ill-behaved in several ways.<p>
-
-For this reason, my initial proposal was George Marsaglia's
-COMBO generator, which is the combination of a 32-bit 
-multiplicative lagged Fibonacci-generator with a 16-bit
-multiply with carry generator.
-The COMBO generator passes all tests of Marsaglia's
-<a href="http://stat.fsu.edu/~geo/diehard.html">DIEHARD</a>
-testsuite for random number generators and has
-a period of order 2^60.<p>
-
-As an improvement, Brad Lucier suggested
-<a href="http://srfi.schemers.org/srfi-27/mail-archive/msg00000.html">suggested</a>
-Pierre L'Ecuyer's
-<a href="http://www.iro.umontreal.ca/~lecuyer/myftp/papers/combmrg2.ps">MRG32k3a</a>
-generator which is combination of two recursive generators
-of degree three, both of which fit into 54-bit arithmetics.
-The MRG32k3a generator also passes DIEHARD and in addition,
-has desirable spectral properties and a period in the
-order of 2^191.
-As a matter of fact, multiple recursive generators (MRGs) are 
-theoretically much better understood than special constructions
-as the COMBO generator.
-This is the reason why the implementations provided here
-implements the MRG32k3a generator.
-When implemented in floating point arithmetics with sufficient
-mantissa-width, this generator is also very fast.<p>
-
-<H3>Choice of arithmetics</H3>
-
-The next important decision about the implementation is
-the type of arithmetics to be used.
-The choice is difficult and depends heavily on the
-underlying Scheme system and even on the underlying
-hardware platform and architecture.
-For the MRG32k3a generator, use 64-bit arithmetics if you 
-really have it. If not, use a floating point ALU if
-it gives you 54 or more bits of mantissa.
-And if you do not have floats either, then at least
-try to make sure you work with immediate integers
-(instead of allocated objects).
-Unfortunately, there is no portable way in Scheme to
-find out about native and emulated arithmetics.<p>
-
-As performance is critical to many applications, 
-one might want to implement the actual
-generator itself in native code.
-For this reason, I provide three different 
-implementations of the backbone generator 
-as a source of inspiration.
-See the code below.
-
-<H3>Data Type for Random Sources</H3>
-
-An important aspect of the specification in this SRFI
-is that random sources are objects of a distinct type.
-Although this is straight-forward and available in nearly
-every Scheme implementation, there is no portable way 
-to do this at present.
-One way to define the record type is to use 
-<a href="http://srfi.schemers.org/srfi-9/">SRFI-9</a>.<p>
-
-The reference implementations below define a record
-type to contain the exported procedures.
-The actual state of the generator is stored in the
-binding time environment of <code>make-random-source</code>.
-This has the advantage that access to the state is fast
-even if the record type would be slow (which need not be
-the case).
-
-<H3>Entropy Source for Randomization</H3>
-
-Another problematic part of the specification with respect
-to portability is <code>random-source-randomize!</code> as
-it needs access to a real entropy source.<p>
-
-A reasonable choice for such as source is to use the system
-clock in order to obtain a value for randomization, for example
-in the way John David Stone recommends (see reference below).
-This is good enough for most applications with the 
-notable exception of security related programs.
-One way to obtain the time in Scheme is to use 
-<a href="http://srfi.schemers.org/srfi-19/">SRFI-19</a>.<p>
-
-<H3>Implementation of the specified interface</H3>
-
-Once the portability issues are resolved, 
-one can provide the remaining functionality as 
-specified in this SRFI document.<p>
-
-For the reference implementation, a relatively large part
-of the code deals with the more advanced features of the 
-MRG32k3a generator, 
-in particular <code>random-source-pseudo-randomize!</code>.
-This code is inspired by Pierre L'Ecuyer's own implementation
-of the MRG32k3a generator.<p>
-
-Another part of this generic code deals with changing
-the range and quantization of the random numbers and
-with error checking to detect common mistakes and abuses.<p>
-
-<H3>Implementation Examples</H3>
-
-<a href="http://srfi.schemers.org/srfi-27/reference">Here</a> are three alternative implementations of the SRFI.
-(<a href="http://srfi.schemers.org/srfi-27/srfi-27-reference.tar.gz">Here</a> are all files, tar-gzipped, 13300 bytes.)
-Keep in mind that a SRFI is a "request for implementation",
-which means these implementations are merely examples
-to illustrate the specification and inspire people to implement 
-it better and faster. 
-The performance figures below are rough indications measured
-on a Pentium3, 800 Mhz, Linux; <i>x</i> int/s, <i>y</i> real/s
-means <code>(random-integer 2)</code> can be computed about <i>x</i>
-times a second and <code>(random-real)</code> about <i>y</i> times a second.
-The implementations are
-
-<OL type="a">
-
-<LI> for Scheme 48 0.57, using 54-bit <code>integer</code> only.
-This implementation aims at portability, not at performance
-(30000 ints/s, 3000/s reals/s).
-
-<LI> for Scheme 48 0.57 with the core generator being implemented 
-in C using <code>(double)</code>-arithmetics.
-The generator is made available in Scheme 48 via the
-<a href="http://s48.org/0.57/manual/s48manual_52.html">C/Scheme 
-interface</a>.
-The performance of this generator is good
-(160000 ints/s, 180000 reals/s).
-
-<LI> for Gambit 3.0, using <code>flonum</code> and 
-54-bit <code>integer</code>.
-This code is inspired by a program by Brad Lucier as 
-<a href="http://srfi.schemers.org/srfi-27/mail-archive/msg00000.html">posted</a>
-to the discussion archive of this SRFI.
-The performance of this generator is good when compiled
-(5000 ints/s, 25000/s reals/s when interpreted,
-200000 ints/s, 400000/s reals/s when compiled;
-see acknowledgements).
-
-</OL>
-
-In addition to the implementations there is a small
-collection of <a href="http://srfi.schemers.org/srfi-27/conftest.scm">confidence tests</a>
-for the interface specified.
-The tests merely check a few assertions expressed by the specification.
-It is not the intention to provide a complete test of the interface here.
-It is even less the intention to provide statistical tests of the
-generator itself.
-However, there is a function to write random bits from
-the generators to a file in a way readable by the <em>DIEHARD</em> 
-testsuite. This makes it easier for implementors to find out
-about their favorite generators and check their implementation.<p>
-
-
-
-<H1>Recommended Usage Patterns</H1>
-
-Unless the functionality defined in this SRFI is sufficient,
-an application has to implement more procedures to construct
-other random deviates.
-This section contains some recommendation 
-on how to do this technically by presenting
-examples of increasing difficulty 
-with respect to the interface.
-Note that the code below is not part of the specification,
-it is merely meant to illustrate the spirit
-
-<H3>Generating Random Permutations</H3>
-
-The following code defines procedures to generate random 
-permutations of the set {0, ..., <I>n</I>-1}.
-Such a permutation is represented by a <code>vector</code> 
-of length <I>n</I> for the images of the points.<p>
-
-Observe that the implementation first defines the procedure 
-<code>random-source-make-permutations</code> to
-turn a random source <I>s</I> into a procedure to generate
-permutations of given degree <I>n</I>.
-In a second step, this is applied to the default source
-to define a ready-to-use procedure for permutations:
-<code>(random-permutation </code><I>n</I><code>)</code>
-constructs a random permutation of degree <I>n</I>.
-
-<code><pre>
-(define (random-source-make-permutations s)
-  (let ((rand (random-source-make-integers s)))
-    (lambda (n)
-      (let ((x (make-vector n 0)))
-	(do ((i 0 (+ i 1)))
-	    ((= i n))
-	  (vector-set! x i i))
-	(do ((k n (- k 1)))
-	    ((= k 1) x)
-	  (let* ((i (- k 1))
-		 (j (rand k))
-		 (xi (vector-ref x i))
-		 (xj (vector-ref x j)))
-	    (vector-set! x i xj)
-	    (vector-set! x j xi)))))))
-
-(define random-permutation
-  (random-source-make-permutations default-random-source))
-</pre></code>
-
-For the algorithm refer to Knuth's "The Art of Computer Programming",
-Vol. II, 2nd ed., Algorithm P of Section 3.4.2.
-
-<H3>Generating Exponentially-Distributed Random Numbers</H3>
-
-The following code defines procedures to generate exponentially
-Exp(mu)-distributed random numbers.
-The technical difficulty of the interface addressed here is
-how to pass optional arguments to <code>random-source-make-reals</code>.
-
-<code><pre>
-(define (random-source-make-exponentials s . unit)
-  (let ((rand (apply random-source-make-reals s unit)))
-    (lambda (mu)
-      (- (* mu (log (rand)))))))
-
-(define random-exponential
-  (random-source-make-exponentials default-random-source))
-</pre></code>
-
-The algorithm is folklore. Refer to Knuth's "The Art of Computer 
-Programming", Vol. II, 2nd ed., Section 3.4.1.D.
-
-<H3>Generating Normally-Distributed Random Numbers</H3>
-
-The following code defines procedures to generate 
-normal N(mu, sigma)-distributed real numbers using 
-the polar method.<p>
-
-The technical difficulty of the interface addressed here
-is that the polar method generates two results per computation.
-We return one of the result and store the second one to be 
-returned by the next call to the procedure.
-Note that this implies that <code>random-source-state-set!</code>
-(and the other procedures modifying the state) does not necessarily
-affect the output of <code>random-normal</code> immediately!
-
-<code><pre>
-(define (random-source-make-normals s . unit)
-  (let ((rand (apply random-source-make-reals s unit))
-	(next #f))
-    (lambda (mu sigma)
-      (if next
-	  (let ((result next))
-	    (set! next #f)
-	    (+ mu (* sigma result)))
-	  (let loop ()
-	    (let* ((v1 (- (* 2 (rand)) 1))
-		   (v2 (- (* 2 (rand)) 1))
-		   (s (+ (* v1 v1) (* v2 v2))))
-	      (if (>= s 1)
-		  (loop)
-		  (let ((scale (sqrt (/ (* -2 (log s)) s))))
-		    (set! next (* scale v2))
-		    (+ mu (* sigma scale v1))))))))))
-
-(define random-normal
-  (random-source-make-normals default-random-source))
-</pre></code>
-
-For the algorithm refer to Knuth's "The Art of Computer Programming",
-Vol. II, 2nd ed., Algorithm P of Section 3.4.1.C.
-
-<H1>Acknowledgements</H1>
-
-I would like to thank all people who have participated in the discussion,
-in particular Brad Lucier and Pierre l'Ecuyer.
-Their contributions have greatly improved the design of this SRFI.
-Moreover, Brad has optimized the Gambit implementation quite substantially.
-
-<H1>References</H1>
-
-<OL>
-
-<LI>
-       G. Marsaglia: 
-       Diehard -- Testsuite for Random Number Generators. 
-       <a href="http://stat.fsu.edu/~geo/diehard.html">stat.fsu.edu/~geo/diehard.html</a>
-       (Also contains some generators that do pass Diehard.)
-</LI>
-
-<LI>
-       D. E. Knuth:
-       The Art of Computer Programming;
-       Volume II Seminumerical Algorithms.
-       2nd ed. Addison-Wesley, 1981.
-       (The famous chapter on random number generators.)
-</LI>
-
-<LI>
-       P. L'Ecuyer:
-       "Software for Uniform Random Number Generation:
-       Distinguishing the Good and the Bad",
-       Proceedings of the 2001 Winter Simulation Conference, 
-       IEEE Press, Dec. 2001, 95--105.
-       <a href="http://www.iro.umontreal.ca/~lecuyer/myftp/papers/wsc01rng.pdf">www.iro.umontreal.ca/~lecuyer/myftp/papers/wsc01rng.pdf</a>
-       (Profound discussion of random number generators.)
-</LI>
-
-<LI>
-       P. L'Ecuyer:
-       "Good Parameter Sets for Combined Multiple Recursive
-       Random Number Generators", 
-       Shorter version in Operations Research, 47, 1 (1999), 159--164.
-       <a href="http://www.iro.umontreal.ca/~lecuyer/myftp/papers/combmrg2.ps">www.iro.umontreal.ca/~lecuyer/myftp/papers/combmrg2.ps</a>
-       (Actual numbers for good generators.)
-</LI>
-
-<LI>
-       P. L'Ecuyer:
-       "Software for Uniform Random Number Generation:
-       Distinguishing the Good and the Bad",
-       Proceedings of the 2001 Winter Simulation Conference, 
-       IEEE Press, Dec. 2001, 95--105.
-</LI>
-
-<LI>
-       MIT Scheme v7.6:
-         <code>random flo:random-unit *random-state* make-random-state 
-         random-state?</code>
-       <a href="http://www.swiss.ai.mit.edu/projects/scheme/documentation/scheme_5.html#SEC53">http://www.swiss.ai.mit.edu/projects/scheme/documentation/scheme_5.html#SEC53</a>
-       (A mechanism to run a fixed unspecified generator.)
-</LI>
-
-<LI>
-       A. Jaffer: 
-       SLIB 2d2 with (require 'random):
-         <code>random *random-state* copy-random-state seed->random-state
-         make-random-state random:uniform random:exp random:normal-vector!
-         random-hollow-sphere! random:solid-sphere!</code>
-       <a href="http://www.swiss.ai.mit.edu/~jaffer/slib_4.html#SEC92">http://www.swiss.ai.mit.edu/~jaffer/slib_4.html#SEC92</a>
-       (Based on the MIT Scheme mechanism.)
-</LI>
-
-<LI>
-       R. Kelsey, J. Rees:
-       Scheme 48 v0.57 'random.scm': 
-         <code>make-random make-random-vector</code>
-       (Internal procedures of Scheme48; a fixed 28-bit generator.)
-</LI>
-
-<LI>
-       M. Flatt: 
-       PLT MzScheme Version 200alpha1:
-         <code>random random-seed current-pseudo-random-generator 
-         make-pseudo-random-generator pseudo-random-generator?</code>
-       <a href="http://download.plt-scheme.org/doc/200alpha1/html/mzscheme/mzscheme-Z-H-3.html#%_idx_144">http://download.plt-scheme.org/doc/200alpha1/html/mzscheme/mzscheme-Z-H-3.html#%_idx_144</a>
-       (A mechanism to run a generator and to exchange the generator.)
-</LI>
-
-<LI>
-       H. Abelson, G. J. Sussmann, J. Sussman:
-       Structure and Interpretation of Computer Programs.
-       <a href="http://mitpress.mit.edu/sicp/full-text/book/book-Z-H-20.html#%_idx_2934">http://mitpress.mit.edu/sicp/full-text/book/book-Z-H-20.html#%_idx_2934</a>
-       (The <code>rand</code>-example shows a textbook way to define a 
-       random number generator.)
-</LI>
-
-<LI>
-       John David Stone:
-       A portable random-number generator.
-       <a href="http://www.math.grin.edu/~stone/events/scheme-workshop/random.html">http://www.math.grin.edu/~stone/events/scheme-workshop/random.html</a>
-       (An implementation of a linear congruental generator in Scheme.)
-</LI>
-
-<LI>
-       Network Working Group:
-       RFC1750: Randomness Recommendations for Security.
-       <a href="http://www.cis.ohio-state.edu/htbin/rfc/rfc1750.html">http://www.cis.ohio-state.edu/htbin/rfc/rfc1750.html</a>
-       (A serious discussion of serious randomness for serious security.)
-</LI>
-
-<LI>
-       <a href="http://www.random.org/essay.html">http://www.random.org/essay.html</a><br>
-       <a href="http://www.taygeta.com/random/randrefs.html">http://www.taygeta.com/random/randrefs.html</a>
-       (Resources on random number generators and randomness.)
-</LI>
-
-</OL>
-
-
-<H1>Copyright</H1>
-<p>Copyright (C) Sebastian Egner (2002). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-    <address>Author: <a href="mailto:sebastian.egner@philips.com">Sebastian Egner</a></address>
-<!-- Created: Mon Feb 4 18:17 EST 2002 -->
-<!-- hhmts start -->
-Last modified: Fri Sep  5 16:11:17 MST 2003
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-28.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-28.html
deleted file mode 100644
index 8aae23b3ce..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-28.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <title>SRFI 28: Basic Format Strings</title>
-    <meta name="author" content="Scott G. Miller">
-    <meta name="description" content="Basic Format Strings">
-  </head>
-
-  <body>
-
-    <H1>Title</H1>
-
-    SRFI 28: Basic Format Strings 
-
-    <H1>Author</H1>
-
-    Scott G. Miller 
-
-    <H1>Status</H1>
-
-    This SRFI is currently in ``final'' status. To see an explanation of each status that a SRFI can hold, see <a href="http://srfi.schemers.org/srfi-process.html">here</a>.
-
-    You can access the discussion on this SRFI via <a href="http://srfi.schemers.org/srfi-28/mail-archive/maillist.html">the archive of the mailing list</a>.
-
-    <ul>
-      <li>Draft: 2002/03/23-2002/05/23</li>
-      <li>Final: 2002/06/25
-    </ul>
-
-    <H1>Abstract</H1>
-
-    This document specifies Format Strings, a method of
-    interpreting a Scheme string which contains a number of escape
-    sequences that are replaced with other string data according to
-    the semantics of each sequence. 
-
-    <H1>Rationale</H1>
-
-    Many Scheme systems provide access to a function called <tt>
-    format.</tt> This function takes as arguments a format string,
-    an ordinary Scheme string containing zero or more escape
-    sequences, followed zero or more Scheme values. The procedure
-    processes the format string and performs string replacement on
-    the escape sequences according to the rules for each code. This
-    SRFI defines a basic version of <tt>format</tt> which should
-    allow portable code to be written using the function without
-    much (if any) effort on the part of Scheme implementors. 
-
-    <H1>Specification</H1>
-
-    <b><a name="format"></a><tt>format</tt></b> <tt><i>format-string [obj ...] -&gt;
-    string</i></tt> 
-
-    <blockquote>
-      <p>Accepts a message template (a Scheme String), and
-      processes it, replacing any escape sequences in order with
-      one or more characters, the characters themselves dependent
-      on the semantics of the escape sequence encountered.</p>
-
-      <p>An escape sequence is a two character sequence in the
-      string where the first character is a tilde '~'. Each escape
-      code's meaning is as follows:</p>
-
-      <ul>
-        <li><tt>~a</tt> The corresponding value is inserted into
-        the string as if printed with <tt>display</tt>.</li>
-
-        <li><tt>~s</tt> The corresponding value is inserted into
-        the string as if printed with <tt>write</tt>.</li>
-
-        <li><tt>~%</tt> A newline is inserted.</li>
-
-        <li><tt>~~</tt> A tilde '~' is inserted.</li>
-      </ul>
-
-      <p><tt>~a</tt> and <tt>~s</tt>, when encountered, require a
-      corresponding Scheme value to be present after the format
-      string. The values provided as operands are used by the
-      escape sequences in order. It is an error if fewer values are
-      provided than escape sequences that require them.</p>
-
-      <p><tt>~%</tt> and <tt>~~</tt> require no corresponding
-      value.</p>
-    </blockquote>
-
-    <h2>Examples</h2>
-<pre>
-(format "Hello, ~a" "World!")
-; =&gt; "Hello, World!"
-
-(format "Error, list is too short: ~s~%" '(one "two" 3))
-; =&gt; "Error, list is too short: (one \"two\" 3))"
-</pre>
-
-    <H1>Implementation</H1>
-
-    The implementation below requires SRFI-6 (Basic string ports)
-    and SRFI-23 (Error reporting mechanism). <br>
-     
-<pre>
-(define format
-  (lambda (format-string . objects)
-    (let ((buffer (open-output-string)))
-      (let loop ((format-list (string-&gt;list format-string))
-                 (objects objects))
-        (cond ((null? format-list) (get-output-string buffer))
-              ((char=? (car format-list) #\~)
-               (if (null? (cdr format-list))
-                   (error 'format "Incomplete escape sequence")
-                   (case (cadr format-list)
-                     ((#\a)
-                      (if (null? objects)
-                          (error 'format "No value for escape sequence")
-                          (begin
-                            (display (car objects) buffer)
-                            (loop (cddr format-list) (cdr objects)))))
-	             ((#\s)
-                      (if (null? objects)
-                          (error 'format "No value for escape sequence")
-                          (begin
-                            (write (car objects) buffer)
-                            (loop (cddr format-list) (cdr objects)))))
-                     ((#\%)
-                      (newline buffer)
-                      (loop (cddr format-list) objects))
-                     ((#\~)
-                      (write-char #\~ buffer)
-                      (loop (cddr format-list) objects))
-                     (else
-                      (error 'format "Unrecognized escape sequence")))))
-              (else (write-char (car format-list) buffer)
-                    (loop (cdr format-list) objects)))))))
-    
-</pre>
-
-    <H1>Copyright</H1>
-
-    <p>Copyright (C) Scott G. Miller (2002). All Rights Reserved.</p>
-
-    <p>
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-    </p>
-    <p>
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-    </p>
-    <p>
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-    </p>
-    <hr>
-
-    <address>
-      Editor: <a href="mailto:srfi-editors@srfi.schemers.org">
-      Francisco Solsona</a>
-    </address>
-
-    <address>
-      Author: <a href="mailto:scgmille@freenetproject.org">Scott G.
-      Miller</a>
-    </address>
-    <!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-    <!-- Revised: Friday, March 22, 2002  19:20 PST  -->
-    <!-- hhmts start -->Last modified: Mon Apr 8 06:54:37 CDT 2002 
-    <!-- hhmts end -->
-  </body>
-</html>
-
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-29.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-29.html
deleted file mode 100644
index 93604a4eef..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-29.html
+++ /dev/null
@@ -1,507 +0,0 @@
-<!DOCTYPE html PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <title>SRFI 29: Localization</title>
-    <meta name="author" content="Scott G. Miller">
-    <meta name="description" content="Localization">
-  </head>
-  <body>
-    <H1>Title</H1>
-
-    SRFI 29: Localization 
-
-    <H1>Author</H1>
-
-    Scott G. Miller 
-
-    <H1>Abstract</H1>
-
-    This document specifies an interface to retrieving and
-    displaying locale sensitive messages. A Scheme program can
-    register one or more translations of templated messages, and
-    then write Scheme code that can transparently retrieve the
-    appropriate message for the locale under which the Scheme
-    system is running. <br>
-     
-
-    <H1>Rationale</H1>
-
-    <p>As any programmer that has ever had to deal with making his
-    or her code readable in more than one locale, the process of
-    sufficiently abstracting program messages from their
-    presentation to the user is non-trivial without help from the
-    programming language. Most modern programming language
-    libraries do provide some mechanism for performing this
-    separation.</p>
-
-    <p>A portable API that allows a piece of code to run without
-    modification in different countries and under different
-    languages is a must for any non-trivial software project.
-    &nbsp;The interface should separate the logic of a program from
-    the myriad of translations that may be necessary.</p>
-
-    <p>The interface described in this document provides such
-    functionality. The underlying implementation is also allowed to
-    use whatever datastructures it likes to provide access to the
-    translations in the most efficient manner possible. &nbsp;In
-    addition, the implementation is provided with standardized
-    functions that programs will use for accessing an external,
-    unspecified repository of translations.</p>
-
-    <p>This interface <i>does not</i> cover all aspects of
-    localization, including support for non-latin characters,
-    number and date formatting, etc. Such functionality is the
-    scope of a future SRFI that may extend this one.</p>
-
-    <H1>Dependencies</H1>
-
-    An SRFI-29 conformant implementation must also implement
-    SRFI-28, Basic Format Strings. Message templates are strings
-    that must be processed by the <tt>format</tt> function
-    specified in that SRFI. 
-
-    <H1>Specification</H1>
-
-    <h3>Message Bundles</h3>
-
-    <p>A Message Bundle is a set of message templates and their
-    identifying keys. Each bundle contains one or more such
-    key/value pairs. The bundle itself is associated with a
-    <i>bundle specifier</i> which uniquely identifies the
-    bundle.</p>
-
-    <h3>Bundle Specifiers</h3>
-
-    <p>A Bundle Specifier is a Scheme list that describes, in order
-    of importance, the package and locale of a message bundle.
-    &nbsp;In most cases, a locale specifier will have between one
-    and three elements. The first element is a symbol denoting the
-    package for which this bundle applies. The second and third
-    elements denote a <i>locale</i>. The second element (first
-    element of the locale) if present, is the two letter, ISO 639-1
-    language code for the bundle. The third element, if present, is
-    a two letter ISO 3166-1 country code. &nbsp;In some cases, a
-    fourth element may be present, specifying the encoding used for
-    the bundle. &nbsp;All bundle specifier elements are Scheme
-    symbols.</p>
-
-    <p>If only one translation is provided, it should be designated
-    only by a package name, for example <tt>(mathlib)</tt>. This
-    translation is called the <i>default</i> translation.</p>
-
-    <h3>Bundle Searching</h3>
-
-    <p>When a message template is retrieved from a bundle, the
-    Scheme implementation will provide the locale under which the
-    system is currently running. When the template is retrieved,
-    the package name will be specified. The Scheme system should
-    construct a Bundle Specifier from the provided package name and
-    the active locale. For example, when retrieving a message
-    template for French Canadian, in the <tt>mathlib</tt> package,
-    the bundle specifier '<tt>(mathlib fr ca)</tt>' is used. A
-    program may also retrieve the elements of the current locale
-    using the no-argument procedures:</p>
-
-    <p><b><a name="current-language"></a><tt>current-language</tt></b> <tt>-&gt;
-    <i>symbol</i></tt><br>
-     <tt><b>current-language</b> <i>symbol</i> -&gt;
-    undefined</tt><br>
-    </p>
-
-    <blockquote>
-      When given no arguments, returns the current ISO 639-1
-      language code as a symbol. &nbsp;If provided with an
-      argument, the current language is set to that named by the
-      symbol for the currently executing Scheme thread (or for the
-      entire Scheme system if such a distinction is not possible).
-      &nbsp;
-    </blockquote>
-
-    <p><b><a name="current-country"></a><tt>current-country</tt></b> <tt>-&gt;
-    <i>symbol</i></tt><br>
-     <tt><b>current-country</b> <i>symbol</i> -&gt;
-    undefined</tt><br>
-    </p>
-
-    <blockquote>
-      returns the current ISO 3166-1 country code as a symbol.
-      &nbsp;If provided with an argument, the current country is
-      set to that named by the symbol for the currently executing
-      Scheme thread (or for the entire Scheme system if such a
-      distinction is not possible). &nbsp;&nbsp;
-    </blockquote>
-
-    <p><b><a name="current-locale-details"></a><tt>current-locale-details</tt></b> <tt>-&gt; <i>list of
-    symbol</i></tt>s<br>
-     <tt><b>current-locale-details</b> <i>list-of-symbols</i> -&gt;
-    undefined</tt><br>
-    </p>
-
-    <blockquote>
-      Returns a list of additional locale details as a list of
-      symbols. &nbsp;This list may contain information about
-      encodings or other more specific information. &nbsp;If
-      provided with an argument, the current locale details are set
-      to those given in the currently executing Scheme thread (or
-      for the entire Scheme system if such a distinction is not
-      possible).&nbsp;
-    </blockquote>
-
-    <p>The Scheme System should first check for a bundle with the
-    exact name provided. If no such bundle is found, the last
-    element from the list is removed and a search is tried for a
-    bundle with that name. If no bundle is then found, the list is
-    shortened by removing the last element again. If no message is
-    found and the bundle specifier is now the empty list, an error
-    should be raised.</p>
-
-    <p>The reason for this search order is to provide the most
-    locale sensitive template possible, but to fall back on more
-    general templates if a translation has not yet been provided
-    for the given locale.</p>
-
-    <h3>Message Templates</h3>
-
-    <p>A message template is a localized message that may or may
-    not contain one of a number of formatting codes. A message
-    template is a Scheme string. The string is of a form that can
-    be processed by the <tt>format</tt> procedure found in many
-    Scheme systems and formally specified in SRFI-28 (Basic Format
-    Strings).</p>
-
-    <p>This SRFI also extends SRFI-28 to provide an additional
-    <tt>format</tt> escape code:</p>
-
-    <blockquote>
-      <tt>~[n]@*</tt> - Causes a value-requiring escape code that
-      follows this code immediately to reference the [N]'th
-      optional value absolutely, rather than the next unconsumed
-      value. The referenced value is <i>not</i> consumed.
-    </blockquote>
-    This extension allows optional values to be positionally
-    referenced, so that message templates can be constructed that
-    can produce the proper word ordering for a language. 
-
-    <h3>Preparing Bundles</h3>
-    Before a bundle may be used by the Scheme system to retrieve
-    localized template messages, they must be made available to the
-    Scheme system. &nbsp;This SRFI specifies a way to portably
-    define the bundles, as well as store them in and retrieve them
-    from an unspecified system which may be provided by resources
-    outside the Scheme system.<br>
-     
-
-    <p><b><a name="declare-bundle!"></a><tt>declare-bundle!</tt></b> <tt><i>bundle-specifier
-    association-list</i> -&gt; undefined<br>
-    </tt></p>
-
-    <blockquote>
-      Declares a new bundle named by the given bundle-specifier.
-      &nbsp;The contents of the bundle are defined by the provided
-      association list. &nbsp;The list contains associations
-      between Scheme symbols and the message templates (Scheme
-      strings) they name. &nbsp;If a bundle already exists with the
-      given name, it is overwritten with the newly declared
-      bundle.<br>
-    </blockquote>
-    <tt><a name="store-bundle"></a><b>store-bundle</b> <i>bundle-specifier</i> -&gt;
-    boolean</tt><br>
-     
-
-    <blockquote>
-      Attempts to store a bundle named by the given bundle
-      specifier, and previously made available using
-      <tt>declare-bundle!</tt> or <tt>load-bundle!</tt>, in an
-      unspecified mechanism that may be persistent across Scheme
-      system restarts. &nbsp;If successful, a non-false value is
-      returned. &nbsp;If unsuccessful, <tt>#f</tt> is returned.<br>
-    </blockquote>
-    <tt><a name="load-bundle!"></a><b>load-bundle!</b> <i>bundle-specifier</i> -&gt;
-    boolean</tt><br>
-     
-
-    <blockquote>
-      Attempts to retrieve a bundle from an unspecified mechanism
-      which stores bundles outside the Scheme system. &nbsp;If the
-      bundle was retrieved successfully, the function returns a
-      non-false value, and the bundle is immediately available to
-      the Scheme system. If the bundle could not be found or loaded
-      successfully, the function returns <tt>#f</tt>, and the
-      Scheme system's bundle registry remains unaffected.<br>
-    </blockquote>
-    A compliant Scheme system may choose not to provide any
-    external mechanism to store localized bundles. &nbsp;If it does
-    not, it must still provide implementations for
-    <tt>store-bundle</tt> and <tt>load-bundle!</tt>. In such a
-    case, both functions must return <tt>#f</tt> regardless of the
-    arguments given. Users of this SRFI should recognize that the
-    inability to load or store a localized bundle in an external
-    repository is <i>not</i> a fatal error.<br>
-     
-
-    <h3>Retrieving Localized Message Templates</h3>
-
-    <p><a name="localized-template"></a><b><tt>localized-template</tt></b> <i><tt>package-name
-    message-template-name</tt></i> <tt>-&gt; <i>string or #f<br>
-    </i></tt></p>
-
-    <blockquote>
-      Retrieves a localized message template for the given package
-      name and the given message template name (both symbols).
-      &nbsp;If no such message could be found, false (#f) is
-      returned.<br>
-      <br>
-    </blockquote>
-    After retrieving a template, the calling program can use
-    <tt>format</tt> to produce a string that can be displayed to
-    the user.<br>
-     
-
-    <h2>Examples</h2>
-    The below example makes use of SRFI-29 to display simple,
-    localized messages. &nbsp;It also defines its bundles in such a
-    way that the Scheme system may store and retrieve the bundles
-    from a more efficient system catalog, if available.<br>
-     
-<pre>
-(let ((translations
-       '(((en) . ((time . "Its ~a, ~a.")
-                (goodbye . "Goodbye, ~a.")))
-         ((fr) . ((time . "~1@*~a, c'est ~a.")
-                (goodbye . "Au revoir, ~a."))))))
-  (for-each (lambda (translation)
-              (let ((bundle-name (cons 'hello-program (car translation))))
-                (if (not (load-bundle! bundle-name))
-                    (begin
-                     (declare-bundle! bundle-name (cdr translation))
-                     (store-bundle! bundle-name)))))
-             translations))
-
-(define localized-message
-  (lambda (message-name . args)
-    (apply format (cons (localized-template 'hello-program
-                                            message-name)
-                        args))))
-
-(let ((myname "Fred"))
-  (display (localized-message 'time "12:00" myname))
-  (display #\newline)
-
-  (display (localized-message 'goodbye myname))
-  (display #\newline))
-
-;; Displays (English):
-;; Its 12:00, Fred.
-;; Goodbye, Fred.
-;;
-;; French:
-;; Fred, c'est 12:00.
-;; Au revoir, Fred.
-</pre>
-
-    <H1>Implementation</H1>
-
-    <p>The implementation requires that the Scheme system provide a
-    definition for <tt>current-language</tt> and
-    <tt>current-country</tt> capable of distinguishing the correct
-    locale present during a Scheme session. The definitions of
-    those functions in the reference implementation are not capable
-    of that distinction. Their implementation is provided only so
-    that the following code can run in any R4RS scheme system.
-    &nbsp;<br>
-    </p>
-
-    <p>In addition, the below implementation of a compliant
-    <tt>format</tt> requires SRFI-6 (Basic String Ports) and
-    SRFI-23 (Error reporting)</p>
-<pre>
-;; The association list in which bundles will be stored
-(define *localization-bundles* '())
-
-;; The current-language and current-country functions provided
-;; here must be rewritten for each Scheme system to default to the
-;; actual locale of the session
-(define current-language
-  (let ((current-language-value 'en))
-    (lambda args
-      (if (null? args)
-          current-language-value
-          (set! current-language-value (car args))))))
-
-(define current-country
-  (let ((current-country-value 'us))
-    (lambda args
-      (if (null? args)
-          current-country-value
-          (set! current-country-value (car args))))))
-
-;; The load-bundle! and store-bundle! both return #f in this
-;; reference implementation.  A compliant implementation need
-;; not rewrite these procedures.
-(define load-bundle!
-  (lambda (bundle-specifier)
-    #f))
-
-(define store-bundle!
-  (lambda (bundle-specifier)
-    #f))
-
-;; Declare a bundle of templates with a given bundle specifier
-(define declare-bundle!
-  (letrec ((remove-old-bundle
-            (lambda (specifier bundle)
-              (cond ((null? bundle) '())
-                    ((equal? (caar bundle) specifier)
-                     (cdr bundle))
-                    (else (cons (car bundle)
-                                (remove-old-bundle specifier
-                                                   (cdr bundle))))))))
-    (lambda (bundle-specifier bundle-assoc-list)
-      (set! *localization-bundles*
-            (cons (cons bundle-specifier bundle-assoc-list)
-                  (remove-old-bundle bundle-specifier
-                                     *localization-bundles*))))))
-
-;;Retrieve a localized template given its package name and a template name
-(define localized-template
-  (letrec ((rdc
-            (lambda (ls)
-              (if (null? (cdr ls))
-                  '()
-                  (cons (car ls) (rdc (cdr ls))))))
-           (find-bundle
-            (lambda (specifier template-name)
-              (cond ((assoc specifier *localization-bundles*) =&gt;
-                     (lambda (bundle) bundle))
-                    ((null? specifier) #f)
-                    (else (find-bundle (rdc specifier)
-                                       template-name))))))
-    (lambda (package-name template-name)
-      (let loop ((specifier (cons package-name
-                                  (list (current-language)
-                                        (current-country)))))
-        (and (not (null? specifier))
-             (let ((bundle (find-bundle specifier template-name)))
-               (and bundle
-                    (cond ((assq template-name bundle) =&gt; cdr)
-                          ((null? (cdr specifier)) #f)
-                          (else (loop (rdc specifier)))))))))))
-
-;;An SRFI-28 and SRFI-29 compliant version of format.  It requires
-;;SRFI-23 for error reporting.
-(define format
-  (lambda (format-string . objects)
-    (let ((buffer (open-output-string)))
-      (let loop ((format-list (string-&gt;list format-string))
-                 (objects objects)
-                 (object-override #f))
-        (cond ((null? format-list) (get-output-string buffer))
-              ((char=? (car format-list) #\~)
-               (cond ((null? (cdr format-list))
-                      (error 'format "Incomplete escape sequence"))
-                     ((char-numeric? (cadr format-list))
-                      (let posloop ((fl (cddr format-list))
-                                    (pos (string-&gt;number
-                                          (string (cadr format-list)))))
-                        (cond ((null? fl)
-                               (error 'format "Incomplete escape sequence"))
-                              ((and (eq? (car fl) '#\@)
-                                    (null? (cdr fl)))
-                                    (error 'format "Incomplete escape sequence"))
-                              ((and (eq? (car fl) '#\@)
-                                    (eq? (cadr fl) '#\*))
-                               (loop (cddr fl) objects (list-ref objects pos)))
-                              (else
-                                (posloop (cdr fl)
-                                         (+ (* 10 pos)
-                                            (string-&gt;number
-                                             (string (car fl)))))))))
-                     (else
-                       (case (cadr format-list)
-                         ((#\a)
-                          (cond (object-override
-                                 (begin
-                                   (display object-override buffer)
-                                   (loop (cddr format-list) objects #f)))
-                                ((null? objects)
-                                 (error 'format "No value for escape sequence"))
-                                (else
-                                  (begin
-                                    (display (car objects) buffer)
-                                    (loop (cddr format-list)
-                                          (cdr objects) #f)))))
-                         ((#\s)
-                          (cond (object-override
-                                 (begin
-                                   (display object-override buffer)
-                                   (loop (cddr format-list) objects #f)))
-                                ((null? objects)
-                                 (error 'format "No value for escape sequence"))
-                                (else
-                                  (begin
-                                    (write (car objects) buffer)
-                                    (loop (cddr format-list)
-                                          (cdr objects) #f)))))
-                         ((#\%)
-                          (if object-override
-                              (error 'format "Escape sequence following positional override does not require a value"))
-                          (display #\newline buffer)
-                          (loop (cddr format-list) objects #f))
-                        ((#\~)
-                          (if object-override
-                              (error 'format "Escape sequence following positional override does not require a value"))
-                          (display #\~ buffer)
-                          (loop (cddr format-list) objects #f))
-                         (else
-                           (error 'format "Unrecognized escape sequence"))))))
-              (else (display (car format-list) buffer)
-                    (loop (cdr format-list) objects #f)))))))
-
-</pre>
-
-    <H1>Copyright</H1>
-
-    Copyright (C) Scott G. Miller (2002). All Rights Reserved. 
-
-    <p>This document and translations of it may be copied and
-    furnished to others, and derivative works that comment on or
-    otherwise explain it or assist in its implementation may be
-    prepared, copied, published and distributed, in whole or in
-    part, without restriction of any kind, provided that the above
-    copyright notice and this paragraph are included on all such
-    copies and derivative works. However, this document itself may
-    not be modified in any way, such as by removing the copyright
-    notice or references to the Scheme Request For Implementation
-    process or editors, except as needed for the purpose of
-    developing SRFIs in which case the procedures for copyrights
-    defined in the SRFI process must be followed, or as required to
-    translate it into languages other than English.</p>
-
-    <p>The limited permissions granted above are perpetual and will
-    not be revoked by the authors or their successors or
-    assigns.</p>
-
-    <p>This document and the information contained herein is
-    provided on an "AS IS" basis and THE AUTHOR AND THE SRFI
-    EDITORS DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
-    BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
-    HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES
-    OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.</p>
-    <hr>
-
-    <address>
-      Editor: <a href="mailto:srfi-editors@srfi.schemers.org">David
-      Rush</a>
-    </address>
-
-    <address>
-      Author: <a href="mailto:scgmille@freenetproject.org">Scott G.
-      Miller</a>
-    </address>
-    <!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-    <!-- hhmts start -->Last modified: Mon Jun 17 12:00:08 Pacific
-    Daylight Time 2002 <!-- hhmts end --> <br>
-  </body>
-</html>
-
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-30.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-30.html
deleted file mode 100644
index b6c2fdcd05..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-30.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <title>SRFI 30: Nested Multi-line Comments</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 30: Nested Multi-line Comments
-
-<H1>Author</H1>
-
-Martin Gasbichler
-    
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status. To see an explanation of
-each status that a SRFI can hold, see <a
-href="http://srfi.schemers.org/srfi-process.html">here</a>.  It will
-remain in draft until 2002-04-06, or as amended.  to provide input on
-this SRFI, please
-<a href="mailto:srfi-30@srfi.schemers.org">
-mail to <code>srfi-30@srfi.schemers.org</code></a>.
-See <a href="http://srfi.schemers.org/srfi-list-subscribe.html">
-instructions here</a> to subscribe to the list.  You can access
-previous messages via
-<a href="http://srfi.schemers.org/srfi-30/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-You can access
-post-finalization messages via
-<a href="http://srfi.schemers.org/srfi-30/post-mail-archive/maillist.html">
-the archive of the mailing list</a>.
-
-<UL>
-      <LI>Draft: 2002/04/12-2002/06/10</LI>
-      <li>Revised: 2002/06/05</li>
-      <li>Final: 2002/08/07</li>
-</UL>
-
-    <h1>Related SRFIs</h1>
-    
-    <p><a href="http://srfi.schemers.org/srfi-22/">SRFI 22</a> defines
-    a multi line comment that may only appear at the beginning of a
-    file.</p>
-
-    <p><a href="http://srfi.schemers.org/srfi-10/">SRFI 10</a>
-    proposes the notation
-
-    <PRE> "#" &lt;discriminator&gt; &lt;other-char&gt;*</PRE> for further
-    SRFIs that introduce values which may be read and written.</p>
-
-    <H1>Abstract</H1>
-
-    <p>This SRFI extends R5RS by possibly nested, multi-line
-    comments. Multi-line comments start with <code>#|</code> and end
-    with <code>|#</code>.</p>
-    
-    <H1>Rationale</H1>
-    
-    <p>Multi-line comments are common to many programming languages. They
-    provide a convenient mean for adding blocks of text inside a program and
-    support development by fading out incomplete code or alternative
-    implementations.</p>
-    
-    <p>The syntax <code>#|</code> ... <code>|#</code> was chosen
-    because it is already widely used (Chez Scheme, Chicken, Gambit-C,
-    Kawa, MIT Scheme, MzScheme and RScheme) and since it fits smoothly
-    with R5RS. Nested comments are an important feature for
-    incrementally commenting out code.</p>
-    
-    <H1>Specification</H1>
-
-    <p>This SRFI extends the specification of comments -- <a
-    href="http://www.schemers.org/Documents/Standards/R5RS/HTML/r5rs-Z-H-5.html#%_sec_2.2">R5RS
-    section 2.2</a> -- as follows:</p>
-
-    <a name="spec"></a>
-    <p>The sequence <code>#|</code> indicates the start of a
-    multi-line comment. The multi-line comment continues until
-    <code>|#</code> appears. If the closing <code>|#</code> is
-    omitted, an error is signaled. Multi-line comments are visible to
-    Scheme as a single whitespace. Multi-line comments may be nested:
-    Every <code>#|</code> within the comment starts a new multi-line
-    comment, which has to be terminated by a matching
-    <code>|#</code>.</p>
-    
-    <p>This SRFI furthermore extends the production for
-    <code>&lt;comment&gt;</code> in the specification of lexical
-    structure -- <a
-    href="http://www.schemers.org/Documents/Standards/R5RS/HTML/r5rs-Z-H-10.html#%_sec_7.1.1">R5RS
-    section 7.1.1</a> -- to:
-    </p>
-    <pre>
-    &lt;comment&gt; ---&gt; ; &lt;all subsequent characters up to a line break&gt;
-     	    |         #| &lt;comment-text&gt; (&lt;comment&gt; &lt;comment-text&gt;)* |#
-
-    &lt;comment-text&gt; ---&gt; &lt;character sequence not containing #| or |#&gt;
-
-    </pre>
-
-
-    <h1><code>&lt;delimiter&gt;</code> and <code>#</code></h1> 
-
-    <p>The SRFI does not extend the specification of
-    <code>&lt;delimiter&gt;</code> from <a
-    href="http://www.schemers.org/Documents/Standards/R5RS/HTML/r5rs-Z-H-10.html#%_sec_7.1.1">R5RS
-    section 7.1.1</a>. It is therefore required to separate tokens
-    which require implicit termination (identifiers, numbers,
-    characters, and dot) from multi-line comments by a
-    <code>&lt;delimiter&gt;</code> from R5RS.</p>
-
-    <p><em>Rationale</em> An extension of the
-    <code>&lt;delimiter&gt;</code> to <code>#|</code> would be
-    incompatible with existing implementations which allow
-    <code>#</code> as legal character within identifiers.</p>
-
-    <H1>Implementation</H1>
-    
-    <p>The following procedure <code>skip-comment</code> deletes a
-    leading multi-line comment from the current input port. Its
-    optional argument specifies whether the caller has already removed
-    leading characters of the comment from the current input port. The
-    symbol <code>start</code> means that the caller has removed
-    nothing, <code>read-sharp</code> means that it has removed a sharp
-    and finally <code>read-bar</code> indicates that the caller has
-    removed <code>#|</code>. </p>
-
-    <pre>
-(define (skip-comment! . maybe-start-state)
-  (let lp ((state (if (null? maybe-start-state) 'start (car maybe-start-state))) 
-	   (nested-level 0))
-    (define (next-char)
-      (let ((c (read-char)))
-	(if (eof-object? c)
-	    (error "EOF inside block comment -- #| missing a closing |#")
-	    c)))
-
-    (case state
-      ((start) (case (next-char)
-		 ((#\|) (lp 'read-bar nested-level))
-		 ((#\#) (lp 'read-sharp nested-level))
-		 (else (lp 'start nested-level))))
-      ((read-bar) (case (next-char)
-		    ((#\#) (if (> nested-level 1)
-			       (lp 'start (- nested-level 1))))
-		    (else (lp 'start nested-level))))
-      ((read-sharp) (case (next-char)
-		      ((#\|) (lp 'start (+ nested-level 1)))
-		      (else (lp 'start nested-level)))))))
-    </pre>
-
-    <p>A <a href="http://srfi.schemers.org/srfi-22/">SRFI 22</a> script to remove nested multi-line comments is
-    available at 
-      
-      <a
-	 href="http://srfi.schemers.org/srfi-30/remove-srfi30-comments-script.scm">http://srfi.schemers.org/srfi-30/remove-srfi30-comments-script.scm</a>.
-      
-      The script will read a Scheme program containing nested
-      multi-line comments from standard input and emit the same
-      programs with the comments removed to standard output. The
-      script mimics the Scheme 48 reader and uses the
-      <code>error</code> procedure from <a
-      href="http://srfi.schemers.org/srfi-23/">SRFI 23</a>.</p>
-
-     <p>A number of Scheme implemenations already support this SRFI:
-     Chez Scheme, Chicken, Gambit-C, Kawa, MIT Scheme, MzScheme and
-     RScheme. Bigloo supports multi-line comments via
-     <code>#!</code>/<code>!#</code>. Among the major Scheme
-     implementations, Scheme 48 and Guile do not support this SRFI
-     yet.</p>
-
-    <H1>Copyright</H1>
-    <p>Copyright (C) Martin Gasbichler (2002). All Rights Reserved.</p>
-
-    <p>
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-    </p>
-    <p>
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-    </p>
-    <p>
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-    </p>
-
-      
-    <hr>
-    <address>Editor: <a
-    href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-<!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-<!-- hhmts start -->
-Last modified: Sun Sep  1 17:14:55 MST 2002
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-31.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-31.html
deleted file mode 100644
index faf6eb936f..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-31.html
+++ /dev/null
@@ -1,361 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-    <title>SRFI 31: A special form `rec' for recursive evaluation</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 31: A special form <CODE>rec</CODE> for recursive evaluation
-
-<H1>Author</H1> 
-
-Mirko Luedde &lt;<a href="mailto:Mirko.Luedde@SAP.com">Mirko.Luedde@SAP.com</a>&gt;
-
-<H1>Status</H1>
- 
-This SRFI is currently in ``final'' status.  To see an explanation of
-each status that a SRFI can hold, see <A
-HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-
-You can access the discussion via <A
-HREF="http://srfi.schemers.org/srfi-31/mail-archive/maillist.html">the
-archive of the mailing list</A>.
-
-<UL>
-  <LI>Draft: 2002/05/24-2002/08/24</LI>
-  <LI>Revised: 2002/08/12</LI>
-  <LI>Final: 2002/12/02</LI>
-</UL>
-
-<H1>Abstract</H1> 
-
-We propose the implementation of a special form
-called <CODE>rec</CODE>.  This form is a generalization and
-combination of the forms <CODE>rec</CODE> and
-<CODE>named-lambda</CODE> of <A
-href="#[Clinger1985]">[Clinger1985]</A>. It allows the simple and
-non-imperative construction of self-referential expressions.  As an
-important special case, it extends the A. Church form
-<CODE>lambda</CODE> such that it allows the direct definition of
-recursive procedures without using further special forms like
-<CODE>let</CODE> or <CODE>letrec</CODE>, without using advanced
-constructions like the H. B. Curry combinator and, unlike
-<CODE>define</CODE>, without introducing variable bindings into the
-external environment.
-
-<H1>Rationale</H1> 
-
-<H2>General</H2> Among the prominent features of the Scheme
-programming language as defined in <a href="#[KCR1998]">[KCR1998]</a>
-are the following.
-
-<OL>
-
- <LI>It has simple syntax.</LI>
- 
- <LI>It encourages recursive definitions, e.g. by ensuring memory
-     efficient tail recursion.</LI>
-
- <LI>It supports non-imperative programming.</LI>
-
-</OL>
-
-Nevertheless Scheme does not provide a syntax for recursive
-evaluations with the properties of
-
-<OL>
-
-<LI>being as simple, intuitive and close to the mathematical standard
-notation as possible,</LI>
-
-<LI>allowing general recursion,</LI>
-
-<LI>being non-imperative.</LI>
-
-</OL>
-
-<H2>Example</H2> 
-
-<H3>Problem 1</H3> 
-
-Let us look at the factorial function. In mathematical notation this
-function is expressed as
-
-<PRE> 
-  (F : N |--> 1,            if N = 0; 
-              N * F(N - 1), otherwise).
-</PRE>
-
-This expression is a term and not a definition or proposition.
-
-<P>We investigate some approaches to express the factorial function in
-Scheme.
-
-<UL>
-
-<LI>
-The simplest way perhaps is as
-
-<PRE>
-(define (F N) 
-  (if (zero? N) 1 
-    (* N (F (- N 1)))))
-</PRE>
-
-But this expression is not a term. It binds the factorial function to
-the variable <code>F</code>. The expression itself may not occur in a
-syntactical context where a name of the factorial is required.</LI>
-
-<LI>
-We list several ways to express the factorial as a function term.
-
-<OL>
-
-<LI>
-<PRE>
-(let () 
-  (define (F N)
-    (if (zero? N) 1 
-        (* N (F (- N 1)))))
-    F)
-</PRE>
-</LI>
-
-<LI>
-<PRE>
-(lambda (N) 
-  (let F ( (N N) ) 
-       (if (zero? N) 1 
-	 (* N (F (- N 1))))))
-</PRE>
-</LI>
-
-<LI>
-<PRE>
-(letrec ( (F (lambda (N) 
-	       (if (zero? N) 1 
-		 (* N (F (- N 1)))))) )	F)
-</PRE>
-</LI>
-
-<LI>
-<PRE>
-((lambda (F) 
-   (F F))
- (lambda (G) 
-   (lambda (N) 
-     (if (zero? N) 1 
-       (* N ((G G) (- N 1)))))))
-</PRE>
-</LI>
-
-</OL>
-
-All these expressions define the factorial anonymously, not binding it
-to a variable. However, all these expressions are more verbose than it
-seems necessary and they are less intuitive than it seems
-desirable. </LI>
-
-</UL>
-
-<H3>Solution 1</H3> 
-
-A solution to our problem was already provided in <A
-href="#[Clinger1985]">[Clinger1985]</A> by the form
-<CODE>named-lambda</CODE>. An even earlier solution with a slightly
-different syntax was implemented in Kent Dybvig's Chez Scheme system.
-
-Using this special form, we can denote the factorial simply by
-
-<PRE>
-(named-lambda (F N) 
-              (if (zero? N) 1 
-                (* N (F (- N 1)))))
-</PRE>
-
-This expression is a function term that denotes the factorial in the
-appropriate brevity.
-
-<P>However, the form <code>named-lambda</code> has been dropped from
-later versions of the Scheme Report. Also it is missing in
-state-of-the-art implementations such as Chez Scheme (6.0a) and MIT
-Scheme (7.7.0). (The latter actually knows a form
-<CODE>named-lambda</CODE> with different semantics).
-
-<H3>Problem 2</H3> 
-
-The constant stream of ones can be defined via
-
-<PRE>(define S (cons 1 (delay S)))</PRE>
-
-As in the case of the factorial, we are able to define the recursive
-object at the price of spending an externally bound name. Remedying
-this with <CODE>let</CODE> or <CODE>letrec</CODE> leads to similar
-objections as above.
-
-<H3>Solution 2</H3> 
-
-This particular case of the self-referential problem was solved by the
-<CODE>rec</CODE> form in <A href="#[Clinger1985]">[Clinger1985]</A>.
-
-This form allows writing
-
-<PRE>(rec S (cons 1 (delay S)))</PRE>
-
-This expression is non-imperative and does not introduce an external
-variable binding.
-
-<P>Also this form has been dropped from later versions of the Scheme
-Report. Moreover, from our point of view this form alone is not
-capable of solving Problem 1. The respective definition would look
-like
-
-<PRE>
-(rec F 
-     (lambda (N) 
-       (if (zero? N) 1 
-	 (* N (F (- N 1))))))
-</PRE>
-
-This again does not seem quite as simple and intuitive as the
-mathematical notation.
-
-<H2>Proposal</H2> 
-
-We therefore propose to implement the <CODE>rec</CODE> special form in
-a generalized way that combines the advantages of the
-<CODE>named-lambda</CODE> and <CODE>rec</CODE> forms.
-
-The factorial function could be written
-<PRE>
-(rec (F N) 
-     (if (zero? N) 1 
-       (* N (F (- N 1)))))
-</PRE>
-
-<H1>Specification</H1>
-
-<H2>Syntax</H2> 
-
-The following production rules are to be added to those of <a
-href="#[KCR1998]">[KCR1998]</a> (we reuse names of non-terminals).
-
-<OL><a name="rec"></a>
-
-<LI><CODE>&lt;derived expression&gt; --&gt; &lt;rec expression&gt;</CODE></LI>
-
-<LI><CODE>&lt;rec expression&gt; --&gt; (rec &lt;variable&gt;
-&lt;expression&gt;)</CODE></LI>
-
-<LI><CODE>&lt;rec expression&gt; --&gt; (rec (&lt;variable&gt;+)
-&lt;body&gt;)</CODE></LI>
-
-</OL>
-
-<H2>Semantics</H2> 
-
-Scheme versions such as <A href="#[KCR1998]">[KCR1998]</A> providing
-<CODE>define-syntax</CODE>, <CODE>syntax-rules</CODE>,
-<CODE>letrec</CODE> and <CODE>lambda</CODE> might implement
-<CODE>rec</CODE> as follows.
-
-<PRE>
-(define-syntax rec
-  (syntax-rules ()
-    ((rec (NAME . VARIABLES) . BODY)
-     (letrec ( (NAME (lambda VARIABLES . BODY)) ) NAME))
-    ((rec NAME EXPRESSION)
-     (letrec ( (NAME EXPRESSION) ) NAME))))
-</PRE>
-
-<H2>Test</H2>
-
-The following session shows in which way <CODE>rec</CODE> allows a
-tail-recursive implementation of the factorial function.
-
-<PRE>
-> (define F (rec (F N)
-		((rec (G K L)
-		   (if (zero? K) L
-		     (G (- K 1) (* K L)))) N 1)))
-> F
-#&lt;procedure&gt;
-> (F 0)
-1
-> (F 10)
-3628800
-</PRE>
-
-<H1>Acknowledgements</H1> 
-
-The author thanks Al Petrofsky for the final solution and Hal Abelson,
-Chris Hanson and others for their input. The work of the maintainers
-of the SRFI forum is highly appreciated.
-
-<H1>Bibliography</H1>
-
-<UL>
-
-<LI>
-<a name="[Clinger1985]">[Clinger1985]</a>
-  EDITOR =	 {Clinger, W.},
-  TITLE =	 {Draft of Report of the October 1984 Workshop on Scheme},
-  JOURNAL =	 {Proceedings Brandeis Workshop Oct.~22--23, 1984},
-  MONTH =	 {Mar},
-  YEAR =	 {1985},
-  URL =
-{<A
-HREF=http://www.swiss.ai.mit.edu/ftpdir/scheme-mail/HTML/rrrs-1985>http://www.swiss.ai.mit.edu/ftpdir/scheme-mail/HTML/rrrs-1985</A>}</LI>
-
-<LI>
-<a name="[KCR1998]">[KCR1998]</a>
-  AUTHOR =	 {Kelsey, R. and Clinger, W. and Rees, J.},
-  TITLE =	 {Revised (5) Report on the Algorithmic Language Scheme},
-  JOURNAL =	 {Higher-Order and Symbolic Computation},
-  VOLUME =	 {11},
-  NUMBER =	 {1},
-  MONTH =	 {Sep},
-  YEAR =	 {1998}
-</LI>
-</UL>
-
-<H1>Copyright</H1>
-
-<p>Copyright (C) Dr. Mirko Luedde (2002). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-<HR>
-
-<ADDRESS>Author: <A href="mailto:Mirko.Luedde@SAP.com">Mirko Luedde</A></ADDRESS>
-
-<ADDRESS>Editor: <A href="mailto:srfi-editors@srfi.schemers.org">Francisco Solsona</A></ADDRESS>
-
-</body>
-
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-34.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-34.html
deleted file mode 100644
index aa4675711c..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-34.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<head>
-<title>SRFI 34: Exception Handling for Programs</title>
-</head>
-
-<body>
-<H1>Title</H1>
-
-SRFI 34: Exception Handling for Programs
-
-<H1>Authors</H1>
-
-Richard Kelsey and Michael Sperber
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status. To see an explanation of
-each status that a SRFI can hold, see <a
-href="http://srfi.schemers.org/srfi-process.html">here</a>.  It will
-remain in draft until 2002-10-20, or as amended.  to provide input on
-this SRFI, please mail to 
-<a href="mailto:srfi-34@srfi.schemers.org">
-<code>srfi-34@srfi.schemers.org</code></a>.
-See <a href="http://srfi.schemers.org/srfi-list-subscribe.html">
-instructions here</a> to subscribe to the list.  You can access
-the discussion via
-<a href="http://srfi.schemers.org/srfi-34/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-You can access
-post-finalization messages via
-<a href="http://srfi.schemers.org/srfi-34/post-mail-archive/maillist.html">
-the archive of the mailing list</a>.
-
-<UL>
-      <LI>Draft: 2002/07/24-2002/10/20</LI>
-      <li>Revised: 2002/09/20</li>
-      <li>Final: 2002/12/1</li>
-      <LI>Fixed reference implementation: 2003/03/10</LI>
-</UL>
-
-<h1>Abstract</h1>
-This SRFI defines exception-handling and exception-raising constructs for Scheme, including<ul><li>a <code>with-exception-handler</code>
- procedure and a <code>guard</code>
- form for installing exception-handling procedures,</li>
-<li>a <code>raise</code>
- procedure for invoking the current exception handler.</li>
-</ul>
-<p>This SRFI is based on (withdrawn) <a href="http://srfi.schemers.org/srfi-12/">SRFI 12: Exception Handling</a>
-by William Clinger, R. Kent Dybvig, Matthew Flatt, and Marc Feeley.</p>
-<h1>Rationale</h1>
-<p>The goals of the exception mechanism specified in this SRFI are to help programmers share code which relies on exception handling, and to be easily added to existing Scheme systems.</p>
-<p>This SRFI is primarily useful in conjunction with one or more companion SRFIs:</p>
-<ul><li>a SRFI specifying exception-describing objects (conditions). An example is <a href="http://srfi.schemers.org/srfi-35">SRFI 35</a>
- (Conditions).</li>
-<li>a SRFI specifying a set of standard condition types to be raised by the primitives provided by the Scheme implementation, and requiring that certain Scheme primitives indeed raise exceptions within the framework described. An example is <a href="http://srfi.schemers.org/srfi-36">SRFI 36</a>
- (I/O Conditions).</li>
-<li>a SRFI specifying how computations may be resumed after an exception is raised.</li>
-</ul>
-<h1>Specification</h1>
-<p>Exception handlers are one-argument procedures that determine the action the program takes when an exceptional situation is signalled. The system implicitly maintains a <i>current exception handler</i>.</p>
-<p>The program raises an exception by invoking the current exception handler, passing to it an object encapsulating information about the exception. Any procedure accepting one argument may serve as an exception handler and any object may be used to represent an exception.</p>
-<p>The system maintains the current exception handler as part of  the <i>dynamic environment</i> of the program, akin to the current input or output port, or the context for <code>dynamic-wind</code>. The dynamic environment can be thought of as that part of a continuation that does not specify the destination of any returned values.  It includes the current input and output ports, the <code>dynamic-wind</code>
- context, and this SRFI's current exception handler.  See the reference implementation for portable definitions of <code>current-dynamic-environment</code>
- and <code>with-dynamic-environment</code>.</p>
-<p>The initial current exception handler of the program is implementation-dependent. However, it should interrupt the program in some way visible to the user, either by aborting it, invoking a debugger, or some similar action.</p>
-<h2>Establishing Exception Handlers</h2>
-<dl><dt><a name="with-exception-handler"><code>(with-exception-handler </code><var>handler</var>
- <var>thunk</var><code>)</code></a></dt>
-<dd><p>Returns the result(s) of invoking <var>thunk</var>. <var>Handler</var>
- must be a procedure that accepts one argument. It is installed as the current exception handler for the dynamic extent (as determined by <code>dynamic-wind</code>) of the invocation of <var>thunk</var>.</p>
-</dd>
-</dl>
-<dl><dt><a name="guard"><code>(guard </code><code>(</code>
-&lt;var&gt; &lt;clause<sub>1</sub>
-&gt; &lt;clause<sub>2</sub>
-&gt; ...<code>)</code>
- &lt;body&gt;<code>)</code></a> (syntax)</dt>
-<dd><p><em>Syntax:</em>
- Each &lt;clause&gt; should have the same form as a <code>cond</code>
- clause</p>
-<p><em>Semantics:</em>
- Evaluating a <code>guard</code>
- form evaluates &lt;body&gt; with an exception handler that binds the raised object to &lt;var&gt; and within the scope of that binding evaluates the clauses as if they were the clauses of a <code>cond</code>
- expression. That implicit <code>cond</code>
- expression is evaluated with the continuation and dynamic environment of the <code>guard</code>
- expression. If every &lt;clause&gt;'s &lt;test&gt; evaluates to false and there is no <code>else</code>
- clause, then <code>raise</code>
- is re-invoked on the raised object within the dynamic environment of the original call to <code>raise</code>
- except that the current exception handler is that of the <code>guard</code>
- expression.</p>
-</dd>
-</dl>
-<h2>Raising Exceptions</h2>
-<dl><dt><a name="raise"><code>(raise </code><var>obj</var><code>)</code></a></dt>
-<dd><p>Invokes the current exception handler on <var>obj</var>. The handler is called in the dynamic environment of the call to <code>raise</code>, except that the current exception handler is that in place for the call to <code>with-exception-handler</code>
- that installed the handler being called.  The handler's continuation is otherwise unspecified.</p>
-</dd>
-</dl>
-<h1>Examples</h1>
-<pre>(call-with-current-continuation
- (lambda (k)
-   (with-exception-handler (lambda (x)
-                             (display &quot;condition: &quot;)
-                             (write x)
-                             (newline)
-                             (k 'exception))
-     (lambda ()
-       (+ 1 (raise 'an-error))))))
-PRINTS: condition: an-error
-=&gt; exception
-
-(call-with-current-continuation
- (lambda (k)
-   (with-exception-handler (lambda (x)
-                             (display &quot;something went wrong&quot;)
-                             (newline)
-                             'dont-care)
-     (lambda ()
-       (+ 1 (raise 'an-error))))))
-PRINTS: something went wrong
-then behaves in an unspecified way
-
-(guard (condition
-         (else
-          (display &quot;condition: &quot;)
-          (write condition)
-          (newline)
-          'exception))
-  (+ 1 (raise 'an-error)))
-PRINTS: condition: an-error
-=&gt; exception
-
-(guard (condition
-         (else
-          (display &quot;something went wrong&quot;)
-          (newline)
-          'dont-care))
- (+ 1 (raise 'an-error)))
-PRINTS: something went wrong
-=&gt; dont-care
-
-(call-with-current-continuation
- (lambda (k)
-   (with-exception-handler (lambda (x)
-                             (display &quot;reraised &quot;) (write x) (newline)
-                             (k 'zero))
-     (lambda ()
-       (guard (condition
-                ((positive? condition) 'positive)
-                ((negative? condition) 'negative))
-        (raise 1))))))
-=&gt; positive
-
-(call-with-current-continuation
- (lambda (k)
-   (with-exception-handler (lambda (x)
-                             (display &quot;reraised &quot;) (write x) (newline)
-                             (k 'zero))
-     (lambda ()
-       (guard (condition
-                ((positive? condition) 'positive)
-                ((negative? condition) 'negative))
-        (raise -1))))))
-=&gt; negative
-
-(call-with-current-continuation
- (lambda (k)
-   (with-exception-handler (lambda (x)
-                             (display &quot;reraised &quot;) (write x) (newline)
-                             (k 'zero))
-     (lambda ()
-       (guard (condition
-                ((positive? condition) 'positive)
-                ((negative? condition) 'negative))
-        (raise 0))))))
-PRINTS: reraised 0
-=&gt; zero
-
-(guard (condition
-         ((assq 'a condition) =&gt; cdr)
-         ((assq 'b condition)))
-  (raise (list (cons 'a 42))))
-=&gt; 42
-
-(guard (condition
-         ((assq 'a condition) =&gt; cdr)
-         ((assq 'b condition)))
-  (raise (list (cons 'b 23))))
-=&gt; (b . 23)
-</pre><h1>Reference Implementation</h1>
-<p>The reference implementation makes use of <a href="http://srfi.schemers.org/srfi-9/">SRFI 9</a>
- (&quot;Defining Record Types&quot;), and <a href="http://srfi.schemers.org/srfi-23/">SRFI 23</a>
- (&quot;Error reporting mechanism&quot;).</p>
-<pre>(define *current-exception-handlers*
-  (list (lambda (condition)
-          (error &quot;unhandled exception&quot; condition))))
-
-(define (with-exception-handler handler thunk)
-  (with-exception-handlers (cons handler *current-exception-handlers*)
-                           thunk))
-
-(define (with-exception-handlers new-handlers thunk)
-  (let ((previous-handlers *current-exception-handlers*))
-    (dynamic-wind
-      (lambda ()
-        (set! *current-exception-handlers* new-handlers))
-      thunk
-      (lambda ()
-        (set! *current-exception-handlers* previous-handlers)))))
-
-(define (raise obj)
-  (let ((handlers *current-exception-handlers*))
-    (with-exception-handlers (cdr handlers)
-      (lambda ()
-        ((car handlers) obj)
-        (error &quot;handler returned&quot;
-               (car handlers)
-               obj)))))
-
-(define-syntax guard
-  (syntax-rules ()
-    ((guard (var clause ...) e1 e2 ...)
-     ((call-with-current-continuation
-       (lambda (guard-k)
-         (with-exception-handler
-          (lambda (condition)
-            ((call-with-current-continuation
-               (lambda (handler-k)
-                 (guard-k
-                  (lambda ()
-                    (let ((var condition))      ; clauses may SET! var
-                      (guard-aux (handler-k (lambda ()
-                                              (raise condition)))
-                                 clause ...))))))))
-          (lambda ()
-            (call-with-values
-             (lambda () e1 e2 ...)
-             (lambda args
-               (guard-k (lambda ()
-                          (apply values args)))))))))))))
-
-(define-syntax guard-aux
-  (syntax-rules (else =&gt;)
-    ((guard-aux reraise (else result1 result2 ...))
-     (begin result1 result2 ...))
-    ((guard-aux reraise (test =&gt; result))
-     (let ((temp test))
-       (if temp 
-           (result temp)
-           reraise)))
-    ((guard-aux reraise (test =&gt; result) clause1 clause2 ...)
-     (let ((temp test))
-       (if temp
-           (result temp)
-           (guard-aux reraise clause1 clause2 ...))))
-    ((guard-aux reraise (test))
-     test)
-    ((guard-aux reraise (test) clause1 clause2 ...)
-     (let ((temp test))
-       (if temp
-           temp
-           (guard-aux reraise clause1 clause2 ...))))
-    ((guard-aux reraise (test result1 result2 ...))
-     (if test
-         (begin result1 result2 ...)
-         reraise))
-    ((guard-aux reraise (test result1 result2 ...) clause1 clause2 ...)
-     (if test
-         (begin result1 result2 ...)
-         (guard-aux reraise clause1 clause2 ...)))))
-</pre><h1>References</h1>
-<ul><li><a href="http://srfi.schemers.org/srfi-12/">SRFI 12: Exception Handling</a>
-by William Clinger, R. Kent Dybvig, Matthew Flatt, and Marc Feeley</li>
-<li><a href="http://srfi.schemers.org/srfi-18/">SRFI 18: Multithreading support</a>
-by Marc Feeley</li>
-<li>Richard Kelsey's <a href="http://www.swiss.ai.mit.edu/ftpdir/scheme-mail/HTML/rrrs-1996/msg00022.html">1996 proposal</a>
-</li>
-<li><a href="http://www.cs.indiana.edu/scheme-repository/doc.proposals.exceptions.html">Proposal for Exception Handling in Scheme</a>
- by Dan Friedman, Chris Haynes, and Kent Dybvig</li>
-<li>Kent Pitman's <a href="http://world.std.com/~pitman/Papers/Condition-Handling-2001.html">history paper</a>
-</li>
-<li>The <a href="http://www.xanalys.com/software_tools/reference/HyperSpec/Body/09_.htm">Conditions chapter</a>
- from the <a href="http://www.xanalys.com/software_tools/reference/HyperSpec/Front/index.htm">Common Lisp HyperSpec</a>
-</li>
-<li>The Conditions chapter by Kent M. Pitman in <a href="http://www-2.cs.cmu.edu/afs/cs.cmu.edu/project/ai-repository/ai/html/cltl/cltl2.html"><i>Common Lisp the Language, 2nd edition</i>
-</a>
- by Guy L. Steele</li>
-<li>The <a href="http://www.gwydiondylan.org/drm/drm_52.htm#HEADING52-0">Conditions chapter</a>
- in the <a href="http://www.gwydiondylan.org/drm/drm_1.htm">Dylan Reference Manual</a>
-</li>
-<li>The Exceptions chapter in <a href="http://www-2.cs.cmu.edu/~rwh/smlbook/">Programming in Standard ML</a>
- by Robert Harper</li>
-</ul>
-
-<H1>Copyright</H1>
-
-<p>Copyright (C) Richard Kelsey, Michael Sperber (2002). All Rights
-Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Francisco Solsona</a></address>
-</body></html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-35.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-35.html
deleted file mode 100644
index de261a8b17..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-35.html
+++ /dev/null
@@ -1,515 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html><head><title>SRFI 35: Conditions</title></head><body>
-<h1>Title</h1>
-
-Conditions
-
-<h1>Authors</h1>
-
-Richard Kelsey and Michael Sperber
-
-<h1>Status</h1>
-
-This SRFI is currently in ``final'' status. To see an explanation of
-each status that a SRFI can hold, see <a href="http://srfi.schemers.org/srfi-process.html">here</a>.  It will
-remain in draft until 2002-10-20, or as amended.  to provide input on
-this SRFI, please mail to 
-<a href="mailto:srfi%20minus%2035%20at%20srfi%20dot%20schemers%20dot%20org">
-<code>srfi minus 35 at srfi dot schemers dot org</code></a>.
-See <a href="http://srfi.schemers.org/srfi-list-subscribe.html">
-instructions here</a> to subscribe to the list.  You can access
-the discussion via
-<a href="http://srfi.schemers.org/srfi-35/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-You can access
-post-finalization messages via
-<a href="http://srfi.schemers.org/srfi-34/post-mail-archive/maillist.html">
-the archive of the mailing list</a>.
-
-<ul>
-      <li>Draft: 2002/07/24-2002/10/20</li>
-      <li>Revised: 2002/09/20</li>
-      <li>Final: 2002/12/1</li>
-</ul>
-
-<h1>Abstract</h1>
-<p>The SRFI defines constructs for creating and inspecting <i>condition</i>
-types and values. A condition value encapsulates information about an
-exceptional situation, or exception. This SRFI also defines a few basic
-condition types.</p>
-<h1>Rationale</h1>
-<p>Conditions are values that communicate information about exceptional
-situations between parts of a program. Code that detects an exception
-may be in a different part of the program than the code that handles
-it. In fact, the former may have been written independently from the
-latter. Consequently, to facilitate effective handling of exceptions,
-conditions must communicate as much information as possible as
-accurately as possible, and still allow effective handling by code that
-did not precisely anticipate the nature of the exception that occurred.</p>
-<p>This  SRFI provides two mechanisms to enable this kind of communication</p><ul><li>subtyping among condition types allows handling code to determine the <em>general</em>
- nature of an exception even though it does not anticipate its <em>exact</em>
- nature,</li>
-<li>compound conditions allow an exceptional situation to be described in multiple ways.</li>
-</ul>
-<p></p>
-<h1>Specification</h1>
-<p>Conditions are records with named fields. Each condition belongs to one or more <i>condition types</i>.
-Each condition type specifies a set of field names. A condition
-belonging to a condition type includes a value for each of the type's
-field names. These values can be extracted from the condition by using
-the appropriate field name.</p>
-<p>There is a tree of condition types with the distinguished <code>&amp;condition</code>
- as its root. All other condition types have a parent condition type.</p>
-<p>A condition belonging to several condition types with a common
-supertype may have distinct values for the supertype's fields for each
-type. The type used to access a field determines which of the values is
-returned. The program can extract each of these field values separately.</p>
-<h2>Procedures</h2>
-<dl><dt><code>(make-condition-type </code><var>id</var>
- <var>parent</var>
- <var>field-names</var><code>)</code></dt>
-<dd><p><code>Make-condition-type</code>
- returns a new condition type. <var>Id</var>
- must be a symbol that serves as a symbolic name for the condition type.  <var>Parent</var>
- must itself be a condition type. <var>Field-names</var>
- must be a list of symbols.  It identifies the fields of the conditions associated with the condition type.</p>
-<p><var>Field-names</var>
- must be disjoint from the field names of <var>parent</var>
- and its ancestors.</p>
-</dd>
-<dt><code>(condition-type? </code><var>thing</var><code>)</code></dt>
-<dd><p><code>Condition-type?</code>
- is a predicate for condition types: it returns <code>#t</code>
- if <var>thing</var>
- is a condition type, and <code>#f</code>
- otherwise</p>
-</dd>
-<dt><code>(make-condition </code><var>type</var>
- <var>field-name</var>
- <var>value</var>
- ...<code>)</code></dt>
-<dd><p><code>Make-condition</code>
- creates a condition value belonging condition type <var>type</var>.  The following arguments must be, in turn, a field name and an arbitrary value.  There must be such a pair for each field of <var>type</var>
- and its direct and indirect supertypes.  <code>Make-condition</code>
- returns the condition value, with the argument values associated with their respective fields.</p>
-</dd>
-<dt><code>(condition? </code><var>thing</var><code>)</code></dt>
-<dd><p><code>Condition?</code>
- is a predicate for conditions: it returns <code>#t</code>
- if <var>thing</var>
- is a condition type, and <code>#f</code>
- otherwise</p>
-</dd>
-<dt><code>(condition-has-type? </code><var>condition</var>
- <var>condition-type</var><code>)</code></dt>
-<dd><p><code>Condition-has-type?</code>
- tests if condition <var>condition</var>
- belongs to condition type <var>condition-type</var>.  It returns <code>#t</code>
- if any of <var>condition</var>
-'s types includes <var>condition-type</var>
-eitherdirectlyorasanancestorand
-	<code>#f</code>
- otherwise.</p>
-<p>It is an error if <var>condition</var>
- is not a condition, or if <var>condition-type</var>
- is not a condition type.</p>
-</dd>
-<dt><code>(condition-ref </code><var>condition</var>
- <var>field-name</var><code>)</code></dt>
-<dd><p><var>Condition</var>
- must be a condition, and <var>field-name</var>
- a symbol.  Moreover, <var>condition</var>
- must belong to a condition type which has a field name called <var>field-name</var>, or one of its (direct or indirect) supertypes must have the field. <code>Condition-ref</code>
- returns the value associated with <var>field-name</var>.</p>
-<p>It is an error to refer to a field the condition does not have.</p>
-</dd>
-<dt><code>(make-compound-condition </code><var>condition<sub>0</sub>
-</var>
- <var>condition<sub>1</sub>
-...</var><code>)</code></dt>
-<dd><p><code>Make-compound-condition</code>
- returns a compound condition  belonging to all condition types that the <var>condition<sub>i</sub>
-</var>
- belong to. </p>
-<p><code>Condition-ref</code>, when applied to a compound condition will return the value from the first of the <var>condition<sub>i</sub>
-</var>
- that has such a field.</p>
-</dd>
-<dt><code>(extract-condition </code><var>condition</var>
- <var>condition-type</var><code>)</code></dt>
-<dd><p><var>Condition</var>
- must be a condition belonging to <var>condition-type</var>.  <code>Extract-condition</code>
-returns a condition of condition type <var>condition-type</var>
- with the field values specified by <var>condition</var>.</p>
-<p>If <var>condition</var>
- is a compound condition, <code>extract-condition</code>
- extracts the field values from  the subcondition belonging to <var>condition-type</var>
- that appeared first in the call to <code>make-compound-condition</code>
- that created the condition. The returned condition may be newly created; it is possible for</p><pre>(let* ((&amp;c (make-condition-type 'c &amp;condition '()))
-       (c0 (make-condition &amp;c))
-       (c1 (make-compound-condition c0)))
-  (eq? c0 (extract-condition c1 &amp;c)))
-</pre>to return false.<p></p>
-</dd>
-</dl>
-<h2>Macros</h2>
-<dl><dt><code>(define-condition-type </code>&lt;condition-type&gt; &lt;supertype&gt; &lt;predicate&gt; &lt;field-spec&gt; ...<code>)</code></dt>
-<dd><p>This defines a new condition type. &lt;Condition-type&gt;, &lt;supertypes&gt;, and &lt;predicate&gt; must all be identifiers. <code>Define-condition-type</code>
-defines an identifier &lt;condition-type&gt; to some value describing
-the condition type. &lt;supertype&gt; must be the name of a previously
-defined condition type. </p>
-<p><code>Define-condition-type</code> also defines &lt;predicate&gt; to
-a predicate that identifies conditions associated with that type, or
-with any of its subtypes.</p>
-<p>Each &lt;field-spec&gt; must be of the form <code>(</code>
-&lt;field&gt; &lt;accessor&gt;<code>)</code>
- where both &lt;field&gt; and &lt;accessor&gt; must be identifiers. <code>Define-condition-type</code>
-defines each &lt;accessor&gt; to a procedure which extracts the value
-of the named field from a condition associated with this condition type.</p>
-</dd>
-<dt><code>(condition </code>&lt;type-field-binding&gt; ...<code>)</code></dt>
-<dd><p>This creates a condition value. Each &lt;type-field-binding&gt; must be of the form <code>(</code>
-&lt;condition-type&gt; &lt;field-binding&gt; ...<code>)</code>
-Each &lt;field-binding&gt; must be of the form <code>(</code>
-&lt;field&gt; &lt;exp&gt;<code>)</code>
- where &lt;field&gt; is a field identifier from the definition of &lt;condition-type&gt;. </p>
-<p>The &lt;exp&gt; are evaluated in some unspecified order; their
-values can later be extracted from the condition object via the
-accessors of the associated condition types or their supertypes.</p>
-<p>The condition returned by <code>condition</code>
- is created by a call of form</p>
-<pre>(make-compound-condition
-  (make-condition &lt;condition-type&gt; '&lt;field-name&gt; &lt;value&gt;...)
-  ...)</pre>
-<p> with the condition types retaining their order from the<code>condition</code>
-form. The field names and values are duplicated as necessary as described below.</p>
-<p>Each &lt;type-field-binding&gt; must contain field bindings for <em>all</em>
-fields of &lt;condition-type&gt; without duplicates. There is an
-exception to this rule: if a field binding is missing, and the field
-belongs to a supertype shared with one of the other
-&lt;type-field-binding&gt; subforms, then the value defaults to that of
-the first such binding in the <code>condition</code>
- form.</p>
-</dd>
-</dl>
-<h2>Standard Conditions</h2>
-<dl><dt><code>&amp;condition</code>
-</dt>
-<dd><p>This is the root of the entire condition type hierarchy. It has a no fields.</p>
-</dd>
-<dt><code>&amp;message</code>
-</dt>
-<dd><p>This condition type could be defined by</p><pre>(define-condition-type &amp;message &amp;condition
-  message-condition?
-  (message condition-message))
-</pre><p></p>
-<p>It carries a message further describing the nature of the condition to humans.</p>
-</dd>
-<dt><code>&amp;serious</code>
-</dt>
-<dd><p>This condition type could be defined by</p><pre>(define-condition-type &amp;serious &amp;condition
-  serious-condition?)
-</pre><p></p>
-<p>This type describes conditions serious enough that they cannot
-safely be ignored. This condition type is primarily intended as a
-supertype of other condition types.</p>
-</dd><dt><code>&amp;error</code>
-</dt>
-<dd><p>This condition type could be defined by</p><pre>(define-condition-type &amp;error &amp;serious
-  error?)
-</pre><p></p>
-<p>This condition describes errors, typically caused by something that
-has gone wrong in the interaction of the program with the external
-world or the user.</p>
-</dd>
-
-</dl>
-<h1>Examples</h1>
-<pre>(define-condition-type &amp;c &amp;condition
-  c?
-  (x c-x))
-
-(define-condition-type &amp;c1 &amp;c
-  c1?
-  (a c1-a))
-
-(define-condition-type &amp;c2 &amp;c
-  c2?
-  (b c2-b))
-(define v1 (make-condition &amp;c1 'x "V1" 'a "a1"))
-
-(c? v1)        =&gt; #t
-(c1? v1)       =&gt; #t
-(c2? v1)       =&gt; #f
-(c-x v1)       =&gt; "V1"
-(c1-a v1)      =&gt; "a1"
-
-(define v2 (condition (&amp;c2
-                        (x "V2")
-                        (b "b2"))))
-
-(c? v2)        =&gt; #t
-(c1? v2)       =&gt; #f
-(c2? v2)       =&gt; #t
-(c-x v2)       =&gt; "V2"
-(c2-b v2)      =&gt; "b2"
-
-(define v3 (condition (&amp;c1
-                       (x "V3/1")
-                       (a "a3"))
-                      (&amp;c2
-                       (b "b3"))))
-
-(c? v3)        =&gt; #t
-(c1? v3)       =&gt; #t
-(c2? v3)       =&gt; #t
-(c-x v3)       =&gt; "V3/1"
-(c1-a v3)      =&gt; "a3"
-(c2-b v3)      =&gt; "b3"
-
-(define v4 (make-compound-condition v1 v2))
-
-(c? v4)        =&gt; #t
-(c1? v4)       =&gt; #t
-(c2? v4)       =&gt; #t
-(c-x v4)       =&gt; "V1"
-(c1-a v4)      =&gt; "a1"
-(c2-b v4)      =&gt; "b2"
-
-(define v5 (make-compound-condition v2 v3))
-
-(c? v5)        =&gt; #t
-(c1? v5)       =&gt; #t
-(c2? v5)       =&gt; #t
-(c-x v5)       =&gt; "V2"
-(c1-a v5)      =&gt; "a3"
-(c2-b v5)      =&gt; "b2"
-</pre><h1>Reference Implementation</h1>
-<p>The reference implementation makes use of <a href="http://srfi.schemers.org/srfi-1/">SRFI 1</a>
- ("List Library"), <a href="http://srfi.schemers.org/srfi-9/">SRFI 9</a>
- ("Defining Record Types"), and <a href="http://srfi.schemers.org/srfi-23/">SRFI 23</a>
- ("Error reporting mechanism").</p>
-<pre>(define-record-type :condition-type
-  (really-make-condition-type name supertype fields all-fields)
-  condition-type?
-  (name condition-type-name)
-  (supertype condition-type-supertype)
-  (fields condition-type-fields)
-  (all-fields condition-type-all-fields))
-
-(define (make-condition-type name supertype fields)
-  (if (not (symbol? name))
-      (error "make-condition-type: name is not a symbol"
-             name))
-  (if (not (condition-type? supertype))
-      (error "make-condition-type: supertype is not a condition type"
-             supertype))
-  (if (not
-       (null? (lset-intersection eq?
-                                 (condition-type-all-fields supertype)
-                                 fields)))
-      (error "duplicate field name" ))
-  (really-make-condition-type name
-                              supertype
-                              fields
-                              (append (condition-type-all-fields supertype)
-                                      fields)))
-
-(define-syntax define-condition-type
-  (syntax-rules ()
-    ((define-condition-type ?name ?supertype ?predicate
-       (?field1 ?accessor1) ...)
-     (begin
-       (define ?name
-         (make-condition-type '?name
-                              ?supertype
-                              '(?field1 ...)))
-       (define (?predicate thing)
-         (and (condition? thing)
-              (condition-has-type? thing ?name)))
-       (define (?accessor1 condition)
-         (condition-ref (extract-condition condition ?name)
-                        '?field1))
-       ...))))
-
-(define (condition-subtype? subtype supertype)
-  (let recur ((subtype subtype))
-    (cond ((not subtype) #f)
-          ((eq? subtype supertype) #t)
-          (else
-           (recur (condition-type-supertype subtype))))))
-
-(define (condition-type-field-supertype condition-type field)
-  (let loop ((condition-type condition-type))
-    (cond ((not condition-type) #f)
-          ((memq field (condition-type-fields condition-type))
-           condition-type)
-          (else
-           (loop (condition-type-supertype condition-type))))))
-
-; The type-field-alist is of the form
-; ((&lt;type&gt; (&lt;field-name&gt; . &lt;value&gt;) ...) ...)
-(define-record-type :condition
-  (really-make-condition type-field-alist)
-  condition?
-  (type-field-alist condition-type-field-alist))
-
-(define (make-condition type . field-plist)
-  (let ((alist (let label ((plist field-plist))
-                 (if (null? plist)
-                            '()
-                     (cons (cons (car plist)
-                                 (cadr plist))
-                           (label (cddr plist)))))))
-    (if (not (lset= eq?
-                    (condition-type-all-fields type)
-                    (map car alist)))
-        (error "condition fields don't match condition type"))
-    (really-make-condition (list (cons type alist)))))
-
-(define (condition-has-type? condition type)
-  (any (lambda (has-type)
-         (condition-subtype? has-type type))
-       (condition-types condition)))
-
-(define (condition-ref condition field)
-  (type-field-alist-ref (condition-type-field-alist condition)
-                        field))
-
-(define (type-field-alist-ref type-field-alist field)
-  (let loop ((type-field-alist type-field-alist))
-    (cond ((null? type-field-alist)
-           (error "type-field-alist-ref: field not found"
-                  type-field-alist field))
-          ((assq field (cdr (car type-field-alist)))
-           =&gt; cdr)
-          (else
-           (loop (cdr type-field-alist))))))
-
-(define (make-compound-condition condition-1 . conditions)
-  (really-make-condition
-   (apply append (map condition-type-field-alist
-                      (cons condition-1 conditions)))))
-
-(define (extract-condition condition type)
-  (let ((entry (find (lambda (entry)
-                              (condition-subtype? (car entry) type))
-                            (condition-type-field-alist condition))))
-    (if (not entry)
-        (error "extract-condition: invalid condition type"
-                      condition type))
-    (really-make-condition
-      (list (cons type
-                  (map (lambda (field)
-                         (assq field (cdr entry)))
-                       (condition-type-all-fields type)))))))
-
-(define-syntax condition
-  (syntax-rules ()
-    ((condition (?type1 (?field1 ?value1) ...) ...)
-     (type-field-alist-&gt;condition
-      (list
-       (cons ?type1
-             (list (cons '?field1 ?value1) ...))
-       ...)))))
-
-(define (type-field-alist-&gt;condition type-field-alist)
-  (really-make-condition
-   (map (lambda (entry)
-          (cons (car entry)
-                (map (lambda (field)
-                       (or (assq field (cdr entry))
-                           (cons field
-                                 (type-field-alist-ref type-field-alist field))))
-                     (condition-type-all-fields (car entry)))))
-        type-field-alist)))
-
-(define (condition-types condition)
-  (map car (condition-type-field-alist condition)))
-
-(define (check-condition-type-field-alist the-type-field-alist)
-  (let loop ((type-field-alist the-type-field-alist))
-    (if (not (null? type-field-alist))
-        (let* ((entry (car type-field-alist))
-               (type (car entry))
-               (field-alist (cdr entry))
-               (fields (map car field-alist))
-               (all-fields (condition-type-all-fields type)))
-          (for-each (lambda (missing-field)
-                      (let ((supertype
-                             (condition-type-field-supertype type missing-field)))
-                        (if (not
-                             (any (lambda (entry)
-                                    (let ((type (car entry)))
-                                      (condition-subtype? type supertype)))
-                                  the-type-field-alist))
-                            (error "missing field in condition construction"
-                                   type
-                                   missing-field))))
-                    (lset-difference eq? all-fields fields))
-          (loop (cdr type-field-alist))))))
-
-(define &amp;condition (really-make-condition-type '&amp;condition
-                                               #f
-                                               '()
-                                               '()))
-
-(define-condition-type &amp;message &amp;condition
-  message-condition?
-  (message condition-message))
-
-(define-condition-type &amp;serious &amp;condition
-  serious-condition?)
-
-(define-condition-type &amp;error &amp;serious
-  error?)
-</pre><h1>References</h1>
-<ul><li><a href="http://srfi.schemers.org/srfi-12/">SRFI 12: Exception Handling</a>
-by William Clinger, R. Kent Dybvig, Matthew Flatt, and Marc Feeley</li>
-<li><a href="http://www.swiss.ai.mit.edu/ftpdir/scheme-mail/HTML/rrrs-1996/msg00022.html">Richard Kelsey's 1996 proposal</a>
-</li>
-<li><a href="http://world.std.com/%7Epitman/Papers/Condition-Handling-2001.html">Kent Pitman's history paper</a>
-</li>
-<li>The <a href="http://www.xanalys.com/software_tools/reference/HyperSpec/Body/09_.htm">Conditions chapter</a>
- from the <a href="http://www.xanalys.com/software_tools/reference/HyperSpec/Front/index.htm">Common Lisp HyperSpec</a>
-</li>
-<li>The Conditions chapter by Kent M. Pitman in <a href="http://www-2.cs.cmu.edu/afs/cs.cmu.edu/project/ai-repository/ai/html/cltl/cltl2.html"><i>Common Lisp the Language, 2nd edition</i>
-</a>
- by Guy L. Steele</li>
-<li>The <a href="http://www.gwydiondylan.org/drm/drm_52.htm#HEADING52-0">Conditions chapter</a>
- in the <a href="http://www.gwydiondylan.org/drm/drm_1.htm">Dylan Reference Manual</a>
-</li>
-</ul>
-
-<h1>Copyright</h1>
-
-<p>Copyright (C) Richard Kelsey, Michael Sperber (2002). All Rights
-Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi%20minus%20editors%20at%20srfi%20dot%20schemers%20dot%20org">Francisco Solsona</a></address>
-
-</body></html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-38.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-38.html
deleted file mode 100644
index 378fbd2816..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-38.html
+++ /dev/null
@@ -1,637 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 38: External Representation for Data With Shared Structure</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-External Representation for Data With Shared Structure
-
-<H1>Author</H1>
-
-Ray Dillinger
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status. To see an explanation of
-each status that a SRFI can hold, see <a
-href="http://srfi.schemers.org/srfi-process.html">here</a>.
-You can access
-the discussion via
-<a href="http://srfi.schemers.org/srfi-38/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-
-<UL>
-      <LI>Draft: 2002/12/20-2003/04/02</li>
-      <LI>Final: 2003/04/02</LI>
-</UL>
-
-<H1>Abstract</H1>
-<P>
-This SRFI proposes <tt>(write-with-shared-structure)</tt> and 
-<tt>(read-with-shared-structure)</tt>, procedures for writing
-and reading external representations of data containing shared
-structure.  These procedures implement a proposed standard
-external notation for data containing shared structure.
-</P>
-<P>
-This SRFI permits but does not require replacing the standard
-<tt>(write)</tt> and <tt>(read)</tt> functions.  These functions
-may be implemented without the overhead in time and space required
-to detect and specify shared structure.
-</P>
-<P>
-An implementation conforms to this SRFI if it provides procedures
-named <tt>(write-with-shared-structure)</tt> and
-<tt>(read-with-shared-structure)</tt>, which produce and read
-the same notation as produced by the reference implementation.
-It may also provide <tt>(read/ss)</tt> and <tt>(write/ss)</tt>,
-equivalent functions with shorter names.
-</P>
-
-
-<H1>Rationale</H1>
-
-<P>
-
-R5RS scheme and IEEE scheme provide the procedure <tt>(write)</tt>,
-which prints machine-readable representations of lists and other
-objects.  However, the printed representation does not preserve
-information about what parts of the structure are shared, and in the
-case of self-referential objects the behavior of <tt>(write)</tt>
-itself is undefined; it is permitted to go into an infinite loop or
-invoke the dreaded curse of the nasal demons.
-
-</P>
-<P>
-
-For example, it is possible to have a list within which two or more
-members are the same string (in the sense of <tt>(eq?)</tt>), but when
-the list is written, there is not sufficient information in the
-representation to recover the <tt>(eq?)</tt> relationship.  When the
-list is read back in, there will be two or more copies of the string
-which are <tt>(eqv?)</tt> but not <tt>(eq?)</tt>.
-
-</P>
-<P>
-As an example of the second problem,  The results of evaluating
-<PRE>
-(begin (define a (cons 'val1 'val2))
-       (set-cdr! a a)
-       (write a))
-</PRE>
-
-are undefined; in R5RS parlance, calling write on such a structure
-&quot;is an error&quot;, but not one that is necessarily
-signalled. The routine is permitted to print a nonstandard notation
-such as the one proposed in this standard or a different one, fail
-silently, signal an error, go into an infinite loop, or make demons
-fly out of your nose.  Some of these results are unacceptable in some
-cases. This SRFI hopes to provide a standard way of dealing with this
-problem by providing a method of writing data which is guaranteed to
-be well-behaved and predictable even on data containing shared
-structures.
-
-</P>
-
-<P>
-
-The extended functionality described below in the implementation of
-<tt>(write-with-shared-structure)</tt>is already present in the
-<tt>(write)</tt> function of several major scheme implementations
-(PLT, SISC, Chez, Bigloo, MIT scheme, and possibly others).
-
-</P>
-
-<H1>Specification</H1>
-<P>
-
-<h2> Formal Grammar of the New External Representation</h2>
-This SRFI creates an alternative external representation for data
-written and read under <tt>(write/ss)</tt> and <tt>(read/ss)</tt>.
-It is identical to the grammar for external representation for data
-written and read under <tt>(write)</tt> and <tt>(read)</tt> given in
-section 7 of R5RS, except that the single production
-<PRE>
-
-&lt;datum&gt; --&gt; &lt;simple datum&gt; | &lt;compound datum&gt; 
-
-</PRE>
-Is replaced by the following five productions.
-<PRE>
-
-&lt;datum&gt; --&gt; &lt;defining datum&gt; | &lt;nondefining datum&gt; | &lt;defined datum&gt;
-
-&lt;defining datum&gt; --&gt;  #&lt;indexnum&gt;=&lt;nondefining datum&gt;
-
-&lt;defined datum&gt; --&gt; #&lt;indexnum&gt;#
-
-&lt;nondefining datum&gt; --&gt; &lt;simple datum&gt; | &lt;compound datum&gt; 
-
-&lt;indexnum&gt; --&gt; &lt;digit 10&gt;+
-</PRE>
-</P>
-
-<h2>New Procedures</h2>
-<P>
-<PRE>
-
-[[library procedure]] <a name="write-with-shared-structure">(write-with-shared-structure obj)</a>
-[[library procedure]] (write-with-shared-structure obj port)
-[[library procedure]] (write-with-shared-structure obj port optarg)
-
-</PRE>
-
-Writes a written representation of obj to the given port. Strings that
-appear in the written representation are enclosed in doublequotes, and
-within those strings backslash and doublequote characters are escaped
-by backslashes. Character objects are written using the #\
-notation. 
-
-</P><P>
-
-Objects which denote locations rather than values (cons cells,
-vectors, and non-zero-length strings in R5RS scheme; also mutable
-objects, records, or containers if provided by the implementation), if
-they appear at more than one point in the data being written, must be
-preceded by <tt>"#N="</tt> the first time they are written and
-replaced by <tt>"#N#"</tt> all subsequent times they are written,
-where N is a natural number used to identify that particular object.
-If objects which denote locations occur only once in the structure,
-then <tt>(write-with-shared-structure)</tt> must produce the same
-external representation for those objects as <tt>(write)</tt>.
-
-</P>
-
-<P>
-
-Write-with-shared-structure must terminate in finite time when writing
-finite data.  Write-with-shared-structure must produce a finite
-representation when writing finite data.
-
-</P><P>
-
-Write-with-shared-structure returns an unspecified value. The port
-argument may be omitted, in which case it defaults to the value
-returned by <tt>(current-output-port)</tt>.  The optarg argument may
-also be omitted.  If present, its effects on the output and return
-value are unspecified but <tt>(write-with-shared-structure)</tt> must
-still write a representation that can be read by
-<tt>(read-with-shared-structure)</tt>.  Some implementations may wish to
-use optarg to specify formatting conventions, numeric radixes, or
-return values. The reference implementation ignores optarg.
-
-</P>
-<P>
-
-For example, the code
-<PRE>
-
-(begin (define a (cons 'val1 'val2))
-       (set-cdr! a a)
-       (write-with-shared-structure a))
-
-</PRE>
-
-should produce the output <tt> #1=(val1 . #1#) </tt>.  This shows a cons
-cell whose cdr contains itself.
-
-</P><P>
-
-<PRE>
-
-[[library procedure]] <a name="read-with-shared-structure">(read-with-shared-structure)</a>
-[[library procedure]] (read-with-shared-structure  port)
-
-</PRE>
-
-<tt>(read-with-shared-structure)</tt> converts the external
-representations of Scheme objects produced by
-<tt>(write-with-shared-structure)</tt> into scheme objects.  That is,
-it is a parser for the nonterminal &lt;datum&gt; in the augmented
-external representation grammar defined above.
-<tt>(read-with-shared-structure)</tt> returns the next object parsable
-from the given input port, updating port to point to the first
-character past the end of the external representation of the object.
-
-</P> <P>
-
-If an end-of-file is encountered in the input before any characters
-are found that can begin an object, then an end-of-file object is
-returned.  The port remains open, and further attempts to read it (by
-<tt>(read-with-shared-structure)</tt> or <tt>(read)</tt> will also
-return an end-of-file object.  If an end of file is encountered after
-the beginning of an object's external representation, but the external
-representation is incomplete and therefore not parsable, an error is
-signalled.
-
-</P><P>
-
-The port argument may be omitted, in which case it defaults to the
-value returned by <tt>(current-input-port)</tt>.  It is an error to
-read from a closed port.
-
-</P>
-
-
-
-
-<H1>Implementation</H1>
-
-<P>
-
-The reference implementation of <tt>(write-with-shared-structure)</tt>
-is based on an implementation provided by Al Petrofsky.  If there are
-any errors in it, I probably introduced them when I was adding support
-for an optional port argument.  The reference implementation of
-<tt>(read-with-shared-structure)</tt> <i>is</i> the implementation
-provided by Al Petrofsky.  Both are used here with his generous
-permission.
-
-</P>
-
-<P>
-
-Note that portability forces the reference implementation of
-<tt>(write-with-shared-structure)</tt> to be O(N^2) but that if an
-implementor tracks objects through additional fields hidden from R5RS
-scheme, a more efficient implementation can be provided.
-
-</P>
-<P>
-
-If all the locations in your scheme are mutable and you don't do any
-locking or multithreading, you can write an O(n) version that
-destructively marks locations as it goes and then restores them all
-when done.  If locations are immutable, then there should be some
-fixed ordering of them that you can use to make an O(log n) lookup
-table, giving you an O(n log n) write-with-shared-structure.  R5RS
-does not give the programmer access to mutability information nor to
-comparison of constant data's addresses, but both of these are trivial
-operations if you have access to the system's internals.
-
-</P>
-
-
-<PRE>
-;;; A printer that shows all sharing of substructures.  Uses the Common
-;;; Lisp print-circle notation: #n# refers to a previous substructure
-;;; labeled with #n=.   Takes O(n^2) time.
-
-
-  (define (write-with-shared-structure obj . optional-port)
-    (define (acons key val alist)
-      (cons (cons key val) alist))
-    (define outport (if (eq? '() optional-port)
-			(current-output-port)
-			(car optional-port)))
-    ;; We only track duplicates of pairs, vectors, and strings.  We
-    ;; ignore zero-length vectors and strings because r5rs doesn't
-    ;; guarantee that eq? treats them sanely (and they aren't very
-    ;; interesting anyway).
-
-    (define (interesting? obj)
-      (or (pair? obj)
-	  (and (vector? obj) (not (zero? (vector-length obj))))
-	  (and (string? obj) (not (zero? (string-length obj))))))
-    ;; (write-obj OBJ ALIST):
-    ;; ALIST has an entry for each interesting part of OBJ.  The
-    ;; associated value will be:
-    ;;  -- a number if the part has been given one,
-    ;;  -- #t if the part will need to be assigned a number but has not been yet,
-    ;;  -- #f if the part will not need a number.
-    ;; The cdr of ALIST's first element should be the most recently
-    ;; assigned number.
-    ;; Returns an alist with new shadowing entries for any parts that
-    ;; had numbers assigned.
-    (define (write-obj obj alist)
-      (define (write-interesting alist)
-	(cond ((pair? obj)
-	       (display "(" outport)
-	       (let write-cdr ((obj (cdr obj)) (alist (write-obj (car obj) alist)))
-		 (cond ((and (pair? obj) (not (cdr (assq obj alist))))
-			(display " " outport)
-			(write-cdr (cdr obj) (write-obj (car obj) alist)))
-		       ((null? obj)
-			(display ")" outport)
-			alist)
-		       (else
-			(display " . " outport)
-			(let ((alist (write-obj obj alist)))
-			  (display ")" outport)
-			  alist)))))
-	      ((vector? obj)
-	       (display "#(" outport)
-	       (let ((len (vector-length obj)))
-		 (let write-vec ((i 1) (alist (write-obj (vector-ref obj 0) alist)))
-		   (cond ((= i len) (display ")" outport) alist)
-			 (else (display " " outport)
-			       (write-vec (+ i 1)
-					  (write-obj (vector-ref obj i) alist)))))))
-	      ;; else it's a string
-	      (else (write obj outport) alist)))
-      (cond ((interesting? obj)
-	     (let ((val (cdr (assq obj alist))))
-	       (cond ((not val) (write-interesting alist))
-		     ((number? val) 
-		      (begin (display "#" outport)
-			     (write val outport)
-			     (display "#" outport) alist))
-		     (else
-		      (let ((n (+ 1 (cdar alist))))
-			(begin (display "#" outport)
-			       (write n outport) 
-			       (display "=" outport))
-			(write-interesting (acons obj n alist)))))))
-	    (else (write obj outport) alist)))
-
-    ;; Scan computes the initial value of the alist, which maps each
-    ;; interesting part of the object to #t if it occurs multiple times,
-    ;; #f if only once.
-    (define (scan obj alist)
-      (cond ((not (interesting? obj)) alist)
-	    ((assq obj alist)
-             => (lambda (p) (if (cdr p) alist (acons obj #t alist))))
-	    (else
-	     (let ((alist (acons obj #f alist)))
-	       (cond ((pair? obj) (scan (car obj) (scan (cdr obj) alist)))
-		     ((vector? obj)
-		      (let ((len (vector-length obj)))
-			(do ((i 0 (+ 1 i))
-			     (alist alist (scan (vector-ref obj i) alist)))
-			    ((= i len) alist))))
-		     (else alist))))))
-    (write-obj obj (acons 'dummy 0 (scan obj '())))
-    ;; We don't want to return the big alist that write-obj just returned.
-    (if #f #f))
-
-
-
-
-
-(define (read-with-shared-structure . optional-port)
-  (define port
-    (if (null? optional-port) (current-input-port) (car optional-port)))
-
-  (define (read-char*) (read-char port))
-  (define (peek-char*) (peek-char port))
-
-  (define (looking-at? c)
-    (eqv? c (peek-char*)))
-
-  (define (delimiter? c)
-    (case c
-      ((#\( #\) #\" #\;) #t)
-      (else (or (eof-object? c)
-		(char-whitespace? c)))))
-
-  (define (not-delimiter? c) (not (delimiter? c)))
-
-  (define (eat-intertoken-space)
-    (define c (peek-char*))
-    (cond ((eof-object? c))
-	  ((char-whitespace? c) (read-char*) (eat-intertoken-space))
-	  ((char=? c #\;)
-	   (do ((c (read-char*) (read-char*)))
-	       ((or (eof-object? c) (char=? c #\newline))))
-	   (eat-intertoken-space))))
-
-  (define (read-string)
-    (read-char*)
-    (let read-it ((chars '()))
-      (let ((c (read-char*)))
-	(if (eof-object? c)
-	    (error "EOF inside a string")
-	    (case c
-	      ((#\") (list->string (reverse chars)))
-	      ((#\\) (read-it (cons (read-char*) chars)))
-	      (else (read-it (cons c chars))))))))
-
-  ;; reads chars that match PRED and returns them as a string.
-  (define (read-some-chars pred)
-    (let iter ((chars '()))
-      (let ((c (peek-char*)))
-	(if (or (eof-object? c) (not (pred c)))
-	    (list->string (reverse chars))
-	    (iter (cons (read-char*) chars))))))
-
-  ;; reads a character after the #\ has been read.
-  (define (read-character)
-    (let ((c (peek-char*)))
-      (cond ((eof-object? c) (error "EOF inside a character"))
-	    ((char-alphabetic? c)
-	     (let ((name (read-some-chars char-alphabetic?)))
-	       (cond ((= 1 (string-length name)) (string-ref name 0))
-		     ((string-ci=? name "space") #\space)
-		     ((string-ci=? name "newline") #\newline)
-		     (else (error "Unknown named character: " name)))))
-	    (else (read-char*)))))
-
-  (define (read-number first-char)
-    (let ((str (string-append (string first-char)
-			      (read-some-chars not-delimiter?))))
-      (or (string->number str)
-	  (error "Malformed number: " str))))
-
-  (define char-standard-case
-    (if (char=? #\a (string-ref (symbol->string 'a) 0))
-	char-downcase
-	char-upcase))
-
-  (define (string-standard-case str)
-    (let* ((len (string-length str))
-	   (new (make-string len)))
-      (do ((i 0 (+ i 1)))
-	  ((= i len) new)
-	(string-set! new i (char-standard-case (string-ref str i))))))
-
-  (define (read-identifier)
-    (string->symbol (string-standard-case (read-some-chars not-delimiter?))))
-
-  (define (read-part-spec)
-    (let ((n (string->number (read-some-chars char-numeric?))))
-      (let ((c (read-char*)))
-	(case c
-	  ((#\=) (cons 'decl n))
-	  ((#\#) (cons 'use n))
-	  (else (error "Malformed shared part specifier"))))))
-
-  ;; Tokens: strings, characters, numbers, booleans, and
-  ;; identifiers/symbols are represented as themselves.
-  ;; Single-character tokens are represented as (CHAR), the
-  ;; two-character tokens #( and ,@ become (#\#) and (#\@).
-  ;; #NN= and #NN# become (decl . NN) and (use . NN).
-  (define (read-optional-token)
-    (eat-intertoken-space)
-    (let ((c (peek-char*)))
-      (case c
-	((#\( #\) #\' #\`) (read-char*) (list c))
-	((#\,)
-	 (read-char*)
-	 (if (looking-at? #\@)
-	     (begin (read-char*) '(#\@))
-	     '(#\,)))
-	((#\") (read-string))
-	((#\.)
-	 (read-char*)
-	 (cond ((delimiter? (peek-char*)) '(#\.))
-	       ((not (looking-at? #\.)) (read-number #\.))
-	       ((begin (read-char*) (looking-at? #\.)) (read-char*) '...)
-	       (else (error "Malformed token starting with \"..\""))))
-	((#\+) (read-char*) (if (delimiter? (peek-char*)) '+ (read-number c)))
-	((#\-) (read-char*) (if (delimiter? (peek-char*)) '- (read-number c)))
-	((#\#)
-	 (read-char*)
-	 (let ((c (peek-char*)))
-	   (case c
-	     ((#\() (read-char*) '(#\#))
-	     ((#\\) (read-char*) (read-character))
-	     ((#\t #\T) (read-char*) #t)
-	     ((#\f #\F) (read-char*) #f)
-	     (else (cond ((eof-object? c) (error "EOF inside a # token"))
-			 ((char-numeric? c) (read-part-spec))
-			 (else (read-number #\#)))))))
-	(else (cond ((eof-object? c) c)
-		    ((char-numeric? c) (read-char*) (read-number c))
-		    (else (read-identifier)))))))
-
-  (define (read-token)
-    (let ((tok (read-optional-token)))
-      (if (eof-object? tok)
-	  (error "EOF where token was required")
-	  tok)))
-
-  ;; Parts-alist maps the number of each part to a thunk that returns the part.
-  (define parts-alist '())
-
-  (define (add-part-to-alist! n thunk)
-    (set! parts-alist (cons (cons n thunk) parts-alist)))
-
-  ;; Read-object returns a datum that may contain some thunks, which
-  ;; need to be replaced with their return values.
-  (define (read-object)
-    (finish-reading-object (read-token)))
-
-  ;; Like read-object, but may return EOF.
-  (define (read-optional-object)
-    (finish-reading-object (read-optional-token)))
-
-  (define (finish-reading-object first-token)
-    (if (not (pair? first-token))
-	first-token
-	(if (char? (car first-token))
-	    (case (car first-token)
-	      ((#\() (read-list-tail))
-	      ((#\#) (list->vector (read-list-tail)))
-	      ((#\. #\)) (error (string-append "Unexpected \"" first-token "\"")))
-	      (else
-	       (list (caadr (assv (car first-token)
-				  '((#\' 'x) (#\, ,x) (#\` `x) (#\@ ,@x))))
-		     (read-object))))
-	    ;; We need to specially handle chains of declarations in
-	    ;; order to allow #1=#2=x and #1=(#2=#1#) and not to allow
-	    ;; #1=#2=#1# nor #1=#2=#1=x.
-	    (let ((starting-alist parts-alist))
-	      (let read-decls ((token first-token))
-		(if (and (pair? token) (symbol? (car token)))
-		    (let ((n (cdr token)))
-		      (case (car token)
-			((use)
-			 ;; To use a part, it must have been
-			 ;; declared before this chain started.
-			 (cond ((assv n starting-alist) => cdr)
-			       (else (error "Use of undeclared part " n))))
-			((decl)
-			 (if (assv n parts-alist)
-			     (error "Double declaration of part " n))
-			 ;; Letrec enables us to make deferred
-			 ;; references to an object before it exists.
-			 (letrec ((obj (begin
-					 (add-part-to-alist! n (lambda () obj))
-					 (read-decls (read-token)))))
-			   obj))))
-		    (finish-reading-object token)))))))
-
-  (define (read-list-tail)
-    (let ((token (read-token)))
-      (if (not (pair? token))
-	  (cons token (read-list-tail))
-	  (case (car token)
-	    ((#\)) '())
-	    ((#\.) (let* ((obj (read-object))
-			  (tok (read-token)))
-		     (if (and (pair? tok) (char=? #\) (car tok)))
-			 obj
-			 (error "Extra junk after a dot"))))
-	    (else (let ((obj (finish-reading-object token)))
-		    (cons obj (read-list-tail))))))))
-
-  ;; Unthunk.
-  ;; To deference a part that was declared using another part,
-  ;; e.g. #2=#1#, may require multiple dethunkings.  We were careful
-  ;; in finish-reading-object to ensure that this won't loop forever:
-  (define (unthunk thunk)
-    (let ((x (thunk)))
-      (if (procedure? x) (unthunk x) x)))
-
-  (let ((obj (read-optional-object)))
-    (let fill-in-parts ((obj obj))
-      (cond ((pair? obj)
-	     (if (procedure? (car obj))
-		 (set-car! obj (unthunk (car obj)))
-		 (fill-in-parts (car obj)))
-	     (if (procedure? (cdr obj))
-		 (set-cdr! obj (unthunk (cdr obj)))
-		 (fill-in-parts (cdr obj))))
-	    ((vector? obj)
-	     (let ((len (vector-length obj)))
-	       (do ((i 0 (+ i 1)))
-		   ((= i len))
-		 (let ((elt (vector-ref obj i)))
-		   (if (procedure? elt)
-		       (vector-set! obj i (unthunk elt))
-		       (fill-in-parts elt))))))))
-    obj))
-
-</PRE>
-
-
-<H1>Copyright</H1>
-<p>Copyright (C) Ray Dillinger 2003. All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a
-    href="mailto:srfi-editors@srfi.schemers.org">David Rush</a></address>
-<!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-<!-- hhmts start -->
-Last modified: Wed Apr  2 19:58:58 BST 2003
-<!-- hhmts end -->
-  </body>
-</html>
-
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-39.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-39.html
deleted file mode 100644
index efd33ed205..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-39.html
+++ /dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 39: Parameter objects</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 39: Parameter objects
-
-<H1>Author</H1>
-
-Marc Feeley
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status. To see an explanation of
-each status that a SRFI can hold, see <a
-href="http://srfi.schemers.org/srfi-process.html">here</a>.  
-You can access
-previous messages via
-<a href="http://srfi.schemers.org/srfi-39/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-
-<UL>
-      <LI>Draft: 2002/12/21-2003/02/18</LI>
-      <LI>Revised: 2003/5/15</LI>
-      <LI>Final: 2003/6/30</LI>
-</UL>
-
-
-<H1>Abstract</H1>
-
-<P>
-This SRFI defines <I>parameter</I> objects, the procedure
-<CODE>make-parameter</CODE> to
-create parameter objects and the <CODE>parameterize</CODE> special
-form to dynamically bind parameter objects.  In the dynamic
-environment, each parameter object is bound to a cell containing the
-value of the parameter.  When a procedure is called the called
-procedure inherits the dynamic environment from the caller.  The
-<CODE>parameterize</CODE> special form allows the binding of a
-parameter object to be changed for the dynamic extent of its body.
-</P>
-
-<H1>Rationale</H1>
-
-<P>
-The <I>dynamic environment</I> is the structure which allows
-the system to find the value returned by the R5RS procedures
-<CODE>current-input-port</CODE> and <CODE>current-output-port</CODE>.
-The R5RS procedures <CODE>with-input-from-file</CODE> and
-<CODE>with-output-to-file</CODE> extend the dynamic environment to
-produce a new dynamic environment which is in effect for the dynamic
-extent of the call to the thunk passed as their last argument.  These
-procedures are essentially special purpose dynamic binding operations
-on hidden dynamic variables (one for <CODE>current-input-port</CODE>
-and one for <CODE>current-output-port</CODE>).  The purpose of this
-SRFI is to generalize this dynamic binding mechanism (which exists in
-all R5RS compliant systems) to allow the user to introduce new dynamic
-variables and dynamically bind them.
-</P>
-
-<P>
-General dynamic binding mechanisms exist in several implementations of
-Scheme under various names, including "fluid" variables and parameter
-objects.  The parameter objects specified in this SRFI are compatible
-with the semantics of all implementations of Scheme we know which
-currently support parameter objects (in the sense that it is possible
-to implement this SRFI so that old code works the same as before).  We
-believe Chez-Scheme was the first implementation of Scheme to have
-used parameter objects.
-</P>
-
-<P>
-In the presence of threads, the dynamic binding mechanism does not
-behave the same way in all implementations of Scheme supporting
-dynamic binding.  The issue is the relationship between the dynamic
-environments of the parent and child threads when a thread is created.
-In Scheme 48 the child gets a fresh dynamic environment where
-(typically but not necessarily) all the bindings are to their initial
-value.  In MzScheme and Gambit-C the child is given a dynamic
-environment inherited from the parent.  In this inherited dynamic
-environment the dynamic variables have the same values as the parent's
-dynamic environment.  However, in MzScheme the cells bound to the
-dynamic variables in the child are distinct from those of the parent
-(i.e. an assignment of a value to a dynamic variable is not visible in
-the other thread).  In Gambit-C the child and parent dynamic
-environment share the same cells (i.e. an assignment of a value to a
-dynamic variable is visible in the other thread).  Note that in the
-absence of assignment to dynamic variables the MzScheme and Gambit-C
-approaches are equivalent.
-</P>
-
-<P>
-Given that there are semantic differences in the presence of threads
-and that there are valid reasons for choosing each semantics, this
-SRFI does not specify the semantics of parameter objects in the
-presence of threads.  It is left to the implementation and other SRFIs
-which extend this SRFI to specify the interaction between parameter
-objects and threads.
-</P>
-
-<H1>Specification</H1>
-
-<P>
-The <I>dynamic environment</I> is composed of two parts: the <I>local
-dynamic environment</I> and the <I>global dynamic environment</I>.
-The global dynamic environment is used to lookup parameter objects
-that can't be found in the local dynamic environment.  When parameter
-objects are created, their initial binding is put in the global
-dynamic environment (by mutation).  The local dynamic environment is
-only extended by the <CODE>parameterize</CODE> form.
-</P>
-
-<P>
-<I>Parameter objects</I> are created with the
-<CODE>make-parameter</CODE> procedure which takes one or two
-arguments.  The second argument is a one argument <I>conversion
-procedure</I>.  If only one argument is passed to
-<CODE>make-parameter</CODE> the identity function is used as a
-conversion procedure.  The global dynamic environment is updated to
-associate the parameter object to a new cell.  The initial content of
-the cell is the result of applying the conversion procedure to the
-first argument of <CODE>make-parameter</CODE>.
-</P>
-
-<P>
-A <I>parameter object</I> is a procedure which accepts zero or one
-argument.  The cell bound to a particular parameter object in the
-dynamic environment is accessed by calling the parameter object.  When
-no argument is passed, the content of the cell is returned.  When one
-argument is passed the content of the cell is updated with the result
-of applying the parameter object's conversion procedure to the
-argument.
-</P>
-
-<P>
-The <CODE>parameterize</CODE> special form, when given a parameter
-object and a value, binds for the dynamic extent of its body the
-parameter object to a new cell.  The initial content of the cell is
-the result of applying the parameter object's conversion procedure to
-the value.  The <CODE>parameterize</CODE> special form behaves
-analogously to <CODE>let</CODE> when binding more than one parameter
-object (that is the order of evaluation is unspecified and the new
-bindings are only visible in the body of the <CODE>parameterize</CODE>
-special form).
-</P>
-
-<P>
-Note that the conversion procedure can be used for guaranteeing the
-type of the parameter object's binding and/or to perform some
-conversion of the value.
-</P>
-
-<P>
-Because it is possible to implement the R5RS procedures
-<CODE>current-input-port</CODE> and <CODE>current-output-port</CODE>
-as parameter objects and this offers added functionnality, it is
-required by this SRFI that they be implemented as parameter objects
-created with <CODE>make-parameter</CODE>.
-</P>
-
-<H4>Procedures and syntax</H4>
-
-<DL>
-
-<DT><PRE>
-<a name="make-parameter">(make-parameter <I>init</I> [<I>converter</I>])</a>                     ;procedure
-</PRE><DD>
-
-<P>
-Returns a new parameter object which is bound in the global dynamic
-environment to a cell containing the value returned by the call
-<CODE>(<I>converter</I> <I>init</I>)</CODE>.  If the conversion
-procedure <I>converter</I> is not specified the identity function is
-used instead.
-</P>
-
-<P>
-The parameter object is a procedure which accepts zero or one
-argument.  When it is called with no argument, the content of the cell
-bound to this parameter object in the current dynamic environment is
-returned.  When it is called with one argument, the content of the
-cell bound to this parameter object in the current dynamic environment
-is set to the result of the call <CODE>(<I>converter</I>
-<I>arg</I>)</CODE>, where <I>arg</I> is the argument passed to the
-parameter object, and an unspecified value is returned.
-</P>
-
-<PRE>
-    (define radix
-      (make-parameter 10))
-
-    (define write-shared
-      (make-parameter
-        #f
-        (lambda (x)
-          (if (boolean? x)
-              x
-              (error "only booleans are accepted by write-shared")))))
-
-    (radix)           ==>  10
-    (radix 2)
-    (radix)           ==>  2
-    (write-shared 0)  gives an error
-
-    (define prompt
-      (make-parameter
-        123
-        (lambda (x)
-          (if (string? x)
-              x
-              (with-output-to-string (lambda () (write x)))))))
-
-    (prompt)       ==>  "123"
-    (prompt ">")
-    (prompt)       ==>  ">"
-</PRE>
-
-<P>
-<DT><PRE>
-<a name="parameterize">(parameterize ((<I>expr1</I> <I>expr2</I>) ...) <I>&lt;body&gt;</I>)</a>             ;syntax
-</PRE><DD>
-
-<P>
-    The expressions <I>expr1</I> and <I>expr2</I> are evaluated in an
-    unspecified order.  The value of the <I>expr1</I> expressions must
-    be parameter objects.  For each <I>expr1</I> expression and in an
-    unspecified order, the local dynamic environment is extended with
-    a binding of the parameter object <I>expr1</I> to a new cell whose
-    content is the result of the call <CODE>(<I>converter</I>
-    <I>val</I>)</CODE>, where <I>val</I> is the value of <I>expr2</I>
-    and <I>converter</I> is the conversion procedure of the parameter
-    object.  The resulting dynamic environment is then used for the
-    evaluation of <I>&lt;body&gt</I> (which refers to the R5RS grammar
-    nonterminal of that name).  The result(s) of the
-    <CODE>parameterize</CODE> form are the result(s) of the
-    <I>&lt;body&gt</I>.
-</P>
-
-<PRE>
-    (radix)                                              ==>  2
-    (parameterize ((radix 16)) (radix))                  ==>  16
-    (radix)                                              ==>  2
-
-    (define (f n) (number->string n (radix)))
-
-    (f 10)                                               ==>  "1010"
-    (parameterize ((radix 8)) (f 10))                    ==>  "12"
-    (parameterize ((radix 8) (prompt (f 10))) (prompt))  ==>  "1010"
-</PRE>
-
-<H1>Implementation</H1>
-
-<P>
-The following implementation uses association lists to represent local
-dynamic environments.  The global dynamic environment binding is
-stored in the parameter object itself.  Since we are assuming that
-there is a single thread, the current local dynamic environment can be
-bound to a global variable, <CODE>dynamic-env-local</CODE>.  Mutations
-of this variable are wrapped in a <CODE>dynamic-wind</CODE> so that
-the local dynamic environment returns to its previous value when
-control exits the body of the <CODE>parameterize</CODE>.
-</P>
-
-<PRE>
-    (define make-parameter
-      (lambda (init . conv)
-        (let ((converter
-               (if (null? conv) (lambda (x) x) (car conv))))
-          (let ((global-cell
-                 (cons #f (converter init))))
-            (letrec ((parameter
-                      (lambda new-val
-                        (let ((cell (dynamic-lookup parameter global-cell)))
-                          (cond ((null? new-val)
-                                 (cdr cell))
-                                ((null? (cdr new-val))
-                                 (set-cdr! cell (converter (car new-val))))
-                                (else ; this case is needed for parameterize
-                                 (converter (car new-val))))))))
-              (set-car! global-cell parameter)
-              parameter)))))
-
-    (define-syntax parameterize
-      (syntax-rules ()
-        ((parameterize ((expr1 expr2) ...) body ...)
-         (dynamic-bind (list expr1 ...)
-                       (list expr2 ...)
-                       (lambda () body ...)))))
-
-    (define dynamic-bind
-      (lambda (parameters values body)
-        (let* ((old-local
-                (dynamic-env-local-get))
-               (new-cells
-                (map (lambda (parameter value)
-                       (cons parameter (parameter value #f)))
-                     parameters
-                     values))
-               (new-local
-                (append new-cells old-local)))
-          (dynamic-wind
-            (lambda () (dynamic-env-local-set! new-local))
-            body
-            (lambda () (dynamic-env-local-set! old-local))))))
-
-    (define dynamic-lookup
-      (lambda (parameter global-cell)
-        (or (assq parameter (dynamic-env-local-get))
-            global-cell)))
-
-    (define dynamic-env-local '())
-
-    (define dynamic-env-local-get
-      (lambda () dynamic-env-local))
-
-    (define dynamic-env-local-set!
-      (lambda (new-env) (set! dynamic-env-local new-env)))
-</PRE>
-
-<H1>Copyright</H1>
-<p>Copyright (C) Marc Feeley 2002. All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-4.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-4.html
deleted file mode 100644
index f48174fd17..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-4.html
+++ /dev/null
@@ -1,368 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 4: Homogeneous numeric vector datatypes</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI-4: Homogeneous numeric vector datatypes
-
-<H1>Author</H1>
-
-Marc Feeley
-
-<H1>Status</H1>
-This SRFI is currently in ``final'' status.  To see an explanation of
-each status that a SRFI can hold, see <A
-HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access previous messages via <A
-HREF="http://srfi.schemers.org/srfi-4/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P><UL>
-<LI>Received: 1998/1/11
-<LI>Draft: 1999/1/19-1999/03/19
-<LI>Revised: 1999/04/26
-<LI>Final: 1999/5/22
-</UL>
-
-<H1>Abstract</H1>
-
-This SRFI describes a set of datatypes for vectors whose elements are
-of the same numeric type (signed or unsigned exact integer or inexact
-real of a given precision).  These datatypes support operations
-analogous to the Scheme vector type, but they are distinct datatypes.
-An external representation is specified which must be supported by the
-<code>read</code> and <code>write</code> procedures and by the program
-parser (i.e. programs can contain references to literal homogeneous
-vectors).
-
-<H1>Rationale</H1>
-
-Like lists, Scheme vectors are a heterogeneous datatype which impose
-no restriction on the type of the elements.  This generality is not
-needed for applications where all the elements are of the same type.
-The use of Scheme vectors is not ideal for such applications because,
-in the absence of a compiler with a fancy static analysis, the
-representation will typically use some form of boxing of the elements
-which means low space efficiency and slower access to the elements.
-Moreover, homogeneous vectors are convenient for interfacing with
-low-level libraries (e.g. binary block I/O) and to interface with
-foreign languages which support homogeneous vectors.  Finally, the use
-of homogeneous vectors allows certain errors to be caught earlier.
-
-	<p></p>
-
-This SRFI specifies a set of homogeneous vector datatypes which cover
-the most practical case, that is where the type of the elements is
-numeric (exact integer or inexact real) and the precision and
-representation is efficiently implemented on the hardware of most
-current computer architectures (8, 16, 32 and 64 bit integers, either
-signed or unsigned, and 32 and 64 bit floating point numbers).
-
-<H1>Specification</H1>
-
-There are 8 datatypes of exact integer homogeneous vectors (which will
-be called integer vectors):
-
-<TABLE>
-<TR>
-<TD><TD><STRONG>datatype</STRONG> <TD><STRONG>type of elements</STRONG>
-</TR>
-<TR>
-<TD><TD><code><a name="s8vector">s8vector</a></code> <TD>signed exact integer in the range -(2^7) to (2^7)-1
-</TR>
-<TR>
-<TD><TD><code><a name="u8vector">u8vector</a></code> <TD>unsigned exact integer in the range 0 to (2^8)-1
-</TR>
-<TR>
-<TD><TD><code><a name="s16vector">s16vector</a></code><TD>signed exact integer in the range -(2^15) to (2^15)-1
-</TR>
-<TR>
-<TD><TD><code><a name="u16vector">u16vector</a></code><TD>unsigned exact integer in the range 0 to (2^16)-1
-</TR>
-<TR>
-<TD><TD><code><a name="s32vector">s32vector</a></code><TD>signed exact integer in the range -(2^31) to (2^31)-1
-</TR>
-<TR>
-<TD><TD><code><a name="u32vector">u32vector</a></code><TD>unsigned exact integer in the range 0 to (2^32)-1
-</TR>
-<TR>
-<TD><TD><code><a name="s64vector">s64vector</a></code><TD>signed exact integer in the range -(2^63) to (2^63)-1
-</TR>
-<TR>
-<TD><TD><code><a name="u64vector">u64vector</a></code><TD>unsigned exact integer in the range 0 to (2^64)-1
-</TR>
-</TABLE>
-
-	<p></p>
-
-There are 2 datatypes of inexact real homogeneous vectors (which will
-be called float vectors):
-
-<TABLE>
-<TR>
-<TD><TD><STRONG>datatype</STRONG> <TD><STRONG>type of elements</STRONG>
-</TR>
-<TR>
-<TD><TD><code><a name="f32vector">f32vector</a></code> <TD>inexact real
-</TR>
-<TR>
-<TD><TD><code><a name="f64vector">f64vector</a></code> <TD>inexact real
-</TR>
-</TABLE>
-
-	<p></p>
-
-The only difference between the two float vector types is that
-<code>f64vector</code>s preserve at least as much precision as
-<code>f32vector</code>s (see the implementation section for details).
-
-	<p></p>
-
-A Scheme system that conforms to this SRFI does not have to support
-all of these homogeneous vector datatypes.  However, a Scheme system
-must support <code>f32vector</code>s and <code>f64vector</code>s if it
-supports Scheme inexact reals (of any precision).  A Scheme system
-must support a particular integer vector datatype if the system's
-exact integer datatype contains all the values that can be stored in
-such an integer vector.  Thus a Scheme system with bignum support must
-implement all the integer vector datatypes and a Scheme system may
-only support <code>s8vector</code>s, <code>u8vector</code>s,
-<code>s16vector</code>s and <code>u16vector</code>s if it only
-supports small integers in the range -(2^29) to (2^29)-1 (which would
-be the case if they are represented as 32 bit fixnums with two bits
-for tag).  Note that it is possible to test which numeric datatypes
-the Scheme system supports by calling the
-<code>string-&gt;number</code> procedure (e.g.
-<code>(string-&gt;number "0.0")</code> returns <code>#f</code> if the
-Scheme system does not support inexact reals).
-
-	<p></p>
-
-Each homogeneous vector datatype has an external representation which
-is supported by the <code>read</code> and <code>write</code>
-procedures and by the program parser.  Each datatype also has a set of
-associated predefined procedures analogous to those available for
-Scheme's heterogeneous vectors.
-
-	<p></p>
-
-For each value of <code>TAG</code> in {
-<code>s8</code>, <code>u8</code>,
-<code>s16</code>, <code>u16</code>,
-<code>s32</code>, <code>u32</code>,
-<code>s64</code>, <code>u64</code>,
-<code>f32</code>, <code>f64</code>
-}, if the datatype <code>TAGvector</code> is supported, then
-
-	<p></p>
-
-<OL>
-
-<LI> the external representation of instances of the datatype
-<code>TAGvector</code> is <code>#TAG(</code> ...elements... <code>)</code>.
-
-	<p></p>
-
-For example, <code>#u8(0 #e1e2 #xff)</code> is an
-<code>u8vector</code> of length 3 containing 0, 100 and 255;
-<code>#f64(-1.5)</code> is an <code>f64vector</code> of length 1
-containing -1.5.
-
-	<p></p>
-
-Note that the syntax for float vectors conflicts with Standard Scheme
-which parses <code>#f32()</code> as 3 objects: <code>#f</code>,
-<code>32</code> and <code>()</code>.  For this reason, conformance to
-this SRFI implies this minor nonconformance to Standard Scheme.
-
-	<p></p>
-
-This external representation is also available in program source code.
-For example, <code>(set! x '#u8(1 2 3))</code> will set <code>x</code>
-to the object <code>#u8(1 2 3)</code>.  Literal homogeneous vectors
-must be quoted just like heterogeneous vectors must be.  Homogeneous
-vectors can appear in quasiquotations but must not contain
-<code>unquote</code> or <code>unquote-splicing</code> forms
-(i.e. <code>`(,x #u8(1 2))</code> is legal but <code>`#u8(1 ,x
-2)</code> is not).  This restriction is to accommodate the many Scheme
-systems that use the <code>read</code> procedure to parse programs.
-
-	<p></p>
-
-<LI> the following predefined procedures are available:
-
-<OL>
-<LI> <code>(TAGvector? obj)</code>
-<LI> <code>(make-TAGvector n [ TAGvalue ])</code>
-<LI> <code>(TAGvector TAGvalue...)</code>
-<LI> <code>(TAGvector-length TAGvect)</code>
-<LI> <code>(TAGvector-ref TAGvect i)</code>
-<LI> <code>(TAGvector-set! TAGvect i TAGvalue)</code>
-<LI> <code>(TAGvector-&gt;list TAGvect)</code>
-<LI> <code>(list-&gt;TAGvector TAGlist)</code>
-</OL>
-
-where <code>obj</code> is any Scheme object, <code>n</code> is a
-nonnegative exact integer, <code>i</code> is a nonnegative exact
-integer less than the length of the vector, <code>TAGvect</code> is an
-instance of the <code>TAGvector</code> datatype, <code>TAGvalue</code>
-is a number of the type acceptable for elements of the
-<code>TAGvector</code> datatype, and <code>TAGlist</code> is a proper
-list of numbers of the type acceptable for elements of the
-<code>TAGvector</code> datatype.
-
-	<p></p>
-
-It is an error if <code>TAGvalue</code> is not the same type as the
-elements of the <code>TAGvector</code> datatype (for example if an
-exact integer is passed to <code>f64vector</code>).  If the fill
-value is not specified, the content of the vector is unspecified
-but individual elements of the vector are guaranteed to be in the
-range of values permitted for that type of vector.
-
-</OL>
-
-<H1>Implementation</H1>
-
-The homogeneous vector datatypes described here suggest a concrete
-implementation as a sequence of 8, 16, 32 or 64 bit elements, using
-two's complement representation for the signed exact integers, and
-single and double precision IEEE-754 floating point representation for
-the inexact reals.  Although this is a practical implementation on
-many modern byte addressed machines, a different implementation is
-possible for machines which don't support these concrete numeric types
-(the CRAY-T90 for example does not have a 32 bit floating point
-representation and the 64 bit floating point representation does not
-conform to IEEE-754, so both the <code>f32vector</code> and
-<code>f64vector</code> datatypes could be represented the same way
-with 64 bit floating point numbers).
-
-	<p></p>
-
-A portable implementation of the homogeneous vector predefined
-procedures can be based on Scheme's heterogeneous vectors.
-Here is for example an implementation of <code>s8vector</code>s
-which is exempt of error checking:
-
-<PRE>
-(define s8vector? #f)
-(define make-s8vector #f)
-(define s8vector #f)
-(define s8vector-length #f)
-(define s8vector-ref #f)
-(define s8vector-set! #f)
-(define s8vector-&gt;list #f)
-(define list-&gt;s8vector #f)
-
-(let ((orig-vector? vector?)
-      (orig-make-vector make-vector)
-      (orig-vector vector)
-      (orig-vector-length vector-length)
-      (orig-vector-ref vector-ref)
-      (orig-vector-set! vector-set!)
-      (orig-vector-&gt;list vector-&gt;list)
-      (orig-list-&gt;vector list-&gt;vector)
-      (orig-&gt; &gt;)
-      (orig-eq? eq?)
-      (orig-+ +)
-      (orig-null? null?)
-      (orig-cons cons)
-      (orig-car car)
-      (orig-cdr cdr)
-      (orig-not not)
-      (tag (list 's8)))
-
-  (set! s8vector?
-    (lambda (obj)
-      (and (orig-vector? obj)
-           (orig-&gt; (orig-vector-length obj) 0)
-           (orig-eq? (orig-vector-ref obj 0) tag))))
-
-  (set! make-s8vector
-    (lambda (n . opt-fill)
-      (let ((v (orig-make-vector
-                 (orig-+ n 1)
-                 (if (orig-null? opt-fill) 123 (orig-car opt-fill)))))
-        (orig-vector-set! v 0 tag)
-        v)))
-
-  (set! s8vector
-    (lambda s8list
-      (orig-list-&gt;vector (orig-cons tag s8list))))
-
-  (set! s8vector-length
-    (lambda (s8vect)
-      (orig-+ (orig-vector-length s8vect) -1)))
-
-  (set! s8vector-ref
-    (lambda (s8vect i)
-      (orig-vector-ref s8vect (orig-+ i 1))))
-
-  (set! s8vector-set!
-    (lambda (s8vect i s8value)
-      (orig-vector-set! s8vect (orig-+ i 1) s8value)))
-
-  (set! s8vector-&gt;list
-    (lambda (s8vect)
-      (orig-cdr (orig-vector-&gt;list s8vect))))
-
-  (set! list-&gt;s8vector
-    (lambda (s8list)
-      (orig-list-&gt;vector (orig-cons tag s8list))))
-
-  (set! vector?
-    (lambda (obj)
-      (and (orig-vector? obj)
-           (orig-not (and (orig-&gt; (orig-vector-length obj) 0)
-                          (orig-eq? (orig-vector-ref obj 0) tag)))))))
-</PRE>
-
-	<p></p>
-
-The Scheme system's <code>read</code> and <code>write</code>
-procedures and the program parser also need to be extended to handle
-the homogeneous vector external representations.  The implementation
-is very similar to heterogeneous vectors except that <code>read</code>
-and the program parser must recognize the prefixes <code>#s8</code>,
-<code>#f32</code>, etc.  (this can be done by checking if the sharp
-sign is followed by a character that can start a symbol, and if this
-is the case, parse a symbol and check if it is <code>t</code>,
-<code>f</code>, <code>s8</code>, <code>f32</code>, and so on, and in
-the case of a homogeneous vector prefix, check if the next character
-is an opening parenthesis).
-
-<H1>Copyright</H1>
-Copyright (C) Marc Feeley (1999). All Rights Reserved. 
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-
-<hr>
-<address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">
-  Shriram Krishnamurthi</a></address>
-
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-40.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-40.html
deleted file mode 100644
index 734078142c..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-40.html
+++ /dev/null
@@ -1,1116 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 40: A Library of Streams</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 40: A Library of Streams
-
-<H1>Author</H1>
-
-Philip L. Bewig
-
-<H1>Status</H1>
-
-<p>
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-To comments
-this SRFI, please mail to 
-<a href="mailto:srfi-40@srfi.schemers.org">
-<code>srfi-40@srfi.schemers.org</code></a>.
-See <a href="http://srfi.schemers.org/srfi-list-subscribe.html">
-instructions here</a> to subscribe to the list.  You can access
-the discussion via
-<a href="http://srfi.schemers.org/srfi-40/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-You can access
-post-finalization messages via
-<a href="http://srfi.schemers.org/srfi-40/post-mail-archive/maillist.html">
-the archive of the mailing list</a>.
-</P>
-
-<LI>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-40/srfi-40.txt?rev=1.1">2003/02/03</a>
-<LI>Draft: 2003/02/03-2003/04/03
-<LI>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-40/srfi-40.txt?rev=1.2">2003/08/02</a>
-<LI>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-40/srfi-40.txt?rev=1.3">2003/12/23</a>
-<LI>Final: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-40/srfi-40.html?rev=1.4">2004/08/22</a>
-</UL>
-
-<H1>Abstract</H1>
-
-<p>
-Along with higher-order functions, one of the hallmarks of functional
-programming is lazy evaluation.  A primary manifestation of lazy
-evaluation is lazy lists, generally called streams by Scheme
-programmers, where evaluation of a list element is delayed until its
-value is needed.  
-</p>
-
-<p>
-The literature on lazy evaluation distinguishes two styles of
-laziness, called even and odd.  Odd style streams are ubiquitous among
-Scheme programs and can be easily encoded with the Scheme primitives
-delay and force defined in R5RS.  However, the even style delays
-evaluation in a manner closer to that of traditional lazy languages
-such as Haskell and avoids an "off by one" error that is symptomatic
-of the odd style.
-</p>
-
-<p>
-This SRFI defines the stream data type in the even style, some
-essential procedures and syntax that operate on streams, and motivates
-our choice of the even style.  A companion SRFI 41 Stream Library
-provides additional procedures and syntax which make for more
-convenient processing of streams and shows several examples of their
-use.  
-</p>
-
-<H1>Rationale</H1>
-
-<p>
-Two of the defining characteristics of functional programming
-languages are higher-order functions, which provide a powerful tool to
-allow programmers to abstract data representations away from an
-underlying concrete implementation, and lazy evaluation, which allows
-programmers to modularize a program and recombine the pieces in useful
-ways.  Scheme provides higher-order functions through its <code>lambda</code>
-keyword and lazy evaluation through its <code>delay</code> keyword.  A primary
-manifestation of lazy evaluation is lazy lists, generally called
-streams by Scheme programmers, where evaluation of a list element is
-delayed until its value is needed.  Streams can be used, among other
-things, to compute with infinities, conveniently process simulations,
-program with coroutines, and reduce the number of passes over data.
-This library defines a minimal set of functions and syntax for
-programming with streams.
-</p>
-
-<p>
-Scheme has a long tradition of computing with streams.  The great
-computer science textbook <a href="srfi-40.html#sicp">Structure and Interpretation
-of Computer Programs</a>, uses streams extensively.
-The <a href="http://www.schemers.org/Documents/Standards/R5RS/HTML/r5rs-Z-H-13.html#%_chap_Temp_9">example</a> given
-in R5RS makes use of streams to integrate systems of differential
-equations using the method of Runge-Kutta.  MIT Scheme, the original
-implementation of Scheme, provides streams natively.  <a
-href="srfi-40.html#scheme-and-the-art">Scheme and the Art of Programming</a>, 
-discusses streams.
-Some Scheme-like languages also have traditions of using streams:
-Winston and Horn, in their classic <a href="srfi-40.html#lisp">Lisp textbook</a>, discuss streams, and
-so does Larry Paulson in his <a href="srfi-40.html#ml-working-programmer">text on
-ML</a>. Streams are an important and useful data structure.
-</p>
-
-<p>
-Basically, a stream is much like a list, and can either be null or can
-consist of an object (the stream element) followed by another stream;
-the difference to a list is that elements aren't evaluated until they
-are accessed.  All the streams mentioned above use the same underlying
-representation, with the null stream represented by <code>'()</code>
-and stream pairs constructed by <code>(cons car (delay cdr))</code>,
-which must be implemented as syntax.  These streams are known as
-head-strict, because the head of the stream is always computed,
-whether or not it is needed.
-</p>
-
-<p>
-Streams are the central data type -- just as arrays are for most
-imperative languages and lists are for Lisp and Scheme -- for the
-"pure" functional languages Miranda and Haskell.  But those streams
-are subtly different from the traditional Scheme streams of SICP et
-al.  The difference is at the head of the stream, where Miranda and
-Haskell provide streams that are fully lazy, with even the head of the
-stream not computed until it is needed.  We'll see in a moment the
-operational difference between the two types of streams.
-</p>
-
-<p>
-Philip Wadler, Walid Taha, and David MacQueen, in their paper <a
-href="srfi-40.html#laziness-even-odd">"How to add laziness to a strict language
-without even being odd"</a>, describe how they added streams to the
-SML/NJ compiler.  They discuss two kinds of streams: odd streams, as
-in SICP et al, and even streams, as in Haskell; the names odd and even
-refer to the parity of the number of constructors (<code>delay</code>,
-<code>cons</code>, <code>nil</code>) used to represent the stream.
-Here are the first two figures from their paper, rewritten in Scheme:
-</p>
-
-<table><tr>
-<td valign="top">
-<pre>;;; FIGURE 1 -- ODD                 
-				    
-(define nil1 '())                   
-				    
-(define (nil1? strm)                
-  (null? strm))                     
-				    
-(define-syntax cons1                
-  (syntax-rules ()                  
-    ((cons1 obj strm)               
-      (cons obj (delay strm)))))    
-				    
-(define (car1 strm)                 
-  (car strm))                       
-				    
-(define (cdr1 strm)                 
-  (force (cdr strm)))               
-				    
-(define (map1 func strm)            
-                                    
-  (if (nil1? strm)                  
-    nil1                            
-    (cons1                          
-      (func (car1 strm))            
-      (map1 func (cdr1 strm)))))    
-				    
-(define (countdown1 n)              
-                                    
-  (cons1 n (countdown1 (- n 1))))   
-				    
-(define (cutoff1 n strm)            
-  (cond                             
-    ((zero? n) '())                 
-    ((nil1? strm) '())              
-    (else                           
-      (cons                         
-        (car1 strm)                 
-        (cutoff1 (- n 1)             
-                 (cdr1 strm))))))    
-</pre></td>
-<td valign=top>
-<pre>;;; FIGURE 2 -- EVEN
-
-(define nil2 (delay '()))
-
-(define (nil2? strm)
-  (null? (force strm)))
-
-(define-syntax cons2
-  (syntax-rules ()
-    ((cons2 obj strm)
-     (delay (cons obj strm)))))
-
-(define (car2 strm)
-  (car (force strm)))
-
-(define (cdr2 strm)
-  (cdr (force strm)))
-
-(define (map2 func strm)
-  (delay (force
-    (if (nil2? strm)
-      nil2
-      (cons2
-        (func (car2 strm))
-        (map2 func (cdr2 strm)))))))
-
-(define (countdown2 n)
-  (delay (force
-    (cons2 n (countdown2 (- n 1))))))
-
-(define (cutoff2 n strm)
-  (cond
-    ((zero? n) '())
-    ((nil2? strm) '())
-    (else
-      (cons
-        (car2 strm)
-        (cutoff2 (- n 1)
-                 (cdr2 strm))))))
-</pre></td></tr></table>
-
-<p>
-It is easy to see the operational difference between the two kinds of streams, using
-an example adapted from the paper:
-</p>
-
-<table>
-<tr>
-<td valign="top">
-<pre>&gt; (define (12div n) (/ 12 n))       
-&gt; (cutoff1 4                        
-    (map1 12div (countdown1 4)))    
-error: divide by zero               
-</pre>
-</td>
-<td valign="top">
-<pre>&gt; (define (12div n) (/ 12 n))
-&gt; (cutoff2 4
-    (map2 12div (countdown2 4)))
-(3 4 6 12)
-</pre>
-</td>
-</tr>
-</table>
-
-<p>
-The problem of odd streams is that they do too much work, having an "off-by-one"
-error that causes them to evaluate the next element of a stream before it is needed.
-Mostly that's just a minor leak of space and time, but if evaluating the next element
-causes an error, such as dividing by zero, it's a silly, unnecessary bug.
-</p>
-
-<p> It is instructive to look at the coding differences between odd
-and even streams.  We expect the two constructors <code>nil</code> and
-<code>cons</code> to be different, and they are; the odd
-<code>nil</code> and <code>cons</code> return a strict list, but the
-even <code>nil</code> and <code>cons</code> return promises.
-<code>Nil?</code>, <code>car</code> and <code>cdr</code> change to
-accommodate the underlying representation differences.
-<code>Cutoff</code> is identical in the two versions, because it
-doesn't return a stream.
-</p>
-
-<p> The subtle but critical difference is in <code>map</code> and
-<code>countdown</code>, the two functions that return streams.  They
-are identical except for the <code>(delay (force ...))</code> that
-wraps the return value in the even version.  That looks odd, but is
-correct.  It is tempting to just eliminate the <code>(delay (force
-...))</code>, but that doesn't work, because, given a promise
-<i>x</i>, even though <code>(delay (force <i>x</i>))</code> and
-<i>x</i> both evaluate to <i>x</i> when forced, their semantics are
-different, with <i>x</i> being evaluated and cached in one case but
-not the other.  That evaluation is, of course, the same "off-by-one"
-error that caused the problem with odd streams.  Note that
-<code>(force (delay <i>x</i>))</code> is something different entirely,
-even though it looks much the same.
-</p>
-
-<p> Unfortunately, that <code>(delay (force ...))</code> is a major
-notational inconvenience, because it means that the representation of
-streams can't be hidden inside a few primitives but must infect each
-function that returns a stream, making streams harder to use, harder
-to explain, and more prone to error.  Wadler et al solve the
-notational inconvenience in their SML/NJ implementation by adding
-special syntax -- the keyword <code>lazy</code> -- within the
-compiler.  Since Scheme allows syntax to be added via a macro, it
-doesn't require any compiler modifications to provide streams.  Shown
-below is a Scheme implementation of Figure 1 to 3 from the paper, with
-the <code>(delay (force ...))</code> hidden within
-<code>stream-define</code>, which is the syntax used to create a
-function that returns a stream:
-</p>
-
-<table>
-<tr>
-<td valign="top">
-<pre>;;; FIGURE 1 -- ODD      
-			 
-(define nil1             
-  '())                   
-			 
-(define (nil1? strm)     
-  (null? strm))          
-			 
-(define-syntax cons1     
-  (syntax-rules ()       
-    ((cons1 obj strm)    
-      (cons              
-        obj              
-          (delay         
-            strm)))))    
-			 
-(define (car1 strm)      
-  (car strm))            
-			 
-(define (cdr1 strm)      
-  (force (cdr strm)))    
-			 
-                         
-                         
-                         
-                         
-                         
-                         
-                         
-			 
-(define (map1 func strm) 
-                         
-  (if (nil1? strm)       
-    nil1                 
-    (cons1               
-      (func              
-        (car1 strm))     
-      (map1              
-        func             
-        (cdr1            
-          strm)))))      
-			 
-(define (countdown1 n)   
-                         
-  (cons1                 
-    n                    
-    (countdown1          
-      (- n 1))))         
-			 
-(define (cutoff1 n strm) 
-  (cond                  
-    ((zero? n) '())      
-    ((nil1? strm) '())   
-    (else                
-      (cons              
-        (car1 strm)      
-        (cutoff1         
-          (- n 1)        
-          (cdr1          
-            strm))))))   
-</pre>
-</td>
-<td valign="top">
-<pre>;;; FIGURE 2 -- EVEN     
-			 
-(define nil2             
-  (delay '()))           
-			 
-(define (nil2? strm)     
-  (null? (force strm))   
-			 
-(define-syntax cons2     
-  (syntax-rules ()       
-    ((cons2 obj strm)    
-      (delay             
-        (cons            
-          obj            
-          strm)))))      
-			 
-(define (car2 strm)      
-  (car (force strm)))    
-			 
-(define (cdr2 strm)      
-  (cdr (force strm)))    
-			 
-                         
-                         
-                         
-                         
-                         
-                         
-                         
-			 
-(define (map2 func strm) 
-  (delay (force		 
-    (if (nil2? strm)     
-      nil2               
-      (cons2             
-        (func            
-          (car2 strm))   
-        (map2            
-          func           
-          (cdr2          
-            strm)))))))  
-			 
-(define (countdown2 n)   
-  (delay (force		 
-    (cons2               
-      n                  
-      (countdown2        
-        (- n 1))))))     
-			 
-(define (cutoff2 n strm) 
-  (cond                  
-    ((zero? n) '())      
-    ((nil2? strm) '())   
-    (else                
-      (cons              
-        (car2 strm)      
-        (cutoff2         
-          (- n 1)        
-          (cdr2          
-            strm))))))   
-</pre>
-</td>
-<td valign="top">
-<pre>;;; FIGURE 3 -- EASY
-
-(define nil3
-  (delay '()))
-
-(define (nil3? strm)
-  (null? (force strm)))
-
-(define-syntax cons3
-  (syntax-rules ()
-    ((cons3 obj strm)
-      (delay
-        (cons
-          obj
-          strm)))))
-
-(define (car3 strm)
-  (car (force strm)))
-
-(define (cdr3 strm)
-  (cdr (force strm)))
-
-(define-syntax stream-define
- (syntax-rules ()
-  ((stream-define (name args ...)
-                  body0 body1 ...)
-   (define (name args ...)
-    (delay (force
-     (begin body0 body1 ...)))))))
-
-(stream-define (map3 func strm)
-
-  (if (nil3? strm)
-    nil3
-    (cons3
-      (func
-        (car3 strm))
-      (map3
-        func
-        (cdr3
-          strm)))))
-
-(stream-define (countdown3 n)
-
-  (cons3
-    n
-    (countdown3
-      (- n 1))))
-
-(define (cutoff3 n strm)
-  (cond
-    ((zero? n) '())
-    ((nil3? strm) '())
-    (else
-      (cons
-        (car3 strm)
-        (cutoff3
-          (- n 1)
-          (cdr3
-            strm))))))
-</pre>
-</td>
-</tr>
-</table>
-
-<p>
-It is now easy to see the notational inconvenience of Figure 2, as
-the bodies of <code>map1</code> and <code>map3</code> are identical,
-as are <code>countdown1</code> and <code>countdown3</code>.  All of
-the inconvenience is hidden in the stream primitives, where it
-belongs, so functions that use the primitives won't be burdened.  This
-means that users can just step up and use the library without any
-knowledge of how the primitives are implemented, and indeed the
-implementation of the primitives can change without affecting users of
-the primitives, which would not have been possible with the streams of
-Figure 2.  With this implementation of streams, <code>(cutoff3 4 (map3 12div
-(countdown3 4)))</code> evaluates to <code>(3 4 6 12)</code>, as it should.
-</p>
-
-<p>
-This library provides streams that are even, not odd.  This decision overturns years
-of experience in the Scheme world, but follows the traditions of the "pure" functional
-languages such as Miranda and Haskell.  The primary benefit is elimination of the
-"off-by-one" error that odd streams suffer.  Of course, it is possible to use even
-streams to represent odd streams, as Wadler et al show in their Figure 4, so nothing
-is lost by choosing even streams as the default.
-</p>
-
-<p>
-Obviously, stream elements are evaluated when they are accessed, not when they are
-created; that's the definition of lazy.  Additionally, stream elements must be
-evaluated only once, and the result cached in the event it is needed again; that's
-common practice in all languages that support streams.  Following the rule of R5RS
-section 1.1 fourth paragraph, an implementation of streams is permitted to delete a
-stream element from the cache and reclaim the storage it occupies if it can prove
-that the stream element cannot possibly matter to any future computation.
-</p>
-
-<p>
-The fact that objects are permitted, but not required, to be reclaimed has a
-significant impact on streams.  Consider for instance the following example, due to
-Joe Marshall.  Stream-filter is a function that takes a predicate and a stream and
-returns a new stream containing only those elements of the original stream that pass
-the predicate; it can be simply defined as follows:
-</p>
-
-<pre>    (stream-define (stream-filter pred? strm)
-      (cond ((stream-null? strm) strm)
-            ((pred? (stream-car strm))
-              (stream-cons (stream-car strm)
-                           (stream-filter pred? (stream-cdr strm))))
-            (else (stream-filter pred? (stream-cdr strm)))))
-</pre>
-
-<p>
-But this implementation of stream-filter has a problem:
-</p>
-
-<pre>    (define (times3 n)
-      (stream-car
-        (stream-cdr
-          (stream-cdr
-            (stream-cdr
-              (stream-cdr
-                (stream-filter
-                  (lambda (x) (zero? (modulo x n)))
-                  from0)))))))
-</pre>
-
-<p>
-Called as <code>(times3 5)</code>, the function evaluates to 15, as
-desired.  But called as <code>(times3 1000000)</code>, it churns the
-disk, creating closures and caching each result as it counts slowly to
-3,000,000; on most Scheme systems, this function will run out of
-memory long before it computes an answer.  A space leak occurs when
-there is a gap between elements that pass the predicate, because the
-naive definition hangs on to the head of the gap.  Unfortunately, this
-space leak can be very hard to fix, depending on the underlying Scheme
-implementation, and solutions that work in one Scheme implementation
-may not work in another.  And, since R5RS itself doesn't specify any
-safe-for-space requirements, this SRFI can't make any specific
-requirements either.  Thus, this SRFI encourages native
-implementations of the streams described in this SRFI to "do the right
-thing" with respect to space consumption, and implement streams that
-are as safe-for-space as the rest of the implementation.  Of course,
-if the stream is bound in a scope outside the stream-filter
-expression, there is nothing to be done except cache the elements as
-they are filtered.
-</p>
-
-<p>
-Although stream-define has been discussed as the basic stream
-abstraction, in fact it is the <code>(delay (force ...))</code>
-mechanism that is the basis for everything else.  In the spirit of
-Scheme minimality, the specification below gives stream-delay as the
-syntax for converting an expression to a stream; stream-delay is
-similar to delay, but returns a stream instead of a promise.  Given
-stream-delay, it is easy to create stream-lambda, which returns a
-stream-valued function, and then stream-define, which binds a
-stream-valued function to a name.  However, stream-lambda and
-stream-define are both library procedures, not fundamental to the use
-of streams, and are thus excluded from this SRFI.
-</p>
-
-<H1>Specification</H1>
-
-<p>A <i>stream-pair</i> is a data structure consisting of two fields called
-the <i>stream-car</i> and <i>stream-cdr</i>.  Stream-pairs are created
-by the procedure <code>stream-cons</code>, and the stream-car and
-stream-cdr fields are accessed by the procedures
-<code>stream-car</code> and <code>stream-cdr</code>.  There also
-exists a special stream object called <i>stream-null</i>, which
-is a single stream object with no elements, distinguishable from all
-other stream objects and, indeed, from all other objects of any type.
-The stream-cdr of a stream-pair must be either another stream-pair or
-stream-null.
-</p>
-
-<p>
-Stream-null and stream-pair are used to represent streams.  A stream
-can be defined recursively as either stream-null or a stream-pair
-whose stream-cdr is a stream.  The objects in the stream-car fields of
-successive stream-pairs of a stream are the elements of the stream.
-For example, a two-element stream is a stream-pair whose stream-car is
-the first element and whose stream-cdr is a stream-pair whose
-stream-car is the second element and whose stream-cdr is stream-null.
-A chain of stream-pairs ending with stream-null is finite and has a
-length that is computed as the number of elements in the stream, which
-is the same as the number of stream-pairs in the stream.  A chain of
-stream-pairs not ending with stream-null is infinite and has undefined
-length.
-</p>
-
-<p>
-The way in which a stream can be infinite is that no element of the stream is
-evaluated until it is accessed.  Thus, any initial prefix of the stream can be
-enumerated in finite time and space, but still the stream remains infinite.
-Stream elements are evaluated only once; once evaluated, the value of a stream
-element is saved so that the element will not be re-evaluated if it is accessed
-a second time.  Streams and stream elements are never mutated; all functions
-involving streams are purely applicative.  Errors are not required to be
-signalled, as in R5RS section 1.3.2, although implementations are encouraged
-to detect and report errors.
-</p>
-
-<dl>
-<dt>
-<code><a name="stream-null">stream-null</a></code> (constant)</dt>
-<dd>
-<code>Stream-null</code> is the distinguished nil stream, a single
-Scheme object distinguishable from all other objects.  If the last
-stream-pair in a stream contains stream-null in its cdr field, the
-stream is finite and has a computable length.  However, there is no
-need for streams to terminate.
-
-<pre>
-    stream-null                                 => (stream)
-</pre>
-</dd>
-
-<dt>
-<code><a name="stream-cons">(stream-cons <i>object</i> <i>stream</i>)</a></code> (syntax)</dt>
-<dd>
-<code>Stream-cons</code> is the primitive constructor of streams,
-returning a stream with the given object in its car field and the
-given stream in its cdr field.  The stream returned by
-<code>stream-cons</code> must be different (in the sense of
-<code>eqv?</code>) from every other Scheme object.  The object may be
-of any type, and there is no requirement that successive elements of a
-stream be of the same type, although it is common for them to be.  It
-is an error if the second argument of <code>stream-cons</code> is not a stream.
-
-<pre>    (stream-cons 'a stream-null)                =&gt; (stream 'a)
-    (stream-cons 'a (stream 'b 'c 'd))          =&gt; (stream 'a 'b 'c 'd)
-    (stream-cons "a" (stream 'b 'c))            =&gt; (stream "a" 'b 'c)
-    (stream-cons 'a 3)                          =&gt; error
-    (stream-cons (stream 'a 'b) (stream 'c))    =&gt; (stream (stream 'a 'b) 'c)
-</pre>
-</dd>
-
-<dt>
-<code><a name="streamp">(stream? <i>object</i>)</a></code> (function)</code></dt>
-<dd>
-<code>Stream?</code> returns <code>#t</code> if the object is a stream, and otherwise returns <code>#f</code>.  A stream
-object may be either the null stream or a stream pair created by <code>stream-cons</code>.
-
-<pre>    (stream? stream-null)                       =&gt; #t
-    (stream? (stream-cons 'a stream-null))      =&gt; #t
-    (stream? 3)                                 =&gt; #f
-</pre>
-</dd>
-
-<dt>
-<code><a name="stream-nullp">(stream-null? <i>object</i>)</a></code> (function)</code></dt>
-<dd>
-<code>Stream-null?</code> returns <code>#t</code> if the object is the distinguished nil stream, and
-otherwise returns <code>#f</code.
-
-<pre>    (stream-null? stream-null)                  =&gt; #t
-    (stream-null? (stream-cons 'a stream-null)) =&gt; #f
-    (stream-null? 3)                            =&gt; #f
-</pre>
-</dd>
-
-<dt>
-<code><a name="stream-pairp">(stream-pair? <i>object</i>)</a></code> (function)</dt>
-<dd>
-<code>Stream-pair?</code> returns <code>#t</code> if the object is a stream pair created by stream-cons, and
-otherwise returns <code>#f</code>.
-
-<pre>    (stream-pair? stream-null)                  =&gt; #f
-    (stream-pair? (stream-cons 'a stream-null)) =&gt; #t
-    (stream-pair? 3)                            =&gt; #f
-</pre>
-</dd>
-
-<dt>
-<code><a name="stream-car">(stream-car <i>stream</i>)</a></code> (function)</dt>
-<dd>
-<code>Stream-car</code> returns the object in the stream-car field of
-a stream-pair.  It is an error to attempt to evaluate the stream-car
-of stream-null.
-
-<pre>    (stream-car (stream 'a 'b 'c))              =&gt; a
-    (stream-car stream-null)                    =&gt; error
-    (stream-car 3)                              =&gt; error
-</pre>
-</dd>
-
-<dt>
-<code><a name="stream-cdr">(stream-cdr <i>stream</i>)</a></code> (function)</dt>
-<dd>
-<code>Stream-cdr</code> returns the stream in the stream-cdr field of
-a stream-pair.  It is an error to attempt to evaluate the stream-cdr
-of stream-null.
-</code>
-
-<pre>    (stream-cdr (stream 'a 'b 'c))              =&gt; (stream 'b 'c)
-    (stream-cdr stream-null)                    =&gt; error
-    (stream-cdr 3)                              =&gt; error
-</code>
-</pre>
-</dd>
-
-<dt>
-<code><a name="stream-delay">(stream-delay <i>expression</i>)</a></code> (syntax)</dt>
-<dd>
-<code>Stream-delay</code> is the essential mechanism for operating on streams, taking an
-expression and returning a delayed form of the expression that can be asked at
-some future point to evaluate the expression and return the resulting value.  The
-action of stream-delay is analogous to the action of delay, but it is specific to
-the stream data type, returning a stream instead of a promise; no corresponding
-<code>stream-force</code> is required, because each of the stream functions performs the force
-implicitly.
-
-<pre>    (define from0
-      (let loop ((x 0))
-        (stream-delay
-          (stream-cons x (loop (+ x 1))))))
-    from0                                       =&gt; (stream 0 1 2 3 4 5 6 ...)
-</pre>
-</dd>
-
-<dt><code><a name="stream">(stream <i>object</i> ...)</a></code> (library function)
-<dd>
-<code>Stream</code> returns a newly allocated finite stream of its arguments, in order.
-
-<pre>    (stream 'a (+ 3 4) 'c)                      =&gt; (stream 'a 7 'c)
-    (stream)                                    =&gt; stream-null
-</pre>
-</dd>
-
-<dt>
-<code><a name="stream-unfoldn">(stream-unfoldn <i>generator</i> <i>seed</i> <i>n</i>)</a></code>
-(function)</dt>
-<dd>
-<code>Stream-unfoldn</code> returns <i>n</i> streams whose contents are produced by successive calls
-to generator, which takes the current seed as an arguments and returns <i>n</i> + 1
-values:
-
-<p>
-<code>(<i>proc</i> <i>seed</i>)</code> -> <i>seed</i> <i>result0</i> ... <i>resultN</i>
-
-<p>
-where <i>resultI</i> indicates how to produce the next element of the Ith result stream:
-</p>
-
-<table>
-<tr>
-<td><code>(<i>value</i>)</code></td>
-<td><i>value</i> is the next car of this result stream</td>
-</tr>
-<tr>
-<td><code>#f</code></td>
-<td>no new information for this result stream
-</td>
-</tr>
-<tr>
-<td>
-<code>()</code></td>
-<td>the end of this result stream has been reached
-</td>
-</tr>
-</table>
-
-Note that getting the next element in any particular result stream may require
-multiple calls to generator.
-
-<pre>    (define (take5 s)
-      (stream-unfoldn
-        (lambda (x)
-          (let ((n (car x)) (s (cdr x)))
-            (if (zero? n)
-                (values 'dummy '())
-                (values
-                  (cons (- n 1) (stream-cdr s))
-                  (list (stream-car s))))))
-        (cons 5 s)
-        1))
-    (take5 from0)                              =&gt; (stream 0 1 2 3 4)
-</pre>
-</dd>
-
-<dt>
-<code><a name="stream-map">(stream-map <i>function</i> <i>stream</i> ...)</a></code> (library
-function)</dt>
-<dd>
-<code>Stream-map</code> creates a newly allocated stream built by
-applying function elementwise to the elements of the streams.  The
-function must take as many arguments as there are streams and return a
-single value (not multiple values).  The stream returned by <code>stream-map</code>
-is finite if the given stream is finite, and infinite if the given
-stream is infinite.  If more than one stream is given, <code>stream-map</code>
-terminates when any of them terminate, or is infinite if all the
-streams are infinite.  The stream elements are evaluated in order.
-
-<pre>    (stream-map (lambda (x) (+ x x)) from0)      =&gt; (stream 0 2 4 6 8 10 ...)
-    (stream-map + (stream 1 2 3) (stream 4 5 6)) =&gt; (stream 5 7 9)
-    (stream-map (lambda (x) (expt x x))
-      (stream 1 2 3 4 5))                        =&gt; (stream 1 4 27 256 3125)
-</pre>
-</dd>
-
-<dt>
-<code><a name="stream-for-each">(stream-for-each <i>procedure</i> <i>stream</i> ...)</a></code>
-(library function)</dt>
-<dd>
-<code>Stream-for-each</code> applies procedure elementwise to the elements of the streams,
-calling the procedure for its side effects rather than for its values.  The
-procedure must take as many arguments as there are streams.  The value returned by
-stream-for-each is unspecified.  The stream elements are visited in order.
-
-<pre>    (stream-for-each display from0)             =&gt; no value, prints 01234 ...
-</pre>
-</dd>
-
-<dt>
-<code><a name="stream-filter">(stream-filter <i>predicate?</i> <i>stream</i>)</a></code> (library function)</dt>
-<dd>
-<code>Stream-filter</code> applies <i>predicate?</i> to each element
-of stream and creates a newly allocated stream consisting of those
-elements of the given stream for which predicate? returns a
-non-<code>#f</code> value.  Elements of the output stream are in the
-same order as they were in the input stream, and are tested by
-<i>predicate?</i> in order.
-
-<pre>    (stream-filter odd? stream-null)            =&gt; stream-null
-    (take5 (stream-filter odd? from0))          =&gt; (stream 1 3 5 7 9)
-</pre>
-</dd>
-</dl>
-
-<H1>Implementation</H1>
-
-<p> A reference implementation of streams is shown below.  It strongly
-prefers simplicity and clarity to efficiency, and though a reasonable
-attempt is made to be safe-for-space, no promises are made.  The reference
-implementation relies on the mechanism for defining record types of <a
-href="http://srfi.schemers.org/srfi-9/">SRFI-9</a>, and the functions
-<code>any</code> and <code>every</code> from <a
-href=""http://srfi.schemers.org/srfi-1/">SRFI-1</a>.  The
-<code>stream-error</code> function aborts by calling <code>error</code> as
-defined in <a href="http://srfi.schemers.org/srfi-23/">SRFI 23</a>.
-
-<pre>;;; PROMISES A LA SRFI-45:
-
-;;; A separate implementation is necessary to
-;;; have promises that answer #t to stream?
-;;; This requires lots of complicated type conversions.
-
-(define-record-type s:promise (make-s:promise kind content) s:promise?
-  (kind    s:promise-kind    set-s:promise-kind!)
-  (content s:promise-content set-s:promise-content!))
-
-(define-record-type box (make-box x) box?
-  (x unbox set-box!))
-
-(define-syntax srfi-40:lazy
-  (syntax-rules ()
-    ((lazy exp)
-     (make-box (make-s:promise 'lazy (lambda () exp))))))
-
-(define (srfi-40:eager x)
-  (make-stream (make-box (make-s:promise 'eager x))))
-
-(define-syntax srfi-40:delay
-  (syntax-rules ()
-    ((srfi-40:delay exp) (srfi-40:lazy (srfi-40:eager exp)))))
-
-(define (srfi-40:force promise)
-  (let ((content (unbox promise)))
-    (case (s:promise-kind content)
-      ((eager) (s:promise-content content))
-      ((lazy)
-       (let* ((promise* (stream-promise ((s:promise-content content))))
-              (content  (unbox promise)))
-         (if (not (eqv? 'eager (s:promise-kind content)))
-             (begin
-               (set-s:promise-kind! content (s:promise-kind (unbox promise*)))
-               (set-s:promise-content! content (s:promise-content (unbox promise*)))
-               (set-box! promise* content)))
-         (srfi-40:force promise))))))
-
-
-;;; STREAM -- LIBRARY OF SYNTAX AND FUNCTIONS TO MANIPULATE STREAMS
-
-;;; A stream is a new data type, disjoint from all other data types, that
-;;; contains a promise that, when forced, is either nil (a single object
-;;; distinguishable from all other objects) or consists of an object
-;;; (the stream element) followed by a stream.  Each stream element is
-;;; evaluated exactly once, when it is first retrieved (not when it is
-;;; created); once evaluated its value is saved to be returned by
-;;; subsequent retrievals without being evaluated again.
-
-;; STREAM-TYPE -- type of streams
-;; STREAM? object -- #t if object is a stream, #f otherwise
-(define-record-type stream-type
-  (make-stream promise)
-  stream?
-  (promise stream-promise))
-
-;;; UTILITY FUNCTIONS
-
-;; STREAM-ERROR message -- print message then abort execution
-;  replace this with a call to the native error handler
-;  if stream-error returns, so will the stream library function that called it
-(define stream-error error)
-
-;;; STREAM SYNTAX AND FUNCTIONS
-
-;; STREAM-NULL -- the distinguished nil stream
-(define stream-null (make-stream (srfi-40:delay '())))
-
-;; STREAM-CONS object stream -- primitive constructor of streams
-(define-syntax stream-cons
-  (syntax-rules ()
-    ((stream-cons obj strm)
-     (make-stream
-      (srfi-40:delay
-       (if (not (stream? strm))
-           (stream-error "attempt to stream-cons onto non-stream")
-           (cons obj strm)))))))
-
-;; STREAM-NULL? object -- #t if object is the null stream, #f otherwise
-(define (stream-null? obj)
-  (and (stream? obj) (null? (srfi-40:force (stream-promise obj)))))
-
-;; STREAM-PAIR? object -- #t if object is a non-null stream, #f otherwise
-(define (stream-pair? obj)
-  (and (stream? obj) (not (null? (srfi-40:force (stream-promise obj))))))
-
-;; STREAM-CAR stream -- first element of stream
-(define (stream-car strm)
-  (cond ((not (stream? strm)) (stream-error "attempt to take stream-car of non-stream"))
-        ((stream-null? strm)  (stream-error "attempt to take stream-car of null stream"))
-        (else (car (srfi-40:force (stream-promise strm))))))
-
-;; STREAM-CDR stream -- remaining elements of stream after first
-(define (stream-cdr strm)
-  (cond ((not (stream? strm)) (stream-error "attempt to take stream-cdr of non-stream"))
-        ((stream-null? strm)  (stream-error "attempt to take stream-cdr of null stream"))
-        (else (cdr (srfi-40:force (stream-promise strm))))))
-
-;; STREAM-DELAY object -- the essential stream mechanism
-(define-syntax stream-delay
-  (syntax-rules ()
-    ((stream-delay expr)
-      (make-stream
-        (srfi-40:lazy expr)))))
-
-;; STREAM object ... -- new stream whose elements are object ...
-(define (stream . objs)
-  (let loop ((objs objs))
-    (stream-delay
-      (if (null? objs)
-          stream-null
-          (stream-cons (car objs) (loop (cdr objs)))))))
-
-;; STREAM-UNFOLDN generator seed n -- n+1 streams from (generator seed)
-(define (stream-unfoldn gen seed n)
-  (define (unfold-result-stream gen seed)
-    (let loop ((seed seed))
-      (stream-delay
-        (call-with-values
-          (lambda () (gen seed))
-          (lambda (next . results)
-            (stream-cons results (loop next)))))))
-  (define (result-stream-&gt;output-stream result-stream i)
-    (stream-delay
-      (let ((result (list-ref (stream-car result-stream) i)))
-        (cond ((pair? result)
-                (stream-cons (car result)
-                             (result-stream-&gt;output-stream
-                               (stream-cdr result-stream) i)))
-              ((not result)
-                (result-stream-&gt;output-stream (stream-cdr result-stream) i))
-              ((null? result) stream-null)
-              (else (stream-error "can't happen"))))))
-  (define (result-stream-&gt;output-streams result-stream n)
-    (let loop ((i 0) (outputs '()))
-      (if (= i n)
-        (apply values (reverse outputs))
-        (loop (+ i 1)
-              (cons (result-stream-&gt;output-stream result-stream i)
-                    outputs)))))
-  (result-stream-&gt;output-streams (unfold-result-stream gen seed) n))
-
-;; STREAM-MAP func stream ... -- stream produced by applying func element-wise
-(define (stream-map func . strms)
-  (cond ((not (procedure? func)) (stream-error "non-functional argument to stream-map"))
-        ((null? strms) (stream-error "no stream arguments to stream-map"))
-        ((not (every stream? strms)) (stream-error "non-stream argument to stream-map"))
-        (else (let loop ((strms strms))
-                (stream-delay
-                  (if (any stream-null? strms)
-                      stream-null
-                      (stream-cons (apply func (map stream-car strms))
-                                   (loop (map stream-cdr strms)))))))))
-
-;; STREAM-FOR-EACH proc stream ... -- apply proc element-wise for side-effects
-(define (stream-for-each proc . strms)
-  (cond ((not (procedure? proc)) (stream-error "non-functional argument to stream-for-each"))
-        ((null? strms) (stream-error "no stream arguments to stream-for-each"))
-        ((not (every stream? strms)) (stream-error "non-stream argument to stream-for-each"))
-        (else (let loop ((strms strms))
-                (if (not (any stream-null? strms))
-                    (begin (apply proc (map stream-car strms))
-                           (loop (map stream-cdr strms))))))))
-
-;; STREAM-FILTER pred? stream -- new stream including only items passing pred?
-(define (stream-filter pred? strm)
-  (cond ((not (procedure? pred?)) (stream-error "non-functional argument to stream-filter"))
-        ((not (stream? strm)) (stream-error "attempt to apply stream-filter to non-stream"))
-        (else (stream-unfoldn
-                (lambda (s)
-                  (values
-                    (stream-cdr s)
-                    (cond ((stream-null? s) '())
-                          ((pred? (stream-car s)) (list (stream-car s)))
-                          (else #f))))
-                strm
-                1))))</pre>
-
-<H1>References</H1>
-
-<ul>
-<li>
-<a name="sicp"></a>
-Harold Abelson, Gerald Jay Sussman, Julie Sussman:
-<a href="http://www-mitpress.mit.edu/sicp"><i>Structure and
-	Interpretation of Computer Programs</i></a>, 1996, MIT Press.
-</li>
-<li>
-<a name="ml-working-programmer"></a>
-Lawrence C. Paulson: <i>ML for the Working Programmer</i>,
-2nd edition, Cambridge University Press, 1996.
-</li>
-<li>
-<a name="scheme-and-the-art"></a>
-George Springer and Daniel P. Friedman:
-<i>Scheme and the Art of Programming</i>, MIT Press and McGraw-Hill, 1989.
-</li>
-<li>
-<a name="laziness-even-odd"></a>
-Philip Wadler, Walid Taha, and David MacQueen:
-"How to
-add laziness to a strict language without even being odd", 1998 ACM SIGPLAN
-Workshop on ML, pp. 24-30.
-(available
-<a href="http://citeseer.nj.nec.com/102172.html">here</a> in various formats)
-</li>
-<li>
-<a name="lisp"></a>
-Patrick H. Winston, Berthold K. Horn: <i>Lisp</i>, 3rd edition,
-Addison Wesley, 1989.
-</ul>
-<H1>Copyright</H1>
-<p>Copyright (C) 2003 by Philip L. Bewig of Saint Louis, Missouri, United States of
-America.  All rights reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-<!-- Created: Mon Feb  3 14:53:23 MET 2003 -->
-<!-- hhmts start -->
-Last modified: Sat Sep 11 12:40:31 MST 2004
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-41/srfi-41.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-41/srfi-41.html
deleted file mode 100644
index a937761696..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-41/srfi-41.html
+++ /dev/null
@@ -1,2712 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html><head><title>SRFI 41: Streams</title></head><body>
-
-<h1>Title</h1>
-
-Streams
-
-
-<h1>Author</h1>
-
-Philip L. Bewig
-
-<h1>Status</h1>
-
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see
-<a href="http://srfi.schemers.org/srfi-process.html">here</a>.
-To comment on this SRFI, please <code>
-<a href="mailto:srfi%20minus%2041%20at%20srfi%20dot%20schemers%20dot%20org">mailto:srfi minus 41 at srfi dot schemers dot org</a></code>.
-See <a href="http://srfi.schemers.org/srfi-list-subscribe.html">instructions
-here</a> to subscribe to the list. You can access
-the discussion via
-<a href="http://srfi.schemers.org/srfi-41/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-You can access
-post-finalization messages via
-<a href="http://srfi.schemers.org/srfi-41/post-mail-archive/maillist.html">
-the archive of the mailing list</a>.
-
-<ul>
-<li>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-41/srfi-41.html?rev=1.2">2007/10/24</a>
-</li><li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-41/srfi-41.html?rev=1.3">2007/11/14</a>
-</li><li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-41/srfi-41.html?rev=1.5">2007/11/14</a>
-</li><li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-41/srfi-41.html?rev=1.6">2007/12/17</a>
-</li><li>Final: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-41/srfi-41.html?rev=1.7">2008/01/24</a>
-</li><li>Draft: 2007/10/21 - 2007/12/22
-</li></ul>
-  
-<h1>Abstract</h1>
-
-<p align="justify"><font face="serif">Streams, sometimes 
-called lazy lists, are a sequential data structure containing elements 
-computed only on demand.  A stream is either null or is a pair 
-with a stream in its cdr.  Since elements of a stream are computed 
-only when accessed, streams can be infinite.  Once computed, the 
-value of a stream element is cached in case it is needed again.</font></p>
-
-<p align="justify"><font face="serif">Streams without 
-memoization were first described by Peter Landin in 1965.  Memoization 
-became accepted as an essential feature of streams about a decade later.  
-Today, streams are the signature data type of functional programming 
-languages such as Haskell.</font></p>
-
-<p align="justify"><font face="serif">This Scheme Request for Implementation describes 
-two libraries for operating on streams: a canonical set of stream primitives
-and a set of procedures and syntax derived from those primitives that permits
-convenient expression of stream operations. They rely on facilities provided
-by R6RS, including libraries, records, and error reporting.  To load both
-stream libraries, say:</font></p>
-
-<p align="justify"><font face="monospace">(import (streams))</font></p>
-
-<h1>Rationale</h1>
-
-<p align="justify"><font face="serif">Harold Abelson 
-and Gerald Jay Sussman discuss streams at length, giving a strong justification 
-for their use.  The streams they provide are represented as a </font><font face="monospace">cons</font><font face="serif"> 
-pair with a promise to return a stream in its </font><font face="monospace">cdr</font><font face="serif">; for instance, a stream with elements 
-the first three counting numbers is represented conceptually as </font><font face="monospace">(cons 1 (delay (cons 2 (delay (cons 3 (delay 
-'()))))))</font><font face="serif">.</font><font face="monospace">  </font><font face="serif">Philip Wadler, Walid Taha and David 
-MacQueen describe such streams as <i>odd</i> because, regardless of 
-their length, the parity of the number of constructors (</font><font face="monospace">delay</font><font face="serif">, </font><font face="monospace">cons</font><font face="serif">, </font><font face="monospace">'()</font><font face="serif">) 
-in the stream is odd.</font></p>
-
-<p align="justify"><font face="serif">The streams 
-provided here differ from those of Abelson and Sussman, being 
-represented as promises that contain a </font><font face="monospace">cons</font><font face="serif"> pair with a stream in its </font><font face="monospace">cdr</font><font face="serif">; 
-for instance, the stream with elements the first three counting numbers 
-is represented conceptually as </font><font face="monospace">(delay 
-(cons 1 (delay (cons 2 (delay (cons 3 (delay '())))))))</font><font face="serif">; 
-this is an <i>even</i> stream because the parity of the number of constructors 
-in the stream is even.</font></p>
-
-<p align="justify"><font face="serif">Even streams 
-are more complex than odd streams in both definition and usage, but 
-they offer a strong benefit: they fix the off-by-one error of odd streams.  
-Wadler, Taha and MacQueen show, for instance, that an expression like </font><font face="monospace">(stream-&gt;list 4 (stream-map / (stream-from 
-4 -1))) </font><font face="serif">evaluates to </font><font face="monospace">(1/4 1/3 1/2 1)</font><font face="serif"> 
-using even streams but fails with a divide-by-zero error using odd streams, 
-because the next element in the stream, which will be </font><font face="monospace">1/0</font><font face="serif">, is evaluated before it is accessed.  
-This extra bit of laziness is not just an interesting oddity; it is 
-vitally critical in many circumstances, as will become apparent below.</font></p>
-
-<p align="justify"><font face="serif">When used effectively, 
-the primary benefit of streams is improved modularity.  Consider 
-a process that takes a sequence of items, operating on each in turn.  
-If the operation is complex, it may be useful to split it into two or 
-more procedures in which the partially-processed sequence is an intermediate 
-result.  If that sequence is stored as a list, the entire intermediate 
-result must reside in memory all at once; however, if the intermediate 
-result is stored as a stream, it can be generated piecemeal, using only 
-as much memory as required by a single item.  This leads to a programming 
-style that uses many small operators, each operating on the sequence 
-of items as a whole, similar to a pipeline of unix commands.</font></p>
-
-<p align="justify"><font face="serif">In addition 
-to improved modularity, streams permit a clear exposition of backtracking 
-algorithms using the &#8220;stream of successes&#8221; technique, and they can 
-be used to model generators and co-routines.  The implicit memoization 
-of streams makes them useful for building persistent data structures, 
-and the laziness of streams permits some multi-pass algorithms to be 
-executed in a single pass.  Savvy programmers use streams to enhance 
-their programs in countless ways.</font></p>
-
-<p align="justify"><font face="serif">There is an 
-obvious space/time trade-off between lists and streams; lists take more 
-space, but streams take more time (to see why, look at all the type 
-conversions in the implementation of the stream primitives).  Streams 
-are appropriate when the sequence is truly infinite, when the space 
-savings are needed, or when they offer a clearer exposition of the algorithms 
-that operate on the sequence.</font></p>
-
-
-<h1>Specification</h1>
-
-<h2>The <font face="monospace">(streams primitive)</font><font face="serif"> library</font></h2>
-
-<font face="serif">The </font><font face="monospace">(streams primitive)</font><font face="serif"> 
-library provides two mutually-recursive abstract data types:  An 
-object of the </font><font face="monospace">stream</font><font face="serif"> abstract data type is a promise that, 
-when forced, is either </font><font face="monospace">stream-null</font><font face="serif"> or is an object of type </font><font face="monospace">stream-pair</font><font face="serif">.  
-An object of the </font><font face="monospace">stream-pair</font><font face="serif"> abstract data type contains a </font><font face="monospace">stream-car</font><font face="serif"> 
-and a </font><font face="monospace">stream-cdr</font><font face="serif">, which must be a </font><font face="monospace">stream</font><font face="serif">.  The essential feature of streams 
-is the systematic suspensions of the recursive promises between the 
-two data types.</font><p></p>
-
-<p align="justify"><font face="monospace"><pre>&#945; stream
-  :: (promise stream-null)
-  |  (promise (&#945; stream-pair))</pre><pre>&#945; stream-pair
-  :: (promise &#945;) × (promise (&#945; stream))</pre></font></p>
-
-<p align="justify"><font face="serif">The object 
-stored in the </font><font face="monospace">stream-car</font><font face="serif"> of a </font><font face="monospace">stream-pair</font><font face="serif"> is a promise that is forced the first 
-time the </font><font face="monospace">stream-car</font><font face="serif"> is accessed; its value is cached in 
-case it is needed again.  The object may have any type, and different 
-stream elements may have different types.  If the </font><font face="monospace">stream-car</font><font face="serif"> is never accessed, the object stored 
-there is never evaluated.  Likewise, the </font><font face="monospace">stream-cdr</font><font face="serif"> is a promise to return a stream, and 
-is only forced on demand.</font></p>
-
-<p align="justify"><font face="serif">This library 
-provides eight operators: constructors for </font><font face="monospace">stream-null</font><font face="serif"> and </font><font face="monospace">stream-pair</font><font face="serif">s, type recognizers for streams and 
-the two kinds of streams, accessors for both fields of a </font><font face="monospace">stream-pair</font><font face="serif">, 
-and a lambda that creates procedures that return streams.</font></p>
-
-<p align="justify"><font face="serif"><b>constructor: </b></font><font face="monospace"><b>stream-null</b></font><br>
-<font face="monospace">Stream-null</font><font face="serif"> is a promise that, when forced, is 
-a single object, distinguishable from all other objects, that represents 
-the null stream.  </font><font face="monospace">Stream-null</font><font face="serif"> is immutable and unique.</font></p>
-
-<p align="justify"><font face="monospace"><font face="serif"><b>constructor: </b></font><b>(stream-cons </b></font><font face="serif"><b><i>object</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">Stream-cons</font><font face="serif"> is a macro that accepts an <i>object</i> 
-and a <i>stream</i> and creates a newly-allocated </font><font face="monospace">stream</font><font face="serif"> containing a promise that, when forced, 
-is a </font><font face="monospace">stream-pair</font><font face="serif"> with the <i>object</i> in its </font><font face="monospace">stream-car</font><font face="serif"> 
-and the <i>stream</i> in its </font><font face="monospace">stream-cdr</font><font face="serif">.  </font><font face="monospace">Stream-cons</font><font face="serif"> must be syntactic, not procedural, 
-because neither <i>object</i> nor <i>stream</i> is evaluated when </font><font face="monospace">stream-cons</font><font face="serif"> 
-is called.  Since <i>stream</i> is not evaluated, when the stream-pair 
-is created, it is not an error to call </font><font face="monospace">stream-cons</font><font face="serif"> with a <i>stream</i> that is not of 
-type </font><font face="monospace">stream</font><font face="serif">; 
-however, doing so will cause an error later when the </font><font face="monospace">stream-cdr</font><font face="serif"> of the </font><font face="monospace">stream-pair</font><font face="serif"> is accessed.  Once created, a </font><font face="monospace">stream-pair</font><font face="serif"> 
-is immutable; there is no </font><font face="monospace">stream-set-car!</font><font face="serif"> or </font><font face="monospace">stream-set-cdr!</font><font face="serif"> that modifies an existing </font><font face="monospace">stream-pair</font><font face="serif">.  
-There is no dotted-pair or improper stream as with lists.</font></p>
-
-<p align="justify"><font face="serif"><b>recognizer: </b></font><font face="monospace"><b>(stream? </b></font><font face="serif"><b><i>object</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">Stream?</font><font face="serif"> is a procedure that takes an <i>object</i> 
-and returns </font><font face="monospace">#t</font><font face="serif"> 
-if the <i>object</i> is a stream and </font><font face="monospace">#f</font><font face="serif"> otherwise.  If <i>object</i> 
-is a stream, </font><font face="monospace">stream?</font><font face="serif"> does not force its promise.  
-If </font><font face="monospace">(stream? obj)</font><font face="serif"> is </font><font face="monospace">#t</font><font face="serif">, then one of </font><font face="monospace">(stream-null? 
-obj)</font><font face="serif"> and </font><font face="monospace">(stream-pair? 
-obj)</font><font face="serif"> will be </font><font face="monospace">#t</font><font face="serif"> 
-and the other will be </font><font face="monospace">#f</font><font face="serif">; if </font><font face="monospace">(stream? 
-obj)</font><font face="serif"> is </font><font face="monospace">#f</font><font face="serif">, both </font><font face="monospace">(stream-null? 
-obj)</font><font face="serif"> and </font><font face="monospace">(stream-pair? 
-obj)</font><font face="serif"> will be </font><font face="monospace">#f</font><font face="serif">. </font></p>
-
-<p align="justify"><font face="serif"><b>recognizer: </b></font><font face="monospace"><b>(stream-null? </b></font><font face="serif"><b><i>object</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">Stream-null?</font><font face="serif"> is a procedure that takes an <i>object</i> 
-and returns </font><font face="monospace">#t</font><font face="serif"> 
-if the <i>object</i> is the distinguished null stream and </font><font face="monospace">#f</font><font face="serif"> 
-otherwise.  If <i>object</i> is a stream, </font><font face="monospace">stream-null?</font><font face="serif"> must force its promise in order to 
-distinguish </font><font face="monospace">stream-null</font><font face="serif"> from </font><font face="monospace">stream-pair</font><font face="serif">.</font></p>
-
-<p align="justify"><font face="serif"><b>recognizer: </b></font><font face="monospace"><b>(stream-pair? </b></font><font face="serif"><b><i>object</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">Stream-pair?</font><font face="serif"> is a procedure that takes an <i>object</i> 
-and returns </font><font face="monospace">#t</font><font face="serif"> 
-if the <i>object</i> is a </font><font face="monospace">stream-pair</font><font face="serif"> constructed by </font><font face="monospace">stream-cons</font><font face="serif"> and </font><font face="monospace">#f</font><font face="serif"> otherwise.  If <i>object</i> 
-is a stream, </font><font face="monospace">stream-pair?</font><font face="serif"> must force its promise in order to 
-distinguish </font><font face="monospace">stream-null</font><font face="serif"> from </font><font face="monospace">stream-pair</font><font face="serif">.</font></p>
-
-<p align="justify"><font face="serif"><b>accessor: </b></font><font face="monospace"><b>(stream-car </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">Stream-car</font><font face="serif"> is a procedure that takes a <i>stream</i> 
-and returns the object stored in the </font><font face="monospace">stream-car</font><font face="serif"> of the <i>stream</i>.  </font><font face="monospace">Stream-car</font><font face="serif"> 
-signals an error if the object passed to it is not a </font><font face="monospace">stream-pair</font><font face="serif">.  Calling </font><font face="monospace">stream-car</font><font face="serif"> causes the object stored there to 
-be evaluated if it has not yet been; the object&#8217;s value is cached 
-in case it is needed again.</font></p>
-
-<p align="justify"><font face="serif"><b>accessor: </b></font><font face="monospace"><b>(stream-cdr </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">Stream-cdr</font><font face="serif"> is a procedure that takes a <i>stream</i> 
-and returns the stream stored in the </font><font face="monospace">stream-cdr</font><font face="serif"> of the <i>stream</i>.  </font><font face="monospace">Stream-cdr</font><font face="serif"> 
-signals an error if the object passed to it is not a </font><font face="monospace">stream-pair</font><font face="serif">.  Calling </font><font face="monospace">stream-cdr</font><font face="serif"> 
-does not force the promise containing the stream stored in the
-</font><font face="monospace">stream-cdr</font><font face="serif"> of the <i>stream</i>.
-
-</font></p><p align="justify"><font face="serif"><font face="serif"><b>lambda: </b></font><font face="serif"><b>(</b></font><font face="monospace"><b>stream-lambda </b></font><font face="serif"><b><i>args</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>body</i>)</b></font><br>
-<font face="monospace">Stream-lambda</font><font face="serif"> creates a procedure that returns a 
-promise to evaluate the <i>body</i> of the procedure.  The last <i>
-body</i> expression to be evaluated must yield a stream.  As with 
-normal </font><font face="monospace">lambda</font><font face="serif">, <i>
-args</i> may be a single variable name, in which case all the formal 
-arguments are collected into a single list, or a list of variable names, 
-which may be null if there are no arguments, proper if there are an 
-exact number of arguments, or dotted if a fixed number of arguments 
-is to be followed by zero or more arguments collected into a list.  <i>
-Body</i> must contain at least one expression, and may contain internal 
-definitions preceding any expressions to be evaluated.</font></font></p>
-
-<p align="justify"><font face="serif"><font face="monospace"></font></font></p><pre><font face="serif"><font face="monospace">(define strm123
-  (stream-cons 1
-    (stream-cons 2
-      (stream-cons 3
-        stream-null))))</font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="monospace">(stream-car strm123) </font><font face="Symbol">&#8658;</font><font face="monospace"> 
-1</font></font></p>
-
-<p align="justify"><font face="serif"><font face="monospace">(stream-car (stream-cdr 
-strm123) </font><font face="Symbol">&#8658;</font><font face="monospace"> 
-2</font></font></p>
-
-<p align="justify"><font face="serif"><font face="monospace"></font></font></p><pre><font face="serif"><font face="monospace">(stream-pair?
-  (stream-cdr
-    (stream-cons (/ 1 0) stream-null))) </font><font face="Symbol">&#8658;</font><font face="monospace"> #f</font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="monospace">(stream? (list 
-1 2 3)) </font><font face="Symbol">&#8658;</font><font face="monospace"> 
-#f</font></font></p>
-
-<p align="justify"><font face="serif"><font face="monospace"></font></font></p><pre><font face="serif"><font face="monospace">(define iter
-  (stream-lambda (f x)
-    (stream-cons x (iter f (f x)))))</font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="monospace">(define nats (iter 
-(lambda (x) (+ x 1)) 0))</font></font></p>
-
-<p align="justify"><font face="serif"><font face="monospace">(stream-car (stream-cdr 
-nats)) </font><font face="Symbol">&#8658;</font><font face="monospace"> 
-1</font></font></p>
-
-<p align="justify"><font face="serif"><font face="monospace"></font></font></p><pre><font face="serif"><font face="monospace">(define stream-add
-  (stream-lambda (s1 s2)
-    (stream-cons
-      (+ (stream-car s1) (stream-car s2))
-      (stream-add (stream-cdr s1)
-                  (stream-cdr s2)))))</font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="monospace">(define evens (stream-add 
-nats nats))</font></font></p>
-
-<p align="justify"><font face="serif"><font face="monospace">(stream-car evens) </font><font face="Symbol">&#8658;</font><font face="monospace"> 0</font></font></p>
-
-<p align="justify"><font face="serif"><font face="monospace">(stream-car (stream-cdr 
-evens)) </font><font face="Symbol">&#8658;</font><font face="monospace"> 
-2</font></font></p>
-
-<p align="justify"><font face="serif"><font face="monospace">(stream-car (stream-cdr 
-(stream-cdr evens))) </font><font face="Symbol">&#8658;</font><font face="monospace"> 4</font></font></p>
-
-<h2><font face="serif">The <font face="monospace">(streams derived)</font><font face="serif"> library</font></font></h2>
-
-<p align="justify"><font face="serif"><font face="serif">The </font><font face="monospace">(streams derived)</font><font face="serif"> 
-library provides useful procedures and syntax that depend on the primitives 
-defined above.  In the operator 
-templates given below, an ellipsis </font><font face="monospace">...</font><font face="serif"> indicates zero or more repetitions 
-of the preceding subexpression and square brackets </font><font face="monospace">[&#8230;]</font><font face="serif"> indicate optional elements.  
-In the type annotations given below, square brackets </font><font face="monospace">[&#8230;]</font><font face="serif"> refer to lists, curly braces </font><font face="monospace">{&#8230;}</font><font face="serif"> 
-refer to streams, and </font><font face="monospace">nat</font><font face="serif"> refers to exact non-negative integers.</font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><b>syntax: </b></font><font face="monospace"><b>(define-stream 
-(</b></font><font face="serif"><b><i>name</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>args</i></b></font><font face="monospace"><b>) </b></font><font face="serif"><b><i>body</i></b></font><font face="monospace"><b>) </b></font><br>
-<font face="monospace">Define-stream</font><font face="serif"> creates a procedure that returns a 
-stream, and may appear anywhere a normal </font><font face="monospace">define</font><font face="serif"> may appear, including as an internal 
-definition, and may have internal definitions of its own, including 
-other </font><font face="monospace">define-stream</font><font face="serif">s.  The defined procedure takes 
-arguments in the same way as </font><font face="monospace">stream-lambda</font><font face="serif">.  </font><font face="monospace">Define-stream</font><font face="serif"> is syntactic sugar on </font><font face="monospace">stream-lambda</font><font face="serif">; 
-see also </font><font face="monospace">stream-let</font><font face="serif">, which is also a sugaring of </font><font face="monospace">stream-lambda</font><font face="serif">.</font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif">A simple version of <font face="monospace">stream-map</font>
-<font face="serif"> that takes only a single input stream calls itself recursively:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (stream-map proc strm)
-  (if (stream-null? strm)
-      stream-null
-      (stream-cons
-        (proc (stream-car strm))
-        (stream-map proc (stream-cdr strm))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font><font face="monospace"><b>(list-&gt;stream </b></font><font face="serif"><b><i>list-of-objects</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">[&#945;] &#8594; {&#945;}</font><br>
-<font face="monospace">List-&gt;stream</font><font face="serif"> takes a list of objects and returns 
-a newly-allocated stream containing in its elements the objects in the 
-list.  Since the objects are given in a list, they are evaluated 
-when </font><font face="monospace">list-&gt;stream</font><font face="serif"> is called, before the stream is created.  
-If the list of objects is null, as in </font><font face="monospace">(list-&gt;stream 
-'())</font><font face="serif">, the null stream is 
-returned.  See also </font><font face="monospace">stream</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(define strm123 (list-&gt;stream '(1 2 3)))</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">
-<pre>; fails with divide-by-zero error
-(define s (list-&gt;stream (list 1 (/ 1 0) -1)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font><font face="monospace"><b>(port-&gt;stream 
-[</b></font><font face="serif"><b><i>port</i></b></font><font face="monospace"><b>])</b></font><br>
-<font face="monospace">port &#8594; {char}</font><br>
-<font face="monospace">Port-&gt;stream</font><font face="serif"> takes a <i>port</i> and returns a 
-newly-allocated stream containing in its elements the characters on 
-the port.  If <i>port</i> is not given it defaults to the current 
-input port.  The returned stream has finite length and is terminated 
-by </font><font face="monospace">stream-null</font><font face="serif">.</font></font></font></p>
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">It looks like 
-one use of </font><font face="monospace">port-&gt;stream</font><font face="serif"> would be this:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define s ;wrong!
-  (with-input-from-file filename
-    (lambda () (port-&gt;stream))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">But that fails, 
-because </font><font face="monospace">with-input-from-file</font><font face="serif"> is eager, and closes the input port 
-prematurely, before the first character is read.  To read a file 
-into a stream, say:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (file-&gt;stream filename)
-  (let ((p (open-input-file filename)))
-    (stream-let loop ((c (read-char p)))
-      (if (eof-object? c)
-          (begin (close-input-port p)
-                 stream-null)
-          (stream-cons c
-            (loop (read-char p)))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>syntax: </b></font><font face="monospace"><b>(stream </b></font><font face="serif"><b><i>object</i> </b></font><font face="monospace"><b>...)</b></font><br>
-<font face="monospace">Stream</font><font face="serif"> is syntax that takes zero or more <i>
-object</i>s and creates a newly-allocated stream containing in its elements 
-the <i>object</i>s, in order.  Since </font><font face="monospace">stream</font><font face="serif"> is syntactic, the <i>object</i>s are 
-evaluated when they are accessed, not when the stream is created.  
-If no <i>object</i>s are given, as in </font><font face="monospace">(stream)</font><font face="serif">, the null stream is returned.  
-See also </font><font face="monospace">list-&gt;stream</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(define strm123 (stream 1 2 3))</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>; (/ 1 0) not evaluated when stream is created
-(define s (stream 1 (/ 1 0) -1))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font><font face="monospace"><b>(stream-&gt;list 
-[</b></font><font face="serif"><b><i>n</i></b></font><font face="monospace"><b>] </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">nat × {&#945;} &#8594; [&#945;]</font><br>
-<font face="monospace">Stream-&gt;list</font><font face="serif"> takes a natural number <i>n</i> and 
-a <i>stream</i> and returns a newly-allocated list containing in its 
-elements the first <i>n</i> items in the <i>stream</i>. If the <i>stream</i> 
-has less than <i>n</i> items all the items in the <i>stream</i> will 
-be included in the returned list.  If <i>n</i> is not given it 
-defaults to infinity, which means that unless <i>stream</i> is finite </font><font face="monospace">stream-&gt;list</font><font face="serif"> 
-will never return.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">(stream-&gt;list 10
-  (stream-map (lambda (x) (* x x))
-    (stream-from 0)))
-  </font><font face="Symbol">&#8658;</font><font face="monospace"> (0 1 4 9 16 25 36 49 64 81)</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b>
-</font><font face="monospace"><b>(stream-append </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b> ...)</b></font><br>
-<font face="monospace">{&#945;} ... &#8594; {&#945;}</font><br>
-<font face="monospace">Stream-append</font><font face="serif"> returns a newly-allocated stream containing 
-in its elements those elements contained in its input <i>stream</i>s, 
-in order of input.  If any of the input <i>stream</i>s is infinite, 
-no elements of any of the succeeding input <i>stream</i>s will appear 
-in the output stream; thus, if </font><font face="monospace">x</font><font face="serif"> is infinite, </font><font face="monospace">(stream-append 
-x y) &#8801; x</font><font face="serif">.  See also </font><font face="monospace">stream-concat</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Quicksort can 
-be used to sort a stream, using </font><font face="monospace">stream-append</font><font face="serif"> to build the output; the sort is lazy; 
-so if only the beginning of the output stream is needed, the end of 
-the stream is never sorted.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (qsort lt? strm)
-  (if (stream-null? strm)
-      stream-null
-      (let ((x (stream-car strm))
-            (xs (stream-cdr strm)))
-        (stream-append
-          (qsort lt?
-            (stream-filter
-              (lambda (u) (lt? u x))
-              xs))
-          (stream x)
-          (qsort lt?
-            (stream-filter
-              (lambda (u) (not (lt? u x)))
-              xs))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Note also that, 
-when used in tail position as in </font><font face="monospace">qsort</font><font face="serif">, </font><font face="monospace">stream-append</font><font face="serif"> does not suffer the poor performance 
-of </font><font face="monospace">append</font><font face="serif"> 
-on lists.  The list version of </font><font face="monospace">append</font><font face="serif"> requires re-traversal of all its list 
-arguments except the last each time it is called.  But </font><font face="monospace">stream-append</font><font face="serif"> 
-is different.  Each recursive call to </font><font face="monospace">stream-append</font><font face="serif"> is suspended; when it is later forced, 
-the preceding elements of the result have already been traversed, so 
-tail-recursive loops that produce streams are efficient even when each 
-element is appended to the end of the result stream.  This also 
-implies that during traversal of the result only one promise needs to 
-be kept in memory at a time.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font><font face="monospace"><b>(stream-concat </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">{{&#945;}} ... &#8594; {&#945;}</font><br>
-<font face="monospace">Stream-concat</font><font face="serif"> takes a <i>stream</i> consisting of 
-one or more streams and returns a newly-allocated stream containing 
-all the elements of the input streams.  If any of the streams in 
-the input <i>stream</i> is infinite, any remaining streams in the input <i>
-stream</i> will never appear in the output stream.  See also </font><font face="monospace">stream-append</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-&gt;list
-  (stream-concat
-    (stream
-      (stream 1 2) (stream) (stream 3 2 1))))
-  &#8658; (1 2 3 2 1)</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The permutations 
-of a finite stream can be determined by interleaving each element of 
-the stream in all possible positions within each permutation of the 
-other elements of the stream.  </font><font face="monospace">Interleave</font><font face="serif"> returns a stream of streams with <i>
-x</i> inserted in each possible position of <i>yy</i>:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (interleave x yy)
-  (stream-match yy
-    (() (stream (stream x)))
-    ((y . ys)
-      (stream-append
-        (stream (stream-cons x yy))
-        (stream-map
-          (lambda (z) (stream-cons y z))
-          (interleave x ys))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (perms xs)
-  (if (stream-null? xs)
-      (stream (stream))
-      (stream-concat
-        (stream-map
-          (lambda (ys)
-            (interleave (stream-car xs) ys))
-          (perms (stream-cdr xs))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font><font face="monospace"><b>(stream-constant </b></font><font face="serif"><b><i>object</i></b></font><font face="monospace"><b> ...)</b></font><br>
-<font face="monospace">&#945; ... &#8594; {&#945;}</font><br>
-<font face="monospace">Stream-constant</font><font face="serif"> takes one or more <i>object</i>s and 
-returns a newly-allocated stream containing in its elements the <i>object</i>s, 
-repeating the <i>object</i>s in succession forever.</font></font></font></p>
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(stream-constant 
-1) </font><font face="Symbol">&#8658;</font><font face="monospace"> 
-1 1 1 ...</font></font></font></p>
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(stream-constant 
-#t #f) </font><font face="Symbol">&#8658;</font><font face="monospace"> 
-#t #f #t #f #t #f ...</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font><font face="monospace"><b>(stream-drop </b></font><font face="serif"><b><i>n</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><font face="serif"><b> procedure </b></font><br>
-<font face="monospace">nat × {&#945;} &#8594; {&#945;}</font><br>
-<font face="monospace">Stream-drop</font><font face="serif"> returns the suffix of the input <i>
-stream</i> that starts at the next element after the first <i>n</i> 
-elements.  The output stream shares structure with the input <i>
-stream</i>; thus, promises forced in one instance of the stream are 
-also forced in the other instance of the stream.  If the input <i>
-stream</i> has less than <i>n</i> elements, </font><font face="monospace">stream-drop</font><font face="serif"> returns the null stream.  See 
-also </font><font face="monospace">stream-take</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (stream-split n strm)
-  (values (stream-take n strm)
-          (stream-drop n strm)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font><font face="monospace"><b>(stream-drop-while </b></font><font face="serif"><b><i>pred?</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">(&#945; &#8594; boolean) × {&#945;} &#8594; {&#945;}</font><br>
-<font face="monospace">Stream-drop-while</font><font face="serif"> returns the suffix of the input <i>
-stream</i> that starts at the first element <i>x</i> for which </font><font face="monospace">(pred? </font><font face="serif"><i>x</i></font><font face="monospace">)</font><font face="serif"> 
-is </font><font face="monospace">#f</font><font face="serif">.  
-The output stream shares structure with the input <i>stream</i>.  
-See also </font><font face="monospace">stream-take-while</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Stream-unique</font><font face="serif"> creates a new stream that retains 
-only the first of any sub-sequences of repeated elements.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (stream-unique eql? strm)
-  (if (stream-null? strm)
-      stream-null
-      (stream-cons (stream-car strm)
-        (stream-unique eql?
-          (stream-drop-while
-            (lambda (x)
-              (eql? (stream-car strm) x))
-            strm)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-filter </b></font><font face="serif"><b><i>pred?</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">(&#945; &#8594; boolean) × {&#945;} &#8594; {&#945;}</font><br>
-<font face="monospace">Stream-filter</font><font face="serif"> returns a newly-allocated stream that 
-contains only those elements <i>x</i> of the input <i>stream</i> for 
-which </font><font face="monospace">(</font><font face="serif"><i>pred?</i></font><font face="monospace"> </font><font face="serif"><i>x</i></font><font face="monospace">)</font><font face="serif"> 
-is non-</font><font face="monospace">#f</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-filter odd? (stream-from 0))
-   &#8658; 1 3 5 7 9 ...</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-fold </b></font><font face="serif"><b><i>proc</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>base</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">(&#945; × &#946; &#8594; &#945;) × &#945; × {&#946;} &#8594; &#945;</font><br>
-<font face="monospace">Stream-fold</font><font face="serif"> applies a binary <i>proc</i>edure 
-to <i>base</i> and the first element of <i>stream</i> to compute a new <i>
-base</i>, then applies the <i>proc</i>edure to the new <i>base</i> and 
-the next element of <i>stream</i> to compute a succeeding <i>base</i>, 
-and so on, accumulating a value that is finally returned as the value 
-of </font><font face="monospace">stream-fold</font><font face="serif"> 
-when the end of the <i>stream</i> is reached.  <i>Stream</i> must 
-be finite, or </font><font face="monospace">stream-fold</font><font face="serif"> will enter an infinite loop.  
-See also </font><font face="monospace">stream-scan</font><font face="serif">, which is similar to </font><font face="monospace">stream-fold</font><font face="serif">, but useful for infinite streams.  
-For readers familiar with other functional languages, this is a left-fold; 
-there is no corresponding right-fold, since right-fold relies on finite 
-streams that are fully-evaluated, at which time they may as well be 
-converted to a list.</font></font></font></p>
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Stream-fold</font><font face="serif"> is often used to summarize a stream 
-in a single value, for instance, to compute the maximum element of a stream.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (stream-maximum lt? strm)
-  (stream-fold
-    (lambda (x y) (if (lt? x y) y x))
-    (stream-car strm)
-    (stream-cdr strm)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Sometimes, 
-it is useful to have </font><font face="monospace">stream-fold</font><font face="serif"> defined only on non-null streams:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (stream-fold-one proc strm)
-  (stream-fold proc
-    (stream-car strm)
-    (stream-cdr strm)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Stream-minimum</font><font face="serif"> can then be defined as:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (stream-minimum lt? strm)
-  (stream-fold-one
-    (lambda (x y) (if (lt? x y) x y))
-    strm))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Stream-fold</font><font face="serif"> can also be used to build a stream:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (isort lt? strm)
-    (define-stream (insert strm x)
-      (stream-match strm
-        (() (stream x))
-        ((y . ys)
-          (if (lt? y x)
-              (stream-cons y (insert ys x))
-              (stream-cons x strm)))))
-    (stream-fold insert stream-null strm))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-for-each </b></font><font face="serif"><b><i>proc</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b> ...)</b></font><br>
-<font face="monospace">(&#945; × &#946; × ...) × {&#945;} × {&#946;} ...</font><br>
-<font face="monospace">Stream-for-each</font><font face="serif"> applies a <i>proc</i>edure element-wise 
-to corresponding elements of the input <i>stream</i>s for its side-effects; 
-it returns nothing.  </font><font face="monospace">Stream-for-each</font><font face="serif"> stops as soon as any of its input <i>
-stream</i>s is exhausted.</font></font></font></p>
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The following 
-procedure displays the contents of a file:</font></font></font></p>
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (display-file filename)
-  (stream-for-each display
-    (file-&gt;stream filename)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">
-<font face="serif"><b>procedure: </b></font>
-<b>(stream-from </b></font><font face="serif"><b><i>first</i></b></font><font face="monospace"><b> 
-[</b></font><font face="serif"><b><i>step</i></b></font><font face="monospace"><b>])</b></font><br>
-<font face="monospace">number × number &#8594; {number}</font><br>
-<font face="monospace">Stream-from</font><font face="serif"> creates a newly-allocated stream that 
-contains <i>first</i> as its first element and increments each succeeding 
-element by <i>step</i>.  If <i>step</i> is not given it defaults 
-to </font><font face="monospace">1</font><font face="serif">.  <i>
-First</i> and <i>step</i> may be of any numeric type.  </font><font face="monospace">Stream-from</font><font face="serif"> 
-is frequently useful as a generator in </font><font face="monospace">stream-of</font><font face="serif"> expressions.  See also </font><font face="monospace">stream-range</font><font face="serif"> 
-for a similar procedure that creates finite streams.</font><font face="monospace"> </font></font></font></p>
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Stream-from</font><font face="serif"> could be implemented as </font><font face="monospace">(stream-iterate (lambda (x) (+ x </font><font face="serif"><i>step</i></font><font face="monospace">)) </font><font face="serif"><i>first</i></font><font face="monospace">)</font><font face="serif">.</font></font></font></p>
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(define nats (stream-from 
-0)) </font><font face="Symbol">&#8658;</font><font face="monospace"> 
-0 1 2 ...</font></font></font></p>
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(define odds (stream-from 
-1 2)) </font><font face="Symbol">&#8658;</font><font face="monospace"> 
-1 3 5 ...</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-iterate proc base)</b></font><br>
-<font face="monospace">(&#945; &#8594; &#945;) × &#945; &#8594; {&#945;}</font><br>
-<font face="monospace">Stream-iterate</font><font face="serif"> creates a newly-allocated stream containing <i>
-base</i> in its first element and applies <i>proc</i> to each element 
-in turn to determine the succeeding element.  See also </font><font face="monospace">stream-unfold</font><font face="serif"> 
-and </font><font face="monospace">stream-unfolds</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-iterate (lambda (x) (+ x 1)) 0)
-  &#8658; 0 1 2 3 4 ...</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">(stream-iterate (lambda (x) (* x 2)) 1)
-  &#8658; 1 2 4 8 16 ...</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Given a <i>
-seed</i> between </font><font face="monospace">0</font><font face="serif"> and </font><font face="monospace">2<sup>32</sup></font><font face="serif">, exclusive, the following expression 
-creates a stream of pseudo-random integers between </font><font face="monospace">0</font><font face="serif"> and </font><font face="monospace">2<sup>32</sup></font><font face="serif">, exclusive, beginning with <i>seed</i>, 
-using the method described by Stephen Park and Keith Miller:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">(stream-iterate
-  (lambda (x) (modulo (* x 16807) 2147483647))
-  </font><font face="serif"><i>seed</i></font><font face="monospace">)</font></font></font></pre><p></p>
-
-<p><font face="serif"><font face="serif"><font face="serif">Successive values of the continued 
-fraction shown below approach the value of the &#8220;golden ratio&#8221; &#966; 
-&#8776; 1.618:</font></font></font></p>
-
-<p align="center"><font face="serif"><font face="serif"><img src="srfi-41_files/streams1.jpg" alt="Continued fraction" height="126" width="131"></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The fractions 
-can be calculated by the stream</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(stream-iterate 
-(lambda (x) (+ 1 (/ x))) 1)</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-length </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">{&#945;} &#8594; nat</font><br>
-<font face="monospace">Stream-length</font><font face="serif"> takes an input <i>stream</i> and returns 
-the number of elements in the <i>stream</i>; it does not evaluate its 
-elements.  </font><font face="monospace">Stream-length</font><font face="serif"> may only be used on finite streams; 
-it enters an infinite loop with infinite streams.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(stream-length 
-strm123) </font><font face="Symbol">&#8658;</font><font face="monospace"> 
-3</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>syntax: </b></font>
-<font face="monospace"><b>(stream-let </b></font><font face="serif"><b><i>tag</i></b></font><font face="monospace"><b> 
-((</b></font><font face="serif"><b><i>var</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>expr</i></b></font><font face="monospace"><b>) ...) </b></font><font face="serif"><b><i>body</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">Stream-let</font><font face="serif"> creates a local scope that binds each <i>
-var</i>iable<i> </i>to the value of its corresponding <i>expr</i>ession.  
-It additionally binds <i>tag</i> to a procedure which takes the bound <i>
-var</i>iables as arguments and <i>body</i> as its defining expressions, 
-binding the <i>tag</i> with </font><font face="monospace">stream-lambda</font><font face="serif">. <i>Tag</i> is in scope within <i>
-body</i>, and may be called recursively.  When the expanded expression 
-defined by the </font><font face="monospace">stream-let</font><font face="serif"> is evaluated, </font><font face="monospace">stream-let</font><font face="serif"> evaluates the expressions in its <i>
-body</i> in an environment containing the newly-bound <i>var</i>iables, 
-returning the value of the last expression evaluated, which must yield 
-a stream.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Stream-let</font><font face="serif"> provides syntactic sugar on </font><font face="monospace">stream-lambda</font><font face="serif">, 
-in the same manner as normal </font><font face="monospace">let</font><font face="serif"> provides syntactic sugar on normal </font><font face="monospace">lambda</font><font face="serif">.  
-However, unlike normal </font><font face="monospace">let</font><font face="serif">, the <i>tag</i> is required, not optional, 
-because unnamed </font><font face="monospace">stream-let</font><font face="serif"> is meaningless. </font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Stream-member</font><font face="serif"> returns the first stream-pair of the 
-input </font><font face="monospace">strm</font><font face="serif"> 
-with a </font><font face="monospace">stream-car</font><font face="serif"> <i>x</i> that satisfies </font><font face="monospace">(eql? obj </font><font face="serif"><i>x</i></font><font face="monospace">)</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (stream-member eql? obj strm)
-  (stream-let loop ((strm strm))
-    (cond ((stream-null? strm) #f)
-          ((eql? obj (stream-car strm)) strm)
-          (else (loop (stream-cdr strm))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-map </b></font><font face="serif"><b><i>proc stream</i> </b></font><font face="monospace"><b>...)</b></font><br>
-<font face="monospace">(&#945; × &#946; ... &#8594; &#969;) × {&#945;} × {&#946;} ... &#8594; {&#969;}</font><br>
-<font face="monospace">Stream-map</font><font face="serif"> applies a <i>proc</i>edure element-wise 
-to corresponding elements of the input <i>stream</i>s, returning a newly-allocated 
-stream containing elements that are the results of those <i>proc</i>edure 
-applications.  The output stream has as many elements as the minimum-length 
-input <i>stream</i>, and may be infinite.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(define (square 
-x) (* x x))</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(stream-map square 
-(stream 9 3)) &#8658; 81 9</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (sigma f m n)
-  (stream-fold + 0
-    (stream-map f (stream-range m (+ n 1)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(sigma square 1 
-100) &#8658; 338350</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">In some functional 
-languages, </font><font face="monospace">stream-map</font><font face="serif"> takes only a single input stream, 
-and </font><font face="monospace">stream-zipwith</font><font face="serif"> provides a companion function that 
-takes multiple input streams.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>syntax: </b></font>
-<font face="monospace"><b>(stream-match </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>clause</i></b></font><font face="monospace"><b> ...)</b></font><br>
-<font face="monospace">Stream-match</font><font face="serif"> provides the syntax of pattern-matching 
-for streams.  The input <i>stream</i> is an expression that evaluates 
-to a stream.  Clauses are of the form </font><font face="monospace">(</font><font face="serif"><i>pattern</i></font><font face="monospace"> 
-[</font><font face="serif"><i>fender</i></font><font face="monospace">] </font><font face="serif"><i>expr</i></font><font face="monospace">)</font><font face="serif">, 
-consisting of a <i>pattern</i> that matches a stream of a particular 
-shape, an optional <i>fender</i> that must succeed if the pattern is 
-to match, and an <i>expr</i>ession that is evaluated if the <i>pattern</i> 
-matches.  There are four types of <i>pattern</i>s:</font></font></font></p>
-
-<ul type="disc">
-<font face="serif"><font face="serif">  <li><font face="monospace">()</font><font face="serif"> 
-  &#8212; Matches the null stream.</font></li>
-  <li><font face="monospace">(</font><font face="serif"><i>pat</i><sub><i>0</i></sub></font><font face="monospace"> </font><font face="serif"><i>pat</i><sub><i>1</i></sub></font><font face="monospace"> ...)</font><font face="serif"> 
-  &#8212; Matches a finite stream with length exactly equal to the number 
-  of pattern elements.</font></li>
-  <li><font face="monospace">(</font><font face="serif"><i>pat</i><sub><i>0</i></sub></font><font face="monospace"> </font><font face="serif"><i>pat</i><sub><i>1</i></sub></font><font face="monospace"> ... . </font><font face="serif"><i>pat</i><sub><i>rest</i></sub></font><font face="monospace">)</font><font face="serif"> 
-  &#8212; Matches an infinite stream, or a finite stream with length at least 
-  as great as the number of pattern elements before the literal dot.</font></li>
-  <li><font face="serif"><i>pat</i> &#8212; Matches 
-  an entire stream.  Should always appear last in the list of clauses; 
-  it&#8217;s not an error to appear elsewhere, but subsequent clauses could 
-  never match.</font></li>
-</font></font></ul>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Each pattern 
-element <i>pat</i><sub><i>i</i></sub> may be either:</font></font></font></p>
-
-<ul type="disc">
-<font face="serif"><font face="serif">  <li><font face="serif">An identifier &#8212; 
-  Matches any stream element.  Additionally, the value of the stream 
-  element is bound to the variable named by the identifier, which is in 
-  scope in the <i>fender</i> and <i>expr</i>ession of the corresponding <i>clause</i>.  
-  Each identifier in a single pattern must be unique.</font></li>
-  <li><font face="serif">A literal underscore 
-  &#8212; Matches any stream element, but creates no bindings.</font></li>
-</font></font></ul>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The <i>pattern</i>s 
-are tested in order, left-to-right, until a matching pattern is found; 
-if <i>fender</i> is present, it must evaluate as non-</font><font face="monospace">#f</font><font face="serif"> for the match to be successful.  
-Pattern variables are bound in the corresponding <i>fender</i> and <i>
-expr</i>ession.  Once the matching pattern is found, the corresponding <i>
-expr</i>ession is evaluated and returned as the result of the match.  
-An error is signaled if no pattern matches the input <i>stream</i>.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Stream-match</font><font face="serif"> is often used to distinguish null 
-streams from non-null streams, binding </font><font face="monospace">head</font><font face="serif"> and </font><font face="monospace">tail</font><font face="serif">:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (len strm)
-  (stream-match strm
-    (() 0)
-    ((head . tail) (+ 1 (len tail)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Fenders can 
-test the common case where two stream elements must be identical; the </font><font face="monospace">else</font><font face="serif"> 
-pattern is an identifier bound to the entire stream, not a keyword as 
-in </font><font face="monospace">cond</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-match strm
-  ((x y . _) (equal? x y) 'ok)
-  (else 'error))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">A more complex 
-example uses two nested matchers to match two different stream arguments; </font><font face="monospace">(stream-merge lt? . </font><font face="serif"><i>strms</i></font><font face="monospace">)</font><font face="serif"> 
-stably merges two or more streams ordered by the </font><font face="monospace">lt?</font><font face="serif"> predicate:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (stream-merge lt? . strms)
-  (define-stream (merge xx yy)
-    (stream-match xx (() yy) ((x . xs)
-      (stream-match yy (() xx) ((y . ys)
-        (if (lt? y x)
-            (stream-cons y (merge xx ys))
-            (stream-cons x (merge xs yy))))))))
-  (stream-let loop ((strms strms))
-    (cond ((null? strms) stream-null)
-          ((null? (cdr strms)) (car strms))
-          (else (merge (car strms)
-                       (apply stream-merge lt?
-                         (cdr strms)))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>syntax: </b></font>
-<font face="monospace"><b>(stream-of </b></font><font face="serif"><b><i>expr</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>clause</i></b></font><font face="monospace"><b> ...)</b></font><br>
-<font face="monospace">Stream-of</font><font face="serif"> provides the syntax of stream comprehensions, 
-which generate streams by means of looping expressions.  The result 
-is a stream of objects of the type returned by <i>expr</i>.  There 
-are four types of clauses:</font></font></font></p>
-
-<ul type="disc">
-<font face="serif"><font face="serif">  <li><font face="monospace">(</font><font face="serif"><i>var</i></font><font face="monospace"> in </font><font face="serif"><i>stream-expr</i></font><font face="monospace">)</font><font face="serif"> 
-  &#8212; Loop over the elements of <i>stream-expr</i>, in order from the 
-  start of the stream, binding each element of the stream in turn to <i>
-  var</i>.  </font><font face="monospace">Stream-from</font><font face="serif"> and </font><font face="monospace">stream-range</font><font face="serif"> are frequently useful as generators 
-  for <i>stream-expr</i>.</font></li>
-  <li><font face="monospace">(</font><font face="serif"><i>var</i></font><font face="monospace"> is </font><font face="serif"><i>expr</i></font><font face="monospace">)</font><font face="serif"> 
-  &#8212; Bind <i>var</i> to the value obtained by evaluating <i>expr</i>.</font></li>
-  <li><font face="monospace">(pred? </font><font face="serif"><i>expr</i></font><font face="monospace">)</font><font face="serif"> 
-  &#8212; Include in the output stream only those elements <i>x</i> for which </font><font face="monospace">(pred? </font><font face="serif"><i>x</i></font><font face="monospace">)</font><font face="serif"> 
-  is non-</font><font face="monospace">#f</font><font face="serif">.</font></li>
-</font></font></ul>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The scope of <i>
-var</i>iables bound in the stream comprehension is the clauses to the 
-right of the binding clause (but not the binding clause itself) plus 
-the result expression.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">When two or 
-more generators are present, the loops are processed as if they are 
-nested from left to right; that is, the rightmost generator varies fastest.  
-A consequence of this is that only the first generator may be infinite 
-and all subsequent generators must be finite.  If no generators 
-are present, the result of a stream comprehension is a stream containing 
-the result expression; thus, </font><font face="monospace">(stream-of 
-1)</font><font face="serif"> produces a finite stream 
-containing only the element </font><font face="monospace">1</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-of (* x x)
-  (x in (stream-range 0 10))
-  (even? x))
-  &#8658; 0 4 16 36 64</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-of (list a b)
-  (a in (stream-range 1 4))
-  (b in (stream-range 1 3))) 
-  &#8658; (1 1) (1 2) (2 1) (2 2) (3 1) (3 2)</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-of (list i j)
-  (i in (stream-range 1 5))
-  (j in (stream-range (+ i 1) 5)))
-  &#8658; (1 2) (1 3) (1 4) (2 3) (2 4) (3 4)</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-range </b></font><font face="serif"><b><i>first</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>past</i></b></font><font face="monospace"><b> 
-[</b></font><font face="serif"><b><i>step</i></b></font><font face="monospace"><b>])</b></font><br>
-<font face="monospace">number × number × number &#8594; {number}</font><br>
-<font face="monospace">Stream-range</font><font face="serif"> creates a newly-allocated stream that 
-contains <i>first</i> as its first element and increments each succeeding 
-element by <i>step</i>.  The stream is finite and ends before <i>
-past</i>, which is not an element of the stream.  If <i>step</i> 
-is not given it defaults to </font><font face="monospace">1</font><font face="serif"> if <i>first</i> is less than <i>past</i> 
-and </font><font face="monospace">-1</font><font face="serif"> 
-otherwise.  <i>First</i>, <i>past</i> and <i>step</i> may be of 
-any numeric type.  </font><font face="monospace">Stream-range</font><font face="serif"> is frequently useful as a generator 
-in </font><font face="monospace">stream-of</font><font face="serif"> 
-expressions.  See also </font><font face="monospace">stream-from</font><font face="serif"> for a similar procedure that creates 
-infinite streams.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(stream-range 0 
-10) &#8658; 0 1 2 3 4 5 6 7 8 9</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(stream-range 0 
-10 2) &#8594; 0 2 4 6 8</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Successive 
-elements of the stream are calculated by adding <i>step</i> to <i>first</i>, 
-so if any of <i>first</i>, <i>past</i> or <i>step</i> are inexact, the 
-length of the output stream may differ from </font><font face="monospace">(ceiling 
-(- (/ (- </font><font face="serif"><i>past</i></font><font face="monospace"> </font><font face="serif"><i>first</i></font><font face="monospace">) </font><font face="serif"><i>step</i></font><font face="monospace">) 1)</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-ref </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>n</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">{&#945;} × nat &#8594; &#945;</font><br>
-<font face="monospace">Stream-ref</font><font face="serif"> returns the <i>n</i>th element of <i>
-stream</i>, counting from zero.  An error is signaled if <i>n</i> 
-is greater than or equal to the length of <i>stream</i>.</font><font face="monospace"> </font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (fact n)
-  (stream-ref
-    (stream-scan * 1 (stream-from 1))
-    n))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-reverse </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">{&#945;} &#8594; {&#945;}</font><br>
-<font face="monospace">Stream-reverse</font><font face="serif"> returns a newly-allocated stream containing 
-the elements of the input <i>stream</i> but in reverse order.  </font><font face="monospace">Stream-reverse</font><font face="serif"> 
-may only be used with finite streams; it enters an infinite loop with 
-infinite streams.  </font><font face="monospace">Stream-reverse</font><font face="serif"> does not force evaluation of the elements 
-of the stream.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>&gt; (define s (stream 1 (/ 1 0) -1))
-&gt; (define r (stream-reverse s))
-&gt; (stream-ref r 0)
-&gt; (stream-ref r 2)
-1
-&gt; (stream-ref r 1)
-error: division by zero</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-scan </b></font><font face="serif"><b><i>proc</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>base</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">(&#945; × &#946; &#8594; &#945;) × &#945; × {&#946;} &#8594; {&#945;}</font><br>
-<font face="monospace">Stream-scan</font><font face="serif"> accumulates the partial folds of an 
-input <i>stream</i> into a newly-allocated output stream.  The 
-output stream is the <i>base</i> followed by </font><font face="monospace">(stream-fold 
-proc base (stream-take </font><font face="serif"><i>i</i></font><font face="monospace"> stream))</font><font face="serif"> 
-for each of the first <i>i</i> elements of <i>stream</i>.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-scan + 0 (stream-from 1))
-  &#8658; (stream 0 1 3 6 10 15 ...)</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-scan * 1 (stream-from 1))
-  &#8658; (stream 1 1 2 6 24 120 ...)</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-take </b></font><font face="serif"><b><i>n</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">nat × {&#945;} &#8594; {&#945;}</font><br>
-<font face="monospace">Stream-take</font><font face="serif"> takes a non-negative integer <i>n</i> 
-and a <i>stream</i> and returns a newly-allocated stream containing 
-the first <i>n</i> elements of the input <i>stream</i>.  If the 
-input <i>stream</i> has less than <i>n</i> elements, so does the output 
-stream.  See also </font><font face="monospace">stream-drop</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Mergesort splits 
-a stream into two equal-length pieces, sorts them recursively and merges 
-the results:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (msort lt? strm)
-  (let* ((n (quotient (stream-length strm) 2))
-         (ts (stream-take n strm))
-         (ds (stream-drop n strm)))
-    (if (zero? n)
-        strm
-        (stream-merge lt?
-          (msort &lt; ts) (msort &lt; ds)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-take-while </b></font><font face="serif"><b><i>pred?</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">(&#945; &#8594; boolean) × {&#945;} &#8594; {&#945;}</font><br>
-<font face="monospace">Stream-take-while</font><font face="serif"> takes a predicate and a <i>stream</i> 
-and returns a newly-allocated stream containing those elements <i>x</i> 
-that form the maximal prefix of the input <i>stream</i> for which </font><font face="monospace">(pred? </font><font face="serif"><i>x</i></font><font face="monospace">)</font><font face="serif"> 
-is non-</font><font face="monospace">#f</font><font face="serif">.  
-See also </font><font face="monospace">stream-drop-while</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-car
-  (stream-reverse
-    (stream-take-while
-      (lambda (x) (&lt; x 1000))
-        primes))) &#8658; 997</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-unfold </b></font><font face="serif"><b><i>map</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>pred?</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>gen</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>base</i>)</b></font><br>
-<font face="monospace">(&#945; &#8594; &#946;) × (&#945; &#8594; boolean) × (&#945; &#8594; &#945;) × &#945; &#8594; {&#946;}</font><br>
-<font face="monospace">Stream-unfold</font><font face="serif"> is the fundamental recursive stream 
-constructor.  It constructs a stream by repeatedly applying <i>
-gen</i> to successive values of <i>base</i>, in the manner of </font><font face="monospace">stream-iterate</font><font face="serif">, 
-then applying <i>map</i> to each of the values so generated, appending 
-each of the mapped values to the output stream as long as </font><font face="monospace">(</font><font face="serif"><i>pred?</i></font><font face="monospace"> </font><font face="serif"><i>base</i></font><font face="monospace">)</font><font face="serif"> 
-is non-</font><font face="monospace">#f</font><font face="serif">.  
-See also </font><font face="monospace">stream-iterate</font><font face="serif"> and </font><font face="monospace">stream-unfolds</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The expression 
-below creates the finite stream </font><font face="monospace">0</font><font face="serif"> </font><font face="monospace">1</font><font face="serif"> </font><font face="monospace">4</font><font face="serif"> </font><font face="monospace">9</font><font face="serif"> </font><font face="monospace">16</font><font face="serif"> </font><font face="monospace">25</font><font face="serif"> </font><font face="monospace">36</font><font face="serif"> </font><font face="monospace">49</font><font face="serif"> </font><font face="monospace">64</font><font face="serif"> </font><font face="monospace">81</font><font face="serif">.  Initially the </font><font face="monospace">base</font><font face="serif"> is </font><font face="monospace">0</font><font face="serif">, which is less than </font><font face="monospace">10</font><font face="serif">, so <i>map</i> squares the <i>base</i> 
-and the mapped value becomes the first element of the output stream.  
-Then <i>gen</i> increments the <i>base</i> by </font><font face="monospace">1</font><font face="serif">, so it becomes </font><font face="monospace">1</font><font face="serif">; this is less than </font><font face="monospace">10</font><font face="serif">, so <i>map</i> squares the new </font><font face="monospace">base</font><font face="serif"> 
-and </font><font face="monospace">1</font><font face="serif"> 
-becomes the second element of the output stream.  And so on, until 
-the <i>base</i> becomes </font><font face="monospace">10</font><font face="serif">, when <i>pred?</i> stops the recursion 
-and </font><font face="monospace">stream-null</font><font face="serif"> ends the output stream.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-unfold
-  (lambda (x) (expt x 2)) ; map
-  (lambda (x) (&lt; x 10))   ; pred?
-  (lambda (x) (+ x 1))    ; gen
-  0)                      ; base</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-unfolds </b></font><font face="serif"><b><i>proc</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>seed</i></b></font><font face="monospace"><b>)</b></font><br>
-<font face="monospace">(&#945; &#8594; (values &#945; × &#946; ...)) × &#945; &#8594; (values {&#946;} ...)</font><br>
-<font face="monospace">Stream-unfolds</font><font face="serif"> returns <i>n</i> newly-allocated streams 
-containing those elements produced by successive calls to the generator <i>
-proc</i>, which takes the current <i>seed</i> as its argument and returns <i>
-n</i></font><font face="monospace">+1</font><font face="serif"> 
-values</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(</font><font face="serif"><i>proc</i></font><font face="monospace"> </font><font face="serif"><i>seed</i></font> &#8594; <font face="serif"><i>seed</i></font><font face="monospace"> </font><font face="serif"><i>result</i><sub><i>0</i></sub></font><font face="monospace"> ... </font><font face="serif"><i>result</i><sub><i>n-1</i></sub></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">where the returned <i>
-seed</i> is the input <i>seed</i> to the next call to the generator 
-and <i>result</i><sub><i>i</i></sub> indicates how to produce the next 
-element of the <i>i</i><sup><i>th</i></sup> result stream:</font></font></font></p>
-
-<ul type="disc">
-<font face="serif"><font face="serif">  <li><font face="monospace">(</font><font face="serif"><i>value</i></font><font face="monospace">)</font><font face="serif"> 
-  &#8212; <i>value</i> is the next car of the result stream</font></li>
-  <li><font face="monospace">#f</font><font face="serif"> 
-  &#8212; no value produced by this iteration of the generator <i>proc</i> 
-  for the result stream</font></li>
-  <li><font face="monospace">()</font><font face="serif"> 
-  &#8212; the end of the result stream</font></li>
-</font></font></ul>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">It may require 
-multiple calls of <i>proc</i> to produce the next element of any particular 
-result stream.  See also </font><font face="monospace">stream-iterate</font><font face="serif"> and </font><font face="monospace">stream-unfold</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Stream-unfolds</font><font face="serif"> is especially useful when writing 
-expressions that return multiple streams.  For instance, </font><font face="monospace">(stream-partition </font><font face="serif"><i>pred?</i></font><font face="monospace"> </font><font face="serif"><i>strm</i></font><font face="monospace">)</font><font face="serif"> 
-is equivalent to</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">(values
-  (stream-filter </font><font face="serif"><i>pred?</i></font><font face="monospace"> </font><font face="serif"><i>strm</i></font><font face="monospace">)
-  (stream-filter
-    (lambda (x) (not (</font><font face="serif"><i>pred?</i></font><font face="monospace"> x))) </font><font face="serif"><i>strm</i></font><font face="monospace">))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">but only tests <i>
-pred?</i> once for each element of <i>strm</i>.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (stream-partition pred? strm)
-  (stream-unfolds
-    (lambda (s)
-      (if (stream-null? s)
-          (values s '() '())
-          (let ((a (stream-car s))
-                (d (stream-cdr s)))
-            (if (pred? a)
-                (values d (list a) #f)
-                (values d #f (list a))))))
-    strm))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">(call-with-values
-  (lambda ()
-    (stream-partition odd?
-      (stream-range 1 6)))
-  (lambda (odds evens)
-    (list (stream-&gt;list odds)
-          (stream-&gt;list evens))))
-  &#8658; ((1 3 5) (2 4))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><b>procedure: </b></font>
-<font face="monospace"><b>(stream-zip </b></font><font face="serif"><b><i>stream</i></b></font><font face="monospace"><b> ...)</b></font><br>
-<font face="monospace">{&#945;} × {&#946;} × ... &#8594; {[&#945; &#946; ...]}</font><br>
-<font face="monospace">Stream-zip</font><font face="serif"> takes one or more input <i>stream</i>s 
-and returns a newly-allocated stream in which each element is a list 
-(not a stream) of the corresponding elements of the input <i>stream</i>s.  
-The output stream is as long as the shortest input <i>stream</i>, if 
-any of the input <i>stream</i>s is finite, or is infinite if all the 
-input <i>stream</i>s are infinite.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">A common use 
-of </font><font face="monospace">stream-zip</font><font face="serif"> 
-is to add an index to a stream, as in </font><font face="monospace">(stream-finds </font><font face="serif"><i>eql?</i></font><font face="monospace"> </font><font face="serif"><i>obj</i></font><font face="monospace"> </font><font face="serif"><i>strm</i></font><font face="monospace">)</font><font face="serif">, which returns all the zero-based 
-indices in <i>strm</i> at which <i>obj</i> appears; </font><font face="monospace">(stream-find </font><font face="serif"><i>eql?</i></font><font face="monospace"> </font><font face="serif"><i>obj</i></font><font face="monospace"> </font><font face="serif"><i>strm</i></font><font face="monospace">)</font><font face="serif"> returns the first such index, or </font><font face="monospace">#f</font><font face="serif"> 
-if <i>obj</i> is not in <i>strm</i>.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (stream-finds eql? obj strm)
-  (stream-of (car x)
-    (x in (stream-zip (stream-from 0) strm))
-    (eql? obj (cadr x))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (stream-find eql? obj strm)
-  (stream-car
-    (stream-append
-      (stream-finds eql? obj strm)
-      (stream #f))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-find char=? #\l
-  (list-&gt;stream
-    (string-&gt;list "hello"))) &#8658; 2</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-find char=? #\l
-  (list-&gt;stream
-    (string-&gt;list "goodbye"))) &#8658; #f</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Stream-find</font><font face="serif"> is not as inefficient as it looks; 
-although it calls </font><font face="monospace">stream-finds</font><font face="serif">, which finds all matching indices, 
-the matches are computed lazily, and only the first match is needed 
-for </font><font face="monospace">stream-find</font><font face="serif">.</font></font></font></p>
-
-<h1><font face="serif"><font face="serif">Utilities</font></font></h1>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Streams, being 
-the signature structured data type of functional programming languages, 
-find useful expression in conjunction with higher-order functions.  
-Some of these higher-order functions, and their relationship to streams, 
-are described below.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The identity 
-and constant procedures are frequently useful as the recursive base 
-for maps and folds; </font><font face="monospace"><b>(identity </b></font><font face="serif"><b><i>obj</i></b></font><font face="monospace"><b>)</b></font><font face="serif"> always returns <i>obj</i>, and </font><font face="monospace"><b>(const </b></font><font face="serif"><b><i>obj</i></b></font><font face="monospace"><b>)</b></font><font face="serif"> 
-creates a procedure that takes any number of arguments and always returns 
-the same <i>obj</i>, no matter its arguments:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(define (identity 
-obj) obj)</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(define (const 
-obj) (lambda x obj))</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Many of the 
-stream procedures take a unary predicate that accepts an element of 
-a stream and returns a boolean.  Procedure </font><font face="monospace"><b>(negate </b></font><font face="serif"><b><i>pred?</i></b></font><font face="monospace"><b>)</b></font><font face="serif"> takes a unary predicate and returns 
-a new unary predicate that, when called, returns the opposite boolean 
-value as the original predicate.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (negate pred?)
-  (lambda (x) (not (pred? x))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Negate</font><font face="serif"> is useful for procedures like </font><font face="monospace">stream-take-while</font><font face="serif"> 
-that take a predicate, allowing them to be used in the opposite direction 
-from which they were written; for instance, with the predicate reversed, </font><font face="monospace">stream-take-while</font><font face="serif"> 
-becomes </font><font face="monospace">stream-take-until</font><font face="serif">.  </font><font face="monospace">Stream-remove</font><font face="serif"> is the opposite of </font><font face="monospace">stream-filter</font><font face="serif">:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (stream-remove pred? strm)
-  (stream-filter (negate pred?) strm))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">A section is 
-a procedure which has been partially applied to some of its arguments; 
-for instance, </font><font face="monospace">(double </font><font face="serif"><i>x</i></font><font face="monospace">)</font><font face="serif">, which returns twice its argument, 
-is a partial application of the multiply operator to the number </font><font face="monospace">2</font><font face="serif">.  
-Sections come in two kinds: left sections partially apply arguments 
-starting from the left, and right sections partially apply arguments 
-starting from the right.  Procedure </font><font face="monospace"><b>(lsec </b></font><font face="serif"><b><i>proc</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>args</i></b></font><font face="monospace"><b> 
-...)</b></font><font face="serif"> takes a <i>proc</i>edure 
-and some prefix of its arguments and returns a new procedure in which 
-those arguments are partially applied.  Procedure </font><font face="monospace"><b>(rsec </b></font><font face="serif"><b><i>proc</i></b></font><font face="monospace"><b> </b></font><font face="serif"><b><i>args</i></b></font><font face="monospace"><b> 
-...)</b></font><font face="serif"> takes a <i>proc</i>edure 
-and some reversed suffix of its arguments and returns a new procedure 
-in which those arguments are partially applied.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (lsec proc . args)
-  (lambda x (apply proc (append args x))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (rsec proc . args)
-  (lambda x (apply proc (reverse
-    (append (reverse args) (reverse x))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Since most 
-of the stream procedures take a stream as their last (right-most) argument, 
-left sections are particularly useful in conjunction with streams.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(define stream-sum 
-(lsec stream-fold + 0))</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Function composition 
-creates a new function by partially applying multiple functions, one 
-after the other.  In the simplest case there are only two functions, </font><font face="monospace">f</font><font face="serif"> 
-and </font><font face="monospace">g</font><font face="serif">, 
-composed as </font><font face="monospace">((compose f g) &#8801; <i>x</i></font><font face="monospace">))</font><font face="serif">; 
-the composition can be bound to create a new function, as in </font><font face="monospace">(define fg (compose f g))</font><font face="serif">.  
-Procedure </font><font face="monospace"><b>(compose </b></font><font face="serif"><b><i>proc</i></b></font><font face="monospace"><b> 
-...)</b></font><font face="serif"> takes one or more <i>
-proc</i>edures and returns a new procedure that performs the same action 
-as the individual procedures would if called in succession.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (compose . fns)
-  (let comp ((fns fns))
-    (cond
-      ((null? fns) 'error)
-      ((null? (cdr fns)) (car fns))
-      (else
-        (lambda args
-          (call-with-values
-            (lambda ()
-              (apply
-                (comp (cdr fns))
-                args))
-            (car fns)))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Compose</font><font face="serif"> works with sections to create succinct 
-but highly expressive procedure definitions.  The expression to 
-compute the squares of the integers from </font><font face="monospace">1</font><font face="serif"> to </font><font face="monospace">10</font><font face="serif"> given above at </font><font face="monospace">stream-unfold</font><font face="serif"> could be written by composing </font><font face="monospace">stream-map</font><font face="serif">, </font><font face="monospace">stream-take-while</font><font face="serif">, 
-and </font><font face="monospace">stream-iterate</font><font face="serif">:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>((compose
-  (lsec stream-map (rsec expt 2))
-  (lsec stream-take-while (negate (rsec &gt; 10)))
-  (lsec stream-iterate (rsec + 1)))
- 1)</pre></font></font></font></p>
-
-<h1><font face="serif"><font face="serif">Examples</font></font></h1>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The examples 
-below show a few of the myriad ways streams can be exploited, as well 
-as a few ways they can trip the unwary user.  All the examples 
-are drawn from published sources; it is instructive to compare the Scheme 
-versions to the originals in other languages.</font></font></font></p>
-
-<h2><font face="serif"><font face="serif">Infinite streams</font></font></h2>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">As a simple 
-illustration of infinite streams, consider this definition of the natural 
-numbers:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define nats
-  (stream-cons 0
-    (stream-map add1 nats)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The recursion 
-works because it is offset by one from the initial </font><font face="monospace">stream-cons</font><font face="serif">.  Another sequence that uses 
-the offset trick is this definition of the fibonacci numbers:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define fibs
-  (stream-cons 1
-    (stream-cons 1
-      (stream-map +
-        fibs
-        (stream-cdr fibs)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Yet another 
-sequence that uses the same offset trick is the Hamming numbers, named 
-for the mathematician and computer scientist Richard Hamming, defined 
-as all numbers that have no prime factors greater than 5; in other words, 
-Hamming numbers are all numbers expressible as 2<sup><i>i</i></sup>·3<sup><i>j</i></sup>·5<sup><i>k</i></sup>, 
-where <i>i</i>, <i>j</i> and <i>k</i> are non-negative integers.  The 
-Hamming sequence starts with </font><font face="monospace">1 
-2 3 4 5 6 8 9 10 12</font><font face="serif"> and 
-is computed starting with </font><font face="monospace">1</font><font face="serif">, taking </font><font face="monospace">2</font><font face="serif">, </font><font face="monospace">3</font><font face="serif"> and </font><font face="monospace">5</font><font face="serif"> times all the previous elements with </font><font face="monospace">stream-map</font><font face="serif">, 
-then merging sub-streams and eliminating duplicates.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define hamming
-  (stream-cons 1
-    (stream-unique =
-      (stream-merge &lt;
-        (stream-map (lsec * 2) hamming)
-        (stream-map (lsec * 3) hamming)
-        (stream-map (lsec * 5) hamming)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">It is possible 
-to have an infinite stream of infinite streams.  Consider the definition 
-of </font><font face="monospace">power-table</font><font face="serif">:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define power-table
-  (stream-of
-    (stream-of (expt m n)
-      (m in (stream-from 1)))
-      (n in (stream-from 2))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">which evaluates 
-to an infinite stream of infinite streams:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><mpre>
-(stream
-  (stream 1 4 9 16 25 ...)
-  (stream 1 8 27 64 125 ...)
-  (stream 1 16 81 256 625 ...)
-  ...)</mpre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">But even though 
-it is impossible to display </font><font face="monospace">power-table</font><font face="serif"> in its entirety, it is possible to 
-select just part of it:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-&gt;list 10 (stream-ref power-table 1))
-  &#8658; (1 8 27 64 125 216 343 512 729 1000)</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">This example 
-clearly shows that the elements of a stream are computed lazily, as 
-they are needed; </font><font face="monospace">(stream-ref 
-power-table 0)</font><font face="serif"> is not computed, 
-even when its successor is displayed, since computing it would enter 
-an infinite loop.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Chris Reade 
-shows how to calculate the stream of prime numbers according to the 
-sieve of Eratosthenes, using a method that eliminates multiples of the 
-sifting base with addition rather than division:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define primes (let ()
-  (define-stream (next base mult strm)
-    (let ((first (stream-car strm))
-          (rest (stream-cdr strm)))
-      (cond ((&lt; first mult)
-              (stream-cons first
-                (next base mult rest)))
-            ((&lt; mult first)
-              (next base (+ base mult) strm))
-            (else (next base
-                    (+ base mult) rest)))))
-  (define-stream (sift base strm)
-    (next base (+ base base) strm))
-  (define-stream (sieve strm)
-    (let ((first (stream-car strm))&gt;
-          (rest (stream-cdr strm)))
-      (stream-cons first
-        (sieve (sift first rest)))))
-  (sieve (stream-from 2))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">A final example 
-of infinite streams is a functional pearl from Jeremy Gibbons, David 
-Lester and Richard Bird that enumerates the positive rational numbers 
-without duplicates:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define rats
-  (stream-iterate
-    (lambda (x)
-      (let* ((n (floor x)) (y (- x n)))
-        (/ (- n -1 y))))
-    1))</pre></font></font></font></p>
-
-<h2><font face="serif"><font face="serif">Backtracking via the stream of successes</font></font></h2>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Philip Wadler 
-describes the <i>stream of successes</i> technique that uses streams 
-to perform backtracking search.   The basic idea is that each procedure 
-returns a stream of possible results, so that its caller can decide 
-which result it wants; an empty stream signals failure, and causes backtracking 
-to a previous choice point.  The stream of successes technique 
-is useful because the program is written as if to simply enumerate all 
-possible solutions; no backtracking is explicit in the code.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The Eight Queens 
-puzzle, which asks for a placement of eight queens on a chessboard so 
-that none of them attack any other, is an example of a problem that 
-can be solved using the stream of successes technique.  The algorithm 
-is to place a queen in the first column of a chessboard; any column 
-is satisfactory.  Then a queen is placed in the second column, 
-in any position not held in check by the queen in the first column.  
-Then a queen is placed in the third column, in any position not held 
-in check by the queens in the first two columns.  And so on, until 
-all eight queens have been placed.  If at any point there is no 
-legal placement for the next queen, backtrack to a different legal position 
-for the previous queens, and try again.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The chessboard 
-is represented as a stream of length <i>m</i>, where there are queens 
-in the first <i>m</i> columns, each position in the stream representing 
-the rank on which the queen appears in that column.  For example, 
-stream </font><font face="monospace">4</font><font face="serif"> </font><font face="monospace">6</font><font face="serif"> </font><font face="monospace">1</font><font face="serif"> </font><font face="monospace">5</font><font face="serif"> </font><font face="monospace">2</font><font face="serif"> </font><font face="monospace">8</font><font face="serif"> </font><font face="monospace">3</font><font face="serif"> </font><font face="monospace">7</font><font face="serif"> 
-represents the following chessboard:</font></font></font></p>
-
-<p align="center"><font face="serif"><font face="serif"><img src="srfi-41_files/streams2.jpg" alt="Chessboard" height="205" width="195"></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Two queens 
-at column <i>i</i> row <i>j</i> and column <i>m</i> row <i>n</i> check 
-each other if their columns <i>i</i> and <i>m</i> are the same, or if 
-their rows <i>j</i> and <i>n</i> are the same, or if they are on the 
-same diagonal with <i>i</i> + <i>j</i> = <i>m</i> + <i>n</i> or <i>i</i> 
-&#8211; <i>j</i> = <i>m</i> &#8211; <i>n</i>.  There is no need to test 
-the columns, because the placement algorithm enforces that they differ, 
-so the </font><font face="monospace">check?</font><font face="serif"> 
-procedure tests if two queens hold each other in check.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (check? i j m n)
-  (or (= j n)
-      (= (+ i j) (+ m n))
-      (= (- i j) (- m n))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The algorithm 
-walks through the columns, extending position <i>p</i> by adding a new 
-queen in row <i>n</i> with </font><font face="monospace">(stream-append </font><font face="serif"><i>p</i></font><font face="monospace"> 
-(stream </font><font face="serif"><i>n</i></font><font face="monospace">))</font><font face="serif">.  </font><font face="monospace">Safe?</font><font face="serif"> 
-tests if it is safe to do so, using the utility procedure </font><font face="monospace">stream-and</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (stream-and strm)
-  (let loop ((strm strm))
-    (cond ((stream-null? strm) #t)
-          ((not (stream-car strm)) #f)
-          (else (loop (stream-cdr strm))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (safe? p n)
-  (let* ((len (stream-length p))
-         (m (+ len 1)))
-    (stream-and
-      (stream-of
-        (not (check? (car ij) (cadr ij) m n))
-          (ij in (stream-zip
-                   (stream-range 1 m)
-                   p))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Procedure </font><font face="monospace">(queens </font><font face="serif"><i>m</i></font><font face="monospace">)</font><font face="serif"> 
-returns all the ways that queens can safely be placed in the first <i>
-m</i> columns.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (queens m)
-  (if (zero? m)
-      (stream (stream))
-      (stream-of (stream-append p (stream n))
-        (p in (queens (- m 1)))
-        (n in (stream-range 1 9))
-        (safe? p n))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">To see the 
-first solution to the Eight Queens problem, say</font></font></font></p>
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(stream-&gt;list 
-(stream-car (queens 8)))</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">To see all 
-92 solutions, say</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-&gt;list
-  (stream-map stream-&gt;list
-    (queens 8)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">There is no 
-explicit backtracking in the code.  The </font><font face="monospace">stream-of</font><font face="serif"> expression in </font><font face="monospace">queens</font><font face="serif"> returns all possible streams that 
-satisfy </font><font face="monospace">safe?</font><font face="serif">; 
-implicit backtracking occurs in the recursive call to </font><font face="monospace">queens</font><font face="serif">.</font></font></font></p>
-
-<h2><font face="serif"><font face="serif">Generators and co-routines</font></font></h2>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">It is possible 
-to model generators and co-routines using streams.  Consider the task, 
-due to Carl Hewitt, of determining if two trees have the same sequence 
-of leaves:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(same-fringe? = 
-'(1 (2 3)) '((1 2) 3)) &#8658; #t</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(same-fringe? = 
-'(1 2 3) '(1 (3 2))) &#8658; #f</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The simplest 
-solution is to flatten both trees into lists and compare them element-by-element:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (flatten tree)
-  (cond ((null? tree) '())
-        ((pair? (car tree))
-          (append (flatten (car tree))
-                  (flatten (cdr tree))))
-        (else (cons (car tree)
-                    (flatten (cdr tree))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (same-fringe? eql? tree1 tree2)
-  (let loop ((t1 (flatten tree1))
-             (t2 (flatten tree2)))
-    (cond ((and (null? t1) (null? t2)) #t)
-          ((or (null? t1) (null? t2)) #f)
-          ((not (eql? (car t1) (car t2))) #f)
-          (else (loop (cdr t1) (cdr t2))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">That works, 
-but requires time to flatten both trees and space to store the flattened 
-versions; if the trees are large, that can be a lot of time and space, 
-and if the fringes differ, much of that time and space is wasted.</font></font></font></p>
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Hewitt used 
-a generator to flatten the trees one element at a time, storing only 
-the current elements of the trees and the machines needed to continue 
-flattening them, so </font><font face="monospace">same-fringe?</font><font face="serif"> could stop early if the trees differ.  
-Dorai Sitaram presents both the generator solution and a co-routine 
-solution, which both involve tricky calls to </font><font face="monospace">call-with-current-continuation</font><font face="serif"> and careful coding to keep them synchronized.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">An alternate 
-solution flattens the two trees to streams instead of lists, which accomplishes 
-the same savings of time and space, and involves code that looks little 
-different than the list solution presented above:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (flatten tree)
-  (cond ((null? tree) stream-null)
-        ((pair? (car tree))
-          (stream-append
-            (flatten (car tree))
-            (flatten (cdr tree))))
-        (else (stream-cons
-                (car tree)
-                (flatten (cdr tree))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (same-fringe? eql? tree1 tree2)
-  (let loop ((t1 (flatten tree1))
-             (t2 (flatten tree2)))
-    (cond ((and (stream-null? t1)
-                (stream-null? t2)) #t)
-          ((or  (stream-null? t1)
-                (stream-null? t2)) #f)
-          ((not (eql? (stream-car t1)
-                      (stream-car t2))) #f)
-          (else (loop (stream-cdr t1)
-                      (stream-cdr t2))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Note that streams, 
-a data structure, replace generators or co-routines, which are control 
-structures, providing a fine example of how lazy streams enhance modularity.</font></font></font></p>
-
-<h2><font face="serif"><font face="serif">A pipeline of procedures</font></font></h2>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Another way 
-in which streams promote modularity is enabling the use of many small 
-procedures that are easily composed into larger programs, in the style 
-of unix pipelines, where streams are important because they allow a 
-large dataset to be processed one item at a time.  Bird and Wadler 
-provide the example of a text formatter.  Their example uses right-folds:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (stream-fold-right f base strm) 
-  (if (stream-null? strm)
-      base
-      (f (stream-car strm)
-         (stream-fold-right f base
-           (stream-cdr strm)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (stream-fold-right-one f strm)
-  (stream-match strm
-  ((x) x)
-  ((x . xs)
-    (f x (stream-fold-right-one f xs)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Bird and Wadler 
-define text as a stream of characters, and develop a standard package 
-for operating on text, which they derive mathematically (this assumes 
-the line-separator character is a single </font><font face="monospace">#\newline</font><font face="serif">):</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (breakon a)
-  (stream-lambda (x xss)
-    (if (equal? a x)
-        (stream-append (stream (stream)) xss)
-        (stream-append
-          (stream (stream-append
-              (stream x) (stream-car xss)))
-          (stream-cdr xss)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (lines strm) 
-  (stream-fold-right
-    (breakon #\newline)
-    (stream (stream))
-    strm))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (words strm)
-  (stream-filter stream-pair?
-    (stream-fold-right
-      (breakon #\space)
-      (stream (stream))
-      strm)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (paras strm)
-  (stream-filter stream-pair?
-    (stream-fold-right
-      (breakon stream-null)
-      (stream (stream))
-      strm)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (insert a)
-  (stream-lambda (xs ys)
-    (stream-append xs (stream a) ys)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define unlines
-  (lsec stream-fold-right-one
-    (insert #\newline)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define unwords
-  (lsec stream-fold-right-one
-    (insert #\space)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define unparas
-  (lsec stream-fold-right-one
-    (insert stream-null)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">These versatile 
-procedures can be composed to count words, lines and paragraphs; the </font><font face="monospace">normalize</font><font face="serif"> 
-procedure squeezes out multiple spaces and blank lines:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define countlines
-  (compose stream-length lines))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define countwords
-  (compose stream-length
-           stream-concat
-           (lsec stream-map words)
-           lines))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define countparas
-  (compose stream-length paras lines))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define parse
-  (compose (lsec stream-map
-             (lsec stream-map words))
-           paras
-           lines))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define unparse
-  (compose unlines
-           unparas
-           (lsec stream-map
-             (lsec stream-map unwords))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define normalize (compose unparse parse))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">More useful 
-than normalization is text-filling, which packs as many words onto each 
-line as will fit.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (greedy m ws)
-  (- (stream-length
-       (stream-take-while (rsec &lt;= m)
-         (stream-scan
-           (lambda (n word)
-             (+ n (stream-length word) 1))
-           -1
-           ws))) 1))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (fill m ws)
-  (if (stream-null? ws)
-      stream-null
-      (let* ((n (greedy m ws))
-             (fstline (stream-take n ws))
-             (rstwrds (stream-drop n ws)))
-        (stream-append
-          (stream fstline)
-          (fill m rstwrds)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define linewords
-  (compose stream-concat
-           (lsec stream-map words)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define textparas
-  (compose (lsec stream-map linewords)
-           paras
-           lines))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (filltext m strm)
-  (unparse (stream-map (lsec fill m) (textparas strm))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">To display <i>
-filename</i> in lines of <i>n</i> characters, say:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">(stream-for-each display
-  (filltext </font><font face="serif"><i>n</i></font><font face="monospace"> (file-&gt;stream </font><font face="serif"><i>filename</i></font><font face="monospace">)))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Though each 
-operator performs only a single task, they can be composed powerfully 
-and expressively.  The alternative is to build a single monolithic 
-procedure for each task, which would be harder and involve repetitive 
-code.  Streams ensure procedures are called as needed.</font></font></font></p>
-
-<h2><font face="serif"><font face="serif">Persistent data</font></font></h2>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Queues are 
-one of the fundamental data structures of computer science.  In 
-functional languages, queues are commonly implemented using two lists, 
-with the front half of the queue in one list, where the head of the 
-queue can be accessed easily, and the rear half of the queue in reverse 
-order in another list, where new items can easily be added to the end 
-of a queue.  The standard form of such a queue holds that the front 
-list can only be null if the rear list is also null: </font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(define queue-null (cons '() '())</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (queue-null? obj)
-  (and (pair? obj) (null? (car obj))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (queue-check f r)
-  (if (null? f)
-      (cons (reverse r) '())
-      (cons f r)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (queue-snoc q x)
-  (queue-check (car q) (cons x (cdr q))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (queue-head q)
-  (if (null? (car q))
-      (error "empty queue: head")
-      (car (car q))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (queue-tail q)
-  (if (null? (car q))
-      (error "empty-head: tail")
-      (queue-check (cdr (car q)) (cdr q))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">This queue 
-operates in amortized constant time per operation, with two conses per 
-element, one when it is added to the rear list, and another when the 
-rear list is reversed to become the front list.  </font><font face="monospace">Queue-snoc</font><font face="serif"> and </font><font face="monospace">queue-head</font><font face="serif"> operate in constant time; </font><font face="monospace">queue-tail</font><font face="serif"> 
-operates in worst-case linear time when the front list is empty.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Chris Okasaki 
-points out that, if the queue is used persistently, its time-complexity 
-rises from linear to quadratic since each persistent copy of the queue 
-requires its own linear-time access.  The problem can be fixed 
-by implementing the front and rear parts of the queue as streams, rather 
-than lists, and rotating one element from rear to front whenever the 
-rear list is larger than the front list: </font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define queue-null
-  (cons stream-null stream-null))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (queue-null? x)
-  (and (pair? x) (stream-null (car x))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (queue-check f r)
-  (if (&lt; (stream-length r) (stream-length f))
-      (cons f r)
-      (cons (stream-append f (stream-reverse r))
-            stream-null)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (queue-snoc q x)
-  (queue-check (car q) (stream-cons x (cdr q))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (queue-head q)
-  (if (stream-null? (car q))
-      (error "empty queue: head")
-      (stream-car (car q))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (queue-tail q)
-  (if (stream-null? (car q))
-      (error "empty queue: tail")
-      (queue-check (stream-cdr (car q))
-                   (cdr q))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Memoization 
-solves the persistence problem; once a queue element has moved from 
-rear to front, it need never be moved again in subsequent traversals 
-of the queue.  Thus, the linear time-complexity to access all elements 
-in the queue, persistently, is restored. </font></font></font></p>
-
-<h2><font face="serif"><font face="serif">Reducing two passes to one</font></font></h2>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The final example 
-is a lazy dictionary, where definitions and uses may occur in any order; 
-in particular, uses may precede their corresponding definitions.  
-This is a common problem.  Many programming languages allow procedures 
-to be used before they are defined.  Macro processors must collect 
-definitions and emit uses of text in order.  An assembler needs 
-to know the address that a linker will subsequently give to variables.  
-The usual method is to make two passes over the data, collecting the 
-definitions on the first pass and emitting the uses on the second pass.  
-But Chris Reade shows how streams allow the dictionary to be built lazily, 
-so that only a single pass is needed.  Consider a stream of requests:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define requests
-  (stream
-    '(get 3)
-    '(put 1 "a")    ; use follows definition
-    '(put 3 "c")    ; use precedes definition
-    '(get 1)
-    '(get 2)
-    '(put 2 "b")    ; use precedes definition
-    '(put 4 "d")))  ; unused definition</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">We want a procedure 
-that will display </font><font face="monospace">cab</font><font face="serif">, which is the result of </font><font face="monospace">(get 3)</font><font face="serif">, </font><font face="monospace">(get 1)</font><font face="serif">, 
-and </font><font face="monospace">(get 2)</font><font face="serif">, 
-in order.  We first separate the request stream into </font><font face="monospace">gets</font><font face="serif"> 
-and </font><font face="monospace">puts</font><font face="serif">:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (get? obj) (eq? (car obj) 'get))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (gets strm)
-  (stream-map cadr (stream-filter get? strm)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (puts strm)
-  (stream-map cdr  (stream-remove get? strm)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Now, </font><font face="monospace">run-dict</font><font face="serif"> 
-inserts each element of the </font><font face="monospace">puts</font><font face="serif"> stream into a lazy dictionary, represented 
-as a stream of key/value pairs (an association stream), then looks up 
-each element of the </font><font face="monospace">gets</font><font face="serif"> stream with </font><font face="monospace">stream-assoc</font><font face="serif">:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (run-dict requests)
-  (let ((dict (build-dict (puts requests))))
-    (stream-map (rsec stream-assoc dict)
-      (gets requests))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (stream-assoc key dict)
-    (cond ((stream-null? dict) #f)
-          ((equal? key (car (stream-car dict)))
-            (stream-car dict))
-          (else (stream-assoc key
-                  (stream-cdr dict)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">Dict</font><font face="serif"> is created in the </font><font face="monospace">let</font><font face="serif">, but nothing is initially added to 
-it.  Each time </font><font face="monospace">stream-assoc</font><font face="serif"> performs a lookup, enough of </font><font face="monospace">dict</font><font face="serif"> 
-is built to satisfy the lookup, but no more.  We are assuming that 
-each item is defined once and only once.  All that is left is to 
-define the procedure that inserts new items into the dictionary, lazily:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (build-dict puts)
-  (if (stream-null? puts)
-      stream-null
-      (stream-cons
-        (stream-car puts)
-        (build-dict (stream-cdr puts)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Now we can 
-run the requests and print the result:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-for-each display
-  (stream-map cadr (run-dict requests)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The </font><font face="monospace">(put 4 "d")</font><font face="serif"> 
-definition is never added to the dictionary because it is never needed.</font></font></font></p>
-
-<h2><font face="serif"><font face="serif">Pitfalls</font></font></h2>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Programming 
-with streams, or any lazy evaluator, can be tricky, even for programmers 
-experienced in the genre.  Programming with streams is even worse 
-in Scheme than in a purely functional language, because, though the 
-streams are lazy, the surrounding Scheme expressions in which they are 
-embedded are eager.  The impedance between lazy and eager can occasionally 
-lead to astonishing results.  Thirty-two years ago, William Burge 
-warned:</font></font></font></p>
-
-<ul><p align="justify"><font face="serif"><font face="serif"><font face="serif">Some care 
-must be taken when a stream is produced to make sure that its elements 
-are not really a list in disguise, in other words, to make sure that 
-the stream elements are not materialized too soon.</font></font></font></p></ul>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">For example, 
-a simple version of </font><font face="monospace">stream-map</font><font face="serif"> that returns a stream built by applying 
-a unary procedure to the elements of an input stream could be defined 
-like this:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (stream-map proc strm) ;wrong!
-  (let loop ((strm strm))
-    (if (stream-null? strm)
-        stream-null
-        (stream-cons
-          (proc (stream-car strm))
-          (loop (stream-cdr strm))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">That looks 
-right.  It properly wraps the procedure in </font><font face="monospace">stream-lambda</font><font face="serif">, and the two legs of the </font><font face="monospace">if</font><font face="serif"> 
-both return streams, so it type-checks.  But it fails because the 
-named </font><font face="monospace">let</font><font face="serif"> 
-binds </font><font face="monospace">loop</font><font face="serif"> 
-to a procedure using normal </font><font face="monospace">lambda</font><font face="serif"> rather than </font><font face="monospace">stream-lambda</font><font face="serif">, so even though the first element 
-of the result stream is lazy, subsequent elements are eager.  </font><font face="monospace">Stream-map</font><font face="serif"> 
-can be written using </font><font face="monospace">stream-let</font><font face="serif">:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (stream-map proc strm)
-  (stream-let loop ((strm strm))
-    (if (stream-null? strm)
-        stream-null
-        (stream-cons
-          (proc (stream-car strm))
-          (loop (stream-cdr strm))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Here, </font><font face="monospace">stream-let</font><font face="serif"> 
-assures that each element of the result stream is properly delayed, 
-because each is subject to the </font><font face="monospace">stream-lambda</font><font face="serif"> that is implicit in </font><font face="monospace">stream-let</font><font face="serif">, so the result is truly a stream, 
-not a &#8220;list in disguise.&#8221;  Another version of this procedure 
-was given previously at the description of </font><font face="monospace">define-stream</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Another common 
-problem occurs when a stream-valued procedure requires the next stream 
-element in its definition.  Consider this definition of </font><font face="monospace">stream-unique</font><font face="serif">:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define-stream (stream-unique eql? strm) ;wrong!
-  (stream-match strm
-    (() strm)
-    ((_) strm)
-    ((a b . _)
-      (if (eql? a b)
-          (stream-unique eql?
-            (stream-cdr strm))
-          (stream-cons a
-            (stream-unique eql?
-              (stream-cdr strm)))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The </font><font face="monospace">(a b . _)</font><font face="serif"> 
-pattern requires the value of the next stream element after the one 
-being considered.  Thus, to compute the <i>n</i><sup>th</sup> element 
-of the stream, one must know the <i>n</i>+1<sup>st</sup> element, and 
-to compute the <i>n</i>+1<sup>st</sup> element, one must know the <i>
-n</i>+2<sup>nd</sup> element, and to compute&#8230;.  The correct version, 
-given above in the description of </font><font face="monospace">stream-drop-while</font><font face="serif">, only needs the current stream element.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">A similar problem 
-occurs when the stream expression uses the previous element to compute 
-the current element:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">(define (nat n)
-  (stream-ref
-    (stream-let loop ((s (stream 0)))
-      (stream-cons (stream-car s)
-        (loop (stream (add1 (stream-car s))))))
-    n))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">This program 
-traverses the stream of natural numbers, building the stream as it goes.  
-The definition is correct; </font><font face="monospace">(nat 
-15)</font><font face="serif"> evaluates to </font><font face="monospace">15</font><font face="serif">.  
-But it needlessly uses unbounded space because each stream element holds 
-the value of the prior stream element in the binding to </font><font face="monospace">s</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">When traversing 
-a stream, it is easy to write the expression in such a way that evaluation 
-requires unbounded space, even when that is not strictly necessary.  
-During the discussion of SRFI-40, Joe Marshall created this infamous 
-procedure:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (times3 n)
-  (stream-ref
-    (stream-filter
-      (lambda (x)
-        (zero? (modulo x n)))
-      (stream-from 0))
-    3))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(times3 5)</font><font face="serif"> evaluates to </font><font face="monospace">15</font><font face="serif"> and </font><font face="monospace">(times3 
-#e1e9)</font><font face="serif"> evaluates to three 
-billion, though it takes a while.  In either case, </font><font face="monospace">times3</font><font face="serif"> 
-should operate in bounded space, since each iteration mutates the promise 
-that holds the next value.  But it is easy to write </font><font face="monospace">times3</font><font face="serif"> 
-so that it does not operate in bounded space, as the follies of SRFI-40 
-showed.  The common problem is that some element of the stream 
-(often the first element) is bound outside the expression that is computing 
-the stream, so it holds the head of the stream, which holds the second 
-element, and so on.  In addition to testing the programmer, this 
-procedure tests the stream primitives (it caught several errors during 
-development) and also tests the underlying Scheme system (it found a 
-bug in one implementation).</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Laziness is 
-no defense against an infinite loop; for instance, the expression below 
-never returns, because the </font><font face="monospace">odd?</font><font face="serif"> predicate never finds an odd stream 
-element.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-null?
-  (stream-filter odd?
-    (stream-from 0 2)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Ultimately, 
-streams are defined as promises, which are implemented as thunks (lambda 
-with no arguments).  Since a stream is a procedure, comparisons 
-such as </font><font face="monospace">eq?</font><font face="serif">, </font><font face="monospace">eqv?</font><font face="serif"> 
-and </font><font face="monospace">equal?</font><font face="serif"> 
-are not meaningful when applied to streams.  For instance, the 
-expression </font><font face="monospace">(define s ((stream-lambda 
-() stream-null)))</font><font face="serif"> defines </font><font face="monospace">s</font><font face="serif"> 
-as the null stream, and </font><font face="monospace">(stream-null? 
-s)</font><font face="serif"> is </font><font face="monospace">#t</font><font face="serif">, but </font><font face="monospace">(eq? 
-s stream-null)</font><font face="serif"> is </font><font face="monospace">#f</font><font face="serif">.  
-To determine if two streams are equal, it is necessary to evaluate the 
-elements in their common prefixes, reporting </font><font face="monospace">#f</font><font face="serif"> if two elements ever differ and </font><font face="monospace">#t</font><font face="serif"> 
-if both streams are exhausted at the same time.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define (stream-equal? eql? xs ys)
-  (cond ((and (stream-null? xs)
-              (stream-null? ys)) #t)
-        ((or (stream-null? xs)
-             (stream-null? ys)) #f)
-        ((not (eql? (stream-car xs)
-                    (stream-car ys))) #f)
-        (else (stream-equal? eql?
-                (stream-cdr xs)
-                (stream-cdr ys)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">It is generally 
-not a good idea to mix lazy streams with eager side-effects, because 
-the order in which stream elements are evaluated determines the order 
-in which the side-effects occur.  For a simple example, consider 
-this side-effecting version of </font><font face="monospace">strm123</font><font face="serif">:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(define strm123-with-side-effects
-  (stream-cons (begin (display "one") 1)
-    (stream-cons (begin (display "two") 2)
-      (stream-cons (begin (display "three") 3)
-        stream-null))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The stream 
-has elements </font><font face="monospace">1</font><font face="serif"> </font><font face="monospace">2</font><font face="serif"> </font><font face="monospace">3</font><font face="serif">.  
-But depending on the order in which stream elements are accessed, </font><font face="monospace">"one"</font><font face="serif">, </font><font face="monospace">"two"</font><font face="serif"> 
-and </font><font face="monospace">"three"</font><font face="serif"> could be printed in any order.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Since the performance 
-of streams can be very poor, normal (eager) lists should be preferred 
-to streams unless there is some compelling reason to the contrary.  
-For instance, computing pythagorean triples with streams</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(stream-ref
-  (stream-of (list a b c)
-    (n in (stream-from 1))
-    (a in (stream-range 1 n))
-    (b in (stream-range a n))
-    (c is (- n a b))
-    (= (+ (* a a) (* b b)) (* c c)))
-  50)</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">is about two 
-orders of magnitude slower than the equivalent expression using loops.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>(do ((n 1 (+ n 1))) ((&gt; n 228))
-  (do ((a 1 (+ a 1))) ((&gt; a n))
-    (do ((b a (+ b 1))) ((&gt; b n))
-      (let ((c (- n a b)))
-        (if (= (+ (* a a) (* b b)) (* c c))
-            (display (list a b c)))))))</pre></font></font></font></p>
-
-<h1><font face="serif"><font face="serif">Implementation</font></font></h1>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Bird and Wadler 
-describe streams as either null or a pair with a stream in the tail:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">
-&#945; list :: null | &#945; * &#945; list</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">That works 
-in a purely functional language such as Miranda
-or Haskell because the entire language is lazy.  In 
-an eager language like ML or Scheme, of course, it&#8217;s just a normal, 
-eager list.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Using ML, Wadler, 
-Taha and MacQueen give the type of even streams as:</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>datatype 'a stream_
-  = Nil_
-  | Cons_ of 'a * 'a stream
-withtype 'a stream
-  = 'a stream_ susp;</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Their </font><font face="monospace">susp</font><font face="serif"> 
-type is similar to Scheme&#8217;s </font><font face="monospace">promise</font><font face="serif"> type.  Since Scheme conflates 
-the notions of record and type (the only way to create a new type disjoint 
-from all other types is to create a record), it is necessary to distribute 
-the suspension through the two constructors of the stream data type:</font></font></font></p>
-
-<p><font face="serif"><font face="serif"><font face="monospace"><pre>&#945; stream
-  :: (promise stream-null)
-  |  (promise (&#945; stream-pair))</pre></font></font></font></p>
-
-<p><font face="serif"><font face="serif"><font face="monospace"><pre>&#945; stream-pair
-  :: &#945; × (&#945; stream)</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">That type captures 
-the systematic suspension of recursive promises that is the essence 
-of &#8220;streamness.&#8221;  But it doesn&#8217;t quite work, because Scheme 
-is eager rather than lazy, and both the car and the cdr of the stream 
-are evaluated too early.  So the final type of streams delays both 
-the car and the cdr of the stream-pair:</font></font></font></p>
-
-<p><font face="serif"><font face="serif"><font face="monospace"><pre>&#945; stream
-  :: (promise stream-null)
-  |  (promise (&#945; stream-pair))</pre></font></font></font></p>
-
-<p><font face="serif"><font face="serif"><font face="monospace"><pre>&#945; stream-pair
-  :: (promise &#945;) × (promise (&#945; stream))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">The two outer 
-promises, in the </font><font face="monospace">stream</font><font face="serif"> type, provide streams without memoization.  
-The two inner promises, in the </font><font face="monospace">stream-pair</font><font face="serif"> type, add the memoization that is 
-characteristic of streams in modern functional languages.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Lists provide 
-seven primitive operations: the two constructors </font><font face="monospace">'()</font><font face="serif"> and </font><font face="monospace">cons</font><font face="serif">, the type predicates </font><font face="monospace">list?</font><font face="serif">, </font><font face="monospace">null?</font><font face="serif"> and </font><font face="monospace">pair?</font><font face="serif">, and the accessors </font><font face="monospace">car</font><font face="serif"> and </font><font face="monospace">cdr</font><font face="serif"> for pairs.  All other list operations 
-can be derived from those primitives.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">It would seem 
-that the same set of primitives could apply to streams, but in fact 
-one additional primitive is required.  André van Tonder describes 
-the reason in his discussion of the promise data type.  The promises 
-of R6RS are inadequate to support iterative algorithms because each 
-time a promise is called iteratively it binds the old promise in the 
-closure that defines the new promise (so the old promise can be forced 
-later, if requested).  However, in the case of iteration, the old 
-promise becomes unreachable, so instead of creating a new promise that 
-binds the old promise within, it is better to mutate the promise; that 
-way, no space is wasted by the old promise.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Van Tonder 
-describes this new promise type, and provides a recipe for its use: 
-all constructors are wrapped with </font><font face="monospace">delay</font><font face="serif">, all accessors are wrapped with </font><font face="monospace">force</font><font face="serif">, 
-and all function bodies are wrapped with </font><font face="monospace">lazy</font><font face="serif">.  Given the seven primitives 
-above, the first two parts of van Tonder&#8217;s recipe are simple: the 
-two constructors </font><font face="monospace">stream-null</font><font face="serif"> and </font><font face="monospace">stream-pair</font><font face="serif"> hide </font><font face="monospace">delay</font><font face="serif">, and the two accessors </font><font face="monospace">stream-car</font><font face="serif"> 
-and </font><font face="monospace">stream-cdr</font><font face="serif"> 
-hide </font><font face="monospace">force</font><font face="serif"> 
-(</font><font face="monospace">stream-null?</font><font face="serif"> 
-and </font><font face="monospace">stream-pair?</font><font face="serif"> also hide </font><font face="monospace">force</font><font face="serif">, so they can distinguish the two constructors 
-of the stream type).</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Although the 
-new promise type prevents a space leak, it creates a new problem: there 
-is no place to hide the </font><font face="monospace">lazy</font><font face="serif"> that is the third part of van Tonder&#8217;s 
-recipe.  SRFI-40 solved this problem by exposing it (actually, 
-it exposed </font><font face="monospace">delay</font><font face="serif">, which was incorrect).  But that 
-violates good software engineering by preventing the stream 
-data type from being fully abstract.  The solution of SRFI-41 is 
-to create a new primitive, </font><font face="monospace">stream-lambda</font><font face="serif">, that returns a function that hides </font><font face="monospace">lazy</font><font face="serif">.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Besides hiding </font><font face="monospace">lazy</font><font face="serif"> 
-and making the types work out correctly, </font><font face="monospace">stream-lambda</font><font face="serif"> is obvious and easy-to-use for competent 
-Scheme programmers, especially when augmented with the syntactic sugar 
-of </font><font face="monospace">define-stream</font><font face="serif"> and named </font><font face="monospace">stream-let</font><font face="serif">.  The alternative of exposing </font><font face="monospace">stream-lazy</font><font face="serif"> 
-would be less clear and harder to use.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">One of the 
-hardest tasks when writing any program library is to decide what to 
-include and, more importantly, what to exclude.  One important 
-guideline is minimalism, since once an operator enters a library it 
-must remain forever: <i>Il semble que la perfection soit atteinte non 
-quand il n&#8217;y a plus rien à ajouter, mais quand il n&#8217;y a plus rien 
-à retrancher</i>.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Since streams 
-are substantially slower than lists (the stream primitives require numerous 
-type conversions, and list operations in most Scheme implementations 
-are heavily optimized), most programmers will use streams only when 
-the sequence of elements is truly infinite (such as mathematical series) 
-or when there is some clear advantage of laziness (such as reducing 
-the number of passes though a large data set).  Thus, the library 
-is biased toward functions that work with infinite streams left-to-right.  
-In particular, there is no right-fold; if you need to materialize an entire stream, 
-it&#8217;s best to use a list.</font></font></font></p>
-
-<h2><font face="serif"><font face="serif">Implementation of <font face="monospace">(streams primitive)</font></font></font></h2>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(library (streams primitive)</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (export stream-null stream-cons stream? stream-null? stream-pair?
-          stream-car stream-cdr stream-lambda)</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (import (rnrs) (rnrs mutable-pairs))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-record-type (stream-type make-stream stream?)
-    (fields (mutable box stream-promise stream-promise!)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-syntax stream-lazy
-    (syntax-rules ()
-      ((stream-lazy expr)
-        (make-stream
-          (cons 'lazy (lambda () expr))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (stream-eager expr)
-    (make-stream
-      (cons 'eager expr)))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-syntax stream-delay
-    (syntax-rules ()
-      ((stream-delay expr)
-        (stream-lazy (stream-eager expr)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-force promise)
-    (let ((content (stream-promise promise)))
-      (case (car content)
-        ((eager) (cdr content))
-        ((lazy)  (let* ((promise* ((cdr content)))
-                        (content  (stream-promise promise)))
-                   (if (not (eqv? (car content) 'eager))
-                       (begin (set-car! content (car (stream-promise promise*)))
-                              (set-cdr! content (cdr (stream-promise promise*)))
-                              (stream-promise! promise* content)))
-                   (stream-force promise))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define stream-null (stream-delay (cons 'stream 'null)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-record-type (stream-pare-type make-stream-pare stream-pare?)
-    (fields (immutable kar stream-kar) (immutable kdr stream-kdr)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (stream-pair? obj)
-    (and (stream? obj) (stream-pare? (stream-force obj))))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-null? obj)
-    (and (stream? obj)
-         (eqv? (stream-force obj)
-               (stream-force stream-null))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-syntax stream-cons
-    (syntax-rules ()
-      ((stream-cons obj strm)
-        (stream-eager (make-stream-pare (stream-delay obj) (stream-lazy strm))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-car strm)
-    (cond ((not (stream? strm)) (error 'stream-car "non-stream"))
-          ((stream-null? strm) (error 'stream-car "null stream"))
-          (else (stream-force (stream-kar (stream-force strm))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-cdr strm)
-    (cond ((not (stream? strm)) (error 'stream-cdr "non-stream"))
-          ((stream-null? strm) (error 'stream-cdr "null stream"))
-          (else (stream-kdr (stream-force strm)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-syntax stream-lambda
-    (syntax-rules ()
-      ((stream-lambda formals body0 body1 ...)
-        (lambda formals (stream-lazy (let () body0 body1 ...)))))))</pre></font></font></font></p>
-
-<h2><font face="serif"><font face="serif">Implementation of <font face="monospace">(streams derived)</font></font></font></h2>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(library (streams derived)</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (export stream-null stream-cons stream? stream-null? stream-pair? stream-car
-          stream-cdr stream-lambda define-stream list-&gt;stream port-&gt;stream stream
-          stream-&gt;list stream-append stream-concat stream-constant stream-drop
-          stream-drop-while stream-filter stream-fold stream-for-each stream-from
-          stream-iterate stream-length stream-let stream-map stream-match _
-          stream-of stream-range stream-ref stream-reverse stream-scan stream-take
-          stream-take-while stream-unfold stream-unfolds stream-zip)</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (import (rnrs) (streams primitive))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-syntax define-stream
-    (syntax-rules ()
-      ((define-stream (name . formal) body0 body1 ...)
-        (define name (stream-lambda formal body0 body1 ...)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (list-&gt;stream objs)
-    (define list-&gt;stream
-      (stream-lambda (objs)
-        (if (null? objs)
-            stream-null
-            (stream-cons (car objs) (list-&gt;stream (cdr objs))))))
-    (if (not (list? objs))
-        (error 'list-&gt;stream "non-list argument")
-        (list-&gt;stream objs)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (port-&gt;stream . port)
-    (define port-&gt;stream
-      (stream-lambda (p)
-        (let ((c (read-char p)))
-          (if (eof-object? c)
-              stream-null
-              (stream-cons c (port-&gt;stream p))))))
-    (let ((p (if (null? port) (current-input-port) (car port))))
-      (if (not (input-port? p))
-          (error 'port-&gt;stream "non-input-port argument")
-          (port-&gt;stream p))))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-syntax stream
-    (syntax-rules ()
-      ((stream) stream-null)
-      ((stream x y ...) (stream-cons x (stream y ...)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (stream-&gt;list . args)
-    (let ((n (if (= 1 (length args)) #f (car args)))
-          (strm (if (= 1 (length args)) (car args) (cadr args))))
-      (cond ((not (stream? strm)) (error 'stream-&gt;list "non-stream argument"))
-            ((and n (not (integer? n))) (error 'stream-&gt;list "non-integer count"))
-            ((and n (negative? n)) (error 'stream-&gt;list "negative count"))
-            (else (let loop ((n (if n n -1)) (strm strm))
-                    (if (or (zero? n) (stream-null? strm))
-                        '()
-                        (cons (stream-car strm) (loop (- n 1) (stream-cdr strm)))))))))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-append . strms)
-    (define stream-append
-      (stream-lambda (strms)
-        (cond ((null? (cdr strms)) (car strms))
-              ((stream-null? (car strms)) (stream-append (cdr strms)))
-              (else (stream-cons (stream-car (car strms))
-                                 (stream-append (cons (stream-cdr (car strms)) (cdr strms))))))))
-    (cond ((null? strms) stream-null)
-          ((exists (lambda (x) (not (stream? x))) strms)
-            (error 'stream-append "non-stream argument"))
-          (else (stream-append strms))))</pre></font></font></font></p>
-<font face="serif"><font face="serif">  
-</font></font><p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (stream-concat strms)
-    (define stream-concat
-      (stream-lambda (strms)
-        (cond ((stream-null? strms) stream-null)
-              ((not (stream? (stream-car strms)))
-                (error 'stream-concat "non-stream object in input stream"))
-              ((stream-null? (stream-car strms))
-                (stream-concat (stream-cdr strms)))
-              (else (stream-cons
-                      (stream-car (stream-car strms))
-                      (stream-concat
-                        (stream-cons (stream-cdr (stream-car strms)) (stream-cdr strms))))))))
-    (if (not (stream? strms))
-        (error 'stream-concat "non-stream argument")
-        (stream-concat strms)))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define stream-constant
-    (stream-lambda objs
-      (cond ((null? objs) stream-null)
-            ((null? (cdr objs)) (stream-cons (car objs) (stream-constant (car objs))))
-            (else (stream-cons (car objs)
-                               (apply stream-constant (append (cdr objs) (list (car objs)))))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-drop n strm)
-    (define stream-drop
-      (stream-lambda (n strm)
-        (if (or (zero? n) (stream-null? strm))
-            strm
-            (stream-drop (- n 1) (stream-cdr strm)))))
-    (cond ((not (integer? n)) (error 'stream-drop "non-integer argument"))
-          ((negative? n) (error 'stream-drop "negative argument"))
-          ((not (stream? strm)) (error 'stream-drop "non-stream argument"))
-          (else (stream-drop n strm))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (stream-drop-while pred? strm)
-    (define stream-drop-while
-      (stream-lambda (strm)
-        (if (and (stream-pair? strm) (pred? (stream-car strm)))
-            (stream-drop-while (stream-cdr strm))
-            strm)))
-    (cond ((not (procedure? pred?)) (error 'stream-drop-while "non-procedural argument"))
-          ((not (stream? strm)) (error 'stream-drop-while "non-stream argument"))
-          (else (stream-drop-while strm))))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-filter pred? strm)
-    (define stream-filter
-      (stream-lambda (strm)
-        (cond ((stream-null? strm) stream-null)
-              ((pred? (stream-car strm))
-                (stream-cons (stream-car strm) (stream-filter (stream-cdr strm))))
-              (else (stream-filter (stream-cdr strm))))))
-    (cond ((not (procedure? pred?)) (error 'stream-filter "non-procedural argument"))
-          ((not (stream? strm)) (error 'stream-filter "non-stream argument"))
-          (else (stream-filter strm))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-fold proc base strm)
-    (cond ((not (procedure? proc)) (error 'stream-fold "non-procedural argument"))
-          ((not (stream? strm)) (error 'stream-fold "non-stream argument"))
-          (else (let loop ((base base) (strm strm))
-                  (if (stream-null? strm)
-                      base
-                      (loop (proc base (stream-car strm)) (stream-cdr strm)))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (stream-for-each proc . strms)
-    (define (stream-for-each strms)
-      (if (not (exists stream-null? strms))
-          (begin (apply proc (map stream-car strms))
-                 (stream-for-each (map stream-cdr strms)))))
-    (cond ((not (procedure? proc)) (error 'stream-for-each "non-procedural argument"))
-          ((null? strms) (error 'stream-for-each "no stream arguments"))
-          ((exists (lambda (x) (not (stream? x))) strms)
-            (error 'stream-for-each "non-stream argument"))
-          (else (stream-for-each strms))))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-from first . step)
-    (define stream-from
-      (stream-lambda (first delta)
-        (stream-cons first (stream-from (+ first delta) delta))))
-    (let ((delta (if (null? step) 1 (car step))))
-      (cond ((not (number? first)) (error 'stream-from "non-numeric starting number"))
-            ((not (number? delta)) (error 'stream-from "non-numeric step size"))
-            (else (stream-from first delta)))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-iterate proc base)
-    (define stream-iterate
-      (stream-lambda (base)
-        (stream-cons base (stream-iterate (proc base)))))
-    (if (not (procedure? proc))
-        (error 'stream-iterate "non-procedural argument")
-        (stream-iterate base)))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (stream-length strm)
-    (if (not (stream? strm))
-        (error 'stream-length "non-stream argument")
-        (let loop ((len 0) (strm strm))
-          (if (stream-null? strm)
-              len
-              (loop (+ len 1) (stream-cdr strm))))))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-syntax stream-let
-    (syntax-rules ()
-      ((stream-let tag ((name val) ...) body1 body2 ...)
-       ((letrec ((tag (stream-lambda (name ...) body1 body2 ...))) tag) val ...))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-map proc . strms)
-    (define stream-map
-      (stream-lambda (strms)
-        (if (exists stream-null? strms)
-            stream-null
-            (stream-cons (apply proc (map stream-car strms))
-                         (stream-map (map stream-cdr strms))))))
-    (cond ((not (procedure? proc)) (error 'stream-map "non-procedural argument"))
-          ((null? strms) (error 'stream-map "no stream arguments"))
-          ((exists (lambda (x) (not (stream? x))) strms)
-            (error 'stream-map "non-stream argument"))
-          (else (stream-map strms))))</pre></font></font></font></p>
-<font face="serif"><font face="serif">  
-</font></font><p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define-syntax stream-match
-    (syntax-rules ()
-      ((stream-match strm-expr clause ...)
-        (let ((strm strm-expr))
-          (cond
-            ((not (stream? strm)) (error 'stream-match "non-stream argument"))
-            ((stream-match-test strm clause) =&gt; car) ...
-            (else (error 'stream-match "pattern failure")))))))</font></font></font></pre><p></p>
-<font face="serif"><font face="serif"> 
-</font></font><p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-syntax stream-match-test
-    (syntax-rules ()
-      ((stream-match-test strm (pattern fender expr))
-        (stream-match-pattern strm pattern () (and fender (list expr))))
-      ((stream-match-test strm (pattern expr))
-        (stream-match-pattern strm pattern () (list expr)))))</pre></font></font></font></p>
-<font face="serif"><font face="serif"> 
-</font></font><p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define-syntax stream-match-pattern 
-    (lambda (x)
-      (define (wildcard? x)
-        (and (identifier? x)
-             (free-identifier=? x (syntax _))))
-      (syntax-case x () 
-        ((stream-match-pattern strm () (binding ...) body)
-          (syntax (and (stream-null? strm) (let (binding ...) body))))
-        ((stream-match-pattern strm (w? . rest) (binding ...) body)
-          (wildcard? #'w?) 
-          (syntax (and (stream-pair? strm)
-                       (let ((strm (stream-cdr strm)))
-                         (stream-match-pattern strm rest (binding ...) body)))))
-        ((stream-match-pattern strm (var . rest) (binding ...) body)
-          (syntax (and (stream-pair? strm)
-                       (let ((temp (stream-car strm)) (strm (stream-cdr strm))) 
-                         (stream-match-pattern strm rest ((var temp) binding ...) body)))))
-        ((stream-match-pattern strm w? (binding ...) body)
-          (wildcard? #'w?)
-          (syntax (let (binding ...) body)))
-        ((stream-match-pattern strm var (binding ...) body) 
-          (syntax (let ((var strm) binding ...) body))))))</font></font></font></pre><p></p>
-<font face="serif"><font face="serif">  
-</font></font><p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-syntax stream-of
-    (syntax-rules ()
-      ((_ expr rest ...)
-        (stream-of-aux expr stream-null rest ...))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define-syntax stream-of-aux
-    (syntax-rules (in is)
-      ((stream-of-aux expr base)
-        (stream-cons expr base))
-      ((stream-of-aux expr base (var in stream) rest ...)
-        (stream-let loop ((strm stream))
-          (if (stream-null? strm)
-              base
-              (let ((var (stream-car strm)))
-                (stream-of-aux expr (loop (stream-cdr strm)) rest ...)))))
-      ((stream-of-aux expr base (var is exp) rest ...)
-        (let ((var exp)) (stream-of-aux expr base rest ...)))
-      ((stream-of-aux expr base pred? rest ...)
-        (if pred? (stream-of-aux expr base rest ...) base))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (stream-range first past . step)
-    (define stream-range
-      (stream-lambda (first past delta lt?)
-        (if (lt? first past)
-            (stream-cons first (stream-range (+ first delta) past delta lt?))
-            stream-null)))
-    (cond ((not (number? first)) (error 'stream-range "non-numeric starting number"))
-          ((not (number? past)) (error 'stream-range "non-numeric ending number"))
-          (else (let ((delta (cond ((pair? step) (car step)) ((&lt; first past) 1) (else -1))))
-                  (if (not (number? delta))
-                      (error 'stream-range "non-numeric step size")
-                      (let ((lt? (if (&lt; 0 delta) &lt; &gt;)))
-                        (stream-range first past delta lt?)))))))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-ref strm n)
-    (cond ((not (stream? strm)) (error 'stream-ref "non-stream argument"))
-          ((not (integer? n)) (error 'stream-ref "non-integer argument"))
-          ((negative? n) (error 'stream-ref "negative argument"))
-          (else (let loop ((strm strm) (n n))
-                  (cond ((stream-null? strm) (error 'stream-ref "beyond end of stream"))
-                        ((zero? n) (stream-car strm))
-                        (else (loop (stream-cdr strm) (- n 1))))))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (stream-reverse strm)
-    (define stream-reverse
-      (stream-lambda (strm rev)
-        (if (stream-null? strm)
-            rev
-            (stream-reverse (stream-cdr strm) (stream-cons (stream-car strm) rev)))))
-    (if (not (stream? strm))
-        (error 'stream-reverse "non-stream argument")
-        (stream-reverse strm stream-null)))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-scan proc base strm)
-    (define stream-scan
-      (stream-lambda (base strm)
-        (if (stream-null? strm)
-            (stream base)
-            (stream-cons base (stream-scan (proc base (stream-car strm)) (stream-cdr strm))))))
-    (cond ((not (procedure? proc)) (error 'stream-scan "non-procedural argument"))
-          ((not (stream? strm)) (error 'stream-scan "non-stream argument"))
-          (else (stream-scan base strm))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-take n strm)
-    (define stream-take
-      (stream-lambda (n strm)
-        (if (or (stream-null? strm) (zero? n))
-            stream-null
-            (stream-cons (stream-car strm) (stream-take (- n 1) (stream-cdr strm))))))
-    (cond ((not (stream? strm)) (error 'stream-take "non-stream argument"))
-          ((not (integer? n)) (error 'stream-take "non-integer argument"))
-          ((negative? n) (error 'stream-take "negative argument"))
-          (else (stream-take n strm))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-take-while pred? strm)
-    (define stream-take-while
-      (stream-lambda (strm)
-        (cond ((stream-null? strm) stream-null)
-              ((pred? (stream-car strm))
-                (stream-cons (stream-car strm) (stream-take-while (stream-cdr strm))))
-              (else stream-null))))
-    (cond ((not (stream? strm)) (error 'stream-take-while "non-stream argument"))
-          ((not (procedure? pred?)) (error 'stream-take-while "non-procedural argument"))
-          (else (stream-take-while strm))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (define (stream-unfold mapper pred? generator base)
-    (define stream-unfold
-      (stream-lambda (base)
-        (if (pred? base)
-            (stream-cons (mapper base) (stream-unfold (generator base)))
-            stream-null)))
-    (cond ((not (procedure? mapper)) (error 'stream-unfold "non-procedural mapper"))
-          ((not (procedure? pred?)) (error 'stream-unfold "non-procedural pred?"))
-          ((not (procedure? generator)) (error 'stream-unfold "non-procedural generator"))
-          (else (stream-unfold base))))</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (stream-unfolds gen seed)
-    (define (len-values gen seed)
-      (call-with-values
-        (lambda () (gen seed))
-        (lambda vs (- (length vs) 1))))
-    (define unfold-result-stream
-      (stream-lambda (gen seed)
-        (call-with-values
-          (lambda () (gen seed))
-          (lambda (next . results)
-            (stream-cons results (unfold-result-stream gen next))))))
-    (define result-stream-&gt;output-stream
-      (stream-lambda (result-stream i)
-        (let ((result (list-ref (stream-car result-stream) (- i 1))))
-          (cond ((pair? result)
-                  (stream-cons
-                    (car result)
-                    (result-stream-&gt;output-stream (stream-cdr result-stream) i)))
-                ((not result)
-                  (result-stream-&gt;output-stream (stream-cdr result-stream) i))
-                ((null? result) stream-null)
-                (else (error 'stream-unfolds "can't happen"))))))
-    (define (result-stream-&gt;output-streams result-stream)
-      (let loop ((i (len-values gen seed)) (outputs '()))
-        (if (zero? i)
-            (apply values outputs)
-            (loop (- i 1) (cons (result-stream-&gt;output-stream result-stream i) outputs)))))
-    (if (not (procedure? gen))
-        (error 'stream-unfolds "non-procedural argument")
-        (result-stream-&gt;output-streams (unfold-result-stream gen seed))))</font></font></font></pre><p></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"></font></font></font></p><pre><font face="serif"><font face="serif"><font face="monospace">  (define (stream-zip . strms)
-    (define stream-zip
-      (stream-lambda (strms)
-        (if (exists stream-null? strms)
-            stream-null
-            (stream-cons (map stream-car strms) (stream-zip (map stream-cdr strms))))))
-    (cond ((null? strms) (error 'stream-zip "no stream arguments"))
-          ((exists (lambda (x) (not (stream? x))) strms)
-            (error 'stream-zip "non-stream argument"))
-          (else (stream-zip strms)))))</font></font></font></pre><p></p>
-
-<h2><font face="serif"><font face="serif">Implementation of <font face="monospace">(streams)</font></font></font></h2>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace">(library (streams)</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (export stream-null stream-cons stream? stream-null? stream-pair? stream-car
-          stream-cdr stream-lambda define-stream list-&gt;stream port-&gt;stream stream
-          stream-&gt;list stream-append stream-concat stream-constant stream-drop
-          stream-drop-while stream-filter stream-fold stream-for-each stream-from
-          stream-iterate stream-length stream-let stream-map stream-match _
-          stream-of stream-range stream-ref stream-reverse stream-scan stream-take
-          stream-take-while stream-unfold stream-unfolds stream-zip)</pre></font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="monospace"><pre>  (import (streams primitive) (streams derived)))</pre></font></font></font></p>
-
-<h1><font face="serif"><font face="serif">Acknowledgements</font></font></h1>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Jos Koot sharpened 
-my thinking during many e-mail discussions, suggested several discussion 
-points in the text, and contributed the final version of </font><font face="monospace">stream-match</font><font face="serif">.  
-Michael Sperber and Abdulaziz Ghuloum gave advice on R6RS.</font></font></font></p>
-
-<h1><font face="serif"><font face="serif">References</font></font></h1>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Harold Abelson 
-and Gerald Jay Sussman with Julie Sussman.  <i>Structure and Interpretation 
-of Computer Programs</i>.  MIT Press, Cambridge, Massachusetts.  
-Second edition, 1996.  </font><font face="monospace"><a href="http://mitpress.mit.edu/sicp" target="_blank">mitpress.mit.edu/sicp</a></font><font face="serif">.  The classic text on computer 
-science.  Section 3.5 includes extensive discussion of odd streams.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Anne L. Bewig.  
-&#8220;Golden Ratio&#8221; (personal communication).  Homework for the 
-high school course <i>Calculus</i>.  Teaching my daughter how to 
-calculate the 200<sup>th</sup> element of a continued fraction was a 
-moment of sheer joy in the development of the stream libraries.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Philip L. Bewig.  <i>
-Scheme Request for Implementation 40: 
-A Library of Streams</i>.  August, 2004.  </font><font face="monospace"><a href="http://srfi.schemers.org/srfi-40" target="_blank">srfi.schemers.org/srfi-40</a></font><font face="serif">.  Describes an implementation 
-of the </font><font face="monospace">stream</font><font face="serif"> 
-data type. </font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Richard Bird 
-and Philip Wadler.  <i>Introduction to Functional Programming</i>.  
-Prentice Hall, 1988.  The classic text on functional programming.  
-Even streams are discussed in the context of purely functional programming.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">William H. 
-Burge.  <i>Recursive Programming Techniques</i>.  Addison-Wesley, 
-1975.  An early text on functional programming, and still one of 
-the best, though the terminology is dated.  Discusses even streams 
-in Section 3.10.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Jeremy Gibbons, 
-David Lester and Richard Bird, &#8220;Functional Pearl: Enumerating the 
-Rationals,&#8221; under consideration for publication in <i>Journal of Functional 
-Programming</i>.  </font><font face="monospace"><a href="http://web.comlab.ox.ac.uk/oucl/work/jeremy.gibbons/publications/rationals.pdf" target="_blank">http://web.comlab.ox.ac.uk<wbr>/oucl/work/jeremy.gibbons<wbr>/publications/rationals.pdf</a></font><font face="serif">.  Discusses a series of expressions 
-that enumerate the rational numbers without duplicates.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Carl Hewitt. 
-&#8220;Viewing control structures as patterns of passing messages,&#8221; in <i>
-Journal of Artificial Intelligence</i>, Volume 8, Number 3 (June, 1977), 
-pp 323-364.  Also published as Artificial Intelligence Memo 410 
-by the Massachusetts Institute of Technology, </font><font face="monospace"><a href="ftp://publications.ai.mit.edu/ai-publications/pdf/AIM-410.pdf" target="_blank">ftp://publications.ai.mit.edu<wbr>/ai-publications/pdf/AIM-410<wbr>.pdf</a></font><font face="serif">.  Describes the Actor message-passing 
-system; one of the examples used is the </font><font face="monospace">same-fringe?</font><font face="serif"> problem.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Peter J. Landin.  
-&#8220;A correspondence between ALGOL 60 and Church&#8217;s lambda-notation: 
-Part I,&#8221;  <i>Communications of the ACM</i>, Volume 8, Number 
-2, February 1965., pages 89&#8211;101.  The seminal description of 
-streams.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Joe Marshall.  
-&#8220;Stream problem redux&#8221;, from <i>Usenet 
-comp.lang.scheme</i>, June 28, 2002.  </font><font face="monospace"><a href="http://groups.google.com/group/comp.lang.scheme/msg/db4b4a1f33e3eea8" target="_blank">groups.google.com/group/comp<wbr>.lang.scheme/msg/db4b4a1f33e3ee<wbr>a8</a></font><font face="serif">.  The original post on </font><font face="monospace">comp.lang.scheme</font><font face="serif"> 
-that describes the </font><font face="monospace">times3</font><font face="serif"> problem.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Chris Okasaki.  <i>
-Purely Functional Data Structures</i>.  Cambridge University Press, 
-2003.  Revised version of Okasaki&#8217;s thesis <i>Purely Functional 
-Data Structures</i>, Carnegie-Mellon University, 1996, </font><font face="monospace"><a href="http://www.cs.cmu.edu/%7Erwh/theses/okasaki.pdf" target="_blank">www.cs.cmu.edu/~rwh/theses<wbr>/okasaki.pdf</a></font><font face="serif">.  Provides a strong defense of 
-laziness, and describes several data structures that exploit laziness, 
-including streams and queues.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Stephen K. 
-Park and Keith W. Miller.  &#8220;Random number generators: good ones 
-are hard to find,&#8221; <i>Communications of the ACM</i>, Volume 31, Issue 
-10 (October 1988), pages 1192&#8211;1201.  Describes a minimal standard 
-random number generator. </font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Simon Peyton-Jones, 
-et al, editors.  <i>Haskell 98: Haskell 98 Language and Libraries: 
-The Revised Report</i>.  December 2002.  </font><font face="monospace"><a href="http://www.haskell.org/onlinereport" target="_blank">www.haskell.org/onlinereport</a></font><font face="serif">.  Haskell is the prototypical 
-purely functional language, and includes even streams, which it calls 
-lists, as its fundamental structured data type.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Chris Reade.  <i>
-Elements of Functional Programming</i>.  Addison-Wesley, April 
-1989.  A textbook on functional programming.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Antoine de 
-Saint-Exupéry. Chapter III &#8220;L&#8217;Avion&#8221; of <i>Terre des Hommes</i>.  
-1939.  &#8220;Perfection is achieved, not when there is nothing more 
-to add, but when there is nothing left to take away.&#8221;</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Dorai Sitaram.  <i>
-Teach Yourself Scheme in Fixnum Days</i>.  </font><font face="monospace"><a href="http://www.ccs.neu.edu/home/dorai/t-y-scheme/t-y-scheme.html" target="_blank">www.ccs.neu.edu/home/dorai/t-y<wbr>-scheme/t-y-scheme.html</a></font><font face="serif">.  A useful introduction to Scheme; 
-includes generator and co-routine solutions to the </font><font face="monospace">same-fringe?</font><font face="serif"> problem.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Michael Sperber, 
-R. Kent Dybvig, Matthew Flatt, and Anton von Straaten, editors.  <i>
-
-Revised</i><sup><i>6</i></sup><i> Report on the Algorithmic Language 
-Scheme</i>.  September 26, 2007. </font><font face="monospace"><a href="http://www.r6rs.org/" target="_blank">www.r6rs.org</a></font><font face="serif">.  The standard definition of 
-the Scheme programming language.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">André van 
-Tonder.  <i>Scheme Request for Implementation 45: 
-Primitives for Expressing Iterative Lazy Algorithms</i>.  </font><font face="monospace"><a href="http://srfi.schemers.org/srfi-45" target="_blank">srfi.schemers.org/srfi-45</a></font><font face="serif">.  
-April, 2004.  Describes the problems inherent in the </font><font face="monospace">promise</font><font face="serif"> 
-data type of R5RS (also present in R6RS), and provides the alternate </font><font face="monospace">promise</font><font face="serif"> 
-data type used in the stream primitives.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Philip Wadler.  
-&#8220;How to replace failure by a list of successes,&#8221; in <i>Proceedings 
-of the conference on functional programming languages and computer architecture</i>, 
-Nancy, France, 1985, pages 113&#8211;128.  Describes the &#8220;list of 
-successes&#8221; technique for implementing backtracking algorithms using 
-streams.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">Philip Wadler, 
-Walid Taha, and David MacQueen, &#8220;How to add laziness to a strict language 
-without even being odd.&#8221;  1998 ACM SIGPLAN Workshop on ML, pp. 24ff.  </font><font face="monospace"><a href="http://homepages.inf.ed.ac.uk/wadler/papers/lazyinstrict/lazyinstrict.ps" target="_blank">homepages.inf.ed.ac.uk/wadler<wbr>/papers/lazyinstrict/lazyinstri<wbr>ct.ps</a></font><font face="serif">.  Describes odd and even styles 
-of lazy evaluation, and shows how to add lazy evaluation to the strict 
-functional language SML. </font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">All cited web 
-pages visited during September 2007.</font></font></font></p>
-
-<h1><font face="serif"><font face="serif">Copyright</font></font></h1>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif">
-Copyright (C) Philip L. Bewig (2007). All Rights Reserved.</font></font></font></p>
-
-<p align="justify">
-<font face="serif"><font face="serif"><font face="serif">Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:</font></font></font></p>
-
-<p align="justify">
-<font face="serif"><font face="serif"><font face="serif">The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.</font></font></font></p>
-
-<p align="justify">
-<font face="serif"><font face="serif"><font face="serif">THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.</font></font></font></p>
-
-<p align="justify"><font face="serif"><font face="serif"><font face="serif"><font face="serif">Several files related to this document are
-available from</font>
-<font face="monospace">srfi.schemers.org/srfi-41</font><font face="serif">:
-A version of this document suitable for printing is available at</font>
-<font face="monospace"><a href="http://srfi.schemers.org/srfi-41/streams.pdf">streams.pdf</a></font><font face="serif">.
-The complete source corresponding to the three Appendices is available in files</font>
-<font face="monospace"><a href="http://srfi.schemers.org/srfi-41/streams.ss">streams.ss</a></font><font face="serif">,
-</font><font face="monospace"><a href="http://srfi.schemers.org/srfi-41/primitive.ss">primitive.ss</a></font><font face="serif">, and
-</font><font face="monospace"><a href="http://srfi.schemers.org/srfi-41/derived.ss">derived.ss</a></font><font face="serif">.
-Samples from the text are available at
-</font><font face="monospace"><a href="http://srfi.schemers.org/srfi-41/samples.ss">samples.ss</a></font><font face="serif">,
-and a test suite is available at</font>
-<font face="monospace"><a href="http://srfi.schemers.org/srfi-41/r6rs-test.ss">r6rs-test.ss</a></font><font face="serif">.
-Source code and tests for R5RS are available at</font>
-<font face="monospace"><a href="http://srfi.schemers.org/srfi-41/r5rs.ss">r5rs.ss</a></font><font face="serif">,
-and</font> <font face="monospace"><a href="http://srfi.schemers.org/srfi-41/r5rs-test.ss">r5rs-test.ss</a></font><font face="serif">.</font></font></font></font></p>
-
-<hr>
-<address><font face="serif"><font face="serif"><font face="serif">Editor: <a href="mailto:srfi-editors%20at%20srfi%20dot%20schemers%20dot%20org">Michael Sperber</a></font></font></font></address>
-
-</body></html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-41/streams1.jpg b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-41/streams1.jpg
deleted file mode 100644
index 173959a0ee..0000000000
Binary files a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-41/streams1.jpg and /dev/null differ
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-41/streams2.jpg b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-41/streams2.jpg
deleted file mode 100644
index 14ab2a48f3..0000000000
Binary files a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-41/streams2.jpg and /dev/null differ
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-42.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-42.html
deleted file mode 100644
index a3cb664590..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-42.html
+++ /dev/null
@@ -1,2132 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-  <head>
-    <title>SRFI 42: Eager Comprehensions</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 42: Eager Comprehensions
-
-<H1>Author</H1>
-
-Sebastian Egner
-
-<H1>Status</H1>
-
-<P>This SRFI is currently in ``final'' status. To see an explanation of
-each status that a SRFI can hold, see <a
-href="http://srfi.schemers.org/srfi-process.html">here</a>.
-To comments
-this SRFI, please mail to 
-<a href="mailto:srfi-42@srfi.schemers.org">
-<code>srfi-42@srfi.schemers.org</code></a>.
-See <a href="http://srfi.schemers.org/srfi-list-subscribe.html">
-instructions here</a> to subscribe to the list.  You can access
-the discussion via
-<a href="http://srfi.schemers.org/srfi-42/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-You can access
-post-finalization messages via
-<a href="http://srfi.schemers.org/srfi-42/post-mail-archive/maillist.html">
-the archive of the mailing list</a>.
-</P>
-    <UL> 
-      <LI>Received: 2003/02/20 
-      <LI>Draft: 2003/02/20-2003/04/20
-      <LI>Revised: 2003/07/07
-      <LI>Final: 2003/07/07
-    </UL>
-
-<H1>Abstract</H1>
-
-This SRFI defines a modular and portable mechanism for 
-eager comprehensions extending the algorithmic language Scheme
-<a href="#R5RS">[R5RS]</a>.
-An eager comprehension is a convenient notation
-for one or more nested or parallel loops generating
-a sequence of values, and accumulating this sequence into a result.
-In its most simple form, a comprehension according to this SRFI
-looks like this:
-
-<a name="example1"></a><blockquote><pre><code>(<a href="#list-ec">list-ec</a> (<a href="#:">:</a> i 5) (* i i)) => (0 1 4 9 16)</code>.</pre></blockquote>
-
-Here, <code>i</code> is a local variable that is sequentially 
-bound to the values 0, 1, ..., 4,  and the squares of these 
-numbers are collected in a list.
-The following example illustrates most conventions of this SRFI
-with respect to nesting and syntax:
-
-<a name="example1"></a><blockquote><pre><code>(<a href="#list-ec">list-ec</a> (<a href="#:">:</a> n 1 4) (<a href="#:">:</a> i n) (list n i)) => ((1 0) (2 0) (2 1) (3 0) (3 1) (3 2))</code>.</pre></blockquote>
-
-In the example, the variable <code>n</code> is first bound to 1
-then to 2 and finally to 3, and for each binding of <code>n</code> 
-the variable <code>i</code> is bound to the values 
-0, 1, ..., <code>n</code>-1 in turn.
-The expression <code>(list n i)</code> constructs a two-element list for
-each bindings, and the comprehension <code>list-ec</code> collects
-all these results in a list.<P>
-
-The mechanism defined in this SRFI has the following properties:
-
-<UL>
-
-<LI>
-The set of comprehensions defined for this SRFI is inspired by 
-those procedures and macros of <a href="#R5RS">[R5RS, 6.]</a>
-leading to natural comprehensions such as
-<a href="#list-ec"><code>list-ec</code></a>,
-<a href="#append-ec"><code>append-ec</code></a>,
-<a href="#sum-ec"><code>sum-ec</code></a>,
-<a href="#min-ec"><code>min-ec</code></a>,
-<a href="#every?-ec"><code>every?-ec</code></a>,
-<a href="#do-ec"><code>do-ec</code></a>, and others.
-Some other natural comprehensions (e.g. <code>gcd-ec</code>) have 
-not been included into this SRFI due to their low significance 
-for most applications.
-On the other hand, a few comprehensions 
-(<a href="#fold-ec"><code>fold-ec</code></a>,
-<a href="#fold3-ec"><code>fold3-ec</code></a>)
-not inspired by <a href="#R5RS">[R5RS]</a> have been 
-included due to their broad applicability.
-</LI>
-
-<LI>
-There are typed generators 
-(<a href="#:list"><code>:list</code></a>, <a href="#:list"><code>:string</code></a>, ...)
-expecting certain types of objects for their arguments.
-These generators usually produce code as efficient as
-hand coded <code>do</code>-loops.
-</LI>
-
-<LI>
-There is also the special generator <a href="#:"><code>:</code></a> 
-(read 'run through') 
-dispatching on the value of its argument list at runtime.
-In the examples above, one or two integers were used to define a range.
-The convenience of omitting the type comes at a certain
-performance penalty, both per iteration and during startup of the loop.
-</LI>
-
-<LI>
-Generators can be nested depth-first (as in the example above), 
-run in parallel (with an optional <a href="#vars">index variable</a> 
-or more generally with <a href="#:parallel"><code>:parallel</code></a>),
-and can be stopped early before (<a href="#:while"><code>:while</code></a>)
-or after (<a href="#:until"><code>:until</code></a>)
-producing the current value.
-</LI>
-
-<LI>
-The sequence of values can be filtered 
-(<a href="#if"><code>if</code></a>, <a href="#not"><code>not</code></a>,
-<a href="#and"><code>and</code></a>, <a href="#or"><code>or</code></a>),
-intermediate commands can be evaluated between
-generators (<a href="#begin"><code>begin</code></a>), and
-intermediate variables can be introduced (<a href="#:let"><code>:let</code></a>).
-</LI>
-<LI>
-The mechanism is fully modular.
-This means that no existing macro or procedure needs 
-to be modified when adding
-<a href="#foo-ec">application-specific comprehensions</a>,
-<a href="#:foo">application-specific typed generators</a>,
-or <a href="#:dfoo">application-specific dispatching generators</a>.
-</LI>
-
-<LI>
-Syntactically, this SRFI uses the 
-[<I>outer</I> .. <I>inner</I> | <I>expr</I>] convention,
-meaning that the most right generator (<I>inner</I>) spins fastest
-and is followed by the result expression over which the
-comprehension ranges (<I>expr</I>).
-Refer to the <a href="#convention">Section "Design Rationale"</a>.
-Moreover, the syntax is strictly prefix and the naming
-convention <code>my-comprehension-ec</code>, 
-<code>:my-generator</code> is used systematically.
-</LI>
-
-</UL>
-
-<P>
-
-The remainder of this document is organized as follows.
-In section <a href="#rationale">Rationale</a> a brief
-introduction is given what the motivation is for this SRFI.
-The following section <a href="#specification">Specification</a>
-defines the mechanism.
-Section <a href="#ext-examples">Suggestions for
-Application-specific Extensions</a> presents some ideas
-how extensions using this SRFI could look like.
-The section <a href="#design">Design Rationale</a> contains
-some considerations that went into the design of the
-mechanism as defined in the specification.
-The following section <a href="#related-work">Related Work
-and Acknowledgements</a> briefly reviews other proposals
-related to Scheme and comprehensions or loops.
-Finally, the section <a href="#refimpl">Reference
-Implementation</a> gives source code for a reference
-implementation together with a collection of runnable
-examples and a few examples on extensions.
-
-
-<H1><a name="rationale"></a>Rationale</H1>
-
-The purpose of this SRFI is to provide a compact notation
-for many common cases of loops, in particular those 
-constructing values for further computation.
-The origin of this SRFI is my frustration that
-there is no simple for the list of integers
-from 0 to <I>n</I>-1.
-With this SRFI it is <code>(list-ec (: i n) i)</code>.
-Refer to the collection of examples for the 
-<a href="#refimpl">reference implementation</a>
-what it can be used for, and what it should not be used for.
-To give a practically useful example, 
-the following procedure computes the sorted
-list of all prime numbers below a certain bound
-(you may want to run it yourself to get an idea of
-its efficiency):
-
-<blockquote><pre><code>
-(define (eratosthenes n)          ; primes in {2..n-1} for n >= 1
-  (let ((p? (make-string n #\1)))
-    (do-ec (:range k 2 n)
-           (if (char=? (string-ref p? k) #\1))
-           (:range i (* 2 k) n k)
-           (string-set! p? i #\0) )
-    (list-ec (:range k 2 n) (if (char=? (string-ref p? k) #\1)) k) ))</code></pre></blockquote>
-
-
-Apart from <I>make simple things simple</I>, 
-there is no other paradigm involved for this SRFI.
-In particular, it is not the ambition to implement the
-powerful <I>lazy</I> list comprehensions of other functional
-programming languages in Scheme.
-If you are looking for that you may want to refer to
-<a href="#SRFI40">[SRFI 40]</a>.
-(The usual definition of the stream of all primes does
-in fact also use Eratosthenes' sieve method. 
-It is instructive to compare.)<P>
-
-The main focus of the design of this SRFI is portability under 
-<a href="#R5RS">[R5RS]</a> and modularity for extension.
-Portability is achieved by limiting the features included.
-Modularity for generators is achieved by a special
-implementation technique using <I>Continuation
-Passing Style</I> for macros (which I learned from
-Richard Kelsey's implementation of "Macros for writing loops",
-<a href="#MWL">[MWL]</a>) and by limiting the
-expressive power of generators.
-Modularity for comprehensions requires no additional effort.
-As modularity was a major design goal, I hope many people will
-find it easy to define their own comprehensions and generators.
-As a starting point for doing so, I have included several
-<a href="#ext-examples">suggestions</a> for extensions.<P>
-
-For a detailed motivation of the design decisions,
-please refer to the <a href="#design">Section "Design Rationale"</a>.<P>
-
-<H1><a name="specification"></a>Specification</H1>
-
-A comprehensions is a hygienic referentially transparent macro 
-in the sense of <a href="#R5RS">[R5RS, 4.3.]</a>.
-The macros extend the <code>&lt;expression&gt;</code>-syntax 
-defined in <a href="#R5RS">[R5RS, 7.1.3.]</a>.
-The main syntactic pattern used for defining a comprehension is 
-<code>&lt;qualifier&gt;</code>, representing a generator or a filter.
-It is defined in <a href="#qualifiers">Section "Qualifiers"</a>.<P>
-
-The most important instances of <code>&lt;qualifier&gt;</code> are generators.
-These are defined in <a href="#generators">Section "Generators"</a>.
-Generators come in three flavors,
-as <I>typed generators</I> 
-(<a href="#:list"><code>:list</code></a>, 
-<a href="#:range"><code>:range</code></a> etc.),
-as <I>the dispatching generator</I> <a href="#:"><code>:</code></a> 
-(pronounced as 'run through'),
-and as combined and modified generators 
-(<a href="#:parallel"><code>:parallel</code></a>, 
-<a href="#:while"><code>:while</code></a>, 
-<a href="#:until"><code>:until</code></a>).
-Most generators in this SRFI also support an optional 
-<a href="#vars">index variable</a> counting the
-values being generated.<P>
-
-Finally, it is explained how to add a new 
-<a href="#foo-ec">application-specific comprehension</a>,
-how to add a new <a href="#:foo">application-specific typed generator</a>,
-and how to add a new
-<a href="#:dfoo">application-specific dispatching generator</a>.
-As this concerns code unknown at the time this is being written,
-the explanation should not be taken as
-a <I>specification</I> in the literal sense. 
-It rather suggests a convention to follow in order to
-ensure new comprehensions and generators blend seamlessly with
-the ones defined in this SRFI.<P>
-
-
-<H2><a name="comprehensions"></a>Comprehensions</H2>
-
-<DL>
-<DT><a name="do-ec"></a>
-<code>(do-ec &lt;qualifier&gt;</code>*<code> &lt;command&gt;)</code>
-</DT>
-
-<DD>
-Evaluates the <code>&lt;command&gt;</code> exactly once 
-for each binding in the sequence defined by the qualifiers.
-If there are no qualifiers <code>&lt;command&gt;</code>
-is evaluated exactly once.
-The expression is evaluated for its side-effects only.
-The result of the comprehension is unspecified.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="list-ec"></a>
-<code>(list-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-The list of values obtained by evaluating
-<code>&lt;expression&gt;</code> once for each binding in the sequence 
-defined by the qualifiers.
-If there are no qualifiers the result is the list with
-the value of <code>&lt;expression&gt;</code>. 
-</DD>
-</DL>
-
-<DL>
-<DT><a name="append-ec"></a>
-<code>(append-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-The list obtained by appending all values of <code>&lt;expression&gt;</code>,
-which must all be lists.<BR>
-Think of it as
-<code>(apply append (list-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;))</code>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="string-ec"></a>
-<code>(string-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-The string of all values of <code>&lt;expression&gt;</code>.<BR>
-Think of it as
-<code>(list->string (list-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;))</code>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="string-append-ec"></a>
-<code>(string-append-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-The string obtained by appending all values of <code>&lt;expression&gt;</code>,
-which must all be strings.<BR>
-Think of it as
-<code>(apply string-append (list-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;))</code>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="vector-ec"></a>
-<code>(vector-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-The vector of all values of <code>&lt;expression&gt;</code>.<BR>
-Think of it as
-<code>(list->vector (list-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;))</code>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="vector-of-length-ec"></a>
-<code>(vector-of-length-ec &lt;k&gt; &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-The vector of all values of <code>&lt;expression&gt;</code>,
-of which there must be exactly <code>&lt;k&gt;</code>.
-This comprehension behaves like <code>vector-ec</code>
-but can be implemented more efficiently.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="sum-ec"></a>
-<code>(sum-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-The sum of all values of <code>&lt;expression&gt;</code>.<BR>
-Think of it as
-<code>(apply + (list-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;))</code>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="product-ec"></a>
-<code>(product-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-The product of all values of <code>&lt;expression&gt;</code>.<BR>
-Think of it as
-<code>(apply * (list-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;))</code>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="min-ec"></a><a name="max-ec"></>
-<code>(min-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)</code><BR>
-<code>(max-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-The minimum and maximum of all values of <code>&lt;expression&gt;</code>.
-The sequence of values must be non-empty.
-Think of these as<BR>
-<code>(apply min (list-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;))</code><BR>
-<code>(apply max (list-ec &lt;qualifier&gt;</code>*<code> &lt;expression&gt;))</code>.<P>
-
-If you want to return a default value in case the sequence is empty
-you may want to consider<BR>
-<code>(fold3-ec 'infinity &lt;qualifier&gt;</code>*<code> &lt;expression&gt; min min)</code>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="any?-ec"></a>
-<code>(any?-ec &lt;qualifier&gt;</code>*<code> &lt;test&gt;)</code>
-</DT>
-
-<DD>
-Tests whether any value of <code>&lt;test&gt;</code> in the sequence
-of bindings specified by the qualifiers is non-<code>#f</code>.
-If this is the case, <code>#t</code> is returned, otherwise <code>#f</code>.
-If there are no bindings in the sequence specified by the qualifiers
-at all then the result is <code>#f</code>.
-The enumeration of values stops after the first non-<code>#f</code>
-encountered.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="every?-ec"></a>
-<code>(every?-ec &lt;qualifier&gt;</code>*<code> &lt;test&gt;)</code>
-</DT>
-
-<DD>
-Tests whether all values of <code>&lt;test&gt;</code> are non-<code>#f</code>. 
-If this is the case, <code>#t</code> is returned, otherwise <code>#f</code>.
-If the sequence is empty the result is <code>#t</code>.
-Enumeration stops after the first <code>#f</code>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="first-ec"></a><a name="last-ec"></a><code>
-(first-ec &lt;default&gt; &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)<br>
-(last-ec &nbsp;&lt;default&gt; &lt;qualifier&gt;</code>*<code> &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-The first or last value of <code>&lt;expression&gt;</code> 
-in the sequence of bindings specified by the qualifiers.
-Before enumeration, the result is initialized
-with the value of <code>&lt;default&gt;</code>;
-so this will be the result if the sequence is empty.
-Enumeration is terminated in <code>first-ec</code> 
-when the first value has been computed.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="fold-ec"></a><a name="fold3-ec"></a><code>
-(fold-ec  &nbsp;&lt;x0&gt; &lt;qualifier&gt;</code>*<code> &lt;expression&gt;      &lt;f2&gt;)<br>
-(fold3-ec &lt;x0&gt; &lt;qualifier&gt;</code>*<code> &lt;expression&gt; &lt;f1&gt; &lt;f2&gt;)</code>
-</DT>
-
-<DD>
-Reduces the sequence <I>x</I>[0], <I>x</I>[1], ..., <I>x</I>[<I>n</I>-1]
-of values obtained by evaluating <code>&lt;expression&gt;</code> once
-for each binding as specified by <code>&lt;qualifier&gt;</code>*.
-The arguments <code>&lt;x0&gt;</code>, <code>&lt;f2&gt;</code>, 
-and <code>&lt;f1&gt;</code>, all syntactically equivalent to
-<code>&lt;expression&gt;</code>, specify the reduction process.<P>
-
-The reduction process for <code>fold-ec</code> is defined as follows.
-A reduction variable <code>x</code> is initialized to the value 
-of <code>&lt;x0&gt;</code>,
-and for each <I>k</I> in {0, ..., <I>n</I>-1} the command 
-<code>(set! x (&lt;f2&gt </code><I>x</I>[<I>k</I>]<code> x))</code>
-is evaluated. 
-Finally, <code>x</code> is returned as the value of the comprehension.<P>
-
-The reduction process for <code>fold3-ec</code> is different.
-If and only if <I>n</I> = 0, i.e. the sequence is empty, then 
-<code>&lt;x0&gt;</code> is evaluated and returned as the value 
-of the comprehension.
-Otherwise, a reduction variable <code>x</code> is initialized
-to the value of <code>(&lt;f1&gt </code><I>x</I>[0]<code>)</code>,
-and for each <I>k</I> in {1, ..., <I>n</I>-1} the command 
-<code>(set! x (&lt;f2&gt </code><I>x</I>[<I>k</I>]<code> x))</code>
-is evaluated. 
-Finally, <code>x</code> is returned as the value of the comprehension.<P>
-
-As the order of the arguments suggests,
-<code>&lt;x0&gt;</code> is evaluated outside the scope of the
-qualifiers, whereas the reduction expressions involving
-<code>&lt;f1&gt</code> and <code>&lt;f2&gt</code> are
-inside the scope of the qualifiers (so they may depend on
-any variable introduced by the qualifiers).
-Note that <code>&lt;f2&gt;</code> is evaluated repeatedly,
-with any side-effect or overhead this might have.<P>
-
-The main purpose of these comprehensions is 
-implementing other comprehensions as special cases.
-They are generalizations of the procedures
-<code>fold</code> and <code>reduce</code> in the sense of
-<a href="#SRFI1">[SRFI 1]</a>. 
-(Concerning naming and argument order, please refer to 
-the discussion archive of SRFI 1, in particular
-the posting <a href="#Folds">[Folds]</a>.)
-Note that <code>fold3-ec</code> is defined such that
-<code>&lt;x0&gt;</code> is only evaluated in case the 
-sequence is empty.
-This allows raising an error for the empty sequence, 
-as in the example definition of <code>min-ec</code> below.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="foo-ec"></a>
-<code>&lt;application-specific comprehension&gt;</code>
-</DT>
-
-<DD>
-An important aspect of this SRFI is a modular mechanism 
-to define application-specific comprehensions.
-To create a new comprehension a hygienic macro 
-of this name is defined.
-The macro transforms the new comprehension patterns
-into instances of <a href="#do-ec"><code>do-ec</code></a>, which is the most
-fundamental eager comprehension, or any other comprehension
-already defined.
-For example, the following code defines
-<a href="#list-ec"><code>list-ec</code></a> and
-<a href="#min-ec"><code>min-ec</code></a>
-in terms of <a href="#fold-ec"><code>fold-ec</code></a>
-and <a href="#fold3-ec"><code>fold3-ec</code></a>:
-
-<blockquote><pre><code>
-(define-syntax list-ec
-  (syntax-rules ()
-    ((list-ec etc1 etc ...)
-     (reverse (fold-ec '() etc1 etc ... cons)) )))
-
-(define-syntax min-ec
-  (syntax-rules ()
-    ((min-ec etc1 etc ...)
-     (fold3-ec (min) etc1 etc ... min min) )))</code></pre></blockquote>
-
-Note that the pattern <code>etc1 etc ...</code> matches
-the syntax <code>&lt;qualifier&gt;</code>*<code> &lt;expression&gt;</code>
-without separate access to <code>&lt;qualifier&gt;</code>*<code></code> 
-and <code>&lt;expression&gt;</code>.
-In order to define a comprehension that does need explicit
-access to the <code>&lt;expression&gt;</code>-part, 
-the following method is used.
-First, all qualifiers are collected into a 
-<a href="#nested"><code>nested</code></a>-qualifier, and then the
-'exactly one qualifier'-case is implemented.
-For illustration, the following code defines
-<a href="#fold3-ec"><code>fold3-ec</code></a> in terms of 
-<a href="#do-ec"><code>do-ec</code></a>:
-
-<a name="fold3-ec-example"></a>
-<blockquote><pre><code>
-(define-syntax fold3-ec
-  (syntax-rules (nested)
-    ((fold3-ec x0 (nested q1 ...) q etc1 etc2 etc3 etc ...)
-     (fold3-ec x0 (nested q1 ... q) etc1 etc2 etc3 etc ...) )
-    ((fold3-ec x0 q1 q2 etc1 etc2 etc3 etc ...)
-     (fold3-ec x0 (nested q1 q2) etc1 etc2 etc3 etc ...) )
-    ((fold3-ec x0 expression f1 f2)
-     (fold3-ec x0 (nested) expression f1 f2) )
-
-    ((fold3-ec x0 qualifier expression f1 f2)
-     (let ((result #f) (empty #t))
-       (do-ec qualifier
-              (let ((value expression)) ; don't duplicate code
-                (if empty
-                    (begin (set! result (f1 value))
-                           (set! empty #f) )
-                    (set! result (f2 value result)) )))
-       (if empty x0 result) ))))</code></pre></blockquote>
-
-Finally, observe that the newly defined <code>fold3-ec</code>
-comprehension inherits all types of qualifiers supported by
-<code>do-ec</code>, including all application-specific generators;
-no further definitions are necessary.
-</DD>
-</DL>
-
-
-<H2><a name="qualifiers"></a>Qualifiers</H2>
-
-This section defines the syntax <code>&lt;qualifier&gt;</code>.
-The nesting of qualifiers is from left (outer) to right (inner).
-In other words, the rightmost generator spins fastest.
-The nesting also defines the scope of the variables introduced
-by the generators. 
-This implies that inner generators may depend on the variables
-of outer generators.
-The sequence of enumeration of values is strictly <I>depth first</I>.
-These conventions are illustrated by the 
-first <a href="#example1">example</a>.<P>
-
-The syntax <code>&lt;qualifier&gt;</code> consists of the following alternatives:<P>
-
-
-<DL>
-<DT><a name="generator"></a>
-<code>&lt;generator&gt;</code>
-</DT>
-
-<DD>
-Enumerates a sequence of bindings of one or more variables.
-The scope of the variables starts at the generator and extends
-over all subsequent qualifiers and expressions in the comprehension.
-The <code>&lt;generator&gt;</code>-syntax is defined in 
-<a href="#generators">Section "Generators"</a>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="if"></a>
-<code>(if &lt;test&gt;)</code>
-</DT>
-
-<DD>
-Filters the sequence of bindings by testing if
-<code>&lt;test&gt;</code> evaluates to non-<code>#f</code>.
-Only for those bindings for which this is the case,
-the subsequent qualifiers of the comprehension are evaluated.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="not"></a><a name="and"></a><a name="or"></a><code>
-(not &lt;test&gt;)<br>
-(and &lt;test&gt;</code>*<code>)<br>
-(or  &nbsp;&lt;test&gt;</code>*<code>)</code>
-</DT>
-
-<DD>
-Abbreviated notations for filters of the form
-<code>(if (not &lt;test&gt;))</code>,
-<code>(if (and &lt;test&gt;</code>*<code>))</code>, and
-<code>(if (or &lt;test&gt;</code>*<code>))</code>.
-These represent frequent cases of filters.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="begin"></a>
-<code>(begin &lt;sequence&gt;)</code>
-</DT>
-
-<DD>
-Evaluate <code>&lt;sequence&gt;</code>, consisting of
-<code>&lt;command&gt;</code>*<code> &lt;expression&gt;</code>,
-once for each binding of the variables defined by the 
-previous qualifiers in the comprehension.
-Using this qualifier, side effects can be inserted
-into the body of a comprehension.
-</DD>
-</DL>
-
-<DL>
-<DT><a name="nested"></a>
-<code>(nested &lt;qualifier&gt;</code>*<code>)</code>
-</DT>
-
-<DD>
-A syntactic construct to group qualifiers.
-The meaning of a qualifier according to the 
-<code>nested</code>-syntax is the same as 
-inserting <code>&lt;qualifier&gt;</code>*
-into the enclosing comprehension.
-This construct can be used to reduce comprehensions with several
-qualifiers into a form with exactly one qualifier.
-</DD>
-</DL>
-
-
-<H2><a name="generators"></a>Generators</H2>
-
-This section defines the syntax <code>&lt;generator&gt;</code>.
-Each generator defines a sequence of bindings through 
-which one or more variables are run.
-The scope of the variables begins after the closing 
-parenthesis of the generator expression and extends
-to the end of the comprehension it is part of.<P>
-
-<a name="vars"></a>The variables defined by the generators 
-are specified using the syntax<P>
-
-<blockquote><pre>
-<code>&lt;vars&gt; --&gt; &lt;variable1&gt;</code> [ <code>(index &lt;variable2&gt;)</code> ],</pre></blockquote>
-
-where <code>&lt;variable1&gt;</code> runs through the values in
-the sequence defined by the generator, and the optional 
-<code>&lt;variable2&gt;</code> is an exact integer-valued 
-index variable counting the values (starting from 0).
-The names of the variables must be distinct.
-The following example illustrates the index variable:<P>
-
-<blockquote><pre><code>
-(list-ec (: x (index i) "abc") (list x i)) => ((#\a 0) (#\b 1) (#\c 2))</code></pre></blockquote>
-
-Unless defined otherwise, all generators make sure that the
-expressions provided for their syntactic arguments are
-evaluated exactly once, before enumeration begins.
-Moreover, it may be assumed that the generators do not
-copy the code provided for their arguments, because that
-could lead to exponential growth in code size.
-Finally, it is possible to assign a value to the variables 
-defined by a generator, but the effect of this assignment 
-is unspecified.<P>
-
-The syntax <code>&lt;generator&gt;</code> consists of the following alternatives:<P>
-
-<DL>
-<DT><a name=":"></a>
-<code>(: &lt;vars&gt; &lt;arg1&gt; &lt;arg&gt;</code>*<code>)</code>
-</DT>
-
-<DD>
-First the expressions <code>&lt;arg1&gt; &lt;arg&gt;</code>*
-are evaluated into <I>a</I>[1] <I>a</I>[2] ... <I>a</I>[<I>n</I>]
-and then a global dispatch procedure is used to dispatch on
-the number and types of the arguments and run the resulting
-generator.
-
-<a name=":-dispatch"></a>
-Initially (after loading the SRFI), 
-the following cases are recognized:<P>
-
-<TABLE>
-
-<TR>
-<TD><a href="#:list"><code>:list</code></a>
-<TD>if
-<TD>for all <I>i</I> in {1..<I>n</I>}:
-<code>(list? </code><I>a</I>[<I>i</I>]<code>)</code>.
-</TR>
-
-<TR>
-<TD><a href="#:string"><code>:string</code></a>
-<TD>if
-<TD>for all <I>i</I> in {1..<I>n</I>}:
-<code>(string? </code><I>a</I>[<I>i</I>]<code>)</code>.
-</TR>
-
-<TR>
-<TD><a href="#:vector"><code>:vector</code></a>
-<TD>if
-<TD>for all <I>i</I> in {1..<I>n</I>}:
-<code>(vector? </code><I>a</I>[<I>i</I>]<code>)</code>.
-</TR>
-
-<TR>
-<TD><a href="#:range"><code>:range</code></a>
-<TD>if
-<TD><I>n</I> in {1..3} and 
-for all <I>i</I> in {1..<I>n</I>}:
-<code>(integer? </code><I>a</I>[<I>i</I>]<code>)</code> and
-<code>(exact? </code><I>a</I>[<I>i</I>]<code>)</code>.
-</TR>
-
-<TR>
-<TD><a href="#:real-range"><code>:real-range</code></a>
-<TD>if
-<TD><I>n</I> in {1..3} and 
-for all <I>i</I> in {1..<I>n</I>}:
-<code>(real? </code><I>a</I>[<I>i</I>]<code>)</code>.
-</TR>
-
-<TR>
-<TD><a href="#:char-range"><code>:char-range</code></a>
-<TD>if
-<TD><I>n</I> = 2 and
-for all <I>i</I> in {1, 2}:
-<code>(char? </code><I>a</I>[<I>i</I>]<code>)</code>.
-</TR>
-
-<TR>
-<TD><a href="#:port"><code>:port</code></a>
-<TD>if
-<TD><I>n</I> in {1,2} and
-<code>(input-port? </code><I>a</I>[1]<code>)</code> and
-<code>(procedure? </code><I>a</I>[2]<code>)</code>.
-</TR>
-
-</TABLE><P>
-
-<a name="make-initial-:-dispatch"></a><a name=":-dispatch-ref"></a><a name=":-dispatch-set!"></a>
-The current dispatcher can be retrieved as 
-<code>(:-dispatch-ref)</code>, a new dispatcher <I>d</I> 
-can be installed by
-<code>(:-dispatch-set! </code><I>d</I><code>)</code>
-yielding an unspecified result,
-and a copy of the initial dispatcher can be obtained as
-<code>(make-initial-:-dispatch)</code>.
-Please refer to the section <a href="#:dfoo-global">below</a>
-for recommendation how to add cases to the dispatcher.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":list"></a><a name=":string"></a><a name=":vector"></a><code>
-(:list   &nbsp;&nbsp;&lt;vars&gt; &lt;arg1&gt; &lt;arg&gt;</code>*<code>)<br>
-(:string &lt;vars&gt; &lt;arg1&gt; &lt;arg&gt;</code>*<code>)<br>
-(:vector &lt;vars&gt; &lt;arg1&gt; &lt;arg&gt;</code>*<code>)</code>
-</DT>
-
-<DD>
-Run through one or more lists, strings, or vectors.
-First all expressions in <code>&lt;arg1&gt; &lt;arg&gt;</code>* 
-are evaluated and then all elements of the resulting values
-are enumerated from left to right.
-One can think of it as first appending all arguments and
-then enumerating the combined object.
-As a clarifying example, consider<BR>
-<code>(list-ec (:string c (index i) "a" "b") (cons c i))</code> =>
-<code>((#\a . 0) (#\b . 1))</code>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":integers"></a>
-<code>(:integers &lt;vars&gt;)</code>
-</DT>
-
-<DD>
-Runs through the sequence 0, 1, 2, ... of non-negative integers.
-This is most useful in combination with 
-<a href="#:parallel"><code>:parallel</code></a>,
-<a href="#:while"><code>:while</code></a>, and 
-<a href="#:until"><code>:until</code></a> or with
-a non-local exit in the body of the comprehension.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":range"></a><code>
-(:range &lt;vars&gt; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;stop&gt;)<br>
-(:range &lt;vars&gt; &lt;start&gt; &lt;stop&gt;)<br>
-(:range &lt;vars&gt; &lt;start&gt; &lt;stop&gt; &lt;step&gt;)</code>
-</DT>
-
-<DD>
-Runs through a range of exact rational numbers.<P>
-
-The form <code>(:range &lt;vars&gt; &lt;stop&gt;)</code>
-evaluates the expression <code>&lt;stop&gt;</code>,
-which must result in an exact integer <I>n</I>, 
-and runs through the finite sequence 0, 1, 2, ..., <I>n</I>-1.
-If <I>n</I> is zero or negative the sequence is empty.<P>
-
-The form <code>(:range &lt;vars&gt; &lt;start&gt; &lt;stop&gt;)</code>
-evaluates the expressions <code>&lt;start&gt;</code> and 
-<code>&lt;stop&gt;</code>,
-which must result in exact integers <I>a</I> and <I>b</I>, 
-and runs through the finite sequence 
-<I>a</I>, <I>a</I>+1, <I>a</I>+2, ..., <I>b</I>-1.
-If <I>b</I> is less or equal <I>a</I> then the sequence is empty.<P>
-
-The form <code>(:range &lt;vars&gt; &lt;start&gt; &lt;stop&gt; &lt;step&gt;)</code>
-first evaluates the expressions <code>&lt;start&gt;</code>, 
-<code>&lt;stop&gt;</code>, and <code>&lt;step&gt;</code>,
-which must result in exact integers <I>a</I>, <I>b</I>, and <I>s</I>
-such that <I>s</I> is unequal to zero.
-Then the sequence
-<I>a</I>, <I>a</I> + <I>s</I>, <I>a</I> + 2 <I>s</I>, ..., <I>a</I> + (<I>n</I>-1) <I>s</I>
-is enumerated where <I>n</I> = ceil((<I>b</I>-<I>a</I>)/<I>s</I>).
-In other words, the sequence starts at <I>a</I>, increments by <I>s</I>,
-and stops when the next value would reach or cross <I>b</I>.
-If <I>n</I> is zero or negative the sequence is empty.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":real-range"></a><code>
-(:real-range &lt;vars&gt; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;stop&gt;)<br>
-(:real-range &lt;vars&gt; &lt;start&gt; &lt;stop&gt;)<br>
-(:real-range &lt;vars&gt; &lt;start&gt; &lt;stop&gt; &lt;step&gt;)</code>
-</DT>
-
-<DD>
-Runs through a range of real numbers using an explicit index variable.
-This form of range enumeration avoids accumulation of rounding errors
-and is the one to use if any of the numbers defining the range is 
-inexact, not an integer, or a bignum of large magnitude.<P>
-
-Providing default value 0 for <code>&lt;start&gt;</code> and
-1 for <code>&lt;step&gt;</code>, the generator first
-evaluates <code>&lt;start&gt;</code>, <code>&lt;stop&gt;</code>,
-and <code>&lt;step&gt;</code>, which must result in reals
-<I>a</I>, <I>b</I>, and <I>s</I> such that 
-<I>n</I> = (<I>b</I>-<I>a</I>)/<I>s</I> is also representable
-as a real.
-Then the sequence 0, 1, 2, ... is enumerated while the
-current value <I>i</I> is less than <I>n</I>, and the
-variable in <code>&lt;vars&gt;</code> is bound to the
-value <I>a</I> + <I>i</I> <I>s</I>.
-If any of the values <I>a</I>, <I>b</I>, or <I>s</I> is
-non-exact then all values in the sequence are non-exact.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":char-range"></a>
-<code>(:char-range &lt;vars&gt; &lt;min&gt; &lt;max&gt;)</code>
-</DT>
-
-<DD>
-Runs through a range of characters.
-First <code>&lt;min&gt;</code> and <code>&lt;max&gt;</code> are
-evaluated, which must result in two characters <I>a</I> and <I>b</I>.
-Then the sequence of characters 
-<I>a</I>, <I>a</I>+1, <I>a</I>+2, ..., <I>b</I>
-is enumerated in the order defined by <code>char&lt;=?</code>
-in the sense of <a href="#R5RS">[R5RS, 6.3.4.]</a>.
-If <I>b</I> is smaller than <I>a</I> then the sequence is empty.
-(Note that <I>b</I> is included in the sequence.)
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":port"></a>
-<code>(:port &lt;vars&gt; &lt;port&gt;)</code><BR>
-<code>(:port &lt;vars&gt; &lt;port&gt; &lt;read-proc&gt;)</code>
-</DT>
-
-<DD>
-Reads from the port until the eof-object is read.
-Providing the default <code>read</code> for 
-<code>&lt;read-proc&gt;</code>, the generator first
-evaluates <code>&lt;port&gt;</code> and 
-<code>&lt;read-proc&gt;</code>, which must result
-in an input port <I>p</I> and a procedure <I>r</I>.
-Then the variable is run through the sequence obtained
-by <code>(</code><I>r</I><code> </code><I>p</I><code>)</code>
-while the result does not satisfy <code>eof-object?</code>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":dispatched"></a>
-<code>(:dispatched &lt;vars&gt; &lt;dispatch&gt; &lt;arg1&gt; &lt;arg&gt;</code>*<code>)</code>
-</DT>
-
-<DD>
-Runs the variables through a sequence defined by <code>&lt;dispatch&gt;</code>
-and <code>&lt;arg1&gt; &lt;arg&gt;</code>*.
-The purpose of <code>:dispatched</code> is implementing
-dispatched generators, in particular the predefined dispatching
-generator <a href="#:"><code>:</code></a>.<P>
-
-The working of <code>:dispatched</code> is as follows.
-First <code>&lt;dispatch&gt;</code> and
-<code>&lt;arg1&gt; &lt;arg&gt;</code>* are evaluated,
-resulting in a procedure <I>d</I> (the 'dispatcher') and 
-the values <I>a</I>[1] <I>a</I>[2] ... <I>a</I>[<I>n</I>].
-Then 
-<code>(</code><I>d</I><code> (list </code><I>a</I>[1] <I>a</I>[2] ... <I>a</I>[<I>n</I>] <code>))</code> 
-is evaluated, resulting in a value <I>g</I>.
-If <I>g</I> is not a procedure then the dispatcher
-did not recognize the argument list and an error is raised.
-Otherwise the 'generator procedure' <I>g</I> is used 
-to run <code>&lt;vars&gt;</code> through a sequence of values.
-The sequence defined by <I>g</I> is obtained by repeated 
-evaluation of <code>(</code><I>g</I> <I>empty</I><code>)</code>
-until the result is <I>empty</I>.
-In other words, <I>g</I> indicates the end of the sequence by
-returning its only argument, for which the caller has provided 
-an object distinct from anything <I>g</I> can produce.
-(Generator procedures are state based, they are no such noble things
-as streams in the sense of <a href="#SRFI40">SRFI 40</a>.)<P>
-
-<a name=":generator-proc"></a>
-The definition of dispatchers is greatly simplified by the
-macro <code>:generator-proc</code> that constructs a generator
-procedure from a typed generator.
-Let <code>(g var arg1 arg ...)</code> be an instance of
-the <code>&lt;generator&gt;</code> syntax, for example an
-<a href="#:foo">application-specific typed generator</a>,
-with a single variable <code>var</code> and no index variable.
-Then
-
-<blockquote><code>
-(:generator-proc (g arg1 arg ...)) => </code><I>g</I>,</blockquote>
-
-where the generator procedure <I>g</I> runs through the list
-<code>(list-ec (g var arg1 arg ...) var)</code>.<P>
-
-<a name=":dfoo"></a>
-<I>Adding an application-specific dispatching generator</I>.
-In order to define a new dispatching generator (say <code>:my</code>)
-first a dispatching procedure (say <code>:my-dispatch</code>) is defined.
-The dispatcher will be called with a single (!) argument
-containing the list of all values to dispatch on.
-To enable informative error messages, the dispatcher should
-return a descriptive object (e.g. a symbol for the module name)
-when it is called with the empty list.
-Otherwise (if there is at least one value to dispatch on),
-the dispatcher must either return a generator procedure
-or <code>#f</code> (= no interest).
-As an example, the following skeleton code defines a dispatcher 
-similar to the initial dispatcher of <a href="#:"><code>:</code></a>:
-
-<pre>
-(define (:my-dispatch args)
-  (case (length args)
-    ((0) 'SRFI-NN)
-    ((1) (let ((a1 (car args)))
-           (cond
-            ((list? a1)
-             (:generator-proc (:list a1)) )
-            ((string? a1)
-             (:generator-proc (:string a1)) )
-            <I>...more unary cases...</I>
-            (else
-             #f ))))
-    ((2) (let ((a1 (car args)) (a2 (cadr args)))
-           (cond
-            ((and (list? a1) (list? a2))
-             (:generator-proc (:list a1 a2)) )
-            <I>...more binary cases...</I>
-            (else
-             #f ))))
-    <I>...more arity cases...</I>
-    (else
-     (cond
-      ((every?-ec (:list a args) (list? a))
-       (:generator-proc (:list (apply append args))) )
-      <I>...more large variable arity cases...</I>
-      (else
-       #f )))))</pre>
-
-Once the dispatcher has been defined, the following macro 
-implements the new dispatching generator:
-
-<pre>
-(define-syntax :my
-  (syntax-rules (index)
-    ((:my cc var (index i) arg1 arg ...)
-     (:dispatched cc var (index i) :my-dispatch arg1 arg ...) )
-    ((:my cc var arg1 arg ...)
-     (:dispatched cc var :my-dispatch arg1 arg ...) )))</pre>
-
-This method of extension yields complete control of the dispatching process.
-Other modules can only add cases to <code>:my</code>
-if they have access to <code>:my-dispatch</code>.<P>
-
-<a name=":dfoo-global"></a>
-<I>Extending the predefined dispatched generator</I>.
-An alternative to adding a new dispatched generators is extending
-the predefined generator <a href="#:"><code>:</code></a>.
-Technically, extending <a href="#:"><code>:</code></a> means
-installing a new global dispatching procedure using
-<a href="#:-dispatch-set!"><code>:-dispatch-set!</code></a>
-as described above.
-
-<a name="dispatch-union"></a>
-In most cases, however, the already installed dispatcher should
-be extended by new cases. 
-The following procedure is a utility for doing so:
-
-<pre>(dispatch-union <I>d1</I> <I>d2</I>) => <I>d</I>,</pre> 
-
-where the new dispatcher <I>d</I> recognizes the union of the
-cases recognized by the dispatchers <I>d1</I> and <I>d2</I>.
-The new dispatcher always tries both component dispatchers
-and raises an error in case of conflict.
-The identification returned by <code>(</code><I>d</I><code>)</code>
-is the concatenation of the component identifications
-<code>(</code><I>d1</I><code>)</code> and 
-<code>(</code><I>d2</I><code>)</code>, enclosed in lists
-if necessary.
-For illustration, consider the following code:
-
-<pre>
-(define (example-dispatch args)
-  (cond
-   ((null? args)
-    'example )
-   ((and (= (length args) 1) (symbol? (car args)) )
-    (:generator-proc (:string (symbol->string (car args)))) )
-   (else
-    #f )))
-
-(:-dispatch-set! (dispatch-union (:-dispatch-ref) example-dispatch))</pre>
-
-After evaluation of this code, the following example will work:
-
-<pre>(list-ec (: c 'abc) c) => (#\a #\b #\c)</pre>
-
-Adding cases to <a href="#:"><code>:</code></a> is particularly useful 
-for frequent cases of interactive input.
-Be warned, however, that the advantage of global extension also carries
-the danger of conflicts, unexpected side-effects, and slow dispatching.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":do"></a><code>
-(:do (&lt;lb&gt;</code>*<code>) &lt;ne1?&gt; (&lt;ls&gt;</code>*<code>))<br>
-(:do (let (&lt;ob&gt;</code>*<code>) &lt;oc&gt;</code>*<code>) (&lt;lb&gt;</code>*<code>) &lt;ne1?&gt; (let (&lt;ib&gt;</code>*<code>) &lt;ic&gt;</code>*<code>) &lt;ne2?&gt; (&lt;ls&gt;</code>*<code>))</code>
-</DT>
-
-<DD>
-Defines a generator in terms of a named-<code>let</code>,
-optionally decorated with inner and outer <code>let</code>s.
-This generator is for defining other generators.
-(In fact, the reference implementation transforms any other
-generator into an instance of fully decorated <code>:do</code>.)
-The generator is a compromise between expressive power 
-(more flexible loops) and fixed structure (necessary
-for merging and modifying generators).
-In the fully decorated form, the syntactic variables 
-<code>&lt;ob&gt;</code> (outer binding),
-<code>&lt;oc&gt;</code> (outer command),
-<code>&lt;lb&gt;</code> (loop binding),
-<code>&lt;ne1?&gt;</code> (not-end1?),
-<code>&lt;ib&gt;</code> (inner binding),
-<code>&lt;ic&gt;</code> (inner command), 
-<code>&lt;ne2?&gt;</code> (not-end2?), and
-<code>&lt;ls&gt;</code> (loop step)
-define the following loop skeleton:
-
-<pre>
-(let (&lt;ob&gt;*)
-  &lt;oc&gt;*
-  (let loop (&lt;lb&gt;*) 
-    (if &lt;ne1?&gt;
-        (let (&lt;ib&gt;*)
-          &lt;ic&gt;*
-          <I>payload</I>
-          (if &lt;ne2?&gt;
-              (loop &lt;ls&gt;*) ))))),</pre>
-
-where <code>&lt;oc&gt;*</code> and
-<code>&lt;ic&gt;*</code> are syntactically
-equivalent to <code>&lt;command&gt;</code>*,
-i.e. they do not begin with a <code>&lt;definition&gt;</code>.
-The latter requirement allows the code generator to
-produce more efficient code for special cases by
-removing empty <code>let</code>-expressions altogether.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":let"></a>
-<code>(:let &lt;vars&gt; &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-Runs through the sequence consisting of the value of 
-<code>&lt;expression&gt;</code>, only.
-This is the same as
-<code>(:list &lt;vars&gt; (list &lt;expression&gt;))</code>.
-If an index variable is specified, its value is 0.
-The <code>:let</code>-generator can be used to introduce 
-an intermediate variable depending on outer generators.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":parallel"></a>
-<code>(:parallel &lt;generator&gt;</code>*<code>)</code>
-</DT>
-
-<DD>
-Runs several generators in parallel.
-This means that the next binding in the sequence is obtained
-by advancing each generator in <code>&lt;generator&gt;</code>*
-by one step.
-The parallel generator terminates when any of its component
-generators terminates.
-The generators share a common scope for the variables 
-they introduce.
-This implies that the names of the variables introduced 
-by the various generators must be distinct.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":while"></a>
-<code>(:while &lt;generator&gt; &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-Runs <code>&lt;generator&gt;</code> while <code>&lt;expression&gt;</code>
-evaluates to non-<code>#f</code>.
-The guarding expression is included in the scope
-of the variables introduced by the generator.<P>
-
-Note the distinction between the filter <code>if</code> and
-the modified generator expressed by <code>:while</code>.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":until"></a>
-<code>(:until &lt;generator&gt; &lt;expression&gt;)</code>
-</DT>
-
-<DD>
-Runs <code>&lt;generator&gt;</code> until after 
-<code>&lt;expression&gt;</code> has evaluated to non-<code>#f</code>.
-The guarding expression is included in the scope
-of the variables introduced by the generator.<P>
-
-Note the distinction between <code>:while</code>, stopping <I>at</I>
-a certain condition, and <code>:until</code>, stopping <I>after</I>
-a certain condition has occurred. The latter implies that the binding
-that has triggered termination has been processed by the comprehension.
-</DD>
-</DL>
-
-<DL>
-<DT><a name=":foo"></a>
-<code>&lt;application-specific typed generator&gt;</code>
-</DT>
-
-<DD>
-An important aspect of this SRFI is a modular mechanism to
-define new typed generators.
-To define a new typed generator a hygienic referentially
-transparent macro of the same name is defined to transform
-the generator pattern into an instance of the 
-<a href="#:do"><code>:do</code></a>-generator.
-The extension is fully modular, meaning that no other
-macro has to be modified to add the new generator.
-This is achieved by defining the new macro in
-<I>Continuation Passing Style</I>, as in <a href="#MWL">[MWL]</a>.<P>
-
-Technically, this works as follows.
-Assume the generator syntax <code>(:mygen &lt;var&gt; &lt;arg&gt;)</code> 
-is to be implemented, for example running the variable <code>&lt;var&gt;</code>
-through the list <code>(reverse &lt;arg&gt;)</code>.
-The following definition implements <code>:mygen</code> 
-in terms of <a href="#:list"><code>:list</code></a> 
-using the additional syntactic variable <code>cc</code> 
-(read <I>current continuation</I>):
-
-<pre>
-(define-syntax :mygen
-  (syntax-rules ()
-    ((:mygen cc var arg)
-     (:list cc var (reverse arg)) )))</pre>
-
-After this definition, any comprehension will accept 
-the <code>:mygen</code>-generator and produce the
-proper code for it.
-This works as follows. 
-When a comprehension sees something of the form
-<code>(g arg ...)</code> in the position of a
-<code>&lt;qualifier&gt;</code> then it will
-transform the entire comprehension into 
-<code>(g (continue ...) arg ...)</code>.
-This effectively 'transfers control' to the 
-macro <code>g</code>, for example <code>:mygen</code>.
-The macro <code>g</code> has full control of
-the transformation, but eventually it should
-transform the expression into
-<code>(:do (continue ...) etc ...)</code>.
-In the <code>:mygen</code>-example this is done
-by the <code>:list</code>-macro.
-The macro <code>:do</code> finally transforms
-into <code>(continue ... (:do etc ...))</code>.
-As <code>continue</code> has been chosen by the
-macro implementing the comprehension, 
-it can regain control and proceed
-with other qualifiers.<P>
-
-In order to ensure consistency of new generators 
-with the ones defined in this SRFI, a few conventions
-are in order.
-Firstly, the generator patterns begin with one or more 
-variables followed by arguments defining the sequence.
-Secondly, each generator except <code>:do</code> 
-can handle an optional index variable.
-This is most easily implemented using
-<a href="#:parallel"><code>:parallel</code></a>
-together with <a href="#:integers"><code>:integers</code></a>.
-In case the payload generator needs an index anyhow
-(e.g. <a href="#:vector"><code>:vector</code></a>)
-it is more efficient to add an index-variable if
-none is given and to implement the indexed case.
-Finally, make sure that no syntactic variable of the
-generator pattern ever gets duplicated in the code
-(to avoid exponential code size in nested application),
-and introduce sufficient intermediate variables to 
-make sure expressions are evaluated at the correct time.
-</DD>
-</DL>
-
-<H1><a name="ext-examples"></a>
-Suggestions for application-specific extensions</H1>
-
-<H3>Arrays in the sense of <a href="#SRFI25">[SRFI25]</a></H3>
-
-In order to create an array from a sequence of elements,
-a comprehension with the following syntax would be useful:
-
-<pre>(array-ec &lt;shape&gt; &lt;qualifier&gt;* &lt;expression&gt;).</pre>
-
-The comprehension constructs a new array of the given shape
-by filling it row-major with the sequence of elements as specified 
-by the qualifiers.
-
-On the generator side, it would be most useful to have a
-generator of the form
-
-<pre>(:array &lt;vars&gt; &lt;arg&gt;),</pre>
-
-running through the elements of the array in row-major.
-For the optional index variable, the extension 
-<code>(index &lt;k1&gt; &lt;k&gt;</code>*<code>)</code>
-could be defined where <code>&lt;k1&gt; &lt;k&gt;</code>*
-are variable names indexing the various dimensions.
-
-
-<H3>Random Numbers in the sense of <a href="#SRFI27">[SRFI27]</a></H3>
-
-In order to create a vector or list of random numbers,
-it would be convenient to have generators of the following form:
-
-<pre>
-(:random-integer [ &lt;range&gt; [ &lt;number&gt; ] ] )
-(:random-real &nbsp;&nbsp;&nbsp;[ &lt;number&gt; ] )</pre>
-
-where <code>&lt;range&gt;</code> (default 2) indicates the range of 
-the integers and <code>&lt;number&gt;</code> (default infinity)
-specifies how many elements are to be generated.
-Derived from these basic generators, one could define several
-other generators for other distributions (e.g. Gaussian).
-
-
-<H3>Bitstrings in the sense of <a href="#SRFI33">[SRFI33]</a></H3>
-
-As eager comprehensions are efficient, they can be useful
-for operations involving strings of bits.
-It could be useful to have the following comprehension:
-
-<pre>(bitwise-ec &lt;qualifier&gt;* &lt;expression&gt;),</pre>
-
-which constructs an integer from bits obtained as values
-of <code>&lt;expression&gt;</code> in the ordering defined
-by <a href="#SRFI33">[SRFI33]</a>.
-In other words, if the sequence of values is 
-<I>x</I>[0], <I>x</I>[1], ..., <I>x</I>[<I>n</I>-1] then
-the result is <I>x</I>[0] + <I>x</I>[1] 2 + ... + <I>x</I>[<I>n</I>-1] 2^(<I>n</I>-1).
-On the generator side, a generator of the form
-
-<pre>(:bitwise &lt;vars&gt; &lt;arg1&gt; &lt;arg&gt;*)</pre>
-
-runs through the sequence of bits obtained by appending the
-binary digits of the integers <code>&lt;arg1&gt; &lt;arg&gt;</code>*.
-
-<H3><a name="srfi40-ec"></a>Streams in the sense of <a href="#SRFI40">[SRFI 40]</a></H3>
-
-It is possible to 'lazify' the eager comprehension 
-<a href="#list-ec"><code>list-ec</code></a>,
-constructing a stream in the sense of <a href="#SRFI40">[SRFI 40]</a>.
-Clearly, such a comprehension (<code>stream-ec</code>)
-is not eager at all since it only runs the loops when results are requested.
-It is also possible to define a <code>:stream</code>-generator with
-the same API as <a href="#:list"><code>:list</code></a> but running
-through streams instead of lists.<P>
-
-For what it is worth, 
-the file <a href="http://srfi.schemers.org/srfi-42/srfi40-ec.scm">srfi40-ec.scm</a> implements
-<code>:stream</code> and <code>stream-ec</code> and gives an example.
-The implementation makes substantial use of 
-<code>call-with-current-continuation</code> to run the loop
-only when necessary.
-In some implementations of Scheme this may involve
-considerable overhead.
-
-<H3>Reading Text Files</H3>
-
-Eager comprehensions can also be used to process files.
-However, bear in mind that an eager comprehension wants
-to read and process the entire file right away.
-Nevertheless, these generators would be useful for
-reading through the lines of a file or through the
-characters of a file:
-
-<pre>
-(:lines-of-file &lt;vars&gt; &lt;file&gt;)
-(:chars-of-file &lt;vars&gt; [ (line &lt;variable1&gt;) ] [ (column &lt;variable2&gt;) ] &lt;file&gt;)</pre>
-
-Here <code>&lt;file&gt;</code> is either an input port
-or a string interpreted as a filename.
-In a similar fashion, generators reading from sockets defined
-by URLs or other communication facilities could be defined.
-
-<H3>The Scheme shell <a href="#SCSH">Scsh</a></H3>
-
-In the Scheme-shell Scsh it could be useful to have certain
-comprehensions and generators. 
-Candidates for comprehensions are
-<code>begin-ec</code>,
-<code>|-ec</code>,
-<code>||-ec</code>, and
-<code>&&-ec</code>.
-Concerning generators, it might be useful to have
-<code>:directory</code> running through the 
-records of a directory, and maybe a 
-sophisticated <code>:file-match</code>-generator
-could enumerate file record in a directory structure.
-Optional variables of the generators could give
-convenient access frequent components of the file records
-(e.g. the filename).
-Another candidate is <code>:env</code> to run through
-the environment associations.
-It is left to other authors and other SRFIs to 
-define a useful set of comprehensions and generators
-for Scsh.
-
-
-<H1><a name="design"></a>Design Rationale</H1>
-
-<H3>What is the difference between eager and lazy comprehensions?</H3>
-
-A lazy comprehension, for example <code>stream-of</code> in the 
-sense of <a href="#SRFI40">[SRFI 40]</a>, constructs an object
-representing a sequence of values. 
-Only at the time these values are needed that they
-are actually produced.
-An eager comprehension, on the other hand, is an instruction to
-run through a certain sequence of values and do something with it,
-for example as in <a href="#do-ec"><code>do-ec</code></a>.
-In other words, it is nothing more sophisticated than a loop,
-potentially with a more convenient notation.
-This also explains why <code>stream-of</code> is the most
-fundamental <I>lazy</I> comprehension, and all others can
-be formulated in terms of it, whereas the most fundamental
-<I>eager</I> comprehension is <code>do-ec</code>.
-
-
-<H3><a name="convention"></a>Why the [<I>outer</I> .. <I>inner</I> | <I>expr</I>] 
-order of qualifiers?</H3>
-
-In principle, there are six possible orders in which the
-qualifiers and the expression of a comprehension can be written.
-We denote the different conventions with a pattern in which
-<I>expr</I> denotes the expression over which the comprehension
-ranges, <I>inner</I> denotes the generator spinning fastest, and
-<I>outer</I> denotes the generator spinning slowest.
-For example, <a href="#Haskell">[Haskell]</a> and 
-<a href="#Python">[Python]</a> use
-[<I>expr</I> | <I>outer</I> .. <I>inner</I>].
-(Probably with sufficient persistence, instances for any
-of the conventions can be found on the Internet.)
-In addition, there is the common mathematical notation 
-'{<I>f</I>(<I>x</I>) | <I>x</I> in <I>X</I>}'.<P>
-
-It is important to understand that the notational convention
-does not only determine the order of enumeration but also the
-scope of the variables introduced by the generators.
-The scope of <I>inner</I> includes <I>expr</I>, and the
-scope of <I>outer</I> should include <I>inner</I> to allow
-inner generates depending on outer generators.
-Eventually, the choice for a particular syntactic convention is
-largely a matter of personal preferences.
-However, there are a few considerations that went into the
-choice made for this SRFI:<P>
-
-1. The mathematical notation is universally known and widely used.
-However, the mathematical notation denotes a <I>set</I> comprehension
-in which the order of the qualifiers is either irrelevant or must
-be deduced from the context.
-For the purpose of eager comprehensions as a programming language 
-construct, the order does matter and a simple convention is a plus.
-For these reasons, the mathematical notation as such is undesirable,
-but its widespread use is in favor of
-[<I>expr</I> | <I>inner</I> .. <I>outer</I>] and
-[<I>expr</I> | <I>outer</I> .. <I>inner</I>].<P>
-
-2. It is desirable to have the scope of the variables increase
-into one direction, as in
-[<I>expr</I> | <I>inner</I> .. <I>outer</I>] and
-[<I>outer</I> .. <I>inner</I> | <I>expr</I>], and
-not change direction, as in
-[<I>expr</I> | <I>outer</I> .. <I>inner</I>]
-where <I>expr</I> is in the scope of <I>inner</I>
-but <I>outer</I> is not.
-This is even more important if the syntax in Scheme
-does not explicitly contain the '|'-separator.<P>
-
-3. More complicated comprehensions with several nested generators
-eventually look like nested loops and Scheme always
-introduces them <I>outer</I> .. <I>inner</I> as in 
-<code>do</code> and named-<code>let</code>.
-This is in favor of 
-[<I>expr</I> | <I>outer</I> .. <I>inner</I>] and
-[<I>outer</I> .. <I>inner</I> | <I>expr</I>].
-Shorter comprehension may look more naturally the
-other way around.<P>
-
-Regarding these contradicting preferences, I regard 
-linearity in scoping (2.) most important, followed by 
-readability for more complicated comprehensions (3.).
-This leads to [<I>outer</I> .. <I>inner</I> | <I>expr</I>].
-An example in Scheme-syntax is
-<code>(list-ec (: x 10) (: y x) (f x y))</code>,
-which looks acceptable to me even without similarity
-to the mathematical notation.
-As a downside, the convention clashes with other the
-convention used in other languages (e.g. Haskell and Python).
-
-
-<H3>You forgot [<I>choose your favorite here</I>]-ec!</H3>
-
-I tried to construct a reasonably useful set of tools
-according to what <a href="#R5RS">[R5RS]</a> specifies.
-Nevertheless, is the choice what to include and what to
-leave out eventually a matter of personal preference.<P>
-
-When 'packing the toolbox' I went for travelling light;
-this SRFI does not include everything imaginable
-or even everything useful.
-I oriented myself at the standard procedures 
-of <a href="#R5RS">[R5RS]</a>,
-with a few omissions and additions.
-A notable omission are <code>gcd-ec</code> and 
-<code>lcm-ec</code> because they are one-liners,
-and more severely, of questionable value in practice.
-A notable addition are
-<a href="#fold-ec"><code>fold-ec</code></a> and
-<a href="#fold3-ec"><code>fold3-ec</code></a>,
-providing a mechanism to define lots of useful one-liners.
-The other notable addition is 
-<a href="#first-ec"><code>first-ec</code></a>, which
-is the fundamental 'early stopping' comprehension.
-It is used to define 
-<a href="#any?-ec"><code>any?-ec</code></a> and
-<a href="#every?-ec"><code>every?-ec</code></a>
-which are among the most frequent comprehensions.<P>
-
-Concerning the generators, the same principle has been used.
-Additions include <a href="#:range"><code>:range</code></a>
-and friends because they are universally needed, and 
-<a href="#:dispatched"><code>:dispatched</code></a> which is
-primarily intended for implementing <a href="#:"><code>:</code></a>.
-
-
-<H3><a name="dovetail"></a>Why is the order of enumeration specified?</H3>
-
-For the purpose of this SRFI, every generator runs through
-its sequence of bindings in a well specified order, and nested 
-generators run through the Cartesian product in the order 
-of nested loops.
-The purpose of this definition is making the sequence as 
-easily predictable as possible.
-
-On the other hand, many mechanisms for <I>lazy</I> comprehensions
-do not specify the order in which the elements are enumerated.
-When it comes to infinite streams, this has the great advantage 
-that a comprehension may interleave an inner and an outer 
-enumeration, a method also known as 'dove-tailing' or 'diagonalizing'.
-Interleaving ensures that any value of the resulting stream is 
-produced after a finite amount of time, even if one or more 
-inner streams are infinite.
-
-<H3>Why both typed and dispatching generators?</H3>
-
-The reason for typed generators is runtime efficiency.
-In fact, the code produced by <code>:range</code> and others
-will run as fast as a hand-coded <code>do</code>-loop.
-The primary purpose of the dispatching generator is convenience.
-It comes at the price of reduced runtime performance,
-both for loop iteration and startup.
-
-<H3>Why the <I>something</I><code>-ec</code> and <code>:</code><I>type</I> naming?</H3>
-
-The purpose of the <code>:</code><I>type</I> convention is to keep 
-many common comprehensions down to one-liners.
-In my opinion, the fundamental nature of eager comprehensions
-justifies a single character naming convention.
-The <I>something</I><code>-ec</code> convention is primarily intended to
-stay away from the widely used <I>something</I><code>-of</code>.
-It reduces confusion and conflict with related mechanisms.
-
-<H3>Why combine variable binding and sequence definition?</H3>
-
-The generators of this SRFI do two different things with
-a single syntactic construct: They define a sequence of values
-to enumerate and they specify a variable (within a certain
-scope) to run through that sequence.
-An alternative is to separate the two, for example as it 
-has been done in 
-<a href="http://srfi.schemers.org/srfi-40/srfi-40.html">SRFI 40</a>.<P>
-
-The reason for combining sequence definition and enumeration
-for the purpose of this SRFI is threefold. 
-Firstly, sequences of values are not explicitly represented as
-objects in the typed generators; the generators merely
-manipulate an internal state.
-Secondly, this SRFI aims at a most concise notation for
-common comprehensions and reduces syntax to the naked minimum.
-Thirdly, this SRFI aims at the highest possible performance for
-typed generators, which is achieved if the state being manipulated
-is represented by the loop variable itself.
-
-<H3>Why is <code>(: &lt;vars&gt;)</code> illegal?</H3>
-
-It is reasonable and easy to define <code>(<a href="#:">:</a> &lt;vars&gt;)</code> 
-as <code>(<a href="#:integers">:integers</a> &lt;vars&gt;)</code>, 
-enumerating the non-negative integers.
-However, it turned out that a frequent mistake in using the
-eager comprehensions is to forget either the variable
-or an argument for the enumeration.
-As this would lead to an infinite loop (not always 
-equally pleasant in interactive sessions), it is not allowed.
-
-<H3>Why is there no <code>:sequential</code>?</H3>
-
-Just like <a href="#:parallel"><code>:parallel</code></a> 
-enumerates generators in
-parallel, a <code>:sequential</code> generator could
-enumerate a concatenation of several generator, starting 
-the next one when the previous has finished.
-The reason for not having such a qualifier is
-that the generators should use all the same variable name
-and there is no hygienic and referentially transparent
-way of enforcing this (or even knowing the variable).
-
-<H3>Why is there no general <code>let</code>-qualifier?</H3>
-
-It is easy to add <code>let</code>, <code>let*</code>, 
-and <code>letrec</code> as cases to <code>&lt;qualifier&gt;</code>.
-This would allow more sophisticated local variables 
-and expressions than possible with 
-<code>(<a href="#:let">:let</a> &lt;vars&gt; &lt;expression&gt;)</code> and
-<code>(<a href="#begin">begin</a> &lt;sequence&gt;</code>*<code>)</code>.
-In particular, a local <code>&lt;definition&gt;</code>
-in the sense of <a href="#R5RS">[R5RS, 7.1.5.]</a> would
-be possible.<P>
-
-There are two reasons for not including <code>let</code> 
-and friends as qualifiers.
-The first reason concerns readability.
-A qualifier of the form 
-<code>(let (&lt;binding spec&gt;</code>*<code>) &lt;body&gt;)</code>
-only makes sense if the scope of the new variables ends at the 
-end of the comprehension, and <I>not</I> already
-after <code>&lt;body&gt;</code>.
-The similarity with ordinary <code>let</code>-expressions 
-would be very confusing.
-The second reason concerns the design rationale.
-If sophisticated <code>let</code>-qualifiers involving
-recursion or local definitions are needed, it is likely 
-that eager comprehensions are being overused.
-In that case it might be better to define a procedure
-for the task.
-So including an invitation to overuse the mechanism would
-be a serious violation of the 
-<I>Keep It Simple and Stupid</I> principle.
-
-<H3>Why is there no <code>:nested</code> generator?</H3>
-
-The specification above defines <a href="#nested"><code>nested</code></a>
-as a qualifier but <a href="#:parallel"><code>:parallel</code></a> 
-as a generator.
-In particular, this makes it impossible to make parallel
-generators from nested ones.<P>
-
-This design simply reflects an implementability limitation.
-All component generators of <code>:parallel</code> are
-transformed into <a href="#:do"><code>:do</code></a>-generators
-and these can be merged into a parallel generator. 
-However, nested generators cannot be merged easily without
-losing the type of the generator, 
-which would seriously hurt modularity and performance.
-
-<H3>Is <code>any?-ec</code> eager?</H3>
-
-Yes, it is still eager because it immediately starts to 
-run through the sequence.<P>
-
-In fact, the reference implementation makes sure 
-<a href="#first-ec"><code>first-ec</code></a>,
-<a href="#any?-ec"><code>any?-ec</code></a>, and
-<a href="#every?-ec"><code>every?-ec</code></a>
-execute efficiently so they can be used conveniently 
-as in 
-<code>(every?-ec (:list x my-list) (pred? x))</code>.
-
-<H3>Why this whole <code>:dispatched</code> business?</H3>
-
-It is specified above that <I>the</I> dispatching generator,
-called <a href="#:"><code>:</code></a>, is just a special case
-of <a href="#:dispatched"><code>:dispatched</code></a> using 
-a global dispatching procedure.
-Alternatively, a simple fixed global mechanism to extend
-<a href="#:"><code>:</code></a> could have been used.
-This is much simpler but does not support the definition
-of new dispatched generators.<P>
-
-The purpose of <a href="#:dispatched"><code>:dispatched</code></a>
-and its utilities
-(<a href="#:generator-proc"><code>:generator-proc</code></a> and
-<a href="#dispatch-union"><code>dispatch-union</code></a>)
-is the following.
-Assume <a href="#:"><code>:</code></a> is to be used inside a
-module but it is essential that no other module can spoil it,
-e.g. by installing a very slow dispatcher.
-The recommended way to proceed in this case is to define a
-local copy of the original dispatching generator 
-<a href="#:"><code>:</code></a>,
-for example with the following code
-
-<pre>
-(define :my-dispatch
-  (make-initial-:-dispatch) )
-
-(define-syntax :my
-  (syntax-rules (index)
-    ((:my cc var (index i) arg1 arg ...)
-     (:dispatched cc var (index i) :my-dispatch arg1 arg ...) )
-    ((:my cc var arg1 arg ...)
-     (:dispatched cc var :my-dispatch arg1 arg ...) ))),</pre>
-
-and to use the new generator <code>:my</code> instead of
-<a href="#:"><code>:</code></a>.<P>
-
-An alternative for the dispatching mechanism as defined in
-this SRFI is the use of parameter objects in the sense of
-<a href="#SRFI39">[SRFI 39]</a>. 
-The dispatching generator would then access a dynamically
-scoped variable to find the dispatcher, allowing full
-control over dispatching.
-However, this approach does not solve the dilemma that it is
-sometimes useful that <a href="#:"><code>:</code></a> is global
-and sometimes undesired.
-The approach specified for this SRFI addresses this dilemma
-by offering options.<P>
-
-Another alternative for dealing with the dispatching
-problem is adding an optional argument to the syntax of
-<a href="#:"><code>:</code></a> through which the dispatcher
-can be passed explicitly.
-However, as <a href="#:"><code>:</code></a> has variable
-arity and the identifier for the variable cannot be
-distinguished from any value for a dispatcher, 
-this is syntactically problematic.
-
-<H3>Why is there no local mechanism for adding to <a href="#:"><code>:</code></a>?</H3>
-
-According to <a href="#R5RS">[R5RS, 7.1.6.]</a> macros can only
-be defined at the level of the <code>&lt;program&gt;</code> syntax.
-This implies that the scope of typed generators cannot easily be
-limited to local scopes.
-As typed and dispatched generators go together,
-there is also no strong need for a limited scope
-of dispatched generators either.
-Furthermore, locally extendable dispatchers are another major 
-headache to those trying to understand other people's code.
-
-<H3>Why are dispatchers unary?</H3>
-
-As defined in <a href="#:dispatched"><code>:dispatched</code></a>,
-a dispatching procedure is called with a single argument being
-the list of values to dispatch on. 
-An alternative is to <code>apply</code> the dispatcher to the
-list of values to dispatch on, which would be more natural in Scheme.<P>
-
-The reason for not using <code>apply</code> is a minor
-improvement in efficiency.
-Every time <code>apply</code> is used on a procedure of variable
-arity, an object containing the argument list is allocated on
-the heap.
-As a dispatcher may call many other dispatchers, this will adds
-to the overhead of dispatching, which is relevant in inner loops.
-
-<H3>Why are there two fold comprehensions?</H3>
-
-The reason for having two fold comprehensions 
-(<a href="#fold-ec"><code>fold-ec</code></a> and
-<a href="#fold3-ec"><code>fold3-ec</code></a>) is efficiency.<P>
-
-Clearly, the more general construction is 
-<a href="#fold3-ec"><code>fold3-ec</code></a> 
-as it allows individual treatment of the empty
-sequence case and the singleton sequence case.
-However, this comes at the price of more book-keeping
-as can be seen from the 
-<a href="#fold3-ec-example">implementation example</a>.
-As the overhead is located within inner loops,
-it makes sense to define another fold comprehension
-for the case where the added flexibility is not needed.
-This is <a href="#fold-ec"><code>fold-ec</code></a>.<P>
-
-The names <code>fold-ec</code> and <code>fold3-ec</code>
-have been chosen for the comprehensions in order to stay
-clear any other 'fold' that may be around.
-
-<H3>Why is <code>:char-range</code> not defined by <code>integer->char</code>?</H3>
-
-The definition of <a href="#:char-range"><code>:char-range</code></a>
-specifies a sequence of adjacent characters ordered by <code>char&lt;=?</code>.
-The reason for not using <code>char->integer</code> and 
-<code>integer->char</code> is the fact that
-<a href="#R5RS">[R5RS, 6.3.4.]</a> leaves it to the implementation
-whether the integers representing characters are consecutive or not.
-In effect, this underspecification is inherited by <code>:char-range</code>.
-
-
-<H1><a name="related-work"></a>Related Work and Acknowledgements</H1>
-
-Several other proposals related to the mechanism specified here exists.
-The following mechanisms are made for and in Scheme (or at least a 
-specific dialect thereof):<P>
-
-First of all, the report <a href="#R5RS">[R5RS]</a> of Scheme itself
-defines two constructs for writing loops: <code>do</code> and 
-named-<code>let</code>.
-Both constructs express a single loop (not nested), 
-possibly with several variables running in parallel,
-based on explicit manipulation of the state variables. 
-For example <code>(do ((x 0 (+ x 1))) ((= x 10)) (display x))</code>
-explicitly mentions how to obtain the next binding of <code>x</code>.<P>
-
-Richard Kelsey's "Macros for writing loops", <a href="#MWL">[MWL]</a>
-are an extension to Scheme48 to simplify the formulation of loops.
-The basic idea is to stick with a <code>do</code>-like syntax for
-more sophisticated loop constructs, not necessarily manipulating
-a state variable explicitly.
-For example, <code>(list* x '(1 2 3))</code> expresses an enumeration
-of the variable <code>x</code> through the list <code>(1 2 3)</code>
-without explicit state manipulation.
-The iteration constructs of <a href="#MWL">[MWL]</a>, named 
-<code>iterate</code> and <code>reduce</code>,
-express a single (not nested) loop (<code>iterate</code>) or 
-comprehension (<code>reduce</code>) with any number of
-parallel enumerations.
-A most important feature of the <a href="#MWL">[MWL]</a>-concept
-is a modular way to add sequence types (generators).
-In effect, the addition of a new sequence type does not
-require a modification of the existing macros.
-This is achieved by carefully limiting the expressive
-power of the loop constructs and by using the macros
-in <I>Continuation Passing Style</I> to call other macros.
-The <a href="#MWL">[MWL]</a>-concept, and its implementation, 
-were most influential for this SRFI.<P>
-
-Another related mechanism is the library of streams recently
-submitted by Phil L. Bewig as <a href="#SRFI40">[SRFI 40]</a>.
-The library contains a data type to represent even
-streams (both car and cdr potentially delayed) and
-defines procedures for manipulating these streams.
-Moreover, the macro <code>stream-of</code> defines a
-lazy comprehension resulting in the stream of values of
-an expression subject to generators and filters.
-A fixed set of generators (lists, vector, string, port,
-and naturally: streams) is supported; extending the
-list of generators requires changing <code>stream-of</code>.
-Nevertheless, modularity is high since it is easy to define
-a procedure producing a stream object and this can be
-used for enumeration.
-The order of enumeration is left unspecified to allow
-interleaving of generators (also refer to 
-<a href="#dovetail">above</a>.)
-Before Phil submitted his SRFIs, we had a short
-discussion in which we clarified the semantic and syntactic
-differences of our approaches.
-It turned out that the mechanisms are sufficiently 
-different not to unify them.
-The most important difference is the design rationale:
-Phil created his library to support the stream-paradigm
-in Scheme, inspired by the work done for Haskell and 
-other lazy languages, and intrigued by the beauty
-of programming with infinite streams.
-My work only aims at a convenient way of expressing 
-frequent patterns of loops in a compact way.
-For what it is worth, section <a href="#srfi40-ec">SRFI40-ec</a>
-contains a suggestion for extending the eager comprehension
-mechanism for SRFI40-streams.<P>
-
-Phil's work on streams and lazy comprehensions in Scheme
-triggered Eli Barzilay to implement a library of eager
-comprehensions for PLT-Scheme, <a href="#Eli">[Eli]</a>.
-The mechanism implemented by Eli is in essence very
-similar to the one proposed in this SRFI, and the two
-efforts have been independent until recently.
-Syntactically, Eli uses infix operators for generators, 
-whereas this SRFI is purely prefix, and Eli uses the 
-[<I>expr</I> | <I>outer</I> .. <I>inner</I>] convention
-for nesting, whereas this SRFI uses the
-[<I>outer</I> .. <I>inner</I> | <I>expr</I>]
-<a href="#convention">convention</a>.
-Semantically, Eli's mechanism defines more flexible
-loops than this SRFI.
-Comprehensions are regarded as generalized collection
-processes like fold and reduce.
-The mechanism in this SRFI is more restricted with respect
-to control flow (there is no general <code>while</code>)
-and more extensive with respect to generators and 
-comprehensions.
-Despite the strong conceptual similarity, the design 
-rationales are different.
-This SRFI focuses on portability and modular extension,
-whatever that may cost in terms of expressive power.<P>
-
-Finally, I would like to thank Mike Sperber for his 
-encouragement to proceed with the SRFI and for several
-discussions of the matter.
-In particular, the dispatching mechanism evolved
-rapidly during discussions with Mike.
-
-
-<H1><a name="refimpl"></a>Implementation</H1>
-
-The reference implementation focuses on portability, 
-performance, readability and simplicity, roughly in this order.
-It is written in <a href="#R5RS">[R5RS]</a>-Scheme 
-(including macros) extended by <a href="#SRFI23">[SRFI 23]</a>
-(<code>error</code>).
-The reference implementation was developed
-under <a href="#Scheme48">Scheme48</a> (0.57),
-<a href="#PLT">PLT</a> (202, 204), and
-<a href="#SCM">SCM</a> (5d7).<P>
-
-The file <a href="http://srfi.schemers.org/srfi-42/ec.scm">ec.scm</a> is the source of
-the reference implementation.
-It also contains comments concerning potential problems.
-Implementors might find the file <a href="http://srfi.schemers.org/srfi-42/design.scm">design.scm</a>
-helpful. 
-It contains alternative implementations of certain comprehensions 
-and generators in order to simplify tuning the implementation
-of this SRFI for different Scheme systems.<P>
-
-The file <a href="http://srfi.schemers.org/srfi-42/examples.scm">examples.scm</a> contains a
-collection of examples, and some code checking their results.
-The purpose of most examples is detecting implementation errors,
-but the section 'Less artificial examples' contains a few
-real-world examples. <P>
-
-The file <a href="http://srfi.schemers.org/srfi-42/timing.scm">timing.scm</a> contains some
-code to measure an idea of performance of the comprehensions.
-A hand-coded <code>do</code>-loop, the typed generator
-<code>(<a href="#:range">:range</a> </code><I>n</I><code>)</code>, 
-and the dispatching generator 
-<code>(<a href="#:">:</a> </code><I>n</I><code>)</code>
-are compared.
-For each loop we compare the time needed
-per iteration and the time needed to construct the loop (the startup delay).
-As a rule of thumb, <code>:range</code> is as fast (or slightly faster) 
-as a hand-coded <code>do</code>-loop per iteration and needs about a 
-third more time for startup (due to type checking of the argument).
-The dispatching generator needs about twice the time per iteration
-(due to calling the generator procedure) and needs about five times
-as long for startup (due to dispatching).<P>
-
-The file <a href="http://srfi.schemers.org/srfi-42/extension.scm">extension.scm</a> contains
-examples for adding new generators and comprehensions.<P>
-
-<H1>References</H1>
-
-<TABLE>
-
-<TR>
-<TD><a name="R5RS">[R5RS]</a>
-<TD>Richard Kelsey, William Clinger, and Jonathan Rees (eds.):
-Revised(5) Report on the Algorithmic Language Scheme of
-20 February 1998.
-Higher-Order and Symbolic Computation, Vol. 11, No. 1, September 1998.
-<a href="http://schemers.org/Documents/Standards/R5RS/">
-http://schemers.org/Documents/Standards/R5RS/</a>.
-</TR>
-
-<TR>
-<TD><a name="MWL">[MWL]</a>
-<TD>Richard Kelsey, Jonathan Rees: 
-The Incomplete Scheme48 Reference Manual for Release 0.57 (July 15, 2001).
-Section "Macros for writing loops".
-<a href="http://s48.org/0.57/manual/s48manual_49.html">http://s48.org/0.57/manual/s48manual_49.html</a>
-</TR>
-
-
-<TR>
-<TD><a name="SRFI1">[SRFI 1]</a>
-<TD>Olin Shivers: List Library.
-<a href="http://srfi.schemers.org/srfi-1/">http://srfi.schemers.org/srfi-1/</a>
-</TR>
-
-<TR>
-<TD><a name="SRFI23">[SRFI 23]</a>
-<TD>Stephan Houben: Error reporting mechanism
-<a href="http://srfi.schemers.org/srfi-23/">http://srfi.schemers.org/srfi-23/</a>
-</TR>
-
-
-<TR>
-<TD><a name="SRFI25">[SRFI 25]</a>
-<TD>Jussi Piitulainen: Multi-dimensional Array Primitives.
-<a href="http://srfi.schemers.org/srfi-25/">http://srfi.schemers.org/srfi-25/</a>
-</TR>
-
-<TR>
-<TD><a name="SRFI27">[SRFI 27]</a>
-<TD>Sebastian Egner: Sources of Random Bits.
-<a href="http://srfi.schemers.org/srfi-27/">http://srfi.schemers.org/srfi-27/</a>
-</TR>
-
-<TR>
-<TD><a name="SRFI33">[SRFI 33]</a>
-<TD>Olin Shivers: Integer Bitwise-operation Library.
-<a href="http://srfi.schemers.org/srfi-33/">http://srfi.schemers.org/srfi-33/</a>
-</TR>
-
-<TR>
-<TD><a name="SRFI39">[SRFI 39]</a>
-<TD>Marc Feeley: Parameter objects.
-<a href="http://srfi.schemers.org/srfi-39/">http://srfi.schemers.org/srfi-39/</a>
-</TR>
-
-<TR>
-<TD><a name="SRFI40">[SRFI 40]</a>
-<TD>Philip L. Bewig: A Library of Streams.
-<a href="http://srfi.schemers.org/srfi-40/">http://srfi.schemers.org/srfi-40/</a>
-</TR>
-
-<TR>
-<TD><a name="Eli">[Eli]</a>
-<TD>Eli Barzilay: Documentation for "misc.ss". 2002.
-<a href="http://www.cs.cornell.edu/eli/Swindle/misc-doc.html#collect">http://www.cs.cornell.edu/eli/Swindle/misc-doc.html#collect</a>
-</TR>
-
-<TR>
-<TD><a name=Folds>[Folds]</a>
-<TD>John David Stone: Folds and reductions.
-Posting in relation to <a href="#SRFI1">[SRFI 1]</a> on 8-Jan-1999.
-<a href="http://srfi.schemers.org/srfi-1/mail-archive/msg00021.html">http://srfi.schemers.org/srfi-1/mail-archive/msg00021.html</a>
-</TR>
-
-<TR>
-<TD><a name="Haskell">[Haskell]</a>
-<TD>Simon L. Peyton Jones, John Hughes: The Haskell 98 Report 1 February 1999.
-Section 3.11 "List Comprehensions".
-<a href="http://www.haskell.org/onlinereport/exps.html#sect3.11">http://www.haskell.org/onlinereport/exps.html#sect3.11</a>
-</TR>
-
-<TR>
-<TD><a name="Python">[Python]</a>
-<TD>Guido van Rossum, Fred L. Drake Jr. (eds.):
-Python Reference Manual.
-Section 5.2.4 "List displays".
-Release 2.2, December 21, 2001.
-<a href="http://python.org/doc/2.2/ref/lists.html">http://python.org/doc/2.2/ref/lists.html</a>
-</TR>
-
-<TR>
-<TD><a name="SICP">[SICP]</a>
-<TD>Harold Abelson, Gerald J. Sussman, Julie Sussman:
-Structure and Interpretation of Computer Programs.
-MIT Press, 1985.
-<a href="http://mitpress.mit.edu/sicp/">http://mitpress.mit.edu/sicp/</a>
-</TR>
-
-<TR>
-<TD><a name="IFPL">[IFPL]</a>
-<TD>Philip Wadler: List Comprehensions (Chapter 7). In:
-Simon L. Peyton Jones: The Implementation of Functional Programming Languages.
-Prentice Hall, 1987.
-</TR>
-
-<TR>
-<TD><a name="Scheme48">[Scheme48]</a>
-<TD>Richard Kelsey, Jonathan Rees: Scheme48 Release 0.57 (July 15, 2001).
-<a href="http://s48.org/">http://s48.org/</a>
-</TR>
-
-<TR>
-<TD><a name="SCM">[SCM]</a>
-<TD>Aubrey Jaffer: SCM Scheme Implementation. Version 5d7 (November 27, 2002).
-<a href="http://www.swiss.ai.mit.edu/~jaffer/SCM.html">http://www.swiss.ai.mit.edu/~jaffer/SCM.html</a>
-</TR>
-
-<TR>
-<TD><a name="PLT">[PLT]</a>
-<TD>PLT People: PLT Scheme, DrScheme Version 203.
-<a href="http://www.plt-scheme.org/">http://www.plt-scheme.org/</a>
-</TR>
-
-<TR>
-<TD><a name="SCSH">[Scsh]</a>
-<TD>Olin Shivers, Brian D. Carlstrom, Martin Gasbichler, Mike Sperber:
-Scsh Reference Manual.
-For scsh release 0.6.3.
-<a href="http://scsh.net/">http://scsh.net/</a>
-</TR>
-
-
-</TABLE>
-
-
-
-<H1>Copyright</H1>
-<p>Copyright (C) Sebastian Egner (2003). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-
-    <hr>
-    <address>Author: <a href="mailto:sebastian.egner@philips.com">Sebastian Egner</a></address>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Francisco Solsona</a></address>
-<!-- Created: Tue Feb 4 13:21:00 MST 2003 -->
-<!-- hhmts start -->
-Last modified: Tue Apr  5 10:43:00 CEST 2005
-<!-- hhmts end -->
-
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-43.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-43.html
deleted file mode 100644
index 7ca1cd3536..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-43.html
+++ /dev/null
@@ -1,2011 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  <head>
-    <!-- Non-indentation necessary for the commit check junk. -->
-<title>SRFI 43: Vector Library</title>
-    <meta http-equiv="Content-type"
-          content="text/html; charset=iso-8859-1">
-    <style type="text/css">
-      /* <![CDATA[ */
-      body {
-        padding-right: 5%;
-      }
-
-      h2 {
-        padding-left: 6%;
-      }
-
-      /* Ugly hack to make the header work right */
-      h1.nonheader {
-        padding-left: 8.5%;
-      }
-
-      h1 {
-        margin-left: -4.5%;
-      }
-
-      div.header {
-        padding-left: 8%;
-      }
-
-      p, dl, code.indented {
-        padding-left: 8%;
-      }
-
-      ul.outer, dl.indented {
-        padding-left: 13%;
-      }
-
-      ul.indented {
-        padding-left: 18%;
-      }
-
-      dt.ref {
-        font-weight: bold;
-      }
-
-      dt.ref:before {
-        content: "[";
-      }
-      dt.ref:after {
-        content: "]";
-      }
-
-      dt.proc-index {
-        padding-left: 0.5%;
-        font-size: medium;
-        font-weight: bold;
-      }
-
-      dt.type-spec {
-        font-family: monospace;
-        font-style: italic;
-      }
-
-      dt.proc-spec {
-        font-family: monospace;
-      }
-
-      code.example-call {
-        padding-left: 3%;
-      }
-      code.example-value {
-        padding-left: 8%;
-      }
-      code.example-value:before {
-        content: "=> "
-      }
-      /* ]]> */
-    </style>
-  </head>
-  <body>
-
-    <div class="header">
-<!--
-     Special SRFI header, formatted oddly due to the commit check script
-     for SRFI CVS.
-  -->
-<H1>Title</H1>
-Vector library
-
-<H1>Author</H1>
-Taylor Campbell
-
-<H1>Status</H1>
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion via <A HREF="http://srfi.schemers.org/srfi-43/mail-archive/maillist.html">the archive of the mailing list</A>.
-<UL>
-<LI>Received: 2003/03/26
-<LI>Draft: 2003/04/03-2003/06/01
-<LI>Revised: 2003/07/15
-<LI>Revised: 2003/11/01
-<LI>Revised: 2004/04/10
-<LI>Revised: 2004/04/28
-<LI>Revised: 2004/08/30
-<LI>Final:   2004/10/26
-</UL>
-<!--
-     End special header.
-  -->
-    </div>
-
-    <h1 class="nonheader">Table of Contents</h1>
-    <ul class="outer">
-      <li>1. <a href="#Abstract">Abstract</a></li>
-      <li>2. <a href="#Rationale">Rationale</a></li>
-      <li>3. <a href="#ProcIndex">Procedure Index</a></li>
-      <li>
-        4. <a href="#Procs">Procedures</a>
-        <ul>
-          <li>4.1. <a href="#Constructors">Constructors</a></li>
-          <li>4.2. <a href="#Predicates">Predicates</a></li>
-          <li>4.3. <a href="#Selectors">Selectors</a></li>
-          <li>4.4. <a href="#Iteration">Iteration</a></li>
-          <li>4.5. <a href="#Searching">Searching</a></li>
-          <li>4.6. <a href="#Mutators">Mutators</a></li>
-          <li>4.7. <a href="#Conversion">Conversion</a></li>
-        </ul>
-      </li>
-      <li>5. <a href="#RefImpl">Reference Implementation</a></li>
-      <li>6. <a href="#Acknowledgements">Acknowledgements</a></li>
-      <li>7. <a href="#References">References</a></li>
-      <li>8. <a href="#Copyright">Copyright</a></li>
-    </ul>
-
-    <h1 class="nonheader"><a name="Abstract">1. Abstract</a></h1>
-    <p>
-      This <a href="#SRFI">SRFI</a> proposes a comprehensive and
-      complete library of vector operations accompanied by a freely
-      available and complete reference implementation.  The reference
-      implementation is unencumbered by copyright, and useable with no
-      modifications on any Scheme system that is
-      <a href="#R5RS">R5RS</a>-compliant.  It also provides several
-      hooks for implementation-specific optimization as well.
-    </p>
-
-    <p>
-      Because this SRFI is more of a library or module specification
-      than a request for additions to readers or any other internal
-      implementation detail, in an implementation that supports a
-      module or structure or package or library or unit (et cetera)
-      systems, these procedures should be contained in a module /
-      structure / package / library / unit called <tt>vector-lib</tt>.
-    </p>
-
-    <h1 class="nonheader"><a name="Rationale">2. Rationale</a></h1>
-    <p>
-      <a href="#R5RS">R5RS</a> provides very few list-processing
-      procedures, for which reason <a href="#SRFI-1">SRFI 1
-      (<tt>list-lib</tt>)</a> exists.  However,
-      <a href="#R5RS">R5RS</a> provides even fewer vector operations
-      &mdash; while it provides mapping, appending, et cetera
-      operations for lists, it specifies only nine vector manipulation
-      operations &mdash;:
-    </p>
-
-    <ul class="indented">
-      <li><tt><a href="#vector-p">vector?</a></tt></li>
-      <li><tt><a href="#make-vector">make-vector</a></tt></li>
-      <li><tt><a href="#vector">vector</a></tt></li>
-      <li><tt><a href="#vector-length">vector-length</a></tt></li>
-      <li><tt><a href="#vector-ref">vector-ref</a></tt></li>
-      <li><tt><a href="#vector-set-bang">vector-set!</a></tt></li>
-      <li><tt><a href="#vector-to-list">vector-&gt;list</a></tt></li>
-      <li><tt><a href="#list-to-vector">list-&gt;vector</a></tt></li>
-      <li><tt><a href="#vector-fill-bang">vector-fill!</a></tt></li>
-    </ul>
-
-    <p>
-      Many Scheme implementations provide several vector operations
-      beyond the minuscule set that R5RS defines (the typical
-      <tt><a href="#vector-append">vector-append</a></tt>,
-      <tt><a href="#vector-map">vector-map</a></tt>, et cetera), but
-      often these procedures have different names, take arguments in
-      different orders, don't take the same number of arguments, or
-      have some other flaw that makes them unportable.  For this
-      reason, this SRFI is proposed.
-    </p>
-
-    <p>
-      It should be noted that no vector sorting procedures are provided
-      by this SRFI, because there already is a SRFI for such a purpose
-      (<a href="#SRFI-32">SRFI 32 (<tt>sort-lib</tt>)</a>), which
-      includes routines for sorting not only vectors but also lists.
-    </p>
-
-    <h1 class="nonheader">
-      <a name="ProcIndex">3. Procedure Index</a>
-    </h1>
-    <p>
-      Here is an index of the procedures provided by this package.
-      Those marked by <b>bold</b> are provided in
-      <a href="#R5RS">R5RS</a> and those marked by <b><i>bold
-      italic</i></b> are defined by <a href="#R5RS">R5RS</a> but are
-      modified from their original definitions.
-    </p>
-    <dl>
-      <dt class="proc-index">
-        &middot;&nbsp;<a href="#Constructors">Constructors</a>
-        <br>
-        <br>
-      </dt>
-      <dd>
-        <code>
-          <b><a href="#make-vector">make-vector</a></b>
-          <b><a href="#vector">vector</a></b>
-          <br>
-          <a href="#vector-tabulate">vector-unfold</a>
-          <a href="#vector-unfold-right">vector-unfold-right</a>
-          <br>
-          <a href="#vector-copy">vector-copy</a>
-          <a href="#vector-reverse-copy">vector-reverse-copy</a>
-          <br>
-          <a href="#vector-append">vector-append</a>
-          <a href="#vector-concatenate">vector-concatenate</a>
-          <br>
-          <br>
-        </code>
-      </dd>
-
-      <dt class="proc-index">
-        &middot;&nbsp;<a href="#Predicates">Predicates</a>
-        <br>
-        <br>
-      </dt>
-      <dd>
-        <code>
-          <b><a href="#vector-p">vector?</a></b>
-          <br>
-          <a href="#vector-empty-p">vector-empty?</a>
-          <br>
-          <a href="#vector-eq">vector=</a>
-          <br>
-          <br>
-        </code>
-      </dd>
-
-      <dt class="proc-index">
-        &middot;&nbsp;<a href="#Selectors">Selectors</a>
-        <br>
-        <br>
-      </dt>
-      <dd>
-        <code>
-          <b><a href="#vector-ref">vector-ref</a></b>
-          <br>
-          <b><a href="#vector-length">vector-length</a></b>
-          <br>
-          <br>
-        </code>
-      </dd>
-
-      <dt class="proc-index">
-        &middot;&nbsp;<a href="#Iteration">Iteration</a>
-        <br>
-        <br>
-      </dt>
-      <dd>
-        <code>
-          <a href="#vector-fold">vector-fold</a>
-          <a href="#vector-fold-right">vector-fold-right</a>
-          <br>
-          <a href="#vector-map">vector-map</a>
-          <a href="#vector-map-bang">vector-map!</a>
-          <br>
-          <a href="#vector-for-each">vector-for-each</a>
-          <br>
-          <a href="#vector-count">vector-count</a>
-          <br>
-          <br>
-        </code>
-      </dd>
-
-      <dt class="proc-index">
-        &middot;&nbsp;<a href="#Searching">Searching</a>
-        <br>
-        <br>
-      </dt>
-      <dd>
-        <code>
-          <a href="#vector-index">vector-index</a>
-          <a href="#vector-index-right">vector-index-right</a>
-          <br>
-          <a href="#vector-skip">vector-skip</a>
-          <a href="#vector-skip-right">vector-skip-right</a>
-          <br>
-          <a href="#vector-binary-search">vector-binary-search</a>
-          <br>
-          <a href="#vector-any">vector-any</a>
-          <a href="#vector-every">vector-every</a>
-          <br>
-          <br>
-        </code>
-      </dd>
-
-      <dt class="proc-index">
-        &middot;&nbsp;<a href="#Mutators">Mutators</a>
-        <br>
-        <br>
-      </dt>
-      <dd>
-        <code>
-          <b><a href="#vector-set-bang">vector-set!</a></b>
-          <a href="#vector-swap-bang">vector-swap!</a>
-          <br>
-          <b><i><a href="#vector-fill-bang">vector-fill!</a></i></b>
-          <br>
-          <a href="#vector-reverse-bang">vector-reverse!</a>
-          <br>
-          <a href="#vector-copy-bang">vector-copy!</a>
-          <a href="#vector-reverse-copy-bang">vector-reverse-copy!</a>
-          <br>
-          <br>
-        </code>
-      </dd>
-
-      <dt class="proc-index">
-        &middot;&nbsp;<a href="#Conversion">Conversion</a>
-        <br>
-        <br>
-      </dt>
-      <dd>
-        <code>
-          <b><i><a href="#vector-to-list">vector-&gt;list</a></i></b>
-          <a href="#reverse-vector-to-list">reverse-vector-&gt;list</a>
-          <br>
-          <b><i><a href="#list-to-vector">list-&gt;vector</a></i></b>
-          <a href="#reverse-list-to-vector">reverse-list-&gt;vector</a>
-        </code>
-      </dd>
-    </dl>
-
-    <h1 class="nonheader"><a name="Procs">4. Procedures</a></h1>
-    <p>
-      In this section containing specifications of procedures, the
-      following notation is used to specify parameters and return
-      values:
-    </p>
-    <dl class="indented">
-      <dt class="type-spec">
-        (f arg<sub>1</sub> arg<sub>2</sub> &middot;&middot;&middot;)
-        -&gt; something</dt>
-      <dd>
-        Indicates a function <tt><i>f</i></tt> takes the parameters
-        <tt><i>arg<sub>1</sub> arg<sub>2</sub>
-        &middot;&middot;&middot;</i></tt> and returns a value of the
-        type <tt><i>something</i></tt>.  If <tt><i>something</i></tt>
-        is <tt>unspecified</tt>, then what <tt><i>f</i></tt> returns is
-        implementation-dependant; this SRFI does not specify what it
-        returns, and in order to write portable code, the return value
-        should be ignored.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="type-spec">vec</dt>
-      <dd>
-        The argument in this place must be a vector, i.e. it must
-        satisfy the predicate
-        <tt><a href="#vector-p">vector?</a></tt>.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="type-spec">i, j, start, size</dt>
-      <dd>
-        The argument in this place must be a nonnegative integer, i.e.
-        it must satisfy the predicates <tt>integer?</tt> and either
-        <tt>zero?</tt> or <tt>positive?</tt>.  The third case of it
-        indicates the index at which traversal begins; the fourth case
-        of it indicates the size of a vector.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="type-spec">end</dt>
-      <dd>
-        The argument in this place must be a positive integer, i.e. it
-        must satisfy the predicates <tt>integer?</tt> and
-        <tt>positive?</tt>.  This indicates the index directly before
-        which traversal will stop &mdash; processing will occur until
-        the index of the vector is <tt><i>end</i></tt>.  It is the
-        closed right side of a range.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="type-spec">f</dt>
-      <dd>
-        The argument in this place must be a function of one or more
-        arguments, returning exactly one value.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="type-spec">pred?</dt>
-      <dd>
-        The argument in this place must be a function of one or more
-        arguments that returns one value, which is treated as a
-        boolean.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="type-spec">
-        x, y, z, seed, knil, fill, key, value
-      </dt>
-      <dd>
-        The argument in this place may be any Scheme value.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="type-spec">[something]</dt>
-      <dd>
-        Indicates that <tt><i>something</i></tt> is an optional
-        argument; it needn't necessarily be applied.
-        <tt><i>Something</i></tt> needn't necessarily be one thing; for
-        example, this usage of it is perfectly valid:
-        <br>
-        <br>
-        <code>
-          &nbsp;&nbsp;&nbsp;[start [end]]
-        </code>
-        <br>
-        <br>
-        and is indeed used quite often.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="type-spec">something &middot;&middot;&middot;</dt>
-      <dd>
-        Indicates that zero or more <tt><i>something</i></tt>s are
-        allowed to be arguments.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="type-spec">
-        something<sub>1</sub> something<sub>2</sub>
-        &middot;&middot;&middot;
-      </dt>
-      <dd>
-        Indicates that at least one <tt><i>something</i></tt> must be
-        arguments.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="type-spec">
-        something<sub>1</sub> something<sub>2</sub>
-        &middot;&middot;&middot;
-        something<sub>n</sub>
-      </dt>
-      <dd>
-        Exactly equivalent to the previous argument notation, but this
-        also indicates that <tt><i>n</i></tt> will be used later in the
-        procedure description.
-        <br>
-        <br>
-      </dd>
-    </dl>
-
-    <p>
-      It should be noted that all of the procedures that iterate across
-      multiple vectors in parallel stop iterating and produce the final
-      result when the end of the shortest vector is reached.  The sole
-      exception is <tt><a href="#vector-eq">vector=</a></tt>, which
-      automatically returns <tt>#f</tt> if the vectors' lengths vary.
-    <p>
-
-    <h2><a name="Constructors">4.1. Constructors</a></h2>
-    <dl>
-      <dt class="proc-spec">
-        <a name="make-vector">
-          (make-vector <i>size</i> [<i>fill</i>])
-          -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        [<a href="#R5RS"><i>R5RS</i></a>] Creates and returns a vector
-        of size <tt><i>size</i></tt>, optionally filling it with
-        <tt><i>fill</i></tt>.  The default value of
-        <tt><i>fill</i></tt> is unspecified.
-        <br>
-        <br>
-        Example:
-        <br>
-        <br>
-        <code class="example-call">
-          (make-vector 5 3)
-        </code>
-        <br>
-        <code class="example-value">
-          #(3 3 3 3 3)
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector">
-          (vector <i>x &middot;&middot;&middot;</i>)
-          -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        [<a href="#R5RS"><i>R5RS</i></a>] Creates and returns a vector
-        whose elements are <tt><i>x &middot;&middot;&middot;</i></tt>.
-        <br>
-        <br>
-        Example:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector 0 1 2 3 4)
-        </code>
-        <br>
-        <code class="example-value">
-          #(0 1 2 3 4)
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-unfold">
-          (vector-unfold <i>f length initial-seed
-                            &middot;&middot;&middot;</i>)
-          -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        The fundamental vector constructor.  Creates a vector whose
-        length is <tt><i>length</i></tt> and iterates across each index
-        <tt><i>k</i></tt> between <tt>0</tt> and
-        <tt><i>length</i></tt>, applying <tt><i>f</i></tt> at each
-        iteration to the current index and current seeds, in that
-        order, to receive <tt><i>n</i> + 1</tt> values: first, the
-        element to put in the <tt><i>k</i></tt>th slot of the new
-        vector and <tt><i>n</i></tt> new seeds for the next iteration.
-        It is an error for the number of seeds to vary between
-        iterations.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-unfold (&lambda; (i x) (values x (- x 1)))
-          <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                         10 0)
-        </code>
-        <br>
-        <code class="example-value">
-          #(0 -1 -2 -3 -4 -5 -6 -7 -8 -9)
-        </code>
-        <br>
-        <br>
-        Construct a vector of the sequence of integers in the range
-        [0,<tt><i>n</i></tt>).
-        <br>
-        <code class="example-call">
-          (vector-unfold values <tt><i>n</i></tt>)
-        </code>
-        <br>
-        <code class="example-value">
-          #(0 1 2 &middot;&middot;&middot; <i>n-2</i> <i>n-1</i>)
-        </code>
-        <br>
-        <br>
-        Copy <tt><i>vector</i></tt>.
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-unfold (&lambda; (i) (vector-ref <i>vector</i> i))
-          <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                         (vector-length <i>vector</i>))
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-unfold-right">
-          (vector-unfold-right <i>f length initial-seed
-                                  &middot;&middot;&middot;</i>)
-          -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        Like <tt><a href="#vector-unfold">vector-unfold</a></tt>, but
-        it uses <tt><i>f</i></tt> to generate elements from
-        right-to-left, rather than left-to-right.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        Construct a vector in reverse of the integers in the range
-        [0,<tt><i>n</i></tt>).
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-unfold-right (&lambda; (i x) (values x (+ x 1))) <i>n</i> 0)
-        </code>
-        <br>
-        <code class="example-value">
-          #(<i>n-1</i> <i>n-2</i> &middot;&middot;&middot; 2 1 0)
-        </code>
-        <br>
-        <br>
-        Reverse <tt><i>vector</i></tt>.
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-unfold-right (&lambda; (i x)
-                                 (values (vector-ref <i>vector</i> x)
-                                         (+ x 1)))
-          <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                               (vector-length <i>vector</i>)
-          <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                               0)
-        </code>
-        <br>
-        <br>
-      </dd>
-
-<!-- VECTOR-TABULATE has been flushed in favour of VECTOR-UNFOLD.
-      <dt class="proc-spec">
-        <a name="vector-tabulate">
-          (vector-tabulate <i>f size</i>)
-          -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        Creates a new vector whose size is <tt><i>size</i></tt> and
-        fills it by applying <tt><i>f</i></tt> to each index in the
-        vector, in an unspecified order.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-tabulate - 5)
-        </code>
-        <br>
-        <code class="example-value">
-          #(0 -1 -2 -3 -4)
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-tabulate (&lambda; (x) (* x x)) 5)
-        </code>
-        <br>
-        <code class="example-value">
-          #(0 1 4 9 16)
-        </code>
-        <br>
-        <br>
-      </dd>
--->
-
-      <dt class="proc-spec">
-        <a name="vector-copy">
-          (vector-copy <i>vec</i>
-                       [<i>start</i> [<i>end</i> [<i>fill</i>]]])
-          -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        Allocates a new vector whose length is <tt><i>end</i> -
-        <i>start</i></tt> and fills it with elements from
-        <tt><i>vec</i></tt>, taking elements from <tt><i>vec</i></tt>
-        starting at index <tt><i>start</i></tt> and stopping at index
-        <tt><i>end</i></tt>.  <tt><i>start</i></tt> defaults to
-        <tt>0</tt> and <tt><i>end</i></tt> defaults to the value of
-        <tt>(<a href="#vector-length">vector-length</a>
-        <i>vec</i>)</tt>.  If <tt><i>end</i></tt> extends beyond the
-        length of <tt><i>vec</i></tt>, the slots in the new vector that
-        obviously cannot be filled by elements from <tt><i>vec</i></tt>
-        are filled with <tt><i>fill</i></tt>, whose default value is
-        unspecified.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-copy '#(a b c d e f g h i))
-        </code>
-        <br>
-        <code class="example-value">
-          #(a b c d e f g h i)
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-copy '#(a b c d e f g h i) 6)
-        </code>
-        <br>
-        <code class="example-value">
-          #(g h i)
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-copy '#(a b c d e f g h i) 3 6)
-        </code>
-        <br>
-        <code class="example-value">
-          #(d e f)
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-copy '#(a b c d e f g h i) 6 12 'x)
-        </code>
-        <br>
-        <code class="example-value">
-          #(g h i x x x)
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-reverse-copy">
-          (vector-reverse-copy <i>vec</i>
-                               [<i>start</i> [<i>end</i>]])
-          -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        Like <tt><a href="#vector-copy">vector-copy</a></tt>, but it
-        copies the elements in the reverse order from
-        <tt><i>vec</i></tt>.
-        <br>
-        <br>
-        Example:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-reverse-copy '#(5 4 3 2 1 0) 1 5)
-        </code>
-        <br>
-        <code class="example-value">
-          #(1 2 3 4)
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-append">
-          (vector-append <i>vec &middot;&middot;&middot;</i>)
-          -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        Returns a newly allocated vector that contains all elements in
-        order from the subsequent locations in <tt><i>vec
-        &middot;&middot;&middot;</i></tt>.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-append '#(x) '#(y))
-        </code>
-        <br>
-        <code class="example-value">
-          #(x y)
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-append '#(a) '#(b c d))
-        </code>
-        <br>
-        <code class="example-value">
-          #(a b c d)
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-append '#(a #(b)) '#(#(c)))
-        </code>
-        <br>
-        <code class="example-value">
-          #(a #(b) #(c))
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-concatenate">
-          (vector-concatenate <i>list-of-vectors</i>)
-          -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        Appends each vector in <tt><i>list-of-vectors</i></tt>.  This
-        is equivalent to:
-        <br>
-        <br>
-        <code class="indented">
-          (apply <a href="#vector-append">vector-append</a>
-                 <i>list-of-vectors</i>)
-        </code>
-        <br>
-        <br>
-        However, it may be implemented better.
-        <br>
-        <br>
-        Example:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-concatenate '(#(a b) #(c d)))
-        </code>
-        <br>
-        <code class="example-value">
-          #(a b c d)
-        </code>
-        <br>
-        <br>
-      </dd>
-    </dl>
-
-    <h2><a name="Predicates">4.2. Predicates</a></h2>
-    <dl>
-      <dt class="proc-spec">
-        <a name="vector-p">
-          (vector? <i>x</i>)
-          -&gt; boolean
-        </a>
-      </dt>
-      <dd>
-        [<a href="#R5RS"><i>R5RS</i></a>] Disjoint type predicate for
-        vectors: this returns <tt>#t</tt> if <tt><i>x</i></tt> is a
-        vector, and <tt>#f</tt> if otherwise.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector? '#(a b c))
-        </code>
-        <br>
-        <code class="example-value">
-          #t
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector? '(a b c))
-        </code>
-        <br>
-        <code class="example-value">
-          #f
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector? #t)
-        </code>
-        <br>
-        <code class="example-value">
-          #f
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector? '#())
-        </code>
-        <br>
-        <code class="example-value">
-          #t
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector? '())
-        </code>
-        <br>
-        <code class="example-value">
-          #f
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-empty-p">
-          (vector-empty? <i>vec</i>)
-          -&gt; boolean
-        </a>
-      </dt>
-      <dd>
-        Returns <tt>#t</tt> if <tt><i>vec</i></tt> is empty, i.e. its
-        length is <tt>0</tt>, and <tt>#f</tt> if not.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-empty? '#(a))
-        </code>
-        <br>
-        <code class="example-value">
-          #f
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-empty? '#(()))
-        </code>
-        <br>
-        <code class="example-value">
-          #f
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-empty? '#(#()))
-        </code>
-        <br>
-        <code class="example-value">
-          #f
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-empty? '#())
-        </code>
-        <br>
-        <code class="example-value">
-          #t
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-eq">
-          (vector= <i>elt=? vec &middot;&middot;&middot;</i>)
-          -&gt; boolean
-        </a>
-      </dt>
-      <dd>
-        Vector structure comparator, generalized across user-specified
-        element comparators.  Vectors <tt><i>a</i></tt> and
-        <tt><i>b</i></tt> are considered equal by <tt>vector=</tt> iff
-        their lengths are the same, and for each respective elements
-        <tt><i>E</i><sub>a</sub></tt> and
-        <tt><i>E</i><sub>b</sub></tt>, <tt>(<i>elt=? E</i><sub>a</sub>
-        <i>E</i><sub>b</sub>)</tt> returns a true value.
-        <tt><i>Elt=?</i></tt> is always applied to two arguments.
-        Element comparison must be consistent with <tt>eq</tt>; that
-        is, if <tt>(eq? <i>E</i><sub>a</sub> <i>E</i><sub>b</sub>)</tt>
-        results in a true value, then <tt>(<i>elt=? E</i><sub>a</sub>
-        <i>E</i><sub>b</sub>)</tt> must also result in a true value.
-        This may be exploited to avoid unnecessary element comparisons.
-        (The reference implementation does, but it does not consider
-        the situation where <tt><i>elt=?</i></tt> is in fact itself
-        <tt>eq?</tt> to avoid yet more unnecessary comparisons.)
-        <br>
-        <br>
-        If there are only zero or one vector arguments, <tt>#t</tt> is
-        automatically returned.  The dynamic order in which comparisons
-        of elements and of vectors are performed is left completely
-        unspecified; do not rely on a particular order.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector= eq? '#(a b c d) '#(a b c d))
-        </code>
-        <br>
-        <code class="example-value">
-          #t
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector= eq? '#(a b c d) '#(a b d c))
-        </code>
-        <br>
-        <code class="example-value">
-          #f
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector= = '#(1 2 3 4 5) '#(1 2 3 4))
-        </code>
-        <br>
-        <code class="example-value">
-          #f
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector= = '#(1 2 3 4) '#(1 2 3 4))
-        </code>
-        <br>
-        <code class="example-value">
-          #t
-        </code>
-        <br>
-        <br>
-        The two trivial cases.
-        <br>
-        <br>
-        <code class="example-call">
-          (vector= eq?)
-        </code>
-        <br>
-        <code class="example-value">
-          #t
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector= eq? '#(a))
-        </code>
-        <br>
-        <code class="example-value">
-          #t
-        </code>
-        <br>
-        <br>
-        Note the fact that we don't use vector literals in the next two
-        &mdash; it is unspecified whether or not literal vectors with
-        the same external representation are <tt>eq?</tt>.
-        <br>
-        <br>
-        <code class="example-call">
-          (vector= eq? (vector (vector 'a)) (vector (vector 'a)))
-        </code>
-        <br>
-        <code class="example-value">
-          #f
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector= equal? (vector (vector 'a)) (vector (vector 'a)))
-        </code>
-        <br>
-        <code class="example-value">
-          #t
-        </code>
-        <br>
-        <br>
-      </dd>
-    </dl>
-
-    <h2><a name="Selectors">4.3. Selectors</a></h2>
-    <dl>
-      <dt class="proc-spec">
-        <a name="vector-ref">
-          (vector-ref <i>vec i</i>)
-          -&gt; value
-        </a>
-      </dt>
-      <dd>
-        [<a href="#R5RS"><i>R5RS</i></a>] Vector element dereferencing:
-        returns the value that the location in <tt><i>vec</i></tt> at
-        <tt><i>i</i></tt> is mapped to in the store.  Indexing is based
-        on zero.  <tt><i>I</i></tt> must be within the range [0,
-        <tt>(<a href="#vector-length">vector-length</a>
-             <i>vec</i>)</tt>).
-        <br>
-        <br>
-        Example:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-ref '#(a b c d) 2)
-        </code>
-        <br>
-        <code class="example-value">
-          c
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-length">
-          (vector-length <i>vec</i>)
-          -&gt; exact nonnegative integer
-        </a>
-      </dt>
-      <dd>
-        [<a href="#R5RS"><i>R5RS</i></a>] Returns the length of <tt><i>vec</i></tt>, the number of
-        locations reachable from <tt><i>vec</i></tt>.  (The careful
-        word 'reachable' is used to allow for 'vector slices,' whereby
-        <tt><i>vec</i></tt> refers to a larger vector that contains
-        more locations that are unreachable from <tt><i>vec</i></tt>.
-        This SRFI does not define vector slices, but later SRFIs may.)
-        <br>
-        <br>
-        Example:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-length '#(a b c))
-        </code>
-        <br>
-        <code class="example-value">
-          3
-        </code>
-        <br>
-        <br>
-      </dd>
-    </dl>
-
-    <h2><a name="Iteration">4.4. Iteration</a></h2>
-    <dl>
-      <dt class="proc-spec">
-        <a name="vector-fold">
-          (vector-fold <i>kons knil vec<sub>1</sub> vec<sub>2</sub>
-                          &middot;&middot;&middot;</i>)
-          -&gt; value
-        </a>
-      </dt>
-      <dd>
-        The fundamental vector iterator.  <tt><i>Kons</i></tt> is
-        iterated over each index in all of the vectors, stopping at the
-        end of the shortest; <tt><i>kons</i></tt> is applied as
-        <tt>
-          (<i>kons</i> <i>i</i> <i>state</i>
-            (<a href="#vector-ref">vector-ref</a>
-             <i>vec<sub>1</sub></i> <i>i</i>)
-            (<a href="#vector-ref">vector-ref</a>
-             <i>vec<sub>2</sub></i> <i>i</i>)
-            &middot;&middot;&middot;)
-        </tt>
-        where <tt><i>state</i></tt> is the current state value &mdash;
-        the current state value begins with <tt><i>knil</i></tt>, and
-        becomes whatever <tt><i>kons</i></tt> returned at the
-        respective iteration &mdash;, and <tt><i>i</i></tt> is the
-        current index.
-        <br>
-        <br>
-        The iteration is strictly left-to-right.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        Find the longest string's length in
-        <tt><i>vector-of-strings</i></tt>.
-        <br>
-        <code class="example-call">
-          (vector-fold (&lambda; (index len str)
-                         (max (string-length str) len))
-          <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;
-                       0 <i>vector-of-strings</i>)
-        </code>
-        <br>
-        <br>
-        Produce a list of the reversed elements of
-        <tt><i>vec</i></tt>.
-        <br>
-        <code class="example-call">
-          (vector-fold (&lambda; (index tail elt) (cons elt tail))
-          <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;
-                       '() <i>vec</i>)
-        </code>
-        <br>
-        <br>
-        Count the number of even numbers in <tt><i>vec</i></tt>.
-        <br>
-        <code class="example-call">
-          (vector-fold (&lambda; (index counter n)
-          <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                         (if (even? n) (+ counter 1) counter))
-          <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;
-                       0 <i>vec</i>)
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-fold-right">
-          (vector-fold-right <i>kons knil
-                                vec<sub>1</sub> vec<sub>2</sub>
-                                &middot;&middot;&middot;</i>)
-          -&gt; value
-        </a>
-      </dt>
-      <dd>
-        Similar to <tt><a href="#vector-fold">vector-fold</a></tt>, but
-        it iterates right to left instead of left to right.
-        <br>
-        <br>
-        Example:
-        <br>
-        <br>
-        Convert a vector to a list.
-        <br>
-        <code class="example-call">
-          (vector-fold-right (&lambda; (index tail elt)
-                               (cons elt tail))
-          <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                             '() '#(a b c d))
-        </code>
-        <br>
-        <code class="example-value">
-          (a b c d)
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-map">
-          (vector-map <i>f vec<sub>1</sub> vec<sub>2</sub>
-                         &middot;&middot;&middot;</i>)
-          -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        Constructs a new vector of the shortest size of the vector
-        arguments.  Each element at index <tt><i>i</i></tt> of the new
-        vector is mapped from the old vectors by
-        <tt>(<i>f</i> <i>i</i>
-             (<a href="#vector-ref">vector-ref</a>
-              <i>vec<sub>1</sub></i>
-              <i>i</i>)
-             (<a href="#vector-ref">vector-ref</a>
-              <i>vec<sub>2</sub></i>
-              <i>i</i>)
-             &middot;&middot;&middot;)</tt>.
-        The dynamic order of application of <tt><i>f</i></tt> is
-        unspecified.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-map (&lambda; (i x) (* x x))
-          <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;
-                      (<a href="#vector-unfold">vector-unfold</a>
-                       (&lambda; (i x) (values x (+ x 1)))
-                       4 1))
-        </code>
-        <br>
-        <code class="example-value">
-          #(1 4 9 16)
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-map (&lambda; (i x y) (* x y))<br>
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;(<a href="#vector-unfold">vector-unfold</a>
-                             (&lambda; (i x) (values x (+ x 1)))
-                             5 1)<br>
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;(<a href="#vector-unfold">vector-unfold</a>
-                             (&lambda; (i x) (values x (- x 1)))
-                             5 5))
-        </code>
-        <br>
-        <code class="example-value">
-          #(5 8 9 8 5)
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (let ((count 0))
-        </code>
-        <br>
-        <code class="example-call">
-          &nbsp;&nbsp;
-          (vector-map (&lambda; (ignored-index ignored-elt)
-        </code>
-        <br>
-        <code class="example-call">
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          (set! count (+ count 1))
-        </code>
-        <br>
-        <code class="example-call">
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          count)
-        </code>
-        <br>
-        <code class="example-call">
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;
-          '#(a b)))
-        </code>
-        <br>
-        <code class="example-value">
-          #(1 2) <i>OR</i> #(2 1)
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-map (&lambda; (i elt) (+ i elt)) '#(1 2 3 4))
-        </code>
-        <br>
-        <code class="example-value">
-          #(1 3 5 7)
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-map-bang">
-          (vector-map! <i>f vec<sub>1</sub> vec<sub>2</sub>
-                          &middot;&middot;&middot;</i>)
-          -&gt; unspecified
-        </a>
-      </dt>
-      <dd>
-        Similar to <tt><a href="#vector-map">vector-map</a></tt>, but
-        rather than mapping the new elements into a new vector, the new
-        mapped elements are destructively inserted into
-        <tt><i>vec<sub>1</sub></i></tt>.  Again, the dynamic order of
-        application of <tt><i>f</i></tt> unspecified, so it is
-        dangerous for <tt><i>f</i></tt> to apply either
-        <tt><a href="#vector-ref">vector-ref</a></tt> or
-        <tt><a href="#vector-set-bang">vector-set!</a></tt> to
-        <tt><i>vec<sub>1</sub></i></tt> in <tt><i>f</i></tt>.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-for-each">
-          (vector-for-each <i>f vec<sub>1</sub> vec<sub>2</sub>
-                              &middot;&middot;&middot;</i>)
-          -&gt; unspecified
-        </a>
-      </dt>
-      <dd>
-        Simple vector iterator: applies <tt><i>f</i></tt> to each index
-        in the range [0, <tt><i>length</i></tt>), where
-        <tt><i>length</i></tt> is the length of the smallest vector
-        argument passed, and the respective list of parallel elements
-        from <tt><i>vec<sub>1</sub> vec<sub>2</sub></i>
-        &middot;&middot;&middot;</tt> at that index.  In contrast with
-        <tt><a href="#vector-map">vector-map</a></tt>, <tt><i>f</i></tt>
-        is reliably applied to each subsequent elements, starting at
-        index 0, in the vectors.
-        <br>
-        <br>
-        Example:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-for-each (&lambda; (i x) (display x) (newline))
-        </code>
-        <br>
-        <code class="example-call">
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          '#("foo" "bar" "baz" "quux" "zot"))
-        </code>
-        <br>
-        Displays:
-        <br>
-        <pre>
-foo
-bar
-baz
-quux
-zot</pre>        
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-count">
-          (vector-count <i>pred? vec<sub>1</sub> vec<sub>2</sub>
-                           &middot;&middot;&middot;</i>)
-          -&gt; exact nonnegative integer
-        </a>
-      </dt>
-      <dd>
-        Counts the number of parallel elements in the vectors that
-        satisfy <tt><i>pred?</i></tt>, which is applied, for each index
-        <tt><i>i</i></tt> in the range [0, <tt><i>length</i></tt>)
-        &mdash; where <tt><i>length</i></tt> is the length of the
-        smallest vector argument &mdash;, to <tt><i>i</i></tt> and each
-        parallel element in the vectors at that index, in order.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-count (&lambda; (i elt) (even? elt))
-                        '#(3 1 4 1 5 9 2 5 6))
-        </code>
-        <br>
-        <code class="example-value">
-          3
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-count (&lambda; (i x y) (&lt; x y))
-                        '#(1 3 6 9) '#(2 4 6 8 10 12))
-        </code>
-        <br>
-        <code class="example-value">
-          2
-        </code>
-        <br>
-        <br>
-      </dd>
-    </dl>
-
-    <h2><a name="Searching">4.5. Searching</a></h2>
-    <dl>
-      <dt class="proc-spec">
-        <a name="vector-index">
-          (vector-index <i>pred? vec<sub>1</sub> vec<sub>2</sub>
-                           &middot;&middot;&middot;</i>)
-          -&gt; exact nonnegative integer or #f
-        </a>
-      </dt>
-      <dd>
-        Finds &amp; returns the index of the first elements in
-        <tt><i>vec<sub>1</sub> vec<sub>2</sub>
-        &middot;&middot;&middot;</i></tt> that satisfy
-        <tt><i>pred?</i></tt>.  If no matching element is found by the
-        end of the shortest vector, <tt>#f</tt> is returned.
-        <br>
-        <br>
-        Examples:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-index even? '#(3 1 4 1 5 9))
-        </code>
-        <br>
-        <code class="example-value">
-          2
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-index &lt; '#(3 1 4 1 5 9 2 5 6) '#(2 7 1 8 2))
-        </code>
-        <br>
-        <code class="example-value">
-          1
-        </code>
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-index = '#(3 1 4 1 5 9 2 5 6) '#(2 7 1 8 2))
-        </code>
-        <br>
-        <code class="example-value">
-          #f
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-index-right">
-          (vector-index-right <i>pred? vec<sub>1</sub> vec<sub>2</sub>
-                                 &middot;&middot;&middot;</i>)
-          -&gt; exact nonnegative integer or #f
-        </a>
-      </dt>
-      <dd>
-        Like <tt><a href="#vector-index">vector-index</a></tt>, but it
-        searches right-to-left, rather than left-to-right, and all of
-        the vectors <i>must</i> have the same length.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-skip">
-          (vector-skip <i>pred? vec<sub>1</sub> vec<sub>2</sub>
-                          &middot;&middot;&middot;</i>)
-          -&gt; exact nonnegative integer or #f
-        </a>
-      </dt>
-      <dd>
-        Finds &amp; returns the index of the first elements in
-        <tt><i>vec<sub>1</sub> vec<sub>2</sub>
-        &middot;&middot;&middot;</i></tt> that do <i>not</i> satisfy
-        <tt><i>pred?</i></tt>.  If all the values in the vectors
-        satisfy <tt><i>pred?</i></tt> until the end of the shortest
-        vector, this returns <tt>#f</tt>. This is equivalent to:
-        <br>
-        <br>
-        <code class="indented">
-          (<a href="#vector-index">vector-index</a>
-           (&lambda; (x<sub><i>1</i></sub> x<sub><i>2</i></sub>
-                      <i>&middot;&middot;&middot;</i>)
-             (not (<i>pred?</i> x<sub><i>1</i></sub>
-                                x<sub><i>1</i></sub>
-                                <i>&middot;&middot;&middot;</i>)))
-           <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-           <i>vec<sub>1</sub> vec<sub>2</sub>
-           &middot;&middot;&middot;</i>)
-        </code>
-        <br>
-        <br>
-        Example:
-        <br>
-        <br>
-        <code class="example-call">
-          (vector-skip number? '#(1 2 a b 3 4 c d))
-        </code>
-        <br>
-        <code class="example-value">
-          2
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-skip-right">
-          (vector-skip-right <i>pred? vec<sub>1</sub> vec<sub>2</sub>
-                                &middot;&middot;&middot;</i>)
-          -&gt; exact nonnegative integer or #f
-        </a>
-      </dt>
-      <dd>
-        Like <tt><a href="#vector-skip">vector-skip</a></tt>, but it
-        searches for a non-matching element right-to-left, rather than
-        left-to-right, and all of the vectors <i>must</i> have the same
-        length.  This is equivalent to:
-        <br>
-        <br>
-        <code class="indented">
-          (<a href="#vector-index">vector-index-right</a>
-           (&lambda; (x<sub><i>1</i></sub> x<sub><i>2</i></sub>
-                      <i>&middot;&middot;&middot;</i>)
-             (not (<i>pred?</i> x<sub><i>1</i></sub>
-                                x<sub><i>1</i></sub>
-                                <i>&middot;&middot;&middot;</i>)))
-           <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-           &nbsp;&nbsp;&nbsp;&nbsp;
-           <i>vec<sub>1</sub> vec<sub>2</sub>
-           &middot;&middot;&middot;</i>)
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-binary-search">
-          (vector-binary-search <i>vec value cmp</i>)
-          -&gt; exact nonnegative integer or #f
-        </a>
-      </dt>
-      <dd>
-        Similar to <tt><a href="#vector-index">vector-index</a></tt>
-        and
-        <tt><a href="#vector-index-right">vector-index-right</a></tt>,
-        but instead of searching left to right or right to left, this
-        performs a binary search.  <tt><i>cmp</i></tt> should be a
-        procedure of two arguments and return a negative integer, which
-        indicates that its first argument is less than its second,
-        zero, which indicates that they are equal, or a positive
-        integer, which indicates that the first argument is greater
-        than the second argument.  An example <tt><i>cmp</i></tt> might
-        be:
-        <br>
-        <br>
-        <code class="indented">
-          (&lambda; (<i>char<sub>1</sub></i> <i>char<sub>2</sub></i>)
-        </code>
-        <br>
-        <code class="indented">
-          &nbsp;&nbsp;(cond ((char&lt;? <i>char<sub>1</sub>
-                                           char<sub>2</sub></i>)
-                             -1)
-        </code>
-        <br>
-        <code class="indented">
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          ((char=? <i>char<sub>1</sub>
-                      char<sub>2</sub></i>)
-           0)
-        </code>
-        <br>
-        <code class="indented">
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          (else 1)))
-        </code>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-any">
-          (vector-any <i>pred? vec<sub>1</sub> vec<sub>2</sub>
-                         &middot;&middot;&middot;</i>)
-          -&gt; value or #f
-        </a>
-      </dt>
-      <dd>
-        Finds the first set of elements in parallel from
-        <tt><i>vec<sub>1</sub> vec<sub>2</sub>
-        &middot;&middot;&middot;</i></tt> for which
-        <tt><i>pred?</i></tt> returns a true value.  If such a parallel
-        set of elements exists, <tt>vector-any</tt> returns the value
-        that <tt><i>pred?</i></tt> returned for that set of elements.
-        The iteration is strictly left-to-right.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-every">
-          (vector-every <i>pred? vec<sub>1</sub> vec<sub>2</sub>
-                           &middot;&middot;&middot;</i>)
-          -&gt; value or #f
-        </a>
-      </dt>
-      <dd>
-        If, for every index <tt><i>i</i></tt> between 0 and the length
-        of the shortest vector argument, the set of elements
-        <tt>(<a href="#vector-ref">vector-ref</a> <i>vec<sub>1</sub></i>
-                                                 <i>i</i>)
-            (<a href="#vector-ref">vector-ref</a> <i>vec<sub>2</sub></i>
-                                                 <i>i</i>)
-            &middot;&middot;&middot;</tt>
-        satisfies <tt><i>pred?</i></tt>, <tt>vector-every</tt> returns
-        the value that <tt><i>pred?</i></tt> returned for the last
-        set of elements, at the last index of the shortest vector.  The
-        iteration is strictly left-to-right.
-        <br>
-        <br>
-      </dd>
-    </dl>
-
-    <h2><a name="Mutators">4.6. Mutators</a></h2>
-    <dl>
-      <dt class="proc-spec">
-        <a name="vector-set-bang">
-          (vector-set! <i>vec i value</i>)
-          -&gt; unspecified
-        </a>
-      </dt>
-      <dd>
-        [<a href="#R5RS"><i>R5RS</i></a>] Assigns the contents of the location at <tt><i>i</i></tt> in
-        <tt><i>vec</i></tt> to <tt><i>value</i></tt>.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-swap-bang">
-          (vector-swap! <i>vec i j</i>)
-          -&gt; unspecified
-        </a>
-      </dt>
-      <dd>
-        Swaps or exchanges the values of the locations in
-        <tt><i>vec</i></tt> at <tt><i>i</i></tt> &amp;
-        <tt><i>j</i></tt>.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-fill-bang">
-          (vector-fill! <i>vec fill</i> [<i>start</i> [<i>end</i>]])
-          -&gt; unspecified
-        </a>
-      </dt>
-      <dd>
-        [<a href="#R5RS"><i>R5RS</i></a>+] Assigns the value of every location in <tt><i>vec</i></tt>
-        between <tt><i>start</i></tt>, which defaults to <tt>0</tt> and
-        <tt><i>end</i></tt>, which defaults to the length of
-        <tt><i>vec</i></tt>, to <tt><i>fill</i></tt>.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-reverse-bang">
-          (vector-reverse! <i>vec</i> [<i>start</i> [<i>end</i>]])
-          -&gt; unspecified
-        </a>
-      </dt>
-      <dd>
-        Destructively reverses the contents of the sequence of
-        locations in <tt><i>vec</i></tt> between <tt><i>start</i></tt>
-        and <tt><i>end</i></tt>.  <tt><i>Start</i></tt> defaults to
-        <tt>0</tt> and <tt><i>end</i></tt> defaults to the length of
-        <tt><i>vec</i></tt>.  Note that this does not deeply reverse.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-copy-bang">
-          (vector-copy! <i>target tstart source</i>
-                        [<i>sstart</i> [<i>send</i>]])
-          -&gt; unspecified
-        </a>
-      </dt>
-      <dd>
-        Copies a block of elements from <tt><i>source</i></tt> to
-        <tt><i>target</i></tt>, both of which must be vectors, starting
-        in <tt><i>target</i></tt> at <tt><i>tstart</i></tt> and
-        starting in <tt><i>source</i></tt> at <tt><i>sstart</i></tt>,
-        ending when <tt><i>send</i> - <i>sstart</i></tt> elements have
-        been copied. It is an error for <tt><i>target</i></tt> to have
-        a length less than <tt><i>tstart</i> + (<i>send</i> -
-        <i>sstart</i>)</tt>.  <tt><i>Sstart</i></tt> defaults to
-        <tt>0</tt> and <tt><i>send</i></tt> defaults to the length of
-        <tt><i>source</i></tt>.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="vector-reverse-copy-bang">
-          (vector-reverse-copy! <i>target tstart source</i>
-                                [<i>sstart</i> [<i>send</i>]])
-          -&gt; unspecified
-        </a>
-      </dt>
-      <dd>
-        Like <tt><a href="#vector-copy-bang">vector-copy!</a></tt>, but
-        this copies the elements in the reverse order.  It is an error
-        if <tt><i>target</i></tt> and <tt><i>source</i></tt> are
-        identical vectors and the target &amp; source ranges overlap;
-        however, if <tt><i>tstart</i> = <i>sstart</i></tt>,
-        <tt>vector-reverse-copy!</tt> behaves as
-        <tt>
-          (<a href="#vector-reverse-bang">vector-reverse!</a>
-           <i>target</i>
-           <i>tstart</i>
-           <i>send</i>)
-        </tt>
-        would.
-        <br>
-        <br>
-      </dd>
-    </dl>
-
-    <h2><a name="Conversion">4.7. Conversion</a></h2>
-    <dl>
-      <dt class="proc-spec">
-        <a name="vector-to-list">
-          (vector-&gt;list <i>vec</i> [<i>start</i> [<i>end</i>]])
-          -&gt; proper-list
-        </a>
-      </dt>
-      <dd>
-        [<a href="#R5RS"><i>R5RS</i></a>+] Creates a list containing the elements in <tt><i>vec</i></tt>
-        between <tt><i>start</i></tt>, which defaults to <tt>0</tt>,
-        and <tt><i>end</i></tt>, which defaults to the length of
-        <tt><i>vec</i></tt>.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="reverse-vector-to-list">
-          (reverse-vector-&gt;list <i>vec</i>
-                                   [<i>start</i> [<i>end</i>]])
-          -&gt; proper-list
-        </a>
-      </dt>
-      <dd>
-        Like <tt><a href="#vector-to-list">vector-&gt;list</a></tt>,
-        but the resulting list contains the elements in reverse between
-        the specified range.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="list-to-vector">
-          (list-&gt;vector <i>proper-list</i>) -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        [<a href="#R5RS"><i>R5RS</i></a>+] Creates a vector of elements from <tt><i>proper-list</i></tt>.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="proc-spec">
-        <a name="reverse-list-to-vector">
-          (reverse-list-&gt;vector <i>proper-list</i>) -&gt; vector
-        </a>
-      </dt>
-      <dd>
-        Like <tt><a href="#list-to-vector">list-&gt;vector</a></tt>,
-        but the resulting list contains the elements in reverse of
-        <tt><i>proper-list</i></tt>.
-        <br>
-        <br>
-      </dd>
-    </dl>
-
-    <h1 class="nonheader">
-      <a name="RefImpl">5. Reference Implementation</a>
-    </h1>
-    <p>
-      With this SRFI comes a complete reference implementation.  It is
-      licensed under a very open copyright with which no implementors
-      should have any legal issues.
-      <br>
-      <br>
-      The reference implementation has only one non-R5RS dependency:
-      <a href="#SRFI-23">SRFI 23</a>'s <tt>error</tt> procedure.
-      <br>
-      <br>
-      This reference implementation of all the procedures described in
-      this SRFI can be found <a href="#vector-lib.scm">here</a>.
-    </p>
-
-    <h1 class="nonheader">
-      <a name="Acknowledgements">6. Acknowledgements</a>
-    </h1>
-    <p>
-      Thanks to Olin Shivers for his wonderfully complete
-      <a href="#SRFI-1">list</a> and <a href="#SRFI-13">string</a>
-      packages; to all the members of the
-      <a href="http://scheme-irc.webhop.org/"><tt>#scheme</tt> IRC
-      channel</a> on <a href="http://www.freenode.net/">Freenode</a>
-      who nitpicked a great deal, but also helped quite a lot in
-      general, and helped test the reference implementation in various
-      Scheme systems; to Michael Burschik for his numerous comments; to
-      Sergei Egorov for helping to narrow down the procedures; to Mike
-      Sperber for putting up with an <i>extremely</i> overdue draft; to
-      Felix Winkelmann for continually bugging me about finishing up the
-      SRFI so that it would be only overdue and not withdrawn; and to
-      everyone else who gave questions, comments, thoughts, or merely
-      attention to the SRFI.
-    </p>
-
-    <h1 class="nonheader"><a name="References">7. References</a></h1>
-    <dl>
-      <dt class="ref"><a name="R5RS">R5RS</a></dt>
-      <dd>
-        <i>R5RS: The Revised<sup>5</sup> Report on Scheme</i>
-        <br>
-        R. Kelsey, W. Clinger, J. Rees (editors).
-        <br>
-        Higher-Order and Symbolic Computation, Vol. 11, No. 1,
-        September, 1998
-        <br>
-        and
-        <br>
-        ACM SIGPLAN Notices, Vol. 33, No. 9, October, 1998
-        <br>
-        Available at:
-        <a href="http://www.schemers.org/Documents/Standards/R5RS/">
-          http://www.schemers.org/Documents/Standards/R5RS/
-        </a>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="ref"><a name="SRFI">SRFI</a></dt>
-      <dd>
-        <i>SRFI: Scheme Request for Implementation</i>
-        <br>
-        The SRFI website can be found at:
-        <a href="http://srfi.schemers.org/">
-          http://srfi.schemers.org/
-        </a>
-        <br>
-        The SRFIs mentioned in this document are described later.
-        <br>
-        <br>
-      </dd>
-
-      <dt class="ref"><a name="SRFI-1">SRFI 1</a></dt>
-      <dd>
-        <i>SRFI 1: List Library</i>
-        <br>
-        A SRFI of list processing procedures, written by Olin Shivers.
-        <br>
-        Available at:
-        <a href="http://srfi.schemers.org/srfi-1/">
-          http://srfi.schemers.org/srfi-1/
-        </a>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="ref"><a name="SRFI-13">SRFI 13</a></dt>
-      <dd>
-        <i>SRFI 13: String Library</i>
-        <br>
-        A SRFI of string processing procedures, written by Olin
-        Shivers.
-        <br>
-        Available at:
-        <a href="http://srfi.schemers.org/srfi-13/">
-          http://srfi.schemers.org/srfi-13/
-        </a>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="ref"><a name="SRFI-23">SRFI 23</a></dt>
-      <dd>
-        <i>SRFI 23: Error Reporting Mechanism</i>
-        <br>
-        A SRFI that defines a new primitive (<tt>error</tt>) for
-        reporting that an error occurred, written by Stephan Houben.
-        <br>
-        Available at:
-        <a href="http://srfi.schemers.org/srfi-23/">
-          http://srfi.schemers.org/srfi-23/
-        </a>
-        <br>
-        <br>
-      </dd>
-
-      <dt class="ref"><a name="SRFI-32">SRFI 32</a></dt>
-      <dd>
-        <i>SRFI 32: Sort Libraries (draft)</i>
-        <br>
-        A SRFI of list and vector sorting routines, written by Olin
-        Shivers.
-        <br>
-        Available at:
-        <a href="http://srfi.schemers.org/srfi-32/">
-          http://srfi.schemers.org/srfi-32/
-        </a>
-      </dd>
-    </dl>
-
-    <h1 class="nonheader"><a name="Copyright">8. Copyright</a></h1>
-    <p>
-     Copyright (C) Taylor Campbell (2003).  All rights reserved.
-    </p>
-    <p>
-      Permission is hereby granted, free of charge, to any person
-      obtaining a copy of this software and associated documentation
-      files (the "Software"), to deal in the Software without
-      restriction, including without limitation the rights to use,
-      copy, modify, merge, publish, distribute, sublicense, and/or
-      sell copies of the Software, and to permit persons to whom the
-      Software is furnished to do so, subject to the following
-      conditions:
-    </p>
-    <p>
-      The above copyright notice and this permission notice shall be
-      included in all copies or substantial portions of the Software.
-    </p>
-    <p>
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-      OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-      NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-      HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-      WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-      FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-      OTHER DEALINGS IN THE SOFTWARE.
-    </p>
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-45.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-45.html
deleted file mode 100644
index a9c326b543..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-45.html
+++ /dev/null
@@ -1,785 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 45: Primitives for expressing iterative lazy algorithms</title>
-  </head>
-
-  <body>
-
-    <H1>Title</H1>
-
-    SRFI 45: Primitives for Expressing Iterative Lazy Algorithms
-
-    <H1>Author</H1>
-    
-    Andr&eacute; van Tonder
-    
-    <H1>Status</H1>
-
-    This SRFI is currently in ``final'' status.  To see an explanation
-    of each status that a SRFI can hold, see <A
-    HREF="http://srfi.schemers.org/srfi-process.html">here</A>.  You
-    can access previous messages via <a
-    href="http://srfi.schemers.org/srfi-45/mail-archive/maillist.html">
-    the archive of the mailing list</a>.
-
-    <p>
-    <ul>
-      <li>Received: 2003/09/20</li>
-      <li>Draft: 2003/09/23-2003/12/23</li>
-      <li>Revised: 2003/12/20</li>
-      <li>Revised: 2004/03/06</li>
-      <li>Final: 2004/04/05</li>
-      <li>Bug fix: 2004/08/04</li>
-    </ul>
-    
-    <H1>Abstract</H1>
-
-Lazy evaluation is traditionally simulated in Scheme using 
-<code>delay</code> and <code>force</code>.  However, these 
-primitives are not powerful enough to express  
-a large class of lazy algorithms that are iterative.
-Indeed, it is folklore in the Scheme community that
-typical iterative lazy algorithms written using
-<code>delay</code> and 
-<code>force</code> will often 
-require unbounded memory.   
-
-<p>
-Although varous modifications of <code>delay</code> and
-<code>force</code> had been proposed to resolve this problem (see e.g., the
-<a href=
-http://srfi.schemers.org/srfi-40/mail-archive/maillist.html>
-SRFI-40 discussion list
-</a>)
-they all fail some of the benchmarks provided below.  To our knowledge,
-the current SRFI provides the first exhaustive solution to this problem.  
-
-
-<p>
-As motivation, 
-we first explain how the usual laziness encoding using only <code>delay</code>
-and <code>force</code> will break the iterative behavior of typical
-algorithms that would have been properly tail-recursive 
-in a true lazy language, causing the computation to require unbounded memory.   
-
-<p>
-The problem is then resolved by  
-introducing a set of three operations:
-<pre>
-    {<code>lazy</code>, <code>delay</code>, <code>force</code>}
-</pre>
-which allow the programmer to succinctly express lazy algorithms while 
-retaining bounded space behavior in cases that are properly tail-recursive.  
-A general
-recipe for using these primitives is provided.  An additional procedure
-<code>{eager}</code> is provided for the construction of 
-eager promises in cases where efficiency is a concern.
-
-<p> 
-Although this SRFI redefines <code>delay</code> and <code>force</code>,
-the extension is conservative in the sense that the semantics of the subset {<code>delay</code>, <code>force</code>} in 
-isolation (i.e., as long as the program does not use <code>lazy</code>)
-agrees with that in R5RS.  In other words, no program that uses the
-R5RS definitions of delay and force will break if those definition are 
-replaced by the SRFI-45 definitions of delay and force.
-
-
-
-
-    <H1>Rationale</H1>
-
-Wadler et al. in the paper 
-<em>How to add laziness to a strict language without even being odd</em> [Wad98], provide a 
-straightforward recipe for transforming arbitrary lazy data structures and algorithms 
-into a strict language using <code>delay</code> and <code>force</code>. 
-
-<p>
-However, it is known (see e.g. the <a href="http://srfi.schemers.org/srfi-40/mail-archive/maillist.html">SRFI-40 discussion list</a>) that this 
-transformation can lead to programs that suffer from unbounded space 
-consumption, even if the original lazy algorithm was properly tail-recursive.
-
-<H2>Example</H2>
-
-Consider the following procedure, written in a hypothetical lazy
-language with Scheme syntax:
-
-<pre>
-(define (stream-filter p? s)
-  (if (null? s) '()
-      (let ((h (car s))
-            (t (cdr s)))
-        (if (p? h)
-            (cons h (stream-filter p? t))
-            (stream-filter p? t)))))
-</pre>
-
-According to the tranformation proposed in [Wad98], this algorithm can be espressed as follows
-in Scheme:
-
-<pre>
-(define (stream-filter p? s)
-  (delay (force 
-          (if (null? (force s)) (delay '())
-              (let ((h (car (force s))) 
-                    (t (cdr (force s))))
-                (if (p? h)
-                    (delay (cons h (stream-filter p? t)))
-                    (stream-filter p? t)))))))
-</pre>
-
-The recipe, <em>which we will modify below</em>, is as follows: 
-<ul>
-<li>
-   wrap all constructors (e.g., <code>'()</code>, <code>cons</code>) with <code>delay</code>,
-</li>
-<li>
-   apply <code>force</code> to arguments of deconstructors (e.g., <code>car</code>,
-   <code>cdr</code> and <code>null?</code>),
-</li>
-<li>
-  wrap procedure bodies with <code>(delay (force ...))</code>.
-</li>
-</ul>
-
-<p>
-However, evaluating the following with a sufficiently value for
-<code>large-number</code>
-will cause a typical Scheme
-implementation to run out of memory, despite the fact that 
-the original (lazy) algorithm was iterative, only needing tail calls to evaluate the 
-first element of the result stream.  
-<pre>
-(define (from n)
-  (delay (cons n (from (+ n 1)))))
-
-(define large-number 1000000000)
-
-(car (force (stream-filter (lambda (n) (= n large-number)) 
-                           (from 0))))
-</pre>
-
-
-<h2>Why the space leak occurs</h2>
-
-The problem occurring in the above
-<code>stream-filter</code> example can already 
-be seen in the following simple infinite loop, expressed in our hypothetical lazy 
-language as:
-
-<pre>
-(define (loop) (loop))
-</pre>
-
-which becomes, according to the [Wad98] transformation 
-<pre>
-(define (loop) (delay (force (loop))))
-</pre>          
-
-Taking the semantics of {<code>delay</code>, <code>force</code>}
-to be informally:
-
-<pre>
-  (force (delay expr)) = update promise : (delay expr) 
-                           with value of expr
-                         return value in promise
-</pre>         
-
-we get 
-<pre>
-  (force (loop)) = update promise1 : (delay (force (loop)))
-                     with value of (force (loop))
-                   return value in promise1
-                 = update promise1 : (delay (force (loop)))
-                     with value of 
-                       update promise2 : (delay (force (loop)))
-                         with value of (force (loop))
-                       return value in promise2
-                   return value in promise1
-                 = update promise1 : (delay (force (loop)))
-                     with value of 
-                       update promise2 : (delay (force (loop)))
-                         with value of 
-                            update promise3 : (delay (force (loop)))
-                              with value of (force (loop))
-                            return value in promise3
-                       return value in promise2
-                   return value in promise1
-                 = ...
-</pre>
-
-We see that an ever growing sequence of pending promises builds up until the heap 
-is exhausted.
-
-
-<h2>Why the above is not call-by-need</h2>
-
-Expressing the above algorithm in terms of {<code>delay</code>, <code>force</code>}
-in fact does not correctly capture common notions of 
-call-by-need evaluation semantics.  For example,
-in a call-by-need language with naive graph reduction semantics, the above algorithm
-would run in bounded space since naive graph reduction is known to be 
-tail-safe.  For a good discussion of this issue, see e.g. R. Jones - 
-<em>Tail recursion without space leaks</em> [Jon98].  
-
-<p>
-Our problem may be regarded as analogous to graph reduction, 
-with promises corresponding to graph nodes and
-<code>force</code> corresponding to reduction.  As described by Jones, 
-one has to be careful with
-the order in which nodes are evaluated and overwritten to avoid space
-leaks.  In our context this would correspond to the order in which
-promises are evaluated and overwritten when forced.  
-
-<p>
-In the above example, naive graph reduction would correspond to the 
-promise at the root being overwritten at each step <em>before</em> 
-the next iteration is evaluated, thus avoiding the need for a growing 
-sequence of unfulfilled promises representing (unnecessary) future 
-copy operations.   
-
-
-<h2>The solution</h2>
- 
-The accumulation of unnecessary promises in the above examples is a consequence
-of suspensions being forced in increasingly nested contexts.  In order 
-to correctly simulate naive graph reduction  
-we should instead find a way of forcing tail suspensions <em>iteratively</em>,
-each time overwriting the previous result.   
-
-
-<p>
-A solution to this problem exists and is described (in a different context) in 
-<em>Compiling higher order languages into fully tail-recursive portable C</em> 
-- Feely et al. [Fee97].  This reference introduces a method
-widely known as the <em>trampoline technique</em> for evaluating
-tail contexts iteratively.  
-
-<p>
-Adapting the trampoline technique to the situation at hand, we 
-introduce a new primitive <code>lazy</code>, which behaves like
-an "atomic" <code>(delay (force ...))</code>, and which will 
-replace the combination <code>(delay (force ...))</code> at procedure
-entry points.  We also
-redefine <code>delay</code> and <code>force</code> as below:  
-
-<pre>
-; type Promise a = lazy (Promise a) | eager a 
-
-(define-syntax lazy
-  (syntax-rules ()
-    ((lazy exp) 
-     (box (cons 'lazy (lambda () exp))))))
-
-(define (eager x)
-  (box (cons 'eager x)))
-
-(define-syntax delay
-  (syntax-rules ()
-    ((delay exp) (lazy (eager exp)))))
-
-(define (force promise)
-  (let ((content (unbox promise)))
-    (case (car content)
-      ((eager) (cdr content))
-      ((lazy)  (let* ((promise* ((cdr content)))        
-                      (content  (unbox promise)))                      ; *
-                 (if (not (eqv? (car content) 'eager))                 ; *
-                     (begin (set-car! content (car (unbox promise*)))
-                            (set-cdr! content (cdr (unbox promise*)))
-                            (set-box! promise* content)))
-                 (force promise))))))
-
-(*) These two lines re-fetch and check the original promise in case 
-    the first line of the let* caused it to be forced.  For an example  
-    where this happens, see reentrancy test 3 below.
-
-(define (box x) (list x))
-(define unbox car)
-(define set-box! set-car!)
-</pre>
-
-
-
-Our example is then coded (see the full recipe below)
-<pre>
-  (define (loop) (lazy (loop)))
-</pre>
-
-When we now evaluate <code>(force (loop))</code>, 
-the <code>force</code> procedure will execute a top-level loop
-which will iteratively evaluate and overwrite subsequent 
-suspensions.   
-
-<p>
-In the language of [Fee97],
-the iterative loop in <code>force</code> plays the role of 
-"dispatcher".
-The <code>lazy</code> form marks "control points" (procedure entry and 
-return points).  
-This technique is tail-safe because lazy procedures, instead of calling 
-other lazy procedures directly, simply return a 
-suspension representing a control point to be called upon the next iteration 
-of the dispatcher loop in <code>force</code>.  For more details, see [FMRW].
-
-
-    <H1>Specification</H1>
-
-The following macros should be provided.  The semantics, which is informally
-described here, should conform to that of the reference implementation below:
-<ul>
-<li>
-<code><a name="delay">(delay expression)</a></code>:
-Takes an expression of arbitrary type a and returns a promise of type (Promise a)
-which at some point in the future may be asked (by the force procedure) 
-to evaluate the expression and deliver the resulting value.
-<li>
-<code><a name="lazy">(lazy  expression)</a></code>:
-Takes an expression of type (Promise a) and returns a promise of type (Promise a)
-which at some point in the future may be asked (by the force procedure) 
-to evaluate the expression and deliver the resulting promise.
-</ul>
-
-The following procedures should be provided:
-<ul>
-<li>
-<code><a name="force">(force expression)</a></code>:
-Takes an argument of type (Promise a) and returns a value of type a as follows:
-If a value of type a has been computed for the promise, this value is returned. 
-Otherwise, the promise is first evaluated, then overwritten by the obtained promise
-or value,
-and then <code>force</code> is again applied (iteratively) to the promise.
-<li>
-<code><a name="eager">(eager expression)</a></code>:
-Takes an argument of type a and returns a value of type Promise a.  As opposed 
-to <code>delay</code>, the argument is evaluated eagerly.  Semantically,
-writing <code>(eager expression)</code> is equivalent to writing
-<pre>
-    (let ((value expression)) (delay value)).
-</pre>
-However, the former is more efficient since it does not require unnecessary
-creation and evaluation of thunks.   We also have the equivalence
-<pre>
-    (delay expression) = (lazy (eager expression))
-</pre>
-</ul>
-
-
-The following reduction rules may be helpful for reasoning about 
-these primitives.  However, they do not express the memoization and 
-memory usage
-semantics specified above:
-<pre>
-  (force (delay expression)) -> expression
-  (force (lazy  expression)) -> (force expression)
-  (force (eager value))      -> value
-</pre>
-
-<p>
-The typing can be succinctly expressed as follows:
-
-<pre>
-
-    type Promise a = lazy (Promise a) | eager a
-    
-           expression  : a
-    ------------------------------
-    (eager expression) : Promise a
-    
-           expression  : Promise a
-    ------------------------------
-    (lazy expression)  : Promise a  
-
-           expression  : a
-    ------------------------------
-    (delay expression) : Promise a 
-
-           expression  : Promise a 
-    ------------------------------
-    (force expression) : a 
-
-</pre>
-
-<p> 
-Although this SRFI specifies an extension to the semantics of <code>force</code>,
-the extension is conservative in the sense that the semantics of the subset {<code>delay</code>, <code>force</code>} in 
-isolation (i.e., as long as the program does not use <code>lazy</code>)
-agrees with that in R5RS.  
-
-    <H1>Correct usage</H1>
-
-We now provide a general
-recipe for using the primitives  
-<pre>
-    {<code>lazy</code>, <code>delay</code>, <code>force</code>}
-</pre>
-to express lazy algorithms in Scheme.  
-
-The transformation is best described by way of an example:  Consider 
-again the stream-filter algorithm, expressed in a hypothetical lazy language
-as  
-<pre>
-(define (stream-filter p? s)
-  (if (null? s) '()
-      (let ((h (car s))
-            (t (cdr s)))
-        (if (p? h)
-            (cons h (stream-filter p? t))
-            (stream-filter p? t)))))
-</pre>
-
-This algorithm can be espressed as follows
-in Scheme:
-
-<pre>
-(define (stream-filter p? s)
-  (lazy
-     (if (null? (force s)) (delay '())
-         (let ((h (car (force s)))
-               (t (cdr (force s))))
-           (if (p? h)
-               (delay (cons h (stream-filter p? t)))
-               (stream-filter p? t))))))
-</pre>
-
-In other words, we 
-<ul>
-<li>
-   wrap all constructors (e.g., <code>'(), cons</code>) with <code>delay</code>,
-</li>
-<li>
-   apply <code>force</code> to arguments of deconstructors (e.g., <code>car</code>,
-   <code>cdr</code> and <code>null?</code>),
-</li>
-<li>
-  wrap procedure bodies with <code>(lazy ...)</code>.
-</li>
-</ul>
-
-The only difference with the [Wad98] transformation described above is 
-in replacing the combination <code>(delay (force ...))</code> with 
-<code>(lazy ...)</code> in the third rule.  
-
-<p>
-More examples are included in the reference implementation below.
- 
-
-
-    <H1>Implementation</H1>
-
-The reference implementation uses the macro 
-mechanism of R5RS.
-It does not use any other SRFI or any library.
-
-<p>
-A collection of benchmarks is provided. 
-These check some special cases of the mechanism defined
-in this SRFI.  To run them the user will need access to some way
-of inspecting the runtime memory usage of the algorithms, and 
-a metric, left unspecified here, for deciding whether the memory
-usage is bounded.  A leak benchmark is passed if the memory usage
-is bounded.   
-Passing the tests does not mean a correct implementation.
-
-
-<h2>
-Reference implementation
-</h2>
-
-<pre>
-;=========================================================================
-; Boxes
-
-(define (box x) (list x))
-(define unbox car)
-(define set-box! set-car!)
-
-;=========================================================================
-; Primitives for lazy evaluation:
-
-(define-syntax lazy
-  (syntax-rules ()
-    ((lazy exp)
-     (box (cons 'lazy (lambda () exp))))))
-
-(define (eager x)
-  (box (cons 'eager x)))
-
-(define-syntax delay
-  (syntax-rules ()
-    ((delay exp) (lazy (eager exp)))))
-
-(define (force promise)
-  (let ((content (unbox promise)))
-    (case (car content)
-      ((eager) (cdr content))
-      ((lazy)  (let* ((promise* ((cdr content)))        
-                      (content  (unbox promise)))                      ; * 
-                 (if (not (eqv? (car content) 'eager))                 ; *
-                     (begin (set-car! content (car (unbox promise*)))
-                            (set-cdr! content (cdr (unbox promise*)))
-                            (set-box! promise* content)))
-                 (force promise))))))
-
-; (*) These two lines re-fetch and check the original promise in case 
-;     the first line of the let* caused it to be forced.  For an example  
-;     where this happens, see reentrancy test 3 below.
-
-;=========================================================================
-; TESTS AND BENCHMARKS:
-;=========================================================================
-
-;=========================================================================
-; Memoization test 1:
-
-(define s (delay (begin (display 'hello) 1)))
-
-(force s)
-(force s)
-               ;===> Should display 'hello once
-
-;=========================================================================
-; Memoization test 2:
-
-(let ((s (delay (begin (display 'bonjour) 2))))
-  (+ (force s) (force s)))
-
-               ;===> Should display 'bonjour once
-
-;=========================================================================
-; Memoization test 3: (pointed out by Alejandro Forero Cuervo) 
-
-(define r (delay (begin (display 'hi) 1)))
-(define s (lazy r))
-(define t (lazy s))
-
-(force t)
-(force r)
-               ;===> Should display 'hi once
-
-;=========================================================================
-; Memoization test 4: Stream memoization 
-
-(define (stream-drop s index)
-  (lazy
-   (if (zero? index)
-       s
-       (stream-drop (cdr (force s)) (- index 1)))))
-
-(define (ones)
-  (delay (begin
-           (display 'ho)
-           (cons 1 (ones)))))
-
-(define s (ones))
-
-(car (force (stream-drop s 4)))
-(car (force (stream-drop s 4)))
-
-               ;===> Should display 'ho five times
-
-;=========================================================================
-; Reentrancy test 1: from R5RS
-
-(define count 0)
-(define p
-  (delay (begin (set! count (+ count 1))
-                (if (> count x)
-                    count
-                    (force p)))))
-(define x 5)
-(force p)                     ;===>  6
-(set! x 10)
-(force p)                     ;===>  6
-       
-
-;=========================================================================
-; Reentrancy test 2: from SRFI 40
-
-(define f
-  (let ((first? #t))
-    (delay
-      (if first?
-          (begin
-            (set! first? #f)
-            (force f))
-          'second))))
-
-(force f)                     ;===> 'second 
-
-;=========================================================================
-; Reentrancy test 3: due to John Shutt
-
-(define q
-  (let ((count 5))
-    (define (get-count) count)
-    (define p (delay (if (<= count 0)
-                         count
-                         (begin (set! count (- count 1))
-                                (force p)
-                                (set! count (+ count 2))
-                                count))))
-    (list get-count p)))
-(define get-count (car q))
-(define p (cadr q))
-
-(get-count)  ; =>   5
-(force p)    ; =>   0
-(get-count)  ; =>   10
-
-;=========================================================================
-; Test leaks:  All the leak tests should run in bounded space.
-
-;=========================================================================
-; Leak test 1: Infinite loop in bounded space.
-
-(define (loop) (lazy (loop)))
-;(force (loop))                               ;==> bounded space
-
-;=========================================================================
-; Leak test 2: Pending memos should not accumulate 
-;              in shared structures.
-
-(define s (loop))
-;(force s)                                    ;==> bounded space 
-
-;=========================================================================
-; Leak test 3: Safely traversing infinite stream.
-
-(define (from n)
-  (delay (cons n (from (+ n 1)))))
-
-(define (traverse s)
-  (lazy (traverse (cdr (force s)))))
-
-;(force (traverse (from 0)))                  ;==> bounded space
-
-;=========================================================================
-; Leak test 4: Safely traversing infinite stream 
-;              while pointer to head of result exists.
-
-(define s (traverse (from 0)))  
-;(force s)                                    ;==> bounded space
-
-;=========================================================================
-; Convenient list deconstructor used below.
-
-(define-syntax match
-  (syntax-rules ()
-    ((match exp 
-       (()      exp1)
-       ((h . t) exp2))
-     (let ((lst exp))
-       (cond ((null? lst) exp1)
-             ((pair? lst) (let ((h (car lst))
-                                (t (cdr lst)))
-                            exp2))
-             (else 'match-error))))))
-
-;========================================================================
-; Leak test 5: Naive stream-filter should run in bounded space.
-;              Simplest case.
-
-(define (stream-filter p? s)
-  (lazy (match (force s)
-          (()      (delay '())) 
-          ((h . t) (if (p? h)
-                       (delay (cons h (stream-filter p? t)))
-                       (stream-filter p? t))))))
-
-;(force (stream-filter (lambda (n) (= n 10000000000))
-;                      (from 0)))
-                                             ;==> bounded space
-
-;========================================================================
-; Leak test 6: Another long traversal should run in bounded space.
-
-; The stream-ref procedure below does not strictly need to be lazy.  
-; It is defined lazy for the purpose of testing safe compostion of 
-; lazy procedures in the times3 benchmark below (previous 
-; candidate solutions had failed this).  
-
-(define (stream-ref s index)
-  (lazy
-   (match (force s)
-     (()      'error)
-     ((h . t) (if (zero? index)
-                  (delay h)
-                  (stream-ref t (- index 1)))))))
-
-; Check that evenness is correctly implemented - should terminate:
-
-(force (stream-ref (stream-filter zero? (from 0))
-                   0))                              ;==> 0
-
-(define s (stream-ref (from 0) 100000000))
-;(force s)                                          ;==> bounded space
-
-;======================================================================
-; Leak test 7: Infamous example from SRFI 40. 
-
-(define (times3 n)
-  (stream-ref (stream-filter
-               (lambda (x) (zero? (modulo x n)))
-               (from 0))
-              3))
-
-(force (times3 7))
-;(force (times3 100000000))                        ;==> bounded space
-
-</pre>
-
-    <H1>References</H1>
-
-[Wad98]
-Philip Wadler, Walid Taha, and David MacQueen. 
-<em>How to add laziness to a strict language, without even being odd</em>,
-Workshop on Standard ML, Baltimore, September 1998
-<p>
-[Jon92]
-Richard Jones. <em>Tail recursion without space leaks</em>, Journal of Functional Programming, 2(1):73-79, January 1992
-<p>
-[Fee97]
-Marc Feeley, James S. Miller, Guillermo J. Rozas, Jason A. Wilson, 
-<em> Compiling Higher-Order Languages into Fully Tail-Recursive Portable C</em>, 
-Rapport technique 1078, département d'informatique et r.o., Université de Montréal, août 1997. 
-
-
-
-
-    <H1>Copyright</H1>
-
-<p>Copyright (C) Andr&eacute; van Tonder (2003). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Author: <a href="mailto:andre@het.brown.edu">André van Tonder</a></address>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Francisco Solsona</a></address>
-<!-- Created: Fri Sep 19 17:55:00 EST 2002 -->
-<!-- hhmts start -->
-Last modified: Tue Dec 30 11:21:21 CST 2003
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-48.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-48.html
deleted file mode 100644
index e73f4aadc1..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-48.html
+++ /dev/null
@@ -1,797 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 48: Intermediate Format Strings</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 48: Intermediate Format Strings
-
-<H1>Author</H1>
-
-Ken Dickey
-
-<H1>Status</H1> 
-
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a
-SRFI can hold, see <a href="http://srfi.schemers.org/srfi-process.html">here</a>.  
-You can access
-previous messages via
-<a href="http://srfi.schemers.org/srfi-48/mail-archive/maillist.html">
-the archive of the mailing list</a>.
-
-    <p><ul>
-      <li>Received: 2003/11/24</li>
-      <li>Draft: 2003/11/25-2004/02/25</li>
-      <li>Revised: 2003/12/04</li>
-      <li>Revised: 2003/12/28</li>
-      <li>Final: 2004/03/02</li>
-      <li>Revised: 2005/06/01</li>
-      </ul></p>
-
-<H1>Abstract</H1>
-
-This document specifies Format Strings, a method of interpreting a Scheme string which contains a 
-number of format directives that are replaced with other string data according to the semantics of each directive.
-This SRFI extends <a href="http://srfi.schemers.org/srfi-28/srfi-28.html">SRFI-28</a> in being more generally useful but is less general than
-advanced format strings in that it does not allow, aside from ~F, for controlled positioning of text within fields.  
-
-<H1>Issues</H1>
-
-<P>
-Some may disagree with specific escape options or return values.  
-For those who desire complex options as implemented by SLIB 
-or Common Lisp's FORMAT, an upwards compatible 
-"Advanced Format" SRFI should be proposed.
-</P><P>
-In particular, the reference implementation given here does not accept numeric arguments 
-(aside from ~F).  
-Hence it does <b>not</b> support <a href="http://srfi.schemers.org/srfi-29/srfi-29.html">SRFI-29</a>.
-</P><P>
-It is highly desirable that baseline library code be small, attempt to
-eliminiate heap allocation and bound stack usage.  
-This is especially important in embedded systems.
-This can be accomplished by writing directly to a port, 
-rather than a string, by not supporting ~W or ~F, 
-and by replacing
-<I>(display (number->string n r) p)</I> with a carefully written 
-<I>(display:number->string n r p)</I> which does not build intermediate strings.
-</P><P>
-As this is <B>intermediate</B> format, it was felt that ~F and ~W are too highly useful to elide. 
-The ~H option is helpful to users, allows for programattic query, and makes clear which format directives are supported.
-</P>
-
-<H1>Rationale</H1>
-<P>
-Inheriting from MacLisp, nearly all Lisp and Scheme implementations support some form of
-FORMAT function with support for various numbers of format directives.  
-By agreeing to the options here, we raise the bar for portable code.  
-</P><P>
-The reference implementation is R5RS compliant and easy to port.
-In not requiring advanced features (aside from ~W and ~F) small implementations are possible. 
-E.g. the reference code does not use side effects (assignment) and is less than 
-a third the source size of the latest SLIB implementation of FORMAT 
-(less than a tenth if ~F support is elided).
-</P><P>
-The optional <i>port</i> argument allows for compatibility with older code 
-written for, e.g. scheme48, MIT Scheme, T, et cetera, which required a port argument.  
-It is also useful in cases where a synoptic
-implementation of Scheme and CommonLisp is maintained.
-</P>
-
-<H1>Specification</H1>
-
-    <a name="format"><b><tt>format</tt></b></a> <tt><i>[port] format-string [obj ...]</i> </tt>
-
-    <blockquote>
-      <p>Accepts a format template (a Scheme String), and
-      processes it, replacing any format directives in order with
-      one or more characters, the characters themselves dependent
-      on the semantics of the format directive encountered.  Each directive
-      may consume one obj. It is an error if fewer or more obj values are
-      provided than format directives that require them.</p>
-      
-      <p>When a <i>port</i> is specified it must be either an output port or 
-      a boolean.  If an output-port is specified, the formatted output is
-      output into that port.  If the port argument is #t, output is to the
-      current-output-port.  If the port is #f or no port is specified, the
-      output is returned as a string.  If the port is specified and is #t 
-      or an output-port, the result of the format function is unspecified.</p>
-      
-      <p>It is unspecified which encoding is used (e.g. ASCII, EBCDIC, UNICODE).  
-      A given implementation must specify which encoding is used.  
-      The implementation may or may not allow the encoding to be selected or changed.</p>
-      
-      <p>It is an error if an format directive consumes an <i>obj</i> argument and 
-      that argument does not
-      confirm to a required type as noted in the table below.</p>
-      
-      <p>It is permissible, but highly discouraged, to implement pretty-print as
-      <i>(define pretty-print write)</i>.</p>
-
-      <p>An format directive is a two character sequence in the
-      string where the first character is a tilde '~'. Directive characters
-      are case-independent, i.e. upper and lower case characters
-      are interpreted the same.  Each directive
-      code's meaning is described in the following table:</p>
-      
-      <table>
-<tr>
-<td><b>DIRECTIVE</b></td>
-<td><b>MNEMONIC</b></td>
-<td><b>ACTION</b></td>
-<td><b>CONSUMES?</b><td>
-</tr>
-<tr>
-	<td>~a</td>
-	<td>Any</td>
-	<td>(display obj) for humans</td>
-	<td>yes</td>
-</tr>
-<tr>
-	<td>~s</td>
-	<td>Slashified</td>
-	<td>(write obj) for parsers</td>
-	<td>yes</td>
-</tr>
-<tr>
-	<td>~w</td>
-	<td>WriteCircular</td>
-	<td>(write-with-shared-structure obj) like ~s, but handles recursive structures</td>
-	<td>yes</td>
-</tr>	
-<tr>
-	<td>~d</td>
-	<td>Decimal</td>
-	<td>the obj is a number which is output in decimal radix</td>
-	<td>yes</td>
-</tr>
-<tr>
-	<td>~x</td>
-	<td>heXadecimal</td>
-	<td>the obj is a number which is output in hexdecimal radix</td>
-	<td>yes</td>
-</tr>
-<tr>
-	<td>~o</td>
-	<td>Octal</td>
-	<td>the obj is a number which is output in octal radix</td>
-	<td>yes</td>
-</tr>
-<tr>
-	<td>~b</td>
-	<td>Binary</td>
-	<td>the obj is a number which is output in binary radix</td>
-	<td>yes</td>
-</tr>
-<tr>
-	<td>~c</td>
-	<td>Character</td>
-	<td>the single charater obj is output by write-char</td>
-	<td>yes</td>
-</tr>
-<tr>
-	<td>~y</td>
-	<td>Yuppify</td>
-	<td>the list obj is pretty-printed to the output</td>
-	<td>yes</td>
-</tr>
-<tr>
-	<td>~?</td>
-	<td>Indirection</td>
-	<td>the obj is another format-string and the following obj is a list of arguments; format is called recursively</td>
-	<td>yes</td>
-</tr>
-<tr>
-	<td>~K</td>
-	<td>Indirection</td>
-	<td>the same as ~? for backward compatibility with some existing implementations</td>
-	<td>yes</td>
-</tr>
-<tr>
-	<td>~[w[,d]]F</td>
-	<td>Fixed</td>
-	<td>~w,dF outputs a number with width w and d digits after the decimal; 
-	~wF outputs a string or number with width w.</td>
-	<td>yes</td>
-</tr>
-<tr>
-	<td>~~</td>
-	<td>Tilde</td>
-	<td>output a tilde</td>
-	<td>no</td>
-</tr>
-<tr>
-	<td>~t</td>
-	<td>Tab</td>
-	<td>output a tab character</td>
-	<td>no</td>
-</tr>
-<tr>
-	<td>~%</td>
-	<td>Newline</td>
-	<td>output a newline character</td>
-	<td>no</td>
-</tr>
-<tr>
-	<td>~&</td>
-	<td>Freshline</td>
-	<td>output a newline character if it is known that the previous output was not a newline</td>
-	<td>no</td>
-</tr>
-<tr>
-	<td>~_</td>
-	<td>Space</td>
-	<td>a single space character is output</td>
-	<td>no</td>
-</tr>
-<tr>
-	<td>~h</td>
-	<td>Help</td>
-	<td>outputs one line of call synopsis, one line of comment, and one line of
-synopsis for each format directive, starting with the directive (e.g. "~t")
-	</td>
-	<td>no</td>
-</tr>
-	</table>
-<br>
-	<p>
-	The <b>~F</b>, fixed format, directive requires some elucidation.
-	</p><p>
-	<b>~wF</b> is useful for strings or numbers.  Where the string (or number->string
-	of the number) has fewer characters than the integer width w, the string is
-	padded on the left with space characters.
-	</p><p>
-	<b>~w,dF</b> is typically used only on numbers.  For strings, the <b>d</b>
-	specifier is ignored. For numbers, the integer <b>d</b> specifies the number
-	of decimal digits after the decimal place.  Both <b>w</b> and <b>d</b> must be
-	zero or positive.
-	</p><p>
-	If <b>d</b> is specified, the number is processed
-	as if added to 0.0, i.e. it is converted to an inexact value.
-	<pre>(format "~8,2F" 1/3) =&gt; "    0.33"</pre>
-	If no <b>d</b> is specified, the number is <i>not</i> coerced to inexact.
-	<pre>(format "~6F" 32) =&gt; "    32"</pre>
-	Digits are padded to the right with zeros
-	<pre>(format "~8,2F" 32) =&gt; "   32.00"</pre>
-	If the number it too large to fit in the width specified, 
-	a string longer than the width is returned
-	<pre>(format "~1,2F" 4321) =&gt; "4321.00"</pre>
-	If the number is complex, <b>d</b> is applied to both real and imaginal parts
-	<pre>(format "~1,2F" (sqrt -3.9)) =&gt; "0.00+1.97i"</pre>
-	</p><p>
-	For very large or very small numbers, the point where exponential notation 
-	is used is implementation defined.
-	<pre>(format "~8F" 32e5) =&gt; "   3.2e6" or "3200000.0"</pre>
-	</p>
-    </blockquote>
-<br>
-    <h2>Examples</h2>
-<pre>
-(format "~h")
-; =&gt; 
-"(format [&lt;port&gt;] &lt;format-string&gt; [&lt;arg&gt;...]) -- &lt;port&gt; is #t, #f or an output-port
-OPTION	[MNEMONIC]	DESCRIPTION	-- This implementation Assumes ASCII Text Encoding
-~H	[Help]		output this text
-~A	[Any]		(display arg) for humans
-~S	[Slashified]	(write arg) for parsers
-~~	[tilde]		output a tilde
-~T	[Tab]		output a tab character
-~%	[Newline]	output a newline character
-~&	[Freshline]	output a newline character if the previous output was not a newline
-~D	[Decimal]	the arg is a number which is output in decimal radix
-~X	[heXadecimal]	the arg is a number which is output in hexdecimal radix
-~O	[Octal]		the arg is a number which is output in octal radix
-~B	[Binary]	the arg is a number which is output in binary radix
-~w,dF	[Fixed]		the arg is a string or number which has width w and d digits after the decimal
-~C	[Character]	charater arg is output by write-char
-~_	[Space]		a single space character is output
-~Y	[Yuppify]	the list arg is pretty-printed to the output
-~?	[Indirection]	recursive format: next arg is a format-string and the following arg a list of arguments
-~K	[Indirection]	same as ~?
-"
-
-(format "Hello, ~a" "World!")
-; =&gt; "Hello, World!"
-
-(format "Error, list is too short: ~s" '(one "two" 3))
-; =&gt; "Error, list is too short: (one \"two\" 3))"
-
-(format "test me")
-; =&gt; "test me"
-
-(format "~a ~s ~a ~s" 'this 'is "a" "test")
-; =&gt; "this is a \"test\""
-
-(format #t "#d~d #x~x #o~o #b~b~%" 32 32 32 32)
-;; Prints:   #d32 #x20 #o40 #b100000
-; =&gt; &lt;unspecified&gt;
-
-(format "~a ~? ~a" 'a "~s" '(new) 'test)
-; =&gt;"a new test"
-
-(format #f "~&1~&~&2~&~&~&3~%")
-; =&gt; 
-"
-1
-2
-3
-"
-
-(format #f "~a ~? ~a ~%" 3 " ~s ~s " '(2 2) 3)
-; =&gt; 
-"3  2 2  3 
-"
-
-(format "~w" (let ( (c '(a b c)) ) (set-cdr! (cddr c) c) c))
-; =&gt; "#1=(a b c . #1#)"
-
-(format "~8,2F" 32)
-; =&gt; "   32.00"
-
-(format "~8,3F" (sqrt -3.8))
-; =&gt; "0.000+1.949i"
-
-(format "~8,2F" 3.4567e11)
-; =&gt; " 3.45e11"
-
-(format "~6,3F" 1/3)
-; =&gt; " 0.333"
-
-(format "~4F" 12)
-; =&gt; "  12"
-
-(format "~8,3F" 123.3456)
-; =&gt; " 123.346"
-
- (format "~6,3F" 123.3456)
-; =&gt; "123.346"
-
- (format "~2,3F" 123.3456)
-; =&gt; "123.346"
-
-(format "~8,3F" "foo")
-; =&gt; "     foo"
-
-(format "~a~a~&" (list->string (list #\newline)) "")
-; =&gt;
-"
-"
-
-</pre>
-    
-
-
-<H1>Implementation</H1>
-
-    The implementation below requires SRFI-6 (Basic string ports),
-    SRFI-23 (Error reporting mechanism) and 
-    SRFI-38 (External Representation for Data With Shared Structure). <br>
-     
-
-<pre>
-
-;; IMPLEMENTATION DEPENDENT options
-
-(define ascii-tab   (integer->char  9))  ;; NB: assumes ASCII encoding
-(define dont-print  (if (eq? #t #f) 1))
-;;(define DONT-PRINT (string->symbol ""))
-;;(define DONT-PRINT (void))
-;;(define DONT-PRINT #!void)
-(define pretty-print   write) ; ugly but permitted
-;; (require 'srfi-38)  ;; write-with-shared-structure
-
-
-;; FORMAT
-(define (format . args)
-  (cond
-   ((null? args)
-    (error "FORMAT: required format-string argument is missing")
-    )
-   ((string? (car args))
-    (apply format (cons #f args)))
-   ((< (length args) 2)
-    (error (format #f "FORMAT: too few arguments ~s" (cons 'format args)))
-    )
-   (else
-    (let ( (output-port   (car  args))
-           (format-string (cadr args))
-           (args          (cddr args))
-         )
-      (letrec ( (port 
-                 (cond ((output-port? output-port) output-port)
-                       ((eq? output-port #t) (current-output-port)) 
-                       ((eq? output-port #f) (open-output-string)) 
-                       (else (error
-                              (format #f "FORMAT: bad output-port argument: ~s"
-                                      output-port)))
-                ) )
-                (return-value 
-                 (if (eq? output-port #f)    ;; if format into a string 
-                     (lambda () (get-output-string port)) ;; then return the string
-                     (lambda () dont-print)) ;; else do something harmless
-                 )        
-             )  
-
-         (define (string-index str c)
-           (let ( (len (string-length str)) )
-             (let loop ( (i 0) )
-               (cond ((= i len) #f)
-                     ((eqv? c (string-ref str i)) i)
-                     (else (loop (+ i 1)))))))
-
-         (define (string-grow str len char)
-           (let ( (off (- len (string-length str))) )
-             (if (positive? off)
-               (string-append (make-string off char) str)
-               str)))
-
-         (define (compose-with-digits digits pre-str frac-str exp-str)
-           (let ( (frac-len (string-length frac-str)) )
-             (cond
-              ((< frac-len digits) ;; grow frac part, pad with zeros
-               (string-append pre-str "."
-                              frac-str (make-string (- digits frac-len) #\0)
-                              exp-str)
-               )
-              ((= frac-len digits) ;; frac-part is exactly the right size
-               (string-append pre-str "."
-                              frac-str
-                              exp-str)
-               )
-              (else ;; must round to shrink it
-               (let* ( (first-part (substring frac-str 0 digits))
-                       (last-part  (substring frac-str digits frac-len))
-                       (temp-str
-                        (number->string
-                         (round (string->number
-                                 (string-append first-part "." last-part)))))
-                       (dot-pos (string-index  temp-str #\.))
-                       (carry?
-                        (and (> dot-pos digits)
-                             (> (round (string->number
-                                        (string-append "0." frac-str)))
-                                0)))
-                       (new-frac
-                        (substring temp-str 0 digits))
-                     )
-                 (string-append
-                  (if carry? (number->string (+ 1 (string->number pre-str))) pre-str)
-                  "."
-                  new-frac
-                  exp-str)))
-         ) ) )
- 
-         (define (format-fixed number-or-string width digits) ; returns a string
-           (cond
-            ((string? number-or-string)
-             (string-grow number-or-string width #\space)
-             )
-            ((number? number-or-string)
-             (let ( (real (real-part number-or-string))
-                    (imag (imag-part number-or-string))
-                  )
-               (cond
-                ((not (zero? imag))
-                 (string-grow
-                  (string-append (format-fixed real 0 digits)
-                                 (if (negative? imag) "" "+")
-                                 (format-fixed imag 0 digits)
-                                 "i")
-                  width
-                  #\space)
-                 )
-                (digits
-                 (let* ( (num-str   (number->string (exact->inexact real)))
-                         (dot-index (string-index  num-str #\.))
-                         (exp-index (string-index  num-str #\e))
-                         (length    (string-length num-str))
-                         (pre-string
-                          (cond
-                           (exp-index
-                            (if dot-index
-                                (substring num-str 0 dot-index)
-                                (substring num-str 0 (+ exp-index 1)))
-                            )
-                           (dot-index
-                            (substring num-str 0 dot-index)
-                            )
-                           (else
-                            num-str))
-                          )
-                         (exp-string
-                          (if exp-index (substring num-str exp-index length) "")
-                          )
-                         (frac-string
-                          (if exp-index
-                              (substring num-str (+ dot-index 1) exp-index)
-                              (substring num-str (+ dot-index 1) length))
-                          )
-                       )
-                   (string-grow
-                    (if dot-index
-                        (compose-with-digits digits
-                                             pre-string
-                                             frac-string
-                                             exp-string)
-                        (string-append pre-string exp-string))
-                    width
-                    #\space)
-                 ))
-                (else ;; no digits
-                 (string-grow (number->string real) width #\space)))
-             ))
-            (else
-             (error
-              (format "FORMAT: ~F requires a number or a string, got ~s" number-or-string)))
-            ))
-
-         (define documentation-string
-"(format [&lt;port&gt;] &lt;format-string&gt; [&lt;arg&gt;...]) -- &lt;port&gt; is #t, #f or an output-port
-OPTION  [MNEMONIC]      DESCRIPTION     -- Implementation Assumes ASCII Text Encoding
-~H      [Help]          output this text
-~A      [Any]           (display arg) for humans
-~S      [Slashified]    (write arg) for parsers
-~W      [WriteCircular] like ~s but outputs circular and recursive data structures
-~~      [tilde]         output a tilde
-~T      [Tab]           output a tab character
-~%      [Newline]       output a newline character
-~&      [Freshline]     output a newline character if the previous output was not a newline
-~D      [Decimal]       the arg is a number which is output in decimal radix
-~X      [heXadecimal]   the arg is a number which is output in hexdecimal radix
-~O      [Octal]         the arg is a number which is output in octal radix
-~B      [Binary]        the arg is a number which is output in binary radix
-~w,dF   [Fixed]         the arg is a string or number which has width w and d digits after the decimal
-~C      [Character]     charater arg is output by write-char
-~_      [Space]         a single space character is output
-~Y      [Yuppify]       the list arg is pretty-printed to the output
-~?      [Indirection]   recursive format: next 2 args are format-string and list of arguments
-~K      [Indirection]   same as ~?
-"
-          )
-
-         (define (require-an-arg args)
-           (if (null? args)
-               (error "FORMAT: too few arguments" ))
-         )
-        
-         (define (format-help format-strg arglist)
-          
-          (letrec (
-             (length-of-format-string (string-length format-strg))
-             
-             (anychar-dispatch       
-              (lambda (pos arglist last-was-newline) 
-                (if (>= pos length-of-format-string) 
-                  arglist ; return unused args 
-                  (let ( (char (string-ref format-strg pos)) ) 
-                    (cond            
-                     ((eqv? char #\~)   
-                      (tilde-dispatch (+ pos 1) arglist last-was-newline)) 
-                     (else                   
-                      (write-char char port)     
-                      (anychar-dispatch (+ pos 1) arglist #f)        
-                      ))               
-                    ))        
-             )) ; end anychar-dispatch
-
-             (has-newline?
-              (lambda (whatever last-was-newline)
-                (or (eqv? whatever #\newline)
-                    (and (string? whatever)
-                         (let ( (len (string-length whatever)) )
-                           (if (zero? len)
-                               last-was-newline
-                               (eqv? #\newline (string-ref whatever (- len 1)))))))
-              )) ; end has-newline?
-             
-             (tilde-dispatch          
-              (lambda (pos arglist last-was-newline)     
-                (cond           
-                 ((>= pos length-of-format-string)   
-                  (write-char #\~ port) ; tilde at end of string is just output
-                  arglist ; return unused args
-                  )     
-                 (else      
-                  (case (char-upcase (string-ref format-strg pos)) 
-                    ((#\A)       ; Any -- for humans
-                     (require-an-arg arglist)
-                     (let ( (whatever (car arglist)) )
-                       (display whatever port)
-                       (anychar-dispatch (+ pos 1) 
-                                         (cdr arglist) 
-                                         (has-newline? whatever last-was-newline))
-                     ))
-                    ((#\S)       ; Slashified -- for parsers
-                     (require-an-arg arglist)
-                     (let ( (whatever (car arglist)) )
-                        (write whatever port)     
-                        (anychar-dispatch (+ pos 1) 
-                                          (cdr arglist) 
-                                          (has-newline? whatever last-was-newline)) 
-                     ))
-                    ((#\W)
-                     (require-an-arg arglist)
-                     (let ( (whatever (car arglist)) )
-                        (write-with-shared-structure whatever port)  ;; srfi-38
-                        (anychar-dispatch (+ pos 1) 
-                                          (cdr arglist) 
-                                          (has-newline? whatever last-was-newline))
-                     ))                           
-                    ((#\D)       ; Decimal
-                     (require-an-arg arglist)
-                     (display (number->string (car arglist) 10) port)  
-                     (anychar-dispatch (+ pos 1) (cdr arglist) #f)  
-                     )            
-                    ((#\X)       ; HeXadecimal
-                     (require-an-arg arglist)
-                     (display (number->string (car arglist) 16) port)
-                     (anychar-dispatch (+ pos 1) (cdr arglist) #f)  
-                     )             
-                    ((#\O)       ; Octal
-                     (require-an-arg arglist)
-                     (display (number->string (car arglist)  8) port) 
-                     (anychar-dispatch (+ pos 1) (cdr arglist) #f) 
-                     )       
-                    ((#\B)       ; Binary
-                     (require-an-arg arglist)
-                     (display (number->string (car arglist)  2) port)
-                     (anychar-dispatch (+ pos 1) (cdr arglist) #f) 
-                     )           
-                    ((#\C)       ; Character
-                     (require-an-arg arglist)
-                     (write-char (car arglist) port) 
-                     (anychar-dispatch (+ pos 1) (cdr arglist) (eqv? (car arglist) #\newline))  
-                     )          
-                    ((#\~)       ; Tilde  
-                     (write-char #\~ port)   
-                     (anychar-dispatch (+ pos 1) arglist #f) 
-                     )            
-                    ((#\%)       ; Newline   
-                     (newline port) 
-                     (anychar-dispatch (+ pos 1) arglist #t) 
-                     )
-                    ((#\&)      ; Freshline
-                     (if (not last-was-newline) ;; (unless last-was-newline ..
-                         (newline port))
-                     (anychar-dispatch (+ pos 1) arglist #t)
-                     )
-                    ((#\_)       ; Space 
-                     (write-char #\space port)   
-                     (anychar-dispatch (+ pos 1) arglist #f)
-                     )             
-                    ((#\T)       ; Tab -- IMPLEMENTATION DEPENDENT ENCODING    
-                     (write-char ascii-tab port)          
-                     (anychar-dispatch (+ pos 1) arglist #f)     
-                     )             
-                    ((#\Y)       ; Pretty-print
-                     (pretty-print (car arglist) port)  ;; IMPLEMENTATION DEPENDENT
-                     (anychar-dispatch (+ pos 1) (cdr arglist) #f)
-                     )              
-                    ((#\F)
-                     (require-an-arg arglist)
-                     (display (format-fixed (car arglist) 0 #f) port)
-                     (anychar-dispatch (+ pos 1) (cdr arglist) #f)
-                     )
-                    ((#\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9) ;; gather "~w[,d]F" w and d digits
-                     (let loop ( (index (+ pos 1))
-                                 (w-digits (list (string-ref format-strg pos)))
-                                 (d-digits '())
-                                 (in-width? #t)
-                               )
-                       (if (>= index length-of-format-string)
-                           (error
-                            (format "FORMAT: improper numeric format directive in ~s" format-strg))
-                           (let ( (next-char (string-ref format-strg index)) )
-                             (cond
-                              ((char-numeric? next-char)
-                               (if in-width?
-                                   (loop (+ index 1)
-                                         (cons next-char w-digits)
-                                         d-digits
-                                         in-width?)
-                                   (loop (+ index 1)
-                                         w-digits
-                                         (cons next-char d-digits)
-                                         in-width?))
-                               )
-                              ((char=? next-char #\F)
-                               (let ( (width  (string->number (list->string (reverse w-digits))))
-                                      (digits (if (zero? (length d-digits))
-                                                  #f
-                                                  (string->number (list->string (reverse d-digits)))))
-                                    )
-                                 (display (format-fixed (car arglist) width digits) port)
-                                 (anychar-dispatch (+ index 1) (cdr arglist) #f))
-                               )
-                              ((char=? next-char #\,)
-                               (if in-width?
-                                   (loop (+ index 1)
-                                         w-digits
-                                         d-digits
-                                         #f)
-                                   (error
-                                    (format "FORMAT: too many commas in directive ~s" format-strg)))
-                               )
-                              (else
-                               (error (format "FORMAT: ~~w.dF directive ill-formed in ~s" format-strg))))))
-                     ))
-                    ((#\? #\K)       ; indirection -- take next arg as format string
-                     (cond           ;  and following arg as list of format args
-                      ((< (length arglist) 2)
-                       (error
-                        (format "FORMAT: less arguments than specified for ~~?: ~s" arglist))
-                       )
-                      ((not (string? (car arglist)))
-                       (error
-                        (format "FORMAT: ~~? requires a string: ~s" (car arglist)))
-                       )
-                      (else
-                       (format-help (car arglist) (cadr arglist))
-                       (anychar-dispatch (+ pos 1) (cddr arglist) #f)
-                     )))
-                    ((#\H)      ; Help
-                     (display documentation-string port)
-                     (anychar-dispatch (+ pos 1) arglist #t)
-                     )
-                    (else                
-                     (error (format "FORMAT: unknown tilde escape: ~s"
-                                    (string-ref format-strg pos))))
-                    )))
-                )) ; end tilde-dispatch   
-             ) ; end letrec            
-            
-             ; format-help main      
-             (anychar-dispatch 0 arglist #f) 
-            )) ; end format-help    
-        
-        ; format main
-        (let ( (unused-args (format-help format-string args)) )
-          (if (not (null? unused-args))
-              (error
-               (format "FORMAT: unused arguments ~s" unused-args)))
-          (return-value))
-                                              
-      )) ; end letrec, if
-)))  ; end format
-
-</pre>
-
-
-<H1>Copyright</H1>
-<p>Copyright (C) Kenneth A Dickey (2003). All Rights Reserved.</p>
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Author: <a href="mailto:Ken.Dickey@allvantage.com">Ken Dickey</a></address>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Francisco Solsona</a></address>
-<!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-<!-- hhmts start -->
-Last modified: Wed Jun 01 10:40:09 CST 2005
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-5.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-5.html
deleted file mode 100644
index ee42593b0e..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-5.html
+++ /dev/null
@@ -1,345 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.2//EN">
-<html>
-<head>
-   <title>SRFI 5: A compatible let form with signatures and rest arguments</title>
-</head>
-<body>
-
-<H1>Title</H1>
-
-SRFI-5: A compatible <code>let</code> form with signatures and rest arguments
-
-<H1>Author</H1>
-
-Andy Gaynor
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion on this SRFI via <A HREF="http://srfi.schemers.org/srfi-5/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P><UL>
-<LI>Received: 1999/2/2
-<LI>Draft: 1999/2/10-1999/04/12
-<LI>Final: 1999/4/26
-<LI>Revised reference implementation: 2003/01/27
-</UL>
-
-<H1>Abstract</H1>
-
-The <i>named-let</i> incarnation of the <code>let</code> form has two slight
-inconsistencies with the <code>define</code> form.  As defined, the <code>let</code>
-form makes no accommodation for rest arguments, an issue of functionality
-and consistency.  As defined, the <code>let</code> form does not accommodate
-signature-style syntax, an issue of aesthetics and consistency.  Both
-issues are addressed here in a manner which is compatible with the traditional
-<code>let</code> form but for minor extensions.
-
-<H1>Rationale</H1>
-
-<H2>Signature-style Syntax</H2>
-
-Consider the following two equivalent definitions:
-
-<p><pre>
-(define fibonacci
-  (lambda (n i f0 f1)
-    (if (= i n)
-      f0
-      (fibonacci n (+ i 1) f1 (+ f0 f1)))))
-
-(define (fibonacci n i f0 f1)
-  (if (= i n)
-    f0
-    (fibonacci n (+ i 1) f1 (+ f0 f1))))
-</pre>
-
-Although there is a named-let analog for the former form, there is none
-for the latter.  To wit, suppose one wished to compute the 10th element
-of the Fibonacci sequence using a named let:
-
-<p>
-<pre>
-(let fibonacci ((n 10) (i 0) (f0 0) (f1 1))
-  (if (= i n)
-    f0
-    (fibonacci n (+ i 1) f1 (+ f0 f1))))
-Values: 55
-</pre>
-
-As it stands, one cannot equivalently write
-
-<p>
-<pre>
-(let (fibonacci (n 10) (i 0) (f0 0) (f1 1))
-  (if (= i n)
-    f0
-    (fibonacci n (+ i 1) f1 (+ f0 f1))))
-</pre>
-
-which is consistent with <code>define</code>'s signature-style form.
-<p>Those that favor the signature style may prefer this extension. 
-In any case, it may be more appropriate to include all bound names within
-the binding section.  As presented, this straightforward extension
-introduces no ambiguity or incompatibility with the existing definition
-of let.
-
-<H2>Rest Arguments</H2>
-
-As it stands, one cannot write a named let with rest arguments, as in
-
-<p>
-<pre>
-(let (blast (port (current-output-port)) . (x (+ 1 2) 4 5))
-  (if (null? x)
-    'just-a-silly-contrived-example
-    (begin
-      (write (car x) port)
-      (apply blast port (cdr x)))))
-</pre>
-
-otherwise equivalent to
-
-<p>
-<pre>
-(letrec ((blast (lambda (port . x)
-		  (if (null? x)
-		      'just-a-silly-contrived-example
-		      (begin
-			(write (car x) port)
-			(apply blast port (cdr x)))))))
-  (blast (current-output-port) (+ 1 2) 4 5))
-</pre>
-
-While this example is rather contrived, the functionality is not. 
-There are several times when the author has used this construct in practice. 
-Regardless, there is little reason to deny the <code>let</code> form access to
-all the features of lambda functionality.
-
-<H2>Symbols in Binding Sections</H2>
-
-Both the features above rely upon the placement of symbols in <code>let</code>
-binding lists (this statement is intentially simplistic).  The only
-other apparent use of such symbol placement is to tersely bind variables
-to unspecified values.  For example, one might desire to use
-<code>(let (foo bar baz) ...)</code>
-to bind <code>foo</code>, <code>bar</code>, and <code>baz</code> to
-unspecified values.
-
-<p>This usage is considered less important in light of the rationales
-presented above, and an alternate syntax is immediately apparent, as
-in <code>(let ((foo) (bar) (baz)) ...)</code> This may even
-be preferable, consistently parenthesizing normal binding clauses.
-
-<H1>Specification</H1>
-
-<H2>Syntax</H2>
-
-<p>
-A formal specification of the syntax follows.  Below, body, expression,
-and identifier are free.  Each instantiation of binding-name must be
-unique.
-</p>
-
-<p>
-<pre>
-            let = "(" "let" let-bindings body ")"
-    expressions = nothing | expression expressions
-   let-bindings = let-name bindings
-                | "(" let-name "." bindings ")"
-       let-name = identifier
-       bindings = "(" ")"
-                | rest-binding
-                | "(" normal-bindings ["." rest-binding] ")"
-normal-bindings = nothing
-                | normal-binding normal-bindings
- normal-binding = "(" binding-name expression ")"
-   binding-name = identifier
-   rest-binding = "(" binding-name expressions ")"
-</pre>
-
-<p>
-For clarity and convenience, an informal specification follows.
-</p>
-
-<ol>
-<li><a name="unnamed">Unnamed</a>
-
-<p><pre>
-(let ((&lt;parameter&gt; &lt;argument&gt;)...) 
-  &lt;body&gt;...)
-</pre>
-</li>
-
-<li><a name="named-non-sig">
-Named, non-signature-style, no rest argument</a>
-
-<p><pre>
-(let &lt;name&gt; ((&lt;parameter&gt; &lt;argument&gt;)...)
-  &lt;body&gt;...)
-</pre>
-</li>
-
-<li><a name="named-sig">Named, signature-style,  no rest argument</a>
-
-<p><pre>
-(let (&lt;name&gt; (&lt;parameter&gt; &lt;argument&gt;)...)
-  &lt;body&gt;...)
-</pre>
-</li>
-
-<li><a name="named-non-sig-rest">Named, non-signature-style, rest argument</a>
-
-<p><pre>
-(let &lt;name&gt; ((&lt;parameter&gt; &lt;argument&gt;)...
-    
-. (&lt;rest-parameter&gt; &lt;rest-argument&gt;...))
-  &lt;body&gt;...)
-</pre>
-
-<li><a name="named-sig-rest">Named, signature-style, rest argument</a>
-
-<p><pre>
-(let (&lt;name&gt; (&lt;parameter&gt; &lt;argument&gt;)...
-   
-. (&lt;rest-parameter&gt; &lt;rest-argument&gt;...))
-  &lt;body&gt;...)
-</pre>
-</li>
-</ol>
-
-<H2>Semantics</H2>
-
-Let <code>$lambda</code> and <code>$letrec</code> be hygienic bindings for the <code>lambda</code>
-and <code>letrec</code> forms, respectively.
-
-<ul>
-<li>For informal syntax 1:
-
-<p><pre>
-(($lambda (&lt;parameter&gt;...) &lt;body&gt;...) &lt;argument&gt;...)
-</pre>
-</li>
-
-<li>For informal syntaxes 2 and 3:
-
-<p>
-<pre>
-($letrec ((&lt;name&gt; ($lambda (&lt;parameter&gt;...) &lt;body&gt;...)))
-  (&lt;name&gt; &lt;argument&gt;...))
-</pre>
-</li>
-
-<li>For informal syntaxes 4 and 5:
-
-<p>
-<pre>
-($letrec ((&lt;name&gt; ($lambda (&lt;parameter&gt;...
-   
-. &lt;rest-parameter&gt;) &lt;body&gt;...))) 
-  (&lt;name&gt; &lt;argument&gt;... &lt;rest-argument&gt;...))
-</pre>
-</li>
-</ul>
-
-<H1>Implementation</H1>
-
-Here is an implementation using <code>SYNTAX-RULES</code>.
-
-<p>
-<pre>
-;; Use your own standard let.
-;; Or call a lambda.
-;; (define-syntax standard-let
-;;
-;;   (syntax-rules ()
-;;
-;;     ((let ((var val) ...) body ...)
-;;      ((lambda (var ...) body ...) val ...))))
-
-(define-syntax let
-
-  (syntax-rules ()
-
-    ;; No bindings: use standard-let.
-    ((let () body ...)
-     (standard-let () body ...))
-    ;; Or call a lambda.
-    ;; ((lambda () body ...))
-
-    ;; All standard bindings: use standard-let.
-    ((let ((var val) ...) body ...)
-     (standard-let ((var val) ...) body ...))
-    ;; Or call a lambda.
-    ;; ((lambda (var ...) body ...) val ...)
-
-    ;; One standard binding: loop.
-    ;; The all-standard-bindings clause didn't match,
-    ;; so there must be a rest binding.
-    ((let ((var val) . bindings) body ...)
-     (let-loop #f bindings (var) (val) (body ...)))
-
-    ;; Signature-style name: loop.
-    ((let (name binding ...) body ...)
-     (let-loop name (binding ...) () () (body ...)))
-
-    ;; defun-style name: loop.
-    ((let name bindings body ...)
-     (let-loop name bindings () () (body ...)))))
-
-(define-syntax let-loop
-
-  (syntax-rules ()
-
-    ;; Standard binding: destructure and loop.
-    ((let-loop name ((var0 val0) binding ...) (var ...     ) (val ...     ) body)
-     (let-loop name (            binding ...) (var ... var0) (val ... val0) body))
-
-    ;; Rest binding, no name: use standard-let, listing the rest values.
-    ;; Because of let's first clause, there is no "no bindings, no name" clause.
-    ((let-loop #f (rest-var rest-val ...) (var ...) (val ...) body)
-     (standard-let ((var val) ... (rest-var (list rest-val ...))) . body))
-    ;; Or call a lambda with a rest parameter on all values.
-    ;; ((lambda (var ... . rest-var) . body) val ... rest-val ...))
-    ;; Or use one of several other reasonable alternatives.
-
-    ;; No bindings, name: call a letrec'ed lambda.
-    ((let-loop name () (var ...) (val ...) body)
-     ((letrec ((name (lambda (var ...) . body)))
-        name)
-      val ...))
-
-    ;; Rest binding, name: call a letrec'ed lambda.
-    ((let-loop name (rest-var rest-val ...) (var ...) (val ...) body)
-     ((letrec ((name (lambda (var ... . rest-var) . body)))
-        name)
-      val ... rest-val ...))))
-</pre>
-
-
-<H1>Copyright</H1>
-
-Copyright (C) Andy Gaynor (1999). All Rights Reserved.
-<p>This document and translations of it may be copied and furnished to
-others, and derivative works that comment on or otherwise explain it or
-assist in its implementation may be prepared, copied, published and distributed,
-in whole or in part, without restriction of any kind, provided that the
-above copyright notice and this paragraph are included on all such copies
-and derivative works. However, this document itself may not be modified
-in any way, such as by removing the copyright notice or references to the
-Scheme Request For Implementation process or editors, except as needed
-for the purpose of developing SRFIs in which case the procedures for copyrights
-defined in the SRFI process must be followed, or as required to translate
-it into languages other than English.
-<p>The limited permissions granted above are perpetual and will not be
-revoked by the authors or their successors or assigns.
-<p>This document and the information contained herein is provided on an
-"AS IS" basis and THE AUTHOR AND THE SRFI EDITORS DISCLAIM ALL WARRANTIES,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE
-USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-
-</body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-54.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-54.html
deleted file mode 100644
index da1c5a7284..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-54.html
+++ /dev/null
@@ -1,652 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html><head><title>SRFI 54: Formatting</title></head><body>
-
-<h1>Title</h1>
-
-Formatting
-
-<h1>Author</h1>
-
-Joo ChurlSoo
-
-<h1>Status</h1>
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <a href="http://srfi.schemers.org/srfi-process.html">here</a>.
-You can access the discussion via <a href="http://srfi.schemers.org/srfi-54/mail-archive/maillist.html">the archive of the mailing list</a>.
-<p></p><ul>
-
-<li>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-54/srfi-54.txt?rev=1.1">2004/03/28</a></li>
-<li>Draft: 2004/03/22-2004/06/22</li>
-<li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-54/srfi-54.txt?rev=1.3">2004/04/07</a></li>
-<li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-54/srfi-54.txt?rev=1.4">2004/04/12</a></li>
-<li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-54/srfi-54.txt?rev=1.6">2004/04/20</a></li>
-<li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-54/srfi-54.txt?rev=1.7">2004/04/29</a></li>
-<li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-54/srfi-54.txt?rev=1.8">2004/05/27</a></li>
-<li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-54/srfi-54.html?rev=1.9">2004/06/09</a></li>
-<li>Reference implementation fix: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-54/srfi-54.html?rev=1.10">2006/01/20</a></li>
-<li>Final: 2004/06/24</li>
-</ul>
-
-<h1>Abstract</h1>
-
-
-<p>This SRFI introduces the CAT procedure that converts any object to a string.
-It takes one object as the first argument and accepts a variable number of
-optional arguments, unlike the procedure called FORMAT.</p>
-
-
-<h1>Rationale</h1>
-
-
-<p>It is difficult to gain a complete consensus for the design of a generic
-formatting procedure that performs a variety of necessary functions in
-addition to essential functions provided in C's PRINTF and Common lisp's
-FORMAT.  One of such ways would be to devise a free (and/or floating) sequence
-method that easily handles optional arguments, in contrast to the conventional
-fixed sequence method, in order to obtain a handy optional and functional
-interface.  With the concept of free sequencing, the CAT procedure is then
-defined, not to process optional arguments with default values, but to process
-default values with optional arguments.</p>
-
-<h1>Issues</h1>
-
-
-<p>In converting a number to a string, it has not been tried to uniformly express
-the exactness of a number.  The CAT procedure makes it possible for the user
-to prefix an exact sign to the resulting string as well as not to prefix it to
-the resulting string as conventionally used when an exact number is made to
-have a decimal point.  An inexact sign is prefixed to the resulting string in
-addition to an radix sign when an inexact number is converted to a
-non-decimal.</p>
-
-<h1>Specification</h1>
-
-<dl>
-<dt>
-<code>
-(CAT &lt;object&gt; [&lt;exactness%&gt;] [&lt;radix%&gt;] [&lt;sign%&gt;] [&lt;precision%&gt;] [&lt;separator%&gt;]
-	      [&lt;writer$&gt;] [&lt;pipe$&gt;] [&lt;take$&gt;]
-	      [&lt;converter*&gt;] [&lt;width*&gt;] [&lt;char*&gt;] [&lt;port*&gt;] [&lt;string*&gt;] ...)
-</code></dt>
-<dd>&lt;suffix%&gt;: effective only for the number type of &lt;object&gt;.<br>
-    &lt;suffix$&gt;: effective for all types except the number type of &lt;object&gt;.<br>
-    &lt;suffix*&gt;: effective for all types of &lt;object&gt;.</dd>
-<dd>&lt;object&gt; is any Scheme object.</dd>
-<dd>&lt;exactness&gt; is a symbol: exact or inexact.</dd>
-<dd>&lt;radix&gt; is a symbol: binary, octal, decimal, or hexadecimal.<br>
-    Each radix sign except decimal is prefixed to the resulting string.<br>
-    The default value is decimal.</dd>
-<dd>If &lt;sign&gt; is a symbol that takes the form of 'sign, and
-&lt;object&gt; is a positive number without a positive sign, the
-positive sign is prefixed to the resulting string.</dd>
-<dd>&lt;precision&gt; is an inexact integer whose absolute value
-specifies the number of decimal digits after a decimal point. If
-&lt;precision&gt; is a non-negative integer, an exact sign is prefixed
-to the resulting string as needed.</dd>
-<dd>&lt;separator&gt; is a list whose first element is a character
-serving as a separator and second element is a positive exact integer.
-If the integer is n, the resulting string is separated in every
-n-characters of the resulting string. When the integer is omitted, the
-default value is 3.</dd>
-<dd>&lt;writer&gt; is a procedure of two arguments; &lt;object&gt; and
-a string port. It writes &lt;object&gt; to the string port. The default
-value of &lt;writer&gt; is varied according to the type of
-&lt;object&gt;. When &lt;object&gt; is a self-evaluating constant, it
-becomes equivalent to DISPLAY procedure, otherwise, it becomes WRITE
-procedure. If you want any objects to be displayed in your own way, you
-have to define your own &lt;writer&gt;. Otherwise, they are displayed
-simply in their evaluated forms.</dd>
-<dd>&lt;pipe&gt; is a list which is composed of one or more procedures.
-Each procedure takes at least one string argument and returns a string.
-One procedure connects with another as a pipe.</dd>
-<dd>&lt;take&gt; is a list whose elements are two exact integers; n and
-m, and the absolute values of n and m are N and M, respectively. First,
-the resulting string takes from the left n-characters, if it is
-non-negative, or all the characters but N-characters, if negative.
-Second, it takes from the right m-characters, if it is non-negative, or
-all the characters but M-characters, if negative. Then, it concatenates
-two set of characters taken. The second element can be omitted. If
-omitted, the default value is 0.</dd>
-<dd>&lt;converter&gt; is a pair whose car value is a predicate
-procedure that checks whether &lt;object&gt; satisfies it, and cdr
-value is a procedure that takes the &lt;object&gt; as an argument and
-returns a string. When &lt;object&gt; satisfies the predicate
-procedure, all optional arguments are ineffective except &lt;width&gt;,
-&lt;char&gt;, &lt;port&gt;, and &lt;string&gt;.</dd>
-<dd>&lt;width&gt; is an exact integer whose absolute value specifies
-the width of the resulting string. When the resulting string has fewer
-characters than the absolute value of &lt;width&gt;, it is placed
-rightmost with the rest being padded with &lt;char&gt;s, if
-&lt;width&gt; is positive, or it is placed leftmost with the rest being
-padded with &lt;char&gt;s, if &lt;width&gt; is negative. On the other
-hand, when the resulting string has more characters than the absolute
-value of &lt;width&gt;, the &lt;width&gt; is ignored. The default value
-is 0.</dd>
-<dd>&lt;char&gt; is a padding character.  The default value is #\space.</dd>
-<dd>&lt;port&gt; is an output port or a boolean. If an output port is
-specified, the resulting string and &lt;string&gt;s are output into
-that port and simultaneously returned as a string. If &lt;port&gt; is
-#t, the output port is current output port. If &lt;port&gt; is #f, the
-output is only returned as a string. The default value is #f.</dd>
-<dd>&lt;string&gt; is a string that is appended to the resulting string.</dd>
-</dl>
-
-<p>The order of all optional arguments does not matter.  The CAT procedure
-processes optional arguments in the following order; &lt;exactness&gt;, &lt;radix&gt;,
-&lt;precision&gt;, &lt;separator&gt;, &lt;sign&gt; for the number type of &lt;object&gt;, or in the
-following order; &lt;writer&gt;, &lt;pipe&gt;, &lt;take&gt; for all other types.</p>
-
-<h2>Examples</h2>
-
-<blockquote><pre><code>(cat 129.995 -10 2.) =&gt; "130.00    "</code></pre></blockquote>
-<blockquote><pre><code>(cat 129.995 10 2.) =&gt; "    130.00"</code></pre></blockquote>
-<blockquote><pre><code>(cat 129.985 10 2.) =&gt; "    129.98"</code></pre></blockquote>
-<blockquote><pre><code>(cat 129.985001 10 2.) =&gt; "    129.99"</code></pre></blockquote>
-<blockquote><pre><code>(cat 129.995 2. 'exact) =&gt; "#e130.00"</code></pre></blockquote>
-<blockquote><pre><code>(cat 129 -2.) =&gt; "129.00"</code></pre></blockquote>
-<blockquote><pre><code>(cat 129 2.) =&gt; "#e129.00"</code></pre></blockquote>
-<blockquote><pre><code>(cat 129 10 2. #\0 'sign) =&gt; "#e+0129.00"</code></pre></blockquote>
-<blockquote><pre><code>(cat 129 10 2. #\* 'sign) =&gt; "*#e+129.00"</code></pre></blockquote>
-<blockquote><pre><code>(cat 1/3) =&gt; "1/3"</code></pre></blockquote>
-<blockquote><pre><code>(cat 1/3 10 2.) =&gt; "    #e0.33"</code></pre></blockquote>
-<blockquote><pre><code>(cat 1/3 10 -2.) =&gt; "      0.33"</code></pre></blockquote>
-<blockquote><pre><code>(cat 129.995 10 '(#\, 2)) =&gt; " 1,29.99,5"</code></pre></blockquote>
-<blockquote><pre><code>(cat 129995 10 '(#\,) 'sign) =&gt; "  +129,995"</code></pre></blockquote>
-<blockquote><pre><code>(cat (cat 129.995 0.) '(0 -1)) =&gt; "130"</code></pre></blockquote>
-<blockquote><pre><code>(cat 99.5 10 'sign 'octal) =&gt; "#i#o+307/2"</code></pre></blockquote>
-<blockquote><pre><code>(cat 99.5 10 'sign 'octal 'exact) =&gt; "  #o+307/2"</code></pre></blockquote>
-<blockquote><pre><code>(cat #x123 'octal 'sign) =&gt; "#o+443"</code></pre></blockquote>
-<blockquote><pre><code>(cat #x123 -10 2. 'sign #\*) =&gt; "#e+291.00*"</code></pre></blockquote>
-<blockquote><pre><code>(cat -1.2345e+15+1.2355e-15i 3.) =&gt; "-1.234e15+1.236e-15i"</code></pre></blockquote>
-<blockquote><pre><code>(cat 1.2345e+15 10 3. 'sign) =&gt; " +1.234e15"</code></pre></blockquote>
-<blockquote><pre><code>(cat "string" -10) =&gt; "string    "</code></pre></blockquote>
-<blockquote><pre><code>(cat "string" 10 (list string-upcase)) =&gt; "    STRING"</code></pre></blockquote>
-<blockquote><pre><code>(cat "string" 10 (list string-upcase) '(-2)) =&gt; "      RING"</code></pre></blockquote>
-<blockquote><pre><code>(cat "string" 10 `(,string-titlecase) '(2 3)) =&gt; "     Sting"</code></pre></blockquote>
-<blockquote><pre><code>(cat "string" `(,string-reverse ,string-upcase) =&gt; "GNIRTS"</code></pre></blockquote>
-<blockquote><pre><code>(cat #\a 10) =&gt; "         a"</code></pre></blockquote>
-<blockquote><pre><code>(cat 'symbol 10) =&gt; "    symbol"</code></pre></blockquote>
-<blockquote><pre><code>(cat '#(#\a "str" s)) =&gt; "#(#\\a \"str\" s)"</code></pre></blockquote>
-<blockquote><pre><code>(cat '(#\a "str" s)) =&gt; "(#\\a \"str\" s)"</code></pre></blockquote>
-<blockquote><pre><code>(cat '(#\a "str" s) #t) =&gt; (#\a "str" s)"(#\\a \"str\" s)"</code></pre></blockquote>
-<blockquote><pre><code>(cat '(#\a "str" s) (current-output-port)) =&gt; (#\a "str" s)"(#\\a \"str\" s)"</code></pre></blockquote>
-<blockquote><pre><code>(cat 3 (cat 's) " " (cat "str" write)) =&gt; "3s \"str\""</code></pre></blockquote>
-<blockquote><pre><code>(cat 3 #t (cat 's) " " (cat "str" write)) =&gt; 3s "str""3s \"str\""</code></pre></blockquote>
-<blockquote><pre><code>(cat 3 #t (cat 's #t) " " (cat "str" write)) =&gt; s3s "str""3s \"str\""</code></pre></blockquote>
-<blockquote>
-<pre><code>
-(define-record-type :example
-    (make-example num str)
-    example?
-    (num get-num set-num!)
-    (str get-str set-str!))
-(define ex (make-example 123 "string"))
-(define (record-&gt;string object)
-  (cat (get-num object) "-" (get-str object)))
-(define (record-writer object string-port)
-    (if (example? object)
-	(begin (display (get-num object) string-port)
-	       (display "-" string-port)
-	       (display (get-str object) string-port))
-	((or (and (or (string? object)
-		      (char? object)
-		      (boolean? object))
-		  display)
-	     write) object string-port)))
-ex =&gt; '#{:example}
-(cat ex) =&gt; "#{:example}"
-(cat ex 20 record-writer) =&gt; "          123-string"
-(cat ex 20 record-writer
-     `(,(cut string-delete char-set:digit &lt;&gt;)
-       ,string-upcase ,string-reverse)
-     '(0 -1) #\-) =&gt; "--------------GNIRTS"
-(cat "string" 20 record-writer
-     (list string-upcase) '(2 3) #\-) =&gt; "---------------STING"
-(cat 12 20 record-writer 3.) =&gt; "            #e12.000"
-(cat ex 20 (cons example? record-&gt;string)) =&gt; "          123-string"
-(cat ex 20 (cons example? record-&gt;string)
-     `(,(cut string-delete char-set:digit &lt;&gt;)
-       ,string-upcase ,string-reverse)
-     '(0 -1) #\-) =&gt; "----------123-string"
-(cat "string" 20 (cons example? record-&gt;string)
-     (list string-upcase) '(2 3) #\-) =&gt; "---------------STING"
-(cat 12 20 (cons example? record-&gt;string) -3.) =&gt; "              12.000"
-</code>
-</pre>
-</blockquote>
-
-
-<h1>Implementation</h1>
-
-<p>
-</p><p>The implementation below requires <a href="http://srfi.schemers.org/srfi-6/">SRFI 6</a>
-(Basic string ports) and <a href="http://srfi.schemers.org/srfi-23/">SRFI 23</a> (Error
-reporting mechanism).
-    </p>
-
-<pre><code>
-(define (cat object . rest)
-  (let* ((str-rest (part string? rest))
-	 (str-list (car str-rest))
-	 (rest-list (cdr str-rest)))
-    (if (null? rest-list)
-	(apply string-append
-	       (cond
-		((number? object) (number-&gt;string object))
-		((string? object) object)
-		((char? object) (string object))
-		((boolean? object) (if object "#t" "#f"))
-		((symbol? object) (symbol-&gt;string object))
-		(else
-		 (get-output-string
-		  (let ((str-port (open-output-string)))
-		    (write object str-port)
-		    str-port))))
-	       str-list)
-	(alet-cat* rest-list
-	  ((width 0 (and (integer? width) (exact? width)))
-	   (port #f (or (boolean? port) (output-port? port))
-		 (if (eq? port #t) (current-output-port) port))
-	   (char #\space (char? char))
-	   (converter #f (and (pair? converter)
-			      (procedure? (car converter))
-			      (procedure? (cdr converter))))
-	   (precision #f (and (integer? precision)
-			      (inexact? precision)))
-	   (sign #f (eq? 'sign sign))
-	   (radix 'decimal
-		  (memq radix '(decimal octal binary hexadecimal)))
-	   (exactness #f (memq exactness '(exact inexact)))
-	   (separator #f (and (list? separator)
-			      (&lt; 0 (length separator) 3)
-			      (char? (car separator))
-			      (or (null? (cdr separator))
-				  (let ((n (cadr separator)))
-				    (and (integer? n) (exact? n)
-					 (&lt; 0 n))))))
-	   (writer #f (procedure? writer))
-	   (pipe #f (and (list? pipe)
-			 (not (null? pipe))
-			 (every? procedure? pipe)))
-	   (take #f (and (list? take)
-			 (&lt; 0 (length take) 3)
-			 (every? (lambda (x)
-				   (and (integer? x) (exact? x)))
-				 take))))
-	  (let* ((str
-		  (cond
-		   ((and converter
-			 ((car converter) object))
-		    (let* ((str ((cdr converter) object))
-			   (pad (- (abs width) (string-length str))))
-		      (cond
-		       ((&lt;= pad 0) str)
-		       ((&lt; 0 width) (string-append (make-string pad char) str))
-		       (else (string-append str (make-string pad char))))))
-		   ((number? object)
-		    (and (not (eq? radix 'decimal)) precision
-			 (error "cat: non-decimal cannot have a decimal point"))
-		    (and precision (&lt; precision 0) (eq? exactness 'exact)
-			 (error "cat: exact number cannot have a decimal point without exact sign"))
-		    (let* ((exact-sign (and precision
-					    (&lt;= 0 precision)
-					    (or (eq? exactness 'exact)
-						(and (exact? object)
-						     (not (eq? exactness
-							       'inexact))))
-					    "#e"))
-			   (inexact-sign (and (not (eq? radix 'decimal))
-					      (or (and (inexact? object)
-						       (not (eq? exactness
-								 'exact)))
-						  (eq? exactness 'inexact))
-					      "#i"))
-			   (radix-sign (cdr (assq radix
-						  '((decimal . #f)
-						    (octal . "#o")
-						    (binary . "#b")
-						    (hexadecimal . "#x")))))
-			   (plus-sign (and sign (&lt; 0 (real-part object)) "+"))
-			   (exactness-sign (or exact-sign inexact-sign))
-			   (str
-			    (if precision
-				(let ((precision (inexact-&gt;exact
-						  (abs precision)))
-				      (imag (imag-part object)))
-				  (if (= 0 imag)
-				      (e-mold object precision)
-				      (string-append
-				       (e-mold (real-part object) precision)
-				       (if (&lt; 0 imag) "+" "")
-				       (e-mold imag precision)
-				       "i")))
-				(number-&gt;string
-				 (cond
-				  (inexact-sign (inexact-&gt;exact object))
-				  (exactness
-				   (if (eq? exactness 'exact)
-				       (inexact-&gt;exact object)
-				       (exact-&gt;inexact object)))
-				  (else object))
-				 (cdr (assq radix '((decimal . 10)
-						    (octal . 8)
-						    (binary . 2)
-						    (hexadecimal . 16)))))))
-			   (str
-			    (if (and separator
-				     (not (or (and (eq? radix 'decimal)
-						   (str-index str #\e))
-					      (str-index str #\i)
-					      (str-index str #\/))))
-				(let ((sep (string (car separator)))
-				      (num (if (null? (cdr separator))
-					       3 (cadr separator)))
-				      (dot-index (str-index str #\.)))
-				  (if dot-index
-				      (string-append
-				       (separate (substring str 0 dot-index)
-						 sep num (if (&lt; object 0)
-							     'minus #t))
-				       "."
-				       (separate (substring
-						  str (+ 1 dot-index)
-						  (string-length str))
-						 sep num #f))
-				      (separate str sep num (if (&lt; object 0)
-								'minus #t))))
-				str))
-			   (pad (- (abs width)
-				   (+ (string-length str)
-				      (if exactness-sign 2 0)
-				      (if radix-sign 2 0)
-				      (if plus-sign 1 0))))
-			   (pad (if (&lt; 0 pad) pad 0)))
-		      (if (&lt; 0 width)
-			  (if (char-numeric? char)
-			      (if (&lt; (real-part object) 0)
-				  (string-append (or exactness-sign "")
-						 (or radix-sign "")
-						 "-"
-						 (make-string pad char)
-						 (substring str 1
-							    (string-length
-							     str)))
-				  (string-append (or exactness-sign "")
-						 (or radix-sign "")
-						 (or plus-sign "")
-						 (make-string pad char)
-						 str))
-			      (string-append (make-string pad char)
-					     (or exactness-sign "")
-					     (or radix-sign "")
-					     (or plus-sign "")
-					     str))
-			  (string-append (or exactness-sign "")
-					 (or radix-sign "")
-					 (or plus-sign "")
-					 str
-					 (make-string pad char)))))
-		   (else
-		    (let* ((str (cond
-				 (writer (get-output-string
-					  (let ((str-port
-						 (open-output-string)))
-					    (writer object str-port)
-					    str-port)))
-				 ((string? object) object)
-				 ((char? object) (string object))
-				 ((boolean? object) (if object "#t" "#f"))
-				 ((symbol? object) (symbol-&gt;string object))
-				 (else (get-output-string
-					(let ((str-port (open-output-string)))
-					  (write object str-port)
-					  str-port)))))
-			   (str (if pipe
-				    (let loop ((str ((car pipe) str))
-					       (fns (cdr pipe)))
-				      (if (null? fns)
-					  str
-					  (loop ((car fns) str)
-						(cdr fns))))
-				    str))
-			   (str
-			    (if take
-				(let ((left (car take))
-				      (right (if (null? (cdr take))
-						 0 (cadr take)))
-				      (len (string-length str)))
-				  (define (substr str beg end)
-				    (let ((end (cond
-						((&lt; end 0) 0)
-						((&lt; len end) len)
-						(else end)))
-					  (beg (cond
-						((&lt; beg 0) 0)
-						((&lt; len beg) len)
-						(else beg))))
-				      (if (and (= beg 0) (= end len))
-					  str
-					  (substring str beg end))))
-				  (string-append
-				   (if (&lt; left 0)
-				       (substr str (abs left) len)
-				       (substr str 0 left))
-				   (if (&lt; right 0)
-				       (substr str 0 (+ len right))
-				       (substr str (- len right) len))))
-				str))
-			   (pad (- (abs width) (string-length str))))
-		      (cond
-		       ((&lt;= pad 0) str)
-		       ((&lt; 0 width) (string-append (make-string pad char) str))
-		       (else (string-append str (make-string pad char))))))))
-		 (str (apply string-append str str-list)))
-	    (and port (display str port))
-	    str)))))
-
-(define-syntax alet-cat*		; borrowed from SRFI-86
-  (syntax-rules ()
-    ((alet-cat* z (a . e) bd ...)
-     (let ((y z))
-       (%alet-cat* y (a . e) bd ...)))))
-
-(define-syntax %alet-cat*		; borrowed from SRFI-86
-  (syntax-rules ()
-    ((%alet-cat* z ((n d t ...)) bd ...)
-     (let ((n (if (null? z)
-		  d
-		  (if (null? (cdr z))
-		      (wow-cat-end z n t ...)
-		      (error "cat: too many arguments" (cdr z))))))
-       bd ...))
-    ((%alet-cat* z ((n d t ...) . e) bd ...)
-     (let ((n (if (null? z)
-		  d
-		  (wow-cat! z n d t ...))))
-       (%alet-cat* z e bd ...)))
-    ((%alet-cat* z e bd ...)
-     (let ((e z)) bd ...))))
-
-(define-syntax wow-cat!			; borrowed from SRFI-86
-  (syntax-rules ()
-    ((wow-cat! z n d)
-     (let ((n (car z)))
-       (set! z (cdr z))
-       n))
-    ((wow-cat! z n d t)
-     (let ((n (car z)))
-       (if t
-	   (begin (set! z (cdr z)) n)
-	   (let lp ((head (list n)) (tail (cdr z)))
-	     (if (null? tail)
-		 d
-		 (let ((n (car tail)))
-		   (if t
-		       (begin (set! z (append (reverse head) (cdr tail))) n)
-		       (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat! z n d t ts)
-     (let ((n (car z)))
-       (if t
-	   (begin (set! z (cdr z)) ts)
-	   (let lp ((head (list n)) (tail (cdr z)))
-	     (if (null? tail)
-		 d
-		 (let ((n (car tail)))
-		   (if t
-		       (begin (set! z (append (reverse head) (cdr tail))) ts)
-		       (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat! z n d t ts fs)
-     (let ((n (car z)))
-       (if t
-	   (begin (set! z (cdr z)) ts)
-	   (begin (set! z (cdr z)) fs))))))
-
-(define-syntax wow-cat-end		; borrowed from SRFI-86
-  (syntax-rules ()
-    ((wow-cat-end z n)
-     (car z))
-    ((wow-cat-end z n t)
-     (let ((n (car z)))
-       (if t n (error "cat: too many argument" z))))
-    ((wow-cat-end z n t ts)
-     (let ((n (car z)))
-       (if t ts (error "cat: too many argument" z))))
-    ((wow-cat-end z n t ts fs)
-     (let ((n (car z)))
-       (if t ts fs)))))
-
-(define (str-index str char)
-  (let ((len (string-length str)))
-    (let lp ((n 0))
-      (and (&lt; n len)
-	   (if (char=? char (string-ref str n))
-	       n
-	       (lp (+ n 1)))))))
-
-(define (every? pred ls)
-  (let lp ((ls ls))
-    (or (null? ls)
-	(and (pred (car ls))
-	     (lp (cdr ls))))))
-
-(define (part pred ls)
-  (let lp ((ls ls) (true '()) (false '()))
-    (cond
-     ((null? ls) (cons (reverse true) (reverse false)))
-     ((pred (car ls)) (lp (cdr ls) (cons (car ls) true) false))
-     (else (lp (cdr ls) true (cons (car ls) false))))))
-
-(define (e-mold num pre)
-  (let* ((str (number-&gt;string (exact-&gt;inexact num)))
-	 (e-index (str-index str #\e)))
-    (if e-index
-	(string-append (mold (substring str 0 e-index) pre)
-		       (substring str e-index (string-length str)))
-	(mold str pre))))
-
-(define (mold str pre)
-  (let ((ind (str-index str #\.)))
-    (if ind
-	(let ((d-len (- (string-length str) (+ ind 1))))
-	  (cond
-	   ((= d-len pre) str)
-	   ((&lt; d-len pre) (string-append str (make-string (- pre d-len) #\0)))
-	   ;;((char&lt;? #\4 (string-ref str (+ 1 ind pre)))
-	   ;;(let ((com (expt 10 pre)))
-	   ;;  (number-&gt;string (/ (round (* (string-&gt;number str) com)) com))))
-	   ((or (char&lt;? #\5 (string-ref str (+ 1 ind pre)))
-		(and (char=? #\5 (string-ref str (+ 1 ind pre)))
-		     (or (&lt; (+ 1 pre) d-len)
-			 (memv (string-ref str (+ ind (if (= 0 pre) -1 pre)))
-			       '(#\1 #\3 #\5 #\7 #\9)))))
-	    (apply
-	     string
-	     (let* ((minus (char=? #\- (string-ref str 0)))
-		    (str (substring str (if minus 1 0) (+ 1 ind pre)))
-		    (char-list
-		     (reverse
-		      (let lp ((index (- (string-length str) 1))
-			       (raise #t))
-			(if (= -1 index)
-			    (if raise '(#\1) '())
-			    (let ((chr (string-ref str index)))
-			      (if (char=? #\. chr)
-				  (cons chr (lp (- index 1) raise))
-				  (if raise
-				      (if (char=? #\9 chr)
-					  (cons #\0 (lp (- index 1) raise))
-					  (cons (integer-&gt;char
-						 (+ 1 (char-&gt;integer chr)))
-						(lp (- index 1) #f)))
-				      (cons chr (lp (- index 1) raise))))))))))
-	       (if minus (cons #\- char-list) char-list))))
-	   (else
-	    (substring str 0 (+ 1 ind pre)))))
-	(string-append str "." (make-string pre #\0)))))
-
-(define (separate str sep num opt)
-  (let* ((len (string-length str))
-	 (pos (if opt
-		  (let ((pos (remainder (if (eq? opt 'minus) (- len 1) len)
-					num)))
-		    (if (= 0 pos) num pos))
-		  num)))
-    (apply string-append
-	   (let loop ((ini 0)
-		      (pos (if (eq? opt 'minus) (+ pos 1) pos)))
-	     (if (&lt; pos len)
-		 (cons (substring str ini pos)
-		       (cons sep (loop pos (+ pos num))))
-		 (list (substring str ini len)))))))
-
-;;; eof
-</code>
-</pre>
-
-
-<h1>Acknowledgment</h1>
-
-
-<p>I owe much to those who incite me to make this SRFI better.  And I
-must thank Michael Sperber for his encouragement and guidance during
-the draft period of <a href="http://srfi.schemers.org/srfi-51/">SRFI 51</a>, as the important part of this SRFI is
-based on SRFI 51.  Without him, neither SRFI 51 nor SRFI 54 would have
-been finilized.  Again, I greatly appreciate his kindness and effort.
-Finally, I deeply apologize to Francisco Solsona for bringing disgrace
-upon him against my will early in the draft period.</p>
-
-
-<h1>Copyright</h1>
-
-<p>Copyright (C) Joo ChurlSoo (2004). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi%20minus%20editors%20at%20srfi%20dot%20schemers%20dot%20org">Francisco Solsona</a></address>
-<!-- Created: Mon Feb  3 14:53:23 MET 2003 -->
-<!-- hhmts start -->
-Last modified: Sun Jan 28 13:40:19 MET 2007
-<!-- hhmts end -->
-  
-</body></html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-57.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-57.html
deleted file mode 100644
index e86c6be461..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-57.html
+++ /dev/null
@@ -1,1389 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD><title>SRFI 57: Records</title>
-</HEAD>
-<BODY>
-<H1>Title</H1> 
-Records
-
-<H1>Author</H1> 
-Andr&eacute; van Tonder 
-
-<H1>Status</H1> 
-
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see <A
-href="http://srfi.schemers.org/srfi-process.html">here</A>. You can access
-previous messages via <A
-href="http://srfi.schemers.org/srfi-57/mail-archive/maillist.html"> the
-archive of the mailing list</A>.
-
-<P> 
-<UL>
-  <LI>Received: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-57/srfi-57.html?rev=1.1">2004/09/08</A></LI>
-  <LI>Draft: 2004/09/08 - 2005/01/08</LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-57/srfi-57.html?rev=1.2">2004/09/22</A></LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-57/srfi-57.html?rev=1.3">2004/11/08</A></LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-57/srfi-57.html?rev=1.6">2004/11/25</A></LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-57/srfi-57.html?rev=1.7">2004/12/08</A></LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-57/srfi-57.html?rev=1.8">2005/03/07</A></LI>
-  <LI>Final: 2005/03/07</LI>
-</UL>
-
-<H1>Abstract</H1>
-
-We describe a syntax for defining record types.    
-A predicate, constructor, 
-and field accessors and modifiers may be specified for each record
-type.
-We also introduce a syntax for declaring record type schemes, representing
-families of record types that share a set of field labels.  
-A polymorphic predicate and 
-polymorphic field accessors and modifiers may be specified for each
-record type scheme.
-A syntax is provided for constructing records by
-field label, for in-place and for functional record 
-update, and for composing records. 
-
-
-<H1>Rationale</H1>
-
-We extend the existing SRFI-9 [1] with the following features,
-each listed with a brief justification.  Expanded rationales appear
-in the specification section below.  
-
-<ul>
-<li>A syntax for constructing record values by field label.  Such a
-    feature is common in the prior art [2].  Indeed, the ability to
-    address fields by labels instead of position is one of the main
-    reasons for introducing the concept of records in the first
-    place.  
-    Taking advantage of this feature can ease coding and increase readability and 
-    robustness of code.
-</li><li>
-  A mechanism for defining and incrementally extending 
-   polymorphic functions on families 
-  of record types sharing a set of field labels.  This automates
-  a common programming pattern which would otherwise be laborious to 
-  code explicitly.  
-</li><li>Facilities for record composition, functional record update, 
-    including polymorphic
-    update, and linear in-place update.
-    These facilitate functional style programming with records.  
-</li><li>A declaration syntax that allows shorter variations and
-    optional elements, to save labor and reduce namespace
-    pollution.    
-</li></ul>
-
-  
-<H1>Specification</H1>
-
-<h2>Declaration</h2>
-
-<pre> &lt;command or definition&gt;           
-   -&gt; &lt;record type definition&gt;          
-   -&gt; &lt;record scheme definition&gt;           ; addition to 7.1.6 in R5RS
-
- &lt;record type definition&gt; -&gt; (define-record-type &lt;type clause&gt; 
-                                                 &lt;constructor clause&gt; 
-                                                 &lt;predicate clause&gt;                          
-                                                 &lt;field clause&gt; ...)  
-                          -&gt; (define-record-type &lt;type clause&gt; 
-                                                 &lt;constructor clause&gt;)  
-                          -&gt; (define-record-type &lt;type clause&gt;)                   
-
- &lt;record scheme definition&gt; -&gt; (define-record-scheme &lt;scheme clause&gt; 
-                                                     &lt;deconstructor clause&gt; 
-                                                     &lt;predicate clause&gt;                          
-                                                     &lt;field clause&gt; ...)  
-                            -&gt; (define-record-scheme &lt;scheme clause&gt; 
-                                                     &lt;deconstructor clause&gt;)  
-                            -&gt; (define-record-scheme &lt;scheme clause&gt;)                   
-
- &lt;type clause&gt; -&gt; &lt;type name&gt;                           
-               -&gt; (&lt;type name&gt; &lt;scheme name&gt; ...)  
-
- &lt;scheme clause&gt; -&gt; &lt;scheme name&gt;                           
-                 -&gt; (&lt;scheme name&gt; &lt;parent scheme name&gt; ...)  
-
- &lt;constructor clause&gt; -&gt; (&lt;constructor name&gt; &lt;field label&gt; ...)               
-                      -&gt; &lt;constructor name&gt; 
-                      -&gt; #f
-
- &lt;deconstructor clause&gt; -&gt; (&lt;deconstructor name&gt; &lt;field label&gt; ...)               
-                        -&gt; &lt;deconstructor name&gt; 
-                        -&gt; #f
-
- &lt;predicate clause&gt; -&gt; &lt;predicate name&gt;                 
-                    -&gt; #f
-
- &lt;field clause&gt; -&gt; (&lt;field label&gt; &lt;accessor clause&gt; &lt;modifier clause&gt;) 
-                -&gt; (&lt;field label&gt; &lt;accessor clause&gt;)
-                -&gt; (&lt;field label&gt;)
-            
- &lt;accessor clause&gt; -&gt; &lt;accessor name&gt;                 
-                   -&gt; #f
-
- &lt;modifier clause&gt; -&gt; &lt;modifier name&gt;                 
-                   -&gt; #f             
-
- &lt;field label&gt; -&gt; &lt;identifier&gt;
- &lt;... name&gt;    -&gt; &lt;identifier&gt;
-
-</pre>
-
-<h3>Record types</h3>
-
-An instance of <code>define-record-type</code> is equivalent to the following:
-
-<ul>
-<li> A list of field labels is associated with the record type <code>&lt;type name&gt;</code>,
-     obtained by appending from left to right the lists of field labels  
-     of any record 
-     type schemes (see below) appearing in the <code>&lt;type clause&gt;</code>,
- followed by the list of labels in the
-     <code>&lt;constructor clause&gt;</code>, followed by the labels
-     in order of appearance in the <code>&lt;field
-     clause&gt;</code>s.    
-     Duplicates are removed from the resulting list according
-     to the semantics of <code>delete-duplicates</code> of SRFI-1. 
-     Labels in the constructor clause must be
-     distinct.  Labels in the field clauses must also be distinct. 
-     <p>
-
-</p></li><li>For each <code>&lt;scheme name&gt;</code> in <code>&lt;type clause&gt;</code>, the record type 
-      <code>&lt;type name&gt;</code> is said to be an <i>instance</i> of, or to 
-     <i>conform</i> to the corresponding 
-      record type scheme <code>&lt;scheme name&gt;</code> and to all 
-      parent type schemes (see below) of <code>&lt;scheme name&gt;</code>.  
-
-<p></p></li><li> <code>&lt;type name&gt;</code> is bound to a macro, described below, that can be used to construct record 
-     values by label.  It may also be registered, as specified in a
-     future SRFI, for performing pattern matching on record values of
-     type  <code>&lt;type name&gt;</code>.
-   <p> 
-</p></li><li> If <code>&lt;constructor clause&gt;</code> is 
-     of the form <code>(&lt;constructor name&gt; &lt;field label&gt; ...)</code>, then
-     <code>&lt;constructor name&gt;</code> is bound to a procedure that takes as many arguments as 
-      there are <code>&lt;field label&gt;</code>s following it
-      and returns a new <code>&lt;type name&gt;</code> record. 
-      Fields whose labels are listed with <code>&lt;type name&gt;</code> have the corresponding 
-     argument as their initial value. The initial values of all other fields are unspecified.
-     If <code>&lt;constructor clause&gt;</code> is of the form <code>&lt;constructor name&gt;</code>, 
-     the  procedure
-     <code>&lt;constructor name&gt;</code> takes as many arguments as there are field labels
-     associated with <code>&lt;type name&gt;</code>, in the default order defined above.
-     <p></p><p> 
-
-   <code>&lt;constructor name&gt;</code> may be
-      registered, in a way to be described in a future SRFI,  for performing a 
-      positional pattern match of the fields <code>&lt;field label&gt; ...</code> 
-      of record 
-      values of type <code>&lt;type name&gt;</code> in the first case,
-      or of all fields 
-     associated with <code>&lt;scheme name&gt;</code> in the default
-      order defined above in the second case.
-
-</p></li><li> <code>&lt;predicate name&gt;</code>, is bound to a predicate procedure 
-     that returns <code>#t</code> when given a record value that has been constructed using
-     the macro <code>&lt;type name&gt;</code> or the procedure <code>&lt;constructor name&gt;</code>,
-     and <code>#f</code> for any other
-    value.  Values on which <code>&lt;predicate name&gt;</code>, if applied, would return 
-    <code>#t</code>, are said to be <i>of type</i> <code>&lt;type name&gt;</code>. 
-     <p>
-
-</p></li><li> Field labels inherited from a <code>&lt;type scheme&gt;</code> or 
-      introduced in the <code>&lt;constructor clause&gt;</code> do not have to be 
-      repeated in the 
-      <code>&lt;field clause&gt;</code>s. 
-      Where present, <code>&lt;field
-      clause&gt;</code>s may provide additional information on such fields, or may
-      declare additional fields.
-  
-     <p></p><p>
-     Field labels may be reused as the name of accessors or modifiers (a practice known 
-     as punning).
-     </p><p>
-</p><ul>
-<p></p><li> Each <code>&lt;accessor name&gt;</code> is bound to
-     a procedure that takes a 
-     value of type <code>&lt;type name&gt;</code>,
-     and returns the current value of the corresponding 
-     field.  It is an error to pass an accessor a value not of type 
-     <code>&lt;type name&gt;</code>.  
-<p></p></li><li> Each <code>&lt;modifier name&gt;</code> is bound to 
-     a procedure that takes a value of type <code>&lt;type name&gt;</code>
-     and a value which becomes the new value of the corresponding field.  
-     It is an error to pass a modifier a first argument that is not of type
-     <code>&lt;type name&gt;</code>.
-      The return value of <code>&lt;modifier name&gt;</code> is unspecified.  
-     <p>
-</p></li></ul></li></ul>
- 
-<p>
-<code>Define-record-type</code> is generative: each use creates a new record type that is distinct 
-from all existing types, including
-other record types and Scheme's predefined types. This SRFI only
-specifies the behaviour of <code>define-record-type</code> at
-top-level.  
-  
-
-</p><h3>Record type schemes</h3>
-
-An instance of <code>define-record-scheme</code> is equivalent to the following:
-
-<ul>
-<li> A list of field labels is associated with the type scheme <code>&lt;scheme name&gt;</code>,
-     obtained by appending from left to right the lists of field labels  
-     of any parent
-     type schemes appearing in the <code>&lt;scheme clause&gt;</code>,
- followed by the list of labels in the
-     <code>&lt;deconstructor clause&gt;</code>, followed by the labels
-     in order of appearance in the <code>&lt;field clause&gt;</code>s.
-     Duplicates are removed from the resulting list according
-     to the semantics of <code>delete-duplicates</code> of SRFI-1.  
-    Labels in the constructor clause must be
-     distinct.  Labels in the field clauses must also be distinct. 
-     <p>
-
-</p></li><li>A record type scheme is called a <i>parent scheme</i> of
-      <code>&lt;scheme name&gt;</code> if it appears in the 
-      <code>&lt;scheme clause&gt;</code>, or if it is a parent scheme of 
-      one of the  <code>&lt;parent scheme name&gt;</code>'s appearing in the 
-        <code>&lt;scheme clause&gt;</code>.  
-      The type scheme 
-      <code>&lt;scheme name&gt;</code> is said to
-     <i>extend</i> its parent type schemes.  It is an error to extend a type scheme
-     that has not yet been defined.  
-        
-
-<p></p></li><li> <code>&lt;scheme name&gt;</code> may be bound to a macro or otherwise   
-     registered, in a way to be 
-      described in a future
-     SRFI, 
-     for performing pattern matching on record 
-     values conforming to <code>&lt;scheme name&gt;</code>. 
-   <p> 
-</p></li><li>If <code>&lt;deconstructor clause&gt;</code> is 
-     of the form <code>(&lt;deconstructor name&gt; &lt;field label&gt; ...)</code>, then
-     <code>&lt;deconstructor name&gt;</code> may be bound to a macro or otherwise
-      registered, in a way to be described in a future SRFI,  for performing a 
-      positional pattern match of the fields <code>&lt;field label&gt; ...</code> 
-      on record 
-      values conforming to <code>&lt;scheme name&gt;</code>.
-     If <code>&lt;deconstructor clause&gt;</code> is of the form <code>&lt;deconstructor name&gt;</code>, 
-     the positional match will be on all fields 
-     associated with <code>&lt;scheme name&gt;</code>, in the default order defined above.
-     <p></p><p> 
-
-</p></li><li> <code>&lt;predicate name&gt;</code>, is bound to a predicate procedure 
-     that returns <code>#t</code> when given a record value of any record type conforming
-     to <code>&lt;scheme name&gt;</code>,
-     and <code>#f</code> for any other
-    value. 
-     <p>
-
-</p></li><li> Field labels inherited from a <code>&lt;parent type scheme&gt;</code> or 
-      introduced in the <code>&lt;deconstructor clause&gt;</code> do not have to be 
-      repeated in the 
-      <code>&lt;field clause&gt;</code>s. 
-      Where present, <code>&lt;field
-      clause&gt;</code>s may provide additional information on such fields, or may
-      declare additional fields.
-  
-     <p></p><p>
-     Field labels may be reused as the name of accessors or modifiers (a practice known 
-     as punning).
-     </p><p>
-</p><ul>
-<p></p><li> Each <code>&lt;accessor name&gt;</code> is bound to
-     a procedure that takes a 
-     value conforming to <code>&lt;scheme name&gt;</code>,
-     and returns the current value of the corresponding 
-     field.  It is an error to pass an accessor a value not conforming to 
-     <code>&lt;scheme name&gt;</code>.  
-<p></p></li><li> Each <code>&lt;modifier name&gt;</code> is bound to 
-     a procedure that takes a value conforming to  <code>&lt;scheme name&gt;</code>
-     and a value which becomes the new value of the corresponding field.  
-     It is an error to pass a modifier a first argument that does not conform to
-     <code>&lt;scheme name&gt;</code>.
-      The return value of <code>&lt;modifier name&gt;</code> is unspecified.  
-     <p>
-</p></li></ul></li></ul>
-
-
-
-
-
-
-
-
-<p></p><h3>Examples</h3>
-
-<h4>A simple record:</h4>
-
-<pre>  (define-record-type point (make-point x y) point?
-    (x get-x set-x!)           
-    (y get-y set-y!))                    
-
-  (define p (make-point 1 2))
-  (get-y  p)                                 ==&gt; 2
-  (set-y! p 3))                             
-  (get-y  p)                                 ==&gt; 3                             
-  (point? p)                                 ==&gt; #t  
-</pre>
-
-
-<h4>Record type schemes:</h4>
-
-Let's declare a couple of record schemes.  Record schemes do not have constructors.
-They introduce polymorphic predicates and accessors.
-<pre>  (define-record-scheme &lt;point #f &lt;point? 
-    (x &lt;point.x)
-    (y &lt;point.y))
-
-  (define-record-scheme &lt;color #f &lt;color?
-    (hue &lt;color.hue))
-</pre>
-
-We now declare concrete instances of the above schemes.
-Constructors may be introduced.
-Predicates and accessors for concrete record types, when declared, are monomorphic.  
-
-<pre>  (define-record-type (point &lt;point) make-point point?
-    (x point.x)
-    (y point.y))
-
-  (define-record-type (color &lt;color) make-color)
-
-  (define-record-type (color-point &lt;color &lt;point) 
-                      (make-color-point x y hue) color-point?
-    (info color-point.info))
-
-  (define cp (make-color-point 1 2 'blue))
-
-  (&lt;point?          cp)            ==&gt; #t 
-  (&lt;color?          cp)            ==&gt; #t
-  (&lt;point.y         cp)            ==&gt; 2
-  (&lt;color.hue       cp)            ==&gt; blue
-  (point?           cp)            ==&gt; #f      
-  (point.x          cp)            ==&gt; error   
-  (color-point?     cp)            ==&gt; #t
-  (color-point.info cp)            ==&gt; &lt;undefined&gt;
-</pre>
-
-<h4>Optional elements:</h4>
-
-Elements may be left out if not desired, as the following examples illustrate:
-<pre>  
-  (define-record-type node (make-node left right)) 
-  (define-record-type leaf (make-leaf value))       
-</pre>
-In these declarations, no predicates are bound.  Also note that field labels listed in the 
-constructor do not have to be repeated in the field clause list unless 
-we want to bind getters or setters.
-
-<pre>              
-  (define-record-type monday)               
-  (define-record-type tuesday #f tuesday?)      
-</pre>
-Here <code>monday</code> has no declared constructor or predicate, while <code>tuesday</code>
-has a predicate but no constructor.       
-
-<pre>  (define-record-type node make-node #f                                   
-    (left  left)                        
-    (right right))                     
-</pre>
-Here the constructor <code>make-node</code> has the default argument order and no predicate
-is bound.   Also note that field labels are
-punned.    
-  
-
-
-
- 
-
-
-
-<p></p><h4>A note on repeated fields and redefinitions</h4>
-
-In the following example, two record type schemes define different accessors for the same field:
-
-<pre>  (define-record-scheme foo #f #f (x foo-x))
-  (define-record-scheme bar #f #f (x bar-x))
-  (define-record-type (foo-bar foo bar))
-</pre>
-
-Since any value <code>fb</code> of type <code>foo-bar</code> conforms to both
-<code>foo</code> and <code>bar</code>, both <code>foo-x</code> and <code>bar-x</code> 
-can be applied to <code>fb</code>, returning the value of the <code>x</code> field. 
-
-<p>
-In the following example, two declarations introduce
-the same accessor:
-
-</p><pre>  (define-record-scheme foo     #f #f (x foo-x))
-  (define-record-type (bar foo) #f #f (x foo-x))
-</pre>
-As in any <code>define-...</code> form, later bindings replace earlier bindings.
-After the second declaration is executed, 
-<code>foo-x</code> will be bound to the monomorphic accessor applicable only to values
- of type <code>bar</code>, replacing its binding to the polymorphic accessor procedure 
-introduced in the <code>foo</code> declaration.  
-
-
-
-  
-<h2>Labeled record expressions</h2>
-
-The following syntax allows one to construct a record value by labels.  The result 
-is a record value of type <code>&lt;type name&gt;</code> with each field 
-<code>&lt;field label&gt;</code> populated with the value of the corresponding 
-<code>&lt;expression&gt;</code>.  The order of evaluation of the expressions
-<code>&lt;expression&gt; ...</code> is undefined.  All the
-<code>&lt;field label&gt;</code>s have to belong to the record type <code>&lt;type name&gt;</code>.
-If this condition is not satisfied, an expansion time error must be signaled.  The
-runtime efficiency of a labeled record expression is required to be at least that of 
-the equivalent positional constructor.  
-
-<pre>   &lt;expression&gt; -&gt; (&lt;type name&gt; (&lt;field label&gt; &lt;expression&gt;) ...)
-</pre>
-
-</p><p>
-The order of evaluation of the expressions
-<code>&lt;expression&gt; ...</code> is undefined.
-
-
-
-<h4>Rationale</h4>
-
-The traditional practice of instantiating record values with a positional constructor procedure
-can lead to code that is hard to read and fragile under common operations such as
-adding, removing, or rearranging field declarations.  The ability to populate record values 
-by labels provides a more robust and readable alternative, especially useful when a record has 
-more than two or three fields, or if it inherits fields from a type scheme.  
-Field labels are checked for validity 
-and the macro may be compiled to a positional constructor at expansion time, 
-thus eliminating a large class of potential programmer errors at no cost in efficiency. 
-
-<h4>Example</h4>
-
-<pre>  (color-point (info 'hi) 
-               (x 1) 
-               (y 2))  
-            
-                 ==&gt; (color-point (hue &lt;undefined&gt;) (x 1) (y 2) (info hi)) 
-</pre>
-
-<h2>Record update</h2>
-
-The following syntax allows different forms of record update:
-
-<pre>   &lt;expression&gt; -&gt; (record-update  &lt;record&gt; &lt;scheme name&gt; (&lt;field label&gt; &lt;expression&gt;) ...)
-                -&gt; (record-update  &lt;record&gt; &lt;type name&gt;   (&lt;field label&gt; &lt;expression&gt;) ...)
-                -&gt; (record-update! &lt;record&gt; &lt;type name&gt;   (&lt;field label&gt; &lt;expression&gt;) ...)
-                -&gt; (record-update! &lt;record&gt; &lt;scheme name&gt; (&lt;field label&gt; &lt;expression&gt;) ...)
-</pre>
-
-The first alternative is used for polymorphic functional record update.  The expression 
-<code>&lt;record&gt;</code> must evaluate to a record value that conforms to  
-<code>&lt;scheme name&gt;</code>.  
-The result will be a new record value of the same type as 
-the original <code>&lt;record&gt;</code>, with the given fields updated.  The original 
-record value is unaffected.  All the
-<code>&lt;field label&gt;</code>s have to belong to the record type scheme <code>&lt;scheme name&gt;</code>.
-If this condition is not satisfied, an expansion time error must be signaled. 
-<p>
-
-The second alternative is used for monomorphic functional record update.  The expression 
-<code>&lt;record&gt;</code> must evaluate to a record value of type 
-<code>&lt;type name&gt;</code>.  The result will be a new record value of type 
-<code>&lt;type name&gt;</code>, with the given fields updated.  The original 
-record value is unaffected.  All the
-<code>&lt;field label&gt;</code>s have to belong to the record type <code>&lt;type name&gt;</code>.
-If this condition is not satisfied, an expansion time error must be signaled. 
-</p><p>
-
-The third and fourth alternatives are used for linear, in-place record update.  The expression 
-<code>&lt;record&gt;</code> must evaluate to a record value of type 
-<code>&lt;type name&gt;</code> or conforming to scheme <code>&lt;scheme name&gt;</code> .  The result will be the original record value 
- with the given fields
-mutated in place.  
-Note that a useful value is returned.  All the
-<code>&lt;field label&gt;</code>s have to belong to the record type <code>&lt;type name&gt;</code> or scheme <code>&lt;scheme name&gt;</code>.
-If this condition is not satisfied, an expansion time error must be signaled. 
-
-</p><p>
-In these forms, the order of evaluation of the expressions
-<code>&lt;expression&gt; ...</code> is undefined.
-
-</p><h4>Rationale</h4>
- 
-A mechanism for functional update facilitates and encourages functional-style programming
-with records.  
-Note that polymorphic record update is not reducible
-to the other operations we have listed and therefore has to be 
-provided as a built-in primitive [2].   
-
-
-<p></p><p>The linear version
-<code>update!</code> is provided especially for cases where the programmer 
-knows that no other references to a value exist to produce what is, observationally, a
-pure-functional result.  In these cases, an <code>update</code> 
-operation may be replaced by <code>update!</code> for efficiency.
-See SRFI-1 for a good discussion of the rationale behind linear update procedures.
-Note, however, that in contrast with the linear procedures in SRFI-1, <code>update!</code> here is <i>required</i>
-to mutate the original record.  
-
-</p><h4>Examples</h4>
-
-Monomorphic update:
-<pre>  (define p (point (x 1) (y 2)))
-
-  (record-update p point (x 7))      ==&gt; (point (x 7) (y 2))
-  p                                  ==&gt; (point (x 1) (y 2))   - original unaffected
-</pre>
-
-Polymorphic update:
-<pre>  (define cp (color-point (hue 'blue) (x 1) (y 2)))
- 
-  (record-update cp &lt;point (x 7))    ==&gt; (color-point (info &lt;undefined&gt;) (hue blue) (x 7) (y 2))
-  cp                                 ==&gt; (color-point (info &lt;undefined&gt;) (hue blue) (x 1) (y 2))
-</pre>
-
-In-place update:
-<pre>  (record-update! cp &lt;point (x 7)))  ==&gt; (color-point (info &lt;undefined&gt;) (hue blue) (x 7) (y 2))
-  cp                                 ==&gt; (color-point (info &lt;undefined&gt;) (hue blue) (x 7) (y 2))
-</pre>
-
-
-<h2>Record composition</h2>
-
-The following syntax provides a shorthand for composing record values:
-
-<pre>   &lt;expression&gt; -&gt; (record-compose (&lt;import name&gt; &lt;record&gt;) 
-                                   ...
-                                   (&lt;export-type name&gt; (&lt;field label&gt; &lt;expression&gt;) ...))
-
-   &lt;import name&gt; -&gt; &lt;type name&gt;
-                 -&gt; &lt;scheme name&gt;
-</pre>
-Here each expression <code>&lt;record&gt;</code> must evaluate to a record value of type 
-<code>&lt;type name&gt;</code> or conforming to type scheme <code>&lt;scheme name&gt;</code>.   The expression 
-evaluates to a new record value of type <code>&lt;export-type name&gt;</code> 
-whose fields are
-populated as follows:  For each field label belonging to <code>&lt;import name&gt;</code>
- that is also a field label of the type
-&lt;export-type name&gt;, the corresponding field of <code>&lt;record&gt;</code>
-is copied into the result.  This is done for all imports from left to
-right, dropping any repeated fields.  The additional fields <code>&lt;field label&gt;</code>
-are then populated with the value of the
- corresponding <code>&lt;expression&gt;</code>, overwriting
-any fields with the same labels already imported.   Any remaining fields are undefined.
-All the
-<code>&lt;field label&gt;</code>s have to belong to the record type <code>&lt;export type name&gt;</code>.
-If this condition is not satisfied, an expansion time error must be signaled.
-
-<p>
-The order of evaluation of the expressions <code>&lt;record&gt; ...</code> and
-<code>&lt;expression&gt; ...</code> is undefined.  All the
-expressions  <code>&lt;record&gt; ...</code> will be evaluated, even
-if their values might not be used in
-the result.  
-
-</p><h4>Rationale</h4>
-
-Calculi for composing record values, such as the above scheme, 
-may be used, for example, as units are used in 
-PLT Scheme, or for writing what amounts to modules and functors in the sense of ML.<p>  
-Monomorphic record update is a special case of <code>record-compose</code>.  The latter
-may be used to express more general updates polymorphic in the 
-argument but monomorphic in the result type.
-</p><p>
-
-
-</p><h4>Examples</h4>
-
-Use <code>record-compose</code> for updates polymorphic in the argument but 
-monomorphic in the result type:
-<pre>  (define cp (make-color-point 1 2 'green))
-
-  (record-compose (&lt;point cp) (point (x 8)))   ==&gt; (point (x 8) (y 2))
-</pre>
-
-A more general composition example:
-
-<pre>  (define cp (make-color-point 1 2 'green))
-  (define c  (make-color 'blue))
-  
-  (record-compose (&lt;point cp)                ; polymorphic import - only fields x and y of cp taken
-                  (color  c)                 ; monomorphic import
-                  (color-point (x 8)         ; overrides imported field
-                               (info 'hi)))                 
-                                      
-                                         ==&gt; (color-point (info hi) (hue blue) (x 8) (y 2))
-</pre>
-
-Small module-functor example:
-<pre>  
-  (define-record-type monoid #f #f 
-    (mult monoid.mult) 
-    (one  monoid.one))
-
-  (define-record-type abelian-group #f #f 
-    (add  group.add) 
-    (zero group.zero)
-    (sub  group.sub))
-
-  (define-record-type ring #f #f
-    (mult ring.mult) 
-    (one  ring.one)
-    (add  ring.add) 
-    (zero ring.zero)
-    (sub  ring.sub))
-
-  (define integer-monoid (monoid (mult *) 
-                                 (one  1)))
-
-  (define integer-group (abelian-group (add  +)
-                                       (zero 0)
-                                       (sub  -)))
-
-  (define (make-ring g m)          ; simple functor a la ML
-    (record-compose (monoid m)
-                    (abelian-group g)
-                    (ring)))
-
-  (define integer-ring (make-ring integer-group 
-                                  integer-monoid))
-  
-  ((ring.add integer-ring) 1
-                           2)    ==&gt; 3
-</pre>
-
-
-
-<H1>Implementation</H1>
-
-<p>
-The reference implementation uses the macro mechanism of 
-R5RS. It assumes an existing implementation of SRFI-9, here denoted
-srfi-9:define-record-type.  It also contains a trivial use of
-case-lambda from SRFI-16.
-
-</p><p>
-The reference implementation, though relatively portable as a set of
-<code>syntax-rules</code> macros, is slow.  For practical
-implementations, it is recommended that a procedural macro system be
-used.  Such implementations are provided separately in the discussion
-archives.  Unless otherwise stated by the author(s), they are covered
-by the same copyright agreement as this document.  
-
-
-</p><p>  
-This version depends on <code>define</code> being treated as a binding
-form by <code>syntax-rules</code>.  This is true for recent versions of portable syntax-case as used in Chez Scheme.  It is
-also true for PLT, for Scheme48, and possibly others.  It also assumes
-that the implementation of SRFI-9 binds the type name passed to it, which is a
-hygienically introduced internal identifier, 
-using <code>define</code>.  
-
-
-</p><p>
-The SRFI specification was designed with the constraint that 
-all record expressions containing field labels be translatable into positional 
-expressions at macro-expansion time.  For example, labeled record expressions 
-and patterns should be just as efficient as positional constructors and 
-patterns.  This is true for the reference implementation.
-
-</p><p>
-Only the names mentioned in the specification should be visible to
-the user.  Other
-names should be hidden by a module system or naming convention.  
-</p><p>
-The last section contains a few examples and (non-exhaustive) tests.  
-
-
-
-</p>
-<h2>Reference implementation </h2>
-
-
-<pre>;============================================================================================
-; IMPLEMENTATION:
-;
-; Andre van Tonder, 2004.
-;
-;============================================================================================
-
-(define-syntax define-record-type    
-  (syntax-rules ()
-    ((define-record-type . body)
-     (parse-declaration #f . body))))
-
-(define-syntax define-record-scheme    
-  (syntax-rules ()
-    ((define-record-scheme . body)
-     (parse-declaration #t . body))))
-
-(define-syntax parse-declaration    
-  (syntax-rules ()
-    ((parse-declaration is-scheme? (name super ...) constructor-clause predicate field-clause ...)
-     (build-record 0 constructor-clause (super ...) (field-clause ...) name predicate is-scheme?))
-    ((parse-declaration is-scheme? (name super ...) constructor-clause)
-     (parse-declaration is-scheme? (name super ...) constructor-clause #f))  
-    ((parse-declaration is-scheme? (name super ...))
-     (parse-declaration is-scheme? (name super ...) #f #f))
-    ((parse-declaration is-scheme? name . rest)
-     (parse-declaration is-scheme? (name) . rest))))
-
-(define-syntax record-update!
-  (syntax-rules ()
-    ((record-update! record name (label exp) ...)
-     (meta
-      `(let ((r record)) 
-         ((meta ,(name ("setter") label)) r exp)
-         ...
-         r)))))
-
-(define-syntax record-update
-  (syntax-rules ()
-    ((record-update record name (label exp) ...)
-     (name ("is-scheme?")
-           (meta                                                         
-            `(let ((new ((meta ,(name ("copier"))) record)))
-               (record-update! new name (label exp) ...)))
-           (record-compose (name record) (name (label exp) ...))))))    
-           
-(define-syntax record-compose
-  (syntax-rules ()
-    ((record-compose (export-name (label exp) ...))
-     (export-name (label exp) ...))
-    ((record-compose (import-name record) ... (export-name (label exp) ...))
-     (help-compose 1 (import-name record) ... (export-name (label exp) ...)))))
-
-(define-syntax help-compose
-  (syntax-rules ()
-    ((help-compose 1 (import-name record) import ... (export-name (label exp) ...))
-     (meta
-      `(help-compose 2
-                     (meta ,(intersection
-                             (meta ,(export-name ("labels")))
-                             (meta ,(remove-from (meta ,(import-name ("labels")))
-                                                 (label ...)
-                                                 if-free=))
-                             if-free=))
-                     (import-name record) 
-                     import ...
-                     (export-name (label exp) ...))))
-    ((help-compose 2 (copy-label ...) (import-name record) import ... (export-name . bindings))
-     (meta
-      `(let ((r record))
-         (record-compose import ...
-           (export-name (copy-label ((meta ,(import-name ("getter") copy-label)) r))
-                        ...
-                        . bindings)))))))
-
-(define-syntax build-record
-  (syntax-rules ()
-   ((build-record 0 (constructor . pos-labels) . rest)              ; extract positional labels from constructor clause
-    (build-record 1 (constructor . pos-labels) pos-labels . rest))  ; 
-   ((build-record 0 constructor . rest)                             ; 
-    (build-record 1 (constructor . #f) () . rest))                  ; 
-   ((build-record 1 constructor-clause (pos-label ...) (super ...)  
-                    ((label . accessors) ...) . rest)
-    (meta 
-     `(build-record 2
-                    constructor-clause
-                    (meta ,(union (meta ,(super ("labels")))        ; compute union of labels from supers,
-                                  ...                               ; constructor clause and field clauses
-                                  (pos-label ...) 
-                                  (label ...)      
-                                  top:if-free=))
-                    ((label . accessors) ...)
-                    (meta  ,(union (meta ,(super ("supers")))       ; compute transitive union of supers
-                                   ...
-                                   top:if-free=))
-                    . rest)))
-    ((build-record 2 (constructor . pos-labels) labels . rest)      ; insert default constructor labels if not given
-     (syntax-if pos-labels
-                (build-record 3 (constructor . pos-labels) labels . rest)
-                (build-record 3 (constructor . labels)     labels . rest)))
-    ((build-record 3 constructor-clause labels ((label . accessors) ...) . rest)
-     (meta 
-      `(build-record 4
-                     (meta ,(remove-from labels                     ; separate the labels that do not appear in a
-                                         (label ...)                ; field clause for next step
-                                         top:if-free=))
-                     ((label . accessors) ...) 
-                     constructor-clause
-                     labels
-                     . rest)))
-    ((build-record 4
-                   (undeclared-label ...)
-                   (field-clause ...)
-                   (constructor . pos-labels)
-                   labels
-                   supers
-                   name
-                   predicate
-                   is-scheme?)
-     (meta
-      `(build-record 5                                              ; generate identifiers for constructor, predicate
-                     is-scheme?                                     ; getters and setters as needed 
-                     name
-                     supers
-                     supers
-                     labels 
-                     (meta ,(to-identifier constructor))   
-                     (meta ,(add-temporaries pos-labels))           ; needed for constructor below
-                     (meta ,(to-identifier predicate))
-                     (meta ,(augment-field field-clause)) 
-                     ... 
-                     (undeclared-label (meta ,(generate-identifier))
-                                       (meta ,(generate-identifier)))
-                     ...)))
-    ((build-record 5
-                   is-scheme?
-                   name
-                   (super ...)
-                   supers
-                   (label ...)
-                   constructor  
-                   ((pos-label pos-temp) ...) 
-                   predicate
-                   (field-label getter setter)
-                   ...)  
-     
-     (begin
-       (syntax-if is-scheme?
-                  
-                  (begin
-                    (define-generic (predicate x) (lambda (x) #f))
-                    (define-generic (getter x))
-                    ...
-                    (define-generic (setter x v))
-                    ...
-                    (define-generic (copy x)))
-                  
-                  (begin
-                    (srfi-9:define-record-type internal-name
-                                               (maker field-label ...)
-                                               predicate
-                                               (field-label getter setter) ...)  
-       
-                    (define constructor 
-                      (lambda (pos-temp ...)
-                        (populate 1 maker (field-label ...) (pos-label pos-temp) ...)))
-       
-                    (extend-predicates supers predicate)
-                    (extend-accessors supers field-label predicate getter setter)
-                    ...
-       
-                    (define (copy x)
-                      (maker (getter x) ...))
-                    (extend-copiers supers copy predicate)
-   
-                    (define-method (show (r predicate))
-                      (list 'name
-                            (list 'field-label (getter r)) 
-                            ...))))    
-       
-       (define-syntax name
-         (syntax-rules (field-label ...)
-           ((name ("is-scheme?") sk fk)     (syntax-if is-scheme? sk fk))
-           ((name ("predicate") k)          (syntax-apply k predicate))
-           ((name ("supers") k)             (syntax-apply k (super ... name)))  
-           ((name ("labels") k)             (syntax-apply k (label ...)))
-           ((name ("pos-labels") k)         (syntax-apply k (pos-label ...)))
-           ((name ("getter") field-label k) (syntax-apply k getter))   
-           ...
-           ((name ("getter") other k)       (syntax-apply k #f))
-           ((name ("setter") field-label k) (syntax-apply k setter))  
-           ...
-           ((name ("setter") other k)       (syntax-apply k #f))
-           ((name ("copier") k)             (syntax-apply k copy))
-           ((name . bindings)               (populate 1 maker (field-label ...) . bindings))))))))
-
-
-(define-syntax to-identifier
-  (syntax-rules ()
-    ((to-identifier #f k) (syntax-apply k generated-identifier))
-    ((to-identifier id k) (syntax-apply k id))))
-
-(define-syntax augment-field 
-  (syntax-rules ()
-    ((augment-field (label) k)               (syntax-apply k (label generated-getter generated-setter)))
-    ((augment-field (label getter) k)        (meta `(label (meta ,(to-identifier getter)) generated-setter) k))
-    ((augment-field (label getter setter) k) (meta `(label (meta ,(to-identifier getter)) 
-                                                           (meta ,(to-identifier setter))) k))))
-
-(define-syntax extend-predicates
-  (syntax-rules ()
-    ((extend-predicates (super ...) predicate)
-     (begin
-       (meta
-        `(define-method (meta ,(super ("predicate")))
-                        (predicate)
-                        (x)
-                        any?))   
-       ...))))
-
-(define-syntax extend-copiers
-  (syntax-rules ()
-    ((extend-copiers (super ...) copy predicate)
-     (begin
-       (meta
-        `(define-method (meta ,(super ("copier")))
-                        (predicate)
-                        (x)
-                        copy))    
-       ...))))
-
-(define-syntax extend-accessors
-  (syntax-rules ()
-    ((extend-accessors (super ...) label predicate selector modifier)
-     (meta
-      `(begin 
-         (syntax-if (meta ,(super ("getter") label))
-                    (define-method (meta ,(super ("getter") label))
-                                   (predicate)
-                                   (x)
-                                   selector)
-                    (begin))
-         ...
-         (syntax-if (meta ,(super ("setter") label))
-                    (define-method (meta ,(super ("setter") label))
-                                   (predicate any?)
-                                   (x v)
-                                   modifier)
-                    (begin))
-         ...)))))
-
-(define-syntax populate
-  (syntax-rules ()
-    ((populate 1 maker labels . bindings)
-     (meta 
-      `(populate 2 maker
-                   (meta ,(order labels bindings ('&lt;undefined&gt;))))))
-    ((populate 2 maker ((label exp) ...))
-     (maker exp ...))))
-
-(define-syntax order
-  (syntax-rules ()
-    ((order (label ...) ((label* . binding) ...) default k)
-     (meta
-      `(if-empty? (meta ,(remove-from (label* ...) 
-                                      (label ...) 
-                                      if-free=))
-                  (order "emit" (label ...) ((label* . binding) ...) default k)
-                  (syntax-error "Illegal labels in" ((label* . binding) ...)
-                                "Legal labels are" (label ...)))))
-    ((order "emit" (label ...) bindings default k)
-     (meta 
-      `((label . (meta ,(syntax-lookup label 
-                                       bindings 
-                                       if-free= 
-                                       default)))
-        ...)
-      k))))
-
-
-;============================================================================================
-; Simple generic functions:
-
-(define-syntax define-generic
-  (syntax-rules ()
-    ((define-generic (name arg ...))
-     (define-generic (name arg ...)
-       (lambda (arg ...) (error "Inapplicable method:" 'name
-                                "Arguments:" (show arg) ... ))))
-    ((define-generic (name arg ...) proc)
-     (define name (make-generic (arg ...) proc)))))  
-  
-(define-syntax define-method
-  (syntax-rules ()
-    ((define-method (generic (arg pred?) ...) . body)
-     (define-method generic (pred? ...) (arg ...) (lambda (arg ...) . body))) 
-    ((define-method generic (pred? ...) (arg ...) procedure)
-     (let ((next ((generic) 'get-proc))
-           (proc procedure))
-       (((generic) 'set-proc)
-        (lambda (arg ...)
-          (if (and (pred? arg) ...)
-              (proc arg ...)
-              (next arg ...))))))))
-
-(define-syntax make-generic
-  (syntax-rules ()
-    ((make-generic (arg arg+ ...) default-proc)
-     (let ((proc default-proc))
-       (case-lambda
-         ((arg arg+ ...)
-          (proc arg arg+ ...))
-         (()
-          (lambda (msg)
-            (case msg
-              ((get-proc) proc)
-              ((set-proc) (lambda (new)
-                            (set! proc new)))))))))))
-
-(define-generic (show x) 
-  (lambda (x) x))
-
-(define (any? x) #t)
-
-
-;============================================================================================
-; Syntax utilities:
-
-(define-syntax syntax-error
-  (syntax-rules ()))
-
-(define-syntax syntax-apply
-  (syntax-rules ()
-    ((syntax-apply (f . args) exp ...) 
-     (f exp ... . args))))
-
-(define-syntax syntax-cons
-  (syntax-rules ()
-    ((syntax-cons x rest k) 
-     (syntax-apply k (x . rest)))))
-
-(define-syntax syntax-cons-after
-  (syntax-rules ()
-    ((syntax-cons-after rest x k)
-     (syntax-apply k (x . rest)))))
-
-(define-syntax if-empty?
-  (syntax-rules ()
-    ((if-empty? () sk fk)      sk)
-    ((if-empty? (h . t) sk fk) fk)))
-
-(define-syntax add-temporaries   
-  (syntax-rules () 
-    ((add-temporaries lst k)                (add-temporaries lst () k))
-    ((add-temporaries () lst-temps k)       (syntax-apply k lst-temps))
-    ((add-temporaries (h . t) (done ...) k) (add-temporaries t (done ... (h temp)) k))))
-
-(define-syntax if-free=
-  (syntax-rules ()
-    ((if-free= x y kt kf)
-      (let-syntax
-          ((test (syntax-rules (x)
-                   ((test x kt* kf*) kt*)
-                   ((test z kt* kf*) kf*))))
-        (test y kt kf)))))
-
-(define-syntax top:if-free=
-  (syntax-rules ()
-    ((top:if-free= x y kt kf)
-     (begin
-       (define-syntax if-free=:test
-         (syntax-rules (x)
-           ((if-free=:test x kt* kf*) kt*)
-           ((if-free=:test z kt* kf*) kf*)))
-       (if-free=:test y kt kf)))))
-
-(define-syntax meta
-  (syntax-rules (meta quasiquote unquote)
-    ((meta `(meta ,(function argument ...)) k)
-     (meta `(argument ...) (syntax-apply-to function k)))
-    ((meta `(a . b) k)
-     (meta `a (descend-right b k)))
-    ((meta `whatever k) (syntax-apply k whatever))
-    ((meta `arg)
-     (meta `arg (syntax-id)))))
-
-(define-syntax syntax-apply-to
-  (syntax-rules ()
-    ((syntax-apply-to (argument ...) function k)
-     (function argument ... k))))
-
-(define-syntax descend-right
-  (syntax-rules ()
-    ((descend-right evaled b k)
-     (meta `b (syntax-cons-after evaled k)))))
-
-(define-syntax syntax-id
-  (syntax-rules ()
-    ((syntax-id arg) arg))) 
-
-(define-syntax remove-duplicates
-  (syntax-rules ()
-    ((remove-duplicates lst compare? k)
-     (remove-duplicates lst () compare? k))
-    ((remove-duplicates () done compare? k)
-     (syntax-apply k done))
-    ((remove-duplicates (h . t) (d ...) compare? k)
-     (if-member? h (d ...) compare? 
-                 (remove-duplicates t (d ...) compare? k)
-                 (remove-duplicates t (d ... h) compare? k)))))
-
-(define-syntax syntax-filter
-  (syntax-rules ()
-    ((syntax-filter () (if-p? arg ...) k)
-     (syntax-apply k ()))
-    ((syntax-filter (h . t) (if-p? arg ...) k)
-     (if-p? h arg ...
-            (syntax-filter t (if-p? arg ...) (syntax-cons-after h k))
-            (syntax-filter t (if-p? arg ...) k)))))
-
-(define-syntax if-member?
-  (syntax-rules ()
-    ((if-member? x () compare? sk fk) 
-     fk)
-    ((if-member? x (h . t) compare? sk fk)
-     (compare? x h
-               sk
-               (if-member? x t compare? sk fk)))))
-
-(define-syntax union
-  (syntax-rules ()
-    ((union (x ...) ... compare? k)
-     (remove-duplicates (x ... ...) compare? k))))
-
-(define-syntax intersection
-  (syntax-rules ()
-    ((intersection list1 list2 compare? k)
-     (syntax-filter list1 (if-member? list2 compare?) k))))
-
-(define-syntax remove-from
-  (syntax-rules ()
-    ((remove-from list1 list2 compare? k)
-     (syntax-filter list1 (if-not-member? list2 compare?) k))))
-
-(define-syntax if-not-member?
-  (syntax-rules ()
-    ((if-not-member? x list compare? sk fk)
-     (if-member? x list compare? fk sk))))
-
-(define-syntax generate-identifier
-  (syntax-rules ()
-    ((generate-identifier k) (syntax-apply k generated-identifier))))
-
-(define-syntax syntax-if
-  (syntax-rules ()
-    ((syntax-if #f sk fk)    fk)
-    ((syntax-if other sk fk) sk)))
-
-(define-syntax syntax-lookup
-  (syntax-rules ()
-    ((syntax-lookup label () compare fail k)
-     (syntax-apply k fail))
-    ((syntax-lookup label ((label* . value) . bindings) compare fail k)
-     (compare label label*
-              (syntax-apply k value)
-              (syntax-lookup label bindings compare fail k)))))
-</pre>
-
-
-
-<h2>Tests and examples</h2>
-
-<pre>;============================================================================================
-; Examples:
-
-; A simple record declaration:
-
-(define-record-type point (make-point x y) point?
-  (x point.x point.x-set!)
-  (y point.y point.y-set!))
-
-(define p (make-point 1 2))
-
-(point? p)             ;==&gt; #t
-(point.y p)            ;==&gt; 2
-(point.y-set! p 7)
-(point.y p)            ;==&gt; 7
-
-; Simple record schemes.
-; Record schemes don't have constructors.
-; The predicates and accessors are polymorphic.
-
-(define-record-scheme &lt;point #f &lt;point? 
-  (x &lt;point.x)
-  (y &lt;point.y))
-
-(define-record-scheme &lt;color #f &lt;color?
-  (hue &lt;color.hue))
-
-; Concrete instances of the above schemes.
-; Constructors may be declared.
-; Predicates and accessors, when provided, are monomorphic.  
-
-(define-record-type (point &lt;point) make-point point?
-  (x point.x)
-  (y point.y))
-
-(define-record-type (color &lt;color) make-color)
-
-(define-record-type (color-point &lt;color &lt;point) (make-color-point x y hue) color-point?
-  (extra color-point.extra))
-
-(define cp (make-color-point 1 2 'blue))
-
-(&lt;point? cp)            ;==&gt; #t         
-(&lt;color? cp)            ;==&gt; #t
-(color-point? cp)       ;==&gt; #t
-;(point.x cp)           ;==&gt; error 
-(&lt;point.y cp)           ;==&gt; 2
-(&lt;color.hue cp)         ;==&gt; blue
-(color-point.extra cp)  ;==&gt; &lt;undefined&gt;
-
-; Constructing records by field labels:
-
-(define p (point (x 1) 
-                 (y 2)))
-(define cp (color-point (hue 'blue) 
-                        (x 1) 
-                        (y 2)))
-
-; Monomorphic functional update:
-
-(show
- (record-update p point (x 7)))     ;==&gt; (point (x 7) (y 2))
-(show p)                            ;==&gt; (point (x 1) (y 2))   - original unaffected
-
-; Polymorphic functional update:
-
-(show 
- (record-update cp &lt;point (x 7)))   ;==&gt; (color-point (extra &lt;undefined&gt;) (hue blue) (x 7) (y 2))
-(show cp)                           ;==&gt; (color-point (extra &lt;undefined&gt;) (hue blue) (x 1) (y 2))
-
-; In-place update:
-
-(show 
- (record-update! cp &lt;point (x 7)))  ;==&gt; color-point (extra &lt;undefined&gt;) (hue blue) (x 7) (y 2))
-(show cp)                           ;==&gt; color-point (extra &lt;undefined&gt;) (hue blue) (x 7) (y 2))
- 
-; Use record-compose for updates polymorphic in argument but monomorphic in result type:
-
-(show
- (record-compose (&lt;point cp) (point (x 8))))  ;==&gt; (point (x 8) (y 2))
-(show cp)                                     ;==&gt; (color-point (extra &lt;undefined&gt;) (hue blue) (x 7) (y 2))
-
-; More general record composition example:
-
-(define cp (make-color-point 1 2 'green))
-(define c  (make-color 'blue))
- 
-(show 
- (record-compose (&lt;point cp)                 ; polymorphic import - only fields x and y of cp taken
-                 (color c)                   ; monomorphic import
-                 (color-point (x 8)          ; override imported field
-                              (extra 'hi))))                 
-                                      
-                                         ;==&gt; (color-point (extra hi) (hue blue) (x 8) (y 2))
-
-; Small module-functor example:
-  
-(define-record-type monoid #f #f 
-  (mult monoid.mult) 
-  (one  monoid.one))
-
-(define-record-type abelian-group #f #f 
-  (add  group.add) 
-  (zero group.zero)
-  (sub  group.sub))
-
-(define-record-type ring #f #f
-  (mult ring.mult) 
-  (one  ring.one)
-  (add  ring.add) 
-  (zero ring.zero)
-  (sub  ring.sub))
-
-(define integer-monoid (monoid (mult *) 
-                               (one  1)))
-
-(define integer-group (abelian-group (add  +)
-                                     (zero 0)
-                                     (sub  -)))
-
-(define (make-ring g m)          ; simple "functor"
-  (record-compose (monoid m)
-                  (abelian-group g)
-                  (ring)))
-
-(define integer-ring (make-ring integer-group 
-                                integer-monoid))
-  
-((ring.add integer-ring) 1 2)    ;==&gt; 3
-
-; Example of tree data type
-
-(define-record-scheme &lt;tree #f &lt;tree?) 
-
-(define-record-type (node &lt;tree) make-node node?
-  (lhs node.lhs)
-  (rhs node.rhs))
-
-(define-record-type (leaf &lt;tree) make-leaf leaf?
-  (val leaf.val))
-
-(define (tree-&gt;list t)
-  (cond
-    ((leaf? t) (leaf.val t))
-    ((node? t) (cons (tree-&gt;list (node.lhs t))
-                     (tree-&gt;list (node.rhs t))))))
-
-(define t 
-  (make-node (make-node (make-leaf 1)
-                        (make-leaf 2))
-             (make-leaf 3)))
-
-(&lt;tree? t)         ;==&gt; #t
-(tree-&gt;list t)     ;==&gt; ((1 . 2) . 3)
-</pre>
-
-
-<h2>References</h2>
-
-<pre>[1] Richard Kelsey, Defining Record Types, SRFI-9: http://srfi.schemers.org/srfi-9/srfi-9.html
-
-[2] See e.g.
-    Benjamin C. Pierce, Types and Programming Languages, MIT Press 2002, and references therein.
-    Mitchell Wand, Type inference for record concatenation and multiple inheritance, 
-                   Information and Computation, v.93 n.1, p.1-15, July 1991
-    John Reppy, Jon Riecke, Simple objects for Standard ML,
-                Proceedings of the ACM SIGPLAN '96 Conference on Programming Language Design and Implementation
-
-
-</pre>
-
-
-<H1>Copyright</H1>
-
-<p>Copyright (C) Andr&eacute; van Tonder (2004). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-<HR>
-
-<ADDRESS>Author: <A href="mailto:andre@het.brown.edu">Andr&eacute; van 
-Tonder</A></ADDRESS>
-<ADDRESS>Editor: <A href="mailto:srfi-editors@srfi.schemers.org">David Van Horn</A></ADDRESS>
-<!-- Created: Tue Mar 16 19:01:34 EST 2004 --><!-- hhmts start -->
-Last modified: Wed Dec  8 15:31:34 EST 2004
-<!-- hhmts end --></BODY></HTML>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-59.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-59.html
deleted file mode 100644
index 84b0680ff5..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-59.html
+++ /dev/null
@@ -1,350 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-  <HEAD>
-    <title>SRFI 59: Vicinity</title>
-  </HEAD>
-
-  <BODY>
-
-<H1>Title</H1>
-
-Vicinity
-
-<H1>Author</H1>
-
-Aubrey Jaffer
-
-<H1>Status</H1> 
-
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see <A
-href="http://srfi.schemers.org/srfi-process.html">here</A>. You can access
-previous messages via <A
-href="http://srfi.schemers.org/srfi-59/mail-archive/maillist.html">the
-archive of the mailing list</A>.
-
-<P> 
-<UL>
-  <LI>Received: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-59/srfi-59.html?rev=1.1">2004/12/30</A></LI>
-  <LI>Draft: 2004/12/30 - 2005/02/27</LI>
-  <LI>Final: 2005/03/08</LI>
-</UL>
-
-<H1>Abstract</H1>
-
-A vicinity is a descriptor for a place in the file system.  Vicinities
-hide from the programmer the concepts of host, volume, directory, and
-version.  Vicinities express only the concept of a file environment
-where a file name can be resolved to a file in a system independent
-manner.
-<P>
-All of these procedures are file-system dependent.  Use of these
-vicinity procedures can make programs file-system
-<EM>in</EM>dependent.
-<P>
-
-<H1>Rationale</H1>
-
-Most computer languages expose the syntax of pathnames of the host
-file-system when dealing with files.
-But a great many programs require read access to data, text, or
-library files they were installed with.
-<P>
-Some programs use literal strings to locate accessory files, breaking
-on installations with different destinations.
-More savvy coders will construct pathnames from environment variables
-or compile-time definitions.
-<P>
-In most languages, programs intended for portability must condition
-all manipulations of pathnames to the syntax and capabilities of the
-host file-system.  Inconsistent conditioning is a common cause of
-porting failures.
-<P>
-Common-Lisp attacks the general problem of naming files anywhere in
-any file system.  It has a six-component <DFN>pathname</DFN> datatype
-to represent names in the most complicated file-system imaginable;
-names in simpler file systems use fewer components.
-<P>
-In this arrangement, portable file-handling programs must be capable
-of handling pathnames with 6 components, and those employing fewer.
-But which component will be used is not obvious.  Is a
-<CODE>".txt"</CODE> filename suffix a <I>type</I> or part of the
-<I>name</I>?
-<P>
-Vicinities attack a smaller problem, that of describing pathnames in 5
-predefined locations, and their sub-vicinities.  Those predefined
-locations cover the usual areas for ancillary and configuration files
-used by Scheme implementations and programs.  The
-<CODE>program-vicinity</CODE> is particularly useful as it is the
-directory where the currently loading file is located.  This is
-captured by redefining <CODE>load</CODE> to <CODE>fluid-let</CODE> a
-top-level variable with its argument.
-<P>
-The <CODE>make-vicinity</CODE> and <CODE>pathname-&gt;vicinity</CODE>
-procedures provide means to create new base vicinities.  Base
-vicinities should generally be absolute pathnames.
-<P>
-Vicinities need not be tied to individual files in a file system.  The
-files named could be members of a zip archive, as Java does.
-Vicinities can even be used on <EM>flat</EM> file systems (which have
-no directory structure) by having the vicinity express constraints on
-the file name.  On most systems a vicinity is a string.
-<P>
-<A HREF="http://swiss.csail.mit.edu/~jaffer/slib_2.html#SEC14"><TT>vicinity</TT></A>
-procedures are supported by all implementations in
-<A HREF="http://swiss.csail.mit.edu/~jaffer/SLIB">SLIB</A>.
-<P>
-
-<H1>Specification</H1>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B><a name="program-vicinity">program-vicinity</a></B>
-<DD><A NAME="IDX60"></A>
-Returns the vicinity of the currently loading Scheme code.  For an
-interpreter this would be the directory containing source code.  For a
-compiled system (with multiple files) this would be the directory
-where the object or executable files are.  If no file is currently
-loading, then the result is undefined.  <STRONG>Warning:</STRONG>
-<CODE>program-vicinity</CODE> can return incorrect values if your program
-escapes back into a <CODE>load</CODE> continuation.
-</DL>
-
-
-<P>
-<DL>
-<DT><U>Function:</U> <B><a name="library-vicinity">library-vicinity</a></B>
-<DD><A NAME="IDX61"></A>
-Returns the vicinity of the shared Scheme library.
-</DL>
-
-
-<P>
-<DL>
-<DT><U>Function:</U> <B><a name="implementation-vicinity">implementation-vicinity</a></B>
-<DD><A NAME="IDX62"></A>
-Returns the vicinity of the underlying Scheme implementation.  This
-vicinity will likely contain startup code and messages and a compiler.
-</DL>
-
-
-<P>
-<DL>
-<DT><U>Function:</U> <B><a name="user-vicinity">user-vicinity</a></B>
-<DD><A NAME="IDX63"></A>
-Returns the vicinity of the current directory of the user.  On most
-systems this is <TT>`""'</TT> (the empty string).
-</DL>
-
-
-<P>
-<DL>
-<DT><U>Function:</U> <B><a name="home-vicinity">home-vicinity</a></B>
-<DD><A NAME="IDX64"></A>
-Returns the vicinity of the user's <EM>HOME</EM> directory, the directory
-<A NAME="IDX65"></A>
-which typically contains files which customize a computer environment
-for a user.  If scheme is running without a user (eg. a daemon) or if
-this concept is meaningless for the platform, then <CODE>home-vicinity</CODE>
-returns <CODE>#f</CODE>.
-</DL>
-
-
-<P>
-<DL>
-<DT><U>Function:</U> <B><a name="in-vicinity">in-vicinity</a></B> <I>vicinity filename</I>
-<DD><A NAME="IDX67"></A>
-Returns a filename suitable for use by <CODE>load</CODE>,
-<CODE>open-input-file</CODE>, <CODE>open-output-file</CODE>, etc.  The
-returned filename is <VAR>filename</VAR> in <VAR>vicinity</VAR>.
-<CODE>in-vicinity</CODE> should allow <VAR>filename</VAR> to override
-<VAR>vicinity</VAR> when <VAR>filename</VAR> is an absolute pathname
-and <VAR>vicinity</VAR> is equal to the value of
-<CODE>(user-vicinity)</CODE>.  The behavior of
-<CODE>in-vicinity</CODE> when <VAR>filename</VAR> is absolute and
-<VAR>vicinity</VAR> is not equal to the value of
-<CODE>(user-vicinity)</CODE> is unspecified.  For most systems
-<CODE>in-vicinity</CODE> can be <CODE>string-append</CODE>.  </DL>
-
-
-<P>
-<DL>
-<DT><U>Function:</U> <B><a name="sub-vicinity">sub-vicinity</a></B> <I>vicinity name</I>
-<DD><A NAME="IDX68"></A>
-Returns the vicinity of <VAR>vicinity</VAR> restricted to <VAR>name</VAR>.  This
-is used for large systems where names of files in subsystems could
-conflict.  On systems with directory structure <CODE>sub-vicinity</CODE> will
-return a pathname of the subdirectory <VAR>name</VAR> of
-<VAR>vicinity</VAR>.
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B><a name="make-vicinity">make-vicinity</a></B> <I>dirpath</I>
-<DD><A NAME="IDX58"></A>
-Returns <VAR>dirpath</VAR> as a vicinity for use as first argument to
-<CODE>in-vicinity</CODE>.
-</DL>
-
-
-<P>
-<DL>
-<DT><U>Function:</U> <B><a name="pathname-to-vicinity">pathname-&#62;vicinity</a></B> <I>path</I>
-<DD><A NAME="IDX59"></A>
-Returns the vicinity containing <VAR>path</VAR>.
-
-<PRE>
-(pathname-&#62;vicinity "/usr/local/lib/scm/Link.scm")
-                    => "/usr/local/lib/scm/"
-</PRE>
-
-</DL>
-
-
-<P>
-<DL>
-<DT><U>Function:</U> <B><a name="vicinity:suffix-p">vicinity:suffix?</a></B> <I>chr</I>
-<DD><A NAME="IDX66"></A>
-Returns the <SAMP>`#t'</SAMP> if <VAR>chr</VAR> is a vicinity suffix character; and
-<CODE>#f</CODE> otherwise.  Typical vicinity suffixes are <SAMP>`/'</SAMP>,
-<SAMP>`:'</SAMP>, and <SAMP>`\'</SAMP>,
-</DL>
-
-
-<H1>Implementation</H1>
-
-This code is taken from
-<A HREF="http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/slib/slib/logical.scm?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">slib/Template.scm</A>
-and
-<A HREF="http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/slib/slib/logical.scm?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">slib/require.scm</A>
-<P>
-
-<PRE>
-;;@ (implementation-vicinity) should be defined to be the pathname of
-;;; the directory where any auxiliary files to your Scheme
-;;; implementation reside.
-(define (implementation-vicinity)
-  (case (software-type)
-    ((UNIX)	"/usr/local/src/scheme/")
-    ((VMS)	"scheme$src:")
-    ((MS-DOS)	"C:\\scheme\\")))
-
-;;@ (library-vicinity) should be defined to be the pathname of the
-;;; directory where files of Scheme library functions reside.
-(define library-vicinity
-  (let ((library-path
-	 (or
-	  ;; Use this getenv if your implementation supports it.
-	  (getenv "SCHEME_LIBRARY_PATH")
-	  ;; Use this path if your scheme does not support GETENV
-	  ;; or if SCHEME_LIBRARY_PATH is not set.
-	  (case (software-type)
-	    ((UNIX) "/usr/local/lib/slib/")
-	    ((VMS) "lib$scheme:")
-	    ((MS-DOS) "C:\\SLIB\\")
-	    (else "")))))
-    (lambda () library-path)))
-
-;;@ (home-vicinity) should return the vicinity of the user's HOME
-;;; directory, the directory which typically contains files which
-;;; customize a computer environment for a user.
-(define (home-vicinity)
-  (let ((home (getenv "HOME")))
-    (and home
-	 (case (software-type)
-	   ((UNIX COHERENT MS-DOS)	;V7 unix has a / on HOME
-	    (if (eqv? #\/ (string-ref home (+ -1 (string-length home))))
-		home
-		(string-append home "/")))
-	   (else home)))))
-;@
-(define in-vicinity string-append)
-;@
-(define (user-vicinity)
-  (case (software-type)
-    ((VMS)	"[.]")
-    (else	"")))
-;@
-(define vicinity:suffix?
-  (let ((suffi
-	 (case (software-type)
-	   ((AMIGA)				'(#\: #\/))
-	   ((MACOS THINKC)			'(#\:))
-	   ((MS-DOS WINDOWS ATARIST OS/2)	'(#\\ #\/))
-	   ((NOSVE)				'(#\: #\.))
-	   ((UNIX COHERENT PLAN9)		'(#\/))
-	   ((VMS)				'(#\: #\]))
-	   (else
-	    (slib:warn "require.scm" 'unknown 'software-type (software-type))
-	    "/"))))
-    (lambda (chr) (and (memv chr suffi) #t))))
-;@
-(define (pathname-&gt;vicinity pathname)
-  (let loop ((i (- (string-length pathname) 1)))
-    (cond ((negative? i) "")
-	  ((vicinity:suffix? (string-ref pathname i))
-	   (substring pathname 0 (+ i 1)))
-	  (else (loop (- i 1))))))
-(define (program-vicinity)
-  (if *load-pathname*
-      (pathname-&gt;vicinity *load-pathname*)
-      (slib:error 'program-vicinity "called while not within load")))
-;@
-(define sub-vicinity
-  (case (software-type)
-    ((VMS) (lambda
-	       (vic name)
-	     (let ((l (string-length vic)))
-	       (if (or (zero? (string-length vic))
-		       (not (char=? #\] (string-ref vic (- l 1)))))
-		   (string-append vic "[" name "]")
-		   (string-append (substring vic 0 (- l 1))
-				  "." name "]")))))
-    (else (let ((*vicinity-suffix*
-		 (case (software-type)
-		   ((NOSVE) ".")
-		   ((MACOS THINKC) ":")
-		   ((MS-DOS WINDOWS ATARIST OS/2) "\\")
-		   ((UNIX COHERENT PLAN9 AMIGA) "/"))))
-	    (lambda (vic name)
-	      (string-append vic name *vicinity-suffix*))))))
-;@
-(define (make-vicinity pathname) pathname)
-</PRE>
-<P>
-
-<H1>Copyright</H1>
-<p>Copyright (C) Aubrey Jaffer (2004). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-
-    <HR>
-    <ADDRESS>Editor: <A HREF="mailto:srfi-editors@srfi.schemers.org">David Van Horn</A></ADDRESS>
-<!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-<!-- hhmts start -->
-Last modified: Thu Dec 30 23:48:06 EST 2004
-<!-- hhmts end -->
-  </BODY>
-</HTML>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-6.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-6.html
deleted file mode 100644
index 890e205f86..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-6.html
+++ /dev/null
@@ -1,353 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>SRFI 6: Basic String Ports</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI-6: Basic String Ports
-
-<H1>Author</H1>
-
-William D Clinger
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion via <A HREF="http://srfi.schemers.org/srfi-6/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P><UL>
-<LI>Received: 1999/04/07
-<LI>Draft: 1999/04/26-1999/06/24
-<LI>Final: 1999/07/01
-</UL>
-
-
-<H1>Abstract</H1>
-
-Scheme's i/o primitives are extended by adding three new procedures
-that
-<ul>
-<li>create an input port from a string,
-<li>create an output port whose contents are accumulated in Scheme's
-    working memory instead of an external file, and
-<li>extract the accumulated contents of an in-memory output port
-    and return them in the form of a string.
-</ul>
-
-<H1>Issues</H1>
-
-None.
-
-<H1>Rationale</H1>
-
-Scheme's procedures for performing input and output from and to ports
-become more useful when extended by string ports.  The interface
-described here has been in use since 1986 or before, and is currently
-supported by several of the major implementations.
-
-<H1>Specification</H1>
-
-This specification is taken from the MacScheme Reference Manual.
-
-<dl>
-<dt><a name="open-input-string"></a><pre>
-(OPEN-INPUT-STRING string)                            ;procedure
-</pre><dd>
-    Takes a string and returns an input port that delivers characters
-    from the string.  The port can be closed by
-    <code>CLOSE-INPUT-PORT</code>, though its storage will be
-    reclaimed by the garbage collector if it becomes inaccessible.
-<pre>
-        (define p
-          (open-input-string "(a . (b . c . ())) 34"))
-
-        (input-port? p)                 -->  #t
-        (read p)                        -->  (a b c)
-        (read p)                        -->  34
-        (eof-object? (peek-char p))     -->  #t
-</pre>
-
-<dt><a name="open-output-string"></a><pre>
-(OPEN-OUTPUT-STRING)                                  ;procedure
-</pre><dd>
-    Returns an output port that will accumulate characters for
-    retrieval by <code>GET-OUTPUT-STRING</code>.  The port can be
-    closed by the procedure <code>CLOSE-OUTPUT-PORT</code>, though
-    its storage will be reclaimed by the garbage collector if it
-    becomes inaccessible.
-<pre>
-        (let ((q (open-output-string))
-              (x '(a b c)))
-          (write (car x) q)
-          (write (cdr x) q)
-          (get-output-string q))        -->  "a(b c)"
-</pre>
-
-<dt><a name="get-output-string"></a><pre>
-(GET-OUTPUT-STRING output-port)                       ;procedure
-</pre><dd>
-    Given an output port created by <code>OPEN-OUTPUT-STRING</code>,
-    returns a string consisting of the characters that have been
-    output to the port so far.
-</dl>
-
-
-<H1>Implementation</H1>
-
-What follows is just an outline of how these procedures might be
-implemented, because a real implementation would also have to
-redefine <code>READ</code>, <code>WRITE</code>, and so forth
-to use <code>PEEK-CHAR</code>, <code>READ-CHAR</code>, and
-<code>WRITE-CHAR</code> as redefined below.
-
-<p>
-Since the code for <code>READ</code> and <code>WRITE</code>
-would be identical to code that already exists in any
-implementation, however, it should not be necessary for this
-SRFI to include that code within this SRFI.  Including it
-would only detract from the readability of this implementation.
-
-<p>
-<pre>
-; This implementation is not IEEE- or R5RS-compliant,
-; for the following reasons:
-;
-; This implementation does not redefine procedures
-; like READ, WRITE, DISPLAY, and NEWLINE to ensure
-; that they use the redefined PEEK-CHAR, READ-CHAR,
-; WRITE-CHAR, and so forth.  That should be easy
-; for an implementor to do, however.
-;
-; This implementation obtains an end-of-file object
-; by reading a Unix-specific file, /dev/null.
-
-(define open-input-string 0)  ; assigned below
-(define open-output-string 0) ; assigned below
-(define get-output-string 0)  ; assigned below
-
-; We have to remember the original procedures before
-; we can define new ones.
-
-(define ur-vector? vector?)
-(define ur-vector-length vector-length)
-(define ur-vector-ref vector-ref)
-(define ur-vector-set! vector-set!)
-(define ur-input-port? input-port?)
-(define ur-output-port? output-port?)
-(define ur-close-input-port close-input-port)
-(define ur-close-output-port close-output-port)
-(define ur-peek-char peek-char)
-(define ur-read-char read-char)
-(define ur-write-char write-char)
-
-; IEEE/ANSI Scheme insists that we define any global
-; variables that we are going to assign.  R5RS Scheme
-; apparently does not require this.
-
-(define vector? vector?)
-(define vector-length vector-length)
-(define vector-ref vector-ref)
-(define vector-set! vector-set!)
-(define input-port? input-port?)
-(define output-port? output-port?)
-(define close-input-port close-input-port)
-(define close-output-port close-output-port)
-(define peek-char peek-char)
-(define read-char read-char)
-(define write-char write-char)
-
-(let ((ur-vector? ur-vector?)
-      (ur-vector-length ur-vector-length)
-      (ur-vector-ref ur-vector-ref)
-      (ur-vector-set! ur-vector-set!)
-      (ur-input-port? ur-input-port?)
-      (ur-output-port? ur-output-port?)
-      (ur-close-input-port ur-close-input-port)
-      (ur-close-output-port ur-close-output-port)
-      (ur-peek-char ur-peek-char)
-      (ur-read-char ur-read-char)
-      (ur-write-char ur-write-char)
-      (eof (call-with-input-file "/dev/null" read-char))
-      (input-string-tag (list 'input-string-tag))
-      (output-string-tag (list 'output-string-tag)))
-  
-  (define (error)
-    (display "You're not supposed to do that!")
-    (newline)
-    (if #f #f))
-  
-  (define (restrict f pred?)
-    (lambda (x . rest)
-      (if (pred? x)
-          (apply f x rest)
-          (error))))
-  
-  (define (my-vector? x)
-    (and (ur-vector? x)
-         (not (input-string? x))
-         (not (output-string? x))))
-  
-  (define (input-string? x)
-    (and (ur-vector? x)
-         (positive? (ur-vector-length x))
-         (eq? input-string-tag (ur-vector-ref x 0))))
-  
-  (define (output-string? x)
-    (and (ur-vector? x)
-         (positive? (ur-vector-length x))
-         (eq? output-string-tag (ur-vector-ref x 0))))
-  
-  (define (selector pred? i)
-    (lambda (x)
-      (if (pred? x)
-          (ur-vector-ref x i)
-          (error))))
-  
-  (define (setter pred? i)
-    (lambda (x y)
-      (if (pred? x)
-          (begin (ur-vector-set! x i y)
-                 (if #f #f))
-          (error))))
-  
-  (set! vector?       my-vector?)
-  (set! vector-length (restrict ur-vector-length my-vector?))
-  (set! vector-ref    (restrict ur-vector-ref  my-vector?))
-  (set! vector-set!   (restrict ur-vector-set! my-vector?))
-  
-  (let ()
-    
-    ; The guts of the implementation begin here.
-    
-    (define (make-input-string s)
-      (vector input-string-tag #t s (string-length s) 0))
-    
-    (define input-string:open?  (selector input-string? 1))
-    (define input-string:open?! (setter   input-string? 1))
-    (define input-string:string (selector input-string? 2))
-    (define input-string:size   (selector input-string? 3))
-    (define input-string:next   (selector input-string? 4))
-    (define input-string:next!  (setter   input-string? 4))
-    
-    (define (make-output-string)
-      (vector output-string-tag #t '()))
-    
-    (define output-string:open?     (selector output-string? 1))
-    (define output-string:open?!    (setter   output-string? 1))
-    (define output-string:contents  (selector output-string? 2))
-    (define output-string:contents! (setter   output-string? 2))
-    
-    (set! open-input-string make-input-string)
-    (set! open-output-string make-output-string)
-    (set! get-output-string
-          (lambda (x)
-            (list->string (reverse (output-string:contents x)))))
-    
-    (set! input-port?
-          (lambda (x)
-            (or (ur-input-port? x)
-                (input-string? x))))
-    
-    (set! output-port?
-          (lambda (x)
-            (or (ur-output-port? x)
-                (output-string? x))))
-    
-    (set! close-input-port
-          (lambda (x)
-            (if (input-string? x)
-                (input-string:open?! x #f)
-                (ur-close-input-port x))))
-    
-    (set! close-output-port
-          (lambda (x)
-            (if (output-string? x)
-                (output-string:open?! x #f)
-                (ur-close-output-port x))))
-    
-    (set! peek-char
-          (lambda args
-            (if (null? args)
-                (ur-peek-char)
-                (let ((x (car args)))
-                  (if (input-string? x)
-                      (let ((s (input-string:string x))
-                            (i (input-string:next x))
-                            (n (input-string:size x)))
-                        (if (input-string:open? x)
-                            (if (< i n)
-                                (string-ref s i)
-                                eof)
-                            (error)))
-                      (ur-peek-char x))))))
-    
-    (set! read-char
-          (lambda args
-            (if (null? args)
-                (ur-read-char)
-                (let ((x (car args)))
-                  (if (input-string? x)
-                      (let ((s (input-string:string x))
-                            (i (input-string:next x))
-                            (n (input-string:size x)))
-                        (if (input-string:open? x)
-                            (if (< i n)
-                                (let ((c (string-ref s i)))
-                                  (input-string:next! x (+ i 1))
-                                  c)
-                                eof)
-                            (error)))
-                      (ur-read-char x))))))
-    
-    (set! write-char
-          (lambda (c . rest)
-            (if (null? rest)
-                (ur-write-char c)
-                (let ((x (car rest)))
-                  (if (output-string? x)
-                      (if (output-string:open? x)
-                          (output-string:contents!
-                           x
-                           (cons c (output-string:contents x)))
-                          (error))
-                      (ur-write-char c x))))))
-    
-    (if #f #f)))
-</pre>
-
-<H1>Copyright</H1>
-Copyright (C) William D Clinger (1999). All Rights Reserved. 
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-<!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-<!-- hhmts start -->
-Last modified: Mon Feb 24 11:54:01 MET 2003
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-60.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-60.html
deleted file mode 100644
index 09e098ac0e..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-60.html
+++ /dev/null
@@ -1,884 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-  <HEAD>
-    <title>SRFI 60: Integers as Bits</title>
-  </HEAD>
-
-  <BODY>
-
-<H1>Title</H1>
-
-SRFI 60: Integers as Bits
-
-<H1>Author</H1>
-
-Aubrey Jaffer
-
-<H1>Status</H1> 
-
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see <A
-href="http://srfi.schemers.org/srfi-process.html">here</A>. You can access
-previous messages via <A
-href="http://srfi.schemers.org/srfi-60/mail-archive/maillist.html">the
-archive of the mailing list</A>.
-
-<P> 
-<UL>
-  <LI>Received: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-60/srfi-60.html?rev=1.1">2005/01/03</A></LI>
-  <LI>Draft: 2005/01/03 - 2005/03/03</LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-60/srfi-60.html?rev=1.2">2005/01/10</A></LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-60/srfi-60.html?rev=1.4">2005/01/27</A></LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-60/srfi-60.html?rev=1.5">2005/01/29</A></LI>
-  <LI>Final: 2005/03/08</LI>
-</UL>
-
-<H1>Abstract</H1>
-
-Treating integers as two's-complement strings of bits is an arcane but
-important domain of computer science.  It is used for:
-
-<UL>
-<LI>hashing;
-
-<LI>Galois-field[2] calculations of error-detecting and
-    error-correcting codes;
-
-<LI>cryptography and ciphers;
-
-<LI>pseudo-random number generation;
-
-<LI>register-transfer-level modeling of digital logic designs;
-
-<LI>Fast-Fourier transforms;
-
-<LI>packing and unpacking numbers in persistent data structures;
-
-<LI>space-filling curves with applications to dimension reduction and
-    sparse multi-dimensional database indexes; and
-
-<LI>generating approximate seed values for root-finders and
-    transcendental function algorithms.
-
-</UL>
-<P>
-
-<H1>Rationale</H1>
-
-This proposal describes the
-<A HREF="http://swiss.csail.mit.edu/~jaffer/SLIB">SLIB</A> module
-<A HREF="http://swiss.csail.mit.edu/~jaffer/slib_5.html#SEC88"><TT>logical</TT></A>,
-which has been used for those purposes listed above.
-<P>
-The discussions of the withdrawn
-<A HREF="http://srfi.schemers.org/srfi-33/">SRFI-33: "Integer
-Bitwise-operation Library"</A> seemed to founder on consistency of
-procedure names and arity; and on perceived competition with the
-boolean arrays of SRFI-47.
-<P>
-I have implemented both logical number operations and boolean arrays;
-and have not been conflicted as to their application.  I used boolean
-arrays to construct very fast indexes for database tables having
-millions of records.  To avoid running out of RAM, creation of megabit
-arrays should be explicit; so the boolean array procedures put their
-results into a passed array.  In contrast, these procedures are purely
-functional.
-<P>
-
-<H3>Bits and Complements</H3>
-
-A bit-index in these descriptions is nonnegative with the least
-significant bit at index 0.
-A positive integer has a finite number of "1" bits.
-A negative integer has a finite number of "0" bits.
-<P>
-The reference implementation is written using only Scheme integer
-operations.  Thus the only exposure of the underlying representation
-is the ranges of fixnums.
-<P>
-The <DFN>complement</DFN> describes the representation of negative
-integers.  With one's-complement fixnums, the range of integers is
--(2<SUP><I>n</I></SUP>) to 2<SUP><I>n</I></SUP>, and there are two
-possible representations of 0.  With two's-complement fixnums, the
-range of integers is -(2<SUP><I>n</I></SUP>+1) to
-2<SUP><I>n</I></SUP>.
-<P>
-Since we treat integers as having two's-complement negations,
-the two's-complement of an integer is simply its negation.
-The one's-complement of an integer is computed by lognot:
-
-<PRE>
-(define (lognot n) (- -1 n))
-</PRE>
-<P>
-
-<H3>Bitwise Operations and Integer Properties</H3>
-
-The <TT>logior</TT>, <TT>logxor</TT>, <TT>logand</TT>,
-<TT>lognot</TT>, <TT>logtest</TT>, <TT>logbit?</TT> (logbitp),
-<TT>ash</TT>, <TT>logcount</TT>, and <TT>integer-length</TT>
-procedures are from Common-Lisp.  <TT>Logior</TT>, <TT>logxor</TT>,
-and <TT>logand</TT> have been extended to accept any arity.
-Opportunities to use an <I>n</I>-ary version of <TT>logtest</TT> have
-not been frequent enough to justify its extension.
-<P>
-In the <DFN>Bitwise Operations</DFN>, rather than striving for
-orthogonal completeness, I have concentrated on a nearly minimal set
-of bitwise logical functions sufficient to support the uses listed
-above.
-<P>
-Although any two of <TT>logior</TT>, <TT>logxor</TT>, and
-<TT>logand</TT> (in combination with <TT>lognot</TT>) are sufficient
-to generate all the two-input logic functions, having these three
-means that any nontrivial two-input logical function can be
-synthesized using just one of these two-input primaries with zero or
-one calls to <TT>lognot</TT>.
-<P>
-<TT>bitwise-if</TT> is what SRFI-33 calls <TT>bitwise-merge</TT>.
-<P>
-The SRFI-33 aliases: <TT>bitwise-ior</TT>, <TT>bitwise-xor</TT>,
-<TT>bitwise-and</TT>, <TT>bitwise-not</TT>, <TT>bitwise-merge</TT>,
-<TT>any-bits-set?</TT>, and <TT>bit-count</TT> are also provided.
-<P>
-<TT>log2-binary-factors</TT> (alias <TT>first-set-bit</TT>) is a
-useful function which is simple but non-obvious:
-
-<PRE>
-(define (log2-binary-factors n)
-  (+ -1 (integer-length (logand n (- n)))))
-</PRE>
-
-<H3>Bit Within Word and Field of Bits</H3>
-
-The <DFN>Bit Within Word</DFN> and <DFN>Field of Bits</DFN> procedures
-are used for modeling digital logic and accessing binary data
-structures in software.
-<P>
-I have changed to <TT>copy-bit-field</TT> argument order to be
-consistent with the other <DFN>Field of Bits</DFN> procedures: the
-<VAR>start</VAR> and <VAR>end</VAR> index arguments are last.
-This makes them analogous to the argument order to <TT>substring</TT>
-and SRFI-47 arrays, which took their cue from <TT>substring</TT>.
-<P>
-These <VAR>start</VAR> and <VAR>end</VAR> index arguments are not
-compatible with SRFI-33's <VAR>size</VAR> and <VAR>position</VAR>
-arguments (occurring first) in its <TT>bit-field</TT> procedures.
-Both define <TT>copy-bit-field</TT>; the arguments and purposes being
-incompatible.
-<P>
-A procedure in slib/logical.scm, <TT>logical:rotate</TT>, rotated a
-given number of low-order bits by a given number of bits.  This
-function was quite servicable, but I could not name it adequately.  I
-have replaced it with <TT>rotate-bit-field</TT> with the addition of a
-<VAR>start</VAR> argument.  This new function rotates a given field
-(from positions <VAR>start</VAR> to <VAR>end</VAR>) within an integer;
-leaving the rest unchanged.
-<P>
-Another problematic name was <TT>logical:ones</TT>, which generated an
-integer with the least significant <VAR>k</VAR> bits set.  Calls to
-<TT>bit-field</TT> could have replaced its uses .  But the definition
-was so short that I just replaced its uses with:
-
-<PRE>
-(lognot (ash -1 <VAR>k</VAR>))
-</PRE>
-<P>
-The <TT>bit-reverse</TT> procedure was then the only one which took a
-<VAR>width</VAR> argument.  So I replaced it with
-<TT>reverse-bit-field</TT>.
-<P>
-The <DFN>Lamination</DFN> and <DFN>Gray-code</DFN> functions were
-moved to
-<A HREF="http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/slib/slib/phil-spc.scm?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">slib/phil-spc.scm</A>
-<P>
-
-<H3>Bits as Booleans</H3>
-
-<DFN>Bits as Booleans</DFN> provides the procedures to convert between
-integers and lists of booleans.  There is no comparable facility in
-SRFI-33.
-<P>
-
-
-<H1>Specification</H1>
-
-
-
-<H3><A NAME="SEC97">Bitwise Operations</A></H3>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>logand</B> <I>n1 ...</I>
-<DD><A NAME="IDX487"></A>
-<DT><U>Function:</U> <B>bitwise-and</B> <I>n1 ...</I>
-<DD><A NAME="IDX488"></A>
-Returns the integer which is the bit-wise AND of the integer
-arguments.
-
-
-<P>
-Example:
-
-<PRE>
-(number-&#62;string (logand #b1100 #b1010) 2)
-    => "1000"
-</PRE>
-
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>logior</B> <I>n1 ...</I>
-<DD><A NAME="IDX489"></A>
-<DT><U>Function:</U> <B>bitwise-ior</B> <I>n1 ...</I>
-<DD><A NAME="IDX490"></A>
-Returns the integer which is the bit-wise OR of the integer arguments.
-
-
-<P>
-Example:
-
-<PRE>
-(number-&#62;string (logior #b1100 #b1010) 2)
-    => "1110"
-</PRE>
-
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>logxor</B> <I>n1 ...</I>
-<DD><A NAME="IDX491"></A>
-<DT><U>Function:</U> <B>bitwise-xor</B> <I>n1 ...</I>
-<DD><A NAME="IDX492"></A>
-Returns the integer which is the bit-wise XOR of the integer
-arguments.
-
-
-<P>
-Example:
-
-<PRE>
-(number-&#62;string (logxor #b1100 #b1010) 2)
-    => "110"
-</PRE>
-
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>lognot</B> <I>n</I>
-<DD><A NAME="IDX493"></A>
-<DT><U>Function:</U> <B>bitwise-not</B> <I>n</I>
-<DD><A NAME="IDX494"></A>
-Returns the integer which is the one's-complement of the integer argument.
-
-
-<P>
-Example:
-
-<PRE>
-(number-&#62;string (lognot #b10000000) 2)
-    => "-10000001"
-(number-&#62;string (lognot #b0) 2)
-    => "-1"
-</PRE>
-
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>bitwise-if</B> <I>mask n0 n1</I>
-<DD><A NAME="IDX495"></A>
-<DT><U>Function:</U> <B>bitwise-merge</B> <I>mask n0 n1</I>
-<DD><A NAME="IDX496"></A>
-Returns an integer composed of some bits from integer <VAR>n0</VAR> and some
-from integer <VAR>n1</VAR>.  A bit of the result is taken from <VAR>n0</VAR> if the
-corresponding bit of integer <VAR>mask</VAR> is 1 and from <VAR>n1</VAR> if that bit
-of <VAR>mask</VAR> is 0.
-</DL>
-
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>logtest</B> <I>j k</I>
-<DD><A NAME="IDX497"></A>
-<DT><U>Function:</U> <B>any-bits-set?</B> <I>j k</I>
-<DD><A NAME="IDX498"></A>
-
-<PRE>
-(logtest j k) == (not (zero? (logand j k)))
-
-(logtest #b0100 #b1011) => #f
-(logtest #b0100 #b0111) => #t
-</PRE>
-
-</DL>
-
-
-
-<H3><A NAME="SEC98">Integer Properties</A></H3>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>logcount</B> <I>n</I>
-<DD><A NAME="IDX499"></A>
-<DT><U>Function:</U> <B>bit-count</B> <I>n</I>
-<DD><A NAME="IDX500"></A>
-Returns the number of bits in integer <VAR>n</VAR>.  If integer is positive,
-the 1-bits in its binary representation are counted.  If negative, the
-0-bits in its two's-complement binary representation are counted.  If 0,
-0 is returned.
-
-
-<P>
-Example:
-
-<PRE>
-(logcount #b10101010)
-    => 4
-(logcount 0)
-    => 0
-(logcount -2)
-    => 1
-</PRE>
-
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>integer-length</B> <I>n</I>
-<DD><A NAME="IDX501"></A>
-Returns the number of bits necessary to represent <VAR>n</VAR>.
-
-
-<P>
-Example:
-
-<PRE>
-(integer-length #b10101010)
-    => 8
-(integer-length 0)
-    => 0
-(integer-length #b1111)
-    => 4
-</PRE>
-
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>log2-binary-factors</B> <I>n</I>
-<DD><A NAME="IDX502"></A>
-<DT><U>Function:</U> <B>first-set-bit</B> <I>n</I>
-<DD><A NAME="IDX503"></A>
-Returns the number of factors of two of integer <VAR>n</VAR>.  This value
-is also the bit-index of the least-significant <SAMP>`1'</SAMP> bit in
-<VAR>n</VAR>.
-
-
-
-<PRE>
-(require 'printf)
-(do ((idx 0 (+ 1 idx)))
-      ((&#62; idx 16))
-    (printf "%s(%3d) ==&#62; %-5d %s(%2d) ==&#62; %-5d\n"
-            'log2-binary-factors
-            (- idx) (log2-binary-factors (- idx))
-            'log2-binary-factors
-            idx (log2-binary-factors idx)))
--|
-log2-binary-factors(  0) ==&#62; -1    log2-binary-factors( 0) ==&#62; -1   
-log2-binary-factors( -1) ==&#62; 0     log2-binary-factors( 1) ==&#62; 0    
-log2-binary-factors( -2) ==&#62; 1     log2-binary-factors( 2) ==&#62; 1    
-log2-binary-factors( -3) ==&#62; 0     log2-binary-factors( 3) ==&#62; 0    
-log2-binary-factors( -4) ==&#62; 2     log2-binary-factors( 4) ==&#62; 2    
-log2-binary-factors( -5) ==&#62; 0     log2-binary-factors( 5) ==&#62; 0    
-log2-binary-factors( -6) ==&#62; 1     log2-binary-factors( 6) ==&#62; 1    
-log2-binary-factors( -7) ==&#62; 0     log2-binary-factors( 7) ==&#62; 0    
-log2-binary-factors( -8) ==&#62; 3     log2-binary-factors( 8) ==&#62; 3    
-log2-binary-factors( -9) ==&#62; 0     log2-binary-factors( 9) ==&#62; 0    
-log2-binary-factors(-10) ==&#62; 1     log2-binary-factors(10) ==&#62; 1    
-log2-binary-factors(-11) ==&#62; 0     log2-binary-factors(11) ==&#62; 0    
-log2-binary-factors(-12) ==&#62; 2     log2-binary-factors(12) ==&#62; 2    
-log2-binary-factors(-13) ==&#62; 0     log2-binary-factors(13) ==&#62; 0    
-log2-binary-factors(-14) ==&#62; 1     log2-binary-factors(14) ==&#62; 1    
-log2-binary-factors(-15) ==&#62; 0     log2-binary-factors(15) ==&#62; 0    
-log2-binary-factors(-16) ==&#62; 4     log2-binary-factors(16) ==&#62; 4    
-</PRE>
-
-</DL>
-
-
-
-<H3><A NAME="SEC99">Bit Within Word</A></H3>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>logbit?</B> <I>index n</I>
-<DD><A NAME="IDX504"></A>
-<DT><U>Function:</U> <B>bit-set?</B> <I>index n</I>
-<DD><A NAME="IDX505"></A>
-
-<PRE>
-(logbit? index n) == (logtest (expt 2 index) n)
-
-(logbit? 0 #b1101) => #t
-(logbit? 1 #b1101) => #f
-(logbit? 2 #b1101) => #t
-(logbit? 3 #b1101) => #t
-(logbit? 4 #b1101) => #f
-</PRE>
-
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>copy-bit</B> <I>index from bit</I>
-<DD><A NAME="IDX506"></A>
-Returns an integer the same as <VAR>from</VAR> except in the <VAR>index</VAR>th bit,
-which is 1 if <VAR>bit</VAR> is <CODE>#t</CODE> and 0 if <VAR>bit</VAR> is <CODE>#f</CODE>.
-
-
-<P>
-Example:
-
-<PRE>
-(number-&#62;string (copy-bit 0 0 #t) 2)       => "1"
-(number-&#62;string (copy-bit 2 0 #t) 2)       => "100"
-(number-&#62;string (copy-bit 2 #b1111 #f) 2)  => "1011"
-</PRE>
-
-</DL>
-
-
-
-<H3><A NAME="SEC100">Field of Bits</A></H3>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>bit-field</B> <I>n start end</I>
-<DD><A NAME="IDX507"></A>
-Returns the integer composed of the <VAR>start</VAR> (inclusive) through
-<VAR>end</VAR> (exclusive) bits of <VAR>n</VAR>.  The <VAR>start</VAR>th bit becomes
-the 0-th bit in the result.
-
-
-<P>
-Example:
-
-<PRE>
-(number-&#62;string (bit-field #b1101101010 0 4) 2)
-    => "1010"
-(number-&#62;string (bit-field #b1101101010 4 9) 2)
-    => "10110"
-</PRE>
-
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>copy-bit-field</B> <I>to from start end</I>
-<DD><A NAME="IDX508"></A>
-Returns an integer the same as <VAR>to</VAR> except possibly in the
-<VAR>start</VAR> (inclusive) through <VAR>end</VAR> (exclusive) bits, which are
-the same as those of <VAR>from</VAR>.  The 0-th bit of <VAR>from</VAR> becomes the
-<VAR>start</VAR>th bit of the result.
-
-
-<P>
-Example:
-
-<PRE>
-(number-&#62;string (copy-bit-field #b1101101010 0 0 4) 2)
-    => "1101100000"
-(number-&#62;string (copy-bit-field #b1101101010 -1 0 4) 2)
-    => "1101101111"
-(number-&#62;string (copy-bit-field #b110100100010000 -1 5 9) 2)
-    => "110100111110000"
-</PRE>
-
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>ash</B> <I>n count</I>
-<DD><A NAME="IDX509"></A>
-<DT><U>Function:</U> <B>arithmetic-shift</B> <I>n count</I>
-<DD><A NAME="IDX510"></A>
-Returns an integer equivalent to
-<CODE>(inexact-&#62;exact (floor (* <VAR>n</VAR> (expt 2 <VAR>count</VAR>))))</CODE>.
-
-
-<P>
-Example:
-
-<PRE>
-(number-&#62;string (ash #b1 3) 2)
-    => "1000"
-(number-&#62;string (ash #b1010 -1) 2)
-    => "101"
-</PRE>
-
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>rotate-bit-field</B> <I>n count start end</I>
-<DD><A NAME="IDX511"></A>
-Returns <VAR>n</VAR> with the bit-field from <VAR>start</VAR> to <VAR>end</VAR>
-cyclically permuted by <VAR>count</VAR> bits towards high-order.
-
-
-<P>
-Example:
-
-<PRE>
-(number-&#62;string (rotate-bit-field #b0100 3 0 4) 2)
-    => "10"
-(number-&#62;string (rotate-bit-field #b0100 -1 0 4) 2)
-    => "10"
-(number-&#62;string (rotate-bit-field #b110100100010000 -1 5 9) 2)
-    => "110100010010000"
-(number-&#62;string (rotate-bit-field #b110100100010000 1 5 9) 2)
-    => "110100000110000"
-</PRE>
-
-</DL>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>reverse-bit-field</B> <I>n start end</I>
-<DD><A NAME="IDX512"></A>
-Returns <VAR>n</VAR> with the order of bits <VAR>start</VAR> to <VAR>end</VAR>
-reversed.
-
-
-
-<PRE>
-(number-&#62;string (reverse-bit-field #xa7 0 8) 16)
-    => "e5"
-</PRE>
-
-</DL>
-
-
-
-<H3><A NAME="SEC101">Bits as Booleans</A></H3>
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>integer-&#62;list</B> <I>k len</I>
-<DD><A NAME="IDX513"></A>
-<DT><U>Function:</U> <B>integer-&#62;list</B> <I>k</I>
-<DD><A NAME="IDX514"></A>
-<CODE>integer-&#62;list</CODE> returns a list of <VAR>len</VAR> booleans corresponding
-to each bit of the given integer.  #t is coded for each 1; #f for 0.
-The <VAR>len</VAR> argument defaults to <CODE>(integer-length <VAR>k</VAR>)</CODE>.
-
-
-<P>
-<DT><U>Function:</U> <B>list-&#62;integer</B> <I>list</I>
-<DD><A NAME="IDX515"></A>
-<CODE>list-&#62;integer</CODE> returns an integer formed from the booleans in the
-list <VAR>list</VAR>, which must be a list of booleans.  A 1 bit is coded for
-each #t; a 0 bit for #f.
-
-
-<P>
-<CODE>integer-&#62;list</CODE> and <CODE>list-&#62;integer</CODE> are inverses so far as
-<CODE>equal?</CODE> is concerned.
-</DL>
-
-
-<P>
-<DL>
-<DT><U>Function:</U> <B>booleans-&#62;integer</B> <I>bool1 ...</I>
-<DD><A NAME="IDX516"></A>
-Returns the integer coded by the <VAR>bool1</VAR> ... arguments.
-</DL>
-
-
-
-<H1>Implementation</H1>
-
-<A HREF="http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/slib/slib/logical.scm?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">slib/logical.scm</A>
-implements the integers-as-bits procedures for R4RS or R5RS compliant
-Scheme implementations.
-<P>
-<PRE>
-;;;; "logical.scm", bit access and operations for integers for Scheme
-;;; Copyright (C) 1991, 1993, 2001, 2003, 2005 Aubrey Jaffer
-;
-;Permission to copy this software, to modify it, to redistribute it,
-;to distribute modified versions, and to use it for any purpose is
-;granted, subject to the following restrictions and understandings.
-;
-;1.  Any copy made of this software must include this copyright notice
-;in full.
-;
-;2.  I have made no warranty or representation that the operation of
-;this software will be error-free, and I am under no obligation to
-;provide any services, by way of maintenance, update, or otherwise.
-;
-;3.  In conjunction with products arising from the use of this
-;material, there shall be no use of my name in any advertising,
-;promotional, or sales literature without prior written consent in
-;each case.
-
-(define logical:boole-xor
- '#(#(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)
-    #(1 0 3 2 5 4 7 6 9 8 11 10 13 12 15 14)
-    #(2 3 0 1 6 7 4 5 10 11 8 9 14 15 12 13)
-    #(3 2 1 0 7 6 5 4 11 10 9 8 15 14 13 12)
-    #(4 5 6 7 0 1 2 3 12 13 14 15 8 9 10 11)
-    #(5 4 7 6 1 0 3 2 13 12 15 14 9 8 11 10)
-    #(6 7 4 5 2 3 0 1 14 15 12 13 10 11 8 9)
-    #(7 6 5 4 3 2 1 0 15 14 13 12 11 10 9 8)
-    #(8 9 10 11 12 13 14 15 0 1 2 3 4 5 6 7)
-    #(9 8 11 10 13 12 15 14 1 0 3 2 5 4 7 6)
-    #(10 11 8 9 14 15 12 13 2 3 0 1 6 7 4 5)
-    #(11 10 9 8 15 14 13 12 3 2 1 0 7 6 5 4)
-    #(12 13 14 15 8 9 10 11 4 5 6 7 0 1 2 3)
-    #(13 12 15 14 9 8 11 10 5 4 7 6 1 0 3 2)
-    #(14 15 12 13 10 11 8 9 6 7 4 5 2 3 0 1)
-    #(15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0)))
-
-(define logical:boole-and
- '#(#(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-    #(0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-    #(0 0 2 2 0 0 2 2 0 0 2 2 0 0 2 2)
-    #(0 1 2 3 0 1 2 3 0 1 2 3 0 1 2 3)
-    #(0 0 0 0 4 4 4 4 0 0 0 0 4 4 4 4)
-    #(0 1 0 1 4 5 4 5 0 1 0 1 4 5 4 5)
-    #(0 0 2 2 4 4 6 6 0 0 2 2 4 4 6 6)
-    #(0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7)
-    #(0 0 0 0 0 0 0 0 8 8 8 8 8 8 8 8)
-    #(0 1 0 1 0 1 0 1 8 9 8 9 8 9 8 9)
-    #(0 0 2 2 0 0 2 2 8 8 10 10 8 8 10 10)
-    #(0 1 2 3 0 1 2 3 8 9 10 11 8 9 10 11)
-    #(0 0 0 0 4 4 4 4 8 8 8 8 12 12 12 12)
-    #(0 1 0 1 4 5 4 5 8 9 8 9 12 13 12 13)
-    #(0 0 2 2 4 4 6 6 8 8 10 10 12 12 14 14)
-    #(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)))
-
-(define (logical:ash-4 x)
-  (if (negative? x)
-      (+ -1 (quotient (+ 1 x) 16))
-      (quotient x 16)))
-
-(define (logical:reduce op4 ident)
-  (lambda args
-    (do ((res ident (op4 res (car rgs) 1 0))
-         (rgs args (cdr rgs)))
-        ((null? rgs) res))))
-
-;@
-(define logand
-  (letrec
-      ((lgand
-        (lambda (n2 n1 scl acc)
-          (cond ((= n1 n2) (+ acc (* scl n1)))
-                ((zero? n2) acc)
-                ((zero? n1) acc)
-                (else (lgand (logical:ash-4 n2)
-                             (logical:ash-4 n1)
-                             (* 16 scl)
-                             (+ (* (vector-ref (vector-ref logical:boole-and
-                                                           (modulo n1 16))
-                                               (modulo n2 16))
-                                   scl)
-                                acc)))))))
-    (logical:reduce lgand -1)))
-;@
-(define logior
-  (letrec
-      ((lgior
-        (lambda (n2 n1 scl acc)
-          (cond ((= n1 n2) (+ acc (* scl n1)))
-                ((zero? n2) (+ acc (* scl n1)))
-                ((zero? n1) (+ acc (* scl n2)))
-                (else (lgior (logical:ash-4 n2)
-                             (logical:ash-4 n1)
-                             (* 16 scl)
-                             (+ (* (- 15 (vector-ref
-                                          (vector-ref logical:boole-and
-                                                      (- 15 (modulo n1 16)))
-                                          (- 15 (modulo n2 16))))
-                                   scl)
-                                acc)))))))
-    (logical:reduce lgior 0)))
-;@
-(define logxor
-  (letrec
-      ((lgxor
-        (lambda (n2 n1 scl acc)
-          (cond ((= n1 n2) acc)
-                ((zero? n2) (+ acc (* scl n1)))
-                ((zero? n1) (+ acc (* scl n2)))
-                (else (lgxor (logical:ash-4 n2)
-                             (logical:ash-4 n1)
-                             (* 16 scl)
-                             (+ (* (vector-ref (vector-ref logical:boole-xor
-                                                           (modulo n1 16))
-                                               (modulo n2 16))
-                                   scl)
-                                acc)))))))
-    (logical:reduce lgxor 0)))
-;@
-(define (lognot n) (- -1 n))
-;@
-(define (logtest n1 n2)
-  (not (zero? (logand n1 n2))))
-;@
-(define (logbit? index n)
-  (logtest (expt 2 index) n))
-;@
-(define (copy-bit index to bool)
-  (if bool
-      (logior to (arithmetic-shift 1 index))
-      (logand to (lognot (arithmetic-shift 1 index)))))
-;@
-(define (bitwise-if mask n0 n1)
-  (logior (logand mask n0)
-          (logand (lognot mask) n1)))
-;@
-(define (bit-field n start end)
-  (logand (lognot (ash -1 (- end start)))
-          (arithmetic-shift n (- start))))
-;@
-(define (copy-bit-field to from start end)
-  (bitwise-if (arithmetic-shift (lognot (ash -1 (- end start))) start)
-              (arithmetic-shift from start)
-              to))
-;@
-(define (rotate-bit-field n count start end)
-  (define width (- end start))
-  (set! count (modulo count width))
-  (let ((mask (lognot (ash -1 width))))
-    (define zn (logand mask (arithmetic-shift n (- start))))
-    (logior (arithmetic-shift
-             (logior (logand mask (arithmetic-shift zn count))
-                     (arithmetic-shift zn (- count width)))
-             start)
-            (logand (lognot (ash mask start)) n))))
-;@
-(define (arithmetic-shift n count)
-  (if (negative? count)
-      (let ((k (expt 2 (- count))))
-        (if (negative? n)
-            (+ -1 (quotient (+ 1 n) k))
-            (quotient n k)))
-      (* (expt 2 count) n)))
-;@
-(define integer-length
-  (letrec ((intlen (lambda (n tot)
-                     (case n
-                       ((0 -1) (+ 0 tot))
-                       ((1 -2) (+ 1 tot))
-                       ((2 3 -3 -4) (+ 2 tot))
-                       ((4 5 6 7 -5 -6 -7 -8) (+ 3 tot))
-                       (else (intlen (logical:ash-4 n) (+ 4 tot)))))))
-    (lambda (n) (intlen n 0))))
-;@
-(define logcount
-  (letrec ((logcnt (lambda (n tot)
-                     (if (zero? n)
-                         tot
-                         (logcnt (quotient n 16)
-                                 (+ (vector-ref
-                                     '#(0 1 1 2 1 2 2 3 1 2 2 3 2 3 3 4)
-                                     (modulo n 16))
-                                    tot))))))
-    (lambda (n)
-      (cond ((negative? n) (logcnt (lognot n) 0))
-            ((positive? n) (logcnt n 0))
-            (else 0)))))
-;@
-(define (log2-binary-factors n)
-  (+ -1 (integer-length (logand n (- n)))))
-
-(define (bit-reverse k n)
-  (do ((m (if (negative? n) (lognot n) n) (arithmetic-shift m -1))
-       (k (+ -1 k) (+ -1 k))
-       (rvs 0 (logior (arithmetic-shift rvs 1) (logand 1 m))))
-      ((negative? k) (if (negative? n) (lognot rvs) rvs))))
-;@
-(define (reverse-bit-field n start end)
-  (define width (- end start))
-  (let ((mask (lognot (ash -1 width))))
-    (define zn (logand mask (arithmetic-shift n (- start))))
-    (logior (arithmetic-shift (bit-reverse width zn) start)
-            (logand (lognot (ash mask start)) n))))
-;@
-(define (integer-&gt;list k . len)
-  (if (null? len)
-      (do ((k k (arithmetic-shift k -1))
-           (lst '() (cons (odd? k) lst)))
-          ((&lt;= k 0) lst))
-      (do ((idx (+ -1 (car len)) (+ -1 idx))
-           (k k (arithmetic-shift k -1))
-           (lst '() (cons (odd? k) lst)))
-          ((negative? idx) lst))))
-;@
-(define (list-&gt;integer bools)
-  (do ((bs bools (cdr bs))
-       (acc 0 (+ acc acc (if (car bs) 1 0))))
-      ((null? bs) acc)))
-(define (booleans-&gt;integer . bools)
-  (list-&gt;integer bools))
-
-;;;;@ SRFI-60 aliases
-(define ash arithmetic-shift)
-(define bitwise-ior logior)
-(define bitwise-xor logxor)
-(define bitwise-and logand)
-(define bitwise-not lognot)
-(define bit-count logcount)
-(define bit-set?   logbit?)
-(define any-bits-set? logtest)
-(define first-set-bit log2-binary-factors)
-(define bitwise-merge bitwise-if)
-
-;;; Legacy
-;;(define (logical:rotate k count len) (rotate-bit-field k count 0 len))
-;;(define (logical:ones deg) (lognot (ash -1 deg)))
-;;(define integer-expt expt)            ; legacy name
-</PRE>
-
-
-<H1>Copyright</H1>
-<p>Copyright (C) Aubrey Jaffer (2004, 2005). All Rights Reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-
-    <HR>
-    <ADDRESS>Editor: <A HREF="mailto:srfi-editors@srfi.schemers.org">David Van Horn</A></ADDRESS>
-<!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-<!-- hhmts start -->
-Last modified: Sat Jan 29 13:16:05 EST 2005
-<!-- hhmts end -->
-  </BODY>
-</HTML>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-61.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-61.html
deleted file mode 100644
index db64d63488..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-61.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-  <head>
-    <title>SRFI 61: A more general COND clause</title>
-  </head>
-
-  <body>
-
-
-<H1>Title</H1>
-
-<p>A more general <code>cond</code> clause</p>
-
-
-<H1>Author</H1>
-
-<p>Taylor Campbell</p>
-
-
-<H1>Status</H1>
-<p>This SRFI is currently in ``final'' status.  To see an explanation of
-each status that a SRFI can hold, see <a href="http://srfi.schemers.org/srfi-process.html">here</a>.
-You can access previous messages via
-<a href="http://srfi.schemers.org/srfi-61/mail-archive/maillist.html">the archive of the mailing list</a>.</p>
-<ul>	<li>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-61/srfi-61.txt?rev=1.1">2005/01/04</a></li>
-	<li>Draft: 2005/01/03-2005/03/04</li>
-        <li>Final: 2005/07/21</li>
-</ul>
-
-
-<H1>Abstract</H1>
-
-<p>This SRFI proposes an extension to the <code>cond</code> syntax to allow a more
-general clause, one that allows binding the results of tests as in the
-<code>=&gt;</code> clauses and user-defined meaning of the success &amp; failure of tests.</p>
-
-
-<H1>Rationale</H1>
-
-<p>The present set of <code>cond</code> clauses is based on simple boolean testing.  It
-is prohibitively inexpressive in that the condition part of a <code>cond</code>
-clause that uses <code>=&gt;</code> may pass only a single value to the receiver, and
-it enforces a semantics whereby <code>#f</code> implies failure of the condition.
-Programmers frequently use different tokens to imply failure, such as
-in R5RS's I/O readers which return a distinguished 'EOF object' to
-denote failure, and a successful condition may produce more than one
-useful value.  This simple extension allows any meaning of 'failure' to
-be assigned on a per-clause basis, and it also allows the condition to
-return multiple values to be passed to the receiver.</p>
-
-
-<H1>Specification</H1>
-
-<p>The <code>&lt;cond clause&gt;</code> production in the formal syntax of Scheme as written
-by R5RS in section 7.1.3 is extended with a new option:</p>
-
-<blockquote>
-<pre><code>  &lt;cond clause&gt; ---&gt;
-      ...
-    | (&lt;generator&gt; &lt;guard&gt; =&gt; &lt;receiver&gt;)</code></pre>
-</blockquote>
-
-<p>where <code>&lt;generator&gt;</code>, <code>&lt;guard&gt;</code>, &amp; <code>&lt;receiver&gt;</code> are all <code>&lt;expression&gt;</code>s.</p>
-
-<p>Clauses of this form have the following semantics: <code>&lt;generator&gt;</code> is
-evaluated.  It may return arbitrarily many values.  <code>&lt;Guard&gt;</code> is applied
-to an argument list containing the values in order that <code>&lt;generator&gt;</code>
-returned.  If <code>&lt;guard&gt;</code> returns a true value for that argument list,
-<code>&lt;receiver&gt;</code> is applied with an equivalent argument list.  If <code>&lt;guard&gt;</code>
-returns a false value, however, the clause is abandoned and the next
-one is tried.</p>
-
-
-<H1>Examples</H1>
-
-<p>This <code>port-&gt;char-list</code> procedure accepts an input port and returns a list
-of all the characters it produces until the end.</p>
-
-<blockquote>
-<pre><code>  (define (port-&gt;char-list port)
-    (cond ((read-char port) char?
-           =&gt; (lambda (c) (cons c (port-&gt;char-list port))))
-          (else '())))</code></pre>
-</blockquote>
-
-<p>Consider now a hypothetical <code>table-entry</code> procedure that accepts two
-arguments, a table (perhaps a hash table) and a key to an entry that
-may be in the table; it returns two values: a boolean that denotes
-whether or not an entry with the given key was in the table and, if it
-was, the value associated with the key.  Also, a hypothetical <code>proj0</code>
-combinator (projection of argument 0) returns its 0<sup>th</sup> argument and
-ignores all others.  One might conditionally branch to a certain body
-of code if the table contains the desired entry like so with the new
-type of <code>cond</code> clause:</p>
-
-<blockquote>
-<pre><code>  (cond ...
-        ((table-entry &lt;table&gt; &lt;key&gt;) proj0
-         =&gt; (lambda (present? value)
-              ...[VALUE is bound to the value of the entry]...))
-        ...)</code></pre>
-</blockquote>
-
-
-<H1>Implementation</H1>
-
-<p>The entirety of a syntax transformer for the new <code>cond</code> syntax is given
-here.  It uses an auxiliary macro, <code>cond/maybe-more</code>, to simplify the
-construction of <code>if</code> expressions with or without more <code>cond</code> clauses.  The
-code is in the public domain.</p>
-
-<blockquote>
-<pre><code>(define-syntax cond
-  (syntax-rules (=&gt; ELSE)
-
-    ((COND (ELSE else1 else2 ...))
-     ;; The (IF #T (BEGIN ...)) wrapper ensures that there may be no
-     ;; internal definitions in the body of the clause.  R5RS mandates
-     ;; this in text (by referring to each subform of the clauses as
-     ;; &lt;expression&gt;) but not in its reference implementation of COND,
-     ;; which just expands to (BEGIN ...) with no (IF #T ...) wrapper.
-     (IF #T (BEGIN else1 else2 ...)))
-
-    ((COND (test =&gt; receiver) more-clause ...)
-     (LET ((T test))
-       (COND/MAYBE-MORE T
-                        (receiver T)
-                        more-clause ...)))
-
-    ((COND (generator guard =&gt; receiver) more-clause ...)
-     (CALL-WITH-VALUES (LAMBDA () generator)
-       (LAMBDA T
-         (COND/MAYBE-MORE (APPLY guard    T)
-                          (APPLY receiver T)
-                          more-clause ...))))
-
-    ((COND (test) more-clause ...)
-     (LET ((T test))
-       (COND/MAYBE-MORE T T more-clause ...)))
-
-    ((COND (test body1 body2 ...) more-clause ...)
-     (COND/MAYBE-MORE test
-                      (BEGIN body1 body2 ...)
-                      more-clause ...))))
-
-(define-syntax cond/maybe-more
-  (syntax-rules ()
-    ((COND/MAYBE-MORE test consequent)
-     (IF test
-         consequent))
-    ((COND/MAYBE-MORE test consequent clause ...)
-     (IF test
-         consequent
-         (COND clause ...)))))</code></pre>
-</blockquote>
-
-
-<H1>Copyright</H1>
-
-<p>Copyright (C) 2004 Taylor Campbell.  All rights reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-62.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-62.html
deleted file mode 100644
index 304071e909..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-62.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html><head><title>SRFI 62: S-expression comments</title></head><body>
-
-<h1>Title</h1>
-
-S-expression comments
-
-<h1>Author</h1>
-
-Taylor Campbell
-
-<h1>Status</h1>
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <a href="http://srfi.schemers.org/srfi-process.html">here</a>.
-You can access previous messages via <a href="http://srfi.schemers.org/srfi-62/mail-archive/maillist.html">the archive of the mailing list</a>.
-<p></p><ul>
-
-<li>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-62/srfi-62.txt?rev=1.1">2005/01/04</a>
-</li><li>Draft: 2005/01/03-2005/03/04
-</li><li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-62/srfi-62.txt?rev=1.3">2005/02/27</a>
-</li><li>Final: 2005/07/21</li>
-</ul>
-
-<h1>Abstract</h1>
-
-<p>
-This SRFI proposes a simple extension to Scheme's lexical syntax that
-allows individual S-expressions to be made into comments, ignored by
-the reader.  This contrasts with the standard Lisp semicolon commnets,
-which make the reader ignore the remainder of the line, and the
-slightly less common block comments, as <a href="http://srfi.schemers.org/srfi-30/srfi-30.html">SRFI 30</a>
-defines: both of these mechanisms comment out slices of text, not
-S-expressions.
-</p>
-
-<h1>Rationale</h1>
-
-<p>
-Line and block comments are useful for embedding textual commentary in
-programs, but they are not conducive to commenting out code easily in
-an absence of extensive editor support for removing selected text that
-composes S-expressions while retaining them in the text itself, or
-subsequently removing the comments and re-introducing the S-expressions
-themselves.
-</p>
-
-<h1>Informal specification</h1>
-
-<p>
-A new octothorpe reader syntax character is defined, <tt>#\;</tt>, such
-that the reader ignores the S-expression following the <tt>#;</tt> and
-proceeds on to the S-expression after that.  For example,
-<br>
-</p>
-<table border="0" cellpadding="0" cellspacing="10">
-  <tbody><tr>
-    <td><tt>(+ 1 #;(* 2 3) 4)</tt></td>
-    <td>-reads-&gt; <tt>(+ 1 4)</tt></td>
-    <td>-evals-&gt; <tt>5</tt></td>
-  </tr>
-  <tr>
-    <td><tt>(list 'x #;'y 'z)</tt></td>
-    <td>-reads-&gt; <tt>(list (quote x) (quote z))</tt></td>
-    <td>-evals-&gt; <tt>(x z)</tt></td>
-  </tr>
-  <tr>
-    <td><tt>(* 3 4 #;(+ 1 2))</tt></td>
-    <td>-reads-&gt; <tt>(* 3 4)</tt></td>
-    <td>-evals-&gt; <tt>12</tt></td>
-  </tr>
-  <tr>
-    <td><tt>(#;sqrt abs -16)</tt></td>
-    <td>-reads-&gt; <tt>(abs -16)</tt></td>
-    <td>-evals-&gt; <tt>16</tt></td>
-  </tr>
-</tbody></table>
-
-<p>
-Some examples of nested S-expression comments may appear confusing at
-first, but they are straightforwardly explained.  For instance,
-consider the text <tt>(list 'a #; #;'b 'c 'd)</tt>.  This reads as the
-list represented by <tt>(list (quote a) (quote d))</tt>.  Note that
-both <tt>'b</tt> and <tt>'c</tt> seemed to 'disappear.'  The reason is
-simply that when the first <tt>#;</tt> causes the reader to read ahead
-in the input stream for the next S-expression, the reader encounters
-another <tt>#;</tt>, which causes the <tt>'b</tt> to be consumed, and
-which then moves the reader on to <tt>'c</tt> to return as the first
-S-expression following the first <tt>#;</tt>.  Since it is the first
-S-expression following a <tt>#;</tt>, <tt>'b</tt> is ignored as well,
-leaving only <tt>'d</tt>.
-</p>
-
-<p>
-That is a fairly special case of nested S-expression comments.  Others
-are somewhat simpler for intuition to grasp immediately, such as:
-<br>
-<br>
-<tt>(list 'a #;(list 'b #;c 'd) 'e)</tt> -reads-&gt; <tt>(list (quote a) (quote e))</tt> -evals-&gt; <tt>(a e)</tt>
-<br>
-<br>
-There are also some other somewhat peculiar examples, such as in dotted
-lists and at the end of lists, which are still simple to grasp:
-<br>
-<br>
-<table border="0" cellpadding="0" cellspacing="10">
-  <tbody><tr>
-    <td><tt>'(a . #;b c)</tt></td>
-    <td>-reads-&gt; <tt>(quote (a . c))</tt></td>
-  </tr>
-  <tr>
-    <td><tt>'(a . b #;c)</tt></td>
-    <td>-reads-&gt; <tt>(quote (a . b))</tt></td>
-  </tr>
-</tbody></table>
-</p>
-
-<p>
-Note, however, that any text that is invalid without S-expression
-comments will be invalid with them as well, and an S-expression comment
-prefix, <tt>#;</tt>, must be followed by a complete S-expression (and
-after that either a complete S-expression or a special token such as a
-closing parenthesis, a dot in dotted lists, or the end of file); for
-instance, the following are all errors:
-<br>
-<br>
-</p><ul>
-  <li><tt>(#;a . b)</tt></li>
-  <li><tt>(a . #;b)</tt></li>
-  <li><tt>(a #;. b)</tt></li>
-  <li><tt>(#;x #;y . z)</tt></li>
-  <li><tt>(#; #;x #;y . z)</tt></li>
-  <li><tt>(#; #;x . z)</tt></li>
-</ul>
-<p></p>
-
-<h1>Formal specification</h1>
-
-<p>
-R5RS's formal syntax is modified as follows:
-</p><ul>
-  <li>In section 7.1.1, a <tt>#;</tt> option is added to the
-      <tt>&lt;token&gt;</tt> non-terminal.</li>
-  <li>In section 7.1.2, a non-terminal <tt>&lt;commented datum&gt;</tt>
-      is defined:
-<pre>  &lt;commented datum&gt; ---&gt; "#;" &lt;datum&gt; &lt;datum&gt;
-</pre></li>
-  <li>Also in section 7.1.2, the <tt>&lt;datum&gt;</tt> non-terminal is
-      modified to have a <tt>&lt;commented datum&gt;</tt> option.</li>
-  <li>Finally in section 7.1.2, the <tt>&lt;list&gt;</tt> and
-      <tt>&lt;vector&gt;</tt> non-terminals are replaced with the
-      following rules, along with two auxiliary ones:
-<pre>  &lt;list&gt; ---&gt; "(" &lt;datum&gt;* &lt;optional dot&gt; &lt;delimiter prefix&gt; ")"
-  &lt;vector&gt; ---&gt; "#(" &lt;datum&gt;* &lt;delimiter prefix&gt; ")"
-  &lt;optional dot&gt; ---&gt; &lt;empty&gt; | &lt;datum&gt; &lt;delimiter prefix&gt; "." &lt;datum&gt;
-  &lt;delimiter prefix&gt; ---&gt; &lt;empty&gt; | "#;" &lt;datum&gt; &lt;delimiter prefix&gt;
-</pre></li>
-</ul>
-The first datum in a <tt>&lt;commented datum&gt;</tt> is ignored
-semantically, as is any datum immediately following a <tt>#;</tt> token
-in a delimiter prefix.
-<br><br>
-All of the new or modified rules are presented here:
-<pre>  7.1.1:
-
-    &lt;token&gt; ---&gt; &lt;identifier&gt; | &lt;boolean&gt; | &lt;number&gt;
-        | &lt;character&gt; | &lt;string&gt;
-        | "(" | ")" | "#(" | "'" | "`" | "," | ",@" | "." | "#;"
-
-  7.1.2:
-
-    &lt;datum&gt; ---&gt; &lt;simple datum&gt; | &lt;compound datum&gt;
-        | &lt;commented datum&gt;
-    &lt;commented datum&gt; ---&gt; "#;" &lt;datum&gt; &lt;datum&gt;
-    &lt;list&gt; ---&gt; "(" &lt;datum&gt;* &lt;optional dot&gt; &lt;delimiter prefix&gt; ")"
-    &lt;vector&gt; ---&gt; "#(" &lt;datum&gt;* &lt;delimiter prefix&gt; ")"
-    &lt;optional dot&gt; ---&gt; &lt;empty&gt; | &lt;datum&gt; &lt;delimiter prefix&gt; "." &lt;datum&gt;
-    &lt;delimiter prefix&gt; ---&gt; &lt;empty&gt; | "#;" &lt;datum&gt; &lt;delimiter prefix&gt;
-</pre>
-<p></p>
-
-<h1>Copyright</h1>
-
-<p>Copyright (C) 2004 Taylor Campbell.  All rights reserved.</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi%20minus%20editors%20at%20srfi%20dot%20schemers%20dot%20org">Mike Sperber</a></address>
-  
-</body></html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-63.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-63.html
deleted file mode 100644
index d846e0f71b..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-63.html
+++ /dev/null
@@ -1,1516 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-  <HEAD>
-    <title>SRFI 63: Homogeneous and Heterogeneous Arrays</title>
-  </HEAD>
-
-  <BODY>
-
-<H1>Title</H1>
-
-Homogeneous and Heterogeneous Arrays
-
-<H1>Author</H1>
-
-Aubrey Jaffer
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see <A
-HREF="http://srfi.schemers.org/srfi-process.html">here</A>.  You can
-access previous messages via <A
-HREF="http://srfi.schemers.org/srfi-63/mail-archive/maillist.html">the
-archive of the mailing list</A>.
-<P>
-</P><UL>
-  <LI>Received: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-63/srfi-63.html?rev=1.3">2005/01/17</A></LI>
-  <LI>Draft: 2005/01/17 - 2005/03/18</LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-63/srfi-63.html?rev=1.4">2005/01/27</A></LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-63/srfi-63.html?rev=1.5">2005/01/29</A></LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-63/srfi-63.html?rev=1.6">2005/04/08</A></LI>
-  <LI>Revised: <A HREF="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-63/srfi-63.html?rev=1.7">2005/04/27</A></LI>
-  <LI>Final: 2005/04/27</LI>
-</UL>
-
-<H1>Abstract</H1>
-
-The SRFI, which is to supersede
-<A HREF="http://srfi.schemers.org/srfi-47/srfi-47.html">SRFI-47</A>,
-"Array",
-
-<UL>
-
-<LI>synthesizes array concepts from Common-Lisp and Alan Bawden's
-    "array.scm";
-
-</LI><LI>incorporates all the uniform vector types from
-    <A HREF="http://srfi.schemers.org/srfi-4/srfi-4.html">SFRI-4</A>
-    "Homogeneous numeric vector datatypes";
-
-</LI><LI>adds a boolean uniform array type;
-
-</LI><LI>adds 16.bit and 128.bit floating-point uniform-array types;
-
-</LI><LI>adds decimal floating-point uniform-array types; and
-
-</LI><LI>adds array types of (dual) floating-point complex numbers.
-
-</LI></UL>
-
-Multi-dimensional arrays subsume homogeneous vectors as the
-one-dimensional case, obviating the need for SRFI-4.
-<P>
-SRFI-58 gives a read/write invariant syntax for the homogeneous and
-heterogeneous arrays described here.
-</P><P>
-
-</P><H1>Issues</H1>
-
-<UL>
-<!-- <LI> -->
-<!-- Character arrays can be supported based on strings; but they do not -->
-<!-- necessarily have access times comparable to other types of arrays. -->
-<!-- <P> -->
-<LI>
-The <A HREF="#Conversions">conversion rules</A> for exact decimal
-flonums have yet to be determined.  Wisdom in this area would come
-from experience.  Lacking that, it is better to underspecify the
-behavior of decimal flonums than to make it wrong.
-<P>
-<!-- <LI> -->
-<!-- <CODE>array-&gt;vector</CODE> and <CODE>vector-&gt;array</CODE> are -->
-<!-- not inverses for rank-0 arrays. -->
-<!-- <P> -->
-</P></LI></UL>
-
-<H1>Rationale</H1>
-
-<H2>Arrays</H2>
-
-Computations have been organized into multidimensional arrays for over
-200 years.  Applications for multi-dimensional arrays continue to
-arise.  Computer graphics and imaging, whether vector or raster based,
-use arrays.  A general-purpose computer language without
-multidimensional arrays is an oxymoron.
-
-<H2>Precision</H2>
-
-R5RS provides an input syntax for inexact numbers which is capable of
-distinguishing between <VAR>short</VAR>, <VAR>single</VAR>,
-<VAR>double</VAR>, and <VAR>long</VAR> precisions.  But R5RS provides
-no method for limiting the precision of calculations:
-
-<BLOCKQUOTE>
-In particular, implementations that use flonum representations must
-follow these rules: A flonum result must be represented with at least
-as much precision as is used to express any of the inexact arguments
-to that operation.
-
-</BLOCKQUOTE>
-
-And calculation with any exact number inputs blows the precision out
-to "the most precise flonum format available":
-
-<BLOCKQUOTE>
-If, however, an exact number is operated upon so as to produce an
-inexact result (as by <SAMP>`sqrt'</SAMP>), and if the result is
-represented as a flonum, then the most precise flonum format available
-must be used; but if the result is represented in some other way then
-the representation must have at least as much precision as the most
-precise flonum format available.
-
-</BLOCKQUOTE>
-
-Scheme is not much hampered by lack of low-precision inexact numbers
-for scalar calculations.  The extra computation incurred by gratuitous
-precision is usually small compared with the overhead of type-dispatch
-and boxed data manipulation.
-<P>
-</P><H2>Homogeneous Arrays</H2>
-
-But if calculations are vectorized, that overhead can become
-significant.  Sophisticated program analysis may be able to deduce
-that aggregated number storage can be made uniformly of the most
-precise flonum format available.  But even the most aggressive
-analysis of uncontrived programs will not be able to reduce the
-precision while yielding results equivalent to the most precise
-calculation, as R5RS requires.
-<P>
-<!-- Globally reduced precision is a poor solution.  The intermediate -->
-<!-- results should be calculated with precision as high or higher than the -->
-<!-- inputs, even if the results will be stored with lower precision. -->
-<!-- <P> -->
-Also significant is that the numerical data in most Scheme
-implementations has manifest type information encoded with it.
-Varying sizes of number objects means that the vectors hold pointers
-to some numbers, requiring data fetches from memory locations unlikely
-to be in the same CPU cache-line.
-</P><P>
-Arrays composed of elements all having the same size representations
-can eliminate these indirect accesses and the storage allocation
-associated with them.  Homogeneous arrays of lower precision flonums
-can reduce by factors of 2 or 4 the storage they occupy; which can
-also speed execution because of the lower bandwidth to the memory
-necessary to supply the CPU data cache.
-</P><P>
-</P><H2>Common Lisp</H2>
-
-Common-Lisp arrays are serviceable, and are the basis for arrays here.
-Common-Lisp's <CODE>make-array</CODE> does not translate well to
-Scheme because the array element type and the initial contents are
-passed using named arguments.
-<P>
-Prototype arrays specify both the homogeneous array type (or lack of)
-and the initial value or lack of it; allowing these purposes to be
-satisfied by one argument to <CODE>make-array</CODE> or other
-procedures which create arrays.
-</P><P>
-Some have objected that restricting type specification to arrays is a
-half-measure.  In vectorized programs, specifying the precision of
-scalar calculations will produce negligible performance improvements.
-But the performance improvements of homogeneous arrays can accrue to
-both interpreted and compiled Scheme implementations.  By avoiding the
-morass of general type specification, SRFI-63 can be more easily
-accommodated by more Scheme implementations.
-</P><P>
-</P><H2>Argument Order</H2>
-
-<UL>
-<LI>
-Most of the procedures originate from Alan Bawden's "array.scm".
-SRFI-47's <CODE>array-set!</CODE> argument order is that of Bawden's
-package.  <a href="http://swissnet.ai.mit.edu/%7Ejaffer/SLIB">SLIB</A>
-adopted "array.scm" in 1993.  This form of <CODE>array-set!</CODE> has
-also been part of the
-<a href="http://swissnet.ai.mit.edu/%7Ejaffer/SCM">SCM</A> Scheme
-implementation since 1993.<P>
-
-</P></LI><LI>
-The <CODE>array-set!</CODE> argument order is different from the
-same-named procedure in
-<A HREF="http://srfi.schemers.org/srfi-25/srfi-25.html">SRFI-25</A>.
-Type dispatch on the first argument to <CODE>array-set!</CODE> could
-support both SRFIs simultaneously.<P>
-
-</P></LI><LI>
-The <CODE>make-array</CODE> arguments are different from the
-same-named procedure in
-<A HREF="http://srfi.schemers.org/srfi-25/srfi-25.html">SRFI-25</A>.
-Type dispatch on the first argument to <CODE>make-array</CODE> could
-support both SRFIs simultaneously.<P>
-
-</P></LI><LI>
-The SRFI-47 argument orders are motivated to make easy dealing with
-the variable arity resulting from variable rank.
-
-<PRE>       (vector-&gt;array  vect  proto  bound1 ...)
-          (make-array        proto  bound1 ...)
-   (make-shared-array  array mapper bound1 ...)
-          (array-set!  array obj    index1 ...)
-    (array-in-bounds?  array        index1 ...)
-           (array-ref  array        index1 ...)
-</PRE>
-<P>
-The list-&gt;array is somewhat dissonant:
-</P><PRE>         (list-&gt;array  rank  proto  list)
-</PRE>
-<P>
-</P></LI></UL>
-<P>
-
-</P><H2>Homogeneous Array Types</H2>
-
-All implementations must support Scheme strings as rank 1 character
-arrays.  This requirement mandates that Scheme strings be valid
-arguments to array procedures; their stored representations may be
-different from other character arrays.
-<P>
-
-Although an implementation is required to define all the prototype
-functions, it is not required to support all or even any of the
-homogeneous numeric arrays.  It is assumed that no uniform numeric
-types have larger precision than the Scheme implementation supports as
-numbers.
-</P><P>
-<A name="Table-1"></A>
-<TABLE border="1">
-<TBODY><TR><th>prototype<br>procedure
-    </th><th>exactness
-    </th><th>element type
-</th></TR><TR><TD><CODE>vector    </CODE></TD><TD>        </TD><TD>any
-</TD></TR><TR><TD><CODE>A:floC128b</CODE></TD><TD>inexact</TD><TD>128.bit binary flonum complex
-</TD></TR><TR><TD><CODE>A:floC64b </CODE></TD><TD>inexact</TD><TD>64.bit binary flonum complex
-</TD></TR><TR><TD><CODE>A:floC32b </CODE></TD><TD>inexact</TD><TD>32.bit binary flonum complex
-</TD></TR><TR><TD><CODE>A:floC16b </CODE></TD><TD>inexact</TD><TD>16.bit binary flonum complex
-</TD></TR><TR><TD><CODE>A:floR128b</CODE></TD><TD>inexact</TD><TD>128.bit binary flonum real
-</TD></TR><TR><TD><CODE>A:floR64b </CODE></TD><TD>inexact</TD><TD>64.bit binary flonum real
-</TD></TR><TR><TD><CODE>A:floR32b </CODE></TD><TD>inexact</TD><TD>32.bit binary flonum real
-</TD></TR><TR><TD><CODE>A:floR16b </CODE></TD><TD>inexact</TD><TD>16.bit binary flonum real
-</TD></TR><TR><td colspan="3">
-</TD></TR><TR><TD><CODE>A:floQ128d</CODE></TD><TD>exact</TD><TD>128.bit decimal flonum rational
-</TD></TR><TR><TD><CODE>A:floQ64d </CODE></TD><TD>exact</TD><TD>64.bit decimal flonum rational
-</TD></TR><TR><TD><CODE>A:floQ32d </CODE></TD><TD>exact</TD><TD>32.bit decimal flonum rational
-</TD></TR><TR><td colspan="3">
-</TD></TR><TR><TD><CODE>A:fixZ64b </CODE></TD><TD>exact</TD><TD>64.bit binary fixnum
-</TD></TR><TR><TD><CODE>A:fixZ32b </CODE></TD><TD>exact</TD><TD>32.bit binary fixnum
-</TD></TR><TR><TD><CODE>A:fixZ16b </CODE></TD><TD>exact</TD><TD>16.bit binary fixnum
-</TD></TR><TR><TD><CODE>A:fixZ8b  </CODE></TD><TD>exact</TD><TD>8.bit  binary fixnum
-</TD></TR><TR><TD><CODE>A:fixN64b </CODE></TD><TD>exact</TD><TD>64.bit nonnegative binary fixnum
-</TD></TR><TR><TD><CODE>A:fixN32b </CODE></TD><TD>exact</TD><TD>32.bit nonnegative binary fixnum
-</TD></TR><TR><TD><CODE>A:fixN16b </CODE></TD><TD>exact</TD><TD>16.bit nonnegative binary fixnum
-</TD></TR><TR><TD><CODE>A:fixN8b  </CODE></TD><TD>exact</TD><TD>8.bit  nonnegative binary fixnum
-</TD></TR><TR><TD><CODE>A:bool    </CODE></TD><TD>     </TD><TD>boolean
-</TD></TR><TR><TD><CODE>string    </CODE></TD><TD>     </TD><TD>char
-</TD></TR></TBODY></TABLE>
-</P><P>
-Decimal flonums are used for financial calculations so that fractional
-errors do not accumulate.  They should be exact numbers.
-</P><P>
-<A NAME="Conversions"></A>
-</P><H2>Conversions</H2>
-
-<UL>
-<LI> All the elements of arrays of type A:fixN8b, A:fixN16b,
-     A:fixN32b, A:fixN64b, A:fixZ8b, A:fixZ16b, A:fixZ32b, or
-     A:fixZ64b are exact.<P>
-
-</P></LI><LI> All the elements of arrays of type A:floR16b, A:floR32b,
-     A:floR64b, A:floR128b, A:floC16b, A:floC32b, A:floC64b, and
-     A:floC128b are inexact.<P>
-
-</P></LI><LI> The value retrieved from an exact array element will equal (=)
-     the value stored in that element.<P>
-
-</P></LI><LI> Assigning a non-integer to array-type A:fixN8b, A:fixN16b,
-     A:fixN32b, A:fixN64b, A:fixZ8b, A:fixZ16b, A:fixZ32b, or
-     A:fixZ64b is an error.<P>
-
-</P></LI><LI> Assigning a number larger than can be represented in array-type
-     A:fixN8b, A:fixN16b, A:fixN32b, A:fixN64b, A:fixZ8b, A:fixZ16b,
-     A:fixZ32b, or A:fixZ64b is an error.<P>
-
-</P></LI><LI> Assigning a negative number to array-type A:fixN8b, A:fixN16b,
-     A:fixN32b, or A:fixN64b is an error.<P>
-
-</P></LI><LI> Assigning an inexact number to array-type A:fixN8b, A:fixN16b,
-     A:fixN32b, A:fixN64b, A:fixZ8b, A:fixZ16b, A:fixZ32b, or
-     A:fixZ64b is an error.<P>
-
-</P></LI><LI> When assigning an exact number to an inexact array-type, the
-     procedure may report a violation of an implementation
-     restriction.<P>
-
-</P></LI><LI> Assigning a non-real number (eg. <CODE>real?</CODE> returns
-     <CODE>#f</CODE>) to an A:floR128b, A:floR64b, A:floR32b, or
-     A:floR16b array is an error.<P>
-
-</P></LI><LI> When an inexact number is assigned to an array whose type is
-     lower precision, the number will be rounded to that lower
-     precision if possible; otherwise it is an error.<P>
-
-</P></LI></UL>
-
-<A NAME="Prototype Procedures"></A>
-<H2>Prototype Procedures</H2>
-
-Implementations are required to define all of the prototype
-procedures.  Uniform types of matching format and sizes which the
-platform supports will be used; the others will be represented as
-follows:
-<P>
-For inexact flonum complex arrays:
-</P><UL>
-  <LI>the next larger complex format is used;
-  </LI><LI>if there is no larger format,
-  <UL>
-    <LI>then if the implementation supports complex floating-point numbers of
-        unbounded precision,
-    <UL>
-      <LI>then a heterogeneous array;
-      </LI><LI>else the largest inexact flonum complex array.
-    </LI></UL>
-  </LI></UL>
-</LI></UL>
-
-For inexact flonum real arrays:
-<UL>
-  <LI>the next larger real format is used;
-  </LI><LI>if there is no larger real format, then the next larger complex format
-      is used.
-  </LI><LI>If there is no larger complex format,
-    <UL>
-    <LI>then if the implementation supports floating-point real numbers of
-        unbounded precision,
-    <UL>
-      <LI>then a heterogeneous array;
-      </LI><LI>else the largest inexact flonum real or complex array.
-    </LI></UL>
-  </LI></UL>
-</LI></UL>
-
-For exact decimal flonum arrays:
-<UL>
-  <LI>the next larger decimal flonum format array is used;
-  </LI><LI>If there is no larger decimal flonum format, then a
-      heterogeneous array is used.
-</LI></UL>
-
-For exact bipolar fixnum arrays:
-<UL>
-  <LI>the next larger bipolar fixnum format array is used;
-  </LI><LI>If there is no larger bipolar fixnum format,
-  <UL>
-    <LI>then if the implementation supports exact integers of unbounded
-        precision,
-      <UL>
-        <LI>then a heterogeneous array;
-        </LI><LI>else the largest bipolar fixnum array.
-     </LI></UL>
-  </LI></UL>
-</LI></UL>
-
-For exact nonnegative fixnum arrays:
-<UL>
-  <LI>the next larger nonnegative fixnum format array is used;
-  </LI><LI>If there is no larger nonnegative fixnum format,
-  <UL>
-    <LI>then the next larger bipolar fixnum format is used.
-    </LI><LI>If there is no larger bipolar fixnum format,
-    <UL>
-      <LI>then if the implementation supports exact integers of
-          unbounded precision,
-      <UL>
-        <LI>then a heterogeneous array;
-        </LI><LI>else the largest nonnegative or bipolar fixnum array.
-      </LI></UL>
-    </LI></UL>
-  </LI></UL>
-</LI></UL>
-
-<P>
-Note that these rules are used to configure an implementation's
-definitions of the prototype procedures, which should not themselves
-be type-dispatching.
-</P><P>
-This arrangement has platforms which support uniform array types
-employing them, with less capable platforms using vectors; but all
-working compatibly from the same source code.
-</P><P>
-
-</P><H2>Shared Arrays</H2>
-
-To my knowledge, the specification of shared array index mapping by
-means of a procedure is original to Alan Bawden in his "array.scm".
-<CODE>Make-shared-array</CODE> creates any view into an array whose
-coordinates can be mapped by exact integer affine functions.  The rank
-of the arrays need not match.  Shared arrays are quite useful.  They
-can reverse indexes, make subarrays, and facilitate straightforward
-implementations of divide-and-conquer algorithms.
-<P>
-In Common-Lisp a <DFN>displaced array</DFN> can be created by calls to
-<A HREF="http://www-2.cs.cmu.edu/Groups/AI/html/hyperspec/HyperSpec/Body/fun_adjust-array.html">adjust-array</A>.
-
-But displaced arrays are far less flexible than <DFN>shared
-arrays</DFN>, constrained to have the same rank as the original and
-allowing only index displacements (not reversals, skips, or
-shuffling).
-</P><P>
-
-</P><H2>Limit Cases</H2>
-
-The bounds for each index in both Alan Bawden's "array.scm" and
-<A HREF="http://srfi.schemers.org/srfi-25/srfi-25.html">SRFI-25</A>
-
-can be any consecutive run of integers.  All indexes in SRFI-63 are
-zero-based for compatibility with R5RS.
-<P>
-Empty arrays having no elements can be of any positive rank.  Empty
-arrays can be returned from <CODE>make-shared-array</CODE>.
-</P><P>
-Following <A HREF="http://www-2.cs.cmu.edu/Groups/AI/html/hyperspec/HyperSpec/Body/sec_15-1-1-3.html">Common-Lisp</A>'s
-lead, zero-rank arrays have a single element.
-</P><P>
-Except for character arrays, array access time is
-O(<I>R</I>)+<I>V</I>, where <I>R</I> is the rank of the array and
-<I>V</I> is the vector access time.
-</P><P>
-Character array access time is
-O(<I>R</I>)+<I>S</I>, where <I>R</I> is the rank of the array and
-<I>S</I> is the string access time.
-</P><P>
-
-</P><H1>Specification</H1>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>array?</B> <I>obj</I>
-</DT><DD><A name="IDX1108"></A>
-
-
-<P>
-Returns <CODE>#t</CODE> if the <VAR>obj</VAR> is an array, and <CODE>#f</CODE> if not.
-</P></DD></DL>
-
-
-<P>
-<EM>Note:</EM> Arrays are not disjoint from other Scheme types.
-Vectors and possibly strings also satisfy <CODE>array?</CODE>.
-A disjoint array predicate can be written:
-
-
-
-</P><PRE>(define (strict-array? obj)
-  (and (array? obj) (not (string? obj)) (not (vector? obj))))
-</PRE>
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>equal?</B> <I>obj1 obj2</I>
-</DT><DD><A name="IDX1109"></A>
-
-
-<P>
-Returns <CODE>#t</CODE> if <VAR>obj1</VAR> and <VAR>obj2</VAR> have the same rank and dimensions and the
-corresponding elements of <VAR>obj1</VAR> and <VAR>obj2</VAR> are <CODE>equal?</CODE>.
-
-
-</P><P>
-<CODE>equal?</CODE> recursively compares the contents of pairs, vectors, strings, and
-<EM>arrays</EM>, applying <CODE>eqv?</CODE> on other objects such as numbers
-and symbols.  A rule of thumb is that objects are generally <CODE>equal?</CODE> if
-they print the same.  <CODE>equal?</CODE> may fail to terminate if its arguments are
-circular data structures.
-
-
-
-</P><PRE>(equal? 'a 'a)                             =&gt;  #t
-(equal? '(a) '(a))                         =&gt;  #t
-(equal? '(a (b) c)
-        '(a (b) c))                        =&gt;  #t
-(equal? "abc" "abc")                       =&gt;  #t
-(equal? 2 2)                               =&gt;  #t
-(equal? (make-vector 5 'a)
-        (make-vector 5 'a))                =&gt;  #t
-(equal? (make-array (A:fixN32b 4) 5 3)
-        (make-array (A:fixN32b 4) 5 3))    =&gt;  #t
-(equal? (make-array '#(foo) 3 3)
-        (make-array '#(foo) 3 3))          =&gt;  #t
-(equal? (lambda (x) x)
-        (lambda (y) y))                    =&gt;  <em>unspecified</em>
-</PRE>
-
-</DD></DL>
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>array-rank</B> <I>obj</I>
-</DT><DD><A name="IDX1110"></A>
-
-
-<P>
-Returns the number of dimensions of <VAR>obj</VAR>.  If <VAR>obj</VAR> is not an array, 0 is
-returned.
-</P></DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>array-dimensions</B> <I>array</I>
-</DT><DD><A name="IDX1111"></A>
-
-
-<P>
-Returns a list of dimensions.
-
-
-
-</P><PRE>(array-dimensions (make-array '#() 3 5))
-   =&gt; (3 5)
-</PRE>
-
-</DD></DL>
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>make-array</B> <I>prototype k1 ...</I>
-</DT><DD><A name="IDX1112"></A>
-
-
-<P>
-Creates and returns an array of type <VAR>prototype</VAR> with dimensions <VAR>k1</VAR>, ...
-and filled with elements from <VAR>prototype</VAR>.  <VAR>prototype</VAR> must be an array, vector, or
-string.  The implementation-dependent type of the returned array
-will be the same as the type of <VAR>prototype</VAR>; except if that would be a vector
-or string with rank not equal to one, in which case some variety of
-array will be returned.
-
-
-</P><P>
-If the <VAR>prototype</VAR> has no elements, then the initial contents of the returned
-array are unspecified.  Otherwise, the returned array will be filled
-with the element at the origin of <VAR>prototype</VAR>.
-</P></DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>make-shared-array</B> <I>array mapper k1 ...</I>
-</DT><DD><A name="IDX1114"></A>
-
-
-<P>
-<CODE>make-shared-array</CODE> can be used to create shared subarrays of other
-arrays.  The <VAR>mapper</VAR> is a function that translates coordinates in
-the new array into coordinates in the old array.  A <VAR>mapper</VAR> must be
-linear, and its range must stay within the bounds of the old array, but
-it can be otherwise arbitrary.  A simple example:
-
-
-
-</P><PRE>(define fred (make-array '#(#f) 8 8))
-(define freds-diagonal
-  (make-shared-array fred (lambda (i) (list i i)) 8))
-(array-set! freds-diagonal 'foo 3)
-(array-ref fred 3 3)
-   =&gt; FOO
-(define freds-center
-  (make-shared-array fred (lambda (i j) (list (+ 3 i) (+ 3 j)))
-                     2 2))
-(array-ref freds-center 0 0)
-   =&gt; FOO
-</PRE>
-
-</DD></DL>
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>list-&gt;array</B> <I>rank proto list</I>
-</DT><DD><A name="IDX1115"></A>
-
-
-<P>
-<VAR>list</VAR> must be a rank-nested list consisting of all the elements, in
-row-major order, of the array to be created.
-
-
-</P><P>
-<CODE>list-&gt;array</CODE> returns an array of rank <VAR>rank</VAR> and type <VAR>proto</VAR> consisting of all the
-elements, in row-major order, of <VAR>list</VAR>.  When <VAR>rank</VAR> is 0, <VAR>list</VAR> is the lone
-array element; not necessarily a list.
-
-
-
-</P><PRE>(list-&gt;array 2 '#() '((1 2) (3 4)))
-                =&gt; #2A((1 2) (3 4))
-(list-&gt;array 0 '#() 3)
-                =&gt; #0A 3
-</PRE>
-
-</DD></DL>
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>array-&gt;list</B> <I>array</I>
-</DT><DD><A name="IDX1116"></A>
-
-
-<P>
-Returns a rank-nested list consisting of all the elements, in
-row-major order, of <VAR>array</VAR>.  In the case of a rank-0 array, <CODE>array-&gt;list</CODE> returns
-the single element.
-
-
-
-</P><PRE>(array-&gt;list #2A((ho ho ho) (ho oh oh)))
-                =&gt; ((ho ho ho) (ho oh oh))
-(array-&gt;list #0A ho)
-                =&gt; ho
-</PRE>
-
-</DD></DL>
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>vector-&gt;array</B> <I>vect proto dim1 ...</I>
-</DT><DD><A name="IDX1117"></A>
-
-
-<P>
-<VAR>vect</VAR> must be a vector of length equal to the product of exact
-nonnegative integers <VAR>dim1</VAR>, ....
-
-
-</P><P>
-<CODE>vector-&gt;array</CODE> returns an array of type <VAR>proto</VAR> consisting of all the elements, in
-row-major order, of <VAR>vect</VAR>.  In the case of a rank-0 array, <VAR>vect</VAR> has a
-single element.
-
-
-
-</P><PRE>(vector-&gt;array #(1 2 3 4) #() 2 2)
-                =&gt; #2A((1 2) (3 4))
-(vector-&gt;array '#(3) '#())
-                =&gt; #0A 3
-</PRE>
-
-</DD></DL>
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>array-&gt;vector</B> <I>array</I>
-</DT><DD><A name="IDX1118"></A>
-
-
-<P>
-Returns a new vector consisting of all the elements of <VAR>array</VAR> in
-row-major order.
-
-
-
-</P><PRE>(array-&gt;vector #2A ((1 2)( 3 4)))
-                =&gt; #(1 2 3 4)
-(array-&gt;vector #0A ho)
-                =&gt; #(ho)
-</PRE>
-
-</DD></DL>
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>array-in-bounds?</B> <I>array index1 ...</I>
-</DT><DD><A name="IDX1119"></A>
-
-
-<P>
-Returns <CODE>#t</CODE> if its arguments would be acceptable to
-<CODE>array-ref</CODE>.
-</P></DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>array-ref</B> <I>array k1 ...</I>
-</DT><DD><A name="IDX1120"></A>
-
-
-<P>
-Returns the (<VAR>k1</VAR>, ...) element of <VAR>array</VAR>.
-</P></DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Procedure:</U> <B>array-set!</B> <I>array obj k1 ...</I>
-</DT><DD><A name="IDX1121"></A>
-
-
-<P>
-Stores <VAR>obj</VAR> in the (<VAR>k1</VAR>, ...) element of <VAR>array</VAR>.  The value returned
-by <CODE>array-set!</CODE> is unspecified.
-</P></DD></DL>
-
-
-<P>
-These functions return a prototypical uniform-array enclosing the
-optional argument (which must be of the correct type).  If the
-uniform-array type is supported by the implementation, then it is
-returned; defaulting to the next larger precision type; resorting
-finally to vector.
-
-
-</P><P>
-</P><DL>
-<DT><U>Function:</U> <B>a:floc128b</B> <I>z</I>
-</DT><DD><A name="IDX1122"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:floc128b</b>
-</DT><DD><A name="IDX1123"></A>
-Returns an inexact 128.bit flonum complex uniform-array prototype.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:floc64b</B> <I>z</I>
-</DT><DD><A name="IDX1124"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:floc64b</b>
-</DT><DD><A name="IDX1125"></A>
-Returns an inexact 64.bit flonum complex uniform-array prototype.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:floc32b</B> <I>z</I>
-</DT><DD><A name="IDX1126"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:floc32b</b>
-</DT><DD><A name="IDX1127"></A>
-Returns an inexact 32.bit flonum complex uniform-array prototype.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:floc16b</B> <I>z</I>
-</DT><DD><A name="IDX1128"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:floc16b</b>
-</DT><DD><A name="IDX1129"></A>
-Returns an inexact 16.bit flonum complex uniform-array prototype.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:flor128b</B> <I>z</I>
-</DT><DD><A name="IDX1130"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:flor128b</b>
-</DT><DD><A name="IDX1131"></A>
-Returns an inexact 128.bit flonum real uniform-array prototype.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:flor64b</B> <I>z</I>
-</DT><DD><A name="IDX1132"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:flor64b</b>
-</DT><DD><A name="IDX1133"></A>
-Returns an inexact 64.bit flonum real uniform-array prototype.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:flor32b</B> <I>z</I>
-</DT><DD><A name="IDX1134"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:flor32b</b>
-</DT><DD><A name="IDX1135"></A>
-Returns an inexact 32.bit flonum real uniform-array prototype.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:flor16b</B> <I>z</I>
-</DT><DD><A name="IDX1136"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:flor16b</b>
-</DT><DD><A name="IDX1137"></A>
-Returns an inexact 16.bit flonum real uniform-array prototype.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:flor128b</B> <I>z</I>
-</DT><DD><A name="IDX1138"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:flor128b</b>
-</DT><DD><A name="IDX1139"></A>
-Returns an exact 128.bit decimal flonum rational uniform-array prototype.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:flor64b</B> <I>z</I>
-</DT><DD><A name="IDX1140"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:flor64b</b>
-</DT><DD><A name="IDX1141"></A>
-Returns an exact 64.bit decimal flonum rational uniform-array prototype.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:flor32b</B> <I>z</I>
-</DT><DD><A name="IDX1142"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:flor32b</b>
-</DT><DD><A name="IDX1143"></A>
-Returns an exact 32.bit decimal flonum rational uniform-array prototype.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:fixz64b</B> <I>n</I>
-</DT><DD><A name="IDX1144"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:fixz64b</b>
-</DT><DD><A name="IDX1145"></A>
-Returns an exact binary fixnum uniform-array prototype with at least
-64 bits of precision.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:fixz32b</B> <I>n</I>
-</DT><DD><A name="IDX1146"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:fixz32b</b>
-</DT><DD><A name="IDX1147"></A>
-Returns an exact binary fixnum uniform-array prototype with at least
-32 bits of precision.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:fixz16b</B> <I>n</I>
-</DT><DD><A name="IDX1148"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:fixz16b</b>
-</DT><DD><A name="IDX1149"></A>
-Returns an exact binary fixnum uniform-array prototype with at least
-16 bits of precision.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:fixz8b</B> <I>n</I>
-</DT><DD><A name="IDX1150"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:fixz8b</b>
-</DT><DD><A name="IDX1151"></A>
-Returns an exact binary fixnum uniform-array prototype with at least
-8 bits of precision.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:fixn64b</B> <I>k</I>
-</DT><DD><A name="IDX1152"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:fixn64b</b>
-</DT><DD><A name="IDX1153"></A>
-Returns an exact non-negative binary fixnum uniform-array prototype with at
-least 64 bits of precision.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:fixn32b</B> <I>k</I>
-</DT><DD><A name="IDX1154"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:fixn32b</b>
-</DT><DD><A name="IDX1155"></A>
-Returns an exact non-negative binary fixnum uniform-array prototype with at
-least 32 bits of precision.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:fixn16b</B> <I>k</I>
-</DT><DD><A name="IDX1156"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:fixn16b</b>
-</DT><DD><A name="IDX1157"></A>
-Returns an exact non-negative binary fixnum uniform-array prototype with at
-least 16 bits of precision.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:fixn8b</B> <I>k</I>
-</DT><DD><A name="IDX1158"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:fixn8b</b>
-</DT><DD><A name="IDX1159"></A>
-Returns an exact non-negative binary fixnum uniform-array prototype with at
-least 8 bits of precision.
-</DD></DL>
-
-
-<P>
-</P><DL>
-<DT><U>Function:</U> <B>a:bool</B> <I>bool</I>
-</DT><DD><A name="IDX1160"></A>
-
-
-<P>
-</P></DD><DT><u>Function:</u> <b>a:bool</b>
-</DT><DD><A name="IDX1161"></A>
-Returns a boolean uniform-array prototype.
-</DD></DL>
-
-
-
-<H1>Implementation</H1>
-
-<A HREF="http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/slib/slib/array.scm?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">slib/array.scm</A>
-implements array procedures for R4RS or R5RS compliant Scheme
-implementations with <DFN>records</DFN> as implemented by
-<A HREF="http://savannah.gnu.org/cgi-bin/viewcvs/slib/slib/record.scm?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">slib/record.scm</A>
-or <A HREF="http://srfi.schemers.org/srfi-9/srfi-9.html">SRFI-9</A>.
-"<CODE>array.scm</CODE>" redefines <CODE>equal?</CODE> to handle
-arrays.
-<P>
-</P><PRE>;;;;"array.scm" Arrays for Scheme
-; Copyright (C) 2001, 2003 Aubrey Jaffer
-;
-;Permission to copy this software, to modify it, to redistribute it,
-;to distribute modified versions, and to use it for any purpose is
-;granted, subject to the following restrictions and understandings.
-;
-;1.  Any copy made of this software must include this copyright notice
-;in full.
-;
-;2.  I have made no warranty or representation that the operation of
-;this software will be error-free, and I am under no obligation to
-;provide any services, by way of maintenance, update, or otherwise.
-;
-;3.  In conjunction with products arising from the use of this
-;material, there shall be no use of my name in any advertising,
-;promotional, or sales literature without prior written consent in
-;each case.
-
-;;@code{(require 'array)} or @code{(require 'srfi-63)}
-;;@ftindex array
-
-(require 'record)
-
-(define array:rtd
-  (make-record-type "array"
-                    '(dimensions
-                      scales            ;list of dimension scales
-                      offset            ;exact integer
-                      store             ;data
-                      )))
-
-(define array:dimensions
-  (let ((dimensions (record-accessor array:rtd 'dimensions)))
-    (lambda (array)
-      (cond ((vector? array) (list (vector-length array)))
-            ((string? array) (list (string-length array)))
-            (else (dimensions array))))))
-
-(define array:scales
-  (let ((scales (record-accessor array:rtd 'scales)))
-    (lambda (obj)
-      (cond ((string? obj) '(1))
-            ((vector? obj) '(1))
-            (else (scales obj))))))
-
-(define array:store
-  (let ((store (record-accessor array:rtd 'store)))
-    (lambda (obj)
-      (cond ((string? obj) obj)
-            ((vector? obj) obj)
-            (else (store obj))))))
-
-(define array:offset
-  (let ((offset (record-accessor array:rtd 'offset)))
-    (lambda (obj)
-      (cond ((string? obj) 0)
-            ((vector? obj) 0)
-            (else (offset obj))))))
-
-(define array:construct
-  (record-constructor array:rtd '(dimensions scales offset store)))
-
-;;@args obj
-;;Returns @code{#t} if the @1 is an array, and @code{#f} if not.
-(define array?
-  (let ((array:array? (record-predicate array:rtd)))
-    (lambda (obj) (or (string? obj) (vector? obj) (array:array? obj)))))
-
-;;@noindent
-;;@emph{Note:} Arrays are not disjoint from other Scheme types.
-;;Vectors and possibly strings also satisfy @code{array?}.
-;;A disjoint array predicate can be written:
-;;
-;;@example
-;;(define (strict-array? obj)
-;;  (and (array? obj) (not (string? obj)) (not (vector? obj))))
-;;@end example
-
-;;@body
-;;Returns @code{#t} if @1 and @2 have the same rank and dimensions and the
-;;corresponding elements of @1 and @2 are @code{equal?}.
-
-;;@body
-;;@0 recursively compares the contents of pairs, vectors, strings, and
-;;@emph{arrays}, applying @code{eqv?} on other objects such as numbers
-;;and symbols.  A rule of thumb is that objects are generally @0 if
-;;they print the same.  @0 may fail to terminate if its arguments are
-;;circular data structures.
-;;
-;;@example
-;;(equal? 'a 'a)                             @result{}  #t
-;;(equal? '(a) '(a))                         @result{}  #t
-;;(equal? '(a (b) c)
-;;        '(a (b) c))                        @result{}  #t
-;;(equal? "abc" "abc")                       @result{}  #t
-;;(equal? 2 2)                               @result{}  #t
-;;(equal? (make-vector 5 'a)
-;;        (make-vector 5 'a))                @result{}  #t
-;;(equal? (make-array (A:fixN32b 4) 5 3)
-;;        (make-array (A:fixN32b 4) 5 3))    @result{}  #t
-;;(equal? (make-array '#(foo) 3 3)
-;;        (make-array '#(foo) 3 3))          @result{}  #t
-;;(equal? (lambda (x) x)
-;;        (lambda (y) y))                    @result{}  @emph{unspecified}
-;;@end example
-(define (equal? obj1 obj2)
-  (cond ((eqv? obj1 obj2) #t)
-        ((or (pair? obj1) (pair? obj2))
-         (and (pair? obj1) (pair? obj2)
-              (equal? (car obj1) (car obj2))
-              (equal? (cdr obj1) (cdr obj2))))
-        ((or (string? obj1) (string? obj2))
-         (and (string? obj1) (string? obj2)
-              (string=? obj1 obj2)))
-        ((or (vector? obj1) (vector? obj2))
-         (and (vector? obj1) (vector? obj2)
-              (equal? (vector-length obj1) (vector-length obj2))
-              (do ((idx (+ -1 (vector-length obj1)) (+ -1 idx)))
-                  ((or (negative? idx)
-                       (not (equal? (vector-ref obj1 idx)
-                                    (vector-ref obj2 idx))))
-                   (negative? idx)))))
-        ((or (array? obj1) (array? obj2))
-         (and (array? obj1) (array? obj2)
-              (equal? (array:dimensions obj1) (array:dimensions obj2))
-              (equal? (array:store obj1) (array:store obj2))))
-        (else #f)))
-
-;;@body
-;;Returns the number of dimensions of @1.  If @1 is not an array, 0 is
-;;returned.
-(define (array-rank obj)
-  (if (array? obj) (length (array:dimensions obj)) 0))
-
-;;@args array
-;;Returns a list of dimensions.
-;;
-;;@example
-;;(array-dimensions (make-array '#() 3 5))
-;;   @result{} (3 5)
-;;@end example
-(define array-dimensions array:dimensions)
-
-;;@args prototype k1 @dots{}
-;;
-;;Creates and returns an array of type @1 with dimensions @2, @dots{}
-;;and filled with elements from @1.  @1 must be an array, vector, or
-;;string.  The implementation-dependent type of the returned array
-;;will be the same as the type of @1; except if that would be a vector
-;;or string with rank not equal to one, in which case some variety of
-;;array will be returned.
-;;
-;;If the @1 has no elements, then the initial contents of the returned
-;;array are unspecified.  Otherwise, the returned array will be filled
-;;with the element at the origin of @1.
-(define (make-array prototype . dimensions)
-  (define tcnt (apply * dimensions))
-  (let ((store
-         (if (string? prototype)
-             (case (string-length prototype)
-               ((0) (make-string tcnt))
-               (else (make-string tcnt
-                                  (string-ref prototype 0))))
-             (let ((pdims (array:dimensions prototype)))
-               (case (apply * pdims)
-                 ((0) (make-vector tcnt))
-                 (else (make-vector tcnt
-                                    (apply array-ref prototype
-                                           (map (lambda (x) 0) pdims)))))))))
-    (define (loop dims scales)
-      (if (null? dims)
-          (array:construct dimensions (cdr scales) 0 store)
-          (loop (cdr dims) (cons (* (car dims) (car scales)) scales))))
-    (loop (reverse dimensions) '(1))))
-;;@args prototype k1 @dots{}
-;;@0 is an alias for @code{make-array}.
-(define create-array make-array)
-
-;;@args array mapper k1 @dots{}
-;;@0 can be used to create shared subarrays of other
-;;arrays.  The @var{mapper} is a function that translates coordinates in
-;;the new array into coordinates in the old array.  A @var{mapper} must be
-;;linear, and its range must stay within the bounds of the old array, but
-;;it can be otherwise arbitrary.  A simple example:
-;;
-;;@example
-;;(define fred (make-array '#(#f) 8 8))
-;;(define freds-diagonal
-;;  (make-shared-array fred (lambda (i) (list i i)) 8))
-;;(array-set! freds-diagonal 'foo 3)
-;;(array-ref fred 3 3)
-;;   @result{} FOO
-;;(define freds-center
-;;  (make-shared-array fred (lambda (i j) (list (+ 3 i) (+ 3 j)))
-;;                     2 2))
-;;(array-ref freds-center 0 0)
-;;   @result{} FOO
-;;@end example
-(define (make-shared-array array mapper . dimensions)
-  (define odl (array:scales array))
-  (define rank (length dimensions))
-  (define shape
-    (map (lambda (dim) (if (list? dim) dim (list 0 (+ -1 dim)))) dimensions))
-  (do ((idx (+ -1 rank) (+ -1 idx))
-       (uvt (append (cdr (vector-&gt;list (make-vector rank 0))) '(1))
-            (append (cdr uvt) '(0)))
-       (uvts '() (cons uvt uvts)))
-      ((negative? idx)
-       (let ((ker0 (apply + (map * odl (apply mapper uvt)))))
-         (array:construct
-          (map (lambda (dim) (+ 1 (- (cadr dim) (car dim)))) shape)
-          (map (lambda (uvt) (- (apply + (map * odl (apply mapper uvt))) ker0))
-               uvts)
-          (apply +
-                 (array:offset array)
-                 (map * odl (apply mapper (map car shape))))
-          (array:store array))))))
-
-;;@args rank proto list
-;;@3 must be a rank-nested list consisting of all the elements, in
-;;row-major order, of the array to be created.
-;;
-;;@0 returns an array of rank @1 and type @2 consisting of all the
-;;elements, in row-major order, of @3.  When @1 is 0, @3 is the lone
-;;array element; not necessarily a list.
-;;
-;;@example
-;;(list-&gt;array 2 '#() '((1 2) (3 4)))
-;;                @result{} #2A((1 2) (3 4))
-;;(list-&gt;array 0 '#() 3)
-;;                @result{} #0A 3
-;;@end example
-(define (list-&gt;array rank proto lst)
-  (define dimensions
-    (do ((shp '() (cons (length row) shp))
-         (row lst (car lst))
-         (rnk (+ -1 rank) (+ -1 rnk)))
-        ((negative? rnk) (reverse shp))))
-  (let ((nra (apply make-array proto dimensions)))
-    (define (l2ra dims idxs row)
-      (cond ((null? dims)
-             (apply array-set! nra row (reverse idxs)))
-            ((if (not (eqv? (car dims) (length row)))
-                 (slib:error 'list-&gt;array
-                             'non-rectangular 'array dims dimensions))
-             (do ((idx 0 (+ 1 idx))
-                  (row row (cdr row)))
-                 ((&gt;= idx (car dims)))
-               (l2ra (cdr dims) (cons idx idxs) (car row))))))
-    (l2ra dimensions '() lst)
-    nra))
-
-;;@args array
-;;Returns a rank-nested list consisting of all the elements, in
-;;row-major order, of @1.  In the case of a rank-0 array, @0 returns
-;;the single element.
-;;
-;;@example
-;;(array-&gt;list #2A((ho ho ho) (ho oh oh)))
-;;                @result{} ((ho ho ho) (ho oh oh))
-;;(array-&gt;list #0A ho)
-;;                @result{} ho
-;;@end example
-(define (array-&gt;list ra)
-  (define (ra2l dims idxs)
-    (if (null? dims)
-        (apply array-ref ra (reverse idxs))
-        (do ((lst '() (cons (ra2l (cdr dims) (cons idx idxs)) lst))
-             (idx (+ -1 (car dims)) (+ -1 idx)))
-            ((negative? idx) lst))))
-  (ra2l (array-dimensions ra) '()))
-
-;;@args vect proto dim1 @dots{}
-;;@1 must be a vector of length equal to the product of exact
-;;nonnegative integers @3, @dots{}.
-;;
-;;@0 returns an array of type @2 consisting of all the elements, in
-;;row-major order, of @1.  In the case of a rank-0 array, @1 has a
-;;single element.
-;;
-;;@example
-;;(vector-&gt;array #(1 2 3 4) #() 2 2)
-;;                @result{} #2A((1 2) (3 4))
-;;(vector-&gt;array '#(3) '#())
-;;                @result{} #0A 3
-;;@end example
-(define (vector-&gt;array vect prototype . dimensions)
-  (define vdx (vector-length vect))
-  (if (not (eqv? vdx (apply * dimensions)))
-      (slib:error 'vector-&gt;array vdx '&lt;&gt; (cons '* dimensions)))
-  (let ((ra (apply make-array prototype dimensions)))
-    (define (v2ra dims idxs)
-      (cond ((null? dims)
-             (set! vdx (+ -1 vdx))
-             (apply array-set! ra (vector-ref vect vdx) (reverse idxs)))
-            (else
-             (do ((idx (+ -1 (car dims)) (+ -1 idx)))
-                 ((negative? idx) vect)
-               (v2ra (cdr dims) (cons idx idxs))))))
-    (v2ra dimensions '())
-    ra))
-
-;;@args array
-;;Returns a new vector consisting of all the elements of @1 in
-;;row-major order.
-;;
-;;@example
-;;(array-&gt;vector #2A ((1 2)( 3 4)))
-;;                @result{} #(1 2 3 4)
-;;(array-&gt;vector #0A ho)
-;;                @result{} #(ho)
-;;@end example
-(define (array-&gt;vector ra)
-  (define dims (array-dimensions ra))
-  (let* ((vdx (apply * dims))
-         (vect (make-vector vdx)))
-    (define (ra2v dims idxs)
-      (if (null? dims)
-          (let ((val (apply array-ref ra (reverse idxs))))
-            (set! vdx (+ -1 vdx))
-            (vector-set! vect vdx val)
-            vect)
-          (do ((idx (+ -1 (car dims)) (+ -1 idx)))
-              ((negative? idx) vect)
-            (ra2v (cdr dims) (cons idx idxs)))))
-    (ra2v dims '())))
-
-(define (array:in-bounds? array indices)
-  (do ((bnds (array:dimensions array) (cdr bnds))
-       (idxs indices (cdr idxs)))
-      ((or (null? bnds)
-           (null? idxs)
-           (not (integer? (car idxs)))
-           (not (&lt; -1 (car idxs) (car bnds))))
-       (and (null? bnds) (null? idxs)))))
-
-;;@args array index1 @dots{}
-;;Returns @code{#t} if its arguments would be acceptable to
-;;@code{array-ref}.
-(define (array-in-bounds? array . indices)
-  (array:in-bounds? array indices))
-
-;;@args array k1 @dots{}
-;;Returns the (@2, @dots{}) element of @1.
-(define (array-ref array . indices)
-  (define store (array:store array))
-  (or (array:in-bounds? array indices)
-      (slib:error 'array-ref 'bad-indices indices))
-  ((if (string? store) string-ref vector-ref)
-   store (apply + (array:offset array) (map * (array:scales array) indices))))
-
-;;@args array obj k1 @dots{}
-;;Stores @2 in the (@3, @dots{}) element of @1.  The value returned
-;;by @0 is unspecified.
-(define (array-set! array obj . indices)
-  (define store (array:store array))
-  (or (array:in-bounds? array indices)
-      (slib:error 'array-set! 'bad-indices indices))
-  ((if (string? store) string-set! vector-set!)
-   store (apply + (array:offset array) (map * (array:scales array) indices))
-   obj))
-
-;;@noindent
-;;These functions return a prototypical uniform-array enclosing the
-;;optional argument (which must be of the correct type).  If the
-;;uniform-array type is supported by the implementation, then it is
-;;returned; defaulting to the next larger precision type; resorting
-;;finally to vector.
-
-(define (make-prototype-checker name pred? creator)
-  (lambda args
-    (case (length args)
-      ((1) (if (pred? (car args))
-               (creator (car args))
-               (slib:error name 'incompatible 'type (car args))))
-      ((0) (creator))
-      (else (slib:error name 'wrong 'number 'of 'args args)))))
-
-(define (integer-bytes?? n)
-  (lambda (obj)
-    (and (integer? obj)
-         (exact? obj)
-         (or (negative? n) (not (negative? obj)))
-         (do ((num obj (quotient num 256))
-              (n (+ -1 (abs n)) (+ -1 n)))
-             ((or (zero? num) (negative? n))
-              (zero? num))))))
-
-;;@args z
-;;@args
-;;Returns an inexact 128.bit flonum complex uniform-array prototype.
-(define A:floC128b (make-prototype-checker 'A:floC128b complex? vector))
-;;@args z
-;;@args
-;;Returns an inexact 64.bit flonum complex uniform-array prototype.
-(define A:floC64b (make-prototype-checker 'A:floC64b complex? vector))
-;;@args z
-;;@args
-;;Returns an inexact 32.bit flonum complex uniform-array prototype.
-(define A:floC32b (make-prototype-checker 'A:floC32b complex? vector))
-;;@args z
-;;@args
-;;Returns an inexact 16.bit flonum complex uniform-array prototype.
-(define A:floC16b (make-prototype-checker 'A:floC16b complex? vector))
-
-;;@args z
-;;@args
-;;Returns an inexact 128.bit flonum real uniform-array prototype.
-(define A:floR128b (make-prototype-checker 'A:floR128b real? vector))
-;;@args z
-;;@args
-;;Returns an inexact 64.bit flonum real uniform-array prototype.
-(define A:floR64b (make-prototype-checker 'A:floR64b real? vector))
-;;@args z
-;;@args
-;;Returns an inexact 32.bit flonum real uniform-array prototype.
-(define A:floR32b (make-prototype-checker 'A:floR32b real? vector))
-;;@args z
-;;@args
-;;Returns an inexact 16.bit flonum real uniform-array prototype.
-(define A:floR16b (make-prototype-checker 'A:floR16b real? vector))
-
-;;@args z
-;;@args
-;;Returns an exact 128.bit decimal flonum rational uniform-array prototype.
-(define A:floR128b (make-prototype-checker 'A:floR128b real? vector))
-;;@args z
-;;@args
-;;Returns an exact 64.bit decimal flonum rational uniform-array prototype.
-(define A:floR64b (make-prototype-checker 'A:floR64b real? vector))
-;;@args z
-;;@args
-;;Returns an exact 32.bit decimal flonum rational uniform-array prototype.
-(define A:floR32b (make-prototype-checker 'A:floR32b real? vector))
-
-;;@args n
-;;@args
-;;Returns an exact binary fixnum uniform-array prototype with at least
-;;64 bits of precision.
-(define A:fixZ64b (make-prototype-checker 'A:fixZ64b (integer-bytes?? -8) vector))
-;;@args n
-;;@args
-;;Returns an exact binary fixnum uniform-array prototype with at least
-;;32 bits of precision.
-(define A:fixZ32b (make-prototype-checker 'A:fixZ32b (integer-bytes?? -4) vector))
-;;@args n
-;;@args
-;;Returns an exact binary fixnum uniform-array prototype with at least
-;;16 bits of precision.
-(define A:fixZ16b (make-prototype-checker 'A:fixZ16b (integer-bytes?? -2) vector))
-;;@args n
-;;@args
-;;Returns an exact binary fixnum uniform-array prototype with at least
-;;8 bits of precision.
-(define A:fixZ8b (make-prototype-checker 'A:fixZ8b (integer-bytes?? -1) vector))
-
-;;@args k
-;;@args
-;;Returns an exact non-negative binary fixnum uniform-array prototype with at
-;;least 64 bits of precision.
-(define A:fixN64b (make-prototype-checker 'A:fixN64b (integer-bytes?? 8) vector))
-;;@args k
-;;@args
-;;Returns an exact non-negative binary fixnum uniform-array prototype with at
-;;least 32 bits of precision.
-(define A:fixN32b (make-prototype-checker 'A:fixN32b (integer-bytes?? 4) vector))
-;;@args k
-;;@args
-;;Returns an exact non-negative binary fixnum uniform-array prototype with at
-;;least 16 bits of precision.
-(define A:fixN16b (make-prototype-checker 'A:fixN16b (integer-bytes?? 2) vector))
-;;@args k
-;;@args
-;;Returns an exact non-negative binary fixnum uniform-array prototype with at
-;;least 8 bits of precision.
-(define A:fixN8b (make-prototype-checker 'A:fixN8b (integer-bytes?? 1) vector))
-
-;;@args bool
-;;@args
-;;Returns a boolean uniform-array prototype.
-(define A:bool (make-prototype-checker 'A:bool boolean? vector))
-</PRE>
-
-<H1>Copyright</H1>
-<p>Copyright (C) 2005 Aubrey Jaffer</p>
-
-<P>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</P><P>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</P><P>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</P><P>
-    </P><HR>
-    <ADDRESS>Editor: <A HREF="mailto:srfi-editors@srfi.schemers.org">David Van Horn</A></ADDRESS>
-<!-- Created: Tue Sep 29 19:20:08 EDT 1998 -->
-<!-- hhmts start -->
-Last modified: Thu Jan 27 09:30:33 EST 2005
-<!-- hhmts end -->
-  </BODY>
-</HTML>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-64.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-64.html
deleted file mode 100644
index db939d6ff1..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-64.html
+++ /dev/null
@@ -1,845 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><title>SRFI 64: A Scheme API for test suites</title>
-
-  
-    
-<style type="text/css">
-  div.title h1 { font-size: small; color: blue }
-  div.title { font-size: xx-large; color: blue; font-weight: bold }
-  h1 { font-size: x-large; color: blue }
-  h2 { font-size: large; color: blue }
-  /* So var inside pre gets same font as var in paragraphs. */
-  var { font-family: monospace; }
-</style></head><body>
-<div class="title">
-<h1>Title</h1>
-A Scheme API for test suites
-</div>
-
-<h1>Author</h1>
-<p>Per Bothner
-<code><a href="mailto:per@bothner.com">&lt;per@bothner.com&gt;</a></code></p>
-
-<h1>Status</h1>
-
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see
-<a href="http://srfi.schemers.org/srfi-process.html">here</a>.
-It will remain in draft status until 2005/03/17, or as amended. To
-provide input on this SRFI, please <code>
-<a href="mailto:srfi%20minus%2064%20at%20srfi%20dot%20schemers%20dot%20org">mailto:srfi minus 64 at srfi dot schemers dot org</a></code>.
-See <a href="http://srfi.schemers.org/srfi-list-subscribe.html">instructions
-here</a> to subscribe to the list. You can access previous messages via
-<a href="http://srfi.schemers.org/srfi-64/mail-archive/maillist.html">the
-archive of the mailing list</a>.
-<p>
-</p><ul>
-  <li>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-64/srfi-64.html">2005/01/07</a></li>
-  <li>Draft: 2005/01/28 - 2005/03/28</li>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-64/srfi-64.html?rev=1.3">2005/10/18</a>  
-  </li><li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-64/srfi-64.html?rev=1.5">2006/02/24</a>  
-  </li><li>Final: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-64/srfi-64.html?rev=1.6">2006/06/18</a></li>
-</ul>
-<p></p>
-
-
-<h1>Abstract</h1>
-<p>
-This defines an API for writing <dfn>test suites</dfn>, to make it easy
-to portably test Scheme APIs, libraries, applications, and implementations.
-A test suite is a collection of <dfn>test cases</dfn> that execute
-in the context of a <dfn>test-runner</dfn>.  This specifications
-also supports writing new test-runners, to allow customization
-of reporting and processing the result of running test suites.</p>
-
-<h1>Rationale</h1>
-
-<p>The Scheme community needs a standard for writing test suites.
-Every SRFI or other library should come with a test suite.
-Such a test suite must be portable, without requiring any
-non-standard features, such as modules.  The test suite implementation
-or "runner" need not be portable, but it is desirable that it be
-possible to write a portable basic implementation.</p>
-<p>
-There are other testing frameworks written in Scheme, including
-<a href="http://schematics.sourceforge.net/schemeunit.html">SchemeUnit</a>.
-However SchemeUnit is not portable.
-It is also a bit on the verbose side.
-It would be useful to have a bridge between this framework and SchemeUnit
-so SchemeUnit tests could run under this framework and vice versa.
-There exists also at least one Scheme wrapper providing a Scheme interface
-to the <q>standard</q> <a href="http://www.junit.org/">JUnit</a> API for Java.
-It would be useful to have a bridge so that tests written using this
-framework can run under a JUnit runner.
-Neither of these features are part of this specification.</p>
-<p>
-This API makes use of implicit dynamic state, including an
-implicit <q>test runner</q>.  This makes the API convenient
-and terse to use, but it may be a little less elegant and <q>compositional</q>
-than using explicit test objects, such as JUnit-style frameworks.
-It is not claimed to follow either object-oriented or functional design
-principles, but I hope it is useful and convenient to use and extend.</p>
-<p>
-This proposal allows converting a Scheme source file to a
-test suite by just adding a few macros.  You don't have to
-write the entire file in a new form, thus you don't have to
-re-indent it.</p>
-<p>
-All names defined by the API start with the prefix <code>test-</code>.
-All function-like forms are defined as syntax.  They may be implemented
-as functions or macros or built-ins.  The reason for specifying them as
-syntax is to allow specific tests to be skipped without evaluating sub-expressions, or for implementations
-to add features such as printing line numbers or catching exceptions.</p>
-
-<h1>Specification</h1>
-
-<p>While this is a moderately complex specification,
-you should be able to write simple test suites after just reading the
-first few sections below.  More advanced functionality, such
-as writing a custom test-runner, is at the end of the specification.</p>
-
-<h2>Writing basic test suites</h2>
-<p>Let's start with a simple example.
-This is a complete self-contained test-suite.</p>
-
-<pre>;; Initialize and give a name to a simple testsuite.
-(test-begin "vec-test")
-(define v (make-vector 5 99))
-;; Require that an expression evaluate to true.
-(test-assert (vector? v))
-;; Test that an expression is eqv? to some other expression.
-(test-eqv 99 (vector-ref v 2))
-(vector-set! v 2 7)
-(test-eqv 7 (vector-ref v 2))
-;; Finish the testsuite, and report results.
-(test-end "vec-test")
-</pre>
-<p>
-This testsuite could be saved in its own source file.
-Nothing else is needed:
-We do not require any top-level forms, so it is easy
-to wrap an existing program or test to this form, without adding indentation.
-It is also easy to add new tests, without having to name individual
-tests (though that is optional).</p>
-<p>
-Test cases are executed in the context of a <dfn>test runner</dfn>,
-which is a object that accumulates and reports test results.
-This specification defines how to create and use custom test runners,
-but implementations should also provide a default test runner.
-It is suggested (but not required) that loading the above
-file in a top-level environment will cause the
-tests to be executed using an implementation-specified default test runner,
-and <code>test-end</code> will cause a summary to be displayed
-in an implementation-specified manner.</p>
-
-<h3>Simple test-cases</h3>
-<p>
-Primitive test cases test that a given condition is true.
-They may have a name.
-The core test case form is <code>test-assert</code>:</p>
-<pre>(<b>test-assert</b> [<var>test-name</var>] <var>expression</var>)
-</pre>
-<p>
-This evaluates the <var>expression</var>.
-The test passes if the result
-is true; if the result is false, a test failure is reported.
-The test also fails if an exception is raised, assuming the implementation
-has a way to catch exceptions.
-How the failure is reported depends on the test runner environment.
-The <var>test-name</var> is a string that names the test case.
-(Though the <var>test-name</var> is a string literal in the examples,
-it is an expression.  It is evaluated only once.) 
-It is used when reporting errors, and also when skipping tests,
-as described below.
-It is an error to invoke <code>test-assert</code>
-if there is no current test runner.</p>
-<p>
-The following forms may be more convenient than
-using <code>test-assert</code> directly:</p>
-<pre>(<b>test-eqv</b> [<var>test-name</var>] <var>expected</var> <var>test-expr</var>)
-</pre>
-<p>
-This is equivalent to:</p>
-<pre>(test-assert [<var>test-name</var>] (eqv? <var>expected</var> <var>test-expr</var>))
-</pre>
-<p>
-Similarly <code>test-equal</code> and <code>test-eq</code>
-are shorthand for <code>test-assert</code> combined with
-<code>equal?</code> or <code>eq?</code>, respectively:</p>
-<pre>(<b>test-equal</b> [<var>test-name</var>] <var>expected</var> <var>test-expr</var>)
-(<b>test-eq</b> [<var>test-name</var>] <var>expected</var> <var>test-expr</var>)</pre>
-<p>
-Here is a simple example:</p>
-<pre>(define (mean x y) (/ (+ x y) 2.0))
-(test-eqv 4 (mean 3 5))
-</pre>
-<p>For testing approximate equality of inexact reals
-we can use <code>test-approximate</code>:</p>
-<pre>(<b>test-approximate</b> [test-name] expected test-expr error)
-</pre>
-<p>
-This is equivalent to (except that each argument is only evaluated once):</p>
-<pre>(test-assert [test-name]
-  (and (&gt;= test-expr (- expected error))
-       (&lt;= test-expr (+ expected error))))
-</pre>
-
-<h3>Tests for catching errors</h3>
-<p>
-We need a way to specify that evaluation <em>should</em> fail.
-This verifies that errors are detected when required.</p>
-<pre>(<b>test-error</b> [[<var>test-name</var>] <var>error-type</var>] <var>test-expr</var>)
-</pre>
-<p>
-Evaluating <var>test-expr</var> is expected to signal an error.
-The kind of error is indicated by  <var>error-type</var>.</p>
-<p>
-If the <var>error-type</var> is left out, or it is
-<code>#t</code>, it means "some kind of unspecified error should be signaled".
-For example:</p>
-<pre>(test-error #t (vector-ref '#(1 2) 9))
-</pre>
-<p>
-This specification leaves it implementation-defined (or for a future
-specification) what form <code><var>test-error</var></code> may take,
-though all implementations must allow <code>#t</code>.
-Some implementations may support
-<a href="http://srfi.schemers.org/srfi-35/srfi-35.html">SRFI-35's conditions</a>,
-but these are only standardized for 
-<a href="http://srfi.schemers.org/srfi-36/srfi-36.html">SRFI-36's I/O conditions</a>, which are seldom useful in test suites.
-An implementation may also allow implementation-specific
-<q>exception types</q>.
-For example Java-based implementations may allow
-the names of Java exception classes:</p>
-<pre>;; Kawa-specific example
-(test-error &lt;java.lang.IndexOutOfBoundsException&gt; (vector-ref '#(1 2) 9))
-</pre>
-<p>
-An implementation that cannot catch exceptions should skip
-<code>test-error</code> forms.</p>
-
-<h3>Testing syntax</h3>
-<p>
-Testing syntax is tricky, especially if we want to
-check that invalid syntax is causes an error.
-The following utility function can help:</p>
-<pre>(<b>test-read-eval-string</b> <var>string</var>)
-</pre>
-<p>
-This function parses <var>string</var> (using <code>read</code>)
-and evaluates the result.
-The result of evaluation is returned from <code>test-read-eval-string</code>.
-An error is signalled if there are unread characters after the
-<code>read</code> is done.
-For example:<br>
-<code>(test-read-eval-string "(+ 3 4)")</code> <i>evaluates to</i> <code>7</code>.<br>
-<code>(test-read-eval-string "(+ 3 4")</code> <i>signals an error</i>.<br>
-<code>(test-read-eval-string "(+ 3 4) ")</code> <i>signals an error</i>,
-because there is extra <q>junk</q> (<i>i.e.</i> a space) after the
-list is read.
-</p>
-<p>
-The <code>test-read-eval-string</code> used in tests:</p>
-<pre>(test-equal 7 (test-read-eval-string "(+ 3 4)"))
-(test-error (test-read-eval-string "(+ 3"))
-(test-equal #\newline (test-read-eval-string "#\\newline"))
-(test-error (test-read-eval-string "#\\newlin"))
-
-;; Skip the next 2 tests unless srfi-62 is available.
-(test-skip (cond-expand (srfi-62 0) (else 2)))
-(test-equal 5 (test-read-eval-string "(+ 1 #;(* 2 3) 4)"))
-(test-equal '(x z) (test-read-string "(list 'x #;'y 'z)"))
-</pre>
-
-<h3>Test groups and paths</h3>
-<p>A <dfn>test group</dfn> is a named sequence of forms containing testcases,
-expressions, and definitions.
-Entering a group sets the <dfn>test group name</dfn>; leaving a
-group restores the previous group name.
-These are dynamic (run-time) operations, and a group has no
-other effect or identity.
-Test groups are informal groupings: they are neither
-Scheme values, nor are they syntactic forms.</p>
-<!--(More formal <q>test suite</q> values are introduced below.)-->
-<p>
-A test group may contain nested inner test groups.
-The <dfn>test group path</dfn> is a list of the currently-active
-(entered) test group names, oldest (outermost) first.</p>
-<pre>(<b>test-begin</b> <var>suite-name</var> [<var>count</var>])
-</pre>
-<p>A <code>test-begin</code> enters a new test group.
-The <var>suite-name</var> becomes the current test group name,
-and is added to the end of the test group path.
-Portable test suites should use a sting literal for <var>suite-name</var>;
-the effect of expressions or other kinds of literals is unspecified.</p>
-<p>
-<b>Rationale:</b> In some ways using symbols would be preferable.
-However, we want human-readable names, and standard Scheme does not
-provide a way to include spaces or mixed-case text in
-literal symbols.</p>
-<p>
-The optional <var>count</var> must match the number of
-test-cases executed by this group.
-(Nested test groups count as a single test case for this count.)
-This extra test may be useful to catch cases where a test doesn't
-get executed because of some unexpected error.</p>
-<p>
-Additionally, if there is no currently executing test runner,
-one is installed in an implementation-defined manner.</p>
-<pre>(<b>test-end</b> [<var>suite-name</var>])
-</pre>
-<p>
-A <code>test-end</code> leaves the current test group.
-An error is reported if the <var>suite-name</var> does not
-match the current test group name.
-<!--If it does match an earlier
-name in the test group path, intervening groups are left.
---></p>
-<p>
-Additionally, if the matching <code>test-begin</code>
-installed a new test-runner, then the <code>test-end</code>
-will de-install it, after reporting the accumulated test
-results in an implementation-defined manner.</p>
-
-<pre>(<b>test-group</b> <var>suite-name</var> <var>decl-or-expr</var> ...)
-</pre>
-<p>
-Equivalent to:</p>
-<pre>(if (not (test-to-skip% <var>suite-name</var>))
-  (dynamic-wind
-    (lambda () (test-begin <var>suite-name</var>))
-    (lambda () <var>decl-or-expr</var> ...)
-    (lambda () (test-end <var>suite-name</var>))))
-</pre>
-<p>This is usually equivalent to executing the <var>decl-or-expr</var>s
-within the named test group.  However, the entire group is skipped
-if it matched an active <code>test-skip</code> (see later).
-Also, the <code>test-end</code> is executed in case of an exception.</p>
-
-<h3>Handling set-up and cleanup</h3>
-<pre>(<b>test-group-with-cleanup</b> <var>suite-name</var>
-  <var>decl-or-expr</var> ...
-  <var>cleanup-form</var>)
-</pre>
-<p>
-Execute each of the <code><var>decl-or-expr</var></code> forms in order
-(as in a <code><var>&lt;body&gt;</var></code>),
-and then execute the <code><var>cleanup-form</var></code>.
-The latter should be executed even if
-one of a <code><var>decl-or-expr</var></code> forms raises an exception
-(assuming the implementation has a way to catch exceptions).</p>
-<p>For example:</p>
-<pre>(test-group-with-cleanup "test-file"
-  (define f (open-output-file "log"))
-  (do-a-bunch-of-tests f)
-  (close-output-port f))
-</pre>
-
-<!--
-<h2>Test suites</h2>
-<p>
-<i>(Not sure how useful this is, given <code>test-group</code>).</i>
-<p>A <dfn>test suite</dfn> is a test group that can (and must) be
-executed explicitly.
-<pre>
-(test-suite <var>suite-name</var> <var>decl-or-expr</var> ...)
-</pre>
-<p>
-The <df>test suite path</dfn> is the list of names of currently
-running testsuites, from outermost (oldest) to innermost (newest).
-<p>A <code>test-suite</code> form is equivalent to:
-<pre>
-(test-suite-register <var>suite-name</var>
-  (test-group <var>suite-name</var> <var>decl-or-expr</var> ...))
-</pre>
-You can run previously registered test suite:
-<pre>
-(test-suite-run <var>suite-name</var>)
-</pre>
--->
-
-<h2>Conditonal test-suites and other advanced features</h2>
-<p>
-The following describes features for controlling which tests to execute,
-or specifing that some tests are <em>expected</em> to fail.</p>
-
-<h3>Test specifiers</h3>
-<p>Sometimes we want to only run certain tests, or we know that
-certain tests are expected to fail.
-A <dfn>test specifier</dfn> is one-argument function that takes a test-runner
-and returns a boolean.  The specifier may be run before a test is performed,
-and the result may control whether the test is executed.
-For convenience, a specifier may also be a non-procedure value,
-which is coerced to a specifier procedure, as described below for
-<code><var>count</var></code> and <code><var>name</var></code>.</p>
-<p>
-A simple example is:</p>
-<pre>(if <var>some-condition</var>
-  (test-skip 2)) ;; skip next 2 tests
-</pre>
-<p>
-<code>(<b>test-match-name</b> <var>name</var>)</code><br>
-The resulting specifier matches if the current test name (as
-returned by <code>test-runner-test-name</code>) is <code>equals?</code> to
-<var>name</var>.</p>
-<p>
-<code>(<b>test-match-nth</b> <var>n</var> [<var>count</var>])</code><br>
-This evaluates to a <em>stateful</em> predicate: A counter keeps track of
-how many times it has been called.
-The predicate matches the <var>n</var>'th time it is called
-(where <code>1</code> is the first time), and
-the next <code>(- <var>count</var> 1)</code> times,
-where <var>count</var> defaults to <code>1</code>.</p>
-<p>
-<code>(<b>test-match-any</b> <var>specifier</var> ...)</code><br>
-The resulting specifier matches if any <var>specifier</var>
-matches.
-Each <code><var>specifier</var></code> is applied, in order,
-so side-effects from a later <code><var>specifier</var></code> happen
-even if an earlier <code><var>specifier</var></code> is true.</p>
-<p>
-<code>(<b>test-match-all</b> <var>specifier</var> ...)</code><br>
-The resulting specifier matches if each <var>specifier</var>
-matches.
-Each <code><var>specifier</var></code> is applied, in order,
-so side-effects from a later <code><var>specifier</var></code> happen
-even if an earlier <code><var>specifier</var></code> is false.</p>
-<p>
-<code><var>count</var> </code><i>(i.e. an integer)</i><br>
-Convenience short-hand for: <code>(test-match-nth 1 <var>count</var>)</code>.</p>
-<p>
-<code><var>name</var> </code><i>(i.e. a string)</i><br>
-Convenience short-hand for <code>(test-match-name <var>name</var>)</code>.</p>
-
-<h3>Skipping selected tests</h3>
-<p>In some cases you may want to skip a test.</p>
-<pre>(<b>test-skip</b> <var>specifier</var>)
-</pre>
-<p>Evaluating <code>test-skip</code> adds the
-resulting <var>specifier</var>
-to the set of currently active skip-specifiers.
-Before each test (or <code>test-group</code>)
-the set of active skip-specifiers are applied to the active test-runner.
-If any specifier matches, then the test is skipped.</p>
-<p>
-For convenience, if the <var>specifier</var> is a string that
-is syntactic sugar for <code>(test-match-name <var>specifier</var>)</code>.
-For example:</p>
-<pre>(test-skip "test-b")
-(test-assert "test-a")   ;; executed
-(test-assert "test-b")   ;; skipped
-</pre>
-<p>
-Any skip specifiers introduced by a <code>test-skip</code>
-are removed by a following non-nested <code>test-end</code>.</p>
-<pre>(test-begin "group1")
-(test-skip "test-a")
-(test-assert "test-a")   ;; skipped
-(test-end "group1")      ;; Undoes the prior test-skip
-(test-assert "test-a")   ;; executed
-</pre>
-
-<h3>Expected failures</h3>
-<p>
-Sometimes you know a test case will fail, but you don't have time
-to or can't fix it.   Maybe a certain feature only works on certain platforms.
-However, you want the test-case to be there
-to remind you to fix it.  You want to note that 
-such tests are expected to fail.</p>
-<pre>(<b>test-expect-fail</b> <var>specifier</var>)
-</pre>
-<p>
-Matching tests (where matching is defined as in <code>test-skip</code>)
-are expected to fail.  This only affects test reporting,
-not test execution.  For example:</p>
-<pre>(test-expect-fail 2)
-(test-eqv ...) ;; expected to fail
-(test-eqv ...) ;; expected to fail
-(test-eqv ...) ;; expected to pass
-</pre>
-
-<h2>Test-runner</h2>
-<p>
-A <dfn>test-runner</dfn> is an object that runs a test-suite,
-and manages the state.  The test group path, and the sets skip and
-expected-fail specifiers are part of the test-runner.
-A test-runner will also typically accumulate statistics about executed tests,
-</p>
-<p>
-<code>(<b>test-runner?</b> <var>value</var>)</code><br>
-True iff <code><var>value</var></code> is a test-runner object.</p>
-<p>
-<code>(<b>test-runner-current</b>)</code><br>
-<code>(<b>test-runner-current</b> <var>runner</var>)</code><br>
-Get or set the current test-runner.
-If an implementation supports parameter objects
-(as in <a href="http://srfi.schemers.org/srfi-39/srfi-39.html">SRFI-39</a>),
-then <code>test-runner-current</code> can be a parameter object.
-Alternatively, <code>test-runner-current</code> may be implemented
-as a macro or function 
-that uses a fluid or thread-local variable, or a plain global variable.</p>
-<p>
-<code>(<b>test-runner-get</b>)</code><br>
-Same as <code>(test-runner-current)</code>, buth trows an exception
-if there is no current test-runner.</p>
-<p>
-<code>(<b>test-runner-simple</b>)</code><br>
-Creates a new simple test-runner, that prints errors and a summary
-on the standard output port.</p>
-<p>
-<code>(<b>test-runner-null</b>)</code><br>
-Creates a new test-runner, that does nothing with the test results.
-This is mainly meant for extending when writing a custom runner.</p>
-<p>
-Implementations <em>may</em> provide other test-runners, perhaps
-a <code>(test-runner-gui)</code>.</p>
-<p><code>(<b>test-runner-create</b>)</code><br>
-Create a new test-runner.  Equivalent to
-<code>((test-runner-factory))</code>.</p>
-<p>
-<code>(<b>test-runner-factory</b>)</code><br>
-<code>(<b>test-runner-factory</b> <var>factory</var>)</code><br>
-Get or set the current test-runner factory.
-A factory is a zero-argument function that creates a new test-runner.
-The default value is <code>test-runner-simple</code>,
-but implementations may provide a way to override the default.
-As with <code>test-runner-current</code>, this may be a parameter object,
-or use a per-thread, fluid, or global variable.</p>
-
-<h3>Running specific tests with a specified runner</h3>
-<p>
-<code>(<b>test-apply</b> [<var>runner</var>] <var>specifier</var> ... <var>procedure</var>)</code><br>
-Calls <var>procedure</var> with no arguments using the specified
-<var>runner</var> as the current test-runner.
-If <var>runner</var> is omitted,
-then <code>(test-runner-current)</code> is used.
-(If there is no current runner, one is created as in <code>test-begin</code>.)
-If one or more <var>specifier</var>s are listed then only tests matching
-the <var>specifier</var>s are executed.  A <var>specifier</var> has the same form
-as one used for <code>test-skip</code>.  A test is executed
-if it matches any of the <var>specifier</var>s in the
-<code>test-apply</code> <em>and</em> does not match any
-active <code>test-skip</code> specifiers.</p>
-<p>
-<code>(<b>test-with-runner </b><var>runner</var> <var>decl-or-expr</var> ...)</code><br>
-Executes each <var>decl-or-expr</var> in order in a context
-where the current test-runner is <var>runner</var>.</p>
-
-<h2>Test results</h2>
-<p>Running a test sets various status properties in the current test-runner.
-This can be examined by a custom test-runner,
-or (more rarely) in a test-suite.</p>
-
-<h3>Result kind</h3>
-<p>Running a test may yield one of the following
-status symbols:</p>
-<dl>
-<dt><code>'pass</code></dt><dd>The passed, as expected.</dd>
-<dt><code>'fail</code></dt><dd>The test failed (and was not expected to).</dd>
-<dt><code>'xfail</code></dt><dd>The test failed and was expected to.</dd>
-<dt><code>'xpass</code></dt><dd>The test passed, but was expected to fail.</dd>
-<dt><code>'skip</code></dt><dd>The test was skipped.</dd>
-</dl>
-<p>
-<code>(<b>test-result-kind</b> [<var>runner</var>])</code><br>
-Return one of the above result codes from the most recent tests.
-Returns <code>#f</code> if no tests have been run yet.
-If we've started on a new test, but don't have a result yet,
-then the result kind is <code>'xfail</code> is the test is expected to fail,
-<code>'skip</code> is the test is supposed to be skipped,
-or <code>#f</code> otherwise.</p>
-<p>
-<code>(<b>test-passed?</b> [<var>runner</var>])</code><br>
-True if the value of <code>(test-result-kind [<var>runner</var>])</code>
-is one of <code>'pass</code> or <code>'xpass</code>.
-This is a convenient shorthand that might be useful
-in a test suite to only run certain tests if the previous test passed.</p>
-
-<h3>Test result properties</h3>
-<p>
-A test runner also maintains a set of more detailed <q>result properties</q>
-associated with the current or most recent test.  (I.e. the properties of the
-most recent test are available as long as a new test hasn't started.)
-Each property has a name (a symbol) and a value (any value).
-Some properties are standard or set by the implementation;
-implementations can add more.</p>
-<p>
-<code>(<b>test-result-ref</b> <var>runner</var> '<var>pname</var> [<var>default</var>])</code><br>
-Returns the property value associated with the <var>pname</var> property name.
-If there is no value associated with <code>'<var>pname</var></code>
-return <var>default</var>,
-or <code>#f</code> if <var>default</var> isn't specified.</p>
-<p>
-<code>(<b>test-result-set!</b> <var>runner</var> '<var>pname</var> <var>value</var>)</code><br>
-Sets the property value associated with the <var>pname</var>
-property name to <var>value</var>.
-Usually implementation code should call this function, but it may be
-useful for a custom test-runner to add extra properties.</p>
-<p>
-<code>(<b>test-result-remove</b> <var>runner</var> '<var>pname</var>)</code><br>
-Remove the property with the name <code>'<var>pname</var></code>.</p>
-<p>
-<code>(<b>test-result-clear</b> <var>runner</var>)</code><br>
-Remove all result properties.
-The implementation automatically calls <code>test-result-clear</code>
-at the start of a <code>test-assert</code> and similar procedures.</p>
-<p>
-<code>(<b>test-result-alist</b> <var>runner</var>)</code><br>
-Returns an association list of the current result properties.
-It is unspecified if the result shares state with the test-runner.
-The result should not be modified, on the other hand the result
-may be implicitly modified by future <code>test-result-set!</code> or
-<code>test-result-remove</code> calls.
-However, A <code>test-result-clear</code> does not modify the returned
-alist.  Thus you can <q>archive</q> result objects from previous runs.</p>
-
-<h3>Standard result properties</h3>
-<p>
-The set of available result properties is implementation-specific.
-However, it is suggested that the following might be provided:</p>
-<dl>
-<dt><code>'result-kind</code></dt>
-<dd>The result kind, as defined previously.
-This is the only mandatory result property.<br>
-<code>(test-result-kind <var>runner</var>)</code> is equivalent to:<br>
-<code>(test-result-ref  <var>runner</var> 'result-kind)</code>
-</dd>
-<dt><code>'source-file</code></dt>
-<dt><code>'source-line</code></dt>
-<dd>If known, the location of test statements (such as <code>test-assert</code>)
-in test suite source code..</dd>
-<dt><code>'source-form</code></dt>
-<dd>The source form, if meaningful and known.</dd>
-<dt><code>'expected-value</code></dt>
-<dd>The expected non-error result, if meaningful and known.</dd>
-<dt><code>'expected-error</code></dt>
-<dd>The <code><var>error-type</var></code>
-specified in a <code>test-error</code>, if it meaningful and known.</dd>
-<dt><code>'actual-value</code></dt>
-<dd>The actual non-error result value, if meaningful and known.</dd>
-<dt><code>'actual-error</code></dt>
-<dd>The error value, if an error was signalled and it is known.
-The actual error value is implementation-defined.</dd>
-</dl>
-
-<h2>Writing a new test-runner</h2>
-<p>This section specifies how to write a test-runner.
-It can be ignored if you just want to write test-cases.</p>
-
-
-<h3>Call-back functions</h3>
-<p>
-These call-back functions are <q>methods</q> (in the object-oriented sense)
-of a test-runner. A method <code>test-runner-on-<var>event</var></code>
-is called by the implementation when <var>event</var> happens.</p>
-<p>
-To define (set) the callback function for <var>event</var> use the following expression.
-(This is normally done when initializing a test-runner.)
-<br>
-<code>(test-runner-on-<var>event</var>! <var>runner</var> <var>event-function</var>)</code></p>
-<p>
-An <var>event-function</var> takes a test-runner argument, and possibly other arguments, depending on the <var>event</var>.</p>
-<p>
-To extract (get) the callback function for <var>event</var> do this:<br>
-<code>(test-runner-on-<var>event</var> <var>runner</var>)</code></p>
-<p>
-To extract call the callback function for <var>event</var> use the following expression.
-(This is normally done by the implementation core.)<br>
-<code>((test-runner-on-<var>event</var> <var>runner</var>) <var>runner</var> <var>other-args</var> ...)</code></p>
-<p>
-The following call-back hooks are available.</p>
-<p>
-<code>(<b>test-runner-on-test-begin</b> <var>runner</var>)</code><br>
-<code>(<b>test-runner-on-test-begin!</b> <var>runner</var> <var>on-test-begin-function</var>)</code><br>
-<code>(<var>on-test-begin-function</var> <var>runner</var>)</code><br>
-The <var>on-test-begin-function</var> is called at the start of an
-individual testcase, before the test expression (and expected value) are
-evaluated.
-</p>
-<p>
-<code>(<b>test-runner-on-test-end</b> <var>runner</var>)</code><br>
-<code>(<b>test-runner-on-test-end!</b> <var>runner</var> <var>on-test-end-function</var>)</code><br>
-<code>(<var>on-test-end-function</var> <var>runner</var>)</code><br>
-The <var>on-test-end-function</var> is called at the end of an
-individual testcase, when the result of the test is available.</p>
-<p>
-<code>(<b>test-runner-on-group-begin</b> <var>runner</var>)</code><br>
-<code>(<b>test-runner-on-group-begin!</b> <var>runner</var> <var>on-group-begin-function</var>)</code><br>
-<code>(<var>on-group-begin-function</var> <var>runner</var> <var>suite-name</var> <var>count</var>)</code><br>
-The <var>on-group-begin-function</var> is called by a <code>test-begin</code>,
-including at the start of a <code>test-group</code>.
-The <var>suite-name</var> is a Scheme string,
-and <var>count</var> is an integer or <code>#f</code>.</p>
-<p>
-<code>(<b>test-runner-on-group-end</b> <var>runner</var>)</code><br>
-<code>(<b>test-runner-on-group-end!</b> <var>runner</var> <var>on-group-end-function</var>)</code><br>
-<code>(<var>on-group-end-function</var> <var>runner</var>)</code><br>
-The <var>on-group-end-function</var> is called by a <code>test-end</code>,
-including at the end of a <code>test-group</code>.</p>
-<p>
-<code>(<b>test-runner-on-bad-count</b> <var>runner</var>)</code><br>
-<code>(<b>test-runner-on-bad-count!</b> <var>runner</var> <var>on-bad-count-function</var>)</code><br>
-<code>(<var>on-bad-count-function</var> <var>runner</var> <var>actual-count</var> <var>expected-count</var>)</code><br>
-Called from <code>test-end</code> (before the <var>on-group-end-function</var>
-is called) if an <var>expected-count</var> was specified by the matching
-<code>test-begin</code> and the <var>expected-count</var> does not match
-the <var>actual-count</var> of tests actually executed or skipped.</p>
-<p>
-<code>(<b>test-runner-on-base-end-name</b> <var>runner</var>)</code><br>
-<code>(<b>test-runner-on-bad-end-name!</b> <var>runner</var> <var>on-bad-end-name-function</var>)</code><br>
-<code>(<var>on-bad-end-name-function</var> <var>runner</var> <var>begin-name</var> <var>end-name</var>)</code><br>
-Called from <code>test-end</code> (before the <var>on-group-end-function</var>
-is called) if a <var>suite-name</var> was specified, and it did not that the
-name in the matching <code>test-begin</code>.</p>
-<p>
-<code>(<b>test-runner-on-final</b> <var>runner</var>)</code><br>
-<code>(<b>test-runner-on-final!</b> <var>runner</var> <var>on-final-function</var>)</code><br>
-<code>(<var>on-final-function</var> <var>runner</var>)</code><br>
-The <var>on-final-function</var> takes one parameter (a test-runner)
-and typically displays a summary (count) of the tests.
-The <var>on-final-function</var> is called after called the
-<var>on-group-end-function</var> correspondiong to the outermost
-<code>test-end</code>.
-The default value is <code>test-on-final-simple</code> which writes
-to the standard output port the number of tests of the various kinds.
-</p>
-<p>
-The default test-runner returned by <code>test-runner-simple</code>
-uses the following call-back functions:<br>
-<code>(<b>test-on-test-begin-simple</b> <var>runner</var>)</code><br>
-<code>(<b>test-on-test-end-simple</b> <var>runner</var>)</code><br>
-<code>(<b>test-on-group-begin-simple</b> <var>runner</var> <var>suite-name</var> <var>count</var>)</code><br>
-<code>(<b>test-on-group-end-simple</b> <var>runner</var>)</code><br>
-<code>(<b>test-on-bad-count-simple</b> <var>runner</var> <var>actual-count</var> <var>expected-count</var>)</code><br>
-<code>(<b>test-on-bad-end-name-simple</b> <var>runner</var> <var>begin-name</var> <var>end-name</var>)</code><br>
-You can call those if you want to write a your own test-runner.</p>
-
-<h3>Test-runner components</h3>
-<p>
-The following functions are for accessing the other components of a test-runner.
-They would normally only be used to write a new test-runner or
-a match-predicate.</p>
-<p>
-<code>(<b>test-runner-pass-count</b> <var>runner</var>)</code><br>
-Returns the number of tests that passed, and were expected to pass.</p>
-<p>
-<code>(<b>test-runner-fail-count</b> <var>runner</var>)</code><br>
-Returns the number of tests that failed, but were expected to pass.</p>
-<p>
-<code>(<b>test-runner-xpass-count</b> <var>runner</var>)</code><br>
-Returns the number of tests that passed, but were expected to fail.</p>
-<p>
-<code>(<b>test-runner-xfail-count</b> <var>runner</var>)</code><br>
-Returns the number of tests that failed, and were expected to pass.</p>
-<p>
-<code>(<b>test-runner-skip-count</b> <var>runner</var>)</code><br>
-Returns the number of tests or test groups that were skipped.</p>
-<p>
-<code>(<b>test-runner-test-name</b> <var>runner</var>)</code><br>
-Returns the name of the current test or test group, as a string.
-During execution of <code>test-begin</code> this is the name of the
-test group; during the execution of an actual test, this is the name
-of the test-case.
-If no name was specified, the name is the empty string.</p>
-<p>
-<code>(<b>test-runner-group-path</b> <var>runner</var>)</code><br>
-A list of names of groups we're nested in, with the outermost group first.</p>
-<p>
-<code>(<b>test-runner-group-stack</b> <var>runner</var>)</code><br>
-A list of names of groups we're nested in, with the outermost group last.
-(This is more efficient than <code>test-runner-group-path</code>,
-since it doesn't require any copying.)</p>
-<p>
-<code>(<b>test-runner-aux-value</b> <var>runner</var>)</code><br>
-<code>(<b>test-runner-aux-value!</b> <var>runner</var> <var>on-test</var>)</code><br>
-Get or set the <code>aux-value</code> field of a test-runner.
-This field is not used by this API or the <code>test-runner-simple</code>
-test-runner, but may be used by custom test-runners to store extra state.</p>
-<p>
-<code>(<b>test-runner-reset</b> <var>runner</var>)</code><br>
-Resets the state of the <var>runner</var> to its initial state.
-</p>
-
-<h3>Example</h3>
-<p>This is an example of a simple custom test-runner.
-Loading this program before running a test-suite will install
-it as the default test runner.</p>
-<pre>(define (my-simple-runner filename)
-  (let ((runner (test-runner-null))
-	(port (open-output-file filename))
-        (num-passed 0)
-        (num-failed 0))
-    (test-runner-on-test! runner
-      (lambda (runner result)
-        (case (cdr (assq 'result-kind result))
-          ((pass xpass) (set! num-passed (+ num-passed 1)))
-          ((fail xfail) (set! num-failed (+ num-failed 1)))
-          (else #t))))
-    (test-runner-on-final! runner
-       (lambda (runner)
-          (format port "Passing tests: ~d.~%Failing tests: ~d.~%"
-                  num-passed num-failed)
-	  (close-output-port port)))
-    runner))
-
-(test-runner-factory
- (lambda () (my-simple-runner "/tmp/my-test.log")))
-</pre>
-
-<h1>Implementation</h1>
-<p>
-The test implementation uses <code>cond-expand</code>
-(<a href="http://srfi.schemers.org/srfi-0/srfi-0.html">SRFI-0</a>)
-to select different code depending on certain SRFI names (<code>srfi-9</code>,
-<code>srfi-34</code>, <code>srfi-35</code>, <code>srfi-39</code>),
-or implementations (<code>kawa</code>).
-It should otherwise be portable to any R5RS implementation.</p>
-
-<p><a href="http://srfi.schemers.org/srfi-64/testing.scm">testing.scm</a></p>
-
-<h2>Examples</h2>
-<p>Here is <a href="http://srfi.schemers.org/srfi-64/srfi-25-test.scm"><code>srfi-25-test.scm</code></a>,
-based converted from Jussi Piitulainen's
-<a href="http://srfi.schemers.org/srfi-25/test.scm"><code>test.scm</code></a>
-for <a href="http://srfi.schemers.org/srfi-25/srfi-25.html">SRFI-25</a>.</p>
-
-<h2>Test suite</h2>
-<p>
-Of course we need a test suite for the testing framework itself.
-This suite <code><a href="http://srfi.schemers.org/srfi-64/srfi-64-test.scm">srfi-64-test.scm</a></code>
-was contributed by Donovan Kolbly
-<a href="mailto:donovan@rscheme.org"><code>&lt;donovan@rscheme.org&gt;</code></a>.</p>
-
-<h1>Copyright</h1>
-<p>
-Copyright (C) Per Bothner (2005, 2006)</p>
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
-<hr>
-<address>Author: <a href="mailto:per@bothner.com">Per Bothner</a></address>
-<address>Editor: <a href="mailto:srfi%20minus%20editors%20at%20srfi%20dot%20schemers%20dot%20org">Francisco Solsona</a></address>
-<p>
-<!-- Created: Sat Sep  4 12:26:07 PDT 2004 -->
-<!-- hhmts start -->
-Last modified: Sun Jan 28 13:40:18 MET 2007
-<!-- hhmts end -->
-</p>
-  
-</body></html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-66.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-66.html
deleted file mode 100644
index 7d8fcb30b2..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-66.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<body>
-<head>
-<title>SRFI 66: Octet Vectors</title>
-</head>
-
-<body>
-<H1>Title</H1>
-
-Octet Vectors
-
-<H1>Authors</H1>
-
-Michael Sperber
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see
-<A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-To
-provide input on this SRFI, please <CODE>
-<A HREF="mailto:srfi-66@srfi.schemers.org">mailto:srfi-66@srfi.schemers.org</A></CODE>.
-See <A HREF="http://srfi.schemers.org/srfi-list-subscribe.html">instructions
-here</A> to subscribe to the list. You can access previous messages via
-<A HREF="http://srfi.schemers.org/srfi-66/mail-archive/maillist.html">the
-archive of the mailing list</A>.
-<P>
-<UL>
-  <LI>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-66/srfi-66.html?rev=1.3">2005/03/11</a></LI>
-  <LI>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-66/srfi-66.html?rev=1.4">2005/04/18</a></LI>
-  <LI>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-66/srfi-66.html?rev=1.5">2005/06/06</a></LI>
-  <LI>Final: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-66/srfi-66.html?rev=1.6">2005/12/15</a></LI>
-</UL>
-
-<h1>Abstract</h1><p>This SRFI defines a set of procedures for creating, accessing, and manipulating uniform vectors of octets.</p><h1>Rationale</h1><p>A number of applications deal with sequences of octets (often called bytes), most prominently interfaces to C and I/O.  Vectors are typically too space-costly and too slow to work well in these circumstance.  This justifies having a separate type for octet vectors.</p><p>This SRFI is related to <a href="http://srfi.schemers.org/srfi-4/">SRFI 4</a> (Homogeneous numeric vector datatypes), which also provides vectors of octets,  and uses names consistent with it. However, the extension described here does not require any extensions to the syntax of the underlying Scheme system, and provides a slightly richer set of primtives.</p><p>Scheme systems implementing both SRFI 4 and this SRFI should use the same type for <code>u8vector</code> and octet vectors as specified here.</p><h1>Specification</h1><p>Octet vectors are objects of a new type.  This type may or may not be disjoint from the type of regular vectors.  Its elements must be octets, that is, exact integers in the range [0,255].</p><p>As with vectors, the length of a octet vector is the number of elements it contains.  This number is fixed.  A valid index into a octet vector  is an exact, non-negative integer.  The first element of a octet vector  has index 0, the last element has an index one less than the  length of the vector.</p><dl><dt><code>(u8vector? </code><var>obj</var><code>)</code></dt><dd><p>Returns <code>#t</code> if <var>obj</var> is a vector, otherwise returns <code>#f</code>.  Analogous to <code>vector?</code>.</p></dd><dt><code>(make-u8vector </code><var>k</var> <var>fill</var><code>)</code></dt><dd><p>Returns a newly allocated octet vector of <var>k</var> elements.  Each element is initialized to <var>fill</var>.  <var>Fill</var> must be an octet.  Analogous to <code>make-vector</code>.</p></dd><dt><code>(u8vector </code><var>octet</var> ...<code>)</code></dt><dd><p>Returns a newly allocated octet vector  whose elements contain the given arguments, which must all be octets.  Analogous to <code>vector</code>.</p></dd><dt><code>(u8vector-&gt;list </code><var>u8vector</var><code>)</code></dt><dt><code>(list-&gt;u8vector </code><var>octets</var><code>)</code></dt><dd><p><code>u8vector-&gt;list</code>returns a newly allocated list of the elements of <var>u8vector</var> in the same order.Analogous to <code>vector-&gt;list</code>.</p></dd><dd><p><code>List-&gt;u8vector</code> returns a newly allocated octet vector whose elements are the elements of list <var>octets</var>, which must all be octets. Analogous to <code>list-&gt;vector</code>.</p></dd><dt><code>(u8vector-length </code><var>u8vector</var><code>)</code></dt><dd><p>Returns the number of elements in <var>u8vector</var> as an exact integer.  Analogous to <code>vector-length</code>.</p></dd><dt><code>(u8vector-ref </code><var>u8vector</var> <var>k</var><code>)</code></dt><dd><p><var>k</var> must be a valid index of <var>u8vector</var>.  <code>u8vector-ref</code> returns the contents of element <var>k</var> of <var>u8vector</var>.  Analogous to <code>vector-ref</code>.</p></dd><dt><code>(u8vector-set! </code><var>u8vector</var> <var>k</var> <var>octet</var><code>)</code></dt><dd><p><var>k</var> must be a valid index of <var>u8vector</var>.  <code>u8vector-set!</code> stores <var>octet</var> in element <var>k</var> of <var>u8vector</var>.  The number of return values  and the return values are unspecified.  However, the number of return values  is such that it is accepted by a continuation created by <code>begin</code>.  Analogous to <code>vector-set!</code>.</p></dd><dt><code>(u8vector=? </code><var>u8vector-1</var> <var>u8vector-2</var><code>)</code></dt><dd><p>Returns <var>#t</var> if <var>u8vector-1</var> and <var>u8vector-2</var> are equal---that is, if they have the same length and equal elements at all valid indices.</p></dd><dt><code>(u8vector-compare </code><var>u8vector-1</var> <var>u8vector-2</var><code>)</code></dt><dd><p>Compares <var>u8vector-1</var> and <var>u8vector-2</var> and returns a value consistent with the vector ordering specified in <a href="http://srfi.schemers.org/srfi-67/">SRFI 67</a>, i.e. -1 if <var>u8vector-1</var> is smaller than <var>u8vector-2</var>, 0 if they are equal, and 1 if <var>u8vector-1</var> is greater than <var>u8vector-2</var>. Shorter vectors are always smaller than longer ones, and vectors  of equal length are compared lexicographically.</p></dd><dt><code>(u8vector-copy! </code><var>source</var> <var>source-start</var> <var>target</var> <var>target-start</var> <var>n</var><code>)</code></dt><dd><p>Copies data from octet vector <var>source</var> to octet vector <var>target</var>.  <var>Source-start</var>, <var>target-start</var>, and <var>n</var> must be non-negative exact integers that satisfy</p><p>0 &lt;= <var>source-start</var> &lt;= <var>source-start</var> + <var>n</var> &lt;= <code>(u8vector-length <var>source</var>)</code></p><p>0 &lt;= <var>target-start</var> &lt;= <var>target-start</var> + <var>n</var> &lt;= <code>(u8vector-length <var>target</var>)</code></p><p>This copies the octets from <var>source</var> at indices [<var>source-start</var>, <var>source-start</var> + <var>n</var>) to consecutive indices in <var>target</var> starting at <var>target-index</var>.</p><p>This must work even if the memory regions for the source and the target overlap, i.e., the octets at the target location after the copy must be equal to the octets at the source location before the copy.</p><p>The number of return values  and the return values are unspecified.  However, the number of return values  is such that it is accepted by a continuation created by <code>begin</code>.  Analogous to <code>vector-ref</code>.</p></dd><dt><code>(u8vector-copy </code><var>u8vector</var><code>)</code></dt><dd><p>Returns a newly allocated copy of octet vector <var>u8vector</var>.</p></dd></dl><h1>Reference Implementation</h1><p>This reference implementation makes use of <a href="http://srfi.schemers.org/srfi-9/">SRFI 9</a> (Defining Record Types) and <a href="http://srfi.schemers.org/srfi-23/">SRFI 23</a> (Error reporting mechanism) .</p><pre>(define-record-type :u8vector
-  (really-make-u8vector elements)
-  u8vector?
-  (elements u8vector-elements))
-
-(define (ensure-octet thing)
-  (if (not (and (integer? thing)
-		(exact? thing)
-		(&gt;= thing 0)
-		(&lt;= thing 255)))
-      (error &quot;not a octet&quot; thing)))
-
-(define (make-u8vector k fill)
-  (ensure-octet fill)
-  (really-make-u8vector (make-vector k fill)))
-
-(define (list-&gt;u8vector octets)
-  (for-each ensure-octet octets)
-  (really-make-u8vector (apply vector octets)))
-
-(define (u8vector-&gt;list octets)
-  (vector-&gt;list (u8vector-elements octets)))
-  
-(define (u8vector . octets)
-  (list-&gt;u8vector octets))
-
-(define (u8vector-length u8vector)
-  (vector-length (u8vector-elements u8vector)))
-
-(define (u8vector-ref u8vector k)
-  (vector-ref (u8vector-elements u8vector) k))
-
-(define (u8vector-set! u8vector k octet)
-  (ensure-octet octet)
-  (vector-set! (u8vector-elements u8vector) k octet))
-
-(define (u8vector-copy! source source-start target target-start count)
-  (if (&gt;= source-start target-start)
-      (do ((i 0 (+ i 1)))
-	  ((= i count))
-        (u8vector-set! target
-                          (+ target-start i) 
-                          (u8vector-ref source (+ source-start i))))
-      (do ((i (- count 1) (- i 1)))
-	  ((= i -1))
-        (u8vector-set! target
-                          (+ target-start i) 
-                          (u8vector-ref source (+ source-start i))))))
-
-(define (u8vector-copy u8vector)
-  (let* ((size (u8vector-length u8vector))
-	 (copy (make-u8vector size 0)))
-    (u8vector-copy! u8vector 0 copy 0 size)
-    copy))
-
-(define (u8vector=? u8vector-1 u8vector-2)
-  (let ((size (u8vector-length u8vector-1)))
-    (and (= size (u8vector-length u8vector-2))
-	 (let loop ((i 0))
-	   (or (&gt;= i size)
-	       (and (= (u8vector-ref u8vector-1)
-		       (u8vector-ref u8vector-2))
-		    (loop (+ 1 i))))))))
-
-(define (u8vector-compare u8vector-1 u8vector-2)
-  (let ((length-1 (u8vector-length u8vector-1))
-        (length-2 (u8vector-length u8vector-2)))
-    (cond
-      ((&lt; length-1 length-2) -1)
-      ((&gt; length-1 length-2)  1)
-      (else
-       (let loop ((i 0))
-         (if (= i length-1)
-             0
-             (let ((elt-1 (u8vector-ref u8vector-1 i))
-                   (elt-2 (u8vector-ref u8vector-2 i)))
-               (cond ((&lt; elt-1 elt-2) -1)
-                     ((&gt; elt-1 elt-2)  1)
-                     (else (loop (+ i 1)))))))))))
-</pre><h1>References</h1><ul><li><a href="http://srfi.schemers.org/srfi-4/">SRFI 4</a> (Homogeneous numeric vector datatypes)</li><li>The &quot;Byte Vectors&quot; section of <i>The Incomplete Scheme 48 Reference Manual</i> available from <a href="http://www.s48.org/">this page</a>.</li></ul></body><H1>Copyright</H1>
-Copyright (C) Michael Sperber (2005). All Rights Reserved. 
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-<p>
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">David Van Horn</a></address>
-</body></html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-1.png b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-1.png
deleted file mode 100644
index 995a933ee7..0000000000
Binary files a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-1.png and /dev/null differ
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-2.png b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-2.png
deleted file mode 100644
index e47ce920a8..0000000000
Binary files a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-2.png and /dev/null differ
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-3.png b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-3.png
deleted file mode 100644
index 976e557148..0000000000
Binary files a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-3.png and /dev/null differ
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-4.png b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-4.png
deleted file mode 100644
index c969404298..0000000000
Binary files a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-4.png and /dev/null differ
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-5.png b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-5.png
deleted file mode 100644
index dcff4994dd..0000000000
Binary files a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-5.png and /dev/null differ
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-6.png b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-6.png
deleted file mode 100644
index dea1599951..0000000000
Binary files a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-6.png and /dev/null differ
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-7.png b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-7.png
deleted file mode 100644
index c290afe54c..0000000000
Binary files a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-7.png and /dev/null differ
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-8.png b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-8.png
deleted file mode 100644
index 09f496fda0..0000000000
Binary files a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-G-D-8.png and /dev/null differ
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-S.css b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-S.css
deleted file mode 100644
index 7c68002983..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67-Z-S.css
+++ /dev/null
@@ -1,191 +0,0 @@
-
-               body {
-               color: black;
-               /*   background-color: #e5e5e5;*/
-               background-color: #ffffff;
-               /*background-color: beige;*/
-               margin-top: 2em;
-               margin-left: 8%;
-               margin-right: 8%;
-               }
-
-               h1,h2,h3,h4,h5,h6 {
-               margin-top: .5em;
-               }
-
-               .title {
-               font-size: 200%;
-               font-weight: normal;
-               }
-
-               .partheading {
-               font-size: 100%;
-               }
-
-               .chapterheading {
-               font-size: 100%;
-               }
-
-               .beginsection {
-               font-size: 110%;
-               }
-
-               .tiny {
-               font-size: 40%;
-               }
-
-               .scriptsize {
-               font-size: 60%;
-               }
-
-               .footnotesize {
-               font-size: 75%;
-               }
-
-               .small {
-               font-size: 90%;
-               }
-
-               .normalsize {
-               font-size: 100%;
-               }
-
-               .large {
-               font-size: 120%;
-               }
-
-               .largecap {
-               font-size: 150%;
-               }
-
-               .largeup {
-               font-size: 200%;
-               }
-
-               .huge {
-               font-size: 300%;
-               }
-
-               .hugecap {
-               font-size: 350%;
-               }
-
-               pre {
-               margin-left: 2em;
-               }
-
-               blockquote {
-               margin-left: 2em;
-               }
-
-               ol {
-               list-style-type: decimal;
-               }
-
-               ol ol {
-               list-style-type: lower-alpha;
-               }
-
-               ol ol ol {
-               list-style-type: lower-roman;
-               }
-
-               ol ol ol ol {
-               list-style-type: upper-alpha;
-               }
-
-               /*
-               .verbatim {
-               color: #4d0000;
-               }
-               */
-
-               tt i {
-               font-family: serif;
-               }
-
-               .verbatim em {
-               font-family: serif;
-               }
-
-               .scheme em {
-               font-family: serif;
-               color: black;
-               }
-
-               .scheme {
-               color: brown;
-               }
-
-               .scheme .keyword {
-               color: #990000;
-               font-weight: bold;
-               }
-
-               .scheme .builtin {
-               color: #990000;
-               }
-
-               .scheme .variable {
-               color: navy;
-               }
-
-               .scheme .global {
-               color: purple;
-               }
-
-               .scheme .selfeval {
-               color: green;
-               }
-
-               .scheme .comment {
-               color:  teal;
-               }
-
-               .schemeresponse {
-               color: green;
-               }
-
-               .navigation {
-               color: red;
-               text-align: right;
-               font-size: medium;
-               font-style: italic;
-               }
-
-               .disable {
-               /* color: #e5e5e5; */
-               color: gray;
-               }
-
-               .smallcaps {
-               font-size: 75%;
-               }
-
-               .smallprint {
-               color: gray;
-               font-size: 75%;
-               text-align: right;
-               }
-
-               /*
-               .smallprint hr {
-               text-align: left;
-               width: 40%;
-               }
-               */
-
-               .footnoterule {
-               text-align: left;
-               width: 40%;
-               }
-
-               .colophon {
-               color: gray;
-               font-size: 80%;
-               text-align: right;
-               }
-
-               .colophon a {
-               color: gray;
-               }
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67.html
deleted file mode 100644
index a41875d7a2..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-67/srfi-67.html
+++ /dev/null
@@ -1,2240 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-
-Generated from srfi-67.tex by tex2page, v 2004-09-11
-(running on MzScheme 299.200, unix), 
-(c) Dorai Sitaram, 
-http://www.ccs.neu.edu/~dorai/tex2page/tex2page-doc.html
-
--->
-<head>
-<title>
-SRFI 67: Compare Procedures
-</title>
-<link rel="stylesheet" type="text/css" href="srfi-67-Z-S.css" title=default>
-<meta name=robots content="index,follow">
-</head>
-<body>
-<div align=right class=navigation><i>[Go to <a href="srfi-67.html#node_index_start">index</a></span>]</i></div><p></p>
-
-
-<h1 class=title align=center><br><br>SRFI 67: Compare Procedures</h1>
-<p></p>
-<div align=center>
-
-<br>
-<table>
-<tr align="center">
-  <td>Sebastian Egner</td>
-  <td>&nbsp;&nbsp;</td>
-  <td>Jens Axel S&oslash;gaard</td>
-</tr>
-<tr>
-  <td> <a href="mailto:sebastian.egner-at-philips.com">sebastian.egner-at-philips.com</a> </td>
-  <td>&nbsp;&nbsp;</td>
-  <td><a href="mailto:jensaxel-at-soegaard.net">jensaxel-at-soegaard.net</a> </td>
-</tr>
-</table>
-<p>
-Other formats are available at srfi.schemers.org:
-<ul>
-<li><a href="http://srfi.schemers.org/srfi-67/srfi-67.ps">The SRFI 67 Document (Postscript)</a></li>
-<li><a href="http://srfi.schemers.org/srfi-67/srfi-67.pdf">The SRFI 67 Document (PDF)</a></li>
-<li><a href="http://srfi.schemers.org/srfi-67/srfi-67.dvi">The SRFI 67 Document (TeX-DVI)</a></li>
-</ul>
-&nbsp;<br>
-<p>December 3, 2005</p>
-</div>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
- </p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<p>                    </p>
-<a name="node_sec_Temp_1"></a>
-<h1><a href="#node_toc_node_sec_Temp_1">Contents</a></h1>
-<p><a name="node_toc_start"></a></p>
-<p><b>
-&nbsp; &nbsp; <a name="node_toc_node_sec_1"></a><a href="#node_sec_1">1&nbsp;&nbsp;Abstract and Rationale</a></b><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="node_toc_node_sec_2"></a><a href="#node_sec_2">2&nbsp;&nbsp;Introduction</a></b><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="node_toc_node_sec_3"></a><a href="#node_sec_3">3&nbsp;&nbsp;Terminology and Conventions</a></b><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="node_toc_node_sec_4"></a><a href="#node_sec_4">4&nbsp;&nbsp;Specification</a></b><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.1"></a><a href="#node_sec_4.1">4.1&nbsp;&nbsp;Comparing atoms</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.2"></a><a href="#node_sec_4.2">4.2&nbsp;&nbsp;Comparing lists and vectors</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.3"></a><a href="#node_sec_4.3">4.3&nbsp;&nbsp;Comparing pairs and improper lists</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.4"></a><a href="#node_sec_4.4">4.4&nbsp;&nbsp;The default compare procedure</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.5"></a><a href="#node_sec_4.5">4.5&nbsp;&nbsp;Constructing compare procedures</a><br>
-&nbsp; &nbsp; &nbsp; &nbsp; <a name="node_toc_node_sec_4.6"></a><a href="#node_sec_4.6">4.6&nbsp;&nbsp;Using compare procedures</a><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="node_toc_node_sec_5"></a><a href="#node_sec_5">5&nbsp;&nbsp;The theory of compare functions</a></b><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="node_toc_node_sec_6"></a><a href="#node_sec_6">6&nbsp;&nbsp;Design Rationale</a></b><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="node_toc_node_sec_7"></a><a href="#node_sec_7">7&nbsp;&nbsp;Related work</a></b><br>
-</p>
-<p><b>
-&nbsp; &nbsp; <a name="node_toc_node_sec_8"></a><a href="#node_sec_8">8&nbsp;&nbsp;Reference implementation</a></b><br>
-</p>
-<p>
-</p>
-<p>
-Copyright (c) 2005 Sebastian Egner and Jens Axel S&oslash;gaard.</p>
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-``Software''), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.</p>
-<p>
-THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-</p>
-<p>
-</p>
-<p>
-</p>
-<a name="node_sec_1"></a>
-<h1><a href="#node_toc_node_sec_1">1&nbsp;&nbsp;Abstract and Rationale</a></h1>
-<p>This SRFI can be seen as an extension of the standard procedures
-<tt>=</tt>, <tt>&lt;</tt>, <tt>char&lt;?</tt> etc. of 
-R<sup>5</sup>RS  -- or even as a replacement.
-The primary design aspect in this SRFI is the separation of
-<em>representing</em> a total order and <em>using it.</em>
-For representing the order, we have chosen for truly 3-way
-comparisons. 
-For using it we provide an extensive set of
-operations, each of which accepts a procedure used for comparison.
-Since these compare procedures are often optional,
-comparing built-in types is as convenient as 
-R<sup>5</sup>RS ,
-sometimes more convenient: 
-For example, testing if the integer index <em>i</em> lies in the
-integer range {0, <tt>...</tt>, <em>n</em> <tt>-</tt> 1} can be written as
-<tt>(&lt;=/&lt;? 0 i n)</tt>, implicitly invoking <tt>default-compare</tt>.</p>
-<p>
-As soon as new total orders are required,
-the infrastructure provided by this SRFI is far more
-convenient and often even more efficient than building
-each total order from scratch.</p>
-<p>
-Moreover, in case Scheme users and implementors find this
-mechanism useful and adopt it,
-the benefit of having a uniform interface to total orders
-to be used in data structures will manifest itself.
-Most concretely, a new sorting procedure in the spirit of
-this SRFI would have the interface
-<tt>(my-sort [ <i>compare</i> ] <i>xs</i>)</tt>,
-using <tt>default-compare</tt> if the optional <i>compare</i>
-was not provided.
-Then <tt>my-sort</tt> could be defined using the entire
-infrastructure of this SRFI: 
-Efficient 2- and 3-way branching,
-testing for chains and pairwise inequality,
-min/max, and general order statistics.</p>
-<p>
-</p>
-<a name="node_sec_2"></a>
-<h1><a href="#node_toc_node_sec_2">2&nbsp;&nbsp;Introduction</a></h1>
-<p>This SRFI defines a mechanism for comparing Scheme values
-with respect to a total order (aka linear order) [<a href="#node_bib_1">1</a>].
-The mechanism provides operations for:
-</p>
-<ol>
-<li><p>comparing objects of the built-in types,
-</p>
-<li><p>using a total order in situations that arise in programs,
-</p>
-<li><p>facilitating the definition of a new total order.
-</p>
-</ol><p>
-In the following, these aspects will briefly be illustrated.</p>
-<p>
-Traditionally, a total order is represented in Scheme by an
-order predicate, like <tt>&lt;</tt> or <tt>char&lt;?</tt>.
-For the purpose of this SRFI, however, a total order is 
-represented by a Scheme-procedure comparing its two arguments 
-and returning either <tt>-1</tt>, <tt>0</tt>, or <tt>1</tt> depending
-on whether the first argument is considered smaller, equal, 
-or greater than the second argument respectively.
-Examples of such compare procedures include
-<tt>(lambda (x y) (sign (- x y)))</tt> for comparing real numbers,
-but also <tt>(lambda (x y) 0)</tt> comparing anything.
-For most built-in types specified in the 
-Revised<sup>5</sup> Report on the Algorithmic Language Scheme
-(
-R<sup>5</sup>RS , [<a href="#node_bib_3">3</a>]) compare procedures are specified in
-Sections&nbsp;<a href="#node_sec_4.1">4.1</a>, <a href="#node_sec_4.2">4.2</a>, and <a href="#node_sec_4.3">4.3</a> of this SRFI.
-An axiomatic definition of ``compare procedure''
-is given in Section&nbsp;<a href="#node_sec_5">5</a>.</p>
-<p>
-The primary reason for using 3-valued compare procedures
-instead of (2-valued) order predicates is efficiency:
-When comparison is computationally expensive,
-it is wasteful if <em>two</em> predicates are evaluated
-where a single 3-valued comparison would suffice.
-This point is discussed in greater detail in Section&nbsp;<a href="#node_sec_6">6</a>.</p>
-<p>
-But dealing directly with 3-valued comparisons in
-the application program is inconvenient and obscures intention:
-For testing <tt>x</tt> &lt; <tt>y</tt> one would have 
-to write <tt>(eqv? (compare x y) -1)</tt>.
-For this reason, an operation <tt>&lt;?</tt> is supplied which allows
-to phrase the same test as <tt>(&lt;? compare x y)</tt>.
-This is an example of mapping the three possible outcomes of
-a comparison into the two boolean values {<tt>#<em>f</em></tt>, <tt>#<em>t</em></tt>}.
-Since <tt>&lt;?</tt> takes the total order as an explicit parameter,
-a comfortably large arsenal of tests can be made available
-for each and every total order (Section&nbsp;<a href="#node_sec_4.6">4.6</a>).
-This deviates from the approach of 
-R<sup>5</sup>RS , in which there are
-only five operations ( = , &lt;, &gt;, <u>&lt;</u>, <u>&gt;</u>) -- and for each
-total order (<tt>real</tt>/<tt>number</tt>, <tt>char</tt>, <tt>char-ci</tt>, <tt>string</tt>,
-<tt>string-ci</tt>) a complete set of these five operation is provided.</p>
-<p>
-But still, using <tt>&lt;?</tt> would be inconvenient if the compare
-procedure would have to be supplied explicitly every time.
-For this reason, the parameter <tt>compare</tt> is often made
-optional in this SRFI -- and the procedure <tt>default-compare</tt> is
-used whenever no compare procedure is passed explicitly.
-<tt>Default-compare</tt> (Section&nbsp;<a href="#node_sec_4.4">4.4</a>) defines
-<em>some</em> resonable total order on the built-in types of 
-R<sup>5</sup>RS .</p>
-<p>
-For the third aspect of this SRFI, defining compare procedures,
-special control structures (macros) are 
-provided (Section&nbsp;<a href="#node_sec_4.5">4.5</a>).
-These control structures can be used in the definition of
-a (potentially recursive) compare procedure.
-This is best explained by an extended example.</p>
-<p>
-</p>
-<a name="node_sec_Temp_2"></a>
-<h4><a href="#node_toc_node_sec_Temp_2">Example</a></h4>
-<p>Assume there is a type <tt>length</tt> representing physical length.
-The type has an accessor procedure <tt>meters</tt> returning the length
-in meters (a real number).
-A compare procedure for lengths can then be defined in terms of
-<tt>real-compare</tt> (Section&nbsp;<a href="#node_sec_4.1">4.1</a>) as:
-</p>
-<tt>&nbsp;&nbsp;(define&nbsp;(length-compare&nbsp;length1&nbsp;length2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(real-compare&nbsp;(meters&nbsp;length1)&nbsp;(meters&nbsp;length2)))<br>
-</tt><p>
-Now, <tt>(&lt;? length-compare x y)</tt> tests if 
-length <tt>x</tt> is shorter than length <tt>y</tt>.
-Also, <tt>(&lt;=/&lt;? length-compare a x b)</tt> tests 
-if length <tt>x</tt> lies between length <tt>a</tt> (incl.) and 
-length <tt>b</tt> (excl.)
-The expression <tt>(min-compare length-compare x y z)</tt>
-is a shortest of the lengths <tt>x</tt>, <tt>y</tt>, and <tt>z</tt>.
-Likewise, <tt>(chain&lt;? length-compare x1 x2 x3 x4)</tt> test
-if the lengths <tt>x1 x2 x3 x3</tt> are strictly increasing,
-and so on (refer to Section&nbsp;<a href="#node_sec_4.6">4.6</a>).</p>
-<p>
-Furthermore, assume there is another type <tt>box</tt> representing a physical box.
-The type has procedures <tt>width</tt>, <tt>height</tt>, and <tt>depth</tt>
-accessing the dimension (each giving a <tt>length</tt>).
-A compare procedure for boxes, comparing first by width then
-by height and then by depth, can be defined using the control
-structure <tt>refine-compare</tt> (Section&nbsp;<a href="#node_sec_4.5">4.5</a>) as:
-</p>
-<tt>&nbsp;&nbsp;(define&nbsp;(box-compare&nbsp;box1&nbsp;box2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(refine-compare&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(length-compare&nbsp;(width&nbsp;&nbsp;box1)&nbsp;(width&nbsp;&nbsp;box2))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(length-compare&nbsp;(height&nbsp;box1)&nbsp;(height&nbsp;box2))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(length-compare&nbsp;(depth&nbsp;&nbsp;box1)&nbsp;(depth&nbsp;&nbsp;box2))))<br>
-</tt><p>
-This time, <tt>(&lt;? box-compare b1 b2)</tt> tests if box <tt>b1</tt>
-is smaller than box <tt>b2</tt> -- in the sense of the order defined. 
-Of course, all the other tests, minimum, maximum etc. are available, too.</p>
-<p>
-As a final complication, assume that there is also a type <tt>bowl</tt>
-with accessors <tt>radius</tt> (a <tt>length</tt>) and <tt>open?</tt> (a boolean).
-Bowls are to be compared first by whether they are open or closed,
-and then by radius.
-However, bowls and boxes also need to be compared to each other,
-ordered such that a bowl is considered ``smaller'' than a box.
-(There are type-test predicates <tt>box?</tt> and <tt>bowl?</tt>).
-Using the control structure <tt>select-compare</tt>
-(Section&nbsp;<a href="#node_sec_4.5">4.5</a>) this can be expressed as:
-</p>
-<tt>(define&nbsp;(container-compare&nbsp;c1&nbsp;c2)<br>
-&nbsp;&nbsp;(select-compare&nbsp;c1&nbsp;c2<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(bowl?&nbsp;(boolean-compare&nbsp;(open?&nbsp;&nbsp;c1)&nbsp;(open?&nbsp;&nbsp;c2))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(length-compare&nbsp;&nbsp;(radius&nbsp;c1)&nbsp;(radius&nbsp;c2)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(box?&nbsp;&nbsp;(box-compare&nbsp;c1&nbsp;c2))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;&quot;neither&nbsp;bowls&nbsp;nor&nbsp;boxes&quot;&nbsp;c1&nbsp;c2)))<br>
-</tt><p>
-This is an example of ``hierarchical extension'' of compare
-procedures, as explained in Section&nbsp;<a href="#node_sec_5">5</a>.
-Also note the implicit use of <tt>refine-compare</tt> in
-the <tt>bowl?</tt>-case.</p>
-<p>
-The preceding example illustrates the main functionality of this SRFI.
-For other examples, refer to Section&nbsp;<a href="#node_sec_4.4">4.4</a>,
-and to the file <tt>examples.scm</tt> included in the reference
-implementation.</p>
-<p>
-</p>
-<a name="node_sec_3"></a>
-<h1><a href="#node_toc_node_sec_3">3&nbsp;&nbsp;Terminology and Conventions</a></h1>
-<p>A <em>compare procedure</em> is a Scheme-procedure of two
-arguments returning an exact integer in { <tt>-</tt> 1,0,1}
-such that the valid input values are ordered according
-to some total order.
-A compare procedure, together with a set of Scheme values
-to which it is applicable, represents a compare function
-as defined in Section&nbsp;<a href="#node_sec_5">5</a>.</p>
-<p>
-A <em>comparison</em> is either an expression applying
-a compare procedure to two values, or the result of such
-an expression.</p>
-<p>
-Each operation (macro or procedure) processing the value of 
-a comparison checks if the value is indeed an exact integer 
-in the set { <tt>-</tt> 1,0,1}.
-If this is not the case, an error is signalled.</p>
-<p>
-Compare procedures expecting certain types of argument
-should raise an error in case the arguments are not
-of this type.
-For most compare procedures specified in this SRFI,
-this behavior is required.
-A compare procedure <i>compare</i> can be used for 
-type-checking value <i>x</i> by evaluating
-<tt>(<i>compare</i> <i>x</i> <i>x</i>)</tt>,
-in case that is desired.
-This is useful in procedures like <tt>chain&lt;?</tt> which
-guarantee to check each argument unconditionally.</p>
-<p>
-</p>
-<p>
-</p>
-<a name="node_sec_4"></a>
-<h1><a href="#node_toc_node_sec_4">4&nbsp;&nbsp;Specification</a></h1>
-<p></p>
-<a name="node_sec_4.1"></a>
-<h2><a href="#node_toc_node_sec_4.1">4.1&nbsp;&nbsp;Comparing atoms</a></h2>
-<p></p>
-<p>
-In this section, compare procedures for most of the atomic
-types of 
-R<sup>5</sup>RS  are defined: 
-Booleans, characters, strings, symbols, and numbers.</p>
-<p>
-As a general naming convention, a procedure named
-</p>
-<div align=center><table><tr><td>
-
-<em>type</em><tt>-compare-</tt><em>order</em>
-</td></tr></table></div>
-<p>
-compares two object of the type <em>type</em> with
-respect to a total order for which <em>order</em> is
-a mnemonic hint (e.g. <tt>-ci</tt> for case-insensitive).
-Of course, <tt>-</tt><em>order</em> may be absent if there is
-just one order or the order is obvious.
-It is an error if a compare procedure accepting objects of a
-certain type is called with one or two arguments not of that type.</p>
-<p>
-</p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_2"></a>boolean-compare<i> <i>bool<sub>1</sub></i> <i>bool<sub>2</sub></i></i>)</tt>&nbsp;</div>
-Compares two booleans, ordered by <tt>#f</tt> &lt; <tt>#t</tt>.
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-A non-<tt>#f</tt> value is <em>not</em> interpreted as a ``true value,''
-but rather an error will be signalled.
-</blockquote><br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_4"></a>char-compare<i>    <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_6"></a>char-compare-ci<i> <i>char<sub>1</sub></i> <i>char<sub>2</sub></i></i>)</tt>&nbsp;</div>
-Compare characters as <tt>char&lt;=?</tt> and <tt>char-ci&lt;=?</tt> respectively.
-The suffix <tt>-ci</tt> means ``case insensitive.''
-<br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_8"></a>string-compare<i>    <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_10"></a>string-compare-ci<i> <i>string<sub>1</sub></i> <i>string<sub>2</sub></i></i>)</tt>&nbsp;</div>
-Compare strings as <tt>string&lt;=</tt> and <tt>string-ci&lt;=?</tt>.
-The suffix <tt>-ci</tt> means ``case insensitive.''
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-<tt>Compare-string</tt> could be defined as<p>
-</p>
-<tt>&nbsp;&nbsp;(define&nbsp;(string-compare&nbsp;string1&nbsp;string2)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(vector-compare-as-list&nbsp;char-compare&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;string1&nbsp;string2<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;string-length&nbsp;string-ref))<br>
-</tt>
-</blockquote><br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_12"></a>symbol-compare<i> <i>symbol<sub>1</sub></i> <i>symbol<sub>2</sub></i></i>)</tt>&nbsp;</div>
-Compares symbols as <tt>string&lt;=</tt> on the names returned by <tt>symbol-&gt;string</tt>.<br>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_14"></a>integer-compare<i>  <i>x</i> <i>y</i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_16"></a>rational-compare<i> <i>x</i> <i>y</i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_18"></a>real-compare<i>     <i>x</i> <i>y</i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_20"></a>complex-compare<i>  <i>x</i> <i>y</i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_22"></a>number-compare<i>   <i>x</i> <i>y</i></i>)</tt>&nbsp;</div>
-Compare two numbers.
-It is an error if an argument is not of the type specified
-by the name of the procedure.<p>
-Complex numbers are ordered lexicographically on pairs (<em>r</em><em>e</em>, <em>i</em><em>m</em>).
-For objects representing real numbers sign(<em>x</em>  <tt>-</tt>  <em>y</em>) is computed.
-The ordering for values satisfying <tt>real?</tt> or <tt>complex?</tt>
-but not representing a real or complex number should be consistent with
-procedures <tt>=</tt> and <tt>&lt;</tt> of 
-R<sup>5</sup>RS ,
-and apart from that it is unspecified.</p>
-<p>
-Numerical compare procedures are compatible with the 
-R<sup>5</sup>RS 
-numerical tower in the following sense:
-If <em>S</em> is a subtype of the numerical type <em>T</em>
-and <em>x</em>, <em>y</em> can be represented both in <em>S</em> and in <em>T</em>,
-then <tt>compare-</tt><em>S</em> and <tt>compare-</tt><em>T</em> compute the same result.
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-Floating point formats usually include several symbolic values not
-simply representing rational numbers.
-For example, the IEEE 754 standard defines -0, -Inf, +Inf,
-and NaN (&quot;not a number&quot;) for continuing a calculation in the presence
-of error conditions.
-The behavior of the numerical comparison operation is unspecified
-in case an argument is one of the special symbols.
-</blockquote><em>Warning:</em> 
-The propagation of inexactness can lead to surprises.
-In a Scheme system propagating inexactness in
-complex numbers (such as PLT, version 208):<p>
-</p>
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(complex-compare&nbsp;(make-rectangular&nbsp;(/&nbsp;1&nbsp;3)&nbsp;&nbsp;1.)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(make-rectangular&nbsp;(/&nbsp;1&nbsp;3)&nbsp;-1))&nbsp;<br>
-&nbsp;&nbsp;===&gt;&nbsp;-1<br>
-</tt>At first glance, one might expect the first complex number to be
-larger, because the numbers are equal on their real parts and the
-first imaginary part (<tt>1.</tt>) is larger than the second (<tt>-1</tt>).
-Closer inspection reveals that the decimal dot causes the first
-real part to be made inexact upon construction of the complex number,
-and since <tt>(exact-&gt;inexact (/ 1 3))</tt> is less than <tt>(/ 1 3)</tt>
-in the underlying floating point format used,
-the real parts decide the comparison of the complex numbers.
-
-<br>
- 
-<a name="node_sec_4.2"></a>
-<h2><a href="#node_toc_node_sec_4.2">4.2&nbsp;&nbsp;Comparing lists and vectors</a></h2>
-<p></p>
-<p>
-In this section compare procedures are defined for Scheme
-lists and vectors -- and for objects that can be accessed
-like lists or like vectors.</p>
-<p>
-An object <em>x</em> can be <em>accessed like a vector</em> if
-there are procedures <tt>size</tt> and <tt>ref</tt> such that
-<tt>(size <em>x</em>)</tt> is a non-negative integer <em>n</em> 
-indicating the number of elements, and <tt>(ref <em>x</em> <em>i</em>)</tt>
-is the <em>i</em>-th element of <em>x</em> for <em>i</em> <img src="srfi-67-Z-G-D-4.png" border="0" alt="[srfi-67-Z-G-D-4.png]"> {0, <tt>...</tt>, <em>n</em> <tt>-</tt> 1}.
-The default vector access procedures are <tt>vector-length</tt>
-and <tt>vector-ref</tt>.</p>
-<p>
-An object <em>x</em> can be <em>accessed like a (proper) list</em>
-if there are procedures <tt>empty?</tt>, <tt>head</tt>, and <tt>tail</tt>
-such that <tt>(empty? <em>x</em>)</tt> is a boolean indicating that
-there are no elements in <em>x</em>, <tt>(head <em>x</em>)</tt> is the
-first element of <em>x</em>, and <tt>(tail <em>x</em>)</tt> is an object
-representing the residual elements of <em>x</em>.
-The default list access procedures are <tt>null?</tt>,
-<tt>car</tt>, and <tt>cdr</tt>.</p>
-<p>
-Independent of the way the elements are accessed,
-the natural ordering of vectors and lists differs:
-Sequences are <em>compared as vectors</em> if
-shorter sequences are smaller than longer sequences,
-and sequences of the same size are compared lexicographically.
-Sequences are <em>compared as lists</em> if the empty
-sequence is smallest, and two non-empty sequences are
-compared by their first elements, and only if the first
-elements are equal the residual sequences are compared, 
-recursively.
-</p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_24"></a>vector-compare<i> [ <i>compare</i> ] <i>x</i> <i>y</i> [ <i>size</i> <i>ref</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_26"></a>vector-compare-as-list<i> [ <i>compare</i> ] <i>x</i> <i>y</i> [ <i>size</i> <i>ref</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_28"></a>list-compare<i> [ <i>compare</i> ] <i>x</i> <i>y</i> [ <i>empty?</i> <i>head</i> <i>tail</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_30"></a>list-compare-as-vector<i> [ <i>compare</i> ] <i>x</i> <i>y</i> [ <i>empty?</i> <i>head</i> <i>tail</i> ]</i>)</tt>&nbsp;</div>
-
-Compare two sequences <i>x</i> and <i>y</i>,
-using <i>compare</i> for comparing elements.
-The result is an exact integer in { <tt>-</tt> 1, 0, 1}.
-If <i>compare</i> is not supplied, <tt>default-compare</tt> is used.<p>
-The procedure named <em>access</em><tt>-compare-as-</tt><em>order</em>
-accesses the objects like <em>access</em> and compares them with
-respect to the order given by <em>order</em>.
-The names <em>type</em><tt>-compare</tt> are abbreviations for
-<em>type</em><tt>-compare-as-</tt><em>type</em>.</p>
-<p>
-Examples:</p>
-<p>
-</p>
-<tt>&nbsp;&nbsp;(list-compare&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'(2)&nbsp;'(1&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1<br>
-&nbsp;&nbsp;(list-compare-as-vector&nbsp;'(2)&nbsp;'(1&nbsp;2))&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;-1<br>
-&nbsp;&nbsp;(vector-compare&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'#(2)&nbsp;'#(1&nbsp;2))&nbsp;&nbsp;===&gt;&nbsp;-1<br>
-&nbsp;&nbsp;(vector-compare-as-list&nbsp;'#(2)&nbsp;'#(1&nbsp;2))&nbsp;&nbsp;===&gt;&nbsp;&nbsp;1<br>
-</tt>
-<br>
-<p>
-</p>
-<a name="node_sec_4.3"></a>
-<h2><a href="#node_toc_node_sec_4.3">4.3&nbsp;&nbsp;Comparing pairs and improper lists</a></h2>
-<p></p>
-<p>
-In this section, compare procedures for Scheme
-pairs and (possibly) improper lists are defined.</p>
-<p>
-</p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_32"></a>pair-compare-car<i> <i>compare</i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_34"></a>pair-compare-cdr<i> <i>compare</i></i>)</tt>&nbsp;</div>
-Construct a compare procedure on pairs which only uses
-the car (only the cdr, respectively), and ignores the other.
-One could define<p>
-</p>
-<tt>&nbsp;&nbsp;(define&nbsp;(pair-compare-car&nbsp;compare)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;y)&nbsp;(compare&nbsp;(car&nbsp;x)&nbsp;(car&nbsp;y))))<br>
-</tt>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-<tt>Pair-compare-car</tt> can be used to turn a search data 
-structure (e.g. a heap) into a dictionary:
-Store <tt>(key . value)</tt> pairs and compare them using the
-compare procedure <tt>(pair-compare-car compare-key)</tt>.
-</blockquote><br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_36"></a>pair-compare<i> <i>compare-car</i> <i>compare-cdr</i> <i>pair<sub>1</sub></i> <i>pair<sub>2</sub></i></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_38"></a>pair-compare<i> [ <i>compare</i> ] <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i></i>)</tt>&nbsp;</div>
-Compares two pairs, or (possibly improper) lists.<p>
-The 4-ary form compares two pairs <i>pair<sub>1</sub></i> <i>pair<sub>2</sub></i>
-by comparing their cars using <i>compare-car</i>, 
-and if the cars are equal the cdrs are compared
-using <i>compare-cdr</i>.</p>
-<p>
-The 3-ary form compares two objects by type using the ordering
-of types
-</p>
-<div align=center><table><tr><td>
-
-<i>null</i> &lt; <i>pair</i> &lt; <i>neither-null-nor-pair</i>.
-</td></tr></table></div>
-<p>
-Two objects of type <i>neither-null-nor-pair</i> are compared
-using <i>compare</i>. 
-Two pairs are compared by using <i>compare</i> on the cars,
-and if the cars are equal by recursing on the cdrs.</p>
-<p>
-The 2-ary form uses <tt>default-compare</tt> for <i>compare</i>.</p>
-<p>
-</p>
-<tt>&nbsp;&nbsp;&nbsp;(pair-compare&nbsp;'()&nbsp;'foo)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-1<br>
-&nbsp;&nbsp;&nbsp;(pair-compare&nbsp;'()&nbsp;'(1&nbsp;.&nbsp;2)))&nbsp;===&gt;&nbsp;&nbsp;-1<br>
-&nbsp;&nbsp;&nbsp;(pair-compare&nbsp;'(1&nbsp;.&nbsp;2)&nbsp;'foo)&nbsp;===&gt;&nbsp;&nbsp;-1<br>
-&nbsp;&nbsp;&nbsp;(pair-compare&nbsp;3&nbsp;4)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;===&gt;&nbsp;&nbsp;-1<br>
-</tt>
-<br>
-<p>
-</p>
-<a name="node_sec_4.4"></a>
-<h2><a href="#node_toc_node_sec_4.4">4.4&nbsp;&nbsp;The default compare procedure</a></h2>
-<p></p>
-<p>
-It is convenient to have a compare procedure readily available
-for comparing most built-in types.</p>
-<p>
-</p>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_40"></a>default-compare<i> <i>obj<sub>1</sub></i> <i>obj<sub>2</sub></i></i>)</tt>&nbsp;</div>
-compares its arguments by type using the ordering
-<div align=center><table><tr><td>
-
-<i>null</i>    &lt; 
-<i>pair</i>    &lt; 
-<i>boolean</i> &lt; 
-<i>char</i>    &lt; 
-<i>string</i>  &lt; 
-<i>symbol</i>  &lt; 
-<i>number</i>  &lt; 
-<i>vector</i>  &lt; 
-<i>other</i>
-</td></tr></table></div>
-<p>
-Two objects of the same type <em>type</em> are 
-compared as <em>type</em><tt>-compare</tt> would,
-if there is such a procedure.
-The type <i>null</i> consists of the empty list <tt>'()</tt>.
-The effect of comparing two <i>other</i> objects or
-of comparing cyclic structures (made from lists or vectors)
-is unspecified. (Implementations are encouraged to add
-comparisons for other built-in types, e.g. records,
-regexps, etc.)
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-<tt>Default-compare</tt> refines <tt>pair-compare</tt> by splitting
-<i>neither-null-nor-pair</i>.
-</blockquote><blockquote><em>Note:&nbsp;&nbsp;</em>
-<tt>Default-compare</tt> could be defined as follows
-(mind the order of the cases!):<p>
-</p>
-<tt>&nbsp;&nbsp;&nbsp;(define&nbsp;(default-compare&nbsp;x&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(select-compare&nbsp;x&nbsp;y<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(null?&nbsp;&nbsp;&nbsp;&nbsp;0)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(pair?&nbsp;&nbsp;&nbsp;&nbsp;(default-compare&nbsp;(car&nbsp;x)&nbsp;(car&nbsp;y))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(default-compare&nbsp;(cdr&nbsp;x)&nbsp;(cdr&nbsp;y)))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(boolean?&nbsp;(boolean-compare&nbsp;x&nbsp;y))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(char?&nbsp;&nbsp;&nbsp;&nbsp;(char-compare&nbsp;&nbsp;&nbsp;&nbsp;x&nbsp;y))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(string?&nbsp;&nbsp;(string-compare&nbsp;&nbsp;x&nbsp;y))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(symbol?&nbsp;&nbsp;(symbol-compare&nbsp;&nbsp;x&nbsp;y))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(number?&nbsp;&nbsp;(number-compare&nbsp;&nbsp;x&nbsp;y))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(vector?&nbsp;&nbsp;(vector-compare&nbsp;default-compare&nbsp;x&nbsp;y))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(else&nbsp;(error&nbsp;&quot;unrecognized&nbsp;types&quot;&nbsp;x&nbsp;y))))<br>
-</tt></blockquote><br>
-<a name="node_sec_4.5"></a>
-<h2><a href="#node_toc_node_sec_4.5">4.5&nbsp;&nbsp;Constructing compare procedures</a></h2>
-<p></p>
-<p>
-An important goal of this SRFI is to provide a mechanism for defining
-new compare procedures as conveniently as possible.  The syntactic
-extensions defined in this section are the primary utilities for doing
-so.</p>
-<p>
-</p>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_42"></a>refine-compare &lt;c<sub>1</sub>&gt; <tt>...</tt>)</tt>&nbsp;</div>
-
-<em>Syntax: </em>The &lt;c<sub><em>i</em></sub>&gt; are expressions.<p>
-<em>Semantics: </em>The arguments &lt;c<sub>1</sub>&gt; <tt>...</tt>are evaluated from left to
-right until a non-zero value is found (which then is the value)
-or until there are no more arguments to evaluate (in which case
-the value is 0).
-It is allowed that there are no arguments at all.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-This macro is the preferred way to define a compare procedure
-as a refinement (refer to Section&nbsp;<a href="#node_sec_5">5</a>). Example:<p>
-</p>
-<tt>(define&nbsp;(compare-rectangle&nbsp;r&nbsp;s)<br>
-&nbsp;&nbsp;(refine-compare&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(compare-length&nbsp;(width&nbsp;&nbsp;r)&nbsp;(width&nbsp;&nbsp;s))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(compare-length&nbsp;(height&nbsp;r)&nbsp;(height&nbsp;s))))<br>
-</tt></blockquote><br>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_44"></a>select-compare &lt;x<sub>1</sub>&gt; &lt;x<sub>2</sub>&gt;
-&lt;clause<sub>1</sub>&gt; <tt>...</tt>)</tt>&nbsp;</div>
-
-<em>Syntax: </em>Each &lt;clause&gt;, with the possible exception of the last, is of the form
-<tt>(&lt;type?&gt;&nbsp;&lt;c<sub>1</sub>&gt;&nbsp;<tt>...</tt>)</tt>
-where &lt;type?&gt; is an expression evaluating to a predicate procedure, 
-and &lt;c<sub><em>i</em></sub>&gt; are expressions evaluating to an exact integer in { <tt>-</tt> 1,0,1}. 
-The last &lt;clause&gt; may be an ``else clause'',
-which has the form 
-<tt>(else&nbsp;&lt;c<sub>1</sub>&gt;&nbsp;<tt>...</tt>).</tt><p>
-<em>Semantics: </em><tt>Select-compare</tt> is a conditional for defining 
-hierarchical extensions and refinements of compare
-procedures (refer to Section&nbsp;<a href="#node_sec_5">5</a>).
-It compares the values of &lt;x<sub>1</sub>&gt; and &lt;x<sub>2</sub>&gt; by
-trying the type tests in order, and applies an implict
-<tt>refine-compare</tt> on the consequences upon a match.</p>
-<p>
-In more detail, evaluation proceeds as follows:
-First &lt;x<sub>1</sub>&gt; and &lt;x<sub>2</sub>&gt; are evaluated in
-unspecified order, resulting in values <em>x</em><sub>1</sub> and <em>x</em><sub>2</sub>, respectively.
-Then the clauses are evaluated one by one, from left to right.</p>
-<p>
-For clause (&lt;type?&gt; &lt;c<sub>1</sub>&gt; <tt>...</tt>),
-first &lt;type?&gt; is evaluated resulting in a 
-predicate procedure <i>type?</i> and then the
-expressions (<i>type?</i> <em>x</em><sub>1</sub>) and (<i>type?</i> <em>x</em><sub>2</sub>)
-are evaluated and interpreted as booleans.
-If both booleans are true then the overall value is
-<tt>(refine-compare &lt;c<sub>1</sub>&gt; <tt>...</tt>)</tt>.
-If only the first is true the result is -1,
-if only the second is true the result is 1,
-and if neither is true the next clause is considered.
-An <tt>else</tt> clause is treated as if both tests
-where true.
-If there are no clauses left, the result is 0.</p>
-<p>
-<tt>Select-compare</tt> evaluates &lt;x<sub>1</sub>&gt; and &lt;x<sub>2</sub>&gt; 
-exactly once, even in the absence of any clauses. 
-Moreover, each &lt;type?&gt; is evaluated at most once and the 
-resulting procedure <i>type?</i> is called at most twice.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-An example of <tt>select-compare</tt> is the definition
-of <tt>default-compare</tt> given above.
-</blockquote><br>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_46"></a>cond-compare &lt;clause<sub>1</sub>&gt; <tt>...</tt>)</tt>&nbsp;</div>
- <em>Syntax: </em>Each &lt;clause&gt;, with the possible exception of the last, is of the form
-<tt>((&lt;t<sub>1</sub>&gt;&nbsp;&lt;t<sub>2</sub>&gt;)&nbsp;&lt;c<sub>1</sub>&gt;&nbsp;<tt>...</tt>)</tt>
-where &lt;t<sub>1</sub>&gt; and &lt;t<sub>2</sub>&gt; are expressions evaluating to booleans, 
-and &lt;c<sub><em>i</em></sub>&gt; are expressions evaluating to an exact integer in { <tt>-</tt> 1,0,1}. 
-The last &lt;clause&gt; may be an ``else clause'',
-which has the form 
-<tt>(else&nbsp;&lt;c<sub>1</sub>&gt;&nbsp;<tt>...</tt>).</tt><p>
-<em>Semantics: </em><tt>Cond-compare</tt> is another conditional for defining hierarchical
-extensions and refinements of compare procedures 
-(refer to Section&nbsp;<a href="#node_sec_5">5</a>).</p>
-<p>
-Evaluation proceeds as follows:
-The clauses are evaluated one by one, from left to right.
-For clause ((&lt;t<sub>1</sub>&gt; &lt;t<sub>2</sub>&gt;) &lt;c<sub>1</sub>&gt; <tt>...</tt>),
-first &lt;t<sub>1</sub>&gt; and &lt;t<sub>2</sub>&gt; are evaluated and the
-results are interpreted as boolean values.
-If both booleans are true then the overall value is
-<tt>(refine-compare &lt;c<sub>1</sub>&gt; <tt>...</tt>)</tt>.
-If only the first is true the result is -1,
-if only the second is true the result is 1,
-and if neither is true the next clause is considered.
-An <tt>else</tt> clause is treated as if both booleans where true.
-If there are no clauses left (or there are no clauses
-to begin with), the result is 0.</p>
-<p>
-<tt>Cond-compare</tt> evaluates each expression at most once.</p>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-<tt>Cond-compare</tt> and <tt>select-compare</tt> only differ
-in the way the type tests are specified.
-Both ways are equivalent, and each way is sometimes
-more convenient than the other.
-</blockquote><br>
-<a name="node_sec_4.6"></a>
-<h2><a href="#node_toc_node_sec_4.6">4.6&nbsp;&nbsp;Using compare procedures</a></h2>
-<p></p>
-<p>
-The facilities defined in this section provide a mechanism for
-using a compare procedure (passed as a parameter) in the 
-different situations arising in applications.</p>
-<p>
-</p>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_48"></a>if3 &lt;c&gt; &lt;less&gt; &lt;equal&gt; &lt;greater&gt;)</tt>&nbsp;</div>
- <em>Syntax: </em>&lt;c&gt;, &lt;less&gt;, &lt;equal&gt;, and &lt;greater&gt;
-are expressions.  <p>
-<em>Semantics: </em><tt>If3</tt> is the 3-way conditional for comparisons.
-First &lt;c&gt; is evaluated, resulting in value <em>c</em>.
-The value <em>c</em> must be an exact integer in { <tt>-</tt> 1, 0, 1},
-otherwise an error is signalled.
-If <em>c</em>  =   <tt>-</tt> 1 then the value of the <tt>if3</tt>-expression 
-is obtained by evaluating &lt;less&gt;.
-If <em>c</em>  =  0 then &lt;equal&gt; is evaluated.
-If <em>c</em>  =  1 then &lt;greater&gt; is evaluated.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-As an example, the following procedure inserts <tt>x</tt>
-into the sorted list <tt>s</tt>, possibly replacing the
-first equivalent element.<p>
-</p>
-<tt>(define&nbsp;(insert&nbsp;compare&nbsp;x&nbsp;s)<br>
-&nbsp;&nbsp;(if&nbsp;(null?&nbsp;s)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(list&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if3&nbsp;(compare&nbsp;x&nbsp;(car&nbsp;s))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;x&nbsp;s)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;x&nbsp;(cdr&nbsp;s))&nbsp;;&nbsp;replace<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cons&nbsp;(car&nbsp;s)&nbsp;(insert&nbsp;compare&nbsp;x&nbsp;(cdr&nbsp;s))))))<br>
-</tt></blockquote><blockquote><em>Rationale:&nbsp;&nbsp;</em>
-<tt>If3</tt> is the preferred way of branching on the result of 
-a comparison in case all three branches are different.
-</blockquote><br>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_50"></a>if=?     &lt;c&gt; &lt;consequent&gt; [ &lt;alternate&gt; ])</tt>&nbsp;</div>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_52"></a>if&lt;?     &lt;c&gt; &lt;consequent&gt; [ &lt;alternate&gt; ])</tt>&nbsp;</div>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_54"></a>if&gt;?     &lt;c&gt; &lt;consequent&gt; [ &lt;alternate&gt; ])</tt>&nbsp;</div>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_56"></a>if&lt;=?    &lt;c&gt; &lt;consequent&gt; [ &lt;alternate&gt; ])</tt>&nbsp;</div>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_58"></a>if&gt;=?    &lt;c&gt; &lt;consequent&gt; [ &lt;alternate&gt; ])</tt>&nbsp;</div>
-<div align=left><u>syntax:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_60"></a>if-not=? &lt;c&gt; &lt;consequent&gt; [ &lt;alternate&gt; ])</tt>&nbsp;</div>
-<em>Syntax: </em>&lt;c&gt;, &lt;consequent&gt;, and &lt;alternate&gt; are expressions.
-If &lt;alternate&gt; is not provided, <tt>(if #f #f)</tt> is used.<p>
-<em>Semantics: </em>These six macros are 2-way conditionals for comparisons.
-First &lt;c&gt; is evaluated, resulting in value <em>c</em>.
-The value <em>c</em> must be an exact integer in { <tt>-</tt> 1, 0, 1},
-otherwise an error is signalled.
-Then, depending on the value of <em>c</em> and the name of the macro,
-either &lt;consequence&gt; or &lt;alternate&gt; is evaluated,
-and the resulting value is the value of the conditional expression.</p>
-<p>
-The branch is chosen according to the following table:
-</p>
-<div align=center><table><tr><td>
-<table border=1><tr><td valign=top ></td><td valign=top >&lt;consequent&gt; </td><td valign=top >&lt;alternate&gt; </td></tr>
-<tr><td valign=top ><tt>if=?</tt>     </td><td valign=top ><em>c</em>  =  0           </td><td valign=top ><em>c</em> <img src="srfi-67-Z-G-D-4.png" border="0" alt="[srfi-67-Z-G-D-4.png]"> { <tt>-</tt> 1, 1} </td></tr>
-<tr><td valign=top ><tt>if&lt;?</tt>     </td><td valign=top ><em>c</em>  =   <tt>-</tt> 1          </td><td valign=top ><em>c</em> <img src="srfi-67-Z-G-D-4.png" border="0" alt="[srfi-67-Z-G-D-4.png]"> {0, 1}  </td></tr>
-<tr><td valign=top ><tt>if&gt;?</tt>     </td><td valign=top ><em>c</em>  =  1           </td><td valign=top ><em>c</em> <img src="srfi-67-Z-G-D-4.png" border="0" alt="[srfi-67-Z-G-D-4.png]"> { <tt>-</tt> 1, 0} </td></tr>
-<tr><td valign=top ><tt>if&lt;=?</tt>    </td><td valign=top ><em>c</em> <img src="srfi-67-Z-G-D-4.png" border="0" alt="[srfi-67-Z-G-D-4.png]"> { <tt>-</tt> 1, 0} </td><td valign=top ><em>c</em>  =  1           </td></tr>
-<tr><td valign=top ><tt>if&gt;=?</tt>    </td><td valign=top ><em>c</em> <img src="srfi-67-Z-G-D-4.png" border="0" alt="[srfi-67-Z-G-D-4.png]"> {0, 1}  </td><td valign=top ><em>c</em>  =   <tt>-</tt> 1          </td></tr>
-<tr><td valign=top ><tt>if-not=?</tt> </td><td valign=top ><em>c</em> <img src="srfi-67-Z-G-D-4.png" border="0" alt="[srfi-67-Z-G-D-4.png]"> { <tt>-</tt> 1, 1} </td><td valign=top ><em>c</em>  =  0
-</td></tr></table></td></tr></table></div>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The macros <tt>if&lt;=?</tt> etc. are the preferred way of 2-way branching based
-on the result of a comparison.
-</blockquote><br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_62"></a>=?<i>    [ <i>compare</i> ] [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_64"></a>&lt;?<i>    [ <i>compare</i> ] [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_66"></a>&gt;?<i>    [ <i>compare</i> ] [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_68"></a>&lt;=?<i>    [ <i>compare</i> ] [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_70"></a>&gt;=?<i>    [ <i>compare</i> ] [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_72"></a>not=?<i>    [ <i>compare</i> ] [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-If the values <i>x</i> and <i>y</i> are given, test if <i>x</i> and <i>y</i> are in the 
-relation specified by the name of the procedure <i>rel?</i>, with respect to 
-compare procedure <i>compare</i>; otherwise construct a predicate procedure.<p>
-</p>
-<p>
-In the forms <tt>(<i>rel?</i> [ <i>compare</i> ] <i>x</i> <i>y</i>)</tt>,
-the result is a boolean (either <tt>#t</tt> or <tt>#f</tt>)
-depending on <tt>(<i>compare</i> <i>x</i> <i>y</i>)</tt> and
-the test <i>rel?</i> as specified for <tt>if&lt;?</tt> etc.
-If <i>compare</i> is not supplied, <tt>default-compare</tt> is used.</p>
-<p>
-In the form <tt>(<i>rel?</i> [ <i>compare</i> ])</tt>,
-the predicate procedure 
-(lambda (x y) (<i>rel?</i> <i>compare</i> x y)) is constructed.
-Again, if <i>compare</i> is not supplied, <tt>default-compare</tt> is used.</p>
-<p>
-A few examples for illustration
-</p>
-<tt>&nbsp;&nbsp;(&gt;?&nbsp;&quot;laugh&quot;&nbsp;&quot;LOUD&quot;)&nbsp;===&gt;&nbsp;#t<br>
-&nbsp;&nbsp;(&lt;?&nbsp;string-compare-ci&nbsp;&quot;laugh&quot;&nbsp;&quot;LOUD&quot;)&nbsp;===&gt;&nbsp;#t<br>
-&nbsp;&nbsp;(define&nbsp;char&lt;=?&nbsp;(&lt;=?&nbsp;char-compare))<br>
-&nbsp;&nbsp;(sort-by-less&nbsp;'(1&nbsp;a&nbsp;&quot;b&quot;)&nbsp;(&lt;?))&nbsp;===&gt;&nbsp;'(&quot;b&quot;&nbsp;a&nbsp;1)<br>
-&nbsp;&nbsp;(sort-by-less&nbsp;'(1&nbsp;a&nbsp;&quot;b&quot;)&nbsp;(&gt;?))&nbsp;===&gt;&nbsp;'(1&nbsp;a&nbsp;&quot;b&quot;)<br>
-</tt><p>
-</p>
-<em>Warning:</em> 
-A common mistake is writing <tt>(&lt;=? x y z)</tt> 
-where <tt>(&lt;=/&lt;=? x y z)</tt> is meant; 
-this will most likely manifest itself at the time
-the expression <tt>(x y z)</tt> is evaluated.
-<br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_74"></a>&lt;/&lt;?<i>   [ <i>compare</i> ] [ <i>x</i> <i>y</i> <i>z</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_76"></a>&lt;/&lt;=?<i>   [ <i>compare</i> ] [ <i>x</i> <i>y</i> <i>z</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_78"></a>&lt;=/&lt;?<i>   [ <i>compare</i> ] [ <i>x</i> <i>y</i> <i>z</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_80"></a>&lt;=/&lt;=?<i>   [ <i>compare</i> ] [ <i>x</i> <i>y</i> <i>z</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_82"></a>&gt;/&gt;?<i>   [ <i>compare</i> ] [ <i>x</i> <i>y</i> <i>z</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_84"></a>&gt;/&gt;=?<i>   [ <i>compare</i> ] [ <i>x</i> <i>y</i> <i>z</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_86"></a>&gt;=/&gt;?<i>   [ <i>compare</i> ] [ <i>x</i> <i>y</i> <i>z</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_88"></a>&gt;=/&gt;=?<i>   [ <i>compare</i> ] [ <i>x</i> <i>y</i> <i>z</i> ]</i>)</tt>&nbsp;</div>
-Test if <i>x</i>, <i>y</i>, and <i>z</i> form a chain with the two relations
-specified by the name of the procedure <i>rel1/rel2?</i>,
-with respect to the compare procedure <i>compare</i>.<p>
-If <i>compare</i> is not provided, <tt>default-compare</tt> is used.
-If <i>x</i> <i>y</i> <i>z</i> are not provided, a predicate
-procedure of three arguments is constructed.
-The order in which the values are compared is unspecified,
-but each value is compared at least once.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-<tt>(&lt;=/&lt;? real-compare 0 <i>x</i> 1)</tt> tests if <i>x</i> is a real number
-in the half open interval [0,1).</blockquote><br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_90"></a>chain=?<i>  <i>compare</i> <i>x<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_92"></a>chain&lt;?<i>  <i>compare</i> <i>x<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_94"></a>chain&gt;?<i>  <i>compare</i> <i>x<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_96"></a>chain&lt;=?<i>  <i>compare</i> <i>x<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_98"></a>chain&gt;=?<i>  <i>compare</i> <i>x<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;</div>
-Test if the values <i>x<sub>1</sub></i> <tt>...</tt>(zero or more values) form
-a chain with respect to the relation specified by the name of
-the procedure, and with respect to the compare procedure <i>compare</i>.
-The result is a boolean (either <tt>#t</tt> or <tt>#f</tt>.)
-The order in which the values are compared is unspecified,
-but each value is compared at least once (even if there is just
-one.)<p>
-A sequence of values <em>x</em><sub>1</sub>, <tt>...</tt>, <em>x</em><sub><em>n</em></sub> forms a chain with respect
-to the relation <i>rel?</i> if <tt>(<i>rel?</i> <i>compare</i> <em>x</em><sub><em>i</em></sub> <em>x</em><sub><em>j</em></sub>)</tt>
-for all 1 <u>&lt;</u> <em>i</em> &lt; <em>j</em> <u>&lt;</u> <em>n</em>.
-In particular, this is the case for <em>n</em> <img src="srfi-67-Z-G-D-4.png" border="0" alt="[srfi-67-Z-G-D-4.png]"> {0,1}.</p>
-<p>
-Since the relations  = , &lt;, &gt;, <u>&lt;</u>, and <u>&gt;</u> are transitive,
-it is sufficient to test <tt>(<i>rel?</i> <i>compare</i> <em>x</em><sub><em>i</em></sub> <em>x</em><sub><em>i</em>+1</sub>)</tt>
-for 1 <u>&lt;</u> <em>i</em> &lt; <em>n</em>.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The reason every <em>x</em><sub><em>i</em></sub> participates in at least one comparison
-is type-checking:
-After testing if the values form a chain, these value may be assumed
-to be of the type comparable by <i>compare</i> -- and this holds
-irrespectively of the number of values, or whether they form a chain.
-</blockquote><br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_100"></a>pairwise-not=?<i> <i>compare</i> <i>x<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;</div>
-Tests if the values <i>x<sub>1</sub></i> <tt>...</tt>(zero or more values) are
-pairwise unequal with respect to the compare procedure <i>compare</i>.
-The result is a boolean (either <tt>#t</tt> or <tt>#f</tt>).
-The order in which the values are compared is unspecified,
-but each value is compared at least once (even if there is just one).<p>
-The values <em>x</em><sub>1</sub>, <tt>...</tt>, <em>x</em><sub><em>n</em></sub> are pairwise unequal if 
-<tt>(not=? <i>compare</i> <em>x</em><sub><em>i</em></sub> <em>x</em><sub><em>j</em></sub>)</tt> for all <em>i</em> <img src="srfi-67-Z-G-D-8.png" border="0" alt="[srfi-67-Z-G-D-8.png]"> <em>j</em>.
-In particular, this is the case for <em>n</em> <img src="srfi-67-Z-G-D-4.png" border="0" alt="[srfi-67-Z-G-D-4.png]"> {0,1}.</p>
-<p>
-Since <i>compare</i> defines a total ordering on the values,
-the property can be checked in time <em>O</em>(<em>n</em> log <em>n</em>), and
-implementations are required to do this. (For example by
-first sorting and then comparing adjacent elements).
-</p>
-<br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_102"></a>min-compare<i> <i>compare</i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_104"></a>max-compare<i> <i>compare</i> <i>x<sub>1</sub></i> <i>x<sub>2</sub></i> <tt>...</tt></i>)</tt>&nbsp;</div>
-A minimum or maximum of the values <i>x<sub>1</sub></i> <i>x<sub>2</sub></i> <tt>...</tt>(one or more values) with respect to the compare procedure <i>compare</i>.<p>
-The result is the first value that is minimal (maximal, respectively).
-The order in which the values are compared is unspecified,
-but each value is compared at least once (even if there is
-just one value).
-</p>
-<br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_106"></a>kth-largest<i> <i>compare</i> <i>k</i> <i>x<sub>0</sub></i> <i>x<sub>1</sub></i> <tt>...</tt></i>)</tt>&nbsp;</div>
-The <em>k</em>-th largest element of values 
-<i>x<sub>0</sub></i> <i>x<sub>1</sub></i> <tt>...</tt>(one or more values)
-with respect to the compare procedure <i>compare</i>.<p>
-More precisely,
-<tt>(kth-largest <i>compare</i> <i>k</i> <i>x<sub>0</sub></i> <tt>...</tt> <i>x<sub><em>n</em><tt>-</tt>1</sub></i>)</tt>
-returns the <tt>(modulo <i>k</i> <em>n</em>)</tt>-th element of the unique sequence
-obtained by stably sorting (<em>x</em><sub>0</sub> <tt>&middot;&middot;&middot;</tt> <em>x</em><sub><em>n</em><tt>-</tt>1</sub>).
-(Recall that a sorting algorithm is <em>stable</em> if it does not
-permute items with equal key, i.e. equivalent w.r.t. <i>compare</i>).</p>
-<p>
-The argument <i>k</i> is an exact integer, and <em>n</em> <u>&gt;</u> 1.
-The order in which the values <em>x</em><sub><em>i</em></sub> are compared is unspecified,
-but each value is compared at least once (even if there is
-just one value).</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-The 0-th largest element is the minimum,
-the ( <tt>-</tt> 1)-st largest element is the maximum.
-The median is the (<em>n</em> <tt>-</tt> 1)/2-th largest element if <em>n</em> is odd,
-and the average of the (<em>n</em>/2 <tt>-</tt> 1)-st and <em>n</em>/2-th largest elements
-if <em>n</em> is even.
-</blockquote><br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_108"></a>compare-by&lt;<i>    <i>lt-pred</i> [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_110"></a>compare-by&gt;<i>    <i>gt-pred</i> [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_112"></a>compare-by&lt;=<i>   <i>le-pred</i> [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_114"></a>compare-by&gt;=<i>   <i>ge-pred</i> [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_116"></a>compare-by=/&lt;<i>  <i>eq-pred</i> <i>lt-pred</i> [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_118"></a>compare-by=/&gt;<i>  <i>eq-pred</i> <i>gt-pred</i> [ <i>x</i> <i>y</i> ]</i>)</tt>&nbsp;</div>
-
-If optional arguments <i>x</i> and <i>y</i> are present then these 
-are compared with respect to the total order defined by the
-predicate(s) given; the result is in { <tt>-</tt> 1,0,1}.
-If <i>x</i> and <i>y</i> are not present then a procedure comparing
-its two arguments using the predicate(s) given is constructed and
-returned.<p>
-The predicate procedures mean the following: 
-<tt>(<i>lt-pred</i> <i>x</i> <i>y</i>)</tt> tests if <em>x</em> &lt; <em>y</em>, 
-<i>le-pred</i> tests for <u>&lt;</u>, 
-<i>gt-pred</i> for &gt;,
-<i>ge-pred</i> for <u>&gt;</u>,
-and <i>eq-pred</i> tests if <em>x</em> and <em>y</em> are equivalent.
-The result returned by a predicate procedure is interpreted
-as a Scheme truth value (i.e. <tt>#f</tt> is false and non-<tt>#f</tt>
-is true).</p>
-<p>
-The purpose of the procedures <tt>compare-by</tt><em>predicate(s)</em>
-is to define a compare procedure from an order predicate,
-and possibly an additional equivalence predicate.
-If an equivalence predicate <i>eq-pred</i> is given, it is called
-<em>before</em> the order predicate because the equivalence may be
-coarser than the total ordering, and it may also be cheaper.</p>
-<p>
-</p>
-<blockquote><em>Note:&nbsp;&nbsp;</em>
-<tt>Char-compare</tt> could be defined in terms of <tt>char&lt;=?</tt> as<p>
-</p>
-<tt>&nbsp;&nbsp;&nbsp;(define&nbsp;char-compare&nbsp;(compare-by&lt;=&nbsp;char&lt;=?))<br>
-</tt>
-</blockquote><br>
-<div align=left><u>procedure:</u>&nbsp;&nbsp;<tt>(<a name="node_idx_120"></a>debug-compare<i> <i>compare</i></i>)</tt>&nbsp;</div>
-Constructs a compare procedure equivalent to <i>compare</i>
-but with debugging code wrapped around the calls to <i>compare</i>.
-The debugging code signals an error if it detects a violation
-of the axioms of a compare function.
-For this it is assumed that <i>compare</i> has no side-effects.<p>
-More specifically, <tt>(debug-compare <i>compare</i>)</tt> evaluates
-to a compare procedure <i>compare<sub>1</sub></i> which checks reflexivity,
-antisymmetry, and transitivity of <i>compare</i> based on the
-arguments on which <i>compare<sub>1</sub></i> is called:</p>
-<p>
-The procedure <i>compare<sub>1</sub></i> checks reflexivity on any value
-passed to <i>compare</i>,
-antisymmetry on any pair of values on which <i>compare</i> is called,
-and transitivity on triples where two of the arguments are from
-the current call to <i>compare<sub>1</sub></i> and the third is a pseudo-random
-selection from the two arguments of the previous call to <i>compare<sub>1</sub></i>.</p>
-<p>
-</p>
-<blockquote><em>Rationale:&nbsp;&nbsp;</em>
-The test coverage is partial and determined pseudo-randomly,
-but the execution time of <i>compare<sub>1</sub></i> is only a constant factor larger
-than the execution time of <i>compare</i>.
-</blockquote><br>
-<p>
-</p>
-<a name="node_sec_5"></a>
-<h1><a href="#node_toc_node_sec_5">5&nbsp;&nbsp;The theory of compare functions</a></h1>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-<b>NOTE:</b> This section of the SRFI-document can be read at 
-<a href="http://srfi.schemers.org/srfi-67/">srfi.schemers.org/srfi-67/</a>.
-It was removed from the
-HelpDesk version due to the math.</p>
-<p>
-The section contains a theoretical justification
-for the concept ``compare function''.
-First an axiomatic definition of compare functions is given.
-Then it is proved that compare functions are just an 
-unconventional way of defining total orders on equivalence
-classes of elements -- and mathematically that
-is all there is to say about compare functions.</p>
-<p>
-At this point, a mathematician may wonder why we
-introduce compare functions in the first place.
-The answer is: Because they are convenient and efficient
-for writing programs involving total orders.</p>
-<p>
-
-</p>
-<p></p>
-<p></p>
-<a name="node_sec_6"></a>
-<h1><a href="#node_toc_node_sec_6">6&nbsp;&nbsp;Design Rationale</a></h1>
-<p></p>
-<p>
-</p>
-<p>
-In this section we present our reasoning behind the design
-decisions made for this SRFI.
-We would like to be explicit on this because we believe
-that design is not about the outcome of decisions but
-about the alternatives considered.
-The section is organized as a Q&amp;A list.</p>
-<p>
-</p>
-<a name="node_sec_Temp_3"></a>
-<h2><a href="#node_toc_node_sec_Temp_3">Order predicates (2-way) or 3-way comparisons?</a></h2>
-<p>It is mathematical tradition to specify a total order
-in terms of a ``less or equal'' (<u>&lt;</u>) relation.
-This usually carries over to programming languages in the
-form of a <tt>&lt;=</tt> predicate procedure.</p>
-<p>
-However, there are inherently <em>three</em> possible relations 
-between two elements <em>x</em> and <em>y</em> with respect to a total order:
-<em>x</em> &lt; <em>y</em>, <em>x</em>  =  <em>y</em>, and <em>x</em> &gt; <em>y</em>.
-(With respect to a partial order there is a fourth:
-<em>x</em> and <em>y</em> are uncomparable.)
-This implies that any mechanism based on 2-valued 
-operations (be it <u>&lt;</u>, or ( = , &lt;), or other)
-has cases in which <em>two</em> expressions must be
-evaluated in order to determine the relation between
-two elements.</p>
-<p>
-In practice, this is a problem if a comparison
-is computationally expensive.
-Examples of this are implicitly defined orders in which the
-order of elements depends on their relative position in some enumeration.
-(Think of comparing graphs by isomorphism type.)
-In this case, each order predicate is as expensive as a
-compare procedure -- implying that a proper 3-way branch
-could be twice as fast as cascaded 2-way branches.
-Hence, there is a potentially considerable loss in performance,
-and it is purely due to the interface for comparisons.</p>
-<p>
-The primary disadvantage of bare 3-way comparisons
-is that they are less convenient, both in use and 
-in their definition.
-Luckily, this problem can be solved quite satisfactorily using
-the syntactic (macro) and procedural abstractions of Scheme
-(refer to Sections&nbsp;<a href="#node_sec_4.5">4.5</a> and <a href="#node_sec_4.6">4.6</a>).</p>
-<p>
-</p>
-<a name="node_sec_Temp_4"></a>
-<h2><a href="#node_toc_node_sec_Temp_4">How to represent the three cases?</a></h2>
-<p>We have considered the following alternatives for representing
-the three possible results of a comparison:
-</p>
-<ol>
-<li><p>the exact integers -1, 0, and 1 (used in this SRFI),
-</p>
-<li><p>the sign of an exact immediate integer,
-</p>
-<li><p>the sign of any Scheme number satisfying <tt>real?</tt>,
-</p>
-<li><p>three different symbols (e.g. <tt>'&lt;</tt>, <tt>'=</tt>, and <tt>'&gt;</tt>),
-</p>
-<li><p>an enumeration type consisting of three elements, and
-</p>
-<li><p>a built-in type with self-evaluating special constants
-(e.g. <tt>#&lt;</tt>, <tt>#=</tt>, and <tt>#&gt;</tt>).
-</p>
-</ol><p>
-The representation acts as an internal interface between 
-programs comparing objects and programs using these comparisons.</p>
-<p>
-The advantage of using only three values is that the 
-representation of each case is uniquely defined.
-In particular, this enables the use of <tt>case</tt>
-instead of <tt>if</tt>, and it ensures portability.
-Portability of numbers is problematic in 
-R<sup>5</sup>RS  due to 
-underspecification and inexactness.</p>
-<p>
-The advantage of using a non-unique (numerical) representation
-is that the result of a computation can sometimes immediately be
-used in a branch, much like the ``non-<tt>#f</tt> means true''-convention.
-However, with the operations in Section&nbsp;<a href="#node_sec_4.6">4.6</a>
-this advantage hardly matters.
-Moreover, the ``non-<tt>#f</tt> means true''-convention is
-a major cause of unexpected program behavior itself.</p>
-<p>
-The advantage of using { <tt>-</tt> 1, 0, 1} over using three 
-symbols is that the integers support additional operations,
-for example they can directly be used in index computations.
-A particularly useful operation is <tt>(* sign (compare x y))</tt>
-which inverts the order relation depending on <tt>sign</tt>
-(either  <tt>-</tt> 1 or 1).
-In addition, the integers are unique -- once it is known that
-comparisons result in integers it is obvious which integers.
-A minor consideration is that Scheme systems usually
-treat small integers as unboxed values, and that integers
-are self-evaluating literals.</p>
-<p>
-The advantage of using three symbols is that they can be
-chosen to be more descriptive.
-For example, it is more instructive to see 
-<tt>(symbol-compare 'foo 'bar)</tt>
-result in <tt>'greater</tt> than in <tt>1</tt>.
-Unfortunately, there is no obvious choice of name for the
-three symbols.
-Amoung the choices that make sense are
-<tt>'less</tt> <tt>'equal</tt> <tt>'greater</tt>,
-or <tt>'lt</tt> <tt>'eq</tt> <tt>'gt</tt>,
-or <tt>'&lt;</tt> <tt>'=</tt> <tt>'&gt;</tt>.
-A disadvantage of using symbols for the three cases is
-that Scheme symbols are ordered, too, and this ordering
-may differ from the desired ordered for the three cases.</p>
-<p>
-Some Scheme implementations provide a mechanism for
-defining enumeration types. 
-For example <tt>define-enumerated-type</tt>
-of Scheme&nbsp;48 can be used to define a type
-<tt>comparison</tt> consisting of three objects, 
-say <tt>lt</tt>, <tt>eq</tt>, <tt>gt</tt>.
-The enumeration can also (directly) be defined on top of 
-SRFI&nbsp;9 (Defining Record Types) [<a href="#node_bib_10">10</a>]
-by defining three new record types, each of which
-having a single instance.
-We regard this approach as preferable over three symbols
-because comparison results have their own type,
-and a sufficiently advanced compiler could use this
-information to eliminate redundant type-checks.</p>
-<p>
-One step further in this direction is the following
-design alternative we have considered:
-Due to the fundamental nature of the type 
-<tt>comparison</tt> for programming,
-it would be worthwhile integrating it into the
-core language of Scheme.
-This could take the following form:
-There are three self-evaluating constants,
-e.g. written <tt>#&lt;</tt> <tt>#=</tt> <tt>#&gt;</tt>,
-and these are the only instances of the type
-<tt>comparison</tt>.
-The type supports two operations:
-<tt>comparison?</tt> and <tt>comparison-compare</tt>.
-Furthermore, <tt>eq?</tt>, <tt>eqv?</tt>,
-and <tt>equal?</tt> need to understand the
-comparison values.
-In other words, <tt>comparison</tt> is designed
-after <tt>boolean</tt>.
-It is unclear, however, which problem this tight integration
-of comparisons into the language is solving.</p>
-<p>
-Given this situation, we have chosen for { <tt>-</tt> 1,0,1},
-while providing facilities for using this conveniently -- in 
-particular it is hardly ever necessary to deal with
-the integers directly.</p>
-<p>
-</p>
-<a name="node_sec_Temp_5"></a>
-<h2><a href="#node_toc_node_sec_Temp_5">How to order complex numbers?</a></h2>
-<p>Mathematically, no total order of the complex numbers exists
-which is compatible with the algebraic or topological structure.
-Nevertheless, it is useful for programming purposes to have
-<em>some</em> total order of complex numbers readily available.</p>
-<p>
-Several total orders on the complex numbers are at least 
-compatible with the natural ordering of real numbers.
-The least surprising of these is lexicographic on (<em>r</em><em>e</em>, <em>i</em><em>m</em>).</p>
-<p>
-</p>
-<p>
-</p>
-<a name="node_sec_Temp_6"></a>
-<h2><a href="#node_toc_node_sec_Temp_6">How to order special floating point symbols?</a></h2>
-<p>Floating point formats often do not only represent rational
-numbers but extend this set by special symbols, for example
-+Inf, -Inf, NaN (``Not a number''), and -0.
-How should these symbols be ordered with respect to the
-ordinary numerical values and with respect to each other?
-(Refer to the discussion archive starting with
-<a href="http://srfi.schemers.org/srfi-67/mail-archive/msg00010.html">msg00010</a>.)</p>
-<p>
-Let us briefly recall the purpose of the special symbols.
-The general rationale for introducing special symbols into
-a floating point format is for numerical calculations to 
-continue in the presence of data-dependent errors, 
-while still retaining some meaningful information
-about the result.
-The symbols +Inf and -Inf indicate that the calculation
-has produced a value exceeding the representable range.
-The special symbol -0, indicates that a calculation has
-produced a value of unrepresentable small magnitude,
-but retains the information that the underflow approached
-zero from the negative side (otherwise it would be +0).
-This sign information is useful in the presence of branch-cuts.
-Finally, NaN indicates that the information about the
-value has been lost entirely (example: -Inf + Inf)
-NaN avoids raising an exception and allows carrying on
-with other parts of the calculation.
-It should be noted that several NaNs can exist.
-For example in the IEEE 754 standard many bit patterns
-represent NaN (whatever the interpretation).</p>
-<p>
-As +Inf and -Inf are designed to represent extremal numbers,
-their ordering with respect to real numbers is obvious.
-For signed zeros, the ordering is also obvious.
-However, the notion of two zeros (or even three: -0, 0, and +0)
-is incompatible with the arithmetic structure of the real numbers.
-Hence, in most situations all zeros should be treated as equal,
-even though this can destroy information about results.
-But the alternative design may also make sense in certain
-situations where the full information carried in a floating
-point object is to be retained.</p>
-<p>
-For NaN (or even several NaNs) the situation is even
-more ambiguous because there is not even a natural order
-relation of NaN with the other possible floating point values.
-One design alternative is to raise an error if NaN is to
-participate in a comparison; the reasoning being ``if the
-control flow depends on a NaN you are in trouble anyway''.
-An alternative is to define some order by force; the
-reasoning being ``if an object satisfies <tt>real?</tt>
-then it can be compared with <tt>real-compare</tt>.''
-Neither approach is obviously better than the other.</p>
-<p>
-Given this situation, we have decided to leave the effect of
-using a special floating point value in <tt>real-compare</tt>
-unspecified, in line with the approach of 
-R<sup>5</sup>RS .
-This approach might change once Scheme itself is more
-explicit about floating point representations and
-numerical computation.</p>
-<p>
-</p>
-<a name="node_sec_Temp_7"></a>
-<h2><a href="#node_toc_node_sec_Temp_7">How to define <tt>default-compare</tt>?</a></h2>
-<p>The purpose of <tt>default-compare</tt> is providing <em>some</em>
-well-defined way of comparing two arbitrary Scheme values.
-This can be used in all situations in which the user is 
-unwilling to define a compare procedure explicitly,
-for example because the actual details of the total order
-do not really matter.</p>
-<p>
-As an example, consider the task of dealing
-with sets of sets of integers. 
-In this case, one could simply use sorted lists without
-repetition for representing lists and <tt>default-compare</tt>
-already provides a total order.</p>
-<p>
-However, there are limits as to how <tt>default-compare</tt> can be defined.  
-For example, <tt>default-compare</tt> cannot easily be based on a hash 
-code derived from the pointer representing an object due to the close
-dependency with the garbage collection mechanism.
-Also, we believe it to be more useful to applications if
-<tt>default-compare</tt> is based on type and structure.</p>
-<p>
-Unfortunately, this imposes limits on what can be compared
-using <tt>default-compare</tt> because it is very desirable to
-have a portable reference implementation.
-In particular, portable ways of dealing with circular structures
-are overly costly.</p>
-<p>
-Naturally, the question arises how the types should be ordered.
-For this question it is useful to understand that 
-<tt>boolean-compare</tt> and <tt>pair-compare</tt> both already
-define a total order for all values (at least in priciple).
-Hence, <tt>default-compare</tt> could refine one of them,
-but unfortunately not both at the same time (unless
-<tt>#f</tt> and <tt>'()</tt> are minimum and maximum of the order, 
-respectively).
-Since <tt>pair-compare</tt> is more frequently used than
-<tt>boolean-compare</tt> we base <tt>default-compare</tt>
-on <tt>pair-compare</tt>.
-The other portably comparable types are ordered by
-increasing complexity, which clearly is an arbitrary choice.</p>
-<p>
-</p>
-<a name="node_sec_Temp_8"></a>
-<h2><a href="#node_toc_node_sec_Temp_8">What is the ``lexicographic order''?</a></h2>
-<p>The <em>lexicographic order</em> is a general way of defining
-an ordering for sequences from an ordering of elements:</p>
-<p>
-In the lexicographic order, the empty sequence is the smallest
-sequence of all, and two non-empty sequences are first compared
-by their first element and only if these are equal the residual
-sequences are compared, recursively.</p>
-<p>
-The lexicographic order has its name from its use in a lexicon:
-For example, <em>fun</em> &lt; <em>funloving</em> &lt; <em>jolly</em>.</p>
-<p>
-</p>
-<a name="node_sec_Temp_9"></a>
-<h2><a href="#node_toc_node_sec_Temp_9">What is the ``natural order'' of lists and vectors?</a></h2>
-<p>By ``natural order'' of an abstract data type we mean a total order
-that is defined to match the basic operations operations supported
-by the data type.</p>
-<p>
-The basic access operations with constant execution time 
-for Scheme lists are <tt>null?</tt>, <tt>car</tt>, and <tt>cdr</tt>.
-These are exactly the operations needed for comparing two
-sequences lexicographically.</p>
-<p>
-The constant time access operations for Scheme vectors
-are <tt>vector-length</tt> (size) and <tt>vector-ref</tt> (ref).
-Using these operations, the fundamental ordering of vectors
-is first comparing by size,
-and only if the sizes are equal,
-by comparing the elements lexicographically.</p>
-<p>
-</p>
-<a name="node_sec_Temp_10"></a>
-<h2><a href="#node_toc_node_sec_Temp_10">Why are vectors not ordered lexicographically?</a></h2>
-<p>In this SRFI, lists and strings are ordered
-lexicographically (`LEX') by default, e.g.&nbsp;<tt>&quot;12&quot;</tt> &lt; <tt>&quot;2&quot;</tt>.
-The default order of vectors is first by length and then
-lexicographically (`LENGTH-LEX'), e.g.&nbsp;<tt>#(2)</tt> &lt; <tt>#(1 2)</tt>.
-Alternatively, vectors could be ordered purely lexicographically, too.
-In the extreme, lists, strings, and vectors could even be
-ordered lexicographically as sequences without distinguishing
-the concrete representation,
-implying <tt>&quot;12&quot;</tt> 
- =  <tt>(#\1 #\2)</tt> 
- =  <tt>#(#\1 #\2)</tt>.</p>
-<p>
-The choice affects <tt>vector-compare</tt>, <tt>default-compare</tt>,
-and the way orders are interpreted conceptually.
-Moreover, this SRFI introduces the terminology ``ordered as lists'' 
-and ``ordered as vectors'' to refer to the two fundamental
-ways of lifting an order to sequences (LEX and LENGTH-LEX).
-The choice also has implications for any other SRFI 
-introducing container data types (e.g. 66 and 74), 
-in case the author wishes to specify default compare
-procedures compatible with this SRFI.</p>
-<p>
-Summarizing the discussion, there seem to be three major arguments:
-</p>
-<ol>
-<li><p>Conceptually vectors and lists are representations of sequences, 
-and if there is only one ordering for them it should be LEX.
-</p>
-<li><p>LENGTH-LEX is more fundamental and efficient for types
-supporting a constant-time `size' operation.
-</p>
-<li><p>Conceptually strings are ``vectors of characters'' and 
-strings are conventionally ordered LEX by default, 
-so vectors should be ordered LEX as well in order to 
-minimize the potential for confusion.
-</p>
-</ol><p>
-(Please refer to the discussion archive for details, in particular
-<a href="http://srfi.schemers.org/srfi-67/mail-archive/msg00054.html">msg00054</a>.)</p>
-<p>
-We consider 2. the most important due to its mathematical nature,
-followed by 1. because it simplifies the design.
-While this controversial, we think that it is preferable
-to introduce different orders for different data types,
-and not derive every order from a single one for sequences.
-Finally, we consider 3. a weak argument because the default
-ordering of strings is motivated primarily historically for
-ordering written words of (small alphabet) natural languages.</p>
-<p>
-Concerning other vector-like data types, such as those 
-introduced by SRFI 66 and 74, we recommend to define a
-default ordering which appears most natural for the type.
-These can conveniently be named <tt><i>type</i>-as-<i>ordering</i></tt>.
-In cases where the order is of minor importance,
-we recommend to be compatible with this SRFI.</p>
-<p>
-</p>
-<a name="node_sec_Temp_11"></a>
-<h2><a href="#node_toc_node_sec_Temp_11">Why so few higher-order constructions?</a></h2>
-<p>An alternative for the control structures (macros) <tt>refine-compare</tt>,
-<tt>select-compare</tt>, and <tt>cond-compare</tt> is a set of
-higher-order procedures for constructing compare procedures.</p>
-<p>
-We have chosen for control structures instead of higher-order
-procedures for simplicity.
-This becomes particularly evident when a recursive compare procedure,
-e.g. <tt>default-compare</tt>, is to be defined.
-Using <tt>select-compare</tt> it is possible to define <tt>default-compare</tt> simply
-as a procedure calling itself in some branches (refer to the example in
-Section&nbsp;<a href="#node_sec_4.4">4.4</a>).
-In the higher-order approach, the procedure under construction must also
-be able to call itself, with arguments that are application specific.
-Expressing this with a flexible higher-order procedure is much more indirect. </p>
-<p>
-</p>
-<a name="node_sec_Temp_12"></a>
-<h2><a href="#node_toc_node_sec_Temp_12">Why the operations <tt>&lt;?</tt>, <tt>&lt;=?</tt> etc.?</a></h2>
-<p>Programs need both 2-way branching and 3-way branching.
-For 3-way branching, the conditional <tt>if3</tt>
-is provided.</p>
-<p>
-For 2-way branching, the set { <tt>-</tt> 1,0,1} of results of
-a comparison is mapped onto the set {<tt>#f</tt>, <tt>#t</tt>}.
-There are eight functions from a 3-set into a 2-set;
-all six non-constant functions are provided as <tt>=?</tt>,
-<tt>&lt;?</tt>, etc.</p>
-<p>
-The five monotonic functions can be generalized to 
-chains of values.
-In order to make the compare procedure parameter optional
-in the ordinary comparisons, separate operations 
-(<tt>chain&lt;?</tt>, <tt>chain&lt;=?</tt> etc.) are defined for chains.
-For the sixth operation (<tt>not=?</tt>) the generalization
-to pairwise unequality is defined as <tt>pairwise-not=?</tt>.
-This operation can be implemented efficiently because the
-compare procedure also defines a total order.</p>
-<p>
-As chains of length three are still frequently tested in
-programs (think of a range check ``0 <u>&lt;</u> <em>i</em> &lt; <em>n</em>''),
-and often two different relations are combined, 
-there are special operations for chains of length three
-(<tt>&lt;/&lt;?</tt>, <tt>&lt;/&lt;=?</tt>, etc.)</p>
-<p>
-For convenience, the compare procedure argument is
-made optional as often as possible. 
-Unfortunately, this opens up a possibility for mistake:
-Writing <tt>(&lt;=? x y z)</tt> where <tt>(&lt;=/&lt;=? x y z)</tt> is meant.
-Fortunately, the mistake will likely manifest itself at the
-time <tt>(x y z)</tt> is evaluated.</p>
-<p>
-</p>
-<a name="node_sec_Temp_13"></a>
-<h2><a href="#node_toc_node_sec_Temp_13">Why are <tt>&lt;?</tt> etc. procedures, not macros?</a></h2>
-<p>The procedures <tt>&lt;?</tt>, <tt>&lt;/&lt;?</tt>, <tt>chain&lt;?</tt> etc.
-could also have been specified as macros.
-This would have the advantage that they could make full use
-of ``short evaluation'': A chain of comparisons stops as
-soon as one of the comparisons has failed; all remaining
-argument expressions and comparisons need not be evaluated.
-This is potentially more efficient.</p>
-<p>
-The advantage of procedures, on the other hand, is that
-in Scheme they are ``first class citizens,'' meaning that
-they can be passed as arguments and returned from higher-order
-procedures.</p>
-<p>
-Taking this approach one step further, one can even require
-the compare procedures to check the types of all arguments,
-even if the result of the comparison is already known.
-This is what Section&nbsp;6.2.5 of 
-R<sup>5</sup>RS  calls ``transitive``
-behavior of the predicates <tt>=</tt>, <tt>&lt;</tt>, etc.
-For example, <tt>(&lt; 0 x y)</tt> first tests if <tt>x</tt> is positive,
-and only if this is the case <tt>(&lt; x y)</tt> is tested.
-But even if <tt>x</tt> is not positive it is checked that 
-<tt>y</tt> is indeed a <tt>real</tt> -- otherwise an error is raised.
-In ``short evaluation,'' on the contrary, if <tt>x</tt> is not
-positive, <tt>y</tt> can be an arbitrary Scheme value.</p>
-<p>
-Clearly, ``transitive'' tests have an overhead, namely that
-they need to execute potentially redundant type checks.
-Even worse, as types are only known to the compare procedure
-the only way to check the type of a value is to compare it,
-maybe with itself (which should result in 0 by definition
-of a compare procedure).</p>
-<p>
-The advantage of ``transitive'' comparisons is the automatic
-insertion of a type assertion.
-For example, after <tt>(chain&lt;? integer-compare x y z)</tt> 
-has been evaluated, no matter the result, 
-it is known that <tt>x</tt>, <tt>y</tt>, and <tt>z</tt> are integers.
-We consider this advantage sufficiently important to pay the price.</p>
-<p>
-</p>
-<a name="node_sec_Temp_14"></a>
-<h2><a href="#node_toc_node_sec_Temp_14">Why <tt>compare-by&lt;</tt> etc.?</a></h2>
-<p>It is often easier to define an order predicate,
-and possibly a separate equivalence relation,
-than it is to define a compare procedure.
-For this case, <tt>compare&lt;</tt> etc. provide a convenient
-and robust way of constructing the associated compare
-procedure.</p>
-<p>
-As has been learned from writing the reference implementation,
-despite the fact that each of these procedures is just a few
-lines of trivial code, they miraculously attract bugs.</p>
-<p>
-</p>
-<a name="node_sec_Temp_15"></a>
-<h2><a href="#node_toc_node_sec_Temp_15">How do I define a compare function from just an equivalence?</a></h2>
-<p>You better don't.</p>
-<p>
-A compare function defines a total order on equivalence classes,
-and vice versa (refer to Section&nbsp;<a href="#node_sec_5">5</a>).
-Hence, a compare procedure <tt>compare</tt> can be used to
-test equivalence: <tt>(=? compare <em>x</em> <em>y</em>)</tt>.</p>
-<p>
-In reverse, one could be tempted to define a ``compare function''
-<em>c</em> from just an equivalence relation ~ as <em>c</em>(<em>x</em>, <em>y</em>)  =  0
-if <em>x</em> ~ <em>y</em> and <em>c</em>(<em>x</em>, <em>y</em>)  =  1 otherwise.
-However, <em>c</em> is not antisymmetric (unless all objects are equivalent,
-i.e. <em>c</em>(<em>x</em>,<em>y</em>)  =  0 for all <em>x</em>, <em>y</em>) and hence it is not a compare function.
-In fact, there is no way at all of avoiding a total order on the equivalence classes.</p>
-<p>
-This is also reflected in the fact that there are efficient
-(log-time) search data structures based on a total order,
-but we know of no efficient (sublinear worst-case) data
-structures based solely on an equivalence relation.
-The following program takes time and space <em>O</em>(<em>h</em>),
-where <em>h</em> is the number of equivalence classes in use:</p>
-<p>
-</p>
-<tt>(define&nbsp;(equal-&gt;compare&nbsp;equal)<br>
-&nbsp;&nbsp;(let&nbsp;((reps&nbsp;'())&nbsp;(length-reps&nbsp;0))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(define&nbsp;(index&nbsp;x)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;loop&nbsp;((i&nbsp;(-&nbsp;length-reps&nbsp;1))&nbsp;(rs&nbsp;reps))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(null?&nbsp;rs)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(let&nbsp;((i&nbsp;length-reps))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;reps&nbsp;(cons&nbsp;x&nbsp;reps))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(set!&nbsp;length-reps&nbsp;(+&nbsp;length-reps&nbsp;1))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;i)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if&nbsp;(equal&nbsp;x&nbsp;(car&nbsp;rs))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;i<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(loop&nbsp;(-&nbsp;i&nbsp;1)&nbsp;(cdr&nbsp;rs))))))<br>
-&nbsp;&nbsp;&nbsp;&nbsp;(lambda&nbsp;(x&nbsp;y)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(integer-compare&nbsp;(index&nbsp;x)&nbsp;(index&nbsp;y)))))<br>
-</tt><p>
-If <tt>equal</tt> is an equivalence predicate (i.e. it is reflexive,
-symmetric, and transitive) then <tt>(equal-&gt;compare equal)</tt>
-is a compare procedure for the objects comparable by <tt>equal</tt>.
-The total order defined is unspecified (as it depends on call sequence).</p>
-<p>
-Note that the equivalence predicate <tt>equal</tt> could be defined
-by using a <em>union-find data structure</em>.
-But keep in mind that the equivalence relation represented by <tt>equal</tt>
-must not change while <tt>(equal-&gt;compare equal)</tt> is in use-so the
-union-find data structure must be unite classes. </p>
-<p>
-</p>
-<a name="node_sec_Temp_16"></a>
-<h2><a href="#node_toc_node_sec_Temp_16">How do I switch from 
-R<sup>5</sup>RS  to this SRFI?</a></h2>
-<p>As it happens, the specification of this SRFI is fully
-compatible with the 25 order predicates found in 
-R<sup>5</sup>RS .
-The easiest way of switching is by defining the 
-R<sup>5</sup>RS 
-operations in terms of this SRFI.
-Refer to the file <a href="http://srfi.schemers.org/srfi-67/implementation/r5rs-to-srfi.scm">r5rs-to-srfi.scm</a>
-for the corresponding Scheme-code.</p>
-<p>
-Alternatively, each expression involving a reference to an
-
-R<sup>5</sup>RS  order predicate can be transformed into an equivalent 
-expression using the facilities of this SRFI.
-Be reminded though that this requires an understanding of
-the <em>context</em> of the expression in question,
-in particular variable bindings, macro definitions,
-and the use of <tt>eval</tt>.</p>
-<p>
-However, if the meaning of an expression may be altered,
-it is often possible to increase type safety or simplicity.
-Consider for example the following potential replacements
-of <tt>(and (&lt;= 0 i) (&lt; i n))</tt>:
-</p>
-<tt>&nbsp;&nbsp;(and&nbsp;(&lt;=?&nbsp;real-compare&nbsp;0&nbsp;i)&nbsp;(&lt;?&nbsp;real-compare&nbsp;i&nbsp;n))<br>
-&nbsp;&nbsp;(&lt;=/&lt;?&nbsp;real-compare&nbsp;0&nbsp;i&nbsp;n)&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;always&nbsp;compares&nbsp;<tt>n</tt><br>
-&nbsp;&nbsp;(&lt;=/&lt;?&nbsp;integer-compare&nbsp;0&nbsp;i&nbsp;n)&nbsp;;&nbsp;only&nbsp;integer&nbsp;<tt>i</tt>,&nbsp;<tt>n</tt><br>
-&nbsp;&nbsp;(&lt;=/&lt;?&nbsp;0&nbsp;i&nbsp;n)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;uses&nbsp;<tt>default-compare</tt><br>
-</tt><p>
-Only the first alternative is equivalent to the original
-expression, but the other alternatives might be useful, too,
-depending on the goal.</p>
-<p>
-</p>
-<a name="node_sec_Temp_17"></a>
-<h2><a href="#node_toc_node_sec_Temp_17">Why be so tight with types?</a></h2>
-<p>Most procedures and macros in this SRFI are required to 
-signal an error if an argument is not according to the
-type specified, in particular comparison values must be
-exact integer in { <tt>-</tt> 1,0,1} at all times.
-Alternatively, we could have specified that procedures and
-macros accept values as general as makes sense.</p>
-<p>
-We believe that being tight on types at this fundamental
-level of a language pays off quickly.
-In particular, this will simplify debugging.
-Moreover, static analysis of a program will recognize
-more variables of a known type, which allows for more
-unboxed values and tighter compiled code.
-(Clearly, at the time of this writing this is speculative.)</p>
-<p>
-</p>
-<a name="node_sec_Temp_18"></a>
-<h2><a href="#node_toc_node_sec_Temp_18">Is there a performance penalty for this SRFI?</a></h2>
-<p>Yes and no.</p>
-<p>
-The focus of the reference implementation is correctness and 
-portability; performance will very likely suffer due to the
-overhead of internal procedure calls and type-checking.</p>
-<p>
-But as the word ``SRFI'' suggests, this document is a ``request
-for implementation,'' meaning we would love to see this SRFI
-being implemented efficiently by the implementation experts of
-particular Scheme systems.
-In practice, this means that most of the operations defined
-here, if not all, are supported natively.</p>
-<p>
-In this case, there is no performance penalty for using the
-mechanisms of this SRFI -- using this SRFI might even be faster
-due to explicit 3-way branching and better typing.</p>
-<p>
-</p>
-<a name="node_sec_Temp_19"></a>
-<h2><a href="#node_toc_node_sec_Temp_19">Why are there optional leading arguments?</a></h2>
-<p>Some operations have an optional first argument.
-This is in contrast to common practice in Scheme to
-put optional arguments after mandatory arguments.</p>
-<p>
-The leading optional argument is always the argument
-<i>compare</i>, representing the total order to be used.
-If it is missing <tt>default-compare</tt> is used.</p>
-<p>
-In the cases where we have chosen to make <i>compare</i>
-optional it is for the sake of brevity, e.g. in <tt>(&lt;? x y)</tt>
-instead of enforcing <tt>(&lt;? default-compare x y)</tt>.
-Although an option introduces potential for confusion
-(e.g. <tt>(&lt;? x y z)</tt> vs. <tt>(&lt;/&lt;? x y z)</tt>),
-we consider it an important feature for interactive use
-and convenient programming
-(e.g. in <tt>(do ((i 0 (+ i 1))) ((=? i n)))</tt>).</p>
-<p>
-Given our decision for optional <i>compare</i>,
-the question arises how to pass the option.
-In the absence of other widely accepted mechanisms for options,
-we can only vary the length of the argument list.
-For historical reasons -- before <tt>case-lambda</tt> of SRFI 16 -- 
-optional arguments are passed at the end of the argument list
-for simplified parsing.
-On the other hand, <tt>(&lt;? compare x y)</tt> is more consistent
-with the rest of the SRFI than <tt>(&lt;? x y compare)</tt>.</p>
-<p>
-Unfortunately, any particular choice here is a compromise,
-and it is also controversial.
-(Please refer to the discussion archive for details, in particular 
-<a href="http://srfi.schemers.org/srfi-67/mail-archive/msg00051.html">msg00051</a>.)
-We have chosen for notational convenience in the common 
-case (optional <i>compare</i>) and for 
-consistency within this SRFI (leading optional argument).</p>
-<p>
-</p>
-<a name="node_sec_Temp_20"></a>
-<h2><a href="#node_toc_node_sec_Temp_20">Why <tt>chain&lt;?</tt> etc. and not a predicate parameter?</a></h2>
-<p>This SRFI specifies the five chain predicates <tt>chain=?</tt>, 
-<tt>chain&lt;?</tt>, <tt>chain&gt;?</tt>, <tt>chain&lt;=?</tt>, and <tt>chain&gt;=?</tt>.
-An alterative is to define a single chain predicate that 
-has the ordering as a parameter.
-(Refer to the discussion archive starting with
-<a href="http://srfi.schemers.org/srfi-67/mail-archive/msg00012.html">msg00012</a>.)</p>
-<p>
-The reason we have chosen for five chain predicates is that
-we use compare procedures to represent orders, not predicate
-procedures.
-There are five possible order relations predicates for which
-a chain test makes sense. (The sixth, <tt>not=?</tt>, is not 
-not transitive and hence requires pairwise testing.)
-The five chain tests are clearly defined and can be
-implemented efficiently, their main overhead being the
-call to the compare procedure.</p>
-<p>
-</p>
-<a name="node_sec_Temp_21"></a>
-<h2><a href="#node_toc_node_sec_Temp_21">Why not more higher-order procedures?</a></h2>
-<p>In this SRFI <tt>min-compare</tt> accepts a compare procedure as
-a first mandatory argument, applying the minimum operation to
-the list of all other arguments.
-An alternative is to have <tt>min-compare</tt> accept only
-the compare procedure (possibly optional) and returing a
-procedure computing the minimum of all its arguments
-(with respect to the compare procedure.)
-In a similar fashion other operations can specified as
-higher-order procedures.</p>
-<p>
-We have avoided higher-order procedures in this SRFI
-for simplicity and efficiency.
-As said repeatedly, compare procedures are the main
-vehicle to transport total orders from the code site
-definine an order to the code site using an order.
-Moreover, most operations made available through this 
-SRFI appear rather infrequently in programs, so either
-way there is little to be gained.
-Finally, dealing with higher-order procedures often
-involves writing more parentheses and the more simple-minded
-Scheme systems will create many short-lived closures.</p>
-<p>
-</p>
-<a name="node_sec_Temp_22"></a>
-<h2><a href="#node_toc_node_sec_Temp_22">Why do <tt>&lt;?</tt> etc. have so many options?</a></h2>
-<p>The procedures <tt>=?</tt>, <tt>&lt;?</tt> etc. accept an optional
-compare procedure but also two optional arguments to compare.
-This could be made simpler by not specifying some of
-the cases, or by specifying different procedures for the
-different functions.</p>
-<p>
-The operations <tt>&lt;?</tt> etc. are the primary mechanism
-for using compare procedures.
-As such they should be versatile and concise.</p>
-<p>
-Our original design had two mandatory arguments for
-objects to compare and an optional argument for the
-compare procedure, i.e. it provides a parametric
-comparison <tt>(&lt;? compare x y)</tt> of two objects.
-Amir Livne Bar-On then raised the issue of
-having better support for a higher-order style of
-programming, i.e. <tt>((&lt;? compare) x y)</tt>.
-(Refer to <a href="http://srfi.schemers.org/srfi-67/mail-archive/msg00012.html">msg00012</a>.)</p>
-<p>
-However, in Scheme the higher-order style is 
-less convenient than it is in curried programming 
-languages like Haskell or ML.
-In practice this manifests itself as follows:
-The most basic and frequent case of comparing
-atomic objects with respect to the default ordering would
-read <tt>((&lt;=?) x y)</tt>, 
-which is just two parentheses short of optimal.</p>
-<p>
-Fortunately, Dave Mason proposed a syntax for resolving
-the apparent alternative parametric test vs. higher order style.
-(Refer to
-<a href="http://srfi.schemers.org/srfi-67/mail-archive/msg00014.html">msg00014</a>.)
-By combining both functionalities into a single procedure,
-the user can choose the style at any moment.
-</p>
-<a name="node_sec_7"></a>
-<h1><a href="#node_toc_node_sec_7">7&nbsp;&nbsp;Related work</a></h1>
-<p>The use of compare procedures is not new; 
-defining control structures (<tt>if3</tt>, <tt>select-compare</tt> etc.)
-for dealing with them efficiently, however, seems to be new
-(at least we have not seen it before).</p>
-<p>
-Total ordering in 
-R<sup>5</sup>RS  is represented by typed order
-predicates, such as <tt>&lt;=</tt>, <tt>char&lt;=?</tt> etc.
-Although a ``less or equal''-predicate is sufficient to define
-a total order, 
-R<sup>5</sup>RS  defines a complete set of compare
-predicates (that is  = , &lt;, &gt;, <u>&lt;</u>, and <u>&lt;</u>) for
-the sake of convenience and readability.
-There are 25 procedures related to total orders in 
-R<sup>5</sup>RS .
-These are named 
-(<tt>=</tt>|<tt>&lt;</tt>|<tt>&gt;</tt>|<tt>&lt;=</tt>|<tt>&gt;=</tt>) and 
-(<tt>char</tt>|<tt>string</tt>)[<tt>-ci</tt>](<tt>=</tt>|<tt>&lt;</tt>|<tt>&gt;</tt>|<tt>&lt;=</tt>|<tt>&gt;=</tt>)<tt>?</tt>.</p>
-<p>
-The traditional approach in Scheme to equivalence (``Are two 
-values treated as equal?'') is the fixed set of predicates
-<tt>eq?</tt>, <tt>eqv?</tt>, and <tt>equal?</tt>.
-Historically, this approach was motivated by the desire to
-compare only pointers and avoid structural recursion.
-This SRFI provides the generalization to arbitrary equivalence
-relations, provided the equivalence classes are totally ordered.</p>
-<p>
-The Ruby programming language [<a href="#node_bib_4">4</a>] provides a method 
-<tt>&lt;=&gt;</tt> which is a compare procedure in the sense of this SRFI.
-By (re-)defining this method a total order can be defined 
-for the instances of a class, when compared against other objects. 
-All 2-way comparisons are based on <tt>&lt;=&gt;</tt>,
-but in Ruby essentially every method can be overloaded.</p>
-<p>
-In the Haskell&nbsp;98 programming language [<a href="#node_bib_6">6</a>] order
-predicates and compare functions coexist.
-The type <tt>Ordering</tt> [<a href="#node_bib_6">6</a>,&nbsp;Sect&nbsp;6.1.8] is an 
-enumeration of the three symbolic constants 
-<tt>LT</tt>, <tt>EQ</tt>, <tt>GT</tt>.
-The type class <tt>Ord</tt> [<a href="#node_bib_6">6</a>,&nbsp;Sect&nbsp;6.3.2] asserts
-the presence of a total order for a type, provided
-the type class <tt>Eq</tt> [<a href="#node_bib_6">6</a>,&nbsp;Sect&nbsp;6.3.1] also
-asserts the presence of an equivalence.
-Since the default definition of the method <tt>compare</tt>
-is in terms of the methods <tt>==</tt> and <tt>&lt;=</tt>,
-and vice versa, it can be chosen easily how to provide
-the total order without affecting its pattern of use.
-</p>
-<p>
-The C function <tt>strcmp</tt> [<a href="#node_bib_7">7</a>] of the ``string.h''-library acts as a compare procedure
-in the sense of this SRFI,
-although it is specified to return an integer of
-which only the sign matters.
-Python [<a href="#node_bib_5">5</a>] has a built-in function <tt>cmp</tt>
-which is a compare procedure in the sense of this SRFI.</p>
-<p>
-In SRFI-32 (Sort libraries) [<a href="#node_bib_13">13</a>] the total orders
-used for sorting are represented by a ``less than'' procedure.
-The discussion archive [<a href="#node_bib_13">13</a>] contains a short
-discussion thread on the use of 3-value comparisons under
-the aspect whether they can be used to improve the sorting
-algorithm itself.</p>
-<p>
-In the <tt>Galore.plt</tt> library of data structures for PLT Scheme,
-total orders are represented by the signature definition
-<tt>(define-signature 
-order^ (elm= elm&lt; elm&lt;=))</tt>.</p>
-<p>
-</p>
-<p>
-</p>
-<a name="node_sec_8"></a>
-<h1><a href="#node_toc_node_sec_8">8&nbsp;&nbsp;Reference implementation</a></h1>
-<p>The reference implementation is contained in the
-file
-<a href="http://srfi.schemers.org/srfi-67/implementation/compare.scm">compare.scm</a>;
-it is implemented in 
-R<sup>5</sup>RS 
-(including hygienic macros) together with 
-SRFI-16 (<tt>case-lambda</tt>) [<a href="#node_bib_9">9</a>]
-SRFI-23 (<tt>error</tt>) [<a href="#node_bib_11">11</a>]
-SRFI-27 (<tt>random-integer</tt>) [<a href="#node_bib_12">12</a>].</p>
-<p>
-Test code and examples are collected in 
-<a href="http://srfi.schemers.org/srfi-67/implementation/examples.scm">examples.scm</a>;
-it requires SRFI-42 (<tt>comprehensions</tt>) [<a href="#node_bib_14">14</a>].
-The reference implementation and the testing code have
-been developed and are known to run under
-PLT/DrScheme 208p1 [<a href="#node_bib_15">15</a>],
-Scheme 48 1.1 [<a href="#node_bib_16">16</a>], and
-Chicken 1.70 [<a href="#node_bib_17">17</a>].</p>
-<p>
-Code defining the order predicates of 
-R<sup>5</sup>RS  in terms
-of this SRFI is in the file 
-<a href="http://srfi.schemers.org/srfi-67/implementation/r5rs-to-srfi.scm">r5rs-to-srfi.scm</a>.
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-<p></p>
-<p></p>
-<a name="node_sec_Temp_23"></a>
-<h1><a href="#node_toc_node_sec_Temp_23">References</a></h1>
-<p></p>
-<table>
-<tr><td align=right valign=top><a name="node_bib_1"></a>[1]&nbsp;&nbsp;</td><td valign=top>
-E.&nbsp;Weisstein:
-<em>Totally&nbsp;Ordered&nbsp;Set</em>,<br>
-Mathworld at Wolfram Research.<br>
-<a href="http://mathworld.wolfram.com/TotallyOrderedSet.html">TotallyOrderedSet.html</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_2"></a>[2]&nbsp;&nbsp;</td><td valign=top>
-E.&nbsp;Weisstein:
-<em>Equivalence&nbsp;Relation</em>,<br>
-Mathworld at Wolfram Research.<br>
-mathworld.wolfram.com/EquivalenceRelation.html
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_3"></a>[3]&nbsp;&nbsp;</td><td valign=top>
-R.&nbsp;Kelsey, W.&nbsp;Clinger, J.&nbsp;Rees (eds.):
-<em>Revised<sup>5</sup> Report on the Algorithmic Language Scheme</em>,<br>
-Higher-Order and Symbolic Computation, Vol. 11, No. 1, August, 1998.<br>
-<a href="http://www.schemers.org/Documents/Standards/R5RS/">www.schemers.org/Documents/Standards/R5RS/</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_4"></a>[4]&nbsp;&nbsp;</td><td valign=top>
-Y.&nbsp;Matsumoto: 
-<em>Programming Ruby.
-The Pragmatic Programmer's Guide.</em><br>
-<a href="http://www.ruby-doc.org/docs/ProgrammingRuby/">www.ruby-doc.org/docs/ProgrammingRuby/</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_5"></a>[5]&nbsp;&nbsp;</td><td valign=top>
-G.&nbsp;van Rossum, F.&nbsp;L.&nbsp;Drake, Jr., (ed.):
-<em>Python Library Reference</em>.
-Release 2.4 of 30 November 2004.
-Section 2.1 ``built-in functions''.
-Python Software Foundation.<br>
-<a href="http://docs.python.org/lib/lib.html">http://docs.python.org/lib/lib.html</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_6"></a>[6]&nbsp;&nbsp;</td><td valign=top>
-S. Peyton Jones (ed.):
-<em>Haskell 98 Language and Libraries</em>
-The Revised Report, December 2002.<br>
-<a href="http://www.haskell.org/definition/">http://www.haskell.org/definition/</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_7"></a>[7]&nbsp;&nbsp;</td><td valign=top> 
-ANSI-C <em>ISO/IEC 9899:1999</em>, published 1 December.<br>
-<a href="http://www.open-std.org/jtc1/sc22/wg14/www/standards">http://www.open-std.org/jtc1/sc22/wg14/www/standards</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_8"></a>[8]&nbsp;&nbsp;</td><td valign=top>
-J.&nbsp;A.&nbsp;S&oslash;gaard: 
-<em>Data Structures Galore for PLT Scheme</em>.<br>
-<a href="http://planet.plt-scheme.org:80/207.1/docs/soegaard/galore.plt/1/1/doc.txt">http://planet.plt-scheme.org:80/207.1/docs/soegaard/galore.plt/1/1/doc.txt</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_9"></a>[9]&nbsp;&nbsp;</td><td valign=top>
-L.&nbsp;T.&nbsp;Hansen:
-<em>SRFI 16 Syntax for procedures of variable arity.</em><br>
-<a href="http://srfi.schemers.org/srfi-16/">http://srfi.schemers.org/srfi-16/</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_10"></a>[10]&nbsp;&nbsp;</td><td valign=top>
-R. Kelsey:
-<em>SRFI 9 Defining record types.</em><br>
-<a href="http://srfi.schemers.org/srfi-9/">http://srfi.schemers.org/srfi-9/</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_11"></a>[11]&nbsp;&nbsp;</td><td valign=top>
-S.&nbsp;Houben: 
-<em>SRFI 23 Error reporting mechanism.</em><br>
-<a href="http://srfi.schemers.org/srfi-23/">http://srfi.schemers.org/srfi-23/</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_12"></a>[12]&nbsp;&nbsp;</td><td valign=top>
-S.&nbsp;Egner:
-<em>SRFI 27 Sources of random bits.</em><br>
-<a href="http://srfi.schemers.org/srfi-27/">http://srfi.schemers.org/srfi-27/</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_13"></a>[13]&nbsp;&nbsp;</td><td valign=top>
-O.&nbsp;Shivers: 
-<em>SRFI 32 Sort libraries</em>.
-Section ``Ordering, comparison functions &amp; stability''
-and mail-archive msg000{23,24,33}.html.
-SRFI has been withdrawn July 17, 2003.<br>
-<a href="http://srfi.schemers.org/srfi-32/">http://srfi.schemers.org/srfi-32/</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_14"></a>[14]&nbsp;&nbsp;</td><td valign=top>
-S.&nbsp;Egner:
-<em>SRFI 42 Eager comprehensions.</em><br>
-<a href="http://srfi.schemers.org/srfi-42/">http://srfi.schemers.org/srfi-42/</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_15"></a>[15]&nbsp;&nbsp;</td><td valign=top>
-<em>PLT Scheme.</em><br>
-<a href="http://www.plt-scheme.org/">http://www.plt-scheme.org/</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_16"></a>[16]&nbsp;&nbsp;</td><td valign=top>
-R.&nbsp;Kelsey, J.&nbsp;Rees:
-<em>Scheme48, version 1.1.</em><br>
-<a href="http://s48.org/">http://s48.org/</a>
-</td></tr>
-<tr><td align=right valign=top><a name="node_bib_17"></a>[17]&nbsp;&nbsp;</td><td valign=top>
-<em>Chicken, version 1.70.</em><br>
-<a href="http://www.call-with-current-continuation.org/">www.call-with-current-continuation.org</a>.
-</table><p></p>
-
-
-<h1 class=chapter>
-<div class=chapterheading>&nbsp;</div><br>
-<a href="srfi-67.html#node_toc_node_chap_Temp_24">Alphabetic Index</a></h1>
-<p></p>
-<p>
-</p>
-<p>
-</p>
-<p>
-</p>
-
-<a name="node_index_start"></a><p>
-<br>
-<a href="srfi-67.html#node_idx_76">&lt;/&lt;=?</a><br>
-<a href="srfi-67.html#node_idx_74">&lt;/&lt;?</a><br>
-<a href="srfi-67.html#node_idx_80">&lt;=/&lt;=?</a><br>
-<a href="srfi-67.html#node_idx_78">&lt;=/&lt;?</a><br>
-<a href="srfi-67.html#node_idx_68">&lt;=?</a><br>
-<a href="srfi-67.html#node_idx_64">&lt;?</a><br>
-<a href="srfi-67.html#node_idx_62">=?</a><br>
-<a href="srfi-67.html#node_idx_84">&gt;/&gt;=?</a><br>
-<a href="srfi-67.html#node_idx_82">&gt;/&gt;?</a><br>
-<a href="srfi-67.html#node_idx_88">&gt;=/&gt;=?</a><br>
-<a href="srfi-67.html#node_idx_86">&gt;=/&gt;?</a><br>
-<a href="srfi-67.html#node_idx_70">&gt;=?</a><br>
-<a href="srfi-67.html#node_idx_66">&gt;?</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_2">boolean-compare</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_96">chain&lt;=?</a><br>
-<a href="srfi-67.html#node_idx_92">chain&lt;?</a><br>
-<a href="srfi-67.html#node_idx_90">chain=?</a><br>
-<a href="srfi-67.html#node_idx_98">chain&gt;=?</a><br>
-<a href="srfi-67.html#node_idx_94">chain&gt;?</a><br>
-<a href="srfi-67.html#node_idx_4">char-compare</a><br>
-<a href="srfi-67.html#node_idx_6">char-compare-ci</a><br>
-<a href="srfi-67.html#node_idx_108">compare-by&lt;</a><br>
-<a href="srfi-67.html#node_idx_112">compare-by&lt;=</a><br>
-<a href="srfi-67.html#node_idx_116">compare-by=/&lt;</a><br>
-<a href="srfi-67.html#node_idx_118">compare-by=/&gt;</a><br>
-<a href="srfi-67.html#node_idx_110">compare-by&gt;</a><br>
-<a href="srfi-67.html#node_idx_114">compare-by&gt;=</a><br>
-<a href="srfi-67.html#node_idx_20">complex-compare</a><br>
-<a href="srfi-67.html#node_idx_46">cond-compare</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_120">debug-compare</a><br>
-<a href="srfi-67.html#node_idx_40">default-compare</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_60">if-not=?</a><br>
-<a href="srfi-67.html#node_idx_48">if3</a><br>
-<a href="srfi-67.html#node_idx_56">if&lt;=?</a><br>
-<a href="srfi-67.html#node_idx_52">if&lt;?</a><br>
-<a href="srfi-67.html#node_idx_50">if=?</a><br>
-<a href="srfi-67.html#node_idx_58">if&gt;=?</a><br>
-<a href="srfi-67.html#node_idx_54">if&gt;?</a><br>
-<a href="srfi-67.html#node_idx_14">integer-compare</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_106">kth-largest</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_28">list-compare</a><br>
-<a href="srfi-67.html#node_idx_30">list-compare-as-vector</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_104">max-compare</a><br>
-<a href="srfi-67.html#node_idx_102">min-compare</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_72">not=?</a><br>
-<a href="srfi-67.html#node_idx_22">number-compare</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_36">pair-compare</a>, <a href="srfi-67.html#node_idx_38">[2]</a><br>
-<a href="srfi-67.html#node_idx_32">pair-compare-car</a><br>
-<a href="srfi-67.html#node_idx_34">pair-compare-cdr</a><br>
-<a href="srfi-67.html#node_idx_100">pairwise-not=?</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_16">rational-compare</a><br>
-<a href="srfi-67.html#node_idx_18">real-compare</a><br>
-<a href="srfi-67.html#node_idx_42">refine-compare</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_44">select-compare</a><br>
-<a href="srfi-67.html#node_idx_8">string-compare</a><br>
-<a href="srfi-67.html#node_idx_10">string-compare-ci</a><br>
-<a href="srfi-67.html#node_idx_12">symbol-compare</a></p>
-<p>
-<br>
-</p>
-<p></p>
-<p></p>
-<p>
-<br>
-<a href="srfi-67.html#node_idx_24">vector-compare</a><br>
-<a href="srfi-67.html#node_idx_26">vector-compare-as-list</a></p>
-<p>
-</p>
-
-<p>
-</p>
-<p>
-</p>
-
-
-
-
-</body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-69.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-69.html
deleted file mode 100644
index 6e4c3bbf96..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-69.html
+++ /dev/null
@@ -1,687 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <title>SRFI 69: Basic hash tables</title>
- <meta name="author" content="Panu Kalliokoski">
- <meta name="generator" content="stx2any">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <meta name="date" content="2005-02-24">
-</head>
-<body>
-
-<a name="Ttl"><H1>Title</H1></a>
-
-SRFI 69: Basic hash tables
-
-<a name="thr"><H1>Author</H1></a>
-
-Panu Kalliokoski
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see
-<a HREF="http://srfi.schemers.org/srfi-process.html">here</a>.
-It will remain in draft status until 2005/09/09, or as amended. To
-provide input on this SRFI, please <code>
-<a HREF="mailto:srfi-69@srfi.schemers.org">mailto:srfi-69@srfi.schemers.org</a></code>.
-See <a HREF="http://srfi.schemers.org/srfi-list-subscribe.html">instructions
-here</a> to subscribe to the list. You can access previous messages via
-<a HREF="http://srfi.schemers.org/srfi-69/mail-archive/maillist.html">the
-archive of the mailing list</a>.
-<p>
-<ul>
-  <li>Received: 2005/04/25</li>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-69/srfi-69.html?rev=1.1">2005/05/09</a></li>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-69/srfi-69.html?rev=1.2">2005/08/03</a></li>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-69/srfi-69.html?rev=1.3">2005/08/10</a></li>
-  <li>Draft extended: 2005/08/10 - 2005/09/09</li>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-69/srfi-69.html?rev=1.4">2005/08/30</a></li>
-  <li>Final: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-69/srfi-69.html?rev=1.5">2005/09/14</a></li>
-</ul>
-
-<h1><a name="bstr">Abstract</a></h1>
-
-<p>This SRFI defines basic hash tables.  Hash tables are widely recognised
-as a fundamental data structure for a wide variety of applications.  A
-hash table is a data structure that:
-
-<ol><li>provides a mapping from some set of keys to some set of values
-associated to those keys
-<li>has no intrinsic order for the (key, value) associations it contains
-<li>supports in-place modification as the primary means of setting the
-contents of a hash table
-<li>provides key lookup and destructive update in amortised constant
-time, provided that a good hash function is used.
-
-</ol><p>This SRFI aims to accomplish these goals:
-
-<ol><li>to provide a consistent, generic and widely applicable API for hash
-tables
-<li>to improve code portability by providing a standard hash table
-facility with guaranteed behaviour
-<li>to help the programmer by defining utility routines that account for
-the most common situations of using hash tables.
-
-</ol><h1><a name="sss">Issues</a></h1>
-
-<p>There is no single best way to make hash tables.  The tables presented
-in this SRFI aim at being both conceptually simple and usable for a wide
-variety of applications.  Even though a portable implementation is
-provided, Scheme implementations can speed things up considerably by
-e.g. providing an internal hash function for symbols.  Moreover, almost
-every Scheme implementation already has some kind of low-level hash
-table functionality, because that's the natural way to implement
-the global environment, and specifically, to provide support for
-<tt>string-&gt;symbol</tt>.  There might be some benefit in integration
-between implementation-specific environment data types and the hash
-table API presented here; however, these issues are left open.
-
-<p>This SRFI does not conform to the interface of maps presented in SRFI
-44.  Following SRFI 44 would seriously cripple the interface of hash
-tables.  The naming of the operations for maps in SRFI 44 goes against
-common use and is unnatural.  However, this SRFI has been written so
-that it does not <em>prevent</em> a SRFI-44 API to hash tables.  An
-implementation supporting both SRFI 44 and this SRFI is encouraged to
-provide a SRFI 44 interface to hash tables in addition to the one
-presented here.
-
-<h1><a name="Rtn">Rationale</a></h1>
-
-<p>Hash tables are widely recognised as a fundamental data structure for
-many kinds of computational tasks.  Thus far, there is no existing
-standard for Scheme hash tables; however, almost every non-minimal
-Scheme implementation provides some kind of hash table functionality.
-
-<p>Alas, although somewhat similar, these hash table APIs have many
-differences: some trivial, like the naming of certain functions; some
-complex, like revealing different aspects of the internal implementation
-to the user; some coarse, like requiring keys to be of some specific
-type(s); some subtle, like requiring the user to guess the size of the
-hash table in advance to get optimal performance.  As a result, the
-existing hash table facilities cannot be used to write portable
-programs.
-
-<p>The primary aim of this SRFI is to establish a standard API for hash
-tables so that portable programs can be written that make efficient use
-of common hash table functionality.  The SRFI resolves discrepancies
-that exist between the various hash table API's with respect to naming
-and semantics of hash table operations.  A lot of effort has been put
-into making the API consistent, simple and generic.  The SRFI also
-defines some of the most common utility routines that would otherwise
-need to be written and rewritten for various applications.
-
-<p>Incorporating this SRFI as a standard feature in Scheme implementations
-makes it possible to write efficient and portable programs that use hash
-tables.
-
-<h1><a name="Spcf">Specification</a></h1>
-
-<p>Names defined in this SRFI:
-
-<dl><dt>Type constructors and predicate</dt>
-<dd><a href="srfi-69.html#mkh">make-hash-table</a>, <a href="srfi-69.html#hsht">hash-table?</a>, <a href="srfi-69.html#lst">alist-&gt;hash-table</a>
-
-</dd><dt>Reflective queries</dt>
-<dd><a href="srfi-69.html#hsht1">hash-table-equivalence-function</a>, <a href="srfi-69.html#hsht2">hash-table-hash-function</a>
-
-</dd><dt>Dealing with single elements</dt>
-<dd><a href="srfi-69.html#hsht3">hash-table-ref</a>, <a href="srfi-69.html#hsht4">hash-table-ref/default</a>, <a href="srfi-69.html#hsht5">hash-table-set!</a>,
-<a href="srfi-69.html#hsht6">hash-table-delete!</a>, <a href="srfi-69.html#hsht7">hash-table-exists?</a>,
-<a href="srfi-69.html#hsht8">hash-table-update!</a>, <a href="srfi-69.html#hsht9">hash-table-update!/default</a>
-
-</dd><dt>Dealing with the whole contents</dt>
-<dd><a href="srfi-69.html#hsht11">hash-table-size</a>, <a href="srfi-69.html#hsht12">hash-table-keys</a>, <a href="srfi-69.html#hsht13">hash-table-values</a>,
-<a href="srfi-69.html#hsht14">hash-table-walk</a>, <a href="srfi-69.html#hsht15">hash-table-fold</a>, <a href="srfi-69.html#hsht16">hash-table-&gt;alist</a>,
-<a href="srfi-69.html#hsht17">hash-table-copy</a>, <a href="srfi-69.html#hsht18">hash-table-merge!</a>
-
-</dd><dt>Hashing</dt>
-<dd><a href="srfi-69.html#hsh">hash</a>, <a href="srfi-69.html#strng">string-hash</a>, <a href="srfi-69.html#strng19">string-ci-hash</a>, <a href="srfi-69.html#hshb">hash-by-identity</a>
-
-</dd></dl><p>An implementation that does not provide <tt>hash-table-ref</tt>,
-<tt>hash-table-set!</tt>, <tt>hash-table-delete!</tt>, <tt>hash-table-update!</tt>,
-<tt>hash-table-exists?</tt>, and <tt>hash-table-size</tt> in amortised constant
-time (when a good hash function is used), or fails to provide good hash
-function definitions for <tt>hash</tt>, <tt>string-hash</tt>, <tt>string-ci-hash</tt>,
-and <tt>hash-by-identity</tt>, does not conform to this SRFI.
-
-<p>Hash table implementations are allowed to rely on the fact that the hash
-value of a key in hash table does not change.  In most cases, modifying
-a key in-place after it has been inserted into the hash table will
-violate this constraint and thus leads to unspecified behaviour.
-
-<h2><a name="Tpc">Type constructors and predicate</a></h2>
-
-<p>Procedure: <a name="mkh">make-hash-table</a> [ <var>equal?</var> [ <var>hash</var> [ <var>args</var> &hellip; ]]]
-&rarr; <var>hash-table</var>
-
-<p>Create a new hash table with no associations.  <var>equal?</var> is a
-predicate that should accept two keys and return a boolean telling
-whether they denote the same key value; it defaults to <tt>equal?</tt>.
-
-<p><var>hash</var> is a hash function, and defaults to an appropriate hash function
-for the given <var>equal?</var> predicate (see section <a href="srfi-69.html#Hshn">Hashing</a>).  However,
-an acceptable default is not guaranteed to be given for any equivalence
-predicate coarser than <tt>equal?</tt>, except for <tt>string-ci=?</tt>.<small>[1]</small>  The function <var>hash</var> must be acceptable for <var>equal?</var>, so if
-you use coarser equivalence than <tt>equal?</tt> other than <tt>string-ci=?</tt>,
-you must always provide the function <var>hash</var> yourself.
-<br><small>[1]</small> An
-equivalence predicate <var>c1</var> is coarser than a equivalence predicate <var>c2</var>
-iff there exist values <var>x</var> and <var>y</var> such that <tt>(and (c1 x y) (not (c2 x
-y)))</tt>.<br>
-
-<p>Implementations are allowed to use the rest <var>args</var> for
-implementation-specific extensions.  Be warned, though, that using these
-extensions will make your program less portable.
-
-<p>Procedure: <a name="hsht">hash-table?</a> <var>obj</var> &rarr; <var>boolean</var>
-
-<p>A predicate to test whether a given object <var>obj</var> is a hash table.  The
-hash table type should be disjoint from all other types, if possible.
-
-<p>Procedure: <a name="lst">alist-&gt;hash-table</a> <var>alist</var> [ <var>equal?</var> [ <var>hash</var> 
-[ <var>args</var> &hellip; ]]] &rarr; <var>hash-table</var>
-
-<p>Takes an <q>association list</q> <var>alist</var> and creates a hash table
-<var>hash-table</var> which maps the <tt>car</tt> of every element in <var>alist</var> to the
-<tt>cdr</tt> of corresponding elements in <var>alist</var>.  <var>equal?</var>, <var>hash</var>, and
-<var>args</var> are interpreted as in <tt>make-hash-table</tt>.  If some key occurs
-multiple times in <var>alist</var>, the value in the first association will take
-precedence over later ones.  (Note: the choice of using <tt>cdr</tt> (instead
-of <tt>cadr</tt>) for values tries to strike balance between the two
-approaches: using <tt>cadr</tt> would render this procedure unusable for
-<tt>cdr</tt> alists, but not vice versa.)
-
-<p>The rest <var>args</var> are passed to <a href="srfi-69.html#mkh">make-hash-table</a> and can thus be used for
-implementation-specific extensions.
-
-<h2><a name="Rflc">Reflective queries</a></h2>
-
-<p>Procedure: <a name="hsht1">hash-table-equivalence-function</a> <var>hash-table</var>
-
-<p>Returns the equivalence predicate used for keys of <var>hash-table</var>.
-
-<p>Procedure: <a name="hsht2">hash-table-hash-function</a> <var>hash-table</var>
-
-<p>Returns the hash function used for keys of <var>hash-table</var>.
-
-<h2><a name="Dln">Dealing with single elements</a></h2>
-
-<p>Procedure: <a name="hsht3">hash-table-ref</a> <var>hash-table</var>  <var>key</var> [ <var>thunk</var> ] &rarr; <var>value</var>
-
-<p>This procedure returns the <var>value</var> associated to <var>key</var> in <var>hash-table</var>.
-If no <var>value</var> is associated to <var>key</var> and <var>thunk</var> is given, it is called
-with no arguments and its value is returned; if <var>thunk</var> is not given, an
-error is signalled.  
-Given a good hash function, this operation should have an (amortised)
-complexity of O(1) with respect to the number of associations in
-<var>hash-table</var>.  (Note: this rules out implementation by association lists
-or fixed-length hash tables.)
-
-<p>Procedure: <a name="hsht4">hash-table-ref/default</a> <var>hash-table</var>  <var>key</var>  <var>default</var> &rarr;
-<var>value</var>
-
-<p>Evaluates to the same value as <tt>(hash-table-ref hash-table key (lambda
-() default))</tt>.  
-Given a good hash function, this operation should have an (amortised)
-complexity of O(1) with respect to the number of associations in
-<var>hash-table</var>.  (Note: this rules out implementation by association lists
-or fixed-length hash tables.)
-
-<p>Procedure: <a name="hsht5">hash-table-set!</a> <var>hash-table</var>  <var>key</var>  <var>value</var> &rarr; undefined
-
-<p>This procedure sets the <var>value</var> associated to <var>key</var> in <var>hash-table</var>.
-The previous association (if any) is removed.  
-Given a good hash function, this operation should have an (amortised)
-complexity of O(1) with respect to the number of associations in
-<var>hash-table</var>.  (Note: this rules out implementation by association lists
-or fixed-length hash tables.)
-
-<p>Procedure: <a name="hsht6">hash-table-delete!</a> <var>hash-table</var>  <var>key</var> &rarr; undefined
-
-<p>This procedure removes any association to <var>key</var> in <var>hash-table</var>.  It is
-not an error if no association for that key exists; in this case,
-nothing is done.  
-Given a good hash function, this operation should have an (amortised)
-complexity of O(1) with respect to the number of associations in
-<var>hash-table</var>.  (Note: this rules out implementation by association lists
-or fixed-length hash tables.)
-
-<p>Procedure: <a name="hsht7">hash-table-exists?</a> <var>hash-table</var>  <var>key</var> &rarr; <var>boolean</var>
-
-<p>This predicate tells whether there is any association to <var>key</var> in
-<var>hash-table</var>.  
-Given a good hash function, this operation should have an (amortised)
-complexity of O(1) with respect to the number of associations in
-<var>hash-table</var>.  (Note: this rules out implementation by association lists
-or fixed-length hash tables.)
-
-<p>Procedure: <a name="hsht8">hash-table-update!</a> <var>hash-table</var>  <var>key</var>  <var>function</var>
-[ <var>thunk</var> ] &rarr; undefined
-
-<p>Semantically equivalent to, but may be implemented more efficiently
-than, the following code:
-<pre>
-(hash-table-set! hash-table key
-                 (function (hash-table-ref hash-table key thunk)))
-</pre>
-
-<p>Procedure: <a name="hsht9">hash-table-update!/default</a>
-<var>hash-table</var>  <var>key</var>  <var>function</var>  <var>default</var> &rarr; undefined
-
-<p>Behaves as if it evaluates to <tt>(hash-table-update! hash-table key
-function (lambda () default))</tt>.
-
-<h2><a name="Dln10">Dealing with the whole contents</a></h2>
-
-<p>Procedure: <a name="hsht11">hash-table-size</a> <var>hash-table</var> &rarr; <var>integer</var>
-
-<p>Returns the number of associations in <var>hash-table</var>.  This operation
-must have a complexity of O(1) with respect to the number of
-associations in <var>hash-table</var>.
-
-<p>Procedure: <a name="hsht12">hash-table-keys</a> <var>hash-table</var> &rarr; <var>list</var>
-
-<p>Returns a list of keys in <var>hash-table</var>.  The order of the keys is
-unspecified.
-
-<p>Procedure: <a name="hsht13">hash-table-values</a> <var>hash-table</var> &rarr; <var>list</var>
-
-<p>Returns a list of values in <var>hash-table</var>.  The order of the values is
-unspecified, and is not guaranteed to match the order of keys in the
-result of <a href="srfi-69.html#hsht12">hash-table-keys</a>.
-
-<p>Procedure: <a name="hsht14">hash-table-walk</a> <var>hash-table</var>  <var>proc</var> &rarr; unspecified
-
-<p><var>proc</var> should be a function taking two arguments, a <var>key</var> and a <var>value</var>.
-This procedure calls <var>proc</var> for each association in <var>hash-table</var>, giving
-the key of the association as <var>key</var> and the value of the association as
-<var>value</var>.  The results of <var>proc</var> are discarded.  The order in which
-<var>proc</var> is called for the different associations is unspecified.
-
-<p>(Note: in some implementations, there is a procedure called
-<tt>hash-table-map</tt> which does the same as this procedure.  However, in
-other implementations, <tt>hash-table-map</tt> does something else.  In no
-implementation that I know of, <tt>hash-table-map</tt> does a real functorial
-map that lifts an ordinary function to the domain of hash tables.
-Because of these reasons, <tt>hash-table-map</tt> is left outside this SRFI.)
-
-<p>Procedure: <a name="hsht15">hash-table-fold</a> <var>hash-table</var>  <var>f</var>  <var>init-value</var>
-&rarr; <var>final-value</var>
-
-<p>This procedure calls <var>f</var> for every association in <var>hash-table</var> with
-three arguments: the key of the association <var>key</var>, the value of the
-association <var>value</var>, and an <q>accumulated value</q>, <var>val</var>.  <var>val</var> is
-<var>init-value</var> for the first invocation of <var>f</var>, and for subsequent
-invocations of <var>f</var>, the return value of the previous invocation of <var>f</var>.
-The value <var>final-value</var> returned by <tt>hash-table-fold</tt> is the return
-value of the last invocation of <var>f</var>.  The order in which <var>f</var> is called
-for different associations is unspecified.
-
-<p>Procedure: <a name="hsht16">hash-table-&gt;alist</a> <var>hash-table</var> &rarr; <var>alist</var>
-
-<p>Returns an association list such that the <tt>car</tt> of each element in
-<var>alist</var> is a key in <var>hash-table</var> and the corresponding <tt>cdr</tt> of each
-element in <var>alist</var> is the value associated to the key in <var>hash-table</var>.
-The order of the elements is unspecified.
-
-<p>The following should always produce a hash table with the same mappings
-as a hash table <tt>h</tt>:
-<pre>
-(alist-&gt;hash-table (hash-table-&gt;alist h)
-                        (hash-table-equivalence-function h)
-                        (hash-table-hash-function h))
-</pre>
-
-<p>Procedure: <a name="hsht17">hash-table-copy</a> <var>hash-table</var> &rarr; <var>hash-table</var>
-
-<p>Returns a new hash table with the same equivalence predicate, hash
-function and mappings as in <var>hash-table</var>.
-
-<p>Procedure: <a name="hsht18">hash-table-merge!</a> <var>hash-table1</var>  <var>hash-table2</var> &rarr;
-<var>hash-table</var>
-
-<p>Adds all mappings in <var>hash-table2</var> into <var>hash-table1</var> and returns the
-resulting hash table.  This function may modify <var>hash-table1</var>
-destructively.
-
-<h2><a name="Hshn">Hashing</a></h2>
-
-<p>Hashing means the act of taking some value and producing a number from
-the value.  A hash function is a function that does this.  Every
-equivalence predicate <var>e</var> has a set of <var>acceptable</var> hash functions for
-that predicate; a hash function <var>hash</var> is acceptable iff <tt>(e obj1
-obj2)</tt> &rarr; <tt>(= (hash obj1) (hash obj2))</tt>.
-
-<p>A hash function <var>h</var> is <var>good</var> for a equivalence predicate <var>e</var> if it
-distributes the result numbers (<var>hash values</var>) for non-equal objects (by
-<var>e</var>) as uniformly as possible over the numeric range of hash values,
-especially in the case when some (non-equal) objects resemble each other
-by e.g. having common subsequences.  This definition is vague but should
-be enough to assert that e.g. a constant function is <em>not</em> a good hash
-function.
-
-<p>When the definition of <a href="srfi-69.html#mkh">make-hash-table</a> above talks about an
-<q>appropriate</q> hashing function for <var>e</var>, it means a hashing function that
-gives decent performance (for the hashing operation) while being both
-acceptable and good for <var>e</var>.  This definition, too, is intentionally
-vague.
-
-<p>Procedure: <a name="hsh">hash</a> <var>object</var> [ <var>bound</var> ] &rarr; <var>integer</var>
-
-<p>Produces a hash value for <var>object</var> in the range ( 0, <var>bound</var> (.  If
-<var>bound</var> is not given, the implementation is free to choose any bound,
-given that the default bound is greater than the size of any imaginable
-hash table in a normal application.  (This is so that the implementation
-may choose some very big value in fixnum range for the default bound.)
-This hash function is acceptable for <tt>equal?</tt>.
-
-<p>Procedure: <a name="strng">string-hash</a> <var>string</var> [ <var>bound</var> ] &rarr; <var>integer</var>
-
-<p>The same as <a href="srfi-69.html#hsh">hash</a>, except that the argument <var>string</var> must be a string.
-
-<p>Procedure: <a name="strng19">string-ci-hash</a> <var>string</var> [ <var>bound</var> ] &rarr; <var>integer</var>
-
-<p>The same as <a href="srfi-69.html#strng">string-hash</a>, except that the case of characters in
-<var>string</var> does not affect the hash value produced.
-
-<p>Procedure: <a name="hshb">hash-by-identity</a> <var>object</var> [ <var>bound</var> ] &rarr; <var>integer</var>
-
-<p>The same as <a href="srfi-69.html#hsh">hash</a>, except that this function is only guaranteed to be
-acceptable for <tt>eq?</tt>.  The reason for providing this function is that
-it might be implemented significantly more efficiently than <tt>hash</tt>.
-Implementations are encouraged to provide this function as a builtin.
-
-<h1><a name="mplm">Implementation</a></h1>
-
-<p>This implementation relies on SRFI-9 for distinctness of the hash table
-type, and on SRFI-23 for error reporting.  Otherwise, the implementation
-is pure R5RS.
-
-<pre>
-
-(define *default-bound* (- (expt 2 29) 3))
-
-(define (%string-hash s ch-conv bound)
-  (let ((hash 31)
-	(len (string-length s)))
-    (do ((index 0 (+ index 1)))
-      ((&gt;= index len) (modulo hash bound))
-      (set! hash (modulo (+ (* 37 hash)
-			    (char-&gt;integer (ch-conv (string-ref s index))))
-			 *default-bound*)))))
-
-(define (string-hash s . maybe-bound)
-  (let ((bound (if (null? maybe-bound) *default-bound* (car maybe-bound))))
-    (%string-hash s (lambda (x) x) bound)))
-
-(define (string-ci-hash s . maybe-bound)
-  (let ((bound (if (null? maybe-bound) *default-bound* (car maybe-bound))))
-    (%string-hash s char-downcase bound)))
-
-(define (symbol-hash s . maybe-bound)
-  (let ((bound (if (null? maybe-bound) *default-bound* (car maybe-bound))))
-    (%string-hash (symbol-&gt;string s) (lambda (x) x) bound)))
-
-(define (hash obj . maybe-bound)
-  (let ((bound (if (null? maybe-bound) *default-bound* (car maybe-bound))))
-    (cond ((integer? obj) (modulo obj bound))
-	  ((string? obj) (string-hash obj bound))
-	  ((symbol? obj) (symbol-hash obj bound))
-	  ((real? obj) (modulo (+ (numerator obj) (denominator obj)) bound))
-	  ((number? obj)
-	   (modulo (+ (hash (real-part obj)) (* 3 (hash (imag-part obj))))
-		   bound))
-	  ((char? obj) (modulo (char-&gt;integer obj) bound))
-	  ((vector? obj) (vector-hash obj bound))
-	  ((pair? obj) (modulo (+ (hash (car obj)) (* 3 (hash (cdr obj))))
-			       bound))
-	  ((null? obj) 0)
-	  ((not obj) 0)
-	  ((procedure? obj) (error "hash: procedures cannot be hashed" obj))
-	  (else 1))))
-
-(define hash-by-identity hash)
-
-(define (vector-hash v bound)
-  (let ((hashvalue 571)
-	(len (vector-length v)))
-    (do ((index 0 (+ index 1)))
-      ((&gt;= index len) (modulo hashvalue bound))
-      (set! hashvalue (modulo (+ (* 257 hashvalue) (hash (vector-ref v index)))
-			      *default-bound*)))))
-
-(define %make-hash-node cons)
-(define %hash-node-set-value! set-cdr!)
-(define %hash-node-key car)
-(define %hash-node-value cdr)
-
-(define-record-type &lt;srfi-hash-table&gt;
-  (%make-hash-table size hash compare associate entries)
-  hash-table?
-  (size hash-table-size hash-table-set-size!)
-  (hash hash-table-hash-function)
-  (compare hash-table-equivalence-function)
-  (associate hash-table-association-function)
-  (entries hash-table-entries hash-table-set-entries!))
-
-(define *default-table-size* 64)
-
-(define (appropriate-hash-function-for comparison)
-  (or (and (eq? comparison eq?) hash-by-identity)
-      (and (eq? comparison string=?) string-hash)
-      (and (eq? comparison string-ci=?) string-ci-hash)
-      hash))
-
-(define (make-hash-table . args)
-  (let* ((comparison (if (null? args) equal? (car args)))
-	 (hash
-	   (if (or (null? args) (null? (cdr args)))
-	     (appropriate-hash-function-for comparison) (cadr args)))
-	 (size
-	   (if (or (null? args) (null? (cdr args)) (null? (cddr args)))
-	     *default-table-size* (caddr args)))
-	 (association
-	   (or (and (eq? comparison eq?) assq)
-	       (and (eq? comparison eqv?) assv)
-	       (and (eq? comparison equal?) assoc)
-	       (letrec
-		 ((associate
-		    (lambda (val alist)
-		      (cond ((null? alist) #f)
-			    ((comparison val (caar alist)) (car alist))
-			    (else (associate val (cdr alist)))))))
-		 associate))))
-    (%make-hash-table 0 hash comparison association (make-vector size '()))))
-
-(define (make-hash-table-maker comp hash)
-  (lambda args (apply make-hash-table (cons comp (cons hash args)))))
-(define make-symbol-hash-table
-  (make-hash-table-maker eq? symbol-hash))
-(define make-string-hash-table
-  (make-hash-table-maker string=? string-hash))
-(define make-string-ci-hash-table
-  (make-hash-table-maker string-ci=? string-ci-hash))
-(define make-integer-hash-table
-  (make-hash-table-maker = modulo))
-
-(define (%hash-table-hash hash-table key)
-  ((hash-table-hash-function hash-table)
-     key (vector-length (hash-table-entries hash-table))))
-
-(define (%hash-table-find entries associate hash key)
-  (associate key (vector-ref entries hash)))
-
-(define (%hash-table-add! entries hash key value)
-  (vector-set! entries hash
-	       (cons (%make-hash-node key value)
-		     (vector-ref entries hash))))
-
-(define (%hash-table-delete! entries compare hash key)
-  (let ((entrylist (vector-ref entries hash)))
-    (cond ((null? entrylist) #f)
-	  ((compare key (caar entrylist))
-	   (vector-set! entries hash (cdr entrylist)) #t)
-	  (else
-	    (let loop ((current (cdr entrylist)) (previous entrylist))
-	      (cond ((null? current) #f)
-		    ((compare key (caar current))
-		     (set-cdr! previous (cdr current)) #t)
-		    (else (loop (cdr current) current))))))))
-
-(define (%hash-table-walk proc entries)
-  (do ((index (- (vector-length entries) 1) (- index 1)))
-    ((&lt; index 0)) (for-each proc (vector-ref entries index))))
-
-(define (%hash-table-maybe-resize! hash-table)
-  (let* ((old-entries (hash-table-entries hash-table))
-	 (hash-length (vector-length old-entries)))
-    (if (&gt; (hash-table-size hash-table) hash-length)
-      (let* ((new-length (* 2 hash-length))
-	     (new-entries (make-vector new-length '()))
-	     (hash (hash-table-hash-function hash-table)))
-	(%hash-table-walk
-	  (lambda (node)
-	    (%hash-table-add! new-entries
-			      (hash (%hash-node-key node) new-length)
-			      (%hash-node-key node) (%hash-node-value node)))
-	  old-entries)
-	(hash-table-set-entries! hash-table new-entries)))))
-
-(define (hash-table-ref hash-table key . maybe-default)
-  (cond ((%hash-table-find (hash-table-entries hash-table)
-			   (hash-table-association-function hash-table)
-			   (%hash-table-hash hash-table key) key)
-	 =&gt; %hash-node-value)
-	((null? maybe-default)
-	 (error "hash-table-ref: no value associated with" key))
-	(else ((car maybe-default)))))
-
-(define (hash-table-ref/default hash-table key default)
-  (hash-table-ref hash-table key (lambda () default)))
-
-(define (hash-table-set! hash-table key value)
-  (let ((hash (%hash-table-hash hash-table key))
-	(entries (hash-table-entries hash-table)))
-    (cond ((%hash-table-find entries
-			     (hash-table-association-function hash-table)
-			     hash key)
-	   =&gt; (lambda (node) (%hash-node-set-value! node value)))
-	  (else (%hash-table-add! entries hash key value)
-		(hash-table-set-size! hash-table
-				       (+ 1 (hash-table-size hash-table)))
-		(%hash-table-maybe-resize! hash-table)))))
-
-(define (hash-table-update! hash-table key function . maybe-default)
-  (let ((hash (%hash-table-hash hash-table key))
-	(entries (hash-table-entries hash-table)))
-    (cond ((%hash-table-find entries
-			     (hash-table-association-function hash-table)
-			     hash key)
-	   =&gt; (lambda (node)
-	        (%hash-node-set-value!
-		  node (function (%hash-node-value node)))))
-	  ((null? maybe-default)
-	   (error "hash-table-update!: no value exists for key" key))
-	  (else (%hash-table-add! entries hash key
-				  (function ((car maybe-default))))
-		(hash-table-set-size! hash-table
-				       (+ 1 (hash-table-size hash-table)))
-		(%hash-table-maybe-resize! hash-table)))))
-
-(define (hash-table-update!/default hash-table key function default)
-  (hash-table-update! hash-table key function (lambda () default)))
-
-(define (hash-table-delete! hash-table key)
-  (if (%hash-table-delete! (hash-table-entries hash-table)
-			   (hash-table-equivalence-function hash-table)
-			   (%hash-table-hash hash-table key) key)
-    (hash-table-set-size! hash-table (- (hash-table-size hash-table) 1))))
-
-(define (hash-table-exists? hash-table key)
-  (and (%hash-table-find (hash-table-entries hash-table)
-			 (hash-table-association-function hash-table)
-			 (%hash-table-hash hash-table key) key) #t))
-
-(define (hash-table-walk hash-table proc)
-  (%hash-table-walk
-    (lambda (node) (proc (%hash-node-key node) (%hash-node-value node)))
-    (hash-table-entries hash-table)))
-
-(define (hash-table-fold hash-table f acc)
-  (hash-table-walk hash-table 
-		       (lambda (key value) (set! acc (f key value acc))))
-  acc)
-
-(define (alist-&gt;hash-table alist . args)
-  (let* ((comparison (if (null? args) equal? (car args)))
-	 (hash
-	   (if (or (null? args) (null? (cdr args)))
-	     (appropriate-hash-function-for comparison) (cadr args)))
-	 (size
-	   (if (or (null? args) (null? (cdr args)) (null? (cddr args)))
-	     (max *default-table-size* (* 2 (length alist))) (caddr args)))
-	 (hash-table (make-hash-table comparison hash size)))
-    (for-each
-      (lambda (elem)
-	(hash-table-update!/default
-	  hash-table (car elem) (lambda (x) x) (cdr elem)))
-      alist)
-    hash-table))
-
-(define (hash-table-&gt;alist hash-table)
-  (hash-table-fold hash-table
-		   (lambda (key val acc) (cons (cons key val) acc)) '()))
-
-(define (hash-table-copy hash-table)
-  (let ((new (make-hash-table (hash-table-equivalence-function hash-table)
-  			      (hash-table-hash-function hash-table)
-			      (max *default-table-size*
-				   (* 2 (hash-table-size hash-table))))))
-    (hash-table-walk hash-table
-		     (lambda (key value) (hash-table-set! new key value)))
-    new))
-
-(define (hash-table-merge! hash-table1 hash-table2)
-  (hash-table-walk
-    hash-table2
-    (lambda (key value) (hash-table-set! hash-table1 key value)))
-  hash-table1)
-
-(define (hash-table-keys hash-table)
-  (hash-table-fold hash-table (lambda (key val acc) (cons key acc)) '()))
-
-(define (hash-table-values hash-table)
-  (hash-table-fold hash-table (lambda (key val acc) (cons val acc)) '()))
-
-
-</pre>
-
-<h1><a name="Cpr">Copyright</a></h1>
-
-<p>Copyright &copy; Panu Kalliokoski (2005). All Rights Reserved.
-
-<p>Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-<q>Software</q>), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-<p>The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-<p>THE SOFTWARE IS PROVIDED <q>AS IS</q>, WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-    <hr>
-    <address>Editor: <a HREF="mailto:srfi-editors@srfi.schemers.org">David Van Horn</a></address>
-Last modified: Wed Sep 14 09:54:51 EDT 2005
-
-</body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-7.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-7.html
deleted file mode 100644
index 17cbb0b4be..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-7.html
+++ /dev/null
@@ -1,337 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.2//EN">
-<html>
-<head>
-   <title>SRFI 7: Feature-based program configuration language</title>
-</head>
-<body>
-
-<H1>Title</H1>
-
-SRFI-7: Feature-based program configuration language
-
-<H1>Author</H1>
-
-Richard Kelsey
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion via <A HREF="http://srfi.schemers.org/srfi-7/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P><UL>
-<LI>Received: 1999/05/12
-<LI>Draft: 1999/05/26-1999/07/26
-<LI>Final: 1999/08/19
-</UL>
-
-<H1>Abstract</H1>
-
-<p>
-This SRFI describes a configuration language to be used for specifing
-the set of Scheme features or extensions required to run a program.
-In addition to a list of required features, a program may also contain
-Scheme code to be used only when a particular feature or combination of
-features is available.
-</p>
-
-<p>
-The configuration language is entirely distinct from Scheme; it is
-neither embedded in Scheme nor includes Scheme as a subset.
-</p>
-
-<H1>Rationale</H1>
-
-<p>
-The use of a separate configuration language makes it easy for
-both human and machine readers to determine the requirements of a
-program.  It also avoids ambiguities arising from having to expand
-macros to determine which features, and thus which macros, are used
-in the program.
-</p>
-
-<p> See <a href="http://srfi.schemers.org/srfi-0">SRFI 0</a> for a
-rationale for the need for some kind of configuration control.
-</p>
-
-<H1>Specification</H1>
-<a name="program"></a>
-<a name="requires"></a>
-<a name="code"></a>
-<a name="feature-cond"></a>
-<a name="and"></a>
-<a name="or"></a>
-<a name="not"></a>
-<a name="else"></a>
-
-<H2>Syntax</H2>
-
-<p>
-<pre>
- &lt;program&gt; --&gt; (program &lt;program clause&gt;+)
-
- &lt;program clause&gt;
-   --&gt; (requires &lt;feature identifier&gt;+)
-     | (files &lt;filename&gt;*)
-     | (code &lt;Scheme expression, definition, or syntax definition&gt;*)
-     | (feature-cond &lt;feature-cond clause&gt;+)
-     | (feature-cond &lt;feature-cond clause&gt;* (else &lt;program clause&gt;+))
-
- &lt;feature-cond clause&gt;
-   --&gt; (&lt;feature requirement&gt; &lt;program clause&gt;+)
-
- &lt;feature requirement&gt;
-   --&gt; &lt;feature identifier&gt;
-     | (and &lt;feature requirement&gt;*)
-     | (or &lt;feature requirement&gt;*)
-     | (not &lt;feature requirement&gt;)
-
- &lt;feature identifier&gt;
-   --&gt; a symbol which is the name of a SRFI
-</pre>
-</p>
-
-<H2>Semantics</H2>
-<p>
-The configuration language is distinct from Scheme.  Given a set of
-available features a <code>&lt;program&gt;</code> can be converted into a
-sequence of Scheme commands, definitions, and syntax definitions.
-This conversion does not require expanding macros or doing any other
-processing of Scheme code.
-</p>
-
-<p>
-An implementation of the configuration language will need to provide
-some method for executing a program.  For example, it might have a
-<code>(LOAD-PROGRAM &lt;filename&gt;)</code> function or a compiler that
-compiles a program into an executable file.
-</p>
-
-<p> The meanings of the different <code>&lt;program&gt;</code> clauses are
-given below.  The ordering of the clauses in a <code>&lt;program&gt;</code>
-determines the order of the forms in the resultant Scheme program.
-
-<p> In processing the <code>REQUIRES</code> and
-<code>FEATURE-COND</code> clauses in a <code>&lt;program&gt;</code>,
-an implementation should be consistent with some fixed set of present
-and absent features.  An implementation may analyze a <code>&lt;program&gt;</code>
-before choosing a set of features to use in processing it, but it
-should not use different sets of features for different clauses in the
-same <code>&lt;program&gt;</code>.
-</p>
-
-<dl>
-      <dt><code>(requires &lt;feature-identifier&gt;+)</code></dt>
-      <dd>The listed features are required by the program.  If one or
-	more is not provided by the implementation the program cannot
-	be run.
-      </dd>
-      
-    <dt><code>(files &lt;filename&gt;*)</code></dt>
-  <dd>The listed files are read and the forms they contain added to the program.</dd>
-
-    <dt><code>(code &lt;body&gt;)</code></dt>
-  <dd>The forms in &lt;body&gt; are added to the program.</dd>
-
-    <dt><code>(feature-cond &lt;feature-cond clause&gt;+)</code></dt>
-      <dd>The meaning of a <code>FEATURE-COND</code> clause is that of the
-<code>&lt;program-clause&gt;</code>s in the first <code>&lt;feature-cond clause&gt;</code> whose
-<code>&lt;implementation-requirement&gt;</code> is satisfied by the implementation.
-If an <code>ELSE</code> clause is present it is used if and only if no preceding
-clause is satisfied; a <code>FEATURE-COND</code> with an
-<code>ELSE</code> clause is always satisfied.
-
-<p>If no clause can be satisified the <code>&lt;program&gt;</code> cannot be evaluated in
-the implementation.</p>
-
-	<p>
-The meaning of the <code>&lt;implementation requirement&gt;</code>s is as follows:</p>
-
-	<table>
-	  <tr><td><code>&lt;feature identifier&gt;</code></td><td>satisfied if the feature is present</td>
-	  </tr>
-
-	  <tr><td><code>(and)</code></td><td>always satisfied</td>
-	  </tr>
-
-	<tr><td><code>(and x ...)</code></td><td>satisfied if every
-	<code>X</code> is satisfied</td>
-	    </tr>
-
-	<tr><td><code>(or)</code></td><td>never satisfied</td></tr>
-
-	<tr><td><code>(or x ...)</code></td><td>satisfied if any
-	<code>X</code> is satisfied</td></tr>
-
-	  <tr><td><code>(not x)</code></td><td>satisfied if <code>X</code> is not satisfied</td></tr>
-	</table>
-
-</dl>
-
-<H1>Implementation</H1>
-
-<p> Two implementations are provided here.  The first is a
-<code>PROCESS-PROGRAM</code> function that converts a
-<code>&lt;program&gt;</code>, represented as an S-expression, and a
-list of feature identifiers and returns the list expressions,
-definitions, and syntax definitions that are the source for the
-<code>&lt;program&gt;</code> in the presence of those features.  The
-function returns <code>#F</code> if the program cannot be run using
-the features provided.
-</p>
-
-<p>
-This is not a complete implementation of the configuration language; it needs
-an (implementation-dependent) method for evaluating the forms returned by
-<code>PROCESS-PROGRAM</code>.
-</p>
-
-<p>
-<pre>
-(define (process-program program features)
-  (call-with-current-continuation
-    (lambda (exit)	; We exit early when an unsatisfiable clause is found.
-
-      ; Process each clause in turn
-
-      (define (process-clauses clauses)
-	(if (null? clauses)
-	    '()
-	    (append (process-clause (car clauses))
-		    (process-clauses (cdr clauses)))))
-      
-      ; Dispatch on the type of the clause.
-
-      (define (process-clause clause)
-	(case (car clause)
-	  ((requires)
-	   (if (all-satisfied? (cdr clause))
-	       '()
-	       (exit #f)))
-	  ((code)
-	   (cdr clause))
-	  ((files)
-	   (read-files (cdr clause)))
-	  ((feature-cond)
-	   (process-cond-clauses (cdr clause)))))
-      
-      ; Loop through CLAUSES finding the first that is satisfied.
-
-      (define (process-cond-clauses clauses)
-	(cond ((null? clauses)
-	       (exit #f))
-	      ((or (and (eq? (caar clauses) 'else)
-			(null? (cdr clauses)))
-		   (satisfied? (caar clauses)))
-	       (process-clauses (cdar clauses)))
-	      (else
-	       (process-cond-clauses (cdr clauses)))))
-    
-      ; Compound requirements are handled recursively, simple ones are tested.
-
-      (define (satisfied? requirement)
-	(if (pair? requirement)
-	    (case (car requirement)
-	      ((and)
-	       (all-satisfied? (cdr requirement)))
-	      ((or)
-	       (any-satisfied? (cdr requirement)))
-	      ((not)
-	       (not (satisfied? (cadr requirement)))))
-	    (memq requirement features)))
-      
-      ; True if every requirement in LIST is satisfied.
-
-      (define (all-satisfied? list)
-	(if (null? list)
-	    #t
-	    (and (satisfied? (car list))
-		 (all-satisfied? (cdr list)))))
-      
-      ; True if any requirement in LIST is satisfied.
-
-      (define (any-satisfied? list)
-	(if (null? list)
-	    #f
-	    (or (satisfied? (car list))
-		(any-satisfied? (cdr list)))))
-      
-      ; Start by doing the whole program.
-
-      (process-clauses (cdr program)))))
-
-; Returns a list of the forms in the named files.
-
-(define (read-files filenames)
-  (if (null? filenames)
-      '()
-      (append (call-with-input-file (car filenames)
-		(lambda (in)
-		  (let label ()
-		    (let ((next (read in)))
-		      (if (eof-object? next)
-			  '()
-			  (cons next (label)))))))
-	      (read-files (cdr filenames)))))
-</pre></p>
-
-<p>
-The second implementation is a <code>PROGRAM</code> macro that implements
-the configuration language in terms of the <code>COND-EXPAND</code>
-syntax of <a href="http://srfi.schemers.org/srfi-0">SRFI 0</a>.
-Note that this implementation requires that <code>LOAD</code> use the current
-evaluation environment.
-</p>
-
-<p><pre>
-(define-syntax program
-  (syntax-rules (requires files code feature-cond)
-    ((program)
-     (begin))
-    ((program (requires feature-id ...)
-              more ...)
-     (begin (cond-expand ((and feature-id ...) 'okay))
-            (program more ...)))
-    ((program (files filename ...)
-              more ...)
-     (begin (load filename) ...
-            (program more ...)))
-    ((program (code stuff ...)
-              more ...)
-     (begin stuff ...
-            (program more ...)))
-    ((program (feature-cond (requirement stuff ...) ...)
-              more ...)
-     (begin (cond-expand (requirement (program stuff ...)) ...)
-            (program more ...)))))
-</pre></p>
-
-<H1>Copyright</H1>
-
-Copyright (C) Richard Kelsey (1999). All Rights Reserved.
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-
-</body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-71.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-71.html
deleted file mode 100644
index a22c3d6414..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-71.html
+++ /dev/null
@@ -1,549 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  <head>
-    <title>SRFI 71: Extended LET-syntax for multiple values</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-Extended LET-syntax for multiple values
-
-<H1>Author</H1>
-
-<a href="mailto:sebastian.egner-AT-philips.com">Sebastian Egner</a>
-
-<p>
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see
-<A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-To
-provide input on this SRFI, please <CODE>
-<A HREF="mailto:srfi-71@srfi.schemers.org">mailto:srfi-71@srfi.schemers.org</A></CODE>.
-See <A HREF="http://srfi.schemers.org/srfi-list-subscribe.html">instructions
-here</A> to subscribe to the list. You can access the discussion via
-<A HREF="http://srfi.schemers.org/srfi-71/mail-archive/maillist.html">the
-archive of the mailing list</A>.
-You can access
-post-finalization messages via
-<a href="http://srfi.schemers.org/srfi-71/post-mail-archive/maillist.html">
-the archive of the mailing list</a>.
-</p>
-<UL>
-  <LI>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-71/srfi-71.html?rev=1.1">2005/05/16</a></LI>
-  <li>Draft: 2005/05/16 - 2005/07/14</li>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-71/srfi-71.html?rev=1.2">2005/05/18</a>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-71/srfi-71.html?rev=1.3">2005/08/01</a>
-  <li>Final: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-71/srfi-71.html?rev=1.6">2005/08/12</a>
-</UL>
-
-
-<H1>Abstract</H1>
-
-This SRFI is a proposal for extending <code>let</code>,
-<code>let*</code>, and <code>letrec</code>
-for receiving multiple values.
-The syntactic extension is fully compatible with the existing syntax.
-It is the intention that single-value bindings, 
-i.e. <code>(let ((var expr)) ...)</code>, and
-multiple-value binding can be mixed freely and conveniently.
-<p>
-The most simple form of the new syntax is best explained by an example:
-<p>
-<pre>(define (quo-rem x y)
-  (values (quotient x y) (remainder x y)))
-
-(define (quo x y)
-  (let ((q r (quo-rem x y)))
-    q))
-</pre>
-The procedure <code>quo-rem</code> delivers two values to
-its continuation. These values are received as <code>q</code>
-and <code>r</code> in the <code>let</code>-expression of the
-procedure <code>quo</code>.
-In other words, the syntax of <code>let</code> is extended such
-that several variables can be specified---and these variables
-receive the values delivered by the expression <code>(quo-rem x y)</code>.
-<p>
-The syntax of <code>let</code> is further extended to cases in which
-a rest argument receives the list of all residual values.
-Again by example, 
-<pre>(let (((values y1 y2 . y3+) (foo x)))
-   body)
-</pre>
-In this example, <code>values</code> is a syntactic keyword 
-indicating the presence of multiple values to be received,
-and <code>y1</code>, <code>y2</code>, and <code>y3+</code>, 
-resp., are variables bound to the first value, the second value,
-and the list of the remaining values, resp., as produced by 
-<code>(foo x)</code>.
-The syntactic keyword <code>values</code> allows receiving
-all values as in <code>(let (((values . xs) (foo x))) body)</code>.
-It also allows receiving no values at all as in 
-<code>(let (((values) (for-each foo list))) body)</code>.
-<p>
-A common application of binding multiple values is
-decomposing data structures into their components.
-This mechanism is illustrated in its most primitive form as follows:
-The procedure <code>uncons</code> (defined below) 
-decomposes a pair <code>x</code> into its car and its cdr
-and delivers them as two values to its continuation.
-Then an extended <code>let</code> can receive these values:
-<pre>(let ((car-x cdr-x (uncons x)))
-  (foo car-x cdr-x))
-</pre>
-Of course, for pairs this method is probably neither faster 
-nor clearer than using the procedures <code>car</code>
-and <code>cdr</code>.
-However, for data structures doing substantial work upon
-decomposition this is different: Extracting the element of
-highest priority from a priority queue, while at the
-same time constructing the residual queue,
-can both be more efficient and more convenient than
-doing both operations independently.
-In fact, the <code>quo-rem</code> example illustrates this
-point already as both quotient and remainder are probably
-computed by a common exact division algorithm.
-(And often caching is used to avoid executing this
-algorithm twice as often as needed.)
-<p>
-As the last feature of this SRFI, a mechanism is specified
-to store multiple values in heap-allocated data structures.
-For this purpose, <code>values->list</code> and <code>values->vector</code>
-construct a list (a vector, resp.) storing all values delivered 
-by evaluating their argument expression.
-Note that these operations cannot be procedures.
-
-<H1>Rationale</H1>
-
-My original motivation for writing this SRFI is my unhappiness with
-the current state of affairs in Scheme with respect to multiple values.
-Multiple values are mandatory in the
-Revised^5 Report on the Algorithmic
-Language Scheme (<a href="#R5RS">R5RS</a>),
-and they are fully available in all major Scheme implementations.
-Yet there is often a painful hesitation about using them.
-<p>
-The reason for this hesitation is that multiple values are
-nearly fully integrated into Scheme---but not quite.
-(Unlike for example in the languages Matlab, Octave, or
-the computer algebra system Magma, in which returning
-multiple values from a function is the most natural thing
-in the world: <code>q, r := quo_rem(x, y);</code>)
-However, considerable progress has been made on this point,
-and I understand this SRFI as a minor contribution 
-"placing the last corner stone".
-But first a very brief history of multiple values in Scheme,
-as far as relevant for this SRFI.
-<p>
-<a href="#R5RS">R5RS</a> specifies the procedures <code>values</code>
-and <code>call-with-values</code> for passing any number of values
-from a producer procedure to a consumer procedure. 
-This is the only construct in R5RS 
-dealing with multiple values explicitly, and it is sufficient
-to implement anything that can be implemented for multiple values.
-<p>
-However, as John David Stone observed in <a href="#SRFI8">SRFI&nbsp;8</a>,
-the mechanism exposes explicitly how multiple values are 
-passed---but that is hardly ever interesting.
-In fact, <code>call-with-values</code> is often clumsy because
-the continuations are made explicit.
-<a href="#SRFI8">SRFI&nbsp;8</a> improves on this situation
-by adding the special form 
-<code>(receive &lt;formals&gt; &lt;expression&gt; &lt;body&gt;)</code>
-for receiving several values produced by the expression
-in variables specified by <code>&lt;formals&gt;</code> and
-using them in the body.
-<p>
-The major limitation of <code>receive</code> is that it can only 
-handle a single expression, which means programs dealing with
-multiple values frequently get deeply nested.
-<a href="#SRFI11">SRFI&nbsp;11</a> provides a more versatile construct:
-<code>Let-values</code> and <code>let*-values</code> are
-modeled after <code>let</code> and <code>let*</code> but
-replace <code>&lt;variable&gt;</code> by an argument list
-with the syntax of <code>&lt;formals&gt;</code>.
-The <code>let-values</code> binding construct makes multiple
-values about as convenient as it will ever get in Scheme.
-Its primary shortcoming is that <code>let-values</code> is
-incompatible with the existing syntax of <code>let</code>:
-In <code>(let-values ((v x)) ...)</code> is <code>v</code> bound
-to the list of all values delivered by <code>x</code> (as in <a href="#SRFI11">SRFI&nbsp;11</a>)?
-Or is <code>x</code> to deliver a single value to be
-bound to <code>v</code> (as in <code>let</code>)?
-Refer to the 
-<a href="http://srfi.schemers.org/srfi-11/mail-archive/threads.html">discussion
-archive of SRFI 11</a> for details.
-Moreover, <code>let-values</code> suffers from "parenthesis complexity",
-despite Scheme programmers are tolerant to braces.
-<p>
-Eli Barzilay's <a href="#Eli">Swindle</a> library (for MzScheme) on 
-the other hand redefines let to include multiple-values and internal
-procedures: The syntactic keyword <code>values</code> indicates the
-presence of multiple values, while additional parentheses (with the
-syntax of <code>&lt;formals&gt;</code>)
-indicate a <code>lambda</code>-expression as right-hand side.
-<p>
-This SRFI follows Eli's approach, while keeping the syntax
-simple (few parentheses and concepts) and adding tools for
-dealing more conveniently with multiple values.
-The aim is convenient integration of multiple values into Scheme,
-at full coexistence with the existing syntax (<a href="#R5RS">R5RS</a>.)
-This is achieved by extending the syntax in two different
-ways (multiple left-hand sides or a syntactic keyword)
-and adding operations to convert between (implicitly passed)
-values and (first class) data structures.
-<p>
-Finally, I would like to mention that Oscar Waddell et al.
-describe an efficient compilation method for Scheme's 
-<code>letrec</code> (<a href="#Fix">Fixing Letrec</a>)
-and propose a <code>letrec*</code> binding construct
-to as a basis for internal <code>define</code>.
-I expect their compilation method (and <code>letrec*</code>)
-and this SRFI to be fully compatible with one another,
-although I have not checked this claim by way of implementation.
-
-<H1>Specification</H1>
-
-<a name="let"></a>The syntax of Scheme (<a href="#R5RS">R5RS</a>, Section 7.1.3.)
-is extended by replacing the existing production:
-
-<pre>&lt;binding spec&gt; --&gt; (&lt;variable&gt; &lt;expression&gt;)
-</pre>
-
-by the three new productions
-
-<pre>&lt;binding spec&gt; --&gt; ((values &lt;variable&gt;*) &lt;expression&gt;)
-&lt;binding spec&gt; --&gt; ((values &lt;variable&gt;* . &lt;variable&gt;) &lt;expression&gt;)
-&lt;binding spec&gt; --&gt; (&lt;variable&gt;+ &lt;expression&gt;)
-</pre>
-
-The form <code>(&lt;variable&gt;+ &lt;expression&gt;)</code> is just
-an abbreviation for <code>((values &lt;variable&gt;+) &lt;expression&gt;)</code>,
-and it includes the original <code>&lt;binding spec&gt;</code> of <a href="#R5RS">R5RS</a>.
-<p>
-The first two forms are evaluated as follows: The variables are bound and
-the expression is evaluated according to the enclosing construct
-(either <code>let</code>, <code>let*</code>, or <code>letrec</code>.)
-However, the expression may deliver any number of values to its continuation, 
-which stores these values into the variables specified, 
-possibly allocating a rest list in case of the <code>. &lt;variable&gt;</code> form. 
-<p>
-The number of values delivered by the expression must match the
-number of values expected by the binding specification.
-Otherwise an error is raised, as <code>call-with-values</code> would.
-This implies in particular, that each binding of a named let involves
-exactly one value, because this binding can also be an argument to a
-lambda-expression.
-
-<h3>Standard operations</h3>
-
-The following procedures, specified in terms of standard procedures,
-are added to the set of standard procedures:
-<pre><a name="uncons"></a>(define (uncons pair)
-  (values (car pair) (cdr pair)))
-
-(define (uncons-2 list)
-  (values (car list) (cadr list) (cddr list)))
-
-(define (uncons-3 list)
-  (values (car list) (cadr list) (caddr list) (cdddr list)))
-
-(define (uncons-4 list)
-  (values (car list) (cadr list) (caddr list) (cadddr list) (cddddr list)))
-
-<a name="uncons-cons"></a>(define (uncons-cons alist)
-  (values (caar alist) (cdar alist) (cdr alist)))
-
-<a name="unlist"></a>(define (unlist list)
-  (apply values list))
-
-<a name="unvector"></a>(define (unvector vector)
-  (apply values (vector->list vector)))
-</pre>
-These procedures decompose the standard concrete data structures
-(pair, list, vector) and deliver the components as values.
-It is an error if the argument cannot be decomposed as expected.
-Note that the procedures are not necessarily implemented by
-the definition given above.
-<p>
-The preferred way of decomposing a list into the first two elements
-and the rest list is <code>(let ((x1 x2 x3+ (uncons-2 x))) body)</code>,
-and similar for three or four elements and a rest.
-This is <i>not</i> equivalent to 
-<code>(let (((values x1 x2 . x3+) (unlist x))) body)</code>
-because the latter binds <code>x3+</code> to a newly allocated
-copy of <code>(cddr x)</code>.
-<p>
-Finally, the following two macros are added to the standard macros:
-
-<pre><a name="values2list"></a>(values->list   &lt;expression&gt;)
-<a name="values2vector"></a>(values->vector &lt;expression&gt;)
-</pre>
-
-These operation receive all values (if any) delivered by their 
-argument expression and return a newly allocated list (vector, resp.)
-of these values. 
-Note that <code>values->list</code> is <i>not</i> the same as 
-<code>list</code> (the procedure returning the list of its arguments).
-
-<H1>Design Rationale</H1>
-
-<h3>Which alternatives designs for the syntax were considered?</h3>
-
-This SRFI defines two notations for receiving several values:
-Using the keyword <code>values</code>,
-or simply listing the variables if there is at least one.
-There are several alternatives for this design,
-some of which were proposed during the discussion.
-(Refer in particular to <a href="http://srfi.schemers.org/srfi-71/mail-archive/msg00000.html">msg00000</a>,
-<a href="http://srfi.schemers.org/srfi-71/mail-archive/msg00001.html">msg00001</a>, and
-<a href="http://srfi.schemers.org/srfi-71/mail-archive/msg00002.html">msg00002</a>,
-<a href="http://srfi.schemers.org/srfi-71/mail-archive/msg00007.html">msg00007</a>.)
-The alternatives considered include:
-<ol>
-<li>Just listing the variables (no syntactic keyword at all) as in
-<code>(let ((x1 x2 expr)) body)</code>.</li>
-<li>Only using a keyword, e.g. <code>values</code>, as in
-<code>(let (((values x1 x2 . x3+) expr)) body)</code>.</li>
-<li>A keyword, e.g. <code>dot</code>, indicating the 
-rest list as in <code>(let ((x1 x2 dot x3+ expr)) body)</code>.</li>
-<li>The keyword <code>...</code> indicating the 
-rest list as in <code>(let ((x1 x2 x3+ ... expr)) body)</code>.</li>
-<li>A keyword, e.g. <code>rest</code>, indicating the 
-rest list as in <code>(let ((x1 x2 (rest x3+) expr)) body)</code>.</li>
-<li>Using the <code>&lt;formals&gt;</code> syntax of
-<a href="#R5RS">R5RS</a> as in
-<code>(let (((x1 x2 . x3+) expr)) body)</code>.
-<li>Mimicking <code>&lt;formals&gt;</code> but with
-one level of parentheses removed as in
-<code>(let ((x1 x2 . x3+ expr)) body)</code>.</li>
-<li>As the previous but with additional syntax for 
-&quot;no values&quot; and &quot;just a rest&quot;, e.g.
-<code>(let ((! expr)) body)</code> and
-<code>(let ((xs . expr)) body)</code>.
-</ol>
-<p>
-The requirements for the design are
-compatibility with the existing <code>let</code>,
-concise notation for the frequent use cases,
-robustness against most common mistakes, and
-full flexibility of receiving values.
-<p>
-For the sake of compatibility,
-only modifications of <code>&lt;binding spec&gt;</code> were
-considered. 
-The alternative, i.e. modifying the syntax of <code>let</code> 
-in other ways, was not considered.
-Concerning concise notation, by far the most convenient notation
-is <i>listing the variables</i>.
-As this notation also covers the existing syntax, it was adopted
-as the basis of the extension to be specified.
-<p>
-The <i>listing the variables</i> notation is limited by the fact that
-the preferred marker for a rest list (&quot;<code>.</code>&quot;)
-cannot follow an opening parenthesis as in
-<code>(let ((. xs expr)) body)</code>, 
-nor that it can be followed by two syntactic elements as in
-<code>(let ((x1 . x2+ expr)) body)</code>.
-Lifting these restrictions would require major modifications
-in unrelated parts of the Scheme syntax, which is not an
-attractive option.
-<p>
-Another problematic aspect of the <i>listing the variables</i> notation
-is the case of no variables at all.
-While this case is not conflicting with existing syntax,
-it seriously harms syntactic robustness:
-<code>(let (((run! foo))) body)</code> and 
-<code>(let ((run! foo)) body)</code> would both be
-syntactically correct and could easily be confused with one another.
-For this reason, the notation of listing the variables was
-restricted to one or more variables.
-<p>
-This leaves the problem of extending the notation in order to
-cover rest arguments and the &quot;no values&quot;-case.
-This can either be done <i>ad hoc</i>, covering the open cases,
-or by adding a general notation covering all cases.
-In view of readability and uniformity (useful when code gets
-processed automatically) the latter approach was chosen.
-This has resulted in the design specified in this SRFI.
-
-<h3>Why is <code>values</code> needed in the &quot;zero values&quot;-case?</h3>
-
-The syntax specified in this SRFI allows zero variables being
-bound in a binding specification using the syntax
-<code>(let (((values) (for-each foo (bar)))) body)</code>.
-An alternative is allowing <code>(&lt;expression&gt;)</code>
-as a binding specification.
-(Refer to the discussion archive starting at <a href="http://srfi.schemers.org/srfi-71/mail-archive/msg00001.html">msg00001</a>.)
-<p>
-The syntax specified in this SRFI is designed for static
-detection of the most frequent types (forgotten parentheses).
-For example, writing 
-<code>(let ((values) (for-each foo (bar))) body)</code>
-is not a well-formed let-expression in this SRFI.
-<p>
-In the alternative syntax, both 
-<code>(let (((for-each foo (bar)))) body)</code>
-and <code>(let ((for-each foo (bar))) body)</code> 
-are syntactically correct.
-The first just executes <code>(for-each foo (bar))</code>,
-whereas the second binds the variables <code>for-each</code> and
-<code>foo</code> to the two values delivered by <code>(bar)</code>. 
-Assuming the first meaning was intended, 
-the error will probably manifest itself at the moment 
-<code>(bar)</code> fails to deliver exactly two values.
-Unless it does, in which case the error must manifest itself much 
-further downstream from the fact that <code>foo</code> never got called. 
-<p>
-In order to avoid this sort of expensive typos, 
-the syntax proposed in this SRFI is more verbose
-than it needs to be.
-
-<h3>Why not also include a syntax for procedures?</h3>
-
-This SRFI is a proposal for extending the syntax of <code>let</code>
-etc. in order to include multiple values.
-It is also desirable to extend the syntax of <code>let</code> 
-for simplifying the definition of local procedures.
-(For example, as in <a href="#Swindle">Swindle</a>.)
-However, this SRFI does not include this feature.
-<p>
-The reason I have chosen not restrict this SRFI to a syntax
-for multiple values is simplicity.
-
-<h3>Why the names <code>unlist</code> etc.?</h3>
-
-An alternative naming convention for the decomposition
-operation <code>unlist</code> is <code>list->values</code>,
-which is more symmetric with respect to its
-inverse operation <code>values->list</code>.
-<p>
-This symmetry ends, however, as soon as more complicated
-data structures with other operations are involved.
-Then it becomes apparent that the same data structure can
-support different decomposition operations:
-A double-ended queue (deque) for example supports splitting off
-the head and splitting of the tail; and neither of these
-operations should be named <code>deque->values</code>.
-The <code>un</code>-convention covers this in a natural way.
-<p>
-Please also refer to the double-ended queue (deque) example
-in <a href="examples.scm">examples.scm</a> to see how to
-use decomposition procedures for dealing with data structures.
-
-<h3>Which decomposition operations are included?</h3>
-
-The particular set of operations specified in this SRFI 
-for decomposing lists represents a trade-off between limiting
-the number of operations and convenience.
-<p>
-As Al Petrofsky has pointed out during the discussion
-(<a href="http://srfi.schemers.org/srfi-71/mail-archive/msg00018.html">
-msg00018</a>) it is not sufficient to have only 
-<code>unlist</code> as this will copy the rest list.
-For this reason specialized decomposition operations
-for splitting off the first 1, ..., 4 elements are
-provided, and a decomposition operation expecting the
-first element to be a pair itself.
-These appear to be the most common cases.
-
-<H1>Implementation</H1>
-
-The reference implementation is written in <a href="#R5RS">R5RS</a> 
-using hygienic macros, only.
-It is not possible, however, to portably detect read access to
-an uninitialized variable introduced by <code>letrec</code>.
-The definition of the actual functionality can be found 
-<a href="letvalues.scm">here</a>.
-The implementation defines macros <code>srfi-let/*/rec</code> etc.
-in terms of <code>r5rs-let/*/rec</code>.
-Implementors may use this to redefine (or even re-implement)
-<code>let/*/rec</code> in terms of <code>srfi-let/*/rec</code>,
-while providing implementations of <code>r5rs-let/*/rec</code>.
-An efficient method for the latter is given in <a href="#Fix">Fixing Letrec</a>
-by O. Waddell et al.
-<p>
-<i>R5RS:</i>
-For trying out the functionality, a complete implementation under
-<a href="#R5RS">R5RS</a> can be found <a href="letvalues-r5rs.scm">here</a>. 
-It defines <code>r5rs-let/*/rec</code> in terms of <code>lambda</code>
-and redefines <code>let/*/rec</code> as <code>srfi-let/*/rec</code>.
-This may not be the most efficient implementation, because many
-Scheme systems handle <code>let</code> etc. specially and do not
-reduce it into <code>lambda</code>
-<p>
-<i>PLT&nbsp;208:</i>
-The implementation found <a href="letvalues-plt.scm">here</a>
-uses <a href="#PLT">PLT</a>'s module system for exporting 
-<code>srfi-let/*/rec</code>
-under the name of <code>let/*/rec</code>, while defining
-<code>r5rs-let/*/rec</code> as a copy of the built-in
-<code>let/*/rec</code>. This code should be efficient.
-<p>
-Examples using the new functionality
-can be found in <a href="examples.scm">examples.scm</a>.
-
-<H1>References</H1>
-
-<table>
-
-<tr>
-<td><a name="R5RS">[R5RS]</a>
-<td>Richard Kelsey, William Clinger, and Jonathan Rees (eds.):
-Revised^5 Report on the Algorithmic Language Scheme of
-20 February 1998.
-Higher-Order and Symbolic Computation, Vol. 11, No. 1, September 1998.
-<a href="http://schemers.org/Documents/Standards/R5RS/">
-http://schemers.org/Documents/Standards/R5RS/</a>.
-</tr>
-
-<tr>
-<td><a name="SRFI8">[SRFI&nbsp;8]</a>
-<td>John David Stone: <code>Receive</code>: Binding to multiple values.
-<a href="http://srfi.schemers.org/srfi-8/">http://srfi.schemers.org/srfi-8/</a>
-</tr>
-
-<tr>
-<td><a name="SRFI11">[SRFI&nbsp;11]</a>
-<td>Lars T. Hansen: Syntax for receiving multiple values.
-<a href="http://srfi.schemers.org/srfi-11/">http://srfi.schemers.org/srfi-11/</a>
-</tr>
-
-<tr>
-<td><a name="Eli">[Swindle]</a>
-<td>Eli Barzilay: Swindle, documentation for "base.ss" (Swindle Version 20040908.)
-<a href="http://www.cs.cornell.edu/eli/Swindle/base-doc.html#let">http://www.cs.cornell.edu/eli/Swindle/base-doc.html#let</a>
-</tr>
-
-<tr>
-<td><a name="Fix">[Fix]</a>
-<td>O. Waddell, D. Sarkar, R. K. Dybvig:
-Fixing Letrec: A Faithful Yet Efficient Implementation of Scheme's
-Recursive Binding Construct. To appear, 2005.
-<a href="http://www.cs.indiana.edu/~dyb/pubs/fixing-letrec.pdf">http://www.cs.indiana.edu/~dyb/pubs/fixing-letrec.pdf</a>
-</tr>
-
-</table>
-
-
-<H1>Copyright</H1>
-Copyright (c) 2005 Sebastian Egner.
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-<p>
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-<p>
-THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    <hr>
-    <address>Author: <a href="mailto:sebastian.egner@philips.com">Sebastian Egner</a></address>
-    <address>Editor: <a
-    href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-<!-- Created: Fri Apr 29 09:30:00 CEST 2005 -->
-<!-- hhmts start -->
-Last modified: Sun Sep 11 16:07:38 CEST 2005
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-74.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-74.html
deleted file mode 100644
index 50be38507c..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-74.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<body>
-<head>
-<title>SRFI 74: Octet-Addressed Binary Blocks</title>
-</head>
-
-<body>
-<H1>Title</H1>
-
-Octet-Addressed Binary Blocks
-
-<H1>Authors</H1>
-
-Michael Sperber
-
-<p>
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see
-<a HREF="http://srfi.schemers.org/srfi-process.html">here</a>.
-To
-provide input on this SRFI, please <code>
-<a HREF="mailto:srfi-74@srfi.schemers.org">mailto:srfi-74@srfi.schemers.org</a></code>.
-See <a HREF="http://srfi.schemers.org/srfi-list-subscribe.html">instructions
-here</a> to subscribe to the list. You can access previous messages via
-<a HREF="http://srfi.schemers.org/srfi-74/mail-archive/maillist.html">the
-archive of the mailing list</a>.
-
-</p>
-<ul>
-  <li>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-74/srfi-74.html?rev=1.1">2005/07/06</a></li>
-  <li>Draft: 2005/07/06 - 2005/09/04</li>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-74/srfi-74.html?rev=1.2">2005/07/22</a>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-74/srfi-74.html?rev=1.3">2005/12/04</a>
-  <li>Final: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-74/srfi-74.html?rev=1.4">2005/12/15</a>
-</ul>
-<h1>Abstract</h1><p>This SRFI defines a set of procedures for creating, accessing, and manipulating octet-addressed blocks of binary data, in short, <i>blobs</i>. The SRFI provides access primitives for fixed-length integers of arbitrary size, with specified endianness, and a choice of unsigned and two's complement representations.</p><h1>Rationale</h1><p>Many applications must deal with blocks of binary data by accessing them in various ways---extracting signed or unsigned numbers of various sizes.  Such an application can use octet vectors as in <a href="http://srfi.schemers.org/srfi-66/">SRFI 66</a> or any of the other types of homogeneous vectors in <a href="http://srfi.schemers.org/srfi-4/">SRFI 4</a>, but these both only allow retrieving the binary data of one type.</p><p>This is awkward in many situations, because an application might access different kinds of entities from a single binary block.  Even for uniform blocks, the disjointness of the various vector data types in SRFI 4 means that, say, an I/O API needs to provide an army of procedures for each of them in order to provide efficient access to binary data.</p><p>Therefore, this SRFI provides a <em>single</em> type for blocks of binary data with multiple ways to access that data.  It deals only with integers in various sizes with specified endianness, because these are the most frequent applications.  Dealing with other kinds of binary data, such as floating-point numbers or variable-size integers would be natural extensions, but are left for a future SRFI.</p><h1>Specification</h1><h2>General remarks</h2><p>Blobs are objects of a new type.  Conceptually, a blob represents a sequence of octets.</p><p>Scheme systems implementing both SRFI 4 and/or SRFI 66 and this SRFI may or may not use the same type for u8vector and blobs.  They are encouraged to do so, however.</p><p>As with u8vectors, the length of a blob is the number of octets it contains.  This number is fixed.  A valid index into a blob  is an exact, non-negative integer.  The first octet of a blob  has index 0, the last octet has an index one less than the  length of the blob.</p><p>Generally, the access procedures come in different flavors according to the size of the represented integer, and the <a href="http://en.wikipedia.org/wiki/Endianness">endianness</a> of the representation.  The procedures also distinguish signed and unsigned representations.  The signed representations all use <a href="http://en.wikipedia.org/wiki/Two's_complement">two's complement</a>.</p><p>For procedures that have no "natural" return value, this SRFI often uses the sentence</p><p><em>The return values are unspecified.</em></p><p>This means that number of return values  and the return values are unspecified.  However, the number of return values  is such that it is accepted by a continuation created by <code>begin</code>.  Specifically, on Scheme implementations where continuations created by <code>begin</code> accept an arbitrary number of arguments (this includes most implementations), it is suggested that the procedure return zero return values.</p><h2>Interface</h2><dl><dt><code>(endianness </code><code>big</code><code>)</code> (syntax)</dt><dt><code>(endianness </code><code>little</code><code>)</code> (syntax)</dt><dt><code>(endianness </code><code>native</code><code>)</code> (syntax)</dt><dd><p><code>(endianness big)</code> and <code>(endianness little)</code> evaluate to two distinct and unique objects representing an  endianness.  The <code>native</code> endianness evaluates to the endianness of the underlying machine architecture, and must be <code>eq?</code> to either <code>(endianness big)</code> or <code>(endianness little)</code>.</p></dd><dt><code>(blob? </code><var>obj</var><code>)</code></dt><dd><p>Returns <code>#t</code> if <var>obj</var> is a blob, otherwise returns <code>#f</code>.</p></dd><dt><code>(make-blob </code><var>k</var><code>)</code></dt><dd><p>Returns a newly allocated blob of <var>k</var> octets, all of them 0.</p></dd><dt><code>(blob-length </code><var>blob</var><code>)</code></dt><dd><p>Returns the number of octets in <var>blob</var> as an exact integer.</p></dd><dt><code>(blob-u8-ref </code><var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-s8-ref </code><var>blob</var> <var>k</var><code>)</code></dt><dd><p><var>K</var> must be a valid index of <var>blob</var>.</p><p><code>Blob-u8-ref</code> returns the octet at index <var>k</var> of <var>blob</var>.</p><p><code>Blob-s8-ref</code> returns the exact integer corresponding to the two's complement representation at index <var>k</var> of <var>blob</var>.</p></dd><dt><code>(blob-u8-set! </code><var>blob</var> <var>k</var> <var>octet</var><code>)</code></dt><dt><code>(blob-s8-set! </code><var>blob</var> <var>k</var> <var>byte</var><code>)</code></dt><dd><p><var>K</var> must be a valid index of <var>blob</var>.</p><p><code>Blob-u8-set!</code> stores <var>octet</var> in element <var>k</var> of <var>blob</var>.</p><p><var>Byte</var>, must be an exact integer in the interval {-128, ..., 127}. <code>Blob-u8-set!</code> stores the two's complement representation  of <var>byte</var> in element <var>k</var> of <var>blob</var>.</p><p>The return values are unspecified.</p></dd><dt><code>(blob-uint-ref </code><var>size</var> <var>endianness</var> <var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-sint-ref </code><var>size</var> <var>endianness</var> <var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-uint-set! </code><var>size</var> <var>endianness</var> <var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dt><code>(blob-sint-set! </code><var>size</var> <var>endianness</var> <var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dd><p><var>Size</var> must be a positive exact integer. <var>K</var> must be a valid index of <var>blob</var>; so must the indices {<var>k</var>, ..., <var>k</var> + <var>size</var> - 1}. <var>Endianness</var> must be an endianness object. </p><p><code>Blob-uint-ref</code> retrieves the exact integer corresponding to the unsigned representation of size <var>size</var> and specified by <var>endianness</var> at indices {<var>k</var>, ..., <var>k</var> + <var>size</var> - 1}.</p><p><code>Blob-sint-ref</code> retrieves the exact integer corresponding to the two's complement representation of size <var>size</var> and specified by <var>endianness</var> at indices {<var>k</var>, ..., <var>k</var> + <var>size</var> - 1}.</p><p>For <code>blob-uint-set!</code>, <var>n</var> must be an exact integer in the interval [0, (256^<var>size</var>)-1]. <code>Blob-uint-set!</code> stores the unsigned representation of size <var>size</var> and specified by <var>endianness</var> into the blob at indices {<var>k</var>, ..., <var>k</var> + <var>size</var> - 1}.</p><p>For <code>blob-uint-set!</code>, <var>n</var> must be an exact integer in the interval [-256^(<var>size</var>-1), (256^(<var>size</var>-1))-1]. <code>Blob-sint-set!</code> stores the two's complement representation of size <var>size</var> and specified by <var>endianness</var> into the blob at indices {<var>k</var>, ..., <var>k</var> + <var>size</var> - 1}.</p></dd><dt><code>(blob-u16-ref </code><var>endianness</var> <var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-s16-ref </code><var>endianness</var> <var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-u16-native-ref </code><var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-s16-native-ref </code><var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-u16-set! </code><var>endianness</var> <var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dt><code>(blob-s16-set! </code><var>endianness</var> <var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dt><code>(blob-u16-native-set! </code><var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dt><code>(blob-s16-native-set! </code><var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dd><p><var>K</var> must be a valid index of <var>blob</var>; so must the index <var>k</var>+ 1. <var>Endianness</var> must be an endianness object. </p><p>These retrieve and set two-octet representations of numbers at indices <var>k</var> and <var>k</var>+1, according to the endianness specified by <var>endianness</var>. The procedures with <code>u16</code> in their names deal with the unsigned representation, those with <code>s16</code> with the two's complement representation.</p><p>The procedures with <code>native</code> in their names employ the native endianness, and only work at aligned indices: <var>k</var> must be a multiple of 2.  It is an error to use them at non-aligned indices.</p></dd><dt><code>(blob-u32-ref </code><var>endianness</var> <var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-s32-ref </code><var>endianness</var> <var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-u32-native-ref </code><var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-s32-native-ref </code><var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-u32-set! </code><var>endianness</var> <var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dt><code>(blob-s32-set! </code><var>endianness</var> <var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dt><code>(blob-u32-native-set! </code><var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dt><code>(blob-s32-native-set! </code><var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dd><p><var>K</var> must be a valid index of <var>blob</var>; so must the indices {<var>k</var>, ..., <var>k</var>+ 3}. <var>Endianness</var> must be an endianness object. </p><p>These retrieve and set four-octet representations of numbers at indices {<var>k</var>, ..., <var>k</var>+ 3}, according to the endianness specified by <var>endianness</var>. The procedures with <code>u32</code> in their names deal with the unsigned representation, those with <code>s32</code> with the two's complement representation.</p><p>The procedures with <code>native</code> in their names employ the native endianness, and only work at aligned indices: <var>k</var> must be a multiple of 4.  It is an error to use them at non-aligned indices.</p></dd><dt><code>(blob-u64-ref </code><var>endianness</var> <var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-s64-ref </code><var>endianness</var> <var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-u64-native-ref </code><var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-s64-native-ref </code><var>blob</var> <var>k</var><code>)</code></dt><dt><code>(blob-u64-set! </code><var>endianness</var> <var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dt><code>(blob-s64-set! </code><var>endianness</var> <var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dt><code>(blob-u64-native-set! </code><var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dt><code>(blob-s64-native-set! </code><var>blob</var> <var>k</var> <var>n</var><code>)</code></dt><dd><p><var>K</var> must be a valid index of <var>blob</var>; so must the indices {<var>k</var>, ..., <var>k</var>+ 7}. <var>Endianness</var> must be an endianness object. </p><p>These retrieve and set eight-octet representations of numbers at indices {<var>k</var>, ..., <var>k</var>+ 7}, according to the endianness specified by <var>endianness</var>. The procedures with <code>u64</code> in their names deal with the unsigned representation, those with <code>s64</code> with the two's complement representation.</p><p>The procedures with <code>native</code> in their names employ the native endianness, and only work at aligned indices: <var>k</var> must be a multiple of 8.  It is an error to use them at non-aligned indices.</p></dd><dt><code>(blob=? </code><var>blob-1</var> <var>blob-2</var><code>)</code></dt><dd><p>Returns <var>#t</var> if <var>blob-1</var> and <var>blob-2</var> are equal---that is, if they have the same length and equal octets at all valid indices.</p></dd><dt><code>(blob-copy! </code><var>source</var> <var>source-start</var> <var>target</var> <var>target-start</var> <var>n</var><code>)</code></dt><dd><p>Copies data from blob <var>source</var> to blob <var>target</var>.  <var>Source-start</var>, <var>target-start</var>, and <var>n</var> must be non-negative exact integers that satisfy</p><p>0 &lt;= <var>source-start</var> &lt;= <var>source-start</var> + <var>n</var> &lt;= <code>(blob-length <var>source</var>)</code></p><p>0 &lt;= <var>target-start</var> &lt;= <var>target-start</var> + <var>n</var> &lt;= <code>(blob-length <var>target</var>)</code></p><p>This copies the octets from <var>source</var> at indices [<var>source-start</var>, <var>source-start</var> + <var>n</var>) to consecutive indices in <var>target</var> starting at <var>target-index</var>.</p><p>This must work even if the memory regions for the source and the target overlap, i.e., the octets at the target location after the copy must be equal to the octets at the source location before the copy.</p><p>The return values are unspecified.</p></dd><dt><code>(blob-copy </code><var>blob</var><code>)</code></dt><dd><p>Returns a newly allocated copy of blob <var>blob</var>.</p></dd><dt><code>(blob-&gt;u8-list </code><var>blob</var><code>)</code></dt><dt><code>(u8-list-&gt;blob </code><var>blob</var><code>)</code></dt><dd><p><code>blob-&gt;u8-list</code>returns a newly allocated list of the octets of <var>blob</var> in the same order.</p></dd><dd><p><code>U8-list-&gt;blob</code> returns a newly allocated blob whose elements are the elements of list <var>octets</var>, which must all be octets, in the same order. Analogous to <code>list-&gt;vector</code>.</p></dd><dt><code>(blob-&gt;uint-list </code><var>size</var> <var>endianness</var> <var>blob</var><code>)</code></dt><dt><code>(blob-&gt;sint-list </code><var>size</var> <var>endianness</var> <var>blob</var><code>)</code></dt><dt><code>(uint-list-&gt;blob </code><var>size</var> <var>endianness</var> <var>list</var><code>)</code></dt><dt><code>(sint-list-&gt;blob </code><var>size</var> <var>endianness</var> <var>list</var><code>)</code></dt><dd><p><var>Size</var> must be a positive exact integer. <var>Endianness</var> must be an endianness object.</p><p>These convert between lists of integers and their consecutive representations according to <var>size</var> and <var>endianness</var> in blobs in the same way as <code>blob-&gt;u8-list</code>, <code>blob-&gt;s8-list</code>, <code> u8-list-&gt;blob</code>, and <code>s8-list-&gt;blob</code> do for one-octet representations.</p></dd></dl><h1>Reference Implementation</h1><p>This <a href="blob.scm">reference implementation</a> makes use of <a href="http://srfi.schemers.org/srfi-23/">SRFI 23</a> (Error reporting mechanism), <a href="http://srfi.schemers.org/srfi-26/">SRFI 26</a> (Notation for Specializing Parameters without Currying), <a href="http://srfi.schemers.org/srfi-60/">SRFI 60</a> (Integers as Bits), and <a href="http://srfi.schemers.org/srfi-66">SRFI 66</a> (Octet Vectors) .</p><h1>Examples</h1><p>The <a href="example.scm">test suite</a> doubles as a source of examples.</p><h1>References</h1><ul><li><a href="http://srfi.schemers.org/srfi-4/">SRFI 4</a> (Homogeneous numeric vector datatypes)</li><li><a href="http://srfi.schemers.org/srfi-56/">SRFI 56</a> (Binary I/O)</li><li><a href="http://srfi.schemers.org/srfi-66/">SRFI 66</a> (Octet Vectors)</li></ul></body><H1>Copyright</H1>
-Copyright (C) Michael Sperber (2005). All Rights Reserved. 
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-<p>
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">David Van Horn</a></address>
-</body></html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-78.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-78.html
deleted file mode 100644
index 4267157268..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-78.html
+++ /dev/null
@@ -1,312 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-  <head>
-    <title>SRFI 78: Lightweight testing</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-Lightweight testing
-
-<H1>Author</H1>
-
-Sebastian Egner
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status.  To see an explanation of
-each status that a SRFI can hold, see <A
-HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-
-To provide input on this SRFI, please <code><A
-HREF="mailto:srfi-78@srfi.schemers.org">mail to
-&lt;srfi-78@srfi.schemers.org&gt;</A></code>.  See <A
-HREF=../srfi-list-subscribe.html>instructions here</A> to subscribe to
-the list.  You can access previous messages via <A
-HREF=mail-archive/maillist.html>the archive of the mailing list</A>.
-
-
-<P><UL>
-<LI>Received: 2005/10/25</LI>
-<LI>Draft: 2005/11/11 - 2006/01/10</LI>
-<LI>Draft extended: 2006/01/17 - 2006/01/31</LI>
-<LI>Revised: 2006/01/18</LI>
-<LI>Revised: 2006/02/08</LI>
-<LI>Final: 2006/03/06</LI>
-</UL>
-
-<H1>Abstract</H1>
-
-A simple mechanism is defined for testing Scheme programs.
-As a most primitive example, the expression
-
-<PRE>   (check (+ 1 1) => 3)
-</PRE>
-
-evaluates the expression <CODE>(+ 1 1)</CODE> and compares the result
-with the expected result 3 provided after the syntactic
-keyword <CODE>=&gt;</CODE>. Then the outcome of this comparison is reported
-in human-readable form by printing a message of the form
-
-<PRE>   (+ 1 1) => 2 ; *** failed ***
-   ; expected result: 3
-</PRE>
-
-Moreover, the outcome of any executed check is recorded
-in a global state counting the number of correct and failed
-checks and storing the first failed check. At the end of a
-file, or at any other point, the user can print a summary
-using <CODE>check-report</CODE>.
-<p>
-In addition to the simple test above, it is also possible
-to execute a parametric sequence of checks. Syntactically,
-this takes the form of an eager comprehension in the sense
-of <A HREF="http://srfi.schemers.org/srfi-42">SRFI 42</A> [5]. For example,
-
-<PRE>   (check-ec (:range e 100)
-             (:let x (expt 2.0 e)) 
-             (= (+ x 1) x) => #f (e x))
-</PRE>
-
-This statement runs the variable <CODE>e</CODE> through {0..99} and
-for each binding defines <CODE>x</CODE> as <CODE>(expt 2.0 e)</CODE>. Then it is 
-checked if <CODE>(+ x 1)</CODE> is equal to <CODE>x</CODE>, and it is expected that
-this is not the case (i.e. expected value is <CODE>#f</CODE>). The
-trailing <CODE>(e x)</CODE> tells the reporting mechanism to print
-the values of both <CODE>e</CODE> and <CODE>x</CODE> in case of a failed check.
-The output could look like this:
-
-<PRE>   (let ((e 53) (x 9007199254740992.0)) (= (+ x 1) x)) => #t ; *** failed ***
-    ; expected result: #f
-</PRE>
-
-The specification of bindings to report, <CODE>(e x)</CODE> in the 
-example, is optional but very informative.
-
-Other features of this SRFI are:
-<UL>
-<LI>A way to specify a different equality predicate (default is <CODE>equal?</CODE>).</LI>
-<LI>Controlling the amount of reporting being printed.</LI>
-<LI>Switching off the execution and reporting of checks entriely.</LI>
-<LI>Retrieving a boolean if all checks have been executed and passed.</LI>
-</UL>
-
-<H1>Rationale</H1>
-The mechanism defined in this SRFI should be available in
-every Scheme system because it has already proven useful
-for interactive development---of SRFIs. 
-<p>
-Although it is extremely straight-forward, the origin of the
-particular mechanism described here is the 'examples.scm' file
-accompanying the reference implementation of SRFI 42 [5].
-The same mechanism has been reimplemented for the reference
-implementation of SRFI 67, and a simplified version is yet
-again found in the reference implementation of SRFI 77.
-<p>
-The mechanism in this SRFI does not replace more sophisticated
-approaches to unit testing, like SRFI 64 [1] or SchemeUnit [2].
-These systems provide more control of the testing, separate
-the definition of a test, its execution, and its reports, and
-provide several other features.
-<p>
-Neil Van Dyke's Testeez library [3] is very close in spirit 
-to this SRFI. In Testeez, tests are disabled by (re-)defining a
-macro. The advantage of this method is that the code for the
-test cases can be removed entirely, and hence even the dependency
-on the Testeez library. This SRFI on the other hand, uses a
-Scheme conditional (<CODE>COND</CODE>, <CODE>IF</CODE>) to prevent execution of the
-testing code. This method is more dynamic but retains dead
-testing code, unless a compiler and a module system are used
-to apply constant folding and dead code elimination. The only
-major addition in SRFI over Testeez is the comprehension for
-formulating parametric tests.
-<p>
-Design considerations for this SRFI include the following:
-<UL>
-<LI> Reporting is human-readable and as specific as possible,
-  i.e. not just "assertion failed" but the expression with
-  actual and expected value, and if possibly the relevant 
-  part of the bindings environment.</LI>
-<LI> An effort is made to print closed Scheme expressions, i.e. 
-  expressions that can directly be copy/pasted into a REPL
-  for further analysis (e.g. the let expression in the abstract).</LI>
-<LI> By default the checks report both correct and failed checks.
-  However, it is possible to reduce the output---or even to 
-  switch off the execution of checks. It has turned out useful
-  to be able to run only some subset checks for the features
-  currently under development. This can be done by changing
-  the reporting mode between different sections.</LI>
-<LI> The global state (correct/failed count) is not made available
-  to the user program. This reduces the dependencies between
-  different checks because it is not possible to use the state.</LI>
-<LI> Ocassionally, it is useful to check that a certain expression 
-  does <I>not</I> yield an ordinary result but raises an error. However, 
-  R5RS [4] does not specify the mechanism by which this occurs
-  (e.g. raising exception, breaking into a REPL, aborting the
-  program, etc.). For this reason, this SRFI is restricted to 
-  the case that the checked expressions evaluate normally.</LI>
-<LI> Though usually I am very much in favor of strictly prefix
-  syntax, for this SRFI I make an exception because the 
-  infix "<CODE>=&gt;</CODE>" syntax is widely used and intuitive.</LI>
-</UL>
-
-<H1>Specification</H1>
-
-<DL>
-<DT><CODE>
-(<a name="check">check</a> &lt;expr&gt; (=&gt; &lt;equal&gt;) &lt;expected&gt;)                                   </CODE>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;MACRO<CODE><BR>
-(check &lt;expr&gt;  =&gt;          &lt;expected&gt;)
-</CODE></DT>
-<DD>
-   evaluates <CODE>&lt;expr&gt;</CODE> and compares the value to the value
-   of <CODE>&lt;expected&gt;</CODE> using the predicate <CODE>&lt;equal&gt;</CODE>, which is
-   <CODE>equal?</CODE> when omitted. Then a report is printed according
-   to the current mode setting (see below) and the outcome
-   is recorded in a global state to be used in <CODE>check-report</CODE>.
-      The precise order of evaluation is that first <CODE>&lt;equal&gt;</CODE>
-   and <CODE>&lt;expected&gt;</CODE> are evaluated (in unspecified order) and
-   then <CODE>&lt;expr&gt;</CODE> is evaluated.<BR>
-   Example: <CODE>(check (+ 1 1) =&gt; 2)</CODE>
-</DD>
-</DL>
-
-<DL>
-<DT><CODE>
-(<a name="check-ec">check-ec</a> &lt;qualifier&gt;</CODE>*<CODE> &lt;expr&gt; (=&gt; &lt;equal&gt;) &lt;expected&gt; (&lt;argument&gt;</CODE>*<CODE>))   </CODE>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;MACRO<CODE><BR>
-(check-ec &lt;qualifier&gt;</CODE>*<CODE> &lt;expr&gt;  =&gt;          &lt;expected&gt; (&lt;argument&gt;</CODE>*<CODE>))<BR>
-(check-ec &lt;qualifier&gt;</CODE>*<CODE> &lt;expr&gt; (=&gt; &lt;equal&gt;) &lt;expected&gt;)<BR>
-(check-ec &lt;qualifier&gt;</CODE>*<CODE> &lt;expr&gt;  =&gt;          &lt;expected&gt;)
-</CODE></DT>
-<DD>
-   an eager comprehension for executing a parametric sequence of checks.<p>
-      Enumerates the sequence of bindings specified by <CODE>&lt;qualifier&gt;</CODE>*.
-   For each binding evaluates <CODE>&lt;equal&gt;</CODE> and <CODE>&lt;expected&gt;</CODE> in unspecified
-   order. Then evalues <CODE>&lt;expr&gt;</CODE> and compares the value obtained to the
-   value of <CODE>&lt;expected&gt;</CODE> using the value of <CODE>&lt;equal&gt;</CODE> as predicate, which
-   is <CODE>equal?</CODE> when omitted.
-      The comprehension stops after the first failed check, if there
-   is any. Then a report is printed according to the current mode 
-   setting (see below) and the outcome is recorded in a global state 
-   to be used in <CODE>check-report</CODE>. The entire <CODE>check-ec</CODE> counts as a single 
-   check.<P>
-      In case the check fails <CODE>&lt;argument&gt;</CODE>* is used for constructing an
-   informative message with the argument values. Use <CODE>&lt;argument&gt;</CODE>* to
-   list the relevant free variables of <CODE>&lt;expr&gt;</CODE> (see examples) that you
-   want to have printed.<P>
-      A <CODE>&lt;qualifier&gt;</CODE> is any qualifier of an eager comprehension as
-   specified in <A HREF="http://srfi.schemers.org/srfi-42">SRFI 42</A> [5].<P>
-
-   Examples:
-   <PRE>     (check-ec (: e 100) (positive? (expt 2 e)) =&gt; #t (e)) ; fails on fixnums
-     (check-ec (: e 100) (:let x (expt 2.0 e)) (= (+ x 1) x) =&gt; #f (x)) ; fails
-     (check-ec (: x 10) (: y 10) (: z 10)
-               (* x (+ y z)) =&gt; (+ (* x y) (* x z))
-               (x y z)) ; passes with 10^3 cases checked
-   </PRE>
-</DD>
-</DL>
-
-<DL>
-<DT><CODE>
-(<a name="check-report">check-report</a>) </CODE>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PROCEDURE<CODE>
-</CODE></DT>
-<DD>
-   prints a summary and the first failed check, if there is any,
-   depending on the current mode settings.
-</DD>
-</DL>
-
-<DL>
-<DT><CODE>
-(<a name="check-set-mode">check-set-mode!</a> mode) </CODE>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PROCEDURE<CODE>
-</CODE></DT>
-<DD>
-   sets the current mode to mode, which must be a symbol in
-   <CODE>'(off summary report-failed report)</CODE>, default is <CODE>'report</CODE>.
-   Note that you can change the mode at any time, and that check,
-   <CODE>check-ec</CODE> and <CODE>check-report</CODE> use the current value.
-<P>
-   The mode symbols have the following meaning:<BR>
-     <CODE>off</CODE>:           do not execute any of the checks,<BR>
-     <CODE>summary</CODE>:       print only summary in <CODE>(check-report)</CODE> and nothing else,<BR>
-     <CODE>report-failed</CODE>: report failed checks when they happen, and in summary,<BR>
-     <CODE>report</CODE>:        report every example executed.<BR>
-</DD>
-</DL>
-
-<DL>
-<DT><CODE>
-(<a name="check-reset">check-reset!</a>) </CODE>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PROCEDURE<CODE>
-</CODE></DT>
-<DD>
-   resets the global state (counters of correct/failed examples)
-   to the state immediately after loading the module for the
-   first time, i.e. no checks have been executed.
-</DD>
-</DL>
-
-<DL>
-<DT><CODE>
-(<a name="check-passed">check-passed?</a> expected-total-count) </CODE>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PROCEDURE<CODE>
-</CODE></DT>
-<DD>
-   <CODE>#t</CODE> if there were no failed checks and expected-total-count 
-   correct checks, <CODE>#f</CODE> otherwise.<P>
-     Rationale: This procedure can be used in automatized
-   tests by terminating a test program with the statement
-   <CODE>(exit (if (check-passed? </CODE><I>n</I><CODE>) 0 1))</CODE>.
-</DD>
-</DL>
-
-
-<H1>Implementation</H1>
-
-<A HREF="check.scm">check.scm</A>:
-  implementation in R5RS + SRFI 23 (error) + SRFI 42 (comprehensions);
-  tested under PLT 208p1 and Scheme 48 1.3.<br>
-
-<A HREF="examples.scm">examples.scm</A>:
-  a few examples.
-
-<H1>References</H1>
-
-<UL>
-<LI><A NAME="1">[1]</A> 
-    SRFI 64 by Per Bothner: A Scheme API for test suites. January 2005.
-    <A HREF="http://srfi.schemers.org/srfi-64">http://srfi.schemers.org/srfi-64</A></LI>
-
-<LI><A NAME="2">[2]</A> 
-    Noel Welsh: SchemeUnit. February 2003.
-    <A HREF="http://schematics.sourceforge.net/schemeunit.html">http://schematics.sourceforge.net/schemeunit.html</A></LI>
-
-<LI><A NAME="3">[3]</A> 
-    Neil Van Dyke: 
-    Testeez, Lightweight Unit Test Mechanism for Scheme. May 2005.
-    <A HREF="http://www.neilvandyke.org/testeez">http://www.neilvandyke.org/testeez</A></LI>
-
-<LI><A NAME="4">[4]</A> 
-    Revised^5 Report on the Algorithmic Language Scheme (R5RS).
-    <A HREF="http://www.schemers.org/Documents/Standards/R5RS/">http://www.schemers.org/Documents/Standards/R5RS/</A></LI>
-
-<LI><A NAME="5">[5]</A> 
-    SRFI 42 by Sebastian Egner: Eager Comprehensions.
-    <A HREF="http://srfi.schemers.org/srfi-42">http://srfi.schemers.org/srfi-42</A></LI>
-</UL>
-
-<H1>Copyright</H1>
-
-Copyright (C) Sebastian Egner (2005-2006). All Rights Reserved.
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 
-<p>
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-<p>
-    <hr>
-    <address>Author: <a href="mailto:srfi-78@sebastian-egner.net">srfi-78@sebastian-egner.net</a></address>
-    <address>Editors: <a href="mailto:srfi-editors@srfi.schemers.org">srfi-editors@srfi.schemers.org</a></address>
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-8.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-8.html
deleted file mode 100644
index 38b73406b1..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-8.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.2//EN">
-<html>
-<head>
-<title>SRFI 8: RECEIVE: Binding to multiple values</title>
-</head>
-
-<body>
-<H1>Title</H1>
-
-SRFI 8: <code>receive</code>: Binding to multiple values
-
-<H1>Author</H1>
-
-John David Stone
-
-<p>
-Department of Mathematics and Computer Science, Grinnell College, Grinnell, Iowa 50112,
-<a href="mailto:stone@cs.grinnell.edu">email</a>.
-</p>
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion via <A HREF="http://srfi.schemers.org/srfi-8/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P><UL>
-<LI>Received: 1999/05/27
-<LI>Draft: 1999/07/01-1999/08/30
-<LI>Final: 1999/08/30
-</UL>
-
-<H1>Related SRFIs</H1>
-
-<p>
-The syntax proposed in this SRFI is used in the reference implementation of
-<a href="srfi-1.html">SRFI-1</a>, ``List library.''
-</p>
-
-<H1>Abstract</H1>
-
-<p>
-The only mechanism that R<sup>5</sup>RS provides for binding identifiers to
-the values of a multiple-valued expression is the primitive
-<code>call-with-values</code>.  This SRFI proposes a more concise, more
-readable syntax for creating such bindings.
-</p>
-
-<H1>Rationale</H1>
-
-<p>
-Although R<sup>5</sup>RS supports multiple-valued expressions, it provides
-only the essential procedures <code>values</code> and
-<code>call-with-values</code>.  It is evident that the authors expected
-Scheme programmers to define other constructs in terms of these,
-abstracting common patterns of use.
-</p>
-
-<p>
-One such pattern consists in binding an identifier to each of the values of
-a multiple-valued expression and then evaluating an expression in the scope
-of the bindings.  As an instance of this pattern, consider the following
-excerpt from a quicksort procedure:
-</p>
-
-<pre>
-<code>
-(call-with-values
-  (lambda ()
-    (partition (precedes pivot) others))
-  (lambda (fore aft)
-    (append (qsort fore) (cons pivot (qsort aft)))))
-</code>
-</pre>
-
-<p>
-Here <code>partition</code> is a multiple-valued procedure that takes two
-arguments, a predicate and a list, and returns two lists, one comprising
-the list elements that satisfy the predicate, the other those that do not.
-The purpose of the expression shown is to partition the list
-<code>others</code>, sort each of the sublists, and recombine the results
-into a sorted list.
-</p>
-
-<p>
-For our purposes, the important step is the binding of the identifiers
-<code>fore</code> and <code>aft</code> to the values returned by
-<code>partition</code>.  Expressing the construction and use of these
-bindings with the <code>call-by-values</code> primitive is cumbersome: One
-must explicitly embed the expression that provides the values for the
-bindings in a parameterless procedure, and one must explicitly embed the
-expression to be evaluated in the scope of those bindings in another
-procedure, writing as its parameters the identifiers that are to be bound
-to the values received.
-</p>
-
-<p>
-These embeddings are boilerplate, exposing the underlying binding mechanism
-but not revealing anything relevant to the particular program in which it
-occurs.  So the use of a syntactic abstraction that exposes only the
-interesting parts -- the identifiers to be bound, the multiple-valued
-expression that supplies the values, and the body of the receiving
-procedure -- makes the code more concise and more readable:
-</p>
-
-<pre>
-<code>
-(receive (fore aft) (partition (precedes pivot) others)
-  (append (qsort fore) (cons pivot (qsort aft))))
-</code>
-</pre>
-
-<p>
-The advantages are similar to those of a <code>let</code>-expression over a 
-procedure call with a <code>lambda</code>-expression as its operator.  In
-both cases, cleanly separating a ``header'' in which the bindings are
-established from a ``body'' in which they are used makes it easier to
-follow the code.
-</p>
-
-<H1>Specification</H1>
-<a name="receive"></a>
-<p>
-<code>(receive</code> &lt;formals&gt; &lt;expression&gt;
-&lt;body&gt;<code>)</code>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;library&nbsp;syntax 
-</p>
-
-<p>
-&lt;Formals&gt;, &lt;expression&gt;, and &lt;body&gt; are as described in
-R<sup>5</sup>RS.  Specifically, &lt;formals&gt; can have any of three
-forms:
-</p>
-
-<ul>
-<li><p>
-<code>(</code>&lt;variable<sub>1</sub>&gt; <code>...</code>
-&lt;variable<sub><i>n</i></sub>&gt;<code>)</code>: The environment in which 
-the <code>receive</code>-expression is evaluated is extended by binding
-</code>&lt;variable<sub>1</sub>&gt;, ...,
-&lt;variable<sub><i>n</i></sub>&gt; to fresh locations.  The
-&lt;expression&gt; is evaluated, and its values are stored into those
-locations.  (It is an error if &lt;expression&gt; does not have exactly
-<i>n</i> values.)
-</p></li>
-
-<li><p>
-&lt;variable&gt;: The environment in which the
-<code>receive</code>-expression is evaluated is extended by binding 
-&lt;variable&gt; to a fresh location.  The &lt;expression&gt; is evaluated,
-its values are converted into a newly allocated list, and the list is
-stored in the location bound to &lt;variable&gt;.
-</p></li>
-
-<li><p>
-<code>(</code>&lt;variable<sub>1</sub>&gt; <code>...</code>
-&lt;variable<sub><i>n</i></sub>&gt; . &lt;variable<sub><i>n</i> +
-1</sub>&gt;<code>)</code>:  The environment in which 
-the <code>receive</code>-expression is evaluated is extended by binding
-</code>&lt;variable<sub>1</sub>&gt;, ...,
-&lt;variable<sub><i>n</i> + 1</sub>&gt; to fresh locations.  The
-&lt;expression&gt; is evaluated.  Its first <i>n</i> values are stored into
-the locations bound to &lt;variable<sub>1</sub>&gt; <code>...</code>
-&lt;variable<sub><i>n</i></sub>&gt;.  Any remaining values are converted
-into a newly allocated list, which is stored into the location bound to 
-&lt;variable<sub><i>n</i> + 1</sub>&gt;.  (It is an error if
-&lt;expression&gt; does not have at least
-<i>n</i> values.)
-</p></li>
-</ul>
-
-<p>
-In any case, the expressions in &lt;body&gt; are evaluated sequentially in
-the extended environment.  The results of the last expression in the body
-are the values of the <code>receive</code>-expression.
-</p>
-
-<H1>Reference implementation</H1>
-
-<pre>
-<code>
-(define-syntax receive
-  (syntax-rules ()
-    ((receive formals expression body ...)
-     (call-with-values (lambda () expression)
-                       (lambda formals body ...)))))
-</code>
-</pre>
-
-<hr>
-
-<p>
-Copyright (C) John David Stone (1999).  All Rights Reserved.
-</p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-<hr>
-
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-
-</body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-86.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-86.html
deleted file mode 100644
index 39255f2c0b..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-86.html
+++ /dev/null
@@ -1,1937 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html><head><title>SRFI 86: MU and NU simulating VALUES &amp; CALL-WITH-VALUES, and their related LET-syntax</title></head><body>
-
-<h1>Title</h1>
-
-MU and NU simulating VALUES &amp; CALL-WITH-VALUES, and their related LET-syntax
-
-<h1>Author</h1>
-
-Joo ChurlSoo
-
-<h1>Status</h1>
-
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see
-<a href="http://srfi.schemers.org/srfi%20minus%20process.html">here</a>.
-To
-provide input on this SRFI, please <code>
-<a href="mailto:srfi-86%20at%20srfi%20dot%20schemers%20dot%20org">mailto:srfi minus 86 at srfi dot schemers dot org</a></code>.
-See <a href="http://srfi.schemers.org/srfi%20minus%20list-subscribe.html">instructions
-here</a> to subscribe to the list. You can access the discussion via
-<a href="http://srfi.schemers.org/srfi-86/mail-archive/maillist.html">the
-archive of the mailing list</a>.
-You can access
-post-finalization messages via
-<a href="http://srfi.schemers.org/srfi-86/post-mail-archive/maillist.html">
-the archive of the mailing list</a>.
-<p>
-</p><ul>
-  <li>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-86/srfi-86.txt?rev=1.1">2006/04/03</a></li>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-86/srfi-86.txt?rev=1.2">2006/05/08</a></li>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-86/srfi-86.txt?rev=1.3">2006/05/22</a></li>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-86/srfi-86.txt?rev=1.4">2006/06/20</a></li>
-  <li>Final: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-86/srfi-86.html?rev=1.7">2006/06/20</a></li>
-  <li>Draft: 2006/04/04 - 2006/06/01</li>
-</ul>
-
-<h1>Abstract</h1>
-    
-<p>
-Unlike the <code>values</code>/<code>call-with-values</code> mechanism of
-R5RS, this SRFI uses an explicit representation for multiple return
-values as a single value, namely a procedure.  Decomposition of
-multiple values is done by simple application.  Each of the two
-macros, <code>mu</code> and <code>nu</code>, evaluates to a procedure
-that takes one procedure argument.  The <code>mu</code> and
-<code>nu</code> can be compared with <code>lambda</code>.  While
-<code>lambda</code> expression that consists of &lt;formals&gt; and &lt;body&gt;
-requires some actual arguments later when the evaluated
-<code>lambda</code> expression is called, <code>mu</code> and
-<code>nu</code> expressions that consist of &lt;expression&gt;s
-corresponding to actual arguments of <code>lambda</code> require
-&lt;formals&gt; and &lt;body&gt;, that is, an evaluated <code>lambda</code>
-expression, later when the evaluated <code>mu</code> and
-<code>nu</code> expressions are called.
-    </p>
-
-<p>
-This SRFI also introduces new <code>let</code>-syntax depending on
-<code>mu</code> and <code>nu</code> to manipulate multiple values,
-<code>alet</code> and <code>alet*</code> that are compatible with
-<code>let</code> and <code>let*</code> of R5RS in single value
-bindings.  They also have a binding form making use of
-<code>values</code> and <code>call-with-values</code> to handle
-multiple values.  In addition, they have several new binding forms for
-useful functions such as escape, recursion, etc.
-    </p>
-
-<h1>Rationale</h1>
-
-<p>
-It is impossible to bind the evaluated result of <code>values</code>
-expression to a single variable unlike other Scheme expressions.
-Moreover, the pair of <code>values</code> and
-<code>call-with-values</code> is clumsy to use and somewhat slow under
-some circumstances.  A solution would be to enclose the arguments of
-<code>values</code> expression in a procedure of one argument, a
-consumer procedure of <code>call-with-values</code>.  The following are examples to
-show the differences.
-    </p>
-
-<pre>(define v (values 1 2 3))		=&gt; error
-(define v (lambda () (values 1 2 3)))	=&gt; (lambda () (values 1 2 3))
-(define m (mu 1 2 3))			=&gt; (lambda (f) (f 1 2 3))
-(define a (apply values 1 '(2 3)))	=&gt; error
-(define a
-  (lambda () (apply values 1 '(2 3))))	=&gt; (lambda () (apply values 1 '(2 3)))
-(define n (nu 1 '(2 3)))		=&gt; (lambda (f) (apply f 1 '(2 3)))
-
-(call-with-values v list)	=&gt; (1 2 3)
-(m list)			=&gt; (1 2 3)
-(call-with-values a list)	=&gt; (1 2 3)
-(n list)			=&gt; (1 2 3)
-</pre>
-
-<p>
-The <code>alet</code> and <code>alet*</code> are cases in point to use
-<code>mu</code> and <code>nu</code>.  The differences between this
-<code>let</code>-syntax and others, and some additional functions are
-best explained by simple examples.
-    </p>
-
-<ol>
-      <li>
-
-<p>The following are rest argument forms of each SRFI.</p>
-
-<p>In <a href="#SRFI11">SRFI 11</a>:</p>
-
-<pre>(let-values ((a (values 1 2)) ((b c) (values 3 4)))
-	    (list a b c))
-=&gt; ((1 2) 3 4)
-</pre>
-
-<p>In <a href="#SRFI71">SRFI 71</a>:</p>
-
-<pre>(srfi-let (((values . a) (values 1 2)) ((values b c) (values 3 4)))
-	  (list a b c))
-=&gt; ((1 2) 3 4)
-</pre>
-
-<p>In this SRFI:</p>
-
-<pre>(alet (a (mu 1 2) ((b c) (mu 3 4)))
-  (list a b c))
-=&gt; ((1 2) 3 4)
-</pre>
-
-</li>
-
-<li><p>The expressions for <code>alet</code> bindings are evaluated in
-sequence from left to right unlike <code>let</code> of R5RS and
-<code>let</code> of <a href="#SRFI71">SRFI 71</a>.</p>
-
-<p>In <a href="#SRFI71">SRFI 71</a>:</p>
-
-<pre>(srfi-let ((a (begin (display "1st") 1))
-	   (b c (values (begin (display "2nd") 2) 3))
-	   (d (begin (display "3rd") 4))
-	   ((values e . f) (values (begin (display "4th") 5) 6)))
-	  (list a b c d e f))
-=&gt; 2nd4th1st3rd(1 2 3 4 5 (6))
-</pre>
-
-<p>In this SRFI:</p>
-
-<pre>(alet ((a (begin (display "1st") 1))
-       (b c (mu (begin (display "2nd") 2) 3))
-       (d (begin (display "3rd") 4))
-       ((e . f) (mu (begin (display "4th") 5) 6)))
-  (list a b c d e f))
-=&gt; 1st2nd3rd4th(1 2 3 4 5 (6))
-</pre>
-      </li>
-
-<li><p>The bindings that require multiple values can take multiple expressions, if
-   syntactically possible, as well as a single expression that produce
-   multiple values.</p>
-
-<pre>(alet* (((a b) (mu 1 2))
-	((c d e) a (+ a b c) (+ a b c d))
-	((f . g) (mu 5 6 7))
-	((h i j . k) e 9 10 h i j))
-  (list a b c d e f g h i j k))
-
-=&gt; (1 2 1 4 8 5 (6 7) 8 9 10 (8 9 10))
-</pre>
-      </li>
-
-<li><p>The named-<code>alet</code> and named-<code>alet*</code> are
-allowed to take multiple values bindings.</p>
-
-<p>In <a href="#SRFI71">SRFI 71</a>:</p>
-
-<pre>(srfi-let tag ((a 1) (b 2) (c 3) (d 4) (e 5))
-	  (if (&lt; a 10) (tag 10 b c d e) (list a b c d e)))
-=&gt; (10 2 3 4 5)
-</pre>
-
-<p>In this SRFI:</p>
-
-<pre>(alet* tag ((a 1) (a b b c (mu (+ a 2) 4 5 6)) ((d e e) b 5 (+ a b c)))
-       (if (&lt; a 10) (tag a 10 b c c d e d) (list a b c d e)))
-=&gt; (10 6 6 5 5)
-</pre>
-      </li>
-
-<li><p>They have a new binding form that has a recursive function like
-named-<code>alet</code>.   It is also allowed to take multiple values
-bindings.</p>
-
-<pre>(alet* ((a 1)
-	((b 2) (b c c (mu 3 4 5)) ((d e d (mu a b c)) . intag) . tag)
-	(f 6))
-  (if (&lt; d 10)
-      (intag d e 10)
-      (if (&lt; c 10)
-	  (tag b 11 c 12 a b d intag)
-	  (list a b c d e f))))
-=&gt; (1 11 12 10 3 6)
-</pre>
-      </li>
-
-<li><p>They have a new binding form that has an escape function.</p>
-
-<pre>(alet ((exit)
-       (a (begin (display "1st") 1))
-       (b c (mu (begin (display "2nd") 2) (begin (display "3rd") 3))))
-  (display (list a b c))
-  (exit 10)
-  (display "end"))
-=&gt; 1st2nd3rd(1 2 3)10
-</pre>
-      </li>
-
-<li><p> The <code>and-let</code> and <code>and-let*</code> are
-integrated into the <code>alet</code> and <code>alet*</code> with a
-   syntactic keyword <code>and</code>.</p>
-
-<pre>(alet ((and (a (begin (display "1st") 1))
-	    (b (begin (display "2nd") 2))
-	    (c (begin (display "false") #f))
-	    (d (begin (display "3nd") 3))))
-  (list a b c d))
-=&gt; 1st2ndfalse#f
-
-(alet ((and (a (begin (display "1st") 1))
-	    (b (begin (display "2nd") 2) (&lt; b 2)) ; different from <a href="#SRFI2">SRFI 2</a>
-	    (c (begin (display "false") #f))
-	    (d (begin (display "3nd") 3))))
-  (list a b c d))
-=&gt; 1st2nd#f
-</pre>
-      </li>
-
-<li><p>The <code>rest-values</code> of <a href="#SRFI51">SRFI 51</a> is integrated into the
-<code>alet</code> and <code>alet*</code> with
-   syntactic keywords <code>opt</code> and <code>cat</code> in the
-   similar way to <code>let-optionals</code> in Scsh.</p>
-
-<pre>((lambda (str . rest)
-   (alet* ((len (string-length str))
-	   (opt rest
-		(start 0 (integer? start)
-		       (if (&lt; start 0) 0 (if (&lt; len start) len start)))	 ;true
-		(end len (integer? end)
-		     (if (&lt; end start) start (if (&lt; len end) len end)))));true
-     (substring str start end))) "abcdefg" 1 20)
-=&gt; "bcdefg"
-
-((lambda (str . rest)
-   (alet* ((len (string-length str))
-	   (min (apply min rest))
-	   (cat rest
-		(start 0 (= start min)
-		       (if (&lt; start 0) 0 (if (&lt; len start) len start)))	 ;true
-		(end len (integer? end)
-		     (if (&lt; end start) start (if (&lt; len end) len end)))));true
-     (substring str start end))) "abcdefg" 20 1)
-=&gt; "bcdefg"
-
-((lambda (str . rest)
-   (alet ((cat rest
-	       (start 0
-		      (and (list? start) (= 2 (length start))
-			   (eq? 'start (car start)))
-		      (cadr start))	; true
-	       (end (string-length str)
-		    (and (list? end) (= 2 (length end)) (eq? 'end (car end)))
-		    (cadr end))))	; true
-     (substring str start end))) "abcdefg" '(end 6) '(start 1))
-=&gt; "bcdef"
-</pre>
-      </li>
-
-<li><p>The <code>let-keywords</code> and <code>let-keywords*</code>
-	  are integrated into the <code>alet</code> and
-	  <code>alet*</code> with a syntactic keyword <code>key</code>.
-	  They use any Scheme objects as keywords.
-
-</p><pre>(define rest-list '(a 10 cc 30 40 b 20))
-(alet ((key rest-list (a 1) (b 2) ((c 'cc) 3) . d)) (list a b c d))
-=&gt; (10 2 30 (40 b 20))
-
-(alet ((key rest-list (a 1) (b 2) ((c 'cc) 3) #f . d)) (list a b c d))
-=&gt; (10 2 30 (40 b 20))
-
-(alet ((key rest-list (a 1) (b 2) ((c 'cc) 3) #t . d)) (list a b c d))
-=&gt; (10 20 30 (40))
-
-(define rest (list 'a 10 'd 40 "c" 30 50 'b 20))
-(alet ((key rest (a 1) (b 2) ((c "c") 3) . d)) (list a b c d))
-=&gt; (10 2 30 (d 40 50 b 20))
-
-(alet ((key rest (a 1) (b 2) ((c "c") 3) #f . d)) (list a b c d))
-=&gt; (10 2 3 (d 40 "c" 30 50 b 20))
-
-(alet ((key rest (a 1) (b 2) ((c "c") 3) #t . d)) (list a b c d))
-=&gt; (10 20 30 (d 40 50))
-
-((lambda (m . n)
-   (alet* ((opt n (a 10) (b 20) (c 30) . d)
-	   (key d (x 100) (y 200) (a 300)))
-     (list m a b c x y)))
- 0 1 2 3 'a 30 'y 20 'x 10)
-=&gt; (0 30 2 3 10 20)
-
-((lambda (m . n)
-   (alet* ((key n (x 100) (y 200) (a 300) . d)
-	   (opt d (a 10) (b 20) (c 30)))
-     (list m a b c x y)))
- 0 'a 30 'y 20 'x 10 1 2 3)
-=&gt; (0 1 2 3 10 20)
-</pre>
-      </li>
-
-<li><p>The <code>letrec</code>and <code>letrec*</code> are integrated
-into the <code>alet</code> and <code>alet*</code> with a
-    syntactic keyword <code>rec</code>.</p>
-
-<pre>(alet* ((a 1)
-	(rec (a 2) (b 3) (b (lambda () c)) (c a))
-	(d 50))
-  (list a (b) c d))
-=&gt; '(2 2 2 50)
-</pre>
-      </li>
-
-<li><p>They have a binding form that use <code>call-with-values</code>
-and <code>values</code> to handle multiple values with a syntactic
-keyword <code>values</code> like <a href="#SRFI71">SRFI 71</a>.</p>
-
-<pre>(alet ((a b (mu 1 2))
-       (values c d (values 3 4))	;This is different from <a href="#SRFI71">SRFI 71</a>.
-       ((e f) (mu 5 6))
-       ((values g h) (values 7 8))
-       ((i j . k) (nu 9 '(10 11 12)))
-       ((values l m . n) (apply values 13 '(14 15 16)))
-       o (mu 17 18)
-       ((values . p) (values 19 20)))
-  (list a b c d e f g h i j k l m n o p))
-=&gt; (1 2 3 4 5 6 7 8 9 10 (11 12) 13 14 (15 16) (17 18) (19 20))
-</pre>
-</li>
-
-<li><p>They have a new binding form that works as an intervening external
-    environment in <code>alet</code> and as an intervening internal
-    environment in <code>alet*</code>.</p>
-
-<pre>(alet ((a 1)
-       (() (define a 10) (define b 100))
-       (b a))
-  (list a b))
-=&gt; (1 10)
-
-(alet* ((a 1)
-	(() (define a 10) (define b 100))
-	(b a))
-  (list a b))
-=&gt; (10 10)
-</pre>
-    </li>
-    </ol>
-
-<h1>Specification</h1>
-
-<pre>(mu &lt;expr&gt; ...)			=&gt; (lambda (f) (f &lt;expr&gt; ...))
-(nu &lt;expr&gt; ... &lt;exprn&gt;)		=&gt; (lambda (f) (apply f &lt;expr&gt; ... &lt;exprn&gt;))
-</pre>
-
-<p>The &lt;exprn&gt; should be a list.</p>
-
-<p>
-Each macro evaluates to a procedure of one argument.  The environment
-in effect when the macro expression was evaluated is remembered as
-part of the procedure.  When the procedure is later called with an
-actual argument, a procedure, the environment in which the macro was
-evaluated is extended by binding &lt;expr&gt;s to the corresponding
-variables in the formal argument list of the argument procedure.  The
-argument procedure of <code>mu</code> is called with the &lt;expr&gt;s,
-and that of <code>nu</code> is applied to APPLY procedure with the
-&lt;expr&gt;s.</p>
-
-<pre>(alet  (&lt;binding spec&gt; ...) body ...)
-(alet* (&lt;binding spec&gt; ...) body ...)
-</pre>
-
-    <p>
-    <code>syntax-rules</code> identifier: <code>opt</code>
-    <code>cat</code> <code>key</code> <code>and</code>
-    <code>rec</code> <code>values</code>
-    </p>
-
-<p>&lt;binding spec&gt;:</p>
-
-<ol>
-<li><pre>(&lt;var&gt; &lt;expr&gt;)</pre></li>
-<li><pre>(&lt;var1&gt; &lt;var2&gt; &lt;var3&gt; ... &lt;expr&gt;)</pre></li>
-<li><pre>((&lt;var&gt;) &lt;expr&gt;)</pre></li>
-<li><pre>((&lt;var1&gt; &lt;var2&gt; &lt;var3&gt; ... ) &lt;expr&gt;)</pre></li>
-<li><pre>((&lt;var1&gt; ... &lt;varm&gt; . &lt;varn&gt;) &lt;expr&gt;)</pre></li>
-<li><pre>((&lt;var1&gt; &lt;var2&gt; &lt;var3&gt; ... ) &lt;expr1&gt; &lt;expr2&gt; &lt;expr3&gt; ...)</pre></li>
-<li><pre>((&lt;var1&gt; ... &lt;varm&gt; . &lt;varn&gt;) &lt;expr1&gt; ... &lt;exprm&gt; &lt;exprn&gt; ...)</pre></li>
-<li><pre>&lt;var&gt; &lt;expr&gt;	</pre></li>
-<li><pre>(&lt;var&gt;)	</pre></li>
-<li><pre>(&lt;binding spec1&gt; &lt;binding spec2&gt; ... . &lt;var&gt;)</pre></li>
-<li><pre>(() . &lt;var&gt;)</pre></li>
-<li><pre>(and (&lt;var1&gt; &lt;expr1&gt; [&lt;test1&gt;]) (&lt;var2&gt; &lt;expr2&gt; [&lt;test2&gt;]) ...)</pre></li>
-<li><pre>(opt &lt;rest list&gt;
-    (&lt;var1&gt; &lt;default1&gt; [&lt;test1&gt; [&lt;true substitute1&gt; [&lt;false substitute1&gt;]]])
-    ...
-    (&lt;varn&gt; &lt;defaultn&gt; [&lt;testn&gt; [&lt;true substituten&gt; [&lt;false substituten&gt;]]])
-    . [&lt;rest var&gt;])</pre></li>
-<li><pre>(cat &lt;rest list&gt;
-     (&lt;var1&gt; &lt;default1&gt; [&lt;test1&gt; [&lt;true substitute1&gt; [&lt;false substitute1&gt;]]])
-     ...
-     (&lt;varn&gt; &lt;defaultn&gt; [&lt;testn&gt; [&lt;true substituten&gt; [&lt;false substituten&gt;]]])
-     . [&lt;rest var&gt;])</pre></li>
-<li><pre>(key &lt;rest list&gt;
- (&lt;var spec1&gt; &lt;default1&gt; [&lt;test1&gt; [&lt;true substitute1&gt; [&lt;false substitute1&gt;]]])
- ...
- (&lt;var specn&gt; &lt;defaultn&gt; [&lt;testn&gt; [&lt;true substituten&gt; [&lt;false substituten&gt;]]])
- [&lt;option&gt;]
- . [&lt;rest var&gt;])</pre></li>
-<li><pre>(rec (&lt;var1&gt; &lt;expr1&gt;) (&lt;var2&gt; &lt;expr2&gt;) ...)</pre></li>
-<li><pre>(values &lt;var1&gt; &lt;var2&gt; ... &lt;expr&gt;)</pre></li>
-<li><pre>((values &lt;var1&gt; &lt;var2&gt; ...) &lt;expr&gt;)</pre></li>
-<li><pre>((values &lt;var1&gt; ... . &lt;varn&gt;) &lt;expr&gt;) </pre></li>
-<li><pre>((values &lt;var1&gt; &lt;var2&gt; &lt;var3&gt; ...) &lt;expr1&gt; &lt;expr2&gt; &lt;expr3&gt; ...)</pre></li>
-<li><pre>((values &lt;var1&gt; ... . &lt;varn&gt;) &lt;expr1&gt; ... &lt;exprn&gt; ...) </pre></li>
-<li><pre>(() &lt;expr1&gt; &lt;expr2&gt; ...)</pre></li>
-    </ol>
-
-<p>
-The <code>alet*</code> is to the <code>alet</code> what the
-<code>let*</code> is to the <code>let</code>.  However, the &lt;binding
-spec&gt;s of <code>alet</code> are evaluated in sequence from left to
-spec&gt;right unlike <code>let</code> of
-R5RS.  The <code>alet</code> and <code>alet*</code> make use of
-<code>mu</code> or <code>nu</code> instead of <code>values</code> to
-handle multiple values.  So, the single &lt;expr&gt; of multiple values
-binding should be a <code>mu</code> or <code>nu</code> expression, or
-its equivalent.  And the number of arguments of <code>mu</code> or the
-number of `applied' arguments of <code>nu</code> must match the number
-of values expected by the binding specification.  Otherwise an error
-is signaled, as <code>lambda</code> expression would.
-    </p>
-
-<ol>
-<li><pre>(&lt;var&gt; &lt;expr&gt;)</pre>
-This is the same as <code>let</code> (R5RS, 4.2.2).
-      </li>
-
-<li><pre>(&lt;var1&gt; &lt;var2&gt; &lt;var3&gt; ... &lt;expr&gt;)</pre>
-This is the same as 4.</li>
-       
-<li><pre>((&lt;var&gt;) &lt;expr&gt;)</pre>
-This is the same as 1.</li>
-
-<li><pre>((&lt;var1&gt; &lt;var2&gt; &lt;var3&gt; ... ) &lt;expr&gt;)</pre></li>
-<li><pre>((&lt;var1&gt; ... &lt;varm&gt; . &lt;varn&gt;) &lt;expr&gt;)</pre>
-
-The &lt;expr&gt; must be a <code>mu</code> or <code>nu</code>
-expression or its equivalent. The matching of &lt;var&gt;s to the
-values of &lt;expr&gt; is as for the matching of &lt;formals&gt; to
-arguments in a <code>lambda</code> expression (R5RS, 4.1.4).
-      </li>
-
-<li><pre>((&lt;var1&gt; &lt;var2&gt; &lt;var3&gt; ... ) &lt;expr1&gt; &lt;expr2&gt; &lt;expr3&gt; ...)</pre>
-This is the same as
-<pre>(let[*] ((&lt;var1&gt; &lt;expr1&gt;) (&lt;var2&gt; &lt;expr2&gt;) (&lt;var3&gt; &lt;expr3&gt;) ...).</pre>
-      </li>
-
-<li><pre>((&lt;var1&gt; ... &lt;varm&gt; . &lt;varn&gt;) &lt;expr1&gt; ... &lt;exprm&gt; &lt;exprn&gt; ...) </pre>
-This is the same as
-<pre>(let[*] ((&lt;var1&gt; &lt;expr1&gt;) ... (&lt;varm&gt; &lt;exprm&gt;) (&lt;varn&gt;  (list &lt;exprn&gt; ...))).</pre>
-      </li>
-
-<li><pre>&lt;var&gt; &lt;expr&gt;</pre>
-The &lt;var&gt; is a rest argument, so the &lt;expr&gt; should be a form that can deliver
-multiple values, that is, a <code>mu</code> or <code>nu</code> expression or its equivalent. 
-      </li>
-
-<li><pre>(&lt;var&gt;)</pre>
-The &lt;var&gt; becomes an escape procedure that can take return
-values of <code>alet</code>[*] as its arguments.
-
-</li><li><pre>(&lt;binding spec1&gt; &lt;binding spec2&gt; ... . &lt;var&gt;)</pre>
-The &lt;var&gt; becomes a recursive procedure that takes all &lt;vars&gt; of &lt;binding
-spec&gt;s as arguments.
-      </li>
-
-<li><pre>(() . &lt;var&gt;)</pre>
-The &lt;var&gt; becomes a recursive thunk that takes no argument.
-      </li>
-
-<li><pre>(and (&lt;var1&gt; &lt;expr1&gt; [&lt;test1&gt;]) (&lt;var2&gt; &lt;expr2&gt; [&lt;test2&gt;]) ...)</pre>
-
-Each &lt;expr&gt; is evaluated sequentially and bound to the
-corresponding &lt;var&gt;.  During the process, if there is no
-&lt;test&gt; and the value of &lt;expr&gt; is false, it stops and
-returns <code>#f</code>.  When there is a &lt;test&gt;, the process is continued
-regardless of the value of &lt;expr&gt; unless the value of &lt;test&gt; is
-false.  If the value of &lt;test&gt; is false, it stops and returns #f.
-      </li>
-
-<li>
-<pre>(opt &lt;rest list&gt;
-    (&lt;var1&gt; &lt;default1&gt; [&lt;test1&gt; [&lt;true substitute1&gt; [&lt;false substitute1&gt;]]])
-    ...
-    (&lt;varn&gt; &lt;defaultn&gt; [&lt;testn&gt; [&lt;true substituten&gt; [&lt;false substituten&gt;]]])
-    . [&lt;rest var&gt;])
-</pre>
-
-This binds each &lt;var&gt; to a corresponding element of &lt;rest list&gt;.
-If there is no more element, then the corresponding &lt;default&gt; is
-evaluated and bound to the &lt;var&gt;.  An error is signaled when
-there are more elements than &lt;var&gt;s.  But if &lt;rest var&gt; is
-given, it is bound to the remaining elements.  If there is a
-&lt;test&gt;, it is evaluated only when &lt;var&gt; is bound to an
-element of &lt;rest list&gt;.  If it returns a false value and there is no
-&lt;false substitute&gt;, an error is signaled.  If it returns a false value
-and there is a &lt;false
-substitute&gt;, &lt;var&gt; is rebound to the result of evaluating &lt;false substitute&gt;
-instead of signaling an error.  If it returns a true value and there is a
-&lt;true substitute&gt;, &lt;var&gt; is rebound to the result of evaluating &lt;true
-substitute&gt;.
-      </li>
-
-<li><pre>(cat &lt;rest list&gt;
-     (&lt;var1&gt; &lt;default1&gt; [&lt;test1&gt; [&lt;true substitute1&gt; [&lt;false substitute1&gt;]]])
-     ...
-     (&lt;varn&gt; &lt;defaultn&gt; [&lt;testn&gt; [&lt;true substituten&gt; [&lt;false substituten&gt;]]])
-     . [&lt;rest var&gt;])
-</pre>
-
-This is the same as the above <code>opt</code> except the binding
-method.  It temporarily binds &lt;var&gt; to each elements of &lt;rest
-list&gt; sequentally, until &lt;test&gt; returns a true value, then
-the &lt;var&gt; is finally bound to the passed element.  If there is
-no &lt;test&gt;, the first element of the remained &lt;rest list&gt;
-is regarded as passing.  If any element of the &lt;rest list&gt; does
-not pass the &lt;test&gt;, the &lt;default&gt; is bound to the
-&lt;var&gt; instead of signaling an error.  If there is a &lt;false
-substitute&gt; and &lt;test&gt; returns a false value, &lt;var&gt; is
-finally bound to the result of evaluating &lt;false substitute&gt;
-instead of the above process.  If there is a &lt;true substitute&gt;
-and &lt;test&gt; returns a true value, &lt;var&gt; is finally bound to
-the result of evaluating &lt;true substitute&gt;.
-      </li>
-
-<li><pre>(key &lt;rest list&gt;
- (&lt;var spec1&gt; &lt;default1&gt; [&lt;test1&gt; [&lt;true substitute1&gt; [&lt;false substitute1&gt;]]])
- ...
- (&lt;var specn&gt; &lt;defaultn&gt; [&lt;testn&gt; [&lt;true substituten&gt; [&lt;false substituten&gt;]]])
- [&lt;option&gt;]
- . [&lt;rest var&gt;])
-
-&lt;var spec&gt; --&gt; &lt;var&gt; | (&lt;var&gt; &lt;keyword&gt;)
-&lt;option&gt; --&gt; #f | #t
-&lt;keyword&gt;  --&gt; &lt;any scheme object&gt;
-&lt;default&gt; --&gt; &lt;expression&gt;
-&lt;test&gt; --&gt; &lt;expression&gt;
-&lt;true substitute&gt; --&gt; &lt;expression&gt;
-&lt;false substitute&gt; --&gt; &lt;expression&gt;
-</pre>
-
-This <code>key</code> form is the same as the <code>cat</code> form in view of the fact that both
-don't use argument position for binding &lt;var&gt;s to elements of &lt;rest list&gt;.
-However, for extracting values from &lt;rest list&gt;, the former uses explicitly
-keywords and the latter uses implicitly &lt;test&gt;s.  The keywords in this form
-are not self-evaluating symbols (keyword objects) but any scheme objects.  The
-keyword used in &lt;rest list&gt; for the corresponding variable is a symbol of the
-same name as the variable of the &lt;var spec&gt; composed of a single &lt;var&gt;.  But
-the keyword can be any scheme object when the &lt;var spec&gt; is specified as a
-parenthesized variable and a keyword.
-The elements of &lt;rest list&gt; are sequentially interpreted as a series of pairs,
-where the first member of each pair is a keyword and the second is the
-corresponding value.  If there is no element for a particular keyword, the
-&lt;var&gt; is bound to the result of evaluating &lt;default&gt;.  When there is a &lt;test&gt;,
-it is evaluated only when &lt;var&gt; is bound to an element of &lt;rest list&gt;.  If it
-returns a false value and there is no &lt;false substitute&gt;, an error is
-signaled.  If it returns a false value and there is a &lt;false substitute&gt;,
-&lt;var&gt; is rebound to the result of evaluating &lt;false substitute&gt; instead of
-signaling an error.  If it returns a true value and there is a &lt;true
-substitute&gt;, &lt;var&gt; is rebound to the result of evaluating &lt;true substitute&gt;.
-When there are more elements than ones that are specified by &lt;var spec&gt;s, an
-error is signaled.  But if &lt;rest var&gt; is given, it is bound to the remaining
-elements.
-The following options can be used to control binding behavior when the keyword
-of keyword-value pair at the bind processing site is different from any
-keywords specified by &lt;var spec&gt;s.
-
-<ol>
-<li>default -- the remaining elements of &lt;rest list&gt; are continually
-   interpreted as a series of pairs.</li>
-<li><code>#f</code> - the variable is bound to the corresponding &lt;default&gt;.</li>
-<li><code>#t</code> - the remaining elements of &lt;rest list&gt; are
-continually interpreted as a single element until the element is a
-particular keyword.</li>
-	</ol>
-      </li>
-
-<li><pre>(rec (&lt;var1&gt; &lt;expr1&gt;) (&lt;var2&gt;
-&lt;expr2&gt;) ...)</pre>
-
-This is the same as <pre>(letrec[*] ((&lt;var1&gt; &lt;expr1&gt;) (&lt;var2&gt; &lt;expr2&gt;) ...)</pre>
-      </li>
-
-<li><pre>(values &lt;var1&gt; &lt;var2&gt; ... &lt;expr&gt;)</pre>
-
-This is the same as 17.
-      </li>
-
-<li><pre>((values &lt;var1&gt; &lt;var2&gt; ...) &lt;expr&gt;)</pre></li>
-
-<li><pre>((values &lt;var1&gt; ... . &lt;varn&gt;) &lt;expr&gt;)</pre>
-
-The &lt;expr&gt; should be a <code>values</code> expression or its
-equivalent.  The matching of &lt;var&gt;s to the values of
-&lt;expr&gt; is as for the matching of &lt;formals&gt; to arguments in a
-<code>lambda</code> expression.
-      </li>
-
-<li><pre>((values &lt;var1&gt; &lt;var2&gt; &lt;var3&gt; ...) &lt;expr1&gt; &lt;expr2&gt; &lt;expr3&gt; ...)</pre>
-
-This is the same as
-<pre>(let[*] ((&lt;var1&gt; &lt;expr1&gt;) (&lt;var2&gt; &lt;expr2&gt;) (&lt;var3&gt; &lt;expr3&gt;) ...)</pre>
-      </li>
-
-<li><pre> ((values &lt;var1&gt; ... . &lt;varn&gt;) &lt;expr1&gt; ... &lt;exprn&gt; ...) </pre>
-
-This is the same as (let[*] ((&lt;var1&gt; &lt;expr1&gt;)
-... (&lt;varn&gt; (list &lt;exprn&gt; ...))).
-      </li>
-
-<li><pre>(() &lt;expr1&gt; &lt;expr2&gt; ...)</pre>
-
-This works as an intervening external environment in
-<code>alet</code>, and an intervening internal environment in
-<code>alet*</code>.
-      </li>
-    </ol>
-
-<pre>(alet  name (&lt;binding spec&gt; ...) body ...)
-(alet* name (&lt;binding spec&gt; ...) body ...)
-</pre>
-
-<p>
-These are the same as the named-<code>let</code> (R5RS, 4.2.4) except
-binding specification.  These allow all sorts of bindings in &lt;binding
-spec&gt;.</p>
-
-<h1>Examples</h1>
-
-<pre>(alet ((a (begin (display "1st") 1))
-       ((b c) 2 (begin (display "2nd") 3))
-       (() (define m #f) (define n (list 8)))
-       ((d (begin (display "3rd") 4))
-	(key '(e 5 tmp 6) (e 0) ((f 'tmp) 55)) . p)
-       g (nu (begin (display "4th") 7) n)
-       ((values . h) (apply values 7 (begin (display "5th") n)))
-       ((m 11) (n n) . q)
-       (rec (i (lambda () (- (j) 1)))
-	    (j (lambda ()  10)))
-       (and (k (begin (display "6th") m))
-	    (l (begin (display "end") (newline) 12)))
-       (o))
-  (if (&lt; d 10)
-      (p 40 50 60)
-      (if (&lt; m 100)
-	  (q 111 n)
-	  (begin (display (list a b c d e f g h (i) (j) k l m n))
-		 (newline))))
-  (o (list o p q))
-  (display "This is not displayed"))
-=&gt; 1st2nd3rd4th5th6th#f
-
-(alet* ((a (begin (display "1st") 1))
-	((b c) 2 (begin (display "2nd") 3))
-	(() (define m #f) (define n (list 8)))
-	((d (begin (display "3rd") 4))
-	 (key '(e 5 tmp 6) (e 0) ((f 'tmp) 55)) . p)
-	g (nu (begin (display "4th") 7) n)
-	((values . h) (apply values 7 (begin (display "5th") n)))
-	((m 11) (n n) . q)
-	(rec (i (lambda () (- (j) 1)))
-	     (j (lambda ()  10)))
-	(and (k (begin (display "6th") m))
-	     (l (begin (display "end") (newline) 12)))
-	(o))
-  (if (&lt; d 10)
-      (p 40 50 60)
-      (if (&lt; m 100)
-	  (q 111 n)
-	  (begin (display (list a b c d e f g h (i) (j) k l m n))
-		 (newline))))
-  (o (list o p q))
-  (display "This is not displayed"))
-=&gt; 1st2nd3rd4th5th6thend
-   4th5th6thend
-   6thend
-   (1 2 3 40 50 60 (7 8) (7 8) 9 10 111 12 111 (8))
-   (#&lt;continuation&gt; #&lt;procedure:p&gt; #&lt;procedure:q&gt;)
-
-(define (arg-message head-message proc . message)
-  (display head-message) (newline)
-  (alet ((() . lp)
-	 (() (for-each display message))
-	 (arg (read)))
-    (if (proc arg) arg (lp))))
-
-(define (substr str . rest)
-  (alet* ((len (string-length str))
-	  (opt rest
-	       (start 0
-		      (and (integer? start) (&lt;= 0 start len))
-		      start
-		      (arg-message
-		       "The first  argument:"
-		       (lambda (n) (and (integer? n) (&lt;= 0 n len)))
-		       "Write number (" 0 " &lt;= number &lt;= " len "): "))
-	       (end len
-		    (and (integer? end) (&lt;= start end len))
-		    end
-		    (arg-message
-		     "The second argument:"
-		     (lambda (n) (and (integer? n) (&lt;= start n len)))
-		     "Write number (" start " &lt;= number &lt;= " len "): "))))
-    (substring str start end)))
-	
-(substr "abcdefghi" 3)
-=&gt; "defghi"
-
-(substr "abcdefghi" 3 7)
-=&gt; "defg"
-
-(substr "abcdefghi" 20 7)
-=&gt; The first  argument:
-   Write number (0 &lt;= number &lt;= 9): 3
-   "defg"
-
-(substr "abcdefghi" "a" 20)
-=&gt; The first  argument:
-   Write number (0 &lt;= number &lt;= 9): 2
-   The second argument:
-   Write number (2 &lt;= number &lt;= 9): 10
-   Write number (2 &lt;= number &lt;= 9): 9
-   "cdefghi"
-</pre>
-
-<h1>Implementation</h1>
-
-<p>
-The following implementation is written in R5RS hygienic macros and
-requires SRFI 23 (Error reporting mechanism).
-</p>
-
-<pre>;;; mu &amp; nu
-(define-syntax mu
-  (syntax-rules ()
-    ((mu argument ...)
-     (lambda (f) (f argument ...)))))
-
-(define-syntax nu
-  (syntax-rules ()
-    ((nu argument ...)
-     (lambda (f) (apply f argument ...)))))
-
-;;; alet
-(define-syntax alet
-  (syntax-rules ()
-    ((alet (bn ...) bd ...)
-     (%alet () () (bn ...) bd ...))
-    ((alet var (bn ...) bd ...)
-     (%alet (var) () (bn ...) bd ...))))
-
-(define-syntax %alet
-  (syntax-rules (opt cat key rec and values)
-    ((%alet () ((n v) ...) () bd ...)
-     ((lambda (n ...) bd ...) v ...))
-    ((%alet (var) ((n v) ...) () bd ...)
-     ((letrec ((var (lambda (n ...) bd ...)))
-	var) v ...))
-    ((%alet (var (p ...) (nv ...) (bn ...)) ((n v) ...) () bd ...)
-     ((letrec ((t (lambda (v ...)
-		    (%alet (p ...) (nv ... (n v) ... (var t))
-			   (bn ...) bd ...))))
-	t) v ...))
-    ((%alet (p ...) (nv ...) ((() a b ...) bn ...) bd ...)
-     ((lambda () a b ... (%alet (p ...) (nv ...) (bn ...) bd ...))))
-    ((%alet (p ...) (nv ...) (((a) c) bn ...) bd ...)
-     ((lambda (t) (%alet (p ...) (nv ... (a t)) (bn ...) bd ...)) c))
-
-    ((%alet (p ...) (nv ...) (((values a) c) bn ...) bd ...)
-     ((lambda (t) (%alet (p ...) (nv ... (a t)) (bn ...) bd ...)) c))
-    ((%alet (p ...) (nv ...) (((values . b) c d ...) bn ...) bd ...)
-     (%alet "dot" (p ...) (nv ...) (values) (b c d ...) (bn ...) bd ...))
-    ((%alet "dot" (p ...) (nv ...) (values t ...) ((a . b) c ...)
-	    (bn ...) bd ...)
-     (%alet "dot" (p ...) (nv ... (a tn)) (values t ... tn) (b c ...)
-	    (bn ...) bd ...))
-    ((%alet "dot" (p ...) (nv ...) (values t ...) (() c) (bn ...) bd ...)
-     (call-with-values (lambda () c)
-       (lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...))))
-    ((%alet "dot" (p ...) (nv ...) (values t ...) (() c ...) (bn ...) bd ...)
-     ((lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...)) c ...))
-    ((%alet "dot" (p ...) (nv ...) (values t ...) (b c) (bn ...) bd ...)
-     (call-with-values (lambda () c)
-       (lambda (t ... . tn)
-	 (%alet (p ...) (nv ... (b tn)) (bn ...) bd ...))))
-    ((%alet "dot" (p ...) (nv ...) (values t ...) (b c ...) (bn ...) bd ...)
-     ((lambda (t ... . tn)
-	(%alet (p ...) (nv ... (b tn)) (bn ...) bd ...)) c ...))
-
-    ((%alet (p ...) (nv ...) (((a . b) c d ...) bn ...) bd ...)
-     (%alet "dot" (p ...) (nv ... (a t)) (t) (b c d ...) (bn ...) bd ...))
-    ((%alet "dot" (p ...) (nv ...) (t ...) ((a . b) c ...) (bn ...) bd ...)
-     (%alet "dot" (p ...) (nv ... (a tn)) (t ... tn) (b c ...) (bn ...)
-	    bd ...))
-    ((%alet "dot" (p ...) (nv ...) (t ...) (() c) (bn ...) bd ...)
-     (c (lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...))))
-    ((%alet "dot" (p ...) (nv ...) (t ...) (() c ...) (bn ...) bd ...)
-     ((lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...)) c ...))
-    ((%alet "dot" (p ...) (nv ...) (t ...) (b c) (bn ...) bd ...)
-     (c (lambda (t ... . tn) (%alet (p ...) (nv ... (b tn)) (bn ...) bd ...))))
-    ((%alet "dot" (p ...) (nv ...) (t ...) (b c ...) (bn ...) bd ...)
-     ((lambda (t ... . tn)
-	(%alet (p ...) (nv ... (b tn)) (bn ...) bd ...)) c ...))
-
-    ((%alet (p ...) (nv ...) ((and (n1 v1 t1 ...) (n2 v2 t2 ...) ...) bn ...)
-	    bd ...)
-     (%alet "and" (p ...) (nv ...) ((n1 v1 t1 ...) (n2 v2 t2 ...) ...) (bn ...)
-	    bd ...))
-    ((%alet "and" (p ...) (nv ...) ((n v) nvt ...) (bn ...) bd ...)
-     (let ((t v))
-       (and t (%alet "and" (p ...) (nv ... (n t)) (nvt ...) (bn ...) bd ...))))
-    ((%alet "and" (p ...) (nv ...) ((n v t) nvt ...) (bn ...) bd ...)
-     (let ((tt v))
-       (and (let ((n tt)) t)
-	    (%alet "and" (p ...) (nv ... (n tt)) (nvt ...) (bn ...) bd ...)))) 
-    ((%alet "and" (p ...) (nv ...) () (bn ...) bd ...)
-     (%alet (p ...) (nv ...) (bn ...) bd ...))
-    ((%alet (p ...) (nv ...) ((opt z a . e) bn ...) bd ...)
-     (%alet "opt" (p ...) (nv ...) z (a . e) (bn ...) bd ...))
-    ((%alet "opt" (p ...) (nv ...) z ((n d t ...)) (bn ...) bd ...)
-     (let ((x (if (null? z)
-		  d
-		  (if (null? (cdr z))
-		      (wow-opt n (car z) t ...)
-		      (error "alet: too many arguments" (cdr z))))))
-       (%alet (p ...) (nv ... (n x)) (bn ...) bd ...)))
-    ((%alet "opt" (p ...) (nv ...) z ((n d t ...) . e) (bn ...) bd ...)
-     (let ((y (if (null? z) z (cdr z)))
-	   (x (if (null? z)
-		  d
-		  (wow-opt n (car z) t ...))))
-       (%alet "opt" (p ...) (nv ... (n x)) y e (bn ...) bd ...)))
-    ((%alet "opt" (p ...) (nv ...) z e (bn ...) bd ...)
-     (let ((te z))
-       (%alet (p ...) (nv ... (e te)) (bn ...) bd ...)))
-    ((%alet (p ...) (nv ...) ((cat z a . e) bn ...) bd ...)
-     (let ((y z))
-       (%alet "cat" (p ...) (nv ...) y (a . e) (bn ...) bd ...)))
-    ((%alet "cat" (p ...) (nv ...) z ((n d t ...)) (bn ...) bd ...)
-     (let ((x (if (null? z)
-		  d
-		  (if (null? (cdr z))
-		      (wow-cat-end z n t ...)
-		      (error "alet: too many arguments" (cdr z))))))
-       (%alet (p ...) (nv ... (n x)) (bn ...) bd ...)))
-    ((%alet "cat" (p ...) (nv ...) z ((n d t ...) . e) (bn ...) bd ...)
-     (let ((x (if (null? z)
-		  d
-		  (wow-cat! z n d t ...))))
-       (%alet "cat" (p ...) (nv ... (n x)) z e (bn ...) bd ...)))
-    ((%alet "cat" (p ...) (nv ...) z e (bn ...) bd ...)
-     (let ((te z))
-       (%alet (p ...) (nv ... (e te)) (bn ...) bd ...)))
-    ((%alet (p ...) (nv ...) ((key z a . e) bn ...) bd ...)
-     (let ((y z))
-       (%alet "key" (p ...) (nv ...) y () () (a . e) () (bn ...) bd ...)))
-    ((%alet "key" (p ...) (nv ...) z ()
-	    (ndt ...) (((n k) d t ...) . e) (kk ...) (bn ...) bd ...)
-     (%alet "key" (p ...) (nv ...) z ()
-	    (ndt ... ((n k) d t ...)) e (kk ... k) (bn ...) bd ...))
-    ((%alet "key" (p ...) (nv ...) z ()
-	    (ndt ...) ((n d t ...) . e) (kk ...) (bn ...) bd ...)
-     (%alet "key" (p ...) (nv ...) z ()
-	    (ndt ... ((n 'n) d t ...)) e (kk ... 'n) (bn ...) bd ...))
-    ((%alet "key" (p ...) (nv ...) z ()
-	    (ndt nd ...) (#t . e) (kk k ...) (bn ...) bd ...)
-     (%alet "key" (p ...) (nv ...) z (#t)
-	    (ndt nd ...) e (kk k ...) (bn ...) bd ...))
-    ((%alet "key" (p ...) (nv ...) z ()
-	    (ndt nd ...) (#f . e) (kk k ...) (bn ...) bd ...)
-     (%alet "key" (p ...) (nv ...) z (#f)
-	    (ndt nd ...) e (kk k ...) (bn ...) bd ...))
-    ((%alet "key" (p ...) (nv ...) z (o ...)
-	    (((n k) d t ...) ndt ...) e (kk ...) (bn ...) bd ...)
-     (let ((x (if (null? z)
-		  d
-		  (wow-key! z (o ...) (kk ...) (n k) d t ...))))
-       (%alet "key" (p ...) (nv ... (n x)) z (o ...)
-	      (ndt ...) e (kk ...) (bn ...) bd ...)))
-    ((%alet "key" (p ...) (nv ...) z (o ...) () () (kk ...) (bn ...) bd ...)
-     (if (null? z)
-	 (%alet (p ...) (nv ...) (bn ...) bd ...)
-	 (error "alet: too many arguments" z)))
-    ((%alet "key" (p ...) (nv ...) z (o ...) () e (kk ...) (bn ...) bd ...)
-     (let ((te z)) (%alet (p ...) (nv ... (e te)) (bn ...) bd ...)))
-    ((%alet (p ...) (nv ...) ((rec (n v) (nn vv) ...) bn ...) bd ...)
-     (%alet "rec" (p ...) (nv ... (n t)) ((n v t))
-	    ((nn vv) ...) (bn ...) bd ...))
-    ((%alet "rec" (p ...) (nv ...) (nvt ...) ((n v) (nn vv) ...)
-	    (bn ...) bd ...)
-     (%alet "rec" (p ...) (nv ... (n t)) (nvt ... (n v t)) ((nn vv) ...)
-	    (bn ...) bd ...))
-    ((%alet "rec" (p ...) (nv ...) ((n v t) ...) () (bn ...) bd ...)
-     ((let ((n '&lt;undefined&gt;) ...)
-	(let ((t v) ...)
-	  (set! n t) ...
-	  (mu n ...)))
-      (lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...))))
-
-    ((%alet (p ...) (nv ...) ((a b) bn ...) bd ...)
-     ((lambda (t) (%alet (p ...) (nv ... (a t)) (bn ...) bd ...)) b))
-
-    ((%alet (p ...) (nv ...) ((values a c) bn ...) bd ...)
-     ((lambda (t) (%alet (p ...) (nv ... (a t)) (bn ...) bd ...)) c))
-    ((%alet (p ...) (nv ...) ((values a b c ...) bn ...) bd ...)
-     (%alet "not" (p ...) (nv ... (a t)) (values t) (b c ...) (bn ...) bd ...))
-    ((%alet "not" (p ...) (nv ...) (values t ...) (a b c ...) (bn ...) bd ...)
-     (%alet "not" (p ...) (nv ... (a tn)) (values t ... tn) (b c ...)
-	    (bn ...) bd ...))
-    ((%alet "not" (p ...) (nv ...) (values t ...) (z) (bn ...) bd ...)
-     (call-with-values (lambda () z)
-       (lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...))))
-
-    ((%alet (p ...) (nv ...) ((a b c ...) bn ...) bd ...)
-     (%alet "not" (p ...) (nv ... (a t)) (t) (b c ...) (bn ...) bd ...))
-    ((%alet "not" (p ...) (nv ...) (t ...) (a b c ...) (bn ...) bd ...)
-     (%alet "not" (p ...) (nv ... (a tn)) (t ... tn) (b c ...) (bn ...)
-	    bd ...))
-    ((%alet "not" (p ...) (nv ...) (t ...) (z) (bn ...) bd ...)
-     (z (lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...))))
-    ((%alet (p ...) (nv ...) ((a) bn ...) bd ...)
-     (call-with-current-continuation
-      (lambda (t) (%alet (p ...) (nv ... (a t)) (bn ...) bd ...))))
-    ((%alet (p ...) (nv ...) ((a . b) bn ...) bd ...)
-     (%alet "rot" (p ...) (nv ...) (a) b (bn ...) bd ...))
-    ((%alet "rot" (p ...) (nv ...) (new-bn ...) (a . b) (bn ...) bd ...)
-     (%alet "rot" (p ...) (nv ...) (new-bn ... a) b (bn ...) bd ...)) 
-    ((%alet "rot" (p ...) (nv ...) (()) b (bn ...) bd ...)
-     (%alet (b (p ...) (nv ...) (bn ...)) () () bd ...))
-    ((%alet "rot" (p ...) (nv ...) (new-bn ...) b (bn ...) bd ...)
-     (%alet (b (p ...) (nv ...) (bn ...)) () (new-bn ...) bd ...))
-    ((%alet (p ...) (nv ...) (a b bn ...) bd ...)
-     (b (lambda t (%alet (p ...) (nv ... (a t)) (bn ...) bd ...))))))
-
-;;; alet*
-(define-syntax alet*
-  (syntax-rules (opt cat key rec and values)
-    ((alet* () bd ...)
-     ((lambda () bd ...)))
-    ((alet* ((() a b ...) bn ...) bd ...)
-     ((lambda () a b ... (alet* (bn ...) bd ...))))
-    ((alet* (((a) c) bn ...) bd ...)
-     ((lambda (a) (alet* (bn ...) bd ...)) c))
-
-    ((alet* (((values a) c) bn ...)  bd ...)
-     ((lambda (a) (alet* (bn ...) bd ...)) c))
-
-    ((alet* (((values . b) c) bn ...)  bd ...)
-     (call-with-values (lambda () c)
-       (lambda* b (alet* (bn ...) bd ...))))
-    ((alet* (((values . b) c d ...) bn ...) bd ...)
-     (alet* "dot" (b c d ...) (bn ...) bd ...))
-    ((alet* "dot" ((a . b) c d ...) (bn ...) bd ...)
-     ((lambda (a) (alet* "dot" (b d ...) (bn ...) bd ...)) c))
-    ((alet* "dot" (()) (bn ...) bd ...)
-     (alet* (bn ...) bd ...))
-    ((alet* "dot" (b c ...) (bn ...) bd ...)
-     ((lambda b (alet* (bn ...) bd ...)) c ...))
-    
-    ((alet* (((a . b) c) bn ...)  bd ...)
-     (c (lambda* (a . b) (alet* (bn ...) bd ...))))
-    ((alet* (((a . b) c d ...) bn ...) bd ...)
-     ((lambda (a) (alet* "dot" (b d ...) (bn ...) bd ...)) c))
-
-    ((alet* ((and (n1 v1 t1 ...) (n2 v2 t2 ...) ...) bn ...) bd ...)
-     (alet-and* ((n1 v1 t1 ...) (n2 v2 t2 ...) ...) (alet* (bn ...) bd ...)))
-    ((alet* ((opt z a . e) bn ...) bd ...)
-     (%alet-opt* z (a . e) (alet* (bn ...) bd ...)))
-    ((alet* ((cat z a . e) bn ...)  bd ...)
-     (let ((y z))
-       (%alet-cat* y (a . e) (alet* (bn ...) bd ...))))
-    ((alet* ((key z a . e) bn ...)  bd ...)
-     (let ((y z))
-       (%alet-key* y () () (a . e) () (alet* (bn ...) bd ...))))
-    ((alet* ((rec (n1 v1) (n2 v2) ...) bn ...) bd ...)
-     (alet-rec* ((n1 v1) (n2 v2) ...) (alet* (bn ...) bd ...)))
-
-    ((alet* ((a b) bn ...) bd ...)
-     ((lambda (a) (alet* (bn ...) bd ...)) b))
-
-    ((alet* ((values a c) bn ...) bd ...)
-     ((lambda (a) (alet* (bn ...) bd ...)) c))
-    ((alet* ((values a b c ...) bn ...) bd ...)
-     (alet* "not" (values a) (b c ...) (bn ...) bd ...))
-    ((alet* "not" (values r ...) (a b c ...) (bn ...) bd ...)
-     (alet* "not" (values r ... a) (b c ...) (bn ...) bd ...))
-    ((alet* "not" (values r ...) (z) (bn ...) bd ...)
-     (call-with-values (lambda () z)
-       (lambda* (r ...) (alet* (bn ...) bd ...))))
-
-    ((alet* ((a b c ...) bn ...) bd ...)
-     (alet* "not" (a) (b c ...) (bn ...) bd ...))
-    ((alet* "not" (r ...) (a b c ...) (bn ...) bd ...)
-     (alet* "not" (r ... a) (b c ...) (bn ...) bd ...))
-    ((alet* "not" (r ...) (z) (bn ...) bd ...)
-     (z (lambda* (r ...) (alet* (bn ...) bd ...))))
-    ((alet* ((a) bn ...) bd ...)
-     (call-with-current-continuation (lambda (a) (alet* (bn ...)  bd ...))))
-    ((alet* ((a . b) bn ...) bd ...)
-     (%alet* () () ((a . b) bn ...) bd ...))
-    ((alet* (a b bn ...) bd ...)
-     (b (lambda a (alet* (bn ...) bd ...))))
-    ((alet* var (bn ...) bd ...)
-     (%alet* (var) () (bn ...) bd ...))))
-
-(define-syntax %alet*
-  (syntax-rules (opt cat key rec and values)
-    ((%alet* (var) (n ...) () bd ...)
-     ((letrec ((var (lambda* (n ...) bd ...)))
-	var) n ...))
-    ((%alet* (var (bn ...)) (n ...) ()  bd ...)
-     ((letrec ((var (lambda* (n ...) (alet* (bn ...) bd ...))))
-	var) n ...))
-    ((%alet* (var (p ...) (nn ...) (bn ...)) (n ...) ()  bd ...)
-     ((letrec ((var (lambda* (n ...)
-			     (%alet* (p ...) (nn ... n ... var) (bn ...)
-				     bd ...))))
-	var) n ...))
-    ((%alet* (p ...) (n ...) ((() a b ...) bn ...) bd ...)
-     ((lambda () a b ... (%alet* (p ...) (n ...) (bn ...) bd ...))))
-    ((%alet* (p ...) (n ...) (((a) c) bn ...) bd ...)
-     ((lambda (a) (%alet* (p ...) (n ... a) (bn ...) bd ...)) c))
-
-    ((%alet* (p ...) (n ...) (((values a) c) bn ...) bd ...)
-     ((lambda (a) (%alet* (p ...) (n ... a) (bn ...) bd ...)) c))
-
-    ((%alet* (p ...) (n ...) (((values . b) c) bn ...) bd ...)
-     (%alet* "one" (p ...) (n ...) (values) (b c) (bn ...) bd ...))
-    ((%alet* "one" (p ...) (n ...) (values r ...) ((a . b) c) (bn ...) bd ...)
-     (%alet* "one" (p ...) (n ... a) (values r ... a) (b c) (bn ...) bd ...))
-    ((%alet* "one" (p ...) (n ...) (values r ...) (() c) (bn ...) bd ...)
-     (call-with-values (lambda () c)
-       (lambda* (r ...) (%alet* (p ...) (n ...) (bn ...) bd ...))))
-    ((%alet* "one" (p ...) (n ...) (values r ...) (b c) (bn ...) bd ...)
-     (call-with-values (lambda () c)
-       (lambda* (r ... . b) (%alet* (p ...) (n ... b) (bn ...) bd ...))))
-
-    ((%alet* (p ...) (n ...) (((values . b) c d ...) bn ...) bd ...)
-     (%alet* "dot" (p ...) (n ...) (b c d ...) (bn ...) bd ...))
-
-    ((%alet* (p ...) (n ...) (((a . b) c) bn ...) bd ...)
-     (%alet* "one" (p ...) (n ... a) (a) (b c) (bn ...) bd ...))
-    ((%alet* "one" (p ...) (n ...) (r ...) ((a . b) c) (bn ...) bd ...)
-     (%alet* "one" (p ...) (n ... a) (r ... a) (b c) (bn ...) bd ...))
-    ((%alet* "one" (p ...) (n ...) (r ...) (() c) (bn ...) bd ...)
-     (c (lambda* (r ...) (%alet* (p ...) (n ...) (bn ...) bd ...))))
-    ((%alet* "one" (p ...) (n ...) (r ...) (b c) (bn ...) bd ...)
-     (c (lambda* (r ... . b) (%alet* (p ...) (n ... b) (bn ...) bd ...))))
-
-    ((%alet* (p ...) (n ...) (((a . b) c d ...) bn ...) bd ...)
-     ((lambda (a)
-	(%alet* "dot" (p ...) (n ... a) (b d ...) (bn ...) bd ...)) c))
-    ((%alet* "dot" (p ...) (n ...) ((a . b) c d ...) (bn ...) bd ...)
-     ((lambda (a)
-	(%alet* "dot" (p ...) (n ... a) (b d ...) (bn ...) bd ...)) c))
-    ((%alet* "dot" (p ...) (n ...) (()) (bn ...) bd ...)
-     (%alet* (p ...) (n ...) (bn ...) bd ...))
-    ((%alet* "dot" (p ...) (n ...) (b c ...) (bn ...) bd ...)
-     ((lambda b (%alet* (p ...) (n ... b) (bn ...) bd ...)) c ...))
-
-    ((%alet* (p ...) (n ...) ((and (n1 v1 t1 ...) (n2 v2 t2 ...) ...) bn ...)
-	     bd ...)
-     (alet-and* ((n1 v1 t1 ...) (n2 v2 t2 ...) ...)
-		(%alet* (p ...) (n ... n1 n2 ...) (bn ...) bd ...)))
-    ((%alet* (p ...) (n ...) ((opt z a . e) bn ...) bd ...)
-     (%alet* "opt" (p ...) (n ...) z (a . e) (bn ...) bd ...))
-    ((%alet* "opt" (p ...) (nn ...) z ((n d t ...)) (bn ...) bd ...)
-     (let ((n (if (null? z)
-		  d
-		  (if (null? (cdr z))
-		      (wow-opt n (car z) t ...)
-		      (error "alet*: too many arguments" (cdr z))))))
-       (%alet* (p ...) (nn ... n) (bn ...) bd ...)))
-    ((%alet* "opt" (p ...) (nn ...) z ((n d t ...) . e) (bn ...) bd ...)
-     (let ((y (if (null? z) z (cdr z)))
-	   (n (if (null? z)
-		  d
-		  (wow-opt n (car z) t ...))))
-       (%alet* "opt" (p ...) (nn ... n) y e (bn ...) bd ...)))
-    ((%alet* "opt" (p ...) (nn ...) z e (bn ...) bd ...)
-     (let ((e z))
-       (%alet* (p ...) (nn ... e) (bn ...) bd ...)))
-    ((%alet* (p ...) (nn ...) ((cat z a . e) bn ...) bd ...)
-     (let ((y z))
-       (%alet* "cat" (p ...) (nn ...) y (a . e) (bn ...) bd ...)))
-    ((%alet* "cat" (p ...) (nn ...) z ((n d t ...)) (bn ...) bd ...)
-     (let ((n (if (null? z)
-		  d
-		  (if (null? (cdr z))
-		      (wow-cat-end z n t ...)
-		      (error "alet*: too many arguments" (cdr z))))))
-       (%alet* (p ...) (nn ... n) (bn ...) bd ...)))
-    ((%alet* "cat" (p ...) (nn ...) z ((n d t ...) . e) (bn ...) bd ...)
-     (let ((n (if (null? z)
-		  d
-		  (wow-cat! z n d t ...))))
-       (%alet* "cat" (p ...) (nn ... n) z e (bn ...) bd ...)))
-    ((%alet* "cat" (p ...) (nn ...) z e (bn ...) bd ...)
-     (let ((e z))
-       (%alet* (p ...) (nn ... e) (bn ...) bd ...)))
-    ((%alet* (p ...) (m ...) ((key z a . e) bn ...) bd ...)
-     (let ((y z))
-       (%alet* "key" (p ...) (m ...) y () () (a . e) () (bn ...) bd ...)))
-    ((%alet* "key" (p ...) (m ...) z ()
-	     (ndt ...) (((n k) d t ...) . e) (kk ...) (bn ...) bd ...)
-     (%alet* "key" (p ...) (m ...) z ()
-	     (ndt ... ((n k) d t ...)) e (kk ... k) (bn ...) bd ...))
-    ((%alet* "key" (p ...) (m ...) z ()
-	     (ndt ...) ((n d t ...) . e) (kk ...) (bn ...) bd ...)
-     (%alet* "key" (p ...) (m ...) z ()
-	     (ndt ... ((n 'n) d t ...)) e (kk ... 'n) (bn ...) bd ...))
-    ((%alet* "key" (p ...) (m ...) z ()
-	     (ndt nd ...) (#t . e) (kk k ...) (bn ...) bd ...)
-     (%alet* "key" (p ...) (m ...) z (#t)
-	     (ndt nd ...) e (kk k ...) (bn ...) bd ...))
-    ((%alet* "key" (p ...) (m ...) z ()
-	     (ndt nd ...) (#f . e) (kk k ...) (bn ...) bd ...)
-     (%alet* "key" (p ...) (m ...) z (#f)
-	     (ndt nd ...) e (kk k ...) (bn ...) bd ...))
-    ((%alet* "key" (p ...) (m ...) z (o ...)
-	     (((n k) d t ...) ndt ...) e (kk ...) (bn ...) bd ...)
-     (let ((n (if (null? z)
-		  d
-		  (wow-key! z (o ...) (kk ...) (n k) d t ...))))
-       (%alet* "key" (p ...) (m ... n) z (o ...)
-	       (ndt ...) e (kk ...) (bn ...) bd ...)))
-    ((%alet* "key" (p ...) (m ...) z (o ...) () () (kk ...) (bn ...) bd ...)
-     (if (null? z)
-	 (%alet* (p ...) (m ...) (bn ...) bd ...)
-	 (error "alet*: too many arguments" z)))
-    ((%alet* "key" (p ...) (m ...) z (o ...) () e (kk ...) (bn ...) bd ...)
-     (let ((e z)) (%alet* (p ...) (m ... e) (bn ...) bd ...)))
-    ((%alet* (p ...) (n ...) ((rec (n1 v1) (n2 v2) ...) bn ...) bd ...)
-     (alet-rec* ((n1 v1) (n2 v2) ...)
-		(%alet* (p ...) (n ... n1 n2 ...) (bn ...) bd ...)))
-
-    ((%alet* (p ...) (n ...) ((a b) bn ...) bd ...)
-     ((lambda (a) (%alet* (p ...) (n ... a) (bn ...) bd ...)) b))
-
-    ((%alet* (p ...) (n ...) ((values a c) bn ...) bd ...)
-     ((lambda (a) (%alet* (p ...) (n ... a) (bn ...) bd ...)) c))
-    ((%alet* (p ...) (n ...) ((values a b c ...) bn ...) bd ...)
-     (%alet* "not" (p ...) (n ... a) (values a) (b c ...) (bn ...) bd ...))
-    ((%alet* "not" (p ...) (n ...) (values r ...) (a b c ...) (bn ...) bd ...)
-     (%alet* "not" (p ...) (n ... a) (values r ... a) (b c ...) (bn ...)
-	     bd ...))
-    ((%alet* "not" (p ...) (n ...) (values r ...) (z) (bn ...) bd ...)
-     (call-with-values (lambda () z)
-       (lambda* (r ...) (%alet* (p ...) (n ...) (bn ...) bd ...))))
-
-    ((%alet* (p ...) (n ...) ((a b c ...) bn ...) bd ...)
-     (%alet* "not" (p ...) (n ... a) (a) (b c ...) (bn ...) bd ...))
-    ((%alet* "not" (p ...) (n ...) (r ...) (a b c ...) (bn ...) bd ...)
-     (%alet* "not" (p ...) (n ... a) (r ... a) (b c ...) (bn ...) bd ...))
-    ((%alet* "not" (p ...) (n ...) (r ...) (z) (bn ...) bd ...)
-     (z (lambda* (r ...) (%alet* (p ...) (n ...) (bn ...) bd ...))))
-    ((%alet* (p ...) (n ...) ((a) bn ...) bd ...)
-     (call-with-current-continuation
-      (lambda (a) (%alet* (p ...) (n ... a) (bn ...) bd ...))))
-    ((%alet* (p ...) (n ...) ((a . b) bn ...) bd ...)
-     (%alet* "rot" (p ...) (n ...) (a) b (bn ...) bd ...))
-    ((%alet* "rot" (p ...) (n ...) (new-bn ...) (a . b) (bn ...) bd ...)
-     (%alet* "rot" (p ...) (n ...) (new-bn ... a) b (bn ...) bd ...)) 
-    ((%alet* "rot" () () (()) b (bn ...) bd ...)
-     (%alet* (b (bn ...)) () () bd ...))
-    ((%alet* "rot" (p ...) (n ...) (()) b (bn ...) bd ...)
-     (%alet* (b (p ...) (n ...) (bn ...)) () () bd ...))
-    ((%alet* "rot" () () (new-bn ...) b (bn ...) bd ...)
-     (%alet* (b (bn ...)) () (new-bn ...) bd ...))
-    ((%alet* "rot" (p ...) (n ...) (new-bn ...) b (bn ...) bd ...)
-     (%alet* (b (p ...) (n ...) (bn ...)) () (new-bn ...) bd ...))
-    ((%alet* (p ...) (n ...) (a b bn ...) bd ...)
-     (b (lambda a (%alet* (p ...) (n ... a) (bn ...) bd ...))))))
-
-;;; auxiliaries
-(define-syntax lambda*
-  (syntax-rules ()
-    ((lambda* (a . e) bd ...)
-     (lambda* "star" (ta) (a) e bd ...))
-    ((lambda* "star" (t ...) (n ...) (a . e) bd ...)
-     (lambda* "star" (t ... ta) (n ... a) e bd ...))
-    ((lambda* "star" (t ...) (n ...) () bd ...)
-     (lambda (t ...)
-       (let* ((n t) ...) bd ...)))
-    ((lambda* "star" (t ...) (n ...) e bd ...)
-     (lambda (t ... . te)
-       (let* ((n t) ... (e te)) bd ...)))
-    ((lambda* e bd ...)
-     (lambda e bd ...))))
-
-(define-syntax alet-and
-  (syntax-rules ()
-    ((alet-and ((n v t ...) ...) bd ...)
-     (alet-and "and" () ((n v t ...) ...) bd ...))
-    ((alet-and "and" (nt ...) ((n v) nvt ...) bd ...)
-     (let ((t v))
-       (and t (alet-and "and" (nt ... (n t)) (nvt ...) bd ...))))
-    ((alet-and "and" (nt ...) ((n v t) nvt ...) bd ...)
-     (let ((tt v))
-       (and (let ((n tt)) t)
-	    (alet-and "and" (nt ... (n tt)) (nvt ...) bd ...))))
-    ((alet-and "and" ((n t) ...) () bd ...)
-     ((lambda (n ...) bd ...) t ...))))
-
-(define-syntax alet-and*
-  (syntax-rules ()
-    ((alet-and* () bd ...)
-     ((lambda () bd ...)))
-    ((alet-and* ((n v) nvt ...) bd ...)
-     (let ((n v))
-       (and n (alet-and* (nvt ...) bd ...))))
-    ((alet-and* ((n v t) nvt ...) bd ...)
-     (let ((n v))
-       (and t (alet-and* (nvt ...) bd ...))))))
-
-(define-syntax alet-rec
-  (syntax-rules ()
-    ((alet-rec ((n v) ...) bd ...)
-     (alet-rec "rec" () ((n v) ...) bd ...))
-    ((alet-rec "rec" (nvt ...) ((n v) nv ...) bd ...)
-     (alet-rec "rec" (nvt ... (n v t)) (nv ...) bd ...))
-    ((alet-rec "rec" ((n v t) ...) () bd ...)
-     (let ((n '&lt;undefined&gt;) ...)
-       (let ((t v) ...)
-	 (set! n t) ...
-	 ;;(let ()
-	 ;;  bd ...))))))
-	 bd ...)))))
-
-(define-syntax alet-rec*
-  (syntax-rules ()
-    ((alet-rec* ((n v) ...) bd ...)
-     (let* ((n '&lt;undefined&gt;) ...)
-       (set! n v) ...
-       ;;(let ()
-       ;; bd ...)))))
-       bd ...))))
-
-(define-syntax wow-opt
-  (syntax-rules ()
-    ((wow-opt n v)
-     v)
-    ((wow-opt n v t)
-     (let ((n v))
-       (if t n (error "alet[*]: bad argument" n 'n 't))))
-    ((wow-opt n v t ts)
-     (let ((n v))
-       (if t ts (error "alet[*]: bad argument" n 'n 't))))
-    ((wow-opt n v t ts fs)
-     (let ((n v))
-       (if t ts fs)))))
-
-(define-syntax wow-opt!
-  (syntax-rules ()
-    ((wow-opt! z n)
-     (let ((n (car z)))
-       (set! z (cdr z))
-       n))
-    ((wow-opt! z n t)
-     (let ((n (car z)))
-       (if t
-	   (begin (set! z (cdr z)) n)
-	   (error "alet[*]: bad argument" n 'n 't))))
-    ((wow-opt! z n t ts)
-     (let ((n (car z)))
-       (if t
-	   (begin (set! z (cdr z)) ts)
-	   (error "alet[*]: bad argument" n 'n 't))))
-    ((wow-opt! z n t ts fs)
-     (let ((n (car z)))
-       (if t
-	   (begin (set! z (cdr z)) ts)
-	   (begin (set! z (cdr z)) fs))))))
-
-(define-syntax wow-cat-end
-  (syntax-rules ()
-    ((wow-cat-end z n)
-     (car z))
-    ((wow-cat-end z n t)
-     (let ((n (car z)))
-       (if t n (error "alet[*]: too many argument" z))))
-    ((wow-cat-end z n t ts)
-     (let ((n (car z)))
-       (if t ts (error "alet[*]: too many argument" z))))
-    ((wow-cat-end z n t ts fs)
-     (let ((n (car z)))
-       (if t ts fs)))))
-
-(define-syntax wow-cat
-  (syntax-rules ()
-    ((wow-cat z n d)
-     z)
-    ((wow-cat z n d t)
-     (let ((n (car z)))
-       (if t
-	   z
-	   (let lp ((head (list n)) (tail (cdr z)))
-	     (if (null? tail)
-		 (cons d z)
-		 (let ((n (car tail)))
-		   (if t
-		       (cons n (append (reverse head) (cdr tail)))
-		       (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat z n d t ts)
-     (let ((n (car z)))
-       (if t
-	   (cons ts (cdr z))
-	   (let lp ((head (list n)) (tail (cdr z)))
-	     (if (null? tail)
-		 (cons d z)
-		 (let ((n (car tail)))
-		   (if t
-		       (cons ts (append (reverse head) (cdr tail)))
-		       (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat z n d t ts fs)
-     (let ((n (car z)))
-       (if t
-	   (cons ts (cdr z))
-	   (cons fs (cdr z)))))))
-
-(define-syntax wow-cat!
-  (syntax-rules ()
-    ((wow-cat! z n d)
-     (let ((n (car z)))
-       (set! z (cdr z))
-       n))
-    ((wow-cat! z n d t)
-     (let ((n (car z)))
-       (if t
-	   (begin (set! z (cdr z)) n)
-	   (let lp ((head (list n)) (tail (cdr z)))
-	     (if (null? tail)
-		 d
-		 (let ((n (car tail)))
-		   (if t
-		       (begin (set! z (append (reverse head) (cdr tail))) n)
-		       (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat! z n d t ts)
-     (let ((n (car z)))
-       (if t
-	   (begin (set! z (cdr z)) ts)
-	   (let lp ((head (list n)) (tail (cdr z)))
-	     (if (null? tail)
-		 d
-		 (let ((n (car tail)))
-		   (if t
-		       (begin (set! z (append (reverse head) (cdr tail))) ts)
-		       (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat! z n d t ts fs)
-     (let ((n (car z)))
-       (if t
-	   (begin (set! z (cdr z)) ts)
-	   (begin (set! z (cdr z)) fs))))))
-
-(define-syntax wow-key!
-  (syntax-rules ()
-    ((wow-key! z () (kk ...) (n key) d)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (begin (set! z (cdr y)) (car y))
-	       (let lp ((head (list (car y) x)) (tail (cdr y)))
-		 (if (null? tail)
-		     d
-		     (let ((x (car tail))
-			   (y (cdr tail)))
-		       (if (null? y)
-			   d
-			   (if (equal? key x)
-			       (begin (set! z (append (reverse head) (cdr y)))
-				      (car y))
-			       (lp (cons (car y) (cons x head))
-				   (cdr y)))))))))))
-    ((wow-key! z (#f) (kk ...) (n key) d)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (begin (set! z (cdr y)) (car y))
-	       (let ((lk (list kk ...)))
-		 (if (not (member x lk))
-		     d
-		     (let lp ((head (list (car y) x)) (tail (cdr y)))
-		       (if (null? tail)
-			   d
-			   (let ((x (car tail))
-				 (y (cdr tail)))
-			     (if (null? y)
-				 d
-				 (if (equal? key x)
-				     (begin (set! z (append (reverse head)
-							    (cdr y)))
-					    (car y))
-				     (if (not (member x lk))
-					 d
-					 (lp (cons (car y) (cons x head))
-					     (cdr y))))))))))))))
-    ((wow-key! z (#t) (kk ...) (n key) d)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (begin (set! z (cdr y)) (car y))
-	       (let* ((lk (list kk ...))
-		      (m (member x lk)))
-		 (let lp ((head (if m (list (car y) x) (list x)))
-			  (tail (if m (cdr y) y)))
-		   (if (null? tail)
-		       d
-		       (let ((x (car tail))
-			     (y (cdr tail)))
-			 (if (null? y)
-			     d
-			     (if (equal? key x)
-				 (begin (set! z (append (reverse head)
-							(cdr y)))
-					(car y))
-				 (let ((m (member x lk)))
-				   (lp (if m
-					   (cons (car y) (cons x head))
-					   (cons x head))
-				       (if m (cdr y) y)))))))))))))
-    ((wow-key! z () (kk ...) (n key) d t)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (let ((n (car y)))
-		 (if t
-		     (begin (set! z (cdr y)) n)
-		     (error "alet[*]: bad argument" n 'n 't)))
-	       (let lp ((head (list (car y) x)) (tail (cdr y)))
-		 (if (null? tail)
-		     d
-		     (let ((x (car tail))
-			   (y (cdr tail)))
-		       (if (null? y)
-			   d
-			   (if (equal? key x)
-			       (let ((n (car y)))
-				 (if t
-				     (begin (set! z (append (reverse head)
-							    (cdr y)))
-					    n)
-				     (error "alet[*]: bad argument"
-					    n 'n 't)))
-			       (lp (cons (car y) (cons x head))
-				   (cdr y)))))))))))
-    ((wow-key! z (#f) (kk ...) (n key) d t)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (let ((n (car y)))
-		 (if t
-		     (begin (set! z (cdr y)) n)
-		     (error "alet[*]: bad argument" n 'n 't)))
-	       (let ((lk (list kk ...)))
-		 (if (not (member x lk))
-		     d
-		     (let lp ((head (list (car y) x)) (tail (cdr y)))
-		       (if (null? tail)
-			   d
-			   (let ((x (car tail))
-				 (y (cdr tail)))
-			     (if (null? y)
-				 d
-				 (if (equal? key x)
-				     (let ((n (car y)))
-				       (if t
-					   (begin
-					     (set! z (append (reverse head)
-							     (cdr y)))
-					     n)
-					   (error "alet[*]: bad argument"
-						  n 'n 't)))
-				     (if (not (member x lk))
-					 d
-					 (lp (cons (car y) (cons x head))
-					     (cdr y))))))))))))))
-    ((wow-key! z (#t) (kk ...) (n key) d t)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (let ((n (car y)))
-		 (if t
-		     (begin (set! z (cdr y)) n)
-		     (error "alet[*]: bad argument" n 'n 't)))
-	       (let* ((lk (list kk ...))
-		      (m (member x lk)))
-		 (let lp ((head (if m (list (car y) x) (list x)))
-			  (tail (if m (cdr y) y)))
-		   (if (null? tail)
-		       d
-		       (let ((x (car tail))
-			     (y (cdr tail)))
-			 (if (null? y)
-			     d
-			     (if (equal? key x)
-				 (let ((n (car y)))
-				   (if t
-				       (begin (set! z (append (reverse head)
-							      (cdr y)))
-					      n)
-				       (error "alet[*]: bad argument"
-					      n 'n 't)))
-				 (let ((m (member x lk)))
-				   (lp (if m
-					   (cons (car y) (cons x head))
-					   (cons x head))
-				       (if m (cdr y) y)))))))))))))
-    ((wow-key! z () (kk ...) (n key) d t ts)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (let ((n (car y)))
-		 (if t
-		     (begin (set! z (cdr y)) ts)
-		     (error "alet[*]: bad argument" n 'n 't)))
-	       (let lp ((head (list (car y) x)) (tail (cdr y)))
-		 (if (null? tail)
-		     d
-		     (let ((x (car tail))
-			   (y (cdr tail)))
-		       (if (null? y)
-			   d
-			   (if (equal? key x)
-			       (let ((n (car y)))
-				 (if t
-				     (begin (set! z (append (reverse head)
-							    (cdr y)))
-					    ts)
-				     (error "alet[*]: bad argument"
-					    n 'n 't)))
-			       (lp (cons (car y) (cons x head))
-				   (cdr y)))))))))))
-    ((wow-key! z (#f) (kk ...) (n key) d t ts)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (let ((n (car y)))
-		 (if t
-		     (begin (set! z (cdr y)) ts)
-		     (error "alet[*]: bad argument" n 'n 't)))
-	       (let ((lk (list kk ...)))
-		 (if (not (member x lk))
-		     d
-		     (let lp ((head (list (car y) x)) (tail (cdr y)))
-		       (if (null? tail)
-			   d
-			   (let ((x (car tail))
-				 (y (cdr tail)))
-			     (if (null? y)
-				 d
-				 (if (equal? key x)
-				     (let ((n (car y)))
-				       (if t
-					   (begin
-					     (set! z (append (reverse head)
-							     (cdr y)))
-					     ts)
-					   (error "alet[*]: bad argument"
-						  n 'n 't)))
-				     (if (not (member x lk))
-					 d
-					 (lp (cons (car y) (cons x head))
-					     (cdr y))))))))))))))
-    ((wow-key! z (#t) (kk ...) (n key) d t ts)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (let ((n (car y)))
-		 (if t
-		     (begin (set! z (cdr y)) ts)
-		     (error "alet[*]: bad argument" n 'n 't)))
-	       (let* ((lk (list kk ...))
-		      (m (member x lk)))
-		 (let lp ((head (if m (list (car y) x) (list x)))
-			  (tail (if m (cdr y) y)))
-		   (if (null? tail)
-		       d
-		       (let ((x (car tail))
-			     (y (cdr tail)))
-			 (if (null? y)
-			     d
-			     (if (equal? key x)
-				 (let ((n (car y)))
-				   (if t
-				       (begin (set! z (append (reverse head)
-							      (cdr y)))
-					      ts)
-				       (error "alet[*]: bad argument"
-					      n 'n 't)))
-				 (let ((m (member x lk)))
-				   (lp (if m
-					   (cons (car y) (cons x head))
-					   (cons x head))
-				       (if m (cdr y) y)))))))))))))
-    ((wow-key! z () (kk ...) (n key) d t ts fs)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (let ((n (car y)))
-		 (if t
-		     (begin (set! z (cdr y)) ts)
-		     (begin (set! z (cdr y)) fs)))
-	       (let lp ((head (list (car y) x)) (tail (cdr y)))
-		 (if (null? tail)
-		     d
-		     (let ((x (car tail))
-			   (y (cdr tail)))
-		       (if (null? y)
-			   d
-			   (if (equal? key x)
-			       (let ((n (car y)))
-				 (if t
-				     (begin (set! z (append (reverse head)
-							    (cdr y)))
-					    ts)
-				     (begin (set! z (append (reverse head)
-							    (cdr y)))
-					    fs)))
-			       (lp (cons (car y) (cons x head))
-				   (cdr y)))))))))))
-    ((wow-key! z (#f) (kk ...) (n key) d t ts fs)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (let ((n (car y)))
-		 (if t
-		     (begin (set! z (cdr y)) ts)
-		     (begin (set! z (cdr y)) fs)))
-	       (let ((lk (list kk ...)))
-		 (if (not (member x lk))
-		     d
-		     (let lp ((head (list (car y) x)) (tail (cdr y)))
-		       (if (null? tail)
-			   d
-			   (let ((x (car tail))
-				 (y (cdr tail)))
-			     (if (null? y)
-				 d
-				 (if (equal? key x)
-				     (let ((n (car y)))
-				       (if t
-					   (begin
-					     (set! z (append (reverse head)
-							     (cdr y)))
-					     ts)
-					   (begin
-					     (set! z (append (reverse head)
-							     (cdr y)))
-					     fs)))
-				     (if (not (member x lk))
-					 d
-					 (lp (cons (car y) (cons x head))
-					     (cdr y))))))))))))))
-    ((wow-key! z (#t) (kk ...) (n key) d t ts fs)
-     (let ((x (car z))
-	   (y (cdr z)))
-       (if (null? y)
-	   d
-	   (if (equal? key x)
-	       (let ((n (car y)))
-		 (if t
-		     (begin (set! z (cdr y)) ts)
-		     (begin (set! z (cdr y)) fs)))
-	       (let* ((lk (list kk ...))
-		      (m (member x lk)))
-		 (let lp ((head (if m (list (car y) x) (list x)))
-			  (tail (if m (cdr y) y)))
-		   (if (null? tail)
-		       d
-		       (let ((x (car tail))
-			     (y (cdr tail)))
-			 (if (null? y)
-			     d
-			     (if (equal? key x)
-				 (let ((n (car y)))
-				   (if t
-				       (begin (set! z (append (reverse head)
-							      (cdr y)))
-					      ts)
-				       (begin (set! z (append (reverse head)
-							      (cdr y)))
-					      fs)))
-				 (let ((m (member x lk)))
-				   (lp (if m
-					   (cons (car y) (cons x head))
-					   (cons x head))
-				       (if m (cdr y) y)))))))))))))))
-
-(define-syntax alet-opt*
-  (syntax-rules ()
-    ((alet-opt* z (a . e) bd ...)
-     (let ((y z))
-       (%alet-opt* y (a . e) bd ...)))))
-(define-syntax %alet-opt*
-  (syntax-rules ()
-    ((%alet-opt* z ((n d t ...)) bd ...)
-     (let ((n (if (null? z)
-		  d
-		  (if (null? (cdr z))
-		      (wow-opt n (car z) t ...)
-		      (error "alet*: too many arguments" (cdr z))))))
-       bd ...))
-    ((%alet-opt* z ((n d t ...) . e)  bd ...)
-     (let ((y (if (null? z) z (cdr z)))
-	   (n (if (null? z)
-		  d
-		  (wow-opt n (car z) t ...))))
-       (%alet-opt* y e bd ...)))
-    ((%alet-opt* z e bd ...)
-     (let ((e z)) bd ...))))
-;; (define-syntax %alet-opt*
-;;   (syntax-rules ()
-;;     ((%alet-opt* z ((n d t ...)) bd ...)
-;;      (let ((n (if (null? z)
-;; 		  d
-;; 		  (if (null? (cdr z))
-;; 		      (wow-opt n (car z) t ...)
-;; 		      (error "alet*: too many arguments" (cdr z))))))
-;;        bd ...))
-;;     ((%alet-opt* z ((n d t ...) . e)  bd ...)
-;;      (let ((n (if (null? z)
-;; 		  d
-;; 		  (wow-opt! z n t ...))))
-;;        (%alet-opt* z e bd ...)))
-;;     ((%alet-opt* z e bd ...)
-;;      (let ((e z)) bd ...))))
-;; (define-syntax %alet-opt*
-;;   (syntax-rules ()
-;;     ((%alet-opt* z (ndt ...) (a . e) bd ...)
-;;      (%alet-opt* z (ndt ... a) e bd ...))
-;;     ((%alet-opt* z ((n d t ...) (nn dd tt ...) ...) () bd ...)
-;;      (if (null? z)
-;; 	 (let* ((n d) (nn dd) ...) bd ...)
-;; 	 (let ((y (cdr z))
-;; 	       (n (wow-opt n (car z) t ...)))
-;; 	   (%alet-opt* y ((nn dd tt ...) ...) () bd ...))))
-;;     ((%alet-opt* z () () bd ...)
-;;      (if (null? z)
-;; 	 (let () bd ...)
-;; 	 (error "alet*: too many arguments" z)))
-;;     ((%alet-opt* z  ((n d t ...) (nn dd tt ...) ...) e bd ...)
-;;      (if (null? z)
-;; 	 (let* ((n d) (nn dd) ... (e z)) bd ...)
-;; 	 (let ((y (cdr z))
-;; 	       (n (wow-opt n (car z) t ...)))
-;; 	   (%alet-opt* y ((nn dd tt ...) ...) e bd ...))))
-;;     ((%alet-opt* z () e bd ...)
-;;      (let ((e z)) bd ...))))
-
-(define-syntax alet-cat*
-  (syntax-rules ()
-    ((alet-cat* z (a . e) bd ...)
-     (let ((y z))
-       (%alet-cat* y (a . e) bd ...)))))
-;; (define-syntax %alet-cat*
-;;   (syntax-rules ()
-;;     ((%alet-cat* z ((n d t ...)) bd ...)
-;;      (let ((n (if (null? z)
-;; 		  d
-;; 		  (if (null? (cdr z))
-;; 		      (wow-cat-end z n t ...)
-;; 		      (error "alet*: too many arguments" (cdr z))))))
-;;        bd ...))
-;;     ((%alet-cat* z ((n d t ...) . e) bd ...)
-;;      (let* ((w (if (null? z)
-;; 		   (cons d z)
-;; 		   (wow-cat z n d t ...)))
-;; 	    (n (car w))
-;; 	    (y (cdr w)))
-;;        (%alet-cat* y e bd ...)))
-;;     ((%alet-cat* z e bd ...)
-;;      (let ((e z)) bd ...))))
-(define-syntax %alet-cat*
-  (syntax-rules ()
-    ((%alet-cat* z ((n d t ...)) bd ...)
-     (let ((n (if (null? z)
-		  d
-		  (if (null? (cdr z))
-		      (wow-cat-end z n t ...)
-		      (error "alet*: too many arguments" (cdr z))))))
-       bd ...))
-    ((%alet-cat* z ((n d t ...) . e) bd ...)
-     (let ((n (if (null? z)
-		  d
-		  (wow-cat! z n d t ...))))
-       (%alet-cat* z e bd ...)))
-    ((%alet-cat* z e bd ...)
-     (let ((e z)) bd ...))))
-;; (define-syntax %alet-cat*
-;;   (syntax-rules ()
-;;     ((%alet-cat* z (ndt ...) (a . e) bd ...)
-;;      (%alet-cat* z (ndt ... a) e bd ...))
-;;     ((%alet-cat* z ((n d t ...) (nn dd tt ...) ...) () bd ...)
-;;      (if (null? z)
-;; 	 (let* ((n d) (nn dd) ...) bd ...)
-;; 	 (let* ((w (wow-cat z n d t ...))
-;; 		(n (car w))
-;; 		(y (cdr w)))
-;; 	   (%alet-cat* y ((nn dd tt ...) ...) () bd ...))))
-;;     ((%alet-cat* z () () bd ...)
-;;      (if (null? z)
-;; 	 (let () bd ...)
-;; 	 (error "alet*: too many arguments" z)))
-;;     ((%alet-cat* z  ((n d t ...) (nn dd tt ...) ...) e bd ...)
-;;      (if (null? z)
-;; 	 (let* ((n d) (nn dd) ... (e z)) bd ...)
-;; 	 (let* ((w (wow-cat z n d t ...))
-;; 		(n (car w))
-;; 		(y (cdr w)))
-;; 	   (%alet-cat* y ((nn dd tt ...) ...) e bd ...))))
-;;     ((%alet-cat* z () e bd ...)
-;;      (let ((e z)) bd ...))))
-
-(define-syntax alet-key*
-  (syntax-rules ()
-    ((alet-key* z (a . e) bd ...)
-     (let ((y z))
-       (%alet-key* y () () (a . e) () bd ...)))))
-(define-syntax %alet-key*
-  (syntax-rules ()
-    ((%alet-key* z () (ndt ...) (((n k) d t ...) . e) (kk ...) bd ...)
-     (%alet-key* z () (ndt ... ((n k) d t ...)) e (kk ... k) bd ...))
-    ((%alet-key* z () (ndt ...) ((n d t ...) . e) (kk ...) bd ...)
-     (%alet-key* z () (ndt ... ((n 'n) d t ...)) e (kk ... 'n) bd ...))
-    ((%alet-key* z () (ndt nd ...) (#f . e) (kk k ...) bd ...)
-     (%alet-key* z (#f) (ndt nd ...) e (kk k ...) bd ...))
-    ((%alet-key* z () (ndt nd ...) (#t . e) (kk k ...) bd ...)
-     (%alet-key* z (#t) (ndt nd ...) e (kk k ...) bd ...))
-
-    ((%alet-key* z (o ...) (((n k) d t ...) ndt ...) e (kk ...) bd ...)
-     (let ((n (if (null? z)
-		  d
-		  (wow-key! z (o ...) (kk ...) (n k) d t ...))))
-       (%alet-key* z (o ...) (ndt ...) e (kk ...) bd ...)))
-    ((%alet-key* z (o ...) () () (kk ...) bd ...)
-     (if (null? z)
-	 (let () bd ...)
-	 (error "alet*: too many arguments" z)))
-    ((%alet-key* z (o ...) () e (kk ...) bd ...)
-     (let ((e z)) bd ...))))
-</pre>
-
-<h1>References</h1>
-
-<ul>
-<li><a name="R5RS">[R5RS]</a> Richard Kelsey, William Clinger, and Jonathan Rees: Revised(5)
-	    Report on the Algorithmic Language Scheme
-	<a href="http://www.schemers.org/Documents/Standards/R5Rs/">Link</a></li>
-<li><a name="SRFI2">[SRFI 2]</a> Oleg Kiselyov: <code>and-let*</code>: and <code>and</code> with local bindings, a guarded
-	    <code>let*</code> special form.
-	<a href="http://srfi.schemers.org/srfi-2/">Link</a></li>
-<li><a name="SRFI11">[SRFI 11]</a> Lars T. Hansen: Syntax for receiving multiple values.
-	<a href="http://srfi.schemers.org/srfi-11/">Link</a></li>
-<li><a name="SRFI51">[SRFI 51]</a> Joo ChurlSoo: Handling rest list.
-	<a href="http://srfi.schemers.org/srfi-51/">Link</a></li>
-<li><a name="SRFI71">[SRFI 71]</a> Sebastian Egner: Extended <code>let</code>-syntax for multiple values.
-	    <a href="http://srfi.schemers.org/srfi-71/">Link</a></li>
-<li><a name="Scsh">[Scsh]</a> Olin Shivers, Brian Carlstrom, Martin Gasbichler, Mike Sperber
-	<a href="http://www.scsh.net/">Link</a></li>
-    </ul>
-	    
-<h1>Copyright</h1>
-
-Copyright (c) 2006 Joo ChurlSoo.
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-</p><p>
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-</p><p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-    </p><hr>
-    <address>Editor: <a href="mailto:srfi%20minus%20editors%20at%20srfi%20dot%20schemers%20dot%20org">Mike
-    Sperber</a></address>
-
-
-</body></html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-87.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-87.html
deleted file mode 100644
index 73986bb6bf..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-87.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>SRFI 87: =&gt; in case clauses</title></head><body>
-
-<h1>Title</h1>
-
-=&gt; in case clauses
-
-<h1>Author</h1>
-
-Chongkai Zhu
-
-<h1>Status</h1>
-
-This SRFI is currently in ``final'' status. To see an explanation of each
-status that a SRFI can hold, see
-<a href="http://srfi.schemers.org/srfi-process.html">here</a>.
-To provide input on this SRFI, please <code>
-<a href="mailto:srfi-87@srfi.schemers.org">mailto:srfi-87@srfi.schemers.org</a></code>.
-See <a href="http://srfi.schemers.org/srfi-list-subscribe.html">instructions
-here</a> to subscribe to the list. You can access the discussion via
-<a href="http://srfi.schemers.org/srfi-87/mail-archive/maillist.html">the
-archive of the mailing list</a>.
-You can access
-post-finalization messages via
-<a href="http://srfi.schemers.org/srfi-87/post-mail-archive/maillist.html">
-the archive of the mailing list</a>.
-<p>
-</p><ul>
-  <li>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-87/srfi-87.html?rev=1.1">2006/04/10</a></li>
-  <li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-87/srfi-87.html?rev=1.2">2006/05/08</a></li>
-  <li>Draft: 2006/04/10 - 2006/06/08</li>
-  <li>Final: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-87/srfi-87.html?rev=1.3">2006/10/18</a></li>
-</ul>
-
-<h1>Abstract</h1>This SRFI proposes an extension to the <code>case</code> syntax 
-to allow the <code>=&gt;</code> clauses as in <code>cond</code>.
-<h1>Rationale</h1><code>case</code> is introduced as a syntax sugar based on 
-<code>cond</code>, which helps to save a explicit calling to <code>let</code>. 
-But without the <code>=&gt;</code> clause, if the <code>result </code>expression 
-needs the value of <code>key</code>, the <code>let </code>can't be saved. For an 
-easy example, suppose we want the following:
-<blockquote><pre>(case (get-symbol)
-  ((true) #t)
-  ((false) #f)
-  (else =&gt; (lambda (x) x)))</pre></blockquote>
-<p>Without the <code>=&gt;</code> clause in <code>case</code>, we have to 
-write:</p>
-<blockquote><pre>(let ((key (get-symbol)))
-  (cond ((eq? key 'true) #t)
-        ((eq? key 'false) #f)
-        (else key)))</pre></blockquote>
-<h1>Specification</h1>
-<p>(Based on R5RS section 4.2.1 Conditionals)</p>
-<dl>
-  <dt><u>library syntax:</u> <b><a name="case">case</a></b> <i>&lt;key&gt; &lt;clause1&gt; 
-  &lt;clause2&gt; ...</i> 
-  </dt><dd><em>Syntax:</em> &lt;Key&gt; may be any expression. Each &lt;clause&gt; 
-  should have the form <pre><tt>((&lt;datum1&gt; ...) &lt;expression1&gt; &lt;expression2&gt; ...),</tt></pre>
-  <p>where each &lt;datum&gt; is an external representation of some object. All 
-  the &lt;datum&gt;s must be distinct. The last &lt;clause&gt; may be an "else 
-  clause," which has the form </p><pre><tt>(else &lt;expression1&gt; &lt;expression2&gt; ...).</tt></pre>
-  <p><font color="#ff0000">Alternatively, a &lt;clause&gt; may be of the form 
-  </font></p><pre><font color="#ff0000"><tt>((&lt;datum1&gt; ...) =&gt; &lt;expression&gt;)</tt></font></pre>
-  <p><font color="#ff0000">and the last &lt;clause&gt; may be of the 
-  form</font></p><pre><font color="#ff0000"><tt>(else =&gt; &lt;expression&gt;)</tt></font></pre>
-  <p><em>Semantics:</em> A <samp>`case'</samp> expression is evaluated as 
-  follows. &lt;Key&gt; is evaluated and its result is compared against each 
-  &lt;datum&gt;. If the result of evaluating &lt;key&gt; is equivalent (in the 
-  sense of <samp>`eqv?'</samp>; see section see section <a href="http://www.swiss.ai.mit.edu/%7Ejaffer/r5rs_8.html#SEC49">6.1 Equivalence 
-  predicates</a>) to a &lt;datum&gt;, then the expressions in the corresponding 
-  &lt;clause&gt; are evaluated from left to right and the result(s) of the last 
-  expression in the &lt;clause&gt; is(are) returned as the result(s) of the 
-  <samp>`case'</samp> expression. If the result of evaluating &lt;key&gt; is 
-  different from every &lt;datum&gt;, then if there is an else clause its 
-  expressions are evaluated and the result(s) of the last is(are) the result(s) 
-  of the <samp>`case'</samp> expression; otherwise the result of the 
-  <samp>`case'</samp> expression is unspecified. <font color="#ff0000">If the 
-  selected &lt;clause&gt; uses the <code>=&gt;</code> alternate form, then the 
-  &lt;expression&gt; is evaluated. Its value must be a procedure that accepts 
-  one argument; this procedure is then called on the value of &lt;Key&gt; and 
-  the value(s) returned by this procedure is(are) returned by the 
-  <samp>`case'</samp> expression. </font></p></dd></dl>
-<p>(Based on R5RS section 3.5 Proper tail recursion)</p>
-<dd>If a <tt>cond</tt> <font color="#ff0000">or <tt>case</tt></font> expression is in a tail context, and has a clause of the 
-form <tt>(&lt;expression<sub>1</sub>&gt; =&gt; &lt;expression<sub>2</sub>&gt;)</tt> then the 
-(implied) call to the procedure that results from the evaluation of &lt;expression<sub>2</sub>&gt; 
-is in a tail context. &lt;expression<sub>2</sub>&gt; itself is not in a tail context.</dd>
-<h1>Implementation</h1>
-<blockquote><pre><code>(define-syntax case
-  (syntax-rules (else =&gt;)
-    ((case (key ...)
-       clauses ...)
-     (let ((atom-key (key ...)))
-       (case atom-key clauses ...)))
-    ((case key
-       (else =&gt; result))
-     (result key))
-    ((case key
-       ((atoms ...) =&gt; result))
-     (if (memv key '(atoms ...))
-         (result key)))
-    ((case key
-       ((atoms ...) =&gt; result)
-       clause clauses ...)
-     (if (memv key '(atoms ...))
-         (result key)
-         (case key clause clauses ...)))
-    ((case key
-       (else result1 result2 ...))
-     (begin result1 result2 ...))
-    ((case key
-       ((atoms ...) result1 result2 ...))
-     (if (memv key '(atoms ...))
-         (begin result1 result2 ...)))
-    ((case key
-       ((atoms ...) result1 result2 ...)
-       clause clauses ...)
-     (if (memv key '(atoms ...))
-         (begin result1 result2 ...)
-         (case key clause clauses ...)))))</code></pre></blockquote>
-<h1>Copyright</h1>Copyright (C) 2006 Chongkai Zhu. All Rights Reserved. 
-<p>Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of 
-the Software, and to permit persons to whom the Software is furnished to do so, 
-subject to the following conditions: 
-</p><p>The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software. 
-</p><p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-</p><hr>
-
-<address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike 
-Sperber</a></address><!-- Created: Tue Sep 29 19:20:08 EDT 1998 --><!-- hhmts start -->Last 
-modified: Mon Apr 10 21:20:25 CEST 2006 <!-- hhmts end -->
-</body></html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-9.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-9.html
deleted file mode 100644
index 0bf112aa92..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-9.html
+++ /dev/null
@@ -1,403 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.2//EN">
-<html>
-  <head>
-    <title>SRFI 9: Defining Record Types</title>
-  </head>
-
-  <body>
-
-<H1>Title</H1>
-
-SRFI 9: Defining Record Types
-
-<H1>Author</H1>
-
-Richard Kelsey
-
-<H1>Status</H1>
-
-This SRFI is currently in ``final'' status.  To see an explanation of each status that a SRFI can hold, see <A HREF="http://srfi.schemers.org/srfi-process.html">here</A>.
-You can access the discussion via <A HREF="http://srfi.schemers.org/srfi-9/mail-archive/maillist.html">the archive of the mailing list</A>.
-<P><UL>
-<LI>Received: 1999/07/01
-<LI>Revised: 1999/08/25
-<LI>Draft: 1999/07/07-1999/09/06
-<LI>Final: 1999/09/09
-</UL>
-
-<H1>Abstract</H1>
-
-This SRFI describes syntax for creating new data types, called record types.
-A predicate, constructor, and field accessors and modifiers are defined for
-each record type.  Each new record type is distinct from all existing types,
-including other record types and Scheme's predefined types.
-
-<H1>Rationale</H1>
-
-Many Scheme implementations provide means for creating new types,
- usually called either records or structures.
-The <code>DEFINE-RECORD-TYPE</code> syntax described here is a slight
- simplification of one written for Scheme&#032;48 by Jonathan Rees.
-Unlike many record-defining macros or special forms, it
- does not create any new identifiers.
-Instead, the names of the
- record type, predicate, constructor, and so on are all listed explicitly
- in the source.
-This has the following advantages:
-<UL>
-<LI> It can be defined using a simple <code>SYNTAX-RULES</code> macro
- in Scheme implementations that provide a procedural interface
- for creating record types.
-<LI> It does not restrict users to a particular naming convention.
-<LI> Tools like <code>grep</code> and GNU Emacs's tag facility will see the
- defining occurrence of each identifier.
-</UL>
-
-<H1>Specification</H1>
-
-The syntax of a record-type definition is:
-<a name="define-record-type"></a>
-<PRE>
- &lt;command or definition&gt;           
-   -&gt; &lt;record type definition&gt;           ; addition to 8.1.6 in R5RS
-
- &lt;record type definition&gt;
-   -&gt; (define-record-type &lt;type name&gt;
-	(&lt;constructor name&gt; &lt;field tag&gt; ...)
-	&lt;predicate name&gt;
-	&lt;field spec&gt; ...)
-
- &lt;field spec&gt; -&gt; (&lt;field tag&gt; &lt;accessor name&gt;)
-              -&gt; (&lt;field tag&gt; &lt;accessor name&gt; &lt;modifier name&gt;)
-
- &lt;field tag&gt; -&gt; &lt;identifier&gt;
- &lt;... name&gt;  -&gt; &lt;identifier&gt;
-</PRE> 
-
-<code>DEFINE-RECORD-TYPE</code> is generative: 
-each use creates a new record type that is distinct from all existing types,
-including other record types and Scheme's predefined types.
-
-Record-type definitions may only occur at top-level (there are two
-possible semantics for `internal' record-type definitions, generative
-and nongenerative, and no consensus as to which is better).
-
-<P>
-An instance of <code>DEFINE-RECORD-TYPE</code> is equivalent to the following
-definitions:
-<UL>
-<LI> <code>&lt;type name&gt;</code> is bound to a representation of the record
-    type itself.  Operations on record types, such as defining print
-    methods, reflection, etc. are left to other SRFIs.
-
-<LI> <code>&lt;constructor name&gt;</code> is bound to a procedure that takes
-    as many arguments as there are <code>&lt;field tag&gt;</code>s in the
-    <code>(&lt;constructor name&gt; ...)</code>
-    subform and returns a new <code>&lt;type name&gt;</code> record.
-    Fields whose tags are listed with <code>&lt;constructor name&gt;</code>
-    have the corresponding argument as their
-    initial value.  The initial values of all other fields are unspecified.
-
-<LI> <code>&lt;predicate name&gt;</code> is a predicate that returns #T when
-    given a value returned by <code>&lt;constructor name&gt;</code> and #F
-    for everything else.
-
-<LI> Each <code>&lt;accessor name&gt;</code> is a procedure that takes a record
-    of type <code>&lt;type name&gt;</code> and returns the current value of the
-    corresponding field.
-    It is an error to pass an accessor a value which is not a record of
-    the appropriate type.
-    
-<LI> Each <code>&lt;modifier name&gt;</code> is a procedure that takes a record
-    of type <code>&lt;type name&gt;</code> and a value which becomes the new
-    value of the corresponding field; an unspecified value is returned.
-    It is an error to pass a modifier a first
-    argument which is not a record of the appropriate type.
-</UL>
-
-<P>
-Records are disjoint from the types listed in Section 4.2 of R5RS.
-
-<P>
-<code>Set!</code>ing the value of any of these identifiers has no
- effect on the behavior of any of their original values.
-
-<P>
-The following
-<PRE>
-  (define-record-type :pare
-    (kons x y)
-    pare?
-    (x kar set-kar!)
-    (y kdr))
-</PRE>
-defines <code>KONS</code> to be a constructor, <code>KAR</code> and
-<code>KDR</code> to be accessors, <code>SET-KAR!</code> to be a modifier,
-and <code>PARE?</code> to be a predicate for <code>:PARE</code>s.
-
-<PRE>
-  (pare? (kons 1 2))        --&gt; #t
-  (pare? (cons 1 2))        --&gt; #f
-  (kar (kons 1 2))          --&gt; 1
-  (kdr (kons 1 2))          --&gt; 2
-  (let ((k (kons 1 2)))
-    (set-kar! k 3)
-    (kar k))                --&gt; 3
-</PRE>
-
-<H1>Implementation</H1>
-
-This code is divided into three layers.  In top-down order these are:
-<OL>
-<LI> Syntax definitions for <code>DEFINE-RECORD-TYPE</code> and an auxiliary
- macro.
-<LI> An implementation of record types with a procedural interface.
-Some Scheme implementations already have something close to this.
-<LI> Vector-like records implemented in R5RS.  This redefines some standard
-Scheme procedures and therefor must be loaded before any other code, including
-part 2 above.  Note that these procedures can be used to break the
-record-type abstraction (for example, <code>RECORD-SET!</code> can be used
-to modify the type of a record).  Access to these procedures should be
-restricted.
-</OL>
-
-<H2>Syntax definitions</H2>
-
-<PRE>
-; Definition of DEFINE-RECORD-TYPE
-
-(define-syntax define-record-type
-  (syntax-rules ()
-    ((define-record-type type
-       (constructor constructor-tag ...)
-       predicate
-       (field-tag accessor . more) ...)
-     (begin
-       (define type
-         (make-record-type 'type '(field-tag ...)))
-       (define constructor
-         (record-constructor type '(constructor-tag ...)))
-       (define predicate
-         (record-predicate type))
-       (define-record-field type field-tag accessor . more)
-       ...))))
-
-; An auxilliary macro for define field accessors and modifiers.
-; This is needed only because modifiers are optional.
-
-(define-syntax define-record-field
-  (syntax-rules ()
-    ((define-record-field type field-tag accessor)
-     (define accessor (record-accessor type 'field-tag)))
-    ((define-record-field type field-tag accessor modifier)
-     (begin
-       (define accessor (record-accessor type 'field-tag))
-       (define modifier (record-modifier type 'field-tag))))))
-</PRE>
-
-<H2>Record types</H2>
-
-<PRE>
-; We define the following procedures:
-; 
-; (make-record-type &lt;type-name &lt;field-names&gt;)    -> &lt;record-type&gt;
-; (record-constructor &lt;record-type&lt;field-names&gt;) -> &lt;constructor&gt;
-; (record-predicate &lt;record-type&gt;)               -> &lt;predicate&gt;
-; (record-accessor &lt;record-type &lt;field-name&gt;)    -> &lt;accessor&gt;
-; (record-modifier &lt;record-type &lt;field-name&gt;)    -> &lt;modifier&gt;
-;   where
-; (&lt;constructor&gt; &lt;initial-value&gt; ...)         -> &lt;record&gt;
-; (&lt;predicate&gt; &lt;value&gt;)                       -> &lt;boolean&gt;
-; (&lt;accessor&gt; &lt;record&gt;)                       -> &lt;value&gt;
-; (&lt;modifier&gt; &lt;record&gt; &lt;value&gt;)         -> &lt;unspecific&gt;
-
-; Record types are implemented using vector-like records.  The first
-; slot of each record contains the record's type, which is itself a
-; record.
-
-(define (record-type record)
-  (record-ref record 0))
-
-;----------------
-; Record types are themselves records, so we first define the type for
-; them.  Except for problems with circularities, this could be defined as:
-;  (define-record-type :record-type
-;    (make-record-type name field-tags)
-;    record-type?
-;    (name record-type-name)
-;    (field-tags record-type-field-tags))
-; As it is, we need to define everything by hand.
-
-(define :record-type (make-record 3))
-(record-set! :record-type 0 :record-type)	; Its type is itself.
-(record-set! :record-type 1 ':record-type)
-(record-set! :record-type 2 '(name field-tags))
-
-; Now that :record-type exists we can define a procedure for making more
-; record types.
-
-(define (make-record-type name field-tags)
-  (let ((new (make-record 3)))
-    (record-set! new 0 :record-type)
-    (record-set! new 1 name)
-    (record-set! new 2 field-tags)
-    new))
-
-; Accessors for record types.
-
-(define (record-type-name record-type)
-  (record-ref record-type 1))
-
-(define (record-type-field-tags record-type)
-  (record-ref record-type 2))
-
-;----------------
-; A utility for getting the offset of a field within a record.
-
-(define (field-index type tag)
-  (let loop ((i 1) (tags (record-type-field-tags type)))
-    (cond ((null? tags)
-           (error "record type has no such field" type tag))
-          ((eq? tag (car tags))
-           i)
-          (else
-           (loop (+ i 1) (cdr tags))))))
-
-;----------------
-; Now we are ready to define RECORD-CONSTRUCTOR and the rest of the
-; procedures used by the macro expansion of DEFINE-RECORD-TYPE.
-
-(define (record-constructor type tags)
-  (let ((size (length (record-type-field-tags type)))
-        (arg-count (length tags))
-        (indexes (map (lambda (tag)
-                        (field-index type tag))
-                      tags)))
-    (lambda args
-      (if (= (length args)
-             arg-count)
-          (let ((new (make-record (+ size 1))))
-            (record-set! new 0 type)
-            (for-each (lambda (arg i)
-			(record-set! new i arg))
-                      args
-                      indexes)
-            new)
-          (error "wrong number of arguments to constructor" type args)))))
-
-(define (record-predicate type)
-  (lambda (thing)
-    (and (record? thing)
-         (eq? (record-type thing)
-              type))))
-
-(define (record-accessor type tag)
-  (let ((index (field-index type tag)))
-    (lambda (thing)
-      (if (and (record? thing)
-               (eq? (record-type thing)
-                    type))
-          (record-ref thing index)
-          (error "accessor applied to bad value" type tag thing)))))
-
-(define (record-modifier type tag)
-  (let ((index (field-index type tag)))
-    (lambda (thing value)
-      (if (and (record? thing)
-               (eq? (record-type thing)
-                    type))
-          (record-set! thing index value)
-          (error "modifier applied to bad value" type tag thing)))))
-</PRE>
-
-<H2>Records</H2>
-
-<PRE>
-; This implements a record abstraction that is identical to vectors,
-; except that they are not vectors (VECTOR? returns false when given a
-; record and RECORD? returns false when given a vector).  The following
-; procedures are provided:
-;   (record? &lt;value&gt;)                -> &lt;boolean&gt;
-;   (make-record &lt;size&gt;)             -> &lt;record&gt;
-;   (record-ref &lt;record&gt; &lt;index&gt;)    -> &lt;value&gt;
-;   (record-set! &lt;record&gt; &lt;index&gt; &lt;value&gt;) -> &lt;unspecific&gt;
-;
-; These can implemented in R5RS Scheme as vectors with a distinguishing
-; value at index zero, providing VECTOR? is redefined to be a procedure
-; that returns false if its argument contains the distinguishing record
-; value.  EVAL is also redefined to use the new value of VECTOR?.
-
-; Define the marker and redefine VECTOR? and EVAL.
-
-(define record-marker (list 'record-marker))
-
-(define real-vector? vector?)
-
-(define (vector? x)
-  (and (real-vector? x)
-       (or (= 0 (vector-length x))
-	   (not (eq? (vector-ref x 0)
-		record-marker)))))
-
-; This won't work if ENV is the interaction environment and someone has
-; redefined LAMBDA there.
-
-(define eval
-  (let ((real-eval eval))
-    (lambda (exp env)
-      ((real-eval `(lambda (vector?) ,exp))
-       vector?))))
-
-; Definitions of the record procedures.
-
-(define (record? x)
-  (and (real-vector? x)
-       (&lt; 0 (vector-length x))
-       (eq? (vector-ref x 0)
-            record-marker)))
-
-(define (make-record size)
-  (let ((new (make-vector (+ size 1))))
-    (vector-set! new 0 record-marker)
-    new))
-
-(define (record-ref record index)
-  (vector-ref record (+ index 1)))
-
-(define (record-set! record index value)
-  (vector-set! record (+ index 1) value))
-</PRE>
-
-<H1>Copyright</H1>
-
-<p>Copyright (C) Richard Kelsey (1999). All Rights Reserved. </p>
-
-<p>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-
-<hr>
-
-    <address>Editor: <a href="mailto:srfi-editors@srfi.schemers.org">Mike Sperber</a></address>
-
-  </body>
-</html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-98.html b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-98.html
deleted file mode 100644
index 8ff8dfbb8f..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi-std/srfi-98.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"><!-- DO NOT EDIT THIS FILE-->
-<!-- Edit the .tex version instead-->
-
-  
-    <title>SRFI 98: An interface to access environment variables.</title>
-  </head><body>
-
-<h1>Title</h1>
-
-An interface to access environment variables.
-
-<h1>Author</h1>
-
-Taro Minowa(Higepon)
-
-<h1>Status</h1>
-
-This SRFI is currently in ``final'' status.  To see an explanation of
-each status that a SRFI can hold, see <a href="http://srfi.schemers.org/srfi-process.html">here</a>.
-
-To provide input on this SRFI, please send email to
-<a href="mailto:srfi%20minus%2098%20at%20srfi%20dot%20schemers%20dot%20org">
-<code>&lt;srfi minus 98 at srfi dot schemers dot org&gt;</code></a>.  See 
-<a href="http://srfi.schemers.org/srfi-list-subscribe.html">instructions here</a> to subscribe to
-the list.  You can access the discusssion via 
-<a href="http://srfi.schemers.org/srfi-98/mail-archive/maillist.html">the archive of the mailing list</a>.
-You can access
-post-finalization messages via
-<a href="http://srfi.schemers.org/srfi-98/post-mail-archive/maillist.html">
-the archive of the mailing list</a>.
-<p></p><ul>
-
-<li>Received: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-98/srfi-98.html?rev=1.2">2008/07/06</a></li>
-<li>Draft: 2008/07/06 - 2008/09/06</li>
-<li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-98/srfi-98.html?rev=1.3">2008/07/18</a></li>
-<li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-98/srfi-98.html?rev=1.4">2008/07/18</a></li>
-<li>Revised: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-98/srfi-98.html?rev=1.5">2008/08/14</a></li>
-<li>Final: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-98/srfi-98.html?rev=1.7">2008/09/19</a></li>
-<li>R6RS library name: <a href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-98/srfi-98.html?rev=1.8">2009/02/16</a></li>
-</ul>
-
-<h1>Abstract</h1>
-This SRFI specifies the procedure get-environment-variable, which gets
-the value of the specified environment variable, and the procedure
-get-environment-variables, which gets an association list of all
-environment variables.
-
-<h1>Rationale</h1>
-<p>Most operating systems provide a mechanism for passing auxiliary
-parameters implicitly to child processes.  Usually, this mechanism is
-called "the environment", and is conceptually a map from string names
-to string values.  The string names are called environment
-variables.</p>
-
-<p>Some applications rely on environment variables to modify their
-behavior according to local settings.  Also, various established
-protocols rely on environment variables as a form of interprocess
-communication.  For example, most implementations of the common
-gateway interface (CGI) use environment variables to pass
-Meta-Variables from the server to the script <a href="#0.1_cgi">[1]</a>.
-Environment variables are also required
-by <a href="http://srfi.schemers.org/srfi-96/srfi-96.html" title="SRFI
-96: SLIB Prerequisites">SRFI 96: SLIB Prerequisites</a>.
-Providing a means to access environment variables is therefore
-indispensable for writing practical programs in Scheme.
-</p>
-<p>Most widely-used Scheme implementations provide a function for
-getting the value of a specified environment variable.  The name for
-this function is usually getenv, but varies (<a href="#0.1_appendix">see
-below</a>).  Some implementations also provide a way to get all the
-environment variables, but others do not.</p>
-<p>This SRFI specifies a uniform interface for accessing environment
-variables.  That should make it easier to write portable programs
-that need access to their environment.
-For example, a CGI program may portably obtain the values of the
-Meta-Variables "QUERY_STRING", "CONTENT_LENGTH" and
-"REQUEST_METHOD" as in the following examples:</p>
-<pre>(get-environment-variable "QUERY_STRING") =&gt; "foo=bar&amp;huga=hige"
-(get-environment-variable "CONTENT_LENGTH") =&gt; "512"
-(get-environment-variable "REQUEST_METHOD") =&gt; "post"
-</pre>
-
-<p><a name="0.1_cgi">[1]</a> The Common Gateway Interface (CGI) Version 1.1, RFC3875, <a href="http://www.ietf.org/rfc/rfc3875" target="_blank">http://www.ietf.org/rfc/rfc3875</a>.</p>
-<h1>Specification</h1>
-<pre>R6RS library name</pre>
-The following two procedures belong to the R6RS library named (srfi :98 os-environment-variables).
-<pre>Function: <a name="get-environment-variable">get-environment-variable</a> name</pre>Returns the value of
-the named environment variable as a string, or #f if the named
-environment variable is not found. The name argument is expected to be
-a string.
-get-environment-variable may use
-locale-setting information to encode the name and decode the value of
-the environment variable.
-If get-environment-variable can't decode the value, get-environment-variable may raise an exception.
-<pre>(get-environment-variable "PATH") =&gt; "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
-</pre>
-<pre>Function: <a name="get-environment-variables">get-environment-variables</a></pre>
-Returns names and values of all the environment variables as an a-list.
-The same decoding considerations as for get-environment-variable apply.
-<pre>(get-environment-variables) =&gt; (("PATH" . "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin") ("USERNAME" . "taro"))
-</pre>
-
-<h1>Implementation</h1>
-<h2>Gauche</h2>
-<pre>(define get-environment-variable sys-getenv)
-(define get-environment-variables sys-environ-&gt;alist)
-</pre>
-<h2>Scheme48</h2>
-<pre>(define (get-environment-variable name)
-  (cond
-    ((lookup-environment-variable name) =&gt; os-string-&gt;string)
-    (else #f)))
-(define (get-environment-variables)
-  (map (lambda (p)
-        (cons (os-string-&gt;string (car p)) (os-string-&gt;string (cdr p))))
-       (environment-alist)))
-</pre>
-<h2>scsh</h2>
-<pre>(define get-environment-variable getenv)
-(define get-environment-variables env-&gt;alist)
-</pre>
-
-<h2>SCM</h2>
-<pre>(define get-environment-variable getenv)
-(define get-environment-variables getenv)
-</pre>
-
-<h1>Issues</h1>
-<p>get-environment-variable is expected to return a "Scheme string".
-Unfortunately, many current platforms, including POSIX-like ones, do
-not require environment variables to be interpretable as sequences of
-characters.  In particular, environment variables can be used to name
-files, and filenames on the system can amount to NULL-terminated byte
-vectors, which, if the Scheme program were to collect uninterpreted
-and pass to, say, the open call, would work just fine, but which might
-not represent a string in the particular encoding the program expects.
-While in principle it may be desirable to provide a mechanism for
-accessing environment variables raw, this SRFI specifies a "string"
-return type because that best represents the consensus of existing
-implementations, and captures the semantically desirable behavior in
-the common case that the byte sequence is interpretable as a string.</p>
-
-<a name="0.1_appendix"></a>
-<h1>Appendix: Existing implementations</h1>
-<table border="1">
-  <tbody><tr><th>Scheme implementation</th><th>get environment variable</th><th>get all the environment variables as an a-list</th></tr>
-  <tr><td>Bigloo</td><td>(getenv name) =&gt; (or string? false) name:string?</td><td>&nbsp;</td></tr>
-  <tr><td>CHICKEN</td><td>(getenv name) =&gt; (or string? false) name:string?</td><td>&nbsp;</td></tr>
-  <tr><td>Gambit</td><td>(getenv name . &lt;default&gt;) =&gt;(or string? &lt;default&gt; &lt;Unbound OS environment variable error&gt;) name:string?</td><td>&nbsp;</td></tr>
-
-  <tr><td>Gauche</td><td>(sys-getenv name) =&gt; (or string? false) name:string?</td><td>(sys-environ)</td></tr>
-  <tr><td>Guile</td><td>(getenv name) =&gt; (or string? false) name:string?</td><td>&nbsp;</td></tr>
-  <tr><td>PLT</td><td>(getenv name) =&gt; (or string? false) name:string?</td><td>&nbsp;</td></tr>
-  <tr><td>MIT/GNU Scheme</td><td>(get-environment-variable name) =&gt; (or string? false) name:string?</td><td>&nbsp;</td></tr>
-  <tr><td>Scheme48</td><td>(lookup-environment-variable name) =&gt; (or string? false) name:string?</td><td>(environment-alist)</td></tr>
-
-  <tr><td>SLIB</td><td>(getenv name) =&gt; (or string? false) name:string?</td><td>&nbsp;</td></tr>
-  <tr><td>STk</td><td>(getenv name) =&gt; (or string? false) name:string?</td><td>&nbsp;</td></tr>
-  <tr><td>STklos</td><td>(getenv name) =&gt; (or string? false) name:string?</td><td>(getenv)</td></tr>
-  <tr><td>SCM</td><td>(getenv name) =&gt; (or string? false) name:string?</td><td>(getenv)</td></tr>
-  </tbody></table>
-<h1>Acknowledgements</h1>
-Thanks to Shiro Kawai, Alexey Radul, jmuk, Kokosabu, leque and all the members of the #Lisp_Scheme IRC channel on Freenode.
-<h1>Copyright</h1>
-Copyright (C) Taro Minowa(Higepon) (2008). All Rights Reserved.
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-</p>
-<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-    <hr>
-    <address>Editor: <a href="mailto:srfi-editors%20at%20srfi%20dot%20schemers%20dot%20org">Mike Sperber</a></address>
-<!-- Last modified: Sun Jan 28 14:21:14 MET 2007 -->
-  </body></html>
diff --git a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi.scrbl b/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi.scrbl
deleted file mode 100644
index 9e10b8bb46..0000000000
--- a/pkgs/srfi-pkgs/srfi-doc/srfi/scribblings/srfi.scrbl
+++ /dev/null
@@ -1,1017 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/eval
-          scriblib/render-cond
-          scribble/core
-          scribble/html-properties
-          (for-syntax scheme/base)
-          (for-label scheme/base
-                     racket/stream))
-
-@(define-syntax (srfi stx)
-  (syntax-case stx ()
-   [(_ num #:subdir subdir? . title)
-    (with-syntax ([srfi/n (string->symbol (format "srfi/~a" (syntax-e #'num)))])
-      #'(begin
-          (section #:tag (format "srfi-~a" num)
-                   #:style 'unnumbered
-                   (format "SRFI ~a: " num)
-                   . title)
-          (defmodule srfi/n)
-          "Original specification: "
-          (let* ([label (format "SRFI ~a" num)]
-                 [sub (if subdir? (format "srfi-~a/" num) "")]
-                 [url (λ (b) (format "~a/srfi-std/~asrfi-~a.html" b sub num))])
-            (cond-element
-              [(or latex text) @link[(url "http://docs.racket-lang.org") label]]
-              [else @link[(url ".") label]]))))]
-   [(_ num . title) #'(srfi num #:subdir #f . title)]))
-
-@;{ The `lst' argument is a list of
-       (list sym syntactic-form? html-anchor) }
-@(define (redirect n lst #:subdir [subdir? #f])
-   (let ([file (if subdir?
-                 (format "srfi-~a/srfi-~a.html" n n)
-                 (format "srfi-~a.html" n))]
-         [mod-path (string->symbol (format "srfi/~a" n))])
-     (make-binding-redirect-elements mod-path
-       (map (lambda (b)
-              (list (car b) (cadr b)
-                    (build-path "srfi-std" file)
-                    (caddr b)))
-            lst))))
-
-@(define in-core
-   (case-lambda
-     [() (in-core ".")]
-     [(k) @elem{This SRFI's bindings are also available in
-                @racketmodname[racket/base]@|k|}]))
-
-@(begin
-  (define-syntax-rule (def-mz mz-if)
-    (begin
-      (require (for-label mzscheme))
-      (define mz-if (racket if))))
-  (def-mz mz-if))
-
-@(define srfi-std (style #f (list (install-resource "srfi-std"))))
-
-@; ----------------------------------------------------------------------
-
-@title{SRFIs: Libraries}
-
-The @link[#:style srfi-std "http://srfi.schemers.org/"]{Scheme Requests for
-Implementation} (a.k.a. @deftech{SRFI}) process allows individual
-members of the Scheme community to propose libraries and extensions to
-be supported by multiple Scheme implementations.
-
-Racket is distributed with implementations of many SRFIs, most of
-which can be implemented as libraries. To import the bindings of SRFI
-@math{n}, use
-
-@racketblock[
-(require @#,elem{@racketidfont{srfi/}@math{n}})
-]
-
-This document lists the SRFIs that are supported by Racket and
-provides a link to the original SRFI specification (which is also
-distributed as part of Racket's documentation).
-
-@table-of-contents[]
-
-@; ----------------------------------------
-
-@srfi[1]{List Library}
-
-This SRFI works with pairs and lists as in @racketmodname[racket],
-which are immutable, so it does not export @racketidfont{set-car!} and
-@racketidfont{set-cdr!}. The other provided bindings that end in
-@racketidfont{!} are equivalent to the corresponding bindings without
-@racketidfont{!}. Functions that are documented in the SRFI in bold
-(but not bold italic) correspond to @racketmodname[racket] functions,
-while the others are distinct from same-named @racketmodname[racket]
-functions.
-
-@redirect[1 '(
- (cons #f "cons")
- (list #f "list")
- (xcons #f "xcons")
- (cons* #f "cons*")
- (make-list #f "make-list")
- (list-tabulate #f "list-tabulate")
- (list-copy #f "list-copy")
- (circular-list #f "circular-list")
- (iota #f "iota")
- (pair? #f "pair-p")
- (null? #f "null-p")
- (proper-list? #f "proper-list-p")
- (circular-list? #f "circular-list-p")
- (dotted-list? #f "dotted-list-p")
- (not-pair? #f "not-pair-p")
- (null-list? #f "null-list-p")
- (car #f "car")
- (cdr #f "cdr")
- (cddadr #f "cddadr")
- (cddddr #f "cddddr")
- (list-ref #f "list-ref")
- (first #f "first")
- (second #f "second")
- (third #f "third")
- (fourth #f "fourth")
- (fifth #f "fifth")
- (sixth #f "sixth")
- (seventh #f "seventh")
- (eighth #f "eighth")
- (ninth #f "ninth")
- (tenth #f "tenth")
- (car+cdr #f "car+cdr")
- (take #f "take")
- (drop #f "drop")
- (take-right #f "take-right")
- (drop-right #f "drop-right")
- (take! #f "take!")
- (drop-right! #f "drop-right!")
- (split-at #f "split-at")
- (split-at! #f "split-at!")
- (last #f "last")
- (last-pair #f "last-pair")
- (length #f "length")
- (length+ #f "length+")
- (append #f "append")
- (append! #f "append!")
- (concatenate #f "concatenate")
- (concatenate! #f "concatenate!")
- (reverse #f "reverse")
- (reverse! #f "srfi-1.html")
- (append-reverse #f "append-reverse")
- (append-reverse! #f "append-reverse!")
- (zip #f "zip")
- (unzip1 #f "unzip1")
- (unzip2 #f "unzip2")
- (unzip3 #f "unzip3")
- (unzip4 #f "unzip4")
- (unzip5 #f "unzip5")
- (count #f "count")
- (fold #f "fold")
- (fold-right #f "fold-right")
- (pair-fold #f "pair-fold")
- (pair-fold-right #f "pair-fold-right")
- (reduce #f "reduce")
- (reduce-right #f "reduce-right")
- (unfold #f "unfold")
- (unfold-right #f "unfold-right")
- (map #f "map")
- (for-each #f "srfi-1.html")
- (append-map #f "append-map")
- (append-map! #f "append-map!")
- (map! #f "map!")
- (map-in-order #f "map-in-order")
- (pair-for-each #f "pair-for-each")
- (filter-map #f "filter-map")
- (filter #f "filter")
- (filter! #f "filter!")
- (partition! #f "partition!")
- (remove! #f "remove!")
- (remove #f "remove")
- (partition #f "partition")
- (find #f "find")
- (find-tail #f "find-tail")
- (take-while #f "take-while")
- (take-while! #f "take-while!")
- (drop-while #f "drop-while")
- (span #f "span")
- (span! #f "span!")
- (break #f "break")
- (break! #f "break!")
- (any #f "any")
- (every #f "every")
- (list-index #f "list-index")
- (member #f "member")
- (memq #f "memq")
- (memv #f "memv")
- (delete #f "delete")
- (delete-duplicates #f "delete-duplicates")
- (delete! #f "delete!")
- (delete-duplicates! #f "delete-duplicates!")
- (assoc #f "assoc")
- (assq #f "assq")
- (assv #f "assv")
- (alist-cons #f "alist-cons")
- (alist-copy #f "alist-copy")
- (alist-delete #f "alist-delete")
- (alist-delete! #f "alist-delete!")
- (lset #f "lset")
- (lset= #f "lset=")
- (lset-adjoin #f "lset-adjoin")
- (lset-union #f "lset-union")
- (lset-intersection #f "lset-intersection")
- (lset-intersection! #f "lset-intersection!")
- (lset-union! #f "lset-union!")
- (lset-difference! #f "lset-difference!")
- (lset-xor! #f "lset-xor!")
- (lset-diff+intersection! #f "lset-diff+intersection!")
- (lset-difference #f "lset-difference")
- (lset-xor #f "lset-xor")
- (lset-diff+intersection #f "lset-diff+intersection")
-)]
-
-@; ----------------------------------------
-
-@srfi[2]{AND-LET*: an AND with local bindings...}
-
-@redirect[2 '(
- (and-let* #t "and-let")
-)]
-
-@; ----------------------------------------
-
-@srfi[4]{Homogeneous numeric vector datatypes}
-
-@redirect[4 '(
- (s8vector #f "s8vector")
- (u8vector #f "s8vector")
- (s16vector #f "s8vector")
- (u16vector #f "u8vector")
- (s32vector #f "s16vector")
- (u32vector #f "u16vector")
- (s64vector #f "s64vector")
- (u64vector #f "u64vector")
- (f32vector #f "f32vector")
- (f64vector #f "f64vector")
-)]
-
-This SRFI's reader and printer syntax is not supported. The bindings
-are also available from @racketmodname[scheme/foreign].
-
-@; ----------------------------------------
-
-@srfi[5]{A compatible let form with signatures and rest arguments}
-
-@redirect[5 '(
- (let #t "unnamed")
-)]
-
-@; ----------------------------------------
-
-@srfi[6]{Basic String Ports}
-
-@redirect[6 '(
- (open-input-string #f "open-input-string")
- (open-output-string #f "open-output-string")
- (get-output-string #f "get-output-string")
-)]
-
-@in-core{}
-
-@; ----------------------------------------
-
-@srfi[7]{Feature-based program configuration language}
-
-@redirect[7 '(
- (program #t "program")
-)]
-
-@; ----------------------------------------
-
-@srfi[8]{RECEIVE: Binding to multiple values}
-
-@redirect[8 '(
- (receive #t "receive")
-)]
-
-@; ----------------------------------------
-
-@srfi[9]{Defining Record Types}
-
-@redirect[9 '(
- (define-record-type #t "define-record-type")
-)]
-
-@; ----------------------------------------
-
-@srfi[11]{Syntax for receiving multiple values}
-
-@redirect[11 '(
- (let-values #t "let-values")
- (let*-values #t "let*-values")
-)]
-
-@in-core{, but without support for dotted ``rest'' bindings.}
-
-@; ----------------------------------------
-
-@srfi[13]{String Libraries}
-
-@redirect[13 '(
- (string? #f "string-p")
- (string-null? #f "string-null-p")
- (string-every #f "string-every")
- (string-any #f "string-any")
- (make-string #f "make-string")
- (string #f "string")
- (string-tabulate #f "string-tabulate")
- (string->list #f "string2list")
- (list->string #f "list2string")
- (reverse-list->string #f "reverse-list2string")
- (string-join #f "string-join")
- (string-length #f "string-length")
- (string-ref #f "string-ref")
- (string-copy #f "string-copy")
- (substring/shared #f "substring/shared")
- (string-copy! #f "string-copy!")
- (string-take #f "string-take")
- (string-drop #f "string-drop")
- (string-take-right #f "string-take-right")
- (string-drop-right #f "string-drop-right")
- (string-pad #f "string-pad")
- (string-pad-right #f "string-pad-right")
- (string-trim #f "string-trim")
- (string-trim-right #f "string-trim-right")
- (string-trim-both #f "string-trim-both")
- (string-set! #f "string-set!")
- (string-fill! #f "string-fill!")
- (string-compare #f "string-compare")
- (string-compare-ci #f "string-compare-ci")
- (string= #f "string=")
- (string<> #f "string<>")
- (string< #f "string<")
- (string> #f "string>")
- (string<= #f "string<=")
- (string>= #f "string>=")
- (string-ci= #f "string-ci=")
- (string-ci<> #f "string-ci<>")
- (string-ci< #f "string-ci<")
- (string-ci> #f "string-ci>")
- (string-ci<= #f "string-ci<=")
- (string-ci>= #f "string-ci>=")
- (string-hash #f "string-hash")
- (string-hash-ci #f "string-hash-ci")
- (string-prefix-length #f "string-prefix-length")
- (string-suffix-length #f "string-suffix-length")
- (string-prefix-length-ci #f "string-prefix-length-ci")
- (string-suffix-length-ci #f "string-suffix-length-ci")
- (string-prefix? #f "string-prefix-p")
- (string-suffix? #f "string-suffix-p")
- (string-prefix-ci? #f "string-prefix-ci-p")
- (string-suffix-ci? #f "string-suffix-ci-p")
- (string-index #f "string-index")
- (string-index-right #f "string-index-right")
- (string-skip #f "string-skip")
- (string-skip-right #f "string-skip-right")
- (string-count #f "string-count")
- (string-contains #f "string-contains")
- (string-contains-ci #f "string-contains-ci")
- (string-titlecase #f "string-titlecase")
- (string-titlecase! #f "string-titlecase!")
- (string-upcase #f "string-upcase")
- (string-upcase! #f "string-upcase!")
- (string-downcase #f "string-downcase")
- (string-downcase! #f "string-downcase!")
- (string-reverse #f "string-reverse")
- (string-reverse! #f "string-reverse!")
- (string-append #f "string-append")
- (string-concatenate #f "string-concatenate")
- (string-concatenate/shared #f "string-concatenate/shared")
- (string-append/shared #f "string-append/shared")
- (string-concatenate-reverse #f "string-concatenate-reverse")
- (string-concatenate-reverse/shared #f "string-concatenate-reverse/shared")
- (string-map #f "string-map")
- (string-map! #f "string-map!")
- (string-fold #f "string-fold")
- (string-fold-right #f "string-fold-right")
- (string-unfold #f "string-unfold")
- (string-unfold-right #f "string-unfold-right")
- (string-for-each #f "string-for-each")
- (string-for-each-index #f "string-for-each-index")
- (xsubstring #f "xsubstring")
- (string-xcopy! #f "string-xcopy!")
- (string-replace #f "string-replace")
- (string-tokenize #f "string-tokenize")
- (string-filter #f "string-filter")
- (string-delete #f "string-delete")
- (string-parse-start+end #f "string-parse-start+end")
- (string-parse-final-start+end #f "string-parse-final-start+end")
- (let-string-start+end #f "let-string-start+end")
- (check-substring-spec #f "check-substring-spec")
- (substring-spec-ok? #f "substring-spec-ok-p")
- (make-kmp-restart-vector #f "make-kmp-restart-vector")
- (kmp-step #f "kmp-step")
- (string-kmp-partial-search #f "string-kmp-partial-search")
-)]
-
-@; ----------------------------------------
-
-@srfi[14]{Character-set Library}
-
-@redirect[14 '(
- (char-set? #f "char-set-p")
- (char-set= #f "char-set=")
- (char-set<= #f "char-set<=")
- (char-set-hash #f "char-set-hash")
- (char-set-cursor #f "char-set-cursor")
- (char-set-ref #f "char-set-ref")
- (char-set-cursor-next #f "char-set-cursor-next")
- (end-of-char-set? #f "end-of-char-set-p")
- (char-set-fold #f "char-set-fold")
- (char-set-unfold #f "char-set-unfold")
- (char-set-unfold! #f "char-set-unfold!")
- (char-set-for-each #f "char-set-for-each")
- (char-set-map #f "char-set-map")
- (char-set-copy #f "char-set-copy")
- (char-set #f "char-set")
- (list->char-set #f "list->char-set")
- (list->char-set! #f "list->char-set!")
- (string->char-set #f "string->char-set")
- (string->char-set! #f "string->char-set!")
- (char-set-filter #f "char-set-filter")
- (char-set-filter! #f "char-set-filter!")
- (ucs-range->char-set #f "ucs-range->char-set")
- (ucs-range->char-set! #f "ucs-range->char-set!")
- (->char-set #f "->char-set")
- (char-set->list #f "char-set->list")
- (char-set->string #f "char-set->string")
- (char-set-size #f "char-set-size")
- (char-set-count #f "char-set-count")
- (char-set-every #f "char-set-every")
- (char-set-any #f "char-set-any")
- (char-set-contains? #f "char-set-contains-p")
- (char-set-adjoin #f "char-set-adjoin")
- (char-set-delete #f "char-set-delete")
- (char-set-adjoin! #f "char-set-adjoin!")
- (char-set-delete! #f "char-set-delete!")
- (char-set-complement #f "char-set-complement")
- (char-set-union #f "char-set-union")
- (char-set-intersection #f "char-set-intersection")
- (char-set-difference #f "char-set-difference")
- (char-set-xor #f "char-set-xor")
- (char-set-diff+intersection #f "char-set-diff+intersection")
- (char-set-complement! #f "char-set-complement!")
- (char-set-union! #f "char-set-union!")
- (char-set-intersection! #f "char-set-intersection!")
- (char-set-difference! #f "char-set-difference!")
- (char-set-xor! #f "char-set-xor!")
- (char-set-diff+intersection! #f "char-set-diff+intersection!")
- (char-set:lower-case #f "char-set:lower-case")
- (char-set:upper-case #f "char-set:upper-case")
- (char-set:title-case #f "char-set:title-case")
- (char-set:letter #f "char-set:letter")
- (char-set:digit #f "char-set:digit")
- (char-set:letter+digit #f "char-set:letter+digit")
- (char-set:graphic #f "char-set:graphic")
- (char-set:printing #f "char-set:printing")
- (char-set:whitespace #f "char-set:whitespace")
- (char-set:iso-control #f "char-set:iso-control")
- (char-set:punctuation #f "char-set:punctuation")
- (char-set:symbol #f "char-set:symbol")
- (char-set:hex-digit #f "char-set:hex-digit")
- (char-set:blank #f "char-set:blank")
- (char-set:ascii #f "char-set:ascii")
- (char-set:empty #f "char-set:empty")
- (char-set:full #f "char-set:full")
-)]
-
-@; ----------------------------------------
-
-@srfi[16]{Syntax for procedures of variable arity}
-
-@redirect[16 '(
- (case-lambda #t "case-lambda")
-)]
-
-@in-core{}
-
-@; ----------------------------------------
-
-@srfi[17]{Generalized set!}
-
-@redirect[17 '(
- (set! #t "set!")
- (getter-with-setter #f "getter-with-setter")
-)]
-
-@; ----------------------------------------
-
-@srfi[19]{Time Data Types and Procedures}
-
-@redirect[19 '(
- (time-duration #f "")
- (time-monotonic #f "time-monotonic")
- (time-process #f "time-process")
- (time-tai #f "time-tai")
- (time-thread #f "time-thread")
- (time-utc #f "time-utc")
- (current-date #f "")
- (current-julian-day #f "current-julian-day")
- (current-modified-julian-day #f "current-modified-julian-day")
- (current-time #f "current-time")
- (time-resolution #f "time-resolution")
- (make-time #f "make-time")
- (time? #f "time-p")
- (time-type #f "time-type")
- (time-nanosecond #f "time-nanosecond")
- (time-second #f "time-second")
- (set-time-type! #f "set-time-type!")
- (set-time-nanosecond! #f "set-time-nanosecond!")
- (set-time-second! #f "set-time-second!")
- (copy-time #f "copy-time")
- (time<=? #f "time<=-p")
- (time<? #f "time<-p")
- (time=? #f "time=-p")
- (time>=? #f "time>=-p")
- (time>? #f "time>-p")
- (time-difference #f "time-difference")
- (time-difference! #f "time-difference!")
- (add-duration #f "add-duration")
- (add-duration! #f "add-duration!")
- (subtract-duration #f "subtract-duration")
- (subtract-duration! #f "subtract-duration!")
- (make-date #f "make-date")
- (date? #f "date-p")
- (date-nanosecond #f "date-nanosecond")
- (date-second #f "date-second")
- (date-minute #f "date-minute")
- (date-hour #f "date-hour")
- (date-day #f "date-day")
- (date-month #f "date-month")
- (date-year #f "date-year")
- (date-zone-offset #f "date-zone-offset")
- (date-year-day #f "date-year-day")
- (date-week-day #f "date-week-day")
- (date-week-number #f "date-week-number")
- (date->julian-day #f "date->julian-day")
- (date->modified-julian-day #f "date->modified-julian-day")
- (date->time-monotonic #f "date->time-monotonic")
- (date->time-tai #f "date->time-tai")
- (date->time-utc #f "date->time-utc")
- (julian-day->date #f "julian-day->date")
- (julian-day->time-monotonic #f "julian-day->time-monotonic")
- (julian-day->time-tai #f "julian-day->time-tai")
- (julian-day->time-utc #f "julian-day->time-utc")
- (modified-julian-day->date #f "modified-julian-day->date")
- (modified-julian-day->time-monotonic #f "modified-julian-day->time-monotonic")
- (modified-julian-day->time-tai #f "modified-julian-day->time-tai")
- (modified-julian-day->time-utc #f "modified-julian-day->time-utc")
- (time-monotonic->date #f "time-monotonic->date")
- (time-monotonic->julian-day #f "time-monotonic->julian-day")
- (time-monotonic->modified-julian-day #f "time-monotonic->modified-julian-day")
- (time-monotonic->time-tai #f "time-monotonic->time-tai")
- (time-monotonic->time-tai! #f "time-monotonic->time-tai!")
- (time-monotonic->time-utc #f "time-monotonic->time-utc")
- (time-monotonic->time-utc! #f "time-monotonic->time-utc!")
- (time-tai->date #f "time-tai->date")
- (time-tai->julian-day #f "time-tai->julian-day")
- (time-tai->modified-julian-day #f "time-tai->modified-julian-day")
- (time-tai->time-monotonic #f "time-tai->time-monotonic")
- (time-tai->time-monotonic! #f "time-tai->time-monotonic!")
- (time-tai->time-utc #f "time-tai->time-utc")
- (time-tai->time-utc! #f "time-tai->time-utc!")
- (time-utc->date #f "time-utc->date")
- (time-utc->julian-day #f "time-utc->julian-day")
- (time-utc->modified-julian-day #f "time-utc->modified-julian-day")
- (time-utc->time-monotonic #f "time-utc->time-monotonic")
- (time-utc->time-monotonic! #f "time-utc->time-monotonic!")
- (time-utc->time-tai #f "time-utc->time-tai")
- (time-utc->time-tai! #f "time-utc->time-tai!")
- (date->string #f "date->string")
- (string->date #f "string->date")
-)]
-
-The date structure produced by this SRFI library is identical
-to the one provided by @racketmodname[racket/base] in most cases
-(see @racket[date]).
-
-For backwards compatibility, when an invalid date field value is
-provided to the SRFI constructor, the constructor will produce a lax
-date structure. A lax date structure is @emph{not} compatible with
-functions from @racketmodname[racket/base] or
-@racketmodname[racket/date]. SRFI functions such as
-@racket[string->date] may return a lax date structure depending on the
-format string.
-
-@(define srfi-19-eval (make-base-eval))
-@(srfi-19-eval '(require srfi/19))
-
-@defproc[(lax-date? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[_v] is a lax date structure. Otherwise
-returns @racket[#f].
-
-@examples[#:eval srfi-19-eval
-  (lax-date? (make-date 0 19 10 10 14 "bogus" "bogus" 0))
-  (lax-date? (make-date 0 19 10 10 14 1 2013 0))
-  (lax-date? (string->date "10:21:00" "~H:~M:~S"))
-]}
-
-@(close-eval srfi-19-eval)
-
-@; ----------------------------------------
-
-@srfi[23]{Error reporting mechanism}
-
-@redirect[23 '(
- (error #f "error")
-)]
-
-@in-core{}
-
-@; ----------------------------------------
-
-@srfi[25]{Multi-dimensional Array Primitives}
-
-@redirect[25 '(
- (array? #f "array-p")
- (make-array #f "make-array")
- (shape #f "shape")
- (array #f "array")
- (array-rank #f "array-rank")
- (array-start #f "array-start")
- (array-end #f "array-end")
- (array-ref #f "array-ref")
- (array-set! #f "array-set!")
- (share-array #f "share-array")
-)]
-
-@; ----------------------------------------
-
-@srfi[26]{Notation for Specializing Parameters without Currying}
-
-@redirect[26 '(
- (cut #t "cut")
- (cute #t "cute")
-)]
-
-
-@; ----------------------------------------
-
-@srfi[27]{Sources of Random Bits}
-
-@redirect[27 '(
- (random-integer #f "random-integer")
- (random-real #f "random-real")
- (default-random-source #f "default-random-source")
- (make-random-source #f "make-random-source")
- (random-source? #f "random-source-p")
- (random-source-state-ref #f "random-source-state-ref")
- (random-source-state-ref! #f "random-source-state-ref")
- (random-source-randomize! #f "random-source-randomize!")
- (random-source-pseudo-randomize! #f "random-source-pseudo-randomize!")
- (random-source-make-integers #f "random-source-make-integers")
- (random-source-make-reals #f "random-source-make-reals")
-)]
-
-@; ----------------------------------------
-
-@srfi[28]{Basic Format Strings}
-
-@redirect[28 '(
- (format #f "format")
-)]
-
-@in-core{}
-
-@; ----------------------------------------
-
-@srfi[29]{Localization}
-
-@redirect[29 '(
- (current-language #f "current-language")
- (current-country #f "current-country")
- (current-locale-details #f "current-locale-details")
- (declare-bundle! #f "declare-bundle!")
- (store-bundle #f "store-bundle")
- (load-bundle! #f "load-bundle!")
- (localized-template #f "localized-template")
-)]
-
-@; ----------------------------------------
-
-@srfi[30]{Nested Multi-line Comments}
-
-This SRFI's syntax is part of Racket's default reader.
-
-@; ----------------------------------------
-
-@srfi[31]{A special form rec for recursive evaluation}
-
-@redirect[31 '(
- (rec #t "rec")
-)]
-
-@; ----------------------------------------
-
-@srfi[34]{Exception Handling for Programs}
-
-@redirect[34 '(
- (with-exception-handler #f "with-exception-handler")
- (guard #t "guard")
- (raise #f "raise")
-)]
-
-An @racket[else] is recognized as either the one from
-@racketmodname[racket/base] or as an identifier with the symbolic form
-@racket['else] and no binding.
-
-@; ----------------------------------------
-
-@srfi[35]{Conditions}
-
-@; ----------------------------------------
-
-@srfi[38]{External Representation for Data With Shared Structure}
-
-@redirect[38 '(
- (write-with-shared-structure #f "write-with-shared-structure")
- (read-with-shared-structure #f "read-with-shared-structure")
-)]
-
-This SRFI's syntax is part of Racket's default reader and printer.
-
-@; ----------------------------------------
-
-@srfi[39]{Parameter objects}
-
-@redirect[39 '(
- (make-parameter #f "make-parameter")
- (parameterize #t "parameterize")
-)]
-
-@in-core{}
-
-@; ----------------------------------------
-
-@srfi[40]{A Library of Streams}
-
-@redirect[40 '(
- (stream-cons #t "stream-cons")
- (stream? #f "stream?")
- (stream-null? #f "stream-null?")
- (stream-car #f "stream-car")
- (stream-cdr #f "stream-cdr")
- (stream-delay #t "stream-delay")
- (stream-null #f "stream-null")
- (stream #f "stream")
- (stream-unfoldn #f "stream-unfoldn")
- (stream-map #f "stream-map")
- (stream-for-each #f "stream-for-each")
- (stream-filter #f "stream-filter")
-)]
-
-Superceded by @racketmodname[srfi/41].
-
-@; ----------------------------------------
-
-@srfi[41 #:subdir #t]{Streams}
-
-The @racket[stream-cons] operation from @racketmodname[srfi/41] is the
-same as from @racketmodname[racket/stream].
-
-@redirect[41 #:subdir #t '(
- (stream-null #f "stream-null")
- (stream-cons #t "stream-cons")
- (stream? #f "stream?")
- (stream-null? #f "stream-null?")
- (stream-pair? #f "stream-pair?")
- (stream-car #f "stream-car")
- (stream-cdr #f "stream-cdr")
- (stream-lambda #t "stream-lambda")
- (define-stream #t "define-stream")
- (list->stream #f "list-to-stream")
- (port->stream #f "port-to-stream")
- (stream #t "stream")
- (stream->list #f "stream-to-list")
- (stream-append #f "stream-append")
- (stream-concat #f "stream-concat")
- (stream-constant #f "stream-constant")
- (stream-drop #f "stream-drop")
- (stream-drop-while #f "stream-drop-while")
- (stream-filter #f "stream-filter")
- (stream-fold #f "stream-fold")
- (stream-for-each #f "stream-for-each")
- (stream-from #f "stream-from")
- (stream-iterate #f "stream-iterate")
- (stream-length #f "stream-length")
- (stream-let #t "stream-let")
- (stream-map #f "stream-map")
- (stream-match #t "stream-match")
- (stream-of #t "stream-of")
- (stream-range #f "stream-range")
- (stream-ref #f "stream-ref")
- (stream-reverse #f "stream-reverse")
- (stream-scan #f "stream-scan")
- (stream-take #f "stream-take")
- (stream-take-while #f "stream-take-while")
- (stream-unfold #f "stream-unfold")
- (stream-zip #f "stream-zip")
-)]
-
-@; ----------------------------------------
-
-@srfi[42]{Eager Comprehensions}
-
-@redirect[42 '(
- (do-ec #t "do-ec")
- (list-ec #t "list-ec")
- (append-ec #t "append-ec")
- (string-ec #t "string-ec")
- (string-append-ec #t "string-append-ec")
- (vector-ec #t "vector-ec")
- (vector-of-length-ec #t "vector-of-length-ec")
- (sum-ec #t "sum-ec")
- (product-ec #t "product-ec")
- (min-ec #t "min-ec")
- (max-ec #t "max-ec")
- (any?-ec #t "any?-ec")
- (every?-ec #t "every?-ec")
- (first-ec #t "first-ec")
- (last-ec #t "last-ec")
- (fold-ec #t "fold-ec")
- (fold3-ec #t "fold3-ec")
- (generator #t "generator")
- (if #t "if")
- (not #t "not")
- (and #t "and")
- (or #t "or")
- (begin #t "begin")
- (nested #t "nested")
- (: #t ":")
- (:list #t ":list")
- (:string #t ":string")
- (:vector #t ":vector")
- (:integers #t ":integers")
- (:range #t ":range")
- (:real-range #t ":real-range")
- (:char-range #t ":char-range")
- (:port #t ":port")
- (:dispatched #t "")
- (:generator-proc #t ":generator-proc")
- (:do #t ":do")
- (:let #t ":let")
- (:parallel #t ":parallel")
- (:while #t ":while")
- (:until #t ":until")
-)]
-
-Forms that syntactically detect @racket[if] recognize both @racket[if]
-from @racketmodname[scheme/base] and @mz-if from
-@racketmodname[mzscheme].
-
-@; ----------------------------------------
-
-@srfi[43]{Vector Library}
-
-@redirect[43 '(
- (make-vector #f "make-vector")
- (vector #f "vector")
- (vector-unfold #f "vector-unfold")
- (vector-unfold-right #f "vector-unfold-right")
- (vector-copy #f "vector-copy")
- (vector-reverse-copy #f "vector-reverse-copy")
- (vector-append #f "vector-append")
- (vector-concatenate #f "vector-concatenate")
- (vector? #f "vector-p")
- (vector-empty? #f "vector-empty?")
- (vector= #f "vector-eq")
- (vector-ref #f "vector-ref")
- (vector-length #f "vector-length")
- (vector-fold #f "vector-fold")
- (vector-fold-right #f "vector-fold-right")
- (vector-map #f "vector-map")
- (vector-map! #f "vector-map-bang")
- (vector-for-each #f "vector-for-each")
- (vector-count #f "vector-count")
- (vector-index #f "vector-index")
- (vector-index-right #f "vector-index-right")
- (vector-skip #f "vector-skip")
- (vector-skip-right #f "vector-skip-right")
- (vector-binary-search #f "vector-binary-search")
- (vector-any #f "vector-any")
- (vector-every #f "vector-every")
- (vector-set! #f "vector-set-bang")
- (vector-swap! #f "vector-swap-bang")
- (vector-fill! #f "vector-fill-bang")
- (vector-reverse! #f "vector-reverse-bang")
- (vector-copy! #f "vector-copy-bang")
- (vector-reverse-copy! #f "vector-reverse-copy-bang")
- (vector->list #f "vector->list")
- (reverse-vector->list #f "reverse-vector->list")
- (list->vector #f "list->vector")
- (reverse-list->vector #f "reverse-list->vector")
-)]
-
-@; ----------------------------------------
-
-@srfi[45]{Primitives for Expressing Iterative Lazy Algorithms}
-
-@redirect[45 '(
- (delay #t "delay")
- (lazy #t "lazy")
- (force #f "force")
- (eager #f "eager")
-)]
-
-Additional binding:
-
-@defproc[(promise? [v any/c]) boolean?]{
-Returns @racket[#t] if @racket[v] is a promise, @racket[#f] otherwise.}
-
-@; ----------------------------------------
-
-@srfi[48]{Intermediate Format Strings}
-
-@redirect[48 '(
- (format #f "format")
-)]
-
-@; ----------------------------------------
-
-@srfi[54]{Formatting}
-
-@; ----------------------------------------
-
-@srfi[57]{Records}
-
-@; ----------------------------------------
-
-@srfi[59]{Vicinity}
-
-@redirect[59 '(
- (program-vicinity #f "program-vicinity")
- (library-vicinity #f "library-vicinity")
- (implementation-vicinity #f "implementation-vicinity")
- (user-vicinity #f "user-vicinity")
- (home-vicinity #f "home-vicinity")
- (in-vicinity #f "in-vicinity")
- (sub-vicinity #f "sub-vicinity")
- (make-vicinity #f "make-vicinity")
- (pathname->vicinity #f "pathname-to-vicinity")
- (vicinity:suffix? #f "vicinity:suffix-p")
-)]
-
-@; ----------------------------------------
-
-@srfi[60]{Integers as Bits}
-
-@; ----------------------------------------
-
-@srfi[61]{A more general cond clause}
-
-@; ----------------------------------------
-
-@; no actual library for this
-@section[#:tag "srfi-62" #:style 'unnumbered]{SRFI 62: S-expression comments}
-
-Original specification: @link["srfi-std/srfi-62.html"]{SRFI 62}
-
-This SRFI's syntax is part of Racket's default reader (no
-@racket[require] is needed).
-
-@; ----------------------------------------
-
-@srfi[63]{Homogeneous and Heterogeneous Arrays}
-
-@; ----------------------------------------
-
-@srfi[64]{A Scheme API for test suites}
-
-@; ----------------------------------------
-
-@srfi[66]{Octet Vectors}
-
-@; ----------------------------------------
-
-@srfi[67 #:subdir #t]{Compare Procedures}
-
-@; ----------------------------------------
-
-@srfi[69]{Basic hash tables}
-
-@; ----------------------------------------
-
-@srfi[71]{Extended LET-syntax for multiple values}
-
-@; ----------------------------------------
-
-@srfi[74]{Octet-Addressed Binary Blocks}
-
-@; ----------------------------------------
-
-@srfi[78]{Lightweight testing}
-
-@; ----------------------------------------
-
-@srfi[86]{MU & NU simulating VALUES & CALL-WITH-VALUES...}
-
-@; ----------------------------------------
-
-@srfi[87]{=> in case clauses}
-
-@; ----------------------------------------
-
-@srfi[98]{An interface to access environment variables}
-
-@redirect[98 '((get-environment-variable #f "get-environment-variable")
-               (get-environment-variables #f "get-environment-variables"))]
-
-@; ----------------------------------------
-
-@index-section[]
diff --git a/pkgs/srfi-pkgs/srfi-lib/LICENSE.txt b/pkgs/srfi-pkgs/srfi-lib/LICENSE.txt
deleted file mode 100644
index 81a1100bf8..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-srfi-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/srfi-pkgs/srfi-lib/info.rkt b/pkgs/srfi-pkgs/srfi-lib/info.rkt
deleted file mode 100644
index cf45c552c8..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base"
-               "srfi-lite-lib"
-               "r6rs-lib"
-               "compatibility-lib"))
-
-(define implies '("srfi-lite-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"srfi\"")
-
-(define pkg-authors '(mflatt noel chongkai jay))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a1.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a1.rkt
deleted file mode 100644
index 6aa4b486ac..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a1.rkt
+++ /dev/null
@@ -1,1725 +0,0 @@
-#!r6rs
-;;; SRFI-1 list-processing library 			-*- Scheme -*-
-;;; Reference implementation
-;;;
-;;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;;; this code as long as you do not remove this copyright notice or
-;;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;;     -Olin
-
-;;; This is a library of list- and pair-processing functions. I wrote it after
-;;; carefully considering the functions provided by the libraries found in
-;;; R4RS/R5RS Scheme, MIT Scheme, Gambit, RScheme, MzScheme, slib, Common
-;;; Lisp, Bigloo, guile, T, APL and the SML standard basis. It is a pretty
-;;; rich toolkit, providing a superset of the functionality found in any of
-;;; the various Schemes I considered.
-
-;;; This implementation is intended as a portable reference implementation
-;;; for SRFI-1. See the porting notes below for more information.
-
-; Ikarus porting begun by Abdulaziz Ghuloum, 
-; and continued by Derick Eddington.
-
-(library (srfi :1 lists)
-  (export
-    ;;; Exported:
-    xcons #;tree-copy make-list list-tabulate list-copy 
-    proper-list? circular-list? dotted-list? not-pair? null-list? list=
-    circular-list length+
-    iota
-    first second third fourth fifth sixth seventh eighth ninth tenth
-    car+cdr
-    take       drop       
-    take-right drop-right 
-    take!      drop-right!
-    split-at   split-at!
-    last last-pair
-    zip unzip1 unzip2 unzip3 unzip4 unzip5
-    count
-    append! append-reverse append-reverse! concatenate concatenate! 
-    unfold       fold       pair-fold       reduce
-    unfold-right            pair-fold-right reduce-right
-    append-map append-map! map! pair-for-each filter-map map-in-order
-    filter! partition! remove! 
-    find-tail any every list-index
-    take-while drop-while take-while!
-    span break span! break!
-    delete delete!
-    alist-cons alist-copy
-    delete-duplicates delete-duplicates!
-    alist-delete alist-delete!
-    reverse! 
-    lset<= lset= lset-adjoin  
-    lset-union  lset-intersection  lset-difference  lset-xor  
-    lset-diff+intersection
-    lset-union! lset-intersection! lset-difference! lset-xor!
-    lset-diff+intersection!
-    ;; re-exported:
-    append assq assv caaaar caaadr caaar caadar caaddr
-    caadr caar cadaar cadadr cadar caddar cadddr caddr cadr
-    car cdaaar cdaadr cdaar cdadar cdaddr cdadr cdar cddaar
-    cddadr cddar cdddar cddddr cdddr cddr cdr cons cons*
-    length list list-ref memq memv null? pair?
-    reverse set-car! set-cdr!
-    ;; different than R6RS:
-    assoc filter find fold-right for-each map member partition remove)
-  (import 
-    (except (rnrs)
-            assoc error filter find fold-right
-            for-each map member partition remove)
-    (rnrs mutable-pairs))
-
-;;; 
-;;; In principle, the following R4RS list- and pair-processing procedures
-;;; are also part of this package's exports, although they are not defined
-;;; in this file:
-;;;   Primitives: cons pair? null? car cdr set-car! set-cdr!
-;;;   Non-primitives: list length append reverse cadr ... cddddr list-ref
-;;;                   memq memv assq assv
-;;;   (The non-primitives are defined in this file, but commented out.)
-;;;
-;;; These R4RS procedures have extended definitions in SRFI-1 and are defined
-;;; in this file:
-;;;   map for-each member assoc
-;;;
-;;; The remaining two R4RS list-processing procedures are not included: 
-;;;   list-tail (use drop)
-;;;   list? (use proper-list?)
-
-
-;;; A note on recursion and iteration/reversal:
-;;; Many iterative list-processing algorithms naturally compute the elements
-;;; of the answer list in the wrong order (left-to-right or head-to-tail) from
-;;; the order needed to cons them into the proper answer (right-to-left, or
-;;; tail-then-head). One style or idiom of programming these algorithms, then,
-;;; loops, consing up the elements in reverse order, then destructively 
-;;; reverses the list at the end of the loop. I do not do this. The natural
-;;; and efficient way to code these algorithms is recursively. This trades off
-;;; intermediate temporary list structure for intermediate temporary stack
-;;; structure. In a stack-based system, this improves cache locality and
-;;; lightens the load on the GC system. Don't stand on your head to iterate!
-;;; Recurse, where natural. Multiple-value returns make this even more
-;;; convenient, when the recursion/iteration has multiple state values.
-
-;;; Porting:
-;;; This is carefully tuned code; do not modify casually.
-;;;   - It is careful to share storage when possible;
-;;;   - Side-effecting code tries not to perform redundant writes.
-;;; 
-;;; That said, a port of this library to a specific Scheme system might wish
-;;; to tune this code to exploit particulars of the implementation. 
-;;; The single most important compiler-specific optimisation you could make
-;;; to this library would be to add rewrite rules or transforms to:
-;;; - transform applications of n-ary procedures (e.g. LIST=, CONS*, APPEND,
-;;;   LSET-UNION) into multiple applications of a primitive two-argument 
-;;;   variant.
-;;; - transform applications of the mapping functions (MAP, FOR-EACH, FOLD, 
-;;;   ANY, EVERY) into open-coded loops. The killer here is that these 
-;;;   functions are n-ary. Handling the general case is quite inefficient,
-;;;   requiring many intermediate data structures to be allocated and
-;;;   discarded.
-;;; - transform applications of procedures that take optional arguments
-;;;   into calls to variants that do not take optional arguments. This
-;;;   eliminates unnecessary consing and parsing of the rest parameter.
-;;;
-;;; These transforms would provide BIG speedups. In particular, the n-ary
-;;; mapping functions are particularly slow and cons-intensive, and are good
-;;; candidates for tuning. I have coded fast paths for the single-list cases,
-;;; but what you really want to do is exploit the fact that the compiler
-;;; usually knows how many arguments are being passed to a particular
-;;; application of these functions -- they are usually explicitly called, not
-;;; passed around as higher-order values. If you can arrange to have your
-;;; compiler produce custom code or custom linkages based on the number of
-;;; arguments in the call, you can speed these functions up a *lot*. But this
-;;; kind of compiler technology no longer exists in the Scheme world as far as
-;;; I can see.
-;;;
-;;; Note that this code is, of course, dependent upon standard bindings for
-;;; the R5RS procedures -- i.e., it assumes that the variable CAR is bound
-;;; to the procedure that takes the car of a list. If your Scheme 
-;;; implementation allows user code to alter the bindings of these procedures
-;;; in a manner that would be visible to these definitions, then there might
-;;; be trouble. You could consider horrible kludgery along the lines of
-;;;    (define fact 
-;;;      (let ((= =) (- -) (* *))
-;;;        (letrec ((real-fact (lambda (n) 
-;;;                              (if (= n 0) 1 (* n (real-fact (- n 1)))))))
-;;;          real-fact)))
-;;; Or you could consider shifting to a reasonable Scheme system that, say,
-;;; has a module system protecting code from this kind of lossage.
-;;;
-;;; This code does a fair amount of run-time argument checking. If your
-;;; Scheme system has a sophisticated compiler that can eliminate redundant
-;;; error checks, this is no problem. However, if not, these checks incur
-;;; some performance overhead -- and, in a safe Scheme implementation, they
-;;; are in some sense redundant: if we don't check to see that the PROC 
-;;; parameter is a procedure, we'll find out anyway three lines later when
-;;; we try to call the value. It's pretty easy to rip all this argument 
-;;; checking code out if it's inappropriate for your implementation -- just
-;;; nuke every call to CHECK-ARG.
-;;;
-;;; On the other hand, if you *do* have a sophisticated compiler that will
-;;; actually perform soft-typing and eliminate redundant checks (Rice's systems
-;;; being the only possible candidate of which I'm aware), leaving these checks 
-;;; in can *help*, since their presence can be elided in redundant cases,
-;;; and in cases where they are needed, performing the checks early, at
-;;; procedure entry, can "lift" a check out of a loop. 
-;;;
-;;; Finally, I have only checked the properties that can portably be checked
-;;; with R5RS Scheme -- and this is not complete. You may wish to alter
-;;; the CHECK-ARG parameter checks to perform extra, implementation-specific
-;;; checks, such as procedure arity for higher-order values.
-;;;
-;;; The code has only these non-R4RS dependencies:
-;;;   A few calls to an ERROR procedure;
-;;;   Uses of the R5RS multiple-value procedure VALUES and the m-v binding
-;;;     RECEIVE macro (which isn't R5RS, but is a trivial macro).
-;;;   Many calls to a parameter-checking procedure check-arg:
-;;;    (define (check-arg pred val caller)
-;;;      (let lp ((val val))
-;;;        (if (pred val) val (lp (error "Bad argument" val pred caller)))))
-  (define-syntax check-arg
-    (lambda (stx)
-      (syntax-case stx ()
-        [(_ pred val caller)
-         (and (identifier? #'val) (identifier? #'caller))
-         #'(unless (pred val)
-             (assertion-violation 'caller "check-arg failed" val))])))
-
-;;;   A few uses of the LET-OPTIONAL and :OPTIONAL macros for parsing
-;;;     optional arguments.
-
-;;;
-;;; Most of these procedures use the NULL-LIST? test to trigger the
-;;; base case in the inner loop or recursion. The NULL-LIST? function
-;;; is defined to be a careful one -- it raises an error if passed a
-;;; non-nil, non-pair value. The spec allows an implementation to use
-;;; a less-careful implementation that simply defines NULL-LIST? to
-;;; be NOT-PAIR?. This would speed up the inner loops of these procedures
-;;; at the expense of having them silently accept dotted lists.
-
-;;; A note on dotted lists:
-;;; I, personally, take the view that the only consistent view of lists
-;;; in Scheme is the view that *everything* is a list -- values such as
-;;; 3 or "foo" or 'bar are simply empty dotted lists. This is due to the
-;;; fact that Scheme actually has no true list type. It has a pair type,
-;;; and there is an *interpretation* of the trees built using this type
-;;; as lists.
-;;;
-;;; I lobbied to have these list-processing procedures hew to this
-;;; view, and accept any value as a list argument. I was overwhelmingly
-;;; overruled during the SRFI discussion phase. So I am inserting this
-;;; text in the reference lib and the SRFI spec as a sort of "minority
-;;; opinion" dissent.
-;;;
-;;; Many of the procedures in this library can be trivially redefined
-;;; to handle dotted lists, just by changing the NULL-LIST? base-case
-;;; check to NOT-PAIR?, meaning that any non-pair value is taken to be
-;;; an empty list. For most of these procedures, that's all that is
-;;; required.
-;;;
-;;; However, we have to do a little more work for some procedures that
-;;; *produce* lists from other lists.  Were we to extend these procedures to
-;;; accept dotted lists, we would have to define how they terminate the lists
-;;; produced as results when passed a dotted list. I designed a coherent set
-;;; of termination rules for these cases; this was posted to the SRFI-1
-;;; discussion list. I additionally wrote an earlier version of this library
-;;; that implemented that spec. It has been discarded during later phases of
-;;; the definition and implementation of this library.
-;;;
-;;; The argument *against* defining these procedures to work on dotted
-;;; lists is that dotted lists are the rare, odd case, and that by 
-;;; arranging for the procedures to handle them, we lose error checking
-;;; in the cases where a dotted list is passed by accident -- e.g., when
-;;; the programmer swaps a two arguments to a list-processing function,
-;;; one being a scalar and one being a list. For example,
-;;;     (member '(1 3 5 7 9) 7)
-;;; This would quietly return #f if we extended MEMBER to accept dotted
-;;; lists.
-;;;
-;;; The SRFI discussion record contains more discussion on this topic.
-
-(define (error . args)
-  (if (and (<= 2 (length args)) (symbol? (car args)) (string? (cadr args)))
-    (apply assertion-violation args)
-    (apply assertion-violation "(library (srfi :1 lists))"
-           "misuse of error procedure" args)))
-  
-;;; Constructors
-;;;;;;;;;;;;;;;;
-
-;;; Occasionally useful as a value to be passed to a fold or other
-;;; higher-order procedure.
-(define (xcons d a) (cons a d))
-
-;;;; Recursively copy every cons.
-;(define (tree-copy x)
-;  (let recur ((x x))
-;    (if (not (pair? x)) x
-;	(cons (recur (car x)) (recur (cdr x))))))
-
-;;; Make a list of length LEN.
-
-(define (make-list len . maybe-elt)
-  (check-arg (lambda (n) (and (integer? n) (>= n 0))) len make-list)
-  (let ((elt (cond ((null? maybe-elt) #f) ; Default value
-		   ((null? (cdr maybe-elt)) (car maybe-elt))
-		   (else (error 'make-list "Too many arguments"
-				(cons len maybe-elt))))))
-    (do ((i len (- i 1))
-	 (ans '() (cons elt ans)))
-	((<= i 0) ans))))
-
-
-;(define (list . ans) ans)	; R4RS
-
-
-;;; Make a list of length LEN. Elt i is (PROC i) for 0 <= i < LEN.
-
-(define (list-tabulate len proc)
-  (check-arg (lambda (n) (and (integer? n) (>= n 0))) len list-tabulate)
-  (check-arg procedure? proc list-tabulate)
-  (do ((i (- len 1) (- i 1))
-       (ans '() (cons (proc i) ans)))
-      ((< i 0) ans)))
-
-;;; (cons* a1 a2 ... an) = (cons a1 (cons a2 (cons ... an)))
-;;; (cons* a1) = a1	(cons* a1 a2 ...) = (cons a1 (cons* a2 ...))
-;;;
-;;; (cons first (unfold not-pair? car cdr rest values))
-
-;(define (cons* first . rest)
-;  (let recur ((x first) (rest rest))
-;    (if (pair? rest)
-;       (cons x (recur (car rest) (cdr rest)))
-;       x)))
-
-;;; (unfold not-pair? car cdr lis values)
-
-(define (list-copy lis)				
-  (let recur ((lis lis))			
-    (if (pair? lis)				
-	(cons (car lis) (recur (cdr lis)))	
-	lis)))					
-
-;;; IOTA count [start step]	(start start+step ... start+(count-1)*step)
-
-;;;(define (iota count . maybe-start+step)
-;;;  (check-arg integer? count iota)
-;;;  (if (< count 0) (error "Negative step count" iota count))
-;;;  (let-optionals maybe-start+step ((start 0) (step 1))
-;;;    (check-arg number? start iota)
-;;;    (check-arg number? step iota)
-;;;    (let ((last-val (+ start (* (- count 1) step))))
-;;;      (do ((count count (- count 1))
-;;;	   (val last-val (- val step))
-;;;	   (ans '() (cons val ans)))
-;;;	  ((<= count 0)  ans)))))
-	  
-;;; using case-lambda instead of let-optional
-(define iota
-  (case-lambda
-    [(count) (iota count 0 1)]
-    [(count start) (iota count start 1)]
-    [(count start step)
-     (check-arg integer? count iota)
-     (if (< count 0) (error 'iota "Negative step count" count))
-     (check-arg number? start iota)
-     (check-arg number? step iota)
-     (let ((last-val (+ start (* (- count 1) step))))
-       (do ((count count (- count 1))
-         (val last-val (- val step))
-         (ans '() (cons val ans)))
-        ((<= count 0)  ans)))]))
-	
-
-;;; I thought these were lovely, but the public at large did not share my
-;;; enthusiasm...
-;;; :IOTA to		(0 ... to-1)
-;;; :IOTA from to	(from ... to-1)
-;;; :IOTA from to step  (from from+step ...)
-
-;;; IOTA: to		(1 ... to)
-;;; IOTA: from to	(from+1 ... to)
-;;; IOTA: from to step	(from+step from+2step ...)
-
-;(define (%parse-iota-args arg1 rest-args proc)
-;  (let ((check (lambda (n) (check-arg integer? n proc))))
-;    (check arg1)
-;    (if (pair? rest-args)
-;	(let ((arg2 (check (car rest-args)))
-;	      (rest (cdr rest-args)))
-;	  (if (pair? rest)
-;	      (let ((arg3 (check (car rest)))
-;		    (rest (cdr rest)))
-;		(if (pair? rest) (error "Too many parameters" proc arg1 rest-args)
-;		    (values arg1 arg2 arg3)))
-;	      (values arg1 arg2 1)))
-;	(values 0 arg1 1))))
-;
-;(define (iota: arg1 . rest-args)
-;  (receive (from to step) (%parse-iota-args arg1 rest-args iota:)
-;    (let* ((numsteps (floor (/ (- to from) step)))
-;	   (last-val (+ from (* step numsteps))))
-;      (if (< numsteps 0) (error "Negative step count" iota: from to step))
-;      (do ((steps-left numsteps (- steps-left 1))
-;	   (val last-val (- val step))
-;	   (ans '() (cons val ans)))
-;	  ((<= steps-left 0) ans)))))
-;
-;
-;(define (:iota arg1 . rest-args)
-;  (receive (from to step) (%parse-iota-args arg1 rest-args :iota)
-;    (let* ((numsteps (ceiling (/ (- to from) step)))
-;	   (last-val (+ from (* step (- numsteps 1)))))
-;      (if (< numsteps 0) (error "Negative step count" :iota from to step))
-;      (do ((steps-left numsteps (- steps-left 1))
-;	   (val last-val (- val step))
-;	   (ans '() (cons val ans)))
-;	  ((<= steps-left 0) ans)))))
-
-
-
-(define (circular-list val1 . vals)
-  (let ((ans (cons val1 vals)))
-    (set-cdr! (last-pair ans) ans)
-    ans))
-
-;;; <proper-list> ::= ()			; Empty proper list
-;;;		  |   (cons <x> <proper-list>)	; Proper-list pair
-;;; Note that this definition rules out circular lists -- and this
-;;; function is required to detect this case and return false.
-
-(define (proper-list? x)
-  (let lp ((x x) (lag x))
-    (if (pair? x)
-	(let ((x (cdr x)))
-	  (if (pair? x)
-	      (let ((x   (cdr x))
-		    (lag (cdr lag)))
-		(and (not (eq? x lag)) (lp x lag)))
-	      (null? x)))
-	(null? x))))
-
-
-;;; A dotted list is a finite list (possibly of length 0) terminated
-;;; by a non-nil value. Any non-cons, non-nil value (e.g., "foo" or 5)
-;;; is a dotted list of length 0.
-;;;
-;;; <dotted-list> ::= <non-nil,non-pair>	; Empty dotted list
-;;;               |   (cons <x> <dotted-list>)	; Proper-list pair
-
-(define (dotted-list? x)
-  (let lp ((x x) (lag x))
-    (if (pair? x)
-	(let ((x (cdr x)))
-	  (if (pair? x)
-	      (let ((x   (cdr x))
-		    (lag (cdr lag)))
-		(and (not (eq? x lag)) (lp x lag)))
-	      (not (null? x))))
-	(not (null? x)))))
-
-(define (circular-list? x)
-  (let lp ((x x) (lag x))
-    (and (pair? x)
-	 (let ((x (cdr x)))
-	   (and (pair? x)
-		(let ((x   (cdr x))
-		      (lag (cdr lag)))
-		  (or (eq? x lag) (lp x lag))))))))
-
-(define (not-pair? x) (not (pair? x)))	; Inline me.
-
-;;; This is a legal definition which is fast and sloppy:
-;;;     (define null-list? not-pair?)
-;;; but we'll provide a more careful one:
-(define (null-list? l)
-  (cond ((pair? l) #f)
-	((null? l) #t)
-	(else (error 'null-list? "argument out of domain" l))))
-           
-
-(define (list= elt= . lists)
-  (or (null? lists) ; special case
-      (let lp1 ((list-a (car lists)) (others (cdr lists)))
-	(or (null? others)
-	    (let ((list-b-orig (car others))
-		  (others      (cdr others)))
-	      (if (eq? list-a list-b-orig)	; EQ? => LIST=
-		  (lp1 list-b-orig others)
-		  (let lp2 ((list-a list-a) (list-b list-b-orig))
-		    (if (null-list? list-a)
-			(and (null-list? list-b)
-			     (lp1 list-b-orig others))
-			(and (not (null-list? list-b))
-			     (elt= (car list-a) (car list-b))
-			     (lp2 (cdr list-a) (cdr list-b)))))))))))
-			
-
-
-;;; R4RS, so commented out.
-;(define (length x)			; LENGTH may diverge or
-;  (let lp ((x x) (len 0))		; raise an error if X is
-;    (if (pair? x)			; a circular list. This version
-;        (lp (cdr x) (+ len 1))		; diverges.
-;        len)))
-
-(define (length+ x)			; Returns #f if X is circular.
-  (let lp ((x x) (lag x) (len 0))
-    (if (pair? x)
-	(let ((x (cdr x))
-	      (len (+ len 1)))
-	  (if (pair? x)
-	      (let ((x   (cdr x))
-		    (lag (cdr lag))
-		    (len (+ len 1)))
-		(and (not (eq? x lag)) (lp x lag len)))
-	      len))
-	len)))
-
-(define (zip list1 . more-lists) (apply map list list1 more-lists))
-
-
-;;; Selectors
-;;;;;;;;;;;;;
-
-;;; R4RS non-primitives:
-;(define (caar   x) (car (car x)))
-;(define (cadr   x) (car (cdr x)))
-;(define (cdar   x) (cdr (car x)))
-;(define (cddr   x) (cdr (cdr x)))
-;
-;(define (caaar  x) (caar (car x)))
-;(define (caadr  x) (caar (cdr x)))
-;(define (cadar  x) (cadr (car x)))
-;(define (caddr  x) (cadr (cdr x)))
-;(define (cdaar  x) (cdar (car x)))
-;(define (cdadr  x) (cdar (cdr x)))
-;(define (cddar  x) (cddr (car x)))
-;(define (cdddr  x) (cddr (cdr x)))
-;
-;(define (caaaar x) (caaar (car x)))
-;(define (caaadr x) (caaar (cdr x)))
-;(define (caadar x) (caadr (car x)))
-;(define (caaddr x) (caadr (cdr x)))
-;(define (cadaar x) (cadar (car x)))
-;(define (cadadr x) (cadar (cdr x)))
-;(define (caddar x) (caddr (car x)))
-;(define (cadddr x) (caddr (cdr x)))
-;(define (cdaaar x) (cdaar (car x)))
-;(define (cdaadr x) (cdaar (cdr x)))
-;(define (cdadar x) (cdadr (car x)))
-;(define (cdaddr x) (cdadr (cdr x)))
-;(define (cddaar x) (cddar (car x)))
-;(define (cddadr x) (cddar (cdr x)))
-;(define (cdddar x) (cdddr (car x)))
-;(define (cddddr x) (cdddr (cdr x)))
-
-
-(define first  car)
-(define second cadr)
-(define third  caddr)
-(define fourth cadddr)
-(define (fifth   x) (car    (cddddr x)))
-(define (sixth   x) (cadr   (cddddr x)))
-(define (seventh x) (caddr  (cddddr x)))
-(define (eighth  x) (cadddr (cddddr x)))
-(define (ninth   x) (car  (cddddr (cddddr x))))
-(define (tenth   x) (cadr (cddddr (cddddr x))))
-
-(define (car+cdr pair) (values (car pair) (cdr pair)))
-
-;;; take & drop
-
-(define (take lis k)
-  (check-arg integer? k take)
-  (let recur ((lis lis) (k k))
-    (if (zero? k) '()
-	(cons (car lis)
-	      (recur (cdr lis) (- k 1))))))
-
-(define (drop lis k)
-  (check-arg integer? k drop)
-  (let iter ((lis lis) (k k))
-    (if (zero? k) lis (iter (cdr lis) (- k 1)))))
-
-(define (take! lis k)
-  (check-arg integer? k take!)
-  (if (zero? k) '()
-      (begin (set-cdr! (drop lis (- k 1)) '())
-	     lis)))
-
-;;; TAKE-RIGHT and DROP-RIGHT work by getting two pointers into the list, 
-;;; off by K, then chasing down the list until the lead pointer falls off
-;;; the end.
-
-(define (take-right lis k)
-  (check-arg integer? k take-right)
-  (let lp ((lag lis)  (lead (drop lis k)))
-    (if (pair? lead)
-	(lp (cdr lag) (cdr lead))
-	lag)))
-
-(define (drop-right lis k)
-  (check-arg integer? k drop-right)
-  (let recur ((lag lis) (lead (drop lis k)))
-    (if (pair? lead)
-	(cons (car lag) (recur (cdr lag) (cdr lead)))
-	'())))
-
-;;; In this function, LEAD is actually K+1 ahead of LAG. This lets
-;;; us stop LAG one step early, in time to smash its cdr to ().
-(define (drop-right! lis k)
-  (check-arg integer? k drop-right!)
-  (let ((lead (drop lis k)))
-    (if (pair? lead)
-
-	(let lp ((lag lis)  (lead (cdr lead)))	; Standard case
-	  (if (pair? lead)
-	      (lp (cdr lag) (cdr lead))
-	      (begin (set-cdr! lag '())
-		     lis)))
-
-	'())))	; Special case dropping everything -- no cons to side-effect.
-
-;(define (list-ref lis i) (car (drop lis i)))	; R4RS
-
-;;; These use the APL convention, whereby negative indices mean 
-;;; "from the right." I liked them, but they didn't win over the
-;;; SRFI reviewers.
-;;; K >= 0: Take and drop  K elts from the front of the list.
-;;; K <= 0: Take and drop -K elts from the end   of the list.
-
-;(define (take lis k)
-;  (check-arg integer? k take)
-;  (if (negative? k)
-;      (list-tail lis (+ k (length lis)))
-;      (let recur ((lis lis) (k k))
-;	(if (zero? k) '()
-;	    (cons (car lis)
-;		  (recur (cdr lis) (- k 1)))))))
-;
-;(define (drop lis k)
-;  (check-arg integer? k drop)
-;  (if (negative? k)
-;      (let recur ((lis lis) (nelts (+ k (length lis))))
-;	(if (zero? nelts) '()
-;	    (cons (car lis)
-;		  (recur (cdr lis) (- nelts 1)))))
-;      (list-tail lis k)))
-;
-;
-;(define (take! lis k)
-;  (check-arg integer? k take!)
-;  (cond ((zero? k) '())
-;	((positive? k)
-;	 (set-cdr! (list-tail lis (- k 1)) '())
-;	 lis)
-;	(else (list-tail lis (+ k (length lis))))))
-;
-;(define (drop! lis k)
-;  (check-arg integer? k drop!)
-;  (if (negative? k)
-;      (let ((nelts (+ k (length lis))))
-;	(if (zero? nelts) '()
-;	    (begin (set-cdr! (list-tail lis (- nelts 1)) '())
-;		   lis)))
-;      (list-tail lis k)))
-
-(define-syntax receive
-  (syntax-rules ()
-    [(_ (id* ...) expr body body* ...)
-     (let-values ([(id* ...) expr]) body body* ...)]))
-
-
-(define (split-at x k)
-  (check-arg integer? k split-at)
-  (let recur ((lis x) (k k))
-    (if (zero? k) (values '() lis)
-	(receive (prefix suffix) (recur (cdr lis) (- k 1))
-	  (values (cons (car lis) prefix) suffix)))))
-
-(define (split-at! x k)
-  (check-arg integer? k split-at!)
-  (if (zero? k) (values '() x)
-      (let* ((prev (drop x (- k 1)))
-	     (suffix (cdr prev)))
-	(set-cdr! prev '())
-	(values x suffix))))
-
-
-(define (last lis) (car (last-pair lis)))
-
-(define (last-pair lis)
-  (check-arg pair? lis last-pair)
-  (let lp ((lis lis))
-    (let ((tail (cdr lis)))
-      (if (pair? tail) (lp tail) lis))))
-
-
-;;; Unzippers -- 1 through 5
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (unzip1 lis) (map car lis))
-
-(define (unzip2 lis)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values lis lis)	; Use NOT-PAIR? to handle
-	(let ((elt (car lis)))			; dotted lists.
-	  (receive (a b) (recur (cdr lis))
-	    (values (cons (car  elt) a)
-		    (cons (cadr elt) b)))))))
-
-(define (unzip3 lis)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values lis lis lis)
-	(let ((elt (car lis)))
-	  (receive (a b c) (recur (cdr lis))
-	    (values (cons (car   elt) a)
-		    (cons (cadr  elt) b)
-		    (cons (caddr elt) c)))))))
-
-(define (unzip4 lis)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values lis lis lis lis)
-	(let ((elt (car lis)))
-	  (receive (a b c d) (recur (cdr lis))
-	    (values (cons (car    elt) a)
-		    (cons (cadr   elt) b)
-		    (cons (caddr  elt) c)
-		    (cons (cadddr elt) d)))))))
-
-(define (unzip5 lis)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values lis lis lis lis lis)
-	(let ((elt (car lis)))
-	  (receive (a b c d e) (recur (cdr lis))
-	    (values (cons (car     elt) a)
-		    (cons (cadr    elt) b)
-		    (cons (caddr   elt) c)
-		    (cons (cadddr  elt) d)
-		    (cons (car (cddddr  elt)) e)))))))
-
-
-;;; append! append-reverse append-reverse! concatenate concatenate!
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (append! . lists)
-  ;; First, scan through lists looking for a non-empty one.
-  (let lp ((lists lists) (prev '()))
-    (if (not (pair? lists)) prev
-	(let ((first (car lists))
-	      (rest (cdr lists)))
-	  (if (not (pair? first)) (lp rest first)
-
-	      ;; Now, do the splicing.
-	      (let lp2 ((tail-cons (last-pair first))
-			(rest rest))
-		(if (pair? rest)
-		    (let ((next (car rest))
-			  (rest (cdr rest)))
-		      (set-cdr! tail-cons next)
-		      (lp2 (if (pair? next) (last-pair next) tail-cons)
-			   rest))
-		    first)))))))
-
-;;; APPEND is R4RS.
-;(define (append . lists)
-;  (if (pair? lists)
-;      (let recur ((list1 (car lists)) (lists (cdr lists)))
-;        (if (pair? lists)
-;            (let ((tail (recur (car lists) (cdr lists))))
-;              (fold-right cons tail list1)) ; Append LIST1 & TAIL.
-;            list1))
-;      '()))
-
-;(define (append-reverse rev-head tail) (fold cons tail rev-head))
-
-;(define (append-reverse! rev-head tail)
-;  (pair-fold (lambda (pair tail) (set-cdr! pair tail) pair)
-;             tail
-;             rev-head))
-
-;;; Hand-inline the FOLD and PAIR-FOLD ops for speed.
-
-(define (append-reverse rev-head tail)
-  (let lp ((rev-head rev-head) (tail tail))
-    (if (null-list? rev-head) tail
-	(lp (cdr rev-head) (cons (car rev-head) tail)))))
-
-(define (append-reverse! rev-head tail)
-  (let lp ((rev-head rev-head) (tail tail))
-    (if (null-list? rev-head) tail
-	(let ((next-rev (cdr rev-head)))
-	  (set-cdr! rev-head tail)
-	  (lp next-rev rev-head)))))
-
-
-(define (concatenate  lists) (reduce-right append  '() lists))
-(define (concatenate! lists) (reduce-right append! '() lists))
-
-;;; Fold/map internal utilities
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; These little internal utilities are used by the general
-;;; fold & mapper funs for the n-ary cases . It'd be nice if they got inlined.
-;;; One the other hand, the n-ary cases are painfully inefficient as it is.
-;;; An aggressive implementation should simply re-write these functions 
-;;; for raw efficiency; I have written them for as much clarity, portability,
-;;; and simplicity as can be achieved.
-;;;
-;;; I use the dreaded call/cc to do local aborts. A good compiler could
-;;; handle this with extreme efficiency. An implementation that provides
-;;; a one-shot, non-persistent continuation grabber could help the compiler
-;;; out by using that in place of the call/cc's in these routines.
-;;;
-;;; These functions have funky definitions that are precisely tuned to
-;;; the needs of the fold/map procs -- for example, to minimize the number
-;;; of times the argument lists need to be examined.
-
-;;; Return (map cdr lists). 
-;;; However, if any element of LISTS is empty, just abort and return '().
-(define (%cdrs lists)
-  (call-with-current-continuation
-    (lambda (abort)
-      (let recur ((lists lists))
-	(if (pair? lists)
-	    (let ((lis (car lists)))
-	      (if (null-list? lis) (abort '())
-		  (cons (cdr lis) (recur (cdr lists)))))
-	    '())))))
-
-(define (%cars+ lists last-elt)	; (append! (map car lists) (list last-elt))
-  (let recur ((lists lists))
-    (if (pair? lists) (cons (caar lists) (recur (cdr lists))) (list last-elt))))
-
-;;; LISTS is a (not very long) non-empty list of lists.
-;;; Return two lists: the cars & the cdrs of the lists.
-;;; However, if any of the lists is empty, just abort and return [() ()].
-
-(define (%cars+cdrs lists)
-  (let f ([ls lists] [a* '()] [d* '()])
-    (cond
-      [(pair? ls) 
-       (let ([a (car ls)])
-         (if (pair? a) 
-             (f (cdr ls) (cons (car a) a*) (cons (cdr a) d*))
-             (values '() '())))]
-      [else (values (reverse a*) (reverse d*))])))
-
-;  (call-with-current-continuation
-;    (lambda (abort)
-;      (let recur ((lists lists))
-;        (if (pair? lists)
-;	    (receive (list other-lists) (car+cdr lists)
-;	      (if (null-list? list) (abort '() '()) ; LIST is empty -- bail out
-;		  (receive (a d) (car+cdr list)
-;		    (receive (cars cdrs) (recur other-lists)
-;		      (values (cons a cars) (cons d cdrs))))))
-;	    (values '() '()))))))
-
-;;; Like %CARS+CDRS, but we pass in a final elt tacked onto the end of the
-;;; cars list. What a hack.
-(define (%cars+cdrs+ lists cars-final)
-  (call-with-current-continuation
-    (lambda (abort)
-      (let recur ((lists lists))
-        (if (pair? lists)
-	    (receive (list other-lists) (car+cdr lists)
-	      (if (null-list? list) (abort '() '()) ; LIST is empty -- bail out
-		  (receive (a d) (car+cdr list)
-		    (receive (cars cdrs) (recur other-lists)
-		      (values (cons a cars) (cons d cdrs))))))
-	    (values (list cars-final) '()))))))
-
-;;; Like %CARS+CDRS, but blow up if any list is empty.
-(define (%cars+cdrs/no-test lists)
-  (let recur ((lists lists))
-    (if (pair? lists)
-	(receive (list other-lists) (car+cdr lists)
-	  (receive (a d) (car+cdr list)
-	    (receive (cars cdrs) (recur other-lists)
-	      (values (cons a cars) (cons d cdrs)))))
-	(values '() '()))))
-
-
-;;; count
-;;;;;;;;;
-(define (count pred list1 . lists)
-  (check-arg procedure? pred count)
-  (if (pair? lists)
-
-      ;; N-ary case
-      (let lp ((list1 list1) (lists lists) (i 0))
-	(if (null-list? list1) i
-	    (receive (as ds) (%cars+cdrs lists)
-	      (if (null? as) i
-		  (lp (cdr list1) ds
-		      (if (apply pred (car list1) as) (+ i 1) i))))))
-
-      ;; Fast path
-      (let lp ((lis list1) (i 0))
-	(if (null-list? lis) i
-	    (lp (cdr lis) (if (pred (car lis)) (+ i 1) i))))))
-
-
-;;; fold/unfold
-;;;;;;;;;;;;;;;
-
-(define unfold-right
-  (case-lambda
-    [(p f g seed)
-     (unfold-right p f g seed '())]
-    [(p f g seed tail)
-     (check-arg procedure? p unfold-right)
-     (check-arg procedure? f unfold-right)
-     (check-arg procedure? g unfold-right)
-     (let lp ((seed seed) (ans tail))
-       (if (p seed) ans
-         (lp (g seed)
-             (cons (f seed) ans))))]))
-
-
-(define (unfold p f g seed . maybe-tail-gen)
-  (check-arg procedure? p unfold)
-  (check-arg procedure? f unfold)
-  (check-arg procedure? g unfold)
-  (if (pair? maybe-tail-gen) ;;; so much for :optional (aghuloum)
-
-      (let ((tail-gen (car maybe-tail-gen)))
-	(if (pair? (cdr maybe-tail-gen))
-	    (apply error 'unfold "Too many arguments" p f g seed maybe-tail-gen)
-
-	    (let recur ((seed seed))
-	      (if (p seed) (tail-gen seed)
-		  (cons (f seed) (recur (g seed)))))))
-
-      (let recur ((seed seed))
-	(if (p seed) '()
-	    (cons (f seed) (recur (g seed)))))))
-      
-
-(define (fold kons knil lis1 . lists)
-  (check-arg procedure? kons fold)
-  (if (pair? lists)
-      (let lp ((lists (cons lis1 lists)) (ans knil))	; N-ary case
-	(receive (cars+ans cdrs) (%cars+cdrs+ lists ans)
-	  (if (null? cars+ans) ans ; Done.
-	      (lp cdrs (apply kons cars+ans)))))
-	    
-      (let lp ((lis lis1) (ans knil))			; Fast path
-	(if (null-list? lis) ans
-	    (lp (cdr lis) (kons (car lis) ans))))))
-
-
-(define (fold-right kons knil lis1 . lists)
-  (check-arg procedure? kons fold-right)
-  (if (pair? lists)
-      (let recur ((lists (cons lis1 lists)))		; N-ary case
-	(let ((cdrs (%cdrs lists)))
-	  (if (null? cdrs) knil
-	      (apply kons (%cars+ lists (recur cdrs))))))
-
-      (let recur ((lis lis1))				; Fast path
-	(if (null-list? lis) knil
-	    (let ((head (car lis)))
-	      (kons head (recur (cdr lis))))))))
-
-
-(define (pair-fold-right f zero lis1 . lists)
-  (check-arg procedure? f pair-fold-right)
-  (if (pair? lists)
-      (let recur ((lists (cons lis1 lists)))		; N-ary case
-	(let ((cdrs (%cdrs lists)))
-	  (if (null? cdrs) zero
-	      (apply f (append! lists (list (recur cdrs)))))))
-
-      (let recur ((lis lis1))				; Fast path
-	(if (null-list? lis) zero (f lis (recur (cdr lis)))))))
-
-(define (pair-fold f zero lis1 . lists)
-  (check-arg procedure? f pair-fold)
-  (if (pair? lists)
-      (let lp ((lists (cons lis1 lists)) (ans zero))	; N-ary case
-	(let ((tails (%cdrs lists)))
-	  (if (null? tails) ans
-	      (lp tails (apply f (append! lists (list ans)))))))
-
-      (let lp ((lis lis1) (ans zero))
-	(if (null-list? lis) ans
-	    (let ((tail (cdr lis)))		; Grab the cdr now,
-	      (lp tail (f lis ans)))))))	; in case F SET-CDR!s LIS.
-      
-
-;;; REDUCE and REDUCE-RIGHT only use RIDENTITY in the empty-list case.
-;;; These cannot meaningfully be n-ary.
-
-(define (reduce f ridentity lis)
-  (check-arg procedure? f reduce)
-  (if (null-list? lis) ridentity
-      (fold f (car lis) (cdr lis))))
-
-(define (reduce-right f ridentity lis)
-  (check-arg procedure? f reduce-right)
-  (if (null-list? lis) ridentity
-      (let recur ((head (car lis)) (lis (cdr lis)))
-	(if (pair? lis)
-	    (f head (recur (car lis) (cdr lis)))
-	    head))))
-
-
-
-;;; Mappers: append-map append-map! pair-for-each map! filter-map map-in-order
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (append-map f lis1 . lists)
-  (check-arg procedure? f append-map)
-  (really-append-map append  f lis1 lists))
-(define (append-map! f lis1 . lists) 
-  (check-arg procedure? f append-map!)
-  (really-append-map append! f lis1 lists))
-
-(define (really-append-map appender f lis1 lists)
-  (if (pair? lists)
-      (receive (cars cdrs) (%cars+cdrs (cons lis1 lists))
-	(if (null? cars) '()
-	    (let recur ((cars cars) (cdrs cdrs))
-	      (let ((vals (apply f cars)))
-		(receive (cars2 cdrs2) (%cars+cdrs cdrs)
-		  (if (null? cars2) vals
-		      (appender vals (recur cars2 cdrs2))))))))
-
-      ;; Fast path
-      (if (null-list? lis1) '()
-	  (let recur ((elt (car lis1)) (rest (cdr lis1)))
-	    (let ((vals (f elt)))
-	      (if (null-list? rest) vals
-		  (appender vals (recur (car rest) (cdr rest)))))))))
-
-
-(define (pair-for-each proc lis1 . lists)
-  (check-arg procedure? proc pair-for-each)
-  (if (pair? lists)
-
-      (let lp ((lists (cons lis1 lists)))
-	(let ((tails (%cdrs lists)))
-	  (if (pair? tails)
-	      (begin (apply proc lists)
-		     (lp tails)))))
-
-      ;; Fast path.
-      (let lp ((lis lis1))
-	(if (not (null-list? lis))
-	    (let ((tail (cdr lis)))	; Grab the cdr now,
-	      (proc lis)		; in case PROC SET-CDR!s LIS.
-	      (lp tail))))))
-
-;;; We stop when LIS1 runs out, not when any list runs out.
-(define (map! f lis1 . lists)
-  (check-arg procedure? f map!)
-  (if (pair? lists)
-      (let lp ((lis1 lis1) (lists lists))
-	(if (not (null-list? lis1))
-	    (receive (heads tails) (%cars+cdrs/no-test lists)
-	      (set-car! lis1 (apply f (car lis1) heads))
-	      (lp (cdr lis1) tails))))
-
-      ;; Fast path.
-      (pair-for-each (lambda (pair) (set-car! pair (f (car pair)))) lis1))
-  lis1)
-
-
-;;; Map F across L, and save up all the non-false results.
-(define (filter-map f lis1 . lists)
-  (check-arg procedure? f filter-map)
-  (if (pair? lists)
-      (let recur ((lists (cons lis1 lists)))
-	(receive (cars cdrs) (%cars+cdrs lists)
-	  (if (pair? cars)
-	      (cond ((apply f cars) => (lambda (x) (cons x (recur cdrs))))
-		    (else (recur cdrs))) ; Tail call in this arm.
-	      '())))
-	    
-      ;; Fast path.
-      (let recur ((lis lis1))
-	(if (null-list? lis) lis
-	    (let ((tail (recur (cdr lis))))
-	      (cond ((f (car lis)) => (lambda (x) (cons x tail)))
-		    (else tail)))))))
-
-
-;;; Map F across lists, guaranteeing to go left-to-right.
-;;; NOTE: Some implementations of R5RS MAP are compliant with this spec;
-;;; in which case this procedure may simply be defined as a synonym for MAP.
-
-(define (map-in-order f lis1 . lists)
-  (check-arg procedure? f map-in-order)
-  (if (pair? lists)
-      (let recur ((lists (cons lis1 lists)))
-	(receive (cars cdrs) (%cars+cdrs lists)
-	  (if (pair? cars)
-	      (let ((x (apply f cars)))		; Do head first,
-		(cons x (recur cdrs)))		; then tail.
-	      '())))
-	    
-      ;; Fast path.
-      (let recur ((lis lis1))
-	(if (null-list? lis) lis
-	    (let ((tail (cdr lis))
-		  (x (f (car lis))))		; Do head first,
-	      (cons x (recur tail)))))))	; then tail.
-
-
-;;; We extend MAP to handle arguments of unequal length.
-(define map map-in-order)	
-
-;;; Contributed by Michael Sperber since it was missing from the
-;;; reference implementation.
-(define (for-each f lis1 . lists)
-  (if (pair? lists)
-      (let recur ((lists (cons lis1 lists)))
-	(receive (cars cdrs) (%cars+cdrs lists)
-		 (if (pair? cars)
-		     (begin
-		       (apply f cars)	; Do head first,
-		       (recur cdrs)))))	; then tail.
-    
-      ;; Fast path.
-      (let recur ((lis lis1))
-	(if (not (null-list? lis))
-	    (begin
-	      (f (car lis))		; Do head first,
-	      (recur (cdr lis)))))))	; then tail.
-
-;;; filter, remove, partition
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; FILTER, REMOVE, PARTITION and their destructive counterparts do not
-;;; disorder the elements of their argument.
-
-;; This FILTER shares the longest tail of L that has no deleted elements.
-;; If Scheme had multi-continuation calls, they could be made more efficient.
-
-(define (filter pred lis)			; Sleazing with EQ? makes this
-  (check-arg procedure? pred filter)		; one faster.
-  (let recur ((lis lis))		
-    (if (null-list? lis) lis			; Use NOT-PAIR? to handle dotted lists.
-	(let ((head (car lis))
-	      (tail (cdr lis)))
-	  (if (pred head)
-	      (let ((new-tail (recur tail)))	; Replicate the RECUR call so
-		(if (eq? tail new-tail) lis
-		    (cons head new-tail)))
-	      (recur tail))))))			; this one can be a tail call.
-
-
-;;; Another version that shares longest tail.
-;(define (filter pred lis)
-;  (receive (ans no-del?)
-;      ;; (recur l) returns L with (pred x) values filtered.
-;      ;; It also returns a flag NO-DEL? if the returned value
-;      ;; is EQ? to L, i.e. if it didn't have to delete anything.
-;      (let recur ((l l))
-;	(if (null-list? l) (values l #t)
-;	    (let ((x  (car l))
-;		  (tl (cdr l)))
-;	      (if (pred x)
-;		  (receive (ans no-del?) (recur tl)
-;		    (if no-del?
-;			(values l #t)
-;			(values (cons x ans) #f)))
-;		  (receive (ans no-del?) (recur tl) ; Delete X.
-;		    (values ans #f))))))
-;    ans))
-
-
-
-;(define (filter! pred lis)			; Things are much simpler
-;  (let recur ((lis lis))			; if you are willing to
-;    (if (pair? lis)				; push N stack frames & do N
-;        (cond ((pred (car lis))		; SET-CDR! writes, where N is
-;               (set-cdr! lis (recur (cdr lis))); the length of the answer.
-;               lis)				
-;              (else (recur (cdr lis))))
-;        lis)))
-
-
-;;; This implementation of FILTER!
-;;; - doesn't cons, and uses no stack;
-;;; - is careful not to do redundant SET-CDR! writes, as writes to memory are 
-;;;   usually expensive on modern machines, and can be extremely expensive on 
-;;;   modern Schemes (e.g., ones that have generational GC's).
-;;; It just zips down contiguous runs of in and out elts in LIS doing the 
-;;; minimal number of SET-CDR!s to splice the tail of one run of ins to the 
-;;; beginning of the next.
-
-(define (filter! pred lis)
-  (check-arg procedure? pred filter!)
-  (let lp ((ans lis))
-    (cond ((null-list? ans)       ans)			; Scan looking for
-	  ((not (pred (car ans))) (lp (cdr ans)))	; first cons of result.
-
-	  ;; ANS is the eventual answer.
-	  ;; SCAN-IN: (CDR PREV) = LIS and (CAR PREV) satisfies PRED.
-	  ;;          Scan over a contiguous segment of the list that
-	  ;;          satisfies PRED.
-	  ;; SCAN-OUT: (CAR PREV) satisfies PRED. Scan over a contiguous
-	  ;;           segment of the list that *doesn't* satisfy PRED.
-	  ;;           When the segment ends, patch in a link from PREV
-	  ;;           to the start of the next good segment, and jump to
-	  ;;           SCAN-IN.
-	  (else (letrec ((scan-in (lambda (prev lis)
-				    (if (pair? lis)
-					(if (pred (car lis))
-					    (scan-in lis (cdr lis))
-					    (scan-out prev (cdr lis))))))
-			 (scan-out (lambda (prev lis)
-				     (let lp ((lis lis))
-				       (if (pair? lis)
-					   (if (pred (car lis))
-					       (begin (set-cdr! prev lis)
-						      (scan-in lis (cdr lis)))
-					       (lp (cdr lis)))
-					   (set-cdr! prev lis))))))
-		  (scan-in ans (cdr ans))
-		  ans)))))
-
-
-
-;;; Answers share common tail with LIS where possible; 
-;;; the technique is slightly subtle.
-
-(define (partition pred lis)
-  (check-arg procedure? pred partition)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values lis lis)	; Use NOT-PAIR? to handle dotted lists.
-	(let ((elt (car lis))
-	      (tail (cdr lis)))
-	  (receive (in out) (recur tail)
-	    (if (pred elt)
-		(values (if (pair? out) (cons elt in) lis) out)
-		(values in (if (pair? in) (cons elt out) lis))))))))
-
-
-
-;(define (partition! pred lis)			; Things are much simpler
-;  (let recur ((lis lis))			; if you are willing to
-;    (if (null-list? lis) (values lis lis)	; push N stack frames & do N
-;        (let ((elt (car lis)))			; SET-CDR! writes, where N is
-;          (receive (in out) (recur (cdr lis))	; the length of LIS.
-;            (cond ((pred elt)
-;                   (set-cdr! lis in)
-;                   (values lis out))
-;                  (else (set-cdr! lis out)
-;                        (values in lis))))))))
-
-
-;;; This implementation of PARTITION!
-;;; - doesn't cons, and uses no stack;
-;;; - is careful not to do redundant SET-CDR! writes, as writes to memory are
-;;;   usually expensive on modern machines, and can be extremely expensive on 
-;;;   modern Schemes (e.g., ones that have generational GC's).
-;;; It just zips down contiguous runs of in and out elts in LIS doing the
-;;; minimal number of SET-CDR!s to splice these runs together into the result 
-;;; lists.
-
-(define (partition! pred lis)
-  (check-arg procedure? pred partition!)
-  (if (null-list? lis) (values lis lis)
-
-      ;; This pair of loops zips down contiguous in & out runs of the
-      ;; list, splicing the runs together. The invariants are
-      ;;   SCAN-IN:  (cdr in-prev)  = LIS.
-      ;;   SCAN-OUT: (cdr out-prev) = LIS.
-      (letrec ((scan-in (lambda (in-prev out-prev lis)
-			  (let lp ((in-prev in-prev) (lis lis))
-			    (if (pair? lis)
-				(if (pred (car lis))
-				    (lp lis (cdr lis))
-				    (begin (set-cdr! out-prev lis)
-					   (scan-out in-prev lis (cdr lis))))
-				(set-cdr! out-prev lis))))) ; Done.
-
-	       (scan-out (lambda (in-prev out-prev lis)
-			   (let lp ((out-prev out-prev) (lis lis))
-			     (if (pair? lis)
-				 (if (pred (car lis))
-				     (begin (set-cdr! in-prev lis)
-					    (scan-in lis out-prev (cdr lis)))
-				     (lp lis (cdr lis)))
-				 (set-cdr! in-prev lis)))))) ; Done.
-
-	;; Crank up the scan&splice loops.
-	(if (pred (car lis))
-	    ;; LIS begins in-list. Search for out-list's first pair.
-	    (let lp ((prev-l lis) (l (cdr lis)))
-	      (cond ((not (pair? l)) (values lis l))
-		    ((pred (car l)) (lp l (cdr l)))
-		    (else (scan-out prev-l l (cdr l))
-			  (values lis l))))	; Done.
-
-	    ;; LIS begins out-list. Search for in-list's first pair.
-	    (let lp ((prev-l lis) (l (cdr lis)))
-	      (cond ((not (pair? l)) (values l lis))
-		    ((pred (car l))
-		     (scan-in l prev-l (cdr l))
-		     (values l lis))		; Done.
-		    (else (lp l (cdr l)))))))))
-
-
-;;; Inline us, please.
-(define (remove  pred l) (filter  (lambda (x) (not (pred x))) l))
-(define (remove! pred l) (filter! (lambda (x) (not (pred x))) l))
-
-
-
-;;; Here's the taxonomy for the DELETE/ASSOC/MEMBER functions.
-;;; (I don't actually think these are the world's most important
-;;; functions -- the procedural FILTER/REMOVE/FIND/FIND-TAIL variants
-;;; are far more general.)
-;;;
-;;; Function			Action
-;;; ---------------------------------------------------------------------------
-;;; remove pred lis		Delete by general predicate
-;;; delete x lis [=]		Delete by element comparison
-;;;					     
-;;; find pred lis		Search by general predicate
-;;; find-tail pred lis		Search by general predicate
-;;; member x lis [=]		Search by element comparison
-;;;
-;;; assoc key lis [=]		Search alist by key comparison
-;;; alist-delete key alist [=]	Alist-delete by key comparison
-
-(define delete 
-  (case-lambda
-    [(x lis)
-     (delete x lis equal?)]
-    [(x lis =) 
-     (filter (lambda (y) (not (= x y))) lis)]))
-
-(define delete! 
-  (case-lambda
-    [(x lis)
-     (delete! x lis equal?)]
-    [(x lis =)
-     (filter! (lambda (y) (not (= x y))) lis)]))
-
-;;; Extended from R4RS to take an optional comparison argument.
-(define member  
-  (case-lambda
-    [(x lis)
-     (member x lis equal?)]
-    [(x lis =)
-     (find-tail (lambda (y) (= x y)) lis)]))
-
-;;; R4RS, hence we don't bother to define.
-;;; The MEMBER and then FIND-TAIL call should definitely
-;;; be inlined for MEMQ & MEMV.
-;(define (memq    x lis) (member x lis eq?))
-;(define (memv    x lis) (member x lis eqv?))
-
-
-;;; right-duplicate deletion
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; delete-duplicates delete-duplicates!
-;;;
-;;; Beware -- these are N^2 algorithms. To efficiently remove duplicates
-;;; in long lists, sort the list to bring duplicates together, then use a 
-;;; linear-time algorithm to kill the dups. Or use an algorithm based on
-;;; element-marking. The former gives you O(n lg n), the latter is linear.
-
-(define delete-duplicates 
-  (case-lambda
-    [(lis)
-     (delete-duplicates lis equal?)]
-    [(lis elt=)
-     (check-arg procedure? elt= delete-duplicates)
-     (let recur ((lis lis))
-       (if (null-list? lis) lis
-         (let* ((x (car lis))
-                (tail (cdr lis))
-                (new-tail (recur (delete x tail elt=))))
-           (if (eq? tail new-tail) lis (cons x new-tail)))))]))
-
-(define delete-duplicates! 
-  (case-lambda
-    [(lis)
-     (delete-duplicates! lis equal?)]
-    [(lis elt=)
-     (check-arg procedure? elt= delete-duplicates!)
-     (let recur ((lis lis))
-       (if (null-list? lis) lis
-           (let* ((x (car lis))
-                  (tail (cdr lis))
-                  (new-tail (recur (delete! x tail elt=))))
-             (when (not (eq? tail new-tail))
-               (set-cdr! lis new-tail))
-             lis)))]))
-
-
-;;; alist stuff
-;;;;;;;;;;;;;;;
-
-;;; Extended from R4RS to take an optional comparison argument.
-(define assoc 
-  (case-lambda
-    [(x lis)
-     (assoc x lis equal?)]
-    [(x lis =)
-     (find (lambda (entry) (= x (car entry))) lis)]))
-
-(define (alist-cons key datum alist) (cons (cons key datum) alist))
-
-(define (alist-copy alist)
-  (map (lambda (elt) (cons (car elt) (cdr elt)))
-       alist))
-
-(define alist-delete 
-  (case-lambda
-    [(key alist)
-     (alist-delete key alist equal?)]
-    [(key alist =)
-     (filter (lambda (elt) (not (= key (car elt)))) alist)]))
-
-(define alist-delete! 
-  (case-lambda
-    [(key alist)
-     (alist-delete! key alist equal?)]
-    [(key alist =)
-     (filter! (lambda (elt) (not (= key (car elt)))) alist)]))
-
-
-;;; find find-tail take-while drop-while span break any every list-index
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (find pred list)
-  (cond ((find-tail pred list) => car)
-	(else #f)))
-
-(define (find-tail pred list)
-  (check-arg procedure? pred find-tail)
-  (let lp ((list list))
-    (and (not (null-list? list))
-	 (if (pred (car list)) list
-	     (lp (cdr list))))))
-
-(define (take-while pred lis)
-  (check-arg procedure? pred take-while)
-  (let recur ((lis lis))
-    (if (null-list? lis) '()
-	(let ((x (car lis)))
-	  (if (pred x)
-	      (cons x (recur (cdr lis)))
-	      '())))))
-
-(define (drop-while pred lis)
-  (check-arg procedure? pred drop-while)
-  (let lp ((lis lis))
-    (if (null-list? lis) '()
-	(if (pred (car lis))
-	    (lp (cdr lis))
-	    lis))))
-
-(define (take-while! pred lis)
-  (check-arg procedure? pred take-while!)
-  (if (or (null-list? lis) (not (pred (car lis)))) '()
-      (begin (let lp ((prev lis) (rest (cdr lis)))
-	       (if (pair? rest)
-		   (let ((x (car rest)))
-		     (if (pred x) (lp rest (cdr rest))
-			 (set-cdr! prev '())))))
-	     lis)))
-
-(define (span pred lis)
-  (check-arg procedure? pred span)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values '() '())
-	(let ((x (car lis)))
-	  (if (pred x)
-	      (receive (prefix suffix) (recur (cdr lis))
-		(values (cons x prefix) suffix))
-	      (values '() lis))))))
-
-(define (span! pred lis)
-  (check-arg procedure? pred span!)
-  (if (or (null-list? lis) (not (pred (car lis)))) (values '() lis)
-      (let ((suffix (let lp ((prev lis) (rest (cdr lis)))
-		      (if (null-list? rest) rest
-			  (let ((x (car rest)))
-			    (if (pred x) (lp rest (cdr rest))
-				(begin (set-cdr! prev '())
-				       rest)))))))
-	(values lis suffix))))
-  
-
-(define (break  pred lis) (span  (lambda (x) (not (pred x))) lis))
-(define (break! pred lis) (span! (lambda (x) (not (pred x))) lis))
-
-(define (any pred lis1 . lists)
-  (check-arg procedure? pred any)
-  (if (pair? lists)
-
-      ;; N-ary case
-      (receive (heads tails) (%cars+cdrs (cons lis1 lists))
-	(and (pair? heads)
-	     (let lp ((heads heads) (tails tails))
-	       (receive (next-heads next-tails) (%cars+cdrs tails)
-		 (if (pair? next-heads)
-		     (or (apply pred heads) (lp next-heads next-tails))
-		     (apply pred heads)))))) ; Last PRED app is tail call.
-
-      ;; Fast path
-      (and (not (null-list? lis1))
-	   (let lp ((head (car lis1)) (tail (cdr lis1)))
-	     (if (null-list? tail)
-		 (pred head)		; Last PRED app is tail call.
-		 (or (pred head) (lp (car tail) (cdr tail))))))))
-
-
-;(define (every pred list)              ; Simple definition.
-;  (let lp ((list list))                ; Doesn't return the last PRED value.
-;    (or (not (pair? list))
-;        (and (pred (car list))
-;             (lp (cdr list))))))
-
-(define every
-  (case-lambda
-    [(p ls) 
-     (or (null-list? ls)
-         (let f ([p p] [a (car ls)] [d (cdr ls)])
-           (cond
-             [(pair? d) 
-              (and (p a) (f p (car d) (cdr d)))]
-             [else (p a)])))]
-    [(p ls1 ls2)
-     (cond
-       [(and (pair? ls1) (pair? ls2)) 
-        (let f ([p p] [a1 (car ls1)] [d1 (cdr ls1)] [a2 (car ls2)] [d2 (cdr ls2)])
-          (cond
-            [(and (pair? d1) (pair? d2)) 
-             (and (p a1 a2) (f p (car d1) (cdr d1) (car d2) (cdr d2)))]
-            [else (p a1 a2)]))]
-       [else #t])]
-    [(pred lis1 . lists)
-     (receive (heads tails) (%cars+cdrs (cons lis1 lists))
-       (or (not (pair? heads))
-           (let lp ((heads heads) (tails tails))
-             (receive (next-heads next-tails) (%cars+cdrs tails)
-       	(if (pair? next-heads)
-       	    (and (apply pred heads) (lp next-heads next-tails))
-       	    (apply pred heads))))))]))
-
-      ;; Fast path
-;;;       (or (null-list? lis1)
-;;; 	  (let lp ((head (car lis1))  (tail (cdr lis1)))
-;;; 	    (if (null-list? tail)
-;;; 		(pred head)	; Last PRED app is tail call.
-;;; 		(and (pred head) (lp (car tail) (cdr tail))))))))
-
-(define (list-index pred lis1 . lists)
-  (check-arg procedure? pred list-index)
-  (if (pair? lists)
-
-      ;; N-ary case
-      (let lp ((lists (cons lis1 lists)) (n 0))
-	(receive (heads tails) (%cars+cdrs lists)
-	  (and (pair? heads)
-	       (if (apply pred heads) n
-		   (lp tails (+ n 1))))))
-
-      ;; Fast path
-      (let lp ((lis lis1) (n 0))
-	(and (not (null-list? lis))
-	     (if (pred (car lis)) n (lp (cdr lis) (+ n 1)))))))
-
-;;; Reverse
-;;;;;;;;;;;
-
-;R4RS, so not defined here.
-;(define (reverse lis) (fold cons '() lis))
-				      
-;(define (reverse! lis)
-;  (pair-fold (lambda (pair tail) (set-cdr! pair tail) pair) '() lis))
-
-(define (reverse! lis)
-  (let lp ((lis lis) (ans '()))
-    (if (null-list? lis) ans
-        (let ((tail (cdr lis)))
-          (set-cdr! lis ans)
-          (lp tail lis)))))
-
-;;; Lists-as-sets
-;;;;;;;;;;;;;;;;;
-
-;;; This is carefully tuned code; do not modify casually.
-;;; - It is careful to share storage when possible;
-;;; - Side-effecting code tries not to perform redundant writes.
-;;; - It tries to avoid linear-time scans in special cases where constant-time
-;;;   computations can be performed.
-;;; - It relies on similar properties from the other list-lib procs it calls.
-;;;   For example, it uses the fact that the implementations of MEMBER and
-;;;   FILTER in this source code share longest common tails between args
-;;;   and results to get structure sharing in the lset procedures.
-
-(define (%lset2<= = lis1 lis2) (every (lambda (x) (member x lis2 =)) lis1))
-
-(define (lset<= = . lists)
-  (check-arg procedure? = lset<=)
-  (or (not (pair? lists)) ; 0-ary case
-      (let lp ((s1 (car lists)) (rest (cdr lists)))
-	(or (not (pair? rest))
-	    (let ((s2 (car rest))  (rest (cdr rest)))
-	      (and (or (eq? s2 s1)	; Fast path
-		       (%lset2<= = s1 s2)) ; Real test
-		   (lp s2 rest)))))))
-
-(define (lset= = . lists)
-  (check-arg procedure? = lset=)
-  (or (not (pair? lists)) ; 0-ary case
-      (let lp ((s1 (car lists)) (rest (cdr lists)))
-	(or (not (pair? rest))
-	    (let ((s2   (car rest))
-		  (rest (cdr rest)))
-	      (and (or (eq? s1 s2)	; Fast path
-		       (and (%lset2<= = s1 s2) (%lset2<= = s2 s1))) ; Real test
-		   (lp s2 rest)))))))
-
-
-(define (lset-adjoin = lis . elts)
-  (check-arg procedure? = lset-adjoin)
-  (fold (lambda (elt ans) (if (member elt ans =) ans (cons elt ans)))
-	lis elts))
-
-
-(define (lset-union = . lists)
-  (check-arg procedure? = lset-union)
-  (reduce (lambda (lis ans)		; Compute ANS + LIS.
-	    (cond ((null? lis) ans)	; Don't copy any lists
-		  ((null? ans) lis) 	; if we don't have to.
-		  ((eq? lis ans) ans)
-		  (else
-		   (fold (lambda (elt ans) (if (any (lambda (x) (= x elt)) ans)
-					       ans
-					       (cons elt ans)))
-			 ans lis))))
-	  '() lists))
-
-(define (lset-union! = . lists)
-  (check-arg procedure? = lset-union!)
-  (reduce (lambda (lis ans)		; Splice new elts of LIS onto the front of ANS.
-	    (cond ((null? lis) ans)	; Don't copy any lists
-		  ((null? ans) lis) 	; if we don't have to.
-		  ((eq? lis ans) ans)
-		  (else
-		   (pair-fold (lambda (pair ans)
-				(let ((elt (car pair)))
-				  (if (any (lambda (x) (= x elt)) ans)
-				      ans
-				      (begin (set-cdr! pair ans) pair))))
-			      ans lis))))
-	  '() lists))
-
-
-(define (lset-intersection = lis1 . lists)
-  (check-arg procedure? = lset-intersection)
-  (let ((lists (delete lis1 lists eq?))) ; Throw out any LIS1 vals.
-    (cond ((any null-list? lists) '())		; Short cut
-	  ((null? lists)          lis1)		; Short cut
-	  (else (filter (lambda (x)
-			  (every (lambda (lis) (member x lis =)) lists))
-			lis1)))))
-
-(define (lset-intersection! = lis1 . lists)
-  (check-arg procedure? = lset-intersection!)
-  (let ((lists (delete lis1 lists eq?))) ; Throw out any LIS1 vals.
-    (cond ((any null-list? lists) '())		; Short cut
-	  ((null? lists)          lis1)		; Short cut
-	  (else (filter! (lambda (x)
-			   (every (lambda (lis) (member x lis =)) lists))
-			 lis1)))))
-
-
-(define (lset-difference = lis1 . lists)
-  (check-arg procedure? = lset-difference)
-  (let ((lists (filter pair? lists)))	; Throw out empty lists.
-    (cond ((null? lists)     lis1)	; Short cut
-	  ((memq lis1 lists) '())	; Short cut
-	  (else (filter (lambda (x)
-			  (every (lambda (lis) (not (member x lis =)))
-				 lists))
-			lis1)))))
-
-(define (lset-difference! = lis1 . lists)
-  (check-arg procedure? = lset-difference!)
-  (let ((lists (filter pair? lists)))	; Throw out empty lists.
-    (cond ((null? lists)     lis1)	; Short cut
-	  ((memq lis1 lists) '())	; Short cut
-	  (else (filter! (lambda (x)
-			   (every (lambda (lis) (not (member x lis =)))
-				  lists))
-			 lis1)))))
-
-
-(define (lset-xor = . lists)
-  (check-arg procedure? = lset-xor)
-  (reduce (lambda (b a)			; Compute A xor B:
-	    ;; Note that this code relies on the constant-time
-	    ;; short-cuts provided by LSET-DIFF+INTERSECTION,
-	    ;; LSET-DIFFERENCE & APPEND to provide constant-time short
-	    ;; cuts for the cases A = (), B = (), and A eq? B. It takes
-	    ;; a careful case analysis to see it, but it's carefully
-	    ;; built in.
-
-	    ;; Compute a-b and a^b, then compute b-(a^b) and
-	    ;; cons it onto the front of a-b.
-	    (receive (a-b a-int-b)   (lset-diff+intersection = a b)
-	      (cond ((null? a-b)     (lset-difference = b a))
-		    ((null? a-int-b) (append b a))
-		    (else (fold (lambda (xb ans)
-				  (if (member xb a-int-b =) ans (cons xb ans)))
-				a-b
-				b)))))
-	  '() lists))
-
-
-(define (lset-xor! = . lists)
-  (check-arg procedure? = lset-xor!)
-  (reduce (lambda (b a)			; Compute A xor B:
-	    ;; Note that this code relies on the constant-time
-	    ;; short-cuts provided by LSET-DIFF+INTERSECTION,
-	    ;; LSET-DIFFERENCE & APPEND to provide constant-time short
-	    ;; cuts for the cases A = (), B = (), and A eq? B. It takes
-	    ;; a careful case analysis to see it, but it's carefully
-	    ;; built in.
-
-	    ;; Compute a-b and a^b, then compute b-(a^b) and
-	    ;; cons it onto the front of a-b.
-	    (receive (a-b a-int-b)   (lset-diff+intersection! = a b)
-	      (cond ((null? a-b)     (lset-difference! = b a))
-		    ((null? a-int-b) (append! b a))
-		    (else (pair-fold (lambda (b-pair ans)
-				       (if (member (car b-pair) a-int-b =) ans
-					   (begin (set-cdr! b-pair ans) b-pair)))
-				     a-b
-				     b)))))
-	  '() lists))
-
-
-(define (lset-diff+intersection = lis1 . lists)
-  (check-arg procedure? = lset-diff+intersection)
-  (cond ((every null-list? lists) (values lis1 '()))	; Short cut
-	((memq lis1 lists)        (values '() lis1))	; Short cut
-	(else (partition (lambda (elt)
-			   (not (any (lambda (lis) (member elt lis =))
-				     lists)))
-			 lis1))))
-
-(define (lset-diff+intersection! = lis1 . lists)
-  (check-arg procedure? = lset-diff+intersection!)
-  (cond ((every null-list? lists) (values lis1 '()))	; Short cut
-	((memq lis1 lists)        (values '() lis1))	; Short cut
-	(else (partition! (lambda (elt)
-			    (not (any (lambda (lis) (member elt lis =))
-				      lists)))
-			  lis1))))
-;;; end of library
-) 
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a1/lists.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a1/lists.rkt
deleted file mode 100644
index 22d52fb0ea..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a1/lists.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a1
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a11.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a11.rkt
deleted file mode 100644
index 0017499f91..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a11.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/11
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a11/let-values.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a11/let-values.rkt
deleted file mode 100644
index c67d691ddd..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a11/let-values.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a11
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a13.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a13.rkt
deleted file mode 100644
index 222e5afff8..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a13.rkt
+++ /dev/null
@@ -1,104 +0,0 @@
-#lang scheme
-
-(require
- (rename-in srfi/13
-            (reverse-list->string srfi13:reverse-list->string)
-            (string->list srfi13:string->list)
-            (string-concatenate srfi13:string-concatenate)
-            (string-concatenate/shared srfi13:string-concatenate/shared)
-            (string-concatenate-reverse srfi13:string-concatenate-reverse)
-            (string-concatenate-reverse/shared srfi13:string-concatenate-reverse/shared)
-            (string-join srfi13:string-join)
-            (string-tokenize srfi13:string-tokenize))
- (only-in rnrs/base-6
-          list->string)
- scheme/mpair)
-
-(provide
-    string-map string-map!
-    string-fold       string-unfold
-    string-fold-right string-unfold-right 
-    string-tabulate string-for-each string-for-each-index
-    string-every string-any
-    string-hash string-hash-ci
-    string-compare string-compare-ci
-    string=    string<    string>    string<=    string>=    string<>
-    string-ci= string-ci< string-ci> string-ci<= string-ci>= string-ci<> 
-    string-downcase  string-upcase  string-titlecase  
-    string-downcase! string-upcase! string-titlecase! 
-    string-take string-take-right
-    string-drop string-drop-right
-    string-pad string-pad-right
-    string-trim string-trim-right string-trim-both
-    string-filter string-delete
-    string-index string-index-right 
-    string-skip  string-skip-right
-    string-count
-    string-prefix-length string-prefix-length-ci
-    string-suffix-length string-suffix-length-ci
-    string-prefix? string-prefix-ci?
-    string-suffix? string-suffix-ci?
-    string-contains string-contains-ci
-    string-copy! substring/shared
-    string-reverse string-reverse! reverse-list->string
-    string-concatenate string-concatenate/shared string-concatenate-reverse
-    string-concatenate-reverse/shared
-    string-append/shared
-    xsubstring string-xcopy!
-    string-null?
-    string-join
-    string-tokenize
-    string-replace
-    ; R5RS extended:
-    string->list string-copy string-fill! 
-    ; R5RS re-exports:
-    string? make-string string-length string-ref string-set! 
-    string string-append list->string
- )
-
-(define string->list
-  (case-lambda
-    ((s start end)
-     (list->mlist (srfi13:string->list s start end)))
-    ((s start)
-     (list->mlist (srfi13:string->list s start)))
-    ((s)
-     (list->mlist (srfi13:string->list s)))))
-
-(define (reverse-list->string char-list)
-  (srfi13:reverse-list->string (mlist->list char-list)))
-
-(define (string-join string-list [delimiter " "] [grammar 'infix])
-  (srfi13:string-join (mlist->list string-list) delimiter grammar))
-
-(define (string-concatenate string-list)
-  (srfi13:string-concatenate (mlist->list string-list)))
-
-(define (string-concatenate/shared string-list)
-  (srfi13:string-concatenate/shared (mlist->list string-list)))
-
-(define (make-reverse-concatenator procedure)
-  (case-lambda
-    ((string-list final-string end)
-     (procedure (mlist->list string-list) final-string end))
-    ((string-list final-string)
-     (procedure (mlist->list string-list) final-string))
-    ((string-list)
-     (procedure (mlist->list string-list)))))
-
-(define string-concatenate-reverse
-  (make-reverse-concatenator srfi13:string-concatenate-reverse))
-
-(define string-concatenate-reverse/shared
-  (make-reverse-concatenator srfi13:string-concatenate-reverse/shared))
-
-(define string-tokenize
-  (case-lambda
-    ((s token-set start end)
-     (list->mlist (srfi13:string-tokenize s token-set start end)))
-    ((s token-set start)
-     (list->mlist (srfi13:string-tokenize s token-set start)))
-    ((s token-set)
-     (list->mlist (srfi13:string-tokenize s token-set)))
-    ((s)
-     (list->mlist (srfi13:string-tokenize s)))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a13/strings.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a13/strings.rkt
deleted file mode 100644
index 6e12b96217..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a13/strings.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a13
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a14.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a14.rkt
deleted file mode 100644
index bff8a185fc..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a14.rkt
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang scheme
-(require
- (rename-in srfi/14
-            (list->char-set srfi14:list->char-set)
-            (list->char-set! srfi14:list->char-set!)
-            (char-set->list srfi14:char-set->list))
- scheme/mpair)
-
-(provide char-set?
-
-         char-set=
-         char-set<=
-         char-set-hash
-         char-set-cursor
-         char-set-ref
-         char-set-cursor-next
-         end-of-char-set?
-         char-set-fold
-         char-set-unfold
-         char-set-unfold!
-         char-set-for-each
-         char-set-map
-         char-set-copy
-         char-set
-         list->char-set
-         list->char-set!
-         string->char-set
-         string->char-set!
-         char-set-filter
-         char-set-filter!
-         ucs-range->char-set
-         ucs-range->char-set!
-         ->char-set
-         char-set->list
-         char-set->string
-         char-set-size
-         char-set-count
-         char-set-contains?
-         char-set-every
-         char-set-any
-         char-set-adjoin
-         char-set-adjoin!
-         char-set-delete
-         char-set-delete!
-         char-set-complement
-         char-set-complement!
-         char-set-union
-         char-set-union!
-         char-set-intersection
-         char-set-intersection!
-         char-set-difference
-         char-set-difference!
-         char-set-xor
-         char-set-xor!
-         char-set-diff+intersection
-         char-set-diff+intersection!
-         char-set:lower-case
-         char-set:upper-case
-         char-set:title-case
-         char-set:letter
-         char-set:digit
-         char-set:letter+digit
-         char-set:graphic
-         char-set:printing
-         char-set:whitespace
-         char-set:iso-control
-         char-set:punctuation
-         char-set:symbol
-         char-set:hex-digit
-         char-set:blank
-         char-set:ascii
-         char-set:empty
-         char-set:full)
-
-(define list->char-set
-  (case-lambda
-    ((char-list base-cs)
-     (srfi14:list->char-set (mlist->list char-list) base-cs))
-    ((char-list)
-     (srfi14:list->char-set (mlist->list char-list)))))
-
-(define (list->char-set! char-list base-cs)
-  (list->char-set char-list base-cs))
-
-(define (char-set->list cs)
-  (list->mlist (srfi14:char-set->list cs)))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a14/char-sets.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a14/char-sets.rkt
deleted file mode 100644
index 6131f670d8..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a14/char-sets.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a14
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a16.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a16.rkt
deleted file mode 100644
index 79262d8bce..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a16.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/16
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a16/case-lambda.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a16/case-lambda.rkt
deleted file mode 100644
index 5e2eefa4ec..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a16/case-lambda.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a16
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a17.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a17.rkt
deleted file mode 100644
index 647edac9f0..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a17.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/17
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a17/generalized-set.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a17/generalized-set.rkt
deleted file mode 100644
index e542757f6b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a17/generalized-set.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a17
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a18.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a18.rkt
deleted file mode 100644
index 1cb18114a8..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a18.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/18
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a18/multithreading.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a18/multithreading.rkt
deleted file mode 100644
index 10e5a396ea..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a18/multithreading.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a18
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a19.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a19.rkt
deleted file mode 100644
index fb8e91be2e..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a19.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/19
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a19/time.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a19/time.rkt
deleted file mode 100644
index c0c81aace2..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a19/time.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a19
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a2.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a2.rkt
deleted file mode 100644
index 61b94cf879..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a2.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/2
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a2/and-let%2a.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a2/and-let%2a.rkt
deleted file mode 100644
index 85bfca546b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a2/and-let%2a.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a2
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a23.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a23.rkt
deleted file mode 100644
index 42fcce9d55..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a23.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/23
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a23/error.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a23/error.rkt
deleted file mode 100644
index 2cf77d7cdf..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a23/error.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a23
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a25.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a25.rkt
deleted file mode 100644
index bbf9b64a30..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a25.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/25
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a25/multi-dimensional-arrays.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a25/multi-dimensional-arrays.rkt
deleted file mode 100644
index 43d4a8ac13..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a25/multi-dimensional-arrays.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a25
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a26.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a26.rkt
deleted file mode 100644
index 56acf26277..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a26.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/26
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a26/cut.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a26/cut.rkt
deleted file mode 100644
index 96216356b0..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a26/cut.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a26
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a27.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a27.rkt
deleted file mode 100644
index 3b5c28c11a..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a27.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/27
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a27/random-bits.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a27/random-bits.rkt
deleted file mode 100644
index ee371855ef..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a27/random-bits.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a27
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a28.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a28.rkt
deleted file mode 100644
index 808ec0ac39..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a28.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/28
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a28/basic-format-strings.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a28/basic-format-strings.rkt
deleted file mode 100644
index 20e15b6d4d..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a28/basic-format-strings.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a28
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a29.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a29.rkt
deleted file mode 100644
index 722c157f18..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a29.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/29
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a29/localization.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a29/localization.rkt
deleted file mode 100644
index f2bcf9f2b1..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a29/localization.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a29
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a31.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a31.rkt
deleted file mode 100644
index e59ebae8b8..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a31.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/31
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a31/rec.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a31/rec.rkt
deleted file mode 100644
index 4c80621ad3..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a31/rec.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a31
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a38.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a38.rkt
deleted file mode 100644
index 87fe7fb670..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a38.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/38
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a38/with-shared-structure.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a38/with-shared-structure.rkt
deleted file mode 100644
index 941995798a..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a38/with-shared-structure.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a38
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a39.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a39.rkt
deleted file mode 100644
index c84bcde280..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a39.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/39
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a39/parameters.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a39/parameters.rkt
deleted file mode 100644
index c84fb84eee..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a39/parameters.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a39
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a41.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a41.rkt
deleted file mode 100644
index 9f16815a90..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a41.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/41
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a41/streams.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a41/streams.rkt
deleted file mode 100644
index 5be0dd214f..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a41/streams.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a41
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a42.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a42.rkt
deleted file mode 100644
index 065c647827..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a42.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/42
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a42/eager-comprehensions.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a42/eager-comprehensions.rkt
deleted file mode 100644
index 74e3845f30..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a42/eager-comprehensions.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a42
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a43.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a43.rkt
deleted file mode 100644
index a3e33d7c90..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a43.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/43
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a43/vectors.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a43/vectors.rkt
deleted file mode 100644
index 38418f8517..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a43/vectors.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a43
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a45.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a45.rkt
deleted file mode 100644
index 33d51b7531..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a45.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/45
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a45/lazy.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a45/lazy.rkt
deleted file mode 100644
index 0e02ac8a7c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a45/lazy.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a45
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a48.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a48.rkt
deleted file mode 100644
index 2f5a6e1451..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a48.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/48
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a48/intermediate-format-strings.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a48/intermediate-format-strings.rkt
deleted file mode 100644
index c6c8ea5adc..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a48/intermediate-format-strings.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a48
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a5.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a5.rkt
deleted file mode 100644
index 07cba2445e..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a5.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang s-exp srfi/provider srfi/5
-
-;; FIXME: "rest arguments" need to generate mutable lists
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a5/let.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a5/let.rkt
deleted file mode 100644
index 7b230cdd46..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a5/let.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a5
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a54.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a54.rkt
deleted file mode 100644
index 277bff4134..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a54.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/54
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a54/cat.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a54/cat.rkt
deleted file mode 100644
index d7c3386e5b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a54/cat.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a54
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a57.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a57.rkt
deleted file mode 100644
index bf2b54327c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a57.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/57
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a57/records.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a57/records.rkt
deleted file mode 100644
index 261689f2d4..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a57/records.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a57
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a59.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a59.rkt
deleted file mode 100644
index ca46d252fe..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a59.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/59
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a59/vicinities.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a59/vicinities.rkt
deleted file mode 100644
index ea6c86dbbc..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a59/vicinities.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a59
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a6.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a6.rkt
deleted file mode 100644
index a76fffa789..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a6.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-;; Copyright (c) 2009 Derick Eddington.
-;;
-;; Permission is hereby granted, free of charge, to any person obtaining a
-;; copy of this software and associated documentation files (the "Software"),
-;; to deal in the Software without restriction, including without limitation
-;; the rights to use, copy, modify, merge, publish, distribute, sublicense,
-;; and/or sell copies of the Software, and to permit persons to whom the
-;; Software is furnished to do so, subject to the following conditions:
-
-;; The above copyright notice and this permission notice shall be included in
-;; all copies or substantial portions of the Software.
-
-;; Except as contained in this notice, the name(s) of the above copyright
-;; holders shall not be used in advertising or otherwise to promote the sale,
-;; use or other dealings in this Software without prior written authorization.
-
-;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-;; THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-;; DEALINGS IN THE SOFTWARE.
-
-#!r6rs
-(library (srfi :6)
-  (export
-    (rename (open-string-input-port open-input-string))
-    open-output-string
-    get-output-string)
-  (import
-    (rnrs)
-    (only (scheme base) make-weak-hasheq hash-ref hash-set!))
-  
-  (define accumed-ht (make-weak-hasheq))
-  
-  (define (open-output-string)
-    (letrec ([sop
-              (make-custom-textual-output-port
-               "string-output-port"
-               (lambda (string start count)  ; write!
-                 (when (positive? count)
-                   (let ([al (hash-ref accumed-ht sop)])
-                     (hash-set! accumed-ht sop 
-                       (cons (substring string start (+ start count)) al))))
-                 count)
-               #f  ; get-position  TODO?
-               #f  ; set-position!  TODO?
-               #f  #| closed  TODO? |# )])
-      (hash-set! accumed-ht sop '())
-      sop))
-  
-  (define (get-output-string sop)
-    (if (output-port? sop)
-      (cond [(hash-ref accumed-ht sop #f)
-             => (lambda (al) (apply string-append (reverse al)))]
-            [else
-             (assertion-violation 'get-output-string "not a string-output-port" sop)])
-      (assertion-violation 'get-output-string "not an output-port" sop)))
-
-)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a6/basic-string-ports.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a6/basic-string-ports.rkt
deleted file mode 100644
index 748cbb68af..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a6/basic-string-ports.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a6
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a60.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a60.rkt
deleted file mode 100644
index 87c7c30126..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a60.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/60
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a60/integer-bits.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a60/integer-bits.rkt
deleted file mode 100644
index 4ccb0381b0..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a60/integer-bits.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a60
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a61.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a61.rkt
deleted file mode 100644
index 94d9f02ea1..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a61.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/61
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a61/cond.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a61/cond.rkt
deleted file mode 100644
index 431c771a54..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a61/cond.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a61
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a63.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a63.rkt
deleted file mode 100644
index 57f3441c62..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a63.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/63
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a63/arrays.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a63/arrays.rkt
deleted file mode 100644
index ef6f35dd98..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a63/arrays.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a63
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a64.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a64.rkt
deleted file mode 100644
index 6889818969..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a64.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/64
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a64/testing.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a64/testing.rkt
deleted file mode 100644
index 75a6603295..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a64/testing.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a64
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a66.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a66.rkt
deleted file mode 100644
index 504e580850..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a66.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/66
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a66/octet-vectors.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a66/octet-vectors.rkt
deleted file mode 100644
index d36c965ee0..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a66/octet-vectors.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a66
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a67.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a67.rkt
deleted file mode 100644
index d9a4c529e1..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a67.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#!r6rs
-
-(library (srfi :67)
-  (export  </<=? </<? <=/<=? <=/<? <=? <? =?
-           >/>=? >/>? >=/>=? >=/>? >=? >?
-           boolean-compare chain<=? chain<? chain=? chain>=? chain>?
-           char-compare char-compare-ci
-           compare-by< compare-by<= compare-by=/< compare-by=/> compare-by> 
-           compare-by>= complex-compare cond-compare
-           debug-compare default-compare
-           if-not=? if3 if<=? if<? if=? if>=? if>? integer-compare
-           kth-largest list-compare list-compare-as-vector
-           max-compare min-compare not=? number-compare
-           pair-compare pair-compare-car pair-compare-cdr
-           pairwise-not=? rational-compare real-compare
-           refine-compare select-compare string-compare string-compare-ci 
-           symbol-compare vector-compare vector-compare-as-list)
-  
-  (import (except (rnrs) error)
-          (rnrs r5rs)    ; for modulo
-          (srfi :27 random-bits)  ; for random-integer
-          (srfi :23 error)
-          (scheme include)
-          (only (scheme base) lib))
-
-(include (lib "srfi/67/compare-reference.scm")))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a67/compare-procedures.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a67/compare-procedures.rkt
deleted file mode 100644
index 014534d050..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a67/compare-procedures.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a67
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a69.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a69.rkt
deleted file mode 100644
index 1f2407993b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a69.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/69
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a69/basic-hash-tables.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a69/basic-hash-tables.rkt
deleted file mode 100644
index 21eefa5332..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a69/basic-hash-tables.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a69
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a71.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a71.rkt
deleted file mode 100644
index 1088be13d0..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a71.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/71
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a71/let.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a71/let.rkt
deleted file mode 100644
index 590229445c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a71/let.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a71
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a74.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a74.rkt
deleted file mode 100644
index b983a5d374..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a74.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/74
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a74/blobs.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a74/blobs.rkt
deleted file mode 100644
index a7b868ab0c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a74/blobs.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a74
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a78.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a78.rkt
deleted file mode 100644
index c1e65a916d..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a78.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/78
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a78/lightweight-testing.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a78/lightweight-testing.rkt
deleted file mode 100644
index c90b018287..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a78/lightweight-testing.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a78
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a8.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a8.rkt
deleted file mode 100644
index c81cc00e03..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a8.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#!r6rs
-
-(library (srfi :8)
-  (export receive)
-  (import (rnrs base))
-
-(define-syntax receive
-  (syntax-rules ()
-    ((receive (var ...) ?producer . ?body)
-     (let-values ([(var ...) ?producer]) . ?body))
-    ((receive ?vars ?producer . ?body)
-     (call-with-values (lambda () ?producer) (lambda ?vars . ?body))))))
-
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a8/receive.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a8/receive.rkt
deleted file mode 100644
index 670412617a..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a8/receive.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a8
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a86.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a86.rkt
deleted file mode 100644
index a160057f63..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a86.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/86
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a86/mu-and-nu.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a86/mu-and-nu.rkt
deleted file mode 100644
index c652a63dca..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a86/mu-and-nu.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a86
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a87.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a87.rkt
deleted file mode 100644
index 2412d12182..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a87.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/87
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a87/case.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a87/case.rkt
deleted file mode 100644
index be83a4611b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a87/case.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a87
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a9.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a9.rkt
deleted file mode 100644
index 90bb58c70c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a9.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/9
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a9/records.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a9/records.rkt
deleted file mode 100644
index 571166416e..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a9/records.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a9
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a98.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a98.rkt
deleted file mode 100644
index f494333118..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a98.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scheme/base
-(require srfi/98
-         scheme/mpair)
-
-(provide get-environment-variable
-         (rename-out (mpair:get-environment-variables
-                      get-environment-variables)))
-
-(define (mpair:get-environment-variables)
-  (list->mlist (map (lambda (pair)
-                      (mcons (car pair) (cdr pair)))
-                    (get-environment-variables))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a98/os-environment-variables.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/%3a98/os-environment-variables.rkt
deleted file mode 100644
index 7b142a9d8c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/%3a98/os-environment-variables.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/%3a98
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/11.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/11.rkt
deleted file mode 100644
index fdb915219f..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/11.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-;; The versions from `racket/base' don't support rest args.
-
-#|
-
-Modified to use `syntax-parse' and multiple macros by Sam
-Tobin-Hochstadt, 2011.
-
-The original:
-
-Copyright (C) Lars T Hansen (1999). All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-|#
-
-#lang racket/base
-(require (for-syntax racket/base syntax/parse))
-
-(define-syntax let-values
-  (syntax-parser
-    ((let-values (?binding ...) ?body0 ?body1 ...)
-     #'(let-values/bind (?binding ...) () (begin ?body0 ?body1 ...)))))
-
-(define-syntax let-values/bind
-  (syntax-parser
-    ((let-values/bind () ?tmps ?body)
-     #'(let ?tmps ?body))
-    ((let-values/bind ((?b0 ?e0) ?binding ...) ?tmps ?body)
-     #'(let-values/mktmp ?b0 ?e0 () (?binding ...) ?tmps ?body))))
-
-(define-syntax let-values/mktmp
-  (syntax-parser
-    ((let-values/mktmp () ?e0 ?args ?bindings ?tmps ?body)
-     #'(call-with-values
-           (lambda () ?e0)
-         (lambda ?args
-           (let-values/bind ?bindings ?tmps ?body))))
-
-    ((let-values/mktmp (?a . ?b) ?e0 (?arg ...) ?bindings (?tmp ...) ?body)
-     #'(let-values/mktmp ?b ?e0 (?arg ... x) ?bindings (?tmp ... (?a x)) ?body))
-
-    ((let-values/mktmp ?a ?e0 (?arg ...) ?bindings (?tmp ...) ?body)
-     #'(call-with-values (lambda () ?e0)
-         (lambda (?arg ... . x)
-           (let-values/bind ?bindings (?tmp ... (?a x)) ?body))))))
-
-(define-syntax let*-values
-  (syntax-parser
-    ((let*-values () ?body0 ?body1 ...)
-     #'(begin ?body0 ?body1 ...))
-
-    ((let*-values (?binding0 ?binding1 ...) ?body0 ?body1 ...)
-     #'(let-values (?binding0)
-         (let*-values (?binding1 ...) ?body0 ?body1 ...)))))
-
-(provide let-values let*-values)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/16.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/16.rkt
deleted file mode 100644
index ee7d50cff6..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/16.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-;; Supported by core PLT:
-#lang scheme/base
-(provide case-lambda)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/17.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/17.rkt
deleted file mode 100644
index 50e76c06a3..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/17.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-17
-#lang s-exp srfi/provider srfi/17/set #:unprefix s:
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/17/set.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/17/set.rkt
deleted file mode 100644
index 662c130751..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/17/set.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang racket/base
-
-;; Simple implementation by Eli Barzilay,
-;;   (compatible names to the srfi version.)
-
-(provide s:set! setter set-setter! getter-with-setter)
-
-(require (for-syntax racket/base))
-
-(define setters (make-weak-hasheq)) ; weak => usable for local functions
-
-(define (setter proc)
-  (hash-ref setters proc
-            (lambda () (error 'setter "could not find a setter for ~e" proc))))
-
-(define (set-setter! proc setter)
-  ;; it seems better to throw an error if a setter already exists, but I
-  ;; didn't do that to keep it compatible with the original srfi code.
-  (hash-set! setters proc setter))
-
-(define-syntax (s:set! stx)
-  (syntax-case stx ()
-    [(s:set! (E0 E1 ...) V) #'((setter E0) E1 ... V)]
-    [(s:set! x V) (identifier? #'x) #'(set! x V)]))
-
-(define (getter-with-setter getter setter)
-  ;; I don't see any reason why the sample version returns a wrapped
-  ;; getter function, it seems like it would kill any chance of inlining
-  ;; with any compiler (eg, the resulting arity can be different).  In
-  ;; fact, I don't see any reason for this thing at all...  (Keeping it
-  ;; just to be compatible...)
-  (set-setter! getter setter)
-  getter)
-
-;; Initialize the table
-(for ([x (in-list `([,setter     ,set-setter!]
-                    [,vector-ref ,vector-set!]
-                    [,string-ref ,string-set!]
-                    [,mcar       ,set-mcar!]
-                    [,mcdr       ,set-mcdr!]
-                    [,hash-ref   ,hash-set!]))])
-  (set-setter! (car x) (cadr x)))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/18.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/18.rkt
deleted file mode 100644
index 592b5da94c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/18.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-;; Supported by core PLT:
-#lang scheme/base
-(provide thread)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/2.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/2.rkt
deleted file mode 100644
index e7ddea2dd6..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/2.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-2
-#lang s-exp srfi/provider srfi/2/and-let
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/2/and-let.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/2/and-let.rkt
deleted file mode 100644
index ba68aae08b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/2/and-let.rkt
+++ /dev/null
@@ -1,204 +0,0 @@
-;;;
-;;; <land.rkt> ---- SRFI 2 port to PLT Scheme: LAND*, a generalized AND.
-;;; Time-stamp: <02/04/30 08:05:27 solsona>
-;;;
-;;; Usually, I would add a copyright notice, and the announce that
-;;; this code is under the LGPL licence.  Nevertheless, I only did the
-;;; port to PLT Scheme, the original comment follows:
-
-;                       Checking of a LAND* special form
-;
-; LAND* is a generalized AND: it evaluates a sequence of forms one after another
-; till the first one that yields #f; the non-#f result of a form can be bound
-; to a fresh variable and used in the subsequent forms.
-;
-; When an ordinary AND is formed of _proper_ boolean expressions:
-;       (AND E1 E2 ...)
-; expression E2, if it gets to be evaluated, knows that E1 has returned non-#f.
-; Moreover, E2 knows exactly what the result of E1 was - #t - so E2 can use
-; this knowledge to its advantage. If E1 however is an _extended_
-; boolean expression, E2 can no longer tell which particular non-#f
-; value E1 has returned. Chances are it took a lot of work to evaluate E1,
-; and the produced result (a number, a vector, a string, etc) may be of
-; value to E2. Alas, the AND form merely checks that the result is not an #f,
-; and throws it away. If E2 needs it, it has to recompute the value again.
-; This proposed LAND* special form lets constituent expressions get
-; hold of the results of already evaluated expressions, without re-doing
-; their work.
-;
-; Syntax:
-;       LAND* (CLAWS) BODY
-;
-; where CLAWS is a list of expressions or bindings: 
-;       CLAWS ::= '() | (cons CLAW CLAWS)
-; Every element of the CLAWS list, a CLAW, must be one of the following:
-;       (VARIABLE EXPRESSION)
-; or
-;       (EXPRESSION)
-; or
-;       BOUND-VARIABLE
-; These CLAWS are evaluated in the strict left-to-right order. For each
-; CLAW, the EXPRESSION part is evaluated first (or BOUND-VARIABLE is looked up).
-; If the result is #f, LAND* immediately returns #f, thus disregarding the rest
-; of the CLAWS and the BODY. If the EXPRESSION evaluates to not-#f, and
-; the CLAW is of the form
-;       (VARIABLE EXPRESSION)
-; the EXPRESSION's value is bound to a freshly made VARIABLE. The VARIABLE is
-; available for _the rest_ of the CLAWS, and the BODY. As usual, all
-; VARIABLEs must be unique (like in let*).
-;
-; Thus LAND* is a sort of cross-breed between LET* and AND.
-;
-; Denotation semantics:
-;
-; Eval[ (LAND* (CLAW1 ...) BODY), Env] =
-;       EvalClaw[ CLAW1, Env ] andalso 
-;               Eval[ (LAND* ( ...) BODY), ExtClawEnv[ CLAW1, Env]]
-;
-; Eval[ (LAND* (CLAW) ), Env] = EvalClaw[ CLAW, Env ]
-; Eval[ (LAND* () FORM1 ...), Env] = Eval[ (BEGIN FORM1 ...), Env ]
-; Eval[ (LAND* () ), Env] = #t
-;
-; EvalClaw[ BOUND-VARIABLE, Env ] = Eval[ BOUND-VARIABLE, Env ]
-; EvalClaw[ (EXPRESSION), Env ] = Eval[ EXPRESSION, Env ]
-; EvalClaw[ (VARIABLE EXPRESSION), Env ] = Eval[ EXPRESSION, Env ]
-;
-; ExtClawEnv[ BOUND-VARIABLE, Env ] = Env
-; ExtClawEnv[ (EXPRESSION), Env ] = EnvAfterEval[ EXPRESSION, Env ]
-; ExtClawEnv[ (VARIABLE EXPRESSION), Env ] = 
-;       ExtendEnv[ EnvAfterEval[ EXPRESSION, Env ],
-;                  VARIABLE boundto Eval[ EXPRESSION, Env ]]
-;
-;
-; If one has a Scheme interpreter written in Prolog/ML/Haskell, he can
-; implement the above semantics right away. Within Scheme, it is trivial to
-; code LAND* with R4RS "define-syntax". Alas, Gambit does not have this
-; facility. So this implementation uses macros instead.
-;
-; The following LAND* macro will convert a LAND* expression into a "tree" of
-; AND and LET expressions. For example,
-; (LAND* ((my-list (compute-list)) ((not (null? my-list))))
-;       (do-something my-list))
-; is transformed into
-; (and (let ((my-list (compute-list)))
-;       (and my-list  (not (null? my-list)) (begin (do-something my-list)))))
-;
-; I must admit the LAND* macro is written in a pathetic anti-functional style.
-; To my excuse, the macro's goal is a syntactic transformation of source
-; code, that is, performing a re-writing. IMHO, rewriting kind of suggests
-; mutating.
-;
-; Sample applications:
-;
-; The following piece of code (from my treap package) 
-;   (let ((new-root (node:dispatch-on-key root key ...)))
-;      (if new-root (set! root new-root)))
-; could be elegantly re-written as
-;   (land* ((new-root (node:dispatch-on-key root key ...)))
-;               (set! root new-root))
-;
-; A very common application of land* is looking up a value
-; associated with a given key in an assoc list, returning #f in case of a
-; look-up failure:
-;
-;               ; Standard implementation
-; (define (look-up key alist)
-;   (let ((found-assoc (assq key alist)))
-;       (and found-assoc (cdr found-assoc))))
-;
-;               ; A more elegant solution
-; (define (look-up key alist)
-;   (cdr (or (assq key alist) '(#f . #f))))
-;
-;               ; An implementation which is just as graceful as the latter
-;               ; and just as efficient as the former:
-; (define (look-up key alist)
-;   (land* ((x (assq key alist))) (cdr x)))
-;
-; Generalized cond:
-;
-; (or
-;   (land* (bindings-cond1) body1)
-;   (land* (bindings-cond2) body2)
-;   (begin else-clause))
-;
-; Unlike => (cond's send), LAND* applies beyond cond. LAND* can also be used
-; to generalize cond, as => is limited to sending of only a single value;
-; LAND* allows as many bindings as necessary (which are performed in sequence)
-;
-; (or
-;  (land* ((c (read-char)) ((not (eof-object? c))))
-;       (string-set! some-str i c) (++! i))
-;  (begin (do-process-eof)))
-;
-; Another concept LAND* is reminiscent of is programming with guards:
-; a LAND* form can be considered a sequence of _guarded_ expressions.
-; In a regular program, forms may produce results, bind them to variables
-; and let other forms use these results. LAND* differs in that it checks
-; to make sure that every produced result "makes sense" (that is, not an #f).
-; The first "failure" triggers the guard and aborts the rest of the
-; sequence (which presumably would not make any sense to execute anyway).
-;
-; $Id: and-let.rkt,v 1.1 2003/02/25 01:49:25 solsona Exp $
-
-;;; See: http://srfi.schemers.org for more information on SRFIs.
-
-(module and-let mzscheme
-  (provide and-let*)
-
-  ;; Boy, I thought porting Surfies was "easy" :-) The following
-  ;; and-let* macro does not follow the SRFI-2 description, nor the
-  ;; implementation.  I felt like translating Aramaic into Scheme.
-  ;; 
-  ;; This should be very close to what SRFI-2 defines, though. Or so I hope. 
-  
-  (define-syntax (and-let* stx)
-    (syntax-case stx ()
-      
-      ;; FIXME: empty body (returns #t like AND), is this the intended
-      ;; behavior?
-      [(_ ()) (syntax #t)]
-
-      ;; (and-let* ((x y)))
-      [(_ ((id val)))
-       (unless (identifier? (syntax id))
-               (raise-syntax-error #f "expected an identifier" stx (syntax id)))
-       (syntax val)]
-
-      ;; (and-let* ((x y)) body)
-      [(_ ((id val) more ...) . body)
-       (unless (identifier? (syntax id))
-         (raise-syntax-error #f "expected an identifier" stx (syntax id)))
-       (syntax (let ((id val))
-                 (if id
-                     (and-let* (more ...) . body)
-                     #f)))]
-      
-      [(_ ((exp))) (syntax exp)]
-      
-      [(_ ((exp)) . body)
-       (syntax (if exp (begin . body) #f))]
-
-      [(_ (exp)) (syntax exp)]
-
-      [(_ (exp) . body)
-       (syntax (if exp
-                   (begin . body)
-                   #f))]
-
-      [(_ ((exp) more ...) . body)
-       (syntax (if exp
-                   (and-let* (more ...) . body)
-                   #f))]
-
-      [(_ (exp more ...) . body)
-       (syntax (if exp
-                   (and-let* (more ...) . body)
-                   #f))]
-      
-      [(_ () . body) (syntax (begin . body))]
-      ))
-
-  )
-
-;;; land.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/23.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/23.rkt
deleted file mode 100644
index 008edf77bf..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/23.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-;; Supported by core PLT:
-#lang scheme/base
-(provide error)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/25.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/25.rkt
deleted file mode 100644
index 5e70c5c83b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/25.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-25
-#lang s-exp srfi/provider srfi/25/array
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/25/arlib.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/25/arlib.scm
deleted file mode 100644
index afe56eaf16..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/25/arlib.scm
+++ /dev/null
@@ -1,542 +0,0 @@
-;; Array library: high level implementation of useful array procedures.
-
-;;; array arlib
-
-;;; 2001 Jussi Piitulainen
-
-;;; This is a high level implementation of some generally useful
-;;; array procedures. In addition to R5RS and SRFI-25, only one
-;;; tool is used, namely array:apply-to-vector and friends. Thus
-;;; this library serves to prove that the primitives really are
-;;; primitives. - A lower level implementation would access some
-;;; implementation details to bypass redundant checking and such.
-
-;;; Note that these procedures are not necessarily designed with
-;;; full care. Think of them as examples of what can be done.
-;;; Important tools are also missing, including scans and reduces
-;;; and many thinks that I have not even heard of yet.
-
-;;; (array-shape arr) (array-length arr dim) (array-size arr)
-;;; (array-equal? arr1 arr2)
-;;; (shape-for-each shp proc [ind])
-;;; (array-for-each-index arr proc [ind])
-;;; (tabulate-array shp proc) (tabulate-array! shp proc ind)
-;;; (array-retabulate! arr shp proc [ind])
-;;; (array-map [shp] proc arr0 arr1 ...)
-;;; (array-map! arr [shp] proc arr0 arr1 ...)
-;;; (array->vector arr) (array->list arr)
-;;; (share-array/prefix arr k ...) (share-row arr k) (share-column arr k)
-;;; (share-array/origin arr k ...) (share-array/origin arr ind)
-;;; (array-append dim arr0 arr1 ...)
-;;; (transpose arr dim ...)
-;;; (share-nths arr dim n)
-
-;;; Naming problem: should all those index-object using procedures
-;;; bang? The main argument, like shape, is not mutated.
-
-;;; (array-shape arr)
-
-(define (array-shape arr)
-  (let ((r (array-rank arr)))
-    (let ((m (make-array (shape 0 r 0 2))))
-      (do ((d 0 (+ d 1)))
-	  ((= d r)
-	   m)
-	(array-set! m d 0 (array-start arr d))
-	(array-set! m d 1 (array-end arr d))))))
-
-;;; (array-length arr dim)
-
-(define (array-length arr dim)
-  (- (array-end arr dim)
-     (array-start arr dim)))
-
-;;; (array-size arr)
-
-(define (array-size arr)
-  (let ((r (array-rank arr)))
-    (do ((k 0 (+ k 1))
-	 (p 1 (* p (array-length arr k))))
-	((= k r) p))))
-
-;;; (array-equal? a b)
-;;; compares elements with equal? so elements better not contain
-;;; arrays.
-
-(define (array-equal? a b)
-  (let ((r (array-rank a)))
-    (and (= r (array-rank b))
-	 (and (do ((k 0 (+ k 1))
-		   (true #t (and true
-				 (= (array-start a k)
-				    (array-start b k))
-				 (= (array-end a k)
-				    (array-end b k)))))
-		  ((= k r) true))
-	      (let ((ks (make-vector r 0)))
-		(let wok ((d 0))
-		  (if (< d r)
-		      (let ((e (array-end a d)))
-			(do ((k (array-start a d) (+ k 1))
-			     (true #t (and true (wok (+ d 1)))))
-			    ((= k e) true)
-			  (vector-set! ks d k)))
-		      (equal? (array-ref a ks)
-			      (array-ref b ks)))))))))
-
-;;; (shape-for-each shp proc [index-object])
-;;; passes each index in shape to proc in row-major ordered, using
-;;; index-object if provided.
-
-(define (shape-for-each shp proc . o)
-  (if (null? o)
-      (array:arlib:shape-for-each/arguments shp proc)
-      (if (vector? (car o))
-	  (array:arlib:shape-for-each/vector shp proc (car o))
-	  (array:arlib:shape-for-each/array shp proc (car o)))))
-
-(define (array:arlib:shape-for-each/arguments shp proc)
-  (let ((r (array-end shp 0)))
-    (let ((vec (make-vector r)))
-      (let do-dim ((d 0))
-	(if (= d r)
-	    (array:apply-to-vector r proc vec)
-	    (let ((e (array-ref shp d 1)))
-	      (do ((k (array-ref shp d 0) (+ k 1)))
-		  ((= k e))
-		(vector-set! vec d k)
-		(do-dim (+ d 1)))))))))
-
-(define (array:arlib:shape-for-each/vector shp proc vec)
-  (let ((r (array-end shp 0)))
-    (let do-dim ((d 0))
-      (if (= d r)
-	  (proc vec)
-	  (let ((e (array-ref shp d 1)))
-	    (do ((k (array-ref shp d 0) (+ k 1)))
-		((= k e))
-	      (vector-set! vec d k)
-	      (do-dim (+ d 1))))))))
-
-(define (array:arlib:shape-for-each/array shp proc arr)
-  ;; arr is not vector
-  (let ((r (array-end shp 0)))
-    (let do-dim ((d 0))
-      (if (= d r)
-	  (proc arr)
-	  (let ((e (array-ref shp d 1)))
-	    (do ((k (array-ref shp d 0) (+ k 1)))
-		((= k e))
-	      (array-set! arr d k)
-	      (do-dim (+ d 1))))))))
-
-;;; (array-for-each-index arr proc [ind])
-;;; is equivalent to
-;;;
-;;;   (shape-for-each-index (array-shape arr) proc [ind])
-;;;
-;;; but is implemented without allocation of the shape, to prove
-;;; that it can be so implemented.
-
-(define (array-for-each-index arr proc . o)
-  (if (null? o)
-      (array:arlib:array-for-each-index/arguments arr proc)
-      (if (vector? (car o))
-	  (array:arlib:array-for-each-index/vector arr proc (car o))
-	  (array:arlib:array-for-each-index/array arr proc (car o)))))
-
-(define (array:arlib:array-for-each-index/arguments arr proc)
-  (let ((r (array-rank arr)))
-    (let ((vec (make-vector r))
-	  (apply (array:applier-to-vector r)))
-      (let do-dim ((d 0))
-	(if (= d r)
-	    (apply proc vec)
-	    (let ((e (array-end arr d)))
-	      (do ((k (array-start arr d) (+ k 1)))
-		  ((= k e))
-		(vector-set! vec d k)
-		(do-dim (+ d 1)))))))))
-
-(define (array:arlib:array-for-each-index/vector arr proc ind)
-  ;; ind is a vector
-  (let ((r (array-rank arr)))
-    (let do-dim ((d 0))
-      (if (= d r)
-	  (proc ind)
-	  (let ((e (array-end arr d)))
-	    (do ((k (array-start arr d) (+ k 1)))
-		((= k e))
-	      (vector-set! ind d k)
-	      (do-dim (+ d 1))))))))
-
-(define (array:arlib:array-for-each-index/array arr proc ind)
-  ;; ind is an array but not a vector
-  (let ((r (array-rank arr)))
-    (let do-dim ((d 0))
-      (if (= d r)
-	  (proc ind)
-	  (let ((e (array-end arr d)))
-	    (do ((k (array-start arr d) (+ k 1)))
-		((= k e))
-	      (array-set! ind d k)
-	      (do-dim (+ d 1))))))))
-
-;;; (tabulate-array shp proc)
-;;; (tabulate-array! shp proc ind)
-;;; returns a newly allocated array of the given shape with initial
-;;; contents at each index whatever proc returns given the indices.
-;;; The latter procedure reuses ind for package of indices.
-
-(define (tabulate-array shp proc)
-  (let ((arr (make-array shp)))
-    (array:arlib:shape-for-each/vector
-     shp
-     (let ((apply (array:applier-to-vector (array-end shp 0))))
-       (lambda (ix) (array-set! arr ix (apply proc ix))))
-     (make-vector (array-end shp 0)))
-    arr))
-
-(define (tabulate-array! shp proc ind)
-  (let ((arr (make-array shp)))
-    (if (vector? ind)
-	(array:arlib:shape-for-each/vector
-	 shp
-	 (lambda (ix) (array-set! arr ix (proc ix)))
-	 ind)
-	(array:arlib:shape-for-each/array
-	 shp
-	 (lambda (ix) (array-set! arr ix (proc ix)))
-	 ind))
-    arr))
-
-;;; (array-retabulate! arr shp proc [index-object])
-;;; sets the elements of arr in shape to the value of proc at that
-;;; index, using index-object if provided.
-
-(define (array-retabulate! arr shp proc . o)
-  (if (null? o)
-      (array:arlib:shape-for-each/vector
-       shp
-       (let ((apply (array:applier-to-vector (array-end shp 0))))
-	 (lambda (ix)
-	   (array-set! arr ix (apply proc ix))))
-       (make-vector (array-end shp 0)))
-      (if (vector? (car o))
-	  (array:arlib:shape-for-each/vector
-	   shp
-	   (lambda (ix)
-	     (array-set! arr ix (proc ix)))
-	   (car o))
-	  (array:arlib:shape-for-each/array
-	   shp
-	   (lambda (ix)
-	     (array-set! arr ix (proc ix)))
-	   (car o)))))
-
-;;; (array-map! array [shape] proc array0 array1...)
-;;; stores to the elements of array (in shape) the values of proc at
-;;; the contents of arrayk at corresponding index.
-
-(define (array-map! arr x y . o)
-  (if (array:array? x)
-      (array:arlib:map! arr x y (apply vector o))
-      (array:arlib:map! arr (array-shape arr) x (apply vector y o))))
-
-(define (array:arlib:map! arr shp proc args)
-  (let ((rank (vector-length args)))
-    (let ((argv (make-vector rank)))
-      (array:arlib:shape-for-each/vector
-       shp
-       (let ((apply (array:applier-to-vector rank)))
-	 (lambda (ix)
-	   (do ((k 0 (+ k 1)))
-	       ((= k rank))
-	     (vector-set! argv k (array-ref (vector-ref args k) ix)))
-	   (array-set! arr ix (apply proc argv))))
-       (make-vector (array-end shp 0))))))
-
-;;; (array-map [shape] proc array0 array1 ...)
-;;; creates a new array with elements initialized to the values of
-;;; proc at contents of arrayk (in shape).
-
-(define (array-map x y . o)
-  (if (array:array? x)
-      (let ((arr (make-array x)))
-	(array:arlib:map! arr x y (apply vector o))
-	arr)
-      (let ((shp (array-shape y)))
-	(let ((arr (make-array shp)))
-	  (array:arlib:map! arr shp x (apply vector y o))
-	  arr))))
-
-;;; SRFI-25 mailing list requested array->vector; they also requested the
-;;; ability to use an array as an index of an element, and array->list is
-;;; an attempt to provide for that.
-
-(define (array->vector arr)
-  (let ((vec (make-vector (array-size arr))))
-    (let ((k 0))
-      (shape-for-each
-       (array-shape arr)
-       (lambda (index)
-	 (vector-set! vec k (array-ref arr index))
-	 (set! k (+ k 1)))
-       (make-vector (array-rank arr)))
-      vec)))
-
-;;; It needs to be said that more efficient implementations are
-;;; possible, even within SRFI-25.
-
-(define (array->list arr)
-  (vector->list (array->vector arr)))
-
-;;; (share-row arr k)
-;;; shares whatever the first index is about.
-;;; The result has one dimension less.
-
-(define (share-row arr k)
-  (share-array
-   arr
-   (let ((bounds (array->list (array-shape arr))))
-     (apply shape (cddr bounds)))
-   (lambda ks
-     (apply values k ks))))
-
-;;; (share-array/prefix arr k ...)
-
-(define (share-array/prefix arr . js)
-  (if (or (null? js)
-	  (integer? (car js)))
-      (share-array
-       arr
-       (let ((bounds (array->list (array-shape arr))))
-	 (apply shape (list-tail bounds (* 2 (length js)))))
-       (lambda ks
-	 (apply values (append js ks))))
-      (apply (lambda (fix)
-	       (share-array/prefix!
-		arr
-		fix
-		(make-vector (- (array-rank arr)
-				(if (vector? fix)
-				    (vector-length fix)
-				    (array-end fix 0))))))
-	     js)))
-
-(define (share-array/prefix! arr fix in . out)
-  (let* ((out (if (pair? out)
-		  ((lambda (out) out) out)
-		  (make-vector (array-rank arr))))
-	 (fix-ref (if (vector? fix) vector-ref array-ref))
-	 (in-ref (if (vector? in) vector-ref array-ref))
-	 (out-set! (if (vector? out) vector-set! array-set!))
-	 (m (if (vector? fix)
-		(vector-length fix)
-		(array-end fix 0)))
-	 (n (if (vector? out)
-		(vector-length out)
-		(array-end out 0))))
-    (do ((k 0 (+ k 1)))
-	((= k m))
-      (out-set! out k (fix-ref fix k)))
-    (share-array/index!
-     arr
-     (let ((bounds (array->list (array-shape arr))))
-       (apply shape (list-tail bounds (if (vector? fix)
-					  (* 2 (vector-length fix))
-					  (* 2 (array-end fix 0))))))
-     (lambda (in)
-       (do ((k m (+ k 1)))
-	   ((= k n))
-	 (out-set! out k (in-ref in (- k m))))
-       out)
-     in)))
-
-;;; (share-column arr k)
-;;; shares whatever the second index is about.
-;;; The result has one dimension less.
-
-(define (share-column arr k)
-  (share-array
-   arr
-   (let ((bounds (array->list (array-shape arr))))
-     (apply shape
-	    (car bounds) (cadr bounds)
-	    (cddddr bounds)))
-   (lambda ks
-     (apply values (car ks) k (cdr ks)))))
-
-;;; (share-array/origin arr k ...)
-;;; (share-array/origin arr index)
-;;; change origin to k ..., with index a vector or zero-based
-;;; one-dimensional array that contains k ...
-;;;
-;;; This is useful for writing array-append. Maybe for something
-;;; else too - who knows.
-
-(define (share-array/origin arr . xs)
-  (let ((new (if (or (null? xs)
-		     (integer? (car xs)))
-		 xs
-		 (apply (lambda (x)
-			  (if (vector? x)
-			      (vector->list x)
-			      (if (array? x)
-				  (array->list x)
-				  (error "share-array/origin: bad thing"))))
-			xs))))
-    (do ((k (array-rank arr) (- k 1))
-	 (old '() (cons (array-start arr (- k 1)) old)))
-	((= k 0)
-	 (let ((ds (map - new old)))
-	   (share-array
-	    arr
-	    (tabulate-array
-	     (shape 0 (array-rank arr) 0 2)
-	     (lambda (r k)
-	       (case k
-		 ((0) (+ (array-start arr r) (list-ref ds r)))
-		 ((1) (+ (array-end arr r) (list-ref ds r))))))
-	    (lambda ks
-	      (apply values (map - ks ds)))))))))
-
-;;; SRFI-25 mailing list requested making shapes their own type. Here's
-;;; an example of how manipulating shapes as arrays can be useful. The
-;;; example also tests that higher level libraries are indeed easy to
-;;; write on top of this SRFI.
-
-;;; (array-append arr1 arr2 dim)
-;;; appends two arrays along a specified dimension. The arrays must
-;;; have equally many dimensions and all other dimensions equally long.
-;;;
-;;; Generalize to more arrays and maybe rewrite with shape-for-each or
-;;; what have you.
-
-(define (array-append dim arr . ars)
-  (let* ((total (do ((m (array-length arr dim)
-			(+ m (array-length (car r) dim)))
-		     (r ars (cdr r)))
-		    ((null? r) m)))
-	 (common (array-shape arr))
-	 (origin (array->vector (share-column common 0)))
-	 (index (make-vector (array-rank arr))))
-    (array-set! common dim 1 (+ (array-start arr dim) total))
-    (let ((result (make-array common)))
-      (array-set! common dim 1 (array-start arr dim))
-      (let wok ((arr arr)
-		(ars ars))
-	(vector-set! origin dim (array-ref common dim 1))
-	(let ((arr1 (share-array/origin arr origin)))
-	  (array-set! common dim 0 (array-start arr1 dim))
-	  (array-set! common dim 1 (array-end arr1 dim))
-	  (shape-for-each
-	   common
-	   (lambda (index)
-	     (array-set! result index (array-ref arr1 index)))
-	   index))
-	(if (pair? ars)
-	    (wok (car ars) (cdr ars))))
-      result)))
-
-;;; Transpose, as permutation of dimensions, is applicable to all
-;;; arrays. The default is reversal.
-
-;;; The implementation uses multiplication by permutation
-;;; matrix but matrix multiplication is not exported.
-
-(define (array:arlib:matrix-times a b)
-  (or (and (= (array-rank a) 2)
-	   (= (array-rank b) 2))
-      (error "times: arrays are not matrices"))
-  (let ((r0 (array-start a 0))  (rn (array-end a 0))
-	(t0 (array-start a 1))  (tn (array-end a 1))
-	(u0 (array-start b 0))  (un (array-end b 0)) 
-	(k0 (array-start b 1))  (kn (array-end b 1)))
-    (or (= (- tn t0) (- un u0))
-	(error "times: matrices are not compatible"))
-    (let ((ab (make-array (shape r0 rn k0 kn))))
-      (do ((r r0 (+ r 1)))
-	  ((= r rn))
-	(do ((k k0 (+ k 1)))
-	    ((= k kn))
-	  (do ((t t0 (+ t 1))
-	       (u u0 (+ u 1))
-	       (s 0 (+ s (* (array-ref a r t)
-			    (array-ref b u k)))))
-	      ((and (= t tn)
-		    (= u un))
-	       (array-set! ab r k s)))))
-      ab)))
-
-; This is a generalized transpose. It can permute the dimensions any which 
-; way. The permutation is provided by a permutation matrix: a square matrix
-; of zeros and ones, with exactly one one in each row and column, or a
-; permutation of the rows of an identity matrix; the size of the matrix
-; must match the number of dimensions of the array.
-;
-; The default permutation is [ 0 1 | 1 0 ] of course, but any permutation
-; array can be specified, and the shape array of the original array is then
-; multiplied with it, and index column vectors of the new array with its
-; inverse, from left, to permute the rows appropriately.
-
-(define (array:arlib:permutation-matrix . ds)
-  (let* ((n (length ds))
-	 (arr (make-array (shape 0 n 0 n) 0)))
-    (do ((k 0 (+ k 1))
-	 (ds ds (cdr ds)))
-	((= k n))
-      (array-set! arr k (car ds) 1))
-    arr))
-
-;;; (transpose arr k ...)
-;;; shares arr with permuted dimensions. Each dimension from 0
-;;; inclusive to rank exclusive must appear once in k ...
-
-(define (transpose a . p0)
-  (let* ((r (array-rank a))
-	 (permutation (apply array:arlib:permutation-matrix
-			     (if (pair? p0)
-				 p0
-				 (do ((ds '() (cons d ds))
-				      (d 0 (+ d 1)))
-				     ((= d r)
-				      ;; reverse dimensions
-				      ds)))))
-	 (inverse-permutation (share-array permutation
-					   (array-shape permutation)
-					   (lambda (r k)
-					     ;; transpose
-					     (values k r)))))
-    (share-array
-     a
-     (array:arlib:matrix-times permutation (array-shape a))
-     (lambda ks0
-       (apply values
-	      (array->list
-	       (array:arlib:matrix-times
-		inverse-permutation
-		(apply array (shape 0 r 0 1) ks0))))))))
-
-;;; (share-array/index! array subshape proc index)
-
-(define (share-array/index! array subshape proc index)
-  (array:share/index! array subshape proc index))
-
-;;; Take every nth slice along dimension d into a shared array. This
-;;; preserves the origin.
-
-(define (share-nths arr d n)
-  (let* ((bounds (array->vector (array-shape arr)))
-	 (b (vector-ref bounds (* 2 d)))
-	 (e (vector-ref bounds (+ (* 2 d) 1))))
-    (vector-set! bounds (+ (* 2 d) 1) (+ b (quotient (+ n (- e b 1)) n)))
-    (share-array
-     arr
-     (apply shape (vector->list bounds))
-     (lambda ks
-       (apply values
-	      (let d/nk ((u 0) (ks ks))
-		(if (= u d)
-		    (cons (+ b (* n (- (car ks) b))) (cdr ks))
-		    (cons (car ks) (d/nk (+ u 1) (cdr ks))))))))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/25/array.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/25/array.rkt
deleted file mode 100644
index 4b2f47fa21..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/25/array.rkt
+++ /dev/null
@@ -1,675 +0,0 @@
-;; SRFI-25: Array implementation
-;;; 1997 - 2001 Jussi Piitulainen
-
-;;; --- Intro ---
-
-;;; This interface to arrays is based on Alan Bawden's array.scm of
-;;; 1993 (earlier version in the Internet Repository and another
-;;; version in SLIB). This is a complete rewrite, to be consistent
-;;; with the rest of Scheme and to make arrays independent of lists.
-
-;;; Some modifications are due to discussion in srfi-25 mailing list.
-
-;;; (array? obj)
-;;; (make-array shape [obj])             changed arguments
-;;; (shape bound ...)                    new
-;;; (array shape obj ...)                new
-;;; (array-rank array)                   changed name back
-;;; (array-start array dimension)        new
-;;; (array-end array dimension)          new
-;;; (array-ref array k ...)
-;;; (array-ref array index)              new variant
-;;; (array-set! array k ... obj)         changed argument order
-;;; (array-set! array index obj)         new variant
-;;; (share-array array shape proc)       changed arguments
-
-;;; All other variables in this file have names in "array:".
-
-;;; Should there be a way to make arrays with initial values mapped
-;;; from indices? Sure. The current "initial object" is lame.
-;;;
-;;; Removed (array-shape array) from here. There is a new version
-;;; in arlib though.
-
-;;; --- Representation type dependencies ---
-
-;;; The mapping from array indices to the index to the underlying vector
-;;; is whatever array:optimize returns. The file "opt" provides three
-;;; representations:
-;;; 
-;;; mbda) mapping is a procedure that allows an optional argument
-;;; tter) mapping is two procedures that takes exactly the indices
-;;; ctor) mapping is a vector of a constant term and coefficients
-;;;
-;;; Choose one in "opt" to make the optimizer. Then choose the matching
-;;; implementation of array-ref and array-set!.
-;;;
-;;; These should be made macros to inline them. Or have a good compiler
-;;; and plant the package as a module.
-
-;;; 1. Pick an optimizer.
-;;; 2. Pick matching index representation.
-;;; 3. Pick a record implementation; as-procedure is generic; syntax inlines.
-;;; 3. This file is otherwise portable.
-
-;;; --- Portable R5RS (R4RS and multiple values) ---
-
-
-(module array mzscheme
-  (require srfi/9;; record-types
-	   )
-  (provide array? make-array shape array array-rank
-	   array-start array-end array-ref array-set! share-array
-	   ;; FIXME: should we export all these?
-	   ;; Array library: high level implementation of useful procedures
-	   array-shape array-length array-size array-equal?
-	   shape-for-each array-for-each-index
-	   tabulate-array array-retabulate! array-map array-map!
-	   array->vector share-array/prefix share-array/origin
-	   array-append transpose share-nths)
-  ;; As defined in as-srfi-9-record.scm in the reference implementation:
-  (define-record-type
-    array:srfi-9-record-type-descriptor
-    (array:make vec ind shp)
-    array:array?
-    (vec array:vector)
-    (ind array:index)
-    (shp array:shape))
-
-  ;; Using SRFI-25 ctor based index representation
-  (require mzlib/include)
-  (include "ix-ctor.scm")
-  (include "op-ctor.scm")
-
-;;; --- Portable R5RS (R4RS and multiple values) ---
-
-;;; (array? obj)
-;;; returns #t if `obj' is an array and #t or #f otherwise.
-
-  (define (array? obj)
-    (array:array? obj))
-
-;;; (make-array shape)
-;;; (make-array shape obj)
-;;; makes array of `shape' with each cell containing `obj' initially.
-
-  (define (make-array shape . rest)
-    (or (array:good-shape? shape)
-	(error "make-array: shape is not a shape"))
-    (apply array:make-array shape rest))
-
-  (define (array:make-array shape . rest)
-    (let ((size (array:size shape)))
-      (array:make
-       (if (pair? rest)
-	   (apply (lambda (o) (make-vector size o)) rest)
-	   (make-vector size))
-       (if (= size 0)
-	   (array:optimize-empty
-	    (vector-ref (array:shape shape) 1))
-	   (array:optimize
-	    (array:make-index shape)
-	    (vector-ref (array:shape shape) 1)))
-       (array:shape->vector shape))))
-
-;;; (shape bound ...)
-;;; makes a shape. Bounds must be an even number of exact, pairwise
-;;; non-decreasing integers. Note that any such array can be a shape.
-
-  (define (shape . bounds)
-    (let ((v (list->vector bounds)))
-      (or (even? (vector-length v))
-	  (error (string-append "shape: uneven number of bounds: "
-				(array:list->string bounds))))
-      (let ((shp (array:make
-		  v
-		  (if (pair? bounds)
-		      (array:shape-index)
-		      (array:empty-shape-index))
-		  (vector 0 (quotient (vector-length v) 2)
-			  0 2))))
-	(or (array:good-shape? shp)
-	    (error (string-append "shape: bounds are not pairwise "
-				  "non-decreasing exact integers: "
-				  (array:list->string bounds))))
-	shp)))
-
-;;; (array shape obj ...)
-;;; is analogous to `vector'.
-
-  (define (array shape . elts)
-    (or (array:good-shape? shape)
-	(error (string-append "array: shape " (array:thing->string shape)
-			      " is not a shape")))
-    (let ((size (array:size shape)))
-      (let ((vector (list->vector elts)))
-	(or (= (vector-length vector) size)
-	    (error (string-append "array: an array of shape "
-				  (array:shape-vector->string
-				   (array:vector shape))
-				  " has "
-				  (number->string size)
-				  " elements but got "
-				  (number->string (vector-length vector))
-				  " values: "
-				  (array:list->string elts))))
-	(array:make
-	 vector
-	 (if (= size 0)
-	     (array:optimize-empty
-	      (vector-ref (array:shape shape) 1))
-	     (array:optimize
-	      (array:make-index shape)
-	      (vector-ref (array:shape shape) 1)))
-	 (array:shape->vector shape)))))
-
-;;; (array-rank array)
-;;; returns the number of dimensions of `array'.
-
-  (define (array-rank array)
-    (quotient (vector-length (array:shape array)) 2))
-
-;;; (array-start array k)
-;;; returns the lower bound index of array along dimension k. This is
-;;; the least valid index along that dimension if the dimension is not
-;;; empty.
-
-  (define (array-start array d)
-    (vector-ref (array:shape array) (+ d d)))
-
-;;; (array-end array k)
-;;; returns the upper bound index of array along dimension k. This is
-;;; not a valid index. If the dimension is empty, this is the same as
-;;; the lower bound along it.
-
-  (define (array-end array d)
-    (vector-ref (array:shape array) (+ d d 1)))
-
-;;; (share-array array shape proc)
-;;; makes an array that shares elements of `array' at shape `shape'.
-;;; The arguments to `proc' are indices of the result.  The values of
-;;; `proc' are indices of `array'.
-
-;;; Todo: in the error message, should recognise the mapping and show it.
-
-  (define (share-array array subshape f)
-    (or (array:good-shape? subshape)
-	(error (string-append "share-array: shape "
-			      (array:thing->string subshape)
-			      " is not a shape")))
-    (let ((subsize (array:size subshape)))
-      (or (array:good-share? subshape subsize f (array:shape array))
-	  (error (string-append "share-array: subshape "
-				(array:shape-vector->string
-				 (array:vector subshape))
-				" does not map into supershape "
-				(array:shape-vector->string
-				 (array:shape array))
-				" under mapping "
-				(array:map->string
-				 f
-				 (vector-ref (array:shape subshape) 1)))))    
-      (let ((g (array:index array)))
-	(array:make
-	 (array:vector array)
-	 (if (= subsize 0)
-	     (array:optimize-empty
-	      (vector-ref (array:shape subshape) 1))
-	     (array:optimize
-	      (lambda ks
-		(call-with-values
-		 (lambda () (apply f ks))
-		 (lambda ks (array:vector-index g ks))))
-	      (vector-ref (array:shape subshape) 1)))
-	 (array:shape->vector subshape)))))
-
-;;; --- Hrmph ---
-
-;;; (array:share/index! ...)
-;;; reuses a user supplied index object when recognising the
-;;; mapping. The mind balks at the very nasty side effect that
-;;; exposes the implementation. So this is not in the spec.
-;;; But letting index objects in at all creates a pressure
-;;; to go the whole hog. Arf.
-
-;;; Use array:optimize-empty for an empty array to get a
-;;; clearly invalid vector index.
-
-;;; Surely it's perverse to use an actor for index here? But
-;;; the possibility is provided for completeness.
-
-  (define (array:share/index! array subshape proc index)
-    (array:make
-     (array:vector array)
-     (if (= (array:size subshape) 0)
-	 (array:optimize-empty
-	  (quotient (vector-length (array:shape array)) 2))
-	 ((if (vector? index)
-	      array:optimize/vector
-	      array:optimize/actor)
-	  (lambda (subindex)
-	    (let ((superindex (proc subindex)))
-	      (if (vector? superindex)
-		  (array:index/vector
-		   (quotient (vector-length (array:shape array)) 2)
-		   (array:index array)
-		   superindex)
-		  (array:index/array
-		   (quotient (vector-length (array:shape array)) 2)
-		   (array:index array)
-		   (array:vector superindex)
-		   (array:index superindex)))))
-	  index))
-     (array:shape->vector subshape)))
-
-  (define (array:optimize/vector f v)
-    (let ((r (vector-length v)))
-      (do ((k 0 (+ k 1)))
-	  ((= k r))
-	(vector-set! v k 0))
-      (let ((n0 (f v))
-	    (cs (make-vector (+ r 1)))
-	    (apply (array:applier-to-vector (+ r 1))))
-	(vector-set! cs 0 n0)
-	(let wok ((k 0))
-	  (if (< k r)
-	      (let ((k1 (+ k 1)))
-		(vector-set! v k 1)
-		(let ((nk (- (f v) n0)))
-		  (vector-set! v k 0)
-		  (vector-set! cs k1 nk)
-		  (wok k1)))))
-	(apply (array:maker r) cs))))
-
-  (define (array:optimize/actor f a)
-    (let ((r (array-end a 0))
-	  (v (array:vector a))
-	  (i (array:index a)))
-      (do ((k 0 (+ k 1)))
-	  ((= k r))
-	(vector-set! v (array:actor-index i k) 0))
-      (let ((n0 (f a))
-	    (cs (make-vector (+ r 1)))
-	    (apply (array:applier-to-vector (+ r 1))))
-	(vector-set! cs 0 n0)
-	(let wok ((k 0))
-	  (if (< k r)
-	      (let ((k1 (+ k 1))
-		    (t (array:actor-index i k)))
-		(vector-set! v t 1)
-		(let ((nk (- (f a) n0)))
-		  (vector-set! v t 0)
-		  (vector-set! cs k1 nk)
-		  (wok k1)))))
-	(apply (array:maker r) cs))))
-
-;;; --- Internals ---
-
-  (define (array:shape->vector shape)
-    (let ((idx (array:index shape))
-	  (shv (array:vector shape))
-	  (rnk (vector-ref (array:shape shape) 1)))
-      (let ((vec (make-vector (* rnk 2))))
-	(do ((k 0 (+ k 1)))
-	    ((= k rnk)
-	     vec)
-	  (vector-set! vec (+ k k)
-		       (vector-ref shv (array:shape-vector-index idx k 0)))
-	  (vector-set! vec (+ k k 1)
-		       (vector-ref shv (array:shape-vector-index idx k 1)))))))
-
-;;; (array:size shape)
-;;; returns the number of elements in arrays of shape `shape'.
-
-  (define (array:size shape)
-    (let ((idx (array:index shape))
-	  (shv (array:vector shape))
-	  (rnk (vector-ref (array:shape shape) 1)))
-      (do   ((k 0 (+ k 1))
-	     (s 1 (* s
-		     (- (vector-ref shv (array:shape-vector-index idx k 1))
-			(vector-ref shv (array:shape-vector-index idx k 0))))))
-	  ((= k rnk) s))))
-
-;;; (array:make-index shape)
-;;; returns an index function for arrays of shape `shape'. This is a
-;;; runtime composition of several variable arity procedures, to be
-;;; passed to array:optimize for recognition as an affine function of
-;;; as many variables as there are dimensions in arrays of this shape.
-
-  (define (array:make-index shape)
-    (let ((idx (array:index shape))
-	  (shv (array:vector shape))
-	  (rnk (vector-ref (array:shape shape) 1)))
-      (do ((f (lambda () 0)
-	      (lambda (k . ks)
-		(+ (* s (- k (vector-ref
-			      shv
-			      (array:shape-vector-index idx (- j 1) 0))))
-		   (apply f ks))))
-	   (s 1 (* s (- (vector-ref
-			 shv
-			 (array:shape-vector-index idx (- j 1) 1))
-			(vector-ref
-			 shv
-			 (array:shape-vector-index idx (- j 1) 0)))))
-	   (j rnk (- j 1)))
-	  ((= j 0)
-	   f))))
-
-
-;;; --- Error checking ---
-
-;;; (array:good-shape? shape)
-;;; returns true if `shape' is an array of the right shape and its
-;;; elements are exact integers that pairwise bound intervals `[lo..hi)�.
-
-  (define (array:good-shape? shape)
-    (and (array:array? shape)
-	 (let ((u (array:shape shape))
-	       (v (array:vector shape))
-	       (x (array:index shape)))
-	   (and (= (vector-length u) 4)
-		(= (vector-ref u 0) 0)
-		(= (vector-ref u 2) 0)
-		(= (vector-ref u 3) 2))
-	   (let ((p (vector-ref u 1)))
-	     (do ((k 0 (+ k 1))
-		  (true #t (let ((lo (vector-ref
-				      v
-				      (array:shape-vector-index x k 0)))
-				 (hi (vector-ref
-				      v
-				      (array:shape-vector-index x k 1))))
-			     (and true
-				  (integer? lo)
-				  (exact? lo)
-				  (integer? hi)
-				  (exact? hi)
-				  (<= lo hi)))))
-		 ((= k p) true))))))
-
-;;; (array:good-share? subv subsize mapping superv)
-;;; returns true if the extreme indices in the subshape vector map
-;;; into the bounds in the supershape vector.
-
-;;; If some interval in `subv' is empty, then `subv' is empty and its
-;;; image under `f' is empty and it is trivially alright.  One must
-;;; not call `f', though.
-
-  (define (array:good-share? subshape subsize f super)
-    (or (zero? subsize)
-	(letrec
-	    ((sub (array:vector subshape))
-	     (dex (array:index subshape))
-	     (ck (lambda (k ks)
-		   (if (zero? k)
-		       (call-with-values
-			(lambda () (apply f ks))
-			(lambda qs (array:good-indices? qs super)))
-		       (and (ck (- k 1)
-				(cons (vector-ref
-				       sub
-				       (array:shape-vector-index
-					dex
-					(- k 1)
-					0))
-				      ks))
-			    (ck (- k 1)
-				(cons (- (vector-ref
-					  sub
-					  (array:shape-vector-index
-					   dex
-					   (- k 1)
-					   1))
-					 1)
-				      ks)))))))
-	  (let ((rnk (vector-ref (array:shape subshape) 1)))
-	    (or (array:unchecked-share-depth? rnk)
-		(ck rnk '()))))))
-
-;;; Check good-share on 10 dimensions at most. The trouble is,
-;;; the cost of this check is exponential in the number of dimensions.
-
-  (define (array:unchecked-share-depth? rank)
-    (if (> rank 10)
-	(begin
-	  (display `(warning: unchecked depth in share:
-			      ,rank subdimensions))
-	  (newline)
-	  #t)
-	#f))
-
-;;; (array:check-indices caller indices shape-vector)
-;;; (array:check-indices.o caller indices shape-vector)
-;;; (array:check-index-vector caller index-vector shape-vector)
-;;; return if the index is in bounds, else signal error.
-;;;
-;;; Shape-vector is the internal representation, with
-;;; b and e for dimension k at 2k and 2k + 1.
-
-  (define (array:check-indices who ks shv)
-    (or (array:good-indices? ks shv)
-	(error (array:not-in who ks shv))))
-
-  (define (array:check-indices.o who ks shv)
-    (or (array:good-indices.o? ks shv)
-	(error (array:not-in who (reverse (cdr (reverse ks))) shv))))
-
-  (define (array:check-index-vector who ks shv)
-    (or (array:good-index-vector? ks shv)
-	(error (array:not-in who (vector->list ks) shv))))
-
-  (define (array:check-index-actor who ks shv)
-    (let ((shape (array:shape ks)))
-      (or (and (= (vector-length shape) 2)
-	       (= (vector-ref shape 0) 0))
-	  (error "not an actor"))
-      (or (array:good-index-actor?
-	   (vector-ref shape 1)
-	   (array:vector ks)
-	   (array:index ks)
-	   shv)
-	  (array:not-in who (do ((k (vector-ref shape 1) (- k 1))
-				 (m '() (cons (vector-ref
-					       (array:vector ks)
-					       (array:actor-index
-						(array:index ks)
-						(- k 1)))
-					      m)))
-				((= k 0) m))
-			shv))))
-
-  (define (array:good-indices? ks shv)
-    (let ((d2 (vector-length shv)))
-      (do ((kp ks (if (pair? kp)
-                      (cdr kp)))
-           (k 0 (+ k 2))
-           (true #t (and true (pair? kp)
-                         (array:good-index? (car kp) shv k))))
-	  ((= k d2)
-	   (and true (null? kp))))))
-
-  (define (array:good-indices.o? ks.o shv)
-    (let ((d2 (vector-length shv)))
-      (do   ((kp ks.o (if (pair? kp)
-			  (cdr kp)))
-	     (k 0 (+ k 2))
-	     (true #t (and true (pair? kp)
-			   (array:good-index? (car kp) shv k))))
-	  ((= k d2)
-	   (and true (pair? kp) (null? (cdr kp)))))))
-
-  (define (array:good-index-vector? ks shv)
-    (let ((r2 (vector-length shv)))
-      (and (= (* 2 (vector-length ks)) r2)
-	   (do ((j 0 (+ j 1))
-		(k 0 (+ k 2))
-		(true #t (and true
-			      (array:good-index? (vector-ref ks j) shv k))))
-	       ((= k r2) true)))))
-
-  (define (array:good-index-actor? r v i shv)
-    (and (= (* 2 r) (vector-length shv))
-	 (do ((j 0 (+ j 1))
-	      (k 0 (+ k 2))
-	      (true #t (and true
-			    (array:good-index? (vector-ref
-						v
-						(array:actor-index i j))
-					       shv
-					       k))))
-	     ((= j r) true))))
-
-;;; (array:good-index? index shape-vector 2d)
-;;; returns true if index is within bounds for dimension 2d/2.
-
-  (define (array:good-index? w shv k)
-    (and (integer? w)
-	 (exact? w)
-	 (<= (vector-ref shv k) w)
-	 (< w (vector-ref shv (+ k 1)))))
-
-  (define (array:not-in who ks shv)
-    (let ((index (array:list->string ks))
-	  (bounds (array:shape-vector->string shv)))
-      (error (string-append who
-			    ": index " index
-			    " not in bounds " bounds))))
-
-  (define (array:list->string ks)
-    (do ((index "" (string-append index (array:thing->string (car ks)) " "))
-	 (ks ks (cdr ks)))
-	((null? ks) index)))
-
-  (define (array:shape-vector->string shv)
-    (do ((bounds "" (string-append bounds
-				   "["
-				   (number->string (vector-ref shv t))
-				   ".."
-				   (number->string (vector-ref shv (+ t 1)))
-				   ")"
-				   " "))
-	 (t 0 (+ t 2)))
-	((= t (vector-length shv)) bounds)))
-
-  (define (array:thing->string thing)
-    (cond
-     ((number? thing) (number->string thing))
-     ((symbol? thing) (string-append "#<symbol>" (symbol->string thing)))
-     ((char? thing) "#<char>")
-     ((string? thing) "#<string>")
-     ((list? thing) (string-append "#" (number->string (length thing))
-				   "<list>"))
-     
-     ((pair? thing) "#<pair>")
-     ((array? thing) "#<array>")
-     ((vector? thing) (string-append "#" (number->string
-					  (vector-length thing))
-				     "<vector>"))
-     ((procedure? thing) "#<procedure>")
-     (else
-      (case thing
-	((()) "()")
-	((#t) "#t")
-	((#f) "#f")
-	(else
-	 "#<whatsit>")))))
-
-;;; And to grok an affine map, vector->vector type. Column k of arr
-;;; will contain coefficients n0 ... nm of 1 k1 ... km for kth value.
-;;; 
-;;; These are for the error message when share fails.
-
-  (define (array:index-ref ind k)
-    (if (vector? ind)
-	(vector-ref ind k)
-	(vector-ref
-	 (array:vector ind)
-	 (array:actor-index (array:index ind) k))))
-
-  (define (array:index-set! ind k o)
-    (if (vector? ind)
-	(vector-set! ind k o)
-	(vector-set!
-	 (array:vector ind)
-	 (array:actor-index (array:index ind) k)
-	 o)))
-
-  (define (array:index-length ind)
-    (if (vector? ind)
-	(vector-length ind)
-	(vector-ref (array:shape ind) 1)))
-
-  (define (array:map->string proc r)
-    (let* ((m (array:grok/arguments proc r))
-	   (s (vector-ref (array:shape m) 3)))
-      (do ((i "" (string-append i c "k" (number->string k)))
-	   (c "" ", ")
-	   (k 1 (+ k 1)))
-	  ((< r k)
-	   (do ((o "" (string-append o c (array:map-column->string m r k)))
-		(c "" ", ")
-		(k 0 (+ k 1)))
-	       ((= k s)
-		(string-append i " => " o)))))))
-
-  (define (array:map-column->string m r k)
-    (let ((v (array:vector m))
-	  (i (array:index m)))
-      (let ((n0 (vector-ref v (array:vector-index i (list 0 k)))))
-	(let wok ((j 1)
-		  (e (if (= n0 0) "" (number->string n0))))
-	  (if (<= j r)
-	      (let ((nj (vector-ref v (array:vector-index i (list j k)))))
-		(if (= nj 0)
-		    (wok (+ j 1) e)
-		    (let* ((nj (if (= nj 1) ""
-				   (if (= nj -1) "-"
-				       (string-append (number->string nj)
-						      " "))))
-			   (njkj (string-append nj "k" (number->string j))))
-		      (if (string=? e "")
-			  (wok (+ j 1) njkj)
-			  (wok (+ j 1) (string-append e " + " njkj))))))
-	      (if (string=? e "") "0" e))))))
-
-  (define (array:grok/arguments proc r)
-    (array:grok/index!
-     (lambda (vec)
-       (call-with-values
-	(lambda ()
-	  (array:apply-to-vector r proc vec))
-	vector))
-     (make-vector r)))
-
-  (define (array:grok/index! proc in)
-    (let ((m (array:index-length in)))
-      (do ((k 0 (+ k 1)))
-	  ((= k m))
-	(array:index-set! in k 0))
-      (let* ((n0 (proc in))
-	     (n (array:index-length n0)))
-	(let ((arr (make-array (shape 0 (+ m 1) 0 n)))) ; (*)
-	  (do ((k 0 (+ k 1)))
-	      ((= k n))
-	    (array-set! arr 0 k (array:index-ref n0 k))) ; (**)
-	  (do ((j 0 (+ j 1)))
-	      ((= j m))
-	    (array:index-set! in j 1)
-	    (let ((nj (proc in)))
-	      (array:index-set! in j 0)
-	      (do ((k 0 (+ k 1)))
-		  ((= k n))
-		(array-set! arr (+ j 1) k (- (array:index-ref nj k) ; (**)
-					     (array:index-ref n0 k))))))
-	  arr))))
-  ;; (*)  Should not use `make-array' and `shape' here
-  ;; (**) Should not use `array-set!' here
-  ;; Should use something internal to the library instead: either lower
-  ;; level code (preferable but complex) or alternative names to these same.
-
-  ;; The array library:
-  (include "arlib.scm")
-
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/25/info.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/25/info.rkt
deleted file mode 100644
index 986e2e8c16..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/25/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("arlib.scm" "ix-ctor.scm" "op-ctor.scm"))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/25/ix-ctor.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/25/ix-ctor.scm
deleted file mode 100644
index b6f99a4f0b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/25/ix-ctor.scm
+++ /dev/null
@@ -1,77 +0,0 @@
-(define (array-ref a . xs)
-  (or (array:array? a)
-      (error "not an array"))
-  (let ((shape (array:shape a)))
-    (if (null? xs)
-        (array:check-indices "array-ref" xs shape)
-        (let ((x (car xs)))
-          (if (vector? x)
-              (array:check-index-vector "array-ref" x shape)
-              (if (integer? x)
-                  (array:check-indices "array-ref" xs shape)
-                  (if (array:array? x)
-                      (array:check-index-actor "array-ref" x shape)
-                      (error "not an index object"))))))
-    (vector-ref
-     (array:vector a)
-     (if (null? xs)
-         (vector-ref (array:index a) 0)
-         (let ((x (car xs)))
-           (if (vector? x)
-               (array:index/vector
-                (quotient (vector-length shape) 2)
-                (array:index a)
-                x)
-               (if (integer? x)
-                   (array:vector-index (array:index a) xs)
-                   (if (array:array? x)
-                       (array:index/array
-                        (quotient (vector-length shape) 2)
-                        (array:index a)
-                        (array:vector x)
-                        (array:index x))
-                       (error "array-ref: bad index object")))))))))
-
-(define (array-set! a x . xs)
-  (or (array:array? a)
-      (error "array-set!: not an array"))
-  (let ((shape (array:shape a)))
-    (if (null? xs)
-        (array:check-indices "array-set!" '() shape)
-        (if (vector? x)
-            (array:check-index-vector "array-set!" x shape)
-            (if (integer? x)
-                (array:check-indices.o "array-set!" (cons x xs) shape)
-                (if (array:array? x)
-                    (array:check-index-actor "array-set!" x shape)
-                    (error "not an index object")))))
-    (if (null? xs)
-        (vector-set! (array:vector a) (vector-ref (array:index a) 0) x)
-        (if (vector? x)
-            (vector-set! (array:vector a)
-                         (array:index/vector
-                          (quotient (vector-length shape) 2)
-                          (array:index a)
-                          x)
-                         (car xs))
-            (if (integer? x)
-                (let ((v (array:vector a))
-                      (i (array:index a))
-                      (r (quotient (vector-length shape) 2)))
-                  (do ((sum (* (vector-ref i 0) x)
-                            (+ sum (* (vector-ref i k) (car ks))))
-                       (ks xs (cdr ks))
-                       (k 1 (+ k 1)))
-                    ((= k r)
-                     (vector-set! v (+ sum (vector-ref i k)) (car ks)))))
-                (if (array:array? x)
-                    (vector-set! (array:vector a)
-                                 (array:index/array
-                                  (quotient (vector-length shape) 2)
-                                  (array:index a)
-                                  (array:vector x)
-                                  (array:index x))
-                                 (car xs))
-                    (error (string-append
-                            "array-set!: bad index object: "
-                            (array:thing->string x)))))))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/25/op-ctor.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/25/op-ctor.scm
deleted file mode 100644
index c13b14e320..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/25/op-ctor.scm
+++ /dev/null
@@ -1,649 +0,0 @@
-(begin
-  (define array:opt-args '(ctor (4)))
-  (define (mlist->list l)
-    (if (null? l)
-        null
-        (cons (mcar l) (mlist->list (mcdr l)))))
-  (define (array:optimize f r)
-    (case r
-      ((0) (let ((n0 (f))) (array:0 n0)))
-      ((1) (let ((n0 (f 0))) (array:1 n0 (- (f 1) n0))))
-      ((2)
-       (let ((n0 (f 0 0)))
-         (array:2 n0 (- (f 1 0) n0) (- (f 0 1) n0))))
-      ((3)
-       (let ((n0 (f 0 0 0)))
-         (array:3
-           n0
-           (- (f 1 0 0) n0)
-           (- (f 0 1 0) n0)
-           (- (f 0 0 1) n0))))
-      (else
-       (let ((v
-              (do ((k 0 (+ k 1)) (v '() (mcons 0 v)))
-                  ((= k r) v))))
-         (let ((n0 (apply f (mlist->list v))))
-           (apply
-            array:n
-            n0
-            (array:coefficients f n0 v v)))))))
-  (define (array:optimize-empty r)
-    (let ((x (make-vector (+ r 1) 0)))
-      (vector-set! x r -1)
-      x))
-  (define (array:coefficients f n0 vs vp)
-    (case vp
-      ((()) '())
-      (else
-       (set-mcar! vp 1)
-       (let ((n (- (apply f (mlist->list vs)) n0)))
-         (set-mcar! vp 0)
-         (cons n (array:coefficients f n0 vs (mcdr vp)))))))
-  (define (array:vector-index x ks)
-    (do ((sum 0 (+ sum (* (vector-ref x k) (car ks))))
-         (ks ks (cdr ks))
-         (k 0 (+ k 1)))
-        ((null? ks) (+ sum (vector-ref x k)))))
-  (define (array:shape-index) '#(2 1 0))
-  (define (array:empty-shape-index) '#(0 0 -1))
-  (define (array:shape-vector-index x r k)
-    (+
-     (* (vector-ref x 0) r)
-     (* (vector-ref x 1) k)
-     (vector-ref x 2)))
-  (define (array:actor-index x k)
-    (+ (* (vector-ref x 0) k) (vector-ref x 1)))
-  (define (array:0 n0) (vector n0))
-  (define (array:1 n0 n1) (vector n1 n0))
-  (define (array:2 n0 n1 n2) (vector n1 n2 n0))
-  (define (array:3 n0 n1 n2 n3) (vector n1 n2 n3 n0))
-  (define (array:n n0 n1 n2 n3 n4 . ns)
-    (apply vector n1 n2 n3 n4 (append ns (list n0))))
-  (define (array:maker r)
-    (case r
-      ((0) array:0)
-      ((1) array:1)
-      ((2) array:2)
-      ((3) array:3)
-      (else array:n)))
-  (define array:indexer/vector
-    (let ((em
-           (vector
-             (lambda (x i) (+ (vector-ref x 0)))
-             (lambda (x i)
-               (+
-                (* (vector-ref x 0) (vector-ref i 0))
-                (vector-ref x 1)))
-             (lambda (x i)
-               (+
-                (* (vector-ref x 0) (vector-ref i 0))
-                (* (vector-ref x 1) (vector-ref i 1))
-                (vector-ref x 2)))
-             (lambda (x i)
-               (+
-                (* (vector-ref x 0) (vector-ref i 0))
-                (* (vector-ref x 1) (vector-ref i 1))
-                (* (vector-ref x 2) (vector-ref i 2))
-                (vector-ref x 3)))
-             (lambda (x i)
-               (+
-                (* (vector-ref x 0) (vector-ref i 0))
-                (* (vector-ref x 1) (vector-ref i 1))
-                (* (vector-ref x 2) (vector-ref i 2))
-                (* (vector-ref x 3) (vector-ref i 3))
-                (vector-ref x 4)))
-             (lambda (x i)
-               (+
-                (* (vector-ref x 0) (vector-ref i 0))
-                (* (vector-ref x 1) (vector-ref i 1))
-                (* (vector-ref x 2) (vector-ref i 2))
-                (* (vector-ref x 3) (vector-ref i 3))
-                (* (vector-ref x 4) (vector-ref i 4))
-                (vector-ref x 5)))
-             (lambda (x i)
-               (+
-                (* (vector-ref x 0) (vector-ref i 0))
-                (* (vector-ref x 1) (vector-ref i 1))
-                (* (vector-ref x 2) (vector-ref i 2))
-                (* (vector-ref x 3) (vector-ref i 3))
-                (* (vector-ref x 4) (vector-ref i 4))
-                (* (vector-ref x 5) (vector-ref i 5))
-                (vector-ref x 6)))
-             (lambda (x i)
-               (+
-                (* (vector-ref x 0) (vector-ref i 0))
-                (* (vector-ref x 1) (vector-ref i 1))
-                (* (vector-ref x 2) (vector-ref i 2))
-                (* (vector-ref x 3) (vector-ref i 3))
-                (* (vector-ref x 4) (vector-ref i 4))
-                (* (vector-ref x 5) (vector-ref i 5))
-                (* (vector-ref x 6) (vector-ref i 6))
-                (vector-ref x 7)))
-             (lambda (x i)
-               (+
-                (* (vector-ref x 0) (vector-ref i 0))
-                (* (vector-ref x 1) (vector-ref i 1))
-                (* (vector-ref x 2) (vector-ref i 2))
-                (* (vector-ref x 3) (vector-ref i 3))
-                (* (vector-ref x 4) (vector-ref i 4))
-                (* (vector-ref x 5) (vector-ref i 5))
-                (* (vector-ref x 6) (vector-ref i 6))
-                (* (vector-ref x 7) (vector-ref i 7))
-                (vector-ref x 8)))
-             (lambda (x i)
-               (+
-                (* (vector-ref x 0) (vector-ref i 0))
-                (* (vector-ref x 1) (vector-ref i 1))
-                (* (vector-ref x 2) (vector-ref i 2))
-                (* (vector-ref x 3) (vector-ref i 3))
-                (* (vector-ref x 4) (vector-ref i 4))
-                (* (vector-ref x 5) (vector-ref i 5))
-                (* (vector-ref x 6) (vector-ref i 6))
-                (* (vector-ref x 7) (vector-ref i 7))
-                (* (vector-ref x 8) (vector-ref i 8))
-                (vector-ref x 9)))))
-          (it
-           (lambda (w)
-             (lambda (x i)
-               (+
-                (* (vector-ref x 0) (vector-ref i 0))
-                (* (vector-ref x 1) (vector-ref i 1))
-                (* (vector-ref x 2) (vector-ref i 2))
-                (* (vector-ref x 3) (vector-ref i 3))
-                (* (vector-ref x 4) (vector-ref i 4))
-                (* (vector-ref x 5) (vector-ref i 5))
-                (* (vector-ref x 6) (vector-ref i 6))
-                (* (vector-ref x 7) (vector-ref i 7))
-                (* (vector-ref x 8) (vector-ref i 8))
-                (* (vector-ref x 9) (vector-ref i 9))
-                (do ((xi
-                      0
-                      (+
-                       (* (vector-ref x u) (vector-ref i u))
-                       xi))
-                     (u (- w 1) (- u 1)))
-                    ((< u 10) xi))
-                (vector-ref x w))))))
-      (lambda (r) (if (< r 10) (vector-ref em r) (it r)))))
-  (define array:indexer/array
-    (let ((em
-           (vector
-             (lambda (x v i) (+ (vector-ref x 0)))
-             (lambda (x v i)
-               (+
-                (*
-                 (vector-ref x 0)
-                 (vector-ref v (array:actor-index i 0)))
-                (vector-ref x 1)))
-             (lambda (x v i)
-               (+
-                (*
-                 (vector-ref x 0)
-                 (vector-ref v (array:actor-index i 0)))
-                (*
-                 (vector-ref x 1)
-                 (vector-ref v (array:actor-index i 1)))
-                (vector-ref x 2)))
-             (lambda (x v i)
-               (+
-                (*
-                 (vector-ref x 0)
-                 (vector-ref v (array:actor-index i 0)))
-                (*
-                 (vector-ref x 1)
-                 (vector-ref v (array:actor-index i 1)))
-                (*
-                 (vector-ref x 2)
-                 (vector-ref v (array:actor-index i 2)))
-                (vector-ref x 3)))
-             (lambda (x v i)
-               (+
-                (*
-                 (vector-ref x 0)
-                 (vector-ref v (array:actor-index i 0)))
-                (*
-                 (vector-ref x 1)
-                 (vector-ref v (array:actor-index i 1)))
-                (*
-                 (vector-ref x 2)
-                 (vector-ref v (array:actor-index i 2)))
-                (*
-                 (vector-ref x 3)
-                 (vector-ref v (array:actor-index i 3)))
-                (vector-ref x 4)))
-             (lambda (x v i)
-               (+
-                (*
-                 (vector-ref x 0)
-                 (vector-ref v (array:actor-index i 0)))
-                (*
-                 (vector-ref x 1)
-                 (vector-ref v (array:actor-index i 1)))
-                (*
-                 (vector-ref x 2)
-                 (vector-ref v (array:actor-index i 2)))
-                (*
-                 (vector-ref x 3)
-                 (vector-ref v (array:actor-index i 3)))
-                (*
-                 (vector-ref x 4)
-                 (vector-ref v (array:actor-index i 4)))
-                (vector-ref x 5)))
-             (lambda (x v i)
-               (+
-                (*
-                 (vector-ref x 0)
-                 (vector-ref v (array:actor-index i 0)))
-                (*
-                 (vector-ref x 1)
-                 (vector-ref v (array:actor-index i 1)))
-                (*
-                 (vector-ref x 2)
-                 (vector-ref v (array:actor-index i 2)))
-                (*
-                 (vector-ref x 3)
-                 (vector-ref v (array:actor-index i 3)))
-                (*
-                 (vector-ref x 4)
-                 (vector-ref v (array:actor-index i 4)))
-                (*
-                 (vector-ref x 5)
-                 (vector-ref v (array:actor-index i 5)))
-                (vector-ref x 6)))
-             (lambda (x v i)
-               (+
-                (*
-                 (vector-ref x 0)
-                 (vector-ref v (array:actor-index i 0)))
-                (*
-                 (vector-ref x 1)
-                 (vector-ref v (array:actor-index i 1)))
-                (*
-                 (vector-ref x 2)
-                 (vector-ref v (array:actor-index i 2)))
-                (*
-                 (vector-ref x 3)
-                 (vector-ref v (array:actor-index i 3)))
-                (*
-                 (vector-ref x 4)
-                 (vector-ref v (array:actor-index i 4)))
-                (*
-                 (vector-ref x 5)
-                 (vector-ref v (array:actor-index i 5)))
-                (*
-                 (vector-ref x 6)
-                 (vector-ref v (array:actor-index i 6)))
-                (vector-ref x 7)))
-             (lambda (x v i)
-               (+
-                (*
-                 (vector-ref x 0)
-                 (vector-ref v (array:actor-index i 0)))
-                (*
-                 (vector-ref x 1)
-                 (vector-ref v (array:actor-index i 1)))
-                (*
-                 (vector-ref x 2)
-                 (vector-ref v (array:actor-index i 2)))
-                (*
-                 (vector-ref x 3)
-                 (vector-ref v (array:actor-index i 3)))
-                (*
-                 (vector-ref x 4)
-                 (vector-ref v (array:actor-index i 4)))
-                (*
-                 (vector-ref x 5)
-                 (vector-ref v (array:actor-index i 5)))
-                (*
-                 (vector-ref x 6)
-                 (vector-ref v (array:actor-index i 6)))
-                (*
-                 (vector-ref x 7)
-                 (vector-ref v (array:actor-index i 7)))
-                (vector-ref x 8)))
-             (lambda (x v i)
-               (+
-                (*
-                 (vector-ref x 0)
-                 (vector-ref v (array:actor-index i 0)))
-                (*
-                 (vector-ref x 1)
-                 (vector-ref v (array:actor-index i 1)))
-                (*
-                 (vector-ref x 2)
-                 (vector-ref v (array:actor-index i 2)))
-                (*
-                 (vector-ref x 3)
-                 (vector-ref v (array:actor-index i 3)))
-                (*
-                 (vector-ref x 4)
-                 (vector-ref v (array:actor-index i 4)))
-                (*
-                 (vector-ref x 5)
-                 (vector-ref v (array:actor-index i 5)))
-                (*
-                 (vector-ref x 6)
-                 (vector-ref v (array:actor-index i 6)))
-                (*
-                 (vector-ref x 7)
-                 (vector-ref v (array:actor-index i 7)))
-                (*
-                 (vector-ref x 8)
-                 (vector-ref v (array:actor-index i 8)))
-                (vector-ref x 9)))))
-          (it
-           (lambda (w)
-             (lambda (x v i)
-               (+
-                (*
-                 (vector-ref x 0)
-                 (vector-ref v (array:actor-index i 0)))
-                (*
-                 (vector-ref x 1)
-                 (vector-ref v (array:actor-index i 1)))
-                (*
-                 (vector-ref x 2)
-                 (vector-ref v (array:actor-index i 2)))
-                (*
-                 (vector-ref x 3)
-                 (vector-ref v (array:actor-index i 3)))
-                (*
-                 (vector-ref x 4)
-                 (vector-ref v (array:actor-index i 4)))
-                (*
-                 (vector-ref x 5)
-                 (vector-ref v (array:actor-index i 5)))
-                (*
-                 (vector-ref x 6)
-                 (vector-ref v (array:actor-index i 6)))
-                (*
-                 (vector-ref x 7)
-                 (vector-ref v (array:actor-index i 7)))
-                (*
-                 (vector-ref x 8)
-                 (vector-ref v (array:actor-index i 8)))
-                (*
-                 (vector-ref x 9)
-                 (vector-ref v (array:actor-index i 9)))
-                (do ((xi
-                      0
-                      (+
-                       (*
-                        (vector-ref x u)
-                        (vector-ref
-                          v
-                          (array:actor-index i u)))
-                       xi))
-                     (u (- w 1) (- u 1)))
-                    ((< u 10) xi))
-                (vector-ref x w))))))
-      (lambda (r) (if (< r 10) (vector-ref em r) (it r)))))
-  (define array:applier-to-vector
-    (let ((em
-           (vector
-             (lambda (p v) (p))
-             (lambda (p v) (p (vector-ref v 0)))
-             (lambda (p v)
-               (p (vector-ref v 0) (vector-ref v 1)))
-             (lambda (p v)
-               (p
-                (vector-ref v 0)
-                (vector-ref v 1)
-                (vector-ref v 2)))
-             (lambda (p v)
-               (p
-                (vector-ref v 0)
-                (vector-ref v 1)
-                (vector-ref v 2)
-                (vector-ref v 3)))
-             (lambda (p v)
-               (p
-                (vector-ref v 0)
-                (vector-ref v 1)
-                (vector-ref v 2)
-                (vector-ref v 3)
-                (vector-ref v 4)))
-             (lambda (p v)
-               (p
-                (vector-ref v 0)
-                (vector-ref v 1)
-                (vector-ref v 2)
-                (vector-ref v 3)
-                (vector-ref v 4)
-                (vector-ref v 5)))
-             (lambda (p v)
-               (p
-                (vector-ref v 0)
-                (vector-ref v 1)
-                (vector-ref v 2)
-                (vector-ref v 3)
-                (vector-ref v 4)
-                (vector-ref v 5)
-                (vector-ref v 6)))
-             (lambda (p v)
-               (p
-                (vector-ref v 0)
-                (vector-ref v 1)
-                (vector-ref v 2)
-                (vector-ref v 3)
-                (vector-ref v 4)
-                (vector-ref v 5)
-                (vector-ref v 6)
-                (vector-ref v 7)))
-             (lambda (p v)
-               (p
-                (vector-ref v 0)
-                (vector-ref v 1)
-                (vector-ref v 2)
-                (vector-ref v 3)
-                (vector-ref v 4)
-                (vector-ref v 5)
-                (vector-ref v 6)
-                (vector-ref v 7)
-                (vector-ref v 8)))))
-          (it
-           (lambda (r)
-             (lambda (p v)
-               (apply
-                p
-                (vector-ref v 0)
-                (vector-ref v 1)
-                (vector-ref v 2)
-                (vector-ref v 3)
-                (vector-ref v 4)
-                (vector-ref v 5)
-                (vector-ref v 6)
-                (vector-ref v 7)
-                (vector-ref v 8)
-                (vector-ref v 9)
-                (do ((k r (- k 1))
-                     (r
-                      '()
-                      (cons (vector-ref v (- k 1)) r)))
-                    ((= k 10) r)))))))
-      (lambda (r) (if (< r 10) (vector-ref em r) (it r)))))
-  (define array:applier-to-actor
-    (let ((em
-           (vector
-             (lambda (p a) (p))
-             (lambda (p a) (p (array-ref a 0)))
-             (lambda (p a)
-               (p (array-ref a 0) (array-ref a 1)))
-             (lambda (p a)
-               (p
-                (array-ref a 0)
-                (array-ref a 1)
-                (array-ref a 2)))
-             (lambda (p a)
-               (p
-                (array-ref a 0)
-                (array-ref a 1)
-                (array-ref a 2)
-                (array-ref a 3)))
-             (lambda (p a)
-               (p
-                (array-ref a 0)
-                (array-ref a 1)
-                (array-ref a 2)
-                (array-ref a 3)
-                (array-ref a 4)))
-             (lambda (p a)
-               (p
-                (array-ref a 0)
-                (array-ref a 1)
-                (array-ref a 2)
-                (array-ref a 3)
-                (array-ref a 4)
-                (array-ref a 5)))
-             (lambda (p a)
-               (p
-                (array-ref a 0)
-                (array-ref a 1)
-                (array-ref a 2)
-                (array-ref a 3)
-                (array-ref a 4)
-                (array-ref a 5)
-                (array-ref a 6)))
-             (lambda (p a)
-               (p
-                (array-ref a 0)
-                (array-ref a 1)
-                (array-ref a 2)
-                (array-ref a 3)
-                (array-ref a 4)
-                (array-ref a 5)
-                (array-ref a 6)
-                (array-ref a 7)))
-             (lambda (p a)
-               (p
-                (array-ref a 0)
-                (array-ref a 1)
-                (array-ref a 2)
-                (array-ref a 3)
-                (array-ref a 4)
-                (array-ref a 5)
-                (array-ref a 6)
-                (array-ref a 7)
-                (array-ref a 8)))))
-          (it
-           (lambda (r)
-             (lambda (p a)
-               (apply
-                a
-                (array-ref a 0)
-                (array-ref a 1)
-                (array-ref a 2)
-                (array-ref a 3)
-                (array-ref a 4)
-                (array-ref a 5)
-                (array-ref a 6)
-                (array-ref a 7)
-                (array-ref a 8)
-                (array-ref a 9)
-                (do ((k r (- k 1))
-                     (r '() (cons (array-ref a (- k 1)) r)))
-                    ((= k 10) r)))))))
-      (lambda (r)
-        "These are high level, hiding implementation at call site."
-        (if (< r 10) (vector-ref em r) (it r)))))
-  (define array:applier-to-backing-vector
-    (let ((em
-           (vector
-             (lambda (p ai av) (p))
-             (lambda (p ai av)
-               (p (vector-ref av (array:actor-index ai 0))))
-             (lambda (p ai av)
-               (p
-                (vector-ref av (array:actor-index ai 0))
-                (vector-ref av (array:actor-index ai 1))))
-             (lambda (p ai av)
-               (p
-                (vector-ref av (array:actor-index ai 0))
-                (vector-ref av (array:actor-index ai 1))
-                (vector-ref av (array:actor-index ai 2))))
-             (lambda (p ai av)
-               (p
-                (vector-ref av (array:actor-index ai 0))
-                (vector-ref av (array:actor-index ai 1))
-                (vector-ref av (array:actor-index ai 2))
-                (vector-ref av (array:actor-index ai 3))))
-             (lambda (p ai av)
-               (p
-                (vector-ref av (array:actor-index ai 0))
-                (vector-ref av (array:actor-index ai 1))
-                (vector-ref av (array:actor-index ai 2))
-                (vector-ref av (array:actor-index ai 3))
-                (vector-ref av (array:actor-index ai 4))))
-             (lambda (p ai av)
-               (p
-                (vector-ref av (array:actor-index ai 0))
-                (vector-ref av (array:actor-index ai 1))
-                (vector-ref av (array:actor-index ai 2))
-                (vector-ref av (array:actor-index ai 3))
-                (vector-ref av (array:actor-index ai 4))
-                (vector-ref av (array:actor-index ai 5))))
-             (lambda (p ai av)
-               (p
-                (vector-ref av (array:actor-index ai 0))
-                (vector-ref av (array:actor-index ai 1))
-                (vector-ref av (array:actor-index ai 2))
-                (vector-ref av (array:actor-index ai 3))
-                (vector-ref av (array:actor-index ai 4))
-                (vector-ref av (array:actor-index ai 5))
-                (vector-ref av (array:actor-index ai 6))))
-             (lambda (p ai av)
-               (p
-                (vector-ref av (array:actor-index ai 0))
-                (vector-ref av (array:actor-index ai 1))
-                (vector-ref av (array:actor-index ai 2))
-                (vector-ref av (array:actor-index ai 3))
-                (vector-ref av (array:actor-index ai 4))
-                (vector-ref av (array:actor-index ai 5))
-                (vector-ref av (array:actor-index ai 6))
-                (vector-ref av (array:actor-index ai 7))))
-             (lambda (p ai av)
-               (p
-                (vector-ref av (array:actor-index ai 0))
-                (vector-ref av (array:actor-index ai 1))
-                (vector-ref av (array:actor-index ai 2))
-                (vector-ref av (array:actor-index ai 3))
-                (vector-ref av (array:actor-index ai 4))
-                (vector-ref av (array:actor-index ai 5))
-                (vector-ref av (array:actor-index ai 6))
-                (vector-ref av (array:actor-index ai 7))
-                (vector-ref av (array:actor-index ai 8))))))
-          (it
-           (lambda (r)
-             (lambda (p ai av)
-               (apply
-                p
-                (vector-ref av (array:actor-index ai 0))
-                (vector-ref av (array:actor-index ai 1))
-                (vector-ref av (array:actor-index ai 2))
-                (vector-ref av (array:actor-index ai 3))
-                (vector-ref av (array:actor-index ai 4))
-                (vector-ref av (array:actor-index ai 5))
-                (vector-ref av (array:actor-index ai 6))
-                (vector-ref av (array:actor-index ai 7))
-                (vector-ref av (array:actor-index ai 8))
-                (vector-ref av (array:actor-index ai 9))
-                (do ((k r (- k 1))
-                     (r
-                      '()
-                      (cons
-                       (vector-ref
-                         av
-                         (array:actor-index ai (- k 1)))
-                       r)))
-                    ((= k 10) r)))))))
-      (lambda (r)
-        "These are low level, exposing implementation at call site."
-        (if (< r 10) (vector-ref em r) (it r)))))
-  (define (array:index/vector r x v)
-    ((array:indexer/vector r) x v))
-  (define (array:index/array r x av ai)
-    ((array:indexer/array r) x av ai))
-  (define (array:apply-to-vector r p v)
-    ((array:applier-to-vector r) p v))
-  (define (array:apply-to-actor r p a)
-    ((array:applier-to-actor r) p a)))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/26.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/26.rkt
deleted file mode 100644
index d22c6cb47d..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/26.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-26
-#lang s-exp srfi/provider srfi/26/cut
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/26/cut.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/26/cut.rkt
deleted file mode 100644
index f8c1af69bc..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/26/cut.rkt
+++ /dev/null
@@ -1,135 +0,0 @@
-;;; cut.rkt
-
-; This file reimplements srfi-26 for PLT.
-; The reimplementation provides better error messages.
-
-; Examples of errors with better error messages:
-;   (cut)
-;   ((cut cons <> <>) 1 2 3)
-
-#lang scheme/base
-  
-(provide cut cute)
-(require (for-syntax scheme/base))
-  
-; generate-names/exprs :
-;    Given the arguments for the macro call to cut (or cute) as a syntax-list,
-;  call build with four lists:
-;    1) a list of names given to each <>-slot
-;    2) [cut] a list of the macro arguments, except that all occurrences
-;       of a <>-slots have been substituted with the chosen name.
-;    3) [cute] a list the names given to the exprs and the <>-slots
-;    4) [cute] a list of lists of name-expression pairs, i.e. the bindings
-;       used to bind the expressions to names, in order to evaluate
-;       the expressions at the time of the macro call to cute.
-(define-for-syntax (generate-names/exprs slot-or-exprs build)
-  (let loop ([slot-or-exprs       (syntax->list slot-or-exprs)]
-             [slot-names          '()]
-             [cut-names-or-exprs  '()]
-             [cute-names          '()]
-             [bindings            '()])
-    (cond
-     [(null? slot-or-exprs)  (build (reverse slot-names)
-                                    (reverse cut-names-or-exprs)
-                                    (reverse cute-names)
-                                    (reverse bindings))]
-     [else                   (let ((name (car (generate-temporaries #'(x)))))
-                               (syntax-case (car slot-or-exprs) (<> <...>)
-                                 [<>
-                                  (loop (cdr slot-or-exprs)
-                                        (cons name slot-names)
-                                        (cons name cut-names-or-exprs)
-                                        (cons name cute-names)
-                                        bindings)]
-                                 [_
-                                  (loop (cdr slot-or-exprs)
-                                        slot-names
-                                        (cons (car slot-or-exprs) cut-names-or-exprs)
-                                        (cons name cute-names)
-                                        (cons (list name (car slot-or-exprs))
-                                              bindings))]))])))
-  
-(define-syntax (cut stx)
-  (syntax-case stx (<> <...>)
-    [(cut)
-     (raise-syntax-error #f "cut expects 1 or more slots or expressions, given none"  stx)]
-    [(cut <>)
-     #'(lambda (f) (f))]
-    [(cut <...> slot-or-expr ...)
-     (raise-syntax-error #f "cut expects a a slot or an expression at the first position, given <...>" stx)]
-    [(cut proc)
-     #'(lambda () (proc))]
-    [(cut <> slot-or-expr ... <...>)
-     (generate-names/exprs #'(slot-or-expr ...)
-                           (lambda (slot-names names-or-exprs . ignored)
-                             #`(lambda (f . xs)
-                                 #,(quasisyntax/loc stx
-                                                    (apply f #,@names-or-exprs xs)))))]
-    [(cut <> slot-or-expr ...)
-     (generate-names/exprs #'(slot-or-expr ...)
-                           (lambda (slot-names names-or-exprs . ignored)
-                             #`(lambda (x #,@slot-names)
-                                 (x #,@(datum->syntax stx names-or-exprs)))))]
-    [(cut proc slot-or-expr ... <...>)
-     ;;   Applying a wrong number of arguments to the lamba generated by cut, will provoke an
-     ;; error caused by the application (proc ...). The quasisyntax/loc makes sure DrScheme
-     ;; shows the cut-expression as the source of the error in stead of the showing an error in
-     ;; the code implementing the macro i.e. in this code.
-     ;;   Note: Is it possible to propagate the error to the location of the wrong application
-     ;;         in the user code?
-     (generate-names/exprs #'(slot-or-expr ...)
-                           (lambda (slot-names names-or-exprs . ignored)
-                             #`(lambda (#,@slot-names . xs)
-                                 #,(quasisyntax/loc stx
-                                                    (apply proc #,@names-or-exprs xs)))))]
-    [(cut proc slot-or-expr ...)
-     (generate-names/exprs #'(slot-or-expr ...)
-                           (lambda (slot-names names-or-exprs . ignored)
-                             #`(lambda #,slot-names
-                                 #,(quasisyntax/loc stx
-                                                    (proc #,@names-or-exprs)))))]))
-  
-;  In addition to cut, there is a variant called cute (a mnemonic for
-; "cut with evaluated non-slots") which evaluates the non-slot expressions
-; at the time the procedure is specialized, not at the time the specialized
-; procedure is called. For example,
-;     (cute cons (+ a 1) <>) is the same as (let ((a1 (+ a 1))) (lambda (x2) (cons a1 x2)))
-; As you see from comparing this example with the first example above, the
-; cute-variant will evaluate (+ a 1) once, while the cut-variant will evaluate
-; it during every invokation of the resulting procedure.
-  
-(define-syntax (cute stx)
-  (syntax-case stx (<> <...>)
-    [(cute)
-     (raise-syntax-error #f "cute expects 1 or more slots or expressions, given none"  stx)]
-    [(cute <>)
-     #'(lambda (f) (f))]
-    [(cute <...> slot-or-expr ...)
-     (raise-syntax-error #f "cute expects an expression at the first position, given <...>" stx)]
-    [(cute proc)
-     #'(lambda () (proc))]
-    [(cute <> slot-or-expr ... <...>)
-     (generate-names/exprs #'(slot-or-expr ...)
-                           (lambda (slot-names ignored names bindings)
-                             #`(let #,bindings
-                                 (lambda (f #,@slot-names . xs)
-                                   (apply f #,@names xs)))))]
-    [(cute <> slot-or-expr ...)
-     (generate-names/exprs #'(slot-or-expr ...)
-                           (lambda (slot-names ignored names bindings)
-                             #`(let #,bindings
-                                 (lambda (f #,@slot-names)
-                                   (f #,@names)))))]
-    [(cute proc slot-or-expr ... <...>)
-     (generate-names/exprs #'(slot-or-expr ...)
-                           (lambda (slot-names ignored names bindings)
-                             #`(let #,bindings
-                                 (lambda (#,@slot-names . xs)
-                                   (apply proc #,@names xs)))))]
-    [(cute proc slot-or-expr ...)
-     (generate-names/exprs #'(slot-or-expr ...)
-                           (lambda (slot-names ignored names bindings)
-                             #`(let #,bindings
-                                 (lambda #,slot-names
-                                   (proc #,@names)))))]))
-  
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/27.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/27.rkt
deleted file mode 100644
index a5628cfd72..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/27.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-27
-#lang s-exp srfi/provider srfi/27/random-bits
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/27/random-bits-examples.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/27/random-bits-examples.rkt
deleted file mode 100644
index 46e67ad87c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/27/random-bits-examples.rkt
+++ /dev/null
@@ -1,294 +0,0 @@
-(module random-bits-examples mzscheme
-  (require srfi/27/random-bits)
-
-  (define ascii->char integer->char)
-
-; CONFIDENCE TESTS FOR SRFI-27 "Sources of Random Bits"
-; =====================================================
-;
-; Sebastian.Egner@philips.com, 2002.
-;
-; This file contains a small collection of checks for the
-; implementation of SRFI-27. It is not meant to be complete
-; or to test the actual properties of the underlying generator.
-; It is merely meant to run the code and to check some of the
-; assumptions made by specification. There is an interface to
-; G. Marsaglia's DIEHARD battery of tests for random number
-; generators, though.
-;
-; running this file in Scheme 48 0.57 with SRFI-27 installed:
-;
-;   ,open srfi-27 srfi-23 ascii
-;   ,load conftest.scm
-;
-; speed in Scheme 48 0.57 with SRFI-27 opened:
-;
-;   ,time (do ((k 0 (+ k 1))) ((= k 100000)) (random-integer 2))
-;   ; about  30000/s on P3@800MHz for the Scheme-impl.
-;   ; about 160000/s on P3@800MHz for the C/Scheme-impl.
-;
-;   ,time (do ((k 0 (+ k 1))) ((= k 100000)) (random-real))
-;   ; about   3000/s on P3@800MHz for the Scheme-impl.
-;   ; about 180000/s on P3@800MHz for the C/Scheme-impl.
-;
-; speed in PLT 204 with SRFI-27 opened:
-;
-;   (time (do ((k 0 (+ k 1))) ((= k 100000)) (random-integer 2)))
-;   ; about 30000/s on P3@800MHz for the Scheme-impl.
-;
-;   (time (do ((k 0 (+ k 1))) ((= k 100000)) (random-real)))
-;   ; about 50000/s on P3@800MHz for the Scheme-impl.
-;
-; running this file in Gambit 3.0 (interpreter) with SRFI-27 loaded:
-;
-;   (define ascii->char integer->char)
-;   (load "conftest.scm")
-;
-; compiling a simple program in Gambit 3.0 (compiler) using this file:
-;
-;   1. create 'a.scm' with content;
-;     (include "srfi-27-c.scm")
-;     (time (do ((k 0 (+ k 1))) ((= k 1000000)) (random-integer 2)))
-;     (time (do ((k 0 (+ k 1))) ((= k 1000000)) (random-real)))
-;   2. compile Scheme into C (verbose paths for clarity)
-;     GAMBCDIR=$GAMBIT/lib LD_LIBRARY_PATH=$GAMBIT/lib $GAMBIT/gsc/gsc a
-;   3. compile and link C code into an executable
-;     gcc -I$GAMBIT/lib -o a a.c a_.c -lm -lgambc -L$GAMBIT/lib
-;   4. run the executable
-;     GAMBCDIR=$GAMBIT/lib LD_LIBRARY_PATH=$GAMBIT/lib a
-;
-; speed in Gambit 3.0 with SRFI-27 loaded:
-;
-;   (time (do ((k 0 (+ k 1))) ((= k 100000)) (random-integer 2)))
-;   ; about 5000/s on P3@800MHz, interpreted
-;   ; about 200000/s on P3@800MHz, compiled
-;
-;   (time (do ((k 0 (+ k 1))) ((= k 100000)) (random-real)))
-;   ; about 25000/s on P3@800MHz, interpreted
-;   ; about 400000/s on P3@800MHz, compiled
-;
-; history of this file:
-;   SE, 19-Mar-2002: initial version, based on earlier tests
-;   SE, 22-Mar-2002: adapted to new procedure names
-;   SE, 25-Mar-2002: more descriptive output
-;   SE, 04-Apr-2002: some quick timings; check up
-
-
-; (check expr)
-;    evals expr and issues an error if it is not #t.
-
-(define (check expr)
-  (if (not (eq? (eval expr) #t))
-      (error "check failed" expr)))
-
-; Basic Tests of the Interface
-; ============================
-
-(define (my-random-integer n)
-  (let ((x (random-integer n)))
-    (if (<= 0 x (- n 1))
-        x
-        (error "(random-integer n) returned illegal value" x))))
-
-(define (my-random-real)
-  (let ((x (random-real)))
-    (if (< 0 x 1)
-        x
-        (error "(random-real) returned illegal value" x))))
-
-(define (check-basics-1)
-
-  ; generate increasingly large numbers
-  (display "; generating large numbers [bits]: ")
-  (do ((k 0 (+ k 1))
-       (n 1 (* n 2)))
-      ((> k 1024))
-    (display k)
-    (display " ")
-    (my-random-integer n))
-  (display "ok")
-  (newline)
-
-  ; generate some reals
-  (display "; generating reals [1000 times]: ")
-  (do ((k 0 (+ k 1))
-       (x (my-random-real) (+ x (my-random-real))))
-      ((= k 1000)
-       x))
-  (display "ok")
-  (newline)
-
-  ; get/set the state
-  (display "; get/set state: ")
-  (let* ((state1 (random-source-state-ref default-random-source))
-         (x1 (my-random-integer (expt 2 32)))
-         (state2 (random-source-state-ref default-random-source))
-         (x2 (my-random-integer (expt 2 32))))
-    (random-source-state-set! default-random-source state1)
-    (let ((y1 (my-random-integer (expt 2 32))))
-      (if (not (= x1 y1))
-          (error "state get/set doesn't work" x1 y1 state1)))
-    (random-source-state-set! default-random-source state2)
-    (let ((y2 (my-random-integer (expt 2 32))))
-      (if (not (= x2 y2))
-          (error "state get/set doesn't work" x2 y2 state2))))
-  (display "ok")
-  (newline)
-
-  ; randomize!
-  (display "; randomize!: ")
-  (let* ((state1 (random-source-state-ref default-random-source))
-         (x1 (my-random-integer (expt 2 32))))
-    (random-source-state-set! default-random-source state1)
-    (random-source-randomize! default-random-source)
-    (let ((y1 (my-random-integer (expt 2 32))))
-      (if (= x1 y1)
-          (error "random-source-randomize! didn't work" x1 state1))))
-  (display "ok")
-  (newline)
-
-  ; pseudo-randomize!
-  (display "; pseudo-randomize!: ")
-  (let* ((state1 (random-source-state-ref default-random-source))
-         (x1 (my-random-integer (expt 2 32))))
-    (random-source-state-set! default-random-source state1)
-    (random-source-pseudo-randomize! default-random-source 0 1)
-    (let ((y1 (my-random-integer (expt 2 32))))
-      (if (= x1 y1)
-          (error "random-source-pseudo-randomize! didn't work" x1 state1)))
-    (random-source-state-set! default-random-source state1)
-    (random-source-pseudo-randomize! default-random-source 1 0)
-    (let ((y1 (my-random-integer (expt 2 32))))
-      (if (= x1 y1)
-          (error "random-source-pseudo-randomize! didn't work" x1 state1))))
-  (display "ok")
-  (newline)
-  (newline))
-
-
-; Testing the MRG32k3a Generator (if implemented)
-; ===============================================
-
-; (check-mrg32k3a)
-;   tests if the underlying generator is the MRG32k3a generator
-;   as implemented in the reference implementation. This function
-;   is useful to check whether the reference implementation computes
-;   the right numbers.
-
-(define (check-mrg32k3a)
- 
-  ; check if the initial state is A^16 * (1 0 0 1 0 0)
-  (display "; check A^16 * (1 0 0 1 0 0)")
-  (let* ((s (make-random-source))
-         (state1 (random-source-state-ref s))
-	 (rand (random-source-make-reals s)))
-    (random-source-state-set! s '(lecuyer-mrg32k3a 1 0 0 1 0 0))
-    (do ((k 0 (+ k 1)))
-	((= k 16)
-	 (let ((state2 (random-source-state-ref s)))
-	   (if (not (equal? state1 state2))
-	       (error "16-th state after (1 0 0 1 0 0) is wrong"))))
-	(rand)))
-  (display "ok")
-  (newline)
-
-  ; check if pseudo-randomize! advances properly
-  (display "; checking (random-source-pseudo-randomize! s 1 2)")
-  (let ((s (make-random-source)))
-    (random-source-pseudo-randomize! s 1 2)
-    (if (not (equal? (random-source-state-ref s)
-		     '(lecuyer-mrg32k3a 
-		       1250826159 
-		       3004357423 
-		        431373563 
-		       3322526864 
-		        623307378 
-		       2983662421)))
-	(error "pseudo-randomize! gives wrong result")))
-  (display "ok")
-  (newline)
-
-  ; run the check published by Pierre L'Ecuyer:
-  ;   Note that the reference implementation deals slightly different
-  ;   with reals mapping m1-1 into 1-1/(m1+1) and not into 0 as in
-  ;   L'Ecuyer's original proposal. However, for the first 10^7 reals
-  ;   that makes no difference as m1-1 is not generated.
-  (display "; checking (random-source-pseudo-randomize! s 1 2)...")
-  (let* ((x 0.0) 
-	 (s (make-random-source))
-	 (rand (random-source-make-reals s)))
-    (random-source-state-set!
-     s
-     '(lecuyer-mrg32k3a 12345 12345 12345 12345 12345 12345))
-    (do ((k 0 (+ k 1)))
-	((= k 10000000)
-	 (if (not (< (abs (- x 5001090.95)) 0.01))
-	     (error "bad sum over 10^7 reals" x)))
-      (set! x (+ x (rand)))))
-  (display "ok")
-  (newline))
-
-
-; Writing Data to DIEHARD
-; =======================
-
-; (write-diehard filename s bytes-per-call calls)
-;    creates a binary file to which bytes-per-call * calls bytes are
-;    written. The bytes are obtained from the random source s using
-;    the range n = (expt 256 bytes-per-call).
-;       The intention of write-diehard is to give implementors a 
-;    '15 min.'-way of running their favourite random number generator 
-;    through a pretty tough testsuite.
-;
-;    try: For the reference implementation, the call
-;
-;       (write-diehard "outfile" (make-random-source) 4 2867200)
-;
-;    should create a file that looks as follows (od -A x -t x1 outfile):
-;
-;       0000000 92 bb 7e db 1b 14 f6 bb bb 54 a1 55 c2 3e cd ca
-;       0000010 23 01 20 35 06 47 65 b0 52 4c b8 c0 21 48 af 67
-;       0000020 63 a9 8c 78 50 73 29 08 62 d1 22 7f a6 89 96 77
-;       0000030 98 28 65 2d 2d 8b f9 52 41 be 8e 3f c5 84 0f ca
-;       0000040 c0 fa 03 d6 f0 65 9d 3a 9b ab 6f fe d1 aa 5f 92
-;       0000050 0f ea f6 3b 78 b9 fe ad 63 5e 49 f1 9d c9 8e 2f
-;       0000060 53 a9 5d 32 d4 20 51 1d 1c 2e 82 f0 8b 26 40 c0
-;       ...total length is 11468800 bytes.
-;
-;    The message digest is md5sum = 4df554f56cb5ed251bd04b0d50767443.
-;
-;    try: For the reference implementation, the call
-;
-;       (write-diehard "outfile" (make-random-source) 3 3822934)
-;
-;    should create a file that looks as follows (od -A x -t x1 outfile):
-;
-;       000000 bb 7e db 30 a3 49 14 f6 bb d0 f2 d0 54 a1 55 8b
-;       000010 8c 03 3e cd ca a3 88 1d 01 20 35 e8 50 c8 47 65
-;       000020 b0 e7 d9 28 4c b8 c0 f2 82 35 48 af 67 42 3e 8a
-;       000030 a9 8c 78 12 ef b6 73 29 08 ff e9 71 d1 22 7f 52
-;       000040 b8 f0 89 96 77 dc 71 86 28 65 2d c2 82 fc 8b f9
-;       000050 52 d7 23 2a be 8e 3f 61 a8 99 84 0f ca 44 83 65
-;       000060 fa 03 d6 c2 11 c0 65 9d 3a c2 7a dd ab 6f fe 1c
-;       ...total length is 11468802 bytes.
-;
-;    The message digest is md5sum = 750ac219ff40c50bb2d04ff5eff9b24c.
-
-(define (write-diehard filename s bytes-per-call calls)
-  (let ((port (open-output-file filename))
-	(rand (random-source-make-integers s))
-        (n (expt 256 bytes-per-call)))
-    (do ((i 0 (+ i 1))) 
-        ((= i calls) 
-         (close-output-port port))
-      (let ((x (rand n)))
-        (do ((k 0 (+ k 1))) ((= k bytes-per-call))
-          (write-char (ascii->char (modulo x 256)) port)
-          (set! x (quotient x 256)))))))
-         
-; run some tests
-(check-basics-1)
-(display "passed (check-basics-1)")
-(newline)
-
-) ; end module
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/27/random-bits.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/27/random-bits.rkt
deleted file mode 100644
index a723a729b0..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/27/random-bits.rkt
+++ /dev/null
@@ -1,364 +0,0 @@
-; MODULE DEFINITION FOR SRFI-27
-; =============================
-; 
-; based on Sebastian.Egner@philips.com, Mar-2002, in PLT 204
-;  plus the C code from that SRFI, which is built into
-;  MzScheme's random routines.
-; Contributors include David Van Horn and Chongkai Zhu.
-
-; GENERIC PART OF MRG32k3a-GENERATOR FOR SRFI-27
-; ==============================================
-;
-; Sebastian.Egner@philips.com, 2002.
-;
-; This is the generic R5RS-part of the implementation of the MRG32k3a
-; generator to be used in SRFI-27. It is based on a separate implementation
-; of the core generator (presumably in native code) and on code to
-; provide essential functionality not available in R5RS (see below).
-;
-; compliance:
-;   Scheme R5RS with integer covering at least {-2^53..2^53-1}.
-;   In addition,
-;     SRFI-23: error
-;
-; history of this file:
-;   SE, 22-Mar-2002: refactored from earlier versions
-;   SE, 25-Mar-2002: pack/unpack need not allocate
-;   SE, 27-Mar-2002: changed interface to core generator
-;   SE, 10-Apr-2002: updated spec of mrg32k3a-random-integer
-
-; Generator
-; =========
-;
-; Pierre L'Ecuyer's MRG32k3a generator is a Combined Multiple Recursive 
-; Generator. It produces the sequence {(x[1,n] - x[2,n]) mod m1 : n} 
-; defined by the two recursive generators
-;
-;   x[1,n] = (               a12 x[1,n-2] + a13 x[1,n-3]) mod m1,
-;   x[2,n] = (a21 x[2,n-1] +                a23 x[2,n-3]) mod m2,
-;
-; where the constants are
-;   m1       = 4294967087 = 2^32 - 209    modulus of 1st component
-;   m2       = 4294944443 = 2^32 - 22853  modulus of 2nd component
-;   a12      =  1403580                   recursion coefficients
-;   a13      =  -810728
-;   a21      =   527612
-;   a23      = -1370589
-;
-; The generator passes all tests of G. Marsaglia's Diehard testsuite.
-; Its period is (m1^3 - 1)(m2^3 - 1)/2 which is nearly 2^191.
-; L'Ecuyer reports: "This generator is well-behaved in all dimensions
-; up to at least 45: ..." [with respect to the spectral test, SE].
-;
-; The period is maximal for all values of the seed as long as the
-; state of both recursive generators is not entirely zero.
-;
-; As the successor state is a linear combination of previous
-; states, it is possible to advance the generator by more than one
-; iteration by applying a linear transformation. The following
-; publication provides detailed information on how to do that:
-;
-;    [1] P. L'Ecuyer, R. Simard, E. J. Chen, W. D. Kelton:
-;        An Object-Oriented Random-Number Package With Many Long 
-;        Streams and Substreams. 2001.
-;        To appear in Operations Research.
-;
-; Arithmetics
-; ===========
-;
-; The MRG32k3a generator produces values in {0..2^32-209-1}. All 
-; subexpressions of the actual generator fit into {-2^53..2^53-1}. 
-; The code below assumes that Scheme's "integer" covers this range.
-; In addition, it is assumed that floating point literals can be
-; read and there is some arithmetics with inexact numbers.
-;
-; However, for advancing the state of the generator by more than
-; one step at a time, the full range {0..2^32-209-1} is needed.
-
-
-; Required: Backbone Generator
-; ============================
-;
-; At this point in the code, the following procedures are assumed
-; to be defined to execute the core generator:
-;
-;   (mrg32k3a-pack-state unpacked-state) -> packed-state
-;   (mrg32k3a-unpack-state packed-state) -> unpacked-state
-;      pack/unpack a state of the generator. The core generator works
-;      on packed states, passed as an explicit argument, only. This
-;      allows native code implementations to store their state in a
-;      suitable form. Unpacked states are #(x10 x11 x12 x20 x21 x22) 
-;      with integer x_ij. Pack/unpack need not allocate new objects
-;      in case packed and unpacked states are identical.
-;
-;   (mrg32k3a-random-range) -> m-max
-;   (mrg32k3a-random-integer packed-state range) -> x in {0..range-1}
-;      advance the state of the generator and return the next random
-;      range-limited integer. 
-;        Note that the state is not necessarily advanced by just one 
-;      step because we use the rejection method to avoid any problems 
-;      with distribution anomalies.
-;        The range argument must be an exact integer in {1..m-max}.
-;      It can be assumed that range is a fixnum if the Scheme system
-;      has such a number representation.
-;
-;   (mrg32k3a-random-real packed-state) -> x in (0,1)
-;      advance the state of the generator and return the next random
-;      real number between zero and one (both excluded). The type of
-;      the result should be a flonum if possible.
-
-#lang scheme/base
-
-(require mzlib/contract)
-  
-(provide random-real
-         default-random-source
-         make-random-source
-         random-source?
-         random-source-state-ref
-         random-source-state-set!
-         random-source-randomize!
-         random-source-pseudo-randomize!)
-
-(define (random-source? v)
-  (pseudo-random-generator? v))
-
-(provide/contract (random-integer
-                   (-> exact-positive-integer? any))
-                  (random-source-make-integers
-                   (-> random-source? (-> exact-positive-integer? any)))
-                  (random-source-make-reals
-                   (case->
-                    (-> random-source? any)
-                    (-> random-source? (and/c (>/c 0) (</c 1)) any))))
-
-(define mrg32k3a-initial-state ; 0 3 6 9 12 15 of A^16, see below
-  '#( 1062452522
-      2961816100 
-       342112271 
-      2854655037 
-      3321940838 
-      3542344109))
-
-(define (make-random-source)
-  (let ([new (make-pseudo-random-generator)])
-    (vector->pseudo-random-generator! new mrg32k3a-initial-state)
-    new))
-
-(define default-random-source (make-random-source))
-
-(define (random-source-state-ref s)
-  (pseudo-random-generator->vector s))
-
-(define (random-source-state-set! s state)
-  (vector->pseudo-random-generator! s state))
-
-(define (random-source-randomize! s)
-  (let ([new (make-pseudo-random-generator)])
-    (random-source-state-set! s (random-source-state-ref new))))
-  
-(define (random-source-pseudo-randomize! s i j)
-  (let ([vec (mrg32k3a-pseudo-randomize-state i j)])
-    (vector->pseudo-random-generator! s vec)))
-
-(define (my-random-integer n s)
-  (if (<= n 4294967087)
-      (random n s)
-      (mrg32k3a-random-large s n)))
-
-(define (random-source-make-integers s)
-  (lambda (n)
-    (my-random-integer n s)))
-  
-(define random-source-make-reals
-  (case-lambda
-   [(s) (lambda () (random s))]
-   [(s unit)
-    (let ((n (inexact->exact (floor (/ unit)))))
-      (lambda ()
-        (* (add1 (my-random-integer n s)) unit)))]))
-  
-(define random-integer
-  (random-source-make-integers default-random-source))
-
-(define random-real
-  (random-source-make-reals default-random-source))
-
-; Large Integers
-; ==============
-;
-; To produce large integer random deviates, for n > m-max, we first 
-; construct large random numbers in the range {0..m-max^k-1} for some 
-; k such that m-max^k >= n and then use the rejection method to choose
-; uniformly from the range {0..n-1}.
-
-(define mrg32k3a-m-max 4294967087)
-(define (mrg32k3a-random-integer s n) (random n s))
-
-(define (mrg32k3a-random-power state k) ; n = m-max^k, k >= 1
-  (if (= k 1)
-      (mrg32k3a-random-integer state mrg32k3a-m-max)
-      (+ (* (mrg32k3a-random-power state (- k 1)) mrg32k3a-m-max)
-         (mrg32k3a-random-integer state mrg32k3a-m-max))))
-
-(define (mrg32k3a-random-large state n) ; n > m-max
-  (do ((k 2 (+ k 1))
-       (mk (* mrg32k3a-m-max mrg32k3a-m-max) (* mk mrg32k3a-m-max)))
-      ((>= mk n)
-       (let* ((mk-by-n (quotient mk n))
-              (a (* mk-by-n n)))
-         (do ((x (mrg32k3a-random-power state k)
-                 (mrg32k3a-random-power state k)))
-             ((< x a) (quotient x mk-by-n)))))))
-
-
-; Pseudo-Randomization
-; ====================
-;
-; Reference [1] above shows how to obtain many long streams and 
-; substream from the backbone generator.
-;
-; The idea is that the generator is a linear operation on the state.
-; Hence, we can express this operation as a 3x3-matrix acting on the
-; three most recent states. Raising the matrix to the k-th power, we
-; obtain the operation to advance the state by k steps at once. The
-; virtual streams and substreams are now simply parts of the entire
-; periodic sequence (which has period around 2^191).
-;
-; For the implementation it is necessary to compute with matrices in
-; the ring (Z/(m1*m1)*Z)^(3x3). By the Chinese-Remainder Theorem, this
-; is isomorphic to ((Z/m1*Z) x (Z/m2*Z))^(3x3). We represent such a pair
-; of matrices 
-;   [ [[x00 x01 x02],
-;      [x10 x11 x12],
-;      [x20 x21 x22]], mod m1
-;     [[y00 y01 y02],
-;      [y10 y11 y12],
-;      [y20 y21 y22]]  mod m2]
-; as a vector of length 18 of the integers as written above:
-;   #(x00 x01 x02 x10 x11 x12 x20 x21 x22
-;     y00 y01 y02 y10 y11 y12 y20 y21 y22)
-;
-; As the implementation should only use the range {-2^53..2^53-1}, the
-; fundamental operation (x*y) mod m, where x, y, m are nearly 2^32, 
-; is computed by breaking up x and y as x = x1*w + x0 and y = y1*w + y0 
-; where w = 2^16. In this case, all operations fit the range because 
-; w^2 mod m is a small number. If proper multiprecision integers are
-; available this is not necessary, but pseudo-randomize! is an expected
-; to be called only occasionally so we do not provide this implementation.
-
-(define mrg32k3a-m1 4294967087) ; modulus of component 1
-(define mrg32k3a-m2 4294944443) ; modulus of component 2
-
-(define mrg32k3a-generators #f) ; computed when needed
-
-(define (mrg32k3a-pseudo-randomize-state i j)
-
-  (define (product A B) ; A*B in ((Z/m1*Z) x (Z/m2*Z))^(3x3)
-
-    (define w      65536) ; wordsize to split {0..2^32-1}
-    (define w-sqr1 209)   ; w^2 mod m1
-    (define w-sqr2 22853) ; w^2 mod m2
-
-    (define (lc i0 i1 i2 j0 j1 j2 m w-sqr) ; linear combination
-      (let ((a0h (quotient (vector-ref A i0) w))
-            (a0l (modulo   (vector-ref A i0) w))
-            (a1h (quotient (vector-ref A i1) w))
-            (a1l (modulo   (vector-ref A i1) w))
-            (a2h (quotient (vector-ref A i2) w))
-            (a2l (modulo   (vector-ref A i2) w))
-            (b0h (quotient (vector-ref B j0) w))
-            (b0l (modulo   (vector-ref B j0) w))
-            (b1h (quotient (vector-ref B j1) w))
-            (b1l (modulo   (vector-ref B j1) w))
-            (b2h (quotient (vector-ref B j2) w))
-            (b2l (modulo   (vector-ref B j2) w)))
-        (modulo
-         (+ (* (+ (* a0h b0h) 
-                  (* a1h b1h) 
-                  (* a2h b2h)) 
-               w-sqr)
-            (* (+ (* a0h b0l) 
-                  (* a0l b0h)
-                  (* a1h b1l) 
-                  (* a1l b1h)
-                  (* a2h b2l) 
-                  (* a2l b2h))
-               w)
-            (* a0l b0l)
-            (* a1l b1l)
-            (* a2l b2l))
-         m)))
-    
-    (vector
-     (lc  0  1  2   0  3  6  mrg32k3a-m1 w-sqr1) ; (A*B)_00 mod m1
-     (lc  0  1  2   1  4  7  mrg32k3a-m1 w-sqr1) ; (A*B)_01
-     (lc  0  1  2   2  5  8  mrg32k3a-m1 w-sqr1)
-     (lc  3  4  5   0  3  6  mrg32k3a-m1 w-sqr1) ; (A*B)_10
-     (lc  3  4  5   1  4  7  mrg32k3a-m1 w-sqr1)
-     (lc  3  4  5   2  5  8  mrg32k3a-m1 w-sqr1)
-     (lc  6  7  8   0  3  6  mrg32k3a-m1 w-sqr1)
-     (lc  6  7  8   1  4  7  mrg32k3a-m1 w-sqr1)
-     (lc  6  7  8   2  5  8  mrg32k3a-m1 w-sqr1)
-     (lc  9 10 11   9 12 15  mrg32k3a-m2 w-sqr2) ; (A*B)_00 mod m2
-     (lc  9 10 11  10 13 16  mrg32k3a-m2 w-sqr2)
-     (lc  9 10 11  11 14 17  mrg32k3a-m2 w-sqr2)
-     (lc 12 13 14   9 12 15  mrg32k3a-m2 w-sqr2)
-     (lc 12 13 14  10 13 16  mrg32k3a-m2 w-sqr2)
-     (lc 12 13 14  11 14 17  mrg32k3a-m2 w-sqr2)
-     (lc 15 16 17   9 12 15  mrg32k3a-m2 w-sqr2)
-     (lc 15 16 17  10 13 16  mrg32k3a-m2 w-sqr2)
-     (lc 15 16 17  11 14 17  mrg32k3a-m2 w-sqr2)))
-
-  (define (power A e) ; A^e
-    (cond
-     ((zero? e)
-      '#(1 0 0 0 1 0 0 0 1 1 0 0 0 1 0 0 0 1))
-     ((= e 1)
-      A)
-     ((even? e)
-      (power (product A A) (quotient e 2)))
-     (else
-      (product (power A (- e 1)) A))))
-
-  (define (power-power A b) ; A^(2^b)
-    (if (zero? b)
-        A
-        (power-power (product A A) (- b 1))))
-
-  (define A                        ; the MRG32k3a recursion
-    '#(     0 1403580 4294156359
-            1       0          0
-            0       1          0
-       527612       0 4293573854
-            1       0          0
-            0       1          0))
-
-  ; check arguments
-  (when (not (and (exact-integer? i) 
-                  (exact-integer? j)))
-      (error "'random-source-pseudo-randomize!: arguments must be exact integers:" i j))
-
-  ; precompute A^(2^127) and A^(2^76) only once
-
-  (when (not mrg32k3a-generators)
-      (set! mrg32k3a-generators
-            (list (power-power A 127)
-                  (power-power A  76)
-                  (power A 16))))
-
-  ; compute M = A^(16 + i*2^127 + j*2^76)
-  (let ((M (product 
-            (list-ref mrg32k3a-generators 2)
-            (product
-             (power (list-ref mrg32k3a-generators 0)
-                    (modulo i (expt 2 28)))
-             (power (list-ref mrg32k3a-generators 1) 
-                    (modulo j (expt 2 28)))))))
-     (vector
-      (vector-ref M 0)
-      (vector-ref M 3)
-      (vector-ref M 6)
-      (vector-ref M 9)
-      (vector-ref M 12)
-      (vector-ref M 15))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/28.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/28.rkt
deleted file mode 100644
index 7f379c95d1..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/28.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-;; Supported by core PLT:
-#lang scheme/base
-(provide format)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/30.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/30.rkt
deleted file mode 100644
index f45bdf1608..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/30.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; Supported by core PLT, nothing to provide:
-#lang scheme/base
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/31.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/31.rkt
deleted file mode 100644
index e391fb8ed5..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/31.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-31: A special form rec for recursive evaluation
-#lang s-exp srfi/provider srfi/31/rec
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/31/rec.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/31/rec.rkt
deleted file mode 100644
index 46abb60f9e..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/31/rec.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-(module rec mzscheme
-  (provide rec)
-  (require mzlib/etc))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/32.rkt
deleted file mode 100644
index 6d76f0d115..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-32
-#lang s-exp srfi/provider srfi/32/sort
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/delndups.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/32/delndups.scm
deleted file mode 100644
index 6c26afec6a..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/delndups.scm
+++ /dev/null
@@ -1,194 +0,0 @@
-(module delndups mzscheme
-  (require "vector-util.scm")
-  (provide list-delete-neighbor-dups
-           #;list-delete-neighbor-dups!
-           vector-delete-neighbor-dups
-           #;vector-delete-neighbor-dups!)
-  
-  ;;; The sort package -- delete neighboring duplicate elts
-  ;;; Copyright (c) 1998 by Olin Shivers.
-  ;;; This code is open-source; see the end of the file for porting and
-  ;;; more copyright information.
-  ;;; Olin Shivers 11/98.
-  
-  ;;; Problem:
-  ;;; vector-delete-neighbor-dups pushes N stack frames, where N is the number
-  ;;; of elements in the answer vector. This is arguably a very efficient thing
-  ;;; to do, but it might blow out on a system with a limited stack but a big
-  ;;; heap. We could rewrite this to "chunk" up answers in temp vectors if we
-  ;;; push more than a certain number of frames, then allocate a final answer,
-  ;;; copying all the chunks into the answer. But it's much more complex code.
-  
-  ;;; Exports:
-  ;;; (list-delete-neighbor-dups  = lis) -> list
-  ;;; (list-delete-neighbor-dups! = lis) -> list
-  ;;; (vector-delete-neighbor-dups  = v [start end]) -> vector
-  ;;; (vector-delete-neighbor-dups! = v [start end]) -> end'
-  
-  ;;; These procedures delete adjacent duplicate elements from a list or
-  ;;; a vector, using a given element equality procedure. The first or leftmost
-  ;;; element of a run of equal elements is the one that survives. The list
-  ;;; or vector is not otherwise disordered.
-  ;;;
-  ;;; These procedures are linear time -- much faster than the O(n^2) general 
-  ;;; duplicate-elt deletors that do not assume any "bunching" of elements.
-  ;;; If you want to delete duplicate elements from a large list or vector,
-  ;;; sort the elements to bring equal items together, then use one of these
-  ;;; procedures -- for a total time of O(n lg n). 
-  
-  ;;; LIST-DELETE-NEIGHBOR-DUPS
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; Below are multiple versions of the LIST-DELETE-NEIGHBOR-DUPS procedure,
-  ;;; from simple to complex. RECUR's contract: Strip off any leading X's from 
-  ;;; LIS, and return that list neighbor-dup-deleted.
-  ;;;
-  ;;; The final version
-  ;;; - shares a common subtail between the input & output list, up to 1024 
-  ;;;   elements;
-  ;;; - Needs no more than 1024 stack frames.
-  
-  ;;; Simplest version. 
-  ;;; - Always allocates a fresh list / never shares storage.
-  ;;; - Needs N stack frames, if answer is length N.
-#;  (define (list-delete-neighbor-dups = lis)
-    (if (pair? lis)
-        (let ((x0 (car lis)))
-          (cons x0 (let recur ((x0 x0) (xs (cdr lis)))
-                     (if (pair? xs)
-                         (let ((x1  (car xs))
-                               (x2+ (cdr xs)))
-                           (if (= x0 x1)
-                               (recur x0 x2+) ; Loop, actually.
-                               (cons x1 (recur x1 x2+))))
-                         xs))))
-        lis))
-  
-  ;;; This version tries to use cons cells from input by sharing longest
-  ;;; common tail between input & output. Still needs N stack frames, for ans
-  ;;; of length N.
-  (define (list-delete-neighbor-dups = lis)
-    (if (pair? lis)
-        (let* ((x0 (car lis))
-               (xs (cdr lis))
-               (ans (let recur ((x0 x0) (xs xs))
-                      (if (pair? xs)
-                          (let ((x1  (car xs))
-                                (x2+ (cdr xs)))
-                            (if (= x0 x1)
-                                (recur x0 x2+)
-                                (let ((ans-tail (recur x1 x2+)))
-                                  (if (eq? ans-tail x2+) xs
-                                      (cons x1 ans-tail)))))
-                          xs))))
-          (if (eq? ans xs) lis (cons x0 ans)))
-        
-        lis))
-  
-  ;;; LIST-DELETE-NEIGHBOR-DUPS!
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; This code runs in constant list space, constant stack, and also
-  ;;; does only the minimum SET-CDR!'s necessary.
-  
-  #;
-  (define (list-delete-neighbor-dups! = lis)
-    (if (pair? lis)
-        (let lp1 ((prev lis) (prev-elt (car lis)) (lis (cdr lis)))
-          (if (pair? lis)
-              (let ((lis-elt (car lis))
-                    (next (cdr lis)))
-                (if (= prev-elt lis-elt)
-                    
-                    ;; We found the first elts of a run of dups, so we know
-                    ;; we're going to have to do a SET-CDR!. Scan to the end of
-                    ;; the run, do the SET-CDR!, and loop on LP1.
-                    (let lp2 ((lis next))
-                      (if (pair? lis)
-                          (let ((lis-elt (car lis))
-                                (next (cdr lis)))
-                            (if (= prev-elt lis-elt)
-                                (lp2 next)
-                                (begin (set-cdr! prev lis)
-                                       (lp1 lis lis-elt next))))
-                          (set-cdr! prev lis)))	; Ran off end => quit.
-                    
-                    (lp1 lis lis-elt next))))))
-    lis)
-  
-  
-  (define (vector-delete-neighbor-dups elt= v . maybe-start+end)
-    (call-with-values
-     (lambda () (vector-start+end v maybe-start+end))
-     (lambda (start end)
-       (if (< start end)
-           (let* ((x (vector-ref v start))
-                  (ans (let recur ((x x) (i start) (j 1))
-                         (if (< i end)
-                             (let ((y (vector-ref v i))
-                                   (nexti (+ i 1)))
-                               (if (elt= x y)
-                                   (recur x nexti j)
-                                   (let ((ansvec (recur y nexti (+ j 1))))
-                                     (vector-set! ansvec j y)
-                                     ansvec)))
-                             (make-vector j)))))
-             (vector-set! ans 0 x)
-             ans)
-           '#()))))
-  
-  
-  ;;; Packs the surviving elements to the left, in range [start,end'),
-  ;;; and returns END'.
-  #;
-  (define (vector-delete-neighbor-dups! elt= v . maybe-start+end)
-    (call-with-values
-     (lambda () (vector-start+end v maybe-start+end))
-     (lambda (start end)
-       
-       (if (>= start end)
-           end
-           ;; To eliminate unnecessary copying (read elt i then write the value 
-           ;; back at index i), we scan until we find the first dup.
-           (let skip ((j start) (vj (vector-ref v start)))
-             (let ((j+1 (+ j 1)))
-               (if (>= j+1 end)
-                   end
-                   (let ((vj+1 (vector-ref v j+1)))
-                     (if (not (elt= vj vj+1))
-                         (skip j+1 vj+1)
-                         
-                         ;; OK -- j & j+1 are dups, so we're committed to moving
-                         ;; data around. In lp2, v[start,j] is what we've done;
-                         ;; v[k,end) is what we have yet to handle.
-                         (let lp2 ((j j) (vj vj) (k (+ j 2)))
-                           (let lp3 ((k k))
-                             (if (>= k end)
-                                 (+ j 1) ; Done.
-                                 (let ((vk (vector-ref v k))
-                                       (k+1 (+ k 1)))
-                                   (if (elt= vj vk)
-                                       (lp3 k+1)
-                                       (let ((j+1 (+ j 1)))
-                                         (vector-set! v j+1 vk)
-                                         (lp2 j+1 vk k+1))))))))))))))))
-  
-  ;;; Copyright
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; This code is
-  ;;;     Copyright (c) 1998 by Olin Shivers.
-  ;;; The terms are: You may do as you please with this code, as long as
-  ;;; you do not delete this notice or hold me responsible for any outcome
-  ;;; related to its use.
-  ;;;
-  ;;; Blah blah blah. Don't you think source files should contain more lines
-  ;;; of code than copyright notice?
-  ;;;
-  ;;; Code porting
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;;
-  ;;; If your Scheme has a faster mechanism for handling optional arguments
-  ;;; (e.g., Chez), you should definitely port over to it. Note that argument
-  ;;; defaulting and error-checking are interleaved -- you don't have to
-  ;;; error-check defaulted START/END args to see if they are fixnums that are
-  ;;; legal vector indices for the corresponding vector, etc.
-
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/info.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/32/info.rkt
deleted file mode 100644
index ff0d98716a..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("test.scm"))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/lmsort.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/32/lmsort.scm
deleted file mode 100644
index 9c7f001767..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/lmsort.scm
+++ /dev/null
@@ -1,395 +0,0 @@
-(module lmsort mzscheme
-  (provide list-merge
-           #;list-merge!
-           list-merge-sort
-           #;list-merge-sort!)
-  
-  ;;; list merge & list merge-sort	-*- Scheme -*-
-  ;;; Copyright (c) 1998 by Olin Shivers.
-  ;;; This code is open-source; see the end of the file for porting and
-  ;;; more copyright information.
-  ;;; Olin Shivers
-  
-  ;;; Exports:
-  ;;; (list-merge  < lis lis) -> list
-  ;;; (list-merge! < lis lis) -> list
-  ;;; (list-merge-sort  < lis) -> list
-  ;;; (list-merge-sort! < lis) -> list
-  
-  ;;; A stable list merge sort of my own device
-  ;;; Two variants: pure & destructive
-  ;;;
-  ;;; This list merge sort is opportunistic (a "natural" sort) -- it exploits
-  ;;; existing order in the input set. Instead of recursing all the way down to
-  ;;; individual elements, the leaves of the merge tree are maximal contiguous
-  ;;; runs of elements from the input list. So the algorithm does very well on
-  ;;; data that is mostly ordered, with a best-case time of O(n) when the input
-  ;;; list is already completely sorted. In any event, worst-case time is
-  ;;; O(n lg n).
-  ;;;
-  ;;; The destructive variant is "in place," meaning that it allocates no new
-  ;;; cons cells at all; it just rearranges the pairs of the input list with
-  ;;; SET-CDR! to order it.
-  ;;;
-  ;;; The interesting control structure is the combination recursion/iteration
-  ;;; of the core GROW function that does an "opportunistic" DFS walk of the
-  ;;; merge tree, adaptively subdividing in response to the length of the
-  ;;; merges, without requiring any auxiliary data structures beyond the
-  ;;; recursion stack. It's actually quite simple -- ten lines of code.
-  ;;;	-Olin Shivers 10/20/98
-  
-  ;;; (mlet ((var-list mv-exp) ...) body ...)
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; A LET* form that handles multiple values. Move this into the two clients
-  ;;; if you don't have a module system handy to restrict its visibility...
-  (define-syntax mlet ; Multiple-value LET*
-    (syntax-rules ()
-      ((mlet ((() exp) rest ...) body ...)
-       (begin exp (mlet (rest ...) body ...)))
-      
-      ((mlet (((var) exp) rest ...) body ...)
-       (let ((var exp)) (mlet (rest ...) body ...)))
-      
-      ((mlet ((vars exp) rest ...) body ...)
-       (call-with-values (lambda () exp) 
-                         (lambda vars (mlet (rest ...) body ...))))
-      
-      ((mlet () body ...) (begin body ...))))
-  
-  
-  ;;; (list-merge-sort < lis)
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; A natural, stable list merge sort. 
-  ;;; - natural: picks off maximal contiguous runs of pre-ordered data.
-  ;;; - stable: won't invert the order of equal elements in the input list.
-  
-  (define (list-merge-sort elt< lis)
-    
-    ;; (getrun lis) -> run runlen rest
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; Pick a run of non-decreasing data off of non-empty list LIS. 
-    ;; Return the length of this run, and the following list.
-    (define (getrun lis)
-      (let lp ((ans '())  (i 1)  (prev (car lis))  (xs (cdr lis)))
-        (if (pair? xs)
-            (let ((x (car xs)))
-              (if (elt< x prev) 
-                  (values (append-reverse ans (cons prev '())) i xs)
-                  (lp (cons prev ans) (+ i 1) x (cdr xs))))
-            (values (append-reverse ans (cons prev '())) i xs))))
-    
-    (define (append-reverse rev-head tail)
-      (let lp ((rev-head rev-head) (tail tail))
-        (if (null-list? rev-head) tail
-            (lp (cdr rev-head) (cons (car rev-head) tail)))))
-    
-    (define (null-list? l)
-      (cond ((pair? l) #f)
-            ((null? l) #t)
-            (else (error "null-list?: argument out of domain" l))))
-    
-    ;; (merge a b) -> list
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; List merge -- stably merge lists A (length > 0) & B (length > 0).
-    ;; This version requires up to |a|+|b| stack frames.
-    (define (merge a b)
-      (let recur ((x (car a)) (a a)
-                              (y (car b)) (b b))
-        (if (elt< y x)
-            (cons y (let ((b (cdr b)))
-                      (if (pair? b)
-                          (recur x a (car b) b)
-                          a)))
-            (cons x (let ((a (cdr a)))
-                      (if (pair? a)
-                          (recur (car a) a y b)
-                          b))))))
-    
-    ;; (grow s ls ls2 u lw) -> [a la unused]
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; The core routine. Read the next 20 lines of comments & all is obvious.
-    ;; - S is a sorted list of length LS > 1.
-    ;; - LS2 is some power of two <= LS.
-    ;; - U is an unsorted list.
-    ;; - LW is a positive integer.
-    ;; Starting with S, and taking data from U as needed, produce
-    ;; a sorted list of *at least* length LW, if there's enough data
-    ;; (LW <= LS + length(U)), or use all of U if not.
-    ;;
-    ;; GROW takes maximal contiguous runs of data from U at a time;
-    ;; it is allowed to return a list *longer* than LW if it gets lucky
-    ;; with a long run.
-    ;;
-    ;; The key idea: If you want a merge operation to "pay for itself," the two
-    ;; lists being merged should be about the same length. Remember that.
-    ;;
-    ;; Returns:
-    ;;   - A:      The result list
-    ;;   - LA:     The length of the result list
-    ;;   - UNUSED: The unused tail of U.
-    
-    (define (grow s ls ls2 u lw)	; The core of the sort algorithm.
-      (if (or (<= lw ls) (not (pair? u)))	; Met quota or out of data?
-          (values s ls u)			; If so, we're done.
-          (mlet (((ls2) (let lp ((ls2 ls2))
-                          (let ((ls2*2 (+ ls2 ls2)))
-                            (if (<= ls2*2 ls) (lp ls2*2) ls2))))
-                 ;; LS2 is now the largest power of two <= LS.
-                 ;; (Just think of it as being roughly LS.)
-                 ((r lr u2)  (getrun u))			; Get a run, then
-                 ((t lt u3)  (grow r lr 1 u2 ls2))) 	; grow it up to be T.
-                (grow (merge s t) (+ ls lt)	 		; Merge S & T, 
-                      (+ ls2 ls2) u3 lw))))	     		;   and loop.
-    
-    ;; Note: (LENGTH LIS) or any constant guaranteed 
-    ;; to be greater can be used in place of INFINITY.
-    (if (pair? lis)				; Don't sort an empty list.
-        (mlet (((r lr tail)  (getrun lis))	; Pick off an initial run,
-               ((infinity)   #o100000000)		; then grow it up maximally.
-               ((a la v)     (grow r lr 1 tail infinity)))
-              a)
-        '()))
-  
-  
-  ;;; (list-merge-sort! < lis)
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; A natural, stable, destructive, in-place list merge sort. 
-  ;;; - natural: picks off maximal contiguous runs of pre-ordered data.
-  ;;; - stable: won't invert the order of equal elements in the input list.
-  ;;; - destructive, in-place: this routine allocates no extra working memory; 
-  ;;;   it simply rearranges the list with SET-CDR! operations.
-  
-  #;
-  (define (list-merge-sort! elt< lis)
-    ;; (getrun lis) -> runlen last rest
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; Pick a run of non-decreasing data off of non-empty list LIS. 
-    ;; Return the length of this run, the last cons cell of the run,
-    ;; and the following list.
-    (define (getrun lis)
-      (let lp ((lis lis) (x (car lis)) (i 1) (next (cdr lis)))
-        (if (pair? next)
-            (let ((y (car next)))
-              (if (elt< y x) 
-                  (values i lis next)
-                  (lp next y (+ i 1) (cdr next))))
-            (values i lis next))))
-    
-    ;; (merge! a enda b endb) -> [m endm]
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; Destructively and stably merge non-empty lists A & B.
-    ;; The last cons of A is ENDA. (The cdr of ENDA can be non-nil.)
-    ;; the last cons of B is ENDB. (The cdr of ENDB can be non-nil.)
-    ;;
-    ;; Return the first and last cons cells of the merged list.
-    ;; This routine is iterative & in-place: it runs in constant stack and 
-    ;; doesn't allocate any cons cells. It is also tedious but simple; don't
-    ;; bother reading it unless necessary.
-    (define (merge! a enda b endb)
-      ;; The logic of these two loops is completely driven by these invariants:
-      ;;   SCAN-A: (CDR PREV) = A. X = (CAR A). Y = (CAR B).
-      ;;   SCAN-B: (CDR PREV) = B. X = (CAR A). Y = (CAR B).
-      (letrec ((scan-a (lambda (prev  x a  y b)     ; Zip down A until we
-                         (cond ((elt< y x)          ; find an elt > (CAR B).
-                                (set-cdr! prev b)
-                                (let ((next-b (cdr b)))
-                                  (if (eq? b endb)
-                                      (begin (set-cdr! b a) enda) ; Done.
-                                      (scan-b b x a (car next-b) next-b))))
-                               
-                               ((eq? a enda) (maybe-set-cdr! a b) endb) ; Done.
-                               
-                               (else (let ((next-a (cdr a)))  ; Continue scan.
-                                       (scan-a a (car next-a) next-a y b))))))
-               
-               (scan-b (lambda (prev  x a  y b)     ; Zip down B while its
-                         (cond ((elt< y x)          ; elts are < (CAR A).
-                                (if (eq? b endb) 
-                                    (begin (set-cdr! b a) enda)      ; Done.
-                                    (let ((next-b (cdr b))) ; Continue scan.
-                                      (scan-b b x a (car next-b) next-b))))
-                               
-                               (else (set-cdr! prev a)
-                                     (if (eq? a enda) 
-                                         (begin (maybe-set-cdr! a b) endb) ; Done.
-                                         (let ((next-a (cdr a)))
-                                           (scan-a a (car next-a) next-a y b)))))))
-               
-               ;; This guy only writes if he has to. Called at most once.
-               ;; Pointer equality rules; pure languages are for momma's boys.
-               (maybe-set-cdr! (lambda (pair val) (if (not (eq? (cdr pair) val)) 
-                                                      (set-cdr! pair val)))))
-        
-        (let ((x (car a))  (y (car b)))
-          (if (elt< y x)
-              
-              ;; B starts the answer list.
-              (values b (if (eq? b endb)
-                            (begin (set-cdr! b a) enda)
-                            (let ((next-b (cdr b)))
-                              (scan-b b x a (car next-b) next-b))))
-              
-              ;; A starts the answer list.
-              (values a (if (eq? a enda) 
-                            (begin (maybe-set-cdr! a b) endb)
-                            (let ((next-a (cdr a)))
-                              (scan-a a (car next-a) next-a y b))))))))
-    
-    ;; (grow s ends ls ls2 u lw) -> [a enda la unused]
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; The core routine.
-    ;; - S is a sorted list of length LS > 1, with final cons cell ENDS.
-    ;;   (CDR ENDS) doesn't have to be nil.
-    ;; - LS2 is some power of two <= LS.
-    ;; - U is an unsorted list. 
-    ;; - LW is a positive integer.
-    ;; Starting with S, and taking data from U as needed, produce
-    ;; a sorted list of *at least* length LW, if there's enough data
-    ;; (LW <= LS + length(U)), or use all of U if not.
-    ;;
-    ;; GROW takes maximal contiguous runs of data from U at a time;
-    ;; it is allowed to return a list *longer* than LW if it gets lucky
-    ;; with a long run.
-    ;;
-    ;; The key idea: If you want a merge operation to "pay for itself," the two
-    ;; lists being merged should be about the same length. Remember that.
-    ;; 
-    ;; Returns:
-    ;;   - A:      The result list (not properly terminated)
-    ;;   - ENDA:   The last cons cell of the result list.
-    ;;   - LA:     The length of the result list
-    ;;   - UNUSED: The unused tail of U.
-    (define (grow s ends ls ls2 u lw)
-      (if (and (pair? u) (< ls lw))
-          
-          ;; We haven't met the LW quota but there's still some U data to use.
-          (mlet (((ls2) (let lp ((ls2 ls2))
-                          (let ((ls2*2 (+ ls2 ls2)))
-                            (if (<= ls2*2 ls) (lp ls2*2) ls2))))
-                 ;; LS2 is now the largest power of two <= LS.
-                 ;; (Just think of it as being roughly LS.)
-                 ((lr endr u2)   (getrun u))		  ; Get a run from U;
-                 ((t endt lt u3) (grow u endr lr 1 u2 ls2)) ; grow it up to be T.
-                 ((st end-st)    (merge! s ends t endt)))	  ; Merge S & T,
-                (grow st end-st (+ ls lt) (+ ls2 ls2) u3 lw))	  ; then loop.
-          
-          (values s ends ls u))) ; Done -- met LW quota or ran out of data.
-    
-    ;; Note: (LENGTH LIS) or any constant guaranteed
-    ;; to be greater can be used in place of INFINITY.
-    (if (pair? lis)
-        (mlet (((lr endr rest)  (getrun lis))	; Pick off an initial run.
-               ((infinity)      #o100000000)	; Then grow it up maximally.
-               ((a enda la v)   (grow lis endr lr 1 rest infinity)))
-              (set-cdr! enda '())			; Nil-terminate answer.
-              a)					; We're done.
-        
-        '()))					; Don't sort an empty list.
-  
-  
-  ;;; Merge
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; These two merge procedures are stable -- ties favor list A.
-  
-  (define (list-merge < a b)
-    (cond ((not (pair? a)) b)
-          ((not (pair? b)) a)
-          (else (let recur ((x (car a)) (a a)	; A is a pair; X = (CAR A).
-                                        (y (car b)) (b b))	; B is a pair; Y = (CAR B).
-                  (if (< y x)
-                      
-                      (let ((b (cdr b)))
-                        (if (pair? b)
-                            (cons y (recur x a (car b) b))
-                            (cons y a)))
-                      
-                      (let ((a (cdr a)))
-                        (if (pair? a)
-                            (cons x (recur (car a) a y b))
-                            (cons x b))))))))
-  
-  
-  ;;; This destructive merge does as few SET-CDR!s as it can -- for example, if
-  ;;; the list is already sorted, it does no SET-CDR!s at all. It is also
-  ;;; iterative, running in constant stack.
-  
-  #;
-  (define (list-merge! < a b)
-    ;; The logic of these two loops is completely driven by these invariants:
-    ;;   SCAN-A: (CDR PREV) = A. X = (CAR A). Y = (CAR B).
-    ;;   SCAN-B: (CDR PREV) = B. X = (CAR A). Y = (CAR B).
-    (letrec ((scan-a (lambda (prev a x b y)		; Zip down A doing
-                       (if (< y x)			; no SET-CDR!s until
-                           (let ((next-b (cdr b)))	; we hit a B elt that
-                             (set-cdr! prev b)		; has to be inserted.
-                             (if (pair? next-b)
-                                 (scan-b b a x next-b (car next-b))
-                                 (set-cdr! b a)))
-                           
-                           (let ((next-a (cdr a)))
-                             (if (pair? next-a)
-                                 (scan-a a next-a (car next-a) b y)
-                                 (set-cdr! a b))))))
-             
-             (scan-b (lambda (prev a x b y)		; Zip down B doing
-                       (if (< y x)			; no SET-CDR!s until 
-                           (let ((next-b (cdr b)))	; we hit an A elt that
-                             (if (pair? next-b)			  ; has to be
-                                 (scan-b b a x next-b (car next-b)) ; inserted.
-                                 (set-cdr! b a))) 
-                           
-                           (let ((next-a (cdr a)))
-                             (set-cdr! prev a)
-                             (if (pair? next-a)
-                                 (scan-a a next-a (car next-a) b y)
-                                 (set-cdr! a b)))))))
-      
-      (cond ((not (pair? a)) b)
-            ((not (pair? b)) a)
-            
-            ;; B starts the answer list.
-            ((< (car b) (car a))
-             (let ((next-b (cdr b)))
-               (if (null? next-b)
-                   (set-cdr! b a)
-                   (scan-b b a (car a) next-b (car next-b))))
-             b)
-            
-            ;; A starts the answer list.
-            (else (let ((next-a (cdr a)))
-                    (if (null? next-a)
-                        (set-cdr! a b)
-                        (scan-a a next-a (car next-a) b (car b))))
-                  a))))
-  
-  
-  ;;; Copyright
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; This code is
-  ;;;     Copyright (c) 1998 by Olin Shivers.
-  ;;; The terms are: You may do as you please with this code, as long as
-  ;;; you do not delete this notice or hold me responsible for any outcome
-  ;;; related to its use.
-  ;;;
-  ;;; Blah blah blah.
-  
-  
-  ;;; Code tuning & porting
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; This is very portable code. It's R4RS with the following exceptions:
-  ;;; - The R5RS multiple-value VALUES & CALL-WITH-VALUES procedures for
-  ;;;   handling multiple-value return.
-  ;;;
-  ;;; This code is *tightly* bummed as far as I can go in portable Scheme.
-  ;;;
-  ;;; - The fixnum arithmetic in LIST-MERGE-SORT! and COUNTED-LIST-MERGE!
-  ;;;    that could be safely switched over to unsafe, fixnum-specific ops,
-  ;;;    if you're sure that 2*maxlen is a fixnum, where maxlen is the length
-  ;;;    of the longest list you could ever have.
-  ;;;
-  ;;; - I typically write my code in a style such that every CAR and CDR 
-  ;;;   application is protected by an upstream PAIR?. This is the case in this
-  ;;;   code, so all the CAR's and CDR's could safely switched over to unsafe
-  ;;;   versions. But check over the code before you do it, in case the source
-  ;;;   has been altered since I wrote this.
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/sort.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/32/sort.rkt
deleted file mode 100644
index d3d2fae47c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/sort.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-(module sort mzscheme
-  (provide list-sort
-           (rename list-sort list-sort!)
-           list-stable-sort
-           (rename list-stable-sort list-stable-sort!)
-           vector-sort
-           vector-sort!
-           vector-stable-sort
-           vector-stable-sort!
-           ; lmsort
-           list-merge
-           (rename list-merge list-merge!)
-           list-merge-sort
-           (rename list-merge-sort list-merge-sort!)
-           ; vmsort
-           vector-merge
-           vector-merge!
-           vector-merge-sort
-           vector-merge-sort!
-           ; visort
-           vector-insert-sort
-           vector-insert-sort!
-           ; vhsort
-           vector-heap-sort!
-           vector-heap-sort
-           ; vbinsearch
-           vector-binary-search
-           vector-binary-search3
-           ; delndups
-           list-delete-neighbor-dups
-           (rename list-delete-neighbor-dups list-delete-neighbor-dups!)
-           vector-delete-neighbor-dups
-           (rename vector-delete-neighbor-dups vector-delete-neighbor-dups!)
-           ; sortp
-           list-sorted?
-           vector-sorted?
-           )
-  
-  (require "lmsort.scm"
-           "vmsort.scm"
-           "visort.scm"
-           "vhsort.scm"
-           "vbinsearch.scm"
-           "sortp.scm"
-           "delndups.scm")
-  
-  ;;; The sort package -- general sort & merge procedures
-  ;;;
-  ;;; Copyright (c) 1998 by Olin Shivers.
-  ;;; You may do as you please with this code, as long as you do not delete this
-  ;;; notice or hold me responsible for any outcome related to its use.
-  ;;; Olin Shivers 10/98.
-  
-  ;;; This file just defines the general sort API in terms of some
-  ;;; algorithm-specific calls.
-  
-  (define (list-sort < l)		; Sort lists by converting to
-    (let ((v (list->vector l)))		; a vector and sorting that.
-      (vector-heap-sort! < v)
-      (vector->list v)))
-  
-  #;(define list-sort! list-merge-sort!)
-  
-  (define list-stable-sort  list-merge-sort)
-  #;(define list-stable-sort! list-merge-sort!)
-  
-  (define vector-sort  vector-heap-sort)
-  (define vector-sort! vector-heap-sort!)
-  
-  (define vector-stable-sort  vector-merge-sort)
-  (define vector-stable-sort! vector-merge-sort!)
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/sort.txt b/pkgs/srfi-pkgs/srfi-lib/srfi/32/sort.txt
deleted file mode 100644
index 825bdb355b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/sort.txt
+++ /dev/null
@@ -1,1069 +0,0 @@
-The SRFI-32 sort libraries					-*- outline -*-
-Olin Shivers
-First draft: 1998/10/19
-Last update: 2002/7/21
-
-[Todo: del-list-neighbor-dups!
-       vector-copy -> subvector
-       use srfi-23 for reporting errors
-       use srfi-16 for n-aries?
-
-Emacs should display this document in outline mode. Say c-h m for
-instructions on how to move through it by sections (e.g., c-c c-n, c-c c-p).
-
-* Table of contents
--------------------
-Abstract
-Procedure index
-Introduction
-What's wrong with the current state of affairs?
-Design rules
-  What vs. how
-  Consistency across function signatures
-  Data parameter first, less-than parameter after
-  Ordering, comparison functions & stability
-  All vector operations accept optional subrange parameters
-  Required vs. allowed side-effects
-Procedure specification
-  Procedure naming and functionality
-  Types of parameters and return values
-  sort-lib - general sorting package
-  Algorithm-specific sorting packages
-Algorithmic properties
-Topics to be resolved during discussion phase
-Porting and optimisation
-References & Links
-Acknowledgements
-Copyright
-
-
-* Abstract
-----------
-Current Scheme sorting packages are, every one of them, surprisingly bad. I've
-designed the API for a full-featured sort toolkit, which I propose as a SRFI.
-
-The spec comes with 1200 lines of high-quality reference code: tightly
-written, highly commented, portable code, available for free. Implementors
-want this code. It's better than what you have.
-
--------------------------------------------------------------------------------
-* Procedure index
------------------
-list-sorted?			vector-sorted?
-
-list-merge			vector-merge
-list-sort			vector-sort
-list-stable-sort		vector-stable-sort
-list-delete-neighbor-dups	vector-delete-neighbor-dups
-
-list-merge!			vector-merge!
-list-sort!			vector-sort!
-list-stable-sort!		vector-stable-sort!
-list-delete-neighbor-dups!	vector-delete-neighbor-dups!
-
-quick-sort    heap-sort   insert-sort   list-merge-sort   vector-merge-sort
-quick-sort!   heap-sort!  insert-sort!  list-merge-sort!  vector-merge-sort!
-quick-sort3!             
-
-vector-binary-search
-vector-binary-search3
-
--------------------------------------------------------------------------------
-* Introduction
---------------
-As I'll detail below, I wasn't very happy with the state of the Scheme
-world for sorting and merging lists and vectors. So I have designed and 
-written a fairly comprehensive sorting & merging toolkit. It is
-
-    - very portable,
-
-    - much better code than what is currently in Elk, Gambit, Bigloo, 
-      Scheme->C, MzScheme, RScheme, Scheme48, MIT Scheme, or slib, and 
-
-    - priced to move: free code.
-
-The package includes
-    - Vector insert sort (stable)
-    - Vector heap sort
-    - Vector quick sort (with median-of-3 pivot picking)
-    - Vector merge sort (stable)
-    - Pure and destructive list merge sort (stable)
-    - Stable vector and list merge
-    - Miscellaneous sort-related procedures: Vector and list merging, 
-      sorted? predicates, vector binary search, vector and list 
-      delete-equal-neighbor procedures.
-    - A general, non-algorithmic set of procedure names for general sorting
-      and merging.
-
-Scheme programmers may want to adopt this package. I'd like Scheme
-implementors to adopt this code and its API -- in fact, the code is a bribe to
-make it easy for implementors to converge on the suggested API. I mean, you'd
-really have to be a boor to take this free code I wrote and mutate its
-interface over to your incompatible, unportable API, wouldn't you? But you
-could, of course -- it's freely available. More in the spirit of the offering,
-you could make this API available, and then also write a little module
-providing your old interface that is defined in terms of this API. "Scheme
-implementors," in this context, includes slib, which is not a standalone
-implementation of Scheme, but rather an influential collection of API's and
-code.
-
-The code is tightly bummed. It is clearly written, and commented in my usual
-voluminous style. This includes notes on porting and implementation-specific
-optimisations.
-
-
--------------------------------------------------------------------------------
-* What's wrong with the current state of affairs?
--------------------------------------------------
-
-It's just amazing to me that in 2002, sorting and merging hasn't been
-completely put to bed. These are well-understood algorithms, each of them well
-under a page of code. The straightforward algorithms are basic, core stuff --
-sophomore-level. But if you tour the major Scheme implementations out there on
-the Net, you find badly written code that provides extremely spotty coverage
-of the algorithm space. One implementation even has a buggy implementation
-that has been in use for about 20 years. Another has an O(n^2) algorithm...
-implemented in C for speed.
-
-Open source-code is a wonderful thing. In a couple of hours, I was able to
-download and check the sources of 9 Scheme systems. Here are my notes from the
-systems I checked. You can skip to the next section if you aren't morbidly
-curious.
-
-slib
-  sorted? vector-or-list <
-  merge  list1 list2 <
-  merge! list1 list2 <
-  sort  vector-or-list <
-  sort! vector-or-list <
-
-  Richard O'Keefe's stable list merge sort is right idea, but implemented 
-  using gratuitous variable side effects. It also does redundant SET-CDR!s.
-  The vector sort converts to list, merge sorts, then reconverts
-  to vector. This is a bad idea -- non-local pointer chasing bad; vector 
-  shuffling good. If you must allocate temp storage, might as well allocate
-  a temp vector and use vector merge sort.
-
-MIT Scheme
-  sort!       vector <
-  merge-sort! vector <
-  quick-sort! vector <
-
-  sort       vector-or-list <
-  merge-sort vector-or-list <
-  quick-sort vector-or-list <
-
-  Naive vector quicksort: loser, for worst-case performance reasons.
-  List sort by "list->vector; quicksort; vector->list," hence also loser.
-  A clever stable vector merge sort, albeit not very bummed.
-
-Scheme 48 & T
-  sort-list  list <
-  sort-list! list <
-  list-merge! list1 list2 <
-
-  Bob Nix's implementation of online merge-sort, written in the early 80's. 
-  Conses unnecessary bookkeeping structure, which isn't necessary with a
-  proper recursive formulation. Also, does redundant SET-CDR!s. No vector
-  sort. Also, has a bug -- is claimed to be a stable sort, but isn't! To see
-  this, get the S48 code, and try
-    (define (my< x y) (< (abs x) (abs y)))
-    (list-merge! (list 0 2) (list   -2) my<)		; -> (0  2 -2)
-    (list-merge! (list   2) (list 0 -2) my<)		; -> (0 -2  2)
-  This could be fixed very easily, but it isn't worth it given the 
-  other problems with the algorithm.
-
-RScheme
-  vector-sort! vector <
-  sort collection <
-
-  Good basic implementation of vector heapsort, which has O(n lg n)
-  worst-case time. Code ugly, needs tuning. List sort by "list->vector; 
-  sort; vector->list." Nothing for stable sorting.
-
-MzScheme
-  quicksort lis <
-  mergesort alox <
-
-  Sorts lists with (list->vector; quicksort; vector->list) -- but the core
-  quicksort is not available for vector sorting. Nothing for stable sorting.
-  Quicksort picks pivot naively, inducing O(n^2) worse-case behaviour on a
-  fairly common case: an already-sorted list.
-
-Bigloo, STK
-  sort vector-or-list <
-  Uses an O(n^2) algorithm... implemented in C for speed. Hmm.
-  (See runtime/Ieee/vector.scm and runtime/Clib/cvector.c)
-
-Gambit
-  sort-list list <
-  Nothing for vectors. Simple, slow, unstable merge sort for lists.
-
-Elk
-  Another naive quicksort. Lists handled by converting to vector.
-  sort  vector-or-list <
-  sort! vector-or-list <
-
-Chez Scheme
-  merge  < list1 list2
-  merge! < list1 list2
-  sort  < list
-  sort! < list
-
-  These are stable. I have not seen the source code.
-
-Common Lisp
-  sort        sequence < [key]
-  stable-sort sequence < [key]
-  merge result-type sequence1 sequence2 < [key]
-
-  The sort procedures are allowed, but not required, to be destructive.
-
-SML/NJ
-  sort: ('a*'a -> bool) -> 'a list -> 'a list
-  "Smooth applicative merge sort," which is stable.
-  There is also a highly bummed quicksort for vectors.
-
-The right solution: Implement a full toolbox of carefully written standard sort
-routines.
-
-Having the source of all these above-cited Schemes available for study made
-life a lot easier writing this code. I appreciate the authors making their
-source available under such open terms.
-
-
--------------------------------------------------------------------------------
-* Design rules
---------------
-
-** What vs. how
-===============
-There are two different interfaces: "what" (simple) & "how" (detailed).
-
-    - Simple: you specify semantics: datatype (list or vector), 
-      mutability, and stability.
-
-    - Detailed: you specify the actual algorithm (quick, heap,
-      insert, merge). Different algorithms have different properties,
-      both semantic & pragmatic, so these exports are necessary.
-
-      It is necessarily the case that the specifications of these procedures
-      make statements about execution "pragmatics." For example, the sole
-      distinction between heap sort and quick sort -- both of which are
-      provided by this library -- is one of execution time, which is not a
-      "semantic" distinction. Similar resource-use statements are made about
-      "iterative" procedures, meaning that they can execute on input of
-      arbitrary size in a constant number of stack frames.
-
-** Consistency across function signatures
-=========================================
-The two interfaces share common function signatures wherever
-possible, to facilitate switching a given call from one procedure
-to another.
-	
-** Less-than parameter first, data parameter after
-==================================================
-These procedures uniformly observe the following parameter order:
-the data to be sorted comes after the comparison function.
-That is, we write
-  (sort < lis)
-not
-  (sort lis <).
-
-With the sole exception of Chez Scheme, this is the exact opposite of
-every sort function out there in current use in the Scheme world. (See
-the summary of related APIs above.) However, it is consistent with common
-practice across Scheme libraries in general to put the ordering function
-first -- the "operation currying" convention. (E.g., consider FOR-EACH or
-MAP or FIND.) 
-
-The original draft of this SRFI used the data-first/comparison-last convention
-for backwards compatibility -- a decision I made with internal misgivings.
-Happily, however, the overwhelming response from the discussion phase
-supported "cleaning up" this issue and re-converging the parameter order with
-the general Scheme "op currying" convention. So the original decision was
-inverted in favor of the comparison-first/data-last convention.
-
-** Ordering, comparison functions & stability
-=============================================
-These routines take a < comparison function, not a <= comparison
-function, and they sort into increasing order. The difference between
-a < spec and a <= spec comes up in three places: 
-  - the definition of an ordered or sorted data set,
-  - the definition of a stable sorting algorithm, and
-  - correctness of quicksort.
-
-+ We say that a data set (a list or vector) is *sorted* or *ordered*
-  if it contains no adjacent pair of values ... X Y ... such that Y < X. 
-
-  In other words, scanning across the data never takes a "downwards" step.
-
-  If you use a <= procedure where these algorithms expect a <
-  procedure, you may not get the answers you expect. For example,
-  the LIST-SORTED? function will return false if you pass it a <= comparison
-  function and an ordered list containing adjacent equal elements.
-
-+ A "stable" sort is one that preserves the pre-existing order of equal
-  elements. Suppose, for example, that we sort a list of numbers by 
-  comparing their absolute values, i.e., using comparison function
-    (lambda (x y) (< (abs x) (abs y)))
-  If we sort a list that contains both 3 and -3:
-    ... 3 ... -3 ...
-  then a stable sort is an algorithm that will not swap the order
-  of these two elements, that is, the answer is guaranteed to to look like
-    ... 3 -3 ...
-  not
-    ... -3 3 ...
-
-  Choosing < for the comparison function instead of <= affects how stability
-  is coded. Given an adjacent pair X Y, (< y x) means "Y should be moved in
-  front of X" -- otherwise, leave things as they are. So using a <= function
-  where a < function is expected will *invert* stability.
-
-  This is due to the definition of equality, given a < comparator:
-    (and (not (< x y))
-         (not (< y x)))
-  The definition is rather different, given a <= comparator:
-    (and (<= x y)
-         (<= y x))
-
-+ A "stable" merge is one that reliably favors one of its data sets
-  when equal items appear in both data sets. *All merge operations in
-  this library are stable*, breaking ties between data sets in favor
-  of the first data set -- elements of the first list come before equal 
-  elements in the second list.
-
-  So, if we are merging two lists of numbers ordered by absolute value,
-  the stable merge operation LIST-MERGE
-    (list-merge (lambda (x y) (< (abs x) (abs y)))
-                '(0 -2 4 8 -10) '(-1 3 -4 7))
-  reliably places the 4 of the first list before the equal-comparing -4
-  of the second list:
-    (0 -1 -2 4 -4 7 8 -10)
-
-+ Some sort algorithms will *not work correctly* if given a <= when they
-  expect a < comparison (or vice-versa). For example, violating quicksort's
-  spec may cause it to produce wrong answers, diverge, raise an error, or do
-  some fourth thing. To see why, consider the left-scan part of the standard
-  quicksort partition step:
-	    (let ((i (let scan ((i i)) (if (elt< (vector-ref v i) pivot)
-					   (scan (+ i 1))
-					   i))))
-	      ...)
-  Consider applying this loop to a vector of all zeroes (hence, PIVOT, as
-  well, is zero), but erroneously using <= for the ELT< function. The loop
-  will scan right off the end of the vector, producing a vector-index error.
-  The guarantee that the scan loop will terminate before running off the end
-  of the vector depends critically upon ELT< performing as a true, irreflexive
-  < relation. Running off the end of the vector is only one of a variety of 
-  possibly ways to lose -- other, variant implementations of quicksort can, 
-  instead, loop forever on some data sets if ELT< is a <= predicate.
-
-In short, if your comparison function F answers true to (F x x), then 
-  - using a stable sorting or merging algorithm will not give you a 
-    stable sort or merge, 
-  - LIST-SORTED? may surprise you, and 
-  - quicksort may fail in a variety of possible ways.
-Note that  you can synthesize a < function from a <= function with
-    (lambda (x y) (not (<= y x)))
-if need be. 
-
-Precise definitions give sharp edges to tools, but require care in use. 
-"Measure twice, cut once."
-
-I have adopted the choice of < from Common Lisp. One would assume the definers
-of Common Lisp had a good reason for adopting < instead of <=, but canvassing
-several of the principal actors in the definition process has turned up no
-better reason than "an arbitrary but consistent choice." At minimum, then,
-this SRFI extends the coverage of that consistent choice.
-
-** All vector operations accept optional subrange parameters
-============================================================
-The vector operations specified below all take optional START/END arguments
-indicating a selected subrange of a vector's elements. If a START parameter or
-START/END parameter pair is given to such a procedure, they must be exact,
-non-negative integers, such that
-    0 <= START <= END <= (VECTOR-LENGTH V)
-where V is the related vector parameter. If not specified, they default to 0
-and the length of the vector, respectively. They are interpreted to select the
-range [START,END), that is, all elements from index START (inclusive) up to,
-but not including, index END.
-
-** Required vs. allowed side-effects
-====================================
-LIST-SORT! and LIST-STABLE-SORT! are allowed, but not required,
-to alter their arguments' cons cells to construct the result list. This is
-consistent with the what-not-how character of the group of procedures
-to which they belong (the "sort-lib" package).
-
-The LIST-DELETE-NEIGHBOR-DUPS!, LIST-MERGE! and LIST-MERGE-SORT! procedures,
-on the other hand, provide specific algorithms, and, as such, explicitly
-commit to the use of side-effects on their input lists in order to guarantee
-their key algorithmic properties (e.g., linear-time operation, constant-space
-stack use).
-
--------------------------------------------------------------------------------
-* Procedure specification
--------------------------
-The procedures are split into several packages. In a Scheme system that has a
-module or package system, these procedures should be contained in modules
-named as follows:
-   Package name			Functionality
-   ------------			-------------
-   sort-lib			General sorting for lists & vectors
-   sorted?-lib			Sorted predicates for lists & vectors
-   list-merge-sort-lib		List merge sort
-   vector-merge-sort-lib	Vector merge sort
-   vector-heap-sort-lib		Vector heap sort
-   vector-quick-sort-lib	Vector quick sort
-   vector-insert-sort-lib	Vector insertion sort
-   delndup-lib			List and vector delete neighbor duplicates
-   binsearch-lib		Vector binary search
-
-A Scheme system without a module system should provide all of the bindings
-defined in all of these modules as components of the "SRFI-32" package.
-
-Note that there is no "list insert sort" package, as you might as well always
-use list merge sort. The reference implementation's destructive list merge
-sort will do fewer SET-CDR!s than a destructive insert sort.
-
-** Procedure naming and functionality
-=====================================
-Almost all of the procedures described below are variants of two basic
-operations: sorting and merging. These procedures are consistently named
-by composing a set of basic lexemes to indicate what they do.
-
-Lexeme	  Meaning
-------	  -------
-"sort"	  The procedure sorts its input data set by some < comparison function.
-
-"merge"	  The procedure merges two ordered data sets into a single ordered
-	  result.
-
-"stable"  This lexeme indicates that the sort is a stable one.
-
-"vector"  The procedure operates upon vectors.
-
-"list"	  The procedure operates upon lists.
-
-"!"	  Procedures that end in "!" are allowed, and sometimes required, 
-	  to reuse their input storage to construct their answer.
-
-** Types of parameters and return values
-========================================
-In the procedures specified below,
-  - A LIS parameter is a list;
-      
-  - A V parameter is a vector;
-      
-  - A < or = parameter is a procedure accepting two arguments taken from the
-    specified procedure's data set(s), and returning a boolean;
-      
-  - START and END parameters are exact, non-negative integers that 
-    serve as vector indices selecting a subrange of some associated vector.
-    When specified, they must satisfy the relation
-        0 <= start <= end <= (vector-length v)
-    where V is the associated vector.
-
-Passing values to procedures with these parameters that do not satisfy these
-types is an error.
-
-If a procedure is said to return "unspecified," this means that nothing at all
-is said about what the procedure returns, not even the number of return
-values. Such a procedure is not even required to be consistent from call to
-call in the nature or number of its return values. It is simply required to
-return a value (or values) that may be passed to a command continuation, e.g.
-as the value of an expression appearing as a non-terminal subform of a BEGIN
-expression. Note that in R5RS, this restricts such a procedure to returning a
-single value; non-R5RS systems may not even provide this restriction.
-
-** sort-lib - general sorting package
-=====================================
-This library provides basic sorting and merging functionality suitable for
-general programming. The procedures are named by their semantic properties,
-i.e., what they do to the data (sort, stable sort, merge, and so forth).
-
-    Procedure						Suggested algorithm
-    -------------------------------------------------------------------------
-    list-sorted? < lis -> boolean
-    list-merge  < lis1 lis2 -> list
-    list-merge! < lis1 lis2 -> list
-    list-sort  < lis -> list				(vector heap or quick)
-    list-sort! < lis -> list				(list merge sort)
-    list-stable-sort  < lis -> list			(vector merge sort)
-    list-stable-sort! < lis -> list			(list merge sort)
-    list-delete-neighbor-dups  = lis -> list
-    list-delete-neighbor-dups! = lis -> list
-
-    vector-sorted? < v [start end]	-> boolean
-    vector-merge  < v1 v2 [start1 end1 start2 end2] -> vector
-    vector-merge! < v v1 v2 [start start1 end1 start2 end2] -> unspecified
-    vector-sort  < v [start end] 	-> vector	(heap or quick sort)
-    vector-sort! < v [start end]	-> unspecified	(heap or quick sort)
-    vector-stable-sort  < v [start end] -> vector	(vector merge sort)
-    vector-stable-sort! < v [start end] -> unspecified	(vector merge sort)
-    vector-delete-neighbor-dups  = v [start end] -> vector
-    vector-delete-neighbor-dups! = target source [t-start s-start s-end] -> t-end
-
-    LIST-SORTED? and VECTOR-SORTED? return true if their input list or vector
-    is in sorted order, as determined by their < comparison parameter.
-
-    All four merge operations are stable: an element of the initial list LIS1
-    or vector V1 will come before an equal-comparing element in the second
-    list LIS2 or vector V2 in the result.
-
-    The procedures
-      LIST-MERGE
-      LIST-SORT
-      LIST-STABLE-SORT
-      LIST-DELETE-NEIGHBOR-DUPS
-    do not alter their inputs and are allowed to return a value that shares 
-    a common tail with a list argument.
-
-    The procedures
-      LIST-SORT!
-      LIST-STABLE-SORT!
-    are "linear update" operators -- they are allowed, but not required, to
-    alter the cons cells of their arguments to produce their results. 
-
-    On the other hand, the procedures
-      LIST-DELETE-NEIGHBOR-DUPS!
-      LIST-MERGE!
-    make only a single, iterative, linear-time pass over their argument lists,
-    using SET-CDR!s to rearrange the cells of the lists into the final result
-    -- they work "in place." Hence, any cons cell appearing in the result must
-    have originally appeared in an input. The intent of this
-    iterative-algorithm commitment is to allow the programmer to be sure that
-    if, for example, LIST-MERGE! is asked to merge two ten-million-element
-    lists, the operation will complete without performing some extremely
-    (possibly twenty-million) deep recursion.
-
-    The vector procedures
-      VECTOR-SORT
-      VECTOR-STABLE-SORT
-      VECTOR-DELETE-NEIGHBOR-DUPS
-    do not alter their inputs, but allocate a fresh vector for their result,
-    of length END - START. 
-
-    The vector procedures
-      VECTOR-SORT!
-      VECTOR-STABLE-SORT!
-    sort their data in-place. (But note that VECTOR-STABLE-SORT! may 
-    allocate temporary storage proportional to the size of the input --
-    I am not aware of O(n lg n) stable vector-sorting algorithms that
-    run in constant space.)
-
-    VECTOR-MERGE returns a vector of length (END1-START1)+(END2-START2).
-    
-    VECTOR-MERGE! writes its result into vector V, beginning at index START,
-    for indices less than END = START + (END1-START1) + (END2-START2). The 
-    target subvector 
-      V[start,end)
-    may not overlap either source subvector 
-      V1[start1,end1)
-      V2[start2,end2).
-
-    The ...-DELETE-NEIGHBOR-DUPS-... procedures:
-    These procedures delete adjacent duplicate elements from a list or a
-    vector, using a given element-equality procedure. The first/leftmost
-    element of a run of equal elements is the one that survives. The list or
-    vector is not otherwise disordered.
-    
-    These procedures are linear time -- much faster than the O(n^2) general
-    duplicate-element deletors that do not assume any "bunching" of elements
-    (such as the ones provided by SRFI-1). If you want to delete duplicate
-    elements from a large list or vector, you can sort the elements to bring
-    equal items together, then use one of these procedures, for a total time
-    of O(n lg n).
-    
-    The comparison function = passed to these procedures is always applied
-      (= x y)
-    where X comes before Y in the containing list or vector.
-
-    - LIST-DELETE-NEIGHBOR-DUPS does not alter its input list; its answer
-      may share storage with the input list.
-
-    - VECTOR-DELETE-NEIGHBOR-DUPS does not alter its input vector, but
-      rather allocates a fresh vector to hold the result.
-
-    - LIST-DELETE-NEIGHBOR-DUPS! is permitted, but not required, to
-      mutate its input list in order to construct its answer.
-
-    - VECTOR-DELETE-NEIGHBOR-DUPS! reuses its input vector to hold the
-      answer, packing its answer into the index range [start,end'), where
-      END' is the non-negative exact integer returned as its value. It
-      returns END' as its result. The vector is not altered outside the range
-      [start,end').
-
-    - VECTOR-DELETE-NEIGHBOR-DUPS! scans vector SOURCE in range
-      [S-START,S-END), writing its result to vector TARGET beginning at index
-      T-START. It returns exact, non-negative integer T-END, which indicates
-      that the results of the operation are found in index range
-      [T-START,T-END) of TARGET; elements of TARGET outside this range
-      are unaltered.
-      
-      It is an error for memory cell TARGET[T-START] to be a memory cell in
-      the region SOURCE[1 + S-START, S-END). In a Scheme implementation
-      that does not allow distinct vectors to share storage, this means
-      that one of the following must be true:
-        1. (not (eq? source target))
-        2. t-start not-in [s-start + 1, s-end)
-
-    - Examples:
-	(list-delete-neighbor-dups = '(1 1 2 7 7 7 0 -2 -2))
-          => (1 2 7 0 -2)
-
-	(vector-delete-neighbor-dups = '#(1 1 2 7 7 7 0 -2 -2))
-          => #(1 2 7 0 -2)
-
-	(vector-delete-neighbor-dups = '#(1 1 2 7 7 7 0 -2 -2) 3 7)
-          => #(7 0 -2)
-
-        ;; Result left in v[3,9):
-        (let ((v (vector 0 0 0 1 1 2 2 3 3 4 4 5 5 6 6)))
-          (cons (vector-delete-neighbor-dups! = v 3)
-                v))
-           => (9 . #(0 0 0 1 2 3 4 5 6 4 4 5 5 6 6))
-
-
-** Algorithm-specific sorting packages
-======================================
-These packages provide more specific sorting functionality, that is,
-specific commitment to particular algorithms that have particular
-pragmatic consequences (such as memory locality, asymptotic running time)
-beyond their semantic behaviour (sorting, stable sorting, merging, etc.).
-Programmers that need a particular algorithm can use one of these packages.
-
-sorted?-lib - sorted predicates
-    list-sorted?   < lis	   -> boolean
-    vector-sorted? < v [start end] -> boolean
-
-    Return #f iff there is an adjacent pair ... X Y ... in the input
-    list or vector such that Y < X. The optional START/END range 
-    arguments restrict VECTOR-SORTED? to the indicated subvector.
-
-list-merge-sort-lib - list merge sort
-    list-merge-sort  < lis	-> list
-    list-merge-sort! < lis	-> list
-    list-merge  lis1 < lis2	-> list
-    list-merge! lis1 < lis2	-> list
-
-    The sort procedures sort their data using a list merge sort, which is
-    stable. (The reference implementation is, additionally, a "natural" sort.
-    See below for the properties of this algorithm.)
-
-    The ! procedures are destructive -- they use SET-CDR!s to rearrange the
-    cells of the lists into the proper order. As such, they do not allocate
-    any extra cons cells -- they are "in place" sorts. Additionally,
-    LIST-MERGE! is iterative -- it can operate on arguments of arbitrary size
-    with a constant number of stack frames.
-
-    The merge operations are stable: an element of LIS1 will come before an
-    equal-comparing element in LIS2 in the result list.
-
-vector-merge-sort-lib - vector merge sort
-    vector-merge-sort  < v [start end temp]			-> vector
-    vector-merge-sort! < v [start end temp]			-> unspecified
-    vector-merge  < v1 v2 [start1 end1 start2 end2]		-> vector
-    vector-merge! < v v1 v2 [start start1 end1 start2 end2]	-> unspecified
-
-    The sort procedures sort their data using vector merge sort, which is
-    stable. (The reference implementation is, additionally, a "natural" sort.
-    See below for the properties of this algorithm.)
-
-    The optional START/END arguments provide for sorting of subranges, and
-    default to 0 and the length of the corresponding vector.
-    
-    Merge-sorting a vector requires the allocation of a temporary "scratch"
-    work vector for the duration of the sort. This scratch vector can be
-    passed in by the client as the optional TEMP argument; if so, the supplied
-    vector must be of size >= END, and will not be altered outside the range
-    [start,end). If not supplied, the sort routines allocate one themselves.
-
-    The merge operations are stable: an element of V1 will come before an
-    equal-comparing element in V2 in the result vector.
-
-    VECTOR-MERGE-SORT! leaves its result in V[start,end).
-
-    VECTOR-MERGE-SORT returns a vector of length END-START.
-    
-    VECTOR-MERGE returns a vector of length (END1-START1)+(END2-START2).
-    
-    VECTOR-MERGE! writes its result into vector V, beginning at index START,
-    for indices less than END = START + (END1-START1) + (END2-START2). The 
-    target subvector 
-      V[start,end)
-    may not overlap either source subvector 
-      V1[start1,end1)
-      V2[start2,end2).
-
-vector-heap-sort-lib - vector heap sort
-    heap-sort  < v [start end] -> vector
-    heap-sort! < v [start end] -> unspecified
-
-    These procedures sort their data using heap sort, 
-    which is not a stable sorting algorithm.
-    
-    HEAP-SORT returns a vector of length END-START. 
-    HEAP-SORT! is in-place, leaving its result in V[start,end).
-
-vector-quick-sort-lib - vector quick sort
-    quick-sort   < v [start end] -> vector
-    quick-sort!  < v [start end] -> unspecified
-    quick-sort3! c v [start end] -> unspecified
-
-    These procedures sort their data using quick sort, 
-    which is not a stable sorting algorithm.
-    
-    QUICK-SORT returns a vector of length END-START. 
-    QUICK-SORT! is in-place, leaving its result in V[start,end).
-
-    QUICK-SORT3! is a variant of quick-sort that takes a three-way
-    comparison function C. C compares a pair of elements and returns
-    an exact integer whose sign indicates their relationship:
-      (c x y) < 0   =>   x<y
-      (c x y) = 0   =>   x=y
-      (c x y) > 0   =>   x>y
-    To help remember the relationship between the sign of the result and
-    the relation, use the function - as the model for C: (- x y) < 0
-    means that x < y; (- x y) > 0 means that x > y.
-
-    The extra discrimination provided by the three-way comparison can
-    provide significant speedups when sorting data sets with many duplicates,
-    especially when the comparison function is relatively expensive (e.g.,
-    comparing long strings).
-
-    WARNING: Some sort algorithms, such as insertion sort or heap sort,
-    can tolerate being passed a <= comparison function when they expect a < 
-    function -- insertion and merge sort may simply invert stability; and
-    heap sort will run a bit slower, but otherwise produce a correct answer.
-
-    Quicksort, however, is much more critically sensitive to the distinction
-    between a < and a <= comparison. If QUICK-SORT or QUICK-SORT! expect a <
-    comparison function, and are erroneously given a <= function, they may,
-    depending on implementation, produce an unsorted result, go into an 
-    infinite loop, cause a run-time error, occasionally produce a correct
-    result, or do some fifth thing.
-
-    Implementors may wish to write QUICKSORT3! so that it (a) tests the
-    comparison function (by checking that (c v[start] v[start]) produces
-    false), or (b) is tolerant of an erroneous <= function, or (c) both.
-    Clients of this function, however, should not count on this.
-
-vector-insert-sort-lib - vector insertion sort
-    insert-sort  < v [start end] -> vector
-    insert-sort! < v [start end] -> unspecified
-    
-    These procedures stably sort their data using insertion sort.
-    
-    INSERT-SORT returns a vector of length END-START.
-    INSERT-SORT! is in-place, leaving its result in V[start,end).
-
-delndup-lib - list and vector delete neighbor duplicates
-    list-delete-neighbor-dups  = lis -> list
-    list-delete-neighbor-dups! = lis -> list
-    
-    vector-delete-neighbor-dups  = v [start end] -> vector
-    vector-delete-neighbor-dups! = v [start end] -> end'
-
-    These procedures delete adjacent duplicate elements from a list or
-    a vector, using a given element-equality procedure =. The first/leftmost
-    element of a run of equal elements is the one that survives. The list
-    or vector is not otherwise disordered.
-
-    These procedures are linear time -- much faster than the O(n^2) general
-    duplicate-element deletors that do not assume any "bunching" of elements
-    (such as the ones provided by SRFI-1). If you want to delete duplicate
-    elements from a large list or vector, you can sort the elements to bring
-    equal items together, then use one of these procedures, for a total time
-    of O(n lg n).
-    
-    The comparison function = passed to these procedures is always applied
-      (= x y)
-    where X comes before Y in the containing list or vector.
-
-    LIST-DELETE-NEIGHBOR-DUPS does not alter its input list; its answer
-    may share storage with the input list.
-
-    VECTOR-DELETE-NEIGHBOR-DUPS does not alter its input vector, but
-    rather allocates a fresh vector to hold the result.
-
-    LIST-DELETE-NEIGHBOR-DUPS! is permitted, but not required, to
-    mutate its input list in order to construct its answer.
-
-    VECTOR-DELETE-NEIGHBOR-DUPS! reuses its input vector to hold the
-    answer, packing its answer into the index range [start,end'), where
-    END' is the non-negative exact integer returned as its value. It
-    returns END' as its result. The vector is not altered outside the range
-    [start,end').
-
-    Examples:
-	(list-delete-neighbor-dups = '(1 1 2 7 7 7 0 -2 -2))
-          => (1 2 7 0 -2)
-
-	(vector-delete-neighbor-dups = '#(1 1 2 7 7 7 0 -2 -2))
-          => #(1 2 7 0 -2)
-
-	(vector-delete-neighbor-dups = '#(1 1 2 7 7 7 0 -2 -2) 3 7)
-          => #(7 0 -2)
-
-        ;; Result left in v[3,9):
-        (let ((v (vector 0 0 0 1 1 2 2 3 3 4 4 5 5 6 6)))
-          (cons (vector-delete-neighbor-dups! = v 3)
-                v))
-           => (9 . #(0 0 0 1 2 3 4 5 6 4 4 5 5 6 6))
-
-binsearch-lib - vector binary search lib
-    vector-binary-search  elt< elt->key key v [start end] -> integer-or-false
-    vector-binary-search3 c                 v [start end] -> integer-or-false
-
-    VECTOR-BINARY-SEARCH searches vector V in range [START,END) (which
-    default to 0 and the length of V, respectively) for an element whose
-    associated key is equal to KEY. The procedure ELT->KEY is used to map
-    an element to its associated key. The elements of the vector are assumed
-    to be ordered by the ELT< relation on these keys. That is, 
-      (vector-sorted? (lambda (x y) (elt< (elt->key x) (elt->key y)))
-                      v start end) => true
-    An element E of V is a match for KEY if it's neither less nor greater
-    than the key:
-      (and (not (elt< (elt->key e) key))
-           (not (elt< key (elt->key e))))
-    If there is such an element, the procedure returns its index in the
-    vector as an exact integer. If there is no such element in the searched 
-    range, the procedure returns false.
-
-    (vector-binary-search < car 4 '#((1 . one) (3 . three)
-				     (4 . four) (25 . twenty-five)))
-    => 2
-
-    (vector-binary-search < car 7 '#((1 . one) (3 . three)
-				     (4 . four) (25 . twenty-five)))
-    => #f
-    
-    VECTOR-BINARY-SEARCH3 is a variant that uses a three-way comparison
-    function C. C compares its parameter to the search key, and returns an
-    exact integer whose sign indicates its relationship to the search key.
-      (c x) < 0   =>   x < search-key
-      (c x) = 0   =>   x = search-key
-      (c x) > 0   =>   x > search-key
-
-    (vector-binary-search3 (lambda (elt) (- (car elt) 4))
-                           '#((1 . one) (3 . three)
-			      (4 . four) (25 . twenty-five)))
-    => 2
-    
-    Rationale:
-    - Why isn't VECTOR-BINARY-SEARCH's ELT->KEY computation simply absorbed
-      into the < function? It is separated out because the < function is
-      applied twice inside the binary-search inner loop, once with the search
-      key for the first argument and the element key for the second argument,
-      and once, with the reverse argument order. This is not necessary for
-      VECTOR-BINARY-SEARCH3.
-  
-    - When a comparison operation is able to produce a three-way
-      discrimination, the inner loop of the binary search can trim the number
-      of per-iteration comparisons from an average of 1.5 to a guaranteed
-      single comparison per iteration. This can be a significant savings when
-      searching with an expensive comparison operation (e.g., one that
-      uses string compare, sends email, references a database, or queries
-      a network service such as a web server).
-
-    - Failure is signaled by false (rather than, say, -1) so that searches
-      can be used in conditional forms such as
-        (or (vector-binary-search ...) ...)
-      or
-        (cond ((vector-binary-search ...) => index-consumer)
-              ...)
-
--------------------------------------------------------------------------------
-* Algorithmic properties
-------------------------
-Different sort and merge algorithms have different properties.
-Choose the algorithm that matches your needs:
-
-Vector insert sort
-    Stable, but only suitable for small vectors -- O(n^2).
-
-Vector quick sort
-    Not stable. Is fast on average -- O(n lg n) -- but has bad worst-case
-    behaviour. Has good memory locality for big vectors (unlike heap sort). 
-    A clever pivot-picking trick (median of three samples) helps avoid 
-    worst-case behaviour, but pathological cases can still blow up.
-
-Vector heap sort
-    Not stable. Guaranteed fast -- O(n lg n) *worst* case. Poor locality
-    on large vectors. A very reliable workhorse.
-
-Vector merge sort
-    Stable. Not in-place -- requires a temporary buffer of equal size. 
-    Fast -- O(n lg n) -- and has good memory locality for large vectors.
-    
-    The implementation of vector merge sort provided by this SRFI's reference
-    implementation is, additionally, a "natural" sort, meaning that it
-    exploits existing order in the input data, providing O(n) best case.
-
-Destructive list merge sort
-    Stable, fast and in-place (i.e., allocates no new cons cells). "Fast"
-    means O(n lg n) worse-case, and substantially better if the data
-    is already mostly ordered, all the way down to linear time for
-    a completely-ordered input list (i.e., it is a "natural" sort).
-
-    Note that sorting lists involves chasing pointers through memory, which
-    can be a loser on modern machine architectures because of poor cache &
-    page locality. Pointer *writing*, which is what the SET-CDR!s of a
-    destructive list-sort algorithm do, is even worse, especially if your
-    Scheme has a generational GC -- the writes will thrash the write-barrier.
-    Sorting vectors has inherently better locality.
-
-    This SRFI's destructive list merge and merge sort implementations are
-    opportunistic -- they avoid redundant SET-CDR!s, and try to take long
-    already-ordered runs of list structure as-is when doing the merges.
-
-Pure list merge sort
-    Stable and fast -- O(n lg n) worst-case, and possibly O(n), depending
-    upon the input list (see discussion above).
-
-
-Algorithm     Stable?  Worst case  Average case  In-place
-------------------------------------------------------
-Vector insert Yes      O(n^2)      O(n^2)        Yes
-Vector quick  No       O(n^2)      O(n lg n)     Yes
-Vector heap   No       O(n lg n)   O(n lg n)     Yes
-Vector merge  Yes      O(n lg n)   O(n lg n)     No
-List merge    Yes      O(n lg n)   O(n lg n)     Either
-
-
--------------------------------------------------------------------------------
-* Porting and optimisation
---------------------------
-This package should be trivial to port. There are only four non-R4RS bits
-in the code:
-- Use of multiple-value return, with the R5RS VALUES procedure, and the
-  simple (RECEIVE (var ...) mv-exp body ...) multiple-value binding macro
-  of SRFI-8.
-
-- A VECTOR-COPY procedure. This is a tiny little procedure:
-    (vector-copy v [start end])
-
-- Use of the LET-OPTIONALS macro from scsh to parse and default optional
-  arguments to three routines. Again, easy to port the macro or rewrite
-  the code to parse, default, and error check the args by hand. 
-
-- Calls to an ERROR function for complaining about bad arguments.
-
-This code is tightly bummed, as far as I can go in portable Scheme.
-
-You could speed up the vector code a lot by error-checking the procedure
-parameters and then shifting over to fixnum-specific arithmetic and dangerous
-vector-indexing and vector-setting primitives. The comments in the code
-indicate where the initial error checks would have to be added. There are
-several (QUOTIENT N 2)'s that could be changed to a fixnum right-shift, as
-well, in both the list and vector code (SRFI 33 provides such an operator).
-The code is designed to enable this -- each file usually exports one or two
-"safe" procedures that end up calling an internal "dangerous" primitive. The
-little exported cover procedures are where you move the error checks.
-
-This should provide *big* speedups. In fact, all the code bumming I've done
-pretty much disappears in the noise unless you have a good compiler and also
-can dump the vector-index checks and generic arithmetic -- so I've really just
-set things up for you to exploit.
-
-The optional-arg parsing, defaulting, and error checking is done with a
-portable R4RS macro. But if your Scheme has a faster mechanism (e.g., Chez),
-you should definitely port over to it. Note that argument defaulting and
-error-checking are interleaved -- you don't have to error-check defaulted
-START/END args to see if they are fixnums that are legal vector indices for
-the corresponding vector, etc.
-
-
--------------------------------------------------------------------------------
-* References & Links
---------------------
-
-This document, in HTML:
-    http://srfi.schemers.org/srfi-32/srfi-32.html
-    [This link may not be valid while the SRFI is in draft form.]
-
-This document, in simple text format:
-    http://srfi.schemers.org/srfi-32/srfi-32.txt
-
-Archive of SRFI-32 discussion-list email:
-    http://srfi.schemers.org/srfi-32/mail-archive/maillist.html
-
-SRFI web site:
-    http://srfi.schemers.org/
-
-[CommonLisp]
-    Common Lisp: the Language
-    Guy L. Steele Jr. (editor).
-    Digital Press, Maynard, Mass., second edition 1990.
-    Available at http://www.elwood.com/alu/table/references.htm#cltl2
-
-    The Common Lisp "HyperSpec," produced by Kent Pitman, is essentially
-    the ANSI spec for Common Lisp:
-    http://www.xanalys.com/software_tools/reference/HyperSpec/
-
-[R5RS]
-    Revised^5 Report on the Algorithmic Language Scheme, 
-    R. Kelsey, W. Clinger, J. Rees (editors).
-    Higher-Order and Symbolic Computation, Vol. 11, No. 1, September, 1998.
-    and ACM SIGPLAN Notices, Vol. 33, No. 9, October, 1998.
-
-    Available at http://www.schemers.org/Documents/Standards/
-
-
--------------------------------------------------------------------------------
-* Acknowledgements
-------------------
-
-I thank the authors of the open source I consulted when designing this
-library, particularly Richard O'Keefe, Donovan Kolby and the MIT Scheme Team.
-
-
--------------------------------------------------------------------------------
-* Copyright
------------
-
-** SRFI text
-============
-This document is copyright (C) Olin Shivers (1998, 1999). 
-All Rights Reserved. 
-
-This document and translations of it may be copied and furnished to others,
-and derivative works that comment on or otherwise explain it or assist in its
-implementation may be prepared, copied, published and distributed, in whole or
-in part, without restriction of any kind, provided that the above copyright
-notice and this paragraph are included on all such copies and derivative
-works. However, this document itself may not be modified in any way, such as
-by removing the copyright notice or references to the Scheme Request For
-Implementation process or editors, except as needed for the purpose of
-developing SRFIs in which case the procedures for copyrights defined in the
-SRFI process must be followed, or as required to translate it into languages
-other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by
-the authors or their successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and THE AUTHORS AND THE SRFI EDITORS DISCLAIM ALL WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-** Reference implementation
-===========================
-Short summary: no restrictions.
-
-While I wrote all of this code myself, I read a lot of code before I began
-writing. However, all such code is, itself, either open source or public
-domain, rendering irrelevant any issue of "copyright taint."
-
-The natural merge sorts (pure list, destructive list, and vector) are not only
-my own code, but are implementations of an algorithm of my own devising. They
-run in O(n lg n) worst case, O(n) best case, and require only a logarithmic
-number of stack frames. And they are stable. And the destructive-list variant
-allocates zero cons cells; it simply rearranges the cells of the input list.
-
-Hence the reference implementation is
-    Copyright (c) 1998 by Olin Shivers.
-and made available under the same copyright as the SRFI text (see above).
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/sortp.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/32/sortp.scm
deleted file mode 100644
index b7888ce3e7..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/sortp.scm
+++ /dev/null
@@ -1,43 +0,0 @@
-(module sortp mzscheme
-  (provide list-sorted?
-           vector-sorted?)
-  
-  (require "vector-util.scm")
-  
-  ;;; The sort package -- sorted predicates
-  ;;; Olin Shivers 10/98.
-  ;;;
-  ;;; (list-sorted? < lis) -> boolean
-  ;;; (vector-sorted? < v [start end]) -> boolean
-  
-  (define (list-sorted? < list)
-    (or (not (pair? list))
-        (let lp ((prev (car list)) (tail (cdr list)))
-          (or (not (pair? tail))
-              (let ((next (car tail)))
-                (and (not (< next prev))
-                     (lp next (cdr tail))))))))
-  
-  (define (vector-sorted? elt< v . maybe-start+end)
-    (call-with-values
-     (lambda () (vector-start+end v maybe-start+end))
-     (lambda (start end)
-       (or (>= start end)			; Empty range
-           (let lp ((i (+ start 1)) (vi-1 (vector-ref v start)))
-             (or (>= i end)
-                 (let ((vi (vector-ref v i)))
-                   (and (not (elt< vi vi-1))
-                        (lp (+ i 1) vi)))))))))
-  
-  ;;; Copyright and porting non-notices
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; Give me a break. It's fifteen lines of code. I place this code in the
-  ;;; public domain; help yourself.
-  ;;;
-  ;;; If your Scheme has a faster mechanism for handling optional arguments
-  ;;; (e.g., Chez), you should definitely port over to it. Note that argument
-  ;;; defaulting and error-checking are interleaved -- you don't have to
-  ;;; error-check defaulted START/END args to see if they are fixnums that are
-  ;;; legal vector indices for the corresponding vector, etc.
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/test.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/32/test.scm
deleted file mode 100644
index f4943aa967..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/test.scm
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang scheme/base
-
-(require "sort.ss"
-         "vector-util.scm"
-         srfi/27)
-
-(define insert-sort!
-  ; http://www.math.grin.edu/~stone/events/scheme-workshop/insertion.html
-  (lambda (< v)
-    (let ((precedes? <)
-          (len (vector-length v)))
-      (let ((insert!
-             (lambda (position)
-               (let ((new (vector-ref v position)))
-                 (let loop ((trial (- position 1)))
-                   (if (negative? trial)          ; at the left end: stop!
-                       (vector-set! v 0 new)
-                       (let ((displaced (vector-ref v trial)))
-                         (if (precedes? new displaced)
-                             (begin
-                               (vector-set! v (+ trial 1) displaced)
-                               (loop (- trial 1)))
-                             (vector-set! v (+ trial 1) new)))))))))
-
-        (do ((index 1 (+ index 1)))
-            ((<= len index))
-          (insert! index))))))
-
-;;; Little test harness, 'cause I'm paraoid about tricky code.
-;;; ,open i/o srfi-27 sort list-merge-sort vector-insertion-sort vector-utils 
-
-;;; For testing stable sort -- 3 & -3 compare the same.
-(define (my< x y) (< (abs x) (abs y)))
-
-(define (unstable-sort-test v) ; quick & heap vs simple insert
-  (let ((v1 (vector-copy v))
-	(v2 (vector-copy v)))
-    (vector-heap-sort!    < v1)
-    (insert-sort!  < v2)
-    (and (or (not (equal? v1 v2))
-	     (not (vector-sorted? < v1)))
-	 (list v v1 v2))))
-
-(define (stable-sort-test v) ; insert, list & vector merge sorts
-  (let ((v1 (vector-copy v))
-	(v2 (vector-copy v))
-	(v3 (list->vector (list-merge-sort! my< (vector->list v))))
-	(v4 (list->vector (list-merge-sort  my< (vector->list v)))))
-    (vector-merge-sort! my< v1)
-    (insert-sort!       my< v2)
-    (and (or (not (equal? v1 v2))
-	     (not (equal? v1 v3))
-	     (not (equal? v1 v4))
-	     (not (vector-sorted? my< v1)))
-	 (list v v1 v2 v3 v4))))
-
-(define (do-test max-size [max-iterations #f])
-  (let lp ((i 0)
-           (total-iterations 0))
-    (when (or (not max-iterations)
-              (< total-iterations max-iterations))
-      (let ((i (cond ((= i 1000)
-                      (write-char #\.)
-                      (flush-output (current-output-port))
-                      0)
-                     (else (+ i 1))))
-            (v (random-vector (random-integer max-size))))
-        (cond ((unstable-sort-test v) => (lambda (x) (cons 'u x)))
-              ((stable-sort-test   v) => (lambda (x) (cons 's x)))
-              (else (lp i (+ total-iterations 1))))))))
-
-(define (random-vector size)
-  (let ((v (make-vector size)))
-    (fill-vector-randomly! v (* 10 size))
-    v))
-
-(define (fill-vector-randomly! v range)
-  (let ((half (quotient range 2)))
-    (do ((i (- (vector-length v) 1) (- i 1)))
-	((< i 0))
-      (vector-set! v i (- (random-integer range) half)))))
-
-
-(do-test 100 10000)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/vbinsearch.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/32/vbinsearch.scm
deleted file mode 100644
index 95b8d019d0..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/vbinsearch.scm
+++ /dev/null
@@ -1,42 +0,0 @@
-(module vbinsearch mzscheme
-  (provide vector-binary-search
-           vector-binary-search3)
-  
-  (require "vector-util.scm")
-  
-  ;;; The sort package -- binary search			-*- Scheme -*-
-  ;;; Copyright (c) 1998 by Olin Shivers.
-  ;;; This code is in the public domain.
-  ;;; Olin Shivers 98/11
-  
-  ;;; Returns the index of the matching element.
-  ;;; (vector-binary-search < car 4 '#((1 . one) (3 . three)
-  ;;;                                  (4 . four) (25 . twenty-five)))
-  ;;;   => 2
-  
-  (define (vector-binary-search key< elt->key key v . maybe-start+end)
-    (call-with-values
-     (lambda () (vector-start+end v maybe-start+end))
-     (lambda (start end)
-       (let lp ((left start) (right end))	; Search V[left,right).
-         (and (< left right)
-              (let* ((m (quotient (+ left right) 2))
-                     (elt (vector-ref v m))
-                     (elt-key (elt->key elt)))
-                (cond ((key< key elt-key) (lp left m))
-                      ((key< elt-key key) (lp (+ m 1) right))
-                      (else m))))))))
-  
-  (define (vector-binary-search3 compare v . maybe-start+end)
-    (call-with-values
-     (lambda () (vector-start+end v maybe-start+end))
-     (lambda (start end)
-       (let lp ((left start) (right end))	; Search V[left,right).
-         (and (< left right)
-              (let* ((m (quotient (+ left right) 2))
-                     (sign (compare (vector-ref v m))))
-                (cond ((> sign 0) (lp left m))
-                      ((< sign 0) (lp (+ m 1) right))
-                      (else m))))))))
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/vector-util.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/32/vector-util.scm
deleted file mode 100644
index 5ee3cd8d8c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/vector-util.scm
+++ /dev/null
@@ -1,61 +0,0 @@
-(module vector-util mzscheme
-
-  (provide (all-defined))
-  
-  (define (vector-portion-copy vec start end)
-    (let* ((len (vector-length vec))
-           (new-len (- end start))
-           (new (make-vector new-len)))
-      (do ((i start (+ i 1))
-           (j 0 (+ j 1)))
-	((= i end) new)
-        (vector-set! new j (vector-ref vec i)))))
-  
-  (define (vector-copy vec)
-    (vector-portion-copy vec 0 (vector-length vec)))
-  
-  (define (vector-portion-copy! target src start end)
-    (let ((len (- end start)))
-      (do ((i (- len 1) (- i 1))
-           (j (- end 1) (- j 1)))
-	((< i 0))
-        (vector-set! target i (vector-ref src j)))))
-  
-  (define (has-element list index)
-    (cond
-      ((zero? index)
-       (if (pair? list)
-           (values #t (car list))
-           (values #f #f)))
-      ((null? list)
-       (values #f #f))
-      (else
-       (has-element (cdr list) (- index 1)))))
-  
-  (define (list-ref-or-default list index default)
-    (call-with-values
-     (lambda () (has-element list index))
-     (lambda (has? maybe)
-       (if has?
-           maybe
-           default))))
-  
-  (define (vector-start+end vector maybe-start+end)
-    (let ((start (list-ref-or-default maybe-start+end
-                                      0 0))
-          (end (list-ref-or-default maybe-start+end
-                                    1 (vector-length vector))))
-      (values start end)))
-  
-  (define (vectors-start+end-2 vector-1 vector-2 maybe-start+end)
-    (let ((start-1 (list-ref-or-default maybe-start+end
-                                        0 0))
-          (end-1 (list-ref-or-default maybe-start+end
-                                      1 (vector-length vector-1)))
-          (start-2 (list-ref-or-default maybe-start+end
-                                        2 0))
-          (end-2 (list-ref-or-default maybe-start+end
-                                      3 (vector-length vector-2))))
-      (values start-1 end-1
-              start-2 end-2)))
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/vhsort.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/32/vhsort.scm
deleted file mode 100644
index cc13b10ac1..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/vhsort.scm
+++ /dev/null
@@ -1,126 +0,0 @@
-(module vhsort mzscheme
-  (provide vector-heap-sort!
-           vector-heap-sort)
-  
-  (require "vector-util.scm")
-  
-  ;;; The sort package -- vector heap sort		-*- Scheme -*-
-  ;;; Copyright (c) 2002 by Olin Shivers.
-  ;;; This code is open-source; see the end of the file for porting and
-  ;;; more copyright information.
-  ;;; Olin Shivers 10/98.
-  
-  ;;; Exports:
-  ;;; (vector-heap-sort! elt< v [start end]) -> unspecified
-  ;;; (vector-heap-sort  elt< v [start end]) -> vector
-  
-  ;;; Two key facts
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; If a heap structure is embedded into a vector at indices [start,end), then:
-  ;;;   1. The two children of index k are start + 2*(k-start) + 1 = k*2-start+1
-  ;;;                                  and start + 2*(k-start) + 2 = k*2-start+2.
-  ;;;
-  ;;;   2. The first index of a leaf node in the range [start,end) is
-  ;;;          first-leaf = floor[(start+end)/2]
-  ;;;      (You can deduce this from fact #1 above.) 
-  ;;;      Any index before FIRST-LEAF is an internal node.
-  
-  (define (really-vector-heap-sort! elt< v start end)
-    ;; Vector V contains a heap at indices [START,END). The heap is in heap
-    ;; order in the range (I,END) -- i.e., every element in this range is >=
-    ;; its children. Bubble HEAP[I] down into the heap to impose heap order on
-    ;; the range [I,END).
-    (define (restore-heap! end i)
-      (let* ((vi (vector-ref v i))
-             (first-leaf (quotient (+ start end) 2)) ; Can fixnum overflow.
-             (final-k (let lp ((k i))
-                        (if (>= k first-leaf)
-                            k		; Leaf, so done.
-                            (let* ((k*2-start (+ k (- k start))) ; Don't overflow.
-                                   (child1 (+ 1 k*2-start))
-                                   (child2 (+ 2 k*2-start))
-                                   (child1-val (vector-ref v child1)))
-                              (call-with-values
-                               (lambda ()
-                                 (if (< child2 end)
-                                     (let ((child2-val (vector-ref v child2)))
-                                       (if (elt< child2-val child1-val)
-                                           (values child1 child1-val)
-                                           (values child2 child2-val)))
-                                     (values child1 child1-val)))
-                               (lambda (max-child max-child-val)
-                                 (cond ((elt< vi max-child-val)
-                                        (vector-set! v k max-child-val)
-                                        (lp max-child))
-                                       (else k))))))))) ; Done.
-        (vector-set! v final-k vi)))
-    
-    ;; Put the unsorted subvector V[start,end) into heap order.
-    (let ((first-leaf (quotient (+ start end) 2)))  ; Can fixnum overflow.
-      (do ((i (- first-leaf 1) (- i 1)))
-	((< i start))
-        (restore-heap! end i)))
-    
-    (do ((i (- end 1) (- i 1)))
-      ((<= i start))
-      (let ((top (vector-ref v start)))
-        (vector-set! v start (vector-ref v i))
-        (vector-set! v i top)
-        (restore-heap! i start))))
-  
-  ;;; Here are the two exported interfaces.
-  
-  (define (vector-heap-sort! elt< v . maybe-start+end)
-    (call-with-values
-     (lambda () (vector-start+end v maybe-start+end))
-     (lambda (start end)
-       (really-vector-heap-sort! elt< v start end))))
-  
-  (define (vector-heap-sort elt< v . maybe-start+end)
-    (call-with-values
-     (lambda () (vector-start+end v maybe-start+end))
-     (lambda (start end)
-       (let ((ans (vector-portion-copy v start end)))
-         (really-vector-heap-sort! elt< ans 0 (- end start))
-         ans))))
-  
-  ;;; Notes on porting
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; 
-  ;;; Bumming the code for speed
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; If you can use a module system to lock up the internal function
-  ;;; REALLY-VECTOR-HEAP-SORT! so that it can only be called from VECTOR-HEAP-SORT and
-  ;;; VECTOR-HEAP-SORT!, then you can hack the internal functions to run with no safety
-  ;;; checks. The safety checks performed by the exported functions VECTOR-HEAP-SORT &
-  ;;; VECTOR-HEAP-SORT! guarantee that there will be no type errors or array-indexing
-  ;;; errors. In addition, with the exception of the two computations of
-  ;;; FIRST-LEAF, all arithmetic will be fixnum arithmetic that never overflows
-  ;;; into bignums, assuming your Scheme provides that you can't allocate an
-  ;;; array so large you might need a bignum to index an element, which is
-  ;;; definitely the case for every implementation with which I am familiar. 
-  ;;;
-  ;;; If you want to code up the first-leaf = (quotient (+ s e) 2) computation
-  ;;; so that it will never fixnum overflow when S & E are fixnums, you can do
-  ;;; it this way:
-  ;;;   - compute floor(e/2), which throws away e's low-order bit.
-  ;;;   - add e's low-order bit to s, and divide that by two:
-  ;;;     floor[(s + e mod 2) / 2]
-  ;;;   - add these two parts together.
-  ;;; giving you
-  ;;;   (+ (quotient e 2)
-  ;;;      (quotient (+ s (modulo e 2)) 2))
-  ;;; If we know that e & s are fixnums, and that 0 <= s <= e, then this
-  ;;; can only fixnum-overflow when s = e = max-fixnum. Note that the
-  ;;; two divides and one modulo op can be done very quickly with two 
-  ;;; right-shifts and a bitwise and.
-  ;;;
-  ;;; I suspect there has never been a heapsort written in the history of
-  ;;; the world in C that got this detail right.
-  ;;;
-  ;;; If your Scheme has a faster mechanism for handling optional arguments
-  ;;; (e.g., Chez), you should definitely port over to it. Note that argument
-  ;;; defaulting and error-checking are interleaved -- you don't have to
-  ;;; error-check defaulted START/END args to see if they are fixnums that are
-  ;;; legal vector indices for the corresponding vector, etc.
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/visort.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/32/visort.scm
deleted file mode 100644
index cbd4c69d9e..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/visort.scm
+++ /dev/null
@@ -1,86 +0,0 @@
-(module visort mzscheme
-  (provide vector-insert-sort
-           vector-insert-sort!
-           %vector-insert-sort!)
-  
-  (require "vector-util.scm")
-  
-  ;;; The sort package -- stable vector insertion sort	-*- Scheme -*-
-  ;;; Copyright (c) 1998 by Olin Shivers.
-  ;;; This code is open-source; see the end of the file for porting and
-  ;;; more copyright information.
-  ;;; Olin Shivers 10/98.
-  
-  ;;; Exports:
-  ;;; vector-insert-sort  < v [start end] -> vector
-  ;;; vector-insert-sort! < v [start end] -> unspecific
-  ;;;
-  ;;; %vector-insert-sort! is also called from vqsort.scm's quick-sort function.
-  
-  (define (vector-insert-sort elt< v . maybe-start+end)
-    (call-with-values
-     (lambda () (vector-start+end v maybe-start+end))
-     (lambda (start end)
-       (let ((ans (vector-portion-copy v start end)))
-         (%vector-insert-sort! elt< ans 0 (- end start))
-         ans))))
-  
-  (define (vector-insert-sort! < v . maybe-start+end)
-    (call-with-values
-     (lambda () (vector-start+end v maybe-start+end))
-     (lambda (start end)
-       (%vector-insert-sort! < v start end))))
-  
-  (define (%vector-insert-sort! elt< v start end)
-    (do ((i (+ 1 start) (+ i 1)))	; Invariant: [start,i) is sorted.
-      ((>= i end))
-      (let ((val (vector-ref v i)))
-        (vector-set! v (let lp ((j i))		; J is the location of the
-                         (if (<= j start)
-                             start	; "hole" as it bubbles down.
-                             (let* ((j-1 (- j 1))
-                                    (vj-1 (vector-ref v j-1)))
-                               (cond ((elt< val vj-1)
-                                      (vector-set! v j vj-1)
-                                      (lp j-1))
-                                     (else j)))))
-                     val))))
-  
-  ;;; Copyright
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; This code is
-  ;;;     Copyright (c) 1998 by Olin Shivers.
-  ;;; The terms are: You may do as you please with this code, as long as
-  ;;; you do not delete this notice or hold me responsible for any outcome
-  ;;; related to its use.
-  ;;;
-  ;;; Blah blah blah. Don't you think source files should contain more lines
-  ;;; of code than copyright notice?
-  
-  
-  ;;; Code tuning & porting
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;;
-  ;;; This code is tightly bummed as far as I can go in portable Scheme.
-  ;;;
-  ;;; The code can be converted to use unsafe vector-indexing and
-  ;;; fixnum-specific arithmetic ops -- the safety checks done on entry
-  ;;; to VECTOR-INSERT-SORT and VECTOR-INSERT-SORT! are sufficient to
-  ;;; guarantee nothing bad will happen. However, note that if you alter
-  ;;; %VECTOR-INSERT-SORT! to use dangerous primitives, you must ensure
-  ;;; it is only called from clients that guarantee to observe its
-  ;;; preconditions. In the implementation, %VECTOR-INSERT-SORT! is only
-  ;;; called from VECTOR-INSERT-SORT! and the quick-sort code in
-  ;;; vqsort.scm, and the preconditions are guaranteed for these two
-  ;;; clients.  This should provide *big* speedups. In fact, all the
-  ;;; code bumming I've done pretty much disappears in the noise unless
-  ;;; you have a good compiler and also can dump the vector-index checks
-  ;;; and generic arithmetic -- so I've really just set things up for
-  ;;; you to exploit.
-  ;;;
-  ;;; If your Scheme has a faster mechanism for handling optional arguments
-  ;;; (e.g., Chez), you should definitely port over to it. Note that argument
-  ;;; defaulting and error-checking are interleaved -- you don't have to
-  ;;; error-check defaulted START/END args to see if they are fixnums that are
-  ;;; legal vector indices for the corresponding vector, etc.
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/32/vmsort.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/32/vmsort.scm
deleted file mode 100644
index 8e3bf501b3..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/32/vmsort.scm
+++ /dev/null
@@ -1,248 +0,0 @@
-(module vmsort mzscheme
-  (provide vector-merge
-           vector-merge!
-           vector-merge-sort
-           vector-merge-sort!)
-  
-  (require "vector-util.scm"
-           (only scheme/base vector-copy!))
-  
-  ;;; The sort package -- stable vector merge & merge sort -*- Scheme -*-
-  ;;; Copyright (c) 1998 by Olin Shivers.
-  ;;; This code is open-source; see the end of the file for porting and
-  ;;; more copyright information.
-  ;;; Olin Shivers 10/98.
-  
-  ;;; Exports:
-  ;;; (vector-merge  < v1 v2 [start1 end1 start2 end2])          -> vector
-  ;;; (vector-merge! < v v1 v2 [start0 start1 end1 start2 end2]) -> unspecific
-  ;;;
-  ;;; (vector-merge-sort  < v [start end temp]) -> vector
-  ;;; (vector-merge-sort! < v [start end temp]) -> unspecific
-  
-  
-  ;;; Merge
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; (vector-merge < v1 v2 [start1 end1 start2 end2]) -> vector
-  ;;; (vector-merge! < v v1 v2 [start start1 end1 start2 end2]) -> unspecific
-  ;;;
-  ;;; Stable vector merge -- V1's elements come out ahead of equal V2 elements.
-  
-  (define (vector-merge < v1 v2 . maybe-starts+ends)
-    (call-with-values
-     (lambda () (vectors-start+end-2 v1 v2 maybe-starts+ends))
-     (lambda (start1 end1 start2 end2)
-       (let ((ans (make-vector (+ (- end1 start1) (- end2 start2)))))
-         (%vector-merge! < ans v1 v2 0 start1 end1 start2 end2)
-         ans))))
-  
-  (define (vector-merge! < v v1 v2 . maybe-starts+ends)
-    (call-with-values
-     (lambda ()
-       (if (pair? maybe-starts+ends)
-           (values (car maybe-starts+ends)
-                   (cdr maybe-starts+ends))
-           (values 0
-                   '())))
-     (lambda (start rest)
-       (call-with-values
-        (lambda () (vectors-start+end-2 v1 v2 rest))
-        (lambda (start1 end1 start2 end2)
-          (%vector-merge! < v v1 v2 start start1 end1 start2 end2))))))
-  
-  
-  ;;; This routine is not exported. The code is tightly bummed.
-  ;;;
-  ;;; If these preconditions hold, the routine can be bummed to run with 
-  ;;; unsafe vector-indexing and fixnum arithmetic ops:
-  ;;;   - V V1 V2 are vectors.
-  ;;;   - START0 START1 END1 START2 END2 are fixnums.
-  ;;;   - (<= 0 START0 END0 (vector-length V),
-  ;;;     where end0 = start0 + (end1 - start1) + (end2 - start2)
-  ;;;   - (<= 0 START1 END1 (vector-length V1))
-  ;;;   - (<= 0 START2 END2 (vector-length V2))
-  ;;; If you put these error checks in the two client procedures above, you can
-  ;;; safely convert this procedure to use unsafe ops -- which is why it isn't
-  ;;; exported. This will provide *huge* speedup.
-  
-  (define (%vector-merge! elt< v v1 v2 start start1 end1 start2 end2)
-    (letrec ((vblit (lambda (fromv j i end)      ; Blit FROMV[J,END) to V[I,?].
-                      (vector-copy! v i fromv j end))))
-      
-      (cond ((<= end1 start1) (if (< start2 end2) (vblit v2 start2 start end2)))
-            ((<= end2 start2) (vblit v1 start1 start end1))
-            
-            ;; Invariants: I is next index of V to write; X = V1[J]; Y = V2[K].
-            (else (let lp ((i start)
-                           (j start1)  (x (vector-ref v1 start1))
-                           (k start2)  (y (vector-ref v2 start2)))
-                    (let ((i1 (+ i 1)))	; "i+1" is a complex number in R4RS!
-                      (if (elt< y x)
-                          (let ((k (+ k 1)))
-                            (vector-set! v i y)
-                            (if (< k end2)
-                                (lp i1 j x k (vector-ref v2 k))
-                                (vblit v1 j i1 end1)))
-                          (let ((j (+ j 1)))
-                            (vector-set! v i x)
-                            (if (< j end1)
-                                (vblit v2 k i1 end2)
-                                (lp i1 j (vector-ref v1 j) k y))))))))))
-  
-  
-  ;;; (vector-merge-sort  < v [start end temp]) -> vector
-  ;;; (vector-merge-sort! < v [start end temp]) -> unspecific
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; Stable natural vector merge sort
-  
-  (define (vector-merge-sort! < v . maybe-args)
-    (call-with-values
-     (lambda () (vector-start+end v maybe-args))
-     (lambda (start end)
-       (let ((temp (if (and (pair? maybe-args) ; kludge
-                            (pair? (cdr maybe-args))
-                            (pair? (cddr maybe-args)))
-                       (caddr maybe-args)
-                       (make-vector (vector-length v)))))
-         (%vector-merge-sort! < v start end temp)))))
-  
-  (define (vector-merge-sort < v . maybe-args)
-    (let ((ans (vector-copy v)))
-      (apply vector-merge-sort! < ans maybe-args)
-      ans))
-  
-  
-  ;;; %VECTOR-MERGE-SORT! is not exported.
-  ;;; Preconditions:
-  ;;;   V TEMP vectors
-  ;;;   START END fixnums
-  ;;;   START END legal indices for V and TEMP
-  ;;; If these preconditions are ensured by the cover functions, you
-  ;;; can safely change this code to use unsafe fixnum arithmetic and vector
-  ;;; indexing ops, for *huge* speedup.
-  
-  ;;; This merge sort is "opportunistic" -- the leaves of the merge tree are
-  ;;; contiguous runs of already sorted elements in the vector. In the best
-  ;;; case -- an already sorted vector -- it runs in linear time. Worst case
-  ;;; is still O(n lg n) time.
-  
-  (define (%vector-merge-sort! elt< v0 l r temp0)
-    (define (xor a b) (not (eq? a b)))
-    
-    ;; Merge v1[l,l+len1) and v2[l+len1,l+len1+len2) into target[l,l+len1+len2)
-    ;; Merge left-to-right, so that TEMP may be either V1 or V2
-    ;; (that this is OK takes a little bit of thought).
-    ;; V2=TARGET? is true if V2 and TARGET are the same, which allows
-    ;; merge to punt the final blit half of the time.
-    
-    (define (merge target v1 v2 l len1 len2 v2=target?)
-      (letrec ((vblit (lambda (fromv j i end)    ; Blit FROMV[J,END) to TARGET[I,?]
-                        (let lp ((j j) (i i))    ; J < END. The final copy.
-                          (vector-set! target i (vector-ref fromv j))
-                          (let ((j (+ j 1)))
-                            (if (< j end) (lp j (+ i 1))))))))
-        
-        (let* ((r1 (+ l  len1))
-               (r2 (+ r1 len2)))
-          ; Invariants:
-          (let lp ((n l)					; N is next index of 
-                   (j l)   (x (vector-ref v1 l))		;   TARGET to write.   
-                   (k r1)  (y (vector-ref v2 r1)))	; X = V1[J]          
-            (let ((n+1 (+ n 1)))				; Y = V2[K]          
-              (if (elt< y x)
-                  (let ((k (+ k 1)))
-                    (vector-set! target n y)
-                    (if (< k r2)
-                        (lp n+1 j x k (vector-ref v2 k))
-                        (vblit v1 j n+1 r1)))
-                  (let ((j (+ j 1)))
-                    (vector-set! target n x)
-                    (if (< j r1)
-                        (lp n+1 j (vector-ref v1 j) k y)
-                        (if (not v2=target?) (vblit v2 k n+1 r2))))))))))
-    
-    
-    ;; Might hack GETRUN so that if the run is short it pads it out to length
-    ;; 10 with insert sort...
-    
-    ;; Precondition: l < r.
-    (define (getrun v l r)
-      (let lp ((i (+ l 1))  (x (vector-ref v l)))
-        (if (>= i r)
-            (- i l)
-            (let ((y (vector-ref v i)))
-              (if (elt< y x)
-                  (- i l)
-                  (lp (+ i 1) y))))))
-    
-    ;; RECUR: Sort V0[L,L+LEN) for some LEN where 0 < WANT <= LEN <= (R-L).
-    ;;   That is, sort *at least* WANT elements in V0 starting at index L.
-    ;;   May put the result into either V0[L,L+LEN) or TEMP0[L,L+LEN).
-    ;;   Must not alter either vector outside this range.
-    ;;   Return:
-    ;;     - LEN -- the number of values we sorted
-    ;;     - ANSVEC -- the vector holding the value
-    ;;     - ANS=V0? -- tells if ANSVEC is V0 or TEMP
-    ;;
-    ;; LP: V[L,L+PFXLEN) holds a sorted prefix of V0.
-    ;;     TEMP = if V = V0 then TEMP0 else V0. (I.e., TEMP is the other vec.)
-    ;;     PFXLEN2 is a power of 2 <= PFXLEN.
-    ;;     Solve RECUR's problem.
-    (if (< l r) ; Don't try to sort an empty range.
-        (call-with-values
-         (lambda ()
-           (let recur ((l l) (want (- r l)))
-             (let lp ((pfxlen (getrun v0 l r)) (pfxlen2 1)
-                      (v v0) (temp temp0)
-                      (v=v0? #t))
-               (if (or (>= pfxlen want) (= pfxlen (- r l)))
-                   (values pfxlen v v=v0?)
-                   (let ((pfxlen2 (let lp ((j pfxlen2))
-                                    (let ((j*2 (+ j j)))
-                                      (if (<= j*2 pfxlen) (lp j*2) j)))))
-                     ;; PFXLEN2 is now the largest power of 2 <= PFXLEN.
-                     ;; (Just think of it as being roughly PFXLEN.)
-                     (call-with-values
-                         (lambda ()
-                           (recur (+ pfxlen l) pfxlen2))
-                       (lambda (nr-len nr-vec nrvec=v0?)
-                         (merge temp v nr-vec l pfxlen nr-len
-                                (xor nrvec=v0? v=v0?))
-                         (lp (+ pfxlen nr-len) (+ pfxlen2 pfxlen2)
-                             temp v (not v=v0?)))))))))
-         (lambda (ignored-len ignored-ansvec ansvec=v0?)
-           (if (not ansvec=v0?) (vector-portion-copy! v0 temp0 l r))))))
-  
-  
-  ;;; Copyright
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; This code is
-  ;;;     Copyright (c) 1998 by Olin Shivers.
-  ;;; The terms are: You may do as you please with this code, as long as
-  ;;; you do not delete this notice or hold me responsible for any outcome
-  ;;; related to its use.
-  ;;;
-  ;;; Blah blah blah. Don't you think source files should contain more lines
-  ;;; of code than copyright notice?
-  
-  
-  ;;; Code tuning & porting
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;; This code is *tightly* bummed as far as I can go in portable Scheme.
-  ;;;
-  ;;; The two internal primitives that do the real work can be converted to
-  ;;; use unsafe vector-indexing and fixnum-specific arithmetic ops *if* you
-  ;;; alter the four small cover functions to enforce the invariants. This should
-  ;;; provide *big* speedups. In fact, all the code bumming I've done pretty
-  ;;; much disappears in the noise unless you have a good compiler and also
-  ;;; can dump the vector-index checks and generic arithmetic -- so I've really
-  ;;; just set things up for you to exploit.
-  ;;;
-  ;;; The optional-arg parsing, defaulting, and error checking is done with a
-  ;;; portable R4RS macro. But if your Scheme has a faster mechanism (e.g., 
-  ;;; Chez), you should definitely port over to it. Note that argument defaulting
-  ;;; and error-checking are interleaved -- you don't have to error-check 
-  ;;; defaulted START/END args to see if they are fixnums that are legal vector
-  ;;; indices for the corresponding vector, etc.
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/34.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/34.rkt
deleted file mode 100644
index c2d7d0c640..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/34.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-34
-#lang s-exp srfi/provider srfi/34/exception
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/34/exception.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/34/exception.rkt
deleted file mode 100644
index 7b79798df6..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/34/exception.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     syntax/stx))
-
-;; SRFI 34 for PLT Scheme
-;; Zhu Chongkai, April 2005
-;; <mrmathematica@yahoo.com>
-
-(provide with-exception-handler
-         guard
-         raise)
-  
-(define-syntax with-exception-handler
-  (syntax-rules ()
-    ((_ handler thunk)
-     (with-handlers (((lambda (exn) #t) handler)) (thunk)))))
-
-(define-syntax (guard stx)
-  (syntax-case stx ()
-    ((_ (var clause ... (els de ...)) e1 e2 ...)
-     (and (identifier? #'els)
-          (module-or-top-identifier=? #'els #'else))
-     (syntax/loc stx
-       (with-handlers (((lambda (exn) #t)
-                        (lambda (var) (cond clause ...
-                                            (else de ...)))))
-         e1 e2 ...)))
-    ((_ (var clause ...) e1 e2 ...)
-     (syntax/loc stx
-       (with-handlers (((lambda (exn) #t)
-                        (lambda (var) (cond clause ...
-                                            (else (raise var))))))
-         e1 e2 ...)))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/35.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/35.rkt
deleted file mode 100644
index 203cd182aa..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/35.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-35
-#lang s-exp srfi/provider srfi/35/condition
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/35/condition.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/35/condition.rkt
deleted file mode 100644
index b0b9f97ab2..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/35/condition.rkt
+++ /dev/null
@@ -1,194 +0,0 @@
-(module condition mzscheme
-  
-  (require srfi/1/list
-           srfi/9)
-  
-  (provide make-condition-type
-           condition-type?
-           make-condition
-           condition?
-           condition-has-type?
-           condition-ref
-           make-compound-condition
-           extract-condition
-           define-condition-type
-           condition
-           &condition
-           &message
-           &serious
-           &error)
-  
-  (define-record-type :condition-type
-                      (really-make-condition-type name supertype fields all-fields)
-                      condition-type?
-                      (name condition-type-name)
-                      (supertype condition-type-supertype)
-                      (fields condition-type-fields)
-                      (all-fields condition-type-all-fields))
-  
-  (define (make-condition-type name supertype fields)
-    (if (not (symbol? name))
-        (error "make-condition-type: name is not a symbol"
-               name))
-    (if (not (condition-type? supertype))
-        (error "make-condition-type: supertype is not a condition type"
-               supertype))
-    (if (not
-         (null? (lset-intersection eq?
-                                   (condition-type-all-fields supertype)
-                                   fields)))
-        (error "duplicate field name" ))
-    (really-make-condition-type name
-                                supertype
-                                fields
-                                (append (condition-type-all-fields supertype)
-                                        fields)))
-  
-  (define-syntax define-condition-type
-    (syntax-rules ()
-      ((define-condition-type ?name ?supertype ?predicate
-                              (?field1 ?accessor1) ...)
-       (begin
-         (define ?name
-           (make-condition-type '?name
-                                ?supertype
-                                '(?field1 ...)))
-         (define (?predicate thing)
-           (and (condition? thing)
-                (condition-has-type? thing ?name)))
-         (define (?accessor1 condition)
-           (condition-ref (extract-condition condition ?name)
-                          '?field1))
-         ...))))
-  
-  (define (condition-subtype? subtype supertype)
-    (let recur ((subtype subtype))
-      (cond ((not subtype) #f)
-            ((eq? subtype supertype) #t)
-            (else
-             (recur (condition-type-supertype subtype))))))
-  
-  (define (condition-type-field-supertype condition-type field)
-    (let loop ((condition-type condition-type))
-      (cond ((not condition-type) #f)
-            ((memq field (condition-type-fields condition-type))
-             condition-type)
-            (else
-             (loop (condition-type-supertype condition-type))))))
-  
-  ; The type-field-alist is of the form
-  ; ((<type> (<field-name> . <value>) ...) ...)
-  (define-record-type :condition
-                      (really-make-condition type-field-alist)
-                      condition?
-                      (type-field-alist condition-type-field-alist))
-  
-  (define (make-condition type . field-plist)
-    (let ((alist (let label ((plist field-plist))
-                   (if (null? plist)
-                       '()
-                       (cons (cons (car plist)
-                                   (cadr plist))
-                             (label (cddr plist)))))))
-      (if (not (lset= eq?
-                      (condition-type-all-fields type)
-                      (map car alist)))
-          (error "condition fields don't match condition type"))
-      (really-make-condition (list (cons type alist)))))
-  
-  (define (condition-has-type? condition type)
-    (any (lambda (has-type)
-           (condition-subtype? has-type type))
-         (condition-types condition)))
-  
-  (define (condition-ref condition field)
-    (type-field-alist-ref (condition-type-field-alist condition)
-                          field))
-  
-  (define (type-field-alist-ref type-field-alist field)
-    (let loop ((type-field-alist type-field-alist))
-      (cond ((null? type-field-alist)
-             (error "type-field-alist-ref: field not found"
-                    type-field-alist field))
-            ((assq field (cdr (car type-field-alist)))
-             => cdr)
-            (else
-             (loop (cdr type-field-alist))))))
-  
-  (define (make-compound-condition condition-1 . conditions)
-    (really-make-condition
-     (apply append (map condition-type-field-alist
-                        (cons condition-1 conditions)))))
-  
-  (define (extract-condition condition type)
-    (let ((entry (find (lambda (entry)
-                         (condition-subtype? (car entry) type))
-                       (condition-type-field-alist condition))))
-      (if (not entry)
-          (error "extract-condition: invalid condition type"
-                 condition type))
-      (really-make-condition
-       (list (cons type
-                   (map (lambda (field)
-                          (assq field (cdr entry)))
-                        (condition-type-all-fields type)))))))
-  
-  (define-syntax condition
-    (syntax-rules ()
-      ((condition (?type1 (?field1 ?value1) ...) ...)
-       (type-field-alist->condition
-        (list
-         (cons ?type1
-               (list (cons '?field1 ?value1) ...))
-         ...)))))
-  
-  (define (type-field-alist->condition type-field-alist)
-    (really-make-condition
-     (map (lambda (entry)
-            (cons (car entry)
-                  (map (lambda (field)
-                         (or (assq field (cdr entry))
-                             (cons field
-                                   (type-field-alist-ref type-field-alist field))))
-                       (condition-type-all-fields (car entry)))))
-          type-field-alist)))
-  
-  (define (condition-types condition)
-    (map car (condition-type-field-alist condition)))
-  
-  (define (check-condition-type-field-alist the-type-field-alist)
-    (let loop ((type-field-alist the-type-field-alist))
-      (if (not (null? type-field-alist))
-          (let* ((entry (car type-field-alist))
-                 (type (car entry))
-                 (field-alist (cdr entry))
-                 (fields (map car field-alist))
-                 (all-fields (condition-type-all-fields type)))
-            (for-each (lambda (missing-field)
-                        (let ((supertype
-                               (condition-type-field-supertype type missing-field)))
-                          (if (not
-                               (any (lambda (entry)
-                                      (let ((type (car entry)))
-                                        (condition-subtype? type supertype)))
-                                    the-type-field-alist))
-                              (error "missing field in condition construction"
-                                     type
-                                     missing-field))))
-                      (lset-difference eq? all-fields fields))
-            (loop (cdr type-field-alist))))))
-  
-  (define &condition (really-make-condition-type '&condition
-                                                 #f
-                                                 '()
-                                                 '()))
-  
-  (define-condition-type &message &condition
-                         message-condition?
-                         (message condition-message))
-  
-  (define-condition-type &serious &condition
-                         serious-condition?)
-  
-  (define-condition-type &error &serious
-                         error?))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/38.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/38.rkt
deleted file mode 100644
index 1f5786103f..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/38.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-38
-#lang s-exp srfi/provider srfi/38/38 #:unprefix s:
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/38/38.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/38/38.rkt
deleted file mode 100644
index ce4306df4c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/38/38.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scheme/base
-
-(define (write-with-shared-structure val [port (current-output-port)] [optarg #f])
-  (parameterize ([print-graph #t]) (write val port)))
-
-(define (read-with-shared-structure [port (current-input-port)] [optarg #f])
-  (parameterize ([read-accept-graph #t])
-    (read port)))
-
-(provide write-with-shared-structure
-         (rename-out [write-with-shared-structure write/ss])
-         read-with-shared-structure
-         (rename-out [read-with-shared-structure read/ss]))
-
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/39.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/39.rkt
deleted file mode 100644
index 818336bb56..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/39.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-;; Supported by core PLT, with a slight difference in how a guard is used:
-#lang scheme/base
-
-(define make-parameter*
-  (let ([make-parameter
-         (case-lambda
-          [(v) (make-parameter v)]
-          [(v guard) (make-parameter (if (and (procedure? guard)
-                                              (procedure-arity-includes? guard 1))
-                                         ;; apply guard to initial value:
-                                         (guard v)
-                                         ;; let `make-parameter' complain:
-                                         v)
-                                     guard)])])
-    make-parameter))
-
-(provide (rename-out [make-parameter* make-parameter])
-         parameterize)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/4.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/4.rkt
deleted file mode 100644
index a66748599b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/4.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang scheme/base
-
-(require scheme/require)
-
-;; Note: this also gets additional functions for srfi-66 (u8vector-copy,
-;; u8vector=?, u8vector-compare, u8vector-copy!) -- but that should be fine,
-;; just like a future extension of the srfi-4 stuff to provide these for all
-;; vector types.
-(require (matching-identifiers-in #px"\\b_?[suf](8|16|32|64)vector\\b"
-                                  scheme/foreign))
-(provide (all-from-out scheme/foreign))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/40.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/40.rkt
deleted file mode 100644
index 910fd63217..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/40.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-40
-#lang s-exp srfi/provider srfi/40/stream
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/40/stream.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/40/stream.rkt
deleted file mode 100644
index 1dba8c8a0e..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/40/stream.rkt
+++ /dev/null
@@ -1,219 +0,0 @@
-; SRFI 40
-; STREAM -- LIBRARY OF SYNTAX AND FUNCTIONS TO MANIPULATE STREAMS
-; Zhu Chongkai    mrmathematica@yahoo.com
-; 3-Apr-2005
-
-(module stream mzscheme
-  
-  (provide stream-null
-           stream-cons
-           stream?
-           stream-null?
-           stream-pair?
-           stream-car
-           stream-cdr
-           stream-delay
-           (rename my-stream stream)
-           stream-unfoldn
-           stream-map
-           stream-for-each
-           stream-filter)
-  
-  ;;; PROMISES A LA SRFI-45:
-  
-  ;;; A separate implementation is necessary to
-  ;;; have promises that answer #t to stream?
-  ;;; This requires lots of complicated type conversions.
-  
-  (define-struct s:promise (kind content))
-  
-  (define-syntax srfi-40:lazy
-    (syntax-rules ()
-      ((_ exp)
-       (box (make-s:promise 'lazy (lambda () exp))))))
-  
-  (define (srfi-40:eager x)
-    (make-stream (box (make-s:promise 'eager x))))
-  
-  (define-syntax srfi-40:delay
-    (syntax-rules ()
-      ((_ exp)
-       (srfi-40:lazy (srfi-40:eager exp)))))
-  
-  (define (srfi-40:force promise)
-    (let ((content (unbox promise)))
-      (case (s:promise-kind content)
-        ((eager) (s:promise-content content))
-        ((lazy)
-         (let* ((promise* (stream-promise ((s:promise-content content))))
-                (content (unbox promise)))
-           (unless (eq? 'eager (s:promise-kind content))
-             (set-s:promise-kind! content (s:promise-kind (unbox promise*)))
-             (set-s:promise-content! content (s:promise-content (unbox promise*)))
-             (set-box! promise* content))
-           (srfi-40:force promise))))))
-  
-  ;;; A stream is a new data type, disjoint from all other data types, that
-  ;;; contains a promise that, when forced, is either nil (a single object
-  ;;; distinguishable from all other objects) or consists of an object
-  ;;; (the stream element) followed by a stream.  Each stream element is
-  ;;; evaluated exactly once, when it is first retrieved (not when it is
-  ;;; created); once evaluated its value is saved to be returned by
-  ;;; subsequent retrievals without being evaluated again.
-  
-  ;; STREAM? object -- #t if object is a stream, #f otherwise
-  (define-struct stream (promise))
-  
-  ;; STREAM-NULL -- the distinguished nil stream
-  (define stream-null (make-stream (srfi-40:delay '())))
-  
-  ;; STREAM-CONS object stream -- primitive constructor of streams
-  (define-syntax stream-cons
-    (syntax-rules ()
-      ((_ obj strm)
-       (make-stream (srfi-40:delay (cons obj strm))))))
-  
-  ;; STREAM-NULL? object -- #t if object is the null stream, #f otherwise
-  (define (stream-null? obj)
-    (and (stream? obj)
-         (null? (srfi-40:force (stream-promise obj)))))
-  
-  ;; STREAM-PAIR? object -- #t if object is a non-null stream, #f otherwise
-  (define (stream-pair? obj)
-    (and (stream? obj)
-         (not (null? (srfi-40:force (stream-promise obj))))))
-  
-  ;; STREAM-CAR stream -- first element of stream
-  (define (stream-car strm)
-    (unless (stream? strm)
-      (raise-type-error 'stream-car "stream" strm))
-    (let ((pair (srfi-40:force (stream-promise strm))))
-      (if (null? pair)
-          (raise-type-error 'stream-car "stream-pair" strm)
-          (car pair))))
-  
-  ;; STREAM-CDR stream -- remaining elements of stream after first
-  (define (stream-cdr strm)
-    (unless (stream? strm)
-      (raise-type-error 'stream-cdr "stream" strm))
-    (let ((pair (srfi-40:force (stream-promise strm))))
-      (if (null? pair)
-          (raise-type-error 'stream-cdr "stream-pair" strm)
-          (cdr pair))))
-  
-  ;; STREAM-DELAY object -- the essential stream mechanism
-  (define-syntax stream-delay
-    (syntax-rules ()
-      ((_ expr)
-       (make-stream (srfi-40:lazy expr)))))
-  
-  ;; STREAM object ... -- new stream whose elements are object ...
-  (define (my-stream . objs)
-    (let loop ((objs objs))
-      (stream-delay
-       (if (null? objs)
-           stream-null
-           (stream-cons (car objs) (loop (cdr objs)))))))
-  
-  ;; STREAM-UNFOLDN generator seed n -- n streams from (generator seed)
-  (define stream-unfoldn
-    (letrec ((unfold-result-stream
-              (lambda (gen seed)
-                (let loop ((seed seed))
-                  (stream-delay
-                   (call-with-values
-                    (lambda () (gen seed))
-                    (lambda (next . results)
-                      (stream-cons results (loop next))))))))
-             (result-stream->output-stream
-              (lambda (result-stream i)
-                (stream-delay
-                 (let ((result
-                        (list-ref (stream-car result-stream) i)))
-                   (cond ((pair? result)
-                          (stream-cons (car result)
-                                       (result-stream->output-stream
-                                        (stream-cdr result-stream) i)))
-                         ((not result)
-                          (result-stream->output-stream
-                           (stream-cdr result-stream) i))
-                         ((null? result)
-                          stream-null)
-                         (else
-                          (raise-mismatch-error
-                           'stream-unfoldn
-                           "result of the generator should be <pair>/#f/null; given "
-                           result)))))))
-             (result-stream->output-streams
-              (lambda (result-stream n)
-                (let loop ((i n) (outputs '()))
-                  (if (zero? i)
-                      (apply values outputs)
-                      (let ((i (sub1 i)))
-                        (loop i
-                              (cons (result-stream->output-stream result-stream i)
-                                    outputs))))))))
-      (lambda (gen seed n)
-        (unless (procedure-arity-includes? gen 1)
-          (raise-type-error 'stream-unfoldn "procedure of arity 1" gen))
-        (unless (and (integer? n)
-                     (exact? n)
-                     (positive? n))
-          (raise-type-error 'stream-unfoldn "exact, non-negative integer" n))
-        (result-stream->output-streams (unfold-result-stream gen seed) n))))
-  
-  ;; STREAM-MAP func stream ... -- stream produced by applying func element-wise
-  (define (stream-map func strm1 . strms)
-    (unless (procedure? func)
-      (raise-type-error 'stream-map "procedure" func))
-    (unless (stream? strm1)
-      (raise-type-error 'stream-map "stream" strm1))
-    (if (null? strms)
-        (let loop ((strm strm1))
-          (stream-delay
-           (if (stream-null? strm)
-               stream-null
-               (stream-cons (func (stream-car strm))
-                            (loop (stream-cdr strm))))))
-        (if (andmap stream? strms)
-            (let loop ((strms (cons strm1 strms)))
-              (stream-delay
-               (if (ormap stream-null? strms)
-                   stream-null
-                   (stream-cons (apply func (map stream-car strms))
-                                (loop (map stream-cdr strms))))))
-            (raise-type-error 'stream-map "streams" strms))))
-  
-  ;; STREAM-FOR-EACH proc stream ... -- apply proc element-wise for side-effects
-  (define (stream-for-each proc strm1 . strms)
-    (unless (procedure? proc)
-      (raise-type-error 'stream-for-each "procedure" proc))
-    (unless (stream? strm1)
-      (raise-type-error 'stream-for-each "stream" strm1))
-    (if (null? strms)
-        (let loop ((strm strm1))
-          (unless (stream-null? strm)
-            (proc (stream-car strm))
-            (loop (stream-cdr strm))))
-        (if (andmap stream? strms)
-            (let loop ((strms (cons strm1 strms)))
-              (unless (ormap stream-null? strms)
-                (apply proc (map stream-car strms))
-                (loop (map stream-cdr strms))))
-            (raise-type-error 'stream-for-each "streams" strms))))
-  
-  ;; STREAM-FILTER pred? stream -- new stream including only items passing pred?
-  (define (stream-filter pred? strm)
-    (unless (procedure? pred?)
-      (raise-type-error 'stream-filter "procedure" pred?))
-    (unless (stream? strm)
-      (raise-type-error 'stream-filter "stream" strm))
-    (let loop ((s strm))
-      (stream-delay
-       (cond ((stream-null? s)
-              stream-null)
-             ((pred? (stream-car s))
-              (stream-cons (stream-car s)
-                           (loop (stream-cdr s))))
-             (else
-              (loop (stream-cdr s))))))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/41.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/41.rkt
deleted file mode 100644
index 264cf12bec..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/41.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-;; module loader for SRFI-40
-(module |41| mzscheme
-  (require srfi/41/streams)
-  (provide (all-from srfi/41/streams)))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/41/derived.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/41/derived.rkt
deleted file mode 100644
index 36b7c03157..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/41/derived.rkt
+++ /dev/null
@@ -1,377 +0,0 @@
-; Library streams/derived
-; Adapted for PLT Scheme by Jacob J. A. Koot
-; from original version of Philip L. Bewig.
-
-; Copyright (C) 2007 by Philip L. Bewig of Saint Louis, Missouri, USA.  All rights
-; reserved.  Permission is hereby granted, free of charge, to any person obtaining a copy of
-; this software and associated documentation files (the "Software"), to deal in the Software
-; without restriction, including without limitation the rights to use, copy, modify, merge,
-; publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to
-; whom the Software is furnished to do so, subject to the following conditions: The above
-; copyright notice and this permission notice shall be included in all copies or substantial
-; portions of the Software.  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-; FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-; CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-; THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#lang scheme
-
-(provide define-stream list->stream port->stream stream stream->list
- stream-append stream-concat stream-constant stream-drop
- stream-drop-while stream-filter stream-fold stream-for-each stream-from
- stream-iterate stream-length stream-let stream-map stream-match _
- stream-of stream-range stream-ref stream-reverse stream-scan stream-take
- stream-take-while stream-unfold stream-unfolds stream-zip)
-
-(require "primitive.rkt")
-
-(define-syntax define-stream
- (syntax-rules ()
-  ((define-stream (name . formal) body0 body1 ...)
-   (define name (stream-lambda formal body0 body1 ...)))))
-
-(define (list->stream objs)
- (define list->stream
-  (stream-lambda (objs)
-   (if (null? objs)
-    stream-null
-    (stream-cons (car objs) (list->stream (cdr objs))))))
- (if (not (list? objs))
-  (error 'list->stream "non-list argument")
-  (list->stream objs)))
-
-(define (port->stream . port)
- (define port->stream
-  (stream-lambda (p)
-   (let ((c (read-char p)))
-    (if (eof-object? c)
-     stream-null
-     (stream-cons c (port->stream p))))))
- (let ((p (if (null? port) (current-input-port) (car port))))
-  (if (not (input-port? p))
-   (error 'port->stream "non-input-port argument")
-   (port->stream p))))
-
-(define-syntax stream
- (syntax-rules ()
-  ((stream) stream-null)
-  ((stream x y ...) (stream-cons x (stream y ...)))))
-
-(define (stream->list . args)
- (let ((n (if (= 1 (length args)) #f (car args)))
-       (strm (if (= 1 (length args)) (car args) (cadr args))))
-  (cond ((not (stream? strm)) (error 'stream->list "non-stream argument"))
-        ((and n (not (integer? n))) (error 'stream->list "non-integer count"))
-        ((and n (negative? n)) (error 'stream->list "negative count"))
-        (else (let loop ((n (if n n -1)) (strm strm))
-                (if (or (zero? n) (stream-null? strm))
-                  '()
-                  (cons (stream-car strm) (loop (- n 1) (stream-cdr strm)))))))))
-
-(define (stream-append . strms)
- (define stream-append
-  (stream-lambda (strms)
-   (cond ((null? (cdr strms)) (car strms))
-         ((stream-null? (car strms)) (stream-append (cdr strms)))
-         (else (stream-cons (stream-car (car strms))
-                            (stream-append (cons (stream-cdr (car strms)) (cdr strms))))))))
- (cond ((null? strms) stream-null)
-       ((ormap (lambda (x) (not (stream? x))) strms)
-        (error 'stream-append "non-stream argument"))
-       (else (stream-append strms))))
-
-(define (stream-concat strms)
- (define stream-concat
-  (stream-lambda (strms)
-   (cond ((stream-null? strms) stream-null)
-    ((not (stream? (stream-car strms)))
-     (error 'stream-concat "non-stream object in input stream"))
-    ((stream-null? (stream-car strms))
-     (stream-concat (stream-cdr strms)))
-    (else (stream-cons
-           (stream-car (stream-car strms))
-           (stream-concat
-            (stream-cons (stream-cdr (stream-car strms)) (stream-cdr strms))))))))
- (if (not (stream? strms))
-  (error 'stream-concat "non-stream argument")
-  (stream-concat strms)))
-
-(define stream-constant
- (stream-lambda objs
-  (cond ((null? objs) stream-null)
-        ((null? (cdr objs)) (stream-cons (car objs) (stream-constant (car objs))))
-        (else (stream-cons (car objs)
-                           (apply stream-constant (append (cdr objs) (list (car objs)))))))))
-
-(define (stream-drop n strm)
- (define stream-drop
-  (stream-lambda (n strm)
-   (if (or (zero? n) (stream-null? strm))
-    strm
-    (stream-drop (- n 1) (stream-cdr strm)))))
- (cond ((not (integer? n)) (error 'stream-drop "non-integer argument"))
-       ((negative? n) (error 'stream-drop "negative argument"))
-       ((not (stream? strm)) (error 'stream-drop "non-stream argument"))
-       (else (stream-drop n strm))))
-
-(define (stream-drop-while pred? strm)
- (define stream-drop-while
-  (stream-lambda (strm)
-   (if (and (stream-pair? strm) (pred? (stream-car strm)))
-    (stream-drop-while (stream-cdr strm))
-    strm)))
- (cond ((not (procedure? pred?)) (error 'stream-drop-while "non-procedural argument"))
-       ((not (stream? strm)) (error 'stream-drop-while "non-stream argument"))
-       (else (stream-drop-while strm))))
-
-(define (stream-filter pred? strm)
- (define stream-filter
-  (stream-lambda (strm)
-   (cond ((stream-null? strm) stream-null)
-         ((pred? (stream-car strm))
-          (stream-cons (stream-car strm) (stream-filter (stream-cdr strm))))
-         (else (stream-filter (stream-cdr strm))))))
- (cond ((not (procedure? pred?)) (error 'stream-filter "non-procedural argument"))
-       ((not (stream? strm)) (error 'stream-filter "non-stream argument"))
-       (else (stream-filter strm))))
-
-(define (stream-fold proc base strm)
- (cond ((not (procedure? proc)) (error 'stream-fold "non-procedural argument"))
-       ((not (stream? strm)) (error 'stream-fold "non-stream argument"))
-       (else (let loop ((base base) (strm strm))
-               (if (stream-null? strm)
-                 base
-                 (loop (proc base (stream-car strm)) (stream-cdr strm)))))))
-
-(define (stream-for-each proc . strms)
- (define (stream-for-each strms)
-  (when (not (ormap stream-null? strms))
-   (begin (apply proc (map stream-car strms))
-    (stream-for-each (map stream-cdr strms)))))
- (cond ((not (procedure? proc)) (error 'stream-for-each "non-procedural argument"))
-       ((null? strms) (error 'stream-for-each "no stream arguments"))
-       ((ormap (lambda (x) (not (stream? x))) strms)
-        (error 'stream-for-each "non-stream argument"))
-       (else (stream-for-each strms))))
-
-(define (stream-from first . step)
- (define stream-from
-  (stream-lambda (first delta)
-   (stream-cons first (stream-from (+ first delta) delta))))
- (let ((delta (if (null? step) 1 (car step))))
-   (cond ((not (number? first)) (error 'stream-from "non-numeric starting number"))
-         ((not (number? delta)) (error 'stream-from "non-numeric step size"))
-         (else (stream-from first delta)))))
-
-(define (stream-iterate proc base)
- (define stream-iterate
-  (stream-lambda (base)
-   (stream-cons base (stream-iterate (proc base)))))
- (if (not (procedure? proc))
-  (error 'stream-iterate "non-procedural argument")
-  (stream-iterate base)))
-
-(define (stream-length strm)
- (if (not (stream? strm))
-  (error 'stream-length "non-stream argument")
-  (let loop ((len 0) (strm strm))
-   (if (stream-null? strm)
-    len
-    (loop (+ len 1) (stream-cdr strm))))))
-
-(define-syntax stream-let
- (syntax-rules ()
-  ((stream-let tag ((name val) ...) body1 body2 ...)
-   ((letrec ((tag (stream-lambda (name ...) body1 body2 ...))) tag) val ...))))
-
-(define (stream-map proc . strms)
- (define stream-map
-  (stream-lambda (strms)
-   (if (ormap stream-null? strms)
-    stream-null
-    (stream-cons (apply proc (map stream-car strms))
-     (stream-map (map stream-cdr strms))))))
- (cond ((not (procedure? proc)) (error 'stream-map "non-procedural argument"))
-       ((null? strms) (error 'stream-map "no stream arguments"))
-       ((ormap (lambda (x) (not (stream? x))) strms)
-        (error 'stream-map "non-stream argument"))
-       (else (stream-map strms))))
-
-(define-syntax stream-match
- (syntax-rules ()
-  ((stream-match strm-expr clause ...)
-   (let ((strm strm-expr))
-    (cond
-     ((not (stream? strm)) (error 'stream-match "non-stream argument"))
-     ((stream-match-test strm clause) => car) ...
-     (else (error 'stream-match "pattern failure")))))))
-
-(define-syntax stream-match-test
- (syntax-rules ()
-  ((stream-match-test strm (pattern fender expr))
-   (stream-match-pattern strm pattern () (and fender (list expr))))
-  ((stream-match-test strm (pattern expr))
-   (stream-match-pattern strm pattern () (list expr)))))
-
-(define-syntax stream-match-pattern
- (lambda (x)
-  (define (wildcard? x)
-   (and (identifier? x)
-    (free-identifier=? x (syntax _))))
-  (syntax-case x ()
-   ((stream-match-pattern strm () (binding ...) body)
-    (syntax (and (stream-null? strm) (let (binding ...) body))))
-   ((stream-match-pattern strm (w? . rest) (binding ...) body)
-    (wildcard? #'w?)
-    (syntax (and (stream-pair? strm)
-      (let ((strm (stream-cdr strm)))
-       (stream-match-pattern strm rest (binding ...) body)))))
-   ((stream-match-pattern strm (var . rest) (binding ...) body)
-    (syntax (and (stream-pair? strm)
-      (let ((temp (stream-car strm)) (strm (stream-cdr strm)))
-       (stream-match-pattern strm rest ((var temp) binding ...) body)))))
-   ((stream-match-pattern strm w? (binding ...) body)
-    (wildcard? #'w?)
-    (syntax (let (binding ...) body)))
-   ((stream-match-pattern strm var (binding ...) body)
-    (syntax (let ((var strm) binding ...) body))))))
-
-(define-syntax stream-of
- (syntax-rules ()
-  ((_ expr rest ...)
-   (stream-of-aux expr stream-null rest ...))))
-
-(define-syntax stream-of-aux
- (syntax-rules (in is)
-  ((stream-of-aux expr base)
-   (stream-cons expr base))
-  ((stream-of-aux expr base (var in stream) rest ...)
-   (stream-let loop ((strm stream))
-    (if (stream-null? strm)
-     base
-     (let ((var (stream-car strm)))
-      (stream-of-aux expr (loop (stream-cdr strm)) rest ...)))))
-  ((stream-of-aux expr base (var is exp) rest ...)
-   (let ((var exp)) (stream-of-aux expr base rest ...)))
-  ((stream-of-aux expr base pred? rest ...)
-   (if pred? (stream-of-aux expr base rest ...) base))))
-
-(define (stream-range first past . step)
- (define stream-range
-  (stream-lambda (first past delta lt?)
-   (if (lt? first past)
-    (stream-cons first (stream-range (+ first delta) past delta lt?))
-    stream-null)))
- (cond ((not (number? first)) (error 'stream-range "non-numeric starting number"))
-       ((not (number? past)) (error 'stream-range "non-numeric ending number"))
-       (else (let ((delta (cond ((pair? step) (car step)) ((< first past) 1) (else -1))))
-               (if (not (number? delta))
-                 (error 'stream-range "non-numeric step size")
-                 (let ((lt? (if (< 0 delta) < >)))
-                   (stream-range first past delta lt?)))))))
-
-(define (stream-ref strm n)
- (cond ((not (stream? strm)) (error 'stream-ref "non-stream argument"))
-       ((not (integer? n)) (error 'stream-ref "non-integer argument"))
-       ((negative? n) (error 'stream-ref "negative argument"))
-       (else (let loop ((strm strm) (n n))
-               (cond ((stream-null? strm) (error 'stream-ref "beyond end of stream"))
-                     ((zero? n) (stream-car strm))
-                     (else (loop (stream-cdr strm) (- n 1))))))))
-
-(define (stream-reverse strm)
- (define stream-reverse
-  (stream-lambda (strm rev)
-   (if (stream-null? strm)
-    rev
-    (stream-reverse (stream-cdr strm) (stream-cons (stream-car strm) rev)))))
- (if (not (stream? strm))
-  (error 'stream-reverse "non-stream argument")
-  (stream-reverse strm stream-null)))
-
-(define (stream-scan proc base strm)
- (define stream-scan
-  (stream-lambda (base strm)
-   (if (stream-null? strm)
-    (stream base)
-    (stream-cons base (stream-scan (proc base (stream-car strm)) (stream-cdr strm))))))
- (cond ((not (procedure? proc)) (error 'stream-scan "non-procedural argument"))
-       ((not (stream? strm)) (error 'stream-scan "non-stream argument"))
-       (else (stream-scan base strm))))
-
-(define (stream-take n strm)
- (define stream-take
-  (stream-lambda (n strm)
-   (if (or (stream-null? strm) (zero? n))
-    stream-null
-    (stream-cons (stream-car strm) (stream-take (- n 1) (stream-cdr strm))))))
- (cond ((not (stream? strm)) (error 'stream-take "non-stream argument"))
-       ((not (integer? n)) (error 'stream-take "non-integer argument"))
-       ((negative? n) (error 'stream-take "negative argument"))
-       (else (stream-take n strm))))
-
-(define (stream-take-while pred? strm)
- (define stream-take-while
-  (stream-lambda (strm)
-   (cond ((stream-null? strm) stream-null)
-         ((pred? (stream-car strm))
-          (stream-cons (stream-car strm) (stream-take-while (stream-cdr strm))))
-         (else stream-null))))
- (cond ((not (stream? strm)) (error 'stream-take-while "non-stream argument"))
-       ((not (procedure? pred?)) (error 'stream-take-while "non-procedural argument"))
-       (else (stream-take-while strm))))
-
-(define (stream-unfold mapper pred? generator base)
- (define stream-unfold
-  (stream-lambda (base)
-   (if (pred? base)
-    (stream-cons (mapper base) (stream-unfold (generator base)))
-    stream-null)))
- (cond ((not (procedure? mapper)) (error 'stream-unfold "non-procedural mapper"))
-       ((not (procedure? pred?)) (error 'stream-unfold "non-procedural pred?"))
-       ((not (procedure? generator)) (error 'stream-unfold "non-procedural generator"))
-       (else (stream-unfold base))))
-
-(define (stream-unfolds gen seed)
- (define (len-values gen seed)
-  (call-with-values
-   (lambda () (gen seed))
-   (lambda vs (- (length vs) 1))))
- (define unfold-result-stream
-  (stream-lambda (gen seed)
-   (call-with-values
-    (lambda () (gen seed))
-    (lambda (next . results)
-     (stream-cons results (unfold-result-stream gen next))))))
- (define result-stream->output-stream
-  (stream-lambda (result-stream i)
-   (let ((result (list-ref (stream-car result-stream) (- i 1))))
-    (cond ((pair? result)
-           (stream-cons
-            (car result)
-            (result-stream->output-stream (stream-cdr result-stream) i)))
-          ((not result)
-           (result-stream->output-stream (stream-cdr result-stream) i))
-          ((null? result) stream-null)
-          (else (error 'stream-unfolds "can't happen"))))))
- (define (result-stream->output-streams result-stream)
-  (let loop ((i (len-values gen seed)) (outputs '()))
-   (if (zero? i)
-    (apply values outputs)
-    (loop (- i 1) (cons (result-stream->output-stream result-stream i) outputs)))))
- (if (not (procedure? gen))
-  (error 'stream-unfolds "non-procedural argument")
-  (result-stream->output-streams (unfold-result-stream gen seed))))
-
-(define (stream-zip . strms)
- (define stream-zip
-  (stream-lambda (strms)
-   (if (ormap stream-null? strms)
-    stream-null
-    (stream-cons (map stream-car strms) (stream-zip (map stream-cdr strms))))))
- (cond ((null? strms) (error 'stream-zip "no stream arguments"))
-       ((ormap (lambda (x) (not (stream? x))) strms)
-        (error 'stream-zip "non-stream argument"))
-       (else (stream-zip strms))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/41/primitive.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/41/primitive.rkt
deleted file mode 100644
index ec986be647..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/41/primitive.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-
-(require racket/private/stream-cons)
-(provide (all-from-out racket/private/stream-cons))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/41/streams.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/41/streams.rkt
deleted file mode 100644
index 0d9d3dd8bd..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/41/streams.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-; Library streams
-; Adapted for PLT Scheme by Jacob J. A. Koot
-; from original version of Philip L. Bewig.
-
-; Copyright (C) 2007 by Philip L. Bewig of Saint Louis, Missouri, USA.  All rights
-; reserved.  Permission is hereby granted, free of charge, to any person obtaining a copy of
-; this software and associated documentation files (the "Software"), to deal in the Software
-; without restriction, including without limitation the rights to use, copy, modify, merge,
-; publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to
-; whom the Software is furnished to do so, subject to the following conditions: The above
-; copyright notice and this permission notice shall be included in all copies or substantial
-; portions of the Software.  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-; FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-; CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-; THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#lang scheme
-
-  (provide stream-null stream-cons stream? stream-null? stream-pair? stream-car
-          stream-cdr stream-lambda define-stream list->stream port->stream stream
-          stream->list stream-append stream-concat stream-constant stream-drop
-          stream-drop-while stream-filter stream-fold stream-for-each stream-from
-          stream-iterate stream-length stream-let stream-map stream-match _
-          stream-of stream-range stream-ref stream-reverse stream-scan stream-take
-          stream-take-while stream-unfold stream-unfolds stream-zip)
-
-  (require "primitive.rkt" "derived.rkt")
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/42.rkt
deleted file mode 100644
index 214aecabdb..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-42
-#lang s-exp srfi/provider srfi/42/ec
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/comprehension-struct.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/42/comprehension-struct.scm
deleted file mode 100644
index 812edf887e..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/comprehension-struct.scm
+++ /dev/null
@@ -1,10 +0,0 @@
-;;;
-;;; COMPREHENSIONS
-;;;
-
-(module comprehension-struct mzscheme
-  (provide comprehension comprehension? comprehension-loop make-comprehension
-           comprehension-payload)
-  
-  (define-struct comprehension
-    (name loop payload)))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/comprehensions.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/42/comprehensions.scm
deleted file mode 100644
index 0d870cf575..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/comprehensions.scm
+++ /dev/null
@@ -1,404 +0,0 @@
-;;;
-;;; COMPREHENSIONS
-;;;
-
-(module comprehensions mzscheme
-  (provide (all-defined))
-  
-  (require "generators.scm")
-  (require-for-syntax "generators.scm")
-  (require-for-syntax "expansion.scm")
-  (require-for-template mzscheme)
-  
-  ; This is the model comprehension
-  
-  #;(define-syntax (list-ec stx)
-      (syntax-case stx ()
-        [(_ body)
-         #'(list body)]
-        [(_ clause ... body)
-         (begin
-           (check-all-clauses-are-generators-or-filters #'(clause ...) 'list-ec)
-           (when (and (null? (syntax->list #'(clause (... ...))))
-                      (generator-clause? #'body))
-             (raise-syntax-error
-              'list-ec 
-              (string-append "Generator used in body position. "
-                             "Expected (list <generator-or-filter> ... <expr>), got: ")
-              #'body))
-           #`(let ([result '()])
-               #,((expand-clauses #'(clause ...))
-                  #'(set! result (cons body result)))
-               (reverse result)))]
-        [_
-         (raise-syntax-error
-          'name-ec
-          "expected (list-ec <generator-or-filter> ... <expr>), got: "
-          st)]))
-  
-  (define-syntax (define-comprehension stx)
-    (syntax-case stx ()
-      [(_ name-ec inserter body expansion)
-       #'(define-syntax (name-ec st)
-           (syntax-case st ()
-             [(_ clause (... ...) body)
-              (begin
-                (check-all-clauses-are-generators-or-filters #'(clause (... ...)) 'name-ec)
-                (when (and (null? (syntax->list #'(clause (... ...))))
-                           (generator-clause? #'body))
-                  (raise-syntax-error
-                   'name-ec (format 
-                             (string-append 
-                              "Generator used in body position. "
-                              "Expected (~a <generator-or-filter> ... <expr>), got: ")
-                             'name-ec)
-                   #'body))
-                (let ([inserter (expand-clauses #'(clause (... ...)))])
-                  expansion))]
-             [_
-              (raise-syntax-error
-               'name-ec
-               (format "expected (~a <generator-or-filter> ... <expr>), got: " 'name-ec)
-               st)]))]
-      [else
-       (raise-syntax-error
-        'define-comprehension
-        "expected (define-comprehension <name> <inserter> <body> <expansion>) "
-        stx)]))
-  
-  
-  (define-comprehension list-ec 
-    insert-payload-in-loop body
-    #`(let ([result '()])
-        #,(insert-payload-in-loop 
-           #'(set! result (cons body result)))
-        (reverse result)))
-  
-  (define-comprehension do-ec
-    insert-payload-in-loop body
-    (insert-payload-in-loop 
-     #'body))
-  
-  (define-syntax (define-derived-comprehension stx)
-    (syntax-case stx ()
-      [(_ name-ec (literal ...) (pattern clauses-to-check template) ...)
-       #'(define-syntax (name-ec st)
-           (define (raise-error)
-             (raise-syntax-error
-              'name-ec
-              (format "expected (~a <generator-or-filter> ... <expr>), got: " 'name-ec)
-              st))
-           (syntax-case st ()
-             [(name clause (... ...) body)
-              (begin
-                (syntax-case #'(name clause (... ...) body) (literal ...)
-                  [pattern 
-                   (begin
-                     (check-all-clauses-are-generators-or-filters #'clauses-to-check 'name-ec)
-                     #'template)]
-                  ...
-                  [_else (raise-error)]))]
-             [_ (raise-error)]))]
-      [else
-       (raise-syntax-error
-        'define-derived-comprehension
-        "expected (define-derived-comprehension name-ec (literal ...) (pattern template) ...), got: "
-        stx)]))
-  
-  (define-derived-comprehension append-ec ()
-    ((append-ec  etc ... body)
-     (etc ...)
-     (apply append (list-ec etc ... body))))
-  
-  (define-derived-comprehension string-ec ()
-    ((string-ec etc ... body)
-     (etc ...)
-     (list->string (list-ec etc ... body)) ))
-  
-  (define-derived-comprehension string-append-ec ()
-    ((string-append-ec etc ... body)
-     (etc ...)
-     (apply string-append (list-ec etc ... body)) ))
-  
-  (define-derived-comprehension vector-ec ()
-    ((vector-ec etc ... body)
-     (etc ...)
-     (list->vector (list-ec etc ... body)) ))
-  
-  
-  (define-derived-comprehension vector-of-length-ec (nested)
-    ((vector-of-length-ec k (nested q1 ...) q etc1 etc ... body)
-     (q1 ... q etc ... body)
-     (vector-of-length-ec k (nested q1 ... q) etc1 etc ... body) )
-    ((vector-of-length-ec k q1 q2             etc1 etc ... body)
-     (q1 q2 etc1 etc ... body)
-     (vector-of-length-ec k (nested q1 q2)    etc1 etc ... body) )
-    ((vector-of-length-ec k body)
-     ()
-     (vector-of-length-ec k (nested) body) )
-    ((vector-of-length-ec k qualifier body)
-     (qualifier)
-     (let ((len k))
-       (let ((vec (make-vector len))
-             (i 0) )
-         (do-ec qualifier
-                (if (< i len)
-                    (begin (vector-set! vec i body)
-                           (set! i (+ i 1)) )
-                    (error "vector is too short for the comprehension") ))
-         (if (= i len)
-             vec
-             (error "vector is too long for the comprehension") )))))
-  
-  
-  (define-derived-comprehension fold3-ec (nested)
-    ((fold3-ec x0 (nested q1 ...) q etc ... expr f1 f2)
-     (q1 ... q)
-     (fold3-ec x0 (nested q1 ... q) etc ... expr f1 f2) )
-    ((fold3-ec x0 q1 q2 etc ... expr f1 f2)
-     (q1 q2 etc ...)
-     (fold3-ec x0 (nested q1 q2) etc ... expr f1 f2) )
-    ((fold3-ec x0 expression f1 f2)
-     ()
-     (fold3-ec x0 (nested) expression f1 f2) )
-    
-    ((fold3-ec x0 qualifier expression f1 f2)
-     (qualifier)
-     (let ((result #f) (empty #t))
-       (do-ec qualifier
-              (let ((value expression)) ; don't duplicate
-                (if empty
-                    (begin (set! result (f1 value))
-                           (set! empty #f) )
-                    (set! result (f2 value result)) )))
-       (if empty x0 result) )))
-  
-  (define-derived-comprehension fold-ec (nested)
-    ((fold-ec x0 (nested q1 ...) q  etc1 etc ... body f2)
-     (q q1 ... etc1 etc2 etc ...)
-     (fold-ec x0 (nested q1 ... q)  etc1 etc ... body f2) )
-    ((fold-ec x0 q1 q2 etc ... body f2)
-     (q1 q2 etc ...)
-     (fold-ec x0 (nested q1 q2) etc ... body f2) )
-    ((fold-ec x0 body f2)
-     ()
-     (fold-ec x0 (nested) body f2) )
-    ((fold-ec x0 qualifier body f2)
-     (qualifier)
-     (let ((result x0))
-       (do-ec qualifier (set! result (f2 body result)))
-       result )))
-  
-  (define-derived-comprehension sum-ec ()
-    ((sum-ec etc ... body)
-     (etc ...)
-     (fold-ec (+) etc ... body +) ))
-  
-  (define-derived-comprehension product-ec ()
-    ((product-ec etc ... body)
-     (etc ...)
-     (fold-ec (*) etc ... body *) ))
-  
-  
-  (define-syntax (min-ec2 stx)
-    (define (check clauses body)
-      (check-all-clauses-are-generators-or-filters clauses 'min-ec)
-      (when (and (null? (syntax->list clauses))
-                 (generator-clause? body))
-        (raise-syntax-error
-         'min-ec (string-append 
-                  "Generator used in body position. "
-                  "Expected (min-ec <generator-or-filter> ... <expr>), got: ")
-         body)))
-      
-    (syntax-case stx (on-new-min)
-      [(_ clause ... (on-new-min on-min-expr ...) body)
-       (begin
-         (check #'(clause ...) #'body)
-         (let ([insert-body (expand-clauses #'(clause ...))])
-           #`(let ([minimum +inf.0])
-               #,(insert-body 
-                  #'(let ([x body])
-                      (when (< x minimum)
-                        (set! minimum x)
-                        on-min-expr ...
-                        x)))
-               minimum)))]
-      [(_ clause ... body)
-       (syntax/loc stx (min-ec clause ... (on-new-min (void)) body))]
-      [_
-       (raise-syntax-error
-        'min-ec
-        (format "expected (~a <generator-or-filter> ... <expr>), got: " 'name-ec)
-        stx)]))
-  
-  #;(define-derived-comprehension min-ec ()
-      ((min-ec etc ... body)
-       (etc ...)
-       (fold3-ec (min) etc ... body min min)))
-  
-  (define-derived-comprehension min-ec (on-new-min)
-    ((min-ec etc ... (on-new-min on-expr ...) body)
-     (etc ...)
-     (fold3-ec (min) etc ... body min (lambda (new old)
-                                        (if (< new old)
-                                            (begin
-                                              on-expr ...
-                                              new)
-                                            old))))
-    ((min-ec etc ... body)
-     (etc ...)
-     (fold3-ec (min) etc ... body min min)))
-  
-  (define-syntax (max-ec stx)
-    (define (check clauses body)
-      (check-all-clauses-are-generators-or-filters clauses 'max-ec)
-      (when (and (null? (syntax->list clauses))
-                 (generator-clause? body))
-        (raise-syntax-error
-         'max-ec (string-append 
-                  "Generator used in body position. "
-                  "Expected (min-ec <generator-or-filter> ... <expr>), got: ")
-         body)))
-      
-    (syntax-case stx (on-new-max)
-      [(_ clause ... (on-new-max on-max-expr ...) body)
-       (begin
-         (check #'(clause ...) #'body)
-         (let ([insert-body (expand-clauses #'(clause ...))])
-           #`(let ([maximum -inf.0])
-               #,(insert-body 
-                  #'(let ([x body])
-                      (when (> x maximum)
-                        (set! maximum x)
-                        on-max-expr ...
-                        x)))
-               maximum)))]
-      [(_ clause ... body)
-       (syntax/loc stx (max-ec clause ... (on-new-max (void)) body))]
-      [_
-       (raise-syntax-error
-        'max-ec
-        (format "expected (~a <generator-or-filter> ... <expr>), got: " 'name-ec)
-        stx)]))
-  
-  
-  #;(define-derived-comprehension max-ec ()
-    ((max-ec etc ... body)
-     (etc ...)
-     (fold3-ec (max) etc ... body max max) ))
-  
-  (define-derived-comprehension last-ec (nested)
-    ((last-ec default (nested q1 ...) q etc ... body)
-     (q1 ... q etc ...)
-     (last-ec default (nested q1 ... q) etc ... body) )
-    ((last-ec default q1 q2             etc ... body)
-     (q1 q2 etc ...)
-     (last-ec default (nested q1 q2)    etc ... body) )
-    ((last-ec default body)
-     ()
-     (last-ec default (nested) body) )
-    
-    ((last-ec default qualifier body)
-     (qualifier)
-     (let ((result default))
-       (do-ec qualifier (set! result body))
-       result )))
-  
-  
-  (define-derived-comprehension first-ec (nested)
-    ((first-ec default (nested q1 ...) q etc ... body)
-     (q1 ... q etc ...)
-     (first-ec default (nested q1 ... q) etc ... body) )
-    ((first-ec default q1 q2             etc ... body)
-     (q1 q2 etc ...)
-     (first-ec default (nested q1 q2)    etc ... body) )
-    ((first-ec default body)
-     ()
-     (first-ec default (nested) body) )
-    
-    ((first-ec default qualifier body)
-     (qualifier)
-     (let ((result default) (stop #f))
-       (ec-guarded-do-ec 
-        stop 
-        (nested qualifier)
-        (begin (set! result body)
-               (set! stop #t) ))
-       result )))
-  
-  ; (ec-guarded-do-ec stop (nested q ...) cmd)
-  ;   constructs (do-ec q ... cmd) where the generators gen in q ... are
-  ;   replaced by (:until gen stop).
-  
-  (define-derived-comprehension ec-guarded-do-ec (nested if not and or begin)
-    ((ec-guarded-do-ec stop (nested (nested q1 ...) q2 ...) cmd)
-     (q1 ... q2 ...)
-     (ec-guarded-do-ec stop (nested q1 ... q2 ...) cmd) )
-    
-    ((ec-guarded-do-ec stop (nested (if test) q ...) cmd)
-     (q ...)
-     (if test (ec-guarded-do-ec stop (nested q ...) cmd)) )
-    
-    ((ec-guarded-do-ec stop (nested (not test) q ...) cmd)
-     (q ...)
-     (if (not test) (ec-guarded-do-ec stop (nested q ...) cmd)) )
-    
-    ((ec-guarded-do-ec stop (nested (and test ...) q ...) cmd)
-     (q ...)
-     (if (and test ...) (ec-guarded-do-ec stop (nested q ...) cmd)) )
-    
-    ((ec-guarded-do-ec stop (nested (or test ...) q ...) cmd)
-     (q ...)
-     (if (or test ...) (ec-guarded-do-ec stop (nested q ...) cmd)) )
-    
-    ((ec-guarded-do-ec stop (nested (begin etc ...) q ...) cmd)
-     (q ...)
-     (begin etc ... (ec-guarded-do-ec stop (nested q ...) cmd)) )
-    
-    ((ec-guarded-do-ec stop (nested gen q ...) cmd)
-     (q ...)
-     (do-ec 
-      (:until gen stop) 
-      (ec-guarded-do-ec stop (nested q ...) cmd) ))
-    
-    ((ec-guarded-do-ec stop (nested) cmd)
-     ()
-     (do-ec cmd) ))
-  
-  ; ==========================================================================
-  ; The early-stopping comprehensions any?-ec every?-ec
-  ; ==========================================================================
-  
-  (define-derived-comprehension any?-ec (nested)
-    ((any?-ec (nested q1 ...) q etc ... body)
-     (q etc ...)
-     (any?-ec (nested q1 ... q) etc ... body) )
-    ((any?-ec q1 q2             etc ... body)
-     (q1 q2 etc ...)
-     (any?-ec (nested q1 q2)    etc ... body) )
-    ((any?-ec expression)
-     ()
-     (any?-ec (nested) expression) )
-    
-    ((any?-ec qualifier expression)
-     (qualifier)
-     (first-ec #f qualifier (if expression) #t) ))
-  
-  
-  (define-derived-comprehension every?-ec (nested)
-    ((every?-ec (nested q1 ...) q etc ... body)
-     (q1 ... q etc ...)
-     (every?-ec (nested q1 ... q) etc ... body) )
-    ((every?-ec q1 q2             etc ... body)
-     (q1 q2 etc ...)
-     (every?-ec (nested q1 q2)    etc ... body) )
-    ((every?-ec expression)
-     ()
-     (every?-ec (nested) expression) )
-    
-    ((every?-ec qualifier expression)
-     (qualifier)
-     (first-ec #t qualifier (if (not expression)) #f) ))
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/dispatching.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/42/dispatching.scm
deleted file mode 100644
index d73348a1c9..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/dispatching.scm
+++ /dev/null
@@ -1,174 +0,0 @@
-;;;
-;;; DISPATCHING
-;;;
-
-(module dispatching mzscheme
-  (provide (all-defined))
-  
-  (require-for-syntax "expansion.scm" "generators.scm")
-  (require "expansion.scm" "generators.scm")
-  
-  (define-generator (:dispatched form-stx)
-    (syntax-case form-stx (index)
-      [(_ var (index i) dispatch expr1 expr2 ...)
-       #'(:parallel (:integers i)
-                    (:dispatched var dispatch expr1 expr2 ...))]
-      [(_ var dispatch expr1 expr2 ...)
-       #'(:do (let ([d dispatch]
-                    [args (list expr1 expr2 ...)]
-                    [g #f]
-                    [empty (list #f)])
-                (set! g (d args))
-                (if (not (procedure? g))
-                    (error "unrecognized arguments in dispatching"
-                           args (d '()))))
-              ((var (g empty)))
-              (not (eq? var empty))
-              (let ())
-              #t
-              ((g empty)))]))
-  
-  ; Despite the name, this isn't a generator.
-  ; It's syntax used to make a first-order generator from generator syntax.
-  ; TODO: insert ec-simplify
-  (define-syntax :generator-proc
-    (lambda (form-stx)
-      (syntax-case form-stx (:do let) 
-        [(_ (gen expr1 expr2 ...))
-         (with-syntax ([(var) (generate-temporaries #'(empty))])
-           (let ([loop (generator->loop #'(gen var expr1 expr2 ...))])
-             (with-syntax
-                 ([(obs (oc ...) ((lv li) ...)
-                        ne1? (((i ...) v) ...) (ic ...) 
-                        ne2? (ls ...) )
-                   (loop-stx loop)])
-               #'(let-values obs
-                   oc ...
-                   (let ((lv li) ... (ne2 #t))
-                     (let-values (((i) #f) ... ...) ; v not yet valid
-                       (lambda (empty)
-                         (if (and ne1? ne2)
-                             (begin 
-                               (set!-values (i ...) v) ...
-                               ic ...
-                               (let ((value var))
-                                 (if ne2?
-                                     (begin (set! lv ls) ...)
-                                     (set! ne2 #f) )
-                                 value ))
-                             empty ))))))))])))
-  
-  (define (dispatch-union d1 d2)
-    (lambda (args)
-      (let ((g1 (d1 args)) (g2 (d2 args)))
-        (if g1
-            (if g2 
-                (if (null? args)
-                    (append (if (list? g1) g1 (list g1)) 
-                            (if (list? g2) g2 (list g2)) )
-                    (error "dispatching conflict" args (d1 '()) (d2 '())) )
-                g1 )
-            (if g2 g2 #f) ))))
-  
-  (define (make-initial-:-dispatch)
-    (lambda (args)
-      (case (length args)
-        ((0) 'SRFI42)
-        ((1) (let ((a1 (car args)))
-               (cond
-                 ((list? a1)
-                  (:generator-proc (:list a1)) )
-                 ((string? a1)
-                  (:generator-proc (:string a1)) )
-                 ((vector? a1)
-                  (:generator-proc (:vector a1)) )
-                 ((and (integer? a1) (exact? a1))
-                  (:generator-proc (:range a1)) )
-                 ((real? a1)
-                  (:generator-proc (:real-range a1)) )
-                 ((input-port? a1)
-                  (:generator-proc (:port a1)) )
-                 (else
-                  #f ))))
-        ((2) (let ((a1 (car args)) (a2 (cadr args)))
-               (cond
-                 ((and (list? a1) (list? a2))
-                  (:generator-proc (:list a1 a2)) )
-                 ((and (string? a1) (string? a1))
-                  (:generator-proc (:string a1 a2)) )
-                 ((and (vector? a1) (vector? a2))
-                  (:generator-proc (:vector a1 a2)) )
-                 ((and (integer? a1) (exact? a1) (integer? a2) (exact? a2))
-                  (:generator-proc (:range a1 a2)) )
-                 ((and (real? a1) (real? a2))
-                  (:generator-proc (:real-range a1 a2)) )
-                 ((and (char? a1) (char? a2))
-                  (:generator-proc (:char-range a1 a2)) )
-                 ((and (input-port? a1) (procedure? a2))
-                  (:generator-proc (:port a1 a2)) )
-                 (else
-                  #f ))))
-        ((3) (let ((a1 (car args)) (a2 (cadr args)) (a3 (caddr args)))
-               (cond
-                 ((and (list? a1) (list? a2) (list? a3))
-                  (:generator-proc (:list a1 a2 a3)) )
-                 ((and (string? a1) (string? a1) (string? a3))
-                  (:generator-proc (:string a1 a2 a3)) )
-                 ((and (vector? a1) (vector? a2) (vector? a3))
-                  (:generator-proc (:vector a1 a2 a3)) )
-                 ((and (integer? a1) (exact? a1) 
-                       (integer? a2) (exact? a2)
-                       (integer? a3) (exact? a3))
-                  (:generator-proc (:range a1 a2 a3)) )
-                 ((and (real? a1) (real? a2) (real? a3))
-                  (:generator-proc (:real-range a1 a2 a3)) )
-                 (else
-                  #f ))))
-        (else
-         (letrec ((every? 
-                   (lambda (pred args)
-                     (if (null? args)
-                         #t
-                         (and (pred (car args))
-                              (every? pred (cdr args)) )))))
-           (cond
-             ((every? list? args)
-              (:generator-proc (:list (apply append args))) )
-             ((every? string? args)
-              (:generator-proc (:string (apply string-append args))) )
-             ((every? vector? args)
-              (:generator-proc (:list (apply append (map vector->list args)))) )
-             (else
-              #f )))))))
-  
-  (define :-dispatch
-    (make-initial-:-dispatch) )
-  
-  (define (:-dispatch-ref)
-    :-dispatch )
-  
-  (define (:-dispatch-set! dispatch)
-    (if (not (procedure? dispatch))
-        (error "not a procedure" dispatch) )
-    (set! :-dispatch dispatch) )
-  
-  (define-generator (: form-stx)
-    (define (raise-error culprit)
-      (raise-syntax-error
-       '|: |
-       "expected either (: <var> <expr>) or (: <var> (index <var>) <expr>), got:"
-       form-stx culprit))
-    (syntax-case form-stx (index)
-      [(_ var (index i) arg1 arg ...)
-       (begin
-         (unless (identifier? #'var) (raise-error #'var))
-         (unless (identifier? #'i) (raise-error #'i))
-         (syntax/loc form-stx
-           (:dispatched var (index i) :-dispatch arg1 arg ...)))]
-      [(_ var arg1 arg ...)
-       (unless (identifier? #'var) (raise-error #'var))
-       (syntax/loc form-stx
-         (:dispatched var :-dispatch arg1 arg ...))]
-      [_ (raise-error form-stx)]))
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/ec-core.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/42/ec-core.scm
deleted file mode 100644
index 703bc5bf44..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/ec-core.scm
+++ /dev/null
@@ -1,9 +0,0 @@
-(module ec-core mzscheme
-  (require "expansion.scm"
-           "generators.scm"
-           "comprehensions.scm"
-           "dispatching.scm")
-  (provide (all-from "expansion.scm")
-           (all-from "generators.scm")
-           (all-from "comprehensions.scm")
-           (all-from "dispatching.scm")))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/ec.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/42/ec.rkt
deleted file mode 100644
index cf940a1389..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/ec.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-(module ec mzscheme
-  (require "ec-core.scm" "extra-generators.scm")
-  (provide 
-   ;; generators.scm 
-   define-generator
-   define-indexed-generator-with-append
-   define-indexed-generator-without-append
-   ;; (the generators present in the reference implementation)
-   :list :integers :string :bytes :vector
-   :range :real-range :char-range
-   :port
-   :let :parallel :until :do :while
-
-   (all-from "extra-generators.scm")
-   
-   ;; comprehensions.scm
-   
-   define-comprehension
-   define-derived-comprehension
-   
-   list-ec
-   do-ec
-   append-ec
-   string-ec
-   string-append-ec
-   vector-ec
-   vector-of-length-ec
-   fold3-ec
-   fold-ec
-   sum-ec
-   product-ec
-   min-ec
-   max-ec
-   last-ec
-   first-ec
-   any?-ec
-   every?-ec
-
-   ;; dispatching.scm
-   :dispatched
-   :generator-proc
-   dispatch-union
-   make-initial-:-dispatch
-   :-dispatch-ref 
-   :-dispatch-set!
-   :
-   
-   ;; expansion.scm
-   add-index
-   )
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/expansion.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/42/expansion.scm
deleted file mode 100644
index 076ccbd1f8..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/expansion.scm
+++ /dev/null
@@ -1,221 +0,0 @@
-;;;
-;;; EXPANSION
-;;;
-
-(module expansion mzscheme
-  (provide (all-from "generator-struct.scm")
-           (all-from "generator-definitions.scm")
-           (all-from "loops.scm"))
-  (provide generator->loop
-           check-all-clauses-are-generators-or-filters
-           expand-clauses
-           generator-clause?
-           filter-clause?
-           add-index)
-  
-  (require "generator-struct.scm"
-           "loops.scm"
-           "generator-definitions.scm")
-  (require-for-template mzscheme)
-  
-  (define current-introducer (make-parameter #f))
-  
-  (define (generator-clause? clause-stx)
-    (syntax-case clause-stx ()
-      [(name . more)
-       (and (identifier? #'name)
-            (generator? (syntax-local-value #'name (lambda () #f))))]
-      [_ #f]))
-  
-  (require (lib "stx.ss" "syntax"))
-  (require (prefix base: scheme)
-           (for-meta 1 (prefix base: scheme)))
-  
-  (define (if-filter? stx)
-      (syntax-case stx ()
-        [(head expr)
-         (and (identifier? #'head)
-              (eq? 'if (syntax-e #'head)))]
-        [else #f]))
-  
-  (require (prefix new- scheme))
-  
-  #;(define (if-filter? stx)
-    (syntax-case* stx (if new-if) module-or-top-identifier=?
-      [(if expr) #t]
-      [(new-if expr) #t]
-      [_ #f]))
-  
-  (define (filter-clause? clause-stx)
-    (or (if-filter? clause-stx)
-        (syntax-case* clause-stx (if base:if not and or) module-or-top-identifier=?
-          [(not . more) #t]
-          [(and . more) #t]
-          [(or  . more) #t]
-          [_            #f])))
-      
-  (define (begin-clause? clause-stx)
-    (syntax-case clause-stx (begin)
-      [(begin  . more) #t]
-      [_               #f]))
-  
-  (define (nested-clause? clause-stx)
-    (syntax-case clause-stx (nested)
-      [(nested  . more) #t]
-      [_                #f]))
-  
-  ; generator->loop : clause-stx -> loop
-  (define (generator->loop clause-stx)
-    (define introduce (make-syntax-introducer))
-    (define (mark s)
-      (if (current-introducer) ; this is a subexpansion
-          (introduce ((current-introducer) s))
-          (introduce (syntax-local-introduce s))))
-    (define (unmark s)
-      (if (current-introducer) ; this is a subexpansion
-          ((current-introducer) (introduce s))
-          (syntax-local-introduce (introduce s))))
-    (syntax-case clause-stx ()
-      [(gen-name . more)
-       (begin
-         (unless (generator-clause? clause-stx)
-           (raise-syntax-error
-            'generator->loop 
-            "expected a generator clause, got: "
-            clause-stx ))
-         (let* ([generator (syntax-local-value #'gen-name)]
-                [marked-clause-stx (mark clause-stx)]
-                [loop (parameterize ([current-introducer introduce])
-                        ((generator-clause->loop generator) 
-                         marked-clause-stx))])
-           (cond
-             [(loop? loop)                      (make-loop (unmark (loop-stx loop)))]
-             [(generator-clause? (unmark loop)) (generator->loop (unmark loop))]
-             [else
-              (raise-syntax-error 
-               'generator-loop 
-               (apply string-append
-                      (cons "generator expander returned neither a loop structure nor "
-                            (cons "a syntax-object representing a generator clause. "
-                                  (if (syntax? loop)
-                                      (syntax-case loop ()
-                                        [(name . more) 
-                                         (identifier? #'name)
-                                         (list (string-append "\nMaybe you forgot to define "
-                                                              (symbol->string (syntax-object->datum #'name))
-                                                              " to as a generator?"))]
-                                        [_ '()])
-                                      '()))))
-               loop)])))]))
-  
-  
-  
-  ; expand-clauses : stx -> (stx -> stx)
-  ;   Input:  A syntax-object representing a list of clauses
-  ;   Output: A procedure of one argument. The input of which is
-  ;           a syntax-object representing the body (aka payload)
-  ;           of the loop. The output is a fully expanded loop.
-  ;   Note:   This is used by comprehensions such as list-ec
-  ;           to insert their payloads into the "middle" of the loop.
-  (require (lib "stx.ss" "syntax"))
-  
-  (define (expand-clauses clauses-stx)
-    (syntax-case clauses-stx () 
-      [() 
-       (lambda (body-stx) body-stx)]
-      [(clause1 clause2 ...)
-       (lambda (body-stx)
-         (cond
-           [(generator-clause? #'clause1)
-            (let ([loop1    (generator->loop #'clause1)]
-                  [loop2... (expand-clauses #'(clause2 ...))])
-              (loop->syntax #'clause1 loop1
-                            (loop2... body-stx)))]
-           [(filter-clause? #'clause1)
-            (let ([loop2... (expand-clauses #'(clause2 ...))])
-              (cond
-                [(if-filter? #'clause1)
-                 (syntax-case #'clause1 ()
-                   [(the-if expr)
-                    #`(if expr #,(loop2... body-stx))]
-                   [else (raise-syntax-error 'expand-clauses 
-                                             "internal error: <if-filter> expected" #'clause1)])] 
-                [else
-                 (syntax-case* #'clause1 (if not and or) module-or-top-identifier=?  ; due to not
-                   #;[(if expr)  
-                      #`(if expr #,(loop2... body-stx))]
-                   [(not expr)
-                    #`(if (not expr) #,(loop2... body-stx))]
-                   [(or expr ...)
-                    #`(if (or expr ...) #,(loop2... body-stx))]
-                   [(and expr ...)
-                    #`(if (and expr ...) #,(loop2... body-stx))]
-                   [_
-                    (raise-syntax-error 'expand-clauses 
-                                        "unimplemented <filter>" #'clause1)])]))]
-           [(begin-clause? #'clause1)
-            (let ([loop2... (expand-clauses #'(clause2 ...))])
-              (syntax-case #'clause1 ()
-                [(_ expr1 ...)
-                 #`(begin expr1 ... #,(loop2... body-stx))]))]
-           [(nested-clause? #'clause1)
-            (syntax-case #'clause1 (nested)
-              [(nested qualifier ...)
-               ((expand-clauses 
-                 #`(qualifier ... clause2 ...))
-                body-stx)]
-              [_
-               (error)])]
-           [else
-            (begin
-              (display clauses-stx) (newline)
-              (error 'expand-clauses "this should have been caught earlier"))]))]
-      [else
-       (error "huh")]))
-  
-  (define (check-all-clauses-are-generators-or-filters clauses-stx caller)
-    (syntax-case clauses-stx ()
-      [(clause ...)
-       (let loop ([cs (syntax->list #'(clause ...))])
-         (cond
-           [(null? cs)                   'all-ok]
-           [(generator-clause? (car cs)) (loop (cdr cs))]
-           [(filter-clause? (car cs))    (loop (cdr cs))]
-           [(begin-clause? (car cs))     (loop (cdr cs))]
-           [(nested-clause? (car cs))    (loop (cdr cs))]
-           [else (raise-syntax-error 
-                  caller "<generator> or <filter> expected, got:" (car cs))]))]))
-  
-  ; add-index : loc-stx loop-or-stx var-stx -> loop
-  ;   add a loop binding to the loop, s.t.
-  ;   var-stx now counts the number of
-  ;   elements produced
-  
-  (require-for-template mzscheme)
-  
-  (define (add-index-proc l var-stx)
-    (cond
-      [(loop? l) 
-       (with-syntax ([var var-stx])
-         (syntax-case (loop-stx l) ()
-           [(ob* oc* lb* ne1 ib* ic* ne2 ls*)
-            (make-loop #'(ob* oc* ((var 0) . lb*)
-                              ne1 ib* ic* ne2 ((add1 var) . ls*)))]))]
-      [(syntax? l)
-       (add-index-proc (generator->loop l) var-stx)]
-      [else
-       (raise-syntax-error 
-        'add-index-proc "expected either a loop structure of a generator clause as first argument, got" l)]))
-  
-  (define-syntax (add-index stx)
-    (syntax-case stx (syntax)
-      [(_ loc #'loop var-stx)
-       #'(add-index-proc (syntax/loc loc loop) var-stx)]
-      [(_ #'loop var-stx)
-       (raise-syntax-error
-        'add-index
-        "you forgot to add location info"
-        stx)]
-      [_ 
-       (raise-syntax-error 'add-index "think" stx)]))
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/extra-generators.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/42/extra-generators.scm
deleted file mode 100644
index dc20e41abb..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/extra-generators.scm
+++ /dev/null
@@ -1,376 +0,0 @@
-;;;
-;;; EXTRA GENERATORS (NOT IN SRFI-42)
-;;;
-
-(module extra-generators mzscheme
-  (provide :let-values
-	   :repeat
-	   :iterate
-	   :combinations
-	   :vector-combinations
-	   :do-until
-	   :pairs
-           :pairs-by
-	   :list-by
-	   :alist
-	   :hash-table
-	   :hash-table-keys
-	   :hash-table-values
-           indices->list
-           indices->vector
-           last-combination?
-           next-combination
-           first-combination)
-  (require "ec-core.scm")
-  (require-for-syntax "ec-core.scm")
-  
-  ;;; :let-values
-  
-  (define-generator (:let-values form-stx)
-    (syntax-case form-stx (index)
-      [(_ (var ...) (index i) expression)
-       #'(:do (let-values ([(var ...) expression] [(i) 0])) () #t (let ()) #f ())]
-      [(_ (var ...) expression)
-       #'(:do (let-values ([(var ...) expression])) () #t (let ()) #f ())]
-      [_
-       (raise-syntax-error 
-        ':let-values 
-        "expected (:let-values (<var> ...) (index i) <expr> where the index is optional, got: "
-        form-stx)]))
-  
-  ;;; :repeat   Fixed number of iterations
-  
-  ; (list-ec (:repeat 5) 1) => '(1 1 1 1 1)
-  
-  (define-generator (:repeat form-stx)
-    (syntax-case form-stx (index)
-      [(_ (index i) expr)
-       #'(:range i expr)]
-      [(_ expr)
-       #'(:range i expr)]
-      [_
-       (raise-syntax-error
-        ':repeat
-        "expected (:repeat <expr>) ot (:repeat (index i) <expr>), got: "
-        form-stx)]))
-  
-  ;;; Iteration  :iterate
-  
-  ; An iterative process can be seen as a triple
-  ; of an initial state, a transition function next-state
-  ; from state to state, and a predicate end-state? that
-  ; determines whether and terminal state has been reached.
-  
-  ; (list-ec (:iterate e 0 (lambda (x) (+ x 2)) (lambda (x) (>= x 10))) 
-  ;          e) ; => (0 2 4 6 8)
-  
-  (define-generator (:iterate stx)
-    (syntax-case stx (index)
-      [(:iterate state initial-state next-state end-state?)
-       (begin
-         (unless (identifier? #'state)
-           (raise-syntax-error 
-            ':iterate "expected variable (for the state), got: " #'state))
-         #'(:do (let ((initial initial-state) (end? end-state?) (next next-state)))
-                ((state initial))
-                (not (end? state))
-                (let ())
-                #t
-                ((next state))))]
-      [(:iterate state (index i) initial-state next-state end-state?)
-       (add-index stx #'(:iterate state initial-state next-state end-state?) #'i)]
-      [_
-       (raise-syntax-error
-        ':iterate
-        "expected (:iterate <state-var> <initial-state> <next-state> <end-state?>), got: "
-        stx)]))
-  
-  
-  ;;;; Combinations
-  ;; The problem of generating all k combinations of the n numbers
-  ;; 0,1,...,n-1 provides a nice example of the advanced :do-generator.
-  ;; The list of 3,5-combinations are
-  ;
-  ;;    (#3(0 1 2) #3(0 1 3) #3(0 1 4) #3(0 2 3) #3(0 2 4) #3(0 3 4)
-  ;;     #3(1 2 3) #3(1 2 4) #3(1 3 4)
-  ;;     #3(2 3 4))
-  ;
-  ;; The first combination is #(0 1 2) and the last combination is #3(2 3 4).
-  ;; Given helper funcions first-combination, last-combination?, and
-  ;; next-combination we can use the advanced :do-generator as follows.
-  ;
-  (define-syntax vr  (syntax-rules () [(_ v i)   (vector-ref v i)]))
-  (define-syntax vs! (syntax-rules () [(_ v i x) (vector-set! v i x)]))
-  (define-syntax incrementable? (syntax-rules () [(_ v i k n)  (< (vr v i) (+ n (- k) i))]))
-  (define-syntax last-combination? (syntax-rules () [(_ k n v) (= (vr v 0) (- n k))]))
-  
-  (define (first-combination k n)
-    (if (<= 1 k n)
-        (vector-ec (: i 0 k) i)
-        #f))
-  
-  (define (vector-copy v)
-    (vector-of-length-ec (vector-length v)
-                         (:vector x v)
-                         x))
-  
-  (define (next-combination k n v)
-    (last-ec #f ; default, when there is no next combination
-             (:let v (vector-copy v))
-             ; find the last incrementable index
-             (:let i (last-ec #f (:until (: i (- k 1) -1 -1) 
-                                         (incrementable? v i k n)) 
-                              i))
-             (if i)
-             ; increment index i and fix indices to the right of i
-             (:parallel (: j i k)
-                        (: vj (+ (vr v i) 1) n))
-             (begin (vs! v j vj))
-             ; if all indices is fixed we have a new combination
-             (if (= j (- k 1)))
-             ; return the new combination
-             v))
-  
-  ;;;; Combinations :combinations, :vector-combinations
-  ;
-  ;; In the section on the advanced :do-generator we showed that
-  ;; how to use :do to generate all k,n-combinations of the
-  ;; indices 0,1,...,n-1.
-  ;
-  ;; We can use this to define a the :combinations generator
-  ;; that generates all k combinations of elements from a
-  ;; given list l.
-  
-  (define (indices->list indices elements)
-    ; (indices->list '#(0 1 4) '#(a b c d e))  => (a b e)
-    (list-ec (:vector i indices)
-             (vector-ref elements i)))
-  
-  (define-generator (:combinations stx)
-    (syntax-case stx (index)
-      ((:combinations lc (index i) k l)
-       #'(:parallel  (:integers i) (:combinations lc k l)))
-      ((:combinations lc k l)
-       #'(:do (let ((n (length l))
-                    (v (list->vector l))))
-              ((c (first-combination k n)))
-              c
-              (let ((lc (indices->list c v))))
-              (not (last-combination? k n c))
-              ((next-combination k n c))))))
-  
-  ; The vector version is similar.
-  
-  (define (indices->vector k indices elements)
-    (vector-of-length-ec k
-                         (:vector i indices)
-                         (vector-ref elements i)))
-  
-  (define-generator (:vector-combinations stx)
-    (syntax-case stx (index)
-      ((:vector-combinations vc (index i) k v)
-       #'(:parallel (:integers i) (:vector-combinations vc k v)))
-      ((:vector-combinations vc k v)
-       #'(:do (let ((n (vector-length v))))
-              ((c (first-combination k n)))
-              c
-              (let ((vc (indices->vector k c v))))
-              (not (last-combination? k n c))
-              ((next-combination k n c))))))
-  
-  ;;; An alternative to :do, the :do-until        
-  
-  ; The simple :do is a "do-while" loop. As we saw previously
-  ; this we had to use the advanced :do-generator in order
-  ; to write :list in terms of :do, due to the last element
-  ; missing. Compare:
-  
-  ; (list-ec (:do-until ((x 0)) (> x 5) ((+ x 1))) x)
-  ;    => '(0 1 2 3 4 5 6)
-  
-  ; (list-ec (:do ((x 0)) (<= x 5) ((+ x 1))) x)
-  ;    => '(0 1 2 3 4 5)
-  
-  ; If only the termination test were done *after* and
-  ; not before the loop payload ...  This leads to the
-  ; idea of an :do-until.
-  
-  (define-generator (:do-until stx)
-    (syntax-case stx ()
-      [(:do-until lb* ne1? ls*)
-       #'(:do (let ()) lb* #t (let ()) (not ne1?) ls*)]
-      [_
-       (raise-syntax-error
-        ':do-until
-        "expected (:do-until <loop-bindings> <not-end?> <loop-steppers>), got: "
-        stx)]))
-  
-  ;;;
-  ;;; Pairs of a list
-  ;;;
-  
-  ; The normal :list generator allows one to work with the elements
-  ; of a list. In order to work with the pairs of the list, we
-  ; define :pairs that generate the pairs of the list.
-  
-  ;  (list-ec (:pairs p '(1 2 3)) p) ; => '(1 2 3) (2 3) (3))
-  
-  (define-generator (:pairs stx)
-    (syntax-case stx (index)
-      [(:pairs p (index i) l)
-       (add-index stx #'(:pairs p l) #'i)]
-      [(:pairs p l)
-       (begin 
-         (unless (identifier? #'p)
-           (raise-syntax-error 
-            ':pairs "expected identifier to bind, got: " #'p))
-         #'(:iterate p l cdr null?))]
-      [_ 
-       (raise-syntax-error
-        ':pairs
-        "expected (:pairs <var> (index <var>) <expr>), got: "
-        stx)]))
-  
-  (define-generator (:pairs-by stx)
-    (syntax-case stx (index)
-      ((:pairs-by p (index i) l)           #'(:pairs-by p (index i) l cdr))
-      ((:pairs-by p (index i) l next)      #'(:pairs-by p (index i) l next null?))
-      ((:pairs-by p (index i) l next end?) (add-index stx #'(:iterate  p l next end?) #'i))
-      
-      ((:pairs-by p l)                     #'(:pairs-by p l cdr))
-      ((:pairs-by p l next)                #'(:pairs-by p l next null?))
-      ((:pairs-by p l next end?)           #'(:iterate  p l next end?))
-      (_
-       (raise-syntax-error
-        ':pairs-by 
-        (string-append
-         "expected (:pairs-by <var> (index var) <list-expr> <next-expr> <end-expr>), where "
-         "the index is optional, and the defaults for <next-expr> and <end-expr> are cdr and null?. Got: ")
-        stx))))
-  
-  ;;;
-  ;;; A more flexible :list, the :list-by
-  ;;;
-  
-  (define-generator (:list-by stx)
-    (syntax-case stx (index)
-      ((:list-by x (index i) l)
-       #'(:list-by  x (index i) l cdr))
-      ((:list-by x (index i) l next)
-       #'(:list-by x (index i) l next null?))
-      ((:list-by x (index i) l next end?)
-       (add-index stx #'(:do  (let ()) ((t l)) (not (end? t)) 
-                              (let ((x (car t)))) #t ((next t)))
-                  #'i))
-      ((:list-by x l)
-       #'(:list-by x l cdr))
-      ((:list-by x l next)
-       #'(:list-by x l next null?))
-      ((:list-by x l next end?)
-       #'(:do (let ()) ((t l)) (not (end? t)) (let ((x (car t)))) #t ((next t))))
-      (_
-       (raise-syntax-error
-        ':list-by
-        (string-append
-         "expected (:list-by x (index <id>) <list-expr> <next-expr> <end-expr>), where "
-         "the (index <id>), <next-exp>, and <end-expr> are optional, got: ")
-        stx))))
-  
-  (define-generator (:alist stx)
-    (syntax-case stx (index)
-      [(:alist vars (index i) al-expr)
-       (add-index stx #'(:alist vars al-expr) #'i)]
-      [(:alist (key val) al-expr)
-       #'(:do (let ([al al-expr]))
-              ((al al))
-              (not (null? al))
-              (let-values ([(key val) (values (caar al) (cdar al))]))
-              #t
-              ((cdr al)))]))
-  
-  
-  (define-generator (:hash-table stx)
-    (syntax-case stx (index)
-      [(:hash-table vars (index i) ht-expr)
-       (add-index stx #'(:hash-table vars ht-expr) #'i)]
-      [(:hash-table (key-var val-var) ht-expr)
-       #'(:alist (key-var val-var) (hash-table-map ht-expr cons))]
-      [(:hash-table var ht-expr)
-       #'(:list var (hash-table-map ht-expr cons))]
-      [_
-       (raise-syntax-error 
-        ':hash-table
-        "expected (:hash-table (<key-var> <val-var>) <ht-expr>) or (:hash-table <var> <ht-expr>) "
-        stx)]))
-  
-  (define-generator (:hash-table-keys stx)
-    (syntax-case stx (index)
-      [(_ var (index i) ht-expr)
-       (add-index stx #'(:hash-table-keys vars ht-expr) #'i)]
-      [(_ var ht-expr)
-       #'(:list var (hash-table-map ht-expr (lambda (k v) k)))]
-      [_
-       (raise-syntax-error 
-        ':hash-table-keys
-        "expected (:hash-table-keys <var> (index <var>) <ht-expr>) where the index is optional "
-        stx)]))
-  
-  (define-generator (:hash-table-values stx)
-    (syntax-case stx (index)
-      [(_ var (index i) ht-expr)
-       (add-index stx #'(:hash-table-keys vars ht-expr) #'i)]
-      [(_ var ht-expr)
-       #'(:list var (hash-table-map ht-expr (lambda (k v) v)))]
-      [_
-       (raise-syntax-error 
-        ':hash-table-values
-        "expected (:hash-table-values <var> (index <var>) <ht-expr>) where the index is optional "
-        stx)]))
-  
-  #;(require-for-syntax (lib "private/match/gen-match.ss")
-                      (lib "private/match/convert-pat.ss"))
-  
-  #;(define-generator (:plt-match stx)
-    (syntax-case stx ()
-      [(_  pat expr)
-       (identifier? #'pat)
-       #'(:let pat expr)]
-      [(_ pat expr)
-       (let* ((**match-bound-vars** '())
-              (compiled-match
-               (gen-match #'the-expr
-                          #'((pat never-used))
-                          stx
-                          (lambda (sf bv)
-                            (set! **match-bound-vars** bv)
-                            #`(begin
-                                #,@(map (lambda (x)
-                                          #`(set! #,(car x) #,(cdr x)))
-                                        (reverse bv)))))))
-         #`(:do (let ((the-expr expr)
-                      (match-found? #t)
-                      #,@(map (lambda (x) #`(#,(car x) #f))
-                              (reverse **match-bound-vars**)))
-                  (with-handlers ([exn:fail? (lambda (exn) (set! match-found? #f))])
-                    #,compiled-match))
-                () match-found? (let ()) #f ()))]
-      [_
-       (raise-syntax-error 
-        ':plt-match
-        "expected (:plt-match <pattern> <expr>)"
-        stx)]))
-  
-  #;(define-generator (:match stx)
-    (syntax-case stx ()
-      [(_  pat expr)
-       (identifier? #'pat)
-       #'(:let path expr)]
-      [(_ pat expr)
-       (with-syntax ([new-pat (convert-pat #'pat)])
-         #'(:plt-match new-pat expr))]
-      [_
-       (raise-syntax-error 
-        'match
-        "expected (:match <pattern> <expr>)"
-        stx)]))
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/generator-definitions.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/42/generator-definitions.scm
deleted file mode 100644
index f2c1aad20f..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/generator-definitions.scm
+++ /dev/null
@@ -1,38 +0,0 @@
-(module generator-definitions mzscheme
-  (provide define-generator)
-  
-  (require-for-syntax "generator-struct.scm")
-  (require-for-template mzscheme)
-  
-  ; syntax 
-  ;    (define-generator name proc)
-  ;    (define-generator (name arg) body ...)
-  ;  The procedure takes a generator clause as input, and returns
-  ;  either a loop structure or a syntax-object representing
-  ;  a (simpler) generator clause.
-  (define-syntax (define-generator stx)
-    (syntax-case stx ()
-      [(_ (name arg) body ...)
-       (begin
-         (unless (identifier? #'name)
-           (raise-syntax-error 
-            'define-generator "expected (define-generator <id> <procedure>), got: " #'name))
-         (unless (identifier? #'name)
-           (raise-syntax-error 
-            'define-generator "expected (define-generator (<id> name) <body> ...), got: " #'name))
-         #'(begin
-             (define-for-syntax name (make-generator 'name (lambda (arg) body ...)))
-             (define-syntax name (make-generator 'name (lambda (arg) body ...)))))]
-      [(_ name proc)
-       (begin
-         (unless (identifier? #'name)
-           (raise-syntax-error 
-            'define-generator "expected (define-generator <id> <procedure>), got: " #'name))
-         #'(begin
-             (define-for-syntax name (make-generator 'name proc))
-             (define-syntax name (make-generator 'name proc))))]
-      [_else
-       (raise-syntax-error 
-        'define-generator
-        "expected either (define-generator <id> <proc>) or (define-generator (<id1> <id2>) <body> ... , got: "
-        stx)])))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/generator-struct.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/42/generator-struct.scm
deleted file mode 100644
index af0dd942e3..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/generator-struct.scm
+++ /dev/null
@@ -1,17 +0,0 @@
-;;;
-;;; GENERATORS
-;;;
-
-
-(module generator-struct mzscheme
-  (provide generator     
-           generator?
-           generator-clause->loop     
-           make-generator)
-  
-  ; A GENERATOR has a name, and function form->loop,
-  ; that takes a syntax-object representing an instance
-  ; of a generator clause as input. For example 
-  ; #'(:list x (list 1 2 3)). The function form->loop 
-  ; returns a loop structure.
-  (define-struct generator (name clause->loop)))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/generators.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/42/generators.scm
deleted file mode 100644
index c101454a22..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/generators.scm
+++ /dev/null
@@ -1,458 +0,0 @@
-;;;
-;;; NORMAL GENERATORS
-;;;
-
-
-(module generators mzscheme
-  (provide (all-defined))
-  (require "expansion.scm")
-  (require-for-syntax "expansion.scm")
-  (require-for-template mzscheme)
-  
-  
-  (define-generator :list
-    (lambda (form-stx)
-      (syntax-case form-stx (index)
-        [(_ var (index i) expr ...)
-         (add-index form-stx #'(_ var expr ...) #'i)]
-        [(_ var expr1 expr2 expr ...)
-         ; TODO IMPROVE: something better than append ?
-         #'(_ var (append expr1 expr2 expr ...))]
-        [(_ var expr)
-         (begin
-           (unless (identifier? #'var)
-             (raise-syntax-error ':list "expected identifier, got " #'var))
-           ; (ob* oc* lb* ne1 ib* ic* ne2 ls*)
-           (make-loop  #'(() () ((xs expr)) (not (null? xs))
-                             (((var) (car xs))) () #t ((cdr xs)))))]
-        [_ (raise-syntax-error 
-            ':list 
-            "Expected either (:list <expr> ...) or (:list (index <var>) expr ...), got: "
-            form-stx)])))
-  
-  (define-generator (:integers form-stx)
-    (syntax-case form-stx (index)
-      [(_ var (index i))
-       ; (ob* oc* lb* ne1 ib* ic* ne2 ls*)
-       (make-loop  #'(() () ((var 0)) #t (((i) var)) () #t ((add1 var))))]
-      [(_ var)
-       ; (ob* oc* lb* ne1 ib* ic* ne2 ls*)
-       (make-loop  #'(() () ((var 0)) #t () () #t ((add1 var))))]
-      [_
-       (raise-syntax-error
-        ':integers
-        "expected (:integers <var> (index <var>)) where (index <var>) is optional, got: "
-        form-stx)]))
-  
-  
-  (define (ec-:vector-filter vecs)
-    ; filter zero-length vectors
-    (if (null? vecs)
-        '()
-        (if (zero? (vector-length (car vecs)))
-            (ec-:vector-filter (cdr vecs))
-            (cons (car vecs) (ec-:vector-filter (cdr vecs))) )))
-  
-  ; The expansion below uses name-append to turn
-  ;       (:name var expr1 expr2 ...)
-  ; into
-  ;       (:name var (name-append expr1 expr2 ...))
-  
-  ; If your indexed sequence doesn't have an append operation
-  ; (or it is too expensive to use) then use
-  ; define-indexed-generator instead.
-  
-  (define-syntax (define-indexed-generator-with-append stx)
-    (syntax-case stx ()
-      [(__ :name (name? name-ref name-length name-append name-type))
-       #'(define-generator (:name form-stx)
-           (syntax-case form-stx (index)
-             [(_ var (index i) expr (... ...))
-              (add-index form-stx #'(:name var expr (... ...)) #'i)]
-             [(_ var expr)
-              (begin
-                (unless (identifier? #'var)
-                  (raise-syntax-error
-                   ':name
-                   "expected a variable to bind"
-                   #'var))
-                #'(:do (let ((seq expr) (len 0))
-                         (set! len (name-length seq)))
-                       ((i 0))
-                       (< i len)
-                       (let ((var (name-ref seq i))))
-                       #t
-                       ((+ i 1)) ))]
-             [(_ var expr (... ...))
-              #`(:name var (let ([es (list expr (... ...))])
-                             (unless (andmap name? es)
-                               (error
-                                ':name 
-                                (format "expected ~as, but got: ~~a " name-type)
-                                es))
-                             ; TODO: use raise-syntax-error above (how?)
-                             (apply name-append es)))]
-             [_
-              (raise-syntax-error
-               ':name
-               (format "expected (~a <var> (index i) <expr> <expr> ...) where (index i) is optional, got: "
-                       ':name)
-               form-stx)]))]))
-  
-  (define-indexed-generator-with-append :string 
-    (string? string-ref string-length string-append "string"))
-  
-  (define-indexed-generator-with-append :bytes 
-    (bytes? bytes-ref bytes-length bytes-append "byte-string"))
-  
-  ; The expansion below basically turns 
-  ;       (:name var expr1 expr2 ...)
-  ; into (nested (: xs (list expr1 expr2 ...)
-  ;              (:name var xs))
-  ; except we need to write it as a do-loop.
-  
-  (define-syntax (define-indexed-generator-without-append stx)
-    (syntax-case stx ()
-      [(__ :name (name? name-ref name-length name-type))
-       #'(define-generator (:name form-stx)
-           (syntax-case form-stx (index)
-             [(_ var (index i) expr (... ...))
-              (add-index form-stx #'(:name var expr (... ...)) #'i)]
-             [(_ var expr)
-              (begin
-                (unless (identifier? #'var)
-                  (raise-syntax-error
-                   ':name
-                   "expected a variable to bind"
-                   #'var))
-                #`(:do (let ((seq expr) (len 0))
-                         (set! len (name-length seq)))
-                       ((i 0))
-                       (< i len)
-                       (let ((var #,(syntax/loc form-stx (name-ref seq i)))))
-                       #t
-                       ((+ i 1)) ))]
-             [(_ var expr (... ...))
-              #'(:do (let ([es ; filter zero-length sequences away
-                            (let lp ([es (list expr (... ...))])
-                              (cond
-                                [(null? es)                     '()]
-                                [(zero? (name-length (car es))) (lp (cdr es))]
-                                [else (cons (car es) (lp (cdr es)))]))]
-                           [current        #f]
-                           [current-length 0]))
-                     ((k 0))
-                     (if (< k current-length)
-                         #t
-                         (if (null? es)
-                             #f
-                             (begin (set! current (car es))
-                                    (set! es (cdr es))
-                                    (set! current-length (name-length current))
-                                    (set! k 0)
-                                    #t)))
-                     (let ((var (name-ref current k))))
-                     #t
-                     ((+ k 1)))]
-             [_
-              (raise-syntax-error
-               ':name
-               (format "expected (~a <var> (index i) <expr> <expr> ...) where (index i) is optional, got: "
-                       ':name)
-               form-stx)]))]))
-  
-  (define-indexed-generator-without-append :vector
-    (vector? vector-ref vector-length  "vector"))
-  
-  
-  (define-generator (:range form-stx)
-    (syntax-case form-stx (index)
-      ; handle index variable and add optional args
-      ((:range var (index i) arg1 arg ...)
-       (add-index form-stx #'(:range var arg1 arg ...) #'i))
-      ((:range var arg1)
-       #'(:range var 0 arg1 1) )
-      ((:range var arg1 arg2)
-       #'(:range var arg1 arg2 1) )
-      
-      ; special cases (partially evaluated by hand from general case)
-      ((:range var 0 arg2 1)
-       #'(:do (let ((b arg2))
-                (if (not (and (integer? b) (exact? b)))
-                    (error 
-                     "arguments of :range are not exact integer "
-                     "(use :real-range?)" 0 b 1 )))
-              ((var 0))
-              (< var b)
-              (let ())
-              #t
-              ((+ var 1)) ))
-      
-      ((:range var 0 arg2 -1)
-       #'(:do (let ((b arg2))
-                (if (not (and (integer? b) (exact? b)))
-                    (error 
-                     "arguments of :range are not exact integer "
-                     "(use :real-range?)" 0 b 1 )))
-              ((var 0))
-              (> var b)
-              (let ())
-              #t
-              ((- var 1)) ))
-      
-      ((:range var arg1 arg2 1)
-       #'(:do (let ((a arg1) (b arg2))
-                (if (not (and (integer? a) (exact? a)
-                              (integer? b) (exact? b) ))
-                    (error 
-                     "arguments of :range are not exact integer "
-                     "(use :real-range?)" a b 1 )) )
-              ((var a))
-              (< var b)
-              (let ())
-              #t
-              ((+ var 1)) ))
-      
-      ((:range var arg1 arg2 -1)
-       #'(:do (let ((a arg1) (b arg2) (s -1) (stop 0))
-                (if (not (and (integer? a) (exact? a)
-                              (integer? b) (exact? b) ))
-                    (error 
-                     "arguments of :range are not exact integer "
-                     "(use :real-range?)" a b -1 )) )
-              ((var a))
-              (> var b)
-              (let ())
-              #t
-              ((- var 1)) ))
-      
-      ; the general case
-      
-      ((:range var arg1 arg2 arg3)
-       #'(:do (let ((a arg1) (b arg2) (s arg3) (stop 0))
-                (if (not (and (integer? a) (exact? a)
-                              (integer? b) (exact? b)
-                              (integer? s) (exact? s) ))
-                    (error 
-                     "arguments of :range are not exact integer "
-                     "(use :real-range?)" a b s ))
-                (if (zero? s)
-                    (error "step size must not be zero in :range") )
-                (set! stop (+ a (* (max 0 (ceiling (/ (- b a) s))) s))) )
-              ((var a))
-              (not (= var stop))
-              (let ())
-              #t
-              ((+ var s)) ))))
-  
-  
-  (define-generator (:real-range form-stx)
-    (syntax-case form-stx (index)
-      ; add optional args and index variable
-      ((:real-range var arg1)
-       #'(:real-range var (index i) 0 arg1 1) )
-      ((:real-range var (index i) arg1)
-       #'(:real-range var (index i) 0 arg1 1) )
-      ((:real-range var arg1 arg2)
-       #'(:real-range var (index i) arg1 arg2 1) )
-      ((:real-range var (index i) arg1 arg2)
-       #'(:real-range var (index i) arg1 arg2 1) )
-      ((:real-range var arg1 arg2 arg3)
-       #'(:real-range var (index i) arg1 arg2 arg3) )
-      
-      ; the fully qualified case
-      ((:real-range var (index i) arg1 arg2 arg3)
-       #'(:do (let ((a arg1) (b arg2) (s arg3) (istop 0))
-                (if (not (and (real? a) (real? b) (real? s)))
-                    (error "arguments of :real-range are not real" a b s) )
-                (if (and (exact? a) (or (not (exact? b)) (not (exact? s))))
-                    (set! a (exact->inexact a)) )
-                (set! istop (/ (- b a) s)) )
-              ((i 0))
-              (< i istop)
-              (let ((var (+ a (* s i)))))
-              #t
-              ((+ i 1)) ))))
-  
-  ; Comment: The macro :real-range adapts the exactness of the start
-  ;   value in case any of the other values is inexact. This is a
-  ;   precaution to avoid (list-ec (: x 0 3.0) x) => '(0 1.0 2.0).
-  
-  (define-generator (:char-range form-stx)
-    (syntax-case form-stx (index)
-      [(_ var (index i) expr1 expr2)
-       (add-index form-stx #'(:char-range var expr1 expr2) #'i)]
-      [(_ var expr1 expr2)
-       #'(:do (let ((imax (char->integer expr2))))
-              ((i (char->integer expr1)))
-              (<= i imax)
-              (let ((var (integer->char i))))
-              #t
-              ((+ i 1)) )]
-      [_
-       (raise-syntax-error
-        ':char-range
-        "expected (:char-range <var> (index <var>) <expr> <expr>) where the index is optional, got: "
-        form-stx)]))
-  
-  (define-generator (:port form-stx)
-    (syntax-case form-stx (index)
-      ((:port var (index i) arg1 arg ...)
-       (add-index form-stx #'(:port var arg1 arg ...) #'i))
-      ((:port var arg)
-       #'(:port var arg read) )
-      ((:port var arg1 arg2)
-       #'(:do (let ((port arg1) (read-proc arg2)))
-              ((var (read-proc port)))
-              (not (eof-object? var))
-              (let ())
-              #t 
-              ((read-proc port)) ))
-      (_
-       (raise-syntax-error
-        ':port
-        "expected (:port <var> (index i) <reader-expr>) where index is optional, and the <reader-expr> defaults to read, got:"
-        form-stx))))
-  
-  
-  ;;;
-  ;;; SPECIAL GENERATORS
-  ;;;
-  
-  (define-generator (:let form-stx)
-    (syntax-case form-stx (index)
-      ; ($ loop ob* oc* lb* ne1 ib* ic* ne2 ls*)
-      [(_ var (index i) expr)
-       (make-loop #'(() () ((var expr) (i 0)) #t () () #f ()))]
-      [(_ var expr)
-       (make-loop #'(() () ((var expr)) #t () () #f ()))]
-      [_ 
-       (raise-syntax-error 
-        ':let "expected (:let <var> <expr>) or (:let <var> (index <var>) <expr>), got:" 
-        form-stx)]))
-  
-  (require-for-syntax (lib "match.ss"))
-  
-  (define-generator (:parallel form-stx)
-    ; TODO: Check that all subforms are generators
-    (syntax-case form-stx (index)
-      [(_ (index i) q ...)
-       (add-index form-stx #'(_ q ...) #'i)]
-      [(_ gen)
-       (generator->loop #'gen)]
-      [(_ gen1 gen2)
-       (syntax-case (list (loop-stx (generator->loop #'gen1))
-                          (loop-stx (generator->loop #'gen2))) ()
-         [(((ob ...) (oc ...) (lb ...) ne1 (ib ...) (ic ...) ne2 (ls ...))
-           ((ob2 ...) (oc2 ...) (lb2 ...) ne12 (ib2 ...) (ic2 ...) ne22 (ls2 ...)))
-          (make-loop
-           #'((ob ... ob2 ...) 
-              (oc ... oc2 ...)  (lb ... lb2 ...)
-              (and ne1 ne12)    (ib ... ib2 ...)
-              (ic ... ic2 ...) (and ne2 ne22) 
-              (ls ... ls2 ...)))])]
-      [(_ gen1 gen2 gen3 ...)
-       #'(:parallel (:parallel gen1 gen2) gen3 ...)]))
-  
-  (define-generator (:until form-stx)
-    (syntax-case form-stx (index)
-      [(_ gen test-expr)
-       (unless (generator-clause? #'gen)
-         (raise-syntax-error
-          ':until "expected <generator> in " #'gen))
-       (syntax-case (loop-stx (generator->loop #'gen)) ()
-         [(obs ocs lbs ne1 ibs ics ne2 lss)
-          (make-loop #'(obs ocs lbs ne1 ibs ics 
-                            (and ne2 (not test-expr))
-                            lss))])]
-      [_
-       (raise-syntax-error 
-        ':until "expected (:until <generator> <expression>), got: "
-        form-stx)]))
-  
-  
-  (define-generator (:do form-stx)
-    (syntax-case form-stx (let let-values)
-      ; short form -> fill in default value
-      [(_ ((lv le) ...) ne1? (expr ...))
-       #'(:do (let ()) ((lv le) ...) ne1? (let ()) #t (expr ...))]
-      ; convert (let _) variants to (let-values _)
-      [(_   (let        ((on oe) ...) <oc> ...)       (<lb> ...) <ne1?> (let        ((in ie) ...)       <ic> ...) <ne2?> (<ls> ...))
-       #'(_ (let-values (((on) oe) ...) <oc> ...)     (<lb> ...) <ne1?> (let-values ([(in) ie] ...)     <ic> ...) <ne2?> (<ls> ...))]
-      [(_   (let        ((on oe) ...) <oc> ...)       (<lb> ...) <ne1?> ilet                                      <ne2?> (<ls> ...))
-       #'(_ (let-values (((on) oe) ...) <oc> ...)     (<lb> ...) <ne1?> ilet                                      <ne2?> (<ls> ...))]
-      [(_   olet                                      (<lb> ...) <ne1?> (let        ((in ie) ...)       <ic> ...) <ne2?> (<ls> ...))
-       #'(_ olet                                      (<lb> ...) <ne1?> (let-values ([(in) ie] ...)     <ic> ...) <ne2?> (<ls> ...))]
-      
-      ; now both outer bindings and inner bindings must be let-values bindings
-      [(_ olet lbs ne1? ilet ne2? lss)
-       (begin
-         ; check syntax of subforms
-         (syntax-case #'olet (let-values)
-           [(let-values (((i ...) e) ...) oc ...) 'ok]
-           [_ (raise-syntax-error 
-               ':do (string-append "expected (let ((<id> <expr>) ...) <command> ...)  or\n"
-                                   "(let-values ([(<id> ...) <expr>] ...) <command> ...) , got ")
-               #'olet)])
-         (syntax-case #'ilet (let-values)
-           [(let-values (((i ...) e) ...) ic ...) 'ok]
-           [_ (raise-syntax-error 
-               ':do (string-append "expected (let ((<id> <expr>) ...) <command> ...) or\n"
-                                   "(let-values ([(<id> ...) <expr>] ...) <command> ...), got ")
-               #'ilet)])
-         (syntax-case #'lbs ()
-           [((i b) ...)
-            (for-each (lambda (i) 
-                        (unless (identifier? i)
-                          (raise-syntax-error ':do "expected an identifier, got: " i)))
-                      (syntax->list #'(i ...)))]
-           [_ (raise-syntax-error 
-               ':do
-               "expected loop bindings of the form ((<id> <expr>) ...), got: " #'lbs)])
-         (syntax-case #'lss ()
-           [(expr ...) 'ok]
-           [_ (raise-syntax-error "expected loop steppers: (<expr> ...), got: " #'lss)])
-         ; everything is ok
-         (syntax-case form-stx (let-values)
-           [(_ (let-values ([(oi ...) oe] ...) oc ...) lbs ne1? (let-values ([(ii ...) ie] ...) ic ...) ne2? lss)
-            ; (ob* oc* lb* ne1 ib* ic* ne2 ls*)
-            (make-loop #'((((oi ...) oe) ...) (oc ...) lbs ne1? (((ii ...) ie) ...) (ic ...) ne2? lss))]))]
-      [_
-       (raise-syntax-error
-        ':do 
-        "TODO fix message: expected (:do (let ((<id> <expr>) ...) <cmd> ...) <ne1?> (let ((<id> <expr>) ...) <cmd> ...) (<expr> ...)), got "
-        form-stx)]))
-  
-  (define-generator (:while form-stx)
-    (syntax-case form-stx ()
-      [(_ gen test)
-       (begin
-         (unless (generator-clause? #'gen)
-           (raise-syntax-error
-            ':while "expected a generator clause, got: " #'gen))
-         (let ([loop (generator->loop #'gen)])
-           (syntax-case (loop-stx loop) ()
-             [((ob ...) (oc ...) (lb ...) ne1 (((ib-var ...) ib-rhs) ...) (ic ...) ne2 (ls ...))
-              (with-syntax ([(ib-tmp ...) (generate-temporaries #'(ib-var ... ...))]
-                            [(false ...)  (map (lambda (x) #'f) (syntax->list #'(ib-var ... ...)))])
-                ; this trickery is necessary to make ib-vars visible in test
-                (make-loop #'((ob ... ((ib-tmp) #f) ...)
-                              (oc ...)
-                              (lb ...)
-                              (let ([ne1-val ne1])
-                                (and ne1-val
-                                     (let-values ([(ib-var ...) ib-rhs] ...)
-                                       ic ...
-                                       (set! ib-tmp ib-var) ... ...
-                                       (and ne1-val test))))
-                              (((ib-var ...) ib-tmp) ...)
-                              ()
-                              ne2
-                              (ls ...))))])))]
-      [_ 
-       (raise-syntax-error
-        ':while
-        "expected (:while <generator> <expr>) got: "
-        form-stx)]))
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/loops.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/42/loops.scm
deleted file mode 100644
index 8ec3c13f6f..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/loops.scm
+++ /dev/null
@@ -1,110 +0,0 @@
-;;;
-;;; LOOPS
-;;;
-
-(module loops mzscheme
-  (provide loop loop-stx
-           loop->syntax 
-           (rename checked-make-loop make-loop)
-           loop? )
-  
-  ; The structure of a loop is:
-  
-  #;(let (<ob>*)                      ; outer bindings
-      <oc>*                           ; outer commands
-      (let loop (<lb>*)               ; loop bindings
-        (if <ne1?>                    ; not end (stop-before)
-            (let (<ib>*)              ; inner bindings
-              <ic>*                   ; inner commands
-              <payload>               ; payload (from the comprehension)
-              (if <ne2?>              ; not end (stop-after)
-                  (loop <ls>*))))))   ; loop steppers
-  
-  ; A binding is a list consisting of two syntax-objects,
-  ; the first represents the variable, the other the expression.
-  
-  ; Actually for the inner and outer bindings we are using let-values instead of let.
-  ; The form (:do _) supports both (let _) and (let-values _) syntax for these bindings.
-  ;         (let ((v e) ...) c ...) 
-  ;     ==  (let-values (((v) e) ...) c ...)
-  
-  (define-struct loop (stx))
-  ; stx is a syntax-object representing:
-  ;   (ob* oc* lb* ne1 ib* ic* ne2 ls*)
-  
-  (define (checked-make-loop stx)
-    (define (check-values-bindings stx)
-      (syntax-case stx ()
-        [(((name ...) expr) ...)
-         (begin
-           (unless (andmap identifier? (syntax->list #'(name ... ...)))
-             (raise-syntax-error 
-              'make-loop "expected list of bindings, got: " stx)))]))
-    (define (check-bindings stx)
-      (syntax-case stx ()
-        [((name expr) ...)
-         (begin
-           (unless (andmap identifier? (syntax->list #'(name ...)))
-             (raise-syntax-error 
-              'make-loop "expected list of bindings, got: " stx)))]))
-    (define (check-list-of stx what)
-      (syntax-case stx ()
-        [(x ...) 'ok]
-        [_ (raise-syntax-error 
-            'make-loop (format "expected list of ~a, got: " what) stx)]))
-    ; checks
-    (syntax-case stx ()
-      [(ob* oc* lb* ne1 ib* ic* ne2 ls*)
-       (begin
-         (check-values-bindings #'ob*)
-         (check-values-bindings #'ib*)
-         ; (check-bindings #'lb*)
-         (check-list-of #'oc* "outer commands")
-         (check-list-of #'ic* "inner commands")
-         (check-list-of #'ls* "loop steppers"))]
-      [_else 
-       (raise-syntax-error 
-        'make-loop 
-        "expected (ob* oc* lb* ne1 ib* ic* ne2 ls*), got: " stx)])
-    ; everything's ok
-    (make-loop stx))
-  
-  
-  ; A simple loop has the structure:
-  
-  #;(let loop (<lb>*)
-      (if <ne1?>
-          (loop <ls>*)))
-  
-  (require-for-template mzscheme)
-  (require-for-template "simplifier.scm")
-  
-  ; make-simple-loop : stx stx stx -> loop
-  ;  build a loop from the simple pieces
-  ;(define (make-simple-loop lb* ne1 ls*)
-  ;  (with-syntax ([lb* lb*] [ne1 ne1] [ls* ls*])
-  ;    (make-loop #'(() () lb* ne1 () () #t ls*))))
-  
-  ; loop->syntax : src-stx loop stx -> stx
-  ;   Turn the loop structure l into a
-  ;   syntax-object containing a loop.
-  ;   Use payload as the body of the load.
-  ;   The src-location info is taken from src-stx.
-  (define (loop->syntax src-stx l payload)
-    (syntax-case (loop-stx l) ()
-      [((ob ...) (oc ...) (lb ...) ne1 (ib ...) (ic ...) ne2 (ls ...))
-       (with-syntax ([payload payload])
-         (syntax/loc src-stx
-           (let-values (ob ...)
-             oc ...
-             (let loop (lb ...)
-               (ec-simplify
-                (if ne1                    
-                    (let-values (ib ...)
-                      ic ...
-                      (ec-simplify payload)
-                      (ec-simplify
-                       (if ne2
-                           (loop ls ...))))))))))]))
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42/simplifier.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/42/simplifier.scm
deleted file mode 100644
index ffa56f12f5..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42/simplifier.scm
+++ /dev/null
@@ -1,93 +0,0 @@
-;;;
-;;; SIMPLIFIER
-;;;
-
-(module simplifier mzscheme
-  (provide ec-simplify)
-  
-  ; (ec-simplify <expression>)
-  ;   generates potentially more efficient code for <expression>.
-  ;   The macro handles if, (begin <command>*), and (let () <command>*)
-  ;   and takes care of special cases.
-  ; 
-  ; NOTE: Turns out the JIT optimizer doesn't handle (not (not x)) 
-  ;       and (if (not x) expr1 expr2) => (if x expr2 expr1)
-  ;       yet.
-  
-  #;(define-syntax ec-simplify
-      (syntax-rules ()
-        [(_ . (more)) more]))
-  
-  (require-for-syntax (lib "stx.ss" "syntax"))
-  
-  (define-syntax (ec-simplify stx)
-    (syntax-case* stx (if not let begin #%top #%app) module-or-top-identifier=?
-      
-      ; one- and two-sided if
-      
-      ; literal <test>
-      ((ec-simplify (if #t consequent))
-       #'consequent )
-      ((ec-simplify (if #f consequent))
-       #'(if #f #f) )
-      ((ec-simplify (if #t consequent alternate))
-       #'consequent )
-      ((ec-simplify (if #f consequent alternate))
-       #'alternate )
-      
-      ; (not (not <test>))
-      ((ec-simplify (if (not (not test)) consequent))
-       #'(ec-simplify (if test consequent)) )
-      
-      ((ec-simplify (if (#%app not (not test)) consequent))
-       #'(ec-simplify (if test consequent)) )
-      
-      ((ec-simplify (if (not (#%app not test)) consequent))
-       #'(ec-simplify (if test consequent)) )
-      
-      ((ec-simplify (if (#%app not (#%app not test)) consequent))
-       #'(ec-simplify (if test consequent)) )
-      
-      ((ec-simplify (if (not (not test)) consequent alternate))
-       #'(ec-simplify (if test consequent alternate)) )
-      
-      ((ec-simplify (if (#%app not (not test)) consequent alternate))
-       #'(ec-simplify (if test consequent alternate)) )
-      
-      ((ec-simplify (if (not (#%app not test)) consequent alternate))
-       #'(ec-simplify (if test consequent alternate)) )
-      
-      ((ec-simplify (if (#%app not (#%app not test)) consequent alternate))
-       #'(ec-simplify (if test consequent alternate)) )
-      
-      
-      ; (let () <command>*) 
-      
-      ; empty <binding spec>*
-      #;((ec-simplify (let () command ...))
-         #'(ec-simplify (begin command ...)) )
-      ; NOTE: Removed. let introduces a new scope, begin doesn't
-      
-      
-      ; begin 
-      
-      ; flatten use helper (ec-simplify 1 done to-do)
-      ((ec-simplify (begin command ...))
-       #'(ec-simplify 1 () (command ...)) )
-      ((ec-simplify 1 done ((begin to-do1 ...) to-do2 ...))
-       #'(ec-simplify 1 done (to-do1 ... to-do2 ...)) )
-      ((ec-simplify 1 (done ...) (to-do1 to-do ...))
-       #'(ec-simplify 1 (done ... to-do1) (to-do ...)) )
-      
-      ; exit helper
-      ((ec-simplify 1 () ())
-       #'(if #f #f) )
-      ((ec-simplify 1 (command) ())
-       #'command )
-      ((ec-simplify 1 (command1 command ...) ())
-       #'(begin command1 command ...) )
-      
-      ; anything else
-      
-      ((ec-simplify expression)
-       #'expression ))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42ref.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/42ref.rkt
deleted file mode 100644
index 30e0446eb8..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42ref.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-42 reference implementation
-#lang s-exp srfi/provider srfi/42ref/comprehensions
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42ref/comprehensions.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/42ref/comprehensions.rkt
deleted file mode 100644
index d2209d1e2a..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42ref/comprehensions.rkt
+++ /dev/null
@@ -1,1067 +0,0 @@
-; SRFI 42 as a module in PLT -----------------------------------------------
-; sebastian_egner@yahoo.com, 26-Dec-2007, PLT 371.
-;   + bugs found by sunnan and jens axel soegaard fixed
-; Sebastian.Egner@philips.com, 15-May-2003, PLT 204.
-; For running demos: (require srfi/42/examples)
-; For anything else: http://srfi.schemers.org/srfi-42/
-
-(module |comprehensions| mzscheme
-
- (require srfi/23
-          (rename scheme/base base-if if))
-
- (provide 
-    do-ec list-ec append-ec string-ec string-append-ec vector-ec 
-      vector-of-length-ec sum-ec product-ec min-ec max-ec any?-ec 
-      every?-ec first-ec last-ec fold-ec fold3-ec 
-    : :list :string :vector :integers :range :real-range :char-range 
-      :port :dispatched :do :let :parallel :while :until
-    :-dispatch-ref :-dispatch-set! make-initial-:-dispatch 
-    dispatch-union
-    :generator-proc )
-
-; There is a subtle point in defining a macro inside a module 
-; and exporting it to the rest of the world. If the macro has a 
-; literal identifier which is imported from another module (in 
-; our case `not' comes from mzscheme) then this identifier 
-; becomes local to the module and does not match patterns 
-; as expected when the exported macro is used outside.
-;    As a fix, Matthew Flatt suggested to use syntax-case*
-; with equivalence predicate module-or-top-identifier=? as
-; require-for-syntax'ed by syntax/stx. To limit
-; the amount of modification to the SRFI 42 code below, we
-; replace define-syntax by the new define-syntax-globally
-; which constructs the proper code. The new transformer
-; must be used for all exported macros recognizing `not'.
-
-  (require-for-syntax syntax/stx)
-  
-  (define-syntax define-syntax-globally
-    (syntax-rules (syntax-rules)
-      ((define-syntax-globally macro 
-         (syntax-rules (identifier ...)
-           (pattern template) ... ))
-       (define-syntax (macro stx)
-         (syntax-case* stx (identifier ...) module-or-top-identifier=?
-           (pattern (syntax template)) ... )))))
-
-; ec.scm with define-syntax-globally starts here ---------------------------
-
-; <PLAINTEXT>
-; Eager Comprehensions in [outer..inner|expr]-Convention
-; ======================================================
-;
-; sebastian.egner@philips.com, Eindhoven, The Netherlands, Feb-2003.
-; Scheme R5RS (incl. macros), SRFI-23 (error).
-; 
-; Loading the implementation into Scheme48 0.57:
-;   ,open srfi-23
-;   ,load ec.scm
-;
-; Loading the implementation into PLT/DrScheme 202:
-;   ; File > Open ... "ec.scm", click Execute
-;
-; Loading the implementation into SCM 5d7:
-;   (require 'macro) (require 'record) 
-;   (load "ec.scm")
-;
-; Implementation comments:
-;   * All local (not exported) identifiers are named ec-<something>.
-;   * This implementation focuses on portability, performance, 
-;     readability, and simplicity roughly in this order. Design
-;     decisions related to performance are taken for Scheme48.
-;   * Alternative implementations, Comments and Warnings are 
-;     mentioned after the definition with a heading.
-
-
-; ==========================================================================
-; The fundamental comprehension do-ec
-; ==========================================================================
-;
-; All eager comprehensions are reduced into do-ec and
-; all generators are reduced to :do. 
-;
-; We use the following short names for syntactic variables
-;   q    - qualifier
-;   cc   - current continuation, thing to call at the end;
-;          the CPS is (m (cc ...) arg ...) -> (cc ... expr ...)
-;   cmd  - an expression being evaluated for its side-effects
-;   expr - an expression
-;   gen  - a generator of an eager comprehension
-;   ob   - outer binding
-;   oc   - outer command
-;   lb   - loop binding
-;   ne1? - not-end1? (before the payload)
-;   ib   - inner binding
-;   ic   - inner command
-;   ne2? - not-end2? (after the payload)
-;   ls   - loop step
-;   etc  - more arguments of mixed type
-
-
-; (do-ec q ... cmd)
-;   handles nested, if/not/and/or, begin, :let, and calls generator 
-;   macros in CPS to transform them into fully decorated :do.
-;   The code generation for a :do is delegated to do-ec:do.
-
-(define-syntax-globally do-ec
-  (syntax-rules (nested if base-if not and or begin :do let)
-
-    ; explicit nesting -> implicit nesting
-    ((do-ec (nested q ...) etc ...)
-     (do-ec q ... etc ...) )
-
-    ; implicit nesting -> fold do-ec
-    ((do-ec q1 q2 etc1 etc ...)
-     (do-ec q1 (do-ec q2 etc1 etc ...)) )
-
-    ; no qualifiers at all -> evaluate cmd once
-    ((do-ec cmd)
-     (begin cmd (if #f #f)) )
-
-; now (do-ec q cmd) remains
-
-    ; filter -> make conditional
-    ((do-ec (if test) cmd)
-     (if test (do-ec cmd)) )
-    ((do-ec (base-if test) cmd)
-     (if test (do-ec cmd)) )
-    ((do-ec (not test) cmd)
-     (if (not test) (do-ec cmd)) )
-    ((do-ec (and test ...) cmd)
-     (if (and test ...) (do-ec cmd)) )
-    ((do-ec (or test ...) cmd)
-     (if (or test ...) (do-ec cmd)) )
-
-    ; begin -> make a sequence
-    ((do-ec (begin etc ...) cmd)
-     (begin etc ... (do-ec cmd)) )
-
-    ; fully decorated :do-generator -> delegate to do-ec:do
-    ((do-ec (:do olet lbs ne1? ilet ne2? lss) cmd)
-     (do-ec:do cmd (:do olet lbs ne1? ilet ne2? lss)) )
-
-; anything else -> call generator-macro in CPS; reentry at (*)
-
-    ((do-ec (g arg1 arg ...) cmd)
-     (g (do-ec:do cmd) arg1 arg ...) )))
-
-
-; (do-ec:do cmd (:do olet lbs ne1? ilet ne2? lss)
-;   generates code for a single fully decorated :do-generator
-;   with cmd as payload, taking care of special cases.
-
-(define-syntax do-ec:do
-  (syntax-rules (:do let)
-
-    ; reentry point (*) -> generate code
-    ((do-ec:do cmd 
-               (:do (let obs oc ...) 
-                    lbs 
-                    ne1? 
-                    (let ibs ic ...) 
-                    ne2? 
-                    (ls ...) ))
-     (ec-simplify
-       (let obs
-         oc ...
-         (let loop lbs
-           (ec-simplify
-             (if ne1?
-                 (ec-simplify
-                   (let ibs
-                      ic ...
-                      cmd
-                      (ec-simplify
-                        (if ne2?
-                            (loop ls ...) )))))))))) ))
-
-    
-; (ec-simplify <expression>)
-;   generates potentially more efficient code for <expression>.
-;   The macro handles if, (begin <command>*), and (let () <command>*)
-;   and takes care of special cases.
-
-(define-syntax-globally ec-simplify
-  (syntax-rules (if base-if not let begin)
-
-; one- and two-sided if
-
-    ; literal <test>
-    ((ec-simplify (if #t consequent))
-     consequent )
-    ((ec-simplify (if #f consequent))
-     (if #f #f) )
-    ((ec-simplify (if #t consequent alternate))
-     consequent )
-    ((ec-simplify (if #f consequent alternate))
-     alternate )
-
-    ; (not (not <test>))
-    ((ec-simplify (if (not (not test)) consequent))
-     (ec-simplify (if test consequent)) )
-    ((ec-simplify (if (not (not test)) consequent alternate))
-     (ec-simplify (if test consequent alternate)) )
-
-    ; base-if variants:
-    ((ec-simplify (base-if #t consequent))
-     consequent )
-    ((ec-simplify (base-if #f consequent))
-     (if #f #f) )
-    ((ec-simplify (base-if #t consequent alternate))
-     consequent )
-    ((ec-simplify (base-if #f consequent alternate))
-     alternate )
-    ((ec-simplify (base-if (not (not test)) consequent))
-     (ec-simplify (if test consequent)) )
-    ((ec-simplify (base-if (not (not test)) consequent alternate))
-     (ec-simplify (if test consequent alternate)) )
-
-; (let () <command>*) 
-
-    ; empty <binding spec>*
-    ((ec-simplify (let () command ...))
-     (ec-simplify (begin command ...)) )
-
-; begin 
-
-    ; flatten use helper (ec-simplify 1 done to-do)
-    ((ec-simplify (begin command ...))
-     (ec-simplify 1 () (command ...)) )
-    ((ec-simplify 1 done ((begin to-do1 ...) to-do2 ...))
-     (ec-simplify 1 done (to-do1 ... to-do2 ...)) )
-    ((ec-simplify 1 (done ...) (to-do1 to-do ...))
-     (ec-simplify 1 (done ... to-do1) (to-do ...)) )
-
-    ; exit helper
-    ((ec-simplify 1 () ())
-     (if #f #f) )
-    ((ec-simplify 1 (command) ())
-     command )
-    ((ec-simplify 1 (command1 command ...) ())
-     (begin command1 command ...) )
-
-; anything else
-
-    ((ec-simplify expression)
-     expression )))
-
-
-; ==========================================================================
-; The special generators :do, :let, :parallel, :while, and :until
-; ==========================================================================
-
-(define-syntax :do
-  (syntax-rules ()
-
-    ; full decorated -> continue with cc, reentry at (*)
-    ((:do (cc ...) olet lbs ne1? ilet ne2? lss)
-     (cc ... (:do olet lbs ne1? ilet ne2? lss)) )
-
-    ; short form -> fill in default values
-    ((:do cc lbs ne1? lss)
-     (:do cc (let ()) lbs ne1? (let ()) #t lss) )))
-    
-
-(define-syntax :let
-  (syntax-rules (index)
-    ((:let cc var (index i) expression)
-     (:do cc (let ((var expression) (i 0))) () #t (let ()) #f ()) )
-    ((:let cc var expression)
-     (:do cc (let ((var expression))) () #t (let ()) #f ()) )))
-
-
-(define-syntax :parallel
-  (syntax-rules (:do)
-    ((:parallel cc)
-     cc )
-    ((:parallel cc (g arg1 arg ...) gen ...)
-     (g (:parallel-1 cc (gen ...)) arg1 arg ...) )))
-
-; (:parallel-1 cc (to-do ...) result [ next ] )
-;    iterates over to-do by converting the first generator into 
-;    the :do-generator next and merging next into result.
-
-(define-syntax :parallel-1  ; used as 
-  (syntax-rules (:do let)
-
-    ; process next element of to-do, reentry at (**)
-    ((:parallel-1 cc ((g arg1 arg ...) gen ...) result)
-     (g (:parallel-1 cc (gen ...) result) arg1 arg ...) )
-
-    ; reentry point (**) -> merge next into result
-    ((:parallel-1 
-       cc 
-       gens 
-       (:do (let (ob1 ...) oc1 ...) 
-            (lb1 ...) 
-            ne1?1 
-            (let (ib1 ...) ic1 ...) 
-            ne2?1 
-            (ls1 ...) )
-       (:do (let (ob2 ...) oc2 ...) 
-            (lb2 ...) 
-            ne1?2 
-            (let (ib2 ...) ic2 ...) 
-            ne2?2 
-            (ls2 ...) ))
-     (:parallel-1 
-       cc 
-       gens 
-       (:do (let (ob1 ... ob2 ...) oc1 ... oc2 ...) 
-            (lb1 ... lb2 ...) 
-            (and ne1?1 ne1?2) 
-            (let (ib1 ... ib2 ...) ic1 ... ic2 ...) 
-            (and ne2?1 ne2?2) 
-            (ls1 ... ls2 ...) )))
-
-    ; no more gens -> continue with cc, reentry at (*)
-    ((:parallel-1 (cc ...) () result)
-     (cc ... result) )))
-
-
-(define-syntax :while
-  (syntax-rules ()
-    ((:while cc (g arg1 arg ...) test)
-     (g (:while-1 cc test) arg1 arg ...) )))
-
-(define-syntax :while-1
-  (syntax-rules (:do let)
-    ((:while-1 cc test (:do olet lbs ne1? ilet ne2? lss))
-     (:while-2 cc test () () () (:do olet lbs ne1? ilet ne2? lss)))))
-
-(define-syntax :while-2
-  (syntax-rules (:do let)
-    ((:while-2 cc 
-               test 
-               (ib-let     ...)
-               (ib-save    ...)
-               (ib-restore ...)
-               (:do olet 
-                    lbs 
-                    ne1? 
-                    (let ((ib-var ib-rhs) ib ...) ic ...)
-                    ne2? 
-                    lss))
-     (:while-2 cc 
-               test 
-               (ib-let     ... (ib-tmp #f))
-               (ib-save    ... (ib-var ib-rhs))
-               (ib-restore ... (ib-var ib-tmp))
-               (:do olet 
-                    lbs 
-                    ne1? 
-                    (let (ib ...) ic ... (set! ib-tmp ib-var)) 
-                    ne2? 
-                    lss)))
-    ((:while-2 cc
-               test
-               (ib-let     ...)
-               (ib-save    ...)
-               (ib-restore ...)
-               (:do (let (ob ...) oc ...) lbs ne1? (let () ic ...) ne2? lss))
-     (:do cc
-          (let (ob ... ib-let ...) oc ...)
-          lbs
-          (let ((ne1?-value ne1?))
-	    (and ne1?-value
-		 (let (ib-save ...)
-		   ic ...
-		   test)))
-          (let (ib-restore ...))
-          ne2?
-          lss))))
-
-
-(define-syntax :until
-  (syntax-rules ()
-    ((:until cc (g arg1 arg ...) test)
-     (g (:until-1 cc test) arg1 arg ...) )))
-
-(define-syntax :until-1
-  (syntax-rules (:do)
-    ((:until-1 cc test (:do olet lbs ne1? ilet ne2? lss))
-     (:do cc olet lbs ne1? ilet (and ne2? (not test)) lss) )))
-
-
-; ==========================================================================
-; The typed generators :list :string :vector etc.
-; ==========================================================================
-
-(define-syntax :list
-  (syntax-rules (index)
-    ((:list cc var (index i) arg ...)
-     (:parallel cc (:list var arg ...) (:integers i)) )
-    ((:list cc var arg1 arg2 arg ...)
-     (:list cc var (append arg1 arg2 arg ...)) )
-    ((:list cc var arg)
-     (:do cc
-          (let ())
-          ((t arg))
-          (not (null? t))
-          (let ((var (car t))))
-          #t
-          ((cdr t)) ))))
-
-
-(define-syntax :string
-  (syntax-rules (index)
-    ((:string cc var (index i) arg)
-     (:do cc
-          (let ((str arg) (len 0)) 
-            (set! len (string-length str)))
-          ((i 0))
-          (< i len)
-          (let ((var (string-ref str i))))
-          #t
-          ((+ i 1)) ))
-    ((:string cc var (index i) arg1 arg2 arg ...)
-     (:string cc var (index i) (string-append arg1 arg2 arg ...)) )
-    ((:string cc var arg1 arg ...)
-     (:string cc var (index i) arg1 arg ...) )))
-
-; Alternative: An implementation in the style of :vector can also
-;   be used for :string. However, it is less interesting as the
-;   overhead of string-append is much less than for 'vector-append'.
-
-
-(define-syntax :vector
-  (syntax-rules (index)
-    ((:vector cc var arg)
-     (:vector cc var (index i) arg) )
-    ((:vector cc var (index i) arg)
-     (:do cc
-          (let ((vec arg) (len 0)) 
-            (set! len (vector-length vec)))
-          ((i 0))
-          (< i len)
-          (let ((var (vector-ref vec i))))
-          #t
-          ((+ i 1)) ))
-
-    ((:vector cc var (index i) arg1 arg2 arg ...)
-     (:parallel cc (:vector cc var arg1 arg2 arg ...) (:integers i)) )
-    ((:vector cc var arg1 arg2 arg ...)
-     (:do cc
-          (let ((vec #f)
-                (len 0)
-                (vecs (ec-:vector-filter (list arg1 arg2 arg ...))) ))
-          ((k 0))
-          (if (< k len)
-              #t
-              (if (null? vecs)
-                  #f
-                  (begin (set! vec (car vecs))
-                         (set! vecs (cdr vecs))
-                         (set! len (vector-length vec))
-                         (set! k 0)
-                         #t )))
-          (let ((var (vector-ref vec k))))
-          #t
-          ((+ k 1)) ))))
-
-(define (ec-:vector-filter vecs)
-  (if (null? vecs)
-      '()
-      (if (zero? (vector-length (car vecs)))
-          (ec-:vector-filter (cdr vecs))
-          (cons (car vecs) (ec-:vector-filter (cdr vecs))) )))
-
-; Alternative: A simpler implementation for :vector uses vector->list
-;   append and :list in the multi-argument case. Please refer to the
-;   'design.scm' for more details.
-
-
-(define-syntax :integers
-  (syntax-rules (index)
-    ((:integers cc var (index i))
-     (:do cc ((var 0) (i 0)) #t ((+ var 1) (+ i 1))) )
-    ((:integers cc var)
-     (:do cc ((var 0)) #t ((+ var 1))) )))
-
-
-(define-syntax :range
-  (syntax-rules (index)
-
-    ; handle index variable and add optional args
-    ((:range cc var (index i) arg1 arg ...)
-     (:parallel cc (:range var arg1 arg ...) (:integers i)) )
-    ((:range cc var arg1)
-     (:range cc var 0 arg1 1) )
-    ((:range cc var arg1 arg2)
-     (:range cc var arg1 arg2 1) )
-
-; special cases (partially evaluated by hand from general case)
-
-    ((:range cc var 0 arg2 1)
-     (:do cc
-          (let ((b arg2))
-            (if (not (and (integer? b) (exact? b)))
-                (error 
-                   "arguments of :range are not exact integer "
-                   "(use :real-range?)" 0 b 1 )))
-          ((var 0))
-          (< var b)
-          (let ())
-          #t
-          ((+ var 1)) ))
-
-    ((:range cc var 0 arg2 -1)
-     (:do cc
-          (let ((b arg2))
-            (if (not (and (integer? b) (exact? b)))
-                (error 
-                   "arguments of :range are not exact integer "
-                   "(use :real-range?)" 0 b 1 )))
-          ((var 0))
-          (> var b)
-          (let ())
-          #t
-          ((- var 1)) ))
-
-    ((:range cc var arg1 arg2 1)
-     (:do cc
-          (let ((a arg1) (b arg2))
-            (if (not (and (integer? a) (exact? a)
-                          (integer? b) (exact? b) ))
-                (error 
-                   "arguments of :range are not exact integer "
-                   "(use :real-range?)" a b 1 )) )
-          ((var a))
-          (< var b)
-          (let ())
-          #t
-          ((+ var 1)) ))
-
-    ((:range cc var arg1 arg2 -1)
-     (:do cc
-          (let ((a arg1) (b arg2) (s -1) (stop 0))
-            (if (not (and (integer? a) (exact? a)
-                          (integer? b) (exact? b) ))
-                (error 
-                   "arguments of :range are not exact integer "
-                   "(use :real-range?)" a b -1 )) )
-          ((var a))
-          (> var b)
-          (let ())
-          #t
-          ((- var 1)) ))
-
-; the general case
-
-    ((:range cc var arg1 arg2 arg3)
-     (:do cc
-          (let ((a arg1) (b arg2) (s arg3) (stop 0))
-            (if (not (and (integer? a) (exact? a)
-                          (integer? b) (exact? b)
-                          (integer? s) (exact? s) ))
-                (error 
-                   "arguments of :range are not exact integer "
-                   "(use :real-range?)" a b s ))
-            (if (zero? s)
-                (error "step size must not be zero in :range") )
-            (set! stop (+ a (* (max 0 (ceiling (/ (- b a) s))) s))) )
-          ((var a))
-          (not (= var stop))
-          (let ())
-          #t
-          ((+ var s)) ))))
-
-; Comment: The macro :range inserts some code to make sure the values
-;   are exact integers. This overhead has proven very helpful for 
-;   saving users from themselves.
-
-
-(define-syntax :real-range
-  (syntax-rules (index)
-
-    ; add optional args and index variable
-    ((:real-range cc var arg1)
-     (:real-range cc var (index i) 0 arg1 1) )
-    ((:real-range cc var (index i) arg1)
-     (:real-range cc var (index i) 0 arg1 1) )
-    ((:real-range cc var arg1 arg2)
-     (:real-range cc var (index i) arg1 arg2 1) )
-    ((:real-range cc var (index i) arg1 arg2)
-     (:real-range cc var (index i) arg1 arg2 1) )
-    ((:real-range cc var arg1 arg2 arg3)
-     (:real-range cc var (index i) arg1 arg2 arg3) )
-
-    ; the fully qualified case
-    ((:real-range cc var (index i) arg1 arg2 arg3)
-     (:do cc
-          (let ((a arg1) (b arg2) (s arg3) (istop 0))
-            (if (not (and (real? a) (real? b) (real? s)))
-                (error "arguments of :real-range are not real" a b s) )
-            (if (and (exact? a) (or (not (exact? b)) (not (exact? s))))
-                (set! a (exact->inexact a)) )
-            (set! istop (/ (- b a) s)) )
-          ((i 0))
-          (< i istop)
-          (let ((var (+ a (* s i)))))
-          #t
-          ((+ i 1)) ))))
-
-; Comment: The macro :real-range adapts the exactness of the start
-;   value in case any of the other values is inexact. This is a
-;   precaution to avoid (list-ec (: x 0 3.0) x) => '(0 1.0 2.0).
-
-    
-(define-syntax :char-range
-  (syntax-rules (index)
-    ((:char-range cc var (index i) arg1 arg2)
-     (:parallel cc (:char-range var arg1 arg2) (:integers i)) )
-    ((:char-range cc var arg1 arg2)
-     (:do cc
-          (let ((imax (char->integer arg2))))
-          ((i (char->integer arg1)))
-          (<= i imax)
-          (let ((var (integer->char i))))
-          #t
-          ((+ i 1)) ))))
-
-; Warning: There is no R5RS-way to implement the :char-range generator 
-;   because the integers obtained by char->integer are not necessarily 
-;   consecutive. We simply assume this anyhow for illustration.
-
-
-(define-syntax :port
-  (syntax-rules (index)
-    ((:port cc var (index i) arg1 arg ...)
-     (:parallel cc (:port var arg1 arg ...) (:integers i)) )
-    ((:port cc var arg)
-     (:port cc var arg read) )
-    ((:port cc var arg1 arg2)
-     (:do cc
-          (let ((port arg1) (read-proc arg2)))
-          ((var (read-proc port)))
-          (not (eof-object? var))
-          (let ())
-          #t
-          ((read-proc port)) ))))
-
-
-; ==========================================================================
-; The typed generator :dispatched and utilities for constructing dispatchers
-; ==========================================================================
-
-(define-syntax :dispatched
-  (syntax-rules (index)
-    ((:dispatched cc var (index i) dispatch arg1 arg ...)
-     (:parallel cc 
-                (:integers i)
-                (:dispatched var dispatch arg1 arg ...) ))
-    ((:dispatched cc var dispatch arg1 arg ...)
-     (:do cc
-          (let ((d dispatch) 
-                (args (list arg1 arg ...)) 
-                (g #f) 
-                (empty (list #f)) )
-            (set! g (d args))
-            (if (not (procedure? g))
-                (error "unrecognized arguments in dispatching" 
-                       args 
-                       (d '()) )))
-          ((var (g empty)))
-          (not (eq? var empty))
-          (let ())
-          #t
-          ((g empty)) ))))
-
-; Comment: The unique object empty is created as a newly allocated
-;   non-empty list. It is compared using eq? which distinguishes
-;   the object from any other object, according to R5RS 6.1.
-
-
-(define-syntax :generator-proc
-  (syntax-rules (:do let)
-
-    ; call g with a variable, reentry at (**)
-    ((:generator-proc (g arg ...))
-     (g (:generator-proc var) var arg ...) )
-
-    ; reentry point (**) -> make the code from a single :do
-    ((:generator-proc
-       var 
-       (:do (let obs oc ...) 
-            ((lv li) ...) 
-            ne1? 
-            (let ((i v) ...) ic ...) 
-            ne2? 
-            (ls ...)) )
-     (ec-simplify 
-      (let obs
-          oc ...
-          (let ((lv li) ... (ne2 #t))
-            (ec-simplify
-             (let ((i #f) ...) ; v not yet valid
-               (lambda (empty)
-                 (if (and ne1? ne2)
-                     (ec-simplify
-                      (begin 
-                        (set! i v) ...
-                        ic ...
-                        (let ((value var))
-                          (ec-simplify
-                           (if ne2?
-                               (ec-simplify 
-                                (begin (set! lv ls) ...) )
-                               (set! ne2 #f) ))
-                          value )))
-                     empty ))))))))
-
-    ; silence warnings of some macro expanders
-    ((:generator-proc var)
-     (error "illegal macro call") )))
-
-
-(define (dispatch-union d1 d2)
-  (lambda (args)
-    (let ((g1 (d1 args)) (g2 (d2 args)))
-      (if g1
-          (if g2 
-              (if (null? args)
-                  (append (if (list? g1) g1 (list g1)) 
-                          (if (list? g2) g2 (list g2)) )
-                  (error "dispatching conflict" args (d1 '()) (d2 '())) )
-              g1 )
-          (if g2 g2 #f) ))))
-
-
-; ==========================================================================
-; The dispatching generator :
-; ==========================================================================
-
-(define (make-initial-:-dispatch)
-  (lambda (args)
-    (case (length args)
-      ((0) 'SRFI42)
-      ((1) (let ((a1 (car args)))
-             (cond
-              ((list? a1)
-               (:generator-proc (:list a1)) )
-              ((string? a1)
-               (:generator-proc (:string a1)) )
-              ((vector? a1)
-               (:generator-proc (:vector a1)) )
-              ((and (integer? a1) (exact? a1))
-               (:generator-proc (:range a1)) )
-              ((real? a1)
-               (:generator-proc (:real-range a1)) )
-              ((input-port? a1)
-               (:generator-proc (:port a1)) )
-              (else
-               #f ))))
-      ((2) (let ((a1 (car args)) (a2 (cadr args)))
-             (cond
-              ((and (list? a1) (list? a2))
-               (:generator-proc (:list a1 a2)) )
-              ((and (string? a1) (string? a1))
-               (:generator-proc (:string a1 a2)) )
-              ((and (vector? a1) (vector? a2))
-               (:generator-proc (:vector a1 a2)) )
-              ((and (integer? a1) (exact? a1) (integer? a2) (exact? a2))
-               (:generator-proc (:range a1 a2)) )
-              ((and (real? a1) (real? a2))
-               (:generator-proc (:real-range a1 a2)) )
-              ((and (char? a1) (char? a2))
-               (:generator-proc (:char-range a1 a2)) )
-              ((and (input-port? a1) (procedure? a2))
-               (:generator-proc (:port a1 a2)) )
-              (else
-               #f ))))
-      ((3) (let ((a1 (car args)) (a2 (cadr args)) (a3 (caddr args)))
-             (cond
-              ((and (list? a1) (list? a2) (list? a3))
-               (:generator-proc (:list a1 a2 a3)) )
-              ((and (string? a1) (string? a1) (string? a3))
-               (:generator-proc (:string a1 a2 a3)) )
-              ((and (vector? a1) (vector? a2) (vector? a3))
-               (:generator-proc (:vector a1 a2 a3)) )
-              ((and (integer? a1) (exact? a1) 
-                    (integer? a2) (exact? a2)
-                    (integer? a3) (exact? a3))
-               (:generator-proc (:range a1 a2 a3)) )
-              ((and (real? a1) (real? a2) (real? a3))
-               (:generator-proc (:real-range a1 a2 a3)) )
-              (else
-               #f ))))
-      (else
-       (letrec ((every? 
-                 (lambda (pred args)
-                   (if (null? args)
-                       #t
-                       (and (pred (car args))
-                            (every? pred (cdr args)) )))))
-         (cond
-          ((every? list? args)
-           (:generator-proc (:list (apply append args))) )
-          ((every? string? args)
-           (:generator-proc (:string (apply string-append args))) )
-          ((every? vector? args)
-           (:generator-proc (:list (apply append (map vector->list args)))) )
-          (else
-           #f )))))))
-
-(define :-dispatch
-  (make-initial-:-dispatch) )
-
-(define (:-dispatch-ref)
-  :-dispatch )
-
-(define (:-dispatch-set! dispatch)
-  (if (not (procedure? dispatch))
-      (error "not a procedure" dispatch) )
-  (set! :-dispatch dispatch) )
-
-(define-syntax :
-  (syntax-rules (index)
-    ((: cc var (index i) arg1 arg ...)
-     (:dispatched cc var (index i) :-dispatch arg1 arg ...) )
-    ((: cc var arg1 arg ...)
-     (:dispatched cc var :-dispatch arg1 arg ...) )))
-
-
-; ==========================================================================
-; The utility comprehensions fold-ec, fold3-ec
-; ==========================================================================
-
-(define-syntax fold3-ec
-  (syntax-rules (nested)
-    ((fold3-ec x0 (nested q1 ...) q etc1 etc2 etc3 etc ...)
-     (fold3-ec x0 (nested q1 ... q) etc1 etc2 etc3 etc ...) )
-    ((fold3-ec x0 q1 q2 etc1 etc2 etc3 etc ...)
-     (fold3-ec x0 (nested q1 q2) etc1 etc2 etc3 etc ...) )
-    ((fold3-ec x0 expression f1 f2)
-     (fold3-ec x0 (nested) expression f1 f2) )
-
-    ((fold3-ec x0 qualifier expression f1 f2)
-     (let ((result #f) (empty #t))
-       (do-ec qualifier
-              (let ((value expression)) ; don't duplicate
-                (if empty
-                    (begin (set! result (f1 value))
-                           (set! empty #f) )
-                    (set! result (f2 value result)) )))
-       (if empty x0 result) ))))
-
-
-(define-syntax fold-ec
-  (syntax-rules (nested)
-    ((fold-ec x0 (nested q1 ...) q etc1 etc2 etc ...)
-     (fold-ec x0 (nested q1 ... q) etc1 etc2 etc ...) )
-    ((fold-ec x0 q1 q2 etc1 etc2 etc ...)
-     (fold-ec x0 (nested q1 q2) etc1 etc2 etc ...) )
-    ((fold-ec x0 expression f2)
-     (fold-ec x0 (nested) expression f2) )
-
-    ((fold-ec x0 qualifier expression f2)
-     (let ((result x0))
-       (do-ec qualifier (set! result (f2 expression result)))
-       result ))))
-
-
-; ==========================================================================
-; The comprehensions list-ec string-ec vector-ec etc.
-; ==========================================================================
-
-(define-syntax list-ec
-  (syntax-rules ()
-    ((list-ec etc1 etc ...)
-     (reverse (fold-ec '() etc1 etc ... cons)) )))
-
-; Alternative: Reverse can safely be replaced by reverse! if you have it.
-;
-; Alternative: It is possible to construct the result in the correct order
-;   using set-cdr! to add at the tail. This removes the overhead of copying
-;   at the end, at the cost of more book-keeping.
-
-
-(define-syntax append-ec
-  (syntax-rules ()
-    ((append-ec etc1 etc ...)
-     (apply append (list-ec etc1 etc ...)) )))
-
-(define-syntax string-ec
-  (syntax-rules ()
-    ((string-ec etc1 etc ...)
-     (list->string (list-ec etc1 etc ...)) )))
-
-; Alternative: For very long strings, the intermediate list may be a
-;   problem. A more space-aware implementation collect the characters 
-;   in an intermediate list and when this list becomes too large it is
-;   converted into an intermediate string. At the end, the intermediate
-;   strings are concatenated with string-append.
-
-
-(define-syntax string-append-ec
-  (syntax-rules ()
-    ((string-append-ec etc1 etc ...)
-     (apply string-append (list-ec etc1 etc ...)) )))
-
-(define-syntax vector-ec
-  (syntax-rules ()
-    ((vector-ec etc1 etc ...)
-     (list->vector (list-ec etc1 etc ...)) )))
-
-; Comment: A similar approach as for string-ec can be used for vector-ec.
-;   However, the space overhead for the intermediate list is much lower
-;   than for string-ec and as there is no vector-append, the intermediate
-;   vectors must be copied explicitly.
-
-(define-syntax vector-of-length-ec
-  (syntax-rules (nested)
-    ((vector-of-length-ec k (nested q1 ...) q etc1 etc ...)
-     (vector-of-length-ec k (nested q1 ... q) etc1 etc ...) )
-    ((vector-of-length-ec k q1 q2             etc1 etc ...)
-     (vector-of-length-ec k (nested q1 q2)    etc1 etc ...) )
-    ((vector-of-length-ec k expression)
-     (vector-of-length-ec k (nested) expression) )
-
-    ((vector-of-length-ec k qualifier expression)
-     (let ((len k))
-       (let ((vec (make-vector len))
-             (i 0) )
-         (do-ec qualifier
-                (if (< i len)
-                    (begin (vector-set! vec i expression)
-                           (set! i (+ i 1)) )
-                    (error "vector is too short for the comprehension") ))
-         (if (= i len)
-             vec
-             (error "vector is too long for the comprehension") ))))))
-
-
-(define-syntax sum-ec
-  (syntax-rules ()
-    ((sum-ec etc1 etc ...)
-     (fold-ec (+) etc1 etc ... +) )))
-
-(define-syntax product-ec
-  (syntax-rules ()
-    ((product-ec etc1 etc ...)
-     (fold-ec (*) etc1 etc ... *) )))
-
-(define-syntax min-ec
-  (syntax-rules ()
-    ((min-ec etc1 etc ...)
-     (fold3-ec (min) etc1 etc ... min min) )))
-
-(define-syntax max-ec
-  (syntax-rules ()
-    ((max-ec etc1 etc ...)
-     (fold3-ec (max) etc1 etc ... max max) )))
-
-(define-syntax last-ec
-  (syntax-rules (nested)
-    ((last-ec default (nested q1 ...) q etc1 etc ...)
-     (last-ec default (nested q1 ... q) etc1 etc ...) )
-    ((last-ec default q1 q2             etc1 etc ...)
-     (last-ec default (nested q1 q2)    etc1 etc ...) )
-    ((last-ec default expression)
-     (last-ec default (nested) expression) )
-
-    ((last-ec default qualifier expression)
-     (let ((result default))
-       (do-ec qualifier (set! result expression))
-       result ))))
-
-
-; ==========================================================================
-; The fundamental early-stopping comprehension first-ec
-; ==========================================================================
-
-(define-syntax first-ec
-  (syntax-rules (nested)
-    ((first-ec default (nested q1 ...) q etc1 etc ...)
-     (first-ec default (nested q1 ... q) etc1 etc ...) )
-    ((first-ec default q1 q2             etc1 etc ...)
-     (first-ec default (nested q1 q2)    etc1 etc ...) )
-    ((first-ec default expression)
-     (first-ec default (nested) expression) )
-
-    ((first-ec default qualifier expression)
-     (let ((result default) (stop #f))
-       (ec-guarded-do-ec 
-         stop 
-         (nested qualifier)
-         (begin (set! result expression)
-                (set! stop #t) ))
-       result ))))
-
-; (ec-guarded-do-ec stop (nested q ...) cmd)
-;   constructs (do-ec q ... cmd) where the generators gen in q ... are
-;   replaced by (:until gen stop).
-
-(define-syntax-globally ec-guarded-do-ec
-  (syntax-rules (nested if base-if not and or begin)
-
-    ((ec-guarded-do-ec stop (nested (nested q1 ...) q2 ...) cmd)
-     (ec-guarded-do-ec stop (nested q1 ... q2 ...) cmd) )
-
-    ((ec-guarded-do-ec stop (nested (if test) q ...) cmd)
-     (if test (ec-guarded-do-ec stop (nested q ...) cmd)) )
-    ((ec-guarded-do-ec stop (nested (base-if test) q ...) cmd)
-     (if test (ec-guarded-do-ec stop (nested q ...) cmd)) )
-    ((ec-guarded-do-ec stop (nested (not test) q ...) cmd)
-     (if (not test) (ec-guarded-do-ec stop (nested q ...) cmd)) )
-    ((ec-guarded-do-ec stop (nested (and test ...) q ...) cmd)
-     (if (and test ...) (ec-guarded-do-ec stop (nested q ...) cmd)) )
-    ((ec-guarded-do-ec stop (nested (or test ...) q ...) cmd)
-     (if (or test ...) (ec-guarded-do-ec stop (nested q ...) cmd)) )
-
-    ((ec-guarded-do-ec stop (nested (begin etc ...) q ...) cmd)
-     (begin etc ... (ec-guarded-do-ec stop (nested q ...) cmd)) )
-
-    ((ec-guarded-do-ec stop (nested gen q ...) cmd)
-     (do-ec 
-       (:until gen stop) 
-       (ec-guarded-do-ec stop (nested q ...) cmd) ))
-
-    ((ec-guarded-do-ec stop (nested) cmd)
-     (do-ec cmd) )))
-
-; Alternative: Instead of modifying the generator with :until, it is
-;   possible to use call-with-current-continuation:
-;
-;   (define-synatx first-ec 
-;     ...same as above...
-;     ((first-ec default qualifier expression)
-;      (call-with-current-continuation 
-;       (lambda (cc)
-;        (do-ec qualifier (cc expression))
-;        default ))) ))
-;
-;   This is much simpler but not necessarily as efficient.
-
-
-; ==========================================================================
-; The early-stopping comprehensions any?-ec every?-ec
-; ==========================================================================
-
-(define-syntax any?-ec
-  (syntax-rules (nested)
-    ((any?-ec (nested q1 ...) q etc1 etc ...)
-     (any?-ec (nested q1 ... q) etc1 etc ...) )
-    ((any?-ec q1 q2             etc1 etc ...)
-     (any?-ec (nested q1 q2)    etc1 etc ...) )
-    ((any?-ec expression)
-     (any?-ec (nested) expression) )
-
-    ((any?-ec qualifier expression)
-     (first-ec #f qualifier (if expression) #t) )))
-
-(define-syntax every?-ec
-  (syntax-rules (nested)
-    ((every?-ec (nested q1 ...) q etc1 etc ...)
-     (every?-ec (nested q1 ... q) etc1 etc ...) )
-    ((every?-ec q1 q2             etc1 etc ...)
-     (every?-ec (nested q1 q2)    etc1 etc ...) )
-    ((every?-ec expression)
-     (every?-ec (nested) expression) )
-
-    ((every?-ec qualifier expression)
-     (first-ec #t qualifier (if (not expression)) #f) )))
-
-; ec.scm with 'define-syntax-globally ends here ----------------------------
-) ; close the module
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/42ref/examples-42.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/42ref/examples-42.rkt
deleted file mode 100644
index 60324079ee..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/42ref/examples-42.rkt
+++ /dev/null
@@ -1,673 +0,0 @@
-; Examples for SRFI 42 as a module to PLT 204 ------------------------------
-; sebastian_egner@yahoo.com, 26-Dec-2007, PLT 371.
-;   + check fix for bugs found by sunnan and jens axel soegaard
-; Sebastian.Egner@philips.com, 7-July-2003, PLT 204.
-; For running the demos: (require srfi/42/examples-42)
-; For anything else: http://srfi.schemers.org/srfi-42/
-
-(module |examples-42| mzscheme
-
-  (require srfi/42)
-
-  (define (my-open-output-file filename)
-    (open-output-file (build-path (find-system-path 'temp-dir) filename) 'replace 'text) )
-
-  (define (my-call-with-input-file filename thunk)
-    (call-with-input-file (build-path (find-system-path 'temp-dir) filename) thunk 'text) )
-
-; examples.scm starts here -------------------------------------------------
-
-; <PLAINTEXT>
-; Examples for Eager Comprehensions in [outer..inner|expr]-Convention
-; ===================================================================
-;
-; sebastian.egner@philips.com, Eindhoven, The Netherlands, Feb-2003.
-; Scheme R5RS (incl. macros), SRFI-23 (error).
-; 
-; Running the examples in Scheme48 (version 0.57):
-;   ,open srfi-23
-;   ,load ec.scm
-;   (define my-open-output-file open-output-file)
-;   (define my-call-with-input-file call-with-input-file)
-;   ,load examples.scm
-;
-; Running the examples in PLT/DrScheme (version 202): 
-;   ; open "ec.scm", click Execute
-;   (define (my-open-output-file filename)
-;     (open-output-file filename 'replace 'text) )
-;   (define (my-call-with-input-file filename thunk)
-;     (call-with-input-file filename thunk 'text) )
-;   (load "examples.scm")
-;
-; Running the examples in PLT/DrScheme (version 204): 
-;   (require srfi/42-examples)
-;
-; Running the examples in SCM (version 5d7):
-;   (require 'macro) (require 'record)
-;   (load "ec.scm")
-;   (define my-open-output-file open-output-file)
-;   (define my-call-with-input-file call-with-input-file)
-;   (load "examples.scm")
-
-
-; Tools for checking results
-; ==========================
-
-(define (my-equal? x y)
-  (cond
-   ((or (boolean? x) 
-        (null? x)
-        (symbol? x) 
-        (char? x) 
-        (input-port? x)
-        (output-port? x) )
-    (eqv? x y) )
-   ((string? x)
-    (and (string? y) (string=? x y)) )
-   ((vector? x)
-    (and (vector? y)
-         (my-equal? (vector->list x) (vector->list y)) ))
-   ((pair? x)
-    (and (pair? y)
-         (my-equal? (car x) (car y))
-         (my-equal? (cdr x) (cdr y)) ))
-   ((real? x)
-    (and (real? y)
-         (eqv? (exact? x) (exact? y))
-         (if (exact? x)
-             (= x y)
-             (< (abs (- x y)) (/ 1 (expt 10 6))) ))) ; will do here
-   (else
-    (error "unrecognized type" x) )))
-
-(define my-check-correct 0)
-(define my-check-wrong   0)
-
-(define-syntax my-check
-  (syntax-rules (=>)
-    ((my-check ec => desired-result)
-     (begin
-       (newline)
-       (write (quote ec))
-       (newline)
-       (let ((actual-result ec))
-         (display "  => ")
-         (write actual-result)
-         (if (my-equal? actual-result desired-result)
-             (begin
-               (display " ; correct")
-               (set! my-check-correct (+ my-check-correct 1)) )
-             (begin
-               (display " ; *** wrong ***, desired result:")
-               (newline)
-               (display "  => ")
-               (write desired-result)
-               (set! my-check-wrong (+ my-check-wrong 1)) ))
-         (newline) )))))
-             
-
-; ==========================================================================
-; do-ec 
-; ==========================================================================
-
-(my-check 
-  (let ((x 0)) (do-ec (set! x (+ x 1))) x) 
-  => 1)
-
-(my-check 
-  (let ((x 0)) (do-ec (:range i 10) (set! x (+ x 1))) x) 
-  => 10)
-
-(my-check 
-  (let ((x 0)) (do-ec (:range n 10) (:range k n) (set! x (+ x 1))) x) 
-  => 45)
-
-
-; ==========================================================================
-; list-ec and basic qualifiers 
-; ==========================================================================
-
-(my-check (list-ec 1) => '(1))
-
-(my-check (list-ec (:range i 4) i) => '(0 1 2 3))
-
-(my-check (list-ec (:range n 3) (:range k (+ n 1)) (list n k)) 
-  => '((0 0) (1 0) (1 1) (2 0) (2 1) (2 2)) )
-
-(my-check 
-  (list-ec (:range n 5) (if (even? n)) (:range k (+ n 1)) (list n k)) 
-  => '((0 0) (2 0) (2 1) (2 2) (4 0) (4 1) (4 2) (4 3) (4 4)) )
-
-
-(my-check 
-  (list-ec (:range n 5) (not (even? n)) (:range k (+ n 1)) (list n k)) 
-  => '((1 0) (1 1) (3 0) (3 1) (3 2) (3 3)) )
-
-(my-check
-  (list-ec (:range n 5) 
-           (and (even? n) (> n 2)) 
-           (:range k (+ n 1)) 
-           (list n k) )
-  => '((4 0) (4 1) (4 2) (4 3) (4 4)) )
-
-(my-check
-  (list-ec (:range n 5) 
-           (or (even? n) (> n 3)) 
-           (:range k (+ n 1)) 
-           (list n k) )
-  => '((0 0) (2 0) (2 1) (2 2) (4 0) (4 1) (4 2) (4 3) (4 4)) )
-
-(my-check
- (let ((x 0)) (list-ec (:range n 10) (begin (set! x (+ x 1))) n) x)
- => 10 )
-
-(my-check
- (list-ec (nested (:range n 3) (:range k n)) k)
- => '(0 0 1) )
-
-
-; ==========================================================================
-; Other comprehensions
-; ==========================================================================
-
-(my-check (append-ec '(a b)) => '(a b))
-(my-check (append-ec (:range i 0) '(a b)) => '())
-(my-check (append-ec (:range i 1) '(a b)) => '(a b))
-(my-check (append-ec (:range i 2) '(a b)) => '(a b a b))
-
-(my-check (string-ec #\a) => (string #\a))
-(my-check (string-ec (:range i 0) #\a) => "")
-(my-check (string-ec (:range i 1) #\a) => "a")
-(my-check (string-ec (:range i 2) #\a) => "aa")
-
-(my-check (string-append-ec "ab") => "ab")
-(my-check (string-append-ec (:range i 0) "ab") => "")
-(my-check (string-append-ec (:range i 1) "ab") => "ab")
-(my-check (string-append-ec (:range i 2) "ab") => "abab")
-
-(my-check (vector-ec 1) => (vector 1))
-(my-check (vector-ec (:range i 0) i) => (vector))
-(my-check (vector-ec (:range i 1) i) => (vector 0))
-(my-check (vector-ec (:range i 2) i) => (vector 0 1))
-
-(my-check (vector-of-length-ec 1 1) => (vector 1))
-(my-check (vector-of-length-ec 0 (:range i 0) i) => (vector))
-(my-check (vector-of-length-ec 1 (:range i 1) i) => (vector 0))
-(my-check (vector-of-length-ec 2 (:range i 2) i) => (vector 0 1))
-
-(my-check (sum-ec 1) => 1)
-(my-check (sum-ec (:range i 0) i) => 0)
-(my-check (sum-ec (:range i 1) i) => 0)
-(my-check (sum-ec (:range i 2) i) => 1)
-(my-check (sum-ec (:range i 3) i) => 3)
-
-(my-check (product-ec 1) => 1)
-(my-check (product-ec (:range i 1 0) i) => 1)
-(my-check (product-ec (:range i 1 1) i) => 1)
-(my-check (product-ec (:range i 1 2) i) => 1)
-(my-check (product-ec (:range i 1 3) i) => 2)
-(my-check (product-ec (:range i 1 4) i) => 6)
-
-(my-check (min-ec 1) => 1)
-(my-check (min-ec (:range i 1) i) => 0)
-(my-check (min-ec (:range i 2) i) => 0)
-
-(my-check (max-ec 1) => 1)
-(my-check (max-ec (:range i 1) i) => 0)
-(my-check (max-ec (:range i 2) i) => 1)
-
-(my-check (first-ec #f 1) => 1)
-(my-check (first-ec #f (:range i 0) i) => #f)
-(my-check (first-ec #f (:range i 1) i) => 0)
-(my-check (first-ec #f (:range i 2) i) => 0)
-
-(my-check 
-  (let ((last-i -1))
-    (first-ec #f (:range i 10) (begin (set! last-i i)) i)
-    last-i )
-  => 0 )
-
-(my-check (last-ec #f 1) => 1)
-(my-check (last-ec #f (:range i 0) i) => #f)
-(my-check (last-ec #f (:range i 1) i) => 0)
-(my-check (last-ec #f (:range i 2) i) => 1)
-
-(my-check (any?-ec #f) => #f)
-(my-check (any?-ec #t) => #t)
-(my-check (any?-ec (:range i 2 2) (even? i)) => #f)
-(my-check (any?-ec (:range i 2 3) (even? i)) => #t)
-
-(my-check (every?-ec #f) => #f)
-(my-check (every?-ec #t) => #t)
-(my-check (every?-ec (:range i 2 2) (even? i)) => #t)
-(my-check (every?-ec (:range i 2 3) (even? i)) => #t)
-(my-check (every?-ec (:range i 2 4) (even? i)) => #f)
-
-(my-check 
- (let ((sum-sqr (lambda (x result) (+ result (* x x)))))
-   (fold-ec 0 (:range i 10) i sum-sqr) )
- => 285 )
-
-(my-check 
- (let ((minus-1 (lambda (x) (- x 1)))
-       (sum-sqr (lambda (x result) (+ result (* x x)))))
-   (fold3-ec (error "wrong") (:range i 10) i minus-1 sum-sqr) )
- => 284 )
-
-(my-check 
- (fold3-ec 'infinity (:range i 0) i min min)
- => 'infinity )
-
-
-; ==========================================================================
-; Typed generators
-; ==========================================================================
-
-(my-check (list-ec (:list x '()) x) => '())
-(my-check (list-ec (:list x '(1)) x) => '(1))
-(my-check (list-ec (:list x '(1 2 3)) x) => '(1 2 3))
-(my-check (list-ec (:list x '(1) '(2)) x) => '(1 2))
-(my-check (list-ec (:list x '(1) '(2) '(3)) x) => '(1 2 3))
-
-(my-check (list-ec (:string c "") c) => '())
-(my-check (list-ec (:string c "1") c) => '(#\1))
-(my-check (list-ec (:string c "123") c) => '(#\1 #\2 #\3))
-(my-check (list-ec (:string c "1" "2") c) => '(#\1 #\2))
-(my-check (list-ec (:string c "1" "2" "3") c) => '(#\1 #\2 #\3))
-
-(my-check (list-ec (:vector x (vector)) x) => '())
-(my-check (list-ec (:vector x (vector 1)) x) => '(1))
-(my-check (list-ec (:vector x (vector 1 2 3)) x) => '(1 2 3))
-(my-check (list-ec (:vector x (vector 1) (vector 2)) x) => '(1 2))
-(my-check 
- (list-ec (:vector x (vector 1) (vector 2) (vector 3)) x)
- => '(1 2 3))
-
-(my-check (list-ec (:range x -2) x) => '())
-(my-check (list-ec (:range x -1) x) => '())
-(my-check (list-ec (:range x  0) x) => '())
-(my-check (list-ec (:range x  1) x) => '(0))
-(my-check (list-ec (:range x  2) x) => '(0 1))
-
-(my-check (list-ec (:range x  0  3) x) => '(0 1 2))
-(my-check (list-ec (:range x  1  3) x) => '(1 2))
-(my-check (list-ec (:range x -2 -1) x) => '(-2))
-(my-check (list-ec (:range x -2 -2) x) => '())
-
-(my-check (list-ec (:range x 1 5  2) x) => '(1 3))
-(my-check (list-ec (:range x 1 6  2) x) => '(1 3 5))
-(my-check (list-ec (:range x 5 1 -2) x) => '(5 3))
-(my-check (list-ec (:range x 6 1 -2) x) => '(6 4 2))
-
-(my-check (list-ec (:real-range x 0.0 3.0)     x) => '(0. 1. 2.))
-(my-check (list-ec (:real-range x 0   3.0)     x) => '(0. 1. 2.))
-(my-check (list-ec (:real-range x 0   3   1.0) x) => '(0. 1. 2.))
-
-(my-check 
- (string-ec (:char-range c #\a #\z) c) 
- => "abcdefghijklmnopqrstuvwxyz" )
-
-(my-check 
- (begin
-   (let ((f (my-open-output-file "tmp1")))
-     (do-ec (:range n 10) (begin (write n f) (newline f)))
-     (close-output-port f))
-   (my-call-with-input-file "tmp1"
-    (lambda (port) (list-ec (:port x port read) x)) ))
- => (list-ec (:range n 10) n) )
-
-(my-check 
- (begin
-   (let ((f (my-open-output-file "tmp1")))
-     (do-ec (:range n 10) (begin (write n f) (newline f)))
-     (close-output-port f))
-   (my-call-with-input-file "tmp1"                 
-     (lambda (port) (list-ec (:port x port) x)) ))
- => (list-ec (:range n 10) n) )
-
-
-; ==========================================================================
-; The special generators :do :let :parallel :while :until
-; ==========================================================================
-
-(my-check (list-ec (:do ((i 0)) (< i 4) ((+ i 1))) i) => '(0 1 2 3))
-
-(my-check 
- (list-ec 
-  (:do (let ((x 'x)))
-       ((i 0)) 
-       (< i 4) 
-       (let ((j (- 10 i))))
-       #t
-       ((+ i 1)) )
-  j )
- => '(10 9 8 7) )
-
-(my-check (list-ec (:let x 1) x) => '(1))
-(my-check (list-ec (:let x 1) (:let y (+ x 1)) y) => '(2))
-(my-check (list-ec (:let x 1) (:let x (+ x 1)) x) => '(2))
-
-(my-check 
- (list-ec (:parallel (:range i 1 10) (:list x '(a b c))) (list i x))
- => '((1 a) (2 b) (3 c)) )
-
-
-(my-check 
- (list-ec (:while (:range i 1 10) (< i 5)) i)
- => '(1 2 3 4) )
-
-(my-check 
- (list-ec (:until (:range i 1 10) (>= i 5)) i)
- => '(1 2 3 4 5) )
-
-; with generator that might use inner bindings
-
-(my-check
- (list-ec (:while (:list i '(1 2 3 4 5 6 7 8 9)) (< i 5)) i)
- => '(1 2 3 4) )
-; Was broken in original reference implementation as pointed
-; out by sunnan@handgranat.org on 24-Apr-2005 comp.lang.scheme.
-; Refer to http://groups-beta.google.com/group/comp.lang.scheme/
-; browse_thread/thread/f5333220eaeeed66/75926634cf31c038#75926634cf31c038
-
-(my-check 
- (list-ec (:until (:list i '(1 2 3 4 5 6 7 8 9)) (>= i 5)) i)
- => '(1 2 3 4 5) )
-
-(my-check
- (list-ec (:while (:vector x (index i) '#(1 2 3 4 5))
-		  (< x 10))
-	  x)
- => '(1 2 3 4 5))
-; Was broken in reference implementation, even after fix for the
-; bug reported by Sunnan, as reported by Jens-Axel Soegaard on
-; 4-Jun-2007.
-
-; combine :while/:until and :parallel
-
-(my-check
- (list-ec (:while (:parallel (:range i 1 10)
-                             (:list j '(1 2 3 4 5 6 7 8 9)))
-                  (< i 5))
-          (list i j))
- => '((1 1) (2 2) (3 3) (4 4)))
-
-(my-check
- (list-ec (:until (:parallel (:range i 1 10)
-                             (:list j '(1 2 3 4 5 6 7 8 9)))
-                  (>= i 5))
-          (list i j))
- => '((1 1) (2 2) (3 3) (4 4) (5 5)))
-
-; check that :while/:until really stop the generator
-
-(my-check
- (let ((n 0))
-   (do-ec (:while (:range i 1 10) (begin (set! n (+ n 1)) (< i 5)))
-          (if #f #f))
-   n)
- => 5)
-
-(my-check
- (let ((n 0))
-   (do-ec (:until (:range i 1 10) (begin (set! n (+ n 1)) (>= i 5)))
-          (if #f #f))
-   n)
- => 5)
-
-(my-check
- (let ((n 0))
-   (do-ec (:while (:parallel (:range i 1 10)
-                             (:do () (begin (set! n (+ n 1)) #t) ()))
-                  (< i 5))
-          (if #f #f))
-   n)
- => 5)
-
-(my-check
- (let ((n 0))
-   (do-ec (:until (:parallel (:range i 1 10)
-                             (:do () (begin (set! n (+ n 1)) #t) ()))
-                  (>= i 5))
-          (if #f #f))
-   n)
- => 5)
-
-; ==========================================================================
-; The dispatching generator
-; ==========================================================================
-
-(my-check (list-ec (: c '(a b)) c) => '(a b))
-(my-check (list-ec (: c '(a b) '(c d)) c) => '(a b c d))
-
-(my-check (list-ec (: c "ab") c) => '(#\a #\b))
-(my-check (list-ec (: c "ab" "cd") c) => '(#\a #\b #\c #\d))
-
-(my-check (list-ec (: c (vector 'a 'b)) c) => '(a b))
-(my-check (list-ec (: c (vector 'a 'b) (vector 'c)) c) => '(a b c))
-
-(my-check (list-ec (: i 0) i) => '())
-(my-check (list-ec (: i 1) i) => '(0))
-(my-check (list-ec (: i 10) i) => '(0 1 2 3 4 5 6 7 8 9))
-(my-check (list-ec (: i 1 2) i) => '(1))
-(my-check (list-ec (: i 1 2 3) i) => '(1))
-(my-check (list-ec (: i 1 9 3) i) => '(1 4 7))
-
-(my-check (list-ec (: i 0.0 1.0 0.2) i) => '(0. 0.2 0.4 0.6 0.8))
-
-(my-check (list-ec (: c #\a #\c) c) => '(#\a #\b #\c))
-
-(my-check 
- (begin
-   (let ((f (my-open-output-file "tmp1")))
-     (do-ec (:range n 10) (begin (write n f) (newline f)))
-     (close-output-port f))
-   (my-call-with-input-file "tmp1"                 
-     (lambda (port) (list-ec (: x port read) x)) ))
- => (list-ec (:range n 10) n) )
-    
-(my-check 
- (begin
-   (let ((f (my-open-output-file "tmp1")))
-     (do-ec (:range n 10) (begin (write n f) (newline f)))
-     (close-output-port f))
-   (my-call-with-input-file "tmp1"                 
-     (lambda (port) (list-ec (: x port) x)) ))
- => (list-ec (:range n 10) n) )
-
-
-; ==========================================================================
-; With index variable
-; ==========================================================================
-
-(my-check (list-ec (:list c (index i) '(a b)) (list c i)) => '((a 0) (b 1)))
-(my-check (list-ec (:string c (index i) "a") (list c i)) => '((#\a 0)))
-(my-check (list-ec (:vector c (index i) (vector 'a)) (list c i)) => '((a 0)))
-
-(my-check 
- (list-ec (:range i (index j) 0 -3 -1) (list i j)) 
- => '((0 0) (-1 1) (-2 2)) )
-
-(my-check 
- (list-ec (:real-range i (index j) 0 1 0.2) (list i j)) 
- => '((0. 0) (0.2 1) (0.4 2) (0.6 3) (0.8 4)) )
-
-(my-check 
- (list-ec (:char-range c (index i) #\a #\c) (list c i)) 
- => '((#\a 0) (#\b 1) (#\c 2)) )
-
-(my-check 
- (list-ec (: x (index i) '(a b c d)) (list x i))
- => '((a 0) (b 1) (c 2) (d 3)) )
-
-(my-check 
- (begin
-   (let ((f (my-open-output-file "tmp1")))
-     (do-ec (:range n 10) (begin (write n f) (newline f)))
-     (close-output-port f))
-   (my-call-with-input-file "tmp1"
-     (lambda (port) (list-ec (: x (index i) port) (list x i))) ))
- => '((0 0) (1 1) (2 2) (3 3) (4 4) (5 5) (6 6) (7 7) (8 8) (9 9)) )
-
-
-; ==========================================================================
-; The examples from the SRFI document
-; ==========================================================================
-
-; from Abstract
-
-(my-check (list-ec (: i 5) (* i i)) => '(0 1 4 9 16))
-
-(my-check 
-  (list-ec (: n 1 4) (: i n) (list n i)) 
-  => '((1 0) (2 0) (2 1) (3 0) (3 1) (3 2)) )
-
-; from Generators
-
-(my-check 
-  (list-ec (: x (index i) "abc") (list x i)) 
-  => '((#\a 0) (#\b 1) (#\c 2)) )
-
-(my-check
-  (list-ec (:string c (index i) "a" "b") (cons c i))
-  => '((#\a . 0) (#\b . 1)) )
-
-
-; ==========================================================================
-; Little Shop of Horrors
-; ==========================================================================
-
-(my-check (list-ec (:range x 5) (:range x x) x) => '(0 0 1 0 1 2 0 1 2 3))
-
-(my-check (list-ec (:list x '(2 "23" (4))) (: y x) y) => '(0 1 #\2 #\3 4))
-
-(my-check 
- (list-ec (:parallel (:integers x) 
-                     (:do ((i 10)) (< x i) ((- i 1))))
-          (list x i))
- => '((0 10) (1 9) (2 8) (3 7) (4 6)) )
-
-
-; ==========================================================================
-; Less artificial examples
-; ==========================================================================
-
-(define (factorial n) ; n * (n-1) * .. * 1 for n >= 0
-  (product-ec (:range k 2 (+ n 1)) k) )
-
-(my-check (factorial  0) => 1)
-(my-check (factorial  1) => 1)
-(my-check (factorial  3) => 6)
-(my-check (factorial  5) => 120)
-
-
-(define (eratosthenes n) ; primes in {2..n-1} for n >= 1
-  (let ((p? (make-string n #\1)))
-    (do-ec (:range k 2 n)
-           (if (char=? (string-ref p? k) #\1))
-           (:range i (* 2 k) n k)
-           (string-set! p? i #\0) )
-    (list-ec (:range k 2 n) (if (char=? (string-ref p? k) #\1)) k) ))
-
-(my-check 
- (eratosthenes 50)
- => '(2 3 5 7 11 13 17 19 23 29 31 37 41 43 47) )
-
-(my-check
- (length (eratosthenes 100000))
- => 9592 ) ; we expect 10^5/ln(10^5)
-
-
-(define (pythagoras n) ; a, b, c s.t. 1 <= a <= b <= c <= n, a^2 + b^2 = c^2
-  (list-ec 
-   (:let sqr-n (* n n))
-   (:range a 1 (+ n 1))
-; (begin (display a) (display " "))
-   (:let sqr-a (* a a))
-   (:range b a (+ n 1)) 
-   (:let sqr-c (+ sqr-a (* b b)))
-   (if (<= sqr-c sqr-n))
-   (:range c b (+ n 1))
-   (if (= (* c c) sqr-c))
-   (list a b c) ))
-           
-(my-check
- (pythagoras 15)
- => '((3 4 5) (5 12 13) (6 8 10) (9 12 15)) )
-
-(my-check
- (length (pythagoras 200))
- => 127 )
-
-
-(define (qsort xs) ; stable
-  (if (null? xs)
-      '()
-      (let ((pivot (car xs)) (xrest (cdr xs)))
-        (append
-         (qsort (list-ec (:list x xrest) (if (<  x pivot)) x))
-         (list pivot)
-         (qsort (list-ec (:list x xrest) (if (>= x pivot)) x)) ))))
-
-(my-check 
- (qsort '(1 5 4 2 4 5 3 2 1 3))
- => '(1 1 2 2 3 3 4 4 5 5) )
-
-
-(define (pi-BBP m) ; approx. of pi within 16^-m (Bailey-Borwein-Plouffe)
-  (sum-ec 
-    (:range n 0 (+ m 1))
-    (:let n8 (* 8 n))
-    (* (- (/ 4 (+ n8 1))
-          (+ (/ 2 (+ n8 4))
-             (/ 1 (+ n8 5))
-             (/ 1 (+ n8 6))))
-       (/ 1 (expt 16 n)) )))
-
-(my-check
- (pi-BBP 5)
- => (/ 40413742330349316707 12864093722915635200) )
-
-
-(define (my-read-line port) ; next line (incl. #\newline) of port
-  (let ((line
-         (string-ec 
-          (:until (:port c port read-char)
-                  (char=? c #\newline) )
-          c )))
-    (if (string=? line "")
-        (read-char port) ; eof-object
-        line )))
-
-(define (my-read-lines filename) ; list of all lines
-  (my-call-with-input-file 
-   filename
-   (lambda (port)
-     (list-ec (:port line port my-read-line) line) )))
-
-(my-check
- (begin
-   (let ((f (my-open-output-file "tmp1")))
-     (do-ec (:range n 10) (begin (write n f) (newline f)))
-     (close-output-port f))
-   (my-read-lines "tmp1") )
- => (list-ec (:char-range c #\0 #\9) (string c #\newline)) )
-
-
-; ==========================================================================
-; Summary
-; ==========================================================================
-
-(begin
-  (newline)
-  (newline)
-  (display "correct examples : ")
-  (display my-check-correct)
-  (newline)
-  (display "wrong examples   : ")
-  (display my-check-wrong)
-  (newline)
-  (newline) )
-
-; examples.scm ends here ---------------------------------------------------
-) ; end module
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/43.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/43.rkt
deleted file mode 100644
index 6e2dd25fd1..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/43.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-43
-#lang s-exp srfi/provider srfi/43/vector-lib #:unprefix s:
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/43/vector-lib.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/43/vector-lib.rkt
deleted file mode 100644
index 72ecd2ba7b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/43/vector-lib.rkt
+++ /dev/null
@@ -1,844 +0,0 @@
-;;; Copyright (C) 2005-2014 by Chongkai Zhu.
-;;; Distributed under the same terms as Racket, by permission.
-
-(module vector-lib mzscheme
-  
-  (require srfi/8/receive
-           mzlib/etc
-           mzlib/contract)
-  
-  (define mutable-vector/c
-    (and/c vector? (not/c immutable?)))
-  (define index/c
-    (and/c natural-number/c
-           exact?))
-  
-  (define (vec-start-end-contract vector?)
-    (case->
-     (-> vector? any)
-     (->r ((vec vector?)
-           (start (and/c index/c
-                         (<=/c (vector-length vec)))))
-          any)
-     (->pp ((vec vector?)
-            (start index/c)
-            (end index/c))
-           (<= start end (vector-length vec))
-           any)))
-  
-  ;;; (%SMALLEST-LENGTH <vector-list> <default-length>)
-  ;;;       -> exact, nonnegative integer
-  ;;;   Compute the smallest length of VECTOR-LIST.  DEFAULT-LENGTH is
-  ;;;   the length that is returned if VECTOR-LIST is empty.  Common use
-  ;;;   of this is in n-ary vector routines:
-  ;;;     (define (f vec . vectors)
-  (define (%smallest-length vector-list length)
-    (if (null? vector-list)
-        length
-        (%smallest-length (cdr vector-list)
-                          (min length
-                               (vector-length (car vector-list))))))
-  
-  (define (vectors-ref vectors i)
-    (map (lambda (v) (vector-ref v i)) vectors))
-  
-  ;;; from vector-unfold-right
-  (define (unfold1! f vec i seed)
-    (if (>= i 0)
-        (receive (elt new-seed)
-                 (f i seed)
-                 (vector-set! vec i elt)
-                 (unfold1! f vec (sub1 i) new-seed))))
-  
-  (define unfold-contract
-    (->r ((f (lambda (f)
-               (and (procedure? f)
-                    (procedure-arity-includes? f (add1 (length seeds))))))
-          (len index/c))
-         seeds list?
-         any))
-  
-  (define copy-contract
-    (case->
-     (-> vector? any)
-     (->r ((vec vector?)
-           (start (and/c index/c
-                         (<=/c (vector-length vec)))))
-          any)
-     (->r ((vec vector?)
-           (start (and/c index/c
-                         (<=/c (vector-length vec))))
-           (end (and/c index/c
-                       (>=/c start))))
-          any)
-     (->r ((vec vector?)
-           (start (and/c index/c
-                         (<=/c (vector-length vec))))
-           (end (and/c index/c
-                       (>=/c start)))
-           (fill any/c))
-          any)))
-  
-  (provide/contract (vector-unfold unfold-contract)
-                    (vector-unfold-right unfold-contract)
-                    (vector-copy copy-contract)
-                    (vector-reverse-copy (vec-start-end-contract vector?))
-                    (vector-append (->* () (listof vector?) any))
-                    (vector-concatenate (-> (listof vector?) any)))
-  
-  ;;; (VECTOR-UNFOLD <f> <length> <initial-seed> ...) -> vector
-  ;;;     (F <index> <seed> ...) -> [elt seed' ...]
-  ;;;   The fundamental vector constructor.  Creates a vector whose
-  ;;;   length is LENGTH and iterates across each index K between 0 and
-  ;;;   LENGTH, applying F at each iteration to the current index and the
-  ;;;   current seeds to receive N+1 values: first, the element to put in
-  ;;;   the Kth slot and then N new seeds for the next iteration.
-  (define vector-unfold
-    (letrec ((tabulate!                   ; Special zero-seed case.
-              (lambda (f vec i len)
-                (cond ((< i len)
-                       (vector-set! vec i (f i))
-                       (tabulate! f vec (add1 i) len)))))
-             (unfold1!                    ; Fast path for one seed.
-              (lambda (f vec i len seed)
-                (if (< i len)
-                    (receive (elt new-seed)
-                             (f i seed)
-                             (vector-set! vec i elt)
-                             (unfold1! f vec (add1 i) len new-seed)))))
-             (unfold2+!                   ; Slower variant for N seeds.
-              (lambda (f vec i len seeds)
-                (if (< i len)
-                    (receive (elt . new-seeds)
-                             (apply f i seeds)
-                             (vector-set! vec i elt)
-                             (unfold2+! f vec (add1 i) len new-seeds))))))
-      (lambda (f len . initial-seeds)
-        (let ((vec (make-vector len)))
-          (cond ((null? initial-seeds)
-                 (tabulate! f vec 0 len))
-                ((null? (cdr initial-seeds))
-                 (unfold1! f vec 0 len (car initial-seeds)))
-                (else
-                 (unfold2+! f vec 0 len initial-seeds)))
-          vec))))
-  
-  ;;; (VECTOR-UNFOLD-RIGHT <f> <length> <initial-seed> ...) -> vector
-  ;;;     (F <seed> ...) -> [seed' ...]
-  ;;;   Like VECTOR-UNFOLD, but it generates elements from LENGTH to 0
-  ;;;   (still exclusive with  LENGTH and inclusive with 0), not 0 to
-  ;;;   LENGTH as with VECTOR-UNFOLD.
-  (define vector-unfold-right
-    (letrec ((tabulate!
-              (lambda (f vec i)
-                (cond ((>= i 0)
-                       (vector-set! vec i (f i))
-                       (tabulate! f vec (sub1 i))))))
-             (unfold2+!
-              (lambda (f vec i seeds)
-                (if (>= i 0)
-                    (receive (elt . new-seeds)
-                             (apply f i seeds)
-                             (vector-set! vec i elt)
-                             (unfold2+! f vec (sub1 i) new-seeds))))))
-      (lambda (f len . initial-seeds)
-        (let ((vec (make-vector len))
-              (i (sub1 len)))
-          (cond ((null? initial-seeds)
-                 (tabulate! f vec i))
-                ((null? (cdr initial-seeds))
-                 (unfold1!  f vec i (car initial-seeds)))
-                (else
-                 (unfold2+! f vec i initial-seeds)))
-          vec))))
-  
-  ;;; (VECTOR-COPY <vector> [<start> <end> <fill>]) -> vector
-  ;;;   Create a newly allocated vector containing the elements from the
-  ;;;   range [START,END) in VECTOR.  START defaults to 0; END defaults
-  ;;;   to the length of VECTOR.  END may be greater than the length of
-  ;;;   VECTOR, in which case the vector is enlarged; if FILL is passed,
-  ;;;   the new locations from which there is no respective element in
-  ;;;   VECTOR are filled with FILL.
-  (define vector-copy
-    (opt-lambda (vec (start 0) (end (vector-length vec)) (fill 0))
-      (let ((new-vector
-             (make-vector (- end start) fill)))
-        (vector-copy! new-vector 0
-                      vec        start
-                      (min end (vector-length vec)))
-        new-vector)))
-  
-  ;;; (VECTOR-REVERSE-COPY <vector> [<start> <end>]) -> vector
-  ;;;   Create a newly allocated vector whose elements are the reversed
-  ;;;   sequence of elements between START and END in VECTOR.  START's
-  ;;;   default is 0; END's default is the length of VECTOR.
-  (define vector-reverse-copy
-    (opt-lambda (vec (start 0) (end (vector-length vec)))
-      (let ((new (make-vector (- end start))))
-        (vector-reverse-copy! new 0 vec start end)
-        new)))
-  
-  ;;; (VECTOR-APPEND <vector> ...) -> vector
-  ;;;   Append VECTOR ... into a newly allocated vector and return that
-  ;;;   new vector.
-  (define (vector-append . vectors)
-    (vector-concatenate vectors))
-  
-  ;;; (VECTOR-CONCATENATE <vector-list>) -> vector
-  ;;;   Concatenate the vectors in VECTOR-LIST.  This is equivalent to
-  ;;;     (apply vector-append VECTOR-LIST)
-  ;;; Actually, they're both implemented in terms of an internal routine.
-  (define vector-concatenate
-    (letrec ((compute-length
-              (lambda (vectors len)
-                (if (null? vectors)
-                    len
-                    (let ((vec (car vectors)))
-                      (compute-length (cdr vectors)
-                                      (+ (vector-length vec) len))))))
-             (concatenate!
-              (lambda (vectors target to)
-                (if (null? vectors)
-                    target
-                    (let* ((vec1 (car vectors))
-                           (len (vector-length vec1)))
-                      (vector-copy! target to vec1 0 len)
-                      (concatenate! (cdr vectors) target
-                                    (+ to len)))))))
-      (lambda (vectors)
-        (let ((new-vector
-               (make-vector (compute-length vectors 0))))
-          (concatenate! vectors new-vector 0)
-          new-vector))))
-  
-  (provide/contract (vector-empty?
-                     (-> vector? any))
-                    (vector=
-                     (->* ((-> any/c any/c any))
-                          (listof vector?)
-                          any)))
-  
-  ;;; (VECTOR-EMPTY? <vector>) -> boolean
-  ;;;   Return #T if VECTOR has zero elements in it, i.e. VECTOR's length
-  ;;;   is 0, and #F if not.
-  (define (vector-empty? vec)
-    (zero? (vector-length vec)))
-  
-  ;;; (VECTOR= <elt=?> <vector> ...) -> boolean
-  ;;;     (ELT=? <value> <value>) -> boolean
-  ;;;   Determine vector equality generalized across element comparators.
-  ;;;   Vectors A and B are equal iff their lengths are the same and for
-  ;;;   each respective elements E_a and E_b (element=? E_a E_b) returns
-  ;;;   a true value.  ELT=? is always applied to two arguments.  Element
-  ;;;   comparison must be consistent with EQ?; that is, if (eq? E_a E_b)
-  ;;;   results in a true value, then (ELEMENT=? E_a E_b) must result in a
-  ;;;   true value.  This may be exploited to avoid multiple unnecessary
-  ;;;   element comparisons.  (This implementation does, but does not deal
-  ;;;   with the situation that ELEMENT=? is EQ? to avoid more unnecessary
-  ;;;   comparisons, but I believe this optimization is probably fairly
-  ;;;   insignificant.)
-  ;;;   
-  ;;;   If the number of vector arguments is zero or one, then #T is
-  ;;;   automatically returned.  If there are N vector arguments,
-  ;;;   VECTOR_1 VECTOR_2 ... VECTOR_N, then VECTOR_1 & VECTOR_2 are
-  ;;;   compared; if they are equal, the vectors VECTOR_2 ... VECTOR_N
-  ;;;   are compared.  The precise order in which ELT=? is applied is not
-  ;;;   specified.
-  (define (vector= elt=? . vectors)
-    (or (null? vectors)
-        (null? (cdr vectors))
-        (let loop ((vecs vectors))
-          (let ((vec1 (car vecs))
-                (vec2+ (cdr vecs)))
-            (or (null? vec2+)
-                (and (binary-vector= elt=? vec1 (car vec2+))
-                     (loop vec2+)))))))
-  (define (binary-vector= elt=? vector-a vector-b)
-    (or (eq? vector-a vector-b)           ;+++
-        (let ((length-a (vector-length vector-a)))
-          (and (= length-a (vector-length vector-b))
-               (let loop ((i 0))
-                 (or (= i length-a)
-                     (and (elt=? (vector-ref vector-a i)
-                                 (vector-ref vector-b i))
-                          (loop (add1 i)))))))))
-  
-  (define fold-contract
-    (->r ((kons (lambda (f)
-                  (and (procedure? f)
-                       (procedure-arity-includes? f (+ 3 (length vec))))))
-          (knil any/c)
-          (vec1 vector?))
-         vec (listof vector?)
-         any))
-  
-  (define (map-contract m)
-    (->r ((f (lambda (f)
-               (and (procedure? f)
-                    (procedure-arity-includes? f (+ 2 (length vec))))))
-          (vec1 m))
-         vec (listof vector?)
-         any))
-  
-  (provide/contract (vector-fold fold-contract)
-                    (vector-fold-right fold-contract)
-                    (vector-map (map-contract vector?))
-                    (vector-map! (map-contract mutable-vector/c))
-                    (vector-for-each (map-contract vector?))
-                    (vector-count (map-contract vector?)))
-  
-  ;;; (VECTOR-FOLD <kons> <initial-knil> <vector> ...) -> knil
-  ;;;     (KONS <knil> <elt> ...) -> knil' ; N vectors -> N+1 args
-  ;;;   The fundamental vector iterator.  KONS is iterated over each
-  ;;;   index in all of the vectors in parallel, stopping at the end of
-  ;;;   the shortest; KONS is applied to an argument list of (list I
-  ;;;   STATE (vector-ref VEC I) ...), where STATE is the current state
-  ;;;   value -- the state value begins with KNIL and becomes whatever
-  ;;;   KONS returned at the respective iteration --, and I is the
-  ;;;   current index in the iteration.  The iteration is strictly left-
-  ;;;   to-right.
-  ;;;     (vector-fold KONS KNIL (vector E_1 E_2 ... E_N))
-  ;;;       <=>
-  ;;;     (KONS (... (KONS (KONS KNIL E_1) E_2) ... E_N-1) E_N)
-  (define (vector-fold kons knil vec . vectors)
-    (if (null? vectors)
-        (%vector-fold1 kons knil (vector-length vec) vec)
-        (%vector-fold2+ kons knil
-                        (%smallest-length vectors
-                                          (vector-length vec))
-                        (cons vec vectors))))
-  
-  (define %vector-fold1
-    (letrec ((loop (lambda (kons knil len vec i)
-                     (if (= i len)
-                         knil
-                         (loop kons
-                               (kons i knil (vector-ref vec i))
-                               len vec (add1 i))))))
-      (lambda (kons knil len vec)
-        (loop kons knil len vec 0))))
-  (define %vector-fold2+
-    (letrec ((loop (lambda (kons knil len vectors i)
-                     (if (= i len)
-                         knil
-                         (loop kons
-                               (apply kons i knil
-                                      (vectors-ref vectors i))
-                               len vectors (add1 i))))))
-      (lambda (kons knil len vectors)
-        (loop kons knil len vectors 0))))
-  
-  ;;; (VECTOR-COUNT <predicate?> <vector> ...)
-  ;;;       -> exact, nonnegative integer
-  ;;;     (PREDICATE? <index> <value> ...) ; N vectors -> N+1 args
-  ;;;   PREDICATE? is applied element-wise to the elements of VECTOR ...,
-  ;;;   and a count is tallied of the number of elements for which a
-  ;;;   true value is produced by PREDICATE?.  This count is returned.
-  (define (vector-count pred? vec . vectors)
-    (if (null? vectors)
-        (%vector-fold1 (lambda (index count elt)
-                         (if (pred? index elt)
-                             (add1 count)
-                             count))
-                       0
-                       (vector-length vec)
-                       vec)
-        (%vector-fold2+ (lambda (index count . elts)
-                          (if (apply pred? index elts)
-                              (add1 count)
-                              count))
-                        0
-                        (%smallest-length vectors
-                                          (vector-length vec))
-                        (cons vec vectors))))
-  
-  ;;; (VECTOR-FOLD-RIGHT <kons> <initial-knil> <vector> ...) -> knil
-  ;;;     (KONS <knil> <elt> ...) -> knil' ; N vectors => N+1 args
-  ;;;   The fundamental vector recursor.  Iterates in parallel across
-  ;;;   VECTOR ... right to left, applying KONS to the elements and the
-  ;;;   current state value; the state value becomes what KONS returns
-  ;;;   at each next iteration.  KNIL is the initial state value.
-  ;;;     (vector-fold-right KONS KNIL (vector E_1 E_2 ... E_N))
-  ;;;       <=>
-  ;;;     (KONS (... (KONS (KONS KNIL E_N) E_N-1) ... E_2) E_1)
-  ;;;
-  ;;; Not implemented in terms of a more primitive operations that might
-  ;;; called %VECTOR-FOLD-RIGHT due to the fact that it wouldn't be very
-  ;;; useful elsewhere.
-  (define vector-fold-right
-    (letrec ((loop1 (lambda (kons knil vec i)
-                      (if (zero? i)
-                          knil
-                          (let ((j (sub1 i)))
-                            (loop1 kons
-                                   (kons j knil (vector-ref vec j))
-                                   vec
-                                   j)))))
-             (loop2+ (lambda (kons knil vectors i)
-                       (if (zero? i)
-                           knil
-                           (let ((j (sub1 i)))
-                             (loop2+ kons
-                                     (apply kons j knil
-                                            (vectors-ref vectors j))
-                                     vectors
-                                     j))))))
-      (lambda (kons knil vec . vectors)
-        (if (null? vectors)
-            (loop1 kons knil vec (vector-length vec))
-            (loop2+ kons knil (cons vec vectors)
-                    (%smallest-length vectors
-                                      (vector-length vec)))))))
-  
-  ;;; (VECTOR-MAP <f> <vector> ...) -> vector
-  ;;;     (F <elt> ...) -> value ; N vectors -> N args
-  ;;;   Constructs a new vector of the shortest length of the vector
-  ;;;   arguments.  Each element at index I of the new vector is mapped
-  ;;;   from the old vectors by (F I (vector-ref VECTOR I) ...).  The
-  ;;;   dynamic order of application of F is unspecified.
-  (define (vector-map f vec . vectors)
-    (if (null? vectors)
-        (let ((len (vector-length vec)))
-          (%vector-map1! f (make-vector len) vec len))
-        (let ((len (%smallest-length vectors
-                                     (vector-length vec))))
-          (%vector-map2+! f (make-vector len)
-                          (cons vec vectors) len))))
-  
-  ;;; (%VECTOR-MAP1! <f> <target> <length> <vector>)
-  ;;;     (F <index> <elt>) -> elt'
-  (define (%vector-map1! f target vec i)
-    (if (zero? i)
-        target
-        (let ((j (sub1 i)))
-          (vector-set! target j
-                       (f j (vector-ref vec j)))
-          (%vector-map1! f target vec j))))
-  (define (%vector-map2+! f target vectors i)
-    (if (zero? i)
-        target
-        (let ((j (sub1 i)))
-          (vector-set! target j
-                       (apply f j (vectors-ref vectors j)))
-          (%vector-map2+! f target vectors j))))
-  
-  ;;; (VECTOR-MAP! <f> <vector> ...) -> vector
-  ;;;     (F <elt> ...) -> element' ; N vectors -> N args
-  ;;;   Similar to VECTOR-MAP, but rather than mapping the new elements
-  ;;;   into a new vector, the new mapped elements are destructively
-  ;;;   inserted into the first vector.  Again, the dynamic order of
-  ;;;   application of F is unspecified, so it is dangerous for F to
-  ;;;   manipulate the first VECTOR.
-  (define (vector-map! f vec . vectors)
-    (if (null? vectors)
-        (%vector-map1! f vec vec (vector-length vec))
-        (%vector-map2+! f vec (cons vec vectors)
-                        (%smallest-length vectors
-                                          (vector-length vec)))))
-  
-  ;;; (VECTOR-FOR-EACH <f> <vector> ...) -> void
-  ;;;     (F <elt> ...) ; N vectors -> N args
-  ;;;   Simple vector iterator: applies F to each index in the range [0,
-  ;;;   LENGTH), where LENGTH is the length of the smallest vector
-  ;;;   argument passed, and the respective element at that index.  In
-  ;;;   contrast with VECTOR-MAP, F is reliably applied to each
-  ;;;   subsequent elements, starting at index 0 from left to right, in
-  ;;;   the vectors.
-  (define vector-for-each
-    (letrec ((for-each1
-              (lambda (f vec i len)
-                (when (< i len)
-                  (f i (vector-ref vec i))
-                  (for-each1 f vec (add1 i) len))))
-             (for-each2+
-              (lambda (f vecs i len)
-                (when (< i len)
-                  (apply f i (vectors-ref vecs i))
-                  (for-each2+ f vecs (add1 i) len)))))
-      (lambda (f vec . vectors)
-        (if (null? vectors)
-            (for-each1 f vec 0 (vector-length vec))
-            (for-each2+ f (cons vec vectors) 0
-                        (%smallest-length vectors
-                                          (vector-length vec)))))))
-  
-  (define index-contract
-    (->r ((f (lambda (f)
-               (and (procedure? f)
-                    (procedure-arity-includes? f (add1 (length vec))))))
-          (vec1 vector?))
-         vec (listof vector?)
-         any))
-  
-  (provide/contract (vector-index index-contract)
-                    (vector-index-right index-contract)
-                    (vector-skip index-contract)
-                    (vector-skip-right index-contract)
-                    (vector-binary-search
-                     (-> vector? any/c
-                         (-> any/c any/c real?)
-                         any))
-                    (vector-any index-contract)
-                    (vector-every index-contract))
-  
-  ;; All the functions (except vector-binary-search) here can be 
-  ;; abstracted, but for performance I didn't do so.
-  
-  ;;; (VECTOR-INDEX <predicate?> <vector> ...)
-  ;;;       -> exact, nonnegative integer or #F
-  ;;;     (PREDICATE? <elt> ...) -> boolean ; N vectors -> N args
-  ;;;   Search left-to-right across VECTOR ... in parallel, returning the
-  ;;;   index of the first set of values VALUE ... such that (PREDICATE?
-  ;;;   VALUE ...) returns a true value; if no such set of elements is
-  ;;;   reached, return #F.
-  (define vector-index
-    (letrec ((loop1  (lambda (pred? vec len i)
-                       (cond ((= i len) #f)
-                             ((pred? (vector-ref vec i)) i)
-                             (else (loop1 pred? vec len (add1 i))))))
-             (loop2+ (lambda (pred? vectors len i)
-                       (cond ((= i len) #f)
-                             ((apply pred? (vectors-ref vectors i)) i)
-                             (else (loop2+ pred? vectors len (add1 i)))))))
-      (lambda (pred? vec . vectors)
-        (if (null? vectors)
-            (loop1 pred? vec (vector-length vec) 0)
-            (loop2+ pred? (cons vec vectors)
-                    (%smallest-length vectors
-                                      (vector-length vec))
-                    0)))))
-  
-  ;;; (VECTOR-SKIP <predicate?> <vector> ...)
-  ;;;       -> exact, nonnegative integer or #F
-  ;;;     (PREDICATE? <elt> ...) -> boolean ; N vectors -> N args
-  ;;;   (vector-index (lambda elts (not (apply PREDICATE? elts)))
-  ;;;                 VECTOR ...)
-  ;;;   Like VECTOR-INDEX, but find the index of the first set of values
-  ;;;   that do _not_ satisfy PREDICATE?.
-  (define vector-skip
-    (letrec ((loop1  (lambda (pred? vec len i)
-                       (cond ((= i len) #f)
-                             ((pred? (vector-ref vec i))
-                              (loop1 pred? vec len (add1 i)))
-                             (else i))))
-             (loop2+ (lambda (pred? vectors len i)
-                       (cond ((= i len) #f)
-                             ((apply pred? (vectors-ref vectors i))
-                              (loop2+ pred? vectors len (add1 i)))
-                             (else i)))))
-      (lambda (pred? vec . vectors)
-        (if (null? vectors)
-            (loop1 pred? vec (vector-length vec) 0)
-            (loop2+ pred? (cons vec vectors)
-                    (%smallest-length vectors
-                                      (vector-length vec))
-                    0)))))
-  
-  ;;; (VECTOR-INDEX-RIGHT <predicate?> <vector> ...)
-  ;;;       -> exact, nonnegative integer or #F
-  ;;;     (PREDICATE? <elt> ...) -> boolean ; N vectors -> N args
-  ;;;   Right-to-left variant of VECTOR-INDEX.
-  (define vector-index-right
-    (letrec ((loop1  (lambda (pred? vec i)
-                       (if (zero? i)
-                           #f
-                           (let ((i (sub1 i)))
-                             (if (pred? (vector-ref vec i))
-                                 i
-                                 (loop1 pred? vec i))))))
-             (loop2+ (lambda (pred? vectors i)
-                       (if (zero? i)
-                           #f
-                           (let ((i (sub1 i)))
-                             (if (apply pred? (vectors-ref vectors i))
-                                 i
-                                 (loop2+ pred? vectors i)))))))
-      (lambda (pred? vec . vectors)
-        (if (null? vectors)
-            (loop1 pred? vec (vector-length vec))
-            (loop2+ pred? (cons vec vectors)
-                    (%smallest-length vectors
-                                      (vector-length vec)))))))
-  
-  ;;; (VECTOR-SKIP-RIGHT <predicate?> <vector> ...)
-  ;;;       -> exact, nonnegative integer or #F
-  ;;;     (PREDICATE? <elt> ...) -> boolean ; N vectors -> N args
-  ;;;   Right-to-left variant of VECTOR-SKIP.
-  (define vector-skip-right
-    (letrec ((loop1  (lambda (pred? vec i)
-                       (if (zero? i)
-                           #f
-                           (let ((i (sub1 i)))
-                             (if (pred? (vector-ref vec i))
-                                 (loop1 pred? vec i)
-                                 i)))))
-             (loop2+ (lambda (pred? vectors i)
-                       (if (zero? i)
-                           #f
-                           (let ((i (sub1 i)))
-                             (if (apply pred? (vectors-ref vectors i))
-                                 (loop2+ pred? vectors i)
-                                 i))))))
-      (lambda (pred? vec . vectors)
-        (if (null? vectors)
-            (loop1 pred? vec (vector-length vec))
-            (loop2+ pred? (cons vec vectors)
-                    (%smallest-length vectors
-                                      (vector-length vec)))))))
-  
-  ;;; (VECTOR-BINARY-SEARCH <vector> <value> <cmp>)
-  ;;;       -> exact, nonnegative integer or #F
-  ;;;     (CMP <value1> <value2>) -> integer
-  ;;;       positive -> VALUE1 > VALUE2
-  ;;;       zero     -> VALUE1 = VALUE2
-  ;;;       negative -> VALUE1 < VALUE2
-  ;;;   Perform a binary search through VECTOR for VALUE, comparing each
-  ;;;   element to VALUE with CMP.
-  (define (vector-binary-search vec value cmp)
-    (let loop ((start 0)
-               (end (vector-length vec)))
-      (if (= start end)
-          #f
-          (let* ((i (quotient (+ start end) 2))
-                 (comparison (cmp (vector-ref vec i) value)))
-            (cond ((zero?     comparison) i)
-                  ((positive? comparison) (loop start i))
-                  (else                   (loop (add1 i) end)))))))
-  
-  ;;; (VECTOR-ANY <pred?> <vector> ...) -> value
-  ;;;   Apply PRED? to each parallel element in each VECTOR ...; if PRED?
-  ;;;   should ever return a true value, immediately stop and return that
-  ;;;   value; otherwise, when the shortest vector runs out, return #F.
-  ;;;   The iteration and order of application of PRED? across elements
-  ;;;   is of the vectors is strictly left-to-right.
-  (define vector-any
-    (letrec ((loop1 (lambda (pred? vec i len)
-                      (and (not (= i len))
-                           (or (pred? (vector-ref vec i))
-                               (loop1 pred? vec (add1 i) len)))))
-             (loop2+ (lambda (pred? vectors i len)
-                       (and (not (= i len))
-                            (or (apply pred? (vectors-ref vectors i))
-                                (loop2+ pred? vectors (add1 i) len))))))
-      (lambda (pred? vec . vectors)
-        (if (null? vectors)
-            (loop1 pred? vec 0 (vector-length vec))
-            (loop2+ pred? (cons vec vectors)
-                    0 (%smallest-length vectors
-                                        (vector-length vec)))))))
-  
-  ;;; (VECTOR-EVERY <pred?> <vector> ...) -> value
-  ;;;   Apply PRED? to each parallel value in each VECTOR ...; if PRED?
-  ;;;   should ever return #F, immediately stop and return #F; otherwise,
-  ;;;   if PRED? should return a true value for each element, stopping at
-  ;;;   the end of the shortest vector, return the last value that PRED?
-  ;;;   returned.  In the case that there is an empty vector, return #T.
-  ;;;   The iteration and order of application of PRED? across elements
-  ;;;   is of the vectors is strictly left-to-right.
-  (define vector-every
-    (letrec ((loop1 (lambda (pred? vec i len)
-                      (or (> i len)
-                          (if (= i len)
-                              (pred? (vector-ref vec i))
-                              (and (pred? (vector-ref vec i))
-                                   (loop1 pred? vec (add1 i) len))))))
-             (loop2+ (lambda (pred? vectors i len)
-                       (or (> i len)
-                           (if (= i len)
-                               (apply pred? (vectors-ref vectors i))
-                               (and (apply pred? (vectors-ref vectors i))
-                                    (loop2+ pred? vectors (add1 i) len)))))))
-      (lambda (pred? vec . vectors)
-        (if (null? vectors)
-            (loop1 pred? vec 0 (sub1 (vector-length vec)))
-            (loop2+ pred?
-                    (cons vec vectors)
-                    0
-                    (sub1
-                     (%smallest-length vectors
-                                       (vector-length vec))))))))
-  
-  (define copy!-contract
-    (case->
-     (->r ((target mutable-vector/c)
-           (tstart (and/c index/c
-                          (<=/c (- (vector-length target)
-                                   (vector-length source)))))
-           (source vector?))
-          any)
-     (->r ((target mutable-vector/c)
-           (tstart (and/c index/c
-                          (<=/c (- (vector-length target)
-                                   (- (vector-length source)
-                                      sstart)))))
-           (source vector?)
-           (sstart (and/c index/c
-                          (<=/c (vector-length source)))))
-          any)
-     (->pp ((target mutable-vector/c)
-            (tstart (and/c index/c
-                           (<=/c (- (vector-length target)
-                                    (- send sstart)))))
-            (source vector?)
-            (sstart index/c)
-            (send index/c))
-           (<= sstart send (vector-length source))
-           any)))
-  
-  (provide/contract (vector-swap!
-                     (->r ((vec mutable-vector/c)
-                           (i (and/c index/c
-                                     (</c (vector-length vec))))
-                           (j (and/c index/c
-                                     (</c (vector-length vec)))))
-                          any))
-                    (rename my-vector-fill! s:vector-fill!
-                            (case->
-                             (-> vector? any/c any)
-                             (->r ((vec vector?)
-                                   (fill any/c)
-                                   (start (and/c index/c
-                                                 (<=/c (vector-length vec)))))
-                                  any)
-                             (->pp ((vec vector?)
-                                    (fill any/c)
-                                    (start index/c)
-                                    (end index/c))
-                                   (<= start end (vector-length vec))
-                                   any)))
-                    (vector-reverse! (vec-start-end-contract mutable-vector/c))
-                    (vector-copy! copy!-contract)
-                    (vector-reverse-copy! copy!-contract))
-  
-  ;;; (VECTOR-SWAP! <vector> <index1> <index2>) -> void
-  ;;;   Swap the values in the locations at INDEX1 and INDEX2.
-  (define (vector-swap! vec i j)
-    (let ((x (vector-ref vec i)))
-      (vector-set! vec i (vector-ref vec j))
-      (vector-set! vec j x)))
-  
-  ;;; (VECTOR-FILL! <vector> <value> [<start> <end>]) -> <vector>
-  ;;;   [R5RS+] Fill the locations in VECTOR between START, whose default
-  ;;;   is 0, and END, whose default is the length of VECTOR, with VALUE.
-  ;;;
-  ;;; This one can probably be made really fast natively.
-  (define my-vector-fill!
-    (case-lambda
-      ((vec value)
-       (vector-fill! vec value))
-      ((vec value start)
-       (my-vector-fill! vec value start (vector-length vec)))
-      ((vec value start end)
-       (do ((i start (add1 i)))
-         ((= i end))
-         (vector-set! vec i value))
-       vec)))
-  
-  ;;; (VECTOR-REVERSE! <vector> [<start> <end>]) -> void
-  ;;;   Destructively reverse the contents of the sequence of locations
-  ;;;   in VECTOR between START, whose default is 0, and END, whose
-  ;;;   default is the length of VECTOR.
-  (define vector-reverse!
-    (letrec ((loop (lambda (vec i j)
-                     (when (< i j)
-                       (vector-swap! vec i j)
-                       (loop vec (add1 i) (sub1 j))))))
-      (opt-lambda (vec (start 0) (end (vector-length vec)))
-        (loop vec start (sub1 end)))))
-  
-  ;;; (VECTOR-COPY! <target> <tstart> <source> [<sstart> <send>])
-  ;;;       -> unspecified
-  ;;;   Copy the values in the locations in [SSTART,SEND) from SOURCE to
-  ;;;   to TARGET, starting at TSTART in TARGET.
-  (define vector-copy!
-    (letrec ((loop/l->r (lambda (target source send i j)
-                          (cond ((< i send)
-                                 (vector-set! target j
-                                              (vector-ref source i))
-                                 (loop/l->r target source send
-                                            (add1 i) (add1 j))))))
-             (loop/r->l (lambda (target source sstart i j)
-                          (cond ((>= i sstart)
-                                 (vector-set! target j
-                                              (vector-ref source i))
-                                 (loop/r->l target source sstart
-                                            (sub1 i) (sub1 j)))))))
-      (opt-lambda (target tstart source (sstart 0) (send (vector-length source)))
-        (if (> sstart tstart)             ; Make sure we don't copy over
-            ;   ourselves.
-            (loop/l->r target source send sstart tstart)
-            (loop/r->l target source sstart (sub1 send)
-                       (+ -1 tstart send (- sstart)))))))
-  
-  ;;; (VECTOR-REVERSE-COPY! <target> <tstart> <source> [<sstart> <send>])
-  (define vector-reverse-copy!
-    (letrec ((loop (lambda (target source sstart i j)
-                     (cond ((>= i sstart)
-                            (vector-set! target j (vector-ref source i))
-                            (loop target source sstart
-                                  (sub1 i)
-                                  (add1 j)))))))
-      (opt-lambda (target tstart source (sstart 0) (send (vector-length source)))
-        (cond ((and (eq? target source)
-                    (= sstart tstart))
-               (vector-reverse! target tstart send))
-              ((and (eq? target source)
-                    (or (between? sstart tstart send)
-                        (between? tstart sstart
-                                  (+ tstart (- send sstart)))))
-               ;an error in the reference implement here
-               (error 'vector-reverse-copy!
-                      "Vector range for self-copying overlaps"))
-              (else
-               (loop target source sstart
-                     (sub1 send)
-                     tstart))))))
-  
-  (define (between? x y z)
-    (and (<  x y)
-         (<= y z)))
-  
-  (provide/contract (rename my-vector->list s:vector->list
-                            (vec-start-end-contract vector?))
-                    (reverse-vector->list vec-start-end-contract)
-                    (reverse-list->vector (-> list? any)))
-  
-  ;;; (VECTOR->LIST <vector> [<start> <end>]) -> list
-  ;;;   [R5RS+] Produce a list containing the elements in the locations
-  ;;;   between START, whose default is 0, and END, whose default is the
-  ;;;   length of VECTOR, from VECTOR.
-  (define my-vector->list
-    (case-lambda
-      ((vec)
-       (vector->list vec)) ;+++
-      ((vec start)
-       (my-vector->list vec start (vector-length vec)))
-      ((vec start end)
-       (do ((i (sub1 end) (sub1 i))
-            (result '() (cons (vector-ref vec i) result)))
-         ((< i start) result)))))
-  
-  ;;; (REVERSE-VECTOR->LIST <vector> [<start> <end>]) -> list
-  ;;;   Produce a list containing the elements in the locations between
-  ;;;   START, whose default is 0, and END, whose default is the length
-  ;;;   of VECTOR, from VECTOR, in reverse order.
-  (define reverse-vector->list
-    (opt-lambda (vec (start 0) (end (vector-length vec)))
-      ;(unfold (lambda (i) (= i end))     ; No SRFI 1.
-      ;        (lambda (i) (vector-ref vec i))
-      ;        (lambda (i) (add1 i))
-      ;        start)
-      (do ((i start (add1 i))
-           (result '() (cons (vector-ref vec i) result)))
-        ((= i end) result))))
-  
-  ;;; (REVERSE-LIST->VECTOR <list> -> vector
-  ;;;   Produce a vector containing the elements in LIST in reverse order.
-  (define (reverse-list->vector lst)
-    (let* ((len (length lst))
-           (vec (make-vector len)))
-      (unfold1! (lambda (index l) (values (car l) (cdr l)))
-                vec
-                (sub1 len)
-                lst)
-      vec)))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/45.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/45.rkt
deleted file mode 100644
index 49c1eb0529..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/45.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-45
-#lang s-exp srfi/provider srfi/45/lazy
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/45/lazy.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/45/lazy.rkt
deleted file mode 100644
index ca98e70b39..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/45/lazy.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang scheme/base
-
-;; scheme/promise has srfi-45-style primitives
-(require scheme/promise)
-(provide delay lazy force
-         ;; Strictly speaking, this should be a procedure according to srfi-45.
-         ;; It's easy to make it one, but then it loses its ability to deal
-         ;; with multiple values (which the srfi completely ignores).
-         (rename-out [delay/strict eager]))
-
-;; TODO: there is a small difference between the primitives in srfi-45 and the
-;; ones provided by scheme/promise (the latter is a bit more permissive).  See
-;; "library approach" in scheme/promise and see the post-finalization
-;; discussion on the srfi-45 list.  I (Eli) showed at some point how the
-;; "language approach" primitives can be used to implement the other, and this
-;; needs to be done here too.
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/48.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/48.rkt
deleted file mode 100644
index 20e3574753..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/48.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-48
-#lang s-exp srfi/provider srfi/48/format #:unprefix s:
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/48/format.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/48/format.rkt
deleted file mode 100644
index 1f35f29827..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/48/format.rkt
+++ /dev/null
@@ -1,314 +0,0 @@
-; SRFI 48
-; Zhu Chongkai   mrmathematica@yahoo.com
-; 28-May-2005
-(module format mzscheme
-  
-  (require mzlib/pretty)
-  
-  (provide s:format)
-  
-  (define (s:format . args)
-    (cond
-      ((null? args)
-       (raise (make-exn:fail:contract:arity
-               "format: expects at least 1 argument, given 0"
-               (current-continuation-marks))))
-      ((string? (car args))
-       (apply s:format #f args))
-      ((< (length args) 2)
-       (raise (make-exn:fail:contract:arity
-               "format: expects at least 1 string arguments, given 0"
-               (current-continuation-marks))))
-      (else
-       (let ((output-port   (car  args))
-             (format-string (cadr args))
-             (args          (cddr args)))
-         (let ((port
-                (cond ((output-port? output-port) output-port)
-                      ((eq? output-port #t) (current-output-port))
-                      ((eq? output-port #f) (open-output-string))
-                      (else (raise-type-error 'format "output-port/boolean" 0 args)))))
-           
-           (define (point-five? n)
-             (let ((absn (abs n)))
-               (= 0.5 (- absn (truncate absn)))))
-           
-           (define (round* n scale) ;; assert scale < 0
-             ;; Note: Scheme's "round to even" rule for 0.5*
-             (let ((one (expt 10 (- scale))))
-               (/ (round (* n one)) one)))
-           
-           (define (string-index str c)
-             (let ((len (string-length str)))
-               (let loop ((i 0))
-                 (cond ((= i len) #f)
-                       ((eqv? c (string-ref str i)) i)
-                       (else (loop (+ i 1)))))))
-           
-           (define (string-grow str len char)
-             (let ((off (- len (string-length str))))
-               (if (positive? off)
-                   (string-append (make-string off char) str)
-                   str)))
-           
-           (define (string-pad-right str len char)
-             (let ((slen (string-length str)))
-               (cond ((< slen len)
-                      (string-append str (make-string (- len slen) char)))
-                     ((> slen len)
-                      (substring (number->string
-                                  (round* (string->number str) len))
-                                 0
-                                 len))
-                     (else str))))
-           
-           (define (format-fixed number-or-string width digits)
-             (cond
-               ((string? number-or-string)
-                (string-grow number-or-string width #\space))
-               ((number? number-or-string)
-                (let ((real (real-part number-or-string))
-                      (imag (imag-part number-or-string)))
-                  (cond
-                    ((not (zero? imag))
-                     (string-grow
-                      (string-append (format-fixed real 0 digits)
-                                     (if (negative? imag) "" "+")
-                                     (format-fixed imag 0 digits)
-                                     "i")
-                      width
-                      #\space))
-                    (digits
-                     (let* ((rounded-number (exact->inexact (round* real (- digits))))
-                            (rounded-string (number->string rounded-number))
-                            (dot-index (string-index  rounded-string #\.))
-                            (exp-index (string-index  rounded-string #\e))
-                            (length    (string-length rounded-string))
-                            (pre-string
-                             (cond
-                               (exp-index
-                                (if dot-index
-                                    (substring rounded-string 0 (+ dot-index 1))
-                                    (substring rounded-string 0 (+ exp-index 1))))
-                               (dot-index
-                                (substring rounded-string 0 (+ dot-index 1)))
-                               (else
-                                rounded-string)))
-                            (exp-string
-                             (if exp-index
-                                 (substring rounded-string exp-index length)
-                                 ""))
-                            (frac-string
-                             (if exp-index
-                                 (substring rounded-string (+ dot-index 1) exp-index)
-                                 (substring rounded-string (+ dot-index 1) length))))
-                       (string-grow
-                        (string-append pre-string
-                                       (if dot-index "" ".")
-                                       (string-pad-right frac-string digits #\0)
-                                       exp-string)
-                        width
-                        #\space)))
-                    (else ;; no digits
-                     (string-grow (number->string real) width #\space)))))
-               (else
-                (raise-type-error 'format "number/string" number-or-string))))
-           
-           (define documentation-string
-             "(format [<port>] <format-string> [<arg>...]) -- <port> is #t, #f or an output-port
-OPTION  [MNEMONIC]      DESCRIPTION     -- Implementation Assumes ASCII Text Encoding
-~H      [Help]          output this text
-~A      [Any]           (display arg) for humans
-~S      [Slashified]    (write arg) for parsers
-~W      [WriteCircular] like ~s but outputs circular and recursive data structures
-~~      [tilde]         output a tilde
-~T      [Tab]           output a tab character
-~%      [Newline]       output a newline character
-~&      [Freshline]     output a newline character if the previous output was not a newline
-~D      [Decimal]       the arg is a number which is output in decimal radix
-~X      [heXadecimal]   the arg is a number which is output in hexdecimal radix
-~O      [Octal]         the arg is a number which is output in octal radix
-~B      [Binary]        the arg is a number which is output in binary radix
-~w,dF   [Fixed]         the arg is a string or number which has width w and d digits after the decimal
-~C      [Character]     charater arg is output by write-char
-~_      [Space]         a single space character is output
-~Y      [Yuppify]       the list arg is pretty-printed to the output
-~?      [Indirection]   recursive format: next 2 args are format-string and list of arguments
-~K      [Indirection]   same as ~?
-")
-           
-           (define (require-an-arg args)
-             (unless (pair? args)
-               (raise-mismatch-error 'format "too few arguments: " args)))
-           
-           (define (format-help format-strg arglist)
-             (letrec ((length-of-format-string (string-length format-strg))
-                      (anychar-dispatch
-                       (lambda (pos arglist last-was-newline)
-                         (if (>= pos length-of-format-string)
-                             arglist ; return unused args
-                             (let ((char (string-ref format-strg pos)))
-                               (cond
-                                 ((eqv? char #\~)
-                                  (tilde-dispatch (+ pos 1) arglist last-was-newline))
-                                 (else
-                                  (write-char char port)
-                                  (anychar-dispatch (+ pos 1) arglist #f)))))))
-                      (has-newline?
-                       (lambda (whatever last-was-newline)
-                         (or (eqv? whatever #\newline)
-                             (and (string? whatever)
-                                  (let ((len (string-length whatever)))
-                                    (if (zero? len)
-                                        last-was-newline
-                                        (eqv? #\newline
-                                              (string-ref whatever (- len 1)))))))))
-                      (tilde-dispatch
-                       (lambda (pos arglist last-was-newline)
-                         (cond
-                           ((>= pos length-of-format-string)
-                            (write-char #\~ port) ; tilde at end of string is just output
-                            arglist)
-                           (else
-                            (case (char-upcase (string-ref format-strg pos))
-                              ((#\A)       ; Any -- for humans
-                               (require-an-arg arglist)
-                               (let ((whatever (car arglist)))
-                                 (display whatever port)
-                                 (anychar-dispatch (+ pos 1) 
-                                                   (cdr arglist) 
-                                                   (has-newline? whatever
-                                                                 last-was-newline))))
-                              ((#\S)       ; Slashified -- for parsers
-                               (require-an-arg arglist)
-                               (let ((whatever (car arglist)))
-                                 (write whatever port)
-                                 (anychar-dispatch (+ pos 1)
-                                                   (cdr arglist)
-                                                   (has-newline? whatever
-                                                                 last-was-newline))))
-                              ((#\W)
-                               (require-an-arg arglist)
-                               (let ((whatever (car arglist)))
-                                 (write whatever port)
-                                 (anychar-dispatch (+ pos 1)
-                                                   (cdr arglist)
-                                                   (has-newline? whatever
-                                                                 last-was-newline))))
-                              ((#\D)       ; Decimal
-                               (require-an-arg arglist)
-                               (display (number->string (car arglist) 10) port)
-                               (anychar-dispatch (+ pos 1) (cdr arglist) #f))
-                              ((#\X)       ; HeXadecimal
-                               (require-an-arg arglist)
-                               (display (number->string (car arglist) 16) port)
-                               (anychar-dispatch (+ pos 1) (cdr arglist) #f))
-                              ((#\O)       ; Octal
-                               (require-an-arg arglist)
-                               (display (number->string (car arglist)  8) port)
-                               (anychar-dispatch (+ pos 1) (cdr arglist) #f))
-                              ((#\B)       ; Binary
-                               (require-an-arg arglist)
-                               (display (number->string (car arglist)  2) port)
-                               (anychar-dispatch (+ pos 1) (cdr arglist) #f))
-                              ((#\C)       ; Character
-                               (require-an-arg arglist)
-                               (write-char (car arglist) port)
-                               (anychar-dispatch (+ pos 1)
-                                                 (cdr arglist)
-                                                 (eqv? (car arglist) #\newline)))
-                              ((#\~)       ; Tilde
-                               (write-char #\~ port)
-                               (anychar-dispatch (+ pos 1) arglist #f))
-                              ((#\%)       ; Newline
-                               (newline port)
-                               (anychar-dispatch (+ pos 1) arglist #t))
-                              ((#\&)      ; Freshline
-                               (unless last-was-newline
-                                 (newline port))
-                               (anychar-dispatch (+ pos 1) arglist #t))
-                              ((#\_)       ; Space
-                               (write-char #\space port)
-                               (anychar-dispatch (+ pos 1) arglist #f))
-                              ((#\T)       ; Tab
-                               (write-char #\tab port)
-                               (anychar-dispatch (+ pos 1) arglist #f))
-                              ((#\Y)       ; Pretty-print
-                               (pretty-print (car arglist) port)
-                               (anychar-dispatch (+ pos 1) (cdr arglist) #f))
-                              ((#\F)
-                               (require-an-arg arglist)
-                               (display (format-fixed (car arglist) 0 #f) port)
-                               (anychar-dispatch (+ pos 1) (cdr arglist) #f))
-                              ((#\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9)
-                               ;; gather "~w[,d]F" w and d digits
-                               (let loop ((index (+ pos 1))
-                                          (w-digits (list (string-ref format-strg pos)))
-                                          (d-digits '())
-                                          (in-width? #t))
-                                 (if (>= index length-of-format-string)
-                                     (raise-mismatch-error 'format
-                                                           "improper numeric format directive in "
-                                                           format-strg)
-                                     (let ((next-char (string-ref format-strg index)))
-                                       (cond
-                                         ((char-numeric? next-char)
-                                          (if in-width?
-                                              (loop (+ index 1)
-                                                    (cons next-char w-digits)
-                                                    d-digits
-                                                    in-width?)
-                                              (loop (+ index 1)
-                                                    w-digits
-                                                    (cons next-char d-digits)
-                                                    in-width?)))
-                                         ((char=? next-char #\F)
-                                          (let ((width
-                                                 (string->number (list->string (reverse w-digits))))
-                                                (digits
-                                                 (if (zero? (length d-digits))
-                                                     #f
-                                                     (string->number (list->string (reverse d-digits))))))
-                                            (display (format-fixed (car arglist) width digits) port)
-                                            (anychar-dispatch (+ index 1) (cdr arglist) #f)))
-                                         ((char=? next-char #\,)
-                                          (if in-width?
-                                              (loop (+ index 1)
-                                                    w-digits
-                                                    d-digits
-                                                    #f)
-                                              (raise-mismatch-error 'format
-                                                                    "too many commas in directive "
-                                                                    format-strg)))
-                                         (else
-                                          (raise-mismatch-error 'format
-                                                                "~w.dF directive ill-formed in "
-                                                                format-strg)))))))
-                              ((#\? #\K)       ; indirection -- take next arg as format string
-                               (cond           ;  and following arg as list of format args
-                                 ((< (length arglist) 2)
-                                  (raise-mismatch-error 'format
-                                                        "less arguments than specified for ~?: "
-                                                        arglist))
-                                 ((not (string? (car arglist)))
-                                  (raise-mismatch-error 'format
-                                                        "~? requires a string: "
-                                                        (car arglist)))
-                                 (else
-                                  (format-help (car arglist) (cadr arglist))
-                                  (anychar-dispatch (+ pos 1) (cddr arglist) #f))))
-                              ((#\H)      ; Help
-                               (display documentation-string port)
-                               (anychar-dispatch (+ pos 1) arglist #t))
-                              (else
-                               (raise-mismatch-error 'format
-                                                     "unknown tilde escape: "
-                                                     (string-ref format-strg pos)))))))))
-               (anychar-dispatch 0 arglist #f)))
-           
-           (let ((unused-args (format-help format-string args)))
-             (if (not (null? unused-args))
-                 (raise-mismatch-error 'format "unused arguments " unused-args))
-             (if (eq? output-port #f)    ;; if format into a string 
-                 (get-output-string port)) ;; then return the string
-             )))))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/5.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/5.rkt
deleted file mode 100644
index b76a7571ba..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/5.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-5
-#lang s-exp srfi/provider srfi/5/let #:unprefix s:
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/5/let.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/5/let.rkt
deleted file mode 100644
index cd346163f7..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/5/let.rkt
+++ /dev/null
@@ -1,86 +0,0 @@
-;;;
-;;; <let.rkt> ---- SRFI 5 A compatible let form with signatures and rest arguments
-;;; Time-stamp: <03/04/08 09:56:06 solsona>
-;;;
-;;; Usually, I would add a copyright notice, and the announce that
-;;; this code is under the LGPL licence.  Nevertheless, I only did the
-;;; port to PLT Scheme v200, and here is the copyright notice,
-;;; comments, and licence from the original source:
-;;;
-;;; Copyright (C) Andy Gaynor (1999-2003)
-;;;
-;;; The version of my-let here was cleaned up by: Paul Schlie <schlie@attbi.com>.
-;;; Renamed to s:let by Eli Barzilay
-
-#lang scheme/base
-(provide s:let)
-
-(define-syntax s:let
-  (syntax-rules ()
-    ;; standard
-    ((s:let () body ...)
-     (let () body ...))
-    ((s:let ((var val) ...) body ...)
-     (let ((var val) ...) body ...))
-
-    ;; rest style
-    ((s:let ((var val) . bindings) body ...)
-     (let-loop #f bindings (var) (val) (body ...)))
-
-    ;; signature style
-    ((s:let (name bindings ...) body ...)
-     (let-loop name (bindings ...) () () (body ...)))
-
-    ;; standard named style
-    ((s:let name (bindings ...) body ...)
-     (let-loop name (bindings ...) () () (body ...)))
-
-    ))
-
-;; A loop to walk down the list of bindings.
-
-(define-syntax let-loop
-  (syntax-rules ()
-
-    ;; No more bindings - make a LETREC.
-    ((let-loop name () (vars ...) (vals ...) body)
-     ((letrec ((name (lambda (vars ...) . body)))
-        name)
-      vals ...))
-
-    ;; Rest binding, no name
-    ((let-loop #f (rest-var rest-val ...) (var ...) (val ...) body)
-     (let ((var val) ... (rest-var (list rest-val ...))) . body))
-
-    ;; Process a (var val) pair.
-    ((let-loop name ((var val) more ...) (vars ...)     (vals ...)     body)
-     (let-loop name (more ...)           (vars ... var) (vals ... val) body))
-
-    ;; End with a rest variable - make a LETREC.
-    ((let-loop name (rest-var rest-vals ...) (vars ...) (vals ...) body)
-     ((letrec ((name (lambda (vars ... . rest-var) . body)))
-        name)
-      vals ... rest-vals ...))))
-
-;; Four loops - normal and `signature-style', each with and without a rest
-;; binding.
-;;
-;;(let fibonacci ((n 10) (i 0) (f0 0) (f1 1))
-;;  (if (= i n)
-;;      f0
-;;      (fibonacci n (+ i 1) f1 (+ f0 f1))))
-;;
-;;(let (fibonacci (n 10) (i 0) (f0 0) (f1 1))
-;;  (if (= i n)
-;;      f0
-;;      (fibonacci n (+ i 1) f1 (+ f0 f1))))
-;;
-;;(let fibonacci ((n 10) (i 0) . (f 0 1))
-;;  (if (= i n)
-;;      (car f)
-;;      (fibonacci n (+ i 1) (cadr f) (+ (car f) (cadr f)))))
-;;
-;;(let (fibonacci (n 10) (i 0) . (f 0 1))
-;;  (if (= i n)
-;;      (car f)
-;;      (fibonacci n (+ i 1) (cadr f) (+ (car f) (cadr f)))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/54.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/54.rkt
deleted file mode 100644
index b587f6fec1..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/54.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-54
-#lang s-exp srfi/provider srfi/54/cat
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/54/cat.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/54/cat.rkt
deleted file mode 100644
index 2f1c32067f..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/54/cat.rkt
+++ /dev/null
@@ -1,951 +0,0 @@
-;; based on soo's (the author of the SRFI) R6RS implemenations
-#lang scheme/base
-
-(provide cat)
-
-(define (expr->string v writer)
-  (let ([port (open-output-string)])
-    (writer v port)
-    (get-output-string port)))
-
-(define (take-both-end str take)
-  (let ((left (car take)))
-    (cond
-      ((string? left)
-       (if (null? (cdr take))
-         (string-append left str)
-         (if (list? take)
-           (let ((right (cadr take)))
-             (if (string? right)
-               (string-append left str right)
-               (if (zero? right)
-                 ""
-                 (let* ((lt-str (string-append left str))
-                        (lt-len (string-length lt-str)))
-                   (if (negative? right)
-                     (if (positive? (+ lt-len right))
-                       (substring lt-str 0 (+ lt-len right))
-                       "")
-                     (if (< right lt-len)
-                       (substring lt-str (- lt-len right) lt-len)
-                       lt-str))))))
-           (let ((right (cdr take)))
-             (if (string? right)
-               (string-append left str str right)
-               (if (zero? right)
-                 (string-append left str)
-                 (let ((len (string-length str)))
-                   (if (negative? right)
-                     (if (positive? (+ len right))
-                       (string-append
-                        left str (substring str 0 (+ len right)))
-                       (string-append left str))
-                     (if (< right len)
-                       (string-append
-                        left str (substring str (- len right) len))
-                       (string-append left str str))))))))))
-      ((zero? left)
-       (if (null? (cdr take))
-         str
-         (if (list? take)
-           (let ((right (cadr take)))
-             (if (string? right)
-               (string-append str right)
-               (if (zero? right)
-                 ""
-                 (let ((lt-len (string-length str)))
-                   (if (negative? right)
-                     (if (positive? (+ lt-len right))
-                       (substring str 0 (+ lt-len right))
-                       "")
-                     (if (< right lt-len)
-                       (substring str (- lt-len right) lt-len)
-                       str))))))
-           (let ((right (cdr take)))
-             (if (string? right)
-               (string-append str str right)
-               (if (zero? right)
-                 str
-                 (let ((len (string-length str)))
-                   (if (negative? right)
-                     (if (positive? (+ len right))
-                       (string-append
-                        str (substring str 0 (+ len right)))
-                       str)
-                     (if (< right len)
-                       (string-append
-                        str (substring str (- len right) len))
-                       (string-append str str))))))))))
-      (else
-       (let* ((len (string-length str))
-              (lt-str (if (positive? left)
-                        (if (< left len)
-                          (substring str 0 left)
-                          str)
-                        (if (positive? (+ len left))
-                          (substring str (abs left) len)
-                          ""))))
-         (if (null? (cdr take))
-           lt-str
-           (if (list? take)
-             (let ((right (cadr take)))
-               (if (string? right)
-                 (string-append lt-str right)
-                 (if (zero? right)
-                   ""
-                   (let ((lt-len (string-length lt-str)))
-                     (if (negative? right)
-                       (if (positive? (+ lt-len right))
-                         (substring lt-str 0 (+ lt-len right))
-                         "")
-                       (if (< right lt-len)
-                         (substring lt-str (- lt-len right) lt-len)
-                         lt-str))))))
-             (let ((right (cdr take)))
-               (if (string? right)
-                 (string-append lt-str str right)
-                 (if (zero? right)
-                   lt-str
-                   (if (negative? right)
-                     (if (positive? (+ len right))
-                       (string-append
-                        lt-str (substring str 0 (+ len right)))
-                       lt-str)
-                     (if (< right len)
-                       (string-append
-                        lt-str (substring str (- len right) len))
-                       (string-append lt-str str)))))))))))))
-
-(define (str-char-index str char start end)
-  (let lp ((n start))
-    (if (= n end)
-      #f
-      (if (char=? char (string-ref str n))
-        n
-        (lp (+ n 1))))))
-
-(define (str-numeric-index str start end)
-  (let lp ((n start))
-    (if (= n end)
-      #f
-      (if (char-numeric? (string-ref str n))
-        n
-        (lp (+ n 1))))))
-
-(define (str-numeric? str start end)
-  (let lp ((n start))
-    (if (= n end)
-      #t
-      (if (char-numeric? (string-ref str n))
-        (lp (+ n 1))
-        #f))))
-
-(define (fixnum-string-separate str sep num sig)
-  (let* ((len (string-length str))
-         (dot-index (str-char-index str #\. 1 len)))
-    (if dot-index
-      (if sig
-        (if (and (str-numeric? str 1 dot-index)
-                 (str-numeric? str (+ 1 dot-index) len))
-          (string-append
-           (apply string-append
-                  (let loop ((ini 0)
-                             (pos (+ 1 (let ((pos (remainder
-                                                   (- dot-index 1) num)))
-                                         (if (zero? pos) num pos)))))
-                    (if (< pos dot-index)
-                      (cons (substring str ini pos)
-                            (cons sep (loop pos (+ pos num))))
-                      (list (substring str ini dot-index)))))
-           "."
-           (apply string-append
-                  (let loop ((ini (+ 1 dot-index))
-                             (pos (+ 1 dot-index num)))
-                    (if (< pos len)
-                      (cons (substring str ini pos)
-                            (cons sep (loop pos (+ pos num))))
-                      (list (substring str ini len))))))
-          str)
-        (if (and (str-numeric? str 0 dot-index)
-                 (str-numeric? str (+ 1 dot-index) len))
-          (string-append
-           (apply string-append
-                  (let loop ((ini 0)
-                             (pos (let ((pos (remainder dot-index num)))
-                                    (if (zero? pos) num pos))))
-                    (if (< pos dot-index)
-                      (cons (substring str ini pos)
-                            (cons sep (loop pos (+ pos num))))
-                      (list (substring str ini dot-index)))))
-           "."
-           (apply string-append
-                  (let loop ((ini (+ 1 dot-index))
-                             (pos (+ 1 dot-index num)))
-                    (if (< pos len)
-                      (cons (substring str ini pos)
-                            (cons sep (loop pos (+ pos num))))
-                      (list (substring str ini len))))))
-          str))
-      (if sig
-        (if (str-numeric? str 1 len)
-          (apply string-append
-                 (let loop ((ini 0)
-                            (pos (+ 1 (let ((pos (remainder (- len 1)
-                                                            num)))
-                                        (if (zero? pos) num pos)))))
-                   (if (< pos len)
-                     (cons (substring str ini pos)
-                           (cons sep (loop pos (+ pos num))))
-                     (list (substring str ini len)))))
-          str)
-        (if (str-numeric? str 0 len)
-          (apply string-append
-                 (let loop ((ini 0)
-                            (pos (let ((pos (remainder len num)))
-                                   (if (zero? pos) num pos))))
-                   (if (< pos len)
-                     (cons (substring str ini pos)
-                           (cons sep (loop pos (+ pos num))))
-                     (list (substring str ini len)))))
-          str)))))
-
-(define (separate str sep num)
-  (let ((len (string-length str))
-        (n (abs num)))
-    (apply string-append
-           (let loop ((ini 0)
-                      (pos (if (negative? num)
-                             n
-                             (let ((pos (remainder len n)))
-                               (if (zero? pos) n pos)))))
-             (if (< pos len)
-               (cons (substring str ini pos)
-                     (cons sep (loop pos (+ pos n))))
-               (list (substring str ini len)))))))
-
-(define (every? pred ls)		;not for list but for pair & others
-  (let lp ((ls ls))
-    (if (pair? ls)
-      (if (pred (car ls))
-        (lp (cdr ls))
-        #f)
-      (if (null? ls)
-        #t
-        (if (pred ls)
-          #t
-          #f)))))
-
-(define (every-within-number? pred ls n) ;not for list but for pair & others
-  (let lp ((ls ls) (num 0))
-    (if (pair? ls)
-      (if (and (< num n) (pred (car ls)))
-        (lp (cdr ls) (+ num 1))
-        #f)
-      (if (null? ls)
-        #t
-        (if (and (< num n) (pred ls))
-          #t
-          #f)))))
-
-(define (exact-integer/string? ns)
-  (or (and (integer? ns)
-           (exact? ns))
-      (string? ns)))
-
-(define (mold str pre)
-  (let* ((len (string-length str))
-         (ind (str-char-index str #\. 1 (- len 1))))
-    (if ind
-      (let ((d-len (- len (+ ind 1))))
-        (cond
-          ((= d-len pre) str)
-          ((< d-len pre) (string-append str (make-string (- pre d-len) #\0)))
-          ;;((char<? #\4 (string-ref str (+ 1 ind pre)))
-          ;;(let ((com (expt 10 pre)))
-          ;;  (number->string (/ (round (* (string->number str) com)) com))))
-          ((or (char<? #\5 (string-ref str (+ 1 ind pre)))
-               (and (char=? #\5 (string-ref str (+ 1 ind pre)))
-                    (or (< (+ 1 pre) d-len)
-                        (memv (string-ref str (+ ind (if (= 0 pre) -1 pre)))
-                              '(#\1 #\3 #\5 #\7 #\9)))))
-           (apply
-            string
-            (let* ((minus (char=? #\- (string-ref str 0)))
-                   (str (substring str (if minus 1 0) (+ 1 ind pre)))
-                   (char-list
-                    (reverse
-                     ;;(let lp ((index (- (string-length str) 1))
-                     (let lp ((index (- (+ ind pre) (if minus 1 0)))
-                              (raise #t))
-                       (if (= -1 index)
-                         (if raise '(#\1) '())
-                         (let ((chr (string-ref str index)))
-                           (if (char=? #\. chr)
-                             (cons chr (lp (- index 1) raise))
-                             (if raise
-                               (if (char=? #\9 chr)
-                                 (cons #\0 (lp (- index 1) raise))
-                                 (cons (integer->char
-                                        (+ 1 (char->integer chr)))
-                                       (lp (- index 1) #f)))
-                               (cons chr (lp (- index 1) raise))))))))))
-              (if minus (cons #\- char-list) char-list))))
-          (else
-           (substring str 0 (+ 1 ind pre)))))
-      (string-append str "." (make-string pre #\0)))))
-
-(define (mold-non-finites str pre)
-  (let* ((len (string-length str))
-         (ind (str-char-index str #\. 1 (- len 1)))
-         (d-len (- len (+ ind 1))))
-    (if (char-numeric? (string-ref str (- ind 1)))
-      (cond
-        ((= d-len pre) str)
-        ((< d-len pre) (string-append str (make-string (- pre d-len) #\0)))
-        ;;((char<? #\4 (string-ref str (+ 1 ind pre)))
-        ;;(let ((com (expt 10 pre)))
-        ;;  (number->string (/ (round (* (string->number str) com)) com))))
-        ((or (char<? #\5 (string-ref str (+ 1 ind pre)))
-             (and (char=? #\5 (string-ref str (+ 1 ind pre)))
-                  (or (< (+ 1 pre) d-len)
-                      (memv (string-ref str (+ ind (if (= 0 pre) -1 pre)))
-                            '(#\1 #\3 #\5 #\7 #\9)))))
-         (apply
-          string
-          (let* ((minus (char=? #\- (string-ref str 0)))
-                 (str (substring str (if minus 1 0) (+ 1 ind pre)))
-                 (char-list
-                  (reverse
-                   ;;(let lp ((index (- (string-length str) 1))
-                   (let lp ((index (- (+ ind pre) (if minus 1 0)))
-                            (raise #t))
-                     (if (= -1 index)
-                       (if raise '(#\1) '())
-                       (let ((chr (string-ref str index)))
-                         (if (char=? #\. chr)
-                           (cons chr (lp (- index 1) raise))
-                           (if raise
-                             (if (char=? #\9 chr)
-                               (cons #\0 (lp (- index 1) raise))
-                               (cons (integer->char
-                                      (+ 1 (char->integer chr)))
-                                     (lp (- index 1) #f)))
-                             (cons chr (lp (- index 1) raise))))))))))
-            (if minus (cons #\- char-list) char-list))))
-        (else
-         (substring str 0 (+ 1 ind pre))))
-      (error "cat: infinities or nans cannot have precisions"))))
-
-(define (e-mold str pre)
-  (let* ((len (string-length str))
-         (e-index (str-char-index str #\e 1 (- len 1))))
-    (if e-index
-      (string-append (mold (substring str 0 e-index) pre)
-                     (substring str e-index len))
-      (mold-non-finites str pre))))
-
-(define (flonum-mold str pre)
-  (let* ((len (string-length str))
-         (e-index (str-char-index str #\e 1 (- len 1))))
-    (string-append (mold (substring str 0 e-index) pre)
-                   (substring str e-index len))))
-
-#;(define (remove-zero str len negative)
-    (if negative
-      (let lp ((n 1))
-        (let ((c (string-ref str n)))
-          (cond
-            ((char=? #\0 c) (lp (+ 1 n)))
-            ((char=? #\. c)
-             (if (= n 2)
-               str
-               (string-append "-" (substring str (- n 1) len))))
-            (else
-             (if (= n 1)
-               str
-               (string-append "-" (substring str n len)))))))
-      (let lp ((n 0))
-        (let ((c (string-ref str n)))
-          (cond
-            ((char=? #\0 c) (lp (+ 1 n)))
-            ((char=? #\. c)
-             (if (= n 1)
-               str
-               (substring str (- n 1) len)))
-            (else
-             (if (zero? n)
-               str
-               (substring str n len))))))))
-
-(define (real->fixnum-string n)
-  (let* ((str (number->string (exact->inexact n)))
-         (len (string-length str))
-         (e-index (str-char-index str #\e 1 (- len 1))))
-    (if e-index
-      (let ((e-number (string->number (substring str (+ 1 e-index) len)))
-            (d-index (str-char-index str #\. 1 e-index)))
-        (if (negative? e-number)
-          (if d-index
-            (if (negative? n)
-              (let ((p-number (- (abs e-number) (- d-index 1))))
-                (if (negative? p-number)
-                  (let ((pnumber (+ 1 (abs p-number))))
-                    (string-append (substring str 0 pnumber)
-                                   "."
-                                   (substring str pnumber d-index)
-                                   (substring str (+ 1 d-index)
-                                              e-index)))
-                  (string-append "-0."
-                                 (make-string p-number #\0)
-                                 (substring str 1 d-index)
-                                 (substring str (+ 1 d-index)
-                                            e-index))))
-              (let ((p-number (- (abs e-number) d-index)))
-                (if (negative? p-number)
-                  (let ((pnumber (abs p-number)))
-                    (string-append (substring str 0 pnumber)
-                                   "."
-                                   (substring str pnumber d-index)
-                                   (substring str (+ 1 d-index)
-                                              e-index)))
-                  (string-append "0."
-                                 (make-string p-number #\0)
-                                 (substring str 0 d-index)
-                                 (substring str (+ 1 d-index)
-                                            e-index)))))
-            (if (negative? n)
-              (let ((p-number (- (abs e-number) (- e-index 1))))
-                (if (negative? p-number)
-                  (let ((pnumber (+ 1 (abs p-number))))
-                    (string-append (substring str 0 pnumber)
-                                   "."
-                                   (substring str pnumber e-index)))
-                  (string-append "-0."
-                                 (make-string p-number #\0)
-                                 (substring str 1 e-index))))
-              (let ((p-number (- (abs e-number) e-index)))
-                (if (negative? p-number)
-                  (let ((pnumber (abs p-number)))
-                    (string-append (substring str 0 pnumber)
-                                   "."
-                                   (substring str pnumber e-index)))
-                  (string-append "0."
-                                 (make-string p-number #\0)
-                                 (substring str 0 e-index))))))
-          (if d-index
-            (let ((p-number (- e-number (- e-index (+ d-index 1)))))
-              (if (negative? p-number)
-                ;; A procedure REMOVE-ZERO is unnecessary
-                ;; due to number->string.
-                ;; 0.00123 -> 00.0123 or 000123
-                ;; -0.00123 -> -00.0123 or -000123
-                ;;(remove-zero (string-append
-                ;;	      (substring str 0 d-index)
-                ;;	      (substring str (+ 1 d-index)
-                ;;			 (+ 1 d-index e-number))
-                ;;	      "."
-                ;;	      (substring str (+ 1 d-index e-number)
-                ;;			 e-index))
-                ;;	     e-index
-                ;;	     (< n 0))
-                (string-append (substring str 0 d-index)
-                               (substring str (+ 1 d-index)
-                                          (+ 1 d-index e-number))
-                               "."
-                               (substring str (+ 1 d-index e-number)
-                                          e-index))
-                ;; A procedure REMOVE-ZERO is unnecessary
-                ;; due to number->string.
-                ;; 0.00123 -> 00.0123 or 000123
-                ;; -0.00123 -> -00.0123 or -000123
-                ;;(remove-zero (string-append
-                ;;	      (substring str 0 d-index)
-                ;;	      (substring str (+ 1 d-index) e-index)
-                ;;	      (make-string p-number #\0)
-                ;;	      ".0")
-                ;;	     (+ e-index p-number 1)
-                ;;	     (< n 0))))
-                (string-append (substring str 0 d-index)
-                               (substring str (+ 1 d-index) e-index)
-                               (make-string p-number #\0) ".0")))
-            (string-append (substring str 0 e-index)
-                           (make-string e-number #\0)
-                           ".0"))))
-      (let ((d-index (str-char-index str #\. 1 (- len 1))))
-        (if (char-numeric? (string-ref str (- d-index 1)))
-          str
-          (error "cat: infinities or nans cannot be changed into fixed-point numbers"))))))
-
-(define (non-0-index str start)
-  (let lp ((n start))
-    (if (char=? #\0 (string-ref str n))
-      (lp (+ 1 n))
-      n)))
-
-(define (non-0-index-right str end)
-  (let lp ((n (- end 1)))
-    (if (char=? #\0 (string-ref str n))
-      (lp (- n 1))
-      n)))
-
-#;(define (non-0-dot-index-right str end)
-    (let lp ((n (- end 1)))
-      (let ((c (string-ref str n)))
-        (if (or (char=? #\0 c) (char=? #\. c))
-          (lp (- n 1))
-          n))))
-
-(define (real->flonum-string n)
-  (let* ((str (number->string (exact->inexact n)))
-         (len (string-length str))
-         (e-index (str-char-index str #\e 1 (- len 1))))
-    (if e-index
-      str
-      (let ((d-index (str-char-index str #\. 1 (- len 1))))
-        (if (< -1 n 1)
-          (if (zero? n)
-            (string-append str "e+0") ;for -0.0 or +0.0
-            (let ((n-index (non-0-index str (+ 1 d-index))))
-              (string-append (if (negative? n) "-" "")
-                             (substring str n-index (+ 1 n-index))
-                             "."
-                             (if (= n-index (- len 1))
-                               "0"
-                               (substring str (+ 1 n-index) len))
-                             "e-"
-                             (number->string (- n-index d-index)))))
-          ;;(let ((n-index (non-0-dot-index-right str len)))
-          ;;  (if (< n-index d-index)
-          (let ((n-index (non-0-index-right str len)))
-            (if (= n-index d-index)
-              (let ((n-index (non-0-index-right str d-index)))
-                (if (char-numeric? (string-ref str n-index))
-                  (if (negative? n)
-                    (string-append (substring str 0 2)
-                                   "."
-                                   (if (= n-index 1)
-                                     "0"
-                                     (substring str 2
-                                                (+ 1 n-index)))
-                                   "e+"
-                                   (number->string (- d-index 2)))
-                    (string-append (substring str 0 1)
-                                   "."
-                                   (if (= n-index 0)
-                                     "0"
-                                     (substring str 1
-                                                (+ 1 n-index)))
-                                   "e+"
-                                   (number->string (- d-index 1))))
-                  (error "cat: infinities or nans cannot be changed into floating-point numbers")))
-              (if (negative? n)
-                (string-append (substring str 0 2)
-                               "."
-                               (substring str 2 d-index)
-                               (substring str (+ 1 d-index)
-                                          (+ 1 n-index))
-                               "e+"
-                               (number->string (- d-index 2)))
-                (string-append (substring str 0 1)
-                               "."
-                               (substring str 1 d-index)
-                               (substring str (+ 1 d-index)
-                                          (+ 1 n-index))
-                               "e+"
-                               (number->string (- d-index 1)))))))))))
-
-(define-syntax wow-cat-end
-  (syntax-rules ()
-    ((wow-cat-end z n)
-     (car z))
-    ((wow-cat-end z n t)
-     (let ((n (car z)))
-       (if t n (error "cat: too many argument" z))))
-    ((wow-cat-end z n t ts)
-     (let ((n (car z)))
-       (if t ts (error "cat: too many argument" z))))
-    ((wow-cat-end z n t ts fs)
-     (let ((n (car z)))
-       (if t ts fs)))))
-
-(define-syntax wow-cat!
-  (syntax-rules ()
-    ((wow-cat! z n d)
-     (let ((n (car z)))
-       (set! z (cdr z))
-       n))
-    ((wow-cat! z n d t)
-     (let ((n (car z)))
-       (if t
-         (begin (set! z (cdr z)) n)
-         (let lp ((head (list n)) (tail (cdr z)))
-           (if (null? tail)
-             d
-             (let ((n (car tail)))
-               (if t
-                 (begin (set! z (append (reverse head) (cdr tail))) n)
-                 (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat! z n d t ts)
-     (let ((n (car z)))
-       (if t
-         (begin (set! z (cdr z)) ts)
-         (let lp ((head (list n)) (tail (cdr z)))
-           (if (null? tail)
-             d
-             (let ((n (car tail)))
-               (if t
-                 (begin (set! z (append (reverse head) (cdr tail))) ts)
-                 (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat! z n d t ts fs)
-     (let ((n (car z)))
-       (if t
-         (begin (set! z (cdr z)) ts)
-         (begin (set! z (cdr z)) fs))))))
-
-(define-syntax %alet-cat*
-  (syntax-rules ()
-    ((%alet-cat* z ((n d t ...)) bd ...)
-     (let ((n (if (null? z)
-                d
-                (if (null? (cdr z))
-                  (wow-cat-end z n t ...)
-                  (error "cat: too many arguments" (cdr z))))))
-       bd ...))
-    ((%alet-cat* z ((n d t ...) . e) bd ...)
-     (let ((n (if (null? z)
-                d
-                (wow-cat! z n d t ...))))
-       (%alet-cat* z e bd ...)))
-    ((%alet-cat* z e bd ...)
-     (let ((e z)) bd ...))))
-
-(define-syntax alet-cat*
-  (syntax-rules ()
-    ((alet-cat* z (a . e) bd ...)
-     (let ((y z))
-       (%alet-cat* y (a . e) bd ...)))))
-
-(define (cat object . rest)
-  (if (null? rest)
-    (cond
-      ((number? object) (number->string object))
-      ((symbol? object) (symbol->string object))
-      ((boolean? object) (if object "#t" "#f"))
-      ((char? object) (string object))
-      ((string? object) object)
-      (else (expr->string object display)))
-    (alet-cat* rest
-               ((width 0 (and (integer? width) (exact? width)))
-                (writer display (procedure? writer))
-                (port #f (or (boolean? port) (output-port? port))
-                      (if (eq? port #t) (current-output-port) port))
-                (char #\space (char? char))
-                (precision #f (and (integer? precision) (inexact? precision)))
-                (radix 'decimal (memq radix '(decimal octal binary hexadecimal)))
-                (point #f (memq point '(fixnum flonum)))
-                (sign #f (eq? 'sign sign))
-                (exactness #f (memq exactness '(exact inexact)))
-                ;;(take #f (and (pair? take)
-                ;;	       (every-within-number? exact-integer/string? 2)))
-                (take #f (and (pair? take)
-                              (exact-integer/string? (car take))
-                              (or (null? (cdr take))
-                                  (and (list? take)
-                                       (null? (cddr take))
-                                       (exact-integer/string? (cadr take)))
-                                  (exact-integer/string? (cdr take)))))
-                (pipe #f (and (pair? pipe) (every? procedure? pipe)))
-                (separator #f (and (pair? separator)
-                                   (char? (car separator))
-                                   (or (null? (cdr separator))
-                                       (and (list? separator)
-                                            (null? (cddr separator))
-                                            (exact-integer? (cadr separator)))))))
-               (let ((str
-                      (if (number? object)
-                        (if (or (eq? writer display)
-                                (eq? writer write))
-                          (let* ((inexact-sign
-                                  (and (not (eq? radix 'decimal))
-                                       (or (and (or precision point)
-                                                (error "cat: non-decimal cannot have a decimal point"))
-                                           (and (inexact? object)
-                                                (not (eq? exactness 'exact)))
-                                           (eq? exactness 'inexact))
-                                       "#i"))
-                                 (str
-                                  (cond
-                                    (point
-                                     (if (eq? point 'fixnum)
-                                       (if precision
-                                         (let ((p (inexact->exact
-                                                   (abs precision))))
-                                           (if (real? object)
-                                             (mold
-                                              (real->fixnum-string object) p)
-                                             (let ((imag-str
-                                                    (real->fixnum-string
-                                                     (imag-part object))))
-                                               (string-append
-                                                (mold
-                                                 (real->fixnum-string
-                                                  (real-part object)) p)
-                                                ;; for N+0.0i
-                                                (if (char-numeric?
-                                                     (string-ref imag-str 0))
-                                                  "+" "")
-                                                (mold imag-str p)
-                                                "i"))))
-                                         (if (real? object)
-                                           (real->fixnum-string object)
-                                           (let ((imag-str
-                                                  (real->fixnum-string
-                                                   (imag-part object))))
-                                             (string-append
-                                              (real->fixnum-string
-                                               (real-part object))
-                                              ;; for N+0.0i
-                                              (if (char-numeric?
-                                                   (string-ref imag-str 0))
-                                                "+" "")
-                                              imag-str
-                                              "i"))))
-                                       (if precision ;'flonum
-                                         (let ((p (inexact->exact
-                                                   (abs precision))))
-                                           (if (real? object)
-                                             (flonum-mold
-                                              (real->flonum-string object) p)
-                                             (let ((imag-str
-                                                    (real->flonum-string
-                                                     (imag-part object))))
-                                               (string-append
-                                                (flonum-mold
-                                                 (real->flonum-string
-                                                  (real-part object)) p)
-                                                ;; for N+0.0i
-                                                (if (char-numeric?
-                                                     (string-ref imag-str 0))
-                                                  "+" "")
-                                                (flonum-mold imag-str p)
-                                                "i"))))
-                                         (if (real? object)
-                                           (real->flonum-string object)
-                                           (let ((imag-str
-                                                  (real->flonum-string
-                                                   (imag-part object))))
-                                             (string-append
-                                              (real->flonum-string
-                                               (real-part object))
-                                              ;; for N+0.0i
-                                              (if (char-numeric?
-                                                   (string-ref imag-str 0))
-                                                "+" "")
-                                              imag-str
-                                              "i"))))))
-                                    (precision
-                                     (let ((p (inexact->exact (abs precision))))
-                                       (if (real? object)
-                                         (e-mold (number->string
-                                                  (exact->inexact object)) p)
-                                         (let ((imag-str
-                                                (number->string
-                                                 (exact->inexact
-                                                  (imag-part object)))))
-                                           (string-append
-                                            (e-mold (number->string
-                                                     (exact->inexact
-                                                      (real-part object))) p)
-                                            ;; for N+0.0i
-                                            (if (char-numeric?
-                                                 (string-ref imag-str 0))
-                                              "+" "")
-                                            (e-mold imag-str p)
-                                            "i")))))
-                                    (else
-                                     (number->string
-                                      (cond
-                                        (inexact-sign (inexact->exact object))
-                                        (exactness (if (eq? exactness 'exact)
-                                                     (inexact->exact object)
-                                                     (exact->inexact object)))
-                                        (else object))
-                                      (cdr (assq radix '((decimal . 10)
-                                                         (octal . 8)
-                                                         (hexadecimal . 16)
-                                                         (binary . 2))))))))
-                                 (str
-                                  (if separator
-                                    (fixnum-string-separate
-                                     str
-                                     (string (car separator))
-                                     (if (null? (cdr separator))
-                                       3 (abs (cadr separator)))
-                                     (negative? (real-part object)))
-                                    str))
-                                 (str
-                                  (string-append
-                                   (or inexact-sign "")
-                                   (if (or (and precision
-                                                (not point)
-                                                (or (eq? exactness 'exact)
-                                                    (and (exact? object)
-                                                         ;;(not (eq? exactness
-                                                         ;;	  'inexact))
-                                                         (not exactness)
-                                                         (or (positive? precision)
-                                                             (eqv? precision
-                                                                   0.0)))))
-                                           (and point
-                                                (eq? exactness 'exact)))
-                                     "#e" "")
-                                   (cdr (assq radix
-                                              '((decimal . "")
-                                                (octal . "#o")
-                                                (hexadecimal . "#x")
-                                                (binary . "#b"))))
-                                   (if (and sign
-                                            ;;(positive? (real-part object)))
-                                            ;; for 0.0
-                                            (char-numeric? (string-ref str 0)))
-                                     "+" "")
-                                   str))
-                                 (str (if pipe
-                                        (if (list? pipe)
-                                          (let loop ((str ((car pipe) str))
-                                                     (fns (cdr pipe)))
-                                            (if (null? fns)
-                                              str
-                                              (loop ((car fns) str)
-                                                    (cdr fns))))
-                                          (apply
-                                           string-append
-                                           (let loop ((fns pipe))
-                                             (if (procedure? fns)
-                                               (list (fns str))
-                                               (cons ((car fns) str)
-                                                     (loop (cdr fns)))))))
-                                        str))
-                                 (str (if take (take-both-end str take) str))
-                                 (pad (- (abs width) (string-length str))))
-                            (cond
-                              ((<= pad 0) str)
-                              ((positive? width)
-                               (if (char-numeric? char)
-                                 (let* ((len (string-length str))
-                                        (index (str-numeric-index str 0 len)))
-                                   (if index
-                                     ;;(if (zero? index)
-                                     (if (or (zero? index)
-                                             ;; for infinities and nans
-                                             (char=?
-                                              (string-ref str (- index 1))
-                                              #\.))
-                                       (string-append
-                                        (make-string pad char) str)
-                                       (string-append
-                                        (substring str 0 index)
-                                        (make-string pad char)
-                                        (substring str index len)))
-                                     (string-append
-                                      (make-string pad char) str)))
-                                 (string-append (make-string pad char) str)))
-                              (else (string-append str (make-string pad char)))))
-                          (let* ((str (expr->string object writer))
-                                 (str (if separator
-                                        (fixnum-string-separate
-                                         str
-                                         (string (car separator))
-                                         (if (null? (cdr separator))
-                                           3 (abs (cadr separator)))
-                                         (negative? (real-part object)))
-                                        str))
-                                 (str (if pipe
-                                        (if (list? pipe)
-                                          (let loop ((str ((car pipe) str))
-                                                     (fns (cdr pipe)))
-                                            (if (null? fns)
-                                              str
-                                              (loop ((car fns) str)
-                                                    (cdr fns))))
-                                          (apply
-                                           string-append
-                                           (let loop ((fns pipe))
-                                             (if (procedure? fns)
-                                               (list (fns str))
-                                               (cons ((car fns) str)
-                                                     (loop (cdr fns)))))))
-                                        str))
-                                 (str (if take (take-both-end str take) str))
-                                 (pad (- (abs width) (string-length str))))
-                            (cond
-                              ((<= pad 0) str)
-                              ((positive? width)
-                               (if (char-numeric? char)
-                                 (let* ((len (string-length str))
-                                        (index (str-numeric-index str 0 len)))
-                                   (if index
-                                     ;;(if (zero? index)
-                                     (if (or (zero? index)
-                                             ;; for infinities and nans
-                                             (char=?
-                                              (string-ref str (- index 1))
-                                              #\.))
-                                       (string-append
-                                        (make-string pad char)
-                                        str)
-                                       (string-append
-                                        (substring str 0 index)
-                                        (make-string pad char)
-                                        (substring str index len)))
-                                     (string-append (make-string pad char)
-                                                    str)))
-                                 (string-append (make-string pad char) str)))
-                              (else
-                               (string-append str (make-string pad char))))))
-                        (let* ((str
-                                (if (eq? writer display)
-                                  (cond
-                                    ((symbol? object) (symbol->string object))
-                                    ((boolean? object) (if object "#t" "#f"))
-                                    ((char? object) (string object))
-                                    ((string? object) object)
-                                    (else (expr->string object writer)))
-                                  (if (eq? writer write)
-                                    (cond
-                                      ((symbol? object)
-                                       (symbol->string object))
-                                      ((boolean? object)
-                                       (if object "#t" "#f"))
-                                      (else (expr->string object writer)))
-                                    (expr->string object writer))))
-                               (str (if (and separator
-                                             (not (null? (cdr separator))))
-                                      (separate str (string (car separator))
-                                                (cadr separator))
-                                      str))
-                               (str (if pipe
-                                      (if (list? pipe)
-                                        (let loop ((str ((car pipe) str))
-                                                   (fns (cdr pipe)))
-                                          (if (null? fns)
-                                            str
-                                            (loop ((car fns) str) (cdr fns))))
-                                        (apply string-append
-                                               (let loop ((fns pipe))
-                                                 (if (procedure? fns)
-                                                   (list (fns str))
-                                                   (cons ((car fns) str)
-                                                         (loop (cdr fns)))))))
-                                      str))
-                               (str (if take (take-both-end str take) str))
-                               (pad (- (abs width) (string-length str))))
-                          (cond
-                            ((<= pad 0) str)
-                            ((positive? width)
-                             (string-append (make-string pad char) str))
-                            (else
-                             (string-append str (make-string pad char))))))))
-                 (if port
-                   (display str port)
-                   str)))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/57.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/57.rkt
deleted file mode 100644
index 949444ee2b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/57.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-57
-#lang s-exp srfi/provider srfi/57/records
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/57/records.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/57/records.rkt
deleted file mode 100644
index fe3ff2852a..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/57/records.rkt
+++ /dev/null
@@ -1,307 +0,0 @@
-; SRFI 57
-; Zhu Chongkai   mrmathematica@yahoo.com
-; Based on original author's syntax-case implementation
-(module records mzscheme
-
-  (provide define-record-type
-           define-record-scheme
-           record-update
-           record-update!
-           record-compose
-           show)
-
-  (require            (prefix s9: srfi/9))
-  (require-for-syntax (prefix s1: srfi/1))
-
-  (require-for-syntax "registry.rkt")
-
-  (define-syntax define-record-type
-    (syntax-rules ()
-      ((define-record-type . body)
-       (parse-declaration #f . body))))
-
-  (define-syntax define-record-scheme
-    (syntax-rules ()
-      ((define-record-scheme . body)
-       (parse-declaration #t . body))))
-
-  (define-syntax parse-declaration
-    (syntax-rules ()
-      ((parse-declaration is-scheme? (name super ...) (constructor pos-label ...) predicate field-clause ...)
-       (build-record (constructor pos-label ...)  #f (super ...) (field-clause ...) name predicate is-scheme?))
-      ((parse-declaration is-scheme? (name super ...) constructor predicate field-clause ...)
-       (build-record (constructor)  #t (super ...) (field-clause ...) name predicate is-scheme?))
-      ((parse-declaration is-scheme? (name super ...) constructor-clause)
-       (parse-declaration is-scheme? (name super ...) constructor-clause #f))
-      ((parse-declaration is-scheme? (name super ...))
-       (parse-declaration is-scheme? (name super ...) #f #f))
-      ((parse-declaration is-scheme? name . rest)
-       (parse-declaration is-scheme? (name) . rest))))
-
-  (define-syntax record-update!
-    (lambda (stx)
-      (syntax-case stx ()
-        ((_ record name (label exp) ...)
-         (with-syntax (((setter ...)
-                        (map (lambda (label)
-                               (lookup-setter #`name label))
-                             (syntax->list #`(label ...)))))
-           #`(let ((r record))
-               (setter r exp)
-               ...
-               r))))))
-
-  (define-syntax record-update
-    (lambda (stx)
-      (syntax-case stx ()
-        ((_ record name (label exp) ...)
-         (if (lookup-scheme? #`name)
-             (with-syntax ((copier (lookup-copier #`name)))
-               #`(let ((new (copier record)))
-                   (record-update! new name (label exp) ...)))
-             #`(record-compose (name record) (name (label exp) ...)))))))
-
-
-  (define-syntax record-compose
-    (lambda (stx)
-      (syntax-case stx ()
-        ((record-compose (export-name (label exp) ...))
-         #`(export-name (label exp) ...))
-        ((record-compose (import-name record) import ... (export-name (label exp) ...))
-         (with-syntax
-             (((copy-label ...)
-               (s1:lset-intersection free-identifier=?
-                                     (lookup-labels #`export-name)
-                                     (s1:lset-difference free-identifier=?
-                                                         (lookup-labels #`import-name)
-                                                         (syntax->list #`(label ...))))))
-           (with-syntax (((getter ...)
-                          (s1:map (lambda (label)
-                                    (lookup-getter #`import-name label))
-                                  (syntax->list #`(copy-label ...)))))
-             #`(let ((r record))
-                 (record-compose import ...
-                                 (export-name (copy-label (getter r))
-                                              ...
-                                              (label exp)
-                                              ...)))))))))
-
-  (define-syntax build-record
-    (let ()
-
-      (define (build-record stx)
-        (syntax-case stx ()
-          ((build-record (constructor pos-label ...)
-                         default-order?
-                         (super ...)
-                         ((field-label . accessors) ...)
-                         name
-                         predicate
-                         is-scheme?)
-           (with-syntax
-               (((label ...)
-                 (s1:delete-duplicates (s1:fold-right append
-                                                      (syntax->list #`(pos-label ... field-label ...))
-                                                      (map lookup-labels
-                                                           (syntax->list #`(super ...))))
-                                       free-identifier=?))
-                ((super ...)
-                 (s1:delete-duplicates (s1:fold-right append
-                                                      '()
-                                                      (map lookup-supers
-                                                           (syntax->list #`(super ...))))
-                                       free-identifier=?)))
-             (with-syntax
-                 (((pos-label ...)
-
-                   (if (syntax-e #`default-order?)
-                       #`(label ...)
-                       #`(pos-label ...)))
-
-                  (((field-label getter setter) ...)
-
-                   (append (map augment-field
-                                (syntax->list #`((field-label . accessors) ...)))
-                           (map (lambda (label)
-                                  (maybe-generate #`name `(,label getter setter)))
-                                (s1:lset-difference free-identifier=?
-                                                    (syntax->list #`(label ...))
-                                                    (syntax->list #`(field-label ...)))))))
-
-               (with-syntax ((supers         #`(super ...))
-                             ((pos-temp ...) (generate-temporaries #`(pos-label ...)))
-                             ((constructor predicate maker copier)
-                              (maybe-generate #`name `(,#`constructor ,#`predicate maker copier))))
-                 (begin
-                   (register #`name (make-entry #`name
-                                                (syntax-e #`is-scheme?)
-                                                #`predicate
-                                                (syntax->list #`(super ... name))
-                                                (syntax->list #`(label ...))
-                                                (syntax->list #`(pos-label ...))
-                                                (map syntax->list
-                                                     (syntax->list #`((field-label getter setter) ...)))
-                                                #`copier))
-
-                   (if (syntax-e #`is-scheme?)
-
-                       #`(begin
-                           (define-generic (predicate x) (lambda (x) #f))
-                           (define-generic (getter x))
-                           ...
-                           (define-generic (setter x v))
-                           ...
-                           (define-generic (copier x)))
-
-                       #`(begin
-                           (s9:define-record-type internal-name
-                                                  (maker field-label ...)
-                                                  predicate
-                                                  (field-label getter setter) ...)
-
-                           (define constructor
-                             (lambda (pos-temp ...)
-                               (populate maker (field-label ...) (pos-label pos-temp) ...)))
-
-                           (extend-predicates supers predicate)
-                           (extend-accessors supers field-label predicate getter setter)
-                           ...
-
-                           (define (copier x)
-                             (maker (getter x) ...))
-                           (extend-copiers supers copier predicate)
-
-                           (define-method (show (r predicate))
-                             (list 'name
-                                   (list 'field-label (getter r))
-                                   ...))
-
-                           (define-syntax name
-                             (syntax-rules ()
-                               ((name . bindings) (populate maker (field-label ...) . bindings))))
-
-                           ))))))))) ; build-record
-
-      (define (maybe-generate context maybe-identifiers)
-        (map (lambda (elem)
-               (if (identifier? elem)
-                   elem
-                   (datum->syntax-object context (if (symbol? elem)
-                                                     (gensym elem)
-                                                     (gensym)))))
-             maybe-identifiers))
-
-      (define (augment-field clause)
-        (syntax-case clause ()
-          ((label)               `(,#`label ,@(maybe-generate #`label `(   getter    setter))))
-          ((label getter)        `(,#`label ,@(maybe-generate #`label `(,#`getter    setter))))
-          ((label getter setter) `(,#`label ,@(maybe-generate #`label `(,#`getter ,#`setter))))))
-
-      build-record))
-
-  (define-syntax extend-predicates
-    (lambda (stx)
-      (syntax-case stx ()
-        ((extend-predicates (super ...) new-type)
-         (with-syntax (((predicate ...) (map lookup-predicate
-                                             (syntax->list #`(super ...)))))
-           #`(begin
-               (define-method predicate (new-type) (x) any?)
-               ...))))))
-
-  (define-syntax extend-copiers
-    (lambda (stx)
-      (syntax-case stx ()
-        ((extend-copiers (super ...) copy new-type)
-         (with-syntax (((copier ...) (map lookup-copier
-                                          (syntax->list #`(super ...)))))
-           #`(begin
-               (define-method copier (new-type) (x)  copy)
-               ...))))))
-
-  (define-syntax extend-accessors
-    (lambda (stx)
-      (syntax-case stx ()
-        ((extend-accessors (super ...) label new-type selector modifier)
-         (with-syntax (((getter ...) (s1:filter (lambda (id)
-                                                  (not (eqv? id #f)))
-                                                (map (lambda (super)
-                                                       (lookup-getter super #`label))
-                                                     (syntax->list #`(super ...)))))
-                       ((setter ...) (s1:filter (lambda (id)
-                                                  (not (eqv? id #f)))
-                                                (map (lambda (super)
-                                                       (lookup-setter super #`label))
-                                                     (syntax->list #`(super ...))))))
-           #`(begin
-               (define-method getter (new-type) (x) selector)
-               ...
-               (define-method setter (new-type any?) (x v) modifier)
-               ...))))))
-
-  (define-syntax populate
-    (lambda (stx)
-
-      (define (order ordering bindings default)
-        (if (null? (s1:lset-difference free-identifier=?
-                                       (map car bindings)
-                                       ordering))
-            (map (lambda (label)
-                   (cond ((s1:assoc label bindings free-identifier=?) => (lambda (x) x))
-                         (else `(,label ,default))))
-                 ordering)
-            (raise-syntax-error #f "Illegal labels in" stx)))
-
-      (syntax-case stx ()
-        ((populate maker labels . bindings)
-         (with-syntax ((((label exp) ...) (order (syntax->list #`labels)
-                                                 (map syntax->list
-                                                      (syntax->list #'bindings))
-                                                 #`'<undefined>)))
-           #`(maker exp ...))))))
-
-
-  ; Simple generic functions suitable for our disjoint base record types:
-
-  (define-syntax define-generic
-    (syntax-rules ()
-      ((define-generic (name arg ...))
-       (define-generic (name arg ...)
-         (lambda (arg ...) (error "Inapplicable method:" 'name
-                                  "Arguments:" (show arg) ... ))))
-      ((define-generic (name arg ...) proc)
-       (define name (make-generic (arg ...) proc)))))
-
-  (define-syntax define-method
-    (syntax-rules ()
-      ((define-method (generic (arg pred?) ...) . body)
-       (define-method generic (pred? ...) (arg ...) (lambda (arg ...) . body)))
-      ((define-method generic (pred? ...) (arg ...) procedure)
-       (let ((next ((generic) 'get-proc))
-             (proc procedure))
-         (((generic) 'set-proc)
-          (lambda (arg ...)
-            (if (and (pred? arg) ...)
-                (proc arg ...)
-                (next arg ...))))))))
-
-  (define-syntax make-generic
-    (syntax-rules ()
-      ((make-generic (arg arg+ ...) default-proc)
-       (let ((proc default-proc))
-         (case-lambda
-           ((arg arg+ ...)
-            (proc arg arg+ ...))
-           (()
-            (lambda (msg)
-              (case msg
-                ((get-proc) proc)
-                ((set-proc) (lambda (new)
-                              (set! proc new)))))))))))
-
-  (define-generic (show x)
-    (lambda (x) x))
-
-  (define (any? x) #t)
-
-) ; records
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/57/registry.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/57/registry.rkt
deleted file mode 100644
index 5461216f0b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/57/registry.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-(module registry mzscheme
-
-  (provide register
-           make-entry
-           lookup-entry
-           lookup-scheme?
-           lookup-getter
-           lookup-setter
-           lookup-labels
-           lookup-supers
-           lookup-copier
-           lookup-predicate)
-
-  (require (prefix s1: srfi/1))
-
-  (define reg '())
-
-  (define (make-entry name
-                      is-scheme?
-                      predicate
-                      supers
-                      labels
-                      pos-labels
-                      fields
-                      copier)
-    (vector name
-            is-scheme?
-            predicate
-            supers
-            labels
-            pos-labels
-            fields
-            copier))
-
-  (define (entry.name entry)       (vector-ref entry 0))
-  (define (entry.is-scheme? entry) (vector-ref entry 1))
-  (define (entry.predicate entry)  (vector-ref entry 2))
-  (define (entry.supers entry)     (vector-ref entry 3))
-  (define (entry.labels entry)     (vector-ref entry 4))
-  (define (entry.pos-labels entry) (vector-ref entry 5))
-  (define (entry.fields entry)     (vector-ref entry 6))
-  (define (entry.copier entry)     (vector-ref entry 7))
-
-  (define (register name entry)
-    (set! reg
-          (let loop ([reg reg])
-            (cond
-             [(null? reg) 
-              (list (cons name entry))]
-             [(free-identifier=? name (caar reg))
-              (cons (cons name entry)
-                    (cdr reg))]
-             [else (cons (car reg)
-                         (loop (cdr reg)))]))))
-
-  (define (lookup-entry name)
-    (s1:assoc name reg free-identifier=?))
-
-  (define (lookup-getter name label)
-    (cond ((s1:assoc label
-                     (entry.fields (cdr (lookup-entry name)))
-                     free-identifier=?)
-           => cadr)
-          (else #f)))
-
-  (define (lookup-setter name label)
-    (cond ((s1:assoc label
-                     (entry.fields (cdr (lookup-entry name)))
-                     free-identifier=?)
-           => caddr)
-          (else #f)))
-
-  (define (lookup-scheme? name)   (entry.is-scheme? (cdr (lookup-entry name))))
-  (define (lookup-labels name)    (entry.labels     (cdr (lookup-entry name))))
-  (define (lookup-supers name)    (entry.supers     (cdr (lookup-entry name))))
-  (define (lookup-copier name)    (entry.copier     (cdr (lookup-entry name))))
-  (define (lookup-predicate name) (entry.predicate  (cdr (lookup-entry name))))
-
-  ) ; registry
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/59.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/59.rkt
deleted file mode 100644
index cc78fdd690..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/59.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-59
-#lang s-exp srfi/provider srfi/59/vicinity
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/59/vicinity.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/59/vicinity.rkt
deleted file mode 100644
index cdb99ee25f..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/59/vicinity.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-; SRFI 59
-; Zhu Chongkai   mrmathematica@yahoo.com
-; 29-May-2005
-(module vicinity mzscheme
-  
-  (provide (all-defined))
-  
-  (define (implementation-vicinity)
-    (pathname->vicinity
-     (simplify-path
-      (find-system-path 'exec-file))))
-  
-  (define (library-vicinity)
-    (car (current-library-collection-paths)))
-  
-  (define (home-vicinity)
-    (find-system-path 'home-dir))
-  
-  (define in-vicinity build-path)
-  
-  (define (user-vicinity)
-    (current-directory))
-  
-  (define vicinity:suffix?
-    (let ((suffi
-           (case (system-type)
-             ((macos)			'(#\:))
-             ((windows)			'(#\\ #\/))
-             ((unix oskit macosx)	'(#\/)))))
-      (lambda (chr) (and (memv chr suffi) #t))))
-  
-  (define (pathname->vicinity pathname)
-    (call-with-values
-     (lambda () (split-path pathname))
-     (lambda (base name must-be-dir?) base)))
-  
-  (define (program-vicinity)
-    (current-load-relative-directory))
-  
-  (define sub-vicinity build-path)
-  
-  (define (make-vicinity pathname) pathname)
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/6.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/6.rkt
deleted file mode 100644
index 40977c0b64..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/6.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-;; Supported by core PLT:
-#lang scheme/base
-(provide get-output-string open-input-string open-output-string)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/60.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/60.rkt
deleted file mode 100644
index 2ebb9f298e..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/60.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp srfi/provider srfi/60/60
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/60/60.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/60/60.rkt
deleted file mode 100644
index 066fae3420..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/60/60.rkt
+++ /dev/null
@@ -1,270 +0,0 @@
-;; Implementation of SRFI 60 "Integers as Bits" for PLT Scheme, based on
-;; reference implementation.
-
-;; Copyright (C) 2005 David Van Horn
-
-;; Released under the same terms as the SRFI reference implementation
-;; included below.
-
-(module |60| mzscheme
-  (provide (all-defined-except logical:ash-4)
-           integer-length)
-
-  ;; SRFI 60 defines several procedures which are already provided by
-  ;; Racket and thus they are not provided by this module, namely
-  ;; bitwise-{ior,xor,and,not} and arithmetic-shift. However, SRFI 60
-  ;; names aliases for these procedures, which are provided and which
-  ;; refer to the Mzscheme primitives, namely log{ior,xor,and,not} and
-  ;; ash.
-
-  (define logior bitwise-ior)
-  (define logxor bitwise-xor)
-  (define logand bitwise-and)
-  (define lognot bitwise-not)  
-
-  ;; The reference implementation follows below and has been changed only
-  ;; by adding S-expression comments to definitions which are not needed,
-  ;; such as definitions implemented as Racket exact integer primitives.
-
-;;;; "logical.scm", bit access and operations for integers for Scheme
-;;; Copyright (C) 1991, 1993, 2001, 2003, 2005 Aubrey Jaffer
-;
-;Permission to copy this software, to modify it, to redistribute it,
-;to distribute modified versions, and to use it for any purpose is
-;granted, subject to the following restrictions and understandings.
-;
-;1.  Any copy made of this software must include this copyright notice
-;in full.
-;
-;2.  I have made no warranty or representation that the operation of
-;this software will be error-free, and I am under no obligation to
-;provide any services, by way of maintenance, update, or otherwise.
-;
-;3.  In conjunction with products arising from the use of this
-;material, there shall be no use of my name in any advertising,
-;promotional, or sales literature without prior written consent in
-;each case.
-
-#;(define logical:boole-xor
- '#(#(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)
-    #(1 0 3 2 5 4 7 6 9 8 11 10 13 12 15 14)
-    #(2 3 0 1 6 7 4 5 10 11 8 9 14 15 12 13)
-    #(3 2 1 0 7 6 5 4 11 10 9 8 15 14 13 12)
-    #(4 5 6 7 0 1 2 3 12 13 14 15 8 9 10 11)
-    #(5 4 7 6 1 0 3 2 13 12 15 14 9 8 11 10)
-    #(6 7 4 5 2 3 0 1 14 15 12 13 10 11 8 9)
-    #(7 6 5 4 3 2 1 0 15 14 13 12 11 10 9 8)
-    #(8 9 10 11 12 13 14 15 0 1 2 3 4 5 6 7)
-    #(9 8 11 10 13 12 15 14 1 0 3 2 5 4 7 6)
-    #(10 11 8 9 14 15 12 13 2 3 0 1 6 7 4 5)
-    #(11 10 9 8 15 14 13 12 3 2 1 0 7 6 5 4)
-    #(12 13 14 15 8 9 10 11 4 5 6 7 0 1 2 3)
-    #(13 12 15 14 9 8 11 10 5 4 7 6 1 0 3 2)
-    #(14 15 12 13 10 11 8 9 6 7 4 5 2 3 0 1)
-    #(15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0)))
-
-#;(define logical:boole-and
- '#(#(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
-    #(0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1)
-    #(0 0 2 2 0 0 2 2 0 0 2 2 0 0 2 2)
-    #(0 1 2 3 0 1 2 3 0 1 2 3 0 1 2 3)
-    #(0 0 0 0 4 4 4 4 0 0 0 0 4 4 4 4)
-    #(0 1 0 1 4 5 4 5 0 1 0 1 4 5 4 5)
-    #(0 0 2 2 4 4 6 6 0 0 2 2 4 4 6 6)
-    #(0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7)
-    #(0 0 0 0 0 0 0 0 8 8 8 8 8 8 8 8)
-    #(0 1 0 1 0 1 0 1 8 9 8 9 8 9 8 9)
-    #(0 0 2 2 0 0 2 2 8 8 10 10 8 8 10 10)
-    #(0 1 2 3 0 1 2 3 8 9 10 11 8 9 10 11)
-    #(0 0 0 0 4 4 4 4 8 8 8 8 12 12 12 12)
-    #(0 1 0 1 4 5 4 5 8 9 8 9 12 13 12 13)
-    #(0 0 2 2 4 4 6 6 8 8 10 10 12 12 14 14)
-    #(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)))
-
-(define (logical:ash-4 x)
-  (if (negative? x)
-      (+ -1 (quotient (+ 1 x) 16))
-      (quotient x 16)))
-
-#;(define (logical:reduce op4 ident)
-  (lambda args
-    (do ((res ident (op4 res (car rgs) 1 0))
-	 (rgs args (cdr rgs)))
-	((null? rgs) res))))
-
-;@
-#;(define logand
-  (letrec
-      ((lgand
-	(lambda (n2 n1 scl acc)
-	  (cond ((= n1 n2) (+ acc (* scl n1)))
-		((zero? n2) acc)
-		((zero? n1) acc)
-		(else (lgand (logical:ash-4 n2)
-			     (logical:ash-4 n1)
-			     (* 16 scl)
-			     (+ (* (vector-ref (vector-ref logical:boole-and
-							   (modulo n1 16))
-					       (modulo n2 16))
-				   scl)
-				acc)))))))
-    (logical:reduce lgand -1)))
-;@
-#;(define logior
-  (letrec
-      ((lgior
-	(lambda (n2 n1 scl acc)
-	  (cond ((= n1 n2) (+ acc (* scl n1)))
-		((zero? n2) (+ acc (* scl n1)))
-		((zero? n1) (+ acc (* scl n2)))
-		(else (lgior (logical:ash-4 n2)
-			     (logical:ash-4 n1)
-			     (* 16 scl)
-			     (+ (* (- 15 (vector-ref
-					  (vector-ref logical:boole-and
-						      (- 15 (modulo n1 16)))
-					  (- 15 (modulo n2 16))))
-				   scl)
-				acc)))))))
-    (logical:reduce lgior 0)))
-;@
-#;(define logxor
-  (letrec
-      ((lgxor
-	(lambda (n2 n1 scl acc)
-	  (cond ((= n1 n2) acc)
-		((zero? n2) (+ acc (* scl n1)))
-		((zero? n1) (+ acc (* scl n2)))
-		(else (lgxor (logical:ash-4 n2)
-			     (logical:ash-4 n1)
-			     (* 16 scl)
-			     (+ (* (vector-ref (vector-ref logical:boole-xor
-							   (modulo n1 16))
-					       (modulo n2 16))
-				   scl)
-				acc)))))))
-    (logical:reduce lgxor 0)))
-;@
-#;(define (lognot n) (- -1 n))
-;@
-(define (logtest n1 n2)
-  (not (zero? (logand n1 n2))))
-;@
-(define (logbit? index n)
-  (logtest (expt 2 index) n))
-;@
-(define (copy-bit index to bool)
-  (if bool
-      (logior to (arithmetic-shift 1 index))
-      (logand to (lognot (arithmetic-shift 1 index)))))
-;@
-(define (bitwise-if mask n0 n1)
-  (logior (logand mask n0)
-	  (logand (lognot mask) n1)))
-;@
-(define (bit-field n start end)
-  (logand (lognot (ash -1 (- end start)))
-	  (arithmetic-shift n (- start))))
-;@
-(define (copy-bit-field to from start end)
-  (bitwise-if (arithmetic-shift (lognot (ash -1 (- end start))) start)
-	      (arithmetic-shift from start)
-	      to))
-;@
-(define (rotate-bit-field n count start end)
-  (define width (- end start))
-  (set! count (modulo count width))
-  (let ((mask (lognot (ash -1 width))))
-    (define zn (logand mask (arithmetic-shift n (- start))))
-    (logior (arithmetic-shift
-	     (logior (logand mask (arithmetic-shift zn count))
-		     (arithmetic-shift zn (- count width)))
-	     start)
-	    (logand (lognot (ash mask start)) n))))
-;@
-#;(define (arithmetic-shift n count)
-  (if (negative? count)
-      (let ((k (expt 2 (- count))))
-	(if (negative? n)
-	    (+ -1 (quotient (+ 1 n) k))
-	    (quotient n k)))
-      (* (expt 2 count) n)))
-;@
-#;
-(define integer-length
-  (letrec ((intlen (lambda (n tot)
-		     (case n
-		       ((0 -1) (+ 0 tot))
-		       ((1 -2) (+ 1 tot))
-		       ((2 3 -3 -4) (+ 2 tot))
-		       ((4 5 6 7 -5 -6 -7 -8) (+ 3 tot))
-		       (else (intlen (logical:ash-4 n) (+ 4 tot)))))))
-    (lambda (n) (intlen n 0))))
-;@
-(define logcount
-  (letrec ((logcnt (lambda (n tot)
-		     (if (zero? n)
-			 tot
-			 (logcnt (quotient n 16)
-				 (+ (vector-ref
-				     '#(0 1 1 2 1 2 2 3 1 2 2 3 2 3 3 4)
-				     (modulo n 16))
-				    tot))))))
-    (lambda (n)
-      (cond ((negative? n) (logcnt (lognot n) 0))
-	    ((positive? n) (logcnt n 0))
-	    (else 0)))))
-;@
-(define (log2-binary-factors n)
-  (+ -1 (integer-length (logand n (- n)))))
-
-(define (bit-reverse k n)
-  (do ((m (if (negative? n) (lognot n) n) (arithmetic-shift m -1))
-       (k (+ -1 k) (+ -1 k))
-       (rvs 0 (logior (arithmetic-shift rvs 1) (logand 1 m))))
-      ((negative? k) (if (negative? n) (lognot rvs) rvs))))
-;@
-(define (reverse-bit-field n start end)
-  (define width (- end start))
-  (let ((mask (lognot (ash -1 width))))
-    (define zn (logand mask (arithmetic-shift n (- start))))
-    (logior (arithmetic-shift (bit-reverse width zn) start)
-	    (logand (lognot (ash mask start)) n))))
-;@
-(define (integer->list k . len)
-  (if (null? len)
-      (do ((k k (arithmetic-shift k -1))
-	   (lst '() (cons (odd? k) lst)))
-	  ((<= k 0) lst))
-      (do ((idx (+ -1 (car len)) (+ -1 idx))
-	   (k k (arithmetic-shift k -1))
-	   (lst '() (cons (odd? k) lst)))
-	  ((negative? idx) lst))))
-;@
-(define (list->integer bools)
-  (do ((bs bools (cdr bs))
-       (acc 0 (+ acc acc (if (car bs) 1 0))))
-      ((null? bs) acc)))
-(define (booleans->integer . bools)
-  (list->integer bools))
-
-;;;;@ SRFI-60 aliases
-(define ash arithmetic-shift)
-#;(define bitwise-ior logior)
-#;(define bitwise-xor logxor)
-#;(define bitwise-and logand)
-#;(define bitwise-not lognot)
-(define bit-count logcount)
-(define bit-set?   logbit?)
-(define any-bits-set? logtest)
-(define first-set-bit log2-binary-factors)
-(define bitwise-merge bitwise-if)
-#;(provide 'srfi-60)
-
-;;; Legacy
-;;(define (logical:rotate k count len) (rotate-bit-field k count 0 len))
-;;(define (logical:ones deg) (lognot (ash -1 deg)))
-;;(define integer-expt expt)		; legacy name
-
-
-)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/61.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/61.rkt
deleted file mode 100644
index 3a10400eed..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/61.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-61
-#lang s-exp srfi/provider srfi/61/cond #:unprefix srfi:
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/61/cond.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/61/cond.rkt
deleted file mode 100644
index 8a942846f8..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/61/cond.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-;;SRFI 61  A more general COND clause
-;;Chongkai Zhu  mrmathematica@yahoo.com
-;;12-18-2005
-;; * Updated by Chris Jester-Young 2013-02-28
-#lang racket/base
-(provide (prefix-out srfi: (combine-out cond => else)))
-
-(define-syntax cond
-  (syntax-rules (=> else)
-    ((_ (else else1 else2 ...))
-     (when #t (begin else1 else2 ...)))
-    ((_ (test => receiver) more-clause ...)
-     (let ((t test))
-       (if t
-           (receiver t)
-           (cond more-clause ...))))
-    ((_ (generator guard => receiver) more-clause ...)
-     (call-with-values (lambda () generator)
-                       (lambda t
-                         (if (apply guard    t)
-                             (apply receiver t)
-                             (cond more-clause ...)))))
-    ((_ (test) more-clause ...)
-     (or test (cond more-clause ...)))
-    ((_ (test body ...) more-clause ...)
-     (if test
-         (begin body ...)
-         (cond more-clause ...)))
-    ((_)
-     (void))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/63.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/63.rkt
deleted file mode 100644
index edc3b3731e..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/63.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-1
-#lang s-exp srfi/provider srfi/63/63 #:unprefix s:
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/63/63.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/63/63.rkt
deleted file mode 100644
index c28fca1048..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/63/63.rkt
+++ /dev/null
@@ -1,395 +0,0 @@
-;; Implementation of SRFI 63 "Homogeneous and Heterogeneous Arrays" for PLT 
-;; Scheme.
-;; Copyright (C) 2007-2014 Chongkai Zhu
-
-;; Released under the same terms as the SRFI reference implementation.
-
-;; Parts of this file are based on SLIB "array.scm" Arrays for Scheme.
-;; Copyright (C) 2001, 2003, 2005, 2006 Aubrey Jaffer
-
-(module |63| mzscheme
-  
-  (require srfi/4
-           mzlib/contract)
-  
-  (define-syntax make-cvector
-    (syntax-rules ()
-      ((_ make-fvector)
-       (case-lambda
-         ((n)
-          (cons (make-fvector n)
-                (make-fvector n)))
-         ((n fill)
-          (cons (make-fvector n (real-part fill))
-                (make-fvector n (imag-part fill))))))))
-  (define-syntax cvector-ref
-    (syntax-rules ()
-      ((_ fvector-ref)
-       (lambda (v n)
-         (make-rectangular (fvector-ref (car v) n)
-                           (fvector-ref (cdr v) n))))))
-  (define-syntax cvector-set!
-    (syntax-rules ()
-      ((_ fvector-set!)
-       (lambda (v n z)
-         (fvector-set! (car v) n (real-part z))
-         (fvector-set! (cdr v) n (imag-part z))))))
-  
-  (define make-c64vector
-    (make-cvector make-f64vector))
-  (define c64vector-ref
-    (cvector-ref f64vector-ref))
-  (define c64vector-set!
-    (cvector-set! f64vector-set!))
-  (define make-c32vector
-    (make-cvector make-f32vector))
-  (define c32vector-ref
-    (cvector-ref f32vector-ref))
-  (define c32vector-set!
-    (cvector-set! f32vector-set!))
-  
-  (define (make-floc/c _) complex?)
-  (define (make-flor/c _) real?)
-  (define (make-fix/c n signed?)
-    (and/c exact?
-           (if signed?
-               (let ((x (arithmetic-shift 1 (sub1 n))))
-                 (integer-in (- x) (sub1 x)))
-               (integer-in 0 (sub1 (arithmetic-shift 1 n))))))
-  
-  (define implementations
-    (let ((table
-           (make-immutable-hash-table
-            (list (list 'char     make-string    string-ref    string-set!    char?)
-                  (list 'byte     make-bytes     bytes-ref     bytes-set!     byte?)
-                  (list 'vector   make-vector    vector-ref    vector-set!    any/c)
-                  (list 'bool     make-vector    vector-ref    vector-set!    boolean?)
-                  (list 'floC64b  make-c64vector c64vector-ref c64vector-set! (make-floc/c 64))
-                  (list 'floC32b  make-c32vector c32vector-ref c32vector-set! (make-floc/c 32))
-                  (list 'floR64b  make-f64vector f64vector-ref f64vector-set! (make-flor/c 64))
-                  (list 'floR32b  make-f32vector f32vector-ref f32vector-set! (make-flor/c 32))
-                  (list 'fixZ64b  make-s64vector s64vector-ref s64vector-set! (make-fix/c 64 #t))
-                  (list 'fixZ32b  make-s32vector s32vector-ref s32vector-set! (make-fix/c 32 #t))
-                  (list 'fixZ16b  make-s16vector s16vector-ref s16vector-set! (make-fix/c 16 #t))
-                  (list 'fixZ8b   make-s8vector  s8vector-ref  s8vector-set!  (make-fix/c  8 #t))
-                  (list 'fixN64b  make-u64vector u64vector-ref u64vector-set! (make-fix/c 64 #f))
-                  (list 'fixN32b  make-u32vector u32vector-ref u32vector-set! (make-fix/c 32 #f))
-                  (list 'fixN16b  make-u16vector u16vector-ref u16vector-set! (make-fix/c 16 #f))
-                  (list 'fixN8b   make-u8vector  u8vector-ref  u8vector-set!  (make-fix/c  8 #f))))))
-      (lambda (type pos)
-        (list-ref (hash-table-get table type) pos))))
-  
-  (define (array-print array port write?)
-    (display "#" port)
-    (display (length (my-array-ref array 0)) port)
-    (display "A" port)
-    (let ((type (my-array-ref array 4)))
-      (unless (eq? type 'vector)
-        (display ":" port)
-        (display type port)))
-    (display (array->list array) port))
-  
-  (define-values (struct:array my-make-array my-array? my-array-ref my-array-set!)
-    (make-struct-type 'array #f 5 0 #f
-                      (list (cons prop:custom-write array-print))
-                      #f))
-  
-  (define (array-dimensions array)
-    (cond ((vector? array) (list (vector-length array)))
-          ((string? array) (list (string-length array)))
-          ((bytes? array) (list (bytes-length array)))
-          (else (my-array-ref array 0))))
-  (define (array-scales obj)
-    (if (or (string? obj)
-            (bytes? obj)
-            (vector? obj))
-        '(1)
-        (my-array-ref obj 1)))
-  (define (array-offset obj)
-    (if (or (string? obj)
-            (bytes? obj)
-            (vector? obj))
-        0
-        (my-array-ref obj 2)))
-  (define (array-store obj)
-    (if (or (string? obj)
-            (bytes? obj)
-            (vector? obj))
-        obj
-        (my-array-ref obj 3)))
-  (define (array-store-type obj)
-    (cond ((string? obj) 'char)
-          ((bytes? obj)  'byte)
-          ((vector? obj) 'vector)
-          (else (my-array-ref obj 4))))
-  
-  (define (array-store-maker array-type)
-    (implementations array-type 0))
-  (define (array-store-ref array)
-    (implementations (array-store-type array) 1))
-  (define (array-store-set array)
-    (implementations (array-store-type array) 2))
-  
-  (define (array? obj)
-    (or (string? obj)
-        (bytes? obj)
-        (vector? obj)
-        (my-array? obj)))
-  
- (define (s:equal? obj1 obj2)
-   (or (equal? obj1 obj2)
-       (cond ((and (box? obj1)
-                   (box? obj2))
-              (s:equal? (unbox obj1)
-                        (unbox obj2)))
-             ((and (pair? obj1)
-                   (pair? obj2))
-              (and (s:equal? (car obj1) (car obj2))
-                   (s:equal? (cdr obj1) (cdr obj2))))
-             ((and (vector? obj1)
-                   (vector? obj2))
-              (and (equal? (vector-length obj1) (vector-length obj2))
-                   (let lp ((idx (sub1 (vector-length obj1))))
-                     (or (negative? idx)
-                         (and (s:equal? (vector-ref obj1 idx)
-                                        (vector-ref obj2 idx))
-                              (lp (sub1 idx)))))))
-             ((and (string? obj1)
-                   (string? obj2))
-              (string=? obj1 obj2))
-             ((and (array? obj1)
-                   (array? obj2))
-              (and (equal? (array-dimensions obj1) (array-dimensions obj2))
-                   (s:equal? (array->vector obj1) (array->vector obj2))))
-             ((and (struct? obj1)
-                   (struct? obj2))
-              (let-values (((obj1-type obj1-skipped?)
-                            (struct-info obj1))
-                           ((obj2-type obj2-skipped?)
-                            (struct-info obj2)))
-                (and (eq? obj1-type obj2-type)
-                     (not obj1-skipped?)
-                     (not obj2-skipped?)
-                     (s:equal? (struct->vector obj1)
-                               (struct->vector obj2)))))
-             (else #f))))
-  
-  (define (array-rank obj)
-    (if (array? obj) (length (array-dimensions obj)) 0))
-  
-  (define (make-array prototype . dimensions)
-    (let ((prot    (array-store prototype))
-          (pdims   (array-dimensions prototype))
-          (onedim? (eqv? 1 (length dimensions)))
-          (tcnt    (apply * dimensions)))    
-      (let ((initializer
-             (if (zero? (apply * pdims)) '()
-                 (list      ;; a list with single element at origin
-                  (apply array-ref prototype
-                         (map (lambda (x) 0) pdims))))))    
-        
-        (cond ((and onedim? (string? prot))
-               (apply make-string (car dimensions) initializer))
-              ((and onedim? (vector? prot))
-               (apply make-vector (car dimensions) initializer))            
-              (else
-               (let* ((store-type (array-store-type prototype))
-                      (store (apply (array-store-maker store-type)
-                                    tcnt initializer)))
-                 (let loop ((dims (reverse dimensions)) (scales '(1)))
-                   (if (null? dims)
-                       (my-make-array dimensions (cdr scales) 0 
-                                      store
-                                      store-type)
-                       (loop (cdr dims)
-                             (cons (* (car dims) (car scales)) scales))))))))))
-  
-  (define (make-shared-array array mapper . dimensions)
-    (define odl (array-scales array))
-    (define rank (length dimensions))
-    (define shape
-      (map (lambda (dim) (if (list? dim) dim (list 0 (sub1 dim)))) dimensions))
-    
-    (do ((idx (sub1 rank) (sub1 idx))
-         (uvt (if (zero? rank)
-                  '()
-                  (append (cdr (vector->list (make-vector rank 0))) '(1)))
-              (append (cdr uvt) '(0)))
-         (uvts '() (cons uvt uvts)))
-      ((negative? idx)
-       (let ((ker0 (apply + (map * odl (apply mapper uvt)))))
-         (my-make-array
-          (map (lambda (dim) (add1 (- (cadr dim) (car dim)))) shape)
-          (map (lambda (uvt) (- (apply + (map * odl (apply mapper uvt))) ker0))
-               uvts)
-          (apply +
-                 (array-offset array)
-                 (map * odl (apply mapper (map car shape))))
-          (array-store array)
-          (array-store-type array))))))
-  
-  (define (list->array rank proto lst)
-    (define dimensions
-      (do ((shp '() (cons (length row) shp))
-           (row lst (car lst))
-           (rnk (sub1 rank) (sub1 rnk)))
-        ((negative? rnk) (reverse shp))))
-    (let ((nra (apply make-array proto dimensions)))
-      (define (l2ra dims idxs row)
-        (cond ((null? dims)
-               (apply array-set! nra row (reverse idxs)))
-              ((unless (eqv? (car dims) (length row))
-                 (error 'list->array
-                        "non-rectangular array ~a ~a"
-                        dims dimensions))
-               (do ((idx 0 (add1 idx))
-                    (row row (cdr row)))
-                 ((>= idx (car dims)))
-                 (l2ra (cdr dims) (cons idx idxs) (car row))))))
-      (l2ra dimensions '() lst)
-      nra))
-  
-  (define (array->list ra)
-    (define (ra2l dims idxs)
-      (if (null? dims)
-          (apply array-ref ra (reverse idxs))
-          (do ((lst '() (cons (ra2l (cdr dims) (cons idx idxs)) lst))
-               (idx (sub1 (car dims)) (sub1 idx)))
-            ((negative? idx) lst))))
-    (ra2l (array-dimensions ra) '()))
-  
-  (define (vector->array vect prototype . dimensions)
-    (define vdx (vector-length vect))
-    (let ((ra (apply make-array prototype dimensions)))
-      (define (v2ra dims idxs)
-        (cond ((null? dims)
-               (set! vdx (sub1 vdx))
-               (apply array-set! ra (vector-ref vect vdx) (reverse idxs)))
-              (else
-               (do ((idx (sub1 (car dims)) (sub1 idx)))
-                 ((negative? idx) vect)
-                 (v2ra (cdr dims) (cons idx idxs))))))
-      (v2ra dimensions '())
-      ra))
-  
-  (define (array->vector ra)
-    (define dims (array-dimensions ra))
-    (let* ((vdx (apply * dims))
-           (vect (make-vector vdx)))
-      (define (ra2v dims idxs)
-        (if (null? dims)
-            (let ((val (apply array-ref ra (reverse idxs))))
-              (set! vdx (sub1 vdx))
-              (vector-set! vect vdx val)
-              vect)
-            (do ((idx (sub1 (car dims)) (sub1 idx)))
-              ((negative? idx) vect)
-              (ra2v (cdr dims) (cons idx idxs)))))
-      (ra2v dims '())))
-  
-  (define (array-in-bounds? array . indices)
-    (do ((bnds (array-dimensions array) (cdr bnds))
-         (idxs indices (cdr idxs)))
-      ((or (null? bnds)
-           (null? idxs)
-           (not (integer? (car idxs)))
-           (not (< -1 (car idxs) (car bnds))))
-       (and (null? bnds) (null? idxs)))))
-  
-  (define (array-ref array . indices)
-    ((array-store-ref array)
-     (array-store array)
-     (apply + (array-offset array) (map * (array-scales array) indices))))
-  
-  (define (array-set! array obj . indices)    
-    ((array-store-set array)
-     (array-store array)
-     (apply + (array-offset array) (map * (array-scales array) indices))
-     obj))
-  
-  (define (tag-maker array-type)
-    (case-lambda
-      (()  (my-make-array 
-            '(0) '(1) 0
-            ((array-store-maker array-type) 0)
-            array-type))
-      
-      ((x) (my-make-array
-            '(1) '(1) 0
-            ((array-store-maker array-type) 1 x)
-            array-type))))
-  
-  (define (make-A:/c c)
-    (case-> (-> any)
-            (-> c any)))    
-  
-  (provide array?
-           array-rank
-           s:equal?)
-  
-  (provide/contract
-   
-   (array-dimensions (-> array? any))
-   
-   (make-array
-    (->* (array?) (listof natural-number/c) any))
-   
-   (make-shared-array
-    (->* (array?
-          (unconstrained-domain-> (listof natural-number/c)))
-         (listof natural-number/c)
-         any))
-   
-   (list->array
-    (->r ((rank natural-number/c)
-          (proto array?)
-          (list (if (zero? rank)
-                    any/c
-                    list?)))
-         any))
-   
-   (array->list
-    (-> array? any))
-   (array->vector
-    (-> array? any))
-   
-   (array-in-bounds?
-    (->* (array?) (listof natural-number/c) any))
-   
-   (array-set!
-    (->r ((array array?)
-          (val (implementations (array-store-type array) 3)))
-         indices (lambda _ (apply array-in-bounds? array indices))
-         any))
-   
-   (array-ref
-    (->r ((array array?)) indices 
-         (lambda _ (apply array-in-bounds? array indices)) 
-         any))
-   
-   (vector->array
-    (->r ((vector vector?) (proto array?))
-         dimensions (lambda _ (eqv? (vector-length vector) (apply * dimensions)))
-         any)))
-  
-  (define-syntax A:
-    (syntax-rules ()
-      ((_ name label)
-       (begin (define name (tag-maker label))
-              (provide/contract
-               (name (make-A:/c (implementations label 3))))))))
-  
-  (A: A:floC32b 'floC32b)
-  (A: A:floR64b 'floR64b)
-  (A: A:floR32b 'floR32b)
-  (A: A:fixZ64b 'fixZ64b)
-  (A: A:fixZ16b 'fixZ16b)
-  (A: A:fixZ32b 'fixZ32b)
-  (A: A:fixZ8b  'fixZ8b)
-  (A: A:fixN64b 'fixN64b)
-  (A: A:fixN32b 'fixN32b)
-  (A: A:fixN16b 'fixN16b)
-  (A: A:fixN8b  'fixN8b)
-  (A: A:bool    'bool)
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/64.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/64.rkt
deleted file mode 100644
index 01f62612fe..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/64.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-64
-#lang s-exp srfi/provider srfi/64/testing
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/64/testing.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/64/testing.rkt
deleted file mode 100644
index e054da73da..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/64/testing.rkt
+++ /dev/null
@@ -1,737 +0,0 @@
-;; Copyright (c) 2005, 2006 Per Bothner
-;;
-;; Permission is hereby granted, free of charge, to any person
-;; obtaining a copy of this software and associated documentation
-;; files (the "Software"), to deal in the Software without
-;; restriction, including without limitation the rights to use, copy,
-;; modify, merge, publish, distribute, sublicense, and/or sell copies
-;; of the Software, and to permit persons to whom the Software is
-;; furnished to do so, subject to the following conditions:
-;;
-;; The above copyright notice and this permission notice shall be
-;; included in all copies or substantial portions of the Software.
-;;
-;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-;; SOFTWARE.
-
-(module testing mzscheme
-  
-  (require srfi/9)
-  
-  ;; List of exported names
-  (provide
-   test-begin ;; must be listed first, since in Kawa (at least) it is "magic".
-   test-end test-assert test-eqv test-eq test-equal
-   test-approximate test-error test-apply test-with-runner
-   test-match-nth test-match-all test-match-any test-match-name
-   test-skip test-expect-fail test-read-eval-string
-   test-runner-group-path
-   test-group test-group-with-cleanup
-   test-result-ref test-result-set! test-result-clear test-result-remove
-   test-result-kind test-passed?
-   test-log-to-file
-   ; Misc test-runner functions
-   test-runner? test-runner-reset test-runner-null
-   test-runner-simple test-runner-current test-runner-factory test-runner-get
-   test-runner-create test-runner-test-name
-   ;; test-runner field setter and getter functions - see %test-record-define:
-   test-runner-pass-count test-runner-pass-count!
-   test-runner-fail-count test-runner-fail-count!
-   test-runner-xpass-count test-runner-xpass-count!
-   test-runner-xfail-count test-runner-xfail-count!
-   test-runner-skip-count test-runner-skip-count!
-   test-runner-group-stack test-runner-group-stack!
-   test-runner-on-test-begin test-runner-on-test-begin!
-   test-runner-on-test-end test-runner-on-test-end!
-   test-runner-on-group-begin test-runner-on-group-begin!
-   test-runner-on-group-end test-runner-on-group-end!
-   test-runner-on-final test-runner-on-final!
-   test-runner-on-bad-count test-runner-on-bad-count!
-   test-runner-on-bad-end-name test-runner-on-bad-end-name!
-   test-result-alist test-result-alist!
-   test-runner-aux-value test-runner-aux-value!
-   ;; default/simple call-back functions, used in default test-runner,
-   ;; but can be called to construct more complex ones.
-   test-on-group-begin-simple test-on-group-end-simple
-   test-on-bad-count-simple test-on-bad-end-name-simple
-   test-on-final-simple test-on-test-end-simple)
-  
-  (define-syntax %test-record-define
-    (syntax-rules ()
-      ((%test-record-define alloc runner? (name index setter getter) ...)
-       (define-record-type test-runner
-                           (alloc name ...)
-                           runner?
-                           (name setter getter) ...))))
-  
-  (%test-record-define
-   my-%test-runner-alloc test-runner?
-   ;; Cumulate count of all tests that have passed and were expected to.
-   (pass-count 1 test-runner-pass-count test-runner-pass-count!)
-   (fail-count 2 test-runner-fail-count test-runner-fail-count!)
-   (xpass-count 3 test-runner-xpass-count test-runner-xpass-count!)
-   (xfail-count 4 test-runner-xfail-count test-runner-xfail-count!)
-   (skip-count 5 test-runner-skip-count test-runner-skip-count!)
-   (skip-list 6 %test-runner-skip-list %test-runner-skip-list!)
-   (fail-list 7 %test-runner-fail-list %test-runner-fail-list!)
-   ;; Normally #t, except when in a test-apply.
-   (run-list 8 %test-runner-run-list %test-runner-run-list!)
-   (skip-save 9 %test-runner-skip-save %test-runner-skip-save!)
-   (fail-save 10 %test-runner-fail-save %test-runner-fail-save!)
-   (group-stack 11 test-runner-group-stack test-runner-group-stack!)
-   (on-test-begin 12 test-runner-on-test-begin test-runner-on-test-begin!)
-   (on-test-end 13 test-runner-on-test-end test-runner-on-test-end!)
-   ;; Call-back when entering a group. Takes (runner suite-name count).
-   (on-group-begin 14 test-runner-on-group-begin test-runner-on-group-begin!)
-   ;; Call-back when leaving a group.
-   (on-group-end 15 test-runner-on-group-end test-runner-on-group-end!)
-   ;; Call-back when leaving the outermost group.
-   (on-final 16 test-runner-on-final test-runner-on-final!)
-   ;; Call-back when expected number of tests was wrong.
-   (on-bad-count 17 test-runner-on-bad-count test-runner-on-bad-count!)
-   ;; Call-back when name in test=end doesn't match test-begin.
-   (on-bad-end-name 18 test-runner-on-bad-end-name test-runner-on-bad-end-name!)
-   ;; Cumulate count of all tests that have been done.
-   (total-count 19 %test-runner-total-count %test-runner-total-count!)
-   ;; Stack (list) of (count-at-start . expected-count):
-   (count-list 20 %test-runner-count-list %test-runner-count-list!)
-   (result-alist 21 test-result-alist test-result-alist!)
-   ;; Field can be used by test-runner for any purpose.
-   ;; test-runner-simple uses it for a log file.
-   (aux-value 22 test-runner-aux-value test-runner-aux-value!)
-   )
-  
-  (define (%test-runner-alloc)
-    (my-%test-runner-alloc
-     0 0 0 0 0 0 0 0 0 0 0
-     0 0 0 0 0 0 0 0 0 0 0))
-  
-  (define (test-runner-reset runner)
-    (test-runner-pass-count! runner 0)
-    (test-runner-fail-count! runner 0)
-    (test-runner-xpass-count! runner 0)
-    (test-runner-xfail-count! runner 0)
-    (test-runner-skip-count! runner 0)
-    (%test-runner-total-count! runner 0)
-    (%test-runner-count-list! runner '())
-    (%test-runner-run-list! runner #t)
-    (%test-runner-skip-list! runner '())
-    (%test-runner-fail-list! runner '())
-    (%test-runner-skip-save! runner '())
-    (%test-runner-fail-save! runner '())
-    (test-runner-group-stack! runner '()))
-  
-  (define (test-runner-group-path runner)
-    (reverse (test-runner-group-stack runner)))
-  
-  (define (%test-null-callback runner) #f)
-  
-  (define (test-runner-null)
-    (let ((runner (%test-runner-alloc)))
-      (test-runner-reset runner)
-      (test-runner-on-group-begin! runner (lambda (runner name count) #f))
-      (test-runner-on-group-end! runner %test-null-callback)
-      (test-runner-on-final! runner %test-null-callback)
-      (test-runner-on-test-begin! runner %test-null-callback)
-      (test-runner-on-test-end! runner %test-null-callback)
-      (test-runner-on-bad-count! runner (lambda (runner count expected) #f))
-      (test-runner-on-bad-end-name! runner (lambda (runner begin end) #f))
-      runner))
-  
-  ;; Not part of the specification.  FIXME
-  ;; Controls whether a log file is generated.
-  (define test-log-to-file #t)
-  
-  (define (test-runner-simple)
-    (let ((runner (%test-runner-alloc)))
-      (test-runner-reset runner)
-      (test-runner-on-group-begin! runner test-on-group-begin-simple)
-      (test-runner-on-group-end! runner test-on-group-end-simple)
-      (test-runner-on-final! runner test-on-final-simple)
-      (test-runner-on-test-begin! runner test-on-test-begin-simple)
-      (test-runner-on-test-end! runner test-on-test-end-simple)
-      (test-runner-on-bad-count! runner test-on-bad-count-simple)
-      (test-runner-on-bad-end-name! runner test-on-bad-end-name-simple)
-      runner))
-  
-  (define test-runner-current (make-parameter #f))
-  (define test-runner-factory (make-parameter test-runner-simple))
-  
-  ;; A safer wrapper to test-runner-current.
-  (define (test-runner-get)
-    (let ((r (test-runner-current)))
-      (unless r
-        (error "test-runner not initialized - test-begin missing?"))
-      r))
-  
-  (define (%test-specificier-matches spec runner)
-    (spec runner))
-  
-  (define (test-runner-create)
-    ((test-runner-factory)))
-  
-  (define (%test-any-specifier-matches list runner)
-    (let ((result #f))
-      (let loop ((l list))
-        (cond ((null? l) result)
-              (else
-               (if (%test-specificier-matches (car l) runner)
-                   (set! result #t))
-               (loop (cdr l)))))))
-  
-  ;; Returns #f, #t, or 'xfail.
-  (define (%test-should-execute runner)
-    (let ((run (%test-runner-run-list runner)))
-      (cond ((or
-              (not (or (eqv? run #t)
-                       (%test-any-specifier-matches run runner)))
-              (%test-any-specifier-matches
-               (%test-runner-skip-list runner)
-               runner))
-             (test-result-set! runner 'result-kind 'skip)
-             #f)
-            ((%test-any-specifier-matches
-              (%test-runner-fail-list runner)
-              runner)
-             (test-result-set! runner 'result-kind 'xfail)
-             'xfail)
-            (else #t))))
-  
-  (define (%test-begin suite-name count)
-    (if (not (test-runner-current))
-        (test-runner-current (test-runner-create)))
-    (let ((runner (test-runner-current)))
-      ((test-runner-on-group-begin runner) runner suite-name count)
-      (%test-runner-skip-save! runner
-                               (cons (%test-runner-skip-list runner)
-                                     (%test-runner-skip-save runner)))
-      (%test-runner-fail-save! runner
-                               (cons (%test-runner-fail-list runner)
-                                     (%test-runner-fail-save runner)))
-      (%test-runner-count-list! runner
-                                (cons (cons (%test-runner-total-count runner)
-                                            count)
-                                      (%test-runner-count-list runner)))
-      (test-runner-group-stack! runner (cons suite-name
-                                             (test-runner-group-stack runner)))))
-  (define-syntax test-begin
-    (syntax-rules ()
-      ((test-begin suite-name)
-       (%test-begin suite-name #f))
-      ((test-begin suite-name count)
-       (%test-begin suite-name count))))
-  
-  (define (test-on-group-begin-simple runner suite-name count)
-    (when (null? (test-runner-group-stack runner))
-      (display "%%%% Starting test ")
-      (display suite-name)
-      (if test-log-to-file
-          (let* ((log-file-name
-                  (if (string? test-log-to-file) test-log-to-file
-                      (string-append suite-name ".log")))
-                 (log-file
-                  (open-output-file log-file-name 'truncate/replace)))
-            (display "%%%% Starting test " log-file)
-            (display suite-name log-file)
-            (newline log-file)
-            (test-runner-aux-value! runner log-file)
-            (display "  (Writing full log to \"")
-            (display log-file-name)
-            (display "\")")))
-      (newline))
-    (let ((log (test-runner-aux-value runner)))
-      (when (output-port? log)
-        (display "Group begin: " log)
-        (display suite-name log)
-        (newline log)))
-    #f)
-  
-  (define (test-on-group-end-simple runner)
-    (let ((log (test-runner-aux-value runner)))
-      (when (output-port? log)
-        (display "Group end: " log)
-        (display (car (test-runner-group-stack runner)) log)
-        (newline log)
-        (flush-output log)))
-    #f)
-  
-  (define (%test-on-bad-count-write runner count expected-count port)
-    (display "*** Total number of tests was " port)
-    (display count port)
-    (display " but should be " port)
-    (display expected-count port)
-    (display ". ***" port)
-    (newline port)
-    (display "*** Discrepancy indicates testsuite error or exceptions. ***" port)
-    (newline port))
-  
-  (define (test-on-bad-count-simple runner count expected-count)
-    (%test-on-bad-count-write runner count expected-count (current-output-port))
-    (let ((log (test-runner-aux-value runner)))
-      (if (output-port? log)
-          (%test-on-bad-count-write runner count expected-count log))))
-  
-  (define (test-on-bad-end-name-simple runner begin-name end-name)
-    (error (string-append (%test-format-line runner) "test-end " begin-name
-                          " does not match test-begin " end-name)))
-  
-  
-  (define (%test-final-report1 value label port)
-    (when (> value 0)
-      (display label port)
-      (display value port)
-      (newline port)))
-  
-  (define (%test-final-report-simple runner port)
-    (%test-final-report1 (test-runner-pass-count runner)
-                         "# of expected passes      " port)
-    (%test-final-report1 (test-runner-xfail-count runner)
-                         "# of expected failures    " port)
-    (%test-final-report1 (test-runner-xpass-count runner)
-                         "# of unexpected successes " port)
-    (%test-final-report1 (test-runner-fail-count runner)
-                         "# of unexpected failures  " port)
-    (%test-final-report1 (test-runner-skip-count runner)
-                         "# of skipped tests        " port))
-  
-  (define (test-on-final-simple runner)
-    (%test-final-report-simple runner (current-output-port))
-    (let ((log (test-runner-aux-value runner)))
-      (if (output-port? log)
-          (%test-final-report-simple runner log))))
-  
-  (define (%test-format-line runner)
-    (let* ((line-info (test-result-alist runner))
-           (source-file (assq 'source-file line-info))
-           (source-line (assq 'source-line line-info))
-           (file (if source-file (cdr source-file) "")))
-      (if source-line
-          (string-append file ":"
-                         (number->string (cdr source-line)) ": ")
-          "")))
-  
-  (define (%test-end suite-name line-info)
-    (let* ((r (test-runner-get))
-           (groups (test-runner-group-stack r))
-           (line (%test-format-line r)))
-      (test-result-alist! r line-info)
-      (if (null? groups)
-          (error (string-append line "test-end not in a group")))
-      (if (and suite-name (not (equal? suite-name (car groups))))
-          ((test-runner-on-bad-end-name r) r suite-name (car groups)))
-      (let* ((count-list (%test-runner-count-list r))
-             (expected-count (cdar count-list))
-             (saved-count (caar count-list))
-             (group-count (- (%test-runner-total-count r) saved-count)))
-        (if (and expected-count
-                 (not (= expected-count group-count)))
-            ((test-runner-on-bad-count r) r group-count expected-count))
-        ((test-runner-on-group-end r) r)
-        (test-runner-group-stack! r (cdr (test-runner-group-stack r)))
-        (%test-runner-skip-list! r (car (%test-runner-skip-save r)))
-        (%test-runner-skip-save! r (cdr (%test-runner-skip-save r)))
-        (%test-runner-fail-list! r (car (%test-runner-fail-save r)))
-        (%test-runner-fail-save! r (cdr (%test-runner-fail-save r)))
-        (%test-runner-count-list! r (cdr count-list))
-        (if (null? (test-runner-group-stack r))
-            ((test-runner-on-final r) r)))))
-  
-  (define-syntax test-group
-    (syntax-rules ()
-      ((test-group suite-name . body)
-       (let ((r (test-runner-current)))
-         ;; Ideally should also set line-number, if available.
-         (test-result-alist! r (list (cons 'test-name suite-name)))
-         (if (%test-should-execute r)
-             (dynamic-wind
-              (lambda () (test-begin suite-name))
-              (lambda () . body)
-              (lambda () (test-end  suite-name))))))))
-  
-  (define-syntax test-group-with-cleanup
-    (syntax-rules ()
-      ((test-group-with-cleanup suite-name form cleanup-form)
-       (test-group suite-name
-                   (dynamic-wind
-                    (lambda () #f)
-                    (lambda () form)
-                    (lambda () cleanup-form))))
-      ((test-group-with-cleanup suite-name cleanup-form)
-       (test-group-with-cleanup suite-name #f cleanup-form))
-      ((test-group-with-cleanup suite-name form1 form2 form3 . rest)
-       (test-group-with-cleanup suite-name (begin form1 form2) form3 . rest))))
-  
-  (define (test-on-test-begin-simple runner)
-    (let ((log (test-runner-aux-value runner)))
-      (if (output-port? log)
-          (let* ((results (test-result-alist runner))
-                 (source-file (assq 'source-file results))
-                 (source-line (assq 'source-line results))
-                 (source-form (assq 'source-form results))
-                 (test-name (assq 'test-name results)))
-            (display "Test begin:" log)
-            (newline log)
-            (if test-name (%test-write-result1 test-name log))
-            (if source-file (%test-write-result1 source-file log))
-            (if source-line (%test-write-result1 source-line log))
-            (if source-file (%test-write-result1 source-form log))))))
-  
-  (define-syntax test-result-ref
-    (syntax-rules ()
-      ((test-result-ref runner pname)
-       (test-result-ref runner pname #f))
-      ((test-result-ref runner pname default)
-       (let ((p (assq pname (test-result-alist runner))))
-         (if p (cdr p) default)))))
-  
-  (define (test-on-test-end-simple runner)
-    (let ((log (test-runner-aux-value runner))
-          (kind (test-result-ref runner 'result-kind)))
-      (if (memq kind '(fail xpass))
-          (let* ((results (test-result-alist runner))
-                 (source-file (assq 'source-file results))
-                 (source-line (assq 'source-line results))
-                 (test-name (assq 'test-name results)))
-            (when (or source-file source-line)
-              (if source-file (display (cdr source-file)))
-              (display ":")
-              (if source-line (display (cdr source-line)))
-              (display ": "))
-            (display (if (eq? kind 'xpass) "XPASS" "FAIL"))
-            (when test-name
-              (display " ")
-              (display (cdr test-name)))
-            (newline)))
-      (when (output-port? log)
-        (display "Test end:" log)
-        (newline log)
-        (let loop ((list (test-result-alist runner)))
-          (if (pair? list)
-              (let ((pair (car list)))
-                ;; Write out properties not written out by on-test-begin.
-                (if (not (memq (car pair)
-                               '(test-name source-file source-line source-form)))
-                    (%test-write-result1 pair log))
-                (loop (cdr list))))))))
-  
-  (define (%test-write-result1 pair port)
-    (display "  " port)
-    (display (car pair) port)
-    (display ": " port)
-    (write (cdr pair) port)
-    (newline port))
-  
-  (define (test-result-set! runner pname value)
-    (let* ((alist (test-result-alist runner)))
-      (test-result-alist! 
-       runner
-       (let loop ([alist alist])
-         (cond
-          [(null? alist) (list (cons pname value))]
-          [(eq? pname (caar alist))
-           (cons (cons pname value)
-                 (cdr alist))]
-          [else (cons (car alist)
-                      (loop (cdr alist)))])))))
-  
-  (define (test-result-clear runner)
-    (test-result-alist! runner '()))
-  
-  (define (test-result-remove runner pname)
-    (let* ((alist (test-result-alist runner))
-           (p (assq pname alist)))
-      (if p
-          (test-result-alist! runner
-                              (let loop ((r alist))
-                                (if (eq? r p) (cdr r)
-                                    (cons (car r) (loop (cdr r)))))))))
-  
-  (define (test-result-kind . rest)
-    (let ((runner (if (pair? rest) (car rest) (test-runner-current))))
-      (test-result-ref runner 'result-kind)))
-  
-  (define (test-passed? . rest)
-    (let ((runner (if (pair? rest) (car rest) (test-runner-get))))
-      (memq (test-result-ref runner 'result-kind) '(pass xpass))))
-  
-  (define (%test-report-result)
-    (let* ((r (test-runner-get))
-           (result-kind (test-result-kind r)))
-      (case result-kind
-        ((pass)
-         (test-runner-pass-count! r (+ 1 (test-runner-pass-count r))))
-        ((fail)
-         (test-runner-fail-count!	r (+ 1 (test-runner-fail-count r))))
-        ((xpass)
-         (test-runner-xpass-count! r (+ 1 (test-runner-xpass-count r))))
-        ((xfail)
-         (test-runner-xfail-count! r (+ 1 (test-runner-xfail-count r))))
-        (else
-         (test-runner-skip-count! r (+ 1 (test-runner-skip-count r)))))
-      (%test-runner-total-count! r (+ 1 (%test-runner-total-count r)))
-      ((test-runner-on-test-end r) r)))
-  
-  (define-syntax %test-evaluate-with-catch
-    (syntax-rules ()
-      ((%test-evaluate-with-catch test-expression)
-       (with-handlers (((lambda (exn) #t)
-                        (lambda (exn) #f)))
-         test-expression))))
-  
-  (define-for-syntax (%test-syntax-file form)
-                     (let ((source (syntax-source form)))
-                       (cond ((string? source) source)
-                             ((path? source) (path->string source))
-                             (else #f))))
-  
-  (define-for-syntax (%test-source-line2 form)
-                     (let* ((line (syntax-line form))
-                            (file (%test-syntax-file form))
-                            (line-pair (if line (list (cons 'source-line line)) '())))
-                       (cons (cons 'source-form (syntax-object->datum form))
-                             (if file (cons (cons 'source-file file) line-pair) line-pair))))
-  
-  (define (%test-on-test-begin r)
-    (%test-should-execute r)
-    ((test-runner-on-test-begin r) r)
-    (not (eq? 'skip (test-result-ref r 'result-kind))))
-  
-  (define (%test-on-test-end r result)
-    (test-result-set! r 'result-kind
-                      (if (eq? (test-result-ref r 'result-kind) 'xfail)
-                          (if result 'xpass 'xfail)
-                          (if result 'pass 'fail))))
-  
-  (define (test-runner-test-name runner)
-    (test-result-ref runner 'test-name ""))
-  
-  (define-syntax %test-comp2body
-    (syntax-rules ()
-      ((%test-comp2body r comp expected expr)
-       (let ()
-         (if (%test-on-test-begin r)
-             (let ((exp expected))
-               (test-result-set! r 'expected-value exp)
-               (let ((res (%test-evaluate-with-catch expr)))
-                 (test-result-set! r 'actual-value res)
-                 (%test-on-test-end r (comp exp res)))))
-         (%test-report-result)))))
-  
-  (define (%test-approximimate= error)
-    (lambda (value expected)
-      (and (>= value (- expected error))
-           (<= value (+ expected error)))))
-  
-  (define-syntax %test-comp1body
-    (syntax-rules ()
-      ((%test-comp1body r expr)
-       (let ()
-         (if (%test-on-test-begin r)
-             (let ()
-               (let ((res (%test-evaluate-with-catch expr)))
-                 (test-result-set! r 'actual-value res)
-                 (%test-on-test-end r res))))
-         (%test-report-result)))))
-  
-  (define-syntax test-end
-    (lambda (x)
-      (syntax-case (list x (list 'quote (%test-source-line2 x))) ()
-        (((mac suite-name) line)
-         (syntax
-          (%test-end suite-name line)))
-        (((mac) line)
-         (syntax
-          (%test-end #f line))))))
-  (define-syntax test-assert
-    (lambda (x)
-      (syntax-case (list x (list 'quote (%test-source-line2 x))) ()
-        (((mac tname expr) line)
-         (syntax
-          (let* ((r (test-runner-get))
-                 (name tname))
-            (test-result-alist! r (cons (cons 'test-name tname) line))
-            (%test-comp1body r expr))))
-        (((mac expr) line)
-         (syntax
-          (let* ((r (test-runner-get)))
-            (test-result-alist! r line)
-            (%test-comp1body r expr)))))))
-  (define-for-syntax (%test-comp2 comp x)
-                     (syntax-case (list x (list 'quote (%test-source-line2 x)) comp) ()
-                       (((mac tname expected expr) line comp)
-                        (syntax
-                         (let* ((r (test-runner-get))
-                                (name tname))
-                           (test-result-alist! r (cons (cons 'test-name tname) line))
-                           (%test-comp2body r comp expected expr))))
-                       (((mac expected expr) line comp)
-                        (syntax
-                         (let* ((r (test-runner-get)))
-                           (test-result-alist! r line)
-                           (%test-comp2body r comp expected expr))))))
-  (define-syntax test-eqv
-    (lambda (x) (%test-comp2 (syntax eqv?) x)))
-  (define-syntax test-eq
-    (lambda (x) (%test-comp2 (syntax eq?) x)))
-  (define-syntax test-equal
-    (lambda (x) (%test-comp2 (syntax equal?) x)))
-  (define-syntax test-approximate ;; FIXME - needed for non-Kawa
-    (lambda (x)
-      (syntax-case (list x (list 'quote (%test-source-line2 x))) ()
-        (((mac tname expected expr error) line)
-         (syntax
-          (let* ((r (test-runner-get))
-                 (name tname))
-            (test-result-alist! r (cons (cons 'test-name tname) line))
-            (%test-comp2body r (%test-approximimate= error) expected expr))))
-        (((mac expected expr error) line)
-         (syntax
-          (let* ((r (test-runner-get)))
-            (test-result-alist! r line)
-            (%test-comp2body r (%test-approximimate= error) expected expr)))))))
-  
-  (define-syntax %test-error
-    (syntax-rules ()
-      ((%test-error r etype expr)
-       (%test-comp1body r (with-handlers (((lambda (h) #t) (lambda (h) #t)))
-                            (let ()
-                              (test-result-set! r 'actual-value expr)
-                              #f))))))
-  
-  (define-syntax test-error
-    (lambda (x)
-      (syntax-case (list x (list 'quote (%test-source-line2 x))) ()
-        (((mac tname etype expr) line)
-         (syntax
-          (let* ((r (test-runner-get))
-                 (name tname))
-            (test-result-alist! r (cons (cons 'test-name tname) line))
-            (%test-error r etype expr))))
-        (((mac etype expr) line)
-         (syntax
-          (let* ((r (test-runner-get)))
-            (test-result-alist! r line)
-            (%test-error r etype expr))))
-        (((mac expr) line)
-         (syntax
-          (let* ((r (test-runner-get)))
-            (test-result-alist! r line)
-            (%test-error r #t expr)))))))
-  
-  (define (test-apply first . rest)
-    (if (test-runner? first)
-        (test-with-runner first (apply test-apply rest))
-        (let ((r (test-runner-current)))
-          (if r
-              (let ((run-list (%test-runner-run-list r)))
-                (cond ((null? rest)
-                       (%test-runner-run-list! r (reverse run-list))
-                       (first)) ;; actually apply procedure thunk
-                      (else
-                       (%test-runner-run-list!
-                        r
-                        (if (eq? run-list #t) (list first) (cons first run-list)))
-                       (apply test-apply rest)
-                       (%test-runner-run-list! r run-list))))
-              (let ((r (test-runner-create)))
-                (test-with-runner r (apply test-apply first rest))
-                ((test-runner-on-final r) r))))))
-  
-  (define-syntax test-with-runner
-    (syntax-rules ()
-      ((test-with-runner runner form ...)
-       (let ((saved-runner (test-runner-current)))
-         (dynamic-wind
-          (lambda () (test-runner-current runner))
-          (lambda () form ...)
-          (lambda () (test-runner-current saved-runner)))))))
-  
-  ;;; Predicates
-  
-  (define (%test-match-nth n count)
-    (let ((i 0))
-      (lambda (runner)
-        (set! i (add1 i))
-        (and (>= i n) (< i (+ n count))))))
-  
-  (define-syntax test-match-nth
-    (syntax-rules ()
-      ((test-match-nth n)
-       (test-match-nth n 1))
-      ((test-match-nth n count)
-       (%test-match-nth n count))))
-  
-  (define (%test-match-all . pred-list)
-    (lambda (runner)
-      (let ((result #t))
-        (let loop ((l pred-list))
-          (if (null? l)
-              result
-              (begin
-                (if (not ((car l) runner))
-                    (set! result #f))
-                (loop (cdr l))))))))
-  
-  (define-syntax test-match-all
-    (syntax-rules ()
-      ((test-match-all pred ...)
-       (%test-match-all (%test-as-specifier pred) ...))))
-  
-  (define (%test-match-any . pred-list)
-    (lambda (runner)
-      (let ((result #f))
-        (let loop ((l pred-list))
-          (if (null? l)
-              result
-              (begin
-                (if ((car l) runner)
-                    (set! result #t))
-                (loop (cdr l))))))))
-  
-  (define-syntax test-match-any
-    (syntax-rules ()
-      ((test-match-any pred ...)
-       (%test-match-any (%test-as-specifier pred) ...))))
-  
-  ;; Coerce to a predicate function:
-  (define (%test-as-specifier specifier)
-    (cond ((procedure? specifier) specifier)
-          ((integer? specifier) (test-match-nth 1 specifier))
-          ((string? specifier) (test-match-name specifier))
-          (else
-           (error "not a valid test specifier"))))
-  
-  (define-syntax test-skip
-    (syntax-rules ()
-      ((test-skip pred ...)
-       (let ((runner (test-runner-get)))
-         (%test-runner-skip-list! runner
-                                  (cons (test-match-all (%test-as-specifier pred)  ...)
-                                        (%test-runner-skip-list runner)))))))
-  
-  (define-syntax test-expect-fail
-    (syntax-rules ()
-      ((test-expect-fail pred ...)
-       (let ((runner (test-runner-get)))
-         (%test-runner-fail-list! runner
-                                  (cons (test-match-all (%test-as-specifier pred)  ...)
-                                        (%test-runner-fail-list runner)))))))
-  
-  (define (test-match-name name)
-    (lambda (runner)
-      (equal? name (test-runner-test-name runner))))
-  
-  (define (test-read-eval-string string)
-    (let* ((port (open-input-string string))
-           (form (read port)))
-      (if (eof-object? (read-char port))
-          (eval form)
-          (error "(not at eof)"))))
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/66.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/66.rkt
deleted file mode 100644
index ae5b42d0f7..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/66.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang scheme/base
-
-(require scheme/require)
-(require (matching-identifiers-in #px"\\bu8vector\\b" scheme/foreign))
-(provide (all-from-out scheme/foreign))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/67.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/67.rkt
deleted file mode 100644
index 877ed690ca..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/67.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-67
-#lang s-exp srfi/provider srfi/67/compare
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/67/compare-reference.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/67/compare-reference.scm
deleted file mode 100644
index 21b0e94c4d..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/67/compare-reference.scm
+++ /dev/null
@@ -1,707 +0,0 @@
-; Copyright (c) 2005 Sebastian Egner and Jens Axel S{\o}gaard.
-; 
-; Permission is hereby granted, free of charge, to any person obtaining
-; a copy of this software and associated documentation files (the
-; ``Software''), to deal in the Software without restriction, including
-; without limitation the rights to use, copy, modify, merge, publish,
-; distribute, sublicense, and/or sell copies of the Software, and to
-; permit persons to whom the Software is furnished to do so, subject to
-; the following conditions:
-; 
-; The above copyright notice and this permission notice shall be
-; included in all copies or substantial portions of the Software.
-; 
-; THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-; LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-; 
-; -----------------------------------------------------------------------
-; 
-; Compare procedures SRFI (reference implementation)
-; Sebastian.Egner@philips.com, Jensaxel@soegaard.net
-; history of this file:
-;   SE, 14-Oct-2004: first version
-;   SE, 18-Oct-2004: 1st redesign: axioms for 'compare function'
-;   SE, 29-Oct-2004: 2nd redesign: higher order reverse/map/refine/unite
-;   SE,  2-Nov-2004: 3rd redesign: macros cond/refine-compare replace h.o.f's
-;   SE, 10-Nov-2004: (im,re) replaced by (re,im) in complex-compare
-;   SE, 11-Nov-2004: case-compare by case (not by cond); select-compare added
-;   SE, 12-Jan-2005: pair-compare-cdr
-;   SE, 15-Feb-2005: stricter typing for compare-<type>; pairwise-not=?
-;   SE, 16-Feb-2005: case-compare -> if-compare -> if3; <? </<? chain<? etc.
-;   JS, 24-Feb-2005: selection-compare added
-;   SE, 25-Feb-2005: selection-compare -> kth-largest modified; if<? etc.
-;   JS, 28-Feb-2005: kth-largest modified - is "stable" now
-;   SE, 28-Feb-2005: simplified pairwise-not=?/kth-largest; min/max debugged
-;   SE, 07-Apr-2005: compare-based type checks made explicit
-;   SE, 18-Apr-2005: added (rel? compare) and eq?-test
-;   SE, 16-May-2005: naming convention changed; compare-by< etc. optional x y
-
-; =============================================================================
-
-; Reference Implementation
-; ========================
-;
-; in R5RS (including hygienic macros)
-;  + SRFI-16 (case-lambda) 
-;  + SRFI-23 (error) 
-;  + SRFI-27 (random-integer)
-
-; Implementation remarks:
-;   * In general, the emphasis of this implementation is on correctness
-;     and portability, not on efficiency.
-;   * Variable arity procedures are expressed in terms of case-lambda
-;     in the hope that this will produce efficient code for the case
-;     where the arity is statically known at the call site.
-;   * In procedures that are required to type-check their arguments,
-;     we use (compare x x) for executing extra checks. This relies on
-;     the assumption that eq? is used to catch this case quickly.
-;   * Care has been taken to reference comparison procedures of R5RS
-;     only at the time the operations here are being defined. This
-;     makes it possible to redefine these operations, if need be.
-;   * For the sake of efficiency, some inlining has been done by hand.
-;     This is mainly expressed by macros producing defines.
-;   * Identifiers of the form compare:<something> are private.
-;
-; Hints for low-level implementation:
-;   * The basis of this SRFI are the atomic compare procedures, 
-;     i.e. boolean-compare, char-compare, etc. and the conditionals
-;     if3, if=?, if<? etc., and default-compare. These should make
-;     optimal use of the available type information.
-;   * For the sake of speed, the reference implementation does not
-;     use a LET to save the comparison value c for the ERROR call.
-;     This can be fixed in a low-level implementation at no cost.
-;   * Type-checks based on (compare x x) are made explicit by the
-;     expression (compare:check result compare x ...).
-;   * Eq? should  can used to speed up built-in compare procedures,
-;     but it can only be used after type-checking at least one of
-;     the arguments.
-
-(define (compare:checked result compare . args)
-  (for-each (lambda (x) (compare x x)) args)
-  result)
-
-
-; 3-sided conditional
-
-(define-syntax if3
-  (syntax-rules ()
-    ((if3 c less equal greater)
-     (case c
-       ((-1) less)
-       (( 0) equal)
-       (( 1) greater)
-       (else (error "comparison value not in {-1,0,1}"))))))
-
-
-; 2-sided conditionals for comparisons
-
-(define-syntax compare:if-rel?
-  (syntax-rules ()
-    ((compare:if-rel? c-cases a-cases c consequence)
-     (compare:if-rel? c-cases a-cases c consequence (if #f #f)))
-    ((compare:if-rel? c-cases a-cases c consequence alternate)
-     (case c
-       (c-cases consequence)
-       (a-cases alternate)
-       (else    (error "comparison value not in {-1,0,1}"))))))
-
-(define-syntax if=?
-  (syntax-rules ()
-    ((if=? arg ...)
-     (compare:if-rel? (0) (-1 1) arg ...))))
-
-(define-syntax if<?
-  (syntax-rules ()
-    ((if<? arg ...)
-     (compare:if-rel? (-1) (0 1) arg ...))))
-
-(define-syntax if>?
-  (syntax-rules ()
-    ((if>? arg ...)
-     (compare:if-rel? (1) (-1 0) arg ...))))
-
-(define-syntax if<=?
-  (syntax-rules ()
-    ((if<=? arg ...)
-     (compare:if-rel? (-1 0) (1) arg ...))))
-
-(define-syntax if>=?
-  (syntax-rules ()
-    ((if>=? arg ...)
-     (compare:if-rel? (0 1) (-1) arg ...))))
-
-(define-syntax if-not=?
-  (syntax-rules ()
-    ((if-not=? arg ...)
-     (compare:if-rel? (-1 1) (0) arg ...))))
-
-
-; predicates from compare procedures
-
-(define-syntax compare:define-rel?
-  (syntax-rules ()
-    ((compare:define-rel? rel? if-rel?)
-     (define rel?
-       (case-lambda
-	(()        (lambda (x y) (if-rel? (default-compare x y) #t #f)))
-	((compare) (lambda (x y) (if-rel? (compare         x y) #t #f)))
-	((x y)                   (if-rel? (default-compare x y) #t #f))
-	((compare x y)
-	 (if (procedure? compare)
-	     (if-rel? (compare x y) #t #f)
-	     (error "not a procedure (Did you mean rel/rel??): " compare))))))))
-
-(compare:define-rel? =?    if=?)
-(compare:define-rel? <?    if<?)
-(compare:define-rel? >?    if>?)
-(compare:define-rel? <=?   if<=?)
-(compare:define-rel? >=?   if>=?)
-(compare:define-rel? not=? if-not=?)
-
-
-; chains of length 3
-
-(define-syntax compare:define-rel1/rel2?
-  (syntax-rules ()
-    ((compare:define-rel1/rel2? rel1/rel2? if-rel1? if-rel2?)
-     (define rel1/rel2?
-       (case-lambda
-	(()
-	 (lambda (x y z)
-	   (if-rel1? (default-compare x y)
-		     (if-rel2? (default-compare y z) #t #f)
-		     (compare:checked #f default-compare z))))
-	((compare)
-	 (lambda (x y z)
-	   (if-rel1? (compare x y)
-		(if-rel2? (compare y z) #t #f)
-		(compare:checked #f compare z))))
-	((x y z)
-	 (if-rel1? (default-compare x y)
-	       (if-rel2? (default-compare y z) #t #f)
-	       (compare:checked #f default-compare z)))
-	((compare x y z)
-	 (if-rel1? (compare x y)
-	       (if-rel2? (compare y z) #t #f)
-	       (compare:checked #f compare z))))))))
-
-(compare:define-rel1/rel2? </<?   if<?  if<?)
-(compare:define-rel1/rel2? </<=?  if<?  if<=?)
-(compare:define-rel1/rel2? <=/<?  if<=? if<?)
-(compare:define-rel1/rel2? <=/<=? if<=? if<=?)
-(compare:define-rel1/rel2? >/>?   if>?  if>?)
-(compare:define-rel1/rel2? >/>=?  if>?  if>=?)
-(compare:define-rel1/rel2? >=/>?  if>=? if>?)
-(compare:define-rel1/rel2? >=/>=? if>=? if>=?)
-
-
-; chains of arbitrary length
-
-(define-syntax compare:define-chain-rel?
-  (syntax-rules ()
-    ((compare:define-chain-rel? chain-rel? if-rel?)
-     (define chain-rel?
-       (case-lambda
-	((compare)
-	 #t)
-	((compare x1)
-	 (compare:checked #t compare x1))
-	((compare x1 x2)
-	 (if-rel? (compare x1 x2) #t #f))
-	((compare x1 x2 x3)
-	 (if-rel? (compare x1 x2)
-		  (if-rel? (compare x2 x3) #t #f)
-		  (compare:checked #f compare x3)))
-	((compare x1 x2 . x3+)
-	 (if-rel? (compare x1 x2)
-		  (let chain? ((head x2) (tail x3+))
-		    (if (null? tail)
-			#t
-			(if-rel? (compare head (car tail))
-				 (chain? (car tail) (cdr tail))
-				 (apply compare:checked #f 
-					compare (cdr tail)))))
-		  (apply compare:checked #f compare x3+))))))))
-
-(compare:define-chain-rel? chain=?  if=?)
-(compare:define-chain-rel? chain<?  if<?)
-(compare:define-chain-rel? chain>?  if>?)
-(compare:define-chain-rel? chain<=? if<=?)
-(compare:define-chain-rel? chain>=? if>=?)
-
-
-; pairwise inequality
-
-(define pairwise-not=?
-  (let ((= =) (<= <=))
-    (case-lambda
-      ((compare)
-       #t)
-      ((compare x1)
-       (compare:checked #t compare x1))
-      ((compare x1 x2)
-       (if-not=? (compare x1 x2) #t #f))
-      ((compare x1 x2 x3)
-       (if-not=? (compare x1 x2)
-                 (if-not=? (compare x2 x3)
-                           (if-not=? (compare x1 x3) #t #f)
-                           #f)
-		 (compare:checked #f compare x3)))
-      ((compare . x1+)
-       (let unequal? ((x x1+) (n (length x1+)) (unchecked? #t))
-         (if (< n 2)
-	     (if (and unchecked? (= n 1))
-		 (compare:checked #t compare (car x))
-		 #t)
-             (let* ((i-pivot (random-integer n))
-                    (x-pivot (list-ref x i-pivot)))
-               (let split ((i 0) (x x) (x< '()) (x> '()))
-                 (if (null? x)
-                     (and (unequal? x< (length x<) #f)
-                          (unequal? x> (length x>) #f))
-                     (if (= i i-pivot)
-                         (split (+ i 1) (cdr x) x< x>)
-                         (if3 (compare (car x) x-pivot)
-                              (split (+ i 1) (cdr x) (cons (car x) x<) x>)
-			      (if unchecked?
-				  (apply compare:checked #f compare (cdr x))
-				  #f)
-                              (split (+ i 1) (cdr x) x< (cons (car x) x>)))))))))))))
-
-
-; min/max
-
-(define min-compare
-  (case-lambda
-    ((compare x1)
-     (compare:checked x1 compare x1))
-    ((compare x1 x2)
-     (if<=? (compare x1 x2) x1 x2))
-    ((compare x1 x2 x3)
-     (if<=? (compare x1 x2)
-            (if<=? (compare x1 x3) x1 x3)
-            (if<=? (compare x2 x3) x2 x3)))
-    ((compare x1 x2 x3 x4)
-     (if<=? (compare x1 x2)
-            (if<=? (compare x1 x3)
-                   (if<=? (compare x1 x4) x1 x4)
-                   (if<=? (compare x3 x4) x3 x4))
-            (if<=? (compare x2 x3)
-                   (if<=? (compare x2 x4) x2 x4)
-                   (if<=? (compare x3 x4) x3 x4))))
-    ((compare x1 x2 . x3+)
-     (let min ((xmin (if<=? (compare x1 x2) x1 x2)) (xs x3+))
-       (if (null? xs)
-           xmin
-           (min (if<=? (compare xmin (car xs)) xmin (car xs))
-                (cdr xs)))))))
-
-(define max-compare
-  (case-lambda
-    ((compare x1)
-     (compare:checked x1 compare x1))
-    ((compare x1 x2)
-     (if>=? (compare x1 x2) x1 x2))
-    ((compare x1 x2 x3)
-     (if>=? (compare x1 x2)
-            (if>=? (compare x1 x3) x1 x3)
-            (if>=? (compare x2 x3) x2 x3)))
-    ((compare x1 x2 x3 x4)
-     (if>=? (compare x1 x2)
-            (if>=? (compare x1 x3)
-                   (if>=? (compare x1 x4) x1 x4)
-                   (if>=? (compare x3 x4) x3 x4))
-            (if>=? (compare x2 x3)
-                   (if>=? (compare x2 x4) x2 x4)
-                   (if>=? (compare x3 x4) x3 x4))))
-    ((compare x1 x2 . x3+)
-     (let max ((xmax (if>=? (compare x1 x2) x1 x2)) (xs x3+))
-       (if (null? xs)
-           xmax
-           (max (if>=? (compare xmax (car xs)) xmax (car xs))
-                (cdr xs)))))))
-
-
-; kth-largest
-
-(define kth-largest
-  (let ((= =) (< <))
-    (case-lambda
-      ((compare k x0)
-       (case (modulo k 1)
-         ((0)  (compare:checked x0 compare x0))
-         (else (error "bad index" k))))
-      ((compare k x0 x1)
-       (case (modulo k 2)
-         ((0) (if<=? (compare x0 x1) x0 x1))
-         ((1) (if<=? (compare x0 x1) x1 x0))
-         (else (error "bad index" k))))
-      ((compare k x0 x1 x2)
-       (case (modulo k 3)
-         ((0) (if<=? (compare x0 x1)
-                     (if<=? (compare x0 x2) x0 x2)
-                     (if<=? (compare x1 x2) x1 x2)))
-         ((1) (if3 (compare x0 x1)
-                   (if<=? (compare x1 x2)
-                          x1
-                          (if<=? (compare x0 x2) x2 x0))
-                   (if<=? (compare x0 x2) x1 x0)
-                   (if<=? (compare x0 x2)
-                          x0
-                          (if<=? (compare x1 x2) x2 x1))))
-         ((2) (if<=? (compare x0 x1)
-                     (if<=? (compare x1 x2) x2 x1)
-                     (if<=? (compare x0 x2) x2 x0)))
-         (else (error "bad index" k))))
-      ((compare k x0 . x1+) ; |x1+| >= 1
-       (if (not (and (integer? k) (exact? k)))
-           (error "bad index" k))
-       (let ((n (+ 1 (length x1+))))
-         (let kth ((k   (modulo k n))
-                   (n   n)  ; = |x|
-                   (rev #t) ; are x<, x=, x> reversed?
-                   (x   (cons x0 x1+)))
-           (let ((pivot (list-ref x (random-integer n))))
-             (let split ((x x) (x< '()) (n< 0) (x= '()) (n= 0) (x> '()) (n> 0))
-               (if (null? x)
-                   (cond
-                     ((< k n<)
-                      (kth k n< (not rev) x<))
-                     ((< k (+ n< n=))
-                      (if rev
-                          (list-ref x= (- (- n= 1) (- k n<)))
-                          (list-ref x= (- k n<))))
-                     (else
-                      (kth (- k (+ n< n=)) n> (not rev) x>)))
-                   (if3 (compare (car x) pivot)
-                        (split (cdr x) (cons (car x) x<) (+ n< 1) x= n= x> n>)
-                        (split (cdr x) x< n< (cons (car x) x=) (+ n= 1) x> n>)
-                        (split (cdr x) x< n< x= n= (cons (car x) x>) (+ n> 1))))))))))))
-
-
-; compare functions from predicates
-
-(define compare-by<
-  (case-lambda
-   ((lt)     (lambda (x y) (if (lt x y) -1 (if (lt y x)  1 0))))
-   ((lt x y)               (if (lt x y) -1 (if (lt y x)  1 0)))))
-
-(define compare-by>
-  (case-lambda
-   ((gt)     (lambda (x y) (if (gt x y) 1 (if (gt y x)  -1 0))))
-   ((gt x y)               (if (gt x y) 1 (if (gt y x)  -1 0)))))
-
-(define compare-by<=
-  (case-lambda
-   ((le)     (lambda (x y) (if (le x y) (if (le y x) 0 -1) 1)))
-   ((le x y)               (if (le x y) (if (le y x) 0 -1) 1))))
-
-(define compare-by>=
-  (case-lambda
-   ((ge)     (lambda (x y) (if (ge x y) (if (ge y x) 0 1) -1)))
-   ((ge x y)               (if (ge x y) (if (ge y x) 0 1) -1))))
-
-(define compare-by=/<
-  (case-lambda
-   ((eq lt)     (lambda (x y) (if (eq x y) 0 (if (lt x y) -1 1))))
-   ((eq lt x y)               (if (eq x y) 0 (if (lt x y) -1 1)))))
-
-(define compare-by=/>
-  (case-lambda
-   ((eq gt)     (lambda (x y) (if (eq x y) 0 (if (gt x y) 1 -1))))
-   ((eq gt x y)               (if (eq x y) 0 (if (gt x y) 1 -1)))))
-
-; refine and extend construction
-
-(define-syntax refine-compare
-  (syntax-rules ()
-    ((refine-compare)
-     0)
-    ((refine-compare c1)
-     c1)
-    ((refine-compare c1 c2 cs ...)
-     (if3 c1 -1 (refine-compare c2 cs ...) 1))))
-
-(define-syntax select-compare
-  (syntax-rules (else)
-    ((select-compare x y clause ...)
-     (let ((x-val x) (y-val y))
-       (select-compare (x-val y-val clause ...))))
-    ; used internally: (select-compare (x y clause ...))
-    ((select-compare (x y))
-     0)
-    ((select-compare (x y (else c ...)))
-     (refine-compare c ...))
-    ((select-compare (x y (t? c ...) clause ...))
-     (let ((t?-val t?))
-       (let ((tx (t?-val x)) (ty (t?-val y)))
-         (if tx
-             (if ty (refine-compare c ...) -1)
-             (if ty 1 (select-compare (x y clause ...)))))))))
-
-(define-syntax cond-compare
-  (syntax-rules (else)
-    ((cond-compare)
-     0)
-    ((cond-compare (else cs ...))
-     (refine-compare cs ...))
-    ((cond-compare ((tx ty) cs ...) clause ...)
-     (let ((tx-val tx) (ty-val ty))
-       (if tx-val
-           (if ty-val (refine-compare cs ...) -1)
-           (if ty-val 1 (cond-compare clause ...)))))))
-
-
-; R5RS atomic types
-
-(define-syntax compare:type-check
-  (syntax-rules ()
-    ((compare:type-check type? type-name x)
-     (if (not (type? x))
-         (error (string-append "not " type-name ":") x)))
-    ((compare:type-check type? type-name x y)
-     (begin (compare:type-check type? type-name x)
-            (compare:type-check type? type-name y)))))
-
-(define-syntax compare:define-by=/<
-  (syntax-rules ()
-    ((compare:define-by=/< compare = < type? type-name)
-     (define compare
-       (let ((= =) (< <))
-	 (lambda (x y)
-	   (if (type? x)
-	       (if (eq? x y)
-		   0
-		   (if (type? y)
-		       (if (= x y) 0 (if (< x y) -1 1))
-		       (error (string-append "not " type-name ":") y)))
-	       (error (string-append "not " type-name ":") x))))))))
-
-(define (boolean-compare x y)
-  (compare:type-check boolean? "boolean" x y)
-  (if x (if y 0 1) (if y -1 0)))
-
-(compare:define-by=/< char-compare char=? char<? char? "char")
-
-(compare:define-by=/< char-compare-ci char-ci=? char-ci<? char? "char")
-
-(compare:define-by=/< string-compare string=? string<? string? "string")
-
-(compare:define-by=/< string-compare-ci string-ci=? string-ci<? string? "string")
-
-(define (symbol-compare x y)
-  (compare:type-check symbol? "symbol" x y)
-  (string-compare (symbol->string x) (symbol->string y)))
-
-(compare:define-by=/< integer-compare = < integer? "integer")
-
-(compare:define-by=/< rational-compare = < rational? "rational")
-
-(compare:define-by=/< real-compare = < real? "real")
-
-(define (complex-compare x y)
-  (compare:type-check complex? "complex" x y)
-  (if (and (real? x) (real? y))
-      (real-compare x y)
-      (refine-compare (real-compare (real-part x) (real-part y))
-                      (real-compare (imag-part x) (imag-part y)))))
-
-(define (number-compare x y)
-  (compare:type-check number? "number" x y)
-  (complex-compare x y))
-
-
-; R5RS compound data structures: dotted pair, list, vector
-
-(define (pair-compare-car compare)
-  (lambda (x y)
-    (compare (car x) (car y))))
-
-(define (pair-compare-cdr compare)
-  (lambda (x y)
-    (compare (cdr x) (cdr y))))
-
-(define pair-compare
-  (case-lambda
-    
-    ; dotted pair
-    ((pair-compare-car pair-compare-cdr x y)
-     (refine-compare (pair-compare-car (car x) (car y))
-                     (pair-compare-cdr (cdr x) (cdr y))))
-    
-    ; possibly improper lists
-    ((compare x y)
-     (cond-compare 
-      (((null? x) (null? y)) 0)
-      (((pair? x) (pair? y)) (compare              (car x) (car y))
-                             (pair-compare compare (cdr x) (cdr y)))
-      (else                  (compare x y))))
-    
-    ; for convenience
-    ((x y)
-     (pair-compare default-compare x y))))
-
-(define list-compare
-  (case-lambda
-    ((compare x y empty? head tail)
-     (cond-compare
-      (((empty? x) (empty? y)) 0)
-      (else (compare              (head x) (head y))
-            (list-compare compare (tail x) (tail y) empty? head tail))))
-    
-    ; for convenience
-    ((        x y empty? head tail)
-     (list-compare default-compare x y empty? head tail))
-    ((compare x y              )
-     (list-compare compare         x y null? car   cdr))
-    ((        x y              )
-     (list-compare default-compare x y null? car   cdr))))
-
-(define list-compare-as-vector
-  (case-lambda
-    ((compare x y empty? head tail)
-     (refine-compare
-      (let compare-length ((x x) (y y))
-        (cond-compare
-         (((empty? x) (empty? y)) 0)
-         (else (compare-length (tail x) (tail y)))))
-      (list-compare compare x y empty? head tail)))
-    
-    ; for convenience
-    ((        x y empty? head tail)
-     (list-compare-as-vector default-compare x y empty? head tail))
-    ((compare x y              )
-     (list-compare-as-vector compare         x y null?  car  cdr))
-    ((        x y              )
-     (list-compare-as-vector default-compare x y null?  car  cdr))))
-
-(define vector-compare
-  (let ((= =))
-    (case-lambda
-      ((compare x y size ref)
-       (let ((n (size x)) (m (size y)))
-         (refine-compare 
-          (integer-compare n m)
-          (let compare-rest ((i 0)) ; compare x[i..n-1] y[i..n-1]
-            (if (= i n)
-                0
-                (refine-compare (compare (ref x i) (ref y i))
-                                (compare-rest (+ i 1))))))))
-      
-      ; for convenience
-      ((        x y size ref)
-       (vector-compare default-compare x y size          ref))
-      ((compare x y           )
-       (vector-compare compare         x y vector-length vector-ref))
-      ((        x y           )
-       (vector-compare default-compare x y vector-length vector-ref)))))
-
-(define vector-compare-as-list
-  (let ((= =))
-    (case-lambda
-      ((compare x y size ref)
-       (let ((nx (size x)) (ny (size y)))
-         (let ((n (min nx ny)))
-           (let compare-rest ((i 0)) ; compare x[i..n-1] y[i..n-1]
-             (if (= i n)
-                 (integer-compare nx ny)
-                 (refine-compare (compare (ref x i) (ref y i))
-                                 (compare-rest (+ i 1))))))))
-      
-      ; for convenience
-      ((        x y size ref)
-       (vector-compare-as-list default-compare x y size          ref))
-      ((compare x y           )
-       (vector-compare-as-list compare         x y vector-length vector-ref))
-      ((        x y           )
-       (vector-compare-as-list default-compare x y vector-length vector-ref)))))
-
-
-; default compare
-
-(define (default-compare x y)
-  (select-compare 
-   x y
-   (null?    0)
-   (pair?    (default-compare (car x) (car y))
-	     (default-compare (cdr x) (cdr y)))
-   (boolean? (boolean-compare x y))
-   (char?    (char-compare    x y))
-   (string?  (string-compare  x y))
-   (symbol?  (symbol-compare  x y))
-   (number?  (number-compare  x y))
-   (vector?  (vector-compare default-compare x y))
-   (else (error "unrecognized type in default-compare" x y))))
-
-; Note that we pass default-compare to compare-{pair,vector} explictly.
-; This makes sure recursion proceeds with this default-compare, which 
-; need not be the one in the lexical scope of compare-{pair,vector}.
-
-
-; debug compare
-
-(define (debug-compare c)
-  
-  (define (checked-value c x y)
-    (let ((c-xy (c x y)))
-      (if (or (eqv? c-xy -1) (eqv? c-xy 0) (eqv? c-xy 1))
-          c-xy
-          (error "compare value not in {-1,0,1}" c-xy (list c x y)))))
-  
-  (define (random-boolean)
-    (zero? (random-integer 2)))
-  
-  (define q ; (u v w) such that u <= v, v <= w, and not u <= w
-    '#(
-       ;x < y   x = y   x > y   [x < z]
-       0       0       0    ; y < z
-               0    (z y x) (z y x) ; y = z
-               0    (z y x) (z y x) ; y > z
-               
-               ;x < y   x = y   x > y   [x = z]
-               (y z x) (z x y)    0    ; y < z
-               (y z x)    0    (x z y) ; y = z
-               0    (y x z) (x z y) ; y > z
-               
-               ;x < y   x = y   x > y   [x > z]
-               (x y z) (x y z)    0    ; y < z
-               (x y z) (x y z)    0    ; y = z
-               0       0       0    ; y > z
-               ))
-  
-  (let ((z? #f) (z #f)) ; stored element from previous call
-    (lambda (x y)
-      (let ((c-xx (checked-value c x x))
-	    (c-yy (checked-value c y y))
-	    (c-xy (checked-value c x y))
-	    (c-yx (checked-value c y x)))
-	(if (not (zero? c-xx))
-	    (error "compare error: not reflexive" c x))
-	(if (not (zero? c-yy))
-	    (error "compare error: not reflexive" c y))
-	(if (not (zero? (+ c-xy c-yx)))
-	    (error "compare error: not anti-symmetric" c x y))
-	(if z?
-	    (let ((c-xz (checked-value c x z))
-		  (c-zx (checked-value c z x))
-		  (c-yz (checked-value c y z))
-		  (c-zy (checked-value c z y)))
-	      (if (not (zero? (+ c-xz c-zx)))
-		  (error "compare error: not anti-symmetric" c x z))
-	      (if (not (zero? (+ c-yz c-zy)))
-		  (error "compare error: not anti-symmetric" c y z))
-	      (let ((ijk (vector-ref q (+ c-xy (* 3 c-yz) (* 9 c-xz) 13))))
-		(if (list? ijk)
-		    (apply error
-			   "compare error: not transitive"
-			   c 
-			   (map (lambda (i) (case i ((x) x) ((y) y) ((z) z)))
-				ijk)))))
-	    (set! z? #t))
-	(set! z (if (random-boolean) x y)) ; randomized testing
-	c-xy))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/67/compare.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/67/compare.rkt
deleted file mode 100644
index fa3d6a4eaf..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/67/compare.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-(module compare mzscheme
-  (require mzlib/include
-           srfi/27)
-  
-  (include "compare-reference.scm")
-  
-  (define current-compare (make-parameter default-compare))
-  (provide current-compare)
-  
-  (provide </<=? </<? <=/<=? <=/<? <=? <?
-           =?
-           >/>=? >/>? >=/>=? >=/>? >=? >?
-           
-           boolean-compare
-           
-           chain<=?
-           chain<?
-           chain=?
-           chain>=?
-           chain>?
-           char-compare
-           char-compare-ci
-           compare-by<
-           compare-by<=
-           compare-by=/<
-           compare-by=/>
-           compare-by>
-           compare-by>=
-           complex-compare
-           cond-compare
-           
-           debug-compare
-           default-compare
-           
-           if-not=?
-           if3
-           if<=?
-           if<?
-           if=?
-           if>=?
-           if>?
-           integer-compare
-           
-           kth-largest
-           
-           list-compare
-           list-compare-as-vector
-           
-           max-compare
-           min-compare
-           
-           not=?
-           number-compare
-           
-           pair-compare
-           pair-compare-car
-           pair-compare-cdr
-           pairwise-not=?
-           
-           rational-compare
-           real-compare
-           refine-compare
-           
-           select-compare
-           string-compare
-           string-compare-ci
-           symbol-compare
-           
-           vector-compare
-           vector-compare-as-list))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/67/info.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/67/info.rkt
deleted file mode 100644
index c59269a736..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/67/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("compare-reference.scm"))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/69.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/69.rkt
deleted file mode 100644
index c1d93d1504..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/69.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-69
-#lang s-exp srfi/provider srfi/69/hash #:unprefix s:
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/69/hash.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/69/hash.rkt
deleted file mode 100644
index c135f9beed..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/69/hash.rkt
+++ /dev/null
@@ -1,214 +0,0 @@
-; SRFI 69
-; Chongkai Zhu   czhu@cs.utah.edu
-; Original 01-Nov-2005
-; Revised 23-Oct-2006
-
-(module hash mzscheme
-  
-  (require mzlib/etc
-           scheme/mpair)
-  
-  (provide (rename my-make-hash-table s:make-hash-table)
-           (rename my-hash-table? s:hash-table?)
-           alist->hash-table
-           (rename my-hash-table-equivalence-function hash-table-equivalence-function)
-           (rename my-hash-table-hash-function hash-table-hash-function)
-           hash-table-ref
-           hash-table-ref/default
-           hash-table-set!
-           hash-table-delete!
-           hash-table-exists?
-           hash-table-update!
-           hash-table-update!/default
-           (rename my-hash-table-size hash-table-size)
-           hash-table-keys
-           hash-table-values
-           hash-table-walk
-           hash-table-fold
-           hash-table->alist
-           (rename my-hash-table-copy s:hash-table-copy)
-           hash-table-merge!
-           hash
-           (rename hash string-hash)
-           string-ci-hash
-           hash-by-identity)
-  
-  (define hash
-    (case-lambda
-      ((obj) (equal-hash-code obj))
-      ((obj bound) (modulo (equal-hash-code obj) bound))))
-  
-  (define (string-ci-hash s . maybe-bound)
-    (apply hash (string-downcase s) maybe-bound))
-  
-  (define hash-by-identity
-    (case-lambda
-      ((obj) (eq-hash-code obj))
-      ((obj bound) (modulo (eq-hash-code obj) bound))))
-  
-  (define-struct my-hash-table (size hash-function equivalence-function association-function entries))
-
-  (define *default-table-size* 64)
-  
-  (define (appropriate-hash-function-for comparison)
-    (cond ((eq? comparison eq?) hash-by-identity)
-          ((eq? comparison string-ci=?) string-ci-hash)
-          (else hash)))
-  
-  (define my-make-hash-table
-    (opt-lambda ([comparison equal?]
-                 [hash (appropriate-hash-function-for comparison)]
-                 [size *default-table-size*]
-                 [association (letrec ((associate
-                                        (lambda (val alist)
-                                          (cond ((null? alist) #f)
-                                                ((comparison val (mcar (mcar alist))) (mcar alist))
-                                                (else (associate val (mcdr alist)))))))
-                                associate)])
-      (make-my-hash-table 0 hash comparison association (make-vector size '()))))
-  
-  (define (%hash-table-hash hash-table key)
-    ((my-hash-table-hash-function hash-table)
-     key (vector-length (my-hash-table-entries hash-table))))
-  
-  (define (%hash-table-find entries associate hash key)
-    (associate key (vector-ref entries hash)))
-  
-  (define (%hash-table-add! entries hash key value)
-    (vector-set! entries hash
-                 (mcons (mcons key value)
-                        (vector-ref entries hash))))
-  
-  (define (%hash-table-delete! entries compare hash key)
-    (let ((entrylist (vector-ref entries hash)))
-      (cond ((null? entrylist) #f)
-            ((compare key (mcar (mcar entrylist)))
-             (vector-set! entries hash (mcdr entrylist)) #t)
-            (else
-             (let loop ((current (mcdr entrylist)) (previous entrylist))
-               (cond ((null? current) #f)
-                     ((compare key (mcar (mcar current)))
-                      (set-mcdr! previous (mcdr current)) #t)
-                     (else (loop (mcdr current) current))))))))
-  
-  (define (%hash-table-walk proc entries)
-    (do ((index (- (vector-length entries) 1) (- index 1)))
-      ((< index 0)) (mfor-each proc (vector-ref entries index))))
-  
-  (define (%hash-table-maybe-resize! hash-table)
-    (let* ((old-entries (my-hash-table-entries hash-table))
-           (hash-length (vector-length old-entries)))
-      (if (> (my-hash-table-size hash-table) hash-length)
-          (let* ((new-length (* 2 hash-length))
-                 (new-entries (make-vector new-length '()))
-                 (hash (my-hash-table-hash-function hash-table)))
-            (%hash-table-walk
-              (lambda (node)
-                (%hash-table-add! new-entries
-                                  (hash (mcar node) new-length)
-                                  (mcar node) (mcdr node)))
-              old-entries)
-            (set-my-hash-table-entries! hash-table new-entries)))))
-  
-  (define (hash-table-ref hash-table key . maybe-default)
-    (cond ((%hash-table-find (my-hash-table-entries hash-table)
-                             (my-hash-table-association-function hash-table)
-                             (%hash-table-hash hash-table key) key)
-            => mcdr)
-          ((null? maybe-default)
-           (raise-mismatch-error 'hash-table-ref "no value associated with " key))
-          (else ((car maybe-default)))))
-  
-  (define (hash-table-ref/default hash-table key default)
-    (hash-table-ref hash-table key (lambda () default)))
-  
-  (define (hash-table-set! hash-table key value)
-    (let ((hash (%hash-table-hash hash-table key))
-          (entries (my-hash-table-entries hash-table)))
-      (cond ((%hash-table-find entries
-                               (my-hash-table-association-function hash-table)
-                               hash key)
-              => (lambda (node) (set-mcdr! node value)))
-            (else (%hash-table-add! entries hash key value)
-                  (set-my-hash-table-size! hash-table
-                                           (+ 1 (my-hash-table-size hash-table)))
-                  (%hash-table-maybe-resize! hash-table)))))
-  
-  (define (hash-table-update! hash-table key function . maybe-default)
-    (let ((hash (%hash-table-hash hash-table key))
-          (entries (my-hash-table-entries hash-table)))
-      (cond ((%hash-table-find entries
-                               (my-hash-table-association-function hash-table)
-                               hash key)
-              => (lambda (node)
-                   (set-mcdr! node (function (mcdr node)))))
-            ((null? maybe-default)
-             (raise-mismatch-error 'hash-table-update "no value exists for key " key))
-            (else (%hash-table-add! entries hash key
-                                    (function ((car maybe-default))))
-                  (set-my-hash-table-size! hash-table
-                                           (+ 1 (my-hash-table-size hash-table)))
-                  (%hash-table-maybe-resize! hash-table)))))
-  
-  (define (hash-table-update!/default hash-table key function default)
-    (hash-table-update! hash-table key function (lambda () default)))
-  
-  (define (hash-table-delete! hash-table key)
-    (if (%hash-table-delete! (my-hash-table-entries hash-table)
-                             (my-hash-table-equivalence-function hash-table)
-                             (%hash-table-hash hash-table key) key)
-        (set-my-hash-table-size! hash-table (- (my-hash-table-size hash-table) 1))))
-  
-  (define (hash-table-exists? hash-table key)
-    (and (%hash-table-find (my-hash-table-entries hash-table)
-                           (my-hash-table-association-function hash-table)
-                           (%hash-table-hash hash-table key) key) #t))
-  
-  (define (hash-table-walk hash-table proc)
-    (%hash-table-walk
-      (lambda (node) (proc (mcar node) (mcdr node)))
-      (my-hash-table-entries hash-table)))
-  
-  (define (hash-table-fold hash-table f acc)
-    (hash-table-walk hash-table 
-                     (lambda (key value) (set! acc (f key value acc))))
-    acc)
-  
-  (define alist->hash-table
-    (opt-lambda (alist
-                 [comparison equal?]
-                 [hash (appropriate-hash-function-for comparison)]
-                 [size (max *default-table-size* (* 2 (length alist)))])
-      (let ([hash-table (my-make-hash-table comparison hash size)])
-        (for-each (lambda (elem)
-                    (hash-table-set! hash-table (car elem) (cdr elem)))
-                  alist)
-        hash-table)))
-  
-  (define (hash-table->alist hash-table)
-    (hash-table-fold hash-table
-                     (lambda (key val acc) (cons (cons key val) acc)) '()))
-  
-  (define (my-hash-table-copy hash-table)
-    (let ((new (my-make-hash-table (my-hash-table-equivalence-function hash-table)
-                                   (my-hash-table-hash-function hash-table)
-                                   (max *default-table-size*
-                                        (* 2 (my-hash-table-size hash-table)))
-                                   (my-hash-table-association-function hash-table))))
-      (hash-table-walk hash-table
-                       (lambda (key value) (hash-table-set! new key value)))
-      new))
-  
-  (define (hash-table-merge! hash-table1 hash-table2)
-    (hash-table-walk hash-table2
-                     (lambda (key value)
-                       (hash-table-set! hash-table1 key value)))
-    hash-table1)
-  
-  (define (hash-table-keys hash-table)
-    (hash-table-fold hash-table (lambda (key val acc) (cons key acc)) '()))
-  
-  (define (hash-table-values hash-table)
-    (hash-table-fold hash-table (lambda (key val acc) (cons val acc)) '()))
-
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/7.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/7.rkt
deleted file mode 100644
index eefe09072f..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/7.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-7
-#lang s-exp srfi/provider srfi/7/program
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/7/program.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/7/program.rkt
deleted file mode 100644
index be6b075a97..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/7/program.rkt
+++ /dev/null
@@ -1,129 +0,0 @@
-;;;
-;;; <program.rkt> ---- SRFI-7 program
-;;; based on MJ Ray's code for SRFI 0
-
-(module program mzscheme
-  (require-for-syntax syntax/stx
-		      srfi/features)
-  (require mzlib/include)
-  (provide program)
-  
-  (define-syntax require-feature
-    (lambda (x)
-      (syntax-case x ()
-	((_ id)
-	 (with-syntax ((require-spec
-			(datum->syntax-object
-			 (syntax id)
-			 (feature->require-clause
-			  (syntax-object->datum (syntax id))))))
-	   (syntax
-	    (require require-spec)))))))
-  
-  (define-syntax program
-    (lambda (x)
-      (syntax-case* x (requires files code feature-cond and or not else)
-		    module-or-top-identifier=?
-	((_)
-	 (syntax (begin (void))))
-	((_
-	  (requires feature-id ...)
-	  more ...)
-	 (syntax
-	  (begin 
-	    (require-feature feature-id) ...
-	    (program more ...))))
-	((_
-	  (files filename ...)
-	  more ...)
-	 (with-syntax ((_x x))
-	   (syntax
-	    (begin
-	      (include-at/relative-to _x filename filename) ...
-	      (program
-	       more ...)))))
-	((_
-	  (code stuff ...)
-	  more ...)
-	 (syntax
-	  (begin
-	    stuff ...
-	    (program more ...))))
-	((_
-	  (feature-cond)
-	  more ...)
-	 (syntax
-	  (program
-	   more ...)))
-	((_
-	  (feature-cond (else stuff ...))
-	  more ...)
-	 (syntax
-	  (program
-	   stuff ...
-	   more ...)))
-
-	((_
-	  (feature-cond ((and) stuff ...)
-			rest ...)
-	  more ...)
-	 (syntax
-	  (program
-	   stuff ...
-	   more ...)))
-
-	((_
-	  (feature-cond ((and requirement1 requirement ...) stuff ...)
-			rest ...)
-	  more ...)
-	 (syntax
-	  (program
-	   (feature-cond (requirement1
-			  (feature-cond ((and requirement ...) stuff ...)))
-			 rest ...)
-	   more ...)))
-      
-	((_
-	  (feature-cond ((or) stuff ...)
-			rest ...)
-	  more ...)
-	 (syntax
-	  (program
-	   (feature-cond rest ...)
-	   more ...)))
-	((_
-	  (feature-cond ((or requirement1 requirement ...) stuff ...)
-			rest ...)
-	  more ...)
-	 (syntax
-	  (program
-	   (feature-cond (requirement1 stuff ...)
-			 ((or requirement ...) stuff ...)
-			 rest ...)
-	   more ...)))
-
-	((_
-	  (feature-cond ((not requirement) stuff ...)
-			rest ...)
-	  more ...)
-	 (syntax
-	  (program
-	   (feature-cond (requirement
-			  (feature-cond rest ...))
-			 (else
-			  stuff ...)))))
-	((_
-	  (feature-cond (requirement stuff ...)
-			rest ...)
-	  more ...)
-	 (if (feature-present? (syntax-object->datum (syntax requirement)))
-	     (syntax
-	      (program
-	       stuff ...
-	       more ...))
-	     (syntax
-	      (program
-	       (feature-cond rest ...)
-	       more ...))))))))
-
-;;; program.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/71.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/71.rkt
deleted file mode 100644
index 0ddafd86f1..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/71.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-71
-#lang s-exp srfi/provider srfi/71/letvalues #:unprefix srfi-
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/71/letvalues.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/71/letvalues.rkt
deleted file mode 100644
index 5cf4eb5da4..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/71/letvalues.rkt
+++ /dev/null
@@ -1,228 +0,0 @@
-; Reference implementation of SRFI-71 using PLT 208's modules
-; Sebastian.Egner@philips.com, 29-Apr-2005
-
-#lang scheme/base
-
-(provide srfi-let
-         srfi-let*
-         srfi-letrec
-         srfi-letrec*
-         uncons unlist unvector
-         values->list values->vector
-         uncons-2 uncons-3 uncons-4
-         uncons-cons)
-
-; --- textual copy of 'letvalues.scm' starts here ---
-
-; Reference implementation of SRFI-71 (generic part)
-; Sebastian.Egner@philips.com, 20-May-2005, PLT 208
-;
-; In order to avoid conflicts with the existing let etc.
-; the macros defined here are called srfi-let etc.,
-; and they are defined in terms of r5rs-let etc.
-; It is up to the actual implementation to save let/*/rec
-; in r5rs-let/*/rec first and redefine let/*/rec
-; by srfi-let/*/rec then.
-;
-; There is also a srfi-letrec* being defined (in view of R6RS.)
-;
-; Macros used internally are named i:<something>.
-;
-; Abbreviations for macro arguments:
-;   bs  - <binding spec>
-;   b   - component of a binding spec (values, <variable>, or <expression>)
-;   v   - <variable>
-;   vr  - <variable> for rest list
-;   x   - <expression>
-;   t   - newly introduced temporary variable
-;   vx  - (<variable> <expression>)
-;   rec - flag if letrec is produced (and not let)
-;   cwv - call-with-value skeleton of the form (x formals)
-;         (call-with-values (lambda () x) (lambda formals /payload/))
-;         where /payload/ is of the form (let (vx ...) body1 body ...).
-;
-; Remark (*):
-;   We bind the variables of a letrec to i:undefined since there is
-;   no portable (R5RS) way of binding a variable to a values that
-;   raises an error when read uninitialized.
-
-(define i:undefined 'undefined)
-
-(define-syntax srfi-letrec* ; -> srfi-letrec
-  (syntax-rules ()
-    ((srfi-letrec* () body1 body ...)
-     (srfi-letrec () body1 body ...))
-    ((srfi-letrec* (bs) body1 body ...)
-     (srfi-letrec (bs) body1 body ...))
-    ((srfi-letrec* (bs1 bs2 bs ...) body1 body ...)
-     (srfi-letrec (bs1) (srfi-letrec* (bs2 bs ...) body1 body ...)))))
-
-(define-syntax srfi-letrec ; -> i:let
-  (syntax-rules ()
-    ((srfi-letrec ((b1 b2 b ...) ...) body1 body ...)
-     (i:let "bs" #t () () (body1 body ...) ((b1 b2 b ...) ...)))))
-
-(define-syntax srfi-let* ; -> srfi-let
-  (syntax-rules ()
-    ((srfi-let* () body1 body ...)
-     (srfi-let () body1 body ...))
-    ((srfi-let* (bs) body1 body ...)
-     (srfi-let (bs) body1 body ...))
-    ((srfi-let* (bs1 bs2 bs ...) body1 body ...)
-     (srfi-let (bs1) (srfi-let* (bs2 bs ...) body1 body ...)))))
-
-(define-syntax srfi-let ; -> i:let or i:named-let
-  (syntax-rules ()
-    ((srfi-let ((b1 b2 b ...) ...) body1 body ...)
-     (i:let "bs" #f () () (body1 body ...) ((b1 b2 b ...) ...)))
-    ((srfi-let tag ((b1 b2 b ...) ...) body1 body ...)
-     (i:named-let tag () (body1 body ...) ((b1 b2 b ...) ...)))))
-
-(define-syntax i:let
-  (syntax-rules (values)
-
-    ; (i:let "bs" rec (cwv ...) (vx ...) body (bs ...))
-    ;   processes the binding specs bs ... by adding call-with-values
-    ;   skeletons to cwv ... and bindings to vx ..., and afterwards
-    ;   wrapping the skeletons around the payload (let (vx ...) . body).
-
-    ; no more bs to process -> wrap call-with-values skeletons
-    ((i:let "bs" rec (cwv ...) vxs body ())
-     (i:let "wrap" rec vxs body cwv ...))
-
-    ; recognize form1 without variable -> dummy binding for side-effects
-    ((i:let "bs" rec cwvs (vx ...) body (((values) x) bs ...))
-     (i:let "bs" rec cwvs (vx ... (dummy (begin x #f))) body (bs ...)))
-
-    ; recognize form1 with single variable -> just extend vx ...
-    ((i:let "bs" rec cwvs (vx ...) body (((values v) x) bs ...))
-     (i:let "bs" rec cwvs (vx ... (v x)) body (bs ...)))
-
-    ; recognize form1 without rest arg -> generate cwv
-    ((i:let "bs" rec cwvs vxs body (((values v ...) x) bs ...))
-     (i:let "form1" rec cwvs vxs body (bs ...) (x ()) (values v ...)))
-
-    ; recognize form1 with rest arg -> generate cwv
-    ((i:let "bs" rec cwvs vxs body (((values . vs) x) bs ...))
-     (i:let "form1+" rec cwvs vxs body (bs ...) (x ()) (values . vs)))
-
-    ; recognize form2 with single variable -> just extend vx ...
-    ((i:let "bs" rec cwvs (vx ...) body ((v x) bs ...))
-     (i:let "bs" rec cwvs (vx ... (v x)) body (bs ...)))
-
-    ; recognize form2 with >=2 variables -> transform to form1
-    ((i:let "bs" rec cwvs vxs body ((b1 b2 b3 b ...) bs ...))
-     (i:let "form2" rec cwvs vxs body (bs ...) (b1 b2) (b3 b ...)))
-
-    ; (i:let "form1" rec cwvs vxs body bss (x (t ...)) (values v1 v2 v ...))
-    ;   processes the variables in v1 v2 v ... adding them to (t ...)
-    ;   and producing a cwv when finished. There is not rest argument.
-
-    ((i:let "form1" rec (cwv ...) vxs body bss (x ts) (values))
-     (i:let "bs" rec (cwv ... (x ts)) vxs body bss))
-    ((i:let "form1" rec cwvs (vx ...) body bss (x (t ...)) (values v1 v ...))
-     (i:let "form1" rec cwvs (vx ... (v1 t1)) body bss (x (t ... t1)) (values v ...)))
-
-    ; (i:let "form1+" rec cwvs vxs body bss (x (t ...)) (values v ... . vr))
-    ;   processes the variables in v ... . vr adding them to (t ...)
-    ;   and producing a cwv when finished. The rest arg is vr.
-
-    ((i:let "form1+" rec cwvs (vx ...) body bss (x (t ...)) (values v1 v2 . vs))
-     (i:let "form1+" rec cwvs (vx ... (v1 t1)) body bss (x (t ... t1)) (values v2 . vs)))
-    ((i:let "form1+" rec (cwv ...) (vx ...) body bss (x (t ...)) (values v1 . vr))
-     (i:let "bs" rec (cwv ... (x (t ... t1 . tr))) (vx ... (v1 t1) (vr tr)) body bss))
-    ((i:let "form1+" rec (cwv ...) (vx ...) body bss (x ()) (values . vr))
-     (i:let "bs" rec (cwv ... (x tr)) (vx ... (vr tr)) body bss))
-
-    ; (i:let "form2" rec cwvs vxs body bss (v ...) (b ... x))
-    ;   processes the binding items (b ... x) from form2 as in
-    ;   (v ... b ... x) into ((values v ... b ...) x), i.e. form1.
-    ;   Then call "bs" recursively.
-
-    ((i:let "form2" rec cwvs vxs body (bs ...) (v ...) (x))
-     (i:let "bs" rec cwvs vxs body (((values v ...) x) bs ...)))
-    ((i:let "form2" rec cwvs vxs body bss (v ...) (b1 b2 b ...))
-     (i:let "form2" rec cwvs vxs body bss (v ... b1) (b2 b ...)))
-
-    ; (i:let "wrap" rec ((v x) ...) (body ...) cwv ...)
-    ;   wraps cwv ... around the payload generating the actual code.
-    ;   For letrec this is of course different than for let.
-
-    ((i:let "wrap" #f vxs body)
-     (let vxs . body))
-    ((i:let "wrap" #f vxs body (x formals) cwv ...)
-     (call-with-values
-      (lambda () x)
-      (lambda formals (i:let "wrap" #f vxs body cwv ...))))
-
-    ((i:let "wrap" #t vxs body)
-     (letrec vxs . body))
-    ((i:let "wrap" #t ((v t) ...) body cwv ...)
-     (let ((v i:undefined) ...) ; (*)
-       (i:let "wraprec" ((v t) ...) body cwv ...)))
-
-    ; (i:let "wraprec" ((v t) ...) body cwv ...)
-    ;   generate the inner code for a letrec. The variables v ...
-    ;   are the user-visible variables (bound outside), and t ...
-    ;   are the temporary variables bound by the cwv consumers.
-
-    ((i:let "wraprec" ((v t) ...) (body ...))
-     (begin (set! v t) ... (let () body ...)))
-    ((i:let "wraprec" vxs body (x formals) cwv ...)
-     (call-with-values
-      (lambda () x)
-      (lambda formals (i:let "wraprec" vxs body cwv ...))))
-
-    ))
-
-(define-syntax i:named-let
-  (syntax-rules (values)
-
-    ; (i:named-let tag (vx ...) body (bs ...))
-    ;   processes the binding specs bs ... by extracting the variable
-    ;   and expression, adding them to vx and turning the result into
-    ;   an ordinary named let.
-
-    ((i:named-let tag vxs body ())
-     (let tag vxs . body))
-    ((i:named-let tag (vx ...) body (((values v) x) bs ...))
-     (i:named-let tag (vx ... (v x)) body (bs ...)))
-    ((i:named-let tag (vx ...) body ((v x) bs ...))
-     (i:named-let tag (vx ... (v x)) body (bs ...)))))
-
-; --- standard procedures ---
-
-(define (uncons pair)
-  (values (car pair) (cdr pair)))
-
-(define (uncons-2 list)
-  (values (car list) (cadr list) (cddr list)))
-
-(define (uncons-3 list)
-  (values (car list) (cadr list) (caddr list) (cdddr list)))
-
-(define (uncons-4 list)
-  (values (car list) (cadr list) (caddr list) (cadddr list) (cddddr list)))
-
-(define (uncons-cons alist)
-  (values (caar alist) (cdar alist) (cdr alist)))
-
-(define (unlist list)
-  (apply values list))
-
-(define (unvector vector)
-  (apply values (vector->list vector)))
-
-; --- standard macros ---
-
-(define-syntax values->list
-  (syntax-rules ()
-    ((values->list x)
-     (call-with-values (lambda () x) list))))
-
-(define-syntax values->vector
-  (syntax-rules ()
-    ((values->vector x)
-     (call-with-values (lambda () x) vector))))
-
-; --- textual copy of 'letvalues.scm' ends here ---
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/74.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/74.rkt
deleted file mode 100644
index 8f7eb0b072..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/74.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-13
-#lang s-exp srfi/provider srfi/74/74
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/74/74.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/74/74.rkt
deleted file mode 100644
index e076a5f01d..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/74/74.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-(module |74| mzscheme
-  (require mzlib/include
-           srfi/26
-           srfi/60
-           srfi/66)
-  (provide
-   endianness
-   blob?
-   make-blob
-   blob-length
-   blob-u8-ref blob-s8-ref
-   blob-u8-set! blob-s8-set!
-   blob-uint-ref blob-sint-ref
-   blob-uint-set! blob-sint-set!
-   blob-u16-ref blob-s16-ref
-   blob-u16-native-ref blob-s16-native-ref
-   blob-u16-set! blob-s16-set! 
-   blob-u16-native-set! blob-s16-native-set!
-   blob-u32-ref blob-s32-ref
-   blob-u32-native-ref blob-s32-native-ref
-   blob-u32-set! blob-s32-set!
-   blob-u32-native-set! blob-s32-native-set!
-   blob-u64-ref blob-s64-ref
-   blob-u64-native-ref blob-s64-native-ref
-   blob-u64-set! blob-s64-set!
-   blob-u64-native-set! blob-s64-native-set! 
-   blob=?
-   blob-copy! blob-copy
-   blob->u8-list u8-list->blob
-   blob->uint-list blob->sint-list
-   uint-list->blob sint-list->blob) 
-  (include (lib "blob.scm" "srfi" "74")))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/74/blob.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/74/blob.scm
deleted file mode 100644
index ec1bbbb113..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/74/blob.scm
+++ /dev/null
@@ -1,232 +0,0 @@
-; Octet-addressed binary objects
-
-; Copyright (C) Michael Sperber (2005). All Rights Reserved. 
-; 
-; Permission is hereby granted, free of charge, to any person
-; obtaining a copy of this software and associated documentation files
-; (the "Software"), to deal in the Software without restriction,
-; including without limitation the rights to use, copy, modify, merge,
-; publish, distribute, sublicense, and/or sell copies of the Software,
-; and to permit persons to whom the Software is furnished to do so,
-; subject to the following conditions:
-; 
-; The above copyright notice and this permission notice shall be
-; included in all copies or substantial portions of the Software.
-; 
-; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-; SOFTWARE.
-
-; This uses SRFIs 23, 26, 60, and 66
-
-(define *endianness/little* (list 'little))
-(define *endianness/big* (list 'big))
-
-(define-syntax endianness
-  (syntax-rules (little big native)
-    ((endianness little) *endianness/little*)
-    ((endianness big) *endianness/big*)
-    ;; change this to the endianness of your architecture
-    ((endianness native) *endianness/big*)))
-
-(define blob? u8vector?)
-
-(define (make-blob k)
-  (make-u8vector k 0))
-
-(define (blob-length b)
-  (u8vector-length b))
-
-(define (blob-u8-ref b k)
-  (u8vector-ref b k))
-(define (blob-u8-set! b k octet)
-  (u8vector-set! b k octet))
-
-(define (blob-s8-ref b k)
-  (u8->s8 (u8vector-ref b k)))
-
-(define (u8->s8 octet)
-  (if (> octet 127)
-      (- octet 256)
-      octet))
-
-(define (blob-s8-set! b k val)
-  (u8vector-set! b k (s8->u8 val)))
-
-(define (s8->u8 val)
-  (if (negative? val)
-      (+ val 256)
-      val))
-
-(define (index-iterate start count low-first?
-		       unit proc)
-  (if low-first?
-      (let loop ((index 0)
-		 (acc unit))
-	(if (>= index count)
-	    acc
-	    (loop (+ index 1)
-		  (proc (+ start index) acc))))
-
-      (let loop ((index (- (+ start count) 1))
-		 (acc unit))
-	(if (< index start)
-	    acc
-	    (loop (- index 1)
-		  (proc index acc))))))
-
-(define (blob-uint-ref size endness blob index)
-  (index-iterate index size
-		       (eq? (endianness big) endness)
-		       0
-		       (lambda (index acc)
-			 (+ (u8vector-ref blob index) (arithmetic-shift acc 8)))))
-
-(define (blob-sint-ref size endness blob index)
-  (let ((high-byte (u8vector-ref blob
-				 (if (eq? endness (endianness big))
-				     index
-				     (- (+ index size) 1)))))
-
-    (if (> high-byte 127)
-	(- (+ 1
-	      (index-iterate index size
-			     (eq? (endianness big) endness)
-			     0
-			     (lambda (index acc)
-			       (+ (- 255 (u8vector-ref blob index))
-				  (arithmetic-shift acc 8))))))
-	(index-iterate index size
-		       (eq? (endianness big) endness)
-		       0
-		       (lambda (index acc)
-			 (+ (u8vector-ref blob index) (arithmetic-shift acc 8)))))))
-
-(define (make-uint-ref size)
-  (cut blob-uint-ref size <> <> <>))
-
-(define (make-sint-ref size)
-  (cut blob-sint-ref size <> <> <>))
-
-(define (blob-uint-set! size endness blob index val)
-  (index-iterate index size (eq? (endianness little) endness)
-		 val
-		 (lambda (index acc)
-		   (u8vector-set! blob index (remainder acc 256))
-		   (quotient acc 256)))
-  (values))
-
-(define (blob-sint-set! size endness blob index val)
-  (if (negative? val)
-      (index-iterate index size (eq? (endianness little) endness)
-		     (- -1 val)
-		     (lambda (index acc)
-		       (u8vector-set! blob index (- 255 (remainder acc 256)))
-		       (quotient acc 256)))
-      
-      (index-iterate index size (eq? (endianness little) endness)
-		     val
-		     (lambda (index acc)
-		       (u8vector-set! blob index (remainder acc 256))
-		       (quotient acc 256))))
-  
-  (values))
-  
-(define (make-uint-set! size)
-  (cut blob-uint-set! size <> <> <> <>))
-(define (make-sint-set! size)
-  (cut blob-sint-set! size <> <> <> <>))
-
-(define (make-ref/native base base-ref)
-  (lambda (blob index)
-    (ensure-aligned index base)
-    (base-ref (endianness native) blob index)))
-
-(define (make-set!/native base base-set!)
-  (lambda (blob index val)
-    (ensure-aligned index base)
-    (base-set! (endianness native) blob index val)))
-
-(define (ensure-aligned index base)
-  (if (not (zero? (remainder index base)))
-      (error "non-aligned blob access" index base)))
-
-(define blob-u16-ref (make-uint-ref 2))
-(define blob-u16-set! (make-uint-set! 2))
-(define blob-s16-ref (make-sint-ref 2))
-(define blob-s16-set! (make-sint-set! 2))
-(define blob-u16-native-ref (make-ref/native 2 blob-u16-ref))
-(define blob-u16-native-set! (make-set!/native 2 blob-u16-set!))
-(define blob-s16-native-ref (make-ref/native 2 blob-s16-ref))
-(define blob-s16-native-set! (make-set!/native 2 blob-s16-set!))
-
-(define blob-u32-ref (make-uint-ref 4))
-(define blob-u32-set! (make-uint-set! 4))
-(define blob-s32-ref (make-sint-ref 4))
-(define blob-s32-set! (make-sint-set! 4))
-(define blob-u32-native-ref (make-ref/native 4 blob-u32-ref))
-(define blob-u32-native-set! (make-set!/native 4 blob-u32-set!))
-(define blob-s32-native-ref (make-ref/native 4 blob-s32-ref))
-(define blob-s32-native-set! (make-set!/native 4 blob-s32-set!))
-
-(define blob-u64-ref (make-uint-ref 8))
-(define blob-u64-set! (make-uint-set! 8))
-(define blob-s64-ref (make-sint-ref 8))
-(define blob-s64-set! (make-sint-set! 8))
-(define blob-u64-native-ref (make-ref/native 8 blob-u64-ref))
-(define blob-u64-native-set! (make-set!/native 8 blob-u64-set!))
-(define blob-s64-native-ref (make-ref/native 8 blob-s64-ref))
-(define blob-s64-native-set! (make-set!/native 8 blob-s64-set!))
-
-; Auxiliary stuff
-
-(define (blob-copy! source source-start target target-start count)
-  (u8vector-copy! source source-start target target-start count))
-
-(define (blob-copy b)
-  (u8vector-copy b))
-
-(define (blob=? b1 b2)
-  (u8vector=? b1 b2))
-
-(define (blob->u8-list b)
-  (u8vector->list b))
-(define (blob->s8-list b)
-  (map u8->s8 (u8vector->list b)))
-
-(define (u8-list->blob l)
-  (list->u8vector l))
-(define (s8-list->blob l)
-  (list->u8vector (map s8->u8 l)))
-
-(define (make-blob->int-list blob-ref)
-  (lambda (size endness b)
-    (let ((ref (cut blob-ref size endness b <>))
-	  (length (blob-length b)))
-      (let loop ((i 0) (r '()))
-	(if (>= i length)
-	    (reverse r)
-	    (loop (+ i size)
-		  (cons (ref i) r)))))))
-
-(define blob->uint-list (make-blob->int-list blob-uint-ref))
-(define blob->sint-list (make-blob->int-list blob-sint-ref))
-
-(define (make-int-list->blob blob-set!)
-  (lambda (size endness l)
-    (let* ((blob (make-blob (* size (length l))))
-	   (set! (cut blob-set! size endness blob <> <>)))
-      (let loop ((i 0) (l l))
-	(if (null? l)
-	    blob
-	    (begin
-	      (set! i (car l))
-	      (loop (+ i size) (cdr l))))))))
-
-(define uint-list->blob (make-int-list->blob blob-uint-set!))
-(define sint-list->blob (make-int-list->blob blob-sint-set!))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/74/info.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/74/info.rkt
deleted file mode 100644
index f38daa88e0..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/74/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("blob.scm"))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/78.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/78.rkt
deleted file mode 100644
index eaf59bd0ea..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/78.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-78
-#lang s-exp srfi/provider srfi/78/check
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/78/check-reference.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/78/check-reference.scm
deleted file mode 100644
index 43fe90ee09..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/78/check-reference.scm
+++ /dev/null
@@ -1,258 +0,0 @@
-; <PLAINTEXT>
-; Copyright (c) 2005-2006 Sebastian Egner.
-; 
-; Permission is hereby granted, free of charge, to any person obtaining
-; a copy of this software and associated documentation files (the
-; ``Software''), to deal in the Software without restriction, including
-; without limitation the rights to use, copy, modify, merge, publish,
-; distribute, sublicense, and/or sell copies of the Software, and to
-; permit persons to whom the Software is furnished to do so, subject to
-; the following conditions:
-; 
-; The above copyright notice and this permission notice shall be
-; included in all copies or substantial portions of the Software.
-; 
-; THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-; LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-; 
-; -----------------------------------------------------------------------
-; 
-; Lightweight testing (reference implementation)
-; ==============================================
-;
-; Sebastian.Egner@philips.com
-; in R5RS + SRFI 23 (error) + SRFI 42 (comprehensions)
-;
-; history of this file:
-;   SE, 25-Oct-2004: first version based on code used in SRFIs 42 and 67
-;   SE, 19-Jan-2006: (arg ...) made optional in check-ec
-;
-; Naming convention "check:<identifier>" is used only internally.
-
-; -- portability --
-
-; PLT:      (require srfi/23 srfi/42)
-; Scheme48: ,open srfi-23 srfi-42 
-
-; -- utilities --
-
-; (define check:write write)
-(define check:write pretty-print)
-
-; You can also use a pretty printer if you have one.
-; However, the output might not improve for most cases
-; because the pretty printers usually output a trailing
-; newline.
-
-; PLT:      (require mzlib/pretty) (define check:write pretty-print)
-; Scheme48: ,open pp (define check:write p)
-
-; -- mode --
-
-(define check:mode #f)
-
-(define (check-set-mode! mode)
-  (set! check:mode
-        (case mode
-          ((off)           0)
-          ((summary)       1)
-          ((report-failed) 10)
-          ((report)        100)
-          (else (error "unrecognized mode" mode)))))
-
-(check-set-mode! 'report)
-
-; -- state --
-
-(define check:correct #f)
-(define check:failed   #f)
-
-(define (check-reset!)
-  (set! check:correct 0)
-  (set! check:failed   '()))
-
-(define (check:add-correct!)
-  (set! check:correct (+ check:correct 1)))
-
-(define (check:add-failed! expression actual-result expected-result)
-  (set! check:failed
-        (cons (list expression actual-result expected-result)
-              check:failed)))
-
-(check-reset!)
-
-; -- reporting --
-
-(define (check:report-expression expression)
-  (newline)
-  (check:write expression)
-  (display " => "))
-
-(define (check:report-actual-result actual-result)
-  (check:write actual-result)
-  (display " ; "))
-
-(define (check:report-correct cases)
-  (display "correct")
-  (unless (= cases 1)
-    (display " (")
-    (display cases)
-    (display " cases checked)"))
-  (newline))
-
-(define (check:report-failed expected-result)
-  (display "*** failed ***")
-  (newline)
-  (display " ; expected result: ")
-  (check:write expected-result)
-  (newline))
-
-(define (check-report)
-  (when (>= check:mode 1)
-    (newline)
-    (display "; *** checks *** : ")
-    (display check:correct)
-    (display " correct, ")
-    (display (length check:failed))
-    (display " failed.")
-    (if (or (null? check:failed) (<= check:mode 1))
-      (newline)
-      (let* ((w (car (reverse check:failed)))
-             (expression (car w))
-             (actual-result (cadr w))
-             (expected-result (caddr w)))
-        (display " First failed example:")
-        (newline)
-        (check:report-expression expression)
-        (check:report-actual-result actual-result)
-        (check:report-failed expected-result)))))
-
-(define (check-passed? expected-total-count)
-  (and (= (length check:failed) 0)
-       (= check:correct expected-total-count)))
-
-; -- simple checks --
-
-(define (check:proc expression thunk equal expected-result)
-  (case check:mode
-    ((0) #f)
-    ((1)
-     (let ((actual-result (thunk)))
-       (if (equal actual-result expected-result)
-           (check:add-correct!)
-           (check:add-failed! expression actual-result expected-result))))
-    ((10)
-     (let ((actual-result (thunk)))
-       (if (equal actual-result expected-result)
-           (check:add-correct!)
-           (begin
-             (check:report-expression expression)
-             (check:report-actual-result actual-result)
-             (check:report-failed expected-result)
-             (check:add-failed! expression actual-result expected-result)))))
-    ((100)
-     (check:report-expression expression)
-     (let ((actual-result (thunk)))
-       (check:report-actual-result actual-result)
-       (if (equal actual-result expected-result)
-           (begin (check:report-correct 1)
-                  (check:add-correct!))
-           (begin (check:report-failed expected-result)
-                  (check:add-failed! expression 
-				     actual-result 
-				     expected-result)))))
-    (else (error "unrecognized check:mode" check:mode)))
-  (void))
-
-(define-syntax check
-  (syntax-rules (=>)
-    ((check expr => expected)
-     (check expr (=> equal?) expected))
-    ((check expr (=> equal) expected)
-     (when (>= check:mode 1)
-       (check:proc 'expr (lambda () expr) equal expected)))))
-
-; -- parametric checks --
-
-(define (check:proc-ec w)
-  (let ((correct? (car w))
-        (expression (cadr w))
-        (actual-result (caddr w))
-        (expected-result (cadddr w))
-	(cases (car (cddddr w))))
-    (if correct?
-        (begin (when (>= check:mode 100)
-                 (check:report-expression expression)
-                 (check:report-actual-result actual-result)
-                 (check:report-correct cases))
-               (check:add-correct!))
-        (begin (when (>= check:mode 10)
-                 (check:report-expression expression)
-                 (check:report-actual-result actual-result)
-                 (check:report-failed expected-result))
-               (check:add-failed! expression
-				  actual-result
-				  expected-result)))))
-
-(define-syntax check-ec:make
-  (syntax-rules (=>)
-    ((check-ec:make qualifiers expr (=> equal) expected (arg ...))
-     (when (>= check:mode 1)
-       (check:proc-ec
-        (let ((cases 0))
-          (let ((w (first-ec
-                    #f
-                    qualifiers
-                    (:let equal-pred equal)
-                    (:let expected-result expected)
-                    (:let actual-result
-                          (let ((arg arg) ...) ; (*)
-                            expr))
-                    (begin (set! cases (+ cases 1)))
-                    (if (not (equal-pred actual-result expected-result)))
-                    (list (list 'let (list (list 'arg arg) ...) 'expr)
-                          actual-result
-                          expected-result
-                          cases))))
-            (if w
-              (cons #f w)
-              (list #t
-                    '(check-ec qualifiers
-                               expr (=> equal)
-                               expected (arg ...))
-                    (void)
-                    (void)
-                    cases)))))))))
-
-; (*) is a compile-time check that (arg ...) is a list
-; of pairwise disjoint bound variables at this point.
-
-(define-syntax check-ec
-  (syntax-rules (nested =>)
-    ((check-ec expr => expected)
-     (check-ec:make (nested) expr (=> equal?) expected ()))
-    ((check-ec expr (=> equal) expected)
-     (check-ec:make (nested) expr (=> equal) expected ()))
-    ((check-ec expr => expected (arg ...))
-     (check-ec:make (nested) expr (=> equal?) expected (arg ...)))
-    ((check-ec expr (=> equal) expected (arg ...))
-     (check-ec:make (nested) expr (=> equal) expected (arg ...)))
-
-    ((check-ec qualifiers expr => expected)
-     (check-ec:make qualifiers expr (=> equal?) expected ()))
-    ((check-ec qualifiers expr (=> equal) expected)
-     (check-ec:make qualifiers expr (=> equal) expected ()))
-    ((check-ec qualifiers expr => expected (arg ...))
-     (check-ec:make qualifiers expr (=> equal?) expected (arg ...)))
-    ((check-ec qualifiers expr (=> equal) expected (arg ...))
-     (check-ec:make qualifiers expr (=> equal) expected (arg ...)))
-
-    ((check-ec (nested q1 ...) q etc ...)
-     (check-ec (nested q1 ... q) etc ...))
-    ((check-ec q1 q2             etc ...)
-     (check-ec (nested q1 q2)    etc ...))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/78/check.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/78/check.rkt
deleted file mode 100644
index b434ec0af0..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/78/check.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scheme/base
-(require mzlib/include
-         srfi/23
-         srfi/42
-         mzlib/pretty)
-
-(include "check-reference.scm")
-
-(provide check
-         check-ec
-         check-report
-         check-set-mode!
-         check-reset!
-         check-passed?)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/78/examples-78.scm b/pkgs/srfi-pkgs/srfi-lib/srfi/78/examples-78.scm
deleted file mode 100644
index 7f752c5106..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/78/examples-78.scm
+++ /dev/null
@@ -1,84 +0,0 @@
-; <PLAINTEXT>
-; Copyright (c) 2005-2006 Sebastian Egner.
-; 
-; Permission is hereby granted, free of charge, to any person obtaining
-; a copy of this software and associated documentation files (the
-; ``Software''), to deal in the Software without restriction, including
-; without limitation the rights to use, copy, modify, merge, publish,
-; distribute, sublicense, and/or sell copies of the Software, and to
-; permit persons to whom the Software is furnished to do so, subject to
-; the following conditions:
-; 
-; The above copyright notice and this permission notice shall be
-; included in all copies or substantial portions of the Software.
-; 
-; THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
-; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-; LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-; 
-; -----------------------------------------------------------------------
-
-; Lightweight testing (examples)
-; ==============================
-;
-; Sebastian.Egner@philips.com
-; in R5RS + SRFI 23 (error) + SRFI 42 (comprehensions)
-;
-; history of this file:
-;   SE, 25-Oct-2004: first version
-
-; -- portability --
-
-; PLT:
-; (require srfi/23 srfi/42) (load "check.scm")
-; (load "examples.scm")
-
-(require srfi/78
-         srfi/42)
-
-; Scheme48: 
-; ,open srfi-23 srfi-42
-; ,load check.scm examples.scm
-
-; -- simple test --
-
-(check (+ 1 1) => 2)
-(check (+ 1 1) => 3) ; fails
-
-; -- different equality predicate --
-
-(check (vector 1) => (vector 1))
-(check (vector 1) (=> eq?) (vector 1)) ; fails
-
-; -- parametric tests --
-
-(check-ec (+ 1 1) => 2)
-
-(check-ec (: x 10) (+ x 1) => (+ x 1) (x))
-
-(check-ec (: e 100) (positive? (expt 2 e)) => #t (e)) ; fails on fixnums
-
-(check-ec (: e 100) (:let x (expt 2.0 e)) (= (+ x 1) x) => #f (x)) ; fails
-
-(check-ec (: e 100) (:let x (expt 2.0 e)) (= (+ x 1) x) => #f)
-
-(check-ec (: x 10) (: y 10) (: z 10)
-          (* x (+ y z)) => (+ (* x y) (* x z))
-          (x y z)) ; passes with 10^3 cases checked
-
-; -- toy examples --
-
-(define (fib n)
-  (if (<= n 2) 1 (+ (fib (- n 1)) (fib (- n 2)))))
-
-(check (fib 1) => 1)
-(check (fib 2) => 1)
-(check-ec (: n 1 31) (even? (fib n)) => (= (modulo n 3) 0) (n))
-
-; -- reporting --
-
-(check-report)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/78/info.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/78/info.rkt
deleted file mode 100644
index 9e17f1ee91..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/78/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-paths '("check-reference.scm" "examples-78.scm"))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/86.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/86.rkt
deleted file mode 100644
index 6523239831..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/86.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-86
-#lang s-exp srfi/provider srfi/86/86
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/86/86.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/86/86.rkt
deleted file mode 100644
index ced6f99be7..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/86/86.rkt
+++ /dev/null
@@ -1,1138 +0,0 @@
-#lang mzscheme
-
-(provide mu nu alet alet*)
-
-;;; mu & nu
-(define-syntax mu
-  (syntax-rules ()
-    ((mu argument ...)
-     (lambda (f) (f argument ...)))))
-
-(define-syntax nu
-  (syntax-rules ()
-    ((nu argument ...)
-     (lambda (f) (apply f argument ...)))))
-
-;;; alet
-(define-syntax alet
-  (syntax-rules ()
-    ((alet (bn ...) bd ...)
-     (%alet () () (bn ...) bd ...))
-    ((alet var (bn ...) bd ...)
-     (%alet (var) () (bn ...) bd ...))))
-
-(define-syntax %alet
-  (syntax-rules (opt cat key rec and values)
-    ((%alet () ((n v) ...) () bd ...)
-     ((lambda (n ...) bd ...) v ...))
-    ((%alet (var) ((n v) ...) () bd ...)
-     ((letrec ((var (lambda (n ...) bd ...)))
-        var) v ...))
-    ((%alet (var (p ...) (nv ...) (bn ...)) ((n v) ...) () bd ...)
-     ((letrec ((t (lambda (v ...)
-                    (%alet (p ...) (nv ... (n v) ... (var t))
-                           (bn ...) bd ...))))
-        t) v ...))
-    ((%alet (p ...) (nv ...) ((() a b ...) bn ...) bd ...)
-     ((lambda () a b ... (%alet (p ...) (nv ...) (bn ...) bd ...))))
-    ((%alet (p ...) (nv ...) (((a) c) bn ...) bd ...)
-     ((lambda (t) (%alet (p ...) (nv ... (a t)) (bn ...) bd ...)) c))
-
-    ((%alet (p ...) (nv ...) (((values a) c) bn ...) bd ...)
-     ((lambda (t) (%alet (p ...) (nv ... (a t)) (bn ...) bd ...)) c))
-    ((%alet (p ...) (nv ...) (((values . b) c d ...) bn ...) bd ...)
-     (%alet "dot" (p ...) (nv ...) (values) (b c d ...) (bn ...) bd ...))
-    ((%alet "dot" (p ...) (nv ...) (values t ...) ((a . b) c ...)
-            (bn ...) bd ...)
-     (%alet "dot" (p ...) (nv ... (a tn)) (values t ... tn) (b c ...)
-            (bn ...) bd ...))
-    ((%alet "dot" (p ...) (nv ...) (values t ...) (() c) (bn ...) bd ...)
-     (call-with-values (lambda () c)
-                       (lambda (t ...)
-                         (%alet (p ...) (nv ...) (bn ...) bd ...))))
-    ((%alet "dot" (p ...) (nv ...) (values t ...) (() c ...) (bn ...) bd ...)
-     ((lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...)) c ...))
-    ((%alet "dot" (p ...) (nv ...) (values t ...) (b c) (bn ...) bd ...)
-     (call-with-values (lambda () c)
-                       (lambda (t ... . tn)
-                         (%alet (p ...) (nv ... (b tn)) (bn ...) bd ...))))
-    ((%alet "dot" (p ...) (nv ...) (values t ...) (b c ...) (bn ...) bd ...)
-     ((lambda (t ... . tn)
-        (%alet (p ...) (nv ... (b tn)) (bn ...) bd ...)) c ...))
-
-    ((%alet (p ...) (nv ...) (((a . b) c d ...) bn ...) bd ...)
-     (%alet "dot" (p ...) (nv ... (a t)) (t) (b c d ...) (bn ...) bd ...))
-    ((%alet "dot" (p ...) (nv ...) (t ...) ((a . b) c ...) (bn ...) bd ...)
-     (%alet "dot" (p ...) (nv ... (a tn)) (t ... tn) (b c ...) (bn ...)
-            bd ...))
-    ((%alet "dot" (p ...) (nv ...) (t ...) (() c) (bn ...) bd ...)
-     (c (lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...))))
-    ((%alet "dot" (p ...) (nv ...) (t ...) (() c ...) (bn ...) bd ...)
-     ((lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...)) c ...))
-    ((%alet "dot" (p ...) (nv ...) (t ...) (b c) (bn ...) bd ...)
-     (c (lambda (t ... . tn) (%alet (p ...) (nv ... (b tn)) (bn ...) bd ...))))
-    ((%alet "dot" (p ...) (nv ...) (t ...) (b c ...) (bn ...) bd ...)
-     ((lambda (t ... . tn)
-        (%alet (p ...) (nv ... (b tn)) (bn ...) bd ...)) c ...))
-
-    ((%alet (p ...) (nv ...) ((and (n1 v1 t1 ...) (n2 v2 t2 ...) ...) bn ...)
-            bd ...)
-     (%alet "and" (p ...) (nv ...) ((n1 v1 t1 ...) (n2 v2 t2 ...) ...) (bn ...)
-            bd ...))
-    ((%alet "and" (p ...) (nv ...) ((n v) nvt ...) (bn ...) bd ...)
-     (let ((t v))
-       (and t (%alet "and" (p ...) (nv ... (n t)) (nvt ...) (bn ...) bd ...))))
-    ((%alet "and" (p ...) (nv ...) ((n v t) nvt ...) (bn ...) bd ...)
-     (let ((tt v))
-       (and (let ((n tt)) t)
-            (%alet "and" (p ...) (nv ... (n tt)) (nvt ...) (bn ...) bd ...)))) 
-    ((%alet "and" (p ...) (nv ...) () (bn ...) bd ...)
-     (%alet (p ...) (nv ...) (bn ...) bd ...))
-    ((%alet (p ...) (nv ...) ((opt z a . e) bn ...) bd ...)
-     (%alet "opt" (p ...) (nv ...) z (a . e) (bn ...) bd ...))
-    ((%alet "opt" (p ...) (nv ...) z ((n d t ...)) (bn ...) bd ...)
-     (let ((x (if (null? z)
-                d
-                (if (null? (cdr z))
-                  (wow-opt n (car z) t ...)
-                  (error "alet: too many arguments" (cdr z))))))
-       (%alet (p ...) (nv ... (n x)) (bn ...) bd ...)))
-    ((%alet "opt" (p ...) (nv ...) z ((n d t ...) . e) (bn ...) bd ...)
-     (let ((y (if (null? z) z (cdr z)))
-           (x (if (null? z)
-                d
-                (wow-opt n (car z) t ...))))
-       (%alet "opt" (p ...) (nv ... (n x)) y e (bn ...) bd ...)))
-    ((%alet "opt" (p ...) (nv ...) z e (bn ...) bd ...)
-     (let ((te z))
-       (%alet (p ...) (nv ... (e te)) (bn ...) bd ...)))
-    ((%alet (p ...) (nv ...) ((cat z a . e) bn ...) bd ...)
-     (let ((y z))
-       (%alet "cat" (p ...) (nv ...) y (a . e) (bn ...) bd ...)))
-    ((%alet "cat" (p ...) (nv ...) z ((n d t ...)) (bn ...) bd ...)
-     (let ((x (if (null? z)
-                d
-                (if (null? (cdr z))
-                  (wow-cat-end z n t ...)
-                  (error "alet: too many arguments" (cdr z))))))
-       (%alet (p ...) (nv ... (n x)) (bn ...) bd ...)))
-    ((%alet "cat" (p ...) (nv ...) z ((n d t ...) . e) (bn ...) bd ...)
-     (let ((x (if (null? z)
-                d
-                (wow-cat! z n d t ...))))
-       (%alet "cat" (p ...) (nv ... (n x)) z e (bn ...) bd ...)))
-    ((%alet "cat" (p ...) (nv ...) z e (bn ...) bd ...)
-     (let ((te z))
-       (%alet (p ...) (nv ... (e te)) (bn ...) bd ...)))
-    ((%alet (p ...) (nv ...) ((key z a . e) bn ...) bd ...)
-     (let ((y z))
-       (%alet "key" (p ...) (nv ...) y () () (a . e) () (bn ...) bd ...)))
-    ((%alet "key" (p ...) (nv ...) z ()
-            (ndt ...) (((n k) d t ...) . e) (kk ...) (bn ...) bd ...)
-     (%alet "key" (p ...) (nv ...) z ()
-            (ndt ... ((n k) d t ...)) e (kk ... k) (bn ...) bd ...))
-    ((%alet "key" (p ...) (nv ...) z ()
-            (ndt ...) ((n d t ...) . e) (kk ...) (bn ...) bd ...)
-     (%alet "key" (p ...) (nv ...) z ()
-            (ndt ... ((n 'n) d t ...)) e (kk ... 'n) (bn ...) bd ...))
-    ((%alet "key" (p ...) (nv ...) z ()
-            (ndt nd ...) (#t . e) (kk k ...) (bn ...) bd ...)
-     (%alet "key" (p ...) (nv ...) z (#t)
-            (ndt nd ...) e (kk k ...) (bn ...) bd ...))
-    ((%alet "key" (p ...) (nv ...) z ()
-            (ndt nd ...) (#f . e) (kk k ...) (bn ...) bd ...)
-     (%alet "key" (p ...) (nv ...) z (#f)
-            (ndt nd ...) e (kk k ...) (bn ...) bd ...))
-    ((%alet "key" (p ...) (nv ...) z (o ...)
-            (((n k) d t ...) ndt ...) e (kk ...) (bn ...) bd ...)
-     (let ((x (if (null? z)
-                d
-                (wow-key! z (o ...) (kk ...) (n k) d t ...))))
-       (%alet "key" (p ...) (nv ... (n x)) z (o ...)
-              (ndt ...) e (kk ...) (bn ...) bd ...)))
-    ((%alet "key" (p ...) (nv ...) z (o ...) () () (kk ...) (bn ...) bd ...)
-     (if (null? z)
-       (%alet (p ...) (nv ...) (bn ...) bd ...)
-       (error "alet: too many arguments" z)))
-    ((%alet "key" (p ...) (nv ...) z (o ...) () e (kk ...) (bn ...) bd ...)
-     (let ((te z)) (%alet (p ...) (nv ... (e te)) (bn ...) bd ...)))
-    ((%alet (p ...) (nv ...) ((rec (n v) (nn vv) ...) bn ...) bd ...)
-     (%alet "rec" (p ...) (nv ... (n t)) ((n v t))
-            ((nn vv) ...) (bn ...) bd ...))
-    ((%alet "rec" (p ...) (nv ...) (nvt ...) ((n v) (nn vv) ...)
-            (bn ...) bd ...)
-     (%alet "rec" (p ...) (nv ... (n t)) (nvt ... (n v t)) ((nn vv) ...)
-            (bn ...) bd ...))
-    ((%alet "rec" (p ...) (nv ...) ((n v t) ...) () (bn ...) bd ...)
-     ((let ((n '<undefined>) ...)
-        (let ((t v) ...)
-          (set! n t) ...
-          (mu n ...)))
-      (lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...))))
-
-    ((%alet (p ...) (nv ...) ((a b) bn ...) bd ...)
-     ((lambda (t) (%alet (p ...) (nv ... (a t)) (bn ...) bd ...)) b))
-
-    ((%alet (p ...) (nv ...) ((values a c) bn ...) bd ...)
-     ((lambda (t) (%alet (p ...) (nv ... (a t)) (bn ...) bd ...)) c))
-    ((%alet (p ...) (nv ...) ((values a b c ...) bn ...) bd ...)
-     (%alet "not" (p ...) (nv ... (a t)) (values t) (b c ...) (bn ...) bd ...))
-    ((%alet "not" (p ...) (nv ...) (values t ...) (a b c ...) (bn ...) bd ...)
-     (%alet "not" (p ...) (nv ... (a tn)) (values t ... tn) (b c ...)
-            (bn ...) bd ...))
-    ((%alet "not" (p ...) (nv ...) (values t ...) (z) (bn ...) bd ...)
-     (call-with-values (lambda () z)
-                       (lambda (t ...)
-                         (%alet (p ...) (nv ...) (bn ...) bd ...))))
-
-    ((%alet (p ...) (nv ...) ((a b c ...) bn ...) bd ...)
-     (%alet "not" (p ...) (nv ... (a t)) (t) (b c ...) (bn ...) bd ...))
-    ((%alet "not" (p ...) (nv ...) (t ...) (a b c ...) (bn ...) bd ...)
-     (%alet "not" (p ...) (nv ... (a tn)) (t ... tn) (b c ...) (bn ...)
-            bd ...))
-    ((%alet "not" (p ...) (nv ...) (t ...) (z) (bn ...) bd ...)
-     (z (lambda (t ...) (%alet (p ...) (nv ...) (bn ...) bd ...))))
-    ((%alet (p ...) (nv ...) ((a) bn ...) bd ...)
-     (call-with-current-continuation
-      (lambda (t) (%alet (p ...) (nv ... (a t)) (bn ...) bd ...))))
-    ((%alet (p ...) (nv ...) ((a . b) bn ...) bd ...)
-     (%alet "rot" (p ...) (nv ...) (a) b (bn ...) bd ...))
-    ((%alet "rot" (p ...) (nv ...) (new-bn ...) (a . b) (bn ...) bd ...)
-     (%alet "rot" (p ...) (nv ...) (new-bn ... a) b (bn ...) bd ...)) 
-    ((%alet "rot" (p ...) (nv ...) (()) b (bn ...) bd ...)
-     (%alet (b (p ...) (nv ...) (bn ...)) () () bd ...))
-    ((%alet "rot" (p ...) (nv ...) (new-bn ...) b (bn ...) bd ...)
-     (%alet (b (p ...) (nv ...) (bn ...)) () (new-bn ...) bd ...))
-    ((%alet (p ...) (nv ...) (a b bn ...) bd ...)
-     (b (lambda t (%alet (p ...) (nv ... (a t)) (bn ...) bd ...))))))
-
-;;; alet*
-(define-syntax alet*
-  (syntax-rules (opt cat key rec and values)
-    ((alet* () bd ...)
-     ((lambda () bd ...)))
-    ((alet* ((() a b ...) bn ...) bd ...)
-     ((lambda () a b ... (alet* (bn ...) bd ...))))
-    ((alet* (((a) c) bn ...) bd ...)
-     ((lambda (a) (alet* (bn ...) bd ...)) c))
-
-    ((alet* (((values a) c) bn ...)  bd ...)
-     ((lambda (a) (alet* (bn ...) bd ...)) c))
-
-    ((alet* (((values . b) c) bn ...)  bd ...)
-     (call-with-values (lambda () c)
-                       (lambda* b (alet* (bn ...) bd ...))))
-    ((alet* (((values . b) c d ...) bn ...) bd ...)
-     (alet* "dot" (b c d ...) (bn ...) bd ...))
-    ((alet* "dot" ((a . b) c d ...) (bn ...) bd ...)
-     ((lambda (a) (alet* "dot" (b d ...) (bn ...) bd ...)) c))
-    ((alet* "dot" (()) (bn ...) bd ...)
-     (alet* (bn ...) bd ...))
-    ((alet* "dot" (b c ...) (bn ...) bd ...)
-     ((lambda b (alet* (bn ...) bd ...)) c ...))
-
-    ((alet* (((a . b) c) bn ...)  bd ...)
-     (c (lambda* (a . b) (alet* (bn ...) bd ...))))
-    ((alet* (((a . b) c d ...) bn ...) bd ...)
-     ((lambda (a) (alet* "dot" (b d ...) (bn ...) bd ...)) c))
-
-    ((alet* ((and (n1 v1 t1 ...) (n2 v2 t2 ...) ...) bn ...) bd ...)
-     (alet-and* ((n1 v1 t1 ...) (n2 v2 t2 ...) ...) (alet* (bn ...) bd ...)))
-    ((alet* ((opt z a . e) bn ...) bd ...)
-     (%alet-opt* z (a . e) (alet* (bn ...) bd ...)))
-    ((alet* ((cat z a . e) bn ...)  bd ...)
-     (let ((y z))
-       (%alet-cat* y (a . e) (alet* (bn ...) bd ...))))
-    ((alet* ((key z a . e) bn ...)  bd ...)
-     (let ((y z))
-       (%alet-key* y () () (a . e) () (alet* (bn ...) bd ...))))
-    ((alet* ((rec (n1 v1) (n2 v2) ...) bn ...) bd ...)
-     (alet-rec* ((n1 v1) (n2 v2) ...) (alet* (bn ...) bd ...)))
-
-    ((alet* ((a b) bn ...) bd ...)
-     ((lambda (a) (alet* (bn ...) bd ...)) b))
-
-    ((alet* ((values a c) bn ...) bd ...)
-     ((lambda (a) (alet* (bn ...) bd ...)) c))
-    ((alet* ((values a b c ...) bn ...) bd ...)
-     (alet* "not" (values a) (b c ...) (bn ...) bd ...))
-    ((alet* "not" (values r ...) (a b c ...) (bn ...) bd ...)
-     (alet* "not" (values r ... a) (b c ...) (bn ...) bd ...))
-    ((alet* "not" (values r ...) (z) (bn ...) bd ...)
-     (call-with-values (lambda () z)
-                       (lambda* (r ...) (alet* (bn ...) bd ...))))
-
-    ((alet* ((a b c ...) bn ...) bd ...)
-     (alet* "not" (a) (b c ...) (bn ...) bd ...))
-    ((alet* "not" (r ...) (a b c ...) (bn ...) bd ...)
-     (alet* "not" (r ... a) (b c ...) (bn ...) bd ...))
-    ((alet* "not" (r ...) (z) (bn ...) bd ...)
-     (z (lambda* (r ...) (alet* (bn ...) bd ...))))
-    ((alet* ((a) bn ...) bd ...)
-     (call-with-current-continuation (lambda (a) (alet* (bn ...)  bd ...))))
-    ((alet* ((a . b) bn ...) bd ...)
-     (%alet* () () ((a . b) bn ...) bd ...))
-    ((alet* (a b bn ...) bd ...)
-     (b (lambda a (alet* (bn ...) bd ...))))
-    ((alet* var (bn ...) bd ...)
-     (%alet* (var) () (bn ...) bd ...))))
-
-(define-syntax %alet*
-  (syntax-rules (opt cat key rec and values)
-    ((%alet* (var) (n ...) () bd ...)
-     ((letrec ((var (lambda* (n ...) bd ...)))
-        var) n ...))
-    ((%alet* (var (bn ...)) (n ...) ()  bd ...)
-     ((letrec ((var (lambda* (n ...) (alet* (bn ...) bd ...))))
-        var) n ...))
-    ((%alet* (var (p ...) (nn ...) (bn ...)) (n ...) ()  bd ...)
-     ((letrec ((var (lambda* (n ...)
-                      (%alet* (p ...) (nn ... n ... var) (bn ...)
-                              bd ...))))
-        var) n ...))
-    ((%alet* (p ...) (n ...) ((() a b ...) bn ...) bd ...)
-     ((lambda () a b ... (%alet* (p ...) (n ...) (bn ...) bd ...))))
-    ((%alet* (p ...) (n ...) (((a) c) bn ...) bd ...)
-     ((lambda (a) (%alet* (p ...) (n ... a) (bn ...) bd ...)) c))
-
-    ((%alet* (p ...) (n ...) (((values a) c) bn ...) bd ...)
-     ((lambda (a) (%alet* (p ...) (n ... a) (bn ...) bd ...)) c))
-
-    ((%alet* (p ...) (n ...) (((values . b) c) bn ...) bd ...)
-     (%alet* "one" (p ...) (n ...) (values) (b c) (bn ...) bd ...))
-    ((%alet* "one" (p ...) (n ...) (values r ...) ((a . b) c) (bn ...) bd ...)
-     (%alet* "one" (p ...) (n ... a) (values r ... a) (b c) (bn ...) bd ...))
-    ((%alet* "one" (p ...) (n ...) (values r ...) (() c) (bn ...) bd ...)
-     (call-with-values (lambda () c)
-                       (lambda* (r ...)
-                         (%alet* (p ...) (n ...) (bn ...) bd ...))))
-    ((%alet* "one" (p ...) (n ...) (values r ...) (b c) (bn ...) bd ...)
-     (call-with-values (lambda () c)
-                       (lambda* (r ... . b)
-                         (%alet* (p ...) (n ... b) (bn ...) bd ...))))
-
-    ((%alet* (p ...) (n ...) (((values . b) c d ...) bn ...) bd ...)
-     (%alet* "dot" (p ...) (n ...) (b c d ...) (bn ...) bd ...))
-
-    ((%alet* (p ...) (n ...) (((a . b) c) bn ...) bd ...)
-     (%alet* "one" (p ...) (n ... a) (a) (b c) (bn ...) bd ...))
-    ((%alet* "one" (p ...) (n ...) (r ...) ((a . b) c) (bn ...) bd ...)
-     (%alet* "one" (p ...) (n ... a) (r ... a) (b c) (bn ...) bd ...))
-    ((%alet* "one" (p ...) (n ...) (r ...) (() c) (bn ...) bd ...)
-     (c (lambda* (r ...) (%alet* (p ...) (n ...) (bn ...) bd ...))))
-    ((%alet* "one" (p ...) (n ...) (r ...) (b c) (bn ...) bd ...)
-     (c (lambda* (r ... . b) (%alet* (p ...) (n ... b) (bn ...) bd ...))))
-
-    ((%alet* (p ...) (n ...) (((a . b) c d ...) bn ...) bd ...)
-     ((lambda (a)
-        (%alet* "dot" (p ...) (n ... a) (b d ...) (bn ...) bd ...)) c))
-    ((%alet* "dot" (p ...) (n ...) ((a . b) c d ...) (bn ...) bd ...)
-     ((lambda (a)
-        (%alet* "dot" (p ...) (n ... a) (b d ...) (bn ...) bd ...)) c))
-    ((%alet* "dot" (p ...) (n ...) (()) (bn ...) bd ...)
-     (%alet* (p ...) (n ...) (bn ...) bd ...))
-    ((%alet* "dot" (p ...) (n ...) (b c ...) (bn ...) bd ...)
-     ((lambda b (%alet* (p ...) (n ... b) (bn ...) bd ...)) c ...))
-
-    ((%alet* (p ...) (n ...) ((and (n1 v1 t1 ...) (n2 v2 t2 ...) ...) bn ...)
-             bd ...)
-     (alet-and* ((n1 v1 t1 ...) (n2 v2 t2 ...) ...)
-                (%alet* (p ...) (n ... n1 n2 ...) (bn ...) bd ...)))
-    ((%alet* (p ...) (n ...) ((opt z a . e) bn ...) bd ...)
-     (%alet* "opt" (p ...) (n ...) z (a . e) (bn ...) bd ...))
-    ((%alet* "opt" (p ...) (nn ...) z ((n d t ...)) (bn ...) bd ...)
-     (let ((n (if (null? z)
-                d
-                (if (null? (cdr z))
-                  (wow-opt n (car z) t ...)
-                  (error "alet*: too many arguments" (cdr z))))))
-       (%alet* (p ...) (nn ... n) (bn ...) bd ...)))
-    ((%alet* "opt" (p ...) (nn ...) z ((n d t ...) . e) (bn ...) bd ...)
-     (let ((y (if (null? z) z (cdr z)))
-           (n (if (null? z)
-                d
-                (wow-opt n (car z) t ...))))
-       (%alet* "opt" (p ...) (nn ... n) y e (bn ...) bd ...)))
-    ((%alet* "opt" (p ...) (nn ...) z e (bn ...) bd ...)
-     (let ((e z))
-       (%alet* (p ...) (nn ... e) (bn ...) bd ...)))
-    ((%alet* (p ...) (nn ...) ((cat z a . e) bn ...) bd ...)
-     (let ((y z))
-       (%alet* "cat" (p ...) (nn ...) y (a . e) (bn ...) bd ...)))
-    ((%alet* "cat" (p ...) (nn ...) z ((n d t ...)) (bn ...) bd ...)
-     (let ((n (if (null? z)
-                d
-                (if (null? (cdr z))
-                  (wow-cat-end z n t ...)
-                  (error "alet*: too many arguments" (cdr z))))))
-       (%alet* (p ...) (nn ... n) (bn ...) bd ...)))
-    ((%alet* "cat" (p ...) (nn ...) z ((n d t ...) . e) (bn ...) bd ...)
-     (let ((n (if (null? z)
-                d
-                (wow-cat! z n d t ...))))
-       (%alet* "cat" (p ...) (nn ... n) z e (bn ...) bd ...)))
-    ((%alet* "cat" (p ...) (nn ...) z e (bn ...) bd ...)
-     (let ((e z))
-       (%alet* (p ...) (nn ... e) (bn ...) bd ...)))
-    ((%alet* (p ...) (m ...) ((key z a . e) bn ...) bd ...)
-     (let ((y z))
-       (%alet* "key" (p ...) (m ...) y () () (a . e) () (bn ...) bd ...)))
-    ((%alet* "key" (p ...) (m ...) z ()
-             (ndt ...) (((n k) d t ...) . e) (kk ...) (bn ...) bd ...)
-     (%alet* "key" (p ...) (m ...) z ()
-             (ndt ... ((n k) d t ...)) e (kk ... k) (bn ...) bd ...))
-    ((%alet* "key" (p ...) (m ...) z ()
-             (ndt ...) ((n d t ...) . e) (kk ...) (bn ...) bd ...)
-     (%alet* "key" (p ...) (m ...) z ()
-             (ndt ... ((n 'n) d t ...)) e (kk ... 'n) (bn ...) bd ...))
-    ((%alet* "key" (p ...) (m ...) z ()
-             (ndt nd ...) (#t . e) (kk k ...) (bn ...) bd ...)
-     (%alet* "key" (p ...) (m ...) z (#t)
-             (ndt nd ...) e (kk k ...) (bn ...) bd ...))
-    ((%alet* "key" (p ...) (m ...) z ()
-             (ndt nd ...) (#f . e) (kk k ...) (bn ...) bd ...)
-     (%alet* "key" (p ...) (m ...) z (#f)
-             (ndt nd ...) e (kk k ...) (bn ...) bd ...))
-    ((%alet* "key" (p ...) (m ...) z (o ...)
-             (((n k) d t ...) ndt ...) e (kk ...) (bn ...) bd ...)
-     (let ((n (if (null? z)
-                d
-                (wow-key! z (o ...) (kk ...) (n k) d t ...))))
-       (%alet* "key" (p ...) (m ... n) z (o ...)
-               (ndt ...) e (kk ...) (bn ...) bd ...)))
-    ((%alet* "key" (p ...) (m ...) z (o ...) () () (kk ...) (bn ...) bd ...)
-     (if (null? z)
-       (%alet* (p ...) (m ...) (bn ...) bd ...)
-       (error "alet*: too many arguments" z)))
-    ((%alet* "key" (p ...) (m ...) z (o ...) () e (kk ...) (bn ...) bd ...)
-     (let ((e z)) (%alet* (p ...) (m ... e) (bn ...) bd ...)))
-    ((%alet* (p ...) (n ...) ((rec (n1 v1) (n2 v2) ...) bn ...) bd ...)
-     (alet-rec* ((n1 v1) (n2 v2) ...)
-                (%alet* (p ...) (n ... n1 n2 ...) (bn ...) bd ...)))
-
-    ((%alet* (p ...) (n ...) ((a b) bn ...) bd ...)
-     ((lambda (a) (%alet* (p ...) (n ... a) (bn ...) bd ...)) b))
-
-    ((%alet* (p ...) (n ...) ((values a c) bn ...) bd ...)
-     ((lambda (a) (%alet* (p ...) (n ... a) (bn ...) bd ...)) c))
-    ((%alet* (p ...) (n ...) ((values a b c ...) bn ...) bd ...)
-     (%alet* "not" (p ...) (n ... a) (values a) (b c ...) (bn ...) bd ...))
-    ((%alet* "not" (p ...) (n ...) (values r ...) (a b c ...) (bn ...) bd ...)
-     (%alet* "not" (p ...) (n ... a) (values r ... a) (b c ...) (bn ...)
-             bd ...))
-    ((%alet* "not" (p ...) (n ...) (values r ...) (z) (bn ...) bd ...)
-     (call-with-values (lambda () z)
-         (lambda* (r ...) (%alet* (p ...) (n ...) (bn ...) bd ...))))
-
-    ((%alet* (p ...) (n ...) ((a b c ...) bn ...) bd ...)
-     (%alet* "not" (p ...) (n ... a) (a) (b c ...) (bn ...) bd ...))
-    ((%alet* "not" (p ...) (n ...) (r ...) (a b c ...) (bn ...) bd ...)
-     (%alet* "not" (p ...) (n ... a) (r ... a) (b c ...) (bn ...) bd ...))
-    ((%alet* "not" (p ...) (n ...) (r ...) (z) (bn ...) bd ...)
-     (z (lambda* (r ...) (%alet* (p ...) (n ...) (bn ...) bd ...))))
-    ((%alet* (p ...) (n ...) ((a) bn ...) bd ...)
-     (call-with-current-continuation
-      (lambda (a) (%alet* (p ...) (n ... a) (bn ...) bd ...))))
-    ((%alet* (p ...) (n ...) ((a . b) bn ...) bd ...)
-     (%alet* "rot" (p ...) (n ...) (a) b (bn ...) bd ...))
-    ((%alet* "rot" (p ...) (n ...) (new-bn ...) (a . b) (bn ...) bd ...)
-     (%alet* "rot" (p ...) (n ...) (new-bn ... a) b (bn ...) bd ...)) 
-    ((%alet* "rot" () () (()) b (bn ...) bd ...)
-     (%alet* (b (bn ...)) () () bd ...))
-    ((%alet* "rot" (p ...) (n ...) (()) b (bn ...) bd ...)
-     (%alet* (b (p ...) (n ...) (bn ...)) () () bd ...))
-    ((%alet* "rot" () () (new-bn ...) b (bn ...) bd ...)
-     (%alet* (b (bn ...)) () (new-bn ...) bd ...))
-    ((%alet* "rot" (p ...) (n ...) (new-bn ...) b (bn ...) bd ...)
-     (%alet* (b (p ...) (n ...) (bn ...)) () (new-bn ...) bd ...))
-    ((%alet* (p ...) (n ...) (a b bn ...) bd ...)
-     (b (lambda a (%alet* (p ...) (n ... a) (bn ...) bd ...))))))
-
-;;; auxiliaries
-(define-syntax lambda*
-  (syntax-rules ()
-    ((lambda* (a . e) bd ...)
-     (lambda* "star" (ta) (a) e bd ...))
-    ((lambda* "star" (t ...) (n ...) (a . e) bd ...)
-     (lambda* "star" (t ... ta) (n ... a) e bd ...))
-    ((lambda* "star" (t ...) (n ...) () bd ...)
-     (lambda (t ...)
-       (let* ((n t) ...) bd ...)))
-    ((lambda* "star" (t ...) (n ...) e bd ...)
-     (lambda (t ... . te)
-       (let* ((n t) ... (e te)) bd ...)))
-    ((lambda* e bd ...)
-     (lambda e bd ...))))
-
-(define-syntax alet-and
-  (syntax-rules ()
-    ((alet-and ((n v t ...) ...) bd ...)
-     (alet-and "and" () ((n v t ...) ...) bd ...))
-    ((alet-and "and" (nt ...) ((n v) nvt ...) bd ...)
-     (let ((t v))
-       (and t (alet-and "and" (nt ... (n t)) (nvt ...) bd ...))))
-    ((alet-and "and" (nt ...) ((n v t) nvt ...) bd ...)
-     (let ((tt v))
-       (and (let ((n tt)) t)
-            (alet-and "and" (nt ... (n tt)) (nvt ...) bd ...))))
-    ((alet-and "and" ((n t) ...) () bd ...)
-     ((lambda (n ...) bd ...) t ...))))
-
-(define-syntax alet-and*
-  (syntax-rules ()
-    ((alet-and* () bd ...)
-     ((lambda () bd ...)))
-    ((alet-and* ((n v) nvt ...) bd ...)
-     (let ((n v))
-       (and n (alet-and* (nvt ...) bd ...))))
-    ((alet-and* ((n v t) nvt ...) bd ...)
-     (let ((n v))
-       (and t (alet-and* (nvt ...) bd ...))))))
-
-(define-syntax alet-rec
-  (syntax-rules ()
-    ((alet-rec ((n v) ...) bd ...)
-     (alet-rec "rec" () ((n v) ...) bd ...))
-    ((alet-rec "rec" (nvt ...) ((n v) nv ...) bd ...)
-     (alet-rec "rec" (nvt ... (n v t)) (nv ...) bd ...))
-    ((alet-rec "rec" ((n v t) ...) () bd ...)
-     (let ((n '<undefined>) ...)
-       (let ((t v) ...)
-         (set! n t) ...
-         ;;(let ()
-         ;;  bd ...))))))
-         bd ...)))))
-
-(define-syntax alet-rec*
-  (syntax-rules ()
-    ((alet-rec* ((n v) ...) bd ...)
-     (let* ((n '<undefined>) ...)
-       (set! n v) ...
-       ;;(let ()
-       ;; bd ...)))))
-       bd ...))))
-
-(define-syntax wow-opt
-  (syntax-rules ()
-    ((wow-opt n v)
-     v)
-    ((wow-opt n v t)
-     (let ((n v))
-       (if t n (error "alet[*]: bad argument" n 'n 't))))
-    ((wow-opt n v t ts)
-     (let ((n v))
-       (if t ts (error "alet[*]: bad argument" n 'n 't))))
-    ((wow-opt n v t ts fs)
-     (let ((n v))
-       (if t ts fs)))))
-
-(define-syntax wow-opt!
-  (syntax-rules ()
-    ((wow-opt! z n)
-     (let ((n (car z)))
-       (set! z (cdr z))
-       n))
-    ((wow-opt! z n t)
-     (let ((n (car z)))
-       (if t
-         (begin (set! z (cdr z)) n)
-         (error "alet[*]: bad argument" n 'n 't))))
-    ((wow-opt! z n t ts)
-     (let ((n (car z)))
-       (if t
-         (begin (set! z (cdr z)) ts)
-         (error "alet[*]: bad argument" n 'n 't))))
-    ((wow-opt! z n t ts fs)
-     (let ((n (car z)))
-       (if t
-         (begin (set! z (cdr z)) ts)
-         (begin (set! z (cdr z)) fs))))))
-
-(define-syntax wow-cat-end
-  (syntax-rules ()
-    ((wow-cat-end z n)
-     (car z))
-    ((wow-cat-end z n t)
-     (let ((n (car z)))
-       (if t n (error "alet[*]: too many argument" z))))
-    ((wow-cat-end z n t ts)
-     (let ((n (car z)))
-       (if t ts (error "alet[*]: too many argument" z))))
-    ((wow-cat-end z n t ts fs)
-     (let ((n (car z)))
-       (if t ts fs)))))
-
-(define-syntax wow-cat
-  (syntax-rules ()
-    ((wow-cat z n d)
-     z)
-    ((wow-cat z n d t)
-     (let ((n (car z)))
-       (if t
-         z
-         (let lp ((head (list n)) (tail (cdr z)))
-           (if (null? tail)
-             (cons d z)
-             (let ((n (car tail)))
-               (if t
-                 (cons n (append (reverse head) (cdr tail)))
-                 (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat z n d t ts)
-     (let ((n (car z)))
-       (if t
-         (cons ts (cdr z))
-         (let lp ((head (list n)) (tail (cdr z)))
-           (if (null? tail)
-             (cons d z)
-             (let ((n (car tail)))
-               (if t
-                 (cons ts (append (reverse head) (cdr tail)))
-                 (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat z n d t ts fs)
-     (let ((n (car z)))
-       (if t
-         (cons ts (cdr z))
-         (cons fs (cdr z)))))))
-
-(define-syntax wow-cat!
-  (syntax-rules ()
-    ((wow-cat! z n d)
-     (let ((n (car z)))
-       (set! z (cdr z))
-       n))
-    ((wow-cat! z n d t)
-     (let ((n (car z)))
-       (if t
-         (begin (set! z (cdr z)) n)
-         (let lp ((head (list n)) (tail (cdr z)))
-           (if (null? tail)
-             d
-             (let ((n (car tail)))
-               (if t
-                 (begin (set! z (append (reverse head) (cdr tail))) n)
-                 (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat! z n d t ts)
-     (let ((n (car z)))
-       (if t
-         (begin (set! z (cdr z)) ts)
-         (let lp ((head (list n)) (tail (cdr z)))
-           (if (null? tail)
-             d
-             (let ((n (car tail)))
-               (if t
-                 (begin (set! z (append (reverse head) (cdr tail))) ts)
-                 (lp (cons n head) (cdr tail)))))))))
-    ((wow-cat! z n d t ts fs)
-     (let ((n (car z)))
-       (if t
-         (begin (set! z (cdr z)) ts)
-         (begin (set! z (cdr z)) fs))))))
-
-(define-syntax wow-key!
-  (syntax-rules ()
-    ((wow-key! z () (kk ...) (n key) d)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (begin (set! z (cdr y)) (car y))
-           (let lp ((head (list (car y) x)) (tail (cdr y)))
-             (if (null? tail)
-               d
-               (let ((x (car tail))
-                     (y (cdr tail)))
-                 (if (null? y)
-                   d
-                   (if (equal? key x)
-                     (begin (set! z (append (reverse head) (cdr y)))
-                            (car y))
-                     (lp (cons (car y) (cons x head))
-                         (cdr y)))))))))))
-    ((wow-key! z (#f) (kk ...) (n key) d)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (begin (set! z (cdr y)) (car y))
-           (let ((lk (list kk ...)))
-             (if (not (member x lk))
-               d
-               (let lp ((head (list (car y) x)) (tail (cdr y)))
-                 (if (null? tail)
-                   d
-                   (let ((x (car tail))
-                         (y (cdr tail)))
-                     (if (null? y)
-                       d
-                       (if (equal? key x)
-                         (begin (set! z (append (reverse head)
-                                                (cdr y)))
-                                (car y))
-                         (if (not (member x lk))
-                           d
-                           (lp (cons (car y) (cons x head))
-                               (cdr y))))))))))))))
-    ((wow-key! z (#t) (kk ...) (n key) d)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (begin (set! z (cdr y)) (car y))
-           (let* ((lk (list kk ...))
-                  (m (member x lk)))
-             (let lp ((head (if m (list (car y) x) (list x)))
-                      (tail (if m (cdr y) y)))
-               (if (null? tail)
-                 d
-                 (let ((x (car tail))
-                       (y (cdr tail)))
-                   (if (null? y)
-                     d
-                     (if (equal? key x)
-                       (begin (set! z (append (reverse head)
-                                              (cdr y)))
-                              (car y))
-                       (let ((m (member x lk)))
-                         (lp (if m
-                               (cons (car y) (cons x head))
-                               (cons x head))
-                             (if m (cdr y) y)))))))))))))
-    ((wow-key! z () (kk ...) (n key) d t)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (let ((n (car y)))
-             (if t
-               (begin (set! z (cdr y)) n)
-               (error "alet[*]: bad argument" n 'n 't)))
-           (let lp ((head (list (car y) x)) (tail (cdr y)))
-             (if (null? tail)
-               d
-               (let ((x (car tail))
-                     (y (cdr tail)))
-                 (if (null? y)
-                   d
-                   (if (equal? key x)
-                     (let ((n (car y)))
-                       (if t
-                         (begin (set! z (append (reverse head)
-                                                (cdr y)))
-                                n)
-                         (error "alet[*]: bad argument"
-                                n 'n 't)))
-                     (lp (cons (car y) (cons x head))
-                         (cdr y)))))))))))
-    ((wow-key! z (#f) (kk ...) (n key) d t)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (let ((n (car y)))
-             (if t
-               (begin (set! z (cdr y)) n)
-               (error "alet[*]: bad argument" n 'n 't)))
-           (let ((lk (list kk ...)))
-             (if (not (member x lk))
-               d
-               (let lp ((head (list (car y) x)) (tail (cdr y)))
-                 (if (null? tail)
-                   d
-                   (let ((x (car tail))
-                         (y (cdr tail)))
-                     (if (null? y)
-                       d
-                       (if (equal? key x)
-                         (let ((n (car y)))
-                           (if t
-                             (begin
-                               (set! z (append (reverse head)
-                                               (cdr y)))
-                               n)
-                             (error "alet[*]: bad argument"
-                                    n 'n 't)))
-                         (if (not (member x lk))
-                           d
-                           (lp (cons (car y) (cons x head))
-                               (cdr y))))))))))))))
-    ((wow-key! z (#t) (kk ...) (n key) d t)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (let ((n (car y)))
-             (if t
-               (begin (set! z (cdr y)) n)
-               (error "alet[*]: bad argument" n 'n 't)))
-           (let* ((lk (list kk ...))
-                  (m (member x lk)))
-             (let lp ((head (if m (list (car y) x) (list x)))
-                      (tail (if m (cdr y) y)))
-               (if (null? tail)
-                 d
-                 (let ((x (car tail))
-                       (y (cdr tail)))
-                   (if (null? y)
-                     d
-                     (if (equal? key x)
-                       (let ((n (car y)))
-                         (if t
-                           (begin (set! z (append (reverse head)
-                                                  (cdr y)))
-                                  n)
-                           (error "alet[*]: bad argument"
-                                  n 'n 't)))
-                       (let ((m (member x lk)))
-                         (lp (if m
-                               (cons (car y) (cons x head))
-                               (cons x head))
-                             (if m (cdr y) y)))))))))))))
-    ((wow-key! z () (kk ...) (n key) d t ts)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (let ((n (car y)))
-             (if t
-               (begin (set! z (cdr y)) ts)
-               (error "alet[*]: bad argument" n 'n 't)))
-           (let lp ((head (list (car y) x)) (tail (cdr y)))
-             (if (null? tail)
-               d
-               (let ((x (car tail))
-                     (y (cdr tail)))
-                 (if (null? y)
-                   d
-                   (if (equal? key x)
-                     (let ((n (car y)))
-                       (if t
-                         (begin (set! z (append (reverse head)
-                                                (cdr y)))
-                                ts)
-                         (error "alet[*]: bad argument"
-                                n 'n 't)))
-                     (lp (cons (car y) (cons x head))
-                         (cdr y)))))))))))
-    ((wow-key! z (#f) (kk ...) (n key) d t ts)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (let ((n (car y)))
-             (if t
-               (begin (set! z (cdr y)) ts)
-               (error "alet[*]: bad argument" n 'n 't)))
-           (let ((lk (list kk ...)))
-             (if (not (member x lk))
-               d
-               (let lp ((head (list (car y) x)) (tail (cdr y)))
-                 (if (null? tail)
-                   d
-                   (let ((x (car tail))
-                         (y (cdr tail)))
-                     (if (null? y)
-                       d
-                       (if (equal? key x)
-                         (let ((n (car y)))
-                           (if t
-                             (begin
-                               (set! z (append (reverse head)
-                                               (cdr y)))
-                               ts)
-                             (error "alet[*]: bad argument"
-                                    n 'n 't)))
-                         (if (not (member x lk))
-                           d
-                           (lp (cons (car y) (cons x head))
-                               (cdr y))))))))))))))
-    ((wow-key! z (#t) (kk ...) (n key) d t ts)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (let ((n (car y)))
-             (if t
-               (begin (set! z (cdr y)) ts)
-               (error "alet[*]: bad argument" n 'n 't)))
-           (let* ((lk (list kk ...))
-                  (m (member x lk)))
-             (let lp ((head (if m (list (car y) x) (list x)))
-                      (tail (if m (cdr y) y)))
-               (if (null? tail)
-                 d
-                 (let ((x (car tail))
-                       (y (cdr tail)))
-                   (if (null? y)
-                     d
-                     (if (equal? key x)
-                       (let ((n (car y)))
-                         (if t
-                           (begin (set! z (append (reverse head)
-                                                  (cdr y)))
-                                  ts)
-                           (error "alet[*]: bad argument"
-                                  n 'n 't)))
-                       (let ((m (member x lk)))
-                         (lp (if m
-                               (cons (car y) (cons x head))
-                               (cons x head))
-                             (if m (cdr y) y)))))))))))))
-    ((wow-key! z () (kk ...) (n key) d t ts fs)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (let ((n (car y)))
-             (if t
-               (begin (set! z (cdr y)) ts)
-               (begin (set! z (cdr y)) fs)))
-           (let lp ((head (list (car y) x)) (tail (cdr y)))
-             (if (null? tail)
-               d
-               (let ((x (car tail))
-                     (y (cdr tail)))
-                 (if (null? y)
-                   d
-                   (if (equal? key x)
-                     (let ((n (car y)))
-                       (if t
-                         (begin (set! z (append (reverse head)
-                                                (cdr y)))
-                                ts)
-                         (begin (set! z (append (reverse head)
-                                                (cdr y)))
-                                fs)))
-                     (lp (cons (car y) (cons x head))
-                         (cdr y)))))))))))
-    ((wow-key! z (#f) (kk ...) (n key) d t ts fs)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (let ((n (car y)))
-             (if t
-               (begin (set! z (cdr y)) ts)
-               (begin (set! z (cdr y)) fs)))
-           (let ((lk (list kk ...)))
-             (if (not (member x lk))
-               d
-               (let lp ((head (list (car y) x)) (tail (cdr y)))
-                 (if (null? tail)
-                   d
-                   (let ((x (car tail))
-                         (y (cdr tail)))
-                     (if (null? y)
-                       d
-                       (if (equal? key x)
-                         (let ((n (car y)))
-                           (if t
-                             (begin
-                               (set! z (append (reverse head)
-                                               (cdr y)))
-                               ts)
-                             (begin
-                               (set! z (append (reverse head)
-                                               (cdr y)))
-                               fs)))
-                         (if (not (member x lk))
-                           d
-                           (lp (cons (car y) (cons x head))
-                               (cdr y))))))))))))))
-    ((wow-key! z (#t) (kk ...) (n key) d t ts fs)
-     (let ((x (car z))
-           (y (cdr z)))
-       (if (null? y)
-         d
-         (if (equal? key x)
-           (let ((n (car y)))
-             (if t
-               (begin (set! z (cdr y)) ts)
-               (begin (set! z (cdr y)) fs)))
-           (let* ((lk (list kk ...))
-                  (m (member x lk)))
-             (let lp ((head (if m (list (car y) x) (list x)))
-                      (tail (if m (cdr y) y)))
-               (if (null? tail)
-                 d
-                 (let ((x (car tail))
-                       (y (cdr tail)))
-                   (if (null? y)
-                     d
-                     (if (equal? key x)
-                       (let ((n (car y)))
-                         (if t
-                           (begin (set! z (append (reverse head)
-                                                  (cdr y)))
-                                  ts)
-                           (begin (set! z (append (reverse head)
-                                                  (cdr y)))
-                                  fs)))
-                       (let ((m (member x lk)))
-                         (lp (if m
-                               (cons (car y) (cons x head))
-                               (cons x head))
-                             (if m (cdr y) y)))))))))))))))
-
-(define-syntax alet-opt*
-  (syntax-rules ()
-    ((alet-opt* z (a . e) bd ...)
-     (let ((y z))
-       (%alet-opt* y (a . e) bd ...)))))
-(define-syntax %alet-opt*
-  (syntax-rules ()
-    ((%alet-opt* z ((n d t ...)) bd ...)
-     (let ((n (if (null? z)
-                d
-                (if (null? (cdr z))
-                  (wow-opt n (car z) t ...)
-                  (error "alet*: too many arguments" (cdr z))))))
-       bd ...))
-    ((%alet-opt* z ((n d t ...) . e)  bd ...)
-     (let ((y (if (null? z) z (cdr z)))
-           (n (if (null? z)
-                d
-                (wow-opt n (car z) t ...))))
-       (%alet-opt* y e bd ...)))
-    ((%alet-opt* z e bd ...)
-     (let ((e z)) bd ...))))
-;; (define-syntax %alet-opt*
-;;   (syntax-rules ()
-;;     ((%alet-opt* z ((n d t ...)) bd ...)
-;;      (let ((n (if (null? z)
-;; 		  d
-;; 		  (if (null? (cdr z))
-;; 		      (wow-opt n (car z) t ...)
-;; 		      (error "alet*: too many arguments" (cdr z))))))
-;;        bd ...))
-;;     ((%alet-opt* z ((n d t ...) . e)  bd ...)
-;;      (let ((n (if (null? z)
-;; 		  d
-;; 		  (wow-opt! z n t ...))))
-;;        (%alet-opt* z e bd ...)))
-;;     ((%alet-opt* z e bd ...)
-;;      (let ((e z)) bd ...))))
-;; (define-syntax %alet-opt*
-;;   (syntax-rules ()
-;;     ((%alet-opt* z (ndt ...) (a . e) bd ...)
-;;      (%alet-opt* z (ndt ... a) e bd ...))
-;;     ((%alet-opt* z ((n d t ...) (nn dd tt ...) ...) () bd ...)
-;;      (if (null? z)
-;; 	 (let* ((n d) (nn dd) ...) bd ...)
-;; 	 (let ((y (cdr z))
-;; 	       (n (wow-opt n (car z) t ...)))
-;; 	   (%alet-opt* y ((nn dd tt ...) ...) () bd ...))))
-;;     ((%alet-opt* z () () bd ...)
-;;      (if (null? z)
-;; 	 (let () bd ...)
-;; 	 (error "alet*: too many arguments" z)))
-;;     ((%alet-opt* z  ((n d t ...) (nn dd tt ...) ...) e bd ...)
-;;      (if (null? z)
-;; 	 (let* ((n d) (nn dd) ... (e z)) bd ...)
-;; 	 (let ((y (cdr z))
-;; 	       (n (wow-opt n (car z) t ...)))
-;; 	   (%alet-opt* y ((nn dd tt ...) ...) e bd ...))))
-;;     ((%alet-opt* z () e bd ...)
-;;      (let ((e z)) bd ...))))
-
-(define-syntax alet-cat*
-  (syntax-rules ()
-    ((alet-cat* z (a . e) bd ...)
-     (let ((y z))
-       (%alet-cat* y (a . e) bd ...)))))
-;; (define-syntax %alet-cat*
-;;   (syntax-rules ()
-;;     ((%alet-cat* z ((n d t ...)) bd ...)
-;;      (let ((n (if (null? z)
-;; 		  d
-;; 		  (if (null? (cdr z))
-;; 		      (wow-cat-end z n t ...)
-;; 		      (error "alet*: too many arguments" (cdr z))))))
-;;        bd ...))
-;;     ((%alet-cat* z ((n d t ...) . e) bd ...)
-;;      (let* ((w (if (null? z)
-;; 		   (cons d z)
-;; 		   (wow-cat z n d t ...)))
-;; 	    (n (car w))
-;; 	    (y (cdr w)))
-;;        (%alet-cat* y e bd ...)))
-;;     ((%alet-cat* z e bd ...)
-;;      (let ((e z)) bd ...))))
-(define-syntax %alet-cat*
-  (syntax-rules ()
-    ((%alet-cat* z ((n d t ...)) bd ...)
-     (let ((n (if (null? z)
-                d
-                (if (null? (cdr z))
-                  (wow-cat-end z n t ...)
-                  (error "alet*: too many arguments" (cdr z))))))
-       bd ...))
-    ((%alet-cat* z ((n d t ...) . e) bd ...)
-     (let ((n (if (null? z)
-                d
-                (wow-cat! z n d t ...))))
-       (%alet-cat* z e bd ...)))
-    ((%alet-cat* z e bd ...)
-     (let ((e z)) bd ...))))
-;; (define-syntax %alet-cat*
-;;   (syntax-rules ()
-;;     ((%alet-cat* z (ndt ...) (a . e) bd ...)
-;;      (%alet-cat* z (ndt ... a) e bd ...))
-;;     ((%alet-cat* z ((n d t ...) (nn dd tt ...) ...) () bd ...)
-;;      (if (null? z)
-;; 	 (let* ((n d) (nn dd) ...) bd ...)
-;; 	 (let* ((w (wow-cat z n d t ...))
-;; 		(n (car w))
-;; 		(y (cdr w)))
-;; 	   (%alet-cat* y ((nn dd tt ...) ...) () bd ...))))
-;;     ((%alet-cat* z () () bd ...)
-;;      (if (null? z)
-;; 	 (let () bd ...)
-;; 	 (error "alet*: too many arguments" z)))
-;;     ((%alet-cat* z  ((n d t ...) (nn dd tt ...) ...) e bd ...)
-;;      (if (null? z)
-;; 	 (let* ((n d) (nn dd) ... (e z)) bd ...)
-;; 	 (let* ((w (wow-cat z n d t ...))
-;; 		(n (car w))
-;; 		(y (cdr w)))
-;; 	   (%alet-cat* y ((nn dd tt ...) ...) e bd ...))))
-;;     ((%alet-cat* z () e bd ...)
-;;      (let ((e z)) bd ...))))
-
-(define-syntax alet-key*
-  (syntax-rules ()
-    ((alet-key* z (a . e) bd ...)
-     (let ((y z))
-       (%alet-key* y () () (a . e) () bd ...)))))
-(define-syntax %alet-key*
-  (syntax-rules ()
-    ((%alet-key* z () (ndt ...) (((n k) d t ...) . e) (kk ...) bd ...)
-     (%alet-key* z () (ndt ... ((n k) d t ...)) e (kk ... k) bd ...))
-    ((%alet-key* z () (ndt ...) ((n d t ...) . e) (kk ...) bd ...)
-     (%alet-key* z () (ndt ... ((n 'n) d t ...)) e (kk ... 'n) bd ...))
-    ((%alet-key* z () (ndt nd ...) (#f . e) (kk k ...) bd ...)
-     (%alet-key* z (#f) (ndt nd ...) e (kk k ...) bd ...))
-    ((%alet-key* z () (ndt nd ...) (#t . e) (kk k ...) bd ...)
-     (%alet-key* z (#t) (ndt nd ...) e (kk k ...) bd ...))
-
-    ((%alet-key* z (o ...) (((n k) d t ...) ndt ...) e (kk ...) bd ...)
-     (let ((n (if (null? z)
-                d
-                (wow-key! z (o ...) (kk ...) (n k) d t ...))))
-       (%alet-key* z (o ...) (ndt ...) e (kk ...) bd ...)))
-    ((%alet-key* z (o ...) () () (kk ...) bd ...)
-     (if (null? z)
-       (let () bd ...)
-       (error "alet*: too many arguments" z)))
-    ((%alet-key* z (o ...) () e (kk ...) bd ...)
-     (let ((e z)) bd ...))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/87.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/87.rkt
deleted file mode 100644
index 3bd272ba46..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/87.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-87
-#lang s-exp srfi/provider srfi/87/case #:unprefix srfi:
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/87/case.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/87/case.rkt
deleted file mode 100644
index 1b88b5b4a2..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/87/case.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-(module case mzscheme
-  
-  (provide (rename my-case srfi:case))
-  
-  (define-syntax case-test
-    (lambda (x)
-      (syntax-case x ()
-	[(_ x (k))
-	 (if (symbol? (syntax-e #'k))
-	     (syntax (eq? x 'k))
-	     (syntax (eqv? x 'k)))]
-	[(_ x (k ...))
-	 (syntax (memv x '(k ...)))])))
-
-  (define-syntax my-case
-    (lambda (x)
-      (syntax-case x (else =>)
-	((_ v)
-	 (syntax (begin v (cond))))
-	((_ v (else => e))
-	 (syntax/loc x (e v)))
-	((_ v (else e1 e2 ...))
-	 (syntax/loc x (begin v e1 e2 ...)))
-	((_ v ((k ...) => e) c ...)
-	 (syntax/loc x (let ((x v))
-			 (if (case-test x (k ...))
-			     (e x)
-			     (my-case x c ...)))))
-	((_ v ((k ...) e1 e2 ...))
-	 (syntax/loc x (if (case-test v (k ...)) (begin e1 e2 ...))))
-	((_ v ((k ...) e1 e2 ...) c1 c2 ...)
-	 (syntax/loc x (let ((x v))
-			 (if (case-test x (k ...))
-			     (begin e1 e2 ...)
-			     (my-case x c1 c2 ...)))))
-	((_ v (bad e1 e2 ...) . rest)
-	 (raise-syntax-error 
-	  #f
-	  "bad syntax (not a datum sequence)"
-	  x
-	  (syntax bad)))
-	((_ v clause . rest)
-	 (raise-syntax-error 
-	  #f
-	  "bad syntax (missing expression after datum sequence)"
-	  x
-	  (syntax clause)))
-	((_ . v)
-	 (not (null? (syntax-e (syntax v))))
-	 (raise-syntax-error 
-	  #f
-	  "bad syntax (illegal use of `.')"
-	  x)))))
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/9.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/9.rkt
deleted file mode 100644
index 83f0345d93..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/9.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-9
-#lang s-exp srfi/provider srfi/9/record
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/9/record.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/9/record.rkt
deleted file mode 100644
index 3a1436438e..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/9/record.rkt
+++ /dev/null
@@ -1,104 +0,0 @@
-;; SRFI 9 for PLT Scheme 200
-;; Mike Sperber, 12/14/2001
-
-(module record mzscheme
-	
-  (provide define-record-type)
-	
-  (define-syntax define-record-type
-	  
-    (let ()
-      (define (filter-map proc l)
-	(if (null? l)
-	    '()
-	    (let ((result (proc (car l))))
-	      (if result
-		  (cons result (filter-map proc (cdr l)))
-		  (filter-map proc (cdr l))))))
-	    
-	    
-      (define (syntax-member? thing stuff)
-	(cond
-	 ((null? stuff) #f)
-	 ((free-identifier=? thing (car stuff)) #t)
-	 (else (syntax-member? thing (cdr stuff)))))
-	    
-      (lambda (x)
-	(syntax-case x ()
-	  ((_ type
-	      (constructor constructor-tag ...)
-	      predicate
-	      (field-tag accessor more ...) ...)
-			    
-			    
-	   (with-syntax
-	       ((number-of-fields (length (syntax->list
-					   (syntax (field-tag ...)))))
-		((modifier ...)
-		 (filter-map (lambda (descriptor)
-			       (syntax-case descriptor ()
-				 ((field-tag accessor) #f)
-				 ((field-tag accessor modifier)
-				  (syntax modifier))))
-			     (syntax->list
-			      (syntax ((field-tag accessor more ...) ...)))))
-		((constructor-arg ...)
-		 (map (lambda (field-tag)
-			(if (syntax-member? field-tag
-					    (syntax->list
-					     (syntax (constructor-tag ...))))
-			    field-tag
-			    (syntax (void))))
-		      (syntax->list
-		       (syntax (field-tag ...)))))
-		(generic-access (syntax generic-access))
-		(generic-mutate (syntax generic-mutate)))
-	     (with-syntax
-		 (((accessor-proc ...)
-		   (let loop ((i 0)
-			      (fields (syntax->list (syntax (field-tag ...)))))
-		     (if (null? fields)
-			 '()
-			 (cons (with-syntax
-				   ((i i))
-				 (syntax
-				  (lambda (s)
-				    (generic-access s i)))) 
-			       (loop (+ 1 i)
-				     (cdr fields))))))
-		  ((modifier-proc ...)
-		   (let loop ((i 0)
-			      (descriptors
-			       (syntax->list
-				(syntax ((field-tag accessor more ...) ...)))))
-		     (if (null? descriptors)
-			 '()
-			 (syntax-case (car descriptors) ()
-			   ((field-tag accessor)
-			    (loop (+ 1 i)
-				  (cdr descriptors)))
-			   ((field-tag accessor modifier)
-			    (cons (with-syntax
-				      ((i i))
-				    (syntax
-				     (lambda (s v)
-				       (generic-mutate s i v))))
-				  (loop (+ 1 i)
-					(cdr descriptors)))))))))
-	       (syntax
-		(define-values (constructor
-				predicate
-				accessor ...
-				modifier ...)
-		  (let-values (((type-descriptor
-				 full-constructor
-				 predicate
-				 generic-access
-				 generic-mutate)
-				(make-struct-type 'type #f number-of-fields 0)))
-					     
-		    (values (lambda (constructor-tag ...)
-			      (full-constructor constructor-arg ...))
-			    predicate
-			    accessor-proc ...
-			    modifier-proc ...))))))))))))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/98.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/98.rkt
deleted file mode 100644
index 7209e8df39..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/98.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-;; Copyright (c) 2009-2014 Derick Eddington.  All rights reserved.
-
-;; Permission is hereby granted, free of charge, to any person obtaining a
-;; copy of this software and associated documentation files (the "Software"),
-;; to deal in the Software without restriction, including without limitation
-;; the rights to use, copy, modify, merge, publish, distribute, sublicense,
-;; and/or sell copies of the Software, and to permit persons to whom the
-;; Software is furnished to do so, subject to the following conditions:
-
-;; The above copyright notice and this permission notice shall be included in
-;; all copies or substantial portions of the Software.
-
-;; Except as contained in this notice, the name(s) of the above copyright
-;; holders shall not be used in advertising or otherwise to promote the sale,
-;; use or other dealings in this Software without prior written authorization.
-
-;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-;; THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-;; DEALINGS IN THE SOFTWARE.
-
-;; Inspired by Danny Yoo's get-environment PLaneT package.
-
-#lang scheme/base
-
-(require scheme/foreign)
-(provide (rename-out (getenv get-environment-variable))
-         get-environment-variables)
-
-(unsafe!)
-
-(define (get-environment-variables)
-  (define (split-strings l)
-    (for/list ([next (in-list l)])
-      (let loop ((i 0) (len (string-length next)))
-        (if (< i len)
-            (if (char=? #\= (string-ref next i))
-                (cons (substring next 0 i)
-                      (substring next (+ 1 i) len))
-                                     (loop (+ 1 i) len))
-            (cons next #f)))))
-  (case (system-type)
-    [(windows)
-     (let ([get (get-ffi-obj "GetEnvironmentStringsW" #f (_fun #:abi 'stdcall -> _bytes))]
-           [free (get-ffi-obj "FreeEnvironmentStringsW" #f (_fun #:abi 'stdcall _pointer -> _void))])
-       (let* ([strs (get)]
-              [len (let loop ([i 0])
-                     (if (and (= 0 (ptr-ref strs _byte i))
-                              (= 0 (ptr-ref strs _byte (+ i 1)))
-                              (= 0 (ptr-ref strs _byte (+ i 2)))
-                              (= 0 (ptr-ref strs _byte (+ i 3))))
-                         (+ i 4)
-                         (loop (+ i 2))))]
-              [strs (cast strs _pointer (_bytes o len))])
-         (begin0
-          (split-strings
-           (let loop ([pos 0])
-             (let ([m (regexp-match-positions #rx"(?:..)*?\0\0" strs pos)])
-               (if m
-                   (if (= (cdar m) (+ pos 2))
-                       null
-                       (cons (cast (ptr-add strs pos) _pointer _string/utf-16)
-                             (loop (cdar m))))
-                   null))))
-          (free strs))))]
-    [else
-     (let ([environ (get-ffi-obj "environ" (ffi-lib #f) _pointer)])
-       (split-strings
-        (let loop ([i 0])
-          (let ((next (ptr-ref environ _string/locale i)))
-            (if next
-                (cons next (loop (+ 1 i)))
-                null)))))]))
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/doc.txt b/pkgs/srfi-pkgs/srfi-lib/srfi/doc.txt
deleted file mode 100644
index f99f20a31f..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/doc.txt
+++ /dev/null
@@ -1,177 +0,0 @@
-PLT Scheme support for _SRFIs_ (`surfies')
-==========================================
-
-This is an implementation of (some) SRFIs to the PLT Scheme
-system.  It is intended for PLT Scheme v300+.
-
-If you need more information on SRFI, please visit:
-
-         http://srfi.schemers.org/
-
-Loading
--------
-
-To load a SRFI with name conflicts (currently SRFIs 1, 5,
-13, 17, 19, 43, 45, 48, 61, 63, 69 and 87) in a module,
-please see the note below.
-
-To load a SRFI, use the following form:
-
-         (require srfi/N)
-
-if you know the number of the SRFI you want to load.  This
-is the preferred method, or this one:
-
-         (require srfi/N/NAME)
-
-if you know the `informative name' of the SRFI.
-
-N, is a number corresponding to the sub-collection that
-holds a particular SRFI, and NAME is a more descriptive
-name we assigned to the main file in which the SRFI is
-defined.  For instance, to load SRFI-34 you have to do
-either one of:
-
-         (require srfi/34)
-
-or,
-
-         (require srfi/34/exception)
-
-NOTE on SRFIs with name conflicts
----------------------------------
-
-Certain SRFIs (currently SRFIs 1, 5, 13, 17, 19, 43, 45,
-48, 61, 63, 69 and 87) provide names which conflict with
-names provided by the 'mzscheme' language.  Attempting to
-require one of these SRFIs in a module written in the
-'mzscheme' language will result in an error.
-
-To address this problem, the PLT implementations of these
-SRFIs provide a different module which renames the
-problematic exports to avoid these conflicts.  For SRFI 1,
-this library is called list.ss, and should be required like
-this:
-
-         (require srfi/1/list)
-
-which supplies the colliding names with a prefix of 's:'
-(e.g. "s:map", "s:reverse!") and is therefore suitable for
-requires in a module.
-
-For SRFI 19, this library is called time.ss, and should be
-required like this:
-
-         (require srfi/19/time)
-
-which supplies the colliding names with a prefix of 'srfi:'
-(e.g. "srfi:date?", "srfi:date-second") and is therefore
-suitable for requires in a module.
-
-Supported SRFIs
----------------
-
-Here is a table that has an SRFI, file name, and the
-sub-collection number of the already ported SRFIs:
-
-  SRFI               File name              Sub-collection
- ========           ===========             ==============
-
- SRFI-1             list.ss                       1
- SRFI-2             and-let.ss                    2
- SRFI-4(*1)         4.ss
- SRFI-5             let.ss                        5
- SRFI-6(+)          6.ss
- SRFI-7             program.ss                    7
- SRFI-8             receive.ss                    8
- SRFI-9             record.ss                     9
- SRFI-11(+)         11.ss
- SRFI-13            string.ss                    13
- SRFI-14            char-set.ss                  14
- SRFI-16(+)         16.ss
- SRFI-17            set.ss                       17
- SRFI-18(++)        18.ss
- SRFI-19(*2)        time.ss                      19
- SRFI-23(+)         23.ss
- SRFI-25            array.ss                     25
- SRFI-26            cut.ss                       26
- SRFI-27            random-bits.ss               27
- SRFI-28(+)         28.ss
- SRFI-29            localization.ss              29
- SRFI-30(+)         30.ss
- SRFI-31            rec.ss                       31
- SRFI-32            sort.scm                     32
- SRFI-34            exception.ss                 34
- SRFI-35            condition.ss                 35
- SRFI-38(+)         38.ss
- SRFI-39(+)         39.ss
- SRFI-40            stream.ss                    40
- SRFI-42            comprehensions.ss            42
- SRFI-43            vector-lib.ss                43
- SRFI-45(*3)        lazy.ss                      45
- SRFI-48            format.ss                    48
- SRFI-54            cat.ss                       54
- SRFI-57            records.ss                   57
- SRFI-59            vicinity.ss                  59
- SRFI-60            60.ss                        60
- SRFI-61(+)         61.ss
- SRFI-63            63.ss                        63
- SRFI-64            testing.ss                   64
- SRFI-66            66.ss                        66
- SRFI-67            compare.ss                   67
- SRFI-69            hash.ss                      69
- SRFI-71            letvalues.ss                 71
- SRFI-74            74.ss                        74
- SRFI-78            check.ss                     78
- SRFI-86            86.ss                        86
- SRFI-87            case.ss                      87
-
-
-Notes:
-,--------------------
-| +  Supported by the core of PLT Scheme
-`--------------------
-
-,--------------------
-| ++ Partially supported by the core of PLT Scheme
-`--------------------
-
-,--------------------
-| *1 The functionality is all part of mzscheme available
-| via (lib"foreign.ss"), the only missing part is the i/o
-| syntax.
-`--------------------
-
-,--------------------
-| *2 The time module does not export its time structure
-| (you have to use the time-* procedures.)  It renames all
-| the date-* accessors to tm:date-* so that you won't get
-| errors when including this code in other modules.  Care
-| most be taken NOT to confuse the internal date structure
-| with the PLT Scheme one, they are not the same, and all
-| procedures from this library expect the former.
-`--------------------
-
-,--------------------
-| *3 This port also provides promise? / srfi-45-promise?.
-`--------------------
-
-
-That's it for now.  If you have ported other SRFIs, and
-want them added to this library, please let us know:
-
- + the main PLT Scheme discussion list:
-
-   PLT Scheme <users@racket-lang.org>
-
- + the Schematics-people @ sourceforge.net.  We are NOT members
- of the PLT group, the Schematics project is devoted to create
- code for PLT Scheme ONLY, though.  This SRFI port effort will
- try to be developed, tested, and debugged @ sourceforge, and
- periodically inserted to PLT Scheme.  Please, do join us!:
-
-   http://schematics.sourceforge.net
-
-(we don't have separate mailing lists @ sourceforge.  We have a
-couple of forums there, though.  Of course, you can send us mail
-directly, or... well, we read the PLT Scheme mailing list.)
diff --git a/pkgs/srfi-pkgs/srfi-lib/srfi/features.rkt b/pkgs/srfi-pkgs/srfi-lib/srfi/features.rkt
deleted file mode 100644
index 093ee952c0..0000000000
--- a/pkgs/srfi-pkgs/srfi-lib/srfi/features.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang scheme/base
-
-(provide feature-present? feature->require-clause)
-
-(define *feature-alist*
-  '())
-
-(define (srfi-id? id)
-  (regexp-match? #rx"^srfi-[0-9]+$" (symbol->string id)))
-
-(define (srfi-id->filename srfi-id)
-  (regexp-replace #rx"^srfi-([0-9]+)$" (symbol->string srfi-id) "\\1/\\1.rkt"))
-
-(define (srfi-id-present? srfi-id)
-  (file-exists? (build-path (collection-path "srfi")
-                            (srfi-id->filename srfi-id))))
-
-(define (feature-present? id)
-  (or (and (srfi-id? id) (srfi-id-present? id))
-      (and (assq id *feature-alist*) #t)))
-
-(define (feature->require-clause id)
-  (cond [(and (srfi-id? id) (srfi-id-present? id))
-         (string->symbol (regexp-replace #rx"^srfi-([0-9]+)$"
-                                         (symbol->string id)
-                                         "srfi/\\1/\\1"))]
-        [(assq id *feature-alist*) => cdr]
-        [else (error 'feature->require-clause "unknown feature: ~e" id)]))
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/LICENSE.txt b/pkgs/srfi-pkgs/srfi-lite-lib/LICENSE.txt
deleted file mode 100644
index 0da45db218..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-srfi-lite-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/info.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/info.rkt
deleted file mode 100644
index 09e03421f5..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "implementation of the most widely used \"srfi\" libraries")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1.rkt
deleted file mode 100644
index a55a460827..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-1
-#lang s-exp srfi/provider srfi/1/list #:unprefix s:
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/alist.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/alist.rkt
deleted file mode 100644
index 4583677f5d..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/alist.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-;;;
-;;; <alist.rkt> ---- Association list functions
-;;; Time-stamp: <02/03/01 13:56:33 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; This SRFI-1 implementation is distributed under the same terms as
-;;; Racket.
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-;; Commentary:
-
-;; Based on the reference implementation by Olin Shiver and hence:
-
-;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;; this code as long as you do not remove this copyright notice or
-;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-#lang racket/base
-
-(require (only-in "search.rkt" find))
-
-(provide (rename-out [my-assoc assoc])
-         alist-cons
-         alist-copy
-         alist-delete
-         #; alist-delete! ; lists are immutable
-         )
-
-;; Extended from R4RS to take an optional comparison argument.
-(define (my-assoc x lis [= equal?])
-  (find (lambda (entry) (= x (car entry))) lis))
-
-(define (alist-cons key datum alist) (cons (cons key datum) alist))
-
-(define (alist-copy alist)
-  (map (lambda (elt) (cons (car elt) (cdr elt))) alist))
-
-(define (alist-delete key alist [= equal?])
-  (filter (lambda (elt) (not (= key (car elt)))) alist))
-
-#; ; lists are immutable
-(define (alist-delete! key alist [= equal?])
-  (filter! (lambda (elt) (not (= key (car elt)))) alist))
-
-;;; alist.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/cons.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/cons.rkt
deleted file mode 100644
index d80a68faf8..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/cons.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-;;;
-;;; <cons.rkt> ---- List constructors
-;;; Time-stamp: <02/02/27 12:19:59 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; This SRFI-1 implementation is distributed under the same terms as
-;;; Racket.
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-;; Commentary:
-
-;; Based on the reference implementation by Olin Shiver and hence:
-
-;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;; this code as long as you do not remove this copyright notice or
-;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-#lang racket/base
-
-(require srfi/optional "selector.rkt"
-         (only-in racket/list [make-list make-list*]))
-
-(provide xcons
-         make-list
-         list-tabulate
-         (rename-out [list* cons*])
-         list-copy
-         circular-list
-         iota)
-
-;; Occasionally useful as a value to be passed to a fold or other
-;; higher-order procedure.
-(define (xcons d a) (cons a d))
-
-;; Make a list of length LEN.
-
-(define (make-list len [elt #f]) (make-list* len elt))
-
-;; Make a list of length LEN. Elt i is (PROC i) for 0 <= i < LEN.
-
-(define (list-tabulate len proc)
-  (check-arg (lambda (n) (and (integer? n) (>= n 0))) len 'list-tabulate)
-  (check-arg procedure? proc 'list-tabulate)
-  (for/list ([i (in-range len)]) (proc i)))
-
-;; (cons* a1 a2 ... an) = (cons a1 (cons a2 (cons ... an)))
-;; (cons* a1) = a1; (cons* a1 a2 ...) = (cons a1 (cons* a2 ...))
-;;
-;; (cons first (unfold not-pair? car cdr rest values))
-
-;; reprovided as racket's list*
-;; (define (cons* first . rest)
-;;   (let recur ((x first) (rest rest))
-;;     (if (pair? rest)
-;;       (cons x (recur (car rest) (cdr rest)))
-;;       x)))
-
-(define (list-copy lis)
-  (let recur ((lis lis))
-    (if (pair? lis)
-      (cons (car lis) (recur (cdr lis)))
-      lis)))
-
-(define (circular-list val1 . vals)
-  (let ([ph (make-placeholder #f)])
-    (placeholder-set! ph
-      (cons val1 (let loop ([vals vals])
-                   (if (null? vals)
-                     ph
-                     (cons (car vals) (loop (cdr vals)))))))
-    (make-reader-graph ph)))
-
-;; IOTA count [start step]  (start start+step ... start+(count-1)*step)
-
-(define (iota count [start 0] [step 1])
-  (check-arg integer? count 'iota)
-  (check-arg number? start 'iota)
-  (check-arg number? step 'iota)
-  (unless (or (zero? count) (positive? count))
-    (error 'iota "count expected to be non-negative, got: ~a" count))
-  (let loop ([n 0])
-    (if (= n count) '()
-        (cons (+ start (* n step)) (loop (add1 n))))))
-
-;;; cons.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/delete.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/delete.rkt
deleted file mode 100644
index 507059658f..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/delete.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-;;;
-;;; <delete.rkt> ---- List deletion functions
-;;; Time-stamp: <02/03/01 07:26:12 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; This SRFI-1 implementation is distributed under the same terms as
-;;; Racket.
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-;; Commentary:
-
-
-;; Based on the reference implementation by Olin Shiver and hence:
-
-;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;; this code as long as you do not remove this copyright notice or
-;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-#lang racket/base
-
-(require srfi/optional "predicate.rkt")
-
-(provide delete (rename-out [delete delete!])
-         delete-duplicates (rename-out [delete-duplicates delete-duplicates!]))
-
-(define (delete x lis [= equal?])
-  (filter (lambda (y) (not (= x y))) lis))
-
-#; ; lists are immutable
-(define delete! (x lis [= equal?])
-  (filter! (lambda (y) (not (= x y))) lis))
-
-;; right-duplicate deletion
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; delete-duplicates delete-duplicates!
-;;
-;; Beware -- these are N^2 algorithms. To efficiently remove duplicates
-;; in long lists, sort the list to bring duplicates together, then use a
-;; linear-time algorithm to kill the dups. Or use an algorithm based on
-;; element-marking. The former gives you O(n lg n), the latter is linear.
-
-(define (delete-duplicates lis [elt= equal?])
-  (check-arg procedure? elt= 'delete-duplicates)
-  (let recur ((lis lis))
-    (if (null-list? lis) lis
-        (let* ((x (car lis))
-               (tail (cdr lis))
-               (new-tail (recur (delete x tail elt=))))
-          (if (eq? tail new-tail) lis (cons x new-tail))))))
-
-#; ; lists are immutable
-(define (delete-duplicates! lis [elt= equal?])
-  (check-arg procedure? elt= 'delete-duplicates!)
-  (let recur ((lis lis))
-    (if (null-list? lis) lis
-        (let* ((x (car lis))
-               (tail (cdr lis))
-               (new-tail (recur (delete! x tail elt=))))
-          (if (eq? tail new-tail) lis (cons x new-tail))))))
-
-;;; delete.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/filter.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/filter.rkt
deleted file mode 100644
index c5d35baf2d..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/filter.rkt
+++ /dev/null
@@ -1,169 +0,0 @@
-;;;
-;;; <filter.rkt> ---- List filtering and partitioning functions
-;;; Time-stamp: <02/03/01 07:26:43 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; This SRFI-1 implementation is distributed under the same terms as
-;;; Racket.
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-;; Commentary:
-
-;; Based on the reference implementation by Olin Shiver and hence:
-
-;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;; this code as long as you do not remove this copyright notice or
-;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-#lang racket/base
-
-(require srfi/optional "predicate.rkt")
-
-(provide filter (rename-out [filter filter!])
-         (rename-out [my-filter filter-with-sharing]) ; see comment below
-         partition (rename-out [partition partition!])
-         (rename-out [my-remove remove] [my-remove remove!]))
-
-;; filter, remove, partition
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; FILTER, REMOVE, PARTITION and their destructive counterparts do not
-;; disorder the elements of their argument.
-
-;; The following version of filter is not really needed, so we reprovide the
-;; one from "scheme/private/list.rkt".  That one does not keep the longest tail,
-;; but running a few benchmarks (on v3.99.0.18) shows that on long lists the
-;; code below is slower, and on short lists it is a little faster, but not by
-;; much.  However, seems that "lset.rkt" relies on tail-sharing, so it is
-;; provided under an alternative name above.
-
-;; This FILTER shares the longest tail of L that has no deleted
-;; elements.  If Scheme had multi-continuation calls, they could be
-;; made more efficient.
-
-(define (my-filter pred lis)            ; Sleazing with EQ? makes this
-  (check-arg procedure? pred 'filter)   ; one faster.
-  (let recur ((lis lis))
-    (if (null-list? lis) lis            ; Use NOT-PAIR? to handle dotted lists.
-        (let ((head (car lis))
-              (tail (cdr lis)))
-          (if (pred head)
-            (let ((new-tail (recur tail))) ; Replicate the RECUR call so
-              (if (eq? tail new-tail) lis
-                  (cons head new-tail)))
-            (recur tail))))))           ; this one can be a tail call.
-
-;; This implementation of FILTER!
-;; - doesn't cons, and uses no stack;
-;; - is careful not to do redundant SET-CDR! writes, as writes to memory are
-;;   usually expensive on modern machines, and can be extremely expensive on
-;;   modern Schemes (e.g., ones that have generational GC's).
-;; It just zips down contiguous runs of in and out elts in LIS doing the
-;; minimal number of SET-CDR!s to splice the tail of one run of ins to the
-;; beginning of the next.
-#; ; lists are immutable
-(define (filter! pred lis)
-  (check-arg procedure? pred 'filter!)
-  (let lp ((ans lis))
-    (cond ((null-list? ans)       ans) ; Scan looking for
-          ((not (pred (car ans))) (lp (cdr ans))) ; first cons of result.
-          ;; ANS is the eventual answer.
-          ;; SCAN-IN: (CDR PREV) = LIS and (CAR PREV) satisfies PRED.
-          ;;          Scan over a contiguous segment of the list that
-          ;;          satisfies PRED.
-          ;; SCAN-OUT: (CAR PREV) satisfies PRED. Scan over a contiguous
-          ;;           segment of the list that *doesn't* satisfy PRED.
-          ;;           When the segment ends, patch in a link from PREV
-          ;;           to the start of the next good segment, and jump to
-          ;;           SCAN-IN.
-          (else
-           (letrec ((scan-in (lambda (prev lis)
-                               (if (pair? lis)
-                                 (if (pred (car lis))
-                                   (scan-in lis (cdr lis))
-                                   (scan-out prev (cdr lis))))))
-                    (scan-out (lambda (prev lis)
-                                (let lp ((lis lis))
-                                  (if (pair? lis)
-                                    (if (pred (car lis))
-                                      (begin (set-cdr! prev lis)
-                                             (scan-in lis (cdr lis)))
-                                      (lp (cdr lis)))
-                                    (set-cdr! prev lis))))))
-             (scan-in ans (cdr ans))
-             ans)))))
-
-;; Answers share common tail with LIS where possible;
-;; the technique is slightly subtle.
-(define (partition pred lis)
-  (check-arg procedure? pred 'partition)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values lis lis) ; Use NOT-PAIR? to handle dotted lists.
-        (let ((elt (car lis))
-              (tail (cdr lis)))
-          (let-values ([(in out) (recur tail)])
-            (if (pred elt)
-              (values (if (pair? out) (cons elt in) lis) out)
-              (values in (if (pair? in) (cons elt out) lis))))))))
-
-;; This implementation of PARTITION!
-;; - doesn't cons, and uses no stack;
-;; - is careful not to do redundant SET-CDR! writes, as writes to memory are
-;;   usually expensive on modern machines, and can be extremely expensive on
-;;   modern Schemes (e.g., ones that have generational GC's).
-;; It just zips down contiguous runs of in and out elts in LIS doing the
-;; minimal number of SET-CDR!s to splice these runs together into the result
-;; lists.
-#; ; lists are immutable
-(define (partition! pred lis)
-  (check-arg procedure? pred 'partition!)
-  (if (null-list? lis) (values lis lis)
-      ;; This pair of loops zips down contiguous in & out runs of the
-      ;; list, splicing the runs together. The invariants are
-      ;;   SCAN-IN:  (cdr in-prev)  = LIS.
-      ;;   SCAN-OUT: (cdr out-prev) = LIS.
-      (letrec ((scan-in (lambda (in-prev out-prev lis)
-                          (let lp ((in-prev in-prev) (lis lis))
-                            (if (pair? lis)
-                              (if (pred (car lis))
-                                (lp lis (cdr lis))
-                                (begin (set-cdr! out-prev lis)
-                                       (scan-out in-prev lis (cdr lis))))
-                              (set-cdr! out-prev lis))))) ; Done.
-               (scan-out (lambda (in-prev out-prev lis)
-                           (let lp ((out-prev out-prev) (lis lis))
-                             (if (pair? lis)
-                               (if (pred (car lis))
-                                 (begin (set-cdr! in-prev lis)
-                                        (scan-in lis out-prev (cdr lis)))
-                                 (lp lis (cdr lis)))
-                               (set-cdr! in-prev lis)))))) ; Done.
-        ;; Crank up the scan&splice loops.
-        (if (pred (car lis))
-          ;; LIS begins in-list. Search for out-list's first pair.
-          (let lp ((prev-l lis) (l (cdr lis)))
-            (cond ((not (pair? l)) (values lis l))
-                  ((pred (car l)) (lp l (cdr l)))
-                  (else (scan-out prev-l l (cdr l))
-                        (values lis l)))) ; Done.
-          ;; LIS begins out-list. Search for in-list's first pair.
-          (let lp ((prev-l lis) (l (cdr lis)))
-            (cond ((not (pair? l)) (values l lis))
-                  ((pred (car l))
-                   (scan-in l prev-l (cdr l))
-                   (values l lis)) ; Done.
-                  (else (lp l (cdr l)))))))))
-
-;; Inline us, please.
-(define (my-remove pred l) (filter (lambda (x) (not (pred x))) l))
-#; ; lists are immutable
-(define (remove! pred l) (filter! (lambda (x) (not (pred x))) l))
-
-;;; filter.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/fold.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/fold.rkt
deleted file mode 100644
index 5303b5c28f..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/fold.rkt
+++ /dev/null
@@ -1,251 +0,0 @@
-;;;
-;;; <fold.rkt> ---- List folds
-;;; Time-stamp: <02/02/28 12:02:38 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; This SRFI-1 implementation is distributed under the same terms as
-;;; Racket.
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-;; Commentary:
-
-;; Based on the reference implementation by Olin Shiver and hence:
-
-;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;; this code as long as you do not remove this copyright notice or
-;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-#lang racket/base
-
-(require srfi/optional
-         "predicate.rkt"
-         "selector.rkt"
-         "util.rkt")
-
-(provide (rename-out [my-map map])
-         (rename-out [my-for-each for-each])
-         fold
-         unfold
-         pair-fold
-         reduce
-         fold-right
-         unfold-right
-         pair-fold-right
-         reduce-right
-         append-map
-         (rename-out [append-map append-map!])
-         (rename-out [my-map map!])
-         pair-for-each
-         filter-map
-         map-in-order)
-
-;; fold/unfold
-;;;;;;;;;;;;;;
-
-(define (unfold-right p f g seed . maybe-tail)
-  (check-arg procedure? p 'unfold-right)
-  (check-arg procedure? f 'unfold-right)
-  (check-arg procedure? g 'unfold-right)
-  (let lp ((seed seed) (ans (if (pair? maybe-tail) (car maybe-tail) '())))
-    (if (p seed) ans
-        (lp (g seed)
-            (cons (f seed) ans)))))
-
-(define (unfold p f g seed . maybe-tail-gen)
-  (check-arg procedure? p 'unfold)
-  (check-arg procedure? f 'unfold)
-  (check-arg procedure? g 'unfold)
-  (if (pair? maybe-tail-gen)
-    (let ((tail-gen (car maybe-tail-gen)))
-      (if (pair? (cdr maybe-tail-gen))
-        (apply error "Too many arguments" unfold p f g seed maybe-tail-gen)
-        (let recur ((seed seed))
-          (if (p seed) (tail-gen seed)
-              (cons (f seed) (recur (g seed)))))))
-    (let recur ((seed seed))
-      (if (p seed) '()
-          (cons (f seed) (recur (g seed)))))))
-
-(define (fold kons knil lis1 . lists)
-  (check-arg procedure? kons 'fold)
-  (if (pair? lists)
-    (let lp ((lists (cons lis1 lists)) (ans knil))   ; N-ary case
-      (let-values ([(cars+ans cdrs) (%cars+cdrs+ lists ans)])
-        (if (null? cars+ans) ans ; Done.
-            (lp cdrs (apply kons cars+ans)))))
-    (let lp ((lis lis1) (ans knil))                  ; Fast path
-      (if (null-list? lis) ans
-          (lp (cdr lis) (kons (car lis) ans))))))
-
-(define (fold-right kons knil lis1 . lists)
-  (check-arg procedure? kons 'fold-right)
-  (if (pair? lists)
-    (let recur ((lists (cons lis1 lists)))        ; N-ary case
-      (let ((cdrs (%cdrs lists)))
-        (if (null? cdrs) knil
-            (apply kons (%cars+ lists (recur cdrs))))))
-
-    (let recur ((lis lis1))                       ; Fast path
-      (if (null-list? lis) knil
-          (let ((head (car lis)))
-            (kons head (recur (cdr lis))))))))
-
-(define (pair-fold-right f zero lis1 . lists)
-  (check-arg procedure? f 'pair-fold-right)
-  (if (pair? lists)
-    (let recur ((lists (cons lis1 lists)))        ; N-ary case
-      (let ((cdrs (%cdrs lists)))
-        (if (null? cdrs) zero
-            (apply f (append lists (list (recur cdrs)))))))
-    (let recur ((lis lis1))                       ; Fast path
-      (if (null-list? lis) zero (f lis (recur (cdr lis)))))))
-
-(define (pair-fold f zero lis1 . lists)
-  (check-arg procedure? f 'pair-fold)
-  (if (pair? lists)
-    (let lp ((lists (cons lis1 lists)) (ans zero)) ; N-ary case
-      (let ((tails (%cdrs lists)))
-        (if (null? tails) ans
-            (lp tails (apply f (append lists (list ans)))))))
-    (let lp ((lis lis1) (ans zero))
-      (if (null-list? lis) ans
-          (let ((tail (cdr lis)))                  ; Grab the cdr now,
-            (lp tail (f lis ans))))))) ; in case F SET-CDR!s LIS.
-
-;; REDUCE and REDUCE-RIGHT only use RIDENTITY in the empty-list case.
-;; These cannot meaningfully be n-ary.
-
-(define (reduce f ridentity lis)
-  (check-arg procedure? f 'reduce)
-  (if (null-list? lis) ridentity
-      (fold f (car lis) (cdr lis))))
-
-(define (reduce-right f ridentity lis)
-  (check-arg procedure? f 'reduce-right)
-  (if (null-list? lis) ridentity
-      (let recur ((head (car lis)) (lis (cdr lis)))
-        (if (pair? lis)
-          (f head (recur (car lis) (cdr lis)))
-          head))))
-
-;; Mappers: append-map append-map! pair-for-each map! filter-map map-in-order
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (append-map f lis1 . lists)
-  (really-append-map append-map  append  f lis1 lists))
-#; ; lists are immutable
-(define (append-map! f lis1 . lists)
-  (really-append-map append-map! append! f lis1 lists))
-
-(define (really-append-map who appender f lis1 lists)
-  (check-arg procedure? f 'who)
-  (if (pair? lists)
-    (let-values ([(cars cdrs) (%cars+cdrs (cons lis1 lists))])
-      (if (null? cars) '()
-          (let recur ((cars cars) (cdrs cdrs))
-            (let ((vals (apply f cars)))
-              (let-values ([(cars2 cdrs2) (%cars+cdrs cdrs)])
-                (if (null? cars2) vals
-                    (appender vals (recur cars2 cdrs2))))))))
-    ;; Fast path
-    (if (null-list? lis1) '()
-        (let recur ((elt (car lis1)) (rest (cdr lis1)))
-          (let ((vals (f elt)))
-            (if (null-list? rest) vals
-                (appender vals (recur (car rest) (cdr rest)))))))))
-
-(define (pair-for-each proc lis1 . lists)
-  (check-arg procedure? proc 'pair-for-each)
-  (if (pair? lists)
-    (let lp ((lists (cons lis1 lists)))
-      (let ((tails (%cdrs lists)))
-        (when (pair? tails) (apply proc lists) (lp tails))))
-    ;; Fast path.
-    (let lp ((lis lis1))
-      (unless (null-list? lis)
-        (let ((tail (cdr lis))) ; Grab the cdr now,
-          (proc lis)            ; in case PROC SET-CDR!s LIS.
-          (lp tail))))))
-
-;; We stop when LIS1 runs out, not when any list runs out.
-#; ; lists are immutable
-(define (map! f lis1 . lists)
-  (check-arg procedure? f 'map!)
-  (if (pair? lists)
-    (let lp ((lis1 lis1) (lists lists))
-      (if (not (null-list? lis1))
-        (let-values ([(heads tails) (%cars+cdrs/no-test lists)])
-          (set-car! lis1 (apply f (car lis1) heads))
-          (lp (cdr lis1) tails))))
-    ;; Fast path.
-    (pair-for-each (lambda (pair) (set-car! pair (f (car pair)))) lis1))
-  lis1)
-
-;; Map F across L, and save up all the non-false results.
-(define (filter-map f lis1 . lists)
-  (check-arg procedure? f 'filter-map)
-  (if (pair? lists)
-    (let recur ((lists (cons lis1 lists)))
-      (let-values ([(cars cdrs) (%cars+cdrs lists)])
-        (if (pair? cars)
-          (cond ((apply f cars) => (lambda (x) (cons x (recur cdrs))))
-                (else (recur cdrs))) ; Tail call in this arm.
-          '())))
-    ;; Fast path.
-    (let recur ((lis lis1))
-      (if (null-list? lis) lis
-          (let ((tail (recur (cdr lis))))
-            (cond ((f (car lis)) => (lambda (x) (cons x tail)))
-                  (else tail)))))))
-
-;; Map F across lists, guaranteeing to go left-to-right.
-;; NOTE: Some implementations of R5RS MAP are compliant with this spec;
-;; in which case this procedure may simply be defined as a synonym for MAP.
-
-(define (map-in-order f lis1 . lists)
-  (check-arg procedure? f 'map-in-order)
-  (if (pair? lists)
-    (let recur ((lists (cons lis1 lists)))
-      (let-values ([(cars cdrs) (%cars+cdrs lists)])
-        (if (pair? cars)
-          (let ((x (apply f cars))) ; Do head first,
-            (cons x (recur cdrs)))  ; then tail.
-          '())))
-    ;; Fast path.
-    (let recur ((lis lis1))
-      (if (null-list? lis) lis
-          (let ((tail (cdr lis))
-                (x (f (car lis))))         ; Do head first,
-            (cons x (recur tail)))))))     ; then tail.
-
-;; We extend MAP to handle arguments of unequal length.
-(define my-map map-in-order)
-
-
-;;; Apply F across lists, guaranteeing to go left-to-right.
-;;; NOTE: Some implementations of R5RS MAP are compliant with this spec;
-;;; in which case this procedure may simply be defined as a synonym for FOR-EACH.
-
-(define (my-for-each f lis1 . lists)
-  (check-arg procedure? f for-each)
-  (if (pair? lists)
-    (let recur ((lists (cons lis1 lists)))
-      (let-values ([(cars cdrs) (%cars+cdrs lists)])
-        (when (pair? cars)
-          (apply f cars)  ; Do head first,
-          (recur cdrs)))) ; then tail.
-    ;; Fast path.
-    (let recur ((lis lis1))
-      (unless (null-list? lis)
-        (f (car lis))             ; Do head first,
-        (recur (cdr lis))))))
-
-;;; fold.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/list.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/list.rkt
deleted file mode 100644
index 5efc65f0c5..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/list.rkt
+++ /dev/null
@@ -1,240 +0,0 @@
-;;; SRFI-1 list-processing library   -*- Scheme -*-
-;;; Reference implementation
-;;;
-;;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;;; this code as long as you do not remove this copyright notice or
-;;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-;;; This is a library of list- and pair-processing functions. I wrote it after
-;;; carefully considering the functions provided by the libraries found in
-;;; R4RS/R5RS Scheme, MIT Scheme, Gambit, RScheme, MzScheme, slib, Common
-;;; Lisp, Bigloo, guile, T, APL and the SML standard basis. It is a pretty
-;;; rich toolkit, providing a superset of the functionality found in any of
-;;; the various Schemes I considered.
-
-;;; This implementation is intended as a portable reference implementation
-;;; for SRFI-1. See the porting notes below for more information.
-
-;;; Exported:
-;;; xcons tree-copy make-list list-tabulate cons* list-copy
-;;; proper-list? circular-list? dotted-list? not-pair? null-list? list=
-;;; circular-list length+
-;;; iota
-;;; first second third fourth fifth sixth seventh eighth ninth tenth
-;;; car+cdr
-;;; take       drop
-;;; take-right drop-right
-;;; take!      drop-right!
-;;; split-at   split-at!
-;;; last last-pair
-;;; zip unzip1 unzip2 unzip3 unzip4 unzip5
-;;; count
-;;; append! append-reverse append-reverse! concatenate concatenate!
-;;; unfold       fold       pair-fold       reduce
-;;; unfold-right fold-right pair-fold-right reduce-right
-;;; append-map append-map! map! pair-for-each filter-map map-in-order
-;;; filter  partition  remove
-;;; filter! partition! remove!
-;;; find find-tail any every list-index
-;;; take-while drop-while take-while!
-;;; span break span! break!
-;;; delete delete!
-;;; alist-cons alist-copy
-;;; delete-duplicates delete-duplicates!
-;;; alist-delete alist-delete!
-;;; reverse!
-;;; lset<= lset= lset-adjoin
-;;; lset-union  lset-intersection  lset-difference  lset-xor  lset-diff+intersection
-;;; lset-union! lset-intersection! lset-difference! lset-xor! lset-diff+intersection!
-;;;
-;;; In principle, the following R4RS list- and pair-processing procedures
-;;; are also part of this package's exports, although they are not defined
-;;; in this file:
-;;;   Primitives: cons pair? null? car cdr set-car! set-cdr!
-;;;   Non-primitives: list length append reverse cadr ... cddddr list-ref
-;;;                   memq memv assq assv
-;;;   (The non-primitives are defined in this file, but commented out.)
-;;;
-;;; These R4RS procedures have extended definitions in SRFI-1 and are defined
-;;; in this file:
-;;;   map for-each member assoc
-;;;
-;;; The remaining two R4RS list-processing procedures are not included:
-;;;   list-tail (use drop)
-;;;   list? (use proper-list?)
-
-
-;;; A note on recursion and iteration/reversal:
-;;; Many iterative list-processing algorithms naturally compute the elements
-;;; of the answer list in the wrong order (left-to-right or head-to-tail) from
-;;; the order needed to cons them into the proper answer (right-to-left, or
-;;; tail-then-head). One style or idiom of programming these algorithms, then,
-;;; loops, consing up the elements in reverse order, then destructively
-;;; reverses the list at the end of the loop. I do not do this. The natural
-;;; and efficient way to code these algorithms is recursively. This trades off
-;;; intermediate temporary list structure for intermediate temporary stack
-;;; structure. In a stack-based system, this improves cache locality and
-;;; lightens the load on the GC system. Don't stand on your head to iterate!
-;;; Recurse, where natural. Multiple-value returns make this even more
-;;; convenient, when the recursion/iteration has multiple state values.
-
-;;; Porting:
-;;; This is carefully tuned code; do not modify casually.
-;;;   - It is careful to share storage when possible;
-;;;   - Side-effecting code tries not to perform redundant writes.
-;;;
-;;; That said, a port of this library to a specific Scheme system might wish
-;;; to tune this code to exploit particulars of the implementation.
-;;; The single most important compiler-specific optimisation you could make
-;;; to this library would be to add rewrite rules or transforms to:
-;;; - transform applications of n-ary procedures (e.g. LIST=, CONS*, APPEND,
-;;;   LSET-UNION) into multiple applications of a primitive two-argument
-;;;   variant.
-;;; - transform applications of the mapping functions (MAP, FOR-EACH, FOLD,
-;;;   ANY, EVERY) into open-coded loops. The killer here is that these
-;;;   functions are n-ary. Handling the general case is quite inefficient,
-;;;   requiring many intermediate data structures to be allocated and
-;;;   discarded.
-;;; - transform applications of procedures that take optional arguments
-;;;   into calls to variants that do not take optional arguments. This
-;;;   eliminates unnecessary consing and parsing of the rest parameter.
-;;;
-;;; These transforms would provide BIG speedups. In particular, the n-ary
-;;; mapping functions are particularly slow and cons-intensive, and are good
-;;; candidates for tuning. I have coded fast paths for the single-list cases,
-;;; but what you really want to do is exploit the fact that the compiler
-;;; usually knows how many arguments are being passed to a particular
-;;; application of these functions -- they are usually explicitly called, not
-;;; passed around as higher-order values. If you can arrange to have your
-;;; compiler produce custom code or custom linkages based on the number of
-;;; arguments in the call, you can speed these functions up a *lot*. But this
-;;; kind of compiler technology no longer exists in the Scheme world as far as
-;;; I can see.
-;;;
-;;; Note that this code is, of course, dependent upon standard bindings for
-;;; the R5RS procedures -- i.e., it assumes that the variable CAR is bound
-;;; to the procedure that takes the car of a list. If your Scheme
-;;; implementation allows user code to alter the bindings of these procedures
-;;; in a manner that would be visible to these definitions, then there might
-;;; be trouble. You could consider horrible kludgery along the lines of
-;;;    (define fact
-;;;      (let ((= =) (- -) (* *))
-;;;        (letrec ((real-fact (lambda (n)
-;;;                              (if (= n 0) 1 (* n (real-fact (- n 1)))))))
-;;;          real-fact)))
-;;; Or you could consider shifting to a reasonable Scheme system that, say,
-;;; has a module system protecting code from this kind of lossage.
-;;;
-;;; This code does a fair amount of run-time argument checking. If your
-;;; Scheme system has a sophisticated compiler that can eliminate redundant
-;;; error checks, this is no problem. However, if not, these checks incur
-;;; some performance overhead -- and, in a safe Scheme implementation, they
-;;; are in some sense redundant: if we don't check to see that the PROC
-;;; parameter is a procedure, we'll find out anyway three lines later when
-;;; we try to call the value. It's pretty easy to rip all this argument
-;;; checking code out if it's inappropriate for your implementation -- just
-;;; nuke every call to CHECK-ARG.
-;;;
-;;; On the other hand, if you *do* have a sophisticated compiler that will
-;;; actually perform soft-typing and eliminate redundant checks (Rice's systems
-;;; being the only possible candidate of which I'm aware), leaving these checks
-;;; in can *help*, since their presence can be elided in redundant cases,
-;;; and in cases where they are needed, performing the checks early, at
-;;; procedure entry, can "lift" a check out of a loop.
-;;;
-;;; Finally, I have only checked the properties that can portably be checked
-;;; with R5RS Scheme -- and this is not complete. You may wish to alter
-;;; the CHECK-ARG parameter checks to perform extra, implementation-specific
-;;; checks, such as procedure arity for higher-order values.
-;;;
-;;; The code has only these non-R4RS dependencies:
-;;;   A few calls to an ERROR procedure;
-;;;   Uses of the R5RS multiple-value procedure VALUES and the m-v binding
-;;;     RECEIVE macro (which isn't R5RS, but is a trivial macro).
-;;;   Many calls to a parameter-checking procedure check-arg:
-;;;    (define (check-arg pred val caller)
-;;;      (let lp ((val val))
-;;;        (if (pred val) val (lp (error "Bad argument" val pred caller)))))
-;;;   A few uses of the LET-OPTIONAL and :OPTIONAL macros for parsing
-;;;     optional arguments.
-;;;
-;;; Most of these procedures use the NULL-LIST? test to trigger the
-;;; base case in the inner loop or recursion. The NULL-LIST? function
-;;; is defined to be a careful one -- it raises an error if passed a
-;;; non-nil, non-pair value. The spec allows an implementation to use
-;;; a less-careful implementation that simply defines NULL-LIST? to
-;;; be NOT-PAIR?. This would speed up the inner loops of these procedures
-;;; at the expense of having them silently accept dotted lists.
-
-;;; A note on dotted lists:
-;;; I, personally, take the view that the only consistent view of lists
-;;; in Scheme is the view that *everything* is a list -- values such as
-;;; 3 or "foo" or 'bar are simply empty dotted lists. This is due to the
-;;; fact that Scheme actually has no true list type. It has a pair type,
-;;; and there is an *interpretation* of the trees built using this type
-;;; as lists.
-;;;
-;;; I lobbied to have these list-processing procedures hew to this
-;;; view, and accept any value as a list argument. I was overwhelmingly
-;;; overruled during the SRFI discussion phase. So I am inserting this
-;;; text in the reference lib and the SRFI spec as a sort of "minority
-;;; opinion" dissent.
-;;;
-;;; Many of the procedures in this library can be trivially redefined
-;;; to handle dotted lists, just by changing the NULL-LIST? base-case
-;;; check to NOT-PAIR?, meaning that any non-pair value is taken to be
-;;; an empty list. For most of these procedures, that's all that is
-;;; required.
-;;;
-;;; However, we have to do a little more work for some procedures that
-;;; *produce* lists from other lists.  Were we to extend these procedures to
-;;; accept dotted lists, we would have to define how they terminate the lists
-;;; produced as results when passed a dotted list. I designed a coherent set
-;;; of termination rules for these cases; this was posted to the SRFI-1
-;;; discussion list. I additionally wrote an earlier version of this library
-;;; that implemented that spec. It has been discarded during later phases of
-;;; the definition and implementation of this library.
-;;;
-;;; The argument *against* defining these procedures to work on dotted
-;;; lists is that dotted lists are the rare, odd case, and that by
-;;; arranging for the procedures to handle them, we lose error checking
-;;; in the cases where a dotted list is passed by accident -- e.g., when
-;;; the programmer swaps a two arguments to a list-processing function,
-;;; one being a scalar and one being a list. For example,
-;;;     (member '(1 3 5 7 9) 7)
-;;; This would quietly return #f if we extended MEMBER to accept dotted
-;;; lists.
-;;;
-;;; The SRFI discussion record contains more discussion on this topic.
-
-;; JBC, 2003-10-20: some of the names provided by list.rkt are prefixed
-;; with an s: to avoid colliding with racket.  The wrapper 1.rkt
-;; changes their names back to the non-prefixed form.
-
-#lang racket/base
-
-(require "cons.rkt"
-         "selector.rkt"
-         "predicate.rkt"
-         "misc.rkt"
-         (rename-in "fold.rkt" [map s:map] [for-each s:for-each])
-         (rename-in "search.rkt" [member s:member])
-         (rename-in "filter.rkt" [remove s:remove])
-         "delete.rkt"
-         (rename-in "alist.rkt" [assoc s:assoc])
-         "lset.rkt")
-
-(provide (all-from-out "cons.rkt")
-         (all-from-out "selector.rkt")
-         (all-from-out "predicate.rkt")
-         (all-from-out "misc.rkt")
-         (all-from-out "fold.rkt")
-         (all-from-out "search.rkt")
-         (all-from-out "filter.rkt")
-         (all-from-out "delete.rkt")
-         (all-from-out "alist.rkt")
-         (all-from-out "lset.rkt"))
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/lset.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/lset.rkt
deleted file mode 100644
index 0ad483d729..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/lset.rkt
+++ /dev/null
@@ -1,218 +0,0 @@
-;;;
-;;; <lset.rkt> ---- Lists as Sets
-;;; Time-stamp: <03/03/13 16:20:56 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; This SRFI-1 implementation is distributed under the same terms as
-;;; Racket.
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-;; Commentary:
-
-;; Based on the reference implementation by Olin Shiver and hence:
-
-;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;; this code as long as you do not remove this copyright notice or
-;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-#lang racket/base
-
-(require srfi/optional
-         (rename-in "search.rkt" [member s:member])
-         (except-in "fold.rkt" map for-each)
-         "delete.rkt"
-         "predicate.rkt"
-         (only-in "filter.rkt" [filter-with-sharing s:filter] partition))
-
-(provide lset<=
-         lset=
-         lset-adjoin
-         lset-union (rename-out [lset-union lset-union!])
-         lset-intersection
-         lset-difference (rename-out [lset-difference lset-difference!])
-         lset-xor (rename-out [lset-xor lset-xor!])
-         lset-diff+intersection
-         (rename-out [lset-diff+intersection lset-diff+intersection!]))
-
-;; Lists-as-sets
-;;;;;;;;;;;;;;;;;
-
-;; This is carefully tuned code; do not modify casually.
-;; - It is careful to share storage when possible;
-;; - Side-effecting code tries not to perform redundant writes.
-;; - It tries to avoid linear-time scans in special cases where constant-time
-;;   computations can be performed.
-;; - It relies on similar properties from the other list-lib procs it calls.
-;;   For example, it uses the fact that the implementations of MEMBER and
-;;   FILTER in this source code share longest common tails between args
-;;   and results to get structure sharing in the lset procedures.
-
-(define (%lset2<= = lis1 lis2) (every (lambda (x) (s:member x lis2 =)) lis1))
-
-(define (lset<= = . lists)
-  (check-arg procedure? = 'lset<=)
-  (or (not (pair? lists)) ; 0-ary case
-      (let lp ((s1 (car lists)) (rest (cdr lists)))
-        (or (not (pair? rest))
-            (let ((s2 (car rest))  (rest (cdr rest)))
-              (and (or (eq? s2 s1)         ; Fast path
-                       (%lset2<= = s1 s2)) ; Real test
-                   (lp s2 rest)))))))
-
-(define (lset= = . lists)
-  (check-arg procedure? = 'lset=)
-  (or (not (pair? lists)) ; 0-ary case
-      (let lp ((s1 (car lists)) (rest (cdr lists)))
-        (or (not (pair? rest))
-            (let ((s2   (car rest))
-                  (rest (cdr rest)))
-              (and (or (eq? s1 s2) ; Fast path
-                       (and (%lset2<= = s1 s2) (%lset2<= = s2 s1))) ; Real test
-                   (lp s2 rest)))))))
-
-(define (lset-adjoin = lis . elts)
-  (check-arg procedure? = 'lset-adjoin)
-  (fold (lambda (elt ans) (if (s:member elt ans =) ans (cons elt ans)))
-        lis elts))
-
-(define (lset-union = . lists)
-  (check-arg procedure? = 'lset-union)
-  (reduce (lambda (lis ans)             ; Compute ANS + LIS.
-            (cond ((null? lis) ans)     ; Don't copy any lists
-                  ((null? ans) lis)     ; if we don't have to.
-                  ((eq? lis ans) ans)
-                  (else
-                   (fold (lambda (elt ans)
-                           (if (any (lambda (x) (= x elt)) ans)
-                             ans
-                             (cons elt ans)))
-                         ans lis))))
-          '() lists))
-
-#; ; lists are immutable
-(define (lset-union! = . lists)
-  (check-arg procedure? = 'lset-union!)
-  (reduce (lambda (lis ans) ; Splice new elts of LIS onto the front of ANS.
-            (cond ((null? lis) ans) ; Don't copy any lists
-                  ((null? ans) lis) ; if we don't have to.
-                  ((eq? lis ans) ans)
-                  (else
-                   (pair-fold (lambda (pair ans)
-                                (let ((elt (car pair)))
-                                  (if (any (lambda (x) (= x elt)) ans)
-                                    ans
-                                    (begin (set-cdr! pair ans) pair))))
-                              ans lis))))
-          '() lists))
-
-(define (lset-intersection = lis1 . lists)
-  (check-arg procedure? = 'lset-intersection)
-  (let ((lists (delete lis1 lists eq?))) ; Throw out any LIS1 vals.
-    (cond ((any null-list? lists) '())   ; Short cut
-          ((null? lists)          lis1)  ; Short cut
-          (else (filter (lambda (x)
-                          (every (lambda (lis) (s:member x lis =)) lists))
-                        lis1)))))
-
-#; ; lists are immutable
-(define (lset-intersection! = lis1 . lists)
-  (check-arg procedure? = 'lset-intersection!)
-  (let ((lists (delete lis1 lists eq?))) ; Throw out any LIS1 vals.
-    (cond ((any null-list? lists) '())  ; Short cut
-          ((null? lists)          lis1) ; Short cut
-          (else (filter! (lambda (x)
-                           (every (lambda (lis) (s:member x lis =)) lists))
-                         lis1)))))
-
-(define (lset-difference = lis1 . lists)
-  (check-arg procedure? = 'lset-difference)
-  (let ((lists (filter pair? lists))) ; Throw out empty lists.
-    (cond ((null? lists)     lis1)    ; Short cut
-          ((memq lis1 lists) '())     ; Short cut
-          (else (filter (lambda (x)
-                          (every (lambda (lis) (not (s:member x lis =)))
-                                 lists))
-                        lis1)))))
-
-#; ; lists are immutable
-(define (lset-difference! = lis1 . lists)
-  (check-arg procedure? = 'lset-difference!)
-  (let ((lists (filter pair? lists))) ; Throw out empty lists.
-    (cond ((null? lists)     lis1)    ; Short cut
-          ((memq lis1 lists) '())     ; Short cut
-          (else (filter! (lambda (x)
-                           (every (lambda (lis) (not (s:member x lis =)))
-                                  lists))
-                         lis1)))))
-
-(define (lset-xor = . lists)
-  (check-arg procedure? = 'lset-xor)
-  (reduce (lambda (b a) ; Compute A xor B:
-            ;; Note that this code relies on the constant-time
-            ;; short-cuts provided by LSET-DIFF+INTERSECTION,
-            ;; LSET-DIFFERENCE & APPEND to provide constant-time short
-            ;; cuts for the cases A = (), B = (), and A eq? B. It takes
-            ;; a careful case analysis to see it, but it's carefully
-            ;; built in.
-            ;; Compute a-b and a^b, then compute b-(a^b) and
-            ;; cons it onto the front of a-b.
-            (let-values ([(a-b a-int-b) (lset-diff+intersection = a b)])
-              (cond ((null? a-b)     (lset-difference = b a))
-                    ((null? a-int-b) (append b a))
-                    (else (fold (lambda (xb ans)
-                                  (if (s:member xb a-int-b =) ans (cons xb ans)))
-                                a-b
-                                b)))))
-          '() lists))
-
-#; ; lists are immutable
-(define (lset-xor! = . lists)
-  (check-arg procedure? = 'lset-xor!)
-  (reduce (lambda (b a) ; Compute A xor B:
-            ;; Note that this code relies on the constant-time
-            ;; short-cuts provided by LSET-DIFF+INTERSECTION,
-            ;; LSET-DIFFERENCE & APPEND to provide constant-time short
-            ;; cuts for the cases A = (), B = (), and A eq? B. It takes
-            ;; a careful case analysis to see it, but it's carefully
-            ;; built in.
-            ;; Compute a-b and a^b, then compute b-(a^b) and
-            ;; cons it onto the front of a-b.
-            (let-values ([(a-b a-int-b) (lset-diff+intersection! = a b)])
-              (cond ((null? a-b)     (lset-difference! = b a))
-                    ((null? a-int-b) (append! b a))
-                    (else (pair-fold
-                           (lambda (b-pair ans)
-                             (if (s:member (car b-pair) a-int-b =) ans
-                                 (begin (set-cdr! b-pair ans) b-pair)))
-                           a-b
-                           b)))))
-          '() lists))
-
-(define (lset-diff+intersection = lis1 . lists)
-  (check-arg procedure? = 'lset-diff+intersection)
-  (cond ((every null-list? lists) (values lis1 '())) ; Short cut
-        ((memq lis1 lists)        (values '() lis1)) ; Short cut
-        (else (partition (lambda (elt)
-                           (not (any (lambda (lis) (s:member elt lis =))
-                                     lists)))
-                         lis1))))
-
-#; ; lists are immutable
-(define (lset-diff+intersection! = lis1 . lists)
-  (check-arg procedure? = 'lset-diff+intersection!)
-  (cond ((every null-list? lists) (values lis1 '())) ; Short cut
-        ((memq lis1 lists)        (values '() lis1)) ; Short cut
-        (else (partition! (lambda (elt)
-                            (not (any (lambda (lis) (s:member elt lis =))
-                                      lists)))
-                          lis1))))
-
-;;; lset.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/misc.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/misc.rkt
deleted file mode 100644
index 3554e9bc88..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/misc.rkt
+++ /dev/null
@@ -1,178 +0,0 @@
-;;;
-;;; <misc.rkt> ---- Miscellaneous list procedures
-;;; Time-stamp: <02/03/01 13:52:22 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; This SRFI-1 implementation is distributed under the same terms as
-;;; Racket.
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-;; Commentary:
-
-;; Based on the reference implementation by Olin Shiver and hence:
-
-;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;; this code as long as you do not remove this copyright notice or
-;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-#lang racket/base
-
-(require srfi/optional
-         "predicate.rkt"
-         "selector.rkt"
-         "util.rkt"
-         (only-in "fold.rkt" reduce-right)
-         (rename-in "fold.rkt" [map s:map] [for-each s:for-each])
-         (only-in racket/list count append*))
-
-(provide length+
-         (rename-out [append* concatenate] [append* concatenate!])
-         (rename-out [append append!])
-         (rename-out [reverse reverse!])
-         append-reverse (rename-out [append-reverse append-reverse!])
-         zip unzip1 unzip2 unzip3 unzip4 unzip5
-         count)
-
-#; ; reprovided from scheme/list
-;; count
-;;;;;;;;
-(define (count pred list1 . lists)
-  (check-arg procedure? pred 'count)
-  (if (pair? lists)
-    ;; N-ary case
-    (let lp ((list1 list1) (lists lists) (i 0))
-      (if (null-list? list1) i
-          (let-values ([(as ds) (%cars+cdrs lists)])
-            (if (null? as) i
-                (lp (cdr list1) ds
-                    (if (apply pred (car list1) as) (+ i 1) i))))))
-    ;; Fast path
-    (let lp ((lis list1) (i 0))
-      (if (null-list? lis) i
-          (lp (cdr lis) (if (pred (car lis)) (+ i 1) i))))))
-
-(define (length+ x)  ; Returns #f if X is circular.
-  (let lp ((x x) (lag x) (len 0))
-    (if (pair? x)
-      (let ((x (cdr x))
-            (len (+ len 1)))
-        (if (pair? x)
-          (let ((x   (cdr x))
-                (lag (cdr lag))
-                (len (+ len 1)))
-            (and (not (eq? x lag)) (lp x lag len)))
-          len))
-      len)))
-
-(define (zip list1 . more-lists) (apply s:map list list1 more-lists))
-
-;; Unzippers -- 1 through 5
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (unzip1 lis) (map car lis))
-
-(define (unzip2 lis)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values lis lis) ; Use NOT-PAIR? to handle
-        (let ((elt (car lis)))            ; dotted lists.
-          (let-values ([(a b) (recur (cdr lis))])
-            (values (cons (car  elt) a)
-                    (cons (cadr elt) b)))))))
-
-(define (unzip3 lis)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values lis lis lis)
-        (let ((elt (car lis)))
-          (let-values ([(a b c) (recur (cdr lis))])
-            (values (cons (car   elt) a)
-                    (cons (cadr  elt) b)
-                    (cons (caddr elt) c)))))))
-
-(define (unzip4 lis)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values lis lis lis lis)
-        (let ((elt (car lis)))
-          (let-values ([(a b c d) (recur (cdr lis))])
-            (values (cons (car    elt) a)
-                    (cons (cadr   elt) b)
-                    (cons (caddr  elt) c)
-                    (cons (cadddr elt) d)))))))
-
-(define (unzip5 lis)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values lis lis lis lis lis)
-        (let ((elt (car lis)))
-          (let-values ([(a b c d e) (recur (cdr lis))])
-            (values (cons (car     elt) a)
-                    (cons (cadr    elt) b)
-                    (cons (caddr   elt) c)
-                    (cons (cadddr  elt) d)
-                    (cons (car (cddddr  elt)) e)))))))
-
-;; append! append-reverse append-reverse! concatenate concatenate!
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-#; ; lists are immutable
-(define (my-append! . lists)
-  ;; First, scan through lists looking for a non-empty one.
-  (let lp ((lists lists) (prev '()))
-    (if (not (pair? lists)) prev
-        (let ((first (car lists))
-              (rest (cdr lists)))
-          (if (not (pair? first)) (lp rest first)
-              ;; Now, do the splicing.
-              (let lp2 ((tail-cons (last-pair first))
-                        (rest rest))
-                (if (pair? rest)
-                  (let ((next (car rest))
-                        (rest (cdr rest)))
-                    (set-cdr! tail-cons next)
-                    (lp2 (if (pair? next) (last-pair next) tail-cons)
-                         rest))
-                  first)))))))
-
-
-;;(define (append-reverse rev-head tail) (fold cons tail rev-head))
-
-;;(define (append-reverse! rev-head tail)
-;;  (pair-fold (lambda (pair tail) (set-cdr! pair tail) pair)
-;;             tail
-;;             rev-head))
-
-;; Hand-inline the FOLD and PAIR-FOLD ops for speed.
-
-(define (append-reverse rev-head tail)
-  (let lp ((rev-head rev-head) (tail tail))
-    (if (null-list? rev-head) tail
-        (lp (cdr rev-head) (cons (car rev-head) tail)))))
-
-#; ; lists are immutable
-(define (append-reverse! rev-head tail)
-  (let lp ((rev-head rev-head) (tail tail))
-    (if (null-list? rev-head) tail
-        (let ((next-rev (cdr rev-head)))
-          (set-cdr! rev-head tail)
-          (lp next-rev rev-head)))))
-
-#; ; reprovide scheme/list's `append*' function
-(define (concatenate lists) (reduce-right append '() lists))
-#; ; lists are immutable
-(define (concatenate! lists) (reduce-right my-append! '() lists))
-
-#; ; lists are immutable
-(define (my-reverse! lis)
-  (let lp ((lis lis) (ans '()))
-    (if (null-list? lis) ans
-        (let ((tail (cdr lis)))
-          (set-cdr! lis ans)
-          (lp tail lis)))))
-
-;;; misc.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/predicate.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/predicate.rkt
deleted file mode 100644
index 2c49667bb6..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/predicate.rkt
+++ /dev/null
@@ -1,107 +0,0 @@
-;;;
-;;; <predicate.rkt> ---- List Predicates
-;;; Time-stamp: <02/02/27 12:57:15 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; This SRFI-1 implementation is distributed under the same terms as
-;;; Racket.
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-;; Commentary:
-
-;; Based on the reference implementation by Olin Shiver and hence:
-
-;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;; this code as long as you do not remove this copyright notice or
-;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-
-#lang racket/base
-
-(provide pair?
-         null?
-         proper-list?
-         circular-list?
-         dotted-list?
-         not-pair?
-         null-list?
-         list=)
-
-;; <proper-list> ::= ()                       ; Empty proper list
-;;                 | (cons <x> <proper-list>) ; Proper-list pair
-;; Note that this definition rules out circular lists -- and this
-;; function is required to detect this case and return false.
-
-(define (proper-list? x)
-  (let lp ((x x) (lag x))
-    (if (pair? x)
-      (let ((x (cdr x)))
-        (if (pair? x)
-          (let ((x   (cdr x))
-                (lag (cdr lag)))
-            (and (not (eq? x lag)) (lp x lag)))
-          (null? x)))
-      (null? x))))
-
-;; A dotted list is a finite list (possibly of length 0) terminated
-;; by a non-nil value. Any non-cons, non-nil value (e.g., "foo" or 5)
-;; is a dotted list of length 0.
-;;
-;; <dotted-list> ::= <non-nil,non-pair>       ; Empty dotted list
-;;                 | (cons <x> <dotted-list>) ; Proper-list pair
-
-(define (dotted-list? x)
-  (let lp ((x x) (lag x))
-    (if (pair? x)
-      (let ((x (cdr x)))
-        (if (pair? x)
-          (let ((x   (cdr x))
-                (lag (cdr lag)))
-            (and (not (eq? x lag)) (lp x lag)))
-          (not (null? x))))
-      (not (null? x)))))
-
-(define (circular-list? x)
-  (let lp ((x x) (lag x))
-    (and (pair? x)
-         (let ((x (cdr x)))
-           (and (pair? x)
-                (let ((x   (cdr x))
-                      (lag (cdr lag)))
-                  (or (eq? x lag) (lp x lag))))))))
-
-(define (not-pair? x) (not (pair? x))) ; Inline me.
-
-;; This is a legal definition which is fast and sloppy:
-;;     (define null-list? not-pair?)
-;; but we'll provide a more careful one:
-(define (null-list? l)
-  (cond ((pair? l) #f)
-        ((null? l) #t)
-        (else (error "null-list?: argument out of domain" l))))
-
-(define (list= = . lists)
-  (or (null? lists) ; special case
-      (let lp1 ((list-a (car lists)) (others (cdr lists)))
-        (or (null? others)
-            (let ((list-b (car others))
-                  (others (cdr others)))
-              (if (eq? list-a list-b)        ; EQ? => LIST=
-                (lp1 list-b others)
-                (let lp2 ((la list-a) (lb list-b))
-                  (if (null-list? la)
-                    (and (null-list? lb)
-                         (lp1 list-b others))
-                    (and (not (null-list? lb))
-                         (= (car la) (car lb))
-                         (lp2 (cdr la) (cdr lb)))))))))))
-
-;;; predicate.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/search.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/search.rkt
deleted file mode 100644
index e66ef2e201..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/search.rkt
+++ /dev/null
@@ -1,176 +0,0 @@
-#lang racket/base
-
-;;;
-;;; <search.rkt> ---- List searching functions
-;;; Time-stamp: <02/02/28 12:11:01 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; This SRFI-1 implementation is distributed under the same terms as
-;;; Racket.
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-;; Commentary:
-
-;; Based on the reference implementation by Olin Shiver and hence:
-
-;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;; this code as long as you do not remove this copyright notice or
-;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-
-
-(require srfi/optional
-         "predicate.rkt"
-         "util.rkt")
-
-(provide (rename-out [my-member member])
-         find
-         find-tail
-         any
-         every
-         list-index
-         take-while (rename-out [take-while take-while!])
-         drop-while
-         span (rename-out [span span!])
-         break (rename-out [break break!]))
-
-;; Extended from R4RS to take an optional comparison argument.
-(define [my-member x lis [= equal?]]
-  (find-tail (lambda (y) (= x y)) lis))
-
-;; find find-tail take-while drop-while span break any every list-index
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (find pred list)
-  (check-arg procedure? pred 'find)
-  (cond ((find-tail-internal pred list) => car)
-        (else #f)))
-
-(define (find-tail pred list)
-  (check-arg procedure? pred 'find-tail)
-  (find-tail-internal pred list))
-
-(define (find-tail-internal pred list)
-  (let lp ((list list))
-    (and (not (null-list? list))
-         (if (pred (car list)) list
-             (lp (cdr list))))))
-
-(define (take-while pred lis)
-  (check-arg procedure? pred 'take-while)
-  (let recur ((lis lis))
-    (if (null-list? lis) '()
-        (let ((x (car lis)))
-          (if (pred x)
-            (cons x (recur (cdr lis)))
-            '())))))
-
-(define (drop-while pred lis)
-  (check-arg procedure? pred 'drop-while)
-  (let lp ((lis lis))
-    (cond ((null-list? lis) '())
-          ((pred (car lis)) (lp (cdr lis)))
-          (else lis))))
-
-#; ; lists are immutable
-(define (take-while! pred lis)
-  (check-arg procedure? pred 'take-while!)
-  (if (or (null-list? lis) (not (pred (car lis)))) '()
-      (begin (let lp ((prev lis) (rest (cdr lis)))
-               (if (pair? rest)
-                 (let ((x (car rest)))
-                   (if (pred x) (lp rest (cdr rest))
-                       (set-cdr! prev '())))))
-             lis)))
-
-(define (span pred lis)
-  (check-arg procedure? pred 'span)
-  (let recur ((lis lis))
-    (if (null-list? lis) (values '() '())
-        (let ((x (car lis)))
-          (if (pred x)
-            (let-values ([(prefix suffix) (recur (cdr lis))])
-              (values (cons x prefix) suffix))
-            (values '() lis))))))
-
-#; ; lists are immutable
-(define (span! pred lis)
-  (check-arg procedure? pred 'span!)
-  (if (or (null-list? lis) (not (pred (car lis)))) (values '() lis)
-      (let ((suffix (let lp ((prev lis) (rest (cdr lis)))
-                      (if (null-list? rest) rest
-                          (let ((x (car rest)))
-                            (if (pred x) (lp rest (cdr rest))
-                                (begin (set-cdr! prev '())
-                                       rest)))))))
-        (values lis suffix))))
-
-(define (break pred lis) (span  (lambda (x) (not (pred x))) lis))
-#; ; lists are immutable
-(define (break! pred lis) (span! (lambda (x) (not (pred x))) lis))
-
-(define (any pred lis1 . lists)
-  (check-arg procedure? pred 'any)
-  (if (pair? lists)
-    ;; N-ary case
-    (let-values ([(heads tails) (%cars+cdrs (cons lis1 lists))])
-      (and (pair? heads)
-           (let lp ((heads heads) (tails tails))
-             (let-values ([(next-heads next-tails) (%cars+cdrs tails)])
-               (if (pair? next-heads)
-                 (or (apply pred heads) (lp next-heads next-tails))
-                 (apply pred heads)))))) ; Last PRED app is tail call.
-    ;; Fast path
-    (and (not (null-list? lis1))
-         (let lp ((head (car lis1)) (tail (cdr lis1)))
-           (if (null-list? tail)
-             (pred head)                ; Last PRED app is tail call.
-             (or (pred head) (lp (car tail) (cdr tail))))))))
-
-;(define (every pred list)              ; Simple definition.
-;  (let lp ((list list))                ; Doesn't return the last PRED value.
-;    (or (not (pair? list))
-;        (and (pred (car list))
-;             (lp (cdr list))))))
-
-(define (every pred lis1 . lists)
-  (check-arg procedure? pred 'every)
-  (if (pair? lists)
-    ;; N-ary case
-    (let-values ([(heads tails) (%cars+cdrs (cons lis1 lists))])
-      (or (not (pair? heads))
-          (let lp ((heads heads) (tails tails))
-            (let-values ([(next-heads next-tails) (%cars+cdrs tails)])
-              (if (pair? next-heads)
-                (and (apply pred heads) (lp next-heads next-tails))
-                (apply pred heads)))))) ; Last PRED app is tail call.
-    ;; Fast path
-    (or (null-list? lis1)
-        (let lp ((head (car lis1))  (tail (cdr lis1)))
-          (if (null-list? tail)
-            (pred head) ; Last PRED app is tail call.
-            (and (pred head) (lp (car tail) (cdr tail))))))))
-
-(define (list-index pred lis1 . lists)
-  (check-arg procedure? pred 'list-index)
-  (if (pair? lists)
-    ;; N-ary case
-    (let lp ((lists (cons lis1 lists)) (n 0))
-      (let-values ([(heads tails) (%cars+cdrs lists)])
-        (and (pair? heads)
-             (if (apply pred heads) n
-                 (lp tails (+ n 1))))))
-    ;; Fast path
-    (let lp ((lis lis1) (n 0))
-      (and (not (null-list? lis))
-           (if (pred (car lis)) n (lp (cdr lis) (+ n 1)))))))
-
-;;; search.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/selector.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/selector.rkt
deleted file mode 100644
index c82da2876c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/selector.rkt
+++ /dev/null
@@ -1,142 +0,0 @@
-;;;
-;;; <selector.rkt> ---- List selectors
-;;; Time-stamp: <02/02/27 12:49:44 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; This SRFI-1 implementation is distributed under the same terms as
-;;; Racket.
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-;; Commentary:
-
-;; Based on the reference implementation by Olin Shiver and hence:
-
-;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;; this code as long as you do not remove this copyright notice or
-;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-#lang racket/base
-
-(require srfi/optional
-         (only-in racket/list take drop take-right drop-right split-at))
-
-(provide first second
-         third fourth
-         fifth sixth
-         seventh eighth
-         ninth tenth
-         car+cdr
-         take drop
-         take-right drop-right
-         (rename-out [take take!]) (rename-out [drop-right drop-right!])
-         split-at (rename-out [split-at split-at!])
-         last
-         last-pair)
-
-(define first  car)
-(define second cadr)
-(define third  caddr)
-(define fourth cadddr)
-(define (fifth   x) (car    (cddddr x)))
-(define (sixth   x) (cadr   (cddddr x)))
-(define (seventh x) (caddr  (cddddr x)))
-(define (eighth  x) (cadddr (cddddr x)))
-(define (ninth   x) (car  (cddddr (cddddr x))))
-(define (tenth   x) (cadr (cddddr (cddddr x))))
-
-(define (car+cdr pair) (values (car pair) (cdr pair)))
-
-;; take & drop
-
-#; ; provided by scheme/list
-(define (take lis k)
-  (check-arg integer? k 'take)
-  (let recur ((lis lis) (k k))
-    (if (zero? k) '()
-        (cons (car lis)
-              (recur (cdr lis) (- k 1))))))
-
-#; ; provided by scheme/list
-(define (drop lis k)
-  (check-arg integer? k 'drop)
-  (let iter ((lis lis) (k k))
-    (if (zero? k) lis (iter (cdr lis) (- k 1)))))
-
-#; ; lists are immutable
-(define (take! lis k)
-  (check-arg integer? k 'take!)
-  (if (zero? k) '()
-      (begin (set-cdr! (drop lis (- k 1)) '())
-             lis)))
-
-;; TAKE-RIGHT and DROP-RIGHT work by getting two pointers into the list,
-;; off by K, then chasing down the list until the lead pointer falls off
-;; the end.
-
-#; ; provided by scheme/list
-(define (take-right lis k)
-  (check-arg integer? k 'take-right)
-  (let lp ((lag lis)  (lead (drop lis k)))
-    (if (pair? lead)
-      (lp (cdr lag) (cdr lead))
-      lag)))
-
-#; ; provided by scheme/list
-(define (drop-right lis k)
-  (check-arg integer? k 'drop-right)
-  (let recur ((lag lis) (lead (drop lis k)))
-    (if (pair? lead)
-      (cons (car lag) (recur (cdr lag) (cdr lead)))
-      '())))
-
-;; In this function, LEAD is actually K+1 ahead of LAG. This lets
-;; us stop LAG one step early, in time to smash its cdr to ().
-#; ; lists are immutable
-(define (drop-right! lis k)
-  (check-arg integer? k 'drop-right!)
-  (let ((lead (drop lis k)))
-    (if (pair? lead)
-      (let lp ((lag lis)  (lead (cdr lead))) ; Standard case
-        (if (pair? lead)
-          (lp (cdr lag) (cdr lead))
-          (begin (set-cdr! lag '())
-                 lis)))
-      '()))) ; Special case dropping everything -- no cons to side-effect.
-
-#; ; provided by scheme/list
-(define (split-at x k)
-  (check-arg integer? k 'split-at)
-  (let recur ((lis x) (k k))
-    (if (zero? k) (values '() lis)
-        (let-values ([(prefix suffix) (recur (cdr lis) (- k 1))])
-          (values (cons (car lis) prefix) suffix)))))
-
-#; ; lists are immutable
-(define (split-at! x k)
-  (check-arg integer? k 'split-at!)
-  (if (zero? k) (values '() x)
-      (let* ((prev (drop x (- k 1)))
-             (suffix (cdr prev)))
-        (set-cdr! prev '())
-        (values x suffix))))
-
-;; these could be reprovided from scheme/base, but they don't raise an
-;; error on improper lists
-
-(define (last lis) (car (last-pair lis)))
-
-(define (last-pair lis)
-  (check-arg pair? lis 'last-pair)
-  (let lp ((lis lis))
-    (let ((tail (cdr lis)))
-      (if (pair? tail) (lp tail) lis))))
-
-;;; selector.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/util.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/util.rkt
deleted file mode 100644
index 1ef7d7e820..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/1/util.rkt
+++ /dev/null
@@ -1,108 +0,0 @@
-;;;
-;;; <util.rkt> ---- Utility functions
-;;; Time-stamp: <02/02/28 12:05:00 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; This SRFI-1 implementation is distributed under the same terms as
-;;; Racket.
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-
-;; Commentary:
-
-;; Based on the reference implementation by Olin Shiver and hence:
-
-;; Copyright (c) 1998, 1999 by Olin Shivers. You may do as you please with
-;; this code as long as you do not remove this copyright notice or
-;; hold me liable for its use. Please send bug reports to shivers@ai.mit.edu.
-;;     -Olin
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-#lang racket/base
-
-(require "predicate.rkt"
-         "selector.rkt")
-
-(provide %cdrs
-         %cars+
-         %cars+cdrs
-         %cars+cdrs+
-         %cars+cdrs/no-test)
-
-;; Fold/map internal utilities
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; These little internal utilities are used by the general
-;; fold & mapper funs for the n-ary cases . It'd be nice if they got inlined.
-;; One the other hand, the n-ary cases are painfully inefficient as it is.
-;; An aggressive implementation should simply re-write these functions
-;; for raw efficiency; I have written them for as much clarity, portability,
-;; and simplicity as can be achieved.
-;;
-;; I use the dreaded call/cc to do local aborts. A good compiler could
-;; handle this with extreme efficiency. An implementation that provides
-;; a one-shot, non-persistent continuation grabber could help the compiler
-;; out by using that in place of the call/cc's in these routines.
-;;
-;; These functions have funky definitions that are precisely tuned to
-;; the needs of the fold/map procs -- for example, to minimize the number
-;; of times the argument lists need to be examined.
-
-;; Return (map cdr lists).
-;; However, if any element of LISTS is empty, just abort and return '().
-(define (%cdrs lists)
-  (let/ec abort
-    (let recur ((lists lists))
-      (if (pair? lists)
-        (let ((lis (car lists)))
-          (if (null-list? lis) (abort '())
-              (cons (cdr lis) (recur (cdr lists)))))
-        '()))))
-
-(define (%cars+ lists last-elt) ; (append! (map car lists) (list last-elt))
-  (let recur ((lists lists))
-    (if (pair? lists) (cons (caar lists) (recur (cdr lists))) (list last-elt))))
-
-;; LISTS is a (not very long) non-empty list of lists.
-;; Return two lists: the cars & the cdrs of the lists.
-;; However, if any of the lists is empty, just abort and return [() ()].
-
-(define (%cars+cdrs lists)
-  (let/ec abort
-    (let recur ((lists lists))
-      (if (pair? lists)
-        (let-values ([(list other-lists) (car+cdr lists)])
-          (if (null-list? list) (abort '() '()) ; LIST is empty -- bail out
-              (let-values ([(a d) (car+cdr list)]
-                           [(cars cdrs) (recur other-lists)])
-                (values (cons a cars) (cons d cdrs)))))
-        (values '() '())))))
-
-;; Like %CARS+CDRS, but we pass in a final elt tacked onto the end of the
-;; cars list. What a hack.
-(define (%cars+cdrs+ lists cars-final)
-  (let/ec abort
-    (let recur ((lists lists))
-      (if (pair? lists)
-        (let-values ([(list other-lists) (car+cdr lists)])
-          (if (null-list? list) (abort '() '()) ; LIST is empty -- bail out
-              (let-values ([(a d) (car+cdr list)]
-                           [(cars cdrs) (recur other-lists)])
-                (values (cons a cars) (cons d cdrs)))))
-        (values (list cars-final) '())))))
-
-;; Like %CARS+CDRS, but blow up if any list is empty.
-(define (%cars+cdrs/no-test lists)
-  (let recur ((lists lists))
-    (if (pair? lists)
-      (let*-values ([(list other-lists) (car+cdr lists)]
-                    [(a d) (car+cdr list)]
-                    [(cars cdrs) (recur other-lists)])
-        (values (cons a cars) (cons d cdrs)))
-      (values '() '()))))
-
-;;; util.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/13.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/13.rkt
deleted file mode 100644
index 3f16a3ae17..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/13.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-13
-#lang s-exp srfi/provider srfi/13/string #:unprefix s:
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/13/string.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/13/string.rkt
deleted file mode 100644
index f79511b82c..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/13/string.rkt
+++ /dev/null
@@ -1,1877 +0,0 @@
-;;;
-;;; <string.rkt> ---- SRFI 13 port to PLT Scheme
-;;; Revised by Chongkai Zhu, based on the orgianl port
-;;;
-;;; Here is the copyright notice, and licence from the original source:
-
-;;; Copyright (c) 1988-1994 Massachusetts Institute of Technology.
-;;; Copyright (c) 1998, 1999, 2000 Olin Shivers. All rights reserved.
-;;; Copyright details
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; The prefix/suffix and comparison routines in this code had (extremely
-;;; distant) origins in MIT Scheme's string lib, and was substantially
-;;; reworked by Olin Shivers (shivers@ai.mit.edu) 9/98. As such, it is
-;;; covered by MIT Scheme's open source copyright. See below for details.
-;;;
-;;; The KMP string-search code was influenced by implementations written
-;;; by Stephen Bevan, Brian Dehneyer and Will Fitzgerald. However, this
-;;; version was written from scratch by myself.
-;;;
-;;; The remainder of this code was written from scratch by myself for scsh.
-;;; The scsh copyright is a BSD-style open source copyright. See below for
-;;; details.
-;;;     -Olin Shivers
-
-;; Olin Shivers verified that he is fine with redistributing this code
-;; under the LGPL.  (Verified personally by Eli Barzilay.)
-
-;;; MIT Scheme copyright terms
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; This material was developed by the Scheme project at the Massachusetts
-;;; Institute of Technology, Department of Electrical Engineering and
-;;; Computer Science.  Permission to copy and modify this software, to
-;;; redistribute either the original software or a modified version, and
-;;; to use this software for any purpose is granted, subject to the
-;;; following restrictions and understandings.
-;;;
-;;; 1. Any copy made of this software must include this copyright notice
-;;; in full.
-;;;
-;;; 2. Users of this software agree to make their best efforts (a) to
-;;; return to the MIT Scheme project any improvements or extensions that
-;;; they make, so that these may be included in future releases; and (b)
-;;; to inform MIT of noteworthy uses of this software.
-;;;
-;;; 3. All materials developed as a consequence of the use of this
-;;; software shall duly acknowledge such use, in accordance with the usual
-;;; standards of acknowledging credit in academic research.
-;;;
-;;; 4. MIT has made no warrantee or representation that the operation of
-;;; this software will be error-free, and MIT is under no obligation to
-;;; provide any services, by way of maintenance, update, or otherwise.
-;;;
-;;; 5. In conjunction with products arising from the use of this material,
-;;; there shall be no use of the name of the Massachusetts Institute of
-;;; Technology nor of any adaptation thereof in any advertising,
-;;; promotional, or sales literature without prior written consent from
-;;; MIT in each case.
-
-;;; Scsh copyright terms
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; All rights reserved.
-;;;
-;;; Redistribution and use in source and binary forms, with or without
-;;; modification, are permitted provided that the following conditions
-;;; are met:
-;;; 1. Redistributions of source code must retain the above copyright
-;;;    notice, this list of conditions and the following disclaimer.
-;;; 2. Redistributions in binary form must reproduce the above copyright
-;;;    notice, this list of conditions and the following disclaimer in the
-;;;    documentation and/or other materials provided with the distribution.
-;;; 3. The name of the authors may not be used to endorse or promote products
-;;;    derived from this software without specific prior written permission.
-;;;
-;;; THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
-;;; IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-;;; OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-;;; IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-;;; INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-;;; NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-;;; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-;;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-;;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-;;; THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;; Are you still here? Cool, keep reading it gets better:
-
-#lang s-exp racket/base
-
-(require srfi/optional
-         srfi/8/receive
-         srfi/14/char-set)
-(provide
- ;; String procedures:
- string-map string-map!
- string-fold string-unfold
- string-fold-right string-unfold-right
- string-tabulate string-for-each string-for-each-index
- string-every string-any
- string-hash string-hash-ci
- string-compare string-compare-ci
- string=    string<    string>    string<=    string>=    string<>
- string-ci= string-ci< string-ci> string-ci<= string-ci>= string-ci<>
- s:string-downcase  s:string-upcase  s:string-titlecase
- string-downcase! string-upcase! string-titlecase!
- string-take string-take-right
- string-drop string-drop-right
- string-pad string-pad-right
- string-trim string-trim-right string-trim-both
- string-filter string-delete
- string-index string-index-right
- string-skip  string-skip-right
- string-count
- string-prefix-length string-prefix-length-ci
- string-suffix-length string-suffix-length-ci
- string-prefix? string-prefix-ci?
- string-suffix? string-suffix-ci?
- string-contains string-contains-ci
- substring/shared
- string-reverse string-reverse! reverse-list->string
- string-concatenate string-concatenate/shared string-concatenate-reverse
- string-concatenate-reverse/shared
- string-append/shared
- xsubstring string-xcopy!
- string-null?
- string-join
- string-tokenize
- string-replace
-
- s:string-fill!
- s:string->list
- ;; R5RS re-exports:
- ;; string-copy
- ;; string? make-string string-length string-ref string-set!
- ;; R5RS re-exports (also defined here but commented-out):
- ;; string string-append list->string
-
- ;; Low level routines:
- make-kmp-restart-vector string-kmp-partial-search kmp-step
- string-parse-start+end
- string-parse-final-start+end
- let-string-start+end
- check-substring-spec
- substring-spec-ok?
- )
-
-
-;; Support for START/END substring specs
-;;
-;; This macro parses optional start/end arguments from arg lists, defaulting
-;; them to 0/(string-length s), and checks them for correctness.
-
-(define-syntax let-string-start+end
-  (syntax-rules ()
-    ((let-string-start+end (start end) proc s-exp args-exp body ...)
-     (receive (start end) (string-parse-final-start+end proc s-exp args-exp)
-       body ...))
-    ((let-string-start+end (start end rest) proc s-exp args-exp body ...)
-     (receive (rest start end) (string-parse-start+end proc s-exp args-exp)
-       body ...))))
-
-;; This one parses out a *pair* of final start/end indices.
-;; Not exported; for internal use.
-(define-syntax let-string-start+end2
-  (syntax-rules ()
-    ((l-s-s+e2 (start1 end1 start2 end2) proc s1 s2 args body ...)
-     (let ((procv proc))        ; Make sure PROC is only evaluated once.
-       (let-string-start+end (start1 end1 rest) procv s1 args
-         (let-string-start+end (start2 end2) procv s2 rest
-           body ...))))))
-
-
-;; Returns three values: rest start end
-
-(define (string-parse-start+end proc s args)
-  (when (not (string? s)) (error proc "Non-string value ~a" s))
-  (let ((slen (string-length s)))
-    (if (pair? args)
-
-      (let ((start (car args))
-            (args (cdr args)))
-        (if (and (integer? start) (exact? start) (>= start 0))
-          (receive (end args)
-                   (if (pair? args)
-                     (let ((end (car args))
-                           (args (cdr args)))
-                       (if (and (integer? end) (exact? end) (<= end slen))
-                         (values end args)
-                         (error proc "Illegal substring END spec" end s)))
-                     (values slen args))
-            (if (<= start end)
-              (values args start end)
-              (error proc "Illegal substring START/END spec" start end s)))
-          (error proc "Illegal substring START spec" start s)))
-
-      (values '() 0 slen))))
-
-(define (string-parse-final-start+end proc s args)
-  (receive (rest start end) (string-parse-start+end proc s args)
-    (if (pair? rest)
-      (error proc "Extra arguments to procedure" rest)
-      (values start end))))
-
-(define (substring-spec-ok? s start end)
-  (and (string? s)
-       (integer? start)
-       (exact? start)
-       (integer? end)
-       (exact? end)
-       (<= 0 start)
-       (<= start end)
-       (<= end (string-length s))))
-
-(define (check-substring-spec proc s start end)
-  (unless (substring-spec-ok? s start end)
-    (error "Illegal substring spec." proc s start end)))
-
-
-;; Defined by R5RS, so commented out here.
-;(define (string . chars)
-;  (let* ((len (length chars))
-;         (ans (make-string len)))
-;    (do ((i 0 (+ i 1))
-;        (chars chars (cdr chars)))
-;       ((>= i len))
-;      (string-set! ans i (car chars)))
-;    ans))
-;
-;(define (string . chars) (string-unfold null? car cdr chars))
-
-
-
-;; substring/shared S START [END]
-;; string-copy      S [START END]
-;;
-
-;; All this goop is just arg parsing & checking surrounding a call to the
-;; actual primitive, %SUBSTRING/SHARED.
-
-(define (substring/shared s start . maybe-end)
-  (check-arg string? s 'substring/shared)
-  (let ((slen (string-length s)))
-    (check-arg (lambda (start) (and (integer? start) (exact? start) (<= 0 start)))
-               start 'substring/shared)
-    (%substring/shared s start
-                       (:optional maybe-end slen
-                                  (lambda (end)
-                                    (and (integer? end)
-                                         (exact? end)
-                                         (<= start end)
-                                         (<= end slen)))))))
-
-;; Split out so that other routines in this library can avoid arg-parsing
-;; overhead for END parameter.
-(define (%substring/shared s start end)
-  (if (and (zero? start) (= end (string-length s)))
-    s
-    (substring s start end)))
-
-;; string-copy exists in PLT Scheme, so, we'll use that,
-;; hopefully faster implementation.
-;; (define (string-copy s . maybe-start+end)
-;;   (let-string-start+end (start end) string-copy s maybe-start+end
-;;     (substring s start end)))
-
-;; This library uses the R5RS SUBSTRING, but doesn't export it.
-;; Here is a definition, just for completeness.
-;; (define (substring s start end)
-;;   (check-substring-spec substring s start end)
-;;   (let* ((slen (- end start))
-;;          (ans (make-string slen)))
-;;     (do ((i 0 (+ i 1))
-;;          (j start (+ j 1)))
-;;         ((>= i slen) ans)
-;;       (string-set! ans i (string-ref s j)))))
-
-;; Basic iterators and other higher-order abstractions
-;; (string-map proc s [start end])
-;; (string-map! proc s [start end])
-;; (string-fold kons knil s [start end])
-;; (string-fold-right kons knil s [start end])
-;; (string-unfold       p f g seed [base make-final])
-;; (string-unfold-right p f g seed [base make-final])
-;; (string-for-each       proc s [start end])
-;; (string-for-each-index proc s [start end])
-;; (string-every char-set/char/pred s [start end])
-;; (string-any   char-set/char/pred s [start end])
-;; (string-tabulate proc len)
-;;
-;; You want compiler support for high-level transforms on fold and unfold ops.
-;; You'd at least like a lot of inlining for clients of these procedures.
-;; Don't hold your breath.
-
-(define (string-map proc s . maybe-start+end)
-  (check-arg procedure? proc 'string-map)
-  (let-string-start+end (start end) 'string-map s maybe-start+end
-    (%string-map proc s start end)))
-
-(define (%string-map proc s start end) ; Internal utility
-  (let* ((len (- end start))
-         (ans (make-string len)))
-    (do ((i (- end 1) (- i 1))
-         (j (- len 1) (- j 1)))
-        ((< j 0))
-      (string-set! ans j (proc (string-ref s i))))
-    ans))
-
-(define (string-map! proc s . maybe-start+end)
-  (check-arg procedure? proc 'string-map!)
-  (let-string-start+end (start end) 'string-map! s maybe-start+end
-    (%string-map! proc s start end)))
-
-(define (%string-map! proc s start end)
-  (do ((i (- end 1) (- i 1)))
-      ((< i start))
-    (string-set! s i (proc (string-ref s i)))))
-
-(define (string-fold kons knil s . maybe-start+end)
-  (check-arg procedure? kons 'string-fold)
-  (let-string-start+end (start end) 'string-fold s maybe-start+end
-    (let lp ((v knil) (i start))
-      (if (< i end)
-        (lp (kons (string-ref s i) v) (+ i 1))
-        v))))
-
-(define (string-fold-right kons knil s . maybe-start+end)
-  (check-arg procedure? kons 'string-fold-right)
-  (let-string-start+end (start end) 'string-fold-right s maybe-start+end
-    (let lp ((v knil) (i (- end 1)))
-      (if (>= i start)
-        (lp (kons (string-ref s i) v) (- i 1))
-        v))))
-
-;; (string-unfold p f g seed [base make-final])
-;; This is the fundamental constructor for strings.
-;; - G is used to generate a series of "seed" values from the initial seed:
-;;     SEED, (G SEED), (G^2 SEED), (G^3 SEED), ...
-;; - P tells us when to stop -- when it returns true when applied to one
-;;   of these seed values.
-;; - F maps each seed value to the corresponding character
-;;   in the result string. These chars are assembled into the
-;;   string in a left-to-right order.
-;; - BASE is the optional initial/leftmost portion of the constructed string;
-;;   it defaults to the empty string "".
-;; - MAKE-FINAL is applied to the terminal seed value (on which P returns
-;;   true) to produce the final/rightmost portion of the constructed string.
-;;   It defaults to (LAMBDA (X) "").
-;;
-;; In other words, the following (simple, inefficient) definition holds:
-;; (define (string-unfold p f g seed base make-final)
-;;   (string-append base
-;;                  (let recur ((seed seed))
-;;                    (if (p seed) (make-final seed)
-;;                        (string-append (string (f seed))
-;;                                       (recur (g seed)))))))
-;;
-;; STRING-UNFOLD is a fairly powerful constructor -- you can use it to
-;; reverse a string, copy a string, convert a list to a string, read
-;; a port into a string, and so forth. Examples:
-;; (port->string port) =
-;;   (string-unfold (compose eof-object? peek-char)
-;;                  read-char values port)
-;;
-;; (list->string lis) = (string-unfold null? car cdr lis)
-;;
-;; (tabulate-string f size) = (string-unfold (lambda (i) (= i size)) f add1 0)
-
-;; A problem with the following simple formulation is that it pushes one
-;; stack frame for every char in the result string -- an issue if you are
-;; using it to read a 100kchar string. So we don't use it -- but I include
-;; it to give a clear, straightforward description of what the function
-;; does.
-
-;(define (string-unfold p f g seed base make-final)
-;  (let ((ans (let recur ((seed seed) (i (string-length base)))
-;               (if (p seed)
-;                   (let* ((final (make-final seed))
-;                          (ans (make-string (+ i (string-length final)))))
-;                     (string-copy! ans i final)
-;                     ans)
-;
-;                   (let* ((c (f seed))
-;                          (s (recur (g seed) (+ i 1))))
-;                     (string-set! s i c)
-;                     s)))))
-;    (string-copy! ans 0 base)
-;    ans))
-
-;; The strategy is to allocate a series of chunks into which we stash the
-;; chars as we generate them. Chunk size goes up in powers of two starting
-;; with 40 and levelling out at 4k, i.e.
-;;     40 40 80 160 320 640 1280 2560 4096 4096 4096 4096 4096...
-;; This should work pretty well for short strings, 1-line (80 char) strings,
-;; and longer ones. When done, we allocate an answer string and copy the
-;; chars over from the chunk buffers.
-
-(define string-unfold
-  (lambda (p f g seed (base "") (make-final (lambda (x) "")))
-    (check-arg procedure? p 'string-unfold)
-    (check-arg procedure? f 'string-unfold)
-    (check-arg procedure? g 'string-unfold)
-    (check-arg string? base 'string-unfold)
-    (check-arg procedure? make-final 'string-unfold)
-    (let lp ((chunks '())             ; Previously filled chunks
-             (nchars 0)               ; Number of chars in CHUNKS
-             (chunk (make-string 40)) ; Current chunk into which we write
-             (chunk-len 40)
-             (i 0)                    ; Number of chars written into CHUNK
-             (seed seed))
-      (let lp2 ((i i) (seed seed))
-        (if (not (p seed))
-          (let ((c (f seed))
-                (seed (g seed)))
-            (if (< i chunk-len)
-              (begin (string-set! chunk i c)
-                     (lp2 (+ i 1) seed))
-
-              (let* ((nchars2 (+ chunk-len nchars))
-                     (chunk-len2 (min 4096 nchars2))
-                     (new-chunk (make-string chunk-len2)))
-                (string-set! new-chunk 0 c)
-                (lp (cons chunk chunks) (+ nchars chunk-len)
-                    new-chunk chunk-len2 1 seed))))
-
-          ;; We're done. Make the answer string & install the bits.
-          (let* ((final (make-final seed))
-                 (flen (string-length final))
-                 (base-len (string-length base))
-                 (j (+ base-len nchars i))
-                 (ans (make-string (+ j flen))))
-            (%string-copy! ans j final 0 flen) ; Install FINAL.
-            (let ((j (- j i)))
-              (%string-copy! ans j chunk 0 i) ; Install CHUNK[0,I).
-              (let lp ((j j) (chunks chunks)) ; Install CHUNKS.
-                (when (pair? chunks)
-                  (let* ((chunk  (car chunks))
-                         (chunks (cdr chunks))
-                         (chunk-len (string-length chunk))
-                         (j (- j chunk-len)))
-                    (%string-copy! ans j chunk 0 chunk-len)
-                    (lp j chunks)))))
-            (%string-copy! ans 0 base 0 base-len) ; Install BASE.
-            ans))))))
-
-(define string-unfold-right
-  (lambda (p f g seed (base "") (make-final (lambda (x) "")))
-    (check-arg string? base 'string-unfold-right)
-    (check-arg procedure? make-final 'string-unfold-right)
-    (let lp ((chunks '())             ; Previously filled chunks
-             (nchars 0)               ; Number of chars in CHUNKS
-             (chunk (make-string 40)) ; Current chunk into which we write
-             (chunk-len 40)
-             (i 40)                   ; Number of chars available in CHUNK
-             (seed seed))
-      (let lp2 ((i i) (seed seed))    ; Fill up CHUNK from right
-        (if (not (p seed))            ; to left.
-          (let ((c (f seed))
-                (seed (g seed)))
-            (if (> i 0)
-              (let ((i (- i 1)))
-                (string-set! chunk i c)
-                (lp2 i seed))
-
-              (let* ((nchars2 (+ chunk-len nchars))
-                     (chunk-len2 (min 4096 nchars2))
-                     (new-chunk (make-string chunk-len2))
-                     (i (- chunk-len2 1)))
-                (string-set! new-chunk i c)
-                (lp (cons chunk chunks) (+ nchars chunk-len)
-                    new-chunk chunk-len2 i seed))))
-
-          ;; We're done. Make the answer string & install the bits.
-          (let* ((final (make-final seed))
-                 (flen (string-length final))
-                 (base-len (string-length base))
-                 (chunk-used (- chunk-len i))
-                 (j (+ base-len nchars chunk-used))
-                 (ans (make-string (+ j flen))))
-            (%string-copy! ans 0 final 0 flen) ; Install FINAL.
-            (%string-copy! ans flen chunk i chunk-len) ; Install CHUNK[I,).
-            (let lp ((j (+ flen chunk-used)) ; Install CHUNKS.
-                     (chunks chunks))
-              (if (pair? chunks)
-                (let* ((chunk  (car chunks))
-                       (chunks (cdr chunks))
-                       (chunk-len (string-length chunk)))
-                  (%string-copy! ans j chunk 0 chunk-len)
-                  (lp (+ j chunk-len) chunks))
-                (%string-copy! ans j base 0 base-len))) ; Install BASE.
-            ans))))))
-
-
-(define (string-for-each proc s . maybe-start+end)
-  (check-arg procedure? proc 'string-for-each)
-  (let-string-start+end (start end) 'string-for-each s maybe-start+end
-    (let lp ((i start))
-      (when (< i end)
-        (proc (string-ref s i))
-        (lp (+ i 1))))))
-
-(define (string-for-each-index proc s . maybe-start+end)
-  (check-arg procedure? proc 'string-for-each-index)
-  (let-string-start+end (start end) 'string-for-each-index s maybe-start+end
-    (let lp ((i start))
-      (when (< i end) (proc i) (lp (+ i 1))))))
-
-(define (string-every criterion s . maybe-start+end)
-  (let-string-start+end (start end) 'string-every s maybe-start+end
-    (cond ((char? criterion)
-           (let lp ((i start))
-             (or (>= i end)
-                 (and (char=? criterion (string-ref s i))
-                      (lp (+ i 1))))))
-
-          ((char-set? criterion)
-           (let lp ((i start))
-             (or (>= i end)
-                 (and (char-set-contains? criterion (string-ref s i))
-                      (lp (+ i 1))))))
-
-          ((procedure? criterion) ; Slightly funky loop so that
-           (or (= start end) ; final (PRED S[END-1]) call
-               (let lp ((i start)) ; is a tail call.
-                 (let ((c (string-ref s i))
-                       (i1 (+ i 1)))
-                   (if (= i1 end) (criterion c) ; Tail call.
-                       (and (criterion c) (lp i1)))))))
-
-          (else (error 'string-every "Second param is neither char-set, char, or predicate procedure: ~a" criterion)))))
-
-
-(define (string-any criterion s . maybe-start+end)
-  (let-string-start+end (start end) 'string-any s maybe-start+end
-    (cond ((char? criterion)
-           (let lp ((i start))
-             (and (< i end)
-                  (or (char=? criterion (string-ref s i))
-                      (lp (+ i 1))))))
-
-          ((char-set? criterion)
-           (let lp ((i start))
-             (and (< i end)
-                  (or (char-set-contains? criterion (string-ref s i))
-                      (lp (+ i 1))))))
-
-          ((procedure? criterion) ; Slightly funky loop so that
-           (and (< start end) ; final (PRED S[END-1]) call
-                (let lp ((i start)) ; is a tail call.
-                  (let ((c (string-ref s i))
-                        (i1 (+ i 1)))
-                    (if (= i1 end) (criterion c) ; Tail call
-                        (or (criterion c) (lp i1)))))))
-
-          (else (error "Second param is neither char-set, char, or predicate procedure."
-                       string-any criterion)))))
-
-
-(define (string-tabulate proc len)
-  (check-arg procedure? proc 'string-tabulate)
-  (check-arg (lambda (val) (and (integer? val) (exact? val) (<= 0 val)))
-             len 'string-tabulate)
-  (let ((s (make-string len)))
-    (do ((i (- len 1) (- i 1)))
-        ((< i 0))
-      (string-set! s i (proc i)))
-    s))
-
-
-
-;; string-prefix-length[-ci] s1 s2 [start1 end1 start2 end2]
-;; string-suffix-length[-ci] s1 s2 [start1 end1 start2 end2]
-;;
-;; Find the length of the common prefix/suffix.
-;; It is not required that the two substrings passed be of equal length.
-;; This was microcode in MIT Scheme -- a very tightly bummed primitive.
-;; %STRING-PREFIX-LENGTH is the core routine of all string-comparisons,
-;; so should be as tense as possible.
-
-(define (%string-prefix-length s1 start1 end1 s2 start2 end2)
-  (let* ((delta (min (- end1 start1) (- end2 start2)))
-         (end1 (+ start1 delta)))
-
-    (if (and (eq? s1 s2) (= start1 start2)) ; EQ fast path
-      delta
-
-      (let lp ((i start1) (j start2)) ; Regular path
-        (if (or (>= i end1)
-                (not (char=? (string-ref s1 i)
-                             (string-ref s2 j))))
-          (- i start1)
-          (lp (+ i 1) (+ j 1)))))))
-
-(define (%string-suffix-length s1 start1 end1 s2 start2 end2)
-  (let* ((delta (min (- end1 start1) (- end2 start2)))
-         (start1 (- end1 delta)))
-
-    (if (and (eq? s1 s2) (= end1 end2)) ; EQ fast path
-      delta
-
-      (let lp ((i (- end1 1)) (j (- end2 1))) ; Regular path
-        (if (or (< i start1)
-                (not (char=? (string-ref s1 i)
-                             (string-ref s2 j))))
-          (- (- end1 i) 1)
-          (lp (- i 1) (- j 1)))))))
-
-(define (%string-prefix-length-ci s1 start1 end1 s2 start2 end2)
-  (let* ((delta (min (- end1 start1) (- end2 start2)))
-         (end1 (+ start1 delta)))
-
-    (if (and (eq? s1 s2) (= start1 start2)) ; EQ fast path
-      delta
-
-      (let lp ((i start1) (j start2)) ; Regular path
-        (if (or (>= i end1)
-                (not (char-ci=? (string-ref s1 i)
-                                (string-ref s2 j))))
-          (- i start1)
-          (lp (+ i 1) (+ j 1)))))))
-
-(define (%string-suffix-length-ci s1 start1 end1 s2 start2 end2)
-  (let* ((delta (min (- end1 start1) (- end2 start2)))
-         (start1 (- end1 delta)))
-
-    (if (and (eq? s1 s2) (= end1 end2)) ; EQ fast path
-      delta
-
-      (let lp ((i (- end1 1)) (j (- end2 1))) ; Regular path
-        (if (or (< i start1)
-                (not (char-ci=? (string-ref s1 i)
-                                (string-ref s2 j))))
-          (- (- end1 i) 1)
-          (lp (- i 1) (- j 1)))))))
-
-
-(define (string-prefix-length s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-prefix-length s1 s2 maybe-starts+ends
-    (%string-prefix-length s1 start1 end1 s2 start2 end2)))
-
-(define (string-suffix-length s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-suffix-length s1 s2 maybe-starts+ends
-    (%string-suffix-length s1 start1 end1 s2 start2 end2)))
-
-(define (string-prefix-length-ci s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-prefix-length-ci s1 s2 maybe-starts+ends
-    (%string-prefix-length-ci s1 start1 end1 s2 start2 end2)))
-
-(define (string-suffix-length-ci s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-suffix-length-ci s1 s2 maybe-starts+ends
-    (%string-suffix-length-ci s1 start1 end1 s2 start2 end2)))
-
-
-;; string-prefix?    s1 s2 [start1 end1 start2 end2]
-;; string-suffix?    s1 s2 [start1 end1 start2 end2]
-;; string-prefix-ci? s1 s2 [start1 end1 start2 end2]
-;; string-suffix-ci? s1 s2 [start1 end1 start2 end2]
-;;
-;; These are all simple derivatives of the previous counting funs.
-
-(define (string-prefix? s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-prefix? s1 s2 maybe-starts+ends
-    (%string-prefix? s1 start1 end1 s2 start2 end2)))
-
-(define (string-suffix? s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-suffix? s1 s2 maybe-starts+ends
-    (%string-suffix? s1 start1 end1 s2 start2 end2)))
-
-(define (string-prefix-ci? s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-prefix-ci? s1 s2 maybe-starts+ends
-    (%string-prefix-ci? s1 start1 end1 s2 start2 end2)))
-
-(define (string-suffix-ci? s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-suffix-ci? s1 s2 maybe-starts+ends
-    (%string-suffix-ci? s1 start1 end1 s2 start2 end2)))
-
-
-;; Here are the internal routines that do the real work.
-
-(define (%string-prefix? s1 start1 end1 s2 start2 end2)
-  (let ((len1 (- end1 start1)))
-    (and (<= len1 (- end2 start2))    ; Quick check
-         (= (%string-prefix-length s1 start1 end1
-                                   s2 start2 end2)
-            len1))))
-
-(define (%string-suffix? s1 start1 end1 s2 start2 end2)
-  (let ((len1 (- end1 start1)))
-    (and (<= len1 (- end2 start2))    ; Quick check
-         (= len1 (%string-suffix-length s1 start1 end1
-                                        s2 start2 end2)))))
-
-(define (%string-prefix-ci? s1 start1 end1 s2 start2 end2)
-  (let ((len1 (- end1 start1)))
-    (and (<= len1 (- end2 start2))    ; Quick check
-         (= len1 (%string-prefix-length-ci s1 start1 end1
-                                           s2 start2 end2)))))
-
-(define (%string-suffix-ci? s1 start1 end1 s2 start2 end2)
-  (let ((len1 (- end1 start1)))
-    (and (<= len1 (- end2 start2))    ; Quick check
-         (= len1 (%string-suffix-length-ci s1 start1 end1
-                                           s2 start2 end2)))))
-
-
-;; string-compare    s1 s2 proc< proc= proc> [start1 end1 start2 end2]
-;; string-compare-ci s1 s2 proc< proc= proc> [start1 end1 start2 end2]
-;;
-;; Primitive string-comparison functions.
-;; Continuation order is different from MIT Scheme.
-;; Continuations are applied to s1's mismatch index;
-;; in the case of equality, this is END1.
-
-(define (%string-compare s1 start1 end1 s2 start2 end2
-                         proc< proc= proc>)
-  (let ((size1 (- end1 start1))
-        (size2 (- end2 start2)))
-    (let ((match (%string-prefix-length s1 start1 end1 s2 start2 end2)))
-      (if (= match size1)
-        ((if (= match size2) proc= proc<) end1)
-        ((if (= match size2)
-           proc>
-           (if (char<? (string-ref s1 (+ start1 match))
-                       (string-ref s2 (+ start2 match)))
-             proc< proc>))
-         (+ match start1))))))
-
-(define (%string-compare-ci s1 start1 end1 s2 start2 end2
-                            proc< proc= proc>)
-  (let ((size1 (- end1 start1))
-        (size2 (- end2 start2)))
-    (let ((match (%string-prefix-length-ci s1 start1 end1 s2 start2 end2)))
-      (if (= match size1)
-        ((if (= match size2) proc= proc<) end1)
-        ((if (= match size2) proc>
-             (if (char-ci<? (string-ref s1 (+ start1 match))
-                            (string-ref s2 (+ start2 match)))
-               proc< proc>))
-         (+ start1 match))))))
-
-(define (string-compare s1 s2 proc< proc= proc> . maybe-starts+ends)
-  (check-arg procedure? proc< 'string-compare)
-  (check-arg procedure? proc= 'string-compare)
-  (check-arg procedure? proc> 'string-compare)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-compare s1 s2 maybe-starts+ends
-    (%string-compare s1 start1 end1 s2 start2 end2 proc< proc= proc>)))
-
-(define (string-compare-ci s1 s2 proc< proc= proc> . maybe-starts+ends)
-  (check-arg procedure? proc< 'string-compare-ci)
-  (check-arg procedure? proc= 'string-compare-ci)
-  (check-arg procedure? proc> 'string-compare-ci)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-compare-ci s1 s2 maybe-starts+ends
-    (%string-compare-ci s1 start1 end1 s2 start2 end2 proc< proc= proc>)))
-
-
-
-  ;; string=          string<>          string-ci=          string-ci<>
-  ;; string<          string>           string-ci<          string-ci>
-  ;; string<=         string>=          string-ci<=         string-ci>=
-  ;;
-  ;; Simple definitions in terms of the previous comparison funs.
-  ;; I sure hope the %STRING-COMPARE calls get integrated.
-
-(define (string= s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string= s1 s2 maybe-starts+ends
-    (and (= (- end1 start1) (- end2 start2)) ; Quick filter
-         (or (and (eq? s1 s2) (= start1 start2)) ; Fast path
-             (%string-compare s1 start1 end1 s2 start2 end2 ; Real test
-                              (lambda (i) #f)
-                              values
-                              (lambda (i) #f))))))
-
-(define (string<> s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string<> s1 s2 maybe-starts+ends
-    (or (not (= (- end1 start1) (- end2 start2))) ; Fast path
-        (and (not (and (eq? s1 s2) (= start1 start2))) ; Quick filter
-             (%string-compare s1 start1 end1 s2 start2 end2 ; Real test
-                              values
-                              (lambda (i) #f)
-                              values)))))
-
-(define (string< s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string< s1 s2 maybe-starts+ends
-    (if (and (eq? s1 s2) (= start1 start2)) ; Fast path
-      (< end1 end2)
-      (%string-compare s1 start1 end1 s2 start2 end2 ; Real test
-                       values
-                       (lambda (i) #f)
-                       (lambda (i) #f)))))
-
-(define (string> s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string> s1 s2 maybe-starts+ends
-    (if (and (eq? s1 s2) (= start1 start2)) ; Fast path
-      (> end1 end2)
-
-      (%string-compare s1 start1 end1 s2 start2 end2 ; Real test
-                       (lambda (i) #f)
-                       (lambda (i) #f)
-                       values))))
-
-(define (string<= s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string<= s1 s2 maybe-starts+ends
-    (if (and (eq? s1 s2) (= start1 start2)) ; Fast path
-      (<= end1 end2)
-      (%string-compare s1 start1 end1 s2 start2 end2 ; Real test
-                       values
-                       values
-                       (lambda (i) #f)))))
-
-(define (string>= s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string>= s1 s2 maybe-starts+ends
-    (if (and (eq? s1 s2) (= start1 start2)) ; Fast path
-      (>= end1 end2)
-      (%string-compare s1 start1 end1 s2 start2 end2 ; Real test
-                       (lambda (i) #f)
-                       values
-                       values))))
-
-(define (string-ci= s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-ci= s1 s2 maybe-starts+ends
-    (and (= (- end1 start1) (- end2 start2)) ; Quick filter
-         (or (and (eq? s1 s2) (= start1 start2)) ; Fast path
-             (%string-compare-ci s1 start1 end1 s2 start2 end2 ; Real test
-                                 (lambda (i) #f)
-                                 values
-                                 (lambda (i) #f))))))
-
-(define (string-ci<> s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-ci<> s1 s2 maybe-starts+ends
-    (or (not (= (- end1 start1) (- end2 start2))) ; Fast path
-        (and (not (and (eq? s1 s2) (= start1 start2))) ; Quick filter
-             (%string-compare-ci s1 start1 end1 s2 start2 end2 ; Real test
-                                 values
-                                 (lambda (i) #f)
-                                 values)))))
-
-(define (string-ci< s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-ci< s1 s2 maybe-starts+ends
-    (if (and (eq? s1 s2) (= start1 start2)) ; Fast path
-      (< end1 end2)
-      (%string-compare-ci s1 start1 end1 s2 start2 end2 ; Real test
-                          values
-                          (lambda (i) #f)
-                          (lambda (i) #f)))))
-
-(define (string-ci> s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-ci> s1 s2 maybe-starts+ends
-    (if (and (eq? s1 s2) (= start1 start2)) ; Fast path
-      (> end1 end2)
-      (%string-compare-ci s1 start1 end1 s2 start2 end2 ; Real test
-                          (lambda (i) #f)
-                          (lambda (i) #f)
-                          values))))
-
-(define (string-ci<= s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-ci<= s1 s2 maybe-starts+ends
-    (if (and (eq? s1 s2) (= start1 start2)) ; Fast path
-      (<= end1 end2)
-      (%string-compare-ci s1 start1 end1 s2 start2 end2 ; Real test
-                          values
-                          values
-                          (lambda (i) #f)))))
-
-(define (string-ci>= s1 s2 . maybe-starts+ends)
-  (let-string-start+end2 (start1 end1 start2 end2)
-                         'string-ci>= s1 s2 maybe-starts+ends
-    (if (and (eq? s1 s2) (= start1 start2)) ; Fast path
-      (>= end1 end2)
-      (%string-compare-ci s1 start1 end1 s2 start2 end2 ; Real test
-                          (lambda (i) #f)
-                          values
-                          values))))
-
-
-;; Hash
-
-(define string-hash
-  (lambda (s (bound 0) . rest)
-    (check-arg (lambda (x)
-                 (and (integer? x)
-                      (exact? x)
-                      (<= 0 x)))
-               bound 'string-hash)
-    ((lambda (r)
-       (if (zero? bound)
-         r
-         (modulo r bound)))
-     (equal-hash-code
-      (if (null? rest)
-        s
-        (apply substring/shared s rest))))))
-
-(define string-hash-ci
-  (lambda (s (bound 0) . rest)
-    (check-arg (lambda (x)
-                 (and (integer? x)
-                      (exact? x)
-                      (<= 0 x)))
-               bound 'string-hash-ci)
-    ((lambda (r)
-       (if (zero? bound)
-         r
-         (modulo r bound)))
-     (equal-hash-code
-      (string-downcase
-       (if (null? rest)
-         s
-         (apply substring/shared s rest)))))))
-
-;; Case hacking
-;;
-;; string-upcase  s [start end]
-;; string-upcase! s [start end]
-;; string-downcase  s [start end]
-;; string-downcase! s [start end]
-;;
-;; string-titlecase  s [start end]
-;; string-titlecase! s [start end]
-;;   Capitalize every contiguous alpha sequence: capitalise
-;;   first char, lowercase rest.
-
-(define (s:string-upcase  s . maybe-start+end)
-  (let-string-start+end (start end) 'string-upcase s maybe-start+end
-    (%string-map char-upcase s start end)))
-
-(define (string-upcase! s . maybe-start+end)
-  (let-string-start+end (start end) 'string-upcase! s maybe-start+end
-    (%string-map! char-upcase s start end)))
-
-(define (s:string-downcase  s . maybe-start+end)
-  (let-string-start+end (start end) 'string-downcase s maybe-start+end
-    (%string-map char-downcase s start end)))
-
-(define (string-downcase! s . maybe-start+end)
-  (let-string-start+end (start end) 'string-downcase! s maybe-start+end
-    (%string-map! char-downcase s start end)))
-
-(define (char-cased? c)
-  (not (char=? (char-downcase c) (char-upcase c))))
-
-(define (%string-titlecase! s start end)
-  (let lp ((i start))
-    (cond ((string-index s char-cased? i end) =>
-           (lambda (i)
-             (string-set! s i (char-titlecase (string-ref s i)))
-             (let ((i1 (+ i 1)))
-               (cond ((string-skip s char-cased? i1 end) =>
-                      (lambda (j)
-                        (string-downcase! s i1 j)
-                        (lp (+ j 1))))
-                     (else (string-downcase! s i1 end)))))))))
-
-(define (string-titlecase! s . maybe-start+end)
-  (let-string-start+end (start end) 'string-titlecase! s maybe-start+end
-    (%string-titlecase! s start end)))
-
-(define (s:string-titlecase s . maybe-start+end)
-  (let-string-start+end (start end) 'string-titlecase! s maybe-start+end
-    (let ((ans (substring s start end)))
-      (%string-titlecase! ans 0 (- end start))
-      ans)))
-
-
-;; Cutting & pasting strings
-;;
-;; string-take string nchars
-;; string-drop string nchars
-;;
-;; string-take-right string nchars
-;; string-drop-right string nchars
-;;
-;; string-pad string k [char start end]
-;; string-pad-right string k [char start end]
-;;
-;; string-trim       string [char/char-set/pred start end]
-;; string-trim-right string [char/char-set/pred start end]
-;; string-trim-both  string [char/char-set/pred start end]
-;;
-;; These trimmers invert the char-set meaning from MIT Scheme -- you
-;; say what you want to trim.
-
-(define (string-take s n)
-  (check-arg string? s 'string-take)
-  (check-arg (lambda (val) (and (integer? n) (exact? n)
-                                (<= 0 n (string-length s))))
-             n 'string-take)
-  (%substring/shared s 0 n))
-
-(define (string-take-right s n)
-  (check-arg string? s 'string-take-right)
-  (let ((len (string-length s)))
-    (check-arg (lambda (val) (and (integer? n) (exact? n) (<= 0 n len)))
-               n 'string-take-right)
-    (%substring/shared s (- len n) len)))
-
-(define (string-drop s n)
-  (check-arg string? s 'string-drop)
-  (let ((len (string-length s)))
-    (check-arg (lambda (val) (and (integer? n) (exact? n) (<= 0 n len)))
-               n 'string-drop)
-    (%substring/shared s n len)))
-
-(define (string-drop-right s n)
-  (check-arg string? s 'string-drop-right)
-  (let ((len (string-length s)))
-    (check-arg (lambda (val) (and (integer? n) (exact? n) (<= 0 n len)))
-               n 'string-drop-right)
-    (%substring/shared s 0 (- len n))))
-
-
-(define string-trim
-  (lambda (s (criterion char-set:whitespace) . rest)
-    (let-string-start+end (start end) 'string-trim s rest
-      (cond ((string-skip s criterion start end)
-             => (lambda (i) (%substring/shared s i end)))
-            (else "")))))
-
-(define string-trim-right
-  (lambda (s (criterion char-set:whitespace) . rest)
-    (let-string-start+end (start end) 'string-trim-right s rest
-      (cond ((string-skip-right s criterion start end)
-             => (lambda (i) (%substring/shared s 0 (+ 1 i))))
-            (else "")))))
-
-(define string-trim-both
-  (lambda (s (criterion char-set:whitespace) . rest)
-    (let-string-start+end (start end) 'string-trim-both s rest
-      (cond ((string-skip s criterion start end)
-             => (lambda (i)
-                  (%substring/shared s i (+ 1 (string-skip-right s criterion i end)))))
-            (else "")))))
-
-(define string-pad-right
-  (lambda (s n (char #\space) . rest)
-    (check-arg char? char 'string-pad-right)
-    (let-string-start+end (start end) 'string-pad-right s rest
-      (check-arg (lambda (n) (and (integer? n) (exact? n) (<= 0 n)))
-                 n 'string-pad-right)
-      (let ((len (- end start)))
-        (if (<= n len)
-          (%substring/shared s start (+ start n))
-          (let ((ans (make-string n char)))
-            (%string-copy! ans 0 s start end)
-            ans))))))
-
-(define string-pad
-  (lambda (s n (char #\space) . rest)
-    (check-arg char? char 'string-pad)
-    (let-string-start+end (start end) 'string-pad s rest
-      (check-arg (lambda (n) (and (integer? n) (exact? n) (<= 0 n)))
-                 n 'string-pad)
-      (let ((len (- end start)))
-        (if (<= n len)
-          (%substring/shared s (- end n) end)
-          (let ((ans (make-string n char)))
-            (%string-copy! ans (- n len) s start end)
-            ans))))))
-
-
-
-;; Filtering strings
-;;
-;; string-delete char/char-set/pred string [start end]
-;; string-filter char/char-set/pred string [start end]
-;;
-;; If the criterion is a char or char-set, we scan the string twice with
-;;   string-fold -- once to determine the length of the result string,
-;;   and once to do the filtered copy.
-;; If the criterion is a predicate, we don't do this double-scan strategy,
-;;   because the predicate might have side-effects or be very expensive to
-;;   compute. So we preallocate a temp buffer pessimistically, and only do
-;;   one scan over S. This is likely to be faster and more space-efficient
-;;   than consing a list.
-
-(define (string-delete criterion s . maybe-start+end)
-  (let-string-start+end (start end) 'string-delete s maybe-start+end
-    (if (procedure? criterion)
-      (let* ((slen (- end start))
-             (temp (make-string slen))
-             (ans-len (string-fold (lambda (c i)
-                                     (if (criterion c) i
-                                         (begin (string-set! temp i c)
-                                                (+ i 1))))
-                                   0 s start end)))
-        (if (= ans-len slen) temp (substring temp 0 ans-len)))
-
-      (let* ((cset (cond ((char-set? criterion) criterion)
-                         ((char? criterion) (char-set criterion))
-                         (else (error "string-delete criterion not predicate, char or char-set" criterion))))
-             (len (string-fold (lambda (c i)
-                                 (if (char-set-contains? cset c) i (+ i 1)))
-                               0 s start end))
-             (ans (make-string len)))
-        (string-fold (lambda (c i)
-                       (if (char-set-contains? cset c)
-                         i
-                         (begin (string-set! ans i c) (+ i 1))))
-                     0 s start end)
-        ans))))
-
-(define (string-filter criterion s . maybe-start+end)
-  (let-string-start+end (start end) 'string-filter s maybe-start+end
-    (if (procedure? criterion)
-      (let* ((slen (- end start))
-             (temp (make-string slen))
-             (ans-len (string-fold (lambda (c i)
-                                     (if (criterion c)
-                                       (begin (string-set! temp i c)
-                                              (+ i 1))
-                                       i))
-                                   0 s start end)))
-        (if (= ans-len slen) temp (substring temp 0 ans-len)))
-
-      (let* ((cset (cond ((char-set? criterion) criterion)
-                         ((char? criterion) (char-set criterion))
-                         (else (error "string-delete criterion not predicate, char or char-set" criterion))))
-
-             (len (string-fold (lambda (c i)
-                                 (if (char-set-contains? cset c) (+ i 1) i))
-                               0 s start end))
-             (ans (make-string len)))
-        (string-fold (lambda (c i)
-                       (if (char-set-contains? cset c)
-                         (begin (string-set! ans i c) (+ i 1))
-                         i))
-                     0 s start end)
-        ans))))
-
-
-;; String search
-;;
-;; string-index       string char/char-set/pred [start end]
-;; string-index-right string char/char-set/pred [start end]
-;; string-skip        string char/char-set/pred [start end]
-;; string-skip-right  string char/char-set/pred [start end]
-;; string-count       string char/char-set/pred [start end]
-;;     There's a lot of replicated code here for efficiency.
-;;     For example, the char/char-set/pred discrimination has
-;;     been lifted above the inner loop of each proc.
-
-(define (string-index str criterion . maybe-start+end)
-  (let-string-start+end (start end) 'string-index str maybe-start+end
-    (cond ((char? criterion)
-           (let lp ((i start))
-             (and (< i end)
-                  (if (char=? criterion (string-ref str i)) i
-                      (lp (+ i 1))))))
-          ((char-set? criterion)
-           (let lp ((i start))
-             (and (< i end)
-                  (if (char-set-contains? criterion (string-ref str i)) i
-                      (lp (+ i 1))))))
-          ((procedure? criterion)
-           (let lp ((i start))
-             (and (< i end)
-                  (if (criterion (string-ref str i)) i
-                      (lp (+ i 1))))))
-          (else (error "Second param is neither char-set, char, or predicate procedure."
-                       string-index criterion)))))
-
-(define (string-index-right str criterion . maybe-start+end)
-  (let-string-start+end (start end) 'string-index-right str maybe-start+end
-    (cond ((char? criterion)
-           (let lp ((i (- end 1)))
-             (and (>= i start)
-                  (if (char=? criterion (string-ref str i)) i
-                      (lp (- i 1))))))
-          ((char-set? criterion)
-           (let lp ((i (- end 1)))
-             (and (>= i start)
-                  (if (char-set-contains? criterion (string-ref str i)) i
-                      (lp (- i 1))))))
-          ((procedure? criterion)
-           (let lp ((i (- end 1)))
-             (and (>= i start)
-                  (if (criterion (string-ref str i)) i
-                      (lp (- i 1))))))
-          (else (error "Second param is neither char-set, char, or predicate procedure."
-                       string-index-right criterion)))))
-
-(define (string-skip str criterion . maybe-start+end)
-  (let-string-start+end (start end) 'string-skip str maybe-start+end
-    (cond ((char? criterion)
-           (let lp ((i start))
-             (and (< i end)
-                  (if (char=? criterion (string-ref str i))
-                    (lp (+ i 1))
-                    i))))
-          ((char-set? criterion)
-           (let lp ((i start))
-             (and (< i end)
-                  (if (char-set-contains? criterion (string-ref str i))
-                    (lp (+ i 1))
-                    i))))
-          ((procedure? criterion)
-           (let lp ((i start))
-             (and (< i end)
-                  (if (criterion (string-ref str i)) (lp (+ i 1))
-                      i))))
-          (else (error "Second param is neither char-set, char, or predicate procedure."
-                       string-skip criterion)))))
-
-(define (string-skip-right str criterion . maybe-start+end)
-  (let-string-start+end (start end) 'string-skip-right str maybe-start+end
-    (cond ((char? criterion)
-           (let lp ((i (- end 1)))
-             (and (>= i start)
-                  (if (char=? criterion (string-ref str i))
-                    (lp (- i 1))
-                    i))))
-          ((char-set? criterion)
-           (let lp ((i (- end 1)))
-             (and (>= i start)
-                  (if (char-set-contains? criterion (string-ref str i))
-                    (lp (- i 1))
-                    i))))
-          ((procedure? criterion)
-           (let lp ((i (- end 1)))
-             (and (>= i start)
-                  (if (criterion (string-ref str i)) (lp (- i 1))
-                      i))))
-          (else (error "CRITERION param is neither char-set or char."
-                       string-skip-right criterion)))))
-
-
-(define (string-count s criterion . maybe-start+end)
-  (let-string-start+end (start end) 'string-count s maybe-start+end
-    (cond ((char? criterion)
-           (do ((i start (+ i 1))
-                (count 0 (if (char=? criterion (string-ref s i))
-                           (+ count 1)
-                           count)))
-               ((>= i end) count)))
-
-          ((char-set? criterion)
-           (do ((i start (+ i 1))
-                (count 0 (if (char-set-contains? criterion (string-ref s i))
-                           (+ count 1)
-                           count)))
-               ((>= i end) count)))
-
-          ((procedure? criterion)
-           (do ((i start (+ i 1))
-                (count 0 (if (criterion (string-ref s i)) (+ count 1) count)))
-               ((>= i end) count)))
-
-          (else (error "CRITERION param is neither char-set or char."
-                       string-count criterion)))))
-
-
-
-;;
-;; string-fill! string char [start end]
-;;
-;; string-copy! to tstart from [fstart fend]
-;;    Guaranteed to work, even if s1 eq s2.
-
-(define (s:string-fill! s char . maybe-start+end)
-  (check-arg char? char 'string-fill!)
-  (let-string-start+end (start end) 'string-fill! s maybe-start+end
-    (do ((i (- end 1) (- i 1)))
-        ((< i start))
-      (string-set! s i char))))
-
-;; Library-internal routine
-(define (%string-copy! to tstart from fstart fend)
-  (string-copy! to tstart from fstart fend))
-
-
-;; Returns starting-position in STRING or #f if not true.
-;; This implementation is slow & simple. It is useful as a "spec" or for
-;; comparison testing with fancier implementations.
-;; See below for fast KMP version.
-
-;;(define (string-contains string substring . maybe-starts+ends)
-;;  (let-string-start+end2 (start1 end1 start2 end2)
-;;                         'string-contains string substring maybe-starts+ends
-;;    (let* ((len (- end2 start2))
-;;          (i-bound (- end1 len)))
-;;      (let lp ((i start1))
-;;       (and (< i i-bound)
-;;            (if (string= string substring i (+ i len) start2 end2)
-;;                i
-;;                (lp (+ i 1))))))))
-
-
-;; Searching for an occurrence of a substring
-;;
-
-(define (string-contains text pattern . maybe-starts+ends)
-  (let-string-start+end2 (t-start t-end p-start p-end)
-                         'string-contains text pattern maybe-starts+ends
-    (%kmp-search pattern text char=? p-start p-end t-start t-end)))
-
-(define (string-contains-ci text pattern . maybe-starts+ends)
-  (let-string-start+end2 (t-start t-end p-start p-end)
-                         'string-contains-ci text pattern maybe-starts+ends
-    (%kmp-search pattern text char-ci=? p-start p-end t-start t-end)))
-
-
-;; Knuth-Morris-Pratt string searching
-;;
-;; See
-;;     "Fast pattern matching in strings"
-;;     SIAM J. Computing 6(2):323-350 1977
-;;     D. E. Knuth, J. H. Morris and V. R. Pratt
-;; also described in
-;;     "Pattern matching in strings"
-;;     Alfred V. Aho
-;;     Formal Language Theory - Perspectives and Open Problems
-;;     Ronald V. Brook (editor)
-;; This algorithm is O(m + n) where m and n are the
-;; lengths of the pattern and string respectively
-
-;; KMP search source[start,end) for PATTERN. Return starting index of
-;; leftmost match or #f.
-
-(define (%kmp-search pattern text c= p-start p-end t-start t-end)
-  (let ((plen (- p-end p-start))
-        (rv (make-kmp-restart-vector pattern c= p-start p-end)))
-
-    ;; The search loop. TJ & PJ are redundant state.
-    (let lp ((ti t-start) (pi 0)
-             (tj (- t-end t-start)) ; (- tlen ti) -- how many chars left.
-             (pj plen))        ; (- plen pi) -- how many chars left.
-
-      (if (= pi plen)
-        (- ti plen)                 ; Win.
-        (and (<= pj tj)             ; Lose.
-             (if (c= (string-ref text ti) ; Search.
-                     (string-ref pattern (+ p-start pi)))
-               (lp (+ 1 ti) (+ 1 pi) (- tj 1) (- pj 1)) ; Advance.
-
-               (let ((pi (vector-ref rv pi))) ; Retreat.
-                 (if (= pi -1)
-                   (lp (+ ti 1) 0  (- tj 1) plen) ; Punt.
-                   (lp ti       pi tj       (- plen pi))))))))))
-
-;; (make-kmp-restart-vector pattern [c= start end]) -> integer-vector
-;;
-;; Compute the KMP restart vector RV for string PATTERN.  If
-;; we have matched chars 0..i-1 of PATTERN against a search string S, and
-;; PATTERN[i] doesn't match S[k], then reset i := RV[i], and try again to
-;; match S[k].  If RV[i] = -1, then punt S[k] completely, and move on to
-;; S[k+1] and PATTERN[0] -- no possible match of PAT[0..i] contains S[k].
-;;
-;; In other words, if you have matched the first i chars of PATTERN, but
-;; the i+1'th char doesn't match, RV[i] tells you what the next-longest
-;; prefix of PATTERN is that you have matched.
-;;
-;; - C= (default CHAR=?) is used to compare characters for equality.
-;;   Pass in CHAR-CI=? for case-folded string search.
-;;
-;; - START & END restrict the pattern to the indicated substring; the
-;;   returned vector will be of length END - START. The numbers stored
-;;   in the vector will be values in the range [0,END-START) -- that is,
-;;   they are valid indices into the restart vector; you have to add START
-;;   to them to use them as indices into PATTERN.
-;;
-;; I've split this out as a separate function in case other constant-string
-;; searchers might want to use it.
-;;
-;; E.g.:
-;;    a b d  a b x
-;; #(-1 0 0 -1 1 2)
-
-(define (make-kmp-restart-vector pattern . maybe-c=+start+end)
-  (let-optionals* maybe-c=+start+end
-                  ((c= char=? (procedure? c=))
-                   ((start end) (lambda (args)
-                                  (string-parse-start+end make-kmp-restart-vector
-                                                          pattern args))))
-                  (let* ((rvlen (- end start))
-                         (rv (make-vector rvlen -1)))
-                    (when (> rvlen 0)
-                      (let ((rvlen-1 (- rvlen 1))
-                            (c0 (string-ref pattern start)))
-
-                        ;; Here's the main loop. We have set rv[0] ... rv[i].
-                        ;; K = I + START -- it is the corresponding index into PATTERN.
-                        (let lp1 ((i 0) (j -1) (k start))
-                          (when (< i rvlen-1)
-                            ;; lp2 invariant:
-                            ;;   pat[(k-j) .. k-1] matches pat[start .. start+j-1]
-                            ;;   or j = -1.
-                            (let lp2 ((j j))
-                              (cond ((= j -1)
-                                     (let ((i1 (+ 1 i)))
-                                       (when (not (c= (string-ref pattern (+ k 1)) c0))
-                                         (vector-set! rv i1 0))
-                                       (lp1 i1 0 (+ k 1))))
-                                    ;; pat[(k-j) .. k] matches pat[start..start+j].
-                                    ((c= (string-ref pattern k) (string-ref pattern (+ j start)))
-                                     (let* ((i1 (+ 1 i))
-                                            (j1 (+ 1 j)))
-                                       (vector-set! rv i1 j1)
-                                       (lp1 i1 j1 (+ k 1))))
-
-                                    (else (lp2 (vector-ref rv j)))))))))
-                    rv)))
-
-
-;; We've matched I chars from PAT. C is the next char from the search string.
-;; Return the new I after handling C.
-;;
-;; The pattern is (VECTOR-LENGTH RV) chars long, beginning at index PAT-START
-;; in PAT (PAT-START is usually 0). The I chars of the pattern we've matched
-;; are
-;;     PAT[PAT-START .. PAT-START + I].
-;;
-;; It's *not* an oversight that there is no friendly error checking or
-;; defaulting of arguments. This is a low-level, inner-loop procedure
-;; that we want integrated/inlined into the point of call.
-
-(define (kmp-step pat rv c i c= p-start)
-  (let lp ((i i))
-    (if (c= c (string-ref pat (+ i p-start))) ; Match =>
-      (+ i 1)                       ;   Done.
-      (let ((i (vector-ref rv i)))  ; Back up in PAT.
-        (if (= i -1) 0              ; Can't back up further.
-            (lp i))))))             ; Keep trying for match.
-
-;; Zip through S[start,end), looking for a match of PAT. Assume we've
-;; already matched the first I chars of PAT when we commence at S[start].
-;; - <0:  If we find a match *ending* at index J, return -J.
-;; - >=0: If we get to the end of the S[start,end) span without finding
-;;   a complete match, return the number of chars from PAT we'd matched
-;;   when we ran off the end.
-;;
-;; This is useful for searching *across* buffers -- that is, when your
-;; input comes in chunks of text. We hand-integrate the KMP-STEP loop
-;; for speed.
-
-(define string-kmp-partial-search
-  (lambda (pat rv s i (c= char=?) (p-start 0) . start+end)
-    (check-arg procedure? c= 'string-kmp-partial-search)
-    (check-arg vector? rv 'string-kmp-partial-search)
-    (check-arg (lambda (x)
-                 (and (integer? x) (exact? x) (<= 0 x))) p-start 'string-kmp-partial-search)
-
-    (let-values ([(rest s-start s-end) (string-parse-start+end 'string-kmp-partial-search
-                                                               s start+end)])
-      (let ((patlen (vector-length rv)))
-        (check-arg (lambda (i) (and (integer? i) (exact? i) (<= 0 i) (< i patlen)))
-                   i 'string-kmp-partial-search)
-
-        ;; Enough prelude. Here's the actual code.
-        (let lp ((si s-start)         ; An index into S.
-                 (vi i))              ; An index into RV.
-          (cond ((= vi patlen) (- si)) ; Win.
-                ((= si s-end) vi)     ; Ran off the end.
-                (else                 ; Match s[si] & loop.
-                 (let ((c (string-ref s si)))
-                   (lp (+ si 1)
-                       (let lp2 ((vi vi)) ; This is just KMP-STEP.
-                         (if (c= c (string-ref pat (+ vi p-start)))
-                           (+ vi 1)
-                           (let ((vi (vector-ref rv vi)))
-                             (if (= vi -1) 0
-                                 (lp2 vi))))))))))))))
-
-
-;; Misc
-;;
-;; (string-null? s)
-;; (string-reverse  s [start end])
-;; (string-reverse! s [start end])
-;; (reverse-list->string clist)
-;; (s:string->list s [start end])
-
-(define (string-null? s) (zero? (string-length s)))
-
-(define (string-reverse s . maybe-start+end)
-  (let-string-start+end (start end) 'string-reverse s maybe-start+end
-    (let* ((len (- end start))
-           (ans (make-string len)))
-      (do ((i start (+ i 1))
-           (j (- len 1) (- j 1)))
-          ((< j 0))
-        (string-set! ans j (string-ref s i)))
-      ans)))
-
-(define (string-reverse! s . maybe-start+end)
-  (let-string-start+end (start end) 'string-reverse! s maybe-start+end
-    (do ((i (- end 1) (- i 1))
-         (j start (+ j 1)))
-        ((<= i j))
-      (let ((ci (string-ref s i)))
-        (string-set! s i (string-ref s j))
-        (string-set! s j ci)))))
-
-
-(define (reverse-list->string clist)
-  (let* ((len (length clist))
-         (s (make-string len)))
-    (do ((i (- len 1) (- i 1))
-         (clist clist (cdr clist)))
-        ((not (pair? clist)))
-      (string-set! s i (car clist)))
-    s))
-
-
-;; (define (s:string->list s . maybe-start+end)
-;;  (apply string-fold-right cons '() s maybe-start+end))
-
-(define (s:string->list s . maybe-start+end)
-  (let-string-start+end (start end) 'string->list s maybe-start+end
-    (do ((i (- end 1) (- i 1))
-         (ans '() (cons (string-ref s i) ans)))
-        ((< i start) ans))))
-
-;; Defined by R5RS, so commented out here.
-;;(define (list->string lis) (string-unfold null? car cdr lis))
-
-
-;; string-concatenate        string-list -> string
-;; string-concatenate/shared string-list -> string
-;; string-append/shared s ... -> string
-;;
-;; STRING-APPEND/SHARED has license to return a string that shares storage
-;; with any of its arguments. In particular, if there is only one non-empty
-;; string amongst its parameters, it is permitted to return that string as
-;; its result. STRING-APPEND, by contrast, always allocates new storage.
-;;
-;; STRING-CONCATENATE & STRING-CONCATENATE/SHARED are passed a list of
-;; strings, which they concatenate into a result string. STRING-CONCATENATE
-;; always allocates a fresh string; STRING-CONCATENATE/SHARED may (or may
-;; not) return a result that shares storage with any of its arguments. In
-;; particular, if it is applied to a singleton list, it is permitted to
-;; return the car of that list as its value.
-
-(define (string-append/shared . strings) (string-concatenate/shared strings))
-
-(define (string-concatenate/shared strings)
-  (let lp ((strings strings) (nchars 0) (first #f))
-    (cond ((pair? strings)            ; Scan the args, add up total
-           (let* ((string  (car strings)) ; length, remember 1st
-                  (tail (cdr strings)) ; non-empty string.
-                  (slen (string-length string)))
-             (if (zero? slen)
-               (lp tail nchars first)
-               (lp tail (+ nchars slen) (or first strings)))))
-
-          ((zero? nchars) "")
-
-          ;; Just one non-empty string! Return it.
-          ((= nchars (string-length (car first))) (car first))
-
-          (else (let ((ans (make-string nchars)))
-                  (let lp ((strings first) (i 0))
-                    (when (pair? strings)
-                      (let* ((s (car strings))
-                             (slen (string-length s)))
-                        (%string-copy! ans i s 0 slen)
-                        (lp (cdr strings) (+ i slen)))))
-                  ans)))))
-
-
-;; Alas, Scheme 48's APPLY blows up if you have many, many arguments.
-;;(define (string-concatenate strings) (apply string-append strings))
-
-;; Here it is written out. I avoid using REDUCE to add up string lengths
-;; to avoid non-R5RS dependencies.
-(define (string-concatenate strings)
-  (let* ((total (do ((strings strings (cdr strings))
-                     (i 0 (+ i (string-length (car strings)))))
-                    ((not (pair? strings)) i)))
-         (ans (make-string total)))
-    (let lp ((i 0) (strings strings))
-      (when (pair? strings)
-        (let* ((s (car strings))
-               (slen (string-length s)))
-          (%string-copy! ans i s 0 slen)
-          (lp (+ i slen) (cdr strings)))))
-    ans))
-
-
-;; Defined by R5RS, so commented out here.
-;;(define (string-append . strings) (string-concatenate strings))
-
-;; string-concatenate-reverse        string-list [final-string end] -> string
-;; string-concatenate-reverse/shared string-list [final-string end] -> string
-;;
-;; Return
-;;   (string-concatenate
-;;     (reverse
-;;       (cons (substring final-string 0 end) string-list)))
-
-(define string-concatenate-reverse
-  (lambda (string-list (final "") (end (string-length final)))
-    (check-arg string? final 'string-concatenate-reverse)
-    (check-arg (lambda (x)
-                 (and (integer? x) (exact? x) (<= 0 x (string-length final))))
-               end 'string-concatenate-reverse)
-    (let ((len (let lp ((sum 0) (lis string-list))
-                 (if (pair? lis)
-                   (lp (+ sum (string-length (car lis))) (cdr lis))
-                   sum))))
-
-      (%finish-string-concatenate-reverse len string-list final end))))
-
-(define string-concatenate-reverse/shared
-  (lambda (string-list (final "") (end (string-length final)))
-    (check-arg string? final 'string-concatenate-reverse/shared)
-    (check-arg (lambda (x)
-                 (and (integer? x) (exact? x) (<= 0 x (string-length final))))
-               end 'string-concatenate-reverse/shared)
-    ;; Add up the lengths of all the strings in STRING-LIST; also get a
-    ;; pointer NZLIST into STRING-LIST showing where the first non-zero-length
-    ;; string starts.
-    (let lp ((len 0) (nzlist #f) (lis string-list))
-      (if (pair? lis)
-        (let ((slen (string-length (car lis))))
-          (lp (+ len slen)
-              (if (or nzlist (zero? slen)) nzlist lis)
-              (cdr lis)))
-
-        (cond ((zero? len) (substring/shared final 0 end))
-
-              ;; LEN > 0, so NZLIST is non-empty.
-
-              ((and (zero? end) (= len (string-length (car nzlist))))
-               (car nzlist))
-
-              (else (%finish-string-concatenate-reverse len nzlist final end)))))))
-
-(define (%finish-string-concatenate-reverse len string-list final end)
-  (let ((ans (make-string (+ end len))))
-    (%string-copy! ans len final 0 end)
-    (let lp ((i len) (lis string-list))
-      (when (pair? lis)
-        (let* ((s   (car lis))
-               (lis (cdr lis))
-               (slen (string-length s))
-               (i (- i slen)))
-          (%string-copy! ans i s 0 slen)
-          (lp i lis))))
-    ans))
-
-
-
-
-;; string-replace s1 s2 start1 end1 [start2 end2] -> string
-;;
-;; Replace S1[START1,END1) with S2[START2,END2).
-
-(define (string-replace s1 s2 start1 end1 . maybe-start+end)
-  (check-substring-spec string-replace s1 start1 end1)
-  (let-string-start+end (start2 end2) 'string-replace s2 maybe-start+end
-    (let* ((slen1 (string-length s1))
-           (sublen2 (- end2 start2))
-           (alen (+ (- slen1 (- end1 start1)) sublen2))
-           (ans (make-string alen)))
-      (%string-copy! ans 0 s1 0 start1)
-      (%string-copy! ans start1 s2 start2 end2)
-      (%string-copy! ans (+ start1 sublen2) s1 end1 slen1)
-      ans)))
-
-
-;; string-tokenize s [token-set start end] -> list
-;;
-;; Break S up into a list of token strings, where a token is a maximal
-;; non-empty contiguous sequence of chars belonging to TOKEN-SET.
-;; (string-tokenize "hello, world") => ("hello," "world")
-
-(define string-tokenize
-  (lambda (s (token-chars char-set:graphic) . rest)
-    (check-arg char-set? token-chars 'string-tokenize)
-    (let-string-start+end (start end) 'string-tokenize s rest
-      (let lp ((i end) (ans '()))
-        (cond ((and (< start i) (string-index-right s token-chars start i)) =>
-               (lambda (tend-1)
-                 (let ((tend (+ 1 tend-1)))
-                   (cond ((string-skip-right s token-chars start tend-1) =>
-                          (lambda (tstart-1)
-                            (lp tstart-1
-                                (cons (substring s (+ 1 tstart-1) tend)
-                                      ans))))
-                         (else (cons (substring s start tend) ans))))))
-              (else ans))))))
-
-
-;; xsubstring s from [to start end] -> string
-;;
-;; S is a string; START and END are optional arguments that demarcate
-;; a substring of S, defaulting to 0 and the length of S (e.g., the whole
-;; string). Replicate this substring up and down index space, in both the
-;;  positive and negative directions. For example, if S = "abcdefg", START=3,
-;; and END=6, then we have the conceptual bidirectionally-infinite string
-;;     ...  d  e  f  d  e  f  d  e  f  d  e  f  d  e  f  d  e  f  d  e  f ...
-;;     ... -9 -8 -7 -6 -5 -4 -3 -2 -1  0  1  2  3  4  5  6  7  8  9 ...
-;; XSUBSTRING returns the substring of this string beginning at index FROM,
-;; and ending at TO (which defaults to FROM+(END-START)).
-;;
-;; You can use XSUBSTRING in many ways:
-;; - To rotate a string left:  (xsubstring "abcdef" 2)  => "cdefab"
-;; - To rotate a string right: (xsubstring "abcdef" -2) => "efabcd"
-;; - To replicate a string:    (xsubstring "abc" 0 7) => "abcabca"
-;;
-;; Note that
-;;   - The FROM/TO indices give a half-open range -- the characters from
-;;     index FROM up to, but not including index TO.
-;;   - The FROM/TO indices are not in terms of the index space for string S.
-;;     They are in terms of the replicated index space of the substring
-;;     defined by S, START, and END.
-;;
-;; It is an error if START=END -- although this is allowed by special
-;; dispensation when FROM=TO.
-
-(define (xsubstring s from . maybe-to+start+end)
-  (check-arg (lambda (val) (and (integer? val) (exact? val)))
-             from 'xsubstring)
-  (receive (to start end)
-           (if (pair? maybe-to+start+end)
-             (let-string-start+end (start end) 'xsubstring s (cdr maybe-to+start+end)
-               (let ((to (car maybe-to+start+end)))
-                 (check-arg (lambda (val)
-                              (and (integer? val)
-                                   (exact? val)
-                                   (<= from val)))
-                            to 'xsubstring)
-                 (values to start end)))
-             (let ((slen (string-length (check-arg string? s 'xsubstring))))
-               (values (+ from slen) 0 slen)))
-    (let ((slen   (- end start))
-          (anslen (- to  from)))
-      (cond ((zero? anslen) "")
-            ((zero? slen) (error xsubstring "Cannot replicate empty (sub)string ~a ~a ~a ~a ~a" s from to start end))
-
-            ((= 1 slen)        ; Fast path for 1-char replication.
-             (make-string anslen (string-ref s start)))
-
-            ;; Selected text falls entirely within one span.
-            ((= (floor (/ from slen)) (floor (/ to slen)))
-             (substring s (+ start (modulo from slen))
-                        (+ start (modulo to   slen))))
-
-            ;; Selected text requires multiple spans.
-            (else (let ((ans (make-string anslen)))
-                    (%multispan-repcopy! ans 0 s from to start end)
-                    ans))))))
-
-
-;; string-xcopy! target tstart s sfrom [sto start end] -> unspecific
-;;
-;; Exactly the same as xsubstring, but the extracted text is written
-;; into the string TARGET starting at index TSTART.
-;; This operation is not defined if (EQ? TARGET S) -- you cannot copy
-;; a string on top of itself.
-
-(define (string-xcopy! target tstart s sfrom . maybe-sto+start+end)
-  (check-arg (lambda (val) (and (integer? val) (exact? val)))
-             sfrom 'string-xcopy!)
-  (receive (sto start end)
-           (if (pair? maybe-sto+start+end)
-             (let-string-start+end (start end) 'string-xcopy! s (cdr maybe-sto+start+end)
-               (let ((sto (car maybe-sto+start+end)))
-                 (check-arg (lambda (val) (and (integer? val) (exact? val)))
-                            sto 'string-xcopy!)
-                 (values sto start end)))
-             (let ((slen (string-length s)))
-               (values (+ sfrom slen) 0 slen)))
-
-    (let* ((tocopy (- sto sfrom))
-           (tend (+ tstart tocopy))
-           (slen (- end start)))
-      (check-substring-spec string-xcopy! target tstart tend)
-      (cond ((zero? tocopy))
-            ((zero? slen) (error 'string-xcopy! "Cannot replicate empty (sub)string: ~a ~a ~a ~a ~a ~a ~a" target tstart s sfrom sto start end))
-
-            ((= 1 slen)        ; Fast path for 1-char replication.
-             (s:string-fill! target (string-ref s start) tstart tend))
-
-            ;; Selected text falls entirely within one span.
-            ((= (floor (/ sfrom slen)) (floor (/ sto slen)))
-             (%string-copy! target tstart s
-                            (+ start (modulo sfrom slen))
-                            (+ start (modulo sto   slen))))
-
-            ;; Multi-span copy.
-            (else (%multispan-repcopy! target tstart s sfrom sto start end))))))
-
-;; This is the core copying loop for XSUBSTRING and STRING-XCOPY!
-;; Internal -- not exported, no careful arg checking.
-(define (%multispan-repcopy! target tstart s sfrom sto start end)
-  (let* ((slen (- end start))
-         (i0 (+ start (modulo sfrom slen)))
-         (total-chars (- sto sfrom)))
-
-    ;; Copy the partial span @ the beginning
-    (%string-copy! target tstart s i0 end)
-
-    (let* ((ncopied (- end i0))       ; We've copied this many.
-           (nleft (- total-chars ncopied)) ; # chars left to copy.
-           (nspans (quotient nleft slen))) ; # whole spans to copy
-
-      ;; Copy the whole spans in the middle.
-      (do ((i (+ tstart ncopied) (+ i slen)) ; Current target index.
-           (nspans nspans (- nspans 1))) ; # spans to copy
-          ((zero? nspans)
-           ;; Copy the partial-span @ the end & we're done.
-           (%string-copy! target i s start (+ start (- total-chars (- i tstart)))))
-
-        (%string-copy! target i s start end))))) ; Copy a whole span.
-
-
-
-;; (string-join string-list [delimiter grammar]) => string
-;;
-;; Paste strings together using the delimiter string.
-;;
-;; (string-join '("foo" "bar" "baz") ":") => "foo:bar:baz"
-;;
-;; DELIMITER defaults to a single space " "
-;; GRAMMAR is one of the symbols {prefix, infix, strict-infix, suffix}
-;; and defaults to 'infix.
-;;
-;; I could rewrite this more efficiently -- precompute the length of the
-;; answer string, then allocate & fill it in iteratively. Using
-;; STRING-CONCATENATE is less efficient.
-
-(define string-join
-  (lambda (strings (delim " ") (grammar 'infix))
-    (check-arg string? delim 'string-join)
-    (let ((buildit (lambda (lis final)
-                     (let recur ((lis lis))
-                       (if (pair? lis)
-                         (cons delim (cons (car lis) (recur (cdr lis))))
-                         final)))))
-
-      (cond ((pair? strings)
-             (string-concatenate
-              (case grammar
-
-                ((infix strict-infix)
-                 (cons (car strings) (buildit (cdr strings) '())))
-
-                ((prefix) (buildit strings '()))
-
-                ((suffix)
-                 (cons (car strings) (buildit (cdr strings) (list delim))))
-
-                (else (error "Illegal join grammar"
-                             grammar string-join)))))
-
-            ((not (null? strings))
-             (error "STRINGS parameter not list." strings string-join))
-
-            ;; STRINGS is ()
-
-            ((eq? grammar 'strict-infix)
-             (error "Empty list cannot be joined with STRICT-INFIX grammar."
-                    string-join))
-
-            (else "")))))             ; Special-cased for infix grammar.
-
-;; string.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/14.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/14.rkt
deleted file mode 100644
index 4243e90364..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/14.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-14
-#lang s-exp srfi/provider srfi/14/char-set
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/14/char-set.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/14/char-set.rkt
deleted file mode 100644
index e3df219a72..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/14/char-set.rkt
+++ /dev/null
@@ -1,457 +0,0 @@
-;; Since Matthew implemented this module, tests are in
-;;  collects/tests/racket/char-set.rktl.
-;; Since Mike Sperber looked carefully at this module,
-;;  the code and tests are a lot better than they would be.
-
-(module char-set racket/base
-  (require data/integer-set
-           racket/contract)
-
-  ;; Data defn ----------------------------------------
-
-  (define-struct char-set (set/thunk) #:mutable)
-
-  (define (fold-set op init l)
-    (if (null? l)
-        init
-        (fold-set op (op init (car l)) (cdr l))))
-
-  (define (char-set-set cs)
-    (let ([v (char-set-set/thunk cs)])
-      (if (procedure? v)
-          (let ([v2 (v)])
-            (set-char-set-set/thunk! cs v2)
-            v2)
-          v)))
-
-  ;; General procedures ----------------------------------------
-  
-  (define char-set=
-    (case-lambda
-     [() #t]
-     [(cs) #t]
-     [(cs1 cs2) (equal? (integer-set-contents (char-set-set cs1))
-                        (integer-set-contents (char-set-set cs2)))]
-     [(cs1 . rest) (fold-set (lambda (v cs) (and v (char-set= cs1 cs))) #t rest)]))
-  
-  (define char-set<=
-    (case-lambda
-     [() #t]
-     [(cs) #t]
-     [(cs1 cs2) (subset? (char-set-set cs1) (char-set-set cs2))]
-     [(cs1 . rest) (and (fold-set (lambda (cs1 cs) (and cs1 (char-set<= cs1 cs) cs)) cs1 rest) #t)]))
-  
-  (define char-set-hash
-    (case-lambda
-     [(cs)
-      (abs (equal-hash-code (char-set-set cs)))]
-     [(cs bound)
-      (modulo (char-set-hash cs) bound)]))
-
-  ;; Iterating over character sets ----------------------------------------
-
-  ;; A cursor is (cons num (list-of (cons start-num end-num)))
-  ;;  where the first num indicates how far we are into the
-  ;;; first range of the cdr of the cursor.
-
-  (define (char-set-cursor cs)
-    (cons 0 (integer-set-contents (char-set-set cs))))
-
-  (define (char-set-ref cs c)
-    (integer->char (+ (car c) (caadr c))))
-
-  (define (char-set-cursor-next cs c)
-    (let ([d (- (cdadr c) (caadr c))])
-      (if (= d (car c))
-          (cons 0 (cddr c))
-          (cons (add1 (car c)) (cdr c)))))
-
-  (define (end-of-char-set? c)
-    (null? (cdr c)))
-
-  (define (char-set-fold/done kons knil cs done?)
-    (let loop ([v knil][l (integer-set-contents (char-set-set cs))])
-      (if (null? l)
-          v
-          (let ([end (cdar l)])
-            (let iloop ([v v][i (caar l)])
-              (if (i . > . end)
-                  (loop v (cdr l))
-                  (let ([v (kons (integer->char i) v)])
-                    (if (done? v)
-                        v
-                        (iloop v (add1 i))))))))))
-
-  (define (char-set-fold kons knil cs)
-    (char-set-fold/done kons knil cs (lambda (x) #f)))
-
-  (define char-set-unfold
-    (case-lambda
-     [(p f g seed) (char-set-unfold p f g seed char-set:empty)]
-     [(p f g seed base-cs)
-      ;; Implementation taken directly from SRFI-14:
-      (let lp ((seed seed) (cs base-cs))
-        (if (p seed) 
-            cs ; P says we are done.
-            (lp (g seed) ; Loop on (G SEED).
-                (char-set-adjoin! cs (f seed)))))]))
-
-  (define (char-set-unfold! p f g seed base-cs)
-    (char-set-unfold p f g seed base-cs))
-  
-  (define (char-set-for-each proc cs)
-    (char-set-fold (lambda (c v) (proc c)) (void) cs))
-
-  (define (char-set-map proc cs)
-    ;; Note: no order defined on cs traversal, so it doesn't
-    ;;  matter that we build up the list backward
-    (char-set-fold (lambda (c v) (char-set-adjoin v (proc c))) char-set:empty cs))
-
-
-  ;; Creating character sets ----------------------------------------
-
-  (define (char-set-copy cs) 
-    ;; Our char sets are purely functional:
-    cs)
-
-  (define mk-char-set
-    (let ([char-set (lambda more
-                      (list->char-set more char-set:empty))])
-      char-set))
-
-  (define list->char-set 
-    (case-lambda
-     [(l) (list->char-set l char-set:empty)]
-     [(l cs) (fold-set char-set-adjoin cs l)]))
-  (define (list->char-set! l cs)
-    (list->char-set l cs))
-
-  (define string->char-set
-    (case-lambda
-     [(s) (string->char-set s char-set:empty)]
-     [(s cs) (list->char-set (string->list s) cs)]))
-  (define (string->char-set! s cs)
-    (string->char-set s cs))
-
-  (define char-set-filter
-    (case-lambda
-     [(pred cs) (char-set-filter pred cs char-set:empty)]
-     [(pred cs base-cs)
-      (char-set-fold (lambda (c v) (if (pred c)
-                                       (char-set-adjoin v c)
-                                       v))
-                     base-cs
-                     cs)]))
-  (define (char-set-filter! pred cs base-cs)
-    (char-set-filter pred cs base-cs))
-
-  (define ucs-range->char-set
-    (case-lambda
-     [(lower upper) (ucs-range->char-set lower upper #f char-set:empty)]
-     [(lower upper error?) (ucs-range->char-set lower upper error? char-set:empty)]
-     [(lower upper error? cs)
-      (when (or (lower . < . 0)
-                (upper . > . #x110000)
-                (lower . >= . upper))
-        (raise (make-exn:fail:contract
-                (format "ucs-range->char-set: invalid range: [~a, ~a)" lower upper)
-                (current-continuation-marks))))
-      (char-set-union cs
-                      (cond
-                       [(and (upper . <= . #xE000)
-                             (lower . >= . #xD800))
-                        ;; Completely in the hole
-                        char-set:empty]
-                       [(upper . <= . #xE000)
-                        ;; Below the hole
-                        (make-char-set (make-integer-set (list (cons lower (sub1 (min #xD800 upper))))))]
-                       [(lower . >= . #xD800)
-                        ;; Above the hole
-                        (make-char-set (make-integer-set (list (cons (max #xE000 lower) (sub1 upper)))))]
-                       [else
-                        ;; Spans the hole:
-                        (make-char-set (make-integer-set (list (cons lower #xD7FF)
-                                                               (cons #xE000 (sub1 upper)))))]))]))
-  (define (ucs-range->char-set! lower upper error? base-cs)
-    (ucs-range->char-set lower upper error? base-cs))
-
-  (define (->char-set x)
-    (cond
-     [(char? x) (let ([v (char->integer x)])
-                  (make-char-set (make-integer-set (list (cons v v)))))]
-     [(string? x) (string->char-set x)]
-     [(char-set? x) x]
-     [else (raise-type-error '->char-set "character, string, or char-set" x)]))
-
-  ;; Querying character sets ----------------------------------------
-
-  (define (char-set-size cs)
-    (let loop ([l (integer-set-contents (char-set-set cs))][c 0])
-      (if (null? l)
-          c
-          (loop (cdr l) (+ c 1 (- (cdar l) (caar l)))))))
-
-  (define (char-set-count pred cs)
-    (char-set-fold (lambda (c v)
-                     (+ v (if (pred c) 1 0)))
-                   0
-                   cs))
-
-  (define (char-set->list cs)
-    (char-set-fold cons null cs))
-
-  (define (char-set->string cs)
-    (list->string (char-set->list cs)))
-
-  (define (char-set-contains? cs char)
-    (member? (char->integer char) (char-set-set cs)))
-  
-  (define (char-set-every pred cs)
-    (char-set-fold/done (lambda (c v)
-                          (and v
-                               (pred c)))
-                        #t
-                        cs
-                        not))
-
-  (define (char-set-any pred cs)
-    (char-set-fold/done (lambda (c v)
-                          (or v
-                              (pred c)))
-                        #f
-                        cs
-                        values))
-  
-  ;; Character-set algebra ----------------------------------------
-
-  (define char-set-adjoin
-    (case-lambda
-     [(cs char1) 
-      (let ([v (char->integer char1)])
-        (make-char-set (union (char-set-set cs)
-                              (make-integer-set (list (cons v v))))))]
-     [(cs . more)
-      (fold-set char-set-adjoin cs more)]))
-
-  (define char-set-delete 
-    (case-lambda
-     [(cs char1) 
-      (let ([v (char->integer char1)])
-        (make-char-set (subtract (char-set-set cs)
-                                 (make-integer-set (list (cons v v))))))]
-     [(cs . more)
-      (fold-set char-set-delete cs more)]))
-
-   (define (char-set-complement cs)
-     (make-char-set
-      (subtract (complement (char-set-set cs) 0 #x10FFFF)
-                (make-range #xD800 #xDFFF))))
-
-  (define-syntax define-set-op
-    (syntax-rules ()
-      [(_ char-set-op set-op neutral)
-       (define char-set-op
-         (case-lambda
-          [(cs1 cs2)
-           (make-char-set (set-op (char-set-set cs1) (char-set-set cs2)))]
-          [()
-           neutral]
-          [(cs1 . more)
-           (fold-set char-set-op cs1 more)]))]))
-
-  (define-set-op char-set-union union char-set:empty)
-  (define-set-op char-set-intersection intersect char-set:full)
-  (define char-set-difference
-    (case-lambda
-     [(cs1 cs2)
-      (make-char-set (subtract (char-set-set cs1) (char-set-set cs2)))]
-     [(cs1 . more)
-      (fold-set char-set-difference cs1 more)]))
-  (define-set-op char-set-xor symmetric-difference char-set:empty)
-
-  (define char-set-diff+intersection
-    (case-lambda
-      [(cs)
-       (values (char-set-difference cs)
-               (char-set-intersection cs (char-set-union)))]
-      [(cs1 cs2)
-       (let-values ([(cs1^cs2 cs1-cs2 cs2-cs1) (split (char-set-set cs1) (char-set-set cs2))])
-         (values (make-char-set cs1-cs2)
-                 (make-char-set cs1^cs2)))]
-      [(cs1 cs2 . more)
-       (let-values ([(d i) (char-set-diff+intersection cs1 cs2)])
-         (values (apply char-set-difference d more)
-                 (apply char-set-intersection i more)))]))
-
-  (define char-set-adjoin! char-set-adjoin)
-  (define char-set-delete! char-set-delete)
-  (define char-set-complement! char-set-complement)
-  (define char-set-union! char-set-union)
-  (define char-set-intersection! char-set-intersection)
-  (define char-set-difference! char-set-difference)
-  (define char-set-xor! char-set-xor)
-  (define char-set-diff+intersection! char-set-diff+intersection)
-
-  ;; ----------------------------------------
-
-  ;; Racket provides a rough map to unicode:
-  (define unicode (make-known-char-range-list))
-
-  (define (make-standard-set pred?)
-    (make-char-set
-     (lambda ()
-       (make-integer-set
-        (let loop ([l unicode])
-          (cond
-           [(null? l) null]
-           [(caddar l) 
-            ;; Every char in this range has the same properites
-            (if (pred? (integer->char (caar l)))
-                (cons (cons (caar l) (cadar l)) (loop (cdr l)))
-                (loop (cdr l)))]
-           [else
-            ;; Check char-by-char:
-            (let ([end (cadar l)])
-              (let no-loop ([v (caar l)])
-                (cond
-                 [(v . > . end)
-                  ;; None in this range
-                  (loop (cdr l))]
-                 [(pred? (integer->char v))
-                  ;; Found a char in this range
-                  (let yes-loop ([v2 (add1 v)])
-                    (cond
-                     [(v2 . > . end)
-                      ;; Went to end
-                      (cons (cons v (sub1 v2)) (loop (cdr l)))]
-                     [(pred? (integer->char v2))
-                      (yes-loop (add1 v2))]
-                     [else
-                      ;; Found end of sub-range; treat the rest
-                      ;;  of this range as a new range
-                      (cons (cons v (sub1 v2))
-                            (loop (cons (list v2 end #f) (cdr l))))]))]
-                 [else
-                  ;; Still looking for a char in this range
-                  (no-loop (add1 v))])))]))))))
-
-  (define char-set:lower-case
-    (make-standard-set char-lower-case?))
-  (define char-set:upper-case
-    (make-standard-set char-upper-case?))
-  (define char-set:title-case
-    (make-standard-set char-title-case?))
-  (define char-set:letter
-    (make-standard-set char-alphabetic?))
-  (define char-set:digit
-    (make-standard-set char-numeric?))
-  (define char-set:letter+digit
-    (char-set-union char-set:letter char-set:digit))
-  (define char-set:graphic
-    (make-standard-set char-graphic?))
-  (define char-set:whitespace
-    (make-standard-set char-whitespace?))
-  (define char-set:printing
-    (char-set-union char-set:whitespace char-set:graphic))
-  (define char-set:iso-control
-    (make-standard-set char-iso-control?))
-  (define char-set:punctuation
-    (make-standard-set char-punctuation?))
-  (define char-set:symbol
-    (make-standard-set char-symbolic?))
-  (define char-set:blank
-    (make-standard-set char-blank?))
-  (define char-set:ascii
-    (make-char-set (make-integer-set '((0 . 127)))))
-  (define char-set:hex-digit
-    (make-char-set (make-integer-set '((48 . 57) (65 . 70) (97 . 102)))))
-  (define char-set:empty
-    (make-char-set (make-integer-set '())))
-  (define char-set:full
-    (make-char-set (make-integer-set '((#x0 . #xD7FF) (#xE000 . #x10FFFF)))))
-
-  
-
-  ;; Contracts and provides ----------------------------------------
-
-  (define char-sets0/c
-    (->* () #:rest (listof char-set?) any))
-
-  (define char-sets/c
-    (->* (char-set?) #:rest (listof char-set?) any))
-
-  (define char-sets+/c
-    (->* (char-set? char-set?) #:rest (listof char-set?) any))
-
-  (define ei/c (and/c number? integer? exact?))
-
-  (define char-set-char/c
-    (->* (char-set?) #:rest (listof char?) char-set?))
-
-  (provide
-   char-set?)
-  (provide/contract
-   [char-set= char-sets0/c]
-   [char-set<= char-sets0/c]
-   [char-set-hash (->* (char-set?) (integer?) integer?)]
-   [char-set-cursor (char-set? . -> . any)]
-   [char-set-ref (char-set? any/c . -> . char?)]
-   [char-set-cursor-next (char-set? any/c . -> . any)]
-   [end-of-char-set? (any/c . -> . boolean?)]
-   [char-set-fold ((char? any/c . -> . any) any/c char-set? . -> . any)]
-   [char-set-unfold (->* ((any/c . -> . any) (any/c . -> . char?) (any/c . -> . any) any/c) (char-set?)  char-set?)]
-   [char-set-unfold! ((any/c . -> . any) (any/c . -> . char?) (any/c . -> . any) any/c char-set? . -> . char-set?)]
-   [char-set-for-each ((char? . -> . any) char-set? . -> . any)]
-   [char-set-map ((char? . -> . any) char-set? . -> . char-set?)]
-   [char-set-copy (char-set? . -> . char-set?)]
-   [rename mk-char-set char-set (->* () #:rest (listof char?) char-set?)]
-   [list->char-set (->* ((listof char?)) (char-set?) char-set?)]
-   [list->char-set! ((listof char?) char-set? . -> . char-set?)]
-   [string->char-set (->* (string?) (char-set?) char-set?)]
-   [string->char-set! (string? char-set? . -> . char-set?)]
-   [char-set-filter (->* ((char? . -> . any) char-set?) (char-set?) char-set?)]
-   [char-set-filter! ((char? . -> . any) char-set? char-set? . -> . char-set?)]
-   [ucs-range->char-set (->* (ei/c ei/c) (any/c char-set?) char-set?)]
-   [ucs-range->char-set! (ei/c ei/c any/c char-set? . -> . char-set?)]
-   [->char-set ((or/c string? char? char-set?) . -> . char-set?)]
-   [char-set->list (char-set? . -> . any)]
-   [char-set->string (char-set? . -> . any)]
-   [char-set-size (char-set? . -> . any)]
-   [char-set-count ((char? . -> . any) char-set? . -> . any)]
-   [char-set-contains? (char-set? char? . -> . any)]
-   [char-set-every ((char? . -> . any) char-set? . -> . any)]
-   [char-set-any ((char? . -> . any) char-set? . -> . any)]
-   [char-set-adjoin char-set-char/c]
-   [char-set-adjoin! char-set-char/c]
-   [char-set-delete char-set-char/c]
-   [char-set-delete! char-set-char/c]
-   [char-set-complement (char-set? . -> . char-set?)]
-   [char-set-complement! (char-set? . -> . char-set?)]
-   [char-set-union char-sets0/c]
-   [char-set-union! char-sets/c]
-   [char-set-intersection char-sets0/c]
-   [char-set-intersection! char-sets0/c]
-   [char-set-difference char-sets/c]
-   [char-set-difference! char-sets/c]
-   [char-set-xor char-sets0/c]
-   [char-set-xor! char-sets/c]
-   [char-set-diff+intersection char-sets/c]
-   [char-set-diff+intersection! char-sets/c])
-  (provide
-   char-set:lower-case
-   char-set:upper-case
-   char-set:title-case
-   char-set:letter
-   char-set:digit
-   char-set:letter+digit
-   char-set:graphic
-   char-set:printing
-   char-set:whitespace
-   char-set:iso-control
-   char-set:punctuation
-   char-set:symbol
-   char-set:hex-digit
-   char-set:blank
-   char-set:ascii
-   char-set:empty
-   char-set:full))
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/19.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/19.rkt
deleted file mode 100644
index 14adca90b4..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/19.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-19
-#lang s-exp srfi/provider srfi/19/time #:unprefix srfi:
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/19/time.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/19/time.rkt
deleted file mode 100644
index 78c7565d50..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/19/time.rkt
+++ /dev/null
@@ -1,1592 +0,0 @@
-#lang racket/base
-
-;;;
-;;; <time.ss> ---- SRFI 19 Time Data Types and Procedures port to Racket
-;;; Time-stamp: <2004-07-21 12:57:06 solsona>
-;;;
-;;; Usually, I would add a copyright notice, and the announce that
-;;; this code is under the LGPL licence.  Nevertheless, I only did the
-;;; port to PLT Scheme v200, and here is the copyright notice,
-;;; comments, and licence from the original source:
-
-;;; Based on a corrected version by Will F. Feb/2003
-
-;; SRFI-19: Time Data Types and Procedures.
-;;
-;; Copyright (C) I/NET, Inc. (2000, 2002, 2003). All Rights Reserved.
-;;
-;; Permission is hereby granted, free of charge, to any person obtaining
-;; a copy of this software and associated documentation files (the
-;; "Software"), to deal in the Software without restriction, including
-;; without limitation the rights to use, copy, modify, merge, publish,
-;; distribute, sublicense, and/or sell copies of the Software, and to
-;; permit persons to whom the Software is furnished to do so, subject to
-;; the following conditions:
-;;
-;; The above copyright notice and this permission notice shall be
-;; included in all copies or substantial portions of the Software.
-;;
-;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-;; LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-;; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-;; -- Racket implementation
-;;
-;; The only Racket specific features of this implementation is
-;; CURRENT-SECONDS, the DEFINE-STRUCT procedure (SRFI 9: Defining Record Types
-;; could be used), and the constants tm:time-at-zero-seconds
-;; and tm:julian-day-at-zero-seconds, which refer to the '0' of CURRENT-SECONDS.
-;;
-;; SRFI-6, String Ports, and SRFI-8, RECEIVE: Binding Multiple Values,
-;; are also used. Racket has String Ports built-in. The RECEIVE form
-;; is copied below.
-;;
-; srfi-8: receive
-;(require-library "synrule.rkt") -- PLT doesn't like DEFINE-SYNTAX.
-
-;(define-syntax receive
-;  (syntax-rules ()
-;    ((receive formals expression body ...)
-;     (call-with-values (lambda () expression)
-;                       (lambda formals body ...)))))
-
-;; -- Multiple helper procedures. TM:xxx procedures are meant to be
-;; internal.
-
-(require racket/serialize
-         srfi/8/receive
-         srfi/29
-         srfi/optional)
-
-(provide time-tai time-utc time-monotonic time-thread time-process time-duration time-gc
-         current-date current-julian-day current-modified-julian-day current-time time-resolution
-         ;; Time object and accessors
-         make-time time? time-type time-nanosecond
-         deserialize-info:tm:time-v0
-         time-second set-time-type! set-time-nanosecond! set-time-second!
-         copy-time
-         ;; Time comparison
-         time<=? time<? time=? time>=? time>?
-         ;; Time arithmetic
-         time-difference time-difference! add-duration add-duration! subtract-duration subtract-duration!
-         ;; Date object and accessors
-         ;; date structure is provided by core Racket, we just extended tu support miliseconds:
-         srfi:make-date srfi:date? lax-date?
-         deserialize-info:tm:date-v0
-         date-nanosecond srfi:date-second srfi:date-minute srfi:date-hour srfi:date-day srfi:date-month
-         srfi:date-year date-zone-offset
-         ;; This are not part of the date structure (as they are in the original Racket's date)
-         srfi:date-year-day srfi:date-week-day date-week-number
-
-         ;; The following procedures work with this modified version.
-
-         ;; Time/Date/Julian Day/Modified Julian Day Converters
-         date->julian-day date->modified-julian-day date->time-monotonic date->time-tai date->time-utc
-         julian-day->date julian-day->time-monotonic julian-day->time-tai julian-day->time-utc modified-julian-day->date
-         modified-julian-day->time-monotonic modified-julian-day->time-tai modified-julian-day->time-utc time-monotonic->date
-         time-monotonic->julian-day time-monotonic->modified-julian-day time-monotonic->time-tai time-monotonic->time-tai!
-         time-monotonic->time-utc time-monotonic->time-utc! time-tai->date time-tai->julian-day time-tai->modified-julian-day
-         time-tai->time-monotonic time-tai->time-monotonic! time-tai->time-utc time-tai->time-utc! time-utc->date
-         time-utc->julian-day time-utc->modified-julian-day time-utc->time-monotonic time-utc->time-monotonic!
-         time-utc->time-tai time-utc->time-tai!
-         ;; Date to String/String to Date Converters
-         date->string string->date
-         )
-
-(define localized? #f)
-(define localized-message
-  (lambda (message-name)
-    (unless localized?
-      ;; SRFI-29: Localization initialization:
-      (re-read-locale)
-      (or (load-bundle! (list* 'srfi-19
-                               (current-language)
-                               (current-country)
-                               (current-locale-details)))
-          ;; A little bit less specific
-          (load-bundle! (list 'srfi-19
-                              (current-language)
-                              (current-country)))
-          ;; less specific
-          (load-bundle! (list 'srfi-19 (current-language)))
-          ;; the least specific one (this one *does* exist!, it comes with this srfi) don't worry:
-          (load-bundle! (list 'srfi-19)))
-      (set! localized? #t))
-
-    (localized-template 'srfi-19 message-name)))
-
-;; Constants
-(define time-tai 'time-tai)
-(define time-utc 'time-utc)
-(define time-monotonic 'time-monotonic)
-(define time-thread 'time-thread)
-(define time-process 'time-process)
-(define time-duration 'time-duration)
-
-;; example of extension (Racket specific)
-(define time-gc 'time-gc)
-
-
-;;-- LOCALE dependent constants
-
-(define tm:locale-number-separator 'separator)
-
-(define tm:locale-abbr-weekday-vector (vector 'sun 'mon 'tue 'wed 'thu 'fri 'sat))
-(define tm:locale-long-weekday-vector (vector 'sunday 'monday 'tuesday 'wednesday
-                                              'thursday 'friday 'saturday))
-;; note empty string in 0th place.
-(define tm:locale-abbr-month-vector   (vector 'jan 'feb 'mar
-                                              'apr 'may 'jun 'jul
-                                              'aug 'sep 'oct 'nov
-                                              'dec))
-
-(define tm:locale-long-month-vector   (vector 'january 'february
-                                              'march 'april 'may
-                                              'june 'july 'august
-                                              'september 'october
-                                              'november 'december))
-
-(define tm:locale-pm 'pm)
-(define tm:locale-am 'am)
-
-;; See date->string
-(define tm:locale-date-time-format 'date-time)
-(define tm:locale-short-date-format 'date)
-(define tm:locale-time-format 'time)
-(define tm:iso-8601-date-time-format 'iso8601)
-;;-- Miscellaneous Constants.
-;;-- only the tm:tai-epoch-in-jd might need changing if
-;;   a different epoch is used.
-
-(define tm:nano (expt 10 9))
-(define tm:sid  86400)          ; seconds in a day
-(define tm:sihd 43200)          ; seconds in a half day
-(define tm:tai-epoch-in-jd 4881175/2) ; julian day number for 'the epoch'
-
-;; A Very simple Error system for the time procedures
-;;
-(define tm:time-error-types
-  '(invalid-clock-type
-    unsupported-clock-type
-    incompatible-time-types
-    not-duration
-    dates-are-immutable
-    bad-date-format-string
-    bad-date-template-string
-    invalid-month-specification
-    ))
-
-(define (tm:time-error caller type value)
-  (if (member type tm:time-error-types)
-      (if value
-          (error caller "TIME-ERROR type ~S: ~S" type value)
-          (error caller "TIME-ERROR type ~S" type))
-      (error caller "TIME-ERROR unsupported error type ~S" type)))
-
-;; A table of leap seconds
-;; See ftp://maia.usno.navy.mil/ser7/tai-utc.dat
-;; and update as necessary.
-;; this procedures reads the file in the abover
-;; format and creates the leap second table
-;; it also calls the almost standard, but not R5 procedures read-line
-;; & open-input-string
-;; ie (set! tm:leap-second-table (tm:read-tai-utc-date "tai-utc.dat"))
-
-(define (tm:read-tai-utc-data filename)
-  (define (convert-jd jd)
-    (* (- (inexact->exact jd) tm:tai-epoch-in-jd) tm:sid))
-  (define (convert-sec sec)
-    (inexact->exact sec))
-  (let ( (port (open-input-file filename))
-         (table '()) )
-    (let loop ((line (read-line port)))
-      (unless (eq? line eof)
-        (let* ( (data (read (open-input-string (string-append "(" line ")"))))
-                (year (car data))
-                (jd   (cadddr (cdr data)))
-                (secs (cadddr (cdddr data))) )
-          (when (>= year 1972)
-            (set! table (cons (cons (convert-jd jd) (convert-sec secs)) table)))
-          (loop (read-line port)))))
-    table))
-
-;; each entry is ( utc seconds since epoch . # seconds to add for tai )
-;; note they go higher to lower, and end in 1972.
-;;
-;; up-to-date as of 2013-01-18
-(define tm:leap-second-table
-  '((1341100800 . 35) ; 2012-07-01
-    (1230768000 . 34) ; 2009-01-01
-    (1136073600 . 33) ; 2006-01-01
-    (915148800  . 32) ; 1999-01-01
-    (867715200  . 31) ; 1997-07-01
-    (820454400  . 30) ; 1996-01-01
-    (773020800  . 29) ; 1994-07-01
-    (741484800  . 28) ; 1993-07-01
-    (709948800  . 27) ; 1992-07-01
-    (662688000  . 26) ; 1991-01-01
-    (631152000  . 25) ; 1990-01-01
-    (567993600  . 24) ; 1988-01-01
-    (489024000  . 23) ; 1985-07-01
-    (425865600  . 22) ; 1983-07-01
-    (394329600  . 21) ; 1982-07-01
-    (362793600  . 20) ; 1981-07-01
-    (315532800  . 19) ; 1980-01-01
-    (283996800  . 18) ; 1979-01-01
-    (252460800  . 17) ; 1978-01-01
-    (220924800  . 16) ; 1977-01-01
-    (189302400  . 15) ; 1976-01-01
-    (157766400  . 14) ; 1975-01-01
-    (126230400  . 13) ; 1974-01-01
-    (94694400   . 12) ; 1973-01-01
-    (78796800   . 11) ; 1972-07-01
-    (63072000   . 10) ; 1972-01-01
-    ))
-
-(define (read-leap-second-table filename)
-  (set! tm:leap-second-table (tm:read-tai-utc-data filename))
-  (values))
-
-
-(define (tm:leap-second-delta utc-seconds)
-  (letrec ( (lsd (lambda (table)
-                   (cond ((>= utc-seconds (caar table))
-                          (cdar table))
-                         (else (lsd (cdr table)))))) )
-    (if (< utc-seconds  (* (- 1972 1970) 365 tm:sid)) 0
-        (lsd  tm:leap-second-table))))
-
-;; going from tai seconds to utc seconds ...
-(define (tm:leap-second-neg-delta tai-seconds)
-  (letrec ( (lsd (lambda (table)
-                   (cond ((null? table) 0)
-                         ((<= (cdar table) (- tai-seconds (caar table)))
-                          (cdar table))
-                         (else (lsd (cdr table)))))) )
-    (if (< tai-seconds  (* (- 1972 1970) 365 tm:sid)) 0
-        (lsd  tm:leap-second-table))))
-
-(define-values (tm:time make-time time? tm:time-ref tm:time-set!)
-  (make-struct-type
-   'tm:time #f 3 0 #f
-   (list (cons prop:serializable
-               (make-serialize-info
-                (lambda (t)
-                  (vector (time-type t)
-                          (time-nanosecond t)
-                          (time-second t)))
-                #'deserialize-info:tm:time-v0
-                #f
-                (or (current-load-relative-directory)
-                    (current-directory)))))
-   (make-inspector) #f null))
-
-(define deserialize-info:tm:time-v0
-  (make-deserialize-info
-   make-time
-   (lambda ()
-     (let ([t0 (make-time #f #f #f)])
-       (values t0 (lambda (t1)
-                    (set-time-type!       t0 (time-type t1))
-                    (set-time-nanosecond! t0 (time-nanosecond t1))
-                    (set-time-second!     t0 (time-second t1))))))))
-
-(define (time-type t)       (tm:time-ref t 0))
-(define (time-nanosecond t) (tm:time-ref t 1))
-(define (time-second t)     (tm:time-ref t 2))
-
-(define (set-time-type! t type)     (tm:time-set! t 0 type))
-(define (set-time-nanosecond! t ns) (tm:time-set! t 1 ns))
-(define (set-time-second! t s)      (tm:time-set! t 2 s))
-
-(define (copy-time time)
-  (let ((ntime (make-time #f #f #f)))
-    (set-time-type! ntime (time-type time))
-    (set-time-second! ntime (time-second time))
-    (set-time-nanosecond! ntime (time-nanosecond time))
-    ntime))
-
-
-;;; specific time getters.
-;;; These should be rewritten to be OS specific.
-;;
-;; -- using GNU gettimeofday() would be useful here -- gets
-;;    second + millisecond
-;;    let's pretend we do, using Racket's current-seconds & current-milliseconds
-;;    this is supposed to return UTC.
-;;
-
-(define (tm:get-time-of-day)
-  (let* ((total-msecs (inexact->exact (floor (current-inexact-milliseconds)))))
-    (quotient/remainder total-msecs 1000)))
-
-(define (tm:current-time-utc)
-  (receive (seconds ms) (tm:get-time-of-day)
-           (make-time  time-utc (* ms 1000000) seconds)))
-
-(define (tm:current-time-tai)
-  (receive (seconds ms) (tm:get-time-of-day)
-           (make-time time-tai
-                      (* ms 1000000)
-                      (+ seconds (tm:leap-second-delta seconds))
-                      )))
-
-(define (tm:current-time-ms-time time-type proc)
-  (let ((current-ms (proc)))
-    (make-time time-type
-               (* (remainder current-ms 1000) 1000000)
-               (quotient current-ms 1000000)
-               )))
-
-;; -- we define it to be the same as TAI.
-;;    A different implemation of current-time-montonic
-;;    will require rewriting all of the time-monotonic converters,
-;;    of course.
-
-(define (tm:current-time-monotonic)
-  (receive (seconds ms) (tm:get-time-of-day)
-           (make-time time-monotonic
-                      (* ms 1000000)
-                      (+ seconds (tm:leap-second-delta seconds))
-                      )))
-
-(define (tm:current-time-thread)
-  (tm:current-time-ms-time time-process current-process-milliseconds))
-
-(define (tm:current-time-process)
-  (tm:current-time-ms-time time-process current-process-milliseconds))
-
-(define (tm:current-time-gc)
-  (tm:current-time-ms-time time-gc current-gc-milliseconds))
-
-(define (current-time [clock-type time-utc])
-  (cond
-    ((eq? clock-type time-tai) (tm:current-time-tai))
-    ((eq? clock-type time-utc) (tm:current-time-utc))
-    ((eq? clock-type time-monotonic) (tm:current-time-monotonic))
-    ((eq? clock-type time-thread) (tm:current-time-thread))
-    ((eq? clock-type time-process) (tm:current-time-process))
-    ((eq? clock-type time-gc) (tm:current-time-gc))
-    (else (tm:time-error 'current-time 'invalid-clock-type clock-type))))
-
-
-;; -- Time Resolution
-;; This is the resolution of the clock in nanoseconds.
-;; This will be implementation specific.
-
-(define (time-resolution [clock-type time-utc])
-  (cond
-    ((eq? clock-type time-tai) 1000000)
-    ((eq? clock-type time-utc) 1000000)
-    ((eq? clock-type time-monotonic) 1000000)
-    ((eq? clock-type time-thread) 1000000)
-    ((eq? clock-type time-process) 1000000)
-    ((eq? clock-type time-gc) 1000000)
-    (else (tm:time-error 'time-resolution 'invalid-clock-type clock-type))))
-
-(define (tm:time-compare-check time1 time2 caller)
-  (if (or (not (and (time? time1) (time? time2)))
-          (not (eq? (time-type time1) (time-type time2))))
-      (tm:time-error caller 'incompatible-time-types #f)
-      #t))
-
-(define (time=? time1 time2)
-  (tm:time-compare-check time1 time2 'time=?)
-  (and (= (time-second time1) (time-second time2))
-       (= (time-nanosecond time1) (time-nanosecond time2))))
-
-(define (time>? time1 time2)
-  (tm:time-compare-check time1 time2 'time>?)
-  (or (> (time-second time1) (time-second time2))
-      (and (= (time-second time1) (time-second time2))
-           (> (time-nanosecond time1) (time-nanosecond time2)))))
-
-(define (time<? time1 time2)
-  (tm:time-compare-check time1 time2 'time<?)
-  (or (< (time-second time1) (time-second time2))
-      (and (= (time-second time1) (time-second time2))
-           (< (time-nanosecond time1) (time-nanosecond time2)))))
-
-(define (time>=? time1 time2)
-  (tm:time-compare-check time1 time2 'time>=?)
-  (or (> (time-second time1) (time-second time2))
-      (and (= (time-second time1) (time-second time2))
-           (>= (time-nanosecond time1) (time-nanosecond time2)))))
-
-(define (time<=? time1 time2)
-  (tm:time-compare-check time1 time2 'time<=?)
-  (or (< (time-second time1) (time-second time2))
-      (and (= (time-second time1) (time-second time2))
-           (<= (time-nanosecond time1) (time-nanosecond time2)))))
-
-;; -- Time arithmetic
-(define (tm:time->nanoseconds time)
-  (define (sign1 n)
-    (if (negative? n) -1 1))
-  (+ (* (time-second time) tm:nano)
-     (time-nanosecond time)))
-
-(define (tm:nanoseconds->time time-type nanoseconds)
-  (make-time time-type
-             (remainder nanoseconds tm:nano)
-             (quotient nanoseconds tm:nano)))
-
-(define (tm:nanoseconds->values nanoseconds)
-  (values (abs (remainder nanoseconds tm:nano))
-          (quotient nanoseconds tm:nano)))
-
-(define (tm:time-difference time1 time2 time3)
-  (when (or (not (and (time? time1) (time? time2)))
-            (not (eq? (time-type time1) (time-type time2))))
-    (tm:time-error 'time-difference 'incompatible-time-types #f))
-  (set-time-type! time3 time-duration)
-  (if (time=? time1 time2)
-      (begin
-        (set-time-second! time3 0)
-        (set-time-nanosecond! time3 0))
-      (receive
-       (nanos secs)
-       (tm:nanoseconds->values (- (tm:time->nanoseconds time1)
-                                  (tm:time->nanoseconds time2)))
-       (set-time-second! time3 secs)
-       (set-time-nanosecond! time3 nanos)))
-  time3)
-
-(define (time-difference time1 time2)
-  (tm:time-difference time1 time2 (make-time #f #f #f)))
-
-(define (time-difference! time1 time2)
-  (tm:time-difference time1 time2 time1))
-
-(define (tm:add-duration time1 duration time3)
-  (unless (and (time? time1) (time? duration))
-    (tm:time-error 'add-duration 'incompatible-time-types #f))
-  (if (not (eq? (time-type duration) time-duration))
-      (tm:time-error 'add-duration 'not-duration duration)
-      (let ( (sec-plus (+ (time-second time1) (time-second duration)))
-             (nsec-plus (+ (time-nanosecond time1) (time-nanosecond duration))) )
-        (let ((r (remainder nsec-plus tm:nano))
-              (q (quotient nsec-plus tm:nano)))
-          ; (set-time-type! time3 (time-type time1))
-          (if (negative? r)
-              (begin
-                (set-time-second! time3 (+ sec-plus q -1))
-                (set-time-nanosecond! time3 (+ tm:nano r)))
-              (begin
-                (set-time-second! time3 (+ sec-plus q))
-                (set-time-nanosecond! time3 r)))
-          time3))))
-
-(define (add-duration time1 duration)
-  (tm:add-duration time1 duration (make-time (time-type time1) #f #f)))
-
-(define (add-duration! time1 duration)
-  (tm:add-duration time1 duration time1))
-
-(define (tm:subtract-duration time1 duration time3)
-  (unless (and (time? time1) (time? duration))
-    (tm:time-error 'add-duration 'incompatible-time-types #f))
-  (if (not (eq? (time-type duration) time-duration))
-      (tm:time-error 'tm:subtract-duration 'not-duration duration)
-      (let ( (sec-minus  (- (time-second time1) (time-second duration)))
-             (nsec-minus (- (time-nanosecond time1) (time-nanosecond duration))) )
-        (let ((r (remainder nsec-minus tm:nano))
-              (q (quotient nsec-minus tm:nano)))
-          (if (negative? r)
-              (begin
-                (set-time-second! time3 (- sec-minus q 1))
-                (set-time-nanosecond! time3 (+ tm:nano r)))
-              (begin
-                (set-time-second! time3 (- sec-minus q))
-                (set-time-nanosecond! time3 r)))
-          time3))))
-
-(define (subtract-duration time1 duration)
-  (tm:subtract-duration time1 duration (make-time (time-type time1) #f #f)))
-
-(define (subtract-duration! time1 duration)
-  (tm:subtract-duration time1 duration time1))
-
-
-;; -- Converters between types.
-
-(define (tm:time-tai->time-utc! time-in time-out caller)
-  (unless (eq? (time-type time-in) time-tai)
-    (tm:time-error caller 'incompatible-time-types time-in))
-  (set-time-type! time-out time-utc)
-  (set-time-nanosecond! time-out (time-nanosecond time-in))
-  (set-time-second!     time-out (- (time-second time-in)
-                                    (tm:leap-second-neg-delta
-                                     (time-second time-in))))
-  time-out)
-
-(define (time-tai->time-utc time-in)
-  (tm:time-tai->time-utc! time-in (make-time #f #f #f) 'time-tai->time-utc))
-
-
-(define (time-tai->time-utc! time-in)
-  (tm:time-tai->time-utc! time-in time-in 'time-tai->time-utc!))
-
-
-(define (tm:time-utc->time-tai! time-in time-out caller)
-  (unless (eq? (time-type time-in) time-utc)
-    (tm:time-error caller 'incompatible-time-types time-in))
-  (set-time-type! time-out time-tai)
-  (set-time-nanosecond! time-out (time-nanosecond time-in))
-  (set-time-second!     time-out (+ (time-second time-in)
-                                    (tm:leap-second-delta
-                                     (time-second time-in))))
-  time-out)
-
-
-(define (time-utc->time-tai time-in)
-  (tm:time-utc->time-tai! time-in (make-time #f #f #f) 'time-utc->time-tai))
-
-(define (time-utc->time-tai! time-in)
-  (tm:time-utc->time-tai! time-in time-in 'time-utc->time-tai!))
-
-;; -- these depend on time-monotonic having the same definition as time-tai!
-(define (time-monotonic->time-utc time-in)
-  (unless (eq? (time-type time-in) time-monotonic)
-    (tm:time-error 'time-monotoinc->time-utc 'incompatible-time-types time-in))
-  (let ((ntime (copy-time time-in)))
-    (set-time-type! ntime time-tai)
-    (tm:time-tai->time-utc! ntime ntime 'time-monotonic->time-utc)))
-
-(define (time-monotonic->time-utc! time-in)
-  (unless (eq? (time-type time-in) time-monotonic)
-    (tm:time-error 'time-monotonic->time-utc! 'incompatible-time-types time-in))
-  (set-time-type! time-in time-tai)
-  (tm:time-tai->time-utc! time-in time-in 'time-monotonic->time-utc))
-
-(define (time-monotonic->time-tai time-in)
-  (unless (eq? (time-type time-in) time-monotonic)
-    (tm:time-error 'time-monotonic->time-tai 'incompatible-time-types time-in))
-  (let ((ntime (copy-time time-in)))
-    (set-time-type! ntime time-tai)
-    ntime))
-
-(define (time-monotonic->time-tai! time-in)
-  (unless (eq? (time-type time-in) time-monotonic)
-    (tm:time-error 'time-monotonic->time-tai! 'incompatible-time-types time-in))
-  (set-time-type! time-in time-tai)
-  time-in)
-
-(define (time-utc->time-monotonic time-in)
-  (unless (eq? (time-type time-in) time-utc)
-    (tm:time-error 'time-utc->time-monotonic 'incompatible-time-types time-in))
-  (let ((ntime (tm:time-utc->time-tai! time-in (make-time #f #f #f)
-                                       'time-utc->time-monotonic)))
-    (set-time-type! ntime time-monotonic)
-    ntime))
-
-
-(define (time-utc->time-monotonic! time-in)
-  (unless (eq? (time-type time-in) time-utc)
-    (tm:time-error 'time-utc->time-montonic! 'incompatible-time-types time-in))
-  (let ((ntime (tm:time-utc->time-tai! time-in time-in
-                                       'time-utc->time-monotonic!)))
-    (set-time-type! ntime time-monotonic)
-    ntime))
-
-
-(define (time-tai->time-monotonic time-in)
-  (unless (eq? (time-type time-in) time-tai)
-    (tm:time-error 'time-tai->time-monotonic 'incompatible-time-types time-in))
-  (let ((ntime (copy-time time-in)))
-    (set-time-type! ntime time-monotonic)
-    ntime))
-
-(define (time-tai->time-monotonic! time-in)
-  (unless (eq? (time-type time-in) time-tai)
-    (tm:time-error 'time-tai->time-monotonic!  'incompatible-time-types time-in))
-  (set-time-type! time-in time-monotonic)
-  time-in)
-
-;; -- Date Structures
-
-;; These identifiers originally referred to a separate date type,
-;; but they now use Racket's native date type
-(define (srfi:make-date nanosecond second minute
-                        hour day month
-                        year zone-offset)
-  (with-handlers ([exn:fail:contract?
-                   (lambda (e)
-                     (lax-date nanosecond second minute hour
-                               day month year zone-offset))])
-    (date* second minute hour
-           day month year
-           ;; compute derived fields
-           (tm:week-day day month year)
-           ;; date* and srfi/19 are off-by-1 on year day
-           (- (tm:year-day day month year) 1)
-           #f
-           zone-offset
-           nanosecond
-           "")))
-
-;; A struct type that emulates the old srfi/19 type
-;; This is lax about its contents, unlike date*
-(struct lax-date (nanosecond second minute
-                  hour day month
-                  year zone-offset)
-        #:transparent)
-
-;; Try to convert srfi-19 date to date*
-(define (lax-date->date* date)
-  (srfi:make-date (lax-date-nanosecond date)
-                  (lax-date-second date)
-                  (lax-date-minute date)
-                  (lax-date-hour date)
-                  (lax-date-day date)
-                  (lax-date-month date)
-                  (lax-date-year date)
-                  (lax-date-zone-offset date)))
-
-;; Predicate for dates
-(define (srfi:date? d)
-  (or (lax-date? d) (date? d)))
-
-;; Racket's date structure has the following:
-;;   * second : 0 to 61 (60 and 61 are for unusual leap-seconds)
-;;   * minute : 0 to 59
-;;   * hour : 0 to 23
-;;   * day : 1 to 31
-;;   * month : 1 to 12
-;;   * year : e.g., 1996
-;;   * week-day : 0 (Sunday) to 6 (Saturday)
-;;   * year-day : 0 to 365 (364 in non-leap years)
-;;   * dst? : #t (daylight savings time) or #f
-;;   * time-zone-offset : the number of seconds east of GMT for this time zone (e.g., Pacific Standard Time is -28800), an exact integer 36
-
-;; These accessors work over either style of date
-(define-syntax-rule (define-date-accessor accessor srfi-19-accessor date-accessor)
-  (define (accessor d)
-    (if (lax-date? d)
-        (srfi-19-accessor d)
-        (date-accessor d))))
-
-(define-date-accessor date-nanosecond lax-date-nanosecond date*-nanosecond)
-(define-date-accessor srfi:date-second lax-date-second date-second)
-(define-date-accessor srfi:date-minute lax-date-minute date-minute)
-(define-date-accessor srfi:date-hour lax-date-hour date-hour)
-(define-date-accessor srfi:date-day lax-date-day date-day)
-(define-date-accessor srfi:date-month lax-date-month date-month)
-(define-date-accessor srfi:date-year lax-date-year date-year)
-(define-date-accessor date-zone-offset
-  lax-date-zone-offset date-time-zone-offset)
-
-;; Serialization support for old srfi-19 structs
-(define deserialize-info:tm:date-v0
-  (make-deserialize-info
-   srfi:make-date
-   (lambda ()
-     (error 'deserialize-info:tm:date-v0 "cycles not allowed"))))
-
-;; gives the julian day which starts at noon.
-(define (tm:encode-julian-day-number day month year)
-  (let* ((a (quotient (- 14 month) 12))
-         (y (- (+ year 4800) a (if (negative? year) -1  0)))
-         (m (- (+ month (* 12 a)) 3)))
-    (+ day
-       (quotient (+ (* 153 m) 2) 5)
-       (* 365 y)
-       (quotient y 4)
-       (- (quotient y 100))
-       (quotient y 400)
-       -32045)))
-
-(define (tm:char-pos char str index len)
-  (cond
-    ((>= index len) #f)
-    ((char=? (string-ref str index) char)
-     index)
-    (else
-     (tm:char-pos char str (+ index 1) len))))
-
-; return a string representing the decimal expansion of the fractional
-; portion of a number, limited by a specified precision
-(define (tm:decimal-expansion r precision)
-  (let loop ([num (- r (round r))]
-             [p precision])
-    (if (or (= p 0) (= num 0))
-        ""
-        (let* ([num-times-10 (* 10 num)]
-               [round-num-times-10 (round num-times-10)])
-          (string-append (number->string (inexact->exact round-num-times-10))
-                         (loop (- num-times-10 round-num-times-10) (- p 1)))))))
-
-;; gives the seconds/date/month/year
-(define (tm:decode-julian-day-number jdn)
-  (let* ((days (truncate jdn))
-         (a (+ days 32044))
-         (b (quotient (+ (* 4 a) 3) 146097))
-         (c (- a (quotient (* 146097 b) 4)))
-         (d (quotient (+ (* 4 c) 3) 1461))
-         (e (- c (quotient (* 1461 d) 4)))
-         (m (quotient (+ (* 5 e) 2) 153))
-         (y (+ (* 100 b) d -4800 (quotient m 10))))
-    (values ; seconds date month year
-     (* (- jdn days) tm:sid)
-     (+ e (- (quotient (+ (* 153 m) 2) 5)) 1)
-     (+ m 3 (* -12 (quotient m 10)))
-     (if (>= 0 y) (- y 1) y))
-    ))
-
-;; relies on the fact that we named our time zone accessor
-;; differently from Racket's....
-;; This should be written to be OS specific.
-(define (tm:local-tz-offset)
-  (date-time-zone-offset (seconds->date (current-seconds))))
-
-;; special thing -- ignores nanos
-(define (tm:time->julian-day-number seconds tz-offset)
-  (+ (/ (+ seconds
-           tz-offset
-           tm:sihd)
-        tm:sid)
-     tm:tai-epoch-in-jd))
-
-(define (tm:find proc l)
-  (if (null? l)
-      #f
-      (if (proc (car l))
-          #t
-          (tm:find proc (cdr l)))))
-
-(define (tm:tai-before-leap-second? second)
-  (tm:find (lambda (x)
-             (= second (- (+ (car x) (cdr x)) 1)))
-           tm:leap-second-table))
-
-(define (tm:time->date time tz-offset ttype)
-  (unless (eq? (time-type time) ttype)
-    (tm:time-error 'time->date 'incompatible-time-types  time))
-  (let* ( (offset (:optional tz-offset (tm:local-tz-offset))) )
-    (receive (secs date month year)
-             (tm:decode-julian-day-number
-              (tm:time->julian-day-number (time-second time) offset))
-             (let* ( (hours    (quotient secs (* 60 60)))
-                     (rem      (remainder secs (* 60 60)))
-                     (minutes  (quotient rem 60))
-                     (seconds  (remainder rem 60)) )
-               (srfi:make-date (time-nanosecond time)
-                               seconds
-                               minutes
-                               hours
-                               date
-                               month
-                               year
-                               offset)))))
-
-
-
-(define (time-tai->date time . tz-offset)
-  (if (tm:tai-before-leap-second? (time-second time))
-      ;; if it's *right* before the leap, we need to pretend to subtract a second ...
-      (let ((d (tm:time->date (subtract-duration! (time-tai->time-utc time)
-                                                  (make-time time-duration 0 1))
-                              tz-offset time-utc)))
-        (srfi:make-date (date-nanosecond d)
-                        60
-                        (srfi:date-minute d)
-                        (srfi:date-hour d)
-                        (srfi:date-day d)
-                        (srfi:date-month d)
-                        (srfi:date-year d)
-                        (date-zone-offset d)))
-      (tm:time->date (time-tai->time-utc time) tz-offset time-utc)))
-
-(define (time-utc->date time . tz-offset)
-  (tm:time->date time tz-offset time-utc))
-
-;; again, time-monotonic is the same as time tai
-(define (time-monotonic->date time . tz-offset)
-  (tm:time->date time tz-offset time-monotonic))
-
-(define (date->time-utc date)
-  (let ( (nanosecond (date-nanosecond date))
-         (second (srfi:date-second date))
-         (minute (srfi:date-minute date))
-         (hour (srfi:date-hour date))
-         (day (srfi:date-day date))
-         (month (srfi:date-month date))
-         (year (srfi:date-year date))
-         (offset (date-zone-offset date)) )
-    (let ( (jdays (- (tm:encode-julian-day-number day month year)
-                     tm:tai-epoch-in-jd)) )
-      (make-time
-       time-utc
-       nanosecond
-       (+ (* (- jdays 1/2) 24 60 60)
-          (* hour 60 60)
-          (* minute 60)
-          second
-          (- offset))
-       ))))
-
-(define (date->time-tai d)
-  (if (= (srfi:date-second d) 60)
-      (subtract-duration! (time-utc->time-tai! (date->time-utc d)) (make-time time-duration 0 1))
-      (time-utc->time-tai! (date->time-utc d))))
-
-(define (date->time-monotonic date)
-  (time-utc->time-monotonic! (date->time-utc date)))
-
-
-(define (tm:leap-year? year)
-  (or (= (modulo year 400) 0)
-      (and (= (modulo year 4) 0) (not (= (modulo year 100) 0)))))
-
-(define (leap-year? date)
-  (tm:leap-year? (srfi:date-year date)))
-
-;; tm:year-day fixed: adding wrong number of days.
-(define  tm:month-assoc '((0 . 0) (1 . 31)  (2 . 59)   (3 . 90)   (4 . 120)
-                                  (5 . 151) (6 . 181)  (7 . 212)  (8 . 243)
-                                  (9 . 273) (10 . 304) (11 . 334)))
-
-(define (tm:year-day day month year)
-  (let ((days-pr (assoc (- month 1) tm:month-assoc)))
-    (unless days-pr
-      (tm:time-error 'date-year-day 'invalid-month-specification month))
-    (if (and (tm:leap-year? year) (> month 2))
-        (+ day (cdr days-pr) 1)
-        (+ day (cdr days-pr)))))
-
-(define (srfi:date-year-day date)
-  (tm:year-day (srfi:date-day date) (srfi:date-month date) (srfi:date-year date)))
-
-;; from calendar faq
-(define (tm:week-day day month year)
-  (let* ((a (quotient (- 14 month) 12))
-         (y (- year a))
-         (m (+ month (* 12 a) -2)))
-    (modulo (+ day y (quotient y 4) (- (quotient y 100))
-               (quotient y 400) (quotient (* 31 m) 12))
-            7)))
-
-(define (srfi:date-week-day date)
-  (tm:week-day (srfi:date-day date) (srfi:date-month date) (srfi:date-year date)))
-
-(define (tm:days-before-first-week date day-of-week-starting-week)
-  (let* ( (first-day (srfi:make-date 0 0 0 0
-                                     1
-                                     1
-                                     (srfi:date-year date)
-                                     #f))
-          (fdweek-day (srfi:date-week-day first-day))  )
-    (modulo (- day-of-week-starting-week fdweek-day)
-            7)))
-
-(define (date-week-number date day-of-week-starting-week)
-  (quotient (- (srfi:date-year-day date)
-               (tm:days-before-first-week  date day-of-week-starting-week))
-            7))
-
-(define (current-date . tz-offset)
-  (time-utc->date (current-time time-utc)
-                  (:optional tz-offset (tm:local-tz-offset))))
-
-;; given a 'two digit' number, find the year within 50 years +/-
-(define (tm:natural-year n)
-  (let* ( (current-year (srfi:date-year (current-date)))
-          (current-century (* (quotient current-year 100) 100)) )
-    (cond
-      ((>= n 100) n)
-      ((<  n 0) n)
-      ((<=  (- (+ current-century n) current-year) 50)
-       (+ current-century n))
-      (else
-       (+ (- current-century 100) n)))))
-
-(define (date->julian-day date)
-  (let ( (nanosecond (date-nanosecond date))
-         (second (srfi:date-second date))
-         (minute (srfi:date-minute date))
-         (hour (srfi:date-hour date))
-         (day (srfi:date-day date))
-         (month (srfi:date-month date))
-         (year (srfi:date-year date))
-         (offset (date-zone-offset date)) )
-    (+ (tm:encode-julian-day-number day month year)
-       (- 1/2)
-       (+ (/ (+ (* hour 60 60)
-                (* minute 60)
-                second
-                (/ nanosecond tm:nano)
-                (- offset))
-             tm:sid)))))
-
-(define (date->modified-julian-day date)
-  (- (date->julian-day date)
-     4800001/2))
-
-
-(define (time-utc->julian-day time)
-  (unless (eq? (time-type time) time-utc)
-    (tm:time-error 'time->date 'incompatible-time-types  time))
-  (+ (/ (+ (time-second time) (/ (time-nanosecond time) tm:nano))
-        tm:sid)
-     tm:tai-epoch-in-jd))
-
-(define (time-utc->modified-julian-day time)
-  (- (time-utc->julian-day time)
-     4800001/2))
-
-(define (time-tai->julian-day time)
-  (unless (eq? (time-type time) time-tai)
-    (tm:time-error 'time->date 'incompatible-time-types  time))
-  (+ (/ (+ (- (time-second time)
-              (tm:leap-second-delta (time-second time)))
-           (/ (time-nanosecond time) tm:nano))
-        tm:sid)
-     tm:tai-epoch-in-jd))
-
-(define (time-tai->modified-julian-day time)
-  (- (time-tai->julian-day time)
-     4800001/2))
-
-;; this is the same as time-tai->julian-day
-(define (time-monotonic->julian-day time)
-  (unless (eq? (time-type time) time-monotonic)
-    (tm:time-error 'time->date 'incompatible-time-types  time))
-  (+ (/ (+ (- (time-second time)
-              (tm:leap-second-delta (time-second time)))
-           (/ (time-nanosecond time) tm:nano))
-        tm:sid)
-     tm:tai-epoch-in-jd))
-
-
-(define (time-monotonic->modified-julian-day time)
-  (- (time-monotonic->julian-day time)
-     4800001/2))
-
-
-(define (julian-day->time-utc jdn)
-  (let ( (nanosecs (* tm:nano tm:sid (- jdn tm:tai-epoch-in-jd))) )
-    (make-time time-utc
-               (remainder nanosecs tm:nano)
-               (floor (/ nanosecs tm:nano)))))
-
-(define (julian-day->time-tai jdn)
-  (time-utc->time-tai! (julian-day->time-utc jdn)))
-
-(define (julian-day->time-monotonic jdn)
-  (time-utc->time-monotonic! (julian-day->time-utc jdn)))
-
-(define (julian-day->date jdn . tz-offset)
-  (let ((offset (:optional tz-offset (tm:local-tz-offset))))
-    (time-utc->date (julian-day->time-utc jdn) offset)))
-
-(define (modified-julian-day->date jdn . tz-offset)
-  (let ((offset (:optional tz-offset (tm:local-tz-offset))))
-    (julian-day->date (+ jdn 4800001/2) offset)))
-
-(define (modified-julian-day->time-utc jdn)
-  (julian-day->time-utc (+ jdn 4800001/2)))
-
-(define (modified-julian-day->time-tai jdn)
-  (julian-day->time-tai (+ jdn 4800001/2)))
-
-(define (modified-julian-day->time-monotonic jdn)
-  (julian-day->time-monotonic (+ jdn 4800001/2)))
-
-(define (current-julian-day)
-  (time-utc->julian-day (current-time time-utc)))
-
-(define (current-modified-julian-day)
-  (time-utc->modified-julian-day (current-time time-utc)))
-
-;; returns a string rep. of number N, of minimum LENGTH,
-;; padded with character PAD-WITH. If PAD-WITH if #f,
-;; no padding is done, and it's as if number->string was used.
-;; if string is longer than LENGTH, it's as if number->string was used.
-(define (tm:padding n pad-with length)
-  (let* ( (str (number->string n))
-          (str-len (string-length str)) )
-    (if (or (> str-len length)
-            (not pad-with))
-        str
-        (let* ( (new-str (make-string length pad-with))
-                (new-str-offset (- (string-length new-str)
-                                   str-len)) )
-          (do ((i 0 (+ i 1)))
-            ((>= i (string-length str)))
-            (string-set! new-str (+ new-str-offset i)
-                         (string-ref str i)))
-          new-str))))
-
-(define (tm:last-n-digits i n)
-  (abs (remainder i (expt 10 n))))
-
-(define (tm:locale-abbr-weekday n)
-  (localized-message (vector-ref tm:locale-abbr-weekday-vector n)))
-
-(define (tm:locale-long-weekday n)
-  (localized-message (vector-ref tm:locale-long-weekday-vector n)))
-
-(define (tm:locale-abbr-month n)
-  (localized-message (vector-ref tm:locale-abbr-month-vector (- n 1))))
-
-(define (tm:locale-long-month n)
-  (localized-message (vector-ref tm:locale-long-month-vector (- n 1))))
-
-(define (tm:vector-find needle haystack comparator)
-  (let ((len (vector-length haystack)))
-    (define (tm:vector-find-int index)
-      (cond
-        ((>= index len) #f)
-        ((comparator needle (localized-message (vector-ref haystack index))) (+ index 1))
-        (else (tm:vector-find-int (+ index 1)))))
-    (tm:vector-find-int 0)))
-
-(define (tm:locale-abbr-weekday->index string)
-  (tm:vector-find string tm:locale-abbr-weekday-vector string=?))
-
-(define (tm:locale-long-weekday->index string)
-  (tm:vector-find string tm:locale-long-weekday-vector string=?))
-
-(define (tm:locale-abbr-month->index string)
-  (tm:vector-find string tm:locale-abbr-month-vector string=?))
-
-(define (tm:locale-long-month->index string)
-  (tm:vector-find string tm:locale-long-month-vector string=?))
-
-
-
-;; do nothing.
-;; Your implementation might want to do something...
-;;
-(define (tm:locale-print-time-zone date port)
-  (values))
-
-;; Again, locale specific.
-(define (tm:locale-am/pm hr)
-  (localized-message
-   (if (> hr 11) tm:locale-pm tm:locale-am)))
-
-(define (tm:tz-printer offset port)
-  (display
-   (cond [(= offset 0) "Z"]
-         [else (let ([sign (cond [(negative? offset) "-"]
-                                 [else               "+"])]
-                     [hours (abs (quotient offset (* 60 60)))]
-                     [minutes (abs (quotient (remainder offset (* 60 60)) 60))])
-                 (string-append sign (tm:padding hours #\0 2) (tm:padding minutes #\0 2)))])
-   port))
-
-;; A table of output formatting directives.
-;; the first time is the format char.
-;; the second is a procedure that takes the date, a padding character
-;; (which might be #f), and the output port.
-;;
-(define tm:directives
-  (list
-   (cons #\~ (lambda (date pad-with port) (display #\~ port)))
-
-   (cons #\a (lambda (date pad-with port)
-               (display (tm:locale-abbr-weekday (srfi:date-week-day date))
-                        port)))
-   (cons #\A (lambda (date pad-with port)
-               (display (tm:locale-long-weekday (srfi:date-week-day date))
-                        port)))
-   (cons #\b (lambda (date pad-with port)
-               (display (tm:locale-abbr-month (srfi:date-month date))
-                        port)))
-   (cons #\B (lambda (date pad-with port)
-               (display (tm:locale-long-month (srfi:date-month date))
-                        port)))
-   (cons #\c (lambda (date pad-with port)
-               (display (date->string date (localized-message tm:locale-date-time-format)) port)))
-   (cons #\d (lambda (date pad-with port)
-               (display (tm:padding (srfi:date-day date)
-                                    #\0 2)
-                        port)))
-   (cons #\D (lambda (date pad-with port)
-               (display (date->string date "~m/~d/~y") port)))
-   (cons #\e (lambda (date pad-with port)
-               (display (tm:padding (srfi:date-day date)
-                                    #\Space 2)
-                        port)))
-   (cons #\f (lambda (date pad-with port)
-               (if (> (date-nanosecond date)
-                      tm:nano)
-                   (display (tm:padding (+ (srfi:date-second date) 1)
-                                        pad-with 2)
-                            port)
-                   (display (tm:padding (srfi:date-second date)
-                                        pad-with 2)
-                            port))
-               (let ([f (tm:decimal-expansion (/ (date-nanosecond date) tm:nano) 6)])
-                 (when (> (string-length f) 0)
-                   (display (localized-message tm:locale-number-separator) port)
-                   (display f port)))))
-   (cons #\h (lambda (date pad-with port)
-               (display (date->string date "~b") port)))
-   (cons #\H (lambda (date pad-with port)
-               (display (tm:padding (srfi:date-hour date)
-                                    pad-with 2)
-                        port)))
-   (cons #\I (lambda (date pad-with port)
-               (let ((hr (srfi:date-hour date)))
-                 (if (> hr 12)
-                     (display (tm:padding (- hr 12)
-                                          pad-with 2)
-                              port)
-                     (display (tm:padding hr
-                                          pad-with 2)
-                              port)))))
-   (cons #\j (lambda (date pad-with port)
-               (display (tm:padding (srfi:date-year-day date)
-                                    pad-with 3)
-                        port)))
-   (cons #\k (lambda (date pad-with port)
-               (display (tm:padding (srfi:date-hour date)
-                                    #\0 2)
-                        port)))
-   (cons #\l (lambda (date pad-with port)
-               (let ((hr (if (> (srfi:date-hour date) 12)
-                             (- (srfi:date-hour date) 12) (srfi:date-hour date))))
-                 (display (tm:padding hr  #\Space 2)
-                          port))))
-   (cons #\m (lambda (date pad-with port)
-               (display (tm:padding (srfi:date-month date)
-                                    pad-with 2)
-                        port)))
-   (cons #\M (lambda (date pad-with port)
-               (display (tm:padding (srfi:date-minute date)
-                                    pad-with 2)
-                        port)))
-   (cons #\n (lambda (date pad-with port)
-               (newline port)))
-   (cons #\N (lambda (date pad-with port)
-               (display (tm:padding (date-nanosecond date)
-                                    pad-with 9)
-                        port)))
-   (cons #\p (lambda (date pad-with port)
-               (display (tm:locale-am/pm (srfi:date-hour date)) port)))
-   (cons #\r (lambda (date pad-with port)
-               (display (date->string date "~I:~M:~S ~p") port)))
-   (cons #\s (lambda (date pad-with port)
-               (display (time-second (date->time-utc date)) port)))
-   (cons #\S (lambda (date pad-with port)
-               (if (> (date-nanosecond date)
-                      tm:nano)
-                   (display (tm:padding (+ (srfi:date-second date) 1)
-                                        pad-with 2)
-                            port)
-                   (display (tm:padding (srfi:date-second date)
-                                        pad-with 2)
-                            port))))
-   (cons #\t (lambda (date pad-with port)
-               (display #\Tab port)))
-   (cons #\T (lambda (date pad-with port)
-               (display (date->string date "~H:~M:~S") port)))
-   (cons #\U (lambda (date pad-with port)
-               (if (> (tm:days-before-first-week date 0) 0)
-                   (display (tm:padding (+ (date-week-number date 0) 1)
-                                        #\0 2) port)
-                   (display (tm:padding (date-week-number date 0)
-                                        #\0 2) port))))
-   (cons #\V (lambda (date pad-with port)
-               (display (tm:padding (date-week-number date 1)
-                                    #\0 2) port)))
-   (cons #\w (lambda (date pad-with port)
-               (display (srfi:date-week-day date) port)))
-   (cons #\x (lambda (date pad-with port)
-               (display (date->string date (localized-message tm:locale-short-date-format)) port)))
-   (cons #\X (lambda (date pad-with port)
-               (display (date->string date (localized-message tm:locale-time-format)) port)))
-   (cons #\W (lambda (date pad-with port)
-               (if (> (tm:days-before-first-week date 1) 0)
-                   (display (tm:padding (+ (date-week-number date 1) 1)
-                                        #\0 2) port)
-                   (display (tm:padding (date-week-number date 1)
-                                        #\0 2) port))))
-   (cons #\y (lambda (date pad-with port)
-               (display (tm:padding (tm:last-n-digits
-                                     (srfi:date-year date) 2)
-                                    pad-with
-                                    2)
-                        port)))
-   (cons #\Y (lambda (date pad-with port)
-               (display (srfi:date-year date) port)))
-   (cons #\z (lambda (date pad-with port)
-               (tm:tz-printer (date-zone-offset date) port)))
-   (cons #\Z (lambda (date pad-with port)
-               (tm:locale-print-time-zone date port)))
-   (cons #\1 (lambda (date pad-with port)
-               (display (date->string date "~Y-~m-~d") port)))
-   (cons #\2 (lambda (date pad-with port)
-               (display (date->string date "~k:~M:~S~z") port)))
-   (cons #\3 (lambda (date pad-with port)
-               (display (date->string date "~k:~M:~S") port)))
-   (cons #\4 (lambda (date pad-with port)
-               (display (date->string date "~Y-~m-~dT~k:~M:~S~z") port)))
-   (cons #\5 (lambda (date pad-with port)
-               (display (date->string date "~Y-~m-~dT~k:~M:~S") port)))
-   ))
-
-
-(define (tm:get-formatter char)
-  (let ( (associated (assoc char tm:directives)) )
-    (if associated (cdr associated) #f)))
-
-(define (tm:date-printer date index format-string str-len port)
-  (if (>= index str-len)
-      (values)
-      (let ( (current-char (string-ref format-string index)) )
-        (if (not (char=? current-char #\~))
-            (begin
-              (display current-char port)
-              (tm:date-printer date (+ index 1) format-string str-len port))
-            (if (= (+ index 1) str-len) ; bad format string.
-                (tm:time-error 'tm:date-printer 'bad-date-format-string
-                               format-string)
-                (let ( (pad-char? (string-ref format-string (+ index 1))) )
-                  (cond
-                    ((char=? pad-char? #\-)
-                     (if (= (+ index 2) str-len) ; bad format string.
-                         (tm:time-error 'tm:date-printer 'bad-date-format-string
-                                        format-string)
-                         (let ( (formatter (tm:get-formatter
-                                            (string-ref format-string
-                                                        (+ index 2)))) )
-                           (if (not formatter)
-                               (tm:time-error 'tm:date-printer 'bad-date-format-string
-                                              format-string)
-                               (begin
-                                 (formatter date #f port)
-                                 (tm:date-printer date (+ index 3)
-                                                  format-string str-len port))))))
-
-                    ((char=? pad-char? #\_)
-                     (if (= (+ index 2) str-len) ; bad format string.
-                         (tm:time-error 'tm:date-printer 'bad-date-format-string
-                                        format-string)
-                         (let ( (formatter (tm:get-formatter
-                                            (string-ref format-string
-                                                        (+ index 2)))) )
-                           (if (not formatter)
-                               (tm:time-error 'tm:date-printer 'bad-date-format-string
-                                              format-string)
-                               (begin
-                                 (formatter date #\Space port)
-                                 (tm:date-printer date (+ index 3)
-                                                  format-string str-len port))))))
-                    (else
-                     (let ( (formatter (tm:get-formatter
-                                        (string-ref format-string
-                                                    (+ index 1)))) )
-                       (if (not formatter)
-                           (tm:time-error 'tm:date-printer 'bad-date-format-string
-                                          format-string)
-                           (begin
-                             (formatter date #\0 port)
-                             (tm:date-printer date (+ index 2)
-                                              format-string str-len port))))))))))))
-
-
-(define (date->string date [format-string "~c"])
-  (unless (string? format-string)
-    (raise-type-error 'date->string "string" 1 date format-string))
-  (let ( (str-port (open-output-string)) )
-    (tm:date-printer date 0 format-string (string-length format-string) str-port)
-    (get-output-string str-port)))
-
-(define (tm:char->int ch)
-  (cond
-    ((char=? ch #\0) 0)
-    ((char=? ch #\1) 1)
-    ((char=? ch #\2) 2)
-    ((char=? ch #\3) 3)
-    ((char=? ch #\4) 4)
-    ((char=? ch #\5) 5)
-    ((char=? ch #\6) 6)
-    ((char=? ch #\7) 7)
-    ((char=? ch #\8) 8)
-    ((char=? ch #\9) 9)
-    (else (tm:time-error 'bad-date-template-string
-                         'digit-char
-                         ch))))
-
-;; read an integer upto n characters long on port; upto -> #f if any length
-(define (tm:integer-reader upto port)
-  (define (accum-int port accum nchars)
-    (let ((ch (peek-char port)))
-      (if (or (eof-object? ch)
-              (not (char-numeric? ch))
-              (and upto (>= nchars  upto )))
-          accum
-          (accum-int port (+ (* accum 10) (tm:char->int (read-char port))) (+ nchars 1)))))
-  (accum-int port 0 0))
-
-(define (tm:make-integer-reader upto)
-  (lambda (port)
-    (tm:integer-reader upto port)))
-
-;; read an fractional integer upto n characters long on port; upto -> #f if any length
-;;
-;; The return value is normalized to upto decimal places. For example, if upto is 9 and
-;; the string read is "123", the return value is 123000000.
-(define (tm:fractional-integer-reader upto port)
-  (define (accum-int port accum nchars)
-    (let ((ch (peek-char port)))
-      (if (or (eof-object? ch)
-              (not (char-numeric? ch))
-              (and upto (>= nchars  upto )))
-          (* accum (expt 10 (- upto nchars)))
-          (accum-int port (+ (* accum 10) (tm:char->int (read-char port))) (+ nchars 1)))))
-  (accum-int port 0 0))
-
-(define (tm:make-fractional-integer-reader upto)
-  (lambda (port)
-    (tm:fractional-integer-reader upto port)))
-
-;; read *exactly* n characters and convert to integer; could be padded
-(define (tm:integer-reader-exact n port)
-  (let ( (padding-ok #t) )
-    (define (accum-int port accum nchars)
-      (let ((ch (peek-char port)))
-        (cond
-          ((>= nchars n) accum)
-          ((eof-object? ch)
-           (tm:time-error 'string->date 'bad-date-template-string
-                          "Premature ending to integer read."))
-          ((char-numeric? ch)
-           (set! padding-ok #f)
-           (accum-int port (+ (* accum 10) (tm:char->int (read-char port)))
-                      (+ nchars 1)))
-          (padding-ok
-           (read-char port)             ; consume padding
-           (accum-int port accum (+ nchars 1)))
-          (else                 ; padding where it shouldn't be
-           (tm:time-error 'string->date 'bad-date-template-string
-                          "Non-numeric characters in integer read.")))))
-    (accum-int port 0 0)))
-
-
-(define (tm:make-integer-exact-reader n)
-  (lambda (port)
-    (tm:integer-reader-exact n port)))
-
-(define (tm:zone-reader port)
-  (let ( (offset 0)
-         (positive? #f) )
-    (let ( (ch (read-char port)) )
-      (when (eof-object? ch)
-        (tm:time-error 'string->date 'bad-date-template-string
-                       (list "Invalid time zone +/-" ch)))
-      (if (or (char=? ch #\Z) (char=? ch #\z))
-          0
-          (begin
-            (cond
-              ((char=? ch #\+) (set! positive? #t))
-              ((char=? ch #\-) (set! positive? #f))
-              (else
-               (tm:time-error 'string->date 'bad-date-template-string
-                              (list "Invalid time zone +/-" ch))))
-            (let ((ch (read-char port)))
-              (when (eof-object? ch)
-                (tm:time-error 'string->date 'bad-date-template-string (list "Invalid time zone number" ch)))
-              (set! offset (* (tm:char->int ch)
-                              10 60 60)))
-            (let ((ch (read-char port)))
-              (unless (eof-object? ch)
-                ;; FIXME: non-existing values should be considered Zero instead of an error
-                ;; (tm:time-error 'string->date 'bad-date-template-string (list "Invalid time zone number" ch)))
-                (set! offset (+ offset (* (tm:char->int ch) 60 60)))))
-            (let ((ch (read-char port)))
-              (unless (eof-object? ch)
-                ;; FIXME: non-existing values should be considered Zero instead of an error
-                ;; (tm:time-error 'string->date 'bad-date-template-string (list "Invalid time zone number" ch)))
-                (set! offset (+ offset (* (tm:char->int ch) 10 60)))))
-            (let ((ch (read-char port)))
-              (unless (eof-object? ch)
-                ;; FIXME: non-existing values should be considered Zero instead of an error
-                ;; (tm:time-error 'string->date 'bad-date-template-string (list "Invalid time zone number" ch)))
-                (set! offset (+ offset (* (tm:char->int ch) 60)))))
-            (if positive? offset (- offset)))))))
-
-;; looking at a char, read the char string, run thru indexer, return index
-(define (tm:locale-reader port indexer)
-  (let ( (string-port (open-output-string)) )
-    (define (read-char-string)
-      (let ((ch (peek-char port)))
-        (if (char-alphabetic? ch)
-            (begin (write-char (read-char port) string-port)
-                   (read-char-string))
-            (get-output-string string-port))))
-    (let* ( (str (read-char-string))
-            (index (indexer str)) )
-      (if index index (tm:time-error 'string->date
-                                     'bad-date-template-string
-                                     (list "Invalid string for " indexer))))))
-
-(define (tm:make-locale-reader indexer)
-  (lambda (port)
-    (tm:locale-reader port indexer)))
-
-(define (tm:make-char-id-reader char)
-  (lambda (port)
-    (if (char=? char (read-char port))
-        char
-        (tm:time-error 'string->date
-                       'bad-date-template-string
-                       "Invalid character match."))))
-
-;; A List of formatted read directives.
-;; Each entry is a list.
-;; 1. the character directive;
-;; a procedure, which takes a character as input & returns
-;; 2. #t as soon as a character on the input port is acceptable
-;; for input,
-;; 3. a port reader procedure that knows how to read the current port
-;; for a value. Its one parameter is the port.
-;; 4. a action procedure, that takes the value (from 3.) and some
-;; object (here, always the date) and (probably) side-effects it.
-;; In some cases (e.g., ~A) the action is to do nothing
-(define tm:read-directives
-  (let ( (ireader4 (tm:make-integer-reader 4))
-         (ireader2 (tm:make-integer-reader 2))
-         (fireader9 (tm:make-fractional-integer-reader 9))
-         (ireaderf (tm:make-integer-reader #f))
-         (eireader2 (tm:make-integer-exact-reader 2))
-         (eireader4 (tm:make-integer-exact-reader 4))
-         (locale-reader-abbr-weekday (tm:make-locale-reader
-                                      tm:locale-abbr-weekday->index))
-         (locale-reader-long-weekday (tm:make-locale-reader
-                                      tm:locale-long-weekday->index))
-         (locale-reader-abbr-month   (tm:make-locale-reader
-                                      tm:locale-abbr-month->index))
-         (locale-reader-long-month   (tm:make-locale-reader
-                                      tm:locale-long-month->index))
-         (char-fail (lambda (ch) #t))
-         (do-nothing (lambda (val object) (values)))
-         )
-
-    (list
-     (list #\~ char-fail (tm:make-char-id-reader #\~) do-nothing)
-     (list #\a char-alphabetic? locale-reader-abbr-weekday do-nothing)
-     (list #\A char-alphabetic? locale-reader-long-weekday do-nothing)
-     (list #\b char-alphabetic? locale-reader-abbr-month
-           (lambda (val object)
-             (struct-copy lax-date object [month val])))
-     (list #\B char-alphabetic? locale-reader-long-month
-           (lambda (val object)
-             (struct-copy lax-date object [month val])))
-     (list #\d char-numeric? ireader2
-           (lambda (val object)
-             (struct-copy lax-date object [day val])))
-     (list #\e char-fail eireader2
-           (lambda (val object)
-             (struct-copy lax-date object [day val])))
-     (list #\h char-alphabetic? locale-reader-abbr-month
-           (lambda (val object)
-             (struct-copy lax-date object [month val])))
-     (list #\H char-numeric? ireader2
-           (lambda (val object)
-             (struct-copy lax-date object [hour val])))
-     (list #\k char-fail eireader2
-           (lambda (val object)
-             (struct-copy lax-date object [hour val])))
-     (list #\m char-numeric? ireader2
-           (lambda (val object)
-             (struct-copy lax-date object [month val])))
-     (list #\M char-numeric? ireader2
-           (lambda (val object)
-             (struct-copy lax-date object [minute val])))
-     (list #\N char-numeric? fireader9
-           (lambda (val object)
-             (struct-copy lax-date object [nanosecond val])))
-     (list #\S char-numeric? ireader2
-           (lambda (val object)
-             (struct-copy lax-date object [second val])))
-     (list #\y char-fail eireader2
-           (lambda (val object)
-             (struct-copy lax-date object
-                          [year (tm:natural-year val)])))
-     (list #\Y char-numeric? ireader4
-           (lambda (val object)
-             (struct-copy lax-date object [year val])))
-     (list #\z (lambda (c)
-                 (or (char=? c #\Z)
-                     (char=? c #\z)
-                     (char=? c #\+)
-                     (char=? c #\-)))
-           tm:zone-reader
-           (lambda (val object)
-             (struct-copy lax-date object [zone-offset val])))
-     ; PLT-specific extension for 2- or 4-digit years:
-     (list #\? char-numeric? ireader4
-           (lambda (val object)
-             (struct-copy lax-date object
-                          [year (tm:natural-year val)])))
-     )))
-
-(define (tm:string->date date index format-string str-len port template-string)
-  (define (skip-until port skipper)
-    (let ((ch (peek-char port)))
-      (if (eof-object? ch)
-          (tm:time-error 'string->date 'bad-date-format-string template-string)
-          (unless (skipper ch)
-            (read-char port)
-            (skip-until port skipper)))))
-  (if (>= index str-len)
-      date
-      (let ( (current-char (string-ref format-string index)) )
-        (if (not (char=? current-char #\~))
-            (let ((port-char (read-char port)))
-              (when (or (eof-object? port-char)
-                        (not (char=? current-char port-char)))
-                (tm:time-error 'string->date 'bad-date-format-string template-string))
-              (tm:string->date date (+ index 1) format-string str-len port template-string))
-            ;; otherwise, it's an escape, we hope
-            (if (> (+ index 1) str-len)
-                (tm:time-error 'string->date 'bad-date-format-string template-string)
-                (let* ( (format-char (string-ref format-string (+ index 1)))
-                        (format-info (assoc format-char tm:read-directives)) )
-                  (if (not format-info)
-                      (tm:time-error 'string->date 'bad-date-format-string template-string)
-                      (begin
-                        (let ((skipper (cadr format-info))
-                              (reader  (caddr format-info))
-                              (actor   (cadddr format-info)))
-                          (skip-until port skipper)
-                          (define new-date
-                            (let ((val (reader port)))
-                              (if (eof-object? val)
-                                  (tm:time-error 'string->date 'bad-date-format-string template-string)
-                                  (actor val date))))
-                          (tm:string->date new-date (+ index 2) format-string str-len port template-string))))))))))
-
-
-(define (string->date input-string template-string)
-  (define (tm:date-ok? date)
-    (and (date-nanosecond date)
-         (srfi:date-second date)
-         (srfi:date-minute date)
-         (srfi:date-hour date)
-         (srfi:date-day date)
-         (srfi:date-month date)
-         (srfi:date-year date)
-         (date-zone-offset date)))
-  (let* ([initial (lax-date 0 0 0 0 #t #t #t (tm:local-tz-offset))]
-         [newdate (tm:string->date
-                   initial
-                   0
-                   template-string
-                   (string-length template-string)
-                   (open-input-string input-string)
-                   template-string)])
-    (if (tm:date-ok? newdate)
-        (lax-date->date* newdate)
-        (tm:time-error 'string->date 'bad-date-format-string (list "Incomplete date read. " newdate template-string)))))
-
-
-
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29.rkt
deleted file mode 100644
index d49125c55e..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-29
-#lang s-exp srfi/provider srfi/29/localization
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/bundles/es/srfi-19 b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/bundles/es/srfi-19
deleted file mode 100644
index 8bfcc45b92..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/bundles/es/srfi-19
+++ /dev/null
@@ -1,29 +0,0 @@
-;; -*- scheme -*-
-( ;; weekday abbreviations
- (sun . "dom") (mon . "lun") (tue . "mar") (wed . "mi�")
- (thu . "jue") (fri . "vie") (sat . "s�b")
-
- ;; long weekdays
- (sunday . "domingo") (monday . "lunes") (tuesday . "martes")
- (wednesday . "mi�rcoles") (thursday . "jueves") (friday . "viernes")
- (saturday . "s�bado")
-
- ;; month abbrevs
- (jan . "ene") (feb . "feb") (mar . "mar") (apr . "abr")
- (may . "may") (jun . "jun") (jul . "jul") (aug . "ago")
- (sep . "sep") (oct . "oct") (nov . "nov") (dec . "dic")
-
- ;; long month
- (january . "Enero") (february . "Febrero") (march . "Marzo") (april . "Abril")
- (may . "Mayo") (june . "Junio") (july . "Julio") (august . "Agosto")
- (septembre . "Septiembre") (octuber . "Octubre") (november . "Noviembre") (december . "Deciembre")
-
- (pm . "PM") (am . "AM")
-
- (date-time . "~a ~d ~b ~H:~M:~S~z ~Y")
- (date . "~d/~m/~y")
- (time . "~H:~M:~S")
- (iso8601 . "~Y-~m-~dT~H:~M:~S~z")
- (separator . ".")
- 
-)
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/bundles/srfi-19 b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/bundles/srfi-19
deleted file mode 100644
index 94cf97b7d7..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/bundles/srfi-19
+++ /dev/null
@@ -1,30 +0,0 @@
-;; -*- scheme -*-
-( ;; weekday abbreviations
- (sun . "Sun") (mon . "Mon") (tue . "Tue") (wed . "Wed")
- (thu . "Thu") (fri . "Fri") (sat . "Sat")
-
- ;; long weekdays
- (sunday . "Sunday") (monday . "Monday") (tuesday . "Tuesday")
- (wednesday . "Wednesday") (thursday . "Thursday") (friday . "Friday")
- (saturday . "Saturday")
-
- ;; month abbrevs
- (jan . "Jan") (feb . "Feb") (mar . "Mar") (apr . "Apr")
- (may . "May") (jun . "Jun") (jul . "Jul") (aug . "Aug")
- (sep . "Sep") (oct . "Oct") (nov . "Nov") (dec . "Dec")
-
- ;; long month
- (january . "January") (february . "February") (march . "March") (april . "April")
- (may . "May") (june . "June") (july . "July") (august . "August")
- (september . "September") (october . "October") (november . "November") (december . "December")
-
- (pm . "PM") (am . "AM")
-
- (date-time . "~a ~b ~d ~H:~M:~S~z ~Y")
- (date . "~m/~d/~y")
- (time . "~H:~M:~S")
- (iso8601 . "~Y-~m-~dT~H:~M:~S~z")
- (separator . ".")
- 
- 
- )
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/localization.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/localization.rkt
deleted file mode 100644
index 49dcb86886..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/29/localization.rkt
+++ /dev/null
@@ -1,131 +0,0 @@
-(module localization racket/base
-  
-  (require racket/contract/base
-           racket/file
-           (only-in racket/runtime-path define-runtime-path)
-           racket/string racket/format
-           syntax/modread
-	   (for-syntax racket/base))
-  
-  (provide/contract (current-language (parameter/c symbol?))
-                    (current-country (parameter/c symbol?))
-                    (current-locale-details (parameter/c (listof symbol?)))
-                    (declare-bundle! (-> (listof symbol?) (listof pair?) any))
-                    (load-bundle! (->* ((listof symbol?)) #:rest any/c any))
-                    (store-bundle! (-> (listof symbol?) any))
-                    (localized-template (-> symbol? any/c any)))
-  
-  (provide re-read-locale)
-  
-  (define get-from-locale
-    (lambda (what)
-      (let ((locale (current-locale)))
-	(if (string=? locale "")
-	    (case what
-	      ((language) 'en) ;; Default language: English
-	      ((country) 'us) ;; Default country: US
-	      (else null))
-	    (let ((len (string-length locale)))
-	      (case what
-		((language)
-		 (if (>= len 2)
-		     (string->symbol (substring locale 0 2))
-		     'en))
-		((country)
-		 (if (>= len 5)
-		     (string->symbol (substring locale 3 5))
-		     'us))
-		(else ;; details
-		 (if (> len 6)
-		     (list (string->symbol (substring locale 6)))
-		     null))))))))
-  
-  ;; The association list in which bundles will be stored
-  (define *localization-bundles*
-    (make-hash))
-  
-  (define current-language
-    (make-parameter (get-from-locale 'language)))
-  
-  (define current-country
-    (make-parameter (get-from-locale 'country)))
-  
-  (define current-locale-details
-    (make-parameter (get-from-locale 'details)))
-  
-  (define (make-name bundle-specifier)
-    (string->symbol
-     (string-append "srfi-29:"
-                    (~v bundle-specifier))))
-  
-  (define (declare-bundle! bundle-specifier bundle-assoc-list)
-    (hash-set! *localization-bundles* bundle-specifier bundle-assoc-list))
-  
-  (define (store-bundle! bundle-specifier)
-    (put-preferences (list (make-name bundle-specifier))
-                     (list (hash-ref *localization-bundles* bundle-specifier)))
-    #t)
-  
-  (define (load-bundle-from-preference! bundle-specifier)
-    (let/ec k
-      (declare-bundle! bundle-specifier
-                       (get-preference (make-name bundle-specifier)
-                                       (lambda () (k #f))))
-      #t))
-  
-  ;; If you change (current-locale), you don't have to set current-*
-  ;; by hand, you can simply call this procedure, and it will update
-  ;; those parameters to the values in the new locale.
-  (define (re-read-locale)
-    (current-language (get-from-locale 'language))
-    (current-country (get-from-locale 'country))
-    (current-locale-details (get-from-locale 'details)))
-  
-  ;; System bundles are here:
-  (define-runtime-path system-bundles "bundles")
-  
-  (define (with-reader-params thunk)
-    ;; Use `with-module-reading-parameterization' to get
-    ;; most defaults...
-    (with-module-reading-parameterization 
-     (lambda ()
-       ;; ... but disable `#reader':
-       (parameterize ([read-accept-reader #f])
-         (thunk)))))
-  
-  ;; load-bundle! accpect an alternate-path to search bundle
-  (define (load-bundle! bundle-specifier . alternate-path)
-    (or (load-bundle-from-preference! bundle-specifier)
-        (let* ((filename (case (length bundle-specifier)
-                           ((1) (symbol->string (car bundle-specifier)))
-                           ((2) (build-path (symbol->string (cadr bundle-specifier))
-                                            (symbol->string (car bundle-specifier))))
-                           (else (build-path (symbol->string (cadr bundle-specifier))
-                                             (symbol->string (caddr bundle-specifier))
-                                             (symbol->string (car bundle-specifier))))))
-               (path (build-path (if (null? alternate-path)
-                                     system-bundles
-                                     (car alternate-path))
-                                 filename)))
-          (and (file-exists? path)
-               (declare-bundle! bundle-specifier
-                                (with-reader-params
-                                 (lambda ()
-                                   (with-input-from-file path read))))
-               #t))))
-  (define (rdc ls)
-    (if (null? (cdr ls))
-        '()
-        (cons (car ls) (rdc (cdr ls)))))
-  
-  ;;Retrieve a localized template given its package name and a template name
-  (define (localized-template package-name template-name)
-    (let loop ((specifier (list package-name
-                                (current-language)
-                                (current-country))))
-      (and (not (null? specifier))
-           (let ((bundle (hash-ref *localization-bundles* specifier #f)))
-             (cond ((and bundle (assq template-name bundle)) => cdr)
-                   ((null? (cdr specifier)) #f)
-                   (else (loop (rdc specifier))))))))
-  )
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/8.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/8.rkt
deleted file mode 100644
index 3d67cc4efe..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/8.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-;; module loader for SRFI-8
-#lang s-exp srfi/provider srfi/8/receive
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/8/receive.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/8/receive.rkt
deleted file mode 100644
index e09498d558..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/8/receive.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-;;;
-;;; <receive.rkt> ---- SRFI 8 Binding to Multiple Values port to PLT Scheme
-;;; Time-stamp: <02/05/10 12:22:37 solsona>
-;;;
-;;; Usually, I would add a copyright notice, and the announce that
-;;; this code is under the LGPL licence.  Nevertheless, I only did the
-;;; port to PLT Scheme v200 (it was written for the 103), and here is
-;;; the copyright notice, comments, and licence from the original
-;;; source:
-;;;
-;;; oh well, there is no such comment.
-
-#lang racket/base
-(provide receive)
-
-;; (receive vars producer . body)
-(define-syntax receive
-  (syntax-rules ()
-    ((receive (var ...) ?producer . ?body)
-     (let-values ([(var ...) ?producer]) . ?body))
-    ((receive ?vars ?producer . ?body)
-     (call-with-values (lambda () ?producer) (lambda ?vars . ?body)))))
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/optional.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/optional.rkt
deleted file mode 100644
index 0e20082a1b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/optional.rkt
+++ /dev/null
@@ -1,168 +0,0 @@
-;;;
-;;; <optional.rkt> ---- Let-optionals macros
-;;; Time-stamp: <2011-02-02 11:44:21 dvanhorn>
-;;;
-;;; Usually, I would add a copyright notice, and the announce that
-;;; this code is under the LGPL licence.  This code is been copied
-;;; from Scheme48, and Scsh, and thus I will append here their
-;;; Copyright notice:
-;;;
-;;; Copyright (c) 1993-1999 Richard Kelsey and Jonathan Rees
-;;; Copyright (c) 1994-1999 by Olin Shivers and Brian D. Carlstrom.
-;;; All rights reserved.
-;;;
-;;; Redistribution and use in source and binary forms, with or without
-;;; modification, are permitted provided that the following conditions
-;;; are met:
-;;; 1. Redistributions of source code must retain the above copyright
-;;;    notice, this list of conditions and the following disclaimer.
-;;; 2. Redistributions in binary form must reproduce the above copyright
-;;;    notice, this list of conditions and the following disclaimer in the
-;;;    documentation and/or other materials provided with the distribution.
-;;; 3. The name of the authors may not be used to endorse or promote products
-;;;    derived from this software without specific prior written permission.
-;;;
-;;; THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
-;;; IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-;;; OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-;;; IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-;;; INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-;;; NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-;;; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-;;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-;;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-;;; THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-;;;
-;;; Author: Francisco Solsona <solsona@acm.org>
-;;
-;;
-;; Commentary:
-;;
-;; this is a port of commonly referred (in SRFI mostly) macros, and
-;; utilities, to the PLT Scheme system.  I'm not sure if I should use
-;; the word "port", because I hardly touched Olin Shivers' superiour
-;; macros. :-)
-;;
-
-#lang racket/base
-
-(require (for-syntax racket/base))
-
-(provide :optional let-optionals* check-arg)
-
-;; (function (check-arg predicate value caller))
-;;
-;;
-;; Checks parameter values.
-(define (check-arg pred val caller)
-  (if (not (pred val))
-    (let ([expected-string
-           (cond [(eq? pred number? ) "expected number, "]
-                 [(eq? pred integer?) "expected integer, "]
-                 [(eq? pred pair?) "expected pair, "]
-                 [(eq? pred procedure?) "expected procedure, "]
-                 [(eq? pred string?) "expected string, "]
-                 [(eq? pred vector?) "expected vector, "]
-                 [else ""])])
-      (error caller (string-append expected-string "given ~s") val))
-    val))
-
-
-
-;; (:optional rest-arg default-exp [test-pred])
-;;
-;; This form is for evaluating optional arguments and their defaults
-;; in simple procedures that take a *single* optional argument. It is
-;; a macro so that the default will not be computed unless it is needed.
-;;
-;; REST-ARG is a rest list from a lambda -- e.g., R in
-;;     (lambda (a b . r) ...)
-;; - If REST-ARG has 0 elements, evaluate DEFAULT-EXP and return that.
-;; - If REST-ARG has 1 element, return that element.
-;; - If REST-ARG has >1 element, error.
-;;
-;; If there is an TEST-PRED form, it is a predicate that is used to test
-;; a non-default value. If the predicate returns false, an error is raised.
-(define-syntax (:optional stx)
-  (syntax-case stx ()
-    [(_ rest default-exp)
-     (syntax
-       (let ([maybe-arg rest])
-         (if (pair? maybe-arg)
-           (if (null? (cdr maybe-arg)) (car maybe-arg)
-               (error "too many optional arguments:" maybe-arg))
-           default-exp)))]
-    [(_ rest default-exp arg-test)
-     (syntax
-       (let ([maybe-arg rest])
-         (if (pair? maybe-arg)
-           (if (null? (cdr maybe-arg))
-             (let ([val (car maybe-arg)])
-               (if (arg-test val) val
-                   (error "optional argument failed test:" val)))
-             (error "too many optional arguments:" maybe-arg))
-           default-exp)))]))
-
-
-;; NOTE: This is the `less-efficient version of LET-OPTIONALS*'.
-;;       Once I understand the more efficient one, as for to
-;;       adapt it to PLT Scheme, I will.  Sorry, Olin Shivers,
-;;       wrote a far to complex thing for me to grasp. :-{
-
-;;      (LET-OPTIONALS* arg-list (opt-clause1 ... opt-clauseN [rest])
-;;       body ...)
-;; where
-;;     <opt-clause> ::= (var default [arg-check supplied?])
-;;                  |   ((var1 ... varN) external-arg-parser)
-;;
-;; LET-OPTIONALS* has LET* scope -- each arg clause sees the bindings of
-;; the previous clauses. LET-OPTIONALS has LET scope -- each arg clause
-;; sees the outer scope (an ARG-CHECK expression sees the outer scope
-;; *plus* the variable being bound by that clause, by necessity).
-(define-syntax let-optionals*
-  (syntax-rules ()
-    [(let-optionals* arg (opt-clause ...) body ...)
-     (let ([rest arg])
-       (%let-optionals* rest (opt-clause ...) body ...))]))
-
-
-(define-syntax %let-optionals*
-  (syntax-rules ()
-    [(%let-optionals* arg (((var ...) xparser) opt-clause ...) body ...)
-     (call-with-values (lambda () (xparser arg))
-         (lambda (rest var ...)
-           (%let-optionals* rest (opt-clause ...) body ...)))]
-
-    [(%let-optionals* arg ((var default) opt-clause ...) body ...)
-     (call-with-values (lambda () (if (null? arg) (values default '())
-                                      (values (car arg) (cdr arg))))
-         (lambda (var rest)
-           (%let-optionals* rest (opt-clause ...) body ...)))]
-
-    [(%let-optionals* arg ((var default test) opt-clause ...) body ...)
-     (call-with-values (lambda ()
-                         (if (null? arg) (values default '())
-                             (let ([var (car arg)])
-                               (if test (values var (cdr arg))
-                                   (error "arg failed LET-OPT test" var)))))
-         (lambda (var rest)
-           (%let-optionals* rest (opt-clause ...) body ...)))]
-
-    [(%let-optionals* arg ((var default test supplied?) opt-clause ...) body ...)
-     (call-with-values (lambda ()
-                         (if (null? arg) (values default #f '())
-                             (let ([var (car arg)])
-                               (if test (values var #t (cdr arg))
-                                   (error "arg failed LET-OPT test" var)))))
-         (lambda (var supplied? rest)
-           (%let-optionals* rest (opt-clause ...) body ...)))]
-
-    [(%let-optionals* arg (rest) body ...)
-     (let ([rest arg]) body ...)]
-
-    [(%let-optionals* arg () body ...)
-     (if (null? arg) (begin body ...)
-         (error "Too many arguments in let-opt" arg))]))
-
-;; optional.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/provider.rkt b/pkgs/srfi-pkgs/srfi-lite-lib/srfi/provider.rkt
deleted file mode 100644
index 720873156b..0000000000
--- a/pkgs/srfi-pkgs/srfi-lite-lib/srfi/provider.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base racket/provide-transform))
-
-;; This is a utility for many srfi/N.rkt files that simply reprovide stuff from
-;; some other file.  It is used as a module, for example, the "srfi/1.rkt"
-;; loader has:
-;;   #lang s-exp srfi/provider srfi/1/list #:unprefix s:
-;; which makes it require `srfi/1/list', then reprovide everything from there,
-;; removing any `s:' prefixes that it uses (since `srfi/1/list' does not
-;; collide with `racket/base').  It is used in most files here, and the
-;; unprefix facility is used in a few similar situations.  You can add a
-;; `#:debug' flag to have the unprefixer print its renamings, to check that you
-;; get the right bindings.
-
-(provide (rename-out [module-begin #%module-begin]))
-(define-syntax (module-begin stx)
-  (syntax-case stx ()
-    [(_ srfi-req . more)
-     (let ([pfx #f] [debug #f])
-       (let loop ([more #'more])
-         (syntax-case more ()
-           [(#:unprefix pfx-id . more) (set! pfx #'pfx-id) (loop #'more)]
-           [(#:debug . more) (set! debug #t) (loop #'more)]
-           [() (void)]))
-       #`(#%module-begin
-          (require srfi-req)
-          (provide (all-from-unprefix-out #,pfx srfi-req #,debug))))]))
-
-(define-syntax all-from-unprefix-out
-  (make-provide-transformer
-   (lambda (stx modes)
-     (syntax-case stx ()
-       [(_ pfx spec debug?)
-        (map (if (identifier? #'pfx)
-               (let ([rx (string-append
-                          "^"
-                          (regexp-quote (symbol->string (syntax-e #'pfx))))]
-                     [debug? (syntax-e #'debug?)])
-                 (lambda (e)
-                   (let* ([s (symbol->string (export-out-sym e))]
-                          [m (regexp-match-positions rx s)])
-                     (when (and m debug?)
-                       (printf "Renaming: ~a -> ~a\n" s (substring s (cdar m))))
-                     (if m
-                       (make-export (export-local-id e)
-                                    (string->symbol  (substring s (cdar m)))
-                                    (export-mode     e)
-                                    (export-protect? e)
-                                    (export-orig-stx e))
-                       e))))
-               values)
-             (expand-export #'(all-from-out spec) modes))]))))
diff --git a/pkgs/srfi-pkgs/srfi-test/LICENSE.txt b/pkgs/srfi-pkgs/srfi-test/LICENSE.txt
deleted file mode 100644
index 072e998478..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-srfi-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/srfi-pkgs/srfi-test/info.rkt b/pkgs/srfi-pkgs/srfi-test/info.rkt
deleted file mode 100644
index dcc8f9e6f2..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '())
-(define build-deps '("scheme-lib"
-                     "base"
-                     "compatibility-lib"
-                     "rackunit-lib"
-                     "srfi-lib"))
-(define update-implies '("srfi-lib"))
-
-(define pkg-desc "tests for \"srfi\"")
-
-(define pkg-authors '(mflatt noel chongkai jay))
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/alist-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/alist-test.rkt
deleted file mode 100644
index 4bb0dfd13c..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/alist-test.rkt
+++ /dev/null
@@ -1,308 +0,0 @@
-;;;
-;;; <alist-test.rkt> ---- Association list tests
-;;; Time-stamp: <2008-03-07 16:36:15 nhw>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; SRFI-1 is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; SRFI-1 is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with SRFI-1; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-;; Originally created by:
-
-;; John David Stone
-;; Department of Mathematics and Computer Science
-;; Grinnell College
-;; stone@math.grin.edu
-
-(module alist-test mzscheme
-  (require rackunit)
-  (require (all-except srfi/1/alist assoc)
-           (rename srfi/1/alist s:assoc assoc))
-
-  (provide alist-tests)
-
-  (define alist-tests
-    (test-suite
-     "Association list tests"
-
-     ;; ALIST-CONS
-
-     (test-case
-      "alist-cons:null-list"
-      (check-equal? (alist-cons 'Manawa 'Manchester '())
-                     '((Manawa . Manchester))))
-
-     (test-case
-      "alist-cons:singleton-list"
-      (let* ((base '((Manilla . Manly)))
-             (result (alist-cons 'Manning 'Manson base)))
-        (check-equal? result '((Manning . Manson)
-                                (Manilla . Manly)))
-        (check-eq? (cdr result) base)))
-
-     (test-case
-      "alist-cons:longer-list"
-      (let* ((base '((Manteno . Mapleside)
-                     (Mapleton . Maquoketa)
-                     (Marathon . Marcus)
-                     (Marengo . Marietta)
-                     (Marion . Mark)))
-             (result (alist-cons 'Marne 'Marquette base)))
-        (check-equal? result
-                       '((Marne . Marquette)
-                         (Manteno . Mapleside)
-                         (Mapleton . Maquoketa)
-                         (Marathon . Marcus)
-                         (Marengo . Marietta)
-                         (Marion . Mark)))
-        (check-eq? (cdr result) base)))
-
-     (test-case
-      "alist-cons:longer-list-with-duplicate-key"
-      (let* ((base '((Marquisville . Marsh)
-                     (Marshalltown . Martelle)
-                     (Martensdale . Martinsburg)
-                     (Martinstown . Marysville)
-                     (Masonville . Massena)
-                     (Massey . Massilon)
-                     (Matlock . Maud)))
-             (result (alist-cons 'Masonville 'Maurice base)))
-        (check-equal? result '((Masonville . Maurice)
-                                (Marquisville . Marsh)
-                                (Marshalltown . Martelle)
-                                (Martensdale . Martinsburg)
-                                (Martinstown . Marysville)
-                                (Masonville . Massena)
-                                (Massey . Massilon)
-                                (Matlock . Maud)))
-        (check-eq? (cdr result) base)))
-
-     ;; ALIST-COPY
-
-     (test-case
-      "alist-copy:null-list"
-      (check-true (null? (alist-copy '()))))
-
-     (test-case
-      "alist-copy:flat-list"
-      (let* ((original '((Maxon . Maxwell)
-                         (Maynard . Maysville)
-                         (McCallsburg . McCausland)
-                         (McClelland . McGregor)
-                         (McIntire . McNally)))
-             (result (alist-copy original)))
-        (check-true
-         (and (equal? result original)
-              (not (eq? result original))
-              (not (eq? (car result) (car original)))
-              (not (eq? (cdr result) (cdr original)))
-              (not (eq? (cadr result) (cadr original)))
-              (not (eq? (cddr result) (cddr original)))
-              (not (eq? (caddr result) (caddr original)))
-              (not (eq? (cdddr result) (cdddr original)))
-              (not (eq? (cadddr result) (cadddr original)))
-              (not (eq? (cddddr result) (cddddr original)))
-              (not (eq? (car (cddddr result))
-                        (car (cddddr original))))))))
-
-     (test-case
-      "alist-copy:bush"
-      (let* ((first '(McPaul))
-             (second '(McPherson
-                       Mechanicsville
-                       Mederville
-                       (Mediapolis Medora)
-                       ((Mekee Melbourne Melcher))))
-             (third 'Melrose)
-             (original (list (cons 'Meltonville first)
-                             (cons 'Melvin second)
-                             (cons 'Menlo third)))
-             (result (alist-copy original)))
-        (check-true
-         (and (equal? result original)
-              (not (eq? result original))
-              (not (eq? (car result) (car original)))
-              (eq? (cdar result) first)
-              (not (eq? (cdr result) (cdr original)))
-              (not (eq? (cadr result) (cadr original)))
-              (eq? (cdadr result) second)
-              (not (eq? (cddr result) (cddr original)))
-              (not (eq? (caddr result) (caddr original)))
-              (eq? (cdaddr result) third)))))
-
-     ;; ALIST-DELETE
-
-     (test-case
-      "alist-delete:null-list"
-      (check-true (null? (alist-delete 'Mercer '() (lambda (x y) #t)))))
-
-     (test-case
-      "alist-delete:singleton-list"
-      (check-equal?
-       (alist-delete 'Meriden
-                     '((Merrill . Merrimac)))
-       '((Merrill . Merrimac))))
-
-     (test-case
-      "alist-delete:all-elements-removed"
-      (check-true
-       (null? (alist-delete 'Meservey
-                            '((Metz . Meyer)
-                              (Middleburg . Middletwon)
-                              (Midvale . Midway)
-                              (Miles . Milford)
-                              (Miller . Millersburg))
-                            (lambda (x y) #t)))))
-
-     (test-case
-      "alist-delete:some-elements-removed"
-      (check-equal?
-       (alist-delete 561
-                     '((562 . 563)
-                       (565 . 564)
-                       (566 . 567)
-                       (569 . 568)
-                       (570 . 571))
-                     (lambda (x y) (odd? (+ x y))))
-       '((565 . 564) (569 . 568))))
-
-     (test-case
-      "alist-delete:no-elements-removed"
-      (check-equal?
-       (alist-delete 'Millerton
-                     '((Millman . Millnerville)
-                       (Millville . Milo)
-                       (Milton . Minburn)
-                       (Minden . Mineola)
-                       (Minerva . Mingo))
-                     (lambda (x y) #f))
-       '((Millman . Millnerville)
-         (Millville . Milo)
-         (Milton . Minburn)
-         (Minden . Mineola)
-         (Minerva . Mingo))))
-
-     ;; ALIST-DELETE!
-
-
-     ;; ALIST-DELETE
-
-     (test-case
-      "alist-delete:null-list"
-      (check-true (null? (alist-delete '(Reasnor . Redding) '()))))
-
-     (test-case
-      "alist-delete:in-singleton-list"
-      (check-true (null?
-                    (alist-delete '(Redfield . Reeceville)
-                                  '(((Redfield . Reeceville) . Reinbeck))))))
-
-     (test-case
-      "alist-delete:not-in-singleton-list"
-      (check-equal?
-       (alist-delete '(Rembrandt . Remsen)
-                     '(((Renwick . Republic) . Rhodes)))
-       '(((Renwick . Republic) . Rhodes))))
-
-     (test-case
-      "alist-delete:at-beginning-of-longer-list"
-      (check-equal?
-       (alist-delete '(Riceville . Richard)
-                     '(((Riceville . Richard) . Richfield)
-                       ((Richland . Richmond) . Rickardsville)
-                       ((Ricketts . Rider) . Ridgeport)
-                       ((Ridgeway . Riggs) . Rinard)
-                       ((Ringgold . Ringsted) . Rippey)))
-       '(((Richland . Richmond) . Rickardsville)
-         ((Ricketts . Rider) . Ridgeport)
-         ((Ridgeway . Riggs) . Rinard)
-         ((Ringgold . Ringsted) . Rippey))))
-
-     (test-case
-      "alist-delete:in-middle-of-longer-list"
-      (check-equal?
-       (alist-delete '(Ritter . Riverdale)
-                     '(((Riverside . Riverton) . Roberts)
-                       ((Robertson . Robins) . Robinson)
-                       ((Rochester . Rockdale) . Rockford)
-                       ((Rockville . Rockwell) . Rodman)
-                       ((Ritter . Riverdale) . Rodney)
-                       ((Roelyn . Rogers) . Roland)
-                       ((Rolfe . Rome) . Roscoe)))
-       '(((Riverside . Riverton) . Roberts)
-         ((Robertson . Robins) . Robinson)
-         ((Rochester . Rockdale) . Rockford)
-         ((Rockville . Rockwell) . Rodman)
-         ((Roelyn . Rogers) . Roland)
-         ((Rolfe . Rome) . Roscoe))))
-
-     (test-case
-      "alist-delete:at-end-of-longer-list"
-      (check-equal?
-       (alist-delete '(Rose . Roselle)
-                     '(((Roseville . Ross) . Rosserdale)
-                       ((Rossie . Rossville) . Rowan)
-                       ((Rowley . Royal) . Rubio)
-                       ((Ruble . Rudd) . Runnells)
-                       ((Rose . Roselle) . Russell)))
-       '(((Roseville . Ross) . Rosserdale)
-         ((Rossie . Rossville) . Rowan)
-         ((Rowley . Royal) . Rubio)
-         ((Ruble . Rudd) . Runnells))))
-
-     (test-case
-      "alist-delete:not-in-longer-list"
-      (check-equal?
-       (alist-delete '(Ruthven . Rutland)
-                     '(((Rutledge . Ryan) . Sabula)
-                       ((Sageville . Salem) . Salina)
-                       ((Salix . Sanborn) . Sandusky)
-                       ((Sandyville . Santiago) . Saratoga)
-                       ((Sattre . Saude) . Savannah)))
-       '(((Rutledge . Ryan) . Sabula)
-         ((Sageville . Salem) . Salina)
-         ((Salix . Sanborn) . Sandusky)
-         ((Sandyville . Santiago) . Saratoga)
-         ((Sattre . Saude) . Savannah))))
-
-     (test-case
-      "alist-delete:several-matches-in-longer-list"
-      (check-equal?
-       (alist-delete '(Sawyer . Saylor)
-                     '(((Saylorville . Scarville) . Schaller)
-                       ((Schleswig . Schley) . Sciola)
-                       ((Sawyer . Saylor) . Scranton)
-                       ((Searsboro . Sedan) . Selma)
-                       ((Sawyer . Saylor) . Seneca)
-                       ((Seney . Sewal) . Sexton)
-                       ((Sawyer . Saylor) . Seymour)))
-       '(((Saylorville . Scarville) . Schaller)
-         ((Schleswig . Schley) . Sciola)
-         ((Searsboro . Sedan) . Selma)
-         ((Seney . Sewal) . Sexton))))
-
-     ;; ALIST-DELETE!
-
-
-     ))
-  )
-
-;;; alist-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/all-1-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/all-1-tests.rkt
deleted file mode 100644
index 057e407578..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/all-1-tests.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-(module all-1-tests mzscheme
-  
-  (require rackunit)
-  (require "alist-test.rkt"
-           "cons-test.rkt"
-           "delete-test.rkt"
-           "filter-test.rkt"
-           "fold-test.rkt"
-           "lset-test.rkt"
-           "misc-test.rkt"
-           "predicate-test.rkt"
-           "search-test.rkt"
-           "selector-test.rkt")
-  
-  (provide all-1-tests)
-  
-  (define all-1-tests
-    (test-suite 
-     "all-1-tests"
-     alist-tests
-     cons-tests
-     delete-tests
-     filter-tests
-     fold-tests
-     lset-tests
-     misc-tests
-     predicate-tests
-     search-tests
-     selector-tests
-     ))
-  )
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/cons-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/cons-test.rkt
deleted file mode 100644
index eccb6f75b3..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/cons-test.rkt
+++ /dev/null
@@ -1,217 +0,0 @@
-;;;
-;;; <cons-test.rkt> ---- List constructor tests
-;;; Time-stamp: <05/12/16 21:14:31 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; SRFI-1 is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; SRFI-1 is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with SRFI-1; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-;; Originally created by:
-
-;; John David Stone
-;; Department of Mathematics and Computer Science
-;; Grinnell College
-;; stone@math.grin.edu
-
-(module cons-test
-  mzscheme
-  (require rackunit)
-  (require srfi/1/cons)
-
-  (provide cons-tests)
-
-  (define cons-tests
-    (test-suite
-     "List constructor tests"
-
-     ;; XCONS
-
-     (test-case
-      "xcons:null-cdr"
-      (check-equal? (xcons '() 'Andromeda) '(Andromeda)))
-
-     (test-case
-      "xcons:pair-cdr"
-      (let* ((base '(Antlia))
-             (result (xcons base 'Apus)))
-        (check-equal? result '(Apus Antlia))
-        (check-eq? (cdr result) base)))
-
-     (test-case
-      "xcons:datum-cdr"
-      (check-equal? (xcons 'Aquarius 'Aquila) '(Aquila . Aquarius)))
-
-     ;; MAKE-LIST
-
-     (test-case
-      "make-list:zero-length"
-      (check-true (null? (make-list 0))))
-
-     (test-case
-      "make-list:default-element"
-      (check-equal? (make-list 5) '(#f #f #f #f #f)))
-
-     (test-case
-      "make-list:fill-element"
-      (check-equal? (make-list 7 'Circinus)
-                     '(Circinus Circinus Circinus Circinus
-                                Circinus Circinus Circinus)))
-
-     ;; LIST-TABULATE
-
-     (test-case
-      "list-tabulate:zero-length"
-      (check-true (null? (list-tabulate 0 (lambda (position) #f)))))
-
-     (test-case
-      "list-tabulate:identity"
-      (check-equal? (list-tabulate 5 (lambda (position) position))
-                     '(0 1 2 3 4)))
-
-     (test-case
-      "list-tabulate:factorial"
-      (check-equal? (list-tabulate 7 (lambda (position)
-                                        (do ((multiplier 1 (+ multiplier 1))
-                                             (product 1 (* product multiplier)))
-                                            ((< position multiplier) product))))
-                     '(1 1 2 6 24 120 720)))
-
-     ;; LIST*
-
-     (test-case
-      "list*:one-argument"
-      (check-eq? (list* 'Columba)
-                  'Columba))
-
-     (test-case
-      "list*:two-arguments"
-      (check-equal? (list* 'Corvus 'Crater)
-                     '(Corvus . Crater)))
-
-     (test-case
-      "list*:many-arguments"
-      (check-equal? (list* 'Crux 'Cygnus 'Delphinus 'Dorado 'Draco)
-                     '(Crux Cygnus Delphinus Dorado . Draco)))
-
-     (test-case
-      "list*:last-argument-null"
-      (check-equal? (list* 'Equuleus 'Fornax '())
-                     '(Equuleus Fornax)))
-
-     (test-case
-      "list*:last-argument-non-empty-list"
-      (let* ((base '(Gemini Grus))
-             (result (list* 'Hercules 'Horologium 'Hydra 'Hydrus base)))
-        (check-equal? result
-                       '(Hercules Horologium Hydra Hydrus Gemini Grus))
-        (check-eq? (cddddr result) base)))
-
-     ;; LIST-COPY
-
-     (test-case
-      "list-copy:null-list"
-      (check-true (null? (list-copy '()))))
-
-     (test-case
-      "list-copy:flat-list"
-      (let* ((original '(Indus Lacerta Leo Lepus Libra))
-             (result (list-copy original)))
-        (check-equal? result original)
-        (check-true (not (eq? result original)))
-        (check-true (not (eq? (cdr result) (cdr original))))
-        (check-true (not (eq? (cddr result) (cddr original))))
-        (check-true (not (eq? (cdddr result) (cdddr original))))
-        (check-true (not (eq? (cddddr result) (cddddr original))))))
-
-     (test-case
-      "list-copy:bush"
-      (let* ((first '(Lupus))
-             (second '(Lynx Malus Mensa (Microscopium Monoceros)
-                            ((Musca Norma Octans))))
-             (third 'Ophiuchus)
-             (original (list first second third))
-             (result (list-copy original)))
-        (check-equal? result original)
-        (check-true (not (eq? result original)))
-        (check-eq? (car result) first)
-        (check-true (not (eq? (cdr result) (cdr original))))
-        (check-eq? (cadr result) second)
-        (check-true (not (eq? (cddr result) (cddr original))))
-        (check-eq? (caddr result) third)))
-
-     ;; CIRCULAR-LIST
-
-     (test-case
-      "circular-list:one-element"
-      (let ((result (circular-list 'Orion)))
-        (check-true (and (pair? result)
-                          (eq? (car result) 'Orion)
-                          (eq? (cdr result) result)))))
-
-     (test-case
-      "circular-list:many-elements"
-      (let ((result (circular-list 'Pavo 'Pegasus 'Perseus 'Phoenix 'Pictor)))
-        (check-true (and (pair? result)
-                          (eq? (car result) 'Pavo)
-                          (pair? (cdr result))
-                          (eq? (cadr result) 'Pegasus)
-                          (pair? (cddr result))
-                          (eq? (caddr result) 'Perseus)
-                          (pair? (cdddr result))
-                          (eq? (cadddr result) 'Phoenix)
-                          (pair? (cddddr result))
-                          (eq? (car (cddddr result)) 'Pictor)
-                          (eq? (cdr (cddddr result)) result)))))
-
-     ;; IOTA
-
-     (test-case
-      "iota:zero-count"
-      (check-equal? (iota 0) (list)))
-
-     (test-case
-      "iota:zero-count-and-step"
-      (check-equal? (iota 0 0) (list)))
-
-     (test-case
-      "iota:count-only"
-      (check-equal? (iota 4) (list 0 1 2 3)))
-
-     (test-case
-      "iota:count-and-start"
-      (check-equal? (iota 3 1) (list 1 2 3)))
-
-     (test-case
-      "iota:count-start-and-step"
-      (check-equal? (iota 4 3 2) (list 3 5 7 9)))
-
-     (test-case
-      "iota:negative-step"
-      (check-equal? (iota 4 0 -1) (list 0 -1 -2 -3)))
-
-     (test-case
-      "iota:non-integer-step"
-      (check-equal? (iota 5 0 1/2) (list 0 1/2 1 3/2 2)))
-
-     ))
-  )
-;;; cons-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/delete-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/delete-test.rkt
deleted file mode 100644
index 1f74c41adc..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/delete-test.rkt
+++ /dev/null
@@ -1,358 +0,0 @@
-;;;
-;;; <delete-test.rkt> ---- List deletion function tests
-;;; Time-stamp: <05/12/16 21:16:28 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; SRFI-1 is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; SRFI-1 is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with SRFI-1; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-;; Originally created by:
-
-;; John David Stone
-;; Department of Mathematics and Computer Science
-;; Grinnell College
-;; stone@math.grin.edu
-
-(module delete-test
-  mzscheme
-  (require rackunit)
-  (require (all-except srfi/1/delete member))
-
-  (provide delete-tests)
-
-  (define delete-tests
-    (test-suite
-     "List deletion tests"
-
-     ;; DELETE
-
-     (test-case
-      "delete:null-list"
-      (check-true
-       (null? (delete '(Fraser . Frederic) '()))))
-
-     (test-case
-      "delete:in-singleton-list"
-      (check-true
-       (null?
-        (delete '(Fredericksburg . Frederika)
-                '((Fredericksburg . Frederika))))))
-
-     (test-case
-      "delete:not-in-singleton-list"
-      (check-equal?
-       (delete '(Fredonia . Fredsville) '((Freeman . Freeport)))
-       '((Freeman . Freeport))))
-
-     (test-case
-      "delete:at-beginning-of-longer-list"
-      (check-equal?
-       (delete '(Fremont . Froelich) '((Fremont . Froelich)
-                                       (Fruitland . Fulton)
-                                       (Furay . Galbraith)
-                                       (Galesburg . Galland)
-                                       (Galt . Galva)))
-       '((Fruitland . Fulton)
-         (Furay . Galbraith)
-         (Galesburg . Galland)
-         (Galt . Galva))))
-
-     (test-case
-      "delete:in-middle-of-longer-list"
-      (check-equal?
-       (delete '(Gambrill . Garber) '((Gardiner . Gardner)
-                                      (Garfield . Garland)
-                                      (Garnavillo . Garner)
-                                      (Garrison . Garwin)
-                                      (Gambrill . Garber)
-                                      (Gaza . Geneva)
-                                      (Genoa . George)))
-       '((Gardiner . Gardner)
-         (Garfield . Garland)
-         (Garnavillo . Garner)
-         (Garrison . Garwin)
-         (Gaza . Geneva)
-         (Genoa . George))))
-
-     (test-case
-      "delete:at-end-of-longer-list"
-      (check-equal?
-       (delete '(Georgetown . Gerled) '((Germantown . Germanville)
-                                        (Giard . Gibbsville)
-                                        (Gibson . Gifford)
-                                        (Gilbert . Gilbertville)
-                                        (Georgetown . Gerled)))
-       '((Germantown . Germanville)
-         (Giard . Gibbsville)
-         (Gibson . Gifford)
-         (Gilbert . Gilbertville))))
-
-     (test-case
-      "delete:not-in-longer-list"
-      (check-equal?
-       (delete '(Gilliatt . Gilman) '((Givin . Gladbrook)
-                                      (Gladstone . Gladwin)
-                                      (Glasgow . Glendon)
-                                      (Glenwood . Glidden)
-                                      (Goddard . Goldfield)))
-       '((Givin . Gladbrook)
-         (Gladstone . Gladwin)
-         (Glasgow . Glendon)
-         (Glenwood . Glidden)
-         (Goddard . Goldfield))))
-
-     (test-case
-      "delete:several-matches-in-longer-list"
-      (check-equal?
-       (delete '(Goodell . Gosport) '((Gowrie . Goddard)
-                                      (Grable . Graettinger)
-                                      (Goodell . Gosport)
-                                      (Graf . Grafton)
-                                      (Goodell . Gosport)
-                                      (Grandview . Granger)
-                                      (Goodell . Gosport)))
-       '((Gowrie . Goddard)
-         (Grable . Graettinger)
-         (Graf . Grafton)
-         (Grandview . Granger))))
-
-     ;; DELETE!
-
-     (test-case
-      "delete!:null-list"
-      (check-true (null? (delete! (cons 'Henshaw 'Hentons) (list)))))
-
-     (test-case
-      "delete!:in-singleton-list"
-      (check-true
-       (null?
-        (delete! (cons 'Hepburn 'Herndon)
-                 (list (cons 'Hepburn 'Herndon))))))
-
-     (test-case
-      "delete!:not-in-singleton-list"
-      (check-equal?
-       (delete! (cons 'Hesper 'Hiattsville)
-                (list (cons 'Hiawatha 'Hicks)))
-       '((Hiawatha . Hicks))))
-
-     (test-case
-      "delete!:at-beginning-of-longer-list"
-      (check-equal?
-       (delete! (cons 'Highland 'Highlandville)
-                (list (cons 'Highland 'Highlandville)
-                      (cons 'Highview 'Hills)
-                      (cons 'Hillsboro 'Hillsdale)
-                      (cons 'Hilltop 'Hinton)
-                      (cons 'Hiteman 'Hobarton)))
-       '((Highview . Hills)
-         (Hillsboro . Hillsdale)
-         (Hilltop . Hinton)
-         (Hiteman . Hobarton))))
-
-     (test-case
-      "delete!:in-middle-of-longer-list"
-      (check-equal?
-       (delete! (cons 'Hocking 'Holbrook)
-                (list (cons 'Holland 'Holmes)
-                      (cons 'Holstein 'Homer)
-                      (cons 'Homestead 'Hopeville)
-                      (cons 'Hopkinton 'Hornick)
-                      (cons 'Hocking 'Holbrook)
-                      (cons 'Horton 'Hospers)
-                      (cons 'Houghton 'Howardville)))
-       '((Holland . Holmes)
-         (Holstein . Homer)
-         (Homestead . Hopeville)
-         (Hopkinton . Hornick)
-         (Horton . Hospers)
-         (Houghton . Howardville))))
-
-     (test-case
-      "delete!:at-end-of-longer-list"
-      (check-equal?
-       (delete! (cons 'Howe 'Hubbard)
-                (list (cons 'Hudson 'Hugo)
-                      (cons 'Hull 'Humboldt)
-                      (cons 'Humeston 'Huntington)
-                      (cons 'Hurley 'Huron)
-                      (cons 'Howe 'Hubbard)))
-       '((Hudson . Hugo)
-         (Hull . Humboldt)
-         (Humeston . Huntington)
-         (Hurley . Huron))))
-
-     (test-case
-      "delete!:not-in-longer-list"
-      (check-equal?
-       (delete! (cons 'Hurstville 'Hutchins)
-                (list (cons 'Huxley 'Iconium)
-                      (cons 'Illyria 'Imogene)
-                      (cons 'Independence 'Indianapolis)
-                      (cons 'Indianola 'Industry)
-                      (cons 'Inwood 'Ion)))
-       '((Huxley . Iconium)
-         (Illyria . Imogene)
-         (Independence . Indianapolis)
-         (Indianola . Industry)
-         (Inwood . Ion))))
-
-     (test-case
-      "delete!:several-matches-in-longer-list"
-      (check-equal?
-       (delete! (cons 'Ionia 'Ira)
-                (list (cons 'Ireton 'Ironhills)
-                      (cons 'Irving 'Irvington)
-                      (cons 'Ionia 'Ira)
-                      (cons 'Irwin 'Ivester)
-                      (cons 'Ionia 'Ira)
-                      (cons 'Iveyville 'Ivy)
-                      (cons 'Ionia 'Ira)))
-       '((Ireton . Ironhills)
-         (Irving . Irvington)
-         (Irwin . Ivester)
-         (Iveyville . Ivy))))
-
-     ;; DELETE-DUPLICATES
-
-     (test-case
-      "delete-duplicates:null-list"
-      (check-true (null? (delete-duplicates '()))))
-
-     (test-case
-      "delete-duplicates:singleton-list"
-      (check-equal?
-       (delete-duplicates '((Knierim . Knittel)))
-       '((Knierim . Knittel))))
-
-     (test-case
-      "delete-duplicates:in-doubleton-list"
-      (check-equal?
-       (delete-duplicates '((Knoke . Knowlton) (Knoke . Knowlton)))
-       '((Knoke . Knowlton))))
-
-     (test-case
-      "delete-duplicates:none-removed-in-longer-list"
-      (check-equal?
-       (delete-duplicates '((Knox . Knoxville)
-                            (Konigsmark . Kossuth)
-                            (Koszta . Lacelle)
-                            (Lacey . Lacona)
-                            (Ladoga . Ladora)))
-       '((Knox . Knoxville)
-         (Konigsmark . Kossuth)
-         (Koszta . Lacelle)
-         (Lacey . Lacona)
-         (Ladoga . Ladora))))
-
-     (test-case
-      "delete-duplicates:some-removed-in-longer-list"
-      (check-equal?
-       (delete-duplicates '((Lafayette . Lainsville)
-                            (Lakeside . Lakewood)
-                            (Lakeside . Lakewood)
-                            (Lakonta . Lakota)
-                            (Lafayette . Lainsville)
-                            (Lamoille . Lamoni)
-                            (Lakeside . Lakewood)
-                            (Lamont . Lancaster)
-                            (Lakeside . Lakewood)))
-       '((Lafayette . Lainsville)
-         (Lakeside . Lakewood)
-         (Lakonta . Lakota)
-         (Lamoille . Lamoni)
-         (Lamont . Lancaster))))
-
-     (test-case
-      "delete-duplicates:all-but-one-removed-in-longer-list"
-      (check-equal?
-       (delete-duplicates '((Lanesboro . Langdon)
-                            (Lanesboro . Langdon)
-                            (Lanesboro . Langdon)
-                            (Lanesboro . Langdon)
-                            (Lanesboro . Langdon)))
-       '((Lanesboro . Langdon))))
-
-     ;; DELETE-DUPLICATES!
-
-     (test-case
-      "delete-duplicates!:null-list"
-      (check-true (null? (delete-duplicates! (list)))))
-
-     (test-case
-      "delete-duplicates!:singleton-list"
-      (check-equal?
-       (delete-duplicates! (list (cons 'Lester 'Letts)))
-       '((Lester . Letts))))
-
-     (test-case
-      "delete-duplicates!:in-doubleton-list"
-      (check-equal?
-       (delete-duplicates! (list (cons 'Leverette 'Levey)
-                                 (cons 'Leverette 'Levey)))
-       '((Leverette . Levey))))
-
-     (test-case
-      "delete-duplicates!:none-removed-in-longer-list"
-      (check-equal?
-       (delete-duplicates! (list (cons 'Lewis 'Lexington)
-                                 (cons 'Liberty 'Libertyville)
-                                 (cons 'Lidderdale 'Lima)
-                                 (cons 'Linby 'Lincoln)
-                                 (cons 'Linden 'Lineville)))
-       '((Lewis . Lexington)
-         (Liberty . Libertyville)
-         (Lidderdale . Lima)
-         (Linby . Lincoln)
-         (Linden . Lineville))))
-
-     (test-case
-      "delete-duplicates!:some-removed-in-longer-list"
-      (check-equal?
-       (delete-duplicates! (list (cons 'Lisbon 'Liscomb)
-                                 (cons 'Littleport 'Littleton)
-                                 (cons 'Littleport 'Littleton)
-                                 (cons 'Livermore 'Livingston)
-                                 (cons 'Lisbon 'Liscomb)
-                                 (cons 'Lockman 'Lockridge)
-                                 (cons 'Littleport 'Littleton)
-                                 (cons 'Locust 'Logan)
-                                 (cons 'Littleport 'Littleton)))
-       '((Lisbon . Liscomb)
-         (Littleport . Littleton)
-         (Livermore . Livingston)
-         (Lockman . Lockridge)
-         (Locust . Logan))))
-
-     (test-case
-      "delete-duplicates!:all-but-one-removed-in-longer-list"
-      (check-equal?
-       (delete-duplicates! (list (cons 'Logansport 'Lohrville)
-                                 (cons 'Logansport 'Lohrville)
-                                 (cons 'Logansport 'Lohrville)
-                                 (cons 'Logansport 'Lohrville)
-                                 (cons 'Logansport 'Lohrville)))
-       '((Logansport . Lohrville))))
-     ))
-
-  )
-;;; delete-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/filter-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/filter-test.rkt
deleted file mode 100644
index c0f8f2bd97..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/filter-test.rkt
+++ /dev/null
@@ -1,273 +0,0 @@
-;;;
-;;; <filter-test.rkt> ---- List filtering and partitioning tests
-;;; Time-stamp: <05/12/16 21:16:28 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; SRFI-1 is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; SRFI-1 is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with SRFI-1; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-;; Originally created by:
-
-;; John David Stone
-;; Department of Mathematics and Computer Science
-;; Grinnell College
-;; stone@math.grin.edu
-
-(module filter-test
-  mzscheme
-  (require rackunit)
-  (require (all-except srfi/1/filter member))
-
-  (provide filter-tests)
-
-  (define filter-tests
-    (test-suite
-     "List filtering tests"
-
-     ;; FILTER
-
-     (test-case
-      "filter:null-list"
-      (check-true (null? (filter (lambda (x) #t) '()))))
-
-     (test-case
-      "filter:singleton-list"
-      (check-equal?
-       (filter (lambda (x) #t) '(Agency))
-       '(Agency)))
-
-     (test-case
-      "filter:all-elements-removed"
-      (check-true
-       (null? (filter (lambda (x) #f)
-                      '(Ainsworth Akron Albany Albaton Albia)))))
-
-     (test-case
-      "filter:some-elements-removed"
-      (check-equal?
-       (filter even? '(86 87 88 89 90))
-       '(86 88 90)))
-
-     (test-case
-      "filter:no-elements-removed"
-      (check-equal?
-       (filter (lambda (x) #t)
-               '(Albion Alburnett Alden Alexander Algona))
-       '(Albion Alburnett Alden Alexander Algona)))
-
-     ;; FILTER!
-
-     (test-case
-      "filter!:null-list"
-      (check-true
-       (null? (filter! (lambda (x) #t) (list)))))
-
-     (test-case
-      "filter!:singleton-list"
-      (check-equal?
-       (filter! (lambda (x) #t) (list 'Alice))
-       '(Alice)))
-
-     (test-case
-      "filter!:all-elements-removed"
-      (check-true
-       (null? (filter! (lambda (x) #f)
-                       (list 'Alleman 'Allendorf 'Allerton 'Allison 'Almont)))))
-
-     (test-case
-      "filter!:some-elements-removed"
-      (check-equal?
-       (filter! even? (list 91 92 93 94 95))
-       '(92 94)))
-
-     (test-case
-      "filter!:no-elements-removed"
-      (check-equal?
-       (filter! (lambda (x) #t)
-                (list 'Almoral 'Alpha 'Alta 'Alton 'Altoona))
-       '(Almoral Alpha Alta Alton Altoona)))
-
-     ;; REMOVE
-
-     (test-case
-      "remove:null-list"
-      (check-true
-       (null? (remove (lambda (x) #t) '()))))
-
-     (test-case
-      "remove:singleton-list"
-      (check-equal?
-       (remove (lambda (x) #f) '(Alvord))
-       '(Alvord)))
-
-     (test-case
-      "remove:all-elements-removed"
-      (check-true
-       (null? (remove (lambda (x) #t) '(Amana Amber Ames Amish Anamosa)))))
-
-     (test-case
-      "remove:some-elements-removed"
-      (check-equal?
-       (remove even? '(96 97 98 99 100))
-       '(97 99)))
-
-     (test-case
-      "remove:no-elements-removed"
-      (check-equal?
-       (remove (lambda (x) #f)
-               '(Anderson Andover Andrew Andrews Angus))
-       '(Anderson Andover Andrew Andrews Angus)))
-
-     ;; REMOVE!
-
-     (test-case
-      "remove!:null-list"
-      (check-true (null? (remove! (lambda (x) #t) (list)))))
-
-     (test-case
-      "remove!:singleton-list"
-      (check-equal?
-       (remove! (lambda (x) #f) (list 'Anita))
-       '(Anita)))
-
-     (test-case
-      "remove!:all-elements-removed"
-      (check-true
-       (null?
-        (remove! (lambda (x) #t)
-                 (list 'Ankeny 'Anthon 'Aplington 'Arcadia 'Archer)))))
-
-     (test-case
-      "remove!:some-elements-removed"
-      (check-equal?
-       (remove! even? (list 101 102 103 104 105))
-       '(101 103 105)))
-
-     (test-case
-      "remove!:no-elements-removed"
-      (check-equal?
-       (remove! (lambda (x) #f)
-                (list 'Ardon 'Aredale 'Argo 'Argyle 'Arion))
-       '(Ardon Aredale Argo Argyle Arion)))
-
-     ;; PARTITION
-
-     (test-case
-      "partition:null-list"
-      (let-values (((in out) (partition (lambda (x) #f) '())))
-        (check-true (and (null? in) (null? out)))))
-
-     (test-case
-      "partition:singleton-list"
-      (let-values (((in out) (partition (lambda (x) #f) '(Arispe))))
-        (check-true (and (null? in) (equal? out '(Arispe))))))
-
-     (test-case
-      "partition:all-satisfying"
-      (let-values (((in out)
-                    (partition (lambda (x) #t)
-                               '(Arlington Armstrong Arnold Artesian Arthur))))
-        (check-true
-         (and (equal? in
-                      '(Arlington Armstrong Arnold Artesian Arthur))
-              (null? out)))))
-
-     (test-case
-      "partition:mixed-starting-in"
-      (let-values (((in out)
-                    (partition even? '(106 108 109 111 113 114 115 117 118 120))))
-        (check-true (and (equal? in '(106 108 114 118 120))
-                          (equal? out '(109 111 113 115 117))))))
-
-     (test-case
-      "partition:mixed-starting-out"
-      (let-values (((in out)
-                    (partition even? '(121 122 124 126))))
-        (check-true (and (equal? in '(122 124 126))
-                          (equal? out '(121))))))
-
-     (test-case
-      "partition:none-satisfying"
-      (let-values (((in out)
-                    (partition (lambda (x) #f)
-                               '(Asbury Ashawa Ashland Ashton Aspinwall))))
-        (check-true (and (null? in)
-                          (equal? out
-                                  '(Asbury Ashawa Ashland Ashton Aspinwall))))))
-
-     ;; PARTITION!
-
-     (test-case
-      "partition!:null-list"
-      (let-values (((in out)
-                    (partition! (lambda (x) #f) (list))))
-        (check-true (and (null? in) (null? out)))))
-
-     (test-case
-      "partition!:singleton-list"
-      (let-values (((in out)
-                    (partition! (lambda (x) #f) (list 'Astor))))
-        (lambda (in out) (and (null? in) (equal? out '(Astor))))))
-
-     (test-case
-      "partition!:all-satisfying"
-      (let-values (((in out)
-                    (partition! (lambda (x) #t)
-                                (list 'Atalissa 'Athelstan 'Atkins 'Atlantic
-                                      'Attica))))
-        (check-true
-         (and (equal? in
-                      '(Atalissa Athelstan Atkins Atlantic Attica))
-              (null? out)))))
-
-     (test-case
-      "partition!:mixed-starting-in"
-      (let-values (((in out)
-                    (partition! odd?
-                                (list 127 129 130 132 134 135 136 138 139 141))))
-        (check-true
-         (and (equal? in '(127 129 135 139 141))
-              (equal? out '(130 132 134 136 138))))))
-
-     (test-case
-      "partition!:mixed-starting-out"
-      (let-values (((in out)
-                    (partition! odd? (list 142 143 145 147))))
-        (check-true
-         (and (equal? in '(143 145 147))
-              (equal? out '(142))))))
-
-     (test-case
-      "partition!:none-satisfying"
-      (let-values (((in out)
-                    (partition! (lambda (x) #f)
-                                (list 'Auburn 'Audubon 'Augusta 'Aurelia
-                                      'Aureola))))
-        (check-true
-         (and (null? in)
-              (equal? out
-                      '(Auburn Audubon Augusta Aurelia Aureola))))))
-
-     ))
-  )
-
-;;; filter-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/fold-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/fold-test.rkt
deleted file mode 100644
index 4e818cadbc..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/fold-test.rkt
+++ /dev/null
@@ -1,965 +0,0 @@
-;;;
-;;; <fold-test.rkt> ---- Tests for list folds
-;;; Time-stamp: <05/12/16 21:19:37 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; SRFI-1 is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; SRFI-1 is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with SRFI-1; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-;; Originally created by:
-
-;; John David Stone
-;; Department of Mathematics and Computer Science
-;; Grinnell College
-;; stone@math.grin.edu
-
-(module fold-test
-  mzscheme
-  (require rackunit)
-  (require (all-except srfi/1/fold map for-each)
-   (rename srfi/1/fold s:map map)
-   (rename srfi/1/fold s:for-each for-each))
-
-  (provide fold-tests)
-
-  (define fold-tests
-    (test-suite
-     "Folding list procedures tests"
-
-     ;; UNFOLD
-
-     (test-case
-      "unfold:predicate-always-satisfied"
-      (check-true (null?
-                    (unfold (lambda (seed) #t)
-                            (lambda (seed) (* seed 2))
-                            (lambda (seed) (* seed 3))
-                            1))))
-
-     (test-case
-      "unfold:normal-case"
-      (check-equal?
-       (unfold (lambda (seed) (= seed 729))
-               (lambda (seed) (* seed 2))
-               (lambda (seed) (* seed 3))
-               1)
-       '(2 6 18 54 162 486)))
-
-     ;; UNFOLD-RIGHT
-
-     (test-case
-      "unfold-right:predicate-always-satisfied"
-      (check-equal?
-       (unfold-right (lambda (seed) #t)
-                     (lambda (seed) (* seed 2))
-                     (lambda (seed) (* seed 3))
-                     (lambda (seed) (* seed 5))
-                     '(1))
-       (list 1)))
-
-     (test-case
-      "unfold-right:normal-case"
-      (check-equal?
-       (unfold-right (lambda (seed) (= seed 729))
-                     (lambda (seed) (* seed 2))
-                     (lambda (seed) (* seed 3))
-                     1)
-       '(486 162 54 18 6 2)))
-
-     (test-case
-      "unfold-right:normal-case-opt-arg"
-      (check-equal?
-       (unfold-right (lambda (seed) (= seed 729))
-                     (lambda (seed) (* seed 2))
-                     (lambda (seed) (* seed 3))
-                     1
-                     '(1))
-       '(486 162 54 18 6 2 1)))
-
-     ;; FOLD
-
-     (test-case
-      "fold:one-null-list"
-      (check = (fold (lambda (alpha beta) (* alpha (+ beta 1))) 13 '()) 13))
-
-     (test-case
-      "fold:one-singleton-list"
-      (check = (fold (lambda (alpha beta) (* alpha (+ beta 1))) 13 '(15)) 210))
-
-     (test-case
-      "fold:one-longer-list"
-      (check =
-              (fold (lambda (alpha beta) (* alpha (+ beta 1)))
-                    13
-                    '(15 17 19 21 23))
-              32927582))
-
-     (test-case
-      "fold:several-null-lists"
-      (check-eq? (fold vector 'Chad '() '() '() '() '()) 'Chad))
-
-     (test-case
-      "fold:several-singleton-lists"
-      (check-equal?
-       (fold vector 'Chile '(China) '(Colombia) '(Comoros) '(Congo)
-             '(Croatia))
-       '#(China Colombia Comoros Congo Croatia Chile)))
-
-     (test-case
-      "fold:several-longer-lists"
-      (check-equal?
-       (fold (lambda (alpha beta gamma delta epsilon zeta)
-               (cons (vector alpha beta gamma delta epsilon) zeta))
-             '()
-             '(Cuba Cyprus Denmark Djibouti Dominica Ecuador Egypt)
-             '(Eritrea Estonia Ethiopia Fiji Finland France Gabon)
-             '(Gambia Georgia Germany Ghana Greece Grenada
-                      Guatemala)
-             '(Guinea Guyana Haiti Honduras Hungary Iceland India)
-             '(Indonesia Iran Iraq Ireland Israel Italy Jamaica))
-       '(#(Egypt Gabon Guatemala India Jamaica)
-         #(Ecuador France Grenada Iceland Italy)
-         #(Dominica Finland Greece Hungary Israel)
-         #(Djibouti Fiji Ghana Honduras Ireland)
-         #(Denmark Ethiopia Germany Haiti Iraq)
-         #(Cyprus Estonia Georgia Guyana Iran)
-         #(Cuba Eritrea Gambia Guinea Indonesia))))
-
-     (test-case
-      "fold:lists-of-different-lengths"
-      (check-equal?
-       (fold (lambda (alpha beta gamma delta)
-               (cons (vector alpha beta gamma) delta))
-             '()
-             '(Japan Jordan Kazakhstan Kenya)
-             '(Kiribati Kuwait)
-             '(Kyrgyzstan Laos Latvia))
-       '(#(Jordan Kuwait Laos)
-         #(Japan Kiribati Kyrgyzstan))))
-
-     ;; FOLD-RIGHT
-
-     (test-case
-      "fold-right:one-null-list"
-      (check = (fold-right (lambda (alpha beta) (* alpha (+ beta 1))) 13 '())
-              13))
-
-     (test-case
-      "fold-right:one-singleton-list"
-      (check = (fold-right (lambda (alpha beta) (* alpha (+ beta 1))) 13 '(15))
-              210))
-
-     (test-case
-      "fold-right:one-longer-list"
-      (check = (fold-right (lambda (alpha beta) (* alpha (+ beta 1)))
-                            13
-                            '(15 17 19 21 23))
-              32868750))
-
-     (test-case
-      "fold-right:several-null-lists"
-      (check-eq? (fold-right vector 'Lebanon '() '() '() '() '())
-                  'Lebanon))
-
-     (test-case
-      "fold-right:several-singleton-lists"
-      (check-equal?
-       (fold-right vector 'Lesotho '(Liberia) '(Libya) '(Liechtenstein)
-                   '(Lithuania) '(Luxembourg))
-       #(Liberia Libya Liechtenstein Lithuania Luxembourg Lesotho)))
-
-     (test-case
-      "fold-right:several-longer-lists"
-      (check-equal?
-       (fold-right (lambda (alpha beta gamma delta epsilon zeta)
-                     (cons (vector alpha beta gamma delta epsilon) zeta))
-                   '()
-                   '(Macedonia Madagascar Malawi Malaysia Maldives Mali
-                               Malta)
-                   '(Mauritania Mauritius Mexico Micronesia Moldova Monaco
-                                Mongolia)
-                   '(Morocco Mozambique Myanmar Namibia Nauru Nepal
-                             Netherlands)
-                   '(Nicaragua Niger Nigeria Norway Oman Pakistan Palau)
-                   '(Panama Paraguay Peru Philippines Poland Portugal
-                            Qatar))
-
-       '(#(Macedonia Mauritania Morocco Nicaragua Panama)
-         #(Madagascar Mauritius Mozambique Niger Paraguay)
-         #(Malawi Mexico Myanmar Nigeria Peru)
-         #(Malaysia Micronesia Namibia Norway Philippines)
-         #(Maldives Moldova Nauru Oman Poland)
-         #(Mali Monaco Nepal Pakistan Portugal)
-         #(Malta Mongolia Netherlands Palau Qatar))))
-
-     (test-case
-      "fold-right:lists-of-different-lengths"
-      (check-equal?
-       (fold-right (lambda (alpha beta gamma delta)
-                     (cons (vector alpha beta gamma) delta))
-                   '()
-                   '(Romania Russia Rwanda Senegal)
-                   '(Seychelles Singapore)
-                   '(Slovakia Slovenia Somalia))
-       '(#(Romania Seychelles Slovakia)
-         #(Russia Singapore Slovenia))))
-
-     ;; PAIR-FOLD
-
-     (let* ((revappend (lambda (reversend base)
-                         (do ((rest reversend (cdr rest))
-                              (result base (cons (car rest) result)))
-                             ((null? rest) result))))
-            (revappall (lambda (first . rest)
-                         (let loop ((first first) (rest rest))
-                           (if (null? rest)
-                               first
-                               (revappend first
-                                          (loop (car rest)
-                                                (cdr rest))))))))
-       (test-suite
-        "Pair-fold tests"
-
-        (test-case
-         "pair-fold:one-null-list"
-         (check-equal?
-          (pair-fold revappend '(Spain Sudan) '())
-          '(Spain Sudan)))
-
-        (test-case
-         "pair-fold:one-singleton-list"
-         (check-equal?
-          (pair-fold revappend '(Suriname Swaziland) '(Sweden))
-          '(Sweden Suriname Swaziland)))
-
-        (test-case
-         "pair-fold:one-longer-list"
-         (check-equal?
-          (pair-fold revappend
-                     '(Switzerland Syria)
-                     '(Taiwan Tajikistan Tanzania Thailand Togo))
-          '(Togo Togo Thailand Togo Thailand Tanzania Togo
-                 Thailand Tanzania Tajikistan Togo Thailand
-                 Tanzania Tajikistan Taiwan Switzerland Syria)))
-
-        (test-case
-         "pair-fold:several-null-lists"
-         (check-equal?
-          (pair-fold revappall '(Tonga Tunisia) '() '() '() '() '())
-          '(Tonga Tunisia)))
-
-        (test-case
-         "pair-fold:several-singleton-lists"
-         (check-equal?
-          (pair-fold revappall
-                     '(Turkey Turkmenistan)
-                     '(Tuvalu)
-                     '(Uganda)
-                     '(Ukraine)
-                     '(Uruguay)
-                     '(Uzbekistan))
-          '(Tuvalu Uganda Ukraine Uruguay Uzbekistan Turkey
-                   Turkmenistan)))
-
-        (test-case
-         "pair-fold:several-longer-lists"
-         (check-equal?
-          (pair-fold revappall
-                     '(Vanuatu Venezuela)
-                     '(Vietnam Yemen Yugoslavia Zaire Zambia Zimbabwe
-                               Agnon)
-                     '(Aleixandre Andric Asturias Beckett Bellow
-                                  Benavente Bergson)
-                     '(Bjornson Brodsky Buck Bunin Camus Canetti
-                                Carducci)
-                     '(Cela Churchill Deledda Echegary Eliot Elytis
-                            Eucken)
-                     '(Faulkner Galsworthy Gide Gjellerup Golding
-                                Gordimer Hamsun))
-          '(Agnon Bergson Carducci Eucken Hamsun Agnon
-                  Zimbabwe Bergson Benavente Carducci Canetti
-                  Eucken Elytis Hamsun Gordimer Agnon Zimbabwe
-                  Zambia Bergson Benavente Bellow Carducci Canetti
-                  Camus Eucken Elytis Eliot Hamsun Gordimer
-                  Golding Agnon Zimbabwe Zambia Zaire Bergson
-                  Benavente Bellow Beckett Carducci Canetti Camus
-                  Bunin Eucken Elytis Eliot Echegary Hamsun
-                  Gordimer Golding Gjellerup Agnon Zimbabwe Zambia
-                  Zaire Yugoslavia Bergson Benavente Bellow
-                  Beckett Asturias Carducci Canetti Camus Bunin
-                  Buck Eucken Elytis Eliot Echegary Deledda Hamsun
-                  Gordimer Golding Gjellerup Gide Agnon Zimbabwe
-                  Zambia Zaire Yugoslavia Yemen Bergson Benavente
-                  Bellow Beckett Asturias Andric Carducci Canetti
-                  Camus Bunin Buck Brodsky Eucken Elytis Eliot
-                  Echegary Deledda Churchill Hamsun Gordimer
-                  Golding Gjellerup Gide Galsworthy Agnon Zimbabwe
-                  Zambia Zaire Yugoslavia Yemen Vietnam Bergson
-                  Benavente Bellow Beckett Asturias Andric
-                  Aleixandre Carducci Canetti Camus Bunin Buck
-                  Brodsky Bjornson Eucken Elytis Eliot Echegary
-                  Deledda Churchill Cela Hamsun Gordimer Golding
-                  Gjellerup Gide Galsworthy Faulkner Vanuatu
-                  Venezuela)))
-
-        (test-case
-         "pair-fold:lists-of-different-lengths"
-         (check-equal?
-          (pair-fold revappall
-                     '(Hauptmann Hemingway Hesse)
-                     '(Heyse Jensen Jimenez Johnson)
-                     '(Karlfeldt Kawabata)
-                     '(Kipling Lagerkvist Lagerlof Laxness Lewis))
-          '(Johnson Jimenez Jensen Kawabata Lewis Laxness
-                    Lagerlof Lagerkvist Johnson Jimenez Jensen Heyse
-                    Kawabata Karlfeldt Lewis Laxness Lagerlof
-                    Lagerkvist Kipling Hauptmann Hemingway
-                    Hesse)))
-        ))
-
-     ;; PAIR-FOLD-RIGHT
-
-     (let* ((revappend (lambda (reversend base)
-                         (do ((rest reversend (cdr rest))
-                              (result base (cons (car rest) result)))
-                             ((null? rest) result))))
-            (revappall (lambda (first . rest)
-                         (let loop ((first first) (rest rest))
-                           (if (null? rest)
-                               first
-                               (revappend first
-                                          (loop (car rest)
-                                                (cdr rest))))))))
-       (test-suite
-        "Pair-fold-right tests"
-        (test-case
-         "pair-fold-right:one-null-list"
-         (check-equal?
-          (pair-fold-right revappend '(Maeterlinck Mahfouz) '())
-          '(Maeterlinck Mahfouz)))
-
-        (test-case
-         "pair-fold-right:one-singleton-list"
-         (check-equal?
-          (pair-fold-right revappend '(Mann Martinson) '(Mauriac))
-          '(Mauriac Mann Martinson)))
-
-        (test-case
-         "pair-fold-right:one-longer-list"
-         (check-equal?
-          (pair-fold-right revappend
-                           '(Milosz Mistral)
-                           '(Mommsen Montale Morrison Neruda Oe))
-          '(Oe Neruda Morrison Montale Mommsen Oe Neruda
-               Morrison Montale Oe Neruda Morrison Oe Neruda Oe
-               Milosz Mistral)))
-
-        (test-case
-         "pair-fold-right:several-null-lists"
-         (check-equal?
-          (pair-fold-right revappall '(Pasternak Paz) '() '() '() '() '())
-          '(Pasternak Paz)))
-
-        (test-case
-         "pair-fold-right:several-singleton-lists"
-         (check-equal?
-          (pair-fold-right revappall
-                           '(Perse Pirandello)
-                           '(Pontoppidan)
-                           '(Quasimodo)
-                           '(Reymont)
-                           '(Rolland)
-                           '(Russell))
-          '(Pontoppidan Quasimodo Reymont Rolland Russell
-                        Perse Pirandello)))
-
-        (test-case
-         "pair-fold-right:several-longer-lists"
-         (check-equal?
-          (pair-fold-right revappall
-                           '(Sachs Sartre)
-                           '(Seferis Shaw Sholokov Siefert Sienkiewicz
-                                     Sillanpaa Simon)
-                           '(Singer Solzhenitsyn Soyinka Spitteler
-                                    Steinbeck Tagore Undset)
-                           '(Walcott White Yeats Anderson Andrews Angelina
-                                     Aransas)
-                           '(Archer Armstrong Alascosa Austin Bailey
-                                    Bandera Bastrop)
-                           '(Baylor Bee Bell Bexar Blanco Borden Bosque
-                                    Bowie))
-          '(Simon Sillanpaa Sienkiewicz Siefert Sholokov
-                  Shaw Seferis Undset Tagore Steinbeck Spitteler
-                  Soyinka Solzhenitsyn Singer Aransas Angelina
-                  Andrews Anderson Yeats White Walcott Bastrop
-                  Bandera Bailey Austin Alascosa Armstrong Archer
-                  Bowie Bosque Borden Blanco Bexar Bell Bee Baylor
-                  Simon Sillanpaa Sienkiewicz Siefert Sholokov
-                  Shaw Undset Tagore Steinbeck Spitteler Soyinka
-                  Solzhenitsyn Aransas Angelina Andrews Anderson
-                  Yeats White Bastrop Bandera Bailey Austin
-                  Alascosa Armstrong Bowie Bosque Borden Blanco
-                  Bexar Bell Bee Simon Sillanpaa Sienkiewicz
-                  Siefert Sholokov Undset Tagore Steinbeck
-                  Spitteler Soyinka Aransas Angelina Andrews
-                  Anderson Yeats Bastrop Bandera Bailey Austin
-                  Alascosa Bowie Bosque Borden Blanco Bexar Bell
-                  Simon Sillanpaa Sienkiewicz Siefert Undset
-                  Tagore Steinbeck Spitteler Aransas Angelina
-                  Andrews Anderson Bastrop Bandera Bailey Austin
-                  Bowie Bosque Borden Blanco Bexar Simon Sillanpaa
-                  Sienkiewicz Undset Tagore Steinbeck Aransas
-                  Angelina Andrews Bastrop Bandera Bailey Bowie
-                  Bosque Borden Blanco Simon Sillanpaa Undset
-                  Tagore Aransas Angelina Bastrop Bandera Bowie
-                  Bosque Borden Simon Undset Aransas Bastrop Bowie
-                  Bosque Sachs Sartre)))
-
-        (test-case
-         "pair-fold-right:lists-of-different-lengths"
-         (check-equal?
-          (pair-fold-right revappall
-                           '(Brazoria Brazos Brewster)
-                           '(Briscoe Brooks Brown Burleson)
-                           '(Burnet Caldwell)
-                           '(Calhoun Callahan Cameron Camp Carson))
-          '(Burleson Brown Brooks Briscoe Caldwell Burnet
-                     Carson Camp Cameron Callahan Calhoun Burleson
-                     Brown Brooks Caldwell Carson Camp Cameron
-                     Callahan Brazoria Brazos Brewster)))
-        ))
-
-     ;; REDUCE
-
-     (test-case
-      "reduce:null-list"
-      (check-true (zero? (reduce (lambda (alpha beta) (* alpha (+ beta 1))) 0 '()))))
-
-     (test-case
-      "reduce:singleton-list"
-      (check = (reduce (lambda (alpha beta) (* alpha (+ beta 1))) 0 '(25)) 25))
-
-     (test-case
-      "reduce:doubleton-list"
-      (check =
-              (reduce (lambda (alpha beta) (* alpha (+ beta 1)))
-                      0
-                      '(27 29))
-              812))
-
-     (test-case
-      "reduce:longer-list"
-      (check =
-              (reduce (lambda (alpha beta) (* alpha (+ beta 1)))
-                      0
-                      '(31 33 35 37 39 41 43))
-              94118227527))
-
-     ;; REDUCE-RIGHT
-
-     (test-case
-      "reduce-right:null-list"
-      (check-true (zero? (reduce-right (lambda (alpha beta) (* alpha (+ beta 1))) 0 '()))))
-
-     (test-case
-      "reduce-right:singleton-list"
-      (check =
-              (reduce-right (lambda (alpha beta) (* alpha (+ beta 1))) 0 '(25))
-              25))
-
-     (test-case
-      "reduce-right:doubleton-list"
-      (check =
-              (reduce-right (lambda (alpha beta) (* alpha (+ beta 1)))
-                            0
-                            '(27 29))
-              810))
-
-     (test-case
-      "reduce-right:longer-list"
-      (check =
-              (reduce-right (lambda (alpha beta) (* alpha (+ beta 1)))
-                            0
-                            '(31 33 35 37 39 41 43))
-              93259601719))
-
-     ;; APPEND-MAP
-
-     (test-case
-      "append-map:one-null-list"
-      (check-true (null? (append-map (lambda (element) (list element element)) '()))))
-
-     (test-case
-      "append-map:one-singleton-list"
-      (check-equal? (append-map (lambda (element) (list element element)) '(Cass))
-                     '(Cass Cass)))
-
-     (test-case
-      "append-map:one-longer-list"
-      (check-equal? (append-map (lambda (element) (list element element))
-                                 '(Castro Chambers Cherokee Childress Clay))
-                     '(Castro Castro Chambers Chambers Cherokee Cherokee
-                              Childress Childress Clay Clay)))
-
-     (test-case
-      "append-map:several-null-lists"
-      (check-true (null? (append-map (lambda elements (reverse elements))
-                                      '() '() '() '() '()))))
-
-     (test-case
-      "append-map:several-singleton-lists"
-      (check-equal? (append-map (lambda elements (reverse elements))
-                                 '(Cochran)
-                                 '(Coke)
-                                 '(Coleman)
-                                 '(Collin)
-                                 '(Collingsworth))
-                     '(Collingsworth Collin Coleman Coke Cochran)))
-
-     (test-case
-      "append-map:several-longer-lists"
-      (check-equal?
-       (append-map (lambda elements (reverse elements))
-                   '(Colorado Comal Comanche Concho Cooke Coryell
-                              Cottle)
-                   '(Crane Crockett Crosby Culberson Dallam Dallas
-                           Dawson)
-                   '(Delta Denton Dewitt Dickens Dimmit Donley Duval)
-                   '(Eastland Ector Edwards Ellis Erath Falls Fannin)
-                   '(Fayette Fisher Floyd Foard Franklin Freestone
-                             Frio))
-       '(Fayette Eastland Delta Crane Colorado Fisher Ector
-                 Denton Crockett Comal Floyd Edwards Dewitt Crosby
-                 Comanche Foard Ellis Dickens Culberson Concho
-                 Franklin Erath Dimmit Dallam Cooke Freestone Falls
-                 Donley Dallas Coryell Frio Fannin Duval Dawson
-                 Cottle)))
-
-     ;; APPEND-MAP!
-
-     (test-case
-      "append-map!:one-null-list"
-      (check-true (null? (append-map! (lambda (element) (list element element))
-                                       (list)))))
-
-     (test-case
-      "append-map!:one-singleton-list"
-      (check-equal?
-       (append-map! (lambda (element) (list element element))
-                    (list 'Gaines))
-       '(Gaines Gaines)))
-
-     (test-case
-      "append-map!:one-longer-list"
-      (check-equal?
-       (append-map! (lambda (element) (list element element))
-                    (list 'Galveston 'Garza 'Gillespie 'Glasscock
-                          'Goliad))
-       '(Galveston Galveston Garza Garza Gillespie
-                   Gillespie Glasscock Glasscock Goliad Goliad)))
-
-     (test-case
-      "append-map!:several-null-lists"
-      (check-true (null? (append-map! (lambda elements (reverse elements))
-                                       (list)
-                                       (list)
-                                       (list)
-                                       (list)
-                                       (list)))))
-
-     (test-case
-      "append-map!:several-singleton-lists"
-      (check-equal?
-       (append-map! (lambda elements (reverse elements))
-                    (list 'Gonzales)
-                    (list 'Gray)
-                    (list 'Grayson)
-                    (list 'Gregg)
-                    (list 'Grimes))
-       '(Grimes Gregg Grayson Gray Gonzales)))
-
-     (test-case
-      "append-map!:several-longer-lists"
-      (check-equal?
-       (append-map! (lambda elements (reverse elements))
-                    (list 'Guadalupe 'Hale 'Hall 'Hamilton 'Hansford
-                          'Hardeman 'Hardin)
-                    (list 'Harris 'Harrison 'Hartley 'Haskell 'Hays
-                          'Hemphill 'Henderson)
-                    (list 'Hidalgo 'Hill 'Hockley 'Hood 'Hopkins
-                          'Houston 'Howard)
-                    (list 'Hudspeth 'Hunt 'Hutchinson 'Irion 'Jack
-                          'Jackson 'Jasper)
-                    (list 'Jefferson 'Johnson 'Jones 'Karnes 'Kaufman
-                          'Kendall 'Kenedy))
-       '(Jefferson Hudspeth Hidalgo Harris Guadalupe
-                   Johnson Hunt Hill Harrison Hale Jones Hutchinson
-                   Hockley Hartley Hall Karnes Irion Hood Haskell
-                   Hamilton Kaufman Jack Hopkins Hays Hansford
-                   Kendall Jackson Houston Hemphill Hardeman Kenedy
-                   Jasper Howard Henderson Hardin)))
-
-     ;; MAP!
-
-     (test-case
-      "map!:one-null-list"
-      (check-true (null? (map! vector (list)))))
-
-     (test-case
-      "map!:one-singleton-list"
-      (check-equal?  (map! vector (list 'Kent))
-                      '(#(Kent))))
-
-     (test-case
-      "map!:one-longer-list"
-      (check-equal?
-       (map! vector (list 'Kerr 'Kimble 'King 'Kinney 'Kleberg))
-       '(#(Kerr) #(Kimble) #(King) #(Kinney) #(Kleberg))))
-
-     (test-case
-      "map!:several-null-lists"
-      (check-true (null? (map! vector (list) (list) (list) (list) (list)))))
-
-     (test-case
-      "map!:several-singleton-lists"
-      (check-equal?
-       (map! vector
-             (list 'Knox)
-             (list 'Lamar)
-             (list 'Lamb)
-             (list 'Lampasas)
-             (list 'Lavaca))
-       '(#(Knox Lamar Lamb Lampasas Lavaca))))
-
-     (test-case
-      "map!:several-longer-lists"
-      (check-equal?
-       (map! vector
-             (list 'Lee 'Leon 'Liberty 'Limestone 'Lipscomb 'Llano
-                   'Loving)
-             (list 'Lubbock 'Lynn 'McCulloch 'McLennan 'McMullen
-                   'Madison 'Marion)
-             (list 'Martin 'Mason 'Matagorda 'Maverick 'Medina
-                   'Menard 'Midland)
-             (list 'Milam 'Mills 'Mitchell 'Montague 'Montgomery
-                   'Moore 'Morris)
-             (list 'Motley 'Nacogdoches 'Navarro 'Newton 'Nolan
-                   'Nueces 'Ochiltree))
-       '(#(Lee Lubbock Martin Milam Motley)
-         #(Leon Lynn Mason Mills Nacogdoches)
-         #(Liberty McCulloch Matagorda Mitchell Navarro)
-         #(Limestone McLennan Maverick Montague Newton)
-         #(Lipscomb McMullen Medina Montgomery Nolan)
-         #(Llano Madison Menard Moore Nueces)
-         #(Loving Marion Midland Morris Ochiltree))))
-
-     ;; MAP-IN-ORDER
-
-     (test-case
-      "map-in-order:one-null-list"
-      (check-true (null? (let ((counter 0))
-                            (map-in-order (lambda (element)
-                                            (set! counter (+ counter 1))
-                                            (cons counter element))
-                                          '())))))
-
-     (test-case
-      "map-in-order:one-singleton-list"
-      (check-equal?
-       (let ((counter 0))
-         (map-in-order (lambda (element)
-                         (set! counter (+ counter 1))
-                         (cons counter element))
-                       '(Oldham)))
-       '((1 . Oldham))))
-
-     (test-case
-      "map-in-order:one-longer-list"
-      (check-equal?
-       (let ((counter 0))
-         (map-in-order (lambda (element)
-                         (set! counter (+ counter 1))
-                         (cons counter element))
-                       '(Orange Panola Parker Parmer Pecos)))
-       '((1 . Orange)
-         (2 . Panola)
-         (3 . Parker)
-         (4 . Parmer)
-         (5 . Pecos))))
-
-     (test-case
-      "map-in-order:several-null-lists"
-      (check-true (null? (let ((counter 0))
-                            (map-in-order (lambda elements
-                                            (set! counter (+ counter 1))
-                                            (apply vector counter elements))
-                                          '() '() '() '() '())))))
-
-     (test-case
-      "map-in-order:several-singleton-lists"
-      (check-equal?
-       (let ((counter 0))
-         (map-in-order (lambda elements
-                         (set! counter (+ counter 1))
-                         (apply vector counter elements))
-                       '(Polk)
-                       '(Potter)
-                       '(Presidio)
-                       '(Rains)
-                       '(Randall)))
-       '(#(1 Polk Potter Presidio Rains Randall))))
-
-     (test-case
-      "map-in-order:several-longer-lists"
-      (check-equal?
-       (let ((counter 0))
-         (map-in-order (lambda elements
-                         (set! counter (+ counter 1))
-                         (apply vector counter elements))
-                       '(Reagan Real Reeves Refugio Roberts Robertson
-                                Rockwall)
-                       '(Runnels Rusk Sabine Schleicher Scurry
-                                 Shackelford Shelby)
-                       '(Sherman Smith Somervell Starr Stephens
-                                 Sterling Stonewall)
-                       '(Sutton Swisher Tarrant Taylor Terrell Terry
-                                Throckmorton)
-                       '(Titus Travis Trinity Tyler Upshur Upton
-                               Uvalde)))
-       '(#(1 Reagan Runnels Sherman Sutton Titus)
-         #(2 Real Rusk Smith Swisher Travis)
-         #(3 Reeves Sabine Somervell Tarrant Trinity)
-         #(4 Refugio Schleicher Starr Taylor Tyler)
-         #(5 Roberts Scurry Stephens Terrell Upshur)
-         #(6 Robertson Shackelford Sterling Terry Upton)
-         #(7 Rockwall Shelby Stonewall Throckmorton
-             Uvalde))))
-
-     ;; PAIR-FOR-EACH
-
-     (test-case
-      "pair-for-each:one-null-list"
-      (check-true
-       (null? (let ((base '()))
-                (pair-for-each (lambda (tail)
-                                 (set! base (append tail base)))
-                               '())
-                base))))
-
-     (test-case
-      "pair-for-each:one-singleton-list"
-      (check-equal?
-       (let ((base '()))
-         (pair-for-each (lambda (tail)
-                          (set! base (append tail base)))
-                        '(Victoria))
-         base)
-       '(Victoria)))
-
-     (test-case
-      "pair-for-each:one-longer-list"
-      (check-equal?
-       (let ((base '()))
-         (pair-for-each (lambda (tail)
-                          (set! base (append tail base)))
-                        '(Walker Waller Ward Washington Webb))
-         base)
-       '(Webb Washington Webb Ward Washington Webb Waller
-              Ward Washington Webb Walker Waller Ward
-              Washington Webb)))
-
-     (test-case
-      "pair-for-each:several-null-lists"
-      (check-true
-       (null? (let ((base '()))
-                (pair-for-each (lambda tails
-                                 (set! base
-                                       (cons (apply vector tails) base)))
-                               '() '() '() '() '())
-                base))))
-
-     (test-case
-      "pair-for-each:several-singleton-lists"
-      (check-equal?
-       (let ((base '()))
-         (pair-for-each (lambda tails
-                          (set! base
-                                (cons (apply vector tails) base)))
-                        '(Wharton)
-                        '(Wheeler)
-                        '(Wichita)
-                        '(Wilbarger)
-                        '(Willacy))
-         base)
-       '(#((Wharton) (Wheeler) (Wichita) (Wilbarger)
-           (Willacy)))))
-
-     (test-case
-      "pair-for-each:several-longer-lists"
-      (check-equal?
-       (let ((base '()))
-         (pair-for-each (lambda tails
-                          (set! base
-                                (cons (apply vector tails) base)))
-                        '(Williamson Wilson Winkler Wise Wood Yoakum
-                                     Young)
-                        '(Zapata Zavala Admiral Advil Ajax Anacin
-                                 Arrid)
-                        '(Arnold Ban Barbie Beech Blockbuster Bounce
-                                 Breck)
-                        '(Budweiser Bufferin BVD Carrier Celeste
-                                    Charmin Cheer)
-                        '(Cheerios Cinemax Clairol Clorets Combat
-                                   Comet Coppertone))
-         base)
-       '(#((Young) (Arrid) (Breck) (Cheer) (Coppertone))
-         #((Yoakum Young) (Anacin Arrid) (Bounce Breck)
-           (Charmin Cheer) (Comet Coppertone))
-         #((Wood Yoakum Young)
-           (Ajax Anacin Arrid)
-           (Blockbuster Bounce Breck)
-           (Celeste Charmin Cheer)
-           (Combat Comet Coppertone))
-         #((Wise Wood Yoakum Young)
-           (Advil Ajax Anacin Arrid)
-           (Beech Blockbuster Bounce Breck)
-           (Carrier Celeste Charmin Cheer)
-           (Clorets Combat Comet Coppertone))
-         #((Winkler Wise Wood Yoakum Young)
-           (Admiral Advil Ajax Anacin Arrid)
-           (Barbie Beech Blockbuster Bounce Breck)
-           (BVD Carrier Celeste Charmin Cheer)
-           (Clairol Clorets Combat Comet Coppertone))
-         #((Wilson Winkler Wise Wood Yoakum Young)
-           (Zavala Admiral Advil Ajax Anacin Arrid)
-           (Ban Barbie Beech Blockbuster Bounce Breck)
-           (Bufferin BVD Carrier Celeste Charmin Cheer)
-           (Cinemax Clairol Clorets Combat Comet
-                    Coppertone))
-         #((Williamson Wilson Winkler Wise Wood Yoakum
-                       Young)
-           (Zapata Zavala Admiral Advil Ajax Anacin Arrid)
-           (Arnold Ban Barbie Beech Blockbuster Bounce
-                   Breck)
-           (Budweiser Bufferin BVD Carrier Celeste Charmin
-                      Cheer)
-           (Cheerios Cinemax Clairol Clorets Combat Comet
-                     Coppertone)))))
-
-     ;; FILTER-MAP
-
-     (test-case
-      "filter-map:one-null-list"
-      (check-true (null? (filter-map values '()))))
-
-     (test-case
-      "filter-map:one-singleton-list"
-      (check-equal?
-       (filter-map values '(Crest))
-       '(Crest)))
-
-     (test-case
-      "filter-map:one-list-all-elements-removed"
-      (check-true
-       (null? (filter-map (lambda (x) #f)
-                          '(Crisco Degree Doritos Dristan Efferdent)))))
-
-     (test-case
-      "filter-map:one-list-some-elements-removed"
-      (check-equal?
-       (filter-map (lambda (n) (and (even? n) n))
-                   '(44 45 46 47 48 49 50))
-       '(44 46 48 50)))
-
-     (test-case
-      "filter-map:one-list-no-elements-removed"
-      (check-equal?
-       (filter-map values '(ESPN Everready Excedrin Fab Fantastik))
-       '(ESPN Everready Excedrin Fab Fantastik)))
-
-     (test-case
-      "filter-map:several-null-lists"
-      (check-true (null? (filter-map vector '() '() '() '() '()))))
-
-     (test-case
-      "filter-map:several-singleton-lists"
-      (check-equal?
-       (filter-map vector
-                   '(Foamy)
-                   '(Gatorade)
-                   '(Glad)
-                   '(Gleem)
-                   '(Halcion))
-       '(#(Foamy Gatorade Glad Gleem Halcion))))
-
-     (test-case
-      "filter-map:several-lists-all-elements-removed"
-      (check-true
-       (null?
-        (filter-map (lambda arguments #f)
-                    '(Hanes HBO Hostess Huggies Ivory Kent Kinney)
-                    '(Kleenex Knorr Lee Lenox Lerner Listerine
-                              Marlboro)
-                    '(Mazola Michelob Midas Miller NBC Newsweek
-                             Noxema)
-                    '(NutraSweet Oreo Pampers People Planters
-                                 Playskool Playtex)
-                    '(Prego Prell Prozac Purex Ritz Robitussin
-                            Rolaids)))))
-
-     (test-case
-      "filter-map:several-lists-some-elements-removed"
-      (check-equal?
-       (filter-map (lambda arguments
-                     (let ((sum (apply + arguments)))
-                       (and (odd? sum) sum)))
-                   '(51 52 53 54 55 56 57)
-                   '(58 59 60 61 62 63 64)
-                   '(65 66 67 68 69 70 71)
-                   '(72 73 74 75 76 77 78)
-                   '(79 80 81 82 83 84 85))
-       '(325 335 345 355)))
-
-     (test-case
-      "filter-map:several-lists-no-elements-removed"
-      (check-equal?
-       (filter-map vector
-                   '(Ronzoni Ruffles Scotch Skippy SnackWell Snapple
-                             Spam)
-                   '(Sprite Swanson Thomas Tide Tonka Trojan
-                            Tupperware)
-                   '(Tylenol Velveeta Vicks Victory Visine Wheaties
-                             Wise)
-                   '(Wonder Ziploc Abbott Abingdon Ackley Ackworth
-                            Adair)
-                   '(Adams Adaville Adaza Adel Adelphi Adena Afton))
-       '(#(Ronzoni Sprite Tylenol Wonder Adams)
-         #(Ruffles Swanson Velveeta Ziploc Adaville)
-         #(Scotch Thomas Vicks Abbott Adaza)
-         #(Skippy Tide Victory Abingdon Adel)
-         #(SnackWell Tonka Visine Ackley Adelphi)
-         #(Snapple Trojan Wheaties Ackworth Adena)
-         #(Spam Tupperware Wise Adair Afton))))
-
-     ))
-  )
-;;; fold-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/lset-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/lset-test.rkt
deleted file mode 100644
index 6e08cdb319..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/lset-test.rkt
+++ /dev/null
@@ -1,111 +0,0 @@
-;;;
-;;; <lset-test.rkt> ---- Lists as Sets Tests
-;;; Time-stamp: <05/12/16 21:15:22 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; SRFI-1 is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; SRFI-1 is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with SRFI-1; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-;; Originally created by:
-
-;; John David Stone
-;; Department of Mathematics and Computer Science
-;; Grinnell College
-;; stone@math.grin.edu
-
-(module lset-test
-  mzscheme
-  (require rackunit)
-  (require srfi/1/lset)
-
-  (provide lset-tests)
-
-  (define lset-tests
-    (test-suite
-     "List as set procedures tests"
-
-     (test-case
-      "lset<=:singleton"
-      (check-true (lset<= eq?)))
-
-     (test-case
-      "lset<=:empty-list"
-      (check-true (lset<= eq? (list))))
-
-     (test-case
-      "lset<=:empty-lists"
-      (check-true (lset<= eq? (list) (list))))
-
-     (test-case
-      "lset<=:normal-case"
-      (check-true (lset<= = (list 1 2 3 4) (list 1 2 3 4))))
-
-     (test-case
-      "lset<=:normal-case-fail"
-      (check-true (not (lset<= = (list 2 3 4 5) (list 1 2 3 4)))))
-
-     (test-case
-      "lset=:empty-list"
-      (check-true (lset= eq?)))
-
-     (test-case
-      "lset=:singleton"
-      (check-true (lset= eq? '(a b c d e))))
-
-     (test-case
-      "lset=:normal-case"
-      (check-true (lset= = '(1 2 3 4 5) '(5 4 3 2 1))))
-
-     (test-case
-      "lset=:normal-case-fail"
-      (check-false (lset= eq? '(a b c d e) '(a b c d))))
-
-     (test-case
-      "lset-xor:empty-list"
-      (check-equal? (lset-xor eq?) '()))
-
-     (test-case
-      "lset-xor:singleton"
-      (check-equal? (lset-xor eq? '(a b c d e)) '(a b c d e)))
-
-     (test-case
-      "lset-xor:normal-case"
-      (check-true (lset= eq?
-                          (lset-xor eq? '(a b c d e) '(a e i o u))
-                          '(d c b i o u))))
-
-     (test-case
-      "lset-xor!:empty-list"
-      (check-equal? (lset-xor! eq?) '()))
-
-     (test-case
-      "lset-xor!:singleton"
-      (check-equal? (lset-xor! eq? '(a b c d e)) '(a b c d e)))
-
-     (test-case
-      "lset-xor!:normal-case"
-      (check-true (lset= eq?
-                          (lset-xor! eq? '(a b c d e) '(a e i o u))
-                          '(d c b i o u))))
-     ))
-  )
-;;; lset-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/misc-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/misc-test.rkt
deleted file mode 100644
index 6a2a7c5a50..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/misc-test.rkt
+++ /dev/null
@@ -1,382 +0,0 @@
-;;;
-;;; <misc-test.rkt> ---- Misc list procedure tests
-;;; Time-stamp: <05/12/16 21:15:50 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; SRFI-1 is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; SRFI-1 is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with SRFI-1; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-;; Originally created by:
-
-;; John David Stone
-;; Department of Mathematics and Computer Science
-;; Grinnell College
-;; stone@math.grin.edu
-
-(module misc-test
-  mzscheme
-  (require rackunit)
-  (require (all-except srfi/1/misc append! reverse!)
-   (rename srfi/1/misc s:append! append!)
-   (rename srfi/1/misc s:reverse! reverse!))
-
-  (provide misc-tests)
-
-  (define misc-tests
-    (test-suite
-     "Miscellaneous list procedures tests"
-
-     ;; ZIP
-
-     (test-case
-      "zip:all-lists-empty"
-      (check-true (null? (zip '() '() '() '() '()))))
-
-     (test-case
-      "zip:one-list"
-      (check-equal? (zip '(Pisces Puppis Reticulum))
-                     '((Pisces) (Puppis) (Reticulum))))
-
-     (test-case
-      "zip:two-lists"
-      (check-equal? (zip '(Sagitta Sagittarius Scorpio Scutum Serpens)
-                          '(Sextans Taurus Telescopium Triangulum Tucana))
-                     '((Sagitta Sextans)
-                       (Sagittarius Taurus)
-                       (Scorpio Telescopium)
-                       (Scutum Triangulum)
-                       (Serpens Tucana))))
-
-     (test-case
-      "zip:short-lists"
-      (check-equal? (zip '(Vela) '(Virgo) '(Volens) '(Vulpecula))
-                     '((Vela Virgo Volens Vulpecula))))
-
-     (test-case
-      "zip:several-lists"
-      (check-equal? (zip '(actinium aluminum americium antimony argon)
-                          '(arsenic astatine barium berkeleium beryllium)
-                          '(bismuth boron bromine cadmium calcium)
-                          '(californium carbon cerium cesium chlorine)
-                          '(chromium cobalt copper curium dysprosium)
-                          '(einsteinium erbium europium fermium fluorine)
-                          '(francium gadolinium gallium germanium gold))
-                     '((actinium arsenic bismuth californium
-                                 chromium einsteinium francium)
-                       (aluminum astatine boron carbon cobalt
-                                 erbium gadolinium)
-                       (americium barium bromine cerium copper
-                                  europium gallium)
-                       (antimony berkeleium cadmium cesium curium
-                                 fermium germanium)
-                       (argon beryllium calcium chlorine
-                              dysprosium fluorine gold))))
-
-     ;; UNZIP2
-
-     (test-case
-      "unzip2:empty-list-of-lists"
-      (let-values (((firsts seconds) (unzip2 '())))
-        (check-true (and (null? firsts) (null? seconds)))))
-
-     (test-case
-      "unzip2:singleton-list-of-lists"
-      (let-values (((firsts seconds) (unzip2 '((retriever rottweiler)))))
-        (check-true (and (equal? firsts '(retriever))
-                          (equal? seconds '(rottweiler))))))
-
-     (test-case
-      "unzip2:longer-list-of-lists"
-      (let-values (((firsts seconds)
-                    (unzip2 '((saluki samoyed)
-                              (shipperke schnauzer)
-                              (setter shepherd)
-                              (skye spaniel)
-                              (spitz staghound)))))
-        (check-true (and (equal? firsts '(saluki shipperke setter skye spitz))
-                          (equal? seconds '(samoyed schnauzer shepherd spaniel
-                                                    staghound))))))
-
-     (test-case
-      "unzip2:lists-with-extra-elements"
-      (let-values (((firsts seconds)
-                    (unzip2 '((terrier turnspit vizsla wiemaraner)
-                              (whippet wolfhound)
-                              (bells bones bongo carillon celesta)
-                              (chimes clappers conga)))))
-        (check-true (and (equal? firsts '(terrier whippet bells chimes))
-                          (equal? seconds
-                                  '(turnspit wolfhound bones clappers))))))
-
-     ;; UNZIP3
-
-     (test-case
-      "unzip3:empty-list-of-lists"
-      (let-values (((firsts seconds thirds)
-                    (unzip3 '())))
-        (check-true (and (null? firsts) (null? seconds) (null? thirds)))))
-
-     (test-case
-      "unzip3:singleton-list-of-lists"
-      (let-values (((firsts seconds thirds)
-                    (unzip3 '((cymbals gamelan glockenspiel)))))
-        (check-true (and (equal? firsts '(cymbals))
-                          (equal? seconds '(gamelan))
-                          (equal? thirds '(glockenspiel))))))
-
-     (test-case
-      "unzip3:longer-list-of-lists"
-      (let-values (((firsts seconds thirds)
-                    (unzip3 '((gong handbells kettledrum)
-                              (lyra maraca marimba)
-                              (mbira membranophone metallophone)
-                              (nagara naker rattle)
-                              (sizzler snappers tabor)))))
-        (check-true (and (equal? firsts '(gong lyra mbira nagara sizzler))
-                          (equal? seconds '(handbells maraca membranophone naker
-                                                      snappers))
-                          (equal? thirds '(kettledrum marimba metallophone rattle
-                                                      tabor))))))
-
-     (test-case
-      "unzip3:lists-with-extra-elements"
-      (let-values (((firsts seconds thirds)
-                    (unzip3 '((tambourine timbrel timpani tintinnabula tonitruone)
-                              (triangle vibraphone xylophone)
-                              (baccarat banker bezique bingo bridge canasta)
-                              (casino craps cribbage euchre)))))
-        (check-true (and (equal? firsts '(tambourine triangle baccarat casino))
-                          (equal? seconds '(timbrel vibraphone banker craps))
-                          (equal? thirds
-                                  '(timpani xylophone bezique cribbage))))))
-
-     ;; UNZIP4
-
-     (test-case
-      "unzip4:empty-list-of-lists"
-      (let-values (((firsts seconds thirds fourths)
-                    (unzip4 '())))
-        (check-true (and (null? firsts)
-                          (null? seconds)
-                          (null? thirds)
-                          (null? fourths)))))
-
-     (test-case
-      "unzip4:singleton-list-of-lists"
-      (let-values (((firsts seconds thirds fourths)
-                    (unzip4 '((fantan faro gin hazard)))))
-        (check-true (and (equal? firsts '(fantan))
-                          (equal? seconds '(faro))
-                          (equal? thirds '(gin))
-                          (equal? fourths '(hazard))))))
-
-     (test-case
-      "unzip4:longer-list-of-lists"
-      (let-values (((firsts seconds thirds fourths)
-                    (unzip4 '((hearts keno loo lottery)
-                              (lotto lowball monte numbers)
-                              (ombre picquet pinball pinochle)
-                              (poker policy quinze romesteq)
-                              (roulette rum rummy skat)))))
-        (check-true (and (equal? firsts '(hearts lotto ombre poker roulette))
-                          (equal? seconds '(keno lowball picquet policy rum))
-                          (equal? thirds '(loo monte pinball quinze rummy))
-                          (equal? fourths
-                                  '(lottery numbers pinochle romesteq skat))))))
-
-     (test-case
-      "unzip4:lists-with-extra-elements"
-      (let-values (((firsts seconds thirds fourths)
-                    (unzip4 '((adamant agate alexandrite amethyst aquamarine
-                                       beryl)
-                              (bloodstone brilliant carbuncle carnelian)
-                              (chalcedony chrysoberyl chrysolite chrysoprase
-                                          citrine coral demantoid)
-                              (diamond emerald garnet girasol heliotrope)))))
-        (check-true (and (equal? firsts '(adamant bloodstone chalcedony diamond))
-                          (equal? seconds '(agate brilliant chrysoberyl emerald))
-                          (equal? thirds
-                                  '(alexandrite carbuncle chrysolite garnet))
-                          (equal? fourths
-                                  '(amethyst carnelian chrysoprase girasol))))))
-
-     ;; UNZIP5
-
-     (test-case
-      "unzip5:empty-list-of-lists"
-      (let-values (((firsts seconds thirds fourths fifths)
-                    (unzip5 '())))
-        (check-true
-         (and (null? firsts)
-              (null? seconds)
-              (null? thirds)
-              (null? fourths)
-              (null? fifths)))))
-
-     (test-case
-      "unzip5:singleton-list-of-lists"
-      (let-values (((firsts seconds thirds fourths fifths)
-                    (unzip5 '((hyacinth jacinth jade jargoon jasper)))))
-        (lambda (firsts seconds thirds fourths fifths)
-          (and (equal? firsts '(hyacinth))
-               (equal? seconds '(jacinth))
-               (equal? thirds '(jade))
-               (equal? fourths '(jargoon))
-               (equal? fifths '(jasper))))))
-
-     (test-case
-      "unzip5:longer-list-of-lists"
-      (let-values (((firsts seconds thirds fourths fifths)
-                    (unzip5 '((kunzite moonstone morganite onyx opal)
-                              (peridot plasma ruby sapphire sard)
-                              (sardonyx spinel star sunstone topaz)
-                              (tourmaline turquoise zircon Argus basilisk)
-                              (Bigfoot Briareus bucentur Cacus Caliban)))))
-        (check-true
-         (and (equal? firsts
-                      '(kunzite peridot sardonyx tourmaline Bigfoot))
-              (equal? seconds
-                      '(moonstone plasma spinel turquoise Briareus))
-              (equal? thirds '(morganite ruby star zircon bucentur))
-              (equal? fourths '(onyx sapphire sunstone Argus Cacus))
-              (equal? fifths '(opal sard topaz basilisk Caliban))))))
-
-     (test-case
-      "unzip5:lists-with-extra-elements"
-      (let-values (((firsts seconds thirds fourths fifths)
-                    (unzip5 '((centaur Cerberus Ceto Charybdis chimera cockatrice
-                                       Cyclops)
-                              (dipsas dragon drake Echidna Geryon)
-                              (Gigantes Gorgon Grendel griffin Harpy hippocampus
-                                        hippocentaur hippocerf)
-                              (hirocervus Hydra Kraken Ladon manticore Medusa)))))
-        (check-true
-         (and (equal? firsts '(centaur dipsas Gigantes hirocervus))
-              (equal? seconds '(Cerberus dragon Gorgon Hydra))
-              (equal? thirds '(Ceto drake Grendel Kraken))
-              (equal? fourths '(Charybdis Echidna griffin Ladon))
-              (equal? fifths '(chimera Geryon Harpy manticore))))))
-
-     ;; APPEND!
-
-     (test-case
-      "append!:no-arguments"
-      (check-true (null? (s:append!))))
-
-     (test-case
-      "append!:one-argument"
-      (check-equal? (s:append! (list 'mermaid 'merman 'Minotaur))
-                     '(mermaid merman Minotaur)))
-
-     (test-case
-      "append!:several-arguments"
-      (check-equal?
-       (s:append! (list 'nixie 'ogre 'ogress 'opinicus)
-                  (list 'Orthos)
-                  (list 'Pegasus 'Python)
-                  (list 'roc 'Sagittary 'salamander 'Sasquatch 'satyr)
-                  (list 'Scylla 'simurgh 'siren))
-       '(nixie ogre ogress opinicus Orthos Pegasus
-               Python roc Sagittary salamander Sasquatch
-               satyr Scylla simurgh siren)))
-
-     (test-case
-      "append!:some-null-arguments"
-      (check-equal?
-       (s:append! (list) (list) (list 'Sphinx 'Talos 'troll) (list)
-                  (list 'Typhoeus) (list) (list) (list))
-       '(Sphinx Talos troll Typhoeus)))
-
-     (test-case
-      "append!:all-null-arguments"
-      (check-true (null? (s:append! (list) (list) (list) (list) (list)))))
-
-     ;; APPEND-REVERSE
-
-     (test-case
-      "append-reverse:first-argument-null"
-      (check-equal? (append-reverse '() '(Typhon unicorn vampire werewolf))
-                     '(Typhon unicorn vampire werewolf)))
-
-     (test-case
-      "append-reverse:second-argument-null"
-      (check-equal? (append-reverse '(windigo wivern xiphopagus yeti zombie) '())
-                     '(zombie yeti xiphopagus wivern windigo)))
-
-     (test-case
-      "append-reverse:both-arguments-null"
-      (check-true (null? (append-reverse '() '()))))
-
-     (test-case
-      "append-reverse:neither-argument-null"
-      (check-equal?
-       (append-reverse '(Afghanistan Albania Algeria Andorra)
-                       '(Angola Argentina Armenia))
-       '(Andorra Algeria Albania Afghanistan Angola
-                 Argentina Armenia)))
-
-     ;; APPEND-REVERSE!
-
-     (test-case
-      "append-reverse!:first-argument-null"
-      (check-equal? (append-reverse! (list)
-                                      (list 'Australia 'Austria 'Azerbaijan))
-                     '(Australia Austria Azerbaijan)))
-
-     (test-case
-      "append-reverse!:second-argument-null"
-      (check-equal? (append-reverse! (list 'Bahrain 'Bangladesh 'Barbados
-                                            'Belarus 'Belgium)
-                                      (list))
-                     '(Belgium Belarus Barbados Bangladesh Bahrain)))
-
-     (test-case
-      "append-reverse!:both-arguments-null"
-      (check-true (null? (append-reverse! (list) (list)))))
-
-     (test-case
-      "append-reverse!:neither-argument-null"
-      (check-equal? (append-reverse! (list 'Belize 'Benin 'Bhutan 'Bolivia)
-                                      (list 'Bosnia 'Botswana 'Brazil))
-                     '(Bolivia Bhutan Benin Belize Bosnia Botswana Brazil)))
-
-     ;; REVERSE!
-
-     (test-case
-      "reverse!:empty-list"
-      (check-true (null? (s:reverse! (list)))))
-
-     (test-case
-      "reverse!:singleton-list"
-      (check-equal? (s:reverse! (list 'Brunei))
-                     '(Brunei)))
-
-     (test-case
-      "reverse!:longer-list"
-      (check-equal? (s:reverse! (list 'Bulgaria 'Burundi 'Cambodia 'Cameroon
-                                       'Canada))
-                     '(Canada Cameroon Cambodia Burundi Bulgaria)))
-
-     ))
-  )
-
-;;; misc-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/predicate-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/predicate-test.rkt
deleted file mode 100644
index 3effc3ad84..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/predicate-test.rkt
+++ /dev/null
@@ -1,168 +0,0 @@
-;;;
-;;; <predicate-test.rkt> ---- List predicate tests
-;;; Time-stamp: <05/12/16 21:16:27 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; SRFI-1 is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; SRFI-1 is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with SRFI-1; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-;; Originally created by:
-
-;; John David Stone
-;; Department of Mathematics and Computer Science
-;; Grinnell College
-;; stone@math.grin.edu
-
-(module predicate-test
-  mzscheme
-  (require rackunit)
-  (require srfi/1/predicate
-   srfi/1/cons)
-
-  (provide predicate-tests)
-
-  (define predicate-tests
-    (test-suite
-     "List predicate tests"
-
-     ;; PROPER-LIST?
-
-     (test-case
-      "proper-list?:list"
-      (check-true (proper-list? (list 1 2 3 4 5))))
-
-     (test-case
-      "proper-list?:dotted-list"
-      (check-true (not (proper-list? (cons 1 (cons 2 (cons 3 4)))))))
-
-     (test-case
-      "proper-list?:zero-length"
-      (check-true (proper-list? (list))))
-
-     (test-case
-      "proper-list?:circular-list"
-      (check-true (not (proper-list? (circular-list 'a 'b 'c 'd)))))
-
-     (test-case
-      "proper-list?:simple-value"
-      (check-true (not (proper-list? 1))))
-
-     ;; DOTTED-LIST?
-
-     (test-case
-      "dotted-list?:dotted-list"
-      (check-true (dotted-list? '(1 2 3 . 4))))
-
-     (test-case
-      "dotted-list?:proper-list"
-      (check-true (not (dotted-list? (list 'a 'b 'c 'd)))))
-
-     (test-case
-      "dotted-list?:empty-list"
-      (check-true (not (dotted-list? (list)))))
-
-     (test-case
-      "dotted-list?:simple-value"
-      (check-true (dotted-list? "hello")))
-
-     ;; CIRCULAR-LIST
-
-     (test-case
-      "circular-list?:proper-list"
-      (check-true (not (circular-list? (list 1 2 3 4)))))
-
-     (test-case
-      "circular-list?:dotted-list"
-      (check-true (not (circular-list? '(a b c . d)))))
-
-     (test-case
-      "circular-list?:simple-value"
-      (check-true (not (circular-list? 1))))
-
-     (test-case
-      "circular-list?:circular-list"
-      (check-true (circular-list? (circular-list 1 2 3 4))))
-
-     ;; NOT-PAIR
-
-     (test-case
-      "not-pair?:list"
-      (check-true (not (not-pair? (list 1 2 3 4)))))
-
-     (test-case
-      "not-pair?:number"
-      (check-true (not-pair? 1)))
-
-     (test-case
-      "not-pair?:symbol"
-      (check-true (not-pair? 'symbol)))
-
-     (test-case
-      "not-pair?:string"
-      (check-true (not-pair? "string")))
-
-     ;; NULL-LIST?
-
-     (test-case
-      "null-list?:null-list"
-      (check-true (null-list? (list))))
-
-     (test-case
-      "null-list?:list"
-      (check-true (not (null-list? (list 'a 'b 'c)))))
-
-     (test-case
-      "null-list?:pair"
-      (check-true (not (null-list? (cons 1 2)))))
-
-     ;; LIST=
-
-     (test-case
-      "list=:number-list"
-      (check-true (list= = (list 1.0 2.0 3.0) (list 1 2 3))))
-
-     (test-case
-      "list=:symbol-vs-string-list"
-      (check-true (list= (lambda (x y)
-                            (string=? (symbol->string x) y))
-                          (list 'a 'b 'c)
-                          (list "a" "b" "c"))))
-
-     (test-case
-      "list=:unequal-lists"
-      (check-true (not (list= eq? (list 1 2 3) (list 'a 'b 'c) (list 1 2 3)))))
-
-     (test-case
-      "list=:unequal-lengths"
-      (check-true (not (list= eq? (list 1 2 3) (list 1 2 3 4)))))
-
-     (test-case
-      "list=:empty-lists"
-      (check-true (list= eq? (list) (list) (list))))
-
-     (test-case
-      "list=:no-list"
-      (check-true (list= eq?)))
-
-     ))
-  )
-;;; predicate-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/run-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/run-tests.rkt
deleted file mode 100644
index f1bc823cb1..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/run-tests.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-(require rackunit)
-(require rackunit/text-ui)
-(require "all-1-tests.rkt")
-
-(run-tests all-1-tests)
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/search-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/search-test.rkt
deleted file mode 100644
index e06cf33cf9..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/search-test.rkt
+++ /dev/null
@@ -1,529 +0,0 @@
-;;;
-;;; <search-test.rkt> ---- List searching functions tests
-;;; Time-stamp: <05/12/16 21:16:26 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; SRFI-1 is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; SRFI-1 is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with SRFI-1; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-;; Originally created by:
-
-;; John David Stone
-;; Department of Mathematics and Computer Science
-;; Grinnell College
-;; stone@math.grin.edu
-
-(module search-test
-  mzscheme
-
-  (require rackunit)
-  (require (all-except srfi/1/search member))
-
-  (provide search-tests)
-
-  (define search-tests
-    (test-suite
-     "List search tests"
-
-     ;; FIND
-
-     (test-case
-      "find:in-null-list"
-      (check-true (not (find (lambda (x) #t) '()))))
-
-     (test-case
-      "find:in-singleton-list"
-      (check-eq? (find (lambda (x) #t) '(Aurora))
-                  'Aurora))
-
-     (test-case
-      "find:not-in-singleton-list"
-      (check-true (not (find (lambda (x) #f) '(Austinville)))))
-
-     (test-case
-      "find:at-front-of-longer-list"
-      (check-eq?
-       (find (lambda (x) #t) '(Avery Avoca Avon Ayrshire Badger))
-       'Avery))
-
-     (test-case
-      "find:in-middle-of-longer-list"
-      (check =
-              (find even? '(149 151 153 155 156 157 159))
-              156))
-
-     (test-case
-      "find:at-end-of-longer-list"
-      (check =
-              (find even? '(161 163 165 167 168))
-              168))
-
-     (test-case
-      "find:not-in-longer-list"
-      (check-true
-       (not
-        (find (lambda (x) #f)
-              '(Bagley Bailey Badwin Balfour Balltown)))))
-
-;;; FIND-TAIL
-
-     (test-case
-      "find-tail:in-null-list"
-      (check-true (not (find-tail (lambda (x) #t) '()))))
-
-     (test-case
-      "find-tail:in-singleton-list"
-      (let ((source '(Ballyclough)))
-        (check-eq?
-         (find-tail (lambda (x) #t) source)
-         source)))
-
-     (test-case
-      "find-tail:not-in-singleton-list"
-      (check-true (not (find-tail (lambda (x) #f) '(Bancroft)))))
-
-     (test-case
-      "find-tail:at-front-of-longer-list"
-      (let ((source '(Bangor Bankston Barney Barnum Bartlett)))
-        (check-eq?
-         (find-tail (lambda (x) #t) source)
-         source)))
-
-     (test-case
-      "find-tail:in-middle-of-longer-list"
-      (let ((source '(169 171 173 175 176 177 179)))
-        (check-eq?
-         (find-tail even? source)
-         (cddddr source))))
-
-     (test-case
-      "find-tail:at-end-of-longer-list"
-      (let ((source '(181 183 185 187 188)))
-        (check-eq?
-         (find-tail even? source)
-         (cddddr source))))
-
-     (test-case
-      "find-tail:not-in-longer-list"
-      (check-true
-       (not
-        (find-tail (lambda (x) #f)
-                   '(Batavia Bauer Baxter Bayard Beacon)) )))
-
-;;; ANY
-
-     (test-case
-      "any:in-one-null-list"
-      (check-true (not (any values '()))))
-
-     (test-case
-      "any:in-one-singleton-list"
-      (check-equal? (any vector '(Beaconsfield)) '#(Beaconsfield)))
-
-     (test-case
-      "any:not-in-one-singleton-list"
-      (check-true (not (any (lambda (x) #f) '(Beaman)))))
-
-     (test-case
-      "any:at-beginning-of-one-longer-list"
-      (check-equal?
-       (any vector '(Beaver Beaverdale Beckwith Bedford Beebeetown))
-       '#(Beaver)))
-
-     (test-case
-      "any:in-middle-of-one-longer-list"
-      (check =
-              (any (lambda (x) (and (odd? x) (+ x 189)))
-                   '(190 192 194 196 197 198 200))
-              386))
-
-     (test-case
-      "any:at-end-of-one-longer-list"
-      (check =
-              (any (lambda (x) (and (odd? x) (+ x 201)))
-                   '(202 204 206 208 209))
-              410))
-
-     (test-case
-      "any:not-in-one-longer-list"
-      (check-true
-       (not (any (lambda (x) #f)
-                 '(Beech Belinda Belknap Bellefountain Bellevue)))))
-
-     (test-case
-      "any:in-several-null-lists"
-      (check-true
-       (not (any vector '() '() '() '() '()))))
-
-     (test-case
-      "any:in-several-singleton-lists"
-      (check-equal?
-       (any vector
-            '(Belmond)
-            '(Beloit)
-            '(Bennett)
-            '(Benson)
-            '(Bentley))
-       '#(Belmond Beloit Bennett Benson Bentley)))
-
-     (test-case
-      "any:not-in-several-singleton-lists"
-      (check-true
-       (not
-        (any (lambda arguments #f)
-             '(Benton)
-             '(Bentonsport)
-             '(Berea)
-             '(Berkley)
-             '(Bernard)))))
-
-     (test-case
-      "any:at-beginning-of-several-longer-lists"
-      (check-equal?
-       (any vector
-            '(Berne Bertram Berwick Bethesda Bethlehem Bettendorf
-                    Beulah)
-            '(Bevington Bidwell Bingham Birmingham Bladensburg
-                        Blairsburg Blairstown)
-            '(Blakesburg Blanchard Blencoe Bliedorn Blockton
-                         Bloomfield Bloomington)
-            '(Bluffton Bode Bolan Bonair Bonaparte Bondurant Boone)
-            '(Booneville Botany Botna Bouton Bowsher Boxholm Boyd))
-       '#(Berne Bevington Blakesburg Bluffton Booneville)))
-
-     (test-case
-      "any:in-middle-of-several-longer-lists"
-      (check =
-              (any (lambda arguments
-                     (let ((sum (apply + arguments)))
-                       (and (odd? sum) (+ sum 210))))
-                   '(211 212 213 214 215 216 217)
-                   '(218 219 220 221 222 223 224)
-                   '(225 226 227 228 229 230 231)
-                   '(232 233 234 235 236 237 238)
-                   '(240 242 244 246 247 248 250))
-              1359))
-
-     (test-case
-      "any:at-end-of-several-longer-lists"
-      (check =
-              (any (lambda arguments
-                     (let ((sum (apply + arguments)))
-                       (and (even? sum) (+ sum 210))))
-                   '(252 253 254 255 256 257 258)
-                   '(259 260 261 262 263 264 265)
-                   '(266 267 268 269 270 271 272)
-                   '(273 274 275 276 277 278 279)
-                   '(281 283 285 287 289 291 292))
-              1576))
-
-     (test-case
-      "any:not-in-several-longer-lists"
-      (check-true
-       (not
-        (any (lambda arguments #f)
-             '(Boyden Boyer Braddyville Bradford Bradgate Brainard
-                      Brandon)
-             '(Brayton Brazil Breda Bridgewater Brighton Bristol
-                       Bristow)
-             '(Britt Bromley Brompton Bronson Brooklyn Brooks
-                     Brookville)
-             '(Browns Brownville Brunsville Brushy Bryant Bryantsburg
-                      Buchanan)
-             '(Buckeye Buckhorn Buckingham Bucknell Budd Buffalo
-                       Burchinal)))))
-
-     (test-case
-      "any:not-in-lists-of-unequal-length"
-      (check-true
-       (not (any (lambda arguments #f)
-                 '(Burdette Burlington Burnside Burt)
-                 '(Bushville Bussey)
-                 '(Buxton Cairo Calamus)
-                 '(Caledonia Clahoun Callender Calmar Caloma Calumet)))))
-
-;;; EVERY
-
-     (test-case
-      "every:in-one-null-list"
-      (check-true (every values '())))
-
-     (test-case
-      "every:in-one-singleton-list"
-      (check-equal?
-       (every vector '(Camanche))
-       '#(Camanche)))
-
-     (test-case
-      "every:not-in-one-singleton-list"
-      (check-true
-       (not (every (lambda (x) #f) '(Cambria)))))
-
-     (test-case
-      "every:failing-at-beginning-of-one-longer-list"
-      (check-true
-       (not
-        (every (lambda (x) #f)
-               '(Cambridge Cameron Canby Canton Cantril)) )))
-
-     (test-case
-      "every:failing-in-middle-of-one-longer-list"
-      (check-true
-       (not
-        (every (lambda (x) (and (even? x) (+ x 293)))
-               '(294 296 298 300 301 302 304)))))
-
-     (test-case
-      "every:failing-at-end-of-one-longer-list"
-      (check-true
-       (not
-        (every (lambda (x) (and (even? x) (+ x 305)))
-               '(306 308 310 312 313)))))
-
-     (test-case
-      "every:in-one-longer-list"
-      (check-equal?
-       (every vector
-              '(Carbon Carbondale Carl Carlisle Carmel))
-       '#(Carmel)))
-
-     (test-case
-      "every:in-several-null-lists"
-      (check-true
-       (every vector '() '() '() '() '())))
-
-     (test-case
-      "every:in-several-singleton-lists"
-      (check-equal?
-       (every vector
-              '(Carnarvon)
-              '(Carnes)
-              '(Carney)
-              '(Carnforth)
-              '(Carpenter))
-       '#(Carnarvon Carnes Carney Carnforth Carpenter)))
-
-     (test-case
-      "every:not-in-several-singleton-lists"
-      (check-true
-       (not
-        (every (lambda arguments #f)
-               '(Carroll)
-               '(Carrollton)
-               '(Carrville)
-               '(Carson)
-               '(Cartersville)))))
-
-     (test-case
-      "every:failing-at-beginning-of-several-longer-lists"
-      (check-true
-       (not
-        (every (lambda arguments #f)
-               '(Cascade Casey Castalia Castana Cattese Cedar
-                         Centerdale)
-               '(Centerville Centralia Ceres Chapin Chariton
-                             Charleston Charlotte)
-               '(Chatsworth Chautauqua Chelsea Cheney Cherokee Chester
-                            Chickasaw)
-               '(Chillicothe Churchtown Churchville Churdan Cincinnati
-                             Clare Clarence)
-               '(Clarinda Clarion Clark Clarkdale Clarksville Clayton
-                          Clearfield))
-        )))
-
-     (test-case
-      "every:failing-in-middle-of-several-longer-lists"
-      (check-true
-       (not
-        (every (lambda arguments
-                 (let ((sum (apply + arguments)))
-                   (and (odd? sum) (+ sum 314))))
-               '(315 316 317 318 319 320 321)
-               '(322 323 324 325 326 327 328)
-               '(329 330 331 332 333 334 335)
-               '(336 337 338 339 340 341 342)
-               '(343 345 347 349 350 351 353))
-        )))
-
-     (test-case
-      "every:failing-at-end-of-several-longer-lists"
-      (check-true
-       (not
-        (every (lambda arguments
-                 (let ((sum (apply + arguments)))
-                   (and (odd? sum) (+ sum 354))))
-               '(355 356 357 358 359 360 361)
-               '(362 363 364 365 366 367 368)
-               '(369 370 371 372 373 374 375)
-               '(376 377 378 379 380 381 382)
-               '(383 385 387 389 391 393 394))
-        )))
-
-     (test-case
-      "every:in-several-longer-lists"
-      (check-equal?
-       (every vector
-              '(Cleghorn Clemons Clermont Cleves Cliffland Climax
-                         Clinton)
-              '(Clio Clive Cloverdale Clucas Clutier Clyde Coalville)
-              '(Coburg Coggon Coin Colesburg Colfax Collett Collins)
-              '(Colo Columbia Colwell Commerce Communia Competine
-                     Concord)
-              '(Conesville Confidence Cono Conover Conrad Conroy
-                           Consol))
-       '#(Clinton Coalville Collins Concord Consol)))
-
-     (test-case
-      "every:in-lists-of-unequal-length"
-      (check-equal?
-       (every vector
-              '(Conway Cool Cooper Coppock)
-              '(Coralville Corley)
-              '(Cornelia Cornell Corning)
-              '(Correctionville Corwith Corydon Cosgrove Coster
-                                Cotter))
-       '#(Cool Corley Cornell Corwith)))
-
-;;; LIST-INDEX
-
-     (test-case
-      "list-index:in-one-null-list"
-      (check-true
-       (not (list-index (lambda (x) #t) '()))))
-
-     (test-case
-      "list-index:in-one-singleton-list"
-      (check-true
-       (zero?
-        (list-index (lambda (x) #t) '(Cottonville)))))
-
-     (test-case
-      "list-index:not-in-one-singleton-list"
-      (check-true
-       (not (list-index (lambda (x) #f) '(Coulter)))))
-
-     (test-case
-      "list-index:at-front-of-one-longer-list"
-      (check-true
-       (zero?
-        (list-index (lambda (x) #t)
-                    '(Covington Craig Cranston Crathorne
-                                Crawfordsville)))))
-     (test-case
-      "list-index:in-middle-of-one-longer-list"
-      (list-index even? '(395 397 399 401 402 403 405))
-      (lambda (result) (= result 4)))
-
-     (test-case
-      "list-index:at-end-of-one-longer-list"
-      (check =
-              (list-index odd? '(406 408 410 412 414 415))
-              5))
-
-     (test-case
-      "list-index:not-in-one-longer-list"
-      (check-true
-       (not
-        (list-index (lambda (x) #f)
-                    '(Crescent Cresco Creston Crocker Crombie)))))
-
-     (test-case
-      "list-index:in-several-null-lists"
-      (check-true
-       (not (list-index (lambda arguments #t) '() '() '() '() '()))))
-
-     (test-case
-      "list-index:in-several-singleton-lists"
-      (check-true
-       (zero?      (list-index (lambda arguments #t)
-                               '(Cromwell)
-                               '(Croton)
-                               '(Cumberland)
-                               '(Cumming)
-                               '(Curlew)))))
-
-     (test-case
-      "list-index:not-in-several-singleton-lists"
-      (check-true
-       (not      (list-index (lambda arguments #f)
-                             '(Cushing)
-                             '(Cylinder)
-                             '(Dahlonega)
-                             '(Dalby)
-                             '(Dale)))))
-
-     (test-case
-      "list-index:at-front-of-several-longer-lists"
-      (check-true
-       (zero? (list-index (lambda arguments #t)
-                          '(Dallas Dana Danbury Danville Darbyville
-                                   Davenport Dawson)
-                          '(Dayton Daytonville Dean Decorah Dedham Deerfield
-                                   Defiance)
-                          '(Delaware Delhi Delmar Deloit Delphos Delta
-                                     Denhart)
-                          '(Denison Denmark Denova Denver Depew Derby Devon)
-                          '(Dewar Dexter Diagonal Dickens Dickieville Dike
-                                  Dillon)))))
-
-     (test-case
-      "list-index:in-middle-of-several-longer-lists"
-      (check =
-              (list-index (lambda arguments (odd? (apply + arguments)))
-                          '(416 417 418 419 420 421 422)
-                          '(423 424 425 426 427 428 429)
-                          '(430 431 432 433 434 435 436)
-                          '(437 438 439 440 441 442 443)
-                          '(444 446 448 450 451 452 454))
-              4))
-
-     (test-case
-      "list-index:at-end-of-several-longer-lists"
-      (check =
-              (list-index (lambda arguments (even? (apply + arguments)))
-                          '(455 456 457 458 459 460)
-                          '(461 462 463 464 465 466)
-                          '(467 468 469 470 471 472)
-                          '(473 474 475 476 477 478)
-                          '(479 481 483 485 487 488))
-              5))
-
-     (test-case
-      "list-index:not-in-several-longer-lists"
-      (check-true
-       (not
-        (list-index (lambda arguments #f)
-                    '(Dinsdale Dixon Dodgeville Dolliver Donahue
-                               Donnan Donnelley)
-                    '(Donnellson Doon Dorchester Doris Douds Dougherty
-                                 Douglas)
-                    '(Doney Dows Drakesville Dresden Dubuque Dudley
-                            Dumfries)
-                    '(Dumont Dunbar Duncan Duncombe Dundee Dunkerton
-                             Dunlap)
-                    '(Durango Durant Durham Dutchtown Dyersville
-                              Dysart Earlham)))))
-
-     ))
-  )
-
-;;; search-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/selector-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/selector-test.rkt
deleted file mode 100644
index 7226e0be84..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/1/selector-test.rkt
+++ /dev/null
@@ -1,341 +0,0 @@
-;;;
-;;; <selector-test.rkt> ---- List selector tests
-;;; Time-stamp: <05/12/16 21:13:25 noel>
-;;;
-;;; Copyright (C) 2002 by Noel Welsh.
-;;;
-;;; This file is part of SRFI-1.
-
-;;; SRFI-1 is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; SRFI-1 is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with SRFI-1; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-;;; Author: Noel Welsh <noelwelsh@yahoo.com>
-;;
-;;
-;; Commentary:
-
-;; Originally created by:
-
-;; John David Stone
-;; Department of Mathematics and Computer Science
-;; Grinnell College
-;; stone@math.grin.edu
-
-(module selector-test
-  mzscheme
-
-  (require rackunit)
-  (require srfi/1/selector)
-
-  (provide selector-tests)
-
-  (define selector-tests
-    (test-suite
-     "List selector tests"
-
-     ;; FIRST
-
-     (test-case
-      "first:of-one"
-      (check-eq? (first '(hafnium)) 'hafnium))
-
-     (test-case
-      "first:of-many"
-      (check-eq? (first '(hahnium helium holmium hydrogen indium))
-                  'hahnium))
-
-     ;; SECOND
-
-     (test-case
-      "second:of-two"
-      (check-eq? (second '(iodine iridium)) 'iridium))
-
-     (test-case
-      "second:of-many"
-      (check-eq? (second '(iron krypton lanthanum lawrencium lead lithium))
-                  'krypton))
-
-     ;; THIRD
-
-     (test-case
-      "third:of-three"
-      (check-eq? (third '(lutetium magnesium manganese))
-                  'manganese))
-
-     (test-case
-      "third:of-many"
-      (check-eq? (third '(mendelevium mercury molybdenum neodymium neon
-                                       neptunium nickel))
-                  'molybdenum))
-
-     ;; FOURTH
-
-     (test-case
-      "fourth:of-four"
-      (check-eq? (fourth '(niobium nitrogen nobelium osmium))
-                  'osmium))
-
-     (test-case
-      "fourth:of-many"
-      (check-eq? (fourth '(oxygen palladium phosphorus platinum plutonium
-                                   polonium potassium praseodymium))
-                  'platinum))
-
-     ;; FIFTH
-
-     (test-case
-      "fifth:of-five"
-      (check-eq? (fifth '(promethium protatctinium radium radon rhenium))
-                  'rhenium))
-
-     (test-case
-      "fifth:of-many"
-      (check-eq? (fifth '(rhodium rubidium ruthenium rutherfordium samarium
-                                   scandium selenium silicon silver))
-                  'samarium))
-
-     ;; SIXTH
-
-     (test-case
-      "sixth:of-six"
-      (check-eq? (sixth '(sodium strontium sulfur tantalum technetium
-                                  tellurium))
-                  'tellurium))
-
-     (test-case
-      "sixth:of-many"
-      (check-eq? (sixth '(terbium thallium thorium thulium tin titanium
-                                   tungsten uranium vanadium xenon))
-                  'titanium))
-
-     ;; SEVENTH
-
-     (test-case
-      "seventh:of-seven"
-      (check-eq? (seventh '(ytterbium yttrium zinc zirconium acacia abele
-                                       ailanthus))
-                  'ailanthus))
-
-     (test-case
-      "seventh:of-many"
-      (check-eq? (seventh '(alder allspice almond apple apricot ash aspen
-                                   avocado balsa balsam banyan))
-                  'aspen))
-
-     ;; EIGHTH
-
-     (test-case
-      "eighth:of-eight"
-      (check-eq? (eighth '(basswood bay bayberry beech birch boxwood breadfruit
-                                     buckeye))
-                  'buckeye))
-
-     (test-case
-      "eighth:of-many"
-      (check-eq? (eighth '(butternut buttonwood cacao candleberry cashew cassia
-                                      catalpa cedar cherry chestnut chinaberry
-                                      chinquapin))
-                  'cedar))
-
-     ;; NINTH
-
-     (test-case
-      "ninth:of-nine"
-      (check-eq? (ninth '(cinnamon citron clove coconut cork cottonwood cypress
-                                    date dogwood))
-                  'dogwood))
-
-     (test-case
-      "ninth:of-many"
-      (check-eq? (ninth '(ebony elder elm eucalyptus ficus fig fir frankincense
-                                 ginkgo grapefruit guava gum hawthorn))
-                  'ginkgo))
-
-     ;; TENTH
-
-     (test-case
-      "tenth:of-ten"
-      (check-eq? (tenth '(hazel hemlock henna hickory holly hornbeam ironwood
-                                 juniper kumquat laburnum))
-                  'laburnum))
-
-     (test-case
-      "tenth:of-many"
-      (check-eq? (tenth '(lancewood larch laurel lemon lime linden litchi
-                                     locust logwood magnolia mahogany mango
-                                     mangrove maple))
-                  'magnolia))
-
-     ;; CAR+CDR
-
-     (test-case
-      "car+cdr:pair"
-      (let-values (((first second) (car+cdr (cons 'a 'b))))
-        (check-eq? first 'a)
-        (check-eq? second 'b)))
-
-     (test-case
-      "car+cdr:list"
-      (let-values (((first second) (car+cdr (list 'a 'b))))
-        (check-eq? first 'a)
-        (check-equal? second (list 'b))))
-
-     ;; TAKE
-
-     (test-case
-      "take:all-of-list"
-      (check-equal? (take '(medlar mimosa mulberry nutmeg oak) 5)
-                     '(medlar mimosa mulberry nutmeg oak)))
-
-     (test-case
-      "take:front-of-list"
-      (check-equal? (take '(olive orange osier palm papaw peach pear) 5)
-                     '(olive orange osier palm papaw)))
-
-     (test-case
-      "take:rear-of-list"
-      (check-equal?
-       (take-right '(pecan persimmon pine pistachio plane plum pomegranite) 5)
-       '(pine pistachio plane plum pomegranite)))
-
-     (test-case
-      "take:none-of-list"
-      (check-true (null? (take '(poplar quince redwood) 0))))
-
-     (test-case
-      "take:empty-list"
-      (check-true (null? (take '() 0))))
-
-     ;; DROP
-
-     (test-case
-      "drop:all-of-list"
-      (check-true (null? (drop '(rosewood sandalwood sassfras satinwood senna) 5))))
-
-     (test-case
-      "drop:front-of-list"
-      (check-equal? (drop '(sequoia serviceberry spruce sycamore tamarack tamarind
-                                     tamarugo)
-                           5)
-                     '(tamarind tamarugo)))
-
-     (test-case
-      "drop:rear-of-list"
-      (check-equal? (drop-right '(tangerine teak thuja torchwood upas walnut wandoo) 5)
-                     '(tangerine teak)))
-
-     (test-case
-      "drop:none-of-list"
-      (check-equal? (drop '(whitebeam whitethorn wicopy) 0)
-                     '(whitebeam whitethorn wicopy)))
-
-     (test-case
-      "drop:empty-list"
-      (check-true (null? (drop '() 0))))
-
-     ;; TAKE!
-
-     ;; List arguments to linear-update procedures are constructed
-     ;; with the LIST procedure rather than as quoted data, since in
-     ;; some implementations quoted data are not mutable.
-
-     (test-case
-      "take!:all-of-list"
-      (check-equal? (take! (list 'willow 'woollybutt 'wychelm 'yellowwood 'yew) 5)
-                     '(willow woollybutt wychelm yellowwood yew)))
-
-     (test-case
-      "take!:front-of-list"
-      (check-equal? (take! (list 'ylang-ylang 'zebrawood 'affenpinscher 'afghan
-                                  'airedale 'alsatian 'barbet)
-                            5)
-                     '(ylang-ylang zebrawood affenpinscher afghan airedale)))
-
-;(test 'take!:rear-of-list
-;      (take! (list 'basenji 'basset 'beagle 'bloodhound 'boarhound
-;                   'borzoi 'boxer)
-;             -5)
-;      (lambda (result)
-;        (equal? result '(beagle bloodhound boarhound borzoi
-;                                boxer))))
-
-     (test-case
-      "take!:none-of-list"
-      (check-true (null? (take! (list 'briard 'bulldog 'chihuahua) 0))))
-
-     (test-case
-      "take!:empty-list"
-      (check-true (null? (take! '() 0))))
-
-     ;; DROP-RIGHT!
-
-     (test-case
-      "drop-right!:all-of-list"
-      (check-true (null? (drop-right! (list 'chow 'collie 'coonhound 'clydesdale 'dachshund)
-                                       5))))
-
-     (test-case
-      "drop-right!:rear-of-list"
-      (check-equal? (drop-right! (list 'groenendael 'harrier 'hound 'husky 'keeshond
-                                        'komondor 'kuvasz)
-                                  5)
-                     '(groenendael harrier)))
-
-     (test-case
-      "drop-right!:none-of-list"
-      (check-equal? (drop-right! (list 'labrador 'malamute 'malinois) 0)
-                     '(labrador malamute malinois)))
-
-     (test-case
-      "drop-right!:empty-list"
-      (check-true (null? (drop-right! '() 0))))
-
-     ;; LAST
-
-     (test-case
-      "last:of-singleton"
-      (check-eq? (last '(maltese))
-                  'maltese))
-
-     (test-case
-      "last:of-longer-list"
-      (check-eq? (last '(mastiff newfoundland nizinny otterhound papillon))
-                  'papillon))
-
-     ;; LAST-PAIR
-
-     (test-case
-      "last-pair:of-singleton"
-      (let ((pair '(pekingese)))
-        (check-eq? (last-pair pair)
-                    pair)))
-
-     (test-case
-      "last-pair:of-longer-list"
-      (let ((pair '(pointer)))
-        (check-eq? (last-pair (cons 'pomeranian
-                                     (cons 'poodle
-                                           (cons 'pug (cons 'puli pair)))))
-                    pair)))
-
-     (test-case
-      "last-pair:of-improper-list"
-      (let ((pair '(manx . siamese)))
-        (check-eq? (last-pair (cons 'abyssinian (cons 'calico pair)))
-                    pair)))
-
-     ))
-  )
-
-;;; selector-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/11/srfi-11-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/11/srfi-11-test.rkt
deleted file mode 100644
index 9d5c69996e..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/11/srfi-11-test.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-
-(require srfi/11 rackunit)
-(provide srfi-11-tests)
-
-(define srfi-11-tests
-  (test-suite
-   "Tests for SRFI 11"
-   (check-equal? (let-values ((x (values 1 2 3))) x) '(1 2 3) "PR 12147")))
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/13/string-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/13/string-test.rkt
deleted file mode 100644
index 7ef72cd4d8..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/13/string-test.rkt
+++ /dev/null
@@ -1,305 +0,0 @@
-;;;
-;;; <string-test.rkt> ---- SRFI-13 (string) tests
-;;; Time-stamp: <06/06/09 16:05:08 nhw>
-;;;
-;;; Copyright (C) 2002 by Francisco Solsona. 
-;;;
-;;; This file is part of PLT SRFI.
-
-;;; PLT SRFI is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; PLT SRFI is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with PLT SRFI; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-;;; Author: Francisco Solsona <solsona@acm.org>
-;;
-;;
-;; Commentary:
-
-(module string-test mzscheme
-  ;; Noel's Test Framework: (get your copy @ schematics.sourceforge.net)
-  (require rackunit)
-  (require srfi/13/string
-           srfi/14/char-set
-           )
-  (provide string-tests)
-
-  (define-syntax-rule (expect a e) (check-equal? a e))
-
-  (define string-tests
-    (let ((abc null)
-          (cba null)
-          (test-string "This is a simple test string to generate a very simple char set!")
-          )
-      
-      (test-suite
-       "String tests"
-       (test-case "string? test 1"
-                  (check-true (string? test-string)))
-
-       (test-case "string? test 2"
-                  (check-true (not (string? 'hello))))
-       
-       (test-case "string-null? test 1"
-                  (check-true (string-null? "")))
-       
-       (test-case "string-null? test 2"
-                  (check-true (not (string-null? "not empty"))))
-
-       (test-case "string-every test 1 (all #\a)"
-                  (check-true (string-every  #\a "aaaaaaaa")))
-
-       (test-case "string-every test 2 (charset a b c)"
-                  (check-true (string-every
-                               (char-set #\a #\b #\c)
-                               "baacaaaabbaa")))
-
-       (test-case "string-every test 3 (pred vowel?)"
-                  (check-true (string-every vowel? "aeiou")))
-
-       
-       ;; string-every char/char-set/pred s [start end] -> value
-       ;; string-any char/char-set/pred s [start end] -> value
-
-       ;; Following tests adapted from SSAX/SXML vsrfi-13.scm
-
-       (test-case "Verifying string-xcopy!"
-         (let ((sample (string-append "0123456789+")) ; A mutable string
-               (txcopy
-                (lambda (target to src from end)
-                  (string-xcopy! target to src from end)
-                  target)))
-           (expect (txcopy "" 0 "" 0 0) "")
-           (expect (txcopy "" 0 sample 0 0) "")
-           (expect (txcopy sample 5 "" 0 0) sample)
-           (expect (txcopy sample 0 sample 0 0) sample)
-           (expect (txcopy sample 0 sample 0 1) sample)
-           (expect (txcopy sample 0 sample 0 (string-length sample)) sample)
-           (expect (txcopy sample 1 sample 1 (string-length sample)) sample)
-           (expect (txcopy sample 10 sample 10 (string-length sample)) sample)
-           (expect (txcopy (string-append sample) 1 sample 4 7) "0456456789+")
-           ))
-       
-       (test-case "Verifying string-concatenate-reverse"
-         (let ((sample "0123456789+"))
-           (expect (string-concatenate-reverse '() "" 0) "")
-           (expect (string-concatenate-reverse '() sample 0) "")
-           (expect (string-concatenate-reverse '() sample (string-length sample))
-                   sample)
-           (check-not-eq? sample                ; the result must be a fresh string
-                          (string-concatenate-reverse '() sample (string-length sample)))
-           (expect (string-concatenate-reverse (list sample) "" 0) sample)
-           (check-not-eq? sample
-                          (string-concatenate-reverse (list sample) "" 0))
-           (expect (string-concatenate-reverse (list sample) sample 5)
-                   (string-append sample (substring sample 0 5)))
-           (expect (string-concatenate-reverse (list sample "xyz") sample 5)
-                   (string-append "xyz" sample (substring sample 0 5)))
-           (expect (string-concatenate-reverse (list sample "xyz") "abcd" 4)
-                   (string-append "xyz" sample "abcd"))
-           ))
-
-       (test-case "Verifying string-concatenate-reverse/shared"
-         (let ((sample "0123456789+"))
-           (expect (string-concatenate-reverse/shared '()) "")
-           (expect (string-concatenate-reverse/shared (list sample)) sample)
-           (check-eq? sample                    ; Return the original string
-                      (string-concatenate-reverse/shared (list sample)))
-           (expect (string-concatenate-reverse/shared (list sample "")) sample)
-           (expect (string-concatenate-reverse/shared (list "" sample)) sample)
-           (expect (string-concatenate-reverse/shared (list "abcd" sample "xyz"))
-                   (string-append "xyz" sample "abcd"))
-           ))
-
-       (test-case "Verifying string-concatenate/shared"
-         (let ((sample "0123456789+"))
-           (expect (string-concatenate/shared '()) "")
-           (expect (string-concatenate/shared (list sample)) sample)
-           (check-eq? sample
-                      (string-concatenate/shared (list sample)))
-           (expect (string-concatenate/shared (list sample "")) sample)
-           (expect (string-concatenate/shared (list "" sample)) sample)
-           (expect (string-concatenate/shared (list "abcd" sample "xyz"))
-                   (string-append "abcd" sample "xyz"))
-           ))
-
-       (test-case "Verifying string-index, string-index-right and substring?"
-         (let ()
-           (define (substring? pattern str) (string-contains str pattern))
-           (expect (string-index "" #\a) #f)
-           (expect (string-index "cbda" #\a) 3)
-           (expect (string-index "cbdal" #\a) 3)
-           (expect (string-index "acbdal" #\a) 0)
-           (expect (string-index "acbdal" #\space) #f)
-           (expect (string-index "acbd al" #\space) 4)
-
-           (expect (string-index-right "" #\a) #f)
-           (expect (string-index-right "adbc" #\a) 0)
-           (expect (string-index-right "ladbc" #\a) 1)
-           (expect (string-index-right "ladbca" #\a) 5)
-           (expect (string-index-right "ladbca" #\space) #f)
-           (expect (string-index-right "la dbca" #\space) 2)
-  
-           (expect (substring? "rat" "pirate") 2)
-           (expect (substring? "e" "pirate") 5)
-           (expect (substring? "k" "pirate") #f)
-           (expect (substring? "pi" "pirate") 0)
-           (expect (substring? "te" "pirate") 4)
-           (expect (substring? "rat" "outrage") #f)
-           (expect (substring? "pit" "pirate") #f)
-           (expect (substring? "rate" "pirate") 2)
-           (expect (substring? "aa" "aaaaaaa") 0)
-           (expect (substring? "pirate" "pirate") 0)
-           (expect (substring? "pirates" "pirate") #f)
-           (expect (substring? "pirate" "pirates") 0)
-           (expect (substring? "ages" "outrage") #f)
-           (expect (substring? "" "outrage") 0)
-           ))
-
-       (test-case "Verifying string-prefix? and string-suffix?"
-         (let ()
-           (expect (string-prefix? "pir" "pirate") #t)
-           (expect (string-prefix? "rat" "outrage") #f)
-           (expect (string-prefix? "pir" (s "pirate " 'lf) ) #t)
-           (expect (string-prefix? " pir" (s "pirate " 'lf)) #f)
-           (expect (string-prefix? " pir" (s " pirate " 'lf)) #t)
-           (expect (string-prefix? "pirate" "pirate") #t)
-           (expect (string-prefix? "" "pirate") #t)
-           (expect (string-prefix? "" "") #t)
-           (expect (string-prefix? "pirate" "") #f)
-           (expect (string-prefix? "pirat" "pirate") #t)
-           (expect (string-prefix? "pirate" "pirat") #f)
-           (expect (string-prefix? (s 'cr "Z!@~#$Ll*()") (s 'cr "Z!@~#$Ll*()def")) #t)
-
-           (expect (string-prefix-ci? "pir" "pirate") #t)
-           (expect (string-prefix-ci? "pIr" "pirate") #t)
-           (expect (string-prefix? "pIr" "pirate") #f)
-           (expect (string-prefix-ci? "rat" "outrage") #f)
-           (expect (string-prefix-ci? "pir" (s "piratE " 'lf)) #t)
-           (expect (string-prefix-ci? " pir" (s "pirate " 'lf)) #f)
-           (expect (string-prefix-ci? " pir" (s " PIRate " 'lf)) #t)
-           (expect (string-prefix-ci? "pirate" "pirate") #t)
-           (expect (string-prefix-ci? "" "pirate") #t)
-           (expect (string-prefix-ci? "" "") #t)
-           (expect (string-prefix-ci? "pirate" "") #f)
-           (expect (string-prefix-ci? "PiRaT" "pIrAte") #t)
-           (expect (string-prefix-ci? "pIrAte" "PiRaT") #f)
-           (expect (string-prefix-ci? (s 'cr "z!@~#$lL*()")
-                                      (s 'cr "Z!@~#$Ll*()def")) #t)
-           (expect (string-prefix? (s 'cr "z!@~#$lL*()") (s 'cr "Z!@~#$Ll*()def")) #f)
-
-           (expect (string-suffix? "ate" "pirate") #t)
-           (expect (string-suffix? "rag" "outrage") #f)
-           (expect (string-suffix? "rage" "outrage") #t)
-           (expect (string-suffix? "rage" (s 'lf " outrage")) #t)
-           (expect (string-suffix? "rage" (s 'lf " out\\rage" 'lf)) #f)
-           (expect (string-suffix? (s "rage" 'lf) (s 'lf " out\\rage" 'lf)) #t)
-           (expect (string-suffix? "pirate" "pirate") #t)
-           (expect (string-suffix? "" "pirate") #t)
-           (expect (string-suffix? "" "") #t)
-           (expect (string-suffix? "pirate" "") #f)
-           (expect (string-suffix? "pirat" "pirate") #f)
-           (expect (string-suffix? "irate" "pirate") #t)
-           (expect (string-suffix? "pirate" "irate") #f)
-           (expect (string-suffix? (s 'cr "Z!@~#$Ll*()")
-                                   (s "def" 'cr "Z!@~#$Ll*()")) #t)
-
-           (expect (string-suffix-ci? "ate" "pirate") #t)
-           (expect (string-suffix-ci? "ATE" "pirate") #t)
-           (expect (string-suffix? "ATE" "pirate") #f)
-           (expect (string-suffix-ci? "rag" "outrage") #f)
-           (expect (string-suffix-ci? "rage" "outraGE") #t)
-           (expect (string-suffix-ci? "RAGE" (s 'lf " outrage")) #t)
-           (expect (string-suffix-ci? "rage" (s 'lf " out\\rage" 'lf)) #f)
-           (expect (string-suffix-ci? (s "rAge" 'lf)  (s 'lf " out\\raGe" 'lf)) #t)
-           (expect (string-suffix-ci? "pirate" "pirate") #t)
-           (expect (string-suffix-ci? "" "pirate") #t)
-           (expect (string-suffix-ci? "" "") #t)
-           (expect (string-suffix-ci? "pirate" "") #f)
-           (expect (string-suffix-ci? "Pirat" "pirate") #f)
-           (expect (string-suffix-ci? "iRATe" "piRATE") #t)
-           (expect (string-suffix-ci? "piRATE" "iRATe") #f)
-           (expect (string-suffix-ci? (s 'cr "z!@~#$lL*()")
-                                      (s "def" 'cr "Z!@~#$Ll*()")) #t)
-           (expect (string-suffix? (s 'cr "z!@~#$lL*()")
-                                   (s "def" 'cr "Z!@~#$Ll*()")) #f)
-           ))
-
-       (test-case "Verifying string case-changing functions"
-         (let ((add-nl (lambda (str) (string-append str (string #\newline)))))
-           (expect (string-downcase "") "")
-           (expect (string-downcase (add-nl "1234abcde!")) (add-nl "1234abcde!"))
-           (expect (string-downcase "XYZ\\,%^") "xyz\\,%^")
-           (expect (string-downcase (string-append (string #\return) "Z!@~#$Ll*()def"))
-                   (string-append (string #\return) "z!@~#$ll*()def"))
-           
-           (expect (string-upcase "") "")
-           (expect (string-upcase (add-nl "1234abcde!")) (add-nl "1234ABCDE!"))
-           (expect (string-upcase "XYZ\\,%^") "XYZ\\,%^")
-           (expect (string-upcase (string-append (string #\return) "Z!@~#$Ll*()def"))
-                   (string-append (string #\return) "Z!@~#$LL*()DEF"))
-           
-           (let* ((test-str (string-copy "a123456789.,Z"))
-                  (test-str-clone (string-copy test-str)))
-             (check-not-eq? test-str test-str-clone)
-             (check-equal? test-str test-str-clone)
-             (check-not-eq? (string-downcase test-str) (string-downcase test-str))
-             (check-equal? (string-downcase test-str) (string-downcase test-str))
-             (check-not-eq? (string-upcase test-str) (string-upcase test-str))
-             (check-equal? (string-upcase test-str) (string-upcase test-str))
-             (string-downcase! test-str)
-             (check-not-equal? test-str test-str-clone)
-             (check-equal? test-str (string-downcase test-str-clone))
-             (check-equal? test-str (string-downcase test-str))
-             (string-upcase! test-str)
-             (check-not-equal? test-str test-str-clone)
-             (check-equal? test-str (string-upcase test-str-clone))
-             (check-equal? test-str (string-upcase test-str))
-             )
-           ))
-       
-       (test-case "Verifying string-null?"
-         (let ()
-           (check-pred string-null? "")
-           (check-false (string-null? " "))
-           (check-false (string-null? "1 "))
-           (check-false (string-null? (string (integer->char 0))))
-           ))
-       
-       )))
-    
-  (define vowel?
-    (lambda (v)
-      (and (char? v)
-           (or (char=? v #\a) (char=? v #\e) (char=? v #\i) (char=? v #\o) (char=? v #\u)))))
-
-
-  ;; Build a string out of components
-  ;; A component can be a string, a character, a number
-  ;; (converted into a character), symbols cr and lf
-  ;; We could've used a notation like "abc\n\t"
-  ;; Unfortunately, not all Scheme systems support C-like notation
-  ;; of Scheme strings
-  (define (s . components)
-    (apply string-append
-           (map (lambda (component)
-                  (cond
-                   ((string? component) component)
-                   ((char? component) (string component))
-                   ((number? component) (string (integer->char component)))
-                   ((eq? 'lf component) (string #\newline))
-                   ((eq? 'cr component) (string (integer->char 13)))
-                   (else (error "bad component: " component))))
-                components)))
-  )
-
-;;; string-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/14/char-set-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/14/char-set-test.rkt
deleted file mode 100644
index ad61059f16..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/14/char-set-test.rkt
+++ /dev/null
@@ -1,236 +0,0 @@
-;;;
-;;; <char-set-test.rkt> ---- Test driver for the SRFI-14 port: char-set
-;;; Time-stamp: <06/06/09 16:38:25 nhw>
-;;;
-;;; Copyright (C) 2002 by Francisco Solsona.
-;;;
-;;; This file is part of PLT SRFI.
-
-;;; PLT SRFI is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; PLT SRFI is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with PLT SRFI; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-;;; Author: Francisco Solsona <solsona@acm.org>
-;;
-;;
-;; Commentary:
-
-(module char-set-test mzscheme
-
-  (require rackunit)
-  (require srfi/14/char-set)
-  (provide char-set-tests)
-
-  (define char-set-tests
-    (test-suite
-     "Char-Set tests"
-
-     (test-case
-      "char-set? correct"
-      (check-false (char-set? null))
-      (check-true (char-set? (char-set #\a #\b #\c))))
-
-     (test-case
-      "char-set= equality"
-      (let ((abc (char-set #\a #\b #\c)))
-        (check-true (char-set= abc (char-set #\a #\b #\c)))))
-
-     (test-case
-      "char-set<= test 1 (strictly less than)"
-      (check-true (char-set<= (char-set #\a #\b #\c)
-                              (char-set #\a #\b #\c #\d))))
-
-     (test-case
-      "char-set<= test 2 (equal)"
-      (check-true (char-set<= (char-set #\a #\b #\c)
-                              (char-set #\a #\b #\c))))
-
-     (test-case
-      "Hash invariant (default bound)"
-      (check-eqv? (char-set-hash char-set:ascii)
-                  (char-set-hash char-set:ascii)))
-
-     (test-case
-      "Char set cursor test"
-      (let ((abc (char-set #\a #\b #\c)))
-        (check-equal?
-         (let lp ((cur (char-set-cursor abc)) (ans '()))
-           (if (end-of-char-set? cur) ans
-               (lp (char-set-cursor-next abc cur)
-                   (cons (char-set-ref abc cur) ans))))
-         '(#\c #\b #\a))))
-
-     (test-case
-      "char-set-fold test 1 (cs members)"
-      (check-equal? (char-set-fold cons '() (char-set #\a #\b #\c))
-                    '(#\c #\b #\a)))
-
-     (test-case
-      "char-set-fold test 2 (cs size)"
-      (check-eqv? (char-set-fold (lambda (c i) (+ i 1)) 0 (char-set #\a #\b #\c))
-                  3))
-
-     (test-case
-      "char-set-fold test 3 (how many vowels in cs)"
-      (check-eqv? (char-set-fold (lambda (c i) (if (vowel? c) (+ i 1) i))
-                                 0 (char-set #\a #\b #\c))
-                  1))
-
-     (test-case
-      "char-set-unfold test 1 (string-port->char-set)"
-      (check-equal?
-       ;; FIXME: We haven't see if char-set->string works, and we are using it.
-       (char-set->string
-        ((lambda (sp)
-           (char-set-unfold eof-object? values
-                            (lambda (x) (read-char sp))
-                            (read-char sp)))
-         (open-input-string "This is a simple test string to generate a very simple char set!")))
-       "yvtsrponmlihgecaT! "))
-
-     (test-case
-      "char-set-for-each (dummy, really)"
-      (begin
-        (char-set-for-each (lambda (c)
-                             (char? c)) (char-set #\a #\b #\c))
-        (check-true #t)))
-
-     (test-case
-      "char-set-map test 1 (downcase)"
-      (check-true
-       (char-set=
-        (char-set-map char-downcase (char-set #\A #\b #\C))
-        (char-set #\a #\b #\c))))
-
-     (test-case
-      "char-set-copy (copy constructor)"
-      (check-true
-       (let* ((orig (char-set #\a #\b #\c))
-              (copy (char-set-copy orig)))
-         (and (char-set= orig copy)
-              (not (char-set=
-                    (char-set-difference orig (char-set #\a))
-                    copy))))))
-
-     (test-case
-      "list->char-set test 1 (using empty char-set)"
-      (check-true
-       (char-set= (list->char-set '(#\a #\b #\c #\a #\b #\a))
-                  (char-set #\a #\b #\c))))
-
-     (test-case
-      "list->char-set test 2 (adding to an existent char-set)"
-      (check-true
-       (let ((c (char-set #\a #\b)))
-         (and
-          (char-set= (list->char-set '(#\a #\b #\c #\a #\b #\a) c)
-                     (char-set #\a #\b #\c))
-          ;; It has to be non-destructive:
-          (char-set= c (char-set #\a #\b))))))
-
-     (test-case
-      "list->char-set! (destructive addition)"
-      (let ((c (char-set #\a #\b)))
-         (check
-          char-set=
-          (list->char-set! '(#\a #\b #\c #\a #\b #\a) c)
-          (char-set #\a #\b #\c))))
-
-     (test-case
-      "string->char-set test 1 (using empty char-set)"
-      (check-true
-       (char-set= (string->char-set "aaaabbaaccc")
-                  (char-set #\a #\b #\c))))
-
-     (test-case
-      "string->char-set test 2 (using a non empty char-set)"
-      (check-true
-       (let ((c (char-set #\a #\b)))
-         (and
-          (char-set= (string->char-set "aaabbbaaaccc" c)
-                     (char-set #\a #\b #\c))
-          ;; It has to be non-destructive:
-          (char-set= c (char-set #\a #\b))))))
-
-     (test-case
-      "string->char-set! (destructive addition)"
-      (let ((c (char-set #\a #\b)))
-         (check
-          char-set=
-          (string->char-set! "aaabbbaaaccc" c)
-          (char-set #\a #\b #\c))))
-
-     (test-case
-      "char-set-filter test 1 (using an empty set)"
-      (check-true
-       (char-set= (char-set-filter vowel? (char-set #\a #\b #\a #\e #\i #\c #\c #\d))
-                  (char-set #\a #\e #\i))))
-
-     (test-case
-      "char-set-filter test 2 (using a non empty char-set)"
-      (check-true
-       (let ((c (char-set #\a #\e)))
-         (and
-          (char-set= (char-set-filter vowel? (char-set #\a #\b #\a #\e #\i #\c #\c #\d) c)
-                     (char-set #\a #\e #\i))
-          ;; It has to be non destructive
-          (char-set= c (char-set #\a #\e))))))
-
-     (test-case
-      "char-set-filter! test (using a non empty char-set)"
-      (let ((c (char-set #\a #\e)))
-         (check
-          char-set=
-          (char-set-filter! vowel? (char-set #\a #\b #\a #\e #\i #\c #\c #\d) c)
-          (char-set #\a #\e #\i))))
-
-     ;; MISSIGN:
-     ;; ucs-range->char-set, ucs-range->char-set!
-     ;; ->char-set
-
-     (test-case
-      "char-set-size test"
-      (check-true (= (char-set-size (char-set #\a #\b #\c)) 3)))
-
-     (test-case
-      "char-set-count test"
-      (check-true (= (char-set-count vowel? (char-set #\a #\b #\a #\e #\i #\z)) 3)))
-
-     (test-case
-      "char-set->list test"
-      (check-true
-       (let ((l (char-set->list (char-set #\a #\b #\c))))
-         (and (pair? l) (= (length l) 3)))))
-     (test-case
-      "char-set->string test"
-      (check-true
-       (string=? (char-set->string (char-set #\a #\b #\c)) "cba")))
-
-     (test-case
-      "char-set-contains? test (if there)"
-      (check-true (char-set-contains? (char-set #\a #\b #\c) #\b)))
-
-     (test-case
-      "char-set-contains? test (if not there)"
-      (check-true (not (char-set-contains? (char-set #\a #\b #\c) #\z))))
-
-     ))
-
-  (define vowel?
-    (lambda (v)
-      (and (char? v)
-           (or (char=? v #\a) (char=? v #\e) (char=? v #\i) (char=? v #\o) (char=? v #\u)))))
-
-  )
-
-;;; char-set-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/19/tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/19/tests.rkt
deleted file mode 100644
index 176f063d17..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/19/tests.rkt
+++ /dev/null
@@ -1,347 +0,0 @@
-#lang racket/base
-
-;; Tests by Will Fitzgerald, augmented by:
-;;   John Clements                                -- 2004-08-16
-;;   Dave Gurnell  (string->date, date->string)   -- 2007-09-14
-;;   Dave Gurnell  (time{=,<,>,<=,>=}?)           -- 2009-11-26
-;;   John Clements (nanoseconds off by x100)      -- 2009-12-15
-;;   Dave Gurnell  (serializable dates and times) -- 2010-03-03
-;;   Dave Gurnell  (added ~x for string->date)    -- 2010-03-10
-(require (only-in racket/date date->julian/scalinger)
-         racket/serialize
-         srfi/19/time)
-
-(require rackunit
-         rackunit/text-ui)
-
-(define-check (check-comparisons comparison times expected)
-  (for ([time0    (in-list times)]
-        [expected (in-list expected)])
-    (for ([time1    (in-list times)]
-          [expected (in-list expected)])
-      (with-check-info (['comparison comparison]
-                        ['time0      time0]
-                        ['time1      time1])
-        (let ([actual (comparison time0 time1)])
-          (check-equal? actual expected))))))
-
-(define cur-tz (date-zone-offset (current-date)))
-
-; Test suite -------------------------------------
-
-(define srfi-19-test-suite
-  (test-suite "Tests for SRFI 19"
-
-    (test-not-exn "Creating time structures"
-      (lambda ()
-        (list (current-time 'time-tai)
-              (current-time 'time-utc)
-              (current-time 'time-monotonic)
-              (current-time 'time-thread)
-              (current-time 'time-process))))
-
-    (test-not-exn "Testing time resolutions"
-      (lambda ()
-        (list (time-resolution 'time-tai)
-              (time-resolution 'time-utc)
-              (time-resolution 'time-monotonic)
-              (time-resolution 'time-thread)
-              (time-resolution 'time-process))))
-
-    (test-case "Time comparisons (time=?, etc.)"
-      (let ([t0 (make-time 'time-utc 0 1)]
-            [t1 (make-time 'time-utc 0 1)]
-            [t2 (make-time 'time-utc 1 1)]
-            [t3 (make-time 'time-utc 0 2)])
-        (check-comparisons time=?  (list t0 t1 t2 t3) '((#t #t #f #f)
-                                                        (#t #t #f #f)
-                                                        (#f #f #t #f)
-                                                        (#f #f #f #t)))
-        (check-comparisons time<?  (list t0 t1 t2 t3) '((#f #f #t #t)
-                                                        (#f #f #t #t)
-                                                        (#f #f #f #t)
-                                                        (#f #f #f #f)))
-        (check-comparisons time>?  (list t0 t1 t2 t3) '((#f #f #f #f)
-                                                        (#f #f #f #f)
-                                                        (#t #t #f #f)
-                                                        (#t #t #t #f)))
-        (check-comparisons time<=? (list t0 t1 t2 t3) '((#t #t #t #t)
-                                                        (#t #t #t #t)
-                                                        (#f #f #t #t)
-                                                        (#f #f #f #t)))
-        (check-comparisons time>=? (list t0 t1 t2 t3) '((#t #t #f #f)
-                                                        (#t #t #f #f)
-                                                        (#t #t #t #f)
-                                                        (#t #t #t #t)))))
-
-    (test-case "Time difference"
-      (let ((t1 (make-time 'time-utc 0 3000))
-            (t2 (make-time 'time-utc 0 1000))
-            (t3 (make-time 'time-duration 0 2000))
-            (t4 (make-time 'time-duration 0 -2000)))
-        (check time=? t3 (time-difference t1 t2))
-        (check time=? t4 (time-difference t2 t1))))
-
-    (test-case "TAI-UTC Conversions"
-      (check-one-utc-tai-edge 915148800  32 31)
-      (check-one-utc-tai-edge 867715200  31 30)
-      (check-one-utc-tai-edge 820454400  30 29)
-      (check-one-utc-tai-edge 773020800  29 28)
-      (check-one-utc-tai-edge 741484800  28 27)
-      (check-one-utc-tai-edge 709948800  27 26)
-      (check-one-utc-tai-edge 662688000  26 25)
-      (check-one-utc-tai-edge 631152000  25 24)
-      (check-one-utc-tai-edge 567993600  24 23)
-      (check-one-utc-tai-edge 489024000  23 22)
-      (check-one-utc-tai-edge 425865600  22 21)
-      (check-one-utc-tai-edge 394329600  21 20)
-      (check-one-utc-tai-edge 362793600  20 19)
-      (check-one-utc-tai-edge 315532800  19 18)
-      (check-one-utc-tai-edge 283996800  18 17)
-      (check-one-utc-tai-edge 252460800  17 16)
-      (check-one-utc-tai-edge 220924800  16 15)
-      (check-one-utc-tai-edge 189302400  15 14)
-      (check-one-utc-tai-edge 157766400  14 13)
-      (check-one-utc-tai-edge 126230400  13 12)
-      (check-one-utc-tai-edge 94694400   12 11)
-      (check-one-utc-tai-edge 78796800   11 10)
-      (check-one-utc-tai-edge 63072000   10 0)
-      (check-one-utc-tai-edge 0           0 0)   ;; at the epoch
-      (check-one-utc-tai-edge 10          0 0)   ;; close to it ...
-      (check-one-utc-tai-edge 1045789645 32 32)) ;; about now ...
-
-    (test-case "TAI-Date Conversions"
-      (check tm:date= (time-tai->date (make-time time-tai 0 (+ 915148800 29)) 0)
-             (srfi:make-date 0 58 59 23 31 12 1998 0))
-      (check tm:date= (time-tai->date (make-time time-tai 0 (+ 915148800 30)) 0)
-             (srfi:make-date 0 59 59 23 31 12 1998 0))
-      (check tm:date= (time-tai->date (make-time time-tai 0 (+ 915148800 31)) 0)
-             (srfi:make-date 0 60 59 23 31 12 1998 0))
-      (check tm:date= (time-tai->date (make-time time-tai 0 (+ 915148800 32)) 0)
-             (srfi:make-date 0 0 0 0 1 1 1999 0)))
-
-    (test-case "Date-UTC Conversions"
-      (check time=? (make-time time-utc 0 (- 915148800 2))
-             (date->time-utc (srfi:make-date 0 58 59 23 31 12 1998 0)))
-      (check time=? (make-time time-utc 0 (- 915148800 1))
-             (date->time-utc (srfi:make-date 0 59 59 23 31 12 1998 0)))
-      ;; yes, I think this is actually right.
-      (check time=? (make-time time-utc 0 (- 915148800 0))
-             (date->time-utc (srfi:make-date 0 60 59 23 31 12 1998 0)))
-      (check time=? (make-time time-utc 0 (- 915148800 0))
-             (date->time-utc (srfi:make-date 0 0 0 0 1 1 1999 0)))
-      (check time=? (make-time time-utc 0 (+ 915148800 1))
-             (date->time-utc (srfi:make-date 0 1 0 0 1 1 1999 0))))
-
-    (test-case "TZ Offset conversions"
-      (let ((ct-utc (make-time time-utc 6320000 1045944859))
-            (ct-tai (make-time time-tai 6320000 1045944891))
-            (cd (srfi:make-date 6320000 19 14 15 22 2 2003 -18000)))
-        (check time=? ct-utc (date->time-utc cd))
-        (check time=? ct-tai (date->time-tai cd))))
-
-
-    ;; NOTE: documentation doesn't fully specify, e.g., zero-padding on ~c option, so I'm just going
-    ;; to change the test case to match the implementation...
-    (test-case "date->string conversions"
-      (check-equal? (date->string (srfi:make-date 1000 2 3 4 5 6 2007 (* 60 -120))
-                                  "~~ @ ~a @ ~A @ ~b @ ~B @ ~c @ ~d @ ~D @ ~e @ ~f @ ~h @ ~H")
-                    "~ @ Tue @ Tuesday @ Jun @ June @ Tue Jun 05 04:03:02-0200 2007 @ 05 @ 06/05/07 @  5 @ 02.000001 @ Jun @ 04"))
-
-
-
-    (test-case "date->string conversions of dates with nanosecond components"
-      (check-equal? (date->string (srfi:make-date 123456789 2 3 4 5 6 2007 0) "~N") "123456789")
-      (check-equal? (date->string (srfi:make-date 12345678  2 3 4 5 6 2007 0) "~N") "012345678")
-      (check-equal? (date->string (srfi:make-date 1234567   2 3 4 5 6 2007 0) "~N") "001234567")
-      (check-equal? (date->string (srfi:make-date 123456    2 3 4 5 6 2007 0) "~N") "000123456")
-      (check-equal? (date->string (srfi:make-date 12345     2 3 4 5 6 2007 0) "~N") "000012345")
-      (check-equal? (date->string (srfi:make-date 1234      2 3 4 5 6 2007 0) "~N") "000001234")
-      (check-equal? (date->string (srfi:make-date 123       2 3 4 5 6 2007 0) "~N") "000000123")
-      (check-equal? (date->string (srfi:make-date 12        2 3 4 5 6 2007 0) "~N") "000000012")
-      (check-equal? (date->string (srfi:make-date 1         2 3 4 5 6 2007 0) "~N") "000000001"))
-
-    (test-case "string->date conversions of dates with nanosecond components"
-      (check-equal? (string->date "12:00:00.123456789" "~H:~M:~S.~N") (srfi:make-date 123456789 0 0 12 #t #t #t cur-tz) "check 1")
-      (check-equal? (string->date "12:00:00.12345678"  "~H:~M:~S.~N") (srfi:make-date 123456780 0 0 12 #t #t #t cur-tz) "check 2")
-      (check-equal? (string->date "12:00:00.1234567"   "~H:~M:~S.~N") (srfi:make-date 123456700 0 0 12 #t #t #t cur-tz) "check 3")
-      (check-equal? (string->date "12:00:00.123456"    "~H:~M:~S.~N") (srfi:make-date 123456000 0 0 12 #t #t #t cur-tz) "check 4")
-      (check-equal? (string->date "12:00:00.12345"     "~H:~M:~S.~N") (srfi:make-date 123450000 0 0 12 #t #t #t cur-tz) "check 5")
-      (check-equal? (string->date "12:00:00.1234"      "~H:~M:~S.~N") (srfi:make-date 123400000 0 0 12 #t #t #t cur-tz) "check 6")
-      (check-equal? (string->date "12:00:00.123"       "~H:~M:~S.~N") (srfi:make-date 123000000 0 0 12 #t #t #t cur-tz) "check 7")
-      (check-equal? (string->date "12:00:00.12"        "~H:~M:~S.~N") (srfi:make-date 120000000 0 0 12 #t #t #t cur-tz) "check 8")
-      (check-equal? (string->date "12:00:00.1"         "~H:~M:~S.~N") (srfi:make-date 100000000 0 0 12 #t #t #t cur-tz) "check 9")
-      (check-equal? (string->date "12:00:00.123456789" "~H:~M:~S.~N") (srfi:make-date 123456789 0 0 12 #t #t #t cur-tz) "check 10")
-      (check-equal? (string->date "12:00:00.012345678" "~H:~M:~S.~N") (srfi:make-date 12345678  0 0 12 #t #t #t cur-tz) "check 11")
-      (check-equal? (string->date "12:00:00.001234567" "~H:~M:~S.~N") (srfi:make-date 1234567   0 0 12 #t #t #t cur-tz) "check 12")
-      (check-equal? (string->date "12:00:00.000123456" "~H:~M:~S.~N") (srfi:make-date 123456    0 0 12 #t #t #t cur-tz) "check 13")
-      (check-equal? (string->date "12:00:00.000012345" "~H:~M:~S.~N") (srfi:make-date 12345     0 0 12 #t #t #t cur-tz) "check 14")
-      (check-equal? (string->date "12:00:00.000001234" "~H:~M:~S.~N") (srfi:make-date 1234      0 0 12 #t #t #t cur-tz) "check 15")
-      (check-equal? (string->date "12:00:00.000000123" "~H:~M:~S.~N") (srfi:make-date 123       0 0 12 #t #t #t cur-tz) "check 16")
-      (check-equal? (string->date "12:00:00.000000012" "~H:~M:~S.~N") (srfi:make-date 12        0 0 12 #t #t #t cur-tz) "check 17")
-      (check-equal? (string->date "12:00:00.000000001" "~H:~M:~S.~N") (srfi:make-date 1         0 0 12 #t #t #t cur-tz) "check 18"))
-
-    (test-case "interpretation of 1- to 4-digit years by ~y, ~Y and ~?:"
-      ; ~y:
-      (check-exn exn:fail? (lambda () (string->date    "1-03-02" "~y-~m-~d")))
-      (check-not-exn (lambda () (check-equal? (string->date   "10-03-02" "~y-~m-~d") (srfi:make-date 0 0 0 0 2 3 2010 cur-tz))))
-      (check-exn exn:fail? (lambda () (string->date  "100-03-02" "~y-~m-~d")))
-      (check-exn exn:fail? (lambda () (string->date "1000-03-02" "~y-~m-~d")))
-      ; ~Y:
-      (check-not-exn (lambda () (check-equal? (string->date    "1-03-02" "~Y-~m-~d") (srfi:make-date 0 0 0 0 2 3    1 cur-tz))))
-      (check-not-exn (lambda () (check-equal? (string->date   "10-03-02" "~Y-~m-~d") (srfi:make-date 0 0 0 0 2 3   10 cur-tz))))
-      (check-not-exn (lambda () (check-equal? (string->date  "100-03-02" "~Y-~m-~d") (srfi:make-date 0 0 0 0 2 3  100 cur-tz))))
-      (check-not-exn (lambda () (check-equal? (string->date "1000-03-02" "~Y-~m-~d") (srfi:make-date 0 0 0 0 2 3 1000 cur-tz))))
-      ; ~? (PLT-specific extension for 2- or 4-digit years:
-      (check-not-exn (lambda () (check-equal? (string->date    "1-03-02" "~?-~m-~d") (srfi:make-date 0 0 0 0 2 3 2001 cur-tz))))
-      (check-not-exn (lambda () (check-equal? (string->date   "10-03-02" "~?-~m-~d") (srfi:make-date 0 0 0 0 2 3 2010 cur-tz))))
-      (check-not-exn (lambda () (check-equal? (string->date  "100-03-02" "~?-~m-~d") (srfi:make-date 0 0 0 0 2 3  100 cur-tz))))
-      (check-not-exn (lambda () (check-equal? (string->date "1000-03-02" "~?-~m-~d") (srfi:make-date 0 0 0 0 2 3 1000 cur-tz)))))
-
-    (test-case "type-like error on date->string"
-               (check-exn
-                (lambda (exn)
-                  (regexp-match #px"expects type <string>"
-                                (exn-message exn)))
-                (lambda () (date->string (srfi:make-date 1000 2 3 4 2 5 2011 (* 60 -120)) #t))))
-
-
-    (test-case "date<->julian-day conversion"
-      (check = 365 (- (date->julian-day (srfi:make-date 0 0 0 0 1 1 2004 0))
-                      (date->julian-day (srfi:make-date 0 0 0 0 1 1 2003 0))))
-      (let ([test-date (srfi:make-date 0 0 0 0 1 1 2003 -7200)])
-        (check tm:date= test-date (julian-day->date (date->julian-day test-date) -7200))))
-
-    (test-case "date->modified-julian-day conversion"
-      (check = 365 (- (date->modified-julian-day (srfi:make-date 0 0 0 0 1 1 2004 0))
-                      (date->modified-julian-day (srfi:make-date 0 0 0 0 1 1 2003 0))))
-      (let ([test-date (srfi:make-date 0 0 0 0 1 1 2003 -7200)])
-        (check tm:date= test-date (modified-julian-day->date (date->modified-julian-day test-date) -7200))))
-
-    (test-case "serialize and deserialize"
-      (check-equal? (deserialize (serialize (make-time time-utc 0 1))) (make-time time-utc 0 1))
-      (check-equal? (deserialize (serialize (make-time time-tai 2 3))) (make-time time-tai 2 3))
-      (check-equal? (deserialize (serialize (srfi:make-date 0 1 2 3 4 5 6 7))) (srfi:make-date 0 1 2 3 4 5 6 7)))
-
-    ;; make sure that older srfi-19 structures still deserialize
-    (test-case "old deserialization"
-      (check-equal? (deserialize '((3) 1 (((lib "srfi/19/time.rkt") . deserialize-info:tm:date-v0))
-                                   0 () () (0 0 1 2 3 4 5 6 7)))
-                    (srfi:make-date 0 1 2 3 4 5 6 7))
-      (check-equal? (deserialize '((3) 1 (((lib "srfi/19/time.rkt") . deserialize-info:tm:date-v0))
-                                   0 () () (0 0 0 0 0 1 1 2004 0)))
-                    (srfi:make-date 0 0 0 0 1 1 2004 0)))
-
-    ;; test racket/date, lax-date functionality
-    (test-case "check date? and lax-date?"
-               (check-true (date? (srfi:make-date 0 4 5 0 1 10 2013 0)))
-               (check-true (date? (srfi:make-date 0 0 0 0 1 1 2004 0)))
-               (check-equal? (date->julian/scalinger (srfi:make-date 0 0 0 0 1 1 2004 0))
-                             2453006)
-               (check-equal? (date->julian-day (srfi:make-date 0 0 0 0 1 1 2004 0))
-                             4906011/2)
-               (check-true (lax-date? (srfi:make-date 0 0 0 0 0 1 2004 0)))
-               (check-true (lax-date? (srfi:make-date 0 0 0 0 #t 1 2004 0)))
-               (check-true (lax-date? (srfi:make-date 0 0 0 0 #t #t 2004 0)))
-               (check-true (lax-date? (srfi:make-date 0 0 0 0 #t #t #t 0)))
-               (check-equal? (srfi:date-year (srfi:make-date 0 0 0 0 1 1 2004 #t))
-                             2004)
-               (check-equal? (srfi:date-year (srfi:make-date 0 0 0 0 1 1 2004 0))
-                             2004))
-
-    ;; test leap seconds
-    (test-case "check latest leap seconds"
-               (check-equal?
-                1230768032
-                (time-second (date->time-tai (srfi:make-date 0 59 59 23 31 12 2008 0))))
-               (check-equal?
-                1230768033
-                (time-second (date->time-tai (srfi:make-date 0 60 59 23 31 12 2008 0))))
-               (check-equal?
-                1230768034
-                (time-second (date->time-tai (srfi:make-date 0 0 0 0 1 1 2009 0))))
-               (check-equal?
-                1341100833
-                (time-second (date->time-tai (srfi:make-date 0 59 59 23 30 6 2012 0))))
-               (check-equal?
-                1341100834
-                (time-second (date->time-tai (srfi:make-date 0 60 59 23 30 6 2012 0))))
-               (check-equal?
-                1341100835
-                (time-second (date->time-tai (srfi:make-date 0 0 0 0 1 7 2012 0)))))
-
-    ;; test off-by-1 year-day behavior
-    ;; srfi/19's year day and Racket's year day are 1 and 0 indexed, respectively
-    (test-case "test off-by-1 year day"
-               (check-false (lax-date? (time-tai->date (make-time 'time-tai 0 1230768033))))
-               (check-true (lax-date? (srfi:make-date 0 58 59 18 31 12 2008 #f)))
-               (check-equal? (srfi:date-year-day (srfi:make-date 0 58 59 18 31 12 2008 #f))
-                             366)
-               (check-equal? (srfi:date-year-day (time-tai->date (make-time 'time-tai 0 1230768033)))
-                             366)
-               (check-equal? (date-year-day (time-tai->date (make-time 'time-tai 0 1230768033)))
-                             365))
-
-    ;; nanoseconds off by a factor of 100...
-    (test-case "nanosecond order-of-magnitude"
-      ;; half a second should be within 1/10th of 10^9 / 2 nanoseconds (currently off by a factor of 100)
-      (check-within (let ([t (date-nanosecond (current-date))])
-                      (sleep 0.5)
-                      (abs (- (date-nanosecond (current-date)) t)))
-                    (* 1/2  (expt 10 9))
-                    (* 1/10 (expt 10 9))))))
-
-; Helper checks and procedures -----------------
-
-(define-simple-check (check-within actual expected epsilon)
-  (< (abs (- actual expected)) epsilon))
-
-(define-check (check-one-utc-tai-edge utc tai-diff tai-last-diff)
-  (let* (;; right on the edge they should be the same
-         (utc-basic (make-time 'time-utc 0 utc))
-         (tai-basic (make-time 'time-tai 0 (+ utc tai-diff)))
-         (utc->tai-basic (time-utc->time-tai utc-basic))
-         (tai->utc-basic (time-tai->time-utc tai-basic))
-
-         ;; a second before they should be the old diff
-         (utc-basic-1 (make-time 'time-utc 0 (- utc 1)))
-         (tai-basic-1 (make-time 'time-tai 0 (- (+ utc tai-last-diff) 1)))
-         (utc->tai-basic-1 (time-utc->time-tai utc-basic-1))
-         (tai->utc-basic-1 (time-tai->time-utc tai-basic-1))
-
-         ;; a second later they should be the new diff
-         (utc-basic+1 (make-time 'time-utc 0 (+ utc 1)))
-         (tai-basic+1 (make-time 'time-tai 0 (+ (+ utc tai-diff) 1)))
-         (utc->tai-basic+1 (time-utc->time-tai utc-basic+1))
-         (tai->utc-basic+1 (time-tai->time-utc tai-basic+1))
-
-         ;; ok, let's move the clock half a month or so plus half a second
-         (shy (* 15 24 60 60))
-         (hs (/ (expt 10 9) 2))
-         ;; a second later they should be the new diff
-         (utc-basic+2 (make-time 'time-utc hs (+ utc shy)))
-         (tai-basic+2 (make-time 'time-tai hs (+ (+ utc tai-diff) shy)))
-         (utc->tai-basic+2 (time-utc->time-tai utc-basic+2))
-         (tai->utc-basic+2 (time-tai->time-utc tai-basic+2)))
-
-    (check time=? utc-basic tai->utc-basic)
-    (check time=? tai-basic utc->tai-basic)
-    (check time=? utc-basic-1 tai->utc-basic-1)
-    (check time=? tai-basic-1 utc->tai-basic-1)
-    (check time=? utc-basic+1 tai->utc-basic+1)
-    (check time=? tai-basic+1 utc->tai-basic+1)
-    (check time=? utc-basic+2 tai->utc-basic+2)
-    (check time=? tai-basic+2 utc->tai-basic+2)))
-
-(define (tm:date= d1 d2)
-  (and (= (srfi:date-year d1) (srfi:date-year d2))
-       (= (srfi:date-month d1) (srfi:date-month d2))
-       (= (srfi:date-day d1) (srfi:date-day d2))
-       (= (srfi:date-hour d1) (srfi:date-hour d2))
-       (= (srfi:date-second d1) (srfi:date-second d2))
-       (= (date-nanosecond d1) (date-nanosecond d2))
-       (= (date-zone-offset d1) (date-zone-offset d2))))
-
-; Main module body -------------------------------
-
-(run-tests srfi-19-test-suite)
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/2/and-let-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/2/and-let-test.rkt
deleted file mode 100644
index e5826cfa91..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/2/and-let-test.rkt
+++ /dev/null
@@ -1,191 +0,0 @@
-;;;
-;;; <and-let-test.rkt> ---- and-let* macro tests
-;;; Time-stamp: <06/06/09 15:58:59 nhw>
-;;;
-;;; Copyright (C) 2002 by Francisco Solsona. 
-;;;
-;;; This file is part of PLT SRFI.
-
-;;; PLT SRFI is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-
-;;; PLT SRFI is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with PLT SRFI; if not, write to the Free Software
-;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-;;; Author: Francisco Solsona <solsona@acm.org>
-;;
-;;
-;; Commentary:
-
-(module and-let-test mzscheme
-  (require rackunit)
-  (require srfi/2/and-let)
-  (provide and-let*-tests)
-
-  (define and-let*-tests
-    (test-suite
-     "and-let* tests"
-     (test-case "empty body 1"
-                ;; check-true, check-eqv?, etc.
-                (check-eqv? (and-let* () ) #t))
-
-     (test-case "empty claws 1"
-                (check-eqv? (and-let* () 1) 1))
-
-     (test-case "empty claws 2"
-                (check-eqv? (and-let* () 1 2) 2))
-
-     (test-case "singleton claw 1"
-                (check-eqv? (let ((x #f))
-                              (and-let* (x)))
-                            #f))
-
-     (test-case "singleton claw 2"
-                (check-eqv? (let ((x 1))
-                              (and-let* (x)))
-                            1))
-
-     (test-case "let-like assignment 1"
-                (check-eqv? (and-let* ((x #f))) #f))
-
-     (test-case "let-like assignment 2"
-                (check-eqv? (and-let* ((x 1))) 1))
-
-     ;;(test-case "gotta break 1"
-     ;;           (check-true (and-let* (#f (x 1)))))
-
-     (test-case "mixed claws 1"
-                (check-eqv? (and-let* ((#f) (x 1))) #f))
-
-     ;; (test-case "gotta break 2"
-     ;;            (check-true (and-let* (2 (x 1)))))
-
-     (test-case "mixed claws 2"
-                (check-eqv? (and-let* ((2) (x 1))) 1))
-
-     (test-case "mixed claws 3"
-                (check-eqv? (and-let* ((x 1) (2))) 2))
-
-     (test-case "simple claw 1"
-                (check-eqv?
-                 (let ((x #f))
-                   (and-let* (x) x))
-                 #f))
-
-     (test-case "simple claw 2"
-                (check-equal?
-                 (let ((x ""))
-                   (and-let* (x) x))
-                 ""))
-     
-     (test-case "simple claw 3"
-                (check-equal?
-                 (let ((x ""))
-                   (and-let* (x)))
-                 ""))
-
-     (test-case "simple claw 4"
-                (check-eqv?
-                 (let ((x 1))
-                   (and-let* (x) (+ x 1)))
-                 2))
-
-     (test-case "simple claw 5"
-                (check-eqv?
-                 (let ((x #f))
-                   (and-let* (x) (+ x 1)))
-                 #f))
-
-     (test-case "simple claw 6"
-                (check-eqv?
-                 (let ((x 1))
-                   (and-let* (((positive? x))) (+ x 1)))
-                 2))
-
-     (test-case "simple claw 7"
-                (check-eqv?
-                 (let ((x 1))
-                   (and-let* (((positive? x)))))
-                 #t))
-
-     (test-case "simple claw 8"
-                (check-eqv?
-                 (let ((x 0))
-                   (and-let* (((positive? x))) (+ x 1)))
-                 #f))
-
-     (test-case "simple claw 9"
-                (check-eqv?
-                 (let ((x 1))
-                   (and-let* (((positive? x)) (x (+ x 1))) (+ x 1)))
-                 3))
-
-     ;; (test-case "gotta break 3"
-     ;;            (check-true (and-let* (((positive? x)) (x (+ x 1)) (x (+ x 1))) (+ x 1))))
-     
-     (test-case "complex claw 1"
-                (check-eqv?
-                 (let ((x 1))
-                   (and-let* (x ((positive? x))) (+ x 1)))
-                 2))
-
-     (test-case "complex claw 2"
-                (check-eqv?
-                 (let ((x 1))
-                   (and-let* (((begin x)) ((positive? x))) (+ x 1)))
-                 2))
-
-     (test-case "complex claw 3"
-                (check-eqv?
-                 (let ((x 0))
-                   (and-let* (x ((positive? x))) (+ x 1)))
-                 #f))
-
-     (test-case "complex claw 4"
-                (check-eqv?
-                 (let ((x #f))
-                   (and-let* (x ((positive? x))) (+ x 1)))
-                 #f))
-
-     (test-case "complex claw 5"
-                (check-eqv?
-                 (let ((x #f))
-                   (and-let* (((begin x)) ((positive? x))) (+ x 1)))
-                 #f))
-
-     (test-case "funky claw 1"
-                (check-eqv?
-                 (let ((x 1))
-                   (and-let* (x (y (- x 1)) ((positive? y))) (/ x y)))
-                 #f))
-
-     (test-case "funky claw 2"
-                (check-eqv?
-                 (let ((x 0))
-                   (and-let* (x (y (- x 1)) ((positive? y))) (/ x y)))
-                 #f))
-
-     (test-case "funky claw 3"
-                (check-eqv?
-                 (let ((x #f))
-                   (and-let* (x (y (- x 1)) ((positive? y))) (/ x y)))
-                 #f))
-
-     (test-case "funky claw 4"
-                (check-eqv?
-                 (let ((x 3))
-                   (and-let* (x (y (- x 1)) ((positive? y))) (/ x y)))
-                 3/2))
-     ))
-
-  )
-
-;;; and-let-test.rkt ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/26/cut-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/26/cut-test.rkt
deleted file mode 100644
index ce9d4a96f0..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/26/cut-test.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-;;;
-;;; <cut-test.rkt> ---- SRFI 26 tests
-;;; Time-stamp: <06/06/09 16:04:14 nhw>
-;;;
-;;; Usually, I would add a copyright notice, and the announce that
-;;; this code is under the LGPL licence.  However, I only did the
-;;; port to PLT Scheme, the original comment follows:
-
-; CONFIDENCE TEST FOR IMPLEMENTATION OF SRFI-26
-; =============================================
-;
-; Sebastian.Egner@philips.com, 3-Jun-2002.
-;
-; This file checks a few checks about the implementation.
-; If you run it and no error message is issued, the implementation
-; is correct on the cases that have been tested.
-;
-; compliance:
-;   Scheme R5RS with
-;     SRFI-23: error
-;
-
-; $Id: cut-test.rkt,v 1.1 2002/06/20 15:40:52 noel Exp $
-
-(module cut-test mzscheme
-  (require rackunit)
-  (require srfi/26/cut)
-
-  (provide cut-tests)
-
-  (define cut-tests
-    (test-suite
-     "Cut (SRFI 26) Tests"
-     (test-case
-      "Cut test"
-      (begin
-        (check-equal? ((cut list)) '())
-        (check-equal? ((cut list <...>)) '())
-        (check-equal? ((cut list 1)) '(1))
-        (check-equal? ((cut list <>) 1) '(1))
-        (check-equal? ((cut list <...>) 1) '(1))
-        (check-equal? ((cut list 1 2)) '(1 2))
-        (check-equal? ((cut list 1 <>) 2) '(1 2))
-        (check-equal? ((cut list 1 <...>) 2) '(1 2))
-        (check-equal? ((cut list 1 <...>) 2 3 4) '(1 2 3 4))
-        (check-equal? ((cut list 1 <> 3 <>) 2 4) '(1 2 3 4))
-        (check-equal? ((cut list 1 <> 3 <...>) 2 4 5 6) '(1 2 3 4 5 6))
-        (check-equal? 
-         (let* ((x 'wrong) (y (cut list x)))
-           (set! x 'ok) (y))
-         '(ok))
-        (check-equal? 
-         (let ((a 0))
-           (map (cut + (begin (set! a (+ a 1)) a) <>)
-                '(1 2))
-           a)
-         2)))
-     
-     (test-case
-      "Cute test"
-      (begin
-        (check-equal? ((cute list)) '())
-        (check-equal? ((cute list <...>)) '())
-        (check-equal? ((cute list 1)) '(1))
-        (check-equal? ((cute list <>) 1) '(1))
-        (check-equal? ((cute list <...>) 1) '(1))
-        (check-equal? ((cute list 1 2)) '(1 2))
-        (check-equal? ((cute list 1 <>) 2) '(1 2))
-        (check-equal? ((cute list 1 <...>) 2) '(1 2))
-        (check-equal? ((cute list 1 <...>) 2 3 4) '(1 2 3 4))
-        (check-equal? ((cute list 1 <> 3 <>) 2 4) '(1 2 3 4))
-        (check-equal? ((cute list 1 <> 3 <...>) 2 4 5 6) '(1 2 3 4 5 6))
-        (check-equal? 
-         (let ((a 0))
-           (map (cute + (begin (set! a (+ a 1)) a) <>)
-                '(1 2))
-           a)
-         1)))
-     ))
-  )
-
-;;; cut-test.scm ends here
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/34/else.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/34/else.rkt
deleted file mode 100644
index ec836411c7..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/34/else.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/base
-(require srfi/34)
-
-(guard (condition
-         (else
-          (display "condition: ")
-          (write condition)
-          (newline)
-          'exception))
-  (+ 1 (raise 'an-error)))
-
-(guard (condition
-         (#t ; <- not an identifier
-          (display "condition: ")
-          (write condition)
-          (newline)
-          'exception))
-  (+ 1 (raise 'an-error)))
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/34/mz-else.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/34/mz-else.rkt
deleted file mode 100644
index 12138ed104..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/34/mz-else.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang mzscheme
-(require srfi/34)
-
-(guard (condition
-         (else
-          (display "condition: ")
-          (write condition)
-          (newline)
-          'exception))
-  (+ 1 (raise 'an-error)))
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/4/srfi-4-test.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/4/srfi-4-test.rkt
deleted file mode 100644
index 396b3fb74e..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/4/srfi-4-test.rkt
+++ /dev/null
@@ -1,102 +0,0 @@
-(module srfi-4-test mzscheme
-  
-  (require rackunit)
-  (require rackunit/text-ui
-           srfi/4)
-  
-  (provide srfi-4-tests)
-
-  (define-syntax (check-struct-info-binding stx)
-    (syntax-case stx ()
-        [(_ name)
-         (if (identifier? (syntax name))
-             #'#t
-             #'(fail "Identifier not bound"))]))
-
-  (define-check (check-srfi-4-type make pred length ref set to-list from-list)
-    (check-pred pred (from-list '(1 2 3 4)))
-    (check-pred list? (to-list (from-list '(1 2 3 4))))
-    (check-equal? (to-list (from-list '(1 2 3 4))) '(1 2 3 4))
-    (check-pred pred (make 4 1))
-    (let ([vec (make 4 1)])
-      (check-equal? (ref vec 0) 1)
-      (check-equal? (ref vec 1) 1)
-      (check-equal? (ref vec 2) 1)
-      (check-equal? (ref vec 3) 1)
-      (set vec 0 5)
-      (check-equal? (ref vec 0) 5)
-      (check-equal? (length vec) 4)))
-
-  (define-check (check-srfi-4-float-type make pred length ref set to-list from-list)
-    (check-pred pred (from-list '(1. 2. 3. 4.)))
-    (check-pred list? (to-list (from-list '(1. 2. 3. 4.))))
-    (check-equal? (to-list (from-list '(1. 2. 3. 4.))) '(1. 2. 3. 4.))
-    (check-pred pred (make 4 1.))
-    (let ([vec (make 4 1.)])
-      (check-equal? (ref vec 0) 1.)
-      (check-equal? (ref vec 1) 1.)
-      (check-equal? (ref vec 2) 1.)
-      (check-equal? (ref vec 3) 1.)
-      (set vec 0 5.)
-      (check-equal? (ref vec 0) 5.)
-      (check-equal? (length vec) 4)))
-  
-  (define srfi-4-tests
-    (test-suite
-     "All tests for srfi-4"
-
-     (test-case
-      "s8"
-      (check-srfi-4-type make-s8vector s8vector? s8vector-length s8vector-ref s8vector-set! s8vector->list list->s8vector)
-      (check-struct-info-binding s8))
-
-     (test-case
-      "u8"
-      (check-srfi-4-type make-u8vector u8vector? u8vector-length u8vector-ref u8vector-set! u8vector->list list->u8vector))
-
-     (test-case
-      "s16"
-      (check-srfi-4-type make-s16vector s16vector? s16vector-length s16vector-ref s16vector-set! s16vector->list list->s16vector)
-      (check-struct-info-binding s16))
-
-     (test-case
-      "u16"
-      (check-srfi-4-type make-u16vector u16vector? u16vector-length u16vector-ref u16vector-set! u16vector->list list->u16vector)
-      (check-struct-info-binding u16))
-
-     (test-case
-      "s32"
-      (check-srfi-4-type make-s32vector s32vector? s32vector-length s32vector-ref s32vector-set! s32vector->list list->s32vector)
-      (check-struct-info-binding s32))
-
-     (test-case
-      "u32"
-      (check-srfi-4-type make-u32vector u32vector? u32vector-length u32vector-ref u32vector-set! u32vector->list list->u32vector)
-      (check-struct-info-binding u32))
-
-     (test-case
-      "s64"
-      (check-srfi-4-type make-s64vector s64vector? s64vector-length s64vector-ref s64vector-set! s64vector->list list->s64vector)
-      (check-struct-info-binding s64))
-
-     (test-case
-      "u64"
-      (check-srfi-4-type make-u64vector u64vector? u64vector-length u64vector-ref u64vector-set! u64vector->list list->u64vector)
-      (check-struct-info-binding u64))
-
-     (test-case
-      "f32"
-      (check-srfi-4-float-type make-f32vector f32vector? f32vector-length f32vector-ref f32vector-set! f32vector->list list->f32vector)
-      (check-struct-info-binding f32))
-
-     (test-case
-      "f64"
-      (check-srfi-4-float-type make-f64vector f64vector? f64vector-length f64vector-ref f64vector-set! f64vector->list list->f64vector)
-      (check-struct-info-binding f64))
-     
-     ))
-
-
-  (run-tests srfi-4-tests)
-  
-  )
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/40/all-srfi-40-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/40/all-srfi-40-tests.rkt
deleted file mode 100644
index 0efc798847..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/40/all-srfi-40-tests.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-(module all-srfi-40-tests mzscheme
-  (require rackunit)
-  (require srfi/40)
-  (provide all-srfi-40-tests)
-  
-  (define from0
-    (let loop ((x 0))
-      (stream-delay
-       (stream-cons x (loop (+ x 1))))))
-  (define (take5 s)
-    (stream-unfoldn
-     (lambda (x)
-       (let ((n (car x)) (s (cdr x)))
-         (if (zero? n)
-             (values 'dummy '())
-             (values
-              (cons (- n 1) (stream-cdr s))
-              (list (stream-car s))))))
-     (cons 5 s)
-     1))
-  (define (finite-stream->list s)
-    (if (stream-null? s)
-        null
-        (cons (stream-car s)
-              (finite-stream->list (stream-cdr s)))))
-  
-  (define all-srfi-40-tests
-    (test-suite 
-     "All tests for SRFI 40"
-     (test-case
-      "stream?"
-      (check-true
-       (stream? stream-null))
-      (check-true
-       (stream? (stream-cons 'a stream-null)))
-      (check-false
-       (stream? 3)))
-     (test-case
-      "stream-null?"
-      (check-true
-       (stream-null? stream-null))
-      (check-false
-       (stream-null? (stream-cons 'a stream-null)))
-      (check-false
-       (stream-null? 3)))
-     (test-case
-      "stream-pair?"
-      (check-false
-       (stream-pair? stream-null))
-      (check-true
-       (stream-pair? (stream-cons 'a stream-null)))
-      (check-false
-       (stream-pair? 3)))
-     (test-case
-      "stream"
-      (check-true
-       (stream-null? (stream)))
-      (check-equal? (finite-stream->list (stream 'a (+ 3 4) 'c))
-                     '(a 7 c)))
-     (test-case
-      "stream-unfoldn"
-      (check-equal? (finite-stream->list (take5 from0))
-                     '(0 1 2 3 4)))
-     (test-case
-      "stream-for-each"
-      (check-equal?
-       (let ((l '()))
-         (stream-for-each (lambda (n) (set! l (cons n l)))
-                          (take5 from0))
-         l)
-       '(4 3 2 1 0)))
-     (test-case
-      "stream-map"
-      (check-equal? (finite-stream->list (take5 (stream-map (lambda (x) (+ x x)) from0)))
-                     '(0 2 4 6 8))
-      (check-equal? (finite-stream->list (stream-map + (stream 1 2 3) (stream 4 5 6)))
-                     '(5 7 9))
-      (check-equal? (finite-stream->list
-                      (stream-map (lambda (x) (expt x x))
-                                  (stream 1 2 3 4 5)))
-                     '(1 4 27 256 3125)))
-     (test-case
-      "stream-filter"
-      (check-true
-       (stream-null? (stream-filter odd? stream-null)))
-      (check-equal? (finite-stream->list (take5 (stream-filter odd? from0)))
-                     '(1 3 5 7 9))))))
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/40/run-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/40/run-tests.rkt
deleted file mode 100644
index 05b09a2084..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/40/run-tests.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-(require rackunit)
-(require rackunit/text-ui)
-(require "all-srfi-40-tests.rkt")
-
-(run-tests all-srfi-40-tests)
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/all-srfi-43-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/all-srfi-43-tests.rkt
deleted file mode 100644
index 73004b9d0d..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/all-srfi-43-tests.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-(module all-srfi-43-tests mzscheme
-  (require rackunit)
-  (require "constructor-tests.rkt"
-           "predicate-tests.rkt"
-           "iteration-tests.rkt"
-           "searching-tests.rkt"
-           "mutator-tests.rkt"
-           "conversion-tests.rkt")
-  (provide all-srfi-43-tests)
-  
-  (define all-srfi-43-tests
-    (test-suite 
-     "all-tests-tests"
-     constructor-tests
-     predicate-tests
-     iteration-tests
-     searching-tests
-     mutator-tests
-     conversion-tests)))
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/constructor-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/constructor-tests.rkt
deleted file mode 100644
index fdcb6c4068..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/constructor-tests.rkt
+++ /dev/null
@@ -1,111 +0,0 @@
-(module constructor-tests mzscheme
-
-  (require rackunit)
-  (require srfi/43/vector-lib)
-
-  (provide constructor-tests)
-
-  (define constructor-tests
-    (test-suite
-     "All tests for constructor"
-     (test-case
-      "vector-unfold"
-      (check-equal?
-       (vector-unfold values 10)
-       #(0 1 2 3 4 5 6 7 8 9)
-       "No seed")
-      (check-equal?
-       (vector-unfold (lambda (i x) (values x (- x 1))) 10 0)
-       #(0 -1 -2 -3 -4 -5 -6 -7 -8 -9)
-       "Single seed")
-      (check-equal?
-       (vector-unfold (lambda (i a b) (values (/ a b) a b)) 4 5 5)
-       #(1 1 1 1)
-       "Two seeds"))
-
-     (test-case
-      "vector-unfold-right"
-      (check-equal?
-       (vector-unfold-right values 10)
-       #(0 1 2 3 4 5 6 7 8 9)
-       "No seed")
-      (check-equal?
-       (vector-unfold-right
-        (lambda (i x) (values x (- x 1)))
-        10
-        0)
-       #(-9 -8 -7 -6 -5 -4 -3 -2 -1 0)
-       "Single seed")
-      (check-equal?
-       (vector-unfold-right
-        (lambda (i a b) (values (/ a b) a b))
-        4
-        5
-        5)
-       #(1 1 1 1)
-       "Two seeds"))
-
-     (test-case
-      "vector-copy"
-      (check-equal?
-       (vector-copy '#(a b c d e f g h i))
-       #(a b c d e f g h i))
-      (check-equal?
-       (vector-copy '#(a b c d e f g h i) 6)
-       #(g h i))
-      (check-equal?
-       (vector-copy '#(a b c d e f g h i) 3 6)
-       #(d e f))
-      (check-equal?
-       (vector-copy '#(a b c d e f g h i) 6 12 'x)
-       #(g h i x x x)))
-
-     (test-case
-      "vector-reverse-copy"
-      (check-equal?
-       (vector-reverse-copy '#(5 4 3 2 1 0) 1 5)
-       #(1 2 3 4))
-      (check-equal?
-       (vector-reverse-copy '#(5 4 3 2 1 0) 2)
-       #(0 1 2 3))
-      (check-equal?
-       (vector-reverse-copy '#(5 4 3 2 1 0))
-       #(0 1 2 3 4 5)))
-
-     (test-case
-      "vector-append"
-      (check-equal?
-       (vector-append '#(x) '#(y))
-       #(x y))
-      (check-equal?
-       (vector-append '#(a) '#(b c d))
-       #(a b c d))
-      (check-equal?
-       (vector-append '#(a #(b)) '#(#(c)))
-       #(a #(b) #(c)))
-      (check-equal?
-       (vector-append '#(1 2) '#(3) '#(4 5 6 7))
-       #(1 2 3 4 5 6 7))
-      (check-equal?
-       (vector-append)
-       #()))
-
-     (test-case
-      "vector-concatenate"
-      (check-equal?
-       (vector-concatenate '(#(x) #(y)))
-       #(x y))
-      (check-equal?
-       (vector-concatenate '(#(a) #(b c d)))
-       #(a b c d))
-      (check-equal?
-       (vector-concatenate '(#(a #(b)) #(#(c))))
-       #(a #(b) #(c)))
-      (check-equal?
-       (vector-concatenate '(#(1 2) #(3) #(4 5 6 7)))
-       #(1 2 3 4 5 6 7))
-      (check-equal?
-       (vector-concatenate '())
-       #()))
-     ))
-  )
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/conversion-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/conversion-tests.rkt
deleted file mode 100644
index 52565771e0..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/conversion-tests.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-(module conversion-tests mzscheme
-  
-  (require rackunit)
-  (require srfi/43/vector-lib)
-  
-  (provide conversion-tests)
-  
-  (define conversion-tests
-    (test-suite
-     "All tests for conversion"
-     (test-case
-      "vector->list"
-      (check-equal?
-       (s:vector->list '#(1 2 3 4))
-       '(1 2 3 4))
-      (check-equal?
-       (s:vector->list '#(1 2 3 4) 4)
-       '())
-      (check-equal?
-       (s:vector->list '#(1 2 3 4) 1 3)
-       '(2 3)))
-     
-     (test-case
-      "reverse-vector->list"
-      (check-equal?
-       (reverse-vector->list '#(1 2 3 4))
-       '(4 3 2 1))
-      (check-equal?
-       (reverse-vector->list '#(1 2 3 4) 4)
-       '())
-      (check-equal?
-       (reverse-vector->list '#(1 2 3 4) 1 3)
-       '(3 2)))
-     
-     (test-case
-      "reverse-list->vector"
-      (check-equal?
-       (reverse-list->vector '(1 2 3 4))
-       '#(4 3 2 1))
-      (check-equal?
-       (reverse-list->vector '())
-       '#()))
-     ))
-  )
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/iteration-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/iteration-tests.rkt
deleted file mode 100644
index 8055ad96e0..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/iteration-tests.rkt
+++ /dev/null
@@ -1,118 +0,0 @@
-(module iteration-tests mzscheme
-  
-  (require rackunit)
-  (require srfi/43/vector-lib)
-  
-  (provide iteration-tests)
-  
-  (define iteration-tests
-    (test-suite
-     "All tests for iteration"
-     (test-case
-      "vector-fold"
-      (check =
-              (vector-fold (lambda (index len str) (max (string-length str) len))
-                           0 '#("abcde" "1234" "bar"))
-              5)
-      (check-equal?
-       (vector-fold (lambda (index tail elt) (cons elt tail))
-                    '() '#(1 2 3 4 5))
-       '(5 4 3 2 1)
-       "reverse-vector->list")
-      (check =
-              (vector-fold (lambda (index counter n)
-                             (if (even? n) (+ counter 1) counter))
-                           0 '#(1 2 3 4 5))
-              2)
-      (check-equal?
-       (vector-fold (lambda (index tail elt1 elt2)
-                      (cons (list elt1 elt2) tail))
-                    '()
-                    '#(1 2 3 4 5)
-                    '#(a b c d))
-       '((4 d) (3 c) (2 b) (1 a))
-       "two vectors"))
-     
-     (test-case
-      "vector-fold-right"
-      (check-equal?
-       (vector-fold-right (lambda (index tail elt) (cons elt tail))
-                          '() '#(a b c d))
-       '(a b c d)
-       "vector->list")
-      (check-equal?
-       (vector-fold-right (lambda (index tail elt1 elt2)
-                            (cons (list elt1 elt2) tail))
-                          '()
-                          '#(1 2 3 4 5)
-                          '#(a b c d))
-       '((1 a) (2 b) (3 c) (4 d))
-       "two vectors"))
-     
-     (test-case
-      "vector-map"
-      (check-equal?
-       (vector-map (lambda (i x) (* x x))
-                   '#(1 2 3 4))
-       '#(1 4 9 16))
-      (check-equal?
-       (vector-map (lambda (i x y) (* x y))
-                   (vector-unfold (lambda (i x) (values x (+ x 1))) 5 1)
-                   (vector-unfold (lambda (i x) (values x (- x 1))) 5 5))
-       '#(5 8 9 8 5))
-      (check-equal?
-       (vector-map (lambda (i elt) (+ i elt)) '#(1 2 3 4))
-       '#(1 3 5 7)))
-     
-     (test-case
-      "vector-map!"
-      (let ((vec (vector 1 2 3 4)))
-        (check-equal?
-         (begin (vector-map! (lambda (i x) (* x x))
-                             vec)
-                vec)
-         '#(1 4 9 16)))
-      (let ((vec1 (vector-unfold (lambda (i x) (values x (+ x 1))) 5 1))
-            (vec2 (vector-unfold (lambda (i x) (values x (- x 1))) 5 5)))
-        (check-equal?
-         (begin (vector-map! (lambda (i x y) (* x y))
-                             vec1 vec2)
-                vec1)
-         '#(5 8 9 8 5)))
-      (let ((vec (vector 1 2 3 4)))
-        (check-equal?
-         (begin (vector-map! (lambda (i elt) (+ i elt))
-                             vec)
-                vec)
-         '#(1 3 5 7))))
-     
-     (test-case
-      "vector-for-each"
-      (let ((vec1 (vector 1 2 3 4))
-            (vec2 (make-vector 4)))
-        (check-equal?
-         (begin (vector-for-each (lambda (i elt)
-                                   (vector-set! vec2 i (+ i elt)))
-                                 vec1)
-                vec2)
-         '#(1 3 5 7)))
-      (let ((vec1 (vector-unfold (lambda (i x) (values x (+ x 1))) 5 1))
-            (vec2 (vector-unfold (lambda (i x) (values x (- x 1))) 5 5))
-            (vec3 (make-vector 5)))
-        (check-equal?
-         (begin (vector-for-each (lambda (i x y)
-                                   (vector-set! vec3 i (* x y)))
-                                 vec1 vec2)
-                vec3)
-         '#(5 8 9 8 5))))
-     
-     (test-case
-      "vector-count"
-      (check =
-              (vector-count (lambda (i elt) (even? elt)) '#(3 1 4 1 5 9 2 5 6))
-              3)
-      (check =
-              (vector-count (lambda (i x y) (< x y)) '#(1 3 6 9) '#(2 4 6 8 10 12))
-              2))
-     ))
-  )
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/mutator-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/mutator-tests.rkt
deleted file mode 100644
index d730f5a7b3..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/mutator-tests.rkt
+++ /dev/null
@@ -1,102 +0,0 @@
-(module mutator-tests mzscheme
-  
-  (require rackunit)
-  (require srfi/43/vector-lib)
-  
-  (provide mutator-tests)
-  
-  (define mutator-tests
-    (test-suite
-     "All tests for mutator"
-     (test-case
-      "vector-swap!"
-      (let ((vec (vector 'a 'b 'c 'd 'e)))
-        (check-equal?
-         (begin (vector-swap! vec 1 3)
-                vec)
-         '#(a d c b e)))
-      (let ((vec (vector 0 1 2)))
-        (check-equal?
-         (begin (vector-swap! vec 1 1)
-                vec)
-         '#(0 1 2))))
-     
-     (test-case
-      "vector-fill!"
-      (let ((vec (vector 1 2 3 4 5)))
-        (check-equal?
-         (begin (s:vector-fill! vec 0)
-                vec)
-         '#(0 0 0 0 0)))
-      (let ((vec (vector 1 2 3 4 5)))
-        (check-equal?
-         (begin (s:vector-fill! vec 0 1)
-                vec)
-         '#(1 0 0 0 0)))
-      (let ((vec (vector 1 2 3 4 5)))
-        (check-equal?
-         (begin (s:vector-fill! vec 0 1 4)
-                vec)
-         '#(1 0 0 0 5))))
-     
-     (test-case
-      "vector-reverse!"
-      (let ((vec (vector 1 2 3 4 5)))
-        (check-equal?
-         (begin (vector-reverse! vec)
-                vec)
-         '#(5 4 3 2 1)))
-      (let ((vec (vector 1 2 3 4 5)))
-        (check-equal?
-         (begin (vector-reverse! vec 1)
-                vec)
-         '#(1 5 4 3 2)))
-      (let ((vec (vector 1 2 3 4 5)))
-        (check-equal?
-         (begin (vector-reverse! vec 1 4)
-                vec)
-         '#(1 4 3 2 5))))
-     
-     (test-case
-      "vector-copy!"
-      (let ((source (vector 1 2 3 4 5))
-            (target (vector 0 0 0 0 0)))
-        (check-equal?
-         (begin (vector-copy! target 0 source)
-                target)
-         source))
-      (let ((source (vector 1 2 3 4 5))
-            (target (vector 0 0 0 0 0)))
-        (check-equal?
-         (begin (vector-copy! target 1 source 1)
-                target)
-         '#(0 2 3 4 5)))
-      (let ((source (vector 1 2 3 4 5))
-            (target (vector 0 0 0 0 0)))
-        (check-equal?
-         (begin (vector-copy! target 1 source 1 4)
-                target)
-         '#(0 2 3 4 0))))
-     
-     (test-case
-      "vector-reverse-copy!"
-      (let ((source (vector 1 2 3 4 5))
-            (target (vector 0 0 0 0 0)))
-        (check-equal?
-         (begin (vector-reverse-copy! target 0 source)
-                target)
-         '#(5 4 3 2 1)))
-      (let ((source (vector 1 2 3 4 5))
-            (target (vector 0 0 0 0 0)))
-        (check-equal?
-         (begin (vector-reverse-copy! target 1 source 1)
-                target)
-         '#(0 5 4 3 2)))
-      (let ((source (vector 1 2 3 4 5))
-            (target (vector 0 0 0 0 0)))
-        (check-equal?
-         (begin (vector-reverse-copy! target 1 source 1 4)
-                target)
-         '#(0 4 3 2 0))))
-     ))
-  )
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/predicate-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/predicate-tests.rkt
deleted file mode 100644
index 6f8bf7b82a..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/predicate-tests.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-(module predicate-tests mzscheme
-
-  (require rackunit)
-  (require srfi/43/vector-lib)
-
-  (provide predicate-tests)
-
-  (define predicate-tests
-    (test-suite
-     "All tests for predicate"
-     (test-case
-      "vector-empty?"
-      (check-false
-       (vector-empty? '#(a)))
-      (check-false
-       (vector-empty? '#(())))
-      (check-false
-       (vector-empty? '#(#())))
-      (check-true
-       (vector-empty? '#())))
-
-     (test-case
-      "vector="
-      (check-true
-       (vector= eq? '#(a b c d) '#(a b c d)))
-      (check-false
-       (vector= eq? '#(a b c d) '#(a b d c)))
-      (check-false
-       (vector= = '#(1 2 3 4 5) '#(1 2 3 4)))
-      (check-true
-       (vector= = '#(1 2 3 4) '#(1 2 3 4) '#(1 2 3 4)))
-      (check-true
-       (vector= eq?))
-      (check-true
-       (vector= eq? '#(a)))
-      (check-false
-       (vector= eq? '#(a b c d) '#(a b c d) '#(a b d c)))
-      (check-false
-       (vector= eq? '#(a b c d e) '#(a b c d) '#(a b c d))))
-     ))
-  )
-     
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/run-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/run-tests.rkt
deleted file mode 100644
index 4b1e170020..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/run-tests.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-(require rackunit)
-(require rackunit/text-ui)
-(require "all-srfi-43-tests.rkt")
-
-(run-tests all-srfi-43-tests)
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/searching-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/searching-tests.rkt
deleted file mode 100644
index 93719f72b7..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/43/searching-tests.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-(module searching-tests mzscheme
-  
-  (require rackunit)
-  (require srfi/43/vector-lib)
-  
-  (provide searching-tests)
-  
-  (define searching-tests
-    (test-suite
-     "All tests for searching"
-     (test-case
-      "vector-index"
-      (check =
-              (vector-index even? '#(3 1 4 1 5 9))
-              2)
-      (check =
-              (vector-index < '#(3 1 4 1 5 9 2 5 6) '#(2 7 1 8 2))
-              1)
-      (check-false
-       (vector-index = '#(3 1 4 1 5 9 2 5 6) '#(2 7 1 8 2))))
-     
-     (test-case
-      "vector-index-right"
-      (check =
-              (vector-index-right even? '#(3 1 4 1 5 9))
-              2)
-      (check =
-              (vector-index-right < '#(3 1 4 1 5 9 2 5 6) '#(2 7 1 8 2))
-              3)
-      (check-false
-       (vector-index-right = '#(3 1 4 1 5 9 2 5 6) '#(2 7 1 8 2))))
-     
-     (test-case
-      "vector-skip"
-      (check =
-              (vector-skip odd? '#(3 1 4 1 5 9))
-              2)
-      (check =
-              (vector-skip > '#(3 1 4 1 5 9 2 5 6) '#(2 7 1 8 2))
-              1)
-      (check-false
-       (vector-skip = '#(2 7 1 8 2 8) '#(2 7 1 8 2))))
-     
-     (test-case
-      "vector-skip-right"
-      (check =
-              (vector-skip-right odd? '#(3 1 4 1 5 9))
-              2)
-      (check =
-              (vector-skip-right > '#(3 1 4 1 5 9 2 5 6) '#(2 7 1 8 2))
-              3)
-      (check-false
-       (vector-skip-right = '#(2 7 1 8 2 8) '#(2 7 1 8 2))))
-     
-     (test-case
-      "vector-binary-search"
-      (check =
-              (vector-binary-search '#(0 3 4 6 8 9) 0 -)
-              0)
-      (check =
-              (vector-binary-search '#(0 3 4 6 8 9) 3 -)
-              1)
-      (check =
-              (vector-binary-search '#(0 3 4 6 8 9) 4 -)
-              2)
-      (check =
-              (vector-binary-search '#(0 3 4 6 8 9) 6 -)
-              3)
-      (check =
-              (vector-binary-search '#(0 3 4 6 8 9) 8 -)
-              4)
-      (check =
-              (vector-binary-search '#(0 3 4 6 8 9) 9 -)
-              5)
-      (check-false
-       (vector-binary-search '#(0 3 4 6 8 9) 5 -))
-      (check-false
-       (vector-binary-search '#(0 3 4 6 8 9) -2 -))
-      (check-false
-       (vector-binary-search '#(0 3 4 6 8 9) 11 -))
-      (check-false
-       (vector-binary-search '#(0 3 4 6 8 9) 1 -)))
-     
-     (test-case
-      "vector-any"
-      (check-false
-       (vector-any zero? '#(1 2 3 4)))
-      (check-true
-       (vector-any zero? '#(2 0 1)))
-      (check =
-              (vector-any / '#(1 1) '#(1 0))
-              1)
-      (check-false
-       (vector-any (lambda x #t) '#())))
-     
-     (test-case
-      "vector-every"
-      (check-false
-       (vector-every zero? '#(0 0 7)))
-      (check-true
-       (vector-every (lambda x #f) '#()))
-      (check =
-              (vector-every - '#(1 1) '#(1 0))
-              1))
-     ))
-  )
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/69/hash-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/69/hash-tests.rkt
deleted file mode 100644
index 25f9850e4b..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/69/hash-tests.rkt
+++ /dev/null
@@ -1,202 +0,0 @@
-(module hash-tests mzscheme
-
-  (require rackunit)
-
-  (require srfi/1/list
-           (prefix h: srfi/69))
-
-  (provide hash-tests)
-  
-  (define test-hash-table1
-    (h:alist->hash-table '((a . 1) (b . 2) (c . 3))))
-  (define test-hash-table2
-    (h:alist->hash-table '(("a" . 1) ("b" . 2) ("c" . 3)) string-ci=? h:string-ci-hash))
-
-  (define hash-tests
-    (test-suite
-     "srfi-69 test suite"
-     (test-case
-      "make-hash-table and hash-table?"
-      (check-true
-       (h:hash-table? (h:make-hash-table))))
-     (test-case
-      "alist->hash-table"
-      (check-true
-       (h:hash-table? test-hash-table1)))
-     (test-case
-      "hash-table-equivalence-function"
-      (check-eq?
-       (h:hash-table-equivalence-function (h:make-hash-table))
-       equal?)
-      (check-eq?
-       (h:hash-table-equivalence-function (h:make-hash-table eq?))
-       eq?)
-      (check-eq?
-       (h:hash-table-equivalence-function test-hash-table2)
-       string-ci=?))
-     (test-case
-      "hash-table-hash-function"
-      (check-eq?
-       (h:hash-table-hash-function (h:make-hash-table))
-       h:hash)
-      (check-eq?
-       (h:hash-table-hash-function (h:make-hash-table eq?))
-       h:hash-by-identity)
-      (check-eq?
-       (h:hash-table-hash-function test-hash-table2)
-       h:string-ci-hash))
-     (test-case
-      "hash-table-ref"
-      (check-equal?
-       (h:hash-table-ref test-hash-table1 'b)
-       2)
-      (check-equal?
-       (h:hash-table-ref test-hash-table2 "C")
-       3)
-      (check-false
-       (h:hash-table-ref test-hash-table1 'd (lambda () #f))))
-     (test-case
-      "hash-table-ref/default"
-      (check-false
-       (h:hash-table-ref/default test-hash-table2 "d" #f)))
-     (test-case
-      "hash-table-set!"
-      (check-equal?
-       (begin (h:hash-table-set! test-hash-table1 'c 4)
-              (h:hash-table-ref test-hash-table1 'c))
-       4)
-      (check-equal?
-       (begin (h:hash-table-set! test-hash-table2 "d" 4)
-              (h:hash-table-ref test-hash-table2 "D"))
-       4))
-     (test-case
-      "hash-table-delete!"
-      (check-false
-       (begin (h:hash-table-delete! test-hash-table2 "D")
-              (h:hash-table-ref/default test-hash-table2 "d" #f))))
-     (test-case
-      "hash-table-exists?"
-      (check-true
-       (h:hash-table-exists? test-hash-table2 "B"))
-      (check-false
-       (h:hash-table-exists? test-hash-table1 'd)))
-     (test-case
-      "hash-table-update!"
-      (check-equal?
-       (begin (h:hash-table-update! test-hash-table1 'c sub1)
-              (h:hash-table-ref test-hash-table1 'c))
-       3)
-      (check-equal?
-       (begin (h:hash-table-update! test-hash-table2 "d" add1 (lambda () 3))
-              (h:hash-table-ref test-hash-table2 "d"))
-       4))
-     (test-case
-      "hash-table-update!/default"
-      (check-equal?
-       (begin (h:hash-table-update!/default test-hash-table1 'd add1 3)
-              (h:hash-table-ref test-hash-table1 'd))
-       4))
-     (test-case
-      "hash-table-size"
-      (check-equal?
-       (h:hash-table-size test-hash-table1)
-       4)
-      (check-equal?
-       (h:hash-table-size test-hash-table2)
-       4))
-     (test-case
-      "hash-table-keys"
-      (check-true
-       (lset= eq?
-              (h:hash-table-keys test-hash-table1)
-              '(a b c d)))
-      (check-true
-       (lset= equal?
-              (h:hash-table-keys test-hash-table2)
-              (list "a" "b" "c" "d"))))
-     (test-case
-      "hash-table-values"
-      (check-true
-       (lset= eqv?
-              (h:hash-table-values test-hash-table1)
-              '(1 2 3 4)))
-      (check-true
-       (lset= eqv?
-              (h:hash-table-values test-hash-table2)
-              '(1 2 3 4))))
-     (test-case
-      "hash-table-walk"
-      (check-true
-       (let ((a '()))
-         (h:hash-table-walk test-hash-table1
-                            (lambda (key value)
-                              (set! a (cons (cons key value) a))))
-         (lset= equal?
-                a
-                '((a . 1) (b . 2) (c . 3) (d . 4))))))
-     (test-case
-      "hash-table-fold"
-      (check-true
-       (lset= equal?
-              (h:hash-table-fold test-hash-table2
-                                 (lambda (key value accu)
-                                   (cons (cons key value) accu))
-                                 '())
-              (list (cons "a" 1)
-                    (cons "b" 2)
-                    (cons "c" 3)
-                    (cons "d" 4)))))
-     (test-case
-      "hash-table->alist"
-      (check-true
-       (lset= equal?
-              (h:hash-table->alist test-hash-table1)
-              '((a . 1) (b . 2) (c . 3) (d . 4)))))
-     (test-case
-      "hash-table-copy"
-      (check-true
-       (lset= equal?
-              (h:hash-table->alist (h:hash-table-copy test-hash-table2))
-              (list (cons "a" 1)
-                    (cons "b" 2)
-                    (cons "c" 3)
-                    (cons "d" 4))))
-      (check-false
-       (eq? (h:hash-table-copy test-hash-table1)
-            test-hash-table1))
-      (check-eq?
-       (h:hash-table-equivalence-function
-        test-hash-table1)
-       (h:hash-table-equivalence-function
-        (h:hash-table-copy test-hash-table1)))
-      (check-eq?
-       (h:hash-table-hash-function
-        test-hash-table2)
-       (h:hash-table-hash-function
-        (h:hash-table-copy test-hash-table2))))
-     (test-case
-      "hash-table->alist"
-      (check-true
-       (lset= equal?
-              (h:hash-table->alist
-               (h:hash-table-merge!  test-hash-table1
-                                     test-hash-table2))
-              '(("a" . 1)
-                ("b" . 2)
-                ("c" . 3)
-                ("d" . 4)
-                (a . 1)
-                (b . 2)
-                (c . 3)
-                (d . 4))))
-      (check-true
-       (lset= equal?
-              (h:hash-table->alist
-               (h:hash-table-merge!  test-hash-table2
-                                   test-hash-table2))
-              '(("a" . 1)
-                ("b" . 2)
-                ("c" . 3)
-                ("d" . 4)))))))
-
-  )
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/all-srfi-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/all-srfi-tests.rkt
deleted file mode 100644
index 8c171119d6..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/all-srfi-tests.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-(require rackunit)
-(require "1/all-1-tests.rkt"
-         "2/and-let-test.rkt"
-         "4/srfi-4-test.rkt"
-         "11/srfi-11-test.rkt"
-         "13/string-test.rkt"
-         "14/char-set-test.rkt"
-         "26/cut-test.rkt"
-         "40/all-srfi-40-tests.rkt"
-         "43/all-srfi-43-tests.rkt"
-         "69/hash-tests.rkt")
-(provide all-srfi-tests)
-
-(define all-srfi-tests
-  (test-suite
-   "all-srfi-tests"
-   all-1-tests
-   and-let*-tests
-   string-tests
-   char-set-tests
-   cut-tests
-   all-srfi-40-tests
-   all-srfi-43-tests
-   hash-tests
-   srfi-4-tests
-   srfi-11-tests
-   ))
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/load-srfis.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/load-srfis.rkt
deleted file mode 100644
index 7c51511746..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/load-srfis.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang racket/load
-
-;;; This file simply tests that all the SRFIs load.  Just
-;;; load it into Racket to perform this test.  Remember it
-;;; might not be up-to-date, so check before you run it!
-
-(require srfi/1)
-(require srfi/2)
-(require srfi/4)
-(require srfi/5)
-(require srfi/7)
-(require srfi/8)
-(require srfi/9)
-(require srfi/11)
-(require srfi/13)
-(require srfi/14)
-(require srfi/17)
-(require srfi/19)
-(require srfi/25)
-(require srfi/26)
-(require srfi/27)
-(require srfi/29)
-(require srfi/31)
-(require srfi/32)
-(require srfi/34)
-(require srfi/35)
-(require srfi/35)
-(require srfi/40)
-(require srfi/41)
-(require srfi/42)
-(require srfi/42ref)
-(require srfi/43)
-(require srfi/45)
-(require srfi/48)
-(require srfi/54)
-(require srfi/57)
-(require srfi/59)
-(require srfi/60)
-(require srfi/61)
-(require srfi/63)
-(require srfi/64)
-(require srfi/67)
-(require srfi/69)
-(require srfi/71)
-(require srfi/74)
-(require srfi/78)
-(require srfi/86)
-(require srfi/87)
-(require srfi/98)
-
-(require srfi/1/list)
-(require srfi/2/and-let)
-(require srfi/5/let)
-(require srfi/7/program)
-(require srfi/8/receive)
-(require srfi/9/record)
-(require srfi/13/string)
-(require srfi/14/char-set)
-(require srfi/17/set)
-(require srfi/19/time)
-(require srfi/25/array)
-(require srfi/26/cut)
-(require srfi/27/random-bits)
-(require srfi/29/localization)
-(require srfi/31/rec)
-(require srfi/32/sort)
-(require srfi/34/exception)
-(require srfi/35/condition)
-(require srfi/40/stream)
-(require srfi/42/ec)
-(require srfi/42ref/comprehensions)
-(require srfi/43/vector-lib)
-(require srfi/45/lazy)
-(require srfi/48/format)
-(require srfi/57/records)
-(require srfi/59/vicinity)
-(require srfi/60/60)
-(require srfi/61/cond)
-(require srfi/63/63)
-(require srfi/64/testing)
-(require srfi/67/compare)
-(require srfi/69/hash)
-(require srfi/71/letvalues)
-(require srfi/74/74)
-(require srfi/78/check)
-(require srfi/86/86)
-(require srfi/87/case)
-
-(displayln "all loaded")
diff --git a/pkgs/srfi-pkgs/srfi-test/tests/srfi/run-tests.rkt b/pkgs/srfi-pkgs/srfi-test/tests/srfi/run-tests.rkt
deleted file mode 100644
index e837af627b..0000000000
--- a/pkgs/srfi-pkgs/srfi-test/tests/srfi/run-tests.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang scheme/base
-
-(require rackunit)
-(require rackunit/text-ui)
-(require "all-srfi-tests.rkt")
-
-(run-tests all-srfi-tests)
diff --git a/pkgs/srfi-pkgs/srfi/LICENSE.txt b/pkgs/srfi-pkgs/srfi/LICENSE.txt
deleted file mode 100644
index 9fe20e5e08..0000000000
--- a/pkgs/srfi-pkgs/srfi/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-srfi
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/srfi-pkgs/srfi/info.rkt b/pkgs/srfi-pkgs/srfi/info.rkt
deleted file mode 100644
index 7c18e4b553..0000000000
--- a/pkgs/srfi-pkgs/srfi/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("srfi-lib"
-               "srfi-doc"))
-(define implies '("srfi-lib"
-                  "srfi-doc"))
-
-(define pkg-desc "Legacy SRFI (Scheme) libraries")
-
-(define pkg-authors '(mflatt noel chongkai jay))
diff --git a/pkgs/string-constants-pkgs/string-constants-doc/LICENSE.txt b/pkgs/string-constants-pkgs/string-constants-doc/LICENSE.txt
deleted file mode 100644
index de93c61880..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-gui
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/string-constants-pkgs/string-constants-doc/info.rkt b/pkgs/string-constants-pkgs/string-constants-doc/info.rkt
deleted file mode 100644
index cd12803241..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-doc/info.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("string-constants-lib" "base"))
-(define build-deps '("racket-doc" "scribble-lib"))
-(define pkg-desc "String constants documentation")
-(define update-implies '("string-constants-lib"))
-
-(define pkg-authors '(robby))
diff --git a/pkgs/string-constants-pkgs/string-constants-doc/string-constants/info.rkt b/pkgs/string-constants-pkgs/string-constants-doc/string-constants/info.rkt
deleted file mode 100644
index 27186c1a7c..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-doc/string-constants/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("string-constants.scrbl" () (gui-library))))
diff --git a/pkgs/string-constants-pkgs/string-constants-doc/string-constants/string-constants.scrbl b/pkgs/string-constants-pkgs/string-constants-doc/string-constants/string-constants.scrbl
deleted file mode 100644
index 65124d0b23..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-doc/string-constants/string-constants.scrbl
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          (for-label string-constants
-                     racket))
-
-@title{String Constants: GUI Internationalization}
-
-This library provides the facility for multiple languages in
-DrRacket's GUI. 
-
-@; ----------------------------------------------------------------------
-
-@section{Using String Constants}
-@defmodule*/no-declare[(string-constants)]
-@declare-exporting[string-constants/string-constant string-constants]
-
-@defform[(string-constant name)]{
- 
-This form returns the string constant named @racket[name].}
-   
-@defform[(string-constants name)]{
-
-This form returns a list of string constants, one for each language
-that DrRacket's GUI supports.}
-
-@defproc[(dynamic-string-constant [name string-constant?]) string?]{
-  This, like @racket[string-constant], returns the string constant
-  named @racket[name], but without any compile-time checking on the
-  argument.
-}
-
-@defproc[(dynamic-string-constants [name string-constant?]) (listof string?)]{
-  This, like @racket[string-constants], returns the string constants
-  matching @racket[name], but without any compile-time checking on the
-  argument.
-}
-
-@defproc[(string-constant? [v any/c]) boolean?]{
-  Returns @racket[#t] if @racket[v] is a symbol naming a known string constant.
-}
-
-@defform[(this-language)]{
-
-This form returns the name of the current language as a symbol.}
-  
-@defform[(all-languages)]{ 
-
-This form returns a list of symbols (in the same order as those
-returned from @racket[string-constants]) naming each language.}
-
-@defproc[(set-language-pref [lang string?]) void?]{
-
-Sets the language for the next run of DrRacket to @racket[lang], which
-must be a symbol returned from @racket[all-languages].  Does not affect the
-running DrRacket.}
-
-@; ----------------------------------------------------------------------
-
-@section{Adding String Constants}
-
-To add string constants to DrRacket, see the file
-@filepath{private/english-string-constants.rkt}
-and the other string constants files in the @filepath{private}
-directory.
-  
-Each file has the same format. They are each modules in the
-@racket[string-constants/private/string-constant-lang] language. The
-body of each module is a finite mapping table that gives the mapping
-from the symbolic name of a string constant to its translation in the
-appropriate language. Multiple string constants that appear together are
-implicitly concatenated.
-
-The @filepath{english-string-constants} is considered the master file;
-string constants will be set there and translated into each of the
-other language files.  In addition, the
-@filepath{english-string-constants.rkt} file should contain hints about
-the context of the strings whose symbol name might not be clear.
-
-@; ----------------------------------------------------------------------
-
-@section{Language Environment Variables}
-
-@itemize[
-  @item{@indexed-envvar{PLTSTRINGCONSTANTS}}
-  @item{@indexed-envvar{STRINGCONSTANTS}}]
-
-If either of these environment variables are set, DrRacket
-shows you, during startup, which string constants are not
-yet defined for each language. 
-
-You can also specify which languages you are interested
-in. If either environment variable is bound to a symbol (as
-interpreted by @racket[read]) you see only the corresponding
-language's messages. If either one is bound to a list of
-symbols (again, as interpreted by @racket[read]) you see the
-messages for all the languages in the list. If either is
-bound to anything else, you see all of the languages.
-
-The @envvar{PLTSTRINGCONSTANTS} environment variable takes precedence
-of the @envvar{STRINGCONSTANTS} environment variable.
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/LICENSE.txt b/pkgs/string-constants-pkgs/string-constants-lib/LICENSE.txt
deleted file mode 100644
index 5f622e66da..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-string-constants-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/info.rkt b/pkgs/string-constants-pkgs/string-constants-lib/info.rkt
deleted file mode 100644
index b2afc48670..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "String constants to support internationalization, especially in DrRacket")
-
-(define pkg-authors '(robby))
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/info.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/info.rkt
deleted file mode 100644
index 8525dbf5e1..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define compile-omit-files '("tests"))
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/main.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/main.rkt
deleted file mode 100644
index 5f4e3f7bde..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/main.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "string-constant.rkt")
-(provide (all-from-out "string-constant.rkt"))
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/danish-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/danish-string-constants.rkt
deleted file mode 100644
index dd6c775c78..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/danish-string-constants.rkt
+++ /dev/null
@@ -1,1248 +0,0 @@
-#|
-
-When modifying the string constants files,
-please adhere to these guidelines:
-
-- All the entries in english-string-constants.rkt have the same format
-  (name string).  If the purpose of an entry you are adding to the
-  file is not clear from just the name and string, put a comment next
-  to the entry explaining what the string is going to be used for and
-  in what context.
-  That's especially true for strings that contain things like "~a".
-  Systematically describe what the "~a" is going to be replaced with.
-  When we have to translate strings like "deleting ~a", we translators
-  need to know what "~a" is going to be (in particular, in some
-  languages like French, we need to know whether the "~a" is going to
-  be a masculine or feminine word, or whether it's going to be
-  singular or plural, etc).
-
-- When adding a bunch of new entries, put together in a section the
-  entries that logically belong together.  Give a title to your
-  section, so we have an idea of what the strings are for.  Don't mix
-  in the same section strings that have nothing to do with each other,
-  that's only going to confuse us.  Do not start a new section if
-  there's already one that deals with the same thing.  Dumping all the
-  new entries in random order at the end of the file is not a good way
-  to have your new entries translated in a timely manner...
-
-- Before adding strings for your new pet tool, check whether you can't
-  re-use strings that already exist.  There's no need for yet another
-  "Ok" string...
-
-- If you modify an existing string in english-string-constants.rkt, go
-  through all the *-string-constants.rkt files for the other languages,
-  comment out the old version of the modified string in each of these
-  files, and put a short comment there telling us the English string
-  has changed and needs to be re-translated.  Do not erase the old
-  version, it might help us translate the new one.  Do not move it
-  either.  Just comment it out and add the short comment.  After the
-  next git update DrRacket will automatically tell us translators that
-  a new string needs to be translated, we will find your comment in
-  the file, and know what to do.
-	Some evil evil people might think that, since DrRacket automatically
-  informs us of new strings to be translated, an easier thing to do
-  when modifying an existing string would be to simply rename it at
-  the same time.  This works, except that if you do that, we
-  translators will get two warnings from DrRacket:
-		language english had but french does not:
-		(new-name "New String")
-		language french had but english does not:
-		(old-name "Old String")
-  then we translators will be left to wonder whether the two things
-  are related or not, and whether we can safely base our translation
-  of "New String" on the translation of "Old String" (since the two
-  strings are likely to be close in meaning).  Worse, we might not
-  even realize the two strings are related and translate "New String"
-  from scratch, just to realize later that it's only a variation of
-  "Old String".  I can tell you that nothing pisses off a translator
-  more than having to translate pretty much the same string twice
-  just because *you* were too lazy to inform us that it was just a
-  slight modification to an existing string rather than an entirely
-  new one.  Conclusion: do not change the name of a string unless you
-  have some really good reason to do so.
-
-- Please think hard before choosing a string and make sure it means
-  what you want it to mean.  That way you won't have to change it
-  later, and we won't have to retranslate it.
-
-- Please think hard before choosing the name for a string.  Use
-  meaningful names.  "error" or "ok" are not meaningful names.  Prefix
-  all related names with a common prefix (the name of your tool or
-  module).  String names are not the right place to save on typing.
-
-- If, for some reason, you really have to change the name of a string
-  (like, because the original name you gave it really sucked...),
-  change the name of the string in *ALL* the *-string-constants.rkt
-  files.  That's a modification you can do without the help of a
-  translator, so do it yourself.  It's not the job of the translators
-  to clean up your naming mess for you.  Besides, you are the one who
-  knows what you changed, so leaving the translators having to guess
-  what you did is Not Nice(tm).
-
-- If, for some reason, you need to remove a string (i.e. you changed
-  your code and don't need the string anymore), remove the string in
-  *ALL* the *-string-constants.rkt files.  Again, you don't need the
-  help of a translator to do that.  If you're not sure whether you
-  might need the string in the future or not, just comment it out in
-  *ALL* the files.
-
-|#
-
-(module danish-string-constants "string-constant-lang.rkt"
-  ;;; when translating this constant, substitute name of actual language for `English'
-  (is-this-your-native-language "Foretrækker du dansk?")
-  
-  (are-you-sure-you-want-to-switch-languages
-      "Dette ændrer sproget i den grafiske brugerflade. Er du sikker?")
-  
-  (interact-with-drscheme-in-language "Arbejd med DrRacket på Dansk")
-  
-  ;; these two should probably be the same in all languages except English.
-  ;; they are the button labels (under macos and windows, respectively)
-  ;; that go the with the string above.
-  (accept-and-quit "Accepter og afslut")
-  (accept-and-exit "Accepter og afslut")
-  
-  ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
-  (plt "PLT")
-  (drscheme "DrRacket")
-  (drracket "DrRacket")
-  (ok "Ok")
-  (cancel "Fortryd")
-  (abort "Afbryd")
-  (untitled "Uden navn")
-  (untitled-n "Uden navn ~a")
-  (warning "Advarsel")
-  (error "Fejl")
-  (close "Luk") ;; as in, close an open window
-  (stop "Stop")
-  (&stop "&Stop") ;; for use in button and menu item labels, with short cut.
-  (are-you-sure-delete? "Er du sikker på, du vil slette ~a?") ;; ~a is a filename or directory name
-  (ignore "Ignorer")
-  (revert "Gendan")
-  
-  ;; label for a generic check box, often supported on dialogs
-  ;; that ask a binary choice of the user. If checked, the
-  ;; dialog isn't going to be shown again.
-  ;; One version for always using the current choice:
-  (dont-ask-again-always-current "Spørg ikke igen (brugt altid nuværende valg)")
-  ;; One generic version (ie, on the Quit DrRacket dialog)
-  (dont-ask-again                "Spørg ikke igen")
-  
-  ;;; important urls
-  (web-materials "Relaterede websites") ;; menu item title
-  (tool-web-sites "Tool Web Sites")   ;; menu item title
-  (plt-homepage "Racket")
-  (pbd-homepage "Program by Design")
-  
-  ;;; bug report form
-  (cancel-bug-report? "Fortryd afsendelse af fejlrapport?")
-  (are-you-sure-cancel-bug-report?
-   "Er du sikker, du ikke vil afsende denne fejlrapport?")
-  (bug-report-form "Fejlrapportering")
-  (bug-report-field-name "Navn")
-  (bug-report-field-email "E-mail")
-  (bug-report-field-summary "Resumé")
-  (bug-report-field-severity "Alvorlighedsgrad")
-  (bug-report-field-class "Klasse")
-  (bug-report-field-description "Beskrivelse")
-  (bug-report-field-reproduce1 "Skridt for at")
-  (bug-report-field-reproduce2 "reproducere fejlen")
-  (bug-report-field-environment "Omgivelse")
-  (bug-report-field-docs-installed "Installeret dokumentation")
-  (bug-report-field-collections "Samlinger (Collections)")
-  (bug-report-field-human-language "Modersmål")
-  (bug-report-field-memory-use "Hukommelsesforbrug")
-  (bug-report-field-version "Version")
-  (bug-report-synthesized-information "Indsamlet information")  ;; dialog title
-  (bug-report-show-synthesized-info "Vis indsamlet information")
-  (bug-report-submit "Send")
-  (bug-report-submit-menu-item "Send fejlrapport...") ;; in Help Menu (drs & help desk)
-  (error-sending-bug-report "Fejl under afsendelse af fejlrapport")
-  (error-sending-bug-report-expln "Der opstod en fejl ved afsendelse af fejlrapporten. Hvis din internetforbindelse ellers er velfungerende, besøg venligst:\n\n    http://bugs.racket-lang.org/\n\nog send fejlrapporten ved hjælp af vores online fejlrapporteringsside. Vi er kede af besværet.\n\nFejlmeddelelsen er:\n~a")
-  (illegal-bug-report "Ugyldig fejlrapport")
-  (pls-fill-in-field "Udfyld venligst feltet \"~a\" ")
-  (malformed-email-address "Ugyldig e-mail-adresse")
-  (pls-fill-in-either-description-or-reproduce "Udfyld venligst enten beskrivelsesfeltet eller feltet til reproduktion af fejlen.")
-  
-  ;;; check syntax
-  (check-syntax "Syntakstjek")
-  (cs-italic "Kursiv")
-  (cs-bold "Fed")
-  (cs-underline "Understreget")
-  (cs-change-color "Skift farve")
-  (cs-tack/untack-arrow "Pile til/fra")
-  (cs-jump-to-next-bound-occurrence "Hop til næste bundne forekomst")
-  (cs-jump-to-binding "Hop til den bindende forekomst")
-  (cs-jump-to-definition "Hop til definition")
-  (cs-error-message "Fejlmeddelelse")
-  (cs-open-file "Åbn ~a")
-  (cs-rename-var "Omdøb ~a")
-  (cs-rename-id "Omdøb navn")
-  (cs-rename-var-to "Omdøb ~a til:")
-  (cs-name-duplication-error "Det nye navn, du har valgt, ~s, er i konflikt med et allerede eksisterende navn i dette virkefelt.")
-  (cs-rename-anyway "Rename ~a to:")
-  (cs-status-init "Syntakstjek: Initialiserer omgivelser for brugerkode")
-  (cs-status-coloring-program "Syntakstjek: farver udtryk")
-  (cs-status-eval-compile-time "Syntakstjek: evaluering på oversættelsestid")
-  (cs-status-expanding-expression "Syntakstjek: Udvider (expanding) udtryk")
-  (cs-mouse-over-import "bindingen ~a er importeret fra ~s")
-  ;(cs-mouse-over-variable-import "variabel ~s importeret fra ~s")
-  ;(cs-mouse-over-syntax-import "syntaks ~s importeret fra ~s")
-  
-  (cs-lexical-variable "leksikalsk variabel")
-  (cs-imported-variable "importeret variabel")
-  
-  ;;; info bar at botttom of drscheme frame
-  (collect-button-label "GC")
-  (read-only "Skrivebeskyttet")
-  (auto-extend-selection "Auto-udvid")
-  (overwrite "Overskriv")
-  (running "kører")
-  (not-running "kører ikke")
-  
-  ;;; misc
-  (welcome-to-something "Velkommen til ~a")
-  
-  ; this appears in the drscheme about box.
-  (welcome-to-drscheme-version/language "Velkommen til DrRacket, version ~a, ~a")
-  
-  ; these appear on subsequent lines in the `Help|Welcome to DrRacket' dialog.
-  (welcome-to-drscheme "Velkommen til DrRacket")
-  
-  (goto-line "Gå til linje")
-  (goto-line-invalid-number
-   "~a er ikke et gyldigt linjenummer. Det skal være et heltal mellem 1 og ~a")
-  (goto-position "Gå til position")
-  (no-full-name-since-not-saved
-   "Filen har ikke et fuldt navn, for den er endnu ikke gemt.")
-  (cannot-open-because-dne "Kan ikke åbne ~a, for den findes ikke")
-  
-  (needs-execute-language-changed
-   "ADVARSEL: Sproget er skiftet. Klik Kør.")
-  (needs-execute-teachpack-changed
-   "ADVARSEL: Undervisningspakkerne er ændrede. Klik Kør.")
-  (needs-execute-defns-edited
-   "ADVARSEL: Definitionsvinduet er ændret. Klik Kør.")
-  
-  (file-is-not-saved "Filen \"~a\" er endnu ikke gemt.")
-  (save "Gem")
-  (close-anyway "Luk alligevel")
-  (clear-anyway "Rens Anyway")
-  
-  ;; menu item title
-  (log-definitions-and-interactions "Log definitioner og interaktioner...")
-  (stop-logging "Stop logføring")
-  (please-choose-a-log-directory "Vælg en mappe til loggen")
-  (logging-to "Log til: ")
-  (erase-log-directory-contents "Slet indholdet af log-mappen: ~a?")
-  (error-erasing-log-directory "Fejl under sletning ad log-mappens indhold.\n\n~a\n")
-  
-  ;; modes
-  (mode-submenu-label "Tilstande")
-  (scheme-mode "Scheme-tilstand")
-  (racket-mode "Racket-tilstand")
-  (text-mode "Tekst-tilstand")
-  
-  (scheme-mode-color-symbol "Symbol")
-  (scheme-mode-color-keyword "Nøgleord")
-  (scheme-mode-color-comment "Kommentar")
-  (scheme-mode-color-string "Strenf")
-  (scheme-mode-color-constant "Konstant")
-  (scheme-mode-color-parenthesis "Parentes")
-  (scheme-mode-color-error "Fejl")
-  (scheme-mode-color-other "Andet")
-  ;; the ~a is filled in with one of the above (scheme-mode-*)
-  (syntax-coloring-choose-color "Vælg en farve for ~a")
-  (preferences-colors "Farver") ;; used in the preferences dialog
-  
-  (url: "URL:")
-  (open-url... "Åbn URL...")
-  (open-url "Åbn URL")
-  (browse... "Gennemse...")
-  (bad-url "Ugyldig URL")
-  (bad-url:this "Ugyldig URL: ~a")
-  
-  ;; Help Desk
-  (help "Hjælp")
-  (help-desk "Hjælpebord")
-  (plt:hd:search "Søg")
-  (plt:hd:feeling-lucky "Jeg føler mig heldig")
-  (plt:hd:home "Hjælpebordets start") 
-  ; next 3 are popup menu choices in help desk search frame
-  (plt:hd:search-for-keyword "Nøgleord")
-  (plt:hd:search-for-keyword-or-index "Nøgleord eller indekseret opslag")
-  (plt:hd:search-for-keyword-or-index-or-text "Nøgleord, indekseret opslag eller tekst")
-  (plt:hd:exact-match "præcis match")
-  (plt:hd:containing-match "indeholdende match")
-  (plt:hd:regexp-match "regulært udtryk")
-  (plt:hd:find-docs-for "Find dokumentation om:")
-  (plt:hd:search-stopped-too-many-matches "[Søgning afbrudt: for mange resultater")
-  (plt:hd:nothing-found-for "Intet fundet om ~a")
-  (plt:hd:and "og")
-  (plt:hd:refresh "opdater")
-  (plt:hd:refresh-all-manuals "opdater alle manualer")
-  (plt:hd:manual-installed-date "(~a installeret)")
-  ; Help Desk configuration
-  ;; refreshing manuals
-  (plt:hd:refresh-clearing-indices "Renser forgemte indekser")
-  ;; should not mention `SVN' (plt:hd:refresh-done "Færdig med at opdatere SVN-manualer")
-  (plt:hd:refreshing-manuals "Genhenter manualer")
-  (plt:hd:refresh-downloading... "Henter ~a...")
-  (plt:hd:refresh-deleting... "Sletter gammel version af ~a...")
-  (plt:hd:refresh-installing... "Installerer ny version af ~a...")
-  (plt:hd:refreshing-manuals-finished "Færdig.")
-  (plt:hd:about-help-desk "Om hjælpebord")
-  (plt:hd:help-desk-about-string
-   "Hjælpebordet er en fuldstændig kilde af information om PLT-software, inklusive DrRacket, MzScheme og MrEd.\n\nVersion ~a\nCopyright (c) ~a-~a PLT")
-  (plt:hd:help-on-help "Hjælp om hjælp")
-  (plt:hd:help-on-help-details "For hjælp om Hjælpebord, følg linket `How to use Help Desk'-linket på hjælpebordets startside.")
-  (reload "Opdater") ;; refresh the page in a web browser
-  (plt:hd:ask-about-separate-browser
-   "Du har valgt et link til indhold på internettet. Vil du se det i Hjælpebordsbrowseren eller i et separat browserprogram?")
-  (plt:hd:homebrew-browser "Hjælpebordsbrowser") ;; choice for the above string (in a button)
-  (plt:hd:separate-browser "Separat browser") ;; other choice for the above string (also in a button)
-  (plt:hd:external-link-in-help "Eksterne URL'er i hjælp")
-  (plt:hd:use-homebrew-browser "Brug hjælpebordsbrowseren til eksterne URL'er")
-  (plt:hd:new-help-desk "Nyt hjælpebord")
-  
-  ;; in the Help Desk language dialog, title on the right.
-  (plt:hd:manual-search-ordering "Søgeorden")
-  
-  ;; in the help-desk standalone font preference dialog, on a check box
-  (use-drscheme-font-size "Brug DrRacket's fontstørrelse")
-  
-  ;; in the preferences dialog in drscheme there is example text for help desk font size.
-  ;; clicking the links in that text produces a dialog with this message
-  (help-desk-this-is-just-example-text
-   "Dette er bare en eksempeltekst til indstilling af fontstørrelsen. Åben det rigtige hjælpebord (fra Hjælp-menuen) for at følge disse links.")
-  
-  ; help desk htty proxy
-  (http-proxy "HTTP-proxy")
-  (proxy-direct-connection "Direkte forbindelse")
-  (proxy-use-proxy "Benyt proxyen:")
-  (proxy-host "Host")
-  (proxy-port "Port")
-  (proxy-bad-host "Ugyldig proxyvært")
-  
-  ;; browser
-  (rewind-in-browser-history "Tilbage")
-  (forward-in-browser-history "Fremad")
-  (home "Hjem")
-  (browser "Browser")
-  (external-browser-choice-title "Ekstern browser") ; title for radio-button set
-  (browser-command-line-label "Kommandolinje:") ; label for radio button that is followed by text boxes
-  (choose-browser "Vælg en browser")
-  (no-browser "Spørg senere") ; English changed from "None" to "Ask Later"
-  (browser-cmdline-expl-line-1 "(Kommandolinjen konstrueret ved at sætte den forudgående tekst, URL'en,") ; explanatory text for dialog, line 1
-  (browser-cmdline-expl-line-2 "og den efterfølgende tekst sammen uden brug af mellemrum mellem dem.)") ; ... line 2. (Anyone need more lines?)
-  (install? "Installér?")  ;; if a .plt file is found (title of dialog)
-  (you-have-selected-an-installable-package "Du har valgt en pakke, som kan installeres.")
-  (do-you-want-to-install-it? "Vil du installere den?")
-  (paren-file-size "(Filen fylder ~a bytes)")
-  (download-and-install "Download og installér") ;; button label
-  (download "Download") ;; button label
-  (save-downloaded-file/size "Gem den downloadede fil (~a bytes) som ") ;; label for get-file dialog
-  (save-downloaded-file "Gem den downloadede file som")  ;; label for get-file dialog
-  (downloading "Downloader") ;; dialog title
-  (downloading-file... "Downloader fil...")
-  (package-was-installed "Pakken blev installeret.")
-  (download-was-saved "Den downloadede fil blev gemt.")
-  
-  (install-plt-file-menu-item... "Installer .plt-fil...")
-  (install-plt-file-dialog-title "Installer .plt-fil")
-  (install-plt-web-tab "Web")
-  (install-plt-file-tab "Fil")
-  (install-plt-filename "Filnavn:")
-  (install-plt-url "URL:")
-  
-  ;; install plt file when opened in drscheme strings
-  (install-plt-file "Installer ~a eller åbn for at redigere?")
-  (install-plt-file/yes "Installer")
-  (install-plt-file/no "Rediger")
-  
-  (plt-installer-progress-window-title "Installeringsfremgang")
-  (plt-installer-abort-installation "Afbryd installation") ;; button label
-  (plt-installer-aborted "Afbrudt.") ;; msg that appears in the installation window when installation is aborted
-  
-  
-  ;;; about box
-  (about-drscheme-frame-title "Om DrRacket")
-  
-  ;;; save file in particular format prompting.
-  (save-as-plain-text "Gem denne fil som tekt?")
-  (save-in-drs-format "Gem denne fil i det DrRacket-specifikke ikke-tekst format?")
-  (yes "Ja")
-  (no "Nej")
-  
-  ;;; preferences
-  (preferences "Indstillinger")
-  (error-saving-preferences "Fejl under lagring af indstillinger: ~a")
-  (error-reading-preferences "Fejl ved indlæsning af indstillinger")
-  (scheme-prefs-panel-label "Racket")
-  (warnings-prefs-panel-label "Advarsler")
-  (editor-prefs-panel-label "Redigering")
-  (general-prefs-panel-label "Generelt")
-  (highlight-parens "Farv mellem samhørende parenteser")
-  (fixup-open-brackets "Korriger automatisk [ -parentereser")
-  (fixup-close-parens  "Korriger automatisk afsluttende parenteser")
-  (flash-paren-match "Blink ved samhørende parenteser")
-  (auto-save-files "Auto-save filer")
-  (backup-files "Backup filer")
-  (map-delete-to-backspace "Bind delete til backspace")
-  (verify-exit "Spørg ved nedlukning")
-  (ask-before-changing-format "Spørg før ændring af lagringsformat")
-  (wrap-words-in-editor-buffers "Ombryd ord i redigeringsbufferne")
-  (show-status-line "Vis statuslinjen")
-  (count-columns-from-one "Tæl søjlenumger fra en.")
-  (display-line-numbers "Vis linjenumre i bufferen; ikke tegn-offsets")
-  (show-line-and-column-numbers "Vis linje og søjlenumre") ; used for popup menu; right click on line/column box in bottom of drs window
-  (show-character-offsets "Vis tegnnummerering") ; used for popup menu; right click on line/column box in bottom of drs window
-  (enable-keybindings-in-menus "Slå tastaturgenveje i menuer til")
-  (option-as-meta "Brugtion option-tasten som meta") ;; macos/macos x only  
-  (reuse-existing-frames "Genbrug gamle vinduer, når nye filer åbnes")
-  (default-fonts "Standardskrifttyper")
-  (paren-match-color "Parentesfremhævningsfarve") ; in prefs dialog
-  (online-coloring-active "Interaktiv syntaksfarvelægning")
-  (open-files-in-tabs "Åbn filer i separate faneblade (ikke separate vinduer)")
-  (show-interactions-on-execute "Vis automatisk interaktionsvinduet ved kørsel")
-  (limit-interactions-size "Afgræns interaktionernes størrelse")
-  (background-color "Baggrundsfarve")
-  (default-text-color "Default-tekst") ;; used for configuring colors, but doesn't need the word "color"
-  (choose-a-background-color "Vælg en baggrundsfarve")
-  
-  
-  ; title of the color choosing dialog
-  
-  ; should have entire alphabet
-  (font-example-string "Høj bly gom vandt fræk sexquiz på wc.")
-  
-  (change-font-button-label "Skift")
-  (fonts "Fonte")
-  
-  ; filled with type of font, eg modern, swiss, etc.
-  (choose-a-new-font "Vælg en ny \"~a\" font")
-  
-  (font-size-slider-label "Størrelse")
-  (restart-to-see-font-changes "Genstart for at se fontændringer")
-  
-  (font-prefs-panel-title "Font")
-  (font-name "Fontnavn")
-  (font-size "Fontstørrelse")
-  (set-font "Anvend font...")
-  (font-smoothing-label  "Skriftypeudglatning")
-  (font-smoothing-none "Ingen")
-  (font-smoothing-some "Nogen")
-  (font-smoothing-all "Fuld")
-  (font-smoothing-default "Brug systemindstillinger")
-  (select-font-name "Vælg skrifttypenavn")
-  (example-text "Eksempeltekst:")
-  (only-warn-once "Advar kun én gang, når kørsler og interaktioner er ude af trit")
-  
-  ; warning message when lockfile is around
-  (waiting-for-pref-lock "Venter på indstillingernes låsefil...")
-  (pref-lock-not-gone
-   "Indstillingernes låsefil:\n\n   ~a\n\nforhindrer indstillingerne i at blive gemt. Sørg for, at du ikke kører Racket-programmer og slet denne fil.")
-  (still-locked-exit-anyway? "Indstillingerne blev ikke gemt rigtigt. Afslut alligevel?")
-  
-  ;;; indenting preferences panel
-  (indenting-prefs-panel-label "Indrykning")
-  (indenting-prefs-extra-regexp "Ekstra regexp")
-  
-  (square-bracket-prefs-panel-label "Firkantet parentes")
-  
-  ; filled with define, lambda, or begin
-  (enter-new-keyword "Indtast et nyt ~a-lignende nøgleord:")
-  (x-keyword "~a nøgleord")
-  (x-like-keywords "~a-lignende nøgleord")
-  
-  ; used in Square bracket panel
-  (skip-subexpressions "Antal under-udtryk, der skal skippes")
-  
-  (expected-a-symbol "forventede et symbol, fandt: ~a")
-  (already-used-keyword "\"~a\" er allerede et nøgleord med speciel indrykning")
-  (add-keyword "Tilføj")
-  (remove-keyword "Fjern")
-  
-  ;;; find/replace
-  (find-and-replace "Søg og erstat")
-  (find "Søg")
-  (replace "Erstat")
-  (dock "Minimer")
-  (undock "Gendan")
-  (replace&find-again "Erstat og Søg igen") ;;; need double & to get a single &
-  (forward "Frem")
-  (backward "Tilbage")
-  (hide "Skjul")
-  (find-case-sensitive "Forskel på store og små bogstaver")  ;; the check box in both the docked & undocked search
-  
-  ;;; multi-file-search
-  (mfs-multi-file-search-menu-item "Søg i filer...")
-  (mfs-string-match/graphics "Streng match (klarer filer med grafik)")
-  (mfs-regexp-match/no-graphics "Regulært udtryk (kun rå tekstfiler)")
-  (mfs-searching... "Søger...")
-  (mfs-configure-search "Søgeindstillinger") ;; dialog title
-  (mfs-files-section "Filer")   ;; section in config dialog
-  (mfs-search-section "Søg") ;; section in config dialog
-  (mfs-dir "Mappe")
-  (mfs-recur-over-subdirectories "Rekursivt i undermapper")
-  (mfs-regexp-filename-filter "Regexp filnavnsfilter")
-  (mfs-search-string "Søgestreng")
-  (mfs-drscheme-multi-file-search "Søgning i flere filer - DrRacket") ;; results window and error message title
-  (mfs-not-a-dir "\"~a\" er ikke en mappe")
-  (mfs-open-file "Åbn fil")
-  (mfs-stop-search "Stop søgning")
-  (mfs-case-sensitive-label "Forskel på store og små bogstaver")
-  (mfs-no-matches-found "Intet passende fundet.")
-  (mfs-search-interrupted "Søgning afbrudt.")
-  
-  ;;; reverting a file
-  (are-you-sure-revert
-   "Er du sikker på, at du vil gendanne denne fil? En gendannen kan ikke fortrydes.")
-  (are-you-sure-revert-title "Gendan?")
-  
-  ;;; saving a file
-  ; ~a is filled with the filename
-  (error-saving "Fejl under lagring") ;; title of error message dialog
-  (error-saving-file/name "Der var en fejl ved lagring af ~a.")
-  (error-loading "Indlæsefejl")
-  (error-loading-file/name "Fejl ved læsning af ~a.")
-  (unknown-filename "<< ukendt >>")
-  
-  ;;; finder dialog
-  (must-specify-a-filename "Du skal angive et filnavn")
-  (file-does-not-exist "Filen \"~a\" findes ikke.")
-  (ask-because-file-exists "Filen \"~a\" findes allerede. Erstat den?")
-  (dne-or-cycle "Filen \"~a\" indeholder en ikke-eksisterende mappe eller en cykel.")
-  (get-file "Hent fil")
-  (put-file "Gem fil")
-  (full-pathname "Fuldt navn med sti")
-  (show-dot-files "Vis filer og mapper, som begynder med punktum.")
-  (up-directory-button-label "Op")
-  (add-button-label "Tilføj") ;;; for multi-file selection
-  (add-all-button-label "Tilføj alle") ;;; for multi-file selection
-  (remove-button-label "Fjern") ;;; for multi-file selection
-  (file-wrong-form "Det filnavn har ikke den rigtige form.")
-  (select-files "Vælg filer")
-  (select-file "Vælg en fil")
-  (dir-dne "Den mappe findes ikke.")
-  (file-dne "Den fil findes ikke.")
-  (empty-filename "Filnavnet skal indeholde et tegn.")
-  (that-is-dir-name "Det er et mappenavn.")
-  
-  ;;; raw menu names -- these must match the
-  ;;; versions below, once the &s have been stripped.
-  ;;; if they don't, DrRacket's menus will appear
-  ;;; in the wrong order.
-  (file-menu "Filer")
-  (edit-menu "Rediger")
-  (help-menu "Hjælp")
-  (windows-menu "Vinduer")
-  
-  ;;; menus
-  ;;; - in menu labels, the & indicates a alt-key based shortcut.
-  ;;; - sometimes, things are stuck in the middle of
-  ;;; menu item labels. For instance, in the case of
-  ;;; the "Save As" menu, you might see: "Save Definitions As".
-  ;;; be careful of spacing, follow the English, if possible.
-  ;;; - the ellipses in the `after' strings indicates that
-  ;;; more information is required from the user before completing
-  ;;; the command.
-  
-  (file-menu-label "&Filer")
-  
-  (new-info  "Opret en ny fil")
-  (new-menu-item "&Ny")
-  (new-...-menu-item "&Ny...")
-  
-  (open-info "Åbn en fil fra disk")
-  (open-menu-item "&Åbn...")
-  
-  (open-recent-info "En liste af filer brugt for nylig")
-  (open-recent-menu-item "Åbn gammel")
-  
-  (revert-info "Gendan diskkopien af denne fil")
-  (revert-menu-item "Gendan")
-  
-  (save-info "Gem filen på disk")
-  (save-menu-item "&Gem")
-  
-  (save-as-info "Gemmer filen med et nyt filnavn")
-  (save-as-menu-item "Gem &Som...")
-  
-  (print-info "Udskriv filen på printer")
-  (print-menu-item "&Print...")
-  
-  (close-info "Luk denne fil")
-  (close-menu-item "&Luk")
-  
-  (quit-info "Luk alle vinduer")
-  (quit-menu-item-windows "E&xit")  ; TODO
-  (quit-menu-item-others "&Quit")
-  
-  (edit-menu-label "&Rediger")
-  
-  (undo-info "Fortryd sidste handling")
-  (undo-menu-item "&Fortryd")
-  
-  (redo-info "Fortryd det seneste fortryd")
-  (redo-menu-item "&Omgør")
-  
-  (cut-info "Flyt det sidst valgte til klippebordet til senere indsættelse")
-  (cut-menu-item "K&lip")
-  
-  (copy-info "Kopier det sidst valgte til klippebordet til senere indsættelse")
-  (copy-menu-item "&Kopier")
-  
-  (paste-info "Erstat det valgte med det senest kopierede eller klippede")
-  (paste-menu-item "&Indsæt")
-  
-  (clear-info "Slet de valgte elementer uden at påvirke klippebordet eller indsætning")
-  (clear-menu-item-windows "&Rens")
-  
-  (select-all-info "Marker alt")
-  (select-all-menu-item "Marker &alt")
-  
-  (find-info "Søg efter streng")
-  (find-menu-item "Søg...")
-  
-  (find-again-info "Søg efter samme streng som før")
-  (find-again-menu-item "Søg igen")
-  
-  (replace-and-find-again-info "Erstat den nuværende tekst og gentag søgningen")
-  (replace-and-find-again-menu-item "Erstat og søg igen")
-  
-  (preferences-info "Rediger dine indstillinger")
-  (preferences-menu-item "Indstillinger...")
-  
-  (keybindings-info "Vis de gældende, aktive tastebindinger")
-  (keybindings-menu-item "Tastebindinger")
-  (keybindings-show-active "Vis aktive tastebindinger")
-  (keybindings-frame-title "Tastebindinger")
-  (keybindings-sort-by-name "Sorter efter navn")
-  (keybindings-sort-by-key "Sorter efter taster")
-  (keybindings-add-user-defined-keybindings "Tilføj en brugerdefineret tastebindinger...")
-  (keybindings-add-user-defined-keybindings/planet "Tilføj brugerdefinerede tastebindinger fra PLaneT...")
-  (keybindings-menu-remove "Fjern ~a")
-  (keybindings-choose-user-defined-file "Vælg en fil med tastebindinger.")
-  (keybindings-planet-malformed-spec "PLaneT-specifikationen er ukorrekt: ~a") ; the string will be what the user typed in
-  (keybindings-type-planet-spec "Indtast en PLaneT require-specifikation (uden `require')")
-  
-  ; first ~a will be a string naming the file or planet package where the keybindings come from;
-  ; second ~a will be an error message
-  (keybindings-error-installing-file "Error when installing the keybindings ~a:\n\n~a")
-  
-  (user-defined-keybinding-error "Fejl ved kørsel af brugerdefineret tastebinding ~a\n\n~a")
-  (user-defined-keybinding-malformed-file "Filen ~a indeholder ikke et modul skrevet i sproget framework/keybinding-lang.")  
-  
-  ;; menu items in the "special" menu
-  (insert-text-box-item "Indsæt tekstkasse")
-  (insert-image-item    "Indsæt billede...")
-  (insert-comment-box-menu-item-label "Indsæt kommentarkasse")
-  (insert-lambda "Indsæt &Lambda")
-  
-  (wrap-text-item       "Ombryd tekst")
-  
-  (windows-menu-label "&Vinduer")
-  (bring-frame-to-front "Skift til andet vindue")       ;;; title of dialog
-  (bring-frame-to-front... "Skift til andet vindue...") ;;; corresponding title of menu item
-  (most-recent-window "Sidst besøgte vindue")
-  
-  (view-menu-label "&Vis")
-  (show-overview "Vis programkontur")
-  (hide-overview "Skjul programkontur")
-  (show-module-browser "Vis moduloversigt")
-  (hide-module-browser "Skjul moduloversigt")
-  
-  (help-menu-label "&Hjælp")
-  (about-info "Akkrediteringer og detaljer om dette program")
-  (about-menu-item "Om...")
-  
-  ;; open here's new menu item
-  (create-new-window-or-clear-current
-   "Vil du have et nyt vindue, eller rense det gamle?")
-  (clear-current "Rens nuværende")
-  (new-window "Nyt vindue")
-  
-  ;;; exiting and quitting are you sure dialog
-  ;;; (exit is used on windows, quit on macos. go figure)
-  (exit "Afslut")
-  (quit "Afslut")
-  ;;; in are-you-sure-format, either exit or quit is filled in (from above)
-  ;;; based on the platform drscheme is running on.
-  (are-you-sure-exit "Er du sikker, du vil afslutte?")
-  (are-you-sure-quit "Er du sikker, du vil afslutte?")
-  ; these next two are only used in the quit/exit dialog
-  ; on the button whose semantics is "dismiss this dialog".
-  ; they are there to provide more flexibility for translations
-  ; in English, they are just cancel.
-  (dont-exit "Fortryd") 
-  (dont-quit "Fortryd")
-  
-  ;;; autosaving
-  (error-autosaving "Fejl under autosaving \"~a\".")
-  (autosaving-turned-off "Autosaving er slået fra \nindtil filen filen gemmes.")
-  (recover-autosave-files-frame-title "Gendan backupfiler")
-  (autosave-details "Detaljer")
-  (autosave-recover "Gendan")
-  (autosave-unknown-filename "<<ukendt>>")
-  
-  ;; these are labels in a dialog that drscheme displays
-  ;; if you have leftover autosave files. to see the dialog,
-  ;; start up drscheme and modify (but don't save) a file
-  ;; (also, do this with an unsaved file). Wait for the autosave
-  ;; files to appear (typically 5 minutes). Kill DrRacket
-  ;; and restart it. You'll see the dialog
-  (autosave-autosave-label: "Autosave-fil:")
-  (autosave-original-label: "Original fil:")
-  (autosave-autosave-label "Autosave-fil")
-  (autosave-original-label "Original fil")
-  (autosave-compare-files "Sammenlign autosavede filer")
-  
-  (autosave-show-autosave "Autosave-fil") ;; title of a window showing the autosave file
-  
-  (autosave-explanation "DrRacket fandt autosavede filer, som måske indeholde ugemt arbejde.")
-  
-  (autosave-recovered! "Gendannet!") ;; status of an autosave file
-  (autosave-deleted "Slettet")       ;; status of an autosave file
-  
-  (autosave-error-deleting "Fejl under sletning ~a\n\n~a") ;; first is a filename, second is an error message from mz.
-  (autosave-delete-button "Slet")
-  (autosave-delete-title "Slet")  ;; title of a dialog asking for deletion confirmation
-  (autosave-done "Færdig")
-  
-  ;; appears in the file dialog
-  (autosave-restore-to-where? "Vælg et sted til at gemme autosave-filen.")
-  
-  
-  ;;; file modified warning
-  (file-has-been-modified
-   "Der er rettet i filen, siden den sidst blev gemt. Overskriv ændringerne?")
-  (overwrite-file-button-label "Overskriv")
-  
-  (definitions-modified
-    "Definitionsteksten er blevet ændret i filsystemet; gem venligst eller brug 'vend tilbage' for at bruge den gamle version")
-  (drscheme-internal-error "Intern fejl i DrRacket")
-  
-  ;;; tools
-  (invalid-tool-spec "Værkstøjsspecifikationen i collection ~a's info.rkt filen er ugyldig. Forventede enten en streng eller en ikke-tom liste af strenge, fik: ~e")
-  (error-invoking-tool-title "Fejl ved kørsel af værktøj ~s;~s")
-  (tool-tool-names-same-length "forventede `tool-names' og `tools' var to lister af samme længde i info.rkt for ~s, fik ~e og ~e")
-  (tool-tool-icons-same-length  "forventede `tool-icons' og `tools' var to lister af samme længde i info.rkt  for ~s, fik ~e and ~e")
-  (tool-tool-urls-same-length
-   "forventede `tool-urls' og `tools' var lister af samme længde  i info.rkt-filen for ~s, fik ~e og ~e")
-  (error-getting-info-tool  "fejl ved hentning af info.rkt file for ~s")
-  (tool-error-phase1 "Fejl i fase 1 for værktøjet ~s; ~s")
-  (tool-error-phase2 "Fejl i fase 2 for værktøjet ~s; ~s")
-  
-  
-  ;;; define popup menu
-  (end-of-buffer-define "<< slutning af buffer >>")
-  (sort-by-name "Sorter efter navn")
-  (sort-by-position "Sorter efter rækkefølge i programteksten")
-  (no-definitions-found "<< ingen definitioner fundet >>")
-  (jump-to-defn "Hop til definitionen af ~a")
-  
-  (recent-items-sort-by-age "Sorter efter Alder")
-  (recent-items-sort-by-name "Sorter efter Navn")
-  
-  
-  ;;; view menu
-  (hide-definitions-menu-item-label "Skjul &Definitioner")
-  (show-definitions-menu-item-label "Vis &Definitioner")
-  (definitions-menu-item-help-string "Vis/Skjul definitionsvinduet")
-  (show-interactions-menu-item-label "Vis &Interaktioner")
-  (hide-interactions-menu-item-label "Skjul &Interaktioner")
-  (interactions-menu-item-help-string "Vis/Skjul interaktionsvinduet")
-  (show-toolbar "Vis &værktøjslinjen")
-  (hide-toolbar "Skjul &værktøjslinjen")
-  
-  ;;; file menu
-  (save-definitions-as "Gem definitioner som...")
-  (save-definitions "Gem definitioner")
-  (print-definitions "Udskriv definitioner...")
-  (about-drscheme "Om DrRacket")
-  (save-other "Gem andet")
-  (save-definitions-as-text "Gem definitioner som tekst...")
-  (save-interactions "Gem interaktioner")
-  (save-interactions-as "Gem interaktioner som...")
-  (save-interactions-as-text "Gem interaktioner som tekst...")
-  (print-interactions "Udskriv interaktioner...")
-  (new-tab "Nyt faneblad")
-  (close-tab "Luk faneblad")
-  
-  ;;; edit-menu
-  (split-menu-item-label "&Split")
-  (collapse-menu-item-label "K&ollaps")
-  
-  ;;; language menu
-  (language-menu-name "&Sprog")
-  
-  ;;; scheme-menu
-  (scheme-menu-name "Ra&cket")
-  (execute-menu-item-label "Kør")
-  (execute-menu-item-help-string "Genstart programmet i definitionsvinduet")
-  (break-menu-item-label "Afbryd")
-  (break-menu-item-help-string "Afbryd den nuværende evaluering")
-  (kill-menu-item-label "Slå ihjel")
-  (kill-menu-item-help-string "Slå den nuværende evaluering ihjel")
-  (clear-error-highlight-menu-item-label "Fjern fejlfarvelægningen")
-  (clear-error-highlight-item-help-string "Fjerne den pinke farvelægning af fejlene")
-  (reindent-menu-item-label "&Indryk igen")
-  (reindent-all-menu-item-label "Indryk &alt igen")
-  (semicolon-comment-out-menu-item-label "&Udkommenter med semikolonner")
-  (box-comment-out-menu-item-label "&Udkommenter med en kasse")
-  (uncomment-menu-item-label "&Afkommenter")
-  
-  (convert-to-semicolon-comment "Konverter til en semikolon-kommentar")
-  
-  
-  ;;; executables
-  (create-executable-menu-item-label "Lav binær kørselfil...")
-  (create-executable-title "Lav binær kørselsfil")
-  (must-save-before-executable "Du skal gemme dit program, før du laver en binær fil")
-  (save-a-mred-launcher "Gem en GRacket-starter")
-  (save-a-mzscheme-launcher "Gem en Racket-starter")
-  (save-a-mred-stand-alone-executable "Gem en selvstændig GRacket-kørselsfil")
-  (save-a-mzscheme-stand-alone-executable "Gen en selvstændig Racket kørselsfil")
-  (save-a-mred-distribution "Gem en GRacket-distribution")
-  (save-a-mzscheme-distribution "Gem en Racket-distribution")
-  
-  (definitions-not-saved "Definitionsvinduet har ikke været gemt. Den binære kørselsfil vil bruge den senest gemte version af definitionsvinduet. Fortsæt?")
-  (launcher "Starter")
-  ;; The "-explanatory-label" variants are the labels used for the radio buttons in
-  ;;  the "Create Executable..." dialog for the "(module ...)" language.
-  (launcher "Starter")
-  (launcher-explanatory-label "Starter (kun til denne maskine, kører fra programtekst)")
-  (stand-alone "Selvstændig")
-  (stand-alone-explanatory-label "Selvstændig (kun til denne maskine, kører en oversat kopi)")
-  (distribution "Distribution")
-  (distribution-explanatory-label "Distribution (til at installere på andre maskiner)")
-  (executable-type "Type")
-  (executable-base "Base")
-  (filename "Filnavn: ")
-  (create "Opret")
-  (please-specify-a-filename "Angive et filnavn til opretningen.")
-  (~a-must-end-with-~a
-      "Filnavnet ~a\n\n  ~a\n\ner ikke tilladt. Filnavnet må ende med \".~a\".")
-  (macosx-executables-must-end-with-app
-      "Filnavnet\n\n  ~a\n\ner ikke gyldigt. Under MacOS X skal en kørbar fil være en mappe, hvis navn slutter med .app.")
-  (warning-directory-will-be-replaced
-   "ADVARSEL: mappen:\n\n  ~a\n\nvil blive erstattet. Fortsæt?")
-  
-  (distribution-progress-window-title "Distributionsfremgang")
-  (creating-executable-progress-status "Opretter kørbar fil til denne distribution...")
-  (assembling-distribution-files-progress-status "Samler filer til distributionen...")
-  (packing-distribution-progress-status "Pakker distributionen...")
-  
-  (create-servlet "Opret en Servlet...")
-  
-  ; the ~a is a language such as "module" or "algol60"
-  (create-servlet-unsupported-language
-   "Opret Servlet virker ikke med sproget ~a .")
-  
-  ;;; buttons
-  (execute-button-label "Kør")
-  (save-button-label "Gem")
-  (break-button-label "Afbryd")
-  
-  ;;; search help desk popup menu
-  (search-help-desk-for "Søg på hjælpebordet efter \"~a\"")
-  (exact-lucky-search-help-desk-for "Præcis, heldig søgning på hjælpebordet efter \"~a\"")
-  
-  ;; collapse and expand popup menu items
-  (collapse-sexp "Kollaps s-udtryk")
-  (expand-sexp "Ekspander s-udtryk")
-  
-  ;;; fraction dialog
-  (enter-fraction "Indtast brøk")
-  (whole-part "Hele del")
-  (numerator "Tæller")
-  (denominator "Nævner")
-  (invalid-number "Ugyldigt tal: skal være en være et eksakt, reelt, ikke-helt tal.")
-  (insert-fraction-menu-item-label "Indsæt brøk...")
-  
-  ;; number snip popup menu
-  (show-decimal-expansion "Vis som decimaltal")
-  (show-mixed-fraction-view "Vis som blandet tal")
-  (show-improper-fraction-view "Vis som uægte brøk")
-  (show-more-decimal-places "Vis flere decimaler")
-  
-  ;;; TeachPack messages
-  (select-a-teachpack "Vælg undervisningspakke")
-  (clear-teachpack "Fjern undervisningspakken ~a")
-  (teachpack-error-label "DrRacket - Undervisningspakkefejl")
-  (teachpack-didnt-load "Undervisningspakkefilen ~a blev ikke hentet rigtigt.")
-  (add-teachpack-menu-item-label "Tilføj Undervisningspakke")
-  (clear-all-teachpacks-menu-item-label "Fjern alle undervisningspakker")
-  (drscheme-teachpack-message-title "DrRacket Undervisningspakke")
-  (already-added-teachpack "Undervisningspakken ~a er allerede tilføjet")
-  
-  ;;; Language dialog
-  (introduction-to-language-dialog
-   "Vælg venligst et sprog. Elever i de fleste begynderkurser bør vælge det foreslåede sprog.")
-  (language-dialog-title "Vælg sprog")
-  (case-sensitive-label "Forskel på store og små bogstaver")
-  (output-style-label "Output-stil")
-  (constructor-printing-style "Konstruktør")
-  (quasiquote-printing-style "Kvasicitering")
-  (write-printing-style "write")
-  (print-printing-style "print")
-  (sharing-printing-label "Vis deling i værdier")
-  (use-pretty-printer-label "Indsæt linjeskift i printede værdier")
-  (input-syntax "Input-syntaks")
-  (dynamic-properties "Dynamiske egenskaber")
-  (output-syntax "Output-syntaks")
-  (no-debugging-or-profiling "Ingen debugning eller profilering")
-  (debugging "Debugging")
-  (debugging-and-profiling "Debugning og profilering")
-  (test-coverage "Syntaktisk dækning af testsuiten")
-  (show-details-button-label "Vis detaljer")
-  (hide-details-button-label "Skjul detaljer")
-  (choose-language-menu-item-label "Vælg sprog...")
-  (revert-to-language-defaults "Vend tilbage til standardsproget")
-  (fraction-style "Brøkvisning")
-  (use-mixed-fractions "Uægte brøker")
-  (use-repeating-decimals "Periodeiske decimalbrøker")
-  (decimal-notation-for-rationals "Brug decimaltalsnotation for brøker")
-  
-  
-  ;; startup wizard screen language selection section
-  (please-select-a-language "Vælg et sprog")
-  
-  ;;; languages
-  (beginning-student "Begynder")
-  (beginning-one-line-summary "define, cond, strukturer, konstanter og primitiver")
-  (beginning-student/abbrev "Begynder med listeforkortelser")
-  (beginning/abbrev-one-line-summary "Begynder, men udskrivning anvender listenotation i REPL")
-  (intermediate-student "Øvet")
-  (intermediate-one-line-summary "Begynder med leksikalske virkefelter")
-  (intermediate-student/lambda "Øvet med lambda")
-  (intermediate/lambda-one-line-summary "Øvet med funktioner af højere orden")
-  (advanced-student "Rutineret")
-  (advanced-one-line-summary "Øvet med lambda og mutation")
-  (how-to-design-programs "How to Design Programs") ;; should agree with MIT Press on this one...
-  (pretty-big-scheme "Temmelig omfattende Racket")
-  (pretty-big-scheme-one-line-summary "Grafisk, med mange standardbiblioteker")
-  (r5rs-language-name "R5RS")
-  (r5rs-one-line-summary "R5RS, uden dikkedarer")
-  (expander "Ekspanderen")
-  (expander-one-line-summary "Ekspanderer, snarere end evaluerer udtryk")
-  (professional-languages "Professionelle sprog")
-  (teaching-languages "Undervisningssprog")
-  (experimental-languages "Eksperimentelle sprog")
-  (initial-language-category "Startsprog")
-  (no-language-chosen "Intet sprog valgt")
-  
-  ;(module-language-one-line-summary "En kørsel åbner en REPL i i modulets sammenhæng, inkluderer modulets deklarede sprog")
-  
-  ;;; from the `not a language language' used initially in drscheme.
-  (must-choose-language "DrRacket kan ikke køre programmer før du vælger et programmeringssprog.")
-  
-  ; next two appear before and after the name of a text book (which will be in italics)
-  (using-a-textbook-before "Bruger du ")
-  (using-a-textbook-after "?")
-  
-  ; next two are before and after a language
-  (start-with-before "Begynd med ")
-  
-  (seasoned-plt-schemer? "Rutineret PLT-Schemer?")
-  (looking-for-standard-scheme? "Leder efter standard-Scheme?")
-  
-  ; the three string constants are concatenated together and the middle
-  ; one is hyperlinked to the dialog that suggests various languages
-  (get-guidance-before "Vælg enten “Vælg sprog...”-punktet i “Sprog”-menuen, eller ")
-  (get-guidance-during "følg guiden")
-  (get-guidance-after ".")
-  
-  ;;; debug language
-  (unknown-debug-frame "[ukendt]")
-  (backtrace-window-title "Tilbagesporing - DrRacket")
-  (files-interactions "~a's interaktioner") ;; filled with a filename
-  (current-interactions "interaktioner")
-  (current-definitions "definitioner")
-  ; (stack-frame-in-current-interactions "interaktioner")
-  ; (stack-frame-in-current-definitions "definitioner")
-  (mzscheme-w/debug "Tekstuel (MzScheme, inkluderer R5RS)")
-  (mzscheme-one-line-summary "PLT Scheme uden GUI ")
-  (mred-w/debug "Grafisk (MrEd, inkluderer MzScheme)")
-  (mred-one-line-summary "PLT Scheme med GUI")
-  
-  ;; profiling
-  (profiling-low-color "Lav")
-  (profiling-high-color "Høj")
-  (profiling-choose-low-color "Vælg en farve til lav")
-  (profiling-choose-high-color "Vælg en farve til høj")
-  (profiling "Profilering")
-  (profiling-example-text "(define (foo) (foo))")
-  (profiling-color-config "Farveområde for profilering")
-  (profiling-scale "Farveskala for profilering")
-  (profiling-sqrt "Kvadratrod")
-  (profiling-linear "Lineær")
-  (profiling-square "Kvadratisk")
-  (profiling-number "Antal funktionskald")
-  (profiling-time "Kumuleret tid")
-  ;(profiling-clear "Rens profil")
-  (profiling-update "Opdater profil")
-  (profiling-col-percent-time "% tid")
-  (profiling-col-function "Funktion")
-  (profiling-col-time-in-msec "millisekunder")
-  (profiling-col-calls "Kald")
-  (profiling-show-profile "Vis profil")
-  (profiling-hide-profile "Skjul profil")
-  (profiling-unknown-src "<< ukendt >>")
-  (profiling-no-information-available "Der er ingen profileringsinformation tilgængelig. Er du sikker på, at profilering er sat til i dit sprog, og at du har kørt dit program?")
-  (profiling-clear? "Ændringer i definitionsvinduet gør profileringsinformationen ugyldig. Fortsæt?")
-  
-  ;; test coverage
-  (test-coverage-clear? "Ændringer i definitionsvinduet ugyldiggør testdækningsinformationen. Fortsæt?")
-  (test-coverage-clear-and-do-not-ask-again "Ja og spørg ikke igen")
-  (test-coverage-ask? "Spørg om at rense dækningen af testen")
-  
-  ;; tracing
-  (tracing-enable-tracing "Slå sporing til")
-  (tracing-show-tracing-window "Vis sporing")
-  (tracing-hide-tracing-window "Skjul sporing")
-  (tracing-tracing-nothing-to-show "Ingen sporingsresultater er tilstede endnu. (Sørg for at dit sprog understøtter sporing og at sporing er slået til.)")
-  
-  
-  ;;; repl stuff
-  (evaluation-terminated "Evaluering termineret")
-  (evaluation-terminated-explanation
-   "Evalueringstråden kører ikke længere, så der kan ikke foretages yderligere evaluering inden næste kørsel.")
-  (last-stack-frame "vis sidste stakramme")
-  (last-stack-frames "vis de ~a sidste stakrammer")
-  (next-stack-frames "vis de næste ~a stakrammer")
-  
-  ;;; welcoming message in repl
-  (language "Sprog")
-  (custom "speciel")
-  (teachpack "Undervisningspakke")
-  (welcome-to "Velkommen til")
-  (version "version")
-  
-  ;;; kill evaluation dialog
-  (kill-evaluation? "Vil du slå evalueringen ihjel?")
-  (just-break "Bare afbryd")
-  (kill "Ihjel")
-  (kill? "Ihjel?")
-  
-  ;;; version checker
- (version:update-menu-item   "Undersøger om der er opdateringer...")
- (version:update-check       "Opdateringstjek") ; dialog title, with the next line
- (version:connecting-server  "Forbinder til Rackets versionsserver")
- (version:results-title      "Racket Versionstjek")
- (version:do-periodic-checks "Tjek med mellemrum om der er kommet nye Racket-versioner")
- (version:take-me-there      "Til download") ; ...to the download website
- ;; the next one can appear alone, or followed by a comma and the one after that
- (version:plt-up-to-date     "Din Racket version er up-to-date")
- (version:but-newer-alpha    "men læg mærke til, at der er en nyere alpha-udgave")
- ;; This is used in this context: "Racket vNNN <<<*>>> http://download..."
- (version:now-available-at   "er nu klar på")
-
-  ;; special menu
-  (special-menu "Speciel")
-  
-  ;; large semi colon letters
-  (insert-large-letters... "Indsæt store bogstaver...")
-  (large-semicolon-letters "Store semikolon-bogstaver")
-  (text-to-insert "Tekst til indsættelse")
-  
-  (module-browser-filename-format "Fuldt filnavn: ~a (~a linjer)")
-  (module-browser-root-filename "Rod-filnavn: ~a")
-  (module-browser-font-size-gauge-label "Skriftstørrelse")
-  (module-browser-progress-label "Fremgang for moduloverblik")
-  (module-browser-adding-file "Tilføjer fil: ~a...")
-  (module-browser-laying-out-graph-label "Beregner udseende for grafen")
-  (module-browser-open-file-format "Åbn ~a")
-  (module-browser "Moduloversigt") ;; frame title
-  (module-browser... "Moduloversigt...") ;; menu item title
-  (module-browser-error-expanding "Fejl under ekspansion af programmet:\n\n~a")
-  (module-browser-show-lib-paths "Vis filer læst via (lib ..) stier")
-  (module-browser-progress "Moduloversigt: ~a") ;; prefix in the status line
-  (module-browser-compiling-defns "Moduloversigt: oversætter definitioner")
-  (module-browser-show-lib-paths/short "Følg lib requires") ;; check box label in show module browser pane in drscheme window.
-  (module-browser-show-planet-paths/short "Følg planet requires") ;; check box label in show module browser pane in drscheme window.
-  (module-browser-refresh "Opdater") ;; button label in show module browser pane in drscheme window.
-;  (module-browser-only-in-plt-and-module-langs
-;   "Moduloversigten er kun tilgængelig for programmer i PLT-sprogene og i modul-sproget (og kun for de programmer, som benytter moduler).")
-  (module-browser-name-length "Navnelængde")
-  (module-browser-name-short "Kort")
-  (module-browser-name-medium "Mellem")
-  (module-browser-name-long "Lanf")
-  (module-browser-open-all "Åbn alle filer vist her")
-  
-  (happy-birthday-matthias "Tillykke med fødselsdagen, Matthias!")
-  (happy-birthday-matthew  "Tillykke med fødselsdagen, Matthew!")
-  (happy-birthday-shriram  "Tillykke med fødselsdagen, Shriram!")
-  
-  (mrflow-using-default-language-title "Sprog, som bruges når andet ikke er valgt")
-  (mrflow-using-default-language "Det sprog, som anvendes nu, har ikke en typetabel defineret for dets primitiver. R5RS Scheme bruges i stedet.")
-  (mrflow-button-title "Analyser")
-  ;(mrflow-unknown-style-delta-error-title "Unknown Box Style Delta")
-  ;(mrflow-unknown-style-delta-error "Unknown box style delta: ~a")
-  (mrflow-popup-menu-show-type "Vis type")
-  (mrflow-popup-menu-hide-type "Skjul type")
-  (mrflow-popup-menu-show-errors "Vis fejl")
-  (mrflow-popup-menu-hide-errors "Skjul fejl")
-  
-  ;(mrflow-read-exception-title "Læseundtagelse (Read Exception)")
-  ;(mrflow-read-exception "Læseundtagelse (Read exception): ~a")
-  ;(mrflow-syntax-exception-title "Syntaksundtagelse")
-  ;(mrflow-syntax-exception "Syntaksundtagelse: ~a")
-  ;(mrflow-unknown-exception-title "Ukendt undtagelse")
-  ;(mrflow-unknwon-exception "Ukendt undtagelse: ~a")
-  ;(mrflow-language-primitives-error-title "Fejl i sprogprimitiver")
-  ;(mrflow-language-primitives-error "Forkert filnavn for tabellen med typer for sprogets primitiver: ~a")
-  
-  (snips-and-arrows-popup-menu-tack-all-arrows "Vis alle pile")
-  (snips-and-arrows-popup-menu-untack-all-arrows "Skjul alle pile")
-  (snips-and-arrows-user-action-disallowed-title "Brugerændringer er i øjeblikket ikke tilladt")
-  (snips-and-arrows-user-action-disallowed "Brugerændringer er ikke tilladt i editorer, som indeholder snips (f.eks. pile) indsat fra et tool. Skjul alle snips for at få lov til at ændre editorens indhold.")
-  ;(snips-and-arrows-changing-terms-warning-title "Changing terms will be undoable")
-  ;(snips-and-arrows-changing-terms-warning "Changing terms in an editor containing snips cannot be undone.  You can either cancel this action, remove the snips, and try the change again, or you can continue with the change, in which case the change will not be undoable (all others changes made before and afterward will still be undoable though).")
-  (snips-and-arrows-hide-all-snips-in-editor "Skjul alle snips i editoren")
-  
-  (xml-tool-insert-xml-box "Indsæt XML-kasse")
-  (xml-tool-insert-scheme-box "Indsæt Racket-kasse")
-  (xml-tool-insert-scheme-splice-box "Indsæt Racket-splejningskasse (Splice Box)")
-  (xml-tool-xml-box "XML-Kasse")
-  (xml-tool-scheme-box "Racket-Kasse")
-  (xml-tool-scheme-splice-box "Racket-splejsningskasse Racket Splice Box")
-  (xml-tool-switch-to-scheme "Skift til Racket-kasse")
-  (xml-tool-switch-to-scheme-splice "Skift til Racket-splejsningskasse")
-  (xml-tool-eliminate-whitespace-in-empty-tags "Fjern blanktegn i tomme tags")
-  (xml-tool-leave-whitespace-alone "Bevar blanktegn")
-  
-  (show-recent-items-window-menu-item "Vis de senest åbnede filer i et separat vindue")
-  (show-recent-items-window-label "Senest åbnede filer")
-  (number-of-open-recent-items "Antal nye ting")
-  (switch-anyway "Skift fil alligevel")
-  
-  (stepper-program-has-changed "ADVARSEL: Programmet er ændret.")
-  (stepper-program-window-closed "ADVARSEL: Programvinduet er væk.")
-  
-  (stepper-name "Stepper")
-  (stepper-language-level-message
-   "Sprogniveauet er sat til \"~a\". Indtil videre virker stepperen kun for sprogniveauerne fra \"~a\" til \"~a\".")
-  (stepper-button-label "Step")
-  (stepper-previous-application "Funktionskald")
-  (stepper-previous "Step")
-  (stepper-next "Step")
-  (stepper-next-application "Funktionskald")
-  (stepper-jump-to-beginning "Hjem")
-  
-  (debug-tool-button-name "Debug")
-  
-  (dialog-back "Tilbage")
-  
-  
-  ;; warnings about closing a drscheme frame when the program
-  ;; might still be doing something interesting
-  (program-is-still-running "Programmet i definitionsvinduet kører stadig. Luk alligevel?")
-  (program-has-open-windows "Programmet i definitionsvinduet har åbne vinduer. Luk dette vindue alligevel?")
-  
-  ;; ml-command-line-arguments is for the command line arguments
-  ;; label in the module language details in the language dialog.
-  (ml-command-line-arguments "Kommandolinje argumenter som en vektor af strenge i read-syntaks.")
-  
-  ;; ml-cp names are all for the module language collection path
-  ;; configuration. See the details portion of the language dialog
-  ;; for the module language (at the bottom).
-  (ml-cp-default-collection-path "<<standard collection-sti>>")
-  
-  ;; in std get-directory 
-  (ml-cp-choose-a-collection-path "Vælg en collection-sti")
-  
-  ;; err msg when adding default twice
-  (ml-cp-default-already-present
-   "Standard collection-stien er allerede med")
-  
-  ;; title of this section of the dialog (possibly the word
-  ;; `Collection' should not be translated)
-  (ml-cp-collection-paths "Collection-stier")
-  
-  ;; button labels
-  (ml-cp-add "Tilføj")
-  (ml-cp-add-default "Tilføj standardindstilling")
-  (ml-cp-remove "Fjern")
-  (ml-cp-raise "Op")
-  (ml-cp-lower "Ned")
-  
-  ;; Profj
-  (profj-java "Java")
-  (profj-java-mode "Java-tilstande")
-  (profj-java-mode-color-keyword "nøgleord")
-  (profj-java-mode-color-string "streng")
-  (profj-java-mode-color-literal "bogstavelighed (literal)")
-  (profj-java-mode-color-comment "kommentar")
-  (profj-java-mode-color-error "fejl")
-  (profj-java-mode-color-identifier "navn")
-  (profj-java-mode-color-default "andet")
-  
-  (profj-insert-java-comment-box "Indsæt Java-kommentarkasse")
-  (profj-insert-java-interactions-box "Indsæt Java-interaktionskasse")
-  
-  ;; The Test Suite Tool
-  ;; Errors
-  (test-case-empty-error "Tomt test")
-  (test-case-too-many-expressions-error "For mange udtryk i testen.")
-  ;; DrRacket window menu items
-  (test-case-insert "Indsæt test")
-  (test-case-disable-all "Slå alle tests fra")
-  (test-case-enable-all "Slp alle tests til")
-  
-  ;; NOTE: The following string constants are labels of the test-case fields. The width
-  ;;       of the field is determined by the length of the longest of the following three words.
-  ;;       if the words are too long the test case will take up too much horizontal room and
-  ;;       not look very good.
-  ;; This string is the label of the expression that is being tested in a test case.
-  (test-case-to-test "Test")
-  ;; This string is the label of the expression that is the expected value of the to-test expression.
-  (test-case-expected "Forventet")
-  ;; This string is the label of the actual result of the to test expression.
-  (test-case-actual "Faktisk")
-  (test-case-predicate "Prædikat")
-  (test-case-should-raise "Skulle smide")
-  ;; The label of a field of the test-case that describes the expected error message of a test case
-  (test-case-error-message "Fejlbeskeden")
-  
-  (test-case-menu-title "Test")
-  (test-case-switch-to-error-box "Sktift til fejl-testkasse")
-  (test-case-switch-to-nonerror-box "Skift til ikke-fejl-testkasse")
-  (test-case-collapse "Skjul testen")
-  (test-case-show-actual "Vis faktisk værdi")
-  (test-case-enable "Slå testen til")
-  (test-case-show-predicate "Vis prædikat")
-  (test-case-show-error-message "Vis fejlbeskeden")
-  (test-case-convert-to-text "Konverter til tekst")
-  
-  ;; Profj Boxes
-  (profjBoxes-empty-error "Tom interaktion")
-  (profjBoxes-too-many-expressions-error "For mange udtryk i en kasse")
-  (profjBoxes-interactions-label "Interaktioner")
-  (profjBoxes-bad-java-id-error "Ulovlig Java-ID")
-  (profjBoxes-examples-label "Eksempler")
-  (profjBoxes-add-new-example-button "Tilføj nyt eksempel")
-  (profjBoxes-type "Type")
-  ;; The Java identifier of an example of data
-  (profjBoxes-name "Navn")
-  (profjBoxes-value "Værdi")
-  (profjBoxes-insert-java-examples "Indsæt Java-eksempler")
-  (profjBoxes-insert-java-interactions "Indsæt Java-interaktioner")
-  
-  ;; Slideshow
-  (slideshow-hide-picts "Vis indlejrede kasser")
-  (slideshow-show-picts "Vis billeder")
-  (slideshow-cannot-show-picts "Kan ikke vise billeder; kør programmet for at cache størrelserne først")
-  (slideshow-insert-pict-box "Indsæt billed-kasse (Pict Box)") 
-  
-  ;; GUI Tool
-  (gui-tool-heading "GUI-værktøj")
-  (gui-tool-before-clicking-message "Før værktøjsikonerne bruges, vælg \"Indsæt GUI\" fra \"Speciel\"-menuen for at indsætte et rod-GUI-element, eller vælg et allerede indsat GUI.")
-  (gui-tool-show-gui-toolbar "Vis GUI-værktøjslinjen")
-  (gui-tool-hide-gui-toolbar "Skjul GUI-værktøjslinjen")
-  (gui-tool-insert-gui "Indsæt GUI")
-  
-  )
-   
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/dutch-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/dutch-string-constants.rkt
deleted file mode 100644
index 5afae09934..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/dutch-string-constants.rkt
+++ /dev/null
@@ -1,758 +0,0 @@
-(module dutch-string-constants "string-constant-lang.rkt"
-
-;;; -- Where are Undo, Redo, Select all, and friends from the right-click popup menu?
-
- ;;; when translating this constant, substitute name of actual language for `English'
- (is-this-your-native-language "Is uw moedertaal Nederlands?")
-
- (are-you-sure-you-want-to-switch-languages
-  "Wisselen van taal vergt een herstart van DrRacket.  Weet u zeker dat u dit wilt?")
-
- (interact-with-drscheme-in-language "Werk in het Nederlands met DrRacket")
-
- ;; these two should probably be the same in all languages except English.
- ;; they are the button labels (under macos and windows, respectively)
- ;; that go the with the string above.
- (accept-and-quit "OK, sluit DrRacket maar af")
- (accept-and-exit "OK, sluit DrRacket maar af")
- 
- ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
- (plt "PLT")
- (drscheme "DrRacket")
- (drracket "DrRacket")
- (ok "OK")
- (cancel "Annuleren")
- (untitled "Naamloos")
- (untitled-n "Naamloos ~a")
- (warning "Waarschuwing")
- (error "Fout")
- (close "Sluiten") ;; as in, close an open window
- (stop "Stop")   
- (&stop "&Stop") ;; for use in button and menu item labels, with short cut.
-
- ;;; important urls
- (web-materials "Verwante Web Sites") ;; menu item title
- (plt-homepage "Racket")
- (pbd-homepage "Program by Design")
-
- ;;; bug report form
- (cancel-bug-report? "Melden defect afbreken?")
- (are-you-sure-cancel-bug-report?
-  "Weet u zeker dat u deze defectmelding NIET wilt sturen?")
- (bug-report-form "Defectmeldingsformulier")
- (bug-report-field-name "Naam")
- (bug-report-field-email "Email")
- (bug-report-field-summary "Samenvatting")
- (bug-report-field-severity "Ernst")
- (bug-report-field-class "Aard")
- (bug-report-field-description "Omschrijving")
- (bug-report-field-reproduce1 "Hoe te")
- (bug-report-field-reproduce2 "veroorzaken")
- (bug-report-field-environment "Omgeving")
- (bug-report-field-docs-installed "Geïnstalleerde documentatie") ; if allowed, add \n
- (bug-report-field-collections "Collecties")
- (bug-report-field-human-language "Spreektaal")
- (bug-report-field-version "Versie")
- (bug-report-synthesized-information "Systeeminformatie")  ;; dialog title
- (bug-report-show-synthesized-info "Toon systeeminformatie")
- (bug-report-submit "Stuur")
- (error-sending-bug-report "Fout bij het versturen van de defectmelding")
- (error-sending-bug-report-expln "Het versturen van de defectmelding mislukte.  Mocht uw internetverbinding verder goed werken, ga dan naar:\n\n    http://bugs.racket-lang.org/\n\nen verstuur de melding via het webformulier.  Sorry voor het ongemak.\n\nDe foutmelding is:\n~a")
- (illegal-bug-report "Ongeldige defectmelding")
- (pls-fill-in-field "Gelieve het \"~a\"-veld in te vullen")
- (malformed-email-address "Onmogelijk emailadres")
- (pls-fill-in-either-description-or-reproduce "Gelieve hetzij het omschrijvings-, hetzij het \"hoe te veroorzaken\"-veld in te vullen.")
-
- ;;; check syntax
- (check-syntax "Controleer Syntaxis")
- (cs-italic "Cursief")
- (cs-bold "Vet")
- (cs-underline "Onderstreept")
- (cs-change-color "Andere kleur")
- (cs-tack/untack-arrow "Pijlen vast/los")
- (cs-jump "Spring") ; <**> -- "Jump" - where used?
- (cs-error-message "Foutmelding")
- (cs-open-file "Open ~a")
- (cs-rename-var "Hernoem ~a")
- (cs-rename-id "Hernoem Identifier") ;<**>
- (cs-rename-var-to "Hernoem ~a tot:")
- (cs-name-duplication-error "De nieuwgekozen naam ~s komt al voor in dit bereik")
- 
- ;;; info bar at botttom of drscheme frame
- (collect-button-label "GC")
- (read-only "Alleen lezen")
- (auto-extend-selection "Auto-extend") ; <**> -- when does this appear?
- (overwrite "Vervang")
- (running "Bezig")
- (not-running "Klaar")
- 
- ;;; misc
- (welcome-to-something "Welkom bij ~a")
- 
- ; this appears in the drscheme about box.
- (welcome-to-drscheme-version/language "Welkom bij DrRacket, versie ~a, ~a")
-
- ; these appear on subsequent lines in the `Help|Welcome to DrRacket' dialog.
- (welcome-to-drscheme "Welkom bij DrRacket")
-
- (goto-line "Ga naar regel")
- (goto-line-invalid-number
-  "~a is geen geheel getal tussen 1 en ~a, dus geen geldig regelnummer")
- (goto-position "Naar positie")
- (no-full-name-since-not-saved "Dit bestand is nog nooit opgeslagen, en heeft dus nog geen naam.")
- (cannot-open-because-dne "~a bestaat niet, en kan dus niet geopend worden.")
- (interactions-out-of-sync
-  "WAARSCHUWING: Interactie- en definitievenster komen niet overeen.  Druk op Doen!.")
- (file-is-not-saved "Het bestand \"~a\" is niet opgeslagen.")
- (save "Opslaan")
- (close-anyway "Toch sluiten")
- (clear-anyway "Toch wissen") ; <**> -- check with actual usage
-
- (url: "URL:")
- (open-url... "Open URL...")
- (open-url "Open URL")
- (browse... "Surf...") ; -- Translated as browsing on the Internet
- (bad-url "Bad URL") ; <**>
- (bad-url:this "Bad URL: ~a") ;<**>
- 
- ;; Help Desk
- (search-results "Zoekresultaten")
- (help-desk "Hulpbron")
- (help-desk-n "Hulpbron ~a")
- (about-help-desk "Omtrent de Hulpbron")
- (help-desk-about-string
-  "De Hulpbron bevat complete informatie omtrent PLT programmatuur, waaronder DrRacket, MzScheme, en MrEd.\n\nVersie ~a\nAuteursrecht (c) 1995-2001 PLT")
- (help-on-help "Hulp voor hulp")
- (help-on-help-details "Voor hulp bij het gebruik van de Hulpbron, klik de link `Help Desk' op de startpagina van de Hulpbron. (Om op die startpagina te komen, klik op de Startknop bovenaan het hulpbronvenster.)")
- (find-docs-for "Zoektekst:") ; <**> - This whole part needs redoing.  The "search" button is at the wrong place for natural Dutch..
- (search "Zoek")
- ; next 3 are popup menu choices at bottom of help desk window
- (search-for-keyword "een trefwoord")
- (search-for-keyword-or-index "een trefwoord of ingang") ; <**>
- (search-for-keyword-or-index-or-text "als trefwoord, Index Entry of tekst") ; <**>
- (exact-match "precies")
- (containing-match "die dit bevat")
- (regexp-match "regexp match")
- (feeling-lucky "Het eerste het beste") ; -- Where does this occur?
- (nothing-found-for-search-key "Niets gevonden voor \"~a\".")
- (searching "Searching...")
- (search-stopped "(Zoeken gestopt.)")
- (search-stopped-too-many-matches "(Zoeken gestopt - te veel treffers.)")
- (reload "Herlaad")
- (help "Help")
- (searching... "Zoeken...")
- (nothing-found-for-empty-search "Gezocht naar niets -- niets gevonden")
- (nothing-found-for "Geen treffers voor ~a")
- (and "en")
- (error-finding-docs "Kan documentatie niet vinden.\n\n~a")
- (manual-installed-date "(geïnstalleerd op ~a)") ; -- assuming ~a is a date.
-
- ;; refreshing manuals
- (refreshing-manuals "Handleidingen opnieuw ophalen")
- (refresh-downloading... "~a ophalen...")
- (refresh-deleting... "Oude versie van ~a verwijderen...")
- (refresh-installing... "Nieuwe versie van ~a installeren...")
-
- ;; help desk htty proxy
- (http-proxy "HTTP Proxy")
- (proxy-direct-connection "Directe vebinding")
- (proxy-use-proxy "Gebruik proxy:")
- (proxy-host "Host")
- (proxy-port "Port")
- (proxy-bad-host "Verkeerde Proxy Host")
-
- ;; browser
- (rewind-in-browser-history "Terug")
- (forward-in-browser-history "Vooruit")
- (home "Start")
- (browser "Browser")
- (choose-browser "Kies een surfer") ; -- translated as Internet browser
- (no-browser "Geen")
- (install? "Installeren?")  ;; if a .plt file is found (title of dialog)
- (you-have-selected-an-installable-package "U hebt een installeerbaar pakket gekozen.")
- (do-you-want-to-install-it? "Wilt u het installeren?")
- (paren-file-size "(Het bestand bevat ~a bytes)")
- (download-and-install "Haal op && Installeer") ;; button label
- (download "Haal op") ;; button label
- (save-downloaded-file/size "Opgehaald bestand (~a bytes) opslaan als") ;; label for get-file dialog
- (save-downloaded-file "Opgehaald bestand opslaan als")  ;; label for get-file dialog
- (downloading "Ophalen") ;; dialog title
- (downloading-file... "Bestand aan het ophalen...")
- (package-was-installed "Het pakket is geïnstalleerd.")
- (download-was-saved "Het opgehaalde bestand is opgeslagen.")
-
- (install-plt-file-menu-item... "Installeer .plt-bestand...")
- (install-plt-file-dialog-title "Installeer .plt-bestand")
- (install-plt-web-tab "Web")
- (install-plt-file-tab "Bestand")
- (install-plt-filename "Bestandsnaam:")
- (install-plt-url "URL:")
- 
- ;; install plt file when opened in drscheme strings
- (install-plt-file "~a installeren of openen ter bewerking?")
- (install-plt-file/yes "Installeer")
- (install-plt-file/no "Bewerk")
- 
- ;;; about box
- (about-drscheme-frame-title "Omtrent DrRacket")
- 
- ;;; save file in particular format prompting.
- (save-as-plain-text "Bestand opslaan als platte tekst?")
- (save-in-drs-format "Bestand opslaan in DrRacket (niet tekst) -vorm?")
- (yes "Ja")
- (no "Nee") ; -- I personally prefer 'Neen', but it seems most younger people don't..
- 
- ;;; preferences
- (preferences "Voorkeuren")
- (error-saving-preferences "Fout bij opslaan voorkeuren: ~a")
- (error-reading-preferences "Fout bij lezen voorkeuren")
- (scheme-prefs-panel-label "Racket")
- (warnings-prefs-panel-label "Waarschuwingen")
- (editor-prefs-panel-label "Bewerken")
- (highlight-parens "Oplichten tussen bijeenhorende haken") ; -- ugly Dutch - should say something completely different, such as "highlight substructure"
- (fixup-parens "Haken corrigeren")
- (flash-paren-match "Knipper bijbehorende haak")
- (auto-save-files "Bestanden automatisch opslaan")
- (backup-files "Reservebestanden")
- (map-delete-to-backspace "Delete naar links") ; -- to be changed if RtoL languages are supported
- (verify-exit "Bevestiging bij afsluiten")
- (ask-before-changing-format "Bevestiging bij opslaan in ander formaat")
- (wrap-words-in-editor-buffers "Wrap words in editor buffers")
- (show-status-line "Toon statusregel")
- (count-from-one "Regels en kolommen tellen vanaf 1") 
- (display-line-numbers "Toon regelnummers (geen letternummers) in buffer") ; -- 'buffer' is not wrong, but unclear
- (enable-keybindings-in-menus "Gebruik sneltoetsen in menus")
- (reuse-existing-frames "Reuse existing frames when opening new files")
- (default-fonts "Verstek-lettertypen")
- 
- ; should have entire alphabet
- (font-example-string "The quick brown fox jumps over lazy dogs.") 
-
- (change-font-button-label "Veranderen") ; or: 'aanpassen' (= adapt)
- (fonts "Lettertypen") ; -- Where is this used?  If context is clear, then just 'typen' is more natural.
-
- ; filled with type of font, eg modern, swiss, etc.
- (choose-a-new-font "Gelieve een nieuw \"~a\" type te kiezen")
-
- (font-size-slider-label "Grootte")
- (restart-to-see-font-changes "Herstart om veranderingen te zien")
-
- (font-prefs-panel-title "Lettertypen")
- (font-name "Naam")
- (font-size "Grootte")
- (set-font "Lettertype instellen...")
- (select-font-name "Kies naam")
- (example-text "Voorbeeldtekst:")
- (only-warn-once "Slechts eenmaal waarschuwen als interacties niet met definitievenster overeenkomen") ; <**> -- The original English seems wrong here.  I translated "interactions" / "definitions" rather than "executions".
- 
- ; warning message when lockfile is around
- (waiting-for-pref-lock "Waiting for the preferences lockfile...") ; <**>
- (pref-lock-not-gone
-  "The preferences lockfile:\n\n   ~a\n\nprevents the preferences from being saved. Ensure that no Racket software is running and delete this file.")
- (still-locked-exit-anyway? "Opslaan voorkeuren mislukt. Toch afsluiten?")
- 
- ;;; indenting preferences panel
- (indenting-prefs-panel-label "Indenteren")
-
- ; filled with define, lambda, or begin
- (enter-new-keyword "Nieuw ~a-achtig trefwoord")
- (x-keyword "~a trefwoord") ; -- Funny in English too, isn't it?  "Begin Keyword"
- (x-like-keywords "~a-achtige trefwoorden")
-
- (expected-a-symbol "verwachtte een symbool, kreeg: ~a")
- (already-used-keyword "Het trefwoord \"~a\" heeft al een speciale indentatie")
- (add-keyword "Toevoegen")
- (remove-keyword "Verwijderen")
- 
- ;;; find/replace
- (find-and-replace "Zoek en vervang")
- (find "Zoek")
- (replace "Vervang")
- (dock "Aanhaken")
- (undock "Zweven")
- (replace&find-again "Vervang && Zoek opnieuw") ;;; need double & to get a single &
- (forward "Voorwaarts")
- (backward "Terug")
- (hide "Sluiten")
- 
- ;;; multi-file-search
- (mfs-multi-file-search-menu-item "Zoek in bestanden...")
- (mfs-string-match/graphics "String match (handles files with graphics)") ; <**>
- (mfs-regexp-match/no-graphics "Regular Expression (alleen platte tekstbestanden)")
- (mfs-searching... "Zoekt...")
- (mfs-configure-search "Zoekinstellingen") ;; dialog title
- (mfs-files-section "Bestanden")   ;; section in config dialog
- (mfs-search-section "Zoek") ;; section in config dialog
- (mfs-dir "Dir")
- (mfs-recur-over-subdirectories "Recursief in mappen")
- (mfs-regexp-filename-filter "Regexp filename filter")
- (mfs-search-string "Zoektekst")
- (mfs-drscheme-multi-file-search "Multi File Search - DrRacket") ;; results window and error message title
- (mfs-not-a-dir "\"~a\" is geen map")
- (mfs-open-file "Bestand openen")
- (mfs-stop-search "Stop met zoeken")
- (mfs-case-sensitive-label "Case sensitive") ; <**>
- (mfs-no-matches-found "Geen treffers.")
- (mfs-search-interrupted "Zoeken afgebroken.")
- 
- ;;; reverting a file
- (are-you-sure-revert "Herladen kan niet ongedaan gemaakt worden.  Toch doen?")
- (are-you-sure-revert-title
-  "Herladen?")
- 
- ;;; saving a file
- ; ~a is filled with the filename
- (error-saving "Fout bij opslaan") ;; title of error message dialog
- (error-saving-file/name "Er trad een fout op bij het opslaan van ~a.")
-
- ;;; finder dialog
- (must-specify-a-filename "You must specify a file name")
- (file-does-not-exist "Bestand \"~a\" bestaat niet.")
- (ask-because-file-exists "Bestand \"~a\" bestaat al. Vervangen?")
- (dne-or-cycle "Bestand \"~a\" bevat een nietbestaande map, of een cykel.") ; -- weird English.  How can a file contain a directory?
- (get-file "Get file") ; <**>
- (put-file "Put file")
- (full-pathname "Volledige padnaam")
- (show-dot-files "Toon ook bestanden en mappen waarvan de naam met een punt begint.")
- (up-directory-button-label "Één map omhoog")
- (add-button-label "Toevoegen") ;;; for multi-file selection
- (add-all-button-label "Alles toevoegen") ;;; for multi-file selection
- (remove-button-label "Verwijderen") ;;; for multi-file selection
- (file-wrong-form "Bestandsnaam heeft niet de juiste vorm.")
- (select-files "Kies bestanden")
- (select-file "Kies bestand")
- (dir-dne "Map bestaat niet.")
- (file-dne "Bestand bestaat niet.")
- (empty-filename "Bestandsnaam moet minstens één letter bevatten.")
- (that-is-dir-name "Dat is de naam van een map.")
- 
- ;;; raw menu names -- these must match the 
- ;;; versions below, once the &s have been stripped.
- ;;; if they don't, DrRacket's menus will appear
- ;;; in the wrong order.
- (file-menu "Bestand")
- (edit-menu "Bewerken")
- (help-menu "Hulp")
- (windows-menu "Vensters")
- 
- ;;; menus
- ;;; - in menu labels, the & indicates a alt-key based shortcut.
- ;;; - sometimes, things are stuck in the middle of 
- ;;; menu item labels. For instance, in the case of
- ;;; the "Save As" menu, you might see: "Save Definitions As". 
- ;;; be careful of spacing, follow the English, if possible.
- ;;; - the ellipses in the `after' strings indicates that
- ;;; more information is required from the user before completing
- ;;; the command.
-
- (file-menu-label "&Bestand")
-
- (new-info  "Open nieuw bestand")
- (new-menu-item "&Nieuw")
- (new-...-menu-item "&Nieuw...")
-
- (open-info "Open bestand van schijf")
- (open-menu-item "&Open...")
-
- (open-recent-info "Onlangs geopende bestanden")
- (open-recent-menu-item "Open opnieuw")
- 
- (revert-info "Negeer de gemaakte wijzigingen, en herlaad het bestand")
- (revert-menu-item "&Herlaad")
-
- (save-info "Sla dit bestand op een schijf op")
- (save-menu-item "O&pslaan")
-
- (save-as-info "Vraag om een naam en sla dit bestand onder die naam op")
- (save-as-menu-item "Ops&laan als...")
-
- (print-info "Stuur dit bestand naar een printer")
- (print-menu-item "Af&drukken...")
-
- (close-info "Sluit dit bestand")
- (close-menu-item "&Sluiten")
-
- (quit-info "Sluit alle vensters")
- (quit-menu-item-windows "&Afsluiten")
- (quit-menu-item-others "&Afsluiten")
- 
- (edit-menu-label "Be&werken")
- 
- (undo-info "Maak de laatste actie ongedaan")
- (undo-menu-item "&Ongedaan maken")
-
- (redo-info "Voer de als laatste ongedaangemaakte actie alsnog uit")
- (redo-menu-item "Opnieuw &uitvoeren") ;<**> - does the & have the correct position?
-
- (cut-info "Verplaats de selectie naar het klembord")
- (cut-menu-item "K&nippen")
-
- (copy-info "Kopieer de selectie naar het klembord")
- (copy-menu-item "&Kopiëren")
-
- (paste-info "Kopieer de inhoud van het klembord naar de plaats van de cursor")
- (paste-menu-item "&Plakken")
-
- (clear-info "Gooi de selectie weg")
- (clear-menu-item-windows "&Wissen")
-
- (select-all-info "Selecteer het gehele document")
- (select-all-menu-item "Selecteer a&lles")
- 
- (find-info "Zoek tekst in het document")
- (find-menu-item "Zoek...")
-
- (find-again-info "Zoek verder naar dezelfde tekst")
- (find-again-menu-item "Zoek nogmaals")
- 
- (replace-and-find-again-info "Vervang de huidige selectie, en zoek verder")
- (replace-and-find-again-menu-item "Vervang && Zoek nogmaals")
-
- (preferences-info "Stel uw voorkeuren in")
- (preferences-menu-item "Voorkeuren...")
-
- (keybindings-info "Toon de huidige toetsbetekenissen")
- (keybindings-menu-item "Toetsbetekenissen")
- (keybindings-frame-title "Toetsbetekenissen")
- (keybindings-sort-by-name "Op betekenis")
- (keybindings-sort-by-key "Op toets")
-
- (insert-text-box-item "Tekst")
- (insert-image-item "Plaatje...")
- (insert-comment-box-menu-item-label "Commentaarblok")
- (wrap-text-item "Wrap Text") ; <**>
- (wrap-text-item "Wrap Text")
-
-
- (windows-menu-label "&Vensters")
- (bring-frame-to-front "Kies venster")       ;;; title of dialog
- (bring-frame-to-front... "Kies venster...") ;;; corresponding title of menu item
-
- (view-menu-label "&Tonen")
- (show-overview "Overzicht") 
- (hide-overview "Geen Overzicht")
-
- (help-menu-label "&Hulp")
- (about-info "Credits and details for this application") ; <**>
- (about-menu-item "Info...")
- 
- ;;; help-desk-specific menus
- (new-help-desk "Nieuwe Hulpbron")
-
- ;; open here's new menu item
- (create-new-window-or-clear-current
-  "Wilt u een nieuw venster openen, of het huidige wissen?")
- (clear-current "Wis huidig")
- (new-window "Open nieuw")
-
- ;;; exiting and quitting ``are you sure'' dialog
- ;;; (exit is used on windows, quit on macos, in English. Other
- ;;; languages probably use the same word on both platforms.
- (exit "Afsluiten")
- (quit "Afsluiten")
- (are-you-sure-exit "Weet u zeker dat u wilt afsluiten?")
- (are-you-sure-quit "Weet u zeker dat u wilt afsluiten?")
- 
- ;;; autosaving
- (error-autosaving "Fout bij automatisch opslaan van \"~a\".")
- (autosaving-turned-off "Automatisch opslaan uitgezet tot\nhet bestand handmatig is opgeslagen.")
- 
- ;;; file modified warning
- (file-has-been-modified
-  "Sinds de laatste opslag is dit bestand gewijzigd.  Veranderingen overschrijven?")
- (overwrite-file-button-label "Overschrijven")
- 
- (definitions-modified
-  "Het bestand met de definities is gewijzigd.  Gelieve op te slaan of te herladen.")
- (drscheme-internal-error "Interne Fout van DrRacket")
- 
- ;;; tools <**>
- (invalid-tool-spec "The tool specification in collection ~a's info.rkt file is invalid. Expected either a string or a non-empty list of strings, got: ~e")
- (error-invoking-tool-title "Error invoking tool ~s;~s")
- (tool-tool-names-same-length
-  "expected `tool-names' and `tools' to be lists of the same length, in info.rkt file for ~s, got ~e and ~e")
- (tool-tool-icons-same-length
-  "expected `tool-icons' and `tools' to be lists of the same length, in info.rkt file for ~s, got ~e and ~e")
- (error-getting-info-tool
-  "error loading info.rkt file for ~s")
- (tool-error-phase1 "Error in phase 1 for tool ~s; ~s")
- (tool-error-phase2 "Error in phase 2 for tool ~s; ~s")
-
-
- ;;; define popup menu
- (end-of-buffer-define "<< buffereinde >>")
- (sort-by-name "Sorteer op naam")
- (sort-by-position "Sorteer op positie in bestand")
- (no-definitions-found "<< geen definities gevonden >>")
- (jump-to-defn "Spring naar definitie van ~a")
-
- (recent-items-sort-by-age "Sorteer op leeftijd")
- (recent-items-sort-by-name "Sorteer op naam")
- 
- ;;; show menu
- (hide-definitions-menu-item-label "Geen &Definities")
- (show-definitions-menu-item-label "&Definities")
- (definitions-menu-item-help-string "Toon het definitievenster al dan niet")
- (show-interactions-menu-item-label "&Interacties")
- (hide-interactions-menu-item-label "Geen &Interacties niet")
- (interactions-menu-item-help-string "Toon het interactievenster al dan niet")
- 
- ;;; file menu
- (save-definitions-as "Definities ops&laan als...")
- (save-definitions "Definities opslaan")
- (print-definitions "Definitions af&drukken...")
- (about-drscheme "Omtrent DrRacket")
- (save-other "Anderszins opslaan")
- (save-definitions-as-text "Definities opslaan als tekst...")
- (save-interactions "Interacties opslaan")
- (save-interactions-as "Interacties opslaan als...")
- (save-interactions-as-text "Interacties opslaan als tekst...")
- (print-interactions "Interacties afdrukken...")
- 
- ;;; edit-menu
- (split-menu-item-label "&Splits")
- (collapse-menu-item-label "V&oeg samen")
- 
- ;;; language menu
- (language-menu-name "&Taal")
- 
- ;;; scheme-menu
- (scheme-menu-name "Ra&cket")
- (execute-menu-item-label "Doen!")
- (execute-menu-item-help-string "Voer het programma in het definitievenster uit")
- (break-menu-item-label "Onderbreken")
- (break-menu-item-help-string "Onderbreek de huidige berekening")
- (kill-menu-item-label "Beëindigen")
- (kill-menu-item-help-string "Beëindig de huidige berekening")
- (clear-error-highlight-menu-item-label "Verwijder foutkleur")
- (clear-error-highlight-item-help-string "Verwijdert de roze kleur die de fout aangeeft")
- (reindent-menu-item-label "He&rindenteer")
- (reindent-all-menu-item-label "Herindenteer &Alles")
- (comment-out-menu-item-label "&Commentarieer weg")
- (uncomment-menu-item-label "&Verwijder commentaartekens") ; -- Sorry, couldn't keep the &U..
- 
- ;;; executables
- (create-executable-menu-item-label "Maak Exe...")
- (create-executable-title "Maak Exe")
- (must-save-before-executable "You must save your program before creating an executable.")
- (definitions-not-saved "The definitions window has not been saved. The executable will use the latest saved version of the definitions window. Continue?")
- (launcher "Launcher")
- (stand-alone "Stand-alone")
- (executable-type "Type")
- (executable-base "Base")
- (filename "Bestandsnaam: ")
- (create "Maak")
- ;; "choose-an-executable" changed to "specify-a"
- ;(please-choose-an-executable-filename "Kies een bestandsnaam voor het programma.")
- 
- (create-servlet "Maak Servlet...")
-  
- ;;; buttons
- (execute-button-label "Doen!") 
- (save-button-label "Opslaan")
- (break-button-label "Onderbreken")
- 
- ;;; search help desk popup menu
- (search-help-desk-for "Zoek hulp omtrent \"~a\"")
- (exact-lucky-search-help-desk-for "Geef hulp omtremt \"~a\"")
-
- ;; collapse and expand popup menu items
- (collapse-sexp "S-expressie samenvouwen")
- (expand-sexp "S-expressie ontvouwen")
- 
- ;;; fraction dialog
- (enter-fraction "Geef breuk")
- (whole-part "Gehelen")
- (numerator "Teller")
- (denominator "Noemer")
- (invalid-number "Onjuist getal: moet exact, reëel, en niet geheel zijn.")
- (insert-fraction-menu-item-label "Breuk...")
-
- ;; number snip popup menu
- (show-decimal-expansion "Toon als decimaal getal")
- (show-more-decimal-places "Toon meer decimalen")
- 
- ;;; Teachpack messages
- (select-a-teachpack "Kies een lespakket")
- (clear-teachpack "Verwijder lespakket ~a")
- (teachpack-error-label "DrRacket - fout in lespakket") ; -- translated as "error in Teachpack".
- (teachpack-didnt-load "Lespakket ~a niet correct geladen.")
- (add-teachpack-menu-item-label "Lespakket toevoegen...")
- (clear-all-teachpacks-menu-item-label "Alle lespakketten verwijderen")
- (teachpack-not-only-one-import "Lespakket unit/sig in ~a moet precies één 'import' hebben.") ; <**> -- ??
- (drscheme-teachpack-message-title "DrRacket-lespakket")
- (already-added-teachpack "Lespakket ~a al aanwezig")
- 
- ;;; Language dialog
- (introduction-to-language-dialog
-  "Kies een taal.  De verstekwaarde is normaliter de juiste voor beginnende cursisten.")
- (language-dialog-title "Taal instellen")
- (case-sensitive-label "Verschil tussen hoofd- en kleine letters") ; -- ugly
- (output-style-label "Uitvoerstijl")
- (constructor-printing-style "Constructor")
- (quasiquote-printing-style "Quasiquote")
- (write-printing-style "write")
- (sharing-printing-label "Geef weerkerende delen in uitvoer aan")
- (use-pretty-printer-label "Toon uitvoer netjes over meer regels") ; -- maybe rather: 'show indented'?
- (input-syntax "Invoersyntaxis")
- (dynamic-properties "Dynamische eigenschappen")
- (output-syntax "Uitvoersyntaxis")
- (no-debugging-or-profiling "Geen ontwikkelhulp")
- (debugging "Alleen foutvinden")
- (debugging-and-profiling "Foutvinden en klokken")
- (show-details-button-label "Toon details")
- (hide-details-button-label "Toon details niet")
- (choose-language-menu-item-label "Kies taal...")
- (revert-to-language-defaults "Herstel verstekwaarden")
- (fraction-style "Breukweergave")
- (use-mixed-fractions "Gemengde breuken")
- (use-repeating-decimals "Repeterende breuken")
- (decimal-notation-for-rationals "Schrijf breuken decimaal")
- (please-select-a-language "Kies een taal")
-
- 
- ;;; languages
- (beginning-student "Beginner")
- (beginning-one-line-summary "define, cond, structs, constanten, en primitieven")
- (beginning-student/abbrev "Beginner, met lijstnotatie")
- (beginning/abbrev-one-line-summary "Beginner, maar lijsten worden met lijstnotatie afgedrukt")
- (intermediate-student "Middenmoot")
- (intermediate-one-line-summary "Beginner, plus lexikaal bereik")
- (intermediate-student/lambda "Middenmoot, plus lambda")
- (intermediate/lambda-one-line-summary "Middenmoot, plus hogere-ordefuncties")
- (advanced-student "Gevorderde")
- (advanced-one-line-summary "Middenmoot, plus lambda en mutatie")
- (how-to-design-programs "How to Design Programs") ;; should agree with MIT Press on this one...
- (pretty-big-scheme "Vrij groot")
- (pretty-big-scheme-one-line-summary "Inclusief syntaxis and functies van de HtDP-talen")
- (r5rs-language-name "R5RS")
- (r5rs-one-line-summary "R5RS, kaal")
- (unknown-debug-frame "[onbekend]")
- 
- ;(module-language-one-line-summary "Execute creates a REPL in the context of the module, including the module's declared language")
-  
- ;;; debug language
- (backtrace-window-title "Spoor - DrRacket")
- (files-interactions "~a's interacties") ;; filled with a filename
- (current-interactions "interacties")
- (current-definitions "definities")
- (mzscheme-w/debug "Enkel tekst (MzScheme, omvat R5RS)")
- (mzscheme-one-line-summary "PLTs onderliggende Scheme")
- (mred-w/debug "Grafisch (MrEd, bevat MzScheme)")
- (mred-one-line-summary "MzScheme met een grafische schil")
-
- ;; profiling
- (profiling-low-color "Laag")
- (profiling-high-color "Hoog")
- (profiling-choose-low-color "Kies een onderkleur")
- (profiling-choose-high-color "Kies een bovenkleur")
- (profiling "Klokken")
- (profiling-example-text "(define (jippie) (jippie))")
- (profiling-color-config "Kleurbereik")
- (profiling-scale "Kleurschaling")
- (profiling-sqrt "Vierkantswortel")
- (profiling-linear "Lineair")
- (profiling-square "Kwadratisch")
- (profiling-number "Aantal aanroepen")
- (profiling-time "Totaaltijd")
- (profiling-clear "Wis klokgegevens")
- (profiling-update "Werk klokgegevens bij")
- (profiling-col-percent-time "% Tijd")
- (profiling-col-function "Functie")
- (profiling-col-time-in-msec "Msec")
- (profiling-col-calls "Aanroepen")
- (profiling-show-profile "Klokgegevens")
- (profiling-hide-profile "Geen Klokgegevens")
- (profiling-unknown-src "<< onbekend >>")
- (profiling-no-information-available "Er zijn geen klokgegevens.  Deze zijn enkel beschikbaar als klokken in uw taal aanstaat, en u uw programma al gedraaid hebt.")
-
- (profiling-clear? "Veranderingen in het definitievenster maken de klokgegevens ongeldig.  Toch doorgaan?")
- 
- ;;; repl stuff
- (evaluation-terminated "Berekening gestopt")
- (evaluation-terminated-explanation
-  "De rekenthread loopt niet meer, dus tot de volgende uitvoering kan geen berekening plaatsvinden.")
- (last-stack-frame "toon top van de stapel")
- (last-stack-frames "toon top ~a van de stapel")
- (next-stack-frames "toon volgende ~a van de stapel")
- 
- ;;; welcoming message in repl
- (language "Taal")
- (custom "aangepast")
- (teachpack "Lespakket")
- (welcome-to "Welkom bij")
- (version "versie")
- 
- ;;; kill evaluation dialog
- (kill-evaluation? "Wilt u de berekeing beëindigen?")
- (just-break "Enkel onderbreken")
- (kill "Beëindigen")
- (kill? "Beëindigen?")
-
- ;;; version checker
- (version:update-menu-item "Recentere versies...")
- (version:update-check "Versie bijwerken")
-
- ;; special menu
- (special-menu "Invoegen")
- 
- ;; large semi colon letters
- (insert-large-letters... "Krantenkop")
- (large-semicolon-letters "Puntkommaletters")
- (text-to-insert "Invoegtekst")
-
- (module-browser-filename-format "Complete bestandsnaam: ~a (~a lines)")
- (module-browser-root-filename "Root Filename: ~a")
- (module-browser-font-size-gauge-label "Lettergrootte")
- (module-browser-progress-label "Module overview progress")
- (module-browser-adding-file "Toevoegen bestand: ~a...")
- (module-browser-laying-out-graph-label "Opmaken graaf")
- (module-browser-open-file-format "Open ~a")
- (module-browser "Modulekiezer") ;; frame title
- (module-browser... "Vind module...") ;; menu item title
- (module-browser-error-expanding "Error expanding the program:\n\n~a")
-
- (happy-birthday-matthias "Lang zal Matthias leven!")
-
- (mrflow-using-default-language-title "Verstektaal gebruikt")
- (mrflow-using-default-language "Er bestaat geen typetabel voor de primitieven van uw huidige taal.  Gelieve R5RS te gebruiken.")
- (mrflow-button-title "Analyseer")
- ;(mrflow-unknown-style-delta-error-title "Unknown Box Style Delta")
- ;(mrflow-unknown-style-delta-error "Unknown box style delta: ~a")
- (mrflow-popup-menu-show-type "Toon type")
- (mrflow-popup-menu-hide-type "Toon type niet")
- (mrflow-popup-menu-show-errors "Toon fouten")
- (mrflow-popup-menu-hide-errors "Toon fouten niet")
- (mrflow-popup-menu-tack-all-arrows "Alle pijlen vast")
- (mrflow-popup-menu-untack-all-arrows "Alle pijlen los")
- ;(mrflow-read-exception-title "Read Exception")
- ;(mrflow-read-exception "Read exception: ~a")
- ;(mrflow-syntax-exception-title "Syntax Exception")
- ;(mrflow-syntax-exception "Syntax exception: ~a")
- ;(mrflow-unknown-exception-title "Unknown Exception")
- ;(mrflow-unknown-exception "Unknown exception: ~a")
- ;(mrflow-language-primitives-error-title "Fout in basisfuncties")
- ;(mrflow-language-primitives-error "Onjuiste bestandsnaam voor typentabel basisfuncties: ~a")
-
- (xml-tool-insert-xml-box "XMLblok")
- (xml-tool-insert-scheme-box "Racketblok")
- (xml-tool-insert-scheme-splice-box "Racket Splice Box")
- (xml-tool-xml-box "XML Box")
- (xml-tool-scheme-box "Racket Box")
- (xml-tool-scheme-splice-box "Racket Splice Box")
- (xml-tool-switch-to-scheme "Switch to Racket box")
- (xml-tool-switch-to-scheme-splice "Switch to Racket splice box")
- (xml-tool-eliminate-whitespace-in-empty-tags
-  "Verwijder wit in lege tags") ; <**> - don't know the official Dutch for 'tag' here..
- (xml-tool-leave-whitespace-alone "Laat wit staan")
- 
- (show-recent-items-window-menu-item "Toon onlangs geopende bestanden in een apart venster")
- (show-recent-items-window-label "Onlangs geopende bestanden")
- (number-of-open-recent-items "Aantal recente items")
- (switch-anyway "Toch van bestand wisselen")
-
- (stepper-program-has-changed "WAARSCHUWING: Programma is veranderd.")
- (stepper-program-window-closed "WAARSCHUWING: Programmavenster is weg.")
- )
-
-
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/english-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/english-string-constants.rkt
deleted file mode 100644
index bf3fc651da..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/english-string-constants.rkt
+++ /dev/null
@@ -1,1927 +0,0 @@
-#|
-
-When modifying the string constants files,
-please adhere to these guidelines:
-
-- All the entries in english-string-constants.rkt have the same format
-  (name string).  If the purpose of an entry you are adding to the
-  file is not clear from just the name and string, put a comment next
-  to the entry explaining what the string is going to be used for and
-  in what context.
-  That's especially true for strings that contain things like "~a".
-  Systematically describe what the "~a" is going to be replaced with.
-  When we have to translate strings like "deleting ~a", we translators
-  need to know what "~a" is going to be (in particular, in some
-  languages like French, we need to know whether the "~a" is going to
-  be a masculine or feminine word, or whether it's going to be
-  singular or plural, etc).
-
-- When adding a bunch of new entries, put together in a section the
-  entries that logically belong together.  Give a title to your
-  section, so we have an idea of what the strings are for.  Don't mix
-  in the same section strings that have nothing to do with each other,
-  that's only going to confuse us.  Do not start a new section if
-  there's already one that deals with the same thing.  Dumping all the
-  new entries in random order at the end of the file is not a good way
-  to have your new entries translated in a timely manner...
-
-- Before adding strings for your new pet tool, check whether you can't
-  re-use strings that already exist.  There's no need for yet another
-  "Ok" string...
-
-- If you modify an existing string in english-string-constants.rkt, go
-  through all the *-string-constants.rkt files for the other languages,
-  comment out the old version of the modified string in each of these
-  files, and put a short comment there telling us the English string
-  has changed and needs to be re-translated.  Do not erase the old
-  version, it might help us translate the new one.  Do not move it
-  either.  Just comment it out and add the short comment.  After the
-  next git update DrRacket will automatically tell us translators that
-  a new string needs to be translated, we will find your comment in
-  the file, and know what to do.
-	Some evil evil people might think that, since DrRacket automatically
-  informs us of new strings to be translated, an easier thing to do
-  when modifying an existing string would be to simply rename it at
-  the same time.  This works, except that if you do that, we
-  translators will get two warnings from DrRacket:
-		language english had but french does not:
-		(new-name "New String")
-		language french had but english does not:
-		(old-name "Old String")
-  then we translators will be left to wonder whether the two things
-  are related or not, and whether we can safely base our translation
-  of "New String" on the translation of "Old String" (since the two
-  strings are likely to be close in meaning).  Worse, we might not
-  even realize the two strings are related and translate "New String"
-  from scratch, just to realize later that it's only a variation of
-  "Old String".  I can tell you that nothing pisses off a translator
-  more than having to translate pretty much the same string twice
-  just because *you* were too lazy to inform us that it was just a
-  slight modification to an existing string rather than an entirely
-  new one.  Conclusion: do not change the name of a string unless you
-  have some really good reason to do so.
-
-- Please think hard before choosing a string and make sure it means
-  what you want it to mean.  That way you won't have to change it
-  later, and we won't have to retranslate it.
-
-- Please think hard before choosing the name for a string.  Use
-  meaningful names.  "error" or "ok" are not meaningful names.  Prefix
-  all related names with a common prefix (the name of your tool or
-  module).  String names are not the right place to save on typing.
-
-- If, for some reason, you really have to change the name of a string
-  (like, because the original name you gave it really sucked...),
-  change the name of the string in *ALL* the *-string-constants.rkt
-  files.  That's a modification you can do without the help of a
-  translator, so do it yourself.  It's not the job of the translators
-  to clean up your naming mess for you.  Besides, you are the one who
-  knows what you changed, so leaving the translators having to guess
-  what you did is Not Nice(tm).
-
-- If, for some reason, you need to remove a string (i.e. you changed
-  your code and don't need the string anymore), remove the string in
-  *ALL* the *-string-constants.rkt files.  Again, you don't need the
-  help of a translator to do that.  If you're not sure whether you
-  might need the string in the future or not, just comment it out in
-  *ALL* the files.
-
-|#
-
-(module english-string-constants "string-constant-lang.rkt"
- ;;; when translating this constant, substitute name of actual language for `English'
- (is-this-your-native-language "Is English Your Native Language?")
-
- (are-you-sure-you-want-to-switch-languages
-  "This will change the language of the GUI, which requires you to restart DrRacket. Are you sure?")
-
- (interact-with-drscheme-in-language "Interact with DrRacket in English")
-
- ;; these two should probably be the same in all languages excepet English.
- ;; they are the button labels (under macos and windows, respectively)
- ;; that go the with the string above.
- (accept-and-quit "Accept and Quit")
- (accept-and-exit "Accept and Exit")
- 
- ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
- (plt "PLT")
- (drscheme "DrRacket")
- (drracket "DrRacket")
- (ok "OK")
- (cancel "Cancel")
- (abort "Abort")
- (untitled "Untitled")
- (untitled-n "Untitled ~a")
- (warning "Warning")
- (error "Error")
- (close "Close") ;; as in, close an open window or tab. must match close-menu-item
-                 ;; in the sense that, when the &s have been stripped from
-                 ;; close-menu-item, it must be the same string as this.
- (close-window "Close Window")
- (stop "Stop")   
- (&stop "&Stop") ;; for use in button and menu item labels, with short cut.
- (are-you-sure-delete? "Are you sure you want to delete ~a?") ;; ~a is a filename or directory name
- (are-you-sure-replace? "Are you sure you want to replace ~a?") ;; ~a is a filename or directory name
- (ignore "Ignore")
- (revert "Revert")
-
- ;; label for a generic check box, often supported on dialogs
- ;; that ask a binary choice of the user. If checked, the
- ;; dialog isn't going to be shown again.
- ;; One version for always using the current choice:
- (dont-ask-again-always-current "Do not ask again (always use current choice)")
- ;; One generic version (ie, on the Quit DrRacket dialog)
- (dont-ask-again                "Do not ask again")
-
- ;;; important urls
- (web-materials "Related Web Sites") ;; menu item title
- (tool-web-sites "Tool Web Sites")   ;; menu item title
- (plt-homepage "Racket")
- (pbd-homepage "Program by Design")
-
- ;;; bug report form
- (cancel-bug-report? "Cancel Bug Report?")
- (are-you-sure-cancel-bug-report?
-  "Are you sure that you want to cancel sending this bug report?")
- (do-you-want-to-discard-or-save-this-bug-report
-  "Do you want to discard or save this bug report?")
- (discard "Discard") ;; a button label for a dialog box with the above question
- (bug-report-form "Bug Report Form")
- (bug-report-field-name "Name")
- (bug-report-field-email "Email")
- (bug-report-field-summary "Summary")
- (bug-report-field-severity "Severity")
- (bug-report-field-class "Class")
- (bug-report-field-description "Description")
- (bug-report-field-reproduce1 "Steps to")
- (bug-report-field-reproduce2 "Reproduce")
- (bug-report-field-environment "Environment")
- (bug-report-field-docs-installed "Docs Installed")
- (bug-report-field-collections "Collections")
- (bug-report-field-links "Links")  ;; from 'raco link'
- (bug-report-field-human-language "Human Language")
- (bug-report-field-memory-use "Memory Use")
- (bug-report-field-version "Version")
- (bug-report-synthesized-information "Synthesized Information")  ;; dialog title
- (bug-report-show-synthesized-info "Show Synthesized Info")
- (bug-report-submit "Submit")
- (close-and-save-bug-report "Close && Save") ;; button in bug report dialog, next to cancel and bug-report-submit
- (bug-report-submit-menu-item "Submit Bug Report...")  ;; same as above, but used when there are saved bug reports
- (saved-bug-reports-menu-item "Saved Bug Reports") ;; in Help Menu, submenu title
- (disacard-all-saved-bug-reports "Discard All Saved Bug Reports") ;; menu item: only shows up when there is more than one saved bug report
- (no-saved-bug-reports "No bug reports have been saved") ;; an info message that shows up as a disabled menu item when no saved bug reports are around
- (new-bug-report "New Bug Report") ;; button label the user sees when there are saved bug reports, but the user asks to save another one.
- (close-and-save "Close and Save") ;; button on the bottom of the bug report form
- (saved-unsubmitted-bug-reports "Saved, unsubmitted bug reports:") 
-  ;; the above string constant is next to previous line in same dialog, followed by list of bug report subjects (as buttons)
- (error-sending-bug-report "Error Sending Bug Report")
- (error-sending-bug-report-expln
-  "An error occurred when sending this bug report."
-  " If your internet connection is otherwise working fine, please visit:\n\n    http://bugs.racket-lang.org/\n\nand"
-  " submit the bug via our online web-form. Sorry for the difficulties.\n\nThe error message is:\n~a")
- (illegal-bug-report "Illegal Bug Report")
- (pls-fill-in-field "Please fill in the \"~a\" field")
- (malformed-email-address "Malformed email address")
- (pls-fill-in-either-description-or-reproduce "Please fill in either the Description field or the Steps to Reproduce field.")
-
- ;;; check syntax
- (check-syntax "Check Syntax")
- (cs-italic "Italic")
- (cs-bold "Bold")
- (cs-underline "Underline")
- (cs-change-color "Change Color")
- (cs-foreground-color "Foreground Color")
- (cs-background-color "Background Color")
- (cs-tack/untack-arrow "Tack/Untack Arrow(s)")
- (cs-jump-to-next-bound-occurrence "Jump to Next Bound Occurrence")
- (cs-jump-to-previous-bound-occurrence "Jump to Previous Bound Occurrence")
- (cs-jump-to-binding "Jump to Binding Occurrence")
- (cs-jump-to-definition "Jump to Definition (in Other File)")
- (cs-open-defining-file "Open Defining File")
- (cs-error-message "Error Message")
- (cs-open-file "Open ~a")
- (cs-rename-var "Rename ~a")
- (cs-rename-id "Rename Identifier")
- (cs-rename-var-to "Rename ~a to:")
- (cs-name-duplication-error "The new name you have chosen, ~s, conflicts with an already established name in this scope.")
- (cs-rename-anyway "Rename Anyway")
- (cs-status-init "Check Syntax: Initializing environment for user code")
- (cs-status-coloring-program "Check Syntax: coloring expression")
- (cs-status-eval-compile-time "Check Syntax: eval compile time")
- (cs-status-expanding-expression "Check Syntax: expanding expression")
- (cs-status-loading-docs-index "Check Syntax: loading documentation index")
- (cs-mouse-over-import "binding ~s imported from ~s")
- (cs-view-docs "View documentation for ~a")
- (cs-view-docs-from "~a from ~a")  ;; a completed version of the line above
-  ;; (cs-view-docs) is put into the first ~a and a list of modules (separated by commas) 
-  ;; is put into the second ~a. Use check syntax and right-click on a documented variable (eg, 'require') to see this in use
-  
- (cs-lexical-variable "lexical variable")
- (cs-set!d-variable "set!’d variable")
- (cs-imported-variable "imported variable")
- (cs-unused-require "unused require")
- (cs-free-variable "free variable")
-
-  (cs-binder-count "~a binding occurrences")
-  (cs-zero-varrefs "no bound occurrences")
-  (cs-one-varref "1 bound occurrence")
-  (cs-n-varrefs "~a bound occurrences") ;; expected to have one ~a formatter that will accept a number
-  
-  (cs-contract-my-obligation "Contract: this module's obligation")
-  (cs-contract-their-obligation "Contract: clients modules' obligation")
-  (cs-contract-both-obligation "Contract: both this module and client modules' obligation")
-  (cs-contract-unk-obligation "Contract: unknown obligation")
-  
-  ;; mode sub-menu in the "view" menu
-  (cs-check-syntax-mode "Check Syntax Mode")
-  (cs-mode-menu-show-my-obligations "My Contract Obligations")
-  (cs-mode-menu-show-client-obligations "Client Contract Obligations")
-  (cs-mode-menu-show-syntax "Syntactic Categories")
-  
-  ;; the documentation blue boxes in the upper-right corner of the drracket window
-  (sc-read-more... "read more ...")
-  (sc-f2-to-un/lock "f2 to (un)lock")
-  
- ;; the online check syntax status messages (mouse over the bottom right of drracket's window to see the messages during online expansion's various phases)
- (online-expansion-running "Background expansion running")
- (online-expansion-only-raw-text-files-supported "Only pure text files supported")
- (online-expansion-abnormal-termination "Background expansion terminated abnormally")
- (online-expansion-abnormal-termination-out-of-memory "Background expansion terminated abnormally (out of memory)")
- (online-expansion-finished-successfully "Background expansion finished successfully")
-  
- (jump-to-error "Jump to Error")
- (online-expansion-is-disabled "Background expansion is disabled")
- ; these next two show up in the bar along the bottom of the drracket window
- (online-expansion-pending "Background expansion pending ...")
- (online-expansion-finished "Background expansion finished") ;; note: there may still be errors in this case
- ; the next two show up in a menu when you click on the circle in the bottom right corner
- (disable-online-expansion "Disable background expansion")
- (enable-online-expansion "Enable background expansion")
- ;; the online expansion preferences pane
- (online-expansion "Background expansion") ;; title of prefs pane
- ; the different kinds of errors
- (online-expansion-show-read-errors-as "Show read-level errors")
- (online-expansion-show-variable-errors-as "Show unbound identifier errors")
- (online-expansion-show-other-errors-as "Show other errors")
- ; locations the errors can be shown
- (online-expansion-error-gold-highlight "with gold highlighting")
- (online-expansion-error-margin "in the margin")
- ; the label of a preference in the (string-constant online-expansion) section
- (show-arrows-on-mouseover "Show binding and tail-position arrows on mouseover")
- (show-blueboxes "Show blue boxes and blue box arrow semi-circle")
- ;;; info bar at botttom of drscheme frame
- (collect-button-label "GC")
-  (read-only "Read only")
- (auto-extend-selection "Auto-extend")
- (overwrite "Overwrite")
- (running "running")
- (not-running "not running")
-  
-  (install-package-button "Install ~a") ;; button label: ~a is filled with the name of a pkg
-  (update-catalog "Update Catalog") ;; button label; shown when there is a missing module, but no matching package
-  (updating-catalog-from "Updating from ~a...") ;; message label; used as a status message when updating the pkg catalog
-  
- ;;; misc
- (welcome-to-something "Welcome to ~a")
- 
- ; this appears in the drscheme about box.
- (welcome-to-drscheme-version/language "Welcome to DrRacket, version ~a, ~a")
-
- ; these appear on subsequent lines in the `Help|Welcome to DrRacket' dialog.
- (welcome-to-drscheme "Welcome to DrRacket")
-
- (goto-line "Goto line")
- (goto-line-invalid-number
-  "~a is not a valid line number. It must be an integer between 1 and ~a")
- (goto-position "Goto Position")
- (no-full-name-since-not-saved
-  "The file does not have a full name because it has not yet been saved.")
- (cannot-open-because-dne "Cannot open ~a because it does not exist.")
-
-  (needs-execute-language-changed
-   "WARNING: The language has changed. Click Run.")
-  (needs-execute-teachpack-changed
-   "WARNING: The teachpacks have changed. Click Run.")
-  (needs-execute-defns-edited
-   "WARNING: The definitions window has changed. Click Run.")
-  
-  (editor-changed-since-srcloc-recorded
-   "This editor has been changed since the source location was recorded, so the highlighted region may no longer correspond to the correct source location.")
-  
- (file-is-not-saved "The file \"~a\" is not saved.")
- (save "Save")
- (close-anyway "Close Anyway")
- (dont-save "Don't Save")
- (clear-anyway "Clear Anyway")
-
- ;; menu item title
- (log-definitions-and-interactions "Log Definitions and Interactions...")
- (stop-logging "Stop Logging")
- (please-choose-a-log-directory "Please choose a log directory")
- (logging-to "Logging to: ")
- (erase-log-directory-contents "Erase contents of log directory: ~a?")
- (error-erasing-log-directory "Error erasing log directory contents.\n\n~a\n")
-
-  ;; menu items connected to the logger -- also in a button in the planet status line in the drs frame
-  (show-log "Show &Log")
-  (hide-log "Hide &Log")
-  (logger-scroll-on-output "Scroll on output") ; a checkbox in the logger pane
-  (log-messages "Log Messages") ;; label for the drracket logging gui panel
-  
- ;; modes
- (mode-submenu-label "Modes")
- (scheme-mode "Scheme mode")
- (racket-mode "Racket mode")
- (text-mode "Text mode")
-
- (scheme-mode-color-symbol "Symbol")
- (scheme-mode-color-keyword "Keyword")
- (scheme-mode-color-comment "Comment")
- (scheme-mode-color-string "String")
- (scheme-mode-color-text "Text")
- (scheme-mode-color-constant "Constant")
- (scheme-mode-color-parenthesis "Parenthesis")
- (scheme-mode-color-hash-colon-keyword "#:Keyword")
- (scheme-mode-color-error "Error")
- (scheme-mode-color-other "Other")
- ;; the ~a is filled in with one of the above (scheme-mode-*)
- (syntax-coloring-choose-color "Choose a color for ~a")
- (preferences-colors "Colors") ;; used in the preferences dialog
- 
-  ;; parenthesis color scheme string constants
-  (parenthesis-color-scheme "Parenthesis color scheme") ;; label for the choice% menu in the preferences dialog
-  (paren-color-basic-grey "Basic grey")
-  (paren-color-shades-of-gray "Shades of grey")
-  (paren-color-shades-of-blue "Shades of blue")
-  (paren-color-spring "Spring")
-  (paren-color-fall "Fall")
-  (paren-color-winter "Winter")
-
-  
- (url: "URL:")
- (open-url... "Open URL...")
- (open-url "Open URL")
- (browse... "Browse...")
- (bad-url "Bad URL")
- (bad-url:this "Bad URL: ~a")
- 
- ;; Help Desk
- (help "Help")
- (racket-documentation "Racket Documentation")
- (help-desk "Help Desk")
- (plt:hd:search "Search")
- (plt:hd:feeling-lucky "Feeling Lucky")
- (plt:hd:home "Help Desk home") 
- ; next 3 are popup menu choices in help desk search frame
- (plt:hd:search-for-keyword "Keyword entry")
- (plt:hd:search-for-keyword-or-index "Keyword or index entry")
- (plt:hd:search-for-keyword-or-index-or-text "Keyword, index entry, or text")
- (plt:hd:exact-match "Exact match")
- (plt:hd:containing-match "Containing match")
- (plt:hd:regexp-match "Regexp match")
- (plt:hd:find-docs-for "Find docs for:")
- (plt:hd:search-stopped-too-many-matches "[Search aborted: too many matches]")
- (plt:hd:nothing-found-for "Nothing found for ~a")
- (plt:hd:and "and")
- (plt:hd:refresh "refresh")
- (plt:hd:refresh-all-manuals "refresh all manuals")
- (plt:hd:manual-installed-date "(installed ~a)")
- ; Help Desk configuration
- ;; refreshing manuals
- (plt:hd:refreshing-manuals "Re-downloading Manuals")
- (plt:hd:refresh-downloading... "Downloading ~a...")
- (plt:hd:refresh-deleting... "Deleting old version of ~a...")
- (plt:hd:refresh-installing... "Installing new version of ~a...")
- (plt:hd:refresh-clearing-indices "Clearing cached indices")
- (plt:hd:refreshing-manuals-finished "Finished.")
- (plt:hd:about-help-desk "About Help Desk")
- (plt:hd:help-desk-about-string
-  "Help Desk is a complete source of information about Racket software.\n\nVersion ~a\nCopyright (c) ~a-~a PLT")
- (plt:hd:help-on-help "Help on Help")
- (plt:hd:help-on-help-details 
-  "For help on using Help Desk, follow the first link `Help Desk' on Help Desk's home page."
-  " (To get to the home page if you're not already there, click the `Home' button at the top of the Help Desk window.)")
-  (reload "Reload") ;; refresh the page in a web browser
-  (plt:hd:ask-about-separate-browser
-   "You have selected a link to content from the world-wide web."
-   " Would you like to view it in the Help Desk browser, or would you like to use a separate browser program to view it?")
-  (plt:hd:homebrew-browser "Help Desk Browser") ;; choice for the above string (in a button)
-  (plt:hd:separate-browser "Separate Browser") ;; other choice for the above string (also in a button)
-  (plt:hd:external-link-in-help "External URLs in Help")
-  (plt:hd:use-homebrew-browser "Use Help Desk browser for external URLs")
-  (plt:hd:new-help-desk "New Help Desk")
-
-  ;; in the Help Desk language dialog, title on the right.
-  (plt:hd:manual-search-ordering "Manual Search Order")
-  
-  ;; in the help-desk standalone font preference dialog, on a check box
-  (use-drscheme-font-size "Use DrRacket's font size")
-  
-  ;; in the preferences dialog in drscheme there is example text for help desk font size.
-  ;; clicking the links in that text produces a dialog with this message
-  (help-desk-this-is-just-example-text
-   "This is just example text for setting the font size. Open Help Desk proper (from Help menu) to follow these links.")
-
-  ;; this appears in the bottom part of the frame the first time the user hits `f1' 
-  ;; (assuming nothing else has loaded the documentation index first)
-  ;; see also: cs-status-loading-docs-index
-  (help-desk-loading-documentation-index "Help Desk: loading documentation index")
-  
- ;; Help desk htty proxy
- (http-proxy "HTTP Proxy")
- (proxy-direct-connection "Direct connection")
- (proxy-use-proxy "Use proxy:")
- (proxy-host "Host")
- (proxy-port "Port")
- (proxy-bad-host "Bad Proxy Host")
-
- ;; browser
- (rewind-in-browser-history "Rewind")
- (forward-in-browser-history "Forward")
- (home "Home")
- (browser "Browser")
- (external-browser-choice-title "External Browser") ; title for radio-button set
- (browser-command-line-label "Command Line:") ; label for radio button that is followed by text boxes
- (choose-browser "Choose a Browser")
- (no-browser "Ask Later")
- (browser-cmdline-expl-line-1 "(Command line formed by concatenating pre-text, URL,") ; explanatory text for dialog, line 1
- (browser-cmdline-expl-line-2 "and post-text, with no extra spaces between them.)") ; ... line 2. (Anyone need more lines?)
- (install? "Install?")  ;; if a .plt file is found (title of dialog)
- (you-have-selected-an-installable-package "You have selected an installable package.")
- (do-you-want-to-install-it? "Do you want to install it?")
- (paren-file-size "(The file is ~a bytes)")
- (download-and-install "Download && Install") ;; button label
- (download "Download") ;; button label
- (save-downloaded-file/size "Save downloaded file (~a bytes) as") ;; label for get-file dialog
- (save-downloaded-file "Save downloaded file as")  ;; label for get-file dialog
- (downloading "Downloading") ;; dialog title
- (downloading-file... "Downloading file...")
- (package-was-installed "The package was installed.")
- (download-was-saved "The downloaded file was saved.")
-
- (install-plt-file-menu-item... "Install .plt File...")
- (install-plt-file-dialog-title "Install .plt File")
- (install-plt-web-tab "Web")
- (install-plt-file-tab "File")
- (install-plt-filename "Filename:")
- (install-plt-url "URL:")
- ; an error message from a primitive operation is appended to the end of this message.
- (install-plt-error-downloading "There was an error when downloading the"
-                                " .plt file.\n\nDetails:\n")
- (install-plt-error-header "There was an error when checking the validity of the downloaded .plt file. Please check the url and try again.")
- 
- ;; install plt file when opened in drscheme strings
- (install-plt-file "Install ~a or open for editing?")
- (install-plt-file/yes "Install")
- (install-plt-file/no "Edit")
-
- (plt-installer-progress-window-title "Installer Progress") ;; frame title
- (plt-installer-abort-installation "Abort Installation") ;; button label
- (plt-installer-aborted "Aborted.") ;; msg that appears in the installation window when installation is aborted
-
- ;;; about box
- (about-drscheme-frame-title "About DrRacket")
- 
- ;;; save file in particular format prompting.
- (save-as-plain-text "Save this file as plain text?")
- (save-in-drs-format "Save this file in drscheme-specific non-text format?")
- (yes "Yes")
- (no "No")
- 
- ;; saving image (right click on an image to see the text)
-  (save-image "Save image...")
-  
- ;;; preferences
- (preferences "Preferences")
- (error-saving-preferences "Error saving preferences: ~a")
- (error-saving-preferences-title "Error saving preferences")
- (steal-the-lock-and-retry "Steal the lock && retry") ;; in the preferences error dialog; this happens when the lockfile exists (after 3 pref writes). 
- 
- (error-reading-preferences "Error reading preferences")
- (error-reading-preferences-explanation "The preferences file is locked and thus the ~a preference cannot be read")
-  ;; in the above, ~a is filled with the name of the preference (a symbol)
- (dont-ask-again-until-drracket-restarted "Don't ask again (until DrRacket is restarted)")
- ; difference between the above and below is one comes with a question (steal the lock or not) and the other with just a notation saying "the file is locked"
- (dont-notify-again-until-drracket-restarted "Don't notify again (until DrRacket is restarted)") 
- (prefs-file-locked "The preferences file is locked (because the file ~a exists), so your preference change could not be saved. Cancel preference change?")
- (try-again "Try again") ;; button label
- (give-up-and-use-the-default "Give up and use the default") ;; button label
-  
- (prefs-file-still-locked "The preferences file is still locked (because the file ~a exists), so your preference change will not be saved.")
- (prefs-file-locked-nothing-doing 
-  "The preferences file is locked (via ~s) so changes to the preferences cannot be saved.")
-  ;; the  ~s is filled with the lockfile; this string is (currently) used only on windows where lockfiles are less friendly (and there is no steal fallback)
- 
-  (scheme-prefs-panel-label "Racket")
- (warnings-prefs-panel-label "Warnings")
- (editor-prefs-panel-label "Editing")
- (general-prefs-panel-label "General")
- (highlight-parens "Highlight between matching parens")
- (fixup-open-brackets "Automatically adjust opening square brackets")
- (fixup-close-parens "Automatically adjust closing parens")
- (flash-paren-match "Flash paren match")
- (auto-save-files "Auto-save files")
- (backup-files "Backup files")
- (map-delete-to-backspace "Map delete to backspace")
- (verify-exit "Verify exit")
- (ask-before-changing-format "Ask before changing save format")
- (wrap-words-in-editor-buffers "Wrap words in editor buffers")
- (show-status-line "Show status-line")
- (count-columns-from-one "Count column numbers from one")
- (display-line-numbers "Display line numbers in buffer; not character offsets")
- (show-line-and-column-numbers "Show Line && Column Numbers") ; used for popup menu; right click on line/column box in bottom of drs window
- (show-character-offsets "Show Character Offsets") ; used for popup menu; right click on line/column box in bottom of drs window
- (enable-keybindings-in-menus "Enable keybindings in menus")
- (printing-mode "Printing Mode")
- (print-using-platform-specific-mode "Platform-specific printing")
- (print-to-ps "Print to PostScript File")
- (print-to-pdf "Print to PDF File")
- (command-as-meta "Treat command key as meta") ;; macos/macos x only
- (alt-as-meta "Treat alt key as meta")
- (reuse-existing-frames "Reuse existing frames when opening new files")
- (default-fonts "Default Fonts")
- (basic-gray-paren-match-color "Basic gray parenthesis highlight color") ; in prefs dialog
- (online-coloring-active "Color syntax interactively")
- (open-files-in-tabs "Open files in separate tabs (not separate windows)")
- (show-interactions-on-execute "Automatically open interactions window when running a program")
- (switch-to-module-language-automatically "Automatically switch to the module language when opening a module")
- (interactions-beside-definitions "Put the interactions window beside the definitions window") ;; in preferences, below the checkbox one line above this one
- (show-line-numbers "Show line numbers")
- (show-line-numbers/menu "Show Line &Numbers")  ;; just like the above, but capitalized for appearance in a menu item
- (hide-line-numbers/menu "Hide Line &Numbers")
- (show-line-numbers-in-definitions "Show All Line Numbers in Definitions")
-    ;; the constant above shows up in the popup menu item in the bottom of
-    ;; the drracket window; controls the line numbers on each line in the definitions; used in a checkable menu item
- (maximum-char-width-guide-pref-check-box "Maximum character width guide")
- (hide-column-width-guide "Hide Column Width Guide for Files with ~a Columns")
- (show-column-width-guide "Show Column Width Guide at ~a Columns") ;; filled with a number > 2
- (limit-interactions-size "Limit interactions size")
- (background-color "Background") ;; this is in the color section already, so shorten the name a little
- (default-text-color "Default text") ;; used for configuring colors, but doesn't need the word "color"
- (choose-a-background-color "Please choose a background color")
- (revert-to-defaults "Revert to Defaults")
- (undo-changes "Undo Changes and Close") ;; used in the preferences dialog to undo preference changes
-  
-  (color-schemes "Color Schemes") ;; the label in the preferences dialog for the color scheme panel
-  (classic-color-scheme "Classic") ;; formerly called 'black on white'
-  (modern-color-scheme "Modern")   ;; an attempt to be more color-blind friendly
-  (white-on-black-color-scheme "White on Black") ;; clicking the buttons changes the color schemes to some defaults that've been set up.
-  ; drracket additions to the color scheme dialog; two buttons
-  (design-your-own-color-schemes "Design Your Own Color Schemes") ; pointer to (english-only) docs
-  (style-and-color-names "Style && Color Names")
-  
-  (add-spacing-between-lines "Add one pixel of extra space between lines")
-  
- ; title of the color choosing dialog
-
- ; should have entire alphabet
- (font-example-string "The quick brown fox jumped over the lazy dogs.") 
-
- (change-font-button-label "Change")
- (fonts "Fonts")
- (other... "Other...") ;; used in the font choice menu item
-
- ; filled with type of font, eg modern, swiss, etc.
- (choose-a-new-font "Please choose a new \"~a\" font")
-
- (font-size-slider-label "Size")
- (restart-to-see-font-changes "Restart to see font changes")
-
- (font-prefs-panel-title "Font")
- (font-name "Font Name")
- (font-size "Font Size")
- (set-font "Set Font...")
- (font-smoothing-label  "Font smoothing")
- (font-smoothing-none "None")
- (font-smoothing-some "Some")
- (font-smoothing-all "All")
- (font-smoothing-default "Use system-wide default")
- (select-font-name "Select Font Name")
- (example-text "Example Text:")
- (only-warn-once "Only warn once when definitions and interactions are not synchronized")
- 
- ; font size menu items in the 'view' menu; the ~a is filled with a number (font size)
- (increase-font-size "Increase Font Size (To ~a)")
- (decrease-font-size "Decrease Font Size (To ~a)")
-  
- ; warning message when lockfile is around
- (waiting-for-pref-lock "Waiting for the preferences lockfile...")
- (pref-lock-not-gone
-  "The preferences lockfile:\n\n   ~a\n\nprevents the preferences from being saved. Ensure that no Racket software is running and delete this file.")
- (still-locked-exit-anyway? "The preferences were not saved sucessfully. Exit anyway?")
- 
- ;;; indenting preferences panel
- (indenting-prefs-panel-label "Indenting")
- (indenting-prefs-extra-regexp "Extra regexp")
-
- (square-bracket-prefs-panel-label "Square Bracket")
-  
- ; filled with define, lambda, or begin
- (enter-new-keyword "Enter new ~a-like keyword:")
- (x-keyword "~a Keyword")
- (x-like-keywords "~a-like Keywords")
-
- ; used in Square bracket panel
- (skip-subexpressions "Number of sub-expressions to skip")
-
- (expected-a-symbol "expected a symbol, found: ~a")
- (already-used-keyword "\"~a\" is already a specially indented keyword")
- (add-keyword "Add")
- (remove-keyword "Remove")
- 
-  ; repl color preferences
-  (repl-colors "REPL")
-  (repl-out-color "Output")
-  (repl-value-color "Values")
-  (repl-error-color "Errors")
-  
-  ;;; find/replace
-  (search-next "Next")
-  (search-previous "Prev")
-  (search-match "Match")  ;;; this one and the next one are singular/plural variants of each other
-  (search-matches "Matches") 
-  (search-replace "Replace")
-  (search-skip "Skip")
-  (search-show-replace "Show Replace")
-  (search-hide-replace "Hide Replace")
-  (find-case-sensitive "Case sensitive")  ;; the check box in both the docked & undocked search
-  (find-anchor-based "Search using anchors")
-
-  ;; these string constants used to be used by searching,
-  ;; but aren't anymore. They are still used by other tools, tho.
-  (hide "Hide")
-  (dock "Dock")
-  (undock "Undock")
-  
- ;;; multi-file-search
- (mfs-multi-file-search-menu-item "Search in &Files...")
- (mfs-string-match/graphics "String match (handles files with graphics)")
- (mfs-regexp-match/no-graphics "Regular Expression (only raw text files)")
- (mfs-searching... "Searching...")
- (mfs-configure-search "Configure Search") ;; dialog title
- (mfs-files-section "Files")   ;; section in config dialog
- (mfs-search-section "Search") ;; section in config dialog
- (mfs-dir "Dir")
- (mfs-recur-over-subdirectories "Recur over subdirectories")
- (mfs-regexp-filename-filter "Regexp filename filter")
- (mfs-search-string "Search string")
- (mfs-drscheme-multi-file-search "Multi File Search - DrRacket") ;; error message window title
- (mfs-not-a-dir "\"~a\" is not a directory")
- (mfs-open-file "Open File")
- (mfs-stop-search "Stop Search")
- (mfs-case-sensitive-label "Case sensitive")
- (mfs-no-matches-found "No matches found.")
- (mfs-search-interrupted "Search aborted.")
- (mfs-drscheme-multi-file-search-title "Multi File Search for \"~a\" - DrRacket") ;; the ~a format specifier is filled in with the search string
-  
- ;;; reverting a file
- (are-you-sure-revert
-  "Are you sure that you want to revert this file? This change cannot be undone.")
- (are-you-sure-revert-title
-  "Revert?")
- 
- ;;; saving a file
- ; ~a is filled with the filename
- (error-saving "Error Saving") ;; title of error message dialog
- (error-saving-file/name "There was an error saving ~a.")
- (error-loading "Error Loading")
- (error-loading-file/name "There was an error loading ~a.")
- (unknown-filename "<< unknown >>")
-
- ;;; finder dialog
- (must-specify-a-filename "You must specify a file name")
- (file-does-not-exist "The file \"~a\" does not exist.")
- (ask-because-file-exists "The file \"~a\" already exists. Replace it?")
- (dne-or-cycle "The file \"~a\" contains a nonexistent directory or a cycle.")
- (get-file "Get file")
- (put-file "Put file")
- (full-pathname "Full pathname")
- (show-dot-files "Show files and directories that begin with a dot.")
- (up-directory-button-label "Up directory")
- (add-button-label "Add") ;;; for multi-file selection
- (add-all-button-label "Add all") ;;; for multi-file selection
- (remove-button-label "Remove") ;;; for multi-file selection
- (file-wrong-form "That filename does not have the right form.")
- (select-files "Select files")
- (select-file "Select a file")
- (dir-dne "That directory does not exist.")
- (file-dne "That file does not exist.")
- (empty-filename "The filename must have some letters in it.")
- (that-is-dir-name "That is a directory name.")
- 
- ;;; raw menu names -- these must match the 
- ;;; versions below, once the &s have been stripped.
- ;;; if they don't, DrRacket's menus will appear
- ;;; in the wrong order.
- (file-menu "File")
- (edit-menu "Edit")
- (help-menu "Help")
- (windows-menu "Windows")
- (tabs-menu "Tabs") ;; this is the name of the "Windows" menu under linux & windows
-  
- ;;; menus
- ;;; - in menu labels, the & indicates a alt-key based shortcut.
- ;;; - sometimes, things are stuck in the middle of 
- ;;; menu item labels. For instance, in the case of
- ;;; the "Save As" menu, you might see: "Save Definitions As". 
- ;;; be careful of spacing, follow the English, if possible.
- ;;; - the ellipses in the `after' strings indicates that
- ;;; more information is required from the user before completing
- ;;; the command.
-
- (file-menu-label "&File")
-
- (new-info  "Open a new file")
- (new-menu-item "&New")
- (new-...-menu-item "&New...")
-
- (open-info "Open a file from disk")
- (open-menu-item "&Open...")
-
- (open-recent-info "A list of the recently opened files")
- (open-recent-menu-item "Open Recen&t")
-
- (revert-info "Revert this file to the copy on disk")
- (revert-menu-item "&Revert")
-
- (save-info "Save this file to disk")
- (save-menu-item "&Save")
-
- (save-as-info "Prompt for a filename and save this file to disk")
- (save-as-menu-item "Save &As...")
-
- (print-info "Send this file to a printer")
- (print-menu-item "&Print...")
-
- (page-setup-info "Configure printing parameters")
- (page-setup-menu-item "Page Setup...")
-
- (close-info "Close this file")
- (close-menu-item "&Close")
- (close-window-menu-item "&Close Window")
-
- (quit-info "Close all windows")
- (quit-menu-item-windows "E&xit")
- (quit-menu-item-others "&Quit")
- 
- (edit-menu-label "&Edit")
- 
- (undo-info "Undo the most recent action")
- (undo-menu-item "&Undo")
-
- (redo-info "Undo the most recent undo")
- (redo-menu-item "&Redo")
-
- (cut-info "Move the selected items to the clipboard for later pasting")
- (cut-menu-item "Cu&t")
-
- (copy-info "Copy the selected items to the clipboard for later pasting")
- (copy-menu-item "&Copy")
-
- (paste-info "Paste the most recently copied or cut items, in place of the selected items")
- (paste-menu-item "&Paste")
-
- (clear-info "Erase the selected items without affecting the clipboard or pasting")
- (clear-menu-item-windows "&Delete")
-
- (select-all-info "Select the entire document")
- (select-all-menu-item "Select A&ll")
- 
-  (find-menu-item "Find") ;; menu item
-  (find-from-selection-menu-item "Find From S&election")
-  (find-info "Toggles the keyboard focus between the window being searched and the search bar")
-  
- (find-next-info "Skip to the next occurrence of the string in the find window")
- (find-next-menu-item "Find Next")
-  
- (find-previous-info "Skip to the previous occurrence of the string in the find window")
- (find-previous-menu-item "Find Previous")
-  
-  (show-replace-menu-item "Show Replace")
-  (hide-replace-menu-item "Hide Replace")
-  (show/hide-replace-info "Toggles the visibility of the replace panel")
-
-  (replace-menu-item "Replace")
-  (replace-info "Replace the search hit in the dark circle")
-  
-  (replace-all-info "Replace all occurrences of the search string")
-  (replace-all-menu-item "Replace All")
-  
-  (find-case-sensitive-info "Toggles between case-sensitive and case-insensitive search")
-  (find-case-sensitive-menu-item "Find Case Sensitive")
-  
-  (complete-word "Complete Word") ; the complete word menu item in the edit menu
-  (no-completions "... no completions available") ; shows up in the completions menu when there are no completions (in italics)
-  
-  (overwrite-mode "Overwrite Mode")
-  (enable-overwrite-mode-keybindings "Enable overwrite mode keybindings")
-  
-  (enable-automatic-parens "Enable automatic parentheses") ; should "and square brackets and quotes" appear here?
-  
- (preferences-info "Configure your preferences")
- (preferences-menu-item "Preferences...")
-
- (keybindings-info "Show the currently active keybindings")
- (keybindings-menu-item "Keybindings")
- (keybindings-show-active "Show Active Keybindings")
- (keybindings-frame-title "Keybindings")
- (keybindings-sort-by-name "Sort by Name")
- (keybindings-sort-by-key "Sort by Key")
- (keybindings-add-user-defined-keybindings "Add User-defined Keybindings...")
- (keybindings-add-user-defined-keybindings/planet "Add User-defined Keybindings from PLaneT...")
- (keybindings-menu-remove "Remove ~a")
- (keybindings-choose-user-defined-file "Please choose a file containing keybindings.")
- (keybindings-planet-malformed-spec "The PLaneT spec is malformed: ~a") ; the string will be what the user typed in
- (keybindings-type-planet-spec "Please enter a PLaneT require spec (without the `require')")
-  
- ; first ~a will be a string naming the file or planet package where the keybindings come from;
- ; second ~a will be an error message
- (keybindings-error-installing-file "Error when installing the keybindings ~a:\n\n~a")
-  
- (user-defined-keybinding-error "Error running keybinding ~a\n\n~a")
- (user-defined-keybinding-malformed-file "The file ~a does not contain a module written in the framework/keybinding-lang language.")  
- (user-defined-keybinding-malformed-file/found-lang
-  "The file ~a does not contain a module written in the"
-  " framework/keybinding-lang language. Instead, found the language ~s.")
-  
- ;; menu items in the "special" menu
- (insert-text-box-item "Insert Text Box")
- (insert-image-item "Insert Image...")
- (insert-comment-box-menu-item-label "Insert Comment Box")
- (insert-lambda "Insert λ")
-
- (wrap-text-item "Wrap Text")
-
-  ;; windows menu
- (windows-menu-label "&Windows")
- (tabs-menu-label "&Tabs") ;; this is the name of the menu under linux & windows
- (minimize "Minimize") ;; minimize and zoom are only used under mac os x
- (zoom "Zoom")
- (bring-frame-to-front "Bring Frame to Front")       ;;; title of dialog
- (bring-frame-to-front... "Bring Frame to Front...") ;;; corresponding title of menu item
- (most-recent-window "Most Recent Window")
-  (next-tab "Next Tab")
-  (prev-tab "Previous Tab")
-  (move-current-tab-right "Move Tab &Right")
-  (move-current-tab-left "Move Tab &Left")
-  ;; menu item in the windows menu under mac os x. first ~a is filled with a number between 1 and 9; second one is the filename of the tab
-  (tab-i "Tab ~a: ~a")
-  (tab-i/no-name "Tab ~a")
-
- (view-menu-label "&View")
- (show-overview "Show &Program Contour") 
- (hide-overview "Hide &Program Contour")
- (show-module-browser "Show &Module Browser")
- (hide-module-browser "Hide &Module Browser")
-
-  (help-menu-label "&Help")
- (about-info "Credits and details for this application")
- (about-menu-item "About...")
- 
- ;; open here's new menu item
- (create-new-window-or-clear-current
-  "Would you like to create a new window, or clear out the current one?")
- (clear-current "Clear Current")
- (new-window "New Window")
-  
-  ;; popup menu when right-clicking in the gap between
-  ;; the definitions and interactions window
-  (change-to-vertical-alignment "Change to vertical")
-  (change-to-horizontal-alignment "Change to horizontal")
-
- ;;; exiting and quitting ``are you sure'' dialog
- ;;; exit is used on windows, quit on macos, in English. Other
- ;;; languages probably use the same word on both platforms.
- (exit "Exit")
- (quit "Quit")
- (are-you-sure-exit "Are you sure you want to exit?")
- (are-you-sure-quit "Are you sure you want to quit?")
-  ; these next two are only used in the quit/exit dialog
-  ; on the button whose semantics is "dismiss this dialog".
-  ; they are there to provide more flexibility for translations
-  ; in English, they are just cancel.
- (dont-exit "Cancel") 
- (dont-quit "Cancel")
-  
- ;;; autosaving
- (error-autosaving "Error autosaving \"~a\".") ;; ~a will be a filename
- (autosaving-turned-off "Autosaving is turned off\nuntil the file is saved.")
- (recover-autosave-files-frame-title "Recover Autosaved Files")
- (autosave-details "Details")
- (autosave-recover "Recover")
- (autosave-unknown-filename "<<unknown>>")
-  
-  ;; these are labels in a dialog that drscheme displays
-  ;; if you have leftover autosave files. to see the dialog,
-  ;; start up drscheme and modify (but don't save) a file
-  ;; (also, do this with an unsaved file). Wait for the autosave
-  ;; files to appear (typically 5 minutes). Kill DrRacket
-  ;; and restart it. You'll see the dialog
-  (autosave-autosave-label: "Autosave file:")
-  (autosave-original-label: "Original file:")
-  (autosave-autosave-label "Autosave file")
-  (autosave-original-label "Original file")
-  (autosave-compare-files "Compare autosave files")
-
-  (autosave-show-autosave "Autosave file") ;; title of a window showing the autosave file
-
-  (autosave-explanation "DrRacket found autosave files, which may contain your unsaved work.")
-
-  (autosave-recovered! "Recovered!") ;; status of an autosave file
-  (autosave-deleted "Deleted")       ;; status of an autosave file
-
-  (autosave-error-deleting "Error deleting ~a\n\n~a") ;; first is a filename, second is an error message from mz.
-  (autosave-delete-button "Delete")
-  (autosave-delete-title "Delete")  ;; title of a dialog asking for deletion confirmation
-  (autosave-done "Done")
-  
-  ;; appears in the file dialog
-  (autosave-restore-to-where? "Choose a place to save the autosave file.")
-  
-  
- ;;; file modified warning
- (file-has-been-modified
-  "The file has been modified since it was last saved. Overwrite the modifications?")
- (overwrite-file-button-label "Overwrite")
- 
- (definitions-modified 
-  "The definitions text has been modified in the file-system; please save or revert the definitions text.")
- (drscheme-internal-error "DrRacket Internal Error")
- 
- ;;; tools
- (invalid-tool-spec "The tool specification in collection ~a's info.rkt file is invalid. Expected either a string or a non-empty list of strings, got: ~e")
- (error-invoking-tool-title "Error invoking tool ~s;~s")
- (error-loading-tool-title "Error loading tool ~s\n~a") ;; ~s filled with a path, ~a filled with an error message from an exn
- (tool-tool-names-same-length
-  "expected `tool-names' and `tools' to be lists of the same length, in info.rkt file for ~s, got ~e and ~e")
- (tool-tool-icons-same-length
-  "expected `tool-icons' and `tools' to be lists of the same length, in info.rkt file for ~s, got ~e and ~e")
- (tool-tool-urls-same-length
-  "expected `tool-urls' and `tools' to be lists of the same length, in info.rkt file for ~s, got ~e and ~e")
- (error-getting-info-tool
-  "error loading info.rkt file for ~s")
- (tool-error-phase1 "Error in phase 1 for tool ~s; ~s")
- (tool-error-phase2 "Error in phase 2 for tool ~s; ~s")
-
-
- ;;; define popup menu
- (end-of-buffer-define "<< end of buffer >>")
- (sort-by-name "Sort by name")
- (sort-by-position "Sort by position in file")
- (no-definitions-found "<< no definitions found >>")
- (jump-to-defn "Jump to definition of ~a")
-
- (recent-items-sort-by-age "Sort by Age")
- (recent-items-sort-by-name "Sort by Name")
- 
- ;;; view menu
- (hide-definitions-menu-item-label "Hide &Definitions")
- (show-definitions-menu-item-label "Show &Definitions")
- (definitions-menu-item-help-string "Show/Hide the definitions window")
- (show-interactions-menu-item-label "Show &Interactions")
- (hide-interactions-menu-item-label "Hide &Interactions")
- (use-horizontal-layout "Use Horizontal Layout")
- (use-vertical-layout "Use Vertical Layout")
- (interactions-menu-item-help-string "Show/Hide the interactions window")
- (toolbar "Toolbar")
- (toolbar-on-top "Toolbar On Top")
- (toolbar-on-top-no-label "Toolbar On Top With Small Buttons")
- (toolbar-on-left "Toolbar On Left")
- (toolbar-on-right "Toolbar On Right")
- (toolbar-hidden "Toolbar Hidden")
-
- ;;; file menu
- (save-definitions-as "Save Definitions &As...")
- (save-definitions "Save Definitions")
- (print-definitions "Print Definitions...")
- (about-drscheme "About DrRacket")
- (save-other "Save Other")
- (save-definitions-as-text "Save Definitions As Text...")
- (save-interactions "Save Interactions")
- (save-interactions-as "Save Interactions As...")
- (save-interactions-as-text "Save Interactions As Text...")
- (print-interactions "Print Interactions...")
- (new-tab "New Tab")
- (close-tab "Close Tab") ;; must not have any &s in it.
- (close-tab-amp "&Close Tab") ;; like close-tab, but with an ampersand on the same letter as the one in close-menu-item
-  
- ;;; edit menu
- (split-menu-item-label "&Split")
- (collapse-menu-item-label "C&ollapse")
- (find-longest-line "Find Longest Line")
-  
- ;;; language menu
- (language-menu-name "&Language")
- 
- ;;; scheme-menu
- (scheme-menu-name "Ra&cket")
- (execute-menu-item-label "Run")
- (execute-menu-item-help-string "Restart the program in the definitions window")
- (ask-quit-menu-item-label "Ask the Program to Quit")
- (ask-quit-menu-item-help-string "Uses break-thread to stop the primary thread of the current evaluation")
- (force-quit-menu-item-label "Force the Program to Quit")
- (force-quit-menu-item-help-string "Uses custodian-shutdown-all to abort the current evaluation")
- (limit-memory-menu-item-label "Limit Memory...")
- (limit-memory-msg-1 "The limit will take effect the next time the program")
- (limit-memory-msg-2 "is Run, and it must be at least eight megabytes.")
- (limit-memory-unlimited "Unlimited")
- (limit-memory-limited "Limited")
- (limit-memory-megabytes "Megabytes")
- ; the next two constants are used together in the limit memory dialog; they are inserted
- ; one after another. The first one is shown in a bold font and the second is not.
- ; (the first can be the empty string)
- (limit-memory-warning-prefix "Warning: ")
- (limit-memory-warning 
-  "the unlimited memory setting is unsafe. With this setting,"
-  " DrRacket cannot protect itself against programs that allocate too much, and DrRacket may crash.")
- 
- (clear-error-highlight-menu-item-label "Clear Error Highlight")
- (clear-error-highlight-item-help-string "Removes the pink error highlighting")
- (jump-to-next-error-highlight-menu-item-label "Jump to Next Error Highlight")
- (jump-to-prev-error-highlight-menu-item-label "Jump to Previous Error Highlight")
- (reindent-menu-item-label "&Reindent")
- (reindent-all-menu-item-label "Reindent &All")
- (semicolon-comment-out-menu-item-label "&Comment Out with Semicolons")
- (box-comment-out-menu-item-label "Comment Out with a &Box")
- (uncomment-menu-item-label "&Uncomment")
-
- (convert-to-semicolon-comment "Convert to Semicolon Comment")
- 
- ;;; executables
- (create-executable-menu-item-label "Create &Executable...")
- (create-executable-title "Create Executable")
- (drracket-creates-executables-only-in-some-languages
-  "The creation of executables in DrRacket is supported only when you"
-  " have selected one of the teaching languages (DMdA or HtDP) in"
-  " DrRacket's language dialog, or when you have selected “The Racket"
-  " Language” in DrRacket's language dialog and the #lang line at the"
-  " start of your program specifies a language.\n\nConsider"
-  " using the raco exe command-line tool instead.")
- (must-save-before-executable "You must save your program before creating an executable.")
- (save-a-mred-launcher "Save a GRacket Launcher")
- (save-a-mzscheme-launcher "Save a Racket Launcher")
- (save-a-mred-stand-alone-executable "Save a GRacket Stand-alone Executable")
- (save-a-mzscheme-stand-alone-executable "Save a Racket Stand-alone Executable")
- (save-a-mred-distribution "Save a GRacket Distribution")
- (save-a-mzscheme-distribution "Save a Racket Distribution")
- (error-creating-executable "Error creating executable:") ;; this is suffixed with an error message ala error-display-handler
-  
- (definitions-not-saved "The definitions window has not been saved. The executable will use the latest saved version of the definitions window. Continue?")
- ;; The "-explanatory-label" variants are the labels used for the radio buttons in
- ;;  the "Create Executable..." dialog for the "(module ...)" language.
- (launcher "Launcher")
- (launcher-explanatory-label "Launcher (for this machine only, runs from source)")
- (stand-alone "Stand-alone")
- (stand-alone-explanatory-label "Stand-alone (for this machine only, run compiled copy)")
- (distribution "Distribution")
- (distribution-explanatory-label "Distribution (to install on other machines)")
- (executable-type "Type")
- (executable-base "Base")
- (filename "Filename: ")
- (create "Create")
- (files-for-icons-etc "Files for icons, etc.")
- (please-specify-a-filename "Please specify a filename to create.")
- (~a-must-end-with-~a
-  "The ~a filename\n\n  ~a\n\nis illegal. The filename must end with \".~a\".")
- (macosx-executables-must-end-with-app
-  "The filename\n\n  ~a\n\nis illegal. Under MacOS X, an executable must be a directory whose name ends with .app.")
- (warning-directory-will-be-replaced
-  "WARNING: the directory:\n\n  ~a\n\nwill be replaced. Proceed?")
- 
- (distribution-progress-window-title "Distribution Progress")
- (creating-executable-progress-status "Creating executable for distribution...")
- (assembling-distribution-files-progress-status "Assembling files for distribution...")
- (packing-distribution-progress-status "Packing distribution...")
-
- (create-servlet "Create Servlet...")
-
- ; the ~a is a language such as "module" or "algol60"
- (create-servlet-unsupported-language
-  "Create Servlet does not work with the ~a language.")
-  
- ;;; buttons
- (execute-button-label "Run") 
- (save-button-label "Save")
- (break-button-label "Stop")
- 
- ;;; search help desk popup menu
- (search-help-desk-for "Search in Help Desk for \"~a\"")
- (exact-lucky-search-help-desk-for "Exact lucky search in Help Desk for \"~a\"")
-
- ;; collapse and expand popup menu items
- (collapse-sexp "Collapse S-expression")
- (expand-sexp "Expand S-expression")
- 
- ;;; fraction dialog
- (enter-fraction "Enter Fraction")
- (whole-part "Whole Part")
- (numerator "Numerator")
- (denominator "Denominator")
- (insert-number/bad-whole-part "The whole part of the number must be an integral number")
- (insert-number/bad-numerator "The numerator part of the number must be a non-negative, integral number")
- (insert-number/bad-denominator "The denominator part of the number must be a positive, integral number")
- (insert-fraction-menu-item-label "Insert Fraction...")
-
- ;; number snip popup menu
- (show-decimal-expansion "View decimal expansion")
- (show-mixed-fraction-view "View as mixed fraction")
- (show-improper-fraction-view "View as improper fraction")
- (show-more-decimal-places "Show more decimal places")
- 
- ;;; Teachpack messages
- (select-a-teachpack "Select a Teachpack")
- (clear-teachpack "Clear ~a Teachpack")
- (teachpack-error-label "DrRacket - Teachpack error")
- (teachpack-didnt-load "The teachpack file ~a did not load properly.")
- (add-teachpack-menu-item-label "Add Teachpack...")
- (clear-all-teachpacks-menu-item-label "Clear All Teachpacks")
- (drscheme-teachpack-message-title "DrRacket Teachpack")
- (already-added-teachpack "Already added ~a teachpack")
-  
-  ; ~a is filled with the teachpack's name; the message appears in the teachpack selection dialog when a user installs a new teachpack
-  (compiling-teachpack "Compiling ~a teachpack ...")
-  (teachpack-pre-installed "Preinstalled Teachpacks")
-  (teachpack-pre-installed/htdp "Preinstalled HtDP Teachpacks")
-  (teachpack-pre-installed/2htdp "Preinstalled HtDP/2e Teachpacks")
-  (teachpack-user-installed "User-installed Teachpacks")
-  (add-teachpack-to-list... "Add Teachpack to List...")
-  ; first and second ~a are teachpack names, third is a symbol identifing an export
-  (teachpack-conflict
-   "WARNING: the already installed teachpack ~a conflicts with ~a (the export ~a is in both)")
-   ;; a button label; the two ~a are filled with teachpack names
-  (remove-and-add-teachpack "Remove ~a and add ~a")
-  (teachpack-already-installed "A teachpack with the name '~a' has already been installed. Overwrite it?")
-  ; ~a is filled with a list of language names. Each name is separated by a newline and is indented two spaces (no commas, no 'and')
-  (teachpacks-only-in-languages "The Teachpack menu is only available in these languages: ~a\n\nIn other languages, use 'require' instead.")
-  
-  
- ;;; Language dialog
- (introduction-to-language-dialog
-  "Please select a language. Students in most introductory courses should use the default language.")
- (language-dialog-title "Choose Language")
- (case-sensitive-label "Case sensitive")
- (output-style-label "Output Style")
- (constructor-printing-style "Constructor")
- (quasiquote-printing-style "Quasiquote")
- (write-printing-style "write")
- (print-printing-style "print")
- (sharing-printing-label "Show sharing in values")
- (use-pretty-printer-label "Insert newlines in printed values")
- (input-syntax "Input Syntax")
- (dynamic-properties "Dynamic Properties")
- (output-syntax "Output Syntax")
-  (teachpacks "Teachpacks") ;; label in the language dialog for the teaching languages
-  (teachpacks-none "<< none >>") ;; shows up under the previous string, when there are no teachpacks
- (no-debugging-or-profiling "No debugging or profiling")
- (debugging "Debugging")
- (debugging-and-profiling "Debugging and profiling")
- (test-coverage "Syntactic test suite coverage")
- (show-details-button-label "Show Details")
- (hide-details-button-label "Hide Details")
- (choose-language-menu-item-label "Choose Language...")
- (revert-to-language-defaults "Revert to Language Defaults")
- (fraction-style "Fraction Style")
- (use-mixed-fractions "Mixed fractions")
- (use-repeating-decimals "Repeating decimals")
- (decimal-notation-for-rationals "Use decimal notation for rationals")
- (enforce-primitives-group-box-label "Initial Bindings")
- (enforce-primitives-check-box-label "Disallow redefinition of initial bindings")
- (automatically-compile "Populate \"compiled\" directories (for faster loading)")
- (preserve-stacktrace-information "Preserve stacktrace (disable some optimizations)")
- (enforce-module-constants-checkbox-label "Enforce constant definitions (enables some inlining)")
- (expression-level-stacktrace "Expression-level stacktrace")
- (function-level-stacktrace "Function-level stacktrace")
- (submodules-to-run "Submodules to Run")
- (add-submodule "Add Submodule Option ...") ;; menu item
- (add-submodule-title "Add Submodule") ;; title of dialog opened by above menu item
-  
-  
-  ; used in the bottom left of the drscheme frame 
-  ; used the popup menu from the just above; greyed out and only
-  ; visible when some languages are in the history
-  (recent-languages "Recent languages:")
-  ; shows up in bottom-left programming language menu popup, when no langs are recorded
-  (no-recently-chosen-languages "no recently chosen languages") 
-  
- ;; startup wizard screen language selection section
- (please-select-a-language "Please select a language")
-  
-  
- ;;; languages
- (beginning-student "Beginning Student")
- (beginning-one-line-summary "define, cond, structs, constants, and primitives")
- (beginning-student/abbrev "Beginning Student with List Abbreviations")
- (beginning/abbrev-one-line-summary "Beginner, with list style printing in the REPL")
- (intermediate-student "Intermediate Student")
- (intermediate-one-line-summary "Beginner plus lexical scope")
- (intermediate-student/lambda "Intermediate Student with lambda")
- (intermediate/lambda-one-line-summary "Intermediate plus higher-order functions")
- (advanced-student "Advanced Student")
- (advanced-one-line-summary "Intermediate plus lambda and mutation")
- (how-to-design-programs "How to Design Programs") ;; should agree with MIT Press on this one...
- (pretty-big-scheme "Pretty Big")
- (pretty-big-scheme-one-line-summary "Adds syntax and functions from the HtDP languages, mzscheme, & mred/mred")
- (r5rs-language-name "R5RS")
- (r5rs-one-line-summary "R5RS, with no frills")
- (expander "Expander")
- (expander-one-line-summary "Expands, rather than evaluates, expressions")
- (legacy-languages "Legacy Languages")
- (teaching-languages "Teaching Languages")
- (experimental-languages "Experimental Languages")
-  (initial-language-category "Initial language")
-  (no-language-chosen "No language chosen")
- (other-languages "Other Languages")
-  
-  (module-language-name "Determine language from source")
- (module-language-one-line-summary "The #lang line specifies the actual language")
-  (module-language-auto-text "Automatic #lang line") ;; shows up in the details section of the module language
-   
-  ;; for the upper portion of the language dialog
-  (the-racket-language "The Racket Language")
-  (choose-a-language "Choose a language")
-  
-  ;; the next two string constants appear in the
-  ;; language dialog with a list
-  ;; of example languages appearing between them
-  (racket-language-discussion "Start your program with #lang to specify the desired dialect. For example:\n\n")
-  (racket-language-discussion-end "\n... and many more")
-  
-  ;; the next three string constants are put into a message-box dialog
-  ;; that appears when the user clicks on the example #lang languages
-  ;; in the language dialog. The first one always appears and then either
-  ;; the second or the third appears. The second one has the clicked
-  ;; on #lang line placed into the ~a, and third one has the 
-  ;; current #lang line in the first ~a and the clicked on in the second one.
-  ;; The two comments are separated by a blank line.
-  (racket-dialect-in-buffer-message 
-   "Racket dialects are generally chosen by editing the buffer directly,"
-   " not by selecting these entries in the language dialog.")
-  (racket-dialect-add-new-#lang-line "That said, shall I add “~a” to the beginning of the definitions window?")
-  (racket-dialect-replace-#lang-line "That said, I see you have “~a” in your file; shall I replace it with “~a”?")
-  (racket-dialect-already-same-#lang-line "I see you already have “~a” in your file, however; so you should be all set to start programming!")
-  
-  ;; in the dialog containing the above strings, one of these is a button that appears
-  (add-#lang-line "Add #lang line")
-  (replace-#lang-line "Replace #lang line")
-  
-  ;; for the 'new drracket user' dialog
-  (use-language-in-source "Use the language declared in the source")
-  
-  ;;; from the `not a language language' used initially in drscheme.
-  (must-choose-language "DrRacket cannot process programs until you choose a programming language.")
-  
-  ; next two appear before and after the name of a text book (which will be in italics)
-  (using-a-textbook-before "Using ")
-  (using-a-textbook-after "?")
-  
-  ; next two are before and after a language
-  (start-with-before "Start with ")
-  (start-with-after "")
-  
-  (seasoned-plt-schemer? "Seasoned PLT Schemer?")
-  (racketeer? "Are you a Racketeer?")
-  (looking-for-standard-scheme? "Looking for standard Scheme?")
-
-  ; the three string constants are concatenated together and the middle
-  ; one is hyperlinked to the dialog that suggests various languages
-  (get-guidance-before "Either select the “Choose Language...” item in the “Language” menu, or ")
-  (get-guidance-during "get guidance")
-  (get-guidance-after ".")
-    
- ;;; debug language
- (unknown-debug-frame "[unknown]")
- (backtrace-window-title "Backtrace - DrRacket")
- (files-interactions "~a's interactions") ;; filled with a filename
- (current-interactions "interactions")
- (current-definitions "definitions")
- (mzscheme-w/debug "Textual (MzScheme, includes R5RS)")
- (mzscheme-one-line-summary "PLT's implementation Scheme")
- (mred-w/debug "Graphical (MrEd, includes MzScheme)")
- (mred-one-line-summary "Adds GUI support to MzScheme")
-
- ;; profiling
- (profiling-low-color "Low")
- (profiling-high-color "High")
- (profiling-choose-low-color "Please select a low color")
- (profiling-choose-high-color "Please select a high color")
- (profiling "Profiling")
- (profiling-example-text "(define (whee) (whee))")
- (profiling-color-config "Profiling Color Range") 
- (profiling-scale "Profiling Color Scale")
- (profiling-sqrt "Square root")
- (profiling-linear "Linear")
- (profiling-square "Square")
- (profiling-number "Number of Calls")
- (profiling-time "Cumulative Time")
- (profiling-update "Update Profile")
- (profiling-col-percent-time "% Time")
- (profiling-col-function "Function")
- (profiling-col-time-in-msec "Msec")
- (profiling-col-calls "Calls")
- (profiling-show-profile "Show Profile")
- (profiling-hide-profile "Hide Profile")
- (profiling-unknown-src "<< unknown >>")
- (profiling-no-information-available 
-  "There is no profiling information available. Please be sure that"
-  " profiling is enabled in your language and you have run your program.")
- (profiling-clear? "Changing the definitions window invalidates the profiling information. Continue?")
- 
- ;; test coverage
- (test-coverage-clear? "Changing the definitions window invalidates the test coverage information. Continue?")
- (test-coverage-clear-and-do-not-ask-again "Yes, and don't ask again")
- (test-coverage-ask? "Ask about clearing test coverage")
-  
- (test-coverage-on "Tests covered")
- (test-coverage-off "Tests didn't cover")
-  
- ;; tracing
- (tracing-enable-tracing "Enable tracing")
- (tracing-show-tracing-window "Show Tracing")
- (tracing-hide-tracing-window "Hide Tracing")
- (tracing-tracing-nothing-to-show "No tracing results are available, yet. (Make sure that your language supports tracing and that tracing is enabled.)")
-
- ;;; repl stuff
- (evaluation-terminated "Evaluation Terminated")
- (evaluation-terminated-explanation
-  "The evaluation thread is no longer running, so no evaluation can take place until the next execution.")
-  
-  ; The next three constants show up in the same dialog as the above evaluation-terminated string
-  ; constants.
-  ; The first two show up only when the user calls 'exit' (possibly with a status code).
-  ; The third shows up when the program runs out of memory.
-  (exited-successfully "Exited successfully.")
-  (exited-with-error-code "Exited with error code ~a.") ;; ~a is filled in with a number between 1 and 255
-  (program-ran-out-of-memory "The program ran out of memory.")
-  
-  (show-evaluation-terminated-dialog "Show the ‘evaluation terminated’ dialog")
-  (evaluation-terminated-ask "Show this dialog next time")
-  
-  (last-stack-frame "show the last stack frame")
-  (last-stack-frames "show the last ~a stack frames")
-  (next-stack-frames "show the next ~a stack frames")
- 
- ;;; welcoming message in repl
- (language "Language")
- (custom "custom")
- (teachpack "Teachpack")
- (welcome-to "Welcome to")
- (version "version")
- 
- ;;; kill evaluation dialog
- (kill-evaluation? "Do you want to kill the evaluation?")
- (just-break "Just Break")
- (kill "Kill")
- (kill? "Kill?")
-
- ;;; version checker
- (version:update-menu-item   "Check for Updates...")
- (version:update-check       "Update check") ; dialog title, with the next line
- (version:connecting-server  "Connecting to Racket version server")
- (version:results-title      "Racket Version Check")
- (version:do-periodic-checks "Periodically check for newer Racket versions")
- (version:take-me-there      "Take Me There") ; ...to the download website
- ;; the next one can appear alone, or followed by a comma and the one after that
- (version:plt-up-to-date     "Your Racket version is up-to-date")
- (version:but-newer-alpha    "but note that there is a newer alpha-release")
- ;; This is used in this context: "Racket vNNN <<<*>>> http://download..."
- (version:now-available-at   "is now available at")
-
- ;; insert menu
- (insert-menu "&Insert")
- 
- ;; large semi colon letters
- (insert-large-letters... "Insert Large Letters...")
- (large-semicolon-letters "Large Semicolon Letters")
- (text-to-insert "Text to insert")
-
- (module-browser-filename-format "Full Filename: ~a (~a lines)")
- (module-browser-root-filename "Root Filename: ~a")
- (module-browser-font-size-gauge-label "Font Size")
- (module-browser-progress-label "Module Browser Progress")
- (module-browser-adding-file "Adding file: ~a...")
- (module-browser-laying-out-graph-label "Laying out graph")
- (module-browser-open-file-format "Open ~a")
- (module-browser "Module Browser") ;; frame title
- (module-browser... "&Module Browser...") ;; menu item title
- (module-browser-in-file "M&odule Browser on ~a") ;; menu item title; ~a is filled with a filename
- (module-browser-no-file "Module Browser on This Saved File") ;; menu item title for above menu item; used when there is no saved file
- (module-browser-error-expanding "Error expanding the program:\n\n~a")
- (module-browser-show-lib-paths "Show files loaded by (lib ..) paths")
- (module-browser-progress "Module Browser: ~a") ;; prefix in the status line
- (module-browser-compiling-defns "Module Browser: compiling definitions")
- (module-browser-show-lib-paths/short "Follow lib requires") ;; check box label in show module browser pane in drscheme window.
- (module-browser-show-planet-paths/short "Follow PLaneT requires") ;; check box label in show module browser pane in drscheme window.
- (module-browser-refresh "Refresh") ;; button label in show module browser pane in drscheme window.
- (module-browser-highlight "Highlight") ;; used to search in the graph; the label on a text-field% object
-  (module-browser-only-in-plt-and-module-langs
-   "The module browser is only available for module-based programs.")
- (module-browser-name-length "Name length")
- (module-browser-name-short "Short")
- (module-browser-name-medium "Medium")
- (module-browser-name-long "Long")
- (module-browser-name-very-long "Long, with phases")  ;; like 'Long' but shows the phases where this file is loaded
- (module-browser-open-all "Open all files shown here")
-
- (happy-birthday-matthias "Happy Birthday, Matthias!")
- (happy-birthday-matthew "Happy Birthday, Matthew!")
- (happy-birthday-shriram "Happy Birthday, Shriram!")
-
- (mrflow-using-default-language-title "Default Language Used")
- (mrflow-using-default-language "The language currently used does not have a type table defined for its primitives. Using R5RS Scheme instead.")
- (mrflow-button-title "Analyze")
- ;(mrflow-unknown-style-delta-error-title "Unknown Box Style Delta")
- ;(mrflow-unknown-style-delta-error "Unknown box style delta: ~a")
- (mrflow-popup-menu-show-type "Show Type")
- (mrflow-popup-menu-hide-type "Hide Type")
- (mrflow-popup-menu-show-errors "Show Errors")
- (mrflow-popup-menu-hide-errors "Hide Errors")
- ;(mrflow-read-exception-title "Read Exception")
- ;(mrflow-read-exception "Read exception: ~a")
- ;(mrflow-syntax-exception-title "Syntax Exception")
- ;(mrflow-syntax-exception "Syntax exception: ~a")
- ;(mrflow-unknown-exception-title "Unknown Exception")
- ;(mrflow-unknown-exception "Unknown exception: ~a")
- ;(mrflow-language-primitives-error-title "Language Primitives Error")
- ;(mrflow-language-primitives-error "Wrong filename for language primitives types table: ~a")
-  
- (snips-and-arrows-popup-menu-tack-all-arrows "Tack All Arrows")
- (snips-and-arrows-popup-menu-untack-all-arrows "Untack All Arrows")
- (snips-and-arrows-user-action-disallowed-title "User Changes Currently Disallowed")
- (snips-and-arrows-user-action-disallowed
-   "User changes are disallowed in editors that contain tool-inserted snips."
-   " Hide all snips before modifying the content of the editor.")
- ;(snips-and-arrows-changing-terms-warning-title "Changing terms will be undoable")
- (snips-and-arrows-hide-all-snips-in-editor "Hide all snips in editor")
-
- (xml-tool-insert-xml-box "Insert XML Box")
- (xml-tool-insert-scheme-box "Insert Racket Box")
- (xml-tool-insert-scheme-splice-box "Insert Racket Splice Box")
- (xml-tool-xml-box "XML Box")
- (xml-tool-scheme-box "Racket Box")
- (xml-tool-scheme-splice-box "Racket Splice Box")
- (xml-tool-switch-to-scheme "Switch to Racket box")
- (xml-tool-switch-to-scheme-splice "Switch to Racket splice box")
- (xml-tool-eliminate-whitespace-in-empty-tags
-  "Eliminiate whitespace in empty tags")
- (xml-tool-leave-whitespace-alone
-  "Leave whitespace alone")
- 
- (show-recent-items-window-menu-item "Show Recently Opened Files in Separate Window")
- (show-recent-items-window-label "Recently Opened Files")
- (number-of-open-recent-items "Number of recent items")
- (switch-anyway "Switch File Anyway")
-
- (stepper-program-has-changed "WARNING: The program has changed.")
- (stepper-program-window-closed "WARNING: The program window is gone.")
-
- (stepper-name "Stepper")
- (stepper-language-level-message "The stepper does not work for language \"~a\".")
- (stepper-button-label "Step")
-
- (stepper-previous "Step")
- (stepper-next "Step")
- (stepper-jump "Jump...")
- (stepper-jump-to-beginning "to beginning")
- (stepper-jump-to-end "to end")
- (stepper-jump-to-selected "to beginning of selected")
- (stepper-jump-to-previous-application "to previous application step")
- (stepper-jump-to-next-application "to next application step")
- (stepper-out-of-steps "Reached the end of evaluation before finding the kind of step you were looking for.")
- (stepper-no-such-step/title "Step Not Found")
- (stepper-no-such-step "Couldn't find a step matching that criterion.")
- (stepper-no-such-step/earlier "Couldn't find an earlier step matching that criterion.")
- 
- (stepper-no-earlier-application-step "No earlier application steps.")
- (stepper-no-later-application-step "No more application steps.")
- (stepper-complete "All of the definitions have been successfully evaluated.")
- 
- (stepper-no-earlier-step "No earlier steps.")
- (stepper-no-later-step "No more steps.")
-  
- (stepper-no-selected-step "No steps taken in the highlighted region. Perhaps it's commented out?")
-  
- (stepper-no-last-step "No final step available yet.")
- 
-  
-  
-
-  
- (debug-tool-button-name "Debug")
-
- (dialog-back "Back")
-
- ;; warnings about closing a drscheme frame when the program
- ;; might still be doing something interesting
- (program-is-still-running "The program in the definitions window is still running. Close anyway?")
-  (program-has-open-windows "The program in the definitions window has open windows. Close this window anyway?")
- 
-  ;; ml-command-line-arguments is for the command line arguments
-  ;; label in the module language details in the language dialog.
-  (ml-command-line-arguments "Command-line arguments as a vector of strings, in read syntax")
-
-  ;; ml-cp names are all for the module language collection path
-  ;; configuration. See the details portion of the language dialog
-  ;; for the module language (at the bottom).
-  (ml-cp-default-collection-path "<<default collection paths>>")
-
-  ;; in std get-directory 
-  (ml-cp-choose-a-collection-path "Please choose a collection path")
-
-  ;; err msg when adding default twice
-  (ml-cp-default-already-present
-   "Default collection paths are already present")
-  
-  ;; title of this section of the dialog (possibly the word
-  ;; `Collection' should not be translated)
-  (ml-cp-collection-paths "Collection Paths")
-
-  ;; button labels
-  ;;  The package manager uses these, too
-  (ml-cp-add "Add")
-  (ml-cp-add-default "Add Default")
-  (ml-cp-remove "Remove")
-  (ml-cp-raise "Raise")
-  (ml-cp-lower "Lower")
-  
-  (ml-always-show-#lang-line "Always show #lang line in the Module language")
-
-  ;; Profj
-  (profj-java "Java")
-  (profj-java-mode "Java mode")
-  (profj-java-coverage "Java Coverage") ;; shows up in the preferences dialog under 'Color'
-  
-  (profj-beginner-lang "Beginner")
-  (profj-beginner-lang-one-line-summary "Java-like Beginner teaching language")
-  (profj-full-lang "Full")
-  (profj-full-lang-one-line-summary "Like Java 1.0 (some 1.1)")
-  (profj-advanced-lang "Advanced")
-  (profj-advanced-lang-one-line-summary "Java-like Advanced teaching language")
-  (profj-intermediate-lang "Intermediate")
-  (profj-intermediate-lang-one-line-summary "Java-like Intermediate teaching language")
-  (profj-intermediate-access-lang "Intermediate + access")
-  (profj-intermediate-access-lang-one-line-summary "Java-like Intermediate teaching language, with access modifiers")
-  (profj-dynamic-lang "Java+dynamic")
-  (profj-dynamic-lang-one-summary "Java with dynamic typing capabilities")
-
-  (profj-java-mode-color-heading "Edit Colors") ; Heading for preference to choose editing colors  
-  (profj-java-mode-color-keyword "keyword")
-  (profj-java-mode-color-string "string")
-  (profj-java-mode-color-literal "literal")
-  (profj-java-mode-color-comment "comment")
-  (profj-java-mode-color-error "error")
-  (profj-java-mode-color-identifier "identifier")
-  (profj-java-mode-color-prim-type "primitive type") ; Example text for built-in Java types
-  (profj-java-mode-color-default "default")
-
-  (profj-coverage-color-heading "Coverage Colors") ; Heading for preference to choose coverage colors
-  (profj-coverage-color-covered "covered expression") 
-  
-  (profj-language-config-display-preferences "Display Preferences") ; Heading for preferences controlling printing
-  (profj-language-config-display-style "Display style")
-  (profj-language-config-display-field "Class + Fields")
-  (profj-language-config-class "Class")
-  (profj-language-config-display-array "Print entire contents of arrays?")
-  (profj-language-config-testing-preferences "Testing Preferences") ; Heading for preferences controlling test behavior
-  ;(profj-language-config-testing-enable "Display testing results on Run?") ; Run should be the word found on the Run button
-  (profj-language-config-testing-coverage "Collect coverage information for tests?")
-  (profj-language-config-support-test-language "Support test Language extension?")
-  (profj-language-config-testing-check "Allow check expression?") ; check should not be translated
-  (profj-language-config-classpath "Classpath")
-  (profj-language-config-choose-classpath-directory "Choose the directory to add to class path")
-  (profj-language-config-classpath-display "Show current") ; Button label to print the current classpath
-
-  (profj-test-name-close-to-example "Class ~a's name contains a phrase close to Example.")
-  (profj-test-name-example-miscapitalized "Class ~a's name contains a miscapitalized example.")
-  
-   ;; Close testing window and do not run test cases any more
-  ;(profj-test-results-close-and-disable "Close and Disable Testing")
-  ;; Hide docked testing window and do not run test cases any more
-  ;(profj-test-results-hide-and-disable "Hide and Disable Testing")
-  ;Renamed below
-  ;(profj-test-results-window-title "Test Results")
-  
-  (profj-unsupported "Unsupported")
-  (profj-executables-unsupported "Sorry - executables are not supported for Java at this time")
-
-  (profj-convert-to-text-comment "Convert to text comment")
-  (profj-convert-to-comment "Convert to comment")
-
-  (profj-executing-main "executing main")
-
-  (profj-insert-java-comment-box "Insert Java Comment Box")
-  (profj-insert-java-interactions-box "Insert Java Interactions Box")
-
-  ;;The Test engine tool
-  ;;
-  (test-engine-window-title "Test Results")
-  ;;Following two appear in View menu, attach and free test report window from DrRacket frame
-  (test-engine-dock-report "Dock Test Report")
-  (test-engine-undock-report "Undock Test Report")
-  ;;Following two appear in Racket (Java, etc) menu, cause Tests to be Run automatically or not
-  (test-engine-enable-tests "Enable Tests")
-  (test-engine-disable-tests "Disable Tests")
-
-  (test-engine-ran-1-test "Ran 1 test.")
-  (test-engine-ran-1-check "Ran 1 check.")
-  ;; ditto, only plural
-  (test-engine-ran-n-tests "Ran ~a tests.")
-  (test-engine-ran-n-checks "Ran ~a checks.")
-  (test-engine-1-test-passed "The test passed!")
-  (test-engine-1-check-passed "The check passed!")
-  (test-engine-both-tests-passed "Both tests passed!")
-  (test-engine-both-checks-passed "Both checks passed!")
-  (test-engine-all-tests-passed "All tests passed!")
-  (test-engine-all-checks-passed "All checks passed!")
-  (test-engine-all-n-tests-passed "All ~a tests passed!")
-  (test-engine-all-n-checks-passed "All ~a checks passed!")
-  (test-engine-0-tests-passed "0 tests passed.")
-  (test-engine-0-checks-passed "0 checks passed.")
-  (test-engine-m-of-n-tests-failed "~a of the ~a tests failed.")
-  (test-engine-m-of-n-checks-failed "~a of the ~a checks failed.")
-  (test-engine-must-be-tested "This program must be tested!")
-  (test-engine-is-unchecked "This program is unchecked!")
-  (test-engine-tests-disabled "Tests disabled.")
-  (test-engine-should-be-tested "This program should be tested.")
-  (test-engine-at-line-column "at line ~a, column ~a")
-  (test-engine-in-at-line-column "in ~a, line ~a, column ~a")
-  ; as in "column (unknown)"
-  (test-engine-unknown "(unknown)")
-  (test-engine-trace-error "Trace error")
-
-  ; The ~F is special marker for the offending values, which may be
-  ; printed specially in DrRacket.
-  (test-engine-check-encountered-error
-   "check-expect encountered the following error instead of the expected value, ~F. ~n   :: ~a")
-  (test-engine-actual-value-differs-error
-   "Actual value ~F differs from ~F, the expected value.")
-  (test-engine-actual-value-not-within-error
-   "Actual value ~F is not within ~v of expected value ~F.")
-  (test-engine-encountered-error-error
-   "check-error encountered the following error instead of the expected ~a~n   :: ~a")
-  (test-engine-expected-error-error
-   "check-error expected the following error, but instead received the value ~F.~n ~a")
-  (test-engine-expected-an-error-error
-   "check-error expected an error, but instead received the value ~F.")
-  ;; members are appended to the message
-  (test-engine-not-mem-error "Actual value ~F differs from all given members in ")
-  (test-engine-not-range-error "Actual value ~F is not between ~F and ~F, inclusive.")
-
-  ;; followed by list of variable bindings
-  (test-engine-property-fail-error "Property falsifiable with")
-  (test-engine-property-error-error "check-property encountered the following error~n:: ~a")
-
-  (signature-enable-checks "Enable Signature Checks")
-  (signature-disable-checks "Disable Signature Checks")
-
-  ; section header
-  (test-engine-check-failures "Check failures:")
-  ; section header
-  (test-engine-signature-violations "Signature violations:")
-
-  ; part of one phrase "signature <at line ...> to blame: procedure <...>
-  (test-engine-signature "signature")
-  (test-engine-to-blame "to blame: procedure")
-
-  (test-engine-no-signature-violations "No signature violations.")
-  (test-engine-1-signature-violation "1 signature violation.")
-  (test-engine-n-signature-violations "~a signature violations.")
-
-  ; as in got <value>, signature <at ...>
-  (test-engine-got "got")
-
-  (profjWizward-insert-java-class "Insert Java Class")
-  (profjWizard-insert-java-union "Insert Java Union")
-  
-  ;; The Test Suite Tool
-  ;; Errors
-  (test-case-empty-error "Empty test case")
-  (test-case-too-many-expressions-error "Too many expressions in a test case.")
-  ;; DrRacket window menu items
-  (test-case-insert "Insert Test Case")
-  (test-case-disable-all "Disable all Test Cases")
-  (test-case-enable-all "Enable all Test Cases")
-  
-  ;; NOTE: The following string constants are labels of the test-case fields. The width
-  ;;       of the field is determined by the length of the longest of the following three words.
-  ;;       if the words are too long the test case will take up too much horizontal room and
-  ;;       not look very good.
-  ;; This string is the label of the expression that is being tested in a test case.
-  (test-case-to-test "Test")
-  ;; This string is the label of the expression that is the expected value of the to-test expression.
-  (test-case-expected "Should be")
-  ;; This string is the label of the actual result of the to test expression.
-  (test-case-actual "Actual")
-  (test-case-predicate "Predicate")
-  (test-case-should-raise "Should Raise")
-  ;; The label of a field of the test-case that describes the expected error message of a test case
-  (test-case-error-message "Error Message")
-
-  (test-case-menu-title "Test Case")
-  (test-case-switch-to-error-box "Switch to Error Test Box")
-  (test-case-switch-to-nonerror-box "Switch to Nonerror Test box")
-  (test-case-collapse "Collapse Test Case")
-  (test-case-show-actual "Show Actual Value")
-  (test-case-enable "Enable Test Case")
-  (test-case-show-predicate "Show Predicate")
-  (test-case-show-error-message "Show Error Message")
-  (test-case-convert-to-text "Convert to text")
-  
-  ;; Profj Boxes
-  (profjBoxes-empty-error "Empty interaction")
-  (profjBoxes-too-many-expressions-error "Too many expressions in a box")
-  (profjBoxes-interactions-label "Interactions")
-  (profjBoxes-bad-java-id-error "Malformed Java ID")
-  (profjBoxes-examples-label "Examples")
-  (profjBoxes-add-new-example-button "Add New Example")
-  (profjBoxes-type "Type")
-  ;; The Java identifier of an example of data
-  (profjBoxes-name "Name")
-  (profjBoxes-value "Value")
-  (profjBoxes-insert-java-examples "Insert Java Examples")
-  (profjBoxes-insert-java-interactions "Insert Java Interactions")
-
-  ;; Slideshow
-  (slideshow-hide-picts "Show Nested Boxes")
-  (slideshow-show-picts "Show Picts")
-  (slideshow-cannot-show-picts "Cannot show picts; run program to cache sizes first")
-  (slideshow-insert-pict-box "Insert Pict Box") 
-
-  ;; GUI Tool
-  (gui-tool-heading "GUI Tool")
-  (gui-tool-before-clicking-message 
-   "Before clicking a tool icon, use \"Insert GUI\" from the \"Special\" menu"
-   " to insert a root GUI item, or select an already inserted GUI.")
-  (gui-tool-show-gui-toolbar "Show GUI Toolbar")
-  (gui-tool-hide-gui-toolbar "Hide GUI Toolbar")
-  (gui-tool-insert-gui "Insert GUI")
-
-  ;; contract violation tracking
-  
-  ; tooltip for new planet icon in drscheme window (must have a planet violation logged to see it)
-  (show-planet-contract-violations "Show PLaneT contract violations")
-
-  ; buttons in the dialog that lists the recorded bug reports
-  (bug-track-report "File Ticket")
-  (bug-track-forget "Forget")
-  (bug-track-forget-all "Forget All")
-    
-  ;; planet status messages in the bottom of the drscheme window; the ~a is filled with the name of the package
-  (planet-downloading "PLaneT: Downloading ~a...")
-  (planet-installing "PLaneT: Installing ~a...")
-  (planet-finished "PLaneT: Finished with ~a.")
-  (planet-docs-building "PLaneT: Building docs (triggered by ~a)...")
-  (planet-no-status "PLaneT") ;; this can happen when there is status shown in a different and then the user switches to a tab where planet hasn't been used
-  
-  (bug-report-field-pkg "Package system info")
-  
-  ;; string normalization. To see this, paste some text with a ligature into DrRacket
-  ;; the first three strings are in the dialog that appears. The last one is in the preferences dialog
-  (normalize "Normalize")
-  (leave-alone "Leave alone")
-  (normalize-string-info "The string you pasted contains ligatures or other non-normalized characters. Normalize them?")
-  (normalize-string-preference "Normalize pasted strings")
-  (ask-about-normalizing-strings "Ask about normalizing strings")
-  
-  (always-use-platform-specific-linefeed-convention "Always use the platform-specific linefeed convention")
-
-  ;; optimization coach
-  (hide-optimization-coach "Hide Optimization Coach")
-  (show-optimization-coach "Show Optimization Coach")
-
-  ;; labels used (in a big font) in the background of the definitions and interactions windows
-  (definitions-window-label "definitions")
-  (interactions-window-label "interactions")
-  (hide-defs/ints-label "Hide Definitions/Interactions Labels") ;; popup menu
-  (show-defs/ints-label "Show definitions/interactions labels") ;; preferences checkbox
-
-  ;; menu item in the 'edit' menu; applies to editors with programs in them
-  ;; (technically, editors that implement color:text<%>)
-  (spell-check-string-constants "Spell Check String Constants")
-  (spell-check-scribble-text "Spell Check Text (between {} in Scribble)")
-  (spelling-dictionaries "Spelling Dictionaries") ; (sub)menu whose items are the different possible dictionaries
-  (default-spelling-dictionary "Default Dictionary") ; first item in menu from previous line
-  (misspelled-text-color "Misspelled Text Color") ;; in the preferences dialog  
-  (cannot-find-ispell-or-aspell-path "Cannot find the aspell or ispell binary")
-  ; puts the path to the spell program in the ~a and then the error message
-  ; is put following this string (with a blank line in between)
-  (spell-program-wrote-to-stderr-on-startup "The spell program (~a) printed an error message:")
-  (spell-skip-to-next-misspelled-word "Skip to Next Mispelled Word") ;; menu item
-  (spell-suggest-corrections "Suggest Spelling Corrections...") ;; menu item
-  (spell-correction-suggestions "Spelling Correction Suggestions") ;; dialog title
-  (spell-choose-replacement-word "Select a replacement word") ;; label in dialog 
-  
-  ;; GUI for installing a pkg package; available via File|Install Package...
-  (install-pkg-install-by-source "Do What I Mean")         ; tab label
-  (install-pkg-install-from-list "Available from Catalog") ; tab label
-  (install-pkg-install-installed "Currently Installed")    ; tab label
-  (install-pkg-migrate-from "Copy from Version")           ; tab label
-  (install-pkg-settings "Settings")                        ; tab label
-  (install-pkg-menu-item... "Install Package...")
-  (install-pkg-dialog-title "Install Package")
-  (install-pkg-source-label "Package Source")
-  (install-pkg-package-name "Package Name")
-  (install-pkg-package-source-desc "A package source is a package name, file, directory, URL, or Github reference")
-  (install-pkg-infer "Infer")
-  (install-pkg-use "Use") ; as opposed to "Infer", label for text box
-  (install-pkg-type-label "Package Source Type")
-  (install-pkg-file "File")
-  (install-pkg-dir "Directory")
-  (install-pkg-dir-url "Remote Directory")
-  (install-pkg-file-url "Remote File")
-  (install-pkg-git "Git Repository")
-  (install-pkg-github "Github")
-  (install-pkg-name "Name (consulting resolver)")
-  (install-pkg-inferred-as "Type inferred to be ~a") ; ~a gets install-pkg-{file,dir,...}
-  (install-pkg-link-dirs "Local directory as link")
-  (install-pkg-file-or-dir? "Choose a file or a directory?")
-  (install-pkg-force? "Ignore conflicts")
-  (install-pkg-replace? "Updates can replace existing installations")
-  (install-pkg-command-line "Equivalent command line invocation:")
-  (install-pkg-error-installing-title "Error Installing Package")
-  (install-pkg-action-label "Action to Take")
-  (install-pkg-install "Install")
-  (install-pkg-update "Update")
-  (install-pkg-remove "Remove")
-  (install-pkg-do-not-remove "Don't Remove")
-  (install-pkg-action-inferred-to-be-update "Action inferred to be Update")
-  (install-pkg-action-inferred-to-be-install "Action inferred to be Install")
-  (install-pkg-default "Default")
-  (install-pkg-scope-label "Package Scope")
-  (install-pkg-default-scope-label "Default Package Scope") ; for picking the scope to be default
-  (install-pkg-installation "Specific Racket Installation")
-  (install-pkg-user "Specific User and Racket Version")
-  (install-pkg-set-as-default "Set as Default")
-  (install-pkg-scope-is "Package scope is ~a") ; ~a gets install-pkg-{installation,user,shared}
-  (install-pkg-select-package-directory "Select Package Directory")
-  (install-pkg-select-package-file "Select Package File")
-  (install-pkg-update-package-list "Update Package List")
-  (install-pkg-stop-update "Stop Update")
-  (install-pkg-filter "Filter")
-  (install-pkg-update-catalogs? "Update database to match the configured set of catalogs?")
-  (install-pkg-currently-configured-are "The currently configured catalogs are")
-  (install-pkg-database-recorded-are "The database-recorded catalogs are")
-  (install-pkg-update-catalogs "Update")
-  (install-pkg-do-not-update-catalogs "Don't Update")
-  (install-pkg-really-remove? "Are you sure you want to remove the following selected packages?")
-  (install-pkg-promote "Promote from Auto-Installed")
-  (install-pkg-demote "Demote to Auto-Installed")
-  (install-pkg-abort-install "Abort Install")
-  (install-pkg-abort-update "Abort Update")
-  (install-pkg-abort-remove "Abort Remove")
-  (install-pkg-abort-demote "Abort Demote")
-  (install-pkg-abort-promote "Abort Promote")
-  (install-pkg-abort-migrate "Abort Migrate")
-  (install-pkg-abort-generic-action "Abort Action")
-  (install-pkg-close-terminal-output "Close Output")
-  (install-pkg-show-all-options "Show All Options")
-  (install-pkg-migrate-available-installations "Available Installations")
-  (pkg-manager-menu-item "Package Manager...")  
-  ;; where ~a gets an installation name:
-  (install-pkg-packages-for "Packages for ~a")
-  (install-pkg-really-remove-installation "Are you sure you want to remove all installed packages and information for ~a?")
-  
-  (install-pkg-abort-set-scope "Abort Scope Change")
-
-  (install-pkg-dependencies-fail "Fail: cancels installation/update if dependencies are unmet")
-  (install-pkg-dependencies-force "Force: install despite missing or version-mismatched dependencies")
-  (install-pkg-dependencies-search-ask "Ask: prompt about each missing dependency (not supported in GUI)")
-  (install-pkg-dependencies-search-auto "Auto: install missing or version-mismatched dependencies automatically")
-  (install-pkg-dependencies-search-auto+update "Auto + Update: update dependencies whenever possible")
-
-  (install-pkg-dependencies-mode "Dependencies Mode")
-
-  (install-pkg-dependencies-search-ask-not-supported-in-gui
-   "The “ask“ mode for dependencies is not supported in the GUI installer.")
-  ;; "~a" is pre-":" part of `install-pkg-dependencies-fail' or `install-pkg-dependencies-search-auto':
-  (install-pkg-deps-is "Default dependency mode is ~a")
-
-  (install-pkg-package-catalogs "Package Catalogs") ; label for a list box
-  (install-pkg-add-package-catalog "Add Package Catalog")
-
-  (install-pkg-not-rentrant "Installation and updating cannot happen simultaneously;"
-                            " either abort the current one or wait for it to finish.")
-  
-  ;; open a file via a collection path (new "Open" menu item in DrRacket)
-  (open-require-path "Open Require Path...")
-  (enter-subcollection "Enter subcollection") ; button in new dialog
-  (path-to-racket-binary "Path to binary")
-  (use-a-different-racket "Use a different racket")
-
-  ;; adding racket/bin to the path; only under mac os x
-  ; first ~a is filled with either the empty string or an error message from elsewhere
-  ;  (bracketed by some newlines to separate it out)
-  ; second ~a is filled with /etc/paths.d/racket (or some other path like it in the future)
-  ; third ~a is filled with the path to the bin directory of the current drracket
-  (adding-racket/bin-to-path-failed 
-   "Attempt to add racket support to the command line failed.~aSpecifically,"
-   " could not create \"~a\" with the contents \"~a\".")
-  ; first and third ~a are filled with /etc/paths.d/racket (or some other path like it in the future)
-  ; and the second one is filled with the path to the bin directory that was put into that file.
-  (added-racket/bin-to-path
-   "You should now be able to use racket and its tools at the"
-   " command-line.\n\nThe"
-   " default PATH has been configured for all users by adding the file"
-   " ~a to point to ~a. You can undo this"
-   " configuration by deleting ~a.")
-  (add-racket/bin-to-path "Configure Command Line for Racket...") ;; menu item label
-  )
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/french-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/french-string-constants.rkt
deleted file mode 100644
index 56c2b39d2d..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/french-string-constants.rkt
+++ /dev/null
@@ -1,1918 +0,0 @@
-; Do not remove all these blank lines, I use them to make sure a translation
-; in this file appears on the same line as in english-string-constants.rkt
-
-; aâàbcçdeéêèëfghiîïjklmnoôpqrstuûùüvwxyz AÂÀBCÇDEÉÊÈËFGHIÎÏJKLMNOÔPQRSTUÛÙÜVWXYZ “” «  »
-
-; The following can be useful: http://www.jargonf.org/
-;                              http://www.dicofr.com/
-;                              http://translate.google.com/
-; http://atilf.atilf.fr/academie9.htm est le dico de l'academie (A-Q seulement pour l'instant)
-; http://www.lexilogos.com/francais_langue_dictionnaires.htm a plus de liens
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-(module french-string-constants "string-constant-lang.rkt"
-  ;;; when translating this constant, substitute name of actual language for `English'
-  (is-this-your-native-language "Le Français est-il votre langue maternelle ?")
-
-  (are-you-sure-you-want-to-switch-languages
-   "Ceci va changer le langage utilisé par l'interface graphique, ce qui va nécessiter un redémarrage de DrRacket. Êtes-vous certain de vouloir continuer ?")
-
-  (interact-with-drscheme-in-language "Interagir avec DrRacket en Français")
-
-  ;; these two should probably be the same in all languages excepet English.
-  ;; they are the button labels (under macos and windows, respectively)
-  ;; that go the with the string above.
-  (accept-and-quit "Accepter et Quitter")
-  (accept-and-exit "Accepter et Quitter")
-
-  ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
-  (plt "PLT")
-  (drscheme "DrRacket")
-  (drracket "DrRacket")
-  (ok "OK")
-  (cancel "Annuler")
-  (abort "Abandonner")
-  (untitled "Sans Nom")
-  (untitled-n "Sans Nom ~a")
-  (warning "Avertissement")
-  (error "Erreur")
-  (close "Fermer") ;; as in, close an open window or tab. must match close-menu-item
-                   ;; in the sense that, when the &s have been stripped from
-                   ;; close-menu-item, it must be the same string as this.
-  (close-window "Fermer la fenêtre")
-  (stop "Stop")
-  (&stop "&Stop") ;; for use in button and menu item labels, with short cut.
-  (are-you-sure-delete? "Êtes-vous certain de vouloir effacer ~a ?") ;; ~a is a filename
-  (are-you-sure-replace? "Êtes-vous certain de vouloir remplacer ~a ?") ;; ~a is a filename or directory name
-  (ignore "Ignorer")
-  (revert "Retourner") ; revenir?
-
-  ;; label for a generic check box, often supported on dialogs
-  ;; that ask a binary choice of the user. If checked, the
-  ;; dialog isn't going to be shown again.
-  ;; One version for always using the current choice:
-  (dont-ask-again-always-current "Ne jamais redemander (utilisera toujours votre présent choix)")
-  ;; One generic version (ie, on the Quit DrRacket dialog)
-  (dont-ask-again "Ne jamais redemander")
-
-  ;;; important urls
-  (web-materials "Sites web apparentés") ;; menu item title
-  (tool-web-sites "Sites web d'outils")   ;; menu item title
-  (plt-homepage "Racket")
-  (pbd-homepage "Program by Design")
-
-  ;;; bug report form
-  (cancel-bug-report? "Annuler la soumission du rapport de bogue ?")
-  (are-you-sure-cancel-bug-report?
-   "Êtes-vous certain de vouloir annuler la soumission de ce rapport de bogue ?")
-  (do-you-want-to-discard-or-save-this-bug-report
-   "Voulez-vous abandonner ou sauvegarder ce rapport de bogue ?")
-  (discard "Abandonner") ;; a button label for a dialog box with the above question
-  (bug-report-form "Formulaire de soumission de bogue")
-  (bug-report-field-name "Nom")
-  (bug-report-field-email "Email")
-  (bug-report-field-summary "Résumé du problème")
-  (bug-report-field-severity "Sévérité")
-  (bug-report-field-class "Classe")
-  (bug-report-field-description "Description")
-  (bug-report-field-reproduce1 "Etapes à suivre pour")
-  (bug-report-field-reproduce2 "reproduire le bogue")
-  (bug-report-field-environment "Environnement")
-  (bug-report-field-docs-installed "Documentations installées")
-  (bug-report-field-collections "Collections")
-  (bug-report-field-links "Liens")  ;; from 'raco link'
-  (bug-report-field-human-language "Langage humain")
-  (bug-report-field-memory-use "Mémoire utilisée")
-  (bug-report-field-version "Version")
-  (bug-report-synthesized-information "Information Synthétisée")  ;; dialog title
-  (bug-report-show-synthesized-info "Montrer l'information synthétisée")
-  (bug-report-submit "Soumettre")
-  (close-and-save-bug-report "Fermer && Sauvegarder") ;; button in bug report dialog, next to cancel and bug-report-submit
-  (bug-report-submit-menu-item "Soumettre un rapport de bogue...") ;; in Help Menu (drs & help desk)
-  (saved-bug-reports-menu-item "Rapports de bogues sauvegardés") ;; in Help Menu, submenu title
-  (disacard-all-saved-bug-reports "Abondonner tous les rapports de bogues sauvegardés") ;; menu item: only shows up when there is more than one saved bug report
-  (no-saved-bug-reports "Aucun rapport de bogue n'a été sauvegardé") ;; an info message that shows up as a disabled menu item when no saved bug reports are around
-  (new-bug-report "Nouveau rapport de bogue") ;; button label the user sees when there are saved bug reports, but the user asks to save another one.
-  (close-and-save "Fermer et sauvegarder") ;; button on the bottom of the bug report form
-  (saved-unsubmitted-bug-reports "Rapports de bogues sauvegardés mais non-soumis :")
-  ;; the above string constant is next to previous line in same dialog, followed by list of bug report subjects (as buttons)
-  (error-sending-bug-report "Erreur durant la soumission du rapport de bogue.")
-  (error-sending-bug-report-expln
-   "Une erreur s'est produite pendant la soumission de votre rapport de bogue."
-   " Si votre connexion Internet fonctionne correctement, veuillez visiter :\n\n    http://bugs.racket-lang.org/\n\n"
-   " et soumettre votre bogue en utilisant notre formulaire web en ligne. Nous sommes désolés pour vos difficultés.\n\nLe message d'erreur est :\n~a")
-  (illegal-bug-report "Formulaire de soumission de bogue incomplet.")
-  (pls-fill-in-field "Merci de compléter le champ « ~a ».")
-  (malformed-email-address "Adresse email malformée.")
-  (pls-fill-in-either-description-or-reproduce "Veuillez remplir soit le champ « Description », soit le champ « Etapes à suivre pour reproduire le bogue ».")
-
-  ;;; check syntax
-  (check-syntax "Vérifier") ; "Syntaxe" ; "Vérificateur de syntaxe" est long...
-  (cs-italic "Italique")
-  (cs-bold "Gras")
-  (cs-underline "Souligné")
-  (cs-change-color "Changer la couleur")
-  (cs-foreground-color "Couleur d'avant-plan")
-  (cs-background-color "Couleur d'arrière-plan")
-  (cs-tack/untack-arrow "Coller/décoller les flèches")
-  (cs-jump-to-next-bound-occurrence "Aller à l'occurence suivante")
-  (cs-jump-to-previous-bound-occurrence "Aller à l'occurence précédente")
-  (cs-jump-to-binding "Aller à l'occurence liant celle-ci")
-  (cs-jump-to-definition "Aller à la définition (dans un autre fichier)")
-  (cs-open-defining-file "Ouvrir le fichier contenant la définition")
-  (cs-error-message "Message d'erreur")
-  (cs-open-file "Ouvrir ~a")
-  (cs-rename-var "Renommer ~a")
-  (cs-rename-id "Renommer l'identificateur")
-  (cs-rename-var-to "Renommer ~a en :")
-  (cs-name-duplication-error "Le nouveau nom que vous avez choisi, ~s, est en conflit avec un autre nom préexistant dans le même contexte.")
-  (cs-rename-anyway "Renommer quand même")
-  (cs-status-init "Vérificateur de syntaxe : initialisation de l'environnement pour le code de l'utilisateur")
-  (cs-status-coloring-program "Vérificateur de syntaxe : coloriage d'une expression")
-  (cs-status-eval-compile-time "Vérificateur de syntaxe : évaluation pour l'expansion") ; peut mieux faire?
-  (cs-status-expanding-expression "Vérificateur de syntaxe : expansion d'une expression")
-  (cs-status-loading-docs-index "Vérificateur de syntaxe : chargement de l'index de la documentation")
-  (cs-mouse-over-import "l'identificateur ~s est importé de ~s")
-  (cs-view-docs "Documentation pour ~a")
-  (cs-view-docs-from "~a dans ~a")  ;; a completed version of the line above
-  ;; (cs-view-docs) is put into the first ~a and a list of modules (separated by commas)
-  ;; is put into the second ~a. Use check syntax and right-click on a documented variable (eg, 'require') to see this in use
-
-  (cs-lexical-variable "variables lexicales")
-  (cs-set!d-variable "variables modifiées à l'aide de set!")
-  (cs-imported-variable "variables importées")
-  (cs-unused-require "« require » unitilisé")
-  (cs-free-variable "variable libre")
-
-  (cs-binder-count "~a sources de référence")
-  (cs-zero-varrefs "pas de référence") ;  de cette variable...
-  (cs-one-varref "1 référence")
-  (cs-n-varrefs "~a références") ;; expected to have one ~a formatter that will accept a number
-
-  (cs-contract-my-obligation "Contrat: obligation de ce module")
-  (cs-contract-their-obligation "Contrat: obligation des modules clients")
-  (cs-contract-both-obligation "Contrat: obligation de ce module et des modules clients")
-  (cs-contract-unk-obligation "Contrat: obligation inconnue")
-
-  ;; mode sub-menu in the "view" menu
-  (cs-check-syntax-mode "Mode de vérification syntaxique")
-  (cs-mode-menu-show-my-obligations "Mes obligations to contrat")
-  (cs-mode-menu-show-client-obligations "Les obligations de contrat du client")
-  (cs-mode-menu-show-syntax "Catégories syntaxiques")
-
-  ;; the documentation blue boxes in the upper-right corner of the drracket window
-  (sc-read-more... "lire plus...")
-  (sc-f2-to-un/lock "F2 pour (dé)verrouiller")
-
-  ;; the online check syntax status messages (mouse over the bottom right of drracket's window to see the messages during online expansion's various phases)
-  (online-expansion-running "Expansion en arrière-plan en cours") ; used to be "Vérification syntaxique" instead of "Expansion"
-  (online-expansion-only-raw-text-files-supported "Seul les fichiers texte purs sont supportés")
-  (online-expansion-abnormal-termination "Expansion terminée anormalement")
-  (online-expansion-finished-successfully "Expansion terminée correctement")
-
-  (jump-to-error "Aller à l'erreur")
-  (online-expansion-is-disabled "L'expansion en arrière-plan est interdite")
-  ; these next two show up in the bar along the bottom of the drracket window
-  (online-expansion-pending "Expansion en cours...")
-  (online-expansion-finished "Expansion terminée") ;; note: there may still be errors in this case
-  ; the next two show up in a menu when you click on the circle in the bottom right corner
-  (disable-online-expansion "Interdire l'expansion en arrière-plan")
-  (enable-online-expansion "Autoriser l'expansion en arrière-plan")
-  ;; the online expansion preferences pane
-  (online-expansion "Expansion en arrière-plan") ;; title of prefs pane
-  ; the different kinds of errors
-  (online-expansion-show-read-errors-as "Montrer les erreurs syntaxiques") ; erreurs structurelles, erreurs provenants de "read"?
-  (online-expansion-show-variable-errors-as "Montrer les identificateurs libres")
-  (online-expansion-show-other-errors-as "Montrer les autres erreurs")
-  ; locations the errors can be shown
-  (online-expansion-error-gold-highlight "par surlignage doré")
-  (online-expansion-error-margin "dans la marge")
-  ; the label of a preference in the (string-constant online-expansion) section
-  (show-arrows-on-mouseover "Montrer dynamiquement les flèches pour les liens entre variables et pour les appels de fonctions en position terminale") ; mouse over -> dynamiquement
-  (show-blueboxes "Montrer les boites bleues et le quart de cercle bleu")
-  ;;; info bar at botttom of drscheme frame
-  (collect-button-label "Ramassage") ; de miettes
-  (read-only "Lecture seulement")
-  (auto-extend-selection "Autosélection") ; "Sélection auto-étendable" ?
-  (overwrite "Écrasement") ; vs Insertion ? surimpression ?
-  (running "en cours")
-  (not-running "en attente") ; "en attente" ; pause ?
-
-  (install-package-button "Installer ~a") ;; button label: ~a is filled with the name of a pkg
-
-  ;;; misc
-  (welcome-to-something "Bienvenue dans ~a.")
-
-  ; this appears in the drscheme about box.
-  (welcome-to-drscheme-version/language "Bienvenue dans DrRacket, version ~a, ~a.")
-
-  ; these appear on subsequent lines in the `Help|Welcome to DrRacket' dialog.
-  (welcome-to-drscheme "Bienvenue dans DrRacket")
-
-  (goto-line "Aller à la ligne")
-  (goto-line-invalid-number
-   "~a n'est pas un numéro de ligne valide. Ce doit être un entier entre 1 et ~a.")
-  (goto-position "Aller à la position")
-  (no-full-name-since-not-saved
-   "Le fichier n'a pas encore de nom complet car il n'a pas encore été sauvegardé.")
-  (cannot-open-because-dne "Impossible d'ouvrir ~a car le fichier n'existe pas.")
-
-  (needs-execute-language-changed
-   "ATTENTION : le langage a changé. Cliquez sur Exécuter.")
-  (needs-execute-teachpack-changed
-   "ATTENTION : les teachpacks ont changé. Cliquez sur Exécuter.")
-  (needs-execute-defns-edited
-   "ATTENTION : la fenêtre de définition a changé. Cliquez sur Exécuter.")
-
-  (editor-changed-since-srcloc-recorded
-   "Le contenu de cet éditeur a changé depuis que la position du code source a été enregistrée, donc la section de code surlignée peut ne plus correspondre à la position correcte.")
-
-  (file-is-not-saved "Le fichier « ~a » n'a pas été sauvegardé.")
-  (save "Sauvegarder")
-  (close-anyway "Fermer quand même")
-  (dont-save "Ne pas sauvegarder")
-  (clear-anyway "Effacer quand même")
-
-  ;; menu item title
-  (log-definitions-and-interactions "Enregistrer les définitions et interactions...")
-  (stop-logging "Stopper l'enregistrement")
-  (please-choose-a-log-directory "Sélectionnez un répertoire d'enregistrement")
-  (logging-to "Enregistrer dans : ")
-  (erase-log-directory-contents "Effacer le contenu du répertoire d'enregistrement : ~a ?")
-  (error-erasing-log-directory "Erreur durant l'effacement du contenu du répertoire d'enregistrement.\n\n~a\n")
-
-  ;; menu items connected to the logger -- also in a button in the planet status line in the drs frame
-  (show-log "Montrer le journa&l") ; "journaux" ne contient pas de "l"...
-  (hide-log "Cacher le journa&l")
-  (logger-scroll-on-output "Se déplacer à chaque nouveau message") ; a checkbox in the logger pane
-  (log-messages "Journal des messages") ;; label for the drracket logging gui panel
-
-  ;; modes
-  (mode-submenu-label "Modes")
-  (scheme-mode "Mode Scheme")
-  (racket-mode "Mode Racket")
-  (text-mode "Mode texte")
-
-  (scheme-mode-color-symbol "symboles")
-  (scheme-mode-color-keyword "mots réservés")
-  (scheme-mode-color-comment "commentaires")
-  (scheme-mode-color-string "chaînes de caractères")
-  (scheme-mode-color-text "texte")
-  (scheme-mode-color-constant "constantes")
-  (scheme-mode-color-parenthesis "parenthèses")
-  (scheme-mode-color-hash-colon-keyword "#:mot-réservé")
-  (scheme-mode-color-error "erreurs")
-  (scheme-mode-color-other "autre")
-  ;; the ~a is filled in with one of the above (scheme-mode-*)
-  (syntax-coloring-choose-color "Choisissez une couleur pour ~a")
-  (preferences-colors "Couleurs") ;; used in the preferences dialog
-
-  ;; parenthesis color scheme string constants
-  (parenthesis-color-scheme "Couleurs des parenthèses") ;; label for the choice% menu in the preferences dialog
-  (paren-color-basic-grey "Gris simple")
-  (paren-color-shades-of-gray "Nuances de gris")
-  (paren-color-shades-of-blue "Nuances de bleu")
-  (paren-color-spring "Printemps")
-  (paren-color-fall "Automne")
-  (paren-color-winter "Hiver")
-
-
-  (url: "URL :")
-  (open-url... "Ouvrir l'URL...")
-  (open-url "Ouvrir l'URL")
-  (browse... "Naviguer...")
-  (bad-url "URL incorrect")
-  (bad-url:this "URL incorrect : ~a")
-
-  ;; Help Desk
-  (help "Aide")
-  (racket-documentation "Documentation Racket")
-  (help-desk "Aide")
-  (plt:hd:search "Chercher")
-  (plt:hd:feeling-lucky "D'humeur chanceuse")
-  (plt:hd:home "Page d'accueil de l'Aide")
-  ; next 3 are popup menu choices at bottom of help desk window
-  (plt:hd:search-for-keyword "par mot clef")
-  (plt:hd:search-for-keyword-or-index "par mot clef ou entrée dans l'index")
-  (plt:hd:search-for-keyword-or-index-or-text "par mot clef, entrée dans l'index ou dans le texte")
-  (plt:hd:exact-match "mot exact")
-  (plt:hd:containing-match "contenant le mot")
-  (plt:hd:regexp-match "expression régulière")
-  (plt:hd:find-docs-for "Chercher dans les docs :")
-  (plt:hd:search-stopped-too-many-matches "(Recherche stoppée - trop d'entrées ont été trouvées.)")
-  (plt:hd:nothing-found-for "Rien n'a été trouvé pour ~a.")
-  (plt:hd:and "et")
-  (plt:hd:refresh "rafraîchir")
-  (plt:hd:refresh-all-manuals "rafraîchir tous les manuels")
-  (plt:hd:manual-installed-date "(installé le ~a)")
-  ; Help Desk configuration
-  ;; refreshing manuals
-  (plt:hd:refreshing-manuals "Retéléchargement des manuels")
-  (plt:hd:refresh-downloading... "Téléchargement de ~a...")
-  (plt:hd:refresh-deleting... "Effacement de l'ancienne version de ~a...")
-  (plt:hd:refresh-installing... "Installation de la nouvelle version de ~a...")
-  (plt:hd:refresh-clearing-indices "Effacement des indices cachés")
-  (plt:hd:refreshing-manuals-finished "Terminé.")
-  (plt:hd:about-help-desk "A propos de l'Aide")
-  (plt:hd:help-desk-about-string
-   "L'Aide est une source complète d'information à propos des logiciels du PLT, y compris DrRacket, MzScheme et MrEd.\n\nVersion ~a\nCopyright (c) ~a-~a PLT.")
-  (plt:hd:help-on-help "Aide de l'Aide")
-  (plt:hd:help-on-help-details
-   "Pour obtenir de l'aide sur comment utiliser l'Aide, suivez le premier lien `Help Desk' à partir de la page principale de l'Aide"
-   " (pour trouver la page principale, si vous n'y êtes pas déjà, cliquez sur le boutton `Maison' qui apparaît en haut de la fenêtre de l'Aide).")
-  (reload "Rafraîchir")
-  (plt:hd:ask-about-separate-browser
-   "Vous avez sélectionné un lien vers une page sur le world-wide web."
-   " Voulez-vous voir cette page en utilisant le navigateur de l'Aide ou voulez-vous utiliser un navigateur séparé ?")
-  (plt:hd:homebrew-browser "Navigateur de l'Aide") ;; choice for the above string (in a button)
-  (plt:hd:separate-browser "Navigateur séparé") ;; other choice for the above string (also in a button)
-  (plt:hd:external-link-in-help "URLs externes dans l'Aide")
-  (plt:hd:use-homebrew-browser "Utiliser le navigateur de l'Aide pour les URLs externes")
-  (plt:hd:new-help-desk "&Nouvelle Aide")
-
-  ;; in the Help Desk language dialog, title on the right.
-  (plt:hd:manual-search-ordering "Ordre de recherche dans les manuels")
-
-  ;; in the help-desk standalone font preference dialog, on a check box
-  (use-drscheme-font-size "Utiliser la taille de police de DrRacket")
-
-  ;; in the preferences dialog in drscheme there is example text for help desk font size.
-  ;; clicking the links in that text produces a dialog with this message
-  (help-desk-this-is-just-example-text
-   "Ceci est simplement un morceau de texte pour pouvoir choisir la taille de la police.  Ouvrez l'Aide (dans le menu Aide) pour suivre ces liens.")
-
-  ;; this appears in the bottom part of the frame the first time the user hits `f1'
-  ;; (assuming nothing else has loaded the documentation index first)
-  ;; see also: cs-status-loading-docs-index
-  (help-desk-loading-documentation-index "Aide: chargement de l'index de la documentation")
-
-  ; help desk htty proxy
-  (http-proxy "Proxy HTTP")
-  (proxy-direct-connection "Connexion directe")
-  (proxy-use-proxy "Utiliser le proxy :")
-  (proxy-host "Machine")
-  (proxy-port "Port")
-  (proxy-bad-host "Mauvaise machine proxy")
-
-  ;; browser
-  (rewind-in-browser-history "Retourner")
-  (forward-in-browser-history "Avancer")
-  (home "Maison")
-  (browser "Navigateur")
-  (choose-browser "Choisissez un navigateur")
-  (external-browser-choice-title "Navigateur externe") ; title for radio-button set
-  (browser-command-line-label "Ligne de commande :") ; label for radio button that is followed by text boxes
-  (no-browser "Demander plus tard")
-  (browser-cmdline-expl-line-1 "(La ligne de commande est la concaténation du préfixe, de l'URL,") ; explanatory text for dialog, line 1
-  (browser-cmdline-expl-line-2 "et du suffixe, sans espace additionel entre eux.)") ; ... line 2. (Anyone need more lines?)
-  (install? "Installer ?")  ;; if a .plt file is found (title of dialog)
-  (you-have-selected-an-installable-package "Vous avez sélectionné un logiciel qui peut être installé.") ; package => paquetage, pas tres clair...
-  (do-you-want-to-install-it? "Voulez-vous l'installer ?")
-  (paren-file-size "(Le fichier fait ~a octets)")
-  (download-and-install "Télécharger && Installer") ;; button label
-  (download "Télécharger") ;; button label
-  (save-downloaded-file/size "Sauvegarder le fichier téléchargé (~a octets) sous le nom") ;; label for get-file dialog
-  (save-downloaded-file "Sauvegarder le fichier téléchargé sous le nom")  ;; label for get-file dialog
-  (downloading "Téléchargement") ;; dialog title
-  (downloading-file... "Téléchargement du fichier en cours...")
-  (package-was-installed "Le logiciel à été installé.")
-  (download-was-saved "Le fichier téléchargé à été sauvegardé.")
-
-  (install-plt-file-menu-item... "Installer un fichier .plt...")
-  (install-plt-file-dialog-title "Installer un fichier .plt")
-  (install-plt-web-tab "Web")
-  (install-plt-file-tab "Fichier")
-  (install-plt-filename "Nom de fichier :")
-  (install-plt-url "URL :")
-  ; an error message from a primitive operation is appended to the end of this message.
-  (install-plt-error-downloading "Une erreur est survenue pendant le téléchargement du"
-                                 " fichier .plt.\n\nDétails :\n")
-  (install-plt-error-header "Une erreur est survenue pendant la vérification de la validité du ficher .plt que vous avez téléchargé.  Vérifiez l'URL et essayez à nouveau.")
-
-  ;; install plt file when opened in drscheme strings
-  (install-plt-file "Installer ~a ou l'ouvrir pour édition ?")
-  (install-plt-file/yes "Installation")
-  (install-plt-file/no "Edition")
-
-  (plt-installer-progress-window-title "Progresssion de l'installation") ;; frame title
-  (plt-installer-abort-installation "Abandonner l'installation") ;; button label
-  (plt-installer-aborted "Installation abandonnée.") ;; msg that appears in the installation window when installation is aborted
-
-  ;;; about box
-  (about-drscheme-frame-title "À propos de DrRacket")
-
-  ;;; save file in particular format prompting.
-  (save-as-plain-text "Sauvegarder ce fichier au format texte ?")
-  (save-in-drs-format "Sauvegarder ce fichier au format DrRacket (non-texte) ?")
-  (yes "Oui")
-  (no "Non")
-
- ;; saving image (right click on an image to see the text)
-  (save-image "Sauvegarder l'image...")
-
-  ;;; preferences
-  (preferences "Préférences")
-  (error-saving-preferences "Erreur durant la sauvegarde des préférences : ~a.")
-  (error-saving-preferences-title "Erreur durant la sauvegarde des préférences")
-  (steal-the-lock-and-retry "Casser le verrou et réessayer") ;; in the preferences error dialog; this happens when the lockfile exists (after 3 pref writes).
-
-  (error-reading-preferences "Erreur durant la lecture des préférences.")
-  (error-reading-preferences-explanation "Le fichier de préférences est verrouillé, ce qui empêche la lecture de la préférence ~a")
-  ;; in the above, ~a is filled with the name of the preference (a symbol)
-  (dont-ask-again-until-drracket-restarted "Ne pas redemander (jusqu'à ce que DrRacket soit redémarré)")
-  ; difference between the above and below is one comes with a question (steal the lock or not) and the other with just a notation saying "the file is locked"
-  (dont-notify-again-until-drracket-restarted "Ne pas renotifier (jusqu'à ce que DrRacket soit redémarré)")
-  (prefs-file-locked "Le fichier de préférences est verrouillé (car le fichier ~a existe), donc vos préférences n'ont pu être sauvegardées.  Annuler le changement des préférences ?")
-  (try-again "Essayer à nouveau") ;; button label
-  (give-up-and-use-the-default "Abandonner et utiliser la valeur par défaut") ;; button label
-
-  (prefs-file-still-locked "Le fichier de préférences est toujours verrouillé (car le fichier ~a existe), donc vos changements ne vont pas être sauvegardés.")
-  (prefs-file-locked-nothing-doing
-   "Le fichier de préférences est verrouillé (via ~s), donc vos changements de préférences ne peuvent être sauvegardés.")
-   ;; the  ~s is filled with the lockfile; this string is (currently) used only on windows where lockfiles are less friendly (and there is no steal fallback)
-
-  (scheme-prefs-panel-label "Racket")
-  (warnings-prefs-panel-label "Avertissements")
-  (editor-prefs-panel-label "Edition")
-  (general-prefs-panel-label "Général")
-  (highlight-parens "Surligner les paires de parenthèses.")
-  (fixup-open-brackets "Ajuster automatiquement les crochets ouvrants")
-  (fixup-close-parens "Ajuster automatiquement les parenthèses fermantes")
-  (flash-paren-match "Montrer la parenthèse correspondante.")
-  (auto-save-files "Sauvegarde automatique des fichiers.")
-  (backup-files "Fichiers de sauvegarde.")
-  (map-delete-to-backspace "La touche Delete génére Backspace.")
-  (verify-exit "Confirmation pour quitter.")
-  (ask-before-changing-format "Confirmation avant de changer le format de sauvegarde.")
-  (wrap-words-in-editor-buffers "Continuer une longue ligne sur la ligne suivante, dans les éditeurs.")
-  (show-status-line "Montrer la barre de status.")
-  (count-columns-from-one "Compter les lignes et colonnes à partir de un.")
-  (display-line-numbers "Montrer les numéros de ligne et de colonne, pas la distance depuis le début de l'éditeur.")
-  (show-line-and-column-numbers "Montrer les numéros de ligne et de colonne") ; used for popup menu; right click on line/column box in bottom of drs window
-  (show-character-offsets "Montrer la distance depuis le début de l'éditeur") ; used for popup menu; right click on line/column box in bottom of drs window
-  (enable-keybindings-in-menus "Raccourcis clavier dans les menus.")
-  (printing-mode "Mode d'impression")
-  (print-using-platform-specific-mode "Impression dépendante de la plateforme")
-  (print-to-ps "Imprimer vers un fichier PostScript")
-  (print-to-pdf "Imprimer vers un fichier PDF")
-  (command-as-meta "Utiliser la touche « commande » comme touche « meta »") ;; macos/macos x only
-  (alt-as-meta "Utiliser la touche « alt » comme touche « meta »")
-  (reuse-existing-frames "Réutiliser les fenêtres existantes lors de l'ouverture de nouveaux fichiers")
-  (default-fonts "Polices par défaut")
-  (basic-gray-paren-match-color "Couleur grise simple de surlignage des parenthèses") ; in prefs dialog
-  (online-coloring-active "Colorier la syntaxe interactivement")
-  (open-files-in-tabs "Ouvrir les fichiers dans de nouveaux onglets (pas dans de nouvelles fenêtres)")
-  (show-interactions-on-execute "Automatiquement montrer la fenêtre d'interaction lors de l'exécution d'un programme")
-  (switch-to-module-language-automatically "Automatiquement utiliser le langage « module » lors de l'ouverture d'un fichier contenant un module")
-  (interactions-beside-definitions "Mettre la fenêtre d'interaction à côté de la fenêtre de définition") ;; in preferences, below the checkbox one line above this one
-  (show-line-numbers "Montrer les numéros de lignes")
-  (show-line-numbers/menu "Montrer les &numéros de lignes")  ;; just like the above, but capitalized for appearance in a menu item
-  (hide-line-numbers/menu "Cacher les &numéros de lignes")
-  (show-line-numbers-in-definitions "Numéros de ligne dans la fenêtre de définition")
-  ;; the constant above shows up in the popup menu item in the bottom of
-  ;; the drracket window; controls the line numbers on each line in the definitions; used in a checkable menu item
-  (maximum-char-width-guide-pref-check-box "Guide pour la largeur maximum de texte")
-  (hide-column-width-guide "Cacher le guide de largeur de texte pour les fichiers avec ~a colonnes")
-  (show-column-width-guide "Montrer le guide de largeur de texte à partir de ~a colonnes") ;; filled with a number > 2
-  (limit-interactions-size "Limiter la taille de la fenêtre d'interaction")
-  (background-color "Arrière-plan") ;; this is in the color section already, so shorten the name a little
-  (default-text-color "Couleur du texte") ;; used for configuring colors, but doesn't need the word "color"
-  (choose-a-background-color "Sélectionnez une couleur d'arrière-plan")
-  (revert-to-defaults "Retour aux valeurs par défaut")
-  (undo-changes "Fermer sans rien changer") ;; used in the preferences dialog to undo preference changes
-
-  (color-schemes "Régime de couleurs") ;; the label in the preferences dialog for the color scheme panel
-  (classic-color-scheme "Classique") ;; formerly called 'black on white'
-  (modern-color-scheme "Moderne")   ;; an attempt to be more color-blind friendly
-  (white-on-black-color-scheme "Blanc sur noir") ;; clicking the buttons changes the color schemes to some defaults that've been set up.
-  ; drracket additions to the color scheme dialog; two buttons
-  (design-your-own-color-schemes "Concevoir vos propres régimes de couleurs") ; pointer to (english-only) docs
-  (style-and-color-names "Noms de styles et de couleurs")
-
-  (add-spacing-between-lines "Ajouter un pixel d'espace supplémentaire entre les lignes")
-
-  ; title of the color choosing dialog
-
-  ; should have entire alphabet
-  (font-example-string "aâàbcçdeéêèëfghiîïjklmnoôpqrstuûùüvwxyz")
-
-  (change-font-button-label "Changer")
-  (fonts "Polices")
-  (other... "Autre...") ;; used in the font choice menu item
-
-  ; filled with type of font, eg modern, swiss, etc.
-  (choose-a-new-font "Sélectionnez une nouvelle police « ~a ».")
-
-  (font-size-slider-label "Taille")
-  (restart-to-see-font-changes "Redémarrez pour voir le changement de polices.")
-
-  (font-prefs-panel-title "Police")
-  (font-name "Nom de la police")
-  (font-size "Taille de la police")
-  (set-font "Appliquer la police...")
-  (font-smoothing-label  "Lissage de polices")
-  (font-smoothing-none "Aucune")
-  (font-smoothing-some "Certaines")
-  (font-smoothing-all "Toutes")
-  (font-smoothing-default "Utiliser la configuration par défaut du système")
-  (select-font-name "Sélectionnez une police")
-  (example-text "Example de texte :")
-  (only-warn-once "Prévenir une fois seulement quand exécutions et interactions n'ont pas été synchronisées.")
-
-  ; font size menu items in the 'view' menu; the ~a is filled with a number (font size)
-  (increase-font-size "Augmenter la taille de la police (à ~a)")
-  (decrease-font-size "Diminuer la taille de la police (à ~a)")
-  
-  ; warning message when lockfile is around
-  (waiting-for-pref-lock "Attente sur le fichier de verrouillage des préférences...")
-  (pref-lock-not-gone
-   "Les préférences sont verrouillées par le fichier :\n\n   ~a\n\nqui empêche les préférences d'être sauvegardées. Assurez-vous qu'aucun logiciel Racket n'est en cours d'exécution et effacer le fichier.")
-  (still-locked-exit-anyway? "Les préférences n'ont pu être sauvegardées correctement. Quitter quand même ?")
-
-  ;;; indenting preferences panel
-  (indenting-prefs-panel-label "Indentation")
-  (indenting-prefs-extra-regexp "Regexp extra") ; Expression régulière supplémentaire est trop long
-
-  (square-bracket-prefs-panel-label "Crochet")
-
-  ; filled with define, lambda, or begin
-  (enter-new-keyword "Entrez un nouveau mot clef ressemblant à ~a :")
-  (x-keyword "Mot clef ~a")
-  (x-like-keywords "Mots clefs ressemblants à ~a")
-
-  ; used in Square bracket panel
-  (skip-subexpressions "Nombre de sous-expressions à ignorer") ; à sauter?
-
-  (expected-a-symbol "espérait un symbole, trouvé : ~a")
-  (already-used-keyword "« ~a » est déjà un mot clef avec une indentation spéciale.")
-  (add-keyword "Ajouter")
-  (remove-keyword "Enlever")
-
-  ; repl color preferences
-  (repl-colors "REPL")
-  (repl-out-color "Sorties")
-  (repl-value-color "Valeurs")
-  (repl-error-color "Erreurs")
-
-  ;;; find/replace
-  (search-next "Sui")
-  (search-previous "Pre")
-  (search-match "occ.")  ;;; this one and the next one are singular/plural variants of each other
-  (search-matches "occ.")
-  (search-replace "Remplacer")
-  (search-skip "Passer")
-  (search-show-replace "Montrer Remplacer")
-  (search-hide-replace "Cacher Remplacer")
-  (find-case-sensitive "Sensible à la casse")  ;; the check box in both the docked & undocked search
-  (find-anchor-based "Recherche utilisant des ancres")
-
-  ;; these string constants used to be used by searching,
-  ;; but aren't anymore. They are still used by other tools, tho.
-  (hide "Cacher")
-  (dock "Attacher")
-  (undock "Détacher")
-
-  ;;; multi-file-search
-  (mfs-multi-file-search-menu-item "Rechercher dans les fichiers...")
-  (mfs-string-match/graphics "une chaîne de caractères (y compris dans les fichiers avec graphiques)")
-  (mfs-regexp-match/no-graphics "une expression régulière (fichiers textuels seulement)")
-  (mfs-searching... "Recherche en cours...")
-  (mfs-configure-search "Configurer la recherche") ;; dialog title
-  (mfs-files-section "Fichiers")   ;; section in config dialog
-  (mfs-search-section "Rechercher") ;; section in config dialog
-  (mfs-dir "Répertoire")
-  (mfs-recur-over-subdirectories "Récursion dans les sous-répertoires")
-  (mfs-regexp-filename-filter "Expression régulière pour filtrer les noms de fichiers")
-  (mfs-search-string "Chercher la chaîne de caractères")
-  (mfs-drscheme-multi-file-search "Recherche dans des fichiers multiples - DrRacket") ;; results window and error message title
-  (mfs-not-a-dir "« ~a » n'est pas un répertoire")
-  (mfs-open-file "Ouvrir le fichier")
-  (mfs-stop-search "Stopper la recherche")
-  (mfs-case-sensitive-label "Différentier les lettres majuscules des minuscules")
-  (mfs-no-matches-found "Rien n'a été trouvé.")
-  (mfs-search-interrupted "Recherche avortée.")
-  (mfs-drscheme-multi-file-search-title "Recherche dans des fichiers multiples pour « ~a » - DrRacket") ;; the ~a format specifier is filled in with the search string
-
-  ;;;reverting a file
-  (are-you-sure-revert
-   "Êtes-vous certain de vouloir retourner à la version de ce fichier qui est sur le disque dur ? Ce changement ne pourra pas être défait.")
-  (are-you-sure-revert-title
-   "Retourner ?")
-
-  ;;; saving a file
-  ; ~a is filled with the filename
-  (error-saving "Erreur durant la sauvegarde") ;; title of error message dialog
-  (error-saving-file/name "Une erreur s'est produite durant la sauvegarde de ~a.")
-  (error-loading "Erreur durant le chargement")
-  (error-loading-file/name "Une erreur s'est produite durant le chargement de ~a.")
-  (unknown-filename "« inconnu »")
-
-  ;;; finder dialog
-  (must-specify-a-filename "Vous devez spécifier un nom de fichier.")
-  (file-does-not-exist "Le fichier « ~a » n'existe pas.")
-  (ask-because-file-exists "Le fichier « ~a » existe déjà. Voulez-vous le remplacer ?")
-  (dne-or-cycle "Le fichier « ~a » contient un répertoire non-existant, ou une boucle.")
-  (get-file "Obtenir fichier")
-  (put-file "Donner fichier")
-  (full-pathname "Chemin de fichier complet")
-  (show-dot-files "Montrer les fichiers et répertoires dont le nom commence par un point.")
-  (up-directory-button-label "Répertoire parent")
-  (add-button-label "Ajouter") ;;; for multi-file selection
-  (add-all-button-label "Ajouter tous") ;;; for multi-file selection
-  (remove-button-label "Enlever") ;;; for multi-file selection
-  (file-wrong-form "Le format de ce nom de fichier est incorrect.")
-  (select-files "Sélectionnez des fichiers")
-  (select-file "Sélectionnez un fichier")
-  (dir-dne "Ce répertoire n'existe pas.")
-  (file-dne "Ce fichier n'existe pas.")
-  (empty-filename "Le nom de fichier doit contenir au moins quelques lettres.")
-  (that-is-dir-name "Ceci est un nom de répertoire.")
-
-  ;;; raw menu names -- these must match the
-  ;;; versions below, once the &s have been stripped.
-  ;;; if they don't, DrRacket's menus will appear
-  ;;; in the wrong order.
-  (file-menu "Fichier")
-  (edit-menu "Editer")
-  (help-menu "Aide")
-  (windows-menu "Fenêtres")
-  (tabs-menu "Onglets") ;; this is the name of the "Windows" menu under linux & windows
-
-  ;;; menus
-  ;;; - in menu labels, the & indicates a alt-key based shortcut.
-  ;;; - sometimes, things are stuck in the middle of
-  ;;; menu item labels. For instance, in the case of
-  ;;; the "Save As" menu, you might see: "Save Definitions As".
-  ;;; be careful of spacing, follow the English, if possible.
-  ;;; - the ellipses in the `after' strings indicates that
-  ;;; more information is required from the user before completing
-  ;;; the command.
-
-  (file-menu-label "&Fichier")
-
-  (new-info  "Ouvrir un nouveau fichier.")
-  (new-menu-item "&Nouvelle fenêtre")
-  (new-...-menu-item "&Nouvelle...")
-
-  (open-info "Ouvrir un fichier à partir du disque dur.")
-  (open-menu-item "&Ouvrir")
-
-  (open-recent-info "Une liste des fichiers ouverts récemment.")
-  (open-recent-menu-item "Ouvrir récen&t")
-
-  (revert-info "Retour à la version originale de ce fichier sur le disque dur.")
-  (revert-menu-item "&Retour version disque")
-
-  (save-info "Sauvegarder ce fichier sur le disque dur.")
-  (save-menu-item "&Sauvegarder")
-
-  (save-as-info "Demander un nom de fichier et sauver ce fichier sur le disque dur.")
-  (save-as-menu-item "Sauvegarder à")
-
-  (print-info "Envoyer ce fichier à une imprimante.")
-  (print-menu-item "&Imprimer...")
-
-  (page-setup-info "Configurer les paramètres d'impression")
-  (page-setup-menu-item "Paramètres d'impression...")
-
-  (close-info "Fermer ce fichier.")
-  (close-menu-item "&Fermer")
-  (close-window-menu-item "&Fermer la fenêtre")
-
-  (quit-info "Fermer toutes les fenêtres.")
-  (quit-menu-item-windows "&Quitter")
-  (quit-menu-item-others "&Quitter")
-
-  (edit-menu-label "&Editer")
-
-  (undo-info "Défaire l'action la plus récente.")
-  (undo-menu-item "&Défaire")
-
-  (redo-info "Refaire l'action qui vient d'être défaite.")
-  (redo-menu-item "&Refaire")
-
-  (cut-info "Déplacer dans le porte-bloc les éléments sélectionés, pour collage ultérieur.")
-  (cut-menu-item "&Couper")
-
-  (copy-info "Copier dans le porte-bloc les éléments sélectionés, pour collage ultérieur.")
-  (copy-menu-item "Co&pier")
-
-  (paste-info "Coller à la place des éléments sélectionnés les éléments qui ont été copiés ou coupés le plus récemment.")
-  (paste-menu-item "C&oller")
-
-  (clear-info "Effacer les éléments sélectionnés sans modifier le porte-bloc ou le collage.")
-  (clear-menu-item-windows "&Effacer")
-
-  (select-all-info "Sélectionner tout le document.")
-  (select-all-menu-item "&Sélectionner tout")
-
-  (find-menu-item "Rechercher") ;; menu item
-  (find-from-selection-menu-item "Rechercher à partir de la sélection")
-  (find-info "Transférer le contrôle du clavier entre la fenêtre d'édition et la barre de recherche")
-
-  (find-next-info "Recherche la même chaîne de caractères, en avant.")
-  (find-next-menu-item "Rechercher en avant")
-
-  (find-previous-info "Recherche la même chaîne de caractères, en arrière.")
-  (find-previous-menu-item "Rechercher en arrière")
-
-  (show-replace-menu-item "Montrer Remplacer")
-  (hide-replace-menu-item "Cacher Remplacer")
-  (show/hide-replace-info "Montrer ou cacher le champ de remplacement")
-
-  (replace-menu-item "Remplacer")
-  (replace-info "Remplacer le résultat de la recherche")
-
-  (replace-all-info "Remplacer toutes les occurrences de la chaîne de caractères recherchée")
-  (replace-all-menu-item "Remplacer tout")
-
-  (find-case-sensitive-info "Changer la recherche entre sensible à la casse et insensible à la casse")
-  (find-case-sensitive-menu-item "Recherche sensible à la casse")
-
-  (complete-word "Compléter le mot") ; the complete word menu item in the edit menu
-  (no-completions "... pas de complétion connue") ; shows up in the completions menu when there are no completions (in italics)
-
-  (overwrite-mode "Mode d'écrasement")
-  (enable-overwrite-mode-keybindings "Raccourci clavier pour le mode d'écrasement")
-
-  (enable-automatic-parens "Parenthèses automatiques") ; should "and square brackets and quotes" appear here?
-
-  (preferences-info "Configurer vos préférences.")
-  (preferences-menu-item "Préférences...")
-
-  (keybindings-info "Montrer les raccourcis clavier actuellement actifs.")
-  (keybindings-menu-item "Raccourcis clavier")
-  (keybindings-show-active "Montrer les raccourcis clavier actifs")
-  (keybindings-frame-title "Raccourcis clavier")
-  (keybindings-sort-by-name "Trier par nom")
-  (keybindings-sort-by-key "Trier par raccourci")
-  (keybindings-add-user-defined-keybindings "Ajouter des raccourcis clavier...")
-  (keybindings-add-user-defined-keybindings/planet "Ajouter des raccourcis clavier à partir de PLaneT...")
-  (keybindings-menu-remove "Enlever ~a")
-  (keybindings-choose-user-defined-file "Sélectionnez un fichier contenant des raccourcis clavier.")
-  (keybindings-planet-malformed-spec "Cette spécification de fichier PLaneT est malformée : ~a") ; the string will be what the user typed in
-  (keybindings-type-planet-spec "Veuillez spécifier un fichier PLaneT (sans le `require')")
-
-  ; first ~a will be a string naming the file or planet package where the keybindings come from;
-  ; second ~a will be an error message
-  (keybindings-error-installing-file "Erreur durant l'installation des raccourcis clavier provenants du fichier PLaneT ~a:\n\n~a")
-
-  (user-defined-keybinding-error "Erreur durant l'exécution du raccourci clavier ~a\n\n~a")
-  (user-defined-keybinding-malformed-file "Le fichier ~a ne contient pas un module écrit dans le langage framework/keybinding-lang.")
-  (user-defined-keybinding-malformed-file/found-lang
-   "Le fichier ~a ne contient pas un module écrit dans le"
-   " langage framework/keybinding-lang. Le langage ~s a été trouvé à la place.")
-
-  ;; menu items in the "special" menu
-  (insert-text-box-item "Insérer une boite texte")
-  (insert-image-item "Insérer une image...")
-  (insert-comment-box-menu-item-label "Insérer une boite à commentaires")
-  (insert-lambda "Insérer un &Lambda")
-
-  (wrap-text-item "Replier le texte")
-
-  ;; windows menu
-  (windows-menu-label "Fe&nêtres")
-  (tabs-menu-label "Ongle&ts") ;; this is the name of the menu under linux & windows
-  (minimize "Minimiser") ;; minimize and zoom are only used under mac os x
-  (zoom "Agrandir") ; Zoomer?
-  (bring-frame-to-front "Amener une fenêtre au premier plan")       ;;; title of dialog
-  (bring-frame-to-front... "Amener une fenêtre au premier plan...") ;;; corresponding title of menu item
-  (most-recent-window "Fenêtre la plus récente")
-  (next-tab "Onglet suivant")
-  (prev-tab "Onglet précédent")
-  (move-current-tab-right "Déplacer à &droite")
-  (move-current-tab-left "Déplacer à &gauche")
-  ;; menu item in the windows menu under mac os x. first ~a is filled with a number between 1 and 9; second one is the filename of the tab
-  (tab-i "Onglet ~a : ~a")
-  (tab-i/no-name "Onglet ~a")
-
-  (view-menu-label "&Montrer")
-  (show-overview "Montrer le contour du &programme")
-  (hide-overview "Cacher le contour du &programme")
-  (show-module-browser "Montrer le navigateur de &modules")
-  (hide-module-browser "Cacher le navigateur de &modules")
-
-  (help-menu-label "&Aide")
-  (about-info "Auteurs et détails concernant ce logiciel.")
-  (about-menu-item "A propos de ...")
-
-  ;; open here's new menu item
-  (create-new-window-or-clear-current
-   "Voulez-vous créer une nouvelle fenêtre ou effacer celle-ci ?")
-  (clear-current "Effacer celle-ci")
-  (new-window "Nouvelle fenêtre")
-
-  ;; popup menu when right-clicking in the gap between
-  ;; the definitions and interactions window
-  (change-to-vertical-alignment "Passer à la verticale")
-  (change-to-horizontal-alignment "Passer à l'horizontale")
-
-  ;;; exiting and quitting ``are you sure'' dialog
-  ;;; exit is used on windows, quit on macos, in English. Other
-  ;;; languages probably use the same word on both platforms.
-  (exit "Quitter")
-  (quit "Quitter")
-  (are-you-sure-exit "Êtes-vous certain de vouloir quitter ?")
-  (are-you-sure-quit "Êtes-vous certain de vouloir quitter ?")
-  ; these next two are only used in the quit/exit dialog
-  ; on the button whose semantics is "dismiss this dialog".
-  ; they are there to provide more flexibility for translations
-  ; in English, they are just cancel.
-  (dont-exit "Annuler")
-  (dont-quit "Annuler")
-
-  ;;; autosaving
-  (error-autosaving "Erreur durant l'auto-sauvegarde de « ~a ».")
-  (autosaving-turned-off "L'auto-sauvegarde est suspendue\njusqu'à ce que le fichier soit sauvegardé.")
-  (recover-autosave-files-frame-title "Recouvrer des fichiers auto-sauvegardés")
-  (autosave-details "Détails")
-  (autosave-recover "Recouvrer")
-  (autosave-unknown-filename "« inconnu »")
-
-  ;; these are labels in a dialog that drscheme displays
-  ;; if you have leftover autosave files. to see the dialog,
-  ;; start up drscheme and modify (but don't save) a file
-  ;; (also, do this with an unsaved file). Wait for the autosave
-  ;; files to appear (typically 5 minutes). Kill DrRacket
-  ;; and restart it. You'll see the dialog
-  (autosave-autosave-label: "Fichier auto-sauvegardé :")
-  (autosave-original-label: "Fichier original :")
-  (autosave-autosave-label "Fichier auto-sauvegardé")
-  (autosave-original-label "Fichier original")
-  (autosave-compare-files "Comparer les fichiers auto-sauvegardés")
-
-  (autosave-show-autosave "Auto-sauvegarder un fichier") ;; title of a window showing the autosave file
-
-  (autosave-explanation "DrRacket a trouvé des fichiers auto-sauvegardés, qui peuvent contenir votre travail non-sauvegardé.")
-
-  (autosave-recovered! "Recouvré !") ;; status of an autosave file
-  (autosave-deleted "Effacé")       ;; status of an autosave file
-
-  (autosave-error-deleting "Erreur durant l'effacement de ~a\n\n~a") ;; first is a filename, second is an error message from mz.
-  (autosave-delete-button "Effacer")
-  (autosave-delete-title "Effacer")  ;; title of a dialog asking for deletion confirmation
-  (autosave-done "Continuer")
-
-  ;; appears in the file dialog
-  (autosave-restore-to-where? "Sélectionnez un répertoire où sauvegarder le fichier auto-sauvegardé.")
-
-
-  ;;; file modified warning
-  (file-has-been-modified
-   "Ce fichier a été modifié depuis sa dernière sauvegarde. Voulez-vous écraser les modifications ?")
-  (overwrite-file-button-label "Écraser")
-
-  (definitions-modified
-   "Le texte de la fenêtre de définition a été modifié directement sur le disque dur. Sauvegardez ou retournez à la version sur le disque.")
-  (drscheme-internal-error "Erreur interne de DrRacket.")
-
-  ;;; tools
-  (invalid-tool-spec "La spécification d'outil qui se trouve dans le fichier info.rkt de la collection ~a est invalide. Espérait soit une chaîne de caractères, soit une liste de chaînes de caractères, trouvé : ~e")
-  (error-invoking-tool-title "Erreur durant l'invocation de l'outil ~s;~s")
-  (error-loading-tool-title "Erreur durant le chargement de l'outil ~s\n~a") ;; ~s filled with a path, ~a filled with an error message from an exn
-  (tool-tool-names-same-length
-   "`tool-names' et `tools' ne sont pas des listes de la même longueur, dans le fichier info.rkt pour ~s. Trouvé ~e et ~e")
-  (tool-tool-icons-same-length
-   "`tool-icons' et `tools' ne sont pas des listes de la même longueur, dans le fichier info.rkt pour ~s. Trouvé ~e et ~e")
-  (tool-tool-urls-same-length
-   "`tool-urls' et `tools' ne sont pas des listes de la même longueur, dans le fichier info.rkt pour ~s. Trouvé ~e et ~e")
-  (error-getting-info-tool
-   "erreur durant le chargement du fichier info.rkt pour ~s")
-  (tool-error-phase1 "Erreur durant la phase 1 pour l'outil ~s; ~s")
-  (tool-error-phase2 "Erreur durant la phase 2 oour l'outil ~s; ~s")
-
-
-  ;;; define popup menu
-  (end-of-buffer-define "« fin du tampon »")
-  (sort-by-name "Trier par nom")
-  (sort-by-position "Trier par position dans le fichier")
-  (no-definitions-found "« aucune définition trouvée »")
-  (jump-to-defn "Aller à la définition de ~a")
-
-  (recent-items-sort-by-age "Trier par age")
-  (recent-items-sort-by-name "Trier par nom")
-
-  ;;; view menu
-  (hide-definitions-menu-item-label "Cacher les &définitions")
-  (show-definitions-menu-item-label "Montrer les &définitions")
-  (definitions-menu-item-help-string "Cacher/montrer la fenêtre de définition")
-  (show-interactions-menu-item-label "Montrer les &interactions")
-  (hide-interactions-menu-item-label "Cacher les &interactions")
-  (use-horizontal-layout "Disposition horizontale")
-  (use-vertical-layout "Disposition verticale")
-  (interactions-menu-item-help-string "Montrer/cacher la fenêtre d'interaction")
-  (toolbar "Barre d'outils")
-  (toolbar-on-top "Barre d'outils en haut")
-  (toolbar-on-top-no-label "Barre d'outils en haut avec petits bouttons")
-  (toolbar-on-left "Barre d'outils sur la gauche")
-  (toolbar-on-right "Barre d'outils sur la droite")
-  (toolbar-hidden "Barre d'outils cachée")
-
-  ;;; file menu
-  (save-definitions-as "Sauvegarder les définitions...")
-  (save-definitions "&Sauvegarder les définitions")
-  (print-definitions "&Imprimer les définitions...")
-  (about-drscheme "A propos de DrRacket")
-  (save-other "Sauvegarder autre")
-  (save-definitions-as-text "Sauvegarder les définitions au format texte...")
-  (save-interactions "Sauvegarder les interactions")
-  (save-interactions-as "Sauvegarder les interactions...")
-  (save-interactions-as-text "Sauvegarder les interactions au format texte...")
-  (print-interactions "Imprimer les interactions...")
-  (new-tab "Nouvel onglet")
-  (close-tab "Fermer l'onglet")
-  (close-tab-amp "Fermer l'onglet") ;; like close-tab, but with an ampersand on the same letter as the one in close-menu-item
-
-  ;;; edit menu
-  (split-menu-item-label "Di&viser")
-  (collapse-menu-item-label "&Rassembler")
-  (find-longest-line "Trouver la ligne la plus longue")
-
-  ;;; language menu
-  (language-menu-name "&Langage")
-
-  ;;; scheme-menu
-  (scheme-menu-name "&Racket")
-  (execute-menu-item-label "Exécuter")
-  (execute-menu-item-help-string "Réexécuter le programme de la fenêtre de définition.")
-  (ask-quit-menu-item-label "Demander au programme de quitter")
-  (ask-quit-menu-item-help-string "Utilise break-thread pour stopper la tâche principale de l'évaluation courante")
-  (force-quit-menu-item-label "Forcer le programme à quitter")
-  (force-quit-menu-item-help-string "Utilise custodian-shutdown-all pour terminer toute l'évaluation courante")
-  (limit-memory-menu-item-label "Limiter la mémoire...")
-  (limit-memory-msg-1 "La limite prendra effet à la prochaine exécution du programme.")
-  (limit-memory-msg-2 "Elle doit être d'au moins huit mégaoctets.")  ;; the minimum limit is now 8 megs
-  (limit-memory-unlimited "Illimitée")
-  (limit-memory-limited "Limitée à")
-  (limit-memory-megabytes "mégaoctets")
-  ; the next two constants are used together in the limit memory dialog; they are inserted
-  ; one after another. The first one is shown in a bold font and the second is not.
-  ; (the first can be the empty string)
-  (limit-memory-warning-prefix "Avertissement : ")
-  (limit-memory-warning
-   "utiliser une mémoire illimitée est dangereux. Avec cette configuration,"
-   " DrRacket ne peut pas se protéger contre un programme qui utilise trop de mémoire, et DrRacket peut alors s'écraser.")
-
-  (clear-error-highlight-menu-item-label "Effacer le surlignage d'erreur")
-  (clear-error-highlight-item-help-string "Efface le surlignage rose après une erreur")
-  (jump-to-next-error-highlight-menu-item-label "Aller à l'erreur suivante")
-  (jump-to-prev-error-highlight-menu-item-label "Aller à l'erreur précédente")
-  (reindent-menu-item-label "&Réindenter")
-  (reindent-all-menu-item-label "Réindenter &tout")
-  (semicolon-comment-out-menu-item-label "&Commenter à l'aide de points-virgules")
-  (box-comment-out-menu-item-label "Commenter à l'aide d'une &boite")
-  (uncomment-menu-item-label "&Décommenter")
-
-  (convert-to-semicolon-comment "Convertir en un commentaire avec points-virgules")
-
-  ;;; executables
-  (create-executable-menu-item-label "Créer un exécutable...")
-  (create-executable-title "Créer un exécutable")
-  (drracket-creates-executables-only-in-some-languages
-  "DrRacket ne supporte la création d'un exécutable que quand vous"
-  " avez sélectionné un des langages éducatifs (DMdA ou HtDP) dans"
-  " le dialogue de langages de DrRacket, ou quand vous avez sélectionné"
-  " « le langage Racket » dans le dialogue de langages de DrRacket et que la ligne #lang au"
-  " début de votre programme spécifie un langage.\n\nConsidérez"
-  " utiliser l'outil « raco exe »» à la ligne de commande à la place.")
-  (must-save-before-executable "Vous devez sauvegarder votre programme avant de créer un exécutable.")
-  (save-a-mred-launcher "Sauvegarder un lanceur de type GRacket")
-  (save-a-mzscheme-launcher "Sauvegarder un lanceur de type Racket")
-  (save-a-mred-stand-alone-executable "Sauvegarder un exécutable autonome de type GRacket")
-  (save-a-mzscheme-stand-alone-executable "Sauvegarder un exécutable autonome de type Racket")
-  (save-a-mred-distribution "Sauvegarder une distribution GRacket")
-  (save-a-mzscheme-distribution "Sauvegarder une distribution Racket")
-  (error-creating-executable "Erreur durant la crétion de l'exécutable :") ;; this is suffixed with an error message ala error-display-handler
-
-  (definitions-not-saved "La fenêtre de définition n'a pas été sauvegardée. L'exécutable va utiliser la dernière version sauvegardée de la fenêtre de définition. Continuer ?")
-  ;; The "-explanatory-label" variants are the labels used for the radio buttons in
-  ;;  the "Create Executable..." dialog for the "(module ...)" language.
-  (launcher "Lanceur")
-  (launcher-explanatory-label "Lanceur (pour cette machine uniquement, exécution à partir du code source)")
-  (stand-alone "Autonome")
-  (stand-alone-explanatory-label "Autonome (pour cette machine uniquement, exécution d'une copie compilée)")
-  (distribution "Distribution")
-  (distribution-explanatory-label "Distribution (pour installation sur d'autres machines)")
-  (executable-type "Type")
-  (executable-base "Base")
-  (filename "Nom de fichier : ")
-  (create "Créer")
-  (please-specify-a-filename "Veuillez spécifier le nom du fichier à créer.")
-  (~a-must-end-with-~a
-   "Le nom de fichier ~a\n\n  ~a\n\nest illégal. Le nom de fichier doit se terminer par « .~a ».")
-  (macosx-executables-must-end-with-app
-   "Le nom de fichier\n\n  ~a\n\nest illégal. Sous MacOS X, un exécutable doit être un répertoire dont le nom se termine par .app.")
-  (warning-directory-will-be-replaced
-   "ATTENTION : le répertoire :\n\n  ~a\n\nva être remplacé. Voulez-vous continuer ?")
-
-  (distribution-progress-window-title "Progrès de la distribution")
-  (creating-executable-progress-status "Création d'un exécutable pour la distribution...")
-  (assembling-distribution-files-progress-status "Rassemblement des fichiers pour la distribution...")
-  (packing-distribution-progress-status "Empaquetage de la distribution...")
-
-  (create-servlet "Créer un servlet...") ;servlet = greffon, extension serveur?
-
-  ; the ~a is a language such as "module" or "algol60"
-  (create-servlet-unsupported-language
-   "La création de servlets n'est pas possible avec le langage ~a.")
-
-  ;;; buttons
-  (execute-button-label "Exécuter")
-  (save-button-label "Sauvegarder")
-  (break-button-label "Stopper")
-
-  ;;; search help desk popup menu
-  (search-help-desk-for "Rechercher « ~a » dans l'Aide.")
-  (exact-lucky-search-help-desk-for "Faire une recherche « J'ai de la chance » dans l'Aide pour le texte exact « ~a ».")
-
-  ;; collapse and expand popup menu items
-  (collapse-sexp "Rétrécir une s-expression")
-  (expand-sexp "Elargir une s-expression")
-
-  ;;; fraction dialog
-  (enter-fraction "Entrer une fraction")
-  (whole-part "Partie entière")
-  (numerator "Numérateur")
-  (denominator "Dénominateur")
-  (insert-number/bad-whole-part "La partie entière du nombre doit être intégrale")
-  (insert-number/bad-numerator "Le numérateur du nombre doit être un entier non-négatif")
-  (insert-number/bad-denominator "Le dénominateur du nombre doit être un entier positif")
-  (insert-fraction-menu-item-label "Insérer une fraction...")
-
-  ;; number snip popup menu
-  (show-decimal-expansion "Montrer l'expansion décimale")
-  (show-mixed-fraction-view "Montrer sous forme partie-entière plus fraction")
-  (show-improper-fraction-view "Montrer sous forme de fraction")
-  (show-more-decimal-places "Montrer plus de décimales")
-
-  ;;; Teachpack messages
-  (select-a-teachpack "Sélectionner un teachpack")
-  (clear-teachpack "Enlever le teachpack ~a")
-  (teachpack-error-label "DrRacket - erreur avec un teachpack.")
-  (teachpack-didnt-load "Le fichier teachpack ~a n'a pas été correctement chargé.")
-  (add-teachpack-menu-item-label "Ajouter un teachpack...")
-  (clear-all-teachpacks-menu-item-label "Enlever tous les teachpacks")
-  (drscheme-teachpack-message-title "DrRacket teachpack")
-  (already-added-teachpack "Le teachpack ~a a déjà été ajouté.")
-
-  ; ~a is filled with the teachpack's name; the message appears in the teachpack selection dialog when a user installs a new teachpack
-  (compiling-teachpack "Compilation du teachpack ~a...")
-  (teachpack-pre-installed "Teachpacks préinstallés")
-  (teachpack-pre-installed/htdp "Teachpacks HtDP préinstallés")
-  (teachpack-pre-installed/2htdp "Teachpacks HtDP/2e préinstallés")
-  (teachpack-user-installed "Teachpacks installés par l'utilisateur")
-  (add-teachpack-to-list... "Ajouter un teachpack à la liste...")
-  ; first and second ~a are teachpack names, third is a symbol identifing an export
-  (teachpack-conflict
-   "Avertissement : le teachpack ~a déjà installé est en conflit avec ~a (le nom ~a est exporté par les deux)")
-   ;; a button label; the two ~a are filled with teachpack names
-  (remove-and-add-teachpack "Supprimer ~a et ajouter ~a")
-  (teachpack-already-installed "Un teachpack nommé '~a' a déjà été installé.  Voulez-vous l'écraser ?")
-  ; ~a is filled with a list of language names. Each name is separated by a newline and is indented two spaces (no commas, no 'and')
-  (teachpacks-only-in-languages "Le menu pour les teachpacks n'est disponible que pour les langages suivants : ~a\n\nPour les autres langages, utilisez 'require' à la place.")
-
-
-  ;;; Language dialog
-  (introduction-to-language-dialog
-   "Veuillez sélectionner un langage. Un étudiant dans un cours d'introduction préférera le langage par défaut.")
-  (language-dialog-title "Sélectionner le langage")
-  (case-sensitive-label "Différentier les lettres majuscules des minuscules.")
-  (output-style-label "Style d'impression des résultats")
-  (constructor-printing-style "Constructeur")
-  (quasiquote-printing-style "Quasiquote")
-  (write-printing-style "write")
-  (print-printing-style "print")
-  (sharing-printing-label "Montrer le partage entre valeurs.")
-  (use-pretty-printer-label "Insérer des retours-chariots lors de l'impression des résultats.")
-  (input-syntax "Syntaxe d'entrée")
-  (dynamic-properties "Propriétés dynamiques")
-  (output-syntax "Syntaxe de sortie")
-  (teachpacks "Teachpacks") ;; label in the language dialog for the teaching languages
-  (teachpacks-none "« aucun »") ;; shows up under the previous string, when there are no teachpacks
-  (no-debugging-or-profiling "Pas de débogage ou profilage") ; Profilage. Eurk...
-  (debugging "Débogage")
-  (debugging-and-profiling "Débogage et profilage")
-  (test-coverage "Couverture syntaxique de vos tests")
-  (show-details-button-label "Montrer les détails")
-  (hide-details-button-label "Cacher les détails")
-  (choose-language-menu-item-label "Sélectionner le langage...")
-  (revert-to-language-defaults "Retourner aux valeurs par défaut pour le langage.")
-  (fraction-style "Style de fractions")
-  (use-mixed-fractions "Fractions mêlées")
-  (use-repeating-decimals "Décimales répétitives")
-  (decimal-notation-for-rationals "Utiliser la notation décimale pour les nombres rationnels")
-  (enforce-primitives-group-box-label "Définitions initiales")
-  (enforce-primitives-check-box-label "Interdire la redéfinition des définitions initiales")
-  (automatically-compile "Peupler les répertoires « compiled » (pour un chargement plus rapide)")
-  (preserve-stacktrace-information "Préserver la trace de la pile (ceci invalide certaines optimisations)")
-  (enforce-module-constants-checkbox-label "Imposer les définitions constantes (permet certaines optimisations)")
-  (expression-level-stacktrace "Traçage de la pile au niveau des expressions")
-  (function-level-stacktrace "Traçage de la pile au niveau des fonctions")
-  (submodules-to-run "Sous-modules à exécuter")
-  (add-submodule "Ajouter une option de sous-module...") ;; menu item
-  (add-submodule-title "Ajouter Un Sous-module") ;; title of dialog opened by above menu item
-
-
-  ; used in the bottom left of the drscheme frame as the label
-  ; used the popup menu from the just above; greyed out and only
-  ; visible when some languages are in the history
-  (recent-languages "Langages récents :")
-  ; shows up in bottom-left programming language menu popup, when no langs are recorded
-  (no-recently-chosen-languages "pas de langage récent")
-
-  ;; startup wizard screen language selection section
-  (please-select-a-language "Veuillez sélectionner un langage")
-
-
-  ;;; languages
-  (beginning-student "Etudiant niveau débutant")
-  (beginning-one-line-summary "define, cond, structs, constantes, et primitives")
-  (beginning-student/abbrev "Etudiant niveau débutant avec abréviations pour les listes")
-  (beginning/abbrev-one-line-summary "Débutant, avec impression des résultats dans le REPL sous forme de listes")
-  (intermediate-student "Etudiant niveau intermédiaire")
-  (intermediate-one-line-summary "Débutant plus portée lexicale")
-  (intermediate-student/lambda "Etudiant niveau intermédiaire, plus lambda")
-  (intermediate/lambda-one-line-summary "Intermédiaire plus fonctions d'ordre supérieur")
-  (advanced-student "Etudiant niveau avancé")
-  (advanced-one-line-summary "Intermédiaire plus lambda et mutation")
-  (how-to-design-programs "How to Design Programs") ;; should agree with MIT Press on this one...
-  (pretty-big-scheme "Assez gros Scheme")
-  (pretty-big-scheme-one-line-summary "Ajoute de la syntaxe et des fonctions provenants des languages HtDP, mzscheme, et mred/mred")
-  (r5rs-language-name "R5RS")
-  (r5rs-one-line-summary "R5RS, de base")
-  (expander "Expanseur") ; compression, compresseur, compresser => expansion, expanseur, expanser (expandeur, expander fait trop franglais et expandion n'existe pas)
-  (expander-one-line-summary "Expanse les expressions au lieu de les évaluer")
-  (legacy-languages "Langages du passé")
-  (teaching-languages "Langages d'enseignement")
-  (experimental-languages "Langages expérimentaux")
-  (initial-language-category "Langage initial")
-  (no-language-chosen "Aucun langage sélectionné")
-  (other-languages "Autres langages")
-
-  (module-language-name "Déterminer le langage à partir du code source")
-  (module-language-one-line-summary "La ligne #lang spécifie le langage utilisé")
-  (module-language-auto-text "Ligne #lang automatique") ;; shows up in the details section of the module language
-
-  ;; for the upper portion of the language dialog
-  (the-racket-language "Le langage Racket")
-  (choose-a-language "Sélectionner un langage")
-
-  ;; the next two string constants appear in the
-  ;; language dialog with a list
-  ;; of example languages appearing between them
-  (racket-language-discussion "Utilisez #lang en début de programme pour spécifier le dialecte à utiliser.  Par example :\n\n")
-  (racket-language-discussion-end "\n... et bien d'autres")
-
-  ;; the next three string constants are put into a message-box dialog
-  ;; that appears when the user clicks on the example #lang languages
-  ;; in the language dialog. The first one always appears and then either
-  ;; the second or the third appears. The second one has the clicked
-  ;; on #lang line placed into the ~a, and third one has the
-  ;; current #lang line in the first ~a and the clicked on in the second one.
-  ;; The two comments are separated by a blank line.
-  (racket-dialect-in-buffer-message
-   "En général vous devez spécifier un dialecte en éditant directement votre programme,"
-   " pas en sélectionnant un des choix du dialogue de langage.")
-  (racket-dialect-add-new-#lang-line "Néanmoins, voulez-vous que j'ajoute « ~a » en début de votre programme ?") ; la fenêtre de définitions
-  (racket-dialect-replace-#lang-line "Néanmoins, voulez-vous que je remplace « ~a » en début de votre programme par « ~a » ?")
-  (racket-dialect-already-same-#lang-line "Dans le cas présent vous avez déjà « ~a » en début de votre programme; vous pouvez donc tout de suite commencer à programmer !")
-
-  ;; in the dialog containing the above strings, one of these is a button that appears
-  (add-#lang-line "Ajouter la ligne #lang")
-  (replace-#lang-line "Remplacer la ligne #lang")
-
-  ;; for the 'new drracket user' dialog
-  (use-language-in-source "Utiliser le langage qui est spécifié dans le programme")
-
-  ;;; from the `not a language language' used initially in drscheme.
-  (must-choose-language "DrRacket ne peut pas traiter un programme avant que vous aillez sélectionné un langage.")
-
-  ; next two appear before and after the name of a text book (which will be in italics)
-  (using-a-textbook-before "Utilisant ")
-  (using-a-textbook-after " ?")
-
-  ; next two are before and after a language
-  (start-with-before "Commencer avec ")
-  (start-with-after "")
-
-  (seasoned-plt-schemer? "Programmeur PLT Scheme chevronné ?")
-  (racketeer? "Êtes-vous un racketteur ?")
-  (looking-for-standard-scheme? "À la recherche d'un langage Scheme standard ?")
-
-  ; the three string constants are concatenated together and the middle
-  ; one is hyperlinked to the dialog that suggests various languages
-  (get-guidance-before "Choisissez l'entrée « Sélectionner le langage... » dans le menu « Langage », ou ")
-  (get-guidance-during "recevez de l'aide")
-  (get-guidance-after ".")
-
-  ;;; debug language
-  (unknown-debug-frame "[inconnu]")
-  (backtrace-window-title "Trace - DrRacket")
-  (files-interactions "les interactions de ~a") ;; filled with a filename
-  (current-interactions "interactions")
-  (current-definitions "définitions")
-  (mzscheme-w/debug "Textuel (MzScheme)")
-  (mzscheme-one-line-summary "PLT Scheme sans la bibliothèque graphique")
-  (mred-w/debug "Graphique (MrEd)")
-  (mred-one-line-summary "PLT Scheme plus la bibliothèque graphique")
-
-  ;; profiling
-  (profiling-low-color "Bas")
-  (profiling-high-color "Elevé")
-  (profiling-choose-low-color "Sélectionnez une couleur pour Bas")
-  (profiling-choose-high-color "Sélectionnez une couleur pour Elevé")
-  (profiling "Profilage")
-  (profiling-example-text "(define (whee) (whee))")
-  (profiling-color-config "Gamme de couleurs pour le profil")
-  (profiling-scale "Echelle de couleurs pour le profil")
-  (profiling-sqrt "Racine Carrée")
-  (profiling-linear "Linéaire")
-  (profiling-square "Quadratique")
-  (profiling-number "Numbre d'appels de fonctions")
-  (profiling-time "Temps cumulatif")
-  (profiling-update "Mettre à jour le profil")
-  (profiling-col-percent-time "% Temps")
-  (profiling-col-function "Fonction")
-  (profiling-col-time-in-msec "ms")
-  (profiling-col-calls "Appels de fonctions")
-  (profiling-show-profile "Montrer le profil")
-  (profiling-hide-profile "Cacher le profil")
-  (profiling-unknown-src "« inconnu »")
-  (profiling-no-information-available
-   "Pas d'information de profilage disponible. Assurez vous que"
-   " l'option de profilage ait été spécifiée pour ce langage et que vous ayez exécuté le programme.")
-  (profiling-clear? "Modifier le contenu de la fenêtre de définition invalide le profil. Voulez-vous continuer ?")
-
-  ;; test coverage
-  (test-coverage-clear? "Modifier le contenu de la fenêtre de définition invalide l'information de couverture de vos tests. Voulez-vous continuer ?")
-  (test-coverage-clear-and-do-not-ask-again "Oui, et ne me redemandez pas")
-  (test-coverage-ask? "Demander à propos de l'invalidation de l'information de couverture des tests ?")
-
-  (test-coverage-on "Tests couverts")
-  (test-coverage-off "Tests non couverts")
-
-  ;; tracing
-  (tracing-enable-tracing "Traçage")
-  (tracing-show-tracing-window "Montrer le traçage")
-  (tracing-hide-tracing-window "Cacher le traçage")
-  (tracing-tracing-nothing-to-show "Aucun résultat de traçage n'est disponible. Assurez-vous que votre language supporte le traçage et que le traçage est en place")
-
-  ;;; repl stuff
-  (evaluation-terminated "Évaluation terminée.")
-  (evaluation-terminated-explanation
-   "Le tâche d'évaluation n'est plus en exécution, toute évaluation est donc impossible jusqu'à la prochaine exécution.")
-
-  ; The next three constants show up in the same dialog as the above evaluation-terminated string
-  ; constants.
-  ; The first two show up only when the user calls 'exit' (possibly with a status code).
-  ; The third shows up when the program runs out of memory.
-  (exited-successfully "Évaluation terminée avec succès.")
-  (exited-with-error-code "Évaluation terminée avec le code d'erreur ~a.") ;; ~a is filled in with a number between 1 and 255
-  (program-ran-out-of-memory "Le programme est à cours de mémoire.")
-
-  (show-evaluation-terminated-dialog "Montrer le dialogue ‘évaluation terminée’")
-  (evaluation-terminated-ask "Montrer ce dialogue la prochaine fois")
-
-  (last-stack-frame "Montrer le dernier appel de fonction sur la pile.")
-  (last-stack-frames "Montrer les derniers ~a appels de fonction sur la pile.")
-  (next-stack-frames "Montrer les ~a appels de fonction suivants sur la pile.")
-
-  ;;; welcoming message in repl
-  (language "Langage")
-  (custom "personnalisé")
-  (teachpack "Teachpack")
-  (welcome-to "Bienvenue dans")
-  (version "version")
-
-  ;;; kill evaluation dialog
-  (kill-evaluation? "Voulez-vous tuer l'évaluation ?")
-  (just-break "Simplement stopper")
-  (kill "Tuer")
-  (kill? "Tuer ?")
-
-  ;;; version checker
-  (version:update-menu-item "Rechercher des mises à jour...")
-  (version:update-check "Recherche de mises à jour") ; dialog title, with the next line
-  (version:connecting-server  "Connection au serveur de version Racket")
-  (version:results-title      "Vérification de la version")
-  (version:do-periodic-checks "Périodiquement rechercher de nouvelles mises à jour de Racket ?")
-  (version:take-me-there      "Allons-y") ; ...to the download website
-  ;; the next one can appear alone, or followed by a comma and the one after that
-  (version:plt-up-to-date     "Votre version de Racket est à jour")
-  (version:but-newer-alpha    "mais notez qu'il existe une nouvelle version au stade alpha")
-  ;; This is used in this context: "Racket vNNN <<<*>>> http://download..."
-  (version:now-available-at   "est maintenant disponible à")
-
-  ;; insert menu
-  (insert-menu "&Insérer")
-
-  ;; large semi colon letters
-  (insert-large-letters... "Insérer de grandes lettres...")
-  (large-semicolon-letters "Grandes lettres en points-virgules")
-  (text-to-insert "Texte à insérer")
-
-  (module-browser-filename-format "Nom de fichier complet : ~a (~a lignes)")
-  (module-browser-root-filename "Nom de fichier de la racine : ~a")
-  (module-browser-font-size-gauge-label "Taille de la police")
-  (module-browser-progress-label "Avancement du navigateur de modules")
-  (module-browser-adding-file "Ajout du fichier : ~a...")
-  (module-browser-laying-out-graph-label "Tracer le graphe")
-  (module-browser-open-file-format "Ouvrir ~a")
-  (module-browser "Navigateur de modules") ;; frame title
-  (module-browser... "Navigateur de &modules...") ;; menu item title
-  (module-browser-in-file "Navigateur de m&odules pour ~a") ;; menu item title; ~a is filled with a filename
-  (module-browser-no-file "Navigateur de modules pour ce fichier") ;; menu item title for above menu item; used when there is no saved file
-  (module-browser-error-expanding "Erreur durant l'expansion du programme :\n\n~a")
-  (module-browser-show-lib-paths "Montrer les fichiers chargés à l'aide de chemins de fichiers du type (lib ..)")
-  (module-browser-progress "Navigateur de modules : ~a") ;; prefix in the status line
-  (module-browser-compiling-defns "Navigateur de modules : compilation des définitions")
-  (module-browser-show-lib-paths/short "(require (lib ...))") ;; check box label in show module browser pane in drscheme window.
-  (module-browser-show-planet-paths/short "(require (planet ...))") ;; check box label in show module browser pane in drscheme window.
-  (module-browser-refresh "Rafraîchir") ;; button label in show module browser pane in drscheme window.
-  (module-browser-highlight "Chercher") ;; used to search in the graph; the label on a text-field% object
-  (module-browser-only-in-plt-and-module-langs
-   "Le navigateur de modules n'est disponible que pour les programmes qui contiennent des modules.")
-  (module-browser-name-length "Noms")
-  (module-browser-name-short "courts")
-  (module-browser-name-medium "moyens")
-  (module-browser-name-long "longs")
-  (module-browser-name-very-long "longs, avec phases")  ;; like 'Long' but shows the phases where this file is loaded
-  (module-browser-open-all "Ouvrir tous les fichiers montrés ici")
-
-  (happy-birthday-matthias "Joyeux anniversaire, Matthias !")
-  (happy-birthday-matthew "Joyeux anniversaire, Matthew !")
-  (happy-birthday-shriram "Joyeux anniversaire, Shriram !")
-
-  (mrflow-using-default-language-title "Langage par défaut utilisé")
-  (mrflow-using-default-language "Le langage actuellement utilisé n'a pas de table de types défini pour ses primitives. R5RS Scheme est utilisé à la place.")
-  (mrflow-button-title "Analyzer")
-  ;(mrflow-unknown-style-delta-error-title "Delta de Style de boîte inconnu")
-  ;(mrflow-unknown-style-delta-error "Delta de style de boîte inconnu : ~a")
-  (mrflow-popup-menu-show-type "Montrer le type")
-  (mrflow-popup-menu-hide-type "Cacher le type")
-  (mrflow-popup-menu-show-errors "Montrer les erreurs")
-  (mrflow-popup-menu-hide-errors "Cacher les erreurs")
-  ;(mrflow-read-exception-title "Exception lecture")
-  ;(mrflow-read-exception "Exception durant la lecture : ~a")
-  ;(mrflow-syntax-exception-title "Exception syntaxique")
-  ;(mrflow-syntax-exception "Exception syntaxique : ~a")
-  ;(mrflow-unknown-exception-title "Exception inconnue")
-  ;(mrflow-unknown-exception "Exception inconnue : ~a")
-  ;(mrflow-language-primitives-error-title "Erreur pour les primitives du langage")
-  ;(mrflow-language-primitives-error "Mauvais nom de fichier pour la table des types des primitives du langage : ~a")
-
-  (snips-and-arrows-popup-menu-tack-all-arrows "Coller toutes les flèches")
-  (snips-and-arrows-popup-menu-untack-all-arrows "Décoller toutes les flèches")
-  (snips-and-arrows-user-action-disallowed-title "Changements actuellement interdits")
-  (snips-and-arrows-user-action-disallowed
-   "Les changements sont interdits dans les éditeurs qui contiennent des boîtes inserées par un outil."
-   " Cachez toutes les boîtes avant de modifier le contenu de l'éditeur.")
-  ;(snips-and-arrows-changing-terms-warning-title "Changer les termes ne pourra être défait")
-  (snips-and-arrows-hide-all-snips-in-editor "Cacher les boîtes de cet éditeur")
-
-  (xml-tool-insert-xml-box "Insérer une boîte XML")
-  (xml-tool-insert-scheme-box "Insérer une boîte Racket")
-  (xml-tool-insert-scheme-splice-box "Insérer une boîte Racket à raccord")
-  (xml-tool-xml-box "Boîte XML")
-  (xml-tool-scheme-box "Boîte Racket")
-  (xml-tool-scheme-splice-box "Boîte Racket à raccord")
-  (xml-tool-switch-to-scheme "Changer pour une boîte Racket")
-  (xml-tool-switch-to-scheme-splice "Changer pour une boîte Racket à raccord")
-  (xml-tool-eliminate-whitespace-in-empty-tags
-   "Eliminer les espaces dans les délimiteurs vides")
-  (xml-tool-leave-whitespace-alone
-   "Laisser les espaces tel quel")
-
-  (show-recent-items-window-menu-item "Montrer les fichiers récemment ouverts dans une fenêtre séparée")
-  (show-recent-items-window-label "Fichiers récemment ouverts")
-  (number-of-open-recent-items "Nombre de fichiers récents")
-  (switch-anyway "Changer de fichier quand même")
-
-  (stepper-program-has-changed "Avertissement : le programme a été modifié.")
-  (stepper-program-window-closed "Avertissement : la fenêtre du programme a disparu.")
-
-  (stepper-name "Pas à Pas")
-  (stepper-language-level-message "Le Pas à Pas n'est pas disponible pour le langage « ~a ».")
-  (stepper-button-label "Pas")
-
-  (stepper-previous "Pas")
-  (stepper-next "Pas")
-  (stepper-jump "Sauter...")
-  (stepper-jump-to-beginning "au début")
-  (stepper-jump-to-end "à la fin")
-  (stepper-jump-to-selected "au début de la sélection")
-  (stepper-jump-to-previous-application "au pas d'application précédent")
-  (stepper-jump-to-next-application "au pas d'application suivant")
-  (stepper-out-of-steps "Arrivé à la fin de l'évaluation sans trouver le type de pas que vous recherchiez.")
-  (stepper-no-such-step/title "Pas non trouvé")
-  (stepper-no-such-step "Impossible de trouver un pas qui satisfasse ce critère.")
-  (stepper-no-such-step/earlier "Impossible de trouver un pas précédent qui satisfasse ce critère.")
-
-  (stepper-no-earlier-application-step "Pas de pas d'application précédent.")
-  (stepper-no-later-application-step "Pas de pas d'application suivant.")
-  (stepper-complete "Toutes les définitions ont été correctement évaluées.")
-
-  (stepper-no-earlier-step "Pas de pas précédent.")
-  (stepper-no-later-step "Pas de pas suivant.")
-
-  (stepper-no-selected-step "Pas de pas effectué dans la région sélectionnée.  Peut-être est-elle commentée ?")
-
-  (stepper-no-last-step "Pas de pas final pour l'instant.")
-
-
-
-
-
-  (debug-tool-button-name "Déboguer")
-
-  (dialog-back "Précédent")
-
-  ;; warnings about closing a drscheme frame when the program
-  ;; might still be doing something interesting
-  (program-is-still-running "Le programme dans la fenêtre de définition est toujours en cours d'exécution. Fermer la fenêtre quand même ?")
-  (program-has-open-windows "Le programme dans la fenêtre de définition a d'autres fenêtres ouvertes. Fermer la fenêtre quand même ?")
-
-  ;; ml-command-line-arguments is for the command line arguments
-  ;; label in the module language details in the language dialog.
-  (ml-command-line-arguments "Arguments de ligne de commande (vecteur de chaînes de caractères, syntaxe de « read »)")
-
-  ;; ml-cp names are all for the module language collection path
-  ;; configuration. See the details portion of the language dialog
-  ;; for the module language (at the bottom).
-  (ml-cp-default-collection-path "« chemins de répertoires pour les collections par défaut »")
-
-  ;; in std get-directory
-  (ml-cp-choose-a-collection-path "Choisissez un chemin de répertoire pour une collection")
-
-  ;; err msg when adding default twice
-  (ml-cp-default-already-present
-   "Les chemins de répertoires pour les collections par défaut sont déjà présents")
-
-  ;; title of this section of the dialog (possibly the word
-  ;; `Collection' should not be translated)
-  (ml-cp-collection-paths "Chemins de répertoires pour les collections")
-
-  ;; button labels
-  ;;  The package manager uses these, too
-  (ml-cp-add "Ajouter")
-  (ml-cp-add-default "Ajouter les chemins par défaut")
-  (ml-cp-remove "Enlever")
-  (ml-cp-raise "Monter")
-  (ml-cp-lower "Descendre")
-
-  (ml-always-show-#lang-line "Toujours montrer la ligne #lang dans le langage Module")
-
-  ;; Profj
-  (profj-java "Java")
-  (profj-java-mode "mode Java")
-  (profj-java-coverage "Couvrage Java") ;; shows up in the preferences dialog under 'Color'
-
-  (profj-beginner-lang "Débutant")
-  (profj-beginner-lang-one-line-summary "Langage Java restreint pour l'enseignement des etudiants niveau débutant")
-  (profj-full-lang "Complet")
-  (profj-full-lang-one-line-summary "Java 1.0 (et partiellement 1.1)")
-  (profj-advanced-lang "Avancé")
-  (profj-advanced-lang-one-line-summary "Langage Java restreint pour l'enseignement des etudiants niveau avancé")
-  (profj-intermediate-lang "Intermédiaire")
-  (profj-intermediate-lang-one-line-summary "Langage Java restreint pour l'enseignement des etudiants niveau intermédiaire")
-  (profj-intermediate-access-lang "Intermédiaire + accès")
-  (profj-intermediate-access-lang-one-line-summary "Langage Java restreint pour l'enseignement des etudiants niveau intermédiaire, avec modificateurs d'accès")
-  (profj-dynamic-lang "Java + types dynamiques")
-  (profj-dynamic-lang-one-summary "Java, plus types dynamiques")
-
-  (profj-java-mode-color-heading "Édition des couleurs") ; Heading for preference to choose editing colors
-  (profj-java-mode-color-keyword "mots réservés")
-  (profj-java-mode-color-string "chaînes de caractères")
-  (profj-java-mode-color-literal "valeurs litérales")
-  (profj-java-mode-color-comment "commentaires")
-  (profj-java-mode-color-error "erreurs")
-  (profj-java-mode-color-identifier "identificateurs") ; l'académie française ne reconnaît pas ce mot
-  (profj-java-mode-color-prim-type "types élémentaires") ; Example text for built-in Java types
-  (profj-java-mode-color-default "valeur par défaut")
-
-  (profj-coverage-color-heading "Couleurs de couvrage") ; Heading for preference to choose coverage colors
-  (profj-coverage-color-covered "expressions couvertes")
-
-  (profj-language-config-display-preferences "Préférences pour l'affichage") ; Heading for preferences controlling printing
-  (profj-language-config-display-style "Styles d'affichage")
-  (profj-language-config-display-field "Classe et champs")
-  (profj-language-config-class "Classe")
-  (profj-language-config-display-array "Montrer le contenu des tableaux ?")
-  (profj-language-config-testing-preferences "Préférences pour les tests") ; Heading for preferences controlling test behavior
-  ;(profj-language-config-testing-enable "Montrer le résultat des tests lors de l'exécution ?") ; Run should be the word found on the Run button
-  (profj-language-config-testing-coverage "Collecter l'information de couvrage durant les tests ?")
-  (profj-language-config-support-test-language "Supporter l'extension de langage « test » ?")
-  (profj-language-config-testing-check "Permettre les expressions de type « check » ?") ; check should not be translated
-  (profj-language-config-classpath "Chemin d'accès aux classes")
-  (profj-language-config-choose-classpath-directory "Choisissez le répertoire à ajouter au chemin d'accès aux classes")
-  (profj-language-config-classpath-display "Montrer la valeur actuelle") ; Button label to print the current classpath
-
-  (profj-test-name-close-to-example "Le nom de classe ~a contient un mot qui ressemble au mot « Example ».")
-  (profj-test-name-example-miscapitalized "Le mot « example » dans le nom de classe ~a doit être écrit « Example »")
-
-  ;; Close testing window and do not run test cases any more
-  ;(profj-test-results-close-and-disable "Fermer la fenêtre et arrêter l'exécution des tests")
-  ;; Hide docked testing window and do not run test cases any more
-  ;(profj-test-results-hide-and-disable "Cacher la fenêtre et arrêter l'exécution des tests")
-  ;Renamed below
-  ;(profj-test-results-window-title "Résultats des tests")
-
-  (profj-unsupported "Non-supporté")
-  (profj-executables-unsupported "Désolé - la création d'exécutables n'est pour l'instant pas supportée pour Java")
-
-  (profj-convert-to-text-comment "Convertir en commentaire texte")
-  (profj-convert-to-comment "Convertir en commentaire")
-
-  (profj-executing-main "exécution de « main »")
-
-  (profj-insert-java-comment-box "Insérer une boite à commentaires Java")
-  (profj-insert-java-interactions-box "Insérer une boite à interactions Java")
-
-  ;The Test engine tool
-  ;;
-  (test-engine-window-title "Résultats des tests")
-  ;;Following two appear in View menu, attach and free test report window from DrRacket frame
-  (test-engine-dock-report "Attacher le rapport de test")
-  (test-engine-undock-report "Détacher le rapport de test")
-  ;;Following two appear in Racket (Java, etc) menu, cause Tests to be Run automatically or not
-  (test-engine-enable-tests "Revalider les tests")
-  (test-engine-disable-tests "Invalider les tests")
-
-  (test-engine-ran-1-test "1 test exécuté.")
-  (test-engine-ran-1-check "1 contrôle exécuté.")
-  ;; ditto, only plural
-  (test-engine-ran-n-tests "~a tests exécutés.")
-  (test-engine-ran-n-checks "~a contrôles exécutés.")
-  (test-engine-1-test-passed "Le test est réussi !")
-  (test-engine-1-check-passed "Le contrôle est réussi !")
-  (test-engine-both-tests-passed "Les deux tests ont réussi !")
-  (test-engine-both-checks-passed "Les deux contrôles ont réussi !")
-  (test-engine-all-tests-passed "Tous les tests ont réussi !")
-  (test-engine-all-checks-passed "Tous les contrôles ont réussi !")
-  (test-engine-all-n-tests-passed "Tous les ~a tests ont réussi !")
-  (test-engine-all-n-checks-passed "Tous les ~a contrôles ont réussi !")
-  (test-engine-0-tests-passed "0 tests ont réussi.")
-  (test-engine-0-checks-passed "0 contrôles ont réussi.")
-  (test-engine-m-of-n-tests-failed "~a tests parmi ~a ont échoué.")
-  (test-engine-m-of-n-checks-failed "~a contrôles parmi ~a ont échoué.")
-  (test-engine-must-be-tested "Ce programme doit être testé !")
-  (test-engine-is-unchecked "Ce programme n'est pas contrôlé !")
-  (test-engine-tests-disabled "Tests invalidés.")
-  (test-engine-should-be-tested "Ce programme devrait être testé.")
-  (test-engine-at-line-column "à la ligne ~a, colonne ~a")
-  (test-engine-in-at-line-column "dans ~a, ligne ~a, colonne ~a")
-  ; as in "column (unknown)"
-  (test-engine-unknown "(inconnue)")
-  (test-engine-trace-error "Trace erronée")
-
-  ; The ~F is special marker for the offending values, which may be
-  ; printed specially in DrRacket.
-  (test-engine-check-encountered-error
-   "check-expect a rencontré l'erreur suivante au lieu de la valeur attendue, ~F. ~n   :: ~a")
-  (test-engine-actual-value-differs-error
-   "La valeur actuelle ~F est différente de ~F, la valeur attendue.")
-  (test-engine-actual-value-not-within-error
-   "La valeur actualle ~F n'est pas à moins de ~v de la valeur attendue ~F.")
-  (test-engine-encountered-error-error
-   "check-error a rencontré l'erreur suivante au lieu du ~a attendu~n   :: ~a")
-  (test-engine-expected-error-error
-   "check-error attendait l'erreur suivante au lieu de la valeur ~F reçue.~n ~a")
-  (test-engine-expected-an-error-error
-   "check-error attendait une erreur au lieu de la valeur ~F.")
-  ;; members are appended to the message
-  (test-engine-not-mem-error "La valeur actuelle ~F est différente de tous les membres dans ")
-  (test-engine-not-range-error "La valeur actuelle ~F n'est pas entre ~F et ~F, inclusif.")
-
-  ;; followed by list of variable bindings
-  (test-engine-property-fail-error "Propriété falsifiable par")
-  (test-engine-property-error-error "check-property a rencontré l'erreur suivante~n:: ~a")
-
-  (signature-enable-checks "Permettre la vérification des signatures")
-  (signature-disable-checks "Désactiver la vérification des signatures")
-
-  ; section header
-  (test-engine-check-failures "Échecs de vérfications :")
-  ; section header
-  (test-engine-signature-violations "Violations de signatures :")
-
-  ; part of one phrase "signature <at line ...> to blame: procedure <...>
-  (test-engine-signature "Le signature")
-  (test-engine-to-blame "blame la procédure")
-
-  (test-engine-no-signature-violations "Pas de violation de contrat.")
-  (test-engine-1-signature-violation "1 violation de contrat.")
-  (test-engine-n-signature-violations "~a violations de signatures.")
-
-  ; as in got <value>, signature <at ...>
-  (test-engine-got "reçu")
-
-  (profjWizward-insert-java-class "Insérer une classe Java")
-  (profjWizard-insert-java-union "Insérer un union Java")
-
-  ;; The Test Suite Tool
-  ;; Errors
-  (test-case-empty-error "Test vide")
-  (test-case-too-many-expressions-error "Expressions trop nombreuses dans un test.")
-  ;; DrRacket window menu items
-  (test-case-insert "Insérer un test")
-  (test-case-disable-all "Invalider tous les tests")
-  (test-case-enable-all "Revalider tous les tests")
-
-  ;; NOTE: The following three string constants are labels of the test-case fields. The width
-  ;;       of the field is determined by the length of the longest of the following three words.
-  ;;       if the words are too long the test case will take up too much horizontal room and
-  ;;       not look very good.
-  ;; This string is the label of the expression that is being tested in a test case.
-  (test-case-to-test "À tester")
-  ;; This string is the label of the expression that is the expected value of the to-test expression.
-  (test-case-expected "Attendu")
-  ;; This string is the label of the actual result of the to test expression.
-  (test-case-actual "Reçu")
-  (test-case-predicate "Prédicat")
-  (test-case-should-raise "Doit lever l'exception")
-  ;; The label of a field of the test-case that describes the expected error message of a test case
-  (test-case-error-message "Message d'erreur")
-
-  (test-case-menu-title "Test")
-  (test-case-switch-to-error-box "Changer pour une boîte de test d'erreur")
-  (test-case-switch-to-nonerror-box "Changer pour une boîte de test sans erreur")
-  (test-case-collapse "Escamoter le test")
-  (test-case-show-actual "Montrer la valeur")
-  (test-case-enable "Revalider le test")
-  (test-case-show-predicate "Montrer le predicat")
-  (test-case-show-error-message "Montrer le message d'erreur")
-  (test-case-convert-to-text "Convertir en texte")
-
-  ;; Profj Boxes
-  (profjBoxes-empty-error "Interaction vide")
-  (profjBoxes-too-many-expressions-error "Expressions trop nombreuses dans un test")
-  (profjBoxes-interactions-label "Interactions")
-  (profjBoxes-bad-java-id-error "Identificateur Java malformé") ; l'académie française ne reconnaît pas ce mot
-  (profjBoxes-examples-label "Examples")
-  (profjBoxes-add-new-example-button "Ajouter un nouvel example")
-  (profjBoxes-type "Type")
-  ;; The Java identifier of an example of data
-  (profjBoxes-name "Nom")
-  (profjBoxes-value "Valeur")
-  (profjBoxes-insert-java-examples "Insérer des examples Java")
-  (profjBoxes-insert-java-interactions "Insérer des interactions Java")
-
-  ;; Slideshow
-  (slideshow-hide-picts "Montrer les boîtes nichées")
-  (slideshow-show-picts "Montrer les images")
-  (slideshow-cannot-show-picts "Il est impossible de montrer les images; exécutez d'abord le programme pour calculer les dimensions")
-  (slideshow-insert-pict-box "Insérer une boîte à image") ; vu a la tele!
-
-  ;; GUI Tool
-  (gui-tool-heading "Outil GUI") ; IGU is seldom used, "interface graphique" is too long (here and below)
-  (gui-tool-before-clicking-message
-   "Avant d'utiliser cet outil vous devez d'abord soit employer « Insérer une GUI » dans le menu « Spécial »"
-   " pour insérer une GUI à la racine, soit sélectionner une GUI existante")
-  (gui-tool-show-gui-toolbar "Montrer la barre d'outils GUI")
-  (gui-tool-hide-gui-toolbar "Cacher la barre d'outils GUI")
-  (gui-tool-insert-gui "Insérer une GUI")
-
-  ;; contract violation tracking
-
-  ; tooltip for new planet icon in drscheme window (must have a planet violation logged to see it)
-  (show-planet-contract-violations "Montrer les violations de contrat pour PLaneT")
-
-  ; buttons in the dialog that lists the recorded bug reports
-  (bug-track-report "Soumettre un rapport de bogue")
-  (bug-track-forget "Oublier")
-  (bug-track-forget-all "Oublier tous")
-
-  ;; planet status messages in the bottom of the drscheme window; the ~a is filled with the name of the package
-  (planet-downloading "PLaneT: téléchargement de ~a...")
-  (planet-installing "PLaneT: installation de ~a...")
-  (planet-finished "PLaneT: ~a à jour.")
-  (planet-docs-building "PLaneT: compilation des docs (déclenché par ~a)...")
-  (planet-no-status "PLaneT") ;; this can happen when there is status shown in a different and then the user switches to a tab where planet hasn't been used
-
-  (bug-report-field-pkg "Information système du logiciel") ; package -> paquetage, bibliothèque ?
-
-  ;; string normalization. To see this, paste some text with a ligature into DrRacket
-  ;; the first three strings are in the dialog that appears. The last one is in the preferences dialog
-  (normalize "Normaliser")
-  (leave-alone "Ne pas changer")
-  (normalize-string-info "La chaîne de caractères à coller contient des ligatures ou des caractères non-normalisés. Normaliser la chaîne ?")
-  (normalize-string-preference "Normaliser les chaînes de caractères durant le collage")
-  (ask-about-normalizing-strings "Demander à propos de la normalisation des chaînes de caractères")
-
-  (always-use-platform-specific-linefeed-convention "Toujours utiliser la convention spécifique au système d'exploitation pour les fins de lignes")
-
-  ;; optimization coach
-  (hide-optimization-coach "Cacher l'informateur d'optimisation") ; better than "entraîneur"...
-  (show-optimization-coach "Montrer l'informateur d'optimisation")
-
-  ;; labels used (in a big font) in the background of the definitions and interactions windows
-  (definitions-window-label "définitions")
-  (interactions-window-label "interactions")
-  (hide-defs/ints-label "Cacher les étiquettes Définitions/Interactions") ;; popup menu
-  (show-defs/ints-label "Montrer les étiquettes définitions/interactions") ;; preferences checkbox
-
-  ;; menu item in the 'edit' menu; applies to editors with programs in them
-  ;; (technically, editors that implement color:text<%>)
-  (spell-check-string-constants "Vérification orthographique des chaînes de caractères constantes")
-  (spell-check-scribble-text "Vérification orthographique du texte (entre {} dans Scribble)")
-  (spelling-dictionaries "Dictionnaires orthographiques") ; (sub)menu whose items are the different possible dictionaries
-  (default-spelling-dictionary "Dictionnaire par défaut") ; first item in menu from previous line
-  (misspelled-text-color "Couleur de texte pour les erreurs orthographiques") ;; in the preferences dialog
-  (cannot-find-ispell-or-aspell-path "Programmes 'aspell' ou 'ispell' introuvables")
-  ; puts the path to the spell program in the ~a and then the error message
-  ; is put following this string (with a blank line in between)
-  (spell-program-wrote-to-stderr-on-startup "Le programme de vérification orthographique (~a) à émit un message d'erreur :")
-
-  ;; GUI for installing a pkg package; available via File|Install Package...
-  (install-pkg-install-by-source "Faire ce que je pense")         ; tab label
-  (install-pkg-install-from-list "Disponible dans le catalogue") ; tab label
-  (install-pkg-install-installed "Actuellement installé")    ; tab label
-  (install-pkg-migrate-from "Copier de la version")           ; tab label
-  (install-pkg-settings "Configuration")                        ; tab label
-  (install-pkg-menu-item... "Installer un paquetage...")
-  (install-pkg-dialog-title "Installation de paquetage")
-  (install-pkg-source-label "Source du paquetage")
-  (install-pkg-package-name "Nom du paquetage")
-  (install-pkg-package-source-desc "Une source de paquetage est un nom de paquetage, un fichier, un répertoire, un URL, ou une référence vers Github")
-  (install-pkg-infer "Inférer")
-  (install-pkg-use "Utiliser") ; as opposed to "Infer", label for text box
-  (install-pkg-type-label "Type de source de paquetage")
-  (install-pkg-file "Fichier")
-  (install-pkg-dir "Répertoire")
-  (install-pkg-dir-url "Répertoire distant")
-  (install-pkg-file-url "Fichier distant")
-  (install-pkg-github "Github")
-  (install-pkg-name "Nom (consultation du résolveur)")
-  (install-pkg-inferred-as "Le type inféré est ~a") ; ~a gets install-pkg-{file,dir,...}
-  (install-pkg-link-dirs "Lien vers un répertoire local")
-  (install-pkg-file-or-dir? "Sélectionner un fichier ou un répertoire?")
-  (install-pkg-force? "Ignorer les conflits")
-  (install-pkg-replace? "Les mises à jour peuvent remplacer les installations existantes")
-  (install-pkg-command-line "Ligne de commande équivalente :")
-  (install-pkg-error-installing-title "Erreur durant l'installation du paquetage")
-  (install-pkg-action-label "Action à prendre")
-  (install-pkg-install "Installer")
-  (install-pkg-update "Mettre à jour")
-  (install-pkg-remove "Supprimer")
-  (install-pkg-do-not-remove "Ne pas supprimer")
-  (install-pkg-action-inferred-to-be-update "L'action inférée est une mise à jour")
-  (install-pkg-action-inferred-to-be-install "L'action inférée est une installation")
-  (install-pkg-default "Par défaut")
-  (install-pkg-scope-label "Champ d'application du paquetage")
-  (install-pkg-default-scope-label "Champ d'application par défaut pour le paquetage") ; for picking the scope to be default
-  (install-pkg-installation "Une installation Racket spécifique")
-  (install-pkg-user "Un utilisateur et une version de Racket spécifiques")
-  (install-pkg-set-as-default "Fixer comme défaut")
-  (install-pkg-scope-is "Le champ d'application du paquetage est ~a") ; ~a gets install-pkg-{installation,user,shared}
-  (install-pkg-select-package-directory "Sélectionner le répertoire pour le paquetage")
-  (install-pkg-select-package-file "Sélectionner le fichier du paquetage")
-  (install-pkg-update-package-list "Mettre à jour la liste des paquetages")
-  (install-pkg-stop-update "Arrêter la mise à jour")
-  (install-pkg-filter "Filtre")
-  (install-pkg-update-catalogs? "Mettre à jour la base de données pour refléter l'ensemble des catalogues configurés ?")
-  (install-pkg-currently-configured-are "Les catalogues actuellement configurés sont")
-  (install-pkg-database-recorded-are "Les catalogues enregistrés dans la base de données sont")
-  (install-pkg-update-catalogs "Mettre à jour")
-  (install-pkg-do-not-update-catalogs "Ne pas mettre à jour")
-  (install-pkg-really-remove? "Êtes-vous sûr de vouloir supprimer les paquetages suivants que vous avez sélectionné ?")
-  (install-pkg-promote "Promouvoir depuis « auto-installé »")
-  (install-pkg-demote "Rétrograder vers « auto-installé »")
-  (install-pkg-abort-install "Abandonner l'installation")
-  (install-pkg-abort-update "Abandonner la mise à jour")
-  (install-pkg-abort-remove "Abandonner la suppression")
-  (install-pkg-abort-demote "Abandonner la rétrogradation")
-  (install-pkg-abort-promote "Abandonner la promotion")
-  (install-pkg-abort-migrate "Abandonner la migration")
-  (install-pkg-abort-generic-action "Abandonner l'action")
-  (install-pkg-close-terminal-output "Fermer la sortie de données")
-  (install-pkg-show-all-options "Montrer toutes les options")
-  (install-pkg-migrate-available-installations "Installations disponibles")
-  (pkg-manager-menu-item "Gestionnaire de paquetages...")  
-  ;; where ~a gets an installation name:
-  (install-pkg-packages-for "Paquetages pour ~a")
-  (install-pkg-really-remove-installation "Êtes-vous sûr de vouloir supprimer tous les paquetages installés et toutes les informations pour ~a ?")
-  
-  (install-pkg-abort-set-scope "Abandonner le changement de champ d'application")
-
-  (install-pkg-dependencies-fail "Échec : annule l'installation ou la mise à jour si des dépendances manquent")
-  (install-pkg-dependencies-force "Force : installe même si des dépendances manquent ou ont la mauvaise version")
-  (install-pkg-dependencies-search-ask "Demande : demande à propos de chaque dépendance manquante (non-supporté par l'interface graphique)")
-  (install-pkg-dependencies-search-auto "Auto : installe automatiquement les dépendances qui manquent ou qui ont la mauvaise version")
-  (install-pkg-dependencies-search-auto+update "Auto + Mise à jour : automatiquement met à jour toutes les dépendances possibles")
-
-  (install-pkg-dependencies-mode "Mode pour les dépendances")
-
-  (install-pkg-dependencies-search-ask-not-supported-in-gui
-   "Le mode «demande» pour les dépendances n'est pas supporté dans cet installeur graphique.")
-  ;; "~a" is pre-":" part of `install-pkg-dependencies-fail' or `install-pkg-dependencies-search-auto':
-  (install-pkg-deps-is "Le mode par défaut pour les dépendances est ~a")
-
-  (install-pkg-package-catalogs "Catalogues pour les paquetages") ; label for a list box
-  (install-pkg-add-package-catalog "Ajouter un catalogue de paquetages")
-
-  (install-pkg-not-rentrant "Installation et mise à jour ne peuvent avoir lieu en même temps;"
-                            " abandonnez l'installation ou la mise à jour actuelle, ou attendez-en la fin.")
-  
-  ;; open a file via a collection path (new "Open" menu item in DrRacket)
-  ;; now obsolete; replaced by open-require-path (open-collection-path "Ouvrir un chemin de répertoires pour une collection...")
-  (enter-subcollection "Spécifier une sous-collection") ; button in new dialog
-  (path-to-racket-binary "Chemin de répertoires vers le fichier binaire")
-  (use-a-different-racket "Utiliser une version de racket différente")
-
-  ;; adding racket/bin to the path; only under mac os x
-  ; first ~a is filled with either the empty string or an error message from elsewhere
-  ;  (bracketed by some newlines to separate it out)
-  ; second ~a is filled with /etc/paths.d/racket (or some other path like it in the future)
-  ; third ~a is filled with the path to the bin directory of the current drracket
-  (adding-racket/bin-to-path-failed 
-   "La tentative d'ajouter le support pour racket à la ligne de commande a échoué.~aSpécifiquement,"
-   " il est impossible de créer « ~a » avec le contenu de « ~a ».")
-  ; first and third ~a are filled with /etc/paths.d/racket (or some other path like it in the future)
-  ; and the second one is filled with the path to the bin directory that was put into that file.
-  (added-racket/bin-to-path
-   "Vous pouvez maintenant utiliser racket et ses outils à la"
-   " ligne de commande.\n\nLe"
-   " PATH par défaut a été configuré pour tous les utilisateurs en ajoutant le fichier"
-   " ~a, pour pointer vers ~a. Voud pouvez annuler ce"
-   " changement en supprimant ~a.")
-  (add-racket/bin-to-path "Configurer la ligne de commande pour racket...") ;; menu item label
-  ); aâàbcçdeéêèëfghiîïjklmnoôpqrstuûùüvwxyz AÂÀBCÇDEÉÊÈËFGHIÎÏJKLMNOÔPQRSTUÛÙÜVWXYZ “” «  »
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/german-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/german-string-constants.rkt
deleted file mode 100644
index 7d6bc4580e..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/german-string-constants.rkt
+++ /dev/null
@@ -1,1808 +0,0 @@
-(module german-string-constants "string-constant-lang.rkt"
-
- (is-this-your-native-language
-  "Ist Deutsch Ihre Muttersprache?")
-
- (are-you-sure-you-want-to-switch-languages
-  "Dies wird die Sprache der DrRacket-Benutzeroberfläche ändern und erfordert einen Neustart von DrRacket.  Sind Sie sicher?")
-
- (interact-with-drscheme-in-language "Deutsche Benutzeroberfläche für DrRacket")
-
- (accept-and-quit "In Ordnung - Beenden")
- (accept-and-exit "In Ordnung - Beenden")
- ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
- (plt "PLT")
- (drscheme "DrRacket")
- (drracket "DrRacket")
- (ok "OK")
- ;; We can't use "Abbrechen" here because that's much closer in
- ;; meaning to "abort", and it appears in dialogs saying "Quit?" "OK"
- ;; "Cancel."
- (cancel "Abbrechen")
- (abort "Abbrechen")
- (untitled "Namenlos")
- (untitled-n "Namenlos ~a")
- (warning "Warnung")
- (error "Fehler")
- (close "Schließen") ;; as in, close an open window or tab. must match close-menu-item
-                  ;; in the sense that, when the &s have been stripped from
-                  ;; close-menu-item, it must be the same string as this.
- (close-window "Fenster schließen")
- (stop "Stop")
- (&stop "&Stop") ;; for use in button and menu item labels, with short cut.
- (are-you-sure-delete? "Sind Sie sicher, dass Sie ~a löschen wollen?") ;; ~a is a filename or directory name
- (are-you-sure-replace? "Sind Sie sicher, dass Sie ~a ersetzen wollen?") ;; ~a is a filename or directory name
- (ignore "Ignorieren")
- (revert "Änderungen rückgängig machen")
-
- (dont-ask-again-always-current "Nicht wieder nachfragen (immer so wie jetzt)")
- (dont-ask-again                "Nicht wieder nachfragen")
-
- (web-materials "Verwandte Web-Seiten")
- (tool-web-sites "Web-Seiten mit Tools")
- (plt-homepage "Racket")
- (pbd-homepage "Program by Design")
-
- ;;; bug report form
- (cancel-bug-report? "Bug-Report verwerfen?")
- (are-you-sure-cancel-bug-report?
-  "Sind Sie sicher, dass Sie diesen Bug-Report verwerfen wollen?")
- (do-you-want-to-discard-or-save-this-bug-report
-  "Wollen Sie den Bug-Report verwerfen oder speichern?")
- (discard "Verwerfen") ;; a button label for a dialog box with the above question
- (bug-report-form "Formular für Bug-Report")
- (bug-report-field-name "Name")
- (bug-report-field-email "Email")
- (bug-report-field-summary "Zusammenfassung")
- (bug-report-field-severity "Wie schlimm?")
- (bug-report-field-class "Art")
- (bug-report-field-description "Beschreibung")
- (bug-report-field-reproduce1 "Schritte, um das Problem zu")
- (bug-report-field-reproduce2 "reproduzieren")
- (bug-report-field-environment "Umgebung")
- (bug-report-field-docs-installed "Installierte Dokumentation")
- (bug-report-field-collections "Collections")
- (bug-report-field-links "Links")  ;; from 'raco link'
- (bug-report-field-human-language "Interaktionssprache") ;
- (bug-report-field-memory-use "Speicherverbrauch")
- (bug-report-field-version "Version")
- (bug-report-synthesized-information "Generierte Information")  ;; dialog title
- (bug-report-show-synthesized-info "Generierte Informationen anzeigen") ; (an)zeigen
- (bug-report-submit "Abschicken")
- (close-and-save-bug-report "Schließen && Speichern") ;; button in bug report dialog, next to cancel and bug-report-submit
- (bug-report-submit-menu-item "Bug-Report abschicken...") ;; in Help Menu (drs & help desk)
- (saved-bug-reports-menu-item "Gepeicherte Bug-Reports") ;; in Help Menu, submenu title
- (disacard-all-saved-bug-reports "Alle gespeicherten Bug-Reports verwerfen") ;; menu item: only shows up when there is more than one saved bug report
- (no-saved-bug-reports "Kein Bug-Report wurde gespeichert") ;; an info message that shows up as a disabled menu item when no saved bug reports are around
- (new-bug-report "Neuer Bug-Report") ;; button label the user sees when there are saved bug reports, but the user asks to save another one.
- (close-and-save "Schließen und Speichern") ;; button on the bottom of the bug report form
- (saved-unsubmitted-bug-reports "Gespeicherte, noch nicht abgeschickte Bug-Reports:") ;; next to previous line in same dialog, followed by list of bug report subjects (as buttons)
- (error-sending-bug-report "Versendung des Bug-Reports fehlgeschlagen")
- (error-sending-bug-report-expln "Ein Fehler ist beim Versenden des Bug-Reports aufgetreten. Falls Ihre Internet-Verbindung eigentlich funktioniert, besuchen Sie bitte:\n\n    http://bugs.racket-lang.org/ \n\nund teilen Sie uns den Bug mit unserem Online-Formular mit. Wir bitten um Ihr Verständnis.\n\nDie Fehlermeldung lautet:\n~a")
- (illegal-bug-report "Ungültiger Bug-Report")
- (pls-fill-in-field "Bitte auch das \"~a\" Feld ausfüllen")
- (malformed-email-address "Ungültige Email-Adresse")
- (pls-fill-in-either-description-or-reproduce "Bitte füllen Sie entweder das Feld \"Beschreibung\" oder das Feld \"Schritte, um das Problem zu reproduzieren\" aus.")
-
- ;;; check syntax
- (check-syntax "Syntaxprüfung")
- (cs-italic "Kursiv")
- (cs-bold "Fett")
- (cs-underline "Unterstrichen")
- (cs-change-color "Farbe ändern")
- (cs-foreground-color "Vordergrundfarbe")
- (cs-background-color "Hintergrundfarbe")
- (cs-tack/untack-arrow "Pfeil befestigen/lösen")
- (cs-jump-to-next-bound-occurrence "Zum nächsten gebundenen Vorkommen springen")
- (cs-jump-to-previous-bound-occurrence "Zum vorigen gebundenen Vorkommen springen")
- (cs-jump-to-binding "Zu bindendem Vorkommen springen")
- (cs-jump-to-definition "Zu Definition (in anderer Datei) springen")
- (cs-open-defining-file "Datei mit Definition öffnen")
- (cs-error-message "Fehlermeldung")
- (cs-open-file "~a öffnen")
- (cs-rename-var "~a umbenennen")
- (cs-rename-id "Bezeichner umbenennen")
- (cs-rename-var-to "~a umbenennen nach:")
- (cs-name-duplication-error "Der neugewählte Name, ~s, ist hier schon gebunden.")
- (cs-rename-anyway "Trotzdem umbenennen")
- (cs-status-init "Syntaxprüfung: Umgebung für den User-Code initialisieren")
- (cs-status-coloring-program "Syntaxprüfung: Ausdruck einfärben")
- (cs-status-eval-compile-time "Syntaxprüfung: Compile-Time-Code ausführen")
- (cs-status-expanding-expression "Syntaxprüfung: Ausdruck expandieren")
- (cs-status-loading-docs-index "Syntaxprüfung: Dokumentations-Index laden")
- (cs-mouse-over-import "Bindung ~s importiert aus ~s")
-
- (cs-view-docs "Dokumentation für ~a anschauen")
- (cs-view-docs-from "~a aus ~a")  ;; a completed version of the line above (cs-view-docs) is put into the first ~a and a list of modules (separated by commas) is put into the second ~a. Use check syntax and right-click on a documented variable (eg, 'require') to see this in use
-  
- (cs-lexical-variable "lexikalische Variable")
- (cs-set!d-variable "geset!zte Variable")
- (cs-imported-variable "importierte Variable")
- (cs-unused-require "unbenutztes require")
- (cs-free-variable "freie Variable")
-
- (cs-binder-count "~a bindende Vorkommen")
- (cs-zero-varrefs "keine gebundenen Vorkommen")
- (cs-one-varref "Ein gebundenes Vorkommen")
- (cs-n-varrefs "~a gebundene Vorkommen") ;; expected to have one ~a formatter that will accept a number
-
- (cs-contract-my-obligation "Vertrag: Obliation dieses Moduls")
- (cs-contract-their-obligation "Vertrag: Obligation des Klientenmoduls")
- (cs-contract-both-obligation "Vertrag: Obligation sowohl dieses Moduls als auch des Klientenmoduls")
- (cs-contract-unk-obligation "Vertrag: Oblikation unbekannt")
-
- ;; mode sub-menu in the "view" menu
- (cs-check-syntax-mode "Syntax-Check-Modus")
- (cs-mode-menu-show-my-obligations "Meine Vertragsobligationen")
- (cs-mode-menu-show-client-obligations "Vertragsobligationen des Klienten")
- (cs-mode-menu-show-syntax "Syntaktische Kategorien")
-
-  ;; the documentation blue boxes in the upper-right corner of the drracket window
-  (sc-read-more... "Mehr hier nachlesen ...")
-  (sc-f2-to-un/lock "f2 um zu (ent)blockieren")
-
- ;; the online check syntax status messages (mouse over the bottom right of drracket's window to see the messages during online expansion's various phases)
- (online-expansion-running "Hintergrund-Expansion läuft")
- (online-expansion-only-raw-text-files-supported "Nur reine Text-Dateien sind unterstützt")
- (online-expansion-abnormal-termination "Hintergrund-Expansion unglücklich abgebrochen")
- (online-expansion-abnormal-termination-out-of-memory "Hintergrund-Expansion unglücklich abgebrochend (kein Speicher mehr)")
- (online-expansion-finished-successfully "Hintergrund-Expansion erfolgreich abgeschlossen")
-
- (jump-to-error "Zum Fehler springen")
- (online-expansion-is-disabled "Hintergrund-Expansion ist deaktiviert")
- ;; these next two show up in the bar along the bottom of the drracket window
- (online-expansion-pending "Hintergrund-Expansion läuft ...")
- (online-expansion-finished "Hintergrund-Expansion fertig") ;; note: there may still be errors in this case
- 
- ; the next two show up in a menu when you click on the circle in the bottom right corner
- (disable-online-expansion "Hintergrund-Expansion deaktivieren")
- (enable-online-expansion "Hintergrund-Expansion aktivieren")
- ;; the online expansion preferences pane
- (online-expansion "Hintergrund-Expansion") ;; title of prefs pane
- ; the different kinds of errors
- (online-expansion-show-read-errors-as "Reader-Fehler anzeigen")
- (online-expansion-show-variable-errors-as "Ungebundene Bezeichner anzeigen")
- (online-expansion-show-other-errors-as "Andere Fehler anzeigen")
- ; locations the errors can be shown
- (online-expansion-error-gold-highlight "mit goldener Markierung")
- (online-expansion-error-margin "am Rand")
- ; the label of a preference in the (string-constant online-expansion) section
- (show-arrows-on-mouseover "Bindungen und Tail-Positionen unter Mauszeiger anzeigen")
- (show-blueboxes "Blaue Kästen  und blaue anzeigen")
- ;;; info bar at botttom of drscheme frame
- (collect-button-label "GC")
- (read-only "Nur Lesen")
- (auto-extend-selection "Automatisch erweitern")
- (overwrite "Überschreiben")
- (running "Programm läuft")
- (not-running "Programm inaktiv")
- 
- (install-package-button "~a installieren") ;; button label: ~a is filled with the name of a pkg
-
- (update-catalog "Katalog aktualisieren") ;; button label; shown when there is a missing module, but no matching package
- (updating-catalog-from "Von ~a aktualisieren...") ;; message label; used as a status message when updating the pkg catalog
-
- ;;; misc
- (welcome-to-something "Willkommen bei ~a")
- 
- ; this appears in the drscheme about box.
- (welcome-to-drscheme-version/language "Willkommen bei DrRacket! (Version ~a, ~a)")
-
- ; these appear on subsequent lines in the `Help|Welcome to DrRacket' dialog.
- (welcome-to-drscheme "Willkommen bei DrRacket")
-
- (goto-line "Zu Zeile springen")
- (goto-line-invalid-number
-  "~a ist keine gültige Zeilennummer. Es muss eine ganze Zahl zwischen 1 und ~a sein.")
- (goto-position "Zu Position springen")
- (no-full-name-since-not-saved
-  "Die Datei hat noch keinen Namen, weil sie noch nicht abgespeichert wurde.")
- (cannot-open-because-dne "Die Datei ~a kann nicht geöffnet werden, weil sie nicht existiert.")
- (needs-execute-language-changed
-   "WARNUNG: Die Sprache hat sich geändert. \"Start\" drücken.")
- (needs-execute-teachpack-changed
-  "WARNUNG: Die Teachpacks haben sich geändert. \"Start\" drücken.")
- (needs-execute-defns-edited
-  "WARNUNG: Die Definitionen haben sich geändert. \"Start\" drücken.")
-
- (editor-changed-since-srcloc-recorded
-  "Dieser Editor wurde geändert seit die Quelltext-Stellen zugeordnet wurden: die markierte Region entspricht möglicherweise nicht mehr der korrekten Stelle im Quelltext.")
-
- (file-is-not-saved "Die Datei \"~a\" ist nicht gespeichert.")
- (save "Speichern")
- (close-anyway "Trotzdem schließen")
- (dont-save "Nicht speichern")
- (clear-anyway "Trotzdem löschen")
-
- (log-definitions-and-interactions "Definitionen and Interaktionen protokollieren...")
- (stop-logging "Protokoll stoppen")
- (please-choose-a-log-directory "Bitte wählen Sie ein Verzeichnis für das Protokoll")
- (logging-to "Protokoll: ")
- (erase-log-directory-contents "Inhalt von Protokoll-Verzeichnisses ~a löschen?")
- (error-erasing-log-directory "Fehler beim Löschen des Protokoll-Verzeichnisses.\n\n~a\n")
-
-  ;; menu items connected to the logger -- also in a button in the planet status line in the drs frame
-  (show-log "&Log einblenden")
-  (hide-log "&Log ausblenden")
-  (logger-scroll-on-output "Bei Ausgabe scrollen") ; a checkbox in the logger pane
-  (log-messages "Log-Nachrichten") ;; label for the drracket logging gui panel
-
- ;; modes
- (mode-submenu-label "Modi")
- (scheme-mode "Scheme-Modus")
- (racket-mode "Racket-Modus")
- (text-mode "Text-Modus")
-
- (scheme-mode-color-symbol "Symbol")
- (scheme-mode-color-keyword "Schlüsselwort")
- (scheme-mode-color-comment "Kommentar")
- (scheme-mode-color-string "Zeichenkette")
- (scheme-mode-color-text "Text")
- (scheme-mode-color-constant "Literal")
- (scheme-mode-color-parenthesis "Klammer")
- (scheme-mode-color-hash-colon-keyword "#:Keyword")
- (scheme-mode-color-error "Fehler")
- (scheme-mode-color-other "Sonstiges")
- (syntax-coloring-choose-color "Wählen Sie eine Farbe für ~a")
- (preferences-colors "Farben")
-
- ;; parenthesis color scheme string constants
- (parenthesis-color-scheme "Farbschema für Klammern") ;; label for the choice% menu in the preferences dialog
- (paren-color-basic-grey "Grau Standard")
- (paren-color-shades-of-gray "Grauschattierungen")
- (paren-color-shades-of-blue "Blauschattierungen")
- (paren-color-spring "Frühling")
- (paren-color-fall "Herbst")
- (paren-color-winter "Winter")
-
- (url: "URL:")
- (open-url... "URL öffnen...")
- (open-url "URL öffnen")
- (browse... "Browsen...")
- (bad-url "Ungültige URL")
- (bad-url:this "Ungültige URL: ~a")
- 
- ;; Help Desk
- (help "Hilfe")
- (racket-documentation "Dokumentation für Racket")
- (help-desk "Hilfezentrum")
- (plt:hd:search "Suchen")
- (plt:hd:feeling-lucky "Auf gut Glück")
- (plt:hd:home "Hilfezentrum-Homepage") 
- ; next 3 are popup menu choices in help desk search frame
- (plt:hd:search-for-keyword "Stichworteintrag")
- (plt:hd:search-for-keyword-or-index "Stichwort- oder Index-Eintrag")
- (plt:hd:search-for-keyword-or-index-or-text "Stichwort- oder Index-Eintrag, oder Text")
- (plt:hd:exact-match "Exakte Treffer")
- (plt:hd:containing-match "Teilwort")
- (plt:hd:regexp-match "über regulären Ausdruck")
- (plt:hd:find-docs-for "Finde Dokumentation zu:")
- (plt:hd:search-stopped-too-many-matches "[Suche abgebrochen: zu viele Treffer]")
- (plt:hd:nothing-found-for "Nichts zu ~a gefunden")
- (plt:hd:and "und")
- (plt:hd:refresh "aktualisieren")
- (plt:hd:refresh-all-manuals "alle Handbücher aktualisieren")
- (plt:hd:manual-installed-date "(installiert ~a)")
- ; Help Desk configuration
- ;; refreshing manuals
-;; should not mention `SVN' (plt:hd:refresh-done "Aktualisierung der Handbücher aus SVN abgeschlossen")
- (plt:hd:refreshing-manuals "Handbücher aktualisieren")
- (plt:hd:refresh-downloading... "~a herunterladen...")
- (plt:hd:refresh-deleting... "Alte Version von ~a löschen...")
- (plt:hd:refresh-installing... "Neue Version von ~a installieren...")
- (plt:hd:refresh-clearing-indices "Gecachte Indizes löschen")
- (plt:hd:refreshing-manuals-finished "Fertig.")
- (plt:hd:about-help-desk "Über das Hilfezentrum")
- (plt:hd:help-desk-about-string
-  "Das Hilfezentrum ist die primäre Quelle für Information über die PLT-Software,insbesondere DrRacket, MzScheme und MrEd.\n\nVersion ~a\nCopyright (c) ~a-~a PLT")
- (plt:hd:help-on-help "Hilfe zur Hilfe")
- (plt:hd:help-on-help-details "Hilfe zum Hilfezentrum befindet sich auf der Homepage des Hilfezentrums unter `Help Desk'.   (Die Homepage des Hilfezentrums ist über den `Home'-Knopf zu erreichen.)")
-  (reload "Aktualisieren") ;; refresh the page in a web browser
-  (plt:hd:ask-about-separate-browser
-   "Sie haben einen Link selektiert, der ins Web zeigt. Wollen Sie die Seite im Hilfe-Browser oder im externen Browser anzeigen?")
-  (plt:hd:homebrew-browser "Hilfe-Browser") ;; choice for the above string (in a button)
-  (plt:hd:separate-browser "Externer Browser") ;; other choice for the above string (also in a button)
-  (plt:hd:external-link-in-help "Externe URLs im Hilfe-Browser")
-  (plt:hd:use-homebrew-browser "Den Hilfe-Browser für externe URLs benutzen")
-  (plt:hd:new-help-desk "Neues Hilfezentrum")
-
-  ;; in the Help Desk language dialog, title on the right.
-  (plt:hd:manual-search-ordering "Suchreihenfolge Handbuch")
-
-  (use-drscheme-font-size "DrRacket-Schriftgröße verwenden")
-
-  (help-desk-this-is-just-example-text
-   "Dies ist nur ein Beispieltext für das Setzen der Schriftgröße.  Öffnen sie das Hilfezentrum (im \"Hilfe\"-Menü), um diesen Links zu folgen.")
-
-  ;; this appears in the bottom part of the frame the first time the user hits `f1' 
-  ;; (assuming nothing else has loaded the documentation index first)
-  ;; see also: cs-status-loading-docs-index
-  (help-desk-loading-documentation-index "Hilfezentrum: Dokumentations-Index wird geladen")
-
- ;; Help desk htty proxy
- (http-proxy "HTTP-Proxy")
- (proxy-direct-connection "Direkte Verbindung")
- (proxy-use-proxy "Proxy benutzen:")
- (proxy-host "Name")
- (proxy-port "Port")
- (proxy-bad-host "Unzulässiger Proxy")
-
- ;; browser
- (rewind-in-browser-history "Zurück")
- (forward-in-browser-history "Vor")
- (home "Home")
- (browser "Browser")
- (external-browser-choice-title "Externer Browser")
- (browser-command-line-label "Kommandzeile:")
- (choose-browser "Browser auswählen")
- (no-browser "Später")
- (browser-cmdline-expl-line-1 "(Kommandozeile konstruiert durch Aneinanderhängen von Vor-Text, URL,")
- (browser-cmdline-expl-line-2 " und Nach-Text, ohne zusätzliche Leerzeichen dazwischen.")
- (install? "Installieren?")  ;; if a .plt file is found (title of dialog)
- (you-have-selected-an-installable-package "Sie haben eine installierbares Paket angewählt.")
- (do-you-want-to-install-it? "Wollen Sie es installieren?")
- (paren-file-size "(Die Datei hat ~a Bytes)")
- (download-and-install "Herunterladen && installieren") ;; button label
- (download "Herunterladen") ;; button label
- (save-downloaded-file/size "Datei (~a Bytes) speichern als") ;; label for get-file dialog
- (save-downloaded-file "Datei speichern als")  ;; label for get-file dialog
- (downloading "Herunterladen") ;; dialog title
- (downloading-file... "Datei herunterladen...")
- (package-was-installed "Das Paket wurde erfolgreich installiert.")
- (download-was-saved "Die Datei wurde erfolgreich gespeichert.")
-
- (install-plt-file-menu-item... ".plt-Datei installieren...")
- (install-plt-file-dialog-title ".plt-Datei installieren")
- (install-plt-web-tab "Web")
- (install-plt-file-tab "Datei")
- (install-plt-filename "Dateiname:")
- (install-plt-url "URL:")
- ; an error message from a primitive operation is appended to the end of this message.
- (install-plt-error-downloading "Beim Herunterladen der"
-                                " .plt-Datei ist ein Fehler aufgetreten.\n\nDetails:\n")
- (install-plt-error-header "Beim Überprüfen der heruntergeladenen .plt-Datei ist ein Fehler aufgetreten. Bitte überprüfen Sie die URL und versuchen Sie es noch einmal.")
-  
- (install-plt-file "~a installieren oder editieren?")
- (install-plt-file/yes "Installieren")
- (install-plt-file/no "Editieren")
- 
- (plt-installer-progress-window-title "Fortschritt Installation")
- (plt-installer-abort-installation "Installation abbrechen")
- (plt-installer-aborted "Abgebrochen.")
-  
- ;;; about box
- (about-drscheme-frame-title "Über DrRacket")
- 
- ;;; save file in particular format prompting.
- (save-as-plain-text "Diese Datei als Text speichern?")
- (save-in-drs-format "Diese Datei im DrRacket-Format (kein Text) speichern?")
- (yes "Ja")
- (no "Nein")
- 
- ;; saving image (right click on an image to see the text)
- (save-image "Bild abspeichern...")
-
- ;;; preferences
- (preferences "Einstellungen")
- (error-saving-preferences "Fehler beim Speichern der Einstellungen für ~a")
- (error-saving-preferences-title "Fehler beim Speichern der Einstellungen")
- (steal-the-lock-and-retry "Lock an uns reißen && nochmal versuchen") ;; in the preferences error dialog; this happens when the lockfile exists (after 3 pref writes). 
- (error-reading-preferences "Fehler beim Lesen der Einstellungen")
- (error-reading-preferences-explanation "Die Datei mit den Einstellungen ist gesperrt und deshalb kann die  ~a-Einstellung nicht gelesen werden") ;; ~a is filled with the name of the preference (a symbol)
- (dont-ask-again-until-drracket-restarted "Nicht noch einmal fragen (bis DrRacket neu gestartet wird)")
- ; difference between the above and below is one comes with a question (steal the lock or not) and the other with just a notation saying "the file is locked"
- (dont-notify-again-until-drracket-restarted "Nicht noch einmal benachrichtigen (bis DrRacket neu gestartet wird)") 
- (prefs-file-locked "Die Datei mit den Einstellungen ist gesperrt (weil die Datei ~a existiert), weshalb die Änderungen an den Einstellungen nicht gespeichert werden konnten. Änderung an den Einstellungen rückgängig machen?")
- (try-again "Nochmal versuchen") ;; button label
-
- (give-up-and-use-the-default "Aufgeben und Standardeinstellung verwenden") ;; button label
-  
- (prefs-file-still-locked "Die Datei mit den Einstellungen ist immer noch gesperrt (weil die Datei ~a existiert), weshalb die Änderungen an den Einstellungen nicht gespeichert werden konnten.")
- (prefs-file-locked-nothing-doing "Die Datei mit den Einstellungen ist gesperrt (durch ~s), so dass Änderungen an den Einstellungen nicht gespeichert werden können.") ;; the  ~s is filled with the lockfile; this string is (currently) used only on windows where lockfiles are less friendly (and there is no steal fallback)
- (scheme-prefs-panel-label "Racket")
- (warnings-prefs-panel-label "Warnmeldungen")
- (editor-prefs-panel-label "Editieren")
- (general-prefs-panel-label "Allgemein")
- (highlight-parens "Geklammerten Text hervorheben")
- (fixup-open-brackets "Öffnende eckige Klammern automatisch anpassen")
- (fixup-close-parens "Schließende Klammern automatisch anpassen")
- (flash-paren-match "Passende Klammer anblinken")
- (auto-save-files "Dateien automatisch abspeichern")
- (backup-files "Backup-Dateien")
- (map-delete-to-backspace "Entf löscht rückwärts")
- (verify-exit "Bei Verlassen nachfragen")
- (ask-before-changing-format "Vor Formatänderung beim Speichern nachfragen")
- (wrap-words-in-editor-buffers "Worte in Editor-Puffern umbrechen")
- (show-status-line "Status-Zeile anzeigen")
- (count-columns-from-one "Spaltennummern fangen mit 1 an")
- (display-line-numbers "Zeilennummern in Puffern anzeigen, keine Puffer-Indizes")
- (show-line-and-column-numbers "Zeilen- && Spaltennummern anzeigen") ; used for popup menu; right click on line/column box in bottom of drs window
- (show-character-offsets "Zeichen-Offsets anzeigen") ; used for popup menu; right click on line/column box in bottom of drs window
- (enable-keybindings-in-menus "Tastenbelegung für Menüs")
- (printing-mode "Druckmodus")
- (print-using-platform-specific-mode "Plattformspezifisches Drucken")
- (print-to-ps "Drucken in PostScript-Datei")
- (print-to-pdf "Drucken in PDF-Datei")
-
- (command-as-meta "Command-Taste als Meta behandeln") ;; macos/macos x only
- (alt-as-meta "Alt-Taste als Meta behandeln")
- (reuse-existing-frames "Existierende Fenster für neu geöffnete Dateien wiederverwenden")
- (default-fonts "Standard-Fonts")
- (basic-gray-paren-match-color "Farbe für Klammern-Hervorhebung \"Grau Standard\"") ; in prefs dialog
-
- (online-coloring-active "Syntax interaktiv einfärben")
- (open-files-in-tabs "Dateien in separaten Tabs öffnen (nicht separaten Fenstern)")
- (show-interactions-on-execute "Interaktionen beim Programmstart automatisch öffnen")
- (switch-to-module-language-automatically "Automatisch in die `module'-Sprache wechseln, wenn ein Modul geöffnet wird")
- (interactions-beside-definitions "Interaktionen neben den Definitionen anzeigen") ;; in preferences, below the checkbox one line above this one
- (show-line-numbers "Zeilennummern einblenden")
- (show-line-numbers/menu "Zeilen&nummern einblenden")
- (hide-line-numbers/menu "Zeilen&nummern ausblenden")
-
- (show-line-numbers-in-definitions "Alle Zeilennummern in Definitionen einblenden") ;; shows up in the popup menu item in the bottom of the drracket window; controls the line numbers on each line in the definitions; used in a checkable menu item
- (maximum-char-width-guide-pref-check-box "Richtschnur für maximale Zeichenbreite")
- (hide-column-width-guide "Richtschnur für Spaltenbreite für Dateien mit ~a Spalten einblenden")
- (show-column-width-guide "Richtschnur für Spaltenbreite für Dateien mit ~a Spalten ausblenden") ;; filled with a number > 2
- (limit-interactions-size "Umfang der Interaktionen einschränken")
- (background-color "Hintergrund")
- (default-text-color "Standard für Text") ;; used for configuring colors, but doesn't need the word "color"
- (choose-a-background-color "Hintergrundfarbe auswählen")
-
- (revert-to-defaults "Standardeinstellung wiederherstellen")
- (undo-changes "Änderungen rückgängig machen und schließen") ;; used in the preferences dialog to undo preference changes
-
- (color-schemes "Farbschemata") ;; the label in the preferences dialog for the color scheme panel
- (classic-color-scheme "Klassisch") ;; formerly called 'black on white'
- (modern-color-scheme "Modern")   ;; an attempt to be more color-blind friendly
- (white-on-black-color-scheme "Weiß auf Schwarz") ;; clicking the buttons changes the color schemes to some defaults that've been set up.
- ; drracket additions to the color scheme dialog; two buttons
- (design-your-own-color-schemes "Farbschemata selbst machen") ; pointer to (english-only) docs
- (style-and-color-names "Stil && Farbnamen")
-
- (add-spacing-between-lines "Ein Pixel Extra-Platz zwischen den Zeilen")
-
- ; title of the color choosing dialog
-
- ; should have entire alphabet
- (font-example-string "Zwölf Boxkämpfer jagen Victor quer über den großen Sylter Deich.") 
-
- (change-font-button-label "Ändern")
- (fonts "Schriften")
- (other... "Andere...") ;; used in the font choice menu item
-
- ; filled with type of font, eg modern, swiss, etc.
- (choose-a-new-font "Neuen Font für \"~a\" wählen")
-
- (font-size-slider-label "Größe")
- (restart-to-see-font-changes "Neu starten, damit die Schriftänderung wirksam wird")
-
- (font-prefs-panel-title "Schriftart")
- (font-name "Name Schriftart")
- (font-size "Größe Schriftart")
- (set-font "Schriftart setzen...")
- (font-smoothing-label  "Weiche Kanten bei Schrift")
- (font-smoothing-none "Nicht")
- (font-smoothing-some "Bißchen")
- (font-smoothing-all "Total")
- (font-smoothing-default "System-Einstellung verwenden")
- (select-font-name "Schriftart-Name auswählen")
- (example-text "Beispieltext:")
- (only-warn-once "Nur einmal warnen, wenn Definitionen und Interaktionen nicht synchron sind")
- 
- ; font size menu items in the 'view' menu; the ~a is filled with a number (font size)
- (increase-font-size "Schrift vergrößern (auf ~a)")
- (decrease-font-size "Schrift verkleinern (auf ~a)")
-
- ; warning message when lockfile is around
- (waiting-for-pref-lock "Auf Lock-Datei für Einstellungen warten...")
- (pref-lock-not-gone
-  "Die Lock-Datei für die Einstellungen:\n\n   ~a\n\nverhindert, dass die Einstellungen abgespeichert werden können. Bitte stellen Sie sicher, dass keine andere Racket-Software läuft und löschen Sie dann diese Datei.")
- (still-locked-exit-anyway? "Die Einstellungen wurden nicht korrekt gespeichert.  Trotzdem beenden?")
- 
- ;;; indenting preferences panel
- (indenting-prefs-panel-label "Einrücken")
- (indenting-prefs-extra-regexp "Zusätzlicher Regexp")
-
- (square-bracket-prefs-panel-label "eckige Klammern")
-
- ; filled with define, lambda, or begin
- (enter-new-keyword "Bitte ein Schlüsselwort wie ~a eingeben:")
- (x-keyword "~a-Schlüsselwort")
- (x-like-keywords "Schlüsselwort wie ~a")
-
- ; used in Square bracket panel
- (skip-subexpressions "Anzahl zu überspringender Unterausdrücke")
-
- (expected-a-symbol "Symbol erwartet, stattdessen bekommen: ~a")
- (already-used-keyword "\"~a\" ist bereits ein Schlüsselwort mit Spezial-Einrückung")
- (add-keyword "Hinzufügen")
- (remove-keyword "Entfernen")
-
- ;; repl color preferences
- (repl-colors "REPL")
- (repl-out-color "Ausgabe")
- (repl-value-color "Werte")
- (repl-error-color "Fehler")
- 
-  ;;; find/replace
- (search-next "Weiter")
- (search-previous "Zurück")
- (search-match "Fundort")  ;;; this one and the next one are singular/plural variants of each other
- (search-matches "Fundorte") 
- (search-replace "Ersetzen")
- (search-skip "Überspringen")
- (search-show-replace "Ersetzen einblenden")
- (search-hide-replace "Ersetzen ausblenden")
- (find-case-sensitive "Groß-/Kleinschreibung beachten")  ;; the check box in both the docked & undocked search
- (find-anchor-based "Suchen mit Ankern")
- 
- ;; these string constants used to be used by searching,
- ;; but aren't anymore. They are still used by other tools, tho.
- (hide "Ausblenden")
- (dock "Andocken")
- (undock "Ablegen")
- 
- ;;; multi-file-search
- (mfs-multi-file-search-menu-item "In Dateien suchen...")
- (mfs-string-match/graphics "per Text (auch in Dateien mit Grafik)")
- (mfs-regexp-match/no-graphics "per regulärem Ausdruck (nur reine Textdateien)")
- (mfs-searching... "Suche...")
- (mfs-configure-search "Einstellungen Suche") ;; dialog title
- (mfs-files-section "Dateien")   ;; section in config dialog
- (mfs-search-section "Suche") ;; section in config dialog
- (mfs-dir "Verzeichnis")
- (mfs-recur-over-subdirectories "In Unterverzeichnisse abtauchen")
- (mfs-regexp-filename-filter "Regulärer Ausdruck Dateinamen-Filter")
- (mfs-search-string "Zeichenkette suchen")
- (mfs-drscheme-multi-file-search "Suchen in mehreren Dateien - DrRacket") ;; results window and error message title
- (mfs-not-a-dir "\"~a\" ist kein Verzeichnis")
- (mfs-open-file "Datei öffnen")
- (mfs-stop-search "Suche stoppen")
- (mfs-case-sensitive-label "Groß-/Kleinschreibung beachten")
- (mfs-no-matches-found "Keine Treffer gefunden.")
- (mfs-search-interrupted "Suche abgebrochen.")
- (mfs-drscheme-multi-file-search-title "Suchen in mehreren Dateien nach \"~a\" - DrRacket") ;; the ~a format specifier is filled in with the search string
- 
- ;;; reverting a file
- (are-you-sure-revert
-  "Sind Sie sicher, dass Sie diese Datei wiederherstellen wollen? Diese Operation kann nicht rückgängig gemacht werden.")
- (are-you-sure-revert-title
-  "Wiederherstellen?")
- 
- ;;; saving a file
- ; ~a is filled with the filename
- (error-saving "Fehler beim Speichern") ;; title of error message dialog
- (error-saving-file/name "Fehler beim Speichern von ~a")
- (error-loading "Fehler beim Laden")
- (error-loading-file/name "Fehler beim Laden von ~a.")
- (unknown-filename "<< unbekannt >>")
-
- ;;; finder dialog
- (must-specify-a-filename "Sie müssen einen Dateinamen angeben")
- (file-does-not-exist "Die Datei \"~a\" existiert nicht.")
- (ask-because-file-exists "Die Datei \"~a\" existiert schon. Ersetzen?")
- (dne-or-cycle "Der Dateiname \"~a\" enthält ein nicht existentes Verzeichnis oder einen Zyklus.")
- (get-file "Datei lesen")
- (put-file "Datei schreiben")
- (full-pathname "Gesamter Dateiname")
- (show-dot-files "Dateien und Verzeichnisse anzeigen, die mit einem Punkt anfangen.")
- (up-directory-button-label "Verzeichnis nach oben")
- (add-button-label "Hinzufügen") ;;; for multi-file selection
- (add-all-button-label "Alle hinzufügen") ;;; for multi-file selection
- (remove-button-label "Entfernen") ;;; for multi-file selection
- (file-wrong-form "Der Dateiname hat nicht die richtige Form.")
- (select-files "Dateien auswählen")
- (select-file "Datei auswählen")
- (dir-dne "Das Verzeichnis existiert nicht.")
- (file-dne "Die Datei existiert nicht.")
- (empty-filename "Der Dateiname muss Buchstaben enthalten.")
- (that-is-dir-name "Dieser Name gehört zu einem Verzeichnis.")
- 
- ;;; raw menu names -- these must match the 
- ;;; versions below, once the &s have been stripped.
- ;;; if they don't, DrRacket's menus will appear
- ;;; in the wrong order.
- (file-menu "Datei")
- (edit-menu "Bearbeiten")
- (help-menu "Hilfe")
- (windows-menu "Fenster")
-
- (tabs-menu "Tabs")
- 
- ;;; menus
- ;;; - in menu labels, the & indicates a alt-key based shortcut.
- ;;; - sometimes, things are stuck in the middle of 
- ;;; menu item labels. For instance, in the case of
- ;;; the "Save As" menu, you might see: "Save Definitions As". 
- ;;; be careful of spacing, follow the English, if possible.
- ;;; - the ellipses in the `after' strings indicates that
- ;;; more information is required from the user before completing
- ;;; the command.
-
- (file-menu-label "&Datei")
-
- (new-info  "Neue Datei öffnen")
- (new-menu-item "&Neu")
- (new-...-menu-item "&Neu...")
-
- (open-info "Datei öffnen")
- (open-menu-item "&Öffnen...")
-
- (open-recent-info "Liste kürzlich bearbeiteter Dateien")
- (open-recent-menu-item "Noch einmal öffnen")
- 
- (revert-info "Stelle diese Datei wieder her wie zuletzt gespeichert")
- (revert-menu-item "&Wiederherstellen")
-
- (save-info "Diese Datei auf der Platte speichern")
- (save-menu-item "&Speichern")
-
- (save-as-info "Dateinamen abfragen und dann Datei abspeichern")
- (save-as-menu-item "Speichern &unter...")
-
- (page-setup-info "Ausdruck-Einstellungen ändern")
- (page-setup-menu-item "Ausdruck-Einstellungen...")
- 
- (print-info "Diese Datei zum Drucker schicken")
- (print-menu-item "&Drucken...")
-
- (close-info "Diese Datei schließen")
- (close-menu-item "&Schließen")
- (close-window-menu-item "Fenster &schließen")
-
- (quit-info "Alle Fenster schließen")
- (quit-menu-item-windows "Be&enden")
- (quit-menu-item-others "&Beenden")
- 
- (edit-menu-label "&Bearbeiten")
- 
- (undo-info "Letzte Aktion rückgängig machen")
- (undo-menu-item "&Rückgängig")
-
- (redo-info "Letzte Rückgängig-Operation rückgängig machen")
- (redo-menu-item "&Nochmal")
-
- (cut-info "Verschiebe die Selektion ins Clipboard, um sie später wieder einfügen zu können")
- (cut-menu-item "&Ausschneiden")
-
- (copy-info "Kopiere die Selektion ins Clipboard, um sie später wieder einfügen zu könne")
- (copy-menu-item "&Kopieren")
-
- (paste-info "Ersetze die aktuelle Selektion durch die zuletzt kopierte oder ausgeschnittene Selektion")
- (paste-menu-item "&Einfügen")
-
- (clear-info "Lösche die Selektion, ohne das Clipboard dabei zu ändern oder etwas einzufügen")
- (clear-menu-item-windows "&Löschen")
-
- (select-all-info "Gesamtes Dokument selektieren")
- (select-all-menu-item "&Alles selektieren")
- 
- (find-info "Zum nächsten Vorkommen der Zeichenkette aus dem Such-Fenster springen")
- (find-menu-item "Suchen")
- (find-from-selection-menu-item "Die Selektion suchen")
-
- (find-next-info "Zum nächsten Fundort der Zeichenkette im Suchfenster springen")
- (find-next-menu-item "Weitersuchen")
-
- (find-previous-info "Zum vorherigen Vorkommen der Zeichenkette aus dem Such-Fenster springen")
- (find-previous-menu-item "Rückwärts weitersuchen")
-
- (show-replace-menu-item "Ersetzen einblenden")
- (hide-replace-menu-item "Ersetzen ausblenden")
- (show/hide-replace-info "Wechselt die Sichtbarkeit des Ersetzen-Panels")
- 
- (replace-menu-item "Ersetzen")
- (replace-info " Suchtext im dunklen Kreis ersetzen")
-
- (replace-all-info "Alle Vorkommen der Such-Zeichenkette ersetzen")
- (replace-all-menu-item "Alle ersetzen")
- 
- (find-case-sensitive-info "Schaltet zwischen Groß-/Kleinschreibung berücksichtigendem und nicht berücksichtigendem Suchen um")
- (find-case-sensitive-menu-item "Suchen mit Groß-/Kleinschreibung")
-
- (complete-word "Wort vervollständigen") ; the complete word menu item in the edit menu
- (no-completions "... keine Vervollständigungen verfügbar") ; shows up in the completions menu when there are no completions (in italics)
-  
- (overwrite-mode "Überschreib-Modus")
- (enable-overwrite-mode-keybindings "Tastenbelegungen für Überschreib-Modus aktivieren")
-
- (enable-automatic-parens "Automatische Klammerung einschalten") ; should "and square brackets and quotes" appear here?
-
- (preferences-info "Die Einstellungen konfigurieren")
- (preferences-menu-item "Einstellungen...")
-
- (keybindings-info "Aktuelle Tastaturbelegung anzeigen")
- (keybindings-menu-item "Tastaturbelegung")
- (keybindings-show-active "Aktive Tastenbelegungen anzeigen")
- (keybindings-frame-title "Tastaturbelegung")
- (keybindings-sort-by-name "Nach Name sortieren")
- (keybindings-sort-by-key "Nach Taste sortieren")
- (keybindings-add-user-defined-keybindings "Benutzerdefinierte Tastenbelegungen hinzufügen...")
- (keybindings-add-user-defined-keybindings/planet "Benutzerdefinierte Tastenbelegungen aus PLaneT hinzufügen...")
- (keybindings-menu-remove "~a entfernen")
- (keybindings-choose-user-defined-file "Bitte eine Datei mit den Tastenbelegungen auswählen.")
-
- (user-defined-keybinding-error "Fehler beim Ausführen der Tastenbelegung ~a\n\n~a")
- (user-defined-keybinding-malformed-file "Die Datei ~a enthält kein Modul, das in der Sprache framework/keybinding-lang geschrieben ist.")  
- (user-defined-keybinding-malformed-file/found-lang "Die Datei ~a enthält kein Modul, das in der Sprache framework/keybinding-lang geschrieben ist.  Stattdessen wurde Sprache ~s vorgefunden.")  
- (keybindings-planet-malformed-spec "Die PLaneT-Spezifikation ist fehlerhaft: ~a") ; the string will be what the user typed in
- (keybindings-type-planet-spec "Bitte PLaneT-require-Spezifikation eingeben (ohne das `require')")
-  
- ; first ~a will be a string naming the file or planet package where the keybindings come from;
- ; second ~a will be an error message
- (keybindings-error-installing-file "Fehler beim Installieren der Tastenbelegungen ~a:\n\n~a")
-  
- ;; menu items in the "special" menu
- (insert-text-box-item "Text-Kasten einfügen")
- (insert-image-item "Bild einfügen...")
- (insert-comment-box-menu-item-label "Kommentarkasten einfügen")
- (insert-lambda "&Lambda einfügen")
-
- (wrap-text-item "Text umbrechen")
-
- ;; windows menu
- (windows-menu-label "&Fenster")
- (tabs-menu-label "&Tabs")
- (minimize "Minimieren") ;; minimize and zoom are only used under mac os x
- (zoom "Zoomen")
- (bring-frame-to-front "Fenster nach vorn")       ;;; title of dialog
- (bring-frame-to-front... "Fenster nach vorn...") ;;; corresponding title of menu item
- (most-recent-window "Letztes Fenster")
- (next-tab "Nächster Tab")
- (prev-tab "Vorheriger Tab")
- (move-current-tab-right "Tab nach &rechts bewegen")
- (move-current-tab-left "Tab nach &links bewegen")
- (tab-i "Tab ~a: ~a") ;; menu item in the windows menu under mac os x. first ~a is filled with a number between 1 and 9; second one is the filename of the tab
- (tab-i/no-name "Tab ~a")
-  
- (view-menu-label "&Anzeigen")
- (show-overview "&Programm-Umriss einblenden") 
- (hide-overview "&Programm-Umriss ausblenden")
- (show-module-browser "&Modul-Browser einblenden")
- (hide-module-browser "&Modul-Browser ausblenden")
-
- (help-menu-label "&Hilfe")
- (about-info "Mehr über dieses Programm und seine Entstehung")
- (about-menu-item "Über...")
- 
- ;; open here's new menu item
- (create-new-window-or-clear-current
-  "Würden Sie gern ein neues Fenster aufmachen oder dieses hier löschen und wiederverwenden?")
- (clear-current "Dieses löschen")
- (new-window "Neues Fenster")
-
- ;; popup menu when right-clicking in the gap between
- ;; the definitions and interactions window
- (change-to-vertical-alignment "Auf vertikal umschalten")
- (change-to-horizontal-alignment "Auf horizontal umschalten")
-
- ;;; exiting and quitting ``are you sure'' dialog
- ;;; exit is used on windows, quit on macos, in English. Other
- ;;; languages probably use the same word on both platforms.
- (exit "Beenden")
- (quit "Beenden")
- (are-you-sure-exit "Sind Sie sicher, dass Sie das Programm beenden wollen?")
- (are-you-sure-quit "Sind Sie sicher, dass Sie das Programm beenden wollen?")
- (dont-exit "Widerrufen")
- (dont-quit "Widerrufen")
- 
- ;;; autosaving
- (error-autosaving "Fehler beim automatischen Speichern von \"~a\".") ;; ~a will be a filename
- (autosaving-turned-off "Automatisches Speichern abgeschaltet\nbis die Datei wieder gespeichert wird.")
- (recover-autosave-files-frame-title "Automatisch gespeicherte Dateien zurückholen")
- (autosave-details "Details")
- (autosave-recover "Zurückholen")
- (autosave-unknown-filename "<<unbekannt>>")
-  
-  ;; these are labels in a dialog that drscheme displays
-  ;; if you have leftover autosave files. to see the dialog,
-  ;; start up drscheme and modify (but don't save) a file
-  ;; (also, do this with an unsaved file). Wait for the autosave
-  ;; files to appear (typically 5 minutes). Kill DrRacket
-  ;; and restart it. You'll see the dialog
-  (autosave-autosave-label: "Automatisch gespeicherte Datei:")
-  (autosave-original-label: "Ursprüngliche Datei:")
-  (autosave-autosave-label "Automatisch gespeicherte Datei")
-  (autosave-original-label "Ursprüngliche Datei")
-  (autosave-compare-files "Automatisch gespeicherte Dateien vergleichen")
-
-  (autosave-show-autosave "Automatisch gespeicherte Datei") ;; title of a window showing the autosave file
-
-  (autosave-explanation "DrRacket hat automatisch gespeicherte Dateien gefunden, die nicht regulär gespeicherten Inhalt enthalten könnten.")
-
-  (autosave-recovered! "Zurückgeholt!") ;; status of an autosave file
-  (autosave-deleted "Gelöscht")       ;; status of an autosave file
-
-  (autosave-error-deleting "Fehler beim Löschen von ~a\n\n~a") ;; first is a filename, second is an error message from mz.
-  (autosave-delete-button "Löschen")
-  (autosave-delete-title "Löschen")  ;; title of a dialog asking for deletion confirmation
-  (autosave-done "Fertig")
-  
-  ;; appears in the file dialog
-  (autosave-restore-to-where? "Bestimmen Sie, wo die automatisch gespeicherte Datei hin zurückgeholt werden soll")
-  
-  
- ;;; file modified warning
- (file-has-been-modified
-  "Die Datei wurde verändert, seit sie das letzte Mal gespeichert wurde. Änderungen überschreiben?")
- (overwrite-file-button-label "Überschreiben")
- 
- (definitions-modified 
-  "Die Definitionen wurden auf der Platte geändert; bitte speichern sie die Definitionen oder holen Sie diese von der Platte zurück.")
- (drscheme-internal-error "Interner Fehler in DrRacket")
- 
- ;;; tools
- (invalid-tool-spec "Die Tool-Spezifikation in der Datei info.rkt der Collection ~a enthält Fehler. Da sollte eine Zeichenkette oder eine Liste von Zeichenketten stehen, tatsächlich steht dort aber: ~e")
- (error-invoking-tool-title "Fehler beim Starten von Tool ~s;~s")
- (error-loading-tool-title "Fehler beim Laden von Tool ~s\n~a") ;; ~s filled with a path, ~a filled with an error message from an exn
- (tool-tool-names-same-length
-  "`tool-names' und `tools' in info.rkt für ~s müssen Listen der gleichen Länge sein, tatsächlich stehen dort ~e und ~e")
- (tool-tool-icons-same-length
-  "`tool-icons' und `tools' in info.rkt für ~s müssen Listen der gleichen Länge sein, tatsächlich stehen dort ~e und ~e")
- (tool-tool-urls-same-length
-  "`tool-urls' und `tools' in info.rkt für ~s müssen Listen der gleichen Länge sein, tatsächlich stehen dort ~e und ~e")
- (error-getting-info-tool
-  "Fehler beim Laden von info.rkt file für ~s")
- (tool-error-phase1 "Fehler in Phase 1 von Tool ~s; ~s")
- (tool-error-phase2 "Fehler in Phase 2 von Tool ~s; ~s")
-
-
- ;;; define popup menu
- (end-of-buffer-define "<< Text-Ende >>")
- (sort-by-name "Nach Namen Sortieren")
- (sort-by-position "Nach Position in der Datei sortieren")
- (no-definitions-found "<< keine Definitionen gefunden>>")
- (jump-to-defn "Zur Definition von ~a springen")
-
- (recent-items-sort-by-age "Nach Alter sortieren")
- (recent-items-sort-by-name "Nach Name sortieren")
- 
- ;;; view menu
- (hide-definitions-menu-item-label "&Definitionen ausblenden")
- (show-definitions-menu-item-label "&Definitionen einblenden")
- (definitions-menu-item-help-string "Definitionsfenster ein-/ausblenden")
- (show-interactions-menu-item-label "&Interaktionen einblenden")
- (hide-interactions-menu-item-label "&Interaktionen ausblenden")
- (use-horizontal-layout "Horizontal anordnen")
- (use-vertical-layout "Vertikal anordnen")
- (interactions-menu-item-help-string "Interaktionsfenster ein-/ausblenden")
- (toolbar "Toolbar")
- (toolbar-on-top "Toolbar oben")
- (toolbar-on-top-no-label "Toolbar oben mit kleinen Knöpfen")
- (toolbar-on-left "Toolbar links")
- (toolbar-on-right "Toolbar rechts")
- (toolbar-hidden "Toolbar ausblenden")
-
- ;;; file menu
- (save-definitions-as "Definitionen speichern unter...")
- (save-definitions "Definitionen speichern")
- (print-definitions "Definition drucken...")
- (about-drscheme "Über DrRacket")
- (save-other "Speichern unter")
- (save-definitions-as-text "Definitionen als Text speichern...")
- (save-interactions "Interaktionen speichern")
- (save-interactions-as "Interaktionen speichern unter...")
- (save-interactions-as-text "Interaktionen als Text speichern...")
- (print-interactions "Interaktionen drucken...")
- (new-tab "Neuer Tab")
- (close-tab "Tab schließen")
-
- (close-tab-amp "Tab &schließen") ;; like close-tab, but with an ampersand on the same letter as the one in close-menu-item
- 
- ;;; edit menu
- (split-menu-item-label "&Splitten")
- (collapse-menu-item-label "Einfalten")
- (find-longest-line "Längste Zeile finden")
- 
- ;;; language menu
- (language-menu-name "&Sprache")
- 
- ;;; scheme-menu
- (scheme-menu-name "Ra&cket")
- (execute-menu-item-label "Start")
- (execute-menu-item-help-string "Das Programm im Definitionsfenster neu starten")
-
- (ask-quit-menu-item-label "Programm bitten aufzuhören")
- (ask-quit-menu-item-help-string "Benutzt break-thread, um den primären Thread der Auswertung zu stoppen")
- (force-quit-menu-item-label "Programm zwingen aufzuhören")
- (force-quit-menu-item-help-string "Benutzt custodian-shutdown-all, um die Auswertung abzubrechen")
- (limit-memory-menu-item-label "Speicherverbrauch einschränken...")
- (limit-memory-msg-1 "Das Limit wird beim nächsten Programmstart aktiv")
- (limit-memory-msg-2 "und muss mindestens acht Megabyte betragen.") ;; minimum memory limit is now 8 megabytes
- (limit-memory-unlimited "nicht einschränken")
- (limit-memory-limited "einschränken")
- (limit-memory-megabytes "Megabytes")
-
- ; the next two constants are used together in the limit memory dialog; they are inserted
- ; one after another. The first one is shown in a bold font and the second is not.
- ; (the first can be the empty string)
- (limit-memory-warning-prefix "Warning: ")
- (limit-memory-warning "Die Einstellung für uneingeschränkten Speicherverbrauch ist unsicher. Mit dieser Einstellung kann DrRacket sich nicht gegen Programme schützen, die zuviel Speicher allozieren - DrRacket könnte abstürzen.")
- 
- (clear-error-highlight-menu-item-label "Fehlermarkierung entfernen")
- (clear-error-highlight-item-help-string "Entfernt die rosa Fehlermarkierung")
- (jump-to-next-error-highlight-menu-item-label "Zur nächsten Fehlermarkierung springen")
- (jump-to-prev-error-highlight-menu-item-label "Zur vorigen Fehlermarkierung springen")
- (reindent-menu-item-label "&Einrücken")
- (reindent-all-menu-item-label "&Alles einrücken")
- (semicolon-comment-out-menu-item-label "Mit &Semikolon auskommentieren")
- (box-comment-out-menu-item-label "Mit &Kommentar-Kasten auskommentieren")
- (uncomment-menu-item-label "Einkommentieren")
-
- (convert-to-semicolon-comment "In Semikolon-Kommentar umwandeln")
- 
- ;;; executables
- (create-executable-menu-item-label "Programmdatei generieren...")
- (create-executable-title "Programmdatei generieren")
- (drracket-creates-executables-only-in-some-languages
-  "DrRacket unterstützt die Erzeugung von Programmdateien nur,"
-  " wenn eine Lehrsprache (DMdA oder HtDP) im Dialog “Sprache auswählen”"
-  " ausgewählt ist, oder wenn dort “Die Sprache Racket” ausgewählt ist und"
-  " eine #lang-Zeile am Anfang des Programms steht.\n\nZiehen"
-  " Sie das Kommandozeilenprogramm \"raco exe\" in Betracht.")
- (must-save-before-executable "Sie müssen vor der Generierung einer Programmdatei speichern.")
- (save-a-mred-launcher "GRacket-Launcher speichern")
- (save-a-mzscheme-launcher "Racket-Launcher speichern")
- (save-a-mred-stand-alone-executable "GRacket-Stand-Alone-Programmdatei speichern")
- (save-a-mzscheme-stand-alone-executable "Racket-Stand-Alone-Programmdatei speichern")
- (save-a-mred-distribution "GRacket-Distribution speichern")
- (save-a-mzscheme-distribution "Racket-Distribution speichern")
-
- (error-creating-executable "Fehler beim Erzeugen der Stand-Alone-Programmdatei:") ;; this is suffixed with an error message ala error-display-handler
-
- (definitions-not-saved "Die Definitionen sind nicht gespeichert. Die Programmdatei wird von der letzten gespeicherten Version gezogen. Weitermachen?")
- (launcher "Launcher")
- (launcher-explanatory-label "Launcher (nur für diese Maschine, läuft vom Quelltext)")
- (stand-alone "Stand-alone")
- (stand-alone-explanatory-label "Stand-alone (nur für diese Maschine, startet compilierte Kopie)")
- (distribution "Distribution")
- (distribution-explanatory-label "Distribution (für die Installation auf anderen Maschinen)")
- (executable-type "Typ")
- (executable-base "Hauptteil")
- (filename "Dateiname: ")
- (create "Erzeugen")
- (files-for-icons-etc "Dateien für für Bildchen etc.")
- (please-specify-a-filename "Bitte einen Dateinamen angeben.")
- (~a-must-end-with-~a
-  "Der Dateiname auf \".~a\"\n\n  ~a\n\nist nicht zulässig. Der Dateiname muss auf \".~a\" enden.")
- (macosx-executables-must-end-with-app
-  "Der Dateiname auf \".~a\"\n\n  ~a\n\nist nicht zulässig. Unter Mac OS X muss der Dateiname auf \".app\" enden.")
- (warning-directory-will-be-replaced
-  "WARNUNG: Das Verzeichnis:\n\n  ~a\n\nsoll überschrieben werden. Weitermachen?")
- 
- (distribution-progress-window-title "Fortschritt bei der Erstellung der Distribution")
- (creating-executable-progress-status "Ausführbares Programm für Distribution erstellen...")
- (assembling-distribution-files-progress-status "Dateien für Distribution zusammenstellen...")
- (packing-distribution-progress-status "Distribution einpacken...")
-
- (create-servlet "Servlet erzeugen...")
-
- ; the ~a is a language such as "module" or "algol60"
- (create-servlet-unsupported-language
-  "Servlet lassen sich nicht aus einem Programm in der Sprache \"~a\" erzeugen.")
-  
- ;;; buttons
- (execute-button-label "Start") 
- (save-button-label "Speichern")
- (break-button-label "Stop")
- 
- ;;; search help desk popup menu
- (search-help-desk-for "Suche im Hilfezentrum nach \"~a\"")
- (exact-lucky-search-help-desk-for "Exakte Suche im Hilfezentrum auf gut Glück nach \"~a\"")
-
- ;; collapse and expand popup menu items
- (collapse-sexp "S-Expression einfalten")
- (expand-sexp "S-Expression wieder ausfalten")
- 
- ;;; fraction dialog
- (enter-fraction "Bruch eingeben")
- (whole-part "Ganzzahliger Anteil")
- (numerator "Zähler")
- (denominator "Nenner")
- (insert-number/bad-whole-part "Der ganzzahlige Anteil muss eine ganze Zahl sein")
- (insert-number/bad-numerator "Der Zähler einer Zahl muss eine nichtnegative ganze Zahl sein")
- (insert-number/bad-denominator "Der Nenner einer Zahl muss eine nichtnegative ganze Zahl sein")
-
- (insert-fraction-menu-item-label "Bruch einfügen...")
-
- ;; number snip popup menu
- (show-decimal-expansion "Als Dezimalexpansion anzeigen")
- (show-mixed-fraction-view "Als gemischten Bruch anzeigen")
- (show-improper-fraction-view "Als ungemischten Bruch anzeigenn")
- (show-more-decimal-places "Mehr Dezimalziffern anzeigen")
- 
- ;;; Teachpack messages
- (select-a-teachpack "Teachpack auswählen")
- (clear-teachpack "Teachpack ~a entfernen")
- (teachpack-error-label "DrRacket - Teachpack-Fehler")
- (teachpack-didnt-load "Die Teachpack-Datei ~a konnte nicht korrekt geladen werden.")
- (add-teachpack-menu-item-label "Teachpack hinzufügen...")
- (clear-all-teachpacks-menu-item-label "Alle Teachpacks entfernen")
- (drscheme-teachpack-message-title "DrRacket-Teachpack")
- (already-added-teachpack "Teachpack ~a ist schon dabei")
-
- ; ~a is filled with the teachpack's name; the message appears in the teachpack selection dialog when a user installs a new teachpack
- (compiling-teachpack "Teachpack ~a compilieren...")
- 
-  (teachpack-pre-installed "Vorinstallierte Teachpacks")
-  (teachpack-pre-installed/htdp "Vorinstallierte HtDP-Teachpacks")
-  (teachpack-pre-installed/2htdp "Vorinstallierte HtDP/2e-Teachpacks")
-  (teachpack-user-installed "selbst installierte Teachpacks")
-  (add-teachpack-to-list... "Teachpack zu Liste hinzufügen...")
-  ; first and second ~a are teachpack names, third is a symbol identifing an export
-  (teachpack-conflict
-   "WARNUNG: Das schon installierte Teachpack ~a ist im Konflikt mit ~a (beide haben den Export ~a)")
-   ;; a button label; the two ~a are filled with teachpack names
-  (remove-and-add-teachpack "~a entfernen und ~a hinzufügen")
-  (teachpack-already-installed "Ein Teachpack names '~a' ist schon installiert. Überschreiben?")
-  ; ~a is filled with a list of language names. Each name is separated by a newline and is indented two spaces (no commas, no 'and')
-  (teachpacks-only-in-languages "Die Teachpacks sind nur in diesen Sprachen verfügbar: ~a}\n\nIn anderen Sprachen ist `require' vorgesehen.")
-
- ;;; Language dialog
- (introduction-to-language-dialog
-  "Bitte eine Sprache auswählen. Für den Anfängerkurs ist wahrscheinlich die voreingestellte Sprache die richtige.")
- (language-dialog-title "Sprache auswählen")
- (case-sensitive-label "Groß-/Kleinschreibung unterscheiden")
- (output-style-label "Ausgabenotation")
- (constructor-printing-style "Konstruktor")
- (quasiquote-printing-style "Quasiquote")
- (write-printing-style "write")
- (print-printing-style "print")
- (sharing-printing-label "Zeige Sharing an")
- (use-pretty-printer-label "Zeilenumbrüche in Ausdruck einfügen")
- (input-syntax "Eingabesyntax")
- (dynamic-properties "Laufzeit")
- (output-syntax "Ausgabesyntax")
- (teachpacks "Teachpacks") ;; label in the language dialog for the teaching languages
- (teachpacks-none "<< keine >>") ;; shows up under the previous string, when there are no teachpacks
- (no-debugging-or-profiling "Kein Debugging oder Profiling")
- (debugging "Debugging")
- (debugging-and-profiling "Debugging und Profiling")
- (test-coverage "Syntaktische Test-Suiten-Abdeckung")
- (show-details-button-label "Details einblenden")
- (hide-details-button-label "Details ausblenden")
- (choose-language-menu-item-label "Sprache auswählen...")
- (revert-to-language-defaults "Standard-Spracheinstellungen wiederherstellen")
- (fraction-style "Bruch-Ausgabe")
- (use-mixed-fractions "gemischte Brüche")
- (use-repeating-decimals "Dezimalausgabe mit Perioden")
- (decimal-notation-for-rationals "Dezimalnotation für Brüche")
- (enforce-primitives-group-box-label "Initiale Bindungen")
- (enforce-primitives-check-box-label "Änderungen von initialen Bindungen verbieten")
-
- (automatically-compile "\"compiled\"-Verzeichnisse bestücken (für schnelleres laden)")
- (preserve-stacktrace-information "Stack-Trace behalten (einige Optimierungen werden abgeschaltet)")
- (enforce-module-constants-checkbox-label "Konstantendefinitionen durchsetzen (sorgt für etwas Inlining)")
- (expression-level-stacktrace "Stack-Trace mit Ausdrücken")
- (function-level-stacktrace "Stack-Trace mit Funktionen")
- (submodules-to-run "Submodule zum Ausführen")
- (add-submodule "Submodul-Option hinzufügen ...") ;; menu item
- (add-submodule-title "Submodul hinzufügen") ;; title of dialog opened by above menu item
-
- ;; used in the bottom left of the drscheme frame as the label
- ;; above the programming language's name
- ;; used the popup menu from the just above; greyed out and only
- ;; visible when some languages are in the history
- (recent-languages "Kürzlich verwendete Sprachen:")
- ;; shows up in bottom-left programming language menu popup, when no langs are recorded
- (no-recently-chosen-languages "keine kürzlich verwendete Sprache") 
-
- ;; startup wizard screen language selection section
- (please-select-a-language "Sprache auswählen")
- 
- ;;; languages
- (beginning-student "Anfänger")
- (beginning-one-line-summary "define, cond, Strukturen, Konstanten und Primitiva")
- (beginning-student/abbrev "Anfänger mit Listen-Abkürzungen")
- (beginning/abbrev-one-line-summary "Anfänger, wobei Listen mit \"list\" in der REPL ausgedruckt werden")
- (intermediate-student "Zwischenstufe")
- (intermediate-one-line-summary "Anfänger plus lexikalische Bindung")
- (intermediate-student/lambda "Zwischenstufe mit lambda")
- (intermediate/lambda-one-line-summary "Zwischenstufe plus Prozeduren höherer Ordnung")
- (advanced-student "Fortgeschritten")
- (advanced-one-line-summary "Zwischenstufe plus lambda und Mutation")
- (how-to-design-programs "How to Design Programs") ;; should agree with MIT Press on this one...
- (pretty-big-scheme "Kombo")
- (pretty-big-scheme-one-line-summary "Macht Syntax and Prozeduren der HtDP-Sprachen verfügbar")
- (r5rs-language-name "R5RS")
- (r5rs-one-line-summary "R5RS, ohne alles andere")
- (expander "Expander")
- (expander-one-line-summary "Expandiert Ausdrücke, statt sie auszuwerten")
- (legacy-languages "Altlast-Sprachen")
- (teaching-languages "Lehrsprachen")
- (experimental-languages "Experimentelle Sprachen")
- (initial-language-category "Sprache am Anfang")
- (no-language-chosen "Keine Sprache ausgewählt")
-
- (other-languages "Andere Sprachen")
-
- (module-language-name "Sprache aus Quelltext ermitteln")
- (module-language-one-line-summary "Die #lang-Zeile spezifiziert die tatsächliche Sprache.")
-  
- (module-language-auto-text "Automatisch Zeile mit #lang") ;; shows up in the details section of the module language
-
- ;; for the upper portion of the language dialog
- (the-racket-language "Die Sprache Racket")
- (choose-a-language "Sprache auswählen")
-
- ;; the next two string constants appear in the
- ;; language dialog with a list
- ;; of example languages appearing between them
- (racket-language-discussion "Am Anfang des Programms spezifiziert #lang den gewünschten Dialekt. Zum Beispiel:\n\n")
- (racket-language-discussion-end "\n... und viele weitere")
-
- ;; the next three string constants are put into a message-box dialog
- ;; that appears when the user clicks on the example #lang languages
- ;; in the language dialog. The first one always appears and then either
- ;; the second or the third appears. The second one has the clicked
- ;; on #lang line placed into the ~a, and third one has the 
- ;; current #lang line in the first ~a and the clicked on in the second one.
- ;; The two comments are separated by a blank line.
- (racket-dialect-in-buffer-message "Racket-Dialekte werden normalerweise im Editor ausgewählt, nicht durch Auswahl eines Eintrags im Sprachendialog.")
- (racket-dialect-add-new-#lang-line "Soll ich also “~a” am Anfang der Definitionen einfügen?")
- (racket-dialect-replace-#lang-line "Ich sehe auch ein “~a” im Code; durch “~a” ersetzen?")
- (racket-dialect-already-same-#lang-line "Es ist allerdings schon “~a” im Code; es ist also alles bereit fürs Programmieren!")
-
- ;; in the dialog containing the above strings, one of these is a button that appears
- (add-#lang-line "#lang-Zeile hinzufügen")
- (replace-#lang-line "#lang-Zeile ersetzen")
-
- ;; for the 'new drracket user' dialog
- (use-language-in-source "Sprache, die im Code spezifiziert ist, benutzen")
-
-  ;;; from the `not a language language' used initially in drscheme.
- (must-choose-language "DrRacket kann keine Programme verarbeiten, bis Sie eine Sprache auswählen.")
- 
- ;; next two appear before and after the name of a text book (which will be in italics)
- (using-a-textbook-before "Benutzen Sie ")
- (using-a-textbook-after "?")
- 
- ;; next two are before and after a language
- (start-with-before "Mit ")
-
- (start-with-after "anfangen?")
-
- (seasoned-plt-schemer? "Erfahrener PLT-Schemer?")
- (racketeer? "Sind Sie ein Racketeer?")
- (looking-for-standard-scheme? "Wollen Sie Standard-Scheme?")
- 
- ;; the three string constants are concatenated together and the middle
- ;; one is hyperlinked to the dialog that suggests various languages
- (get-guidance-before "Wählen Sie \"Sprache auswählen...\" im \"Sprache\"-Menü oder ")
- (get-guidance-during "Hilfe anfordern")
- (get-guidance-after ".")
-
- ;;; debug language
- (unknown-debug-frame "[unbekannt]")
- (backtrace-window-title "Backtrace - DrRacket")
- (files-interactions "Interaktionen von ~a") ;; filled with a filename
- (current-interactions "Interaktionen")
- (current-definitions "Definitionen")
- (mzscheme-w/debug "Text (MzScheme, mit R5RS)")
- (mzscheme-one-line-summary "Die PLT-Version von Scheme")
- (mred-w/debug "Grafisch (MrEd, mit MzScheme)")
- (mred-one-line-summary "MzScheme + GUI-Bibliothek")
-
- ;; profiling
- (profiling-low-color "Wenig")
- (profiling-high-color "Viel")
- (profiling-choose-low-color "Bitte Farbe für \"wenig\" auswählen")
- (profiling-choose-high-color "Bitte Farbe für \"viel\" auswählen")
- (profiling "Profiling")
- (profiling-example-text "(define (whee) (whee))")
- (profiling-color-config "Farbbereich für Profiling") 
- (profiling-scale "Farbskala für Profiling")
- (profiling-sqrt "Wurzel")
- (profiling-linear "Linear")
- (profiling-square "Quadrat")
- (profiling-number "Aufrufanzahl")
- (profiling-time "Gesamtzeit")
- (profiling-update "Profile aktualisieren")
- (profiling-col-percent-time "% Zeit")
- (profiling-col-function "Prozedur")
- (profiling-col-time-in-msec "ms")
- (profiling-col-calls "Aufrufe")
- (profiling-show-profile "Profile einblenden")
- (profiling-hide-profile "Profile ausblenden")
- (profiling-unknown-src "<< unbekannt >>")
- (profiling-no-information-available "Es ist keine Profiling-Information verfügbar. Bitte stellen Sie sicher, dass Profiling eingeschaltet und Ihr Programm gelaufen ist.")
- (profiling-clear? "Änderungen im Definitionsfenster machen die Profiling-Informationen ungültig. Weitermachen?")
- 
- ;; test coverage
- (test-coverage-clear? "Änderungen im Definitionsfenster machen die Information über Testabdeckung ungültig. Weitermachen?")
- (test-coverage-clear-and-do-not-ask-again "Ja, und nicht nicht wieder fragen")
- (test-coverage-ask? "Frage nach dem Löschen der Testabdeckungs-Information")
- (test-coverage-on "Durch Tests abgedeckt")
- (test-coverage-off "Durch Tests nicht abgedeckt")
-  
- ;; tracing
- (tracing-enable-tracing "Tracing einschalten")
- (tracing-show-tracing-window "Tracing einblenden")
- (tracing-hide-tracing-window "Tracing ausblenden")
- (tracing-tracing-nothing-to-show "Es liegen keine Tracing-Resultate vor. Stellen Sie sicher, dass die eingestellte Sprache Tracing unterstützt und dass Tracing eingeschaltet ist.")
-
- ;;; repl stuff
- (evaluation-terminated "Auswertung abgebrochen")
- (evaluation-terminated-explanation
-  "Der Auswertungs-Thread läuft nicht mehr; es findet also keine Auswertung bis zum nächsten Programmlauf statt.")
-
-  ; The next three constants show up in the same dialog as the above evaluation-terminated string
-  ; constants.
-  ; The first two show up only when the user calls 'exit' (possibly with a status code).
-  ; The third shows up when the program runs out of memory.
-  (exited-successfully "Erfolgreich beendet.")
-  (exited-with-error-code "Beendet mit Fehlercode ~a.") ;; ~a is filled in with a number between 1 and 255
-  (program-ran-out-of-memory "Dem Programm ist der Speicher ausgegangen.")
-  
-  (show-evaluation-terminated-dialog "Den Dialog ‘Auswertung abgebrochen’ zeigen")
-  (evaluation-terminated-ask "Diesen Dialog das nächste Mal anzeigen")
-  
-  (last-stack-frame "letzten Stack-Frame anzeigen")
-  (last-stack-frames "die letzten ~a Stack-Frames anzeigen")
-  (next-stack-frames "die nächsten ~a Stack-Frames anzeigen")
- 
- ;;; welcoming message in repl
- (language "Sprache")
- (custom "angepasst")
- (teachpack "Teachpack")
- (welcome-to "Willkommen bei")
- (version "Version")
- 
- ;;; kill evaluation dialog
- (kill-evaluation? "Auswertung abbrechen?")
- (just-break "Nur unterbrechen")
- (kill "Abbrechen")
- (kill? "Abbrechen?")
-
- ;;; version checker
- (version:update-menu-item "Nach Updates schauen...")
- (version:update-check "Update-Prüfung")
- (version:connecting-server  "Mit Racket-Versions-Server verbinden")
- (version:results-title      "Racket-Versions-Check")
- (version:do-periodic-checks "Regelmäßig nach neueren Racket-Versionen schauen")
- (version:take-me-there      "Dorthin gehen") ; ...to the download website
- ;; the next one can appear alone, or followed by a comma and the one after that
- (version:plt-up-to-date     "Die Racket-Version ist aktuell")
- (version:but-newer-alpha    "aber es gibt eine neuere Alpha-Version")
- ;; This is used in this context: "Racket vNNN <<<*>>> http://download..."
- (version:now-available-at   "ist jetzt verfügbar bei")
-
- ;; insert menu
- (insert-menu "E&infügen")
- 
- ;; large semi colon letters
- (insert-large-letters... "Große Buchstaben einfügen...")
- (large-semicolon-letters "Große Buchstaben aus Semikolons")
- (text-to-insert "Einzufügender Text")
-
- (module-browser-filename-format "Vollständiger Dateiname: ~a (~a Zeilen)")
- (module-browser-root-filename "Basis-Dateiname: ~a")
- (module-browser-font-size-gauge-label "Schriftgröße")
- (module-browser-progress-label "Fortschritt Modul-Browser")
- (module-browser-adding-file "Datei ~a hinzufügen...")
- (module-browser-laying-out-graph-label "Graph-Layout")
- (module-browser-open-file-format "~a öffnen")
- (module-browser "Modul-Browser") ;; frame title
- (module-browser... "&Modul-Browser...") ;; menu item title
- (module-browser-in-file "M&odul-Browser auf ~a") ;; menu item title; ~a is filled with a filename
- (module-browser-no-file "Modul-Browser auf dieser gespeicherten Datei") ;; menu item title for above menu item; used when there is no saved file
- (module-browser-error-expanding "Fehler beim Expandieren des Programms:\n\n~a")
- (module-browser-show-lib-paths "Dateien anzeigen, die über (lib ..)-Pfade eingebunden wurden")
- (module-browser-progress "Modul-Browser: ~a") ;; prefix in the status line
- (module-browser-compiling-defns "Modul-Browser: Definition compilieren")
- (module-browser-show-lib-paths/short "\"lib\"-requires folgen") ;; check box label in show module browser pane in drscheme window.
- (module-browser-show-planet-paths/short "\"PLaneT\"-requires folgen") ;; check box label in show module browser pane in drscheme window.
- (module-browser-refresh "Aktualisieren") ;; button label in show module browser pane in drscheme window.
- (module-browser-highlight "Hervorheben") ;; used to search in the graph; the label on a text-field% object
- (module-browser-only-in-plt-and-module-langs
-  "Der Modul-Browser ist nur für modulbasierte Programme verfügbar.")
- (module-browser-name-length "Länge der Namen")
- (module-browser-name-short "Kurz")
- (module-browser-name-medium "Mittel")
- (module-browser-name-long "Lang")
- (module-browser-name-very-long "Lang mit Phasen")  ;; like 'Long' but shows the phases where this file is loaded
- (module-browser-open-all "Alle hier angezeigten Datein öffnen")
-
- (happy-birthday-matthias "Happy Birthday, Matthias!")
- (happy-birthday-matthew "Happy Birthday, Matthew!")
- (happy-birthday-shriram "Happy Birthday, Shriram!")
-
- (mrflow-using-default-language-title "Standard-Sprache verwendet")
- (mrflow-using-default-language "Die momentan verwendete Sprache hat keine Typ-Tabelle für ihre Primitiva.  Verwende stattdessen R5RS-Scheme.")
- (mrflow-button-title "Analyse")
- ;(mrflow-unknown-style-delta-error-title "Unknown Box Style Delta")
- ;(mrflow-unknown-style-delta-error "Unknown box style delta: ~a")
- (mrflow-popup-menu-show-type "Typ einblenden")
- (mrflow-popup-menu-hide-type "Typ ausblenden")
- (mrflow-popup-menu-show-errors "Fehler einblenden")
- (mrflow-popup-menu-hide-errors "Fehler ausblenden")
- ;(mrflow-read-exception-title "Read Exception")
- ;(mrflow-read-exception "Read exception: ~a")
- ;(mrflow-syntax-exception-title "Syntax Exception")
- ;(mrflow-syntax-exception "Syntax exception: ~a")
- ;(mrflow-unknown-exception-title "Unknown Exception")
- ;(mrflow-unknown-exception "Unknown exception: ~a")
- ;(mrflow-language-primitives-error-title "Language Primitives Error")
- ;(mrflow-language-primitives-error "Wrong filename for language primitives types table: ~a")
-  
- (snips-and-arrows-popup-menu-tack-all-arrows "Alle Pfeile befestigen")
- (snips-and-arrows-popup-menu-untack-all-arrows "Alle Pfeile lösen")
- (snips-and-arrows-user-action-disallowed-title "Änderungen durch den Benutzer momentan nicht möglich")
- (snips-and-arrows-user-action-disallowed "In Editoren, die von Tools erzeugte Snips enthalten, sind Änderungen durch den Benutzer nicht möglich. Blenden Sie alle Snips aus, bevor Sie den Inhalt des Editors ändern.")
- ;(snips-and-arrows-changing-terms-warning-title "Changing terms will be undoable")
- ;(snips-and-arrows-changing-terms-warning "Changing terms in an editor containing snips cannot be undone.  You can either cancel this action, remove the snips, and try the change again, or you can continue with the change, in which case the change will not be undoable (all others changes made before and afterward will still be undoable though).")
- (snips-and-arrows-hide-all-snips-in-editor "Alle Snips im Editor ausblenden")
-
- (xml-tool-insert-xml-box "XML-Kasten einfügen")
- (xml-tool-insert-scheme-box "Racket-Kasten einfügen")
- (xml-tool-insert-scheme-splice-box "Racket-Spleiß-Kasten einfügen")
- (xml-tool-xml-box "XML-Kasten")
- (xml-tool-scheme-box "Racket-Kasten")
- (xml-tool-scheme-splice-box "Racket-Spleiß-Kasten")
- (xml-tool-switch-to-scheme "In Racket-Kasten verwandeln")
- (xml-tool-switch-to-scheme-splice "In Racket-Spleiß-Kasten verwandeln")
- (xml-tool-eliminate-whitespace-in-empty-tags
-  "Überflüssigen Whitespace in leeren Tags entfernen")
- (xml-tool-leave-whitespace-alone
-  "Whitespace unverändert lassen")
- 
- (show-recent-items-window-menu-item "Kürzlich geöffnete Dateien in separatem Fenster anzeigen")
- (show-recent-items-window-label "Kürzlich geöffnete Dateien")
- (number-of-open-recent-items "Anzahl kürzlich geöffneter Dateien")
- (switch-anyway "Datei trotzdem wechseln")
-
- (stepper-program-has-changed "WARNUNG: Das Programm wurde geändert.")
- (stepper-program-window-closed "WARNUNG: Das Programm-Fenster ist nicht mehr da.")
-
- (stepper-name "Stepper")
- (stepper-language-level-message
-  "Der Stepper unterstützt die Sprachebene \"~a\" nicht.")
- (stepper-button-label "Stepper")
-
- (stepper-previous "Schritt")
- (stepper-next "Schritt")
- (stepper-jump "Springen...")
- (stepper-jump-to-beginning "an den Anfang")
- (stepper-jump-to-end "ans Ende")
- (stepper-jump-to-selected "an den Anfang der Selektion")
- (stepper-jump-to-previous-application "zur vorigen Applikation")
- (stepper-jump-to-next-application "zur nächsten Applikation")
- (stepper-out-of-steps "Ende der Auswertung erreicht, bevor ein angemessener Schritt gefunden werden konnte.")
- (stepper-no-such-step/title "Kein Schritt gefunden.")
- (stepper-no-such-step "Kein Schritt gefunden, der das Kriterium erfüllt.")
- (stepper-no-such-step/earlier "Kein früherer Schritt gefunden, der das Kriterium erfüllt.")
- 
- (stepper-no-earlier-application-step "Keine vorherigen Applikationsschritte.")
- (stepper-no-later-application-step "Keine weiteren Applikationsschritte..")
- (stepper-complete "Alle Definitionen wurden erfolgreich ausgewertet.")
- 
- (stepper-no-earlier-step "Keine vorherigen Schritte.")
- (stepper-no-later-step "Keine weiteren Schritte.")
-  
- (stepper-no-selected-step "Keine Schritte im markierten Bereich. Vielleicht ist es auskommentiert?")
-  
- (stepper-no-last-step "Der letzte Schritt ist nocht nicht verfügbar.")
-
- (debug-tool-button-name "Debugger")
-
- (dialog-back "Zurück")
-
- ;; warnings about closing a drscheme frame when the program
- ;; might still be doing something interesting
- (program-is-still-running "Das Programm im Definitionsfenster läuft noch.  Trotzdem schließen?")
-  (program-has-open-windows "Das Programm im Definitionsfenster hat noch offene Fenster.  Trotzdem dieses Fenster schließen?")
- 
-  ;; ml-command-line-arguments is for the command line arguments
-  ;; label in the module language details in the language dialog.
-  (ml-command-line-arguments "Kommandozeilen-Argumente als Vektoren von Zeichenketten, in Read-Syntax")
-
-  ;; ml-cp names are all for the module language collection path
-  ;; configuration. See the details portion of the language dialog
-  ;; for the module language (at the bottom).
-  (ml-cp-default-collection-path "<<Standard-Pfade für Collections>>")
-
-  ;; in std get-directory 
-  (ml-cp-choose-a-collection-path "Bitte Pfad für Collection auswählen")
-
-  ;; err msg when adding default twice
-  (ml-cp-default-already-present
-   "Standard-Pfade für Collections schon vorhanden")
-  
-  ;; title of this section of the dialog (possibly the word
-  ;; `Collection' should not be translated)
-  (ml-cp-collection-paths "Pfade für Collections")
-
-  ;; button labels
-  ;;  The package manager uses these, too
-  (ml-cp-add "Hinzufügen")
-  (ml-cp-add-default "Standard hinzufügen")
-  (ml-cp-remove "Entfernen")
-  (ml-cp-raise "Höher")
-  (ml-cp-lower "Tiefer")
-
-  (ml-always-show-#lang-line "#lang-Zeile in der `module'-Sprache immer anzeigen")
-
-  ;; Profj
-  (profj-java "Java")
-  (profj-java-mode "Java-Modus")
-
-  (profj-java-coverage "Java-Abdeckung") ;; shows up in the preferences dialog under 'Color'
-
-  (profj-beginner-lang "Anfänger")
-  (profj-beginner-lang-one-line-summary "Java-ähnliche Lehrsprache für Anfänger")
-  (profj-full-lang "Voller Sprachumfang")
-  (profj-full-lang-one-line-summary "Wie Java 1.0 (einige 1.1-Erweiterungen)")
-  (profj-advanced-lang "Fortgeschritten")
-  (profj-advanced-lang-one-line-summary "Java-ähnliche Lehrsprache für Fortgeschrittene")
-  (profj-intermediate-lang "Zwischenstufe")
-  (profj-intermediate-lang-one-line-summary "Java-ähnliche Lehrsprache, Zwischenstufe")
-  (profj-intermediate-access-lang "Zwischenstufe + Zugriffskontrolle")
-  (profj-intermediate-access-lang-one-line-summary "Java-ähnliche Lehrsprache, Zwischenstufe, mit Zugriffskontrolle")
-  (profj-dynamic-lang "Java+dynamic")
-  (profj-dynamic-lang-one-summary "Java mit dynamischen Typen")
-
-  (profj-java-mode-color-heading "Farben ändern") ; Heading for preference to choose editing colors  
-  (profj-java-mode-color-keyword "Schlüsselwort")
-  (profj-java-mode-color-string "Zeichenkette")
-  (profj-java-mode-color-literal "Literal")
-  (profj-java-mode-color-comment "Kommentar")
-  (profj-java-mode-color-error "Fehler")
-  (profj-java-mode-color-identifier "Bezeichner")
-  (profj-java-mode-color-prim-type "primitiver Typ") ; Example text for built-in Java types
-  (profj-java-mode-color-default "sonstiges")
-  
-  (profj-coverage-color-heading "Farben für Abdeckung") ; Heading for preference to choose coverage colors
-  (profj-coverage-color-covered "abgedeckte Ausdrücke") 
-
-  (profj-language-config-display-preferences "Einstellungen Anzeige") ; Heading for preferences controlling printing
-  (profj-language-config-display-style "Art der Anzeige")
-  (profj-language-config-display-field "Klasse + Felder")
-  (profj-language-config-class "Klasse")
-  (profj-language-config-display-array "Gesamten Inhalt von Arrays ausdrucken?")
-  (profj-language-config-testing-preferences "Einstellungen Testen") ; Heading for preferences controlling test behavior
-  ;(profj-language-config-testing-enable "Testresultate bei Start anzeigen?") ; Run should be the word found on the Run button
-  (profj-language-config-testing-coverage "Abdeckungsinformationen für Tests sammeln?")
-  (profj-language-config-support-test-language "Spracherweiterung \"test\" unterstützen?")
-  (profj-language-config-testing-check "Check-Ausdruck zulassen?") ; check should not be translated
-  (profj-language-config-classpath "Klassenpfad")
-  (profj-language-config-choose-classpath-directory "Verzeichnis für den Klassenpfad auswählren")
-  (profj-language-config-classpath-display "Aktuellen Wert anzeigen") ; Button label to print the current classpath
-
-  (profj-test-name-close-to-example "Der Name von Klasse ~a enhält etwas, das so ähnlich wie \"Example\" aussieht.")
-  (profj-test-name-example-miscapitalized "Das \"example\" im Namen der Klasse ~a sollte \"Example\" geschrieben werden.")
-
-   ;; Close testing window and do not run test cases any more
-  ;(profj-test-results-close-and-disable "Schließen und Testen deaktivieren")
-  ;; Hide docked testing window and do not run test cases any more
-  ;(profj-test-results-hide-and-disable "Ausblenden und Testen deaktivieren")
-  ;Renamed below
-  ;(profj-test-results-window-title "Testresultate")
-
-  (profj-unsupported "Nicht unterstützt")
-  (profj-executables-unsupported "Programmdateien sind für Java bisher noch nicht unterstützt")
-
-  (profj-convert-to-text-comment "Hier Textkommentar einfügen")
-  (profj-convert-to-comment "Hier Kommentar einfügen")
-
-  (profj-executing-main "main ausführen")
-
-  (profj-insert-java-comment-box "Java-Kommentarkasten einfügen")
-  (profj-insert-java-interactions-box "Java-Interaktions-Kasten einfügen")
-  
-  ;;The test engine tool
-  ;;
-  (test-engine-window-title "Testresultate")
-  ;;Following two appear in View menu, attach and free test report window from DrRacket frame
-  (test-engine-dock-report "Testresultate andocken")
- (test-engine-undock-report "Testresultate abdocken")
-  ;;Following two appear in Racket (Java, etc) menu, cause Tests to be Run automatically or not
-  (test-engine-enable-tests "Test aktivieren")
-  (test-engine-disable-tests "Tests deaktivieren")
-  
-  (test-engine-ran-1-test "1 Test gelaufen.")
-  (test-engine-ran-1-check "1 Check gelaufen.")
-  ;; ditto, only plural
-  (test-engine-ran-n-tests "~a Tests gelaufen.")
-  (test-engine-ran-n-checks "~a Checks gelaufen.")
-  (test-engine-1-test-passed "Der eine Test ist bestanden!")
-  (test-engine-1-check-passed "Der eine Check ist bestanden!")
-  (test-engine-both-tests-passed "Beide Tests bestanden!")
-  (test-engine-both-checks-passed "Beide Checks bestanden!")
-  (test-engine-all-tests-passed "Alle Tests bestanden!")
-  (test-engine-all-checks-passed "Alle Checks bestanden!")
-  (test-engine-all-n-tests-passed "Alle ~a Tests bestanden!")
-  (test-engine-all-n-checks-passed "Alle ~a Checks bestanden!")
-  (test-engine-0-tests-passed "0 Tests bestanden.")
-  (test-engine-0-checks-passed "0 Checks bestanden.")
-  (test-engine-m-of-n-tests-failed "~a der ~a Tests fehlgeschlagen.")
-  (test-engine-m-of-n-checks-failed "~a der ~a Checks fehlgeschlagen.")
-  (test-engine-must-be-tested "Dieses Programm muss noch getestet werden!")
-  (test-engine-is-unchecked "Dieses Programm hat keine Checks!")
-  (test-engine-tests-disabled "Tests deaktiviert.")
-  (test-engine-both-tests-passed "Beide Tests waren erfolgreich.")
-  ; ~a is replaced by count
-  (test-engine-all-tests-passed "Alle ~a Tests waren erfolgreich!")
-  (test-engine-should-be-tested "Dieses Programm sollte getestet werden.")
-  (test-engine-at-line-column "in Zeile ~a, Spalte ~a")
-  (test-engine-in-at-line-column "in ~a, Zeile ~a, Spalte ~a")
-  ; as in "column (unknown)"
-  (test-engine-unknown "(unbekannt)")
-  (test-engine-trace-error "Trace-Fehler")
-
-  (test-engine-check-encountered-error
-   "check-expect bekam den folgenden Fehler statt des erwarteten Werts, ~F. ~n   :: ~a")
-  (test-engine-actual-value-differs-error
-   "Der tatsächliche Wert ~F ist nicht der erwartete Wert ~F.")
-  (test-engine-actual-value-not-within-error
-   "Der tatsächliche Wert ~F ist nicht innerhalb von ~v des erwarteten Werts ~F.")
-  (test-engine-encountered-error-error
-   "check-error bekam den folgenden Fehler anstatt des erwarteten ~a~n   :: ~a")
-  (test-engine-expected-error-error
-   "check-error erwartete den folgenden Fehler, bekam aber den Wert ~F.~n ~a")
-  (test-engine-expected-an-error-error
-   "check-error erwartete einen Fehler, bekam aber den Wert ~F.")
-  (test-engine-not-mem-error  "Tatsächlicher Wert ~F ist keins der Elemente ")
-  (test-engine-not-range-error "Tatsächlicher Wert ~F liegt nicht zwischen ~F und ~F (inklusive).")
-  (test-engine-property-fail-error "Eigenschaft falsifizierbar mit")
-  (test-engine-property-error-error "`check-property' bekam den folgenden Fehler~n:: ~a")
-
-  (signature-enable-checks "Signaturüberprüfung aktivieren")
-  (signature-disable-checks "Signaturüberprüfung deaktivieren")
-
-  ; section header
-  (test-engine-check-failures "Check-Fehler:")
-  ; section header
-  (test-engine-signature-violations "Signaturverletzungen:")
-
-  ; part of one phrase "signature <at line ...> to blame: procedure <at line ...>
-  (test-engine-signature "Signatur")
-  (test-engine-to-blame "verantwortlich: Prozedur")
-
-  (test-engine-no-signature-violations "Keine Signaturverletzungen.")
-  (test-engine-1-signature-violation "1 Signaturverletzung.")
-  (test-engine-n-signature-violations "~a Signaturverletzungen.")
-
-  ; as in got <value>, signature <at ...>
-  (test-engine-got "bekam")
-
-  (profjWizward-insert-java-class "Java-Klasse einfügen")
-  (profjWizard-insert-java-union "Java-Vereinigung einfügen")
-
-  ;; The Test Suite Tool
-  ;; Errors
-  (test-case-empty-error "Leerer Testfall")
-  (test-case-too-many-expressions-error "Zu viele Ausdrücke in einem Testfall")
-  ;; DrRacket window menu items
-  (test-case-insert "Testfall einfügen")
-  (test-case-disable-all "Alle Testfälle deaktivieren")
-  (test-case-enable-all "Alle Testfälle aktivieren")
-  ;; NOTE: The following three string constants are labels of the test-case fields. The width
-  ;;       of the field is determined by the length of the longest of the following three words.
-  ;;       if the words are too long the test case will take up too much horizontal room and
-  ;;       not look very good.
-  ;; This string is the label of the expression that is being tested in a test case.
-  (test-case-to-test "Test")
-  ;; This string is the label of the expression that is the expected value of the to-test expression.
-  (test-case-expected "Sollte sein")
-  ;; This string is the label of the actual result of the to test expression.
-  (test-case-actual "Tatsächlich")
-  (test-case-predicate "Prädikate")
-  (test-case-should-raise "Sollte verursachen")
-  ;; The label of a field of the test-case that describes the expected error message of a test case
-  (test-case-error-message "Fehlermeldung")
-
-  (test-case-menu-title "Testfall")
-  (test-case-switch-to-error-box "Zu Fehler-Testbox machen")
-  (test-case-switch-to-nonerror-box "Zu Nicht-Fehler-Testbox machen")
-  (test-case-collapse "Testfall einfalten")
-  (test-case-show-actual "Tatsächlichen Wert zeigen")
-  (test-case-enable "Testfall aktivieren")
-  (test-case-show-predicate "Prädikat anzeigen")
-  (test-case-show-error-message "Fehlermeldung anzeigen")
-  (test-case-convert-to-text "In Text umwandeln")
-
-  ;; Profj Boxes
-  (profjBoxes-empty-error "Leere Interaktion")
-  (profjBoxes-too-many-expressions-error "Zu viele Ausdrücke in einem Kasten")
-  (profjBoxes-interactions-label "Interaktionen")
-  (profjBoxes-bad-java-id-error "Nicht-wohlgeformte Java-ID")
-  (profjBoxes-examples-label "Beispiele")
-  (profjBoxes-add-new-example-button "Neues Beispiel hinzufügen")
-  (profjBoxes-type "Typ")
-  ;; The Java identifier of an example of data
-  (profjBoxes-name "Name")
-  (profjBoxes-value "Wert")
-  (profjBoxes-insert-java-examples "Java-Beispiele einfügen")
-  (profjBoxes-insert-java-interactions "Java-Interactionen einfügen")
-
-  ;; Slideshow
-  (slideshow-hide-picts "Geschachtelte Kästen anzeigen")
-  (slideshow-show-picts "Picts anzeigen")
-  (slideshow-cannot-show-picts "Kann die Picts nicht anzeigen; Sie müssen erst das Programm zum Cachen der Größen laufen lassen")
-  (slideshow-insert-pict-box "Pict-Kasten einfügen") 
-
-  ;; GUI Tool
-  (gui-tool-heading "GUI-Werkzeug")
-  (gui-tool-before-clicking-message "Befor Sie auf ein Tool-Icon klicken, benutzen Sie \"GUI einfügen\" vom \"Spezial\"-Menü, um ein Wurzel-GUI-Element einzufügen, oder selektieren Sie eine schon vorher eingefügte GUI.")
-  (gui-tool-show-gui-toolbar "GUI-Toolbar einblenden")
-  (gui-tool-hide-gui-toolbar "GUI-Toolbar ausblenden")
-  (gui-tool-insert-gui "GUI einfügen")
-
-  
-  ;; contract violation tracking
-  
-  ; tooltip for new planet icon in drscheme window (must have a planet violation logged to see it)
-  (show-planet-contract-violations "PLaneT-Vertragsverletzungen anzeigen")
-
-  ; buttons in the dialog that lists the recorded bug reports
-  (bug-track-report "Ticket einreichen")
-  (bug-track-forget "Vergessen")
-  (bug-track-forget-all "Alles vergessen")
-
-  ;; planet status messages in the bottom of the drscheme window; the ~a is filled with the name of the package
-  (planet-downloading "PLaneT: ~a herunterladen ...")
-  (planet-installing "PLaneT: ~a installieren ...")
-  (planet-finished "PLaneT: fertig mit ~a.")
-  (planet-docs-building "PLaneT: Dokumentation bauen (ausgelöst durch ~a)...")
-  (planet-no-status "PLaneT") ;; this can happen when there is status shown in a different and then the user switches to a tab where planet hasn't been used
-
-  (bug-report-field-pkg "Info Package-System")
-  
-
- ;; string normalization. To see this, paste some text with a ligature into DrRacket
- ;; the first three strings are in the dialog that appears. The last one is in the preferences dialog
- (normalize "Normalisieren")
- (leave-alone "Unverändert lassen")
- (normalize-string-info "Der Text, den Sie eingefügt haben, enthält Ligaturen oder andere nicht-normalisierte Zeichen. Normalisieren?")
- (normalize-string-preference "Eingefügten Text normalisieren")
- (ask-about-normalizing-strings "Bei Normalisierung nachfragen")
- 
-  (always-use-platform-specific-linefeed-convention "Immer die plattformspezifische Linefeed-Konvention verwenden")
-
-
-  ;; optimization coach
-  (hide-optimization-coach "Optimierungs-Coach ausblenden")
-  (show-optimization-coach "Optimierungs-Coach einblenden")
-  
-
-  ;; labels used (in a big font) in the background of the definitions and interactions windows
-  (definitions-window-label "Definitionen")
-  (interactions-window-label "Interaktionen")
-  (hide-defs/ints-label "Definitionen/Interaktionen-Beschriftung ausblenden") ;; popup menu
-  (show-defs/ints-label "Definitionen/Interaktionen-Beschriftung einblenden") ;; preferences checkbox
-
-  ;; menu item in the 'edit' menu; applies to editors with programs in them
-  ;; (technically, editors that implement color:text<%>)
-  (spell-check-string-constants "String-Konstanten korrekturlesen")
-  (spell-check-scribble-text "Text korrekturlesen (zwischen {} in Scribble)")
-  (spelling-dictionaries "Wörterbücher für die Rechtschreibprüfung") ; (sub)menu whose items are the different possible dictionaries
-  (default-spelling-dictionary "Standard-Wörterbuch") ; first item in menu from previous line
-  (misspelled-text-color "Rechtschreibfehler in Textfarbe") ;; in the preferences dialog  
-  (cannot-find-ispell-or-aspell-path "aspell- bzw. ispell-Programm nicht gefunden")
-  ; puts the path to the spell program in the ~a and then the error message
-  ; is put following this string (with a blank line in between)
-  (spell-program-wrote-to-stderr-on-startup "Der Rechtschreibchecker (~a) hat eine Fehlermeldung ausgegeben:")
-
-  (spell-skip-to-next-misspelled-word "Zum nächsten falsch geschriebenen Wort") ;; menu item
-  (spell-suggest-corrections "Rechtschreibkorrekturen vorschlagen...") ;; menu item
-  (spell-correction-suggestions "Vorschläge für Rechtschreibkorrekturen") ;; dialog title
-  (spell-choose-replacement-word "Austauschwort auswählen") ;; label in dialog 
-  
-  ;; GUI for installing a pkg package; available via File|Install Package...
-  (install-pkg-install-by-source "Tu was ich meine") ; tab label
-  (install-pkg-install-from-list "Im Katalog verfügbar") ; tab label
-  (install-pkg-install-installed "Momentan installiert")         ; tab label
-  (install-pkg-migrate-from "Kopieren von Version")           ; tab label
-  (install-pkg-settings "Einstellungen")                        ; tab label
-  (install-pkg-menu-item... "Paket installieren...")
-  (install-pkg-dialog-title "Paket installieren")
-  (install-pkg-source-label "Paket-Quelle")
-  (install-pkg-package-name "Paket-Name")
-  (install-pkg-package-source-desc "Eine Paket-Quelle ist ein Paket-Name, eine Datei, ein Verzeichnis, eine URL oder ein Verweis auf Github")
-  (install-pkg-infer "Inferieren")
-  (install-pkg-use "Benutzen") ; as opposed to "Infer", label for text box
-  (install-pkg-type-label "Typ Paket-Quelle")
-  (install-pkg-file "Datei")
-  (install-pkg-dir "Verzeichnis")
-  (install-pkg-dir-url "Verzeichnis woanders")
-  (install-pkg-file-url "Datei woanders")
-  (install-pkg-git "Git-Repositorium")
-  (install-pkg-github "Github")
-  (install-pkg-name "Name (frage Auflöser)")
-  (install-pkg-inferred-as "Typ inferiert als ~a") ; ~a gets install-pkg-{file,dir,...}
-  (install-pkg-link-dirs "Lokales Verzeichnis als Link")
-  (install-pkg-file-or-dir? "Datei oder Verzeichnis auswählen")
-  (install-pkg-force? "Konflikte ignorieren")
-  (install-pkg-replace? "Existierende Installation überschreiben")
-  (install-pkg-command-line "Äquivalenter Kommandozeilen-Aufruf:")
-  (install-pkg-error-installing-title "Fehler beim Installieren von Paket")
-
-  (install-pkg-action-label "Maßnahme")
-  (install-pkg-install "Installieren")
-  (install-pkg-update "Aktualisieren")
-  (install-pkg-remove "Entfernen")
-  (install-pkg-do-not-remove "Nicht entfernen")
-  (install-pkg-action-inferred-to-be-update "Maßnahme als Aktualisierung inferiert")
-  (install-pkg-action-inferred-to-be-install "Maßnahme als Installation inferiert")
-  (install-pkg-default "Standard")
-  (install-pkg-scope-label "Paket-Einzugsbereich")
-  (install-pkg-default-scope-label "Standard-Paket-Einzugsbereich") ; for picking the scope to be default
-  (install-pkg-installation "Bestimmte Racket-Installation")
-  (install-pkg-user "Bestimmter Benutzer und Racket-Version")
-  (install-pkg-set-as-default "Als Standard setzen")
-  (install-pkg-scope-is "Paket-Einzugsbereich ist ~a") ; ~a gets install-pkg-{installation,user,shared}
-  (install-pkg-select-package-directory "Paket-Verzeichnis auswählen")
-  (install-pkg-select-package-file "Paket-Datei auswählen")
-  (install-pkg-update-package-list "Paket-Liste aktualisieren")
-  (install-pkg-stop-update "Aktualisierung anhalten")
-  (install-pkg-filter "Filter")
-  (install-pkg-update-catalogs? "Datenbank aktualisieren um mit dem konfigurierten Satz Kataloge übereinzustimmen?")
-  (install-pkg-currently-configured-are "Die aktuell konfigurierten Kataloge sind")
-  (install-pkg-database-recorded-are "Die Kataloge in der Datenbank sind")
-  (install-pkg-update-catalogs "Aktualisieren")
-  (install-pkg-do-not-update-catalogs "Nicht aktualisieren")
-  (install-pkg-really-remove? "Sind Sie sicher, dass Sie die folgenden selektierten Pakete entfernen wollen?")
-  (install-pkg-promote "Von \"automatisch installiert\" befördern")
-  (install-pkg-demote "Nach \"automatisch installiert\" zurückstufen")
-  (install-pkg-abort-install "Installation abbrechen")
-  (install-pkg-abort-update "Aktualisierung abbrechen")
-  (install-pkg-abort-remove "Entfernung abbrechen")
-  (install-pkg-abort-demote "Zurückstufung abbrechen")
-  (install-pkg-abort-promote "Beförderung abbrechen")
-  (install-pkg-abort-migrate "Migration abbrechen")
-  (install-pkg-abort-generic-action "Aktion abbrechen")
-  (install-pkg-close-terminal-output "Anzeige schließen")
-  (install-pkg-show-all-options "Alle Optionen anzeigen")
-  (install-pkg-migrate-available-installations "Verfügbare Installationen")
-  (pkg-manager-menu-item "Paket-Manager...")
-  ;; where ~a gets an installation name:
-  (install-pkg-packages-for "Pakete für ~a")
-  (install-pkg-really-remove-installation "Sind Sie sicher, dass Sie alle installierten Pakete und Informationen für ~a löschen wollen?")
-
-  (install-pkg-abort-set-scope "Änderung des Einzugsbereich widerrufen")
-
-  (install-pkg-dependencies-fail "Fehlschlag: Installation/Aktualisierung widerrufen, falls Abhänigkeiten fehlen")
-  (install-pkg-dependencies-force "Trotzdem: Installieren trotz fehlender Abhängigkeiten")
-  (install-pkg-dependencies-search-ask "Fragen: bei jeder fehlenden Abhänigkeit fragen (nicht unterstützt in GUI)")
-  (install-pkg-dependencies-search-auto "Auto: fehlende Abhänigkeiten automatisch installieren")
-  (install-pkg-dependencies-search-auto+update "Auto + Aktualisieren: Abhänigkeiten aktualisieren wann immer möglich")
-
-  (install-pkg-dependencies-mode "Modus Abhängigkeiten")
-
-  (install-pkg-dependencies-search-ask-not-supported-in-gui
-   "Der “Fragen“-Modus für Abhängigkeiten ist im GUI-Installierer nicht unterstützt.")
-  ;; "~a" is pre-":" part of `install-pkg-dependencies-fail' or `install-pkg-dependencies-search-auto':
-  (install-pkg-deps-is "Standard-Modus für Abhängigkeiten ist ~a")
-
-  (install-pkg-package-catalogs "Paket-Kataloge") ; label for a list box
-  (install-pkg-add-package-catalog "Paket-Katalog hinzufügen")
-
-  (install-pkg-not-rentrant "Installation und Aktualisierung können nicht gleichzeitig laufen."
-                            " Brechen Sie entweder den laufenden Prozess ab oder warten, bis er fertig ist.")
-
-  ;; open a file via a collection path (new "Open" menu item in DrRacket)
-  (open-require-path "Require-Pfad öffnen...")
-  (enter-subcollection "Sub-Collection betreten") ; button in new dialog
-  
-  (path-to-racket-binary "Pfad zur Programmdatei")
-  (use-a-different-racket "Anderes Racket benutzen")
-  
-  ; first ~a is filled with either the empty string or an error message from elsewhere
-  ;  (bracketed by some newlines to separate it out)
-  ; second ~a is filled with /etc/paths.d/racket (or some other path like it in the future)
-  ; third ~a is filled with the path to the bin directory of the current drracket
-  (adding-racket/bin-to-path-failed 
-   "Versuch fehlgeschlagen, Racket-Unterstützung zur Kommandozeile hinzufügen.~aGenauer:"
-   " konnte \"~a\" mit Inhalt \"~a\" nicht erzeugen.")
-  ; first and third ~a are filled with /etc/paths.d/racket (or some other path like it in the future)
-  ; and the second one is filled with the path to the bin directory that was put into that file.
-  (added-racket/bin-to-path
-   "Sie sollten nun Racket mit all seinen Programme von der"
-   " Kommandozeile benutzen können.\n\nDer"
-   " Standardpfad in PATH wurde für alle Benutzer konfiguriert, indem die Datei"
-   " ~a hinzugefügt wurde und auf ~a zeigt. Sie können dies rückgängig machen, indem"
-   " Sie ~a löschen.")
-  (add-racket/bin-to-path "Kommandozeile für Racket konfigurieren...") ;; menu item label
-
-  )
-
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/japanese-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/japanese-string-constants.rkt
deleted file mode 100644
index 4616c3f9de..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/japanese-string-constants.rkt
+++ /dev/null
@@ -1,1452 +0,0 @@
-#|
-
-When modifying the string constants files,
-please adhere to these guidelines:
-
-- All the entries in english-string-constants.rkt have the same format
-  (name string).  If the purpose of an entry you are adding to the
-  file is not clear from just the name and string, put a comment next
-  to the entry explaining what the string is going to be used for and
-  in what context.
-  That's especially true for strings that contain things like "~a".
-  Systematically describe what the "~a" is going to be replaced with.
-  When we have to translate strings like "deleting ~a", we translators
-  need to know what "~a" is going to be (in particular, in some
-  languages like French, we need to know whether the "~a" is going to
-  be a masculine or feminine word, or whether it's going to be
-  singular or plural, etc).
-
-- When adding a bunch of new entries, put together in a section the
-  entries that logically belong together.  Give a title to your
-  section, so we have an idea of what the strings are for.  Don't mix
-  in the same section strings that have nothing to do with each other,
-  that's only going to confuse us.  Do not start a new section if
-  there's already one that deals with the same thing.  Dumping all the
-  new entries in random order at the end of the file is not a good way
-  to have your new entries translated in a timely manner...
-
-- Before adding strings for your new pet tool, check whether you can't
-  re-use strings that already exist.  There's no need for yet another
-  "Ok" string...
-
-- If you modify an existing string in english-string-constants.rkt, go
-  through all the *-string-constants.rkt files for the other languages,
-  comment out the old version of the modified string in each of these
-  files, and put a short comment there telling us the English string
-  has changed and needs to be re-translated.  Do not erase the old
-  version, it might help us translate the new one.  Do not move it
-  either.  Just comment it out and add the short comment.  After the
-  next git update DrRacket will automatically tell us translators that
-  a new string needs to be translated, we will find your comment in
-  the file, and know what to do.
-	Some evil evil people might think that, since DrRacket automatically
-  informs us of new strings to be translated, an easier thing to do
-  when modifying an existing string would be to simply rename it at
-  the same time.  This works, except that if you do that, we
-  translators will get two warnings from DrRacket:
-		language english had but french does not:
-		(new-name "New String")
-		language french had but english does not:
-		(old-name "Old String")
-  then we translators will be left to wonder whether the two things
-  are related or not, and whether we can safely base our translation
-  of "New String" on the translation of "Old String" (since the two
-  strings are likely to be close in meaning).  Worse, we might not
-  even realize the two strings are related and translate "New String"
-  from scratch, just to realize later that it's only a variation of
-  "Old String".  I can tell you that nothing pisses off a translator
-  more than having to translate pretty much the same string twice
-  just because *you* were too lazy to inform us that it was just a
-  slight modification to an existing string rather than an entirely
-  new one.  Conclusion: do not change the name of a string unless you
-  have some really good reason to do so.
-
-- Please think hard before choosing a string and make sure it means
-  what you want it to mean.  That way you won't have to change it
-  later, and we won't have to retranslate it.
-
-- Please think hard before choosing the name for a string.  Use
-  meaningful names.  "error" or "ok" are not meaningful names.  Prefix
-  all related names with a common prefix (the name of your tool or
-  module).  String names are not the right place to save on typing.
-
-- If, for some reason, you really have to change the name of a string
-  (like, because the original name you gave it really sucked...),
-  change the name of the string in *ALL* the *-string-constants.rkt
-  files.  That's a modification you can do without the help of a
-  translator, so do it yourself.  It's not the job of the translators
-  to clean up your naming mess for you.  Besides, you are the one who
-  knows what you changed, so leaving the translators having to guess
-  what you did is Not Nice(tm).
-
-- If, for some reason, you need to remove a string (i.e. you changed
-  your code and don't need the string anymore), remove the string in
-  *ALL* the *-string-constants.rkt files.  Again, you don't need the
-  help of a translator to do that.  If you're not sure whether you
-  might need the string in the future or not, just comment it out in
-  *ALL* the files.
-
-|#
-
-(module japanese-string-constants "string-constant-lang.rkt"
- ;;; when translating this constant, substitute name of actual language for `English'
- (is-this-your-native-language "Is Japanese Your Native Language?")
-
- (are-you-sure-you-want-to-switch-languages
-  "GUI で使用する自然言語を変更します。DrRacket を再起動する必要があります。よろしいですか？")
-
- (interact-with-drscheme-in-language "DrRacket を日本語で使う")
-
- ;; these two should probably be the same in all languages excepet English.
- ;; they are the button labels (under macos and windows, respectively)
- ;; that go the with the string above.
- (accept-and-quit "承認して終了")
- (accept-and-exit "承認して終了")
-
- ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
- (plt "PLT")
- (drscheme "DrRacket")
- (drracket "DrRacket")
- (ok "OK")
- (cancel "キャンセル")
- (abort "中止")
- (untitled "Untitled")
- (untitled-n "Untitled ~a")
- (warning "警告")
- (error "エラー")
- (close "閉じる") ;; as in, close an open window. must match close-menu-item
-                 ;; in the sense that, when the &s have been stripped from
-                 ;; close-menu-item, it must be the same string as this.
- (stop "停止")
- (&stop "停止(&S)") ;; for use in button and menu item labels, with short cut.
- (are-you-sure-delete? "~a を削除してよろしいですか？") ;; ~a is a filename or directory name
- (ignore "無視")
- (revert "復元")
-
- ;; label for a generic check box, often supported on dialogs
- ;; that ask a binary choice of the user. If checked, the
- ;; dialog isn't going to be shown again.
-  ;; One version for always using the current choice:
- (dont-ask-again-always-current "今後このメッセージを表示しない (現在の選択が使われます)")
-  ;; One generic version (ie, on the Quit DrRacket dialog)
- (dont-ask-again                "今後このメッセージを表示しない")
-
- ;;; important urls
- (web-materials "関連するウェブサイト") ;; menu item title
- (tool-web-sites "ツールのウェブサイト")   ;; menu item title
- (plt-homepage "Racket")
- (pbd-homepage "Program by Design")
-
- ;;; bug report form
- (cancel-bug-report? "バグ報告を中止しますか？")
- (are-you-sure-cancel-bug-report?
-  "このバグ報告を送信せずに、中止してよろしいですか？")
- (bug-report-form "バグ報告フォーム")
- (bug-report-field-name "名前")
- (bug-report-field-email "メールアドレス")
- (bug-report-field-summary "概要")
- (bug-report-field-severity "深刻度")
- (bug-report-field-class "分類")
- (bug-report-field-description "説明")
- (bug-report-field-reproduce1 "再現の手順")
- (bug-report-field-reproduce2 "")
- (bug-report-field-environment "環境")
- (bug-report-field-docs-installed "インストールされている文書")
- (bug-report-field-collections "コレクション")
- (bug-report-field-human-language "自然言語")
- (bug-report-field-version "バージョン")
- (bug-report-synthesized-information "詳細情報")  ;; dialog title
- (bug-report-show-synthesized-info "詳細情報の表示")
- (bug-report-submit "送信")
- (bug-report-submit-menu-item "バグ報告の送信...") ;; in Help Menu (drs & help desk)
- (error-sending-bug-report "バグ報告の送信エラー")
- (error-sending-bug-report-expln "バグ報告の送信中にエラーが発生しました。もし、インターネット接続が正常であるなら、\n\n    http://bugs.racket-lang.org/\n\nを開いて、オンラインのウェブフォームからバグ報告を行ってください。お手間をかけて申し訳ありません。\n\nエラーメッセージ:\n~a")
- (illegal-bug-report "バグ報告が正しく入力されていません")
- (pls-fill-in-field "フィールド \"~a\" を入力してください。")
- (malformed-email-address "メールアドレスの形式が正しくありません。")
- (pls-fill-in-either-description-or-reproduce " \"説明\" または \"再現の手順\" のいずれか一方は入力してください。")
-
- ;;; check syntax
- (check-syntax "構文の検証")
- (cs-italic "斜体")
- (cs-bold "太字")
- (cs-underline "下線")
- (cs-change-color "カラーの変更")
- (cs-tack/untack-arrow "矢印の連結/非連結")
- (cs-jump-to-next-bound-occurrence "次の束縛に移動")
- (cs-jump-to-binding "束縛へ移動")
- (cs-jump-to-definition "定義へ移動")
- (cs-error-message "エラーメッセージ")
- (cs-open-file "~a を開く")
- (cs-rename-var "~a の名前を変更")
- (cs-rename-id "識別子の名前変更")
- (cs-rename-var-to "~a を名前変更:")
- (cs-name-duplication-error "入力された新しい名前 ~s は、このスコープに存在する名前と競合します。")
- (cs-rename-anyway "とにかく名前変更")
- (cs-status-init "構文の検証: ユーザーコードのための環境を初期化しています")
- (cs-status-coloring-program "構文の検証: 式にカラーを付けています")
- (cs-status-eval-compile-time "構文の検証: コンパイル時間を評価しています")
- (cs-status-expanding-expression "構文の検証: 式を展開しています")
- (cs-status-loading-docs-index "構文の検証: ドキュメントの索引をロードしています")
- (cs-mouse-over-import "束縛 ~s が ~s からインポートされました")
- (cs-view-docs "~a のドキュメントを表示する")
- (cs-view-docs-from "~a 参照元は ~a")  ;; a completed version of the line above (cs-view-docs) is put into the first ~a and a list of modules (separated by commas) is put into the second ~a. Use check syntax and right-click on a documented variable (eg, 'require') to see this in use
-
- (cs-lexical-variable "レキシカル変数")
- (cs-imported-variable "インポート変数")
-
- ;;; info bar at botttom of drscheme frame
- (collect-button-label "GC")
-  (read-only "読み取り専用")
- (auto-extend-selection "自動拡張")
- (overwrite "上書き")
- (running "実行中")
- (not-running "停止中")
-
- ;;; misc
- (welcome-to-something "~a にようこそ！")
-
- ; this appears in the drscheme about box.
- (welcome-to-drscheme-version/language "Welcome to DrRacket, version ~a, ~a")
-
- ; these appear on subsequent lines in the `Help|Welcome to DrRacket' dialog.
- (welcome-to-drscheme "Welcome to DrRacket")
-
- (goto-line "行番号を指定して移動")
- (goto-line-invalid-number
-  "~a は無効な行番号です。行番号は 1 から ~a までの整数で指定してください。")
- (goto-position "位置を指定して移動")
- (no-full-name-since-not-saved
-  "このファイルはまだ保存されていないため、完全な名前を持っていません。")
- (cannot-open-because-dne "~a が存在しなため、開くことができません。")
-
-  (needs-execute-language-changed
-   "警告: 言語が変更されました。[実行] をクリックしてください。")
-  (needs-execute-teachpack-changed
-   "警告: ティーチパックが変更されました。[実行] をクリックしてください。")
-  (needs-execute-defns-edited
-   "警告: 定義ウィンドウが変更されました。[実行] をクリックしてください。")
-
- (file-is-not-saved "ファイル \"~a\" は保存されていません。")
- (save "保存")
- (close-anyway "とにかく閉じる")
- (dont-save "保存しない")
- (clear-anyway "とにかく消去する")
-
- ;; menu item title
- (log-definitions-and-interactions "定義と対話を記録する...")
- (stop-logging "記録の停止")
- (please-choose-a-log-directory "記録先のディレクトリを選択してください")
- (logging-to "記録先: ")
- (erase-log-directory-contents "記録先のディレクトリ ~a の内容を消去しますか？")
- (error-erasing-log-directory "記録先のディレクトリの内容を消去できませんでした。\n\n~a\n")
-
-  ;; menu items connected to the logger -- also in a button in the planet status line in the drs frame
-  (show-log "ログを表示(&L)")
-  (hide-log "ログを非表示(&L)")
-  (logging-all "すべて") ;; in the logging window in drscheme, shows all logs simultaneously
-
- ;; modes
- (mode-submenu-label "モード")
- (scheme-mode "Scheme モード")
- (racket-mode "Racket モード")
- (text-mode "Text モード")
-
- (scheme-mode-color-symbol "シンボル")
- (scheme-mode-color-keyword "キーワード")
- (scheme-mode-color-comment "コメント")
- (scheme-mode-color-string "文字列")
- (scheme-mode-color-constant "定数")
- (scheme-mode-color-parenthesis "括弧")
- (scheme-mode-color-error "エラー")
- (scheme-mode-color-other "その他")
- ;; the ~a is filled in with one of the above (scheme-mode-*)
- (syntax-coloring-choose-color "~aのカラーを選択してください。")
- (preferences-colors "カラー") ;; used in the preferences dialog
-
-  ;; parenthesis color scheme string constants
-  (parenthesis-color-scheme "括弧のカラースキーム") ;; label for the choice% menu in the preferences dialog
-  (paren-color-basic-grey "Basic grey")
-  (paren-color-shades-of-gray "Shades of grey")
-  (paren-color-shades-of-blue "Shades of blue")
-  (paren-color-spring "Spring")
-  (paren-color-fall "Fall")
-  (paren-color-winter "Winter")
-
-
- (url: "URL:")
- (open-url... "URL を開く...")
- (open-url "URL を開く")
- (browse... "選択...")
- (bad-url "不正な URL")
- (bad-url:this "不正な URL: ~a")
-
- ;; Help Desk
- (help "ヘルプ")
- (help-desk "ヘルプデスク")
- (plt:hd:search "検索")
- (plt:hd:feeling-lucky "Feeling Lucky")
- (plt:hd:home "ヘルプデスクのホーム")
- ; next 3 are popup menu choices in help desk search frame
- (plt:hd:search-for-keyword "キーワードが")
- (plt:hd:search-for-keyword-or-index "キーワードか索引が")
- (plt:hd:search-for-keyword-or-index-or-text "キーワード,索引,テキストが")
- (plt:hd:exact-match "正確に一致")
- (plt:hd:containing-match "含んでいる")
- (plt:hd:regexp-match "正規表現にマッチ")
- (plt:hd:find-docs-for "検索:")
- (plt:hd:search-stopped-too-many-matches "[検索を中止しました: ヒット件数が多過ぎます]")
- (plt:hd:nothing-found-for "情報はありません ~a")
- (plt:hd:and "and")
- (plt:hd:refresh "更新")
- (plt:hd:refresh-all-manuals "すべてのマニュアルを更新する")
- (plt:hd:manual-installed-date "(installed ~a)")
- ; Help Desk configuration
- ;; refreshing manuals
- (plt:hd:refreshing-manuals "マニュアルを再ダウンロードしています")
- (plt:hd:refresh-downloading... "~a をダウンロードしています...")
- (plt:hd:refresh-deleting... "古いバージョンの ~a を削除しています...")
- (plt:hd:refresh-installing... "新しいバージョンの ~a をインストールしています...")
- (plt:hd:refresh-clearing-indices "キャッシュ内の索引を消去しています")
- (plt:hd:refreshing-manuals-finished "完了しました。")
- (plt:hd:about-help-desk "ヘルプデスクについて")
- (plt:hd:help-desk-about-string
-  "ヘルプデスクは PLT ソフトウェア (DrRacket, MzScheme, MrEd など) に関する完全な情報を提供します。\n\nバージョン ~a\nCopyright (c) ~a-~a PLT")
- (plt:hd:help-on-help "ヘルプのヘルプ")
- (plt:hd:help-on-help-details "ヘルプデスクの使い方については、ヘルプデスクのホームページにある最初の `Help Desk' というリンクをたどってください。(ホームページを表示するには、ヘルプデスク ウィンドウの上部にある [ホーム] ボタンを押します。)")
-  (reload "再読み込み") ;; refresh the page in a web browser
-  (plt:hd:ask-about-separate-browser
-   "ウェブ上のコンテンツへのリンクを選択しました。リンクをヘルプデスク ブラウザで表示しますか？それとも別のブラウザで表示しますか？")
-  (plt:hd:homebrew-browser "ヘルプデスク ブラウザ") ;; choice for the above string (in a button)
-  (plt:hd:separate-browser "別のブラウザ") ;; other choice for the above string (also in a button)
-  (plt:hd:external-link-in-help "ヘルプ内の外部 URL")
-  (plt:hd:use-homebrew-browser "ヘルプデスク ブラウザで外部 URL を開く")
-  (plt:hd:new-help-desk "新規ヘルプデスク")
-
-  ;; in the Help Desk language dialog, title on the right.
-  (plt:hd:manual-search-ordering "マニュアルの検索順序")
-
-  ;; in the help-desk standalone font preference dialog, on a check box
-  (use-drscheme-font-size "DrRacket のフォンサイズを使用する")
-  
-  ;; in the preferences dialog in drscheme there is example text for help desk font size.
-  ;; clicking the links in that text produces a dialog with this message
-  (help-desk-this-is-just-example-text
-   "これはフォントサイズを設定するためのサンプルです。[ヘルプ] メニューから [ヘルプデスクを開く] を開いてリンクを辿ってください。")
-
-  ;; this appears in the bottom part of the frame the first time the user hits `f1' 
-  ;; (assuming nothing else has loaded the documentation index first)
-  ;; see also: cs-status-loading-docs-index
-  (help-desk-loading-documentation-index "ヘルプデスク: ドキュメントの索引を読み込んでいます")
-
- ;; Help desk htty proxy
- (http-proxy "HTTP プロキシ")
- (proxy-direct-connection "直接接続")
- (proxy-use-proxy "プロキシを使う:")
- (proxy-host "ホスト")
- (proxy-port "ポート")
- (proxy-bad-host "不正なプロキシ ホスト")
-
- ;; browser
- (rewind-in-browser-history "戻る")
- (forward-in-browser-history "進む")
- (home "ホーム")
- (browser "ブラウザ")
- (external-browser-choice-title "外部ブラウザ") ; title for radio-button set
- (browser-command-line-label "コマンドライン:") ; label for radio button that is followed by text boxes
- (choose-browser "ブラウザを選択してください")
- (no-browser "後で尋ねる")
- (browser-cmdline-expl-line-1 "(Command line formed by concatenating pre-text, URL,") ; explanatory text for dialog, line 1
- (browser-cmdline-expl-line-2 "and post-text, with no extra spaces between them.)") ; ... line 2. (Anyone need more lines?)
- (install? "インストールしますか？")  ;; if a .plt file is found (title of dialog)
- (you-have-selected-an-installable-package "インストール可能なパッケージを選択しました。")
- (do-you-want-to-install-it? "これをインストールしますか？")
- (paren-file-size "(このファイルのサイズは ~a バイトです)")
- (download-and-install "ダウンロード＋インストール") ;; button label
- (download "ダウンロード") ;; button label
- (save-downloaded-file/size "ダウンロードしたファイル (~a バイト) を、次の名前で保存") ;; label for get-file dialog
- (save-downloaded-file "ダウンロードしたファイルを、次の名前で保存")  ;; label for get-file dialog
- (downloading "ダウンロード中") ;; dialog title
- (downloading-file... "ファイルをダウンロード中...")
- (package-was-installed "パッケージがインストールされました。")
- (download-was-saved "ダウンロードされたファイルが保存されました。")
-
- (install-plt-file-menu-item... ".plt ファイルのインストール...")
- (install-plt-file-dialog-title ".plt ファイルのインストール")
- (install-plt-web-tab "ウェブ")
- (install-plt-file-tab "ファイル")
- (install-plt-filename "ファイル名:")
- (install-plt-url "URL:")
-
- ;; install plt file when opened in drscheme strings
- (install-plt-file "~a をインストールしますか？それとも編集用に開きますか？")
- (install-plt-file/yes "インストール")
- (install-plt-file/no "編集")
-
- (plt-installer-progress-window-title "インストールの進行状況") ;; frame title
- (plt-installer-abort-installation "インストールを中止") ;; button label
- (plt-installer-aborted "中止しました") ;; msg that appears in the installation window when installation is aborted
-
- ;;; about box
- (about-drscheme-frame-title "DrRacket について")
-
- ;;; save file in particular format prompting.
- (save-as-plain-text "このファイルをプレーンテキストで保存しますか？")
- (save-in-drs-format "このファイルを DrRacket 専用のバイナリ形式で保存しますか？")
- (yes "はい")
- (no "いいえ")
-
- ;; saving image (right click on an image to see the text)
-  (save-image "画像を保存する...")
-
- ;;; preferences
- (preferences "環境設定")
- (error-saving-preferences "環境設定を保存時にエラーが発生しました: ~a")
- (error-saving-preferences-title "環境設定保存時のエラー")
- (steal-the-lock-and-retry "ロックを解除して再試行") ;; in the preferences error dialog; this happens when the lockfile exists (after 3 pref writes).
- (error-reading-preferences "環境設定を読み取り時にエラーが発生しました")
- (prefs-file-locked "環境設定ファイルがロックされています (ファイル ~a が存在します), 環境設定の変更を保存できません。環境設定の変更をキャンセルしますか？")
- (try-again "再試行") ;; button label
- (prefs-file-still-locked "環境設定ファイルが依然としてロックされているため (ファイル ~a が存在します), 環境設定の変更を保存できません。")
- (scheme-prefs-panel-label "Racket")
- (warnings-prefs-panel-label "警告")
- (editor-prefs-panel-label "編集")
- (general-prefs-panel-label "一般")
- (highlight-parens "対応する括弧の間を強調表示する")
- (fixup-open-brackets "左角括弧を自動調整する")
- (fixup-close-parens "右括弧を自動調整する")
- (flash-paren-match "対応する括弧をフラッシュする")
- (auto-save-files "ファイルを自動保存する")
- (backup-files "ファイルをバックアップする")
- (map-delete-to-backspace "Delete キーを Backspace キーとして処理する")
- (verify-exit "DrRacket 終了時に確認をとる")
- (ask-before-changing-format "保存形式を変更する前に確認をとる")
- (wrap-words-in-editor-buffers "エディタでテキストを折り返して表示する")
- (show-status-line "ステータス行を表示する")
- (count-columns-from-one "桁番号を 1 から数える")
- (display-line-numbers "バッファの行番号を表示 (文字オフセットではなく)")
- (show-line-and-column-numbers "行番号と桁番号を表示する") ; used for popup menu; right click on line/column box in bottom of drs window
- (show-character-offsets "文字オフセットを表示する") ; used for popup menu; right click on line/column box in bottom of drs window
- (enable-keybindings-in-menus "メニューのキーバインドを有効にする")
- (command-as-meta "Command キーを Meta キーとして処理する") ;; macos/macos x only
- (reuse-existing-frames "新しいファイルを開くときに既存のフレームを再利用する")
- (default-fonts "既定のフォント")
- (basic-gray-paren-match-color "基本グレー括弧の強調表示カラー") ; in prefs dialog
- (online-coloring-active "入力と同時に構文の色付けをする")
- (open-files-in-tabs "ファイルを別のタブに開く (別のウィンドウではなく)")
- (show-interactions-on-execute "プログラムを実行するときは、自動的に対話ウィンドウを開く")
-  (switch-to-module-language-automatically "モジュールを開くときは、自動的にそのモジュール言語に切り替える")
-  (interactions-beside-definitions "対話ウィンドウを定義ウィンドウの横に配置する") ;; in preferences, below the checkbox one line above this one
- (limit-interactions-size "対話ウィンドウに表示する文字数を制限する")
- (background-color "背景色")
- (default-text-color "既定のテキスト") ;; used for configuring colors, but doesn't need the word "color"
- (choose-a-background-color "背景色を選択してください")
- (revert-to-defaults "デフォルトに戻す")
-
-  (black-on-white-color-scheme "白地に黒") ;; these two appear in the color preferences dialog on butttons
-  (white-on-black-color-scheme "黒地に白") ;; clicking the buttons changes the color schemes to some defaults that've been set up.
-
- ; title of the color choosing dialog
-
- ; should have entire alphabet
- (font-example-string "The quick brown fox jumped over the lazy dogs.")
-
- (change-font-button-label "変更")
- (fonts "フォント")
- (other... "その他...") ;; used in the font choice menu item
-
- ; filled with type of font, eg modern, swiss, etc.
- (choose-a-new-font "フォントタイプが \"~a\" のフォントを選択してください")
-
- (font-size-slider-label "サイズ")
- (restart-to-see-font-changes "フォントの変更は再起動後に有効になります")
-
- (font-prefs-panel-title "フォント")
- (font-name "フォント名")
- (font-size "フォントサイズ")
- (set-font "Set Font...")
- (font-smoothing-label  "ﾌｫﾝﾄのｽﾑｰｼﾞﾝｸﾞ")
- (font-smoothing-none "なし")
- (font-smoothing-some "ある程度")
- (font-smoothing-all "すべて")
- (font-smoothing-default "システムの既定値を使う")
- (select-font-name "フォント名の選択")
- (example-text "サンプル テキスト:")
- (only-warn-once "定義と対話が同期していない場合、一度だけ警告する。")
-
- ; warning message when lockfile is around
- (waiting-for-pref-lock "環境設定のロックファイルを待っています...")
- (pref-lock-not-gone
-  "環境設定のロックファイル:\n\n   ~a\n\n があるために、環境設定の保存ができません。Racket のソフトウェアが実行されていないことを確認した上で、このファイルを削除してください。")
- (still-locked-exit-anyway? "環境設定が保存できませんでした。とりあえず終了しますか？")
-
- ;;; indenting preferences panel
- (indenting-prefs-panel-label "インデント")
- (indenting-prefs-extra-regexp "正規表現")
-
- (square-bracket-prefs-panel-label "角括弧")
-
- ; filled with define, lambda, or begin
- (enter-new-keyword "新しい ~a のようなキーワードを入力してください:")
- (x-keyword "~a キーワード")
- (x-like-keywords "~a のようなキーワード")
-
- ; used in Square bracket panel
- (skip-subexpressions "スキップする部分式の個数")
-
- (expected-a-symbol "シンボルでなければなりません: ~a")
- (already-used-keyword "\"~a\" はすでに特別にインデントされるキーワードです")
- (add-keyword "追加")
- (remove-keyword "削除")
-
-  ; repl color preferences
-  (repl-colors "REPL")
-  (repl-out-color "出力")
-  (repl-value-color "値")
-  (repl-error-color "エラー")
-
- ;;; find/replace
-  (search-next "次")
-  (search-previous "前")
-  (search-match "一致")  ;;; this one and the next one are singular/plural variants of each other
-  (search-matches "一致") 
-  (search-replace "置換")
-  (search-skip "無視")
-  (search-show-replace "置換を表示")
-  (search-hide-replace "置換を非表示")
-  (find-case-sensitive "大小文字を区別")  ;; the check box in both the docked & undocked search
-  (find-anchor-based "アンカーを用いて検索")
-
-  ;; these string constants used to be used by searching,
-  ;; but aren't anymore. They are still used by other tools, tho.
-  (hide "隠す")
-  (dock "結合")
-  (undock "分離")
-
- ;;; multi-file-search
- (mfs-multi-file-search-menu-item "ファイルから検索...")
- (mfs-string-match/graphics "文字列の一致 (画像を含むファイルも検索)")
- (mfs-regexp-match/no-graphics "正規表現 (プレーンテキストのみ)")
- (mfs-searching... "検索中...")
- (mfs-configure-search "検索の設定") ;; dialog title
- (mfs-files-section "ファイル")   ;; section in config dialog
- (mfs-search-section "検索") ;; section in config dialog
- (mfs-dir "ディレクトリ")
- (mfs-recur-over-subdirectories "サブディレクトリ内を再帰的に検索")
- (mfs-regexp-filename-filter "ファイル名を正規表現でフィルタ")
- (mfs-search-string "検索語")
- (mfs-drscheme-multi-file-search "複数ファイルからの検索 - DrRacket") ;; results window and error message title
- (mfs-not-a-dir "\"~a\" はディレクトリではありません")
- (mfs-open-file "ファイルを開く")
- (mfs-stop-search "検索を中止")
- (mfs-case-sensitive-label "大小文字を区別する")
- (mfs-no-matches-found "見つかりませんでした。")
- (mfs-search-interrupted "検索は中止されました。")
-
- ;;; reverting a file
- (are-you-sure-revert
-  "このファイルをディスク上の内容に復元しますか？この操作はやり直すことができないので注意してください。")
- (are-you-sure-revert-title
-  "ファイル内容の復元")
-
- ;;; saving a file
- ; ~a is filled with the filename
- (error-saving "保存に失敗") ;; title of error message dialog
- (error-saving-file/name "~a を保存中にエラーが発生しました")
- (error-loading "ロードに失敗")
- (error-loading-file/name "~a をロード中にエラーが発生しました")
- (unknown-filename "<< unknown >>")
-
- ;;; finder dialog
- (must-specify-a-filename "ファイル名を指定してください")
- (file-does-not-exist "ファイル \"~a\" は存在しません。")
- (ask-because-file-exists "ファイル \"~a\" はすでに存在します。置換しますか？")
- (dne-or-cycle "The file \"~a\" contains a nonexistent directory or a cycle.")
- (get-file "Get file")
- (put-file "Put file")
- (full-pathname "Full pathname")
- (show-dot-files "ドットで始まるファイルやディレクトリを表示する。")
- (up-directory-button-label "上のディレクトリへ")
- (add-button-label "追加") ;;; for multi-file selection
- (add-all-button-label "すべて追加") ;;; for multi-file selection
- (remove-button-label "削除") ;;; for multi-file selection
- (file-wrong-form "そのファイル名は正しい形式ではありません。")
- (select-files "ファイルの選択")
- (select-file "ファイルの選択")
- (dir-dne "そのディレクトリは存在しません。")
- (file-dne "そのファイルは存在しません。")
- (empty-filename "ファイル名が空です。")
- (that-is-dir-name "それはディレクトリ名です。")
-
- ;;; raw menu names -- these must match the
- ;;; versions below, once the &s have been stripped.
- ;;; if they don't, DrRacket's menus will appear
- ;;; in the wrong order.
- (file-menu "ファイル")
- (edit-menu "編集")
- (help-menu "ヘルプ")
- (windows-menu "ウィンドウ")
-
- ;;; menus
- ;;; - in menu labels, the & indicates a alt-key based shortcut.
- ;;; - sometimes, things are stuck in the middle of
- ;;; menu item labels. For instance, in the case of
- ;;; the "Save As" menu, you might see: "Save Definitions As".
- ;;; be careful of spacing, follow the English, if possible.
- ;;; - the ellipses in the `after' strings indicates that
- ;;; more information is required from the user before completing
- ;;; the command.
-
-(file-menu-label "ファイル(&F)")
-
- (new-info  "新規ファイルを開きます")
- (new-menu-item "新規作成(&N)")
- (new-...-menu-item "新規作成(&N)...")
-
- (open-info "ディスクからファイルを開きます")
- (open-menu-item "開く(&O)...")
-
- (open-recent-info "最近開いたファイルの一覧を表示します")
- (open-recent-menu-item "最近開いたファイル")
-
- (revert-info "このファイルをディスク上のファイルに戻します")
- (revert-menu-item "復元(&R)")
-
- (save-info "このファイルをディスクに保存します")
- (save-menu-item "保存(&S)")
-
- (save-as-info "このファイルにファイル名を指定してディスクに保存します")
- (save-as-menu-item "名前を付けて保存(&A)...")
-
- (print-info "このファイルをプリンタで印刷します")
- (print-menu-item "印刷(&P)...")
-
- (page-setup-info "印刷パラメータの設定")
- (page-setup-menu-item "ページ設定...")
-
- (close-info "このファイルを閉じます")
- (close-menu-item "閉じる(&C)")
-
- (quit-info "すべてのウィンドウを閉じます")
- (quit-menu-item-windows "終了(&X)")
- (quit-menu-item-others "&Quit")
-
- (edit-menu-label "編集(&E)")
-
- (undo-info "直前の動作を元に戻します")
- (undo-menu-item "元に戻す(&U)")
-
- (redo-info "元に戻した直前の動作を再実行します")
- (redo-menu-item "やり直し(&R)")
-
- (cut-info "選択項目を切り取りクリップボードへコピーします")
- (cut-menu-item "切り取り(&U)")
-
- (copy-info "選択項目をクリップボードへコピーします")
- (copy-menu-item "コピー(&C)")
-
- (paste-info "現在の選択項目に、直前にコピーまたは切り取られた項目を貼り付けます")
- (paste-menu-item "貼り付け(&P)")
-
- (clear-info "選択項目を削除します")
- (clear-menu-item-windows "削除(&D)")
-
- (select-all-info "文書全体を選択します")
- (select-all-menu-item "すべて選択(&L)")
-
-  (find-menu-item "検索") ;; menu item
-  (find-info "検索対象ウィンドウと検索バーの間でキーボード フォーカスを移動する")
-
- (find-next-info "検索ウィンドウ内の文字列が次に見つかるまでスキップ")
- (find-next-menu-item "次を検索")
-  
- (find-previous-info "検索ウィンドウ内の文字列が前に見つかるまでスキップ")
- (find-previous-menu-item "前を検索")
-  
-  (show-replace-menu-item "置換を表示")
-  (hide-replace-menu-item "置換を非表示")
-  (show/hide-replace-info "置換パネルの表示/非表示を切り替える")
-
-  (replace-menu-item "置換")
-  (replace-info "黒い円の中の検索にヒットした部分を置換する")
-  
-  (replace-all-info "見つかった検索文字列をすべて置換する")
-  (replace-all-menu-item "すべて置換する")
-  
-  (find-case-sensitive-info "大小文字を区別する/区別しないを切り替える")
-  (find-case-sensitive-menu-item "大小文字を区別して検索")
-
-  (complete-word "自動補完") ; the complete word menu item in the edit menu
-  (no-completions "... 自動補完できません") ; shows up in the completions menu when there are no completions (in italics)
-  
-  (overwrite-mode "上書きモード")
-  (enable-overwrite-mode-keybindings "上書きモードのキーバインドを有効にする")
-  
- (preferences-info "環境設定を行います")
- (preferences-menu-item "環境設定...")
-
- (keybindings-info "現在有効なキーバインドを表示します")
- (keybindings-menu-item "キーバインド")
- (keybindings-show-active "現在有効なキーバインドを表示")
- (keybindings-frame-title "キーバインド")
- (keybindings-sort-by-name "名前で並べ替え")
- (keybindings-sort-by-key "キーで並べ替え")
- (keybindings-add-user-defined-keybindings "ユーザー定義のキーバインドを追加...")
- (keybindings-add-user-defined-keybindings/planet "ユーザー定義のキーバインドを PLaneT から追加...")
- (keybindings-menu-remove "~a を削除")
- (keybindings-choose-user-defined-file "キーバインドを記述したファイルを選択してください")
- (keybindings-planet-malformed-spec "PLaneT の指定が不正です: ~a") ; the string will be what the user typed in
- (keybindings-type-planet-spec "PLaneT の require 指定を入力してください (`require' は入力しないでください)")
-  
- ; first ~a will be a string naming the file or planet package where the keybindings come from;
- ; second ~a will be an error message
- (keybindings-error-installing-file "キーバインドのインストール時にエラーが発生しました ~a:\n\n~a")
-
- (user-defined-keybinding-error "キーバインドを実行中にエラーが発生しました ~a\n\n~a")
- (user-defined-keybinding-malformed-file "ファイル ~a には、言語 framework/keybinding-lang で書かれたモジュールが含まれていません。")
-
- ;; menu items in the "special" menu
- (insert-text-box-item "テキストボックスを挿入")
- (insert-image-item "画像を挿入...")
- (insert-comment-box-menu-item-label "コメント ボックスを挿入")
- (insert-lambda "ラムダ(λ)を挿入")
-
- (wrap-text-item "テキストを折り返す")
-
-  ;; windows menu
- (windows-menu-label "ウィンドウ(&W)")
- (minimize "最小化") ;; minimize and zoom are only used under mac os x
- (zoom "拡大")
- (bring-frame-to-front "フレームを前面に移動")       ;;; title of dialog
- (bring-frame-to-front... "フレームを前面に移動...") ;;; corresponding title of menu item
- (most-recent-window "最近使用したウィンドウ")
-  (next-tab "次のタブ")
-  (prev-tab "前のタブ")
-
- (view-menu-label "表示(&V)")
- (show-overview "プログラムの外観を表示")
- (hide-overview "プログラムの外観を非表示")
- (show-module-browser "モジュール ブラウザを表示")
- (hide-module-browser "モジュール ブラウザを非表示")
-
-  (help-menu-label "ヘルプ(&H)")
- (about-info "このアプリケーションの著作権と詳細情報を表示します")
- (about-menu-item "バージョン情報...")
-
- ;; open here's new menu item
- (create-new-window-or-clear-current
-  "新規ウィンドウを作成しますか？それとも、現在のウィンドウを消去しますか？")
- (clear-current "現在のウィンドウを消去")
- (new-window "新規ウィンドウを作成")
-
- ;;; exiting and quitting ``are you sure'' dialog
- ;;; exit is used on windows, quit on macos, in English. Other
- ;;; languages probably use the same word on both platforms.
- (exit "終了")
- (quit "終了")
- (are-you-sure-exit "終了してよろしいですか？")
- (are-you-sure-quit "終了してよろしいですか？")
-  ; these next two are only used in the quit/exit dialog
-  ; on the button whose semantics is "dismiss this dialog".
-  ; they are there to provide more flexibility for translations
-  ; in English, they are just cancel.
- (dont-exit "キャンセル") 
- (dont-quit "キャンセル")
-
- ;;; autosaving
- (error-autosaving "\"~a\" を自動保存中にエラーが発生しました。") ;; ~a will be a filename
- (autosaving-turned-off "このファイルが保存されるまで、\n自動保存は無効になります。")
- (recover-autosave-files-frame-title "自動保存ファイルの復元")
- (autosave-details "詳細")
- (autosave-recover "復元")
- (autosave-unknown-filename "<<unknown>>")
-
-  ;; these are labels in a dialog that drscheme displays
-  ;; if you have leftover autosave files. to see the dialog,
-  ;; start up drscheme and modify (but don't save) a file
-  ;; (also, do this with an unsaved file). Wait for the autosave
-  ;; files to appear (typically 5 minutes). Kill DrRacket
-  ;; and restart it. You'll see the dialog
-  (autosave-autosave-label: "自動保存ファイル:")
-  (autosave-original-label: "元のファイル:")
-  (autosave-autosave-label "自動保存ファイル")
-  (autosave-original-label "元のファイル")
-  (autosave-compare-files "自動保存ファイルの比較")
-
-  (autosave-show-autosave "自動保存ファイル") ;; title of a window showing the autosave file
-
-  (autosave-explanation "DrRacket は自動保存ファイルを検出しました。自動保存ファイルには、未保存の作業結果が含まれている可能性があります。")
-
-  (autosave-recovered! "復元しました！") ;; status of an autosave file
-  (autosave-deleted "削除しました")       ;; status of an autosave file
-
-  (autosave-error-deleting "~a\nを削除中にエラーが発生しました。\n~a") ;; first is a filename, second is an error message from mz.
-  (autosave-delete-button "削除")
-  (autosave-delete-title "削除")  ;; title of a dialog asking for deletion confirmation
-  (autosave-done "Done")
-
-  ;; appears in the file dialog
-  (autosave-restore-to-where? "自動保存ファイルを保存する場所を選択してください。")
-
-
- ;;; file modified warning
- (file-has-been-modified
-  "このファイルは、前回保存された後に変更されています。変更を上書きしますか？")
- (overwrite-file-button-label "上書き")
-
- (definitions-modified
-  "定義テキストがファイルシステム上で変更されました。定義テキストを保存するか復元してください。")
- (drscheme-internal-error "DrRacket 内部エラー")
-
- ;;; tools
- (invalid-tool-spec "コレクション ~a の info.rkt ファイルに記述されているツール仕様が不正です。文字列か空でない文字列リストでなければなりませんが、次の値が記述されています: ~e")
- (error-invoking-tool-title "ツール ~s を起動時にエラーが発生しました: ~s")
- (tool-tool-names-same-length
-  "expected `tool-names' and `tools' to be lists of the same length, in info.rkt file for ~s, got ~e and ~e")
- (tool-tool-icons-same-length
-  "expected `tool-icons' and `tools' to be lists of the same length, in info.rkt file for ~s, got ~e and ~e")
- (tool-tool-urls-same-length
-  "expected `tool-urls' and `tools' to be lists of the same length, in info.rkt file for ~s, got ~e and ~e")
- (error-getting-info-tool
-  "~s の info.rkt をロード時にエラーが発生しました")
- (tool-error-phase1 "ツール ~s のフェーズ 1 でエラーが発生しました: ~s")
- (tool-error-phase2 "ツール ~s のフェーズ 2 でエラーが発生しました: ~s")
-
-
- ;;; define popup menu
- (end-of-buffer-define "<< バッファ終端 >>")
- (sort-by-name "名前で並び替え")
- (sort-by-position "ファイル内の位置で並び替え")
- (no-definitions-found "<< 定義がありません >>")
- (jump-to-defn "~a の定義に移動")
-
- (recent-items-sort-by-age "日時で並び替え")
- (recent-items-sort-by-name "名前で並び替え")
-
- ;;; view menu
- (hide-definitions-menu-item-label "定義を非表示(&D)")
- (show-definitions-menu-item-label "定義を表示(&D)")
- (definitions-menu-item-help-string "定義ウィンドウを表示/非表示します")
- (show-interactions-menu-item-label "対話を表示(&I)")
- (hide-interactions-menu-item-label "対話を非表示(&I)")
- (interactions-menu-item-help-string "対話ウィンドウを表示/非表示します")
- (toolbar "ツールバー")
- (toolbar-on-top "ツールバーを上側に表示する")
- (toolbar-on-left "ツールバーを左側に表示する")
- (toolbar-on-right "ツールバーを右側に表示する")
- (toolbar-hidden "ツールバーを非表示にする")
-
- ;;; file menu
- (save-definitions-as "定義に名前を付けて保存(&A)...")
- (save-definitions "定義の保存")
- (print-definitions "定義を印刷...")
- (about-drscheme "DrRacketについて")
- (save-other "その他の保存")
- (save-definitions-as-text "定義をテキストに保存...")
- (save-interactions "対話の保存")
- (save-interactions-as "対話に名前を付けて保存...")
- (save-interactions-as-text "対話をテキストに保存...")
- (print-interactions "対話を印刷...")
- (new-tab "新規タブ")
- (close-tab "タブを閉じる") ;; must not have any &s in it.
- (close-tab-amp "タブを閉じる(&C)") ;; like close-tab, but with an ampersand on the same letter as the one in close-menu-item
-
- ;;; edit-menu
- (split-menu-item-label "分割(&S)")
- (collapse-menu-item-label "分割解除(&O)")
-
- ;;; language menu
- (language-menu-name "言語(&L)")
-
- ;;; scheme-menu
- (scheme-menu-name "Ra&cket")
- (execute-menu-item-label "実行")
- (execute-menu-item-help-string "定義ウィンドウのプログラムを再開始します")
- (ask-quit-menu-item-label "プログラムを停止しますか？")
- (ask-quit-menu-item-help-string "現在の式評価のプライマリ スレッドを停止するには break-thread を使用してください")
- (force-quit-menu-item-label "プログラムを強制終了します")
- (force-quit-menu-item-help-string "現在の式評価を強制終了するには custodian-shutdown-all を使用してください")
- (limit-memory-menu-item-label "メモリを制限する...")
- (limit-memory-msg-1 "ここで指定したメモリ制限値は、プログラムを次回に実行するときに有効になります。")
- (limit-memory-msg-2 "制限値は 8MB 以上にしてください。")
- (limit-memory-unlimited "制限しない")
- (limit-memory-limited "制限する")
- (limit-memory-megabytes "MB")
- (clear-error-highlight-menu-item-label "エラー強調表示を消去")
- (clear-error-highlight-item-help-string "ピンク色のエラー強調表示を消去します")
- (reindent-menu-item-label "再インデント(&R)")
- (reindent-all-menu-item-label "すべてを再インデント(&A)")
- (semicolon-comment-out-menu-item-label "セミコロンでコメントアウト(&C)")
- (box-comment-out-menu-item-label "ボックスでコメントアウト(&C)")
- (uncomment-menu-item-label "コメント解除(&U)")
-
- (convert-to-semicolon-comment "セミコロン コメントに変換")
-
- ;;; executables
- (create-executable-menu-item-label "実行ファイルの作成...")
- (create-executable-title "実行ファイルの作成")
- (must-save-before-executable "実行ファイルを作成する前に、プログラムを保存してください。")
- (save-a-mred-launcher "GRacket ランチャの保存")
- (save-a-mzscheme-launcher "Racket ランチャの保存")
- (save-a-mred-stand-alone-executable "GRacket スタンドアロン実行ファイルの保存")
- (save-a-mzscheme-stand-alone-executable "Racket スタンドアロン実行ファイルの保存")
- (save-a-mred-distribution "GRacket 配布物の保存")
- (save-a-mzscheme-distribution "Racket 配布物の保存")
-
- (definitions-not-saved "定義ウィンドウが保存されていません。実行ファイルでは定義ウィンドウの最新の保存が使われます。よろしいですか？")
- ;; The "-explanatory-label" variants are the labels used for the radio buttons in
- ;;  the "Create Executable..." dialog for the "(module ...)" language.
- (launcher "ランチャ")
- (launcher-explanatory-label "Launcher (for this machine only, runs from source)")
- (stand-alone "スタンドアロン")
- (stand-alone-explanatory-label "Stand-alone (for this machine only, run compiled copy)")
- (distribution "Distribution")
- (distribution-explanatory-label "Distribution (to install on other machines)")
- (executable-type "Type")
- (executable-base "Base")
- (filename "ファイル名: ")
- (create "作成")
- (please-specify-a-filename "作成するファイル名を指定してください。")
- (~a-must-end-with-~a
-  "~a のファイル名\n\n  ~a\n\n は不正です。ファイル名の末尾は \".~a\" でなければなりません。")
- (macosx-executables-must-end-with-app
-  "ファイル名\n\n  ~a\n\n は不正です。MacOS X では実行ファイルは末尾が .app のディレクトリでなければなりません。")
- (warning-directory-will-be-replaced
-  "警告: ディレクトリ:\n\n  ~a\n\n を置換します。よろしいですか？")
-
- (distribution-progress-window-title "配布物作成の進行状況")
- (creating-executable-progress-status "配布物のための実行ファイルを作成しています...")
- (assembling-distribution-files-progress-status "配布物のファイルをまとめています...")
- (packing-distribution-progress-status "配布物を展開しています...")
-
- (create-servlet "サーブレットの作成...")
-
- ; the ~a is a language such as "module" or "algol60"
- (create-servlet-unsupported-language
-  "言語 ~a ではサーブレットの作成はできません。")
-
- ;;; buttons
- (execute-button-label "実行")
- (save-button-label "保存")
- (break-button-label "停止")
-
- ;;; search help desk popup menu
- (search-help-desk-for "\"~a\" をヘルプデスクで検索")
- (exact-lucky-search-help-desk-for "\"~a\" をヘルプデスクでラッキー検索 (正確に一致するもの)")
-
- ;; collapse and expand popup menu items
- (collapse-sexp "S-式を縮小")
- (expand-sexp "S-式を展開")
-
- ;;; fraction dialog
- (enter-fraction "分数を入力してください")
- (whole-part "整数部")
- (numerator "分子")
- (denominator "分母")
- (insert-number/bad-whole-part "整数でなければなりません。")
- (insert-number/bad-numerator "分子は非負の整数でなければなりません。")
- (insert-number/bad-denominator "分母は正の整数でなければなりません。")
- (insert-fraction-menu-item-label "分数を挿入...")
-
- ;; number snip popup menu
- (show-decimal-expansion "小数で表示")
- (show-mixed-fraction-view "帯分数で表示")
- (show-improper-fraction-view "仮分数で表示")
- (show-more-decimal-places "小数の桁数を増やす")
-
- ;;; Teachpack messages
- (select-a-teachpack "ティーチパックの選択")
- (clear-teachpack "ティーチパック ~a を消去")
- (teachpack-error-label "DrRacket - ティーチパック エラー")
- (teachpack-didnt-load "ティーチパック ファイル ~a は、正しくロードされませんでした。")
- (add-teachpack-menu-item-label "ティーチパックの追加...")
- (clear-all-teachpacks-menu-item-label "すべてのティーチパックを消去")
- (drscheme-teachpack-message-title "DrRacket ティーチパック")
- (already-added-teachpack "ティーチパック ~a はすでに追加されています")
-
-  ; ~a is filled with the teachpack's name; the message appears in the teachpack selection dialog when a user installs a new teachpack
-  (compiling-teachpack "ティーチパック ~a をコンパイルしています ...")
-  (teachpack-pre-installed "プレインストール済みのティーチパック")
-  (teachpack-user-installed "ユーザーがインストールしたティーチパック")
-  (add-teachpack-to-list... "ティーチパックをリストに追加する...")
-  (teachpack-already-installed "'~a' という名前のティーチパックは既にインストールされています。上書きしますか？")
-  ; ~a is filled with a list of language names. Each name is separated by a newline and is indented two spaces (no commas, no 'and')
-  (teachpacks-only-in-languages "ティーチパックは次の言語でのみ使用可能です: ~a")
-
-
- ;;; Language dialog
- (introduction-to-language-dialog
-  "言語を選択してください。ほとんどの入門コースの学生は、既定の言語を使うとよいでしょう。")
- (language-dialog-title "言語の選択")
- (case-sensitive-label "大小文字の区別")
- (output-style-label "出力形式")
- (constructor-printing-style "コンストラクタ スタイル")
- (quasiquote-printing-style "擬似クォート スタイル")
- (write-printing-style "write スタイル")
- (print-printing-style "print スタイル")
- (sharing-printing-label "値の表示に shared 構文を使う (値の共有構造を表示する)")
- (use-pretty-printer-label "値を表示するときに改行を挿入する")
- (input-syntax "入力の構文")
- (dynamic-properties "実行時のオプション") ;; "Dynamic Properties" の訳だが、これでいいか？
- (output-syntax "出力の構文")
-  (teachpacks "ティーチパック") ;; label in the language dialog for the teaching languages
-  (teachpacks-none "<< なし >>") ;; shows up under the previous string, when there are no teachpacks
- (no-debugging-or-profiling "デバッグもプロファイリングもしない")
- (debugging "デバッグ")
- (debugging-and-profiling "デバッグとプロファイリング")
- (test-coverage "構文上のテストスイート カバレージ")
- (show-details-button-label "詳細を表示")
- (hide-details-button-label "詳細を隠す")
- (choose-language-menu-item-label "言語の選択...")
- (revert-to-language-defaults "言語の既定値に戻す")
- (fraction-style "分数のスタイル")
- (use-mixed-fractions "帯分数")
- (use-repeating-decimals "循環小数")
- (decimal-notation-for-rationals "有理数を10進数で表示する")
- (enforce-primitives-group-box-label "初期束縛")
- (enforce-primitives-check-box-label "初期束縛の再定義を禁止する")
- (automatically-compile? "ソースファイルを自動的にコンパイルしますか？")
-
-  ; used in the bottom left of the drscheme frame
-  ; used the popup menu from the just above; greyed out and only
-  ; visible when some languages are in the history
-  (recent-languages "最近使用した言語:")
-  ; shows up in bottom-left programming language menu popup, when no langs are recorded
-  (no-recently-chosen-languages "最近使用した言語はありません")
-
- ;; startup wizard screen language selection section
- (please-select-a-language "言語を選択してください")
-
-
- ;;; languages
- (beginning-student "Beginning Student")
- (beginning-one-line-summary "定義, 条件式, 構造体, 定数, プリミティブ")
- (beginning-student/abbrev "Beginning Student with List Abbreviations")
- (beginning/abbrev-one-line-summary "Beginner で、REPL でリスト スタイルの表示を行う")
- (intermediate-student "Intermediate Student")
- (intermediate-one-line-summary "Beginner ＋ レキシカル スコープ")
- (intermediate-student/lambda "Intermediate Student with lambda")
- (intermediate/lambda-one-line-summary "Intermediate ＋ 高階関数")
- (advanced-student "Advanced Student")
- (advanced-one-line-summary "Intermediate ＋ lambda と mutation")
- (how-to-design-programs "How to Design Programs") ;; should agree with MIT Press on this one...
- (pretty-big-scheme "Pretty Big")
- (pretty-big-scheme-one-line-summary "syntax と HtDP 言語の関数を追加")
- (pretty-big-scheme-one-line-summary "HtDP 言語, mzscheme, mred/mred の構文と関数を追加")
- (r5rs-language-name "R5RS")
- (r5rs-one-line-summary "純粋な R5RS")
- (expander "Expander")
- (expander-one-line-summary "式を評価するのではなく展開する")
- (legacy-languages "レガシーな言語")
- (teaching-languages "学習用の言語")
- (experimental-languages "実験的な言語")
-  (initial-language-category "初期言語")
-  (no-language-chosen "言語が選択されていません")
-
- ;(module-language-one-line-summary "実行するとモジュールのコンテキスト内で REPL を作成する。モジュールで宣言された言語を含む。")
-  (module-language-auto-text "#lang 行を自動的に追加する") ;; shows up in the details section of the module language
-
-  ;;; from the `not a language language' used initially in drscheme.
-  (must-choose-language "DrRacket は、プログラミング言語を選択しなければプログラムを実行できません。")
-
-  ; next two appear before and after the name of a text book (which will be in italics)
-  (using-a-textbook-before "")
-  (using-a-textbook-after " を読みながら？")
-
-  ; next two are before and after a language
-  (start-with-before "")
-  (start-with-after "")
-
-  (seasoned-plt-schemer? "経験豊かな PLT Scheme のユーザーですか？")
-  (looking-for-standard-scheme? "標準的な Scheme をお探しですか？")
-
-  ; the three string constants are concatenated together and the middle
-  ; one is hyperlinked to the dialog that suggests various languages
-  (get-guidance-before "メニューから [言語]-[言語の選択] を選択するか、または、")
-  (get-guidance-during "ガイド")
-  (get-guidance-after "を参照してください。")
-
- ;;; debug language
- (unknown-debug-frame "[unknown]")
- (backtrace-window-title "バックトレース - DrRacket")
- (files-interactions "~a's interactions") ;; filled with a filename
- (current-interactions "interactions")
- (current-definitions "definitions")
- (mzscheme-w/debug "Textual (MzScheme, R5RS を含む)")
- (mzscheme-one-line-summary "PLT による Scheme 処理系")
- (mred-w/debug "Graphical (MrEd, MzScheme を含む)")
- (mred-one-line-summary "GUI サポートを MzScheme に追加")
-
- ;; profiling
- (profiling-low-color "低度")
- (profiling-high-color "高度")
- (profiling-choose-low-color "低度のカラーを選択してください")
- (profiling-choose-high-color "高度のカラーを選択してください")
- (profiling "プロファイル")
- (profiling-example-text "(define (whee) (whee))")
- (profiling-color-config "プロファイルのカラー範囲")
- (profiling-scale "プロファイルのカラー尺度")
- (profiling-sqrt "平方根")
- (profiling-linear "線型")
- (profiling-square "二乗")
- (profiling-number "呼び出しの回数")
- (profiling-time "累積時間")
- (profiling-update "プロファイルの更新")
- (profiling-col-percent-time "% Time")
- (profiling-col-function "関数")
- (profiling-col-time-in-msec "ミリ秒")
- (profiling-col-calls "Calls")
- (profiling-show-profile "プロファイルを表示")
- (profiling-hide-profile "プロファイルを非表示")
- (profiling-unknown-src "<< unknown >>")
- (profiling-no-information-available "プロファイル情報がありません。お使いの言語でプロファイリングを有効にし、プロファイル対象のプログラムを実行してください。")
- (profiling-clear? "定義ウィンドウを書き換えると、プロファイル情報が無効になります。よろしいですか？")
-
- ;; test coverage
- (test-coverage-clear? "定義ウィンドウを書き換えると、テスト カバレージ情報が無効になります。よろしいですか？")
- (test-coverage-clear-and-do-not-ask-again "「はい」を選択し、今後尋ねないようにする")
- (test-coverage-ask? "テスト カバレージを消去するときは、確認を行う")
-
- ;; tracing
- (tracing-enable-tracing "トレースを有効にする")
- (tracing-show-tracing-window "トレースを表示")
- (tracing-hide-tracing-window "トレースを非表示")
- (tracing-tracing-nothing-to-show "トーレス結果がありません。(お使いの言語でトレースがサポートされていることを確認し、トレースを有効にしてください。)")
-
- ;;; repl stuff
- (evaluation-terminated "評価が終了しました。")
- (evaluation-terminated-explanation
-  "評価スレッドはもう実行されていませんので、次に実行するまでは評価は行われません。")
-
-  ; The next three constants show up in the same dialog as the above evaluation-terminated string
-  ; constants.
-  ; The first two show up only when the user calls 'exit' (possibly with a status code).
-  ; The third shows up when the program runs out of memory.
-  (exited-successfully "正常に終了しました。")
-  (exited-with-error-code "エラーコード ~a で終了しました。") ;; ~a is filled in with a number between 1 and 255
-  (program-ran-out-of-memory "このプログラムはメモリを使い切りました。")
- (last-stack-frame "最後のスタックフレームを表示する")
- (last-stack-frames "最後の  ~a スタックフレームを表示する")
- (next-stack-frames "次の ~a スタックフレームを表示する")
-
- ;;; welcoming message in repl
- (language "言語")
- (custom "カスタム")
- (teachpack "ティーチパック")
- (welcome-to "ようこそ")
- (version "バージョン")
-
- ;;; kill evaluation dialog
- (kill-evaluation? "評価を強制終了しますか？")
- (just-break "Just Break")
- (kill "強制終了")
- (kill? "強制終了？")
-
- ;;; version checker
- (version:update-menu-item   "アップデートの確認...")
- (version:update-check       "アップデートの確認") ; dialog title, with the next line
- (version:connecting-server  "Racket バージョン サーバーに接続しています")
- (version:results-title      "Racket バージョンの確認")
- (version:do-periodic-checks "Racket の新しいバージョンを定期的に確認してください")
- (version:take-me-there      "ダウンロードする") ; ...to the download website
- ;; the next one can appear alone, or followed by a comma and the one after that
- (version:plt-up-to-date     "この Racket バージョンは最新です")
- (version:but-newer-alpha    "しかし、これより新しいアルファ リリースが存在します")
- ;; This is used in this context: "Racket vNNN <<<*>>> http://download..."
- (version:now-available-at   "が次のサイトから入手できます")
-
- ;; insert menu
- (insert-menu "挿入(&I)")
-
- ;; large semi colon letters
- (insert-large-letters... "大きな文字を挿入...")
- (large-semicolon-letters "大きなセミコロン")
- (text-to-insert "挿入する文字列")
-
- (module-browser-filename-format "完全なファイル名: ~a (~a 行)")
- (module-browser-root-filename "ルート ファイル名: ~a")
- (module-browser-font-size-gauge-label "フォント サイズ")
- (module-browser-progress-label "モジュールの概要の進行状況")
- (module-browser-adding-file "ファイルを追加しています: ~a...")
- (module-browser-laying-out-graph-label "グラフを配置しています")
- (module-browser-open-file-format "開く ~a")
- (module-browser "モジュール ブラウザ") ;; frame title
- (module-browser... "モジュール ブラウザ...") ;; menu item title
- (module-browser-error-expanding "プログラムを展開中にエラーが発生しました:\n\n~a")
- (module-browser-show-lib-paths "(lib ..) のパスでロードされたファイルを表示する")
- (module-browser-progress "モジュール ブラウザ: ~a") ;; prefix in the status line
- (module-browser-compiling-defns "モジュール ブラウザ: 定義をコンパイル中です")
- (module-browser-show-lib-paths/short "必要なライブラリを含める") ;; check box label in show module browser pane in drscheme window.
- (module-browser-refresh "更新") ;; button label in show module browser pane in drscheme window.
- (module-browser-refresh "再表示") ;; button label in show module browser pane in drscheme window.
-; (module-browser-only-in-plt-and-module-langs
-;  "モジュール ブラウザは PLT 言語、または、モジュール言語のプログラム (あるいは、それらの言語のモジュールを持つプログラム) でのみ利用可能です。")
- (module-browser-name-length "名前の長さ")
- (module-browser-name-short "短い")
- (module-browser-name-medium "普通")
- (module-browser-name-long "長い")
- (module-browser-open-all "ここに表示されているすべてのファイルを開く")
-
- (happy-birthday-matthias "お誕生日おめでとう, Matthias!")
- (happy-birthday-matthew "お誕生日おめでとう, Matthew!")
- (happy-birthday-shriram "お誕生日おめでとう, Shriram!")
-
- (mrflow-using-default-language-title "既定で使用する言語")
- (mrflow-using-default-language "現在使用している言語には、そのプリミティブ用の型テーブルがありません。代替として R5RS Scheme を使います。")
- (mrflow-button-title "解析")
- ;(mrflow-unknown-style-delta-error-title "Unknown Box Style Delta")
- ;(mrflow-unknown-style-delta-error "Unknown box style delta: ~a")
- (mrflow-popup-menu-show-type "Show Type")
- (mrflow-popup-menu-hide-type "Hide Type")
- (mrflow-popup-menu-show-errors "表示エラー")
- (mrflow-popup-menu-hide-errors "非表示エラー")
- ;(mrflow-read-exception-title "Read Exception")
- ;(mrflow-read-exception "Read exception: ~a")
- ;(mrflow-syntax-exception-title "Syntax Exception")
- ;(mrflow-syntax-exception "Syntax exception: ~a")
- ;(mrflow-unknown-exception-title "Unknown Exception")
- ;(mrflow-unknown-exception "Unknown exception: ~a")
- ;(mrflow-language-primitives-error-title "Language Primitives Error")
- ;(mrflow-language-primitives-error "Wrong filename for language primitives types table: ~a")
-
- (snips-and-arrows-popup-menu-tack-all-arrows "Tack All Arrows")
- (snips-and-arrows-popup-menu-untack-all-arrows "Untack All Arrows")
- (snips-and-arrows-user-action-disallowed-title "User Changes Currently Disallowed")
- (snips-and-arrows-user-action-disallowed "User changes are disallowed in editors that contain tool-inserted snips.  Hide all snips before modifying the content of the editor.")
- ;(snips-and-arrows-changing-terms-warning-title "Changing terms will be undoable")
- ;(snips-and-arrows-changing-terms-warning "Changing terms in an editor containing snips cannot be undone.  You can either cancel this action, remove the snips, and try the change again, or you can continue with the change, in which case the change will not be undoable (all others changes made before and afterward will still be undoable though).")
- (snips-and-arrows-hide-all-snips-in-editor "Hide all snips in editor")
-
- (xml-tool-insert-xml-box "XML ボックスを挿入")
- (xml-tool-insert-scheme-box "Racket ボックスを挿入")
- (xml-tool-insert-scheme-splice-box "Racket Splice ボックスを挿入")
- (xml-tool-xml-box "XML ボックス")
- (xml-tool-scheme-box "Racket ボックス")
- (xml-tool-scheme-splice-box "Racket Splice ボックス")
- (xml-tool-switch-to-scheme "Racket ボックスに切り替え")
- (xml-tool-switch-to-scheme-splice "Racket Splice ボックスに切り替え")
- (xml-tool-eliminate-whitespace-in-empty-tags
-  "空タグ内の空白を削除")
- (xml-tool-leave-whitespace-alone
-  "空白を残す")
-
- (show-recent-items-window-menu-item "最近開いたファイルを別ウィンドウに表示する")
- (show-recent-items-window-label "最近開いたファイル")
- (number-of-open-recent-items "[最近開いたファイル] に表示する数")
- (switch-anyway "Switch File Anyway")
-
- (stepper-program-has-changed "警告: プログラムが変更されました。")
- (stepper-program-window-closed "警告: プログラム ウィンドウが閉じました。")
-
- (stepper-name "ステッパ")
- (stepper-language-level-message "ステッパは \"~a\" 言語に対しては動作しません")
- (stepper-button-label "ステップ")
- (stepper-previous-application "アプリケーション")
- (stepper-previous "ステップ")
- (stepper-next "ステップ")
- (stepper-next-application "アプリケーション")
- (stepper-jump-to-beginning "ホーム")
- (stepper-jump-to-end "終端まで")
-
- (debug-tool-button-name "デバッグ")
-
- (dialog-back "戻る")
-
- ;; warnings about closing a drscheme frame when the program
- ;; might still be doing something interesting
- (program-is-still-running "定義ウィンドウ内のプログラムは実行中です。強制的に閉じますか？")
-  (program-has-open-windows "定義ウィンドウ内のプログラムはウィンドウを開いています。このウィンドウを強制的に閉じますか？")
-
-  ;; ml-command-line-arguments is for the command line arguments
-  ;; label in the module language details in the language dialog.
-  (ml-command-line-arguments "コマンドライン引数 (文字列ベクタの読み取り構文で指定)")
-
-  ;; ml-cp names are all for the module language collection path
-  ;; configuration. See the details portion of the language dialog
-  ;; for the module language (at the bottom).
-  (ml-cp-default-collection-path "<<既定のコレクション パス>>")
-
-  ;; in std get-directory
-  (ml-cp-choose-a-collection-path "コレクション パスを選択してください。")
-
-  ;; err msg when adding default twice
-  (ml-cp-default-already-present
-   "既定のコレクション パスはすでに存在しています。")
-
-  ;; title of this section of the dialog (possibly the word
-  ;; `Collection' should not be translated)
-  (ml-cp-collection-paths "コレクション パス")
-
-  ;; button labels
-  (ml-cp-add "追加")
-  (ml-cp-add-default "既定の追加")
-  (ml-cp-remove "削除")
-  (ml-cp-raise "上へ")
-  (ml-cp-lower "下へ")
-
-  (ml-always-show-#lang-line "モジュール言語で常に #lang 行を表示する")
-
-  ;; Profj
-  (profj-java "Java")
-  (profj-java-mode "Java モード")
-
-  (profj-beginner-lang "Beginner")
-  (profj-beginner-lang-one-line-summary "Java ライクな初級用のティーチング言語")
-  (profj-full-lang "完全")
-  (profj-full-lang-one-line-summary "Java 1.0 (一部は 1.1) のような言語")
-  (profj-advanced-lang "Advanced")
-  (profj-advanced-lang-one-line-summary "Java ライクナ上級用のティーチング言語")
-  (profj-intermediate-lang "Intermediate")
-  (profj-intermediate-lang-one-line-summary "Java ライクな中級用のティーチング言語")
-  (profj-intermediate-access-lang "Intermediate + access")
-  (profj-intermediate-access-lang-one-line-summary "Java ライクな中級用のティーチング言語 (アクセス修飾子付き)")
-  (profj-dynamic-lang "Java+dynamic")
-  (profj-dynamic-lang-one-summary "Java に動的型付け機能を付加した言語")
-
-  (profj-java-mode-color-heading "カラーの編集") ; Heading for preference to choose editing colors
-  (profj-java-mode-color-keyword "キーワード")
-  (profj-java-mode-color-string "文字列")
-  (profj-java-mode-color-literal "リテラル")
-  (profj-java-mode-color-comment "コメント")
-  (profj-java-mode-color-error "エラー")
-  (profj-java-mode-color-identifier "識別子")
-  (profj-java-mode-color-prim-type "基本型") ; Example text for built-in Java types
-  (profj-java-mode-color-default "デフォルト")
-
-  (profj-coverage-color-heading "カバレージのカラー") ; Heading for preference to choose coverage colors
-  (profj-coverage-color-covered "カバーされた式")
-
-  (profj-language-config-display-preferences "表示の環境設定") ; Heading for preferences controlling printing
-  (profj-language-config-display-style "表示のスタイル")
-  (profj-language-config-display-field "クラス + フィールド")
-  (profj-language-config-class "クラス")
-  (profj-language-config-display-array "配列の要素をすべて表示しますか？")
-  (profj-language-config-testing-preferences "テストの環境設定") ; Heading for preferences controlling test behavior
-  ;(profj-language-config-testing-enable "実行時にテスト結果を表示しますか？") ; Run should be the word found on the Run button
-  (profj-language-config-testing-coverage "テストのためのカバレージ情報を収集しますか？")
-  (profj-language-config-support-test-language "Support test Language extension?")
-  (profj-language-config-testing-check "check 式を使用しますか？") ; check should not be translated
-  (profj-language-config-classpath "クラスパス")
-  (profj-language-config-choose-classpath-directory "クラスパスに追加するディレクトリを選択してください")
-  (profj-language-config-classpath-display "現在のクラスパスを表示") ; Button label to print the current classpath
-
-  (profj-test-name-close-to-example "クラス ~a の名前が Example に近いフレーズを含んでいます。")
-  (profj-test-name-example-miscapitalized "クラス ~a の名前の大小文字が誤っています。")
-
-   ;; Close testing window and do not run test cases any more
-  ;(profj-test-results-close-and-disable "テストを閉じて無効にする")
-  ;; Hide docked testing window and do not run test cases any more
-  ;(profj-test-results-hide-and-disable "テストを非表示にして無効にする")
-  ;Renamed below
-  ;(profj-test-results-window-title "テスト結果")
-
-  (profj-unsupported "サポートされていません")
-  (profj-executables-unsupported "申し訳ありません。現バージョンでは Java の実行ファイルはサポートされていません")
-
-  (profj-convert-to-text-comment "テキスト コメントに変換")
-  (profj-convert-to-comment "コメントに変換")
-
-  (profj-executing-main "main を実行しています")
-
-  (profj-insert-java-comment-box "Java コメント ボックスを挿入")
-  (profj-insert-java-interactions-box "Java 対話ボックスを挿入")
-
-  ;;The Test engine tool
-  ;;
-  (test-engine-window-title "テスト結果")
-  ;;Following two appear in View menu, attach and free test report window from DrRacket frame
-  (test-engine-dock-report "テスト結果を切り離して表示する")
-  (test-engine-undock-report "テスト結果を統合して表示する")
-  ;;Following two appear in Racket (Java, etc) menu, cause Tests to be Run automatically or not
-  (test-engine-enable-tests "テストを有効にする")
-  (test-engine-disable-tests "テストを無効にする")
-  
-  (profjWizward-insert-java-class "Java クラスを挿入")
-  (profjWizard-insert-java-union "Java Union を挿入")
-
-  ;; The Test Suite Tool
-  ;; Errors
-  (test-case-empty-error "空のテストケース")
-  (test-case-too-many-expressions-error "テストケース内に式が多過ぎます。")
-  ;; DrRacket window menu items
-  (test-case-insert "テストケースを挿入")
-  (test-case-disable-all "すべてのテストケースを無効にする")
-  (test-case-enable-all "すべてのテストケースを有効にする")
-
-  ;; NOTE: The following string constants are labels of the test-case fields. The width
-  ;;       of the field is determined by the length of the longest of the following three words.
-  ;;       if the words are too long the test case will take up too much horizontal room and
-  ;;       not look very good.
-  ;; This string is the label of the expression that is being tested in a test case.
-  (test-case-to-test "Test")
-  ;; This string is the label of the expression that is the expected value of the to-test expression.
-  (test-case-expected "Should be")
-  ;; This string is the label of the actual result of the to test expression.
-  (test-case-actual "Actual")
-  (test-case-predicate "Predicate")
-  (test-case-should-raise "Should Raise")
-  ;; The label of a field of the test-case that describes the expected error message of a test case
-  (test-case-error-message "エラーメッセージ")
-
-  (test-case-menu-title "テストケース")
-  (test-case-switch-to-error-box "Switch to Error Test Box")
-  (test-case-switch-to-nonerror-box "Switch to Nonerror Test box")
-  (test-case-collapse "テストケースを縮小")
-  (test-case-show-actual "実際の値を表示する")
-  (test-case-enable "テストケースを有効にする")
-  (test-case-show-predicate "Show Predicate")
-  (test-case-show-error-message "エラーメッセージを表示する")
-  (test-case-convert-to-text "テキストに変換する")
-
-  ;; Profj Boxes
-  (profjBoxes-empty-error "Empty interaction")
-  (profjBoxes-too-many-expressions-error "ボックスに式が多過ぎです")
-  (profjBoxes-interactions-label "Interactions")
-  (profjBoxes-bad-java-id-error "不正な形式の Java ID です")
-  (profjBoxes-examples-label "例")
-  (profjBoxes-add-new-example-button "例を追加")
-  (profjBoxes-type "Type")
-  ;; The Java identifier of an example of data
-  (profjBoxes-name "名前")
-  (profjBoxes-value "値")
-  (profjBoxes-insert-java-examples "Insert Java Examples")
-  (profjBoxes-insert-java-interactions "Insert Java Interactions")
-
-  ;; Slideshow
-  (slideshow-hide-picts "Show Nested Boxes")
-  (slideshow-show-picts "Show Picts")
-  (slideshow-cannot-show-picts "Cannot show picts; run program to cache sizes first")
-  (slideshow-insert-pict-box "Pict ボックスを挿入")
-
-  ;; GUI Tool
-  (gui-tool-heading "GUI Tool")
-  (gui-tool-before-clicking-message "ツール アイコンをクリックする前に、[Special] メニューの [Insert GUI] からルート GUI 項目を挿入するか、すでに挿入されている GUI を選択してください。")
-  (gui-tool-show-gui-toolbar "GUI ツールバーを表示")
-  (gui-tool-hide-gui-toolbar "GUI ツールバーを非表示")
-  (gui-tool-insert-gui "GUI を挿入")
-
-  ;; contract violation tracking
-  
-  ; tooltip for new planet icon in drscheme window (must have a planet violation logged to see it)
-  (show-planet-contract-violations "PLaneT の規約違反を表示する")
-
-  ; buttons in the dialog that lists the recorded bug reports
-  (bug-track-report "File Ticket")
-  (bug-track-forget "Forget")
-  (bug-track-forget-all "Forget All")
-    
-  ;; planet status messages in the bottom of the drscheme window; the ~a is filled with the name of the package
-  (planet-downloading "PLaneT: ダウンロード中 ~a...")
-  (planet-installing "PLaneT: インストール中 ~a...")
-  (planet-finished "PLaneT: 完了 ~a.")
-  (planet-no-status "PLaneT") ;; this can happen when there is status shown in a different and then the user switches to a tab where planet hasn't been used
-  
-  ;; string normalization. To see this, paste some text with a ligature into DrRacket
-  ;; the first three strings are in the dialog that appears. The last one is in the preferences dialog
-  (normalize "Normalize")
-  (leave-alone "Leave alone")
-  (normalize-string-info "The string you pasted contains ligatures or other non-normalized characters. Normalize them?")
-  (normalize-string-preference "Normalize pasted strings")
-  (ask-about-normalizing-strings "Ask about normalizing strings")
-  
-  )
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/korean-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/korean-string-constants.rkt
deleted file mode 100644
index d7734e2370..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/korean-string-constants.rkt
+++ /dev/null
@@ -1,1470 +0,0 @@
-;;
-;; Racket Korean Translation Team <racket-korean-translation@googlegroups.com>
-;; or you can touch us from http://www.code-share.org
-;;
-;; Translated by: Jae sung Chung <abattery@gmail.com>,
-;;                Jieung Kim <je1004k@gmail.com>,
-;;                Yujeong Cho <mayflower418@gmail.com>,
-;;                Sung Gyeong Bae <imai0917@gmail.com>
-;;
-(module korean-string-constants "string-constant-lang.rkt"
- (is-this-your-native-language "한글을 사용하시겠습니까?")
-
- (are-you-sure-you-want-to-switch-languages
-  "GUI 사용 언어를 변경하기 위해 DrRacket을 다시 시작합니다. 변경하시겠습니까?")
-
- (interact-with-drscheme-in-language "한글로 DrRacket 사용하기")
-
- ;; these two should probably be the same in all languages excepet English.
- ;; they are the button labels (under macos and windows, respectively)
- ;; that go the with the string above.
- (accept-and-quit "확인하고 닫기")
- (accept-and-exit "확인하고 종료")
- 
- ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
- (plt "PLT")
- (drscheme "DrRacket")
- (drracket "DrRacket")
- (ok "확인")
- (cancel "취소")
- (abort "중단")
- (untitled "제목없음")
- (untitled-n "제목없음 ~a")
- (warning "경고")
- (error "오류")
- (close "닫기") ;; as in, close an open window. must match close-menu-item
-                 ;; in the sense that, when the &s have been stripped from
-                 ;; close-menu-item, it must be the same string as this.
- (stop "중지")   
- (&stop "중지 (&S)") ;; for use in button and menu item labels, with short cut.
- (are-you-sure-delete? "정말 ~a (을)를 삭제하시겠습니까?") ;; ~a is a filename or directory name
- (ignore "무시")
- (revert "복구")
-
- ;; label for a generic check box, often supported on dialogs
- ;; that ask a binary choice of the user. If checked, the
- ;; dialog isn't going to be shown again.
- ;; One version for always using the current choice:
- (dont-ask-again-always-current "다시 묻지 않기 (항상 현재 설정을 사용합니다)")
- ;; One generic version (ie, on the Quit DrRacket dialog)
- (dont-ask-again                "다시 묻지 않기")
-
- ;;; important urls
- (web-materials "관련 사이트") ;; menu item title
- (tool-web-sites "참고 사이트")   ;; menu item title
- (plt-homepage "Racket")
- (pbd-homepage "Program by Design")
-
- ;;; bug report form
- (cancel-bug-report? "오류 보고를 취소하시겠습니까?")
- (are-you-sure-cancel-bug-report?
-  "정말로 이 오류 보고를 취소하시겠습니까?")
- (bug-report-form "오류 보고 형식")
- (bug-report-field-name "이름")
- (bug-report-field-email "이메일")
- (bug-report-field-summary "요약")
- (bug-report-field-severity "심각 정도")
- (bug-report-field-class "분류")
- (bug-report-field-description "설명")
- (bug-report-field-reproduce1 "재구현")
- (bug-report-field-reproduce2 "방법")
- (bug-report-field-environment "환경")
- (bug-report-field-docs-installed "설치된 문서")
- (bug-report-field-collections "Collections")
- (bug-report-field-human-language "자연어")
-  (bug-report-field-memory-use "메모리 사용량")
- (bug-report-field-version "버전")
- (bug-report-synthesized-information "세부 정보")  ;; dialog title
- (bug-report-show-synthesized-info "세부 정보 보기")
- (bug-report-submit "제출")
- (bug-report-submit-menu-item "오류 보고 제출...") ;; in Help Menu (drs & help desk)
- (error-sending-bug-report "오류 보고 보내기 오류")
- (error-sending-bug-report-expln "오류 보고 도중에 오류가 발생했습니다. 다른 인터넷 연결이 원활하다면, 다음 사이트를 방문하여:\n\n    http://bugs.racket-lang.org/\n\n 오류 보고를 온라인 형식으로
-제출하여 주십시오. 불편을 드려 죄송합니다.\n\n 오류 메세지는 다음과 같습니다 :\n~a")
- (illegal-bug-report "형식에 맞지 않는 오류 보고")
- (pls-fill-in-field "\"~a\" 항목을 채워 주십시오")
- (malformed-email-address "잘못된 이메일 주소")
- (pls-fill-in-either-description-or-reproduce "설명 항목 또는 재구현 방법 항목을 채워 주십시오.")
-
- ;;; check syntax
- (check-syntax "문법 검사")
- (cs-italic "기울임")
- (cs-bold "굵게")
- (cs-underline "밑줄")
- (cs-change-color "색깔 바꾸기")
- (cs-tack/untack-arrow "화살표 보기/숨기기") ;;;확인하기!
- (cs-jump-to-next-bound-occurrence "다음 참조로 이동하기")
- (cs-jump-to-binding "원래 참조로 이동하기")
- (cs-jump-to-definition "정의로 이동하기")
- (cs-error-message "오류 메세지")
- (cs-open-file "~a 열기")
- (cs-rename-var "~a 이름 바꾸기")
- (cs-rename-id "식별자 이름바꾸기")
- (cs-rename-var-to "~a 을(를) 바꿀 이름:")
- (cs-name-duplication-error "새로 만든 이름 ~s 은(는) 이미 범위 안에 존재합니다.")
- (cs-rename-anyway "무시하고 계속")
- (cs-status-init "문법 검사: 사용자 코드로 환경 초기화")
- (cs-status-coloring-program "문법 검사: 표현 색칠하기") ;확인하기
- (cs-status-eval-compile-time "문법 검사: 컴파일 시간 계산")
- (cs-status-expanding-expression "문법 검사: 표현 확장")
- (cs-status-loading-docs-index "문법 검사: 문서 목차 가져오기")
- (cs-mouse-over-import "~s 에서 가져온 ~s 묶기")
- (cs-view-docs "~a 문서 보기")
- (cs-view-docs-from "~a 에서 온 ~a")  ;; a completed version of the line above (cs-view-docs) is put into the first ~a and a list of modules (separated by commas) is put into the second ~a. Use check syntax and right-click on a documented variable (eg, 'require') to see this in use
-  
- (cs-lexical-variable "lexical 변수") ;확인하기
- (cs-set!d-variable "set!’d 변수")
- (cs-imported-variable "imported 변수")
-
- ;; mode sub-menu in the "view" menu
- (cs-check-syntax-mode "문법 검사 모드")
- (cs-mode-menu-show-my-obligations "내가 계획한 것에 대한 의무") ;확인하기
- (cs-mode-menu-show-client-obligations "남이 계획한 것에 대한 의무") ;확인하기
- (cs-mode-menu-show-syntax "문법적 분류")
-
- ;;; info bar at botttom of drscheme frame
- (collect-button-label "GC") ;garbage collector
-  (read-only "읽기 전용")
- (auto-extend-selection "자동 확장")
- (overwrite "덮어쓰기")
- (running "실행 중")
- (not-running "정지") ;확인하기. 이상
- 
- ;;; misc
- (welcome-to-something "~a 에 오신것을 환영합니다.")
- 
- ; this appears in the drscheme about box.
- (welcome-to-drscheme-version/language "DrRacket 버전 ~a, ~a에 오신것을 환영합니다.")
-
- ; these appear on subsequent lines in the `Help|Welcome to DrRacket' dialog.
- (welcome-to-drscheme "DrRacket에 환영합니다.")
-
- (goto-line "줄 이동")
- (goto-line-invalid-number
-  "~a 는 잘못된 줄 번호입니다. 줄 번호는 1과 ~a 사이여야 합니다.")
- (goto-position "위치 이동")
- (no-full-name-since-not-saved
-  "파일을 저장하지 않아 이름이 존재하지 않습니다.")
- (cannot-open-because-dne "~a(은)는 존재하지 않으므로 열 수 없습니다.")
-
-  (needs-execute-language-changed
-   "경고: 언어가 바뀌었습니다. 실행 버튼을 눌러주세요.")
-  (needs-execute-teachpack-changed
-   "경고: 배움꾸러미가 바뀌었습니다. 실행 버튼을 눌러주세요.")
-  (needs-execute-defns-edited
-   "경고: 정의창이 바뀌었습니다. 실행 버튼을 눌러주세요.")
-  
-  (editor-changed-since-srcloc-recorded
-   "저장소 기록 이후로 편집기가 바뀌었습니다. 명암처리 된 부분이 올바른 저장소와 일치하지 않을 수도 있습니다.")
-  
- (file-is-not-saved "\"~a\" 파일이 저장되지 않았습니다.")
- (save "저장")
- (close-anyway "무시하고 닫기")
- (dont-save "저장 안함")
- (clear-anyway "무시하고 초기화") ;clear? 확인하기
-
- ;; menu item title
- (log-definitions-and-interactions "정의와 대화 기록하기")
- (stop-logging "기록 중지")
- (please-choose-a-log-directory "기록을 저장할 폴더를 선택하세요")
- (logging-to "기록 중: ")
- (erase-log-directory-contents "기록 폴더 ~a의 내용을 삭제하시겠습니까?")
- (error-erasing-log-directory "기록 폴더의 내용을 삭제하는 도중에 오류가 발생했습니다.\n\n~a\n")
-
-  ;; menu items connected to the logger -- also in a button in the planet status line in the drs frame
-  (show-log "보여주기 기록하기 (&L)")
-  (hide-log "숨기기 기록하기 (&L)")
-  (logging-all "모두") ;; in the logging window in drscheme, shows all logs simultaneously
-  
- ;; modes
- (mode-submenu-label "모드")
- (racket-mode "Racket 모드")
- (scheme-mode "Scheme 모드")
- (text-mode "텍스트 모드")
-
- (scheme-mode-color-symbol "기호")
- (scheme-mode-color-keyword "키워드")
- (scheme-mode-color-comment "주석")
- (scheme-mode-color-string "문자열")
- (scheme-mode-color-constant "상수")
- (scheme-mode-color-parenthesis "괄호")
- (scheme-mode-color-error "오류")
- (scheme-mode-color-other "그 외")
- ;; the ~a is filled in with one of the above (scheme-mode-*)
- (syntax-coloring-choose-color "~a의 색상을 선택하세요")
- (preferences-colors "색상") ;; used in the preferences dialog
- 
-  ;; parenthesis color scheme string constants
-  (parenthesis-color-scheme "괄호 색상") ;; label for the choice% menu in the preferences dialog
-  (paren-color-basic-grey "기본 회색")
-  (paren-color-shades-of-gray "회색 계열")
-  (paren-color-shades-of-blue "파란색 계열")
-  (paren-color-spring "봄")
-  (paren-color-fall "가을")
-  (paren-color-winter "겨울")
-
-  
- (url: "URL:")
- (open-url... "URL 열기...")
- (open-url "URL 열기")
- (browse... "찾기...")
- (bad-url "잘못된 URL")
- (bad-url:this "잘못된 URL: ~a")
- 
- ;; Help Desk
- (help "도움말")
- (help-desk "도움말")
- (plt:hd:search "찾기")
- (plt:hd:feeling-lucky "느낌이 옴")
- (plt:hd:home "도움말 홈") 
- ; next 3 are popup menu choices in help desk search frame
- (plt:hd:search-for-keyword "키워드 입력") ;확인하기. entry?
- (plt:hd:search-for-keyword-or-index "키워드 또는 목차 입력")
- (plt:hd:search-for-keyword-or-index-or-text "키워드, 목차, 텍스트 입력")
- (plt:hd:exact-match "정확하게 일치")
- (plt:hd:containing-match "문구 포함")
- (plt:hd:regexp-match "정규 표현 일치")
- (plt:hd:find-docs-for "관련 문서 찾기:")
- (plt:hd:search-stopped-too-many-matches "[찾기 중단: 일치하는 결과가 너무 많습니다.]")
- (plt:hd:nothing-found-for " ~a의 검색 결과가 없습니다.")
- (plt:hd:and "그리고")
- (plt:hd:refresh "새로 고침")
- (plt:hd:refresh-all-manuals "모든 설명서 새로 고침")
- (plt:hd:manual-installed-date "( ~a 설치됨)")
- ; Help Desk configuration
- ;; refreshing manuals
- (plt:hd:refreshing-manuals "설명서 다시 내려받는 중")
- (plt:hd:refresh-downloading... "~a 내려받는 중...")
- (plt:hd:refresh-deleting... "~a 구버전 삭제 중...")
- (plt:hd:refresh-installing... "~a 새버전 설치 중...")
- (plt:hd:refresh-clearing-indices "저장된 목록 초기화 중")
- (plt:hd:refreshing-manuals-finished "완료.")
- (plt:hd:about-help-desk "도움말에 대해서")
- (plt:hd:help-desk-about-string
-  "도움말은 Racket 소프트웨어에 대한 정보를 제공합니다.\n\nVersion ~a\nCopyright (c) ~a-~a PLT")
- (plt:hd:help-on-help "도움말 도움")
- (plt:hd:help-on-help-details "도움말 사용에 대한 도움말은 도움말 홈페이지의 'Help Desk' 링크에 있습니다. (도움말 창 맨 위의 `Home' 버튼을 클릭하면 도움말 홈페이지로 이동합니다.)")
-  (reload "다시 불러오기") ;; refresh the page in a web browser
-  (plt:hd:ask-about-separate-browser
-   "인터넷을 여는 링크를 선택하셨습니다. 도움말 브라우저에서 보시겠습니까, 아니면 별도의 브라우저 프로그램에서 보시겠습니까?")
-  (plt:hd:homebrew-browser "도움말 브라우저") ;; choice for the above string (in a button)
-  (plt:hd:separate-browser "별도의 브라우저") ;; other choice for the above string (also in a button)
-  (plt:hd:external-link-in-help "도움말의 외부 URL")
-  (plt:hd:use-homebrew-browser "외부 URL 도움말 브라우저로 보기")
-  (plt:hd:new-help-desk "새 도움말")
-
-  ;; in the Help Desk language dialog, title on the right.
-  (plt:hd:manual-search-ordering "설명서 찾기 순서")
-  
-  ;; in the help-desk standalone font preference dialog, on a check box
-  (use-drscheme-font-size "DrRacket의 글꼴 크기 사용하기")
-  
-  ;; in the preferences dialog in drscheme there is example text for help desk font size.
-  ;; clicking the links in that text produces a dialog with this message
-  (help-desk-this-is-just-example-text
-   "이것은 글꼴 크기 예시 텍스트입니다. 링크로 이동하려면 도움말 메뉴에서 도움말를 여십시오.")
-
-  ;; this appears in the bottom part of the frame the first time the user hits `f1' 
-  ;; (assuming nothing else has loaded the documentation index first)
-  ;; see also: cs-status-loading-docs-index
-  (help-desk-loading-documentation-index "도움말: 설명서 목록 가져오는 중")
-  
- ;; Help desk htty proxy
- (http-proxy "HTTP 프록시")
- (proxy-direct-connection "직접 연결")
- (proxy-use-proxy "프록시 사용:")
- (proxy-host "호스트")
- (proxy-port "포트")
- (proxy-bad-host "잘못된 프록시 호스트")
-
- ;; browser
- (rewind-in-browser-history "뒤로")
- (forward-in-browser-history "앞으로")
- (home "홈")
- (browser "브라우저")
- (external-browser-choice-title "외부 브라우저") ; title for radio-button set
- (browser-command-line-label "명령행:") ; label for radio button that is followed by text boxes
- (choose-browser "브라우저를 선택하세요")
- (no-browser "나중에 묻기")
- (browser-cmdline-expl-line-1 "(pre-text, URL, post-text를 잘라서") ; explanatory text for dialog, line 1
- (browser-cmdline-expl-line-2 "중간에 공백 없이 명령행을 만듭니다.)") ; ... line 2. (Anyone need more lines?)
- (install? "설치하시겠습니까?")  ;; if a .plt file is found (title of dialog)
- (you-have-selected-an-installable-package "설치가능한 꾸러미를 선택하셨습니다.")
- (do-you-want-to-install-it? "꾸러미를 설치하시겠습니까?")
- (paren-file-size "(파일의 크기는 ~a 바이트입니다.)")
- (download-and-install "내려받기 && 설치") ;; button label
- (download "내려받기") ;; button label
- (save-downloaded-file/size "내려받은 파일을 (~a 바이트) 저장할 이름") ;; label for get-file dialog
- (save-downloaded-file "내려받은 파일을 저장할 이름")  ;; label for get-file dialog
- (downloading "내려받는 중") ;; dialog title
- (downloading-file... "파일 내려받는 중...")
- (package-was-installed "꾸러미를 설치하였습니다.")
- (download-was-saved "내려받은 파일을 저장하였습니다.")
-
- (install-plt-file-menu-item... ".plt 파일 설치하기")
- (install-plt-file-dialog-title ".plt 파일 설치하기")
- (install-plt-web-tab "웹")
- (install-plt-file-tab "파일")
- (install-plt-filename "파일명:")
- (install-plt-url "URL:")
- 
- ;; install plt file when opened in drscheme strings
- (install-plt-file " ~a을(를) 설치하거나 열어서 편집하시겠습니까?")
- (install-plt-file/yes "설치")
- (install-plt-file/no "편집")
-
- (plt-installer-progress-window-title "설치 진행 상황") ;; frame title
- (plt-installer-abort-installation "설치 중단") ;; button label
- (plt-installer-aborted "중단됨") ;; msg that appears in the installation window when installation is aborted
-
- ;;; about box
- (about-drscheme-frame-title "DrRacket 소개")
- 
- ;;; save file in particular format prompting.
- (save-as-plain-text "텍스트 파일로 저장하시겠습니까?")
- (save-in-drs-format "DrRacket(non-text) 형식으로 저장하시겠습니까?")
- (yes "예")
- (no "아니오")
- 
- ;; saving image (right click on an image to see the text)
-  (save-image "이미지 저장")
-  
- ;;; preferences
- (preferences "설정")
- (error-saving-preferences "설정을 저장하는 도중 오류가 발생했습니다: ~a")
- (error-saving-preferences-title "설정을 저장하는 도중 오류가 발생했습니다.")
- (steal-the-lock-and-retry "잠금을 해제하고 다시 시도하십시오") ;; in the preferences error dialog; this happens when the lockfile exists (after 3 pref writes). ;확인하기 Steal?
- (error-reading-preferences "설정을 읽던 도중 오류가 발생했습니다.")
- (prefs-file-locked "설정 파일이 잠겨있습니다(~a 파일이 존재합니다), 설정변경을 저장할 수 없습니다. 설정 변경을 취소하시겠습니까?")
- (try-again "재시도") ;; button label
- (prefs-file-still-locked "설정 파일이 여전히 잠겨있습니다(~a 파일이 존재합니다), 설정변경을 저장할 수 없습니다.")
- (scheme-prefs-panel-label "Racket")
- (warnings-prefs-panel-label "경고")
- (editor-prefs-panel-label "편집")
- (general-prefs-panel-label "일반")
- (highlight-parens "대응되는 괄호에 강조하기")
- (fixup-open-brackets "자동으로 여는 대괄호'['에 적용")
- (fixup-close-parens "자동으로 닫는 괄호에 적용") ;확인하기 parens == ')' ?, adjust?
- (flash-paren-match "대응되는 괄호 블록처리")
- (auto-save-files "파일 자동 저장")
- (backup-files "파일 백업")
- (map-delete-to-backspace "Delete 키를 Backspace 키로 설정")
- (verify-exit "종료 확인")
- (ask-before-changing-format "파일 형식을 바꾸기 전에 확인하기")
- (wrap-words-in-editor-buffers "편집기 버퍼에 있는 단어 단위로 줄 넘기기") ;확인하기!!!!!!@!!!!!!@#!@%@#^$#$#%% -_-
- (show-status-line "상태표시줄 보기")
- (count-columns-from-one "열번호를 1부터 시작")
- (display-line-numbers "버퍼에 글자 수가 아니라 행번호:줄번호로 표시");확인하기
- (show-line-and-column-numbers "행번호 && 열번호 표시") ; used for popup menu; right click on line/column box in bottom of drs window
- (show-character-offsets "글자수 보기") ; used for popup menu; right click on line/column box in bottom of drs window
- (enable-keybindings-in-menus "메뉴 단축키 사용")
- (command-as-meta "명령 키 메타로 취급") ;; macos/macos x only
- (reuse-existing-frames "새로운 파일을 열 때 기존 프레임 사용")
- (default-fonts "기본 글꼴")
- (basic-gray-paren-match-color "강조 색") ; in prefs dialog
- (online-coloring-active "입력과 동시에 문법 색 입히기");확인하기
- (open-files-in-tabs "파일을 별도의 탭에 열기(새 창에 열지 않기)")
- (show-interactions-on-execute "프로그램 실행 시 자동으로 대화창 열기")
-  (switch-to-module-language-automatically "모듈을 열 때 모듈 언어로 자동으로 바꾸기")
-  (interactions-beside-definitions "대화창을 정의창 옆에 두기") ;; in preferences, below the checkbox one line above this one
- (limit-interactions-size "대화창 크기 한계 설정")
- (background-color "배경 색")
- (default-text-color "텍스트 초기화") ;; used for configuring colors, but doesn't need the word "color"
- (choose-a-background-color "배경 색을 선택해 주세요")
- (revert-to-defaults "설정 초기화")
-  
-  (black-on-white-color-scheme "흰색 배경에 검정 글씨") ;; these two appear in the color preferences dialog on butttons
-  (white-on-black-color-scheme "검정 배경에 흰 글씨") ;; clicking the buttons changes the color schemes to some defaults that've been set up.
-  
- ; title of the color choosing dialog
-
- ; should have entire alphabet
- (font-example-string "The quick brown fox jumped over the lazy dogs.") 
-
- (change-font-button-label "바꾸기")
- (fonts "글꼴")
- (other... "그 외...") ;; used in the font choice menu item
-
- ; filled with type of font, eg modern, swiss, etc.
- (choose-a-new-font "새로운 \"~a\" 글꼴을 선택해 주세요")
-
- (font-size-slider-label "크기")
- (restart-to-see-font-changes "글꼴 변경사항을 적용하시려면 다시 시작 하세요")
-
- (font-prefs-panel-title "글꼴")
- (font-name "글꼴 이름")
- (font-size "글꼴 크기")
- (set-font "글꼴을 설정합니다")
- (font-smoothing-label  "글꼴 뭉개기")
- (font-smoothing-none "하지 않음")
- (font-smoothing-some "약간")
- (font-smoothing-all "완전히")
- (font-smoothing-default "시스템 설정 사용")
- (select-font-name "글꼴 이름 선택")
- (example-text "미리보기:")
- (only-warn-once "정의창과 대화창이 동기화 되지 않았을 때 한번만 경고")
- 
- ; warning message when lockfile is around
- (waiting-for-pref-lock "설정 잠금파일을 위해 기다리는 중입니다")
- (pref-lock-not-gone
-  "설정 잠금파일:\n\n   ~a\n\n때문에 설정을 저장할 수 없습니다. 실행중인 Racket 프로그램이 없는 것을 확인하고 이 파일을 삭제해주십시오.")
- (still-locked-exit-anyway? "설정파일이 성공적으로 저장되지 않았습니다. 종료하시겠습니까?")
- 
- ;;; indenting preferences panel
- (indenting-prefs-panel-label "들여쓰기")
- (indenting-prefs-extra-regexp "다른 정규 표현식")
-
- (square-bracket-prefs-panel-label "대괄호")
-  
- ; filled with define, lambda, or begin
- (enter-new-keyword "~a 같은 키워드들을 입력하세요:") ;확인하기 <- 이거 뭐 하는 거임;;ㅠ
- (x-keyword "~a 키워드")
- (x-like-keywords "~a 같은 키워드")
-
- ; used in Square bracket panel
- (skip-subexpressions "건너 뛸 부분표현식의 수") ;확인하기
-
- (expected-a-symbol "기호의 자리에: ~a")
- (already-used-keyword "\"~a\" 는 이미 특별히 들여쓰기할 키워드입니다.")
- (add-keyword "추가")
- (remove-keyword "삭제")
- 
-  ; repl color preferences
-  (repl-colors "REPL")
-  (repl-out-color "출력")
-  (repl-value-color "값")
-  (repl-error-color "오류")
-  
-  ;;; find/replace
-  (search-next "다음")
-  (search-previous "이전")
-  (search-match "일치")  ;;; this one and the next one are singular/plural variants of each other
-  (search-matches "일치") 
-  (search-replace "바꾸기")
-  (search-skip "건너뛰기")
-  (search-show-replace "바꾸기 보기")
-  (search-hide-replace "바꾸기 숨기기")
-  (find-case-sensitive "대/소문자 구별")  ;; the check box in both the docked & undocked search
-  (find-anchor-based "기준 설정하여 찾기");확인하기 anchor?
-
-  ;; these string constants used to be used by searching,
-  ;; but aren't anymore. They are still used by other tools, tho.
-  (hide "숨기기")
-  (dock "붙이기") ;확인하기
-  (undock "떼기")
-  
- ;;; multi-file-search
- (mfs-multi-file-search-menu-item "파일에서 찾기...")
- (mfs-string-match/graphics "문자열 검색 (그림이 있는 파일도 가능)")
- (mfs-regexp-match/no-graphics "정규 표현식 (텍스트파일만 가능)")
- (mfs-searching... "검색중...")
- (mfs-configure-search "찾기 설정") ;; dialog title
- (mfs-files-section "파일")   ;; section in config dialog
- (mfs-search-section "검색") ;; section in config dialog
- (mfs-dir "경로")
- (mfs-recur-over-subdirectories "하위디렉토리도 검색")
- (mfs-regexp-filename-filter "다음 정규표현식에 맞는 파일")
- (mfs-search-string "찾을 문자열")
- (mfs-drscheme-multi-file-search "다중 파일 검색 - DrRacket") ;; results window and error message title
- (mfs-not-a-dir "\"~a\" 는 디렉토리가 아닙니다")
- (mfs-open-file "파일 열기")
- (mfs-stop-search "검색 중지")
- (mfs-case-sensitive-label "대/소문자 구별")
- (mfs-no-matches-found "일치하는 검색결과가 없습니다.")
- (mfs-search-interrupted "검색이 중지되었습니다.")
- 
- ;;; reverting a file
- (are-you-sure-revert
-  "정말로 이 파일을 되돌리시겠습니까? 변경을 취소할 수 없습니다.")
- (are-you-sure-revert-title
-  "되돌리시겠습니까?")
- 
- ;;; saving a file
- ; ~a is filled with the filename
- (error-saving "저장 오류") ;; title of error message dialog
- (error-saving-file/name "~a을(를) 저장하는 도중 오류가 발생했습니다.")
- (error-loading "불러오기 오류")
- (error-loading-file/name "~a을(를) 불러오는 도중 오류가 발생했습니다.")
- (unknown-filename "<< 알 수 없는 파일 >>")
-
- ;;; finder dialog
- (must-specify-a-filename "파일명을 설정하십시오")
- (file-does-not-exist "\"~a\" 파일이 존재하지 않습니다.")
- (ask-because-file-exists "\"~a\" 파일이 이미 존재합니다. 덮어쓰시겠습니까?")
- (dne-or-cycle "\"~a\"은(는) 존재하지 않는 디렉토리 혹은 순환참조를 포함하고 있습니다.")
- (get-file "파일 가져오기")
- (put-file "파일 내보내기")
- (full-pathname "절대 경로명")
- (show-dot-files ".으로 시작하는 파일과 디렉토리 보여주기")
- (up-directory-button-label "상위 디렉토리")
- (add-button-label "추가") ;;; for multi-file selection
- (add-all-button-label "모두 추가") ;;; for multi-file selection
- (remove-button-label "삭제") ;;; for multi-file selection
- (file-wrong-form "파일명의 형식이 잘못되었습니다.")
- (select-files "파일 선택하기") 
- (select-file "파일 선택하기")
- (dir-dne "디렉토리가 존재하지 않습니다.")
- (file-dne "파일이 존재하지 않습니다.")
- (empty-filename "파일명에는 글자가 포함되어야 합니다.")
- (that-is-dir-name "디렉토리의 이름입니다.")
- 
- ;;; raw menu names -- these must match the 
- ;;; versions below, once the &s have been stripped.
- ;;; if they don't, DrRacket's menus will appear
- ;;; in the wrong order.
- (file-menu "파일")
- (edit-menu "편집")
- (help-menu "도움말")
- (windows-menu "윈도우")
- 
- ;;; menus
- ;;; - in menu labels, the & indicates a alt-key based shortcut.
- ;;; - sometimes, things are stuck in the middle of 
- ;;; menu item labels. For instance, in the case of
- ;;; the "Save As" menu, you might see: "Save Definitions As". 
- ;;; be careful of spacing, follow the English, if possible.
- ;;; - the ellipses in the `after' strings indicates that
- ;;; more information is required from the user before completing
- ;;; the command.
-
- (file-menu-label "파일(&F)")
-
- (new-info  "새 파일 열기")
- (new-menu-item "새로 열기 (&N)")
- (new-...-menu-item "새로 열기 (&N)")
-
- (open-info "디스크에서 파일 가져와서 열기")
- (open-menu-item "열기 (&O)")
-
- (open-recent-info "최근 열어본 파일 목록")
- (open-recent-menu-item "최근 파일 열기 (&T)")
-
- (revert-info "디스크에 있는 파일 복사본으로 되돌리기")
- (revert-menu-item "되돌리기 (&R)")
-
- (save-info "디스크에 저장하기")
- (save-menu-item "저장하기 (&S)")
-
- (save-as-info "파일명을 묻고 파일을 디스크에 저장하기")
- (save-as-menu-item "을 다른 이름으로 저장 (&A)")
-
- (print-info "파일을 프린터로 보내기")
- (print-menu-item "인쇄하기 (&P)")
-
- (page-setup-info "인쇄 설정")
- (page-setup-menu-item "페이지 설정")
-
- (close-info "파일 닫기")
- (close-menu-item "닫기 (&C)")
-
- (quit-info "모든 창 닫기")
- (quit-menu-item-windows "종료하기 (&X)")
- (quit-menu-item-others "끝내기 (&Q)")
- 
- (edit-menu-label "편집(&E)")
- 
- (undo-info "가장 최근 작업 되돌리기")
- (undo-menu-item "되돌리기 (&U)")
-
- (redo-info "가장 최근 되돌린 작업 되돌리기")
- (redo-menu-item "다시 실행 (&R)")
-
- (cut-info "선택된 항목을 클립보드로 옮기기")
- (cut-menu-item "잘라내기 (&T)")
-
- (copy-info "선택된 항목을 클립보드에 복사하기")
- (copy-menu-item "복사하기 (&C)")
-
- (paste-info "가장 최근 복사하거나 잘라낸 항목을 선택된 항목의 자리에 붙여넣기")
- (paste-menu-item "붙여넣기 (&P)")
-
- (clear-info "선택된 항목을 클립보드에 관계없이 지우기")
- (clear-menu-item-windows "삭제하기 (&D)")
-
- (select-all-info "전체 선택하기")
- (select-all-menu-item "전체 선택 (&L)")
- 
-  (find-menu-item "찾기") ;; menu item
-  (find-info "입력 위치를 탐색창과 찾기바 사이에서 전환하기")
-  
- (find-next-info "검색된 다음 문자열로 건너뛰기")
- (find-next-menu-item "다음 찾기")
-  
- (find-previous-info "검색된 이전 문자열로 건너뛰기")
- (find-previous-menu-item "이전 찾기")
-  
-  (show-replace-menu-item "바꾸기 보기")
-  (hide-replace-menu-item "바꾸기 숨기기")
-  (show/hide-replace-info "바꾸기 패널 보기/숨기기 전환")
-
-  (replace-menu-item "바꾸기")
-  (replace-info "진한 동그라미 안에 있는 검색 결과를 바꾸기")
-  
-  (replace-all-info "모든 검색 결과 바꾸기")
-  (replace-all-menu-item "모두 바꾸기")
-  
-  (find-case-sensitive-info "대/소문자 구별 검색과 구별하지 않는 검색 사이를 전환")
-  (find-case-sensitive-menu-item "대/소문자 구별 검색")
-  
-  (complete-word "단어 완성") ; the complete word menu item in the edit menu
-  (no-completions "완성된 단어 없음") ; shows up in the completions menu when there are no completions (in italics)
-  
-  (overwrite-mode "덮어쓰기 모드")
-  (enable-overwrite-mode-keybindings "덮어쓰기 모드 단축키 활성화")
-  
- (preferences-info "설정 바꾸기")
- (preferences-menu-item "설정...")
-
- (keybindings-info "현재 활성화된 단축키 보기")
- (keybindings-menu-item "단축키")
- (keybindings-show-active "활성화된 단축키 보기")
- (keybindings-frame-title "단축키")
- (keybindings-sort-by-name "이름으로 정렬")
- (keybindings-sort-by-key "단축키로 정렬")
- (keybindings-add-user-defined-keybindings "사용자 정의 단축키 보기")
- (keybindings-add-user-defined-keybindings/planet "PLaneT으로부터 사용자 정의 단축키 추가")
- (keybindings-menu-remove "~a 삭제")
- (keybindings-choose-user-defined-file "단축키 저장 파일을 선택하여 주십시오")
- (keybindings-planet-malformed-spec "설정이 잘못되었습니다: ~a") ; the string will be what the user typed in
- (keybindings-type-planet-spec "PLaneT 요구 설정 입력하기(`요구'없이)") ;확인하기 require spec??
-  
- ; first ~a will be a string naming the file or planet package where the keybindings come from;
- ; second ~a will be an error message
- (keybindings-error-installing-file "단축키 ~a 설치 도중에 오류가 발생했습니다:\n\n~a")
-  
- (user-defined-keybinding-error "단축키 ~a 실행 도중에 오류가 발생했습니다 \n\n~a")
- (user-defined-keybinding-malformed-file "~a 파일은 framework/keybinding-lang language로 쓰인 모듈을 포함하고 있지 않습니다.")  
- (user-defined-keybinding-malformed-file/found-lang "~a 파일은 framework/keybinding-lang language로 쓰여진 모듈을 포함하고 있지 않습니다. 대신에 ~s 를 발견하였습니다.")  
-  
- ;; menu items in the "special" menu
- (insert-text-box-item "텍스트 상자 넣기")
- (insert-image-item "그림 넣기")
- (insert-comment-box-menu-item-label "주석상자 넣기")
- (insert-lambda "λ 넣기")
-
- (wrap-text-item "자동 줄 바꿈")
-
-  ;; windows menu
- (windows-menu-label "창(&W)")
- (minimize "최소화") ;; minimize and zoom are only used under mac os x
- (zoom "확대/축소")
- (bring-frame-to-front "프레임 앞으로 가져오기")       ;;; title of dialog
- (bring-frame-to-front... "프레임을 앞으로 가져옵니다") ;;; corresponding title of menu item
- (most-recent-window "가장 최근 창")
-  (next-tab "다음 탭")
-  (prev-tab "이전 탭")
-  (tab-i "탭 ~a: ~a") ;; menu item in the windows menu under mac os x. first ~a is filled with a number between 1 and 9; second one is the filename of the tab
-  (tab-i/no-name "탭 ~a")
-  
- (view-menu-label "보기(&V)")
- (show-overview "프로그램 윤곽 보기 (&P)") 
- (hide-overview "프로그램 윤곽 숨기기 (&P)")
- (show-module-browser "모듈 브라우저 보기 (&M)")
- (hide-module-browser "모듈 브라우저 숨기기 (&M)")
-
-  (help-menu-label "도움말(&H)")
- (about-info "출처와 세부 정보")
- (about-menu-item "소개...")
- 
- ;; open here's new menu item
- (create-new-window-or-clear-current
-  "새 창을 만드시겠습니까, 아니면 현재 창을 초기화하시겠습니까?")
- (clear-current "현재 창 초기화")
- (new-window "새 창 열기")
-
- ;;; exiting and quitting ``are you sure'' dialog
- ;;; exit is used on windows, quit on macos, in English. Other
- ;;; languages probably use the same word on both platforms.
- (exit "종료")
- (quit "닫기")
- (are-you-sure-exit "종료하시겠습니까?")
- (are-you-sure-quit "닫으시겠습니까?")
-  ; these next two are only used in the quit/exit dialog
-  ; on the button whose semantics is "dismiss this dialog".
-  ; they are there to provide more flexibility for translations
-  ; in English, they are just cancel.
- (dont-exit "취소") 
- (dont-quit "취소")
-  
- ;;; autosaving
- (error-autosaving "자동 저장 중에 오류가 발생하였습니다 \"~a\".") ;; ~a will be a filename
- (autosaving-turned-off "파일이 저장될때까지 자동 저장을 하지 않습니다.")
- (recover-autosave-files-frame-title "자동 저장된 파일 복구하기")
- (autosave-details "세부정보")
- (autosave-recover "복구")
- (autosave-unknown-filename "<<알 수 없는 파일>>")
-  
-  ;; these are labels in a dialog that drscheme displays
-  ;; if you have leftover autosave files. to see the dialog,
-  ;; start up drscheme and modify (but don't save) a file
-  ;; (also, do this with an unsaved file). Wait for the autosave
-  ;; files to appear (typically 5 minutes). Kill DrRacket
-  ;; and restart it. You'll see the dialog
-  (autosave-autosave-label: "자동 저장 파일:")
-  (autosave-original-label: "기존 파일:")
-  (autosave-autosave-label "자동 저장 파일")
-  (autosave-original-label "기존 파일")
-  (autosave-compare-files "자동 저장 파일 비교하기")
-
-  (autosave-show-autosave "자동 저장 파일") ;; title of a window showing the autosave file
-
-  (autosave-explanation "DrRacket이 저장되지 않은 내용이 포함되어 있을 수 있는 자동 저장 파일을 찾았습니다.")
-
-  (autosave-recovered! "복구되었습니다!") ;; status of an autosave file
-  (autosave-deleted "삭제되었습니다")       ;; status of an autosave file
-
-  (autosave-error-deleting "~a을(를) 삭제하는 도중에 오류가 발생하였습니다\n\n~a") ;; first is a filename, second is an error message from mz.
-  (autosave-delete-button "삭제")
-  (autosave-delete-title "삭제")  ;; title of a dialog asking for deletion confirmation
-  (autosave-done "완료")
-  
-  ;; appears in the file dialog
-  (autosave-restore-to-where? "자동 저장 파일을 저장할 곳을 선택하세요.")
-  
-  
- ;;; file modified warning
- (file-has-been-modified
-  "마지막으로 저장한 후로 파일이 변경되었습니다. 변경 사항을 저장하시겠습니까?")
- (overwrite-file-button-label "덮어쓰기")
- 
- (definitions-modified 
-  "정의 텍스트가 파일시스템에서 변경되었습니다; 정의 텍스트를 저장하거나 되돌리십시오.")
- (drscheme-internal-error "DrRacket 내부 오류")
- 
- ;;; tools
- (invalid-tool-spec "info.rkt 파일(collection ~a) 안에 있는 도구 세부 정보가 잘못되었습니다. 문자열 또는 문자열의 목록이 있어야 하는데, ~e이(가) 있습니다.")
- (error-invoking-tool-title "~s 도구를 가져오는데 ;~s 오류가 발생하였습니다.")
- (error-loading-tool-title "~s 도구를 불러오는데 \n~a 오류가 발생하였습니다.") ;; ~s filled with a path, ~a filled with an error message from an exn
- (tool-tool-names-same-length
-  "info.rkt 파일(~s)의 `tool-names' 와 `tools' 이 같은 길이의 목록이어야 하는데 ~e와(과) ~e이(가) 있습니다.")
- (tool-tool-icons-same-length
-  "info.rkt 파일(~s)의 `tool-icons' 와 `tools' 이 같은 길이의 목록이어야 하는데 ~e와(과) ~e이(가) 있습니다.")
- (tool-tool-urls-same-length
-  "info.rkt 파일(~s)의 `tool-urls' 와 `tools' 이 같은 길이의 목록이어야 하는데 ~e와(과) ~e이(가) 있습니다.")
- (error-getting-info-tool
-  "info.rkt 파일(~s)을 불러오는데 오류가 발생하였습니다.")
- (tool-error-phase1 "도구 ~s의 phase1에 ~s 오류가 발생하였습니다.")
- (tool-error-phase2 "도구 ~s의 phase2에 ~s 오류가 발생하였습니다.")
-
-
- ;;; define popup menu
- (end-of-buffer-define "<< 버퍼의 끝>>")
- (sort-by-name "이름으로 정렬하기")
- (sort-by-position "파일 내 위치로 정렬하기")
- (no-definitions-found "<< 정의를 찾지 못하였습니다>>")
- (jump-to-defn "~a의 정의로 건너뛰기")
-
- (recent-items-sort-by-age "나이로 정렬")
- (recent-items-sort-by-name "이름으로 정렬")
- 
- ;;; view menu
- (hide-definitions-menu-item-label "정의 숨기기 (&D)")
- (show-definitions-menu-item-label "정의 보기 (&D)")
- (definitions-menu-item-help-string "정의창 보기/숨기기")
- (show-interactions-menu-item-label "대화 보기 (&I)")
- (hide-interactions-menu-item-label "대화 숨기기 (&I)")
- (interactions-menu-item-help-string "대화창 보기/숨기기")
- (toolbar "도구모음")
- (toolbar-on-top "도구모음 위에 두기")
- (toolbar-on-left "도구모음 왼쪽에 두기")
- (toolbar-on-right "도구모음 오른쪽에 두기")
- (toolbar-hidden "도구모음 숨기기")
-
- ;;; file menu
- (save-definitions-as "다른 이름으로 정의 저장하기 (&A)")
- (save-definitions "정의 저장하기")
- (print-definitions "정의 인쇄하기")
- (about-drscheme "DrRacket 소개")
- (save-other "추가 저장 도구")
- (save-definitions-as-text "텍스트 문서로 정의 저장하기")
- (save-interactions "대화 저장하기")
- (save-interactions-as "다른 이름으로 대화 저장하기")
- (save-interactions-as-text "텍스트 문서로 대화 저장하기")
- (print-interactions "대화 인쇄하기")
- (new-tab "새 탭")
- (close-tab "탭 닫기") ;; must not have any &s in it.
- (close-tab-amp "탭 닫기 (&C)") ;; like close-tab, but with an ampersand on the same letter as the one in close-menu-item
-  
- ;;; edit menu
- (split-menu-item-label "쪼개기 (&S)")
- (collapse-menu-item-label "붙이기 (&O)")
- 
- ;;; language menu
- (language-menu-name "언어(&L)")
- 
- ;;; scheme-menu
- (scheme-menu-name "Racket(&C)")
- (execute-menu-item-label "실행")
- (execute-menu-item-help-string "정의창의 프로그램 다시 시작하기")
- (ask-quit-menu-item-label "프로그램 중단 요청")
- (ask-quit-menu-item-help-string "중단 스레드를 사용하여 현재 계산중인 스레드를 중단");확인하기
- (force-quit-menu-item-label "프로그램 강제중단")
- (force-quit-menu-item-help-string "작업관리자를 사용하여 현재 계산을 중단")
- (limit-memory-menu-item-label "메모리 제한")
- (limit-memory-msg-1 "메모리 제한은 8MB 이상이어야 하며, 바꾼 제한 설")
- (limit-memory-msg-2 "정은 프로그램을 다시 시작할 때부터 적용됩니다.")
- (limit-memory-unlimited "제한없음")
- (limit-memory-limited "제한있음")
- (limit-memory-megabytes "Megabytes")
- (clear-error-highlight-menu-item-label "오류 강조 표시 없애기")
- (clear-error-highlight-item-help-string "분홍색 강조 표시를 지웁니다")
- (reindent-menu-item-label "다시 들여쓰기 (&R)")
- (reindent-all-menu-item-label "전부 들여쓰기 (&A)")
- (semicolon-comment-out-menu-item-label "세미콜론으로 주석처리하기 (&C)")
- (box-comment-out-menu-item-label "상자로 주석처리하기 (&C)")
- (uncomment-menu-item-label "주석처리 취소 (&U)")
-
- (convert-to-semicolon-comment "세미콜론 주석으로 바꾸기")
- 
- ;;; executables
- (create-executable-menu-item-label "실행파일 만들기")
- (create-executable-title "실행파일 만들기")
- (must-save-before-executable "실행파일을 만들기 전에 프로그램을 저장하셔야 합니다.")
- (save-a-mred-launcher "GRacket Launcher 저장") ;확인하기 Launcher?
- (save-a-mzscheme-launcher "Racket Launcher 저장")
- (save-a-mred-stand-alone-executable "독립형 GRacket 실행파일 저장") ;stand-alone
- (save-a-mzscheme-stand-alone-executable "독립형 Racket 실행파일 저장")
- (save-a-mred-distribution "GRacket 배포판 저장")
- (save-a-mzscheme-distribution "Racket 배포판 저장")
-
- (definitions-not-saved "정의창의 프로그램이 저장되지 않았습니다. 실행파일은 정의창에서 마지막으로 저장된 버전을 사용합니다 계속하시겠습니까?")
- ;; The "-explanatory-label" variants are the labels used for the radio buttons in
- ;;  the "Create Executable..." dialog for the "(module ...)" language.
- (launcher "Launcher")
- (launcher-explanatory-label "Launcher (이 장치에만 적용, 이 코드를 실행함)");확인하기 runs from source
- (stand-alone "독립형") ;stand-alone
- (stand-alone-explanatory-label "독립형 (이 장치에만 적용, 컴파일된 코드를 실행함)")
- (distribution "배포")
- (distribution-explanatory-label "배포 (다른 장치에서 사용가능)")
- (executable-type "종류")
- (executable-base "기반")
- (filename "파일이름: ")
- (create "생성")
- (please-specify-a-filename "생성할 파일 이름을 정해주십시오.")
- (~a-must-end-with-~a
-  "파일이름 ~a\n\n  ~a\n\n은(는) 잘못되었습니다. 파일이름은 반드시 \".~a\".로 끝나야 합니다")
- (macosx-executables-must-end-with-app
-  "파일이름\n\n  ~a\n\n은(는) 잘못되었습니다. MacOS X 에서, 실행파일은 반드시 .app으로 끝나는 디렉토리 내에 있어야 합니다.")
- (warning-directory-will-be-replaced
-  "경고: 디렉토리:\n\n  ~a\n\n가 덮어씌워집니다. 계속하시겠습니까?")
- 
- (distribution-progress-window-title "배포 과정 진행")
- (creating-executable-progress-status "배포를 위한 실행파일을 생성합니다")
- (assembling-distribution-files-progress-status "배포를 위해 파일을 어셈블리어로 번역합니다")
- (packing-distribution-progress-status "배포판을 압축합니다")
-
- (create-servlet "서블릿 생성")
-
- ; the ~a is a language such as "module" or "algol60"
- (create-servlet-unsupported-language
-  "~a 언어에서는 서블릿 생성을 할 수 없습니다.")
-  
- ;;; buttons
- (execute-button-label "실행") 
- (save-button-label "저장")
- (break-button-label "중지")
- 
- ;;; search help desk popup menu
- (search-help-desk-for "헬프데스크에서 \"~a\" 검색")
- (exact-lucky-search-help-desk-for "헬프데스크에서 \"~a\" lucky search 하기")
-
- ;; collapse and expand popup menu items
- (collapse-sexp "S-expression 접기")
- (expand-sexp "S-expression 펼치기")
- 
- ;;; fraction dialog
- (enter-fraction "분수 입력")
- (whole-part "정수부")
- (numerator "분자")
- (denominator "분모")
- (insert-number/bad-whole-part "정수부는 반드시 정수여야 합니다.")
- (insert-number/bad-numerator "분자는 반드시 음이 아닌 정수여야 합니다.")
- (insert-number/bad-denominator "분모는 양의 정수여야 합니다.")
- (insert-fraction-menu-item-label "분수 넣기")
-
- ;; number snip popup menu
- (show-decimal-expansion "소수로 보기")
- (show-mixed-fraction-view "대분수로 보기")
- (show-improper-fraction-view "가분수로 보기")
- (show-more-decimal-places "소숫점자리 더 보기")
- 
- ;;; Teachpack messages
- (select-a-teachpack "배움꾸러미 선택")
- (clear-teachpack "~a 배움꾸러미 빼기")
- (teachpack-error-label "DrRacket - 배움꾸러미 오류")
- (teachpack-didnt-load "~a 배움꾸러미 파일을 불러오는 데 실패했습니다.")
- (add-teachpack-menu-item-label "배움꾸러미 추가")
- (clear-all-teachpacks-menu-item-label "모든 배움꾸러미 빼기")
- (drscheme-teachpack-message-title "DrRacket 배움꾸러미")
- (already-added-teachpack "~a 배움꾸러미가 이미 추가되어 있습니다.")
-  
-  ; ~a is filled with the teachpack's name; the message appears in the teachpack selection dialog when a user installs a new teachpack
-  (compiling-teachpack "~a 배움꾸러미를 컴파일중입니다.")
-  (teachpack-pre-installed "이미 설치된 배움꾸러미입니다.")
-  (teachpack-pre-installed/htdp "이미 설치된 HTDP 배움꾸러미입니다.")
-  (teachpack-pre-installed/2htdp "이미 설치된 HTDP/2e 배움꾸러미입니다.")
-  (teachpack-user-installed "사용자 정의 배움꾸러미입니다.")
-  (add-teachpack-to-list... "배움꾸러미를 목록에 추가하기")
-  (teachpack-already-installed "배움꾸러미 '~a' 이(가) 이미 설치되어 있습니다. 덮어쓰시겠습니까?")
-  ; ~a is filled with a list of language names. Each name is separated by a newline and is indented two spaces (no commas, no 'and')
-  (teachpacks-only-in-languages "배움꾸러미는 다음 언어에서만 사용가능합니다: ~a")
-   
- ;;; Language dialog
- (introduction-to-language-dialog
-  "언어를 고르십시오. 입문과목을 듣는 학생은 기본 언어를 사용을 권장합니다.")
- (language-dialog-title "언어를 고르십시오.")
- (case-sensitive-label "대/소문자 구별")
- (output-style-label "출력 스타일")
- (constructor-printing-style "생성자")
- (quasiquote-printing-style "Quasiquote") ; 확인하기 ;따로 나타낼 말이 없을 듯. manual에서 보고 어떤 말인지 알아내는 수 밖에는... (manual에 설명 나와있긴 하네...)
- (write-printing-style "write")
- (print-printing-style "print")
- (sharing-printing-label "공유하는 값 보기")
- (use-pretty-printer-label "출력된 값 안에 새줄 넣기")
- (input-syntax "입력 문법")
- (dynamic-properties "동적 속성")
- (output-syntax "출력 문법")
-  (teachpacks "배움꾸러미") ;; label in the language dialog for the teaching languages
-  (teachpacks-none "<< 없음 >>") ;; shows up under the previous string, when there are no teachpacks
- (no-debugging-or-profiling "디버깅 또는 프로파일링 안하기")
- (debugging "디버깅")
- (debugging-and-profiling "디버깅과 프로파일링")
- (test-coverage "논리적 테스트 모음 도달범위")
- (show-details-button-label "상세히 보기")
- (hide-details-button-label "상세히 감추기")
- (choose-language-menu-item-label "언어 고르기")
- (revert-to-language-defaults "기본 언어로 되돌리기")
- (fraction-style "분수 모양")
- (use-mixed-fractions "대분수")
- (use-repeating-decimals "순환소수")
- (decimal-notation-for-rationals "유리수를 십진수로 나타내기")
- (enforce-primitives-group-box-label "원시 함수") ;initial binding
- (enforce-primitives-check-box-label "원시 함수 재정의 금지")
- (automatically-compile "compiled/ 디렉토리를 덧붙이기 (빠른 로딩)")
- (preserve-stacktrace-information "스택추적 보존하기 (일부 최적화 끄기)")
- (expression-level-stacktrace "표현-수준의 스택추적")
- (function-level-stacktrace "함수-수준의 스택추적")
-  
-  
-  ; used in the bottom left of the drscheme frame 
-  ; used the popup menu from the just above; greyed out and only
-  ; visible when some languages are in the history
-  (recent-languages "최근 언어:")
-  ; shows up in bottom-left programming language menu popup, when no langs are recorded
-  (no-recently-chosen-languages "최근 선택된 언어가 없습니다") 
-  
- ;; startup wizard screen language selection section
- (please-select-a-language "언어를 고르십시오.")
-  
-  
- ;;; languages
- (beginning-student "입문 학생")
- (beginning-one-line-summary "define, cond, structs, constants, and primitives")
- (beginning-student/abbrev "입문 학생 (List 축약 포함)")
- (beginning/abbrev-one-line-summary "입문 그리고 REPL안의 list 스타일 출력")
- (intermediate-student "중급 학생")
- (intermediate-one-line-summary "입문 + 어휘적 범위")
- (intermediate-student/lambda "중급 학생 (lambda 포함)")
- (intermediate/lambda-one-line-summary "중급 + higher-order 함수")
- (advanced-student "고급 학생")
- (advanced-one-line-summary "중급 + lambda + mutation")
- (how-to-design-programs "How to Design Programs") ;; should agree with MIT Press on this one...
- (pretty-big-scheme "매우 큰 것")
- (pretty-big-scheme-one-line-summary "HtDP 언어, mzscheme, & mred/mred의 문법과 함수들 추가됨")
- (r5rs-language-name "R5RS")
- (r5rs-one-line-summary "R5RS (frills 미포함)")
- (expander "펼치기")
- (expander-one-line-summary "계산하는 대신 먼저 표현을 펼친다.")
- (legacy-languages "기존 언어") ;확인하기 물려받은 언어?
- (teaching-languages "교육용 언어")
- (experimental-languages "실험용 언어")
-  (initial-language-category "초기 언어")
-  (no-language-chosen "언어가 선택되지 않았습니다.")
- 
-  (module-language-name "소스를 통해서 언어를 결정합니다.")
-  (module-language-one-line-summary "#lang으로 사용 언어를 결정합니다.")
-  (module-language-auto-text "자동 #lang 줄") ;; shows up in the details section of the module language
-   
-  ;; for the upper portion of the language dialog
-  (use-language-in-source "소스에 정의된 언어를 이용합니다.")
-  (choose-a-language "언어를 고르십시오.")
-  (lang-in-source-discussion
-   "프로그램 시작에 위치한 #lang 줄이 그 프로그램의 언어를 선택합니다. 이 방법은 DrRacket의 기본 기능이며 널리 쓰이고 있습니다.")
-  
-  ;;; from the `not a language language' used initially in drscheme.
-  (must-choose-language "DrRacket는 프로그래밍 언어를 선택하기 전에는 프로그램들을 처리할수 없습니다.")
-  
-  ; next two appear before and after the name of a text book (which will be in italics)
-  (using-a-textbook-before "사용중")
-  (using-a-textbook-after "?")
-  
-  ; next two are before and after a language
-  (start-with-before "언어시작 - ")
-  (start-with-after "")
-  
-  (seasoned-plt-schemer? "숙련된 PLT Schemer입니까?")
-  (racketeer? "Racketeer입니까?")
-  (looking-for-standard-scheme? "표준 Scheme을 찾습니까?")
-
-  ; the three string constants are concatenated together and the middle
-  ; one is hyperlinked to the dialog that suggests various languages
-  (get-guidance-before "\"Language\" 메뉴안의 \"언어 고르십시오.\"를 고르거나, 또는 ")
-  (get-guidance-during "사용 안내 가져오기")
-  (get-guidance-after ".")
-      
- ;;; debug language
- (unknown-debug-frame "[알수없음]")
- (backtrace-window-title "역추적 - DrRacket")
- (files-interactions "~a의 대화") ;; filled with a filename
- (current-interactions "대화")
- (current-definitions "정의")
- (mzscheme-w/debug "원문 (R5RS를 포함한 MzScheme)")
- (mzscheme-one-line-summary "PLT가 구현한 Scheme")
- (mred-w/debug "Graphical (MzScheme를 포함한 MzEd)")
- (mred-one-line-summary "MzScheme의 GUI 지원 추가")
-
- ;; profiling
- (profiling-low-color "낮은 범위의 색상") ;확인하기 낮은 범위/ 좁은 범위
- (profiling-high-color "높은 범위의 색상")
- (profiling-choose-low-color "낮은 범위의 색상을 선택하십시오.")
- (profiling-choose-high-color "높은 범위의 색상을 선택하십시오.")
- (profiling "프로파일링")  ;; 다시 한번 확인해 볼 것 어떤 의미로 쓰이는지 다시 봐야 될 듯
- (profiling-example-text "(define (whee) (whee))")
- (profiling-color-config "프로파일링 색상 범위") 
- (profiling-scale "프로파일링 색상 크기")
- (profiling-sqrt "제곱근")
- (profiling-linear "선형함수")
- (profiling-square "이차함수")
- (profiling-number "호출 횟수")
- (profiling-time "누적 시간")
- (profiling-update "프로파일 업데이트")
- (profiling-col-percent-time "% 시간")
- (profiling-col-function "함수")
- (profiling-col-time-in-msec "Msec")
- (profiling-col-calls "호출 횟수")
- (profiling-show-profile "프로파일 보기")
- (profiling-hide-profile "프로파일 감추기")
- (profiling-unknown-src "<< 알수없음 >>")
- (profiling-no-information-available "프로파일링 정보가 없습니다. 선택한 언어에서 프로파일링이 사용가능하고 프로그램을 실행해야합니다.")
- (profiling-clear? "정의창의 내용이 변경되어 프로파일링 정보를 무효화합니다. 계속하시겠습니까?")
- 
- ;; test coverage
- (test-coverage-clear? "정의창의 내용이 변경되어 테스트 범위 정보를 무효화합니다. 계속하시겠습니까?")
- (test-coverage-clear-and-do-not-ask-again "계속, 다시 묻지 않음")
- (test-coverage-ask? "테스트 범위 지우기 묻기")
-  
- ;; tracing
- (tracing-enable-tracing "Tracing 사용하기")
- (tracing-show-tracing-window "Tracing 보기")
- (tracing-hide-tracing-window "Tracing 감추기")
- (tracing-tracing-nothing-to-show "Tracing 결과가 아직 없습니다. (당신의 언어가 tracing 지원하는 지와 tracing이 켜져있는 것을 확인하십시오.)")
-
- ;;; repl stuff
- (evaluation-terminated "계산 중단")
- (evaluation-terminated-explanation
-  "계산을 수행하던 스레드가 더 이상 작동하지 않습니다. 따라서 다음 실행까지 계산이 이루어지지 않을 것입니다.")
-  
-  ; The next three constants show up in the same dialog as the above evaluation-terminated string
-  ; constants.
-  ; The first two show up only when the user calls 'exit' (possibly with a status code).
-  ; The third shows up when the program runs out of memory.
-  (exited-successfully "성공적으로 종료")
-  (exited-with-error-code "오류 코드 ~a와 함께 종료") ;; ~a is filled in with a number between 1 and 255
-  (program-ran-out-of-memory "이 프로그램을 위한 메모리가 없습니다.")
- (last-stack-frame "마지막 스택 프레임 보기")
- (last-stack-frames "마지막 ~a개 스택 프레임들 보기")
- (next-stack-frames "다음 ~a개 스택 프레임들 보기")
- 
- ;;; welcoming message in repl
- (language "언어")
- (custom "사용자정의")
- (teachpack "배움꾸러미") ; 확인
- (welcome-to "환영합니다.")
- (version "버전")
- 
- ;;; kill evaluation dialog
- (kill-evaluation? "계산을 멈추시겠습니까?")
- (just-break "강제 중단")
- (kill "멈춤")
- (kill? "멈춤?")
-
- ;;; version checker
- (version:update-menu-item   "업데이트를 확인합니다.")
- (version:update-check       "업데이트 확인") ; dialog title, with the next line
- (version:connecting-server  "Racket 버전 서버에 접속합니다.")
- (version:results-title      "Racket 버전 확인")
- (version:do-periodic-checks "주기적으로 새로운 Racket 버전을 확인")
- (version:take-me-there      "내려받기 웹사이트") ; ...to the download website
- ;; the next one can appear alone, or followed by a comma and the one after that
- (version:plt-up-to-date     "당신의 Racket은 최신 버전입니다.")
- (version:but-newer-alpha    "하지만 새로 공개된 알파버전이 있습니다.")
- ;; This is used in this context: "Racket vNNN <<<*>>> http://download..."
- (version:now-available-at   "은(는) 지금 사용가능합니다.")
-
- ;; insert menu
- (insert-menu "삽입(&I)")
- 
- ;; large semi colon letters
- (insert-large-letters... "큰 글자 넣기")
- (large-semicolon-letters "큰 세미콜론 글자")
- (text-to-insert "글자 입력")
-
- (module-browser-filename-format "전체 파일이름: ~a (~a 줄)")
- (module-browser-root-filename "최상위 파일이름: ~a")
- (module-browser-font-size-gauge-label "글꼴 크기")
- (module-browser-progress-label "모듈 진행 개요") ; 확인
- (module-browser-adding-file "파일 추가: ~a...")
- (module-browser-laying-out-graph-label "그래프 모양")
- (module-browser-open-file-format "열기 ~a")
- (module-browser "모듈 탐색기") ;; frame title
- (module-browser... "모듈 탐색기 (&M)") ;; menu item title
- (module-browser-error-expanding "프로그램 오류:\n\n~a") ; 확인
- (module-browser-show-lib-paths "(lib ..) 경로에 의해 로드된 파일 보기")
- (module-browser-progress "모듈 탐색기: ~a") ;; prefix in the status line
- (module-browser-compiling-defns "모듈 탐색기: 정의 컴파일")
- (module-browser-show-lib-paths/short "lib 필수사항 따르기") ;; check box label in show module browser pane in drscheme window. ; 확인
- (module-browser-show-planet-paths/short "PLaneT 필수사항 따르기") ;; check box label in show module browser pane in drscheme window.
- (module-browser-refresh "새로고침") ;; button label in show module browser pane in drscheme window.
- (module-browser-only-in-plt-and-module-langs
-  "모듈 탐색기는 모듈기반 프로그램에서만 사용가능합니다.")
- (module-browser-name-length "이름 길이") 
- (module-browser-name-short "짧은") ; 확인하기
- (module-browser-name-medium "중간")
- (module-browser-name-long "긴") 
- (module-browser-name-very-long "단계들과 함께 긴")  ;; like 'Long' but shows the phases where this file is loaded 
- (module-browser-open-all "여기있는 모든 파일 열기")
-
- (happy-birthday-matthias "생일 축하합니다, Matthias!")
- (happy-birthday-matthew "생일 축하합니다, Matthew!")
- (happy-birthday-shriram "생일 축하합니다, Shriram!")
-
- (mrflow-using-default-language-title "기본 언어 사용함")
- (mrflow-using-default-language "사용된 언어는 현재 내장 타입 테이블이 없습니다. 대신 R5RS Scheme 사용합니다.") ; 확인
- (mrflow-button-title "분석하기")
- ;(mrflow-unknown-style-delta-error-title "알수없는 상자 스타일 델타") ; 확인
- ;(mrflow-unknown-style-delta-error "알수없는 상자 스타일 델타: ~a")
- (mrflow-popup-menu-show-type "타입 보기")
- (mrflow-popup-menu-hide-type "타입 감추기")
- (mrflow-popup-menu-show-errors "오류 보기")
- (mrflow-popup-menu-hide-errors "오류 감추기")
- ;(mrflow-read-exception-title "예외 읽기")
- ;(mrflow-read-exception "예외 읽기: ~a")
- ;(mrflow-syntax-exception-title "문법 예외")
- ;(mrflow-syntax-exception "문법 예외: ~a")
- ;(mrflow-unknown-exception-title "알수없는 예외")
- ;(mrflow-unknown-exception "알수없는 예외: ~a")
- ;(mrflow-language-primitives-error-title "언어 내장함수 에러") ; 확인
- ;(mrflow-language-primitives-error "잘못된 언어 내장 타입 테이블의 파일이름: ~a")
-  
- (snips-and-arrows-popup-menu-tack-all-arrows "모든 화살표 고정")
- (snips-and-arrows-popup-menu-untack-all-arrows "모든 화살표 떼어내기")
- (snips-and-arrows-user-action-disallowed-title "사용자 변경이 현재 허락되지 않습니다.") ; 확인
- (snips-and-arrows-user-action-disallowed "사용자 변경이 도구가 포함된 snips에서 허락되지 않습니다. 편집기 상의 내용을 수정하기 전에 모든 snips를 숨기십시오.j")
- ;(snips-and-arrows-changing-terms-warning-title "용어 변경은 취소가능합니다.") ; 확인
- ;(snips-and-arrows-changing-terms-warning "snips이 포함된 편집기 내의 용어 변경은 취소가 불가능합니다. 동작을 취소하고, snips을 삭제하고, 다시 변경을 시도하십시오. 아니면, 변경이 취소불가능하지만 변경을 계속 할 수 있습니다. (모든 다른 앞과 뒤의 변경은 여전히 취소가능합니다.)")
- (snips-and-arrows-hide-all-snips-in-editor "편집기 상의 모든 snips 감추기")
-
- (xml-tool-insert-xml-box "XML 상자 넣기")
- (xml-tool-insert-scheme-box "Racket 상자 넣기")
- (xml-tool-insert-scheme-splice-box "Racket 쪼개기 상자 넣기")
- (xml-tool-xml-box "XML 상자")
- (xml-tool-scheme-box "Racket 상자")
- (xml-tool-scheme-splice-box "Racket 쪼개기 상자")
- (xml-tool-switch-to-scheme "Racket 상자로 변경")
- (xml-tool-switch-to-scheme-splice "Racket 쪼개기 상자로 변경")
- (xml-tool-eliminate-whitespace-in-empty-tags
-  "비어있는 태그사이 공백 제거")
- (xml-tool-leave-whitespace-alone
-  "공백 남기기")
- 
- (show-recent-items-window-menu-item "분리된 창의 최근 열린 파일들을 보기")
- (show-recent-items-window-label "최근 열린 파일들")
- (number-of-open-recent-items "최근 열린 파일 갯수")
- (switch-anyway "무시하고 파일 변경") ;확인
-
- (stepper-program-has-changed "경고: 프로그램이 변경되었습니다.")
- (stepper-program-window-closed "경고: 프로그램 창이 사라졌습니다.")
-
- (stepper-name "한 단계씩 실행")
- (stepper-language-level-message "한 단계씩 실행은 \"~a\" 언어에서 지원하지 않습니다.")
- (stepper-button-label "한 단계씩 실행")
-
- (stepper-previous "이전단계")
- (stepper-next "다음단계")
- (stepper-jump "건너뛰기...") 
- (stepper-jump-to-beginning "처음으로")
- (stepper-jump-to-end "끝으로")
- (stepper-jump-to-selected "선택된 것의 처음으로")
- (stepper-jump-to-previous-application "이전 어플리케이션 단계로")
- (stepper-jump-to-next-application "다음 어플리케이션 단계로")
- (stepper-out-of-steps "한단계씩 실행이 실행되기전에 계산이 끝났습니다.")
- (stepper-no-such-step/title "해당 단계를 찾을 수 없습니다.")
- (stepper-no-such-step "조건을 만족하는 단계를 찾을 수 없습니다.")
- (stepper-no-such-step/earlier "조건을 만족하는 이전 단계를 찾을 수 없습니다..")
-  
- (debug-tool-button-name "디버그") ;확인하기 (이름 바꿀까요? 버그잡기 / 오류찾기 / 벌레잡기 / 살충)
-
- (dialog-back "이전")
-
- ;; warnings about closing a drscheme frame when the program
- ;; might still be doing something interesting
- (program-is-still-running "정의창 안의 프로그램이 아직 실행중입니다. 그래도 종료하시겠습니까?")
-  (program-has-open-windows "정의창 안의 프로그램이 열려있는 윈도우창이 있습니다. 그래도 종료하시겠습니까?")
- 
-  ;; ml-command-line-arguments is for the command line arguments
-  ;; label in the module language details in the language dialog.
-  (ml-command-line-arguments "문자열의 벡터로 명령행 인수 지정") ;확인하기
-
-  ;; ml-cp names are all for the module language collection path
-  ;; configuration. See the details portion of the language dialog
-  ;; for the module language (at the bottom).
-  (ml-cp-default-collection-path "<<기본 collection 경로>>")
-
-  ;; in std get-directory 
-  (ml-cp-choose-a-collection-path "Collection 폴더를 고르십시오.")
-
-  ;; err msg when adding default twice
-  (ml-cp-default-already-present
-   "기본 collection 경로는 이미 포함되어 있습니다.")
-  
-  ;; title of this section of the dialog (possibly the word
-  ;; `Collection' should not be translated)
-  (ml-cp-collection-paths "Collection 경로")
-
-  ;; button labels
-  (ml-cp-add "추가")
-  (ml-cp-add-default "기본값 추가")
-  (ml-cp-remove "제거")
-  (ml-cp-raise "올리기")
-  (ml-cp-lower "내리기")
-  
-  (ml-always-show-#lang-line "모듈 언어 설정에서 항상 #lang 줄 보이기")
-
-  ;; Profj
-  (profj-java "자바")
-  (profj-java-mode "자바 모드")
-  (profj-java-coverage "자바 구현 범위") ;; shows up in the preferences dialog under 'Color'
-  
-  (profj-beginner-lang "초보자")
-  (profj-beginner-lang-one-line-summary "자바와 유사한 초보 교육 언어")
-  (profj-full-lang "전부")
-  (profj-full-lang-one-line-summary "자바 1.0과 유사 (일부 1.1)")
-  (profj-advanced-lang "고급")
-  (profj-advanced-lang-one-line-summary "자바와 유사한 고급 교육 언어")
-  (profj-intermediate-lang "중급")
-  (profj-intermediate-lang-one-line-summary "자바와 유사한 중급 교육 언어")
-  (profj-intermediate-access-lang "중급 + 접근자")
-  (profj-intermediate-access-lang-one-line-summary "자바와 유사한 중급 교육 언어(접근자 포함)")
-  (profj-dynamic-lang "자바 + 동적 타입")
-  (profj-dynamic-lang-one-summary "자바 (동적 타입 포함)")
-
-  (profj-java-mode-color-heading "색상 수정") ; Heading for preference to choose editing colors  
-  (profj-java-mode-color-keyword "주요 단어")
-  (profj-java-mode-color-string "문자열")
-  (profj-java-mode-color-literal "글자")
-  (profj-java-mode-color-comment "주석")
-  (profj-java-mode-color-error "오류")
-  (profj-java-mode-color-identifier "식별자")
-  (profj-java-mode-color-prim-type "원시 타입") ; Example text for built-in Java types
-  (profj-java-mode-color-default "기본값")
-
-  (profj-coverage-color-heading "적용 범위 색상") ; Heading for preference to choose coverage colors
-  (profj-coverage-color-covered "적용 범위") 
-  
-  (profj-language-config-display-preferences "화면 설정") ; Heading for preferences controlling printing
-  (profj-language-config-display-style "화면 모습")
-  (profj-language-config-display-field "클래스 + 필드") ; 확인
-  (profj-language-config-class "클래스")
-  (profj-language-config-display-array "배열의 모든 내용을 출력")
-  (profj-language-config-testing-preferences "테스팅 설정") ; Heading for preferences controlling test behavior
-  ;(profj-language-config-testing-enable "실행시 테스팅 결과를 출력") ; Run should be the word found on the Run button
-  (profj-language-config-testing-coverage "테스트로부터 적용 범위 정보를 구하시겠습니까?")
-  (profj-language-config-support-test-language "테스트 언어 확장기능 사용")
-  (profj-language-config-testing-check "check 표현 허가") ; check should not be translated
-  (profj-language-config-classpath "클래스 경로")
-  (profj-language-config-choose-classpath-directory "클래스 경로에 추가할 디렉토리")
-  (profj-language-config-classpath-display "현재 클래스 경로 보기") ; Button label to print the current classpath
-
-  (profj-test-name-close-to-example "클래스 ~a 이름은 예제와 비슷한 표현을 포함한다.") ; 확인
-  (profj-test-name-example-miscapitalized "클래스 ~a 이름은 잘못 대문자화한 예제을 포함한다.")
-  
-   ;; Close testing window and do not run test cases any more
-  ;(profj-test-results-close-and-disable "닫고 테스팅 끄기")
-  ;; Hide docked testing window and do not run test cases any more
-  ;(profj-test-results-hide-and-disable "감추고 테스팅 끄기")
-  ;Renamed below
-  ;(profj-test-results-window-title "테스트 결과")
-  
-  (profj-unsupported "지원하지 않음")
-  (profj-executables-unsupported "죄송합니다 - 현재 버전의 자바는 이 실행파일을 지원하지 않습니다.")
-
-  (profj-convert-to-text-comment "문자 주석으로 변환")
-  (profj-convert-to-comment "주석으로 변환")
-
-  (profj-executing-main "main 실행중")
-
-  (profj-insert-java-comment-box "자바 주석 상자 삽입")
-  (profj-insert-java-interactions-box "자바 대화 상자 삽입")
-
-  ;;The Test engine tool
-  ;;
-  (test-engine-window-title "테스트 결과")
-  ;;Following two appear in View menu, attach and free test report window from DrRacket frame
-  (test-engine-dock-report "테스트 보고서 열기") ;확인
-  (test-engine-undock-report "테스트 보고서 닫기")
-  ;;Following two appear in Racket (Java, etc) menu, cause Tests to be Run automatically or not
-  (test-engine-enable-tests "테스트 켜기")
-  (test-engine-disable-tests "테스트 끄기")
-
-  (test-engine-ran-1-test "1개의 테스트 실행함.")
-  (test-engine-ran-1-check "1개 점검 실행함.")
-  ;; ditto, only plural
-  (test-engine-ran-n-tests "~a개 테스트들 실행함.")
-  (test-engine-ran-n-checks "~a개 점검 실행함.")
-  (test-engine-1-test-passed "테스트 통과함!")
-  (test-engine-1-check-passed "점검 통과함!")
-  (test-engine-both-tests-passed "2개 테스트 통과함!")
-  (test-engine-both-checks-passed "2개 점검 통과함!")
-  (test-engine-all-tests-passed "모든 테스트 통과함!")
-  (test-engine-all-checks-passed "모든 점검 통과함!")
-  (test-engine-all-n-tests-passed "모든 ~a개 테스트 통과함!")
-  (test-engine-all-n-checks-passed "모든 ~a개 점검 통과함!")
-  (test-engine-0-tests-passed "0개 테스트 통과함.")
-  (test-engine-0-checks-passed "0개 점검 통과함.")
-  (test-engine-m-of-n-tests-failed "~a개 중 ~a개 테스트 실패함.")
-  (test-engine-m-of-n-checks-failed "~a개 중 ~a개 점검 실패함.")
-  (test-engine-must-be-tested "이 프로그램은 테스트가 꼭 필요합니다!")
-  (test-engine-is-unchecked "이 프로그램은 점검이 필요합니다!")
-  (test-engine-tests-disabled "테스트 기능이 꺼져있습니다.")
-  (test-engine-should-be-tested "이 프로그램은 테스트가 필요합니다.")
-  (test-engine-at-line-column "~a줄 ~a칸")
-  (test-engine-in-at-line-column "~a 파일  ~a줄 ~a칸")
-  ; as in "칸 (알수없음)"
-  (test-engine-unknown "(알수없음)")
-  (test-engine-trace-error "추적 오류")
-
-  ; The ~F is special marker for the offending values, which may be
-  ; printed specially in DrRacket.
-  (test-engine-check-encountered-error
-   "check-expect에서 기대한 값 대신 다음의 오류가 발생했습니다. ~F. ~n   :: ~a")
-  (test-engine-actual-value-differs-error
-   "결과값 ~F이(가) 기대한 값 ~F와(과) 다릅니다.")
-  (test-engine-actual-value-not-within-error
-   "결과값 ~F은(는) ~v (기대한 값 ~F) 안에 없습니다..")
-  (test-engine-encountered-error-error
-   "check-error에서 기대와 달리 다음의 오류를 발생했습니다. ~a~n   :: ~a")
-  (test-engine-expected-error-error
-   "check-error에서 기대했던 다음의 오류 대신 다음의 값을 받았습니다. ~F.~n ~a")
-  ;; members are appended to the message
-  (test-engine-not-mem-error "결과값 ~F 은(는) 주어진 값들과 모두 달랐습니다.")
-  (test-engine-not-range-error "결과값 ~F 은(는) ~F 에서 ~F까지 안에 포함되지 못했습니다.")
-
-  ;; followed by list of variable bindings
-  (test-engine-property-fail-error "속성이 잘못되었습니다:") ; 확인
-  (test-engine-property-error-error "check-property에서 다음의 오류가 발생했습니다. ~n:: ~a")
-
-  ; section header
-  (test-engine-check-failures "점검 실패:")
-  ; section header
-  (test-engine-signature-violations "서명 위반:") ;확인
-
-  ; part of one phrase "signature <at line ...> to blame: procedure <...>
-  (test-engine-signature "서명") ; 확인
-  (test-engine-to-blame "책임 : 처리 절차")
-
-  (test-engine-no-signature-violations "서명 점검 성공.")
-  (test-engine-1-signature-violation "1개 서명 위반.")
-  (test-engine-n-signature-violations "~a개 서명 위반.")
-
-  ; as in got <value>, signature <at ...>
-  (test-engine-got "맞습니까?") ; 확인
-
-  (profjWizward-insert-java-class "자바 클래스 삽입")
-  (profjWizard-insert-java-union "자바 공용체(union) 삽입")
-  
-  ;; The Test Suite Tool
-  ;; Errors
-  (test-case-empty-error "테스트 케이스가 비어 있습니다.")
-  (test-case-too-many-expressions-error "너무 많은 표현이 하나의 테스트 케이스에 있습니다.")
-  ;; DrRacket window menu items
-  (test-case-insert "테스트 케이스 삽입")
-  (test-case-disable-all "모든 테스트 케이스 끄기")
-  (test-case-enable-all "모든 테스트 케이스 켜기")
-  
-  ;; NOTE: The following string constants are labels of the test-case fields. The width
-  ;;       of the field is determined by the length of the longest of the following three words.
-  ;;       if the words are too long the test case will take up too much horizontal room and
-  ;;       not look very good.
-  ;; This string is the label of the expression that is being tested in a test case.
-  (test-case-to-test "테스트")
-  ;; This string is the label of the expression that is the expected value of the to-test expression.
-  (test-case-expected "기대 값") ;확인하기 should be
-  ;; This string is the label of the actual result of the to test expression.
-  (test-case-actual "결과값")
-  (test-case-predicate "기대 값") ;확인하기 predicate
-  (test-case-should-raise "기대한 오류") ;확인하기 should raise
-  ;; The label of a field of the test-case that describes the expected error message of a test case
-  (test-case-error-message "오류 정보")
-
-  (test-case-menu-title "테스트 케이스")
-  (test-case-switch-to-error-box "오류 테스트 상자로 변경") ;확인하기 error test box
-  (test-case-switch-to-nonerror-box "오류없는 테스트 상자로 변경") ;확인하기 nonerror test box
-  (test-case-collapse "테스트 케이스를 접습니다")
-  (test-case-show-actual "결과값 보기")
-  (test-case-enable "테스트 케이스 켜기")
-  (test-case-show-predicate "기대 값 보기") ;확인하기 predicate
-  (test-case-show-error-message "오류 정보 보기")
-  (test-case-convert-to-text "문자로 변경")
-  
-  ;; Profj Boxes
-  (profjBoxes-empty-error "대화가 비어있습니다.")
-  (profjBoxes-too-many-expressions-error "한 개의 상자에 너무 많은 표현이 있습니다.")
-  (profjBoxes-interactions-label "대화")
-  (profjBoxes-bad-java-id-error "잘못된 자바 ID")
-  (profjBoxes-examples-label "예제")
-  (profjBoxes-add-new-example-button "새로운 예제 추가")
-  (profjBoxes-type "타입")
-  ;; The Java identifier of an example of data
-  (profjBoxes-name "이름")
-  (profjBoxes-value "값")
-  (profjBoxes-insert-java-examples "자바 예제 삽입")
-  (profjBoxes-insert-java-interactions "자바 정의 삽입")
-
-  ;; Slideshow
-  (slideshow-hide-picts "중첩된 상자 보기")
-  (slideshow-show-picts "그림 보기")
-  (slideshow-cannot-show-picts "그림을 열수 없습니다; 우선 크기를 캐쉬하도록 프로그램을 실행하십시오.") ; 다시 확인
-  (slideshow-insert-pict-box "그림 상자 삽입")
-
-  ;; GUI Tool
-  (gui-tool-heading "GUI 도구")
-  (gui-tool-before-clicking-message "툴 아이콘을 클릭하기 이전에 \"Special\"안의 \"GUI 삽입\" menu을 이용해 최상위 GUI 아이템을 추가하거나 이미 삽입된 GUI를 선택하십시오.")
-  (gui-tool-show-gui-toolbar "GUI 툴바 보기")
-  (gui-tool-hide-gui-toolbar "GUI 툴바 감추기")
-  (gui-tool-insert-gui "GUI 삽입")
-
-  ;; contract violation tracking
-  
-  ; tooltip for new planet icon in drscheme window (must have a planet violation logged to see it)
-  (show-planet-contract-violations "PLaneT 계약 위반")
-
-  ; buttons in the dialog that lists the recorded bug reports
-  (bug-track-report "파일 티켓")
-  (bug-track-forget "그만두기"); 확인하기 forget
-  (bug-track-forget-all "모두 그만두기")
-    
-  ;; planet status messages in the bottom of the drscheme window; the ~a is filled with the name of the package
-  (planet-downloading "PLaneT: ~a 내려받는 중...")
-  (planet-installing "PLaneT: ~a 설치 중...")
-  (planet-finished "PLaneT: ~a 완료.")
-  (planet-docs-building "PLaneT: ~a - docs 만드는 중...")
-  (planet-no-status "PLaneT") ;; this can happen when there is status shown in a different and then the user switches to a tab where planet hasn't been used
-  
-  ;; string normalization. To see this, paste some text with a ligature into DrRacket
-  ;; the first three strings are in the dialog that appears. The last one is in the preferences dialog
-  (normalize "표준화한다")
-  (leave-alone "그대로둔다")
-  (normalize-string-info "붙인 문자열에 합자 또는 표준화 되지 않은 문자가 포함되어있습니다. 이 문자열을 표준화하시겠습니까?")
-  (normalize-string-preference "붙인 문자열을 표준화한다") ;확인하기 실행버튼 찾아보고 재현해볼 것
-  (ask-about-normalizing-strings "문자열을 표준화하시겠습니까?")
-  ) 
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/portuguese-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/portuguese-string-constants.rkt
deleted file mode 100644
index 636d142005..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/portuguese-string-constants.rkt
+++ /dev/null
@@ -1,1183 +0,0 @@
-#|
-
-When modifying the string constants files,
-please adhere to these guidelines:
-
-- All the entries in english-string-constants.rkt have the same format
-  (name string).  If the purpose of an entry you are adding to the
-  file is not clear from just the name and string, put a comment next
-  to the entry explaining what the string is going to be used for and
-  in what context.
-  That's especially true for strings that contain things like "~a".
-  Systematically describe what the "~a" is going to be replaced with.
-  When we have to translate strings like "deleting ~a", we translators
-  need to know what "~a" is going to be (in particular, in some
-  languages like French, we need to know whether the "~a" is going to
-  be a masculine or feminine word, or whether it's going to be
-  singular or plural, etc).
-
-- When adding a bunch of new entries, put together in a section the
-  entries that logically belong together.  Give a title to your
-  section, so we have an idea of what the strings are for.  Don't mix
-  in the same section strings that have nothing to do with each other,
-  that's only going to confuse us.  Do not start a new section if
-  there's already one that deals with the same thing.  Dumping all the
-  new entries in random order at the end of the file is not a good way
-  to have your new entries translated in a timely manner...
-
-- Before adding strings for your new pet tool, check whether you can't
-  re-use strings that already exist.  There's no need for yet another
-  "Ok" string...
-
-- If you modify an existing string in english-string-constants.rkt, go
-  through all the *-string-constants.rkt files for the other languages,
-  comment out the old version of the modified string in each of these
-  files, and put a short comment there telling us the English string
-  has changed and needs to be re-translated.  Do not erase the old
-  version, it might help us translate the new one.  Do not move it
-  either.  Just comment it out and add the short comment.  After the
-  next git update DrRacket will automatically tell us translators that
-  a new string needs to be translated, we will find your comment in
-  the file, and know what to do.
-	Some evil evil people might think that, since DrRacket automatically
-  informs us of new strings to be translated, an easier thing to do
-  when modifying an existing string would be to simply rename it at
-  the same time.  This works, except that if you do that, we
-  translators will get two warnings from DrRacket:
-		language english had but french does not:
-		(new-name "New String")
-		language french had but english does not:
-		(old-name "Old String")
-  then we translators will be left to wonder whether the two things
-  are related or not, and whether we can safely base our translation
-  of "New String" on the translation of "Old String" (since the two
-  strings are likely to be close in meaning).  Worse, we might not
-  even realize the two strings are related and translate "New String"
-  from scratch, just to realize later that it's only a variation of
-  "Old String".  I can tell you that nothing pisses off a translator
-  more than having to translate pretty much the same string twice
-  just because *you* were too lazy to inform us that it was just a
-  slight modification to an existing string rather than an entirely
-  new one.  Conclusion: do not change the name of a string unless you
-  have some really good reason to do so.
-
-- Please think hard before choosing a string and make sure it means
-  what you want it to mean.  That way you won't have to change it
-  later, and we won't have to retranslate it.
-
-- Please think hard before choosing the name for a string.  Use
-  meaningful names.  "error" or "ok" are not meaningful names.  Prefix
-  all related names with a common prefix (the name of your tool or
-  module).  String names are not the right place to save on typing.
-
-- If, for some reason, you really have to change the name of a string
-  (like, because the original name you gave it really sucked...),
-  change the name of the string in *ALL* the *-string-constants.rkt
-  files.  That's a modification you can do without the help of a
-  translator, so do it yourself.  It's not the job of the translators
-  to clean up your naming mess for you.  Besides, you are the one who
-  knows what you changed, so leaving the translators having to guess
-  what you did is Not Nice(tm).
-
-- If, for some reason, you need to remove a string (i.e. you changed
-  your code and don't need the string anymore), remove the string in
-  *ALL* the *-string-constants.rkt files.  Again, you don't need the
-  help of a translator to do that.  If you're not sure whether you
-  might need the string in the future or not, just comment it out in
-  *ALL* the files.
-
-|#
-
-(module portuguese-string-constants "string-constant-lang.rkt"
- ;;; when translating this constant, substitute name of actual language for `English'
- (is-this-your-native-language "Português é a tua língua materna?")
-
- (are-you-sure-you-want-to-switch-languages
-  "Isto vai modificar a língua da interface gráfica, o que requere que reinicie o DrRacket. Tem a certeza que deseja prosseguir?")
-
- (interact-with-drscheme-in-language "Usar o DrRacket em Português")
-
- ;; these two should probably be the same in all languages except English.
- ;; they are the button labels (under macos and windows, respectively)
- ;; that go the with the string above.
- (accept-and-quit "Aceitar e Sair")
- (accept-and-exit "Aceitar e Sair")
- 
- ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
- (plt "PLT")
- (drscheme "DrRacket")
- (drracket "DrRacket")
- (ok "OK")
- (cancel "Cancelar")
- (abort "Abortar")
- (untitled "SemNome")
- (untitled-n "SemNome ~a")
- (warning "Aviso")
- (error "Erro")
- (close "Fechar") ;; as in, close an open window. must match close-menu-item
-                  ;; in the sense that, when the &s have been stripped from
-                  ;; close-menu-item, it must be the same string as this.
- (stop "Parar")   
- (&stop "&Parar") ;; for use in button and menu item labels, with short cut.
- (are-you-sure-delete? "Tem a certeza que deseja remover ~a?") ;; ~a is a filename or directory name
- (ignore "Ignorar")
- (revert "Recuperar")
-
- ;; label for a generic check box, often supported on dialogs
- ;; that ask a binary choice of the user. If checked, the
- ;; dialog isn't going to be shown again.
- ;; One version for always using the current choice:
- (dont-ask-again-always-current "Não voltar a perguntar (utilizar sempre a escolha actual)")
- ;; One generic version (ie, on the Quit DrRacket dialog)
- (dont-ask-again                "Não voltar a perguntar")
-
- ;;; important urls
- (web-materials "Sítios Web Relacionados") ;; menu item title
- (tool-web-sites "Sítios Web de Ferramentas")   ;; menu item title
- (plt-homepage "Racket")
- (pbd-homepage "Program by Design")
-
- ;;; bug report form
- (cancel-bug-report? "Cancelar relatório de erro?")
- (are-you-sure-cancel-bug-report?
-  "Tem a certeza que deseja cancelar o envio deste relatório de erro?")
- (bug-report-form "Formulário de relatório de erro")
- (bug-report-field-name "Nome")
- (bug-report-field-email "Email")
- (bug-report-field-summary "Sumário")
- (bug-report-field-severity "Gravidade")
- (bug-report-field-class "Categoria")
- (bug-report-field-description "Descrição")
- (bug-report-field-reproduce1 "Passos a")
- (bug-report-field-reproduce2 "Reproduzir")
- (bug-report-field-environment "Ambiente")
- (bug-report-field-docs-installed "Documentação Instalada")
- (bug-report-field-collections "Colecções")
- (bug-report-field-human-language "Língua")
- (bug-report-field-memory-use "Utilização de Memória")
- (bug-report-field-version "Versão")
- (bug-report-synthesized-information "Informação Gerada")  ;; dialog title
- (bug-report-show-synthesized-info "Mostrar Informação Gerada")
- (bug-report-submit "Enviar")
- (bug-report-submit-menu-item "Enviar relatório de erro...") ;; in Help Menu (drs & help desk)
- (error-sending-bug-report "Erro a Enviar relatório de erro")
- (error-sending-bug-report-expln "Um erro ocorreu enquanto o relatório de erro estava a ser enviado. Se a sua ligação à internet está a funcionar correctamente, por favor visite:\n\n http://bugs.racket-lang.org/\n\ne envie o erro através do nosso formulário online. Pedimos desculpa pelo incómodo.\n\nA mensagem de erro é:\n~a")
- (illegal-bug-report "Relatório de Erro Ilegal")
- (pls-fill-in-field "Por favor preencha o campo \"~a\"")
- (malformed-email-address "Endereço de email mal formado")
- (pls-fill-in-either-description-or-reproduce "Por favor preencha o campo de Descrição ou o campo com os Passos para Reproduzir o erro.")
-
- ;;; check syntax
- (check-syntax "Verificar Sintaxe")
- (cs-italic "Itálico")
- (cs-bold "Negrito")
- (cs-underline "Sublinhar")
- (cs-change-color "Modificar cor")
- (cs-tack/untack-arrow "Marcar/Desmarcar Seta(s)")
- (cs-jump-to-next-bound-occurrence "Saltar para a Próxima Ocorrência")
- (cs-jump-to-binding "Ir para a Próxima Atribuição")
- (cs-jump-to-definition "Ir para a Definição")
- (cs-error-message "Mensagem de Erro")
- (cs-open-file "Abrir ~a")
- (cs-rename-var "Renomear ~a")
- (cs-rename-id "Renomear Identificador")
- (cs-rename-var-to "Renomear ~a para:")
- (cs-name-duplication-error "O novo nome que escolheu, ~s, entra em conflito com um nome já existente no ambiente corrente.")
- (cs-rename-anyway "Renomear na Mesma")
- (cs-status-init "Verificar Sintaxe: A Inicializar ambiente para o código do utilizador")
- (cs-status-coloring-program "Verificar Sintaxe: a colorir expressão")
- (cs-status-eval-compile-time "Veriricar Sintaxe: tempo de compilação do eval")
- (cs-status-expanding-expression "Verificar Sintaxe: a expandir a expressão")
- (cs-mouse-over-import "a ligar ~s importada de ~s")
-
- (cs-lexical-variable "variável léxica")
- (cs-imported-variable "variável importada")
-
- ;;; info bar at botttom of drscheme frame
- (collect-button-label "GC")
- (read-only "Apenas Leitura")
- (auto-extend-selection "Auto-Extensível")
- (overwrite "Reescrever")
- (running "a executar")
- (not-running "parado")
- 
- ;;; misc
- (welcome-to-something "Benvindo a ~a")
- 
- ; this appears in the drscheme about box.
- (welcome-to-drscheme-version/language "Benvindo ao DrRacket, versão ~a, ~a")
-
- ; these appear on subsequent lines in the `Help|Welcome to DrRacket' dialog.
- (welcome-to-drscheme "Benvindo ao DrRacket")
-
- (goto-line "Ir para a Linha")
- (goto-line-invalid-number
-  "~a não é um número de linha válido. Deve ser um inteiro entre 1 e ~a")
- (goto-position "Ir para a Posição")
- (no-full-name-since-not-saved
-  "O ficheiro não tem um nome completo porque ainda não foi gravado.")
- (cannot-open-because-dne "Impossível abrir ~a porque não existe.")
- 
-  (needs-execute-language-changed
-   "ATENÇÃO: A língua mudou. Clique Correr.")
-  (needs-execute-teachpack-changed
-   "ATENÇÃO: Os pacotes de ensino mudaram. Clique Correr.")
-  (needs-execute-defns-edited
-   "ATENÇÃO: A janela de definições mudou. Clique Correr.")
-  
- (file-is-not-saved "O ficheiro \"~a\" não está gravado.")
- (save "Gravar")
- (close-anyway "Fechar na Mesma")
- (clear-anyway "Limpar na Mesma")
-
- ;; menu item title
- (log-definitions-and-interactions "Arquivar Definições e Interacções...")
- (stop-logging "Parar Arquivação")
- (please-choose-a-log-directory "Por favor escolha uma directoria de arquivação")
- (logging-to "A arquivar para: ")
- (erase-log-directory-contents "Apagar todo o conteúdo da directoria de arquivação: ~a?")
- (error-erasing-log-directory "Erro a apagar o conteúdo da directoria de arquivação.\n\n~a\n")
-
- ;; modes
- (mode-submenu-label "Modos")
- (scheme-mode "Modo Scheme")
- (racket-mode "Modo Racket")
- (text-mode "Modo Texto")
-
- (scheme-mode-color-symbol "Símbolo")
- (scheme-mode-color-keyword "Palavra-Chave")
- (scheme-mode-color-comment "Comentário")
- (scheme-mode-color-string "String")
- (scheme-mode-color-constant "Constante")
- (scheme-mode-color-parenthesis "Parêntesis")
- (scheme-mode-color-error "Erro")
- (scheme-mode-color-other "Outro")
- ;; the ~a is filled in with one of the above (scheme-mode-*)
- (syntax-coloring-choose-color "Escolher uma cor para ~a")
- (preferences-colors "Cores") ;; used in the preferences dialog
- 
- (url: "URL:")
- (open-url... "Abrir URL...")
- (open-url "Abrir URL")
- (browse... "Procurar...")
- (bad-url "URL Errado")
- (bad-url:this "URL Errado: ~a")
- 
- ;; Help Desk
- (help "Ajuda")
- (help-desk "Directorio de Ajuda")
- (plt:hd:search "Procurar")
- (plt:hd:feeling-lucky "Sinto-me Sortudo")
- (plt:hd:home "Início do Directorio de Ajuda") 
- ; next 3 are popup menu choices in help desk search frame
- (plt:hd:search-for-keyword "Procurar por palavra-chave")
- (plt:hd:search-for-keyword-or-index "Procurar por palavra-chave ou índice")
- (plt:hd:search-for-keyword-or-index-or-text "Procurar por palavra-chave, índice ou texto")
- (plt:hd:exact-match "Procura exacta")
- (plt:hd:containing-match "A conter a procura")
- (plt:hd:regexp-match "Procura de expressão regular (regexp)")
- (plt:hd:find-docs-for "Procurar documentos por:")
- (plt:hd:search-stopped-too-many-matches "[Procura Abortada: demasiados resultados]")
- (plt:hd:nothing-found-for "Nada encontrado para ~a")
- (plt:hd:and "e")
- (plt:hd:refresh "Refrescar")
- (plt:hd:refresh-all-manuals "Refrescar todos os manuais")
- (plt:hd:manual-installed-date "(instalado a ~a)")
- ; Help Desk configuration
- ;; refreshing manuals
- (plt:hd:refreshing-manuals "Reactualização de manuais")
- (plt:hd:refresh-downloading... "A tirar ~a...")
- (plt:hd:refresh-deleting... "A remover a versão antiga de ~a...")
- (plt:hd:refresh-installing... "A instalar nova versão de ~a...")
- (plt:hd:refresh-clearing-indices "A apagar os índices em cache")
- (plt:hd:refreshing-manuals-finished "Concluído.")
- (plt:hd:about-help-desk "Sobre o Directorio de Ajuda")
- (plt:hd:help-desk-about-string
-  "O Directorio de Ajuda é um recurso completo de informação sobre o software da PLT, incluindo o DrRacket, MzScheme e o MrEd.\n\nVersão ~a\n Copyright (c) ~a-~a PLT")
- (plt:hd:help-on-help "Ajuda sobre a Ajuda")
- (plt:hd:help-on-help-details "Para ajuda sobre como utilizar o Directorio de Ajuda, seguir a ligação `Como usar o Directorio de Ajuda' no inicio do Directorio de Ajuda. (Para ir para o inicio se ainda não estiver lá, clique no botão `Início' no topo da janela do Directorio de Ajuda.)")
-  (reload "Actualizar") ;; refresh the page in a web browser
-  (plt:hd:ask-about-separate-browser
-   "Seleccionou uma ligação para um conteúdo na web. Quer visualizá-lo no navegador do Directorio de Ajuda, ou prefere usar um navegador independente?")
-  (plt:hd:homebrew-browser "Navegador do Directorio de Ajuda") ;; choice for the above string (in a button)
-  (plt:hd:separate-browser "Navegador Independente") ;; other choice for the above string (also in a button)
-  (plt:hd:external-link-in-help "URLs Externos na Ajuda")
-  (plt:hd:use-homebrew-browser "Usar o navegador do Directorio da Ajuda para URLs Externos")
-  (plt:hd:new-help-desk "Novo Directorio de Ajuda")
-
-  ;; in the Help Desk language dialog, title on the right.
-  (plt:hd:manual-search-ordering "Ordem de Procura dos Manuais")
-
-  ;; in the help-desk standalone font preference dialog, on a check box
-  (use-drscheme-font-size "Usar o tamanho de fonte do DrRacket")
-  
-  ;; in the preferences dialog in drscheme there is example text for help desk font size.
-  ;; clicking the links in that text produces a dialog with this message
-  (help-desk-this-is-just-example-text
-   "Isto é apenas um texto exemplo para a opção do tamanho da fonte. Abra o directório de ajuda (do menu Ajuda) para seguir estas ligações.")
-  
- ;; Help desk htty proxy
- (http-proxy "HTTP Proxy")
- (proxy-direct-connection "Conexão Directa")
- (proxy-use-proxy "Usar Proxy:")
- (proxy-host "Host")
- (proxy-port "Porto")
- (proxy-bad-host "Host de Proxy Incorrecto")
-
- ;; browser
- (rewind-in-browser-history "Para Trás")
- (forward-in-browser-history "Avançar")
- (home "Início")
- (browser "Navegador")
- (external-browser-choice-title "Navegador Externo") ; title for radio-button set
- (browser-command-line-label "Linha de Comandos:") ; label for radio button that is followed by text boxes
- (choose-browser "Escolher um Navegador")
- (no-browser "Perguntar mais tarde")
- (browser-cmdline-expl-line-1 "(Linha de comando formada pela concatenação do texto inicial, URL,") ; explanatory text for dialog, line 1
- (browser-cmdline-expl-line-2 "e o texto final, sem espaços extra entre eles.)") ; ... line 2. (Anyone need more lines?)
- (install? "Instalar?")  ;; if a .plt file is found (title of dialog)
- (you-have-selected-an-installable-package "Seleccionou um pacote instalável.")
- (do-you-want-to-install-it? "Deseja instalá-lo?")
- (paren-file-size "(Este ficheiro tem ~a bytes)")
- (download-and-install "Tirar && Instalar") ;; button label
- (download "Tirar") ;; button label
- (save-downloaded-file/size "Gravar ficheiro tirado (~a bytes) como") ;; label for get-file dialog
- (save-downloaded-file "Gravar ficheiro tirado como")  ;; label for get-file dialog
- (downloading "A tirar") ;; dialog title
- (downloading-file... "A tirar...")
- (package-was-installed "O pacote foi instalado.")
- (download-was-saved "O ficheiro tirado foi gravado.")
-
- (install-plt-file-menu-item... "Instalar ficheiro .plt...")
- (install-plt-file-dialog-title "Instalar ficheiro .plt")
- (install-plt-web-tab "Web")
- (install-plt-file-tab "Ficheiro")
- (install-plt-filename "Nome do Ficheiro:")
- (install-plt-url "URL:")
- 
- ;; install plt file when opened in drscheme strings
- (install-plt-file "Instalar ~a ou abrir ficheiro para edição?")
- (install-plt-file/yes "Instalar")
- (install-plt-file/no "Editar")
-
- (plt-installer-progress-window-title "Progresso da Instalação") ;; frame title
- (plt-installer-abort-installation "Abortar Instalação") ;; button label
- (plt-installer-aborted "Abortado.") ;; msg that appears in the installation window when installation is aborted
-
- ;;; about box
- (about-drscheme-frame-title "Sobre o DrRacket")
- 
- ;;; save file in particular format prompting.
- (save-as-plain-text "Gravar este ficheiro como texto?")
- (save-in-drs-format "Gravar este ficheiro no formato específico de DrRacket?")
- (yes "Sim")
- (no "Não")
- 
- ;;; preferences
- (preferences "Preferências")
- (error-saving-preferences "Erro a gravar preferências: ~a")
- (error-saving-preferences-title "Erro a gravar preferências")
- (error-reading-preferences "Erro a ler preferências")
- (prefs-file-locked "The preferences file is locked (because the file ~a exists), so your preference change could not be saved. Cancel preference change?")
- (try-again "Tentar de novo") ;; button label
- (prefs-file-still-locked "O ficheiro de preferências continua trancado (porque o ficheiro ~a existe), logo as suas modificações não serão guardadas.")
- (scheme-prefs-panel-label "Racket")
- (warnings-prefs-panel-label "Avisos")
- (editor-prefs-panel-label "Editar")
- (general-prefs-panel-label "Geral")
- (highlight-parens "Iluminar entre parêntesis correctos")
- (fixup-open-brackets "Ajustar automaticamente parêntesis rectos de abertura")
- (fixup-close-parens "Ajustar automaticamente parêntesis de fecho")
- (flash-paren-match "Iluminar correcção de parêntesis")
- (auto-save-files "Auto-gravar ficheiros")
- (backup-files "Gravar ficheiros como backup")
- (map-delete-to-backspace "Mapar tecla de delete para backspace")
- (verify-exit "Verificar Saída")
- (ask-before-changing-format "Perguntar antes de modificar formato de gravação")
- (wrap-words-in-editor-buffers "Wrap words in editor buffers")
- (show-status-line "Mostrar linha de status")
- (count-columns-from-one "Contar número de colunas a partir de um")
- (display-line-numbers "Mostrar número da linha no buffer; sem offset de caracteres")
- (show-line-and-column-numbers "Mostrar número de linha e coluna") ; used for popup menu; right click on line/column box in bottom of drs window
- (show-character-offsets "Mostrar caractéres de offset") ; used for popup menu; right click on line/column box in bottom of drs window
- (enable-keybindings-in-menus "Activar ligações de teclas nos menus")
- (option-as-meta "Tratar tecla option como meta") ;; macos/macos x only
- (reuse-existing-frames "Reutilizar janelas já existentes para abrir novos ficheiros")
- (default-fonts "Fontes por Defeito")
- (paren-match-color "Cor de iluminação dos parêntesis"); in prefs dialog
- (online-coloring-active "Coloração de sintaxe interactiva")
- (open-files-in-tabs "Abrir ficheiros em tabs separados (não em janelas separadas)")
- (show-interactions-on-execute "Abrir janela de interacções automaticamente quando correr um programa")
- (limit-interactions-size "Limitar tamanho das interacções")
- (background-color "Cor de fundo")
- (default-text-color "Texto por defeito") ;; used for configuring colors, but doesn't need the word "color"
- (choose-a-background-color "Por favor escolha uma cor de fundo")
-
- ; title of the color choosing dialog
-
- ; should have entire alphabet
- (font-example-string "The quick brown fox jumped over the lazy dogs.") 
-
- (change-font-button-label "Modificar")
- (fonts "Fontes")
-
- ; filled with type of font, eg modern, swiss, etc.
- (choose-a-new-font "Por favor, escolha uma nova \"~a\" fonte")
-
- (font-size-slider-label "Tamanho")
- (restart-to-see-font-changes "Reinicie para ver a mudança de fonte")
-
- (font-prefs-panel-title "Fonte")
- (font-name "Nome da Fonte")
- (font-size "Tamanho da Fonte")
- (set-font "Modificar Fonte...")
- (font-smoothing-label  "Suavização da Fonte")
- (font-smoothing-none "Nenhuma")
- (font-smoothing-some "Alguma")
- (font-smoothing-all "Total")
- (font-smoothing-default "Usar opções por defeito do sistema")
- (select-font-name "Seleccione o nome da fonte")
- (example-text "Texto Exemplo:")
- (only-warn-once "Avisar apenas uma vez quando as definições e as interacções não estiverem sincronizadas")
- 
- ; warning message when lockfile is around
- (waiting-for-pref-lock "À espera do ficheiro de tranca das preferências...")
- (pref-lock-not-gone
-  "O ficheiro de tranca:\n\n   ~a\n\nprevine que as preferências de serem guardadas. Certifique-se que nenhum software Racket está a correr e apague este ficheiro.")
- (still-locked-exit-anyway? "As preferências não foram guardadas com sucesso. Pretende continuar?")
- 
- ;;; indenting preferences panel
- (indenting-prefs-panel-label "Indentação")
- (indenting-prefs-extra-regexp "Expressões regulares extra")
-
- (square-bracket-prefs-panel-label "Parêntesis Recto")
-  
- ; filled with define, lambda, or begin
- (enter-new-keyword "Insira nova palavra chave do tipo ~a:")
- (x-keyword "Palavra Chave ~a")
- (x-like-keywords "Palavras Chave do tipo ~a")
-
-  ; used in Square bracket panel
- (skip-subexpressions "Número de sub-expressões a saltar")
-  
- (expected-a-symbol "esperava um símbolo, recebeu: ~a")
- (already-used-keyword "\"~a\" já é uma palavra chave na lista de indentação")
- (add-keyword "Adicionar")
- (remove-keyword "Remover")
- 
- ;;; find/replace
- (find-and-replace "Procurar e Substituir")
- (find "Procurar")
- (replace "Substituir")
- (dock "Esconder")
- (undock "Não Esconder")
- (replace&find-again "Substituir && Procurar de Novo") ;;; need double & to get a single &
- (forward "Avançar")
- (backward "Recuar")
- (hide "Esconder")
- 
- ;;; multi-file-search
- (mfs-multi-file-search-menu-item "Procurar nos Ficheiros...")
- (mfs-string-match/graphics "String match (handles files with graphics)")
- (mfs-regexp-match/no-graphics "Expressão Regular (apenas com ficheiros de texto simples)")
- (mfs-searching... "A Procurar...")
- (mfs-configure-search "Configurar Procura") ;; dialog title
- (mfs-files-section "Ficheiros")   ;; section in config dialog
- (mfs-search-section "Procura") ;; section in config dialog
- (mfs-dir "Directorio")
- (mfs-recur-over-subdirectories "Recursão sobre subdirectorias")
- (mfs-regexp-filename-filter "Expressão Regular para filtro do nome do ficheiro")
- (mfs-search-string "String de Procura")
- (mfs-drscheme-multi-file-search "Procura Multi Ficheiro - DrRacket") ;; results window and error message title
- (mfs-not-a-dir "\"~a\" não é um directorio")
- (mfs-open-file "Abrir Ficheiro")
- (mfs-stop-search "Parar Procura")
- (mfs-case-sensitive-label "Case sensitive")
- (mfs-no-matches-found "No matches found.")
- (mfs-search-interrupted "Procura Abortada.")
- 
- ;;; reverting a file
- (are-you-sure-revert
-  "De certeza que pretende recuperar este ficheiro? Esta modificação não poderá ser desfeita.")
- (are-you-sure-revert-title
-  "Recuperar?")
- 
- ;;; saving a file
- ; ~a is filled with the filename
- (error-saving "Erro a gravar") ;; title of error message dialog
- (error-saving-file/name "Existiu um erro a gravar ~a.")
- (error-loading "Erro a carregar")
- (error-loading-file/name "Existiu um erro a carregar ~a.")
- (unknown-filename "<< desconhecido >>")
-
- ;;; finder dialog
- (must-specify-a-filename "Deverá especificar um nome para o ficheiro")
- (file-does-not-exist "O ficheiro \"~a\" não existe.")
- (ask-because-file-exists "O ficheiro \"~a\" já existe. Deseja substituí-lo?")
- (dne-or-cycle "The file \"~a\" contains a nonexistent directory or a cycle.")
- (get-file "Get file")
- (put-file "Put file")
- (full-pathname "Full pathname")
- (show-dot-files "Show files and directories that begin with a dot.")
- (up-directory-button-label "Up directory")
- (add-button-label "Add") ;;; for multi-file selection
- (add-all-button-label "Add all") ;;; for multi-file selection
- (remove-button-label "Remove") ;;; for multi-file selection
- (file-wrong-form "That filename does not have the right form.")
- (select-files "Select files")
- (select-file "Select a file")
- (dir-dne "That directory does not exist.")
- (file-dne "That file does not exist.")
- (empty-filename "The filename must have some letters in it.")
- (that-is-dir-name "That is a directory name.")
- 
- ;;; raw menu names -- these must match the 
- ;;; versions below, once the &s have been stripped.
- ;;; if they don't, DrRacket's menus will appear
- ;;; in the wrong order.
- (file-menu "Ficheiro")
- (edit-menu "Editar")
- (help-menu "Ajuda")
- (windows-menu "Janelas")
- 
- ;;; menus
- ;;; - in menu labels, the & indicates a alt-key based shortcut.
- ;;; - sometimes, things are stuck in the middle of 
- ;;; menu item labels. For instance, in the case of
- ;;; the "Save As" menu, you might see: "Save Definitions As". 
- ;;; be careful of spacing, follow the English, if possible.
- ;;; - the ellipses in the `after' strings indicates that
- ;;; more information is required from the user before completing
- ;;; the command.
-
- (file-menu-label "&Ficheiro")
-
- (new-info  "Abrir novo ficheiro")
- (new-menu-item "&Novo")
- (new-...-menu-item "&Novo...")
-
- (open-info "Abrir ficheiro do disco")
- (open-menu-item "&Abrir...")
-
- (open-recent-info "A lista dos ficheiros abertos mais recentes")
- (open-recent-menu-item "Abrir Recente")
- 
- (revert-info "Revert this file to the copy on disk")
- (revert-menu-item "&Revert")
-
- (save-info "Gravar este ficheiro para o disco")
- (save-menu-item "&Gravar")
-
- (save-as-info "Prompt for a filename and save this file to disk")
- (save-as-menu-item "Gravar &Como...")
-
- (print-info "Enviar este ficheiro para a impressora")
- (print-menu-item "&Imprimir...")
-
- (close-info "Fechar este ficheiro")
- (close-menu-item "&Fechar")
-
- (quit-info "Fechar todas as janelas")
- (quit-menu-item-windows "&Fechar")
- (quit-menu-item-others "&Sair")
- 
- (edit-menu-label "&Editar")
- 
- (undo-info "Desfazer a acção mais recente")
- (undo-menu-item "&Desfazer")
-
- (redo-info "Undo the most recent undo")
- (redo-menu-item "&Refazer")
-
- (cut-info "Mover os items seleccionados para o clipboard para colar mais tarde")
- (cut-menu-item "Cor&tar")
-
- (copy-info "Copiar os items seleccionados para o clipboard para colar mais tarde")
- (copy-menu-item "&Copiar")
-
- (paste-info "Colar os items copiados ou cortados mais recentemente, em vez dos items seleccionados")
- (paste-menu-item "&Colar")
-
- (clear-info "Apagar os items seleccionados sem afectar o clipboard ou a colagem")
- (clear-menu-item-windows "&Delete")
-
- (select-all-info "Seleccionar o documento todo")
- (select-all-menu-item "Se&leccionar Tudo")
- 
- (find-info "Procurar por uma string")
- (find-menu-item "Procurar...")
-
- (find-again-info "Procurar pela mesma string que anteriormente")
- (find-again-menu-item "Procurar de novo")
- 
- (replace-and-find-again-info "Substituir o texto corrente e procurar pela mesma string que anteriormente")
- (replace-and-find-again-menu-item "Substituir && Procurar de Novo")
-
- (preferences-info "Configurar as tuas preferências")
- (preferences-menu-item "Preferências...")
-
- (keybindings-info "Show the currently active keybindings")
- (keybindings-menu-item "Keybindings")
- (keybindings-show-active "Show Active Keybindings")
- (keybindings-frame-title "Keybindings")
- (keybindings-sort-by-name "Sort by Name")
- (keybindings-sort-by-key "Sort by Key")
- (keybindings-add-user-defined-keybindings "Add User-defined Keybindings...")
- (keybindings-menu-remove "Remove ~a")
- (keybindings-choose-user-defined-file "Please choose a file containing keybindings.")
-
- (user-defined-keybinding-error "Error running keybinding ~a\n\n~a")
- (user-defined-keybinding-malformed-file "The file ~a does not contain a module written in the framework/keybinding-lang language.")  
-  
- ;; menu items in the "special" menu
- (insert-text-box-item "Inserir Caixa de Texto")
- (insert-image-item "Inserir Imagem...")
- (insert-comment-box-menu-item-label "Inserir Caixa de Comentário")
- (insert-lambda "Inserir λ")
-
- (wrap-text-item "Wrap Text")
-
- (windows-menu-label "&Janelas")
- (bring-frame-to-front "Bring Frame to Front")       ;;; title of dialog
- (bring-frame-to-front... "Bring Frame to Front...") ;;; corresponding title of menu item
- (most-recent-window "Janela Mais Recente")
-
- (view-menu-label "&Ver")
- (show-overview "Show Program Contour") 
- (hide-overview "Hide Program Contour")
- (show-module-browser "Show Module Browser")
- (hide-module-browser "Hide Module Browser")
-
- (help-menu-label "&Ajuda")
- (about-info "Credits and details for this application")
- (about-menu-item "Sobre...")
- 
- ;; open here's new menu item
- (create-new-window-or-clear-current
-  "Would you like to create a new window, or clear out the current one?")
- (clear-current "Clear Current")
- (new-window "Nova Janela")
-
- ;;; exiting and quitting ``are you sure'' dialog
- ;;; exit is used on windows, quit on macos, in English. Other
- ;;; languages probably use the same word on both platforms.
- (exit "Sair")
- (quit "Sair")
- (are-you-sure-exit "Tem a certeza que deseja sair?")
- (are-you-sure-quit "Tem a certeza que deseja sair?")
- 
- ;;; autosaving
- (error-autosaving "Error autosaving \"~a\".") ;; ~a will be a filename
- (autosaving-turned-off "Autosaving is turned off\nuntil the file is saved.")
- (recover-autosave-files-frame-title "Recover Autosaved Files")
- (autosave-details "Detalhes")
- (autosave-recover "Recuperar")
- (autosave-unknown-filename "<<desconhecido>>")
-  
-  ;; these are labels in a dialog that drscheme displays
-  ;; if you have leftover autosave files. to see the dialog,
-  ;; start up drscheme and modify (but don't save) a file
-  ;; (also, do this with an unsaved file). Wait for the autosave
-  ;; files to appear (typically 5 minutes). Kill DrRacket
-  ;; and restart it. You'll see the dialog
-  (autosave-autosave-label: "Ficheiro de auto-gravação:")
-  (autosave-original-label: "Ficheiro original:")
-  (autosave-autosave-label "Ficheiro de auto-gravação")
-  (autosave-original-label "Ficheiro original")
-  (autosave-compare-files "Comparar ficheiros de auto-gravação")
-
-  (autosave-show-autosave "Ficheiro de Autogravação") ;; title of a window showing the autosave file
-
-  (autosave-explanation "O DrRacket encontro ficheiros de auto-gravação que poderá conter trabalho ainda não gravado.")
-
-  (autosave-recovered! "Recuperado!") ;; status of an autosave file
-  (autosave-deleted "Removido")       ;; status of an autosave file
-
-  (autosave-error-deleting "Erro a remover ~a\n\n~a") ;; first is a filename, second is an error message from mz.
-  (autosave-delete-button "Remover")
-  (autosave-delete-title "Remover")  ;; title of a dialog asking for deletion confirmation
-  (autosave-done "Completo")
-  
-  ;; appears in the file dialog
-  (autosave-restore-to-where? "Escolha um local para gravar o ficheiro de auto-gravação.")
-  
-  
- ;;; file modified warning
- (file-has-been-modified
-  "The file has been modified since it was last saved. Overwrite the modifications?")
- (overwrite-file-button-label "Overwrite")
- 
- (definitions-modified 
-  "The definitions text has been modified in the file-system; please save or revert the definitions text.")
- (drscheme-internal-error "DrRacket Internal Error")
- 
- ;;; tools
- (invalid-tool-spec "The tool specification in collection ~a's info.rkt file is invalid. Expected either a string or a non-empty list of strings, got: ~e")
- (error-invoking-tool-title "Error invoking tool ~s;~s")
- (tool-tool-names-same-length
-  "expected `tool-names' and `tools' to be lists of the same length, in info.rkt file for ~s, got ~e and ~e")
- (tool-tool-icons-same-length
-  "expected `tool-icons' and `tools' to be lists of the same length, in info.rkt file for ~s, got ~e and ~e")
- (tool-tool-urls-same-length
-  "expected `tool-urls' and `tools' to be lists of the same length, in info.rkt file for ~s, got ~e and ~e")
- (error-getting-info-tool
-  "error loading info.rkt file for ~s")
- (tool-error-phase1 "Error in phase 1 for tool ~s; ~s")
- (tool-error-phase2 "Error in phase 2 for tool ~s; ~s")
-
-
- ;;; define popup menu
- (end-of-buffer-define "<< end of buffer >>")
- (sort-by-name "Sort by name")
- (sort-by-position "Sort by position in file")
- (no-definitions-found "<< no definitions found >>")
- (jump-to-defn "Jump to definition of ~a")
-
- (recent-items-sort-by-age "Sort by Age")
- (recent-items-sort-by-name "Sort by Name")
- 
- ;;; view menu
- (hide-definitions-menu-item-label "Esconder &Definições")
- (show-definitions-menu-item-label "Mostrar &Definições")
- (definitions-menu-item-help-string "Mostrar/Esconder janela de definições")
- (show-interactions-menu-item-label "Mostrar &Interacções")
- (hide-interactions-menu-item-label "Esconder &Interacções")
- (interactions-menu-item-help-string "Mostrar/Esconder a janela de interacções")
- (show-toolbar "Mostrar &Barra de Ferramentas")
- (hide-toolbar "Esconder &Barra de Ferramentas")
-
- ;;; file menu
- (save-definitions-as "Gravar Definições &Como...")
- (save-definitions "Gravar Definições")
- (print-definitions "Imprimir Definições...")
- (about-drscheme "Sobre DrRacket")
- (save-other "Gravar Outro")
- (save-definitions-as-text "Gravar Definições Como Texto...")
- (save-interactions "Gravar Interacções")
- (save-interactions-as "Gravar Interacções Como...")
- (save-interactions-as-text "Gravar Interacções Como Texto...")
- (print-interactions "Imprimir Interacções...")
- (new-tab "Novo Tab")
- (close-tab "Fechar Tab") ;; must not have any &s in it.
- 
- ;;; edit-menu
- (split-menu-item-label "&Dividir")
- (collapse-menu-item-label "C&olapsar")
- 
- ;;; language menu
- (language-menu-name "&Linguagem")
- 
- ;;; scheme-menu
- (scheme-menu-name "Ra&cket")
- (execute-menu-item-label "Correr")
- (execute-menu-item-help-string "Reiniciar o programa na janela de definições")
- (break-menu-item-label "Parar")
- (break-menu-item-help-string "Break the current evaluation")
- (kill-menu-item-label "Matar")
- (kill-menu-item-help-string "Matar a avaliação actual")
- (clear-error-highlight-menu-item-label "Clear Error Highlight")
- (clear-error-highlight-item-help-string "Removes the pink error highlighting")
- (reindent-menu-item-label "&Reindentar")
- (reindent-all-menu-item-label "Reindentar &Tudo")
- (semicolon-comment-out-menu-item-label "&Comentar com Ponto e Virgula")
- (box-comment-out-menu-item-label "&Comentar com uma Caixa")
- (uncomment-menu-item-label "&Descomentar")
-
- (convert-to-semicolon-comment "Converter para Comentário Ponto e Virgula")
- 
- ;;; executables
- (create-executable-menu-item-label "Criar Executável...")
- (create-executable-title "Criar Executável")
- (must-save-before-executable "Tem de gravar o seu programa antes de criar um executável.")
- (save-a-mred-launcher "Save a GRacket Launcher")
- (save-a-mzscheme-launcher "Save a Racket Launcher")
- (save-a-mred-stand-alone-executable "Save a GRacket Stand-alone Executable")
- (save-a-mzscheme-stand-alone-executable "Save a Racket Stand-alone Executable")
-
- (definitions-not-saved "The definitions window has not been saved. The executable will use the latest saved version of the definitions window. Continue?")
- (launcher "Launcher")
- (stand-alone "Stand-alone")
- (executable-type "Type")
- (executable-base "Base")
- (filename "Filename: ")
- (create "Create")
- ;; "choose-an-executable" changed to "specify-a"
- ;(please-choose-an-executable-filename "Please choose a filename to save the executable.")
- ;; Replaced by generic ~a-must-end-with-~a
- ;(windows-executables-must-end-with-exe
- ; "The filename\n\n  ~a\n\nis illegal. Under Windows, executables must end with .exe.")
- ;(macosx-executables-must-end-with-app
- ; "The filename\n\n  ~a\n\nis illegal. Under MacOS X, an executable must be a directory whose name ends with .app.")
- (warning-directory-will-be-replaced
-  "WARNING: the directory:\n\n  ~a\n\nwill be replaced. Proceed?")
- 
- (create-servlet "Create Servlet...")
-
- ; the ~a is a language such as "module" or "algol60"
- (create-servlet-unsupported-language
-  "Create Servlet does not work with the ~a language.")
-  
- ;;; buttons
- (execute-button-label "Correr") 
- (save-button-label "Gravar")
- (break-button-label "Parar")
- 
- ;;; search help desk popup menu
- (search-help-desk-for "Procurar no Directorio de Ajuda por \"~a\"")
- (exact-lucky-search-help-desk-for "Exact lucky search in Help Desk for \"~a\"")
-
- ;; collapse and expand popup menu items
- (collapse-sexp "Colapsar expressão-s")
- (expand-sexp "Expandir expressão-s")
- 
- ;;; fraction dialog
- (enter-fraction "Inserir Fracção")
- (whole-part "Parte Inteira")
- (numerator "Numerador")
- (denominator "Denominador")
- (invalid-number "Número Inválido: deve ser exacto, real, não-inteiro.")
- (insert-fraction-menu-item-label "Inserir Fracção...")
-
- ;; number snip popup menu
- (show-decimal-expansion "Ver expansão decimal")
- (show-mixed-fraction-view "Ver como fracção mista")
- (show-improper-fraction-view "Ver como fracção imprópria")
- (show-more-decimal-places "Mostrar mais casas decimais")
- 
- ;;; Teachpack messages
- (select-a-teachpack "Seleccionar Pacote de Ensino")
- (clear-teachpack "Apagar Pacote de Ensino ~a")
- (teachpack-error-label "DrRacket - Erro no Pacote de Ensino")
- (teachpack-didnt-load "O ficheiro do Pacote de Ensino ~a não foi carregado correctamente.")
- (add-teachpack-menu-item-label "Adicionar Pacote de Ensino...")
- (clear-all-teachpacks-menu-item-label "Apagar Todos os Pacotes de Ensino")
- (drscheme-teachpack-message-title "Pacote de Ensino do DrRacket")
- (already-added-teachpack "Já adicionou Pacote de Ensino ~a")
- 
- ;;; Language dialog
- (introduction-to-language-dialog
-  "Por favor seleccione uma linguagem. Estudantes na maioria dos cursos introdutórios devem escolher a linguagem seleccionada por defeito.")
- (language-dialog-title "Escolher Linguagem")
- (case-sensitive-label "Case sensitive")
- (output-style-label "Estilo de Saída")
- (constructor-printing-style "Constructor")
- (quasiquote-printing-style "Quasiquote")
- (write-printing-style "escrever")
-  ;(print-printing-style "print-actual") ;; this is possibly incorrect now -- it shows up in the 'output syntax' part of the language dialog
- (sharing-printing-label "Mostrar partilha nos valores")
- (use-pretty-printer-label "Inserir nova linha nos valores printed")
- (input-syntax "Sintaxe de Entrada")
- (dynamic-properties "Propriedades Dinâmicas")
- (output-syntax "Sintaxe de Saída")
- (no-debugging-or-profiling "No debugging or profiling")
- (debugging "Depuração")
- (debugging-and-profiling "Debugging and profiling")
- (test-coverage "Syntactic test suite coverage")
- (show-details-button-label "Mostrar Detalhes")
- (hide-details-button-label "Esconder Detalhes")
- (choose-language-menu-item-label "Escolher Linguagem...")
- (revert-to-language-defaults "Reverter para as Opções por Defeito da Linguagem")
- (fraction-style "Estilo de Fracção")
- (use-mixed-fractions "Fracções Mistas")
- (use-repeating-decimals "Repeating decimals")
- (decimal-notation-for-rationals "Usar notação decimal para racionais")
- (please-select-a-language "Por favor seleccione uma linguagem")
-
- 
- ;;; languages
- (beginning-student "Beginning Student")
- (beginning-one-line-summary "define, cond, structs, constants, and primitives")
- (beginning-student/abbrev "Beginning Student with List Abbreviations")
- (beginning/abbrev-one-line-summary "Beginner, with list style printing in the REPL")
- (intermediate-student "Intermediate Student")
- (intermediate-one-line-summary "Beginner plus lexical scope")
- (intermediate-student/lambda "Intermediate Student with lambda")
- (intermediate/lambda-one-line-summary "Intermediate plus higher-order functions")
- (advanced-student "Advanced Student")
- (advanced-one-line-summary "Intermediate plus lambda and mutation")
- (how-to-design-programs "How to Design Programs") ;; should agree with MIT Press on this one...
- (pretty-big-scheme "Pretty Big")
- (pretty-big-scheme-one-line-summary "Adds syntax and functions from the HtDP languages")
- (r5rs-language-name "R5RS")
- (r5rs-one-line-summary "R5RS, with no frills")
- (expander "Expander")
- (expander-one-line-summary "Expands, rather than evaluates, expressions")
- (professional-languages "Professional Languages")
- (teaching-languages "Teaching Languages")
- (experimental-languages "Experimental Languages")
- 
- ;(module-language-one-line-summary "Run creates a REPL in the context of the module, including the module's declared language")
-  
-
- ;;; debug language
- (unknown-debug-frame "[desconhecido]")
- (backtrace-window-title "Backtrace - DrRacket")
- (files-interactions "~a's interactions") ;; filled with a filename
- (current-interactions "interacções")
- (current-definitions "definições")
- (mzscheme-w/debug "Textual (MzScheme, inclui R5RS)")
- (mzscheme-one-line-summary "Implementação de Scheme da PLT")
- (mred-w/debug "Gráfico (MrEd, inclui MzScheme)")
- (mred-one-line-summary "Adiciona support GUI ao MzScheme")
-
- ;; profiling
- (profiling-low-color "Baixo")
- (profiling-high-color "Elevado")
- (profiling-choose-low-color "Por favor seleccione uma cor baixa")
- (profiling-choose-high-color "Por favor seleccione uma cor elevada")
- (profiling "Profiling")
- (profiling-example-text "(define (whee) (whee))")
- (profiling-color-config "Profiling Color Range") 
- (profiling-scale "Profiling Color Scale")
- (profiling-sqrt "Raiz quadrada")
- (profiling-linear "Linear")
- (profiling-square "Quadrado")
- (profiling-number "Número de Chamadas")
- (profiling-time "Tempo Acumulado")
- (profiling-update "Update Profile")
- (profiling-col-percent-time "% Tempo")
- (profiling-col-function "Função")
- (profiling-col-time-in-msec "Mseg")
- (profiling-col-calls "Chamadas")
- (profiling-show-profile "Show Profile")
- (profiling-hide-profile "Hide Profile")
- (profiling-unknown-src "<< desconhecido >>")
- (profiling-no-information-available "There is no profiling information available. Please be sure that profiling is enabled in your language and you have run your program.")
- (profiling-clear? "Changing the definitions window invalidates the profiling information. Continue?")
- 
- ;; test coverage
- (test-coverage-clear? "Changing the definitions window invalidates the test coverage information. Continue?")
- (test-coverage-clear-and-do-not-ask-again "Yes, and don't ask again")
- (test-coverage-ask? "Ask about clearing test coverage")
-  
- ;; tracing
- (tracing-enable-tracing "Enable tracing")
- (tracing-show-tracing-window "Show Tracing")
- (tracing-hide-tracing-window "Hide Tracing")
- (tracing-tracing-nothing-to-show "No tracing results are available. Be sure your language supports tracing and it is enabled.")
-
- ;;; repl stuff
- (evaluation-terminated "Evaluation Terminated")
- (evaluation-terminated-explanation
-  "The evaluation thread is no longer running, so no evaluation can take place until the next execution.")
- (last-stack-frame "show the last stack frame")
- (last-stack-frames "show the last ~a stack frames")
- (next-stack-frames "show the next ~a stack frames")
- 
- ;;; welcoming message in repl
- (language "Linguagem")
- (custom "costumizado")
- (teachpack "Pacote de Ensino")
- (welcome-to "Benvindo a")
- (version "versão")
- 
- ;;; kill evaluation dialog
- (kill-evaluation? "Do you want to kill the evaluation?")
- (just-break "Just Break")
- (kill "Kill")
- (kill? "Kill?")
-
- ;;; version checker
-
- ;; special menu
- (special-menu "S&pecial")
- 
- ;; large semi colon letters
- (insert-large-letters... "Insert Large Letters...")
- (large-semicolon-letters "Large Semicolon Letters")
- (text-to-insert "Text to insert")
-
- (module-browser-filename-format "Full Filename: ~a (~a lines)")
- (module-browser-root-filename "Root Filename: ~a")
- (module-browser-font-size-gauge-label "Font Size")
- (module-browser-progress-label "Module overview progress")
- (module-browser-adding-file "Adding file: ~a...")
- (module-browser-laying-out-graph-label "Laying out graph")
- (module-browser-open-file-format "Open ~a")
- (module-browser "Module Browser") ;; frame title
- (module-browser... "Module Browser...") ;; menu item title
- (module-browser-error-expanding "Error expanding the program:\n\n~a")
- (module-browser-show-lib-paths "Show files loaded by (lib ..) paths")
- (module-browser-progress "Module Browser: ~a") ;; prefix in the status line
- (module-browser-compiling-defns "Module Browser: compiling definitions")
- (module-browser-show-lib-paths/short "Follow lib requires") ;; check box label in show module browser pane in drscheme window.
- (module-browser-refresh "Refresh") ;; button label in show module browser pane in drscheme window.
-; (module-browser-only-in-plt-and-module-langs
-;  "The module browser is only available for programs in the PLT languages and in the module language (and only for programs that have modules in them).")
- (module-browser-name-length "Name length")
- (module-browser-name-short "Short")
- (module-browser-name-medium "Medium")
- (module-browser-name-long "Long")
- (module-browser-open-all "Open all files shown here")
-
- (happy-birthday-matthias "Parabéns, Matthias!")
- (happy-birthday-matthew "Parabéns, Matthew!")
- (happy-birthday-shriram "Parabéns, Shriram!")
-
- (mrflow-using-default-language-title "Default Language Used")
- (mrflow-using-default-language "The language currently used does not have a type table defined for its primitives. Using R5RS Scheme instead.")
- (mrflow-button-title "Analyze")
- ;(mrflow-unknown-style-delta-error-title "Unknown Box Style Delta")
- ;(mrflow-unknown-style-delta-error "Unknown box style delta: ~a")
- (mrflow-popup-menu-show-type "Show Type")
- (mrflow-popup-menu-hide-type "Hide Type")
- (mrflow-popup-menu-show-errors "Show Errors")
- (mrflow-popup-menu-hide-errors "Hide Errors")
- ;(mrflow-read-exception-title "Read Exception")
- ;(mrflow-read-exception "Read exception: ~a")
- ;(mrflow-syntax-exception-title "Syntax Exception")
- ;(mrflow-syntax-exception "Syntax exception: ~a")
- ;(mrflow-unknown-exception-title "Unknown Exception")
- ;(mrflow-unknown-exception "Unknown exception: ~a")
- ;(mrflow-language-primitives-error-title "Language Primitives Error")
- ;(mrflow-language-primitives-error "Wrong filename for language primitives types table: ~a")
-  
- (snips-and-arrows-popup-menu-tack-all-arrows "Tack All Arrows")
- (snips-and-arrows-popup-menu-untack-all-arrows "Untack All Arrows")
- (snips-and-arrows-user-action-disallowed-title "User Changes Currently Disallowed")
- (snips-and-arrows-user-action-disallowed "User changes are disallowed in editors that contain tool-inserted snips.  Hide all snips before modifying the content of the editor.")
- ;(snips-and-arrows-changing-terms-warning-title "Changing terms will be undoable")
- ;(snips-and-arrows-changing-terms-warning "Changing terms in an editor containing snips cannot be undone.  You can either cancel this action, remove the snips, and try the change again, or you can continue with the change, in which case the change will not be undoable (all others changes made before and afterward will still be undoable though).")
- (snips-and-arrows-hide-all-snips-in-editor "Hide all snips in editor")
-
- (xml-tool-insert-xml-box "Inserir Caixa XML")
- (xml-tool-insert-scheme-box "Inserir Caixa Racket")
- (xml-tool-insert-scheme-splice-box "Inserir Racket Splice Box")
- (xml-tool-xml-box "Caixa XML")
- (xml-tool-scheme-box "Caixa Racket")
- (xml-tool-scheme-splice-box "Racket Splice Box")
- (xml-tool-switch-to-scheme "Switch to Racket box")
- (xml-tool-switch-to-scheme-splice "Switch to Racket splice box")
- (xml-tool-eliminate-whitespace-in-empty-tags
-  "Eliminiate whitespace in empty tags")
- (xml-tool-leave-whitespace-alone
-  "Leave whitespace alone")
- 
- (show-recent-items-window-menu-item "Show Recently Opened Files in Separate Window")
- (show-recent-items-window-label "Recently Opened Files")
- (number-of-open-recent-items "Number of recent items")
- (switch-anyway "Switch File Anyway")
-
- (stepper-program-has-changed "ATENÇÃO: O programa foi modificado.")
- (stepper-program-window-closed "ATENÇÃO: A janela do programa desapareceu.")
-
- (stepper-name "Stepper")
- (stepper-language-level-message
-  "The language level is set to \"~a\". Currently, the stepper works only for the \"~a\" through the \"~a\" language levels.")
- (stepper-button-label "Step")
- (stepper-previous-application "Application")
- (stepper-previous "Step")
- (stepper-next "Step")
- (stepper-jump-to-beginning "Home")
- (stepper-next-application "Application")
- 
-
- (dialog-back "Back")
-
- ;; warnings about closing a drscheme frame when the program
- ;; might still be doing something interesting
- (program-is-still-running "The program in the definitions window is still running. Close anyway?")
-  (program-has-open-windows "The program in the definitions window has open windows. Close this window anyway?")
- 
-  ;; ml-command-line-arguments is for the command line arguments
-  ;; label in the module language details in the language dialog.
-  (ml-command-line-arguments "Command-line arguments as a vector of strings, in read syntax")
-
-  ;; ml-cp names are all for the module language collection path
-  ;; configuration. See the details portion of the language dialog
-  ;; for the module language (at the bottom).
-  (ml-cp-default-collection-path "<<default collection paths>>")
-
-  ;; in std get-directory 
-  (ml-cp-choose-a-collection-path "Please choose a collection path")
-
-  ;; err msg when adding default twice
-  (ml-cp-default-already-present
-   "Default collection paths are already present")
-  
-  ;; title of this section of the dialog (possibly the word
-  ;; `Collection' should not be translated)
-  (ml-cp-collection-paths "Collection Paths")
-
-  ;; button labels
-  (ml-cp-add "Add")
-  (ml-cp-add-default "Add Default")
-  (ml-cp-remove "Remove")
-  (ml-cp-raise "Raise")
-  (ml-cp-lower "Lower")
-
-  ;; Profj
-  (profj-java "Java")
-  (profj-java-mode "Modo Java")
-  (profj-java-mode-color-keyword "Palavra-Chave")
-  (profj-java-mode-color-string "string")
-  (profj-java-mode-color-literal "literal")
-  (profj-java-mode-color-comment "comentário")
-  (profj-java-mode-color-error "erro")
-  (profj-java-mode-color-identifier "identificador")
-  (profj-java-mode-color-default "defeito")
-
-  (profj-insert-java-comment-box "Inserir Caixa de Comentário Java")
-  (profj-insert-java-interactions-box "Inserir Caixa de Interacções Java")
-
-  ;; The Test Suite Tool
-  ;; Errors
-  (test-case-empty-error "Empty test case")
-  (test-case-too-many-expressions-error "Too many expressions in a test case.")
-  ;; DrRacket window menu items
-  (test-case-insert "Insert Test Case")
-  (test-case-disable-all "Disable all Test Cases")
-  (test-case-enable-all "Enable all Test Cases")
-  
-  ;; NOTE: The following string constants are labels of the test-case fields. The width
-  ;;       of the field is determined by the length of the longest of the following three words.
-  ;;       if the words are too long the test case will take up too much horizontal room and
-  ;;       not look very good.
-  ;; This string is the label of the expression that is being tested in a test case.
-  (test-case-to-test "Test")
-  ;; This string is the label of the expression that is the expected value of the to-test expression.
-  (test-case-expected "Should be")
-  ;; This string is the label of the actual result of the to test expression.
-  (test-case-actual "Actual")
-  (test-case-predicate "Predicate")
-  (test-case-should-raise "Should Raise")
-  ;; The label of a field of the test-case that describes the expected error message of a test case
-  (test-case-error-message "Error Message")
-
-  (test-case-menu-title "Test Case")
-  (test-case-switch-to-error-box "Switch to Error Test Box")
-  (test-case-switch-to-nonerror-box "Switch to Nonerror Test box")
-  (test-case-collapse "Collapse Test Case")
-  (test-case-show-actual "Show Actual Value")
-  (test-case-enable "Enable Test Case")
-  (test-case-show-predicate "Show Predicate")
-  (test-case-show-error-message "Show Error Message")
-  (test-case-convert-to-text "Convert to text")
-  
-  ;; Profj Boxes
-  (profjBoxes-empty-error "Empty interaction")
-  (profjBoxes-too-many-expressions-error "Too many expressions in a box")
-  (profjBoxes-interactions-label "Interactions")
-  (profjBoxes-bad-java-id-error "Malformed Java ID")
-  (profjBoxes-examples-label "Examples")
-  (profjBoxes-add-new-example-button "Add new example")
-  (profjBoxes-type "Type")
-  ;; The Java identifier of an example of data
-  (profjBoxes-name "Name")
-  (profjBoxes-value "Value")
-  (profjBoxes-insert-java-examples "Insert Java Examples")
-  (profjBoxes-insert-java-interactions "Insert Java Interactions")
-
-  ;; Slideshow
-  (slideshow-hide-picts "Show Nested Boxes")
-  (slideshow-show-picts "Mostrar Imagens")
-  (slideshow-cannot-show-picts "Cannot show picts; run program to cache sizes first")
-  (slideshow-insert-pict-box "Insert Pict Box") 
-
-  ;; GUI Tool
-  (gui-tool-heading "Ferramenta GUI")
-  (gui-tool-before-clicking-message "Antes de clicar no ícone de uma ferramenta, use \"Inserir GUI\" do menu \"Especial\" para inserir um item GUI raíz, ou seleccionar um já inserido GUI.")
-  (gui-tool-show-gui-toolbar "Mostrar Barra de Ferramentas GUI")
-  (gui-tool-hide-gui-toolbar "Esconder Barra de Ferramentas GUI")
-  (gui-tool-insert-gui "Inserir GUI")
-  )
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/russian-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/russian-string-constants.rkt
deleted file mode 100644
index 8bccf2ed1a..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/russian-string-constants.rkt
+++ /dev/null
@@ -1,1527 +0,0 @@
-#|
-
-When modifying the string constants files,
-please adhere to these guidelines:
-
-- All the entries in english-string-constants.rkt have the same format
-  (name string).  If the purpose of an entry you are adding to the
-  file is not clear from just the name and string, put a comment next
-  to the entry explaining what the string is going to be used for and
-  in what context.
-  That's especially true for strings that contain things like "~a".
-  Systematically describe what the "~a" is going to be replaced with.
-  When we have to translate strings like "deleting ~a", we translators
-  need to know what "~a" is going to be (in particular, in some
-  languages like French, we need to know whether the "~a" is going to
-  be a masculine or feminine word, or whether it's going to be
-  singular or plural, etc).
-
-- When adding a bunch of new entries, put together in a section the
-  entries that logically belong together.  Give a title to your
-  section, so we have an idea of what the strings are for.  Don't mix
-  in the same section strings that have nothing to do with each other,
-  that's only going to confuse us.  Do not start a new section if
-  there's already one that deals with the same thing.  Dumping all the
-  new entries in random order at the end of the file is not a good way
-  to have your new entries translated in a timely manner...
-
-- Before adding strings for your new pet tool, check whether you can't
-  re-use strings that already exist.  There's no need for yet another
-  "Ok" string...
-
-- If you modify an existing string in english-string-constants.rkt, go
-  through all the *-string-constants.rkt files for the other languages,
-  comment out the old version of the modified string in each of these
-  files, and put a short comment there telling us the English string
-  has changed and needs to be re-translated.  Do not erase the old
-  version, it might help us translate the new one.  Do not move it
-  either.  Just comment it out and add the short comment.  After the
-  next git update DrRacket will automatically tell us translators that
-  a new string needs to be translated, we will find your comment in
-  the file, and know what to do.
-	Some evil evil people might think that, since DrRacket automatically
-  informs us of new strings to be translated, an easier thing to do
-  when modifying an existing string would be to simply rename it at
-  the same time.  This works, except that if you do that, we
-  translators will get two warnings from DrRacket:
-		language english had but french does not:
-		(new-name "New String")
-		language french had but english does not:
-		(old-name "Old String")
-  then we translators will be left to wonder whether the two things
-  are related or not, and whether we can safely base our translation
-  of "New String" on the translation of "Old String" (since the two
-  strings are likely to be close in meaning).  Worse, we might not
-  even realize the two strings are related and translate "New String"
-  from scratch, just to realize later that it's only a variation of
-  "Old String".  I can tell you that nothing pisses off a translator
-  more than having to translate pretty much the same string twice
-  just because *you* were too lazy to inform us that it was just a
-  slight modification to an existing string rather than an entirely
-  new one.  Conclusion: do not change the name of a string unless you
-  have some really good reason to do so.
-
-- Please think hard before choosing a string and make sure it means
-  what you want it to mean.  That way you won't have to change it
-  later, and we won't have to retranslate it.
-
-- Please think hard before choosing the name for a string.  Use
-  meaningful names.  "error" or "ok" are not meaningful names.  Prefix
-  all related names with a common prefix (the name of your tool or
-  module).  String names are not the right place to save on typing.
-
-- If, for some reason, you really have to change the name of a string
-  (like, because the original name you gave it really sucked...),
-  change the name of the string in *ALL* the *-string-constants.rkt
-  files.  That's a modification you can do without the help of a
-  translator, so do it yourself.  It's not the job of the translators
-  to clean up your naming mess for you.  Besides, you are the one who
-  knows what you changed, so leaving the translators having to guess
-  what you did is Not Nice(tm).
-
-- If, for some reason, you need to remove a string (i.e. you changed
-  your code and don't need the string anymore), remove the string in
-  *ALL* the *-string-constants.rkt files.  Again, you don't need the
-  help of a translator to do that.  If you're not sure whether you
-  might need the string in the future or not, just comment it out in
-  *ALL* the files.
-
-|#
-
-(module russian-string-constants "string-constant-lang.rkt"
- ;;; when translating this constant, substitute name of actual language for `English'
- (is-this-your-native-language "Русский - это Ваш родной язык?")
-
- (are-you-sure-you-want-to-switch-languages
-  "Смена языка интерфейса пользователя потребует перезапустить DrRacket. Вы уверены, что действительно хотите этого?")
-
- (interact-with-drscheme-in-language "Работать с русским интерфейсом DrRacket")
-
- ;; these two should probably be the same in all languages excepet English.
- ;; they are the button labels (under macos and windows, respectively)
- ;; that go the with the string above.
- (accept-and-quit "Применить и выйти")
- (accept-and-exit "Применить и выйти")
- 
- ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
- (plt "PLT")
- (drscheme "DrRacket")
- (drracket "DrRacket")
- (ok "OK")
- (cancel "Отмена")
- (abort "Отмена")
- (untitled "Безымянный")
- (untitled-n "Безымянный ~a")
- (warning "Предупреждение")
- (error "Ошибка")
- (close "Закрыть") ;; as in, close an open window. must match close-menu-item
-                 ;; in the sense that, when the &s have been stripped from
-                 ;; close-menu-item, it must be the same string as this.
- (stop "Остановить")   
- (&stop "&Остановить") ;; for use in button and menu item labels, with short cut.
- (are-you-sure-delete? "Вы действительно хотите удалить ~a?") ;; ~a is a filename or directory name
- (ignore "Игнорировать")
- (revert "Загрузить заново")
-
- ;; label for a generic check box, often supported on dialogs
- ;; that ask a binary choice of the user. If checked, the
- ;; dialog isn't going to be shown again.
- ;; One version for always using the current choice:
- (dont-ask-again-always-current "Не переспрашивать (всегда использовать текущий выбор)")
- ;; One generic version (ie, on the Quit DrRacket dialog)
- (dont-ask-again                "Не переспрашивать")
-
- ;;; important urls
- (web-materials "Связанные Web-сайты") ;; menu item title
- (tool-web-sites "Web-сайты установленных инструментов")   ;; menu item title
- (plt-homepage "Racket")
- (pbd-homepage "Program by Design")
-
- ;;; bug report form
- (cancel-bug-report? "Отменить отправку отчета об ошибках?")
- (are-you-sure-cancel-bug-report?
-  "Вы действительно хотите отменить отправку отчета об ошибках?")
- (bug-report-form "Отчет об ошибках")
- (bug-report-field-name "Имя")
- (bug-report-field-email "E-mail")
- (bug-report-field-summary "Резюме")
- (bug-report-field-severity "Серьезность")
- (bug-report-field-class "Класс")
- (bug-report-field-description "Описание")
- (bug-report-field-reproduce1 "Последовательность действий")
- (bug-report-field-reproduce2 "для воспроизведения ошибки")
- (bug-report-field-environment "Среда")
- (bug-report-field-docs-installed "Установленная документация")
- (bug-report-field-collections "Коллекция")
- (bug-report-field-human-language "Язык интерфейса")
-  (bug-report-field-memory-use "Используемая память")
- (bug-report-field-version "Версия")
- (bug-report-synthesized-information "Собранные данные")  ;; dialog title
- (bug-report-show-synthesized-info "Показать собранные данные")
- (bug-report-submit "Отправить")
- (bug-report-submit-menu-item "Отправить отчет об ошибке...") ;; in Help Menu (drs & help desk)
- (error-sending-bug-report "Сбой при отправке отчета об ошибке")
- (error-sending-bug-report-expln "При отправке отчета об ошибке произошел сбой. При наличии работающего подключения к Internet посетите сайт:\n\n    http://bugs.racket-lang.org/\n\nи отправьте отчет об ошибке через Web-форму на нем. Извините за неудобства.\n\nСообщение об ошибке:\n~a")
- (illegal-bug-report "Некорректный отчет об ошибке")
- (pls-fill-in-field "Пожалуйста, заполните поле \"~a\"")
- (malformed-email-address "Некорректный адрес электронной почты")
- (pls-fill-in-either-description-or-reproduce "Пожалуйста, заполните поле \"Описание\" либо \"Последовательность действий для воспроизведения ошибки\".")
-
- ;;; check syntax
- (check-syntax "Проверить синтаксис")
- (cs-italic "Курсив")
- (cs-bold "Полужирный")
- (cs-underline "Подчеркнутый")
- (cs-change-color "Изменить цвет")
- (cs-tack/untack-arrow "Соединять/не соединять стрелками")
- (cs-jump-to-next-bound-occurrence "Перейти к следующему вхождению")
- (cs-jump-to-binding "Перейти к определению")
- (cs-jump-to-definition "Перейти к объявлению")
- (cs-error-message "Сообщение об ошибке")
- (cs-open-file "Открыть ~a")
- (cs-rename-var "Переименовать ~a")
- (cs-rename-id "Переименовать идентификатор")
- (cs-rename-var-to "Переименовать ~a в:")
- (cs-name-duplication-error "Выбранное имя ~s конфликтует с ранее определенным.")
- (cs-rename-anyway "Переименовать безоговорочно")
- (cs-status-init "Проверка синтаксиса: инициализация окружения для пользовательского кода")
- (cs-status-coloring-program "Проверка синтаксиса: цветовыделение выражения")
- (cs-status-eval-compile-time "Проверка синтаксиса: вычисление времени компиляции")
- (cs-status-expanding-expression "Проверка синтаксиса: развернуть выражение")
- (cs-status-loading-docs-index "Проверка синтаксиса: загрузка индекса документации")
- (cs-mouse-over-import "Привязка ~s импортирована из ~s")
- (cs-view-docs "Просмотр документации для ~a")
- (cs-view-docs-from "~a из ~a")  ;; a completed version of the line above (cs-view-docs) is put into the first ~a and a list of modules (separated by commas) is put into the second ~a. Use check syntax and right-click on a documented variable (eg, 'require') to see this in use  
-
- (cs-lexical-variable "лексическая переменная")
- (cs-set!d-variable "переопределенная переменная")
- (cs-imported-variable "импортированная переменная")
-
- ;;; info bar at botttom of drscheme frame
- (collect-button-label "Cборка мусора")
-  (read-only "Только для чтения")
- (auto-extend-selection "Авторасширение")
- (overwrite "Замена")
- (running "выполняется")
- (not-running "не выполняется")
- 
- ;;; misc
- (welcome-to-something "Добро пожаловать в ~a")
- 
- ; this appears in the drscheme about box.
- (welcome-to-drscheme-version/language "Добро пожаловать в DrRacket, версия ~a, ~a")
-
- ; these appear on subsequent lines in the `Help|Добро пожаловать в DrRacket' dialog.
- (welcome-to-drscheme "Добро пожаловать в DrRacket")
-
- (goto-line "Перейти к строке")
- (goto-line-invalid-number
-  "~a - некорректный номер строки. Номер должен быть целым числом в диапазоне от 1 до ~a")
- (goto-position "Перейти к позиции")
- (no-full-name-since-not-saved
-  "У файла нет полного имени - он еще не был сохранен.")
- (cannot-open-because-dne "Невозможно открыть ~a, потому что он не существует.")
-
-  (needs-execute-language-changed
-   "Предупреждение: язык изменился. Нажмите Выполнить.")
-  (needs-execute-teachpack-changed
-   "Предупреждение: учебный пакет изменился. Нажмите Выполнить.")
-  (needs-execute-defns-edited
-   "Предупреждение: окно определений изменилось. Нажмите Выполнить.")
-
-  (editor-changed-since-srcloc-recorded
-   "С момента последней фиксации местоположения файла были внесены изменения, поэтому выделенная область может содержать неверное местоположение файла.")
-  
- (file-is-not-saved "Файл \"~a\" не сохранен.")
- (save "Сохранить")
- (close-anyway "Все равно закрыть")
- (dont-save "Не сохранять")
- (clear-anyway "Все равно очистить")
-
- ;; menu item title
- (log-definitions-and-interactions "Сохранить окна определения и интерпретатора...")
- (stop-logging "Остановить протоколирование")
- (please-choose-a-log-directory "Пожалуйста, выберите каталог")
- (logging-to "Протоколировать в: ")
- (erase-log-directory-contents "Удалить содержимое каталога: ~a?")
- (error-erasing-log-directory "Ошибка удаления содержимого каталога.\n\n~a\n")
-
-  ;; menu items connected to the logger -- also in a button in the planet status line in the drs frame
-  (show-log "Показать &протокол")
-  (hide-log "Скрыть &протокол")
-  (logging-all "Все") ;; in the logging window in drscheme, shows all logs simultaneously
-
- ;; modes
- (mode-submenu-label "Режимы")
- (scheme-mode "Режим Scheme")
- (racket-mode "Режим Racket")
- (text-mode "Режим текста")
-
- (scheme-mode-color-symbol "Символ")
- (scheme-mode-color-keyword "Ключевое слово")
- (scheme-mode-color-comment "Комментарий")
- (scheme-mode-color-string "Строка")
- (scheme-mode-color-constant "Константа")
- (scheme-mode-color-parenthesis "Круглые скобки")
- (scheme-mode-color-error "Ошибка")
- (scheme-mode-color-other "Другие")
- ;; the ~a is filled in with one of the above (scheme-mode-*)
- (syntax-coloring-choose-color "Выберите цвет для ~a")
- (preferences-colors "Цвета") ;; used in the preferences dialog
- 
-  ;; parenthesis color scheme string constants
-  (parenthesis-color-scheme "Выделение цветом круглых скобок") ;; label for the choice% menu in the preferences dialog
-  (paren-color-basic-grey "Основной серый")
-  (paren-color-shades-of-gray "Оттенки серого цвета")
-  (paren-color-shades-of-blue "Оттенки голубого цвета")
-  (paren-color-spring "Теплые оттенки")
-  (paren-color-fall "Осенние оттенки")
-  (paren-color-winter "Холодные оттенки")
-
-  
- (url: "URL:")
- (open-url... "Открыть URL...")
- (open-url "Открыть URL")
- (browse... "Браузер...")
- (bad-url "Неверный URL")
- (bad-url:this "Неверный URL: ~a")
- 
- ;; Help Desk
- (help "Справка")
- (help-desk "Помощь")
- (plt:hd:search "Поиск")
- (plt:hd:feeling-lucky "Мне повезёт")
- (plt:hd:home "Домашняя страница справочного бюро") 
- ; next 3 are popup menu choices in help desk search frame
- (plt:hd:search-for-keyword "Искать в ключевых словах")
- (plt:hd:search-for-keyword-or-index "Искать в ключевых словах или в содержании")
- (plt:hd:search-for-keyword-or-index-or-text "Искать в ключевых словах, в содержании или тексте")
- (plt:hd:exact-match "Точное соответствие")
- (plt:hd:containing-match "Содержится упоминание")
- (plt:hd:regexp-match "Соответствие по регулярному выражению")
- (plt:hd:find-docs-for "Поиск документации по:")
- (plt:hd:search-stopped-too-many-matches "[Поиск прервался: слишком много совпадений]")
- (plt:hd:nothing-found-for "Для ~a не найдено")
- (plt:hd:and "и")
- (plt:hd:refresh "обновить")
- (plt:hd:refresh-all-manuals "обновить все руководства")
- (plt:hd:manual-installed-date "(инсталлировать ~a)")
- ; Help Desk configuration
- ;; refreshing manuals
- (plt:hd:refreshing-manuals "Перезагрузить руководства")
- (plt:hd:refresh-downloading... "Загрузить ~a...")
- (plt:hd:refresh-deleting... "Удалить старую версию ~a...")
- (plt:hd:refresh-installing... "Инсталировать новую версию ~a...")
- (plt:hd:refresh-clearing-indices "Очистить кешированные индексы")
- (plt:hd:refreshing-manuals-finished "Готово.")
- (plt:hd:about-help-desk "О помощи")
- (plt:hd:help-desk-about-string
-  "Помощь - это полный источник информации о программном обеспечении PLT, включая DrRacket, MzScheme и MrEd.\n\nВерсия ~a\nCopyright (c) ~a-~a PLT")
- (plt:hd:help-on-help "Справка по справке")
- (plt:hd:help-on-help-details "Для получения справки по использованию помощи, выберите первую ссылку `Помощь' на её домашней странице. (Для перехода на домашнюю страницу нажмите кнопку `Домой' в верхней части окна помощи.)")
-  (reload "Обновить") ;; refresh the page in a web browser
-  (plt:hd:ask-about-separate-browser
-   "Вы выбрали ссылку на данные из WWW. Желаете ли Вы просмотреть их в браузере помощи  или в окне внешнего браузера?")
-  (plt:hd:homebrew-browser "Браузер помощи") ;; choice for the above string (in a button)
-  (plt:hd:separate-browser "Внешний браузер") ;; other choice for the above string (also in a button)
-  (plt:hd:external-link-in-help "Внешние ссылки в справке")
-  (plt:hd:use-homebrew-browser "Использовать браузер помощи для внешних ссылок")
-  (plt:hd:new-help-desk "Новое окно помощи")
-
-  ;; in the Help Desk language dialog, title on the right.
-  (plt:hd:manual-search-ordering "Руководство по поиску")
-  
-  ;; in the help-desk standalone font preference dialog, on a check box
-  (use-drscheme-font-size "Использовать размер шрифта DrRacket")
-  
-  ;; in the preferences dialog in drscheme there is example text for help desk font size.
-  ;; clicking the links in that text produces a dialog with this message
-  (help-desk-this-is-just-example-text
-   "Это пример текста для установки размера шрифта. Откройте соответствующую помощь (из меню Справка) для перехода по этим ссылкам.")
-
-  ;; this appears in the bottom part of the frame the first time the user hits `f1' 
-  ;; (assuming nothing else has loaded the documentation index first)
-  ;; see also: cs-status-loading-docs-index
-  (help-desk-loading-documentation-index "Помощь: загрузка индекса документации")
-  
- ;; Help desk htty proxy
- (http-proxy "HTTP-прокси")
- (proxy-direct-connection "Прямое подключение")
- (proxy-use-proxy "Использовать прокси:")
- (proxy-host "Узел")
- (proxy-port "Порт")
- (proxy-bad-host "Неверный прокси-узел")
-
- ;; browser
- (rewind-in-browser-history "Назад")
- (forward-in-browser-history "Вперед")
- (home "В начало")
- (browser "Браузер")
- (external-browser-choice-title "Внешний браузер") ; title for radio-button set
- (browser-command-line-label "Командная строка:") ; label for radio button that is followed by text boxes
- (choose-browser "Выбрать браузер")
- (no-browser "Выбрать позже")
- (browser-cmdline-expl-line-1 "(Командная строка сформирована соединением  предшествующего текста, URL,") ; explanatory text for dialog, line 1
- (browser-cmdline-expl-line-2 "и последующего текста.)") ; ... line 2. (Anyone need more lines?)
- (install? "Инсталлировать?")  ;; if a .plt file is found (title of dialog)
- (you-have-selected-an-installable-package "Вы выбрали устанавливаемый пакет.")
- (do-you-want-to-install-it? "Вы хотите инсталлировать его?")
- (paren-file-size "(Размер файла- ~a байт)")
- (download-and-install "Загрузить и инсталлировать") ;; button label
- (download "Загрузить") ;; button label
- (save-downloaded-file/size "Сохранить загруженные файлы (~a байт) как") ;; label for get-file dialog
- (save-downloaded-file "Сохранить загруженные файлы как")  ;; label for get-file dialog
- (downloading "Загрузка") ;; dialog title
- (downloading-file... "Загрузка файла...")
- (package-was-installed "Пакет инсталлирован.")
- (download-was-saved "Загруженные файлы сохранены.")
-
- (install-plt-file-menu-item... "Инсталлировать .plt-файл...")
- (install-plt-file-dialog-title "Инсталлировать .plt-файл")
- (install-plt-web-tab "Web")
- (install-plt-file-tab "Файл")
- (install-plt-filename "Имя файла:")
- (install-plt-url "URL:")
- 
- ;; install plt file when opened in drscheme strings
- (install-plt-file "Инсталлировать ~a или открыть для редактирования?")
- (install-plt-file/yes "Инсталлировать")
- (install-plt-file/no "Редактировать")
-
- (plt-installer-progress-window-title "Ход инсталляции") ;; frame title
- (plt-installer-abort-installation "Процес инсталляции прерван") ;; button label
- (plt-installer-aborted "Прервано.") ;; msg that appears in the installation window when installation is aborted
-
- ;;; about box
- (about-drscheme-frame-title "О DrRacket")
- 
- ;;; save file in particular format prompting.
- (save-as-plain-text "Сохранить этот файл в обычном текcтовом формате?")
- (save-in-drs-format "Сохранить этот файл в специальном нетекстовом формате drscheme?")
- (yes "Да")     
- (no "Нет")
- 
- ;; saving image (right click on an image to see the text)
-  (save-image "Сохранить рисунок...")
-  
- ;;; preferences
- (preferences "Настройки пользователя")
- (error-saving-preferences "Ошибка сохранения настроек пользователя: ~a")
- (error-saving-preferences-title "Ошибка сохранения настроек пользователя")
- (steal-the-lock-and-retry "Снять блокировку и повторить") ;; in the preferences error dialog; this happens when the lockfile exists (after 3 pref writes). 
- (error-reading-preferences "Ошибка чтения настроек пользователя")
- (prefs-file-locked "Файл настроек пользователя заблокирован (так как файл ~a существует), поэтому измененные настройки не будут сохранены. Отменить изменения?")
- (try-again "Попытаться снова") ;; button label
- (prefs-file-still-locked "Файл настроек пользователя все еще заблокирован (так как файл ~a существует), поэтому изменения настроек не будут сохранены..")
- (scheme-prefs-panel-label "Racket")
- (warnings-prefs-panel-label "Предупреждения")
- (editor-prefs-panel-label "Редактирование")
- (general-prefs-panel-label "Общее")
- (highlight-parens "Подсвечивать парные скобки")
- (fixup-open-brackets "Автокорекция открывающихся квадратных скобок")
- (fixup-close-parens "Автокорекция закрывающихся скобок")
- (flash-paren-match "Отображать соответствие скобок")
- (auto-save-files "Автосохранение файлов")
- (backup-files "Резервные копии файлов")
- (map-delete-to-backspace "Назначить Delete на Backspace")
- (verify-exit "Проверять завершение")
- (ask-before-changing-format "Спрашивать перед изменением формата")
- (wrap-words-in-editor-buffers "Переносить слова в буферах редактора")
- (show-status-line "Показать строку состояния")
- (count-columns-from-one "Считать номера столбцов, начиная с 1")
- (display-line-numbers "Отображать номера строк в буфере (нет смещения символов)")
- (show-line-and-column-numbers "Показывать номера строк и столбцов") ; used for popup menu; right click on line/column box in bottom of drs window
- (show-character-offsets "Показывать смещение символов") ; used for popup menu; right click on line/column box in bottom of drs window
- (enable-keybindings-in-menus "Разрешить сочетания клавиш в меню")
- (command-as-meta "Считать командную клавишу мета-клавишей") ;; macos/macos x only
- (reuse-existing-frames "Использовать существующие окна при открытии новых файлов")
- (default-fonts "Шрифты по умолчанию")
- (basic-gray-paren-match-color "Выделять парные скобки серым цветом") ; in prefs dialog
- (online-coloring-active "Интерактивная подсветка синтаксиса")
- (open-files-in-tabs "Открывать файлы в отдельных вкладках (не отдельных окнах)")
- (show-interactions-on-execute "Автоматически открывать окно интерпретатора при запуске программы")
-  (switch-to-module-language-automatically "Автоматически переключаться на язык модуля при открытии модуля")
-  (interactions-beside-definitions "Размещать окно интерпретатора возле окна определений") ;; in preferences, below the checkbox one line above this one
- (limit-interactions-size "Ограничить размер программы")
- (background-color "Цвет фона")
- (default-text-color "Цвет текста по умолчанию") ;; used for configuring colors, but doesn't need the word "color"
- (choose-a-background-color "Пожалуйста, выберите цвет фона")
- (revert-to-defaults "Вернуться к значению по умолчанию")
-  
-  (black-on-white-color-scheme "Черный на белом") ;; these two appear in the color preferences dialog on butttons
-  (white-on-black-color-scheme "Белый на черном") ;; clicking the buttons changes teh color schemes to some defaults that've been set up.
-  
- ; title of the color choosing dialog
-
- ; should have entire alphabet
- (font-example-string "Быстрая коричневая лиса перепрыгнула через ленивых собак.") 
-
- (change-font-button-label "Изменить")
- (fonts "Шрифты")
- (other... "Другой...") ;; used in the font choice menu item
-
- ; filled with type of font, eg modern, swiss, etc.
- (choose-a-new-font "Пожалуйста, выберите новый \"~a\" шрифт")
-
- (font-size-slider-label "Размер")
- (restart-to-see-font-changes "Перезапустите, чтобы увидеть смену типа шрифта")
-
- (font-prefs-panel-title "Шрифт")
- (font-name "Имя шрифта")
- (font-size "Размер шрифта")
- (set-font "Установить шрифт...")
- (font-smoothing-label  "Сглаживание шрифтов")
- (font-smoothing-none "Отсутствует")
- (font-smoothing-some "Для некоторых")
- (font-smoothing-all "Для всех")
- (font-smoothing-default "Использовать системные установки")
- (select-font-name "Выбор имени шрифта")
- (example-text "Пример текста:")
- (only-warn-once "Это предупреждение о том, что определения и вызовы не синхронизированы")
- 
- ; warning message when lockfile is around
- (waiting-for-pref-lock "Ожидание завершения блокировки настроек пользователя...")
- (pref-lock-not-gone
-  "Файл блокировки настроек пользователя: \n\n   ~a\n\nне позволяет сохранить изменения настроек. Убедитесь в отсутствии работающего програмного обеспечения Racket и удалите этот файл.")
- (still-locked-exit-anyway? "Настройки не сохранены. Все равно выйти?")
- 
- ;;; indenting preferences panel
- (indenting-prefs-panel-label "Выравнивание")
- (indenting-prefs-extra-regexp "Дополнительные регулярные выражения")
-
- (square-bracket-prefs-panel-label "Квадратные скобки")
-  
- ; filled with define, lambda, or begin
- (enter-new-keyword "Введите новое ~a-подобное ключевое слово:")
- (x-keyword "~a ключевое слово")
- (x-like-keywords "~a-подобное ключевое слово")
-
- ; used in Square bracket panel
- (skip-subexpressions "Количество подвыражений, которые будут пропущены")
-
- (expected-a-symbol "ожидается символ,  найдено: ~a")
- (already-used-keyword "\"~a\" -уже используется как ключевое слово")
- (add-keyword "Добавить")
- (remove-keyword "Удалить")
- 
-  ; repl color preferences
-  (repl-colors "REPL")
-  (repl-out-color "Вывод")
-  (repl-value-color "Значения")
-  (repl-error-color "Ошибки")
-  
-  ;;; find/replace
-  (search-next "Далее")
-  (search-previous "Назад")
-  (search-match "Совпадение")  ;;; this one and the next one are singular/plural variants of each other
-  (search-matches "Совпадения") 
-  (search-replace "Заменить")
-  (search-skip "Пропустить")
-  (search-show-replace "Показать замены")
-  (search-hide-replace "Скрыть замены")
-  (find-case-sensitive "Учитывать регистр")  ;; the check box in both the docked & undocked search
-  (find-anchor-based "Искать, используя привязки")
-
-  ;; these string constants used to be used by searching,
-  ;; but aren't anymore. They are still used by other tools, tho.
-  (hide "Скрыть")
-  (dock "Прикрепить")
-  (undock "Открепить")
-  
- ;;; multi-file-search
- (mfs-multi-file-search-menu-item "Поиск в файлах...")
- (mfs-string-match/graphics "Соответствие строк (обрабатывать файлы с графикой)")
- (mfs-regexp-match/no-graphics "Регулярные выражения (только для неформатированных текстовых файлов)")
- (mfs-searching... "Поиск...")
- (mfs-configure-search "Настройки поиска") ;; dialog title
- (mfs-files-section "Файлы")   ;; section in config dialog
- (mfs-search-section "Поиск") ;; section in config dialog
- (mfs-dir "Каталог")
- (mfs-recur-over-subdirectories "Искать во вложенных каталогах")
- (mfs-regexp-filename-filter "Фильтровать имена файлов по регулярных выражениях")
- (mfs-search-string "Искать строки")
- (mfs-drscheme-multi-file-search "многофайловый поиск - DrRacket") ;; results window and error message title
- (mfs-not-a-dir "\"~a\" не каталог")
- (mfs-open-file "Открыть файл")
- (mfs-stop-search "Остановить поиск")
- (mfs-case-sensitive-label "Учитывать регистр")
- (mfs-no-matches-found "Совпадения не найдены.")
- (mfs-search-interrupted "Поиск прерван.")
- 
- ;;; reverting a file
- (are-you-sure-revert
-  "Вы действительно уверены, что хотите вернуться к предыдущей версии файла? Внесенные изменения невозможно будет восстановить.")
- (are-you-sure-revert-title
-  "Открыть заново?")
- 
- ;;; saving a file
- ; ~a is filled with the filename
- (error-saving "Ошибка при сохранении") ;; title of error message dialog
- (error-saving-file/name "При сохранении произошла ошибка ~a.")
- (error-loading "Ошибка открытия")
- (error-loading-file/name "При открытии произошла ошибка ~a.")
- (unknown-filename "<< неизвестный >>")
-
- ;;; finder dialog
- (must-specify-a-filename "Определите имя файла")
- (file-does-not-exist "Файл \"~a\" не существует.")
- (ask-because-file-exists "Файл \"~a\" уже существует. Заменить его?")
- (dne-or-cycle "Файл \"~a\" содержит несуществующий каталог или цикл.")
- (get-file "Получить файл")
- (put-file "Поместить файл")
- (full-pathname "Полное имя")
- (show-dot-files "Показать файлы и каталоги, которые начинаются с точки.")
- (up-directory-button-label "В предыдущий каталог")
- (add-button-label "Добавить") ;;; for multi-file selection
- (add-all-button-label "Добавить все") ;;; for multi-file selection
- (remove-button-label "Удалить") ;;; for multi-file selection
- (file-wrong-form "Это имя Файла имеет неправильную форму.")
- (select-files "Выбор файлов")
- (select-file "Выбор файла")
- (dir-dne "Каталог не существует.")
- (file-dne "Файл не существует.")
- (empty-filename "Имя файла должно содержать символы.")
- (that-is-dir-name "Это имя каталога.")
- 
- ;;; raw menu names -- these must match the 
- ;;; versions below, once the &s have been stripped.
- ;;; if they don't, DrRacket's menus will appear
- ;;; in the wrong order.
- (file-menu "Файл")
- (edit-menu "Правка")
- (help-menu "Справка")
- (windows-menu "Окна")
- 
- ;;; menus
- ;;; - in menu labels, the & indicates a alt-key based shortcut.
- ;;; - sometimes, things are stuck in the middle of 
- ;;; menu item labels. For instance, in the case of
- ;;; the "Сохранить как" menu, you might see: "Сохранить определения как". 
- ;;; be careful of spacing, follow the English, if possible.
- ;;; - the ellipses in the `after' strings indicates that
- ;;; more information is required from the user before completing
- ;;; the command.
-
- (file-menu-label "&Файл")
-
- (new-info  "Открыть новый файл")
- (new-menu-item "&Новый")
- (new-...-menu-item "&Новый...")
-
- (open-info "Открыть файл с диска")
- (open-menu-item "&Открыть...")
-
- (open-recent-info "Список последних открытых файлов")
- (open-recent-menu-item "Открыть &последние")
-
- (revert-info "Заменить файл сохраненным на диске")
- (revert-menu-item "Пе&реоткрыть")
-
- (save-info "Сохранить этот файл на диск")
- (save-menu-item "&Сохранить")
-
- (save-as-info "Указать имя файла и сохранить этот файл на диск")
- (save-as-menu-item "Сохранить &как...")
-
- (print-info "Отправить файл на печать")
- (print-menu-item "&Печать...")
-
- (page-setup-info "Выбор конфигурации параметров печати")
- (page-setup-menu-item "Параметры страницы...")
- 
- (close-info "Закрыть файл")
- (close-menu-item "&Закрыть")
-
- (quit-info "Закрыть все окна")
- (quit-menu-item-windows "&Выход")
- (quit-menu-item-others "&Выход")
- 
- (edit-menu-label "&Правка")
- 
- (undo-info "Отменить последнее действие")
- (undo-menu-item "О&тменить")
-
- (redo-info "Вернуть последнее действие")
- (redo-menu-item "Вер&нуть")
-
- (cut-info "Переместить выбранные элементы в буфер обмена для дальнейшей вставки")
- (cut-menu-item "Вы&резать")
-
- (copy-info "Копировать выбранные элементы в буфер обмена для дальнейшей вставки")
- (copy-menu-item "&Копировать")
-
- (paste-info "Вставить последний скопированный или вырезанный элемент вместо выбранных элементов")
- (paste-menu-item "Вс&тавить")
-
- (clear-info "Удалить выделенные элементы без изменения буфера или вставки")
- (clear-menu-item-windows "&Удалить")
-
- (select-all-info "Выделить весь документ")
- (select-all-menu-item "Выделить вс&е")
- 
-  (find-menu-item "Найти") ;; menu item
-  (find-info "Переключает клавиатурный фокус между окном, в котором он выполняется, и панелью поиска")
-  
- (find-next-info "Найти следующее вхождение")
- (find-next-menu-item "Найти далее")
-  
- (find-previous-info "Найти предыдущее вхождение")
- (find-previous-menu-item "Найти предыдущее")
-  
-  (show-replace-menu-item "Показать замены")
-  (hide-replace-menu-item "Скрыть замены")
-  (show/hide-replace-info "Переключить видимость панели замены")
-
-  (replace-menu-item "Заменить")
-  (replace-info "Заменить искомое")
-  
-  (replace-all-info "Заменить все вхождения")
-  (replace-all-menu-item "Заменить все")
-  
-  (find-case-sensitive-info "Переключиться между зависящим и независящим от регистра поиском")
-  (find-case-sensitive-menu-item "Искать с учетом регистра")
-  
-  (complete-word "Завершения слов") ; the complete word menu item in the edit menu
-  (no-completions "... завершения недоступны") ; shows up in the completions menu when there are no completions (in italics)
-
-  (overwrite-mode "Режим замены")
-  (enable-overwrite-mode-keybindings "Разрешить переключение в режим замены сочетанием клавиш")  
-  
- (preferences-info "Конфигурация Ваших настроек")
- (preferences-menu-item "Настройки пользователя...")
-
- (keybindings-info "Показать активные сочетания клавиш")
- (keybindings-menu-item "Сочетания клавиш")
- (keybindings-show-active "Показать активные сочетания клавиш")
- (keybindings-frame-title "Сочетания клавиш")
- (keybindings-sort-by-name "Сортировать по имени")
- (keybindings-sort-by-key "Сортировать по ключу")
- (keybindings-add-user-defined-keybindings "Добавить определенные пользователем сочетания клавиш...")
- (keybindings-add-user-defined-keybindings/planet "Добавить определенные пользователем сочетания клавиш из PLaneT...")
- (keybindings-menu-remove "Удалить ~a")
- (keybindings-choose-user-defined-file "Пожалуйста, выберите файл, содержащий сочетания клавиш.")
- (keybindings-planet-malformed-spec "Неверные настройки PLaneT: ~a") ; the string will be what the user typed in
- (keybindings-type-planet-spec "Пожалуйста, введите необходимые настройки PLaneT")
-  
- ; first ~a will be a string naming the file or planet package where the keybindings come from;
- ; second ~a will be an error message
- (keybindings-error-installing-file "Ошибка при инсталляции сочетаний клавиш ~a:\n\n~a")
-  
- (user-defined-keybinding-error "Ошибка выполнения сочетания клавиш ~a\n\n~a")
- (user-defined-keybinding-malformed-file "Файл ~a не содержит модуля, написанного на языке оболочки/сочетаний клавиш.")  
- (user-defined-keybinding-malformed-file/found-lang "Файл ~a не содержит модуля, написанного на языке оболочки/сочетаний клавиш. Найден язык ~s")   
- 
- ;; menu items in the "special" menu
- (insert-text-box-item "Вставить текстовый блок")
- (insert-image-item "Вставить рисунок...")
- (insert-comment-box-menu-item-label "Вставить комментарий")
- (insert-lambda "Вставить λ")
-
- (wrap-text-item "Переносить текст")
-
-  ;; windows menu
- (windows-menu-label "О&кна")
- (minimize "Свернуть") ;; minimize and zoom are only used under mac os x
- (zoom "Изменить размер")
- (bring-frame-to-front "Показать поверх всех окон")       ;;; title of dialog
- (bring-frame-to-front... "Показать поверх всех окон...") ;;; corresponding title of menu item
- (most-recent-window "Последнее окно")
-  (next-tab "Следующая вкладка")
-  (prev-tab "Предыдущая вкладка")
-
- (view-menu-label "В&ид")
- (show-overview "Показать Ко&нтур программы") 
- (hide-overview "Скрыть Ко&нтур программы")
- (show-module-browser "Показать &Браузер модулей")
- (hide-module-browser "Скрыть &Браузер модулей")
-
-  (help-menu-label "&Справка")
- (about-info "Сведения об авторах и подробностях применения программы")
- (about-menu-item "О программе...")
- 
- ;; open here's new menu item
- (create-new-window-or-clear-current
-  "Хотите ли Вы создать новое окно или очистить текущее?")
- (clear-current "Очистить текущее")
- (new-window "Новое окно")
-
- ;;; exiting and quitting ``are you sure'' dialog
- ;;; exit is used on windows, quit on macos, in English. Other
- ;;; languages probably use the same word on both platforms.
- (exit "Выход")
- (quit "Выход")
- (are-you-sure-exit "Вы уверены, что хотите выйти?")
- (are-you-sure-quit "Вы уверены, что хотите выйти?")
-  ; these next two are only used in the quit/exit dialog
-  ; on the button whose semantics is "dismiss this dialog".
-  ; they are there to provide more flexibility for translations
-  ; in English, they are just cancel.
- (dont-exit "Отмена") 
- (dont-quit "Отмена")
-  
- ;;; autosaving
- (error-autosaving "Ошибка автосохранения \"~a\".") ;; ~a will be a filename
- (autosaving-turned-off "Автосохранение отключено\nво время записи файла.")
- (recover-autosave-files-frame-title "Восстановить автосохраненные файлы")
- (autosave-details "Подробности")
- (autosave-recover "Восстановлен")
- (autosave-unknown-filename "<<неизвестный>>")
-  
-  ;; these are labels in a dialog that drscheme displays
-  ;; if you have leftover autosave files. to see the dialog,
-  ;; start up drscheme and modify (but don't save) a file
-  ;; (also, do this with an unsaved file). Wait for the autosave
-  ;; files to appear (typically 5 minutes). Kill DrRacket
-  ;; and restart it. You'll see the dialog
-  (autosave-autosave-label: "Автосохранение файла:")
-  (autosave-original-label: "Исходный файл:")
-  (autosave-autosave-label "Автосохранение файла")
-  (autosave-original-label "Исходный файл")
-  (autosave-compare-files "Сравнить автосохраненные файлы")
-
-  (autosave-show-autosave "Автосохранение файла") ;; title of a window showing the autosave file
-
-  (autosave-explanation "DrRacket нашел Ваши файлы автосохранения, которые могут содержать несохраненную работу.")
-
-  (autosave-recovered! "Восстановить!") ;; status of an autosave file
-  (autosave-deleted "Удалить")       ;; status of an autosave file
-
-  (autosave-error-deleting "Ошибка удаления ~a\n\n~a") ;; first is a filename, second is an error message from mz.
-  (autosave-delete-button "Удалить")
-  (autosave-delete-title "Удалить")  ;; title of a dialog asking for deletion confirmation
-  (autosave-done "Завершено")
-  
-  ;; appears in the file dialog
-  (autosave-restore-to-where? "Выберите место для записи автосохраненного файла.")
-  
-  
- ;;; file modified warning
- (file-has-been-modified
-  "Файл был изменен после последнего автосохранения. Отменить изменения?")
- (overwrite-file-button-label "Перезаписать")
- 
- (definitions-modified 
-  "Текст файла определений был изменен. Пожалуйста, сохраните или переоткройте определения.")
- (drscheme-internal-error "Внутренняя ошибка DrRacket")
- 
- ;;; tools
- (invalid-tool-spec "Некорректный файл info.rkt, содержащий описание инструмента в коллекции ~a. Ожидается строка или непустой список строк, получено: ~e")
- (error-invoking-tool-title "Ошибка вызова инструмента ~s;~s")
- (error-loading-tool-title "Ошибка загрузки инструмента ~s\n~a") ;; ~s filled with a path, ~a filled with an error message from an exn
- (tool-tool-names-same-length
-  "В файле info.rkt для ~s ожидается, что `tool-names' и `tools' - списки равной длины, получено ~e и ~e")
- (tool-tool-icons-same-length
-  "В файле info.rkt для ~s ожидается, что `tool-icons' и `tools' - списки равной длины, получено ~e и ~e")
- (tool-tool-urls-same-length
-  "В файле info.rkt для ~s ожидается, что `tool-urls' и `tools' - списки равной длины, получено ~e и ~e")
- (error-getting-info-tool
-  "ошибка при загрузке файла info.rkt для ~s")
- (tool-error-phase1 "Ошибка на 1 этапе для инструмента ~s; ~s")
- (tool-error-phase2 "Ошибка на 2 этапе для инструмента ~s; ~s")
-
-
- ;;; define popup menu
- (end-of-buffer-define "<< конец буфера >>")
- (sort-by-name "Упорядочить по имени")
- (sort-by-position "Упорядочить по позиции в файле")
- (no-definitions-found "<< определения не найдены >>")
- (jump-to-defn "Перейти к определению ~a")
-
- (recent-items-sort-by-age "Упорядочить по времени")
- (recent-items-sort-by-name "Упорядочить по имени")
- 
- ;;; view menu
- (hide-definitions-menu-item-label "Скрыть окно о&пределений")
- (show-definitions-menu-item-label "Показать окно о&пределений")
- (definitions-menu-item-help-string "Показать/Скрыть окно определений")
- (show-interactions-menu-item-label "Показать окно &интерпретатора")
- (hide-interactions-menu-item-label "Скрыть окно &интерпретатора")
- (interactions-menu-item-help-string "Показать/Скрыть окно интерпретатора")
- (toolbar "Панель инструментов")
- (toolbar-on-top "Панель инструментов сверху")
- (toolbar-on-left "Панель инструментов слева")
- (toolbar-on-right "Панель инструментов справа")
- (toolbar-hidden "Скрыть панель инструментов")
-
- ;;; file menu
- (save-definitions-as "Сохранить определения &как...")
- (save-definitions "Сохранить определения")
- (print-definitions "Печать определений...")
- (about-drscheme "О DrRacket")
- (save-other "Другие способы сохранения")
- (save-definitions-as-text "Сохранить определения как текст...")
- (save-interactions "Сохранить окно интерпретатора")
- (save-interactions-as "Сохранить окно интерпретатора как...")
- (save-interactions-as-text "Сохранить окно интерпретатора как текст...")
- (print-interactions "Печатать окно интерпретатора...")
- (new-tab "Новая вкладка")
- (close-tab "Закрыть вкладку") ;; must not have any &s in it.
- (close-tab-amp "&Закрыть вкладку") ;; like close-tab, but with an ampersand on the same letter as the one in close-menu-item
-  
- ;;; edit-menu
- (split-menu-item-label "&Разделить")
- (collapse-menu-item-label "&Обьединить")
- 
- ;;; language menu
- (language-menu-name "&Язык")
- 
- ;;; scheme-menu
- (scheme-menu-name "&Racket")
- (execute-menu-item-label "Выполнить")
- (execute-menu-item-help-string "Перезапустить программу в окне определений")
- (ask-quit-menu-item-label "Прервать программу")
- (ask-quit-menu-item-help-string "Прервать выполняющуюся программу")
- (force-quit-menu-item-label "Принудительно выйти из программы")
- (force-quit-menu-item-help-string "Прервать все текущие вычисления")
- (limit-memory-menu-item-label "Ограничение по памяти...")
- ;(limit-memory-msg-1 "Ограничение станет действовать после следующего запуска программы")
- ;(limit-memory-msg-2 "Для выполнения необходим, по крайней мере, один мегабайт.")  ;; minimum memory limit is now 8 megs
- (limit-memory-unlimited "Без ограничений")
- (limit-memory-limited "С ограничением")
- (limit-memory-megabytes "Мегабайт")
- (clear-error-highlight-menu-item-label "Очистить выделение ошибок")
- (clear-error-highlight-item-help-string "Удалить выделение ошибок")
- (reindent-menu-item-label "&Выровнять")
- (reindent-all-menu-item-label "Выровнять &все")
- (semicolon-comment-out-menu-item-label "&Закомментировать выделенное точкой с запятой")
- (box-comment-out-menu-item-label "&Закомментировать весь блок")
- (uncomment-menu-item-label "&Раскомментировать")
-
- (convert-to-semicolon-comment "Преобразовать в комментарий с точкой с запятой")
- 
- ;;; executables
- (create-executable-menu-item-label "Создать исполняемый файл...")
- (create-executable-title "Создать исполняемый файл")
- (must-save-before-executable "Вы должны сохранить свою программу прежде, чем создать исполняемый файл.")
- (save-a-mred-launcher "Сохранить запускаемым в графической оболочке")
- (save-a-mzscheme-launcher "Сохранить запускаемым в текстовой оболочке")
- (save-a-mred-stand-alone-executable "Сохранить автономный исполняемый файл с графическим интерфейсом")
- (save-a-mzscheme-stand-alone-executable "Сохранить автономный исполняемый файл с текстовым интерфейсом")
- (save-a-mred-distribution "Сохранить дистрибутив с графическим интерфейсом")
- (save-a-mzscheme-distribution "Сохранить дистрибутив с текстовым интерфейсом")
-
- (definitions-not-saved "Окно определений не было сохранено.  Исполняемая программа будет использовать последнюю сохраненную версию окна определений. Продолжить?")
- ;; The "-explanatory-label" variants are the labels used for the radio buttons in
- ;;  the "Create Executable..." dialog for the "(module ...)" language.
- (launcher "Запуск в оболочке")
- (launcher-explanatory-label "Запуск в оболочке (только для текущего компьютера, выполнение исходного файла)")
- (stand-alone "Автономный")
- (stand-alone-explanatory-label "Автономный (только для текущего компьютера, выполнение скомпилированной копии)")
- (distribution "Дистрибутив")
- (distribution-explanatory-label "Дистрибутив (для установки на других машинах)")
- (executable-type "Тип")
- (executable-base "База")
- (filename "Имя файла: ")
- (create "Создать")
- (please-specify-a-filename "Пожалуйста, определите имя создаваемого файла.")
- (~a-must-end-with-~a
-  "Имя ~a файла\n\n  ~a\n\nнеправильное. Имя файла должно заканчиваться \".~a\".")
- (macosx-executables-must-end-with-app
-  "Имя файла\n\n  ~a\n\nнеправильное. Для MacOS X исполняемая программа должна быть каталогом, имя которого заканчивается .app.")
- (warning-directory-will-be-replaced
-  "Предупреждение: каталог:\n\n  ~a\n\nбудет заменен. Продолжить?")
- 
- (distribution-progress-window-title "Создание дистрибутива")
- (creating-executable-progress-status "Создание исполняемых файлов для дистрибутива...")
- (assembling-distribution-files-progress-status "Сборка файлов для дистрибутива...")
- (packing-distribution-progress-status "Упаковка дистрибутива...")
-
- (create-servlet "Создать сервлет...")
-
- ; the ~a is a language such as "module" or "algol60"
- (create-servlet-unsupported-language
-  "Создание сервлета не поддерживается языком ~a.")
-  
- ;;; buttons
- (execute-button-label "Выполнить") 
- (save-button-label "Сохранить")
- (break-button-label "Остановить")
- 
- ;;; search help desk popup menu
- (search-help-desk-for "Поиск в помощи для \"~a\"")
- (exact-lucky-search-help-desk-for "Точный поиск в помощи для \"~a\"")
-
- ;; collapse and expand popup menu items
- (collapse-sexp "Свернуть S-выражение")
- (expand-sexp "Развернуть S-выражение")
- 
- ;;; fraction dialog
- (enter-fraction "Введите дробь")
- (whole-part "Целая часть")
- (numerator "Числитель")
- (denominator "Знаменатель")
- (insert-number/bad-whole-part "Целая часть числа должна быть целым числом")
- (insert-number/bad-numerator "Числитель должен быть целым неотрицательным числом")
- (insert-number/bad-denominator "Знаменатель должен быть целым положительным числом")
- (insert-fraction-menu-item-label "Вставить дробь...")
-
- ;; number snip popup menu
- (show-decimal-expansion "Показать десятичной дробью")
- (show-mixed-fraction-view "Показать смешанной дробью")
- (show-improper-fraction-view "Показать неправильной дробью")
- (show-more-decimal-places "Показать больше позиций после десятичной точки")
- 
- ;;; Teachpack messages
- (select-a-teachpack "Выбрать учебный пакет")
- (clear-teachpack "Очистить учебный пакет ~a")
- (teachpack-error-label "DrRacket - ошибка учебного пакета")
- (teachpack-didnt-load "Файл учебного пакета ~a не загружается должным образом.")
- (add-teachpack-menu-item-label "Добавить учебный пакет...")
- (clear-all-teachpacks-menu-item-label "Очистить все учебные пакеты")
- (drscheme-teachpack-message-title "Учебный пакет DrRacket")
- (already-added-teachpack "Учебный пакет ~a уже добавлен")
-  
-  ; ~a is filled with the teachpack's name; the message appears in the teachpack selection dialog when a user installs a new teachpack
-  (compiling-teachpack "Компиляция учебного пакета ~a ...")
-  (teachpack-pre-installed "Предварительно инсталлированные учебные пакеты")
-  (teachpack-user-installed "Пользовательские учебные пакеты")
-  (add-teachpack-to-list... "Добавить учебный пакет в список...")
-  (teachpack-already-installed "Учебный пакет с именем '~a' уже был установлен. Перезаписать?")
-  ; ~a is filled with a list of language names. Each name is separated by a newline and is indented two spaces (no commas, no 'and')
-  (teachpacks-only-in-languages "Учебные пакеты доступны только на таких языках: ~a")
-  
-  
- ;;; Language dialog
- (introduction-to-language-dialog
-  "Пожалуйста, выберите язык. Студентам во вводных курсам предпочтительно использовать язык по умолчанию.")
- (language-dialog-title "Выберите язык")
- (case-sensitive-label "Чувствительность к регистру")
- (output-style-label "Стиль вывода")
- (constructor-printing-style "Конструктор")
- (quasiquote-printing-style "Псевдоапострофы")
- (write-printing-style "ввод")
- (print-printing-style "печать")
- (sharing-printing-label "Показывать совместно используемое в значениях")
- (use-pretty-printer-label "Вставлять переводы строк в печатаемые значения")
- (input-syntax "Синтакис ввода")
- (dynamic-properties "Динамические свойства")
- (output-syntax "Синтаксис вывода")
-  (teachpacks "Учебные пакеты") ;; label in the language dialog for the teaching languages
-  (teachpacks-none "<< отсутствуют >>") ;; shows up under the previous string, when there are no teachpacks
- (no-debugging-or-profiling "Не отлаживать или профилировать")
- (debugging "Отладить")
- (debugging-and-profiling "Отладить и профилировать")
- (test-coverage "Включать набор синтаксических тестов")
- (show-details-button-label "Показать подробности")
- (hide-details-button-label "Скрыть подробности")
- (choose-language-menu-item-label "Выбрать язык...")
- (revert-to-language-defaults "Вернуть язык по умолчанию")
- (fraction-style "Стиль дроби")
- (use-mixed-fractions "Смешанные дроби")
- (use-repeating-decimals "Периодические десятичные дроби")
- (decimal-notation-for-rationals "Использовать десятичную запись для рациональных чисел")
- (enforce-primitives-group-box-label "Начальные привязки")
- (enforce-primitives-check-box-label "Запретить переопределение начальных привязок")
- (automatically-compile "Заполнить каталоги compiled/ (для более быстрой загрузки)")
- (preserve-stacktrace-information "Сохранить трассировку стека (отключает некоторые оптимизации)")
- (expression-level-stacktrace "Выражение уровня трассировки стека")
- (function-level-stacktrace "Функция уровня трассировки стека")
-
-
-  ; used in the bottom left of the drscheme frame 
-  ; used the popup menu from the just above; greyed out and only
-  ; visible when some languages are in the history
-  (recent-languages "Последние языки:")
-  ; shows up in bottom-left programming language menu popup, when no langs are recorded
-  (no-recently-chosen-languages "нет выбранных языков") 
-  
- ;; startup wizard screen language selection section
- (please-select-a-language "Пожалуйста, выберите язык")
-  
-  
- ;;; languages
- (beginning-student "Начинающий студент")
- (beginning-one-line-summary "define, cond, структуры, константы и примитивы")
- (beginning-student/abbrev "Начинающий студент со списковыми сокращениями")
- (beginning/abbrev-one-line-summary "Начинающий студент со списковым стилем печати в цикле \"чтение-вычисление-печать\"")
- (intermediate-student "Средний студент")
- (intermediate-one-line-summary "Начинающий студент с лексической видимостью")
- (intermediate-student/lambda "Средний студент с лямбда-выражениями")
- (intermediate/lambda-one-line-summary "Средний студент с функциями высших порядков")
- (advanced-student "Продвинутый студент")
- (advanced-one-line-summary "Средний студент с лямбда-выражениями и мутацией")
- (how-to-design-programs "Как проектировать программы") ;; should agree with MIT Press on this one...
- (pretty-big-scheme "Pretty Big")
- (pretty-big-scheme-one-line-summary "Добавлены синтаксис и функции языков из \"Как проектировать программы\" в mzscheme и mred")
- (r5rs-language-name "R5RS")
- (r5rs-one-line-summary "R5RS с несущественными сокращениями")
- (expander "Макрорасширитель")
- (expander-one-line-summary "Выражение чаще раскрывается, чем вычисляется")
- (legacy-languages "Унаследованные языки")
- (teaching-languages "Учебные языки")
- (experimental-languages "Экспериментальные языки")
-  (initial-language-category "Начальные языки")
-  (no-language-chosen "Не выбран язык")
- 
- (module-language-one-line-summary "Выполнение создает цикл \"чтение-вычисление-печать\" внутри модуля")
-  (module-language-auto-text "Автоматическая строка #lang") ;; shows up in the details section of the module language  
-
-  ;;; from the `not a language language' used initially in drscheme.
-  (must-choose-language "DrRacket не способен выполнять программы при невыбранном языке программирования.")
-  
-  ; next two appear before and after the name of a text book (which will be in italics)
-  (using-a-textbook-before "Использовать ")
-  (using-a-textbook-after "?")
-  
-  ; next two are before and after a language
-  (start-with-before "Начать с ")
-  (start-with-after "")
-  
-  (seasoned-plt-schemer? "Опытный программист на PLT Scheme?")
-  (looking-for-standard-scheme? "Просмотреть стандарт для Scheme?")
-
-  ; the three string constants are  together and the middle
-  ; one is hyperlinked to the dialog that suggests various languages
-  (get-guidance-before "Или выберите пункт \"Выбрать язык...\" в меню \"Язык\", или ")
-  (get-guidance-during "получите совет")
-  (get-guidance-after ".")
-    
- ;;; debug language
- (unknown-debug-frame "[неизвестный]")
- (backtrace-window-title "Обратная трассировка DrRacket")
- (files-interactions "При выполнении ~a") ;; filled with a filename
- (current-interactions "вызовов")
- (current-definitions "определений")
- (mzscheme-w/debug "Текстовый (MzScheme, включая Стандарт 1998 года)")
- (mzscheme-one-line-summary "PLT-реализация Scheme")
- (mred-w/debug "Графический (MrEd, включая MzScheme)")
- (mred-one-line-summary "Добавить поддержку графического интерфейса пользователя к MzScheme")
-
- ;; profiling
- (profiling-low-color "Нижний")
- (profiling-high-color "Верхний")
- (profiling-choose-low-color "Пожалуйста, выберите нижний цвет")
- (profiling-choose-high-color "Пожалуйста, выберите верхний цвет")
- (profiling "Профилирование")
- (profiling-example-text "(define (whee) (whee))")
- (profiling-color-config "Набор основных цветов") 
- (profiling-scale "Шкала распределения цветов")
- (profiling-sqrt "Пропорциональна корню квадратному")
- (profiling-linear "Линейная")
- (profiling-square "Квадратическая")
- (profiling-number "Число вызовов")
- (profiling-time "Общее время")
- (profiling-update "Обновить профиль")
- (profiling-col-percent-time "% времени")
- (profiling-col-function "Функция")
- (profiling-col-time-in-msec "миллисекунд")
- (profiling-col-calls "Вызовы")
- (profiling-show-profile "Показать профиль")
- (profiling-hide-profile "Скрыть профиль")
- (profiling-unknown-src "<< неизвестный >>")
- (profiling-no-information-available "Информация о профилировании недоступна. Пожалуйста, убедитесь, что профилирование допускается на выбранном языке, а программа выполнена.")
- (profiling-clear? "Изменения в окне определений лишают профилирующую информацию актуальности. Продолжить?")
- 
- ;; test coverage
- (test-coverage-clear? "Изменения в окне определений лишают информацию о тестировании актуальности. Продолжить?")
- (test-coverage-clear-and-do-not-ask-again "Да, больше не спрашивать")
- (test-coverage-ask? "Спрашивать об очистке информации о тестировании")
-  
- ;; tracing
- (tracing-enable-tracing "Допустить трассировку")
- (tracing-show-tracing-window "Показать трассировку")
- (tracing-hide-tracing-window "Скрыть трассировку")
- (tracing-tracing-nothing-to-show "Результаты трассировки еще не доступны. (Убедитесь, что выбранный язык поддерживает трассировку и что трассировка включена.)")
-
- ;;; repl stuff
- (evaluation-terminated "Прервать вычисления")
- (evaluation-terminated-explanation
-  "Поток вычислений остановлен до следующего запуска.")
-  
-  ; The next three constants show up in the same dialog as the above evaluation-terminated string
-  ; constants.
-  ; The first two show up only when the user calls 'exit' (possibly with a status code).
-  ; The third shows up when the program runs out of memory.
-  (exited-successfully "Успешное завершение.")
-  (exited-with-error-code "Завершение с кодом ошибки ~a.") ;; ~a is filled in with a number between 1 and 255
-  (program-ran-out-of-memory "Программе не хватило памяти для завершения выполнения.")
- (last-stack-frame "Показать последнее значение стека")
- (last-stack-frames "Показать последние ~a значений стека")
- (next-stack-frames "Показать следующие ~a значений стека")
- 
- ;;; welcoming message in repl
- (language "Язык")
- (custom "выбранный")
- (teachpack "Учебный пакет")
- (welcome-to "Добро пожаловать в")
- (version "версия")
- 
- ;;; kill evaluation dialog
- (kill-evaluation? "Вы хотите прервать цикл вычислений?")
- (just-break "Только остановить")
- (kill "Прервать")
- (kill? "Прервать?")
-
- ;;; version checker
- (version:update-menu-item   "Проверить обновления...")
- (version:update-check       "Проверка обновлений") ; dialog title, with the next line
- (version:connecting-server  "Соединение с сервером версии Racket")
- (version:results-title      "Проверка версии Racket")
- (version:do-periodic-checks "Периодически проверять более новые версии Racket")
- (version:take-me-there      "Обновить") ; ...to the download website
- ;; the next one can appear alone, or followed by a comma and the one after that
- (version:plt-up-to-date     "У Вас новейшая версия Racket")
- (version:but-newer-alpha    "однако заметьте, что есть более новая альфа-версия")
- ;; This is used in this context: "Racket vNNN <<<*>>> http://download..."
- (version:now-available-at   "теперь доступно в")
-
- ;; insert menu
- (insert-menu "&Вставка")
- 
- ;; large semi colon letters
- (insert-large-letters... "Вставить большие буквы...")
- (large-semicolon-letters "Большие закомментированные буквы")
- (text-to-insert "Вставить текст")
-
- (module-browser-filename-format "Полное имя: ~a (~a строк)")
- (module-browser-root-filename "Основное имя файла: ~a")
- (module-browser-font-size-gauge-label "Размер  шрифта")
- (module-browser-progress-label "Прогресс просмотра модулей")
- (module-browser-adding-file "Добавить файл: ~a...")
- (module-browser-laying-out-graph-label "Граф разметки")
- (module-browser-open-file-format "Открыть ~a")
- (module-browser "Браузер модуля") ;; frame title
- (module-browser... "Браузер модуля...") ;; menu item title
- (module-browser-error-expanding "Ошибка раскрытия имени программы:\n\n~a")
- (module-browser-show-lib-paths "Показывать файлы, загружаемые из библиотек")
- (module-browser-progress "Браузер модуля: ~a") ;; prefix in the status line
- (module-browser-compiling-defns "Браузер модуля: компиляция определений")
- (module-browser-show-lib-paths/short "Показывать пути к библиотекам") ;; check box label in show module browser pane in drscheme window.
- (module-browser-show-planet-paths/short "Показывать пути к PLanet") ;; check box label in show module browser pane in drscheme window.
- (module-browser-refresh "Обновить") ;; button label in show module browser pane in drscheme window.
-; (module-browser-only-in-plt-and-module-langs
-;  "Браузер модуля доступен только для программ на PLT-языках и на языке модуля (и только для программ, которые содержат модули).")
- (module-browser-name-length "Длина имени")
- (module-browser-name-short "Короткая")
- (module-browser-name-medium "Средняя")
- (module-browser-name-long "Длинная")
- (module-browser-name-very-long "Длинная, с фазами")  ;; like 'Long' but shows the phases where this file is loaded
- (module-browser-open-all "Открыть все показанные здесь файлы")
-
- (happy-birthday-matthias "С днем рождения, Матиас!")
- (happy-birthday-matthew "С днем рождения, Метью!")
- (happy-birthday-shriram "С днем рождения, Шрирам!")
-
- (mrflow-using-default-language-title "Язык, используемый по умолчанию")
- (mrflow-using-default-language "В используемом языке не определена таблица типов для его примитивов. Используйте стандарт Scheme.")
- (mrflow-button-title "Анализировать")
- ;(mrflow-unknown-style-delta-error-title "Неизвестный стиль блока дельта")
- ;(mrflow-unknown-style-delta-error "Неизвестный стиль блока дельта: ~a")
- (mrflow-popup-menu-show-type "Показать тип")
- (mrflow-popup-menu-hide-type "Скрыть тип")
- (mrflow-popup-menu-show-errors "Показать ошибки")
- (mrflow-popup-menu-hide-errors "Скрыть ошибки")
- ;(mrflow-read-exception-title "Исключение при вводе")
- ;(mrflow-read-exception "Исключение при вводе: ~a")
- ;(mrflow-syntax-exception-title "Синтаксическое исключение")
- ;(mrflow-syntax-exception "Синтаксическое исключение: ~a")
- ;(mrflow-unknown-exception-title "Неизвестное исключение")
- ;(mrflow-unknown-exception "Неизвестное исключение: ~a")
- ;(mrflow-language-primitives-error-title "Ошибка в примитивах языка")
- ;(mrflow-language-primitives-error "Неправильное имя файла для таблицы типов примитивов языка: ~a")
-  
- (snips-and-arrows-popup-menu-tack-all-arrows "Соединить все стрелки")
- (snips-and-arrows-popup-menu-untack-all-arrows "Убрать все стрелки")
- (snips-and-arrows-user-action-disallowed-title "Пользовательские изменения в настоящее время запрещены")
- (snips-and-arrows-user-action-disallowed "Пользовательские изменения запрещены в редакторах, содержащих элементы из панели инструментов. Скройте все инструменты перед редактированием.")
- ;(snips-and-arrows-changing-terms-warning-title "Changing terms will be undoable")
- ;(snips-and-arrows-changing-terms-warning "Changing terms in an editor containing snips cannot be undone.  You can either cancel this action, remove the snips, and try the change again, or you can continue with the change, in which case the change will not be undoable (all others changes made before and afterward will still be undoable though).")
- (snips-and-arrows-hide-all-snips-in-editor "Скрыть все инструменты, вставленные в редактор")
-
- (xml-tool-insert-xml-box "Вставить блок XML")
- (xml-tool-insert-scheme-box "Вставить блок Racket")
- (xml-tool-insert-scheme-splice-box "Присоединить блок Racket")
- (xml-tool-xml-box "XML блок")
- (xml-tool-scheme-box "Racket блок")
- (xml-tool-scheme-splice-box "Присоединенный блок Racket")
- (xml-tool-switch-to-scheme "Переключиться на блок Racket")
- (xml-tool-switch-to-scheme-splice "Переключиться присоединенный на блок Racket")
- (xml-tool-eliminate-whitespace-in-empty-tags
-  "Убирать пробелы в пустых тегах")
- (xml-tool-leave-whitespace-alone
-  "Оставить по одному пробелу")
- 
- (show-recent-items-window-menu-item "Показать недавно открытые файлы в отдельном окне")
- (show-recent-items-window-label "Недавно открытые файлы")
- (number-of-open-recent-items "Количество недавних элементов")
- (switch-anyway "Все равно перейти к файлу")
-
- (stepper-program-has-changed "Предупреждение: Программа была изменена.")
- (stepper-program-window-closed "Предупреждение: Окно программы закрыто.")
-
- (stepper-name "Пошаговое выполнение")
- (stepper-language-level-message "Пошаговое выполнение не работает для языка \"~a\".")
- (stepper-button-label "Шаг")
-
- (stepper-previous-application "Программа")
- (stepper-previous "Шаг")
- (stepper-next "Шаг")
- (stepper-next-application "Программа")
- (stepper-jump "Перейти...") ;; this one is changed.  action?
- (stepper-out-of-steps "Вычисления завершены ранее, чем достигнут искомый шаг.")
- (stepper-no-such-step/title "Шаг не найден")
- (stepper-no-such-step "Шаг, соответствующий критерию, не найден.")
- (stepper-no-such-step/earlier "Предыдущий шаг, соответствующий критерию, не найден.")
- (stepper-jump-to-beginning "в начало") ;; name changed from stepper-home to stepper-jump-to-beginning
- (stepper-jump-to-end "в конец") ;; content changed
- (stepper-jump-to-selected "к началу выбранного") ;; new
-
- (debug-tool-button-name "Отладить")
-
- (dialog-back "Назад")
-
- ;; warnings about closing a drscheme frame when the program
- ;; might still be doing something interesting
- (program-is-still-running "Программа в окне определений все еще выполняется. Все равно закрыть?")
-  (program-has-open-windows "Программа в окне определений имеет открытые окна. Все равно закрыть?")
- 
-  ;; ml-command-line-arguments is for the command line arguments
-  ;; label in the module language details in the language dialog.
-  (ml-command-line-arguments "Аргументы командной строки как вектор строк")
-
-  ;; ml-cp names are all for the module language collection path
-  ;; configuration. See the details portion of the language dialog
-  ;; for the module language (at the bottom).
-  (ml-cp-default-collection-path "<<пути к коллекции по умолчанию>>")
-
-  ;; in std get-directory 
-  (ml-cp-choose-a-collection-path "Пожалуйста, выберите путь к коллекции")
-
-  ;; err msg when adding default twice
-  (ml-cp-default-already-present
-   "Заданные по умолчанию пути к коллекции уже установлены")
-  
-  ;; title of this section of the dialog (possibly the word
-  ;; `Collection' should not be translated)
-  (ml-cp-collection-paths "Пути к коллекции")
-
-  ;; button labels
-  (ml-cp-add "Добавить")
-  (ml-cp-add-default "Добавить по умолчанию")
-  (ml-cp-remove "Удалить")
-  (ml-cp-raise "Вверх")
-  (ml-cp-lower "Вниз")
-  
-  (ml-always-show-#lang-line "Всегда показывать строку #lang модуля языка")
-
-  ;; Profj
-  (profj-java "Java")
-  (profj-java-mode "Режим Java")
-  (profj-java-coverage "Набор Java") ;; shows up in the preferences dialog under 'Color'
-
-  (profj-beginner-lang "Начинающий")
-  (profj-beginner-lang-one-line-summary "Java-подобный язык для обучения начинающих")
-  (profj-full-lang "Полный")
-  (profj-full-lang-one-line-summary "Подобный Java 1.0 (приблизительно 1.1)")
-  (profj-advanced-lang "Опытный")
-  (profj-advanced-lang-one-line-summary "Java-подобный язык для опытных пользователей")
-  (profj-intermediate-lang "Средний")
-  (profj-intermediate-lang-one-line-summary "Java-подобный язык для продолжающих обучение")
-  (profj-intermediate-access-lang "Средний + доступ")
-  (profj-intermediate-access-lang-one-line-summary "Java-подобый язык для продолжающих обучение с доступом к модификаторам")
-  (profj-dynamic-lang "Java + динамическая типизация")
-  (profj-dynamic-lang-one-summary "Java с возможностью динамической типизации")
-
-  (profj-java-mode-color-heading "Цвета редактирования") ; Heading for preference to choose editing colors  
-  (profj-java-mode-color-keyword "ключевые слова")
-  (profj-java-mode-color-string "строка")
-  (profj-java-mode-color-literal "литерал")
-  (profj-java-mode-color-comment "комментарий")
-  (profj-java-mode-color-error "ошибка")
-  (profj-java-mode-color-identifier "идентификатор")
-  (profj-java-mode-color-prim-type "примитивный тип") ; Example text for built-in Java types
-  (profj-java-mode-color-default "по умолчанию")
-
-  (profj-coverage-color-heading "Цвета окружения") ; Heading for preference to choose coverage colors
-  (profj-coverage-color-covered "окружающее выражение") 
-  
-  (profj-language-config-display-preferences "Персональные настройки отображения") ; Heading for preferences controlling printing
-  (profj-language-config-display-style "Стиль отображения")
-  (profj-language-config-display-field "Класс + Поля")
-  (profj-language-config-class "Класс")
-  (profj-language-config-display-array "Выводить массивы целиком?")
-  (profj-language-config-testing-preferences "Настройки тестирования") ; Heading for preferences controlling test behavior
-  ;(profj-language-config-testing-enable "Отображать результаты тестирования при выполнении?") ; Run should be the word found on the Run button
-  (profj-language-config-testing-coverage "Собрать информацию для тестирования?")
-  (profj-language-config-support-test-language "Поддерживать тестирование языковых расширений?")
-  (profj-language-config-testing-check "Разрешить проверку выражений?") ; check should not be translated
-  (profj-language-config-classpath "Путь к классам")
-  (profj-language-config-choose-classpath-directory "Выбрать каталог для добавления к пути к классам")
-  (profj-language-config-classpath-display "Показать текущий") ; Button label to print the current classpath
-
-  (profj-test-name-close-to-example "Имя класса ~a содержит фразу, близкую к примерам.")
-  (profj-test-name-example-miscapitalized "Имя класса ~a с точностью до регистра содержит пример.")
-  
-   ;; Close testing window and do not run test cases any more
-  ;(profj-test-results-close-and-disable "Закрыть и запретить тестирование")
-  ;; Hide docked testing window and do not run test cases any more
-  ;(profj-test-results-hide-and-disable "Скрыть и запретить тестирование")
-  ;Renamed below
-  ;(profj-test-results-window-title "Результаты тестирования")
-  
-  (profj-unsupported "Не поддерживается")
-  (profj-executables-unsupported "Извините - в настоящий момент Java не поддерживает исполняемые файлы")
-
-  (profj-convert-to-text-comment "Преобразовать в текстовый комментарий")
-  (profj-convert-to-comment "Преобразовать в комментарий")
-
-  (profj-executing-main "запуск main")
-
-  (profj-insert-java-comment-box "Вставить блок Java-комментария")
-  (profj-insert-java-interactions-box "Вставить блок Java-кода")
-
-  ;;The Test engine tool
-  ;;
-  (test-engine-window-title "Результаты тестирования")
-  ;;Following two appear in View menu, attach and free test report window from DrRacket frame
-  (test-engine-dock-report "Прикрепить отчет о тестировании")
-  (test-engine-undock-report "Открепить отчет о тестировании")
-  ;;Following two appear in Racket (Java, etc) menu, cause Tests to be Run automatically or not
-  (test-engine-enable-tests "Разрешить тестирование")
-  (test-engine-disable-tests "Запретить тестирование")
- 
-  (test-engine-ran-1-test "Выполнен 1 тест.")
-  (test-engine-ran-1-check "Выполнена 1 проверка.")
-  ;; ditto, only plural
-  (test-engine-ran-n-tests "Выполнено ~a тестов.")
-  (test-engine-ran-n-checks "Выполнено ~a проверок.")
-  (test-engine-1-test-passed "Тест пройден!")
-  (test-engine-1-check-passed "Проверка закончена!")
-  (test-engine-both-tests-passed "Оба теста пройдены!")
-  (test-engine-both-checks-passed "Обе проверки закончены!")
-  (test-engine-all-tests-passed "Все тесты пройдены!")
-  (test-engine-all-checks-passed "Все проверки закончены!")
-  (test-engine-all-n-tests-passed "Все ~a тестов пройдены!")
-  (test-engine-all-n-checks-passed "Все ~a проверок закончены!")
-  (test-engine-0-tests-passed "0 тестов пройдено.")
-  (test-engine-0-checks-passed "0 проверок закончено.")
-  (test-engine-m-of-n-tests-failed "~a из ~a тестов ошибочны.")
-  (test-engine-m-of-n-checks-failed "~a из ~a проверок ошибочны.")
-  (test-engine-must-be-tested "Эта программа должна быть протестирована!")
-  (test-engine-is-unchecked "Эта программа непроверена!")
-  (test-engine-tests-disabled "Тесты отключены.")
-  (test-engine-should-be-tested "Эта программа должна быть проверена.")
-  (test-engine-at-line-column "в строке ~a, столбце ~a")
-  (test-engine-in-at-line-column "в ~a, строке ~a, столбце ~a")
-  ; as in "column (unknown)"
-  (test-engine-unknown "(неизвестно)")
-  (test-engine-trace-error "Ошибка трассировки")
-
-  ; The ~F is special marker for the offending values, which may be
-  ; printed specially in DrRacket.
-  (test-engine-check-encountered-error
-   "ошибка проверки: вместо ожидаемого значения ~F. ~n   :: ~a")
-  (test-engine-actual-value-differs-error
-   "Фактическое значение ~F отличается от ожидаемого ~F.")
-  (test-engine-actual-value-not-within-error
-   "Фактическое значение ~F выходит за пределы ~v ожидаемого значения ~F.")
-  (test-engine-encountered-error-error
-   "ошибка проверки: следующая ошибка вместо ожидаемого значения~a~n   :: ~a")
-  (test-engine-expected-error-error
-   "ошибка проверки: ожидалась ошибка, но вместо этого получено значение ~F.~n ~a")
-
-  ; section header
-  (test-engine-check-failures "Ошибки тестирования:")
-  ; section header
-  (test-engine-signature-violations "Нарушения соглашения:")
-
-  ; part of one phrase "signature <at line ...> to blame: procedure <...>
-  (test-engine-signature "соглашение")
-  (test-engine-to-blame "нарушено: процедура ")
-
-  (test-engine-no-signature-violations "Нет нарушений соглашения.")
-  (test-engine-1-signature-violation "1 нарушение соглашения.")
-  (test-engine-n-signature-violations "~a нарушений соглашения.")
-
-  ; as in got <value>, signature <at ...>
-  (test-engine-got "получено")
-  
-  (profjWizward-insert-java-class "Вставить класс Java")
-  (profjWizard-insert-java-union "Вставить объединение Java")
-  
-  ;; The Test Suite Tool
-  ;; Errors
-  (test-case-empty-error "Пустой тестовый набор")
-  (test-case-too-many-expressions-error "Слишком много выражений в тестовом наборе.")
-  ;; DrRacket window menu items
-  (test-case-insert "Вставить тестовый набор")
-  (test-case-disable-all "Отключить все тестовые наборы")
-  (test-case-enable-all "Включить все тестовые наборы")
-  
-  ;; NOTE: The following string constants are labels of the test-case fields. The width
-  ;;       of the field is determined by the length of the longest of the following three words.
-  ;;       if the words are too long the test case will take up too much horizontal room and
-  ;;       not look very good.
-  ;; This string is the label of the expression that is being tested in a test case.
-  (test-case-to-test "Проверяется")
-  ;; This string is the label of the expression that is the expected value of the to-test expression.
-  (test-case-expected "Должно быть")
-  ;; This string is the label of the actual result of the to test expression.
-  (test-case-actual "Фактически")
-  (test-case-predicate "Предикат")
-  (test-case-should-raise "Должен бы")
-  ;; The label of a field of the test-case that describes the expected error message of a test case
-  (test-case-error-message "Сообщение об ошибке")
-
-  (test-case-menu-title "Тестовый набор")
-  (test-case-switch-to-error-box "Переключиться в окно ошибочных тестов")
-  (test-case-switch-to-nonerror-box "Переключиться в окно безошибочных тестов")
-  (test-case-collapse "Свернуть тестовый набор")
-  (test-case-show-actual "Показать фактическое значение")
-  (test-case-enable "Разрешить тестовый набор")
-  (test-case-show-predicate "Показать предикат")
-  (test-case-show-error-message "Показать сообщение об ошибке")
-  (test-case-convert-to-text "Преобразовать в текст")
-  
-  ;; Profj Boxes
-  (profjBoxes-empty-error "Не заданы действия")
-  (profjBoxes-too-many-expressions-error "Слишком много выражений")
-  (profjBoxes-interactions-label "Действия")
-  (profjBoxes-bad-java-id-error "Неверный Java ID")
-  (profjBoxes-examples-label "Примеры")
-  (profjBoxes-add-new-example-button "Добавить новый пример")
-  (profjBoxes-type "Тип")
-  ;; The Java identifier of an example of data
-  (profjBoxes-name "Имя")
-  (profjBoxes-value "Значение")
-  (profjBoxes-insert-java-examples "Вставить примеры Java")
-  (profjBoxes-insert-java-interactions "Вставить Java-код")
-
-  ;; Slideshow
-  (slideshow-hide-picts "Показать вложенные поля")
-  (slideshow-show-picts "Показать рисунки")
-  (slideshow-cannot-show-picts "Невозможно отобразить рисунки; запустите программу для кеширования размеров")
-  (slideshow-insert-pict-box "Вставить блок рисунка") 
-
-  ;; GUI Tool
-  (gui-tool-heading "Инструмент графического интерфеса пользователя")
-  (gui-tool-before-clicking-message "Перед выбором иконки на панеле используйте \"Вставить элемент графического интерфейса пользователя\" из меню \"Специальная вставка\" в корневой элемент графического интерфейса пользователя либо выберите уже вставленный элемент.")
-  (gui-tool-show-gui-toolbar "Показать панель инструментов графического интерфейса пользователя")
-  (gui-tool-hide-gui-toolbar "Скрыть панель инструментов графического интерфейса пользователя")
-  (gui-tool-insert-gui "Вставить элемент графического интерфейса пользователя")
-
-  ;; contract violation tracking
-  
-  ; tooltip for new planet icon in drscheme window (must have a planet violation logged to see it)
-  (show-planet-contract-violations "Показать нарушения от PLaneT")
-
-  ; buttons in the dialog that lists the recorded bug reports
-  (bug-track-report "Файл отчета")
-  (bug-track-forget "Не обрабатывать")
-  (bug-track-forget-all "Все проигнорировать")
-    
-  ;; planet status messages in the bottom of the drscheme window; the ~a is filled with the name of the package
-  (planet-downloading "PLaneT: загрузка ~a...")
-  (planet-installing "PLaneT: инсталляция ~a...")
-  (planet-finished "PLaneT: закончена с ~a.")
-  (planet-no-status "PLaneT") ;; this can happen when there is status shown in a different and then the user switches to a tab where planet hasn't been used
-  
-  ;; string normalization. To see this, paste some text with a ligature into DrRacket
-  ;; the first three strings are in the dialog that appears. The last one is in the preferences dialog
-  (normalize "Нормализировать")
-  (leave-alone "Оставить без изменений")
-  (normalize-string-info "Строка, которую Вы вставили, содержит лигатуры и другие ненормализированные знаки. Нормализировать их?")
-  (normalize-string-preference "Нормализировать вставленные строки")
-  (ask-about-normalizing-strings "Спрашивать о нормализации строк")
-
-  )
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/simplified-chinese-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/simplified-chinese-string-constants.rkt
deleted file mode 100644
index 2b168bd62b..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/simplified-chinese-string-constants.rkt
+++ /dev/null
@@ -1,1597 +0,0 @@
-;                                                              
-;           #                    #                             
-;       #   ##             ##    #     #       #       #       
-;       #   ##             #     #     #       #   ##  #   ##  
-;      ##   ##    ##       ###### ######       #   #   #   #   
-;      # #########               #             ##  #   #   #   
-;     #     ##            #      #      #    # # # #### ####   
-;    #      ##            ####### #######    # #          #    
-;   #################    #           #      ## #    ###### #   
-;          ####             #########          #           #   
-;         #### #                        #      #           #   
-;        ## ## ##        ###############       #    ########   
-;       ##  ##  ##           ##  #             #    #          
-;      #    ##   ###        ##   #  ##         #    #       #  
-;     #     ##     ##      #     #    ##       #    #       #  
-;   ##      ##           ##   ####     ##      #    #       ## 
-;           #                   #                    #######   
-;                                                              
-(module simplified-chinese-string-constants "string-constant-lang.rkt" 
-  (is-this-your-native-language "中文是你的母语吗？")
-  
-  (are-you-sure-you-want-to-switch-languages
-   "为了改变界面语言，现在需要重新启动DrRacket。你确定吗？")
-  
-  (interact-with-drscheme-in-language "使用简体中文作DrRacket界面语言")
-  
-  ;; these two should probably be the same in all languages excepet English.
-  ;; they are the button labels (under macos and windows, respectively)
-  ;; that go the with the string above.
-  (accept-and-quit "接受并退出")
-  (accept-and-exit "接受并退出")
-  
-  ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
-  (plt "PLT")
-  (drscheme "DrRacket")
-  (drracket "DrRacket")
-  (ok "确定")
-  (cancel "取消")
-  (abort "中止")
-  (untitled "未命名")
-  (untitled-n "未命名~a")
-  (warning "警告")
-  (error "错误")
-  (close "关闭") ;; as in, close an open window. must match close-menu-item
-  ;; in the sense that, when the &s have been stripped from
-  ;; close-menu-item, it must be the same string as this.
-  (close-window "关闭视窗")
-  (stop "停止")
-  (&stop "停止(&S)") ;; for use in button and menu item labels, with short cut.
-  (are-you-sure-delete? "确定要删除~a吗？") ;; ~a is a filename or directory name
-  (are-you-sure-replace? "确定要替换~a吗？") ;; ~a is a filename or directory name
-  (ignore "忽略")
-  (revert "还原")
-  
-  ;; label for a generic check box, often supported on dialogs
-  ;; that ask a binary choice of the user. If checked, the
-  ;; dialog isn't going to be shown again.
-  ;; One version for always using the current choice:
-  (dont-ask-again-always-current "不再询问（总是使用当前设置）")
-  ;; One generic version (ie, on the Quit DrRacket dialog)
-  (dont-ask-again "不再询问")
-  
-  ;;; important urls
-  (web-materials "相关网站") ;; menu item title
-  (tool-web-sites "工具网站")   ;; menu item title
-  (plt-homepage "Racket")
-  (pbd-homepage "Program by Design")
-  
-  ;;; bug report form
-  (cancel-bug-report? "取消程序错误报告？")
-  (are-you-sure-cancel-bug-report?
-   "你确定要取消报告程序错误吗？")
-  (do-you-want-to-discard-or-save-this-bug-report
-   "是保存还是丢弃这份程序错误报告?")
-  (discard "丢弃") ;; a button label for a dialog box with the above question
-  (bug-report-form "程序错误报告表")
-  (bug-report-field-name "姓名")
-  (bug-report-field-email "电子邮件")
-  (bug-report-field-summary "标题")
-  (bug-report-field-severity "严重度")
-  (bug-report-field-class "类别")
-  (bug-report-field-description "详细描述")
-  (bug-report-field-reproduce1 "再现程序错")
-  (bug-report-field-reproduce2 "误的步骤")
-  (bug-report-field-environment "环境")
-  (bug-report-field-docs-installed "已安装文档")
-  (bug-report-field-collections "Collections")
-  (bug-report-field-human-language "自然语言")
-  (bug-report-field-memory-use "内存使用")
-  (bug-report-field-version "版本")
-  (bug-report-synthesized-information "综合信息")  ;; dialog title
-  (bug-report-show-synthesized-info "显示综合信息")
-  (bug-report-submit "提交")
-  (close-and-save-bug-report "保存并关闭(&&)") ;; button in bug report dialog, next to cancel and bug-report-submit
-  (bug-report-submit-menu-item "提交程序错误报告…");; same as above, but used when there are saved bug reports
-  (saved-bug-reports-menu-item "保存程序错误报告") ;; in Help Menu, submenu title
-  (disacard-all-saved-bug-reports "丢弃全部程序错误报告") ;; menu item: only shows up when there is more than one saved bug report
-  (no-saved-bug-reports "不存在程序错误报告") ;; an info message that shows up as a disabled menu item when no saved bug reports are around
-  (new-bug-report "新程序错误报告") ;; button label the user sees when there are saved bug reports, but the user asks to save another one.
-  (close-and-save "保存并关闭") ;; button on the bottom of the bug report form
-  (saved-unsubmitted-bug-reports "未提交的程序错误报告") 
-  ;; the above string constant is next to previous line in same dialog, followed by list of bug report subjects (as buttons)
-  (error-sending-bug-report "程序错误报告传输出错")
-  (error-sending-bug-report-expln "在传输程序错误报告的过程中出现了错误。如果你能够正常浏览网络，请访问：\n\n    http://bugs.racket-lang.org/\n\n使用网页上的表单提交程序错误报告。对于由此产生的不便，我们表示抱歉。\n\n传输错误详情：\n~a")
-  (illegal-bug-report "非法的程序错误报告")
-  (pls-fill-in-field "请填写\"~a\"栏目")
-  (malformed-email-address "电子邮件地址合格不正确")
-  (pls-fill-in-either-description-or-reproduce "在“详细描述”和“再现程序错误的步骤”两栏中，请至少填写一项。")
-  
-  ;;; check syntax
-  (check-syntax "检查语法")
-  (cs-italic "斜体")
-  (cs-bold "黑体")
-  (cs-underline "下划线")
-  (cs-change-color "改变颜色")
-  (cs-foreground-color "前景色")
-  (cs-background-color "背景色")
-  (cs-tack/untack-arrow "附加/取消箭头")
-  (cs-jump-to-next-bound-occurrence "跳至下一个被绑定出现")
-  (cs-jump-to-binding "跳至绑定出现")
-  (cs-jump-to-definition "跳至定义")
-  (cs-error-message "出错信息")
-  (cs-open-file "打开~a")
-  (cs-rename-var "重命名~a")
-  (cs-rename-id "重命名标识符")
-  (cs-rename-var-to "将~a重命名为：")
-  (cs-name-duplication-error "你所选择的新名称~s与当前辖域内现有标识符相同。")
-  (cs-rename-anyway "强制重命名")
-  (cs-status-init "检查语法：为用户代码初始化环境")
-  (cs-status-coloring-program "检查语法：为程序着色")
-  (cs-status-eval-compile-time "检查语法：编译程序")
-  (cs-status-expanding-expression "检查语法：展开表达式")
-  (cs-status-loading-docs-index "检查语法：加载文档索引")
-  (cs-mouse-over-import "绑定~s由~s导入")  
-  (cs-view-docs "察看~a的文档")
-  (cs-view-docs-from "~a（来自~a）")  ;; a completed version of the line above
-  ;; (cs-view-docs) is put into the first ~a and a list of modules (separated by commas) 
-  ;; is put into the second ~a. Use check syntax and right-click on a documented variable (eg, 'require') to see this in use
-  
-  (cs-lexical-variable "词法变量")
-  (cs-set!d-variable "set!过的变量")
-  (cs-imported-variable "导入的变量")
-  (cs-unused-require "无用的require")
-  (cs-free-variable "自由变量")
-  
-  (cs-binder-count "~a次绑定出现")
-  (cs-zero-varrefs "没有绑定出现")
-  (cs-one-varref "1次被绑定出现")
-  (cs-n-varrefs "~a次被绑定出现") ;; expected to have one ~a formatter that will accept a number
-  
-  (cs-contract-my-obligation "Contract：本module的义务")
-  (cs-contract-their-obligation "Contract：客户module的义务")
-  (cs-contract-both-obligation "Contract：本module和客户module的共同义务")
-  (cs-contract-unk-obligation "Contract：义务未知")
-  
-  
-  ;; mode sub-menu in the "view" menu
-  (cs-check-syntax-mode "检查语法模式")
-  (cs-mode-menu-show-my-obligations "我的Contract义务")
-  (cs-mode-menu-show-client-obligations "客户的Contract义务")
-  (cs-mode-menu-show-syntax "语法范畴")
-  
-  ;; the documentation blue boxes in the upper-right corner of the drracket window
-  (sc-read-more... "阅读更多…")
-  (sc-f2-to-un/lock "f2（解除）锁定")
-  
-  ;; the online check syntax status messages (mouse over the bottom right of drracket's window to see the messages during online expansion's various phases)
-  (online-expansion-running "语法检查后台运行中")
-  (online-expansion-only-raw-text-files-supported "仅支持纯文本文件")
-  (online-expansion-abnormal-termination "语法检查后台异常退出")
-  (online-expansion-finished-successfully "语法检查后台成功运行")
-  
-  (jump-to-error "跳至错误")
-  (online-expansion-is-disabled "语法检查后台运行被禁用")
-  ; these next two show up in the bar along the bottom of the drracket window
-  (online-expansion-pending "语法检查后台运行……")
-  (online-expansion-finished "后台语法检查完成") ;; note: there may still be errors in this case
-  ; the next two show up in a menu when you click on the circle in the bottom right corner
-  (disable-online-expansion "禁用后台语法检查")
-  (enable-online-expansion "启用后台语法检查")
-  ;; the online expansion preferences pane
-  (online-expansion "后台语法检查") ;; title of prefs pane
-  ; the different kinds of errors
-  (online-expansion-show-read-errors-as "显示read错误")
-  (online-expansion-show-variable-errors-as "显示未绑定变量")
-  (online-expansion-show-other-errors-as "显示其他错误")
-  ; locations the errors can be shown
-  (online-expansion-error-gold-highlight "使用高亮突出")
-  (online-expansion-error-margin "在一侧显示")
-  ; the label of a preference in the (string-constant online-expansion) section
-  (show-arrows-on-mouseover "鼠标悬停时显示绑定及尾位置箭头")
-  ;;; info bar at botttom of drscheme frame
-  (collect-button-label "垃圾收集")
-  (read-only "只读")
-  (auto-extend-selection "自动延长")
-  (overwrite "覆盖")
-  (running "运行中")
-  (not-running "静止中")
-  
-  ;;; misc
-  (welcome-to-something "欢迎来到~a")
-  
-  ; this appears in the drscheme about box.
-  (welcome-to-drscheme-version/language "欢迎使用DrRacket，版本~a，~a")
-  
-  ; these appear on subsequent lines in the `Help|Welcome to DrRacket' dialog.
-  (welcome-to-drscheme "欢迎使用DrRacket")
-  
-  (goto-line "跳至行号")
-  (goto-line-invalid-number
-   "~a不是合法的行号。必须提供一个在1和~a之间的数字")
-  (goto-position "跳至位置")
-  (no-full-name-since-not-saved
-   "当前文件还没有被命名，因为从来没有对它进行保存。")
-  (cannot-open-because-dne "无法打开~a，文件不存在。")
-  
-  (needs-execute-language-changed
-   "警告：语言改变了。请单击“运行”。")
-  (needs-execute-teachpack-changed
-   "警告：教学包改变了。请单击“运行”。")
-  (needs-execute-defns-edited
-   "警告：定义视窗改变了。请单击“运行”。")
-  
-  (editor-changed-since-srcloc-recorded
-   "编辑器在记录原始位置之后被改动过，故高亮区域不一定准确反映源码")
-  
-  (file-is-not-saved "文件\"~a\"还没有保存过")
-  (save "保存")
-  (close-anyway "强制关闭")
-  (dont-save "不保存")
-  (clear-anyway "强制清空")
-  
-  ;; menu item title
-  (log-definitions-and-interactions "记录定义和交互的日志…")
-  (stop-logging "不再记录日志")
-  (please-choose-a-log-directory "请选择日志目录")
-  (logging-to "记录日志到：")
-  (erase-log-directory-contents "删除日志目录~a中的内容？")
-  (error-erasing-log-directory "删除日志出错。\n\n~a\n")
-  
-  ;; menu items connected to the logger -- also in a button in the planet status line in the drs frame
-  (show-log "显示日志(&L)")
-  (hide-log "隐藏日志(&L)")
-  (logger-scroll-on-output "跟随输出") ; a checkbox in the logger pane
-  (log-messages "日志信息") ;; label for the drracket logging gui panel
-  
-  
-  ;; modes
-  (mode-submenu-label "模式")
-  (scheme-mode "Scheme模式")
-  (racket-mode "Racket模式")
-  (text-mode "文本模式")
-  
-  (scheme-mode-color-symbol "符号")
-  (scheme-mode-color-keyword "关键词")
-  (scheme-mode-color-comment "注释")
-  (scheme-mode-color-string "字符串")
-  (scheme-mode-color-constant "常量")
-  (scheme-mode-color-parenthesis "括号")
-  (scheme-mode-color-hash-colon-keyword "#:关键词")
-  (scheme-mode-color-error "错误")
-  (scheme-mode-color-other "其他")
-  ;; the ~a is filled in with one of the above (scheme-mode-*)
-  (syntax-coloring-choose-color "为~a选择颜色")
-  (preferences-colors "颜色") ;; used in the preferences dialog
-  
-  ;; parenthesis color scheme string constants
-  (parenthesis-color-scheme "括号色彩调配") ;; label for the choice% menu in the preferences dialog
-  (paren-color-basic-grey "单一灰色")
-  (paren-color-shades-of-gray "渐变灰色")
-  (paren-color-shades-of-blue "渐变蓝色")
-  (paren-color-spring "春")
-  (paren-color-fall "秋")
-  (paren-color-winter "冬")
-  
-  
-  (url: "URL：")
-  (open-url... "打开URL…")
-  (open-url "打开URL")
-  (browse... "浏览…")
-  (bad-url "错误的URL")
-  (bad-url:this "错误的URL：~a")
-  
-  ;; Help Desk
-  (help "帮助")
-  (racket-documentation "Racket文档")
-  (help-desk "帮助台")
-  (plt:hd:search "搜索")
-  (plt:hd:feeling-lucky "手气不错")
-  (plt:hd:home "帮助台首页") 
-  ; next 3 are popup menu choices in help desk search frame
-  (plt:hd:search-for-keyword "关键词")
-  (plt:hd:search-for-keyword-or-index "关键词或索引")
-  (plt:hd:search-for-keyword-or-index-or-text "关键词、索引或普通文本")
-  (plt:hd:exact-match "精确匹配")
-  (plt:hd:containing-match "包含")
-  (plt:hd:regexp-match "正则表达式匹配")
-  (plt:hd:find-docs-for "搜索文档：")
-  (plt:hd:search-stopped-too-many-matches "[搜索中断：过多匹配结果]")
-  (plt:hd:nothing-found-for "找不到任何关于~a的信息")
-  (plt:hd:and "并且")
-  (plt:hd:refresh "更新")
-  (plt:hd:refresh-all-manuals "更新所有手册")
-  (plt:hd:manual-installed-date "（~a已安装）")
-  ; Help Desk configuration
-  ;; refreshing manuals
-  (plt:hd:refreshing-manuals "重新下载手册")
-  (plt:hd:refresh-downloading... "下载~a…")
-  (plt:hd:refresh-deleting... "删除旧版本的~a…")
-  (plt:hd:refresh-installing... "安装新版本的~a…")
-  (plt:hd:refresh-clearing-indices "清除缓存中的索引")
-  (plt:hd:refreshing-manuals-finished "完成。")
-  (plt:hd:about-help-desk "关于帮助台")
-  (plt:hd:help-desk-about-string
-   "帮助台是Racket软件的完整信息来源。\n\n版本~a\n版权所有（c）~a—~a PLT")
-  (plt:hd:help-on-help "关于帮助的帮助")
-  (plt:hd:help-on-help-details
-   "关于使用帮助台的帮助，请参见帮助台首页中的第一个链接‘帮助台’。（要进入帮助台的首页，请单击帮助台视窗上方的‘首页’按钮。）")
-  (reload "刷新") ;; refresh the page in a web browser
-  (plt:hd:ask-about-separate-browser
-   "你选择了一个指向万维网的链接。请问您是要在帮助台中打开该页面，还是想使用浏览器程序浏览网页？")
-  (plt:hd:homebrew-browser "帮助台浏览器") ;; choice for the above string (in a button)
-  (plt:hd:separate-browser "网络浏览器") ;; other choice for the above string (also in a button)
-  (plt:hd:external-link-in-help "在帮助台中显示外部URL")
-  (plt:hd:use-homebrew-browser "对于外部URL，使用帮助台浏览")
-  (plt:hd:new-help-desk "新帮助台")
-  
-  ;; in the Help Desk language dialog, title on the right.
-  (plt:hd:manual-search-ordering "搜索手册的顺序")
-  
-  ;; in the help-desk standalone font preference dialog, on a check box
-  (use-drscheme-font-size "使用和DrRacket相同的字体大小")
-  
-  ;; in the preferences dialog in drscheme there is example text for help desk font size.
-  ;; clicking the links in that text produces a dialog with this message
-  (help-desk-this-is-just-example-text
-   "这里显示的只是示例字体大小的文字。要察看这些链接，请通过帮助菜单打开真正的帮助台。")
-  
-  ;; this appears in the bottom part of the frame the first time the user hits `f1' 
-  ;; (assuming nothing else has loaded the documentation index first)
-  ;; see also: cs-status-loading-docs-index
-  (help-desk-loading-documentation-index "帮助台：正在读入文档索引")
-  
-  ;; Help desk htty proxy
-  (http-proxy "HTTP代理")
-  (proxy-direct-connection "直接连接")
-  (proxy-use-proxy "使用代理服务器：")
-  (proxy-host "地址")
-  (proxy-port "端口")
-  (proxy-bad-host "无效代理服务器")
-  
-  ;; browser
-  (rewind-in-browser-history "后退")
-  (forward-in-browser-history "前进")
-  (home "主页")
-  (browser "浏览器")
-  (external-browser-choice-title "外部浏览器") ; title for radio-button set
-  (browser-command-line-label "命令行：") ; label for radio button that is followed by text boxes
-  (choose-browser "选择浏览器")
-  (no-browser "以后再询问")
-  (browser-cmdline-expl-line-1 "（命令行由前缀文字，URL和后缀文字") ; explanatory text for dialog, line 1
-  (browser-cmdline-expl-line-2 "连接而成，中间不含任何空格）") ; ... line 2. (Anyone need more lines?)
-  (install? "安装？")  ;; if a .plt file is found (title of dialog)
-  (you-have-selected-an-installable-package "你选择了一个可以安装的软件包。")
-  (do-you-want-to-install-it? "是否安装？")
-  (paren-file-size "（该文件的长度是~a字节）")
-  (download-and-install "下载并安装(&&)") ;; button label
-  (download "下载") ;; button label
-  (save-downloaded-file/size "下载文件(~a字节)并保存为") ;; label for get-file dialog
-  (save-downloaded-file "下载文件并保存为")  ;; label for get-file dialog
-  (downloading "下载中") ;; dialog title
-  (downloading-file... "下载文件中……")
-  (package-was-installed "安装已完成。")
-  (download-was-saved "文件已保存。")
-  
-  (install-plt-file-menu-item... "安装.plt文件…")
-  (install-plt-file-dialog-title "安装.plt文件")
-  (install-plt-web-tab "网络")
-  (install-plt-file-tab "文件")
-  (install-plt-filename "文件名：")
-  (install-plt-url "URL：")
-  (install-plt-error-header "检查下载的.plt文件时出错。请检查URL并重试。")
-  
-  ;; install plt file when opened in drscheme strings
-  (install-plt-file "安装~a，还是打开以供编辑？")
-  (install-plt-file/yes "安装")
-  (install-plt-file/no "编辑")
-  
-  (plt-installer-progress-window-title "安装进度") ;; frame title
-  (plt-installer-abort-installation "取消安装") ;; button label
-  (plt-installer-aborted "安装中止。") ;; msg that appears in the installation window when installation is aborted
-  
-  ;;; about box
-  (about-drscheme-frame-title "关于DrRacket")
-  
-  ;;; save file in particular format prompting.
-  (save-as-plain-text "保存本文件为纯文本？")
-  (save-in-drs-format "保存本文件为drscheme（非纯文本）格式？")
-  (yes "是")
-  (no "否")
-  
-  ;; saving image (right click on an image to see the text)
-  (save-image "保存图片…")
-  
-  ;;; preferences
-  (preferences "首选项")
-  (error-saving-preferences "保存首选项时出错：~a")
-  (error-saving-preferences-title "保存首选项时出错")
-  (steal-the-lock-and-retry "取消锁定并重试(&&)") ;; in the preferences error dialog; this happens when the lockfile exists (after 3 pref writes).
-  
-  (error-reading-preferences "读取首选项时出错")
-  (error-reading-preferences-explanation "首选项文件被锁定，故~a选项无法读取")
-  ;; in the above, ~a is filled with the name of the preference (a symbol)
-  (dont-ask-again-until-drracket-restarted "不再询问（直到DrRacket关闭）")
-  ; difference between the above and below is one comes with a question (steal the lock or not) and the other with just a notation saying "the file is locked"
-  (dont-notify-again-until-drracket-restarted "不再通知（直到DrRacket关闭）") 
-  (prefs-file-locked "存储首选项的文件被锁定了（由于文件~a的存在），所以这些改动无法被保存。放弃修改？")
-  (try-again "重试") ;; button label
-  (give-up-and-use-the-default "放弃并使用默认值") ;; button label
-  
-  (prefs-file-still-locked "存储首选项的文件仍然被锁定（由于文件~a的存在）, 所以这些改动将不会被保存。")
-  (prefs-file-locked-nothing-doing
-   "首选项文件友~s锁定，故修改不会被保存。")
-  ;; the  ~s is filled with the lockfile; this string is (currently) used only on windows where lockfiles are less friendly (and there is no steal fallback)
-  
-  (scheme-prefs-panel-label "Racket")
-  (warnings-prefs-panel-label "警告")
-  (editor-prefs-panel-label "编辑")
-  (general-prefs-panel-label "常规")
-  (highlight-parens "加亮显示匹配的括号")
-  (fixup-open-brackets "自动调整开中括号")
-  (fixup-close-parens "自动调整闭括号")
-  (flash-paren-match "高亮显示括号匹配")
-  (auto-save-files "自动保存文件")
-  (backup-files "保存备份文件")
-  (map-delete-to-backspace "将delete转换成backspace")
-  (verify-exit "退出时确认")
-  (ask-before-changing-format "改变保存方式时确认")
-  (wrap-words-in-editor-buffers "在编辑器中自动换行")
-  (show-status-line "显示状态栏")
-  (count-columns-from-one "从一开始计算行号")
-  (display-line-numbers "在编辑器中显示行号")
-  (show-line-and-column-numbers "显示行号和列号(&&)") ; used for popup menu; right click on line/column box in bottom of drs window
-  (show-character-offsets "显示字符在文件中的位置") ; used for popup menu; right click on line/column box in bottom of drs window
-  (enable-keybindings-in-menus "允许使用菜单中的快捷键")
-  (printing-mode "打印模式")
-  (print-using-platform-specific-mode "平台特定的打印")
-  (print-to-ps "打印至PostScript文件")
-  (print-to-pdf "打印至PDF文件")
-  (command-as-meta "将command键当作meta") ;; macos/macos x only
-  (reuse-existing-frames "在打开新文件时，使用现有的视窗")
-  (default-fonts "默认字体")
-  (paren-match-color "高亮显示括号所使用的颜色") ; in prefs dialog
-  (online-coloring-active "实时根据语法用颜色标记程序")
-  (open-files-in-tabs "在不同的标签下打开多个文件（不使用多个视窗）")
-  (show-interactions-on-execute "在运行程序时自动打开交互视窗")
-  (switch-to-module-language-automatically "打开module文件时自动切换至module语言")
-  (interactions-beside-definitions "将定义视窗和交互视窗左右放置") ;; in preferences, below the checkbox one line above this one
-  (show-line-numbers "显示行号")
-  (show-line-numbers/menu "显示行号(&N)")  ;; just like the above, but capitalized for appearance in a menu item
-  (hide-line-numbers/menu "隐藏行号(&N)")
-  (show-line-numbers-in-definitions "在定义视窗中显示全部行号")
-  ;; the constant above shows up in the popup menu item in the bottom of
-  ;; the drracket window; controls the line numbers on each line in the definitions; used in a checkable menu item
-  (limit-interactions-size "限制交互视窗的大小")
-  (background-color "背景颜色")
-  (default-text-color "默认颜色") ;; used for configuring colors, but doesn't need the word "color"
-  (choose-a-background-color "请选择背景颜色")
-  (revert-to-defaults "恢复默认")
-  (undo-changes "不做修改并退出") ;; used in the preferences dialog to undo preference changes
-  
-  (black-on-white-color-scheme "白底黑字") ;; these two appear in the color preferences dialog on butttons
-  (white-on-black-color-scheme "黑底白字") ;; clicking the buttons changes the color schemes to some defaults that've been set up.
-  
-  (add-spacing-between-lines "在行间额外填充一个像素")
-  
-  ; title of the color choosing dialog
-  
-  ; should have entire alphabet
-  (font-example-string "简体中文 by 朱崇恺")
-  
-  (change-font-button-label "更改")
-  (fonts "字体")
-  (other... "其他…") ;; used in the font choice menu item
-  
-  ; filled with type of font, eg modern, swiss, etc.
-  (choose-a-new-font "请选择新的“~a”字体")
-  
-  (font-size-slider-label "字号")
-  (restart-to-see-font-changes "重新启动，使修改生效")
-  
-  (font-prefs-panel-title "字体")
-  (font-name "字体名称")
-  (font-size "字体大小")
-  (set-font "设置字体…")
-  (font-smoothing-label  "字体平滑度")
-  (font-smoothing-none "无")
-  (font-smoothing-some "部分")
-  (font-smoothing-all "全部")
-  (font-smoothing-default "使用系统默认值")
-  (select-font-name "选择字体")
-  (example-text "示例文本：")
-  (only-warn-once "当定义视窗和交互视窗不同步时，仅警告一次")
-  
-  ; warning message when lockfile is around
-  (waiting-for-pref-lock "等待首选项设置文件解锁……")
-  (pref-lock-not-gone
-   "首选项设置文件被\n\n~a\n\n锁定。请确定没有其他Racket软件正在运行中，然后删除该锁定文件。")
-  (still-locked-exit-anyway? "首选项无法保存。仍然退出？")
-  
-  ;;; indenting preferences panel
-  (indenting-prefs-panel-label "缩进")
-  (indenting-prefs-extra-regexp "额外的正则表达式")
-  
-  (square-bracket-prefs-panel-label "中括号")
-  
-  ; filled with define, lambda, or begin
-  (enter-new-keyword "请输入一个类似于~a的关键词：")
-  (x-keyword "~a关键词")
-  (x-like-keywords "~a类型的关键词")
-  
-  ; used in Square bracket panel
-  (skip-subexpressions "出现在中括号前的表达式数量")
-  
-  (expected-a-symbol "需要symbol，实得：~a")
-  (already-used-keyword "“~a”已经是缩进关键词了")
-  (add-keyword "添加")
-  (remove-keyword "删除")
-  
-  ; repl color preferences
-  (repl-colors "REPL")
-  (repl-out-color "输出")
-  (repl-value-color "值")
-  (repl-error-color "错误")
-  
-  ;;; find/replace
-  (search-next "下一个")
-  (search-previous "上一个")
-  (search-match "匹配")  ;;; this one and the next one are singular/plural variants of each other
-  (search-matches "匹配")
-  (search-replace "替换")
-  (search-skip "跳过")
-  (search-show-replace "显示替换")
-  (search-hide-replace "隐藏替换")
-  (find-case-sensitive "大小写敏感")  ;; the check box in both the docked & undocked search
-  (find-anchor-based "用锚进行搜索")
-  
-  ;; these string constants used to be used by searching,
-  ;; but aren't anymore. They are still used by other tools, tho.
-  (hide "隐藏")
-  (dock "停靠")
-  (undock "取消停靠")
-  
-  ;;; multi-file-search
-  (mfs-multi-file-search-menu-item "在文件中查找(&F)…")
-  (mfs-string-match/graphics "字符串匹配（可用与包含图像的文件）")
-  (mfs-regexp-match/no-graphics "正则表达式匹配（只适用于纯文本文件）")
-  (mfs-searching... "查找…")
-  (mfs-configure-search "查找设置") ;; dialog title
-  (mfs-files-section "文件")   ;; section in config dialog
-  (mfs-search-section "查找") ;; section in config dialog
-  (mfs-dir "目录")
-  (mfs-recur-over-subdirectories "包含子目录")
-  (mfs-regexp-filename-filter "文件名筛选（正则表达式）")
-  (mfs-search-string "查找字符串")
-  (mfs-drscheme-multi-file-search "多文件查找——DrRacket") ;; results window and error message title
-  (mfs-not-a-dir "“~a”不是目录")
-  (mfs-open-file "打开文件")
-  (mfs-stop-search "停止查找")
-  (mfs-case-sensitive-label "大小写敏感")
-  (mfs-no-matches-found "没有找到匹配结果。")
-  (mfs-search-interrupted "查找中止。")
-  (mfs-drscheme-multi-file-search-title "多文件查找“~a”——DrRacket") ;; the ~a format specifier is filled in with the search string
-  
-  ;;; reverting a file
-  (are-you-sure-revert
-   "你确定要复原该文件吗？这一操作无法撤销。")
-  (are-you-sure-revert-title
-   "复原？")
-  
-  ;;; saving a file
-  ; ~a is filled with the filename
-  (error-saving "保存出错") ;; title of error message dialog
-  (error-saving-file/name "在保存文件~a时出现错误。")
-  (error-loading "读取出错")
-  (error-loading-file/name "在读取~a时出现错误.")
-  (unknown-filename "《未知》")
-  
-  ;;; finder dialog
-  (must-specify-a-filename "你必须指定文件名")
-  (file-does-not-exist "文件“~a”不存在。")
-  (ask-because-file-exists "文件“~a”已存在。是否替换？")
-  (dne-or-cycle "文件“~a”中包含不存在的目录或循环")
-  (get-file "获取文件")
-  (put-file "放置文件")
-  (full-pathname "完整路径")
-  (show-dot-files "由点号开始显示文件名和目录名。")
-  (up-directory-button-label "上层目录")
-  (add-button-label "添加") ;;; for multi-file selection
-  (add-all-button-label "全部添加") ;;; for multi-file selection
-  (remove-button-label "移除") ;;; for multi-file selection
-  (file-wrong-form "该文件名格式不正确")
-  (select-files "选择文件")
-  (select-file "选择文件")
-  (dir-dne "该目录不存在。")
-  (file-dne "该文件不存在。")
-  (empty-filename "文件名中必须包含文字。")
-  (that-is-dir-name "这是一个目录名。")
-  
-  ;;; raw menu names -- these must match the 
-  ;;; versions below, once the &s have been stripped.
-  ;;; if they don't, DrRacket's menus will appear
-  ;;; in the wrong order.
-  (file-menu "文件")
-  (edit-menu "编辑")
-  (help-menu "帮助")
-  (windows-menu "视窗")
-  (tabs-menu "标签") ;; this is the name of the "Windows" menu under linux & windows
-  
-  ;;; menus
-  ;;; - in menu labels, the & indicates a alt-key based shortcut.
-  ;;; - sometimes, things are stuck in the middle of 
-  ;;; menu item labels. For instance, in the case of
-  ;;; the "Save As" menu, you might see: "Save Definitions As". 
-  ;;; be careful of spacing, follow the English, if possible.
-  ;;; - the ellipses in the `after' strings indicates that
-  ;;; more information is required from the user before completing
-  ;;; the command.
-  
-  (file-menu-label "文件(&F)")
-  
-  (new-info  "打开新文件")
-  (new-menu-item "新建(&N)")
-  (new-...-menu-item "新建(&N)…")
-  
-  (open-info "打开现有文件")
-  (open-menu-item "打开(&O)…")
-  
-  (open-recent-info "最近使用过文件的列表")
-  (open-recent-menu-item "最近使用过(&T)")
-  
-  (revert-info "将当前文件恢复为磁盘上的副本")
-  (revert-menu-item "恢复(&R)")
-  
-  (save-info "保存当前文件")
-  (save-menu-item "保存(&S)")
-  
-  (save-as-info "输入新的文件名,保存当前文件")
-  (save-as-menu-item "另存为(&A)…")
-  
-  (print-info "打印当前文件")
-  (print-menu-item "打印(&P)…")
-  
-  (page-setup-info "设置打印参数")
-  (page-setup-menu-item "页面设置…")
-  
-  (close-info "关闭当前文件")
-  (close-menu-item "关闭(&C)")
-  (close-window-menu-item "关闭视窗(&C)")
-  
-  (quit-info "关闭所有视窗")
-  (quit-menu-item-windows "退出(&X)")
-  (quit-menu-item-others "退出(&Q)")
-  
-  (edit-menu-label "编辑(&E)")
-  
-  (undo-info "撤销最近的操作")
-  (undo-menu-item "撤销(&U)")
-  
-  (redo-info "取消最近的撤销操作")
-  (redo-menu-item "重复(&R)")
-  
-  (cut-info "将当前选中的对象移入剪贴版")
-  (cut-menu-item "剪切(&T)")
-  
-  (copy-info "将当前选中的对象复制到剪贴版")
-  (copy-menu-item "复制(&C)")
-  
-  (paste-info "将剪贴版中个内容复制到当前位置")
-  (paste-menu-item "粘贴(&P)")
-  
-  (clear-info "删除当前选中的对象")
-  (clear-menu-item-windows "删除(&D)")
-  
-  (select-all-info "选中整个文件")
-  (select-all-menu-item "全选(&L)")
-  
-  (find-menu-item "查找") ;; menu item
-  (find-from-selection-menu-item "查找当前选中")
-  (find-info "在主视窗和查找栏之间切换光标位置")
-  
-  (find-again-info "跳至该文本的下一个出现")
-  (find-again-menu-item "查找下一个")
-  
-  (find-again-backwards-info "跳至该文本的前一个出现")
-  (find-again-backwards-menu-item "查找上一个")
-  
-  (show-replace-menu-item "显示替换")
-  (hide-replace-menu-item "隐藏替换")
-  (show/hide-replace-info "切换替换面板的可见性")
-  
-  (replace-menu-item "替换")
-  (replace-info "替换当前圈出的查找结果")
-  
-  (replace-all-info "替换查找字符串的所有出现")
-  (replace-all-menu-item "全部替换")
-  
-  (find-case-sensitive-info "切换大小写敏感或不敏感查找")
-  (find-case-sensitive-menu-item "大小写敏感")
-  
-  (complete-word "自动完成") ; the complete word menu item in the edit menu
-  (no-completions "……无自动完成结果") ; shows up in the completions menu when there are no completions (in italics)
-  
-  (overwrite-mode "覆盖模式")
-  (enable-overwrite-mode-keybindings "启用覆盖模式的快捷键")
-  
-  (enable-automatic-parens "自动关括号") ; should "and square brackets and quotes" appear here?
-  
-  (preferences-info "设置首选项")
-  (preferences-menu-item "首选项…")
-  
-  (keybindings-info "显示当前快捷键")
-  (keybindings-menu-item "快捷键")
-  (keybindings-show-active "显示当前的快捷键")
-  (keybindings-frame-title "快捷键")
-  (keybindings-sort-by-name "按名称排序")
-  (keybindings-sort-by-key "按键名排序")
-  (keybindings-add-user-defined-keybindings "添加自定义快捷键…")
-  (keybindings-add-user-defined-keybindings/planet "从PLaneT添加自定义快捷键…")
-  (keybindings-menu-remove "移除~a")
-  (keybindings-choose-user-defined-file "请选择一个包含快捷键的文件")
-  (keybindings-planet-malformed-spec "错误的PLaneT名称：~a") ; the string will be what the user typed in
-  (keybindings-type-planet-spec "请输入PLaneT包名称（无需输入‘require’）")
-  
-  ; first ~a will be a string naming the file or planet package where the keybindings come from;
-  ; second ~a will be an error message
-  (keybindings-error-installing-file "安装快捷键~a时出错：\n\n~a")
-  
-  (user-defined-keybinding-error "快捷键~a出错\n\n~a")
-  (user-defined-keybinding-malformed-file "文件~a并不是一个使用framework/keybinding-lang语言编写的module.")
-  (user-defined-keybinding-malformed-file/found-lang
-   "文件~a并不是一个使用framework/keybinding-lang语言编写的module，而是由~s语言编写")
-  
-  ;; menu items in the "special" menu
-  (insert-text-box-item "插入文本框")
-  (insert-image-item "插入图片…")
-  (insert-comment-box-menu-item-label "插入注释框")
-  (insert-lambda "插入λ")
-  
-  (wrap-text-item "自动换行")
-  
-  (windows-menu-label "视窗(&W)")
-  (tabs-menu-label "标签(&T)") ;; this is the name of the menu under linux & windows
-  (minimize "最小化") ;; minimize and zoom are only used under mac os x
-  (zoom "缩放")
-  (bring-frame-to-front "前端显示")       ;;; title of dialog
-  (bring-frame-to-front... "前端显示…") ;;; corresponding title of menu item
-  (most-recent-window "最近的视窗")
-  (next-tab "下一个标签")
-  (prev-tab "前一个标签")
-  ;; menu item in the windows menu under mac os x. first ~a is filled with a number between 1 and 9; second one is the filename of the tab
-  (tab-i "标签~a：~a")
-  (tab-i/no-name "标签~a")
-  
-  (view-menu-label "视图(&V)")
-  (show-overview "显示程序轮廓(&P)") 
-  (hide-overview "隐藏程序轮廓(&P)")
-  (show-module-browser "显示&Module浏览器")
-  (hide-module-browser "隐藏&Module浏览器")
-  
-  (help-menu-label "帮助(&H)")
-  (about-info "本软件的详细信息以及致谢名单")
-  (about-menu-item "关于…")
-  
-  ;; open here's new menu item
-  (create-new-window-or-clear-current
-   "您是想打开一个新视窗，还是清空当前视窗？")
-  (clear-current "清空当前")
-  (new-window "新视窗")
-  
-  ;; popup menu when right-clicking in the gap between
-  ;; the definitions and interactions window
-  (change-to-vertical-alignment "左右分割")
-  (change-to-horizontal-alignment "上下分割")
-  
-  ;;; exiting and quitting ``are you sure'' dialog
-  ;;; exit is used on windows, quit on macos, in English. Other
-  ;;; languages probably use the same word on both platforms.
-  (exit "退出")
-  (quit "退出")
-  (are-you-sure-exit "你确定要退出吗?")
-  (are-you-sure-quit "你确定要退出吗?")
-  ; these next two are only used in the quit/exit dialog
-  ; on the button whose semantics is "dismiss this dialog".
-  ; they are there to provide more flexibility for translations
-  ; in English, they are just cancel.
-  (dont-exit "取消") 
-  (dont-quit "取消")
-  
-  ;;; autosaving
-  (error-autosaving "自动保存\"~a\"时出错。") ;; ~a will be a filename
-  (autosaving-turned-off "在文件被存盘之前，自动保存不会进行")
-  (recover-autosave-files-frame-title "恢复自动保存的文件")
-  (autosave-details "详细情况")
-  (autosave-recover "恢复")
-  (autosave-unknown-filename "《未知》")
-  
-  ;; these are labels in a dialog that drscheme displays
-  ;; if you have leftover autosave files. to see the dialog,
-  ;; start up drscheme and modify (but don't save) a file
-  ;; (also, do this with an unsaved file). Wait for the autosave
-  ;; files to appear (typically 5 minutes). Kill DrRacket
-  ;; and restart it. You'll see the dialog
-  (autosave-autosave-label: "自动保存文件：")
-  (autosave-original-label: "原始文件：")
-  (autosave-autosave-label "自动保存文件")
-  (autosave-original-label "原始文件")
-  (autosave-compare-files "比较自动保存文件")
-  
-  (autosave-show-autosave "自动保存文件") ;; title of a window showing the autosave file
-  
-  (autosave-explanation "DrRacket发现了自动保存的文件，其中可能包含你没有保存过的程序")
-  
-  (autosave-recovered! "已恢复！") ;; status of an autosave file
-  (autosave-deleted "已删除")       ;; status of an autosave file
-  
-  (autosave-error-deleting "删除~a出错\n\n~a") ;; first is a filename, second is an error message from mz.
-  (autosave-delete-button "删除")
-  (autosave-delete-title "删除")  ;; title of a dialog asking for deletion confirmation
-  (autosave-done "完成")
-  
-  ;; appears in the file dialog
-  (autosave-restore-to-where? "请选择自动保存文件的位置")
-  
-  
-  ;;; file modified warning
-  (file-has-been-modified
-   "文件在上次保存之后又改动过。覆盖这些更改？")
-  (overwrite-file-button-label "覆盖")
-  
-  (definitions-modified 
-    "当前磁盘文件已被修改；请保存或恢复文件。")
-  (drscheme-internal-error "DrRacket内部错误")
-  
-  ;;; tools
-  (invalid-tool-spec "Collection ~a中info.rkt的tool定义不正确。需要一个字符串或者一个非空表，实得：~e")
-  (error-invoking-tool-title "调用tool ~s出错；~s")
-  (error-loading-tool-title "载入tool ~s出错\n~a") ;; ~s filled with a path, ~a filled with an error message from an exn
-  
-  (tool-tool-names-same-length
-   "在~s的info.rkt文件中，‘tool-names’和‘tools’应该是等长的表，实得~e和~e")
-  (tool-tool-icons-same-length
-   "在~s的info.rkt文件中，‘tool-icons’和“tools’应该是等长的表，实得~e和~e")
-  (tool-tool-urls-same-length
-   "在~s的info.rkt文件中，‘tool-urls’和“tools’应该是等长的表，实得~e和~e")
-  (error-getting-info-tool
-   "载入~s的info.rkt出错")
-  (tool-error-phase1 "tool ~s第一阶段出错；~s")
-  (tool-error-phase2 "tool ~s第二阶段出错；~s")
-  
-  
-  ;;; define popup menu
-  (end-of-buffer-define "<<缓冲区结束>>")
-  (sort-by-name "按名称排序")
-  (sort-by-position "按文件中的位置排序")
-  (no-definitions-found "<<没有定义>>")
-  (jump-to-defn "跳至~a的定义")
-  
-  (recent-items-sort-by-age "按时间排序")
-  (recent-items-sort-by-name "按名称排序")
-  
-  ;;; view menu
-  (hide-definitions-menu-item-label "隐藏定义(&D)")
-  (show-definitions-menu-item-label "显示定义(&D)")
-  (definitions-menu-item-help-string "显示/隐藏定义视窗")
-  (show-interactions-menu-item-label "显示交互(&I)")
-  (hide-interactions-menu-item-label "隐藏交互(&I)")
-  (use-horizontal-layout "左右分割")
-  (use-vertical-layout "上下分割")
-  (interactions-menu-item-help-string "显示/隐藏交互视窗")
-  (toolbar "工具栏")
-  (toolbar-on-top "顶置工具栏")
-  (toolbar-on-top-no-label "顶置工具栏并使用小图标")
-  (toolbar-on-left "左置工具栏")
-  (toolbar-on-right "右置工具栏")
-  (toolbar-hidden "隐藏工具栏")
-  
-  ;;; file menu
-  (save-definitions-as "将定义另存为(&A)")
-  (save-definitions "保存定义")
-  (print-definitions "打印定义…")
-  (about-drscheme "关于DrRacket")
-  (save-other "保存其他")
-  (save-definitions-as-text "将定义保存为文本…")
-  (save-interactions "保存交互")
-  (save-interactions-as "将交互另存为…")
-  (save-interactions-as-text "将交互保存为文本…")
-  (print-interactions "打印交互…")
-  (new-tab "新建标签")
-  (close-tab "关闭标签") ;; must not have any &s in it.
-  (close-tab-amp "关闭标签(&C)") ;; like close-tab, but with an ampersand on the same letter as the one in close-menu-item
-  
-  ;;; edit-menu
-  (split-menu-item-label "分屏(&S)")
-  (collapse-menu-item-label "合并(&O)")
-  (find-longest-line "寻找最长一行")
-  
-  ;;; language menu
-  (language-menu-name "语言(&L)")
-  
-  ;;; scheme-menu
-  (scheme-menu-name "Ra&cket")
-  (execute-menu-item-label "运行")
-  (execute-menu-item-help-string "重新运行定义视窗中的程序")
-  (ask-quit-menu-item-label "要求程序终止")
-  (ask-quit-menu-item-help-string "使用break-thread中止当前计算得主线程")
-  (force-quit-menu-item-label "强制终止")
-  (force-quit-menu-item-help-string "使用custodian-shutdown-all退出当前计算")
-  (limit-memory-menu-item-label "限制内存使用…")
-  (limit-memory-msg-1 "内存限制会在下一次运行时生效，")
-  (limit-memory-msg-2 "内存限制最低值为八兆字节。")   (limit-memory-unlimited "无限制")
-  (limit-memory-limited "限制")
-  (limit-memory-megabytes "兆字节(MB)")
-  ; the next two constants are used together in the limit memory dialog; they are inserted
-  ; one after another. The first one is shown in a bold font and the second is not.
-  ; (the first can be the empty string)
-  (limit-memory-warning-prefix "警告：")
-  (limit-memory-warning 
-   "不限制内存有潜在的危险。DrRacket将无法保护自己，当运行的程序分配过多内存时，DrRacket会崩溃.")
-  
-  (clear-error-highlight-menu-item-label "清除错误高亮显示")
-  (clear-error-highlight-item-help-string "清除错误区域的粉红色高亮显示")
-  (jump-to-next-error-highlight-menu-item-label "跳至下一个高亮错误")
-  (jump-to-prev-error-highlight-menu-item-label "跳至前一个高亮错误")
-  (reindent-menu-item-label "调整缩进(&R)")
-  (reindent-all-menu-item-label "全文调整缩进(&A)")
-  (semicolon-comment-out-menu-item-label "用分号注释(&C)")
-  (box-comment-out-menu-item-label "用注释框注释(&C)")
-  (uncomment-menu-item-label "取消注释(&U)")
-  
-  (convert-to-semicolon-comment "转化为分号注释")
-  
-  ;;; executables
-  (create-executable-menu-item-label "创建可执行程序(&E)…")
-  (create-executable-title "创建可执行程序")
-  (drracket-creates-executables-only-in-some-languages
-   "在DrRacket中创建可执行程序仅支持下列语言选择：在DrRacket语言对话框中选择教学语言（DMdA或者HtDP）；在DrRacket语言对话框中选择“Racket语言”，并且用#lang在文件开始处指定语言。\n\n请考虑使用命令行工具raco exe。")
-  (must-save-before-executable "在创建可执行程序之前，你必须保存源程序")
-  (save-a-mred-launcher "保存为GRacket启动程序")
-  (save-a-mzscheme-launcher "保存为Racket启动程序")
-  (save-a-mred-stand-alone-executable "保存为GRacket独立可执行程序")
-  (save-a-mzscheme-stand-alone-executable "保存为Racket独立可执行程序")
-  (save-a-mred-distribution "保存为GRacket可发布程序")
-  (save-a-mzscheme-distribution "保存为Racket可发布程序")
-  (error-creating-executable "创建可执行程序出错：") ;; this is suffixed with an error message ala error-display-handler
-  
-  (definitions-not-saved "当前定义视窗中的程序并没有被保存过。将使用最近保存过的版本来生成可执行程序。是否继续？")
-  ;; The "-explanatory-label" variants are the labels used for the radio buttons in
-  ;;  the "Create Executable..." dialog for the "(module ...)" language.
-  (launcher "启动程序")
-  (launcher-explanatory-label "启动程序（仅在本机运行，运行源代码）")
-  (stand-alone "独立程序")
-  (stand-alone-explanatory-label "独立程序（仅在本机运行，运行编译代码）")
-  (distribution "可发布程序")
-  (distribution-explanatory-label "可发布程序（可以在其它计算机上安装并运行）")
-  (executable-type "类型")
-  (executable-base "基于")
-  (filename "文件名：")
-  (create "创建")
-  (please-specify-a-filename "请指定文件名。")
-  (~a-must-end-with-~a
-   "~a文件名\n\n  ~a\n\n不合法。文件名必须以\".~a\"结尾。")
-  (macosx-executables-must-end-with-app
-   "~a文件名\n\n  ~a\n\n不合法。在MacOS X中，文件名必须以.app结尾。")
-  (warning-directory-will-be-replaced
-   "警告：目录：\n\n  ~a\n\n将会被重置。继续操作？")
-  
-  (distribution-progress-window-title "创建进程")
-  (creating-executable-progress-status "创建可执行程序……")
-  (assembling-distribution-files-progress-status "汇编……")
-  (packing-distribution-progress-status "打包……")
-  
-  (create-servlet "创建Servlet……")
-  
-  ; the ~a is a language such as "module" or "algol60"
-  (create-servlet-unsupported-language
-   "无法为~a语言程序创建Servlet。")
-  
-  ;;; buttons
-  (execute-button-label "运行") 
-  (save-button-label "保存")
-  (break-button-label "停止")
-  
-  ;;; search help desk popup menu
-  (search-help-desk-for "在帮助台中搜索“~a”")
-  (exact-lucky-search-help-desk-for "在帮助台中搜索最符合“~a”的一个页面")
-  
-  ;; collapse and expand popup menu items
-  (collapse-sexp "折叠S表达式")
-  (expand-sexp "扩展S表达式")
-  
-  ;;; fraction dialog
-  (enter-fraction "输入分数")
-  (whole-part "整数部分")
-  (numerator "分子")
-  (denominator "分母")
-  (insert-number/bad-whole-part "整数部分必须输入一个整数")
-  (insert-number/bad-numerator "分子必须是非负整数")
-  (insert-number/bad-denominator "分母必须是正整数")
-  (insert-fraction-menu-item-label "插入分数…")
-  
-  ;; number snip popup menu
-  (show-decimal-expansion "用十进制表示")
-  (show-mixed-fraction-view "用带分数表示")
-  (show-improper-fraction-view "用假分数表示")
-  (show-more-decimal-places "显示更多小数位")
-  
-  ;;; Teachpack messages
-  (select-a-teachpack "选择教学包")
-  (clear-teachpack "卸载教学包~a")
-  (teachpack-error-label "DrRacket——教学包出错")
-  (teachpack-didnt-load "无法装载教学包~a。")
-  (add-teachpack-menu-item-label "加载教学包……")
-  (clear-all-teachpacks-menu-item-label "卸载全部教学包")
-  (drscheme-teachpack-message-title "DrRacket教学包")
-  (already-added-teachpack "教学包~a已装载")
-  
-  ; ~a is filled with the teachpack's name; the message appears in the teachpack selection dialog when a user installs a new teachpack
-  (compiling-teachpack "编译教学包~a……")
-  (teachpack-pre-installed "自带的教学包")
-  (teachpack-pre-installed/htdp "自带的HtDP教学包")
-  (teachpack-pre-installed/2htdp "自带的HtDP/2e教学包")
-  (teachpack-user-installed "用户安装的教学包")
-  (add-teachpack-to-list... "添加教学包…")
-  (teachpack-already-installed "已经存在一个名为'~a'的教学包。是否覆盖？")
-  ; ~a is filled with a list of language names. Each name is separated by a newline and is indented two spaces (no commas, no 'and')
-  (teachpacks-only-in-languages "教学包菜单仅在下列语言中有效：~a\n\n在其他语言中，使用“require”。")
-  
-  ;;; Language dialog
-  (introduction-to-language-dialog
-   "请选择语言。大部分入门级的学生都可以使用默认语言。")
-  (language-dialog-title "语言选择")
-  (case-sensitive-label "大小写敏感")
-  (output-style-label "输出格式")
-  (constructor-printing-style "构造器")
-  (quasiquote-printing-style "Quasiquote")
-  (write-printing-style "write")
-  (print-printing-style "print")
-  (sharing-printing-label "显示内存共享")
-  (use-pretty-printer-label "print多个对象时自动换行")
-  (input-syntax "输入语法")
-  (dynamic-properties "动态属性")
-  (output-syntax "输出语法")
-  (teachpacks "教学包") ;; label in the language dialog for the teaching languages
-  (teachpacks-none "《无》") ;; shows up under the previous string, when there are no teachpacks
-  (no-debugging-or-profiling "不调试，也不性能分析")
-  (debugging "调试")
-  (debugging-and-profiling "调试，并性能分析")
-  (test-coverage "语法测试套件覆盖")
-  (show-details-button-label "显示详情")
-  (hide-details-button-label "隐藏详情")
-  (choose-language-menu-item-label "选择语言…")
-  (revert-to-language-defaults "恢复默认语言设置")
-  (fraction-style "分数格式")
-  (use-mixed-fractions "带分数")
-  (use-repeating-decimals "循环小数")
-  (decimal-notation-for-rationals "使用十进制表示有理数")
-  (enforce-primitives-group-box-label "初始绑定")
-  (enforce-primitives-check-box-label "不允许改变初始绑定")
-  (automatically-compile "填充“compiled”目录（加载更快）")
-  (preserve-stacktrace-information "保留堆栈跟踪信息（禁用某些优化）")
-  (expression-level-stacktrace "表达式级堆栈跟踪")
-  (function-level-stacktrace "函数级堆栈跟踪")
-  (submodules-to-run "运行子module")
-  (add-submodule "添加子module选项…") ;; menu item
-  (add-submodule-title "添加子module") ;; title of dialog opened by above menu item
-  
-  ; used in the bottom left of the drscheme frame as the label
-  ; above the programming language's name
-  ; used the popup menu from the just above; greyed out and only
-  ; visible when some languages are in the history
-  (recent-languages "最近使用的语言：")
-  ; shows up in bottom-left programming language menu popup, when no langs are recorded
-  (no-recently-chosen-languages "没有最近使用过的语言")
-  
-  ;; startup wizard screen language selection section
-  (please-select-a-language "请选择语言")
-  
-  
-  ;;; languages
-  (beginning-student "初级")
-  (beginning-one-line-summary "define、cond、结构体、常量和基本操作")
-  (beginning-student/abbrev "初级+缩写的表")
-  (beginning/abbrev-one-line-summary "在初级的基础上，用缩写形式输出表")
-  (intermediate-student "中级")
-  (intermediate-one-line-summary "在初级的基础上增加了词法作用域")
-  (intermediate-student/lambda "中级+lambda")
-  (intermediate/lambda-one-line-summary "在中级的基础上，增加了高阶函数")
-  (advanced-student "高级")
-  (advanced-one-line-summary "在中级的基础上，增加了lambda和赋值")
-  (how-to-design-programs "程序设计方法/How to Design Programs") ;; should agree with MIT Press on this one...
-  (pretty-big-scheme "大")
-  (pretty-big-scheme-one-line-summary "MzScheme/MrEd加HtDP(程序设计方法)语言")
-  (r5rs-lang-name "R5RS")
-  (r5rs-one-line-summary "Scheme语言标准第5修改稿")
-  (expander "Expander")
-  (expander-one-line-summary "展开表达式，而不是求值")
-  (legacy-languages "过去的语言")
-  (teaching-languages "教学语言")
-  (experimental-languages "实验语言")
-  (initial-language-category "初始语言")
-  (no-language-chosen "还没有选择语言")
-  (other-languages "其他语言")
-  
-  (module-language-name "由源代码来确定语言")
-  (module-language-one-line-summary "由#lang行来确定实际使用的语言")
-  (module-language-auto-text "自动加入#lang行") ;; shows up in the details section of the module language
-  
-  ;; for the upper portion of the language dialog
-  (the-racket-language "Racket语言")
-  (choose-a-language "选择语言")
-  
-  ;; the next two string constants appear in the
-  ;; language dialog with a list
-  ;; of example languages appearing between them
-  (racket-language-discussion "你的程序将从#lang开始，从而指定想用的方言。例如：\n")
-  (racket-language-discussion-end "\n……诸如此类")
-  
-  ;; the next three string constants are put into a message-box dialog
-  ;; that appears when the user clicks on the example #lang languages
-  ;; in the language dialog. The first one always appears and then either
-  ;; the second or the third appears. The second one has the clicked
-  ;; on #lang line placed into the ~a, and third one has the 
-  ;; current #lang line in the first ~a and the clicked on in the second one.
-  ;; The two comments are separated by a blank line.
-  (racket-dialect-in-buffer-message 
-   "Racket的方言一般而言由源代码指定，而不是语言对话框这里的选项指定。")
-  (racket-dialect-add-new-#lang-line "这就是说，需要在定义视窗开头添加“~a”吗？")
-  (racket-dialect-replace-#lang-line "这就是说，在你的文件里现在有“~a”；需要将其替换成“~a”吗？")
-  (racket-dialect-already-same-#lang-line "不过你的文件中已经包含“~a”；你可以开始编写程序了！")
-  
-  ;; in the dialog containing the above strings, one of these is a button that appears
-  (add-#lang-line "添加#lang行")
-  (replace-#lang-line "替换#lang行")
-  
-  ;; for the 'new drracket user' dialog
-  (use-language-in-source "使用代码中指定的语言")
-  
-  ;;; from the `not a language language' used initially in drscheme.
-  (must-choose-language "在继续操作之前，你必须为DrRacket选择一种编程语言。")
-  
-  ; next two appear before and after the name of a text book (which will be in italics)
-  (using-a-textbook-before "使用")
-  (using-a-textbook-after "？")
-  
-  ; next two are before and after a language
-  (start-with-before "由")
-  (start-with-after "开始？")
-  
-  (seasoned-plt-schemer? "PLT Scheme高手?")
-  (racketeer? "你是Racketeer吗？")
-  (looking-for-standard-scheme? "想要标准的Scheme?")
-  
-  ; the three string constants are concatenated together and the middle
-  ; one is hyperlinked to the dialog that suggests various languages
-  (get-guidance-before "请使用“语言”菜单中的“选择语言”对话框，或者")
-  (get-guidance-during "由DrRacket帮助你选择")
-  (get-guidance-after "。")
-  
-  ;;; debug language
-  (unknown-debug-frame "[未知]")
-  (backtrace-window-title "向后跟踪—DrRacket")
-  (files-interactions "~a的交互") ;; filled with a filename
-  (current-interactions "交互")
-  (current-definitions "定义")
-  (mzscheme-w/debug "文本（MzScheme，包含R5RS）")
-  (mzscheme-one-line-summary "PLT的Scheme实现")
-  (mred-w/debug "图形（MrEd，包含MzScheme）")
-  (mred-one-line-summary "在MzScheme的基础上增加GUI支持")
-  
-  ;; profiling
-  (profiling-low-color "低")
-  (profiling-high-color "高")
-  (profiling-choose-low-color "请选择代表低的颜色")
-  (profiling-choose-high-color "请选择代表高的颜色")
-  (profiling "性能分析")
-  (profiling-example-text "(define (马) (马))")
-  (profiling-color-config "性能分析色谱")
-  (profiling-scale "性能分析的色彩比例")
-  (profiling-sqrt "平方根")
-  (profiling-linear "线性")
-  (profiling-square "平方")
-  (profiling-number "调用次数")
-  (profiling-time "累积时间")
-  (profiling-update "更新性能分析")
-  (profiling-col-percent-time "%次")
-  (profiling-col-function "函数")
-  (profiling-col-time-in-msec "毫秒")
-  (profiling-col-calls "调用")
-  (profiling-show-profile "显示性能分析")
-  (profiling-hide-profile "隐藏性能分析")
-  (profiling-unknown-src "《未知》")
-  (profiling-no-information-available "没有可用的性能分析信息。请确定在语言设置中启用了性能分析，并且运行了当前程序。")
-  (profiling-clear? "改变定义视窗的内容将导致性能分析信息失效。是否继续？")
-  
-  ;; test coverage
-  (test-coverage-clear? "改变定义视窗将导致测试覆盖信息失效。是否继续？")
-  (test-coverage-clear-and-do-not-ask-again "是，并且不再询问")
-  (test-coverage-ask? "询问清除测试覆盖")
-  
-  (test-coverage-on "覆盖的测试")
-  (test-coverage-off "未覆盖的测试")
-  
-  ;; tracing
-  (tracing-enable-tracing "启用跟踪")
-  (tracing-show-tracing-window "显示跟踪")
-  (tracing-hide-tracing-window "隐藏跟踪")
-  (tracing-tracing-nothing-to-show "暂时没有可用的跟踪结果。(请检查你所使用的语言是否支持跟踪以及是否启用了跟踪。)")
-  
-  ;;; repl stuff
-  (evaluation-terminated "计算已终止")
-  (evaluation-terminated-explanation
-   "计算线程已停止，在下一次执行之前不会进行计算。")
-  
-  ; The next three constants show up in the same dialog as the above evaluation-terminated string
-  ; constants.
-  ; The first two show up only when the user calls 'exit' (possibly with a status code).
-  ; The third shows up when the program runs out of memory.
-  (exited-successfully "成功退出。")
-  (exited-with-error-code "退出，错误代码~a。") ;; ~a is filled in with a number between 1 and 255
-  (program-ran-out-of-memory "内存耗尽。")
-  
-  (show-evaluation-terminated-dialog "显示‘计算终止’对话框")
-  (evaluation-terminated-ask "下次再显示该对话框")
-  
-  (last-stack-frame "显示最新的栈帧")
-  (last-stack-frames "显示前~a个栈帧")
-  (next-stack-frames "显示后~a个栈帧")
-  
-  ;;; welcoming message in repl
-  (language "语言")
-  (custom "自定义")
-  (teachpack "教学包")
-  (welcome-to "欢迎使用")
-  (version "版本")
-  
-  ;;; kill evaluation dialog
-  (kill-evaluation? "是否要终止计算？")
-  (just-break "中断")
-  (kill "终止")
-  (kill? "终止？")
-  
-  ;;; version checker
-  (version:update-menu-item   "检查更新…")
-  (version:update-check       "检查更新") ; dialog title, with the next line
-  (version:connecting-server  "连接Racket版本服务器")
-  (version:results-title      "Racket版本检查")
-  (version:do-periodic-checks "定期检查Racket版本更新")
-  (version:take-me-there      "下载") ; ...to the download website
-  ;; the next one can appear alone, or followed by a comma and the one after that
-  (version:plt-up-to-date     "您现在使用的已经是最新版本的Racket")
-  (version:but-newer-alpha    "但是还有一个更新的alpha版本")
-  ;; This is used in this context: "Racket vNNN <<<*>>> http://download..."
-  (version:now-available-at   "可以从这里获取：")
-  
-  ;; insert menu
-  (insert-menu "插入(&I)")
-  
-  ;; large semi colon letters
-  (insert-large-letters... "插入大字…")
-  (large-semicolon-letters "带分号的大字")
-  (text-to-insert "要插入的文字")
-  
-  (module-browser-filename-format "文件全名：~a（共~a行）")
-  (module-browser-root-filename "根文件名：~a")
-  (module-browser-font-size-gauge-label "字体大小")
-  (module-browser-progress-label "Module概览进程")
-  (module-browser-adding-file "添加文件：~a…")
-  (module-browser-laying-out-graph-label "正在布局")
-  (module-browser-open-file-format "打开~a")
-  (module-browser "Module浏览器") ;; frame title
-  (module-browser... "&Module浏览器…") ;; menu item title
-  (module-browser-in-file "M&odule浏览~a") ;; menu item title; ~a is filled with a filename
-  (module-browser-no-file "Module浏览存盘文件") ;; menu item title for above menu item; used when there is no saved file
-  (module-browser-error-expanding "展开程序时出错：\n\n~a")
-  (module-browser-show-lib-paths "显示通过(lib ..)加载的文件的路径")
-  (module-browser-progress "Module浏览器：~a") ;; prefix in the status line
-  (module-browser-compiling-defns "Module浏览器：正在编译定义")
-  (module-browser-show-lib-paths/short "跟随lib调用") ;; check box label in show module browser pane in drscheme window.
-  (module-browser-show-planet-paths/short "跟随planet调用") ;; check box label in show module browser pane in drscheme window.
-  (module-browser-refresh "刷新") ;; button label in show module browser pane in drscheme window.
-  (module-browser-highlight "高亮显示") ;; used to search in the graph; the label on a text-field% object
-  (module-browser-only-in-plt-and-module-langs
-   "Module浏览器只能对基于module的程序中使用。")
-  (module-browser-name-length "名称长度")
-  (module-browser-name-short "短")
-  (module-browser-name-medium "中")
-  (module-browser-name-long "长")
-  (module-browser-name-very-long "长，包含阶段")  ;; like 'Long' but shows the phases where this file is loaded
-  (module-browser-open-all "打开所有这些文件")
-  
-  (happy-birthday-matthias "生日快乐，Matthias！")
-  (happy-birthday-matthew "生日快乐，马晓！")
-  (happy-birthday-shriram "生日快乐，Shriram！")
-  
-  (mrflow-using-default-language-title "正在使用默认语言")
-  (mrflow-using-default-language "当前使用的语言并不包含其原素的类型。改用R5RS Scheme。")
-  (mrflow-button-title "分析")
-  ;(mrflow-unknown-style-delta-error-title "Unknown Box Style Delta")
-  ;(mrflow-unknown-style-delta-error "Unknown box style delta: ~a")
-  (mrflow-popup-menu-show-type "显示类型")
-  (mrflow-popup-menu-hide-type "隐藏类型")
-  (mrflow-popup-menu-show-errors "显示错误")
-  (mrflow-popup-menu-hide-errors "隐藏错误")
-  ;(mrflow-read-exception-title "Read Exception")
-  ;(mrflow-read-exception "Read exception: ~a")
-  ;(mrflow-syntax-exception-title "Syntax Exception")
-  ;(mrflow-syntax-exception "Syntax exception: ~a")
-  ;(mrflow-unknown-exception-title "Unknown Exception")
-  ;(mrflow-unknown-exception "Unknown exception: ~a")
-  ;(mrflow-language-primitives-error-title "Language Primitives Error")
-  ;(mrflow-language-primitives-error "Wrong filename for language primitives types table: ~a")
-  
-  (snips-and-arrows-popup-menu-tack-all-arrows "固定所有箭头")
-  (snips-and-arrows-popup-menu-untack-all-arrows "取消固定所有箭头")
-  (snips-and-arrows-user-action-disallowed-title "当前不允许用户改变")
-  (snips-and-arrows-user-action-disallowed
-   "在编辑器中包含由系统插入的段落，所以不允许用户改变。在修改之前请先隐藏所有这些段落。")
-  ;(snips-and-arrows-changing-terms-warning-title "Changing terms will be undoable")
-  (snips-and-arrows-hide-all-snips-in-editor "在编辑器中隐藏所有段落")
-  
-  (xml-tool-insert-xml-box "插入XML框")
-  (xml-tool-insert-scheme-box "插入Racket框")
-  (xml-tool-insert-scheme-splice-box "插入Racket接合框")
-  (xml-tool-xml-box "XML框")
-  (xml-tool-scheme-box "Racket框")
-  (xml-tool-scheme-splice-box "Racket接合框")
-  (xml-tool-switch-to-scheme "转化为Racket框")
-  (xml-tool-switch-to-scheme-splice "转化为Racket接合框")
-  (xml-tool-eliminate-whitespace-in-empty-tags
-   "消除空白标签中的空白")
-  (xml-tool-leave-whitespace-alone
-   "保留空白")
-  
-  (show-recent-items-window-menu-item "在单独视窗中显示最近使用过的文件")
-  (show-recent-items-window-label "最近使用过的文件")
-  (number-of-open-recent-items "最近使用的数量")
-  (switch-anyway "强制切换文件")
-  
-  (stepper-program-has-changed "注意：程序已改变。")
-  (stepper-program-window-closed "注意：程序视窗已关闭。")
-  
-  (stepper-name "单步执行器")
-  (stepper-language-level-message "单步执行不支持语言“~a”。")
-  (stepper-button-label "单步执行")
-  
-  (stepper-previous "上一步")
-  (stepper-next "下一步")
-  (stepper-jump "跳至…")
-  (stepper-jump-to-beginning "最前")
-  (stepper-jump-to-end "最后")
-  (stepper-jump-to-selected "当前选中的开始")
-  (stepper-jump-to-previous-application "前一个调用步骤")
-  (stepper-jump-to-next-application "下一个调用步骤")
-  (stepper-out-of-steps "已到达计算终结，未找到目标步骤。")
-  (stepper-no-such-step/title "未找到步骤")
-  (stepper-no-such-step "找不到符合该标准的步骤。")
-  (stepper-no-such-step/earlier "前向找不到符合该标准的步骤。")
-  
-  (stepper-no-earlier-application-step "前向无调用步骤。")
-  (stepper-no-later-application-step "无调用步骤。")
-  
-  (stepper-no-earlier-step "前向无步骤。")
-  (stepper-no-later-step "无步骤。")
-  
-  (stepper-no-selected-step "选中区域中没有步骤。可能这些是注释？")
-  
-  (stepper-no-last-step "最后步骤暂未生成。")
-  
-  
-  (debug-tool-button-name "调试")
-  
-  (dialog-back "后退")
-  
-  ;; warnings about closing a drscheme frame when the program
-  ;; might still be doing something interesting
-  (program-is-still-running "定义视窗中的程序还在运行中。强制退出？")
-  (program-has-open-windows "定义视窗中的程序打开了其他视窗。强行关闭这些视窗？")
-  
-  ;; ml-command-line-arguments is for the command line arguments
-  ;; label in the module language details in the language dialog.
-  (ml-command-line-arguments "命令行参数是字符串的数组，以红色显示")
-  
-  ;; ml-cp names are all for the module language collection path
-  ;; configuration. See the details portion of the language dialog
-  ;; for the module language (at the bottom).
-  (ml-cp-default-collection-path "<<默认collection路径>>")
-  
-  ;; in std get-directory 
-  (ml-cp-choose-a-collection-path "请选择collection路径")
-  
-  ;; err msg when adding default twice
-  (ml-cp-default-already-present
-   "默认collection路径已存在")
-  
-  ;; title of this section of the dialog (possibly the word
-  ;; `Collection' should not be translated)
-  (ml-cp-collection-paths "Collection路径")
-  
-  ;; button labels
-  (ml-cp-add "添加")
-  (ml-cp-add-default "加为默认")
-  (ml-cp-remove "清除")
-  (ml-cp-raise "上移")
-  (ml-cp-lower "下移")
-  
-  (ml-always-show-#lang-line "在Module语言中，始终显示#langhang")
-  
-  ;; Strings for Profj removed as ProfessorJ is no longer actively developed as part of DrScheme
-  
-  
-  ;;The Test engine tool
-  ;;
-  (test-engine-window-title "测试结果")
-  ;;Following two appear in View menu, attach and free test report window from DrRacket frame
-  (test-engine-dock-report "停靠测试报告")
-  (test-engine-undock-report "取消停靠测试报告")
-  ;;Following two appear in Racket (Java, etc) menu, cause Tests to be Run automatically or not
-  (test-engine-enable-tests "启用测试")
-  (test-engine-disable-tests "停用测试")
-  
-  (test-engine-ran-1-test "运行了1个test。")
-  (test-engine-ran-1-check "运行了1个check。")
-  ;; ditto, only plural
-  (test-engine-ran-n-tests "运行了~a个test。")
-  (test-engine-ran-n-checks "运行了~a个check。")
-  (test-engine-1-test-passed "Test通过！")
-  (test-engine-1-check-passed "Check通过！")
-  (test-engine-both-tests-passed "全部test通过！")
-  (test-engine-both-checks-passed "全部check通过！")
-  (test-engine-all-tests-passed "全部test通过！")
-  (test-engine-all-checks-passed "全部check通过！")
-  (test-engine-all-n-tests-passed "所有~a个test通过！")
-  (test-engine-all-n-checks-passed "所有~a个check通过！")
-  (test-engine-0-tests-passed "0个test通过。")
-  (test-engine-0-checks-passed "0个check通过。")
-  (test-engine-m-of-n-tests-failed "~a个test失败（共~a个test）。")
-  (test-engine-m-of-n-checks-failed "~a个check失败（共~a个check）。")
-  (test-engine-must-be-tested "程序必须要测试！")
-  (test-engine-is-unchecked "程序还没有check！")
-  (test-engine-tests-disabled "测试未启用。")
-  (test-engine-should-be-tested "程序需要测试。")
-  (test-engine-at-line-column "于行~a，列~a")
-  (test-engine-in-at-line-column "于文件~a，行~a，列~a")
-  ; as in "column (unknown)"
-  (test-engine-unknown "（未知）")
-  (test-engine-trace-error "跟踪错误")
-  
-  ; The ~F is special marker for the offending values, which may be
-  ; printed specially in DrRacket.
-  ;; no way to translate these as the order of expected value and actual value (also range) should be ordered differently in Chinese
-  (test-engine-check-encountered-error
-   "check-expect encountered the following error instead of the expected value, ~F. ~n   :: ~a")
-  (test-engine-actual-value-differs-error
-   "Actual value ~F differs from ~F, the expected value.")
-  (test-engine-actual-value-not-within-error
-   "Actual value ~F is not within ~v of expected value ~F.")
-  (test-engine-encountered-error-error
-   "check-error encountered the following error instead of the expected ~a~n   :: ~a")
-  (test-engine-expected-error-error
-   "check-error expected the following error, but instead received the value ~F.~n ~a")
-  (test-engine-expected-an-error-error
-   "check-error expected an error, but instead received the value ~F.")
-  ;; members are appended to the message
-  (test-engine-not-mem-error "Actual value ~F differs from all given members in ")
-  (test-engine-not-range-error "Actual value ~F is not between ~F and ~F, inclusive.")
-  
-  ;; followed by list of variable bindings
-  (test-engine-property-fail-error "Property falsifiable with")
-  (test-engine-property-error-error "check-property遇到如下错误~n:: ~a")
-  
-  (signature-enable-checks "启用Signature Checks")
-  (signature-disable-checks "停用Signature Checks")
-  
-  ; section header
-  (test-engine-check-failures "Check失败：")
-  ; section header
-  (test-engine-signature-violations "Signature违规：")
-  
-  ; part of one phrase "signature <at line ...> to blame: procedure <...>
-  (test-engine-signature "signature")
-  (test-engine-to-blame "to blame: procedure")
-  
-  (test-engine-no-signature-violations "无signature违规。")
-  (test-engine-1-signature-violation "1个signature违规。")
-  (test-engine-n-signature-violations "~a个signature违规。")
-  
-  ; as in got <value>, signature <at ...>
-  (test-engine-got "实得")
-  
-  ;; The Test Suite Tool
-  ;; Errors
-  (test-case-empty-error "空白test")
-  (test-case-too-many-expressions-error "一个test中包含过多表达式。")
-  ;; DrRacket window menu items
-  (test-case-insert "插入Test Case")
-  (test-case-disable-all "禁用所有Test Cases")
-  (test-case-enable-all "允许所有Test Cases")
-  
-  ;; NOTE: The following string constants are labels of the test-case fields. The width
-  ;;       of the field is determined by the length of the longest of the following three words.
-  ;;       if the words are too long the test case will take up too much horizontal room and
-  ;;       not look very good.
-  ;; This string is the label of the expression that is being tested in a test case.
-  (test-case-to-test "Test")
-  ;; This string is the label of the expression that is the expected value of the to-test expression.
-  (test-case-expected "应该为")
-  ;; This string is the label of the actual result of the to test expression.
-  (test-case-actual "实际值")
-  (test-case-predicate "预测值")
-  (test-case-should-raise "应该Raise")
-  ;; The label of a field of the test-case that describes the expected error message of a test case
-  (test-case-error-message "错误信息")
-  
-  (test-case-menu-title "Test Case")
-  (test-case-switch-to-error-box "切换为Error Test框")
-  (test-case-switch-to-nonerror-box "切换为Nonerror Test框")
-  (test-case-collapse "折叠Test Case")
-  (test-case-show-actual "显示实际值")
-  (test-case-enable "启用Test Case")
-  (test-case-show-predicate "显示预测值")
-  (test-case-show-error-message "显示错误信息")
-  (test-case-convert-to-text "转化为文本")
-  
-  ;; Slideshow
-  (slideshow-hide-picts "显示嵌套的框")
-  (slideshow-show-picts "显示图片")
-  (slideshow-cannot-show-picts "无法显示图片；请先运行程序建立大小")
-  (slideshow-insert-pict-box "插入图片框")
-  
-  ;; GUI Tool
-  (gui-tool-heading "GUI工具")
-  (gui-tool-before-clicking-message "在点击工具图标之前，请先使用“特殊符号”菜单中的“插入GUI”命令插入一个GUI根对象，或先选中另一个GUI。")
-  (gui-tool-show-gui-toolbar "显示GUI工具栏")
-  (gui-tool-hide-gui-toolbar "隐藏GUI工具栏")
-  (gui-tool-insert-gui "插入GUI")
-  
-  ;; contract violation tracking
-  
-  ; tooltip for new planet icon in drscheme window (must have a planet violation logged to see it)
-  (show-planet-contract-violations "显示PLaneT中的contract违背")
-  
-  ; buttons in the dialog that lists the recorded bug reports
-  (bug-track-report "发送报告")
-  (bug-track-forget "取消")
-  (bug-track-forget-all "取消全部")
-  
-  ;; planet status messages in the bottom of the drscheme window; the ~a is filled with the name of the package
-  (planet-downloading "PLaneT：正在下载~a……")
-  (planet-installing "PLaneT：正在安装~a……")
-  (planet-finished "PLaneT：~a已完成。")
-  (planet-docs-building "PLaneT：构建文档（由~a触发）……")
-  (planet-no-status "PLaneT") ;; this can happen when there is status shown in a different and then the user switches to a tab where planet hasn't been used
-  
-  (bug-report-field-pkg "Package系统信息")
-  
-  ;; string normalization. To see this, paste some text with a ligature into DrRacket
-  ;; the first three strings are in the dialog that appears. The last one is in the preferences dialog
-  (normalize "标准化")
-  (leave-alone "保留原样")
-  (normalize-string-info "粘帖来的文字包含未经标准化的连字。标准化？")
-  (normalize-string-preference "标准化粘帖字符串")
-  (ask-about-normalizing-strings "询问是否标准化字符")
-  
-  (always-use-platform-specific-linefeed-convention "使用系统相关的换行符约定")
-  
-  ;; optimization coach
-  (hide-optimization-coach "隐藏优化教练")
-  (show-optimization-coach "显示优化教练")
-  
-  ;; labels used (in a big font) in the background of the definitions and interactions windows
-  (definitions-window-label "定义")
-  (interactions-window-label "交互")
-  (hide-defs/ints-label "隐藏定义/交互标签") ;; popup menu
-  (show-defs/ints-label "显示定义/交互标签") ;; preferences checkbox
-  
-  ;; menu item in the 'edit' menu; applies to editors with programs in them
-  ;; (technically, editors that implement color:text<%>)
-  (spell-check-string-constants "对字符串常量进行拼写检查")
-  (spelling-dictionaries "拼写检查字典") ; (sub)menu whose items are the different possible dictionaries
-  (default-spelling-dictionary "默认字典") ; first item in menu from previous line
-  (misspelled-text-color "拼写错误文本的颜色") ;; in the preferences dialog  
-  (cannot-find-ispell-or-aspell-path "找不到aspell或ispell程式文件")
-  ; puts the path to the spell program in the ~a and then the error message
-  ; is put following this string (with a blank line in between)
-  (spell-program-wrote-to-stderr-on-startup "拼写程序（~a）给出错误信息：")
-  )
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/spanish-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/spanish-string-constants.rkt
deleted file mode 100644
index 589e0fd1cb..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/spanish-string-constants.rkt
+++ /dev/null
@@ -1,1094 +0,0 @@
-(module spanish-string-constants "string-constant-lang.rkt"
-
- ;;; when translating this constant, substitue name of actual language for `English'
- (is-this-your-native-language
-  "¿Es español tu idioma materno?")
-
- (interact-with-drscheme-in-language "Interactúa con DrRacket en Español")
-
- (are-you-sure-you-want-to-switch-languages
-  "Esto cambiará el idioma de la interfaz, lo que requiere que reinicies DrRacket. ¿Estas seguro(a)?")
- 
-
- (accept-and-quit "Aceptar y salir")
- (accept-and-exit "Aceptar y salir")
-
- ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
- (plt "PLT")
- (drscheme "DrRacket")
- (drracket "DrRacket")
- (ok "OK")
- (cancel "Cancelar")
- (abort "Abortar")
- (untitled "Sin título")
- (untitled-n "Sin título ~a")
- (warning "Advertencia")
- (error "Error")
- (close "Cerrar") ;; as in, close an open window
- (stop "Detener")
- (&stop "&Detener")
- (are-you-sure-delete? "¿Seguro(a) quieres borrar ~a?") ;; ~a is a filename or directory name
- (ignore "Ignorar")
- (revert "Revertir")
-
- ;; label for a generic check box, often supported on dialogs
- ;; that ask a binary choice of the user. If checked, the
- ;; dialog isn't going to be shown again.
- ;; One version for always using the current choice:
- (dont-ask-again-always-current "No volver a preguntar (usar la selección actual siempre)")
- ;; One generic version (ie, on the Quit DrRacket dialog)
- (dont-ask-again                "No volver a preguntar")
- 
- ;; important urls
- (web-materials "Sitios de Web Relacionados")
- (tool-web-sites "Sitios de Web de Herramientas")   ;; menu item title
- (plt-homepage "Racket")
- (pbd-homepage "Program by Design")
- 
- ;;; bug report form
- (cancel-bug-report? "¿Cancelar el reporte de problemas?")
- (are-you-sure-cancel-bug-report?
-  "¿Estas seguro que quieres cancelar el envío de éste reporte de problemas?")
- (bug-report-form "Forma para reportar problemas")
- (bug-report-field-name "Nombre")
- (bug-report-field-email "Correo Electrónico")
- (bug-report-field-summary "Resumen")
- (bug-report-field-severity "Gravedad")
- (bug-report-field-class "Clase")
- (bug-report-field-description "Descripción")
- (bug-report-field-reproduce1 "Pasos para")
- (bug-report-field-reproduce2 "Reproducir")
- (bug-report-field-environment "Ambiente")
- (bug-report-field-docs-installed "Documentos instalados")
- (bug-report-field-collections "Colecciones")
- (bug-report-field-human-language "Idioma")
- (bug-report-field-version "Versión")
- (bug-report-synthesized-information "Información sintetizada")  ;; dialog title
- (bug-report-show-synthesized-info "Muestra información resumida")
- (bug-report-submit "Enviar")
- (bug-report-submit-menu-item "Enviar reporte de problemas...") ;; in Help Menu (drs & help desk)
- (error-sending-bug-report "Error al enviar el reporte de problemas")
- (error-sending-bug-report-expln "Un error ocurrió mientras enviaba éste reporte de problemas.  Si tu conexión a Internet está funcionando bien, por favor visita:\n\n    http://bugs.racket-lang.org/\n\ny envía el reporte de problemas por medio de la forma de web en esea página de WEB. Sentimos mucho las molestias que esto te ocasiona.\n\nEl mensaje de error es:\n~a")
- (illegal-bug-report "Reporte de problemas ilegal")
- (pls-fill-in-field "Por favor requisita el campo \"~a\"")
- (malformed-email-address "Dirección de correo electrónico inválida")
- (pls-fill-in-either-description-or-reproduce "Por favor requisita el campo de Descripción o el de Pasos para Reproducir.")
-
- ;;; check syntax
- (check-syntax "Revisa la sintáxis")
- (cs-italic "Itálica")
- (cs-bold "Negrita")
- (cs-underline "Subrayado")
- (cs-change-color "Cambiar color")
- (cs-tack/untack-arrow "Anclar/Liberar flecha")
- (cs-jump-to-next-bound-occurrence "Saltar a la Siguiente Ocurrencia Ligada")
- (cs-jump-to-binding "Saltar a Ocurrencia Ligada")
- (cs-jump-to-definition "Saltar a la Definición")
- (cs-error-message "Mensaje de error")
- (cs-open-file "Abrir ~a")
- (cs-rename-var "Renombrar ~a")
- (cs-rename-id "Renombrar identificador")
- (cs-rename-var-to "Renombrar ~a a:")
- (cs-name-duplication-error "El nuevo nombre que has seleccionado, ~s, colisiona con otro nombre en este ambiente.")
- (cs-rename-anyway "Renombrar de cualquier modo")
- (cs-status-init "Checar sintaxis: Iniciando el ambiente para el código de usuario")
- (cs-status-coloring-program "Checar sintaxis: coloreando la expresión")
- (cs-status-eval-compile-time "Checar sintaxis: tiempo de evaluación y compilación")
- (cs-status-expanding-expression "Checar sintaxis: expandiendo la expresión")
- (cs-mouse-over-import "Asociación ~s importada desde ~s")
- 
- (cs-lexical-variable "variable léxica")
- (cs-imported-variable "variable importada")
- 
- 
- ;;; info bar at botttom of drscheme frame
- (collect-button-label "Recolectar")
- (read-only "Sólo lectura")
- (auto-extend-selection "Selección Auto-Extendida")
- (overwrite "Sobreescribir")
- (running "ejecutando")
- (not-running "suspendido") 
- 
- ;;; misc
- (welcome-to-something "Bienvenido a ~a")
- 
- ; this appears in the drscheme about box.
- (welcome-to-drscheme-version/language "Bienvenido a DrRacket, versión ~a, ~a")
-
- ; these appear on subsequent lines in the `Help|Welcome to DrRacket' dialog.
- (welcome-to-drscheme "Bienvenido a DrRacket")
-
- (goto-line "Ir a la línea")
- (goto-line-invalid-number
-  "~a no es un número de línea válido. Debe ser un entero entre 1 y ~a")
- (goto-position "Ir a la posición")
- (no-full-name-since-not-saved
-  "El archivo no tienen un nombre completo porque no ha sido salvado aún.")
- (cannot-open-because-dne "~a no puede ser abierto, porque no existe.")
-
- (needs-execute-language-changed
-  "ADVERTENCIA: El lenguaje ha cambiado. Haz click en Ejecutar.")
- (needs-execute-teachpack-changed
-  "ADVERTENCIA: Los paquetes de enseñanza han cambiado. Haz click en Ejecutar.")
- (needs-execute-defns-edited
-  "ADVERTENCIA: La ventana de definiciones ha cambiado. Haz click en Ejecutar.")
-
-
- (file-is-not-saved "El archivo \"~a\" no ha sido salvado.")
- (save "Salvar")
- (close-anyway "Cerrar y descartar cambios")
- (clear-anyway "Limpiar")
-
- ;; menu item title
- (log-definitions-and-interactions "Guardar bitácora de Definiciones e Interacciones...")
- (stop-logging "Terminar bitácora")
- (please-choose-a-log-directory "Por favor seleccione un directorio para almacenar bitácora")
- (logging-to "Guardando bitácora en: ")
- (erase-log-directory-contents "¿Borrar el contenido del directorio de bitácoras: ~a?")
- (error-erasing-log-directory "Error al borrar el contenido del directorio de bitácoras.\n\n~a\n")
-
-  ;; modes
- (mode-submenu-label "Modos")
- (scheme-mode "Modo Scheme")
- (racket-mode "Modo Racket")
- (text-mode "Modo Texto")
-
- (scheme-mode-color-symbol "Símbolo")
- (scheme-mode-color-keyword "Llave")
- (scheme-mode-color-comment "Comentario")
- (scheme-mode-color-string "Cadena")
- (scheme-mode-color-constant "Constante")
- (scheme-mode-color-parenthesis "Paréntesis")
- (scheme-mode-color-error "Error")
- (scheme-mode-color-other "Otro")
-  ;; the ~a is filled in with one of the above (scheme-mode-*)
- (syntax-coloring-choose-color "Escoge un color para: ~a")
- (preferences-colors "Colores") ;; used in the preferences dialog
-
- (url: "URL:")
- (open-url... "Abre URL...")
- (open-url "Abre URL")
- (browse... "Navega...")
- (bad-url "URL Inválido")
- (bad-url:this "URL Inválido: ~a")
- 
- ;; Help Desk
- (help "Ayuda")
- (help-desk "Módulo de Ayuda")
- (plt:hd:search "Buscar")
- (plt:hd:feeling-lucky "Me siento afortunado")
- (plt:hd:home "Hogar del Módulo de Ayuda")
- ; next 3 are popup menu choices at bottom of help desk window
- (plt:hd:search-for-keyword "por Palabra clave")
- (plt:hd:search-for-keyword-or-index "por palabra clave o entrada en el índice")
- (plt:hd:search-for-keyword-or-index-or-text "por palabra clave, entrada en el índice o texto")
- (plt:hd:exact-match "patrón exacto") ;; exact match??
- (plt:hd:containing-match "subcadena") ;; containing match ??
- (plt:hd:regexp-match "expresión regular") ;; match regexp
- (plt:hd:find-docs-for "Encuentra documentación sobre:")
- (plt:hd:search-stopped-too-many-matches "(Búsqueda detenida - demasiados patrones casan.)")
- (plt:hd:nothing-found-for "Nada casa con ~a")
- (plt:hd:and "y")
- (plt:hd:refresh "refrescar")
- (plt:hd:refresh-all-manuals "refrescar todos los manuales")
- (plt:hd:manual-installed-date "(~a instalado)")
- ;; Help Desk configuration
- ;; refreshing manuals
- ;; should not mention `SVN' (plt:hd:refresh-done "Refresco de los manuales via SVN terminado")
- (plt:hd:refresh-clearing-indices "Eliminando índices guardados")
- (plt:hd:refresh-deleting... "Borrando la versión vieja de ~a...")
- (plt:hd:refresh-downloading... "Bajando ~a...")
- (plt:hd:refresh-installing... "Instalando nueva versión de ~a...")
- (plt:hd:refresh-clearing-indices "Eliminando indices almacenados")
- (plt:hd:refreshing-manuals "Bajando (nuevamente) los Manuales")
- (plt:hd:refreshing-manuals-finished "Terminado.")
- (plt:hd:about-help-desk "Acerca del Módulo de Ayuda")
- (plt:hd:help-desk-about-string
-  "El Módulo de Ayuda es una fuente complete de información acerca del software del grupo PLT, incluyendo DrRacket, MzScheme y MrEd.\n\nVersión ~a\nCopyright (c) ~a-~a PLT")
- (plt:hd:help-on-help "Ayuda para la ayuda")
- (plt:hd:help-on-help-details "Para ayuda sobre el uso del Módulo de Ayuda, sigue la liga `Cómo usar el Módulo de Ayuda' desde el página principal del Módulo de Ayuda.  (Para llegar a la página principal si no estás ahí ya, presiona el botón marcado `Hogar' en la parte superior de la ventana del Módulo de Ayuda.")
- (plt:hd:ask-about-separate-browser
-  "Ha seleccionado una liga que apunta a contenido en el Web.  ¿Le gustaría visitarlo en el navegador del Módulo de Ayuda o le gustaría usar un navegador separado para ver dicho contenido?")
- (plt:hd:homebrew-browser "Navegador del Módulo de Ayuda") ;; choice for the above string (in a button)
- (plt:hd:separate-browser "Navegador separado") ;; other choice for the above string (also in a button)
- (plt:hd:external-link-in-help "URLs externos en Ayuda")
- (plt:hd:use-homebrew-browser "Usar el Navegador del Módulo de Ayuda para URL externos")
- (plt:hd:new-help-desk "Nuevo Módulo de Ayuda")
-
- ;; in the Help Desk language dialog, title on the right.
- (plt:hd:manual-search-ordering "Orden de búsqueda en manuales")
- 
- (reload "Volver a cargar") ;; Reload
-
-
- ;; help desk http proxy
- (http-proxy "Proxy de HTTP")
- (proxy-direct-connection "Coneción Directa")
- (proxy-use-proxy "Utilizar proxy:")
- (proxy-host "Host")
- (proxy-port "Port")
- (proxy-bad-host "El Host Proxy está mal especificado")
-
-    ;;browser
- (rewind-in-browser-history "Revertir")
- (forward-in-browser-history "Adelante")
- (home "Hogar")
- (browser "Navegador")
- (external-browser-choice-title "Navegador externo") ; title for radio-button set
- (browser-command-line-label "Línea de comandos:") ; label for radio button that is followed by text boxes
- (choose-browser "Escoge un navegador")
- (no-browser "Preguntar más tarde")
- (browser-cmdline-expl-line-1 "(línea de comando formada concatenando pre-text, URL,") ; explanatory text for dialog, line 1
- (browser-cmdline-expl-line-2 "y post-text, sin espacios extra entre ellos.)") ; ... line 2. (Anyone need more lines?)
- (install? "¿Instalar?")  ;; if a .plt file is found (title of dialog)
- (you-have-selected-an-installable-package "Ha seleccionado un paquete instalable.")
- (do-you-want-to-install-it? "¿Desea intalarlo?")
- (paren-file-size "(El archivo mide ~a bytes)")
- (download-and-install "Descargar && Instalar")
- (download "Descargar")
- (save-downloaded-file "Salvar el archivo descargado como")
- (save-downloaded-file/size "Salvar el archivo descargado (~a bytes) como")
- (downloading "Descargar")
- (downloading-file... "Descargando archivo...")
- (package-was-installed "El paquete fué instalado.")
- (download-was-saved "Se ha salvado el archivo descargado.")
-
- (install-plt-file-menu-item... "Instalar archivo .plt ...")
- (install-plt-file-dialog-title "Instalar archivo .plt")
- (install-plt-web-tab "Web")
- (install-plt-file-tab "Archivo")
- (install-plt-filename "Nombre de Archivo:")
- (install-plt-url "URL:")
- 
- ;; install plt file when opened in drscheme strings
- (install-plt-file "¿Deseas instalar ~a, o quieres abrirlo para edición?")
- (install-plt-file/yes "Instalar")
- (install-plt-file/no "Editar")
- 
- (plt-installer-progress-window-title "Progreso del instalador")
- (plt-installer-abort-installation "Abortar instalación") ;; button label
- (plt-installer-aborted "Abortado.") ;; msg that appears in the installation window when installation is aborted
-
- ;;; about box
- (about-drscheme-frame-title "Acerca de DrRacket")
- 
- ;;; save file in particular format prompting.
- (save-as-plain-text "¿Salvar este archivo como texto plano?")
- (save-in-drs-format "¿Salvar este archivo en el formato, no texto, particular de DrRacket?")
- (yes "Si")
- (no "No")
- 
- ;;; preferences
- (preferences "Preferencias")
- (error-saving-preferences "Error al salvar preferencias: ~a")
- (error-reading-preferences "Error al leer preferencias")
- (scheme-prefs-panel-label "Racket")
- (warnings-prefs-panel-label "Advertencias")
- (editor-prefs-panel-label "Editando")
- (general-prefs-panel-label "General") 
- (highlight-parens "Resaltar entre parejas de paréntesis")
- (fixup-parens "Corrige paréntesis")
- (flash-paren-match "Señala el paréntesis que casa")
- (auto-save-files "Auto-salva archivos")
- (backup-files "Archivos de respaldo")
- (map-delete-to-backspace "Cambia suprimir por backspace")
- (verify-exit "Confirmar salida")
- (ask-before-changing-format "Preguntar antes de cambiar el formato de salida")
- (wrap-words-in-editor-buffers "Ajustar al border palabras en el editor")
- (show-status-line "Mostrar línea de estado")
- (count-columns-from-one "Cuenta números de columna a partir de uno") 
- (display-line-numbers "Muestra números de línea en el contenedor; sin desplazamiento de caracteres")
- (enable-keybindings-in-menus "Habilita enlaces de teclas en los menús")
- (option-as-meta "Tratar cualquier tecla como meta") ;; macos/macos x only
- (reuse-existing-frames "Reutilizar marcos existentes cuando se abre un nuevo archivo")
- (default-fonts "Fuentes por omisión")
- (paren-match-color "Color de resaltado de paréntesis") ; in prefs dialog
- (online-coloring-active "Colorea sintaxis interactivamente")
- (open-files-in-tabs "Abrir archivos en distintas pestañas (no distintas ventanas)")
- (show-interactions-on-execute "Abrir ventana de interacciones cuando se ejecuta un programa")
- (limit-interactions-size "Limita el tamaño de las interacciones")
- (background-color "Color de fondo")
- (default-text-color "Texto por omisión") ;; used for configuring colors, but doesn't need the word "color"
- (choose-a-background-color "Por favor selecciona un color de fondo")
-
-  ; title of the color choosing dialog
-
- ; should have entire alphabet
- (font-example-string "abcdefghijklmnñopqrstuvxyz¡!¿?«».")  ;; FIXME: shoulde this have special characters?
-
- (change-font-button-label "Cambiar")
- (fonts "Fuentes")
-
-					; filled with type of font, eg modern, swiss, etc.
- (choose-a-new-font "Por favor selecciona una nueva fuente \"~a\"")
-
- (font-size-slider-label "Tamaño")
- (restart-to-see-font-changes "Re-inicia para ver los cambios de las fuentes")
-
- (font-prefs-panel-title "Fuente")
- (font-name "Nombre de fuente")
- (font-size "Tamaño de fuente")
- (set-font "Ver Fuente...")
- (font-smoothing-label  "Suavisar Fuente")
- (font-smoothing-none "Nada")
- (font-smoothing-some "Algo")
- (font-smoothing-all "Todo")
- (font-smoothing-default "Utiliza el valor por omisión del sistema")
- (select-font-name "Selecciona un nombre de Fuente")
- (example-text "Texto de ejemplo:")
- (only-warn-once "Sólo advierte una vez cuando las ejecución e interacciones no están sincronizadas")
- 
- ; warning message when lockfile is around
- (waiting-for-pref-lock "Esperando el archivo candado de las preferencias...")
- (pref-lock-not-gone
-  "El archivo candado de las preferencias:\n\n   ~a\n\nevita que éstas sean salvadas. Asegúrate que ningún otro software de Racket esté corriendo y borra este archivo.")
- (still-locked-exit-anyway? "Las preferencias no fueron salvadas exitosamente. ¿Salir de cualquier forma?")
-
- ;;; indenting preferences panel
- (indenting-prefs-panel-label "Sangrar")  ;; To indent is "Sangrado de márgenes"
- (indenting-prefs-extra-regexp "Expresiones regulares extra")
- 
- ; filled with define, lambda, or begin
- (enter-new-keyword "Teclea una nueva palabra clave parecida a ~a:")
- (x-keyword "Palabra clave ~a")
- (x-like-keywords "Palabra clave parecida a ~a")
-
- (expected-a-symbol "esperaba un símbolo, encontré: ~a")
- (already-used-keyword "la palabra clave \"~a\" ya tenía un sangrado especial asignado")
- (add-keyword "Añade")
- (remove-keyword "Borra")
- 
- ;;; find/replace
- (find-and-replace "Buscar y reemplazar")
- (find "Buscar")
- (replace "Reemplazar")
- (dock "Atracar")
- (undock "Des-atracar")
- (replace&find-again "Reemplazar && Vuelve a buscar") ;;; need double & to get a single &
- (forward "Hacia adelante")
- (backward "Hacia atrás")
- (hide "Esconder")
-
- ;; multi-file-search
- (mfs-multi-file-search-menu-item "Buscar en archivos...")
- (mfs-string-match/graphics "Búsqueda de Cadenas (maneja archivos con gráficas)")
- (mfs-regexp-match/no-graphics "Expresión Regular (sólo archivos de texto plano)")
- (mfs-searching... "Buscando...")
- (mfs-configure-search "Configuración de Búsqueda")
- (mfs-files-section "Archivos")
- (mfs-search-section "Buscar")
- (mfs-dir "Dir")
- (mfs-recur-over-subdirectories "Recurrir sobre subdirectorios")
- (mfs-regexp-filename-filter "Filtro de nombres de archivo con expresiones regulares")
- (mfs-search-string "Buscar cadena")
- (mfs-drscheme-multi-file-search "Búsqueda Multi Archivo  - DrRacket")
- (mfs-not-a-dir "\"~a\" no es un directorio")
- (mfs-open-file "Abrir Archivo")
- (mfs-stop-search "Detener Búsqueda")
- (mfs-case-sensitive-label "Sensible al Tamaño")
- (mfs-no-matches-found "Nada casó con la búsqueda.")
- (mfs-search-interrupted "Búsqueda abortada.")
- 
- ;;;reverting a file
- (are-you-sure-revert "¿Estas seguro que deseas revertir este archivo? Este cambio no puede deshacerse.")
- (are-you-sure-revert-title "¿Revertir?")
-
- ;; saving a file
- ;; ~a is filled with the filename
- (error-saving "Error al Salvar")
- (error-saving-file/name "Hubo un error mientras salvaba ~a.")
- (error-loading "Error al cargar")
- (error-loading-file/name "Hubo un error mientras cargaba ~a.")
- (unknown-filename "<< desconocido >>")
-
- ;;; finder dialog
- (must-specify-a-filename "Debes especificar un nombre de archivo")
- (file-does-not-exist "El archivo \"~a\" no existe.")
- (ask-because-file-exists "El archivo \"~a\" ya existía. ¿Deseas reemplazarlo?")
- (dne-or-cycle "El archivo \"~a\" contiene un directorio inexistente o un ciclo.")
- (get-file "Obtener archivo")
- (put-file "Poner archivo")
- (full-pathname "Ruta completa")
- (show-dot-files "Muestra archivos y directorio que comiencen con un punto.")
- (up-directory-button-label "Arriba")
- (add-button-label "Añadir") ;;; for multi-file selection
- (add-all-button-label "Añadir todos") ;;; for multi-file selection
- (remove-button-label "Eliminar") ;;; for multi-file selection
- (file-wrong-form "Ese archivo no tiene el formato correcto.")
- (select-files "Selecciona archivos")
- (select-file "Selecciona un archivo")
- (dir-dne "El directorio no existe.")
- (file-dne "El archivo no existe.")
- (empty-filename "El nombre del archivo debe contener al menos algunas letras.")
- (that-is-dir-name "Eso es un nombre de directorio.")
- 
- ;;; raw menu names -- these must match the 
- ;;; versions below, once the &s have been stripped.
- ;;; if they don't, DrRacket's menus will appear
- ;;; in the wrong order.
- (file-menu "Archivo")
- (edit-menu "Edición")
- (help-menu "Ayuda")
- (windows-menu "Ventana")
-
- ;;; menus
- ;;; - in menu labels, the & indicates a alt-key based shortcut.
- ;;; - sometimes, things are stuck in the middle of 
- ;;; menu item labels. For instance, in the case of
- ;;; the "Save As" menu, you might see: "Save Definitions As". 
- ;;; be careful of spacing, follow the English, if possible.
- ;;; - the ellipses in the `after' strings indicates that
- ;;; more information is required from the user before completing
- ;;; the command.
-
- (file-menu-label "&Archivo")
-
- (new-info  "Abre un nuevo archivo")
- (new-menu-item "&Nuevo")
- (new-...-menu-item "&Nuevo...")
- 
- (open-info "Abre un nuevo archivo del disco")
- (open-menu-item "&Abrir...")
- (open-recent-info "Una lista de archivos abiertos recientemente")
- (open-recent-menu-item "Abrir reciente")
-
- (revert-info "Revertir este archivo a la copia en disco")
- (revert-menu-item "&Revertir")
-
- (save-info "Salva este archivo a disco")
- (save-menu-item "&Guardar")
-
- (save-as-info "Te pide un nombre para salvar este archivo a disco")
- (save-as-menu-item "Guardar &como ...")
-
- (print-info "Envía este archivo a una impresora")
- (print-menu-item "&Imprimir...")
-
- (close-info "Cierra este archivo")
- (close-menu-item "&Cerrar")
-
- (quit-info "Cierra todas las ventanas")
- (quit-menu-item-windows "&Salir")
- (quit-menu-item-others "&Salir") ;; FIXME: salir is exit, so quit is ???
- 
- (edit-menu-label "&Edición")
- 
- (undo-info "Deshace la acción más reciente")
- (undo-menu-item "&Deshacer")
-
- (redo-info "Deshace el más reciente deshacer")
- (redo-menu-item "&Rehacer")
-
- (cut-info "Mueve los elementos seleccionados al porta-papeles para pegarlos más tarde")
- (cut-menu-item "Cor&tar")
-
- (copy-info "Copia los elementos seleccionados al porta-papeles para pegarlos más tarde")
- (copy-menu-item "&Copiar")
-
- (paste-info "Pega los elementos copiados o cortados más recientemente en lugar de los objetos seleccionados")
- (paste-menu-item "&Pegar")
-
- (clear-info "Borra los elementos seleccionados sin afectar el porta-papeles o el pegado")
- (clear-menu-item-windows "Borr&ar")
-
- (select-all-info "Selecciona el documento completo")
- (select-all-menu-item "&Selecciona todo")
- 
- (find-info "Busca una cadena")
- (find-menu-item "&Buscar...")
-
- (find-again-info "Busca la misma cadena que antes")
- (find-again-menu-item "Volver a buscar")
- 
- (replace-and-find-again-info "Reemplaza el texto actual y busca por la misma cadena que antes")
- (replace-and-find-again-menu-item "Reemplaza && buscar otra vez")
-
- (preferences-info "Configura tus preferencias")
- (preferences-menu-item "Personalizar...")
-
- (keybindings-info "Muestra los enlaces de tecla activos")
- (keybindings-menu-item "Enlaces de teclas")
- (keybindings-show-active "Mostrar enlaces de tecla activos")
- (keybindings-frame-title "Enlaces de teclas")
- (keybindings-sort-by-name "Ordena por Nombre")
- (keybindings-sort-by-key "Ordena por Llave")
- (keybindings-add-user-defined-keybindings "Añade enlaces de tecla definidos por el usuario...")
- (keybindings-menu-remove "Eliminar ~a")
- (keybindings-choose-user-defined-file "Por favor seleccione un archivo con enlaces de teclas.")
-
- (user-defined-keybinding-error "Error al ejecutar el enlace de teclas ~a\n\n~a")
- (user-defined-keybinding-malformed-file "El archivo ~a no contiene un módulo escrito usando el lenguaje framework/keybinding-lang.")  
-
- (insert-text-box-item "Inserta caja de texto")
- (insert-image-item "Inserta imagen...")
- (insert-comment-box-menu-item-label "Insertar Caja de comentario")
- (insert-lambda "Inserta &Lambda")
- 
- (wrap-text-item "Ajustar texto al borde")
-
- (windows-menu-label "&Ventana")
- (bring-frame-to-front "Traer ventana al frente")
- (bring-frame-to-front... "Traer ventana al frente...")
- (most-recent-window "Ventana más reciente")
- 
- (view-menu-label "&Muestra")
- (show-overview "Mostrar Panorama")
- (hide-overview "Esconder Panorama")
- (show-module-browser "Mostrar Navegador de Módulos")
- (hide-module-browser "Esconder Navegador de Módulos")
-
- (help-menu-label "&Ayuda")
- (about-info "Créditos y detalles de esta apliación")
- (about-menu-item "Acerca ...")
-
-  ;;; help-desk-specific menus
- ;; open here's new menu item
- (create-new-window-or-clear-current
-  "¿Deseas una nueva ventana o limpiar la ventana actual?")
- (clear-current "Limpiar actual")
- (new-window "Nueva ventana")
-
- ;;; exiting and quitting are you sure dialog
- ;;; (exit is used on windows, quit on macos. go figure)
- (exit "Salir")
- (quit "Abandonar") ;; FIXME: Quit
- ;;; in are-you-sure-format, either exit or quit is filled in (from above)
- ;;; based on the platform drscheme is running on.
- (are-you-sure-exit "¿Estas seguro(a) que deseas salir?")
- (are-you-sure-quit "¿Estas seguro(a) que deseas abandonar?") ;; FIXME: Quit
- 
- ;;; autosaving
- (error-autosaving "Error al auto-salvar \"~a\".")
- (autosaving-turned-off "Auto-salvar está desactivado hasta\n que el archivo sea salvado.")
- (recover-autosave-files-frame-title "Recuperar archivos auto-salvados")
- (autosave-details "Detalles")
- (autosave-recover "Recuperar")
- (autosave-unknown-filename "<<desconocido>>")
-
- ;; these are labels in a dialog that drscheme displays
- ;; if you have leftover autosave files. to see the dialog,
- ;; start up drscheme and modify (but don't save) a file
- ;; (also, do this with an unsaved file). Wait for the autosave
- ;; files to appear (typically 5 minutes). Kill DrRacket
- ;; and restart it. You'll see the dialog
- (autosave-autosave-label: "Archivo auto-salvado:")
- (autosave-original-label: "Archivo original:")
- (autosave-autosave-label "Archivo auto-salvado")
- (autosave-original-label "Archivo original")
- (autosave-compare-files "Compara archivos auto-salvados")
-
- (autosave-show-autosave "Auto-salvar archivo") ;; title of a window showing the autosave file
-
- (autosave-explanation "DrRacket encontró archivos auto-salvados que pueden contener tu trabajo no salvado.")
-
- (autosave-recovered! "¡Recuperado!") ;; status of an autosave file
- (autosave-deleted "Borrado")       ;; status of an autosave file
-
- (autosave-error-deleting "Error al borrar ~a\n\n~a") ;; first is a filename, second is an error message from mz.
- (autosave-delete-button "Borrar")
- (autosave-delete-title "Borrar")  ;; title of a dialog asking for deletion confirmation
- (autosave-done "Listo")
- 
- ;; appears in the file dialog
- (autosave-restore-to-where? "Escoge un lugar para guardar el archivo auto-salvado.")
- 
- ;;; file modified warning
- (file-has-been-modified
-  "El archivo ha sido modificado desde la última vez que fue salvado. ¿Sobreescribo las modificaciones?")
- (overwrite-file-button-label "Sobreescribir")
- 
- (definitions-modified 
-  "El texto de las definiciones ha sido modificado en el sistema de archivos; por favor salve o regrese el texto de las definiciones.")
- (drscheme-internal-error "Error interno de DrRacket")
- 
- ;;; tools
- (invalid-tool-spec "La especificación de la herramienta, especificada en el archivo info.rkt de la colección ~a, es inválida.  Esperaba una cadena o una lista no vacía de cadenas y recibí: ~e")
- (error-invoking-tool-title "Error al invocar la herramienta ~s;~s")
- (tool-tool-names-same-length
-  "esperaba que `tool-names' y `tools', en el archivo info.rkt de ~s, fueran listas de la misma longitud, pero obtuve ~e y ~e")
- (tool-tool-icons-same-length
-  "esperaba que `tool-icons' y  `tools', en el archivo info.rkt de ~s, fueran listas de la misma longitud, pero obtuve ~e y ~e")
- (tool-tool-urls-same-length
-  "esperaba que `tool-urls' y `tools' fueran listas del mismo tamaño en info.rkt de ~s, pero obtuve ~e y ~e")
- (error-getting-info-tool "error al cargar el archivo info.rkt de ~s")
- (tool-error-phase1 "Error en la fase 1 de la herramienta ~s; ~s")
- (tool-error-phase2 "Error en la fase 2 de la herramienta ~s; ~s")
-
- ;;; define popup menu
- (end-of-buffer-define "<< fin de contenedor (buffer) >>") ;; FIXME: buffer --> almacenador intermediario ?
- (sort-by-name "Ordena por nombre")
- (sort-by-position "Ordena por posición en el archivo")
- (no-definitions-found "<< no se encontraron definiciones >>")
- (jump-to-defn "Saltar a la definición de ~a")
-
- (recent-items-sort-by-age "Ordena por Edad")
- (recent-items-sort-by-name "Ordena por Nombre")
- 
-  ;;; show menu
- (hide-definitions-menu-item-label "Esconder &Definiciones")
- (show-definitions-menu-item-label "Mostrar &Definiciones")
- (definitions-menu-item-help-string "Mostrar/Esconder la ventana de definiciones")
- (show-interactions-menu-item-label "Mostrar &Interacciones")
- (hide-interactions-menu-item-label "Esconder &Interacciones")
- (interactions-menu-item-help-string "Mostrar/Esconder la ventana de Interacciones")
- (show-toolbar "Mostrar &Barra de herramientas")
- (hide-toolbar "Esconder &Barra de Herramientas")
-
- ;;; file menu
- (save-definitions-as "Salvar Definiciones como...")
- (save-definitions "Salvar Definiciones")
- (print-definitions "Imprimir Definiciones...")
- (about-drscheme "Acerca DrRacket")
- (save-other "Salvar otros")
- (save-definitions-as-text "Salvar Definiciones como Texto...")
- (save-interactions "Salvar Interacciones")
- (save-interactions-as "Salvar Interacciones como...")
- (save-interactions-as-text "Salvar Interacciones como Texto...")
- (print-interactions "Imprimir Interacciones...")
- (new-tab "Nueva pestaña")
- (close-tab "Cerrar pestaña") ;; must not have any &s in it.
-
- ;;; edit-menu
- (split-menu-item-label "&Dividir")
- (collapse-menu-item-label "C&olapsar")
- 
- ;;; language menu
- (language-menu-name "&Lenguaje")
- 
- ;;; scheme-menu
- (scheme-menu-name "Ra&cket")
- (execute-menu-item-label "Ejecutar")
- (execute-menu-item-help-string "Reinicia el programa en la ventana de definiciones")
- (break-menu-item-label "Interrumpir")
- (break-menu-item-help-string "Interrumpe la evaluación actual")
- (kill-menu-item-label "Terminar")
- (kill-menu-item-help-string "Terminar la evaluación actual")
- (clear-error-highlight-menu-item-label "Eliminar resaltado de error")
- (clear-error-highlight-item-help-string "Elimina el resaltado rosa de errores")
- (reindent-menu-item-label "&Re-sangrar")
- (reindent-all-menu-item-label "Re-sangrar &todo")
- (semicolon-comment-out-menu-item-label "&Comentar con punto y coma")
- (box-comment-out-menu-item-label "&Comentar con una Caja")
- (uncomment-menu-item-label "&Des-comentar")
-
- (convert-to-semicolon-comment "Convertir a comentario con punto y coma")
- 
- ;;; executables
- (create-executable-menu-item-label "Crear ejecutable...")
- (create-executable-title "Crear Ejecutable")
- (must-save-before-executable "Debes salvar tu programa antes de hacer un ejecutable.")
- (save-a-mred-launcher "Salvar un lanzador de GRacket")
- (save-a-mzscheme-launcher "Salvar un lanzador de Racket")
- (save-a-mred-stand-alone-executable "Salvar un ejecutable autocontenido de GRacket")
- (save-a-mzscheme-stand-alone-executable "Salvar un ejecutable autocontenido de Racket")
-
- (definitions-not-saved "La ventana de definiciones no ha sido salvada. El ejecutable usará la última versión salvada de la ventana de definiciones. ¿Desea continuar?")
- (launcher "Lanzador")
- (stand-alone "Auto-contenido")
- (executable-type "Tipo")
- (executable-base "Base")
- (filename "Nombre de archivo: ")
- (create "Crear")
- ;; "choose-an-executable" changed to "specify-a"
- ;(please-choose-an-executable-filename "Por favor selecciona un nombre de archivo para salvar el ejecutable.")
- ;; Replaced by generic ~a-must-end-with-~a
- ;(windows-executables-must-end-with-exe
- ; "El nombre de archivo \n\n  ~a\n\nes ilegal.  En Windows, los ejecutables deben tener terminación .exe.")
- ;(macosx-executables-must-end-with-app
- ; "El nombre de archivo\n\n  ~a\n\nes ilegal.  En MacOS X, los ejecutables deben tener terminación .app.")
- (warning-directory-will-be-replaced
-  "ADVERTENCIA: el directorio:\n\n  ~a\n\nserá reemplazado.  ¿Continuar?")
- 
- (create-servlet "Crear Servlet...")
- 
- ;; the ~a is a language such as "module" or "algol60"
- (create-servlet-unsupported-language
-  "Crear Servlet no funciona con el lenguaje ~a.")
-
- ;;; buttons
- (execute-button-label "Ejecutar") 
- (save-button-label "Salvar")
- (break-button-label "Interrumpir")
- 
- ;;; search help desk popup menu
- (search-help-desk-for "Busca en el Módulo de Ayuda \"~a\"")
- (exact-lucky-search-help-desk-for "Búsqueda precisa y con suerte en el Módulo de Ayuda \"~a\"") ;; FIXME:  Exact lucky search in Help Desk for
- 
- ;; collapse and expand popup menus
- (collapse-sexp "Colapsar expresión-s")
- (expand-sexp "Expandir expresión-s")
-
- ;;; fraction dialog
- (enter-fraction "Introducir Fracción")
- (whole-part "Parte entera")
- (numerator "Numerador")
- (denominator "Denominador")
- (invalid-number "Número inválido: debe ser un número real exacto, no entero.")
- (insert-fraction-menu-item-label "Insertar Fracción...")
- 
- ;; number snip popup menu
- (show-decimal-expansion "Ver expansión decimal")
- (show-mixed-fraction-view "Ver como una fracción mixta")   
- (show-improper-fraction-view "Ver como fracción impropia")
- (show-more-decimal-places "Muestra más posiciones decimales")
- 
- ;;; TeachPack messages
- (select-a-teachpack "Selecciona un Paquete de Enseñanza")
- (clear-teachpack "Limpia el Paquete de Enseñanza ~a")
- (teachpack-error-label "DrRacket - Paquete de Enseñanza error")
- (teachpack-didnt-load "El archivo del Paquete de Enseñanza ~a no se cargó apropiadamente.")
- (add-teachpack-menu-item-label "Añadir un Paquete de Enseñanza...")
- (clear-all-teachpacks-menu-item-label "Limpia Todos los Paquetes de Enseñanza")
- (drscheme-teachpack-message-title "DrRacket Paquete de Enseñanza")
- (already-added-teachpack "El paquete de enseñanza ~a ya estaba cargado")
- 
- ;;; Language dialog
- (introduction-to-language-dialog
-  "Por favor selecciona un lenguaje.  La mayoría de los estudiantes de cursos introductorios deberían usar el lenguaje por omisión.")
- (language-dialog-title "Configurar Lenguaje")
- (case-sensitive-label "Sensible a mayúsculas") ;; FIXME: Case sensitive
- (output-style-label "Estilo de salida")
- (constructor-printing-style "Constructor")
- (quasiquote-printing-style "Quasiquote")
- (print-printing-style "print")
- (write-printing-style "write")
- (sharing-printing-label "Show sharing in values")
- (use-pretty-printer-label "Insertar caracteres de nueva línea en valores impresos")
- (input-syntax "Sintáxis de Entrada")
- (dynamic-properties "Propiedades dinámicas")
- (output-syntax "Sintáxis de Salida")
- (no-debugging-or-profiling "No depurando o delineando")
- (debugging "Depurando")
- (debugging-and-profiling "Depurando y delineando")
- (test-coverage "Paquete de prueba de cobertura sintáctica") ;; FIXME: Syntactic test suite coverage
- (show-details-button-label "Mostrar Detalles")
- (hide-details-button-label "Esconder Detalles")
- (choose-language-menu-item-label "Seleccionar Lenguaje...")
- (revert-to-language-defaults "Revertir a los Valores por Omisión del Lenguaje")
- (fraction-style "Estilo de Fracciones")
- (use-mixed-fractions "Fracciones mixtas")
- (use-repeating-decimals "Decimales repetidos")
- (decimal-notation-for-rationals "Usar notación decimal para racionales")
- (please-select-a-language "Por favor selecciona un lenguaje")
-
- 
- ;;; languages
- (beginning-student "Estudiante Principiante")
- (beginning-one-line-summary "define, cond, structs, constantes, y primitivas") 
- (beginning-student/abbrev "Estudiante Principiante con Abreviaturas de Listas")
- (beginning/abbrev-one-line-summary "Principiante con estilo de impresión de listas en el REPL") 
- (intermediate-student "Estudiante Intermedio")
- (intermediate-one-line-summary "Estudiante Principiante más alcance léxico")
- (intermediate-student/lambda "Estudiante Intermedio con lambda")
- (intermediate/lambda-one-line-summary "Estudiante Intermedio más funciones de alto-nivel")
- (advanced-student "Estudiante Avanzado")
- (advanced-one-line-summary "Estudiante Intermedio más lambda y mutación") 
- (how-to-design-programs "How to Design Programs") ;; should agree with MIT Press on this one...
- (professional-languages "Languajes Profesionales")
- (teaching-languages "Languajes de Enseñanza")
- (experimental-languages "Languajes Experimentales") 
- (no-language-chosen "No ha seleccionado un lenguaje")
- (pretty-big-scheme "Muy Grande")
- (pretty-big-scheme-one-line-summary "Añade syntaxis y funciones de los lenguajes HtDP")
- (r5rs-language-name "R5RS")
- (r5rs-one-line-summary "R5RS, sin ornamentos")
- (expander "Expandir")
- (expander-one-line-summary "Expande expresiones en lugar de evaluarlas")
- 
- 
- 
- (initial-language-category "Lenguaje inicial")
- (unknown-debug-frame "[desconocido]")
- 
- ;(module-language-one-line-summary "Ejecutar crea un REPL en el contexto del módulo, incluyendo el lenguaje declarado para el módulo")
-
-  ;;; from the `not a language language' used initially in drscheme.
- (must-choose-language "DrRacket no puede procesar programas hasta que selecciones un lenguaje de programación.")
- 
- ; next two appear before and after the name of a text book (which will be in italics)
- (using-a-textbook-before "¿Utilizas ")
- (using-a-textbook-after "?")
- 
-                                        ; next two are before and after a language
- (start-with-before "Empezar con ")
-
- (seasoned-plt-schemer? "¿Usurio experimentado de PLT Scheme?")
- (looking-for-standard-scheme? "¿Buscas un Scheme estándar?")
-
-                                        ; the three string constants are concatenated together and the middle
-                                        ; one is hyperlinked to the dialog that suggests various languages
- (get-guidance-before "Selecciona la opción  “Seleccionar lenguaje...”  en el menú “Languaje, o ")
- (get-guidance-during "permitenos orientarte")
- (get-guidance-after ".")
-
- 
- ;;; debug language
- (backtrace-window-title "Backtrace - DrRacket")
- (files-interactions "Interacciones de ~a") ;; filled with a filename
- (current-interactions "interacciones")
- (current-definitions "definiciones")
- (mzscheme-w/debug "Texto (MzScheme, incluye R5RS)")
- (mzscheme-one-line-summary "Implementación de Scheme del PLT") 
- (mred-w/debug "Gráfico (MrEd, incluye MzScheme)")
- (mred-one-line-summary "Añade soporte para IGU a MzScheme")
-
- ;; profiling
- (profiling-low-color "Tenue")
- (profiling-high-color "Fuerte")
- (profiling-choose-low-color "Por favor selecciona un color tenue")
- (profiling-choose-high-color "Por favor selecciona un color fuerte")
- (profiling "Delineando")
- (profiling-example-text "(define (whee) (whee))")
- (profiling-color-config "Delineando Rango de Color")
- (profiling-scale "Delineando Escala de Color")
- (profiling-sqrt "Raíz cuadrada")
- (profiling-linear "Lineal")
- (profiling-square "Cuadrado")
- (profiling-number "Número de llamadas")
- (profiling-time "Tiempo acumulado")
- (profiling-update "Actualiza Delineado")
- (profiling-col-percent-time "% Tiempo")
- (profiling-col-function "Función")
- (profiling-col-time-in-msec "Msec")
- (profiling-col-calls "Llamadas")
- (profiling-show-profile "Muestra Delineado")
- (profiling-hide-profile "Esconder Profile")
- (profiling-unknown-src "<< desconocido >>")
- (profiling-no-information-available "No hay información de delineado disponible. Por favor, asegúrate que la opción de delineado está activada para el lenguaje y de haber ejecutado su programa.")
- (profiling-clear? "Cambiar la ventana de definiciones invalida la información de delineado. ¿Continuar?")
- 
- ;; test coverage
- (test-coverage-clear? "El cambiar la ventana de definiciones invalida la información de pruebas de cobertura. ¿Continuar?")
- (test-coverage-clear-and-do-not-ask-again "Sí y no me preguntes más")
- (test-coverage-ask? "¿Preguntar acerca de las pruebas de  cobertura?")
-
- ;; tracing
- (tracing-enable-tracing "Habilitar trazado")
- (tracing-show-tracing-window "Mostrar trazado")
- (tracing-hide-tracing-window "Esconder trazado")
- (tracing-tracing-nothing-to-show "No hay resultados de trazado disponibles.  Asegúrese que su lenguaje soporte trazado y que esté habilitado.")
-
- 
- ;;; repl stuff
- (evaluation-terminated "Evaluación Terminada")
- (evaluation-terminated-explanation
-  "El hilo de control de la evaluación ya no se está ejecutando, por lo que no se puede efectuar ninguna evaluación hasta la siguiente ejecución.")
- (last-stack-frame "Mostrar el último marco (frame) en el stack")
- (last-stack-frames "Mostrar los últimos ~a marcos (frames)")
- (next-stack-frames "Mostrar los siguientes ~a marcos (frames) en el stack")
- 
- ;;; welcoming message in repl
- (language "Lenguaje")
- (custom "custom")
- (teachpack "Paquete de Enseñanza")
- (welcome-to "Bienvenido a")
- (version "versión")
- 
- ;;; kill evaluation dialog
- (kill-evaluation? "¿Quieres terminar la evaluación?")
- (just-break "Interrupción Simple")
- (kill "Terminar")
- (kill? "¿Terminar?")
- 
- ;;; version checker
- (version:update-menu-item "Buscando Actualizaciones...")
- (version:update-check "Revisar Actualización")
-
- ;; special menu
- (special-menu "Especial")
-
- ;; large semi colon letters
- (insert-large-letters... "Insertar Letras Grandes...")
- (large-semicolon-letters "Letas Dos Puntos Grandes")
- (text-to-insert "Texto a insertar")
-
- (module-browser-filename-format "Nombre de archivo completo: ~a (~a líneas)")
- (module-browser-root-filename "Raíz del archivo: ~a")
- (module-browser-font-size-gauge-label "Tamaño de fuente")
- (module-browser-progress-label "Módulo de resumen de progreso")
- (module-browser-adding-file "Añadiendo archivo: ~a...")
- (module-browser-laying-out-graph-label "Depositando gráfica")
- (module-browser-open-file-format "Abriendo ~a")
- (module-browser "Navegador de Módulos")
- (module-browser... "Navegador de Módulos...")
- (module-browser-error-expanding "Error al expandir el programa:\n\n~a")
- (module-browser-show-lib-paths "Muestra archivos cargados por rutas (lib ..)")
- (module-browser-progress "Navegador de Módulos: ~a") ;; prefix in the status line
- (module-browser-compiling-defns "Navegador de Módulos: compilando las definiciones")
- (module-browser-show-lib-paths/short "Seguir los requires de bibliotecas (lib)") ;; check box label in show module browser pane in drscheme window.
- (module-browser-show-planet-paths/short "Seguir los requires de bibliotecas (planet)") ;; check box label in show module browser pane in drscheme window.
- (module-browser-refresh "Refrescar") ;; button label in show module browser pane in drscheme window.
-; (module-browser-only-in-plt-and-module-langs
-;  "El navegador de módulos está disponible para programas en los lenguajes PLT y en el lenguaje con módulos (y únicamente para programas que incluyan módulos).")
- (module-browser-name-length "Longitud de nombre")
- (module-browser-name-short "Corto")
- (module-browser-name-medium "Medio")
- (module-browser-name-long "Largo")
- (module-browser-open-all "Abrir todos los archivos mostrados")
-
- ;; Birthdays section
- (happy-birthday-matthias "¡Feliz cumpleaños Matthias!")
- (happy-birthday-matthew "¡Feliz cumpleaños Matthew!")
- (happy-birthday-shriram "¡Feliz cumpleaños Shriram!")
- 
- (mrflow-using-default-language-title "Lenguaje por omisión usado")
- (mrflow-using-default-language "El lenguaje usado actualmente no tiene un tipo tabla definido para sus primitivas.  Usaré R5RS Scheme en su lugar.")
- (mrflow-button-title "Analizar")
-;(mrflow-language-primitives-error "Nombre de archivo incorrecto para la tabla de tipos primitivos del lenguaje: ~a")
-;(mrflow-language-primitives-error-title "Error de Primitivas del Lenguaje")
- (mrflow-popup-menu-hide-errors "Esconder Errores")
- (mrflow-popup-menu-hide-type "Esconder Tipo")
- (mrflow-popup-menu-show-errors "Mostrar Errores")
- (mrflow-popup-menu-show-type "Mostrar Tipo")
-;(mrflow-read-exception "Leer excepción: ~a")
-;(mrflow-read-exception-title "Leer Excepción")
-;(mrflow-syntax-exception "Excepción de sintaxis: ~a")
-;(mrflow-syntax-exception-title "Excepción de Sintaxis")
-;(mrflow-unknown-exception-title "Excepción Desconocida")
-;(mrflow-unknown-exception "Excepción Desconocida: ~a")
- 
- (snips-and-arrows-popup-menu-tack-all-arrows "Ligar todas las Flechas")
- (snips-and-arrows-popup-menu-untack-all-arrows "Desligar todas las Flechas")
- (snips-and-arrows-user-action-disallowed-title "Cambios del usuario no permitidos actualmente")
- (snips-and-arrows-user-action-disallowed "Cambios del usuario no son permitidos en editores que contienen partes insertadas por herramientas.  Esconde todas las partes antes de modificar el contenido del editor.")
- (snips-and-arrows-hide-all-snips-in-editor "Esconder todas las partes en el editor")
-
- (xml-tool-insert-scheme-box "Insertar Caja de Racket")
- (xml-tool-insert-scheme-splice-box "Insertar Caja de Unión de Racket")
- (xml-tool-insert-xml-box "Insertar Caja de XML")
- (xml-tool-xml-box "Caja de XML")
- (xml-tool-scheme-box "Caja de Racket")
- (xml-tool-scheme-splice-box "Caja de Unión de Racket")
- (xml-tool-switch-to-scheme "Cambiar a caja de  Racket")
- (xml-tool-switch-to-scheme-splice "Cambiar a caja de unión de Racket")
- (xml-tool-eliminate-whitespace-in-empty-tags "Eliminar blancos en etiquetas vacías")
- (xml-tool-leave-whitespace-alone "Dejar blancos por la paz")
-
- (show-recent-items-window-label "Archivos abiertos recientemente")
- (show-recent-items-window-menu-item "Muestra Archivos Abiertos recientemente en otra ventana")
- (number-of-open-recent-items "Número de elementos recientes")
- (switch-anyway "Cambia de archivo de cualquier forma")
-
- (stepper-program-has-changed "ADVERTENCIA: El programa ha cambiado.")
- (stepper-program-window-closed "ADVERTENCIA: La ventana del programa ha desaparecido.")
-
- (stepper-name "Stepper")
- (stepper-language-level-message
-  "El nivel del lenguaje es \"~a\".  Actualmente el Stepper funciona para los niveles \"~a\" al \"~a\".")
- (stepper-button-label "Paso")
- (stepper-previous-application "Aplicación")
- (stepper-previous "Paso")
- (stepper-next "Paso")
- (stepper-next-application "Aplicación")
- (stepper-jump-to-beginning "Hogar")
- 
- (dialog-back "Atrás")
- 
- ;; warnings about closing a drscheme frame when the program
- ;; might still be doing something interesting
- (program-is-still-running "El programa en la ventana de definiciones sigue corriendo.  ¿Cerrar de cualquier forma?")
- (program-has-open-windows "El programa en la ventana de definiciones abrió otras ventanas.  ¿Cerrar esta ventana de cualquier forma?")
-
- ;; ml-command-line-arguments is for the command line arguments
- ;; label in the module language details in the language dialog.
- (ml-command-line-arguments "Argumentos en la línea de comandos como un vector de cadenas, en leer sintaxis")
- 
- ;; ml-cp names are all for the module language collection path
- ;; configuration. See the details portion of the language dialog
- ;; for the module language (at the bottom).
- (ml-cp-default-collection-path "<<rutas de colección por omisión>>")
-
- ;; in std get-directory 
- (ml-cp-choose-a-collection-path "Por favor selecciona una ruta de colecciones")
-
- ;; err msg when adding default twice
- (ml-cp-default-already-present "La ruta de colecciones por omisión ya está presente")
- 
- ;; title of this section of the dialog (possibly the word
- ;; `Collection' should not be translated)
- (ml-cp-collection-paths "Rutas de colecciones")
-
- ;; button labels
- (ml-cp-add "Añadir")
- (ml-cp-add-default "Añadir por omisión")
- (ml-cp-remove "Eliminar")
- (ml-cp-raise "Elevar")
- (ml-cp-lower "Bajar")
-
- ;; Profj
- (profj-java "Java")
- (profj-java-mode "Modo Java")
- (profj-java-mode-color-keyword "llave")
- (profj-java-mode-color-string "cadena")
- (profj-java-mode-color-literal "literal")
- (profj-java-mode-color-comment "comentario")
- (profj-java-mode-color-error "error")
- (profj-java-mode-color-identifier "identificador")
- (profj-java-mode-color-default "por omisión")
-
- (profj-insert-java-comment-box "Insertar Caja para Comentarios Java")
- (profj-insert-java-interactions-box "Insertar Caja de Interacciones Java")
-
- 
- ;; The Test Suite Tool
- ;; Errors
- (test-case-empty-error "Caso de prueba vacío")
- (test-case-too-many-expressions-error "Demasiadas expresiones en el caso de prueba.")
- ;; DrRacket window menu items
- (test-case-insert "Insertar Caso de Prueba")
- (test-case-disable-all "Deshabilitar todos los Casos de Prueba")
- (test-case-enable-all "Habilitar todos los Casos de Prueba")
- ;; NOTE: The following three string constants are labels of the test-case fields. The width
- ;;       of the field is determined by the length of the longest of the following three words.
- ;;       if the words are too long the test case will take up too much horizontal room and
- ;;       not look very good.
- ;; This string is the label of the expression that is being tested in a test case.
- (test-case-to-test "Por probar")
- ;; This string is the label of the expression that is the expected value of the to-test expression.
- (test-case-expected "Esperado")
- ;; This string is the label of the actual result of the to test expression.
- (test-case-actual "Obtenido")
- (test-case-predicate "Predicado")
- (test-case-should-raise "Debe provocar") ;; should raise?
- ;; The label of a field of the test-case that describes the expected error message of a test case
- (test-case-error-message "Mensaje de Error")
-
- (test-case-menu-title "Caso de prueba")
- (test-case-switch-to-error-box "Cambiar a caja de prueba de error")
- (test-case-switch-to-nonerror-box "Cambiar a caja de prueba sin-error")
- (test-case-collapse "Colapsar el caso de prueba")
- (test-case-show-actual "Mostrar valor actual")
- (test-case-enable "Activar caso de prueba")
- (test-case-show-predicate "Mostrar predicado")
- (test-case-show-error-message "Mostrar mensaje de error")
- (test-case-convert-to-text "Convertir a texto")
-
-  ;; Profj Boxes
- (profjBoxes-empty-error "Interacción vacía")
- (profjBoxes-too-many-expressions-error "Demasiadas expresiones en una caja")
- (profjBoxes-interactions-label "Interacciones")
- (profjBoxes-bad-java-id-error "Java ID mal formado")
- (profjBoxes-examples-label "Ejemplos")
- (profjBoxes-add-new-example-button "Añadir nuevo ejemplo")
- (profjBoxes-type "Tipo")
- ;; The Java identifier of an example of data
- (profjBoxes-name "Nombre")
- (profjBoxes-value "Valor")
- (profjBoxes-insert-java-examples "Insertar Ejemplos de Java")
- (profjBoxes-insert-java-interactions "Insertar Interacciones Java")
-
- ;; Slideshow
- (slideshow-hide-picts "Mostrar Cajas Anidadas")
- (slideshow-show-picts "Mostrar Imágenes")
- (slideshow-cannot-show-picts "No puedo mostrar imágenes; ejecuta el programa para capturar primero sus tamaños")
- (slideshow-insert-pict-box "Insertar Caja de Imagen") 
-
- 
- ;; GUI Tool
- (gui-tool-heading "Herramienta IGU")
- (gui-tool-before-clicking-message "Antes de seleccionar un ícono de herramienta, utiliza \"Insertar IGU\" del menú \"Especial\" para insertar un elemento raíz IGU, o bien selecciona un IGU previamente insertado.")
- (gui-tool-show-gui-toolbar "Mostrar la barra de herramientas IGU")
- (gui-tool-hide-gui-toolbar "Esconder la barra de herramientas IGU")
- (gui-tool-insert-gui "Insertar IGU")
- 
- )
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/string-constant-lang.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/string-constant-lang.rkt
deleted file mode 100644
index 9d57e8ee7f..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/string-constant-lang.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-
-(provide (rename-out [-#%module-begin #%module-begin])
-         #%datum
-         #%top-interaction)
-
-(define-syntax (-#%module-begin stx)
-  (syntax-case stx ()
-    [(_ (name strs ...) ...)
-     (and (andmap identifier? (syntax->list (syntax (name ...))))
-          (andmap (λ (x) (not (null? (syntax-e x)))) (syntax->list #'((strs ...) ...)))
-          (andmap (λ (x) (string? (syntax-e x))) (syntax->list (syntax (strs ... ...)))))
-     (let ([expln
-            (string-append
-             " (multi-line string constants must be broken on spaces"
-             " and the space must start at the beginning of the"
-             " (non-first) string constant")])
-       (for ([strs-stx (in-list (syntax->list #'((strs ...) ...)))])
-         (define strs (syntax->list strs-stx))
-         (for ([this-str (in-list strs)]
-               [next-str (in-list (cdr strs))])
-           (unless (regexp-match #rx"^ " (syntax-e next-str))
-             (raise-syntax-error 'string-constant-lang 
-                                 (string-append
-                                  "expected a string that begins with a space"
-                                  expln)
-                                 stx
-                                 next-str))
-           (when (regexp-match #rx" $" (syntax-e this-str))
-             (raise-syntax-error 'string-constant-lang 
-                                 (string-append
-                                  "expected a string that does not end with a space"
-                                  expln)
-                                 stx
-                                 this-str))))
-       (with-syntax ([string-constants (datum->syntax stx 'string-constants)])
-         (syntax
-          (#%plain-module-begin
-           (provide string-constants)
-           (define string-constants
-             (make-hash (list (cons 'name (string-append strs ...)) ...)))))))]
-    [(_ prs ...)
-     (for ([pr-stx (in-list (syntax->list (syntax (prs ...))))])
-       (let ([pr (syntax->datum pr-stx)])
-         (unless (and (list? pr) 
-                      (<= 2 (length pr))
-                      (symbol? (car pr))
-                      (andmap string? (cdr pr)))
-           (raise-syntax-error 'string-constant-lang "bad string constant" stx pr-stx))))]))
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/traditional-chinese-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/traditional-chinese-string-constants.rkt
deleted file mode 100644
index afb5f773eb..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/traditional-chinese-string-constants.rkt
+++ /dev/null
@@ -1,1581 +0,0 @@
-;; Computer converted from Simplified-Chineses string constants by Chongkai Zhu
-(module traditional-chinese-string-constants "string-constant-lang.rkt"
-  (is-this-your-native-language "中文是你的母語嗎？")
-  
-  (are-you-sure-you-want-to-switch-languages
-   "為了改變界面語言，現在需要重新啟動DrRacket。你確定嗎？")
-  
-  (interact-with-drscheme-in-language "使用繁體中文作DrRacket界面語言")
-  
-  ;; these two should probably be the same in all languages excepet English.
-  ;; they are the button labels (under macos and windows, respectively)
-  ;; that go the with the string above.
-  (accept-and-quit "接受並退出")
-  (accept-and-exit "接受並退出")
-  
-  ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
-  (plt "PLT")
-  (drscheme "DrRacket")
-  (drracket "DrRacket")
-  
-  (ok "確定")
-  (cancel "取消")
-  (abort "中止")
-  (untitled "未命名")
-  (untitled-n "未命名~a")
-  (warning "警告")
-  (error "錯誤")
-  (close "關閉") ;; as in, close an open window. must match close-menu-item
-  ;; in the sense that, when the &s have been stripped from
-  ;; close-menu-item, it must be the same string as this.
-  (close-window "關閉視窗")
-  (stop "停止")
-  (&stop "停止(&S)") ;; for use in button and menu item labels, with short cut.
-  (are-you-sure-delete? "確定要刪除~a嗎？") ;; ~a is a filename or directory name
-  (are-you-sure-replace? "確定要替換~a嗎？") ;; ~a is a filename or directory name
-  (ignore "忽略")
-  (revert "還原")
-  
-  ;; label for a generic check box, often supported on dialogs
-  ;; that ask a binary choice of the user. If checked, the
-  ;; dialog isn't going to be shown again.
-  ;; One version for always using the current choice:
-  (dont-ask-again-always-current "不再詢問（總是使用當前設置）")
-  ;; One generic version (ie, on the Quit DrRacket dialog)
-  (dont-ask-again "不再詢問")
-  
-  ;;; important urls
-  (web-materials "相關網站") ;; menu item title
-  (tool-web-sites "工具網站")   ;; menu item title
-  (plt-homepage "Racket")
-  (pbd-homepage "Program by Design")
-  
-  ;;; bug report form
-  (cancel-bug-report? "取消程序錯誤報告？")
-  (are-you-sure-cancel-bug-report?
-   "你確定要取消報告程序錯誤嗎？")
-  (do-you-want-to-discard-or-save-this-bug-report
-   "是保存還是丟棄這份程序錯誤報告?")
-  (discard "丟棄") ;; a button label for a dialog box with the above question
-  (bug-report-form "程序錯誤報告表")
-  (bug-report-field-name "姓名")
-  (bug-report-field-email "電子郵件")
-  (bug-report-field-summary "標題")
-  (bug-report-field-severity "嚴重度")
-  (bug-report-field-class "類別")
-  (bug-report-field-description "詳細描述")
-  (bug-report-field-reproduce1 "再現程序錯")
-  (bug-report-field-reproduce2 "誤的步驟")
-  (bug-report-field-environment "環境")
-  (bug-report-field-docs-installed "已安裝文檔")
-  (bug-report-field-collections "Collections")
-  (bug-report-field-human-language "自然語言")
-  (bug-report-field-memory-use "內存使用")
-  (bug-report-field-version "版本")
-  (bug-report-synthesized-information "綜合信息")  ;; dialog title
-  (bug-report-show-synthesized-info "顯示綜合信息")
-  (bug-report-submit "提交")
-  (close-and-save-bug-report "保存並關閉(&&)") ;; button in bug report dialog, next to cancel and bug-report-submit
-  (bug-report-submit-menu-item "提交程序錯誤報告…");; same as above, but used when there are saved bug reports
-  (saved-bug-reports-menu-item "保存程序錯誤報告") ;; in Help Menu, submenu title
-  (disacard-all-saved-bug-reports "丟棄全部程序錯誤報告") ;; menu item: only shows up when there is more than one saved bug report
-  (no-saved-bug-reports "不存在程序錯誤報告") ;; an info message that shows up as a disabled menu item when no saved bug reports are around
-  (new-bug-report "新程序錯誤報告") ;; button label the user sees when there are saved bug reports, but the user asks to save another one.
-  (close-and-save "保存並關閉") ;; button on the bottom of the bug report form
-  (saved-unsubmitted-bug-reports "未提交的程序錯誤報告") 
-  ;; the above string constant is next to previous line in same dialog, followed by list of bug report subjects (as buttons)
-  (error-sending-bug-report "程序錯誤報告傳輸出錯")
-  (error-sending-bug-report-expln "在傳輸程序錯誤報告的過程中出現了錯誤。如果你能夠正常瀏覽網路，請訪問：\n\n    http://bugs.racket-lang.org/\n\n使用网页上的表单提交程序错误报告。对于由此产生的不便，我们表示抱歉。\n\n传输错误详情：\n~a")
-  (illegal-bug-report "非法的程序錯誤報告")
-  (pls-fill-in-field "請填寫\"~a\"欄目")
-  (malformed-email-address "電子郵件地址合格不正確")
-  (pls-fill-in-either-description-or-reproduce "在「詳細描述」和「再現程序錯誤的步驟」兩欄中，請至少填寫一項。")
-  
-  ;;; check syntax
-  (check-syntax "檢查語法")
-  (cs-italic "斜體")
-  (cs-bold "黑體")
-  (cs-underline "下劃線")
-  (cs-change-color "改變顏色")
-  (cs-foreground-color "前景色")
-  (cs-background-color "背景色")
-  (cs-tack/untack-arrow "附加/取消箭頭")
-  (cs-jump-to-next-bound-occurrence "跳至下一個被綁定出現")
-  (cs-jump-to-binding "跳至綁定出現")
-  (cs-jump-to-definition "跳至定義")
-  (cs-error-message "出錯信息")
-  (cs-open-file "打開~a")
-  (cs-rename-var "重命名~a")
-  (cs-rename-id "重命名標識符")
-  (cs-rename-var-to "將~a重命名為：")
-  (cs-name-duplication-error "你所選擇的新名稱~s與當前轄域內現有標識符相同。")
-  (cs-rename-anyway "強制重命名")
-  (cs-status-init "檢查語法：為用戶代碼初始化環境")
-  (cs-status-coloring-program "檢查語法：為程序著色")
-  (cs-status-eval-compile-time "檢查語法：編譯程序")
-  (cs-status-expanding-expression "檢查語法：展開表達式")
-  (cs-status-loading-docs-index "檢查語法：載入文檔索引")
-  (cs-mouse-over-import "綁定~s由~s導入")  
-  (cs-view-docs "察看~a的文檔")
-  (cs-view-docs-from "~a（來自~a）")  ;; a completed version of the line above
-  ;; (cs-view-docs) is put into the first ~a and a list of modules (separated by commas) 
-  ;; is put into the second ~a. Use check syntax and right-click on a documented variable (eg, 'require') to see this in use
-  
-  (cs-lexical-variable "詞法變數")
-  (cs-set!d-variable "set!過的變數")
-  (cs-imported-variable "導入的變數")
-  (cs-unused-require "無用的require")
-  (cs-free-variable "自由變數")
-  
-  (cs-binder-count "~a次綁定出現")
-  (cs-zero-varrefs "沒有綁定出現")
-  (cs-one-varref "1次被綁定出現")
-  (cs-n-varrefs "~a次被綁定出現") ;; expected to have one ~a formatter that will accept a number
-  
-  (cs-contract-my-obligation "Contract：本module的義務")
-  (cs-contract-their-obligation "Contract：客戶module的義務")
-  (cs-contract-both-obligation "Contract：本module和客戶module的共同義務")
-  (cs-contract-unk-obligation "Contract：義務未知")
-  
-  
-  ;; mode sub-menu in the "view" menu
-  (cs-check-syntax-mode "檢查語法模式")
-  (cs-mode-menu-show-my-obligations "我的Contract義務")
-  (cs-mode-menu-show-client-obligations "客戶的Contract義務")
-  (cs-mode-menu-show-syntax "語法範疇")
-  
-  ;; the documentation blue boxes in the upper-right corner of the drracket window
-  (sc-read-more... "閱讀更多…")
-  (sc-f2-to-un/lock "f2（解除）鎖定")
-  
-  ;; the online check syntax status messages (mouse over the bottom right of drracket's window to see the messages during online expansion's various phases)
-  (online-expansion-running "語法檢查後台運行中")
-  (online-expansion-only-raw-text-files-supported "僅支持純文本文件")
-  (online-expansion-abnormal-termination "語法檢查後台異常退出")
-  (online-expansion-finished-successfully "語法檢查後台成功運行")
-  
-  (jump-to-error "跳至錯誤")
-  (online-expansion-is-disabled "語法檢查後台運行被禁用")
-  ; these next two show up in the bar along the bottom of the drracket window
-  (online-expansion-pending "語法檢查後台運行……")
-  (online-expansion-finished "後台語法檢查完成") ;; note: there may still be errors in this case
-  ; the next two show up in a menu when you click on the circle in the bottom right corner
-  (disable-online-expansion "禁用後台語法檢查")
-  (enable-online-expansion "啟用後台語法檢查")
-  ;; the online expansion preferences pane
-  (online-expansion "後台語法檢查") ;; title of prefs pane
-  ; the different kinds of errors
-  (online-expansion-show-read-errors-as "顯示read錯誤")
-  (online-expansion-show-variable-errors-as "顯示未綁定變數")
-  (online-expansion-show-other-errors-as "顯示其他錯誤")
-  ; locations the errors can be shown
-  (online-expansion-error-gold-highlight "使用高亮突出")
-  (online-expansion-error-margin "在一側顯示")
-  ; the label of a preference in the (string-constant online-expansion) section
-  (show-arrows-on-mouseover "滑鼠懸停時顯示綁定及尾位置箭頭")
-  ;;; info bar at botttom of drscheme frame
-  (collect-button-label "垃圾收集")
-  (read-only "只讀")
-  (auto-extend-selection "自動延長")
-  (overwrite "覆蓋")
-  (running "運行中")
-  (not-running "靜止中")
-  
-  ;;; misc
-  (welcome-to-something "歡迎來到~a")
-  
-  ; this appears in the drscheme about box.
-  (welcome-to-drscheme-version/language "歡迎使用DrRacket，版本~a，~a")
-  
-  ; these appear on subsequent lines in the `Help|Welcome to DrRacket' dialog.
-  (welcome-to-drscheme "歡迎使用DrRacket")
-  
-  (goto-line "跳至行號")
-  (goto-line-invalid-number
-   "~a不是合法的行號。必須提供一個在1和~a之間的數字")
-  (goto-position "跳至位置")
-  (no-full-name-since-not-saved
-   "當前文件還沒有被命名，因為從來沒有對它進行保存。")
-  (cannot-open-because-dne "無法打開~a，文件不存在。")
-  
-  (needs-execute-language-changed
-   "警告：語言改變了。請單擊「運行」。")
-  (needs-execute-teachpack-changed
-   "警告：教學包改變了。請單擊「運行」。")
-  (needs-execute-defns-edited
-   "警告：定義視窗改變了。請單擊「運行」。")
-  
-  (editor-changed-since-srcloc-recorded
-   "編輯器在記錄原始位置之後被改動過，故高亮區域不一定準確反映源碼")
-  
-  (file-is-not-saved "文件\"~a\"還沒有保存過")
-  (save "保存")
-  (close-anyway "強制關閉")
-  (dont-save "不保存")
-  (clear-anyway "強制清空")
-  
-  ;; menu item title
-  (log-definitions-and-interactions "記錄定義和交互的日誌…")
-  (stop-logging "不再記錄日誌")
-  (please-choose-a-log-directory "請選擇日誌目錄")
-  (logging-to "記錄日誌到：")
-  (erase-log-directory-contents "刪除日誌目錄~a中的內容？")
-  (error-erasing-log-directory "刪除日誌出錯。\n\n~a\n")
-  
-  ;; menu items connected to the logger -- also in a button in the planet status line in the drs frame
-  (show-log "顯示日誌(&L)")
-  (hide-log "隱藏日誌(&L)")
-  (logger-scroll-on-output "跟隨輸出") ; a checkbox in the logger pane
-  (log-messages "日誌信息") ;; label for the drracket logging gui panel
-  
-  
-  ;; modes
-  (mode-submenu-label "模式")
-  (scheme-mode "Scheme模式")
-  (racket-mode "Racket模式")
-  (text-mode "文本模式")
-  
-  (scheme-mode-color-symbol "符號")
-  (scheme-mode-color-keyword "關鍵詞")
-  (scheme-mode-color-comment "注釋")
-  (scheme-mode-color-string "字元串")
-  (scheme-mode-color-constant "常量")
-  (scheme-mode-color-parenthesis "括號")
-  (scheme-mode-color-hash-colon-keyword "#:關鍵詞")
-  (scheme-mode-color-error "錯誤")
-  (scheme-mode-color-other "其他")
-  ;; the ~a is filled in with one of the above (scheme-mode-*)
-  (syntax-coloring-choose-color "為~a選擇顏色")
-  (preferences-colors "顏色") ;; used in the preferences dialog
-  
-  ;; parenthesis color scheme string constants
-  (parenthesis-color-scheme "括號色彩調配") ;; label for the choice% menu in the preferences dialog
-  (paren-color-basic-grey "單一灰色")
-  (paren-color-shades-of-gray "漸變灰色")
-  (paren-color-shades-of-blue "漸變藍色")
-  (paren-color-spring "春")
-  (paren-color-fall "秋")
-  (paren-color-winter "冬")
-  
-  
-  (url: "URL：")
-  (open-url... "打開URL…")
-  (open-url "打開URL")
-  (browse... "瀏覽…")
-  (bad-url "錯誤的URL")
-  (bad-url:this "錯誤的URL：~a")
-  
-  ;; Help Desk
-  (help "幫助")
-  (racket-documentation "Racket文檔")
-  (help-desk "幫助台")
-  (plt:hd:search "搜索")
-  (plt:hd:feeling-lucky "手氣不錯")
-  (plt:hd:home "幫助台首頁") 
-  ; next 3 are popup menu choices in help desk search frame
-  (plt:hd:search-for-keyword "關鍵詞")
-  (plt:hd:search-for-keyword-or-index "關鍵詞或索引")
-  (plt:hd:search-for-keyword-or-index-or-text "關鍵詞、索引或普通文本")
-  (plt:hd:exact-match "精確匹配")
-  (plt:hd:containing-match "包含")
-  (plt:hd:regexp-match "正則表達式匹配")
-  (plt:hd:find-docs-for "搜索文檔：")
-  (plt:hd:search-stopped-too-many-matches "[搜索中斷：過多匹配結果]")
-  (plt:hd:nothing-found-for "找不到任何關於~a的信息")
-  (plt:hd:and "並且")
-  (plt:hd:refresh "更新")
-  (plt:hd:refresh-all-manuals "更新所有手冊")
-  (plt:hd:manual-installed-date "（~a已安裝）")
-  ; Help Desk configuration
-  ;; refreshing manuals
-  (plt:hd:refreshing-manuals "重新下載手冊")
-  (plt:hd:refresh-downloading... "下載~a…")
-  (plt:hd:refresh-deleting... "刪除舊版本的~a…")
-  (plt:hd:refresh-installing... "安裝新版本的~a…")
-  (plt:hd:refresh-clearing-indices "清除緩存中的索引")
-  (plt:hd:refreshing-manuals-finished "完成。")
-  (plt:hd:about-help-desk "關於幫助台")
-  (plt:hd:help-desk-about-string
-   "幫助台是Racket軟體的完整信息來源。\n\n版本~a\n版權所有（c）~a—~a PLT")
-  (plt:hd:help-on-help "關於幫助的幫助")
-  (plt:hd:help-on-help-details
-   "關於使用幫助台的幫助，請參見幫助台首頁中的第一個連結『幫助台』。（要進入幫助台的首頁，請單擊幫助台視窗上方的『首頁』按鈕。）")
-  (reload "刷新") ;; refresh the page in a web browser
-  (plt:hd:ask-about-separate-browser
-   "你選擇了一個指向全球資訊網的連結。請問您是要在幫助台中打開該頁面，還是想使用瀏覽器程序瀏覽網頁？")
-  (plt:hd:homebrew-browser "幫助台瀏覽器") ;; choice for the above string (in a button)
-  (plt:hd:separate-browser "網路瀏覽器") ;; other choice for the above string (also in a button)
-  (plt:hd:external-link-in-help "在幫助台中顯示外部URL")
-  (plt:hd:use-homebrew-browser "對於外部URL，使用幫助台瀏覽")
-  (plt:hd:new-help-desk "新幫助台")
-  
-  ;; in the Help Desk language dialog, title on the right.
-  (plt:hd:manual-search-ordering "搜索手冊的順序")
-  
-  ;; in the help-desk standalone font preference dialog, on a check box
-  (use-drscheme-font-size "使用和DrRacket相同的字體大小")
-  
-  ;; in the preferences dialog in drscheme there is example text for help desk font size.
-  ;; clicking the links in that text produces a dialog with this message
-  (help-desk-this-is-just-example-text
-   "這裡顯示的只是示例字體大小的文字。要察看這些連結，請通過幫助菜單打開真正的幫助台。")
-  
-  ;; this appears in the bottom part of the frame the first time the user hits `f1' 
-  ;; (assuming nothing else has loaded the documentation index first)
-  ;; see also: cs-status-loading-docs-index
-  (help-desk-loading-documentation-index "幫助台：正在讀入文檔索引")
-  
-  ;; Help desk htty proxy
-  (http-proxy "HTTP代理")
-  (proxy-direct-connection "直接連接")
-  (proxy-use-proxy "使用代理伺服器：")
-  (proxy-host "地址")
-  (proxy-port "埠")
-  (proxy-bad-host "無效代理伺服器")
-  
-  ;; browser
-  (rewind-in-browser-history "後退")
-  (forward-in-browser-history "前進")
-  (home "主頁")
-  (browser "瀏覽器")
-  (external-browser-choice-title "外部瀏覽器") ; title for radio-button set
-  (browser-command-line-label "命令行：") ; label for radio button that is followed by text boxes
-  (choose-browser "選擇瀏覽器")
-  (no-browser "以後再詢問")
-  (browser-cmdline-expl-line-1 "（命令行由前綴文字，URL和後綴文字") ; explanatory text for dialog, line 1
-  (browser-cmdline-expl-line-2 "連接而成，中間不含任何空格）") ; ... line 2. (Anyone need more lines?)
-  (install? "安裝？")  ;; if a .plt file is found (title of dialog)
-  (you-have-selected-an-installable-package "你選擇了一個可以安裝的軟體包。")
-  (do-you-want-to-install-it? "是否安裝？")
-  (paren-file-size "（該文件的長度是~a位元組）")
-  (download-and-install "下載並安裝(&&)") ;; button label
-  (download "下載") ;; button label
-  (save-downloaded-file/size "下載文件(~a位元組)並保存為") ;; label for get-file dialog
-  (save-downloaded-file "下載文件並保存為")  ;; label for get-file dialog
-  (downloading "下載中") ;; dialog title
-  (downloading-file... "下載文件中……")
-  (package-was-installed "安裝已完成。")
-  (download-was-saved "文件已保存。")
-  
-  (install-plt-file-menu-item... "安裝.plt文件…")
-  (install-plt-file-dialog-title "安裝.plt文件")
-  (install-plt-web-tab "網路")
-  (install-plt-file-tab "文件")
-  (install-plt-filename "文件名：")
-  (install-plt-url "URL：")
-  (install-plt-error-header "檢查下載的.plt文件時出錯。請檢查URL並重試。")
-  
-  ;; install plt file when opened in drscheme strings
-  (install-plt-file "安裝~a，還是打開以供編輯？")
-  (install-plt-file/yes "安裝")
-  (install-plt-file/no "編輯")
-  
-  (plt-installer-progress-window-title "安裝進度") ;; frame title
-  (plt-installer-abort-installation "取消安裝") ;; button label
-  (plt-installer-aborted "安裝中止。") ;; msg that appears in the installation window when installation is aborted
-  
-  ;;; about box
-  (about-drscheme-frame-title "關於DrRacket")
-  
-  ;;; save file in particular format prompting.
-  (save-as-plain-text "保存本文件為純文本？")
-  (save-in-drs-format "保存本文件為drscheme（非純文本）格式？")
-  (yes "是")
-  (no "否")
-  
-  ;; saving image (right click on an image to see the text)
-  (save-image "保存圖片…")
-  
-  ;;; preferences
-  (preferences "首選項")
-  (error-saving-preferences "保存首選項時出錯：~a")
-  (error-saving-preferences-title "保存首選項時出錯")
-  (steal-the-lock-and-retry "取消鎖定並重試(&&)") ;; in the preferences error dialog; this happens when the lockfile exists (after 3 pref writes).
-  
-  (error-reading-preferences "讀取首選項時出錯")
-  (error-reading-preferences-explanation "首選項文件被鎖定，故~a選項無法讀取")
-  ;; in the above, ~a is filled with the name of the preference (a symbol)
-  (dont-ask-again-until-drracket-restarted "不再詢問（直到DrRacket關閉）")
-  ; difference between the above and below is one comes with a question (steal the lock or not) and the other with just a notation saying "the file is locked"
-  (dont-notify-again-until-drracket-restarted "不再通知（直到DrRacket關閉）") 
-  (prefs-file-locked "存儲首選項的文件被鎖定了（由於文件~a的存在），所以這些改動無法被保存。放棄修改？")
-  (try-again "重試") ;; button label
-  (give-up-and-use-the-default "放棄並使用默認值") ;; button label
-  
-  (prefs-file-still-locked "存儲首選項的文件仍然被鎖定（由於文件~a的存在）, 所以這些改動將不會被保存。")
-  (prefs-file-locked-nothing-doing
-   "首選項文件友~s鎖定，故修改不會被保存。")
-  ;; the  ~s is filled with the lockfile; this string is (currently) used only on windows where lockfiles are less friendly (and there is no steal fallback)
-  
-  (scheme-prefs-panel-label "Racket")
-  (warnings-prefs-panel-label "警告")
-  (editor-prefs-panel-label "編輯")
-  (general-prefs-panel-label "常規")
-  (highlight-parens "加亮顯示匹配的括號")
-  (fixup-open-brackets "自動調整開中括號")
-  (fixup-close-parens "自動調整閉括號")
-  (flash-paren-match "高亮顯示括號匹配")
-  (auto-save-files "自動保存文件")
-  (backup-files "保存備份文件")
-  (map-delete-to-backspace "將delete轉換成backspace")
-  (verify-exit "退出時確認")
-  (ask-before-changing-format "改變保存方式時確認")
-  (wrap-words-in-editor-buffers "在編輯器中自動換行")
-  (show-status-line "顯示狀態欄")
-  (count-columns-from-one "從一開始計算行號")
-  (display-line-numbers "在編輯器中顯示行號")
-  (show-line-and-column-numbers "顯示行號和列號(&&)") ; used for popup menu; right click on line/column box in bottom of drs window
-  (show-character-offsets "顯示字元在文件中的位置") ; used for popup menu; right click on line/column box in bottom of drs window
-  (enable-keybindings-in-menus "允許使用菜單中的快捷鍵")
-  (printing-mode "列印模式")
-  (print-using-platform-specific-mode "平台特定的列印")
-  (print-to-ps "列印至PostScript文件")
-  (print-to-pdf "列印至PDF文件")
-  (command-as-meta "將command鍵當作meta") ;; macos/macos x only
-  (reuse-existing-frames "在打開新文件時，使用現有的視窗")
-  (default-fonts "默認字體")
-  (paren-match-color "高亮顯示括號所使用的顏色") ; in prefs dialog
-  (online-coloring-active "實時根據語法用顏色標記程序")
-  (open-files-in-tabs "在不同的標籤下打開多個文件（不使用多個視窗）")
-  (show-interactions-on-execute "在運行程序時自動打開交互視窗")
-  (switch-to-module-language-automatically "打開module文件時自動切換至module語言")
-  (interactions-beside-definitions "將定義視窗和交互視窗左右放置") ;; in preferences, below the checkbox one line above this one
-  (show-line-numbers "顯示行號")
-  (show-line-numbers/menu "顯示行號(&N)")  ;; just like the above, but capitalized for appearance in a menu item
-  (hide-line-numbers/menu "隱藏行號(&N)")
-  (show-line-numbers-in-definitions "在定義視窗中顯示全部行號")
-  ;; the constant above shows up in the popup menu item in the bottom of
-  ;; the drracket window; controls the line numbers on each line in the definitions; used in a checkable menu item
-  (limit-interactions-size "限制交互視窗的大小")
-  (background-color "背景顏色")
-  (default-text-color "默認顏色") ;; used for configuring colors, but doesn't need the word "color"
-  (choose-a-background-color "請選擇背景顏色")
-  (revert-to-defaults "恢復默認")
-  (undo-changes "不做修改並退出") ;; used in the preferences dialog to undo preference changes
-  
-  (black-on-white-color-scheme "白底黑字") ;; these two appear in the color preferences dialog on butttons
-  (white-on-black-color-scheme "黑底白字") ;; clicking the buttons changes the color schemes to some defaults that've been set up.
-  
-  (add-spacing-between-lines "在行間額外填充一個像素")
-  
-  ; title of the color choosing dialog
-  
-  ; should have entire alphabet
-  (font-example-string "繁體中文 by 朱崇愷")
-  
-  (change-font-button-label "更改")
-  (fonts "字體")
-  (other... "其他…") ;; used in the font choice menu item
-  
-  ; filled with type of font, eg modern, swiss, etc.
-  (choose-a-new-font "請選擇新的「~a」字體")
-  
-  (font-size-slider-label "字型大小")
-  (restart-to-see-font-changes "重新啟動，使修改生效")
-  
-  (font-prefs-panel-title "字體")
-  (font-name "字體名稱")
-  (font-size "字體大小")
-  (set-font "設置字體…")
-  (font-smoothing-label  "字體平滑度")
-  (font-smoothing-none "無")
-  (font-smoothing-some "部分")
-  (font-smoothing-all "全部")
-  (font-smoothing-default "使用系統默認值")
-  (select-font-name "選擇字體")
-  (example-text "示例文本：")
-  (only-warn-once "當定義視窗和交互視窗不同步時，僅警告一次")
-  
-  ; warning message when lockfile is around
-  (waiting-for-pref-lock "等待首選項設置文件解鎖……")
-  (pref-lock-not-gone
-   "首選項設置文件被\n\n~a\n\n鎖定。請確定沒有其他Racket軟體正在運行中，然後刪除該鎖定文件。")
-  (still-locked-exit-anyway? "首選項無法保存。仍然退出？")
-  
-  ;;; indenting preferences panel
-  (indenting-prefs-panel-label "縮進")
-  (indenting-prefs-extra-regexp "額外的正則表達式")
-  
-  (square-bracket-prefs-panel-label "中括號")
-  
-  ; filled with define, lambda, or begin
-  (enter-new-keyword "請輸入一個類似於~a的關鍵詞：")
-  (x-keyword "~a關鍵詞")
-  (x-like-keywords "~a類型的關鍵詞")
-  
-  ; used in Square bracket panel
-  (skip-subexpressions "出現在中括號前的表達式數量")
-  
-  (expected-a-symbol "需要symbol，實得：~a")
-  (already-used-keyword "「~a」已經是縮進關鍵詞了")
-  (add-keyword "添加")
-  (remove-keyword "刪除")
-  
-  ; repl color preferences
-  (repl-colors "REPL")
-  (repl-out-color "輸出")
-  (repl-value-color "值")
-  (repl-error-color "錯誤")
-  
-  ;;; find/replace
-  (search-next "下一個")
-  (search-previous "上一個")
-  (search-match "匹配")  ;;; this one and the next one are singular/plural variants of each other
-  (search-matches "匹配")
-  (search-replace "替換")
-  (search-skip "跳過")
-  (search-show-replace "顯示替換")
-  (search-hide-replace "隱藏替換")
-  (find-case-sensitive "大小寫敏感")  ;; the check box in both the docked & undocked search
-  (find-anchor-based "用錨進行搜索")
-  
-  ;; these string constants used to be used by searching,
-  ;; but aren't anymore. They are still used by other tools, tho.
-  (hide "隱藏")
-  (dock "停靠")
-  (undock "取消停靠")
-  
-  ;;; multi-file-search
-  (mfs-multi-file-search-menu-item "在文件中查找(&F)…")
-  (mfs-string-match/graphics "字元串匹配（可用與包含圖像的文件）")
-  (mfs-regexp-match/no-graphics "正則表達式匹配（只適用於純文本文件）")
-  (mfs-searching... "查找…")
-  (mfs-configure-search "查找設置") ;; dialog title
-  (mfs-files-section "文件")   ;; section in config dialog
-  (mfs-search-section "查找") ;; section in config dialog
-  (mfs-dir "目錄")
-  (mfs-recur-over-subdirectories "包含子目錄")
-  (mfs-regexp-filename-filter "文件名篩選（正則表達式）")
-  (mfs-search-string "查找字元串")
-  (mfs-drscheme-multi-file-search "多文件查找——DrRacket") ;; results window and error message title
-  (mfs-not-a-dir "「~a」不是目錄")
-  (mfs-open-file "打開文件")
-  (mfs-stop-search "停止查找")
-  (mfs-case-sensitive-label "大小寫敏感")
-  (mfs-no-matches-found "沒有找到匹配結果。")
-  (mfs-search-interrupted "查找中止。")
-  (mfs-drscheme-multi-file-search-title "多文件查找「~a」——DrRacket") ;; the ~a format specifier is filled in with the search string
-  
-  ;;; reverting a file
-  (are-you-sure-revert
-   "你確定要復原該文件嗎？這一操作無法撤銷。")
-  (are-you-sure-revert-title
-   "復原？")
-  
-  ;;; saving a file
-  ; ~a is filled with the filename
-  (error-saving "保存出錯") ;; title of error message dialog
-  (error-saving-file/name "在保存文件~a時出現錯誤。")
-  (error-loading "讀取出錯")
-  (error-loading-file/name "在讀取~a時出現錯誤.")
-  (unknown-filename "《未知》")
-  
-  ;;; finder dialog
-  (must-specify-a-filename "你必須指定文件名")
-  (file-does-not-exist "文件「~a」不存在。")
-  (ask-because-file-exists "文件「~a」已存在。是否替換？")
-  (dne-or-cycle "文件「~a」中包含不存在的目錄或循環")
-  (get-file "獲取文件")
-  (put-file "放置文件")
-  (full-pathname "完整路徑")
-  (show-dot-files "由點號開始顯示文件名和目錄名。")
-  (up-directory-button-label "上層目錄")
-  (add-button-label "添加") ;;; for multi-file selection
-  (add-all-button-label "全部添加") ;;; for multi-file selection
-  (remove-button-label "移除") ;;; for multi-file selection
-  (file-wrong-form "該文件名格式不正確")
-  (select-files "選擇文件")
-  (select-file "選擇文件")
-  (dir-dne "該目錄不存在。")
-  (file-dne "該文件不存在。")
-  (empty-filename "文件名中必須包含文字。")
-  (that-is-dir-name "這是一個目錄名。")
-  
-  ;;; raw menu names -- these must match the 
-  ;;; versions below, once the &s have been stripped.
-  ;;; if they don't, DrRacket's menus will appear
-  ;;; in the wrong order.
-  (file-menu "文件")
-  (edit-menu "編輯")
-  (help-menu "幫助")
-  (windows-menu "視窗")
-  (tabs-menu "標籤") ;; this is the name of the "Windows" menu under linux & windows
-  
-  ;;; menus
-  ;;; - in menu labels, the & indicates a alt-key based shortcut.
-  ;;; - sometimes, things are stuck in the middle of 
-  ;;; menu item labels. For instance, in the case of
-  ;;; the "Save As" menu, you might see: "Save Definitions As". 
-  ;;; be careful of spacing, follow the English, if possible.
-  ;;; - the ellipses in the `after' strings indicates that
-  ;;; more information is required from the user before completing
-  ;;; the command.
-  
-  (file-menu-label "文件(&F)")
-  
-  (new-info  "打開新文件")
-  (new-menu-item "新建(&N)")
-  (new-...-menu-item "新建(&N)…")
-  
-  (open-info "打開現有文件")
-  (open-menu-item "打開(&O)…")
-  
-  (open-recent-info "最近使用過文件的列表")
-  (open-recent-menu-item "最近使用過(&T)")
-  
-  (revert-info "將當前文件恢復為磁碟上的副本")
-  (revert-menu-item "恢復(&R)")
-  
-  (save-info "保存當前文件")
-  (save-menu-item "保存(&S)")
-  
-  (save-as-info "輸入新的文件名,保存當前文件")
-  (save-as-menu-item "另存為(&A)…")
-  
-  (print-info "列印當前文件")
-  (print-menu-item "列印(&P)…")
-  
-  (page-setup-info "設置列印參數")
-  (page-setup-menu-item "頁面設置…")
-  
-  (close-info "關閉當前文件")
-  (close-menu-item "關閉(&C)")
-  (close-window-menu-item "關閉視窗(&C)")
-  
-  (quit-info "關閉所有視窗")
-  (quit-menu-item-windows "退出(&X)")
-  (quit-menu-item-others "退出(&Q)")
-  
-  (edit-menu-label "編輯(&E)")
-  
-  (undo-info "撤銷最近的操作")
-  (undo-menu-item "撤銷(&U)")
-  
-  (redo-info "取消最近的撤銷操作")
-  (redo-menu-item "重複(&R)")
-  
-  (cut-info "將當前選中的對象移入剪貼版")
-  (cut-menu-item "剪切(&T)")
-  
-  (copy-info "將當前選中的對象複製到剪貼版")
-  (copy-menu-item "複製(&C)")
-  
-  (paste-info "將剪貼版中個內容複製到當前位置")
-  (paste-menu-item "粘貼(&P)")
-  
-  (clear-info "刪除當前選中的對象")
-  (clear-menu-item-windows "刪除(&D)")
-  
-  (select-all-info "選中整個文件")
-  (select-all-menu-item "全選(&L)")
-  
-  (find-menu-item "查找") ;; menu item
-  (find-from-selection-menu-item "查找當前選中")
-  (find-info "在主視窗和查找欄之間切換游標位置")
-  
-  (find-again-info "跳至該文本的下一個出現")
-  (find-again-menu-item "查找下一個")
-  
-  (find-again-backwards-info "跳至該文本的前一個出現")
-  (find-again-backwards-menu-item "查找上一個")
-  
-  (show-replace-menu-item "顯示替換")
-  (hide-replace-menu-item "隱藏替換")
-  (show/hide-replace-info "切換替換面板的可見性")
-  
-  (replace-menu-item "替換")
-  (replace-info "替換當前圈出的查找結果")
-  
-  (replace-all-info "替換查找字元串的所有出現")
-  (replace-all-menu-item "全部替換")
-  
-  (find-case-sensitive-info "切換大小寫敏感或不敏感查找")
-  (find-case-sensitive-menu-item "大小寫敏感")
-  
-  (complete-word "自動完成") ; the complete word menu item in the edit menu
-  (no-completions "……無自動完成結果") ; shows up in the completions menu when there are no completions (in italics)
-  
-  (overwrite-mode "覆蓋模式")
-  (enable-overwrite-mode-keybindings "啟用覆蓋模式的快捷鍵")
-  
-  (enable-automatic-parens "自動關括號") ; should "and square brackets and quotes" appear here?
-  
-  (preferences-info "設置首選項")
-  (preferences-menu-item "首選項…")
-  
-  (keybindings-info "顯示當前快捷鍵")
-  (keybindings-menu-item "快捷鍵")
-  (keybindings-show-active "顯示當前的快捷鍵")
-  (keybindings-frame-title "快捷鍵")
-  (keybindings-sort-by-name "按名稱排序")
-  (keybindings-sort-by-key "按鍵名排序")
-  (keybindings-add-user-defined-keybindings "添加自定義快捷鍵…")
-  (keybindings-add-user-defined-keybindings/planet "從PLaneT添加自定義快捷鍵…")
-  (keybindings-menu-remove "移除~a")
-  (keybindings-choose-user-defined-file "請選擇一個包含快捷鍵的文件")
-  (keybindings-planet-malformed-spec "錯誤的PLaneT名稱：~a") ; the string will be what the user typed in
-  (keybindings-type-planet-spec "請輸入PLaneT包名稱（無需輸入『require』）")
-  
-  ; first ~a will be a string naming the file or planet package where the keybindings come from;
-  ; second ~a will be an error message
-  (keybindings-error-installing-file "安裝快捷鍵~a時出錯：\n\n~a")
-  
-  (user-defined-keybinding-error "快捷鍵~a出錯\n\n~a")
-  (user-defined-keybinding-malformed-file "文件~a並不是一個使用framework/keybinding-lang語言編寫的module.")
-  (user-defined-keybinding-malformed-file/found-lang
-   "文件~a並不是一個使用framework/keybinding-lang語言編寫的module，而是由~s語言編寫")
-  
-  ;; menu items in the "special" menu
-  (insert-text-box-item "插入文本框")
-  (insert-image-item "插入圖片…")
-  (insert-comment-box-menu-item-label "插入注釋框")
-  (insert-lambda "插入λ")
-  
-  (wrap-text-item "自動換行")
-  
-  (windows-menu-label "視窗(&W)")
-  (tabs-menu-label "標籤(&T)") ;; this is the name of the menu under linux & windows
-  (minimize "最小化") ;; minimize and zoom are only used under mac os x
-  (zoom "縮放")
-  (bring-frame-to-front "前端顯示")       ;;; title of dialog
-  (bring-frame-to-front... "前端顯示…") ;;; corresponding title of menu item
-  (most-recent-window "最近的視窗")
-  (next-tab "下一個標籤")
-  (prev-tab "前一個標籤")
-  ;; menu item in the windows menu under mac os x. first ~a is filled with a number between 1 and 9; second one is the filename of the tab
-  (tab-i "標籤~a：~a")
-  (tab-i/no-name "標籤~a")
-  
-  (view-menu-label "視圖(&V)")
-  (show-overview "顯示程序輪廓(&P)") 
-  (hide-overview "隱藏程序輪廓(&P)")
-  (show-module-browser "顯示&Module瀏覽器")
-  (hide-module-browser "隱藏&Module瀏覽器")
-  
-  (help-menu-label "幫助(&H)")
-  (about-info "本軟體的詳細信息以及致謝名單")
-  (about-menu-item "關於…")
-  
-  ;; open here's new menu item
-  (create-new-window-or-clear-current
-   "您是想打開一個新視窗，還是清空當前視窗？")
-  (clear-current "清空當前")
-  (new-window "新視窗")
-  
-  ;; popup menu when right-clicking in the gap between
-  ;; the definitions and interactions window
-  (change-to-vertical-alignment "左右分割")
-  (change-to-horizontal-alignment "上下分割")
-  
-  ;;; exiting and quitting ``are you sure dialog
-  ;;; exit is used on windows, quit on macos, in English. Other
-  ;;; languages probably use the same word on both platforms.
-  (exit "退出")
-  (quit "退出")
-  (are-you-sure-exit "你確定要退出嗎?")
-  (are-you-sure-quit "你確定要退出嗎?")
-  ; these next two are only used in the quit/exit dialog
-  ; on the button whose semantics is "dismiss this dialog".
-  ; they are there to provide more flexibility for translations
-  ; in English, they are just cancel.
-  (dont-exit "取消") 
-  (dont-quit "取消")
-  
-  ;;; autosaving
-  (error-autosaving "自動保存\"~a\"時出錯。") ;; ~a will be a filename
-  (autosaving-turned-off "在文件被存檔之前，自動保存不會進行")
-  (recover-autosave-files-frame-title "恢復自動保存的文件")
-  (autosave-details "詳細情況")
-  (autosave-recover "恢復")
-  (autosave-unknown-filename "《未知》")
-  
-  ;; these are labels in a dialog that drscheme displays
-  ;; if you have leftover autosave files. to see the dialog,
-  ;; start up drscheme and modify (but don't save) a file
-  ;; (also, do this with an unsaved file). Wait for the autosave
-  ;; files to appear (typically 5 minutes). Kill DrRacket
-  ;; and restart it. You'll see the dialog
-  (autosave-autosave-label: "自動保存文件：")
-  (autosave-original-label: "原始文件：")
-  (autosave-autosave-label "自動保存文件")
-  (autosave-original-label "原始文件")
-  (autosave-compare-files "比較自動保存文件")
-  
-  (autosave-show-autosave "自動保存文件") ;; title of a window showing the autosave file
-  
-  (autosave-explanation "DrRacket發現了自動保存的文件，其中可能包含你沒有保存過的程序")
-  
-  (autosave-recovered! "已恢復！") ;; status of an autosave file
-  (autosave-deleted "已刪除")       ;; status of an autosave file
-  
-  (autosave-error-deleting "刪除~a出錯\n\n~a") ;; first is a filename, second is an error message from mz.
-  (autosave-delete-button "刪除")
-  (autosave-delete-title "刪除")  ;; title of a dialog asking for deletion confirmation
-  (autosave-done "完成")
-  
-  ;; appears in the file dialog
-  (autosave-restore-to-where? "請選擇自動保存文件的位置")
-  
-  
-  ;;; file modified warning
-  (file-has-been-modified
-   "文件在上次保存之後又改動過。覆蓋這些更改？")
-  (overwrite-file-button-label "覆蓋")
-  
-  (definitions-modified 
-    "當前磁碟文件已被修改；請保存或恢復文件。")
-  (drscheme-internal-error "DrRacket內部錯誤")
-  
-  ;;; tools
-  (invalid-tool-spec "Collection ~a中info.rkt的tool定義不正確。需要一個字元串或者一個非空表，實得：~e")
-  (error-invoking-tool-title "調用tool ~s出錯；~s")
-  (error-loading-tool-title "載入tool ~s出錯\n~a") ;; ~s filled with a path, ~a filled with an error message from an exn
-  
-  (tool-tool-names-same-length
-   "在~s的info.rkt文件中，『tool-names』和『tools』應該是等長的表，實得~e和~e")
-  (tool-tool-icons-same-length
-   "在~s的info.rkt文件中，『tool-icons』和「tools』應該是等長的表，實得~e和~e")
-  (tool-tool-urls-same-length
-   "在~s的info.rkt文件中，『tool-urls』和「tools』應該是等長的表，實得~e和~e")
-  (error-getting-info-tool
-   "載入~s的info.rkt出錯")
-  (tool-error-phase1 "tool ~s第一階段出錯；~s")
-  (tool-error-phase2 "tool ~s第二階段出錯；~s")
-  
-  
-  ;;; define popup menu
-  (end-of-buffer-define "<<緩衝區結束>>")
-  (sort-by-name "按名稱排序")
-  (sort-by-position "按文件中的位置排序")
-  (no-definitions-found "<<沒有定義>>")
-  (jump-to-defn "跳至~a的定義")
-  
-  (recent-items-sort-by-age "按時間排序")
-  (recent-items-sort-by-name "按名稱排序")
-  
-  ;;; view menu
-  (hide-definitions-menu-item-label "隱藏定義(&D)")
-  (show-definitions-menu-item-label "顯示定義(&D)")
-  (definitions-menu-item-help-string "顯示/隱藏定義視窗")
-  (show-interactions-menu-item-label "顯示交互(&I)")
-  (hide-interactions-menu-item-label "隱藏交互(&I)")
-  (use-horizontal-layout "左右分割")
-  (use-vertical-layout "上下分割")
-  (interactions-menu-item-help-string "顯示/隱藏交互視窗")
-  (toolbar "工具欄")
-  (toolbar-on-top "頂置工具欄")
-  (toolbar-on-top-no-label "頂置工具欄並使用小圖標")
-  (toolbar-on-left "左置工具欄")
-  (toolbar-on-right "右置工具欄")
-  (toolbar-hidden "隱藏工具欄")
-  
-  ;;; file menu
-  (save-definitions-as "將定義另存為(&A)")
-  (save-definitions "保存定義")
-  (print-definitions "列印定義…")
-  (about-drscheme "關於DrRacket")
-  (save-other "保存其他")
-  (save-definitions-as-text "將定義保存為文本…")
-  (save-interactions "保存交互")
-  (save-interactions-as "將交互另存為…")
-  (save-interactions-as-text "將交互保存為文本…")
-  (print-interactions "列印交互…")
-  (new-tab "新建標籤")
-  (close-tab "關閉標籤") ;; must not have any &s in it.
-  (close-tab-amp "關閉標籤(&C)") ;; like close-tab, but with an ampersand on the same letter as the one in close-menu-item
-  
-  ;;; edit-menu
-  (split-menu-item-label "分屏(&S)")
-  (collapse-menu-item-label "合併(&O)")
-  (find-longest-line "尋找最長一行")
-  
-  ;;; language menu
-  (language-menu-name "語言(&L)")
-  
-  ;;; scheme-menu
-  (scheme-menu-name "Ra&cket")
-  (execute-menu-item-label "運行")
-  (execute-menu-item-help-string "重新運行定義視窗中的程序")
-  (ask-quit-menu-item-label "要求程序終止")
-  (ask-quit-menu-item-help-string "使用break-thread中止當前計算得主執行緒")
-  (force-quit-menu-item-label "強制終止")
-  (force-quit-menu-item-help-string "使用custodian-shutdown-all退出當前計算")
-  (limit-memory-menu-item-label "限制內存使用…")
-  (limit-memory-msg-1 "內存限制會在下一次運行時生效，")
-  (limit-memory-msg-2 "內存限制最低值為八兆位元組。")   (limit-memory-unlimited "無限制")
-  (limit-memory-limited "限制")
-  (limit-memory-megabytes "兆位元組(MB)")
-  ; the next two constants are used together in the limit memory dialog; they are inserted
-  ; one after another. The first one is shown in a bold font and the second is not.
-  ; (the first can be the empty string)
-  (limit-memory-warning-prefix "警告：")
-  (limit-memory-warning 
-   "不限制內存有潛在的危險。DrRacket將無法保護自己，當運行的程序分配過多內存時，DrRacket會崩潰.")
-  
-  (clear-error-highlight-menu-item-label "清除錯誤高亮顯示")
-  (clear-error-highlight-item-help-string "清除錯誤區域的粉紅色高亮顯示")
-  (jump-to-next-error-highlight-menu-item-label "跳至下一個高亮錯誤")
-  (jump-to-prev-error-highlight-menu-item-label "跳至前一個高亮錯誤")
-  (reindent-menu-item-label "調整縮進(&R)")
-  (reindent-all-menu-item-label "全文調整縮進(&A)")
-  (semicolon-comment-out-menu-item-label "用分號注釋(&C)")
-  (box-comment-out-menu-item-label "用注釋框注釋(&C)")
-  (uncomment-menu-item-label "取消注釋(&U)")
-  
-  (convert-to-semicolon-comment "轉化為分號注釋")
-  
-  ;;; executables
-  (create-executable-menu-item-label "創建可執行程序(&E)…")
-  (create-executable-title "創建可執行程序")
-  (drracket-creates-executables-only-in-some-languages
-   "在DrRacket中創建可執行程序僅支持下列語言選擇：在DrRacket語言對話框中選擇教學語言（DMdA或者HtDP）；在DrRacket語言對話框中選擇「Racket語言」，並且用#lang在文件開始處指定語言。\n\n請考慮使用命令行工具raco exe。")
-  (must-save-before-executable "在創建可執行程序之前，你必須保存源程序")
-  (save-a-mred-launcher "保存為GRacket啟動程序")
-  (save-a-mzscheme-launcher "保存為Racket啟動程序")
-  (save-a-mred-stand-alone-executable "保存為GRacket獨立可執行程序")
-  (save-a-mzscheme-stand-alone-executable "保存為Racket獨立可執行程序")
-  (save-a-mred-distribution "保存為GRacket可發布程序")
-  (save-a-mzscheme-distribution "保存為Racket可發布程序")
-  (error-creating-executable "創建可執行程序出錯：") ;; this is suffixed with an error message ala error-display-handler
-  
-  (definitions-not-saved "當前定義視窗中的程序並沒有被保存過。將使用最近保存過的版本來生成可執行程序。是否繼續？")
-  ;; The "-explanatory-label" variants are the labels used for the radio buttons in
-  ;;  the "Create Executable..." dialog for the "(module ...)" language.
-  (launcher "啟動程序")
-  (launcher-explanatory-label "啟動程序（僅在本機運行，運行原始碼）")
-  (stand-alone "獨立程序")
-  (stand-alone-explanatory-label "獨立程序（僅在本機運行，運行編譯代碼）")
-  (distribution "可發布程序")
-  (distribution-explanatory-label "可發布程序（可以在其它計算機上安裝並運行）")
-  (executable-type "類型")
-  (executable-base "基於")
-  (filename "文件名：")
-  (create "創建")
-  (please-specify-a-filename "請指定文件名。")
-  (~a-must-end-with-~a
-   "~a文件名\n\n  ~a\n\n不合法。文件名必須以\".~a\"結尾。")
-  (macosx-executables-must-end-with-app
-   "~a文件名\n\n  ~a\n\n不合法。在MacOS X中，文件名必須以.app結尾。")
-  (warning-directory-will-be-replaced
-   "警告：目錄：\n\n  ~a\n\n將會被重置。繼續操作？")
-  
-  (distribution-progress-window-title "創建進程")
-  (creating-executable-progress-status "創建可執行程序……")
-  (assembling-distribution-files-progress-status "彙編……")
-  (packing-distribution-progress-status "打包……")
-  
-  (create-servlet "創建Servlet……")
-  
-  ; the ~a is a language such as "module" or "algol60"
-  (create-servlet-unsupported-language
-   "無法為~a語言程序創建Servlet。")
-  
-  ;;; buttons
-  (execute-button-label "運行") 
-  (save-button-label "保存")
-  (break-button-label "停止")
-  
-  ;;; search help desk popup menu
-  (search-help-desk-for "在幫助台中搜索「~a」")
-  (exact-lucky-search-help-desk-for "在幫助台中搜索最符合「~a」的一個頁面")
-  
-  ;; collapse and expand popup menu items
-  (collapse-sexp "摺疊S表達式")
-  (expand-sexp "擴展S表達式")
-  
-  ;;; fraction dialog
-  (enter-fraction "輸入分數")
-  (whole-part "整數部分")
-  (numerator "分子")
-  (denominator "分母")
-  (insert-number/bad-whole-part "整數部分必須輸入一個整數")
-  (insert-number/bad-numerator "分子必須是非負整數")
-  (insert-number/bad-denominator "分母必須是正整數")
-  (insert-fraction-menu-item-label "插入分數…")
-  
-  ;; number snip popup menu
-  (show-decimal-expansion "用十進制表示")
-  (show-mixed-fraction-view "用帶分數表示")
-  (show-improper-fraction-view "用假分數表示")
-  (show-more-decimal-places "顯示更多小數位")
-  
-  ;;; Teachpack messages
-  (select-a-teachpack "選擇教學包")
-  (clear-teachpack "卸載教學包~a")
-  (teachpack-error-label "DrRacket——教學包出錯")
-  (teachpack-didnt-load "無法裝載教學包~a。")
-  (add-teachpack-menu-item-label "載入教學包……")
-  (clear-all-teachpacks-menu-item-label "卸載全部教學包")
-  (drscheme-teachpack-message-title "DrRacket教學包")
-  (already-added-teachpack "教學包~a已裝載")
-  
-  ; ~a is filled with the teachpack's name; the message appears in the teachpack selection dialog when a user installs a new teachpack
-  (compiling-teachpack "編譯教學包~a……")
-  (teachpack-pre-installed "自帶的教學包")
-  (teachpack-pre-installed/htdp "自帶的HtDP教學包")
-  (teachpack-pre-installed/2htdp "自帶的HtDP/2e教學包")
-  (teachpack-user-installed "用戶安裝的教學包")
-  (add-teachpack-to-list... "添加教學包…")
-  (teachpack-already-installed "已經存在一個名為'~a'的教學包。是否覆蓋？")
-  ; ~a is filled with a list of language names. Each name is separated by a newline and is indented two spaces (no commas, no 'and')
-  (teachpacks-only-in-languages "教學包菜單僅在下列語言中有效：~a\n\n在其他語言中，使用「require」。")
-  
-  ;;; Language dialog
-  (introduction-to-language-dialog
-   "請選擇語言。大部分入門級的學生都可以使用默認語言。")
-  (language-dialog-title "語言選擇")
-  (case-sensitive-label "大小寫敏感")
-  (output-style-label "輸出格式")
-  (constructor-printing-style "構造器")
-  (quasiquote-printing-style "Quasiquote")
-  (write-printing-style "write")
-  (print-printing-style "print")
-  (sharing-printing-label "顯示內存共享")
-  (use-pretty-printer-label "print多個對象時自動換行")
-  (input-syntax "輸入語法")
-  (dynamic-properties "動態屬性")
-  (output-syntax "輸出語法")
-  (teachpacks "教學包") ;; label in the language dialog for the teaching languages
-  (teachpacks-none "《無》") ;; shows up under the previous string, when there are no teachpacks
-  (no-debugging-or-profiling "不調試，也不性能分析")
-  (debugging "調試")
-  (debugging-and-profiling "調試，並性能分析")
-  (test-coverage "語法測試套件覆蓋")
-  (show-details-button-label "顯示詳情")
-  (hide-details-button-label "隱藏詳情")
-  (choose-language-menu-item-label "選擇語言…")
-  (revert-to-language-defaults "恢復默認語言設置")
-  (fraction-style "分數格式")
-  (use-mixed-fractions "帶分數")
-  (use-repeating-decimals "循環小數")
-  (decimal-notation-for-rationals "使用十進制表示有理數")
-  (enforce-primitives-group-box-label "初始綁定")
-  (enforce-primitives-check-box-label "不允許改變初始綁定")
-  (automatically-compile "填充「compiled」目錄（載入更快）")
-  (preserve-stacktrace-information "保留堆疊跟蹤信息（禁用某些優化）")
-  (expression-level-stacktrace "表達式級堆疊跟蹤")
-  (function-level-stacktrace "函數級堆疊跟蹤")
-  (submodules-to-run "運行子module")
-  (add-submodule "添加子module選項…") ;; menu item
-  (add-submodule-title "添加子module") ;; title of dialog opened by above menu item
-  
-  ; used in the bottom left of the drscheme frame as the label
-  ; above the programming language's name
-  ; used the popup menu from the just above; greyed out and only
-  ; visible when some languages are in the history
-  (recent-languages "最近使用的語言：")
-  ; shows up in bottom-left programming language menu popup, when no langs are recorded
-  (no-recently-chosen-languages "沒有最近使用過的語言")
-  
-  ;; startup wizard screen language selection section
-  (please-select-a-language "請選擇語言")
-  
-  
-  ;;; languages
-  (beginning-student "初級")
-  (beginning-one-line-summary "define、cond、結構體、常量和基本操作")
-  (beginning-student/abbrev "初級+縮寫的表")
-  (beginning/abbrev-one-line-summary "在初級的基礎上，用縮寫形式輸出表")
-  (intermediate-student "中級")
-  (intermediate-one-line-summary "在初級的基礎上增加了詞法作用域")
-  (intermediate-student/lambda "中級+lambda")
-  (intermediate/lambda-one-line-summary "在中級的基礎上，增加了高階函數")
-  (advanced-student "高級")
-  (advanced-one-line-summary "在中級的基礎上，增加了lambda和賦值")
-  (how-to-design-programs "程序設計方法/How to Design Programs") ;; should agree with MIT Press on this one...
-  (pretty-big-scheme "大")
-  (pretty-big-scheme-one-line-summary "MzScheme/MrEd加HtDP(程序設計方法)語言")
-  (r5rs-lang-name "R5RS")
-  (r5rs-one-line-summary "Scheme語言標準第5修改稿")
-  (expander "Expander")
-  (expander-one-line-summary "展開表達式，而不是求值")
-  (legacy-languages "過去的語言")
-  (teaching-languages "教學語言")
-  (experimental-languages "實驗語言")
-  (initial-language-category "初始語言")
-  (no-language-chosen "還沒有選擇語言")
-  (other-languages "其他語言")
-  
-  (module-language-name "由原始碼來確定語言")
-  (module-language-one-line-summary "由#lang行來確定實際使用的語言")
-  (module-language-auto-text "自動加入#lang行") ;; shows up in the details section of the module language
-  
-  ;; for the upper portion of the language dialog
-  (the-racket-language "Racket語言")
-  (choose-a-language "選擇語言")
-  
-  ;; the next two string constants appear in the
-  ;; language dialog with a list
-  ;; of example languages appearing between them
-  (racket-language-discussion "你的程序將從#lang開始，從而指定想用的方言。例如：\n")
-  (racket-language-discussion-end "\n……諸如此類")
-  
-  ;; the next three string constants are put into a message-box dialog
-  ;; that appears when the user clicks on the example #lang languages
-  ;; in the language dialog. The first one always appears and then either
-  ;; the second or the third appears. The second one has the clicked
-  ;; on #lang line placed into the ~a, and third one has the 
-  ;; current #lang line in the first ~a and the clicked on in the second one.
-  ;; The two comments are separated by a blank line.
-  (racket-dialect-in-buffer-message 
-   "Racket的方言一般而言由原始碼指定，而不是語言對話框這裡的選項指定。")
-  (racket-dialect-add-new-#lang-line "這就是說，需要在定義視窗開頭添加「~a」嗎？")
-  (racket-dialect-replace-#lang-line "這就是說，在你的文件里現在有「~a」；需要將其替換成「~a」嗎？")
-  (racket-dialect-already-same-#lang-line "不過你的文件中已經包含「~a」；你可以開始編寫程序了！")
-  
-  ;; in the dialog containing the above strings, one of these is a button that appears
-  (add-#lang-line "添加#lang行")
-  (replace-#lang-line "替換#lang行")
-  
-  ;; for the 'new drracket user' dialog
-  (use-language-in-source "使用代碼中指定的語言")
-  
-  ;;; from the `not a language language' used initially in drscheme.
-  (must-choose-language "在繼續操作之前，你必須為DrRacket選擇一種程式語言。")
-  
-  ; next two appear before and after the name of a text book (which will be in italics)
-  (using-a-textbook-before "使用")
-  (using-a-textbook-after "？")
-  
-  ; next two are before and after a language
-  (start-with-before "由")
-  (start-with-after "開始？")
-  
-  (seasoned-plt-schemer? "PLT Scheme高手?")
-  (racketeer? "你是Racketeer嗎？")
-  (looking-for-standard-scheme? "想要標準的Scheme?")
-  
-  ; the three string constants are concatenated together and the middle
-  ; one is hyperlinked to the dialog that suggests various languages
-  (get-guidance-before "請使用「語言」菜單中的「選擇語言」對話框，或者")
-  (get-guidance-during "由DrRacket幫助你選擇")
-  (get-guidance-after "。")
-  
-  ;;; debug language
-  (unknown-debug-frame "[未知]")
-  (backtrace-window-title "向後跟蹤—DrRacket")
-  (files-interactions "~a的交互") ;; filled with a filename
-  (current-interactions "交互")
-  (current-definitions "定義")
-  (mzscheme-w/debug "文本（MzScheme，包含R5RS）")
-  (mzscheme-one-line-summary "PLT的Scheme實現")
-  (mred-w/debug "圖形（MrEd，包含MzScheme）")
-  (mred-one-line-summary "在MzScheme的基礎上增加GUI支持")
-  
-  ;; profiling
-  (profiling-low-color "低")
-  (profiling-high-color "高")
-  (profiling-choose-low-color "請選擇代表低的顏色")
-  (profiling-choose-high-color "請選擇代表高的顏色")
-  (profiling "性能分析")
-  (profiling-example-text "(define (馬) (馬))")
-  (profiling-color-config "性能分析色譜")
-  (profiling-scale "性能分析的色彩比例")
-  (profiling-sqrt "平方根")
-  (profiling-linear "線性")
-  (profiling-square "平方")
-  (profiling-number "調用次數")
-  (profiling-time "累積時間")
-  (profiling-update "更新性能分析")
-  (profiling-col-percent-time "%次")
-  (profiling-col-function "函數")
-  (profiling-col-time-in-msec "毫秒")
-  (profiling-col-calls "調用")
-  (profiling-show-profile "顯示性能分析")
-  (profiling-hide-profile "隱藏性能分析")
-  (profiling-unknown-src "《未知》")
-  (profiling-no-information-available "沒有可用的性能分析信息。請確定在語言設置中啟用了性能分析，並且運行了當前程序。")
-  (profiling-clear? "改變定義視窗的內容將導致性能分析信息失效。是否繼續？")
-  
-  ;; test coverage
-  (test-coverage-clear? "改變定義視窗將導致測試覆蓋信息失效。是否繼續？")
-  (test-coverage-clear-and-do-not-ask-again "是，並且不再詢問")
-  (test-coverage-ask? "詢問清除測試覆蓋")
-  
-  (test-coverage-on "覆蓋的測試")
-  (test-coverage-off "未覆蓋的測試")
-  
-  ;; tracing
-  (tracing-enable-tracing "啟用跟蹤")
-  (tracing-show-tracing-window "顯示跟蹤")
-  (tracing-hide-tracing-window "隱藏跟蹤")
-  (tracing-tracing-nothing-to-show "暫時沒有可用的跟蹤結果。(請檢查你所使用的語言是否支持跟蹤以及是否啟用了跟蹤。)")
-  
-  ;;; repl stuff
-  (evaluation-terminated "計算已終止")
-  (evaluation-terminated-explanation
-   "計算執行緒已停止，在下一次執行之前不會進行計算。")
-  
-  ; The next three constants show up in the same dialog as the above evaluation-terminated string
-  ; constants.
-  ; The first two show up only when the user calls 'exit' (possibly with a status code).
-  ; The third shows up when the program runs out of memory.
-  (exited-successfully "成功退出。")
-  (exited-with-error-code "退出，錯誤代碼~a。") ;; ~a is filled in with a number between 1 and 255
-  (program-ran-out-of-memory "內存耗盡。")
-  
-  (show-evaluation-terminated-dialog "顯示『計算終止』對話框")
-  (evaluation-terminated-ask "下次再顯示該對話框")
-  
-  (last-stack-frame "顯示最新的棧幀")
-  (last-stack-frames "顯示前~a個棧幀")
-  (next-stack-frames "顯示後~a個棧幀")
-  
-  ;;; welcoming message in repl
-  (language "語言")
-  (custom "自定義")
-  (teachpack "教學包")
-  (welcome-to "歡迎使用")
-  (version "版本")
-  
-  ;;; kill evaluation dialog
-  (kill-evaluation? "是否要終止計算？")
-  (just-break "中斷")
-  (kill "終止")
-  (kill? "終止？")
-  
-  ;;; version checker
-  (version:update-menu-item   "檢查更新…")
-  (version:update-check       "檢查更新") ; dialog title, with the next line
-  (version:connecting-server  "連接Racket版本伺服器")
-  (version:results-title      "Racket版本檢查")
-  (version:do-periodic-checks "定期檢查Racket版本更新")
-  (version:take-me-there      "下載") ; ...to the download website
-  ;; the next one can appear alone, or followed by a comma and the one after that
-  (version:plt-up-to-date     "您現在使用的已經是最新版本的Racket")
-  (version:but-newer-alpha    "但是還有一個更新的alpha版本")
-  ;; This is used in this context: "Racket vNNN <<<*>>> http://download..."
-  (version:now-available-at   "可以從這裡獲取：")
-  
-  ;; insert menu
-  (insert-menu "插入(&I)")
-  
-  ;; large semi colon letters
-  (insert-large-letters... "插入大字…")
-  (large-semicolon-letters "帶分號的大字")
-  (text-to-insert "要插入的文字")
-  
-  (module-browser-filename-format "文件全名：~a（共~a行）")
-  (module-browser-root-filename "根文件名：~a")
-  (module-browser-font-size-gauge-label "字體大小")
-  (module-browser-progress-label "Module概覽進程")
-  (module-browser-adding-file "添加文件：~a…")
-  (module-browser-laying-out-graph-label "正在布局")
-  (module-browser-open-file-format "打開~a")
-  (module-browser "Module瀏覽器") ;; frame title
-  (module-browser... "&Module瀏覽器…") ;; menu item title
-  (module-browser-in-file "M&odule瀏覽~a") ;; menu item title; ~a is filled with a filename
-  (module-browser-no-file "Module瀏覽存檔文件") ;; menu item title for above menu item; used when there is no saved file
-  (module-browser-error-expanding "展開程序時出錯：\n\n~a")
-  (module-browser-show-lib-paths "顯示通過(lib ..)載入的文件的路徑")
-  (module-browser-progress "Module瀏覽器：~a") ;; prefix in the status line
-  (module-browser-compiling-defns "Module瀏覽器：正在編譯定義")
-  (module-browser-show-lib-paths/short "跟隨lib調用") ;; check box label in show module browser pane in drscheme window.
-  (module-browser-show-planet-paths/short "跟隨planet調用") ;; check box label in show module browser pane in drscheme window.
-  (module-browser-refresh "刷新") ;; button label in show module browser pane in drscheme window.
-  (module-browser-highlight "高亮顯示") ;; used to search in the graph; the label on a text-field% object
-  (module-browser-only-in-plt-and-module-langs
-   "Module瀏覽器只能對基於module的程序中使用。")
-  (module-browser-name-length "名稱長度")
-  (module-browser-name-short "短")
-  (module-browser-name-medium "中")
-  (module-browser-name-long "長")
-  (module-browser-name-very-long "長，包含階段")  ;; like 'Long' but shows the phases where this file is loaded
-  (module-browser-open-all "打開所有這些文件")
-  
-  (happy-birthday-matthias "生日快樂，Matthias！")
-  (happy-birthday-matthew "生日快樂，馬曉！")
-  (happy-birthday-shriram "生日快樂，Shriram！")
-  
-  (mrflow-using-default-language-title "正在使用默認語言")
-  (mrflow-using-default-language "當前使用的語言並不包含其原素的類型。改用R5RS Scheme。")
-  (mrflow-button-title "分析")
-  ;(mrflow-unknown-style-delta-error-title "Unknown Box Style Delta")
-  ;(mrflow-unknown-style-delta-error "Unknown box style delta: ~a")
-  (mrflow-popup-menu-show-type "顯示類型")
-  (mrflow-popup-menu-hide-type "隱藏類型")
-  (mrflow-popup-menu-show-errors "顯示錯誤")
-  (mrflow-popup-menu-hide-errors "隱藏錯誤")
-  ;(mrflow-read-exception-title "Read Exception")
-  ;(mrflow-read-exception "Read exception: ~a")
-  ;(mrflow-syntax-exception-title "Syntax Exception")
-  ;(mrflow-syntax-exception "Syntax exception: ~a")
-  ;(mrflow-unknown-exception-title "Unknown Exception")
-  ;(mrflow-unknown-exception "Unknown exception: ~a")
-  ;(mrflow-language-primitives-error-title "Language Primitives Error")
-  ;(mrflow-language-primitives-error "Wrong filename for language primitives types table: ~a")
-  
-  (snips-and-arrows-popup-menu-tack-all-arrows "固定所有箭頭")
-  (snips-and-arrows-popup-menu-untack-all-arrows "取消固定所有箭頭")
-  (snips-and-arrows-user-action-disallowed-title "當前不允許用戶改變")
-  (snips-and-arrows-user-action-disallowed
-   "在編輯器中包含由系統插入的段落，所以不允許用戶改變。在修改之前請先隱藏所有這些段落。")
-  ;(snips-and-arrows-changing-terms-warning-title "Changing terms will be undoable")
-  (snips-and-arrows-hide-all-snips-in-editor "在編輯器中隱藏所有段落")
-  
-  (xml-tool-insert-xml-box "插入XML框")
-  (xml-tool-insert-scheme-box "插入Racket框")
-  (xml-tool-insert-scheme-splice-box "插入Racket接合框")
-  (xml-tool-xml-box "XML框")
-  (xml-tool-scheme-box "Racket框")
-  (xml-tool-scheme-splice-box "Racket接合框")
-  (xml-tool-switch-to-scheme "轉化為Racket框")
-  (xml-tool-switch-to-scheme-splice "轉化為Racket接合框")
-  (xml-tool-eliminate-whitespace-in-empty-tags
-   "消除空白標籤中的空白")
-  (xml-tool-leave-whitespace-alone
-   "保留空白")
-  
-  (show-recent-items-window-menu-item "在單獨視窗中顯示最近使用過的文件")
-  (show-recent-items-window-label "最近使用過的文件")
-  (number-of-open-recent-items "最近使用的數量")
-  (switch-anyway "強制切換文件")
-  
-  (stepper-program-has-changed "注意：程序已改變。")
-  (stepper-program-window-closed "注意：程序視窗已關閉。")
-  
-  (stepper-name "單步執行器")
-  (stepper-language-level-message "單步執行不支持語言「~a」。")
-  (stepper-button-label "單步執行")
-  
-  (stepper-previous "上一步")
-  (stepper-next "下一步")
-  (stepper-jump "跳至…")
-  (stepper-jump-to-beginning "最前")
-  (stepper-jump-to-end "最後")
-  (stepper-jump-to-selected "當前選中的開始")
-  (stepper-jump-to-previous-application "前一個調用步驟")
-  (stepper-jump-to-next-application "下一個調用步驟")
-  (stepper-out-of-steps "已到達計算終結，未找到目標步驟。")
-  (stepper-no-such-step/title "未找到步驟")
-  (stepper-no-such-step "找不到符合該標準的步驟。")
-  (stepper-no-such-step/earlier "前向找不到符合該標準的步驟。")
-  
-  (stepper-no-earlier-application-step "前向無調用步驟。")
-  (stepper-no-later-application-step "無調用步驟。")
-  
-  (stepper-no-earlier-step "前向無步驟。")
-  (stepper-no-later-step "無步驟。")
-  
-  (stepper-no-selected-step "選中區域中沒有步驟。可能這些是注釋？")
-  
-  (stepper-no-last-step "最後步驟暫未生成。")
-  
-  
-  (debug-tool-button-name "調試")
-  
-  (dialog-back "後退")
-  
-  ;; warnings about closing a drscheme frame when the program
-  ;; might still be doing something interesting
-  (program-is-still-running "定義視窗中的程序還在運行中。強制退出？")
-  (program-has-open-windows "定義視窗中的程序打開了其他視窗。強行關閉這些視窗？")
-  
-  ;; ml-command-line-arguments is for the command line arguments
-  ;; label in the module language details in the language dialog.
-  (ml-command-line-arguments "命令行參數是字元串的數組，以紅色顯示")
-  
-  ;; ml-cp names are all for the module language collection path
-  ;; configuration. See the details portion of the language dialog
-  ;; for the module language (at the bottom).
-  (ml-cp-default-collection-path "<<默認collection路徑>>")
-  
-  ;; in std get-directory 
-  (ml-cp-choose-a-collection-path "請選擇collection路徑")
-  
-  ;; err msg when adding default twice
-  (ml-cp-default-already-present
-   "默認collection路徑已存在")
-  
-  ;; title of this section of the dialog (possibly the word
-  ;; `Collection' should not be translated)
-  (ml-cp-collection-paths "Collection路徑")
-  
-  ;; button labels
-  (ml-cp-add "添加")
-  (ml-cp-add-default "加為默認")
-  (ml-cp-remove "清除")
-  (ml-cp-raise "上移")
-  (ml-cp-lower "下移")
-  
-  (ml-always-show-#lang-line "在Module語言中，始終顯示#langhang")
-  
-  ;; Strings for Profj removed as ProfessorJ is no longer actively developed as part of DrScheme
-  
-  
-  ;;The Test engine tool
-  ;;
-  (test-engine-window-title "測試結果")
-  ;;Following two appear in View menu, attach and free test report window from DrRacket frame
-  (test-engine-dock-report "停靠測試報告")
-  (test-engine-undock-report "取消停靠測試報告")
-  ;;Following two appear in Racket (Java, etc) menu, cause Tests to be Run automatically or not
-  (test-engine-enable-tests "啟用測試")
-  (test-engine-disable-tests "停用測試")
-  
-  (test-engine-ran-1-test "運行了1個test。")
-  (test-engine-ran-1-check "運行了1個check。")
-  ;; ditto, only plural
-  (test-engine-ran-n-tests "運行了~a個test。")
-  (test-engine-ran-n-checks "運行了~a個check。")
-  (test-engine-1-test-passed "Test通過！")
-  (test-engine-1-check-passed "Check通過！")
-  (test-engine-both-tests-passed "全部test通過！")
-  (test-engine-both-checks-passed "全部check通過！")
-  (test-engine-all-tests-passed "全部test通過！")
-  (test-engine-all-checks-passed "全部check通過！")
-  (test-engine-all-n-tests-passed "所有~a個test通過！")
-  (test-engine-all-n-checks-passed "所有~a個check通過！")
-  (test-engine-0-tests-passed "0個test通過。")
-  (test-engine-0-checks-passed "0個check通過。")
-  (test-engine-m-of-n-tests-failed "~a個test失敗（共~a個test）。")
-  (test-engine-m-of-n-checks-failed "~a個check失敗（共~a個check）。")
-  (test-engine-must-be-tested "程序必須要測試！")
-  (test-engine-is-unchecked "程序還沒有check！")
-  (test-engine-tests-disabled "測試未啟用。")
-  (test-engine-should-be-tested "程序需要測試。")
-  (test-engine-at-line-column "於行~a，列~a")
-  (test-engine-in-at-line-column "於文件~a，行~a，列~a")
-  ; as in "column (unknown)"
-  (test-engine-unknown "（未知）")
-  (test-engine-trace-error "跟蹤錯誤")
-  
-  ; The ~F is special marker for the offending values, which may be
-  ; printed specially in DrRacket.
-  ;; no way to translate these as the order of expected value and actual value (also range) should be ordered differently in Chinese
-  (test-engine-check-encountered-error
-   "check-expect encountered the following error instead of the expected value, ~F. ~n   :: ~a")
-  (test-engine-actual-value-differs-error
-   "Actual value ~F differs from ~F, the expected value.")
-  (test-engine-actual-value-not-within-error
-   "Actual value ~F is not within ~v of expected value ~F.")
-  (test-engine-encountered-error-error
-   "check-error encountered the following error instead of the expected ~a~n   :: ~a")
-  (test-engine-expected-error-error
-   "check-error expected the following error, but instead received the value ~F.~n ~a")
-  (test-engine-expected-an-error-error
-   "check-error expected an error, but instead received the value ~F.")
-  ;; members are appended to the message
-  (test-engine-not-mem-error "Actual value ~F differs from all given members in ")
-  (test-engine-not-range-error "Actual value ~F is not between ~F and ~F, inclusive.")
-  
-  ;; followed by list of variable bindings
-  (test-engine-property-fail-error "Property falsifiable with")
-  (test-engine-property-error-error "check-property遇到如下錯誤~n:: ~a")
-  
-  (signature-enable-checks "啟用Signature Checks")
-  (signature-disable-checks "停用Signature Checks")
-  
-  ; section header
-  (test-engine-check-failures "Check失敗：")
-  ; section header
-  (test-engine-signature-violations "Signature違規：")
-  
-  ; part of one phrase "signature <at line ...> to blame: procedure <...>
-  (test-engine-signature "signature")
-  (test-engine-to-blame "to blame: procedure")
-  
-  (test-engine-no-signature-violations "無signature違規。")
-  (test-engine-1-signature-violation "1個signature違規。")
-  (test-engine-n-signature-violations "~a個signature違規。")
-  
-  ; as in got <value>, signature <at ...>
-  (test-engine-got "實得")
-  
-  ;; The Test Suite Tool
-  ;; Errors
-  (test-case-empty-error "空白test")
-  (test-case-too-many-expressions-error "一個test中包含過多表達式。")
-  ;; DrRacket window menu items
-  (test-case-insert "插入Test Case")
-  (test-case-disable-all "禁用所有Test Cases")
-  (test-case-enable-all "允許所有Test Cases")
-  
-  ;; NOTE: The following string constants are labels of the test-case fields. The width
-  ;;       of the field is determined by the length of the longest of the following three words.
-  ;;       if the words are too long the test case will take up too much horizontal room and
-  ;;       not look very good.
-  ;; This string is the label of the expression that is being tested in a test case.
-  (test-case-to-test "Test")
-  ;; This string is the label of the expression that is the expected value of the to-test expression.
-  (test-case-expected "應該為")
-  ;; This string is the label of the actual result of the to test expression.
-  (test-case-actual "實際值")
-  (test-case-predicate "預測值")
-  (test-case-should-raise "應該Raise")
-  ;; The label of a field of the test-case that describes the expected error message of a test case
-  (test-case-error-message "錯誤信息")
-  
-  (test-case-menu-title "Test Case")
-  (test-case-switch-to-error-box "切換為Error Test框")
-  (test-case-switch-to-nonerror-box "切換為Nonerror Test框")
-  (test-case-collapse "摺疊Test Case")
-  (test-case-show-actual "顯示實際值")
-  (test-case-enable "啟用Test Case")
-  (test-case-show-predicate "顯示預測值")
-  (test-case-show-error-message "顯示錯誤信息")
-  (test-case-convert-to-text "轉化為文本")
-  
-  ;; Slideshow
-  (slideshow-hide-picts "顯示嵌套的框")
-  (slideshow-show-picts "顯示圖片")
-  (slideshow-cannot-show-picts "無法顯示圖片；請先運行程序建立大小")
-  (slideshow-insert-pict-box "插入圖片框")
-  
-  ;; GUI Tool
-  (gui-tool-heading "GUI工具")
-  (gui-tool-before-clicking-message "在點擊工具圖標之前，請先使用「特殊符號」菜單中的「插入GUI」命令插入一個GUI根對象，或先選中另一個GUI。")
-  (gui-tool-show-gui-toolbar "顯示GUI工具欄")
-  (gui-tool-hide-gui-toolbar "隱藏GUI工具欄")
-  (gui-tool-insert-gui "插入GUI")
-  
-  ;; contract violation tracking
-  
-  ; tooltip for new planet icon in drscheme window (must have a planet violation logged to see it)
-  (show-planet-contract-violations "顯示PLaneT中的contract違背")
-  
-  ; buttons in the dialog that lists the recorded bug reports
-  (bug-track-report "發送報告")
-  (bug-track-forget "取消")
-  (bug-track-forget-all "取消全部")
-  
-  ;; planet status messages in the bottom of the drscheme window; the ~a is filled with the name of the package
-  (planet-downloading "PLaneT：正在下載~a……")
-  (planet-installing "PLaneT：正在安裝~a……")
-  (planet-finished "PLaneT：~a已完成。")
-  (planet-docs-building "PLaneT：構建文檔（由~a觸發）……")
-  (planet-no-status "PLaneT") ;; this can happen when there is status shown in a different and then the user switches to a tab where planet hasn't been used
-  
-  (bug-report-field-pkg "Package系統信息")
-  
-  ;; string normalization. To see this, paste some text with a ligature into DrRacket
-  ;; the first three strings are in the dialog that appears. The last one is in the preferences dialog
-  (normalize "標準化")
-  (leave-alone "保留原樣")
-  (normalize-string-info "粘帖來的文字包含未經標準化的連字。標準化？")
-  (normalize-string-preference "標準化粘帖字元串")
-  (ask-about-normalizing-strings "詢問是否標準化字元")
-  
-  (always-use-platform-specific-linefeed-convention "使用系統相關的換行符約定")
-  
-  ;; optimization coach
-  (hide-optimization-coach "隱藏優化教練")
-  (show-optimization-coach "顯示優化教練")
-  
-  ;; labels used (in a big font) in the background of the definitions and interactions windows
-  (definitions-window-label "定義")
-  (interactions-window-label "交互")
-  (hide-defs/ints-label "隱藏定義/交互標籤") ;; popup menu
-  (show-defs/ints-label "顯示定義/交互標籤") ;; preferences checkbox
-  
-  ;; menu item in the 'edit' menu; applies to editors with programs in them
-  ;; (technically, editors that implement color:text<%>)
-  (spell-check-string-constants "對字元串常量進行拼寫檢查")
-  (spelling-dictionaries "拼寫檢查字典") ; (sub)menu whose items are the different possible dictionaries
-  (default-spelling-dictionary "默認字典") ; first item in menu from previous line
-  (misspelled-text-color "拼寫錯誤文本的顏色") ;; in the preferences dialog  
-  (cannot-find-ispell-or-aspell-path "找不到aspell或ispell程式文件")
-  ; puts the path to the spell program in the ~a and then the error message
-  ; is put following this string (with a blank line in between)
-  (spell-program-wrote-to-stderr-on-startup "拼寫程序（~a）給出錯誤信息：")
-  )
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/ukrainian-string-constants.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/ukrainian-string-constants.rkt
deleted file mode 100644
index c9abad8e2e..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/private/ukrainian-string-constants.rkt
+++ /dev/null
@@ -1,1527 +0,0 @@
-#|
-
-When modifying the string constants files,
-please adhere to these guidelines:
-
-- All the entries in english-string-constants.rkt have the same format
-  (name string).  If the purpose of an entry you are adding to the
-  file is not clear from just the name and string, put a comment next
-  to the entry explaining what the string is going to be used for and
-  in what context.
-  That's especially true for strings that contain things like "~a".
-  Systematically describe what the "~a" is going to be replaced with.
-  When we have to translate strings like "deleting ~a", we translators
-  need to know what "~a" is going to be (in particular, in some
-  languages like French, we need to know whether the "~a" is going to
-  be a masculine or feminine word, or whether it's going to be
-  singular or plural, etc).
-
-- When adding a bunch of new entries, put together in a section the
-  entries that logically belong together.  Give a title to your
-  section, so we have an idea of what the strings are for.  Don't mix
-  in the same section strings that have nothing to do with each other,
-  that's only going to confuse us.  Do not start a new section if
-  there's already one that deals with the same thing.  Dumping all the
-  new entries in random order at the end of the file is not a good way
-  to have your new entries translated in a timely manner...
-
-- Before adding strings for your new pet tool, check whether you can't
-  re-use strings that already exist.  There's no need for yet another
-  "Ok" string...
-
-- If you modify an existing string in english-string-constants.rkt, go
-  through all the *-string-constants.rkt files for the other languages,
-  comment out the old version of the modified string in each of these
-  files, and put a short comment there telling us the English string
-  has changed and needs to be re-translated.  Do not erase the old
-  version, it might help us translate the new one.  Do not move it
-  either.  Just comment it out and add the short comment.  After the
-  next git update DrRacket will automatically tell us translators that
-  a new string needs to be translated, we will find your comment in
-  the file, and know what to do.
-	Some evil evil people might think that, since DrRacket automatically
-  informs us of new strings to be translated, an easier thing to do
-  when modifying an existing string would be to simply rename it at
-  the same time.  This works, except that if you do that, we
-  translators will get two warnings from DrRacket:
-		language english had but french does not:
-		(new-name "New String")
-		language french had but english does not:
-		(old-name "Old String")
-  then we translators will be left to wonder whether the two things
-  are related or not, and whether we can safely base our translation
-  of "New String" on the translation of "Old String" (since the two
-  strings are likely to be close in meaning).  Worse, we might not
-  even realize the two strings are related and translate "New String"
-  from scratch, just to realize later that it's only a variation of
-  "Old String".  I can tell you that nothing pisses off a translator
-  more than having to translate pretty much the same string twice
-  just because *you* were too lazy to inform us that it was just a
-  slight modification to an existing string rather than an entirely
-  new one.  Conclusion: do not change the name of a string unless you
-  have some really good reason to do so.
-
-- Please think hard before choosing a string and make sure it means
-  what you want it to mean.  That way you won't have to change it
-  later, and we won't have to retranslate it.
-
-- Please think hard before choosing the name for a string.  Use
-  meaningful names.  "error" or "ok" are not meaningful names.  Prefix
-  all related names with a common prefix (the name of your tool or
-  module).  String names are not the right place to save on typing.
-
-- If, for some reason, you really have to change the name of a string
-  (like, because the original name you gave it really sucked...),
-  change the name of the string in *ALL* the *-string-constants.rkt
-  files.  That's a modification you can do without the help of a
-  translator, so do it yourself.  It's not the job of the translators
-  to clean up your naming mess for you.  Besides, you are the one who
-  knows what you changed, so leaving the translators having to guess
-  what you did is Not Nice(tm).
-
-- If, for some reason, you need to remove a string (i.e. you changed
-  your code and don't need the string anymore), remove the string in
-  *ALL* the *-string-constants.rkt files.  Again, you don't need the
-  help of a translator to do that.  If you're not sure whether you
-  might need the string in the future or not, just comment it out in
-  *ALL* the files.
-
-|#
-
-(module ukrainian-string-constants "string-constant-lang.rkt"
- ;;; when translating this constant, substitute name of actual language for `English'
- (is-this-your-native-language "Українська - це Ваша рідна мова?")
-
- (are-you-sure-you-want-to-switch-languages
-  "Для зміни мови інтерфейсу користувача необхідно перезапустити DrRacket. Ви впевнені, що дійсно хочете цього?")
-
- (interact-with-drscheme-in-language "Працювати з українським інтерфейсом DrRacket")
-
- ;; these two should probably be the same in all languages excepet English.
- ;; they are the button labels (under macos and windows, respectively)
- ;; that go the with the string above.
- (accept-and-quit "Застосувати й вийти")
- (accept-and-exit "Застосувати й вийти")
- 
- ;;; general purpose (DrRacket is hereby a word in every language, by decree of Robby :)
- (plt "PLT")
- (drscheme "DrRacket")
- (drracket "DrRacket")
- (ok "OK")
- (cancel "Скасувати")
- (abort "Скасувати")
- (untitled "Без імені")
- (untitled-n "Без імені ~a")
- (warning "Попередження")
- (error "Помилка")
- (close "Закрити") ;; as in, close an open window. must match close-menu-item
-                 ;; in the sense that, when the &s have been stripped from
-                 ;; close-menu-item, it must be the same string as this.
- (stop "Зупинити")   
- (&stop "&Зупинити") ;; for use in button and menu item labels, with short cut.
- (are-you-sure-delete? "Ви дійсно хочете видалити ~a?") ;; ~a is a filename or directory name
- (ignore "Ігнорувати")
- (revert "Завантажити заново")
-
- ;; label for a generic check box, often supported on dialogs
- ;; that ask a binary choice of the user. If checked, the
- ;; dialog isn't going to be shown again.
- ;; One version for always using the current choice:
- (dont-ask-again-always-current "Більше не питати (завжди використовувати поточний вибір)")
- ;; One generic version (ie, on the Quit DrRacket dialog)
- (dont-ask-again                "Більше не питати")
-
- ;;; important urls
- (web-materials "Пов'язані Web-сайти") ;; menu item title
- (tool-web-sites "Web-сайти встановлених інструментів")   ;; menu item title
- (plt-homepage "Racket")
- (pbd-homepage "Program by Design")
-
- ;;; bug report form
- (cancel-bug-report? "Скасувати відправлення звіту про помилки?")
- (are-you-sure-cancel-bug-report?
-  "Ви дійсно хочете скасувати відправлення звіту про помилки?")
- (bug-report-form "Звіт про помилки")
- (bug-report-field-name "Ім'я")
- (bug-report-field-email "E-mail")
- (bug-report-field-summary "Резюме")
- (bug-report-field-severity "Серйозність")
- (bug-report-field-class "Клас")
- (bug-report-field-description "Опис")
- (bug-report-field-reproduce1 "Послідовність дій")
- (bug-report-field-reproduce2 "для відтворення помилки")
- (bug-report-field-environment "Середовище")
- (bug-report-field-docs-installed "Встановлена документація")
- (bug-report-field-collections "Колекція")
- (bug-report-field-human-language "Мова інтерфейсу")
-  (bug-report-field-memory-use "Використовувана пам'ять")
- (bug-report-field-version "Версія")
- (bug-report-synthesized-information "Зібрані дані")  ;; dialog title
- (bug-report-show-synthesized-info "Показати зібрані дані")
- (bug-report-submit "Відправити")
- (bug-report-submit-menu-item "Відправити звіт про помилку...") ;; in Help Menu (drs & help desk)
- (error-sending-bug-report "Збій при відправці звіту про помилку")
- (error-sending-bug-report-expln "При відправці звіту про помилку відбувся збій. При наявності підключення до Internet відвідайте сайт:\n\n    http://bugs.racket-lang.org/\n\nі відправте звіт про помилку через Web-форму на ньому. Вибачте за незручності.\n\nПовідомлення про помилку:\n~a")
- (illegal-bug-report "Некоректний звіт про помилку")
- (pls-fill-in-field "Будь-ласка, заповніть поле \"~a\"")
- (malformed-email-address "Некоректна адреса електронної пошти")
- (pls-fill-in-either-description-or-reproduce "Будь-ласка, заповніть поле \"Опис\" або \"Послідовність дій для відтворення помилки\".")
-
- ;;; check syntax
- (check-syntax "Перевірити синтаксис")
- (cs-italic "Курсив")
- (cs-bold "Напівжирний")
- (cs-underline "Підкреслений")
- (cs-change-color "Змінити колір")
- (cs-tack/untack-arrow "З'єднувати/не з'єднувати стрілками")
- (cs-jump-to-next-bound-occurrence "Перейти до наступного входження")
- (cs-jump-to-binding "Перейти до визначення")
- (cs-jump-to-definition "Перейти до оголошення")
- (cs-error-message "Повідомлення про помилку")
- (cs-open-file "Відкрити ~a")
- (cs-rename-var "Перейменувати ~a")
- (cs-rename-id "Перейменувати ідентифікатор")
- (cs-rename-var-to "Перейменувати ~a в:")
- (cs-name-duplication-error "Обране ім'я ~s конфліктує з визначеним раніше.")
- (cs-rename-anyway "Перейменувати беззастережно")
- (cs-status-init "Перевірка синтаксису: ініціалізація оточення для коду користувача")
- (cs-status-coloring-program "Перевірка синтаксису: виокремлення виразів кольором")
- (cs-status-eval-compile-time "Перевірка синтаксису: обчислення часу компіляції")
- (cs-status-expanding-expression "Перевірка синтаксису: розгорнути вираз")
- (cs-status-loading-docs-index "Перевірка синтаксису: завантаження індексу документації")
- (cs-mouse-over-import "Прив'язка ~s імпортована з ~s")
- (cs-view-docs "Перегляд документації для ~a")
- (cs-view-docs-from "~a з ~a")  ;; a completed version of the line above (cs-view-docs) is put into the first ~a and a list of modules (separated by commas) is put into the second ~a. Use check syntax and right-click on a documented variable (eg, 'require') to see this in use  
-  
- (cs-lexical-variable "лексична змінна")
- (cs-set!d-variable "перевизначена змінна")
- (cs-imported-variable "імпортована змінна")
-
- ;;; info bar at botttom of drscheme frame
- (collect-button-label "Збирання сміття")
-  (read-only "Тільки для читання")
- (auto-extend-selection "Авторозширення")
- (overwrite "Заміна")
- (running "виконується")
- (not-running "не виконується")
- 
- ;;; misc
- (welcome-to-something "Ласкаво просимо до ~a")
- 
- ; this appears in the drscheme about box.
- (welcome-to-drscheme-version/language "Ласкаво просимо до DrRacket, версія ~a, ~a")
-
- ; these appear on subsequent lines in the `Help|Ласкаво просимо до DrRacket' dialog.
- (welcome-to-drscheme "Ласкаво просимо до DrRacket")
-
- (goto-line "Перейти до рядка")
- (goto-line-invalid-number
-  "~a - некоректний номер рядка. Номер повинен бути цілим числом в діапазоні від 1 до ~a")
- (goto-position "Перейти до позиції")
- (no-full-name-since-not-saved
-  "У файлу немає повного імені - він ще не був збережений.")
- (cannot-open-because-dne "Неможливо відкрити ~a, тому що він не існує.")
-
-  (needs-execute-language-changed
-   "Попередження: мова змінилась. Натисніть Виконати.")
-  (needs-execute-teachpack-changed
-   "Попередження: навчальний пакет змінився. Натисніть Виконати.")
-  (needs-execute-defns-edited
-   "Попередження: вікно визначень змінилось. Натисніть Виконати.") (file-is-not-saved "Файл \"~a\" не сохранен.")
-
-  (editor-changed-since-srcloc-recorded
-   "З моменту останньої фіксації місцезнаходження файлу було внесено зміни, тому виділена область може містити неправильне місцезнаходження файлу.")
- 
- (file-is-not-saved "Файл \"~a\" не збережено.")
- (save "Зберегти")
- (close-anyway "Все одно закрити")
- (dont-save "Не зберігати")
- (clear-anyway "Все одно очистити")
-
- ;; menu item title
- (log-definitions-and-interactions "Зберегти вікна визначень та інтерпретатора...")
- (stop-logging "Зупинити протоколювання")
- (please-choose-a-log-directory "Будь-ласка, оберіть каталог")
- (logging-to "Протоколювати в: ")
- (erase-log-directory-contents "Видалити зміст каталогу: ~a?")
- (error-erasing-log-directory "Помилка видалення змісту каталогу.\n\n~a\n")
-
-  ;; menu items connected to the logger -- also in a button in the planet status line in the drs frame
-  (show-log "Показати &протокол")
-  (hide-log "Сховати &протокол")
-  (logging-all "Все") ;; in the logging window in drscheme, shows all logs simultaneously
-
- ;; modes
- (mode-submenu-label "Режими")
- (scheme-mode "Режим Scheme")
- (racket-mode "Режим Racket")
- (text-mode "Режим тексту")
-
- (scheme-mode-color-symbol "Символ")
- (scheme-mode-color-keyword "Ключове слово")
- (scheme-mode-color-comment "Коментар")
- (scheme-mode-color-string "Рядок")
- (scheme-mode-color-constant "Константа")
- (scheme-mode-color-parenthesis "Круглі дужки")
- (scheme-mode-color-error "Помилка")
- (scheme-mode-color-other "Інші")
- ;; the ~a is filled in with one of the above (scheme-mode-*)
- (syntax-coloring-choose-color "Оберіть колір для ~a")
- (preferences-colors "Кольори") ;; used in the preferences dialog
- 
-  ;; parenthesis color scheme string constants
-  (parenthesis-color-scheme "Виокремлення кольором круглих дужок") ;; label for the choice% menu in the preferences dialog
-  (paren-color-basic-grey "Основний сірий")
-  (paren-color-shades-of-gray "Відтінки сірого кольору")
-  (paren-color-shades-of-blue "Відтінки блакитного кольору")
-  (paren-color-spring "Теплі відтінки")
-  (paren-color-fall "Осінні відтінки")
-  (paren-color-winter "Холодні відтінки")
-
-  
- (url: "URL:")
- (open-url... "Відкрити URL...")
- (open-url "Відкрити URL")
- (browse... "Браузер...")
- (bad-url "Невірний URL")
- (bad-url:this "Невірний URL: ~a")
- 
- ;; Help Desk
- (help "Довідка")
- (help-desk "Допомога")
- (plt:hd:search "Пошук")
- (plt:hd:feeling-lucky "Мені пощастить")
- (plt:hd:home "Домашня сторінка допомоги") 
- ; next 3 are popup menu choices in help desk search frame
- (plt:hd:search-for-keyword "Шукати в ключових словах")
- (plt:hd:search-for-keyword-or-index "Шукати в ключових словах або в змісті")
- (plt:hd:search-for-keyword-or-index-or-text "Шукати в ключових словах, в змісті або в тексті")
- (plt:hd:exact-match "Точна відповідність")
- (plt:hd:containing-match "Міститься згадка")
- (plt:hd:regexp-match "Відповідність по регулярному виразу")
- (plt:hd:find-docs-for "Пошук документації з:")
- (plt:hd:search-stopped-too-many-matches "[Пошук перервано: занадто багато співпадань]")
- (plt:hd:nothing-found-for "Для ~a не знайдено")
- (plt:hd:and "і")
- (plt:hd:refresh "оновити")
- (plt:hd:refresh-all-manuals "оновити всі керівництва")
- (plt:hd:manual-installed-date "(інсталювати ~a)")
- ; Help Desk configuration
- ;; refreshing manuals
- (plt:hd:refreshing-manuals "Перезавантажити керівництва")
- (plt:hd:refresh-downloading... "Завантажити ~a...")
- (plt:hd:refresh-deleting... "Видалити стару версію ~a...")
- (plt:hd:refresh-installing... "Інсталювати нову версію ~a...")
- (plt:hd:refresh-clearing-indices "Очистити кешовані індекси")
- (plt:hd:refreshing-manuals-finished "Готово.")
- (plt:hd:about-help-desk "Про допомогу")
- (plt:hd:help-desk-about-string
-  "Допомога - це повне джерело інформації про програмне забезпечення PLT, включаючи DrRacket, MzScheme та MrEd.\n\nВерсія ~a\nCopyright (c) ~a-~a PLT")
- (plt:hd:help-on-help "Довідка про довідку")
- (plt:hd:help-on-help-details "Для отримання довідки з використання допомоги, оберіть перше посилання `Допомога' на її домашній сторінці. (Для переходу на домашню сторінку натисніть кнопку `Додому' в верхній частині вікна допомоги.)")
-  (reload "Оновити") ;; refresh the page in a web browser
-  (plt:hd:ask-about-separate-browser
-   "Ви обрали посилання на дані з WWW. Бажаєте переглянути їх в браузері допомоги чи в вікні зовнішнього браузера?")
-  (plt:hd:homebrew-browser "Браузер допомоги") ;; choice for the above string (in a button)
-  (plt:hd:separate-browser "Зовнішній браузер") ;; other choice for the above string (also in a button)
-  (plt:hd:external-link-in-help "Зовнішні посилання в довідці")
-  (plt:hd:use-homebrew-browser "Використовувати браузер допомоги для зовнішніх посилань")
-  (plt:hd:new-help-desk "Нове вікно допомоги")
-
-  ;; in the Help Desk language dialog, title on the right.
-  (plt:hd:manual-search-ordering "Керівництво з пошуку")
-  
-  ;; in the help-desk standalone font preference dialog, on a check box
-  (use-drscheme-font-size "Використовувати розмір шрифту DrRacket")
-  
-  ;; in the preferences dialog in drscheme there is example text for help desk font size.
-  ;; clicking the links in that text produces a dialog with this message
-  (help-desk-this-is-just-example-text
-   "Це приклад для встановлення розміру шрифта. Відкрийте відповідну допомогу (з меню Довідка) для переходу за цими посиланнямим.")
-
-  ;; this appears in the bottom part of the frame the first time the user hits `f1' 
-  ;; (assuming nothing else has loaded the documentation index first)
-  ;; see also: cs-status-loading-docs-index
-  (help-desk-loading-documentation-index "Допомога: завантаження індексу документації")
-  
- ;; Help desk htty proxy
- (http-proxy "HTTP-проксі")
- (proxy-direct-connection "Пряме підключення")
- (proxy-use-proxy "Використовувати проксі:")
- (proxy-host "Вузол")
- (proxy-port "Порт")
- (proxy-bad-host "Невірний проксі-вузол")
-
- ;; browser
- (rewind-in-browser-history "Назад")
- (forward-in-browser-history "Вперед")
- (home "На початок")
- (browser "Браузер")
- (external-browser-choice-title "Зовнішній браузер") ; title for radio-button set
- (browser-command-line-label "Командний рядок:") ; label for radio button that is followed by text boxes
- (choose-browser "Обрати браузер")
- (no-browser "Обрати пізніше")
- (browser-cmdline-expl-line-1 "(Командний рядок сформований з'єднанням попереднього тексту, URL,") ; explanatory text for dialog, line 1
- (browser-cmdline-expl-line-2 "та наступного тексту.)") ; ... line 2. (Anyone need more lines?)
- (install? "Інсталювати?")  ;; if a .plt file is found (title of dialog)
- (you-have-selected-an-installable-package "Ви обрали пакет для встановлення.")
- (do-you-want-to-install-it? "Ви хочете інсталювати його?")
- (paren-file-size "(Розмір файлу- ~a байт)")
- (download-and-install "Завантажити й інсталювати") ;; button label
- (download "Завантажити") ;; button label
- (save-downloaded-file/size "Зберегти завантажені файли (~a байт) як") ;; label for get-file dialog
- (save-downloaded-file "Зберегти завантажені файли як")  ;; label for get-file dialog
- (downloading "Завантаження") ;; dialog title
- (downloading-file... "Завантаження файлу...")
- (package-was-installed "Пакет інстальований.")
- (download-was-saved "Завантажені файли збережені.")
-
- (install-plt-file-menu-item... "Інсталювати .plt-файл...")
- (install-plt-file-dialog-title "Інсталювати .plt-файл")
- (install-plt-web-tab "Web")
- (install-plt-file-tab "Файл")
- (install-plt-filename "Ім'я файлу:")
- (install-plt-url "URL:")
- 
- ;; install plt file when opened in drscheme strings
- (install-plt-file "Інсталювати ~a чи відкрити для редагування?")
- (install-plt-file/yes "Інсталювати")
- (install-plt-file/no "Редагувати")
-
- (plt-installer-progress-window-title "Інсталяція") ;; frame title
- (plt-installer-abort-installation "Процес інсталяції перервано") ;; button label
- (plt-installer-aborted "Перервано.") ;; msg that appears in the installation window when installation is aborted
-
- ;;; about box
- (about-drscheme-frame-title "Про DrRacket")
- 
- ;;; save file in particular format prompting.
- (save-as-plain-text "Зберегти цей файл в звичайному текстовому форматі?")
- (save-in-drs-format "Зберегти цей файл в спеціальному нетекстовому форматі drscheme?")
- (yes "Так")     
- (no "Ні")
- 
- ;; saving image (right click on an image to see the text)
-  (save-image "Зберегти малюнок...")
-  
- ;;; preferences
- (preferences "Налаштування користувача")
- (error-saving-preferences "Помилка збереження налаштувань користувача: ~a")
- (error-saving-preferences-title "Помилка збереження налаштувань користувача")
- (steal-the-lock-and-retry "Зняти блокування та повторити") ;; in the preferences error dialog; this happens when the lockfile exists (after 3 pref writes). 
- (error-reading-preferences "Помилка читання налаштувань користувача")
- (prefs-file-locked "Файл налаштувань користувача заблоковано (оскільки файл ~a існує), тому змінені налаштування не будуть збережені. Скасувати зміни?")
- (try-again "Спробувати знову") ;; button label
- (prefs-file-still-locked "Файл налаштувань користувача все ще заблоковано (оскільки файл ~a існує), тому змінені налаштування не будуть збережені..")
- (scheme-prefs-panel-label "Racket")
- (warnings-prefs-panel-label "Попередження")
- (editor-prefs-panel-label "Редагування")
- (general-prefs-panel-label "Загальне")
- (highlight-parens "Підсвічувати парні дужки")
- (fixup-open-brackets "Автокорекція квадратних дужок, які відкриваються")
- (fixup-close-parens "Автокорекція дужок, які закриваються")
- (flash-paren-match "Відображати відповідність дужок")
- (auto-save-files "Автозбереження файлів")
- (backup-files "Резервні копії файлів")
- (map-delete-to-backspace "Призначити Delete на Backspace")
- (verify-exit "Перевіряти завершення")
- (ask-before-changing-format "Запитувати перед зміною формату")
- (wrap-words-in-editor-buffers "Переносити слова в буферах редактора")
- (show-status-line "Показати рядок стану")
- (count-columns-from-one "Рахувати номери стовбців, починаючи з 1")
- (display-line-numbers "Відображати номери стовбців в буфері (немає зміщення символів)")
- (show-line-and-column-numbers "Показувати номери рядків і стовбців") ; used for popup menu; right click on line/column box in bottom of drs window
- (show-character-offsets "Показувати зміщення символів") ; used for popup menu; right click on line/column box in bottom of drs window
- (enable-keybindings-in-menus "Дозволити комбінації клавіш в меню")
- (command-as-meta "Вважати командний рядок мета-клавішою") ;; macos/macos x only
- (reuse-existing-frames "Використовувати існуючі вікна при відкритті нових файлів")
- (default-fonts "Шрифти за замовчуванням")
- (basic-gray-paren-match-color "Виділяти парні дужки сірим кольором") ; in prefs dialog
- (online-coloring-active "Інтерактивне підсвічування синтаксису")
- (open-files-in-tabs "відкривати файли в окремих вкладках (не нових вікнах)")
- (show-interactions-on-execute "Автоматично відкривати вікно інтерпретатора при виконанні програми")
-  (switch-to-module-language-automatically "Автоматично перемикатись на мову модуля при відкритті модуля")
-  (interactions-beside-definitions "Розміщувати вікно інтерпретатора поряд з вікном визначення") ;; in preferences, below the checkbox one line above this one
- (limit-interactions-size "Обмежити розмір програми")
- (background-color "Колір фону")
- (default-text-color "Колір тексту за замовчуванням") ;; used for configuring colors, but doesn't need the word "color"
- (choose-a-background-color "Будь-ласка, оберіть колір фону")
- (revert-to-defaults "Повернутись до значень за замовчуванням")
-  
-  (black-on-white-color-scheme "Чорний на білому") ;; these two appear in the color preferences dialog on butttons
-  (white-on-black-color-scheme "Білий на чорному") ;; clicking the buttons changes teh color schemes to some defaults that've been set up.
-  
- ; title of the color choosing dialog
-
- ; should have entire alphabet
- (font-example-string "Швидка руда лисиця перестрибнула через лінивих собак.") 
-
- (change-font-button-label "Змінити")
- (fonts "Шрифти")
- (other... "Інший...") ;; used in the font choice menu item
-
- ; filled with type of font, eg modern, swiss, etc.
- (choose-a-new-font "Будь-даска, оберіть новий \"~a\" шрифт")
-
- (font-size-slider-label "Розмір")
- (restart-to-see-font-changes "Перезапустіть, щоб побачити зміну типу шрифту")
-
- (font-prefs-panel-title "Шрифт")
- (font-name "Ім'я шрифту")
- (font-size "Розмір шрифту")
- (set-font "Встановити шрифт...")
- (font-smoothing-label  "Згладжування шрифтів")
- (font-smoothing-none "Відсутнє")
- (font-smoothing-some "Для деяких")
- (font-smoothing-all "Для всіх")
- (font-smoothing-default "Використати системні налаштування")
- (select-font-name "Вибір імені шрифту")
- (example-text "Зразок тексту:")
- (only-warn-once "Це попередження про те, що визначення і виклики не синхронізовані")
- 
- ; warning message when lockfile is around
- (waiting-for-pref-lock "Очікування завершення блокування налаштувань користувача...")
- (pref-lock-not-gone
-  "Файл блокування налаштувань користувача: \n\n   ~a\n\nне дозволяє зберегти зміни налаштувань. Переконайтесь у відсутності працюючого програмного забезпечення Racket та видаліть цей файл.")
- (still-locked-exit-anyway? "Налаштування не збережені. Все одно вийти?")
- 
- ;;; indenting preferences panel
- (indenting-prefs-panel-label "Вирівнювання")
- (indenting-prefs-extra-regexp "Додаткові регулярні вирази")
-
- (square-bracket-prefs-panel-label "Квадратні дужки")
-  
- ; filled with define, lambda, or begin
- (enter-new-keyword "Введіть нове ~a-подібне ключове слово:")
- (x-keyword "~a ключове слово")
- (x-like-keywords "~a-подібне ключове слово")
-
- ; used in Square bracket panel
- (skip-subexpressions "Кількість підвиразів, які буде пропущено")
-
- (expected-a-symbol "очікується символ,  знайдено: ~a")
- (already-used-keyword "\"~a\" -уже використовується як ключове слово")
- (add-keyword "Додати")
- (remove-keyword "Видалити")
- 
-  ; repl color preferences
-  (repl-colors "REPL")
-  (repl-out-color "Вивід")
-  (repl-value-color "Значення")
-  (repl-error-color "Помилки")
-  
-  ;;; find/replace
-  (search-next "Далі")
-  (search-previous "Назад")
-  (search-match "Співпадання")  ;;; this one and the next one are singular/plural variants of each other
-  (search-matches "Співпадання") 
-  (search-replace "Замінити")
-  (search-skip "Пропустити")
-  (search-show-replace "Показати заміни")
-  (search-hide-replace "Сховати заміни")
-  (find-case-sensitive "З врахуванням регістру")  ;; the check box in both the docked & undocked search
-  (find-anchor-based "Шукати, використовуючи прив'язки")
-
-  ;; these string constants used to be used by searching,
-  ;; but aren't anymore. They are still used by other tools, tho.
-  (hide "Сховати")
-  (dock "Прикріпити")
-  (undock "Відкріпити")
-  
- ;;; multi-file-search
- (mfs-multi-file-search-menu-item "Пошук в файлах...")
- (mfs-string-match/graphics "Відповідність рядків (опрацьовувати файли з графікою)")
- (mfs-regexp-match/no-graphics "Регулярні вирази (тільки для неформатованих текстових файлів)")
- (mfs-searching... "Пошук...")
- (mfs-configure-search "Налаштування пошуку") ;; dialog title
- (mfs-files-section "Файли")   ;; section in config dialog
- (mfs-search-section "Пошук") ;; section in config dialog
- (mfs-dir "Каталог")
- (mfs-recur-over-subdirectories "Шукати у вкладених каталогах")
- (mfs-regexp-filename-filter "Фільтрувати імена файлів за регулярними виразами")
- (mfs-search-string "Шукати рядки")
- (mfs-drscheme-multi-file-search "багатофайловый пошук - DrRacket") ;; results window and error message title
- (mfs-not-a-dir "\"~a\" не каталог")
- (mfs-open-file "Відкрити файл")
- (mfs-stop-search "Зупинити пошук")
- (mfs-case-sensitive-label "З врахуванням регістру")
- (mfs-no-matches-found "Співпадань не знайдено.")
- (mfs-search-interrupted "Пошук перервано.")
- 
- ;;; reverting a file
- (are-you-sure-revert
-  "Ви дійсно впевнені, що хочете повернутись до попередньої версії файлу? Внесені зміни буде неможливо відновити.")
- (are-you-sure-revert-title
-  "Відкрити заново?")
- 
- ;;; saving a file
- ; ~a is filled with the filename
- (error-saving "Помилка під час збереження") ;; title of error message dialog
- (error-saving-file/name "Під час збереження сталася помилка ~a.")
- (error-loading "Помилка відкриття")
- (error-loading-file/name "Під час відкриття сталася помилка ~a.")
- (unknown-filename "<< невідомий >>")
-
- ;;; finder dialog
- (must-specify-a-filename "Визначте ім'я файлу")
- (file-does-not-exist "Файл \"~a\" не існує.")
- (ask-because-file-exists "Файл \"~a\" уже існує. Замінити його?")
- (dne-or-cycle "Файл \"~a\" містить неіснуючий каталог або цикл.")
- (get-file "Отримати файл")
- (put-file "Помістити файл")
- (full-pathname "Повне ім'я")
- (show-dot-files "Показати файли й каталоги, які починаються з крапки.")
- (up-directory-button-label "В попередній каталог")
- (add-button-label "Додати") ;;; for multi-file selection
- (add-all-button-label "Додати все") ;;; for multi-file selection
- (remove-button-label "Видалити") ;;; for multi-file selection
- (file-wrong-form "Це ім'я файлу має неправильну форму.")
- (select-files "Вибір файлів")
- (select-file "Вибір файлу")
- (dir-dne "Каталог не існує.")
- (file-dne "Файл не існує.")
- (empty-filename "Ім'я файлу має містити символи.")
- (that-is-dir-name "Це ім'я каталогу.")
- 
- ;;; raw menu names -- these must match the 
- ;;; versions below, once the &s have been stripped.
- ;;; if they don't, DrRacket's menus will appear
- ;;; in the wrong order.
- (file-menu "Файл")
- (edit-menu "Редагування")
- (help-menu "Довідка")
- (windows-menu "Вікна")
- 
- ;;; menus
- ;;; - in menu labels, the & indicates a alt-key based shortcut.
- ;;; - sometimes, things are stuck in the middle of 
- ;;; menu item labels. For instance, in the case of
- ;;; the "Зберегти як" menu, you might see: "Зберегти визначення як". 
- ;;; be careful of spacing, follow the English, if possible.
- ;;; - the ellipses in the `after' strings indicates that
- ;;; more information is required from the user before completing
- ;;; the command.
-
- (file-menu-label "&Файл")
-
- (new-info  "Відкрити новий файл")
- (new-menu-item "&Новий")
- (new-...-menu-item "&Новий...")
-
- (open-info "Відкрити файл з диску")
- (open-menu-item "&Відкрити...")
-
- (open-recent-info "Список останніх відкритих файлів")
- (open-recent-menu-item "Відкрити о&станні")
-
- (revert-info "Замінити файл збереженим на диску")
- (revert-menu-item "Відкрити за&ново")
-
- (save-info "Зберегти цей файл на диск")
- (save-menu-item "&Зберегти")
-
- (save-as-info "Вказати ім'я файлу та зберегти цей файл на диск")
- (save-as-menu-item "Зберегти &як...")
-
- (print-info "Відправити файл на друк")
- (print-menu-item "&Друк...")
-
- (page-setup-info "Вибір конфігурації параметрів друку")
- (page-setup-menu-item "Параметри сторінки...")
- 
- (close-info "Закрити файл")
- (close-menu-item "За&крити")
-
- (quit-info "Закрити всі вікна")
- (quit-menu-item-windows "&Вихід")
- (quit-menu-item-others "&Вихід")
- 
- (edit-menu-label "&Редагування")
- 
- (undo-info "Скасувати останню дію")
- (undo-menu-item "Скасувати")
-
- (redo-info "Повернути останню дію")
- (redo-menu-item "&Повернути")
-
- (cut-info "Перемістити обрані елементи в буфер обміну для подальшого вставлення")
- (cut-menu-item "Виріза&ти")
-
- (copy-info "Копіювати обрані елементи в буфер обміну для подальшого вставлення")
- (copy-menu-item "&Копіювати")
-
- (paste-info "Вставити останній скопійований або вирізаний елемент замість обраних елементів")
- (paste-menu-item "&Вставити")
-
- (clear-info "Видалити виокремлені елементи без зміни буферу або вставлення")
- (clear-menu-item-windows "Ви&далити")
-
- (select-all-info "Виокремити весь документ")
- (select-all-menu-item "Виокремити в&се")
- 
-  (find-menu-item "Знайти") ;; menu item
-  (find-info "Перемикає клавіатурний фокус між вікном, в якому він здійснюється, і панеллю пошуку")
-  
- (find-next-info "Знайти наступне входження")
- (find-next-menu-item "Знайти далі")
-  
- (find-previous-info "Знайти попереднє входження")
- (find-previous-menu-item "Знайти попереднє")
-  
-  (show-replace-menu-item "Показати заміни")
-  (hide-replace-menu-item "Сховати заміни")
-  (show/hide-replace-info "Перемкнути видимість панелі замін")
-
-  (replace-menu-item "Замінити")
-  (replace-info "Замінити шукане")
-  
-  (replace-all-info "Замінити всі входження")
-  (replace-all-menu-item "Замінити все")
-  
-  (find-case-sensitive-info "Перемкнутись між пошуком з врахуванням/без врахування регістру")
-  (find-case-sensitive-menu-item "Здійснювати пошук з врахуванням регістру")
-  
-  (complete-word "Закінчення слів") ; the complete word menu item in the edit menu
-  (no-completions "... закінчення недоступні") ; shows up in the completions menu when there are no completions (in italics)
-  
-  (overwrite-mode "Режим заміни")
-  (enable-overwrite-mode-keybindings "Дозволити перемикання в режим заміни комбінацією клавіш")  
-
- (preferences-info "Конфігурація Ваших налаштувань")
- (preferences-menu-item "Налаштування користувача...")
-
- (keybindings-info "Показати активні комбінації клавіш")
- (keybindings-menu-item "Комбінації клавіш")
- (keybindings-show-active "Показати активні комбінації клавіш")
- (keybindings-frame-title "Комбінації клавіш")
- (keybindings-sort-by-name "Відсортувати за ім'ям")
- (keybindings-sort-by-key "Відсортувати за ключем")
- (keybindings-add-user-defined-keybindings "Додати визначені користувачем комбінації клавіш...")
- (keybindings-add-user-defined-keybindings/planet "Додати визначені користувачем комбінації клавіш з PLaneT...")
- (keybindings-menu-remove "Видалити ~a")
- (keybindings-choose-user-defined-file "Будь-ласка, оберіть файл, який містить комбінації клавіш.")
- (keybindings-planet-malformed-spec "Невірні налаштування PLaneT: ~a") ; the string will be what the user typed in
- (keybindings-type-planet-spec "Будь-ласка, введіть наобхідні налаштування PLaneT")
-  
- ; first ~a will be a string naming the file or planet package where the keybindings come from;
- ; second ~a will be an error message
- (keybindings-error-installing-file "Помилка при інсталяції комбінації клавіш ~a:\n\n~a")
-  
- (user-defined-keybinding-error "Помилка виконання комбінації клавіш ~a\n\n~a")
- (user-defined-keybinding-malformed-file "Файл ~a не містить модуля, написаного на мові оболонки/комбінацій клавіш.")  
- (user-defined-keybinding-malformed-file/found-lang "Файл ~a не містить модуля, написаного на мові оболонки/комбінацій клавіш. Знайдено мову ~s")     
-
- ;; menu items in the "special" menu
- (insert-text-box-item "Вставити текстовий блок")
- (insert-image-item "Вставити малюнок...")
- (insert-comment-box-menu-item-label "Вставити коментар")
- (insert-lambda "Вставити λ")
-
- (wrap-text-item "Переносити текст")
-
- ;; windows menu
- (windows-menu-label "&Вікна")
- (minimize "Згорнути") ;; minimize and zoom are only used under mac os x
- (zoom "Змінити розмір")
- (bring-frame-to-front "Показати поверх всіх вікон")       ;;; title of dialog
- (bring-frame-to-front... "Показати поверх всіх вікон...") ;;; corresponding title of menu item
- (most-recent-window "Останнє вікно")
-  (next-tab "Наступна вкладка")
-  (prev-tab "Попередня вкладка")
-
- (view-menu-label "&Вигляд")
- (show-overview "Показати контур програми") 
- (hide-overview "Сховати контур програми")
- (show-module-browser "Показати браузер модулів")
- (hide-module-browser "Сховати браузер модулів")
-
-  (help-menu-label "&Довідка")
- (about-info "Відомості про авторів та подробицях застосування програми")
- (about-menu-item "Про програму...")
- 
- ;; open here's new menu item
- (create-new-window-or-clear-current
-  "Ви хочете створити нове вікно чи очистити поточне?")
- (clear-current "Очистити поточне")
- (new-window "Нове вікно")
-
- ;;; exiting and quitting ``are you sure'' dialog
- ;;; exit is used on windows, quit on macos, in English. Other
- ;;; languages probably use the same word on both platforms.
- (exit "Вихід")
- (quit "Вихід")
- (are-you-sure-exit "Ви дійсно впевнені, що хочете вийти?")
- (are-you-sure-quit "Ви дійсно впевнені, що хочете вийти?")
-  ; these next two are only used in the quit/exit dialog
-  ; on the button whose semantics is "dismiss this dialog".
-  ; they are there to provide more flexibility for translations
-  ; in English, they are just cancel.
- (dont-exit "Скасувати") 
- (dont-quit "Скасувати")
-  
- ;;; autosaving
- (error-autosaving "Помилка автозбереження \"~a\".") ;; ~a will be a filename
- (autosaving-turned-off "Автозбереження відключене\nпід час запису файлу.")
- (recover-autosave-files-frame-title "Відновлення автозбережених файлів")
- (autosave-details "Подробиці")
- (autosave-recover "Відновлений")
- (autosave-unknown-filename "<<невідомий>>")
-  
-  ;; these are labels in a dialog that drscheme displays
-  ;; if you have leftover autosave files. to see the dialog,
-  ;; start up drscheme and modify (but don't save) a file
-  ;; (also, do this with an unsaved file). Wait for the autosave
-  ;; files to appear (typically 5 minutes). Kill DrRacket
-  ;; and restart it. You'll see the dialog
-  (autosave-autosave-label: "Автозбереження файлу:")
-  (autosave-original-label: "Вихідний файл:")
-  (autosave-autosave-label "Автозбереження файлу")
-  (autosave-original-label "Вихідний файл")
-  (autosave-compare-files "Порівняти автозбережені файли")
-
-  (autosave-show-autosave "Автозбереження файлу") ;; title of a window showing the autosave file
-
-  (autosave-explanation "DrRacket знайшов Ваші файли автозбереження, які можуть містити незбережену роботу.")
-
-  (autosave-recovered! "Відновити!") ;; status of an autosave file
-  (autosave-deleted "Видалити")       ;; status of an autosave file
-
-  (autosave-error-deleting "Помилка видалення ~a\n\n~a") ;; first is a filename, second is an error message from mz.
-  (autosave-delete-button "Видалити")
-  (autosave-delete-title "Видалити")  ;; title of a dialog asking for deletion confirmation
-  (autosave-done "Завершено")
-  
-  ;; appears in the file dialog
-  (autosave-restore-to-where? "Оберіть місце для запису автозбереженого файлу.")
-  
-  
- ;;; file modified warning
- (file-has-been-modified
-  "Файл був змінений після останнього автозбереження. Скасувати зміни?")
- (overwrite-file-button-label "Перезаписати")
- 
- (definitions-modified 
-  "Текст файлу визначень був змінений. Будь-ласка, збережіть або перевідкрийте визначення.")
- (drscheme-internal-error "Внутрішня помилка DrRacket")
- 
- ;;; tools
- (invalid-tool-spec "Некоректний файл info.rkt, який містить опис інструменту в колекції ~a. Очікується рядок або непустий список рядків, отримано: ~e")
- (error-invoking-tool-title "Помилка виклику інструменту ~s;~s")
- (error-loading-tool-title "Помилка завантаження інструменту ~s\n~a") ;; ~s filled with a path, ~a filled with an error message from an exn
- (tool-tool-names-same-length
-  "В файлі info.rkt для ~s очікується, що `tool-names' і `tools' - списки однакової довжини, отримано ~e і ~e")
- (tool-tool-icons-same-length
-  "В файлі info.rkt для ~s очікується, що `tool-icons' і `tools' - списки однакової довжини, отримано ~e і ~e")
- (tool-tool-urls-same-length
-  "В файлі info.rkt для ~s очікується, що `tool-urls' і `tools' - списки однакової довжини, отримано ~e і ~e")
- (error-getting-info-tool
-  "помилка при завантаженні файлу info.rkt для ~s")
- (tool-error-phase1 "Помилка на 1 етапі для інструменту ~s; ~s")
- (tool-error-phase2 "Помилка на 2 етапі для інструменту ~s; ~s")
-
-
- ;;; define popup menu
- (end-of-buffer-define "<< кінець буферу >>")
- (sort-by-name "Упорядкувати за іменем")
- (sort-by-position "Упорядкувати за позицією в файлі")
- (no-definitions-found "<< визначення не знайдені >>")
- (jump-to-defn "Перейти до визначення ~a")
-
- (recent-items-sort-by-age "Упорядкувати за часом")
- (recent-items-sort-by-name "Упорядкувати за ім'ям")
- 
- ;;; view menu
- (hide-definitions-menu-item-label "Сховати вікно визн&ачень")
- (show-definitions-menu-item-label "Показати вікно виз&начень")
- (definitions-menu-item-help-string "Показати/Сховати вікно визначень")
- (show-interactions-menu-item-label "Показати вікно &інтерпретатора")
- (hide-interactions-menu-item-label "Сховати вікно &інтерпретатора")
- (interactions-menu-item-help-string "Показати/Сховати вікно інтерпретатора")
- (toolbar "Панель інструментів")
- (toolbar-on-top "Панель інструментів зверху")
- (toolbar-on-left "Панель інструментів зліва")
- (toolbar-on-right "Панель інструментів справа")
- (toolbar-hidden "Сховати панель інструментів")
-
- ;;; file menu
- (save-definitions-as "Зберегти визначення &як...")
- (save-definitions "Зберегти визначення")
- (print-definitions "Друкувати визначення...")
- (about-drscheme "Про DrRacket")
- (save-other "Інші способи збереження")
- (save-definitions-as-text "Зберегти визначення як текст...")
- (save-interactions "Зберегти вікно інтерпретатора")
- (save-interactions-as "Зберегти вікно інтерпретатора як...")
- (save-interactions-as-text "Зберегти вікно інтерпретатора як текст...")
- (print-interactions "Друкувати вікно інтерпретатора...")
- (new-tab "Нова вкладка")
- (close-tab "Закрити вкладку") ;; must not have any &s in it.
- (close-tab-amp "&Закрити вкладку") ;; like close-tab, but with an ampersand on the same letter as the one in close-menu-item
-  
- ;;; edit-menu
- (split-menu-item-label "&Розділити")
- (collapse-menu-item-label "&Об'єднати")
- 
- ;;; language menu
- (language-menu-name "&Мова")
- 
- ;;; scheme-menu
- (scheme-menu-name "&Racket")
- (execute-menu-item-label "Виконати")
- (execute-menu-item-help-string "Перезапустити програму в вікні визначень")
- (ask-quit-menu-item-label "Перервати програму")
- (ask-quit-menu-item-help-string "Перервати програму, яка виконується")
- (force-quit-menu-item-label "Примусово вийти з програми")
- (force-quit-menu-item-help-string "Перервати всі поточні обчислення")
- (limit-memory-menu-item-label "Обмеження по пам'яті...")
- ;(limit-memory-msg-1 "Обмеження стануть діяти після наступного виконання програми")
- ;(limit-memory-msg-2 "Для виконання необхідно, принаймні, 1 мегабайт.")  ;; minimum memory limit is now 8 megabytes
- (limit-memory-unlimited "Без обмежень")
- (limit-memory-limited "З обмеженнями")
- (limit-memory-megabytes "Мегабайт")
- (clear-error-highlight-menu-item-label "Очистити виокремлення помилок")
- (clear-error-highlight-item-help-string "Видалити виокремлення помилок")
- (reindent-menu-item-label "&Вирівняти")
- (reindent-all-menu-item-label "Вирівняти вс&е")
- (semicolon-comment-out-menu-item-label "&Закоментувати виокремлене крапкою з комою")
- (box-comment-out-menu-item-label "&Закоментувати весь блок")
- (uncomment-menu-item-label "&Розкоментувати")
-
- (convert-to-semicolon-comment "Перетворити в коментар з крапкою з комою")
- 
- ;;; executables
- (create-executable-menu-item-label "Створити виконуваний файл...")
- (create-executable-title "Створити виконуваний файл")
- (must-save-before-executable "Ви повинні зберегти свою програму, перш ніж створити виконуваний файл.")
- (save-a-mred-launcher "Створити таким, який виконується в графічній оболонці")
- (save-a-mzscheme-launcher "Створити таким, який виконується в текстовій оболонці")
- (save-a-mred-stand-alone-executable "Створити автономний виконуваний файл з графічним інтерфейсом")
- (save-a-mzscheme-stand-alone-executable "Створити автономний виконуваний файл з текстовим інтерфейсом")
- (save-a-mred-distribution "Зберегти дистрибутив з графічним інтерфейсом")
- (save-a-mzscheme-distribution "Зберегти дистрибутив з текстовим інтерфейсом")
-
- (definitions-not-saved "Вікно визначень не було збережено. Програма, що виконується, буде використовувати останню збережену версію вікна визначень. Продовжити?")
- ;; The "-explanatory-label" variants are the labels used for the radio buttons in
- ;;  the "Create Executable..." dialog for the "(module ...)" language.
- (launcher "Виконувати в оболонці")
- (launcher-explanatory-label "Виконувати в оболонці (тільки для поточного комп'ютера, виконувати з вихідного файлу)")
- (stand-alone "Автономный")
- (stand-alone-explanatory-label "Автономний (тільки для поточного комп'ютера, виконання скомпільованої копії)")
- (distribution "Дистрибутив")
- (distribution-explanatory-label "Дистрибутив (для встановлення на інших машинах)")
- (executable-type "Тип")
- (executable-base "База")
- (filename "Ім'я файлу: ")
- (create "Створити")
- (please-specify-a-filename "Будь-ласка, визначте ім'я файлу, який створюється.")
- (~a-must-end-with-~a
-  "Ім'я ~a файлу\n\n  ~a\n\nнеправильне. Ім'я файлу повинне закінчуватись \".~a\".")
- (macosx-executables-must-end-with-app
-  "Ім'я файлу\n\n  ~a\n\nнеправильне. Для MacOS X виконувана програма повинна бути каталогом, ім'я якого закінчується .app.")
- (warning-directory-will-be-replaced
-  "Попередження: каталог:\n\n  ~a\n\nбуде замінений. Продовжити?")
- 
- (distribution-progress-window-title "Створення дистрибутиву")
- (creating-executable-progress-status "Створення виконуваних файлів для дистрибутиву...")
- (assembling-distribution-files-progress-status "Збирання файлів для дистрибутиву...")
- (packing-distribution-progress-status "Пакування дистрибутиву...")
-
- (create-servlet "Створити сервлет...")
-
- ; the ~a is a language such as "module" or "algol60"
- (create-servlet-unsupported-language
-  "Створення сервлету не підтримується мовою ~a.")
-  
- ;;; buttons
- (execute-button-label "Виконати") 
- (save-button-label "Зберегти")
- (break-button-label "Зупинити")
- 
- ;;; search help desk popup menu
- (search-help-desk-for "Пошук в допомозі для \"~a\"")
- (exact-lucky-search-help-desk-for "Точний пошук в допомозі для \"~a\"")
-
- ;; collapse and expand popup menu items
- (collapse-sexp "Згорнути S-вираз")
- (expand-sexp "Розгорнути S-вираз")
- 
- ;;; fraction dialog
- (enter-fraction "Введіть дріб")
- (whole-part "Ціла частина")
- (numerator "Чисельник")
- (denominator "Знаменник")
- (insert-number/bad-whole-part "Ціла частина числа повинна  бути цілим числом")
- (insert-number/bad-numerator "Чисельник повинен бути цілим невід'ємним числом")
- (insert-number/bad-denominator "Знаменник повинен бути цілим додатнім числом")
- (insert-fraction-menu-item-label "Вставити дріб...")
-
- ;; number snip popup menu
- (show-decimal-expansion "Показати десятковим дробом")
- (show-mixed-fraction-view "Показати змішаним дробом")
- (show-improper-fraction-view "Показати неправильним дробом")
- (show-more-decimal-places "Показати більше позицій після десяткової крапки")
- 
- ;;; Teachpack messages
- (select-a-teachpack "Обрати навчальний пакет")
- (clear-teachpack "Очистити навчальний пакет ~a")
- (teachpack-error-label "DrRacket - помилка навчального пакету")
- (teachpack-didnt-load "Файл навчального пакету ~a не завантажується належним чином.")
- (add-teachpack-menu-item-label "Додати навчальний пакет...")
- (clear-all-teachpacks-menu-item-label "Очистити всі навчальні пакети")
- (drscheme-teachpack-message-title "Навчальний пакет DrRacket")
- (already-added-teachpack "Навчальний пакет ~a уже доданий")
-  
-  ; ~a is filled with the teachpack's name; the message appears in the teachpack selection dialog when a user installs a new teachpack
-  (compiling-teachpack "Компіляція навчального пакету ~a ...")
-  (teachpack-pre-installed "Попередньо інстальовані навчальні пакети")
-  (teachpack-user-installed "Навчальні пакети користувача")
-  (add-teachpack-to-list... "Додати  навчальний пакет до списку...")
-  (teachpack-already-installed "Навчальний пакет з ім'ям '~a' уже був інстальований. Перезаписати?")
-  ; ~a is filled with a list of language names. Each name is separated by a newline and is indented two spaces (no commas, no 'and')
-  (teachpacks-only-in-languages "Навчальні пакети доступні лише на таких мовах: ~a")
-  
-  
- ;;; Language dialog
- (introduction-to-language-dialog
-  "Будь-ласка, оберіть мову. Студентам у вступних курсах бажано використовувати мову за замовчуванням.")
- (language-dialog-title "Оберіть мову")
- (case-sensitive-label "Чутливість до регістру")
- (output-style-label "Стиль виведення")
- (constructor-printing-style "Конструктор")
- (quasiquote-printing-style "Псевдоапострофи")
- (write-printing-style "ввід")
- (print-printing-style "друк")
- (sharing-printing-label "Показувати сумісно використовуване в значеннях")
- (use-pretty-printer-label "Додавати перехід на новий рядок в друковані значення")
- (input-syntax "Синтакис введення")
- (dynamic-properties "Динамічні властивості")
- (output-syntax "Синтаксис виведення")
-  (teachpacks "Навчальні пакети") ;; label in the language dialog for the teaching languages
-  (teachpacks-none "<< відсутні >>") ;; shows up under the previous string, when there are no teachpacks
- (no-debugging-or-profiling "Не налагоджувати або профілювати")
- (debugging "Налагодити")
- (debugging-and-profiling "Налагодити й профілювати")
- (test-coverage "Включати набір синтаксичних тестів")
- (show-details-button-label "Показати подробиці")
- (hide-details-button-label "Сховати подробиці")
- (choose-language-menu-item-label "Обрати мову...")
- (revert-to-language-defaults "Повернути мову за замовчуванням")
- (fraction-style "Стиль дробу")
- (use-mixed-fractions "Змішані дроби")
- (use-repeating-decimals "Періодичні десяткові дроби")
- (decimal-notation-for-rationals "Використовувати десятковий запис для раціональних чисел")
- (enforce-primitives-group-box-label "Початкові прив'язки")
- (enforce-primitives-check-box-label "Заборонити перевизначення початкових прив'язок")
- (automatically-compile "Заповнити каталоги compiled/ (для більш швидкого завантаження)")
- (preserve-stacktrace-information "Зберегти трасування стеку (відключає деякі оптимізації")
- (expression-level-stacktrace "Вираз рівню трасування стеку")
- (function-level-stacktrace "Функція рівню трасування стеку")
-
-
-  ; used in the bottom left of the drscheme frame 
-  ; used the popup menu from the just above; greyed out and only
-  ; visible when some languages are in the history
-  (recent-languages "Останні мови:")
-  ; shows up in bottom-left programming language menu popup, when no langs are recorded
-  (no-recently-chosen-languages "немає обраних мов") 
-  
- ;; startup wizard screen language selection section
- (please-select-a-language "Будь-ласка, оберіть мову")
-  
-  
- ;;; languages
- (beginning-student "Студент-початківець")
- (beginning-one-line-summary "define, cond, структури, константи та примітиви")
- (beginning-student/abbrev "Студент-початківець зі списковими скороченнями")
- (beginning/abbrev-one-line-summary "Студент-початківець зі списковим стилем друку в циклі \"читання-обчислення-друк\"")
- (intermediate-student "Середній студент")
- (intermediate-one-line-summary "Студент-початківець з лексичною видимістю")
- (intermediate-student/lambda "Середній студент з лямбда-виразами")
- (intermediate/lambda-one-line-summary "Середній студент з функціями вищих порядків")
- (advanced-student "Досвічений студент")
- (advanced-one-line-summary "Середній студент з лямбда-виразами й мутацією")
- (how-to-design-programs "Як проектувати програми") ;; should agree with MIT Press on this one...
- (pretty-big-scheme "Pretty Big")
- (pretty-big-scheme-one-line-summary "Додані синтаксис і функції мов з \"Як проектувати програми\" в mzscheme й mred")
- (r5rs-language-name "R5RS")
- (r5rs-one-line-summary " R5RS з несуттєвими скороченнями")
- (expander "Макрорасширитель")
- (expander-one-line-summary "Вираз частіше розкривається, ніж обчислюється")
- (legacy-languages "Успадковані мови")
- (teaching-languages "Навчальні мови")
- (experimental-languages "Експериментальні мови")
-  (initial-language-category "Початкові мови")
-  (no-language-chosen "Не обрана мова")
- 
- (module-language-one-line-summary "Виконання створює цикл \"читання-обчислення-друк\" всередині модуля")
-  (module-language-auto-text "Автоматичний рядок #lang") ;; shows up in the details section of the module language    
-
-  ;;; from the `not a language language' used initially in drscheme.
-  (must-choose-language "DrRacket не здатний виконувати програми, якщо не обрана мова програмування.")
-  
-  ; next two appear before and after the name of a text book (which will be in italics)
-  (using-a-textbook-before "Використати ")
-  (using-a-textbook-after "?")
-  
-  ; next two are before and after a language
-  (start-with-before "Почати з ")
-  (start-with-after "")
-  
-  (seasoned-plt-schemer? "Досвічений програміст на PLT Scheme?")
-  (looking-for-standard-scheme? "Проглянути стандарт для Scheme?")
-
-  ; the three string constants are  together and the middle
-  ; one is hyperlinked to the dialog that suggests various languages
-  (get-guidance-before "Або оберіть пункт \"Обрати мову...\" в меню \"Мова\", або ")
-  (get-guidance-during "отримайте пораду")
-  (get-guidance-after ".")
-    
- ;;; debug language
- (unknown-debug-frame "[невідомий]")
- (backtrace-window-title "Обернене трасування DrRacket")
- (files-interactions "При виконанні ~a") ;; filled with a filename
- (current-interactions "викликів")
- (current-definitions "визначень")
- (mzscheme-w/debug "Текстовий (MzScheme, включаючи Стандарт 1998 року)")
- (mzscheme-one-line-summary "PLT-реалізація Scheme")
- (mred-w/debug "Графічний (MrEd, включаючи MzScheme)")
- (mred-one-line-summary "Додати підтримку графічного інтерфейсу користувача до MzScheme")
-
- ;; profiling
- (profiling-low-color "Нижній")
- (profiling-high-color "Верхній")
- (profiling-choose-low-color "Будь-ласка, оберіть нижній колір")
- (profiling-choose-high-color "Будь-ласка, оберіть верхній колір")
- (profiling "Профілювання")
- (profiling-example-text "(define (whee) (whee))")
- (profiling-color-config "Набір основних кольорів") 
- (profiling-scale "Шкала розподілу кольорів")
- (profiling-sqrt "Пропорційна кореню квадратному")
- (profiling-linear "Лінійна")
- (profiling-square "Квадратична")
- (profiling-number "Число викликів")
- (profiling-time "Загальний час")
- (profiling-update "Оновити профіль")
- (profiling-col-percent-time "% часу")
- (profiling-col-function "Функція")
- (profiling-col-time-in-msec "мілісекунд")
- (profiling-col-calls "Виклики")
- (profiling-show-profile "Показати профіль")
- (profiling-hide-profile "Сховати профіль")
- (profiling-unknown-src "<< невідомий >>")
- (profiling-no-information-available "Інформація про профілювання недоступна. Будь-ласка, переконайтеся, що профілювання допускається на обраній мові, а програма виконана.")
- (profiling-clear? "Зміни в вікні визначень позбавляють профілюючу інформацію актуальності. Продовжити?")
- 
- ;; test coverage
- (test-coverage-clear? "Зміни в вікні визначень позбавляють інформацю про тестування актуальності. Продовжити?")
- (test-coverage-clear-and-do-not-ask-again "Так, більше не питати")
- (test-coverage-ask? "Питати про очищення інформації про тестування")
-  
- ;; tracing
- (tracing-enable-tracing "Допустити трасування")
- (tracing-show-tracing-window "Показати трасування")
- (tracing-hide-tracing-window "Сховати трасування")
- (tracing-tracing-nothing-to-show "Результати трасування ще не доступні. (Переконайтеся, що обрана мова підтримує трасування і що трасування ввімкнене.)")
-
- ;;; repl stuff
- (evaluation-terminated "Перервати обчислення")
- (evaluation-terminated-explanation
-  "Потік обчислень зупинений до наступного виконання.")
-  
-  ; The next three constants show up in the same dialog as the above evaluation-terminated string
-  ; constants.
-  ; The first two show up only when the user calls 'exit' (possibly with a status code).
-  ; The third shows up when the program runs out of memory.
-  (exited-successfully "Успішне завершення.")
-  (exited-with-error-code "Завершення з кодом помилки ~a.") ;; ~a is filled in with a number between 1 and 255
-  (program-ran-out-of-memory "Програмі не вистачило пам'яті для завершення виконання.")
- (last-stack-frame "Показати останнє значення стеку")
- (last-stack-frames "Показати останні ~a значень стеку")
- (next-stack-frames "Показати наступні ~a значень стеку")
- 
- ;;; welcoming message in repl
- (language "Мова")
- (custom "обрана")
- (teachpack "Навчальний пакет")
- (welcome-to "Ласкаво просимо до")
- (version "версія")
- 
- ;;; kill evaluation dialog
- (kill-evaluation? "Ви хочете перервати цикл обчислень?")
- (just-break "Тільки зупинити")
- (kill "Перервати")
- (kill? "Перервати?")
-
- ;;; version checker
- (version:update-menu-item   "Перевірка оновлень...")
- (version:update-check       "Перевірка оновлень") ; dialog title, with the next line
- (version:connecting-server  "З'єднання з сервером версії Racket")
- (version:results-title      "Перевірка версії Racket")
- (version:do-periodic-checks "Періодично перевіряти новіші версії Racket")
- (version:take-me-there      "Оновити") ; ...to the download website
- ;; the next one can appear alone, or followed by a comma and the one after that
- (version:plt-up-to-date     "У Вас найновіша версія Racket")
- (version:but-newer-alpha    "однак зауважте, що є новіша альфа-версія")
- ;; This is used in this context: "Racket vNNN <<<*>>> http://download..."
- (version:now-available-at   "тепер є в")
-
- ;; insert menu
- (insert-menu "&Вставлення")
- 
- ;; large semi colon letters
- (insert-large-letters... "Вставити великі літери...")
- (large-semicolon-letters "Великі закоментовані літери")
- (text-to-insert "Вставити текст")
-
- (module-browser-filename-format "Повне ім'я: ~a (~a рядків)")
- (module-browser-root-filename "Основне ім'я файлу: ~a")
- (module-browser-font-size-gauge-label "Розмір шрифту")
- (module-browser-progress-label "Процес перегляду модулів")
- (module-browser-adding-file "Додати файл: ~a...")
- (module-browser-laying-out-graph-label "Граф розмітки")
- (module-browser-open-file-format "Відкрити ~a")
- (module-browser "Браузер модуля") ;; frame title
- (module-browser... "Браузер модуля...") ;; menu item title
- (module-browser-error-expanding "Помилка відкриття програми:\n\n~a")
- (module-browser-show-lib-paths "Показувати файли, які завантажуються з бібліотек")
- (module-browser-progress "Браузер модуля: ~a") ;; prefix in the status line
- (module-browser-compiling-defns "Браузер модуля: компіляція визначень")
- (module-browser-show-lib-paths/short "Показувати шляхи до бібліотек") ;; check box label in show module browser pane in drscheme window.
- (module-browser-show-planet-paths/short "Показувати шляхи до planet") ;; check box label in show module browser pane in drscheme window.
- (module-browser-refresh "Оновити") ;; button label in show module browser pane in drscheme window.
-; (module-browser-only-in-plt-and-module-langs
-;  "Браузер модуля доступний лише для програм на PLT-мовах і на мові модуля (і лише для програм, які містять модулі).")
- (module-browser-name-length "Довжина імені")
- (module-browser-name-short "Коротка")
- (module-browser-name-medium "Середня")
- (module-browser-name-long "Довга")
- (module-browser-name-very-long "Довга, з фазами")  ;; like 'Long' but shows the phases where this file is loaded
- (module-browser-open-all "Відкрити всі файли, які тут показані")
-
- (happy-birthday-matthias "З днем народження, Матіас!")
- (happy-birthday-matthew "З днем народження, Метью!")
- (happy-birthday-shriram "З днем народження, Шрірам!")
-
- (mrflow-using-default-language-title "Мова за замовчуванням")
- (mrflow-using-default-language "У мові, що використовується, не визначена таблиця типів для її примітивів. Зверніться до  стандарту Scheme.")
- (mrflow-button-title "Аналізувати")
- ;(mrflow-unknown-style-delta-error-title "Невідомий стиль блоку дельта")
- ;(mrflow-unknown-style-delta-error "Невідомий стиль блоку дельта: ~a")
- (mrflow-popup-menu-show-type "Показати тип")
- (mrflow-popup-menu-hide-type "Сховати тип")
- (mrflow-popup-menu-show-errors "Показати помилки")
- (mrflow-popup-menu-hide-errors "Сховати помилки")
- ;(mrflow-read-exception-title "Read Exception")
- ;(mrflow-read-exception "Read exception: ~a")
- ;(mrflow-syntax-exception-title "Syntax Exception")
- ;(mrflow-syntax-exception "Syntax Exception: ~a")
- ;(mrflow-unknown-exception-title "Unknown Exception")
- ;(mrflow-unknown-exception "Unknown Exception: ~a")
- ;(mrflow-language-primitives-error-title "Language Primitives Error")
- ;(mrflow-language-primitives-error "Wrong filename for language primitives types table: ~a")
-  
- (snips-and-arrows-popup-menu-tack-all-arrows "З'єднати всі стрілки")
- (snips-and-arrows-popup-menu-untack-all-arrows "Видалити всі стрілки")
- (snips-and-arrows-user-action-disallowed-title "Внесення змін користувачем наразі заборонено")
- (snips-and-arrows-user-action-disallowed "Внесення змін користувачем заборонено в редакторах, які містять елементи з панелі інструментів. Сховайте всі інструменти перед редагуванням.")
- ;(snips-and-arrows-changing-terms-warning-title "Changing terms will be undoable")
- ;(snips-and-arrows-changing-terms-warning "Changing terms in an editor containing snips cannot be undone.  You can either cancel this action, remove the snips, and try the change again, or you can continue with the change, in which case the change will not be undoable (all others changes made before and afterward will still be undoable though).")
- (snips-and-arrows-hide-all-snips-in-editor "Сховати всі інструменти, що вставлені в редактор")
-
- (xml-tool-insert-xml-box "Вставити блок XML")
- (xml-tool-insert-scheme-box "Вставити блок Racket")
- (xml-tool-insert-scheme-splice-box "Приєднати блок Racket")
- (xml-tool-xml-box "XML блок")
- (xml-tool-scheme-box "Racket блок")
- (xml-tool-scheme-splice-box "Приєднаний блок Racket")
- (xml-tool-switch-to-scheme "Перемкнутися на блок Racket")
- (xml-tool-switch-to-scheme-splice "Перемкнутися на приєднаний блок Racket")
- (xml-tool-eliminate-whitespace-in-empty-tags
-  "Видаляти пробіли в пустих тегах")
- (xml-tool-leave-whitespace-alone
-  "Залишати по одному пробілу")
- 
- (show-recent-items-window-menu-item "Показати нещодавно відкриті файли в окремому вікні")
- (show-recent-items-window-label "Нещодавно відкриті файли")
- (number-of-open-recent-items "Кількість нещодавніх елементів")
- (switch-anyway "Все одно перейти до файлу")
-
- (stepper-program-has-changed "Попередження: Програма була змінена.")
- (stepper-program-window-closed "Попередження: Вікно програми закрите.")
-
- (stepper-name "Покрокове виконання")
- (stepper-language-level-message "Покрокове виконання не працює для мови \"~a\".")
- (stepper-button-label "Крок")
-
- (stepper-previous-application "Програма")
- (stepper-previous "Крок")
- (stepper-next "Крок")
- (stepper-next-application "Програма")
- (stepper-jump "Перейти...") ;; this one is changed.  action?
- (stepper-out-of-steps "Обчислення завершено раніше, ніж досягнуто шуканий крок.")
- (stepper-no-such-step/title "Крок не знайдено")
- (stepper-no-such-step "Крок, що відповідає критерію, не знайдено.")
- (stepper-no-such-step/earlier "Попередній крок, що відповідає критерію, не знайдено.")
- (stepper-jump-to-beginning "в початок") ;; name changed from stepper-home to stepper-jump-to-beginning
- (stepper-jump-to-end "в кінець") ;; content changed
- (stepper-jump-to-selected "до початку обраного") ;; new
- 
- (debug-tool-button-name "Налагодити")
-
- (dialog-back "Назад")
-
- ;; warnings about closing a drscheme frame when the program
- ;; might still be doing something interesting
- (program-is-still-running "Програма в вікні визначень все ще виконується. Все одно закрити?")
-  (program-has-open-windows "Програма в вікні визначень має відкриті вікна. Все одно закрити?")
- 
-  ;; ml-command-line-arguments is for the command line arguments
-  ;; label in the module language details in the language dialog.
-  (ml-command-line-arguments "Аргументи командного рядка як вектор рядків")
-
-  ;; ml-cp names are all for the module language collection path
-  ;; configuration. See the details portion of the language dialog
-  ;; for the module language (at the bottom).
-  (ml-cp-default-collection-path "<<шляхи до колекції за замовчуванням>>")
-
-  ;; in std get-directory 
-  (ml-cp-choose-a-collection-path "Будь-ласка, оберіть шлях до колекції")
-
-  ;; err msg when adding default twice
-  (ml-cp-default-already-present
-   "Задані за замовчуванням шляхи до колекції вже встановлені")
-  
-  ;; title of this section of the dialog (possibly the word
-  ;; `Collection' should not be translated)
-  (ml-cp-collection-paths "Шляхи до колекції")
-
-  ;; button labels
-  (ml-cp-add "Додати")
-  (ml-cp-add-default "Додати за замовчуванням")
-  (ml-cp-remove "Видалити")
-  (ml-cp-raise "Вгору")
-  (ml-cp-lower "Вниз")
-  
-  (ml-always-show-#lang-line "Завжди показувати рядок #lang модуля мови")
-
-  ;; Profj
-  (profj-java "Java")
-  (profj-java-mode "Режим Java")
-  (profj-java-coverage "Набір Java") ;; shows up in the preferences dialog under 'Color'
-
-  (profj-beginner-lang "Початківець")
-  (profj-beginner-lang-one-line-summary "Java-подібна мова для навчання початківців")
-  (profj-full-lang "Достатній")
-  (profj-full-lang-one-line-summary "Подібна Java 1.0 (наближено 1.1)")
-  (profj-advanced-lang "Досвічений")
-  (profj-advanced-lang-one-line-summary "Java-подібна мова для навчання досвічених користувачів")
-  (profj-intermediate-lang "Середній")
-  (profj-intermediate-lang-one-line-summary "Java-подібна мова для тих, хто продовжує навчання")
-  (profj-intermediate-access-lang "Середній + доступ")
-  (profj-intermediate-access-lang-one-line-summary "Java-подібна мова для тих, хто продовжує навчання, з доступом до модифікаторів")
-  (profj-dynamic-lang "Java + динамічна типізація")
-  (profj-dynamic-lang-one-summary "Java з можливістю динамічної типізації")
-
-  (profj-java-mode-color-heading "Кольори редагування") ; Heading for preference to choose editing colors  
-  (profj-java-mode-color-keyword "ключові слова")
-  (profj-java-mode-color-string "рядок")
-  (profj-java-mode-color-literal "літерал")
-  (profj-java-mode-color-comment "коментар")
-  (profj-java-mode-color-error "помилка")
-  (profj-java-mode-color-identifier "ідентифікатор")
-  (profj-java-mode-color-prim-type "примітивний тип") ; Example text for built-in Java types
-  (profj-java-mode-color-default "за замовчуванням")
-
-  (profj-coverage-color-heading "Кольори середовища") ; Heading for preference to choose coverage colors
-  (profj-coverage-color-covered "вираз") 
-  
-  (profj-language-config-display-preferences "Персональні налаштування відображення") ; Heading for preferences controlling printing
-  (profj-language-config-display-style "Стиль відображення")
-  (profj-language-config-display-field "Клас + Поля")
-  (profj-language-config-class "Клас")
-  (profj-language-config-display-array "Виводити масиви повністю?")
-  (profj-language-config-testing-preferences "Налаштування тестування") ; Heading for preferences controlling test behavior
-  ;(profj-language-config-testing-enable "Відображати результати тестування при виконанні?") ; Run should be the word found on the Run button
-  (profj-language-config-testing-coverage "Зібрати інформацію для тестування?")
-  (profj-language-config-support-test-language "Підтримувати тестування мовних розширень?")
-  (profj-language-config-testing-check "Дозволити перевірку виразів?") ; check should not be translated
-  (profj-language-config-classpath "Шлях до класів")
-  (profj-language-config-choose-classpath-directory "Обрати каталог для додавання до шляху до класів")
-  (profj-language-config-classpath-display "Показати поточний") ; Button label to print the current classpath
-
-  (profj-test-name-close-to-example "Ім'я класу ~a містить фразу, близьку до зразків.")
-  (profj-test-name-example-miscapitalized "Ім'я класу ~a з точністю до регістру містить зразок.")
-  
-   ;; Close testing window and do not run test cases any more
-  ;(profj-test-results-close-and-disable "Закрити й заборонити тестування")
-  ;; Hide docked testing window and do not run test cases any more
-  ;(profj-test-results-hide-and-disable "Сховати й заборонити тестування")
-  ;Renamed below
-  ;(profj-test-results-window-title "Результати тестування")
-  
-  (profj-unsupported "Не підтримується")
-  (profj-executables-unsupported "Вибачте, наразі Java не підтримує виконувані файли")
-
-  (profj-convert-to-text-comment "Перетворити в текстовий коментар")
-  (profj-convert-to-comment "Перетворити в коментар")
-
-  (profj-executing-main "виконання main")
-
-  (profj-insert-java-comment-box "Вставити блок Java-коментарю")
-  (profj-insert-java-interactions-box "Вставити блок Java-коду")
-
-  ;;The Test engine tool
-  ;;
-  (test-engine-window-title "Результати тестування")
-  ;;Following two appear in View menu, attach and free test report window from DrRacket frame
-  (test-engine-dock-report "Прикріпити звіт про тестування")
-  (test-engine-undock-report "Відкріпити звіт про тестування")
-  ;;Following two appear in Racket (Java, etc) menu, cause Tests to be Run automatically or not
-  (test-engine-enable-tests "Дозволити тестування")
-  (test-engine-disable-tests "Заборонити тестування")
-
-  (test-engine-ran-1-test "Виконаний 1 тест.")
-  (test-engine-ran-1-check "Виконана 1 перевірка.")
-  ;; ditto, only plural
-  (test-engine-ran-n-tests "Виконано  ~a тестів.")
-  (test-engine-ran-n-checks "Виконано ~a перевірок.")
-  (test-engine-1-test-passed "Тест пройдений!")
-  (test-engine-1-check-passed "Перевірка закінчена!")
-  (test-engine-both-tests-passed "Обидва тести пройдені!")
-  (test-engine-both-checks-passed "Обидві перевірки закінчені!")
-  (test-engine-all-tests-passed "Всі тести пройдені!")
-  (test-engine-all-checks-passed "Всі перевірки закінчені!")
-  (test-engine-all-n-tests-passed "Всі ~a тести пройдені!")
-  (test-engine-all-n-checks-passed "Всі ~a перевірки закінчені!")
-  (test-engine-0-tests-passed "0 тестів пройдено.")
-  (test-engine-0-checks-passed "0 перевірок закінчено.")
-  (test-engine-m-of-n-tests-failed "~a з ~a тестів помилкові.")
-  (test-engine-m-of-n-checks-failed "~a з ~a перевірок помилкові.")
-  (test-engine-must-be-tested "Ця програма повинна бути протестована!")
-  (test-engine-is-unchecked "Ця програма не перевірена!")
-  (test-engine-tests-disabled "Тести відключені.")
-  (test-engine-should-be-tested "Ця програма повинна бути перевірена.")
-  (test-engine-at-line-column "в рядку ~a, стовбцю ~a")
-  (test-engine-in-at-line-column "в ~a, рядку ~a, стовбцю ~a")
-  ; as in "column (unknown)"
-  (test-engine-unknown "(невідомо)")
-  (test-engine-trace-error "Помилка трасування")
-
-  ; The ~F is special marker for the offending values, which may be
-  ; printed specially in DrRacket.
-  (test-engine-check-encountered-error
-   "помилка перевірки: замість очікуваного значення, ~F. ~n   :: ~a")
-  (test-engine-actual-value-differs-error
-   "Фактичне значення ~F відрізняється від очікуваного ~F.")
-  (test-engine-actual-value-not-within-error
-   "Фактичне значення ~F виходить за границі ~v очікуваного значення ~F.")
-  (test-engine-encountered-error-error
-   "помилка перевірки: наступна помилка замість очікуваного ~a~n   :: ~a")
-  (test-engine-expected-error-error
-   "помилка перевірки: очікувалась помилка, натомість отримано значення ~F.~n ~a")
-
-  ; section header
-  (test-engine-check-failures "Помилки тестування:")
-  ; section header
-  (test-engine-signature-violations "Порушення домовленості:")
-
-  ; part of one phrase "signature <at line ...> to blame: procedure <...>
-  (test-engine-signature "домовленість")
-  (test-engine-to-blame "порушено: процедура")
-
-  (test-engine-no-signature-violations "Немає порушень домовленості.")
-  (test-engine-1-signature-violation "1 порушення домовленості.")
-  (test-engine-n-signature-violations "~a порушень домовленості.")
-
-  ; as in got <value>, signature <at ...>
-  (test-engine-got "отримано")
-  
-  (profjWizward-insert-java-class "Вставити клас Java")
-  (profjWizard-insert-java-union "Вставити об'єднання Java")
-  
-  ;; The Test Suite Tool
-  ;; Errors
-  (test-case-empty-error "Пустий набір тестів")
-  (test-case-too-many-expressions-error "Забагато виразів у наборі тестів.")
-  ;; DrRacket window menu items
-  (test-case-insert "Вставити набір тестів")
-  (test-case-disable-all "Відключити всі набори тестів")
-  (test-case-enable-all "Ввімкнути всі набори тестів")
-  
-  ;; NOTE: The following string constants are labels of the test-case fields. The width
-  ;;       of the field is determined by the length of the longest of the following three words.
-  ;;       if the words are too long the test case will take up too much horizontal room and
-  ;;       not look very good.
-  ;; This string is the label of the expression that is being tested in a test case.
-  (test-case-to-test "Виконується перевірка")
-  ;; This string is the label of the expression that is the expected value of the to-test expression.
-  (test-case-expected "Повинно бути")
-  ;; This string is the label of the actual result of the to test expression.
-  (test-case-actual "Фактично")
-  (test-case-predicate "Предикат")
-  (test-case-should-raise "Повинен бути")
-  ;; The label of a field of the test-case that describes the expected error message of a test case
-  (test-case-error-message "Повідомлення про помилку")
-
-  (test-case-menu-title "Набір тестів")
-  (test-case-switch-to-error-box "Перейти до вікна помилкових тестів")
-  (test-case-switch-to-nonerror-box "Перейти до вікна безпомилкивих тестів")
-  (test-case-collapse "Згорнути набір тестів")
-  (test-case-show-actual "Показати фактичне значення")
-  (test-case-enable "Дозволити набір тестів")
-  (test-case-show-predicate "Показати предикат")
-  (test-case-show-error-message "Показати повідомлення про помилку")
-  (test-case-convert-to-text "Перетворити в текст")
-  
-  ;; Profj Boxes
-  (profjBoxes-empty-error "Не задані дії")
-  (profjBoxes-too-many-expressions-error "Забагато виразів")
-  (profjBoxes-interactions-label "Дії")
-  (profjBoxes-bad-java-id-error "Невірний Java ID")
-  (profjBoxes-examples-label "Зразки")
-  (profjBoxes-add-new-example-button "Додати новий зразок")
-  (profjBoxes-type "Тип")
-  ;; The Java identifier of an example of data
-  (profjBoxes-name "Ім'я")
-  (profjBoxes-value "Значення")
-  (profjBoxes-insert-java-examples "Вставити зразки Java")
-  (profjBoxes-insert-java-interactions "Вставити Java-код")
-
-  ;; Slideshow
-  (slideshow-hide-picts "Показати вкладені поля")
-  (slideshow-show-picts "Показати малюнки")
-  (slideshow-cannot-show-picts "Неможливо відобразити малюнки; запустіть програму для кешування розмірів")
-  (slideshow-insert-pict-box "Вставити блок малюнку") 
-
-  ;; GUI Tool
-  (gui-tool-heading "Інструмент графічного інтерфейсу користувача")
-  (gui-tool-before-clicking-message "Перед обранням іконки на панелі використайте \"Вставити елемент графічного інтерфейсу користувача\" з меню \"Спеціальне вставлення\" в кореневий елемент графічного інтерфейсу користувача або оберіть уже вставлений елемент.")
-  (gui-tool-show-gui-toolbar "Показати панель інструментів графічного інтерфейсу користувача")
-  (gui-tool-hide-gui-toolbar "Сховати панель інструментів графічного інтерфейсу користувача")
-  (gui-tool-insert-gui "Вставити елемент графічного інтерфейсу користувача")
-
-  ;; contract violation tracking
-  
-  ; tooltip for new planet icon in drscheme window (must have a planet violation logged to see it)
-  (show-planet-contract-violations "Показати порушення від PLaneT")
-
-  ; buttons in the dialog that lists the recorded bug reports
-  (bug-track-report "Файл звіту")
-  (bug-track-forget "Не опрацьовувати")
-  (bug-track-forget-all "Все проігнорувати")
-    
-  ;; planet status messages in the bottom of the drscheme window; the ~a is filled with the name of the package
-  (planet-downloading "PLaneT: завантаження ~a...")
-  (planet-installing "PLaneT: інсталяція ~a...")
-  (planet-finished "PLaneT: закінчена з ~a.")
-  (planet-no-status "PLaneT") ;; this can happen when there is status shown in a different and then the user switches to a tab where planet hasn't been used
-  
-  ;; string normalization. To see this, paste some text with a ligature into DrRacket
-  ;; the first three strings are in the dialog that appears. The last one is in the preferences dialog
-  (normalize "Нормалізувати")
-  (leave-alone "Залишити без змін")
-  (normalize-string-info "Вставлений рядок, містить лігатури й інші ненормалізовані знаки. Нормалізувати їх?")
-  (normalize-string-preference "Нормалізувати вставлені рядки")
-  (ask-about-normalizing-strings "Запитувати про нормалізацію рядків")
-
-  )
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/string-constant.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/string-constant.rkt
deleted file mode 100644
index 9ca991e5fa..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/string-constant.rkt
+++ /dev/null
@@ -1,235 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base 
-                     racket/list
-                     (prefix-in english-ct: "private/english-string-constants.rkt"))
-         racket/file
-         racket/contract/base
-         (prefix-in english: "private/english-string-constants.rkt")
-         (prefix-in spanish: "private/spanish-string-constants.rkt")
-         (prefix-in german: "private/german-string-constants.rkt")
-         (prefix-in french: "private/french-string-constants.rkt")
-         (prefix-in dutch: "private/dutch-string-constants.rkt")
-         (prefix-in danish: "private/danish-string-constants.rkt")
-         (prefix-in portuguese: "private/portuguese-string-constants.rkt")
-         (prefix-in japanese: "private/japanese-string-constants.rkt")
-         (prefix-in traditional-chinese: "private/traditional-chinese-string-constants.rkt")
-         (prefix-in simplified-chinese: "private/simplified-chinese-string-constants.rkt")
-         (prefix-in russian: "private/russian-string-constants.rkt")
-         (prefix-in ukrainian: "private/ukrainian-string-constants.rkt")
-         (prefix-in korean: "private/korean-string-constants.rkt"))
-
-(provide string-constant string-constants 
-         this-language all-languages set-language-pref)
-(provide
- (contract-out
-  [string-constant? (-> any/c boolean?)]
-  [dynamic-string-constant (-> string-constant? string?)]
-  [dynamic-string-constants (-> string-constant? (listof string?))]))
-
-;; set-language-pref : symbol -> void
-(define (set-language-pref language)
-  (put-preferences (list 'plt:human-language) (list language)))
-
-;; table : (listof (list symbol regexp regexp))
-;; this table indicates what the default value of the natural language
-;; preference is. the first regexp is used under Windows and the second
-;; is used on other platforms. All regexps are compared to the result
-;; of (system-language+country)
-(define table
-  '((english             #rx"^en_"        #rx"^English_")
-    (spanish             #rx"^es_"        #rx"^Espanol_")
-    (german              #rx"^de_"        #rx"^German_")
-    (french              #rx"^fr_"        #rx"French_")
-    (dutch               #rx"nl_"         #rx"^Netherlands_")
-    (danish              #rx"^da_DK"      #rx"^Danish_")
-    (portuguese          #rx"^pt_"        #rx"Portuguese_")
-    (japanese            #rx"^ja_"        #rx"^Japan_")
-    (traditional-chinese #rx"^zh_(HK|TW)" #rx"Chinese_(Hong|Taiwan)")
-    (simplified-chinese  #rx"^zh_CN"      #rx"Chinese_China")
-    (russian             #rx"^ru_"        #rx"^Russian_")
-    (ukrainian           #rx"^uk_"        #rx"^Ukrainian_")
-    (korean              #rx"^ko_"        #rx"^Korean_")))
-
-;; default-language : -> symbol
-;; uses `table' and system-language+contry to find what language to start with
-(define (default-language)
-  (let ([slc (system-language+country)])
-    (let loop ([table table])
-      (if (null? table)
-        'english
-        (let ([ent (car table)])
-          (if (or (regexp-match (cadr ent) slc)
-                  (and (cddr ent)
-                       (regexp-match (caddr ent) slc)))
-            (car ent)
-            (loop (cdr table))))))))
-
-(define-struct sc (language-name constants [ht #:mutable]))
-
-(define available-string-constant-sets
-  (list
-   (make-sc 'english             english:string-constants             #f)
-   (make-sc 'spanish             spanish:string-constants             #f)
-   (make-sc 'french              french:string-constants              #f)
-   (make-sc 'german              german:string-constants              #f)
-   (make-sc 'dutch               dutch:string-constants               #f)
-   (make-sc 'danish              danish:string-constants              #f)
-   (make-sc 'portuguese          portuguese:string-constants          #f)
-   (make-sc 'japanese            japanese:string-constants            #f)
-   (make-sc 'traditional-chinese traditional-chinese:string-constants #f)
-   (make-sc 'simplified-chinese  simplified-chinese:string-constants  #f)
-   (make-sc 'russian             russian:string-constants             #f)
-   (make-sc 'ukrainian           ukrainian:string-constants           #f)
-   (make-sc 'korean              korean:string-constants              #f)))
-
-(define first-string-constant-set (car available-string-constant-sets))
-
-;; language : symbol
-(define language
-  (with-handlers ([exn:fail? (lambda (_) (default-language))])
-    (get-preference 'plt:human-language (lambda () (default-language)))))
-
-(define the-sc
-  (or (for/or ([sc (in-list available-string-constant-sets)])
-        (and (equal? language (sc-language-name sc))
-             sc))
-      first-string-constant-set))
-
-(define (dynamic-string-constant key) 
-  (dynamic-string-constant/who the-sc key 'dynamic-string-constant))
-
-(define (dynamic-string-constants key)
-  (for/list ([sc (in-list available-string-constant-sets)])
-    (dynamic-string-constant/who sc key 'dynamic-string-constants)))
-
-(define (dynamic-string-constant/who an-sc key who)
-  (show-warning-message)
-  (hash-ref (sc-constants an-sc) key
-            (λ ()
-              (hash-ref (sc-constants first-string-constant-set)
-                        key
-                        (λ ()
-                          (error who
-                                 "unknown string-constant\n  key: ~e" key))))))
-
-(define (string-constant? sym)
-  (and (hash-ref (sc-constants first-string-constant-set) sym #f)
-       #t))
-              
-
-(define already-warned? #f)
-(define (show-warning-message)
-  (when env-var-set
-    (unless already-warned?
-      (set! already-warned? #t)
-      ;; type no-warning-cache-key = (cons symbol symbol)
-      ;; warning-table : (listof (list no-warning-cache-key (listof (list sym string))))
-      (define warning-table null)
-      (define (extract-ht sc)
-        (unless (sc-ht sc)
-          (define ht (make-hash))
-          (for ([(ent val) (in-hash (sc-constants sc))])
-            (hash-set! ht ent #t))
-          (set-sc-ht! sc ht))
-        (sc-ht sc))
-      (define (check-one-way sc1 sc2)
-        (define assoc1 (sc-constants sc1))
-        (define assoc2 (sc-constants sc2))
-        (define ht2 (extract-ht sc2))
-        (for ([(constant1 value1) (in-hash assoc1)])
-          (define pair2 (hash-ref ht2 constant1 #f))
-          (unless pair2
-            (define no-warning-cache-key (cons (sc-language-name sc1)
-                                               (sc-language-name sc2)))
-            (when (or (env-var-set? (sc-language-name sc1))
-                      (env-var-set? (sc-language-name sc2)))
-              (cond
-                [(memf (lambda (ent) (equal? (mcar ent) no-warning-cache-key)) 
-                       warning-table)
-                 =>
-                 (lambda (x)
-                   (let ([ent (car x)])
-                     (set-mcdr! ent (cons (list constant1 value1) (mcdr ent)))))]
-                [else
-                 (set! warning-table (cons (mcons no-warning-cache-key
-                                                  (list (list constant1 value1)))
-                                           warning-table))])))))
-      
-      (for ([x (in-list (cdr available-string-constant-sets))])
-        (check-one-way x first-string-constant-set)
-        (check-one-way first-string-constant-set x))
-      
-      (define sp (open-output-string))
-      (for ([bad (in-list warning-table)])
-        (define lang-pair (mcar bad))
-        (define constants (mcdr bad))
-        (define lang1-name (car lang-pair))
-        (define lang2-name (cdr lang-pair))
-        (fprintf sp "WARNING: language ~a has but ~a does not:\n"
-                 lang1-name
-                 lang2-name)
-        (define sorted-constants
-          (sort constants string<?
-                #:key (λ (p) (symbol->string (car p)))
-                #:cache-keys? #t))
-        (for ([x (in-list sorted-constants)])
-          (fprintf sp "   ~s\n" x))
-        (newline sp))
-      
-      (with-handlers ([exn:fail? (lambda (x) (void))])
-        ;; the output port may no longer be there, in which case
-        ;; we just give up on printing
-        (eprintf "~a" (get-output-string sp))))))
-
-;; env-var-set? : symbol -> boolean
-;; returns #t if the user has requested this langage info.
-;; If the environment variable is set to something that
-;; isn't well-formed according to `read' you get all output
-;; If the environment variable is set to a symbol (according to read)
-;; you get that language. If it is set to a list of symbols
-;; (again, according to read) you get those languages.
-;; if it is set to anything else, you get all languages.
-(define (env-var-set? lang)
-  (cond [(symbol? specific) (equal? lang specific)]
-        [(list? specific) (member lang specific)]
-        [else #t]))
-
-(define env-var-set
-  (or (getenv "PLTSTRINGCONSTANTS")
-      (getenv "STRINGCONSTANTS")))
-
-(define specific
-  (and env-var-set
-       (with-handlers ([exn:fail:read? (lambda (x) #t)])
-         (read (open-input-string env-var-set)))))
-
-
-(define-for-syntax (check-name name-stx stx)
-  (define datum (syntax->datum name-stx))
-  (unless (symbol? datum)
-    (raise-syntax-error #f (format "expected name, got: ~s" datum) stx))
-  (define default-val (hash-ref english-ct:string-constants datum #f))
-  (unless default-val
-    (raise-syntax-error
-     #f
-     (format "~a is not a known string constant" datum)
-     stx)))
-
-(define-syntax (string-constant stx)
-  (syntax-case stx ()
-    [(_ name)
-     (begin
-       (check-name #'name stx)
-       #'(dynamic-string-constant 'name))]))
-
-(define-syntax (string-constants stx)
-  (syntax-case stx ()
-    [(_ name)
-     (begin
-       (check-name #'name stx)
-       #'(dynamic-string-constants 'name))]))
-
-(define (this-language) language)
-
-(define (all-languages) (map sc-language-name available-string-constant-sets))
-
diff --git a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/tests/test-docs-complete.rkt b/pkgs/string-constants-pkgs/string-constants-lib/string-constants/tests/test-docs-complete.rkt
deleted file mode 100644
index 446f8ada75..0000000000
--- a/pkgs/string-constants-pkgs/string-constants-lib/string-constants/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote string-constants/string-constant))
-(check-docs (quote string-constants))
diff --git a/pkgs/string-constants-pkgs/string-constants/LICENSE.txt b/pkgs/string-constants-pkgs/string-constants/LICENSE.txt
deleted file mode 100644
index de93c61880..0000000000
--- a/pkgs/string-constants-pkgs/string-constants/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-gui
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/string-constants-pkgs/string-constants/info.rkt b/pkgs/string-constants-pkgs/string-constants/info.rkt
deleted file mode 100644
index 05d0888ffb..0000000000
--- a/pkgs/string-constants-pkgs/string-constants/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("string-constants-lib"
-               "string-constants-doc"))
-(define implies '("string-constants-lib"
-                  "string-constants-doc"))
-
-(define pkg-desc "String constants to support internationalization, especially in DrRacket")
-
-(define pkg-authors '(robby))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-doc/LICENSE.txt b/pkgs/syntax-color-pkgs/syntax-color-doc/LICENSE.txt
deleted file mode 100644
index fe169ce015..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax-color-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/syntax-color-pkgs/syntax-color-doc/info.rkt b/pkgs/syntax-color-pkgs/syntax-color-doc/info.rkt
deleted file mode 100644
index eb6d222464..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-doc/info.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("gui-doc"
-                     "scribble-doc"
-                     "gui-lib"
-                     "scribble-lib"
-                     "racket-doc"
-                     "syntax-color-lib"))
-(define deps '("base"))
-(define update-implies '("syntax-color-lib"))
-
-(define pkg-desc "documentation part of \"syntax-color\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-doc/syntax-color/info.rkt b/pkgs/syntax-color-pkgs/syntax-color-doc/syntax-color/info.rkt
deleted file mode 100644
index 3facf10d6b..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-doc/syntax-color/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("syntax-color.scrbl" () (gui-library))))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-doc/syntax-color/syntax-color.scrbl b/pkgs/syntax-color-pkgs/syntax-color-doc/syntax-color/syntax-color.scrbl
deleted file mode 100644
index c915baca24..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-doc/syntax-color/syntax-color.scrbl
+++ /dev/null
@@ -1,298 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          (for-label syntax-color/token-tree
-                     syntax-color/paren-tree
-                     syntax-color/racket-lexer
-                     syntax-color/module-lexer
-                     syntax-color/scribble-lexer
-                     syntax-color/default-lexer
-                     framework
-                     framework/private/color
-                     racket))
-
-@title{Syntax Color: Utilities}
-
-@author["Scott Owens"]
-
-The @filepath{syntax-color} collection provides the underlying data
-structures and some helpful utilities for the @racket[color:text<%>]
-class of @racketmodname[framework].
-
-@; ----------------------------------------------------------------------
-
-@section{Parenthesis Matching}
-
-@defmodule[syntax-color/paren-tree]
-
-@defclass[paren-tree% object% ()]
-
-Parenthesis matching code built on top of @racket[token-tree%].
-
-@; ----------------------------------------------------------------------
-
-@section{Lexer Contract & the Don't Stop struct}
-
-@defmodule[syntax-color/lexer-contract]
-
-@defthing[lexer/c contract?]{
-  Checks to be sure a lexing function is well-behaved. For more
-  details, see @xmethod[color:text<%> start-colorer].
-}
-
-@defstruct[dont-stop ([val any/c])]{
-  A struct used to indicate to the lexer that it should not
-  allow itself to be interrupted. For more details,
-  see @xmethod[color:text<%> start-colorer].
-}
-
-@section{Racket Lexer}
-
-@defmodule[syntax-color/racket-lexer]
-
-@defproc[(racket-lexer [in input-port?]) 
-         (values (or/c string? eof-object?) 
-                 symbol?
-                 (or/c symbol? #f) 
-                 (or/c number? #f) 
-                 (or/c number? #f))]{
-
-A lexer for Racket, including reader extensions (@secref[#:doc'(lib
-"scribblings/reference/reference.scrbl")]{Reader_Extension}), built
-specifically for @racket[color:text<%>].
-
-The @racket[racket-lexer] function returns 5 values:
-
-@itemize[
-  @item{Either a string containing the matching text or the eof object.  
-   Block comments and specials currently return an empty string.  
-   This may change in the future to other string or non-string data.}
-
-  @item{A symbol in @racket['(error comment sexp-comment 
-   white-space constant string no-color parenthesis hash-colon-keyword symbol eof other)].}
-
-  @item{A symbol in @racket['(|(| |)| |[| |]| |{| |}|)] or @racket[#f].}
-
-  @item{A number representing the starting position of the match (or @racket[#f] if eof).}
-
-  @item{A number representing the ending position of the match (or @racket[#f] if eof).}]
-
-}
-
-@defproc[(racket-lexer/status [in input-port?]) 
-         (values (or/c string? eof-object?) 
-                 symbol?
-                 (or/c symbol? #f) 
-                 (or/c number? #f) 
-                 (or/c number? #f)
-                 (or/c 'datum 'open 'close 'continue))]{
-
-Like @racket[racket-lexer], but returns an extra value. The last
-return value indicates whether the consumed token should count as a
-datum, an opening parenthesis (or similar starting token to group
-other tokens), a closing parenthesis (or similar), or a prefix (such
-as whitespace) on a datum.}
-
-@defproc[(racket-nobar-lexer/status [in input-port?]) 
-         (values (or/c string? eof-object?) 
-                 symbol?
-                 (or/c symbol? #f) 
-                 (or/c number? #f) 
-                 (or/c number? #f)
-                 (or/c 'datum 'open 'close 'continue))]{
-
-Like @racket[racket-lexer/status], except it treats
-@litchar{|} as a delimiter instead of quoting syntax for a symbol.
-This function is used by @racket[scribble-lexer].}
-
-
-@section{Default lexer}
-@defmodule[syntax-color/default-lexer]
-
-@defproc[(default-lexer [in input-port?]) 
-         (values (or/c string? eof-object?)
-                 symbol? 
-                 (or/c symbol? #f) 
-                 (or/c number? #f)
-                 (or/c number? #f))]
-
-A lexer that only identifies @litchar{(}, @litchar{)}, @litchar{[},
-@litchar{]}, @litchar["{"], and @litchar["}"] built specifically for
-@racket[color:text<%>].
-
-@racket[default-lexer] returns 5 values:
-
-@itemize[
-  @item{Either a string containing the matching text or the eof object.  
-   Block specials currently return an empty string.  
-   This may change in the future to other string or non-string data.}
-
-  @item{A symbol in @racket['(comment white-space no-color eof)].}
-
-  @item{A symbol in @racket['(|(| |)| |[| |]| |{| |}|)] or @racket[#f].}
-
-  @item{A number representing the starting position of the match (or @racket[#f] if eof).}
-
-  @item{A number representing the ending position of the match (or @racket[#f] if eof).}]
-
-
-@section{Module Lexer}
-
-@defmodule[syntax-color/module-lexer]
-
-@defproc[(module-lexer [in input-port?]
-                       [offset exact-nonnegative-integer?]
-                       [mode (or/c #f
-                                   (-> input-port? any)
-                                   (cons/c (-> input-port? any/c any) any/c))])
-         (values (or/c string? eof-object?) 
-                 symbol?
-                 (or/c symbol? #f) 
-                 (or/c number? #f) 
-                 (or/c number? #f)
-                 exact-nonnegative-integer?
-                 (or/c #f 
-                       (-> input-port? any)
-                       (cons/c (-> input-port? any/c any) any/c)))]{
-
-Like @racket[racket-lexer], but with several differences:
-
-@itemize[
-
- @item{The @racket[module-lexer] function accepts an offset and lexer
-       mode, instead of just an input port.}
-
- @item{In addition to the results of @racket[racket-lexer],
-       @racket[module-lexer] returns a backup distance and a new lexer
-       mode.}
-
- @item{When @racket[mode] is @racket[#f] (indicating the start of the
-       stream), the lexer checks @racket[in] for a @hash-lang[]
-       specification.
-
-       If a @hash-lang[] line is present but the specified
-       language does not exist, the entire @racket[in] input is
-       consumed and colored as @racket['error].
-
-       If the language exists and the language provides a
-       @racket[get-info] function, then it is called with
-       @racket['color-lexer]. If the result is not @racket[#f], then
-       it should be a lexer function for use with
-       @racket[color:text<%>]. The result mode is the lexer---paired
-       with @racket[#f] if the lexer is a procedure arity 3---so that
-       future calls will dispatch to the language-supplied lexer.
-
-       If the language is specified but it provides no
-       @racket[get-info] or @racket['color-lexer] result, then
-       @racket[racket-lexer] is returned as the mode.}
-
- @item{When @racket[mode] is a lexer procedure, the lexer is applied
-       to @racket[in]. The lexer's results are returned, plus the
-       lexer again as the mode.}
-
- @item{When @racket[mode] is a pair, then the lexer procedure in the
-       @racket[car] is applied to @racket[in], @racket[offset], and the mode in the
-       @racket[cdr]. The lexer's results are returned, except that its
-       mode result is paired back with the lexer procedure.}
-
-]}
-
-@section{Scribble Lexer}
-
-@defmodule[syntax-color/scribble-lexer]
-
-@defproc[(scribble-lexer [in input-port?]
-                         [offset exact-nonnegative-integer?]
-                         [mode any/c])
-         (values (or/c string? eof-object?) 
-                 symbol?
-                 (or/c symbol? #f) 
-                 (or/c number? #f) 
-                 (or/c number? #f)
-                 exact-nonnegative-integer?
-                 any/c)]{
-
-Like @racket[racket-lexer], but for Racket extended with Scribble's
-@"@" notation (see @secref[#:doc '(lib
-"scribblings/scribble/scribble.scrbl") "reader"]).}
-
-@defproc[(scribble-inside-lexer [in input-port?]
-                                [offset exact-nonnegative-integer?]
-                                [mode any/c])
-         (values (or/c string? eof-object?) 
-                 symbol?
-                 (or/c symbol? #f) 
-                 (or/c number? #f) 
-                 (or/c number? #f)
-                 exact-nonnegative-integer?
-                 any/c)]{
-
-Like @racket[scribble-lexer], but starting in ``text'' mode instead of
-Racket mode.}
-
-@; ----------------------------------------------------------------------
-
-@section{Splay Tree for Tokenization}
-@defmodule[syntax-color/token-tree]
-
-@defclass[token-tree% object% ()]{
-
-A splay-tree class specifically geared for the task of on-the-fly
-tokenization. Instead of keying nodes on values, each node has a
-length, and they are found by finding a node that follows a certain
-total length of preceding nodes.
-
-FIXME: many methods are not yet documented.
-
- @defconstructor[([len (or/c exact-nonnegative-integer? fasle/c)]
-                  [data any/c])]{
-  Creates a token tree with a single element.
- }
-
- @defmethod[(get-root) (or/c node? #f)]{
-  Returns the root node in the tree.
- }
-
- @defmethod[(search! [key-position natural-number/c]) void?]{
-  Splays, setting the root node to be the closest node to
-  offset @racket[key-position] (i.e., making the total length of
-  the left tree at least @racket[key-position], if possible).
- }
-
-}
-
-@deftogether[(
-@defproc[(node? [v any/c]) boolean?]
-@defproc[(node-token-length [n node?]) natural-number/c]
-@defproc[(node-token-data [n node?]) any/c]
-@defproc[(node-left-subtree-length [n node?]) natural-number/c]
-@defproc[(node-left [n node?]) (or/c node? #f)]
-@defproc[(node-right [n node?]) (or/c node? #f)]
-)]{
-
-Functions for working with nodes in a @racket[token-tree%].}
-
-
-@defproc[(insert-first! [tree1 (is-a?/c token-tree%)] 
-                        [tree2 (is-a?/c token-tree%)]) 
-          void?]{
-
-Inserts @racket[tree1] into @racket[tree2] as the first thing, setting
-@racket[tree2]'s root to @racket[#f].}
-
-
-@defproc[(insert-last! [tree1 (is-a?/c token-tree%)] 
-                       [tree2 (is-a?/c token-tree%)]) 
-          void?]{
-
-Inserts @racket[tree1] into @racket[tree2] as the last thing, setting
-@racket[tree2]'s root to @racket[#f].}
-
-
-@defproc[(insert-last-spec! [tree (is-a?/c token-tree%)] [n natural-number/c] [v any/c]) void?]{
-
-Same as @racketblock[(insert-last! tree
-                                   (new token-tree% 
-                                        [length n]
-                                        [data v]))]
-
-This optimization is important for the colorer.}
diff --git a/pkgs/syntax-color-pkgs/syntax-color-lib/LICENSE.txt b/pkgs/syntax-color-pkgs/syntax-color-lib/LICENSE.txt
deleted file mode 100644
index a9e2323eec..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax-color-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/syntax-color-pkgs/syntax-color-lib/info.rkt b/pkgs/syntax-color-pkgs/syntax-color-lib/info.rkt
deleted file mode 100644
index 9cd9ebfdfa..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-lib/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base"
-               "compatibility-lib"
-               "parser-tools-lib" "unstable-options-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"syntax-color\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/default-lexer.rkt b/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/default-lexer.rkt
deleted file mode 100644
index f432bcdd13..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/default-lexer.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-(module default-lexer mzscheme
-  (require parser-tools/lex
-           (prefix : parser-tools/lex-sre))
-  
-  (provide default-lexer)
-  
-  (define-lex-abbrevs 
-   (parens (:or #\( #\) #\[ #\] #\{ #\})))
-                     
-  
-  (define default-lexer
-    (lexer
-     ((:+ (:~ parens whitespace))
-      (values lexeme 'no-color #f (position-offset start-pos) (position-offset end-pos)))
-     ((:+ whitespace)
-      (values lexeme 'white-space #f (position-offset start-pos) (position-offset end-pos)))
-     (parens
-      (values lexeme 'no-color (string->symbol lexeme) (position-offset start-pos) (position-offset end-pos)))
-     ((special)
-      (values "" 'no-color #f (position-offset start-pos) (position-offset end-pos)))
-     ((special-comment)
-      (values "" 'comment #f (position-offset start-pos) (position-offset end-pos)))
-     ((eof)
-      (values lexeme 'eof #f #f #f)))))
-     
-             
-             
diff --git a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/lexer-contract.rkt b/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/lexer-contract.rkt
deleted file mode 100644
index a077e46d2b..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/lexer-contract.rkt
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         unstable/options)
-(provide lexer/c (struct-out dont-stop))
-
-(struct dont-stop (val) #:transparent)
-
-(define lexer/c
-  (option/c
-   (or/c (->i ([in (and/c input-port? port-counts-lines?)])
-              (values [txt any/c]
-                      [type symbol?]
-                      [paren (or/c symbol? #f)]
-                      [start (or/c exact-positive-integer? #f)]
-                      [end (start type) (end/c start type)]))
-         (->i ([in (and/c input-port? port-counts-lines?)]
-               [offset exact-nonnegative-integer?]
-               [mode (not/c dont-stop?)])
-              (values [txt any/c]
-                      [type symbol?]
-                      [paren (or/c symbol? #f)]
-                      [start (or/c exact-positive-integer? #f)]
-                      [end (start type) (end/c start type)]
-                      [backup exact-nonnegative-integer?]
-                      [new-mode any/c])))
-   #:tester (λ (lexer) (try-some-random-streams lexer))))
-
-(define (try-some-random-streams lexer)
-  (define 3ary-lexer
-    (cond
-      [(procedure-arity-includes? lexer 1)
-       (λ (in offset mode)
-         (define-values (txt type paren start end) (lexer in))
-         (values txt type paren start end 0 #f))]
-      [else lexer]))
-  (define initial-state (pseudo-random-generator->vector
-                         (current-pseudo-random-generator)))
-  (with-handlers ([exn:fail?
-                   (lambda (exn)
-                     (raise
-                      (make-exn
-                       (format (string-append "try-some-random-streams:"
-                                              " random testing of lexer failed\n"
-                                              "  lexer: ~e\n"
-                                              "  pseudo-random state: ~s\n"
-                                              "  error message: ~s")
-                               lexer
-                               initial-state
-                               (exn-message exn))
-                       (exn-continuation-marks exn))))])
-    (for ([x (in-range 10)])
-      (define size (random 100))
-      (define (quash-backslash-r c)
-        ;; it isn't clear the spec is right in
-        ;; the case of \r\n combinations, so we
-        ;; punt for now
-        (if (equal? c #\return) #\newline c))
-      (define s (build-string
-                 size
-                 (λ (c) 
-                   (quash-backslash-r
-                    (case (random 3)
-                      [(0)
-                       (define s " ()@{}\"λΣ\0")
-                       (string-ref s (random (string-length s)))]
-                      [(1 2)
-                       (integer->char (random 255))])))))
-      (define in (open-input-string s))
-      (port-count-lines! in)
-      (let loop ([mode #f][offset 0])
-        (define-values (txt type paren start end backup new-mode)
-          (3ary-lexer in offset mode))
-        (cond
-         [(equal? type 'eof) #t]
-         [(< end size) (loop new-mode end)]
-         [else #f])))))
-
-(define (end/c start type)
-  (cond
-    [(equal? 'eof type) 
-     (or/c exact-positive-integer? #f)]
-    [start
-     (and/c exact-positive-integer?
-            (>/c start))]
-    [else
-     #f]))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/module-lexer.rkt b/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/module-lexer.rkt
deleted file mode 100644
index d1aa4a7799..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/module-lexer.rkt
+++ /dev/null
@@ -1,133 +0,0 @@
-#lang racket/base
-(require racket/port
-         "racket-lexer.rkt"
-         "lexer-contract.rkt"
-         racket/contract
-         unstable/options)
-(provide 
- (contract-out [module-lexer lexer/c]))
-
-#|
-
-mode : (or/c #f 'before-lang-line
-             'no-lang-line
-             (cons lexer mode)
-             lexer)
-
-the module lexer tracks any white-space and comments before
-the #lang line (if any) explicitly by wrapping calls to the 
-scheme-lexer (in #f or 'before-lang-line mode). 
-Once it finds a non-white-space and non-comment
-token, it checks to see if there is a #lang line and, if so
-changes the mode to be the lexer that the #lang indicates,
-delegating to it (the last two modes listed above).
-If there is no #lang line, then it continues
-to delegate to the scheme-lexer (in the 'no-lang-line mode).
-
-|#
-
-
-(define (module-lexer in offset mode)
-  (cond
-    [(or (not mode) (eq? mode 'before-lang-line))
-     (define lexer-port (peeking-input-port in #:init-position (+ 1 (file-position in))))
-     (let-values ([(line col pos) (port-next-location in)])
-       (when line 
-         (port-count-lines! lexer-port)))
-     (set-port-next-location-from in lexer-port)
-     (define-values (lexeme type data new-token-start new-token-end) (racket-lexer lexer-port))
-     (cond
-       [(or (eq? type 'comment) (eq? type 'white-space))
-        (define lexer-end (file-position lexer-port))
-        ;; sync ports
-        (for/list ([i (in-range (file-position in) (file-position lexer-port))])
-          (read-byte-or-special in))
-        (values lexeme type data new-token-start new-token-end 0 'before-lang-line)]
-       [else
-        ;; look for #lang:
-        (define p (peeking-input-port in #:init-position (+ 1 (file-position in))))
-        (define name-p (peeking-input-port in #:init-position (+ 1 (file-position in))))
-        (let-values ([(line col pos) (port-next-location in)])
-          (when line 
-            (port-count-lines! p)
-            (port-count-lines! name-p)))
-        (set-port-next-location-from in p)
-        (set-port-next-location-from in name-p)
-        (define-values (_1 _2 start-pos) (port-next-location p))
-        (define get-info (with-handlers ([exn:fail? values]) 
-                           (or (read-language p (λ () 'fail))
-                               (λ (x y)  y))))
-        (define-values (_3 _4 end-pos) (port-next-location p))
-        (cond
-          [(procedure? get-info)
-           (define lang-name 
-             (apply string
-                    (filter
-                     char?
-                     (for/list ([i (in-range (file-position in) (file-position p))])
-                       (read-char name-p)))))
-          
-           ;; sync ports
-           (for ([i (in-range (file-position in) (file-position p))])
-             (read-byte-or-special in))
-           
-           (define the-lexer 
-             (let ([raw-lexer (or (get-info 'color-lexer #f) racket-lexer)])
-               (if (trusted-lexer? raw-lexer)
-                   (waive-option raw-lexer)
-                   (exercise-option raw-lexer))))
-           
-           ;; Produce language as first token:
-           (values
-            lang-name
-            'other
-            #f
-            start-pos
-            end-pos
-            0
-            (if (procedure-arity-includes? the-lexer 3)
-                (cons the-lexer #f)
-                the-lexer))]
-         
-          [(and (eq? type 'other)
-                (string? lexeme)
-                ;; the read-language docs say that this is all it takes to commit to a #lang
-                (regexp-match #rx"^#[!l]" lexeme))
-           ;; sync ports
-           (for ([i (in-range (file-position in) (file-position p))])
-             (read-byte-or-special in))
-           (values lexeme 'error data new-token-start end-pos 0 'no-lang-line)]
-          [else 
-           (for ([i (in-range (file-position in) (file-position lexer-port))])
-             (read-byte-or-special in))
-           (values lexeme type data new-token-start new-token-end 0 'no-lang-line)])])]
-    [(eq? mode 'no-lang-line)
-     (let-values ([(lexeme type data new-token-start new-token-end) 
-                   (racket-lexer in)])
-       (values lexeme type data new-token-start new-token-end 0 'no-lang-line))]
-    [(pair? mode)
-     ;; #lang-selected language consumes and produces a mode:
-     (let-values ([(lexeme type data new-token-start new-token-end backup-delta new-mode) 
-                   ((car mode) in offset (cdr mode))])
-       (values lexeme type data new-token-start new-token-end backup-delta 
-               (if (dont-stop? new-mode)
-                   (dont-stop (cons (car mode) (dont-stop-val new-mode)))
-                   (cons (car mode) new-mode))))]
-    [else
-     ;; #lang-selected language (or default) doesn't deal with modes:
-     (let-values ([(lexeme type data new-token-start new-token-end) 
-                   (mode in)])
-       (values lexeme type data new-token-start new-token-end 0 mode))]))
-
-(define (set-port-next-location-from src dest)
-  (define-values (line col pos) (port-next-location src))
-  (set-port-next-location! dest line col pos))
-
-
-(define (trusted-lexer? the-lexer)
-  (member (object-name the-lexer)
-          '(racket-lexer 
-            racket-lexer/status 
-            racket-nobar-lexer/status
-            scribble-inside-lexer
-            scribble-lexer)))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/paren-tree.rkt b/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/paren-tree.rkt
deleted file mode 100644
index 518cc9eb54..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/paren-tree.rkt
+++ /dev/null
@@ -1,326 +0,0 @@
-(module paren-tree mzscheme
-  (require mzlib/class
-           mzlib/list
-           "token-tree.rkt")
-  
-  (provide paren-tree%)
-  
-  (define paren-tree%
-    (class object%
-
-      ;; matches: (listof (list/p symbol symbol))
-      ;; Symbols for the open-close pairs
-      (init matches)
-
-      (define open-matches-table (make-hash-table))
-      (for-each (lambda (x)
-                  (hash-table-put! open-matches-table (car x) (cadr x)))
-                matches)
-      
-      (define close-matches-table (make-hash-table))
-      (for-each (lambda (x)
-                  (hash-table-put! close-matches-table (cadr x) (car x)))
-                matches)
-      
-      (define back-cache (make-hash-table))
-      (define (reset-cache) (set! back-cache (make-hash-table)))
-      
-      (define/private (is-open? x)
-        (hash-table-get open-matches-table x #f))
-      
-      (define/private (is-close? x)
-        (hash-table-get close-matches-table x #f))
-      
-      (define/private (matches? open close)
-        (equal? (hash-table-get open-matches-table open #f)
-                close))
-
-      ;; The tree and invalid-tree splay trees map ranges of text to paren
-      ;; records whose type field is a symbol that indicates which type of
-      ;; (opening or closing) parenthesis begins the range being mapped.
-      ;; The length field indicates how many characters the actual parenthesis
-      ;; is.  In the special case that there is a region that is not preceded
-      ;; with a parenthesis (that is, the region before the first parenthesis in
-      ;; a buffer), the type will be #f, and the length will be 0.
-      
-      (define-struct paren (type length))
-      (define tree (new token-tree%))
-      (define invalid-tree (new token-tree%))
-      
-      (define common-parens
-        (list (make-paren '|(| 1)
-              (make-paren '|)| 1)
-              (make-paren '|]| 1)
-              (make-paren '|[| 1)
-              (make-paren '|}| 1)
-              (make-paren '|{| 1)))
-      (define false-zero-paren (make-paren #f 0))
-      
-      (define (build-paren type len)
-        (cond
-          [(eq? len 1)
-           (or (ormap (λ (cp) (and (equal? (paren-type cp) type)
-                                   cp))
-                      common-parens)
-               (make-paren type len))]
-          [(and (eq? length 0) (eq? type #f))
-           false-zero-paren]
-          [else
-           (make-paren type len)]))
-        
-      (define/private (split tree pos)
-        (send tree search! pos)
-        (let ((token-start (send tree get-root-start-position)))
-          (cond
-            ((send tree is-empty?)
-             (values (new token-tree%) (new token-tree%)))
-            ((= pos token-start)
-             (send tree split-before))
-            (else
-             (let-values (((first next) (send tree split-after)))
-               (let ((first-end (send first get-root-end-position)))
-                 (send first add-to-root-length (- pos first-end))
-                 (insert-first! next (new token-tree%
-                                          (length (- first-end pos))
-                                          (data (build-paren #f 0))))
-                 (values first next)))))))
-      
-      ;; split-tree: natural-number -> void
-      ;; Everything at and after pos is marked as invalid.
-      ;; pos must not be a position inside of a token.
-      (define/public (split-tree pos)
-        (reset-cache)
-        (let-values (((l r) (split tree pos)))
-          (set! tree l)
-          (set! invalid-tree r)))
-      
-      ;; merge-tree: natural-number -> void
-      ;; Makes the num-to-keep last positions that have been marked
-      ;; invalid valid again.
-      (define/public (merge-tree num-to-keep)
-        (reset-cache)
-        (send invalid-tree search-max!)
-        (let*-values (((bad good) (split invalid-tree (- (send invalid-tree get-root-end-position)
-                                                         num-to-keep)))
-                      ((data) (send good get-root-data)))
-          (when (and data
-                     (not (or (is-open? (paren-type data))
-                              (is-close? (paren-type data)))))
-            (add-token #f (send good get-root-length))
-            (send good remove-root!))
-          (insert-last! tree good)))
-      
-      
-      ;; add-token: (union #f symbol) * natural-number ->
-      ;; Adds the token to the end of the valid part of the tree.
-      ;; If type is #f, then this is not a parenthesis token.  If it is a symbol, then
-      ;; it should be in one of the pairs in the matches field.
-      (define/public (add-token type length)
-        (reset-cache)
-        (cond
-          ((or (send tree is-empty?) (is-open? type) (is-close? type))
-           ; Big performance increase using the -spec version.
-           ;(insert-last! tree (new token-tree% (length length) (data (cons type length))))
-           (insert-last-spec! tree length 
-                              (build-paren type (if type length 0))))
-          (else
-           (send tree search-max!)
-           (send tree add-to-root-length length))))
-
-      ;; truncate: natural-number ->
-      ;; removes the tokens after pos
-      (define/public (truncate pos)
-        (reset-cache)
-        (let-values (((l r) (split tree pos)))
-          (set! tree l)))
-        
-      ;; match-forward: natural-number? -> (union #f natural-number)^3
-      ;; The first return is the starting position of the open-paren
-      ;; The second return is the position of the closing paren.
-      ;; If the third return is #f, then the first two returns
-      ;; represent a real match.
-      ;; If the third return is a number, it is the maximum position
-      ;; in the tree that was searched.
-      ;; If it indicates an error, the first two results give the
-      ;; starting and stoping positions for error highlighting.
-      ;; If all three return #f, then there was no tree to search, or 
-      ;; the position did not immediately precede an open.
-      (define/public (match-forward pos)
-        (send tree search! pos)
-        (cond
-          ((and (not (send tree is-empty?))
-                (is-open? (paren-type (send tree get-root-data)))
-                (= (send tree get-root-start-position) pos))
-           (let ((end
-                  (let/ec ret
-                    (do-match-forward (node-right (send tree get-root))
-                                      (send tree get-root-end-position)
-                                      (list (paren-type (send tree get-root-data)))
-                                      ret)
-                    #f)))
-             (cond
-               (end
-                (values pos end #f))
-               (else
-                (send tree search-max!)
-                (let ((end (send tree get-root-end-position)))
-                  (send tree search! pos)
-                  (values pos (+ pos (paren-length (send tree get-root-data))) end))))))
-          (else
-           (values #f #f #f))))
-      
-      ;; match-backward: natural-number? -> (union #f natural-number)^3
-      ;; The first return is the starting position of the open-paren
-      ;; The second return is the position of the closing paren.
-      ;; If the third return is #f, then the first two returns
-      ;; represent a real match, otherwise it represents an error
-      ;; If it indicates an error, the first two results give the
-      ;; starting and stoping positions for error highlighting.
-      ;; If all three return #f, then there was no tree to search, or 
-      ;; the position did not immediately follow a close.
-      (define/public (match-backward pos)
-        (define (not-found)
-          (send tree search! pos)
-          (values (- pos (paren-length (send tree get-root-data))) pos #t))
-        (define already (hash-table-get back-cache pos 'todo))
-        (cond
-          [(not (eq? 'todo already)) (values already pos #f)]
-          [else
-           (send tree search! (max 0 (sub1 pos)))
-           (let ([type (send tree get-root-data)])
-             (cond
-               [(and (not (send tree is-empty?))
-                     (is-close? (paren-type type))
-                     (= (+ (paren-length (send tree get-root-data))
-                           (send tree get-root-start-position))
-                        pos))
-                (let loop ()
-                  (let ([p (send tree get-root-start-position)])
-                    (cond
-                      [(= 0 p) (not-found)]
-                      [else
-                       (send tree search! (sub1 p))
-                       (let ([prev-type (paren-type (send tree get-root-data))]
-                             [prev-start-pos (send tree get-root-start-position)])
-                         (cond
-                           [(and (is-open? prev-type) (matches? prev-type (paren-type type)))
-                            (hash-table-put! back-cache pos prev-start-pos)
-                            (values prev-start-pos pos #f)]
-                           [(is-close? prev-type)
-                            (let-values ([(new-start new-end new-err)
-                                          (match-backward (+ prev-start-pos 
-                                                             (paren-length (send tree get-root-data))))])
-                              (cond
-                                [new-err
-                                 (not-found)]
-                                [(and (not new-start) (not new-end) (not new-err))
-                                 (error 'colorer-internal)]
-                                [else
-                                 (send tree search! new-start)
-                                 (loop)]))]
-                           [(is-open? prev-type)
-                            (not-found)]
-                           [else 
-                            (loop)]))])))]
-               [else
-                (values #f #f #f)]))]))
-
-      #;(define/public (match-backward pos)
-        (send tree search! (if (> pos 0) (sub1 pos) pos))
-        (cond
-          ((and (not (send tree is-empty?))
-                (is-close? (paren-type (send tree get-root-data)))
-                (= (+ (paren-length (send tree get-root-data))
-                      (send tree get-root-start-position))
-                   pos))
-           (let ((end
-                  (let/ec ret
-                    (do-match-backward (node-left (send tree get-root))
-                                       0
-                                       (list (paren-type (send tree get-root-data)))
-                                       ret)
-                    #f)))
-             (cond
-               (end
-                (values end pos #f))
-               (else
-                (send tree search! pos)
-                (values (- pos (paren-length (send tree get-root-data))) pos #t)))))
-          (else
-           (values #f #f #f))))
-      
-      ;; is-open-pos?: natural-number -> (union #f symbol)
-      ;; if the position starts an open, return the corresponding close,
-      ;; otherwise return #f
-      (define/public (is-open-pos? pos)
-        (send tree search! pos)
-        (let ((d (send tree get-root-data)))
-          (and (= (send tree get-root-start-position) pos)
-               d
-               (is-open? (paren-type d)))))
-
-      ;; is-close-pos?: natural-number -> (union #f symbol)
-      ;; if the position starts an close, return the corresponding open,
-      ;; otherwise return #f
-      (define/public (is-close-pos? pos)
-        (send tree search! pos)
-        (let ((d (send tree get-root-data)))
-          (and (= (send tree get-root-start-position) pos)
-               d
-               (is-close? (paren-type d)))))
-      
-      (define/private (do-match-forward node top-offset stack escape)
-        (cond
-          ((not node) stack)
-          (else
-           (let* ((type (paren-type (node-token-data node)))
-                  (left-stack (do-match-forward (node-left node) top-offset stack escape))
-                  (new-stack
-                   (cond
-                     ((is-open? type) (cons type left-stack))
-                     ((and (is-close? type) (matches? (car left-stack) type))
-                      (cdr left-stack))
-                     ((is-close? type) (escape #f))
-                     (else left-stack)))
-                  (start (+ top-offset (node-left-subtree-length node))))
-             (cond
-               ((null? new-stack)
-                (let ((loc (+ start (paren-length (node-token-data node)))))
-                  (escape loc)))
-               (else
-                (do-match-forward (node-right node) (+ start (node-token-length node)) new-stack escape)))))))
-      
-      
-      (define/private (do-match-backward node top-offset stack escape)
-        (cond
-          ((not node) stack)
-          (else
-           (let* ((type (paren-type (node-token-data node)))
-                  (right-stack (do-match-backward (node-right node)
-                                                  (+ top-offset (node-left-subtree-length node)
-                                                     (node-token-length node))
-                                                  stack escape))
-                  (new-stack
-                   (cond
-                     ((is-close? type) (cons type right-stack))
-                     ((and (is-open? type) (matches? type (car right-stack)))
-                      (cdr right-stack))
-                     ((is-open? type) (escape #f))
-                     (else right-stack))))
-             (cond
-               ((null? new-stack)
-                (escape (+ top-offset (node-left-subtree-length node))))
-               (else
-                (do-match-backward (node-left node) top-offset new-stack escape)))))))
-      
-      (define/public (test)
-        (let ((v null)
-              (i null))
-          (send tree for-each (lambda (a b c)
-                                (set! v (cons (list a b (cons (paren-type c) (paren-length c))) v))))
-          (send invalid-tree for-each (lambda (a b c)
-                                        (set! i (cons (list a b (cons (paren-type c) (paren-length c))) i))))
-          (list (reverse v) (reverse i))))
-        
-      (super-instantiate ())
-      )))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/racket-lexer.rkt b/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/racket-lexer.rkt
deleted file mode 100644
index 50759a817b..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/racket-lexer.rkt
+++ /dev/null
@@ -1,420 +0,0 @@
-#lang racket/base
-
-  (require parser-tools/lex
-           racket/contract
-           "lexer-contract.rkt"
-           (prefix-in : parser-tools/lex-sre))
-  
-  (provide 
-   (contract-out
-    [racket-lexer lexer/c])
-   racket-lexer/status
-   racket-nobar-lexer/status)
-   
-  (define-lex-abbrevs
-         
-   ;; For case insensitivity
-   [a (char-set "aA")]
-   [b (char-set "bB")]
-   [c (char-set "cC")]
-   [d (char-set "dD")]
-   [e (char-set "eE")]
-   [f (char-set "fF")]
-   [g (char-set "gG")]
-   [h (char-set "hH")]
-   [i (char-set "iI")]
-   [j (char-set "jJ")]
-   [k (char-set "kK")]
-   [l (char-set "lL")]
-   [m (char-set "mM")]
-   [n (char-set "nN")]
-   [o (char-set "oO")]
-   [p (char-set "pP")]
-   [q (char-set "qQ")]
-   [r (char-set "rR")]
-   [s (char-set "sS")]
-   [t (char-set "tT")]
-   [u (char-set "uU")]
-   [v (char-set "vV")]
-   [w (char-set "wW")]
-   [x (char-set "xX")]
-   [y (char-set "yY")]
-   [z (char-set "zZ")]
-
-   [digit (:/ "0" "9")]
-   [digit2 (:/ "0" "1")]
-   [digit8 (:/ "0" "7")]
-   [digit10 digit]
-   [digit16 (:/ "af" "AF" "09")]
-
-   [langchar (:or (:/ "az" "AZ" "09") "+" "-" "_")]
-
-   [racket-whitespace whitespace]
-
-   [line-comment (:: ";" (:* (:~ #\newline)))]
-
-   
-   ;; What about char->integer constraint?
-   [unicode  (:or (:: "u" (:** 1 4 digit16))
-                  (:: "U" (:** 1 6 digit16)))]
-   
-   [character (:or (:: "#\\" any-char)
-                   (:: "#\\" character-name)
-                   (:: "#\\" (:/ "0" "3") digit8 digit8)
-                   (:: "#\\" unicode))]
-   
-   [character-name (:or (:: s p a c e)
-                        (:: n e w l i n e)
-                        (:: n u l) 
-                        (:: n u l l)
-                        (:: b a c k s p a c e)
-                        (:: t a b)
-                        (:: l i n e f e e d)
-                        (:: v t a b)
-                        (:: p a g e)
-                        (:: r e t u r n)
-                        (:: r u b o u t))]
-   
-   [bad-char (:or "#\\"
-                  (:: "#\\" (:>= 2 alphabetic))
-                  (:: "#\\" (:/ "0" "3") digit8))]
-       
-   ;; What about byte string regexp strings
-   [str (:or (:: (:? (:or "#px" "#rx")) "\"" (:* string-element (:: "\\" unicode)) "\"")
-             byte-str)]
-   [byte-str (:: (:? (:or "#px" "#rx")) "#\"" (:* byte-string-element) "\"")]
-   [string-element (:or (:~ "\"" "\\")
-                        string-escape)]
-   [byte-string-element (:or (:- (:/ "\x00" "\xFF") "\"" "\\")
-                             string-escape)]
-   [string-escape (:or "\\\""
-                       "\\\\"
-                       "\\a"
-                       "\\b"
-                       "\\t"
-                       "\\n"
-                       "\\v"
-                       "\\f"
-                       "\\r"
-                       "\\e"
-                       "\\'"
-                       (:: "\\" (:** 1 3 digit8))
-                       (:: "\\x" (:** 1 2 digit16))
-                       (:: "\\" #\newline))]
-
-   [bad-str (:: (:? (:or "#px" "#rx")) (:? "#") "\"" 
-                (:* (:~ "\"" "\\")
-                    (:: "\\" any-char))
-                (:? "\\" "\""))]
-   
-
-   [special-numbers (:or (:: n a n ".0") (:: i n f ".0")
-                         (:: n a n ".f") (:: i n f ".f"))]
-   [special-extflonums (:or (:: n a n ".t") (:: i n f ".t"))]
-   [exponent-marker (:or e s f d l)]
-   [exponent-marker16 (:or s l)]
-   [sign (char-set "+-")]
-   [exactness (:or "#i" "#e" "#I" "#E")]
-   [radix2 (:or "#b" "#B")]
-   [radix8 (:or "#o" "#O")]
-   [radix10 (:or "#d" "#D")]
-   [radix16 (:or "#x" "#X")]
-   
-   [script (:: "#!" (:or #\space #\/) (:* (:~ #\newline) (:: #\\ #\newline)))]
-
-   [identifier-delims (:or (char-set "\",'`()[]{};") racket-whitespace)]
-   [identifier-chars (:~ identifier-delims "\\" "|")]
-   [identifier-escapes (:or (:: "\\" any-char)
-                            (:: "|" (:* (:~ "|")) "|"))]
-   [identifier-start (:or identifier-escapes
-                          (:~ identifier-delims "\\" "|" "#")
-                          "#%")]
-   [identifier (:: identifier-start
-                   (:* identifier-escapes identifier-chars))]
-
-   [nobar-identifier-escapes (:: "\\" any-char)]
-   [nobar-identifier-start (:or nobar-identifier-escapes
-                                (:~ identifier-delims "\\" "|" "#")
-                                "#%")]
-   [nobar-identifier (:: nobar-identifier-start
-                         (:* nobar-identifier-escapes identifier-chars))]
-
-   [bad-id-start (:or identifier-escapes
-                      (:~ identifier-delims "\\" "|"))]
-   [bad-id-escapes (:or identifier-escapes
-                        (:: "|" (:* (:~ "|"))))]
-   [bad-id (:or (:: bad-id-start
-                    (:* identifier-escapes identifier-chars)
-                    (:? "\\" bad-id-escapes))
-                "\\"
-                bad-id-escapes)]
-
-   
-   [nobar-bad-id-escapes nobar-identifier-escapes]
-   [nobar-bad-id (:or (:: bad-id-start
-                          (:* nobar-identifier-escapes identifier-chars)
-                          (:? "\\" nobar-bad-id-escapes))
-                      "\\"
-                      nobar-bad-id-escapes)]
-    
-   [keyword (:: "#:" (:* identifier-escapes identifier-chars))]
-   [nobar-keyword (:: "#:" (:* nobar-identifier-escapes identifier-chars))]
-    
-   [reader-command (:or (:: "#" c s) (:: "#" c i))]
-   [sharing (:or (:: "#" (make-uinteger digit10) "=")
-                 (:: "#" (make-uinteger digit10) "#"))]
-
-   [list-prefix (:or "" "#hash" "#hasheq" "#hasheqv" "#s" (:: "#" (:* digit10)))])
-  
-  (define-lex-trans make-num
-    (syntax-rules ()
-      ((_ digit radix exponent-marker)
-       (:: (make-prefix radix) (make-complex digit exponent-marker)))))
-  
-  (define-lex-trans make-prefix
-    (syntax-rules ()
-      ((_ radix) (:or (:: radix (:? exactness))
-                      (:: (:? exactness) radix)))))
-  
-  (define-lex-trans make-complex
-    (syntax-rules ()
-      ((_ digit exponent-marker)
-       (:or (make-real digit exponent-marker)
-            (:: (make-real digit exponent-marker) "@" (make-real digit exponent-marker))
-            (:: (make-real digit exponent-marker) "+" (:or special-numbers (make-ureal digit exponent-marker)) i)
-            (:: (make-real digit exponent-marker) "-" (:or special-numbers (make-ureal digit exponent-marker)) i)
-            (:: (make-real digit exponent-marker) "+" i)
-            (:: (make-real digit exponent-marker) "-" i)
-            (:: "+" (:or special-numbers (make-ureal digit exponent-marker)) i)
-            (:: "-" (:or special-numbers (make-ureal digit exponent-marker)) i)
-            (:: "+" i)
-            (:: "-" i)))))
-  
-  (define-lex-trans make-ureal
-    (syntax-rules ()
-      ((_ digit exponent-marker)
-       (make-ureal* digit exponent-marker make-suffix))))
-
-  (define-lex-trans make-ureal*
-    (syntax-rules ()
-      ((_ digit exponent-marker make-suffix)
-       (:or (make-uinteger digit)
-            (:: (make-uinteger digit) "/" (make-uinteger digit) (make-suffix digit exponent-marker))
-            (make-decimal digit exponent-marker make-suffix)))))
-
-  (define-lex-trans make-real
-    (syntax-rules ()
-      ((_ digit exponent-marker)
-       (make-real* digit exponent-marker make-suffix special-numbers))))
-
-   (define-lex-trans make-real*
-    (syntax-rules ()
-      ((_ digit exponent-marker make-suffix special-numbers)
-       (:or (:: (:? sign) (make-ureal* digit exponent-marker make-suffix))
-            (:: (char-set "+-") special-numbers)))))
-  
-  (define-lex-trans make-uinteger
-    (syntax-rules ()
-      ((_ digit) (:: (:+ digit) (:* "#")))))
-  
-  (define-lex-trans make-decimal
-    (syntax-rules ()
-      ((_ digit exponent-marker make-suffix)
-       (:or (:: (make-uinteger digit) (make-suffix digit exponent-marker))
-            (:: "." (:+ digit) (:* "#") (make-suffix digit exponent-marker))
-            (:: (:+ digit) "." (:* digit) (:* "#") (make-suffix digit exponent-marker))
-            (:: (:+ digit) (:+ "#") "." (:* "#") (make-suffix digit exponent-marker))))))
-
-  (define-lex-trans make-suffix
-    (syntax-rules ()
-      ((_ digit exponent-marker) (:or "" (:: exponent-marker (:? sign) (:+ digit))))))
-
-  (define-lex-trans make-extflonum-suffix
-    (syntax-rules ()
-      ((_ digit exponent-marker) (:: exponent-marker (:? sign) (:+ digit)))))
-
-  (define-lex-trans make-extflonum
-    (syntax-rules ()
-      ((_ digit radix)
-       (:: radix (make-real* digit (:or "t" "T") make-extflonum-suffix special-extflonums)))))
-  
-  (define (ret lexeme type paren start-pos end-pos status)
-    (values lexeme type paren (position-offset start-pos) (position-offset end-pos) status))
-
-
-  (define get-next-comment
-    (lexer
-     ["#|" (values 1 end-pos)]
-     ["|#" (values -1 end-pos)]
-     [(:or "#" "|" (:* (:~ "|" "#")))
-      (get-next-comment input-port)]
-     [(eof) (values 'eof end-pos)]
-     [(special)
-      (get-next-comment input-port)]
-     [(special-comment)
-      (get-next-comment input-port)]))
-  
-  (define (read-nested-comment num-opens start-pos input)
-    (let-values (((diff end) (get-next-comment input)))
-      (cond
-        ((eq? 'eof diff) (ret "" 'error #f start-pos end 'continue))
-        (else
-         (let ((next-num-opens (+ diff num-opens)))
-           (cond
-             ((= 0 next-num-opens) (ret "" 'comment #f start-pos end 'continue))
-             (else (read-nested-comment next-num-opens start-pos input))))))))
-  
-  (define (get-offset i)
-    (let-values (((x y offset) (port-next-location i)))
-      offset))
-  
-  (define (escape-regexp s)
-    (apply string-append 
-           (map (lambda (c)
-                  (if (memq c '(#\( #\) #\* #\+ #\? #\[ #\] #\. #\^ #\\ #\|))
-                      (string #\\ c)
-                      (string c)))
-                (string->list s))))
-  
-  (define (special-read-line i)
-    (let ((next (peek-char-or-special i)))
-      (cond
-        ((or (eq? next #\newline) (not (char? next)))
-         null)
-        (else
-         (read-char i)
-         (cons next (special-read-line i))))))
-  
-  (define (read-line/skip-over-specials i)
-    (let loop ()
-      (let ((next (peek-char-or-special i)))
-        (cond
-          ((or (eq? next #\newline) (eof-object? next))
-           null)
-          (else
-           (read-char-or-special i)
-           (if (char? next)
-               (cons next (loop))
-               (loop)))))))
-          
-  (define (get-here-string start-pos i)
-    (let* ((ender (list->string (special-read-line i)))
-           (next-char (peek-char-or-special i)))
-      (cond
-        ((or (equal? ender "") (not (eq? #\newline next-char)))
-         (values (string-append "#<<" ender) 'error #f start-pos (get-offset i) 'datum))
-        (else
-         (read-char i)
-         (let loop ((acc (list (string-append "#<<" ender "\n"))))
-           (let* ((next-line (list->string (special-read-line i)))
-                  (next-char (peek-char-or-special i)))
-             (cond
-               ((not (or (char? next-char) (eof-object? next-char))) ;; a special
-                (values (apply string-append (reverse (cons next-line acc)))
-                        'error #f start-pos (get-offset i)
-                        'datum))
-               ((equal? next-line ender)  ;; end of string
-                (values (apply string-append (reverse (cons next-line acc)))
-                        'string #f start-pos (get-offset i)
-                        'datum))
-               ((eof-object? next-char)
-                (values (apply string-append (reverse (cons next-line acc)))
-                        'error #f start-pos (get-offset i)
-                        'datum))
-               (else
-                (read-char i)
-                (loop (cons (string-append next-line "\n") acc))))))))))
-
-  (define (racket-lexer in)
-    (let-values ([(lexeme type paren start end adj) (racket-lexer/status in)])
-      (values lexeme type paren start end)))
-        
-  (define-syntax-rule (lexer/status identifier keyword bad-id)
-    (lexer
-     [(:+ racket-whitespace)
-      (ret lexeme 'white-space #f start-pos end-pos 'continue)]
-     [(:: (:or "#true" "#false" "#t" "#f" "#T" "#F")
-          (:* (:~ identifier-delims)))
-      (ret lexeme 
-           (if (member lexeme '("#true" "#false" "#t" "#f" "#T" "#F"))
-               'constant 
-               'error)
-           #f start-pos end-pos 'datum)]
-     [(:or character
-           (make-num digit2 radix2 exponent-marker)
-           (make-num digit8 radix8 exponent-marker)
-           (make-num digit10 (:? radix10) exponent-marker)
-           (make-num digit16 radix16 exponent-marker16)
-           (make-extflonum digit2 radix2)
-           (make-extflonum digit8 radix8)
-           (make-extflonum digit10 (:? radix10))
-           (make-extflonum digit16 radix16))
-      (ret lexeme 'constant #f start-pos end-pos 'datum)]
-     [keyword (ret lexeme 'hash-colon-keyword #f start-pos end-pos 'datum)]
-     [str (ret lexeme 'string #f start-pos end-pos 'datum)]
-     [";"
-      (values (apply string (read-line/skip-over-specials input-port)) 'comment #f 
-              (position-offset start-pos)
-              (get-offset input-port)
-              'continue)]
-     #;
-     [line-comment
-      (ret lexeme 'comment #f start-pos end-pos)]
-     ["#;"
-      (ret lexeme 'sexp-comment #f start-pos end-pos 'continue)]
-     ["#|" (read-nested-comment 1 start-pos input-port)]
-     [script
-      (ret lexeme 'comment #f start-pos end-pos 'continue)]
-     [(:: list-prefix "(")
-      (ret lexeme 'parenthesis '|(| start-pos end-pos 'open)]
-     [(:: list-prefix "[")
-      (ret lexeme 'parenthesis '|[| start-pos end-pos 'open)]
-     [(:: list-prefix "{")
-      (ret lexeme 'parenthesis '|{| start-pos end-pos 'open)]
-     [(:or ")" "]" "}")
-      (ret lexeme 'parenthesis (string->symbol lexeme) start-pos end-pos 'close)]
-     [(:or "'" "`" "#'" "#`" "#&")
-      (ret lexeme 'constant #f start-pos end-pos 'continue)]
-     [(:or sharing reader-command "." "," ",@" "#," "#,@")
-      (ret lexeme 'other #f start-pos end-pos 'continue)]
-
-     [(:: (:or "#lang " "#!")
-          (:or langchar
-               (:: langchar (:* (:or langchar "/")) langchar)))
-      (ret lexeme 'other #f start-pos end-pos 'continue)]
-     [(:: (:or "#lang " "#!") (:* (:& any-char (complement whitespace))))
-      (ret lexeme 'error #f start-pos end-pos 'continue)]
-     
-     [identifier
-      (ret lexeme 'symbol #f start-pos end-pos 'datum)]
-     ["#<<"
-      (get-here-string (position-offset start-pos) input-port)]
-     [(special)
-      (ret "" 'no-color #f start-pos end-pos 'datum)]
-     [(special-comment)
-      (ret "" 'comment #f start-pos end-pos 'continue)]
-     [(eof) (values lexeme 'eof #f #f #f #f)]
-     [(:or bad-char bad-str 
-           (:& bad-id
-               (complement (:: (:or (:: "#" (:or f t)) reader-command sharing "#<<" "#\\" "#|" "#;" "#&" script)
-                               any-string))))
-      (ret lexeme 'error #f start-pos end-pos 'bad)]
-     [any-char (extend-error lexeme start-pos end-pos input-port)]))
-
-  (define racket-lexer/status (lexer/status identifier keyword bad-id))
-  (define racket-nobar-lexer/status (lexer/status nobar-identifier nobar-keyword nobar-bad-id))
-  
-  (define (extend-error lexeme start end in)
-    (define next (peek-char-or-special in))
-    (if (or (char-whitespace? next)
-            (memq next
-                  `(special
-                    #\" #\, #\' #\` #\( #\) #\[ #\] #\{ #\} #\;
-                    ,eof)))
-        (ret lexeme 'error #f start end 'bad)
-        (let-values (((rest end-pos) (get-chunk in)))
-          (ret (string-append lexeme rest) 'error #f start end-pos 'bad))))
-  
-  (define get-chunk
-    (lexer
-     [(:+ (:~ identifier-delims)) (values lexeme end-pos)]))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/scheme-lexer.rkt b/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/scheme-lexer.rkt
deleted file mode 100644
index a05e36af46..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/scheme-lexer.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-#|
-
-This file is provided for backwards compatibility.
-New code should use racket-lexer.rkt.
-
-|#
-(require "racket-lexer.rkt")
-(provide 
- (rename-out [racket-lexer scheme-lexer]
-             [racket-lexer/status scheme-lexer/status]
-             [racket-nobar-lexer/status scheme-nobar-lexer/status]))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/scribble-lexer.rkt b/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/scribble-lexer.rkt
deleted file mode 100644
index 0afb257102..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/scribble-lexer.rkt
+++ /dev/null
@@ -1,379 +0,0 @@
-#lang scheme/base
-(require "scheme-lexer.rkt"
-         racket/contract
-         "lexer-contract.rkt"
-         racket/port)
-
-(provide 
- (contract-out
-  [scribble-inside-lexer lexer/c]
-  [scribble-lexer lexer/c]))
-
-(define-struct text (scheme-rx end-rx sub-rx string-rx open-paren close-paren) #:transparent)
-(define-struct scheme (status backup) #:transparent)
-(define-struct args () #:transparent)
-(define-struct text-args () #:transparent)
-
-(define rx:opener #rx"^[|]([^a-zA-Z0-9 \t\r\n\f@\\\177-\377{]*){")
-
-(define rxes (make-weak-hash))
-(define rx-keys (make-weak-hasheq))
-
-(define (intern-byte-regexp bstr)
-  (let ([v (hash-ref rxes bstr #f)])
-    (or v
-        (let ([rx (byte-regexp bstr)])
-          (hash-set! rxes bstr rx)
-          (hash-set! rx-keys rx (make-ephemeron rx bstr))
-          rx))))
-
-(define (scribble-inside-lexer orig-in offset orig-mode)
-  (define mode (or orig-mode
-                   (list
-                    (make-text #rx"^@"
-                               #f
-                               #f
-                               #rx".*?(?:(?=[@\r\n])|$)"
-                               #f
-                               #f))))
-  (define in (special-filter-input-port
-              orig-in
-              (lambda (v s) (bytes-set! s 0 (char->integer #\.)) 1)))
-  (let-values ([(line col pos) (port-next-location orig-in)])
-    (when line
-      (port-count-lines! in)))
-  (let-values ([(line col pos) (port-next-location in)]
-               [(l) (car mode)])
-
-    ;; If we don't match rx:opener in a place where we might otherwise
-    ;;  match, and there is a "|" at that point, then a change later
-    ;;  could turn the non-match into a match, AND there could be
-    ;;  arbitrarily many Scheme tokens in between. So we carry the backup
-    ;;  position, use it as necessary (from places that might be between a "|"
-    ;;  and a potential match creator), and cancel it when it's clearly
-    ;;  not needed anymore (which includes after any token that isn't a 
-    ;;  Scheme token).
-    (define (backup-if-needed pos)
-      (if (and (scheme? (car mode))
-               (scheme-backup (car mode)))
-          (- (+ pos offset) (scheme-backup (car mode)))
-          0))
-    (define (no-backup mode)
-      (if (and (scheme? (car mode))
-               (scheme-backup (car mode)))
-          (cons (make-scheme (scheme-status (car mode)) #f)
-                (cdr mode))
-          mode))
-    (define (maybe-no-backup type mode)
-      (if (eq? type 'white-space)
-          ;; white space definitely ends the need for backup
-          (no-backup mode)
-          mode))
-    
-    (define (enter-@ comment-k)
-      (cond
-       [(equal? #\; (peek-char-or-special in))
-        ;; Comment
-        (read-char in)
-        (if (or (equal? #\{ (peek-char-or-special in))
-                (equal? #\| (peek-char-or-special in)))
-            ;; Bracketed comment:
-            (let-values ([(end-line end-col end-pos) (port-next-location in)])
-              (comment-k "@;"
-                         'comment
-                         #f
-                         pos
-                         end-pos
-                         (backup-if-needed pos)
-                         (cons (make-text-args)
-                               (no-backup mode))))
-            ;; Line comment:
-            (begin
-              (regexp-match? #rx".*?(?=[\r\n])" in)
-              (let-values ([(end-line end-col end-pos) (port-next-location in)])
-                (comment-k "@;"
-                           'comment
-                           #f
-                           pos
-                           end-pos
-                           (backup-if-needed pos)
-                           (no-backup mode)))))]
-       [(regexp-try-match rx:opener in)
-        => (lambda (m) (enter-opener m mode))]
-       [(regexp-try-match #rx"^{" in)
-        (enter-simple-opener mode)]
-       [else
-        (let ([new-mode
-               (cond
-                [(equal? #\| (peek-char-or-special in))
-                 (read-char in)
-                 (list* (make-scheme 'bar (+ offset pos))
-                        (no-backup mode))]
-                [else
-                 (list* (make-scheme 'one #f)
-                        (make-args)
-                        (no-backup mode))])])
-          (let-values ([(end-line end-col end-pos) (port-next-location in)])
-            (values "@"
-                    'parenthesis
-                    #f
-                    pos
-                    end-pos
-                    (backup-if-needed pos)
-                    new-mode)))]))
-
-    (define (enter-simple-opener mode)
-      (let-values ([(end-line end-col end-pos) (port-next-location in)])
-        (values "{"
-                'parenthesis
-                '|{|
-                pos
-                end-pos
-                (backup-if-needed pos)
-                (cons (make-text #rx"^@"
-                                 #rx"^}"
-                                 #rx"^{"
-                                 #rx".*?(?:(?=[@{}\r\n])|$)"
-                                 '|{|
-                                 '|}|)
-                       (no-backup mode)))))
-
-    (define (enter-opener m mode)
-      (let-values ([(end-line end-col end-pos) (port-next-location in)])
-        (values (cadr m)
-                'parenthesis
-                '|{| ;; Better complex paren?
-                pos
-                end-pos
-                (backup-if-needed pos)
-                (let ([closer (regexp-quote
-                               (bytes-append #"}"
-                                             (flip (cadr m))
-                                             #"|"))]
-                      [re-opener (regexp-quote (cadr m))])
-                  (cons (make-text (intern-byte-regexp (bytes-append #"^[|]" re-opener #"@"))
-                                   (intern-byte-regexp (bytes-append #"^" closer))
-                                   (intern-byte-regexp (bytes-append #"^[|]" re-opener #"{"))
-                                   (intern-byte-regexp (bytes-append
-                                                         #".*?(?:(?=[|]"
-                                                         re-opener
-                                                         #"[@{])|(?="
-                                                         closer
-                                                         #")|(?=[\r\n])|$)"))
-                                   '|{|  ;; Better complex paren?
-                                   '|}|) ;; Better complex paren?
-                        (no-backup mode))))))
-
-    (if (eof-object? (peek-char-or-special in))
-        (values eof
-                'eof
-                #f
-                pos 
-                pos
-                0
-                #f)
-        (cond
-         [(text? l)
-          (cond
-           [(and (text-scheme-rx l)
-                 (regexp-try-match (text-scheme-rx l) in))
-            ;; Found @
-            (enter-@ values)]
-           [(and (text-end-rx l)
-                 (regexp-try-match (text-end-rx l) in))
-            (let-values ([(end-line end-col end-pos) (port-next-location in)])
-              (values "}"
-                      'parenthesis
-                      (text-close-paren l)
-                      pos
-                      end-pos
-                      0
-                      (cdr mode)))]
-           [(and (text-sub-rx l)
-                 (regexp-try-match (text-sub-rx l) in))
-            (let-values ([(end-line end-col end-pos) (port-next-location in)])
-              (values "{"
-                      'parenthesis
-                      (text-open-paren l)
-                      pos
-                      end-pos
-                      0
-                      (cons (car mode) mode)))]
-           [(regexp-try-match #px"^(?:[\r\n])\\s*" in)
-            ;; Treat a newline and leading whitespace in text mode as whitespace
-            ;; instead of as a string:
-            (let-values ([(end-line end-col end-pos) (port-next-location in)])
-              (values " "
-                      'white-space
-                      #f
-                      pos
-                      end-pos
-                      0
-                      mode))]
-           [else
-            ;; Read string up to @, }, or newline
-            (regexp-match? (text-string-rx l) in)
-            (let-values ([(end-line end-col end-pos) (port-next-location in)])
-              (values 'text
-                      'text
-                      #f
-                      pos
-                      end-pos
-                      0
-                      mode))])]
-         [(scheme? l)
-          (let ([status (scheme-status l)])
-            (cond
-             [(and (eq? status 'bracket)
-                   (regexp-try-match #px"^\\s*?[]]" in))
-              (let-values ([(end-line end-col end-pos) (port-next-location in)])
-                (values "]"
-                        'parenthesis
-                        '|]|
-                        pos
-                        end-pos
-                        0
-                        (cdr mode)))]
-             [(and (memq status '(bar bar-no-more))
-                   (regexp-try-match #px"^\\s*?[|]" in))
-              (let-values ([(end-line end-col end-pos) (port-next-location in)])
-                (values "|"
-                        'parenthesis
-                        #f
-                        pos
-                        end-pos
-                        (backup-if-needed pos)
-                        (cdr mode)))]
-             [(regexp-try-match #rx"^@" in)
-              ;; If we have a backup at this point, we can drop it, because
-              ;; edits after here cannot lead to a rx:opener match.
-              (enter-@ (lambda (lexeme type paren start end backup mode)
-                         (values lexeme
-                                 (if (eq? status 'one)
-                                     'error
-                                     type)
-                                 paren
-                                 start
-                                 end
-                                 backup
-                                 mode)))]
-             [(and (eq? status 'one)
-                   (regexp-try-match rx:opener in))
-              ;; Must have consumed a special before an opener
-              => (lambda (m) (enter-opener m (cdr mode)))]
-             [(and (eq? status 'one)
-                   (regexp-try-match #rx"^{" in))
-              ;; Must have consumed a special before an opener
-              (enter-simple-opener (cdr mode))]
-             [(and (eq? status 'one)
-                   (regexp-try-match #rx"^#?['`]" in))
-              ;; Value special:
-              (let-values ([(end-line end-col end-pos) (port-next-location in)])
-                (values "'"
-                        'constant
-                        #f
-                        pos
-                        end-pos
-                        (backup-if-needed pos)
-                        mode))]
-             [(and (eq? status 'one)
-                   (regexp-try-match #rx"^#?,@?" in))
-              ;; Other special:
-              (let-values ([(end-line end-col end-pos) (port-next-location in)])
-                (values ","
-                        'other
-                        #f
-                        pos
-                        end-pos
-                        (backup-if-needed pos)
-                        mode))]
-             [else
-              (let-values ([(lexeme type paren start end adj) 
-                            (case status
-                              [(bar bar-no-more one) (scheme-nobar-lexer/status in)]
-                              [else (scheme-lexer/status in)])]
-                           [(consume) (lambda (status)
-                                        (case status
-                                          [(many) mode]
-                                          [(one) (cdr mode)]
-                                          [(bracket bar-no-more) 
-                                           (cons (make-scheme status (scheme-backup l)) 
-                                                 (cdr mode))]
-                                          [(bar) (cons (make-scheme 'bar-no-more (scheme-backup l))
-                                                       (cdr mode))]
-                                          [else (error "bad status" status)]))])
-                (values lexeme
-                        (cond
-                         [(or (eq? type 'comment) 
-                              (eq? type 'white-space))
-                          (if (eq? status 'one)
-                              'error
-                              type)]
-                         [(eq? status 'bar-no-more) 
-                          ;; Too many S-expressions in @| ... |
-                          'error]
-                         [else type])
-                        paren 
-                        start 
-                        end
-                        (backup-if-needed start)
-                        (maybe-no-backup
-                         type
-                         (case adj
-                           [(continue) mode]
-                           [(datum) 
-                            (cond
-                             [(pair? status) mode]
-                             [else (consume status)])]
-                           [(open)
-                            (cons (make-scheme (cons #t status) (scheme-backup l))
-                                  (cdr mode))]
-                           [(close)
-                            (if (pair? status)
-                                (let ([v (cdr status)])
-                                  (if (symbol? v)
-                                      (consume v)
-                                      (cons (make-scheme v (scheme-backup l)) (cdr mode))))
-                                (consume status))]
-                           [(bad) (if (pair? status)
-                                      mode
-                                      (consume status))]
-                           [else (error "bad adj")]))))]))]
-         [(args? l)
-          (cond
-           [(regexp-try-match #rx"^\\[" in)
-            (let-values ([(end-line end-col end-pos) (port-next-location in)])
-              (values "["
-                      'parenthesis
-                      '|[|
-                      pos
-                      end-pos
-                      0
-                      (list* (make-scheme 'bracket #f)
-                             mode)))]
-           [else
-            (scribble-inside-lexer in offset (cons (make-text-args) (cdr mode)))])]
-         [(text-args? l)
-          (cond
-           [(regexp-try-match rx:opener in)
-            => (lambda (m) (enter-opener m (cdr mode)))]
-           [(regexp-try-match #rx"^{" in)
-            (enter-simple-opener (cdr mode))]
-           [else
-            (scribble-inside-lexer in offset (cdr mode))])]
-         [else (error "bad mode")]))))
-
-(define (scribble-lexer in offset mode)
-  (scribble-inside-lexer in offset (or mode (list (make-scheme 'many #f)))))
-
-(define (flip s)
-  (list->bytes
-   (for/list ([c (in-bytes s)])
-     (cond
-      [(equal? c (char->integer #\()) (char->integer #\))]
-      [(equal? c (char->integer #\[)) (char->integer #\])]
-      [(equal? c (char->integer #\<)) (char->integer #\>)]
-      [(equal? c (char->integer #\))) (char->integer #\()]
-      [(equal? c (char->integer #\])) (char->integer #\[)]
-      [(equal? c (char->integer #\>)) (char->integer #\<)]
-      [else c]))))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/token-tree.rkt b/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/token-tree.rkt
deleted file mode 100644
index ce2e6c295a..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-lib/syntax-color/token-tree.rkt
+++ /dev/null
@@ -1,394 +0,0 @@
-#lang racket/base
-  (require racket/class)
-  
-  (provide token-tree% insert-first! insert-last! insert-last-spec!
-           node? node-token-length node-token-data node-left-subtree-length node-left node-right)
-  
-  ;; A tree is 
-  ;;  - #f
-  ;;  - (make-node NAT 'a NAT tree tree)
-  (define-struct node ([token-length #:mutable] token-data [left-subtree-length #:mutable] [left #:mutable] [right #:mutable]))
-  
-  ;; ----- The algorithmic implementation of the splay tree for a buffer ------
-  
-  ;; search-max: tree * tree list -> tree
-  (define (search-max node path) (search-dir node path node-right))
-  
-  ;; search-min: tree * tree list -> tree
-  (define (search-min node path) (search-dir node path node-left))
-  
-  (define (search-dir node path direction)
-    (cond
-      [(not node) #f]
-      [else
-       (let loop ([node (direction node)]
-                  [path-hd node]
-                  [path-tl path]
-                  [direction direction])
-         (cond
-           [(not node) (bottom-up-splay path-hd path-tl)]
-           [else
-            (loop (direction node) node (i-cons path-hd path-tl) direction)]))]))
-  
-  ;; internal-search: tree * NAT * NAT * tree list -> tree
-  ;; key-position is the position in the buffer we are looking for
-  ;; offset is the offset for the whole subtree of node in the buffer.
-  ;; path is the path back to the root
-  (define (internal-search node key-position)
-    (cond
-      [(not node) #f]
-      [else 
-       (define-values (first-node first-offset) (internal-direction node key-position 0))
-       (let loop ([node first-node]
-                  [key-position key-position]
-                  [offset first-offset]
-                  [path-hd node]
-                  [path-tl '()])
-         (cond
-           [(not node)
-            (bottom-up-splay path-hd path-tl)]
-           [else
-            (define-values (next-node next-offset) (internal-direction node key-position offset))
-            (loop next-node key-position next-offset node (i-cons path-hd path-tl))]))]))
-  
-  (define (internal-direction node key-position offset)
-    (define node-start (+ offset (node-left-subtree-length node)))
-    (define node-end (+ node-start (node-token-length node)))
-    (cond
-      [(< key-position node-start)
-       (values (node-left node) offset)]
-      [(>= key-position node-end)
-       (values (node-right node) node-end)]
-      [else
-       (values #f #f)]))
-       
-  ;; update-subtree-length-left-rotate: tree * tree -> 
-  (define (update-subtree-length-left-rotate self parent)
-    (set-node-left-subtree-length! parent 
-                                   (- (node-left-subtree-length parent)
-                                      (node-left-subtree-length self)
-                                      (node-token-length self))))
-  
-  ;; update-subtree-length-right-rotate: tree * tree ->
-  (define (update-subtree-length-right-rotate self parent)
-    (set-node-left-subtree-length! self
-                                   (+ (node-left-subtree-length parent)
-                                      (node-left-subtree-length self)
-                                      (node-token-length parent))))
-  
-  ;; bottom-up-splay: tree * tree list -> tree
-  (define (bottom-up-splay self path)
-    (let loop ([self self] [path path])
-      (cond
-        ((null? path) self)               ;; node is root already
-        ((null? (i-cdr path))             ;; node's parent is root
-         (let ((parent (i-car path)))
-           (cond
-             ((eq? self (node-left parent))
-              (set-node-left! parent (node-right self))
-              (set-node-right! self parent)
-              (update-subtree-length-left-rotate self parent))
-             (else
-              (set-node-right! parent (node-left self))
-              (set-node-left! self parent)
-              (update-subtree-length-right-rotate self parent))))
-         self)
-        (else
-         (let ((grand (i-cadr path))
-               (parent (i-car path)))
-           (cond
-             ((eq? self (node-left parent))
-              (cond
-                ((eq? parent (node-left grand))
-                 (set-node-left! grand (node-right parent))
-                 (set-node-right! parent grand)
-                 (set-node-left! parent (node-right self))
-                 (set-node-right! self parent)
-                 (update-subtree-length-left-rotate parent grand)
-                 (update-subtree-length-left-rotate self parent))
-                (else
-                 (set-node-right! grand (node-left self))
-                 (set-node-left! self grand)
-                 (set-node-left! parent (node-right self))
-                 (set-node-right! self parent)
-                 (update-subtree-length-left-rotate self parent)
-                 (update-subtree-length-right-rotate self grand))))
-             (else
-              (cond
-                ((eq? parent (node-right grand))
-                 (set-node-right! grand (node-left parent))
-                 (set-node-left! parent grand)
-                 (set-node-right! parent (node-left self))
-                 (set-node-left! self parent)
-                 (update-subtree-length-right-rotate parent grand)
-                 (update-subtree-length-right-rotate self parent))
-                (else
-                 (set-node-left! grand (node-right self))
-                 (set-node-right! self grand)
-                 (set-node-right! parent (node-left self))
-                 (set-node-left! self parent)
-                 (set-node-left-subtree-length! grand
-                                                (- (node-left-subtree-length grand)
-                                                   (node-left-subtree-length parent)
-                                                   (node-token-length parent)
-                                                   (node-left-subtree-length self)
-                                                   (node-token-length self)))
-                 (update-subtree-length-right-rotate self parent)))))
-           (unless (null? (i-cddr path))
-             (if (eq? grand (node-left (i-caddr path)))
-                 (set-node-left! (i-caddr path) self)
-                 (set-node-right! (i-caddr path) self)))
-           (loop self (i-cddr path)))))))
-
-  (define (size node acc)
-    (cond
-      ((not node) acc)
-      (else
-       (let ((left-size (size (node-left node) acc)))
-         (size (node-right node) (add1 left-size))))))
-      
-  (define (max-depth node)
-    (cond
-      ((not node) 0)
-      (else
-       (add1 (max (max-depth (node-left node))
-                  (max-depth (node-right node)))))))
-
-  (define (do-to-list node)
-    (cond
-      (node
-       (append (do-to-list (node-left node))
-               (list (vector (node-token-length node) (node-left-subtree-length node) (node-token-data node)))
-               (do-to-list (node-right node))))
-      (else null)))
-  
-
-  (define (do-splay-tree-for-each f node offset)
-    (when node
-      (do-splay-tree-for-each f (node-left node) offset)
-      (let ((node-start (+ offset (node-left-subtree-length node))))
-        (f node-start (node-token-length node) (node-token-data node))
-        (do-splay-tree-for-each f (node-right node) (+ node-start (node-token-length node))))))
-  
-  ;; represent paths as improper lists of nodes
-  (define (i-cons hd tl) (if (null? tl) hd (cons hd tl)))
-  (define (i-car pr) (if (node? pr) pr (car pr)))
-  (define (i-cdr pr) (if (node? pr) '() (cdr pr)))
-  (define (i-cadr pr) (i-car (i-cdr pr)))
-  (define (i-cddr pr) (i-cdr (i-cdr pr)))
-  (define (i-caddr pr) (i-car (i-cddr pr)))
-  
-  ;; --------------------- The interface to the splay tree --------------------
-  
-  (define-local-member-name set-root)
-  (define token-tree%
-    (class object%
-      
-      (init (length #f)
-            (data #f))
-
-      ;; root: tree
-      (define root
-        (if length
-            (make-node length data 0 #f #f)
-            #f))
-      
-      ;; reset-tree ->
-      (define/public (reset-tree)
-        (set! root #f))
-  
-      ;; get-root: -> tree
-      (define/public (get-root)
-        root)
-
-      ;; set-root: tree ->
-      ;; set-root is not accessible outside of this module
-      (define/public (set-root t)
-        (set! root t))
-      
-      ;; is-empty?: ->
-      (define/public (is-empty?)
-        (if root #f #t))
-      
-      (define/public (get-root-length)
-        (if root
-            (node-token-length root)
-            0))
-      
-      (define/public (get-root-data)
-        (if root
-            (node-token-data root)
-            #f))
-      
-      (define/public (get-root-start-position)
-        (if root
-            (node-left-subtree-length root)
-            0))
-      
-      (define/public (get-root-end-position)
-        (if root
-            (+ (node-left-subtree-length root)
-               (node-token-length root))
-            0))
-      
-      (define/public (add-to-root-length inc)
-        (unless root
-          (error 'add-to-root-length "Attempted to increase root length of empty token-tree%"))
-        (set-node-token-length! root (+ (node-token-length root) inc)))
-      
-      ;; search!: NAT ->
-      ;; Moves the node at key-position to the root
-      (define/public (search! key-position)
-        (when root
-          (set! root (internal-search root key-position))))
-      
-      ;; search-max!: ->
-      ;; moves the maximum node to the root
-      (define/public (search-max!)
-        (when root
-          (set! root (search-max root null))))
-      
-      ;; search-min!: ->
-      ;; moves the minimum node to the root
-      (define/public (search-min!)
-        (when root
-          (set! root (search-min root null))))
-      
-      ;; remove-root!: ->
-      ;; Removes the root node
-      (define/public (remove-root!)
-        (when root
-          (let ((new-node (search-max (node-left root) null)))
-            (cond
-              (new-node
-               (set-node-right! new-node (node-right root))
-               (set! root new-node))
-              (else
-               (set! root (node-right root)))))))
-
-      
-      ;; split: -> NAT * NAT * token-tree% * token-tree%
-      ;; splits the tree into 2 trees, setting root to #f
-      ;; Returns the start and end position of the token at pos
-      ;; Returns all tokens before pos and after pos, not
-      ;; including any tokens adjacent to pos.  Thus is s
-      ;; pos is on a token boundary, 2 tokens will be dropped.
-      ;; In this case, the start will be for the first dropped
-      ;; token and the stop will be for the second.
-      (define/public (split/data pos)
-        (search! pos)
-        (let ((t1 (new token-tree%))
-              (t2 (new token-tree%)))
-          (cond
-            (root
-             (let ((second-start (get-root-start-position))
-                   (second-stop (get-root-end-position))
-                   (data (node-token-data root)))
-               (send t1 set-root (node-left root))
-               (send t2 set-root (node-right root))
-               (set! root #f)
-               (cond
-                 ((= pos second-start)
-                  (send t1 search-max!)
-                  (let ((first-start (send t1 get-root-start-position)))
-                    (send t1 remove-root!)
-                    (values first-start second-stop t1 t2 data)))
-                 (else
-                  (values second-start second-stop t1 t2 data)))))
-            (else (values 0 0 t1 t2 #f)))))
-
-      (define/public (split pos)
-        (let-values ([(orig-token-start orig-token-end valid-tree invalid-tree orig-data)
-                      (split/data pos)])
-          (values orig-token-start orig-token-end valid-tree invalid-tree)))
-
-;;      (define/public (split)
-;;        (let ((t1 (new token-tree%))
-;;              (t2 (new token-tree%)))
-;;          (cond
-;;            (root
-;;             (send t1 set-root (node-left root))
-;;             (send t2 set-root (node-right root))
-;;             (begin0
-;;               (values (node-left-subtree-length root)
-;;                       (+ (node-left-subtree-length root) (node-token-length root))
-;;                       t1
-;;                       t2)
-;;               (set! root #f)))
-;;            (else (values 0 0 t1 t2)))))
-      
-      ;; split-after: -> token-tree% * token-tree%
-      ;; splits the tree into 2 trees, setting root to #f
-      ;; returns a tree including root and its left subtree
-      ;; then root's right subtree
-      (define/public (split-after)
-        (let ((t1 (new token-tree%))
-              (t2 (new token-tree%)))
-          (when root
-            (send t1 set-root root)
-            (send t2 set-root (node-right root))
-            (set-node-right! root #f)
-            (set! root #f))
-          (values t1 t2)))
-           
-      ;; split-before: -> token-tree% * token-tree%
-      ;; splits the tree into 2 trees, setting root to #f
-      ;; returns root's left subtree and a tree including root
-      ;; and its right subtree
-      (define/public (split-before)
-        (let ((t1 (new token-tree%))
-              (t2 (new token-tree%)))
-          (when root
-            (send t1 set-root (node-left root))
-            (send t2 set-root root)
-            (set-node-left! root #f)
-            (set-node-left-subtree-length! root 0)
-            (set! root #f))
-          (values t1 t2)))
-      
-      (define/public (to-list)
-        (do-to-list root))
-      
-      (define/public (for-each f)
-        (do-splay-tree-for-each f root 0))
-      
-      (super-instantiate ())))
-
-  ;; insert-first!: token-tree% * token-tree% ->
-  ;; insert tree2 into tree1 as the first thing.
-  ;; Set tree2's root to #f
-  (define (insert-first! tree1 tree2)
-    (send tree2 search-max!)
-    (let ((node1 (send tree1 get-root))
-          (node2 (send tree2 get-root)))
-      (when node2
-        (set-node-right! node2 node1)
-        (send tree1 set-root node2)
-        (send tree2 reset-tree))))
-  
-  ;; insert-last!: token-tree% * token-tree%  ->
-  ;; insert tree2 into tree1 as the last thing.
-  ;; Set tree2's root to #f
-  (define (insert-last! tree1 tree2)
-    (send tree1 search-max!)
-    (let ((node1 (send tree1 get-root))
-          (node2 (send tree2 get-root)))
-      (cond
-        (node1
-         (set-node-right! node1 node2))
-        (else
-         (send tree1 set-root node2)))
-      (send tree2 reset-tree)))
-
-  ;; insert-last-spec!: token-tree% NAT 'a ->
-  ;; Same as (insert-last! tree1 (new token-tree% (length len) (data type)))
-  ;; This optimization is important for the colorer.
-  (define (insert-last-spec! tree1 len type)
-    (send tree1 search-max!)
-    (let ((node1 (send tree1 get-root))
-          (node2 (make-node len type 0 #f #f)))
-      (cond
-        (node1
-         (set-node-right! node1 node2))
-        (else
-         (send tree1 set-root node2)))))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-test/LICENSE.txt b/pkgs/syntax-color-pkgs/syntax-color-test/LICENSE.txt
deleted file mode 100644
index b71b8b648c..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax-color-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/syntax-color-pkgs/syntax-color-test/info.rkt b/pkgs/syntax-color-pkgs/syntax-color-test/info.rkt
deleted file mode 100644
index 7f3b4da50b..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-test/info.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-
-(define pkg-desc "tests for \"syntax-color-lib\"")
-
-(define pkg-authors '(mflatt))
-(define build-deps '("rackunit-lib"
-                     "scheme-lib"
-                     "syntax-color-lib"))
-(define update-implies '("syntax-color-lib"))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/module-lexer.rkt b/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/module-lexer.rkt
deleted file mode 100644
index 75b32bfd0e..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/module-lexer.rkt
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang racket/base
-(require syntax-color/module-lexer
-         rackunit)
-
-(define (lex str count?)
-  (define p (open-input-string str))
-  (when count? (port-count-lines! p))
-  (let loop ([mode #f]
-             [n 0])
-    (define-values (lexeme type data token-start token-end backup new-mode)
-      (module-lexer p
-                    0
-                    mode))
-    (define one (list lexeme 
-                      type token-start token-end 
-                      (cond
-                        [(procedure? mode)
-                         `(proc ,(object-name mode))]
-                        [(and (pair? mode)
-                              (procedure? (car mode)))
-                         (cons `(proc ,(object-name (car mode)))
-                               (cdr mode))]
-                        [else mode])))
-    (cond
-      [(eof-object? lexeme) (list one)]
-      [(= n 1000) '()] ;; watch out for loops
-      [else (cons one (loop new-mode (+ n 1)))])))
-
-(define (same? a b)
-  (cond
-    [(eq? a 'dont-care) #t]
-    [(eq? b 'dont-care) #t]
-    [(and (pair? a) (pair? b))
-     (and (same? (car a) (car b))
-          (same? (cdr a) (cdr b)))]
-    [else (equal? a b)]))
-
-(check-equal? (lex "#lang racket/base" #t)
-              `(("#lang racket/base" other 1 18 #f)
-                (,eof eof #f #f (proc racket-lexer))))
-(check-equal? (lex "#lang racket/base\n1" #t)
-              `(("#lang racket/base" other 1 18 #f)
-                ("\n" white-space 18 19 (proc racket-lexer)) 
-                ("1" constant 19 20 (proc racket-lexer))
-                (,eof eof #f #f (proc racket-lexer))))
-(check-equal? (lex ";; αα\n" #t)
-              `(("; αα" comment 1 6 #f) 
-                ("\n" white-space 6 7 before-lang-line) 
-                (,eof eof #f #f before-lang-line)))
-(check-equal? (lex ";; ααα\n;; aaa\n" #t)
-              `(("; ααα" comment 1 7 #f) 
-                ("\n" white-space 7 8 before-lang-line) 
-                ("; aaa" comment 8 14 before-lang-line) 
-                ("\n" white-space 14 15 before-lang-line)
-                (,eof eof #f #f before-lang-line)))
-(check-equal? (lex ";; a\n#lang racket/base" #t)
-              `(("; a" comment 1 5 #f) 
-                ("\n" white-space 5 6 before-lang-line) 
-                ("#lang racket/base" other 6 23 before-lang-line)
-                (,eof eof #f #f (proc racket-lexer))))
-(check-equal? (lex "#lang at-exp racket/base" #t)
-              `(("#lang at-exp racket/base" other 1 25 #f)
-                (,eof eof 25 25 ((proc scribble-lexer) . #f))))
-(check-equal? (lex "#lang at-exp racket/baseBOGUS" #t)
-              `(("#lang at-exp" error 1 30 #f)
-                (,eof eof #f #f no-lang-line)))
-(check-equal? (lex " #lang BOGUS" #t)
-              `((" " white-space 1 2 #f)
-                ("#lang BOGUS" error 2 13 before-lang-line)
-                (,eof eof #f #f no-lang-line)))
-(check same?
-       (lex "#lang at-exp racket/base\n1\n" #t)
-       `(("#lang at-exp racket/base" other 1 25 #f)
-         ("\n" white-space 25 26 ((proc scribble-lexer) . #f)) 
-         ("1" constant 26 27 ((proc scribble-lexer) . dont-care))
-         ("\n" white-space 27 28 ((proc scribble-lexer) . dont-care))
-         (,eof eof 28 28 ((proc scribble-lexer) . dont-care))))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/paren-tree.rkt b/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/paren-tree.rkt
deleted file mode 100644
index 98486f81bb..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/paren-tree.rkt
+++ /dev/null
@@ -1,237 +0,0 @@
-#lang racket/load
-
-(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
-(require mzlib/class
-         syntax-color/paren-tree)
-
-(define t (new paren-tree% (matches '((|(| |)|)
-                                      (|[| |]|)))))
-
-
-(Section 'add-token)
-(send t add-token #f 12)
-(test '(((0 12 (#f . 0))) ())
-      'add-token
-      (send t test))
-(send t add-token #f 1)
-(test '(((0 13 (#f . 0))) ())
-      'add-token
-      (send t test))
-(send t add-token '|)| 3)
-(test '(((0 13 (#f . 0))
-         (13 3 (|)| . 3)))
-        ())
-      'add-token
-      (send t test))
-(send t add-token #f 3)
-(test '(((0 13 (#f . 0))
-         (13 6 (|)| . 3)))
-        ())
-      'add-token
-      (send t test))
-
-(Section 'split-tree)
-(define (build-tree)
-  (set! t (new paren-tree% (matches '((|(| |)|) (|[| |]|)))))
-  (send t add-token #f 2)
-  (send t add-token #f 2)
-  (send t add-token '|(| 2)
-  (send t add-token #f 2)
-  (send t add-token '|(| 2)
-  (send t add-token '|(| 2)
-  (send t add-token #f 2)
-  (send t add-token #f 2))
-(build-tree)
-(test '(((0 4 (#f . 0))
-         (4 4 (|(| . 2))
-         (8 2 (|(| . 2))
-         (10 6 (|(| . 2)))
-        ())
-      'add-token
-      (send t test))
-(define (split-test pos res)
-  (send t split-tree pos)
-  (test res 'split-tree (send t test)))
-(split-test 16 '(((0 4 (#f . 0))
-                  (4 4 (|(| . 2))
-                  (8 2 (|(| . 2))
-                  (10 6 (|(| . 2)))
-                 ((0 0 (#f . 0)))))
-(split-test 14 '(((0 4 (#f . 0))
-                  (4 4 (|(| . 2))
-                  (8 2 (|(| . 2))
-                  (10 4 (|(| . 2)))
-                 ((0 2 (#f . 0)))))
-(split-test 12 '(((0 4 (#f . 0))
-                  (4 4 (|(| . 2))
-                  (8 2 (|(| . 2))
-                  (10 2 (|(| . 2)))
-                 ((0 2 (#f . 0)))))
-(split-test 10 '(((0 4 (#f . 0))
-                  (4 4 (|(| . 2))
-                  (8 2 (|(| . 2)))
-                 ((0 2 (|(| . 2)))))
-(split-test 8 '(((0 4 (#f . 0))
-                  (4 4 (|(| . 2)))
-                 ((0 2 (|(| . 2)))))
-(split-test 6 '(((0 4 (#f . 0))
-                 (4 2 (|(| . 2)))
-                ((0 2 (#f . 0)))))
-(split-test 4 '(((0 4 (#f . 0)))
-                ((0 2 (|(| . 2)))))
-(split-test 2 '(((0 2 (#f . 0)))
-                ((0 2 (#f . 0)))))
-(split-test 0 '(()
-                ((0 2 (#f . 0)))))
-(build-tree)
-(split-test 6 '(((0 4 (#f . 0))
-                 (4 2 (|(| . 2)))
-                ((0 2 (#f . 0))
-                 (2 2 (|(| . 2))
-                 (4 6 (|(| . 2)))))
-
-(set! t (new paren-tree% (matches '((|(| |)|) (|[| |]|)))))
-(split-test 0 '(()()))
-
-(Section 'merge-tree)
-(build-tree)
-(send t split-tree 6)
-(send t merge-tree 10)
-(test '(((0 4 (#f . 0))
-         (4 4 (|(| . 2))
-         (8 2 (|(| . 2))
-         (10 6 (|(| . 2)))
-        ())
-      'merge-tree
-      (send t test))
-(send t split-tree 6)
-(send t merge-tree 0)
-(test '(((0 4 (#f . 0))
-         (4 2 (|(| . 2)))
-        ())
-      'merge-tree
-      (send t test))
-(send t split-tree 6)
-(send t merge-tree 0)
-(test '(((0 4 (#f . 0))
-         (4 2 (|(| . 2)))
-        ())
-      'merge-tree
-      (send t test))
-
-(Section 'truncate)
-(build-tree)
-(send t truncate 0)
-(test '(()())
-      'truncate
-      (send t test))
-(build-tree)
-(send t truncate 6)
-(test '(((0 4 (#f . 0))
-         (4 2 (|(| . 2)))
-        ())
-      'truncate
-      (send t test))
-
-(define (build-tree)
-  (set! t (new paren-tree% (matches '((|(| |)|) (|[| |]|)))))
-  (send t add-token '|(| 2)
-  (send t add-token '|[| 2)
-  (send t add-token '|]| 2)
-  (send t add-token #f 2)
-  (send t add-token '|[| 2)
-  (send t add-token #f 2)
-  (send t add-token '|]| 2)
-  (send t add-token '|)| 2))
-(build-tree)
-(test '(((0 2 (|(| . 2))
-         (2 2 (|[| . 2))
-         (4 4 (|]| . 2))
-         (8 4 (|[| . 2))
-         (12 2 (|]| . 2))
-         (14 2 (|)| . 2)))
-        ())
-      'add-token
-      (send t test))
-
-(Section 'is-open-pos?)
-(build-tree)
-(test '|)| 'is-open-pos? (send t is-open-pos? 0))
-(test '|]| 'is-open-pos? (send t is-open-pos? 2))
-(test #f 'is-open-pos? (send t is-open-pos? 4))
-(test #f 'is-open-pos? (send t is-open-pos? 6))
-(test '|]| 'is-open-pos? (send t is-open-pos? 8))
-(test #f 'is-open-pos? (send t is-open-pos? 10))
-(test #f 'is-open-pos? (send t is-open-pos? 12))
-(test #f 'is-open-pos? (send t is-open-pos? 14))
-(test #f 'is-open-pos? (send t is-open-pos? 16))
-
-(Section 'is-close-pos?)
-(test #f 'is-close-pos? (send t is-close-pos? 0))
-(test #f 'is-close-pos? (send t is-close-pos? 2))
-(test '|[| 'is-close-pos? (send t is-close-pos? 4))
-(test #f 'is-close-pos? (send t is-close-pos? 6))
-(test #f 'is-close-pos? (send t is-close-pos? 8))
-(test #f 'is-close-pos? (send t is-close-pos? 10))
-(test '|[| 'is-close-pos? (send t is-close-pos? 12))
-(test '|(| 'is-close-pos? (send t is-close-pos? 14))
-(test #f 'is-close-pos? (send t is-close-pos? 16))
-
-(Section 'match)
-(define (test-match-forward num res)
-  (let-values (((a b c) (send t match-forward num)))
-    (test res 'match-forward (list a b c))))
-(define (test-match-backward num res)
-  (let-values (((a b c) (send t match-backward num)))
-    (test res 'match-backward (list a b c))))
-(test-match-forward 0 '(0 16 #f))
-(test-match-forward 2 '(2 6 #f))
-(test-match-forward 4 '(#f #f #f))
-(test-match-forward 6 '(#f #f #f))
-(test-match-forward 8 '(8 14 #f))
-(test-match-forward 10 '(#f #f #f))
-(test-match-forward 12 '(#f #f #f))
-(test-match-forward 14 '(#f #f #f))
-(test-match-forward 16 '(#f #f #f))
-
-(test-match-backward 0 '(#f #f #f))
-(test-match-backward 2 '(#f #f #f))
-(test-match-backward 4 '(#f #f #f))
-(test-match-backward 6 '(2 6 #f))
-(test-match-backward 8 '(#f #f #f))
-(test-match-backward 10 '(#f #f #f))
-(test-match-backward 12 '(#f #f #f))
-(test-match-backward 14 '(8 14 #f))
-(test-match-backward 16 '(0 16 #f))
-
-(define (build-tree)
-  (set! t (new paren-tree% (matches '((|(| |)|) (|[| |]|)))))
-  (send t add-token '|(| 2)
-  (send t add-token '|[| 2)
-  (send t add-token '|)| 2)
-  (send t add-token #f 2)
-  (send t add-token '|[| 2)
-  (send t add-token #f 2)
-  (send t add-token '|]| 2)
-  (send t add-token '|)| 2))
-(build-tree)
-(test-match-forward 0 '(0 2 16))
-(test-match-backward 14 '(8 14 #f))
-(test-match-backward 16 '(14 16 #t))
-(test-match-backward 100 '(#f #f #f))
-
-(set! t (new paren-tree% (matches '((|(| |)|) (|[| |]|)))))
-(send t add-token '|(| 2)
-(test-match-forward 0 '(0 2 2))
-
-(set! t (new paren-tree% (matches '((|(| |)|) (|[| |]|)))))
-(send t add-token '|)| 2)
-(test-match-backward 2 '(0 2 #t))
-
-
-(report-errs)
-
-
-
-;match-forward
-;match-backward
diff --git a/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/scheme-lexer.rkt b/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/scheme-lexer.rkt
deleted file mode 100644
index 5bc7ed2124..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/scheme-lexer.rkt
+++ /dev/null
@@ -1,596 +0,0 @@
-#lang scheme
-
-;; Not well tested:
-;;  Non-character input data (i.e. specials)
-;;  The R5RS part of numbers
-;; 
-;; Not supported
-;;  Honu (#hx, #sx, #honu)
-;;  #reader
-
-(require syntax-color/scheme-lexer)
-
-(define (char kind)
-  (case kind
-    ((white-space) #\space)
-    ((symbol) #\i)
-    ((constant) #\c)
-    ((comment) #\;)
-    ((sexp-comment) #\;)
-    ((string) #\s)
-    ((parenthesis) #\p)
-    ((other) #\o)
-    ((no-color) #\n)
-    ((error) #\x)
-    ((hash-colon-keyword) #\h)
-    (else
-     (error 'char "Given ~a" kind))))
-  
-(define (chunks x)
-  (cond
-    ((null? x) 0)
-    ((null? (cdr x)) 1)
-    ((char=? (car x) (cadr x))
-     (chunks (cdr x)))
-    (else (add1 (chunks (cdr x))))))
-     
-(define (lex f p)
-  (define-values (lexeme kind paren? start end)
-    (f p))
-  (cond
-    ((eq? 'eof kind) null)
-    (else
-     (cons (make-string (- end start) (char kind))
-           (lex f p)))))
-      
-(define-syntax (test stx)
-  (syntax-case stx ()
-    [(_ args ...)
-     (with-syntax ([line (syntax-line stx)])
-       #'(test/proc line args ...))]))
-
-(define (test/proc line input expected [e-n (chunks (string->list expected))])
-  (define p (input->port input))
-  (port-count-lines! p)
-  (define l (lex scheme-lexer p))
-  (define s (apply string-append l))
-  (close-input-port p)
-  (unless (string=? s expected)
-    (eprintf "test on line ~a failed:\n" line)
-    (eprintf "  input   : ~s\n" input)
-    (eprintf "  output  : ~s\n" s)
-    (eprintf "  expected: ~s\n\n" expected))
-  (let ((a-n (length l)))
-    (unless (= e-n a-n)
-      (eprintf "test on line ~a failed:\n" line)
-      (eprintf "  input   : ~a\n" input)
-      (eprintf "  expected: ~a tokens\n" e-n)
-      (eprintf "  got     : ~a tokens\n\n" a-n))))
-
-(define (input->port input) 
-  (let-values ([(in out) (make-pipe-with-specials)])
-    (thread
-     (λ ()
-       (let loop ([input input])
-         (cond
-           [(list? input) 
-            (for-each loop input)]
-           [(string? input)
-            (display input out)]
-           [else
-            (write-special input out)]))
-       (close-output-port out)))
-    in))
-      
-;; Delimiters
-(test " " " ")
-(test "\t" " ")
-(test "\n" " ")
-(test "\"" "x")
-(test "," "o")
-(test "'" "c")
-(test "`" "c")
-(test ";" ";")
-(test "(" "p")
-(test ")" "p")
-(test "[" "p")
-(test "]" "p")
-(test "{" "p")
-(test "}" "p")
-
-;; #
-(test "#fq" "xxx")
-(test "#Fq" "xxx")
-(test "#tq" "xxx")
-(test "#Tq" "xxx")
-(test "#true" "ccccc")
-(test "#false" "cccccc")
-(test "#f q" "cc i")
-(test "#F q" "cc i")
-(test "#t q" "cc i")
-(test "#T q" "cc i")
-(test "#true q" "ccccc i")
-(test "#false q" "cccccc i")
-(test "#f(q" "ccpi")
-(test "#T(q" "ccpi")
-(test "#true{q" "cccccpi")
-(test "#012423(a" "ppppppppi")
-(test "#1{a" "pppi")
-(test "#1[a" "pppi")
-(test "#(a" "ppi")
-(test "#{a" "ppi")
-(test "#[a" "ppi")
-(test "#&a" "cci")
-(test "#'a" "cci")
-(test "#`a" "cci")
-(test "#,a" "ooi")
-(test "#,@a" "oooi")
-(test "#CsA" "oooi")
-(test "#cIA" "oooi")
-(test "#hash(a" "ppppppi")
-(test "#hasheq(a" "ppppppppi")
-(test "#hash[a" "ppppppi")
-(test "#hasheq[a" "ppppppppi")
-(test "#hash{a" "ppppppi")
-(test "#hasheq{a" "ppppppppi")
-(test "#135#a" "oooooi")
-(test "#453=a" "oooooi")
-(test #<<string-end
-#! a de \
-ase
-aa
-string-end
-      ";;;;;;;;;;;;; ii")
-(test "#;z" ";;i")
-
-;; Bad #
-(test "#hashe(" "xxxxxxp")
-(test "#HASH(" "xxxxxp")
-(test "#HASHEQ(" "xxxxxxxp")
-(test "#a#a" "xxxx")
-(test "#a=a" "xxxx")
-
-;; Identifier delimiters
-(test "a" "i")
-(test "a a" "i i")
-(test "a\ta" "i i")
-(test "a\na" "i i")
-(test "a\"a" "ixx")
-(test "a,a" "ioi")
-(test "a'a" "ici")
-(test "a`a" "ici")
-(test "a;a" "i;;")
-(test "a(a" "ipi")
-(test "a)a" "ipi")
-(test "a[a" "ipi")
-(test "a]a" "ipi")
-(test "a{a" "ipi")
-(test "a}a" "ipi")
-(test "a#a" "iii")
-(test "a.a" "iii")
-(test "a@a" "iii")
-(test "a/a" "iii")
-(test "a\"a\"a" "isssi")
-(test "a1a" "iii")
-(test "a%a" "iii")
-
-;; Bad identidier delimiters
-(test "#a\t#a" "xx xx")
-(test "#a\n#a" "xx xx")
-(test "#a\"#a" "xxxxx" 2)
-(test "#a,#a" "xxoxx")
-(test "#a'#a" "xxcxx")
-(test "#a`#a" "xxcxx")
-(test "#a;#a" "xx;;;")
-(test "#a(#a" "xxpxx")
-(test "#a)#a" "xxpxx")
-(test "#a[#a" "xxpxx")
-(test "#a]#a" "xxpxx")
-(test "#a{#a" "xxpxx")
-(test "#a}#a" "xxpxx")
-(test "#a#a" "xxxx")
-(test "#a.a" "xxxx")
-(test "#a@a" "xxxx")
-(test "#a/a" "xxxx")
-(test "#a\"a\"#a" "xxsssxx")
-(test "#a1a" "xxxx")
-(test "#a%a" "xxxx")
-
-;; Strange identifiers
-(test "1a" "ii")
-(test "#%a" "iii")
-(test "%a" "ii")
-(test "\\8" "ii")
-(test "\\a" "ii")
-(test "\\\\" "ii")
-(test "a\\ a" "iiii")
-(test "a\\\ta" "iiii")
-(test "a\\\na" "iiii")
-(test "a\\\"a" "iiii")
-(test "a\\,a" "iiii")
-(test "a\\'a" "iiii")
-(test "a\\`a" "iiii")
-(test "a\\;a" "iiii")
-(test "a\\(a" "iiii")
-(test "a\\)a" "iiii")
-(test "a\\[a" "iiii")
-(test "a\\]a" "iiii")
-(test "a\\{a" "iiii")
-(test "a\\}a" "iiii")
-(test "\\|" "ii")
-(test "a\\|a" "iiii")
-(test #<<end-string
-\ \8\ \a\\
-end-string
-      "iiiiiiiiii")
-(test "||" "ii")
-(test "|a|" "iii")
-(test "|8|" "iii")
-(test "|\\|" "iii")
-(test "a| |a" "iiiii")
-(test "a|\t|a" "iiiii")
-(test "a|\n|a" "iiiii")
-(test "a|\"|a" "iiiii")
-(test "a|,|a" "iiiii")
-(test "a|'|a" "iiiii")
-(test "a|`|a" "iiiii")
-(test "a|;|a" "iiiii")
-(test "a|(|a" "iiiii")
-(test "a|)|a" "iiiii")
-(test "a|[|a" "iiiii")
-(test "a|]|a" "iiiii")
-(test "a|{|a" "iiiii")
-(test "a|}|a" "iiiii")
-(test "a|,|\\ |||\\|| se \\|\\\\|\\\\|" "iiiiiiiiiiiiiiiiiiiiiiii")
-(test "\\ ,a" "iioi")
-(test "| |a,a" "iiiioi")
-(test "a#||#" "iiiii")
-(test "a#;1 2" "ii;;;;")
-(test "a#<<a" "iiiii")
-(test "1#!1" "iiii")
-(test "1+nan.0" "iiiiiii")
-(test "-inf.0+1" "iiiiiiii")
-(test "\\#:a" "iiii")
-(test "#\\:a" "ccci")
-
-;; Bad identifiers
-(test "#a" "xx")
-(test "#a1.1" "xxxxx")
-(test "#a#\\a" "xxxxx")
-(test "a|" "xx")
-(test "a#|" "xxx")
-(test "a||a|, a\n\"" "xxxxxxxxxx")
-
-;; Characters
-(test "#\\nul" "ccccc")
-(test "#\\NUL" "ccccc")
-(test "#\\NuL" "ccccc")
-(test "#\\baCKspaCE" "ccccccccccc")
-(test "#\\TaB" "ccccc")
-(test "#\\NEwline" "ccccccccc")
-(test "#\\liNEFEED" "cccccccccc")
-(test "#\\vtAb" "cccccc")
-(test "#\\PAgE" "cccccc")
-(test "#\\reTURn" "cccccccc")
-(test "#\\SPACe" "ccccccc")
-(test "#\\rubouT" "cccccccc")
-(test "#\\nul1a" "cccccii")
-(test "#\\18a" "cccii")
-(test "#\\411a" "ccciii")
-(test "#\\377a" "ccccci")
-(test "#\\1#\\a" "cccccc" 2)
-(test "#\\uaF12a" "ccccccci")
-(test "#\\uaF1g" "cccccci")
-(test "#\\UaF12a" "cccccccc")
-(test "#\\UaF12aaa" "ccccccccci")
-(test "#\\UA" "cccc")
-
-;; Bad Characters
-(test "#\\abcsd1a" "xxxxxxxii")
-(test "#\\nuls1a" "xxxxxxii")
-(test "#\\17a" "xxxxi")
-(test "#\\179" "xxxxc")
-
-;; String
-(test #<<end-string
-""
-end-string
-      "ss")
-(test #<<end-string
-"\a\b\t\n\v\f\r\e\'\\\"x"
-end-string
-      "sssssssssssssssssssssssss")
-(test #<<end-string
-"\1\12\123"
-end-string
-      "sssssssssss")
-(test #<<end-string
-"\xA\xa\x11\xFF\xfff"
-end-string
-      "sssssssssssssssssssss")
-(test #<<end-string
-"\xA\xa\x11\xFF\xfff"
-end-string
-      "sssssssssssssssssssss")
-(test #<<end-string
-"
-a
-a \
-"
-end-string
-      "sssssssss")
-(test #<<end-string
-"\ua\uaA\uAAA\uAAAAa"
-end-string
-      "sssssssssssssssssssss")
-(test #<<end-string
-"\Ua\UaA\UAAA\UAAAAa\UAAAAA\Uaaaaaa\Uaaaaaaaaaa"
-end-string
-      "ssssssssssssssssssssssssssssssssssssssssssssssss")
-(test #<<end-string
-#""
-end-string
-      "sss")
-(test #<<end-string
-#"\a\b\t\n\v\f\r\e\'\\\"x"
-end-string
-      "ssssssssssssssssssssssssss")
-(test #<<end-string
-#"\1\12\123"
-end-string
-      "ssssssssssss")
-(test #<<end-string
-#"\xA\xa\x11\xFF\xfff"
-end-string
-      "ssssssssssssssssssssss")
-(test #<<end-string
-#"\xA\xa\x11\xFF\xfff"
-end-string
-      "ssssssssssssssssssssss")
-(test #<<end-string
-#"
-a
-a \
-"
-end-string
-      "ssssssssss")
-(test #<<end-string
-#rx"a"
-end-string
-      "ssssss")
-(test #<<end-string
-#rx#"a"
-end-string
-      "sssssss")
-
-;; String Errors
-(test #<<end-string
-#"\u1"a
-end-string
-      "xxxxxxi")
-(test #<<end-string
-#"\U1"a
-end-string
-      "xxxxxxi")
-(test #<<end-string
-"\p"a
-end-string
-      "xxxxi")
-(test #<<end-string
-"\ug"a
-end-string
-      "xxxxxi")
-(test #<<end-string
-"\Ug"a
-end-string
-      "xxxxxi")
-(test #<<end-string
-"a
-\
-s
-end-string
-      "xxxxxx")
-(test #<<end-string
-"\p
-a
-a
-end-string
-      "xxxxxxx")
-(test #<<end-string
-#"\Ua
-a
-end-string
-      "xxxxxxx")
-(test #<<end-string
-#rx"\Ua
-a
-end-string
-      "xxxxxxxxx")
-(test #<<end-string
-#rx"a
-a
-end-string
-      "xxxxxxx")
-
-;; Here strings
-(test #<<end-string
-#<<x
-x a
- x
-x
-a
-end-string
-      "sssssssssssss i")
-(test #<<end-string
-#<<a
-as
- a
-end-string
-      "xxxxxxxxxx")
-      
-(test #<<end-string
-#<<
-a
-end-string
-      "xxx i")
-      
-      
-;; Comments
-(test ";ab" ";;;")
-(test #<<end-string
-1 a; asd\
-1 ;a
-end-string
-    "c i;;;;;; c ;;")
-(test '(";a" 1 "b") ";;;;" 1)  ;; a special comment
-(test '(";a" 1 "b\n1" 1) ";;;; cn" 4)
-(test ";αα" ";;;")
-
-(test "#||#" ";;;;")
-(test "#|#||#|#" ";;;;;;;;")
-(test "#| #| \n|# |#" ";;;;;;;;;;;;")
-(test "a #|a#|a|#a|#a" "i ;;;;;;;;;;;i")
-(test "#|# |#" ";;;;;;")
-(test "#|| |#" ";;;;;;")
-
-;; Bad Comments
-(test "#|#|#" "xxxxx")
-(test "#|" "xx")
-(test "a #| a" "i xxxx")
-(test "a |# a|" "i iiiii")
-(test "#|#| |# a\na" "xxxxxxxxxxx")
-(test "#|\n#| |# a\na" "xxxxxxxxxxxx")
-
-;; Numbers and extflonums
-(test "1e0" "ccc")
-(test "1f0" "ccc")
-(test "1t0" "ccc")
-(test "1.1e0" "ccccc")
-(test "1.1f0" "ccccc")
-(test "1.1t0" "ccccc")
-(test "#b1.1" "ccccc")
-(test "#o1.1" "ccccc")
-(test "#d1.1" "ccccc")
-(test "#xa.F" "ccccc")
-(test "#b1e+1" "cccccc")
-(test "#o1E+2" "cccccc")
-(test "#d1E+2" "cccccc")
-(test "#b1D+1" "cccccc")
-(test "#o1d+2" "cccccc")
-(test "#d1d+2" "cccccc")
-(test "1/2e2" "ccccc")
-(test "+iNf.0" "cccccc")
-(test "+iNf.f" "cccccc")
-(test "+iNf.t" "cccccc")
-(test "-InF.0" "cccccc")
-(test "-InF.f" "cccccc")
-(test "-InF.t" "cccccc")
-(test "+naN.0" "cccccc")
-(test "-nAN.0" "cccccc")
-(test "-nAN.f" "cccccc")
-(test "-nAN.t" "cccccc")
-(test "-inf.0+1i" "ccccccccc")
-(test "1-inf.0I" "cccccccc")
-(test "1#/2" "cccc")
-(test "#e#x+e#s+e@-e#l-e" "ccccccccccccccccc")
-(test "1/0" "ccc")
-(test "#e1" "ccc")
-(test "#i1" "ccc")
-(test "#e1.0+2.3l5i" "cccccccccccc")
-
-;; Bad numbers  
-(test "#x1E+2" "xxxxxx")
-(test "#x1d+2" "xxxxxx")
-(test "#e1.0+2.3l5" "xxxxxxxxxxx")
-
-;; Bad extflonums
-(test "#e1t0" "xxxxx")
-(test "#i1t0" "xxxxx")
-(test "1t0+2t0i" "iiiiiiii")
-(test "1t0@2t0" "iiiiiii")
-
-;; Keywords
-(test "#:" "hh")
-(test "#:a#:a" "hhhhhh")
-(test "#:a #:a" "hhh hhh")
-(test "#:a\t#:a" "hhh hhh")
-(test "#:a\n#:a" "hhh hhh")
-(test "#:a\"#:a" "hhhxxxx")
-(test "#:a,#:a" "hhhohhh")
-(test "#:a'#:a" "hhhchhh" 3)
-(test "#:a`#:a" "hhhchhh" 3)
-(test "#:a;#:a" "hhh;;;;")
-(test "#:a(#:a" "hhhphhh" 3)
-(test "#:a)#:a" "hhhphhh" 3)
-(test "#:a[#:a" "hhhphhh" 3)
-(test "#:a]#:a" "hhhphhh" 3)
-(test "#:a{#:a" "hhhphhh" 3)
-(test "#:a}#:a" "hhhphhh" 3)
-(test "#:a##:a" "hhhhhhh")
-(test "#:a.#:a" "hhhhhhh")
-(test "#:a@#:a" "hhhhhhh")
-(test "#:a/#:a" "hhhhhhh")
-(test "#:a\"#:a\"#:a" "hhhssssshhh")
-(test "#:a1#:a" "hhhhhhh")
-(test "#:a%#:a" "hhhhhhh")
-
-(test "#:1a" "hhhh")
-(test "#:\\8" "hhhh")
-(test "#:\\a" "hhhh")
-(test "#:\\\\" "hhhh")
-(test "#:a\\ a" "hhhhhh")
-(test "#:a\\\ta" "hhhhhh")
-(test "#:a\\\na" "hhhhhh")
-(test "#:a\\\"a" "hhhhhh")
-(test "#:a\\,a" "hhhhhh")
-(test "#:a\\'a" "hhhhhh")
-(test "#:a\\`a" "hhhhhh")
-(test "#:a\\;a" "hhhhhh")
-(test "#:a\\(a" "hhhhhh")
-(test "#:a\\)a" "hhhhhh")
-(test "#:a\\[a" "hhhhhh")
-(test "#:a\\]a" "hhhhhh")
-(test "#:a\\{a" "hhhhhh")
-(test "#:a\\}a" "hhhhhh")
-(test "#:\\|" "hhhh")
-(test "#:a\\|a" "hhhhhh")
-(test #<<end-string
-#:\ \8\ \a\\
-end-string
-      "hhhhhhhhhhhh")
-(test "#:||" "hhhh")
-(test "#:|a|" "hhhhh")
-(test "#:|8|" "hhhhh")
-(test "#:|\\|" "hhhhh")
-(test "#:a| |a" "hhhhhhh")
-(test "#:a|\t|a" "hhhhhhh")
-(test "#:a|\n|a" "hhhhhhh")
-(test "#:a|\"|a" "hhhhhhh")
-(test "#:a|,|a" "hhhhhhh")
-(test "#:a|'|a" "hhhhhhh")
-(test "#:a|`|a" "hhhhhhh")
-(test "#:a|;|a" "hhhhhhh")
-(test "#:a|(|a" "hhhhhhh")
-(test "#:a|)|a" "hhhhhhh")
-(test "#:a|[|a" "hhhhhhh")
-(test "#:a|]|a" "hhhhhhh")
-(test "#:a|{|a" "hhhhhhh")
-(test "#:a|}|a" "hhhhhhh")
-(test "#:a|,|\\ |||\\|| se \\|\\\\|\\\\|" "hhhhhhhhhhhhhhhhhhhhhhhhhh")
-(test "#:\\ ,#:a" "hhhhohhh")
-(test "#:| |a,#:a" "hhhhhhohhh")
-(test "#:a#||#" "hhhhhhh")
-(test "#:a#;1 2" "hhhh;;;;")
-(test "#:a#<<a" "hhhhhhh")
-(test "#:1#!1" "hhhhhh")
-(test "#:1+nan.0" "hhhhhhhhh")
-(test "#:-inf.0+1" "hhhhhhhhhh")
-(test "#:\\#:a" "hhhhhh")
-(test "#:#\\:a" "hhhhhh")
-
-(test "#:1.1" "hhhhh")
-(test "#:a|" "xxxx")
-(test "#:a#|" "xxxxx")
-(test "#:a||a|, a\n\"" "xxxxxxxxxxxx")
-
-(test "|\uA0x" "xxx")
diff --git a/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/scribble-lexer.rkt b/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/scribble-lexer.rkt
deleted file mode 100644
index 9b4eee67cf..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/scribble-lexer.rkt
+++ /dev/null
@@ -1,250 +0,0 @@
-#lang scheme
-(require syntax-color/scribble-lexer)
-
-(define in (open-input-string "@|x #|10|#| @me[1 2 #| comment |# ]{10}"))
-
-(define (color str)
-  (with-handlers ((exn:fail? exn-message))
-    (let ([in (open-input-string str)])
-      (port-count-lines! in)
-      (let loop ([mode #f])
-        (let-values ([(lexeme type paren start end backup mode) (scribble-inside-lexer in 0 mode)])
-          (if (eq? type 'eof)
-              null
-              (cons (list start end type backup)
-                    (loop mode))))))))
-
-(define (test* str len-val line)
-  (let ([v (color str)]
-        [val (let loop ([pos 1][l len-val])
-               (if (null? l)
-                   null
-                   (cons (list pos (+ pos (caar l)) (cadar l)
-                               (if (null? (cddar l))
-                                   0
-                                   (caddar l)))
-                         (loop (+ (+ pos (caar l))) (cdr l)))))])
-    (unless (equal? v val)
-      (eprintf "FAILED, line ~s\n" line)
-      (cond [(string? v)
-             (eprintf "~a\nexpected\n" v)]
-            [else
-             (eprintf " result\n")
-             (pretty-print v (current-error-port))
-             (eprintf " is not expected\n")])
-      (pretty-print val (current-error-port))
-      (eprintf "\n"))))
-
-(define-syntax (test stx)
-  (syntax-case stx ()
-    [(_ str len-val)
-     (with-syntax ([line (syntax-line stx)])
-       #'(test* str len-val line))]))
-
-(test "x" '((1 text)))
-(test "x{}" '((3 text)))
-(test "@x" '((1 parenthesis)
-             (1 symbol)))
-
-(test "@x str" '((1 parenthesis)
-                 (1 symbol)
-                 (4 text)))
-
-(test "@x[] str" '((1 parenthesis)
-                   (1 symbol)
-                   (1 parenthesis)
-                   (1 parenthesis)
-                   (4 text)))
-
-(test "@x[z] str" '((1 parenthesis)
-                    (1 symbol)
-                    (1 parenthesis)
-                    (1 symbol)
-                    (1 parenthesis)
-                    (4 text)))
-
-(test "@x[z +1.5] str" '((1 parenthesis)
-                         (1 symbol)
-                         (1 parenthesis)
-                         (1 symbol)
-                         (1 white-space)
-                         (4 constant)
-                         (1 parenthesis)
-                         (4 text)))
-
-(test "@x[z @w{10}] str" '((1 parenthesis)
-                           (1 symbol) ; x
-                           (1 parenthesis)
-                           (1 symbol) ; z
-                           (1 white-space)
-                           (1 parenthesis)
-                           (1 symbol) ; w
-                           (1 parenthesis)
-                           (2 text)
-                           (1 parenthesis)
-                           (1 parenthesis)
-                           (4 text)))
-
-(test "@x[a@b]{a}{b}" '((1 parenthesis)
-                        (1 symbol)
-                        (1 parenthesis)
-                        (3 symbol)
-                        (1 parenthesis)
-                        (1 parenthesis)
-                        (1 text)
-                        (1 parenthesis)
-                        (3 text)))
-(test "@x{{}}" '((1 parenthesis)
-                 (1 symbol)
-                 (1 parenthesis)
-                 (1 parenthesis) ; {
-                 (1 parenthesis) ; }
-                 (1 parenthesis)))
-
-(test "@|x|str" '((2 parenthesis)
-                  (1 symbol 2)
-                  (1 parenthesis 3)
-                  (3 text)))
-(test "@|x #|ok|#|str" '((2 parenthesis)
-                         (1 symbol 2)
-                         (1 white-space 3)
-                         (6 comment)
-                         (1 parenthesis)
-                         (3 text)))
-(test "@| x ; c\n| str" '((2 parenthesis)
-                          (1 white-space 2)
-                          (1 symbol)
-                          (1 white-space)
-                          (3 comment)
-                          (2 parenthesis)
-                          (4 text)))
-(test "@|(a|b|)|str" '((2 parenthesis)
-                       (1 parenthesis 2)
-                       (4 symbol 3)
-                       (1 parenthesis 7)
-                       (1 parenthesis 8)
-                       (3 text)))
-
-(test "@#|bad|#x str" '((1 parenthesis)
-                        (7 error)
-                        (1 symbol)
-                        (4 text)))
-(test "@@x" '((1 parenthesis)
-              (1 parenthesis)
-              (1 symbol)))
-(test "@|@x|z" '((2 parenthesis)
-                 (1 parenthesis 2)
-                 (1 symbol)
-                 (1 parenthesis)
-                 (1 text)))
-(test "@@x[1 2][3]" '((1 parenthesis)
-                      (1 parenthesis)
-                      (1 symbol)
-                      (1 parenthesis)
-                      (1 constant)
-                      (1 white-space)
-                      (1 constant)
-                      (1 parenthesis)
-                      (1 parenthesis)
-                      (1 constant)
-                      (1 parenthesis)))
-
-(test "@{1 2}" '((2 parenthesis)
-                 (3 text)
-                 (1 parenthesis)))
-(test "@|=={1 2}==|" '((5 parenthesis)
-                       (3 text)
-                       (4 parenthesis)))
-(test "@'{1 2}" '((1 parenthesis)
-                  (1 constant)
-                  (1 parenthesis)
-                  (3 text)
-                  (1 parenthesis)))
-(test "@',#,#`|>>{1 2}<<|" '((1 parenthesis)
-                             (1 constant) ; ,
-                             (1 other)    ; ,
-                             (2 other)    ; #,
-                             (2 constant) ; #`
-                             (4 parenthesis)
-                             (3 text)
-                             (4 parenthesis)))
-
-(test "@x|{10}|" '((1 parenthesis)
-                   (1 symbol)
-                   (2 parenthesis)
-                   (2 text)
-                   (2 parenthesis)))
-(test "@x|{@q}|" '((1 parenthesis)
-                   (1 symbol)
-                   (2 parenthesis)
-                   (2 text)
-                   (2 parenthesis)))
-(test "@x|!!{@q}!!|" '((1 parenthesis)
-                       (1 symbol)
-                       (4 parenthesis)
-                       (2 text)
-                       (4 parenthesis)))
-(test "@x|(({@q}))|" '((1 parenthesis)
-                       (1 symbol)
-                       (4 parenthesis)
-                       (2 text)
-                       (4 parenthesis)))
-(test "@x|<<{a|<<@a[10]}>>|" '((1 parenthesis)
-                               (1 symbol)
-                               (4 parenthesis)
-                               (1 text)
-                               (4 parenthesis)
-                               (1 symbol)
-                               (1 parenthesis)
-                               (2 constant)
-                               (1 parenthesis)
-                               (4 parenthesis)))
-(test "@x|{ |{ } }|}|" '((1 parenthesis)
-                         (1 symbol)
-                         (2 parenthesis)
-                         (1 text)
-                         (2 parenthesis) ; |{
-                         (3 text)
-                         (2 parenthesis) ; }|
-                         (2 parenthesis)))
-
-(test "@`',@foo{blah}" '((1 parenthesis)
-                         (1 constant) ; `
-                         (1 constant) ; '
-                         (2 other)    ; ,@
-                         (3 symbol)
-                         (1 parenthesis)
-                         (4 text)
-                         (1 parenthesis)))
-
-(test "@; 1" '((4 comment)))
-(test "@; 1\nv" '((4 comment)
-                  (1 white-space)
-                  (1 text)))
-(test "@;{1}v" '((2 comment)
-                 (1 parenthesis)
-                 (1 text)
-                 (1 parenthesis)
-                 (1 text)))
-(test "@;|{1 }} }|v" '((2 comment)
-                       (2 parenthesis)
-                       (5 text)
-                       (2 parenthesis)
-                       (1 text)))
-
-(test "a\n  b" '((1 text)
-                 (3 white-space)
-                 (1 text)))
-(test "@item{A\nB}" '((1 parenthesis)
-                      (4 symbol)
-                      (1 parenthesis)
-                      (1 text)
-                      (1 white-space)
-                      (1 text)
-                      (1 parenthesis)))
-
-(test "@|()|})|" '((2 parenthesis)
-                   (1 parenthesis 2)
-                   (1 parenthesis 3)
-                   (1 parenthesis 4)
-                   (3 text)))
diff --git a/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/token-tree.rkt b/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/token-tree.rkt
deleted file mode 100644
index b53f378dee..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color-test/tests/syntax-color/token-tree.rkt
+++ /dev/null
@@ -1,180 +0,0 @@
-#lang racket/load
-
-(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
-(require racket/class
-         syntax-color/token-tree)
-
-(define t (new token-tree% (length 1) (data 'a)))
-
-(define (check-only-root)
-  (test #f 'get-root (not (send t get-root)))
-  (test #f node-left (send t get-root))
-  (test #f node-right (send t get-root)))
-
-(define (check-root len dat sp ep)
-  (test len 'get-root-length (send t get-root-length))
-  (test dat 'get-root-data (send t get-root-data))
-  (test sp 'get-root-start-position (send t get-root-start-position))
-  (test ep 'get-root-end-position (send t get-root-end-position)))
-
-(Section 'init-tree)
-(test #f 'is-empty (send t is-empty?))
-(check-only-root)
-(check-root 1 'a 0 1)
-
-(send t reset-tree)
-(Section 'empty-tree)
-(test #f 'get-root (send t get-root))
-(test #t 'is-empty (send t is-empty?))
-(check-root 0 #f 0 0)
-
-(define (build-tree n len?)
-  (when (> n 0)
-    (insert-first! t (new token-tree% (length (if len? 5 n)) (data (list n 1))))
-    (insert-last! t (new token-tree% (length (if len? 5 n)) (data (list n 2))))
-    (build-tree (sub1 n) len?)))
-(define (check-tree n)
-  (let ((tot-len (* n 10)))
-    (let loop ((i 0))
-      (when (< i n)
-        (let* ((x (* i 5))
-               (y (- tot-len x 5)))
-          (send t search! x)
-          (check-root 5 (list (add1 i) 1) x (+ 5 x))
-          (send t search! y)
-          (check-root 5 (list (add1 i) 2) y (+ 5 y)))
-        (loop (add1 i))))))
-      
-
-(build-tree 4 #t)
-(Section 'check-tree)
-(check-tree 4)
-(send t search-min!)
-(check-root 5 '(1 1) 0 5)
-(send t search-max!)
-(check-root 5 '(1 2) 35 40)
-
-(Section 'remove-root)
-(send t search! 20)
-(send t remove-root!)
-(send t search-max!)
-(check-root 5 '(1 2) 30 35)
-
-(Section 'add-to-root-length)
-(send t search-min!)
-(send t add-to-root-length 1)
-(check-root 6 '(1 1) 0 6)
-(send t search! 15)
-(check-root 5 '(3 1) 11 16)
-(send t search-max!)
-(check-root 5 '(1 2) 31 36)
-
-(Section 'for-each)
-(send t reset-tree)
-(build-tree 4 #f)
-(let loop ((i 0))
-  (when (< i 1000)
-    (send t search! (random 20))
-    (loop (add1 i))))
-(define (to-list t)
-  (let ((x null))
-    (send t for-each (lambda (start len data) (set! x (cons (list start len data) x))))
-    (reverse x)))
-(test '((0 1 (1 1))
-        (1 2 (2 1))
-        (3 3 (3 1))
-        (6 4 (4 1))
-        (10 4 (4 2))
-        (14 3 (3 2))
-        (17 2 (2 2))
-        (19 1 (1 2)))
-      'for-each  (to-list t))
-
-(Section 'stress)
-(send t reset-tree)
-(build-tree 100 #f)
-(let loop ((i 0))
-  (when (< i 10000)
-    (send t search! (random 10100))
-    (loop (add1 i))))
-(send t search-max!)
-(check-root 1 '(1 2) 10099 10100)
-
-(Section 'splits)
-(send t reset-tree)
-(build-tree 5 #f)
-(let-values (((s e t1 t2)
-              (send t split 16)))
-  (test 15 'split s)
-  (test 20 'split e)
-  (test '((0 1 (1 1))
-          (1 2 (2 1))
-          (3 3 (3 1))
-          (6 4 (4 1))
-          (10 5 (5 1)))
-        'split (to-list t1))
-  (test '((0 4 (4 2))
-          (4 3 (3 2))
-          (7 2 (2 2))
-          (9 1 (1 2)))
-        'split (to-list t2)))
-(build-tree 5 #f)
-(let-values (((s e t1 t2)
-              (send t split 15)))
-  (test 10 'split s)
-  (test 20 'split e)
-  (test '((0 1 (1 1))
-          (1 2 (2 1))
-          (3 3 (3 1))
-          (6 4 (4 1)))
-        'split (to-list t1))
-  (test '((0 4 (4 2))
-          (4 3 (3 2))
-          (7 2 (2 2))
-          (9 1 (1 2)))
-        'split (to-list t2)))
-(send t reset-tree)
-(build-tree 5 #f)
-(send t search! 15)
-(let-values (((t1 t2) (send t split-after)))
-  (test '((0 1 (1 1))
-          (1 2 (2 1))
-          (3 3 (3 1))
-          (6 4 (4 1))
-          (10 5 (5 1))
-          (15 5 (5 2)))
-        'split-after (to-list t1))
-  (test '((0 4 (4 2))
-          (4 3 (3 2))
-          (7 2 (2 2))
-          (9 1 (1 2)))
-        'split-after (to-list t2)))
-(send t reset-tree)
-(build-tree 5 #f)
-(send t search! 15)
-(let-values (((t1 t2) (send t split-before)))
-  (test '((0 1 (1 1))
-          (1 2 (2 1))
-          (3 3 (3 1))
-          (6 4 (4 1))
-          (10 5 (5 1)))
-        'split-before (to-list t1))
-  (test '((0 5 (5 2))
-          (5 4 (4 2))
-          (9 3 (3 2))
-          (12 2 (2 2))
-          (14 1 (1 2)))
-        'split-before (to-list t2)))
-
-(send t reset-tree)
-(insert-last! t (new token-tree% (length 1) (data 1)))
-(insert-last! t (new token-tree% (length 1) (data 2)))
-(insert-last! t (new token-tree% (length 1) (data 3)))
-(test '((0 1 1) (1 1 2) (2 1 3)) 'insert-last (to-list t))
-(let-values (((s e t1 t2) (send t split 2)))
-  (test 1 'split s)
-  (test 3 'split e)
-  (test '((0 1 1)) 'split (to-list t1))
-  (test '() 'split (to-list t2)))
-
-(report-errs)
diff --git a/pkgs/syntax-color-pkgs/syntax-color/LICENSE.txt b/pkgs/syntax-color-pkgs/syntax-color/LICENSE.txt
deleted file mode 100644
index c223ac3bcb..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax-color
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/syntax-color-pkgs/syntax-color/info.rkt b/pkgs/syntax-color-pkgs/syntax-color/info.rkt
deleted file mode 100644
index 986f32fdf9..0000000000
--- a/pkgs/syntax-color-pkgs/syntax-color/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("syntax-color-lib"
-               "syntax-color-doc"))
-(define implies '("syntax-color-lib"
-                  "syntax-color-doc"))
-
-(define pkg-desc "Program syntax coloring for editors and typesetting")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/trace/LICENSE.txt b/pkgs/trace/LICENSE.txt
deleted file mode 100644
index ee243e6b81..0000000000
--- a/pkgs/trace/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-trace
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/trace/calltrace-lib.rkt b/pkgs/trace/calltrace-lib.rkt
deleted file mode 100644
index e7e0ef7fa6..0000000000
--- a/pkgs/trace/calltrace-lib.rkt
+++ /dev/null
@@ -1,74 +0,0 @@
-;; Poor man's stack-trace-on-exceptions/profiler.
-;; See docs for information.
-
-(module calltrace-lib mzscheme
-  (require "stacktrace.rkt"
-           mzlib/list
-           mzlib/etc
-           mzlib/unit)
-
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; Eval handler, exception handler
-
-  (define instrumenting-enabled (make-parameter #t))
-
-  (define output-port (current-error-port))
-  
-  ;; (union symbol #f) syntax-object (list-of value) boolean int -> void
-  ;; effect: prints out the context surrounding the exception
-  (define (print-call-trace inferred-name original? src args improper? depth)
-    (build-list depth (lambda (n) (fprintf output-port " ")))
-    (fprintf output-port "~v\n" (cons (or inferred-name src) 
-                                      (if improper? 
-                                          (list->improper-list args)
-                                          args))))
-
-
-  (define calltrace-eval-handler    
-    (let ([orig (current-eval)]
-          [ns (current-namespace)])
-      (lambda (e)
-        (if (and (eq? ns (current-namespace))
-		 (not (compiled-expression? (if (syntax? e)
-						(syntax-e e)
-						e))))
-            ;; Loop to flatten top-level `begin's:
-            (let loop ([e (if (syntax? e)
-			      e
-			      (namespace-syntax-introduce
-			       (datum->syntax-object #f e)))])
-              (let ([top-e (expand-syntax-to-top-form e)])
-                (syntax-case top-e (begin)
-                  [(begin expr ...)
-                   ;; Found a `begin', so expand/eval each contained
-                   ;; expression one at a time
-                   (foldl (lambda (e old-val)
-                            (loop e))
-                          (void)
-                          (syntax->list #'(expr ...)))]
-                  [_else
-                   ;; Not `begin', so proceed with normal expand and eval
-                   (let* ([ex (expand-syntax top-e)]
-                          [a (if (not (instrumenting-enabled))
-                                 ex
-                                 (annotate ex))])
-                     (orig a))])))
-            (orig e)))))
-
-  (define (list->improper-list a)
-    (cond [(null? a) (error 'list->improper-list "list->improper-list called with null argument: ~e" a)]
-          [(and (cons? a) (null? (cdr a))) (car a)]
-          [else (cons (car a) (list->improper-list (cdr a)))]))
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;; Stacktrace instrumenter
-  
-  (define calltrace-key #`(quote #,(gensym 'key)))
-  
-  (define-values/invoke-unit stacktrace@
-    (import stacktrace-imports^) (export stacktrace^))
-  
-  (provide calltrace-eval-handler
-           instrumenting-enabled
-           annotate))
diff --git a/pkgs/trace/calltrace.rkt b/pkgs/trace/calltrace.rkt
deleted file mode 100644
index f731eded25..0000000000
--- a/pkgs/trace/calltrace.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-;; Poor man's call tracer.
-
-(module calltrace mzscheme
-  (require "calltrace-lib.rkt")
-  (provide instrumenting-enabled)
-  (current-eval calltrace-eval-handler))
diff --git a/pkgs/trace/info.rkt b/pkgs/trace/info.rkt
deleted file mode 100644
index 59c38c28a3..0000000000
--- a/pkgs/trace/info.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang info
-
-(define collection "trace")
-
-(define name "Calltrace")
-
-(define deps '("scheme-lib"
-               "base"
-               "compatibility-lib"
-               ))
-(define build-deps '("scribble-lib"
-                     "racket-doc"))
-
-(define pkg-desc "Instrumentation to show function calls")
-
-(define pkg-authors '(mflatt robby))
diff --git a/pkgs/trace/main.rkt b/pkgs/trace/main.rkt
deleted file mode 100644
index f61df1e298..0000000000
--- a/pkgs/trace/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scheme/base
-
-(require "calltrace.rkt")
-(provide (all-from-out "calltrace.rkt"))
diff --git a/pkgs/trace/scribblings/info.rkt b/pkgs/trace/scribblings/info.rkt
deleted file mode 100644
index e8a68a81a8..0000000000
--- a/pkgs/trace/scribblings/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("trace.scrbl" () (tool-library))))
diff --git a/pkgs/trace/scribblings/trace.scrbl b/pkgs/trace/scribblings/trace.scrbl
deleted file mode 100644
index e34710171c..0000000000
--- a/pkgs/trace/scribblings/trace.scrbl
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label scheme
-                     trace))
-
-@title[#:tag "top"]{Trace: Instrumentation to Show Function Calls}
-
-@bold{Calltrace} is a tool that displays all calls to user procedures.
-It displays the arguments to the calls, and it indents to show the
-depth of the continuation.
-
-@; ----------------------------------------
-
-@section[#:tag "quick-instructions"]{Quick Instructions}
-
-@itemize[
-         @item{Throw away @filepath{.zo} versions of your source}
-         @item{Prefix your program with 
-                      @racketblock[(require trace)]
-               perhaps by starting @exec{racket} with
-                  @commandline{racket -l trace ...}
-               before arguments to load your program.}
-         @item{Run your program}
-         ]
-
-The @racketmodname[trace] module is odd; don't import it
-into another module. Instead, the @racketmodname[trace]
-module is meant to be invoked from the top-level, so that it can
-install an evaluation handler, exception handler, etc.
-
-To reuse parts of the code of @racketmodname[trace], import
-@racketmodname[trace/calltrace-lib]. It contains all of the bindings
-described here, but it but does not set the @racket[current-eval]
-parameter.
-
-@; ----------------------------------------
-
-@section{Installing Calltrace}
-
-@defmodule[trace]{Invoking the
-@racketmodname[trace] module sets the evaluation handler
-(via @racket[current-eval]) to instrument Racket source code.}
-
- NOTE: @racketmodname[trace] has no effect on code loaded as
- compiled byte code (i.e., from a @filepath{.zo} file) or native code
- (i.e., from a @filepath{.dll}, @filepath{.so}, or @filepath{.dylib}
- file).
-
-Calltrace's instrumentation can be explicitly disabled via the
-@racket[instrumenting-enabled] parameter. Instrumentation is on by
-default. The @racket[instrumenting-enabled] parameter affects only the
-way that source code is compiled, not the way that exception
-information is reported.
-
-Do not load @racketmodname[trace] before writing
-@filepath{.zo} files.  Calltrace instruments S-expressions with
-unprintable values; this works fine if the instrumented S-expression
-is passed to the default eval handler, but neither the S-expression
-nor its byte-code form can be marshalled to a string.
-
-@; ----------------------------------------
-
-@section{Calltrace Library}
-
-@defmodule[trace/calltrace-lib]{The
-@racketmodname[trace/calltrace-lib] module provides functions that
-implement @racket[trace].}
-
-@defboolparam[instrumenting-enabled on?]{
-
-A parameter that determines whether tracing instrumentation is
-enabled.}
-
-@defproc[(calltrace-eval-handler [e any/c]) any]{
-
-A procedure suitable for use with @racket[current-eval], which
-instruments expressions for Calltrace output (when instrumentation is
-not disabled via @racket[instrumenting-enabled]).
-
-Requiring @racket[trace] installs this procedure as the
-value for @racket[current-eval].}
-
-
-@defproc[(annotate [e any/c]) syntax?]{
-
-Instruments the expression @racket[e] with Calltrace support. This
-function is normally used by @racket[calltrace-eval-handler].}
diff --git a/pkgs/trace/stacktrace.rkt b/pkgs/trace/stacktrace.rkt
deleted file mode 100644
index 2cf2a0c7d8..0000000000
--- a/pkgs/trace/stacktrace.rkt
+++ /dev/null
@@ -1,178 +0,0 @@
-#lang scheme/base
-(require mzlib/unit
-         syntax/kerncase
-         syntax/stx
-         (for-syntax scheme/base))
-
-(provide stacktrace@ stacktrace^ stacktrace-imports^)
-
-(define-signature stacktrace-imports^ (calltrace-key print-call-trace))
-(define-signature stacktrace^ (annotate))
-
-(define o (current-output-port))
-(define (oprintf . args) (apply fprintf o args))
-
-(define-struct stx-protector (stx))
-
-(define-unit stacktrace@
-  (import stacktrace-imports^)
-  (export stacktrace^)
-
-  ;; TEMPLATE FUNCTIONS:
-  ;;  these functions' definitions follow the data definitions presented in the
-  ;;  Syntax chapter of the Racket Manual.
-
-  (define (top-level-expr-iterator stx)
-    (kernel-syntax-case stx #f
-      [(module identifier name (#%plain-module-begin . module-level-exprs))
-       #`(module identifier name
-           (#%plain-module-begin 
-            #,@(map module-level-expr-iterator (syntax->list #'module-level-exprs))))]
-      [else-stx
-       (general-top-level-expr-iterator stx)]))
-  
-  (define (module-level-expr-iterator stx)
-    (kernel-syntax-case stx #f
-      [(#%provide . provide-specs)
-       stx]
-      [(#%declare . provide-specs)
-       stx]
-      [else-stx
-       (general-top-level-expr-iterator stx)]))
-
-  (define code-insp (variable-reference->module-declaration-inspector
-                     (#%variable-reference)))
-  
-  (define (general-top-level-expr-iterator stx)
-    (kernel-syntax-case stx #f
-      [(define-values (var ...) expr)
-       (let ([var-list (syntax->list #'(var ...))])
-         (cond [(= (length var-list) 1) #`(define-values (var ...) 
-                                            #,(expr-iterator #'expr 
-                                                             (car var-list)
-                                                             code-insp
-                                                             #f))]
-               [else #`(define-values (var ...) #,(expr-iterator #'expr #f code-insp #f))]))]
-      [(define-syntaxes (var ...) expr)
-       #`(define-syntaxes (var ...) #,(expr-iterator #'expr #f code-insp #t))]
-      [(begin . top-level-exprs)
-       #`(begin #,@(map top-level-expr-iterator (syntax->list #'top-level-exprs)))]
-      [(#%require . require-specs)
-       stx]
-      [else
-       (expr-iterator stx #f code-insp #f)]))
-  
-  (define (expr-iterator stx potential-name insp trans?-expr)
-    (let* ([name-guess (or (syntax-property stx 'inferred-name) potential-name)]
-           [recur-tail (lambda (expr) (expr-iterator expr name-guess insp trans?-expr))]
-           [recur-non-tail (lambda (expr) (expr-iterator expr #f insp trans?-expr))]
-           [recur-with-name (lambda (expr name) (expr-iterator expr name insp trans?-expr))]
-           [recur-on-sequence (lambda (exprs) 
-                                (let loop ([remaining exprs])
-                                  (cond [(null? remaining) null]
-                                        [(null? (cdr remaining)) (list (recur-tail (car remaining)))]
-                                        [else (cons (recur-non-tail (car remaining))
-                                                    (loop (cdr remaining)))])))]
-           [lambda-clause-abstraction
-            (lambda (clause)
-              (kernel-syntax-case clause #f
-                [(arglist . bodies)
-                 (let-values ([(arglist-proper improper?) (arglist-flatten #'arglist)])
-                   (if name-guess
-                       #`(arglist (with-continuation-mark 
-                                      #,calltrace-key
-                                    'unimportant
-                                    (begin (let ([call-depth (length (continuation-mark-set->list
-                                                                      (current-continuation-marks)
-                                                                      #,calltrace-key))])
-                                             (#,print-call-trace 
-                                              (quote-syntax #,name-guess)
-                                              #,(syntax-original? name-guess)
-                                              (#,stx-protector-stx #,(make-stx-protector stx))
-                                              (list #,@arglist-proper)
-                                              #,improper?
-                                              call-depth))
-                                           #,@(recur-on-sequence (syntax->list #'bodies)))))
-                       #`(arglist #,@(recur-on-sequence (syntax->list #'bodies)))))]
-                [else
-                 (error 'expr-syntax-iterator 
-                        "unexpected (case-)lambda clause: ~a" 
-                        (syntax->datum stx))]))]
-           [let-values-abstraction
-            (lambda (stx)
-              (kernel-syntax-case stx #f
-                [(kwd (((variable ...) rhs) ...) . bodies)
-                 (let* ([clause-fn 
-                         (lambda (vars rhs)
-                           (let ([var-list (syntax->list vars)])
-                             (cond [(= (length var-list) 1) 
-                                    #`(#,vars #,(recur-with-name rhs (car var-list)))]
-                                   [else
-                                    #`(#,vars #,(recur-non-tail rhs))])))])
-                   (with-syntax ([(new-clause ...)
-                                  (map clause-fn
-                                       (syntax->list #`((variable ...) ...))
-                                       (syntax->list #`(rhs ...)))])
-                     #`(kwd (new-clause ...) #,@(recur-on-sequence (syntax->list #'bodies)))))]
-                [else
-                 (error 'expr-syntax-iterator 
-                        "unexpected let(rec) expression: ~a"
-                        stx
-                        ;(syntax->datum stx)
-                        )]))]) 
-       (kernel-syntax-case (syntax-disarm stx insp) trans?-expr
-         [var-stx
-          (identifier? (syntax var-stx))
-          stx]
-         [(#%plain-lambda . clause)
-          #`(#%plain-lambda #,@(lambda-clause-abstraction #'clause))]
-         [(case-lambda . clauses)
-          #`(case-lambda #,@(map lambda-clause-abstraction (syntax->list #'clauses)))]
-         [(if test then else)
-          #`(if
-             #,(recur-non-tail #'test)
-             #,(recur-non-tail #'then)
-             #,(recur-non-tail #'else))]
-         [(begin . bodies)
-          #`(begin #,@(recur-on-sequence (syntax->list #'bodies)))]
-         [(begin0 . bodies)
-          #`(begin #,@(map recur-non-tail (syntax->list #'bodies)))]
-         [(let-values . _)
-          (let-values-abstraction stx)]
-         [(letrec-values . _)
-          (let-values-abstraction stx)]
-         [(set! var val)               
-          #`(set! var #,(recur-with-name #'val #'var))]
-         [(quote _)
-          stx]
-         [(quote-syntax _)
-          stx]
-         [(with-continuation-mark key mark body)
-          #`(with-continuation-mark
-                #,(recur-non-tail #'key)
-              #,(recur-non-tail #'mark)
-              #,(recur-tail #'body))]
-         [(#%plain-app . exprs)
-          #`(#%plain-app #,@(map recur-non-tail (syntax->list #'exprs)))]
-         [(#%top . var)
-          stx]
-         [else
-          (error 'expr-iterator "unknown expression (phase ~s): ~s ~s" 
-                 trans?-expr
-                 stx
-                 (syntax->datum stx))])))
-  
-  (define (arglist-flatten arglist)
-    (let loop ([remaining arglist]
-               [so-far null])
-      (syntax-case remaining ()
-        [()
-         (values (reverse so-far) #f)]
-        [var
-         (identifier? (syntax var))
-         (values (reverse (cons #'var so-far)) #t)]
-        [(var . rest)
-         (loop #'rest (cons #'var so-far))])))
-  
-  
-  (define (annotate x) (top-level-expr-iterator x)))
diff --git a/pkgs/trace/test-cases-proposed.txt b/pkgs/trace/test-cases-proposed.txt
deleted file mode 100644
index d362763845..0000000000
--- a/pkgs/trace/test-cases-proposed.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-factorial
-tail recursion
-odd & even
-all flavors of improper arglist
-anonymous procedures
-all language constructs
-indentation of first call (from error)
-unannotated code
diff --git a/pkgs/typed-racket-pkgs/source-syntax/info.rkt b/pkgs/typed-racket-pkgs/source-syntax/info.rkt
deleted file mode 100644
index 938d17ae21..0000000000
--- a/pkgs/typed-racket-pkgs/source-syntax/info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang info
-
-(define collection "syntax")
-
-(define deps '("base"))
-
-(define pkg-desc "find mappings from expanded to source syntax")
-
-(define pkg-authors '(samth stamourv eli))
-
-(define version "1.1")
\ No newline at end of file
diff --git a/pkgs/typed-racket-pkgs/source-syntax/source-syntax.rkt b/pkgs/typed-racket-pkgs/source-syntax/source-syntax.rkt
deleted file mode 100644
index bb641cfef2..0000000000
--- a/pkgs/typed-racket-pkgs/source-syntax/source-syntax.rkt
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang racket/base
-
-;; from Eli
-
-(provide recover-source-syntax)
-
-;; -------------------- utilities
-
-(define (syntax-loc stx) (list (syntax-source stx) (syntax-position stx) (syntax-span stx)))
-
-
-;; -------------------- the real stuff
-
-;; Look for (the outermost) syntax in `orig' that has the same
-;; location as `lookfor' which is coming from the expanded `orig',
-;; given in `expanded'.
-(define (recover-source-syntax orig expanded #:traverse-now? [now? #f])
-  (define src (syntax-source orig))
-
-  ;; this maps source locations that are from orig to their syntax
-  (define syntax-locs (make-hash))
-
-  ;; build `syntax-locs`
-  (let loop ([stx orig])
-    (when (and (syntax? stx)
-               ;; avoid spurious hits in the table from syntaxes
-               ;; that have no useful source information
-               (and (syntax-source stx)
-                    (syntax-position stx)))
-      (hash-set! syntax-locs (syntax-loc stx) stx))
-    (let ([stx (if (syntax? stx) (syntax-e stx) stx)])
-      (when (pair? stx) (loop (car stx)) (loop (cdr stx)))))
-
-  ;; this maps syntax from expanded to the original
-  (define parent-table (make-hasheq))
-
-  ;; if `expanded` is mapped to something, then we'll start with it
-  (define initial-target
-      (hash-ref syntax-locs (syntax-loc expanded) #f))
-
-  ;; this searches for lookfor in orig, building up the table as we go
-  ;; add-to-table: stx or #f -> stx or #f
-  ;; #f as `lookfor` indicates "traverse all of `expanded`
-  (define (add-to-table lookfor)
-    ;; stx is expanded syntax, target is source syntax
-    (let loop ([stx expanded] [target initial-target])
-      (cond
-       [(syntax? stx)
-        (define new-target
-          ;; check if `stx` has the same srcloc as something in orig
-          ;; in which case it's a good target to use
-          ;; otherwise keep using the old target
-          (hash-ref syntax-locs (syntax-loc stx) target))
-        ;; map `stx` to the best enclosing syntax we have, if it's not already there
-        (hash-ref! parent-table stx new-target)
-        (cond
-         ;; if we got what we came for, stop
-         [(and lookfor (eq? stx lookfor)) new-target]
-
-         ;; take apart stx and loop on the components
-         [else
-          (let inner ([stxe (syntax-e stx)])
-            (cond [(list? stxe)
-                   (for/or ([x (in-list stxe)])
-                     (loop x new-target))]
-                  [(pair? stxe) ; may be an improper syntax list
-                   (or (loop (car stxe) new-target) (inner (cdr stxe)))]
-                  [(syntax? stxe) ; base case
-                   (loop stxe new-target)]
-                  [else
-                   #f]))])]
-       [else #f])))
-
-  ;; if now?, add everything to the table
-  (when now?
-    (add-to-table #f))
-
-  (lambda (lookfor)
-    (or
-     ;; we just might get a lookfor that is already in the original
-     (and (eq? src (syntax-source lookfor))
-          (hash-ref syntax-locs (syntax-loc lookfor) #f))
-     (hash-ref parent-table lookfor (λ ()
-                                      (cond [now? #f]
-                                            [else (add-to-table lookfor)
-                                                  (hash-ref parent-table lookfor #f)]))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/LICENSE.txt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/LICENSE.txt
deleted file mode 100644
index 751e3d3a69..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-typed-racket-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/info.rkt
deleted file mode 100644
index ae6fd12c8c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "typed-racket-lib"
-               "base"))
-
-
-(define pkg-desc "compatibility library for older Typed Racket-based languages")
-
-(define pkg-authors '(samth stamourv))
-
-(define version "1.1")
\ No newline at end of file
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/lang/reader.rkt
deleted file mode 100644
index 5affffd034..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/lang/reader.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang s-exp syntax/module-reader
-
-typed-scheme
-
-#:read r:read
-#:read-syntax r:read-syntax
-#:info make-info
-
-(require (prefix-in r: typed-racket/typed-reader))
-
-(define (make-info key default use-default)
-  (case key
-    [(drscheme:toolbar-buttons)
-     ;; If Optimization Coach is installed, load it.
-     (with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
-       (collection-path "optimization-coach")
-       (list (dynamic-require 'optimization-coach/tool
-                              'optimization-coach-drracket-button)))]
-    [else (use-default key default)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/main.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/main.rkt
deleted file mode 100644
index 295e469d89..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed-racket/minimal
-
-(require typed/scheme/base)
-(provide (all-from-out typed/scheme/base))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check.rkt
deleted file mode 100644
index 5e0f470fef..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed-racket/minimal
-
-(require racket/require typed/racket/no-check (subtract-in typed/scheme typed/racket/no-check))
-(provide (all-from-out typed/scheme typed/racket/no-check))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check/lang/reader.rkt
deleted file mode 100644
index 744ec50d0c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed-scheme/no-check/lang/reader.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang s-exp syntax/module-reader
-
-typed-scheme/no-check
-
-#:read r:read
-#:read-syntax r:read-syntax
-
-(require (prefix-in r: typed-racket/typed-reader))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme.rkt
deleted file mode 100644
index b300589a39..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed-racket/minimal
-
-(require typed/scheme/base scheme/require (subtract-in scheme typed/scheme/base scheme/contract)
-	 (for-syntax scheme/base))
-(provide (all-from-out typed/scheme/base scheme)
-	 (for-syntax (all-from-out scheme/base)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base.rkt
deleted file mode 100644
index b6311cd9b1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang typed-racket/minimal
-
-(providing (libs (except scheme/base #%module-begin #%top-interaction
-                         with-handlers default-continuation-prompt-tag
-                         define λ lambda define-struct for for*
-                         let let* let-values letrec letrec-values
-                         let/cc let/ec do case-lambda
-                         for/list for/vector for/hash for/hasheq for/hasheqv
-                         for/and for/or for/sum for/product for/lists
-                         for/first for/last for/fold for*/list for*/lists
-                         for*/vector for*/hash for*/hasheq for*/hasheqv for*/and
-                         for*/or for*/sum for*/product for*/first for*/last
-                         for*/fold))
-	   (basics #%module-begin #%top-interaction))
-
-(require typed-racket/base-env/extra-procs
-         (rename-in
-           (except-in typed-racket/base-env/prims
-             require-typed-struct
-             require/typed)
-           (require-typed-struct-legacy require-typed-struct)
-           (require/typed-legacy require/typed))
-         typed-racket/base-env/base-types
-         typed-racket/base-env/base-types-extra
-	 (for-syntax typed-racket/base-env/base-types-extra))
-(provide (rename-out [define-type-alias define-type])
-         (all-from-out typed-racket/base-env/prims)
-         (all-from-out typed-racket/base-env/base-types)
-         (all-from-out typed-racket/base-env/base-types-extra)
-	 assert defined? with-type for for*
-         (for-syntax (all-from-out typed-racket/base-env/base-types-extra)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/lang/reader.rkt
deleted file mode 100644
index a1873cb0f7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/lang/reader.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang s-exp syntax/module-reader
-
-typed/scheme/base
-
-#:read r:read
-#:read-syntax r:read-syntax
-#:info make-info
-#:language-info make-language-info
-
-(define (make-info key default use-default)
-  (case key
-    [(drscheme:toolbar-buttons)
-     ;; If Optimization Coach is installed, load it.
-     (with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
-       (collection-path "optimization-coach")
-       (list (dynamic-require 'optimization-coach/tool
-                              'optimization-coach-drracket-button)))]
-    [else (use-default key default)]))
-
-(define make-language-info
-  `#(typed-racket/language-info get-info ()))
-
-
-(require (prefix-in r: typed-racket/typed-reader))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check.rkt
deleted file mode 100644
index 8635a457a7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed-racket/minimal
-
-(require racket/require typed/racket/no-check (subtract-in typed/scheme/base typed/racket/no-check))
-(provide (all-from-out typed/scheme/base typed/racket/no-check))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check/lang/reader.rkt
deleted file mode 100644
index 579a3f8f20..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/base/no-check/lang/reader.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang s-exp syntax/module-reader
-
-typed/scheme/base/no-check
-
-#:read r:read
-#:read-syntax r:read-syntax
-
-(require (prefix-in r: typed-racket/typed-reader))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/lang/reader.rkt
deleted file mode 100644
index b3d729b9b0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/lang/reader.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang s-exp syntax/module-reader
-
-typed/scheme
-
-#:read r:read
-#:read-syntax r:read-syntax
-#:info make-info
-#:language-info make-language-info
-
-(define (make-info key default use-default)
-  (case key
-    [(drscheme:toolbar-buttons)
-     ;; If Optimization Coach is installed, load it.
-     (with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
-       (collection-path "optimization-coach")
-       (list (dynamic-require 'optimization-coach/tool
-                              'optimization-coach-drracket-button)))]
-    [else (use-default key default)]))
-
-(define make-language-info
-  `#(typed-racket/language-info get-info ()))
-
-
-(require (prefix-in r: typed-racket/typed-reader))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check.rkt
deleted file mode 100644
index 5e0f470fef..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed-racket/minimal
-
-(require racket/require typed/racket/no-check (subtract-in typed/scheme typed/racket/no-check))
-(provide (all-from-out typed/scheme typed/racket/no-check))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check/lang/reader.rkt
deleted file mode 100644
index 1084e9350a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/no-check/lang/reader.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang s-exp syntax/module-reader
-
-typed/scheme/no-check
-
-#:read r:read
-#:read-syntax r:read-syntax
-
-(require (prefix-in r: typed-racket/typed-reader))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/system.rkt b/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/system.rkt
deleted file mode 100644
index ce3b8a6e2e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-compatibility/typed/scheme/system.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp typed/private/wrap scheme/system
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/LICENSE.txt b/pkgs/typed-racket-pkgs/typed-racket-doc/LICENSE.txt
deleted file mode 100644
index 3b6900fc5a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-typed-racket-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-doc/info.rkt
deleted file mode 100644
index 33dfb0a261..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/info.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("net-doc"
-                     "scheme-lib"
-                     "srfi-lite-lib"
-                     "compatibility-doc"
-                     "compatibility-lib"
-                     "sandbox-lib"
-                     "at-exp-lib"
-                     "scribble-lib"
-                     "pict-lib"
-                     "typed-racket-lib"
-                     "typed-racket-compatibility"
-                     "typed-racket-more"
-                     "racket-doc"))
-(define deps '("base"))
-(define update-implies '("typed-racket-lib"))
-
-(define pkg-desc "documentation part of \"typed-racket\"")
-
-(define pkg-authors '(samth stamourv))
-
-(define version "1.1")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/info.rkt
deleted file mode 100644
index 98958daab9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define scribblings '(("scribblings/ts-reference.scrbl" (multi-page) (language 4))
-                      ("scribblings/ts-guide.scrbl" (multi-page) (language 5))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/begin.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/begin.scrbl
deleted file mode 100644
index 1d6ef54f28..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/begin.scrbl
+++ /dev/null
@@ -1,154 +0,0 @@
-#lang scribble/manual
-
-@begin[(require (for-label (only-meta-in 0 typed/racket)) scribble/eval
-                "../utils.rkt" (only-in "quick.scrbl" typed-mod))]
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require typed/racket))
-
-@title[#:tag "beginning"]{Beginning Typed Racket}
-
-Recall the typed module from @secref["quick"]:
-
-@|typed-mod|
-
-Let us consider each element of this program in turn.
-
-@racketmod[typed/racket]
-
-This specifies that the module is written in the
-@racketmodname[typed/racket] language, which is a typed version of the
-@racketmodname[racket] language.  Typed versions of other languages
-are provided as well; for example, the
-@racketmodname[typed/racket/base] language corresponds to
-@racketmodname[racket/base].
-
-@racketblock+eval[#:eval the-eval (struct: pt ([x : Real] [y : Real]))]
-
-@margin-note{Many forms in Typed Racket have the same name as the
-untyped forms, with a @racket[:] suffix.}
-This defines a new structure, named @racket[pt], with two fields,
-@racket[x] and @racket[y].  Both fields are specified to have the type
-@racket[Real], which corresponds to the @rtech{real numbers}.
- The
-@racket[struct:] form corresponds to the @racket[struct]
-form from @racketmodname[racket]---when porting a program from
-@racketmodname[racket] to @racketmodname[typed/racket], uses of
-@racket[struct] should be changed to @racket[struct:].
-
-@racketblock+eval[#:eval the-eval (: distance (-> pt pt Real))]
-
-This declares that @racket[distance] has the type @racket[(-> pt pt Real)].
-@;{@racket[distance] must be defined at the top-level of the module containing
-the declaration.}
-
-The type @racket[(-> pt pt Real)] is a function type, that is, the type
-of a procedure.  The input type, or domain, is two arguments of
-type @racket[pt], which refers to an instance of the @racket[pt]
-structure.  The @racket[->] indicates that this is a function
-type. The range type, or output type, is the last element in the
-function type, in this case @racket[Real].
-
-If you are familiar with @rtech{contracts}, the notation for function
-types is similar to function contract combinators.
-
-@racketblock+eval[#:eval the-eval
-(define (distance p1 p2)
-  (sqrt (+ (sqr (- (pt-x p2) (pt-x p1)))
-           (sqr (- (pt-y p2) (pt-y p1))))))
-]
-
-This definition is unchanged from the untyped version of the code.
-The goal of Typed Racket is to allow almost all definitions to be
-typechecked without change.  The typechecker verifies that the body of
-the function has the type @racket[Real], under the assumption that
-@racket[p1] and @racket[p2] have type @racket[pt], taking these types
-from the earlier type declaration.  Since the body does have this type,
-the program is accepted.
-
-In the Typed Racket @gtech{REPL}, calling @racket[distance] will
-show the result as usual and will also print the result's type:
-
-@interaction[#:eval the-eval (distance (pt 0 0) (pt 3.1415 2.7172))]
-
-Just evaluating the function name will print the function value and its type,
-which can be useful for discovering the types that Typed Racket ascribes to
-Racket functions. Alternatively, the @racket[:print-type] command will just
-print the type:
-
-@interaction[#:eval the-eval distance string-length (:print-type string-ref)]
-
-@section{Datatypes and Unions}
-
-Many data structures involve multiple variants.  In Typed Racket, we
-represent these using @italic{union types}, written @racket[(U t1 t2 ...)].
-
-@racketmod[
-typed/racket
-(define-type Tree (U leaf node))
-(struct: leaf ([val : Number]))
-(struct: node ([left : Tree] [right : Tree]))
-
-(: tree-height (-> Tree Integer))
-(define (tree-height t)
-  (cond [(leaf? t) 1]
-        [else (max (+ 1 (tree-height (node-left t)))
-                   (+ 1 (tree-height (node-right t))))]))
-
-(: tree-sum (-> Tree Number))
-(define (tree-sum t)
-  (cond [(leaf? t) (leaf-val t)]
-        [else (+ (tree-sum (node-left t))
-                 (tree-sum (node-right t)))]))
-]
-
-In this module, we have defined two new datatypes: @racket[leaf] and
-@racket[node].  We've also defined the type name @racket[Tree] to be
-@racket[(U node leaf)], which represents a binary tree of numbers.  In
-essence, we are saying that the @racket[tree-height] function accepts
-a @racket[Tree], which is either a @racket[node] or a @racket[leaf],
-and produces a number.
-
-In order to calculate interesting facts about trees, we have to take
-them apart and get at their contents.  But since accessors such as
-@racket[node-left] require a @racket[node] as input, not a
-@racket[Tree], we have to determine which kind of input we
-were passed.
-
-For this purpose, we use the predicates that come with each defined
-structure.  For example, the @racket[leaf?] predicate distinguishes
-@racket[leaf]s from all other Typed Racket values.  Therefore, in the
-first branch of the @racket[cond] clause in @racket[tree-sum], we know
-that @racket[t] is a @racket[leaf], and therefore we can get its value
-with the @racket[leaf-val] function.
-
-In the else clauses of both functions, we know that @racket[t] is not
-a @racket[leaf], and since the type of @racket[t] was @racket[Tree] by
-process of elimination we can determine that @racket[t] must be a
-@racket[node].  Therefore, we can use accessors such as
-@racket[node-left] and @racket[node-right] with @racket[t] as input.
-
-The process by which Typed Racket type-checks the bodies of the
-@racket[cond] clauses, using information from the predicate checks,
-is called @tech{occurrence typing} and is described in detail in
-@Secref["occurrence-typing"].
-
-@section{Type Errors}
-
-When Typed Racket detects a type error in the module, it raises an
-error before running the program.
-
-@examples[#:eval the-eval
-(add1 "not a number")
-]
-
-@;{
-Typed Racket also attempts to detect more than one error in the module.
-
-@examples[#:eval the-eval
-(string-append "a string" (add1 "not a number"))
-]
-}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/caveats.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/caveats.scrbl
deleted file mode 100644
index c5ad0c2ab5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/caveats.scrbl
+++ /dev/null
@@ -1,175 +0,0 @@
-#lang scribble/manual
-
-@(require "../utils.rkt"
-          scribble/eval
-          (for-label (only-meta-in 0 typed/racket)))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require typed/racket))
-
-@title[#:tag "caveats"]{Caveats and Limitations}
-
-This section describes limitations and subtle aspects of the
-type system that programmers often stumble on while porting programs
-to Typed Racket.
-
-@section{The @racket[Integer] type and @racket[integer?]}
-
-In Typed Racket, the @racket[Integer] type corresponds to values
-that return @racket[#t] for the @racket[exact-integer?] predicate,
-@bold{@emph{not}} the @racket[integer?] predicate. In particular,
-values that return @racket[#t] for @racket[integer?] may be
-@rtech{inexact number}s (e.g, @racket[1.0]).
-
-When porting a program to Typed Racket, you may need to replace
-uses of functions like @racket[round] and @racket[floor] with
-corresponding exact functions like @racket[exact-round] and
-@racket[exact-floor].
-
-In other cases, it may be necessary to use @racket[assert]ions
-or @racket[cast]s.
-
-@section{Type inference for polymorphic functions}
-
-Typed Racket's local type inference algorithm is currently not
-able to infer types for polymorphic functions that are used
-on higher-order arguments that are themselves polymorphic.
-
-For example, the following program results in a type error
-that demonstrates this limitation:
-
-@interaction[#:eval the-eval
-  (map cons '(a b c d) '(1 2 3 4))
-]
-
-The issue is that the type of @racket[cons] is also polymorphic:
-
-@interaction[#:eval the-eval cons]
-
-To make this expression type-check, the @racket[inst] form can
-be used to instantiate the polymorphic argument (e.g., @racket[cons])
-at a specific type:
-
-@interaction[#:eval the-eval
-  (map (inst cons Symbol Integer) '(a b c d) '(1 2 3 4))
-]
-
-@section{Typed-untyped interaction and contract generation}
-
-When a typed module @racket[require]s bindings from an untyped
-module (or vice-versa), there are some types that cannot be
-converted to a corresponding contract.
-
-This could happen because a type is not yet supported in the
-contract system, because Typed Racket's contract generator has
-not been updated, or because the contract is too difficult
-to generate. In some of these cases, the limitation will be
-fixed in a future release.
-
-The following illustrates an example type that cannot be
-converted to a contract:
-
-@interaction[#:eval the-eval
-  (require/typed racket/base
-    [object-name (case-> (-> Struct-Type-Property Symbol)
-                         (-> Regexp (U String Bytes)))])
-]
-
-This function type by cases is a valid type, but a corresponding
-contract is difficult to generate because the check on the result
-depends on the check on the domain. In the future, this may be
-supported with dependent contracts.
-
-A more approximate type will work for this case, but with a loss
-of type precision at use sites:
-
-@interaction[#:eval the-eval
-  (require/typed racket/base
-    [object-name (-> (U Struct-Type-Property Regexp)
-                     (U String Bytes Symbol))])
-  (object-name #rx"a regexp")
-]
-
-@section{Unsupported features}
-
-Units are not currently supported at all in Typed Racket, but they
-will potentially be supported in a future version.
-
-Most structure type properties do not work in Typed Racket, including
-support for generic interfaces.
-
-@section{Type generalization}
-
-Not so much a caveat as a feature that may have unexpected consequences.
-To make programming with invariant type constructors (such as @racket[Boxof])
-easier, Typed Racket generalizes types that are used as arguments to invariant
-type constructors. For example:
-
-@interaction[#:eval the-eval
-  0
-  (define b (box 0))
-  b
-]
-
-@racket[0] has type @racket[Zero], which means that @racket[b] ``should'' have
-type @racket[(Boxof Zero)]. On the other hand, that type is not especially
-useful, as it only allows @racket[0] to be stored in the box. Most likely, the
-intent was to have a box of a more general type (such as @racket[Integer]) and
-initialize it with @racket[0]. Type generalization does exactly that.
-
-In some cases, however, type generalization can lead to unexpected results:
-
-@interaction[#:eval the-eval
-  (box (ann 1 Fixnum))
-]
-
-The intent of this code may be to create of box of @racket[Fixnum], but Typed
-Racket will generalize it anyway. To create a box of @racket[Fixnum], the box
-itself should have a type annotation:
-
-@interaction[#:eval the-eval
-  (ann (box 1) (Boxof Fixnum))
-  ((inst box Fixnum) 1)
-]
-
-@section{Macros and compile-time computation}
-
-Typed Racket will type-check all expressions at the run-time phase of
-the given module and will prevent errors that would occur at run-time.
-However, expressions at compile-time---including computations that
-occur inside macros---are not checked.
-
-Concretely, this means that expressions inside, for example, a
-@racket[begin-for-syntax] block are not checked:
-
-@interaction[#:eval the-eval
-  (begin-for-syntax (+ 1 "foo"))
-]
-
-Similarly, expressions inside of macros defined in Typed Racket are
-not type-checked. On the other hand, the macro's expansion is always
-type-checked:
-
-@defs+int[#:eval the-eval
-  ((define-syntax (example-1 stx)
-     (+ 1 "foo")
-     #'1)
-   (define-syntax (example-2 stx)
-     #'(+ 1 "foo")))
-  (example-1)
-  (example-2)
-]
-
-Note that functions defined in Typed Racket that are used at
-compile-time in other typed modules or untyped modules will be
-type-checked and then protected with contracts as described in
-@secref["typed-untyped-interaction"].
-
-Additionally, macros that are defined in Typed Racket modules cannot
-be used in ordinary Racket modules because such uses can
-circumvent the protections of the type system.
-
-@section{Expensive contract boundaries}
-
-Contract boundaries installed for typed-untyped interaction may cause
-significant slowdowns. See @secref{contract-costs} for details.
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/more.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/more.scrbl
deleted file mode 100644
index b8f0fee2bd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/more.scrbl
+++ /dev/null
@@ -1,213 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt"
-		scribble/core scribble/eval
-		(for-label (only-meta-in 0 typed/racket)
-                           (only-in mzlib/etc let+)))]
-
-@title[#:tag "more"]{Specifying Types}
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require typed/racket))
-
-
-The previous section introduced the basics of the Typed Racket type
-system.  In this section, we will see several new features of the
-language, allowing types to be specified and used.
-
-@section{Type Annotation and Binding Forms}
-
-In general, variables in Typed Racket must be annotated with their
-type. A later subsection (@secref["when-annotations?"]) introduces a
-heuristic which more precisely details when type annotations are
-needed.
-
-@subsection{Annotating Definitions}
-
-We have already seen the @racket[:] type annotation form.  This is
-useful for definitions, at both the top level of a module
-
-@racketblock[
-(: x Number)
-(define x 7)]
-
-and in an internal definition
-
-@racketblock[
-(let ()
-  (: x Number)
-  (define x 7)
-  (add1 x))
-]
-
-In addition to the @racket[:] form, almost all binding forms from
-@racketmodname[racket] have counterparts which allow the specification
-of types. The @racket[define:] form allows the definition of variables
-in both top-level and internal contexts.
-
-@racketblock[
-(define: x : Number 7)
-(define: (id [z : Number]) : Number z)]
-
-Here, @racket[x] has the type @racket[Number], and @racket[id] has the
-type @racket[(-> Number Number)].  In the body of @racket[id],
-@racket[z] has the type @racket[Number].
-
-@subsection{Annotating Local Binding}
-
-@racketblock[
-(let: ([x : Number 7])
-  (add1 x))
-]
-
-The @racket[let:] form is exactly like @racket[let], but type
-annotations are provided for each variable bound.  Here, @racket[x] is
-given the type @racket[Number].  The @racket[let*:] and
-@racket[letrec:] are similar. Annotations are optional with
-@racket[let:] and variants.
-
-@racketblock[
-(let-values: ([([x : Number] [y : String]) (values 7 "hello")])
-  (+ x (string-length y)))
-]
-
-The @racket[let*-values:] and @racket[letrec-values:] forms are similar.
-
-@subsection{Annotating Functions}
-
-Function expressions also bind variables, which can be annotated with
-types. This function expects two arguments, a @racket[Number] and a
-@racket[String]:
-
-@racketblock[(lambda: ([x : Number] [y : String]) (+ x 5))]
-
-This function accepts at least one @racket[String], followed by
-arbitrarily many @racket[Number]s.  In the body, @racket[y] is a list
-of @racket[Number]s.
-
-@racketblock[(lambda: ([x : String] (unsyntax @tt["."]) [y : Number #,**]) (apply + y))]
-
-This function has the type @racket[(-> String Number #,** Number)].
-Functions defined by cases may also be annotated:
-
-@racketblock[(case-lambda: [() 0]
-			   [([x : Number]) x])]
-
-This function has the type
-@racket[(case-> (-> Number) (-> Number Number))].
-
-@subsection{Annotating Single Variables}
-
-When a single variable binding needs annotation, the annotation can be
-applied to a single variable using a reader extension:
-
-@racketblock[
-(let ([#,(annvar x Number) 7]) (add1 x))]
-
-This is equivalent to the earlier use of @racket[let:]. This is
-especially useful for binding forms which do not have counterparts
-provided by Typed Racket, such as @racket[let+]:
-
-@racketblock[
-(let+ ([val #,(annvar x Number) (+ 6 1)])
-  (* x x))]
-
-@subsection{Annotating Expressions}
-
-It is also possible to provide an expected type for a particular
-expression.
-
-@racketblock[(ann (+ 7 1) Number)]
-
-This ensures that the expression, here @racket[(+ 7 1)], has the
-desired type, here @racket[Number].  Otherwise, the type checker
-signals an error.  For example:
-
-@interaction[#:eval the-eval
-(ann "not a number" Number)]
-
-@section{Type Inference}
-
-In many cases, type annotations can be avoided where Typed Racket can
-infer them.  For example, the types of all local bindings using
-@racket[let] and @racket[let*] can be inferred.
-
-@racketblock[(let ([x 7]) (add1 x))]
-
-In this example, @racket[x] has the type
-@racket[Exact-Positive-Integer].
-
-Similarly, top-level constant definitions do not require annotation:
-
-@racketblock[(define y "foo")]
-
-In this examples, @racket[y] has the type @racket[String].
-
-Finally, the parameter types for loops are inferred from their initial
-values.
-
-@racketblock[
-(let loop ([x 0] [y (list 1 2 3)])
-  (if (null? y) x (loop (+ x (car y)) (cdr y))))]
-
-Here @racket[x] has the inferred type @racket[Integer], and @racket[y]
-has the inferred type @racket[(Listof Integer)].  The @racket[loop]
-variable has type @racket[(-> Integer (Listof Integer) Integer)].
-
-@subsection[#:tag "when-annotations?"]{When do you need type annotations?}
-
-The last several subsections explained several ways to add type annotations
-and explained that type inference allows some annotations to be left out.
-Since annotations can often be omitted, it is helpful to know the situations
-in which they are actually required.
-
-The following four rules of thumb will usually suffice to determine
-if a type annotation is necessary.
-
-An expression or definition needs a type annotation if it:
-
-@itemlist[
-  @item{is a @racket[define] form for a function,}
-  @item{is a @racket[lambda] that is immediately bound to a variable,}
-  @item{is a @racket[lambda] that is an argument to a polymorphic function, or}
-  @item{is defining a mutable variable.}
-]
-
-Here are examples that correspond to each of the cases above:
-
-Example 1:
-@racketblock[
-  (: fn (-> String Symbol))
-  (define (fn str) _...)
-]
-Example 2:
-@racketblock[
-  (: fn (-> String Symbol))
-  (define fn (lambda (str) _...))
-]
-Example 3:
-@racketblock[
-  (map (lambda: ([n : Integer]) (add1 n)) '(1 2 3))
-]
-Example 4:
-@racketblock[
-   (: maybe-animal (Option String))
-   (define maybe-animal #f)
-   (set! maybe-animal "Odontodactylus scyllarus")
-]
-
-In all four cases, if the type annotation is omitted then the inferred type
-will often be too conservative (e.g., @racket[Any]) and the code may not
-type-check.
-
-@section{New Type Names}
-
-Any type can be given a name with @racket[define-type].
-
-@racketblock[(define-type NN (-> Number Number))]
-
-Anywhere the name @racket[NN] is used, it is expanded to
-@racket[(-> Number Number)]. Type names may be recursive
-or even mutually recursive.
-
-@(close-eval the-eval)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/occurrence.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/occurrence.scrbl
deleted file mode 100644
index 502225390c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/occurrence.scrbl
+++ /dev/null
@@ -1,159 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt"
-		scribble/core scribble/eval
-		(for-label (only-meta-in 0 typed/racket)))]
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require typed/racket))
-
-@title[#:tag "occurrence-typing"]{Occurrence Typing}
-
-@section{Basic Occurrence Typing}
-
-One of Typed Racket's distinguishing type system features is
-@deftech{occurrence typing}, which allows the type system to ascribe
-more precise types based on whether a predicate check succeeds or
-fails.
-
-To illustrate, consider the following code:
-
-@racketblock+eval[#:eval the-eval
-  (: flexible-length (-> (U String (Listof Any)) Integer))
-  (define (flexible-length str-or-lst)
-    (if (string? str-or-lst)
-        (string-length str-or-lst)
-        (length str-or-lst)))
-]
-
-The @racket[_flexible-length] function above computes the length of
-either a string or a list. The function body uses the typical Racket
-idiom of dispatching using a predicate (e.g., @racket[string?]).
-
-Typed Racket successfully type-checks this function because the type
-system understands that in the "then" branch of the @racket[if]
-expression, the predicate @racket[string?] must have returned a true
-value.  The type system further knows that if @racket[string?]
-returns true, then the @racket[_str-or-lst] variable must have type
-@racket[String] and can narrow the type from its original union of
-@racket[String] and @racket[(Listof Any)]. This allows the call to
-@racket[string-length] in the "then" branch to type-check
-successfully.
-
-Furthermore, the type system also knows that in the "else" branch of
-the @racket[if] expression, the predicate must have returned
-@racket[#f].  This implies that the variable @racket[_str-or-lst] must
-have type @racket[(Listof Any)] by process of elimination, and thus
-the call @racket[(length str-or-lst)] type-checks.
-
-To summarize, if Typed Racket can determine the type a variable must
-have based on a predicate check in a conditional expression, it can
-narrow the type of the variable within the appropriate branch of the
-conditional.
-
-@section[#:tag "filters-and-predicates"]{Filters and Predicates}
-
-In the previous section, we demonstrated that a Typed Racket programmer
-can take advantage of occurrence typing to type-check functions
-with union types and conditionals. This may raise the question: how
-does Typed Racket know how to narrow the type based on the predicate?
-
-The answer is that predicate types in Typed Racket are annotated
-with @deftech{filters} that tell the typechecker what additional
-information is gained when a predicate check succeeds or fails.
-
-For example, consider the REPL's type printout for @racket[string?]:
-
-@interaction[#:eval the-eval string?]
-
-The type @racket[(-> Any Boolean : String)] has three parts. The first
-two are the same as any other function type and indicate that the
-predicate takes any value and returns a boolean. The third part, after
-the @racket[_:], is a @tech{filter} that tells the typechecker two
-things:
-
-@itemlist[#:style 'ordered
-  @item{If the predicate check succeeds, the argument variable has type @racket[String]}
-  @item{If the predicate check fails, the argument variable @emph{does not} have type @racket[String]}
-]
-
-Predicates for all built-in types are annotated with similar filters
-that allow the type system to reason about predicate checks.
-
-@section{Other conditionals and assertions}
-
-@margin-note{After all, these control flow constructs macro-expand
-  to @racket[if] in the end.}
-
-So far, we have seen that occurrence typing allows precise reasoning
-about @racket[if] expressions. Occurrence typing works for most
-control flow constructs that are present in Racket such as
-@racket[cond], @racket[when], and others.
-
-For example, the @racket[_flexible-length] function from earlier can
-be re-written to use @racket[cond] with no additional effort:
-
-@racketblock+eval[#:eval the-eval
-  (: flexible-length/cond (-> (U String (Listof Any)) Integer))
-  (define (flexible-length/cond str-or-lst)
-    (cond [(string? str-or-lst) (string-length str-or-lst)]
-          [else (length str-or-lst)]))
-]
-
-In some cases, the type system does not have enough information or is
-too conservative to typecheck an expression. For example, consider
-the following interaction:
-
-@interaction[#:eval the-eval
-(: a Positive-Integer)
-(define a 15)
-(: b Positive-Integer)
-(define b 20)
-(: c Positive-Integer)
-(define c (- b a))
-]
-
-In this case, the type system only knows that @racket[_a] and
-@racket[_b] are positive integers and cannot conclude that their
-difference will always be positive in defining @racket[_c].  In cases
-like this, occurrence typing can be used to make the code type-check
-using an @emph{assertion}. For example,
-
-@racketblock+eval[#:eval the-eval
-(: d Positive-Integer)
-(define d (assert (- b a) positive?))
-]
-
-Using the filter on @racket[positive?], Typed Racket can assign the
-type @racket[Positive-Integer] to the whole @racket[assert]
-expression.  This type-checks, but note that the assertion may raise
-an exception at run-time if the predicate returns @racket[#f].
-
-Note that @racket[assert] is a derived concept in Typed Racket and is
-a natural consequence of occurrence typing. The assertion above is
-essentially equivalent to the following:
-
-@racketblock+eval[#:eval the-eval
-(: e Positive-Integer)
-(define e (let ([diff (- b a)])
-            (if (positive? diff)
-                diff
-                (error "Assertion failed"))))
-]
-
-@section{A caveat about @racket[set!]}
-
-If a variable is ever mutated with @racket[set!]  in the scope in
-which it is defined, Typed Racket cannot use occurrence typing with
-that variable. This precaution is needed to ensure that concurrent
-modification of a variable does not invalidate Typed Racket's
-knowledge of the type of that variable.  Also see
-@Secref["using-set!"  #:doc '(lib "scribblings/guide/guide.scrbl")].
-
-Furthermore, this means that the types of @rtech{top-level variable}s
-in the @gtech{REPL} cannot be refined by Typed Racket either. This is
-because the scope of a top-level variable includes future top-level
-interactions, which may include mutations. It is possible to work
-around this by moving the variable inside of a module or into a local
-binding form like @racket[let].
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/optimization.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/optimization.scrbl
deleted file mode 100644
index 138e083406..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/optimization.scrbl
+++ /dev/null
@@ -1,185 +0,0 @@
-#lang scribble/manual
-
-@begin[(require (for-label (only-meta-in 0 typed/racket))
-                scribble/eval racket/sandbox
-		"../utils.rkt" (only-in "quick.scrbl" typed-mod))]
-
-@title[#:tag "optimization"]{Optimization in Typed Racket}
-
-@margin-note{For general information on Racket performance and
-benchmarking, see @secref[#:doc '(lib
-"scribblings/guide/guide.scrbl")]{performance}.}
-
-Typed Racket provides a type-driven optimizer that rewrites well-typed
-programs to potentially make them faster. It should in no way make
-your programs slower or unsafe.
-
-
-@section{Turning the optimizer off}
-
-Typed Racket's optimizer is turned on by default. If you want to
-deactivate it (for debugging, for instance), you must add the
-@as-index{@racket[#:no-optimize]} keyword when specifying the language of your
-program:
-
-@racketmod[typed/racket #:no-optimize]
-
-@section{Getting the most out of the optimizer}
-Typed Racket's optimizer can improve the performance of various common
-Racket idioms. However, it does a better job on some idioms than on
-others. By writing your programs using the right idioms, you can help
-the optimizer help you.
-
-To best take advantage of the Typed Racket optimizer, keep the following in
-mind. The @emph{Optimization Coach} package provides optimization coaching
-support to help you in this task.
-
-
-@subsection{Numeric types}
-Being type-driven, the optimizer makes most of its decisions based on
-the types you assigned to your data. As such, you can improve the
-optimizer's usefulness by writing informative types.
-
-For example, the following programs both typecheck:
-@racketblock[(define: (f (x : Real))  : Real  (+ x 2.5))
-             (f 3.5)]
-@racketblock[(define: (f (x : Float)) : Float (+ x 2.5))
-             (f 3.5)]
-
-However, the second one uses more informative types: the
-@racket[Float] type includes only 64-bit floating-point numbers
-whereas the
-@racket[Real] type includes both exact and
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl") #:key
-"inexact numbers"]{inexact}
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{real numbers}
-and the @racket[Inexact-Real] type includes both 32- and 64-bit
-floating-point numbers.
-Typed Racket's optimizer can optimize the latter program to use
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl") #:key
-"inexact numbers"]{float}
--specific operations whereas it cannot do anything with the
-former program.
-
-Thus, to get the most of Typed Racket's optimizer, you should use the
-@racket[Float] type when possible. For similar reasons, you should use
-floating-point literals instead of exact literals when doing
-floating-point computations.
-
-When mixing floating-point numbers and exact reals in arithmetic
-operations, the result is not necessarily a @racket[Float]. For
-instance, the result of @racket[(* 2.0 0)] is @racket[0] which is not
-a @racket[Float]. This can result in missed optimizations. To prevent
-this, when mixing floating-point numbers and exact reals, coerce exact
-reals to floating-point numbers using @racket[exact->inexact]. This is
-not necessary when using @racket[+] or @racket[-]. When mixing
-floating-point numbers of different precisions, results use the
-highest precision possible.
-
-On a similar note, the @racket[Float-Complex] type is preferable to
-the @racket[Complex] type for the same reason. Typed Racket can keep
-float
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{complex numbers}
-unboxed; as such, programs using
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{complex numbers}
-can have better performance than equivalent programs that
-represent
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{complex numbers}
-as two
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{real numbers}.
-As with floating-point literals, float
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl") #:key
-"complex numbers"]{complex}
-literals (such as @racket[1.0+1.0i]) should be preferred over exact
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl") #:key
-"complex numbers"]{complex}
-literals (such as @racket[1+1i]). Note that both parts of a literal must be
-present and
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl") #:key
-"inexact numbers"]{inexact}
-for the literal to be of type
-@racket[Float-Complex]; @racket[0.0+1.0i] is of type
-@racket[Float-Complex] but @racket[+1.0i] is not.
-To get the most of
-Typed Racket's optimizer, you should also favor rectangular
-coordinates over polar coordinates.
-
-@subsection{Lists}
-Typed Racket handles potentially empty lists and lists that are known
-to be non-empty differently: when taking the @racket[car] or the
-@racket[cdr] of a list Typed Racket knows is non-empty, it can skip
-the check for the empty list that is usually done when calling
-@racket[car] and @racket[cdr].
-
-@racketblock[
-(define: (sum (l : (Listof Integer))) : Integer
-  (if (null? l)
-      0
-      (+ (car l) (sum (cdr l)))))
-]
-
-In this example, Typed Racket knows that if we reach the else branch,
-@racket[l] is not empty. The checks associated with @racket[car] and
-@racket[cdr] would be redundant and are eliminated.
-
-In addition to explicitly checking for the empty list using
-@racket[null?], you can inform Typed Racket that a list is non-empty
-by using the known-length list type constructor; if your data is
-stored in lists of fixed length, you can use the @racket[List] type
-constructors.
-
-For instance, the type of a list of two @racket[Integer]s can be
-written either as:
-@racketblock[(define-type List-2-Ints (Listof Integer))]
-or as the more precise:
-@racketblock[(define-type List-2-Ints (List Integer Integer))]
-
-Using the second definition, all @racket[car] and @racket[cdr]-related
-checks can be eliminated in this function:
-@racketblock[
-(define: (sum2 (l : List-2-Ints) : Integer)
-  (+ (car l) (car (cdr l))))
-]
-
-@subsection{Vectors}
-
-In addition to known-length lists, Typed Racket supports known-length
-vectors through the @racket[Vector] type constructor. Known-length
-vector access using constant indices can be optimized in a similar
-fashion as @racket[car] and @racket[cdr].
-
-@#reader scribble/comment-reader (racketblock
-;; #(name r g b)
-(define-type Color (Vector String Integer Integer Integer))
-(define: x : Color (vector "red" 255 0 0))
-(vector-ref x 0) ; good
-(define color-name 0)
-(vector-ref x color-name) ; good
-(vector-ref x (* 0 10)) ; bad
-)
-
-In many such cases, however, @seclink[#:doc '(lib
-"scribblings/guide/guide.scrbl") "define-struct"]{structs} are
-preferable to vectors. Typed Racket can optimize struct access in all
-cases.
-
-@subsection[#:tag "contract-costs"]{Contract boundaries}
-
-When interoperating with untyped code (see @secref{typed-untyped-interaction}),
-contracts are installed between typed and untyped modules. Contracts can have
-significant overhead, thus typed-untyped boundary crossings should be avoided
-in performance-sensitive code.
-
-Typed Racket provides types for most of the bindings provided by @tt{#lang
-racket}; using @racket[require/typed] is unnecessary in these cases.
-
-If you suspect that contracts at a typed-untyped boundary may be have a
-significant cost in your program, you can investigate further using the
-@seclink["top" #:doc '(lib "contract-profile/scribblings/contract-profile.scrbl")
-               #:indirect? #t
-         "contract profiler"].
-
-If the contract profiler is not already installed, the following command
-will install it:
-
-@commandline{raco pkg install contract-profile}
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/quick.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/quick.scrbl
deleted file mode 100644
index 266f54b823..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/quick.scrbl
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang scribble/manual
-
-@(require "../utils.rkt" (for-label (only-meta-in 0 typed/racket)))
-@(provide typed-mod)
-
-@title[#:tag "quick"]{Quick Start}
-
-Given a module written in the @racketmodname[racket] language, using
-Typed Racket requires the following steps:
-
-@itemize[#:style
-         'ordered
-         @item{Change the language to @racketmodname[typed/racket].}
-         @item{Change the uses of @racket[(require mod)] to
-           @racket[(require typed/mod)].}
-         @item{Annotate structure definitions and top-level
-           definitions with their types.} ]
-
-Then, when the program is run, it will automatically be typechecked
-before any execution, and any type errors will be reported.  If there
-are any type errors, the program will not run.
-
-Here is an example program, written in the @racketmodname[racket]
-language:
-
-@(define typed-mod
-@racketmod[
-typed/racket
-(struct: pt ([x : Real] [y : Real]))
-
-(: distance (-> pt pt Real))
-(define (distance p1 p2)
-  (sqrt (+ (sqr (- (pt-x p2) (pt-x p1)))
-           (sqr (- (pt-y p2) (pt-y p1))))))
-]
-)
-
-@racketmod[
-racket
-(struct pt (x y))
-
-(code:contract distance : pt pt -> real)
-(define (distance p1 p2)
-  (sqrt (+ (sqr (- (pt-x p2) (pt-x p1)))
-           (sqr (- (pt-y p2) (pt-y p1))))))
-]
-
-Here is the same program, in @racketmodname[typed/racket]:
-
-@|typed-mod|
-
-@section{Using Typed Racket from the Racket REPL}
-
-It is possible to use Typed Racket from the Racket REPL. To do so, start Racket
-with the following command line:
-@commandline{racket -I typed/racket}
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/typed-untyped-interaction.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/typed-untyped-interaction.scrbl
deleted file mode 100644
index a652b01583..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/typed-untyped-interaction.scrbl
+++ /dev/null
@@ -1,152 +0,0 @@
-#lang scribble/manual
-
-@(require "../utils.rkt"
-          scribble/eval
-          (for-label (only-meta-in 0 typed/racket)))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require typed/racket))
-
-@title[#:tag "typed-untyped-interaction"]{Typed-Untyped Interaction}
-
-In the previous sections, all of the examples have consisted of programs
-that are entirely typed. One of the key features of Typed Racket is that
-it allows the combination of both typed and untyped code in a single
-program.
-
-@section{Using Untyped Code from Typed Code}
-
-Suppose that we write the untyped module from @secref["quick"] again:
-
-@racketmod[#:file "distance.rkt"
-racket
-
-(provide (struct-out pt)
-         distance)
-
-(struct pt (x y))
-
-(code:contract distance : pt pt -> real)
-(define (distance p1 p2)
-  (sqrt (+ (sqr (- (pt-x p2) (pt-x p1)))
-           (sqr (- (pt-y p2) (pt-y p1))))))
-]
-
-If we want to use the @racket[_distance] function defined in the above module
-from a typed module, we need to use the @racket[require/typed] form to import
-it. Since the untyped module did not specify any types, we need to annotate
-the imports with types (just like how the example in @secref["quick"] had
-additional type annotations with @racket[:]):
-
-@margin-note{Note that a typed module @emph{does not} need to use @racket[require/typed]
-to import from another typed module. The @racket[require] form will work in such
-cases.}
-
-@racketmod[#:file "client.rkt"
-typed/racket
-
-(require/typed "distance.rkt"
-               [#:struct pt ([x : Real] [y : Real])]
-               [distance (-> pt pt Real)])
-
-(distance (pt 3 5) (p 7 0))
-]
-
-The @racket[require/typed] form has several kinds of clauses. The
-@racket[#:struct] clause specifies the import of a structure type
-and allows us to use the structure type as if it were defined with
-@racket[struct:].
-
-The second clause in the example above specifies that a given
-binding @racket[_distance] has the given type @racket[(-> pt pt Real)].
-
-Note that the @racket[require/typed] form can import bindings
-from any module, including those that are part of the Racket standard
-library. For example,
-
-@racketmod[
-typed/racket
-
-(require/typed racket/base [add1 (-> Integer Integer)])
-]
-
-is a valid use of the @racket[require/typed] form and imports @racket[add1]
-from the @racketmodname[racket/base] library.
-
-@section{Using Typed Code in Untyped Code}
-
-In the previous subsection, we saw that the use of untyped code from
-typed code requires the use of @racket[require/typed]. However, the
-use of code in the other direction (i.e., the use of typed code from
-untyped code) requires no additional work.
-
-If an untyped module @racket[require]s a typed module, it will be able
-to use the bindings defined in the typed module as expected. The major
-exception to this rule is that macros defined in typed modules may not
-be used in untyped modules.
-
-@section{Protecting Typed-Untyped Interaction}
-
-One might wonder if the interactions described in the first two
-subsections are actually safe; after all, untyped code might be able to
-ignore the errors that Typed Racket's type system will catch at
-compile-time.
-
-To ensure that typed-untyped interactions are safe, Typed Racket establishes
-contracts wherever typed and untyped code interact. For example, suppose
-that we write an untyped module that implements an @racket[_increment]
-function:
-
-@margin-note{For general information on Racket's contract system
-, see @secref[#:doc '(lib "scribblings/guide/guide.scrbl")]{contracts}.}
-
-@interaction[#:eval the-eval
-(module increment racket
-  (provide increment)
-
-  (code:comment "increment : exact-integer? -> exact-integer?")
-  (define (increment x) "this is broken"))
-]
-
-and a typed module that uses it:
-
-@interaction[#:eval the-eval
-(module client typed/racket
-
-  (require/typed 'increment [increment (-> Integer Integer)])
-
-  (increment 5))
-]
-
-This combined program is not correct. All uses of @racket[_increment]
-in Typed Racket are correct under the assumption that the
-@racket[_increment] function upholds the @racket[(-> Integer Integer)]
-type. Unfortunately, our @racket[_increment] implementation does not
-actually uphold this assumption, because the function actually produces
-strings.
-
-On the other hand, when the program is run:
-
-@interaction[#:eval the-eval (require 'client)]
-
-we find that the contract system checks the assumption made by the typed
-module and correctly finds that the assumption failed because of the
-implementation in the untyped module (hence it is @emph{blamed} in the
-error message).
-
-In the same fashion, Typed Racket checks all functions and other values
-that pass from a typed module to untyped module or vice versa with
-contracts. This means that, for example, Typed Racket can safely optimize
-programs (see @secref["optimization"]) with the assurance that the program
-will not segfault due to an unchecked assumption.
-
-@bold{Important caveat}: contracts such as the @racket[Integer] check from
-above are performant. However, contracts in general can
-have a non-trivial performance impact, especially with the use of first-class
-functions or other higher-order data such as vectors.
-
-Note that no contract overhead is ever incurred for uses of typed
-values from another typed module.
-
-@close-eval[the-eval]
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/types.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/types.scrbl
deleted file mode 100644
index 846b1c31f8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/types.scrbl
+++ /dev/null
@@ -1,328 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt"
-		scribble/core scribble/eval
-		(for-label (only-meta-in 0 typed/racket)))]
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require typed/racket))
-
-@title[#:tag "types"]{Types in Typed Racket}
-
-Typed Racket provides a rich variety of types to describe data. This
-section introduces them.
-
-@section{Basic Types}
-
-The most basic types in Typed Racket are those for primitive data,
-such as @racket[True] and @racket[False] for booleans, @racket[String]
-for strings, and @racket[Char] for characters.
-
-@interaction[#:eval the-eval
-'"hello, world"
-#\f
-#t
-#f]
-
-Each symbol is given a unique type containing only that symbol.  The
-@racket[Symbol] type includes all symbols.
-
-@interaction[#:eval the-eval
-'foo
-'bar]
-
-Typed Racket also provides a rich hierarchy for describing particular
-kinds of numbers.
-
-@interaction[#:eval the-eval
-0
--7
-14
-3.2
-7+2.8i]
-
-Finally, any value is itself a type:
-
-@interaction[#:eval the-eval
-(ann 23 : 23)]
-
-@section{Function Types}
-
-We have already seen some examples of function types.  Function types
-are constructed using @racket[->], where the last type is the result
-type and the others are the argument types.
-Here are some example function types:
-
-@racketblock[
-(-> Number Number)
-(-> String String Boolean)
-(-> Char (values String Natural))
-]
-
-The first type requires a @racket[Number] as input, and produces a
-@racket[Number].  The second requires two arguments.  The third takes
-one argument, and produces  @rtech{multiple values}, of types
-@racket[String] and @racket[Natural].  Here are example functions for
-each of these types.
-
-@interaction[#:eval the-eval
-(lambda: ([x : Number]) x)
-(lambda: ([a : String] [b : String]) (equal? a b))
-(lambda: ([c : Char]) (values (string c) (char->integer c)))]
-
-
-@section{Types for Functions with Optional or Keyword Arguments}
-
-Racket functions often take optional or keyword arguments in addition
-to standard mandatory arguments. Types for these functions can written
-concisely using the @racket[->*] type constructor. Here are some
-examples:
-
-@racketblock[
-(->* () (Number) Number)
-(->* (String String) Boolean)
-(->* (#:x Number) (#:y Number) (values Number Number))
-]
-
-The first type describes a function that has no mandatory arguments,
-one optional argument with type @racket[Number], and returns a
-@racket[Number].
-
-The second requires two mandatory arguments, no optional arguments,
-and produces a @racket[Boolean]. This function type could have been
-written using @racket[->] as @racket[(-> String String Boolean)].
-
-The third requires a mandatory keyword argument with the keyword
-@racket[#:x] and accepts an optional argument with keyword @racket[#:y].
-The result is two values of type @racket[Number].
-
-@;; FIXME: examples for these are not great right now because
-@;; the lambda: does not allow optional arguments and lambda does
-@;; not allow type annotations. This will be fixed in the future,
-@;; so update the Guide then.
-
-@section{Union Types}
-
-Sometimes a value can be one of several types.  To specify this, we
-can use a union type, written with the type constructor @racket[U].
-
-@interaction[#:eval the-eval
-(let ([a-number 37])
-  (if (even? a-number)
-      'yes
-      'no))]
-
-Any number of types can be combined together in a union, and nested
-unions are flattened.
-
-@racketblock[(U Number String Boolean Char)]
-
-@section{Recursive Types}
-
-@deftech{Recursive types} can refer to themselves.  This allows a type
-to describe an infinite family of data.  For example, this is the type
-of binary trees of numbers.
-
-@racketblock[
-(define-type BinaryTree (Rec BT (U Number (Pair BT BT))))]
-
-The @racket[Rec] type constructor specifies that the type @racket[BT]
-refers to the whole binary tree type within the body of the
-@racket[Rec] form.
-
-@section{Structure Types}
-
-Using @racket[struct:] introduces new types, distinct from any
-previous type.
-
-@racketblock[(struct: point ([x : Real] [y : Real]))]
-
-Instances of this structure, such as @racket[(point 7 12)], have type @racket[point].
-
-@section{Subtyping}
-
-In Typed Racket, all types are placed in a hierarchy, based on what
-values are included in the type.  When an element of a larger type is
-expected, an element of a smaller type may be provided.  The smaller
-type is called a @deftech{subtype} of the larger type.  The larger
-type is called a @deftech{supertype}. For example,
-@racket[Integer] is a subtype of @racket[Real], since every integer is
-a real number.  Therefore, the following code is acceptable to the
-type checker:
-
-@racketblock[
-(: f (-> Real Real))
-(define (f x) (* x 0.75))
-
-(: x Integer)
-(define x -125)
-
-(f x)
-]
-
-All types are subtypes of the @racket[Any] type.
-
-The elements of a union type are individually subtypes of the whole
-union, so @racket[String] is a subtype of @racket[(U String Number)].
-One function type is a subtype of another if they have the same number
-of arguments, the subtype's arguments are more permissive (is a supertype), and the
-subtype's result type is less permissive (is a subtype).
-For example, @racket[(-> Any String)] is a subtype of @racket[(-> Number
-(U String #f))].
-
-@;@section{Occurrence Typing}
-
-@section{Polymorphism}
-
-Typed Racket offers abstraction over types as well as values. This allows
-the definition of functions that use @deftech{parametric polymorphism}.
-
-@subsection{Polymorphic Data Structures}
-
-Virtually every Racket program uses lists and other collections.  Fortunately, Typed
-Racket can handle these as well.  A simple list processing program can be
-written like this:
-
-@racketmod[
-typed/racket
-(: sum-list (-> (Listof Number) Number))
-(define (sum-list l)
-  (cond [(null? l) 0]
-        [else (+ (car l) (sum-list (cdr l)))]))
-]
-
-This looks similar to our earlier programs --- except for the type
-of @racket[l], which looks like a function application.  In fact, it's
-a use of the @italic{type constructor} @racket[Listof], which takes
-another type as its input, here @racket[Number].  We can use
-@racket[Listof] to construct the type of any kind of list we might
-want.
-
-We can define our own type constructors as well.  For example, here is
-an analog of the @tt{Maybe} type constructor from Haskell:
-
-@racketmod[
-typed/racket
-(struct: None ())
-(struct: (a) Some ([v : a]))
-
-(define-type (Opt a) (U None (Some a)))
-
-(: find (-> Number (Listof Number) (Opt Number)))
-(define (find v l)
-  (cond [(null? l) (None)]
-        [(= v (car l)) (Some v)]
-        [else (find v (cdr l))]))
-]
-
-The first @racket[struct:] defines @racket[None] to be
-a structure with no contents.
-
-The second definition
-
-@racketblock[
-(struct: (a) Some ([v : a]))
-]
-
-creates a parameterized type, @racket[Some], which is a structure with
-one element, whose type is that of the type argument to
-@racket[Some].  Here the type parameters (only one, @racket[a], in
-this case) are written before the type name, and can be referred to in
-the types of the fields.
-
-The type definiton
-@racketblock[
-  (define-type (Opt a) (U None (Some a)))
-]
-creates a parameterized type --- @racket[Opt] is a potential
-container for whatever type is supplied.
-
-The @racket[find] function takes a number @racket[v] and list, and
-produces @racket[(Some v)] when the number is found in the list,
-and @racket[(None)] otherwise.  Therefore, it produces a
-@racket[(Opt Number)], just as the annotation specified.
-
-@subsection{Polymorphic Functions}
-
-Sometimes functions over polymorphic data structures only concern
-themselves with the form of the structure.  For example, one might
-write a function that takes the length of a list of numbers:
-
-@racketmod[
-typed/racket
-(: list-number-length (-> (Listof Number) Integer))
-(define (list-number-length l)
-  (if (null? l)
-      0
-      (add1 (list-number-length (cdr l)))))]
-
-and also a function that takes the length of a list of strings:
-
-@racketmod[
-typed/racket
-(: list-string-length (-> (Listof String) Integer))
-(define (list-string-length l)
-  (if (null? l)
-      0
-      (add1 (list-string-length (cdr l)))))]
-
-Notice that both of these functions have almost exactly the same
-definition; the only difference is the name of the function.  This
-is because neither function uses the type of the elements in the
-definition.
-
-We can abstract over the type of the element as follows:
-
-@racketmod[
-typed/racket
-(: list-length (All (A) (-> (Listof A) Integer)))
-(define (list-length l)
-  (if (null? l)
-      0
-      (add1 (list-length (cdr l)))))]
-
-The new type constructor @racket[All] takes a list of type
-variables and a body type.  The type variables are allowed to
-appear free in the body of the @racket[All] form.
-
-@subsection{Lexically Scoped Type Variables}
-
-When the @racket[:] type annotation form includes type variables
-for @tech{parametric polymorphism},
-the type variables are @emph{lexically scoped}.
-In other words, the type variables are bound in the body of the
-definition that you annotate.
-
-For example, the following definition of @racket[_my-id] uses
-the type variable @racket[_a] to annotate the argument
-@racket[_x]:
-
-@racketblock[
-(: my-id (All (a) (-> a a)))
-(define my-id (lambda: ([x : a]) x))
-]
-
-Lexical scope also implies that type variables can be shadowed,
-such as in the following example:
-
-@racketblock[
-(: my-id (All (a) (-> a a)))
-(define my-id
-  (lambda: ([x : a])
-    (: helper (All (a) (-> a a)))
-    (define helper
-      (lambda: ([y : a]) y))
-    (helper x)))
-]
-
-The reference to @racket[_a] inside the inner @racket[lambda:]
-refers to the type variable in @racket[_helper]'s annotation.
-That @racket[_a] is @emph{not} the same as the @racket[_a]
-in the annotation of the outer @racket[lambda:] expression.
-
-
-@(close-eval the-eval)
-
-@include-section["varargs.scrbl"]
-
-@;@section{Refinement Types}
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/varargs.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/varargs.scrbl
deleted file mode 100644
index 03aea707e3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/guide/varargs.scrbl
+++ /dev/null
@@ -1,115 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt" (for-label typed/racket/base))]
-
-@title[#:tag "varargs"]{Variable-Arity Functions: Programming with Rest Arguments}
-
-Typed Racket can handle some uses of rest arguments.
-
-@section{Uniform Variable-Arity Functions}
-
-In Racket, one can write a function that takes an arbitrary
-number of arguments as follows:
-
-@racketmod[
-racket
-(define (sum . xs)
-  (if (null? xs)
-      0
-      (+ (car xs) (apply sum (cdr xs)))))
-
-(sum)
-(sum 1 2 3 4)
-(sum 1 3)]
-
-The arguments to the function that are in excess to the
-non-rest arguments are converted to a list which is assigned
-to the rest parameter.  So the examples above evaluate to
-@racketresult[0], @racketresult[10], and @racketresult[4].
-
-We can define such functions in Typed Racket as well:
-
-@racketmod[
-typed/racket
-(: sum (-> Number * Number))
-(define (sum . xs)
-  (if (null? xs)
-      0
-      (+ (car xs) (apply sum (cdr xs)))))]
-
-This type can be assigned to the function when each element
-of the rest parameter is used at the same type.
-
-@section{Non-Uniform Variable-Arity Functions}
-
-However, the rest argument may be used as a heterogeneous list.
-Take this (simplified) definition of the R6RS function @tt{fold-left}:
-@; the above is not a link to avoid a dependency on the r6rs package
-
-@racketmod[
-racket
-(define (fold-left f i as . bss)
-  (if (or (null? as)
-          (ormap null? bss))
-      i
-      (apply fold-left
-             f
-             (apply f i (car as) (map car bss))
-             (cdr as)
-             (map cdr bss))))
-
-(fold-left + 0 (list 1 2 3 4) (list 5 6 7 8))
-(fold-left + 0 (list 1 2 3) (list 2 3 4) (list 3 4 5) (list 4 5 6))
-(fold-left (λ (i v n s) (string-append i (vector-ref v n) s))
-           ""
-           (list (vector "A cat" "A dog" "A mouse")
-                 (vector "tuna" "steak" "cheese"))
-           (list 0 2)
-           (list " does not eat " "."))]
-
-Here the different lists that make up the rest argument @racket[bss]
-can be of different types, but the type of each list in @racket[bss]
-corresponds to the type of the corresponding argument of @racket[f].
-We also know that, in order to avoid arity errors, the length of
-@racket[bss] must be two less than the arity of @racket[f].
-The first argument to @racket[f] is the accumulator,
-and @racket[as] corresponds to the second argument of @racket[f].
-
-The example uses of @racket[fold-left] evaluate to @racketresult[36],
-@racketresult[42], and @racketresult["A cat does not eat cheese."].
-
-In Typed Racket, we can define @racket[fold-left] as follows:
-
-@racketmod[
-typed/racket
-(: fold-left
-   (All (C A B ...)
-        (-> (-> C A B ... B C) C (Listof A) (Listof B) ... B
-            C)))
-(define (fold-left f i as . bss)
-  (if (or (null? as)
-          (ormap null? bss))
-      i
-      (apply fold-left
-             f
-             (apply f i (car as) (map car bss))
-             (cdr as)
-             (map cdr bss))))]
-
-Note that the type variable @racket[B] is followed by an
-ellipsis.  This denotes that B is a dotted type variable
-which corresponds to a list of types, much as a rest
-argument corresponds to a list of values.  When the type
-of @racket[fold-left] is instantiated at a list of types, then
-each type @racket[t] which is bound by @racket[B] (notated by
-the dotted pre-type @racket[t ... B]) is expanded to a number
-of copies of @racket[t] equal to the length of the sequence
-assigned to @racket[B].  Then @racket[B] in each copy is
-replaced with the corresponding type from the sequence.
-
-So the type of @racket[(inst fold-left Integer Boolean String Number)]
-is
-
-@racket[(-> (-> Integer Boolean String Number Integer)
-            Integer (Listof Boolean) (Listof String) (Listof Number)
-            Integer)].
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/internals.txt b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/internals.txt
deleted file mode 100644
index 380ad9e7fe..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/internals.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Data Structures used in Typechecking.
-The main data structure used in typechecking is a tc-results/c.
-This currently has two variants
-(struct/c tc-results ((listof (struct/c tc-result (Type/c FilterSet? Object?)))
-                      (or/c #f (cons/c Type/c symbol?))))
-(struct/c tc-any-results (or/c Filter/c NoFilter?))
-
-The first represents a fixed number of values with optional dotted return values.
-The second represents an unknown number of values.
-
-A value has three main parts: a Type, a FilterSet, and an Object. For dotted values we do no store a 
-FilterSet or an Object because they would almost never be useful. They are thus implicitly -top-filter
-and -empty-obj. In the tc-any-results case since we don't know the number of values, we do not store
-the Type or the Object, but we do store a filter. This is useful in cases like
-(let ((x (read)))
-  (unless (number? x) (error 'bad-input))
-  (do-stuff x))
-
-
-Inference and Sequences
-Typed racket has many types which can have a subpart which is a sequence of different types, for
-example heterogenous lists or arguments to a function. We assume such sequences take one of three forms.
-A fixed prefix followed by either a dotted tail, a uniform tail, or no more types. The subtyping
-relationship has 9 different cases corresponding to the product of the cases. This is implemented once
-for a generic sequence, and each other type converts itself to a sequence to implement inference.
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/compatibility-languages.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/compatibility-languages.scrbl
deleted file mode 100644
index d8969825a1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/compatibility-languages.scrbl
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt")
-       (require (for-label (only-meta-in 0 [except-in typed/scheme for])))]
-
-@title{Compatibility Languages}
-
-@(defmodulelang*/no-declare (typed/scheme typed/scheme/base typed-scheme))
-Typed versions of the @racketmod[scheme] and @racketmod[scheme/base]
-languages. The @racketmod[typed-scheme] language is equivalent to the
-@racketmod[typed/scheme/base] language.
-
-@(declare-exporting typed/scheme/base typed/scheme typed-scheme
-                    #:use-sources
-                    (typed-racket/typed-racket
-                     typed-racket/base-env/prims
-                     typed-racket/base-env/extra-procs
-                     typed-racket/base-env/base-types
-                     typed-racket/base-env/base-types-extra))
-
-@(define-syntax-rule (def-racket rts rt)
-  (begin
-    (require (for-label (only-in typed/racket/base require-typed-struct require/typed)))
-    (define rts (racket require-typed-struct))
-    (define rt (racket require/typed))))
-@(def-racket rts-id rt-id)
-
-
-@defform/subs[#:literals (struct opaque)
-(require/typed m rt-clause ...)
-([rt-clause [r t]
-            [struct name ([f : t] ...)
-                 struct-option ...]
-            [struct (name parent) ([f : t] ...)
-                 struct-option ...]
-            [opaque t pred]]
- [struct-option
-   (code:line #:constructor-name constructor-id)
-   (code:line #:extra-constructor-name constructor-id)])]{
- Similar to @|rt-id|, but as if @racket[#:extra-constructor-name make-name] was supplied.
-}
-
-@defidform[require-typed-struct]{Similar to using the @racket[struct]
-keyword with @racket[require/typed].}
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/experimental.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/experimental.scrbl
deleted file mode 100644
index fda49f8fd4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/experimental.scrbl
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt")
-       (require (for-label (only-meta-in 0 [except-in typed/racket for])))]
-
-@title{Experimental Features}
-
-These features are currently experimental and subject to change.
-
-@defform[(declare-refinement id)]{Declares @racket[id] to be usable in
-refinement types.}
-
-@defform[(Refinement id)]{Includes values that have been tested with the
-predicate @racket[id], which must have been specified with
-@racket[declare-refinement].}
-
-@defform[(define-typed-struct/exec forms ...)]{Defines an executable structure.}
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/exploring-types.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/exploring-types.scrbl
deleted file mode 100644
index 0fd13910ca..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/exploring-types.scrbl
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt")
-       (require scribble/eval)
-       (require (for-label (only-meta-in 0 [except-in typed/racket for])))]
-
-@(define the-top-eval (make-base-eval))
-@(the-top-eval '(require (except-in typed/racket #%module-begin)))
-
-@title{Exploring Types}
-
-In addition to printing a summary of the types of REPL results, Typed Racket
-provides interactive utilities to explore and query types.
-The following bindings are only available at the Typed Racket REPL.
-
-@defform[(:type maybe-verbose t)
-         #:grammar ([maybe-verbose (code:line)
-                                   (code:line #:verbose)])]{
-  Prints the type @racket[_t]. If @racket[_t] is a type alias
-  (e.g., @racket[Number]), then it will be expanded to its representation
-  when printing. Any further type aliases in the type named by @racket[_t]
-  will remain unexpanded.
-
-  If @racket[#:verbose] is provided, all type aliases are expanded
-  in the printed type.
-
-  @examples[#:eval the-top-eval
-    ;; I'm not sure why, but the :type examples below don't work
-    ;; without the #%top-interaction in the first example
-    (eval:alts (:type Number) (#%top-interaction . (:type Number)))
-    (:type Real)
-    (:type #:verbose Number)
-  ]
-}
-
-@defform[(:print-type e)]{Prints the type of @racket[_e]. This prints the whole
-type, which can sometimes be quite large.
-
-@examples[#:eval the-top-eval
-  (:print-type (+ 1 2))
-  (:print-type map)
-]
-}
-
-@defform[(:query-type/args f t ...)]{Given a function @racket[f] and argument
-types @racket[t], shows the result type of @racket[f].
-
-@examples[#:eval the-top-eval
-  (:query-type/args + Integer Number)
-]
-}
-
-@defform[(:query-type/result f t)]{Given a function @racket[f] and a desired
-return type @racket[t], shows the arguments types @racket[f] should be given to
-return a value of type @racket[t].
-
-@examples[#:eval the-top-eval
-  (:query-type/result + Integer)
-  (:query-type/result + Float)
-]
-}
-
-@close-eval[the-top-eval]
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/legacy.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/legacy.scrbl
deleted file mode 100644
index ec32ea95ed..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/legacy.scrbl
+++ /dev/null
@@ -1,190 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt")
-       (require scribble/eval
-                (for-label (only-meta-in 0 [except-in typed/racket for])))]
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require (except-in typed/racket #%top-interaction #%module-begin)))
-@(define the-top-eval (make-base-eval))
-@(the-top-eval '(require (except-in typed/racket #%module-begin)))
-
-@(define-syntax-rule (ex . args)
-   (examples #:eval the-top-eval . args))
-
-@title{Legacy Forms}
-
-The following forms are provided by Typed Racket for backwards
-compatibility.
-
-@defform/subs[(lambda: formals . body)
-              ([formals ([v : t] ...)
-                        ([v : t] ... v : t *)
-                        ([v : t] ... v : t ooo bound)])]{
-A function of the formal arguments @racket[v], where each formal
-argument has the associated type.  If a rest argument is present, then
-it has type @racket[(Listof t)].}
-
-@defform[(λ: formals . body)]{
-An alias for the same form using @racket[lambda:].}
-
-@defform*[[(plambda: (a ...) formals . body)
-           (plambda: (a ... b ooo) formals . body)]]{
-A polymorphic function, abstracted over the type variables
-@racket[a]. The type variables @racket[a] are bound in both the types
-of the formal, and in any type expressions in the @racket[body].}
-
-@defform/subs[(opt-lambda: formals . body)
-([formals ([v : t] ... [v : t default] ...)
-          ([v : t] ... [v : t default] ... v : t *)
-          ([v : t] ... [v : t default] ... v : t ooo bound)])]{
-A function with optional arguments.}
-
-@defform*[[(popt-lambda: (a ...) formals . body)
-           (popt-lambda: (a ... a ooo) formals . body)]]{
-A polymorphic function with optional arguments.}
-
-@defalias[case-lambda: case-lambda]
-
-@defform*[[(pcase-lambda: (a ...) [formals body] ...)
-           (pcase-lambda: (a ... b ooo) [formals body] ...)]]{
-A polymorphic function of multiple arities.}
-
-@defform*[[
-  (let: ([v : t e] ...) . body)
-  (let: loop : t0 ([v : t e] ...) . body)]]{
-Local bindings, like @racket[let], each with
-associated types.  In the second form, @racket[_t0] is the type of the
-result of @racket[_loop] (and thus the result of the entire
-                              expression as well as the final
-                                expression in @racket[body]).
-                                Type annotations are optional.
-@ex[(: filter-even : (Listof Natural) (Listof Natural) -> (Listof Natural))
-    (define (filter-even lst accum)
-      (if (null? lst)
-          accum
-          (let: ([first : Natural (car lst)]
-                 [rest  : (Listof Natural) (cdr lst)])
-                (if (even? first)
-                    (filter-even rest (cons first accum))
-                    (filter-even rest accum)))))
-    (filter-even (list 1 2 3 4 5 6) null)]
-
-@ex[(: filter-even-loop : (Listof Natural) -> (Listof Natural))
-    (define (filter-even-loop lst)
-      (let: loop : (Listof Natural)
-            ([accum : (Listof Natural) null]
-             [lst   : (Listof Natural) lst])
-            (cond
-              [(null? lst)       accum]
-              [(even? (car lst)) (loop (cons (car lst) accum) (cdr lst))]
-              [else              (loop accum (cdr lst))])))
-    (filter-even-loop (list 1 2 3 4))]}
-@defform[(plet: (a ...) ([v : t e] ...) . body)]{
-A polymorphic version of @racket[let:], abstracted over the type variables
-@racket[a]. The type variables @racket[a] are bound in both the types
-of the formal, and in any type expressions in the @racket[body].
-Does not support the looping form of let.}
-
-@deftogether[[
-@defform[(letrec: ([v : t e] ...) . body)]
-@defform[(let*: ([v : t e] ...) . body)]
-@defform[(let-values: ([([v : t] ...) e] ...) . body)]
-@defform[(letrec-values: ([([v : t] ...) e] ...) . body)]
-@defform[(let*-values: ([([v : t] ...) e] ...) . body)]]]{
-Type-annotated versions of
-@racket[letrec], @racket[let*], @racket[let-values],
-@racket[letrec-values], and @racket[let*-values]. As with
-@racket[let:], type annotations are optional.}
-
-@deftogether[[
-@defform[(let/cc: v : t . body)]
-@defform[(let/ec: v : t . body)]]]{
-Type-annotated versions of @racket[let/cc] and @racket[let/ec].
-As with @racket[let:], the type annotation is optional.
-}
-
-@defform*[[(define: v : t e)
-           (define: (a ...) v : t e)
-           (define: (a ... a ooo) v : t e)
-           (define: (f . formals) : t . body)
-           (define: (a ...) (f . formals) : t . body)
-           (define: (a ... a ooo) (f . formals) : t . body)]]{
-These forms define variables, with annotated types.  The first form
-defines @racket[v] with type @racket[t] and value @racket[e]. The second
-form does the same, but allows the specification of type variables. The third
-allows for polydotted variables. The fourth, fifth, and sixth forms define a
-function @racket[f] with appropriate types. In most cases, use of @racket[:] is
-preferred to use of @racket[define:].
-
-@ex[(define: foo : Integer 10)
-
-    (define: (A) mt-seq : (Sequenceof A) empty-sequence)
-
-    (define: (add [first : Integer]
-                  [rest  : Integer]) : Integer
-      (+ first rest))
-
-    (define: (A) (poly-app [func : (A A -> A)]
-                           [first : A]
-                           [rest  : A]) : A
-      (func first rest))]
-}
-
-@defalias[struct: struct]
-@defalias[define-struct: define-struct]
-@defalias[define-struct/exec: define-struct/exec]
-
-@defalias[for: for]
-@deftogether[(@defidform[for*/and:]
-              @defidform[for*/first:]
-              @defidform[for*/flvector:]
-              @defidform[for*/extflvector:]
-              @defidform[for*/fold:]
-              @defidform[for*/hash:]
-              @defidform[for*/hasheq:]
-              @defidform[for*/hasheqv:]
-              @defidform[for*/last:]
-              @defidform[for*/list:]
-              @defidform[for*/lists:]
-              @defidform[for*/or:]
-              @defidform[for*/product:]
-              @defidform[for*/sum:]
-              @defidform[for*/vector:]
-              @defidform[for*:]
-              @defidform[for/and:]
-              @defidform[for/first:]
-              @defidform[for/flvector:]
-              @defidform[for/extflvector:]
-              @defidform[for/fold:]
-              @defidform[for/hash:]
-              @defidform[for/hasheq:]
-              @defidform[for/hasheqv:]
-              @defidform[for/last:]
-              @defidform[for/list:]
-              @defidform[for/lists:]
-              @defidform[for/or:]
-              @defidform[for/product:]
-              @defidform[for/sum:]
-              @defidform[for/vector:])]{
- Aliases for the same iteration forms without a @racket[_:].
-}
-@defalias[do: do]
-
-@defidform[define-type-alias]{Equivalent to @racket[define-type].}
-@defidform[define-typed-struct]{Equivalent to @racket[define-struct:]}
-@defidform[require/opaque-type]{Similar to using the @racket[opaque]
-keyword with @racket[require/typed].}
-@defidform[require-typed-struct]{Similar to using the @racket[struct]
-keyword with @racket[require/typed].}
-@defidform[require-typed-struct/provide]{Similar to
-@racket[require-typed-struct], but also provides the imported identifiers.}
-@defidform[pdefine:]{Defines a polymorphic function.}
-@defform[(pred t)]{Equivalent to @racket[(Any -> Boolean : t)].}
-
-@defalias[Un U]
-@defalias[mu Rec]
-@defalias[Tuple List]
-@defalias[Parameter Parameterof]
-@defalias[Pair Pairof]
-@defalias[values Values]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/libraries.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/libraries.scrbl
deleted file mode 100644
index 3a023b86c0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/libraries.scrbl
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt")
-       (require (for-label (only-meta-in 0 [except-in typed/racket for])
-                           (only-in racket/base for)
-                           racket/list net/url
-                           version/check))]
-
-
-@title{Libraries Provided With Typed Racket}
-
-The @racketmodname[typed/racket] language corresponds to the
-@racketmodname[racket] language---that is, any identifier provided
-by @racketmodname[racket], such as @racket[modulo] is available by default in
-@racketmodname[typed/racket].
-
-@racketmod[typed/racket
-(modulo 12 2)
-]
-
-The @racketmodname[typed/racket/base] language corresponds to the
-@racketmodname[racket/base] language.
-
-Some libraries have counterparts in the @racketidfont{typed}
-collection, which provide the same exports as the untyped versions.
-Such libraries include @racketmodname[srfi/14 #:indirect],
-@racketmodname[net/url], and many others.
-
-@racketmod[typed/racket
-(require typed/srfi/14)
-(char-set= (string->char-set "hello")
-           (string->char-set "olleh"))
-]
-
-Other libraries can be used with Typed Racket via
-@racket[require/typed].
-
-@racketmod[typed/racket
-(require/typed version/check
-               [check-version (-> (U Symbol (Listof Any)))])
-(check-version)
-]
-
-The following libraries are included with Typed Racket in the
-@racketfont{typed} collection:
-
-@(define-syntax-rule @defmodule/incl[name]
-   @defmodule[name #:no-declare])
-
-@;; framework and mred left out until support for classes
-@;; is more complete
-@defmodule/incl[typed/file]
-@defmodule/incl[typed/net/base64]
-@defmodule/incl[typed/net/cgi]
-@defmodule/incl[typed/net/cookie]
-@defmodule/incl[typed/net/dns]
-@defmodule/incl[typed/net/ftp]
-@defmodule/incl[typed/net/gifwrite]
-@defmodule/incl[typed/net/head]
-@defmodule/incl[typed/net/http-client]
-@defmodule/incl[typed/net/imap]
-@defmodule/incl[typed/net/mime]
-@defmodule/incl[typed/net/nntp]
-@defmodule/incl[typed/net/pop3]
-@defmodule/incl[typed/net/qp]
-@defmodule/incl[typed/net/sendmail]
-@defmodule/incl[typed/net/sendurl]
-@defmodule/incl[typed/net/smtp]
-@defmodule/incl[typed/net/uri-codec]
-@defmodule/incl[typed/net/url]
-@defmodule/incl[typed/openssl]
-@defmodule/incl[typed/openssl/md5]
-@defmodule/incl[typed/openssl/sha1]
-@defmodule/incl[typed/pict]
-@defmodule[typed/racket/async-channel @history[#:added "1.1"]]
-@defmodule/incl[typed/racket/date]
-@defmodule/incl[typed/racket/system]
-@defmodule/incl[typed/rackunit]
-@defmodule/incl[typed/srfi/14]
-@defmodule/incl[typed/syntax/stx]
-
-Other libraries included in the main distribution that are either
-written in Typed Racket or have adapter modules that are typed:
-
-@(define-syntax-rule @defmodule/also[name]
-   @defmodule[name #:no-declare #:link-target? #f #:indirect])
-
-@defmodule/also[math]
-@defmodule/also[plot/typed]
-
-@section{Porting Untyped Modules to Typed Racket}
-
-To adapt a Racket library not included with Typed Racket, the
-following steps are required:
-
-@itemlist[
-  @item{Determine the data manipulated by the library, and how it will
-  be represented in Typed Racket.}
-  @item{Specify that data in Typed Racket, using @racket[require/typed]
-  and @racket[#:opaque] and/or @racket[#:struct].}
-  @item{Use the data types to import the various functions and constants
-  of the library.}
-  @item{Provide all the relevant identifiers from the new adapter module.}
-]
-
-For example, the following module adapts the untyped
-@racketmodname[racket/bool] library:
-
-@racketmod[typed/racket
-  (require/typed racket/bool
-                 [true Boolean]
-                 [false Boolean]
-                 [symbol=? (Symbol Symbol -> Boolean)]
-                 [boolean=? (Boolean Boolean -> Boolean)]
-                 [false? (Any -> Boolean)])
-  (provide true false symbol=? boolean=? false?)
-]
-
-More substantial examples are available in the @racketfont{typed}
-collection.
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/no-check.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/no-check.scrbl
deleted file mode 100644
index d8dff2e696..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/no-check.scrbl
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt")
-       (require (for-label (only-meta-in 0 [except-in typed/racket for])))]
-
-@title{Typed Racket Syntax Without Type Checking}
-
-@defmodulelang*[(typed/racket/no-check
-                 typed/racket/base/no-check)]
-
-On occasions where the Typed Racket syntax is useful, but actual
-typechecking is not desired, the @racketmodname[typed/racket/no-check]
-and @racketmodname[typed/racket/base/no-check] languages are useful.
-They provide the same bindings and syntax as
-@racketmodname[typed/racket] and @racketmodname[typed/racket/base],
-but do no type checking.
-
-Examples:
-
-@racketmod[typed/racket/no-check
-(: x Number)
-(define x "not-a-number")]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/numeric-tower-pict.rkt b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/numeric-tower-pict.rkt
deleted file mode 100644
index 8bdeb93d6d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/numeric-tower-pict.rkt
+++ /dev/null
@@ -1,121 +0,0 @@
-#lang racket/base
-
-;; This module provides a pict version of the Typed Racket numeric type
-;; hierarchy diagram from "Typing the Numeric Tower" (pg 5) from PADL 2012
-
-(require pict)
-
-(provide numeric-tower-pict
-         integer-pict)
-
-;; large type category heading
-(define (text/1 str)
-  (text str null 20))
-
-;; small type category
-(define (text/2 str)
-  (text str null 15))
-
-(define base-complex
-  (linewidth
-   2
-   (cc-superimpose
-    (colorize (filled-rectangle 560 350) "white")
-    (rectangle 560 350)
-    (ellipse 510 280)
-    (vline 1 350))))
-
-(define left-side
-  (ct-superimpose
-   (cc-superimpose
-    (ghost (rectangle 270 350))
-    (hc-append (blank 30 1)
-               (cb-superimpose (linewidth 2 (ellipse 140 110))
-                               (vc-append (text/1 "Integer")
-                                          (blank 1 10))))
-    (hc-append (blank 25 1)
-               (linewidth 2 (linestyle 'dot (hline 250 2))))
-    (hc-append (blank 30 1)
-               (cc-superimpose (colorize (filled-ellipse 50 35) "white")
-                               (linewidth 2 (linestyle 'dot (ellipse 50 35)))
-                               (text/2 "Zero"))))
-   (vc-append (blank 1 7) (text/1 "Exact-Number"))
-   (vr-append (blank 265 70)
-              ;; this doesn't line up without the blank for
-              ;; some reason (due to text formatting)
-              ;(hc-append (text/1 "Exact-Rational") (blank 7 1))
-              (text/1 "Exact-Rational")
-              (text/2 "Positive-Exact-Rational")
-              (blank 1 130)
-              (text/2 "Negative-Exact-Rational"))))
-
-(define right-side
-  (ct-superimpose
-   (cc-superimpose
-    (ghost (rectangle 270 350))
-    (hc-append (linewidth 2 (linestyle 'dot (hline 260 2)))
-               (blank 25 1))
-    (hc-append (cc-superimpose (colorize (filled-ellipse 100 35) "white")
-                               (linewidth 2 (linestyle 'dot (ellipse 100 35)))
-                               (text/2 "Float-Zero"))
-               (blank 30 1)))
-   (vc-append (blank 1 7) (text/1 "Float-Complex"))
-   (vl-append (blank 245 70)
-              (text/1 "Float")
-              (text/2 "Positive-Float")
-              (blank 1 130)
-              (text/2 "Negative-Float"))))
-
-(define *integer-pict
-  (ct-superimpose
-   (linewidth
-    2
-    (cc-superimpose
-     (cc-superimpose
-      (colorize (filled-rectangle 200 350) "white")
-      (rectangle 200 350))
-     (rectangle 170 280)
-     (ct-superimpose (ghost (rectangle 140 210))
-                     (inset/clip (linewidth 3 (rectangle 140 210)) 0 0 0 -105))
-     (ct-superimpose (ghost (rectangle 110 140))
-                     (inset/clip (linewidth 3 (rectangle 110 140)) 0 0 0 -70))
-     (hline 200 2)
-     (cc-superimpose
-      (colorize (filled-ellipse 50 30) "white")
-      (ellipse 50 30)
-      (text/2 "Zero"))))
-   (vc-append (blank 1 7)
-              (text/2 "Positive-Integer")
-              (blank 1 20)
-              (text/2 "Positive-Fixnum")
-              (blank 1 20)
-              (text/2 "Positive-Index")
-              (blank 1 20)
-              (text/2 "Positive-Byte")
-              (blank 1 100)
-              (text/2 "Negative-Fixnum")
-              (blank 1 70)
-              (text/2 "Negative-Integer"))))
-
-(define complex-pict
-  (rc-superimpose
-   (lc-superimpose
-    base-complex
-    left-side)
-   right-side))
-
-(define numeric-tower-pict
-  ;; inset to avoid clipping a border
-  (inset (ht-append
-          30
-          (vc-append
-           10
-           (vl-append
-            10
-            (text/1 "Complex / Number")
-            complex-pict)
-           (text/1 "Exact-Rational ∪ Float = Real")))
-         1))
-
-(define integer-pict
-  (inset (vl-append 10 (text/1 "Integer") *integer-pict) 1))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/optimization.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/optimization.scrbl
deleted file mode 100644
index 7a3c0429ee..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/optimization.scrbl
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt" scriblib/footnote)
-       (require (for-label (only-meta-in 0 [except-in typed/racket for])))]
-
-@title{Optimization in Typed Racket}
-
-@note{
-See
-@secref[#:doc '(lib "typed-racket/scribblings/ts-guide.scrbl")]{optimization}
-in the guide for tips to get the most out of the optimizer.
-}
-
-Typed Racket provides a type-driven optimizer that rewrites well-typed
-programs to potentially make them faster. It should in no way make
-your programs slower or unsafe.
-
-Typed Racket's optimizer is turned on by default. If you want to
-deactivate it (for debugging, for instance), you must add the
-@racket[#:no-optimize] keyword when specifying the language of your
-program:
-
-@racketmod[typed/racket #:no-optimize]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/special-forms.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/special-forms.scrbl
deleted file mode 100644
index a9c384e7cb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/special-forms.scrbl
+++ /dev/null
@@ -1,669 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt" scribble/eval racket/sandbox)
-       (require (for-label (only-meta-in 0 [except-in typed/racket])
-                           (only-in racket/base)))]
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require (except-in typed/racket #%top-interaction #%module-begin)))
-@(define the-top-eval (make-base-eval))
-@(the-top-eval '(require (except-in typed/racket #%module-begin)))
-
-@(define-syntax-rule (ex . args)
-   (examples #:eval the-top-eval . args))
-
-
-@(module def-racket racket/base
-   (require (for-label racket/base) scribble/manual)
-
-   (define for-id (racket for))
-   (define for*-id (racket for*))
-   (define mod-beg-id (racket #%module-begin))
-   (define with-handlers-id (racket with-handlers))
-   (define default-continuation-prompt-tag-id
-     (racket default-continuation-prompt-tag))
-   (define lambda-id (racket lambda))
-   (define λ-id (racket λ))
-   (define let-id (racket let))
-   (define letrec-id (racket letrec))
-   (define let*-id (racket let*))
-   (define let-values-id (racket let-values))
-   (define letrec-values-id (racket letrec-values))
-   (define let*-values-id (racket let*-values))
-   (define let/cc-id (racket let/cc))
-   (define let/ec-id (racket let/ec))
-   (define define-id (racket define))
-   (define do-id (racket do))
-   (define struct-id (racket struct))
-   (define define-struct-id (racket define-struct))
-
-   (provide (all-defined-out)))
-
-@(require 'def-racket)
-
-@title[#:tag "special-forms"]{Special Form Reference}
-
-Typed Racket provides a variety of special forms above and beyond
-those in Racket.  They are used for annotating variables with types,
-creating new types, and annotating expressions.
-
-@section{Binding Forms}
-
-@racket[_loop], @racket[_f], @racket[_a], and @racket[_var] are names,
-@racket[_type] is a type.
-@racket[_e] is an expression and @racket[_body] is a block.
-
-@defform*[[(let maybe-tvars (binding ...) . body)
-           (let loop maybe-ret (binding ...) . body)]
-          #:grammar
-          ([binding [var e]
-                    [var : type e]]
-           [maybe-tvars (code:line)
-                        (code:line #:forall (tvar ...))
-                        (code:line #:∀ (tvar ...))]
-           [maybe-ret (code:line)
-                      (code:line : type0)])]{
-Local bindings, like @|let-id|, each with
-associated types.  In the second form, @racket[_type0] is the type of the
-result of @racket[_loop] (and thus the result of the entire
-expression as well as the final expression in @racket[body]).
-Type annotations are optional.
-
-@ex[(: filter-even : (-> (Listof Natural) (Listof Natural) (Listof Natural)))
-    (define (filter-even lst accum)
-      (if (null? lst)
-          accum
-          (let ([first : Natural (car lst)]
-                [rest  : (Listof Natural) (cdr lst)])
-                (if (even? first)
-                    (filter-even rest (cons first accum))
-                    (filter-even rest accum)))))
-    (filter-even (list 1 2 3 4 5 6) null)]
-
-@ex[(: filter-even-loop (-> (Listof Natural) (Listof Natural)))
-    (define (filter-even-loop lst)
-      (let loop : (Listof Natural)
-           ([accum : (Listof Natural) null]
-            [lst   : (Listof Natural) lst])
-           (cond
-             [(null? lst)       accum]
-             [(even? (car lst)) (loop (cons (car lst) accum) (cdr lst))]
-             [else              (loop accum (cdr lst))])))
-    (filter-even-loop (list 1 2 3 4))]
-
-If polymorphic type variables are provided, they are bound in the type
-expressions for variable bindings.
-
-@ex[(let #:forall (A) ([x : A 0]) x)]
-}
-
-@deftogether[[
-@defform[(letrec (binding ...) . body)]
-@defform[(let* (binding ...) . body)]
-@defform[(let-values ([(var+type ...) e] ...) . body)]
-@defform[(letrec-values ([(var+type ...) e] ...) . body)]
-@defform[(let*-values ([(var+type ...) e] ...) . body)]]]{
-
-Type-annotated versions of @|letrec-id|, @|let*-id|, @|let-values-id|,
-@|letrec-values-id|, and @|let*-values-id|. As with
-@racket[let], type annotations are optional.}
-
-@deftogether[[
-@defform[(let/cc v : t . body)]
-@defform[(let/ec v : t . body)]]]{
-  Type-annotated versions of @|let/cc-id| and @|let/ec-id|. As with
-  @racket[let], the type annotation is optional.
-}
-
-@section{Anonymous Functions}
-
-@defform[(lambda maybe-tvars formals maybe-ret . body)
-         #:grammar
-         ([formals (formal ...)
-                   (formal ... . rst)]
-          [formal var
-                  [var default-expr]
-                  [var : type]
-                  [var : type default-expr]
-                  (code:line keyword var)
-                  (code:line keyword [var : type])
-                  (code:line keyword [var : type default-expr])]
-          [rst var
-               [var : type *]
-               [var : type ooo bound]]
-          [maybe-tvars (code:line)
-                       (code:line #:forall (tvar ...))
-                       (code:line #:∀ (tvar ...))
-                       (code:line #:forall (tvar ... ooo))
-                       (code:line #:∀ (tvar ... ooo))]
-          [maybe-ret (code:line)
-                     (code:line : type)])]{
-
-Constructs an anonymous function like the @|lambda-id| form from
-@racketmodname[racket/base], but allows type annotations on the formal
-arguments. If a type annotation is left out, the formal will have
-the type @racket[Any].
-
-@ex[
-  (lambda ([x : String]) (string-append x "bar"))
-  (lambda (x [y : Integer]) (add1 y))
-  (lambda (x) x)
-]
-
-Type annotations may also be specified for keyword and optional arguments:
-
-@ex[
-  (lambda ([x : String "foo"]) (string-append x "bar"))
-  (lambda (#:x [x : String]) (string-append x "bar"))
-  (lambda (x #:y [y : Integer 0]) (add1 y))
-  (lambda ([x 'default]) x)
-]
-
-The @racket[lambda] expression may also specify polymorphic type variables
-that are bound for the type expressions in the formals.
-
-@ex[
-  (lambda #:forall (A) ([x : A]) x)
-  (lambda #:∀ (A) ([x : A]) x)
-]
-
-In addition, a type may optionally be specified for the @gtech{rest argument}
-with either a uniform type or using a polymorphic type. In the former case,
-the rest argument is given the type @racket[(Listof type)] where @racket[type]
-is the provided type annotation.
-
-@ex[
-  (lambda (x . rst) rst)
-  (lambda (x rst : Integer *) rst)
-  (lambda #:forall (A ...) (x rst : A ... A) rst)
-]
-}
-
-@defform[(λ formals . body)]{
-An alias for the same form using @racket[lambda].}
-
-@defform[(case-lambda maybe-tvars [formals body] ...)]{
-
-A function of multiple arities. The @racket[_formals] are identical
-to those accepted by the @racket[lambda] form except that keyword
-and optional arguments are not allowed.
-
-Polymorphic type variables, if provided, are bound in the type
-expressions in the formals.
-
-Note that each @racket[formals] must have a different arity.
-
-@ex[(define add-map
-      (case-lambda
-       [([lst : (Listof Integer)])
-        (map add1 lst)]
-       [([lst1 : (Listof Integer)]
-         [lst2 : (Listof Integer)])
-        (map + lst1 lst2)]))]
-
-To see how to declare a type for @racket[add-map], see the
-@racket[case->] type constructor.}
-
-@section{Loops}
-
-@defform/subs[(for type-ann-maybe (for-clause ...)
-                expr ...+)
-              ([type-ann-maybe code:blank
-                               @code:line[: u]]
-               [for-clause [id : t seq-expr]
-                           [(binding ...) seq-expr]
-                           [id seq-expr]
-                           @code:line[#:when guard]]
-               [binding id
-                        [id : t]])]{
-Like @|for-id| from @racketmodname[racket/base], but each @racket[id] has the associated type
-@racket[t]. Since the return type is always @racket[Void], annotating
-the return type of a @racket[for] form is optional.
-Type annotations in clauses are optional for all @racket[for]
-variants.
-}
-
-@deftogether[[
-@defform[(for/list type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/hash type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/hasheq type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/hasheqv type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/vector type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/flvector type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/extflvector type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/and type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/or   type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/first type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/last type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/sum type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for/product type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/list type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/hash type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/hasheq type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/hasheqv type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/vector type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/flvector type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/extflvector type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/and type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/or   type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/first type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/last type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/sum type-ann-maybe (for-clause ...) expr ...+)]
-@defform[(for*/product type-ann-maybe (for-clause ...) expr ...+)]
-]]{
-These behave like their non-annotated counterparts, with the exception
-that @racket[#:when] clauses can only appear as the last
-@racket[for-clause]. The return value of the entire form must be of
-type @racket[u]. For example, a @racket[for/list] form would be
-annotated with a @racket[Listof] type. All annotations are optional.
-}
-
-@deftogether[[
-@defform[(for/lists type-ann-maybe ([id : t] ...)
-           (for-clause ...)
-           expr ...+)]
-@defform[(for/fold  type-ann-maybe ([id : t init-expr] ...)
-           (for-clause ...)
-           expr ...+)]]]{
-These behave like their non-annotated counterparts. Unlike the above,
-@racket[#:when] clauses can be used freely with these.
-}
-
-@deftogether[[
-@defform[(for* void-ann-maybe (for-clause ...)
-           expr ...+)]
-@defform[(for*/lists type-ann-maybe ([id : t] ...)
-           (for-clause ...)
-           expr ...+)]
-@defform[(for*/fold  type-ann-maybe ([id : t init-expr] ...)
-           (for-clause ...)
-           expr ...+)]]]{
-These behave like their non-annotated counterparts.
-}
-
-@defform/subs[(do : u ([id : t init-expr step-expr-maybe] ...)
-                      (stop?-expr finish-expr ...)
-                expr ...+)
-              ([step-expr-maybe code:blank
-                                step-expr])]{
-Like @|do-id| from @racketmodname[racket/base], but each @racket[id] having the associated type @racket[t], and
-the final body @racket[expr] having the type @racket[u]. Type
-annotations are optional.
-}
-
-
-@section{Definitions}
-
-@defform*[[(define maybe-tvars v maybe-ann e)
-           (define maybe-tvars header maybe-ann . body)]
-          #:grammar
-          ([header (function-name . formals)
-                   (header . formals)]
-           [formals (formal ...)
-                    (formal ... . rst)]
-           [formal var
-                   [var default-expr]
-                   [var : type]
-                   [var : type default-expr]
-                   (code:line keyword var)
-                   (code:line keyword [var : type])
-                   (code:line keyword [var : type default-expr])]
-           [rst var
-                [var : type *]
-                [var : type ooo bound]]
-           [maybe-tvars (code:line)
-                        (code:line #:forall (tvar ...))
-                        (code:line #:∀ (tvar ...))
-                        (code:line #:forall (tvar ... ooo))
-                        (code:line #:∀ (tvar ... ooo))]
-           [maybe-ann (code:line)
-                      (code:line : type)])]{
-
-Like @|define-id| from @racketmodname[racket/base], but allows optional
-type annotations for the variables.
-
-The first form defines a variable @racket[v] to the result of evaluating
-the expression @racket[e]. The variable may have an optional type annotation.
-
-@ex[
-  (define foo "foo")
-  (define bar : Integer 10)
-]
-
-If polymorphic type variables are provided, then they are bound for use
-in the type annotation.
-
-@ex[
-  (define #:forall (A) mt-seq : (Sequenceof A) empty-sequence)
-]
-
-The second form allows the definition of functions with optional
-type annotations on any variables. If a return type annotation is
-provided, it is used to check the result of the function.
-
-Like @racket[lambda], optional and keyword arguments are supported.
-
-@ex[
-    (define (add [first : Integer]
-                 [rest  : Integer]) : Integer
-      (+ first rest))
-
-    (define #:forall (A)
-            (poly-app [func : (A A -> A)]
-                      [first : A]
-                      [rest  : A]) : A
-      (func first rest))]
-
-The function definition form also allows curried function arguments with
-corresponding type annotations.
-
-@ex[
-  (define ((addx [x : Number]) [y : Number]) (+ x y))
-  (define add2 (addx 2))
-  (add2 5)
-]
-
-Note that unlike @|define-id| from @racketmodname[racket/base], @racket[define]
-does not bind functions with keyword arguments to static information about
-those functions.
-}
-
-
-
-@section{Structure Definitions}
-@defform/subs[
-(struct maybe-type-vars name-spec ([f : t] ...) options ...)
-([maybe-type-vars code:blank (v ...)]
- [name-spec name (code:line name parent)]
- [options #:transparent #:mutable])]{
- Defines a @rtech{structure} with the name @racket[name], where the
- fields @racket[f] have types @racket[t], similar to the behavior of @|struct-id|
- from @racketmodname[racket/base].
-  When @racket[parent] is present, the
-structure is a substructure of @racket[parent].  When
-@racket[maybe-type-vars] is present, the structure is polymorphic in the type
- variables @racket[v]. If @racket[parent] is also a polymorphic struct, then
-there must be at least as many type variables as in the parent type, and the
-parent type is instantiated with a prefix of the type variables matching the
-amount it needs.
-
-Options provided have the same meaning as for the @|struct-id| form
-from @racketmodname[racket/base].}
-
-
-@defform/subs[
-(define-struct maybe-type-vars name-spec ([f : t] ...) options ...)
-([maybe-type-vars code:blank (v ...)]
- [name-spec name (name parent)]
- [options #:transparent #:mutable])]{Legacy version of @racket[struct],
-corresponding to @|define-struct-id| from @racketmodname[racket/base].}
-
-@defform/subs[
-(define-struct/exec name-spec ([f : t] ...) [e : proc-t])
-([name-spec name (name parent)])]{
- Like @racket[define-struct], but defines a procedural structure.
- The procdure @racket[e] is used as the value for @racket[prop:procedure], and must have type @racket[proc-t].}
-
-@section{Names for Types}
-@defform*[[(define-type name t maybe-omit-def)
-           (define-type (name v ...) t maybe-omit-def)]
-          #:grammar
-          [(maybe-omit-def (code:line #:omit-define-syntaxes) (code:line))]]{
-The first form defines @racket[name] as type, with the same meaning as
-@racket[t].  The second form is equivalent to
-@racket[(define-type name (All (v ...) t))].  Type names may
-refer to other types defined in the same or enclosing scopes.
-
-@ex[(define-type IntStr (U Integer String))
-    (define-type (ListofPairs A) (Listof (Pair A A)))]
-
-If @racket[#:omit-define-syntaxes] is specified, no definition of
-@racket[name] is created. In this case, some other definition of @racket[name]
-is necessary.
-
-If the body of the type definition refers to itself, then the
-type definition is recursive. Recursion may also occur mutually,
-if a type refers to a chain of other types that eventually refers
-back to itself.
-
-@ex[(define-type BT (U Number (Pair BT BT)))
-    (let ()
-      (define-type (Even A) (U Null (Pairof A (Odd A))))
-      (define-type (Odd A) (Pairof A (Even A)))
-      (: even-lst (Even Integer))
-      (define even-lst '(1 2))
-      even-lst)]
-
-However, the recursive reference may not occur immediately inside
-the type:
-
-@ex[(define-type Foo Foo)
-    (define-type Bar (U Bar False))]
-}
-
-@section{Generating Predicates Automatically}
-
-@defform[(make-predicate t)]{
-
-Evaluates to a predicate for the type @racket[t], with the type
-@racket[(Any -> Boolean : t)]. @racket[t] may not contain function types, or
-types that may refer to mutable data such as @racket[(Vectorof Integer)].} 
-
-@defform[(define-predicate name t)]{
-Equivalent to @racket[(define name (make-predicate t))].
-
-@section{Type Annotation and Instantiation}
-
-@defform*[((: v t)
-           (: v : t))]{
-This declares that @racket[v] has type @racket[t].
-The definition of @racket[v] must appear after this declaration.  This
-can be used anywhere a definition form may be used.
-@ex[(: var1 Integer)
-    (: var2 String)]
-
-The second form allows type annotations to elide one level of parentheses
-for function types.
-
-@ex[(: var3 : -> Integer)
-    (: var4 : String -> Integer)]
-}
-
-@defform[(provide: [v t] ...)]{This declares that the @racket[v]s have
-the types @racket[t], and also provides all of the @racket[v]s.}
-
-@defform/none[#{v : t}]{ This declares that the variable @racket[v] has type
-@racket[t].  This is legal only for binding occurrences of @racket[_v].}
-
-@defform[(ann e t)]{Ensure that @racket[e] has type @racket[t], or
-some subtype.  The entire expression has type @racket[t].
-This is legal only in expression contexts.}
-
-@defform/none[#{e :: t}]{A reader abbreviation for @racket[(ann e t)].}
-
-@defform[(cast e t)]{The entire expression has the type @racket[t], while
-@racket[e] may have any type. The value of the entire expression is the value
-returned by @racket[e], protected by a contract ensuring that it has type
-@racket[t]. This is legal only in expression contexts.
-
-@ex[(cast 3 Integer)
-(cast 3 String)
-(cast (lambda: ([x : Any]) x) (String -> String))
-]
-}
-
-@defform*[[(inst e t ...)
-           (inst e t ... t ooo bound)]]{
-Instantiate the type of @racket[e] with types @racket[t ...] or with the
-poly-dotted types @racket[t ... t ooo bound]. @racket[e] must
-have a polymorphic type that can be applied to the supplied number of type
-variables. This is legal only in expression contexts.
-@ex[(foldl (inst cons Integer Integer) null (list 1 2 3 4))
-
-    (: fold-list : (All (A) (Listof A) -> (Listof A)))
-    (define (fold-list lst)
-      (foldl (inst cons A A) null lst))
-
-    (fold-list (list "1" "2" "3" "4"))
-
-    (: my-values : (All (A B ...) (A B ... -> (values A B ... B))))
-    (define (my-values arg . args)
-      (apply (inst values A B ... B) arg args))]}
-
-@defform/none[#{e |@| t ...}]{
-A reader abbreviation for @racket[(inst e t ...)].}
-@defform/none[#{e |@| t ... t ooo bound}]{
-A reader abbreviation for @racket[(inst e t ... t ooo bound)].}
-
-@section{Require}
-
-Here, @racket[_m] is a module spec, @racket[_pred] is an identifier
-naming a predicate, and @racket[_maybe-renamed] is an
-optionally-renamed identifier.
-
-@defform/subs[#:literals (struct)
-(require/typed m rt-clause ...)
-([rt-clause [maybe-renamed t]
-            [#:struct name ([f : t] ...)
-                 struct-option ...]
-            [#:struct (name parent) ([f : t] ...)
-                 struct-option ...]
-            [#:opaque t pred]]
- [maybe-renamed id
-                (orig-id new-id)]
- [struct-option
-   (code:line #:constructor-name constructor-id)
-   (code:line #:extra-constructor-name constructor-id)])]
-This form requires identifiers from the module @racket[m], giving
-them the specified types.
-
-The first case requires @racket[_maybe-renamed], giving it type
-@racket[t].
-
-@index["struct"]{The second and third cases} require the struct with name @racket[name]
-with fields @racket[f ...], where each field has type @racket[t].  The
-third case allows a @racket[parent] structure type to be specified.
-The parent type must already be a structure type known to Typed
-Racket, either built-in or via @racket[require/typed].  The
-structure predicate has the appropriate Typed Racket filter type so
-that it may be used as a predicate in @racket[if] expressions in Typed
-Racket.
-
-
-@ex[(module UNTYPED racket/base
-      (define n 100)
-
-      (struct IntTree
-        (elem left right))
-
-      (provide n (struct-out IntTree)))
-
-    (module TYPED typed/racket
-      (require/typed 'UNTYPED
-                     [n Natural]
-                     [#:struct IntTree
-                       ([elem  : Integer]
-                        [left  : IntTree]
-                        [right : IntTree])]))]
-
-@index["opaque"]{The fourth case} defines a new type @racket[t].  @racket[pred], imported from
-module @racket[m], is a predicate for this type.  The type is defined
-as precisely those values to which @racket[pred] produces
-@racket[#t].  @racket[pred] must have type @racket[(Any -> Boolean)].
-Opaque types must be required lexically before they are used.
-
-@ex[(require/typed racket/base
-                   [#:opaque Evt evt?]
-                   [alarm-evt (Real -> Evt)]
-                   [sync (Evt -> Any)])
-    evt?
-    (sync (alarm-evt (+ 100 (current-inexact-milliseconds))))]
-
-In all cases, the identifiers are protected with @rtech{contracts} which
-enforce the specified types.  If this contract fails, the module
-@racket[m] is blamed.
-
-Some types, notably the types of predicates such as @racket[number?],
-cannot be converted to contracts and raise a static error when used in
-a @racket[require/typed] form. Here is an example of using
-@racket[case->] in @racket[require/typed].
-
-@(racketblock
-  (require/typed racket/base
-                 [file-or-directory-modify-seconds
-                  (case->
-                    [String -> Exact-Nonnegative-Integer]
-                    [String (Option Exact-Nonnegative-Integer)
-                            ->
-                            (U Exact-Nonnegative-Integer Void)]
-                    [String (Option Exact-Nonnegative-Integer) (-> Any)
-                            ->
-                            Any])]))
-
-@racket[file-or-directory-modify-seconds] has some arguments which are optional,
-so we need to use @racket[case->].}
-
-@defform[(require/typed/provide m rt-clause ...)]{
-Similar to @racket[require/typed], but also provides the imported identifiers.
-Uses outside of a module top-level raise an error.
-
-@ex[(module evts typed/racket
-      (require/typed/provide racket/base
-                             [#:opaque Evt evt?]
-                             [alarm-evt (Real -> Evt)]
-                             [sync (Evt -> Any)]))
-    (require 'evts)
-    (sync (alarm-evt (+ 100 (current-inexact-milliseconds))))]
-}
-
-@section{Other Forms}
-
-@defidform[with-handlers]{
-Identical to @|with-handlers-id| from @racketmodname[racket/base]
-but provides additional annotations to assist the typechecker.
-}
-
-@defproc[(default-continuation-prompt-tag) (-> (Prompt-Tagof Any (Any -> Any)))]{
-  Identical to @|default-continuation-prompt-tag-id|, but additionally protects
-  the resulting prompt tag with a contract that wraps
-  higher-order values, such as functions, that are communicated with that
-  prompt tag. If the wrapped value is used in untyped code, a contract error
-  will be raised.
-
-  @ex[
-    (module typed typed/racket
-      (provide do-abort)
-      (: do-abort (-> Void))
-      (define (do-abort)
-        (abort-current-continuation
-         (code:comment "typed, and thus contracted, prompt tag")
-         (default-continuation-prompt-tag)
-         (λ: ([x : Integer]) (+ 1 x)))))
-    (module untyped racket
-      (require 'typed)
-      (call-with-continuation-prompt
-        (λ () (do-abort))
-        (default-continuation-prompt-tag)
-        (code:comment "the function cannot be passed an argument")
-        (λ (f) (f 3))))
-    (require 'untyped)
-  ]
-}
-
-@defform[(#%module-begin form ...)]{
-
-Legal only in a @rtech{module begin context}.
-The @racket[#%module-begin] form of @racketmodname[typed/racket] checks all the
-forms in the module, using the Typed Racket type checking rules.  All
-@racket[provide] forms are rewritten to insert contracts where appropriate.
-Otherwise, the @racket[#%module-begin] form of @racketmodname[typed/racket]
-behaves like @|mod-beg-id| from @racketmodname[racket].}
-
-@defform[(#%top-interaction . form)]{
-
-Performs type checking of forms entered at the read-eval-print loop.  The
-@racket[#%top-interaction] form also prints the type of @racket[form] after
-type checking.}
-
-
-@(close-eval the-eval)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/typed-classes.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/typed-classes.scrbl
deleted file mode 100644
index 4f2ad7038e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/typed-classes.scrbl
+++ /dev/null
@@ -1,367 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt" scribble/eval racket/sandbox)
-       (require (for-label (only-meta-in 0 [except-in typed/racket for])))]
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require (except-in typed/racket #%top-interaction #%module-begin)))
-@(define the-top-eval (make-base-eval))
-@(the-top-eval '(require (except-in typed/racket #%module-begin)))
-
-@(define-syntax-rule (ex . args)
-   (examples #:eval the-top-eval . args))
-
-@title{Typed Classes}
-
-@bold{Warning}: the features described in this section are experimental
-and may not work correctly. Some of the features will change by
-the next release. In particular, typed-untyped interaction for classes
-will not be backwards compatible so do not rely on the current semantics.
-
-Typed Racket provides support for object-oriented programming with
-the classes and objects provided by the @racketmodname[racket/class]
-library.
-
-@section{Special forms}
-
-@defmodule[typed/racket/class]
-
-The special forms below are provided by the @racketmodname[typed/racket/class]
-and @racketmodname[typed/racket] modules but not by
-@racketmodname[typed/racket/base]. The @racketmodname[typed/racket/class] module
-additional provides all other bindings from @racketmodname[racket/class].
-
-@;; This uses a trick to link to racket/class's class identifier
-@;; in certain cases rather than the class defined here
-@(module id-holder racket/base
-   (require scribble/manual (for-label racket/class))
-   (provide class-element
-            d/p-element d/o-element
-            d/pm-element d/a-element
-            d/pr-element)
-   (define class-element (racket class))
-   (define d/p-element (racket define/public))
-   (define d/o-element (racket define/override))
-   (define d/pm-element (racket define/pubment))
-   (define d/a-element (racket define/augment))
-   (define d/pr-element (racket define/private)))
-@(require 'id-holder)
-
-@defform[#:literals (inspect init init-field init-rest field inherit-field
-                     public pubment override augment private inherit
-                     begin)
-         (class superclass-expr
-           maybe-type-parameters
-           class-clause ...)
-         #:grammar ([class-clause (inspect inspector-expr)
-                                  (init init-decl ...)
-                                  (init-field init-decl ...)
-                                  (init-rest id/type)
-                                  (field field-decl ...)
-                                  (inherit-field field-decl ...)
-                                  (public maybe-renamed/type ...)
-                                  (pubment maybe-renamed/type ...)
-                                  (override maybe-renamed/type ...)
-                                  (augment maybe-renamed/type ...)
-                                  (private id/type ...)
-                                  (inherit id ...)
-                                  method-definition
-                                  definition
-                                  expr
-                                  (begin class-clause ...)]
-                    [maybe-type-parameters (code:line)
-                                           (code:line #:forall (type-variable ...))
-                                           (code:line #:∀ (type-variable ...))]
-                    [init-decl id/type
-                               [renamed]
-                               [renamed : type-expr]
-                               [maybe-renamed default-value-expr]
-                               [maybe-renamed : type-expr default-value-expr]]
-                    [field-decl (maybe-renamed default-value-expr)
-                                (maybe-renamed : type-expr default-value-expr)]
-                    [id/type id
-                             [id : type-expr]]
-                    [maybe-renamed/type maybe-renamed
-                                        [maybe-renamed : type-expr]]
-                    [maybe-renamed id
-                                   renamed]
-                    [renamed (internal-id external-id)])]{
-  Produces a class with type annotations that allows Typed Racket to type-check
-  the methods, fields, and other clauses in the class.
-
-  The meaning of the class clauses are the same as in the @class-element
-  form from the @racketmodname[racket/class] library with the exception of
-  the additional optional type annotations. Additional class clause
-  forms from @class-element that are not listed in the grammar above are
-  not currently supported in Typed Racket.
-
-  @ex[
-    (define fish%
-      (class object%
-        (init [size : Real])
-
-        (: current-size Real)
-        (define current-size size)
-
-        (super-new)
-
-        (: get-size (-> Real))
-        (define/public (get-size)
-          current-size)
-
-        (: grow (Real -> Void))
-        (define/public (grow amt)
-          (set! current-size (+ amt current-size)))
-
-        (: eat ((Object [get-size (-> Real)]) -> Void))
-        (define/public (eat other-fish)
-          (grow (send other-fish get-size)))))
-
-    (define dory (new fish% [size 5.5]))
-  ]
-
-  Within a typed class form, one of the class clauses must be a call
-  to @racket[super-new]. Failure to call @racket[super-new] will result in
-  a type error. In addition, dynamic uses of @racket[super-new] (e.g.,
-  calling it in a separate function within the dynamic extent of the
-  class form's clauses) are restricted.
-
-  @ex[
-    (class object%
-      (code:comment "Note the missing `super-new`")
-      (init-field [x : Real 0] [y : Real 0]))
-  ]
-
-  If any identifier with an optional type annotation is left without an
-  annotation, the type-checker will assume the type @racket[Any]
-  (or @racket[Procedure] for methods) for that identifier.
-
-  @ex[
-    (define point%
-      (class object%
-        (super-new)
-        (init-field x y)))
-    point%
-  ]
-
-  When @racket[type-variable] is provided, the class is parameterized
-  over the given type variables. These type variables are in scope inside
-  the body of the class. The resulting class can be instantiated at
-  particular types using @racket[inst].
-
-  @ex[
-    (define cons%
-      (class object%
-        #:forall (X Y)
-        (super-new)
-        (init-field [car : X] [cdr : Y])))
-    cons%
-    (new (inst cons% Integer String) [car 5] [cdr "foo"])
-  ]
-
-  Initialization arguments may be provided by-name using the @racket[new]
-  form, by-position using the @racket[make-object] form, or both using
-  the @racket[instantiate] form.
-
-  As in ordinary Racket classes, the order in which initialization arguments
-  are declared determines the order of initialization types in the class type.
-
-  Furthermore, a class may also have a typed @racket[init-rest] clause, in
-  which case the class constructor takes an unbounded number of arguments
-  by-position. The type of the @racket[init-rest] clause must be either a
-  @racket[List] type, @racket[Listof] type, or any other list type.
-
-  @ex[
-    (define point-copy%
-      (code:comment "a point% with a copy constructor")
-      (class object%
-        (super-new)
-        (init-rest [rst : (U (List Integer Integer)
-                             (List (Object (field [x Integer]
-                                                  [y Integer]))))])
-        (field [x : Integer 0] [y : Integer 0])
-        (match rst
-          [(list (? integer? *x) *y)
-           (set! x *x) (set! y *y)]
-          [(list (? (negate integer?) obj))
-           (set! x (get-field x obj))
-           (set! y (get-field y obj))])))
-    (define p1 (make-object point-copy% 1 2))
-    (make-object point-copy% p1)
-  ]
-}
-
-@(define (define/foo-content define/foo)
-   @elem{
-   Like @define/foo from @racketmodname[racket/class], but uses the binding of
-   @racket[define] from Typed Racket.
-
-   The @racket[formals] may specify type annotations as in @racket[define].
-})
-
-@defform*[((define/public id expr)
-           (define/public (id . formals) body ...+))]{
-  @define/foo-content[d/p-element]
-}
-
-@defform*[((define/override id expr)
-           (define/override (id . formals) body ...+))]{
-  @define/foo-content[d/o-element]
-}
-
-@defform*[((define/pubment id expr)
-           (define/pubment (id . formals) body ...+))]{
-  @define/foo-content[d/pm-element]
-}
-
-@defform*[((define/augment id expr)
-           (define/augment (id . formals) body ...+))]{
-  @define/foo-content[d/a-element]
-}
-
-@defform*[((define/private id expr)
-           (define/private (id . formals) body ...+))]{
-  @define/foo-content[d/pr-element]
-}
-
-@deftogether[(@defform[(init init-decl ...)]
-              @defform[(init-field init-decl ...)]
-              @defform[(field field-decl ...)]
-              @defform[(inherit-field field-decl ...)]
-              @defform[(init-rest id/type)]
-              @defform[(public maybe-renamed/type ...)]
-              @defform[(pubment maybe-renamed/type ...)]
-              @defform[(override maybe-renamed/type ...)]
-              @defform[(augment maybe-renamed/type ...)]
-              @defform[(private id/type ...)]
-              @defform[(inherit maybe-renamed/type ...)])]{
-  These forms are mostly equivalent to the forms of the same names from
-  the @racketmodname[racket/class] library and will expand to them. However,
-  they also allow the initialization argument, field, or method names to be
-  annotated with types as described above for the @racket[class] form.
-}
-
-@section{Types}
-
-@defform[#:literals (init init-field init-rest field augment)
-         (Class class-type-clause ...)
-         #:grammar ([class-type-clause name+type
-                                       (init init-type ...)
-                                       (init-field init-type ...)
-                                       (init-rest name+type)
-                                       (field name+type ...)
-                                       (augment name+type ...)
-                                       (code:line #:implements type-alias-id)
-                                       (code:line #:implements/inits inits-id)
-                                       (code:line #:row-var row-var-id)]
-                    [init-type name+type
-                               [id type #:optional]]
-                    [name+type [id type]])]{
-  The type of a class with the given initialization argument, method, and
-  field types.
-
-  @ex[
-    (: food% (Class (init [liquid? Boolean])
-                    (field [nutrition Integer])
-                    [get-nutrition (-> Integer)]))
-  ]
-
-  The types of methods are provided either without a keyword, in which case
-  they correspond to public methods, or with the @racketidfont{augment}
-  keyword, in which case they correspond to a method that can be augmented.
-
-  An initialization argument type specifies a name and type and optionally
-  a @racket[#:optional] keyword. An initialization argument type with
-  @racket[#:optional] corresponds to an argument that does not need to
-  be provided at object instantiation.
-
-  @ex[
-    (: drink% (Class (init [color String]
-                           [carbonated? Boolean]
-                           [viscosity Positive-Real #:optional])))
-  ]
-
-  The order of initialization arguments in the type is significant, because
-  it determines the types of by-position arguments for use with
-  @racket[make-object] and @racket[instantiate]. A given @racket[Class] type
-  may also only contain a single @racket[init-rest] clause.
-
-  @ex[
-    (define drink%
-      (class object%
-        (super-new)
-        (code:comment "The order of `color' and `carbonated?' cannot be swapped")
-        (init color carbonated? [viscosity 1.002])))
-    (code:comment "The order of initialization matches the order in the type")
-    (make-object drink% "purple" #t)
-  ]
-
-  When @racket[type-alias-id] is provided, the resulting class type
-  includes all of the method and field types from the specified type alias
-  (which must be an alias for a class type). This is intended to allow a type
-  for a subclass to include parts of its parent class type. The initialization argument
-  types of the parent, however, are @emph{not} included because a subclass does not necessarily
-  share the same initialization arguments as its parent class.
-
-  Initialization argument types can be included from the parent by providing
-  @racket[inits-id] with the @racket[#:implements/inits] keyword. This is identical
-  to the @racket[#:implements] clause except for the initialization argument
-  behavior. Only a single @racket[#:implements/inits] clause may be provided for
-  a single @racket[Class] type. The initialization arguments copied from the parent
-  type are appended to the initialization arguments specified via the @racket[init]
-  and @racket[init-field] clauses.
-
-  Multiple @racket[#:implements] clauses may be provided for a single class
-  type. The types for the @racket[#:implements] clauses are merged in order and the
-  last type for a given method name or field is used (the types in the @racket[Class]
-  type itself takes precedence).
-
-  @ex[
-    (define-type Point<%> (Class (field [x Real] [y Real])))
-    (: colored-point% (Class #:implements Point<%>
-                             (field [color String])))
-  ]
-
-  When @racket[row-var-id] is provided, the class type is an abstract type
-  that is row polymorphic. A row polymorphic class type can be instantiated
-  at a specific row using @racket[inst]. Only a single @racket[#:row-var]
-  clause may appear in a class type.
-}
-
-@defidform[ClassTop]{
-  The supertype of all class types. A value of this type
-  cannot be used for subclassing, object creation, or most
-  other class functions. Its primary use is for reflective
-  operations such as @racket[is-a?].
-}
-
-@defform[#:literals (field)
-         (Object object-type-clause ...)
-         #:grammar ([object-type-clause name+type
-                                        (field name+type ...)])]{
-  The type of an object with the given field and method types.
-
-  @ex[
-    (new object%)
-    (new (class object% (super-new) (field [x : Real 0])))
-  ]
-}
-
-@defform[(Instance class-type-expr)]{
-  The type of an object that corresponds to @racket[class-type-expr].
-
-  This is the same as an @racket[Object] type that has all of the
-  method and field types from @racket[class-type-expr]. The types for
-  the @racketidfont{augment} and @racketidfont{init} clauses in the
-  class type are ignored.
-
-  @ex[
-    (define-type Point% (Class (init-field [x Integer] [y Integer])))
-    (: a-point (Instance Point%))
-    (define a-point
-      (new (class object%
-             (super-new)
-             (init-field [x : Integer 0] [y : Integer 0]))))
-  ]
-}
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/typed-regions.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/typed-regions.scrbl
deleted file mode 100644
index ea8ea2c953..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/typed-regions.scrbl
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt" scribble/eval racket/sandbox)
-       (require (for-label (only-meta-in 0 [except-in typed/racket for])))]
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require (except-in typed/racket #%top-interaction #%module-begin)))
-@(define the-top-eval (make-base-eval))
-@(the-top-eval '(require (except-in typed/racket #%module-begin)))
-
-
-@title{Typed Regions}
-
-The @racket[with-type] form allows for localized Typed Racket regions in
-otherwise untyped code.
-
-@defform*/subs[[(with-type result-spec fv-clause body ...+)
-                (with-type export-spec fv-clause body ...+)]
-              ([fv-clause code:blank
-                          (code:line #:freevars ([id fv-type] ...))]
-               [result-spec (code:line #:result type)]
-               [export-spec ([export-id export-type] ...)])]{
-The first form, an expression, checks that @racket[body ...+] has the type @racket[type].
-If the last expression in @racket[body ...+] returns multiple values, @racket[type] must
-be a type of the form @racket[(values t ...)].
-Uses of the result values are appropriately checked by contracts generated from
-@racket[type].
-
-The second form, which can be used as a definition, checks that each of the @racket[export-id]s
-has the specified type.  These types are also enforced in the surrounding code with contracts.
-
-The @racket[id]s are assumed to
-have the types ascribed to them; these types are converted to contracts and checked dynamically.
-
-@examples[#:eval the-eval
-(with-type #:result Number 3)
-
-((with-type #:result (Number -> Number)
-   (lambda: ([x : Number]) (add1 x)))
- #f)
-
-(let ([x "hello"])
-  (with-type #:result String
-    #:freevars ([x String])
-    (string-append x ", world")))
-
-(let ([x 'hello])
-  (with-type #:result String
-    #:freevars ([x String])
-    (string-append x ", world")))
-
-(with-type ([fun (Number -> Number)]
-            [val Number])
-  (define (fun x) x)
-  (define val 17))
-
-(fun val)]}
-
-@(close-eval the-eval)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/types.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/types.scrbl
deleted file mode 100644
index 2a3896e806..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/types.scrbl
+++ /dev/null
@@ -1,796 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt"
-                "numeric-tower-pict.rkt"
-                scribble/eval
-                racket/sandbox)
-       (require (for-label (only-meta-in 0 [except-in typed/racket for])
-                           racket/async-channel))]
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require (except-in typed/racket #%top-interaction #%module-begin)))
-@(define the-top-eval (make-base-eval))
-@(the-top-eval '(require (except-in typed/racket #%module-begin)
-                         racket/flonum racket/extflonum racket/fixnum))
-
-@(define-syntax-rule (ex . args)
-   (examples #:eval the-top-eval . args))
-
-
-@title[#:tag "type-ref"]{Type Reference}
-
-@defidform[Any]{Any Racket value. All other types are subtypes of @racket[Any].}
-
-@defidform[Nothing]{The empty type.  No values inhabit this type, and
-any expression of this type will not evaluate to a value.}
-
-@section{Base Types}
-
-@(define-syntax-rule
-   (defnums (ids ...) . rest)
-   (deftogether ((defidform ids) ...) . rest))
-
-@subsection{Numeric Types}
-
-These types represent the hierarchy of @rtech{numbers} of Racket. The
-diagram below shows the relationships between the types in the hierarchy.
-
-@centered[@numeric-tower-pict]
-
-The regions with a solid border are @emph{layers} of the numeric hierarchy
-corresponding to sets of numbers such as integers or rationals. Layers
-contained within another are subtypes of the layer containing them. For
-example, @racket[Exact-Rational] is a subtype of @racket[Exact-Number].
-
-The @racket[Real] layer is also divided into positive and negative types
-(shown with a dotted line). The @racket[Integer] layer is subdivided into
-several fixed-width integers types, detailed later in this section.
-
-@defnums[(Number Complex)]
-@racket[Number] and @racket[Complex] are synonyms. This is the most general
-numeric type, including all Racket numbers, both exact and inexact, including
-complex numbers.
-
-@defnums[(Integer)]
-Includes Racket's exact integers and corresponds to the
-@racket[exact-integer?] predicate. This is the most general type that is still
-valid for indexing and other operations that require integral values.
-
-@defnums[(Float Flonum)]
-Includes Racket's double-precision (default) floating-point numbers and
-corresponds to the @racket[flonum?] predicate. This type excludes
-single-precision floating-point numbers.
-
-@defnums[(Single-Flonum)]
-Includes Racket's single-precision floating-point numbers and corresponds to
-the @racket[single-flonum?] predicate. This type excludes double-precision
-floating-point numbers.
-
-@defnums[(Inexact-Real)]
-Includes all of Racket's floating-point numbers, both single- and
-double-precision.
-
-@defnums[(Exact-Rational)]
-Includes Racket's exact rationals, which include fractions and exact integers.
-
-@defnums[(Real)]
-Includes all of Racket's real numbers, which include both exact rationals and
-all floating-point numbers. This is the most general type for which comparisons
-(e.g. @racket[<]) are defined.
-
-@defnums[(
-Exact-Number
-Float-Complex
-Single-Flonum-Complex
-Inexact-Complex)]
-These types correspond to Racket's complex numbers.
-
-
-The above types can be subdivided into more precise types if you want to
-enforce tighter constraints. Typed Racket provides types for the positive,
-negative, non-negative and non-positive subsets of the above types (where
-applicable).
-
-@defnums[(
-Positive-Integer
-Exact-Positive-Integer
-Nonnegative-Integer
-Exact-Nonnegative-Integer
-Natural
-Negative-Integer
-Nonpositive-Integer
-Zero
-Positive-Float
-Positive-Flonum
-Nonnegative-Float
-Nonnegative-Flonum
-Negative-Float
-Negative-Flonum
-Nonpositive-Float
-Nonpositive-Flonum
-Float-Negative-Zero
-Flonum-Negative-Zero
-Float-Positive-Zero
-Flonum-Positive-Zero
-Float-Zero
-Flonum-Zero
-Float-Nan
-Flonum-Nan
-Positive-Single-Flonum
-Nonnegative-Single-Flonum
-Negative-Single-Flonum
-Nonpositive-Single-Flonum
-Single-Flonum-Negative-Zero
-Single-Flonum-Positive-Zero
-Single-Flonum-Zero
-Single-Flonum-Nan
-Positive-Inexact-Real
-Nonnegative-Inexact-Real
-Negative-Inexact-Real
-Nonpositive-Inexact-Real
-Inexact-Real-Negative-Zero
-Inexact-Real-Positive-Zero
-Inexact-Real-Zero
-Inexact-Real-Nan
-Positive-Exact-Rational
-Nonnegative-Exact-Rational
-Negative-Exact-Rational
-Nonpositive-Exact-Rational
-Positive-Real
-Nonnegative-Real
-Negative-Real
-Nonpositive-Real
-Real-Zero
-)]
-@racket[Natural] and @racket[Exact-Nonnegative-Integer] are synonyms. So are
-the integer and exact-integer types, and the float and flonum
-types. @racket[Zero] includes only the integer @racket[0]. @racket[Real-Zero]
-includes exact @racket[0] and all the floating-point zeroes.
-
-These types are useful when enforcing that values have a specific
-sign. However, programs using them may require additional dynamic checks when
-the type-checker cannot guarantee that the sign constraints will be respected.
-
-In addition to being divided by sign, integers are further subdivided into
-range-bounded types. The relationships between most of the range-bounded types
-are shown in this diagram:
-
-@centered[@integer-pict]
-
-Like the previous diagram, types nested inside of another in the
-diagram are subtypes of its containing types.
-
-@defnums[(
-One
-Byte
-Positive-Byte
-Index
-Positive-Index
-Fixnum
-Positive-Fixnum
-Nonnegative-Fixnum
-Negative-Fixnum
-Nonpositive-Fixnum
-)]
-@racket[One] includes only the integer @racket[1]. @racket[Byte] includes
-numbers from @racket[0] to @racket[255]. @racket[Index] is bounded by
-@racket[0] and by the length of the longest possible Racket
-vector. @racket[Fixnum] includes all numbers represented by Racket as machine
-integers. For the latter two families, the sets of values included in the types
-are architecture-dependent, but typechecking is architecture-independent.
-
-These types are useful to enforce bounds on numeric values, but given the
-limited amount of closure properties these types offer, dynamic checks may be
-needed to check the desired bounds at runtime.
-
-@ex[
-7
-8.3
-(/ 8 3)
-0
--12
-3+4i]
-
-@defnums[(
-ExtFlonum
-Positive-ExtFlonum
-Nonnegative-ExtFlonum
-Negative-ExtFlonum
-Nonpositive-ExtFlonum
-ExtFlonum-Negative-Zero
-ExtFlonum-Positive-Zero
-ExtFlonum-Zero
-ExtFlonum-Nan
-)]
-80-bit @rtech{extflonum} types, for the values operated on by
-@racketmodname[racket/extflonum] exports.
-These are not part of the numeric tower.
-
-@subsection{Other Base Types}
-
-@deftogether[(
-@defidform[Boolean]
-@defidform[True]
-@defidform[False]
-@defidform[String]
-@defidform[Keyword]
-@defidform[Symbol]
-@defidform[Char]
-@defidform[Void]
-@defidform[Input-Port]
-@defidform[Output-Port]
-@defidform[Port]
-@defidform[Path]
-@defidform[Path-For-Some-System]
-@defidform[Regexp]
-@defidform[PRegexp]
-@defidform[Byte-Regexp]
-@defidform[Byte-PRegexp]
-@defidform[Bytes]
-@defidform[Namespace]
-@defidform[Namespace-Anchor]
-@defidform[Variable-Reference]
-@defidform[Null]
-@defidform[EOF]
-@defidform[Continuation-Mark-Set]
-@defidform[Undefined]
-@defidform[Module-Path]
-@defidform[Module-Path-Index]
-@defidform[Resolved-Module-Path]
-@defidform[Compiled-Module-Expression]
-@defidform[Compiled-Expression]
-@defidform[Internal-Definition-Context]
-@defidform[Pretty-Print-Style-Table]
-@defidform[Special-Comment]
-@defidform[Struct-Type-Property]
-@defidform[Impersonator-Property]
-@defidform[Read-Table]
-@defidform[Bytes-Converter]
-@defidform[Parameterization]
-@defidform[Custodian]
-@defidform[Inspector]
-@defidform[Security-Guard]
-@defidform[UDP-Socket]
-@defidform[TCP-Listener]
-@defidform[Logger]
-@defidform[Log-Receiver]
-@defidform[Log-Level]
-@defidform[Thread]
-@defidform[Thread-Group]
-@defidform[Subprocess]
-@defidform[Place]
-@defidform[Place-Channel]
-@defidform[Semaphore]
-@defidform[Will-Executor]
-@defidform[Pseudo-Random-Generator]
-)]{
-These types represent primitive Racket data.
-
-@ex[
-#t
-#f
-"hello"
-(current-input-port)
-(current-output-port)
-(string->path "/")
-#rx"a*b*"
-#px"a*b*"
-'#"bytes"
-(current-namespace)
-#\b
-(thread (lambda () (add1 7)))
-]
-}
-
-@defidform[Path-String]{
-The union of the @racket[Path] and
-@racket[String] types.  Note that this does not
-match exactly what the predicate @racket[path-string?]
-recognizes. For example, strings
-that contain the character @racket[#\nul] have the type
-@racket[Path-String] but @racket[path-string?] returns
-@racket[#f] for those strings. For a complete specification
-of which strings @racket[path-string?] accepts, see its
-documentation.}
-
-
-@section{Singleton Types}
-
-Some kinds of data are given singleton types by default.  In
-particular, @rtech{booleans}, @rtech{symbols}, and @rtech{keywords} have types which
-consist only of the particular boolean, symbol, or keyword.  These types are
-subtypes of @racket[Boolean], @racket[Symbol] and @racket[Keyword], respectively.
-
-@ex[
-#t
-'#:foo
-'bar
-]
-
-@section{Containers}
-
-
-The following base types are parametric in their type arguments.
-
-@defform[(Pairof s t)]{is the @rtech{pair} containing @racket[s] as the @racket[car]
-  and @racket[t] as the @racket[cdr]}
-
-@ex[
-(cons 1 2)
-(cons 1 "one")
-]
-
-
-@defform[(Listof t)]{Homogenous @rtech{lists} of @racket[t]}
-@defform[(List t ...)]{is the type of the list with one element, in order,
-  for each type provided to the @racket[List] type constructor.}
-@defform/none[(#,(racket List) t ... trest #,(racket ...) bound)]{is the type of a list with
-one element for each of the @racket[t]s, plus a sequence of elements
-corresponding to @racket[trest], where @racket[bound]
-  must be an identifier denoting a type variable bound with @racket[...].}
-@defform[(List* t t1 ... s)]{is equivalent to @racket[(Pairof t (List* t1 ... s))].}
-
-@ex[
-(list 'a 'b 'c)
-(plambda: (a ...) ([sym : Symbol] boxes : (Boxof a) ... a)
-  (ann (cons sym boxes) (List Symbol (Boxof a) ... a)))
-(map symbol->string (list 'a 'b 'c))
-]
-
-@defform[(MListof t)]{Homogenous @rtech{mutable lists} of @racket[t].}
-@defform[(MPairof t u)]{@rtech{Mutable pairs} of @racket[t] and @racket[u].}
-
-@defidform[MPairTop]{is the type of a @rtech{mutable pair} with unknown
-  element types and is the supertype of all mutable pair types.
-  This type typically appears in programs via the combination of
-  occurrence typing and @racket[mpair?].
-@ex[(lambda: ([x : Any]) (if (mpair? x) x (error "not an mpair!")))]
-}
-
-@defform[(Boxof t)]{A @rtech{box} of @racket[t]}
-
-@ex[(box "hello world")]
-
-@defidform[BoxTop]{is the type of a @rtech{box} with an unknown element
-  type and is the supertype of all box types. Only read-only box operations
-  (e.g. @racket[unbox]) are allowed on values of this type. This type
-  typically appears in programs via the combination of occurrence
-  typing and @racket[box?].
-@ex[(lambda: ([x : Any]) (if (box? x) x (error "not a box!")))]
-}
-
-@defform[(Vectorof t)]{Homogenous @rtech{vectors} of @racket[t]}
-@defform[(Vector t ...)]{is the type of the list with one element, in order,
-  for each type provided to the @racket[Vector] type constructor.
-
-  @ex[(vector 1 2 3)
-  #(a b c)]}
-
-@defidform[FlVector]{An @rtech{flvector}.
-  @ex[(flvector 1.0 2.0 3.0)]}
-@defidform[ExtFlVector]{An @rtech{extflvector}.
-  @ex[(extflvector 1.0t0 2.0t0 3.0t0)]}
-@defidform[FxVector]{An @rtech{fxvector}.
-  @ex[(fxvector 1 2 3)]}
-
-@defidform[VectorTop]{is the type of a @rtech{vector} with unknown length and
-  element types and is the supertype of all vector types.
-  Only read-only vector operations (e.g. @racket[vector-ref])
-  are allowed on values of this type. This type typically appears in programs
-  via the combination of occurrence typing and @racket[vector?].
-@ex[(lambda: ([x : Any]) (if (vector? x) x (error "not a vector!")))]
-}
-
-
-@defform[(HashTable k v)]{is the type of a @rtech{hash table} with key type
-   @racket[k] and value type @racket[v].
-
-@ex[#hash((a . 1) (b . 2))]
-}
-@defidform[HashTableTop]{is the type of a @rtech{hash table} with unknown key
-  and value types and is the supertype of all hash table types. Only read-only
-  hash table operations (e.g.
-  @racket[hash-ref]) are allowed on values of this type. This type typically
-  appears in programs via the combination of occurrence typing and
-  @racket[hash?].
-@ex[(lambda: ([x : Any]) (if (hash? x) x (error "not a hash table!")))]
-}
-
-@defform[(Setof t)]{is the type of a @rtech{set} of @racket[t].
-@ex[(set 0 1 2 3)]
-}
-
-@defform[(Channelof t)]{A @rtech{channel} on which only @racket[t]s can be sent.
-@ex[
-(ann (make-channel) (Channelof Symbol))
-]
-}
-
-@defidform[ChannelTop]{is the type of a @rtech{channel} with unknown
-  message type and is the supertype of all channel types. This type typically
-  appears in programs via the combination of occurrence typing and
-  @racket[channel?].
-@ex[(lambda: ([x : Any]) (if (channel? x) x (error "not a channel!")))]
-}
-
-@defform[(Async-Channelof t)]{An @rtech{asynchronous channel} on which only @racket[t]s can be sent.
-@ex[
-(require typed/racket/async-channel)
-(ann (make-async-channel) (Async-Channelof Symbol))
-]
-@history[#:added "1.1"]
-}
-
-@defidform[Async-ChannelTop]{is the type of an @rtech{asynchronous channel} with unknown
-  message type and is the supertype of all asynchronous channel types. This type typically
-  appears in programs via the combination of occurrence typing and
-  @racket[async-channel?].
-@ex[(require typed/racket/async-channel)
-    (lambda: ([x : Any]) (if (async-channel? x) x (error "not an async-channel!")))]
-@history[#:added "1.1"]
-}
-
-@defform*[[(Parameterof t)
-           (Parameterof s t)]]{A @rtech{parameter} of @racket[t].  If two type arguments are supplied,
-                                 the first is the type the parameter accepts, and the second is the type returned.
-@ex[current-input-port
-    current-directory]
-}
-
-@defform[(Promise t)]{A @rtech{promise} of @racket[t].
- @ex[(delay 3)]}
-
-@defform[(Futureof t)]{A @rtech{future} which produce a value of type @racket[t] when touched.}
-
-@defform[(Sequenceof t)]{A @rtech{sequence} that produces values of
-type @racket[_t] on each iteration.}
-
-@defform[(Custodian-Boxof t)]{A @rtech{custodian box} of @racket[t].}
-@defform[(Thread-Cellof t)]{A @rtech{thread cell} of @racket[t].}
-@defidform[Thread-CellTop]{is the type of a @rtech{thread cell} with unknown
-  element type and is the supertype of all thread cell types. This type typically
-  appears in programs via the combination of occurrence typing and
-  @racket[thread-cell?].
-@ex[(lambda: ([x : Any]) (if (thread-cell? x) x (error "not a thread cell!")))]
-}
-
-@defform[(Weak-Boxof t)]{
-  The type for a @rtech{weak box} whose value is of type @racket[t].
-
-  @ex[(make-weak-box 5)
-      (weak-box-value (make-weak-box 5))]
-}
-
-@defidform[Weak-BoxTop]{is the type of a @rtech{weak box} with an unknown element
-  type and is the supertype of all weak box types. This type
-  typically appears in programs via the combination of occurrence
-  typing and @racket[weak-box?].
-@ex[(lambda: ([x : Any]) (if (weak-box? x) x (error "not a box!")))]
-}
-
-@defform[(Ephemeronof t)]{An @rtech{ephemeron} whose value is of type @racket[t].}
-
-@defform[(Evtof t)]{A @rtech{synchronizable event} whose @rtech{synchronization result}
-  is of type @racket[t].
-
-  @ex[always-evt
-      (system-idle-evt)
-      (ann (thread (λ () (displayln "hello world"))) (Evtof Thread))]
-}
-
-@section{Syntax Objects}
-
-The following types represent @rtech{syntax object}s and their content.
-
-@defform[(Syntaxof t)]{A syntax object with content of type @racket[t].
-Applying @racket[syntax-e] to a value of type @racket[(Syntaxof t)] produces a
-value of type @racket[t].}
-
-@defidform[Identifier]{A syntax object containing a @rtech{symbol}.  Equivalent
-to @racket[(Syntaxof Symbol)].}
-
-@defidform[Syntax]{A syntax object containing only @rtech{symbol}s,
-@rtech{keyword}s, @rtech{string}s, @rtech{character}s, @rtech{boolean}s,
-@rtech{number}s, @rtech{box}es containing @racket[Syntax], @rtech{vector}s of
-@racket[Syntax], or (possibly improper) @rtech{list}s of @racket[Syntax].
-Equivalent to @racket[(Syntaxof Syntax-E)].}
-
-@defidform[Syntax-E]{The content of syntax objects of type @racket[Syntax].
-Applying @racket[syntax-e] to a value of type @racket[Syntax] produces a value
-of type @racket[Syntax-E].}
-
-@defform[(Sexpof t)]{The recursive union of @racket[t] with @rtech{symbol}s,
-@rtech{keyword}s, @rtech{string}s, @rtech{character}s, @rtech{boolean}s,
-@rtech{number}s, @rtech{box}es, @rtech{vector}s, and (possibly improper)
-@rtech{list}s.}
-
-@defidform[Sexp]{Applying @racket[syntax->datum] to a value of type
-@racket[Syntax] produces a value of type @racket[Sexp].  Equivalent to
-@racket[(Sexpof Nothing)].}
-
-@defidform[Datum]{Applying @racket[datum->syntax] to a value of type
-@racket[Datum] produces a value of type @racket[Syntax].  Equivalent to
-@racket[(Sexpof Syntax)].}
-
-
-@section{Control}
-
-The following types represent @rtech{prompt tag}s and
-keys for @rtech{continuation mark}s for use with delimited continuation
-functions and continuation mark functions.
-
-@defform[(Prompt-Tagof s t)]{
-  A prompt tag to be used in a continuation prompt whose body
-  produces the type @racket[_s] and whose handler has the type
-  @racket[_t]. The type @racket[_t] must be a function type.
-
-  The domain of @racket[_t] determines the type of the values
-  that can be aborted, using @racket[abort-current-continuation],
-  to a prompt with this prompt tag.
-
-  @ex[(make-continuation-prompt-tag 'prompt-tag)]
-}
-
-@defidform[Prompt-TagTop]{is the type of a @rtech{prompt tag} with unknown
-  body and handler types and is the supertype of all prompt tag types. This type
-  typically appears in programs via the combination of occurrence typing
-  and @racket[continuation-prompt-tag?].
-@ex[(lambda: ([x : Any]) (if (continuation-prompt-tag? x) x (error "not a prompt tag!")))]
-}
-
-@defform[(Continuation-Mark-Keyof t)]{
-  A continuation mark key that is used for continuation mark
-  operations such as @racket[with-continuation-mark] and
-  @racket[continuation-mark-set->list]. The type @racket[_t]
-  represents the type of the data that is stored in the
-  continuation mark with this key.
-
-  @ex[(make-continuation-mark-key 'mark-key)]
-}
-
-@defidform[Continuation-Mark-KeyTop]{is the type of a continuation mark
-  key with unknown element type and is the supertype of all continuation mark key
-  types. This type typically appears in programs
-  via the combination of occurrence typing and @racket[continuation-mark-key?].
-@ex[(lambda: ([x : Any]) (if (continuation-mark-key? x) x (error "not a mark key!")))]
-}
-
-
-@section{Other Type Constructors}
-
-@defform*/subs[#:id -> #:literals (|@| * ... ! and or implies car cdr)
-               [(-> dom ... rng optional-filter)
-                (-> dom ... rest * rng)
-                (-> dom ... rest ooo bound rng)
-
-                (dom ... -> rng optional-filter)
-                (dom ... rest * -> rng)
-                (dom ... rest ooo bound -> rng)]
-               ([ooo #,(racket ...)]
-                [dom type
-                     mandatory-kw
-                     optional-kw]
-                [mandatory-kw (code:line keyword type)]
-                [optional-kw [keyword type]]
-                [optional-filter (code:line)
-                                 (code:line : type)
-                                 (code:line : pos-filter neg-filter object)]
-                [pos-filter (code:line)
-                            (code:line #:+ proposition ...)]
-                [neg-filter (code:line)
-                            (code:line #:- proposition ...)]
-                [object (code:line)
-                        (code:line #:object index)]
-                [proposition type
-                             (! type)
-                             (type |@| path-elem ... index)
-                             (! type |@| path-elem ... index)
-                             (and proposition ...)
-                             (or proposition ...)
-                             (implies proposition ...)]
-                [path-elem car cdr]
-                [index positive-integer
-                       (positive-integer positive-integer)
-                       identifier])]{
-  The type of functions from the (possibly-empty)
-  sequence @racket[dom ....] to the @racket[rng] type.
-
-  @ex[(λ: ([x : Number]) x)
-      (λ: () 'hello)]
-
-  The second form specifies a uniform rest argument of type @racket[rest], and the
-  third form specifies a non-uniform rest argument of type
-  @racket[rest] with bound @racket[bound]. The bound refers to the type variable
-  that is in scope within the rest argument type.
-
-  @ex[(λ: ([x : Number] . [y : String *]) (length y))
-      ormap]
-
-  In the third form, the @racket[...] introduced by @racket[ooo] is literal,
-  and @racket[bound] must be an identifier denoting a type variable.
-
-  The @racket[dom]s can include both mandatory and optional keyword arguments.
-  Mandatory keyword arguments are a pair of keyword and type, while optional
-  arguments are surrounded by a pair of parentheses.
-
-  @ex[(:print-type file->string)
-      (: is-zero? : (-> Number #:equality (-> Number Number Any) [#:zero Number] Any))
-      (define (is-zero? n #:equality equality #:zero [zero 0])
-        (equality n zero))
-      (is-zero? 2 #:equality =)
-      (is-zero? 2 #:equality eq? #:zero 2.0)]
-
-  When @racket[optional-filter] is provided, it specifies the @emph{filter} for the
-  function type (for an introduction to filters, see @tr-guide-secref["filters-and-predicates"]).
-  For almost all use cases, only the simplest form of filters, with a single type after a
-  @racket[:], are necessary:
-
-  @ex[string?]
-
-  The filter specifies that when @racket[(string? x)] evaluates to a true value for
-  a conditional branch, the variable @racket[x] in that branch can be assumed to have
-  type @racket[String]. Likewise, if the expression evaluates to @racket[#f] in a branch,
-  the variable @emph{does not} have type @racket[String].
-
-  In some cases, asymmetric type information is useful in filters. For example, the
-  @racket[filter] function's first argument is specified with only a positive filter:
-
-  @ex[filter]
-
-  The use of @racket[#:+] indicates that when the function applied to a variable
-  evaluates to a true value, the given type can be assumed for the variable. However,
-  the type-checker gains no information in branches in which the result is @racket[#f].
-
-  Conversely, @racket[#:-] specifies that a function provides information for the
-  false branch of a conditional.
-
-  The other filter proposition cases are rarely needed, but the grammar documents them
-  for completeness. They correspond to logical operations on the propositions.
-
-  The type of functions can also be specified with an @emph{infix} @racket[->]
-  which comes immediately before the @racket[rng] type. The fourth through
-  sixth forms match the first three cases, but with the infix style of arrow.
-
-  @ex[(: add2 (Number -> Number))
-      (define (add2 n) (+ n 2))]
-}
-
-@;; This is a trick to get a reference to ->* in another manual
-@(module id-holder racket/base
-   (require scribble/manual (for-label racket/contract))
-   (provide ->*-element)
-   (define ->*-element (racket ->*)))
-@(require 'id-holder)
-
-@defform[#:literals (* ...)
-         (->* (mandatory-dom ...) optional-doms rest rng)
-         #:grammar
-         ([mandatory-dom type
-                         (code:line keyword type)]
-          [optional-doms (code:line)
-                         (optional-dom ...)]
-          [optional-dom type
-                        (code:line keyword type)]
-          [rest (code:line)
-                (code:line #:rest type)])]{
-  Constructs the type of functions with optional or rest arguments. The first
-  list of @racket[mandatory-dom]s correspond to mandatory argument types. The list
-  @racket[optional-doms], if provided, specifies the optional argument types.
-
-  @ex[(: append-bar (->* (String) (Positive-Integer) String))
-      (define (append-bar str [how-many 1])
-        (apply string-append str (make-list how-many "bar")))]
-
-  If provided, the @racket[rest] expression specifies the type of
-  elements in the rest argument list.
-
-  @ex[(: +all (->* (Integer) #:rest Integer (Listof Integer)))
-      (define (+all inc . rst)
-        (map (λ: ([x : Integer]) (+ x inc)) rst))
-      (+all 20 1 2 3)]
-
-  Both the mandatory and optional argument lists may contain keywords paired
-  with types.
-
-  @ex[(: kw-f (->* (#:x Integer) (#:y Integer) Integer))
-      (define (kw-f #:x x #:y [y 0]) (+ x y))]
-
-  The syntax for this type constructor matches the syntax of the @->*-element
-  contract combinator, but with types instead of contracts.
-  }
-
-@deftogether[(
-@defidform[Top]
-@defidform[Bot])]{ These are filters that can be used with @racket[->].
-  @racket[Top] is the filter with no information.
-  @racket[Bot] is the filter which means the result cannot happen.
-}
-
-
-@defidform[Procedure]{is the supertype of all function types. The @racket[Procedure]
-  type corresponds to values that satisfy the @racket[procedure?] predicate.
-  Because this type encodes @emph{only} the fact that the value is a procedure, and
-  @emph{not} its argument types or even arity, the type-checker cannot allow values
-  of this type to be applied.
-
-  For the types of functions with known arity and argument types, see the @racket[->]
-  type constructor.
-
-  @ex[
-    (: my-list Procedure)
-    (define my-list list)
-    (my-list "zwiebelkuchen" "socca")
-  ]
-}
-
-
-@defform[(U t ...)]{is the union of the types @racket[t ...].
- @ex[(λ: ([x : Real])(if (> 0 x) "yes" 'no))]}
-@defform[(case-> fun-ty ...)]{is a function that behaves like all of
-  the @racket[fun-ty]s, considered in order from first to last.  The @racket[fun-ty]s must all be function
-  types constructed with @racket[->].
-  @ex[(: add-map : (case->
-                     [(Listof Integer) -> (Listof Integer)]
-                     [(Listof Integer) (Listof Integer) -> (Listof Integer)]))]
-  For the definition of @racket[add-map] look into @racket[case-lambda:].}
-
-@defform/none[(t t1 t2 ...)]{is the instantiation of the parametric type
-  @racket[t] at types @racket[t1 t2 ...]}
-@defform*[[(All (a ...) t)
-           (All (a ... a ooo) t)]]{
-  is a parameterization of type @racket[t], with
-  type variables @racket[v ...].  If @racket[t] is a function type
-      constructed with infix @racket[->], the outer pair of parentheses
-      around the function type may be omitted.
-      @ex[(: list-length : (All (A) (Listof A) -> Natural))
-          (define (list-length lst)
-            (if (null? lst)
-                0
-                (add1 (list-length (cdr lst)))))
-          (list-length (list 1 2 3))]}
-
-@defform[(Values t ...)]{is the type of a sequence of multiple values, with
-types @racket[t ...].  This can only appear as the return type of a
-function.
-@ex[(values 1 2 3)]}
-@defform/none[v]{where @racket[v] is a number, boolean or string, is the singleton type containing only that value}
-@defform/none[(quote val)]{where @racket[val] is a Racket value, is the singleton type containing only that value}
-@defform/none[i]{where @racket[i] is an identifier can be a reference to a type
-name or a type variable}
-@defform[(Rec n t)]{is a recursive type where @racket[n] is bound to the
-recursive type in the body @racket[t]
-@ex[(define-type IntList (Rec List (Pair Integer (U List Null))))
-
-    (define-type (List A) (Rec List (Pair A (U List Null))))]}
-
-@defform[(Struct st)]{is a type which is a supertype of all instances of the
-potentially-polymorphic structure type @racket[_st].  Note that structure
-accessors for @racket[_st] will @emph{not} accept @racket[(Struct st)] as an
-argument.}
-
-@defform[(Struct-Type st)]{is a type for the structure type descriptor value
-for the structure type @racket[st]. Values of this type are used with
-reflective operations such as @racket[struct-type-info].
-
-@ex[struct:arity-at-least
-    (struct-type-info struct:arity-at-least)]
-}
-
-@defidform[Struct-TypeTop]{is the supertype of all types for structure type
-descriptor values. The corresponding structure type is unknown for values of
-this top type.
-
-@ex[(struct-info (arity-at-least 0))]
-}
-
-@defalias[→ ->]
-@defalias[case→ case->]
-@defalias[∀ All]
-
-@section{Other Types}
-
-@defform[(Option t)]{Either @racket[t] or @racket[#f]}
-@defform[(Opaque t)]{A type constructed using the @racket[#:opaque]
-clause of @racket[require/typed].}
-
-@(close-eval the-eval)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/utilities.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/utilities.scrbl
deleted file mode 100644
index 5dbefcf94e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/reference/utilities.scrbl
+++ /dev/null
@@ -1,165 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "../utils.rkt" scribble/eval racket/sandbox)
-       (require (for-label (only-meta-in 0 [except-in typed/racket for])
-                           typed/untyped-utils))]
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require (except-in typed/racket #%top-interaction #%module-begin)))
-@(define the-top-eval (make-base-eval))
-@(the-top-eval '(require (except-in typed/racket #%module-begin)))
-
-@title{Utilities}
-
-Typed Racket provides some additional utility functions to facilitate typed programming.
-
-@defproc*[
-([(assert [v (U #f A)]) A]
- [(assert [v A] [p? (A -> Any : B)]) B])]{
-Verifies that the argument satisfies the constraint.  If no predicate
-is provided, simply checks that the value is not
-@racket[#f].
-
-See also the @racket[cast] form.
-}
-
-@examples[#:eval the-top-eval
-(define: x : (U #f String) (number->string 7))
-x
-(assert x)
-(define: y : (U String Symbol) "hello")
-y
-(assert y string?)
-(assert y boolean?)]
-
-@defform*/subs[[(with-asserts ([id maybe-pred] ...) body ...+)]
-              ([maybe-pred code:blank
-                           (code:line predicate)])]{
-Guard the body with assertions. If any of the assertions fail, the
-program errors. These assertions behave like @racket[assert].
-}
-
-
-@defproc[(defined? [v any/c]) boolean?]{A predicate for determining if
-@racket[v] is @emph{not} @|undefined-const|.}
-
-@defproc[(index? [v any/c]) boolean?]{A predicate for the @racket[Index]
-type.}
-
-@defform*/subs[[(typecheck-fail orig-stx maybe-msg maybe-id)]
-               ([maybe-msg code:blank (code:line msg-string)]
-	        [maybe-id code:blank (code:line #:covered-id id)])]{
-Explicitly produce a type error, with the source location or
-@racket[orig-stx].  If @racket[msg-string] is present, it must be a literal string, it is used as
-the error message, otherwise the error message 
-@racket["Incomplete case coverage"] is used.
-If @racket[id] is present and has 
-type @racket[T], then the message @racket["missing coverage of T"] is added to
-the error message.   
-
-@examples[#:eval the-top-eval #:escape UNSYNTAX
-(define-syntax (cond* stx)
-  (syntax-case stx ()
-    [(_ x clause ...)
-     #`(cond clause ... [else (typecheck-fail #,stx "incomplete coverage"
-                                              #:covered-id x)])]))
-
-(define: (f [x  : (U String Integer)]) : Boolean
-  (cond* x
-         [(string? x) #t]
-         [(exact-nonnegative-integer? x) #f]))
-]
-
-}
-
-@section{Untyped Utilities}
-
-@defmodule[typed/untyped-utils]
-
-These utilities help interface typed with untyped code, particularly typed
-libraries that use types that cannot be converted into contracts, or export
-syntax transformers that must expand differently in typed and untyped contexts.
-
-@defform*/subs[[(require/untyped-contract maybe-begin module [name subtype] ...)]
-               ([maybe-begin code:blank (code:line (begin expr ...))])]{
-Use this form to import typed identifiers whose types cannot be converted into
-contracts, but have @emph{subtypes} that can be converted into contracts.
-
-For example, suppose we define and provide the Typed Racket function
-@racketblock[(: negate (case-> (-> Index Fixnum)
-                               (-> Integer Integer)))
-             (define (negate x) (- x))]
-Trying to use @racket[negate] within an untyped module will raise an error
-because the cases cannot be distinguished by arity alone.
-
-If the defining module for @racket[negate] is @racket["my-numerics.rkt"],
-it can be imported and used in untyped code this way:
-@racketblock[(require/untyped-contract
-              "my-numerics.rkt"
-              [negate  (-> Integer Integer)])]
-The type @racket[(-> Integer Integer)] is converted into the contract used
-for @racket[negate].
-
-The @racket[require/untyped-contract] form expands into a submodule
-with language @racketmodname[typed/racket/base]. Identifiers used in
-@racket[subtype] expressions must be either in Typed Racket's base type
-environment (e.g. @racket[Integer] and @racket[Listof]) or defined by an
-expression in the @racket[maybe-begin] form, which is spliced into the
-submodule. For example, the @racketmodname[math/matrix #:indirect] module imports and
-reexports @racket[matrix-expt], which has a @racket[case->] type,
-for untyped use in this way:
-@racketblock[(provide matrix-expt)
-             
-             (require/untyped-contract
-              (begin (require "private/matrix/matrix-types.rkt"))
-              "private/matrix/matrix-expt.rkt"
-              [matrix-expt  ((Matrix Number) Integer -> (Matrix Number))])]
-The @racket[(require "private/matrix/matrix-types.rkt")] expression imports the
-@racket[Matrix] type.
-
-If an identifier @racket[name] is imported using @racket[require/untyped-contract],
-reexported, and imported into typed code, it has its original type, not
-@racket[subtype]. In other words, @racket[subtype] is used only to generate
-a contract for @racket[name], not to narrow its type.
-
-Because of limitations in the macro expander, @racket[require/untyped-contract]
-cannot currently be used in typed code.
-}
-
-@defform[(define-typed/untyped-identifier name typed-name untyped-name)]{
-Defines an identifier @racket[name] that expands to @racket[typed-name] in typed
-contexts and to @racket[untyped-name] in untyped contexts. Each subform must be
-an identifier.
-
-Suppose we define and provide a Typed Racket function with this type:
-@racketblock[(: my-filter (All (a) (-> (-> Any Any : a) (Listof Any) (Listof a))))]
-This type cannot be converted into a contract because it accepts a predicate.
-Worse, @racket[require/untyped-contract] does not help because
-@racket[(All (a) (-> (-> Any Any) (Listof Any) (Listof a)))] is not a subtype.
-
-In this case, we might still provide @racket[my-filter] to untyped code using
-@racketblock[(provide my-filter)
-             
-             (define-typed/untyped-identifier my-filter
-               typed:my-filter
-               untyped:my-filter)]
-where @racket[typed:my-filter] is the original @racket[my-filter], but imported
-using @racket[prefix-in], and @racket[untyped:my-filter] is either a Typed Racket
-implementation of it with type @racket[(All (a) (-> (-> Any Any) (Listof Any) (Listof a)))]
-or an untyped Racket implementation.
-
-Avoid this if possible. Use only in cases where a type has no subtype that can
-be converted to a contract; i.e. cases in which @racket[require/untyped-contract]
-cannot be used.
-}
-
-@defproc[(syntax-local-typed-context?) boolean?]{
-Returns @racket[#t] if called while expanding code in a typed context; otherwise
-@racket[#f].
-
-This is the nuclear option, provided because it is sometimes, but rarely, useful.
-Avoid.
-}
-
-@(close-eval the-eval)
-@(close-eval the-top-eval)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/ts-guide.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/ts-guide.scrbl
deleted file mode 100644
index 50a7cb1949..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/ts-guide.scrbl
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang scribble/manual
-
-@begin[(require "utils.rkt" (for-label (only-meta-in 0 typed/racket)))]
-
-@title[#:tag "top"]{The Typed Racket Guide}
-
-@author[@author+email["Sam Tobin-Hochstadt" "samth@racket-lang.org"]
-        @author+email["Vincent St-Amour" "stamourv@racket-lang.org"]
-        @author+email["Eric Dobson" "endobson@racket-lang.org"]
-        @author+email["Asumu Takikawa" "asumu@racket-lang.org"]
-        ]
-
-@section-index["typechecking" "typechecker" "typecheck"]
-
-Typed Racket is a family of languages, each of which enforce
-that programs written in the language obey a type system that ensures
-the absence of many common errors.  This guide is intended for programmers familiar
-with Racket.  For an introduction to Racket, see @(other-manual '(lib "scribblings/guide/guide.scrbl")).
-
-For the precise details, also see
-@other-doc['(lib "typed-racket/scribblings/ts-reference.scrbl")].
-
-@local-table-of-contents[]
-
-@include-section["guide/quick.scrbl"]
-@include-section["guide/begin.scrbl"]
-@include-section["guide/more.scrbl"]
-@include-section["guide/types.scrbl"]
-@include-section["guide/occurrence.scrbl"]
-@include-section["guide/typed-untyped-interaction.scrbl"]
-@include-section["guide/optimization.scrbl"]
-@include-section["guide/caveats.scrbl"]
-
-@;@section{How the Type System Works}
-
-@;@section{Integrating with Untyped Code}
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/ts-reference.scrbl b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/ts-reference.scrbl
deleted file mode 100644
index f0f9ca4cf2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/ts-reference.scrbl
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang scribble/manual
-
-@title[#:tag "top"]{The Typed Racket Reference}
-
-@author[@author+email["Sam Tobin-Hochstadt" "samth@racket-lang.org"]
-        @author+email["Vincent St-Amour" "stamourv@racket-lang.org"]
-        @author+email["Eric Dobson" "endobson@racket-lang.org"]
-        @author+email["Asumu Takikawa" "asumu@racket-lang.org"]
-        ]
-
-This manual describes the Typed Racket language, a sister language
-of Racket with a static type-checker. The types, special forms, and
-other tools provided by Typed Racket are documented here.
-
-For a friendly introduction, see the companion manual
-@other-doc['(lib "typed-racket/scribblings/ts-guide.scrbl")].
-
-@(defmodulelang* (typed/racket/base typed/racket)
-                 #:use-sources
-                    (typed-racket/typed-racket
-                     typed-racket/base-env/prims
-                     typed-racket/base-env/extra-procs
-                     typed-racket/base-env/base-types
-                     typed-racket/base-env/base-types-extra))
-
-@local-table-of-contents[]
-
-@include-section["reference/types.scrbl"]
-@include-section["reference/special-forms.scrbl"]
-@include-section["reference/libraries.scrbl"]
-@include-section["reference/typed-classes.scrbl"]
-@include-section["reference/utilities.scrbl"]
-@include-section["reference/exploring-types.scrbl"]
-@include-section["reference/no-check.scrbl"]
-@include-section["reference/typed-regions.scrbl"]
-@include-section["reference/optimization.scrbl"]
-@include-section["reference/legacy.scrbl"]
-@include-section["reference/compatibility-languages.scrbl"]
-@include-section["reference/experimental.scrbl"]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/utils.rkt
deleted file mode 100644
index 1874762c46..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-doc/typed-racket/scribblings/utils.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang at-exp scheme
-
-(require scribble/manual scribble/core)
-(provide (all-defined-out))
-
-(define (item* header . args) (apply item @bold[header]{: } args))
-(define-syntax-rule (tmod forms ...) (racketmod typed-scheme forms ...))
-(define (gtech . x)
-  (apply tech x #:doc '(lib "scribblings/guide/guide.scrbl")))
-(define (rtech . x)
-  (apply tech x #:doc '(lib "scribblings/reference/reference.scrbl")))
-
-(define (tr-guide-secref tag)
-  (secref tag #:doc '(lib "typed-racket/scribblings/ts-guide.scrbl")))
-(define (tr-reference-secref tag)
-  (secref tag #:doc '(lib "typed-racket/scribblings/ts-reference.scrbl")))
-
-(define ** (let ([* #f]) @racket[*]))
-
-(define-syntax-rule (annvar x t)
-  (make-element #f (list @racketparenfont["#{"]
-                         @racket[x : t]
-                         @racketparenfont["}"])))
-
-(define-syntax-rule (annexpr x t)
-  (make-element #f (list @racketparenfont["#{"]
-                         @racket[x :: t]
-                         @racketparenfont["}"])))
-
-(define-syntax-rule (defalias id1 id2)
-  @defidform[id1]{An alias for @racket[id2].})
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/LICENSE.txt b/pkgs/typed-racket-pkgs/typed-racket-lib/LICENSE.txt
deleted file mode 100644
index 751e3d3a69..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-typed-racket-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/info.rkt
deleted file mode 100644
index 5401ab0a4b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/info.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("srfi-lite-lib"
-               "base"
-               "pconvert-lib"
-               "unstable-contract-lib"
-               "unstable-list-lib"
-               "source-syntax"
-               "compatibility-lib" ;; to assign types
-               "string-constants-lib"))
-
-;; This is needed since the expansion of TR
-;; can insert `(require unstable/contract)` into
-;; the expanded code.
-(define implies '("unstable-contract-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"typed-racket\"")
-
-(define pkg-authors '(samth stamourv))
-
-(define version "1.1")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/HISTORY.txt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/HISTORY.txt
deleted file mode 100644
index 5c2073d18d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/HISTORY.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-(add1 6.1.1)
-- DrRacket tooltips for types and type errors.
-6.1.1
-- Exception handling is now sound. Broke existing programs (e.g. marketplace).
-- More types for GUI and framework.
-- Support for casts and predicates in typed regions.
-6.1
-- Inference speedups.
-- Support for contracted functions in the base environment.
-- Better keyword support.
-6.0.1
-- Types for classes (including row types, sealing contracts, etc).
-  Still experimental.  
-- Contracts are now optimized; in particular, redundant contracts are omitted
-- Filters work with conditions that raise errors, as in the pattern
-  (begin (unless (number? x) (error 'fail))
-         (add1 x))
-- Types are now pretty-printed
-- Add prefix-style function types and `->*` function type constructor
-- Support syntactic forms without : (such as let, lambda, for, etc)
-- Type aliases support arbitrary mutual recursion
-- Inform check-syntax about expansion results
-- Add `typed/untyped-utils` library
-- Add `typed/syntax/stx`, `typed/pict`, 
-- Significant test suite improvments
-- Improved support for `Struct-Type` values
-- Support keyword function definitions without annotation.
-- Handle forward references in un-annotated definitions
-- Improve type inference for `letrec`-bound variables
-6.0
-- Support for `define-type', `struct:', `make-predicate', etc. at the REPL
-- Performance work: optimized subtyping
-- Make `struct:' have the correct bindings in struct info
-- Use pairs for objects on arrow types
-- Split off `recover-source-syntax' into a separate package and generalized it
-- Lots of doc improvements
-- Lots of error message improvements
-- Split into multiple packages
-5.3.4
-- Moved Optimization Coach to the package system
-- Multiple fixes to polydots
-5.3.3
-  No changes
-5.3.2
-- Added types for control operators
-- Added `typed/untyped-utils`
-5.3.1
-- Revised handling of `Any` exported to untyped code
-- Added `cast`
-- Correctly compute variance of polymorphic type application
-5.3
-- Keyword and optional arguments
-- Faster startup
-- Random testing of the numeric tower
-5.2.1
-- Inference of functions with keyword arguments
-- `typecheck-fail' for explicit creation of type errors
-- Extensive documentation of typed numeric tower
-5.2
-- Performance work: delayed environment evaluation
-- Support `racket'-style optional arguments
-- Changes to support new-style keyword argument expansion
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/annotate-classes.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/annotate-classes.rkt
deleted file mode 100644
index 21d213582c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/annotate-classes.rkt
+++ /dev/null
@@ -1,293 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         syntax/parse/experimental/template
-         "../private/parse-classes.rkt"
-         "../private/syntax-properties.rkt"
-         (for-label "colon.rkt"))
-(provide (all-defined-out))
-
-;; Data definitions
-;; ----------------
-;;
-;; A LambdaKeywords is a
-;;   (lambda-kws (Listof Keyword) (Listof Keyword))
-(struct lambda-kws (mand opt))
-
-;; interp.
-;;   - the first list contains the mandatory keywords
-;;   - the second list contains the optional keywords
-;;
-;; The TR lambda form sets this as a syntax property on lambda expansions
-;; to allow TR to check for missing keywords.
-
-(define-literal-set colon #:for-label (:))
-
-(define-splicing-syntax-class annotated-name
-  #:attributes (name ty ann-name)
-  #:description "type-annotated identifier"
-  #:literal-sets (colon)
-  (pattern [~seq name:id : ty]
-           #:with ann-name (type-label-property #'name #'ty))
-  (pattern name:id
-           #:attr *ty (type-label-property #'name)
-           #:when (attribute *ty)
-           #:attr ty (datum->syntax #'name (attribute *ty))
-           #:with ann-name #'name))
-
-(define-splicing-syntax-class optionally-annotated-name
-  #:attributes (name ty ann-name)
-  #:description "optionally type-annotated identifier"
-  #:literal-sets (colon)
-  (pattern n:annotated-name
-           #:with name #'n.name
-           #:with ty #'n.ty
-           #:with ann-name #'n.ann-name)
-  (pattern n:id
-           #:with name #'n
-           #:attr ty #f
-           #:with ann-name #'n))
-
-(define-splicing-syntax-class (param-annotated-name trans)
-  #:attributes (name ty ann-name)
-  #:description "type-annotated identifier"
-  #:literal-sets (colon)
-  (pattern [~seq name:id : ty]
-           #:with ann-name (type-label-property #'name (trans #'ty))))
-
-(define-syntax-class annotated-binding
-  #:attributes (name ty ann-name binding rhs)
-  (pattern (~and whole [:annotated-name rhs:expr])
-           #:with binding (syntax/loc #'whole [ann-name rhs])))
-
-(define-syntax-class optionally-annotated-binding
-  #:attributes (name ann-name binding rhs)
-  #:description "optionally type-annotated binding"
-  #:literal-sets (colon)
-  (pattern b:annotated-binding
-           #:with name #'b.name
-           #:with ann-name #'b.ann-name
-           #:with binding #'b.binding
-           #:with rhs #'b.rhs)
-  (pattern (~and whole [n:id rhs:expr])
-           #:with name #'n
-           #:with ann-name #'n
-           #:with binding #'whole))
-
-(define-syntax-class annotated-values-binding
-  #:attributes ((name 1) (ty 1) (ann-name 1) binding rhs)
-  (pattern (~and whole [(~describe "sequence of type-annotated identifiers" ([:annotated-name] ...)) rhs:expr])
-           #:with binding (syntax/loc #'whole [(ann-name ...) rhs])))
-
-(define-syntax-class optionally-annotated-values-binding
-  #:attributes ((name 1) (ann-name 1) binding rhs)
-  (pattern b:annotated-values-binding
-           #:with (name ...) #'(b.name ...)
-           #:with (ann-name ...) #'(b.ann-name ...)
-           #:with binding #'b.binding
-           #:with rhs #'b.rhs)
-  (pattern (~and whole [(~describe "sequence of optionally type-annotated identifiers" (n:optionally-annotated-formal ...)) rhs:expr])
-           #:with (name ...) #'(n.name ...)
-           #:with (ann-name ...) #'(n.ann-name ...)
-           #:with binding #'whole))
-
-(define-splicing-syntax-class annotated-star-rest
-  #:attributes (name ann-name ty formal-ty)
-  #:literal-sets (colon)
-  (pattern (~seq name:id : ty s:star)
-           #:with formal-ty #'(ty s)
-           #:with ann-name (type-label-property #'name #'ty)))
-
-(define-splicing-syntax-class annotated-dots-rest
-  #:attributes (name ann-name bound ty formal-ty)
-  #:literal-sets (colon)
-  (pattern (~seq name:id : ty bnd:ddd/bound)
-           #:with formal-ty #'(ty . bnd)
-           #:attr bound (attribute bnd.bound)
-           #:with ann-name (type-dotted-property
-                             (type-label-property #'name #'ty)
-                             (attribute bnd.bound))))
-
-(define-syntax-class annotated-formal
-  #:description "annotated variable of the form [x : T]"
-  #:opaque
-  #:attributes (name ty ann-name)
-  (pattern [:annotated-name]))
-
-(define-syntax-class optionally-annotated-formal
-  #:description "optionally annotated variable of the form [x : T] or just x"
-  #:opaque
-  #:attributes (name ty ann-name)
-  (pattern f:annotated-formal
-           #:with name #'f.name
-           #:attr ty #'f.ty
-           #:with ann-name #'f.ann-name)
-  (pattern f:id
-           #:with name #'f
-           #:attr ty #f
-           #:with ann-name #'f))
-
-(define-syntax-class annotated-formals
-  #:attributes (ann-formals (arg-ty 1))
-  #:literal-sets (colon)
-  (pattern (n:annotated-formal ...)
-           #:with ann-formals #'(n.ann-name ...)
-           #:with (arg-ty ...) #'(n.ty ...))
-  (pattern (n:annotated-formal ... (~describe "dotted or starred type"
-                                              (~or rest:annotated-star-rest rest:annotated-dots-rest)))
-           #:with ann-formals #'(n.ann-name ... . rest.ann-name)
-           #:with (arg-ty ...) #'(n.ty ... . rest.formal-ty)))
-
-(define-syntax-class opt-lambda-annotated-formal
-  #:description "annotated variable, potentially with a default value"
-  #:opaque
-  #:attributes (name ty ann-name)
-  (pattern [:annotated-name])
-  (pattern [n:annotated-name val]
-           #:with name #'n.name
-           #:with ty #'n.name
-           #:with ann-name #'(n.ann-name val)))
-
-(define-syntax-class opt-lambda-annotated-formals
-  #:attributes (ann-formals (arg-ty 1))
-  #:literal-sets (colon)
-  (pattern (n:opt-lambda-annotated-formal ...)
-           #:with ann-formals #'(n.ann-name ...)
-           #:with (arg-ty ...) #'(n.ty ...))
-  (pattern (n:opt-lambda-annotated-formal ...
-            (~describe "dotted or starred type"
-                       (~or rest:annotated-star-rest rest:annotated-dots-rest)))
-           #:with ann-formals #'(n.ann-name ... . rest.ann-name)
-           #:with (arg-ty ...) #'(n.ty ... . rest.formal-ty)))
-
-(define-splicing-syntax-class standalone-annotation
-  #:literal-sets (colon)
-  (pattern (~seq : t)
-           #:with ty #'t))
-(define-splicing-syntax-class optional-standalone-annotation
-  (pattern (~optional a:standalone-annotation)
-           #:attr ty (if (attribute a) #'a.ty #f)))
-
-(define-syntax-class type-variables
-  #:attributes ((vars 1))
-  #:description "a sequence of type variables"
-  (pattern (vars:id ...)
-           #:fail-when (check-duplicate-identifier (syntax->list #'(vars ...)))
-           "duplicate type variable declaration"))
-
-(define-splicing-syntax-class lambda-type-vars
-  #:description "optional type parameters"
-  #:attributes (type-vars)
-  (pattern (~seq (~or #:forall #:∀) (var:id ...))
-           #:attr type-vars #'(var ...)))
-
-(define-splicing-syntax-class maybe-lambda-type-vars
-  #:description "optional type parameters"
-  #:attributes (type-vars)
-  (pattern :lambda-type-vars)
-  (pattern (~seq) #:attr type-vars #f))
-
-(define-splicing-syntax-class kw-formal
-  #:attributes (form id default type kw)
-  #:literal-sets (colon)
-  (pattern (~seq kw:keyword id:id)
-           #:with form #'(kw id)
-           #:attr default #f
-           #:attr type #f)
-  (pattern (~seq kw:keyword [id:id default:expr])
-           #:with form #'(kw [id default])
-           #:attr type #f)
-  (pattern (~seq kw:keyword [id:id : type:expr])
-           #:with form #`(kw #,(type-label-property #'id #'type))
-           #:attr default #f)
-  (pattern (~seq kw:keyword [id:id : type:expr default:expr])
-           #:with form #`(kw [#,(type-label-property #'id #'type) default])))
-
-(define-splicing-syntax-class mand-formal
-  #:description "lambda argument"
-  #:attributes (form id default type kw)
-  #:literal-sets (colon)
-  (pattern id:id
-           #:with form #'(id)
-           #:attr default #f
-           #:attr type #f
-           #:attr kw #f)
-  (pattern [id:id : type:expr]
-           #:with form #`(#,(type-label-property #'id #'type))
-           #:attr default #f
-           #:attr kw #f)
-  (pattern :kw-formal))
-
-(define-splicing-syntax-class opt-formal
-  #:description "optional lambda argument"
-  #:attributes (form id default type kw)
-  #:literal-sets (colon)
-  (pattern [id:id default:expr]
-           #:with form #'([id default])
-           #:attr type #f
-           #:attr kw #f)
-  (pattern [id:id : type:expr default:expr]
-           #:with form #`([#,(type-label-property #'id #'type) default])
-           #:attr kw #f)
-  (pattern :kw-formal))
-
-(define-syntax-class rest-arg
-  #:description "rest argument"
-  #:attributes (form)
-  #:literal-sets (colon)
-  ;; specifying opaque here helps produce a better error
-  ;; message for optional argumenents, but produces worse
-  ;; error messages for rest arguments.
-  #:opaque
-  (pattern rest:id #:attr form #'rest)
-  (pattern (rest:id : type:expr :star)
-           #:attr form (type-label-property #'rest #'type))
-  (pattern (rest:id : type:expr bnd:ddd/bound)
-           #:attr bound (attribute bnd.bound)
-           #:attr form (type-dotted-property
-                        (type-label-property #'rest #'type)
-                        (attribute bound))))
-
-(define-syntax-class lambda-formals
-  #:attributes (opt-property kw-property erased)
-  (pattern (~or (mand:mand-formal ... opt:opt-formal ... . rest:rest-arg)
-                (~and (mand:mand-formal ... opt:opt-formal ...)
-                      (~bind [rest.form #'()])))
-           #:attr kw-property
-           ;; separate raw keywords into mandatory and optional and
-           ;; put them in a struct for later use by tc-expr
-           (let ([kws (append (attribute mand.kw)
-                              (attribute opt.kw))]
-                 [opt?s (append (attribute mand.default)
-                                (attribute opt.default))])
-             (define-values (mand-kws opt-kws)
-               (for/fold ([mand-kws '()]
-                          [opt-kws '()])
-                         ([kw (in-list kws)]
-                          [opt? (in-list opt?s)]
-                          #:when kw)
-                 (if opt?
-                     (values mand-kws (cons (syntax-e kw) opt-kws))
-                     (values (cons (syntax-e kw) mand-kws) opt-kws))))
-             (and (or (not (null? mand-kws))
-                      (not (null? opt-kws)))
-                  (lambda-kws mand-kws opt-kws)))
-           #:attr opt-property
-           (list (length (attribute mand)) (length (attribute opt)))
-           #:attr erased
-           (template ((?@ . mand.form) ... (?@ . opt.form) ... . rest.form))))
-
-(define-syntax-class curried-formals
-  #:attributes (erased fun-name)
-  (pattern fun:id
-           #:with fun-name #'fun
-           #:with erased #'fun)
-  (pattern (fun:curried-formals . formals:lambda-formals)
-           #:with fun-name #'fun.fun-name
-           #:with erased #`(fun.erased . #,(attribute formals.erased))))
-
-(define-splicing-syntax-class return-ann
-  #:description "return type annotation"
-  #:literal-sets (colon)
-  (pattern (~seq : type:expr))
-  (pattern (~seq) #:attr type #f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-contracted.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-contracted.rkt
deleted file mode 100644
index e823f70a95..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-contracted.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-
-;; This file provides Typed Racket bindings for values that need
-;; contract protection, even in typed code.
-
-(require "../utils/utils.rkt"
-         (utils any-wrap)
-         (prefix-in c: racket/contract)
-         (rename-in
-          racket/base
-          [default-continuation-prompt-tag -default-continuation-prompt-tag])
-         (for-syntax racket/base
-                     (env env-req)))
-
-(provide default-continuation-prompt-tag)
-
-;; default tag should use Any wrappers
-(define default-continuation-prompt-tag
-  (c:contract (c:-> (c:prompt-tag/c any-wrap/c #:call/cc any-wrap/c))
-              -default-continuation-prompt-tag
-              ;; TODO: we actually want to be able to specify that the
-              ;;       "contract from" party is not the untyped party
-              ;;       here, but that's not currently possible
-              'untyped 'typed))
-
-(begin-for-syntax
-  (add-mod! (variable-reference->module-path-index (#%variable-reference))))
-
-;; Set up a #%type-decl manually to avoid the overhead of bringing in
-;; the "extra-env-lang.rkt" module
-(begin-for-syntax
-  (module* #%type-decl #f
-    (#%plain-module-begin
-     (require typed-racket/env/global-env
-              typed-racket/types/abbrev
-              typed-racket/rep/type-rep)
-     (register-type
-      (quote-syntax default-continuation-prompt-tag)
-      ;; TODO: we actually want the type
-      ;;       for the handler (->* (list) Univ ManyUniv)
-      ;;       but the prompt tag contract doesn't quite
-      ;;       support this (it needs a #:rest argument)
-      ;;
-      ;;       Also, this type works better with inference.
-      (-> (make-Prompt-Tagof Univ (-> Univ ManyUniv)))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env-indexing-abs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env-indexing-abs.rkt
deleted file mode 100644
index 26940afb67..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env-indexing-abs.rkt
+++ /dev/null
@@ -1,380 +0,0 @@
-#lang racket/base
-
-(require
- "../utils/utils.rkt"
- (for-template racket/base racket/list racket/unsafe/ops racket/flonum racket/extflonum racket/fixnum)
- (utils tc-utils) 
- (rename-in (types union abbrev numeric-tower) [-Number N] [-Boolean B] [-Symbol Sym]))
-
-(provide indexing)
-
-(define-syntax-rule (make-env* [i t] ...) (make-env [i (λ () t)] ...))
-
-(define-syntax-rule (indexing index-type)
-  (make-env*
-
-   [build-list (-poly (a) (index-type (-Index . -> . a) . -> . (-lst a)))]
-   [make-list (-poly (a) (index-type a . -> . (-lst a)))]
-
-   ;Section 3.3
-
-   [make-string (cl-> [(index-type) -String] [(index-type -Char) -String])]
-   [string-ref (-> -String index-type -Char)]
-   [string-set! (-String index-type -Char . -> . -Void)]
-   [substring (->opt -String index-type [index-type] -String)]
-   [string-copy! (-String index-type -String [index-type index-type] . ->opt . -Void)]
-   [build-string (index-type (index-type . -> . -Char) . -> . -String)]
-
-
-
-   [read-string (index-type [-Input-Port] . ->opt . (Un -String (-val eof)))]
-   [read-string! (-String [-Input-Port index-type index-type] . ->opt . (Un -Index (-val eof)))]
-   [read-bytes (index-type [-Input-Port] . ->opt . (Un -Bytes (-val eof)))]
-
-   [write-byte (cl-> [(index-type) -Void]
-                     [(index-type -Output-Port) -Void])]
-   [write-string (cl-> [(-String) -Index]
-                       [(-String -Output-Port) -Index]
-                       [(-String -Output-Port index-type) -Index]
-                       [(-String -Output-Port index-type index-type) -Index])]
-   [write-bytes  (cl-> [(-Bytes) -Index]
-                       [(-Bytes -Output-Port) -Index]
-                       [(-Bytes -Output-Port index-type) -Index]
-                       [(-Bytes -Output-Port index-type index-type) -Index])]
-   [write-bytes-avail  (cl-> [(-Bytes) -Index]
-                             [(-Bytes -Output-Port) -Index]
-                             [(-Bytes -Output-Port index-type) -Index]
-                             [(-Bytes -Output-Port index-type index-type) -Index])]
-   [write-bytes-avail*  (cl-> [(-Bytes) (-opt -Index)]
-                              [(-Bytes -Output-Port) (-opt -Index)]
-                              [(-Bytes -Output-Port index-type) (-opt -Index)]
-                              [(-Bytes -Output-Port index-type index-type) (-opt -Index)])]
-   [write-bytes-avail/enable-break (cl-> [(-Bytes) -Index]
-                                         [(-Bytes -Output-Port) -Index]
-                                         [(-Bytes -Output-Port index-type) -Index]
-                                         [(-Bytes -Output-Port index-type index-type) -Index])]
-
-
-
-   [list-ref  (-poly (a) ((-lst a) index-type . -> . a))]
-   [list-tail (-poly (a) ((-lst a) index-type . -> . (-lst a)))]
-
-
-
-   [regexp-match
-    (let ([?outp   (-opt -Output-Port)]
-          [N       index-type]
-          [?N      (-opt index-type)]
-          [optlist (lambda (t) (-opt (-pair t (-lst (-opt t)))))]
-          [-StrRx  (Un -String -Regexp)]
-          [-BtsRx  (Un -Bytes  -Byte-Regexp)]
-          [-StrInput (Un -String -Path)]
-          [-BtsInput (Un -Input-Port -Bytes)])
-      (cl->*
-       (-StrRx -StrInput [N ?N ?outp -Bytes] . ->opt . (optlist -String))
-       (-BtsRx (Un -StrInput -BtsInput) [N ?N ?outp -Bytes] . ->opt . (optlist -Bytes))
-       (-Pattern -BtsInput    [N ?N ?outp -Bytes] . ->opt . (optlist -Bytes))))]
-
-   [regexp-try-match
-    (let ([?outp   (-opt -Output-Port)]
-          [N       index-type]
-          [?N      (-opt index-type)]
-          [optlist (lambda (t) (-opt (-pair t (-lst (-opt t)))))]
-          [-StrRx  (Un -String -Regexp)]
-          [-BtsRx  (Un -Bytes  -Byte-Regexp)])
-       ((Un -BtsRx -StrRx) -Input-Port [N ?N ?outp -Bytes] . ->opt . (optlist -Bytes)))]
-
-
-   [regexp-match-positions
-    (let* ([?outp   (-opt -Output-Port)]
-           [N       index-type]
-           [?N      (-opt index-type)]
-           [ind-pair (-pair -Index -Index)]
-           [output (-opt (-pair ind-pair (-lst (-opt ind-pair))))]
-           [-Input (Un -String -Input-Port -Bytes -Path)])
-      (->opt -Pattern -Input [N ?N ?outp -Bytes] output))]
-
-   [regexp-match?
-    (let ([?outp   (-opt -Output-Port)]
-          [N       index-type]
-          [?N      (-opt index-type)]
-          [-Input (Un -String -Input-Port -Bytes -Path)])
-       (-Pattern -Input [N ?N ?outp -Bytes] . ->opt . B))]
-
-
-   [regexp-match-peek
-    (let ([progress (-val #f)]
-          [N       index-type]
-          [?N      (-opt index-type)]
-          [optlist (lambda (t) (-opt (-pair t (-lst (-opt t)))))])
-       (-Pattern -Input-Port [N ?N progress -Bytes] . ->opt . (optlist -Bytes)))]
-
-
-   [regexp-match-peek-positions
-    (let* ([progress (-val #f)]
-           [N       index-type]
-           [?N      (-opt index-type)]
-           [ind-pair (-pair -Index -Index)]
-           [output (-opt (-pair ind-pair (-lst (-opt ind-pair))))])
-      (->opt -Pattern -Input-Port [N ?N progress -Bytes] output))]
-
-
-   [regexp-match-peek-immediate
-    (let ([progress (-val #f)]
-          [N       index-type]
-          [?N      (-opt index-type)]
-          [optlist (lambda (t) (-opt (-pair t (-lst (-opt t)))))])
-       (-Pattern -Input-Port [N ?N progress -Bytes] . ->opt . (optlist -Bytes)))]
-
-
-   [regexp-match-peek-positions-immediate
-    (let* ([progress (-val #f)]
-           [N       index-type]
-           [?N      (-opt index-type)]
-           [ind-pair (-pair -Index -Index)]
-           [output (-opt (-pair ind-pair (-lst (-opt ind-pair))))])
-      (->opt -Pattern -Input-Port [N ?N progress -Bytes] output))]
-
-
-
-   [regexp-match-peek-positions*
-    (let* ([progress (-val #f)]
-           [N       index-type]
-           [?N      (-opt index-type)]
-           [ind-pair (-pair -Index -Index)]
-           [output (-lst ind-pair)])
-      (->opt -Pattern -Input-Port [N ?N progress -Bytes] output))]
-
-
-   [regexp-match/end
-    (let ([?outp   (-opt -Output-Port)]
-          [N       index-type]
-          [?N      (-opt index-type)]
-          [optlist (lambda (t) (-opt (-pair t (-lst (-opt t)))))]
-          [-StrRx  (Un -String -Regexp)]
-          [-BtsRx  (Un -Bytes  -Byte-Regexp)]
-          [-StrInput (Un -String -Path)]
-          [-BtsInput (Un -Input-Port -Bytes)])
-      (cl->*
-       (-StrRx -StrInput                [N ?N ?outp -Bytes N] . ->opt . (-values (list (optlist -String) (-opt -Bytes))))
-       (-BtsRx (Un -StrInput -BtsInput) [N ?N ?outp -Bytes N] . ->opt . (-values (list (optlist -Bytes) (-opt -Bytes))))
-       (-Pattern -BtsInput              [N ?N ?outp -Bytes N] . ->opt . (-values (list (optlist -Bytes) (-opt -Bytes))))))]
-
-
-   [regexp-match-positions/end
-    (let* ([?outp   (-opt -Output-Port)]
-           [N       index-type]
-           [?N      (-opt index-type)]
-           [ind-pair (-pair -Index -Index)]
-           [output (-opt (-pair ind-pair (-lst (-opt ind-pair))))]
-           [-Input (Un -String -Input-Port -Bytes -Path)])
-      (->opt -Pattern -Input [N ?N -Bytes N] (-values (list output (-opt -Bytes)))))]
-
-
-
-
-   [regexp-match-peek-positions/end
-    (let* ([progress (-val #f)]
-           [N       index-type]
-           [?N      (-opt index-type)]
-           [ind-pair (-pair -Index -Index)]
-           [output (-opt (-pair ind-pair (-lst (-opt ind-pair))))])
-      (->opt -Pattern -Input-Port [N ?N progress -Bytes N] (-values (list output (-opt -Bytes)))))]
-
-
-   [regexp-match-peek-positions-immediate/end
-    (let* ([progress (-val #f)]
-           [N       index-type]
-           [?N      (-opt index-type)]
-           [ind-pair (-pair -Index -Index)]
-           [output (-opt (-pair ind-pair (-lst (-opt ind-pair))))])
-      (->opt -Pattern -Input-Port [N ?N progress -Bytes N] (-values (list output (-opt -Bytes)))))]
-
-
-
-   [regexp-split
-    (let ([N       index-type]
-          [?N      (-opt index-type)]
-          [output (lambda (t) (-pair t (-lst t)))]
-          [-StrRx  (Un -String -Regexp)]
-          [-BtsRx  (Un -Bytes  -Byte-Regexp)]
-          [-BtsInput (Un -Input-Port -Bytes)])
-      (cl->*
-       (-StrRx -String                [N ?N -Bytes] . ->opt . (output -String))
-       (-BtsRx (Un -String -BtsInput) [N ?N -Bytes] . ->opt . (output -Bytes))
-       (-Pattern -BtsInput            [N ?N -Bytes] . ->opt . (output -Bytes))))]
-
-
-
-
-
-
-
-
-
-
-
-
-   [range (cl->* (-> -NonPosReal -Null)
-                 (-> -One (-lst* -Zero))
-                 (-> -Byte (-lst -Byte))
-                 (-> -Index (-lst -Index))
-                 (-> -Fixnum (-lst -NonNegFixnum))
-                 (-> -Real (-lst -Nat))
-                 (->opt -PosInt -Byte [-Int] (-lst -PosByte))
-                 (->opt -Nat -Byte [-Int] (-lst -Byte))
-                 (->opt -PosInt -Index [-Int] (-lst -PosIndex))
-                 (->opt -Nat -Index [-Int] (-lst -Index))
-                 (->opt -Nat -NonNegFixnum [-Int] (-lst -NonNegFixnum))
-                 (->opt -PosInt -Fixnum [-Nat] (-lst -PosFixnum))
-                 (->opt -Nat -Fixnum [-Nat] (-lst -NonNegFixnum))
-                 (->opt -Nat -Nat [-Int] (-lst -Nat))
-                 (->opt -PosInt -Int [-Nat] (-lst -PosInt))
-                 (->opt -Nat -Int [-Nat] (-lst -Nat))
-                 ;; could add cases that guarantee lists of negatives, etc.
-                 (->opt -Int -Real [-Int] (-lst -Int))
-                 (->opt -Rat -Real [-Rat] (-lst -Rat))
-                 (->opt -Flonum -Real [-Flonum] (-lst -Flonum))
-                 (->opt -SingleFlonum -Real [-SingleFlonum] (-lst -SingleFlonum))
-                 (->opt -InexactReal -Real [-InexactReal] (-lst -InexactReal))
-                 (->opt -Real -Real [-Real] (-lst -Real)))]
-   [take   (-poly (a) ((-lst a) index-type . -> . (-lst a)))]
-   [drop   (-poly (a) ((-lst a) index-type . -> . (-lst a)))]
-   [take-right   (-poly (a) ((-lst a) index-type . -> . (-lst a)))]
-   [drop-right   (-poly (a) ((-lst a) index-type . -> . (-lst a)))]
-   [split-at
-    (-poly (a) ((-lst a) index-type . -> . (-values (list (-lst a) (-lst a)))))]
-   [split-at-right
-    (-poly (a) ((-lst a) index-type . -> . (-values (list (-lst a) (-lst a)))))]
-
-   [vector-ref (-poly (a) (cl->* ((-vec a) index-type . -> . a)
-                                 (-VectorTop index-type . -> . Univ)))]
-   [unsafe-vector-ref (-poly (a) (cl->* ((-vec a) index-type . -> . a)
-                                        (-VectorTop index-type . -> . Univ)))]
-   [unsafe-vector*-ref (-poly (a) (cl->* ((-vec a) index-type . -> . a)
-                                         (-VectorTop index-type . -> . Univ)))]
-   [build-vector (-poly (a) (index-type (-Index . -> . a) . -> . (-vec a)))]
-   [vector-set! (-poly (a) (-> (-vec a) index-type a -Void))]
-   [unsafe-vector-set! (-poly (a) (-> (-vec a) index-type a -Void))]
-   [unsafe-vector*-set! (-poly (a) (-> (-vec a) index-type a -Void))]
-   [vector-copy! (-poly (a) ((-vec a) index-type (-vec a) [index-type index-type] . ->opt . -Void))]
-   [make-vector (-poly (a) (cl-> [(index-type) (-vec (Un -Zero a))]
-                                 [(index-type a) (-vec a)]))]
-
-   ;; flvector ops
-
-   [flvector? (make-pred-ty -FlVector)]
-   [flvector (->* (list) -Flonum -FlVector)]
-   [make-flvector (cl->* (-> index-type -FlVector)
-                         (-> index-type -Flonum -FlVector))]
-   
-   [shared-flvector (->* (list) -Flonum -FlVector)]
-   [make-shared-flvector (cl->* (-> index-type -FlVector)
-                                (-> index-type -Flonum -FlVector))]
-
-   [flvector-length (-> -FlVector -Index)]
-   [flvector-ref (-> -FlVector index-type -Flonum)]
-   [flvector-set! (-> -FlVector index-type -Flonum -Void)]
-   [flvector-copy (cl->* (-> -FlVector -FlVector)
-                         (-> -FlVector index-type -FlVector)
-                         (-> -FlVector index-type index-type -FlVector))]
-
-   [unsafe-flvector-length (-> -FlVector -Index)]
-   [unsafe-flvector-ref (-> -FlVector index-type -Flonum)]
-   [unsafe-flvector-set! (-> -FlVector index-type -Flonum -Void)]
-   
-   ;; Section 4.2.5.2 (ExtFlonum Vectors)
-   [extflvector? (make-pred-ty -ExtFlVector)]
-   [extflvector (->* (list) -ExtFlonum -ExtFlVector)]
-   [make-extflvector (cl->* (-> index-type -ExtFlVector)
-                            (-> index-type -ExtFlonum -ExtFlVector))]
-   
-   [shared-extflvector (->* (list) -ExtFlonum -ExtFlVector)]
-   [make-shared-extflvector (cl->* (-> index-type -ExtFlVector)
-                                   (-> index-type -ExtFlonum -ExtFlVector))]
-
-   [extflvector-length (-> -ExtFlVector -Index)]
-   [extflvector-ref (-> -ExtFlVector index-type -ExtFlonum)]
-   [extflvector-set! (-> -ExtFlVector index-type -ExtFlonum -Void)]
-   [extflvector-copy (cl->* (-> -ExtFlVector -ExtFlVector)
-                            (-> -ExtFlVector index-type -ExtFlVector)
-                            (-> -ExtFlVector index-type index-type -ExtFlVector))]
-
-   [unsafe-extflvector-length (-> -ExtFlVector -Index)]
-   [unsafe-extflvector-ref (-> -ExtFlVector index-type -ExtFlonum)]
-   [unsafe-extflvector-set! (-> -ExtFlVector index-type -ExtFlonum -Void)]
-   
-   ;; Section 4.2.4.2 (Fixnum vectors)
-   [fxvector? (make-pred-ty -FxVector)]
-   [fxvector (->* (list) -Fixnum -FxVector)]
-   [make-fxvector (cl->* (-> index-type -FxVector)
-                         (-> index-type -Fixnum -FxVector))]
-   
-   [shared-fxvector (->* (list) -Fixnum -FxVector)]
-   [make-shared-fxvector (cl->* (-> index-type -FxVector)
-                                (-> index-type -Fixnum -FxVector))]
-
-   [fxvector-length (-> -FxVector -Index)]
-   [fxvector-ref (-> -FxVector index-type -Fixnum)]
-   [fxvector-set! (-> -FxVector index-type -Fixnum -Void)]
-   [fxvector-copy (cl->* (-> -FxVector -FxVector)
-                         (-> -FxVector index-type -FxVector)
-                         (-> -FxVector index-type index-type -FxVector))]
-
-
-   [bytes-ref (-> -Bytes index-type -Byte)]
-   [unsafe-bytes-ref (-> -Bytes index-type -Byte)]
-   [bytes-set! (-> -Bytes index-type index-type -Void)]
-   [unsafe-bytes-set! (-> -Bytes index-type index-type -Void)]
-   [subbytes (cl-> [(-Bytes index-type) -Bytes] [(-Bytes index-type index-type) -Bytes])]
-   [bytes-copy! (-Bytes index-type -Bytes [index-type index-type] . ->opt . -Void)]
-   [bytes-fill! (-> -Bytes index-type -Void)]
-   [bytes->string/utf-8 (-Bytes [(Un (-val #f) -Char) index-type index-type] . ->opt . -String)]
-   [bytes->string/locale (-Bytes [(Un (-val #f) -Char) index-type index-type] . ->opt . -String)]
-   [bytes->string/latin-1 (-Bytes [(Un (-val #f) -Char) index-type index-type] . ->opt . -String)]
-   [string->bytes/utf-8 (-String [(Un (-val #f) index-type) index-type index-type] . ->opt . -Bytes)]
-   [string->bytes/locale (-String [(Un (-val #f) index-type) index-type index-type] . ->opt . -Bytes)]
-   [string->bytes/latin-1 (-String [(Un (-val #f) index-type) index-type index-type] . ->opt . -Bytes)]
-   [string-utf-8-length (-String [index-type index-type] . ->opt . -Index)]
-   [bytes-utf-8-length (-Bytes [(Un (-val #f) -Char) index-type index-type] . ->opt . -Index)]
-   [bytes-utf-8-ref (-Bytes [index-type (Un (-val #f) -Char) index-type index-type] . ->opt . -Char)]
-   [bytes-utf-8-index (-Bytes [index-type (Un (-val #f) -Char) index-type index-type] . ->opt . -Index)]
-
-   [integer->integer-bytes (-Integer index-type Univ [Univ -Bytes index-type] . ->opt . -Bytes)]
-   [integer-bytes->integer
-    (cl->*
-     ;; Any truthy value (not only #t) would work here.
-     ;; We can define a truthy type (without difference types (- Univ #f))
-     ;; by unioning everything (including StructTop and co).
-     ;; We should do this at some point.
-     (-Bytes (-val #t) [Univ index-type index-type] . ->opt . -Nat)
-     (-Bytes Univ [Univ index-type index-type] . ->opt . -Integer))]
-
-   [peek-char
-    (cl->* [->opt [-Input-Port index-type] (Un -Char (-val eof))])]
-   [peek-byte
-    (cl->* [->opt [-Input-Port index-type] (Un -Byte (-val eof))])]
-
-   ;; string.rkt
-   [real->decimal-string (-Real [index-type] . ->opt .  -String)]
-
-
-   [raise-argument-error
-    (cl->*
-     [-> Sym -String Univ (Un)]
-     [->* (list Sym -String index-type) Univ (Un)])]
-   [raise-type-error
-    (cl->*
-     [-> Sym -String Univ (Un)]
-     [->* (list Sym -String index-type) Univ (Un)])]
-   [raise-result-error
-    (cl->*
-     [->* (list Sym -String Univ) Univ (Un)]
-     [->* (list Sym -String index-type Univ) Univ (Un)])]
-   [raise-arguments-error
-    (->* (list Sym -String) Univ (Un))]
-   [raise-range-error
-    (-> Sym -String -String index-type Univ index-type index-type (Un index-type (-val #f)) (Un))]
-
-   ))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env-indexing.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env-indexing.rkt
deleted file mode 100644
index f566001e03..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env-indexing.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-
-(require
- "../utils/utils.rkt"
- (types numeric-tower) (env init-envs)
- "base-env-indexing-abs.rkt")
-
-(define e (indexing -Integer))
-(define (initialize-indexing) (initialize-type-env e))
-(provide initialize-indexing)
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env-numeric.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env-numeric.rkt
deleted file mode 100644
index 91ba65be1a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env-numeric.rkt
+++ /dev/null
@@ -1,2374 +0,0 @@
-#lang s-exp "env-lang.rkt"
-
-(begin
-  (require
-   racket/list racket/math racket/flonum racket/extflonum racket/unsafe/ops unstable/sequence racket/match
-   (for-template racket/flonum racket/extflonum racket/fixnum racket/math racket/unsafe/ops racket/base
-                 (only-in "../types/numeric-predicates.rkt" index?))
-   (only-in (types abbrev numeric-tower) [-Number N] [-Boolean B] [-Symbol Sym] [-Real R] [-PosInt -Pos]))
-
-  ;; TODO having definitions only at the top is really inconvenient.
-
-  (define all-int-types
-    (list -Zero -One -PosByte -Byte -PosIndex -Index
-          -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum -Fixnum
-          -PosInt -Nat -NegInt -NonPosInt -Int))
-  (define rat-types (list -PosRat -NonNegRat -NegRat -NonPosRat -Rat))
-
-  (define all-rat-types (append all-int-types rat-types))
-  (define all-flonum-types
-    (list -FlonumPosZero -FlonumNegZero -FlonumZero -FlonumNan
-          -PosFlonum -NonNegFlonum -NegFlonum -NonPosFlonum -Flonum))
-  (define single-flonum-types
-    (list -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero -SingleFlonumNan
-          -PosSingleFlonum -NonNegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum -SingleFlonum))
-  (define inexact-real-types
-    (list -InexactRealPosZero -InexactRealNegZero -InexactRealZero -InexactRealNan
-          -PosInexactReal -NonNegInexactReal -NegInexactReal -NonPosInexactReal -InexactReal))
-  (define all-float-types (append all-flonum-types single-flonum-types inexact-real-types))
-  (define real-types (list -RealZero -PosReal -NonNegReal -NegReal -NonPosReal -Real))
-  (define all-real-types (append all-rat-types all-float-types real-types))
-  (define number-types
-    (list -ExactNumber -FloatComplex -SingleFlonumComplex -InexactComplex -Number))
-  (define all-number-types (append all-real-types number-types))
-
-
-  ;; convenient to build large case-lambda types
-  (define (from-cases . cases)
-    (apply cl->* (flatten cases)))
-  ;; for fixnum-specific operations. if they return at all, we know
-  ;; their args were fixnums. otherwise, an error would have been thrown
-  ;; for the moment, this is only useful if the result is used as a test
-  ;; once we have a set of filters that are true/false based on reaching
-  ;; a certain point, this will be more useful
-  (define (fx-from-cases . cases)
-    (apply from-cases (map (lambda (x)
-                             (add-unconditional-filter-all-args
-                              x -Fixnum))
-                           (flatten cases))))
-
-  (define (binop t [r t])
-    (t t . -> . r))
-  (define (varop t [r t])
-    (->* (list) t r))
-  (define (varop-1+ t [r t])
-    (->* (list t) t r))
-
-  (define (unop t) (-> t t))
-
-  (define (commutative-binop a1 a2 [r a2])
-    (list (-> a1 a2 r) (-> a2 a1 r)))
-  ;; when having at least one of a given type matters (e.g. adding one+ Pos and Nats)
-  (define (commutative-case t1 t2 [r t1])
-    (list (->* (list t1 t2) t2 r)
-          (->* (list t2 t1) t2 r)
-          (->* (list t2 t2 t1) t2 r)))
-
-  (define (comp t1 [t2 t1])
-    (-> t1 t2 B))
-  ;; simple case useful with equality predicates.
-  ;; if the equality is true, we know that general arg is in fact of specific type.
-  (define (commutative-equality/filter general specific)
-    (list (-> general specific B : (-FS (-filter specific 0) -top))
-          (-> specific general B : (-FS (-filter specific 1) -top))))
-
-  (define (exclude-zero non-neg pos [zero -Zero])
-    (list (-> zero non-neg B : (-FS (-filter zero 1) (-filter pos 1)))
-          (-> non-neg zero B : (-FS (-filter zero 0) (-filter pos 0)))))
-
-
-  (define round-type ; also used for truncate
-    (lambda ()
-      (from-cases
-       (map unop all-int-types)
-       (-> -NonNegRat -Nat)
-       (-> -NonPosRat -NonPosInt)
-       (-> -Rat -Int)
-       (map unop (list -FlonumPosZero -FlonumNegZero -FlonumZero
-                       -NonNegFlonum -NonPosFlonum -Flonum
-                       -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero
-                       -NonNegSingleFlonum -NonPosSingleFlonum -SingleFlonum
-                       -InexactRealPosZero -InexactRealNegZero -InexactRealZero
-                       -NonNegInexactReal -NonPosInexactReal -InexactReal
-                       -RealZero -NonNegReal -NonPosReal -Real)))))
-  
-  (define (inexact-zero->exact-zero-type)
-    (for/list ([t (in-list
-                    (list -FlonumPosZero -FlonumNegZero -FlonumZero
-                          -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero
-                          -InexactRealPosZero -InexactRealNegZero -InexactRealZero
-                          -RealZero))])
-      (-> t -Zero)))
-  
-  (define (exact-round-type) ; also used for exact-truncate
-    (from-cases
-     (map unop all-int-types)
-     (inexact-zero->exact-zero-type)
-     (-> (Un -NonNegRat -NonNegFlonum -NonNegSingleFlonum -NonNegInexactReal -NonNegReal) -Nat)
-     (-> (Un -NonPosRat -NonPosFlonum -NonPosSingleFlonum -NonPosInexactReal -NonPosReal) -NonPosInt)
-     (-> (Un -Rat -Flonum -SingleFlonum -InexactReal -Real) -Int)))
-  
-  (define fl-unop (lambda () (unop -Flonum)))
-
-  ;; types for specific operations, to avoid repetition between safe and unsafe versions
-  (define fx+-type
-    (lambda ()
-      (fx-from-cases
-       (binop -Zero)
-       (map (lambda (t) (commutative-binop t -Zero t))
-            (list -One -PosByte -Byte -PosIndex -Index))
-       (commutative-binop -PosByte -Byte -PosIndex)
-       (-Byte -Byte . -> . -PosIndex)
-       ;; in other cases, either we stay within fixnum range, or we error
-       (commutative-binop -Pos -Nat -PosFixnum)
-       (-Nat -Nat . -> . -NonNegFixnum)
-       (commutative-binop -NegInt -One -NonPosFixnum)
-       (commutative-binop -NegInt -NonPosInt -NegFixnum)
-       (-NonPosInt -NonPosInt . -> . -NonPosFixnum)
-       (-Int -Int . -> . -Fixnum))))
-  (define fx--type
-    (lambda ()
-      (fx-from-cases
-       (binop -Zero)
-       (map (lambda (t) (commutative-binop t -Zero t))
-            (list -One -PosByte -Byte -PosIndex -Index))
-       (-One -One . -> . -Zero)
-       (-PosByte -One . -> . -Byte)
-       (-PosIndex -One . -> . -Index)
-       (-PosFixnum -One . -> . -NonNegFixnum)
-       (-PosInt -One . -> . -NonNegFixnum)
-       (-NegInt -Nat . -> . -NegFixnum)
-       (-NonPosInt -PosInt . -> . -NegFixnum)
-       (-NonPosInt -Nat . -> . -NonPosFixnum)
-       (-PosInt -NonPosInt . -> . -PosInt)
-       (-Nat -NegInt . -> . -PosInt)
-       (-Nat -NonPosInt . -> . -Nat)
-       (-Int -Int . -> . -Fixnum))))
-  (define fx*-type
-    (lambda ()
-      (fx-from-cases
-       (map binop (list -Zero -One))
-       (commutative-binop -Zero -Int)
-       (-PosByte -PosByte . -> . -PosIndex)
-       (-Byte -Byte . -> . -Index)
-       (-PosInt -PosInt . -> . -PosFixnum)
-       (commutative-binop -PosInt -NegInt -NegFixnum)
-       (-NegInt -NegInt . -> . -PosFixnum)
-       (-Nat -Nat . -> . -NonNegFixnum)
-       (commutative-binop -Nat -NonPosInt -NonPosFixnum)
-       (-NonPosFixnum -NonPosFixnum . -> . -NonNegFixnum)
-       (-Int -Int . -> . -Fixnum))))
-  (define fxquotient-type
-    (lambda ()
-      (fx-from-cases
-       (-Zero -Int . -> . -Zero)
-       (map (lambda (t) (-> t -One t)) ; division by one is identity
-            (list -PosByte -Byte -PosIndex -Index
-                  -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum -Fixnum))
-       (-Byte -Nat . -> . -Byte)
-       (-Index -Nat . -> . -Index)
-       (-Nat -Nat . -> . -NonNegFixnum)
-       (commutative-binop -Nat -NonPosInt -NonPosFixnum)
-       (-NonPosInt -NonPosInt . -> . -NonNegFixnum)
-       (-Int -Int . -> . -Fixnum))))
-  (define fxremainder-type ; result has same sign as first arg
-    (lambda ()
-      (fx-from-cases
-       (-One -One . -> . -Zero)
-       (map (lambda (t) (list (-> -Nat t t)
-                              (-> t -Int t)))
-            (list -Byte -Index))
-       (-Nat -Int . -> . -NonNegFixnum)
-       (-NonPosInt -Int . -> . -NonPosFixnum)
-       (-Int -Int . -> . -Fixnum))))
-  (define fxmodulo-type ; result has same sign as second arg
-    (lambda ()
-      (fx-from-cases
-       (-One -One . -> . -Zero)
-       (map (lambda (t) (list (-> -Int t t)
-                              (-> t -Nat t)))
-            (list -Byte -Index))
-       (-Int -Nat . -> . -NonNegFixnum)
-       (-Int -NonPosInt . -> . -NonPosFixnum)
-       (-Int -Int . -> . -Fixnum))))
-  (define fxabs-type
-    (lambda ()
-      (fx-from-cases
-       (map unop (list -Zero -One -PosByte -Byte -PosIndex -Index))
-       ((Un -PosInt -NegInt) . -> . -PosFixnum)
-       (-Int . -> . -NonNegFixnum))))
-  (define fx=-type
-    (lambda ()
-      (fx-from-cases
-       ;; we could rule out cases like (= Pos Neg), but we currently don't
-       (map (lambda (l) (apply exclude-zero l))
-            (list (list -Byte -PosByte)
-                  (list -Index -PosIndex)
-                  (list -Nat -PosFixnum)
-                  (list -NonPosInt -NegFixnum)
-                  (list -Int (Un -PosFixnum -NegFixnum))))
-       (map (lambda (t) (commutative-equality/filter -Int t))
-            (list -One -PosByte -Byte -PosIndex -Index -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum))
-       (comp -Int))))
-  (define fx<-type
-    (lambda ()
-      (fx-from-cases
-       (-> -Pos -One B : (-FS (-filter (Un) 0) -top)) ; can't happen
-       (-> -Nat -One B : (-FS (-filter -Zero 0) -top))
-       (-> -Int -One B : (-FS (-filter -NonPosFixnum 0) (-filter -PosFixnum 0)))
-       ;; bleh, this repeats cases below, but since we can only match a single
-       ;; case, we need to put it here as well, or we would not gain that info,
-       ;; as another unrelated case would match
-       (-> -Byte -Zero B : (-FS (-filter (Un) 0) -top))
-       (-> -Byte -One B : (-FS (-filter -Zero 0) -top))
-       (-> -Zero -Byte B : (-FS (-filter -PosByte 1) (-filter -Zero 1)))
-       (-> -Byte -PosByte B : (-FS -top (-filter -PosByte 0)))
-       (-> -Byte -Byte B : (-FS (-filter -PosByte 1) -top))
-       (-> -Pos -Byte B : (-FS (-and (-filter -PosByte 0) (-filter -PosByte 1)) -top))
-       (-> -Byte -Pos B : (-FS -top (-and (-filter -PosByte 0) (-filter -PosByte 1))))
-       (-> -Byte -Nat B : (-FS -top (-filter -Byte 1)))
-       (-> -Index -Zero B : (-FS (-filter (Un) 0) -top))
-       (-> -Index -One B : (-FS (-filter -Zero 0) -top))
-       (-> -Zero -Index B : (-FS (-filter -PosIndex 1) (-filter -Zero 1)))
-       (-> -Index -PosIndex B : (-FS -top (-filter -PosIndex 0)))
-       (-> -Index -Index B : (-FS (-filter -PosIndex 1) -top))
-       (-> -Pos -Index B : (-FS (-and (-filter -PosIndex 0) (-filter -PosIndex 1)) -top))
-       (-> -Index -Pos B : (-FS -top (-and (-filter -PosIndex 0) (-filter -PosIndex 1))))
-       (-> -Nat -Byte B : (-FS (-and (-filter -Byte 0) (-filter -PosByte 1)) -top))
-       (-> -Nat -Index B : (-FS (-and (-filter -Index 0) (-filter -PosIndex 1)) -top))
-       (-> -Index -Nat B : (-FS -top (-filter -Index 1)))
-       ;; general integer cases
-       (-> -Int -Zero B : (-FS (-filter -NegFixnum 0) (-filter -NonNegFixnum 0)))
-       (-> -Zero -Int B : (-FS (-filter -PosFixnum 1) (-filter -NonPosFixnum 1)))
-       (-> -Int -PosInt B : (-FS -top (-filter -PosFixnum 0)))
-       (-> -Int -Nat B : (-FS -top (-filter -NonNegFixnum 0)))
-       (-> -Nat -Int B : (-FS (-filter -PosFixnum 1) -top))
-       (-> -Int -NonPosInt B : (-FS (-filter -NegFixnum 0) -top))
-       (-> -NegInt -Int B : (-FS -top (-filter -NegFixnum 1)))
-       (-> -NonPosInt -Int B : (-FS -top (-filter -NonPosFixnum 1)))
-       (comp -Int))))
-  (define fx>-type
-    (lambda ()
-      (fx-from-cases
-       (-> -One -Pos B : (-FS (-filter (Un) 1) -top)) ; can't happen
-       (-> -One -Nat B : (-FS (-filter -Zero 1) -top))
-       (-> -One -Int B : (-FS (-filter -NonPosFixnum 1) (-filter -PosFixnum 1)))
-       (-> -Byte -Zero B : (-FS (-filter -PosByte 0) (-filter -Zero 0)))
-       (-> -Zero -Byte B : (-FS (-filter (Un) 1) -top))
-       (-> -One -Byte B : (-FS (-filter -Zero 1) (-filter -PosByte 1)))
-       (-> -PosByte -Byte B : (-FS -top (-filter -PosByte 1)))
-       (-> -Byte -Byte B : (-FS (-filter -PosByte 0) -top))
-       (-> -Byte -Pos B : (-FS (-and (-filter -PosByte 0) (-filter -PosByte 1)) -top))
-       (-> -Pos -Byte B : (-FS -top (-and (-filter -PosByte 0) (-filter -PosByte 1))))
-       (-> -Byte -Nat B : (-FS (-and (-filter -PosByte 0) (-filter -Byte 1)) -top))
-       (-> -Zero -Index B : (-FS (-filter (Un) 1) -top))
-       (-> -One -Index B : (-FS (-filter -Zero 1) -top))
-       (-> -Index -Zero B : (-FS (-filter -PosIndex 0) (-filter -Zero 0)))
-       (-> -PosIndex -Index B : (-FS -top (-filter -PosIndex 1)))
-       (-> -Index -Index B : (-FS (-filter -PosIndex 0) -top))
-       (-> -Index -Pos B : (-FS (-and (-filter -PosIndex 0) (-filter -PosIndex 1)) -top))
-       (-> -Pos -Index B : (-FS -top (-and (-filter -PosIndex 0) (-filter -PosIndex 1))))
-       (-> -Index -Nat B : (-FS (-and (-filter -PosIndex 0) (-filter -Index 1)) -top))
-       (-> -Nat -Byte B : (-FS -top (-filter -Byte 0)))
-       (-> -Nat -Index B : (-FS -top (-filter -Index 0)))
-       ;; general integer cases
-       (-> -Zero -Int B : (-FS (-filter -NegFixnum 1) (-filter -NonNegFixnum 1)))
-       (-> -Int -Zero  B : (-FS (-filter -PosFixnum 0) (-filter -NonPosFixnum 0)))
-       (-> -PosInt -Int B : (-FS -top (-filter -PosFixnum 1)))
-       (-> -Nat -Int B : (-FS -top (-filter -NonNegFixnum 1)))
-       (-> -Int -Nat B : (-FS (-filter -PosFixnum 0) -top))
-       (-> -NonPosInt -Int B : (-FS (-filter -NegFixnum 1) -top))
-       (-> -Int -NegInt B : (-FS -top (-filter -NegFixnum 0)))
-       (-> -Int -NonPosInt B : (-FS -top (-filter -NonPosFixnum 0)))
-       (comp -Int))))
-  (define fx<=-type
-    (lambda ()
-      (fx-from-cases
-       (-> -Pos -One B : (-FS (-filter -One 0) -top))
-       (-> -Byte -Zero B : (-FS (-filter -Zero 0) (-filter -PosByte 0)))
-       (-> -Zero -Byte B : (-FS -top (-filter (Un) 1)))
-       (-> -One -Byte B : (-FS (-filter -PosByte 1) (-filter -Zero 1)))
-       (-> -PosByte -Byte B : (-FS (-filter -PosByte 1) -top))
-       (-> -Byte -Byte B : (-FS -top (-filter -PosByte 0)))
-       (-> -Pos -Byte B : (-FS (-and (-filter -PosByte 0) (-filter -PosByte 1)) -top))
-       (-> -Byte -Pos B : (-FS -top (-and (-filter -PosByte 0) (-filter -PosByte 1))))
-       (-> -Byte -Nat B : (-FS -top (-and (-filter -PosByte 0) (-filter -Byte 1))))
-       (-> -Index -Zero B : (-FS (-filter -Zero 0) (-filter -PosIndex 0)))
-       (-> -Zero -Index B : (-FS -top (-filter (Un) 1)))
-       (-> -One -Index B : (-FS (-filter -PosIndex 1) (-filter -Zero 1)))
-       (-> -PosIndex -Index B : (-FS (-filter -PosIndex 1) -top))
-       (-> -Index -Index B : (-FS -top (-filter -PosIndex 0)))
-       (-> -Pos -Index B : (-FS (-and (-filter -PosIndex 0) (-filter -PosIndex 1)) -top))
-       (-> -Index -Pos B : (-FS -top (-and (-filter -PosIndex 0) (-filter -PosIndex 1))))
-       (-> -Nat -Byte B : (-FS (-filter -Byte 0) -top))
-       (-> -Nat -Index B : (-FS (-filter -Index 0) -top))
-       (-> -Index -Nat B : (-FS -top (-and (-filter -PosIndex 0) (-filter -Index 1))))
-       ;; general integer cases
-       (-> -Nat -Zero B : (-FS (-filter -Zero 0) -top))
-       (-> -One -Nat B : (-FS (-filter -PosFixnum 1) (-filter -Zero 1)))
-       (-> -Int -Zero B : (-FS (-filter -NonPosFixnum 0) (-filter -PosFixnum 0)))
-       (-> -Zero -Int B : (-FS (-filter -NonNegFixnum 1) (-filter -NegFixnum 1)))
-       (-> -PosInt -Int B : (-FS (-filter -PosFixnum 1) -top))
-       (-> -Int -Nat B : (-FS -top (-filter -PosFixnum 0)))
-       (-> -Nat -Int B : (-FS (-filter -NonNegFixnum 1) -top))
-       (-> -Int -NegInt B : (-FS (-filter -NegFixnum 0) -top))
-       (-> -Int -NonPosInt B : (-FS (-filter -NonPosFixnum 0) -top))
-       (-> -NonPosInt -Int B : (-FS -top (-filter -NegFixnum 1)))
-       (comp -Int))))
-  (define fx>=-type
-    (lambda ()
-      (fx-from-cases
-       (-> -One -Pos B : (-FS (-filter -One 1) -top))
-       (-> -Zero -Byte B : (-FS (-filter -Zero 1) (-filter -PosByte 1)))
-       (-> -Byte -Zero B : (-FS -top (-filter (Un) 0)))
-       (-> -Byte -One B : (-FS (-filter -PosByte 0) (-filter -Zero 0)))
-       (-> -Byte -PosByte B : (-FS (-filter -PosByte 0) -top))
-       (-> -Byte -Byte B : (-FS -top (-filter -PosByte 1)))
-       (-> -Byte -Pos B : (-FS (-and (-filter -PosByte 1) (-filter -PosByte 0)) -top))
-       (-> -Pos -Byte B : (-FS -top (-and (-filter -PosByte 1) (-filter -PosByte 0))))
-       (-> -Byte -Nat B : (-FS (-filter -Byte 1) -top))
-       (-> -Zero -Index B : (-FS (-filter -Zero 1) (-filter -PosIndex 1)))
-       (-> -Index -Zero B : (-FS -top (-filter (Un) 0)))
-       (-> -Index -One B : (-FS (-filter -PosIndex 0) (-filter -Zero 0)))
-       (-> -Index -PosIndex B : (-FS (-filter -PosIndex 0) -top))
-       (-> -Index -Index B : (-FS -top (-filter -PosIndex 1)))
-       (-> -Index -Pos B : (-FS (-and (-filter -PosIndex 0) (-filter -PosIndex 1)) -top))
-       (-> -Pos -Index B : (-FS -top (-and (-filter -PosIndex 0) (-filter -PosIndex 1))))
-       (-> -Index -Nat B : (-FS (-filter -Index 1) -top))
-       (-> -Nat -Byte B : (-FS -top (-and (-filter -Byte 0) (-filter -PosByte 1))))
-       (-> -Nat -Index B : (-FS -top (-and (-filter -Index 0) (-filter -PosIndex 1))))
-       ;; general integer cases
-       (-> -Zero -Nat B : (-FS (-filter -Zero 1) -top))
-       (-> -Nat -One B : (-FS (-filter -PosFixnum 0) (-filter -Zero 0)))
-       (-> -Zero -Int B : (-FS (-filter -NonPosFixnum 1) (-filter -PosFixnum 1)))
-       (-> -Int -Zero B : (-FS (-filter -NonNegFixnum 0) (-filter -NegFixnum 0)))
-       (-> -Int -PosInt B : (-FS (-filter -PosFixnum 0) -top))
-       (-> -Nat -Int B : (-FS -top (-filter -PosFixnum 1)))
-       (-> -Int -Nat B : (-FS (-filter -NonNegFixnum 0) -top))
-       (-> -NegInt -Int B : (-FS (-filter -NegFixnum 1) -top))
-       (-> -NonPosInt -Int B : (-FS (-filter -NonPosFixnum 1) -top))
-       (-> -Int -NonPosInt B : (-FS -top (-filter -NegFixnum 0)))
-       (comp -Int))))
-  (define fxmin-type
-    (lambda ()
-      (fx-from-cases
-       (binop -Zero)
-       (binop -One)
-       (commutative-binop -Zero (Un -Zero -One) -Zero)
-       (commutative-binop -PosByte -PosInt -PosByte)
-       (commutative-binop -Byte -Nat -Byte)
-       (commutative-binop -PosIndex -PosInt -PosIndex)
-       (commutative-binop -Index -Nat -Index)
-       (-> -Pos -Pos -PosFixnum)
-       (-> -Nat -Nat -NonNegFixnum)
-       (commutative-binop -NegInt -Int -NegFixnum)
-       (commutative-binop -NonPosInt -Int -NonPosInt)
-       (-> -Int -Int -Fixnum))))
-  (define fxmax-type
-    (lambda ()
-      (fx-from-cases
-       (binop -Zero)
-       (commutative-binop -One (Un -Zero -One) -One)
-       (commutative-binop -PosByte -Byte -PosByte)
-       (binop -Byte)
-       (commutative-binop -PosIndex -Index -PosIndex)
-       (map binop (list -Index -NegFixnum -NonPosFixnum))
-       (commutative-binop -PosInt -Int -PosFixnum)
-       (commutative-binop -Nat -Int -NonNegFixnum)
-       (-> -Int -Int -Fixnum))))
-  (define fxand-type
-    (lambda ()
-      (fx-from-cases
-       (commutative-binop -Zero -Int -Zero)
-       (commutative-binop -Byte -Int -Byte)
-       (commutative-binop -Index -Int -Index)
-       (binop -Nat -NonNegFixnum)
-       (binop -NegInt -NegFixnum)
-       (binop -NonPosInt -NonPosFixnum)
-       (binop -Int -Fixnum))))
-  (define fxior-type
-    (lambda ()
-      (fx-from-cases
-       (binop -Zero)
-       (commutative-binop -One -Zero -One)
-       (commutative-binop -PosByte -Byte -PosByte)
-       (binop -Byte)
-       (commutative-binop -PosIndex -Index -PosIndex)
-       (binop -Index)
-       (commutative-binop -PosInt -Nat -PosFixnum)
-       (binop -Nat -NonNegFixnum)
-       (commutative-binop -NegInt -Int -NegFixnum) ; as long as there's one negative, the result is negative
-       (binop -Int -Fixnum))))
-  (define fxxor-type
-    (lambda ()
-      (fx-from-cases
-       (binop -Zero)
-       (binop -One -Zero)
-       (binop -Byte)
-       (binop -Index)
-       (binop -Nat -NonNegFixnum)
-       (binop -NonPosInt -NonNegFixnum)
-       (commutative-binop -NegInt -Nat -NegFixnum)
-       (commutative-binop -NonPosInt -Nat -NonPosFixnum)
-       (binop -Int -Fixnum))))
-  (define fxnot-type
-    (lambda ()
-      (fx-from-cases
-       (-Nat . -> . -NegFixnum)
-       (-NegInt . -> . -NonNegFixnum)
-       (-Int . -> . -Fixnum))))
-  (define fxlshift-type
-    (lambda ()
-      (fx-from-cases
-       (map (lambda (x) (-> x -Zero x))
-            (list -Zero -One -PosByte -Byte -PosIndex -Index))
-       (-> -PosInt -Int -PosFixnum) ; negative 2nd arg errors, so we can't reach 0
-       (-> -Nat -Int -NonNegFixnum)
-       (-> -NegInt -Int -NegFixnum)
-       (-> -NonPosInt -Int -NonPosFixnum)
-       (binop -Int -Fixnum))))
-  (define fxrshift-type
-    (lambda ()
-      (fx-from-cases
-       (map (lambda (x) (-> x -Zero x))
-            (list -Zero -One -PosByte -Byte -PosIndex -Index))
-       (-> -Nat -Int -NonNegFixnum) ; can reach 0
-       (-> -NegInt -Int -NegFixnum) ; can't reach 0
-       (-> -NonPosInt -Int -NonPosFixnum)
-       (binop -Int -Fixnum))))
-
-
-  (define flabs-type
-    (lambda ()
-      (cl->* (-> -FlonumZero -FlonumZero)
-             (-> (Un -PosFlonum -NegFlonum) -PosFlonum)
-             (-> -Flonum -NonNegFlonum))))
-  (define fl+-type
-    (lambda ()
-      (from-cases (map (lambda (t) (commutative-binop t -FlonumZero t))
-                       ;; not all float types. singleton types are ruled out, since NaN can arise
-                       (list -FlonumZero -FlonumNan -PosFlonum -NonNegFlonum
-                             -NegFlonum -NonPosFlonum -Flonum))
-                  (commutative-binop -NonNegFlonum -PosFlonum -PosFlonum)
-                  (map binop (list -NonNegFlonum -NegFlonum -NonPosFlonum -Flonum))
-                  (-Flonum -Flonum . -> . -Flonum))))
-  (define fl--type
-    (lambda ()
-      (from-cases (binop -FlonumZero)
-                  (-NegFlonum (Un -NonNegFlonum -FlonumZero) . -> . -NegFlonum)
-                  ((Un -NonPosFlonum -FlonumZero) -PosFlonum . -> . -NegFlonum)
-                  (-NonPosFlonum -NonNegFlonum . -> . -NonPosFlonum)
-                  (binop -Flonum))))
-  (define fl*-type
-    (lambda ()
-      (from-cases (binop -FlonumZero)
-                  ;; we don't have Pos Pos -> Pos, possible underflow
-                  (binop -PosFlonum -NonNegFlonum)
-                  (binop -NonNegFlonum)
-                  (commutative-binop -NegFlonum -PosFlonum -NonPosFlonum)
-                  (binop -NegFlonum -NonNegFlonum)
-                  (binop -Flonum))))
-  (define fl/-type
-    (lambda ()
-      (from-cases (-FlonumZero -Flonum . -> . -FlonumZero)
-                  (-PosFlonum -PosFlonum . -> . -NonNegFlonum) ; possible underflow
-                  (commutative-binop -PosFlonum -NegFlonum -NonPosFlonum)
-                  (-NegFlonum -NegFlonum . -> . -NonNegFlonum)
-                  (binop -Flonum))))
-  (define fl=-type
-    (lambda ()
-      (from-cases (map (lambda (l) (exclude-zero (car l) (cadr l) -FlonumZero))
-                       (list (list -NonNegFlonum -PosFlonum)
-                             (list -NonPosFlonum -NegFlonum)))
-                  (map (lambda (t) (commutative-equality/filter -Flonum t))
-                       (list -FlonumZero -PosFlonum -NonNegFlonum
-                             -NegFlonum -NonPosFlonum))
-                  (comp -Flonum))))
-  (define fl<-type
-    (lambda ()
-      (from-cases
-       ;; false case, we know nothing, lhs may be NaN. same for all comparison that can involve floats
-       (-> -FlonumZero -Flonum B : (-FS (-filter -PosFlonum 1) -top))
-       (-> -Flonum -FlonumZero B : (-FS (-filter -NegFlonum 0) -top))
-       (-> -PosFlonum -Flonum B : (-FS (-filter -PosFlonum 1) -top))
-       (-> -Flonum -PosFlonum B)
-       (-> -NonNegFlonum -Flonum B : (-FS (-filter -PosFlonum 1) -top))
-       (-> -Flonum -NonNegFlonum B)
-       (-> -NegFlonum -Flonum B)
-       (-> -Flonum -NegFlonum B : (-FS (-filter -NegFlonum 0) -top))
-       (-> -NonPosFlonum -Flonum B)
-       (-> -Flonum -NonPosFlonum B : (-FS (-filter -NegFlonum 0) -top))
-       (comp -Flonum))))
-  (define fl>-type
-    (lambda ()
-      (from-cases
-       (-> -FlonumZero -Flonum B : (-FS (-filter -NegFlonum 1) -top))
-       (-> -Flonum -FlonumZero B : (-FS (-filter -PosFlonum 0) -top))
-       (-> -PosFlonum -Flonum B)
-       (-> -Flonum -PosFlonum B : (-FS (-filter -PosFlonum 0) -top))
-       (-> -NonNegFlonum -Flonum B)
-       (-> -Flonum -NonNegFlonum B : (-FS (-filter -PosFlonum 0) -top))
-       (-> -NegFlonum -Flonum B : (-FS (-filter -NegFlonum 1) -top))
-       (-> -Flonum -NegFlonum B)
-       (-> -NonPosFlonum -Flonum B : (-FS (-filter -NegFlonum 1) -top))
-       (-> -Flonum -NonPosFlonum B)
-       (comp -Flonum))))
-  (define fl<=-type
-    (lambda ()
-      (from-cases
-       (-> -FlonumZero -Flonum B : (-FS (-filter -NonNegFlonum 1) -top))
-       (-> -Flonum -FlonumZero B : (-FS (-filter -NonPosFlonum 0) -top))
-       (-> -PosFlonum -Flonum B : (-FS (-filter -PosFlonum 1) -top))
-       (-> -Flonum -PosFlonum B)
-       (-> -NonNegFlonum -Flonum B : (-FS (-filter -NonNegFlonum 1) -top))
-       (-> -Flonum -NonNegFlonum B)
-       (-> -NegFlonum -Flonum B)
-       (-> -Flonum -NegFlonum B : (-FS (-filter -NegFlonum 0) -top))
-       (-> -NonPosFlonum -Flonum B)
-       (-> -Flonum -NonPosFlonum B : (-FS (-filter -NonPosFlonum 0) -top))
-       (comp -Flonum))))
-  (define fl>=-type
-    (lambda ()
-      (from-cases
-       (-> -FlonumZero -Flonum B : (-FS (-filter -NonPosFlonum 1) -top))
-       (-> -Flonum -FlonumZero B : (-FS (-filter -NonNegFlonum 0) -top))
-       (-> -PosFlonum -Flonum B)
-       (-> -Flonum -PosFlonum B : (-FS (-filter -PosFlonum 0) -top))
-       (-> -NonNegFlonum -Flonum B)
-       (-> -Flonum -NonNegFlonum B : (-FS (-filter -NonNegFlonum 0) -top))
-       (-> -NegFlonum -Flonum B : (-FS (-filter -NegFlonum 1) -top))
-       (-> -Flonum -NegFlonum B)
-       (-> -NonPosFlonum -Flonum B)
-       (-> -Flonum -NonPosFlonum B : (-FS (-filter -NonPosFlonum 0) -top))
-       (comp -Flonum))))
-  (define flmin-type
-    (lambda ()
-      (from-cases (commutative-case -NegFlonum -Flonum)
-                  (commutative-case -NonPosFlonum -Flonum)
-                  (map binop (list -PosFlonum -NonNegFlonum -Flonum)))))
-  (define flmax-type
-    (lambda ()
-      (from-cases (commutative-case -PosFlonum -Flonum)
-                  (commutative-case -NonNegFlonum -Flonum)
-                  (map binop (list -NegFlonum -NonPosFlonum -Flonum)))))
-  (define flround-type ; truncate too
-    (lambda ()
-      (from-cases (map unop (list -FlonumPosZero -FlonumNegZero -FlonumZero
-                                  -NonNegFlonum -NonPosFlonum -Flonum)))))
-  (define flfloor-type
-    (lambda ()
-      (from-cases (map unop (list -FlonumPosZero -FlonumNegZero -FlonumZero
-                                  -NonNegFlonum -NegFlonum -NonPosFlonum -Flonum)))))
-  (define flceiling-type
-    (lambda ()
-      (from-cases (map unop (list -FlonumPosZero -FlonumNegZero -FlonumZero
-                                  -PosFlonum -NonNegFlonum -NonPosFlonum -Flonum)))))
-  (define fllog-type
-    (lambda ()
-      (from-cases (-> -FlonumZero -NegFlonum) ; -inf
-                  (unop -Flonum))))
-  (define flexp-type
-    (lambda ()
-      (from-cases (-NonNegFlonum . -> . -PosFlonum)
-                  (-NegFlonum . -> . -NonNegFlonum)
-                  (-Flonum . -> . -Flonum)))) ; nan is the only non nonnegative case (returns nan)
-  (define flsqrt-type
-    (lambda ()
-      (from-cases (map unop (list -FlonumPosZero -FlonumNegZero -FlonumZero
-                                  -NonNegFlonum ; we don't have positive case, possible underflow
-                                  -Flonum))))) ; anything negative returns nan
-  (define flexpt-type
-    (lambda ()
-      (from-cases (-FlonumZero -PosFlonum . -> . -FlonumZero) ; (flexpt -0.0 0.1) -> 0.0 ; not sign preserving
-                  ((Un -PosFlonum -NegFlonum) -FlonumZero . -> . -PosFlonum) ; always returns 1.0
-                  (-NonNegFlonum -Flonum . -> . -NonNegFlonum) ; can underflow
-                  (-Flonum -Flonum . -> . -Flonum))))
-
-  (define fx->fl-type
-    (lambda ()
-      (fx-from-cases
-       (-PosInt . -> . -PosFlonum)
-       (-Nat . -> . -NonNegFlonum)
-       (-NegInt . -> . -NegFlonum)
-       (-NonPosInt . -> . -NonPosFlonum)
-       (-Int . -> . -Flonum))))
-  (define fl->fx-type
-    (lambda ()
-      (from-cases
-       (-FlonumZero . -> . -Zero)
-       (-PosFlonum . -> . -PosFixnum)
-       (-NegFlonum . -> . -NegFixnum)
-       (-NonNegFlonum . -> . -NonNegFixnum)
-       (-NonPosFlonum . -> . -NonPosFixnum)
-       (-Flonum . -> . -Fixnum))))
-  (define make-flrectangular-type (lambda () (-Flonum -Flonum . -> . -FloatComplex)))
-  (define flreal-part-type (lambda () (-FloatComplex . -> . -Flonum)))
-  (define flimag-part-type (lambda () (-FloatComplex . -> . -Flonum)))
-  (define flrandom-type (lambda () (-Pseudo-Random-Generator . -> . -Flonum)))
-
-  ;; There's a repetitive pattern in the types of each comparison operator.
-  ;; As explained below, this is because filters don't do intersections.
-  (define (<-type-pattern base pos non-neg neg non-pos [zero -RealZero])
-    (list (-> base zero B : (-FS (-filter neg 0) (-filter non-neg 0)))
-          (-> zero base B : (-FS (-filter pos 1) (-filter non-pos 1)))
-          (-> base -PosReal B : (-FS -top (-filter pos 0)))
-          (-> base -NonNegReal B : (-FS -top (-filter non-neg 0)))
-          (-> -NonNegReal base B : (-FS (-filter pos 1) -top))
-          (-> base -NonPosReal B : (-FS (-filter neg 0) -top))
-          (-> -NegReal base B : (-FS -top (-filter neg 1)))
-          (-> -NonPosReal base B : (-FS -top (-filter non-pos 1)))))
-  (define (>-type-pattern base pos non-neg neg non-pos [zero -RealZero])
-    (list (-> base zero B : (-FS (-filter pos 0) (-filter non-pos 0)))
-          (-> zero base B : (-FS (-filter neg 1) (-filter non-neg 1)))
-          (-> base -NonNegReal B : (-FS (-filter pos 0) -top))
-          (-> -PosReal base B : (-FS -top (-filter pos 1)))
-          (-> -NonNegReal base B : (-FS -top (-filter non-neg 1)))
-          (-> -NonPosReal base B : (-FS (-filter neg 1) -top))
-          (-> base -NegReal B : (-FS -top (-filter neg 0)))
-          (-> base -NonPosReal B : (-FS -top (-filter non-pos 0)))))
-  ;; this is > with flipped filters
-  (define (<=-type-pattern base pos non-neg neg non-pos [zero -RealZero])
-    (list (-> base zero B : (-FS (-filter non-pos 0) (-filter pos 0)))
-          (-> zero base B : (-FS (-filter non-neg 1) (-filter neg 1)))
-          (-> base -NonNegReal B : (-FS -top (-filter pos 0)))
-          (-> -PosReal base B : (-FS (-filter pos 1) -top))
-          (-> -NonNegReal base B : (-FS (-filter non-neg 1) -top))
-          (-> -NonPosReal base B : (-FS -top (-filter neg 1)))
-          (-> base -NegReal B : (-FS (-filter neg 0) -top))
-          (-> base -NonPosReal B : (-FS (-filter non-pos 0) -top))))
-  (define (>=-type-pattern base pos non-neg neg non-pos [zero -RealZero])
-    (list (-> base zero B : (-FS (-filter non-neg 0) (-filter neg 0)))
-          (-> zero base B : (-FS (-filter non-pos 1) (-filter pos 1)))
-          (-> base -PosReal B : (-FS (-filter pos 0) -top))
-          (-> base -NonNegReal B : (-FS (-filter non-neg 0) -top))
-          (-> -NonNegReal base B : (-FS -top (-filter pos 1)))
-          (-> base -NonPosReal B : (-FS -top (-filter neg 0)))
-          (-> -NegReal base B : (-FS (-filter neg 1) -top))
-          (-> -NonPosReal base B : (-FS (-filter non-pos 1) -top))))
-
-  (define (negation-pattern pos neg non-neg non-pos)
-    (list (-> pos neg)
-          (-> non-neg non-pos)
-          (-> neg pos)
-          (-> non-pos non-neg)
-          (-> -Zero pos neg)
-          (-> -Zero non-neg non-pos)
-          (-> -Zero neg pos)
-          (-> -Zero non-pos non-neg)))
-
-  ;; Used because (- min-fixnum) > max-fixnum
-  (define (half-negation-pattern pos neg non-neg non-pos)
-    (list (-> pos neg)
-          (-> non-neg non-pos)
-          (-> -Zero pos neg)
-          (-> -Zero non-neg non-pos)))
-
-  (define abs-cases ; used both for abs and magnitude
-    (list
-     (map unop (list -Zero -One -PosByte -Byte -PosIndex -Index -PosFixnum -NonNegFixnum))
-     ;; abs may not be closed on fixnums. (abs min-fixnum) is not a fixnum
-     ((Un -PosInt -NegInt) . -> . -PosInt)
-     (-Int . -> . -Nat)
-     ((Un -PosRat -NegRat) . -> . -PosRat)
-     (-Rat . -> . -NonNegRat)
-     (-FlonumZero . -> . -FlonumZero)
-     ((Un -PosFlonum -NegFlonum) . -> . -PosFlonum)
-     (-Flonum . -> . -NonNegFlonum)
-     (-SingleFlonumZero . -> . -SingleFlonumZero)
-     ((Un -PosSingleFlonum -NegSingleFlonum) . -> . -PosSingleFlonum)
-     (-SingleFlonum . -> . -NonNegSingleFlonum)
-     (-InexactRealZero . -> . -InexactRealZero)
-     ((Un -PosInexactReal -NegInexactReal) . -> . -PosInexactReal)
-     (-InexactReal . -> . -NonNegInexactReal)
-     ((Un -PosReal -NegReal) . -> . -PosReal)
-     (-Real . -> . -NonNegReal)))
-
-  (define extfl-unop (lambda () (unop -ExtFlonum)))
-  
-  (define extflabs-type
-    (lambda ()
-      (cl->* (-> -ExtFlonumZero -ExtFlonumZero)
-             (-> (Un -PosExtFlonum -NegExtFlonum) -PosExtFlonum)
-             (-> -ExtFlonum -NonNegExtFlonum))))
-  (define extfl+-type
-    (lambda ()
-      (from-cases (map (lambda (t) (commutative-binop t -ExtFlonumZero t))
-                       ;; not all float types. singleton types are ruled out, since NaN can arise
-                       (list -ExtFlonumZero -ExtFlonumNan -PosExtFlonum -NonNegExtFlonum
-                             -NegExtFlonum -NonPosExtFlonum -ExtFlonum))
-                  (commutative-binop -NonNegExtFlonum -PosExtFlonum -PosExtFlonum)
-                  (map binop (list -NonNegExtFlonum -NegExtFlonum -NonPosExtFlonum -ExtFlonum))
-                  (-ExtFlonum -ExtFlonum . -> . -ExtFlonum))))
-  (define extfl--type
-    (lambda ()
-      (from-cases (binop -ExtFlonumZero)
-                  (-NegExtFlonum (Un -NonNegExtFlonum -ExtFlonumZero) . -> . -NegExtFlonum)
-                  ((Un -NonPosExtFlonum -ExtFlonumZero) -PosExtFlonum . -> . -NegExtFlonum)
-                  (-NonPosExtFlonum -NonNegExtFlonum . -> . -NonPosExtFlonum)
-                  (binop -ExtFlonum))))
-  (define extfl*-type
-    (lambda ()
-      (from-cases (binop -ExtFlonumZero)
-                  ;; we don't have Pos Pos -> Pos, possible underflow
-                  (binop -PosExtFlonum -NonNegExtFlonum)
-                  (binop -NonNegExtFlonum)
-                  (commutative-binop -NegExtFlonum -PosExtFlonum -NonPosExtFlonum)
-                  (binop -NegExtFlonum -NonNegExtFlonum)
-                  (binop -ExtFlonum))))
-  (define extfl/-type
-    (lambda ()
-      (from-cases (-ExtFlonumZero -ExtFlonum . -> . -ExtFlonumZero)
-                  (-PosExtFlonum -PosExtFlonum . -> . -NonNegExtFlonum) ; possible underflow
-                  (commutative-binop -PosExtFlonum -NegExtFlonum -NonPosExtFlonum)
-                  (-NegExtFlonum -NegExtFlonum . -> . -NonNegExtFlonum)
-                  (binop -ExtFlonum))))
-  (define extfl=-type
-    (lambda ()
-      (from-cases (map (lambda (l) (exclude-zero (car l) (cadr l) -ExtFlonumZero))
-                       (list (list -NonNegExtFlonum -PosExtFlonum)
-                             (list -NonPosExtFlonum -NegExtFlonum)))
-                  (map (lambda (t) (commutative-equality/filter -ExtFlonum t))
-                       (list -ExtFlonumZero -PosExtFlonum -NonNegExtFlonum
-                             -NegExtFlonum -NonPosExtFlonum))
-                  (comp -ExtFlonum))))
-  (define extfl<-type
-    (lambda ()
-      (from-cases
-       ;; false case, we know nothing, lhs may be NaN. same for all comparison that can involve floats
-       (-> -ExtFlonumZero -ExtFlonum B : (-FS (-filter -PosExtFlonum 1) -top))
-       (-> -ExtFlonum -ExtFlonumZero B : (-FS (-filter -NegExtFlonum 0) -top))
-       (-> -PosExtFlonum -ExtFlonum B : (-FS (-filter -PosExtFlonum 1) -top))
-       (-> -ExtFlonum -PosExtFlonum B)
-       (-> -NonNegExtFlonum -ExtFlonum B : (-FS (-filter -PosExtFlonum 1) -top))
-       (-> -ExtFlonum -NonNegExtFlonum B)
-       (-> -NegExtFlonum -ExtFlonum B)
-       (-> -ExtFlonum -NegExtFlonum B : (-FS (-filter -NegExtFlonum 0) -top))
-       (-> -NonPosExtFlonum -ExtFlonum B)
-       (-> -ExtFlonum -NonPosExtFlonum B : (-FS (-filter -NegExtFlonum 0) -top))
-       (comp -ExtFlonum))))
-  (define extfl>-type
-    (lambda ()
-      (from-cases
-       (-> -ExtFlonumZero -ExtFlonum B : (-FS (-filter -NegExtFlonum 1) -top))
-       (-> -ExtFlonum -ExtFlonumZero B : (-FS (-filter -PosExtFlonum 0) -top))
-       (-> -PosExtFlonum -ExtFlonum B)
-       (-> -ExtFlonum -PosExtFlonum B : (-FS (-filter -PosExtFlonum 0) -top))
-       (-> -NonNegExtFlonum -ExtFlonum B)
-       (-> -ExtFlonum -NonNegExtFlonum B : (-FS (-filter -PosExtFlonum 0) -top))
-       (-> -NegExtFlonum -ExtFlonum B : (-FS (-filter -NegExtFlonum 1) -top))
-       (-> -ExtFlonum -NegExtFlonum B)
-       (-> -NonPosExtFlonum -ExtFlonum B : (-FS (-filter -NegExtFlonum 1) -top))
-       (-> -ExtFlonum -NonPosExtFlonum B)
-       (comp -ExtFlonum))))
-  (define extfl<=-type
-    (lambda ()
-      (from-cases
-       (-> -ExtFlonumZero -ExtFlonum B : (-FS (-filter -NonNegExtFlonum 1) -top))
-       (-> -ExtFlonum -ExtFlonumZero B : (-FS (-filter -NonPosExtFlonum 0) -top))
-       (-> -PosExtFlonum -ExtFlonum B : (-FS (-filter -PosExtFlonum 1) -top))
-       (-> -ExtFlonum -PosExtFlonum B)
-       (-> -NonNegExtFlonum -ExtFlonum B : (-FS (-filter -NonNegExtFlonum 1) -top))
-       (-> -ExtFlonum -NonNegExtFlonum B)
-       (-> -NegExtFlonum -ExtFlonum B)
-       (-> -ExtFlonum -NegExtFlonum B : (-FS (-filter -NegExtFlonum 0) -top))
-       (-> -NonPosExtFlonum -ExtFlonum B)
-       (-> -ExtFlonum -NonPosExtFlonum B : (-FS (-filter -NonPosExtFlonum 0) -top))
-       (comp -ExtFlonum))))
-  (define extfl>=-type
-    (lambda ()
-      (from-cases
-       (-> -ExtFlonumZero -ExtFlonum B : (-FS (-filter -NonPosExtFlonum 1) -top))
-       (-> -ExtFlonum -ExtFlonumZero B : (-FS (-filter -NonNegExtFlonum 0) -top))
-       (-> -PosExtFlonum -ExtFlonum B)
-       (-> -ExtFlonum -PosExtFlonum B : (-FS (-filter -PosExtFlonum 0) -top))
-       (-> -NonNegExtFlonum -ExtFlonum B)
-       (-> -ExtFlonum -NonNegExtFlonum B : (-FS (-filter -NonNegExtFlonum 0) -top))
-       (-> -NegExtFlonum -ExtFlonum B : (-FS (-filter -NegExtFlonum 1) -top))
-       (-> -ExtFlonum -NegExtFlonum B)
-       (-> -NonPosExtFlonum -ExtFlonum B)
-       (-> -ExtFlonum -NonPosExtFlonum B : (-FS (-filter -NonPosExtFlonum 0) -top))
-       (comp -ExtFlonum))))
-  (define extflmin-type
-    (lambda ()
-      (from-cases (commutative-case -NegExtFlonum -ExtFlonum)
-                  (commutative-case -NonPosExtFlonum -ExtFlonum)
-                  (map binop (list -PosExtFlonum -NonNegExtFlonum -ExtFlonum)))))
-  (define extflmax-type
-    (lambda ()
-      (from-cases (commutative-case -PosExtFlonum -ExtFlonum)
-                  (commutative-case -NonNegExtFlonum -ExtFlonum)
-                  (map binop (list -NegExtFlonum -NonPosExtFlonum -ExtFlonum)))))
-  (define extflround-type ; truncate too
-    (lambda ()
-      (from-cases (map unop (list -ExtFlonumPosZero -ExtFlonumNegZero -ExtFlonumZero
-                                  -NonNegExtFlonum -NonPosExtFlonum -ExtFlonum)))))
-  (define extflfloor-type
-    (lambda ()
-      (from-cases (map unop (list -ExtFlonumPosZero -ExtFlonumNegZero -ExtFlonumZero
-                                  -NonNegExtFlonum -NegExtFlonum -NonPosExtFlonum -ExtFlonum)))))
-  (define extflceiling-type
-    (lambda ()
-      (from-cases (map unop (list -ExtFlonumPosZero -ExtFlonumNegZero -ExtFlonumZero
-                                  -PosExtFlonum -NonNegExtFlonum -NonPosExtFlonum -ExtFlonum)))))
-  (define extfllog-type
-    (lambda ()
-      (from-cases (-> -ExtFlonumZero -NegExtFlonum) ; -inf
-                  (unop -ExtFlonum))))
-  (define extflexp-type
-    (lambda ()
-      (from-cases (-NonNegExtFlonum . -> . -PosExtFlonum)
-                  (-NegExtFlonum . -> . -NonNegExtFlonum)
-                  (-ExtFlonum . -> . -ExtFlonum)))) ; nan is the only non nonnegative case (returns nan)
-  (define extflsqrt-type
-    (lambda ()
-      (from-cases (map unop (list -ExtFlonumPosZero -ExtFlonumNegZero -ExtFlonumZero
-                                  -NonNegExtFlonum ; we don't have positive case, possible underflow
-                                  -ExtFlonum))))) ; anything negative returns nan
-  (define extflexpt-type
-    (lambda ()
-      (from-cases (-ExtFlonumZero -PosExtFlonum . -> . -ExtFlonumZero) ; (extflexpt -0.0t0 0.1t0) -> 0.0t0 ; not sign preserving
-                  ((Un -PosExtFlonum -NegExtFlonum) -ExtFlonumZero . -> . -PosExtFlonum) ; always returns 1.0t0
-                  (-NonNegExtFlonum -ExtFlonum . -> . -NonNegExtFlonum) ; can underflow
-                  (-ExtFlonum -ExtFlonum . -> . -ExtFlonum))))
-
-  (define fx->extfl-type
-    (lambda ()
-      (fx-from-cases
-       (-PosInt . -> . -PosExtFlonum)
-       (-Nat . -> . -NonNegExtFlonum)
-       (-NegInt . -> . -NegExtFlonum)
-       (-NonPosInt . -> . -NonPosExtFlonum)
-       (-Int . -> . -ExtFlonum))))
-  (define extfl->fx-type
-    (lambda ()
-      (from-cases
-       (-ExtFlonumZero . -> . -Zero)
-       (-PosExtFlonum . -> . -PosFixnum)
-       (-NegExtFlonum . -> . -NegFixnum)
-       (-NonNegExtFlonum . -> . -NonNegFixnum)
-       (-NonPosExtFlonum . -> . -NonPosFixnum)
-       (-ExtFlonum . -> . -Fixnum))))
-
-  ;Check to ensure we fail fast if the flonum bindings change
-  (define-namespace-anchor anchor)
-  (let ((flonum-ops #'([unsafe-flround    flround]
-                       [unsafe-flfloor    flfloor]
-                       [unsafe-flceiling  flceiling]
-                       [unsafe-fltruncate fltruncate]
-                       [unsafe-flsin      flsin]
-                       [unsafe-flcos      flcos]
-                       [unsafe-fltan      fltan]
-                       [unsafe-flatan     flatan]
-                       [unsafe-flasin     flasin ]
-                       [unsafe-flacos     flacos]
-                       [unsafe-fllog      fllog]
-                       [unsafe-flexp      flexp]
-                       [unsafe-flexpt     flexpt]
-                       [unsafe-extflround    extflround]
-                       [unsafe-extflfloor    extflfloor]
-                       [unsafe-extflceiling  extflceiling]
-                       [unsafe-extfltruncate extfltruncate]
-                       [unsafe-extflsin      extflsin]
-                       [unsafe-extflcos      extflcos]
-                       [unsafe-extfltan      extfltan]
-                       [unsafe-extflatan     extflatan]
-                       [unsafe-extflasin     extflasin]
-                       [unsafe-extflacos     extflacos]
-                       [unsafe-extfllog      extfllog]
-                       [unsafe-extflexp      extflexp]
-                       [unsafe-extflexpt     extflexpt])))
-    (define phase (namespace-base-phase (namespace-anchor->namespace anchor)))
-
-    (for ([op-pair (in-syntax flonum-ops)])
-      (match op-pair
-       [(app syntax->list (list id1 id2))
-        (unless (free-identifier=? id1 id2 (sub1 phase))
-          (error 'flonum-operations "The assumption that the safe and unsafe flonum-ops are the same binding has been violated. ~a and ~a are diffferent bindings." id1 id2))])))
-
-  )
-
-;; numeric predicates
-;; There are 25 values that answer true to zero?. They are either reals, or inexact complexes.
-[zero?
-  (cl->*
-    (-> -ExactNumber B : (-FS (-filter (-val 0) 0) (-not-filter (-val 0) 0)))
-    (-> -Real B : (-FS (-filter -RealZero 0) (-not-filter -RealZero 0)))
-    (-> N B : (-FS (-filter (Un -RealZero -InexactComplex -InexactImaginary) 0)
-                   (-not-filter -RealZero 0))))]
-
-[number? (make-pred-ty N)]
-[integer? (asym-pred Univ B (-FS (-filter (Un -Int -Flonum -SingleFlonum) 0) ; inexact-integers exist...
-                                 (-not-filter -Int 0)))]
-[exact-integer? (make-pred-ty -Int)]
-[real? (make-pred-ty -Real)]
-[flonum? (make-pred-ty -Flonum)]
-[single-flonum? (make-pred-ty -SingleFlonum)]
-[double-flonum? (make-pred-ty -Flonum)]
-[inexact-real? (make-pred-ty -InexactReal)]
-[complex? (make-pred-ty N)]
-;; `rational?' includes all Reals, except infinities and NaN.
-[rational? (asym-pred Univ B (-FS (-filter -Real 0) (-not-filter -Rat 0)))]
-[exact? (make-pred-ty -ExactNumber)]
-[inexact? (make-pred-ty (Un -InexactReal -InexactImaginary -InexactComplex))]
-[fixnum? (make-pred-ty -Fixnum)]
-[index? (make-pred-ty -Index)]
-[positive? (cl->* (-> -Byte B : (-FS (-filter -PosByte 0) (-filter -Zero 0)))
-                  (-> -Index B : (-FS (-filter -PosIndex 0) (-filter -Zero 0)))
-                  (-> -Fixnum B : (-FS (-filter -PosFixnum 0) (-filter -NonPosFixnum 0)))
-                  (-> -Int B : (-FS (-filter -PosInt 0) (-filter -NonPosInt 0)))
-                  (-> -Rat B : (-FS (-filter -PosRat 0) (-filter -NonPosRat 0)))
-                  (-> -Flonum B : (-FS (-filter -PosFlonum 0) (-filter -NonPosFlonum 0)))
-                  (-> -SingleFlonum B : (-FS (-filter -PosSingleFlonum 0) (-filter -NonPosSingleFlonum 0)))
-                  (-> -InexactReal B : (-FS (-filter -PosInexactReal 0) (-filter -NonPosInexactReal 0)))
-                  (-> -Real B : (-FS (-filter -PosReal 0) (-filter -NonPosReal 0))))]
-[negative? (cl->* (-> -Fixnum B : (-FS (-filter -NegFixnum 0) (-filter -NonNegFixnum 0)))
-                  (-> -Int B : (-FS (-filter -NegInt 0) (-filter -Nat 0)))
-                  (-> -Rat B : (-FS (-filter -NegRat 0) (-filter -NonNegRat 0)))
-                  (-> -Flonum B : (-FS (-filter -NegFlonum 0) (-filter -NonNegFlonum 0)))
-                  (-> -SingleFlonum B : (-FS (-filter -NegSingleFlonum 0) (-filter -NonNegSingleFlonum 0)))
-                  (-> -InexactReal B : (-FS (-filter -NegInexactReal 0) (-filter -NonNegInexactReal 0)))
-                  (-> -Real B : (-FS (-filter -NegReal 0) (-filter -NonNegReal 0))))]
-[exact-positive-integer? (make-pred-ty -Pos)]
-[exact-nonnegative-integer? (make-pred-ty -Nat)]
-
-[odd? (-> -Int B : (-FS (-not-filter -Zero 0) (-not-filter -One 0)))]
-[even? (-> -Int B : (-FS (-not-filter -One 0) (-not-filter -Zero 0)))]
-
-[=
- (from-cases
-  (map (lambda (l) (apply exclude-zero l))
-       (list (list -Byte -PosByte)
-             (list -Index -PosIndex)
-             (list -NonNegFixnum -PosFixnum)
-             (list -NonPosFixnum -NegFixnum)
-             (list -Nat -PosInt)
-             (list -NonPosInt -NegInt)
-             (list -Int (Un -PosInt -NegInt))
-             (list -NonNegRat -PosRat)
-             (list -NonPosRat -NegRat)
-             (list -Rat (Un -PosRat -NegRat))
-             (list -NonNegFlonum -PosFlonum -FlonumZero)
-             (list -NonPosFlonum -NegFlonum -FlonumZero)
-             (list -Flonum (Un -PosFlonum -NegFlonum) -FlonumZero)
-             (list -NonNegSingleFlonum -PosSingleFlonum -SingleFlonumZero)
-             (list -NonPosSingleFlonum -NegSingleFlonum -SingleFlonumZero)
-             (list -SingleFlonum (Un -PosSingleFlonum -NegSingleFlonum) -SingleFlonumZero)
-             (list -NonNegInexactReal -PosInexactReal -InexactRealZero)
-             (list -NonPosInexactReal -NegInexactReal -InexactRealZero)
-             (list -InexactReal (Un -PosInexactReal -NegInexactReal) -InexactRealZero)
-             (list -NonNegReal -PosReal -RealZero)
-             (list -NonPosReal -NegReal -RealZero)
-             (list -Real (Un -PosReal -NegReal) -RealZero)))
-  (map (lambda (t) (commutative-equality/filter -ExactNumber t))
-       (list -One -PosByte -Byte -PosIndex -Index
-             -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum -Fixnum
-             -PosInt -Nat -NegInt -NonPosInt -Int
-             -PosRat -NonNegRat -NegRat -NonPosRat -Rat
-             -ExactNumber))
-  (map (lambda (t) (commutative-equality/filter -Flonum t))
-       (list -FlonumZero -PosFlonum -NonNegFlonum -NegFlonum -NonPosFlonum -Flonum))
-  (map (lambda (t) (commutative-equality/filter -SingleFlonum t))
-       (list -SingleFlonumZero -PosSingleFlonum -NonNegSingleFlonum
-             -NegSingleFlonum -NonPosSingleFlonum -SingleFlonum))
-  (map (lambda (t) (commutative-equality/filter -InexactReal t))
-       (list -InexactRealZero -PosInexactReal -NonNegInexactReal
-             -NegInexactReal -NonPosInexactReal -InexactReal))
-  ;; this case should take care of mixed type equality. the filters give
-  ;; sign information, and we get exactness information from the original
-  ;; types
-  (map (lambda (t) (commutative-equality/filter -Real t))
-       (list -RealZero -PosReal -NonNegReal -NegReal -NonPosReal -Real))
-  (->* (list N N) N B))]
-
-[<  (from-cases
-     (-> -Pos -One B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> -Nat -One B : (-FS (-filter -Zero 0) -top))
-     (-> -Byte -RealZero B : (-FS (-filter (Un) 0) -top))
-     (-> -Byte -One B : (-FS (-filter -Zero 0) -top))
-     (-> -Zero -Byte B : (-FS (-filter -PosByte 1) (-filter -Zero 1))) ; can't be -RealZero, which includes NaN
-     (-> -Zero -Index B : (-FS (-filter -PosIndex 1) (-filter -Zero 1)))
-     (-> -Zero -NonNegFixnum B : (-FS (-filter -PosFixnum 1) (-filter -Zero 1)))
-     (-> -Zero -Nat B : (-FS (-filter -PosInt 1) (-filter -Zero 1)))
-     (-> -Byte -PosByte B : (-FS -top (-filter -PosByte 0)))
-     (-> -Byte -Byte B : (-FS (-filter -PosByte 1) -top))
-     (-> -PosInt -Byte B : (-FS (-and (-filter -PosByte 0) (-filter -PosByte 1)) -top))
-     (-> -PosReal -Byte B : (-FS (-filter -PosByte 1) -top)) ; -PosReal is ok here, no filter for #f
-     (-> -Byte -PosInt B : (-FS -top (-and (-filter -PosByte 0) (-filter -PosByte 1))))
-     (-> -Byte -PosRat B : (-FS -top (-filter -PosByte 0))) ; can't be -PosReal, which includes NaN
-     (-> -Nat -Byte B : (-FS (-and (-filter -Byte 0) (-filter -PosByte 1)) -top))
-     (-> -NonNegReal -Byte B : (-FS (-filter -PosByte 1) -top))
-     (-> -Byte -Nat B : (-FS -top (-filter -Byte 1)))
-     (-> -Index -RealZero B : (-FS (-filter (Un) 0) -top))
-     (-> -Index -One B : (-FS (-filter -Zero 0) -top))
-     (-> -Zero -Index B : (-FS (-filter -PosIndex 1) (-filter -Zero 1))) ; can't be -RealZero, which includes NaN
-     (-> -Index -PosIndex B : (-FS -top (-filter -PosIndex 0)))
-     (-> -Index -Index B : (-FS (-filter -PosIndex 1) -top))
-     (-> -PosInt -Index B : (-FS (-and (-filter -PosIndex 0) (-filter -PosIndex 1)) -top))
-     (-> -PosReal -Index B : (-FS (-filter -PosIndex 1) -top))
-     (-> -Index -PosInt B : (-FS -top (-and (-filter -PosIndex 0) (-filter -PosIndex 1))))
-     (-> -Index -PosRat B : (-FS -top (-filter -PosIndex 0))) ; can't be -PosReal, which includes NaN
-     (-> -Nat -Index B : (-FS (-and (-filter -Index 0) (-filter -PosIndex 1)) -top))
-     (-> -NonNegReal -Index B : (-FS (-filter -PosIndex 1) -top))
-     (-> -Index -Nat B : (-FS -top (-filter -Index 1)))
-     (-> -Fixnum -Zero B : (-FS (-filter -NegFixnum 0) (-filter -NonNegFixnum 0))) ; can't be -RealZero
-     (-> -Zero -Fixnum B : (-FS (-filter -PosFixnum 1) (-filter -NonPosFixnum 1)))
-     (-> -Fixnum -PosInt B : (-FS -top (-and (-filter -PosFixnum 0) (-filter -PosFixnum 1))))
-     (-> -Fixnum -PosRat B : (-FS -top (-filter -PosFixnum 0)))
-     (-> -Fixnum -Nat B : (-FS -top (-and (-filter -NonNegFixnum 0) (-filter -NonNegFixnum 1))))
-     (-> -Fixnum -NonNegRat B : (-FS -top (-filter -NonNegFixnum 0)))
-     (-> -Nat -Fixnum B : (-FS (-and (-filter -PosFixnum 1) (-filter -NonNegFixnum 0)) -top))
-     (-> -NonNegReal -Fixnum B : (-FS (-filter -PosFixnum 1) -top))
-     (-> -Fixnum -NonPosInt B : (-FS (-and (-filter -NegFixnum 0) (-filter -NonPosFixnum 1)) -top))
-     (-> -Fixnum -NonPosReal B : (-FS (-filter -NegFixnum 0) -top))
-     (-> -NegInt -Fixnum B : (-FS -top (-and (-filter -NegFixnum 0) (-filter -NegFixnum 1))))
-     (-> -NegRat -Fixnum B : (-FS -top (-filter -NegFixnum 1)))
-     (-> -NonPosInt -Fixnum B : (-FS -top (-and (-filter -NonPosFixnum 0) (-filter -NonPosFixnum 1))))
-     (-> -NonPosRat -Fixnum B : (-FS -top (-filter -NonPosFixnum 1)))
-     (-> -Rat (-val +inf.0) B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> (-val +inf.0) -Rat B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> -Rat (-val -inf.0) B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> (-val -inf.0) -Rat B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> -Rat (-val +inf.f) B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> (-val +inf.f) -Rat B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> -Rat (-val -inf.f) B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> (-val -inf.f) -Rat B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     ;; If applying filters resulted in the interesection of the filter and the
-     ;; original type, we'd only need the cases for Fixnums and those for Reals.
-     ;; Cases for Integers and co would fall out naturally from the Real cases,
-     ;; since we'd keep track of the representation knowledge we'd already have,
-     ;; and the Real cases are enough to give us sign information.
-     ;; In the meantime, repetition is hard to avoid.
-     (<-type-pattern -Int -PosInt -Nat -NegInt -NonPosInt -Zero)
-     (<-type-pattern -Rat -PosRat -NonNegRat -NegRat -NonPosRat -Zero)
-     (<-type-pattern -Flonum -PosFlonum -NonNegFlonum -NegFlonum -NonPosFlonum)
-     (<-type-pattern -SingleFlonum -PosSingleFlonum -NonNegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum)
-     (<-type-pattern -InexactReal -PosInexactReal -NonNegInexactReal -NegInexactReal -NonPosInexactReal)
-     (<-type-pattern -Real -PosReal -NonNegReal -NegReal -NonPosReal)
-     (->* (list R R) R B))]
-[>  (from-cases
-     (-> -One -Pos B : (-FS (-filter (Un) 1) -top)) ; can't happen
-     (-> -One -Nat B : (-FS (-filter -Zero 1) -top))
-     (-> -RealZero -Byte B : (-FS (-filter (Un) 1) -top))
-     (-> -One -Byte B : (-FS (-filter -Zero 1) -top))
-     (-> -Byte -Zero B : (-FS (-filter -PosByte 0) (-filter -Zero 0)))
-     (-> -Index -Zero B : (-FS (-filter -PosIndex 0) (-filter -Zero 0)))
-     (-> -NonNegFixnum -Zero B : (-FS (-filter -PosFixnum 0) (-filter -Zero 0)))
-     (-> -Nat -Zero B : (-FS (-filter -PosInt 0) (-filter -Zero 0)))
-     (-> -PosByte -Byte B : (-FS -top (-filter -PosByte 1)))
-     (-> -Byte -Byte B : (-FS (-filter -PosByte 0) -top))
-     (-> -Byte -PosInt B : (-FS (-and (-filter -PosByte 0) (-filter -PosByte 1)) -top))
-     (-> -Byte -PosReal B : (-FS (-filter -PosByte 0) -top))
-     (-> -PosInt -Byte B : (-FS -top (-and (-filter -PosByte 0) (-filter -PosByte 1))))
-     (-> -PosRat -Byte B : (-FS -top (-filter -PosByte 1)))
-     (-> -Byte -Nat B : (-FS (-and (-filter -PosByte 0) (-filter -Byte 1)) -top))
-     (-> -Byte -NonNegReal B : (-FS (-filter -PosByte 0) -top))
-     (-> -Nat -Byte B : (-FS -top (-filter -Byte 0)))
-     (-> -RealZero -Index B : (-FS (-filter (Un) 1) -top))
-     (-> -One -Index B : (-FS (-filter -Zero 1) -top))
-     (-> -Index -Zero B : (-FS (-filter -PosIndex 0) (-filter -Zero 0)))
-     (-> -PosIndex -Index B : (-FS -top (-filter -PosIndex 1)))
-     (-> -Index -Index B : (-FS (-filter -PosIndex 0) -top))
-     (-> -Index -PosInt B : (-FS (-and (-filter -PosIndex 0) (-filter -PosIndex 1)) -top))
-     (-> -Index -PosReal B : (-FS (-filter -PosIndex 0) -top))
-     (-> -PosInt -Index B : (-FS -top (-and (-filter -PosIndex 0) (-filter -PosIndex 1))))
-     (-> -PosRat -Index B : (-FS -top (-filter -PosIndex 1)))
-     (-> -Index -Nat B : (-FS (-and (-filter -PosIndex 0) (-filter -Index 1)) -top))
-     (-> -Index -NonNegReal B : (-FS (-filter -PosIndex 0) -top))
-     (-> -Nat -Index B : (-FS -top (-filter -Index 0)))
-     (-> -Zero -Fixnum B : (-FS (-filter -NegFixnum 1) (-filter -NonNegFixnum 1)))
-     (-> -Fixnum -RealZero B : (-FS (-filter -PosFixnum 0) (-filter -NonPosFixnum 0)))
-     (-> -PosInt -Fixnum B : (-FS -top (-and (-filter -PosFixnum 0) (-filter -PosFixnum 1))))
-     (-> -PosRat -Fixnum B : (-FS -top (-filter -PosFixnum 1)))
-     (-> -Nat -Fixnum B : (-FS -top (-and (-filter -NonNegFixnum 0) (-filter -NonNegFixnum 1))))
-     (-> -NonNegRat -Fixnum B : (-FS -top (-filter -NonNegFixnum 1)))
-     (-> -Fixnum -Nat B : (-FS (-and (-filter -PosFixnum 0) (-filter -NonNegFixnum 1)) -top))
-     (-> -Fixnum -NonNegReal B : (-FS (-filter -PosFixnum 0) -top))
-     (-> -NonPosInt -Fixnum B : (-FS (-and (-filter -NonPosFixnum 0) (-filter -NegFixnum 1)) -top))
-     (-> -NonPosReal -Fixnum B : (-FS (-filter -NegFixnum 1) -top))
-     (-> -Fixnum -NegInt B : (-FS -top (-and (-filter -NegFixnum 0) (-filter -NegFixnum 1))))
-     (-> -Fixnum -NegRat B : (-FS -top (-filter -NegFixnum 0)))
-     (-> -Fixnum -NonPosInt B : (-FS -top (-and (-filter -NonPosFixnum 0) (-filter -NonPosFixnum 1))))
-     (-> -Fixnum -NonPosRat B : (-FS -top (-filter -NonPosFixnum 0)))
-     (-> (-val +inf.0) -Rat B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> -Rat (-val +inf.0) B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> (-val -inf.0) -Rat B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> -Rat (-val -inf.0) B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> (-val +inf.f) -Rat B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> -Rat (-val +inf.f) B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> (-val -inf.f) -Rat B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> -Rat (-val -inf.f) B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (>-type-pattern -Int -PosInt -Nat -NegInt -NonPosInt -Zero)
-     (>-type-pattern -Rat -PosRat -NonNegRat -NegRat -NonPosRat -Zero)
-     (>-type-pattern -Flonum -PosFlonum -NonNegFlonum -NegFlonum -NonPosFlonum)
-     (>-type-pattern -SingleFlonum -PosSingleFlonum -NonNegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum)
-     (>-type-pattern -InexactReal -PosInexactReal -NonNegInexactReal -NegInexactReal -NonPosInexactReal)
-     (>-type-pattern -Real -PosReal -NonNegReal -NegReal -NonPosReal)
-     (->* (list R R) R B))]
-[<= (from-cases
-     (-> -Pos -One B : (-FS (-filter -One 0) -top))
-     (-> -Byte -Zero B : (-FS (-filter -Zero 0) (-filter -PosByte 0)))
-     (-> -Index -Zero B : (-FS (-filter -Zero 0) (-filter -PosIndex 0)))
-     (-> -NonNegFixnum -Zero B : (-FS (-filter -Zero 0) (-filter -PosFixnum 0)))
-     (-> -Nat -Zero B : (-FS (-filter -Zero 0) (-filter -PosInt 0)))
-     (-> -Zero -Nat B : (-FS -top (-filter (Un) 1)))
-     (-> -One -Byte B : (-FS (-filter -PosByte 1) (-filter -Zero 1)))
-     (-> -PosByte -Byte B : (-FS (-filter -PosByte 1) -top))
-     (-> -Byte -Byte B : (-FS -top (-filter -PosByte 0)))
-     (-> -PosInt -Byte B : (-FS (-and (-filter -PosByte 0) (-filter -PosByte 1)) -top))
-     (-> -PosReal -Byte B : (-FS (-filter -PosByte 1) -top))
-     (-> -Byte -PosInt B : (-FS -top (-and (-filter -PosByte 0) (-filter -PosByte 1))))
-     (-> -Byte -PosRat B : (-FS -top (-filter -PosByte 0)))
-     (-> -Nat -Byte B : (-FS (-filter -Byte 0) -top))
-     (-> -Byte -Nat B : (-FS -top (-and (-filter -PosByte 0) (-filter -Byte 1))))
-     (-> -Byte -NonNegRat B : (-FS -top (-filter -PosByte 0)))
-     (-> -Index -Zero B : (-FS (-filter -Zero 0) (-filter -PosIndex 0)))
-     (-> -Zero -Index B : (-FS -top (-filter (Un) 1)))
-     (-> -One -Index B : (-FS (-filter -PosIndex 1) (-filter -Zero 1)))
-     (-> -PosIndex -Index B : (-FS (-filter -PosIndex 1) -top))
-     (-> -Index -Index B : (-FS -top (-filter -PosIndex 0)))
-     (-> -Pos -Index B : (-FS (-and (-filter -PosIndex 0) (-filter -PosIndex 1)) -top))
-     (-> -PosReal -Index B : (-FS (-filter -PosIndex 1) -top))
-     (-> -Index -Pos B : (-FS -top (-and (-filter -PosIndex 0) (-filter -PosIndex 1))))
-     (-> -Index -PosRat B : (-FS -top (-filter -PosIndex 0)))
-     (-> -Nat -Index B : (-FS (-filter -Index 0) -top))
-     (-> -Index -Nat B : (-FS -top (-and (-filter -PosIndex 0) (-filter -Index 1))))
-     (-> -Index -NonNegRat B : (-FS -top (-filter -PosIndex 0)))
-     (-> -NonNegFixnum -Zero B : (-FS (-filter -Zero 0) (-filter -PosFixnum 0)))
-     (-> -Zero -NonNegFixnum B : (-FS (-filter -Zero 1) (-filter (Un) 1)))
-     (-> -One -NonNegFixnum B : (-FS -top (-filter -Zero 1)))
-     (-> -Zero -Fixnum B : (-FS (-filter -NonNegFixnum 1) (-filter -NegFixnum 1)))
-     (-> -Fixnum -Zero B : (-FS (-filter -NonPosFixnum 0) (-filter -PosFixnum 0)))
-     (-> -PosInt -Fixnum B : (-FS (-and (-filter -PosFixnum 0) (-filter -PosFixnum 1)) -top))
-     (-> -PosReal -Fixnum B : (-FS (-filter -PosFixnum 1) -top))
-     (-> -Nat -Fixnum B : (-FS (-and (-filter -NonNegFixnum 0) (-filter -NonNegFixnum 1)) -top))
-     (-> -NonNegReal -Fixnum B : (-FS (-filter -NonNegFixnum 1) -top))
-     (-> -Fixnum -Nat B : (-FS -top (-and (-filter -PosFixnum 0) (-filter -NonNegFixnum 1))))
-     (-> -Fixnum -NonNegRat B : (-FS -top (-filter -PosFixnum 0)))
-     (-> -NonPosInt -Fixnum B : (-FS -top (-and (-filter -NonPosFixnum 0) (-filter -NegFixnum 1))))
-     (-> -NonPosRat -Fixnum B : (-FS -top (-filter -NegFixnum 1)))
-     (-> -Fixnum -NegInt B : (-FS (-and (-filter -NegFixnum 0) (-filter -NegFixnum 1)) -top))
-     (-> -Fixnum -NegReal B : (-FS (-filter -NegFixnum 0) -top))
-     (-> -Fixnum -NonPosInt B : (-FS (-and (-filter -NonPosFixnum 0) (-filter -NonPosFixnum 1)) -top))
-     (-> -Fixnum -NonPosReal B : (-FS (-filter -NonPosFixnum 0) -top))
-     (-> -Rat (-val +inf.0) B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> (-val +inf.0) -Rat B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> -Rat (-val -inf.0) B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> (-val -inf.0) -Rat B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> -Rat (-val +inf.f) B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> (-val +inf.f) -Rat B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> -Rat (-val -inf.f) B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> (-val -inf.f) -Rat B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (<=-type-pattern -Int -PosInt -Nat -NegInt -NonPosInt -Zero)
-     (<=-type-pattern -Rat -PosRat -NonNegRat -NegRat -NonPosRat -Zero)
-     (<=-type-pattern -Flonum -PosFlonum -NonNegFlonum -NegFlonum -NonPosFlonum)
-     (<=-type-pattern -SingleFlonum -PosSingleFlonum -NonNegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum)
-     (<=-type-pattern -InexactReal -PosInexactReal -NonNegInexactReal -NegInexactReal -NonPosInexactReal)
-     (<=-type-pattern -Real -PosReal -NonNegReal -NegReal -NonPosReal)
-     (->* (list R R) R B))]
-[>= (from-cases
-     (-> -One -Pos B : (-FS (-filter -One 1) -top))
-     (-> -Zero -Byte B : (-FS (-filter -Zero 1) (-filter -PosByte 1)))
-     (-> -Zero -Index B : (-FS (-filter -Zero 1) (-filter -PosIndex 1)))
-     (-> -Zero -NonNegFixnum B : (-FS (-filter -Zero 1) (-filter -PosFixnum 1)))
-     (-> -Zero -Nat B : (-FS (-filter -Zero 1) (-filter -PosInt 1)))
-     (-> -Nat -Zero B : (-FS -top (-filter (Un) 0)))
-     (-> -Byte -One B : (-FS (-filter -PosByte 0) (-filter -Zero 0)))
-     (-> -Byte -PosByte B : (-FS (-filter -PosByte 0) -top))
-     (-> -Byte -Byte B : (-FS -top (-filter -PosByte 1)))
-     (-> -Byte -PosInt B : (-FS (-and (-filter -PosByte 0) (-filter -PosByte 1)) -top))
-     (-> -Byte -PosReal B : (-FS (-filter -PosByte 0) -top))
-     (-> -PosInt -Byte B : (-FS -top (-and (-filter -PosByte 0) (-filter -PosByte 1))))
-     (-> -PosRat -Byte B : (-FS -top (-filter -PosByte 1)))
-     (-> -Byte -Nat B : (-FS (-filter -Byte 1) -top))
-     (-> -Nat -Byte B : (-FS -top (-and (-filter -Byte 0) (-filter -PosByte 1))))
-     (-> -NonNegRat -Byte B : (-FS -top (-filter -PosByte 1)))
-     (-> -Zero -Index B : (-FS (-filter -Zero 1) (-filter -PosIndex 1)))
-     (-> -Index -Zero B : (-FS -top (-filter (Un) 0)))
-     (-> -Index -One B : (-FS (-filter -PosIndex 0) (-filter -Zero 0)))
-     (-> -Index -PosIndex B : (-FS (-filter -PosIndex 0) -top))
-     (-> -Index -Index B : (-FS -top (-filter -PosIndex 1)))
-     (-> -Index -Pos B : (-FS (-and (-filter -PosIndex 0) (-filter -PosIndex 1)) -top))
-     (-> -Index -PosReal B : (-FS (-filter -PosIndex 0) -top))
-     (-> -Pos -Index B : (-FS -top (-and (-filter -PosIndex 0) (-filter -PosIndex 1))))
-     (-> -PosRat -Index B : (-FS -top (-filter -PosIndex 1)))
-     (-> -Index -Nat B : (-FS (-filter -Index 1) -top))
-     (-> -Nat -Index B : (-FS -top (-and (-filter -Index 0) (-filter -PosIndex 1))))
-     (-> -NonNegRat -Index B : (-FS -top (-filter -PosIndex 1)))
-     (-> -Zero -NonNegFixnum B : (-FS (-filter -Zero 1) (-filter -PosFixnum 1)))
-     (-> -NonNegFixnum -Zero B : (-FS (-filter -Zero 0) (-filter (Un) 0)))
-     (-> -NonNegFixnum -One B : (-FS -top (-filter -Zero 0)))
-     (-> -Fixnum -Zero B : (-FS (-filter -NonNegFixnum 0) (-filter -NegFixnum 0)))
-     (-> -Zero -Fixnum B : (-FS (-filter -NonPosFixnum 1) (-filter -PosFixnum 1)))
-     (-> -Fixnum -PosInt B : (-FS (-and (-filter -PosFixnum 0) (-filter -PosFixnum 1)) -top))
-     (-> -Fixnum -PosReal B : (-FS (-filter -PosFixnum 0) -top))
-     (-> -Fixnum -Nat B : (-FS (-and (-filter -NonNegFixnum 0) (-filter -NonNegFixnum 1)) -top))
-     (-> -Fixnum -NonNegReal B : (-FS (-filter -NonNegFixnum 0) -top))
-     (-> -Nat -Fixnum B : (-FS -top (-and (-filter -NonNegFixnum 0) (-filter -PosFixnum 1))))
-     (-> -NonNegRat -Fixnum B : (-FS -top (-filter -PosFixnum 1)))
-     (-> -Fixnum -NonPosInt B : (-FS -top (-and (-filter -NegFixnum 0) (-filter -NonPosFixnum 1))))
-     (-> -Fixnum -NonPosRat B : (-FS -top (-filter -NegFixnum 0)))
-     (-> -NegInt -Fixnum B : (-FS (-and (-filter -NegFixnum 0) (-filter -NegFixnum 1)) -top))
-     (-> -NegReal -Fixnum B : (-FS (-filter -NegFixnum 1) -top))
-     (-> -NonPosInt -Fixnum B : (-FS (-and (-filter -NonPosFixnum 0) (-filter -NonPosFixnum 1)) -top))
-     (-> -NonPosReal -Fixnum B : (-FS (-filter -NonPosFixnum 1) -top))
-     (-> (-val +inf.0) -Rat B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> -Rat (-val +inf.0) B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> (-val -inf.0) -Rat B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> -Rat (-val -inf.0) B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> (-val +inf.f) -Rat B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (-> -Rat (-val +inf.f) B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> (-val -inf.f) -Rat B : (-FS (-filter (Un) 0) -top)) ; can't happen
-     (-> -Rat (-val -inf.f) B : (-FS -top (-filter (Un) 0))) ; guaranteed
-     (>=-type-pattern -Int -PosInt -Nat -NegInt -NonPosInt -Zero)
-     (>=-type-pattern -Rat -PosRat -NonNegRat -NegRat -NonPosRat -Zero)
-     (>=-type-pattern -Flonum -PosFlonum -NonNegFlonum -NegFlonum -NonPosFlonum)
-     (>=-type-pattern -SingleFlonum -PosSingleFlonum -NonNegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum)
-     (>=-type-pattern -InexactReal -PosInexactReal -NonNegInexactReal -NegInexactReal -NonPosInexactReal)
-     (>=-type-pattern -Real -PosReal -NonNegReal -NegReal -NonPosReal)
-     (->* (list R R) R B))]
-
-[* (from-cases
-    (-> -One)
-    (commutative-case -Zero N -Zero)
-    (map (lambda (t) (commutative-binop -One t))
-         all-number-types)
-    (-> -PosByte -PosByte -PosIndex)
-    (-> -Byte -Byte -Index)
-    (-> -PosByte -PosByte -PosByte -PosFixnum)
-    (-> -Byte -Byte -Byte -NonNegFixnum)
-    (map unop all-int-types)
-    (varop -PosInt)
-    (varop -Nat)
-    (-> -NegInt -NegInt)
-    (-> -NonPosInt -NonPosInt)
-    (-> -NegInt -NegInt -PosInt)
-    (commutative-binop -NegInt -PosInt -NegInt)
-    (-> -NonPosInt -NonPosInt -Nat)
-    (commutative-binop -NonPosInt -Nat -NonPosInt)
-    (-> -NegInt -NegInt -NegInt -NegInt)
-    (-> -NonPosInt -NonPosInt -NonPosInt -NonPosInt)
-    (map varop (list -Int -PosRat -NonNegRat))
-    (-> -NegRat -NegRat)
-    (-> -NonPosRat -NonPosRat)
-    (-> -NegRat -NegRat -PosRat)
-    (commutative-binop -NegRat -PosRat -NegRat)
-    (-> -NonPosRat -NonPosRat -NonNegRat)
-    (commutative-binop -NonPosRat -NonNegRat -NonPosRat)
-    (-> -NegRat -NegRat -NegRat -NegRat)
-    (-> -NonPosRat -NonPosRat -NonPosRat -NonPosRat)
-    (map unop rat-types)
-    (varop -Rat)
-    (varop-1+ -FlonumZero)
-    ; no pos * -> pos, possible underflow
-    (varop-1+ -NonNegFlonum)
-    ;; can't do NonPos NonPos -> NonNeg: (* -1.0 0.0) -> NonPos!
-    (-> -NegFlonum -NegFlonum -NonNegFlonum) ; possible underflow, so no neg neg -> pos
-    (-> -NegFlonum -NegFlonum -NegFlonum -NonPosFlonum) ; see above
-    ;; limited flonum contagion rules
-    ;; (* <float> 0) is exact 0 (i.e. not a float)
-    (commutative-case -NonNegFlonum -PosReal) ; real args don't include 0
-    (commutative-case -Flonum (Un -PosReal -NegReal) -Flonum)
-    (map unop all-flonum-types)
-    (map varop-1+ (list -Flonum -SingleFlonumZero -NonNegSingleFlonum))
-    ;; we could add contagion rules for negatives, but we haven't for now
-    (-> -NegSingleFlonum -NegSingleFlonum -NonNegSingleFlonum) ; possible underflow, so no neg neg -> pos
-    (-> -NegSingleFlonum -NegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum)
-    (commutative-case -NonNegSingleFlonum (Un -PosRat -NonNegSingleFlonum))
-    (commutative-case -SingleFlonum (Un -PosRat -NegRat -SingleFlonum) -SingleFlonum)
-    (map unop single-flonum-types)
-    (map varop-1+ (list -SingleFlonum -InexactRealZero -NonNegInexactReal))
-    (-> -NegInexactReal -NegInexactReal -NonNegInexactReal)
-    (-> -NegInexactReal -NegInexactReal -NegInexactReal -NonPosInexactReal)
-    (commutative-case -NonNegInexactReal (Un -PosRat -NonNegInexactReal))
-    (commutative-case -InexactReal (Un -PosRat -NegRat -InexactReal) -InexactReal)
-    (map unop inexact-real-types)
-    (varop-1+ -InexactReal)
-    ;; reals
-    (map unop real-types)
-    (varop -NonNegReal) ; (* +inf.0 0.0) -> +nan.0
-    (-> -NegReal -NegReal -NonNegReal)
-    (commutative-binop -NegReal -PosReal -NonPosReal)
-    (-> -NegReal -NegReal -NegReal -NonPosReal)
-    (varop -Real)
-    ;; complexes
-    (commutative-case -FloatComplex (Un -InexactComplex -InexactReal -PosRat -NegRat) -FloatComplex)
-    (commutative-case -SingleFlonumComplex (Un -SingleFlonumComplex -SingleFlonum -PosRat -NegRat) -SingleFlonumComplex)
-    (commutative-case -InexactComplex (Un -InexactComplex -InexactReal -PosRat -NegRat) -InexactComplex)
-    (map unop number-types)
-    (varop N))]
-[+ (from-cases
-    (-> -Zero)
-    (binop -Zero)
-    (map (lambda (t) (commutative-binop t -Zero t))
-         (list -One -PosByte -Byte -PosIndex -Index
-               -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum -Fixnum))
-    (-> -PosByte -PosByte -PosIndex)
-    (-> -Byte -Byte -Index)
-    (-> -PosByte -PosByte -PosByte -PosIndex)
-    (-> -Byte -Byte -Byte -Index)
-    (commutative-binop -PosIndex -Index -PosFixnum)
-    (-> -PosIndex -Index -Index -PosFixnum)
-    (-> -Index -PosIndex -Index -PosFixnum)
-    (-> -Index -Index -PosIndex -PosFixnum)
-    (-> -Index -Index -NonNegFixnum)
-    (-> -Index -Index -Index -NonNegFixnum)
-    (commutative-binop -NegFixnum -One -NonPosFixnum)
-    (commutative-binop -NonPosFixnum -NonNegFixnum -Fixnum)
-    (commutative-case -PosInt -Nat -PosInt)
-    (commutative-case -NegInt -NonPosInt -NegInt)
-    (map unop all-int-types)
-    (map varop (list -Nat -NonPosInt -Int))
-    (commutative-case -PosRat -NonNegRat -PosRat)
-    (commutative-case -NegRat -NonPosRat -NegRat)
-    (map unop rat-types)
-    (map varop (list -NonNegRat -NonPosRat -Rat))
-    ;; flonum + real -> flonum
-    (commutative-case -PosFlonum -NonNegReal -PosFlonum)
-    (commutative-case -PosReal -NonNegFlonum -PosFlonum)
-    (commutative-case -NegFlonum -NonPosReal -NegFlonum)
-    (commutative-case -NegReal -NonPosFlonum -NegFlonum)
-    (commutative-case -NonNegFlonum -NonNegReal -NonNegFlonum)
-    (commutative-case -NonPosFlonum -NonPosReal -NonPosFlonum)
-    (commutative-case -Flonum -Real -Flonum)
-    (map unop all-flonum-types)
-    (varop-1+ -Flonum)
-    ;; single-flonum + rat -> single-flonum
-    (commutative-case -PosSingleFlonum (Un -NonNegRat -NonNegSingleFlonum) -PosSingleFlonum)
-    (commutative-case (Un -PosRat -PosSingleFlonum) -NonNegSingleFlonum -PosSingleFlonum)
-    (commutative-case -NegSingleFlonum (Un -NonPosRat -NonPosSingleFlonum) -NegSingleFlonum)
-    (commutative-case (Un -NegRat -NegSingleFlonum) -NonPosSingleFlonum -NegSingleFlonum)
-    (commutative-case -NonNegSingleFlonum (Un -NonNegRat -NonNegSingleFlonum) -NonNegSingleFlonum)
-    (commutative-case -NonPosSingleFlonum (Un -NonPosRat -NonPosSingleFlonum) -NonPosSingleFlonum)
-    (commutative-case -SingleFlonum (Un -Rat -SingleFlonum) -SingleFlonum)
-    (map unop single-flonum-types)
-    (varop-1+ -SingleFlonum)
-    ;; inexact-real + real -> inexact-real
-    (commutative-case -PosInexactReal -NonNegReal -PosInexactReal)
-    (commutative-case -PosReal -NonNegInexactReal -PosInexactReal)
-    (commutative-case -NegInexactReal -NonPosReal -NegInexactReal)
-    (commutative-case -NegReal -NonPosInexactReal -NegInexactReal)
-    (commutative-case -NonNegInexactReal -NonNegReal -NonNegInexactReal)
-    (commutative-case -NonPosInexactReal -NonPosReal -NonPosInexactReal)
-    (commutative-case -InexactReal -Real -InexactReal)
-    (map unop inexact-real-types)
-    ;; real
-    (commutative-case -PosReal -NonNegReal -PosReal)
-    (commutative-case -NegReal -NonPosReal -NegReal)
-    (map unop real-types)
-    (map varop (list -NonNegReal -NonPosReal -Real -ExactNumber))
-    ;; complex
-    (commutative-case -FloatComplex N -FloatComplex)
-    (commutative-case -Flonum -InexactComplex -FloatComplex)
-    (commutative-case -SingleFlonumComplex (Un -Rat -SingleFlonum -SingleFlonumComplex) -SingleFlonumComplex)
-    (commutative-case -InexactComplex (Un -Rat -InexactReal -InexactComplex) -InexactComplex)
-    (map unop number-types)
-    (varop N))]
-
-[- (from-cases
-    (binop -Zero)
-    (half-negation-pattern -PosFixnum -NegFixnum -NonNegFixnum -NonPosFixnum)
-    (negation-pattern -PosInt -NegInt -Nat -NonPosInt)
-    (negation-pattern -PosRat -NegRat -NonNegRat -NonPosRat)
-    (negation-pattern -PosFlonum -NegFlonum -NonNegFlonum -NonPosFlonum)
-    (negation-pattern -PosSingleFlonum -NegSingleFlonum -NonNegSingleFlonum -NonPosSingleFlonum)
-    (negation-pattern -PosInexactReal -NegInexactReal -NonNegInexactReal -NonPosInexactReal)
-    (negation-pattern -PosReal -NegReal -NonNegReal -NonPosReal)
-    (map (lambda (t) (-> t -Zero t))
-         (list -One -PosByte -Byte -PosIndex -Index
-               -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum -Fixnum))
-    (-> -One -One -Zero)
-    (-> -PosByte -One -Byte)
-    (-> -PosIndex -One -Index)
-    (-> -PosFixnum -One -NonNegFixnum)
-    (-> -PosInt -One -Nat)
-    (-> -NonNegFixnum -NonNegFixnum -Fixnum)
-    (-> -NegFixnum -NonPosFixnum -Fixnum)
-    (->* (list -PosInt -NonPosInt) -NonPosInt -PosInt)
-    (->* (list -Nat -NonPosInt) -NonPosInt -Nat)
-    (->* (list -NegInt -Nat) -Nat -NegInt)
-    (->* (list -NonPosInt -Nat) -Nat -NonPosInt)
-    (varop-1+ -Int)
-    (->* (list -PosRat -NonPosRat) -NonPosRat -PosRat)
-    (->* (list -NonNegRat -NonPosRat) -NonPosRat -NonNegRat)
-    (->* (list -NegRat -NonNegRat) -NonNegRat -NegRat)
-    (->* (list -NonPosRat -NonNegRat) -NonNegRat -NonPosRat)
-    (varop-1+ -Rat)
-    ;; floats - uncertain about sign properties in the presence of
-    ;; under/overflow, so these are left out
-    (varop-1+ -Flonum)
-    (commutative-case -Flonum -Real -Flonum)
-    (varop-1+ -SingleFlonum)
-    (commutative-case -SingleFlonum (Un -SingleFlonum -Rat) -SingleFlonum)
-    (varop-1+ -InexactReal)
-    (commutative-case -InexactReal (Un -InexactReal -Rat) -InexactReal)
-    (map varop-1+ (list -Real -ExactNumber))
-    (varop-1+ -FloatComplex)
-    (commutative-case -FloatComplex N -FloatComplex)
-    (varop-1+ -SingleFlonumComplex)
-    (commutative-case -SingleFlonumComplex (Un -SingleFlonumComplex -ExactNumber) -SingleFlonumComplex)
-    (varop-1+ -InexactComplex)
-    (commutative-case -InexactComplex (Un -InexactComplex -ExactNumber) -InexactComplex)
-    (varop-1+ N))]
-[/ (from-cases ; very similar to multiplication, without closure properties for integers
-    (commutative-case -Zero N -Zero)
-    (unop -One)
-    (map (lambda (t) (-> t -One t))
-         all-number-types)
-    (varop-1+ -PosRat)
-    (varop-1+ -NonNegRat)
-    (-> -NegRat -NegRat)
-    (-> -NonPosRat -NonPosRat)
-    (-> -NegRat -NegRat -PosRat)
-    (commutative-binop -NegRat -PosRat -NegRat)
-    (-> -NonPosRat -NonPosRat -NonNegRat)
-    (commutative-binop -NonPosRat -NonNegRat -NonPosRat)
-    (-> -NegRat -NegRat -NegRat -NegRat)
-    (-> -NonPosRat -NonPosRat -NonPosRat -NonPosRat)
-    (varop-1+ -Rat)
-    (-> -FlonumZero (Un -PosFlonum -NegFlonum)) ; one of the infinities
-    ;; No (-> -NonNegFlonum -NonNegFlonum -NonNegFlonum), (/ 0.1 -0.0) => -inf.0
-    ;; No (-> -NonPosFlonum -NonPosFlonum), (/ 0.0) => +inf.0
-    (-> -NegFlonum -NegFlonum -NonNegFlonum)
-    (-> -NegFlonum -NegFlonum -NegFlonum -NonPosFlonum)
-    ;; limited flonum contagion rules
-    ;; (/ 0 <float>) is exact 0 (i.e. not a float)
-    (-> -PosFlonum -PosReal -NonNegFlonum)
-    (-> -PosReal -PosFlonum -NonNegFlonum)
-    (commutative-case -PosFlonum -PosReal -NonNegFlonum)
-    (->* (list (Un -PosReal -NegReal -Flonum) -Flonum) -Flonum -Flonum)
-    (->* (list -Flonum) -Real -Flonum) ; if any argument after the first is exact 0, not a problem
-    (varop-1+ -Flonum)
-    (-> -SingleFlonumZero (Un -PosSingleFlonum -NegSingleFlonum)) ; one of the infinities
-    ;; we could add contagion rules for negatives, but we haven't for now
-    (-> -NegSingleFlonum -NegSingleFlonum -NonNegSingleFlonum) ; possible underflow, so no neg neg -> pos
-    (-> -NegSingleFlonum -NegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum)
-    (commutative-case -PosSingleFlonum (Un -PosRat -PosSingleFlonum) -NonNegSingleFlonum)
-    (commutative-case -SingleFlonum (Un -PosRat -NegRat -SingleFlonum) -SingleFlonum)
-    (varop-1+ -SingleFlonum)
-    (-> -InexactRealZero (Un -PosInexactReal -NegInexactReal))
-    (-> -NegInexactReal -NegInexactReal -NonNegInexactReal)
-    (-> -NegInexactReal -NegInexactReal -NegInexactReal -NonPosInexactReal)
-    (commutative-case -PosInexactReal (Un -PosRat -PosInexactReal) -NonNegInexactReal)
-    (commutative-case -InexactReal (Un -PosRat -NegRat -InexactReal) -InexactReal)
-    (varop-1+ -InexactReal)
-    ;; reals
-    (varop-1+ -PosReal -NonNegReal)
-    (-> -NegReal -NonPosReal)
-    (-> -NegReal -NegReal -NonNegReal)
-    (-> -NegReal -PosReal -NonPosReal)
-    (-> -PosReal -NegReal -NonPosReal)
-    (-> -NegReal -NegReal -NegReal -NonPosReal)
-    (varop-1+ -Real)
-    ;; complexes
-    (varop-1+ -FloatComplex)
-    (commutative-case -FloatComplex (Un -InexactComplex -InexactReal -PosRat -NegRat) -FloatComplex)
-    (->* (list -FloatComplex) N -FloatComplex) ; if any argument after the first is exact 0, not a problem
-    (varop-1+ -SingleFlonumComplex)
-    (commutative-case -SingleFlonumComplex (Un -SingleFlonumComplex -SingleFlonum -PosRat -NegRat) -SingleFlonumComplex)
-    (varop-1+ -InexactComplex)
-    (commutative-case -InexactComplex (Un -InexactComplex -InexactReal -PosRat -NegRat) -InexactComplex)
-    (varop-1+ N))]
-
-[max
- (from-cases (map varop (list -Zero -One))
-             (commutative-case -One -Zero)
-             (commutative-case -PosByte -Byte)
-             (commutative-case -PosIndex -Index)
-             (commutative-case -PosFixnum -Fixnum)
-             (commutative-case -NonNegFixnum -Fixnum)
-             (map varop (list -NegFixnum -NonPosFixnum -PosFixnum -NonNegFixnum -Fixnum))
-             (commutative-case -PosInt -Int)
-             (commutative-case -Nat -Int)
-             (map varop (list -NegInt -NonPosInt -PosInt -Nat -Int))
-             ;; we could have more cases here. for instance, when mixing PosInt
-             ;; and NegRats, we get a result of type PosInt (not just PosRat)
-             ;; there's a lot of these, but they may not be worth including
-             (commutative-case -PosRat -Rat)
-             (commutative-case -NonNegRat -Rat)
-             (map varop (list -NegRat -NonPosRat -PosRat -NonNegRat -Rat
-                                 -FlonumPosZero -FlonumNegZero -FlonumZero))
-             ;; inexactness is contagious: (max 3 2.3) => 3.0
-             ;; we could add cases to encode that
-             (commutative-case -PosFlonum -Flonum)
-             (commutative-case -NonNegFlonum -Flonum)
-             (map varop (list -NegFlonum -NonPosFlonum -PosFlonum -NonNegFlonum -Flonum
-                              -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero))
-             (varop -PosSingleFlonum)
-             (commutative-case -PosSingleFlonum -SingleFlonum)
-             (varop -NonNegSingleFlonum)
-             (commutative-case -NonNegSingleFlonum -SingleFlonum)
-             (map varop (list -NegSingleFlonum -NonPosSingleFlonum -SingleFlonum
-                              -InexactRealPosZero -InexactRealNegZero -InexactRealZero))
-             (commutative-case -PosInexactReal -InexactReal)
-             (commutative-case -NonNegInexactReal -InexactReal)
-             (map varop (list -NegInexactReal -NonPosInexactReal -PosInexactReal -NonNegInexactReal
-                              -InexactReal -RealZero))
-             (commutative-case -PosReal -Real)
-             (commutative-case -NonNegReal -Real)
-             (map varop (list -NegReal -NonPosReal -PosReal -NonNegReal -Real)))]
-[min
- (from-cases (map varop (list -Zero -One))
-             (commutative-case -Zero -One)
-             (map varop (list -PosByte -Byte -PosIndex -Index -PosFixnum -NonNegFixnum))
-             (commutative-case -NegFixnum -Fixnum)
-             (commutative-case -NonPosFixnum -Fixnum)
-             (map varop (list -NegFixnum -NonPosFixnum -Fixnum -PosInt -Nat))
-             (commutative-case -NegInt -Int)
-             (commutative-case -NonPosInt -Int)
-             (map varop (list -NegInt -NonPosInt -Int -PosRat -NonNegRat))
-             (commutative-case -NegRat -Rat)
-             (commutative-case -NonPosRat -Rat)
-             (map varop (list -NegRat -NonPosRat -Rat
-                              -FlonumPosZero -FlonumNegZero -FlonumZero
-                              -PosFlonum -NonNegFlonum))
-             (commutative-case -NegFlonum -Flonum)
-             (commutative-case -NonPosFlonum -Flonum)
-             (map varop (list -NegFlonum -NonPosFlonum -Flonum
-                              -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero
-                              -PosSingleFlonum -NonNegSingleFlonum))
-             (commutative-case -NegSingleFlonum -SingleFlonum)
-             (commutative-case -NonPosSingleFlonum -SingleFlonum)
-             (map varop (list -NegSingleFlonum -NonPosSingleFlonum -SingleFlonum
-                              -InexactRealPosZero -InexactRealNegZero -InexactRealZero
-                              -PosInexactReal -NonNegInexactReal))
-             (commutative-case -NegInexactReal -InexactReal)
-             (commutative-case -NonPosInexactReal -InexactReal)
-             (map varop (list -NegInexactReal -NonPosInexactReal -InexactReal
-                              -RealZero -PosReal -NonNegReal))
-             (commutative-case -NegReal -Real)
-             (commutative-case -NonPosReal -Real)
-             (map varop (list -NegReal -NonPosReal -Real)))]
-
-[add1 (from-cases
-       (-> -Zero -One)
-       (-> -One -PosByte)
-       (-> -Byte -PosIndex)
-       (-> -Index -PosFixnum)
-       (-> -NegFixnum -NonPosFixnum)
-       (-> -NonPosFixnum -Fixnum)
-       (-> -Nat -Pos)
-       (-> -NegInt -NonPosInt)
-       (unop -Int)
-       (-> -NonNegRat -PosRat)
-       (unop -Rat)
-       (-> -NonNegFlonum -PosFlonum)
-       (unop -Flonum)
-       (-> -NonNegSingleFlonum -PosSingleFlonum)
-       (unop -SingleFlonum)
-       (-> -NonNegInexactReal -PosInexactReal)
-       (unop -InexactReal)
-       (-> -NonNegReal -PosReal)
-       (map unop (list -Real -FloatComplex -SingleFlonumComplex -InexactComplex N)))]
-
-[sub1 (from-cases
-       (-> -One -Zero)
-       (-> -PosByte -Byte)
-       (-> -PosIndex -Index)
-       (-> -Index -Fixnum)
-       (-> -PosFixnum -NonNegFixnum)
-       (-> -NonNegFixnum -Fixnum)
-       (-> -Pos -Nat)
-       (-> -NonPosInt -NegInt)
-       (unop -Int)
-       (-> -NonPosRat -NegRat)
-       (unop -Rat)
-       (-> -NonPosFlonum -NegFlonum)
-       (unop -Flonum)
-       (-> -NonPosSingleFlonum -NegSingleFlonum)
-       (unop -SingleFlonum)
-       (-> -NonPosInexactReal -NegInexactReal)
-       (unop -InexactReal)
-       (-> -NonPosReal -NegReal)
-       (map unop (list -Real -FloatComplex -SingleFlonumComplex -InexactComplex N)))]
-
-[quotient
- (from-cases
-  (-Zero -Int . -> . -Zero)
-  (map (lambda (t) (-> t -One t)) ; division by one is identity
-       (list -PosByte -Byte -PosIndex -Index
-             -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum -Fixnum))
-  (-Byte -Nat . -> . -Byte)
-  (-Byte -Int . -> . -Fixnum) ; may be negative
-  (-Index -Nat . -> . -Index)
-  (-Index -Int . -> . -Fixnum) ; same.
-  ;; we don't have equivalent for fixnums:
-  ;; (quotient min-fixnum -1) -> max-fixnum + 1
-  (commutative-binop -NonNegFixnum -NonPosFixnum -NonPosFixnum)
-  (-NonPosFixnum -NonPosFixnum . -> . -Nat)
-  (-NonNegFixnum -Nat . -> . -NonNegFixnum)
-  (-NonNegFixnum -Int . -> . -Fixnum)
-  (binop -Nat)
-  (commutative-binop -Nat -NonPosInt -NonPosInt)
-  (-NonPosInt -NonPosInt . -> . -Nat)
-  (binop -Int))]
-[remainder ; result has same sign as first arg
- (from-cases
-  (-One -One . -> . -Zero)
-  (map (lambda (t) (list (-> -Nat t t)
-                         (-> t -Int t)))
-       (list -Byte -Index -NonNegFixnum -Nat))
-  (-NonPosFixnum -Int . -> . -NonPosFixnum)
-  (-NonPosInt -Int . -> . -NonPosInt)
-  (commutative-binop -Fixnum -Int)
-  (binop -Int))]
-[modulo ; result has same sign as second arg
- (from-cases
-  (-One -One . -> . -Zero)
-  (map (lambda (t) (list (-> -Int t t)
-                         (-> t -Nat t)))
-       (list -Byte -Index -NonNegFixnum -Nat))
-  (-Int -NonPosFixnum . -> . -NonPosFixnum)
-  (-Int -NonPosInt . -> . -NonPosInt)
-  (commutative-binop -Fixnum -Int)
-  (binop -Int))]
-;; should be consistent with quotient and remainder
-[quotient/remainder
- (from-cases
-  (-Zero -Int . -> . (-values (list -Zero -Zero)))
-  (-One -One . -> . (-values (list -Zero -One)))
-  ;; division by one is identity, and has no remainder
-  (map (lambda (t) (t -One . -> . (-values (list t -Zero))))
-       (list -PosByte -Byte -PosIndex -Index
-             -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum -Fixnum))
-  (-Byte -Nat . -> . (-values (list -Byte -Byte)))
-  (-Byte -Int . -> . (-values (list -Fixnum -Byte)))
-  (-Index -Nat . -> . (-values (list -Index -Index)))
-  (-Index -Int . -> . (-values (list -Fixnum -Index)))
-  (-Nat -Byte . -> . (-values (list -Nat -Byte)))
-  (-Nat -Index . -> . (-values (list -Nat -Index)))
-  (-NonNegFixnum -NonNegFixnum . -> . (-values (list -NonNegFixnum -NonNegFixnum)))
-  (-NonNegFixnum -NonPosFixnum . -> . (-values (list -NonPosFixnum -NonNegFixnum)))
-  (-NonPosFixnum -NonNegFixnum . -> . (-values (list -NonPosFixnum -NonPosFixnum)))
-  (-NonPosFixnum -NonPosFixnum . -> . (-values (list -NonNegFixnum -NonPosFixnum)))
-  (-NonNegFixnum -Nat . -> . (-values (list -NonNegFixnum -NonNegFixnum)))
-  (-NonNegFixnum -Int . -> . (-values (list -Fixnum -NonNegFixnum)))
-  (-Nat -NonNegFixnum . -> . (-values (list -Nat -NonNegFixnum)))
-  ;; in the following cases, we can't guarantee that the quotient is within
-  ;; fixnum range: (quotient min-fixnum -1) -> max-fixnum + 1
-  (-NonPosFixnum -Int . -> . (-values (list -Int -NonPosFixnum)))
-  (-Fixnum -Int . -> . (-values (list -Int -Fixnum)))
-  (-Int -Fixnum . -> . (-values (list -Int -Fixnum)))
-  (-Nat -Nat . -> . (-values (list -Nat -Nat)))
-  (-Nat -NonPosInt . -> . (-values (list -NonPosInt -Nat)))
-  (-Nat -Int . -> . (-values (list -Int -Nat)))
-  (-NonPosInt -Nat . -> . (-values (list -NonPosInt -NonPosInt)))
-  (-NonPosInt -NonPosInt . -> . (-values (list -Nat -NonPosInt)))
-  (-NonPosInt -Int . -> . (-values (list -Int -NonPosInt)))
-  (-Int -Int . -> . (-values (list -Int -Int))))]
-
-[arithmetic-shift (cl->* (-Zero -NonPosInt . -> . -Zero)
-                         (-Byte -NonPosInt . -> . -Byte)
-                         (-Index -NonPosInt . -> . -Index)
-                         (-NonNegFixnum -NonPosInt . -> . -NonNegFixnum)
-                         (-Fixnum -NonPosInt . -> . -Fixnum)
-                         (-Nat -Int . -> . -Nat)
-                         (-Int -Int . -> . -Int))]
-
-[bitwise-and
- (let ([mix-with-int
-        (lambda (t)
-          (list (->* (list t) t t) ; closed
-                (->* (list -Int t) t t) ; brings result down
-                (->* (list t -Int) t t)))])
-   (from-cases (-> -NegFixnum) ; no args -> -1
-               (map mix-with-int (list -Zero -Byte -Index -NonNegFixnum))
-               ;; closed on negatives, but not closed if we mix with positives
-               (map varop-1+ (list -NegFixnum -NonPosFixnum))
-               (map mix-with-int (list -Fixnum -Nat))
-               (map varop-1+ (list -NegInt -NonPosInt))
-               (null -Int . ->* . -Int)))]
-[bitwise-ior
- (from-cases (varop -Zero)
-             (map (lambda (l) (apply commutative-case l))
-                  (list (list -One -Zero)
-                        (list -PosByte -Byte)
-                        (list -Byte -Byte) ; doesn't need commutative case (varop would do), but saves code to put it here
-                        (list -PosIndex -Index)
-                        (list -Index -Index) ; same
-                        (list -PosFixnum -NonNegFixnum)
-                        (list -NonNegFixnum -NonNegFixnum)
-                        (list -NegFixnum -Fixnum) ; as long as there's one negative, the result is negative
-                        (list -Fixnum -Fixnum)
-                        (list -PosInt -Nat)
-                        (list -Nat -Nat)
-                        (list -NegInt -Int)
-                        (list -Int -Int))))]
-[bitwise-not (cl->* (-> -NonNegFixnum -NegFixnum)
-                    (-> -NegFixnum -NonNegFixnum)
-                    (-> -Fixnum -Fixnum)
-                    (-> -Nat -NegInt)
-                    (-> -NegInt -Nat)
-                    (-> -Int -Int))]
-[bitwise-xor
- (from-cases
-  (-> -One -One)
-  (-> -One -One -Zero)
-  (-> -One -One -One -One)
-  (map varop-1+ (list -Zero -Byte -Index -NonNegFixnum))
-  (-> -NegFixnum -NegFixnum)
-  (-> -NonPosFixnum -NonPosFixnum)
-  (-> -NegFixnum -NegFixnum -NonNegFixnum) ; both have to be negative: (0 -1) -> -1
-  (commutative-binop -NegFixnum -NonNegFixnum -NegFixnum)
-  (-> -NegFixnum -NonNegFixnum -NonPosFixnum) ; not commutative: (<pos> (ann 0 <non-pos>)) -> <pos>
-  (map varop-1+ (list -Fixnum -Nat))
-  (-> -NegInt -NegInt)
-  (-> -NonPosInt -NonPosInt)
-  (-> -NegInt -NegInt -Nat)
-  (commutative-binop -NegInt -Nat -NegInt)
-  (-> -NegInt -Nat -NonPosInt) ; see above
-  (varop -Int))]
-[bitwise-bit-set? (-> -Int -Int B)]
-[bitwise-bit-field
- (from-cases (map (lambda (t [r t]) (-> t -Int -Int t))
-                  (list -Byte -Index -NonNegFixnum -Nat))
-             ;; you can extract as many bits as you want from any negative number
-             (list (-> -Int -Int -Int -Int)))]
-[integer-length (-> -Int -NonNegFixnum)]
-
-[abs (from-cases abs-cases)]
-
-;; exactness
-[exact->inexact
- (from-cases (map unop all-float-types)
-             (-Zero . -> . -FlonumZero)
-             (-PosRat . -> . -NonNegFlonum)
-             (-NegRat . -> . -NonPosFlonum)
-             (-Rat . -> . -Flonum)
-             (map unop (list -FlonumZero -PosFlonum -NonNegFlonum -NegFlonum -NonPosFlonum -Flonum
-                             -SingleFlonumZero -PosSingleFlonum -NonNegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum -SingleFlonum))
-             (-NonNegReal . -> . -NonNegInexactReal) ; not for Pos, possible underflow
-             (-NonPosReal . -> . -NonPosInexactReal)
-             (-Real . -> . -InexactReal)
-             (-FloatComplex . -> . -FloatComplex)
-             (-SingleFlonumComplex . -> . -SingleFlonumComplex)
-             (-InexactComplex . -> . -InexactComplex)
-             (N . -> . (Un -InexactReal -InexactComplex)))]
-[inexact->exact
- (from-cases (map unop all-rat-types)
-             (-RealZero . -> . -Zero)
-             (-PosReal . -> . -PosRat)
-             (-NonNegReal . -> . -NonNegRat)
-             (-NegReal . -> . -NegRat)
-             (-NonPosReal . -> . -NonPosRat)
-             (-Real . -> . -Rat)
-             (N . -> . -ExactNumber))]
-[fl->exact-integer (cl->*
-                    (-FlonumZero . -> . -Zero)
-                    (-PosFlonum . -> . -PosInt)
-                    (-NonNegFlonum . -> . -Nat)
-                    (-NegFlonum . -> . -NegInt)
-                    (-NonPosFlonum . -> . -NonPosInt)
-                    (-Flonum . -> . -Int))]
-[real->single-flonum (cl->* (-RealZero . -> . -SingleFlonumZero)
-                            ;; no positive / negative cases, possible underflow
-                            (-NonNegReal . -> . -NonNegSingleFlonum)
-                            (-NonPosReal . -> . -NonPosSingleFlonum)
-                            (-Real . -> . -SingleFlonumZero))]
-[real->double-flonum (cl->* (-RealZero . -> . -FlonumZero)
-                            ;; no positive / negative cases, possible underflow
-                            (-NonNegReal . -> . -NonNegFlonum)
-                            (-NonPosReal . -> . -NonPosFlonum)
-                            (-Real . -> . -Flonum))]
-
-[floor
- (from-cases
-  (map unop all-int-types)
-  (-> -NonNegRat -Nat)
-  (-> -NegRat -NegInt)
-  (-> -NonPosRat -NonPosInt)
-  (-> -Rat -Int)
-  (map unop (list -FlonumPosZero -FlonumNegZero -FlonumZero
-                  -NonNegFlonum -NegFlonum -NonPosFlonum -Flonum
-                  -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero
-                  -NonNegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum -SingleFlonum
-                  -InexactRealPosZero -InexactRealNegZero -InexactRealZero
-                  -NonNegInexactReal -NegInexactReal -NonPosInexactReal -InexactReal
-                  -RealZero -NonNegReal -NegReal -NonPosReal -Real)))]
-[ceiling
- (from-cases
-  (map unop all-int-types)
-  (-> -PosRat -PosInt)
-  (-> -NonNegRat -Nat)
-  (-> -NonPosRat -NonPosInt)
-  (-> -Rat -Int)
-  (map unop (list -FlonumPosZero -FlonumNegZero -FlonumZero
-                  -PosFlonum -NonNegFlonum -NonPosFlonum -Flonum
-                  -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero
-                  -PosSingleFlonum -NonNegSingleFlonum -NonPosSingleFlonum -SingleFlonum
-                  -InexactRealPosZero -InexactRealNegZero -InexactRealZero
-                  -PosInexactReal -NonNegInexactReal -NonPosInexactReal -InexactReal
-                  -RealZero -PosReal -NonNegReal -NonPosReal -Real)))]
-[truncate (round-type)]
-[round (round-type)]
-
-[make-rectangular (cl->* (-Rat -Rat . -> . -ExactNumber)
-                         (-Flonum -Flonum . -> . -FloatComplex)
-                         (-Flonum (Un -PosReal -NegReal) . -> . -FloatComplex) ; no exact 0
-                         ((Un -PosReal -NegReal) -Flonum . -> . -FloatComplex)
-                         (-SingleFlonum -SingleFlonum . -> . -SingleFlonumComplex)
-                         (-InexactReal -InexactReal . -> . -InexactComplex)
-                         (-Real -Real . -> . N))]
-[make-polar (cl->* (-Flonum -Flonum . -> . -FloatComplex)
-                   (-SingleFlonum -SingleFlonum . -> . -SingleFlonumComplex)
-                   (-InexactReal -InexactReal . -> . -InexactComplex)
-                   (-Real -Real . -> . N))]
-[real-part (from-cases
-            (map unop all-real-types)
-            (-ExactNumber . -> . -Rat)
-            (-FloatComplex . -> . -Flonum)
-            (-SingleFlonumComplex . -> . -SingleFlonum)
-            (-InexactComplex . -> . -InexactReal)
-            (N . -> . -Real))]
-[imag-part (cl->* (-Real . -> . -Zero)
-                  (-ExactNumber . -> . -Rat)
-                  (-FloatComplex . -> . -Flonum)
-                  (-InexactComplex . -> . -InexactReal)
-                  (N . -> . -Real))]
-[magnitude (from-cases abs-cases
-                       (-FloatComplex . -> . -NonNegFlonum)
-                       (-SingleFlonumComplex . -> . -NonNegSingleFlonum)
-                       (-InexactComplex . -> . -NonNegInexactReal)
-                       (N . -> . -NonNegReal))]
-[angle     (cl->* (-PosReal . -> . -Zero)
-                  (-FloatComplex . -> . -Flonum)
-                  (-InexactComplex . -> . -InexactReal)
-                  (N . -> . (Un -InexactReal -Zero)))]
-[numerator
- (from-cases (map unop all-int-types)
-             (-PosRat . -> . -PosInt)
-             (-NonNegRat . -> . -Nat)
-             (-NegRat . -> . -NegInt)
-             (-NonPosRat . -> . -NonPosInt)
-             (-Rat . -> . -Int)
-             ;; includes rational types, but these have been matched already
-             (map unop all-real-types))]
-[denominator (cl->* (-Integer . -> . -One)
-                    (-Rat . -> . -PosInt)
-                    (-Flonum . -> . -PosFlonum)
-                    (-SingleFlonum . -> . -PosSingleFlonum)
-                    (-InexactReal . -> . -PosInexactReal)
-                    (-Real . -> . -PosReal))]
-[rationalize
- (from-cases (map (lambda (t) (-> t -Rat t))
-                  all-int-types)
-             (-NonNegRat -Rat . -> . -NonNegRat) ; non-zero args produce zero
-             (-NonPosRat -Rat . -> . -NonPosRat)
-             (-Rat -Rat . -> . -Rat)
-             (map (lambda (l) (apply commutative-binop l))
-                  ;; actually, second argument could be negative in all cases,
-                  ;; and it would still work, but this would require twice as
-                  ;; many cases
-                  (list (list -NonNegReal -NonNegFlonum)
-                        (list -NonPosReal -NonPosFlonum)
-                        (list -Real -Flonum)
-                        (list -NonNegReal -NonNegSingleFlonum)
-                        (list -NonPosReal -NonPosSingleFlonum)
-                        (list -Real -SingleFlonum)
-                        (list -NonNegReal -NonNegInexactReal)
-                        (list -NonPosReal -NonPosInexactReal)
-                        (list -Real -InexactReal)))
-             (map binop (list -NonNegReal -NonPosReal -Real)))]
-[expt
- (from-cases (-> -One -Rat -One)
-             (map (lambda (t) (-> t -Zero -One)) all-number-types) ; will error if negative
-             (-PosInt -Nat . -> . -PosInt)
-             (-Nat -Nat . -> . -Nat)
-             (-Int -Nat . -> . -Int)
-             (-PosInt -Int . -> . -PosRat)
-             (-Nat -Int . -> . -NonNegRat)
-             (-Int -Int . -> . -Rat)
-             (-PosRat -Int . -> . -PosRat)
-             (-NonNegRat -Int . -> . -NonNegRat)
-             (-Rat -Int . -> . -Rat)
-             (-NonNegFlonum -NonNegFlonum . -> . -NonNegFlonum)
-             (-NonNegFlonum -NonNegReal . -> . (Un -NonNegFlonum -One))
-             (-PosReal -NonNegFlonum . -> . (Un -NonNegFlonum -One))
-             (-Flonum (Un -NegInt -PosInt) . -> . -Flonum)
-             (-Flonum -Int . -> . (Un -Flonum -One))
-             (-Flonum -Flonum . -> . (Un -Flonum -FloatComplex))
-             (-NonNegSingleFlonum (Un -NonNegSingleFlonum -NegRat -PosRat) . -> . -NonNegSingleFlonum)
-             (-SingleFlonum (Un -NegInt -PosInt) . -> . -SingleFlonum)
-             (-SingleFlonum -Int . -> . (Un -SingleFlonum -One))
-             (-SingleFlonum -SingleFlonum . -> . (Un -SingleFlonum -SingleFlonumComplex))
-             (-NonNegInexactReal (Un -NegReal -PosReal) . -> . -NonNegInexactReal)
-             (-NonNegReal -Real . -> . -NonNegReal)
-             (-InexactReal (Un -NegInt -PosInt) . -> . -InexactReal)
-             (-InexactReal -InexactReal . -> . (Un -InexactReal -InexactComplex))
-             (-Real -Int . -> . -Real)
-             (-FloatComplex (Un -InexactComplex -InexactReal) . -> . -FloatComplex)
-             (-SingleFlonumComplex (Un -SingleFlonum -SingleFlonumComplex) . -> . -SingleFlonumComplex)
-             ((Un -InexactReal -InexactComplex) -InexactComplex . -> . -InexactComplex)
-             (-InexactComplex (Un -InexactReal -InexactComplex) . -> . -InexactComplex)
-             (N N . -> . N))]
-[sqrt
- (from-cases
-  (map unop (list -Zero -One
-                  -FlonumPosZero -FlonumNegZero -FlonumZero -PosFlonum -NonNegFlonum
-                  -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero -PosSingleFlonum -NonNegSingleFlonum
-                  -InexactRealPosZero -InexactRealNegZero -InexactRealZero -PosInexactReal -NonNegInexactReal
-                  -RealZero -PosReal -NonNegReal))
-  (-FloatComplex . -> . -FloatComplex)
-  (-SingleFlonumComplex . -> . -SingleFlonumComplex)
-  (-InexactComplex . -> . -InexactComplex)
-  (N . -> . N))]
-[integer-sqrt
- (from-cases
-  (map unop (list -Zero -One -Byte -Index))
-  (-NonNegFixnum . -> . -Index)
-  (map unop (list -Nat -NonNegRat
-                  -FlonumPosZero -FlonumNegZero -FlonumZero -NonNegFlonum
-                  -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero -NonNegSingleFlonum
-                  -InexactRealPosZero -InexactRealNegZero -InexactRealZero -NonNegInexactReal
-                  -RealZero -NonNegReal))
-  (-Rat . -> . -ExactNumber)
-  (-Real . -> . N))] ; defined on inexact integers too, but not complex
-[integer-sqrt/remainder
- (from-cases
-  (-Zero . -> . (-values -Zero -Zero))
-  (-One . -> . (-values -One -Zero))
-  (-Byte . -> . (-values -Byte -Byte))
-  (-Index . -> . (-values -Index -Index))
-  (-NonNegFixnum . -> . (-values -Index -NonNegFixnum))
-
-  (map (λ (t) (t . -> . (-values t -Int)))
-       (list -Nat -NonNegRat
-             -FlonumPosZero -FlonumNegZero -FlonumZero -NonNegFlonum
-             -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero -NonNegSingleFlonum
-             -InexactRealPosZero -InexactRealNegZero -InexactRealZero -NonNegInexactReal
-             -RealZero -NonNegReal))
-
-  (-Rat . -> . (-values -ExactNumber -Int))
-  (-Real . -> . (-values N -Int)))] ; defined on inexact integers too
-
-[log (cl->*
-      (-NonNegRat . -> . -Real)
-      (-FlonumZero . -> . -NegFlonum)
-      (-NonNegFlonum . -> . -Flonum)
-      (-SingleFlonumZero . -> . -NegSingleFlonum)
-      (-NonNegSingleFlonum . -> . -SingleFlonum)
-      (-InexactRealZero . -> . -NegInexactReal)
-      (-NonNegInexactReal . -> . -InexactReal)
-      (-NonNegReal . -> . -Real)
-      (-FloatComplex . -> . -FloatComplex)
-      (-SingleFlonumComplex . -> . -SingleFlonumComplex)
-      (-InexactComplex . -> . -InexactComplex)
-      (N . -> . N))]
-[exp (from-cases (-Zero . -> . -One)
-                 (map unop
-                      (list -Flonum -SingleFlonum -InexactReal -Real
-                            -FloatComplex -SingleFlonumComplex -InexactComplex N)))]
-
-[cos (from-cases (-Zero . -> . -One)
-                 (map unop
-                      (list -Flonum -SingleFlonum -InexactReal -Real
-                            -FloatComplex -SingleFlonumComplex -InexactComplex N)))]
-[sin (from-cases (map unop
-                      (list -Zero -Flonum -SingleFlonum -InexactReal -Real
-                            -FloatComplex -SingleFlonumComplex -InexactComplex N)))]
-[tan (from-cases (map unop
-                      (list -Zero -Flonum -SingleFlonum -InexactReal -Real
-                            -FloatComplex -SingleFlonumComplex -InexactComplex N)))]
-[acos (from-cases (-One . -> . -Zero)
-                  (map unop
-                       (list -Flonum -SingleFlonum -InexactReal -Real
-                             -FloatComplex -SingleFlonumComplex -InexactComplex N)))]
-[asin (from-cases (-Zero . -> . -One)
-                  (map unop
-                       (list -Flonum -SingleFlonum -InexactReal -Real
-                             -FloatComplex -SingleFlonumComplex -InexactComplex N)))]
-[atan (from-cases
-       (map unop (list -Zero -Flonum -SingleFlonum -InexactReal -Real
-                       -FloatComplex -SingleFlonumComplex -InexactComplex N))
-       ;; 2-arg case, atan2
-       (-Zero -PosRat . -> . -Zero)
-       (map binop (list -Flonum -SingleFlonum -InexactReal -Real)))]
-
-[gcd (from-cases (varop -Zero)
-                 (varop-1+ -One)
-                 (varop-1+ -PosByte)
-                 (varop -Byte)
-                 (varop-1+ -PosIndex)
-                 (varop -Index)
-                 (varop-1+ -PosFixnum)
-                 (varop -Fixnum -NonNegFixnum)
-                 (varop-1+ -PosInt)
-                 (varop -Int -Nat)
-                 (varop-1+ -PosRat)
-                 (varop -Rat -NonNegRat)
-                 ;; also supports inexact integers
-                 (varop-1+ -PosFlonum)
-                 (commutative-case -PosFlonum -PosReal -PosFlonum)
-                 (varop -Flonum -NonNegFlonum)
-                 (commutative-case -Flonum -Real -NonNegFlonum)
-                 (varop-1+ -PosSingleFlonum)
-                 (varop -SingleFlonum -NonNegSingleFlonum)
-                 (varop-1+ -PosInexactReal)
-                 (varop -InexactReal -NonNegInexactReal)
-                 ;; Note: this will mess up error messages, since only integers
-                 ;; (exact or not) are accepted, not any reals.
-                 ;; should we only accept exact integers?
-                 (varop-1+ -PosReal)
-                 (varop -Real -NonNegReal))]
-[lcm (from-cases (map unop (list -Zero -One -PosByte -Byte -PosIndex -Index -PosFixnum))
-                 (-NegFixnum . -> . -PosFixnum)
-                 (-Fixnum . -> . -NonNegFixnum)
-                 (commutative-case -Zero -Rat) ; zero anywhere -> zero
-                 (commutative-case -RealZero -Real)
-                 (map (lambda (t) (commutative-binop -One t))
-                      (list -PosByte -Byte -PosIndex -Index -PosFixnum))
-                 (commutative-binop -One -NegFixnum -PosFixnum)
-                 (commutative-binop -One -Fixnum -NonNegFixnum)
-                 (binop -PosByte -PosIndex)
-                 (binop -Byte -Index)
-                 (varop (Un -PosInt -NegInt) -PosInt)
-                 (varop -Int -Nat)
-                 (varop (Un -PosRat -NegRat) -PosRat)
-                 (varop -Rat -NonNegRat)
-                 ;; also supports inexact integers
-                 (commutative-case -FlonumZero -Real -FlonumZero)
-                 (commutative-case -SingleFlonumZero -Real -SingleFlonumZero)
-                 (commutative-case -InexactRealZero -Real -InexactRealZero)
-                 (varop-1+ (Un -PosFlonum -NegFlonum) -PosFlonum)
-                 (varop-1+ -Flonum -NonNegFlonum)
-                 (commutative-case (Un -PosFlonum -NegFlonum) (Un -PosReal -NegReal) -PosFlonum)
-                 (commutative-case -Flonum (Un -PosReal -NegReal) -NonNegFlonum) ; exact 0 -> exact 0
-                 (varop-1+ (Un -PosSingleFlonum -NegSingleFlonum) -PosSingleFlonum)
-                 (varop-1+ -SingleFlonum -NonNegSingleFlonum)
-                 (varop-1+ (Un -PosInexactReal -NegInexactReal) -PosInexactReal)
-                 (varop-1+ -InexactReal -NonNegInexactReal)
-                 ;; Note: same as above.
-                 (varop (Un -PosReal -NegReal) -PosReal)
-                 (varop -Real -NonNegReal))]
-
-;; racket/math
-
-[sgn (cl->* (-Zero . -> . -Zero)
-            (-PosRat . -> . -One)
-            (-NonNegRat . -> . -Index) ; 0 or 1
-            (-NegRat . -> . -NegFixnum) ; -1
-            (-NonPosRat . -> . -NonPosFixnum) ; 0 or -1
-            (-Rat . -> . -Fixnum)
-            (-Flonum . -> . -Flonum)
-            (-SingleFlonum . -> . -SingleFlonum)
-            (-Real . -> . -Real))]
-
-[pi -PosFlonum]
-[pi.f -PosSingleFlonum]
-[sqr (from-cases (map unop (list -Zero -One))
-                 (-> -PosByte -PosIndex)
-                 (-> -Byte -Index)
-                 (unop -PosInt)
-                 (-> -Int -Nat)
-                 (unop -PosRat)
-                 (-> -Rat -NonNegRat)
-                 ;; possible underflow, no pos -> pos
-                 (-> -Flonum -NonNegFlonum)
-                 (-> -SingleFlonum -NonNegSingleFlonum)
-                 (-> -InexactReal -NonNegInexactReal)
-                 (-> -Real -NonNegReal)
-                 (map unop (list -FloatComplex -SingleFlonumComplex
-                                 -InexactComplex -ExactNumber N)))]
-[conjugate (from-cases
-            (map unop all-real-types)
-            (-FloatComplex . -> . -FloatComplex)
-            (-SingleFlonumComplex . -> . -SingleFlonumComplex)
-            (-InexactComplex . -> . -InexactComplex)
-            (-ExactNumber . -> . -ExactNumber)
-            (N . -> . N))]
-[sinh (from-cases
-       (unop -Zero) ; only exact case
-       ;; possible underflow, no pos -> pos. 0 -> 0, no -NonNegRat -> -NonNegFlonum
-       ((Un -PosRat -NonNegFlonum) . -> . -NonNegFlonum)
-       ((Un -NegRat -NonPosFlonum) . -> . -NonPosFlonum)
-       (map unop (list -FlonumNan -Flonum
-                       -SingleFlonumNan -NonNegSingleFlonum -NonPosSingleFlonum -SingleFlonum
-                       -NonNegInexactReal -NonPosInexactReal -InexactReal
-                       -NonNegReal -NonPosReal -Real
-                       -FloatComplex -SingleFlonumComplex -InexactComplex N)))]
-[cosh (from-cases ; no exact cases
-       (map unop (list -FlonumNan -SingleFlonumNan))
-       ((Un -Rat -Flonum) . -> . -PosFlonum)
-       (-SingleFlonum . -> . -PosSingleFlonum)
-       (-InexactReal . -> . -PosInexactReal)
-       (-Real . -> . -PosReal)
-       (map unop (list -FloatComplex -SingleFlonumComplex -InexactComplex N)))]
-[tanh (from-cases ; same as sinh
-       (unop -Zero) ; only exact case
-       ;; possible underflow, no pos -> pos. 0 -> 0, no -NonNegRat -> -NonNegFlonum
-       ((Un -PosRat -NonNegFlonum) . -> . -NonNegFlonum)
-       ((Un -NegRat -NonPosFlonum) . -> . -NonPosFlonum)
-       (map unop (list -FlonumNan -Flonum
-                       -SingleFlonumNan -NonNegSingleFlonum -NonPosSingleFlonum -SingleFlonum
-                       -NonNegInexactReal -NonPosInexactReal -InexactReal
-                       -NonNegReal -NonPosReal -Real
-                       -FloatComplex -SingleFlonumComplex -InexactComplex N)))]
-
-[degrees->radians
- (from-cases
-  (unop -Zero) ; only exact case
-  ((Un -PosRat -PosFlonum) . -> . -NonNegFlonum) ; possible underflow, no pos -> pos
-  ((Un -NegRat -NegFlonum) . -> . -NonPosFlonum)
-  ((Un -PosSingleFlonum) . -> . -NonNegSingleFlonum)
-  ((Un -NegSingleFlonum) . -> . -NonPosSingleFlonum)
-  (map unop (list -FlonumNan -SingleFlonumNan
-                  -NonNegFlonum -NonPosFlonum -Flonum
-                  -NonNegSingleFlonum -NonPosSingleFlonum -SingleFlonum
-                  -PosInexactReal -NonNegInexactReal -NegInexactReal -NonPosInexactReal -InexactReal
-                  -PosReal -NonNegReal -NegReal -NonPosReal -Real)))]
-
-[radians->degrees
- (from-cases
-  (unop -Zero) ; only exact case
-  ((Un -PosRat -PosFlonum) . -> . -PosFlonum)
-  ((Un -NegRat -NegFlonum) . -> . -NegFlonum)
-  (map unop (list -FlonumNan -SingleFlonumNan
-                  -NonNegFlonum -NonPosFlonum -Flonum
-                  -PosSingleFlonum -NonNegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum -SingleFlonum
-                  -PosInexactReal -NonNegInexactReal -NegInexactReal -NonPosInexactReal -InexactReal
-                  -PosReal -NonNegReal -NegReal -NonPosReal -Real)))]
-
-[exact-round (exact-round-type)]
-[exact-truncate (exact-round-type)]
-
-[exact-floor
- (from-cases
-  (map unop all-int-types)
-  (inexact-zero->exact-zero-type)
-  (-> (Un -NonNegRat -NonNegFlonum -NonNegSingleFlonum -NonNegInexactReal -NonNegReal) -Nat)
-  (-> (Un -NegRat -NegFlonum -NegSingleFlonum -NegInexactReal -NegReal) -NegInt)
-  (-> (Un -NonPosRat -NonPosFlonum -NonPosSingleFlonum -NonPosInexactReal -NonPosReal) -NonPosInt)
-  (-> (Un -Rat -Flonum -SingleFlonum -InexactReal -Real) -Int))]
-
-[exact-ceiling
- (from-cases
-  (map unop all-int-types)
-  (inexact-zero->exact-zero-type)
-  (-> (Un -PosRat -PosFlonum -PosSingleFlonum -PosInexactReal -PosReal) -PosInt)
-  (-> (Un -NonNegRat -NonNegFlonum -NonNegSingleFlonum -NonNegInexactReal -NonNegReal) -Nat)
-  (-> (Un -NonPosRat -NonPosFlonum -NonPosSingleFlonum -NonPosInexactReal -NonPosReal) -NonPosInt)
-  (-> (Un -Rat -Flonum -SingleFlonum -InexactReal -Real) -Int))]
-
-[nan? (from-cases
-       (-> -Rat (-val #f))
-       (-> (Un -FlonumNan -SingleFlonumNan) (-val #t))
-       (-> -Real B))]
-
-[infinite? (from-cases
-            (-> (Un -FlonumNan -FlonumNegZero -FlonumPosZero
-                    -SingleFlonumNan -SingleFlonumNegZero -SingleFlonumPosZero
-                    -Rat)
-                (-val #f))
-            (-> -Real B))]
-
-;; racket/fixnum
-[fx+ (fx+-type)]
-[fx- (fx--type)]
-[fx* (fx*-type)]
-[fxquotient (fxquotient-type)]
-[fxremainder (fxremainder-type)]
-[fxmodulo (fxmodulo-type)]
-[fxabs (fxabs-type)]
-
-[fxand (fxand-type)]
-[fxior (fxior-type)]
-[fxxor (fxxor-type)]
-[fxnot (fxnot-type)]
-[fxlshift (fxlshift-type)]
-[fxrshift (fxrshift-type)]
-
-[fx= (fx=-type)]
-[fx< (fx<-type)]
-[fx> (fx>-type)]
-[fx<= (fx<=-type)]
-[fx>= (fx>=-type)]
-[fxmin (fxmin-type)]
-[fxmax (fxmax-type)]
-
-[unsafe-fx+ (fx+-type)]
-[unsafe-fx- (fx--type)]
-[unsafe-fx* (fx*-type)]
-[unsafe-fxquotient (fxquotient-type)]
-[unsafe-fxremainder (fxremainder-type)]
-[unsafe-fxmodulo (fxmodulo-type)]
-[unsafe-fxabs (fxabs-type)]
-
-[unsafe-fxand (fxand-type)]
-[unsafe-fxior (fxior-type)]
-[unsafe-fxxor (fxxor-type)]
-[unsafe-fxnot (fxnot-type)]
-[unsafe-fxlshift (fxlshift-type)]
-[unsafe-fxrshift (fxrshift-type)]
-
-[unsafe-fx= (fx=-type)]
-[unsafe-fx< (fx<-type)]
-[unsafe-fx> (fx>-type)]
-[unsafe-fx<= (fx<=-type)]
-[unsafe-fx>= (fx>=-type)]
-[unsafe-fxmin (fxmin-type)]
-[unsafe-fxmax (fxmax-type)]
-
-
-;; flonum ops
-[flabs (flabs-type)]
-[fl+ (fl+-type)]
-[fl- (fl--type)]
-[fl* (fl*-type)]
-[fl/ (fl/-type)]
-[fl= (fl=-type)]
-[fl<= (fl<=-type)]
-[fl>= (fl>=-type)]
-[fl> (fl>-type)]
-[fl< (fl<-type)]
-[flmin (flmin-type)]
-[flmax (flmax-type)]
-[flround (flround-type)]
-[flfloor (flfloor-type)]
-[flceiling (flceiling-type)]
-[fltruncate (flround-type)]
-[flsin (fl-unop)] ; special cases (0s) not worth special-casing
-[flcos (fl-unop)]
-[fltan (fl-unop)]
-[flatan (fl-unop)]
-[flasin (fl-unop)]
-[flacos (fl-unop)]
-[fllog (fllog-type)]
-[flexp (flexp-type)]
-[flsqrt (flsqrt-type)]
-[flexpt (flexpt-type)]
-[->fl (fx->fl-type)]
-[fx->fl (fx->fl-type)]
-[fl->fx (fl->fx-type)]
-[make-flrectangular (make-flrectangular-type)]
-[flreal-part (flreal-part-type)]
-[flimag-part (flimag-part-type)]
-[flrandom (flrandom-type)]
-
-[unsafe-flabs (flabs-type)]
-[unsafe-fl+ (fl+-type)]
-[unsafe-fl- (fl--type)]
-[unsafe-fl* (fl*-type)]
-[unsafe-fl/ (fl/-type)]
-[unsafe-fl= (fl=-type)]
-[unsafe-fl<= (fl<=-type)]
-[unsafe-fl>= (fl>=-type)]
-[unsafe-fl> (fl>-type)]
-[unsafe-fl< (fl<-type)]
-[unsafe-flmin (flmin-type)]
-[unsafe-flmax (flmax-type)]
-
-;These are currently the same binding as the safe versions
-;and so are not needed. If this changes they should be
-;uncommented. There is a check in the definitions part of
-;the file that makes sure that they are the same binding.
-;
-;[unsafe-flround (flround-type)]
-;[unsafe-flfloor (flfloor-type)]
-;[unsafe-flceiling (flceiling-type)]
-;[unsafe-fltruncate (flround-type)]
-;[unsafe-flsin (fl-unop)]
-;[unsafe-flcos (fl-unop)]
-;[unsafe-fltan (fl-unop)]
-;[unsafe-flatan (fl-unop)]
-;[unsafe-flasin (fl-unop)]
-;[unsafe-flacos (fl-unop)]
-;[unsafe-fllog (fllog-type)]
-;[unsafe-flexp (flexp-type)]
-;[unsafe-flexpt (flexpt-type)]
-;
-[unsafe-flsqrt (flsqrt-type)]
-[unsafe-fx->fl (fx->fl-type)]
-[unsafe-fl->fx (fl->fx-type)]
-[unsafe-make-flrectangular (make-flrectangular-type)]
-[unsafe-flreal-part (flreal-part-type)]
-[unsafe-flimag-part (flimag-part-type)]
-[unsafe-flrandom (flrandom-type)]
-
-; racket/extflonum
-[extflonum? (make-pred-ty -ExtFlonum)]
-[extflonum-available? (-> B)]
-[pi.t -PosExtFlonum]
-
-[extflabs (extflabs-type)]
-[extfl+ (extfl+-type)]
-[extfl- (extfl--type)]
-[extfl* (extfl*-type)]
-[extfl/ (extfl/-type)]
-[extfl= (extfl=-type)]
-[extfl<= (extfl<=-type)]
-[extfl>= (extfl>=-type)]
-[extfl> (extfl>-type)]
-[extfl< (extfl<-type)]
-[extflmin (extflmin-type)]
-[extflmax (extflmax-type)]
-[extflround (extflround-type)]
-[extflfloor (extflfloor-type)]
-[extflceiling (extflceiling-type)]
-[extfltruncate (extflround-type)]
-[extflsin (extfl-unop)] ; special cases (0s) not worth special-casing
-[extflcos (extfl-unop)]
-[extfltan (extfl-unop)]
-[extflatan (extfl-unop)]
-[extflasin (extfl-unop)]
-[extflacos (extfl-unop)]
-[extfllog (extfllog-type)]
-[extflexp (extflexp-type)]
-[extflexpt (extflexpt-type)]
-[extflsqrt (extflsqrt-type)]
-[->extfl (fx->extfl-type)]
-[extfl->exact-integer (cl->* (-ExtFlonumZero . -> . -Zero)
-                             (-PosExtFlonum . -> . -PosInt)
-                             (-NonNegExtFlonum . -> . -Nat)
-                             (-NegExtFlonum . -> . -NegInt)
-                             (-NonPosExtFlonum . -> . -NonPosInt)
-                             (-ExtFlonum . -> . -Int))]
-[real->extfl (cl->* (-RealZero . -> . -ExtFlonumZero)
-                    ;; no positive / negative cases, possible underflow
-                    (-NonNegReal . -> . -NonNegExtFlonum)
-                    (-NonPosReal . -> . -NonPosExtFlonum)
-                    (-Real . -> . -ExtFlonum))]
-[extfl->exact (cl->* (-ExtFlonumZero . -> . -Zero)
-                     (-PosExtFlonum . -> . -PosRat)
-                     (-NonNegExtFlonum . -> . -NonNegRat)
-                     (-NegExtFlonum . -> . -NegRat)
-                     (-NonPosExtFlonum . -> . -NonPosRat)
-                     (-ExtFlonum . -> . -Rat))]
-[extfl->inexact (cl->* (-ExtFlonumZero . -> . -FlonumZero)
-                       ;; no positive / negative cases, possible underflow
-                       (-NonNegExtFlonum . -> . -NonNegFlonum)
-                       (-NonPosExtFlonum . -> . -NonPosFlonum)
-                       (-ExtFlonum . -> . -Flonum))]
-[unsafe-extflabs (extflabs-type)]
-[unsafe-extfl+ (extfl+-type)]
-[unsafe-extfl- (extfl--type)]
-[unsafe-extfl* (extfl*-type)]
-[unsafe-extfl/ (extfl/-type)]
-[unsafe-extfl= (extfl=-type)]
-[unsafe-extfl<= (extfl<=-type)]
-[unsafe-extfl>= (extfl>=-type)]
-[unsafe-extfl> (extfl>-type)]
-[unsafe-extfl< (extfl<-type)]
-[unsafe-extflmin (extflmin-type)]
-[unsafe-extflmax (extflmax-type)]
-
-;These are currently the same binding as the safe versions
-;and so are not needed. If this changes they should be
-;uncommented. There is a check in the definitions part of
-;the file that makes sure that they are the same binding.
-;
-;[unsafe-extflround (extflround-type)]
-;[unsafe-extflfloor (extflfloor-type)]
-;[unsafe-extflceiling (extflceiling-type)]
-;[unsafe-extfltruncate (extflround-type)]
-;[unsafe-extflsin (extfl-unop)]
-;[unsafe-extflcos (extfl-unop)]
-;[unsafe-extfltan (extfl-unop)]
-;[unsafe-extflatan (extfl-unop)]
-;[unsafe-extflasin (extfl-unop)]
-;[unsafe-extflacos (extfl-unop)]
-;[unsafe-extfllog (extfllog-type)]
-;[unsafe-extflexp (extflexp-type)]
-;[unsafe-extflexpt (extflexpt-type)]
-;
-[unsafe-extflsqrt (extflsqrt-type)]
-[unsafe-fx->extfl (fx->extfl-type)]
-[unsafe-extfl->fx (extfl->fx-type)]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env.rkt
deleted file mode 100644
index 2061057a24..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-env.rkt
+++ /dev/null
@@ -1,3187 +0,0 @@
-#lang s-exp "env-lang.rkt"
-
-;; This module defines Typed Racket's main base type environment.
-
-(require
- (for-template
-  (except-in racket -> ->* one-of/c class)
-  racket/unsafe/ops
-  racket/unsafe/undefined
-  (only-in racket/extflonum floating-point-bytes->extfl extfl->floating-point-bytes)
-  ;(only-in rnrs/lists-6 fold-left)
-  '#%paramz
-  "extra-procs.rkt"
-  (only-in '#%kernel [apply kernel:apply] [reverse kernel:reverse])
-  (only-in racket/private/pre-base new-apply-proc)
-  compatibility/mlist
-  racket/private/stx
-  (only-in mzscheme make-namespace)
-  (only-in racket/match/runtime match:error matchable? match-equality-test))
- "base-structs.rkt"
- racket/file
- (only-in racket/private/pre-base new-apply-proc)
- (only-in (types abbrev) [-Boolean B] [-Symbol Sym] -Flat)
- (only-in (types numeric-tower) [-Number N])
- (only-in (rep type-rep)
-          make-ClassTop
-          make-Name
-          make-ValuesDots
-          make-MPairTop
-          make-BoxTop make-ChannelTop make-VectorTop
-          make-ThreadCellTop
-          make-Ephemeron
-          make-CustodianBox
-          make-HeterogeneousVector
-          make-Continuation-Mark-Keyof
-          make-Continuation-Mark-KeyTop
-          make-Prompt-Tagof
-          make-Prompt-TagTop
-          make-StructType make-StructTypeTop
-          make-ListDots))
-
-;; Racket Reference
-;; Section 4.1
-[boolean? (make-pred-ty B)]
-[not (make-pred-ty (-val #f))]
-[equal? (-> Univ Univ B)]
-[eqv? (-> Univ Univ B)]
-[eq? (-> Univ Univ B)]
-
-[equal?/recur (-> Univ Univ (-> Univ Univ Univ) B)]
-[immutable? (-> Univ B)]
-[prop:equal+hash -Struct-Type-Property]
-
-;; Section 4.1.1 (racket/bool)
-[true (-val #t)]
-[false (-val #f)]
-[boolean=? (B B . -> . B)]
-[symbol=? (Sym Sym . -> . B)]
-[false? (make-pred-ty (-val #f))]
-[xor (-> Univ Univ Univ)]
-
-;; Section 4.2 (Numbers)
-;; These are mostly defined in base-env-numeric.rkt
-
-;; Section 4.2.2.7 (Random Numbers)
-[random
-  (cl->* (->opt -PosFixnum [-Pseudo-Random-Generator] -NonNegFixnum)
-         (->opt -Int [-Pseudo-Random-Generator] -Nat)
-         (->opt [-Pseudo-Random-Generator] -Flonum))]
-
-[random-seed (-> -PosInt -Void)]
-[make-pseudo-random-generator (-> -Pseudo-Random-Generator)]
-[pseudo-random-generator? (make-pred-ty -Pseudo-Random-Generator)]
-[current-pseudo-random-generator (-Param -Pseudo-Random-Generator -Pseudo-Random-Generator)]
-[pseudo-random-generator->vector
- (-> -Pseudo-Random-Generator (make-HeterogeneousVector (list -PosInt -PosInt -PosInt -PosInt -PosInt -PosInt)))]
-[vector->pseudo-random-generator
- (-> (make-HeterogeneousVector (list -PosInt -PosInt -PosInt -PosInt -PosInt -PosInt)) -Pseudo-Random-Generator)]
-[vector->pseudo-random-generator!
- (-> -Pseudo-Random-Generator (make-HeterogeneousVector (list -PosInt -PosInt -PosInt -PosInt -PosInt -PosInt)) -Void)]
-
-;; Section 4.2.2.8 (Number-String Conversions)
-[number->string (->opt N [N] -String)]
-[string->number (->opt -String [N] (Un (-val #f) N))]
-
-[floating-point-bytes->real (->opt -Bytes [Univ -Nat -Nat] -Flonum)]
-[real->floating-point-bytes (->opt -Real (one-of/c  4 8) [Univ -Bytes -Nat] -Bytes)]
-[system-big-endian? (-> B)]
-
-[order-of-magnitude (-> -PosReal -Int)]
-
-;; Section 4.2.5.3 (ExtFlonum-Bytes Conversions)
-[floating-point-bytes->extfl (->opt -Bytes [Univ -Nat -Nat] -ExtFlonum)]
-[extfl->floating-point-bytes (->opt -ExtFlonum [Univ -Bytes -Nat] -Bytes)]
-
-;; Section 4.3 (Strings)
-[string? (make-pred-ty -String)]
-;make-string (in Index)
-[string (->* '() -Char -String)]
-[string->immutable-string (-> -String -String)]
-[string-length (-String . -> . -Index)]
-[unsafe-string-length (-String . -> . -Index)]
-;string-ref (in Index)
-;string-set! (in Index)
-;substring (in Index)
-[string-copy (-> -String -String)]
-;string-copy! (in Index)
-[string-fill! (-> -String -Char -Void)]
-[string-append (->* null -String -String)]
-
-[string->list (-String . -> . (-lst -Char))]
-[list->string ((-lst -Char) . -> . -String)]
-;build-string (in Index)
-
-[string=? (->* (list -String -String) -String B)]
-[string<? (->* (list -String -String) -String B)]
-[string<=? (->* (list -String -String) -String B)]
-[string>? (->* (list -String -String) -String B)]
-[string>=? (->* (list -String -String) -String B)]
-
-[string-ci=? (->* (list -String -String) -String B)]
-[string-ci<? (->* (list -String -String) -String B)]
-[string-ci<=? (->* (list -String -String) -String B)]
-[string-ci>? (->* (list -String -String) -String B)]
-[string-ci>=? (->* (list -String -String) -String B)]
-
-[string-upcase (-> -String -String)]
-[string-downcase (-> -String -String)]
-[string-titlecase (-> -String -String)]
-[string-foldcase (-> -String -String)]
-
-[string-normalize-nfd (-> -String -String)]
-[string-normalize-nfkd (-> -String -String)]
-[string-normalize-nfc (-> -String -String)]
-[string-normalize-nfkc (-> -String -String)]
-
-[string-locale=? (->* (list -String -String) -String B)]
-[string-locale<? (->* (list -String -String) -String B)]
-[string-locale>? (->* (list -String -String) -String B)]
-
-[string-locale-ci=? (->* (list -String -String) -String B)]
-[string-locale-ci<? (->* (list -String -String) -String B)]
-[string-locale-ci>? (->* (list -String -String) -String B)]
-
-[string-locale-upcase (-> -String -String)]
-[string-locale-downcase (-> -String -String)]
-
-;; Section 4.3.5 (racket/string)
-[string-append*
- (cl->* (-> (-lst -String) -String)
-        (-> -String (-lst -String) -String))]
-[string-join
- (->optkey (-lst -String) [-String]
-           #:before-last -String #f #:before-first -String #f #:after-last -String #f
-           -String)]
-[string-normalize-spaces
- (->optkey -String [(Un -String -Regexp) -String]
-           #:trim? Univ #f
-           #:repeat? Univ #f
-           -String)]
-[string-replace
- (->key -String (Un -String -Regexp) -String
-        #:all? Univ #f
-        -String)]
-[string-split
- (->optkey -String
-           [(Un -String -Regexp)]
-           #:trim? Univ #f
-           #:repeat? Univ #f
-           (-lst -String))]
-[string-trim
- (->optkey -String [(Un -String -Regexp)]
-           #:left? Univ #f
-           #:right? Univ #f
-           #:repeat? Univ #f
-           -String)]
-
-;; Section 4.3.6 (racket/format)
-[~a (->optkey []
-              #:rest Univ
-              #:separator -String #f
-              #:width (Un -Nat (-val #f)) #f
-              #:max-width (Un -Nat (-val +inf.0)) #f
-              #:min-width -Nat #f
-              #:limit-marker -String #f
-              #:align (one-of/c 'left 'center 'right) #f
-              #:pad-string -String #f
-              #:left-pad-string -String #f
-              #:right-pad-string -String #f
-              -String)]
-[~v (->optkey []
-              #:rest Univ
-              #:separator -String #f
-              #:width (Un -Nat (-val #f)) #f
-              #:max-width (Un -Nat (-val +inf.0)) #f
-              #:min-width -Nat #f
-              #:limit-marker -String #f
-              #:align (one-of/c 'left 'center 'right) #f
-              #:pad-string -String #f
-              #:left-pad-string -String #f
-              #:right-pad-string -String #f
-              -String)]
-[~s (->optkey []
-              #:rest Univ
-              #:separator -String #f
-              #:width (Un -Nat (-val #f)) #f
-              #:max-width (Un -Nat (-val +inf.0)) #f
-              #:min-width -Nat #f
-              #:limit-marker -String #f
-              #:align (one-of/c 'left 'center 'right) #f
-              #:pad-string -String #f
-              #:left-pad-string -String #f
-              #:right-pad-string -String #f
-              -String)]
-[~e (->optkey []
-              #:rest Univ
-              #:separator -String #f
-              #:width (Un -Nat (-val #f)) #f
-              #:max-width (Un -Nat (-val +inf.0)) #f
-              #:min-width -Nat #f
-              #:limit-marker -String #f
-              #:align (one-of/c 'left 'center 'right) #f
-              #:pad-string -String #f
-              #:left-pad-string -String #f
-              #:right-pad-string -String #f
-              -String)]
-[~r (->optkey -Real []
-              #:sign (Un (-val #f) (one-of/c '+ '++ 'parens)
-                         (-lst* (Un -String (-lst* -String -String))
-                                (Un -String (-lst* -String -String))
-                                (Un -String (-lst* -String -String))))
-                     #f
-              #:base (Un -Integer (-lst* (-val 'up) -Integer)) #f
-              #:precision (Un -Integer (-lst* (-val '=) -Integer)) #f
-              #:notation (Un (-val 'positional) (-val 'exponential)
-                             (-> -Real (one-of/c 'positional 'exponential)))
-                         #f
-              #:format-exponent (-opt (Un -String (-> -Integer -String))) #f
-              #:min-width -Integer #f
-              #:pad-string -String #f
-              -String)]
-[~.a (->optkey []
-               #:rest Univ
-               #:separator -String #f
-               #:width (Un -Nat (-val #f)) #f
-               #:max-width (Un -Nat (-val +inf.0)) #f
-               #:min-width -Nat #f
-               #:limit-marker -String #f
-               #:align (one-of/c 'left 'center 'right) #f
-               #:pad-string -String #f
-               #:left-pad-string -String #f
-               #:right-pad-string -String #f
-               -String)]
-[~.v (->optkey []
-               #:rest Univ
-               #:separator -String #f
-               #:width (Un -Nat (-val #f)) #f
-               #:max-width (Un -Nat (-val +inf.0)) #f
-               #:min-width -Nat #f
-               #:limit-marker -String #f
-               #:align (one-of/c 'left 'center 'right) #f
-               #:pad-string -String #f
-               #:left-pad-string -String #f
-               #:right-pad-string -String #f
-               -String)]
-[~.s (->optkey []
-               #:rest Univ
-               #:separator -String #f
-               #:width (Un -Nat (-val #f)) #f
-               #:max-width (Un -Nat (-val +inf.0)) #f
-               #:min-width -Nat #f
-               #:limit-marker -String #f
-               #:align (one-of/c 'left 'center 'right) #f
-               #:pad-string -String #f
-               #:left-pad-string -String #f
-               #:right-pad-string -String #f
-               -String)]
-
-;; Section 4.4 (Byte Strings)
-[bytes (->* (list) -Integer -Bytes)]
-[bytes? (make-pred-ty -Bytes)]
-[make-bytes (cl-> [(-Integer -Integer) -Bytes]
-                  [(-Integer) -Bytes])]
-[bytes->immutable-bytes (-> -Bytes -Bytes)]
-[byte? (make-pred-ty -Byte)]
-[bytes-append (->* (list) -Bytes -Bytes)]
-[bytes-length (-> -Bytes -Index)]
-[unsafe-bytes-length (-> -Bytes -Index)]
-[bytes-copy (-> -Bytes -Bytes)]
-[bytes->list (-> -Bytes (-lst -Byte))]
-[list->bytes (-> (-lst -Integer) -Bytes)]
-[make-shared-bytes (cl-> [(-Integer -Byte) -Bytes]
-                         [(-Integer) -Bytes])]
-[shared-bytes (->* (list) -Byte -Bytes)]
-[bytes<? (->* (list -Bytes) -Bytes B)]
-[bytes>? (->* (list -Bytes) -Bytes B)]
-[bytes=? (->* (list -Bytes) -Bytes B)]
-
-[bytes-open-converter (-> -String -String (-opt -Bytes-Converter))]
-[bytes-close-converter (-> -Bytes-Converter -Void)]
-[bytes-convert
- (cl->*
-  (->opt -Bytes-Converter
-         -Bytes
-         [-Nat
-          -Nat
-          (-val #f)
-          -Nat
-          (-opt -Nat)]
-    (-values (list
-              -Bytes
-              -Nat
-              (one-of/c 'complete 'continues  'aborts  'error))))
-  (->opt -Bytes-Converter
-         -Bytes
-         -Nat
-         -Nat
-         -Bytes
-         [-Nat
-          (-opt -Nat)]
-    (-values (list
-              -Nat
-              -Nat
-              (one-of/c 'complete 'continues  'aborts  'error)))))]
-
-[bytes-convert-end
- (cl->*
-  (->opt -Bytes-Converter
-         [(-val #f)
-          -Nat
-          (-opt -Nat)]
-    (-values (list
-              -Bytes
-              (one-of/c 'complete 'continues))))
-  (->opt -Bytes-Converter
-         -Bytes
-         [-Nat
-          (-opt -Nat)]
-    (-values (list
-              -Nat
-              (one-of/c 'complete 'continues)))))]
-
-[bytes-converter? (make-pred-ty -Bytes-Converter)]
-
-[locale-string-encoding (-> -String)]
-
-[bytes-append* ((-lst -Bytes) . -> . -Bytes)]
-[bytes-join ((-lst -Bytes) -Bytes . -> . -Bytes)]
-
-;; Section 4.5 (Characters)
-[char? (make-pred-ty -Char)]
-[char=? (->* (list -Char -Char) -Char B)]
-[char<=? (->* (list -Char -Char) -Char B)]
-[char>=? (->* (list -Char -Char) -Char B)]
-[char<? (->* (list -Char -Char) -Char B)]
-[char>? (->* (list -Char -Char) -Char B)]
-[char-ci=? (->* (list -Char -Char) -Char B)]
-[char-ci<=? (->* (list -Char -Char) -Char B)]
-[char-ci>=? (->* (list -Char -Char) -Char B)]
-[char-ci>? (->* (list -Char -Char) -Char B)]
-[char-ci<? (->* (list -Char -Char) -Char B)]
-
-[char-alphabetic? (-> -Char B)]
-[char-lower-case? (-> -Char B)]
-[char-upper-case? (-> -Char B)]
-[char-title-case? (-> -Char B)]
-[char-numeric? (-> -Char B)]
-[char-symbolic? (-> -Char B)]
-[char-punctuation? (-> -Char B)]
-[char-graphic? (-> -Char B)]
-[char-whitespace? (-> -Char B)]
-[char-blank? (-> -Char B)]
-[char-iso-control? (-> -Char B)]
-[char-general-category
- (-> -Char (apply Un (map -val
-                          '(lu ll lt lm lo mn mc me nd nl no ps pe pi pf pd
-                            pc po sc sm sk so zs zp zl cc cf cs co cn))))]
-[make-known-char-range-list (-> (-lst (-lst* -PosInt -PosInt B)))]
-
-[char-upcase (-> -Char -Char)]
-[char-downcase (-> -Char -Char)]
-[char-titlecase (-> -Char -Char)]
-[char-foldcase (-> -Char -Char)]
-[char->integer (-> -Char -Index)]
-[integer->char (-> -Integer -Char)]
-[char-utf-8-length (-> -Char (apply Un (map -val '(1 2 3 4 5 6))))]
-
-;; Section 4.6 (Symbols)
-[symbol? (make-pred-ty Sym)]
-[symbol-interned? (-> Sym B)]
-[symbol-unreadable? (-> Sym B)]
-[symbol->string (Sym . -> . -String)]
-[string->symbol (-String . -> . Sym)]
-[string->uninterned-symbol (-String . -> . Sym)]
-[string->unreadable-symbol (-String . -> . Sym)]
-[gensym (->opt [(Un Sym -String)] Sym)]
-[symbol<? (->* (list -Symbol -Symbol) -Symbol -Boolean)]
-
-;; Section 4.7 (Regular Expressions)
-[regexp? (make-pred-ty -Regexp)]
-[pregexp? (make-pred-ty -PRegexp)]
-[byte-regexp? (make-pred-ty -Byte-Regexp)]
-[byte-pregexp? (make-pred-ty -Byte-PRegexp)]
-[regexp (-String . -> . -Base-Regexp)]
-[pregexp (-String . -> . -PRegexp)]
-[byte-regexp (-Bytes . -> . -Byte-Base-Regexp)]
-[byte-pregexp (-Bytes . -> . -Byte-PRegexp)]
-
-[regexp-quote (cl->*
-               (->opt -String [Univ] -String)
-               (->opt -Bytes [Univ] -Bytes))]
-
-[regexp-max-lookbehind (-> (Un -Regexp -Byte-Regexp) -Nat)]
-
-;In Index
-;regexp-match
-;regexp-match*
-;regexp-try-match
-;regexp-match-positions
-;regexp-match?
-
-[regexp-match-exact? (-> -Pattern (Un -String -Bytes -Path) B)]
-
-;In Index
-;regexp-match-peek
-;regexp-match-peek-positions
-;regexp-match-peek-immediate
-;regexp-match-peek-positions-immediate
-;regexp-match-peek-positions*
-;regexp-match/end
-;regexp-match-positions/end
-;regexp-match-peek-positions/end
-;regexp-match-peek-positions-immediate/end
-
-[regexp-replace
- (cl->*
-  (->opt (Un -String -Regexp) -String (Un -String (->* (list -String) -String -String)) [-Bytes] -String)
-  (->opt (Un -Bytes -Byte-Regexp) (Un -Bytes -String) (Un -Bytes -String (->* (list -Bytes) -Bytes -Bytes)) [-Bytes] -Bytes)
-  (->opt -Pattern -Bytes (Un -Bytes -String (->* (list -Bytes) -Bytes -Bytes)) [-Bytes] -Bytes))]
-[regexp-replace*
- (cl->*
-  (->opt (Un -String -Regexp) -String (Un -String (->* (list -String) -String -String)) [-Bytes] -String)
-  (->opt (Un -Bytes -Byte-Regexp) (Un -Bytes -String) (Un -Bytes -String (->* (list -Bytes) -Bytes -Bytes)) [-Bytes] -Bytes)
-  (->opt -Pattern -Bytes (Un -Bytes -String (->* (list -Bytes) -Bytes -Bytes)) [-Bytes] -Bytes))]
-[regexp-replaces
- (-> (Un -String -Bytes)
-     (-lst (-lst* (Un -String -Bytes -Regexp -Byte-Regexp)
-                  (Un -String -Bytes
-                      (->* (list -String) -String -String)
-                      (->* (list -Bytes) -Bytes -Bytes))))
-     (Un -String -Bytes))]
-[regexp-replace-quote
- (cl->*
-  [-> -String -String]
-  [-> -Bytes -Bytes])]
-
-;; Section 4.8 (Keywords)
-[keyword? (make-pred-ty -Keyword)]
-[string->keyword (-String . -> . -Keyword)]
-[keyword->string (-Keyword . -> . -String)]
-[keyword<? (->* (list -Keyword -Keyword) -Keyword B)]
-
-;; Section 4.9 (Pairs and Lists)
-[car   (-poly (a b)
-              (cl->*
-               (->acc (list (-pair a b)) a (list -car))
-               (->* (list (-lst a)) a)))]
-[cdr   (-poly (a b)
-              (cl->*
-               (->acc (list (-pair a b)) b (list -cdr))
-               (->* (list (-lst a)) (-lst a))))]
-
-;; these type signatures do not cover all valid uses of these pair accessors
-[caar (-poly (a b c)
-             (cl->* [->acc (list (-pair (-pair a b) c)) a (list -car -car)]
-                    [-> (-lst (-pair a b)) a]
-                    [-> (-pair (-lst a) b) a]
-                    [-> (-lst (-lst a)) a]))]
-[cdar (-poly (a b c)
-             (cl->* [->acc (list (-pair (-pair a b) c)) b (list -cdr -car)]
-                    [-> (-lst (-pair a b)) b]
-                    [-> (-pair (-lst a) b) (-lst a)]
-                    [-> (-lst (-lst a)) (-lst a)]))]
-[cadr (-poly (a b c)
-             (cl->* [->acc (list (-pair a (-pair b c))) b (list -car -cdr)]
-                    [-> (-lst a) a]))]
-[cddr  (-poly (a b c)
-              (cl->* [->acc (list (-pair a (-pair b c))) c (list -cdr -cdr)]
-                     [-> (-lst a) (-lst a)]))]
-
-[caaar (-poly (a b c d)
-              (cl->* [->acc (list (-pair (-pair (-pair a b) c) d)) a (list -car -car -car)]
-                     [-> (-lst (-lst (-lst a))) a]))]
-[cdaar (-poly (a b c d)
-              (cl->* [->acc (list (-pair (-pair (-pair a b) c) d)) b (list -cdr -car -car)]
-                     [-> (-lst (-lst (-lst a))) (-lst a)]))]
-[cadar (-poly (a b c d)
-              (cl->* [->acc (list (-pair (-pair a (-pair b c)) d)) b (list -car -cdr -car)]
-                     [-> (-lst (-lst a)) a]))]
-[cddar (-poly (a b c d)
-              (cl->* [->acc (list (-pair (-pair a (-pair b c)) d)) c (list -cdr -cdr -car)]
-                     [-> (-lst (-lst a)) (-lst a)]))]
-[caadr (-poly (a b c d)
-              (cl->* [->acc (list (-pair a (-pair (-pair b c) d))) b (list -car -car -cdr)]
-                     [-> (-lst (-lst a)) a]))]
-[cdadr (-poly (a b c d)
-              (cl->* [->acc (list (-pair a (-pair (-pair b c) d))) c (list -cdr -car -cdr)]
-                     [-> (-lst (-lst a)) (-lst a)]))]
-[caddr  (-poly (a b c d)
-              (cl->* [->acc (list (-pair a (-pair b (-pair c d)))) c (list -car -cdr -cdr)]
-                     [-> (-lst a) a]))]
-[cdddr (-poly (a b c d)
-              (cl->* [->acc (list (-pair a (-pair b (-pair c d)))) d (list -cdr -cdr -cdr)]
-                     [-> (-lst a) (-lst a)]))]
-
-[caaaar (-poly (a b c d e)
-               (cl->* [->acc (list (-pair (-pair (-pair (-pair a b) c) d) e)) a (list -car -car -car -car)]
-                      [-> (-lst (-lst (-lst (-lst a)))) a]))]
-[cdaaar (-poly (a b c d e)
-               (cl->* [->acc (list (-pair (-pair (-pair (-pair a b) c) d) e)) b (list -cdr -car -car -car)]
-                      [-> (-lst (-lst (-lst (-lst a)))) (-lst a)]))]
-[cadaar (-poly (a b c d e)
-               (cl->* [->acc (list (-pair (-pair (-pair a (-pair b c)) d) e)) b (list -car -cdr -car -car)]
-                      [-> (-lst (-lst (-lst a))) a]))]
-[cddaar (-poly (a b c d e)
-               (cl->* [->acc (list (-pair (-pair (-pair b (-pair b c)) d) e)) c (list -cdr -cdr -car -car)]
-                      [-> (-lst (-lst (-lst a))) (-lst a)]))]
-[caadar (-poly (a b c d e)
-               (cl->* [->acc (list (-pair (-pair a (-pair (-pair b c) d)) e)) b (list -car -car -cdr -car)]
-                      [-> (-lst (-lst (-lst a))) a]))]
-[cdadar (-poly (a b c d e)
-               (cl->* [->acc (list (-pair (-pair a (-pair (-pair b c) d)) e)) c (list -cdr -car -cdr -car)]
-                      [-> (-lst (-lst (-lst a))) (-lst a)]))]
-[caddar (-poly (a b c d e)
-               (cl->* [->acc (list (-pair (-pair a (-pair b (-pair c d))) e)) c (list -car -cdr -cdr -car)]
-                      [-> (-lst (-lst a)) a]))]
-[cdddar (-poly (a b c d e)
-               (cl->* [->acc (list (-pair (-pair a (-pair b (-pair c d))) e)) d (list -cdr -cdr -cdr -car)]
-                      [-> (-lst (-lst a)) (-lst a)]))]
-[caaadr (-poly (a b c d e)
-               (cl->* [->acc (list (-pair a (-pair (-pair (-pair b c) d) e))) b (list -car -car -car -cdr)]
-                      [-> (-lst (-lst (-lst a))) a]))]
-[cdaadr (-poly (a b c d e)
-               (cl->* [->acc (list (-pair a (-pair (-pair (-pair b c) d) e))) c (list -cdr -car -car -cdr)]
-                      [-> (-lst (-lst (-lst a))) (-lst a)]))]
-[cadadr (-poly (a b c d e)
-               (cl->* [->acc (list (-pair a (-pair (-pair b (-pair c d)) e))) c (list -car -cdr -car -cdr)]
-                      [-> (-lst (-lst a)) a]))]
-[cddadr (-poly (a b c d e)
-               (cl->* [->acc (list (-pair a (-pair (-pair b (-pair c d)) e))) d (list -cdr -cdr -car -cdr)]
-                      [-> (-lst (-lst a)) (-lst a)]))]
-[caaddr (-poly (a b c d e)
-               (cl->* [->acc (list (-pair a (-pair b (-pair (-pair c d) e)))) c (list -car -car -cdr -cdr)]
-                      [-> (-lst (-lst a)) a]))]
-[cdaddr (-poly (a b c d e)
-               (cl->* [->acc (list (-pair a (-pair b (-pair (-pair c d) e)))) d (list -cdr -car -cdr -cdr)]
-                      [-> (-lst (-lst a)) (-lst a)]))]
-[cadddr (-poly (a b c d e)
-               (cl->* [->acc (list (-pair a (-pair b (-pair c (-pair d e))))) d (list -car -cdr -cdr -cdr)]
-                      [-> (-lst a) a]))]
-[cddddr (-poly (a b c d e)
-               (cl->* [->acc (list (-pair a (-pair b (-pair c (-pair d e))))) e (list -cdr -cdr -cdr -cdr)]
-                      [-> (-lst a) (-lst a)]))]
-
-[first (-poly (a b)
-              (cl->*
-               (->acc (list (-pair a (-lst b))) a (list -car))
-               (->* (list (-lst a)) a)))]
-[second (-poly (a r t)
-               (cl->* [->acc (list (-lst* a r #:tail (-lst t))) r (list -car -cdr)]
-                      [->* (list (-lst a)) a]))]
-[third (-poly (a b r t)
-              (cl->* [->acc (list (-lst* a b r #:tail (-lst t))) r (list -car -cdr -cdr)]
-                     [->* (list (-lst a)) a]))]
-[fourth  (-poly (a b c r t)
-              (cl->* [->acc (list (-lst* a b c r #:tail (-lst t))) r (list -car -cdr -cdr -cdr)]
-                     [->* (list (-lst a)) a]))]
-[fifth   (-poly (a b c d r t)
-              (cl->* [->acc (list (-lst* a b c d r #:tail (-lst t))) r (list -car -cdr -cdr -cdr -cdr)]
-                     [->* (list (-lst a)) a]))]
-[sixth   (-poly (a b c d e r t)
-              (cl->* [->acc (list (-lst* a b c d e r #:tail (-lst t))) r (list -car -cdr -cdr -cdr -cdr -cdr)]
-                     [->* (list (-lst a)) a]))]
-[seventh (-poly (a b c d e f r t)
-              (cl->* [->acc (list (-lst* a b c d e f r #:tail (-lst t))) r (list -car -cdr -cdr -cdr -cdr -cdr -cdr)]
-                     [->* (list (-lst a)) a]))]
-[eighth  (-poly (a b c d e f g r t)
-              (cl->* [->acc (list (-lst* a b c d e f g r #:tail (-lst t))) r (list -car -cdr -cdr -cdr -cdr -cdr -cdr -cdr)]
-                     [->* (list (-lst a)) a]))]
-[ninth   (-poly (a b c d e f g h r t)
-              (cl->* [->acc (list (-lst* a b c d e f g h r #:tail (-lst t))) r (list -car -cdr -cdr -cdr -cdr -cdr -cdr -cdr -cdr)]
-                     [->* (list (-lst a)) a]))]
-[tenth   (-poly (a b c d e f g h i r t)
-              (cl->* [->acc (list (-lst* a b c d e f g h i r #:tail (-lst t))) r (list -car -cdr -cdr -cdr -cdr -cdr -cdr -cdr -cdr -cdr)]
-                     [->* (list (-lst a)) a]))]
-[rest (-poly (a b)
-             (cl->*
-              (->acc (list (-pair a (-lst b))) (-lst b) (list -cdr))
-              (->* (list (-lst a)) (-lst a))))]
-
-[cons (-poly (a b)
-             (cl->* [->* (list a (-lst a)) (-lst a)]
-                    [->* (list a b) (-pair a b)]))]
-#;[*cons (-poly (a b) (cl->
-                     [(a b) (-pair a b)]
-                     [(a (-lst a)) (-lst a)]))]
-#;[*list? (make-pred-ty (-lst Univ))]
-
-[null? (make-pred-ty -Null)]
-[null -Null]
-[cons? (make-pred-ty (-pair Univ Univ))]
-[pair? (make-pred-ty (-pair Univ Univ))]
-[empty? (make-pred-ty -Null)]
-[empty -Null]
-
-[ormap (-polydots (a c b) (->... (list (->... (list a) (b b) c) (-lst a)) ((-lst b) b) (Un c (-val #f))))]
-[andmap (-polydots (a c d b) (cl->*
-                              (make-pred-ty (list (make-pred-ty (list a) c d) (-lst a)) c (-lst d)
-                                            ;; predicate on second argument
-                                            (-arg-path 1))
-                              (->... (list (->... (list a) (b b) c) (-lst a)) ((-lst b) b) (Un c (-val #t)))))]
-
-[reverse (-poly (a) (-> (-lst a) (-lst a)))]
-[kernel:reverse (-poly (a) (-> (-lst a) (-lst a)))]
-[append (-poly (a) (->* (list) (-lst a) (-lst a)))]
-[length (-poly (a) (-> (-lst a) -Index))]
-[memq (-poly (a) (-> Univ (-lst a) (-opt (-lst a))))]
-[memv (-poly (a) (-> Univ (-lst a) (-opt (-lst a))))]
-[memf (-poly (a) ((a . -> . Univ) (-lst a) . -> . (-opt (-lst a))))]
-[member (-poly (a)
-          (cl->* (Univ (-lst a) . -> . (-opt (-lst a)))
-                 (Univ (-lst a) (-> a a Univ)
-                       . -> . (-opt (-lst a)))))]
-[findf (-poly (a) ((a . -> . B) (-lst a) . -> . (-opt a)))]
-
-[assq  (-poly (a b) (Univ (-lst (-pair a b)) . -> . (-opt (-pair a b))))]
-[assv  (-poly (a b) (Univ (-lst (-pair a b)) . -> . (-opt (-pair a b))))]
-[assoc (-poly (a b) (Univ (-lst (-pair a b)) . -> . (-opt (-pair a b))))]
-[assf  (-poly (a b) ((a . -> . Univ) (-lst (-pair a b))
-                     . -> . (-opt (-pair a b))))]
-
-[list? (make-pred-ty (-lst Univ))]
-[list (-poly (a) (->* '() a (-lst a)))]
-[map (-polydots (c a b)
-                (cl->*
-                 (-> (-> a c) (-pair a (-lst a)) (-pair c (-lst c)))
-                 ((list
-                   ((list a) (b b) . ->... . c)
-                   (-lst a))
-                  ((-lst b) b) . ->... .(-lst c))))]
-[for-each (-polydots (a b) ((list ((list a) (b b) . ->... . Univ) (-lst a))
-                            ((-lst b) b) . ->... . -Void))]
-#;[fold-left (-polydots (c a b) ((list ((list c a) (b b) . ->... . c) c (-lst a))
-                               ((-lst b) b) . ->... . c))]
-#;[fold-right (-polydots (c a b) ((list ((list c a) (b b) . ->... . c) c (-lst a))
-                                ((-lst b) b) . ->... . c))]
-[foldl
- (-poly (a b c d)
-        (cl-> [((a b . -> . b) b (-lst a)) b]
-              [((a b c . -> . c) c (-lst a) (-lst b)) c]
-              [((a b c d . -> . d) d (-lst a) (-lst b) (-lst c)) d]))]
-[foldr  (-poly (a b c d)
-               (cl-> [((a b . -> . b) b (-lst a)) b]
-                     [((a b c . -> . c) c (-lst a) (-lst b)) c]
-                     [((a b c d . -> . d) d (-lst a) (-lst b) (-lst c)) d]))]
-[filter (-poly (a b) (cl->*
-                      ((asym-pred a Univ (-FS (-filter b 0) -top))
-                       (-lst a)
-                       . -> .
-                       (-lst b))
-                      ((a . -> . Univ) (-lst a) . -> . (-lst a))))]
-[filter-not (-poly (a) (cl->*
-                        ((a . -> . Univ) (-lst a) . -> . (-lst a))))]
-[shuffle (-poly (a) (-> (-lst a) (-lst a)))]
-
-[remove  (-poly (a) (Univ (-lst a) . -> . (-lst a)))]
-[remq    (-poly (a) (Univ (-lst a) . -> . (-lst a)))]
-[remv    (-poly (a) (Univ (-lst a) . -> . (-lst a)))]
-[remove* (-poly (a b) ((-lst a) (-lst b) [(a b . -> . B)] . ->opt . (-lst b)))]
-[remq*   (-poly (a) (-> (-lst Univ) (-lst a) (-lst a)))]
-[remv*   (-poly (a) (-> (-lst Univ) (-lst a) (-lst a)))]
-#|
-[sort (-poly (a b) (cl->* ((-lst a) (a a . -> . B)
-                          #:cache-keys? B #f
-                          . ->key . (-lst a))
-                         ((-lst a) (b b . -> . B)
-                          #:key (a . -> . b) #t
-                          #:cache-keys? B #f
-                          . ->key . (-lst a))))]
-|#
-
-;; Section 4.9.7 (racket/list)
-[filter-map (-polydots (c a b)
-                       ((list
-                         ((list a) (b b) . ->... . (-opt c))
-                         (-lst a))
-                        ((-lst b) b) . ->... . (-lst c)))]
-[count (-polydots (a b)
-                  ((list
-                    ((list a) (b b) . ->... . Univ)
-                    (-lst a))
-                   ((-lst b) b)
-                   . ->... .
-                   -Index))]
-[partition
- (-poly (a b) (cl->* (-> (-> a Univ) (-lst a) (-values (list (-lst a) (-lst a))))
-                     (-> (make-pred-ty a) (-lst b) (-values (list (-lst a) (-lst b))))))]
-
-[last   (-poly (a) ((-lst a) . -> . a))]
-[add-between (-poly (a b) ((-lst a) b
-                           #:splice? -Boolean #f
-                           #:before-first (-lst b) #f
-                           #:before-last b #f
-                           #:after-last (-lst b) #f
-                           . ->key . (-lst (Un a b))))]
-
-[last-pair (-poly (a) ((-mu x (Un a -Null (-pair a x)))
-                       . -> .
-                       (Un (-pair a a) (-lst* a))))]
-[takef
- (-poly (a b)
-   (cl->*
-    (-> (-lst a)
-        (asym-pred a Univ (-FS (-filter b 0) -top))
-        (-lst b))
-    (-> (-lst a) (-> a Univ) (-lst a))))]
-[dropf (-poly (a) (-> (-lst a) (-> a Univ) (-lst a)))]
-[splitf-at
- (-poly (a b)
-   (cl->*
-    (-> (-lst a)
-        (asym-pred a Univ (-FS (-filter b 0) -top))
-        (-values (list (-lst b) (-lst a))))
-    (-> (-lst a) (-> a Univ) (-values (list (-lst a) (-lst a))))))]
-[takef-right
- (-poly (a b)
-   (cl->*
-    (-> (-lst a)
-        (asym-pred a Univ (-FS (-filter b 0) -top))
-        (-lst b))
-    (-> (-lst a) (-> a Univ) (-lst a))))]
-[dropf-right (-poly (a) (-> (-lst a) (-> a Univ) (-lst a)))]
-[splitf-at-right
- (-poly (a b)
-   (cl->*
-    (-> (-lst a)
-        (asym-pred a Univ (-FS (-filter b 0) -top))
-        (-values (list (-lst a) (-lst b))))
-    (-> (-lst a) (-> a Univ) (-values (list (-lst a) (-lst a))))))]
-[append-map
- (-polydots (c a b) ((list ((list a) (b b) . ->... . (-lst c)) (-lst a))
-                     ((-lst b) b) . ->... .(-lst c)))]
-[append*
- (-poly (a) ((-lst (-lst a)) . -> . (-lst a)))]
-[permutations (-poly (a) (-> (-lst a) (-lst (-lst a))))]
-[in-permutations (-poly (a) (-> (-lst a) (-seq (-lst a))))]
-[argmin (-poly (a) ((a . -> . -Real) (-lst a) . -> . a))]
-[argmax (-poly (a) ((a . -> . -Real) (-lst a) . -> . a))]
-
-;; Section 4.9.8 (Immutable Cyclic Data)
-[make-reader-graph (-> Univ Univ)]
-
-;; Section 4.10 (Mutable Pairs)
-[mcons (-poly (a b) (-> a b (-mpair a b)))]
-[mcar (-poly (a b)
-             (cl->* (-> (-mpair a b) a)
-                    (-> (-mlst a) a)))]
-[mcdr (-poly (a b)
-             (cl->* (-> (-mpair a b) b)
-                    (-> (-mlst a) (-mlst a))))]
-[set-mcar! (-poly (a b)
-                  (cl->* (-> (-mpair a b) a -Void)
-                         (-> (-mlst a) a -Void)))]
-[set-mcdr! (-poly (a b)
-                  (cl->* (-> (-mpair a b) b -Void)
-                         (-> (-mlst a) (-mlst a) -Void)))]
-[unsafe-mcar (-poly (a b)
-                    (cl->* (-> (-mpair a b) a)
-                           (-> (-mlst a) a)))]
-[unsafe-mcdr (-poly (a b)
-                    (cl->* (-> (-mpair a b) b)
-                           (-> (-mlst a) (-mlst a))))]
-[unsafe-set-mcar! (-poly (a b)
-                         (cl->* (-> (-mpair a b) a -Void)
-                                (-> (-mlst a) a -Void)))]
-[unsafe-set-mcdr! (-poly (a b)
-                         (cl->* (-> (-mpair a b) b -Void)
-                                (-> (-mlst a) (-mlst a) -Void)))]
-[mpair? (make-pred-ty (make-MPairTop))]
-[mlist (-poly (a) (->* (list) a (-mlst a)))]
-[mlength (-poly (a) (-> (-mlst a) -Index))]
-[mreverse! (-poly (a) (-> (-mlst a) (-mlst a)))]
-[mappend (-poly (a) (->* (list) (-mlst a) (-mlst a)))]
-
-;; Section 4.11 (Vectors)
-[vector? (make-pred-ty (make-VectorTop))]
-[vector->list (-poly (a) (-> (-vec a) (-lst a)))]
-[list->vector (-poly (a) (-> (-lst a) (-vec a)))]
-[vector-length ((make-VectorTop) . -> . -Index)]
-[vector (-poly (a) (->* (list) a (-vec a)))]
-[vector-immutable (-poly (a) (->* (list) a (-vec a)))]
-[vector->immutable-vector (-poly (a) (-> (-vec a) (-vec a)))]
-[vector-fill! (-poly (a) (-> (-vec a) a -Void))]
-[vector-argmax (-poly (a) (-> (-> a -Real) (-vec a) a))]
-[vector-argmin (-poly (a) (-> (-> a -Real) (-vec a) a))]
-[vector-memq (-poly (a) (-> Univ (-vec a) (-opt -Index)))]
-[vector-memv (-poly (a) (-> Univ (-vec a) (-opt -Index)))]
-[vector-member (-poly (a) (Univ (-vec a) . -> . (-opt -Index)))]
-;; [vector->values no good type here]
-
-;; Section 4.11.1 (racket/vector)
-[vector-count (-polydots (a b)
-                         ((list
-                           ((list a) (b b) . ->... . Univ)
-                           (-vec a))
-                          ((-vec b) b)
-                          . ->... .
-                          -Index))]
-[vector-filter (-poly (a b) (cl->*
-                              ((asym-pred a Univ (-FS (-filter b 0) -top))
-                               (-vec a)
-                               . -> .
-                               (-vec b))
-                              ((a . -> . Univ) (-vec a) . -> . (-vec a))))]
-
-[vector-filter-not
- (-poly (a b) (cl->* ((a . -> . Univ) (-vec a) . -> . (-vec a))))]
-[vector-copy
- (-poly (a)
-        (cl->* ((-vec a) . -> . (-vec a))
-               ((-vec a) -Integer . -> . (-vec a))
-               ((-vec a) -Integer -Integer . -> . (-vec a))))]
-[vector-map (-polydots (c a b) ((list ((list a) (b b) . ->... . c) (-vec a))
-                                ((-vec b) b) . ->... .(-vec c)))]
-[vector-map! (-polydots (a b) ((list ((list a) (b b) . ->... . a) (-vec a))
-                               ((-vec b) b) . ->... .(-vec a)))]
-[vector-append (-poly (a) (->* (list) (-vec a) (-vec a)))]
-[vector-take   (-poly (a) ((-vec a) -Integer . -> . (-vec a)))]
-[vector-drop   (-poly (a) ((-vec a) -Integer . -> . (-vec a)))]
-[vector-take-right   (-poly (a) ((-vec a) -Integer . -> . (-vec a)))]
-[vector-drop-right   (-poly (a) ((-vec a) -Integer . -> . (-vec a)))]
-[vector-split-at
- (-poly (a) ((-vec a) -Integer . -> . (-values (list (-vec a) (-vec a)))))]
-[vector-split-at-right
- (-poly (a) ((-vec a) -Integer . -> . (-values (list (-vec a) (-vec a)))))]
-
-;; Section 4.12 (Boxes)
-[box (-poly (a) (a . -> . (-box a)))]
-[box-immutable (-poly (a) (a . -> . (-box a)))]
-[unbox (-poly (a) (cl->*
-                   ((-box a) . -> . a)
-                   ((make-BoxTop) . -> . Univ)))]
-[set-box! (-poly (a) ((-box a) a . -> . -Void))]
-[unsafe-unbox (-poly (a) (cl->*
-                          ((-box a) . -> . a)
-                          ((make-BoxTop) . -> . Univ)))]
-[unsafe-set-box! (-poly (a) ((-box a) a . -> . -Void))]
-[unsafe-unbox* (-poly (a) (cl->*
-                           ((-box a) . -> . a)
-                           ((make-BoxTop) . -> . Univ)))]
-[unsafe-set-box*! (-poly (a) ((-box a) a . -> . -Void))]
-[box? (make-pred-ty (make-BoxTop))]
-
-;; Section 4.13 (Hash Tables)
-[hash? (make-pred-ty -HashTop)]
-[hash-eq? (-> -HashTop B)]
-[hash-eqv? (-> -HashTop B)]
-[hash-equal? (-> -HashTop B)]
-[hash-weak? (-> -HashTop B)]
-;; not a very useful type, but better than nothing
-[hash (-poly (a b) (-> (-HT a b)))]
-[hasheqv (-poly (a b) (-> (-HT a b)))]
-[hasheq (-poly (a b) (-> (-HT a b)))]
-[make-hash (-poly (a b) (->opt [(-lst (-pair a b))] (-HT a b)))]
-[make-hasheq (-poly (a b) (->opt [(-lst (-pair a b))] (-HT a b)))]
-[make-hasheqv (-poly (a b) (->opt [(-lst (-pair a b))] (-HT a b)))]
-[make-weak-hash (-poly (a b) (->opt [(-lst (-pair a b))] (-HT a b)))]
-[make-weak-hasheq (-poly (a b) (->opt [(-lst (-pair a b))] (-HT a b)))]
-[make-weak-hasheqv (-poly (a b) (->opt [(-lst (-pair a b))] (-HT a b)))]
-[make-immutable-hash (-poly (a b) (->opt [(-lst (-pair a b))] (-HT a b)))]
-[make-immutable-hasheq (-poly (a b) (->opt [(-lst (-pair a b))] (-HT a b)))]
-[make-immutable-hasheqv (-poly (a b) (->opt [(-lst (-pair a b))] (-HT a b)))]
-
-[hash-set (-poly (a b) ((-HT a b) a b . -> . (-HT a b)))]
-[hash-set! (-poly (a b) ((-HT a b) a b . -> . -Void))]
-[hash-ref (-poly (a b c)
-                 (cl-> [((-HT a b) a) b]
-                       [((-HT a b) a (-val #f)) (-opt b)]
-                       [((-HT a b) a (-> c)) (Un b c)]
-                       [(-HashTop a) Univ]
-                       [(-HashTop a (-val #f)) Univ]
-                       [(-HashTop a (-> c)) Univ]))]
-[hash-ref! (-poly (a b) (-> (-HT a b) a (-> b) b))]
-[hash-has-key? (-HashTop Univ . -> . B)]
-[hash-update! (-poly (a b)
-                     (cl-> [((-HT a b) a (-> b b)) -Void]
-                           [((-HT a b) a (-> b b) (-> b)) -Void]))]
-[hash-update (-poly (a b)
-                    (cl-> [((-HT a b) a (-> b b)) (-HT a b)]
-                          [((-HT a b) a (-> b b) (-> b)) (-HT a b)]))]
-[hash-remove (-poly (a b) (cl-> [((-HT a b) Univ) (-HT a b)]
-                                [(-HashTop Univ) -HashTop]))]
-[hash-remove! (-poly (a b) (cl-> [((-HT a b) a) -Void]
-                                 [(-HashTop a) -Void]))]
-[hash-map (-poly (a b c) (cl-> [((-HT a b) (a b . -> . c)) (-lst c)]
-                               [(-HashTop (Univ Univ . -> . c)) (-lst c)]))]
-[hash-for-each (-poly (a b c) (cl-> [((-HT a b) (-> a b c)) -Void]
-                                    [(-HashTop (-> Univ Univ c)) -Void]))]
-[hash-count (-poly (a b) (cl-> [((-HT a b)) -Index]
-                               [(-HashTop) -Index]))]
-[hash-keys (-poly (a b) (cl-> [((-HT a b)) (-lst a)]
-                              [(-HashTop) (-lst Univ)]))]
-[hash-values (-poly (a b) (cl-> [((-HT a b)) (-lst b)]
-                                [(-HashTop) (-lst Univ)]))]
-[hash->list (-poly (a b) (cl-> [((-HT a b)) (-lst (-pair a b))]
-                               [(-HashTop) (-lst (-pair Univ Univ))]))]
-
-[hash-copy (-poly (a b) (-> (-HT a b) (-HT a b)))]
-[eq-hash-code (-> Univ -Fixnum)]
-[eqv-hash-code (-> Univ -Fixnum)]
-[equal-hash-code (-> Univ -Fixnum)]
-[equal-secondary-hash-code (-> Univ -Fixnum)]
-[hash-iterate-first (-poly (a b)
-                           ((-HT a b) . -> . (Un (-val #f) -Integer)))]
-[hash-iterate-next (-poly (a b)
-                           ((-HT a b) -Integer . -> . (Un (-val #f) -Integer)))]
-[hash-iterate-key (-poly (a b)
-                           ((-HT a b) -Integer . -> . a))]
-[hash-iterate-value (-poly (a b)
-                           ((-HT a b) -Integer . -> . b))]
-
-[make-custom-hash (->opt (-> Univ Univ Univ) (-> Univ -Nat) [(-> Univ -Nat)] Univ)]
-[make-immutable-custom-hash (->opt (-> Univ Univ Univ) (-> Univ -Nat) [(-> Univ -Nat)] Univ)]
-[make-weak-custom-hash (->opt (-> Univ Univ Univ) (-> Univ -Nat) [(-> Univ -Nat)] Univ)]
-
-;; Section 4.14 (Sequences and Streams)
-[sequence? (make-pred-ty (-seq Univ))]
-[in-sequences
- (-poly (a) (->* (list) (-seq a) (-seq a)))]
-[in-cycle
- (-poly (a) (->* (list) (-seq a) (-seq a)))]
-[in-parallel
- (-poly (a b c)
-   (cl->* (-> (-seq a) (-seq a))
-          (-> (-seq a) (-seq b) (-seq a b))
-          (-> (-seq a) (-seq b) (-seq c) (-seq a b c))))]
-[in-values-sequence
- (-poly (a b c)
-   (cl->* (-> (-seq a) (-seq (-lst* a)))
-          (-> (-seq a b) (-seq (-lst* a b)))
-          (-> (-seq a b c) (-seq (-lst* a b c)))))]
-[in-values*-sequence
- (-poly (a b c)
-   (cl->* (-> (-seq a) (-seq a))
-          (-> (-seq a b) (-seq (-lst* a b)))
-          (-> (-seq a b c) (-seq (-lst* a b c)))))]
-[stop-before (-poly (a) ((-seq a) (a . -> . Univ) . -> . (-seq a)))]
-[stop-after (-poly (a) ((-seq a) (a . -> . Univ) . -> . (-seq a)))]
-[make-do-sequence (-poly (a b) ((-> (-values (list (a . -> . b)
-                                                   (a . -> . a)
-                                                   a
-                                                   (Un (a . -> . Univ) (-val #f))
-                                                   (Un (b . -> . Univ) (-val #f))
-                                                   (Un (a b . -> . Univ) (-val #f)))))
-                                . -> . (-seq b)))]
-[sequence-generate (-poly (a) ((-seq a) . -> . (-values (list (-> -Boolean) (-> a)))))]
-;; Doesn't work (mu types are single-valued only):
-;[sequence-generate*  (-poly (a) ((-seq a) . -> . (-mu t (-values (list (Un (-lst a) (-val #f)) t)))))]
-;; Doesn't render nicely (but seems to work fine):
-[empty-sequence (-poly (a) (-seq a))]
-[sequence->list (-poly (a) ((-seq a) . -> . (-lst a)))]
-[sequence-length (-poly (a) ((-seq a) . -> . -Nat))]
-[sequence-ref (-poly (a) ((-seq a) -Integer . -> . a))]
-[sequence-tail (-poly (a) ((-seq a) -Integer . -> . (-seq a)))]
-[sequence-append (-poly (a) (->* (list) (-seq a) (-seq a)))]
-[sequence-map (-poly (a b) ((a . -> . b) (-seq a) . -> . (-seq b)))]
-[sequence-andmap (-poly (a b) ((a . -> . b) (-seq a) . -> . (Un b (-val #t))))]
-[sequence-ormap (-poly (a b) ((a . -> . b) (-seq a) . -> . (Un b (-val #f))))]
-[sequence-for-each (-poly (a) ((a . -> . Univ) (-seq a) . -> . -Void))]
-[sequence-fold (-poly (a b) ((b a . -> . b) b (-seq a) . -> . b))]
-[sequence-count (-poly (a) ((a . -> . Univ) (-seq a) . -> . -Nat))]
-[sequence-filter (-poly (a b) (cl->*
-                                ((asym-pred a Univ (-FS (-filter b 0) -top))
-                                 (-seq a)
-                                 . -> .
-                                 (-seq b))
-                                ((a . -> . Univ) (-seq a) . -> . (-seq a))))]
-[sequence-add-between (-poly (a) ((-seq a) a . -> . (-seq a)))]
-
-;; Section 4.16 (Sets)
-[set (-poly (e) (->* (list) e (-set e)))]
-[seteqv (-poly (e) (->* (list) e (-set e)))]
-[seteq (-poly (e) (->* (list) e (-set e)))]
-[set-empty? (-poly (e) (-> (-set e) B))]
-[set-count (-poly (e) (-> (-set e) -Index))]
-[set-member? (-poly (e) (-> (-set e) e B))]
-[set-first (-poly (e) (-> (-set e) e))]
-[set-rest (-poly (e) (-> (-set e) (-set e)))]
-[set-add (-poly (e) (-> (-set e) e (-set e)))]
-[set-remove (-poly (e) (-> (-set e) Univ (-set e)))]
-
-[set-union (-poly (e) (->* (list (-set e)) (-set e) (-set e)))]
-[set-intersect (-poly (a b) (->* (list (-set a)) (-set b) (-set a)))]
-[set-subtract (-poly (a b) (->* (list (-set a)) (-set b) (-set a)))]
-[set-symmetric-difference (-poly (e) (->* (list (-set e)) (-set e) (-set e)))]
-
-[set=? (-poly (a b) (-> (-set a) (-set b) B))]
-
-[subset? (-poly (e) (-> (-set e) (-set e) B))]
-[proper-subset? (-poly (e) (-> (-set e) (-set e) B))]
-[set-map (-poly (e b) (-> (-set e) (-> e b) (-lst b)))]
-[set-for-each (-poly (e b) (-> (-set e) (-> e b) -Void))]
-[generic-set? (asym-pred Univ B (-FS -top (-not-filter (-set Univ) 0)))]
-[set? (make-pred-ty (-set Univ))]
-[set-equal? (-poly (e) (-> (-set e) B))]
-[set-eqv? (-poly (e) (-> (-set e) B))]
-[set-eq? (-poly (e) (-> (-set e) B))]
-
-[list->set    (-poly (e) (-> (-lst e) (-set e)))]
-[list->seteq  (-poly (e) (-> (-lst e) (-set e)))]
-[list->seteqv (-poly (e) (-> (-lst e) (-set e)))]
-[set->list (-poly (e) (-> (-set e) (-lst e)))]
-
-;; Section 4.17 (Procedures)
-[procedure? (make-pred-ty top-func)]
-[compose (-poly (a b c) (-> (-> b c) (-> a b) (-> a c)))]
-[compose1 (-poly (a b c) (-> (-> b c) (-> a b) (-> a c)))]
-[procedure-rename (-> top-func -Symbol top-func)]
-[procedure->method (-> top-func top-func)]
-[procedure-closure-contents-eq? (-> top-func top-func -Boolean)]
-;; keyword-apply - hard to give a type
-[procedure-arity (-> top-func (Un -Nat -Arity-At-Least (-lst (Un -Nat -Arity-At-Least))))]
-[procedure-arity? (make-pred-ty (Un -Nat -Arity-At-Least (-lst (Un -Nat -Arity-At-Least))))]
-[procedure-arity-includes? (->opt top-func -Nat [Univ] B)]
-[procedure-reduce-arity (-> top-func (Un -Nat -Arity-At-Least (-lst (Un -Nat -Arity-At-Least))) top-func)]
-[procedure-keywords (-> top-func (-values (list (-lst -Keyword) (-opt (-lst -Keyword)))))]
-
-[apply        (-poly (a b) (((list) a . ->* . b) (-lst a) . -> . b))]
-[new-apply-proc (-poly (a b) (((list) a . ->* . b) (-lst a) . -> . b))]
-[kernel:apply (-poly (a b) (((list) a . ->* . b) (-lst a) . -> . b))]
-[time-apply
- (-polydots (b a) (cl->*
-                   (-> (-> b) -Null (-values (list (-lst* b) -Nat -Nat -Nat)))
-                   (-> (->... '() (a a) b)
-                       (make-ListDots a 'a)
-                       (-values (list (-lst* b) -Nat -Nat -Nat)))))]
-
-;; Section 4.17.3 (racket/function)
-[identity (-poly (a) (->acc (list a) a null))]
-[const (-poly (a) (-> a (->* '() Univ a)))]
-[negate (-polydots (a b c d)
-          (cl->* (-> (-> c Univ : (-FS (-filter a 0) (-not-filter b 0)))
-                     (-> c -Boolean : (-FS (-not-filter b 0) (-filter a 0))))
-                 (-> (-> c Univ : (-FS (-filter a 0) (-filter b 0)))
-                     (-> c -Boolean : (-FS (-filter b 0) (-filter a 0))))
-                 (-> (-> c Univ : (-FS (-not-filter a 0) (-filter b 0)))
-                     (-> c -Boolean : (-FS (-filter b 0) (-not-filter a 0))))
-                 (-> (-> c Univ : (-FS (-not-filter a 0) (-not-filter b 0)))
-                     (-> c -Boolean : (-FS (-not-filter b 0) (-not-filter a 0))))
-                 (-> ((list) [d d] . ->... . Univ)
-                     ((list) [d d] . ->... . -Boolean))))]
-;; probably the most useful cases
-;; doesn't cover cases where we pass multiple of the function's arguments to curry,
-;; also doesn't express that the returned function is itself curried
-[curry (-polydots (a c b)
-                  (cl->* ((->... (list a) (b b) c) a . -> . (->... '() (b b) c))
-                         ((->... (list a) (b b) c) . -> . (a . -> . (->... '() (b b) c)))))]
-(primitive? (-> Univ B))
-(primitive-closure? (-> Univ B))
-
-;; Section 4.18 (Void and Undefined)
-[void (->* '() Univ -Void)]
-[void? (make-pred-ty -Void)]
-
-;; Section 5.2 (Structure Types)
-[make-struct-type
- (->opt -Symbol
-        (-opt (make-StructTypeTop))
-        -Nat -Nat
-        [Univ
-         (-lst (-pair -Struct-Type-Property Univ))
-         (Un -Inspector (-val #f) (-val 'prefab))
-         (Un top-func (-val #f) -Nat)
-         (-lst -Nat)
-         (-opt top-func)
-         (-opt -Symbol)]
-        (-values (list (make-StructTypeTop) top-func top-func top-func top-func)))]
-[make-struct-field-accessor (->opt top-func -Nat [(-opt -Symbol)] top-func)]
-[make-struct-field-mutator  (->opt top-func -Nat [(-opt -Symbol)] top-func)]
-
-;; Section 5.3 (Structure Type Properties)
-[make-struct-type-property
- (->opt Sym
-       [(Un (one-of/c #f 'can-impersonate) (-> Univ (-lst Univ)))
-        (-lst (-pair -Struct-Type-Property (-> Univ Univ)))
-        Univ]
-       (-values (list -Struct-Type-Property (-> Univ B) (-> Univ Univ))))]
-
-[struct-type-property? (make-pred-ty -Struct-Type-Property)]
-[struct-type-property-accessor-procedure? (-> Univ B)]
-
-;; Section 5.6 (Structure Utilities)
-[struct->vector (Univ . -> . (-vec Univ))]
-[struct? (-> Univ -Boolean)]
-[struct-type? (make-pred-ty (make-StructTypeTop))]
-
-;; Section 6.2 (Classes)
-[object% (-class)]
-
-;; Section 6.11 (Object, Class, and Interface Utilities)
-[object? (make-pred-ty (-object))]
-[class? (make-pred-ty (make-ClassTop))]
-;; TODO: interface?
-;;       generic?
-[object=? (-> (-object) (-object) -Boolean)]
-[object->vector (->opt (-object) [Univ] (-vec Univ))]
-;; TODO: class->interface
-;;       object-interface
-[is-a? (-> Univ (make-ClassTop) -Boolean)]
-[subclass? (-> Univ (make-ClassTop) -Boolean)]
-;; TODO: implementation?
-;;       interface-extension?
-;;       method-in-interface?
-;;       interface->method-names
-[object-method-arity-includes? (-> (-object) -Symbol -Nat -Boolean)]
-[field-names (-> (-object) (-lst -Symbol))]
-[object-info (-> (-object) (-values (list (Un (make-ClassTop) (-val #f)) -Boolean)))]
-;; TODO: class-info (is this sound to allow?)
-
-;; Section 9.1
-[exn:misc:match? (-> Univ B)]
-;; this is a hack
-[match:error ((list) Univ . ->* . (Un))]
-;[match:error (Univ . -> . (Un))]
-[match-equality-test (-Param (Univ Univ . -> . Univ) (Univ Univ . -> . Univ))]
-[matchable? (make-pred-ty (Un -String -Bytes))]
-
-;; Section 10.1
-[values (-polydots (a b) (cl->*
-                           (-> (-values null))
-                           (->acc (list a) a null)
-                           ((list a) (b b) . ->... . (make-ValuesDots (list (-result a)) b 'b))))]
-[call-with-values
-  (-polydots (b a)
-    (cl->*
-     ((-> (make-ValuesDots null a 'a)) (null (a a) . ->... . b) . -> .  b)
-     ((-> ManyUniv) ((list) Univ . ->* . b) . -> . b)))]
-
-;; Section 10.2
-[raise (cl->* ((Un -Flat -Exn) . -> . (Un))
-              ((Un -Flat -Exn) Univ . -> . (Un)))]
-[error
- (cl->* (-> Sym (Un))
-        (->* (list -String) Univ (Un))
-        (->* (list Sym -String) Univ (Un)))]
-[raise-user-error
- (cl->* (-> Sym (Un))
-        (->* (list -String) Univ (Un))
-        (->* (list Sym -String) Univ (Un)))]
-
-;raise-type-error (in index)
-[raise-mismatch-error (-> Sym -String Univ (Un))]
-;raise-arity-error
-[raise-syntax-error (->opt (-opt Sym) -String [Univ Univ (-lst (-Syntax Univ))] (Un))]
-
-[call-with-exception-handler (-poly (a) (-> (-> Univ a) (-> a) a))]
-[uncaught-exception-handler (-Param (-> Univ ManyUniv) (-> Univ ManyUniv))]
-
-[error-escape-handler (-Param (-> ManyUniv) (-> ManyUniv))]
-[error-display-handler (-Param (-> -String Univ ManyUniv) (-> -String Univ ManyUniv))]
-[error-value->string-handler (-Param (-> Univ -Nat -String) (-> Univ -Nat -String))]
-[error-print-context-length (-Param -Nat -Nat)]
-[error-print-width (-Param -Nat -Nat)]
-[error-print-source-location (-Param Univ B)]
-
-;; Section 10.2.5
-[prop:exn:srclocs -Struct-Type-Property]
-[exn:srclocs? (-> Univ B)]
-[exn:srclocs-accessor (-> Univ (-lst Univ))] ;TODO
-
-;; Section 10.3 (Delayed Evaluation)
-[promise? (make-pred-ty (-Promise Univ))]
-[force (-poly (a) (->acc (list (-Promise a)) a (list -force)))]
-[promise-forced? (-poly (a) (-> (-Promise a) B))]
-[promise-running? (-poly (a) (-> (-Promise a) B))]
-
-;; Section 10.4 (Continuations)
-[call-with-continuation-prompt
- (-polydots (a b d c)
-   (cl->*
-    (-> (-> b) (make-Prompt-Tagof b (-> (-> d) d)) (Un b d))
-    (-> (-> b) (make-Prompt-Tagof b (->... '() (c c) d)) (->... '() (c c) d)
-        (Un b d))
-    (-> (-> b) Univ)))]
-[abort-current-continuation
- (-polydots (a b d e c)
-   (cl->*
-    (->... (list (make-Prompt-Tagof b (->... '() (c c) d))) (c c) e)
-    (->... (list (make-Prompt-Tagof b (->... '() (c c) ManyUniv))) (c c) e)))]
-[make-continuation-prompt-tag
- (-poly (a b) (->opt [Sym] (make-Prompt-Tagof a b)))]
-;; default-continuation-prompt-tag is defined in "base-contracted.rkt"
-[call-with-current-continuation
- (-polydots (a b c)
-   (cl->* (-> (-> (-> (Un)) (-values null)) (-values null))
-          (-> (-> (->... (list a) (c c) (Un))
-                  (make-ValuesDots (list (-result b)) c 'c))
-              (make-ValuesDots (list (-result (Un a b))) c 'c))))]
-[call/cc
- (-polydots (a b c)
-   (cl->* (-> (-> (-> (Un)) (-values null)) (-values null))
-          (-> (-> (->... (list a) (c c) (Un))
-                  (make-ValuesDots (list (-result b)) c 'c))
-              (make-ValuesDots (list (-result (Un a b))) c 'c))))]
-[call-with-composable-continuation
- (-polydots (b c a)
-   (-> ;; takes a continuation and should return the same
-       ;; type as the continuation's input type
-       (-> (->... '() (a a) b) (make-ValuesDots '() a 'a))
-       (make-Prompt-Tagof b c)
-       ;; the continuation's input is the same as the
-       ;; return type here
-       (make-ValuesDots '() a 'a)))]
-[call-with-escape-continuation
- (-polydots (a b c)
-   (cl->* (-> (-> (-> (Un)) (-values null)) (-values null))
-          (-> (-> (->... (list a) (c c) (Un))
-                  (make-ValuesDots (list (-result b)) c 'c))
-              (make-ValuesDots (list (-result (Un a b))) c 'c))))]
-[call/ec
- (-polydots (a b c)
-   (cl->* (-> (-> (-> (Un)) (-values null)) (-values null))
-          (-> (-> (->... (list a) (c c) (Un))
-                  (make-ValuesDots (list (-result b)) c 'c))
-              (make-ValuesDots (list (-result (Un a b))) c 'c))))]
-[call-with-continuation-barrier (-poly (a) (-> (-> a) a))]
-[continuation-prompt-available? (-> (make-Prompt-TagTop) B)]
-[continuation?
- (asym-pred Univ B (-FS (-filter top-func 0) -top))]
-[continuation-prompt-tag? (make-pred-ty (make-Prompt-TagTop))]
-[dynamic-wind (-poly (a) (-> (-> ManyUniv) (-> a) (-> ManyUniv) a))]
-
-;; Section 10.5 (Continuation Marks)
-;; continuation-marks needs type for continuations as other
-;; possible first argument
-[continuation-marks
- (->opt (Un (-val #f) -Thread) [(make-Prompt-TagTop)] -Cont-Mark-Set)]
-[current-continuation-marks (->opt [(make-Prompt-TagTop)] -Cont-Mark-Set)]
-[continuation-mark-set->list
- (-poly (a)
-        (cl->*
-         (->opt -Cont-Mark-Set (make-Continuation-Mark-Keyof a)
-                [(make-Prompt-TagTop)] (-lst a))
-         (->opt -Cont-Mark-Set Univ [(make-Prompt-TagTop)] (-lst Univ))))]
-[continuation-mark-set->list*
- (-poly (a b)
-        (cl->*
-         (->opt -Cont-Mark-Set
-                (-lst (make-Continuation-Mark-Keyof a))
-                [b (make-Prompt-TagTop)]
-                (-lst (-vec (Un a b))))
-         (->opt -Cont-Mark-Set
-                (-lst Univ)
-                [Univ (make-Prompt-TagTop)]
-                (-lst (-vec Univ)))))]
-[continuation-mark-set-first
- (-poly (a b)
-        (cl->*
-         (-> (-opt -Cont-Mark-Set) (make-Continuation-Mark-Keyof a)
-             (-opt a))
-         (->opt (-opt -Cont-Mark-Set) (make-Continuation-Mark-Keyof a)
-                [b (make-Prompt-TagTop)]
-                (Un a b))
-         (->opt (-opt -Cont-Mark-Set) Univ [Univ (make-Prompt-TagTop)] Univ)))]
-[call-with-immediate-continuation-mark
- (-poly (a) (->opt Univ (-> Univ a) [Univ] a))]
-[continuation-mark-key? (make-pred-ty (make-Continuation-Mark-KeyTop))]
-[continuation-mark-set? (make-pred-ty -Cont-Mark-Set)]
-[make-continuation-mark-key
- (-poly (a) (->opt [-Symbol] (make-Continuation-Mark-Keyof a)))]
-[continuation-mark-set->context
- (-> -Cont-Mark-Set (-lst (-pair (-opt Sym) Univ)))] ;TODO add srcloc
-
-;; Section 10.6
-[break-enabled (cl->* (-> B) (-> B -Void))]
-
-;; Section 10.7 (Exiting)
-[exit (->opt [Univ] (Un))]
-[exit-handler (-Param (-> Univ ManyUniv) (-> Univ ManyUniv))]
-[executable-yield-handler (-Param (-> -Byte ManyUniv) (-> -Byte ManyUniv))]
-
-;; Section 11.1 (Threads)
-
-;; Section 11.1.1
-[thread (-> (-> Univ) -Thread)]
-[thread? (make-pred-ty -Thread)]
-[current-thread (-> -Thread)]
-[thread/suspend-to-kill (-> (-> Univ) -Thread)]
-[call-in-nested-thread (-poly (a) (->opt (-> a) [-Custodian] a))]
-
-;; Section 11.1.2
-[thread-suspend (-Thread . -> . -Void)]
-[thread-resume (->opt -Thread [(Un (-val #f) -Thread -Custodian)] -Void)]
-[kill-thread (-Thread . -> . -Void)]
-[break-thread (-Thread . -> . -Void)]
-[sleep ([N] . ->opt . -Void)]
-[thread-running? (-Thread . -> . B)]
-[thread-dead? (-Thread . -> . B)]
-
-;; Section 11.1.3
-[thread-wait (-Thread . -> . -Void)]
-[thread-dead-evt (-> -Thread (-mu x (-evt x)))]
-[thread-resume-evt (-> -Thread (-mu x (-evt x)))]
-[thread-suspend-evt (-> -Thread (-mu x (-evt x)))]
-
-;; Section 11.1.4
-[thread-send
- (-poly (a) (cl->* (-> -Thread Univ -Void)
-                   (-> -Thread Univ (-val #f) (-opt -Void))
-                   (-> -Thread Univ (-> a) (Un -Void a))))]
-[thread-receive (-> Univ)]
-[thread-try-receive (-> Univ)]
-[thread-receive-evt (-> (-mu x (-evt x)))]
-[thread-rewind-receive (-> (-lst Univ) -Void)]
-
-;; Section 11.2.1
-[evt? (make-pred-ty (-evt Univ))]
-[sync (-poly (a) (->* '() (-evt a) a))]
-[sync/timeout
- (-poly (a b)
-   (cl->*
-    (->* (list (-val #f)) (-evt a) a)
-    (->* (list -NonNegReal) (-evt a) (-opt a))
-    (->* (list (-> b)) (-evt a) (Un a b))))]
-[sync/enable-break (-poly (a) (->* '() (-evt a) a))]
-[sync/timeout/enable-break
- (-poly (a b)
-   (cl->*
-    (->* (list (-val #f)) (-evt a) a)
-    (->* (list -NonNegReal) (-evt a) (-opt a))
-    (->* (list (-> b)) (-evt a) (Un a b))))]
-[choice-evt (-poly (a) (->* '() (-evt a) (-evt a)))]
-[wrap-evt (-poly (a b) (-> (-evt a) (-> a b) (-evt b)))]
-[handle-evt (-poly (a b) (-> (-evt a) (-> a b) (-evt b)))]
-[guard-evt (-poly (a) (-> (-> (-evt a)) (-evt a)))]
-[nack-guard-evt
- (-poly (a)
-   (-> (-> (-evt -Void) (-evt a))
-       (-evt a)))]
-[poll-guard-evt
- (-poly (a) (-> (-> -Boolean (-evt a)) (-evt a)))]
-[always-evt (-mu x (-evt x))]
-[replace-evt (-poly (a b)
-               (cl->*
-                 (-> (-evt a) (-> a (-evt b)) (-evt b))
-                 (-> (-evt a) (-> a b) (-mu x (-evt x)))))]
-[never-evt (-evt (Un))]
-[system-idle-evt (-> (-evt -Void))]
-[alarm-evt (-> -Real (-mu x (-evt x)))]
-[handle-evt? (asym-pred Univ B (-FS (-filter (-evt Univ) 0) -top))]
-[current-evt-pseudo-random-generator
- (-Param -Pseudo-Random-Generator -Pseudo-Random-Generator)]
-
-;; Section 11.2.2
-[make-channel (-poly (a) (-> (-channel a)))]
-[channel? (make-pred-ty (make-ChannelTop))]
-[channel-get (-poly (a) ((-channel a) . -> . a))]
-[channel-try-get (-poly (a) ((-channel a) . -> . (Un a (-val #f))))]
-[channel-put (-poly (a) ((-channel a) a . -> . -Void))]
-[channel-put-evt (-poly (a) (-> (-channel a) a (-mu x (-evt x))))]
-[channel-put-evt? (asym-pred Univ B (-FS (-filter (-mu x (-evt x)) 0) -top))]
-
-;; Section 11.2.3 (Semaphores)
-[semaphore? (make-pred-ty -Semaphore)]
-[make-semaphore (->opt [-Nat] -Semaphore)]
-[semaphore-post (-> -Semaphore -Void)]
-[semaphore-wait (-> -Semaphore -Void)]
-[semaphore-try-wait? (-> -Semaphore B)]
-[semaphore-wait/enable-break (-> -Semaphore -Void)]
-[semaphore-peek-evt (-> -Semaphore (-mu x (-evt x)))]
-[semaphore-peek-evt? (asym-pred Univ B (-FS (-filter (-mu x (-evt x)) 0) -top))]
-;[call-with-semaphore ???]
-;[call-with-semaphore/enable-break ???]
-
-;; Section 11.3.1 (Thread Cells)
-[thread-cell? (make-pred-ty (make-ThreadCellTop))]
-[make-thread-cell (-poly (a) (->opt a [Univ] (-thread-cell a)))]
-[thread-cell-ref (-poly (a) (-> (-thread-cell a) a))]
-[thread-cell-set! (-poly (a) (-> (-thread-cell a) a -Void))]
-[current-preserved-thread-cell-values
- (cl->* (-> Univ) (-> Univ -Void))]
-
-;; Section 11.3.3 (Parameters)
-
-;hidden parameter bindings
-[parameterization-key Sym]
-[extend-parameterization (-poly (a b) (-> Univ (-Param a b) a Univ))]
-
-[make-parameter (-poly (a b) (cl-> [(a) (-Param a a)]
-                                   [(b (a . -> . b)) (-Param a b)]))]
-[make-derived-parameter (-poly (a b c d) (-> (-Param a b) (-> c a) (-> b d) (-Param c d)))]
-[parameter? (make-pred-ty (-Param -Bottom Univ))]
-[parameter-procedure=? (-poly (a b c d) (-> (-Param a b) (-Param c d) B))]
-
-[current-parameterization (-> -Parameterization)]
-[call-with-parameterization (-poly (a) (-> -Parameterization (-> a) a))]
-[parameterization? (make-pred-ty -Parameterization)]
-
-;; Section 11.4 (Futures)
-[future (-poly (A) ((-> A) . -> . (-future A)))]
-[touch (-poly (A) ((-future A) . -> . A))]
-[futures-enabled? (-> -Boolean)]
-[current-future (-> (-opt (-future Univ)))]
-[future? (make-pred-ty (-future Univ))]
-[would-be-future (-poly (A) ((-> A) . -> . (-future A)))]
-[processor-count (-> -PosInt)]
-
-;; Section 11.5 (Places)
-[place-enabled? (-> -Boolean)]
-[place? (make-pred-ty -Place)]
-[place-channel? (make-pred-ty -Place-Channel)]
-;; FIXME: the `#:at` keyword is for remote places, not supported yet
-[dynamic-place (->key (Un -Module-Path -Path) Sym
-                      #:at (-val #f) #f
-                      #:named (Un (-val #f) -Symbol) #f
-                      -Place)]
-[dynamic-place* (->key (Un -Module-Path -Path) Sym
-                       #:in (-opt -Input-Port) #f
-                       #:out (-opt -Output-Port) #f
-                       #:err (-opt -Output-Port) #f
-                      (-values (list -Place
-                                     (-opt -Output-Port)
-                                     (-opt -Input-Port)
-                                     (-opt -Input-Port))))]
-[place-wait (-> -Place -Int)]
-[place-dead-evt (-> -Place (-mu x (-evt x)))]
-[place-break (->opt -Place [(-opt (one-of/c 'hang-up 'terminate))] -Void)]
-[place-kill (-> -Place -Void)]
-[place-channel (-> (-values (list -Place-Channel -Place-Channel)))]
-[place-channel-put (-> -Place-Channel Univ -Void)]
-[place-channel-get (-> -Place-Channel Univ)]
-[place-channel-put/get (-> -Place-Channel Univ Univ)]
-[place-message-allowed? (-> Univ -Boolean)]
-
-;; Section 12 (Macros)
-
-;; Section 12.2
-[syntax? (make-pred-ty (-Syntax Univ))]
-
-[syntax-source (-> (-Syntax Univ) Univ)]
-[syntax-line (-> (-Syntax Univ) (-opt -PosInt))]
-[syntax-column (-> (-Syntax Univ) (-opt -Nat))]
-[syntax-position (-> (-Syntax Univ) (-opt -PosInt))]
-[syntax-span (-> (-Syntax Univ) (-opt -Nat))]
-
-[syntax-original? (-poly (a) (-> (-Syntax a) B))]
-[syntax-source-module (->opt (-Syntax Univ) [Univ] (Un (-val #f) -Path Sym -Module-Path-Index))]
-[syntax-e (-poly (a) (->acc (list (-Syntax a)) a (list -syntax-e)))]
-[syntax->list (-poly (a) (-> (-Syntax (-lst a)) (-lst a)))]
-[syntax->datum (cl->* (-> Any-Syntax -Sexp)
-                      (-> (-Syntax Univ) Univ))]
-
-[datum->syntax
- (let* ([Pre Syntax-Sexp]
-        [I (-Syntax Sym)]
-        [A Any-Syntax]
-        [S (-Syntax Univ)]
-        [ctxt (-opt S)]
-        [srclist (-lst*
-                   Univ
-                   (-opt -Integer)
-                   (-opt -Integer)
-                   (-opt -Integer)
-                   (-opt -Integer))]
-        [srcvec (make-HeterogeneousVector (list
-                                           Univ
-                                           (-opt -Integer)
-                                           (-opt -Integer)
-                                           (-opt -Integer)
-                                           (-opt -Integer)))]
-        [srcloc (Un S (-val #f) srclist srcvec)]
-        [prop (-opt S)]
-        [cert (-opt S)])
-   (cl->*
-    (->opt ctxt Sym  [srcloc prop cert] I)
-    (->opt ctxt Pre  [srcloc prop cert] A)
-    (->opt ctxt Univ [srcloc prop cert] S)))]
-
-[identifier? (make-pred-ty (-Syntax Sym))]
-
-[generate-temporaries (-> (Un (-Syntax (-lst Univ)) (-lst Univ)) (-lst (-Syntax Sym)))]
-[identifier-prune-lexical-context (->opt (-Syntax Sym) [(-lst Sym)] (-Syntax Sym))]
-[identifier-prune-to-source-module (-> (-Syntax Sym) (-Syntax Sym))]
-
-;; Section 12.3
-[bound-identifier=? (Ident Ident [(-opt -Integer)] . ->opt . B)]
-
-[free-identifier=? (Ident Ident [(-opt -Integer)] . ->opt . B)]
-[free-label-identifier=? (Ident Ident . -> . B)]
-[free-transformer-identifier=? (Ident Ident . -> . B)]
-[free-template-identifier=? (Ident Ident . -> . B)]
-
-[check-duplicate-identifier ((-lst (-Syntax Sym)) . -> . (-opt (-Syntax Sym)))]
-
-[identifier-binding
- (Ident [(-opt -Integer)]. ->opt .
-  (Un (-val 'lexical) (-val #f)
-   (-lst* -Module-Path-Index
-          -Symbol
-          -Module-Path-Index
-          -Symbol
-          -Nat
-          (-opt -Integer)
-          (-opt -Integer))))]
-[identifier-transformer-binding
- (Ident . -> .
-  (Un (-val 'lexical) (-val #f)
-   (-lst* -Module-Path-Index
-          -Symbol
-          -Module-Path-Index
-          -Symbol
-          -Nat
-          (-opt -Integer)
-          (-opt -Integer))))]
-[identifier-template-binding
- (Ident . -> .
-  (Un (-val 'lexical) (-val #f)
-   (-lst* -Module-Path-Index
-          -Symbol
-          -Module-Path-Index
-          -Symbol
-          -Nat
-          (-opt -Integer)
-          (-opt -Integer))))]
-[identifier-label-binding
- (Ident . -> .
-  (Un (-val 'lexical) (-val #f)
-   (-lst* -Module-Path-Index
-          -Symbol
-          -Module-Path-Index
-          -Symbol
-          -Nat
-          (-opt -Integer)
-          (-opt -Integer))))]
-
-;; Section 12.4
-[set!-transformer? (-> Univ B)]
-[make-set!-transformer (-> (-> (-Syntax Univ) (-Syntax Univ)) Univ)]
-[set!-transformer-procedure (-> Univ (-> (-Syntax Univ) (-Syntax Univ)))]
-[prop:set!-transformer -Struct-Type-Property]
-
-[rename-transformer? (-> Univ B)]
-[make-rename-transformer (->opt (-Syntax Sym) [(-> (-Syntax Sym) (-Syntax Sym))] Univ)]
-[rename-transformer-target (-> Univ (-Syntax Sym))]
-[prop:rename-transformer -Struct-Type-Property]
-
-[local-expand
- (->opt (-Syntax Univ)
-        (Un (-val 'expression)
-            (-val 'top-level)
-            (-val 'module)
-            (-val 'module-begin)
-            (-lst Univ))
-        (-opt (-lst (-Syntax Sym)))
-        [(Un -Internal-Definition-Context (-pair -Internal-Definition-Context (-lst -Internal-Definition-Context)) (-val #f))]
-        (-Syntax Univ))]
-
-[syntax-local-expand-expression (-> (-Syntax Univ) (-values (list (-Syntax Univ) (-Syntax Univ))))]
-
-[local-expand/capture-lifts
- (->opt (-Syntax Univ)
-        (Un (-val 'expression)
-            (-val 'top-level)
-            (-val 'module)
-            (-val 'module-begin)
-            (-lst Univ))
-        (-opt (-lst (-Syntax Sym)))
-        [(Un -Internal-Definition-Context (-pair -Internal-Definition-Context (-lst -Internal-Definition-Context)) (-val #f))
-         Univ]
-        (-Syntax Univ))]
-
-[local-transformer-expand
- (->opt (-Syntax Univ)
-        (Un (-val 'expression)
-            (-val 'top-level)
-            (-val 'module)
-            (-val 'module-begin)
-            (-lst Univ))
-        (-opt (-lst (-Syntax Sym)))
-        [(Un -Internal-Definition-Context (-pair -Internal-Definition-Context (-lst -Internal-Definition-Context)) (-val #f))]
-        (-Syntax Univ))]
-
-[local-transformer-expand/capture-lifts
- (->opt (-Syntax Univ)
-        (Un (-val 'expression)
-            (-val 'top-level)
-            (-val 'module)
-            (-val 'module-begin)
-            (-lst Univ))
-        (-opt (-lst (-Syntax Sym)))
-        [(Un -Internal-Definition-Context (-pair -Internal-Definition-Context (-lst -Internal-Definition-Context)) (-val #f))
-         Univ]
-        (-Syntax Univ))]
-
-[internal-definition-context? (make-pred-ty -Internal-Definition-Context)]
-[syntax-local-make-definition-context (->opt [(-opt -Internal-Definition-Context)] -Internal-Definition-Context)]
-[syntax-local-bind-syntaxes (-> (-lst (-Syntax Sym)) (-opt (-Syntax Univ)) -Internal-Definition-Context -Void)]
-[internal-definition-context-seal (-> -Internal-Definition-Context -Void)]
-[identifier-remove-from-definition-context (-> (-Syntax Sym) (Un -Internal-Definition-Context (-lst -Internal-Definition-Context)) (-Syntax Sym))]
-
-[syntax-local-value (->opt (-Syntax Sym) [(-opt (-> Univ)) (-opt -Internal-Definition-Context)] Univ)]
-[syntax-local-value/immediate (->opt (-Syntax Sym) [(-opt (-> (-values (list Univ Univ)))) (-opt -Internal-Definition-Context)]
-                                     (-values (list Univ Univ)))]
-[syntax-local-lift-expression (-> (-Syntax Univ) (-Syntax Sym))]
-[syntax-local-lift-values-expression (-> -Nat (-Syntax Univ) (-lst (-Syntax Sym)))]
-[syntax-local-lift-context (-> Univ)]
-[syntax-local-lift-module-end-declaration (-> (-Syntax Univ) -Void)]
-[syntax-local-lift-require (-poly (a) (-> Univ (-Syntax a) (-Syntax a)))]
-[syntax-local-lift-provide (-> Univ -Void)]
-[syntax-local-name (-> Univ)]
-[syntax-local-context (-> (Un (-val 'expression) (-val 'top-level) (-val 'module) (-val 'module-begin) (-lst Univ)))]
-[syntax-local-phase-level (-> -Int)]
-[syntax-local-module-exports (-> -Module-Path (-values (list (-lst Sym) (-lst Sym) (-lst Sym))))]
-[syntax-local-get-shadower (-> (-Syntax Sym) (-Syntax Sym))]
-[syntax-local-certifier (->opt [B] (-poly (a) (->opt (-Syntax a) [Univ (-opt (-poly (b) (-> (-Syntax b) (-Syntax b))))] (-Syntax a))))]
-[syntax-transforming? (-> B)]
-
-[syntax-local-introduce (-poly (a) (-> (-Syntax a) (-Syntax a)))]
-[make-syntax-introducer (-> (-poly (a) (-> (-Syntax a) (-Syntax a))))]
-[make-syntax-delta-introducer (->opt (-Syntax Univ) [(-opt (-Syntax Univ)) (-opt -Int)] (-poly (a) (-> (-Syntax a) (-Syntax a))))]
-[syntax-local-make-delta-introducer (-> (-Syntax Sym) (-> (-Syntax Sym) (-Syntax Sym)))]
-
-[syntax-local-transforming-module-provides? (-> B)]
-[syntax-local-module-defined-identifiers (-> (-HT (Un (-val #f) -Int) (-lst (-Syntax Sym))))]
-[syntax-local-module-required-identifiers (-> (-opt -Module-Path) (Un B -Int) (-lst (-pair (-opt -Int) (-lst (-Syntax Sym)))))]
-
-;; Section 12.5
-
-;; Section 12.6
-
-;; Section 12.7
-[syntax-property (-poly (a) (cl->* (-> (-Syntax a) Univ Univ (-Syntax a))
-                                   (-> (-Syntax Univ) Univ Univ)))]
-[syntax-property-symbol-keys (-> (-Syntax Univ) (-lst Sym))]
-[syntax-track-origin (-poly (a) (-> (-Syntax a) (-Syntax Univ) (-Syntax Univ) (-Syntax a)))]
-
-;; Section 12.8
-[syntax-recertify (-poly (a) (-> (-Syntax a) (-Syntax Univ) -Inspector Univ (-Syntax a)))]
-
-;; Section 12.9
-[expand (-> Univ (-Syntax Univ))]
-[expand-syntax (-> (-Syntax Univ) (-Syntax Univ))]
-[expand-once (-> Univ (-Syntax Univ))]
-[expand-syntax-once (-> (-Syntax Univ) (-Syntax Univ))]
-[expand-to-top-form (-> Univ (-Syntax Univ))]
-[expand-syntax-to-top-form (-> (-Syntax Univ) (-Syntax Univ))]
-
-;; Section 13 (Input and Output)
-
-;; Section 13.1 (Ports)
-
-;; Section 13.1.1
-[current-locale (-Param -String -String)]
-
-;; Section 13.1.2
-[input-port? (make-pred-ty -Input-Port)]
-[output-port? (make-pred-ty -Output-Port)]
-[port? (make-pred-ty -Port)]
-
-[close-input-port (-> -Input-Port -Void)]
-[close-output-port (-> -Output-Port -Void)]
-
-[port-closed? (-> -Port B)]
-[port-closed-evt (-> -Port (-mu x (-evt x)))]
-
-[current-input-port (-Param -Input-Port -Input-Port)]
-[current-output-port (-Param -Output-Port -Output-Port)]
-[current-error-port (-Param -Output-Port -Output-Port)]
-
-[file-stream-port? (-> Univ B)]
-[terminal-port? (-> Univ B)]
-
-[eof (-val eof)]
-[eof-object? (make-pred-ty (-val eof))]
-
-;; Section 13.1.3
-[flush-output (->opt [-Output-Port] -Void)]
-[file-stream-buffer-mode (cl-> [(-Port) (one-of/c 'none 'line 'block #f)]
-                               [(-Port (one-of/c 'none 'line 'block)) -Void])]
-[file-position (cl-> [(-Port) -Nat]
-                     [(-Port -Integer) -Void])]
-[file-position* (-> -Port (Un -Nat (-val #f)))]
-
-;; Section 13.1.4
-[port-count-lines! (-> (Un -Input-Port -Output-Port) -Void)]
-[port-next-location (-> (Un -Input-Port -Output-Port) (-values (list (-opt -PosInt) (-opt -Nat) (-opt -PosInt))))]
-[port-count-lines-enabled (-Param Univ B)]
-
-;; Section 13.1.5
-#|
-[open-input-file (->key -Pathlike #:mode (one-of/c 'binary 'text) #f -Input-Port)]
-
-[open-output-file
- (->key -Pathlike
-        #:mode (one-of/c 'binary 'text) #f
-        #:exists (one-of/c 'error 'append 'update 'can-update
-                           'replace 'truncate
-                           'must-truncate 'truncate/replace)
-        #f
-        -Output-Port)]
-[open-input-output-file
- (->key -Pathlike
-        #:mode (one-of/c 'binary 'text) #f
-        #:exists (one-of/c 'error 'append 'update 'can-update
-                           'replace 'truncate
-                           'must-truncate 'truncate/replace)
-        #f
-        (-values (list -Input-Port -Output-Port)))]
-
-
-[call-with-input-file (-poly (a) (-Pathlike (-Input-Port . -> . a) #:mode (Un (-val 'binary) (-val 'text)) #f . ->key .  a))]
-[call-with-output-file (-poly (a) (-Pathlike (-Output-Port . -> . a)
-                                   #:exists (one-of/c 'error 'append 'update 'replace 'truncate 'truncate/replace) #f
-                                   #:mode (one-of/c 'binary 'text) #f
-                                   . ->key .  a))]
-
-[call-with-input-file* (-poly (a) (-Pathlike (-Input-Port . -> . a) #:mode (Un (-val 'binary) (-val 'text)) #f . ->key .  a))]
-[call-with-output-file* (-poly (a) (-Pathlike (-Output-Port . -> . a)
-                                   #:exists (one-of/c 'error 'append 'update 'replace 'truncate 'truncate/replace) #f
-                                   #:mode (one-of/c 'binary 'text) #f
-                                   . ->key .  a))]
-
-[with-input-from-file
- (-poly (a) (->key -Pathlike (-> a) #:mode (one-of/c 'binary 'text) #f a))]
-[with-output-to-file
- (-poly (a) (->key -Pathlike (-> a)
-                   #:exists (one-of/c 'error 'append 'update 'can-update
-                           'replace 'truncate
-                           'must-truncate 'truncate/replace)
-                   #f
-                   #:mode (one-of/c 'binary 'text) #f
-                   a))]
-|#
-
-[port-try-file-lock? (-> (Un -Input-Port -Output-Port) (one-of/c 'shared 'exclusive) B)]
-[port-file-unlock (-> (Un -Input-Port -Output-Port) -Void)]
-[port-file-identity (-> (Un -Input-Port -Output-Port) -PosInt)]
-
-;; Section 13.1.6
-[open-input-string (-> -String -Input-Port)]
-[open-input-bytes (-> -Bytes -Input-Port)]
-[open-output-string
- ([Univ] . ->opt . -Output-Port)]
-[open-output-bytes
- ([Univ] . ->opt . -Output-Port)]
-
-;FIXME
-;These should be fixed to only accept output-ports generated by open-output-{string,bytes}
-[get-output-bytes (-Output-Port [Univ N N] . ->opt . -Bytes)]
-[get-output-string (-> -Output-Port -String)]
-
-;; Section 13.1.7
-[make-pipe
- (cl->* [->opt [N] (-values (list -Input-Port -Output-Port))])]
-[pipe-content-length (-> (Un -Input-Port -Output-Port) -Nat)]
-
-;; Section 13.1.8
-[prop:input-port -Struct-Type-Property]
-[prop:output-port -Struct-Type-Property]
-
-;; Section 13.1.9
-[make-input-port
- (->opt Univ
-        (Un (-> -Bytes (Un -Nat (-val eof) top-func (-evt Univ)))
-            -Input-Port)
-        (Un (-> -Bytes -Nat (-opt (-evt Univ))
-                (Un -Nat (-val eof) top-func (-evt Univ) (-val #f)))
-            -Input-Port
-            (-val #f))
-        (-> Univ)
-        [(-opt (-> (-evt Univ)))
-         (-opt (-> -PosInt (-evt Univ) (-evt Univ) Univ))
-         (-opt (-> (-values (list (-opt -Integer)
-                                  (-opt -Integer)
-                                  (-opt -Integer)))))
-         (-> Univ)
-         (Un -Integer -Port (-val #f) (-> (-opt -Integer)))
-         (-opt (cl->* (-> (one-of/c 'block 'none) Univ)
-                      (-> (-opt (one-of/c 'block 'none)))))]
-        -Input-Port)]
-[make-output-port
- (->opt Univ
-        (-evt Univ)
-        (Un (-> -Bytes -Nat -Nat -Boolean -Boolean
-                (Un -Integer (-val #f) (-evt Univ)))
-            -Output-Port)
-        (-> Univ)
-        [(-opt (Un -Output-Port (-> Univ -Boolean -Boolean Univ)))
-         (-opt (-> -Bytes -Nat -Nat (-evt Univ)))
-         (-opt (-> Univ (-evt Univ)))
-         (-opt (-> (-values (list (-opt -Integer)
-                                  (-opt -Integer)
-                                  (-opt -Integer)))))
-         (-> Univ)
-         (Un -Integer -Port (-val #f) (-> (-opt -Integer)))
-         (-opt (cl->* (-> (one-of/c 'block 'none) Univ)
-                      (-> (-opt (one-of/c 'block 'none)))))]
-        -Output-Port)]
-
-;; Section 13.1.10
-
-;; Section 13.1.10.1
-[port->list
- (-poly (a) (cl->*
-             (-> (-lst Univ))
-             (->opt (-> -Input-Port a) [-Input-Port] (-lst a))))]
-[port->string (->opt [-Input-Port] -String)]
-[port->bytes (->opt [-Input-Port] -Bytes)]
-#|
-[port->lines
- (cl->*
-  (->key #:line-mode (one-of/c 'linefeed 'return 'return-linefeed 'any 'any-one) #f (-lst -String))
-  (->key -Input-Port #:line-mode (one-of/c 'linefeed 'return 'return-linefeed 'any 'any-one) #f (-lst -String)))]
-[port->bytes-lines
- (cl->*
-  (->key #:line-mode (one-of/c 'linefeed 'return 'return-linefeed 'any 'any-one) #f (-lst -Bytes))
-  (->key -Input-Port #:line-mode (one-of/c 'linefeed 'return 'return-linefeed 'any 'any-one) #f (-lst -Bytes)))]
-
-
-[display-lines (cl->*
- ((-lst Univ) #:separator Univ #f . ->key . -Void)
- ((-lst Univ) -Output-Port #:separator Univ #f . ->key . -Void))]
-|#
-
-[call-with-output-string (-> (-> -Output-Port ManyUniv) -String)]
-[call-with-output-bytes (-> (-> -Output-Port ManyUniv) -Bytes)]
-
-[with-output-to-string
-  (-> (-> ManyUniv) -String)]
-[with-output-to-bytes
-  (-> (-> ManyUniv) -Bytes)]
-
-[call-with-input-string
- (-polydots (a)
-   (-> -String (-> -Input-Port (make-ValuesDots '() a 'a))
-       (make-ValuesDots '() a 'a)))]
-[call-with-input-bytes
- (-polydots (a)
-   (-> -Bytes (-> -Input-Port (make-ValuesDots '() a 'a))
-       (make-ValuesDots '() a 'a)))]
-
-[with-input-from-string (-poly (a) (-> -String (-> a) a))]
-[with-input-from-bytes (-poly (a) (-> -Bytes (-> a) a))]
-
-;; Section 13.1.10.2
-[input-port-append  (->* (list Univ) -Input-Port -Input-Port)]
-
-;TODO write the type for this
-;It is fairly complicated and require events
-;make-input-port/read-to-peek
-
-[make-limited-input-port (->opt -Input-Port -Nat [Univ] -Input-Port)]
-[make-pipe-with-specials (->opt [-Nat Univ Univ] (-values (list -Input-Port -Output-Port)))]
-
-[merge-input (->opt -Input-Port -Input-Port [(-opt -Nat)] -Input-Port)]
-[open-output-nowhere (-> -Output-Port)]
-[peeking-input-port (->opt -Input-Port [Univ -Nat] -Input-Port)]
-
-[reencode-input-port
- (->opt -Input-Port -String (-opt -Bytes) [Univ Univ Univ (-> -String -Input-Port ManyUniv)] -Input-Port)]
-[reencode-output-port
- (->opt -Output-Port -String (-opt -Bytes) [Univ Univ (-opt -Bytes) (-> -String -Output-Port ManyUniv)] -Output-Port)]
-
-[dup-input-port (-Input-Port (B) . ->opt . -Input-Port)]
-[dup-output-port (-Output-Port (B) . ->opt . -Input-Port)]
-
-[relocate-input-port (->opt -Input-Port (-opt -PosInt) (-opt -Nat) -PosInt [Univ] -Input-Port)]
-[relocate-output-port (->opt -Output-Port (-opt -PosInt) (-opt -Nat) -PosInt [Univ] -Output-Port)]
-
-[transplant-input-port (->opt -Input-Port (-opt (-> (-values (list (-opt -PosInt) (-opt -Nat) (-opt -PosInt))))) -PosInt [Univ (-> ManyUniv)] -Input-Port)]
-[transplant-output-port (->opt -Output-Port (-opt (-> (-values (list (-opt -PosInt) (-opt -Nat) (-opt -PosInt))))) -PosInt [Univ (-> ManyUniv)] -Output-Port)]
-
-;; Section 13.1.10.3
-[eof-evt (-> -Input-Port (-evt (-val eof)))]
-[read-bytes-evt (-> -Nat -Input-Port (-evt (Un -Bytes (-val eof))))]
-;read-bytes!-evt (need progress event support)
-[read-bytes-avail!-evt
- (-> -Bytes -Input-Port (-evt (Un -Nat (-val eof))))]
-[read-string-evt (-> -Nat -Input-Port (-evt (Un -String (-val eof))))]
-[read-string!-evt (-> -String -Input-Port (-evt (Un -Nat (-val eof))))]
-[read-line-evt (-> -Input-Port
-                   (one-of/c 'linefeed 'return 'return-linefeed 'any 'any-one)
-                   (-evt (Un -String (-val eof))))]
-[read-bytes-line-evt
- (-> -Input-Port
-     (one-of/c 'linefeed 'return 'return-linefeed 'any 'any-one)
-     (-evt (Un -Bytes (-val eof))))]
-;peek-bytes-evt (ditto progress event)
-;peek-bytes!-evt
-;peek-bytes-avail!-evt
-;peek-string-evt
-;peek-string!-evt
-;regexp-match-evt
-
-;; Section 13.1.10.4
-
-[convert-stream (-> -String -Input-Port -String -Output-Port -Void)]
-[copy-port (->* (list -Input-Port -Output-Port) -Output-Port -Void)]
-
-;; Section 13.2
-[read-char (->opt [-Input-Port] (Un -Char (-val eof)))]
-[read-byte (->opt [-Input-Port] (Un -Byte (-val eof)))]
-
-[read-line  (->opt [-Input-Port Sym] (Un -String (-val eof)))]
-[read-bytes-line (->opt [-Input-Port Sym] (Un -Bytes (-val eof)))]
-
-;read-string (in index)
-;read-bytes (in index)
-
-;read-string! (in index)
-[read-bytes! (->opt -Bytes [-Input-Port -Nat -Nat] (Un -PosInt (-val eof)))]
-[read-bytes-avail! (->opt -Bytes [-Input-Port -Nat -Nat] (Un -PosInt (-val eof) (-> (-opt -PosInt) (-opt -Nat) (-opt -PosInt) (-opt -Nat) Univ)))]
-[read-bytes-avail!* (->opt -Bytes [-Input-Port -Nat -Nat] (Un -Nat (-val eof) (-> (-opt -PosInt) (-opt -Nat) (-opt -PosInt) (-opt -Nat) Univ)))]
-[read-bytes-avail!/enable-break (->opt -Bytes [-Input-Port -Nat -Nat] (Un -PosInt (-val eof) (-> (-opt -PosInt) (-opt -Nat) (-opt -PosInt) (-opt -Nat) Univ)))]
-
-[peek-string (->opt -Nat -Nat [-Input-Port] (Un -String (-val eof)))]
-[peek-bytes (->opt -Nat -Nat [-Input-Port] (Un -Bytes (-val eof)))]
-
-[peek-string! (->opt -String -Nat [-Input-Port -Nat -Nat] (Un -PosInt (-val eof)))]
-[peek-bytes! (->opt -Bytes -Nat [-Input-Port -Nat -Nat] (Un -PosInt (-val eof)))]
-[peek-bytes-avail! (->opt -Bytes -Nat [(-val #f) -Input-Port -Nat -Nat] (Un -Nat (-val eof) (-> (-opt -PosInt) (-opt -Nat) (-opt -PosInt) (-opt -Nat) Univ)))]
-[peek-bytes-avail!* (->opt -Bytes -Nat [(-val #f) -Input-Port -Nat -Nat] (Un -Nat (-val eof) (-> (-opt -PosInt) (-opt -Nat) (-opt -PosInt) (-opt -Nat) Univ)))]
-[peek-bytes-avail!/enable-break (->opt -Bytes -Nat [(-val #f) -Input-Port -Nat -Nat] (Un -Nat (-val eof) (-> (-opt -PosInt) (-opt -Nat) (-opt -PosInt) (-opt -Nat) Univ)))]
-
-[read-char-or-special (->opt [-Input-Port] Univ)]
-[read-byte-or-special (->opt [-Input-Port] Univ)]
-
-;peek-char (in index)
-;peek-byte (in index)
-[peek-char-or-special (->opt [-Input-Port -Nat] Univ)]
-[peek-byte-or-special (->opt [-Input-Port -Nat] Univ)]
-
-;port-progress-evt TODO event
-
-[port-provides-progress-evts? (-> -Input-Port B)]
-
-[port-commit-peeked (->opt -Nat Univ Univ [-Input-Port] B)]
-
-[byte-ready? (->opt [-Input-Port] B)]
-[char-ready? (->opt [-Input-Port] B)]
-
-;; Section 13.3 (Byte and String Output)
-;; some are now in base-env-indexing-abs.rkt
-[write-char (cl-> [(-Char) -Void]
-                  [(-Char -Output-Port) -Void])]
-;write-byte (in index)
-
-[newline (->opt [-Output-Port] -Void)]
-
-;In index
-;write-string
-;write-bytes
-;write-bytes-avail*
-;write-bytes-avail/enable-break
-
-[write-special (->opt Univ [-Output-Port] B)]
-[write-special-avail* (->opt Univ [-Output-Port] B)]
-
-;; Need event type before we can include these
-;;write-special-avail*
-;;write-bytes-avail-evt
-;;write-special-evt
-;;
-[port-writes-atomic? (-Output-Port . -> . -Boolean)]
-[port-writes-special? (-Output-Port . -> . -Boolean)]
-
-;; Section 13.4 (Reading)
-[read (->opt [-Input-Port] Univ)]
-[read-syntax (->opt [Univ -Input-Port] (Un (-Syntax Univ) (-val eof)))]
-[read/recursive (->opt [-Input-Port (-opt -Char) (-opt -Read-Table) Univ] Univ)]
-[read-syntax/recursive (->opt [Univ -Input-Port (-opt -Char) (-opt -Read-Table) Univ] Univ)]
-[read-language (->opt [-Input-Port (-> ManyUniv)] (-opt (-> Univ Univ ManyUniv)))]
-
-[read-case-sensitive (-Param Univ B)]
-[read-square-bracket-as-paren (-Param Univ B)]
-[read-curly-brace-as-paren (-Param Univ B)]
-[read-accept-box (-Param Univ B)]
-[read-accept-compiled (-Param Univ B)]
-[read-accept-bar-quote (-Param Univ B)]
-[read-accept-graph (-Param Univ B)]
-[read-decimal-as-inexact (-Param Univ B)]
-[read-accept-dot (-Param Univ B)]
-[read-accept-infix-dot (-Param Univ B)]
-[read-accept-quasiquote (-Param Univ B)]
-[read-accept-reader (-Param B B)]
-[read-accept-lang (-Param Univ B)]
-[current-reader-guard (-Param (-> Univ ManyUniv) (-> Univ ManyUniv))]
-[current-readtable (-Param (-opt -Read-Table) (-opt -Read-Table))]
-[read-on-demand-source (-Param -Path -Path)]
-
-[port-read-handler
- (cl->* (-> -Input-Port (->opt -Input-Port [Univ] Univ))
-        (-> -Input-Port (->opt -Input-Port [Univ] Univ) -Void))]
-
-;; Section 13.5 (Writing)
-[write   (Univ [-Output-Port] . ->opt . -Void)]
-[display (Univ [-Output-Port] . ->opt . -Void)]
-[print   (Univ [-Output-Port (one-of/c 0 1)] . ->opt . -Void)]
-[displayln (Univ [-Output-Port] . ->opt . -Void)]
-[fprintf (->* (list -Output-Port -String) Univ -Void)]
-[printf (->* (list -String) Univ -Void)]
-[eprintf (->* (list -String) Univ -Void)]
-[format (->* (list -String) Univ -String)]
-
-[print-pair-curly-braces (-Param Univ B)]
-[print-mpair-curly-braces (-Param Univ B)]
-[print-unreadable (-Param Univ B)]
-[print-graph (-Param Univ B)]
-[print-struct (-Param Univ B)]
-[print-box (-Param Univ B)]
-[print-vector-length (-Param Univ B)]
-[print-hash-table (-Param Univ B)]
-[print-boolean-long-form (-Param Univ B)]
-[print-reader-abbreviations (-Param Univ B)]
-[print-as-expression (-Param Univ B)]
-[print-syntax-width (-Param (Un (-val +inf.0) -Nat) (Un (-val +inf.0) -Nat))]
-
-[current-write-relative-directory (-Param (-opt -Path) (-opt -Path))]
-
-[port-write-handler
- (cl->* (-> -Output-Port (-> Univ -Output-Port ManyUniv))
-        (-> -Output-Port (-> Univ -Output-Port ManyUniv) -Void))]
-[port-display-handler
- (cl->* (-> -Output-Port (-> Univ -Output-Port ManyUniv))
-        (-> -Output-Port (-> Univ -Output-Port ManyUniv) -Void))]
-[port-print-handler
- (cl->* (-> -Output-Port (-> Univ -Output-Port ManyUniv))
-        (-> -Output-Port (-> Univ -Output-Port ManyUniv) -Void))]
-
-[global-port-print-handler (-Param (Un (-> Univ -Output-Port ManyUniv) (-> Univ -Output-Port (one-of/c 0 1) ManyUniv))
-                                   (-> Univ -Output-Port (one-of/c 0 1) ManyUniv))]
-
-;; Section 13.6 (racket/pretty)
-[pretty-print (Univ [-Output-Port (one-of/c 0 1)] . ->opt . -Void)]
-[pretty-write (Univ [-Output-Port] . ->opt . -Void)]
-[pretty-display (Univ [-Output-Port] . ->opt . -Void)]
-[pretty-format (Univ [-Nat] . ->opt . -String)]
-[pretty-print-handler (-> Univ -Void)]
-
-[pretty-print-columns (-Param (Un -Nat (-val 'infinity)) (Un -Nat (-val 'infinity)))]
-[pretty-print-depth (-Param (-opt -Nat) (-opt -Nat))]
-[pretty-print-exact-as-decimal (-Param Univ B)]
-[pretty-print-.-symbol-without-bars (-Param Univ B)]
-[pretty-print-show-inexactness (-Param Univ B)]
-[pretty-print-abbreviate-read-macros (-Param Univ B)]
-
-[pretty-print-style-table? (make-pred-ty -Pretty-Print-Style-Table)]
-[pretty-print-current-style-table (-Param -Pretty-Print-Style-Table -Pretty-Print-Style-Table)]
-[pretty-print-extend-style-table (-> (-opt -Pretty-Print-Style-Table) (-lst Sym) (-lst Sym) -Pretty-Print-Style-Table)]
-[pretty-print-remap-stylable (-Param (-> Univ (-opt Sym)) (-> Univ (-opt Sym)))]
-
-[pretty-print-newline (-> -Output-Port -Nat -Void)]
-[pretty-print-print-line (-Param (-> (-opt -Nat) -Output-Port -Nat (Un -Nat (-val 'infinity)) -Nat)
-                                 (-> (-opt -Nat) -Output-Port -Nat (Un -Nat (-val 'infinity)) -Nat))]
-[pretty-print-size-hook (-Param (-> Univ B -Output-Port (-opt -Nat)) (-> Univ B -Output-Port (-opt -Nat)))]
-[pretty-print-print-hook (-Param (-> Univ B -Output-Port -Void) (-> Univ B -Output-Port -Void))]
-[pretty-print-pre-print-hook (-Param (-> Univ -Output-Port -Void) (-> Univ -Output-Port -Void))]
-[pretty-print-post-print-hook (-Param (-> Univ -Output-Port -Void) (-> Univ -Output-Port -Void))]
-
-[pretty-printing (-Param Univ B)]
-
-[make-tentative-pretty-print-output-port (-> -Output-Port -Nat (-> ManyUniv) -Output-Port)]
-[tentative-pretty-print-port-transfer (-> -Output-Port -Output-Port -Void)]
-[tentative-pretty-print-port-cancel (-> -Output-Port -Void)]
-
-;; Section 13.7
-
-;; Section 13.7.1
-[readtable? (make-pred-ty -Read-Table)]
-[make-readtable
- (cl->*
-  (-> -Read-Table -Read-Table)
-  (-> -Read-Table
-      (-opt -Char) (Un (one-of/c 'terminating-macro 'non-terminating-macro 'dispatch-macro) -Char)
-      (-> -Char -Input-Port (-opt -PosInt) (-opt -Nat) (-opt -PosInt) (-opt -Nat) Univ)
-      -Read-Table)
-  (-> -Read-Table
-      (-opt -Char) (Un (one-of/c 'terminating-macro 'non-terminating-macro 'dispatch-macro) -Char)
-      (-> -Char -Input-Port (-opt -PosInt) (-opt -Nat) (-opt -PosInt) (-opt -Nat) Univ)
-      (-opt -Char) (Un (one-of/c 'terminating-macro 'non-terminating-macro 'dispatch-macro) -Char)
-      (-> -Char -Input-Port (-opt -PosInt) (-opt -Nat) (-opt -PosInt) (-opt -Nat) Univ)
-      -Read-Table))]
-
-[readtable-mapping (-> -Read-Table -Char
-                       (-values (list
-                                 (Un -Char (one-of/c  'terminating-macro 'non-terminating-macro))
-                                 (-opt (Un (-> -Char -Input-Port (-opt -PosInt) (-opt -Nat)
-                                               (-opt -PosInt) (-opt -Nat) Univ)
-                                           (cl->*
-
-                                             (-> -Char -Input-Port (-opt -PosInt) (-opt -Nat)
-                                                 (-opt -PosInt) (-opt -Nat) Univ)
-                                             (-> -Char -Input-Port Univ))))
-                                 (-opt (Un (-> -Char -Input-Port (-opt -PosInt) (-opt -Nat)
-                                               (-opt -PosInt) (-opt -Nat) Univ)
-                                           (cl->*
-
-                                             (-> -Char -Input-Port (-opt -PosInt) (-opt -Nat)
-                                                 (-opt -PosInt) (-opt -Nat) Univ)
-                                             (-> -Char -Input-Port Univ)))))))]
-
-;; Section 13.7.2
-;; Nothing defined here
-
-;; Section 13.7.3
-[special-comment? (make-pred-ty -Special-Comment)]
-[make-special-comment (-> Univ -Special-Comment)]
-[special-comment-value (-> -Special-Comment Univ)]
-
-;; Section 13.8
-[prop:custom-write -Struct-Type-Property]
-[custom-write? (-> Univ B)]
-[custom-write-accessor (-> Univ (-> Univ -Output-Port B ManyUniv))]
-
-[prop:custom-print-quotable -Struct-Type-Property]
-[custom-print-quotable? (-> Univ B)]
-[custom-print-quotable-accessor (-> Univ Univ)]
-
-;; Section 13.9
-
-;; Section 13.10
-
-;; Section 14.1 (Namespaces)
-[namespace? (make-pred-ty -Namespace)]
-[make-namespace (->opt [(one-of/c  'empty 'initial)] -Namespace)]
-[make-empty-namespace (-> -Namespace)]
-[make-base-empty-namespace (-> -Namespace)]
-[make-base-namespace (-> -Namespace)]
-
-[namespace-anchor? (make-pred-ty -Namespace-Anchor)]
-[namespace-anchor->empty-namespace (-> -Namespace-Anchor -Namespace)]
-[namespace-anchor->namespace (-> -Namespace-Anchor -Namespace)]
-
-[current-namespace (-Param -Namespace -Namespace)]
-[namespace-symbol->identifier (-> Sym Ident)]
-[namespace-base-phase (->opt [-Namespace] -Integer)]
-[namespace-module-identifier (->opt [(Un -Namespace -Integer (-val #f))] Ident)]
-[namespace-variable-value (->opt Sym [Univ (-opt (-> Univ)) -Namespace] Univ)]
-[namespace-set-variable-value! (->opt Sym [Univ Univ -Namespace] -Void)]
-[namespace-undefine-variable! (->opt Sym [-Namespace] -Void)]
-[namespace-mapped-symbols (->opt [-Namespace] (-lst Sym))]
-[namespace-require (-> Univ -Void)]
-[namespace-require/copy (-> Univ -Void)]
-[namespace-require/constant (-> Univ -Void)]
-[namespace-require/expansion-time (-> Univ -Void)]
-[namespace-attach-module (->opt -Namespace -Module-Path [-Namespace] Univ)]
-[namespace-unprotect-module (->opt -Inspector -Module-Path [-Namespace] -Void)]
-[namespace-module-registry (-> -Namespace Univ)]
-[module->namespace (-> -Module-Path -Namespace)]
-[namespace-syntax-introduce (-poly (a) (-> (-Syntax a) (-Syntax a)))]
-[module-provide-protected? (-> -Module-Path-Index Sym B)]
-
-[variable-reference? (make-pred-ty -Variable-Reference)]
-[variable-reference->empty-namespace (-> -Variable-Reference -Namespace)]
-[variable-reference->namespace (-> -Variable-Reference -Namespace)]
-[variable-reference->resolved-module-path (-> -Variable-Reference (-opt -Resolved-Module-Path))]
-[variable-reference->module-declaration-inspector (-> -Variable-Reference -Inspector)]
-[variable-reference->module-source (-> -Variable-Reference (Un Sym (-val #f) -Path))]
-[variable-reference->phase (-> -Variable-Reference -Nat)]
-[variable-reference-constant? (-> -Variable-Reference -Boolean)]
-
-;; Section 14.2 (Evaluation and Compilation)
-[current-eval (-Param (-> Univ ManyUniv) (-> Univ ManyUniv))]
-[eval (->opt Univ [-Namespace] ManyUniv)]
-[eval-syntax (->opt (-Syntax Univ) [-Namespace] ManyUniv)]
-
-[current-load (-Param (-> -Path (-opt Sym) ManyUniv) (-> -Path (-opt Sym) ManyUniv))]
-[load (-> -Pathlike ManyUniv)]
-[load-relative (-> -Pathlike ManyUniv)]
-[load/cd (-> -Pathlike ManyUniv)]
-
-[current-load-extension (-Param (-> -Path (-opt Sym) ManyUniv) (-> -Path (-opt Sym) ManyUniv))]
-[load-extension (-> -Pathlike ManyUniv)]
-[load-relative-extension (-> -Pathlike ManyUniv)]
-
-[current-load/use-compiled (-Param (-> -Path (-opt Sym) ManyUniv) (-> -Path (-opt Sym) ManyUniv))]
-[load/use-compiled (-> -Pathlike ManyUniv)]
-
-[current-load-relative-directory (-Param (-opt -Pathlike) (-opt -Path))]
-[use-compiled-file-paths (-Param (-lst -Path) (-lst -Path))]
-
-[read-eval-print-loop (-> -Void)]
-[current-prompt-read (-Param (-> Univ) (-> Univ))]
-[current-get-interaction-input-port (-Param (-> -Input-Port) (-> -Input-Port))]
-[current-read-interaction (-Param (-> Univ -Input-Port Univ) (-> Univ -Input-Port Univ))]
-[current-print (-Param (-> Univ ManyUniv) (-> Univ ManyUniv))]
-
-[current-compile (-Param (-> Univ B -Compiled-Expression) (-> Univ B -Compiled-Expression))]
-[compile (-> Univ -Compiled-Expression)]
-[compile-syntax (-> (-Syntax Univ) -Compiled-Expression)]
-[compiled-expression? (make-pred-ty -Compiled-Expression)]
-
-[compile-enforce-module-constants (-Param B B)]
-[compile-allow-set!-undefined (-Param B B)]
-[compile-context-preservation-enabled (-Param B B)]
-[eval-jit-enabled (-Param B B)]
-[load-on-demand-enabled (-Param B B)]
-
-;; Section 14.4 (Module Names and Loading)
-[resolved-module-path? (make-pred-ty -Resolved-Module-Path)]
-[make-resolved-module-path (-> (Un -Symbol -Path) -Resolved-Module-Path)]
-[resolved-module-path-name (-> -Resolved-Module-Path (Un -Path -Symbol))]
-[module-path? (asym-pred Univ B (-FS (-filter -Module-Path 0) -top))]
-
-[current-module-name-resolver (-Param (cl->* (-Resolved-Module-Path Univ . -> . Univ)
-                                             ((Un -Module-Path -Path)
-                                              (-opt -Resolved-Module-Path)
-                                              (-opt (-Syntax Univ))
-                                              -Boolean
-                                              . -> . -Resolved-Module-Path))
-                                      (cl->* (-Resolved-Module-Path Univ . -> . Univ)
-                                             ((Un -Module-Path -Path)
-                                              (-opt -Resolved-Module-Path)
-                                              (-opt (-Syntax Univ))
-                                              -Boolean
-                                              . -> . -Resolved-Module-Path)))]
-[current-module-declare-name (-Param (-opt -Resolved-Module-Path)
-                                     (-opt -Resolved-Module-Path))]
-[current-module-declare-source (-Param (-opt (Un -Symbol -Path))
-                                       (-opt (Un -Symbol -Path)))]
-[module-path-index? (make-pred-ty -Module-Path-Index)]
-[module-path-index-resolve (-> -Module-Path-Index -Resolved-Module-Path)]
-[module-path-index-split (-> -Module-Path-Index
-                             (-values
-                              (list (-opt -Module-Path)
-                                    (-opt (Un -Module-Path-Index
-                                              -Resolved-Module-Path)))))]
-[module-path-index-join (-> (-opt -Module-Path)
-                            (-opt (Un -Module-Path-Index -Resolved-Module-Path))
-                            -Module-Path-Index)]
-[compiled-module-expression? (make-pred-ty -Compiled-Module-Expression)]
-[module-compiled-name (-> -Compiled-Module-Expression -Symbol)]
-[module-compiled-imports (-> -Compiled-Module-Expression
-                             (-lst (-pair (-opt -Integer)
-                                          (-lst -Module-Path-Index))))]
-
-[module-compiled-exports
- (-> -Compiled-Module-Expression
-     (-values
-      (list
-        (-lst (-pair (-opt -Integer)
-                     (-lst (-lst*
-                             -Symbol
-                             (-lst (Un -Module-Path-Index
-                                       (-lst*
-                                         -Module-Path-Index
-                                         (-opt -Integer)
-                                         -Symbol
-                                         (-opt -Integer))))))))
-        (-lst (-pair (-opt -Integer)
-                     (-lst (-lst*
-                             -Symbol
-                             (-lst (Un -Module-Path-Index
-                                       (-lst*
-                                         -Module-Path-Index
-                                         (-opt -Integer)
-                                         -Symbol
-                                         (-opt -Integer)))))))))))]
-[module-compiled-language-info
- (-> -Compiled-Module-Expression
-     (-opt (make-HeterogeneousVector (list -Module-Path -Symbol Univ))))]
-
-;; Section 14.4.3
-[dynamic-require
- (let ((mod (Un -Module-Path -Resolved-Module-Path -Module-Path-Index)))
-  (-poly (a)
-   (cl->* (-> mod (Un (one-of/c #f 0) -Void) -Void)
-          (-> mod (Un (one-of/c #f 0) -Void) (-> a) (Un -Void a))
-          (->opt mod Sym [(-> Univ)] ManyUniv))))]
-
-[dynamic-require-for-syntax
- (let ((mod (Un -Module-Path -Resolved-Module-Path -Module-Path-Index)))
-  (-poly (a)
-   (cl->* (-> mod (-val #f) -Void)
-          (-> mod (-val #f) (-> a) (Un -Void a))
-          (->opt mod Sym [(-> Univ)] ManyUniv))))]
-
-[module-declared?
- (->opt (Un -Module-Path -Resolved-Module-Path -Module-Path-Index)
-        [Univ]
-        -Boolean)]
-
-[module->language-info
- (->opt (Un -Module-Path -Path -Resolved-Module-Path)
-        [Univ]
-        (-opt (make-HeterogeneousVector (list -Module-Path -Symbol Univ))))]
-
-[module->imports (-> (Un -Module-Path -Resolved-Module-Path -Module-Path-Index)
-                     (-lst (-pair (-opt -Integer)
-                                  (-lst -Module-Path-Index))))]
-[module->exports
- (-> (Un -Module-Path -Resolved-Module-Path)
-     (-values
-      (list
-       (-lst (-pair (-opt -Integer)
-                    (-lst (-lst* -Symbol
-                                 (-lst
-                                  (Un -Module-Path-Index
-                                      (-lst* -Module-Path-Index
-                                             (-opt -Integer)
-                                             -Symbol
-                                             (-opt -Integer))))))))
-       (-lst (-pair (-opt -Integer)
-                    (-lst (-lst* -Symbol
-                                 (-lst
-                                  (Un -Module-Path-Index
-                                      (-lst* -Module-Path-Index
-                                             (-opt -Integer)
-                                             -Symbol
-                                             (-opt -Integer)))))))))))]
-
-[module-predefined?
- (-> (Un -Module-Path -Resolved-Module-Path -Module-Path-Index)
-     -Boolean)]
-
-;; Section 14.5 (Impersonators and Chaperones)
-[impersonator? (Univ . -> . B)]
-[chaperone? (Univ . -> . B)]
-[impersonator-of? (Univ Univ . -> . B)]
-[chaperone-of? (Univ Univ . -> . B)]
-
-[make-impersonator-property (-> Sym (-values (list -Impersonator-Property (-> Univ B) (-> Univ Univ))))]
-[impersonator-property? (make-pred-ty -Impersonator-Property)]
-[impersonator-property-accessor-procedure? (-> Univ B)]
-[impersonator-prop:application-mark -Impersonator-Property]
-
-;; Section 14.6 (Security Guards)
-[security-guard? (make-pred-ty -Security-Guard)]
-[make-security-guard
- (->opt -Security-Guard
-        (-> Sym (-opt -Path) (-lst Sym) ManyUniv)
-        (-> Sym (-opt -String) (-opt -PosInt) (one-of/c 'server 'client)  ManyUniv)
-        [(-opt (-> Sym -Path -Path ManyUniv))]
-        -Security-Guard)]
-[current-security-guard (-Param -Security-Guard -Security-Guard)]
-
-;; Section 14.7 (Custodians)
-[custodian? (make-pred-ty -Custodian)]
-[make-custodian (->opt [-Custodian] -Custodian)]
-[custodian-shutdown-all (-> -Custodian -Void)]
-[current-custodian (-Param -Custodian -Custodian)]
-[custodian-managed-list (-> -Custodian -Custodian (-lst Univ))]
-[custodian-memory-accounting-available? (-> B)]
-[custodian-require-memory (-> -Custodian -Nat -Custodian -Void)]
-[custodian-limit-memory (->opt -Custodian -Nat [-Custodian] -Void)]
-
-[make-custodian-box (-poly (a) (-> -Custodian a (make-CustodianBox a)))]
-[custodian-box? (make-pred-ty (-poly (a) (make-CustodianBox a)))]
-[custodian-box-value (-poly (a) (-> (make-CustodianBox a) a))]
-
-;; Section 14.8 (Thread Groups)
-[make-thread-group (->opt [-Thread-Group] -Thread-Group)]
-[thread-group? (make-pred-ty -Thread-Group)]
-[current-thread-group (-Param -Thread-Group -Thread-Group)]
-
-;; Section 14.9 (Structure Inspectors)
-[inspector? (make-pred-ty -Inspector)]
-[make-inspector (->opt [-Inspector] -Inspector)]
-[make-sibling-inspector (->opt [-Inspector] -Inspector)]
-[current-inspector (-Param -Inspector -Inspector)]
-
-[struct-info (-> Univ (-values (list (-opt (make-StructTypeTop)) B)))]
-[struct-type-info
- (-poly (a)
-   (cl->*
-    (-> (make-StructType a)
-        (-values (list Sym -Nat -Nat (-> a -Nat Univ)
-                       (-> a -Nat (Un) -Void) (-lst -Nat)
-                       (-opt (make-StructTypeTop)) B)))
-    (-> (make-StructTypeTop)
-        (-values (list Sym -Nat -Nat top-func top-func (-lst -Nat)
-                       (-opt (make-StructTypeTop)) B)))))]
-[struct-type-make-constructor (-> (make-StructTypeTop) top-func)]
-[struct-type-make-predicate
- (-poly (a)
-   (cl->*
-    (-> (make-StructType a) (make-pred-ty a))
-    (-> (make-StructTypeTop) (-> Univ B))))]
-[object-name (-> Univ Univ)]
-
-;; Section 14.9 (Code Inspectors)
-[current-code-inspector (-Param -Inspector -Inspector)]
-
-;; Section 15.1 (Path Manipulation)
-[path? (make-pred-ty -Path)]
-[path-string? (asym-pred Univ B
-                         (-FS (-filter (Un -Path -String) 0)
-                              (-not-filter -Path 0)))]
-[path-for-some-system? (make-pred-ty -SomeSystemPath)]
-
-[string->path (-> -String -Path)]
-[bytes->path (cl->* (-> -Bytes -Path) (-> -Bytes -PathConventionType -SomeSystemPath))]
-[path->string (-> -Path -String)]
-[path->bytes (-> -SomeSystemPath -Bytes)]
-
-[string->path-element (-> -String -Path)]
-[bytes->path-element (cl->* (-> -Bytes -Path) (-> -Bytes -PathConventionType -SomeSystemPath))]
-[path-element->string (-> -Path -String)]
-[path-element->bytes (-> -SomeSystemPath -Bytes)]
-
-[path-convention-type (-> -SomeSystemPath -PathConventionType)]
-[system-path-convention-type (-> -PathConventionType)]
-
-[build-path
- (cl->*
-  ((list -Pathlike*) -Pathlike* . ->* . -Path)
-  ((list -SomeSystemPathlike*) -SomeSystemPathlike* . ->* . -SomeSystemPath))]
-[build-path/convention-type
-  ((list -PathConventionType -SomeSystemPathlike*) -SomeSystemPathlike* . ->* . -SomeSystemPath)]
-
-[absolute-path? (-> -SomeSystemPath B)]
-[relative-path? (-> -SomeSystemPath B)]
-[complete-path? (-> -SomeSystemPath B)]
-
-[path->complete-path
- (cl->* (-> -Pathlike -Path)
-        (-> -Pathlike -Pathlike -Path)
-        (-> -SomeSystemPathlike -SomeSystemPathlike -SomeSystemPath))]
-
-[path->directory-path
- (cl->* (-> -Pathlike -Path)
-        (-> -SomeSystemPathlike -SomeSystemPath))]
-
-[resolve-path (-> -Pathlike -Path)]
-[cleanse-path
- (cl->* (-> -Pathlike -Path)
-        (-> -SomeSystemPathlike -SomeSystemPath))]
-[expand-user-path (-> -Pathlike -Path)]
-
-[simplify-path
- (cl->*
-  (-Pathlike . -> . -Path)
-  (-Pathlike B . -> . -Path)
-  (-SomeSystemPathlike B . -> . -SomeSystemPath))]
-
-[normal-case-path
- (cl->* (-> -Pathlike -Path)
-        (-> -SomeSystemPathlike -SomeSystemPath))]
-
-[split-path
- (cl->*
-  (-> -Pathlike
-      (-values (list
-                (Un -Path (-val 'relative) (-val #f))
-                (Un -Path (-val 'up) (-val 'same))
-                B)))
-  (-> -SomeSystemPathlike
-      (-values (list
-                (Un -SomeSystemPath (one-of/c 'relative #f))
-                (Un -SomeSystemPath (one-of/c 'up 'same))
-                B))))]
-
-[path-replace-suffix
- (cl->*
-  (-> -Pathlike (Un -String -Bytes) -Path)
-  (-> -SomeSystemPathlike (Un -String -Bytes) -SomeSystemPath))]
-
-[path-add-suffix
- (cl->*
-  (-> -Pathlike (Un -String -Bytes) -Path)
-  (-> -SomeSystemPathlike (Un -String -Bytes) -SomeSystemPath))]
-
-;; Section 15.1.2 (racket/path)
-[explode-path (-SomeSystemPathlike . -> . (-lst (Un -SomeSystemPath (one-of/c 'up 'same))))]
-[simple-form-path (-Pathlike . -> . -Path)]
-[normalize-path (cl->* (-Pathlike [-Pathlike] . ->opt . -Path))]
-[filename-extension (-SomeSystemPathlike . -> . (-opt -Bytes))]
-[file-name-from-path (-Pathlike . -> . (-opt -Path))]
-[path-only (-SomeSystemPathlike . -> . (-opt -Path))]
-[some-system-path->string (-SomeSystemPath . -> . -String)]
-[string->some-system-path
- (-String (one-of/c 'unix 'windows) . -> . -SomeSystemPath)]
-
-;; Section 15.2
-
-;; Section 15.2.1
-[find-system-path (Sym . -> . -Path)]
-[path-list-string->path-list ((Un -String -Bytes) (-lst -Path) . -> . (-lst -Path))]
-[find-executable-path (->opt -Pathlike [(-opt -Pathlike) Univ] (-opt -Path))]
-
-;; Section 15.2.2
-[file-exists? (-> -Pathlike B)]
-[link-exists? (-> -Pathlike B)]
-[delete-file (-> -Pathlike -Void)]
-[rename-file-or-directory (->opt -Pathlike -Pathlike [Univ] -Void)]
-
-[file-or-directory-modify-seconds
- (-poly (a)
-   (cl->* (-Pathlike . -> . -NonNegFixnum)
-          (-Pathlike (-val #f) . -> . -NonNegFixnum)
-          (-Pathlike -Nat . -> . -Void)
-          (-Pathlike (-val #f) (-> a) . -> . (Un a -NonNegFixnum))
-          (-Pathlike -Nat (-> a) . -> . (Un a -Void))))]
-
-
-[file-or-directory-permissions
- (cl->* (-> -Pathlike (-lst (one-of/c 'read 'write 'execute)))
-        (-> -Pathlike (-val #f) (-lst (one-of/c 'read 'write 'execute)))
-        (-> -Pathlike (-val 'bits) -NonNegFixnum)
-        (-> -Pathlike -NonNegFixnum -Void))]
-
-[file-or-directory-identity (->opt -Pathlike [Univ] -PosInt)]
-[file-size (-> -Pathlike -Nat)]
-
-[copy-file (-> -Pathlike -Pathlike -Void)]
-[make-file-or-directory-link (-> -Pathlike -Pathlike -Void)]
-
-;; Section 15.2.3
-[current-directory (-Param -Pathlike -Path)]
-[current-drive (-> -Path)]
-
-[directory-exists? (-> -Pathlike B)]
-[make-directory (-> -Pathlike -Void)]
-[delete-directory (-> -Pathlike -Void)]
-[directory-list (->opt [-Pathlike] (-lst -Path))]
-[filesystem-root-list (-> (-lst -Path))]
-
-;; Section 15.2.4
-
-;; Section 15.2.5 (racket/file)
-[copy-directory/files (->key -Pathlike -Pathlike  #:keep-modify-seconds? Univ #f -Void)]
-[delete-directory/files (->key -Pathlike #:must-exist? Univ #f -Void)]
-
-[find-files (->optkey (-> -Path Univ) [(-opt -Pathlike)] #:follow-links? Univ #f (-lst -Path))]
-[pathlist-closure (->key (-lst -Pathlike) #:follow-links? Univ #f (-lst -Path))]
-
-[fold-files
- (-poly
-  (a)
-  (let ([funarg* (-Path (one-of/c 'file 'dir 'link) a . -> . (-values (list a Univ)))]
-        [funarg (-Path (one-of/c 'file 'dir 'link) a . -> . a)])
-     ((Un funarg funarg*) a [(-opt -Pathlike) Univ]. ->opt . a)))]
-
-[make-directory* (-> -Pathlike -Void)]
-#;[make-temporary-file (->opt [-String (Un -Pathlike (-val 'directory) (-val #f)) (-opt -Pathlike)] -Path)]
-
-[put-preferences (->opt (-lst -Symbol) (-lst Univ) [(-> -Path Univ) (-opt -Pathlike)] -Void)]
-[preferences-lock-file-mode (-> (one-of/c 'exists 'file-lock))]
-
-[make-lock-file-name (->opt -Pathlike [-Pathlike] -Pathlike)]
-
-[user-read-bit     (-val user-read-bit)]
-[user-write-bit    (-val user-write-bit)]
-[user-execute-bit  (-val user-execute-bit)]
-[group-read-bit    (-val group-read-bit)]
-[group-write-bit   (-val group-write-bit)]
-[group-execute-bit (-val group-execute-bit)]
-[other-read-bit    (-val other-read-bit)]
-[other-write-bit   (-val other-write-bit)]
-[other-execute-bit (-val other-execute-bit)]
-
-;; Section 15.3.1 (racket/tcp)
-[tcp-listen (-Integer [-Integer Univ (-opt -String)] . ->opt . -TCP-Listener)]
-[tcp-connect (-String -Integer . -> . (-values (list -Input-Port -Output-Port)))]
-[tcp-connect/enable-break (-String -Integer . -> . (-values (list -Input-Port -Output-Port)))]
-[tcp-accept (-TCP-Listener . -> . (-values (list -Input-Port -Output-Port)) )]
-[tcp-accept/enable-break (-TCP-Listener . -> . (-values (list -Input-Port -Output-Port)) )]
-
-[tcp-accept-ready? (-TCP-Listener . -> . B)]
-[tcp-close (-TCP-Listener . -> . -Void)]
-[tcp-listener? (make-pred-ty -TCP-Listener)]
-
-[tcp-accept-evt
- (-> -TCP-Listener
-     (-evt (-lst* -Input-Port -Output-Port)))]
-
-[tcp-abandon-port (-Port . -> . -Void)]
-[tcp-addresses (cl->*
-                (-Port [(-val #f)] . ->opt . (-values (list -String -String)))
-                (-Port (-val #t) . -> . (-values (list -String -Index -String -Index))))]
-
-[tcp-port? (asym-pred Univ B (-FS (-filter (Un -Input-Port -Output-Port) 0) -top))]
-
-;; Section 15.3.2 (racket/udp)
-[udp-open-socket (->opt [(-opt -String) (-opt -String)] -UDP-Socket)]
-[udp-bind! (-> -UDP-Socket (-opt -String) -Nat -Void)]
-[udp-connect! (-> -UDP-Socket (-opt -String) (-opt -Nat) -Void)]
-
-[udp-send-to (->opt -UDP-Socket -String -Nat -Bytes [-Nat -Nat] -Void)]
-[udp-send (->opt -UDP-Socket -Bytes [-Nat -Nat] -Void)]
-[udp-send-to* (->opt -UDP-Socket -String -Nat -Bytes [-Nat -Nat] B)]
-[udp-send* (->opt -UDP-Socket -Bytes [-Nat -Nat] B)]
-[udp-send-to/enable-break (->opt -UDP-Socket -String -Nat -Bytes [-Nat -Nat] -Void)]
-[udp-send/enable-break (->opt -UDP-Socket -Bytes [-Nat -Nat] -Void)]
-
-[udp-receive! (->opt -UDP-Socket -Bytes [-Nat -Nat] (-values (list -Nat -String -Nat)))]
-[udp-receive!* (->opt -UDP-Socket -Bytes [-Nat -Nat] (-values (list (-opt -Nat) (-opt -String) (-opt -Nat))))]
-[udp-receive!/enable-break (->opt -UDP-Socket -Bytes [-Nat -Nat] (-values (list -Nat -String -Nat)))]
-
-[udp-close (-> -UDP-Socket -Void)]
-[udp? (make-pred-ty -UDP-Socket)]
-[udp-bound? (-> -UDP-Socket B)]
-[udp-connected? (-> -UDP-Socket B)]
-
-[udp-send-ready-evt (-> -UDP-Socket (-mu x (-evt x)))]
-[udp-receive-ready-evt (-> -UDP-Socket (-mu x (-evt x)))]
-[udp-send-to-evt (->opt -UDP-Socket -String -Nat -Bytes [-Nat -Nat]
-                        (-evt -Void))]
-[udp-send-evt (->opt -UDP-Socket -Bytes [-Nat -Nat]
-                     (-evt -Void))]
-[udp-receive!-evt
- (->opt -UDP-Socket -Bytes [-Nat -Nat]
-        (-evt (-lst* -Nat -String -Nat)))]
-
-[udp-addresses
- (cl->*
-  (->opt -UDP-Socket [(-val #f)] (-values (list -String -String)))
-  (-> -UDP-Socket (-val #t) (-values (list -String -NonNegFixnum -String -NonNegFixnum))))]
-
-;; Section 15.4 (Processes)
-
-;; `subprocess' has 3 arguments and 3 return values which are either
-;; ports or false. There is a relation that if a port argument is
-;; false, then the corresponding return value is a port, and if it is
-;; a port the return value is false. `process/ports` and
-;; `process*/ports' have a similar behavior.  This behavior is encoded
-;; in the type system as each possible combination of port arguments
-;; being one case of a case-> type. There is also a final case where
-;; the unions are preserved because TR currently can not deal with
-;; applying a case lambda to union types, and ensure that while no one
-;; branch covers every union, every union is covered by a branch.
-;; There is also twice as many cases to deal with the 'exact behavior
-;; for windows.
-
-[subprocess
- (let* ((make-opt-in-port (lambda (port) (if port -Input-Port (-val #f))))
-        (make-opt-out-port (lambda (port) (if port -Output-Port (-val #f))))
-        (ret-type (-values (list -Subprocess (-opt -Input-Port) (-opt -Output-Port) (-opt -Input-Port))))
-        ;; out, in, err, and exact are all booleans and correspond to
-        ;; whether or not the argument is a port (#t) or #f (#f).
-        ;; The return value is the function type that is one branch
-        ;; of the case lambda.
-        (make-specific-case (lambda (out in err exact)
-                              (let ((arg-out (make-opt-out-port out))
-                                    (arg-in (make-opt-in-port in))
-                                    (arg-err (make-opt-out-port err))
-                                    (result (-values (list -Subprocess
-                                                           (make-opt-in-port (not out))
-                                                           (make-opt-out-port (not in))
-                                                           (make-opt-in-port (not err))))))
-                                (if exact
-                                    (-> arg-out arg-in arg-err -Pathlike (-val 'exact) -String result)
-                                    (->* (list arg-out arg-in arg-err -Pathlike)
-                                         (Un -Path -String -Bytes)
-                                         result)))))
-        (specific-cases
-         (let ((bools '(#t #f)))
-          (for*/list ((out bools) (in bools) (err bools) (exact bools))
-            (make-specific-case out in err exact)))))
-  (apply cl->*
-    (append specific-cases
-     (list
-      (->* (list (-opt -Output-Port) (-opt -Input-Port) (-opt -Output-Port) -Pathlike)
-                    (Un -Path -String -Bytes) ret-type)
-      (-> (-opt -Output-Port) (-opt -Input-Port) (-opt -Output-Port) -Pathlike (-val 'exact) -String ret-type)))))]
-[subprocess-wait (-> -Subprocess -Void)]
-[subprocess-status (-> -Subprocess (Un (-val 'running) -Nat))]
-[subprocess-kill (-> -Subprocess Univ -Void)]
-[subprocess-pid (-> -Subprocess -Nat)]
-[subprocess? (make-pred-ty -Subprocess)]
-[current-subprocess-custodian-mode (-Param (one-of/c #f 'kill 'interrupt)
-                                           (one-of/c #f 'kill 'interrupt))]
-[subprocess-group-enabled (-Param Univ B)]
-
-[shell-execute (-> (-opt -String) -String -String -Pathlike Sym (-val #f))]
-
-;; Section 15.4.1 (racket/system)
-[system ((Un -String -Bytes) [] #:set-pwd? Univ #f . ->optkey . -Boolean)]
-[system* (-Pathlike [] #:rest (Un -Path -String -Bytes) #:set-pwd? Univ #f . ->optkey . -Boolean)]
-[system/exit-code ((Un -String -Bytes) [] #:set-pwd? Univ #f . ->optkey . -Byte)]
-[system*/exit-code (-Pathlike [] #:rest (Un -Path -String -Bytes) #:set-pwd? Univ #f . ->optkey . -Byte)]
-
-[process (->key
-	  -String
-	   #:set-pwd? Univ #f
-	  (-lst* -Input-Port -Output-Port -Nat -Input-Port
-                 (cl->* (-> (-val 'status) (one-of/c 'running 'done-ok 'done-error))
-                        (-> (-val 'exit-code) (-opt -Byte))
-                        (-> (-val 'wait) ManyUniv)
-                        (-> (-val 'interrupt) -Void)
-                        (-> (-val 'kill) -Void))))]
-
-[process*
- (cl->*
-   (->optkey -Pathlike [] #:rest (Un -Path -String -Bytes) #:set-pwd? Univ #f
-        (-lst* -Input-Port -Output-Port -Nat -Input-Port
-               (cl->* (-> (-val 'status) (one-of/c 'running 'done-ok 'done-error))
-                      (-> (-val 'exit-code) (-opt -Byte))
-                      (-> (-val 'wait) ManyUniv)
-                      (-> (-val 'interrupt) -Void)
-                      (-> (-val 'kill) -Void))))
-   (->key -Pathlike (-val 'exact) -String
-	  #:set-pwd? Univ #f
-	  (-lst* -Input-Port -Output-Port -Nat -Input-Port
-                 (cl->* (-> (-val 'status) (one-of/c 'running 'done-ok 'done-error))
-                        (-> (-val 'exit-code) (-opt -Byte))
-                        (-> (-val 'wait) ManyUniv)
-                        (-> (-val 'interrupt) -Void)
-                        (-> (-val 'kill) -Void)))))]
-
-[process/ports
- (let* ((fun-type
-         (cl->* (-> (-val 'status) (one-of/c 'running 'done-ok 'done-error))
-                (-> (-val 'exit-code) (-opt -Byte))
-                (-> (-val 'wait) ManyUniv)
-                (-> (-val 'interrupt) -Void)
-                (-> (-val 'kill) -Void)))
-        (make-opt-in-port (lambda (port) (if port -Input-Port (-val #f))))
-        (make-opt-out-port (lambda (port) (if port -Output-Port (-val #f))))
-        ;; out, in, and exact are all booleans and correspond to
-        ;; whether or not the argument is a port (#t) or #f (#f).
-        ;; err is either a boolean or 'stdout where 'stdout corresponds
-        ;; to the input being the value 'stdout.
-        ;; The return value is the function type that is one branch
-        ;; of the case lambda.
-        (make-specific-case (lambda (out in err)
-                              (->key (make-opt-out-port out)
-				     (make-opt-in-port in)
-				     (case err
-				       ((stdout) (-val 'stdout))
-				       (else (make-opt-out-port err)))
-				     -String
-				     #:set-pwd? Univ #f
-				     (-lst* (make-opt-in-port (not out))
-					    (make-opt-out-port (not in))
-					    -Nat
-					    (make-opt-in-port (not err))
-					    fun-type))))
-        (specific-cases
-         (let ((bools '(#t #f))
-               (err-vals '(#t #f stdout)))
-          (for*/list ((out bools) (in bools) (err err-vals))
-            (make-specific-case out in err)))))
-   (apply cl->*
-    (append
-      specific-cases
-      (list
-       (->key (-opt -Output-Port) (-opt -Input-Port) (Un -Output-Port (one-of/c #f 'stdout)) -String
-	      #:set-pwd? Univ #f
-	      (-lst* (-opt -Input-Port) (-opt -Output-Port) -Nat (-opt -Input-Port) fun-type))))))]
-
-[process*/ports
- (let* ((fun-type
-         (cl->* (-> (-val 'status) (one-of/c 'running 'done-ok 'done-error))
-                (-> (-val 'exit-code) (-opt -Byte))
-                (-> (-val 'wait) ManyUniv)
-                (-> (-val 'interrupt) -Void)
-                (-> (-val 'kill) -Void)))
-        (make-opt-in-port (lambda (port) (if port -Input-Port (-val #f))))
-        (make-opt-out-port (lambda (port) (if port -Output-Port (-val #f))))
-        ;; out, in, and exact are all booleans and correspond to
-        ;; whether or not the argument is a port (#t) or #f (#f).
-        ;; err is either a boolean or 'stdout where 'stdout corresponds
-        ;; to the input being the value 'stdout.
-        ;; The return value is the function type that is one branch
-        ;; of the case lambda.
-        (make-specific-case (lambda (out in err exact)
-                              (let ((arg-out (make-opt-out-port out))
-                                    (arg-in (make-opt-in-port in))
-                                    (arg-err
-                                      (case err
-                                        ((stdout) (-val 'stdout))
-                                        (else (make-opt-out-port err))))
-                                    (result
-                                     (-lst* (make-opt-in-port (not out))
-                                            (make-opt-out-port (not in))
-                                            -Nat
-                                            (make-opt-in-port (not err))
-                                            fun-type)))
-                                (if exact
-                                  (->key arg-out arg-in arg-err -Pathlike (-val 'exact) -String  #:set-pwd? Univ #f result)
-                                  (->optkey arg-out arg-in arg-err -Pathlike []
-					    #:rest (Un -Path -String -Bytes)
-					    #:set-pwd? Univ #f
-					    result)))))
-        (specific-cases
-         (let ((bools '(#t #f))
-               (err-vals '(#t #f stdout)))
-          (for*/list ((out bools) (in bools) (err err-vals) (exact bools))
-            (make-specific-case out in err exact)))))
-   (apply cl->*
-    (append specific-cases
-     (list
-       (->optkey (-opt -Output-Port) (-opt -Input-Port) (Un -Output-Port (one-of/c #f 'stdout)) -Pathlike
-		 []
-		 #:rest (Un -Path -String -Bytes)
-		 #:set-pwd? Univ #f
-		 (-lst* (-opt -Input-Port) (-opt -Output-Port) -Nat (-opt -Input-Port) fun-type))
-       (->key (-opt -Output-Port) (-opt -Input-Port) (Un -Output-Port (one-of/c #f 'stdout)) -Pathlike (-val 'exact) -String
-	      #:set-pwd? Univ #f
-	      (-lst* (-opt -Input-Port) (-opt -Output-Port) -Nat (-opt -Input-Port) fun-type))))))]
-
-;; Section 15.5 (Logging)
-[logger? (make-pred-ty -Logger)]
-[make-logger (->opt [(-opt Sym) (-opt -Logger)] -Logger)]
-[logger-name (-> -Logger (-opt Sym))]
-[current-logger (-Param -Logger -Logger)]
-
-[log-message (cl->* (-> -Logger -Log-Level -String Univ -Void)
-                    (-> -Logger -Log-Level (Un (-val #f) -Symbol) -String Univ -Void))]
-[log-level? (->opt -Logger -Log-Level [(-opt -Symbol)] B)]
-
-[log-receiver? (make-pred-ty -Log-Receiver)]
-[make-log-receiver (-> -Logger -Log-Level -Log-Receiver)]
-
-;; Section 15.6 (Time)
-[seconds->date (cl->* (-Integer . -> . -Date)
-                      (-Integer Univ . -> . -Date))]
-[current-seconds (-> -Integer)]
-[current-milliseconds (-> -Fixnum)]
-[current-inexact-milliseconds (-> -Real)]
-[current-gc-milliseconds (-> -Fixnum)]
-[current-process-milliseconds
- (->opt [(Un (-val #f) (-val 'subprocesses) -Thread)] -Fixnum)]
-
-;; Section 15.7
-[getenv (-> -String (Un -String (-val #f)))]
-[putenv (-> -String -String B)]
-
-;; Section 15.8
-[system-type
- (cl->*
-  (-> (-val 'os) (Un (-val 'unix) (-val 'windows) (-val 'macosx)))
-  (-> (-val 'gc) (Un (-val 'cgc) (-val '3m)))
-  (-> (-val 'link) (Un (-val 'static) (-val 'shared) (-val 'dll) (-val 'framework)))
-  (-> (-val 'so-suffix) -Bytes)
-  (-> (-val 'machine) -String)
-  (-> (-val 'word) -PosInt))]
-[system-language+country (-> -String)]
-[system-library-subpath (->opt [(Un (-val #f) (-val 'cgc) (-val '3m))] -Path)]
-
-[version (-> -String)]
-[banner (-> -String)]
-
-[current-command-line-arguments (-Param (-vec -String) (-vec -String))]
-[current-thread-initial-stack-size (-Param -PosInt -PosInt)]
-;vector-set-performance-stats! TODO complicated
-
-;; Section 15.9 (racket/cmdline)
-[parse-command-line
- (let ([mode-sym (one-of/c 'once-each 'once-any 'multi 'final 'help-labels)])
-   (-polydots (b a)
-              (cl->* (-Pathlike
-                      (Un (-lst -String) (-vec -String))
-                      (-lst (-pair mode-sym (-lst (-lst Univ))))
-                      ((list Univ) [a a] . ->... . b)
-                      (-lst -String)
-                      . -> . b))))]
-
-;; Section 16.1 (Weak Boxes)
-[make-weak-box (-poly (a) (-> a (-weak-box a)))]
-[weak-box-value
- (-poly (a b)
-   (cl->* (-> (-weak-box a) (-opt a))
-          (-> (-weak-box a) b (Un b a))
-          (->opt -Weak-BoxTop [Univ] Univ)))]
-[weak-box? (make-pred-ty -Weak-BoxTop)]
-
-;; Section 16.2 (Ephemerons)
-[make-ephemeron (-poly (k v) (-> k v (make-Ephemeron v)))]
-[ephemeron? (make-pred-ty (make-Ephemeron Univ))]
-[ephemeron-value (-poly (v) (-> (make-Ephemeron v) (Un (-val #f) v)))]
-
-;; Section 16.3 (Wills and Executors)
-[make-will-executor (-> -Will-Executor)]
-[will-executor? (make-pred-ty -Will-Executor)]
-[will-register (-poly (a) (-> -Will-Executor a (-> a ManyUniv) -Void))]
-[will-execute (-> -Will-Executor ManyUniv)]
-[will-try-execute (-> -Will-Executor ManyUniv)]
-
-;; Section 16.4
-[collect-garbage (-> -Void)]
-[current-memory-use (-> -Nat)]
-[dump-memory-stats (-> Univ)]
-
-;; Section 17.2 (Unsafe Data Extraction)
-[unsafe-car (-poly (a b)
-                   (cl->*
-                    (->acc (list (-pair a b)) a (list -car))
-                    (->* (list (-lst a)) a)))]
-[unsafe-cdr (-poly (a b)
-                   (cl->*
-                    (->acc (list (-pair a b)) b (list -cdr))
-                    (->* (list (-lst a)) (-lst a))))]
-[unsafe-vector-length ((make-VectorTop) . -> . -Index)]
-[unsafe-vector*-length ((make-VectorTop) . -> . -Index)]
-[unsafe-struct-ref top-func]
-[unsafe-struct*-ref top-func]
-[unsafe-struct-set! top-func]
-[unsafe-struct*-set! top-func]
-
-;; Section 17.4 (Unsafe Undefined)
-[check-not-unsafe-undefined (-poly (a) (-> a -Symbol a))]
-[check-not-unsafe-undefined/assign (-poly (a) (-> a -Symbol a))]
-
-;; Section 18.2 (Libraries and Collections)
-[find-library-collection-paths (->opt [(-lst -Pathlike) (-lst -Pathlike)] (-lst -Path))]
-[collection-file-path (->* (list -Pathlike) -Pathlike -Path)]
-[collection-path (->* (list) -Pathlike -Path)]
-[current-library-collection-paths (-Param -Path -Path)]
-[use-user-specific-search-paths (-Param Univ B)]
-
-;; Typed Racket Reference
-;; Section 4
-[assert (-poly (a b) (cl->*
-                      (Univ (make-pred-ty (list a) Univ b) . -> . b)
-                      (-> (Un a (-val #f)) a)))]
-[defined? (->* (list Univ) -Boolean : (-FS (-not-filter -Undefined 0) (-filter -Undefined 0)))]
-
-;; Syntax Manual
-;; Section 2.1 (syntax/stx)
-;; Needed for `with-syntax'
-[stx->list (-> (-Syntax Univ) (Un (-lst (-Syntax Univ)) (-val #f)))]
-[stx-list? (-> (-Syntax Univ) -Boolean)]
-
-;; Keyword functions moved back to here:
-[file->string
- (->key -Pathlike #:mode (one-of/c 'binary 'text) #f -String)]
-(file->bytes (->key -Pathlike #:mode (one-of/c 'binary 'text) #f -Bytes))
-(file->value (->key -Pathlike #:mode (one-of/c 'binary 'text) #f Univ))
-(file->lines
- (->key
-  -Pathlike
-  #:mode
-  (one-of/c 'binary 'text)
-  #f
-  #:line-mode
-  (one-of/c 'linefeed 'return 'return-linefeed 'any 'any-one)
-  #f
-  (-lst -String)))
-(file->bytes-lines
- (->key
-  -Pathlike
-  #:line-mode
-  (one-of/c 'linefeed 'return 'return-linefeed 'any 'any-one)
-  #f
-  #:mode
-  (one-of/c 'binary 'text)
-  #f
-  (-lst -Bytes)))
-(display-to-file
- (->key
-  Univ
-  -Pathlike
-  #:exists
-  (one-of/c 'error 'append 'update 'replace 'truncate 'truncate/replace)
-  #f
-  #:mode
-  (one-of/c 'binary 'text)
-  #f
-  -Void))
-(display-lines-to-file
- (->key
-  (-lst Univ)
-  -Pathlike
-  #:separator
-  Univ
-  #f
-  #:mode
-  (one-of/c 'binary 'text)
-  #f
-  #:exists
-  (one-of/c 'error 'append 'update 'replace 'truncate 'truncate/replace)
-  #f
-  -Void))
-(write-to-file
- (->key
-  Univ
-  -Pathlike
-  #:exists
-  (one-of/c 'error 'append 'update 'replace 'truncate 'truncate/replace)
-  #f
-  #:mode
-  (one-of/c 'binary 'text)
-  #f
-  -Void))
-(file->list
- (-poly (a)
-  (cl->*
-   (->optkey -Pathlike [(-> -Input-Port (Un))] #:mode (one-of/c 'binary 'text) #f (-lst Univ))
-   (->optkey -Pathlike [(-> -Input-Port a)] #:mode (one-of/c 'binary 'text) #f (-lst a)))))
-(get-preference
- (let ((use-lock-type Univ)
-       (timeout-lock-there-type (-opt (-> -Path Univ)))
-       (lock-there-type (-opt (-> -Path Univ))))
-   (cl->*
-    (->key
-     -Symbol
-     #:use-lock?
-     use-lock-type
-     #f
-     #:timeout-lock-there
-     timeout-lock-there-type
-     #f
-     #:lock-there
-     lock-there-type
-     #f
-     Univ)
-    (->key
-     -Symbol
-     (-> Univ)
-     #:use-lock?
-     use-lock-type
-     #f
-     #:timeout-lock-there
-     timeout-lock-there-type
-     #f
-     #:lock-there
-     lock-there-type
-     #f
-     Univ)
-    (->key
-     -Symbol
-     (-> Univ)
-     Univ
-     #:use-lock?
-     use-lock-type
-     #f
-     #:timeout-lock-there
-     timeout-lock-there-type
-     #f
-     #:lock-there
-     lock-there-type
-     #f
-     Univ)
-    (->key
-     -Symbol
-     (-> Univ)
-     Univ
-     (-opt -Pathlike)
-     #:use-lock?
-     use-lock-type
-     #f
-     #:timeout-lock-there
-     timeout-lock-there-type
-     #f
-     #:lock-there
-     lock-there-type
-     #f
-     Univ))))
-(make-handle-get-preference-locked
- (let ((lock-there-type (-opt (-> -Path Univ)))
-       (max-delay-type -Real))
-   (->optkey -Real -Symbol [(-> Univ) Univ (-opt -Pathlike)]
-             #:lock-there lock-there-type #f #:max-delay max-delay-type #f
-             (-> -Pathlike Univ))))
-(call-with-file-lock/timeout
- (-poly
-  (a)
-  (->key
-   (-opt -Pathlike)
-   (one-of/c 'shared 'exclusive)
-   (-> a)
-   (-> a)
-   #:lock-file
-   (-opt -Pathlike)
-   #f
-   #:delay
-   -Real
-   #f
-   #:max-delay
-   -Real
-   #f
-   a)))
-(sort
- (-poly
-  (a b)
-  (cl->*
-   (->key (-lst a) (-> a a -Boolean) #:key (-> a a) #f #:cache-keys? -Boolean #f (-lst a))
-   (->key (-lst a) (-> b b -Boolean) #:key (-> a b) #f #:cache-keys? -Boolean #f (-lst a)))))
-(remove-duplicates
- (-poly
-  (a b)
-  (cl->*
-   (->optkey (-lst a) ((-> a a Univ)) #:key (-> a a) #f (-lst a))
-   (->optkey (-lst a) ((-> b b Univ)) #:key (-> a b) #f (-lst a)))))
-(open-input-file (->key -Pathlike
-                        #:mode (one-of/c 'binary 'text) #f
-                        #:for-module? Univ #f
-                        -Input-Port))
-(open-output-file
- (->key
-  -Pathlike
-  #:mode
-  (one-of/c 'binary 'text)
-  #f
-  #:exists
-  (one-of/c 'error 'append 'update 'can-update 'replace 'truncate 'must-truncate 'truncate/replace)
-  #f
-  -Output-Port))
-(open-input-output-file
- (->key
-  -Pathlike
-  #:mode
-  (one-of/c 'binary 'text)
-  #f
-  #:exists
-  (one-of/c 'error 'append 'update 'can-update 'replace 'truncate 'must-truncate 'truncate/replace)
-  #f
-  (-values (list -Input-Port -Output-Port))))
-(call-with-input-file
-    (-poly (a) (->key -Pathlike (-> -Input-Port a) #:mode (Un (-val 'binary) (-val 'text)) #f a)))
-(call-with-output-file
-    (-poly (a)
-     (->key
-      -Pathlike
-      (-> -Output-Port a)
-      #:exists
-      (one-of/c 'error 'append 'update 'replace 'truncate 'truncate/replace 'can-update 'must-truncate)
-      #f
-      #:mode
-      (one-of/c 'binary 'text)
-      #f
-      a)))
-(call-with-input-file* (-poly (a) (->key -Pathlike (-> -Input-Port a) #:mode (Un (-val 'binary) (-val 'text)) #f a)))
-(call-with-output-file*
- (-poly
-  (a)
-  (->key
-   -Pathlike
-   (-> -Output-Port a)
-   #:exists
-   (one-of/c 'error 'append 'update 'replace 'truncate 'truncate/replace 'can-update 'must-truncate)
-   #f
-   #:mode
-   (one-of/c 'binary 'text)
-   #f
-   a)))
-(with-input-from-file (-poly (a) (->key -Pathlike (-> a) #:mode (Un (-val 'binary) (-val 'text)) #f a)))
-(with-output-to-file
-    (-poly
-     (a)
-     (->key
-      -Pathlike
-      (-> a)
-      #:exists
-      (one-of/c 'error 'append 'update 'can-update 'replace 'truncate 'must-truncate 'truncate/replace)
-      #f
-      #:mode
-      (one-of/c 'binary 'text)
-      #f
-      a)))
-(port->lines
- (->optkey [-Input-Port] #:line-mode (one-of/c 'linefeed 'return 'return-linefeed 'any 'any-one) #f (-lst -String)))
-(port->bytes-lines
-  (->optkey [-Input-Port] #:line-mode (one-of/c 'linefeed 'return 'return-linefeed 'any 'any-one) #f (-lst -Bytes)))
-(display-lines
- (->optkey (-lst Univ) [-Output-Port] #:separator Univ #f -Void))
-(find-relative-path (->key -SomeSystemPathlike -SomeSystemPathlike #:more-than-root? Univ #f -SomeSystemPath))
-(regexp-match*
- (let ((N -Integer)
-       (?N (-opt -Integer))
-       (-StrRx (Un -String -Regexp))
-       (-BtsRx (Un -Bytes -Byte-Regexp))
-       (-StrInput (Un -String -Path))
-       (-BtsInput (Un -Input-Port -Bytes))
-       (sel (λ (t) (-opt (-> (-lst t) t)))))
-   (cl->*
-    (->optkey -StrRx -StrInput (N ?N -Bytes)
-              #:match-select (sel -String) #f #:gap-select Univ #f
-              (-lst -String))
-    (->optkey -BtsRx (Un -StrInput -BtsInput) (N ?N -Bytes)
-              #:match-select (sel -Bytes) #f #:gap-select Univ #f
-              (-lst -Bytes))
-    (->optkey -Pattern -BtsInput (N ?N -Bytes)
-              #:match-select (sel -Bytes) #f #:gap-select Univ #f
-              (-lst -Bytes)))))
-(regexp-match-positions*
- (let* ((?outp (-opt -Output-Port))
-        (B -Boolean)
-        (N -Integer)
-        (?N (-opt -Integer))
-        (ind-pair (-pair -Index -Index))
-        (sel (-> (-lst (-opt ind-pair)) (-opt ind-pair)))
-        (output (-opt (-pair ind-pair (-lst (-opt ind-pair)))))
-        (-Input (Un -String -Input-Port -Bytes -Path)))
-   (->optkey -Pattern -Input (N ?N -Bytes) #:match-select sel #f output)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-special-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-special-env.rkt
deleted file mode 100644
index fbcfffc324..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-special-env.rkt
+++ /dev/null
@@ -1,222 +0,0 @@
-#lang racket/base
-
-;; this file cheats to define types for unexported variables
-;; that are expanded into by Racket macros
-(require
- "../utils/utils.rkt"
- racket/promise
- string-constants/string-constant
- racket/private/kw racket/file racket/port syntax/parse racket/path
- (for-template (only-in racket/private/kw kw-expander-proc kw-expander-impl)
-               racket/base racket/file racket/port racket/path racket/list)
- (env init-envs)
- (rename-in (types abbrev numeric-tower union) [make-arr* make-arr])
- (for-syntax racket/base syntax/parse
-             (only-in racket/syntax syntax-local-eval)))
-
-(define (make-template-identifier what where)
-  (let ([name (module-path-index-resolve (module-path-index-join where #f))])
-    (parameterize ([current-namespace (make-empty-namespace)])
-      (namespace-attach-module (current-namespace) ''#%kernel)
-      (parameterize ([current-module-declare-name name])
-        (eval `(,#'module any '#%kernel
-                 (#%provide ,what)
-                 (define-values (,what) #f))))
-      (namespace-require `(for-template ,name))
-      (namespace-syntax-introduce (datum->syntax #f what)))))
-
-
-(define-initial-env initialize-special
-  ;; make-promise
-  [(make-template-identifier 'delay 'racket/private/promise)
-   (-poly (a) (-> (-> a) (-Promise a)))]
-  ;; next four for string constants
-  [(make-template-identifier 'dynamic-string-constant 'string-constants/string-constant)
-   (-> -Symbol -String)]
-  [(make-template-identifier 'dynamic-string-constants 'string-constants/string-constant)
-   (-> -Symbol (-lst -String))]
-  [(make-template-identifier 'this-language 'string-constants/string-constant)
-   (-> -Symbol)]
-  [(make-template-identifier 'all-languages 'string-constants/string-constant)
-   (-> (-lst -Symbol))]
-  ;; qq-append
-  [(make-template-identifier 'qq-append 'racket/private/qq-and-or)
-   (-poly (a b)
-         (cl->*
-          (-> (-lst a) -Null (-lst a))
-          (-> (-lst a) (-lst b) (-lst (Un a b)))))]
-  ;; make-sequence
-  [(make-template-identifier 'make-sequence 'racket/private/for)
-   (-poly (a b)
-          (let ([seq-vals
-                 (lambda (a)
-                   (-values (list
-                             (-> Univ (-values a))
-                             (-> Univ Univ)
-                             Univ
-                             (Un (-> Univ Univ) (-val #f))
-                             (Un (->* a Univ) (-val #f))
-                             (Un (->* (cons Univ a) Univ) (-val #f)))))])
-            (cl->*
-             (-> Univ -Byte         (seq-vals (list -Byte)))
-             (-> Univ -Index        (seq-vals (list -Index)))
-             ;; Generous. Negative numbers aren't allowed.
-             (-> Univ -Fixnum       (seq-vals (list -NonNegFixnum)))
-             (-> Univ -Int          (seq-vals (list -Nat)))
-             (-> Univ (-seq a) (seq-vals (list a)))
-             (-> Univ (-seq a b) (seq-vals (list a b))))))]
-  ;; in-range
-  [(make-template-identifier 'in-range 'racket/private/for)
-   (cl->* (-> -Byte (-seq -Byte))
-          (-> -Index (-seq -Index))
-          (-> -Fixnum (-seq -NonNegFixnum))
-          (-> -Real (-seq -Nat))
-          (->opt -PosInt -Byte [-Int] (-seq -PosByte))
-          (->opt -Nat -Byte [-Int] (-seq -Byte))
-          (->opt -PosInt -Index [-Int] (-seq -PosIndex))
-          (->opt -Nat -Index [-Int] (-seq -Index))
-          (->opt -Nat -NonNegFixnum [-Int] (-seq -NonNegFixnum))
-          (->opt -PosInt -Fixnum [-Nat] (-seq -PosFixnum))
-          (->opt -Nat -Fixnum [-Nat] (-seq -NonNegFixnum))
-          (->opt -Nat -Nat [-Int] (-seq -Nat))
-          (->opt -PosInt -Int [-Nat] (-seq -PosInt))
-          (->opt -Nat -Int [-Nat] (-seq -Nat))
-          ;; could add cases that guarantee lists of negatives, etc.
-          (->opt -Int -Real [-Int] (-seq -Int))
-          (->opt -Rat -Real [-Rat] (-seq -Rat))
-          (->opt -Flonum -Real [-Flonum] (-seq -Flonum))
-          (->opt -SingleFlonum -Real [-SingleFlonum] (-seq -SingleFlonum))
-          (->opt -InexactReal -Real [-InexactReal] (-seq -InexactReal))
-          (->opt -Real -Real [-Real] (-seq -Real)))]
-  ;; in-naturals
-  [(make-template-identifier 'in-naturals 'racket/private/for)
-   (cl->* (-> (-seq -Nat))
-          (-> -PosInt (-seq -PosInt))
-          (-> -Int (-seq -Nat)))]
-  ;; in-list
-  [(make-template-identifier 'in-list 'racket/private/for)
-   (-poly (a) (-> (-lst a) (-seq a)))]
-  ;; in-mlist
-  [(make-template-identifier 'in-mlist 'racket/private/for)
-   (-poly (a) (-> (-mlst a) (-seq a)))]
-  ;; in-vector
-  [(make-template-identifier 'in-vector 'racket/private/for)
-   (-poly (a)
-          (cl->* (->opt (-vec a) [-Int (-opt -Int) -Int] (-seq a))
-                 (->opt -VectorTop [-Int (-opt -Int) -Int] (-seq Univ))))]
-  ;; in-string
-  [(make-template-identifier 'in-string 'racket/private/for)
-   (->opt -String [-Int (-opt -Int) -Int] (-seq -Char))]
-  ;; in-bytes
-  [(make-template-identifier 'in-bytes 'racket/private/for)
-   (->opt -Bytes [-Int (-opt -Int) -Int] (-seq -Byte))]
-  ;; in-hash and friends
-  [(make-template-identifier 'in-hash 'racket/private/for)
-   (-poly (a b)
-          (cl-> [((-HT a b)) (-seq a b)]
-                [(-HashTop) (-seq Univ Univ)]))]
-  [(make-template-identifier 'in-hash-keys 'racket/private/for)
-   (-poly (a b)
-          (cl-> [((-HT a b)) (-seq a)]
-                [(-HashTop) (-seq Univ)]))]
-  [(make-template-identifier 'in-hash-values 'racket/private/for)
-   (-poly (a b)
-          (cl-> [((-HT a b)) (-seq b)]
-                [(-HashTop) (-seq Univ)]))]
-  [(make-template-identifier 'in-hash-pairs 'racket/private/for)
-   (-poly (a b)
-          (cl-> [((-HT a b)) (-seq (-pair a b))]
-                [(-HashTop) (-seq (-pair Univ Univ))]))]
-  ;; in-port
-  [(make-template-identifier 'in-port 'racket/private/for)
-   (->opt [(-> -Input-Port Univ) -Input-Port] (-seq Univ))]
-  ;; in-input-port-bytes
-  [(make-template-identifier 'in-input-port-bytes 'racket/private/for)
-   (-> -Input-Port (-seq -Byte))]
-  ;; in-input-port-chars
-  [(make-template-identifier 'in-input-port-chars 'racket/private/for)
-   (-> -Input-Port (-seq -Char))]
-  ;; in-lines
-  [(make-template-identifier 'in-lines 'racket/private/for)
-   (->opt [-Input-Port -Symbol] (-seq -String))]
-  ;; in-bytes-lines
-  [(make-template-identifier 'in-bytes-lines 'racket/private/for)
-   (->opt [-Input-Port -Symbol] (-seq -Bytes))]
-  ;; in-directory
-  [(make-template-identifier '*in-directory 'racket/private/for)
-   (->opt [(Un (-val #f) -Pathlike)] (-seq -Path))]
-  ;; in-producer
-  [(make-template-identifier 'in-producer 'racket/private/for)
-   (-polydots (a b)
-     (cl->* (-> (-> a) (-seq a))
-            (->... (list (->... '() [b b] a)
-                         (-> a -Boolean))
-                   [b b]
-                   (-seq a))))]
-  ;; in-value
-  [(make-template-identifier 'in-value 'racket/private/for)
-   (-poly (a) (-> a (-seq a)))]
-  ;; in-indexed
-  [(make-template-identifier 'in-indexed 'racket/private/for)
-   (-poly (a) (-> (-seq a) (-seq a -Nat)))]
-  ;; in-set
-  [(make-template-identifier 'in-set 'racket/private/set)
-   (-poly (a) (-> (-set a) (-seq a)))]
-  ;; check-in-bytes-lines
-  [(make-template-identifier 'check-in-bytes-lines 'racket/private/for)
-   (-> Univ Univ Univ)]
-  ;; check-in-lines
-  [(make-template-identifier 'check-in-lines 'racket/private/for)
-   (-> Univ Univ Univ)]
-  ;; check-in-port
-  [(make-template-identifier 'check-in-port 'racket/private/for)
-   (-> Univ Univ Univ)]
-  ;; from the expansion of `with-syntax'
-  [(make-template-identifier 'apply-pattern-substitute 'racket/private/stxcase)
-   (->* (list (-Syntax Univ) Univ) Univ (-Syntax Univ))]
-  ;; same
-  [(make-template-identifier 'with-syntax-fail 'racket/private/with-stx)
-   (-> (-Syntax Univ) (Un))]
-  ;; from the expansion of `make-temp-file`
-  [(make-template-identifier 'make-temporary-file/proc 'racket/file)
-   (->opt [-String (Un -Pathlike (-val 'directory) (-val #f)) (-opt -Pathlike)]
-          -Path)]
-  ;; from the (lifted) portion of the expansion of keyword lambdas
-  [(make-template-identifier 'make-required 'racket/private/kw)
-   (-> Univ Univ Univ Univ Univ)]
-  [(make-template-identifier 'missing-kw 'racket/private/kw)
-   (->* (list Univ) Univ Univ)]
-  ;; from the expansion of `define-runtime-path`
-  [(make-template-identifier 'path-of 'racket/runtime-path)
-   (-> -Path -Path)]
-  [(make-template-identifier 'resolve-paths 'racket/runtime-path)
-   ;; finite approximation of the type
-   ;;   (-> ... 2 args ... (List Pathlike ..._n) -> (List Path ..._n))
-   (cl->* (-> -Variable-Reference (Un (-> -Path) (-> -Void))
-              (-lst* (Un -Pathlike (-lst* (-val 'lib) -Pathlike #:tail (-lst -Pathlike))))
-              (-lst* -Path))
-          ;; this case is for `define-runtime-module-path-index`
-          (-> -Variable-Reference (Un (-> -Path) (-> -Void))
-              (-lst* (-lst* (-val 'module) -Module-Path -Variable-Reference))
-              (-lst* -Module-Path-Index))
-          (-> -Variable-Reference (Un (-> -Path) (-> -Void))
-              (-lst* -Pathlike -Pathlike)
-              (-lst* -Path -Path))
-          (-> -Variable-Reference (Un (-> -Path) (-> -Void))
-              (-lst* -Pathlike -Pathlike -Pathlike)
-              (-lst* -Path -Path -Path)))]
-  [(make-template-identifier 'extract-module-file 'racket/private/this-expression-source-directory)
-   (-> (-Syntax Univ) -Path)]
-  ;; for `define-runtime-module-path`
-  [(make-template-identifier 'combine-module-path 'racket/runtime-path)
-   (-> -Variable-Reference -Module-Path -Resolved-Module-Path)]
-  ;; in-fxvector, in-flvector, in-extflvector
-  [(make-template-identifier 'in-fxvector* 'racket/fixnum)
-   (-> -FxVector (-seq -Fixnum))]
-  [(make-template-identifier 'in-flvector* 'racket/flonum)
-   (-> -FlVector (-seq -Flonum))]
-  [(make-template-identifier 'in-extflvector* 'racket/extflonum)
-   (-> -ExtFlVector (-seq -ExtFlonum))]
-  [(make-template-identifier 'make-namespace-anchor 'racket/private/namespace)
-   (-> -Variable-Reference -Namespace-Anchor)]
-  )
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-structs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-structs.rkt
deleted file mode 100644
index e23182fc2c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-structs.rkt
+++ /dev/null
@@ -1,103 +0,0 @@
-#lang racket/base
-
-(require
- "../utils/utils.rkt"
- (rep type-rep)
- (types abbrev numeric-tower union)
- (typecheck tc-structs)
- ;;For tests
- (prefix-in k: '#%kernel))
-
-(require (for-template racket/base (prefix-in k: '#%kernel)))
-
-(provide initialize-structs -Date -Srcloc -Date -Arity-At-Least -Exn)
-
-(define-syntax define-hierarchy
-  (syntax-rules (define-hierarchy)
-    [(_ parent (opts ...) ([name : type] ...)
-        (define-hierarchy child (child-opts ...) (spec ...)  grand ...)
-        ...)
-     (begin
-       (d-s parent ([name : type] ...) opts ...)
-       (define-sub-hierarchy [child parent] (type ...) (child-opts ...) (spec ...)  grand ...)
-       ...)]))
-
-(define-syntax define-sub-hierarchy
-  (syntax-rules (define-hierarchy)
-    [(_ [child parent] (inheritance ...) (opts ...) ([name : type] ...)
-        (define-hierarchy grandchild (grandchild-opts ...)(spec ...) great ...)
-        ...)
-     (begin
-       (d-s [child parent] ([name : type] ...) (inheritance ...) opts ...)
-       (define-sub-hierarchy [grandchild child]
-         (inheritance ... type ...) (grandchild-opts ...) (spec ...)
-         great
-         ...)
-       ...)]))
-
-(define -Srcloc (-struct-name #'srcloc))
-(define -Date (-struct-name #'date))
-(define -Arity-At-Least (-struct-name #'arity-at-least))
-(define -Exn (-struct-name #'exn))
-
-
-(define (initialize-structs)
-
-
-  (define-hierarchy srcloc (#:kernel-maker k:srcloc)
-    ([source : Univ]
-     [line : (Un -Integer (-val #f))]
-     [column : (Un -Integer (-val #f))]
-     [position : (Un -Integer (-val #f))]
-     [span : (Un -Integer (-val #f))]))
-
-  (define-hierarchy date (#:kernel-maker k:date)
-    ([second : -Nat]
-     [minute : -Nat]
-     [hour : -Nat]
-     [day : -Nat]
-     [month : -Nat]
-     [year : -Nat]
-     [week-day : -Nat]
-     [year-day : -Nat]
-     [dst? : -Boolean]
-     [time-zone-offset : -Integer]))
-
-  (define-hierarchy arity-at-least (#:kernel-maker k:arity-at-least)
-    ([value : -Nat]))
-
-  (define-hierarchy exn (#:kernel-maker k:exn)
-    ([message : -String] [continuation-marks : -Cont-Mark-Set])
-
-    (define-hierarchy exn:break (#:kernel-maker k:exn:break)
-     ([continuation : top-func]))
-
-    (define-hierarchy exn:fail (#:kernel-maker k:exn:fail) ()
-
-      (define-hierarchy exn:fail:contract (#:kernel-maker k:exn:fail:contract) ()
-        (define-hierarchy exn:fail:contract:arity (#:kernel-maker k:exn:fail:contract:arity) ())
-        (define-hierarchy exn:fail:contract:divide-by-zero (#:kernel-maker k:exn:fail:contract:divide-by-zero) ())
-        (define-hierarchy exn:fail:contract:non-fixnum-result (#:kernel-maker k:exn:fail:contract:non-fixnum-result) ())
-        (define-hierarchy exn:fail:contract:continuation (#:kernel-maker k:exn:fail:contract:continuation) ())
-        (define-hierarchy exn:fail:contract:variable (#:kernel-maker k:exn:fail:contract:variable) ()))
-
-      (define-hierarchy exn:fail:syntax (#:kernel-maker k:exn:fail:syntax) ([exprs : (-lst Any-Syntax)]))
-
-      (define-hierarchy exn:fail:read (#:kernel-maker k:exn:fail:read)
-        ([srclocs : (-lst Univ)]) ;; cce: Univ here should be srcloc
-        (define-hierarchy exn:fail:read:eof (#:kernel-maker k:exn:fail:read:eof) ())
-        (define-hierarchy exn:fail:read:non-char (#:kernel-maker k:exn:fail:read:non-char) ()))
-
-      (define-hierarchy exn:fail:filesystem (#:kernel-maker k:exn:fail:filesystem) ()
-        (define-hierarchy exn:fail:filesystem:exists (#:kernel-maker k:exn:fail:filesystem:exists) ())
-        (define-hierarchy exn:fail:filesystem:version (#:kernel-maker k:exn:fail:filesystem:version) ()))
-
-      (define-hierarchy exn:fail:network (#:kernel-maker k:exn:fail:network) ())
-
-      (define-hierarchy exn:fail:out-of-memory (#:kernel-maker k:exn:fail:out-of-memory) ())
-
-      (define-hierarchy exn:fail:unsupported (#:kernel-maker k:exn:fail:unsupported) ())
-
-      (define-hierarchy exn:fail:user (#:kernel-maker k:exn:fail:user) ())))
-
-  (void))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-types-extra.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-types-extra.rkt
deleted file mode 100644
index 9fe186bc96..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-types-extra.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base syntax/stx))
-
-(define-syntax (define-other-types stx)
-  (syntax-case stx ()
-    [(_ nm ...)
-     #'(begin (define-syntax nm
-                (lambda (stx)
-                  (raise-syntax-error 'type-check "type name used out of context"
-                                      stx
-                                      (and (stx-pair? stx) (stx-car stx)))))
-              ...
-              (provide nm) ...)]))
-
-;; special type names that are not bound to particular types
-(define-other-types
-  -> ->* case-> U Rec All Opaque Vector
-  Parameterof List List* Class Object Values Instance Refinement
-  pred Struct Struct-Type Top Bot)
-
-(provide (rename-out [All ∀]
-                     [U Un]
-                     [-> →]
-                     [case-> case→]
-                     [List Tuple]
-                     [Rec mu]
-                     [Parameterof Parameter]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-types.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-types.rkt
deleted file mode 100644
index ff389c9a63..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-types.rkt
+++ /dev/null
@@ -1,192 +0,0 @@
-#lang s-exp "type-env-lang.rkt"
-
-(require "../types/abbrev.rkt" "../types/union.rkt" "../types/numeric-tower.rkt" "../rep/type-rep.rkt")
-
-[Complex -Number]
-[Number -Number]
-[Inexact-Complex -InexactComplex]
-[Single-Flonum-Complex -SingleFlonumComplex]
-[Float-Complex -FloatComplex]
-[Exact-Number -ExactNumber]
-[Real -Real]
-[Nonpositive-Real -NonPosReal]
-[Negative-Real -NegReal]
-[Nonnegative-Real -NonNegReal]
-[Positive-Real -PosReal]
-[Real-Zero -RealZero]
-[Inexact-Real -InexactReal]
-[Single-Flonum -SingleFlonum]
-[Nonpositive-Inexact-Real -NonPosInexactReal]
-[Nonpositive-Single-Flonum -NonPosSingleFlonum]
-[Negative-Inexact-Real -NegInexactReal]
-[Negative-Single-Flonum -NegSingleFlonum]
-[Nonnegative-Inexact-Real -NonNegInexactReal]
-[Nonnegative-Single-Flonum -NonNegSingleFlonum]
-[Positive-Inexact-Real -PosInexactReal]
-[Positive-Single-Flonum -PosSingleFlonum]
-[Inexact-Real-Nan -InexactRealNan]
-[Inexact-Real-Zero -InexactRealZero]
-[Inexact-Real-Negative-Zero -InexactRealNegZero]
-[Inexact-Real-Positive-Zero -InexactRealPosZero]
-[Single-Flonum-Nan -SingleFlonumNan]
-[Single-Flonum-Zero -SingleFlonumZero]
-[Single-Flonum-Negative-Zero -SingleFlonumNegZero]
-[Single-Flonum-Positive-Zero -SingleFlonumPosZero]
-;; these are the default, 64-bit floats, can be optimized
-[Float -Flonum] ; both of these are valid
-[Flonum -Flonum]
-[Nonpositive-Float -NonPosFlonum] ; both of these are valid
-[Nonpositive-Flonum -NonPosFlonum]
-[Negative-Float -NegFlonum] ; both of these are valid
-[Negative-Flonum -NegFlonum]
-[Nonnegative-Float -NonNegFlonum] ; both of these are valid
-[Nonnegative-Flonum -NonNegFlonum]
-[Positive-Float -PosFlonum] ; both of these are valid
-[Positive-Flonum -PosFlonum]
-[Float-Nan -FlonumNan]
-[Flonum-Nan -FlonumNan]
-[Float-Zero -FlonumZero] ; both of these are valid
-[Flonum-Zero -FlonumZero]
-[Float-Negative-Zero -FlonumNegZero] ; both of these are valid
-[Flonum-Negative-Zero -FlonumNegZero]
-[Float-Positive-Zero -FlonumPosZero] ; both of these are valid
-[Flonum-Positive-Zero -FlonumPosZero]
-[Exact-Rational -Rat]
-[Nonpositive-Exact-Rational -NonPosRat]
-[Negative-Exact-Rational -NegRat]
-[Nonnegative-Exact-Rational -NonNegRat]
-[Positive-Exact-Rational -PosRat]
-[Integer -Int]
-[Nonpositive-Integer -NonPosInt]
-[Negative-Integer -NegInt]
-[Exact-Nonnegative-Integer -Nat] ; all three of these are valid
-[Nonnegative-Integer -Nat]
-[Natural -Nat]
-[Exact-Positive-Integer -PosInt] ; both of these are valid
-[Positive-Integer -PosInt]
-[Fixnum -Fixnum]
-[Negative-Fixnum -NegFixnum]
-[Nonpositive-Fixnum -NonPosFixnum]
-[Nonnegative-Fixnum -NonNegFixnum]
-[Positive-Fixnum -PosFixnum]
-[Index -Index]
-[Positive-Index -PosIndex]
-[Byte -Byte]
-[Positive-Byte -PosByte]
-[Zero (-val 0)]
-[One  (-val 1)]
-[ExtFlonum -ExtFlonum]
-[Nonpositive-ExtFlonum -NonPosExtFlonum]
-[Negative-ExtFlonum -NegExtFlonum]
-[Nonnegative-ExtFlonum -NonNegExtFlonum]
-[Positive-ExtFlonum -PosExtFlonum]
-[ExtFlonum-Nan -ExtFlonumNan]
-[ExtFlonum-Zero -ExtFlonumZero]
-[ExtFlonum-Negative-Zero -ExtFlonumNegZero]
-[ExtFlonum-Positive-Zero -ExtFlonumPosZero]
-
-[Void -Void]
-[Undefined -Undefined] ; initial value of letrec bindings
-[Boolean -Boolean]
-[Symbol -Symbol]
-[String -String]
-[Any Univ]
-[Port -Port]
-[Path -Path]
-[Path-For-Some-System -SomeSystemPath]
-[Path-String -Pathlike]
-[Regexp -Regexp]
-[PRegexp -PRegexp]
-[Byte-Regexp -Byte-Regexp]
-[Byte-PRegexp -Byte-PRegexp]
-[Char -Char]
-[Namespace -Namespace]
-[Input-Port -Input-Port]
-[Output-Port -Output-Port]
-[Bytes -Bytes]
-[EOF (-val eof)]
-[Sexpof (-poly (a) (-Sexpof a))]   ;; recursive union of sexps with a
-[Syntaxof (-poly (a) (-Syntax a))] ;; syntax-e yields a
-[Syntax-E In-Syntax] ;; possible results of syntax-e on "2D" syntax
-[Syntax Any-Syntax]  ;; (Syntaxof Syntax-E): "2D" syntax
-[Datum Syntax-Sexp]  ;; (Sexpof Syntax), datum->syntax yields "2D" syntax
-[Sexp -Sexp]         ;; (Sexpof (U)), syntax->datum of "2D" syntax
-[Identifier Ident]
-[Procedure top-func]
-[BoxTop -BoxTop]
-[Weak-BoxTop -Weak-BoxTop]
-[ChannelTop -ChannelTop]
-[Async-ChannelTop -Async-ChannelTop]
-[VectorTop -VectorTop]
-[HashTableTop -HashTop]
-[MPairTop -MPairTop]
-[Thread-CellTop -Thread-CellTop]
-[Prompt-TagTop -Prompt-TagTop]
-[Continuation-Mark-KeyTop -Continuation-Mark-KeyTop]
-[Struct-TypeTop (make-StructTypeTop)]
-[ClassTop (make-ClassTop)]
-[Keyword -Keyword]
-[Thread -Thread]
-[Resolved-Module-Path -Resolved-Module-Path]
-[Module-Path -Module-Path]
-[Module-Path-Index -Module-Path-Index]
-[Compiled-Module-Expression -Compiled-Module-Expression]
-[Compiled-Expression -Compiled-Expression]
-[Read-Table -Read-Table]
-[Special-Comment -Special-Comment]
-[Struct-Type-Property -Struct-Type-Property]
-[Pretty-Print-Style-Table -Pretty-Print-Style-Table]
-[UDP-Socket -UDP-Socket]
-[TCP-Listener -TCP-Listener]
-[Custodian -Custodian]
-[Parameterization -Parameterization]
-[Inspector -Inspector]
-[Namespace-Anchor -Namespace-Anchor]
-[Variable-Reference -Variable-Reference]
-[Internal-Definition-Context -Internal-Definition-Context]
-[Subprocess -Subprocess]
-[Security-Guard -Security-Guard]
-[Thread-Group -Thread-Group]
-[Impersonator-Property -Impersonator-Property]
-[Semaphore -Semaphore]
-[Bytes-Converter -Bytes-Converter]
-[Pseudo-Random-Generator -Pseudo-Random-Generator]
-[Logger -Logger]
-[Log-Receiver -Log-Receiver]
-[Log-Level -Log-Level]
-[Place-Channel -Place-Channel]
-[Place -Place]
-[Will-Executor -Will-Executor]
-
-
-[Listof -Listof]
-[Vectorof (-poly (a) (make-Vector a))]
-[FlVector -FlVector]
-[ExtFlVector -ExtFlVector]
-[FxVector -FxVector]
-[Option (-poly (a) (-opt a))]
-[HashTable (-poly (a b) (-HT a b))]
-[Promise (-poly (a) (-Promise a))]
-[Pair (-poly (a b) (-pair a b))]
-[Boxof (-poly (a) (make-Box a))]
-[Weak-Boxof (-poly (a) (-weak-box a))]
-[Channelof (-poly (a) (make-Channel a))]
-[Async-Channelof (-poly (a) (make-Async-Channel a))]
-[Ephemeronof (-poly (a) (make-Ephemeron a))]
-[Setof (-poly (e) (make-Set e))]
-[Evtof (-poly (r) (-evt r))]
-[Continuation-Mark-Set -Cont-Mark-Set]
-[False -False]
-[True -True]
-[Null -Null]
-[Nothing (Un)]
-[Futureof (-poly (a) (-future a))]
-[Pairof (-poly (a b) (-pair a b))]
-[MPairof (-poly (a b) (-mpair a b))]
-[MListof (-poly (a) (-mlst a))]
-[Sequenceof (-poly (a) (-seq a))]
-[Thread-Cellof (-poly (a) (-thread-cell a))]
-[Custodian-Boxof (-poly (a) (make-CustodianBox a))]
-
-[Continuation-Mark-Keyof (-poly (a) (make-Continuation-Mark-Keyof a))]
-[Prompt-Tagof (-poly (a b) (make-Prompt-Tagof a b))]
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/case-lambda.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/case-lambda.rkt
deleted file mode 100644
index a34f731185..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/case-lambda.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-
-;; This file is logically part of "prims.rkt" but is in a separate
-;; file to avoid cyclic module dependencies
-;;
-;; In particular, "parse-type.rkt" needs the binding of the TR
-;; case-lambda in order to match for case-lambda types.
-
-(require (for-syntax "annotate-classes.rkt"
-                     "../private/syntax-properties.rkt"
-                     racket/base
-                     syntax/parse))
-
-(provide (rename-out [-case-lambda case-lambda]
-                     [-case-lambda case-lambda:])
-         pcase-lambda:)
-
-(begin-for-syntax
-  (define-syntax-class case-lambda-formals
-    (pattern (~or (formal:optionally-annotated-formal ... . rst:rest-arg)
-                  (~and (formal:optionally-annotated-formal ...)
-                        (~bind [rst.form #'()])))
-             #:with form
-             (syntax/loc this-syntax
-               (formal.ann-name ... . rst.form)))))
-
-(define-syntax (-case-lambda stx)
-  (syntax-parse stx
-    [(_ vars:maybe-lambda-type-vars
-        [formals:case-lambda-formals . body] ...)
-     (quasisyntax/loc stx
-       (#%expression
-        #,(plambda-property
-           (syntax/loc stx
-             (case-lambda [formals.form . body] ...))
-           (attribute vars.type-vars))))]))
-
-(define-syntax (pcase-lambda: stx)
-  (syntax-parse stx
-    [(pcase-lambda: tvars:type-variables cl ...)
-     (plambda-property
-       (syntax/loc stx (-case-lambda cl ...))
-       #'(tvars.vars ...))]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/class-clauses.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/class-clauses.rkt
deleted file mode 100644
index 7b2c0bd918..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/class-clauses.rkt
+++ /dev/null
@@ -1,216 +0,0 @@
-#lang racket/base
-
-;; This module provides helper syntax classes and macros that are used
-;; to implement the typed class macro. It's separated in order to allow
-;; other parts of TR to use the bindings of init, public, etc. without
-;; requiring prims.rkt
-
-(require (prefix-in untyped: racket/class)
-         "colon.rkt"
-         (for-syntax racket/base
-                     syntax/parse
-                     syntax/stx
-                     "../private/syntax-properties.rkt"))
-
-(provide (for-syntax class-clause
-                     clause
-                     clause?
-                     clause-stx
-                     clause-kind
-                     clause-ids
-                     init-clause
-                     init-clause?
-                     init-clause-optional?)
-         init
-         init-field
-         field
-         inherit-field
-         init-rest
-         public
-         pubment
-         override
-         augment
-         private
-         inherit)
-
-;; for tests
-(module+ internal (provide (for-syntax init-decl)))
-
-(begin-for-syntax
- ;; A Clause is a (clause Syntax Id Listof<Syntax> Listof<Option<Type>>)
- ;;
- ;; interp. a class clause such as init or field.
- ;;   stx   - the syntax of the entire clause with types erased
- ;;   kind  - the kind of clause (e.g., init, field)
- ;;   ids   - list of the ids defined in this clause
- ;;   types - types for each id, #f if a type is not provided
- (struct clause (stx kind ids types) #:transparent)
-
- ;; An InitClause is a (init-clause Syntax Id Listof<Syntax> Boolean)
- ;;
- ;; interp. an init class clause
- (struct init-clause clause (optional?) #:transparent)
-
- (define-literal-set class-literals
-   (:))
-
- ;; interp:
- ;;   optional? - optional init arg or not (has default value or not)
- ;;   ids       - internal and external id for this argument
- ;;   type      - type annotation, if any
- ;;   form      - type erased form
- (define-syntax-class init-decl
-   #:attributes (optional? ids type form)
-   #:literal-sets (class-literals)
-   (pattern id:id
-            #:attr optional? #f
-            #:with ids #'(id id)
-            #:attr type #f
-            #:with form this-syntax)
-   (pattern (id:id : type:expr)
-            #:attr optional? #f
-            #:with ids #'(id id)
-            #:with form #'id)
-   (pattern (ren:renamed (~optional (~seq : type:expr)))
-            #:attr optional? #f
-            #:with ids #'ren.ids
-            #:with form #'(ren))
-   (pattern (mren:maybe-renamed
-             (~optional (~seq : type:expr))
-             default-value:expr)
-            #:attr optional? #t
-            #:with ids #'mren.ids
-            #:with form #'(mren default-value)))
-
- (define-syntax-class field-decl
-   #:attributes (ids type form)
-   #:literal-sets (class-literals)
-   (pattern (mren:maybe-renamed
-             (~optional (~seq : type:expr))
-             default-value:expr)
-            #:with ids #'mren.ids
-            #:with form #'(mren default-value)))
-
- (define-syntax-class method-decl
-   #:attributes (ids type form)
-   #:literal-sets (class-literals)
-   (pattern mren:maybe-renamed
-            #:with ids #'mren.ids
-            #:attr type #f
-            #:with form this-syntax)
-   (pattern (mren:maybe-renamed : type:expr)
-            #:with ids #'mren.ids
-            #:with form #'mren))
-
- (define-syntax-class private-decl
-   #:attributes (ids type form)
-   #:literal-sets (class-literals)
-   (pattern id:id
-            #:attr ids #'id
-            #:attr type #f
-            #:with form this-syntax)
-   (pattern (id:id : type:expr)
-            #:attr ids #'id
-            #:with form #'id))
-
- (define-syntax-class renamed
-   #:attributes (ids)
-   (pattern (internal-id:id external-id:id)
-            #:with ids #'(internal-id external-id)))
-
- (define-syntax-class maybe-renamed
-   #:attributes (ids)
-   (pattern id:id
-            #:with ids #'(id id))
-   (pattern ren:renamed
-            #:with ids #'ren.ids))
-
- (define-syntax-class init-like-clause-names
-   (pattern (~or (~literal untyped:init)
-                 (~literal untyped:init-field))))
-
- ;; matches ids with clauses shaped like method clauses,
- ;; not necessarily clauses that declare methods
- (define-syntax-class method-like-clause-names
-   (pattern (~or (~literal untyped:inherit-field)
-                 (~literal untyped:public)
-                 (~literal untyped:pubment)
-                 (~literal untyped:public-final)
-                 (~literal untyped:override)
-                 (~literal untyped:overment)
-                 (~literal untyped:override-final)
-                 (~literal untyped:augment)
-                 (~literal untyped:augride)
-                 (~literal untyped:augment-final)
-                 (~literal untyped:inherit)
-                 (~literal untyped:inherit/super)
-                 (~literal untyped:inherit/inner)
-                 (~literal untyped:rename-super))))
-
- (define-syntax-class private-like-clause-names
-   (pattern (~or (~literal untyped:private)
-                 (~literal untyped:abstract))))
-
- (define-syntax-class class-clause
-   (pattern (clause-name:init-like-clause-names names:init-decl ...)
-            #:attr data
-            (init-clause #'(clause-name names.form ...)
-                         #'clause-name
-                         (stx->list #'(names.ids ...))
-                         (attribute names.type)
-                         (attribute names.optional?)))
-   (pattern ((~literal untyped:init-rest) name:private-decl)
-            #:attr data (clause #'(untyped:init-rest name.form)
-                                #'untyped:init-rest
-                                (stx->list #'(name.ids))
-                                (list (attribute name.type))))
-   (pattern ((~literal untyped:field) names:field-decl ...)
-            #:attr data (clause #'(untyped:field names.form ...)
-                                #'untyped:field
-                                (stx->list #'(names.ids ...))
-                                (attribute names.type)))
-   (pattern (clause-name:method-like-clause-names names:method-decl ...)
-            #:attr data
-            (clause #'(clause-name names.form ...)
-                    #'clause-name
-                    (stx->list #'(names.ids ...))
-                    (attribute names.type)))
-   (pattern (clause-name:private-like-clause-names names:private-decl ...)
-            #:attr data
-            (clause #'(clause-name names.form ...)
-                    #'clause-name
-                    (stx->list #'(names.ids ...))
-                    (attribute names.type)))))
-
-;; overriden declaration forms
-(define-syntax (define-decl-forms stx)
-  (syntax-parse stx
-    [(_ ((?clause-name:id ?orig-name:id ?decl-class:id) ...))
-     #'(begin (define-syntax (?clause-name stx)
-                (syntax-parse stx
-                  [(_ (~var ??decl ?decl-class) (... ...))
-                   #`(begin #,@(for/list ([id (in-list (attribute ??decl.ids))]
-                                          [type (in-list (attribute ??decl.type))]
-                                          #:when type)
-                                 (tr:class:top-level-property
-                                  (tr:class:type-annotation-property
-                                   #`(: #,(if (stx-pair? id) (stx-car id) id) #,type)
-                                   #t)
-                                  #t))
-                            ;; set a property here to avoid taint-related issues because
-                            ;; we can't transplant the identifiers in the expansion (into the
-                            ;; class local table) in certain cases
-                            (?orig-name #,@(attribute ??decl.form)))]))
-              ...)]))
-
-(define-decl-forms ([init          untyped:init          init-decl]
-                    [init-field    untyped:init-field    init-decl]
-                    [field         untyped:field         field-decl]
-                    [inherit-field untyped:inherit-field method-decl]
-                    [init-rest     untyped:init-rest     private-decl]
-                    [public        untyped:public        method-decl]
-                    [pubment       untyped:pubment       method-decl]
-                    [override      untyped:override      method-decl]
-                    [augment       untyped:augment       method-decl]
-                    [private       untyped:private       private-decl]
-                    [inherit       untyped:inherit       method-decl]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/class-prims.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/class-prims.rkt
deleted file mode 100644
index de3d664c93..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/class-prims.rkt
+++ /dev/null
@@ -1,402 +0,0 @@
-#lang racket/base
-
-;; This module provides TR primitives for classes and objects
-
-(require (prefix-in untyped: racket/class)
-         "class-clauses.rkt"
-         "colon.rkt"
-         "../typecheck/internal-forms.rkt"
-         "../private/class-literals.rkt"
-         (only-in "prims.rkt" [define tr:define])
-         (for-syntax
-          racket/base
-          racket/class
-          racket/list
-          racket/match
-          racket/syntax
-          syntax/kerncase
-          syntax/parse
-          syntax/stx
-          "annotate-classes.rkt"
-          "../private/syntax-properties.rkt"
-          "../utils/disarm.rkt"
-          "../utils/tc-utils.rkt"))
-
-(provide ;; Typed class macro that coordinates with TR
-         class
-         ;; override these macros to use TR define
-         define/public
-         define/override
-         define/pubment
-         define/augment
-         define/private
-         ;; override these for type annotations
-         init
-         init-field
-         field
-         inherit-field
-         init-rest
-         public
-         pubment
-         override
-         augment
-         private
-         inherit)
-
-;; overriden define forms
-(define-syntax-rule (define-define/class-kw ((?id ?class-kw) ...))
-  (begin (define-syntax (?id stx)
-           (syntax-parse stx
-             [(_ ??header:curried-formals . ??body)
-              (quasisyntax/loc stx
-                (begin (tr:define ??header . ??body)
-                       (?class-kw ??header.fun-name)))]))
-         ...))
-
-(define-define/class-kw
-  ([define/public   public]
-   [define/override override]
-   [define/pubment  pubment]
-   [define/augment  augment]
-   [define/private  private]))
-
-(begin-for-syntax
- ;; TRClassInfo stores information in the class macro that lets the
- ;; TR class helper macros coordinate amongst each other.
- ;;
- ;; It is a (tr-class-info List<Clause> List<Identifier> List<Identifier>)
- ;;
- ;; clauses        - stores in reverse order all class clauses that appeared
- ;;                  in the class expression
- ;; private-fields - a list of private field names
- ;; maybe-private  - a list of field names that are not known to be method
- ;;                  definitions or a private field at the time of discovery
- (struct tr-class-info (clauses private-fields maybe-private) #:mutable)
-
- ;; forms that are not allowed by Typed Racket yet
- (define unsupported-forms
-   (list (quote-syntax untyped:augride)
-         ;; FIXME: see if override contracts are enough
-         ;;        to keep these at bay or whether they
-         ;;        need to be handled
-         (quote-syntax untyped:public-final)
-         (quote-syntax untyped:override-final)
-         (quote-syntax untyped:augment-final)
-         (quote-syntax untyped:overment)
-         (quote-syntax untyped:abstract)
-         (quote-syntax untyped:rename-super)
-         (quote-syntax untyped:inherit/super)
-         (quote-syntax untyped:inherit/inner)
-         (quote-syntax untyped:rename-inner)))
-
- ;; similar to the same stop forms that the class macro uses
- (define stop-forms
-   (append (kernel-form-identifier-list)
-           unsupported-forms
-           (list
-            (quote-syntax :)
-            (quote-syntax untyped:init)
-            (quote-syntax untyped:field)
-            (quote-syntax untyped:init-field)
-            (quote-syntax untyped:init-rest)
-            (quote-syntax untyped:inherit-field)
-            (quote-syntax untyped:private)
-            (quote-syntax untyped:public)
-            (quote-syntax untyped:override)
-            (quote-syntax untyped:pubment)
-            (quote-syntax untyped:augment)
-            (quote-syntax untyped:inherit)
-            (quote-syntax untyped:super)
-            (quote-syntax untyped:inner)
-            (quote-syntax untyped:super-new)
-            (quote-syntax untyped:super-instantiate)
-            (quote-syntax untyped:super-make-object)
-            (quote-syntax untyped:inspect))))
-
- (define-splicing-syntax-class maybe-type-parameter
-   (pattern (~seq (~or #:∀ #:forall) (type-variable:id ...))
-            #:attr type-variables #'(type-variable ...))
-   (pattern (~seq)
-            #:attr type-variables #'())))
-
-;; export some syntax-time definitions for testing purposes
-(module+ internal
-  (provide (for-syntax get-optional-inits)))
-
-(define-syntax (class stx)
-  (syntax-parse stx
-    [(_ super forall:maybe-type-parameter e ...)
-     (define/with-syntax class-info (generate-temporary))
-     (ignore
-      (tr:class
-       (quasisyntax/loc stx
-         (untyped:class #,(tr:class:super-property #'super #t)
-                        (define-syntax class-info (tr-class-info null null null))
-                        (add-annotations class-info e) ...
-                        (determine-private-fields class-info)
-                        (make-locals-table class-info)
-                        (make-class-name-table
-                         class-info
-                         #,(attribute forall.type-variables))))))]))
-
-;; Add syntax properties and other metadata to class form so that the typechecker
-;; can understand the expansion later
-(define-syntax (add-annotations stx)
-  (syntax-parse stx
-    #:literal-sets (kernel-literals)
-    [(_ class-info:id class-exp)
-     (define info (syntax-local-value #'class-info))
-     (define expanded (local-expand #'class-exp (syntax-local-context) stop-forms))
-     (syntax-parse (disarm* expanded) ; to avoid macro tainting issues
-       #:literal-sets (kernel-literals)
-       #:literals (: untyped:super-new untyped:super-make-object
-                     untyped:super-instantiate)
-       [(begin e ...)
-        (quasisyntax/loc #'class-exp
-          (begin (add-annotations class-info e) ...))]
-       [cls:class-clause
-        (define clause-data (attribute cls.data))
-        (match-define (struct clause (stx kind ids types)) clause-data)
-        (set-tr-class-info-clauses!
-         info
-         (cons clause-data (tr-class-info-clauses info)))
-        (check-unsupported-feature kind #'class-exp)
-        #'class-exp]
-       ;; if it's a method definition for a declared method, then
-       ;; mark it as something to type-check
-       [(define-values (id) body)
-        #:when (method-procedure? #'body)
-        (set-tr-class-info-maybe-private!
-         info
-         (cons #'id (tr-class-info-maybe-private info)))
-        (tr:class:def-property #'class-exp #'id)]
-       ;; private field definition
-       [(define-values (id ...) . rst)
-        (set-tr-class-info-private-fields!
-         info
-         (append (syntax->list #'(id ...))
-                 (tr-class-info-private-fields info)))
-        (tr:class:def-property #'class-exp #'(id ...))]
-       ;; special : annotation for augment interface
-       [(: name:id type:expr #:augment augment-type:expr)
-        (quasisyntax/loc #'class-exp
-          (begin
-            #,(tr:class:top-level-property
-               (tr:class:type-annotation-property
-                #'(quote-syntax (:-augment name augment-type)) #t) #t)
-            #,(tr:class:top-level-property
-               (tr:class:type-annotation-property
-                (syntax/loc #'class-exp (: name type)) #t) #t)))]
-       ;; Just process this to add the property
-       [(: name:id . rst)
-        (tr:class:top-level-property
-         (tr:class:type-annotation-property
-          #'class-exp
-          #t)
-         #t)]
-       ;; Identify super-new for the benefit of the type checker
-       [(~or (untyped:super-new [init-id init-expr] ...)
-             (untyped:super-make-object init-expr ...)
-             (untyped:super-instantiate (init-expr ...) [name expr] ...))
-        (tr:class:top-level-property
-         (tr:class:super-new-property #'class-exp #t)
-         #t)]
-       [_ (tr:class:top-level-property #'class-exp #t)])]))
-
-;; Some definitions in the class are not known to be private fields or
-;; public method definitions until the whole class is processed. This
-;; macro makes the decision at the end of the class.
-(define-syntax (determine-private-fields stx)
-  (syntax-parse stx
-    [(_ class-info:id)
-     (match-define (and info (tr-class-info clauses private-fields maybe-ids))
-                   (syntax-local-value #'class-info))
-     (define actual-private-fields
-       (for/fold ([actual-private-fields private-fields])
-                 ([cur-id (in-list maybe-ids)])
-         (define private-field?
-           (or ;; multiple define-values names are only legal for fields
-               (stx-pair? cur-id)
-               (for/and ([clause (in-list clauses)])
-                 (define ids
-                   (for/list ([id (in-list (clause-ids clause))])
-                     (if (stx-pair? id) (stx-car id) id)))
-                 (not (member cur-id ids free-identifier=?)))))
-         (if private-field?
-             (cons cur-id actual-private-fields)
-             actual-private-fields)))
-     (set-tr-class-info-private-fields! info actual-private-fields)
-     #'(void)]))
-
-;; Construct a table in the expansion that lets TR know about the generated
-;; identifiers that are used for methods, fields, and such
-(define-syntax (make-locals-table stx)
-  (syntax-parse stx
-    [(_ class-info:id)
-     (match-define (tr-class-info clauses private-fields _)
-                   (syntax-local-value #'class-info))
-     (do-make-locals-table (reverse clauses) private-fields)]))
-
-;; Construct a table in the expansion that just records the names of clauses
-;; in the class for convenience in later processing
-(define-syntax (make-class-name-table stx)
-  (syntax-parse stx
-    [(_ class-info:id (type-variable:id ...))
-     (match-define (tr-class-info clauses private-fields _)
-                   (syntax-local-value #'class-info))
-     (do-make-class-name-table #'(type-variable ...)
-                               (reverse clauses)
-                               private-fields)]))
-
-(begin-for-syntax
-  ;; Determine if the given syntax object matches the "method-procedure"
-  ;; non-terminal documented for the class macro
-  (define (method-procedure? stx)
-    (define stop-list (list #'lambda #'case-lambda
-                            #'#%plain-lambda #'let-values
-                            #'letrec-values))
-    (define expanded (local-expand stx (syntax-local-context) stop-list))
-    (define stx*
-      (syntax-parse expanded
-        #:literal-sets (kernel-literals)
-        ;; an extra #%expression is inserted by the local expansion but
-        ;; won't appear in the actual expansion, so ignore it
-        [(#%expression e) #'e]
-        [_ expanded]))
-    (syntax-parse stx*
-      #:literal-sets (kernel-literals)
-      #:literals (lambda λ)
-      [((~or lambda λ) formals e ...) #t]
-      [(case-lambda (formals e ...) ...) #t]
-      [(#%plain-lambda formals e ...) #t]
-      [((~or let-values letrec-values) ([(x) m] ...) y:id)
-       (andmap method-procedure? (syntax->list #'(m ...)))]
-      [((~or let-values letrec-values) ([(x) m] ...) m1)
-       (and (andmap method-procedure? (syntax->list #'(m ...)))
-            (method-procedure? #'m1))]
-      [_ #f]))
-
-  ;; clauses->names : (-> Clause Boolean) Listof<Clause> -> Listof<Id>
-  ;; filter clauses by some property and spit out the names in those clauses
-  (define (clauses->names prop clauses [keep-pair? #f])
-    (apply append
-           (for/list ([clause (in-list clauses)]
-                      #:when (prop clause))
-             (define ids (clause-ids clause))
-             (for/list ([id (in-list ids)])
-               (if (and (not keep-pair?) (stx-pair? id))
-                   (stx-car id)
-                   id)))))
-
-  ;; get-optional-inits : Listof<Clause> -> Listof<Id>
-  ;; Get a list of the internal names of optional inits
-  (define (get-optional-inits clauses)
-    (flatten
-     (for/list ([clause clauses]
-                #:when (init-clause? clause))
-       (for/list ([id-pair (in-list (stx->list (clause-ids clause)))]
-                  [optional? (in-list (init-clause-optional? clause))]
-                  #:when optional?)
-         (stx-car id-pair)))))
-
-  ;; get-all-init-names : Listof<Clause> -> Listof<Id>
-  ;; Get a list of all the (internal) init names in order
-  (define (get-all-init-names clauses)
-    (clauses->names init-clause? clauses))
-
-  ;; check-unsupported-feature : Identifier Syntax -> Void
-  ;; Check if the given identifier corresponds to an unsupported class form
-  ;; and emit an error using the given syntax object if it does
-  (define (check-unsupported-feature id stx)
-    (when (member id unsupported-forms free-identifier=?)
-      (tc-error/stx id "unsupported class clause: ~a" stx)))
-
-  ;; do-make-class-name-table : Listof<Id> Listof<Clause> Listof<Id> -> Stx
-  ;; construct syntax used by the class type-checker as a reliable source
-  ;; for the member names that are in a given class, plus any type
-  ;; variables that are bound
-  (define (do-make-class-name-table foralls
-                                    clauses
-                                    private-fields)
-    (define (get-names kind)
-      (clauses->names (λ (clause)
-                        (free-identifier=? (clause-kind clause) kind))
-                      clauses #t))
-    (tr:class:name-table-property
-     (internal
-      #`(class-internal
-         (#:forall        #,@foralls)
-         (#:all-inits     #,@(get-all-init-names clauses))
-         (#:init          #,@(get-names #'untyped:init))
-         (#:init-field    #,@(get-names #'untyped:init-field))
-         (#:init-rest     #,@(get-names #'untyped:init-rest))
-         (#:optional-init #,@(get-optional-inits clauses))
-         (#:field         #,@(get-names #'untyped:field))
-         (#:public        #,@(get-names #'untyped:public))
-         (#:override      #,@(get-names #'untyped:override))
-         (#:private       #,@(get-names #'untyped:private))
-         (#:private-field #,@private-fields)
-         (#:inherit       #,@(get-names #'untyped:inherit))
-         (#:inherit-field #,@(get-names #'untyped:inherit-field))
-         (#:augment       #,@(get-names #'untyped:augment))
-         (#:pubment       #,@(get-names #'untyped:pubment))))
-     #t))
-
-  ;; This is a neat/horrible trick
-  ;;
-  ;; In order to detect the mappings that class-internal.rkt has
-  ;; created for class-local field and method access, we construct
-  ;; a in-syntax table mapping original names to the accessors.
-  ;; The identifiers inside the lambdas below will expand via
-  ;; set!-transformers to the appropriate accessors, which lets
-  ;; us figure out the accessor identifiers.
-  (define (do-make-locals-table clauses private-field-names)
-    (define (get-names kind)
-      (clauses->names (λ (clause)
-                        (free-identifier=? (clause-kind clause) kind))
-                      clauses))
-    (define public-names        (get-names #'untyped:public))
-    (define override-names      (get-names #'untyped:override))
-    (define private-names       (get-names #'untyped:private))
-    (define field-names         (append (get-names #'untyped:field)
-                                        (get-names #'untyped:init-field)))
-    (define init-names          (get-names #'untyped:init))
-    (define init-rest-name      (get-names #'untyped:init-rest))
-    (define inherit-names       (get-names #'untyped:inherit))
-    (define inherit-field-names (get-names #'untyped:inherit-field))
-    (define augment-names       (append (get-names #'untyped:pubment)
-                                        (get-names #'untyped:augment)))
-    (tr:class:local-table-property
-     #`(let-values ([(#,@public-names)
-                     (values #,@(map (λ (stx) #`(λ () (#,stx)))
-                                     public-names))]
-                    [(#,@private-names)
-                     (values #,@(map (λ (stx) #`(λ () (#,stx)))
-                                     private-names))]
-                    [(#,@field-names)
-                     (values #,@(map (λ (stx) #`(λ () #,stx (set! #,stx 0)))
-                                     field-names))]
-                    [(#,@private-field-names)
-                     (values #,@(map (λ (stx) #`(λ () #,stx (set! #,stx 0)))
-                                     private-field-names))]
-                    [(#,@inherit-field-names)
-                     (values #,@(map (λ (stx) #`(λ () #,stx (set! #,stx 0)))
-                                     inherit-field-names))]
-                    [(#,@init-names)
-                     (values #,@(map (λ (stx) #`(λ () #,stx))
-                                     init-names))]
-                    [(#,@init-rest-name)
-                     (values #,@(map (λ (stx) #`(λ () #,stx))
-                                     init-rest-name))]
-                    [(#,@inherit-names)
-                     (values #,@(map (λ (stx) #`(λ () (#,stx)))
-                                     inherit-names))]
-                    [(#,@override-names)
-                     (values #,@(map (λ (stx) #`(λ () (#,stx) (untyped:super #,stx)))
-                                     override-names))]
-                    [(#,@augment-names)
-                     (values #,@(map (λ (stx) #`(λ () (#,stx) (untyped:inner #f #,stx)))
-                                     augment-names))])
-         (void))
-     #t)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/colon.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/colon.rkt
deleted file mode 100644
index aacd2d3607..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/colon.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base syntax/parse unstable/syntax
-                     "../private/parse-classes.rkt"
-                     "../utils/disappeared-use.rkt"
-                     (only-in "../utils/tc-utils.rkt" tc-error/stx))
-         "../typecheck/internal-forms.rkt"
-         (prefix-in t: "base-types-extra.rkt"))
-
-(provide :)
-
-(begin-for-syntax
- (define (err stx str . sub)
-   (apply raise-syntax-error '|type declaration| str stx sub))
-
- ;; Wrap the `:-expr` with a `define-values`. This is like
- ;; what `internal` does, but the work is spread out among two
- ;; macros to delay the unbound identifier check.
- (define (wrap stx :-expr)
-   (quasisyntax/loc stx (define-values () #,:-expr))))
-
-(define-syntax (: stx)
-  (define ctx (syntax-local-context))
-  (define top-level? (eq? 'top-level ctx))
-  ;; make it possible to add another colon after the id for clarity
-  ;; and in that case, a `->' on the RHS does not need to be
-  ;; explicitly parenthesized
-  (syntax-parse stx #:literals (: t:->)
-    [_
-     #:when (eq? 'expression ctx)
-     (err stx "must be used in a definition context")]
-    [(: id (~and kw :) . more:omit-parens)
-     (add-disappeared-use #'kw)
-     (wrap stx #`(:-helper #,stx #,top-level? id more.type))]
-    [(: e ...)
-     (wrap stx #`(:-helper #,stx #,top-level? e ...))]))
-
-(define-syntax (:-helper stx)
-  (syntax-parse stx
-    [(_ _ top-level? i:id ty)
-     (unless (or (syntax-e #'top-level?)
-                 (identifier-binding #'i))
-       (tc-error/stx #'i
-                     "Declaration for `~a' provided, but `~a' has no definition"
-                     (syntax-e #'i)
-                     (syntax-e #'i)))
-     (syntax-property (syntax/loc stx (begin (quote-syntax (:-internal i ty))
-                                             (#%plain-app values)))
-                      'disappeared-use #'i)]
-    [(_ orig-stx _ i:id x ...)
-     (case (syntax-length #'(x ...))
-       [(1)  (err #'orig-stx "can only annotate identifiers with types" #'i)]
-       [(0)  (err #'orig-stx "missing type")]
-       [else (err #'orig-stx "bad syntax (multiple types after identifier)")])]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/env-lang.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/env-lang.rkt
deleted file mode 100644
index ee765ce163..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/env-lang.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt")
-
-(require (for-syntax racket/base syntax/parse)
-         (utils tc-utils)
-         (env init-envs)
-         (types abbrev numeric-tower union filter-ops))
-
-(define-syntax (-#%module-begin stx)
-  (define-syntax-class clause
-    #:description "[id type]"
-    (pattern [id:identifier ty]))
-  (syntax-parse stx #:literals (require begin)
-    [(mb (~optional (~and extra (~or (begin . _) (require . args))))
-         ~! :clause ...)
-     #'(#%plain-module-begin
-        (begin
-          extra
-          (define e
-            (make-env [id (λ () ty)] ...))
-          (define (init)
-           (initialize-type-env e))
-          (provide init)))]
-    [(mb . rest)
-     #'(mb (begin) . rest)]))
-
-(provide (rename-out [-#%module-begin #%module-begin])
-         require
-         (except-out (all-from-out racket/base) #%module-begin)
-         types rep private utils
-         (types-out abbrev numeric-tower union filter-ops))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/extra-env-lang.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/extra-env-lang.rkt
deleted file mode 100644
index 652ef36f72..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/extra-env-lang.rkt
+++ /dev/null
@@ -1,115 +0,0 @@
-#lang racket/base
-
-;; This module defines a #lang for use in defining extra base
-;; type environments that will only be included on a `require`
-;; (unlike the monolithic base type environment in base-env.rkt)
-;;
-;; Also see env-lang.rkt
-
-(require "../utils/utils.rkt"
-         (for-syntax (private parse-type))
-         (for-syntax racket/base
-                     racket/syntax
-                     syntax/parse
-                     syntax/struct
-                     syntax/stx)
-         (types abbrev numeric-tower union filter-ops)
-         (for-syntax (types abbrev numeric-tower union filter-ops)))
-
-(provide type-environment
-         (rename-out [-#%module-begin #%module-begin])
-         require
-         (for-syntax parse-type) ; to allow resolution of Name types
-         (except-out (all-from-out racket/base) #%module-begin)
-         (for-syntax (except-out (all-from-out racket/base) #%module-begin))
-         types rep private utils
-         (for-syntax (types-out abbrev numeric-tower union filter-ops)))
-
-;; syntax classes for type clauses in the type-environment macro
-(begin-for-syntax
-  (define-syntax-class clause
-    ;; form       - syntax to put in the #%type-decl submodule
-    ;; outer-form - other forms to put in outer module
-    #:attributes (form outer-form)
-    (pattern :simple-clause)
-    (pattern :opaque-clause)
-    (pattern :struct-clause))
-
-  (define-syntax-class simple-clause
-    #:description "[id type]"
-    (pattern [id:identifier ty]
-             #:with form #'(register-type (quote-syntax id) ty)
-             #:with outer-form #'(provide id)))
-
-  (define-syntax-class opaque-clause
-    #:description "[#:opaque type pred]"
-    (pattern [#:opaque type:id pred:id]
-             #:with form
-             #'(begin
-                 (register-type (quote-syntax id)
-                                (make-pred-ty (make-Opaque #'pred)))
-                 (register-type-name (quote-syntax type)
-                                     (make-Opaque #'pred)))
-             #:with outer-form #'(begin
-                                   ;; FIXME: same as the one used in prims
-                                   ;;        lift out to utility module maybe
-                                   (define-syntax (type stx)
-                                     (raise-syntax-error 'type-check
-                                                         "type name used out of context"
-                                                         stx
-                                                         (and (stx-pair? stx) (stx-car stx))))
-                                   (provide type pred))))
-
-  (define-syntax-class struct-clause
-    #:description "[#:struct name ([field : type] ...)]"
-    ;; FIXME: support other struct options
-    (pattern [#:struct name:id ([field:id (~datum :) type:expr] ...)
-                       (~optional (~seq #:extra-constructor-name extra:id)
-                                  #:defaults ([extra #f]))
-                       (~optional (~and (~seq #:no-provide) (~bind [provide? #f]))
-                                  #:defaults ([provide? #t]))]
-             #:with form #'(d-s name ([field : type] ...))
-             #:with outer-form (if (attribute provide?)
-                                   #'(provide (struct-out name))
-                                   #'(void)))
-    (pattern [#:struct (name:id par:id)
-                       ([field:id (~datum :) type:expr] ...)
-                       (par-type:expr ...)
-                       (~optional (~seq #:extra-constructor-name extra:id)
-                                  #:defaults ([extra #f]))
-                       (~optional (~and (~seq #:no-provide) (~bind [provide? #f]))
-                                  #:defaults ([provide? #t]))]
-             #:with form #'(d-s (name par) ([field : type] ...) (par-type ...))
-             #:with outer-form (if (attribute provide?)
-                                   #'(provide (struct-out name))
-                                   #'(void)))))
-
-(define-syntax (-#%module-begin stx)
-  (syntax-parse stx
-    [(mb e ...)
-     #'(#%plain-module-begin
-        (require (for-syntax typed-racket/env/env-req))
-        e ...
-        ;; need to register this module
-        (begin-for-syntax (add-mod! (variable-reference->module-path-index
-                                     (#%variable-reference)))))]))
-
-;; macro that actually sets up the #%type-decl, should be used
-;; at most once per extra-env-lang module
-(define-syntax (type-environment stx)
-  (syntax-parse stx
-    [(_ binding:clause ...)
-     #'(begin
-         (begin-for-syntax
-          (module* #%type-decl #f
-                   (#%plain-module-begin ;; avoid top-level printing and config
-                    (require typed-racket/types/numeric-tower typed-racket/env/type-name-env
-                             typed-racket/env/global-env typed-racket/env/type-alias-env
-                             typed-racket/types/struct-table typed-racket/types/abbrev
-                             typed-racket/typecheck/tc-structs
-                             (only-in typed-racket/rep/type-rep make-Name make-Opaque)
-                             (rename-in racket/private/sort [sort raw-sort]))
-                    ;; FIXME: add a switch to turn contracts on for testing
-                    binding.form ...)))
-         binding.outer-form ...)]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/extra-procs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/extra-procs.rkt
deleted file mode 100644
index 19177ba09f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/extra-procs.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-(provide assert defined?)
-
-(define-syntax (assert stx)
-  (syntax-case stx ()
-    [(assert v)
-     #`(let ([val v])
-         #,(syntax-property
-            (syntax/loc stx
-              (or val (error (format "Assertion failed on ~v" val))))
-            'feature-profile:TR-dynamic-check #t))]
-    [(assert v p)
-     #`(let ([val  v]
-             [pred p])
-         #,(syntax-property
-            (quasisyntax/loc stx
-              (if (pred val)
-                  val
-                  (error (format "Assertion ~a failed on ~v" pred val))))
-            'feature-profile:TR-dynamic-check #t))]))
-
-(define (defined? v) #t)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/for-clauses.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/for-clauses.rkt
deleted file mode 100644
index 2f8717fe2e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/for-clauses.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         (for-template (only-in racket/base quote))
-         "annotate-classes.rkt")
-
-(provide (all-defined-out))
-
-;; intersperses "#:when #t" clauses to emulate the for* variants' semantics
-(define-splicing-syntax-class for-clause
-  #:description "for clause"
-  ;; single-valued seq-expr
-  (pattern (~and c (var:optionally-annotated-name seq-expr:expr))
-           #:with (expand ...) #`(#,(syntax/loc #'c
-                                      (var.ann-name seq-expr)))
-           #:with (expand* ...) #'(expand ... #:when '#t))
-  ;; multi-valued seq-expr
-  (pattern (~and c ((v:optionally-annotated-formal ...) seq-expr:expr))
-           #:with (expand ...) (list (syntax/loc #'c
-                                       ((v.ann-name ...) seq-expr)))
-           #:with (expand* ...) (list (quasisyntax/loc #'c
-                                        ((v.ann-name ...) seq-expr))
-                                      #'#:when #''#t))
-  ;; Note: #:break and #:final clauses don't ever typecheck
-  (pattern (~seq (~and kw (~or #:when #:unless #:break #:final)) guard:expr)
-           #:with (expand ...) (list #'kw #'guard)
-           #:with (expand* ...) #'(expand ...)))
-
-(define-syntax-class for-clauses
-  #:description "for clauses"
-  #:attributes ((expand 2) (expand* 2))
-  (pattern (:for-clause ...)))
-
-(define-syntax-class accumulator-binding
-  #:description "accumumulator binding"
-  #:attributes (ann-name init ty)
-  (pattern (:optionally-annotated-name init:expr)))
-
-(define-syntax-class accumulator-bindings
-  #:description "accumumulator bindings"
-  #:attributes ((ann-name 1) (init 1) (ty 1))
-  (pattern (:accumulator-binding ...)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/prims.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/prims.rkt
deleted file mode 100644
index fd3d8ebeb7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/prims.rkt
+++ /dev/null
@@ -1,1391 +0,0 @@
-#lang racket/base
-
-#|
-
-This file defines two sorts of primitives. All of them are provided into any module using the typed racket language.
-
-1. macros for defining type annotated code.
-   this includes: lambda:, define:, etc
-   potentially, these macros should be replacements for the mzscheme ones in the user program
-   however, it's nice to be able to use both when the sugar is more limited
-   for example: (define ((f x) y) (+ x y))
-
-2. macros for defining 'magic' code
-   examples: define-typed-struct, require/typed
-   these expand into (ignored) mzscheme code, and declarations that a typechecker understands
-   in order to protect the declarations, they are wrapped in `#%app void' so that local-expand of the module body
-   will not expand them on the first pass of the macro expander (when the stop list is ignored)
-
-3. contracted versions of built-in racket values such as parameters and prompt tags
-   that are defined in "base-contracted.rkt"
-
-|#
-
-
-(provide (except-out (all-defined-out) dtsi* dtsi/exec* -let-internal define-for-variants define-for*-variants
-                     with-handlers: define-for/acc:-variants base-for/flvector: base-for/vector
-                     -lambda -define -do -let -let* -let*-values -let-values -let/cc -let/ec -letrec -letrec-values -struct)
-         ;; provide the contracted bindings as primitives
-         (all-from-out "base-contracted.rkt")
-         (all-from-out "top-interaction.rkt")
-         (all-from-out "case-lambda.rkt")
-         :
-         (rename-out [define-typed-struct define-struct:]
-                     [define-typed-struct define-struct]
-                     [-struct struct]
-                     [-struct struct:]
-                     [lambda: λ:]
-                     [-lambda lambda]
-                     [-lambda λ]
-                     [-define define]
-                     [-let let]
-                     [-let* let*]
-                     [-letrec letrec]
-                     [-let-values let-values]
-                     [-letrec-values letrec-values]
-                     [-let/cc let/cc]
-                     [-let/ec let/ec]
-                     [-let let:]
-                     [-let* let*:]
-                     [-letrec letrec:]
-                     [-let-values let-values:]
-                     [-letrec-values letrec-values:]
-                     [-let/cc let/cc:]
-                     [-let/ec let/ec:]
-                     [for: for]
-                     [for/list: for/list]
-                     [for/vector: for/vector]
-                     [for/hash: for/hash]
-                     [for/hasheq: for/hasheq]
-                     [for/hasheqv: for/hasheqv]
-                     [for/and: for/and]
-                     [for/or: for/or]
-                     [for/sum: for/sum]
-                     [for/product: for/product]
-                     [for/lists: for/lists]
-                     [for/first: for/first]
-                     [for/last: for/last]
-                     [for/fold: for/fold]
-                     [for*: for*]
-                     [for*/list: for*/list]
-                     [for*/lists: for*/lists]
-                     [for*/vector: for*/vector]
-                     [for*/hash: for*/hash]
-                     [for*/hasheq: for*/hasheq]
-                     [for*/hasheqv: for*/hasheqv]
-                     [for*/and: for*/and]
-                     [for*/or: for*/or]
-                     [for*/sum: for*/sum]
-                     [for*/product: for*/product]
-                     [for*/first: for*/first]
-                     [for*/last: for*/last]
-                     [for*/fold: for*/fold]
-                     [-do do]
-                     [-do do:]
-                     [with-handlers: with-handlers]
-                     [define-typed-struct/exec define-struct/exec:]
-                     [define-typed-struct/exec define-struct/exec]))
-
-(module struct-extraction racket/base
-  (provide extract-struct-info/checked)
-  (require syntax/parse racket/struct-info)
-  (define (extract-struct-info/checked id)
-    (syntax-parse id
-     [(~var id (static struct-info? "identifier bound to a structure type"))
-      (extract-struct-info (syntax-local-value #'id))])))
-
-(require "../utils/require-contract.rkt"
-         "colon.rkt"
-         "../typecheck/internal-forms.rkt"
-         (rename-in racket/contract/base [-> c->] [->* c->*] [case-> c:case->])
-         ;; contracted bindings to replace built-in ones
-         "base-contracted.rkt"
-         "top-interaction.rkt"
-         "base-types.rkt"
-         "base-types-extra.rkt"
-         "case-lambda.rkt"
-         'struct-extraction
-         racket/flonum ; for for/flvector and for*/flvector
-         racket/extflonum ; for for/extflvector and for*/extflvector
-         (for-label (only-in "base-types-extra.rkt" Values)
-                    (only-in racket/base values))
-         (for-syntax
-          racket/lazy-require
-          syntax/parse
-          syntax/parse/experimental/template
-          syntax/stx
-          racket/list
-          racket/syntax
-          unstable/sequence
-          unstable/syntax
-          racket/base
-          racket/struct-info
-          syntax/struct
-          "annotate-classes.rkt"
-          "../utils/tc-utils.rkt"
-          "../utils/literal-syntax-class.rkt"
-          "../private/parse-classes.rkt"
-          "../private/syntax-properties.rkt"
-          ;"../types/utils.rkt"
-          "for-clauses.rkt"
-          'struct-extraction)
-         "../types/numeric-predicates.rkt"
-         racket/unsafe/ops
-         racket/vector)
-(provide index?) ; useful for assert, and racket doesn't have it
-
-;; Lazily loaded b/c they're only used sometimes, so we save a lot
-;; of loading by not having them when they are unneeded
-(begin-for-syntax 
-  (lazy-require ["../rep/type-rep.rkt" (make-Opaque Error?)]
-                ["../types/utils.rkt" (fv)]
-                [syntax/define (normalize-definition)]
-                [typed-racket/private/parse-type (parse-type)]
-                [typed-racket/env/type-alias-env (register-resolved-type-alias)]))
-
-(define-for-syntax (with-type* expr ty)
-  (with-type #`(ann #,expr #,ty)))
-(define-for-syntax (ignore-some/expr expr ty)
-  #`(#,(ignore-some-expr-property #'#%expression ty) #,expr))
-
-
-(begin-for-syntax
-  (define-syntax-class opt-parent
-    #:attributes (nm parent)
-    (pattern nm:id #:with parent #'#f)
-    (pattern (nm:id parent:id))))
-
-
-(define-syntaxes (require/typed-legacy require/typed)
- (let ()
-  (define-syntax-class opt-rename
-    #:attributes (nm spec)
-    (pattern nm:id
-             #:with spec #'nm)
-    (pattern (orig-nm:id internal-nm:id)
-             #:with spec #'(orig-nm internal-nm)
-             #:with nm #'internal-nm))
-
-  (define-syntax-class simple-clause
-    #:attributes (nm ty)
-    (pattern [nm:opt-rename ty]))
-
-  (define-splicing-syntax-class (opt-constructor legacy struct-name)
-   #:attributes (value)
-   (pattern (~seq) #:attr value (if legacy
-                                    #`(#:extra-constructor-name #,(format-id struct-name "make-~a" struct-name))
-                                    #'()))
-   (pattern (~seq (~and key (~or #:extra-constructor-name #:constructor-name)) name:id) #:attr value #'(key name)))
-
-  (define-syntax-class (struct-clause legacy)
-    ;#:literals (struct)
-    #:attributes (nm (body 1) (constructor-parts 1))
-    (pattern [(~or (~datum struct) #:struct) nm:opt-parent (body ...) (~var constructor (opt-constructor legacy #'nm.nm))]
-             #:with (constructor-parts ...) #'constructor.value))
-
-  (define-syntax-class opaque-clause
-    ;#:literals (opaque)
-    #:attributes (ty pred opt)
-    (pattern [(~or (~datum opaque) #:opaque) ty:id pred:id]
-             #:with opt #'())
-    (pattern [(~or (~datum opaque) #:opaque) opaque ty:id pred:id #:name-exists]
-             #:with opt #'(#:name-exists)))
-
-  (define-syntax-class (clause legacy lib)
-   #:attributes (spec)
-   (pattern oc:opaque-clause #:attr spec
-     #`(require/opaque-type oc.ty oc.pred #,lib . oc.opt))
-   (pattern (~var strc (struct-clause legacy)) #:attr spec
-     #`(require-typed-struct strc.nm (strc.body ...) strc.constructor-parts ... #,lib))
-   (pattern sc:simple-clause #:attr spec
-     #`(require/typed #:internal sc.nm sc.ty #,lib)))
-
-
-  (define ((r/t-maker legacy) stx)
-    (syntax-parse stx
-      [(_ lib:expr (~var c (clause legacy #'lib)) ...)
-       (when (zero? (syntax-length #'(c ...)))
-         (raise-syntax-error #f "at least one specification is required" stx))
-       #`(begin c.spec ...)]
-      [(_ #:internal nm:opt-rename ty lib (~optional [~seq #:struct-maker parent]) ...)
-       (define/with-syntax hidden (generate-temporary #'nm.nm))
-       (define/with-syntax sm (if (attribute parent)
-                                  #'(#:struct-maker parent)
-                                  #'()))
-       ;; define `cnt*` to be fixed up later by the module type-checking
-       (define cnt*
-         (syntax-local-lift-expression
-          (make-contract-def-rhs #'ty #f (attribute parent))))
-       (quasisyntax/loc stx
-         (begin
-           #,(internal #'(require/typed-internal hidden ty . sm))
-           #,(ignore #`(require/contract nm.spec hidden #,cnt* lib))))]))
-  (values (r/t-maker #t) (r/t-maker #f))))
-
-(define-syntax (require/typed/provide stx)
-  (unless (memq (syntax-local-context) '(module module-begin))
-    (raise-syntax-error 'require/typed/provide
-                        "can only be used at module top-level"))
-  (syntax-parse stx
-    [(_ lib) #'(begin)]
-    [(_ lib [r:id t] other-clause ...)
-     #'(begin (require/typed lib [r t])
-              (provide r)
-              (require/typed/provide lib other-clause ...))]
-    [(_ lib (~and clause [#:struct name:id ([f:id (~datum :) t] ...)
-                                   option ...])
-        other-clause ...)
-     #'(begin (require/typed lib clause)
-              (provide (struct-out name))
-              (require/typed/provide lib other-clause ...))]
-    [(_ lib (~and clause [#:struct (name:id parent:id)
-                                   ([f:id (~datum :) t] ...)
-                                   option ...])
-        other-clause ...)
-     #'(begin (require/typed lib clause)
-              (provide (struct-out name))
-              (require/typed/provide lib other-clause ...))]
-    [(_ lib (~and clause [#:opaque t:id pred:id])
-        other-clause ...)
-     #'(begin (require/typed lib clause)
-              (provide t pred)
-              (require/typed/provide lib other-clause ...))]))
-
-(define-syntax require-typed-struct/provide
-  (syntax-rules ()
-    [(_ (nm par) . rest)
-     (begin (require-typed-struct (nm par) . rest)
-            (provide (struct-out nm)))]
-    [(_ nm . rest)
-     (begin (require-typed-struct nm . rest)
-            (provide (struct-out nm)))]))
-
-;; Conversion of types to contracts
-;;  define-predicate
-;;  make-predicate
-;;  cast
-
-;; Helper to construct syntax for contract definitions
-(define-for-syntax (make-contract-def-rhs type flat? maker?)
-  (contract-def-property #'#f `#s(contract-def ,type ,flat? ,maker? untyped)))
-
-(define-syntax (define-predicate stx)
-  (syntax-parse stx
-    [(_ name:id ty:expr)
-     #`(begin
-         ;; We want the value bound to name to have a nice object name. Using the built in mechanism
-         ;; of define has better performance than procedure-rename.
-         #,(ignore
-             #'(define name
-                 (let ([pred (make-predicate ty)])
-                   (lambda (x) (pred x)))))
-         ;; not a require, this is just the unchecked declaration syntax
-         #,(internal #'(require/typed-internal name (Any -> Boolean : ty))))]))
-
-(define-syntax (make-predicate stx)
-  (syntax-parse stx
-    [(_ ty:expr)
-     (define name (syntax-local-lift-expression
-                   (make-contract-def-rhs #'ty #t #f)))
-     (define (check-valid-type _)
-       (define type (parse-type #'ty))
-       (define vars (fv type))
-       ;; If there was an error don't create another one
-       (unless (or (Error? type) (null? vars))
-         (tc-error/delayed
-          "Type ~a could not be converted to a predicate because it contains free variables."
-          type)))
-     #`(#,(external-check-property #'#%expression check-valid-type)
-        #,(ignore-some/expr #`(flat-contract-predicate #,name) #'(Any -> Boolean : ty)))]))
-
-(define-syntax (cast stx)
-  (syntax-parse stx
-    [(_ v:expr ty:expr)
-     (define (apply-contract ctc-expr)
-       #`(#%expression
-          #,(ignore-some/expr
-             #`(let-values (((val) #,(with-type* #'v #'Any)))
-                 #,(syntax-property
-                    (quasisyntax/loc stx
-                      (contract
-                       #,ctc-expr
-                       val
-                       'cast
-                       'typed-world
-                       val
-                       (quote-syntax #,stx)))
-                    'feature-profile:TR-dynamic-check #t))
-             #'ty)))
-
-     (cond [(not (unbox typed-context?)) ; no-check, don't check
-            #'v]
-           [else
-            (define ctc (syntax-local-lift-expression
-                         (make-contract-def-rhs #'ty #f #f)))
-            (define (check-valid-type _)
-              (define type (parse-type #'ty))
-              (define vars (fv type))
-              ;; If there was an error don't create another one
-              (unless (or (Error? type) (null? vars))
-                (tc-error/delayed
-                 "Type ~a could not be converted to a contract because it contains free variables."
-                 type)))
-            #`(#,(external-check-property #'#%expression check-valid-type)
-               #,(apply-contract ctc))])]))
-
-(define-syntax (require/opaque-type stx)
-  (define-syntax-class name-exists-kw
-    (pattern #:name-exists))
-  (syntax-parse stx
-    [(_ ty:id pred:id lib (~optional ne:name-exists-kw) ...)
-     ;; This line appears redundant with the use of `define-type-alias` below, but
-     ;; it's actually necessary for top-level uses because this opaque type may appear
-     ;; in subsequent `require/typed` clauses, which needs to parse the types at
-     ;; expansion-time, not at typechecking time when aliases are installed.
-     (register-resolved-type-alias #'ty (make-Opaque #'pred))
-     (with-syntax ([hidden (generate-temporary #'pred)])
-       (quasisyntax/loc stx
-         (begin
-           #,(ignore #'(define pred-cnt (any/c . c-> . boolean?)))
-           #,(internal #'(require/typed-internal hidden (Any -> Boolean : (Opaque pred))))
-           #,(if (attribute ne)
-                 (internal (syntax/loc stx (define-type-alias-internal ty (Opaque pred))))
-                 (syntax/loc stx (define-type-alias ty (Opaque pred))))
-           #,(ignore #'(require/contract pred hidden pred-cnt lib)))))]))
-
-(define-syntax (plambda: stx)
-  (syntax-parse stx
-    [(plambda: tvars:type-variables formals . body)
-     (plambda-property
-       (syntax/loc stx (lambda: formals . body))
-       #'(tvars.vars ...)) ]))
-
-(define-syntax (popt-lambda: stx)
-  (syntax-parse stx
-    [(popt-lambda: tvars:type-variables formals . body)
-     (plambda-property
-       (syntax/loc stx (opt-lambda: formals . body))
-       #'(tvars.vars ...))]))
-
-(define-syntax (pdefine: stx)
-  (syntax-parse stx #:literals (:)
-    [(pdefine: tvars:type-variables (nm:id . formals:annotated-formals) : ret-ty . body)
-     (with-syntax ([type (syntax/loc #'ret-ty (All (tvars.vars ...) (formals.arg-ty ... -> ret-ty)))])
-       (syntax/loc stx
-         (begin
-          (: nm : type)
-          (define (nm . formals.ann-formals) . body))))]))
-
-(define-syntax (ann stx)
-  (syntax-parse stx #:literals (:)
-    [(_ (~or (~seq arg : ty) (~seq arg ty)))
-     (add-ann #'arg #'ty)]))
-
-(define-for-syntax (add-ann expr-stx ty-stx)
-  (quasisyntax/loc expr-stx
-    (#,(type-ascription-property #'#%expression ty-stx)
-     #,expr-stx)))
-
-
-(define-syntax (inst stx)
-  (syntax-parse stx #:literals (:)
-    [(_ arg : . tys)
-     (syntax/loc stx (inst arg . tys))]
-    ;; FIXME: Is the right choice to use a #:row keyword or just
-    ;; to use a Row type constructor and keep it consistent?
-    [(_ arg #:row e ...)
-     (with-syntax ([expr (type-inst-property #'#%expression #'(#:row e ...))])
-       (syntax/loc #'arg (expr arg)))]
-    [(_ arg tys ... ty ddd b:id)
-     #:when (eq? (syntax-e #'ddd) '...)
-     (with-syntax ([expr (type-inst-property #'#%expression #'(tys ... (ty . b)))])
-       (syntax/loc #'arg (expr arg)))]
-    [(_ arg tys ...)
-     (with-syntax ([expr (type-inst-property #'#%expression #'(tys ...))])
-       (syntax/loc #'arg (expr arg)))]))
-
-(define-syntax (lambda: stx)
-  (syntax-parse stx
-    [(lambda: formals:annotated-formals . body)
-     (syntax/loc stx (-lambda formals.ann-formals . body))]))
-
-(define-syntax (opt-lambda: stx)
-  (syntax-parse stx
-    [(opt-lambda: formals:opt-lambda-annotated-formals . body)
-     (syntax/loc stx (-lambda formals.ann-formals . body))]))
-
-(define-syntaxes (-let-internal -let* -letrec)
-  (let ([mk (lambda (form)
-              (lambda (stx)
-                (syntax-parse stx
-                  [(_ (bs:optionally-annotated-binding ...) . body)
-                   (quasisyntax/loc stx (#,form (bs.binding ...) . body))])))])
-    (values (mk #'let) (mk #'let*) (mk #'letrec))))
-
-(define-syntaxes (-let-values -let*-values -letrec-values)
-  (let ([mk (lambda (form)
-              (lambda (stx)
-                (syntax-parse stx
-                  [(_ (bs:optionally-annotated-values-binding ...) . body)
-                   (quasisyntax/loc stx (#,form (bs.binding ...) . body))])))])
-    (values (mk #'let-values) (mk #'let*-values) (mk #'letrec-values))))
-
-(define-syntax (-let stx)
-  (syntax-parse stx #:literals (:)
-    [(-let nm:id ~! ; named let:
-           (~and (~seq (~optional (~seq : ret-ty))
-                       (bs:optionally-annotated-binding ...) body ...)
-                 (~seq rest ...)))
-     (quasisyntax/loc stx
-       (#,(syntax-parse #'(rest ...)
-            #:literals (:)
-            [(: ret-ty (bs:annotated-binding ...) . body)
-             (quasisyntax/loc stx
-               (-letrec ([nm : (bs.ty ... -> ret-ty)
-                             #,(quasisyntax/loc stx
-                                 (lambda (bs.ann-name ...) . #,(syntax/loc stx body)))])
-                        #,(quasisyntax/loc stx nm)))]
-            [(: ret-ty (bs:optionally-annotated-binding ...) body ... bod)
-             (quasisyntax/loc stx
-               (letrec ([nm #,(quasisyntax/loc stx
-                                (lambda (bs.ann-name ...) body ... (ann #,(syntax/loc stx bod) ret-ty)))])
-                 #,(quasisyntax/loc stx nm)))]
-            [((bs:optionally-annotated-binding ...) . body)
-             (quasisyntax/loc stx
-               (letrec ([nm #,(quasisyntax/loc stx
-                                (lambda (bs.ann-name ...) . #,(syntax/loc stx body)))])
-                 #,(quasisyntax/loc stx nm)))])
-        bs.rhs ...))]
-    [(-let vars:lambda-type-vars
-           ([bn:optionally-annotated-name e] ...)
-           . rest)
-     (define/with-syntax (bn* ...)
-       ;; singleton names go to just the name
-       (for/list ([bn (in-syntax #'(bn ...))])
-         (if (empty? (stx-cdr bn))
-             (stx-car bn)
-             bn)))
-     (template ((-lambda (?@ . vars) (bn* ...) . rest) e ...))]
-    [(-let . rest)
-     (syntax/loc stx (-let-internal . rest))]))
-
-(define-syntax (plet: stx)
-  (syntax-parse stx #:literals (:)
-    [(_ (A:id ...) ([bn:optionally-annotated-name e] ...) . body)
-     (syntax/loc stx
-       ((plambda: (A ...) (bn ...) . body) e ...))]))
-
-(define-syntax (define-type-alias stx)
-  (define-syntax-class all-vars
-    #:literals (All)
-    #:attributes (poly-vars)
-    (pattern (All (arg:id ...) rest)
-             #:with poly-vars #'(arg ...))
-    (pattern type:expr #:with poly-vars #'#f))
-
-  (define-splicing-syntax-class omit-define-syntaxes
-    #:attributes (omit)
-    (pattern #:omit-define-syntaxes #:attr omit #t)
-    (pattern (~seq) #:attr omit #f))
-
-  (define-splicing-syntax-class type-alias-full
-     #:attributes (tname type poly-vars omit)
-     (pattern (~seq tname:id (~and type:expr :all-vars) :omit-define-syntaxes))
-     (pattern (~seq (tname:id arg:id ...) body:expr :omit-define-syntaxes)
-       #:with poly-vars #'(arg ...)
-       #:with type (syntax/loc #'body (All (arg ...) body))))
-
-  (syntax-parse stx
-    [(_ :type-alias-full)
-     (define/with-syntax stx-err-fun
-       #'(lambda (stx)
-           (raise-syntax-error
-            'type-check
-            "type name used out of context"
-            stx
-            (and (stx-pair? stx) (stx-car stx)))))
-     #`(begin
-         #,(if (not (attribute omit))
-               (ignore #'(define-syntax tname stx-err-fun))
-               #'(begin))
-         #,(internal (syntax/loc stx
-                       (define-type-alias-internal tname type poly-vars))))]))
-
-(define-syntax (with-handlers: stx)
-  (syntax-parse stx
-    [(_ ([pred? action] ...) . body)
-     (with-syntax ([(pred?* ...)
-                    (for/list ([(pred? idx) (in-indexed (in-syntax #'(pred? ...)))])
-                      (exn-predicate-property pred? idx))]
-                   [(action* ...)
-                    (for/list ([(action idx) (in-indexed (in-syntax #'(action ...)))])
-                      (exn-handler-property action idx))]
-                   [body* (exn-body #'(let-values () . body))])
-       (exn-handlers (quasisyntax/loc stx
-                       (with-handlers ([pred?* action*] ...) body*))))]))
-
-(begin-for-syntax
-  (define-syntax-class dtsi-struct-name
-    #:description "struct name (with optional super-struct name)"
-    #:attributes (name super value)
-    (pattern ((~var name (static struct-info? "struct name")) super:id)
-             #:attr value (attribute name.value))
-    (pattern (~var name (static struct-info? "struct name"))
-             #:attr value (attribute name.value)
-             #:with super #f)))
-
-(define-syntax (define-typed-struct/exec stx)
-  (syntax-parse stx #:literals (:)
-    [(_ nm ((~describe "field specification" [fld:optionally-annotated-name]) ...) [proc : proc-ty])
-     (with-syntax*
-      ([proc* (with-type* #'proc #'proc-ty)]
-       [d-s (ignore-some (syntax/loc stx (define-struct nm (fld.name ...)
-                                      #:property prop:procedure proc*)))]
-       [dtsi (quasisyntax/loc stx (dtsi/exec* () nm (fld ...) proc-ty))])
-      #'(begin d-s dtsi))]))
-
-(define-syntaxes (dtsi* dtsi/exec*)
-  (let ()
-    (define (mk internal-id)
-      (lambda (stx)
-        (syntax-parse stx
-          [(_ () nm:dtsi-struct-name . rest)
-           (internal (quasisyntax/loc stx
-                       (#,internal-id
-                        #,(struct-info-property #'nm (attribute nm.value)) . rest)))]
-          [(_ (vars:id ...) nm:dtsi-struct-name . rest)
-           (internal (quasisyntax/loc stx
-                       (#,internal-id (vars ...)
-                                      #,(struct-info-property #'nm (attribute nm.value)) . rest)))])))
-    (values (mk #'define-typed-struct-internal)
-            (mk #'define-typed-struct/exec-internal))))
-
-;; Syntax classes and helpers for `struct:`
-(begin-for-syntax
-  (define-syntax-class fld-spec
-    #:literals (:)
-    #:description "[field-name : type]"
-    (pattern [fld:id : ty]
-             #:with form this-syntax)
-    (pattern fld:id
-             #:fail-when #t
-             (format "field `~a' requires a type annotation"
-                     (syntax-e #'fld))
-             #:with form 'dummy))
-
-  (define-syntax-class struct-name
-    #:description "struct name (with optional super-struct name)"
-    #:attributes (name super)
-    (pattern (name:id super:id))
-    (pattern name:id
-             #:with super #f))
-  
-  (define-splicing-syntax-class struct-name/new
-    #:description "struct name (with optional super-struct name)"
-    (pattern (~seq name:id super:id)
-             #:attr old-spec #'(name super)
-             #:with new-spec #'(name super))
-    (pattern name:id
-             #:with super #f
-             #:attr old-spec #'name
-             #:with new-spec #'(name)))
-
-  (define-splicing-syntax-class maybe-type-vars
-   #:description "optional list of type variables"
-   #:attributes ((vars 1))
-   (pattern (vars:id ...))
-   (pattern (~seq) #:attr (vars 1) null))
-
-  (define-splicing-syntax-class struct-options
-    #:description "typed structure type options"
-    #:attributes (guard mutable? transparent? [prop 1] [prop-val 1])
-    (pattern (~seq (~or (~optional (~seq (~and #:mutable mutable?)))
-                        (~optional (~seq (~and #:transparent transparent?)))
-                        ;; FIXME: unsound, but relied on in core libraries
-                        ;; #:guard ought to be supportable with some work
-                        ;; #:property is harder
-                        (~optional (~seq #:guard guard:expr))
-                        (~seq #:property prop:expr prop-val:expr))
-                   ...))))
-
-;; User-facing macros for defining typed structure types
-(define-syntaxes (define-typed-struct -struct)
-  (values
-   (lambda (stx)
-     (syntax-parse stx
-       [(_ vars:maybe-type-vars nm:struct-name (fs:fld-spec ...)
-           opts:struct-options)
-        (let ([mutable? (if (attribute opts.mutable?) #'(#:mutable) #'())]
-              [cname (second (build-struct-names #'nm.name empty #t #t))])
-          (with-syntax ([d-s (ignore-some
-                               (syntax/loc stx (define-struct nm (fs.fld ...) . opts)))]
-                        [dtsi (quasisyntax/loc stx
-                                (dtsi* (vars.vars ...) nm (fs.form ...)
-                                       #:maker #,cname
-                                       #,@mutable?))])
-            (if (eq? (syntax-local-context) 'top-level)
-                ;; Use `eval` at top-level to avoid an unbound id error
-                ;; from dtsi trying to look at the d-s bindings.
-                #'(begin (eval (quote-syntax d-s))
-                         ;; It is important here that the object under the
-                         ;; eval is a quasiquoted literal in order
-                         ;; for #%top-interaction to get the lexical
-                         ;; information for TR's actual #%top-interaction.
-                         ;; This effectively lets us invoke the type-checker
-                         ;; dynamically.
-                         ;;
-                         ;; The quote-syntax is also important because we want
-                         ;; the `dtsi` to have the lexical information from
-                         ;; this module. This ensures that the `dtsi` macro
-                         ;; is actually bound to its definition above.
-                         (eval `(#%top-interaction . ,(quote-syntax dtsi))))
-                #'(begin d-s dtsi))))]))
-   (lambda (stx)
-     (syntax-parse stx
-       [(_ vars:maybe-type-vars nm:struct-name/new (fs:fld-spec ...)
-           opts:struct-options)
-        (let ([mutable? (if (attribute opts.mutable?) #'(#:mutable) #'())])
-          (with-syntax ([d-s (ignore (quasisyntax/loc stx
-                                       (struct #,@(attribute nm.new-spec) (fs.fld ...)
-                                               . opts)))]
-                        [dtsi (quasisyntax/loc stx
-                                (dtsi* (vars.vars ...)
-                                       nm.old-spec (fs.form ...)
-                                       #,@mutable?))])
-            ;; see comment above
-            (if (eq? (syntax-local-context) 'top-level)
-                #'(begin (eval (quote-syntax d-s))
-                         (eval `(#%top-interaction . ,(quote-syntax dtsi))))
-                #'(begin d-s dtsi))))]))))
-
-
-;Copied from racket/private/define-struct
-;FIXME when multiple bindings are supported
-(define-for-syntax (self-ctor-transformer orig stx)
-  (define (transfer-srcloc orig stx)
-    (datum->syntax orig (syntax-e orig) stx orig))
-  (syntax-case stx ()
-    [(self arg ...) (datum->syntax stx
-                                   (cons (syntax-property (transfer-srcloc orig #'self)
-                                                          'constructor-for
-                                                          (syntax-local-introduce #'self))
-                                         (syntax-e (syntax (arg ...))))
-                                   stx
-                                   stx)]
-    [_ (transfer-srcloc orig stx)]))
-
-
-(define-for-syntax make-struct-info-self-ctor
- (let ()
-  (struct struct-info-self-ctor (id info)
-          #:property prop:procedure
-                     (lambda (ins stx)
-                      (self-ctor-transformer (struct-info-self-ctor-id ins) stx))
-          #:property prop:struct-info (lambda (x) (extract-struct-info (struct-info-self-ctor-info x))))
-  struct-info-self-ctor))
-
-
-
-(define-syntaxes (require-typed-struct-legacy
-                  require-typed-struct)
- (let ()
-
-  (define-splicing-syntax-class (constructor-term legacy struct-name)
-   (pattern (~seq) #:fail-when legacy #f #:attr name struct-name #:attr extra #f)
-   (pattern (~seq) #:fail-unless legacy #f #:attr name (format-id struct-name "make-~a" struct-name) #:attr extra #t)
-   (pattern (~seq #:constructor-name name:id) #:attr extra #f)
-   (pattern (~seq #:extra-constructor-name name:id) #:attr extra #t))
-
-
-  (define ((rts legacy) stx)
-    (syntax-parse stx #:literals (:)
-      [(_ name:opt-parent ([fld : ty] ...) (~var input-maker (constructor-term legacy #'name.nm)) lib)
-       (with-syntax* ([nm #'name.nm]
-                      [parent #'name.parent]
-                      [hidden (generate-temporary #'name.nm)]
-                      [orig-struct-info (generate-temporary #'nm)]
-                      [spec (if (syntax-e #'name.parent) #'(nm parent) #'nm)]
-                      [num-fields (syntax-length #'(fld ...))]
-                      [(type-des _ pred sel ...) (build-struct-names #'nm (syntax->list #'(fld ...)) #f #t)]
-                      [(mut ...) (stx-map (lambda _ #'#f) #'(sel ...))]
-                      [maker-name #'input-maker.name]
-                      ;maker-name's symbolic form is used in the require form
-                      [id-is-ctor? (or (attribute input-maker.extra) (bound-identifier=? #'maker-name #'nm))]
-                      [internal-maker (generate-temporary #'maker-name)] ;Only used if id-is-ctor? is true
-                      [real-maker (if (syntax-e #'id-is-ctor?) #'internal-maker #'maker-name)] ;The actual identifier bound to the constructor
-                      [extra-maker (and (attribute input-maker.extra)
-                                        (not (bound-identifier=? #'make-name #'nm))
-                                        #'maker-name)])
-                     (define (maybe-add-quote-syntax stx)
-                       (if (and stx (syntax-e stx)) #`(quote-syntax #,stx) stx))
-
-                     (quasisyntax/loc stx
-                       (begin
-                         (require (only-in lib type-des (nm orig-struct-info)))
-
-                         (define-for-syntax si
-                           (let ()
-                             (define-values (orig-type-des orig-maker orig-pred orig-sels orig-muts orig-parent)
-                               (apply values (extract-struct-info/checked (quote-syntax orig-struct-info))))
-
-                             (define (id-drop sels muts num)
-                               (cond
-                                [(zero? num) (values sels muts)]
-                                [(null? sels) (int-err "id-drop: Too short of list")]
-                                [(pair? sels)
-                                 (cond
-                                   [(not (car sels)) (values sels muts)]
-                                   [else (id-drop (cdr sels) (cdr muts) (sub1 num))])]
-                                [else (int-err "id-drop: Not a list")]))
-
-                             (define (struct-info-list new-sels new-muts)
-                               (list (quote-syntax type-des)
-                                     (quote-syntax real-maker)
-                                     (quote-syntax pred)
-                                     (append (list #,@(map maybe-add-quote-syntax (reverse (syntax->list #'(sel ...)))))
-                                             new-sels)
-                                     (append (list #,@(map maybe-add-quote-syntax (reverse (syntax->list #'(mut ...)))))
-                                             new-muts)
-                                     orig-parent))
-
-                             (make-struct-info
-                               (lambda ()
-                                 #,(if (syntax-e #'parent)
-                                       (let-values (((parent-type-des parent-maker parent-pred
-                                                      parent-sel  parent-mut grand-parent)
-                                                     (apply values (extract-struct-info/checked #'parent))))
-                                         #`(struct-info-list
-                                             (list #,@(map maybe-add-quote-syntax parent-sel))
-                                             (list #,@(map maybe-add-quote-syntax parent-mut))))
-                                       #`(let-values (((new-sels new-muts) (id-drop orig-sels orig-muts num-fields)))
-                                           (struct-info-list new-sels new-muts)))))))
-
-                         (define-syntax nm
-                              (if id-is-ctor?
-                                  (make-struct-info-self-ctor #'internal-maker si)
-                                  si))
-
-                         (dtsi* () spec ([fld : ty] ...) #:maker maker-name #:type-only)
-                         #,(ignore #'(require/contract pred hidden (any/c . c-> . boolean?) lib))
-                         #,(internal #'(require/typed-internal hidden (Any -> Boolean : nm)))
-                         (require/typed #:internal (maker-name real-maker) nm lib #:struct-maker parent)
-
-                         ;This needs to be a different identifier to meet the specifications
-                         ;of struct (the id constructor shouldn't expand to it)
-                         #,(if (syntax-e #'extra-maker)
-                               #'(require/typed #:internal (maker-name extra-maker) nm lib #:struct-maker parent)
-                               #'(begin))
-
-                         (require/typed lib
-                           [sel (nm -> ty)]) ...)))]))
-
-  (values (rts #t) (rts #f))))
-
-(define-syntax (-do stx)
-  (syntax-parse stx #:literals (:)
-    [(_ (~optional (~seq : ty) #:defaults ([ty #f]))
-        ((var:optionally-annotated-name rest ...) ...)
-        (stop?:expr ret ...)
-        c:expr ...)
-     (define do-stx
-       (syntax/loc stx
-         (do ((var.ann-name rest ...) ...)
-             (stop? ret ...)
-           c ...)))
-     (if (attribute ty)
-         (quasisyntax/loc stx
-           (ann #,do-stx #,(attribute ty)))
-         do-stx)]))
-
-;; we need handle #:when clauses manually because we need to annotate
-;; the type of each nested for
-(define-syntax (for: stx)
-  (syntax-parse stx #:literals (: Void)
-    ;; the annotation is not necessary (always of Void type), but kept
-    ;; for consistency with the other for: macros
-    [(_ (~optional (~seq : Void))
-        clauses
-        (~optional (~seq : Void)) ; can be either before or after
-        ;; c is not always an expression, could be a break-clause
-        c ...) ; no need to annotate the type, it's always Void
-     (let ((body #'(; break-clause ...
-                    c ...)))
-       (let loop ((clauses #'clauses))
-         (define-splicing-syntax-class for-clause
-           ;; single-valued seq-expr
-           ;; unlike the definitions in for-clauses.rkt, this does not include
-           ;; #:when clauses, which are handled separately here
-           (pattern (~seq (var:optionally-annotated-name seq-expr:expr))
-                    #:with (expand ...) #'((var.ann-name seq-expr)))
-           ;; multi-valued seq-expr
-           (pattern ((v:optionally-annotated-formal ...) seq-expr:expr)
-                    #:with (expand ...) #'(((v.ann-name ...) seq-expr)))
-           ;; break-clause, pass it directly
-           ;; Note: these don't ever typecheck
-           (pattern (~seq (~and kw (~or #:break #:final)) guard-expr:expr)
-                    #:with (expand ...) #'(kw guard-expr)))
-         (define-syntax-class for-kw
-           (pattern #:when
-                    #:with replace-with #'when)
-           (pattern #:unless
-                    #:with replace-with #'unless))
-         (syntax-parse clauses
-           [(head:for-clause next:for-clause ... kw:for-kw rest ...)
-            (add-ann
-             (quasisyntax/loc stx
-               (for
-                (head.expand ... next.expand ... ...)
-                #,(loop #'(kw rest ...))))
-             #'Void)]
-           [(head:for-clause ...) ; we reached the end
-            (add-ann
-             (quasisyntax/loc stx
-               (for
-                (head.expand ... ...)
-                #,@body))
-             #'Void)]
-           [(kw:for-kw guard) ; we end on a keyword clause
-            (quasisyntax/loc stx
-              (kw.replace-with guard
-                #,@body))]
-           [(kw:for-kw guard rest ...)
-            (quasisyntax/loc stx
-              (kw.replace-with guard
-                #,(loop #'(rest ...))))])))]))
-
-(begin-for-syntax
-  (define-splicing-syntax-class optional-standalone-annotation*
-    #:attributes (ty annotate)
-    (pattern :optional-standalone-annotation
-      #:attr annotate (λ (stx) (if (attribute ty)
-                                   (add-ann stx #'ty)
-                                   stx)))))
-
-;; Handling #:when clauses manually, like we do with for: above breaks
-;; the semantics of for/list and co.
-;; We must leave it to the untyped versions of the macros.
-;; However, this means that some uses of these macros with #:when
-;; clauses won't typecheck.
-;; If the only #:when clause is the last clause, inference should work.
-(define-for-syntax (define-for-variant name)
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ a1:optional-standalone-annotation*
-          clause:for-clauses
-          a2:optional-standalone-annotation* ; can be either before or after
-          c ...) ; c is not always an expression, can be a break-clause
-       ((attribute a1.annotate)
-         ((attribute a2.annotate)
-          (quasisyntax/loc stx
-            (#,name
-             (clause.expand ... ...)
-             c ...))))])))
-
-(define-syntax (define-for-variants stx)
-  (syntax-parse stx
-    [(_ (name untyped-name) ...)
-     (quasisyntax/loc
-         stx
-       (begin (define-syntax name (define-for-variant #'untyped-name)) ...))]))
-
-;; for/vector:, for/flvector:, for/and:, for/first: and
-;; for/last:'s expansions can't currently be handled by the typechecker.
-(define-for-variants
-  (for/list: for/list)
-  (for/and: for/and)
-  (for/or: for/or)
-  (for/first: for/first)
-  (for/last: for/last))
-
-;; Unlike with the above, the inferencer can handle any number of #:when
-;; clauses with these 2.
-(define-syntax (for/lists: stx)
-  (syntax-parse stx
-    [(_ a1:optional-standalone-annotation*
-        (var:optionally-annotated-formal ...)
-        clause:for-clauses
-        a2:optional-standalone-annotation*
-        c ...)
-     (define all-typed? (andmap values (attribute var.ty)))
-     (define for-stx
-       (quasisyntax/loc stx
-          (for/lists (var.ann-name ...)
-            (clause.expand ... ...)
-            c ...)))
-     ((attribute a1.annotate)
-      ((attribute a2.annotate)
-       (if all-typed?
-           (add-ann
-            for-stx
-            #'(values var.ty ...))
-           for-stx)))]))
-(define-syntax (for/fold: stx)
-  (syntax-parse stx
-    [(_ a1:optional-standalone-annotation*
-        accum:accumulator-bindings
-        clause:for-clauses
-        a2:optional-standalone-annotation*
-        c ...)
-     (define all-typed? (andmap values (attribute accum.ty)))
-     (define for-stx
-       (quasisyntax/loc stx
-         (for/fold ((accum.ann-name accum.init) ...)
-                   (clause.expand ... ...)
-           c ...)))
-     ((attribute a1.annotate)
-      ((attribute a2.annotate)
-       (if all-typed?
-           (add-ann
-            for-stx
-            #'(values accum.ty ...))
-           for-stx)))]))
-
-(define-syntax (for*: stx)
-  (syntax-parse stx #:literals (: Void)
-    [(_ (~optional (~seq : Void))
-        clause:for-clauses
-        (~optional (~seq : Void))
-        c ...) ; c is not always an expression, can be a break-clause
-     (quasisyntax/loc stx
-       (for: (clause.expand* ... ...)
-             c ...))]))
-
-;; These currently only typecheck in very limited cases.
-(define-for-syntax (define-for*-variant name)
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ a1:optional-standalone-annotation*
-          clause:for-clauses
-          a2:optional-standalone-annotation*
-          c ...) ; c is not always an expression, can be a break-clause
-       ((attribute a1.annotate)
-        ((attribute a2.annotate)
-         (quasisyntax/loc stx
-           (#,name (clause.expand ... ...)
-                   c ...))))])))
-(define-syntax (define-for*-variants stx)
-  (syntax-parse stx
-    [(_ (name no-colon-name) ...)
-     (quasisyntax/loc
-         stx
-       (begin (define-syntax name (define-for*-variant #'no-colon-name))
-              ...))]))
-(define-for*-variants
-  (for*/and: for*/and)
-  (for*/or: for*/or)
-  (for*/first: for*/first)
-  (for*/last: for*/last))
-
-;; Like for/lists: and for/fold:, the inferencer can handle these correctly.
-(define-syntax (for*/lists: stx)
-  (syntax-parse stx
-    [(_ a1:optional-standalone-annotation*
-        ((var:optionally-annotated-name) ...)
-        clause:for-clauses
-        a2:optional-standalone-annotation*
-        c ...)
-     ((attribute a1.annotate)
-      ((attribute a2.annotate)
-       (add-ann
-        (quasisyntax/loc stx
-          (for/lists (var.ann-name ...)
-              (clause.expand* ... ...)
-            c ...))
-        #'(values var.ty ...))))]))
-(define-syntax (for*/fold: stx)
-  (syntax-parse stx #:literals (:)
-    [(_ a1:optional-standalone-annotation*
-        ((var:optionally-annotated-name init:expr) ...)
-        clause:for-clauses
-        a2:optional-standalone-annotation*
-        c ...)
-     ((attribute a1.annotate)
-      ((attribute a2.annotate)
-       (add-ann
-        (quasisyntax/loc stx
-          (for/fold ((var.ann-name init) ...)
-              (clause.expand* ... ...)
-            c ...))
-        #'(values var.ty ...))))]))
-
-(define-for-syntax (define-for/acc:-variant for*? for/folder: for/folder op initial final)
-  (lambda (stx)
-    (syntax-parse stx #:literals (:)
-      [(_ a1:optional-standalone-annotation*
-          clause:for-clauses
-          a2:optional-standalone-annotation*
-          c ...) ; c is not always an expression, can be a break-clause
-       (define a.ty (or (attribute a2.ty)
-                        (attribute a1.ty)))
-       (cond
-        [a.ty
-         ;; ty has to include exact 0, exact 1, null (sum/product/list respectively),
-         ;; the initial value of the accumulator
-         ;; (to be consistent with Racket semantics).
-         ;; We can't just change the initial value to be 0.0 if we expect a
-         ;; Float result. This is problematic in some cases e.g:
-         ;; (for/sum: : Float ([i : Float '(1.1)] #:when (zero? (random 1))) i)
-         (quasisyntax/loc stx
-           (#,final
-             (#,for/folder: : #,a.ty ([acc : #,a.ty #,initial])
-                           (clause.expand ... ...)
-                           (let ([new (let () c ...)])
-                             (#,op acc new)))))]
-        ;; With no annotation, try our luck with the core form.
-        ;; Exact base cases cause problems, thus the additional
-        ;; annotation on the accumulator above.
-        [for*? ((define-for*-variant for/folder) stx)]
-        [else ((define-for-variant for/folder) stx)])])))
-
-(define-syntax (define-for/acc:-variants stx)
-  (syntax-parse stx
-    [(_ (name for/folder: for/folder for*? op initial final) ...)
-     (quasisyntax/loc stx
-       (begin (define-syntax name
-                (define-for/acc:-variant
-                  for*? #'for/folder: #'for/folder #'op #'initial #'final))
-              ...))]))
-(define-for/acc:-variants
-  (for/sum: for/fold: for/sum #f + 0 #%expression)
-  (for*/sum: for*/fold: for*/sum #t + 0 #%expression)
-  (for*/list: for*/fold: for*/list #t (lambda (x y) (cons y x)) null reverse)
-  (for/product: for/fold: for/product #f * 1 #%expression)
-  (for*/product: for*/fold: for*/product #t * 1 #%expression))
-
-(define-for-syntax (define-for/hash:-variant hash-maker)
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ a1:optional-standalone-annotation*
-          clause:for-clauses
-          a2:optional-standalone-annotation*
-          body ...) ; body is not always an expression, can be a break-clause
-       (define a.ty (or (attribute a2.ty) (attribute a1.ty)))
-       (if a.ty
-           (quasisyntax/loc stx
-             (for/fold: : #,a.ty
-               ((return-hash : #,a.ty (ann (#,hash-maker null) #,a.ty)))
-               (clause.expand ... ...)
-               (let-values (((key val) (let () body ...)))
-                 (hash-set return-hash key val))))
-           (syntax/loc stx
-             (for/hash (clause.expand ... ...)
-               body ...)))])))
-
-(define-syntax for/hash:    (define-for/hash:-variant #'make-immutable-hash))
-(define-syntax for/hasheq:  (define-for/hash:-variant #'make-immutable-hasheq))
-(define-syntax for/hasheqv: (define-for/hash:-variant #'make-immutable-hasheqv))
-
-(define-for-syntax (define-for*/hash:-variant hash-maker)
-  (lambda (stx)
-    (syntax-parse stx
-      #:literals (:)
-      [(_ a1:optional-standalone-annotation*
-          clause:for-clauses
-          a2:optional-standalone-annotation*
-          body ...) ; body is not always an expression, can be a break-clause
-       (define a.ty (or (attribute a2.ty) (attribute a1.ty)))
-       (quasisyntax/loc stx
-         (for*/fold: #,@(if a.ty #`(: #,a.ty) #'())
-             #,(if a.ty
-                   #`((return-hash : #,a.ty (ann (#,hash-maker null) #,a.ty)))
-                   #`((return-hash (#,hash-maker null))))
-           (clause.expand* ... ...)
-           (let-values (((key val) (let () body ...)))
-             (hash-set return-hash key val))))])))
-
-(define-syntax for*/hash:    (define-for*/hash:-variant #'make-immutable-hash))
-(define-syntax for*/hasheq:  (define-for*/hash:-variant #'make-immutable-hasheq))
-(define-syntax for*/hasheqv: (define-for*/hash:-variant #'make-immutable-hasheqv))
-
-
-(define-syntax (provide: stx)
-  (syntax-parse stx
-    [(_ [i:id t] ...)
-     ;; indirection through i*s allows `provide: to come
-     ;; before the original definitions/type annotations
-     (define i*s (generate-temporaries #'(i ...)))
-     (for ([i* (in-list i*s)]
-           [i  (in-list (syntax->list #'(i ...)))])
-       ;; lift allows `provide:` to come before original definition
-       (syntax-local-lift-module-end-declaration #`(define #,i* #,i)))
-     (define/with-syntax (i* ...) i*s)
-     (syntax/loc stx
-       (begin (: i* t) ...
-              (provide (rename-out [i* i] ...))))]))
-
-(define-syntax (declare-refinement stx)
-  (syntax-parse stx
-    [(_ p:id)
-     (quasisyntax/loc stx #,(internal #'(declare-refinement-internal p)))]))
-
-(define-syntaxes (-let/cc -let/ec)
-  (let ()
-    (define-literal-syntax-class #:for-label Values)
-    (define-literal-syntax-class #:for-label values)
-    (define ((mk l/c) stx)
-      (syntax-parse stx
-       [(_ (~or (~var k (param-annotated-name
-                         (λ (ty)
-                            (syntax-parse ty
-                              [((~or :Values^ :values^) tys ...) ;; binds types and ellipses
-                               #'(tys ... -> (U))]
-                              [t #'(t -> (U))]))))
-                (~and k:id (~bind [k.ann-name #'k]))) . body)
-        (quasisyntax/loc stx (#,l/c k.ann-name . body))]))
-    (values (mk #'let/cc) (mk #'let/ec))))
-
-
-;; lambda with optional type annotations, uses syntax properties
-(define-syntax (-lambda stx)
-  (syntax-parse stx
-    #:literals (:)
-    [(_ vars:maybe-lambda-type-vars
-        formals:lambda-formals
-        return:return-ann
-        (~describe "body expression or definition" e) ...
-        (~describe "body expression" last-e))
-     ;; Annotate the last expression with the return type. Should be correct
-     ;; since if a function returns, it has to do so through the last expression
-     ;; even with continuations.
-     (define/with-syntax last-e*
-       (if (attribute return.type)
-           #`(ann last-e #,(attribute return.type))
-           #'last-e))
-     (define d (syntax/loc stx (λ formals.erased e ... last-e*)))
-     (define d/prop
-       (if (attribute formals.kw-property)
-           (kw-lambda-property d (attribute formals.kw-property))
-           (opt-lambda-property d (attribute formals.opt-property))))
-     ;; attach a plambda property if necessary
-     (if (attribute vars.type-vars)
-         (quasisyntax/loc stx
-           (#%expression
-            #,(plambda-property d/prop (attribute vars.type-vars))))
-         d/prop)]))
-
-;; for backwards compatibility, note that this only accepts formals
-;; with type annotations and also accepts type variables differently
-;; than -define
-(define-syntax (define: stx)
-  (syntax-parse stx #:literals (:)
-    [(define: (nm:id . formals:annotated-formals) (~describe "return type annotation" (~seq : ret-ty)) body ...)
-     (with-syntax ([arrty (syntax/loc stx (formals.arg-ty ... -> ret-ty))])
-       (syntax/loc stx
-         (-define nm : arrty
-           (-lambda formals body ...))))]
-    [(define: nm:id ~! (~describe ":" :) (~describe "type" ty) body)
-     (syntax/loc stx (-define nm : ty body))]
-    [(define: tvars:type-variables nm:id : ty body)
-     (syntax/loc stx (-define #:forall tvars nm : ty body))]
-    [(define: tvars:type-variables (nm:id . formals:annotated-formals) : ret-ty body ...)
-     (syntax/loc stx (-define #:forall tvars (nm . formals) : ret-ty body ...))]))
-
-(define-syntax (-define stx)
-  (syntax-parse stx #:literals (:)
-    ;; the first three cases are actually subsumed by the last,
-    ;; but manually expanding to using the : annotation form
-    ;; produces better error messages on duplicate annotations
-    [(-define nm:id body)
-     (syntax/loc stx (define nm body))]
-    [(-define nm:id return:return-ann body)
-     (quasisyntax/loc stx
-       (begin (: nm #,(attribute return.type)) (define nm body)))]
-    [(-define vars:lambda-type-vars nm:id : ty body)
-     (define/with-syntax type
-       (syntax/loc #'ty (All vars.type-vars ty)))
-     (syntax/loc stx
-       (begin
-         (: nm : type)
-         (define nm body)))]
-    [(-define (nm:id . formals:annotated-formals) : ret-ty body ...)
-     (with-syntax ([arrty (syntax/loc stx (formals.arg-ty ... -> ret-ty))])
-       (syntax/loc stx
-         (-define nm : arrty
-           (-lambda formals body ...))))]
-    ;; bug 14702: the below should generate a `:` annotation when possible
-    ;; currently, the above special case does the right thing for non-curried lambdas
-    [(-define vars:maybe-lambda-type-vars
-              formals:curried-formals
-              return:return-ann
-              body ... last-body)
-     ;; have to preprocess for the return type annotation
-     (define/with-syntax last-body*
-       (if (attribute return.type)
-           #`(ann last-body #,(attribute return.type))
-           #'last-body))
-     (define-values (defined-id rhs)
-       (normalize-definition
-        #`(define formals.erased body ... last-body*)
-        #'-lambda
-        #t #t))
-     ;; insert in type variables if necessary
-     (define rhs*
-       (syntax-parse rhs
-         #:literals (-lambda)
-         [(-lambda formals . others)
-          (template (-lambda (?@ . vars) formals . others))]
-         [_ rhs]))
-     (quasisyntax/loc stx (define #,defined-id #,rhs*))]))
-
-(define-syntax (with-asserts stx)
-  (define-syntax-class with-asserts-clause
-    [pattern [x:id]
-             #:with cond-clause
-             (syntax/loc #'x
-               [(not x)
-                (error "Assertion failed")])]
-    [pattern [x:id pred]
-             #:with cond-clause
-             (syntax/loc #'x
-               [(not (pred x))
-                (error "Assertion failed")])])
-   (syntax-parse stx
-     [(_ (c:with-asserts-clause ...) body:expr ...+)
-      (syntax-property
-       (quasisyntax/loc stx
-         (cond c.cond-clause
-               ...
-               [else #,(syntax-property
-                        #'(begin body ...)
-                        'feature-profile:TR-dynamic-check 'antimark)]))
-       'feature-profile:TR-dynamic-check #t)]))
-
-(define-syntax (typecheck-fail stx)
-  (syntax-parse stx
-    [(_ orig msg:str #:covered-id var:id)
-     #'(quote-syntax (typecheck-fail-internal orig msg var))]
-    [(_ orig msg:str)
-     #'(quote-syntax (typecheck-fail-internal orig msg #f))]
-    [(_ orig #:covered-id var:id)
-     #'(quote-syntax (typecheck-fail-internal orig "Incomplete case coverage" var))]
-    [(_ orig)
-     #'(quote-syntax (typecheck-fail-internal orig "Incomplete case coverage" #f))]))
-
-(define-syntax (base-for/vector stx)
-  (syntax-case stx ()
-    [(name for ann T K #:length n-expr #:fill fill-expr (clauses ...) body-expr)
-     (syntax/loc stx
-       (call/ec
-        (ann (λ (break)
-               (define n n-expr)
-               (define vs (ann (make-vector n fill-expr) T))
-               (define i 0)
-               (for (clauses ...)
-                 (unsafe-vector-set! vs i body-expr)
-                 (set! i (unsafe-fx+ i 1))
-                 (when (i . unsafe-fx>= . n) (break vs)))
-               vs)
-             K)))]
-    [(name for ann T K #:length n-expr (clauses ...) body-expr)
-     (syntax/loc stx
-       (let ([n n-expr])
-         (define vs
-           (call/ec
-            (ann (λ (break)
-                   (define vs (ann (vector) T))
-                   (define i 0)
-                   (for (clauses ...)
-                     (define v body-expr)
-                     (cond [(unsafe-fx= i 0)  (define new-vs (ann (make-vector n v) T))
-                                              (set! vs new-vs)]
-                           [else  (unsafe-vector-set! vs i v)])
-                     (set! i (unsafe-fx+ i 1))
-                     (when (i . unsafe-fx>= . n) (break vs)))
-                   vs)
-                 K)))
-         (cond [(= (vector-length vs) n)  vs]
-               [else
-                ;; Only happens when n > 0 and vs = (vector)
-                (raise-result-error 'name (format "~e-element vector" n) vs)])))]
-    [(_ for ann T K (clauses ...) body-expr)
-     (syntax/loc stx
-       (let ()
-         (define n 0)
-         (define vs (ann (vector) T))
-         (define i 0)
-         (for (clauses ...)
-           (define v body-expr)
-           (cond [(unsafe-fx= i n)  (define new-n (max 4 (unsafe-fx* 2 n)))
-                                    (define new-vs (ann (make-vector new-n v) T))
-                                    (vector-copy! new-vs 0 vs)
-                                    (set! n new-n)
-                                    (set! vs new-vs)]
-                 [else  (unsafe-vector-set! vs i v)])
-           (set! i (unsafe-fx+ i 1)))
-         (vector-copy vs 0 i)))]))
-
-(define-for-syntax (base-for/vector: stx for:)
-  (syntax-parse stx #:literals (:)
-    [(name (~optional (~seq : T:expr))
-           (~optional (~seq #:length n-expr:expr))
-           (~optional (~seq #:fill fill-expr:expr))
-           (clauses ...)
-           (~optional (~seq : A:expr))
-           body ...+)
-     (let ([T  (attribute T)]
-           [A  (attribute A)])
-       (with-syntax ([(maybe-length ...)  (if (attribute n-expr) #'(#:length n-expr) #'())]
-                     [(maybe-fill ...)  (if (attribute fill-expr) #'(#:fill fill-expr) #'())]
-                     [body-expr  (if A #`(ann (let () body ...) #,A) #'(let () body ...))]
-                     [T  (cond [(and T A)  #`(U #,T (Vectorof #,A))]
-                               [T  T]
-                               [A  #`(Vectorof #,A)]
-                               [else  #'(Vectorof Any)])])
-         (quasisyntax/loc stx
-           (base-for/vector #,for: ann T ((T -> Nothing) -> T)
-                            maybe-length ... maybe-fill ... (clauses ...) body-expr))))]))
-
-(define-syntax (for/vector: stx)
-  (base-for/vector: stx #'for:))
-
-(define-syntax (for*/vector: stx)
-  (base-for/vector: stx #'for*:))
-
-(define-syntax (base-for/flvector: stx)
-  (syntax-parse stx
-    [(_ for: Float flvector make-flvector unsafe-flvector-ref unsafe-flvector-set! flvector-copy
-        #:length n-expr:expr (clauses ...) body ...+)
-     (syntax/loc stx
-       (-let ([n : Integer  n-expr])
-         (cond [(n . > . 0)
-                (define xs (make-flvector n))
-                (define: i : Nonnegative-Fixnum 0)
-                (-let/ec break : Void
-                  (for: (clauses ...)
-                    (unsafe-flvector-set! xs i (let () body ...))
-                    (set! i (unsafe-fx+ i 1))
-                    (when (i . unsafe-fx>= . n) (break (void)))))
-                xs]
-               [else  (flvector)])))]
-    [(_ for: Float flvector make-flvector unsafe-flvector-ref unsafe-flvector-set! flvector-copy
-        (clauses ...) body ...+)
-     (syntax/loc stx
-       (let ()
-         (define n 4)
-         (define xs (make-flvector 4))
-         (define i 0)
-         (for: (clauses ...)
-           (-let ([x : Float  (let () body ...)])
-             (cond [(unsafe-fx= i n)  (define new-n (unsafe-fx* 2 n))
-                                      (define new-xs (make-flvector new-n x))
-                                      (-let loop : Void ([i : Nonnegative-Fixnum 0])
-                                        (when (i . unsafe-fx< . n)
-                                          (unsafe-flvector-set! new-xs i (unsafe-flvector-ref xs i))
-                                          (loop (unsafe-fx+ i 1))))
-                                      (set! n new-n)
-                                      (set! xs new-xs)]
-                   [else  (unsafe-flvector-set! xs i x)]))
-           (set! i (unsafe-fx+ i 1)))
-         (flvector-copy xs 0 i)))]))
-
-(define-syntax-rule (for/flvector: e ...)
-  (base-for/flvector: for: Flonum flvector make-flvector unsafe-flvector-ref unsafe-flvector-set! flvector-copy e ...))
-
-(define-syntax-rule (for*/flvector: e ...)
-  (base-for/flvector: for*: Flonum flvector make-flvector unsafe-flvector-ref unsafe-flvector-set! flvector-copy e ...))
-
-(define-syntax-rule (for/extflvector: e ...)
-  (base-for/flvector: for: ExtFlonum extflvector make-extflvector unsafe-extflvector-ref unsafe-extflvector-set! extflvector-copy e ...))
-
-(define-syntax-rule (for*/extflvector: e ...)
-  (base-for/flvector: for*: ExtFlonum extflvector make-extflvector unsafe-extflvector-ref unsafe-extflvector-set! extflvector-copy e ...))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/top-interaction.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/top-interaction.rkt
deleted file mode 100644
index 5bc44cf761..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/top-interaction.rkt
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang racket/base
-
-(require
-  (for-syntax racket/base racket/lazy-require syntax/parse))
-
-(begin-for-syntax
-  (lazy-require [(submod "." implementation)
-                 (:type-impl :print-type-impl :query-type/args-impl :query-type/result-impl)]))
-
-(provide
-  (for-syntax
-    interactive-command?
-    interactive-command-procedure)
-  :type :print-type :query-type/args :query-type/result)
-
-(define-for-syntax (fail _ stx)
-  (syntax-parse stx
-    [_:id
-     (raise-syntax-error #f "must be applied to arguments" stx)]
-    [_ (raise-syntax-error #f "only valid at the top-level of an interaction" stx)]))
-
-
-(begin-for-syntax
-  (struct interactive-command (procedure)
-    #:property prop:procedure fail))
-
-
-(define-syntax :type (interactive-command :type-impl))
-(define-syntax :print-type (interactive-command :print-type-impl))
-(define-syntax :query-type/args (interactive-command :query-type/args-impl))
-(define-syntax :query-type/result (interactive-command :query-type/result-impl))
-
-(module implementation racket/base
-  (require
-    "../utils/utils.rkt"
-    racket/base
-    racket/match
-    racket/format
-    racket/string
-    racket/list
-    syntax/stx
-    syntax/parse
-    "../tc-setup.rkt"
-    (private parse-type syntax-properties)
-    (types utils abbrev printer)
-    (typecheck tc-toplevel tc-app-helper)
-    (rep type-rep)
-    (utils tc-utils)
-    (for-template racket/base))
-  (provide
-    :type-impl :print-type-impl :query-type/args-impl :query-type/result-impl)
-
-  (define (:type-impl stx)
-    (syntax-parse stx
-      [(_ (~optional (~and #:verbose verbose-kw)) ty:expr)
-       (parameterize ([current-print-type-fuel
-                       (if (attribute verbose-kw) +inf.0 1)]
-                      ;; This makes sure unions are totally flat for the
-                      ;; infinite fuel case. If fuel that's not 0, 1, or +inf.0
-                      ;; is ever used, more may need to be done.
-                      [current-type-names
-                       (if (attribute verbose-kw) '() (current-type-names))]
-                      [current-print-unexpanded (box '())])
-         (define type (pretty-format-type (parse-type #'ty)))
-         (define unexpanded
-           (remove-duplicates (unbox (current-print-unexpanded))))
-         (define cue (if (null? unexpanded)
-                         ""
-                         (format "[can expand further: ~a]"
-                                 (string-join (map ~a unexpanded)))))
-         #`(display #,(format "~a\n~a" type cue)))]
-      [form
-       (raise-syntax-error #f "must be applied to exactly one argument" #'form)]))
-
-  ;; TODO what should be done with stx
-  ;; Prints the _entire_ type. May be quite large.
-  (define (:print-type-impl stx)
-    (syntax-parse stx
-      [(_ e)
-       (tc-toplevel/full stx #'e
-         (λ (expanded type)
-           #`(display
-              #,(if (eq? type 'no-type)
-                    "This form has no type (it does not produce a value)."
-                    (pretty-format-type
-                     (match type
-                       [(tc-result1: t f o) t]
-                       [(tc-results: t) (-values t)]
-                       [(tc-any-results: f) (-AnyValues f)]))))))]
-      [form
-       (raise-syntax-error #f "must be applied to exactly one argument" #'form)]))
-
-  ;; given a function and input types, display the result type
-  (define (:query-type/args-impl stx)
-    (syntax-parse stx
-      [(_ op arg-type ...)
-       (with-syntax ([(dummy-arg ...) (generate-temporaries #'(arg-type ...))])
-         (tc-toplevel/full
-           stx
-           ;; create a dummy function with the right argument types
-           #`(lambda #,(stx-map type-label-property
-                                #'(dummy-arg ...) #'(arg-type ...))
-               (op dummy-arg ...))
-           (λ (expanded type)
-             #`(display
-                #,(pretty-format-type
-                   (match type
-                     [(tc-result1: (and t (Function: _)) f o) t]))))))]
-      [form
-       (raise-syntax-error #f "must be applied to at least one argument" #'form)]))
-
-  ;; given a function and a desired return type, fill in the blanks
-  (define (:query-type/result-impl stx)
-    (syntax-parse stx
-      [(_ op desired-type)
-       (let ([expected (parse-type #'desired-type)])
-         (tc-toplevel/full stx #'op
-           (λ (expanded type)
-             (match type
-               [(tc-result1: (and t (Function: _)) f o)
-                (let ([cleaned (cleanup-type t expected #f)])
-                  #`(display
-                     #,(match cleaned
-                         [(Function: '())
-                          "Desired return type not in the given function's range.\n"]
-                         [(Function: arrs)
-                          (pretty-format-type cleaned)])))]
-               [_ (error (format "~a: not a function" (syntax->datum #'op)))]))))]
-      [form
-       (raise-syntax-error #f "must be applied to exactly two arguments" #'form)])))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/type-env-lang.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/type-env-lang.rkt
deleted file mode 100644
index e1d1d604ac..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/type-env-lang.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base syntax/parse syntax/stx))
-
-(define-syntax (#%module-begin stx)
-  (syntax-parse stx #:literals (require)
-    [(mb (require . args) ... [nm:id ty] ...)
-     #'(#%plain-module-begin
-        (begin
-          (define-syntax (nm stx)
-            (raise-syntax-error
-             'type-check "type name used out of context"
-             stx
-             (and (stx-pair? stx) (stx-car stx))))
-          ...
-          (provide nm) ...
-          (begin-for-syntax
-            (module* initialize #f
-              (require
-               (only-in typed-racket/env/init-envs initialize-type-name-env))
-              (require . args) ...
-              (provide initialize-type-names)
-              (define (initialize-type-names)
-                (initialize-type-name-env
-                 (list (list #'nm ty) ...)))))))]))
-
-(provide #%module-begin require
-         (all-from-out racket/base)
-         (for-syntax (all-from-out racket/base)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/core.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/core.rkt
deleted file mode 100644
index 8defb569a0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/core.rkt
+++ /dev/null
@@ -1,135 +0,0 @@
-#lang racket/base
-
-(require (rename-in "utils/utils.rkt")
-         (for-syntax racket/base)
-         (for-template racket/base)
-         (private with-types type-contract)
-         (except-in syntax/parse id)
-         racket/match racket/syntax
-         syntax/flatten-begin
-         (types utils abbrev generalize)
-         (typecheck provide-handling tc-app-helper)
-         (rep type-rep)
-         (for-template (base-env top-interaction))
-         (utils utils tc-utils arm)
-         (only-in (types printer) pretty-format-type)
-         "standard-inits.rkt"
-         "tc-setup.rkt")
-
-(provide mb-core ti-core wt-core)
-
-(define (mb-core stx)
-  (syntax-parse stx
-    [(mb (~optional (~or (~and #:optimize    (~bind [opt? #'#t])) ; kept for backward compatibility
-                         (~and #:no-optimize (~bind [opt? #'#f]))))
-         forms ...)
-     (let ([pmb-form (syntax/loc stx (#%plain-module-begin forms ...))])
-       (parameterize ([optimize? (or (and (not (attribute opt?)) (optimize?))
-                                     (and (attribute opt?) (syntax-e (attribute opt?))))])
-         (tc-module/full stx pmb-form
-          (λ (new-mod before-code pre-after-code)
-            (with-syntax*
-             (;; pmb = #%plain-module-begin
-              [(pmb . body2) new-mod]
-              ;; perform the provide transformation from [Culpepper 07]
-              [transformed-body (begin0 (remove-provides #'body2) (do-time "Removed provides"))]
-              ;; add the real definitions of contracts on requires
-              [transformed-body
-               (begin0 (change-contract-fixups (syntax->list #'transformed-body))
-                       (do-time "Fixed contract ids"))]
-              ;; add the real definitions of contracts on the after-code
-              [(after-code ...) (change-provide-fixups (flatten-all-begins pre-after-code))]
-              ;; potentially optimize the code based on the type information
-              [(optimized-body ...) (maybe-optimize #'transformed-body)] ;; has own call to do-time
-              ;; add in syntax property on useless expression to draw check-syntax arrows
-              [check-syntax-help (syntax-property
-                                  (syntax-property
-                                   #'(void)
-                                   'disappeared-binding (disappeared-bindings-todo))
-                                  'disappeared-use (disappeared-use-todo))])
-             ;; reconstruct the module with the extra code
-             ;; use the regular %#module-begin from `racket/base' for top-level printing
-             (arm #`(#%module-begin 
-                     #,(if (unbox include-extra-requires?)
-                           extra-requires
-                           #'(begin))
-                     #,before-code optimized-body ... after-code ... check-syntax-help)))))))]))
-
-(define did-I-suggest-:print-type-already? #f)
-(define :print-type-message " ... [Use (:print-type <expr>) to see more.]")
-(define (ti-core stx )
-  (current-type-names (init-current-type-names))
-  (syntax-parse stx
-    #:literal-sets (kernel-literals)
-    [(_ . (module . rest))
-     #'(module . rest)]
-    [(_ . (~and form ((~var command (static interactive-command? #f)) . _)))
-     (do-standard-inits)
-     ((interactive-command-procedure (attribute command.value)) #'form)]
-    [(_ . form)
-     ;; TODO(endobson): Remove the call to do-standard-inits when it is no longer necessary
-     ;; Cast at the top-level still needs this for some reason
-     (do-standard-inits)
-     (tc-toplevel/full stx #'form
-       (λ (body2 type)
-         (with-syntax*
-          ([(optimized-body ...) (maybe-optimize #`(#,body2))]
-           ;; Transform after optimization for top-level because the flattening will
-           ;; change syntax object identity (via syntax-track-origin) which doesn't work
-           ;; for looking up types in the optimizer.
-           [(transformed-body ...)
-            (change-contract-fixups (flatten-all-begins #'(begin optimized-body ...)))])
-          (define ty-str
-            (match type
-              ;; 'no-type means the form is not an expression and
-              ;; has no meaningful type to print
-              ['no-type #f]
-              ;; don't print results of type void
-              [(tc-result1: (== -Void type-equal?)) #f]
-              ;; don't print results of unknown type
-              [(tc-any-results: f) #f]
-              [(tc-result1: t f o)
-               ;; Don't display the whole types at the REPL. Some case-lambda types
-               ;; are just too large to print.
-               ;; Also, to avoid showing too precise types, we generalize types
-               ;; before printing them.
-               (define tc (cleanup-type t))
-               (define tg (generalize tc))
-               (format "- : ~a~a~a\n"
-                       (pretty-format-type tg #:indent 4)
-                       (cond [(equal? tc tg) ""]
-                             [else (format " [more precisely: ~a]" tc)])
-                       (cond [(equal? tc t) ""]
-                             [did-I-suggest-:print-type-already? " ..."]
-                             [else (set! did-I-suggest-:print-type-already? #t)
-                                   :print-type-message]))]
-              [(tc-results: t)
-               (define tcs (map cleanup-type t))
-               (define tgs (map generalize tcs))
-               (define tgs-val (make-Values (map -result tgs)))
-               (define formatted (pretty-format-type tgs-val #:indent 4))
-               (define indented? (regexp-match? #rx"\n" formatted))
-               (format "- : ~a~a~a\n"
-                       formatted
-                       (cond [(andmap equal? tgs tcs) ""]
-                             [indented?
-                              (format "\n[more precisely: ~a]"
-                                      (pretty-format-type (make-Values tcs) #:indent 17))]
-                             [else (format " [more precisely: ~a]" (cons 'Values tcs))])
-                       ;; did any get pruned?
-                       (cond [(andmap equal? t tcs) ""]
-                             [did-I-suggest-:print-type-already? " ..."]
-                             [else (set! did-I-suggest-:print-type-already? #t)
-                                   :print-type-message]))]
-              [x (int-err "bad type result: ~a" x)]))
-          (if (and ty-str
-                   (not (null? (syntax-e #'(transformed-body ...)))))
-              (with-syntax ([(transformed-body ... transformed-last)
-                             #'(transformed-body ...)])
-                #`(begin #,(if (unbox include-extra-requires?)
-                               extra-requires
-                               #'(begin))
-                         #,(arm #'(begin transformed-body ...))
-                         (begin0 #,(arm #'transformed-last)
-                           (display '#,ty-str))))
-              (arm #'(begin transformed-body ...))))))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/env-req.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/env-req.rkt
deleted file mode 100644
index 224dad0a16..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/env-req.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(define to-require null)
-(define (add-mod! m)
-  (set! to-require (cons m to-require)))
-
-(define (do-requires [ns (current-namespace)])
-  (parameterize ([current-namespace ns])
-    (for ([m (in-list to-require)]
-          #:when m)
-      (dynamic-require (module-path-index-join '(submod "." #%type-decl) m)
-                       #f))))
-
-(provide add-mod! do-requires)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/global-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/global-env.rkt
deleted file mode 100644
index 3cd5031b7e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/global-env.rkt
+++ /dev/null
@@ -1,105 +0,0 @@
-#lang racket/base
-
-;; Top-level type environment
-;; maps identifiers to their types, updated by mutation
-
-(require "../types/tc-error.rkt"
-         "../utils/tc-utils.rkt"
-         syntax/parse
-         syntax/id-table
-         racket/lazy-require) 
-(provide register-type register-type-if-undefined
-         finish-register-type
-         maybe-finish-register-type
-         register-type/undefined
-         lookup-type
-         typed-id^
-         register-types
-         unregister-type
-         check-all-registered-types
-         type-env-map)
-
-(lazy-require ["../rep/type-rep.rkt" (Type/c? type-equal?)])
-
-;; free-id-table from id -> type or Box[type]
-;; where id is a variable, and type is the type of the variable
-;; if the result is a box, then the type has not actually been defined, just registered
-(define the-mapping (make-free-id-table))
-
-;; add a single type to the mapping
-;; identifier type -> void
-(define (register-type id type)
-  (free-id-table-set! the-mapping id type))
-
-(define (register-type-if-undefined id type)
-  (cond [(free-id-table-ref the-mapping id (lambda _ #f))
-         => (lambda (e)
-              (define t (if (box? e) (unbox e) e))
-              (unless (and (Type/c? t) (type-equal? t type))
-                (tc-error/delayed #:stx id "Duplicate type annotation of ~a for ~a, previous was ~a" type (syntax-e id) t))
-              (when (box? e)
-                (free-id-table-set! the-mapping id t)))]
-        [else (register-type id type)]))
-
-;; add a single type to the mapping
-;; identifier type -> void
-(define (register-type/undefined id type)
-  ;(printf "register-type/undef ~a\n" (syntax-e id))
-  (cond [(free-id-table-ref the-mapping id (lambda _ #f))
-         =>
-         (λ (t) ;; it's ok to annotate with the same type
-           (define t* (if (box? t) (unbox t) t))
-           (unless (and (Type/c? t*) (type-equal? type t*))
-             (tc-error/delayed #:stx id "Duplicate type annotation of ~a for ~a, previous was ~a" type (syntax-e id) t*)))]
-        [else (free-id-table-set! the-mapping id (box type))]))
-
-;; add a bunch of types to the mapping
-;; listof[id] listof[type] -> void
-(define (register-types ids types)
-  (for-each register-type ids types))
-
-;; given an identifier, return the type associated with it
-;; if none found, calls lookup-fail
-;; identifier -> type
-(define (lookup-type id [fail-handler (λ () (lookup-fail id))])
-  (define v (free-id-table-ref the-mapping id fail-handler))
-  (cond [(box? v) (unbox v)] 
-        [(procedure? v) (define t (v)) (register-type id t) t]
-        [else v]))
-
-(define-syntax-class typed-id^
-  #:attributes (type)
-  (pattern i:id
-    #:attr type (lookup-type #'i #f)
-    #:when (attribute type)))
-
-(define (maybe-finish-register-type id)
-  (let ([v (free-id-table-ref the-mapping id)])
-    (if (box? v)
-        (register-type id (unbox v))
-        #f)))
-
-(define (unregister-type id)
-  (free-id-table-remove! the-mapping id))
-
-(define (finish-register-type id [top-level? #f])
-  (unless (or (maybe-finish-register-type id) top-level?)
-    (tc-error/delayed #:stx id "Duplicate definition for ~a" (syntax-e id))))
-
-(define (check-all-registered-types)
-  (free-id-table-for-each
-   the-mapping
-   (lambda (id e)
-     (when (box? e)
-       (let ([bnd (identifier-binding id)])
-         (tc-error/delayed #:stx id
-                           "Declaration for `~a' provided, but `~a' ~a"
-                           (syntax-e id) (syntax-e id)
-                           (cond [(eq? bnd 'lexical) "is a lexical binding"] ;; should never happen
-                                 [(not bnd) "has no definition"]
-                                 [else "is defined in another module"])))))))
-
-;; map over the-mapping, producing a list
-;; (id type -> T) -> listof[T]
-(define (type-env-map f)
-  (free-id-table-map the-mapping f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/index-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/index-env.rkt
deleted file mode 100644
index d50dbd2a9c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/index-env.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-
-;; this implements the Theta environment from the TOPLAS paper
-
-;; this environment maps type variables names (symbols)
-;; to types representing the type variable
-;; technically, the mapped-to type is unnecessary, but it's convenient to have it around? maybe?
-
-(require "../utils/tc-utils.rkt")
-(provide (all-defined-out))
-
-;; the initial type variable environment - empty
-;; this is used in the parsing of types
-(define initial-index-env (list))
-
-;; a parameter for the current type variables
-(define current-indexes (make-parameter initial-index-env))
-
-;; takes a single index
-(define-syntax-rule (extend-indexes index . body)
- (parameterize ([current-indexes (cons index (current-indexes))]) . body))
-
-(define (bound-index? v) (memq v (current-indexes)))
-
-(define (infer-index stx)
-  (define bounds (current-indexes))
-  (when (null? bounds)
-    (tc-error/stx stx "No type variable bound with ... in scope for ... type"))
-  (unless (null? (cdr bounds))
-    (tc-error/stx stx "Cannot infer bound for ... type"))
-  (car bounds))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/init-envs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/init-envs.rkt
deleted file mode 100644
index a9fbb5ee34..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/init-envs.rkt
+++ /dev/null
@@ -1,189 +0,0 @@
-#lang racket/base
-
-;; Support for defining the initial TR environment
-
-(require "../utils/utils.rkt"
-         "../utils/tc-utils.rkt"
-         "global-env.rkt"
-         "type-name-env.rkt"
-         "type-alias-env.rkt"
-         "mvar-env.rkt"
-         (rename-in racket/private/sort [sort raw-sort])
-         (rep type-rep object-rep filter-rep rep-utils free-variance)
-         (for-syntax syntax/parse racket/base)
-         (types abbrev union)
-         racket/dict racket/list
-         mzlib/pconvert racket/match)
-
-(provide ;; convenience form for defining an initial environment
-         ;; used by "base-special-env.rkt" and "base-contracted.rkt"
-         define-initial-env
-         initialize-type-name-env
-         initialize-type-env
-         converter
-         bound-in-this-module
-         tname-env-init-code
-         tvariance-env-init-code
-         talias-env-init-code
-         env-init-code
-         mvar-env-init-code)
-
-(define-syntax (define-initial-env stx)
-  (syntax-parse stx
-    [(_ initialize-env [id-expr ty] ...)
-     #`(begin
-         (define initial-env (make-env [id-expr (λ () ty)] ... ))
-         (define (initialize-env) (initialize-type-env initial-env))
-         (provide initialize-env))]))
-
-(define (initialize-type-name-env initial-type-names)
-  (for-each (lambda (nm/ty) (register-resolved-type-alias (car nm/ty) (cadr nm/ty))) initial-type-names))
-
-(define (initialize-type-env initial-env)
-  (for-each (lambda (nm/ty) (register-type-if-undefined (car nm/ty) (cadr nm/ty))) initial-env))
-
-(define current-class-cache (make-parameter #f))
-
-(define (converter v basic sub)
-  (define (numeric? t) (match t [(Base: _ _ _ b) b] [(Value: (? number?)) #t] [_ #f]))
-  (define (split-union ts)
-    (define-values (nums others) (partition numeric? ts))
-    (cond [(or (null? nums) (null? others))
-            ;; nothing interesting to do in this case
-            `(make-Union (,#'raw-sort (list ,@(map sub ts)) < Type-seq #f))]
-           [else
-            ;; we do a little more work to hopefully save a bunch in serialization space
-            ;; if we get a hit in the predefined-type-table
-            `(simple-Un ,(sub (apply Un nums)) ,(sub (apply Un others)))]))
-
-  (define (gen-constructor sym)
-    (string->symbol (string-append "make-" (substring (symbol->string sym) 7))))
-  (match v
-    [(? Rep? (app (lambda (v) (hash-ref predefined-type-table (Rep-seq v) #f)) (? values id))) id]
-    [(Listof: elem-ty)
-     `(-lst ,(sub elem-ty))]
-    [(Function: (list (arr: dom (Values: (list (Result: t (FilterSet: (Top:) (Top:)) (Empty:)))) #f #f '())))
-     `(simple-> (list ,@(map sub dom)) ,(sub t))]
-    [(Function: (list (arr: dom (Values: (list (Result: t (FilterSet: (TypeFilter: ft pth)
-                                                                      (NotTypeFilter: ft pth))
-                                                        (Empty:))))
-                            #f #f '())))
-     `(make-pred-ty (list ,@(map sub dom)) ,(sub t) ,(sub ft) ,(sub pth))]
-    [(Function: (list (arr: dom (Values: (list (Result: t (FilterSet: (NotTypeFilter: (== -False)
-                                                                                      (Path: pth (list 0 0)))
-                                                                      (TypeFilter: (== -False)
-                                                                                   (Path: pth (list 0 0))))
-                                                        (Path: pth (list 0 0)))))
-                            #f #f '())))
-     `(->acc (list ,@(map sub dom)) ,(sub t) ,(sub pth))]
-    [(Result: t (FilterSet: (Top:) (Top:)) (Empty:)) `(-result ,(sub t))]
-    [(Union: elems) (split-union elems)]
-    [(Base: n cnt pred _) (int-err "Base type not in predefined-type-table" n)]
-    [(Name: stx args struct?)
-     `(make-Name (quote-syntax ,stx)
-                 ,(and args
-                       `(list ,@(map (λ (x) `(quote-syntax ,x)) args)))
-                 ,struct?)]
-    [(fld: t acc mut) `(make-fld ,(sub t) (quote-syntax ,acc) ,mut)]
-    [(Struct: name parent flds proc poly? pred-id)
-     `(make-Struct (quote-syntax ,name) ,(sub parent)
-                   ,(sub flds) ,(sub proc) ,(sub poly?)
-                   (quote-syntax ,pred-id))]
-    [(App: rator rands stx) `(make-App ,(sub rator) ,(sub rands) (quote-syntax ,stx))]
-    [(Opaque: pred) `(make-Opaque (quote-syntax ,pred))]
-    [(Refinement: parent pred) `(make-Refinement ,(sub parent)
-                                                 (quote-syntax ,pred))]
-    [(Mu-name: n b) `(make-Mu ,(sub n) ,(sub b))]
-    [(Poly-names: ns b) `(make-Poly (list ,@(map sub ns)) ,(sub b))]
-    [(PolyDots-names: ns b) `(make-PolyDots (list ,@(map sub ns)) ,(sub b))]
-    [(PolyRow-names: ns c b) `(make-PolyRow (list ,@(map sub ns))
-                                            (quote ,c) ,(sub b))]
-    [(Class: row inits fields methods augments init-rest)
-     (cond [(and (current-class-cache)
-                 (dict-ref (unbox (current-class-cache)) v #f)) => car]
-           [else
-            ;; FIXME: there's probably a better way to do this
-            (define (convert members [inits? #f])
-              (for/list ([m members])
-                `(list (quote ,(car m))
-                       ,(sub (cadr m))
-                       ,@(if inits? (cddr m) '()))))
-            (define class-type
-              `(make-Class ,(sub row)
-                           (list ,@(convert inits #t))
-                           (list ,@(convert fields))
-                           (list ,@(convert methods))
-                           (list ,@(convert augments))
-                           ,(sub init-rest)))
-            (define name (gensym))
-            (define cache-box (current-class-cache))
-            (when cache-box
-              (set-box! cache-box
-                        (dict-set (unbox cache-box) v (list name class-type))))
-            (if cache-box name class-type)])]
-    [(arr: dom rng rest drest kws)
-     `(make-arr ,(sub dom) ,(sub rng) ,(sub rest) ,(sub drest) ,(sub kws))]
-    [(TypeFilter: t p)
-     `(make-TypeFilter ,(sub t) ,(sub p))]
-    [(NotTypeFilter: t p)
-     `(make-NotTypeFilter ,(sub t) ,(sub p))]
-    [(Path: p i)
-     `(make-Path ,(sub p) ,(if (identifier? i)
-                               `(quote-syntax ,i)
-                               `(list ,(car i) ,(cadr i))))]
-    [(? Rep? rep)
-     `(,(gen-constructor (car (vector->list (struct->vector rep))))
-       ,@(map sub (Rep-values rep)))]
-    [_ (basic v)]))
-
-(define (bound-in-this-module id)
-  (let ([binding (identifier-binding id)])
-    (if (and (list? binding) (module-path-index? (car binding)))
-        (let-values ([(mp base) (module-path-index-split (car binding))])
-          (not mp))
-        #f)))
-
-(define (make-init-code map f)
-  (define class-type-cache (box '()))
-  (define (bound-f id v)
-    (and (bound-in-this-module id) (f id v)))
-  (parameterize ((current-class-cache class-type-cache)
-                 (current-print-convert-hook converter)
-                 ;; ignore sharing in all cases
-                 (current-build-share-hook (λ (v basic sub) 'atomic))
-                 (show-sharing #f)
-                 (booleans-as-true/false #f))
-    (define aliases (filter values (map bound-f)))
-    #`(begin
-        #,@(for/list ([name+type (dict-values (unbox class-type-cache))])
-             (match-define (list name type) name+type)
-             (datum->syntax #'here `(define ,name ,type)))
-        #,@aliases)))
-
-(define (quote-type ty)
-  (datum->syntax #'here (print-convert ty)))
-
-(define (tname-env-init-code)
-  (make-init-code
-    type-name-env-map
-    (λ (id ty) #`(register-type-name #'#,id #,(quote-type ty)))))
-
-(define (tvariance-env-init-code)
-  (make-init-code
-    type-variance-env-map
-    (λ (id var) #`(register-type-variance! #'#,id (list #,@(map variance->binding var))))))
-
-(define (talias-env-init-code)
-  (make-init-code
-    type-alias-env-map
-    (λ (id ty) #`(register-resolved-type-alias #'#,id #,(quote-type ty)))))
-
-(define (env-init-code)
-  (make-init-code
-    type-env-map
-    (λ (id ty) #`(register-type #'#,id #,(quote-type ty)))))
-
-(define (mvar-env-init-code mvar-env)
-  (make-init-code
-    (λ (f) (dict-map mvar-env f))
-    (lambda (id v) (and v #`(register-mutated-var #'#,id)))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/lexical-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/lexical-env.rkt
deleted file mode 100644
index 329c765fb3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/lexical-env.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang racket/base
-
-;; this environment maps *lexical* variables to types
-;; it also contains the proposition environment
-
-;; these environments are unified in "Logical Types for Untyped Languages"
-;; but split here for performance
-
-(require "../utils/utils.rkt"
-         racket/keyword-transform racket/list
-         (for-syntax syntax/parse racket/base)
-         (contract-req)
-         (env type-env-structs global-env mvar-env)
-         (utils tc-utils)
-         (only-in (rep type-rep) Type/c)
-         (typecheck renamer)
-         (except-in (types utils abbrev kw-types) -> ->* one-of/c))
-
-(provide lexical-env with-lexical-env with-lexical-env/extend
-         update-type/lexical)
-(provide/cond-contract
- [lookup-type/lexical ((identifier?) (env? #:fail (or/c #f (-> any/c #f))) . ->* . (or/c Type/c #f))])
-
-;; the current lexical environment
-(define lexical-env (make-parameter empty-prop-env))
-
-;; run code in a new env
-(define-syntax-rule (with-lexical-env e . b)
-  (parameterize ([lexical-env e]) . b))
-
-;; run code in an extended env
-(define-syntax-rule (with-lexical-env/extend is ts . b)
-  (with-lexical-env (extend/values (lexical-env) is ts) . b))
-
-
-;; find the type of identifier i, looking first in the lexical env, then in the top-level env
-;; identifier -> Type
-(define (lookup-type/lexical i [env (lexical-env)] #:fail [fail #f])
-  (lookup env i (λ (i) (lookup-type i (λ () 
-                                        (cond 
-                                          [(syntax-property i 'constructor-for)
-                                           => (λ (prop)
-                                                (define orig (un-rename prop))
-                                                (define t (lookup-type/lexical orig env))
-                                                (register-type i t)
-                                                t)]
-                                          [(syntax-procedure-alias-property i) 
-                                           => (λ (prop)
-                                                (define orig (car (flatten prop)))
-                                                (define t (lookup-type/lexical orig env))
-                                                (register-type i t)
-                                                t)]
-                                          [(syntax-procedure-converted-arguments-property i)
-                                           => (λ (prop)
-                                                (define orig (car (flatten prop)))
-                                                (define pre-t
-                                                  (lookup-type/lexical orig env
-                                                    #:fail (lambda (i) (lookup-fail i) #f)))
-                                                (define t (if pre-t
-                                                              (kw-convert pre-t #f)
-                                                              Err))
-                                                (register-type i t)
-                                                t)]
-                                          [else ((or fail lookup-fail) i)]))))))
-
-
-;; refine the type of i in the lexical env
-;; (identifier type -> type) identifier -> environment
-;; a macro for inlining :(
-(define-syntax (update-type/lexical stx)
-  (syntax-parse stx
-    [(_ f i env)
-     #:declare f (expr/c #'(identifier? Type/c . -> . Type/c))
-     #:declare i (expr/c #'identifier?)
-     #:declare env (expr/c #'prop-env?)
-     ;; check if i is ever the target of a set!
-     ;; or is a top-level variable
-     #'(if (or (is-var-mutated? i)
-               (not (identifier-binding i)))
-           ;; if it is, we do nothing
-           env
-           ;; otherwise, refine the type
-           (parameterize
-               ([current-orig-stx i])
-             (let* ([v (lookup-type/lexical i env #:fail (lambda _ Univ))]
-                    [new-v (f i v)]
-                    [new-env (extend env i new-v)])
-               new-env)))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/mvar-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/mvar-env.rkt
deleted file mode 100644
index 03ccb027fb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/mvar-env.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-
-(require syntax/id-table racket/dict)
-
-(provide mvar-env register-mutated-var is-var-mutated?)
-
-(define mvar-env (make-free-id-table))
-
-(define (register-mutated-var id)
-  (dict-set! mvar-env id #t))
-
-(define (is-var-mutated? id)
-  (dict-ref mvar-env id #f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/row-constraint-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/row-constraint-env.rkt
deleted file mode 100644
index ca22c57278..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/row-constraint-env.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang racket/base
-
-;; This implements an environment that stores row
-;; variable constraints for row variables.
-;;
-;; Since row variables are represented as ordinary
-;; type variables, this additional environment is
-;; needed to keep track of the constraints.
-
-(require "../utils/utils.rkt")
-
-(provide initial-row-constraint-env
-         current-row-constraints
-         extend-row-constraints
-         has-row-constraints?
-         lookup-row-constraints)
-
-;; the initial row constraint environment - empty
-(define initial-row-constraint-env '())
-
-;; a parameter for the current type variables
-(define current-row-constraints
-  (make-parameter initial-row-constraint-env))
-
-;; extend-row-constraints
-;; takes a list of vars and a list of constraints
-;; and extends the environment
-(define-syntax-rule (extend-row-constraints vars constraints . body)
-  (parameterize ([current-row-constraints
-                  (extend/many (current-row-constraints)
-                               vars constraints)])
-    . body))
-
-;; has-row-constraints? : Symbol -> Boolean
-;; returns #t if the given variable is mapped to constraints
-(define (has-row-constraints? v)
-  (not (not (assq v (current-row-constraints)))))
-
-;; lookup-row-constraints : Symbol -> Type
-;; returns the mapped-to constraints or #f
-(define (lookup-row-constraints var)
-  (cdr (assq var (current-row-constraints))))
-
-;; extend : Env Symbol RowConstraint -> Env
-;; extend type environment with a var-constraints pair
-(define (extend env var constraints)
-  (cons (cons var constraints) env))
-
-;; extend/many : Env Listof<Symbol> Listof<RowConstraint> -> Env
-;; extend constraint environment for multiple variables
-(define (extend/many env vars constraints)
-  (for/fold ([env env])
-            ([var (in-list vars)]
-             [constraint (in-list constraints)])
-    (extend env var constraint)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/scoped-tvar-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/scoped-tvar-env.rkt
deleted file mode 100644
index 8a2b628f4b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/scoped-tvar-env.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-
-;; Maintain mapping of type variables introduced by literal Alls in type annotations.
-
-(require "../utils/utils.rkt"
-         (private syntax-properties)
-         syntax/parse
-         syntax/id-table
-         racket/match
-         racket/dict)
-
-(provide register-scoped-tvars lookup-scoped-tvars
-         add-scoped-tvars lookup-scoped-tvar-layer)
-
-;; tvar-stx-mapping: (hash/c syntax? (listof (listof identifier?)))
-(define tvar-stx-mapping (make-weak-hash))
-
-;; add-scoped-tvars: syntax? (or/c #f (listof identifier)) -> void?
-;; Annotate the given expression with the given identifiers if it is safe.
-;; If there are no identifiers, then nothing is done.
-;; Safe expressions are lambda, case-lambda, or the expansion of keyword and opt-lambda forms.
-(define (add-scoped-tvars stx vars)
-  (match vars
-    [(or #f (list)) (void)]
-    [else
-      (define (add-vars stx)
-        (hash-update! tvar-stx-mapping stx (lambda (old-vars) (cons vars old-vars)) null))
-      (let loop ((stx stx))
-        (syntax-parse stx
-          #:literal-sets (kernel-literals)
-          [(#%expression e) (loop #'e)]
-          [(~or (case-lambda formals . body) (#%plain-lambda formals . body))
-           (add-vars stx)]
-          [(~and (let-values ([(f) fun]) . body)
-                 (~or _:kw-lambda^ :opt-lambda^))
-           (add-vars #'fun)]
-          [e (void)]))]))
-
-;; lookup-scoped-tvar-layer: syntax? -> (listof (listof identifier?))
-;; Returns the identifiers associated with a given syntax object.
-;; There can be multiple sections of identifiers, which correspond to multiple poly types.
-(define (lookup-scoped-tvar-layer stx)
-  (hash-ref tvar-stx-mapping stx null))
-
-;; tvar-annotation? := (listof (listof (or/c (listof identifier?)
-;;                                           (list (listof identifier?) identifier?))))
-;; tvar-mapping: (free-id-table/c tvar-annotation?)
-;; Keeps track of type variables that should be introduced when type checking
-;; the definition for an identifier.
-(define tvar-mapping (make-free-id-table))
-
-;; lookup-scoped-tvars: identifier -> (or/c #f tvar-annotation?)
-;; Lookup an indentifier in the scoped tvar-mapping.
-(define (lookup-scoped-tvars id)
-  (dict-ref tvar-mapping id #f))
-
-;; Register type variables for an indentifier in the scoped tvar-mapping.
-;; register-scoped-tvars: identifier? tvar-annotation? -> void?
-(define (register-scoped-tvars id tvars)
-  (dict-set! tvar-mapping id tvars))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/tvar-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/tvar-env.rkt
deleted file mode 100644
index 5c612792ce..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/tvar-env.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang racket/base
-
-;; this implements the Delta environment from the TOPLAS paper
-;; (as well as every other paper on System F)
-
-;; this environment maps type variables names (symbols)
-;; to types representing the type variable
-;;
-;; The mapped-to type is used to distinguish type variables bound
-;; at different scopes
-
-(require "../utils/utils.rkt"
-         (rep type-rep)
-         racket/dict)
-
-(provide initial-tvar-env
-         current-tvars
-         extend-tvars
-         extend-tvars/new
-         bound-tvar?
-         lookup-tvar)
-
-;; the initial type variable environment - empty
-;; this is used in the parsing of types
-(define initial-tvar-env '())
-
-;; a parameter for the current type variables
-(define current-tvars (make-parameter initial-tvar-env))
-
-;; extend-tvars
-;; takes a list of vars and extends the current type variable
-;; environment
-(define-syntax-rule (extend-tvars vars . body)
-  (parameterize ([current-tvars (extend/many (current-tvars) vars)])
-    . body))
-
-;; extend-tvars/new
-;; extend with new type variables (provided by, e.g., Poly-fresh:)
-(define-syntax-rule (extend-tvars/new vars fresh-vars . body)
-  (parameterize ([current-tvars
-                  (extend/many (current-tvars) vars fresh-vars)])
-    . body))
-
-;; bound-tvar? : symbol -> boolean
-;; returns #t if the given type variable is bound
-(define (bound-tvar? v)
-  (dict-has-key? (current-tvars) v))
-
-;; lookup-tvar : symbol -> type
-;; returns the mapped-to type or #f
-(define (lookup-tvar var)
-  (dict-ref (current-tvars) var #f))
-
-;; extend : type-env symbol option<symbol> -> type-env
-;; extend type environment with a free type reference
-(define (extend env var [fresh-var #f])
-  (dict-set env var (make-F (or fresh-var var))))
-
-;; extend/many : type-env list<symbol> option<list<symbol>> -> type-env
-;; extend type environment for many symbols
-(define (extend/many env vars [fresh-vars #f])
-  (let ([fresh-vars (or fresh-vars (for/list ([_ (in-list vars)]) #f))])
-   (for/fold ([env env]) ([var (in-list vars)] [fresh-var (in-list fresh-vars)])
-     (extend env var fresh-var))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-alias-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-alias-env.rkt
deleted file mode 100644
index 19e73b2f4d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-alias-env.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-	 syntax/id-table racket/dict
-         (utils tc-utils)         
-         racket/match)
-
-(provide register-type-alias
-         lookup-type-alias
-         resolve-type-aliases
-         register-resolved-type-alias
-         type-alias-env-map)
-
-(define-struct alias-def () #:inspector #f)
-(define-struct (unresolved alias-def) (stx [in-process #:mutable]) #:inspector #f)
-(define-struct (resolved alias-def) (ty) #:inspector #f)
-
-;; a mapping from id -> alias-def (where id is the name of the type)
-(define the-mapping
-  (make-free-id-table))
-
-(define (mapping-put! id v) (free-id-table-set! the-mapping id v))
-
-;(trace mapping-put!)
-
-;; add a name to the mapping
-;; identifier type-stx -> void
-(define (register-type-alias id stx)
-  ;(printf "registering type ~a\n~a\n" (syntax-e id) id)
-  (mapping-put! id (make-unresolved stx #f)))
-
-(define (register-resolved-type-alias id ty)
-  (mapping-put! id (make-resolved ty)))
-
-(define (lookup-type-alias id parse-type [k (lambda () (tc-error "Unknown type alias: ~a" (syntax-e id)))])
-  (match (free-id-table-ref the-mapping id #f)
-    [#f (k)]
-    [(struct unresolved (stx #f))
-     (resolve-type-alias id parse-type)]
-    [(struct unresolved (stx #t))
-     (tc-error/stx stx "Recursive Type Alias Reference")]
-    [(struct resolved (t)) t]))
-
-(define (resolve-type-alias id parse-type)
-  (define v (free-id-table-ref the-mapping id))
-  (match v
-    [(struct unresolved (stx _))
-     (set-unresolved-in-process! v #t)
-     (let ([t (parse-type stx)])
-       (mapping-put! id (make-resolved t))
-       t)]
-    [(struct resolved (t))
-     t]))
-
-(define (resolve-type-aliases parse-type)
-  (for ([id (in-dict-keys the-mapping)])
-    (resolve-type-alias id parse-type)))
-
-;; map over the-mapping, producing a list
-;; (id type -> T) -> listof[T]
-(define (type-alias-env-map f)  
-  (for/list ([(id t) (in-dict the-mapping)]
-             #:when (resolved? t))
-    (f id (resolved-ty t))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-alias-helper.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-alias-helper.rkt
deleted file mode 100644
index aae1304e23..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-alias-helper.rkt
+++ /dev/null
@@ -1,245 +0,0 @@
-#lang racket/base
-
-;; This module provides helper functions for type aliases
-
-(require "../utils/utils.rkt"
-         (utils tarjan tc-utils)
-         (env type-alias-env type-name-env)
-         (rep type-rep)
-         (private parse-type)
-         (typecheck internal-forms)
-         (types resolve base-abbrev)
-         racket/dict
-         racket/list
-         racket/match
-         syntax/id-table
-         syntax/kerncase
-         (for-template
-          (typecheck internal-forms)
-          racket/base))
-
-(provide find-strongly-connected-type-aliases
-         check-type-alias-contractive
-         get-type-alias-info
-         register-all-type-aliases
-         parse-type-alias)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Data definitions for aliases
-;;
-;; A TypeAliasInfo is a (list Syntax (Listof Identifier))
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Dict<Id, (List Type Listof<Id>)> -> Listof<Listof<Id>>
-;; Find strongly connected type aliases in order to
-;; find mutually recursive aliases
-;;
-;; Returns the components in topologically sorted order
-(define (find-strongly-connected-type-aliases dep-map)
-  (define vertex-map (make-free-id-table))
-  (for ([(id adjacent) (in-dict dep-map)])
-    (free-id-table-set! vertex-map id (make-vertex id adjacent)))
-  (define components (tarjan vertex-map))
-  ;; extract the identifiers out of the results since we
-  ;; don't need the whole vertex
-  (for/list ([component (in-list components)])
-    (map vertex-data component)))
-
-;; check-type-alias-contractive : Id Type -> Void
-;;
-;; This function checks if the given type alias is
-;; "contractive" or "productive"
-;;   i.e., that you can unfold a good type like μx.int->x to
-;;         μx.int->int->int->...x but a type like
-;;         μx.x only unfolds to itself
-;;
-(define (check-type-alias-contractive id type)
-  (define/match (check type)
-    [((Union: elems)) (andmap check elems)]
-    [((Name/simple: name-id))
-     (and (not (free-identifier=? name-id id))
-          (check (resolve-once type)))]
-    [((App: rator rands stx))
-     (and (check rator) (check rands))]
-    [((Mu: _ body)) (check body)]
-    [((Poly: names body)) (check body)]
-    [((PolyDots: names body)) (check body)]
-    [((PolyRow: _ _ body)) (check body)]
-    [(_) #t])
-  (unless (check type)
-    (tc-error/fields
-     "parse error in type"
-     #:stx id
-     #:more "recursive types are not allowed directly inside their definition")))
-
-;; get-type-alias-info : Listof<Syntax> -> Listof<Id> Dict<Id, TypeAliasInfo>
-;;
-;; Given the syntaxes representing type alias definitions, return
-;; the information needed to register them later
-(define (get-type-alias-info type-aliases)
-  (for/lists (_1 _2) ([type-alias (in-list type-aliases)])
-    (define-values (id type-stx args) (parse-type-alias type-alias))
-    ;; Register type alias names with a dummy value so that it's in
-    ;; scope for the registration later.
-    ;;
-    ;; The `(make-Value (gensym))` expression is used to make sure
-    ;; that unions don't collapse the aliases too soon.
-    (register-resolved-type-alias id Err)
-    (register-type-name
-     id
-     (if args
-         (make-Poly (map syntax-e args) (make-Value (gensym)))
-         (make-Value (gensym))))
-    (values id (list id type-stx args))))
-
-;; register-all-type-aliases : Listof<Id> Dict<Id, TypeAliasInfo> -> Void
-;;
-;; Given parsed type aliases and a type alias map, do the work
-;; of actually registering the type aliases. If struct names or
-;; other definitions need to be registered, do that before calling
-;; this function.
-(define (register-all-type-aliases type-alias-names type-alias-map)
-  ;; Find type alias dependencies
-  ;; The two maps defined here contains the dependency structure
-  ;; of type aliases in two senses:
-  ;;   (1) other type aliases referenced in a type alias
-  ;;   (2) other type aliases referenced by some class in a
-  ;;       type alias in a #:implements clause
-  ;;
-  ;; The second is necessary in order to prevent recursive
-  ;; #:implements clauses and to determine the order in which
-  ;; recursive type aliases should be initialized.
-  (define-values (type-alias-dependency-map type-alias-class-map)
-    (for/lists (_1 _2)
-      ([(name alias-info) (in-dict type-alias-map)])
-      (define links-box (box null))
-      (define class-box (box null))
-      (define type
-        (parameterize ([current-type-alias-name name]
-                       [current-referenced-aliases links-box]
-                       [current-referenced-class-parents class-box])
-          (parse-type (car alias-info))))
-      (define pre-dependencies
-        (remove-duplicates (unbox links-box) free-identifier=?))
-      (define (filter-by-type-alias-names names)
-        (for/list ([id (in-list names)]
-                   #:when (memf (λ (id2) (free-identifier=? id id2))
-                                type-alias-names))
-          id))
-      (define alias-dependencies
-        (filter-by-type-alias-names pre-dependencies))
-      (define class-dependencies
-        (filter-by-type-alias-names (unbox class-box)))
-      (values (cons name alias-dependencies)
-              (cons name class-dependencies))))
-
-  (define components
-    (find-strongly-connected-type-aliases type-alias-dependency-map))
-
-  (define class-components
-    (find-strongly-connected-type-aliases type-alias-class-map))
-
-  ;; helper function for defining singletons
-  (define (has-self-cycle? component [map type-alias-dependency-map])
-    (define id (car component))
-    (memf (λ (id2) (free-identifier=? id id2))
-          (dict-ref map id)))
-
-  ;; A singleton component can be either a self-cycle or a node that
-  ;; that does not participate in cycles, so we disambiguate
-  (define-values (acyclic-singletons recursive-aliases)
-    (for/fold ([singletons '()] [other '()])
-              ([component (in-list components)])
-      (if (and (= (length component) 1)
-               (not (has-self-cycle? component)))
-          (values (cons (car component) singletons) other)
-          (values singletons (append component other)))))
-
-  ;; Check that no #:implements clauses are recursive
-  (define counterexample
-    (for/or ([component (in-list class-components)])
-      (and (or (not (= (length component) 1))
-               (has-self-cycle? component type-alias-class-map))
-           component)))
-  (when counterexample
-    (tc-error/stx
-     (car counterexample)
-     "Recursive #:implements clause not allowed"))
-
-  ;; Split recursive aliases into those involving classes
-  ;; (in reverse topological order) and the rest of the aliases
-  (define class-aliases
-    (for/list ([component (in-list (reverse class-components))]
-               #:when (member (car component)
-                              recursive-aliases
-                              free-identifier=?))
-      (car component)))
-  (define other-recursive-aliases
-    (for/list ([alias (in-list recursive-aliases)]
-               #:unless (member alias
-                                class-aliases
-                                free-identifier=?))
-      alias))
-
-  ;; Actually register recursive type aliases
-  (define name-types
-    (for/list ([id (in-list recursive-aliases)])
-      (define record (dict-ref type-alias-map id))
-      (match-define (list _ args) record)
-      (define name-type (make-Name id args #f))
-      (register-resolved-type-alias id name-type)
-      name-type))
-
-  ;; Register non-recursive type aliases
-  ;;
-  ;; Note that the connected component algorithm returns results
-  ;; in topologically sorted order, so we want to go through in the
-  ;; reverse order of that to avoid unbound type aliases.
-  (for ([id (in-list acyclic-singletons)])
-    (define type-stx (car (dict-ref type-alias-map id)))
-    (register-resolved-type-alias id (parse-type type-stx)))
-
-  ;; Clear the resolver cache of Name types from this block
-  (define (reset-resolver-cache!) (resolver-cache-remove! name-types))
-  (reset-resolver-cache!)
-
-  ;; Finish registering recursive aliases
-  ;; names-to-refine : Listof<Id>
-  ;; types-to-refine : Listof<Type>
-  ;; tvarss          : Listof<Listof<Symbol>>
-  (define-values (names-to-refine types-to-refine tvarss)
-    (for/lists (_1 _2 _3)
-      ([id (in-list (append other-recursive-aliases class-aliases))])
-      (define record (dict-ref type-alias-map id))
-      (match-define (list type-stx args) record)
-      (define type
-        ;; make sure to reject the type if it uses polymorphic
-        ;; recursion (see resolve.rkt)
-        (parameterize ([current-check-polymorphic-recursion args])
-          (parse-type type-stx)))
-      (reset-resolver-cache!)
-      (register-type-name id type)
-      (add-constant-variance! id args)
-      (check-type-alias-contractive id type)
-      (values id type args)))
-
-  ;; Finally, do a last pass to refine the variance
-  (refine-variance! names-to-refine types-to-refine tvarss))
-
-;; Syntax -> Syntax Syntax Syntax Option<Integer>
-;; Parse a type alias internal declaration
-(define (parse-type-alias form)
-  (kernel-syntax-case* form #f
-    (define-type-alias-internal values)
-    [(define-values ()
-       (begin (quote-syntax (define-type-alias-internal nm ty args))
-              (#%plain-app values)))
-     (values #'nm #'ty (syntax-e #'args))]
-    ;; this version is for `let`-like bodies
-    [(begin (quote-syntax (define-type-alias-internal nm ty args))
-            (#%plain-app values))
-     (values #'nm #'ty (syntax-e #'args))]
-    [_ (int-err "not define-type-alias")]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-env-structs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-env-structs.rkt
deleted file mode 100644
index 8990cb28cb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-env-structs.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         syntax/id-table
-         (except-in "../utils/utils.rkt" env)
-         (contract-req))
-
-(require-for-cond-contract (rep type-rep filter-rep))
-
-;; types is a free-id-table of identifiers to types
-;; props is a list of known propositions
-(define-struct/cond-contract env ([types immutable-free-id-table?] [props (listof Filter/c)])
-  #:transparent
-  #:property prop:custom-write
-  (lambda (e prt mode)
-    (fprintf prt "(env ~a ~a)" (free-id-table-map (env-types e) list) (env-props e))))
-
-(provide/cond-contract
-  [env? predicate/c]
-  [extend (env? identifier? Type/c . -> . env?)]
-  [extend/values (env? (listof identifier?) (listof Type/c) . -> . env?)]
-  [lookup (env? identifier? (identifier? . -> . any) . -> . any)]
-  [env-props (env? . -> . (listof Filter/c))]
-  [replace-props (env? (listof Filter/c) . -> . env?)]
-  [empty-prop-env env?])
-
-(define empty-prop-env
-  (env
-    (make-immutable-free-id-table)
-    null))
-
-
-(define (replace-props e props)
-  (match e
-    [(env tys _)
-     (env tys props)]))
-
-(define (lookup e key fail)
-  (match e
-    [(env tys _) (free-id-table-ref tys key (λ () (fail key)))]))
-
-
-;; extend that works on single arguments
-(define (extend e k v)
-  (extend/values e (list k) (list v)))
-
-;; takes two lists of identifiers and types to be added
-(define (extend/values e ks vs)
-  (match e
-    [(env tys p)
-     (env
-       (for/fold ([tys tys]) ([k (in-list ks)] [v (in-list vs)])
-         (free-id-table-set tys k v))
-       p)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-name-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-name-env.rkt
deleted file mode 100644
index 3b6682a24b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-name-env.rkt
+++ /dev/null
@@ -1,103 +0,0 @@
-#lang racket/base
-
-;; Environment for type names
-
-(require "../utils/utils.rkt")
-
-(require syntax/id-table
-         (env type-alias-env)
-         (utils tc-utils)
-         (rep type-rep free-variance)
-         (types utils))
-
-(provide register-type-name
-         lookup-type-name
-         register-type-names
-         add-alias
-         type-name-env-map
-
-         register-type-variance!
-         lookup-type-variance
-         type-variance-env-map
-         add-constant-variance!
-         refine-variance!)
-
-;; a mapping from id -> type (where id is the name of the type)
-(define the-mapping
-  (make-free-id-table))
-
-;; add a name to the mapping
-;; identifier Type -> void
-(define (register-type-name id [type #t])
-  (free-id-table-set! the-mapping id type))
-
-;; add a bunch of names to the mapping
-;; listof[identifier] listof[type] -> void
-(define (register-type-names ids types)
-  (for-each register-type-name ids types))
-
-;; given an identifier, return the type associated with it
-;; optional argument is failure continuation - default calls lookup-fail
-;; identifier (-> error) -> type
-(define (lookup-type-name id [k (lambda () (lookup-type-fail id))])
-  (begin0
-    (free-id-table-ref the-mapping id k)
-    (add-disappeared-use id)))
-
-
-;; map over the-mapping, producing a list
-;; (id type -> T) -> listof[T]
-(define (type-name-env-map f)
-  (free-id-table-map the-mapping f))
-
-(define (add-alias from to)
-  (when (lookup-type-name to (lambda () #f))
-    (register-resolved-type-alias
-     from
-     (make-Name to #f #t))))
-
-
-;; a mapping from id -> listof[Variance] (where id is the name of the type)
-(define variance-mapping
-  (make-free-id-table))
-
-;; add a name to the mapping
-;; identifier Type -> void
-(define (register-type-variance! id variance)
-  (free-id-table-set! variance-mapping id variance))
-
-(define (lookup-type-variance id)
-  (free-id-table-ref
-   variance-mapping id
-   (lambda () (lookup-variance-fail id))))
-
-;; map over the-mapping, producing a list
-;; (id variance -> T) -> listof[T]
-(define (type-variance-env-map f)
-  (free-id-table-map variance-mapping f))
-
-;; Listof<Type> Listof<Option<Listof<Type-Var>>> -> Void
-;; Refines the variance of a type in the name environment
-(define (refine-variance! names types tvarss)
-  (let loop ()
-    (define sames?
-      (for/and ([name (in-list names)]
-                [type (in-list types)]
-                [tvars (in-list tvarss)])
-        (cond
-          [(or (not tvars) (null? tvars)) #t]
-          [else
-            (define free-vars (free-vars-hash (free-vars* type)))
-            (define variance (map (λ (v) (hash-ref free-vars v Constant)) tvars))
-            (define old-variance (lookup-type-variance name))
-
-            (register-type-variance! name variance)
-            (equal? variance old-variance)])))
-    (unless sames? (loop))))
-
-;; Id Option<Listof<Type-Var>> -> Void
-;; Initialize variance of the given id to Constant for all type vars
-(define (add-constant-variance! name vars)
-  (unless (or (not vars) (null? vars))
-    (register-type-variance! name (map (lambda (_) Constant) vars))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraint-structs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraint-structs.rkt
deleted file mode 100644
index 400968edbf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraint-structs.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt" (contract-req))
-
-(require-for-cond-contract (rep type-rep))
-
-;; S, T types
-;; represents S <: X <: T (see "Local Type Inference" pg. 12)
-(define-struct/cond-contract c ([S Type/c] [T Type/c]) #:transparent)
-
-;; fixed : Listof[c]
-;; rest : option[c]
-;; a constraint on an index variable
-;; the index variable must be instantiated with |fixed| arguments, each meeting the appropriate constraint
-;; and further instantions of the index variable must respect the rest constraint, if it exists
-(define-struct/cond-contract dcon ([fixed (listof c?)] [rest (or/c c? #f)]) #:transparent)
-
-;; fixed : Listof[c]
-;; rest : c
-(define-struct/cond-contract dcon-exact ([fixed (listof c?)] [rest c?]) #:transparent)
-
-;; fixed : Listof[c]
-;; type : c
-;; bound : var
-(define-struct/cond-contract dcon-dotted ([fixed (listof c?)] [type c?] [bound symbol?]) #:transparent)
-
-(define-for-cond-contract dcon/c (or/c dcon? dcon-exact? dcon-dotted?))
-
-;; map : hash mapping index variables to dcons
-(define-struct/cond-contract dmap ([map (hash/c symbol? dcon/c)]) #:transparent)
-
-;; maps is a list of pairs of
-;;    - functional maps from vars to c's
-;;    - dmaps (see dmap.rkt)
-;; we need a bunch of mappings for each cset to handle case-lambda
-;; because case-lambda can generate multiple possible solutions, and we
-;; don't want to rule them out too early
-(define-struct/cond-contract cset ([maps (listof (cons/c (hash/c symbol? c? #:immutable #t) dmap?))]) #:transparent)
-
-(provide-for-cond-contract dcon/c)
-(provide
-  (struct-out cset)
-  (struct-out dmap)
-  (struct-out dcon)
-  (struct-out dcon-dotted)
-  (struct-out dcon-exact)
-  (struct-out c))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraints.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraints.rkt
deleted file mode 100644
index 939207c187..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraints.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang racket/unit
-
-(require "../utils/utils.rkt"
-	 (types abbrev union subtype)
-	 unstable/sequence
-         "fail.rkt" "signatures.rkt" "constraint-structs.rkt"
-         racket/match
-         racket/list)
-
-(import restrict^ dmap^)
-(export constraints^)
-
-;; Widest constraint possible
-(define no-constraint (make-c (Un) Univ))
-
-;; Create an empty constraint map from a set of type variables X and
-;; index variables Y.  For now, we add the widest constraints for
-;; variables in X to the cmap and create an empty dmap.
-(define (empty-cset X Y)
-  (make-cset (list (cons (for/hash ([x (in-list X)])
-                           (values x no-constraint))
-                         (make-dmap (make-immutable-hash null))))))
-
-
-;; add the constraints S <: var <: T to every map in cs
-(define (insert cs var S T)
-  (match cs
-    [(struct cset (maps))
-     (make-cset (for/list ([(map dmap) (in-pairs maps)])
-                  (cons (hash-set map var (make-c S T))
-                        dmap)))]))
-
-;; meet: Type Type -> Type
-;; intersect the given types. produces a lower bound on both, but
-;; perhaps not the GLB
-(define (meet S T)
-  (let ([s* (restrict S T)])
-    (if (and (subtype s* S)
-             (subtype s* T))
-        s*
-        (Un))))
-
-;; join: Type Type -> Type
-;; union the given types
-(define (join T U) (Un T U))
-
-
-;; meet of two variable constraints
-;; never fails
-;; if var is provided, the resulting constraint uses it, otherwise it
-;; uses the variable from `c1` (which must be the same as the one from
-;; `c2`)
-(define (c-meet c1 c2 [var #f])
-  (match*/early (c1 c2)
-    [((struct c (S T)) (struct c (S* T*)))
-     (let ([S (join S S*)] [T (meet T T*)])
-       (and (subtype S T)
-            (make-c S T)))]))
-
-;; compute the meet of two constraint sets
-;; returns #f for failure
-(define cset-meet
-  (case-lambda
-    [() (empty-cset null null)]
-    [(x) x]
-    [(x y)
-     (match* (x y)
-      [((struct cset (maps1)) (struct cset (maps2)))
-       (define maps (for*/list ([(map1 dmap1) (in-pairs (remove-duplicates maps1))]
-                                [(map2 dmap2) (in-pairs (remove-duplicates maps2))]
-                                [v (in-value (% cons
-                                                (hash-union/fail map1 map2 #:combine c-meet)
-                                                (dmap-meet dmap1 dmap2)))]
-                                #:when v)
-                      v))
-       (cond [(null? maps)
-              #f]
-             [else (make-cset maps)])])]
-    [(x . ys)
-     (for/fold ([x x]) ([y (in-list ys)])
-       (% cset-meet x y))]))
-
-;; combines a list of csets using cset-meet individually
-;; returns #f for failure
-(define (cset-meet* args)
-  (apply cset-meet args))
-
-;; produces a cset of all of the maps in all of the given csets
-;; FIXME: should this call `remove-duplicates`?
-(define (cset-join l)
-  (let ([mapss (map cset-maps l)])
-    (make-cset (apply append mapss))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/dmap.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/dmap.rkt
deleted file mode 100644
index 3f2001e650..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/dmap.rkt
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang racket/unit
-
-(require "../utils/utils.rkt" "fail.rkt"
-         "signatures.rkt" "constraint-structs.rkt"
-         (utils tc-utils) 
-         (contract-req)
-         unstable/sequence)
-
-(import constraints^)
-(export dmap^)
-
-
-;; dcon-meet : dcon dcon -> dcon or #f
-(define/cond-contract (dcon-meet dc1 dc2)
-  (dcon/c dcon/c . -> . (or/c #f dcon/c))
-  (match*/early (dc1 dc2)
-    [((struct dcon-exact (fixed1 rest1)) (or (struct dcon (fixed2 rest2))
-                                             (struct dcon-exact (fixed2 rest2))))
-     #:return-unless (and rest2 (= (length fixed1) (length fixed2)))
-     #f
-     (% make-dcon-exact
-        (for/list/fail ([c1 (in-list fixed1)]
-                        [c2 (in-list fixed2)])
-           (c-meet c1 c2))
-        (c-meet rest1 rest2))]
-    ;; redo in the other order to call the previous case
-    [((struct dcon (fixed1 rest1)) (struct dcon-exact (fixed2 rest2)))
-     (dcon-meet dc2 dc1)]
-    [((struct dcon (fixed1 #f)) (struct dcon (fixed2 #f)))
-     #:return-unless (= (length fixed1) (length fixed2))
-     #f
-     (%1 make-dcon
-         (for/list/fail ([c1 (in-list fixed1)]
-                         [c2 (in-list fixed2)])
-           (c-meet c1 c2))
-         #f)]
-    [((struct dcon (fixed1 #f)) (struct dcon (fixed2 rest)))
-     #:return-unless (>= (length fixed1) (length fixed2))
-     #f
-     (%1 make-dcon
-      (for/list/fail ([c1 (in-list fixed1)]
-                      [c2 (in-sequence-forever fixed2 rest)])
-        (c-meet c1 c2))
-      #f)]
-    ;; redo in the other order to call the previous case
-    [((struct dcon (fixed1 rest)) (struct dcon (fixed2 #f)))
-     (dcon-meet dc2 dc1)]
-    [((struct dcon (fixed1 rest1)) (struct dcon (fixed2 rest2)))
-     (let-values ([(shorter longer srest lrest)
-                   (if (< (length fixed1) (length fixed2))
-                       (values fixed1 fixed2 rest1 rest2)
-                       (values fixed2 fixed1 rest2 rest1))])
-       (% make-dcon
-        (for/list/fail ([c1 (in-list longer)]
-                   [c2 (in-sequence-forever shorter srest)])
-          (c-meet c1 c2))
-        (c-meet lrest srest)))]
-    [((struct dcon-dotted (fixed1 c1 bound1)) (struct dcon-dotted (fixed2 c2 bound2)))
-     #:return-unless (and (= (length fixed1) (length fixed2))
-                          (eq? bound1 bound2))
-     #f
-     (% make-dcon-dotted (for/list/fail ([c1 (in-list fixed1)] [c2 (in-list fixed2)])
-                           (c-meet c1 c2))
-                       (c-meet c1 c2) bound1)]
-    [((struct dcon _) (struct dcon-dotted _))
-     #f]
-    [((struct dcon-dotted _) (struct dcon _))
-     #f]
-    [(_ _) (int-err "Got non-dcons: ~a ~a" dc1 dc2)]))
-
-;; dmap dmap -> dmap or #f
-(define (dmap-meet dm1 dm2)
-  (% make-dmap
-   (hash-union/fail (dmap-map dm1) (dmap-map dm2) #:combine dcon-meet)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/fail.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/fail.rkt
deleted file mode 100644
index 13544ac768..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/fail.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket/base
-(provide (all-defined-out) early-return)
-(require (for-syntax racket/base syntax/parse racket/syntax) "../utils/early-return.rkt"
-         racket/match)
-
-;; like `match*`, but with `early-return` around the rhss
-(define-syntax (match*/early stx)
-  (define-syntax-class rhs
-    (pattern (#:when e rhs ...)
-             #:with r
-             #'(#:when e (early-return rhs ...)))
-    (pattern (rhs ...)
-             #:with r
-             #'((early-return rhs ...))))
- (syntax-parse stx
-  [(_ e [c . r:rhs] ...)
-   #'(match* e [c . r.r] ...)]))
-
-(begin-for-syntax
-  (define-splicing-syntax-class arg
-    #:attributes (v name (arg 1))
-    (pattern v:expr
-      #:with name (generate-temporary #'v)
-      #:with (arg ...) #'(name))
-    (pattern (~seq kw:keyword v:expr)
-      #:with name (generate-temporary #'v)
-      #:with (arg ...) #'(kw name))))
-
-
-;; (% f e ...) == (and e ... (f e ...)) but without repeated evaluation
-(define-syntax (% stx)
-  (syntax-parse stx
-    [(_ f e:arg ...)
-     #'(let/fail ([e.name e.v] ...)
-         (f e.arg ... ...))]))
-
-;; (%1 f e0 e ...) == (and e0 (f e0 e ...)) but without repeated evaluation
-(define-syntax (%1 stx)
-  (syntax-parse stx
-    [(_ f e0:arg e:arg ...)
-     #'(let/fail ([e0.name e0.v])
-         (let ([e.name e.v] ...)
-           (f e0.arg ... e.arg ... ...)))]))
-
-;; like `let`, but if any bindings are #f, the whole expression produces #f
-(define-syntax (let/fail stx)
-  (syntax-parse stx
-    [(let/fail () e ...) #'(let () e ...)]
-    [(let/fail ([x rhs ...] . rest) body ...)
-     #'(let ([x rhs ...])
-         (and x
-              (let/fail rest body ...)))]))
-
-;; (for/list/fail e ...) == (and (andmap values (for/list e ...)) (for/list e ...)
-;; but without wasted work
-(define-syntax-rule (for/list/fail (cl ...) body ...)
-  (% reverse
-     (for/fold ([result null]) (cl ... #:break (not result))
-       (let ([e (let () body ...)])
-         (and e (cons e result))))))
-
-;; like hash-union, but if combine ever produces #f, the overall result is #f
-(define (hash-union/fail #:combine combine one two)
-  (for/fold ([one one]) ([(k v) (in-hash two)] #:break (not one))
-    (define d (if (hash-has-key? one k)
-                  (combine (hash-ref one k) v)
-                  v))
-    (and d (hash-set one k d))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer-unit.rkt
deleted file mode 100644
index c24dc3db42..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer-unit.rkt
+++ /dev/null
@@ -1,870 +0,0 @@
-#lang racket/unit
-
-;; This is the main file that defines local type inference in TR
-;;
-;; The algorithm is based on
-;;   "Local Type Inference" by Pierce and Turner
-;;   ACM TOPLAS, Vol. 22, No. 1, January 2000.
-;;
-
-(require "../utils/utils.rkt"
-         (except-in
-          (combine-in
-           (utils tc-utils)
-           (rep free-variance type-rep filter-rep object-rep rep-utils)
-           (types utils abbrev numeric-tower union subtype resolve
-                  substitute generalize)
-           (env index-env tvar-env))
-          make-env -> ->* one-of/c)
-         "constraint-structs.rkt"
-         "signatures.rkt" "fail.rkt"
-         "promote-demote.rkt"
-         racket/match
-         mzlib/etc
-         (contract-req)
-         (for-syntax
-           racket/base
-           syntax/parse)
-         unstable/sequence unstable/list unstable/hash
-         racket/list)
-
-(import dmap^ constraints^)
-(export infer^)
-
-;; For more data definitions, see "constraint-structs.rkt"
-;;
-;; A Seen is a set represented by a list of Pair<Seq, Seq>
-(define (empty-set) '())
-
-(define current-seen (make-parameter (empty-set)))
-
-;; Type Type -> Pair<Seq, Seq>
-;; construct a pair for the set of seen type pairs
-(define (seen-before s t)
-  (cons (Type-seq s) (Type-seq t)))
-
-;; Context, contains which type variables and indices to infer and which cannot be mentioned in
-;; constraints.
-(define-struct/cond-contract context
-  ([bounds (listof symbol?)]
-   [vars (listof symbol?)]
-   [indices (listof symbol?)]) #:transparent)
-
-(define (context-add-vars ctx vars)
-  (match ctx
-    [(context V X Y)
-     (context V (append vars X) Y)]))
-
-(define (context-add-var ctx var)
-  (match ctx
-    [(context V X Y)
-     (context V (cons var X) Y)]))
-
-(define (context-add ctx #:bounds [bounds empty] #:vars [vars empty] #:indices [indices empty])
-  (match ctx
-    [(context V X Y)
-     (context (append bounds V) (append vars X) (append indices Y))]))
-
-(define (inferable-index? ctx bound)
-  (match ctx
-    [(context _ _ Y)
-     (memq bound Y)]))
-
-(define ((inferable-var? ctx) var)
-  (match ctx
-    [(context _ X _)
-     (memq var X)]))
-
-(define (empty-cset/context ctx)
-  (match ctx
-    [(context _ X Y)
-     (empty-cset X Y)]))
-
-
-
-
-;; Type Type Seen -> Seen
-;; Add the type pair to the set of seen type pairs
-(define/cond-contract (remember s t A)
-  ((or/c AnyValues? Values/c ValuesDots?) (or/c AnyValues? Values/c ValuesDots?)
-   (listof (cons/c exact-nonnegative-integer?
-                   exact-nonnegative-integer?))
-   . -> .
-   (listof (cons/c exact-nonnegative-integer?
-                   exact-nonnegative-integer?)))
- (cons (seen-before s t) A))
-
-;; Type Type -> Boolean
-;; Check if a given type pair have been seen before
-(define/cond-contract (seen? s t cs)
-  ((or/c AnyValues? Values/c ValuesDots?) (or/c AnyValues? Values/c ValuesDots?)
-   (listof (cons/c exact-nonnegative-integer?
-                   exact-nonnegative-integer?))
-   . -> . any/c)
- (member (seen-before s t) cs))
-
-;; (CMap DMap -> Pair<CMap, DMap>) CSet -> CSet
-;; Map a function over a constraint set
-(define (map/cset f cset)
-  (% make-cset (for/list/fail ([(cmap dmap) (in-pairs (cset-maps cset))])
-                 (f cmap dmap))))
-
-;; Symbol DCon -> DMap
-;; Construct a dmap containing only a single mapping
-(define (singleton-dmap dbound dcon)
-  (make-dmap (make-immutable-hash (list (cons dbound dcon)))))
-
-;; Hash<K, V> Listof<K> -> Hash<K, V>
-;; Remove all provided keys from the hash table
-(define (hash-remove* hash keys)
-  (for/fold ([h hash]) ([k (in-list keys)]) (hash-remove h k)))
-
-(define (mover cset dbound vars f)
-  (map/cset
-   (lambda (cmap dmap)
-     (when (hash-has-key? (dmap-map dmap) dbound)
-       (int-err "Tried to move vars to dbound that already exists"))
-     (% cons
-        (hash-remove* cmap (cons dbound vars))
-        (dmap-meet
-         (singleton-dmap
-          dbound
-          (f cmap))
-         dmap)))
-   cset))
-
-;; dbound : index variable
-;; vars : listof[type variable] - temporary variables
-;; cset : the constraints being manipulated
-;; takes the constraints on vars and creates a dmap entry constraining dbound to be |vars|
-;; with the constraints that cset places on vars
-(define/cond-contract (move-vars-to-dmap cset dbound vars)
-  (cset? symbol? (listof symbol?) . -> . cset?)
-  (mover cset dbound vars
-         (λ (cmap)
-           (make-dcon (for/list ([v (in-list vars)])
-                        (hash-ref cmap v
-                                  (λ () (int-err "No constraint for new var ~a" v))))
-                      #f))))
-
-;; cset : the constraints being manipulated
-;; var : index variable being inferred
-;; dbound : constraining index variable
-;;
-(define/cond-contract (move-dotted-rest-to-dmap cset var dbound)
-  (cset? symbol? symbol? . -> . cset?)
-  (mover cset var null
-         (λ (cmap)
-           (make-dcon-dotted
-            null
-            (hash-ref cmap var
-                      (λ () (int-err "No constraint for bound ~a" var)))
-            dbound))))
-
-;; cset : the constraints being manipulated
-;; vars : the variables that are the prefix of the dbound
-;; dbound : index variable
-(define/cond-contract (move-vars+rest-to-dmap cset vars dbound #:exact [exact? #f])
-  ((cset? (listof symbol?) symbol?) (#:exact boolean?) . ->* . cset?)
-  (mover cset dbound vars
-         (λ (cmap)
-           ((if exact? make-dcon-exact make-dcon)
-            (for/list ([v (in-list vars)])
-              (hash-ref cmap v no-constraint))
-            (hash-ref cmap dbound (λ () (int-err "No constraint for bound ~a" dbound)))))))
-
-;; Represents a sequence of types. types are the fixed prefix, and end is the remaining types
-;; This is a unification of all of the dotted types that exist ListDots, ->..., and ValuesDots.
-;; This allows for one implementation of the cgen algorithm for dotted types to be shared across all
-;; of them.
-(struct seq (types end) #:transparent)
-(struct null-end () #:transparent)
-(struct uniform-end (type) #:transparent)
-(struct dotted-end (type bound) #:transparent)
-
-(define (Values->seq v)
-  (match v
-    [(Values: ts) (seq ts (null-end))]
-    [(ValuesDots: ts dty dbound) (seq ts (dotted-end (-result dty) dbound))]
-    [_ #f]))
-
-
-(define (List->end v)
-  (match v
-    [(== -Null type-equal?) (null-end)]
-    [(Listof: t) (uniform-end t)]
-    [(ListDots: t dbound) (dotted-end t dbound)]
-    [_ #f]))
-
-(define (List->seq v)
-  (match v
-    [(List: ts #:tail (app List->end end)) (and end (seq ts end))]))
-
-
-(define-match-expander ValuesSeq:
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ seq) #'(app Values->seq (? values seq))])))
-
-(define-match-expander ListSeq:
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ seq) #'(app List->seq (? values seq))])))
-
-
-;; generate-dbound-prefix: Symbol Type/c Natural Symbol -> (Values (Listof Symbol) (Listof Type/c))
-;; Substitutes n fresh new variables, replaces dotted occurences of v in t with the variables (and
-;; maybe new-end), and then for each variable substitutes it in for regular occurences of v.
-(define (generate-dbound-prefix v ty n new-end)
-  (define vars (build-list n (lambda (x) (gensym v))))
-  (define ty* (substitute-dots (map make-F vars) (and new-end (make-F new-end)) v ty))
-  (values
-    vars
-    (for/list ([var (in-list vars)])
-      (substitute (make-F var) v ty*))))
-
-
-(define/cond-contract (cgen/filter context s t)
-  (context? Filter? Filter? . -> . (or/c #f cset?))
-  (match* (s t)
-    [(e e) (empty-cset/context context)]
-    [(e (Top:)) (empty-cset/context context)]
-    ;; FIXME - is there something to be said about the logical ones?
-    [((TypeFilter: s p) (TypeFilter: t p)) (cgen/inv context s t)]
-    [((NotTypeFilter: s p) (NotTypeFilter: t p)) (cgen/inv context s t)]
-    [(_ _) #f]))
-
-;; s and t must be *latent* filter sets
-(define/cond-contract (cgen/filter-set context s t)
-  (context? FilterSet? FilterSet? . -> . (or/c #f cset?))
-  (match* (s t)
-    [(e e) (empty-cset/context context)]
-    [((FilterSet: s+ s-) (FilterSet: t+ t-))
-     (% cset-meet (cgen/filter context s+ t+) (cgen/filter context s- t-))]
-    [(_ _) #f]))
-
-(define/cond-contract (cgen/object context s t)
-  (context? Object? Object? . -> . (or/c #f cset?))
-  (match* (s t)
-    [(e e) (empty-cset/context context)]
-    [(e (Empty:)) (empty-cset/context context)]
-    ;; FIXME - do something here
-    [(_ _) #f]))
-
-(define/cond-contract (cgen/seq context s-seq t-seq)
-  (context? seq? seq? . -> . (or/c #f cset?))
-  (match*/early (s-seq t-seq)
-    ;; The simplest case - both are null-end
-    [((seq ss (null-end))
-      (seq ts (null-end)))
-      (cgen/list context ss ts)]
-    ;; One is null-end the other is uniform-end
-    [((seq ss (null-end))
-      (seq ts (uniform-end t-rest)))
-     (cgen/list context ss (extend ss ts t-rest))]
-    [((seq ss (uniform-end s-rest))
-      (seq ts (null-end)))
-     #f]
-    ;; Both are uniform-end
-    [((seq ss (uniform-end s-rest))
-      (seq ts (uniform-end t-rest)))
-     (cgen/list context
-                (cons s-rest ss)
-                (cons t-rest (extend ss ts t-rest)))]
-    ;; dotted below, nothing above
-    [((seq ss (dotted-end dty dbound))
-      (seq ts (null-end)))
-     #:return-unless (inferable-index? context dbound)
-     #f
-     #:return-unless (<= (length ss) (length ts))
-     #f
-     (define-values (vars new-tys) (generate-dbound-prefix dbound dty (- (length ts) (length ss)) #f))
-     (define-values (ts-front ts-back) (split-at ts (length ss)))
-     (% cset-meet
-        (cgen/list context ss ts-front)
-        (% move-vars-to-dmap (cgen/list (context-add context #:vars vars) new-tys ts-back) dbound vars))]
-    ;; dotted above, nothing below
-    [((seq ss (null-end))
-      (seq ts (dotted-end dty dbound)))
-     #:return-unless (inferable-index? context dbound)
-     #f
-     #:return-unless (<= (length ts) (length ss))
-     #f
-     (define-values (vars new-tys) (generate-dbound-prefix dbound dty (- (length ss) (length ts)) #f))
-     (define-values (ss-front ss-back) (split-at ss (length ts)))
-     (% cset-meet
-        (cgen/list context ss-front ts)
-        (% move-vars-to-dmap (cgen/list (context-add-vars context vars) ss-back new-tys) dbound vars))]
-
-    ;; same dotted bound
-    [((seq ss (dotted-end s-dty dbound))
-      (seq ts (dotted-end t-dty dbound)))
-     #:return-unless (= (length ss) (length ts))
-     #f
-     (% cset-meet
-        (cgen/list context ss ts)
-        (if (inferable-index? context dbound)
-            (extend-tvars (list dbound)
-              (% move-vars+rest-to-dmap (cgen (context-add-var context dbound) s-dty t-dty) null dbound))
-            (cgen context s-dty t-dty)))]
-
-    ;; bounds are different
-    [((seq ss (dotted-end s-dty dbound))
-      (seq ts (dotted-end t-dty dbound*)))
-     #:when (inferable-index? context dbound)
-     #:return-unless (= (length ss) (length ts)) #f
-     #:return-when (inferable-index? context dbound*) #f
-     (% cset-meet
-        (cgen/list context ss ts)
-        (extend-tvars (list dbound*)
-          (% move-dotted-rest-to-dmap (cgen (context-add-var context dbound) s-dty t-dty) dbound dbound*)))]
-    [((seq ss (dotted-end s-dty dbound))
-      (seq ts (dotted-end t-dty dbound*)))
-     #:when (inferable-index? context dbound*)
-     #:return-unless (= (length ss) (length ts)) #f
-     (% cset-meet
-        (cgen/list context ss ts)
-        (extend-tvars (list dbound)
-          (% move-dotted-rest-to-dmap (cgen (context-add-var context dbound*) s-dty t-dty) dbound* dbound)))]
-
-    ;; * <: ...
-    [((seq ss (uniform-end s-rest))
-      (seq ts (dotted-end t-dty dbound)))
-     #:return-unless (inferable-index? context dbound)
-     #f
-     #:return-unless (<= (length ts) (length ss))
-     #f
-     (define new-bound (gensym dbound))
-     (define-values (vars new-tys) (generate-dbound-prefix dbound t-dty (- (length ss) (length ts))
-                                                           new-bound))
-     (define-values (ss-front ss-back) (split-at ss (length ts)))
-     (% cset-meet
-        (cgen/list context ss-front ts)
-        (% move-vars+rest-to-dmap
-           (% cset-meet
-              (cgen/list (context-add context #:bounds (list new-bound) #:vars vars #:indices (list new-bound))
-                         ss-back new-tys)
-              (cgen (context-add-var context dbound) s-rest t-dty))
-           vars dbound #:exact #t))]
-
-    [((seq ss (dotted-end s-dty dbound))
-      (seq ts (uniform-end t-rest)))
-     (cond
-       [(inferable-index? context dbound)
-        (define new-bound (gensym dbound))
-        (define length-delta (- (length ts) (length ss)))
-        (define-values (vars new-tys)
-          (generate-dbound-prefix dbound s-dty (max 0 length-delta) new-bound))
-        (% cset-meet
-           (cgen/list context ss (if (positive? length-delta)
-                                     (drop-right ts length-delta)
-                                     (extend ss ts t-rest)))
-           (% move-vars+rest-to-dmap
-              (% cset-meet
-                 (cgen/list (context-add context #:bounds (list new-bound) #:vars vars #:indices (list new-bound))
-                            new-tys (take-right ts (max 0 length-delta)))
-                 (cgen (context-add-var context dbound) s-dty t-rest))
-              vars dbound))]
-       [else
-        (extend-tvars (list dbound)
-          (cgen/seq (context-add context #:bounds (list dbound)) (seq ss (uniform-end s-dty)) t-seq))])]))
-
-(define/cond-contract (cgen/arr context s-arr t-arr)
-  (context? arr? arr? . -> . (or/c #f cset?))
-
-  (match* (s-arr t-arr)
-    [((arr: ss s s-rest s-drest s-kws) (arr: ts t t-rest t-drest t-kws))
-     (define (rest->end rest drest)
-       (cond
-         [rest (uniform-end rest)]
-         [drest (dotted-end (car drest) (cdr drest))]
-         [else (null-end)]))
-
-     (define s-seq (seq ss (rest->end s-rest s-drest)))
-     (define t-seq (seq ts (rest->end t-rest t-drest)))
-     (and (null? s-kws)
-          (null? t-kws)
-          (% cset-meet
-           (cgen context s t)
-           (cgen/seq context t-seq s-seq)))]))
-
-(define/cond-contract (cgen/flds context flds-s flds-t)
-  (context? (listof fld?) (listof fld?)  . -> . (or/c #f cset?))
-  (% cset-meet*
-   (for/list/fail ([s (in-list flds-s)] [t (in-list flds-t)])
-     (match* (s t)
-       ;; mutable - invariant
-       [((fld: s _ #t) (fld: t _ #t)) (cgen/inv context s t)]
-       ;; immutable - covariant
-       [((fld: s _ #f) (fld: t _ #f)) (cgen context s t)]))))
-
-(define (cgen/inv context s t)
-  (% cset-meet (cgen context s t) (cgen context t s)))
-
-
-;; context : the context of what to infer/not infer
-;; S : a type to be the subtype of T
-;; T : a type
-;; produces a cset which determines a substitution that makes S a subtype of T
-;; implements the V |-_X S <: T => C judgment from Pierce+Turner, extended with
-;; the index variables from the TOPLAS paper
-(define/cond-contract (cgen context S T)
-  (context? (or/c Values/c ValuesDots? AnyValues?) (or/c Values/c ValuesDots? AnyValues?)
-   . -> . (or/c #F cset?))
-  ;; useful quick loop
-  (define/cond-contract (cg S T)
-   (Type/c Type/c . -> . (or/c #f cset?))
-   (cgen context S T))
-  (define/cond-contract (cg/inv S T)
-   (Type/c Type/c . -> . (or/c #f cset?))
-   (cgen/inv context S T))
-  ;; this places no constraints on any variables
-  (define empty (empty-cset/context context))
-  ;; this constrains just x (which is a single var)
-  (define (singleton S x T)
-    (insert empty x S T))
-  ;; FIXME -- figure out how to use parameters less here
-  ;;          subtyping doesn't need to use it quite as much
-  (define cs (current-seen))
-  ;; if we've been around this loop before, we're done (for rec types)
-  (if (seen? S T cs)
-      empty
-      (parameterize (;; remember S and T, and obtain everything we've seen from the context
-                     ;; we can't make this an argument since we may call back and forth with
-                     ;; subtyping, for example
-                     [current-seen (remember S T cs)])
-        (match*/early (S T)
-          ;; if they're equal, no constraints are necessary (CG-Refl)
-          [(a b) #:when (type-equal? a b) empty]
-          ;; CG-Top
-          [(_ (Univ:)) empty]
-          ;; AnyValues
-          [((AnyValues: s-f) (AnyValues: t-f))
-           (cgen/filter context s-f t-f)]
-
-          [((or (Values: (list (Result: _ fs _) ...))
-                (ValuesDots: (list (Result: _ fs _) ...) _ _))
-            (AnyValues: t-f))
-           (cset-join
-             (filter identity
-               (for/list ([f (in-list fs)])
-                 (match f
-                   [(FilterSet: f+ f-)
-                    (% cset-meet (cgen/filter context f+ t-f) (cgen/filter context f- t-f))]))))]
-
-          ;; check all non Type/c first so that calling subtype is safe
-
-          ;; check each element
-          [((Result: s f-s o-s)
-            (Result: t f-t o-t))
-           (% cset-meet (cg s t)
-                        (cgen/filter-set context f-s f-t)
-                        (cgen/object context o-s o-t))]
-
-          ;; Values just delegate to cgen/seq, except special handling for -Bottom.
-          ;; A single -Bottom in a Values means that there is no value returned and so any other
-          ;; Values or ValuesDots should be above it.
-          [((ValuesSeq: s-seq) (ValuesSeq: t-seq))
-           ;; Check for a substition that S is below (ret -Bottom).
-           (define bottom-case
-             (match S
-               [(Values: (list (Result: s f-s o-s)))
-                (cgen context s -Bottom)]
-               [else #f]))
-           (define regular-case
-             (cgen/seq context s-seq t-seq))
-           ;; If we want the OR of the csets that the two cases return.
-           (cset-join
-             (filter values
-               (list bottom-case regular-case)))]
-
-          ;; they're subtypes. easy.
-          [(a b) 
-           #:when (subtype a b)
-           empty]
-
-          ;; Lists delegate to sequences
-          [((ListSeq: s-seq) (ListSeq: t-seq))
-           (cgen/seq context s-seq t-seq)]
-
-          ;; refinements are erased to their bound
-          [((Refinement: S _) T)
-           (cg S T)]
-
-          ;; variables that are in X and should be constrained
-          ;; all other variables are compatible only with themselves
-          [((F: (? (inferable-var? context) v)) T)
-           #:return-when
-           (match T
-             ;; fail when v* is an index variable
-             [(F: v*) (and (bound-index? v*) (not (bound-tvar? v*)))]
-             [_ #f])
-           #f
-           ;; constrain v to be below T (but don't mention bounds)
-           (singleton (Un) v (var-demote T (context-bounds context)))]
-
-          [(S (F: (? (inferable-var? context) v)))
-           #:return-when
-           (match S
-             [(F: v*) (and (bound-index? v*) (not (bound-tvar? v*)))]
-             [_ #f])
-           #f
-           ;; constrain v to be above S (but don't mention bounds)
-           (singleton (var-promote S (context-bounds context)) v Univ)]
-
-          ;; recursive names should get resolved as they're seen
-          [(s (? Name? t))
-           (cg s (resolve-once t))]
-          [((? Name? s) t)
-           (cg (resolve-once s) t)]
-
-          ;; constrain b1 to be below T, but don't mention the new vars
-          [((Poly: v1 b1) T) (cgen (context-add context #:bounds v1) b1 T)]
-
-          ;; constrain *each* element of es to be below T, and then combine the constraints
-          [((Union: es) T)
-           (define cs (for/list/fail ([e (in-list es)]) (cg e T)))
-           (and cs (cset-meet* (cons empty cs)))]
-
-          ;; find *an* element of es which can be made to be a supertype of S
-          ;; FIXME: we're using multiple csets here, but I don't think it makes a difference
-          ;; not using multiple csets will break for: ???
-          [(S (Union: es))
-           (cset-join
-            (for*/list ([e (in-list es)]
-                        [v (in-value (cg S e))]
-                        #:when v)
-              v))]
-
-          ;; two structs with the same name
-          ;; just check pairwise on the fields
-          [((Struct: nm _ flds proc _ _) (Struct: nm* _ flds* proc* _ _))
-           #:when (free-identifier=? nm nm*)
-           (let ([proc-c
-                  (cond [(and proc proc*)
-                         (cg proc proc*)]
-                        [proc* #f]
-                        [else empty])])
-             (% cset-meet proc-c (cgen/flds context flds flds*)))]
-
-          ;; two struct names, need to resolve b/c one could be a parent
-          [((Name: n _ #t) (Name: n* _ #t))
-           (if (free-identifier=? n n*)
-               empty ;; just succeed now
-               (% cg (resolve-once S) (resolve-once T)))]
-          ;; pairs are pointwise
-          [((Pair: a b) (Pair: a* b*))
-           (% cset-meet (cg a a*) (cg b b*))]
-          ;; sequences are covariant
-          [((Sequence: ts) (Sequence: ts*))
-           (cgen/list context ts ts*)]
-          [((Listof: t) (Sequence: (list t*)))
-           (cg t t*)]
-          [((Pair: t1 t2) (Sequence: (list t*)))
-           (% cset-meet (cg t1 t*) (cg t2 (-lst t*)))]
-          [((MListof: t) (Sequence: (list t*)))
-           (cg t t*)]
-          ;; To check that mutable pair is a sequence we check that the cdr is
-          ;; both an mutable list and a sequence
-          [((MPair: t1 t2) (Sequence: (list t*)))
-           (% cset-meet (cg t1 t*) (cg t2 T) (cg t2 (Un -Null (make-MPairTop))))]
-          [((List: ts) (Sequence: (list t*)))
-           (% cset-meet* (for/list/fail ([t (in-list ts)])
-                           (cg t t*)))]
-          [((HeterogeneousVector: ts) (HeterogeneousVector: ts*))
-           (% cset-meet (cgen/list context ts ts*) (cgen/list context ts* ts))]
-          [((HeterogeneousVector: ts) (Vector: s))
-           (define ts* (map (λ _ s) ts)) ;; invariant, everything has to match
-           (% cset-meet (cgen/list context ts ts*) (cgen/list context ts* ts))]
-          [((HeterogeneousVector: ts) (Sequence: (list t*)))
-           (% cset-meet* (for/list/fail ([t (in-list ts)])
-                           (cg t t*)))]
-          [((Vector: t) (Sequence: (list t*)))
-           (cg t t*)]
-          [((Base: 'String _ _ _) (Sequence: (list t*)))
-           (cg -Char t*)]
-          [((Base: 'Bytes _ _ _) (Sequence: (list t*)))
-           (cg -Nat t*)]
-          [((Base: 'Input-Port _ _ _) (Sequence: (list t*)))
-           (cg -Nat t*)]
-          [((Value: (? exact-nonnegative-integer? n)) (Sequence: (list t*)))
-           (define possibilities
-             (list
-               (list byte? -Byte)
-               (list portable-index? -Index)
-               (list portable-fixnum? -NonNegFixnum)
-               (list values -Nat)))
-           (define type
-             (for/or ([pred-type (in-list possibilities)])
-               (match pred-type
-                 ((list pred? type)
-                  (and (pred? n) type)))))
-           (cg type t*)]
-          [((Base: _ _ _ #t) (Sequence: (list t*)))
-           (define type
-             (for/or ([t (in-list (list -Byte -Index -NonNegFixnum -Nat))])
-               (and (subtype S t) t)))
-           (% cg type t*)]
-          [((Hashtable: k v) (Sequence: (list k* v*)))
-           (cgen/list context (list k v) (list k* v*))]
-          [((Set: t) (Sequence: (list t*)))
-           (cg t t*)]
-
-          ;; Mu's just get unfolded
-          ;; We unfold S first so that unions are handled in S before T
-          [((? Mu? s) t) (cg (unfold s) t)]
-          [(s (? Mu? t)) (cg s (unfold t))]
-
-          ;; resolve applications
-          [((App: _ _ _) _)
-           (% cg (resolve-once S) T)]
-          [(_ (App: _ _ _))
-           (% cg S (resolve-once T))]
-
-          ;; If the struct names don't match, try the parent of S
-          ;; Needs to be done after App and Mu in case T is actually the current struct
-          ;; but not currently visible
-          [((Struct: nm (? Type? parent) _ _ _ _) other)
-           (cg parent other)]
-
-          ;; Invariant here because struct types aren't subtypes just because the
-          ;; structs are (since you can make a constructor from the type).
-          [((StructType: s) (StructType: t))
-           (cg/inv s t)]
-
-          ;; vectors are invariant - generate constraints *both* ways
-          [((Vector: e) (Vector: e*))
-           (cg/inv e e*)]
-          ;; boxes are invariant - generate constraints *both* ways
-          [((Box: e) (Box: e*))
-           (cg/inv e e*)]
-          [((Weak-Box: e) (Weak-Box: e*))
-           (cg/inv e e*)]
-          [((MPair: s t) (MPair: s* t*))
-           (% cset-meet (cg/inv s s*) (cg/inv t t*))]
-          [((Channel: e) (Channel: e*))
-           (cg/inv e e*)]
-          [((Async-Channel: e) (Async-Channel: e*))
-           (cg/inv e e*)]
-          [((ThreadCell: e) (ThreadCell: e*))
-           (cg/inv e e*)]
-          [((Continuation-Mark-Keyof: e) (Continuation-Mark-Keyof: e*))
-           (cg/inv e e*)]
-          [((Prompt-Tagof: s t) (Prompt-Tagof: s* t*))
-           (% cset-meet (cg/inv s s*) (cg/inv t t*))]
-          [((Promise: e) (Promise: e*))
-           (cg e e*)]
-          [((Ephemeron: e) (Ephemeron: e*))
-           (cg e e*)]
-          [((CustodianBox: e) (CustodianBox: e*))
-           (cg e e*)]
-          [((Set: a) (Set: a*))
-           (cg a a*)]
-          [((Evt: a) (Evt: a*))
-           (cg a a*)]
-          [((Base: 'Semaphore _ _ _) (Evt: t))
-           (cg S t)]
-          [((Base: 'Output-Port _ _ _) (Evt: t))
-           (cg S t)]
-          [((Base: 'Input-Port _ _ _) (Evt: t))
-           (cg S t)]
-          [((Base: 'TCP-Listener _ _ _) (Evt: t))
-           (cg S t)]
-          [((Base: 'Thread _ _ _) (Evt: t))
-           (cg S t)]
-          [((Base: 'Subprocess _ _ _) (Evt: t))
-           (cg S t)]
-          [((Base: 'Will-Executor _ _ _) (Evt: t))
-           (cg S t)]
-          [((Base: 'LogReceiver _ _ _) (Evt: t ))
-           (cg (make-HeterogeneousVector
-                   (list -Symbol -String Univ
-                         (Un (-val #f) -Symbol)))
-               t)]
-          [((CustodianBox: t) (Evt: t*)) (cg S t*)]
-          [((Channel: t) (Evt: t*)) (cg t t*)]
-          [((Async-Channel: t) (Evt: t*)) (cg t t*)]
-          ;; we assume all HTs are mutable at the moment
-          [((Hashtable: s1 s2) (Hashtable: t1 t2))
-           ;; for mutable hash tables, both are invariant
-           (% cset-meet (cg/inv s1 t1) (cg/inv s2 t2))]
-          ;; syntax is covariant
-          [((Syntax: s1) (Syntax: s2))
-           (cg s1 s2)]
-          ;; futures are covariant
-          [((Future: s1) (Future: s2))
-           (cg s1 s2)]
-          ;; parameters are just like one-arg functions
-          [((Param: in1 out1) (Param: in2 out2))
-           (% cset-meet (cg in2 in1) (cg out1 out2))]
-          [((Function: (list s-arr ...))
-            (Function: (list t-arr ...)))
-           (% cset-meet*
-            (for/list/fail ([t-arr (in-list t-arr)])
-              ;; for each element of t-arr, we need to get at least one element of s-arr that works
-              (let ([results (for*/list ([s-arr (in-list s-arr)]
-                                         [v (in-value (cgen/arr context s-arr t-arr))]
-                                         #:when v)
-                               v)])
-                ;; ensure that something produces a constraint set
-                (and (not (null? results))
-                     (cset-join results)))))]
-          [(_ _)
-           ;; nothing worked, and we fail
-           #f]))))
-
-;; C : cset? - set of constraints found by the inference engine
-;; X : (listof symbol?) - type variables that must have entries
-;; Y : (listof symbol?) - index variables that must have entries
-;; R : Type/c - result type into which we will be substituting
-(define/cond-contract (subst-gen C X Y R)
-  (cset? (listof symbol?) (listof symbol?) (or/c Values/c AnyValues? ValuesDots?)
-   . -> . (or/c #f substitution/c))
-  (define var-hash (free-vars-hash (free-vars* R)))
-  (define idx-hash (free-vars-hash (free-idxs* R)))
-  ;; c : Constaint
-  ;; variance : Variance
-  (define (constraint->type v variance)
-    (match v
-      [(c S T)
-       (evcase variance
-               [Constant S]
-               [Covariant S]
-               [Contravariant T]
-               [Invariant
-                (let ([gS (generalize S)])
-                  (if (subtype gS T)
-                      gS
-                      S))])]))
-
-  ;; Since we don't add entries to the empty cset for index variables (since there is no
-  ;; widest constraint, due to dcon-exacts), we must add substitutions here if no constraint
-  ;; was found.  If we're at this point and had no other constraints, then adding the
-  ;; equivalent of the constraint (dcon null (c Bot X Top)) is okay.
-  (define (extend-idxs S)
-    (hash-union
-     (for/hash ([v (in-list Y)]
-                #:unless (hash-has-key? S v))
-       (let ([var (hash-ref idx-hash v Constant)])
-         (values v
-                 (evcase var
-                         [Constant (i-subst null)]
-                         [Covariant (i-subst null)]
-                         [Contravariant (i-subst/starred null Univ)]
-                         ;; TODO figure out if there is a better subst here
-                         [Invariant (i-subst null)]))))
-     S))
-  (match (car (cset-maps C))
-    [(cons cmap (dmap dm))
-     (let ([subst (hash-union
-                    (for/hash ([(k dc) (in-hash dm)])
-                      (define (c->t c) (constraint->type c (hash-ref idx-hash k Constant)))
-                      (values
-                        k
-                        (match dc
-                          [(dcon fixed #f)
-                           (i-subst (map c->t fixed))]
-                          [(or (dcon fixed rest) (dcon-exact fixed rest))
-                           (i-subst/starred
-                             (map c->t fixed)
-                             (c->t rest))]
-                          [(dcon-dotted fixed dc dbound)
-                           (i-subst/dotted
-                             (map c->t fixed)
-                             (c->t dc)
-                             dbound)])))
-                   (for/hash ([(k v) (in-hash cmap)])
-                     (values k (t-subst (constraint->type v (hash-ref var-hash k Constant))))))])
-       ;; verify that we got all the important variables
-       (and (for/and ([v (in-list X)])
-              (let ([entry (hash-ref subst v #f)])
-                ;; Make sure we got a subst entry for a type var
-                ;; (i.e. just a type to substitute)
-                (and entry (t-subst? entry))))
-            (extend-idxs subst)))]))
-
-;; context : the context of what to infer/not infer
-;; S : a list of types to be the subtypes of T
-;; T : a list of types
-;; expected-cset : a cset representing the expected type, to meet early and
-;;  keep the number of constraints in check. (empty by default)
-;; produces a cset which determines a substitution that makes the Ss subtypes of the Ts
-(define/cond-contract (cgen/list context S T
-                                 #:expected-cset [expected-cset (empty-cset '() '())])
-  ((context? (listof Values/c) (listof Values/c)) (#:expected-cset cset?) . ->* . (or/c cset? #f))
-  (and (= (length S) (length T))
-       (% cset-meet*
-          (for/list/fail ([s (in-list S)] [t (in-list T)])
-                         ;; We meet early to prune the csets to a reasonable size.
-                         ;; This weakens the inference a bit, but sometimes avoids
-                         ;; constraint explosion.
-            (% cset-meet (cgen context s t) expected-cset)))))
-
-
-
-;; X : variables to infer
-;; Y : indices to infer
-;; S : actual argument types
-;; T : formal argument types
-;; R : result type
-;; expected : #f or the expected type
-;; returns a substitution
-;; if R is #f, we don't care about the substituion
-;; just return a boolean result
-(define infer
- (let ()
-  (define/cond-contract (infer X Y S T R [expected #f])
-    (((listof symbol?) (listof symbol?) (listof Type/c) (listof Type/c)
-      (or/c #f Values/c ValuesDots?))
-     ((or/c #f Values/c AnyValues? ValuesDots?))
-     . ->* . (or/c boolean? substitution/c))
-    (define ctx (context null X Y ))
-    (define expected-cset
-      (if expected
-          (cgen ctx R expected)
-          (empty-cset '() '())))
-    (and expected-cset
-         (let* ([cs (cgen/list ctx S T #:expected-cset expected-cset)]
-                [cs* (% cset-meet cs expected-cset)])
-           (and cs* (if R (subst-gen cs* X Y R) #t)))))
-  ;(trace infer)
-  infer)) ;to export a variable binding and not syntax
-
-;; like infer, but T-var is the vararg type:
-(define (infer/vararg X Y S T T-var R [expected #f])
-  (define new-T (if T-var (extend S T T-var) T))
-  (and ((length S) . >= . (length T))
-       (infer X Y S new-T R expected)))
-
-;; like infer, but dotted-var is the bound on the ...
-;; and T-dotted is the repeated type
-(define (infer/dots X dotted-var S T T-dotted R must-vars #:expected [expected #f])
-  (early-return
-   (define short-S (take S (length T)))
-   (define rest-S (drop S (length T)))
-   (define ctx (context null X (list dotted-var)))
-   (define expected-cset (if expected
-                             (cgen ctx R expected)
-                             (empty-cset '() '())))
-   #:return-unless expected-cset #f
-   (define cs-short (cgen/list ctx short-S T #:expected-cset expected-cset))
-   #:return-unless cs-short #f
-   (define-values (new-vars new-Ts)
-     (generate-dbound-prefix dotted-var T-dotted (length rest-S) #f))
-   (define cs-dotted (cgen/list (context-add-vars ctx new-vars) rest-S new-Ts
-                                #:expected-cset expected-cset))
-   #:return-unless cs-dotted #f
-   (define cs-dotted* (move-vars-to-dmap cs-dotted dotted-var new-vars))
-   #:return-unless cs-dotted* #f
-   (define cs (cset-meet cs-short cs-dotted*))
-   #:return-unless cs #f
-   (define m (cset-meet cs expected-cset))
-   #:return-unless m #f
-   (subst-gen m X (list dotted-var) R)))
-
-
-;(trace subst-gen)
-;(trace cgen)
-;(trace cgen/list)
-;(trace cgen/arr)
-;(trace cgen/seq)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer.rkt
deleted file mode 100644
index d497745cef..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-
-(require "infer-unit.rkt" "constraints.rkt" "dmap.rkt" "signatures.rkt"
-         "restrict.rkt"
-         (only-in racket/unit provide-signature-elements
-                  define-values/invoke-unit/infer link))
-
-(provide-signature-elements restrict^ infer^)
-
-(define-values/invoke-unit/infer
-  (link infer@ constraints@ dmap@ restrict@))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/promote-demote.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/promote-demote.rkt
deleted file mode 100644
index 81766c10bc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/promote-demote.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         (rep type-rep rep-utils)
-         (types abbrev utils structural)
-         (prefix-in c: (contract-req))
-         racket/performance-hint
-         racket/list racket/match)
-
-(provide/cond-contract
-  [var-promote (c:-> Type/c (c:listof symbol?) Type/c)]
-  [var-demote (c:-> Type/c (c:listof symbol?) Type/c)])
-
-(define (V-in? V . ts)
-  (for/or ([e (in-list (append* (map fv ts)))])
-    (memq e V)))
-
-;; get-filters : SomeValues -> FilterSet
-;; extract filters out of the range of a function type
-(define (get-filters rng)
-  (match rng
-    [(AnyValues: f) (list (-FS f f))]
-    [(Values: (list (Result: _ lf _) ...)) lf]
-    [(ValuesDots: (list (Result: _ lf _) ...) _ _) lf]))
-
-
-(begin-encourage-inline
-  (define (var-change V T change)
-    (define (structural-recur t sym)
-      (case sym
-        [(co) (var-change V t change)]
-        [(contra) (var-change V t (not change))]
-        [(inv)
-         (if (V-in? V t)
-             (if change Univ -Bottom)
-             t)]))
-    (define (co t) (structural-recur t 'co))
-    (define (contra t) (structural-recur t 'contra))
-
-    ;; arr? -> (or/c #f arr?)
-    ;; Returns the changed arr or #f if there is no arr above it
-    (define (arr-change arr)
-      (match arr
-        [(arr: dom rng rest drest kws)
-         (cond
-           [(apply V-in? V (get-filters rng))
-            #f]
-           [(and drest (memq (cdr drest) V))
-            (make-arr (map contra dom)
-                      (co rng)
-                      (contra (car drest))
-                      #f
-                      (map contra kws))]
-           [else
-            (make-arr (map contra dom)
-                      (co rng)
-                      (and rest (contra rest))
-                      (and drest (cons (contra (car drest)) (cdr drest)))
-                      (map contra kws))])]))
-
-    (match T
-      [(F: name) (if (memq name V) (if change Univ -Bottom) T)]
-      [(Function: arrs)
-       (make-Function (filter-map arr-change arrs))]
-      [(? structural?) (structural-map T structural-recur)]
-      [(? Filter?) ((sub-f co) T)]
-      [(? Object?) ((sub-o co) T)]
-      [(? Type?) ((sub-t co) T)]))
-  (define (var-promote T V)
-    (var-change V T #t))
-  (define (var-demote T V)
-    (var-change V T #f)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/restrict.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/restrict.rkt
deleted file mode 100644
index 8400889622..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/restrict.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/unit
-
-(require "../utils/utils.rkt")
-(require (rep type-rep)
-         (types union subtype remove-intersect resolve)
-         "signatures.rkt"
-         racket/match)
-
-(import infer^)
-(export restrict^)
-
-;; we don't use union map directly, since that might produce too many elements
-  (define (union-map f l)
-    (match l
-      [(Union: es)
-       (let ([l (map f es)])
-         (apply Un l))]))
-
-;; NEW IMPL
-;; restrict t1 to be a subtype of t2
-;; if `f' is 'new, use t2 when giving up, otherwise use t1
-(define (restrict* t1 t2 [f 'new])
-  (cond
-    [(subtype t1 t2) t1] ;; already a subtype
-    [(match t2 
-       [(Poly: vars t)
-        (and (infer vars null (list t1) (list t) #f) t1)]
-       [_ #f])]
-    [(Union? t1) (union-map (lambda (e) (restrict* e t2 f)) t1)]
-    [(Union? t2) (union-map (lambda (e) (restrict* t1 e f)) t2)]
-    [(needs-resolving? t1) (restrict* (resolve-once t1) t2 f)]
-    [(needs-resolving? t2) (restrict* t1 (resolve-once t2) f)]
-    [(subtype t2 t1) t2] ;; we don't actually want this - want something that's a part of t1
-    [(not (overlap t1 t2)) (Un)] ;; there's no overlap, so the restriction is empty
-    [else (if (eq? f 'new) t2 t1)])) ;; t2 and t1 have a complex relationship, so we punt
-
-(define restrict restrict*)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/signatures.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/signatures.rkt
deleted file mode 100644
index 19bd935f06..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/signatures.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-(require "../utils/utils.rkt"
-         racket/unit (contract-req)
-         (utils unit-utils)
-         (rep type-rep))
-
-(require-for-cond-contract (infer constraint-structs))
-
-(provide (all-defined-out))
-
-(define-signature dmap^
-  ([cond-contracted dmap-meet (dmap? dmap? . -> . (or/c #f dmap?))]))
-
-(define-signature constraints^
-  ([cond-contracted cset-meet ((cset? cset?) #:rest (listof cset?) . ->* . (or/c #f cset?))]
-   [cond-contracted cset-meet* ((listof cset?) . -> . (or/c #f cset?))]
-   [cond-contracted no-constraint c?]
-   [cond-contracted empty-cset ((listof symbol?) (listof symbol?) . -> . cset?)]
-   [cond-contracted insert (cset? symbol? Type/c Type/c . -> . cset?)]
-   [cond-contracted cset-join ((listof cset?) . -> . cset?)]
-   [cond-contracted c-meet ((c? c?) (symbol?) . ->* . (or/c #f c?))]))
-
-(define-signature restrict^
-  ([cond-contracted restrict ((Type/c Type/c) ((or/c 'new 'orig)) . ->* . Type/c)]))
-
-(define-signature infer^
-  ([cond-contracted infer ((;; variables from the forall
-                            (listof symbol?)
-                            ;; indexes from the forall
-                            (listof symbol?)
-                            ;; actual argument types from call site
-                            (listof Type/c)
-                            ;; domain
-                            (listof Type/c)
-                            ;; range
-                            (or/c #f Values/c ValuesDots?))
-                           ;; optional expected type
-                           ((or/c #f Values/c AnyValues? ValuesDots?))
-                           . ->* . any)]
-   [cond-contracted infer/vararg ((;; variables from the forall
-                                   (listof symbol?)
-                                   ;; indexes from the forall
-                                   (listof symbol?)
-                                   ;; actual argument types from call site
-                                   (listof Type/c)
-                                   ;; domain
-                                   (listof Type/c)
-                                   ;; rest
-                                   (or/c #f Type/c)
-                                   ;; range
-                                   (or/c #f Values/c ValuesDots?))
-                                  ;; [optional] expected type
-                                  ((or/c #f Values/c AnyValues? ValuesDots?)) . ->* . any)]
-   [cond-contracted infer/dots (((listof symbol?)
-                                 symbol?
-                                 (listof Values/c)
-                                 (listof Values/c)
-                                 Values/c
-                                 (or/c Values/c ValuesDots?)
-                                 (listof symbol?))
-                                (#:expected (or/c #f Values/c AnyValues? ValuesDots?)) . ->* . any)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/info.rkt
deleted file mode 100644
index f4f7f2b93d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define release-note-files '(("Typed Racket" "HISTORY.txt")))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/language-info.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/language-info.rkt
deleted file mode 100644
index 56b7e99ad5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/language-info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-(require typed-racket/typed-reader)
-(provide get-info configure)
-
-(define ((get-info arg) key default)
-  (case key
-    [(configure-runtime) `(#(typed-racket/language-info configure ()))]
-    [else default]))
-
-;; options currently always empty
-(define (configure options)
-  (namespace-require 'racket/base)
-  (eval '(begin
-           (require (for-syntax typed-racket/utils/tc-utils racket/base))
-           (begin-for-syntax (set-box! typed-context? #t)))
-        (current-namespace))
-  (current-readtable (readtable)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/minimal.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/minimal.rkt
deleted file mode 100644
index 45599a0b1f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/minimal.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-
-(provide #%module-begin provide require rename-in rename-out prefix-in only-in all-from-out except-out except-in
-         providing begin)
-
-(require (for-syntax racket/base))
-
-(define-for-syntax ts-mod 'typed-racket/typed-racket)
-
-(define-syntax (providing stx)
-  (syntax-case stx (libs from basics except)
-    [(form (libs (except lb ex ...) ...) (basics b ...) (from spec id ...) ...)
-     (datum->syntax
-      stx
-      (syntax->datum
-       (with-syntax ([(b* ...) (generate-temporaries #'(b ...))]
-                     [ts ts-mod])
-         (syntax/loc
-             stx
-           (begin
-             (require (except-in ts b ...))
-             (require (only-in ts [b b*] ...))
-             (require (except-in lb ex ...) ...)
-             (require (only-in spec id ...) ...)
-             (provide id ...) ...
-             (provide (rename-out [b* b] ...))
-             (provide (except-out (all-from-out ts) b* ...))
-             (provide (all-from-out lb) ...))))))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/minimal/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/minimal/lang/reader.rkt
deleted file mode 100644
index 0c5c481cbf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/minimal/lang/reader.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang s-exp syntax/module-reader
-
-typed-racket/minimal
-
-#:language-info make-language-info
-#:info make-info
-
-(define (make-info key default use-default)
-  (case key
-    [else (use-default key default)]))
-
-(define make-language-info
-  `#(typed-racket/language-info get-info ()))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/apply.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/apply.rkt
deleted file mode 100644
index 725550dadd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/apply.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require syntax/parse racket/syntax
-         (for-template racket/unsafe/ops racket/base (prefix-in k- '#%kernel))
-         "../utils/utils.rkt"
-         (optimizer utils logging))
-
-(provide apply-opt-expr)
-
-(define-literal-syntax-class +)
-(define-literal-syntax-class *)
-(define-literal-syntax-class k-apply)
-(define-literal-syntax-class map)
-(define-literal-syntax-class app^ (#%plain-app))
-
-
-(define-syntax-class apply-op
-  #:commit
-  (pattern :+^ #:with identity #'0)
-  (pattern :*^ #:with identity #'1))
-
-(define-syntax-class apply-opt-expr
-  #:commit
-  (pattern (kw:app^ appl:k-apply^ op:apply-op (kw2:app^ m:map^ f:opt-expr l:opt-expr))
-    #:do [(log-opt "apply-map" "apply-map deforestation.")]
-    #:with opt (with-syntax ([(f* lp v lst) (map generate-temporary '(f* loop v lst))])
-                 (syntax/loc/origin
-                  this-syntax #'kw
-                  (let ([f* f.opt])
-                    (let loop ([v op.identity] [lst l.opt])
-                      (if (null? lst)
-                          v
-                          (loop (op v (f* (unsafe-car lst)))
-                                (unsafe-cdr lst)))))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/box.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/box.rkt
deleted file mode 100644
index a3db8561a1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/box.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         "../utils/utils.rkt"
-         (for-template racket/base racket/unsafe/ops)
-         (optimizer utils logging))
-
-(provide box-opt-expr)
-
-(define-unsafe-syntax-class unbox)
-(define-unsafe-syntax-class set-box!)
-
-(define-merged-syntax-class box-op (unbox^ set-box!^))
-
-(define-syntax-class box-opt-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-  (pattern (#%plain-app op:box-op b:opt-expr new:opt-expr ...)
-    #:do [(log-opt "box" "Box check elimination.")]
-    #:with opt #`(op.unsafe b.opt new.opt ...)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/dead-code.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/dead-code.rkt
deleted file mode 100644
index a292ce9930..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/dead-code.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang racket/base
-
-(require syntax/parse syntax/stx unstable/sequence
-         racket/syntax
-         (for-template racket/base)
-         "../utils/utils.rkt"
-         (types type-table)
-         (optimizer utils logging))
-
-(provide dead-code-opt-expr)
-
-;; The type based 'dead code elimination' done by this file just makes the dead code obvious.
-;; The actual elimination step is left to the compiler.
-
-(define-syntax-class dead-code-opt-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-  (pattern ((~and kw if) tst:opt-expr thn:opt-expr els:opt-expr)
-    #:do [(define takes-true (test-position-takes-true-branch #'tst))
-          (define takes-false (test-position-takes-false-branch #'tst))
-          (unless takes-true
-            (log-optimization "dead then branch" "Unreachable then branch elimination." #'thn))
-          (unless takes-false
-            (log-optimization "dead else branch" "Unreachable else branch elimination." #'els))]
-    #:with thn-opt (if takes-true #'thn.opt #'thn)
-    #:with els-opt (if takes-false #'els.opt #'els)
-    ;; if the conditional has a known truth value, we can reveal this
-    ;; we have to keep the test, in case it has side effects
-    #:with opt
-      (cond
-        [(and (not takes-true) (not takes-false))
-         (quasisyntax/loc/origin this-syntax #'kw
-           (if #t tst.opt (begin thn-opt els-opt)))]
-        [else
-          (define/with-syntax tst-opt
-            (cond
-              [(and takes-true takes-false) #'tst.opt]
-              [takes-true #'(begin tst.opt #t)]
-              [takes-false #'(begin tst.opt #f)]))
-          (quasisyntax/loc/origin this-syntax #'kw
-            (if tst-opt thn-opt els-opt))]))
-  (pattern ((~and kw lambda) formals . bodies)
-    #:when (dead-lambda-branch? #'formals)
-    #:with opt this-syntax)
-  (pattern ((~and kw case-lambda) (formals . bodies) ...)
-    #:when (for/or ((formals (in-syntax #'(formals ...))))
-             (dead-lambda-branch? formals))
-    #:with opt
-      (quasisyntax/loc/origin
-        this-syntax #'kw
-        (begin0
-          (case-lambda
-            #,@(for/list ((formals (in-syntax #'(formals ...)))
-                          (bodies  (in-syntax #'(bodies ...))))
-                 (if (dead-lambda-branch? formals)
-                     ;; keep the clause (to have a case-lambda with the right arity)
-                     ;; but not the body (to make the function smaller for inlining)
-                     ;; TODO could do better, and keep a single clause per arity
-                     (list formals #'(void)) ; return type doesn't matter, should never run
-                     (cons formals (stx-map (optimize) bodies)))))
-          ;; We need to keep the syntax objects around in the generated code with the correct bindings
-          ;; so that CheckSyntax displays the arrows correctly
-          #,@(for/list ((formals (in-syntax #'(formals ...)))
-                        (bodies  (in-syntax #'(bodies ...)))
-                        #:when (dead-lambda-branch? formals))
-                (log-optimization
-                  "dead case-lambda branch"
-                  "Unreachable case-lambda branch elimination."
-                  formals)
-                #`(λ #,formals . #,bodies))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/extflonum.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/extflonum.rkt
deleted file mode 100644
index 266dbff09c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/extflonum.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-
-(require syntax/parse racket/extflonum
-         syntax/parse/experimental/specialize
-         (for-template racket/base racket/extflonum racket/unsafe/ops)
-         "../utils/utils.rkt"
-         (optimizer utils logging float fixnum))
-
-(provide extflonum-opt-expr)
-
-
-(define (mk-extflonum-tbl generic) ; all operations are prefixed
-  (mk-unsafe-tbl generic "~a" "unsafe-~a"))
-
-(define binary-extflonum-ops
-  ;; comparisons are good too, because we don't have to do n-ary->binary
-  ;; (all ops are binary only)
-  (mk-extflonum-tbl (list #'extfl+ #'extfl- #'extfl* #'extfl/
-                          #'extfl= #'extfl< #'extfl> #'extfl<= #'extfl>=
-                          #'extflmin #'extflmax #'extflexpt)))
-
-(define unary-extflonum-ops
-  (mk-extflonum-tbl (list #'extflabs #'extflround #'extflfloor #'extflceiling #'extfltruncate
-                          #'extflsin #'extflcos #'extfltan #'extflasin #'extflacos #'extflatan
-                          #'extfllog #'extflexp #'extflsqrt)))
-
-(define-syntax-class/specialize unary-extflonum-op (float-op unary-extflonum-ops))
-(define-syntax-class/specialize binary-extflonum-op (float-op binary-extflonum-ops))
-
-(define-literal-syntax-class ->extfl)
-(define-literal-syntax-class real->extfl)
-(define-merged-syntax-class fx->extfl-op (->extfl^ real->extfl^))
-
-(define-syntax-rule (log-extfl-opt opt-label)
-  (log-opt opt-label "Extflonum arithmetic specialization."))
-
-;; Those are easy. Because extflonums are disjoint from the rest of the numeric
-;; tower, if the operations type check at all, they have the right types for
-;; optimization. Ops are all fixed arity, too.
-(define-syntax-class extflonum-opt-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-  (pattern (#%plain-app op:unary-extflonum-op t:opt-expr)
-    #:do [(log-extfl-opt "unary extflonum")]
-    #:with opt #'(op.unsafe t.opt))
-  (pattern (#%plain-app op:binary-extflonum-op t1:opt-expr t2:opt-expr)
-    #:do [(log-extfl-opt "binary extflonum")]
-    #:with opt #'(op.unsafe t1.opt t2.opt))
-
-  (pattern (#%plain-app :fx->extfl-op f:fixnum-expr)
-    #:do [(log-extfl-opt "fixnum to extflonum conversion")]
-    #:with opt #'(unsafe-fx->extfl f.opt))
-  )
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/fixnum.rkt
deleted file mode 100644
index c5150bb748..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/fixnum.rkt
+++ /dev/null
@@ -1,224 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         syntax/parse/experimental/specialize
-         "../utils/utils.rkt"
-         (for-template racket/base racket/fixnum racket/unsafe/ops)
-         (for-syntax racket/base syntax/parse racket/syntax)
-         (types numeric-tower union)
-         (optimizer utils logging))
-
-(provide fixnum-expr fixnum-opt-expr)
-
-(begin-for-syntax
-  (define (format-ids id . args)
-    (for/list ((arg (in-list args)))
-      (format-id id arg id))))
-
-(define-syntax (define-fx-syntax-classes stx)
-  (define-syntax-class spec
-    [pattern name:id
-       #:with v
-         (with-syntax ([(class-name safe-fx unsafe-fx)
-                        (format-ids #'name "~a^" "fx~a" "unsafe-fx~a")])
-           #'(define-unsafe-syntax-class class-name (name safe-fx) unsafe-fx))])
-
-  (syntax-parse stx
-    ((_ (name:spec ...))
-     #'(begin name.v ...))))
-
-(define-syntax (define-bitwise-syntax-class stx)
-  (define-syntax-class spec
-    [pattern name:id
-       #:with v
-         (with-syntax ([(class-name safe-reg safe-fx unsafe-fx)
-                        (format-ids #'name "~a^" "bitwise-~a" "fx~a" "unsafe-fx~a")])
-           #'(define-unsafe-syntax-class class-name (safe-reg safe-fx) unsafe-fx))])
-
-  (syntax-parse stx
-    [(_ (name:spec ...))
-     #'(begin name.v ...)]))
-
-(define-syntax (define-split-fx-syntax-class stx)
-  (define-syntax-class spec
-    [pattern name:id
-       #:with v
-         (with-syntax ([(class-name safe-fx unsafe-fx)
-                        (format-ids #'name "~a^" "fx~a" "unsafe-fx~a")])
-           #'(begin
-               (define-unsafe-syntax-class safe-fx)
-               (define-unsafe-syntax-class class-name (name) unsafe-fx)))])
-
-  (syntax-parse stx
-    [(_ (name:spec ...))
-     #'(begin name.v ...)]))
-
-
-
-(define-fx-syntax-classes (= < > >= <= min max abs))
-;; Seperated out because of potentially-bounded-*-op
-(define-split-fx-syntax-class (+ - * quotient modulo remainder))
-(define-bitwise-syntax-class (and ior xor not))
-
-(define-unsafe-syntax-class exact->inexact^ (exact->inexact) unsafe-fx->fl)
-(define-unsafe-syntax-class fx->fl^         (fx->fl)         unsafe-fx->fl)
-(define-merged-syntax-class fixnum-coercion-op (exact->inexact^ fx->fl^))
-(define-literal-syntax-class add1)
-(define-literal-syntax-class sub1)
-(define-literal-syntax-class zero?)
-
-;; Due to undefined behavior when results are out of the fixnum range, only some
-;; fixnum operations can be optimized
-
-(define-merged-syntax-class fixnum-unary-op (not^))
-
-;; closed on fixnums
-(define-merged-syntax-class fixnum-binary-op (min^ max^ and^ ior^ xor^))
-
-;; closed on fixnums, but 2nd argument must not be 0
-;; quotient is not closed. (quotient most-negative-fixnum -1) is not a fixnum
-(define-merged-syntax-class nonzero-fixnum-binary-op
-  (modulo^ remainder^ fxmodulo^ fxremainder^))
-
-(define-merged-syntax-class fixnum-binary-comp (=^ <^ >^ <=^ >=^))
-
-;; these operations are not closed on fixnums, but we can sometimes guarantee
-;; that results will be within fixnum range
-;; if their return type is a subtype of Fixnum, we can optimize
-;; obviously, we can't include fx-specific ops here, since their return type is
-;; always Fixnum, and we rely on the error behavior if that would be violated
-(define-merged-syntax-class potentially-bounded-fixnum-op (+^ -^ *^))
-(define-merged-syntax-class potentially-bounded-nonzero-fixnum-op (quotient^ remainder^))
-
-
-(define-syntax-class/specialize byte-expr
-  (subtyped-expr -Byte))
-(define-syntax-class/specialize index-expr
-  (subtyped-expr -Index))
-(define-syntax-class/specialize fixnum-expr
-  (subtyped-expr -Fixnum))
-(define-syntax-class/specialize nonneg-fixnum-expr
-  (subtyped-expr -NonNegFixnum))
-(define-syntax-class/specialize nonpos-fixnum-expr
-  (subtyped-expr -NonPosFixnum))
-(define-syntax-class/specialize nonzero-fixnum-expr
-  (subtyped-expr (Un -PosFixnum -NegFixnum)))
-
-(define-syntax-rule (log-fx-opt opt-label)
-  (log-opt opt-label "Fixnum arithmetic specialization."))
-
-(define (log-fixnum-missed-opt stx)
-  (log-missed-optimization
-   "out of fixnum range"
-   "This expression consists of all fixnum arguments but is not guaranteed to produce a fixnum. Therefore it cannot be safely optimized. Constraining the arguments to be of Byte or Index types may help."
-   stx))
-(define (log-fixnum-hidden-cost stx)
-  (log-optimization-info
-   "non-optimized fixnum op" ; e.g. fx+ that couldn't be turned into unsafe-fx+
-   stx))
-
-;; general-purpose safety check for fixnum opts
-;; some operations have different definitions of safe and have their own checks
-;; if we make it this far, an optimization is likely to be expected by the
-;; user, so we report a missed opt if the check fails
-(define (check-if-safe stx)
-  (let ([safe-to-opt? (subtypeof? stx -Fixnum)])
-    (unless safe-to-opt?
-      (log-fixnum-missed-opt stx))
-    safe-to-opt?))
-
-(define-syntax-class fixnum-opt-expr
-  #:literal-sets (kernel-literals)
-  #:attributes (opt)
-  (pattern (#%plain-app . :inner-fixnum-opt-expr))
-  (pattern (#%plain-app . (~var || (inner-checked-fixnum-opt-expr this-syntax)))))
-
-
-(define-syntax-class inner-fixnum-opt-expr
-  #:commit
-  #:attributes (opt)
-  (pattern (op:fixnum-unary-op n:fixnum-expr)
-    #:do [(log-fx-opt "unary fixnum")]
-    #:with opt #'(op.unsafe n.opt))
-  (pattern (op:fixnum-binary-op (~between ns:fixnum-expr 2 +inf.0) ...)
-    #:do [(log-fx-opt "binary fixnum")]
-    #:with opt (n-ary->binary #'op.unsafe #'(ns.opt ...)))
-  (pattern (op:fixnum-binary-comp n1:fixnum-expr n2:fixnum-expr)
-    #:do [(log-fx-opt "binary fixnum comp")]
-    #:with opt #'(op.unsafe n1.opt n2.opt))
-  (pattern (op:fixnum-binary-comp n1:fixnum-expr n2:fixnum-expr ns:fixnum-expr ...)
-    #:do [(log-fx-opt "multi fixnum comp")]
-    #:with opt (n-ary-comp->binary #'op.unsafe #'n1.opt #'n2.opt #'(ns.opt ...)))
-
-  (pattern (op:nonzero-fixnum-binary-op n1:fixnum-expr n2:nonzero-fixnum-expr)
-    #:do [(log-fx-opt "binary nonzero fixnum")]
-    #:with opt #'(op.unsafe n1.opt n2.opt))
-
-  (pattern (op:-^ f:nonneg-fixnum-expr)
-    ;; Invalid for `(- <most-negative-fixnum>)'.
-    #:do [(log-fx-opt "unary fixnum")]
-    #:with opt #'(op.unsafe 0 f.opt))
-
-  (pattern (op:fixnum-coercion-op n:fixnum-expr)
-    #:do [(log-fx-opt "fixnum to float")]
-    #:with opt #'(op.unsafe n.opt))
-
-  (pattern (op:zero?^ n:fixnum-expr)
-    #:do [(log-fx-opt "fixnum zero?")]
-    #:with opt #'(unsafe-fx= n.opt 0))
-
-  ;; for fx-specific ops, we need to mimic the typing rules of their generic
-  ;; counterparts, since fx-specific ops rely on error behavior for typechecking
-  ;; and thus their return type cannot be used directly for optimization
-  ;; Note: We don't log near misses for those, too many false positives.
-  ;;  If someone is using `fx+' in the first place, they should know about
-  ;;  `unsafe-fx+'. However, it makes sense to log it as a hidden cost, which
-  ;;  won't get shown except in hot code, where it may be worth reporting (see
-  ;;  below).
-  (pattern (op:fx+^
-             (~or (~seq n1:index-expr n2:index-expr)
-                  (~seq n1:nonneg-fixnum-expr n2:nonpos-fixnum-expr)
-                  (~seq n1:nonpos-fixnum-expr n2:nonneg-fixnum-expr)))
-    #:do [(log-fx-opt "fixnum fx+")]
-    #:with opt #'(op.unsafe n1.opt n2.opt))
-  (pattern (op:fx-^ n1:nonneg-fixnum-expr n2:nonneg-fixnum-expr)
-    #:do [(log-fx-opt "fixnum fx-")]
-    #:with opt #'(op.unsafe n1.opt n2.opt))
-  (pattern (op:fx*^ n1:byte-expr n2:byte-expr)
-    #:do [(log-fx-opt "fixnum fx*")]
-    #:with opt #'(op.unsafe n1.opt n2.opt))
-  (pattern (op:fxquotient^ n1:nonneg-fixnum-expr n2:nonzero-fixnum-expr)
-    #:do [(log-fx-opt "fixnum fxquotient")]
-    #:with opt #'(op.unsafe n1.opt n2.opt))
-  (pattern (op:abs^ n:nonneg-fixnum-expr)
-    #:do [(log-fx-opt "fixnum fxabs")]
-    #:with opt #'(op.unsafe n.opt)))
-
-;; The following are not closed on fixnums, but we can guarantee that results
-;; won't exceed fixnum range in some cases.
-;; (if they typecheck with return type Fixnum)
-(define-syntax-class (inner-checked-fixnum-opt-expr stx)
-  #:attributes (opt)
-  (pattern (op:potentially-bounded-fixnum-op (~between ns:fixnum-expr 2 +inf.0) ...)
-    #:when (check-if-safe stx)
-    #:do [(log-fx-opt "fixnum bounded expr")]
-    #:with opt (n-ary->binary #'op.unsafe #'(ns.opt ...)))
-  (pattern (op:potentially-bounded-nonzero-fixnum-op n1:fixnum-expr n2:nonzero-fixnum-expr)
-    #:when (check-if-safe stx)
-    #:do [(log-fx-opt "nonzero fixnum bounded expr")]
-    #:with opt #'(op.unsafe n1.opt n2.opt))
-  (pattern (op:add1^ n:fixnum-expr)
-    #:when (check-if-safe stx)
-    #:do [(log-fx-opt "fixnum add1")]
-    #:with opt #'(unsafe-fx+ n.opt 1))
-  (pattern (op:sub1^ n:fixnum-expr)
-    #:when (check-if-safe stx)
-    #:do [(log-fx-opt "fixnum sub1")]
-    #:with opt #'(unsafe-fx- n.opt 1))
-  ;; Report potentially bounded fixnum ops (fixnum versions only) that couldn't
-  ;; be proved bounded as hidden costs.
-  (pattern ((~or op:fx+^ op:fx-^ op:fx*^ op:fxquotient^
-                 op:fxmodulo^ op:fxremainder^)
-            n1:opt-expr n2:opt-expr)
-    #:do [(log-fixnum-hidden-cost this-syntax)]
-    #:with opt #'(op n1.opt n2.opt)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float-complex.rkt
deleted file mode 100644
index 74944d6362..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float-complex.rkt
+++ /dev/null
@@ -1,533 +0,0 @@
-#lang racket/base
-
-(require syntax/parse syntax/stx racket/promise
-         racket/syntax racket/match syntax/parse/experimental/specialize
-         "../utils/utils.rkt" racket/unsafe/ops unstable/sequence
-         (for-template racket/base racket/math racket/flonum racket/unsafe/ops)
-         (types numeric-tower subtype type-table utils)
-         (optimizer utils numeric-utils logging float unboxed-tables))
-
-(provide float-complex-opt-expr
-         float-complex-expr
-         binding-names
-         float-complex-arith-expr
-         unboxed-float-complex-opt-expr
-         float-complex-call-site-opt-expr arity-raising-opt-msg)
-
-(define-literal-syntax-class +)
-(define-literal-syntax-class -)
-(define-literal-syntax-class *)
-(define-literal-syntax-class /)
-(define-literal-syntax-class conjugate)
-(define-literal-syntax-class magnitude)
-(define-literal-syntax-class make-polar)
-(define-literal-syntax-class exp)
-
-(define-literal-syntax-class make-rectangular^ (make-rectangular unsafe-make-flrectangular))
-(define-literal-syntax-class real-part^ (real-part flreal-part unsafe-flreal-part))
-(define-literal-syntax-class imag-part^ (imag-part flimag-part unsafe-flimag-part))
-(define-merged-syntax-class projection^ (real-part^ imag-part^))
-
-(define-merged-syntax-class float-complex-op (+^ -^ *^ conjugate^ exp^))
-
-(define-syntax-class/specialize number-expr (subtyped-expr -Number))
-(define-syntax-class/specialize float-expr (subtyped-expr -Flonum))
-(define-syntax-class/specialize float-complex-expr (subtyped-expr -FloatComplex))
-
-(define (binding-names)
-  (generate-temporaries (list "unboxed-real-" "unboxed-imag-")))
-
-(define arity-raising-opt-msg "Complex number arity raising.")
-(define-syntax-rule (log-unboxing-opt opt-label)
-  (log-opt opt-label "Complex number unboxing."))
-(define-syntax-rule (log-arity-raising-opt opt-label)
-  (log-opt opt-label arity-raising-opt-msg))
-(define-syntax-rule (log-missed-complex-expr)
-  (log-missed-optimization
-    "non-complex value in complex arithmetic"
-    (string-append
-      "This expression has a non-float Complex number type. "
-      "The optimizer could optimize it better if it had type Float-Complex.")
-    this-syntax))
-
-;; If a part is 0.0?
-(define (0.0? stx)
-  (equal? (syntax->datum stx) 0.0))
-
-
-;; a+bi / c+di, names for real and imag parts of result -> one let-values binding clause
-(define (unbox-one-complex-/ a b c d res-real res-imag)
-  (define both-real? (and (0.0? b) (0.0? d)))
-  ;; we have the same cases as the Racket `/' primitive (except for the non-float ones)
-  (define d=0-case
-    #`(values (unsafe-fl+ (unsafe-fl/ #,a #,c)
-                          (unsafe-fl* #,d #,b))
-              (unsafe-fl- (unsafe-fl/ #,b #,c)
-                          (unsafe-fl* #,d #,a))))
-  (define c=0-case
-    #`(values (unsafe-fl+ (unsafe-fl/ #,b #,d)
-                          (unsafe-fl* #,c #,a))
-              (unsafe-fl- (unsafe-fl* #,c #,b)
-                          (unsafe-fl/ #,a #,d))))
-
-  (define general-case
-    #`(let* ([cm    (unsafe-flabs #,c)]
-             [dm    (unsafe-flabs #,d)]
-             [swap? (unsafe-fl< cm dm)]
-             [a     (if swap? #,b #,a)]
-             [b     (if swap? #,a #,b)]
-             [c     (if swap? #,d #,c)]
-             [d     (if swap? #,c #,d)]
-             [r     (unsafe-fl/ c d)]
-             [den   (unsafe-fl+ d (unsafe-fl* c r))]
-             [i     (if swap?
-                        (unsafe-fl/ (unsafe-fl- a (unsafe-fl* b r)) den)
-                        (unsafe-fl/ (unsafe-fl- (unsafe-fl* b r) a) den))])
-        (values (unsafe-fl/ (unsafe-fl+ b (unsafe-fl* a r)) den)
-                i)))
-  (cond [both-real?
-         #`[(#,res-real #,res-imag)
-            (values (unsafe-fl/ #,a #,c)
-                    0.0)]] ; currently not propagated
-        [else
-         #`[(#,res-real #,res-imag)
-            (cond [(unsafe-fl= #,d 0.0) #,d=0-case]
-                  [(unsafe-fl= #,c 0.0) #,c=0-case]
-                  [else                 #,general-case])]]))
-
-;; a+bi / c+di, names for real and imag parts of result -> one let-values binding clause
-;; b = exact 0
-;; a,c,d are floats (!= exact 0)
-(define (unbox-one-float-complex-/ a c d res-real res-imag)
-  ;; TODO: In what cases is the negation in the d=0 case useful
-  (define d=0-case
-    #`(values (unsafe-fl/ #,a #,c)
-              (unsafe-fl* -1.0 (unsafe-fl* #,d #,a))))
-  (define c=0-case
-    #`(values (unsafe-fl* #,c #,a)
-              (unsafe-fl* -1.0 (unsafe-fl/ #,a #,d))))
-
-
-  (define general-case
-    #`(let* ([cm    (unsafe-flabs #,c)]
-             [dm    (unsafe-flabs #,d)]
-             [swap? (unsafe-fl< cm dm)]
-             [a     #,a]
-             [c     (if swap? #,d #,c)]
-             [d     (if swap? #,c #,d)]
-             [r     (unsafe-fl/ c d)]
-             [den   (unsafe-fl+ d (unsafe-fl* c r))]
-             [i     (if swap?
-                        (unsafe-fl/ (unsafe-fl* -1.0 (unsafe-fl* a r)) den)
-                        (unsafe-fl/ (unsafe-fl* -1.0 a) den))]
-             [j     (if swap? a (unsafe-fl* a r))])
-          (values (unsafe-fl/ j den) i)))
-  #`[(#,res-real #,res-imag)
-     (cond [(unsafe-fl= #,d 0.0) #,d=0-case]
-           [(unsafe-fl= #,c 0.0) #,c=0-case]
-           [else                 #,general-case])])
-
-
-;; it's faster to take apart a complex number and use unsafe operations on
-;; its parts than it is to use generic operations
-;; we keep the real and imaginary parts unboxed as long as we stay within
-;; complex operations
-(define-syntax-class unboxed-float-complex-opt-expr
-  #:commit
-  #:attributes (real-binding imag-binding (bindings 1))
-  #:literal-sets (kernel-literals)
-
-  ;; We let racket's optimizer handle optimization of 0.0s
-  (pattern (#%plain-app op:+^ (~between cs:unboxed-float-complex-opt-expr 2 +inf.0) ...)
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:with (real-binding imag-binding) (binding-names)
-    #:do [(log-unboxing-opt "unboxed binary float complex")]
-    #:with (bindings ...)
-      #`(cs.bindings ... ...
-         #,@(let ()
-               (define (fl-sum cs) (n-ary->binary #'unsafe-fl+ cs))
-               (list
-                #`((real-binding) #,(fl-sum #'(cs.real-binding ...)))
-                #`((imag-binding) #,(fl-sum #'(cs.imag-binding ...)))))))
-  (pattern (#%plain-app op:+^ :unboxed-float-complex-opt-expr)
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:do [(log-unboxing-opt "unboxed unary float complex")])
-
-
-  (pattern (#%plain-app op:-^ (~between cs:unboxed-float-complex-opt-expr 2 +inf.0) ...)
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:with (real-binding imag-binding) (binding-names)
-    #:do [(log-unboxing-opt "unboxed binary float complex")]
-    #:with (bindings ...)
-      #`(cs.bindings ... ...
-         #,@(let ()
-              (define (fl-subtract cs) (n-ary->binary #'unsafe-fl- cs))
-              (list
-               #`((real-binding) #,(fl-subtract #'(cs.real-binding ...)))
-               #`((imag-binding) #,(fl-subtract #'(cs.imag-binding ...)))))))
-  (pattern (#%plain-app op:-^ c1:unboxed-float-complex-opt-expr) ; unary -
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:with (real-binding imag-binding) (binding-names)
-    #:do [(log-unboxing-opt "unboxed unary float complex")]
-    #:with (bindings ...)
-      #`(c1.bindings ...
-         [(real-binding) (unsafe-fl* -1.0 c1.real-binding)]
-         [(imag-binding) (unsafe-fl* -1.0 c1.imag-binding)]))
-
-  (pattern (#%plain-app op:*^
-                        c1:unboxed-float-complex-opt-expr
-                        c2:unboxed-float-complex-opt-expr
-                        cs:unboxed-float-complex-opt-expr ...)
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:with (real-binding imag-binding) (binding-names)
-    #:do [(log-unboxing-opt "unboxed binary float complex")]
-    #:with (bindings ...)
-      #`(c1.bindings ... c2.bindings ... cs.bindings ... ...
-         ;; we want to bind the intermediate results to reuse them
-         ;; the final results are bound to real-binding and imag-binding
-         #,@(let ((lr (syntax->list #'(c1.real-binding c2.real-binding cs.real-binding ...)))
-                  (li (syntax->list #'(c1.imag-binding c2.imag-binding cs.imag-binding ...))))
-              (let loop ([o1 (car lr)]
-                         [o2 (car li)]
-                         [e1 (cdr lr)]
-                         [e2 (cdr li)]
-                         [rs (append (stx-map (lambda (x) (generate-temporary "unboxed-real-"))
-                                              #'(cs.real-binding ...))
-                                     (list #'real-binding))]
-                         [is (append (stx-map (lambda (x) (generate-temporary "unboxed-imag-"))
-                                              #'(cs.imag-binding ...))
-                                     (list #'imag-binding))]
-                         [res '()])
-                (if (null? e1)
-                    (reverse res)
-                    (loop (car rs) (car is) (cdr e1) (cdr e2) (cdr rs) (cdr is)
-                          ;; complex multiplication, imag part, then real part (reverse)
-                          ;; we eliminate operations on the imaginary parts of reals
-                          (let ((o-real? (0.0? o2))
-                                (e-real? (0.0? (car e2))))
-                            (list* #`((#,(car is))
-                                      #,(cond ((and o-real? e-real?) #'0.0)
-                                              (o-real? #`(unsafe-fl* #,o1 #,(car e2)))
-                                              (e-real? #`(unsafe-fl* #,o2 #,(car e1)))
-                                              (else
-                                               #`(unsafe-fl+ (unsafe-fl* #,o2 #,(car e1))
-                                                             (unsafe-fl* #,o1 #,(car e2))))))
-                                   #`((#,(car rs))
-                                      #,(cond ((or o-real? e-real?)
-                                               #`(unsafe-fl* #,o1 #,(car e1)))
-                                              (else
-                                               #`(unsafe-fl- (unsafe-fl* #,o1 #,(car e1))
-                                                             (unsafe-fl* #,o2 #,(car e2))))))
-                                 res))))))))
-  (pattern (#%plain-app op:*^ :unboxed-float-complex-opt-expr)
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:do [(log-unboxing-opt "unboxed unary float complex")])
-
-  (pattern (#%plain-app op:/^
-                        c1:unboxed-float-complex-opt-expr
-                        c2:unboxed-float-complex-opt-expr
-                        cs:unboxed-float-complex-opt-expr ...)
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:with (real-binding imag-binding) (binding-names)
-    #:with reals #'(c1.real-binding c2.real-binding cs.real-binding ...)
-    #:with imags #'(c1.imag-binding c2.imag-binding cs.imag-binding ...)
-    #:do [(log-unboxing-opt "unboxed binary float complex")]
-    #:with (bindings ...)
-      #`(c1.bindings ... c2.bindings ... cs.bindings ... ...
-         ;; we want to bind the intermediate results to reuse them
-         ;; the final results are bound to real-binding and imag-binding
-         #,@(let loop ([a  (stx-car #'reals)]
-                       [b  (stx-car #'imags)]
-                       [e1 (cdr (syntax->list #'reals))]
-                       [e2 (cdr (syntax->list #'imags))]
-                       [rs (append (stx-map (lambda (x) (generate-temporary "unboxed-real-"))
-                                            #'(cs.real-binding ...))
-                                   (list #'real-binding))]
-                       [is (append (stx-map (lambda (x) (generate-temporary "unboxed-imag-"))
-                                            #'(cs.imag-binding ...))
-                                   (list #'imag-binding))]
-                       [res '()])
-              (if (null? e1)
-                  (reverse res)
-                  (loop (car rs) (car is) (cdr e1) (cdr e2) (cdr rs) (cdr is)
-                        (cons (unbox-one-complex-/ a b (car e1) (car e2) (car rs) (car is))
-                              res))))))
-  (pattern (#%plain-app op:/^ c1:unboxed-float-complex-opt-expr) ; unary /
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:with (real-binding imag-binding) (binding-names)
-    #:do [(log-unboxing-opt "unboxed unary float complex")]
-    #:with (bindings ...)
-      #`(c1.bindings ...
-         #,(unbox-one-float-complex-/ #'1.0 #'c1.real-binding #'c1.imag-binding
-                                      #'real-binding #'imag-binding)))
-
-  (pattern (#%plain-app op:conjugate^ c:unboxed-float-complex-opt-expr)
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:with real-binding #'c.real-binding
-    #:with imag-binding (generate-temporary "unboxed-imag-")
-    #:do [(log-unboxing-opt "unboxed unary float complex")]
-    #:with (bindings ...)
-      #`(c.bindings ...
-         ((imag-binding) (unsafe-fl* -1.0 c.imag-binding))))
-
-
-  (pattern (#%plain-app op:exp^ c:unboxed-float-complex-opt-expr)
-    #:when (or (subtypeof? this-syntax -FloatComplex)
-               (and (log-missed-complex-expr) #f))
-    #:with (real-binding imag-binding) (binding-names)
-    #:with scaling-factor (generate-temporary "unboxed-scaling-")
-    #:do [(log-unboxing-opt "unboxed unary float complex")]
-    #:with (bindings ...)
-      #`(c.bindings ...
-         ((scaling-factor) (unsafe-flexp c.real-binding))
-         ((real-binding) (unsafe-fl* (unsafe-flcos c.imag-binding) scaling-factor))
-         ((imag-binding) (unsafe-fl* (unsafe-flsin c.imag-binding) scaling-factor))))
-
-
-  ;; we can eliminate boxing that was introduced by the user
-  (pattern (#%plain-app op:make-rectangular^ real:float-arg-expr imag:float-arg-expr)
-    #:when (or (subtypeof? this-syntax -FloatComplex)
-               (and (log-missed-complex-expr) #f))
-    #:with (real-binding imag-binding) (binding-names)
-    #:do [(log-unboxing-opt "make-rectangular elimination")]
-    #:with (bindings ...)
-      #'(((real-binding) real.opt)
-         ((imag-binding) imag.opt)))
-  (pattern (#%plain-app op:make-polar^ r:float-arg-expr theta:float-arg-expr)
-    #:when (or (subtypeof? this-syntax -FloatComplex)
-               (and (log-missed-complex-expr) #f))
-    #:with radius       (generate-temporary)
-    #:with angle        (generate-temporary)
-    #:with (real-binding imag-binding) (binding-names)
-    #:do [(log-unboxing-opt "make-rectangular elimination")]
-    #:with (bindings ...)
-      #'(((radius)       r.opt)
-         ((angle)        theta.opt)
-         ((real-binding) (unsafe-fl* radius (unsafe-flcos angle)))
-         ((imag-binding) (unsafe-fl* radius (unsafe-flsin angle)))))
-
-  ;; if we see a variable that's already unboxed, use the unboxed bindings
-  (pattern :unboxed-var
-    #:do [(log-unboxing-opt "leave var unboxed")]
-    #:with (bindings ...) #'())
-
-  ;; else, do the unboxing here
-
-  ;; we can unbox literals right away
-  (pattern (quote n*:number)
-    #:do [(define n (syntax->datum #'n*))]
-    #:when (not (equal? (imag-part n) 0))
-    #:with (real-binding imag-binding) (binding-names)
-    #:do [(log-unboxing-opt "unboxed literal")]
-    #:with (bindings ...)
-      #`(((real-binding) '#,(real->double-flonum (real-part n)))
-         ((imag-binding) '#,(real->double-flonum (imag-part n)))))
-
-  (pattern e:float-complex-expr
-    #:with e* (generate-temporary)
-    #:with (real-binding imag-binding) (binding-names)
-    #:do [(log-unboxing-opt "unbox float-complex")]
-    #:with (bindings ...)
-      #`(((e*) e.opt)
-         ((real-binding) (unsafe-flreal-part e*))
-         ((imag-binding) (unsafe-flimag-part e*))))
-
-  ;; The following optimization is incorrect and causes bugs because it turns exact numbers into inexact
-  (pattern e:number-expr
-    #:with e* (generate-temporary)
-    #:with (real-binding imag-binding) (binding-names)
-    #:do [(log-unboxing-opt
-            (if (subtypeof? #'e -Flonum)
-                "float in complex ops"
-                "non float complex in complex ops"))]
-    #:with real-binding-value
-      (cond
-        [(subtypeof? #'e -Flonum) #'e*]
-        [(subtypeof? #'e -Real) #'(real->double-flonum e*)]
-        [else #'(real->double-flonum (real-part e*))])
-    #:with imag-binding-value
-      (cond
-        [(subtypeof? #'e -Real) #'0.0]
-        [else #'(real->double-flonum (imag-part e*))])
-
-    #:with (bindings ...)
-      #'(((e*) e.opt)
-         ((real-binding) real-binding-value)
-         ((imag-binding) imag-binding-value)))
-  (pattern e:expr
-    #:do [(error (format "non exhaustive pattern match ~a" #'e))]
-    #:with (bindings ...) (list)
-    #:with real-binding #f
-    #:with imag-binding #f))
-
-
-(define-syntax-class float-complex-opt-expr
-  #:commit
-  #:attributes (opt)
-  #:literal-sets (kernel-literals)
-  ;; Dummy pattern that can't actually match.
-  ;; We just want to detect "unexpected" Complex _types_ that come up.
-  ;; (not necessarily complex _values_, in fact, most of the time this
-  ;; case would come up, no actual complex values will be generated,
-  ;; but the type system has to play it safe, and must assume that it
-  ;; could happen. ex: (sqrt Integer), if the type system can't prove
-  ;; that the argument is non-negative, it must assume that complex
-  ;; results can happen, even if it never does in the user's program.
-  ;; This is exactly what makes complex types like this "unexpected")
-  ;; We define unexpected as: the whole expression has a Complex type,
-  ;; but none of its subexpressions do. Since our definition of
-  ;; arithmetic expression (see the arith-expr syntax class) exclude
-  ;; constructors (like make-rectangular) and coercions, this is a
-  ;; reasonable definition.
-  (pattern e:arith-expr
-           #:when (when (and (in-complex-layer? #'e)
-                             (for/and ([subexpr (in-syntax #'(e.args ...))])
-                               (subtypeof? subexpr -Real)))
-                    (log-missed-optimization
-                     "unexpected complex type"
-                     (string-append
-                      "This expression has a Complex type, despite all its "
-                      "arguments being reals. If you do not want or expect "
-                      "complex numbers as results, you may want to restrict "
-                      "the type of the arguments or use float-specific "
-                      "operations (e.g. flsqrt), which may have a beneficial "
-                      "impact on performance.")
-                     this-syntax))
-           ;; We don't actually want to match.
-           #:when #f
-           ;; required, otherwise syntax/parse is not happy
-           #:with opt #'#f)
-
-
-  (pattern (#%plain-app op:make-polar^ r theta)
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:with exp:unboxed-float-complex-opt-expr this-syntax
-    #:do [(log-unboxing-opt "make-polar")]
-    #:with opt #`(let*-values (exp.bindings ...)
-                   (unsafe-make-flrectangular exp.real-binding exp.imag-binding)))
-
-  (pattern (#%plain-app op:unboxed-fun .
-             (~var call (float-complex-call-site-opt-expr #'op.unboxed-info)))
-    #:do [(log-unboxing-opt "unboxed call site")
-          (log-arity-raising-opt "call to fun with unboxed args")]
-    #:with opt ((attribute call.opt-app) #'op))
-
-  (pattern :float-complex-arith-opt-expr))
-
-;; Supports not optimizing in order to support using it to check for optimizable expressions.
-;; Thus side effects are hidden behind the optimizing argument and referencing the opt attribute.
-(define-syntax-class (float-complex-arith-expr* optimizing)
-  #:commit
-  #:attributes (opt)
-  #:literal-sets (kernel-literals)
-
-  ;; we can optimize taking the real of imag part of an unboxed complex
-  ;; hopefully, the compiler can eliminate unused bindings for the other part if it's not used
-  (pattern (#%plain-app _:projection^ _:float-complex-expr)
-    #:attr opt
-      (delay
-        (syntax-parse this-syntax
-          [(#%plain-app op:projection^ c:unboxed-float-complex-opt-expr)
-           (log-unboxing-opt "complex accessor elimination")
-           #`(let*-values (c.bindings ...)
-               #,(if (or (free-identifier=? #'op #'real-part)
-                         (free-identifier=? #'op #'flreal-part)
-                         (free-identifier=? #'op #'unsafe-flreal-part))
-                     #'c.real-binding
-                     #'c.imag-binding))])))
-
-  (pattern (#%plain-app _:magnitude^ _:float-complex-expr)
-    #:attr opt
-      (delay
-        (syntax-parse this-syntax
-          [(#%plain-app op:magnitude^ c:unboxed-float-complex-opt-expr)
-           (log-unboxing-opt "unboxed unary float complex")
-           #`(let*-values (c.bindings ...)
-               (unsafe-flsqrt
-                 (unsafe-fl+ (unsafe-fl* c.real-binding c.real-binding)
-                             (unsafe-fl* c.imag-binding c.imag-binding))))])))
-
-
-  (pattern (#%plain-app op:float-complex-op e:expr ...)
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:attr opt
-      (delay
-        (syntax-parse this-syntax
-          (exp:unboxed-float-complex-opt-expr
-           #'(let*-values (exp.bindings ...)
-               (unsafe-make-flrectangular exp.real-binding exp.imag-binding))))))
-
-  ;; division is special. can only optimize if none of the arguments can be exact 0.
-  ;; otherwise, optimization is unsound (we'd give a result where we're supposed to throw an error)
-  (pattern (#%plain-app op:/^ e:expr ...)
-    #:when (subtypeof? this-syntax -FloatComplex)
-    #:when (let ([irritants
-                  (for/list ([c (in-syntax #'(e ...))]
-                             #:when (match (type-of c)
-                                      [(tc-result1: t)
-                                       (subtype -Zero t)]
-                                      [_ #t]))
-                    c)])
-             (define safe-to-opt? (null? irritants))
-             ;; result is Float-Complex, but unsafe to optimize, missed optimization
-             (when (and optimizing (not safe-to-opt?))
-               (log-missed-optimization
-                "Float-Complex division, potential exact 0s on the rhss"
-                (string-append
-                 "This expression has a Float-Complex type, but cannot be safely unboxed. "
-                 "The second (and later) arguments could potentially be exact 0."
-                 (if (null? irritants)
-                     ""
-                     "\nTo fix, change the highlighted expression(s) to have Float (or Float-Complex) type(s)."))
-                this-syntax irritants))
-             safe-to-opt?)
-    #:attr opt
-      (delay
-        (syntax-parse this-syntax
-          (exp:unboxed-float-complex-opt-expr
-           #'(let*-values (exp.bindings ...)
-               (unsafe-make-flrectangular exp.real-binding exp.imag-binding))))))
-
-  (pattern (~and :unboxed-var v:float-complex-expr)
-    ;; unboxed variable used in a boxed fashion, we have to box
-    #:attr opt
-      (delay
-       (log-unboxing-opt "unboxed complex variable")
-       #'(unsafe-make-flrectangular real-binding imag-binding))))
-
-
-(define-syntax-class possibly-unboxed
-  #:attributes ([bindings 1] [real-binding 1] [imag-binding 1] [boxed-binding 1])
-  (pattern (#t arg:unboxed-float-complex-opt-expr)
-    #:with (bindings ...) #'(arg.bindings ...)
-    #:with (real-binding ...) #'(arg.real-binding)
-    #:with (imag-binding ...) #'(arg.imag-binding)
-    #:with (boxed-binding ...) #'())
-  (pattern (#f arg:opt-expr)
-    #:with binding-name (generate-temporary 'boxed-binding)
-    #:with (bindings ...) #'(((binding-name) arg.opt))
-    #:with (real-binding ...) #'()
-    #:with (imag-binding ...) #'()
-    #:with (boxed-binding ...) #'(binding-name)))
-
-;; takes as argument a structure describing which arguments will be unboxed
-;; We cannot log opt here because this doesn't see the full original syntax
-(define-syntax-class (float-complex-call-site-opt-expr unboxed-info)
-  #:commit
-  #:attributes (opt-app)
-  ;; call site of a function with unboxed parameters
-  ;; the calling convention is: real parts of unboxed, imag parts, boxed
-  (pattern (orig-args:expr ...)
-    #:with (unboxed-args ...) unboxed-info
-    #:attr opt-app
-      (λ (op)
-        (syntax-parse #'((unboxed-args orig-args) ...)
-          [(e:possibly-unboxed ...)
-           #`(let*-values (e.bindings ... ...)
-               (#,op e.real-binding ... ...
-                     e.imag-binding ... ...
-                     e.boxed-binding ... ...))]))))
-
-
-(define-syntax-class/specialize float-complex-arith-opt-expr (float-complex-arith-expr* #t))
-(define-syntax-class/specialize float-complex-arith-expr (float-complex-arith-expr* #f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float.rkt
deleted file mode 100644
index 2a6400842c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float.rkt
+++ /dev/null
@@ -1,292 +0,0 @@
-#lang racket/base
-
-(require syntax/parse unstable/sequence racket/dict racket/flonum racket/promise
-         syntax/parse/experimental/specialize
-         (for-template racket/base racket/flonum racket/unsafe/ops racket/math)
-         "../utils/utils.rkt"
-         (utils tc-utils)
-         (types numeric-tower union abbrev)
-         (optimizer utils numeric-utils logging fixnum))
-
-(provide float-opt-expr float-arg-expr int-expr float-op)
-
-
-(define (mk-float-tbl generic)
-  (mk-unsafe-tbl generic "fl~a" "unsafe-fl~a"))
-
-(define binary-float-ops
-  (mk-float-tbl (list #'+ #'- #'* #'/ #'min #'max #'expt)))
-(define binary-float-comps
-  (dict-set*
-    (mk-float-tbl (list #'= #'<= #'< #'> #'>=))
-    ;; not a comparison, but takes 2 floats and does not return a float,
-    ;; unlike binary-float-ops
-    #'make-rectangular #'unsafe-make-flrectangular
-    #'make-flrectangular #'unsafe-make-flrectangular))
-
-(define unary-float-ops
-  (dict-set
-    (mk-float-tbl (list #'abs #'sin #'cos #'tan #'asin #'acos #'atan #'log #'exp
-                        #'sqrt #'round #'floor #'ceiling #'truncate))
-    #'magnitude #'unsafe-flabs))
-
-(define-literal-syntax-class -)
-(define-literal-syntax-class /)
-(define-literal-syntax-class sqr)
-(define-literal-syntax-class zero?)
-(define-literal-syntax-class add1)
-(define-literal-syntax-class sub1)
-(define-literal-syntax-class ->float^ (exact->inexact real->double-flonum))
-(define-literal-syntax-class ->single-float^ (exact->inexact real->single-flonum))
-
-(define-literal-syntax-class random)
-(define-literal-syntax-class flrandom)
-(define-merged-syntax-class random-op (random^ flrandom^))
-
-(define-syntax-class (float-op tbl)
-  #:commit
-  (pattern i:id
-           #:when (dict-ref tbl #'i #f)
-           #:with unsafe (begin (add-disappeared-use #'i)
-                                (dict-ref tbl #'i))))
-
-(define-syntax-class/specialize float-expr (subtyped-expr -Flonum))
-(define-syntax-class/specialize single-float-expr (subtyped-expr -SingleFlonum))
-(define-syntax-class/specialize int-expr (subtyped-expr -Integer))
-(define-syntax-class/specialize real-expr (subtyped-expr -Real))
-(define-syntax-class/specialize unary-float-op (float-op unary-float-ops))
-(define-syntax-class/specialize binary-float-op (float-op binary-float-ops))
-(define-syntax-class/specialize binary-float-comp (float-op binary-float-comps))
-
-;; if the result of an operation is of type float, its non float arguments
-;; can be promoted, and we can use unsafe float operations
-;; note: none of the unary operations have types where non-float arguments
-;;  can result in float (as opposed to real) results
-(define-syntax-class float-arg-expr
-  #:commit
-  #:attributes (opt)
-  #:literal-sets (kernel-literals)
-  ;; we can convert literals right away
-  (pattern (quote n)
-    #:when (and (real?  (syntax->datum #'n))
-                (exact? (syntax->datum #'n)))
-    #:with opt #`'#,(real->double-flonum (syntax->datum #'n)))
-  (pattern e:fixnum-expr
-    #:attr opt (delay #'(unsafe-fx->fl e.opt)))
-  (pattern e:int-expr
-    #:attr opt (delay #'(->fl e.opt)))
-  (pattern :float-expr)
-  ;; reals within float expressions are not always valid to optimize because
-  ;; of the exact 0 problem, but since float-opt-expr checks whether the
-  ;; surrounding expressing is of type Float and not just Real, this is safe
-  (pattern e:real-expr
-     #:attr opt (delay #'(real->double-flonum e.opt))))
-
-(define (log-float-real-missed-opt stx irritants)
-  (log-missed-optimization
-   "all args float-arg-expr, result not Float"
-   (string-append
-    "This expression has a Real type. The optimizer could optimize it if it had type Float."
-    (if (null? irritants)
-        ""
-        " To fix, change the highlighted expression(s) to have Float type(s)."))
-   stx irritants))
-
-(define-syntax-rule (log-fl-opt opt-label)
-  (log-opt opt-label "Float arithmetic specialization."))
-
-(define (maybe-exact-rational? stx)
-  (and (subtypeof? stx -Real)
-       (not (subtypeof? stx -Flonum))
-       (not (subtypeof? stx -SingleFlonum))
-       (not (subtypeof? stx -Int))))
-
-
-(define-syntax-class float-opt-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-  (pattern (#%plain-app op:unary-float-op f:float-arg-expr)
-           #:when (let* ([safe-to-opt? (subtypeof? this-syntax -Flonum)]
-                         [missed-optimization? (and (not safe-to-opt?)
-                                                    (in-real-layer? this-syntax))])
-                    (when missed-optimization?
-                      (log-float-real-missed-opt this-syntax (list #'f)))
-                    safe-to-opt?)
-           #:do [(log-fl-opt "unary float")]
-           #:with opt #'(op.unsafe f.opt))
-  (pattern (#%plain-app op:binary-float-op
-                        ;; for now, accept anything that can be coerced to float
-                        ;; finer-grained checking is done below
-                        (~between fs:float-arg-expr 2 +inf.0) ...)
-           #:when (let* ([safe-to-opt?
-                          ;; For it to be safe, we need:
-                          ;; - the result to be a float, in which case coercing args to floats
-                          ;;   won't change the result type
-                          ;; - all non-float arguments need to be provably non-zero
-                          ;;   otherwise, we may hit corner cases like (* 0 <float>) => 0
-                          ;;   or (+ 0 -0.0) => -0.0 (while (+ 0.0 -0.0) => 0.0)
-                          ;; - only one argument can be coerced. If more than one needs
-                          ;;   coercion, we could end up turning exact (or single-float)
-                          ;;   operations into float operations by accident.
-                          ;;   (Note: could allow for more args, if not next to each other, but
-                          ;;    probably not worth the trouble (most ops have 2 args anyway))
-                          (and (subtypeof? this-syntax -Flonum)
-                               (for/and ([a (in-syntax #'(fs ...))])
-                                 ;; flonum or provably non-zero
-                                 (or (subtypeof? a -Flonum)
-                                     (subtypeof? a (Un -PosReal -NegReal))))
-                               (>= 1
-                                   (for/sum ([a (in-syntax #'(fs ...))]
-                                             #:when (not (subtypeof? a -Flonum)))
-                                     1)))]
-                         ;; if we don't have a return type of float, or if the return type is
-                         ;; float, but we can't optimize for some other reason, we missed an
-                         ;; optimization opportunity, report it
-                         ;; ignore operations that stay within integers or rationals, since
-                         ;; these have nothing to do with float optimizations
-                         [missed-optimization? (and (not safe-to-opt?)
-                                                    (or (in-real-layer? this-syntax)
-                                                        (in-float-layer? this-syntax)))])
-                    (when missed-optimization?
-                      (log-float-real-missed-opt
-                       this-syntax
-                       (for/list ([x (in-syntax #'(fs ...))]
-                                  #:unless (subtypeof? x -Flonum))
-                         x)))
-                    ;; If an optimization was expected (whether it was safe or not doesn't matter),
-                    ;; report subexpressions doing expensive exact arithmetic (Exact-Rational and
-                    ;; Real arithmetic), since that extra precision would be "lost" by going to
-                    ;; floating-point in this expression.
-                    ;; Since this exact behavior can be desirable, it's invalid to optimize it away,
-                    ;; but it's more likely to be there by accident. I can't really think of many
-                    ;; use cases for computing exact intermediate results, then converting them to
-                    ;; floats at the end.
-                    (when (or safe-to-opt? missed-optimization?)
-                      (define extra-precision-subexprs
-                        (filter
-                         values
-                         (for/list ([subexpr (in-syntax #'(fs ...))]
-                                    #:when (or (and (in-real-layer? subexpr)
-                                                    ;; exclude single-flonums
-                                                    (not (subtypeof? subexpr -InexactReal)))
-                                               (in-rational-layer? subexpr)))
-                           (syntax-parse subexpr
-                             ;; Only warn about subexpressions that actually perform exact arithmetic.
-                             ;; There's not much point in warning about literals/variables that will
-                             ;; be coerced anyway, or about things like:
-                             ;; (vector-ref vector-of-rationals x)
-                             ;; which don't perform arithmetic despite returning numbers.
-                             [(~and e:arith-expr (op args ...))
-                              ;; if a subexpression has any float args, it will be reported as a
-                              ;; float-real mix missed opt, so this report would be redundant
-
-                              #:when (for/and ([s (in-syntax #'(args ...))])
-                                       (not (in-float-layer? s)))
-                              #'e]
-                             [_ #f]))))
-                      (when (and (not (null? extra-precision-subexprs))
-                                 (subtypeof? this-syntax -InexactReal))
-                        (log-missed-optimization
-                         "exact ops inside float expr"
-                         "This expression has a Float type, but the highlighted subexpression(s) use exact arithmetic. The extra precision of the exact arithmetic will be lost. Using Float types in these subexpression(s) may result in performance gains without significant precision loss."
-                         this-syntax extra-precision-subexprs)))
-                    safe-to-opt?)
-           #:do [(log-fl-opt "binary float")]
-           #:with opt (n-ary->binary #'op.unsafe #'(fs.opt ...)))
-  (pattern (#%plain-app op:binary-float-comp f1:float-expr f2:float-expr)
-    #:do [(log-fl-opt "binary float comp")]
-    #:with opt #'(op.unsafe f1.opt f2.opt))
-  (pattern (#%plain-app op:binary-float-comp
-                        f1:float-expr
-                        f2:float-expr
-                        fs:float-expr ...)
-    #:do [(log-fl-opt "multi float comp")]
-    #:with opt (n-ary-comp->binary #'op.unsafe #'f1.opt #'f2.opt #'(fs.opt ...)))
-  (pattern (#%plain-app op:binary-float-comp args:opt-expr ...)
-    ;; some args, but not all (otherwise above would have matched) are floats
-    ;; mixed-type comparisons are slow and block futures
-    #:when (let ([some-float? (for/first ([e (in-syntax #'(args ...))]
-                                          #:when (subtypeof? e -Flonum))
-                                e)])
-             (when some-float?
-               (define non-floats ; irritants
-                 (for/list ([e (in-syntax #'(args ...))]
-                            #:unless (subtypeof? e -Flonum))
-                   e))
-               (log-missed-optimization
-                "generic comparison"
-                (string-append
-                 "This expression compares values of different exactnesses, "
-                 "which prevents optimization. "
-                 "To fix, explicitly convert the highlighted expressions to "
-                 "be of type Float.")
-                this-syntax
-                non-floats))
-             #f) ; keep trying other patterns
-    #:with opt #f) ; will never be reached
-
-  (pattern (#%plain-app op:-^ f:float-expr)
-    #:do [(log-fl-opt "unary float")]
-    #:with opt #'(unsafe-fl* -1.0 f.opt))
-  (pattern (#%plain-app op:/^ f:float-expr)
-    #:do [(log-fl-opt "unary float")]
-    #:with opt #'(unsafe-fl/ 1.0 f.opt))
-  (pattern (#%plain-app op:sqr^ f:float-expr)
-    #:do [(log-fl-opt "unary float")]
-    #:with opt #'(let ([tmp f.opt]) (unsafe-fl* tmp tmp)))
-
-  ;; we can optimize exact->inexact if we know we're giving it an Integer
-  (pattern (#%plain-app op:->float^ n:int-expr)
-    #:do [(log-fl-opt "int to float")]
-    #:with opt #'(->fl n.opt))
-  ;; we can get rid of it altogether if we're giving it a float
-  (pattern (#%plain-app op:->float^ f:float-expr)
-    #:do [(log-fl-opt "float to float")]
-    #:with opt #'f.opt)
-  ;; same for single-flonums
-  (pattern (#%plain-app op:->single-float^ f:single-float-expr)
-    #:do [(log-fl-opt "single-float to single-float")]
-    #:with opt #'f.opt)
-
-  (pattern (#%plain-app op:zero?^ f:float-expr)
-    #:do [(log-fl-opt "float zero?")]
-    #:with opt #'(unsafe-fl= f.opt 0.0))
-
-  (pattern (#%plain-app op:add1^ n:float-expr)
-    #:do [(log-fl-opt "float add1")]
-    #:with opt #'(unsafe-fl+ n.opt 1.0))
-  (pattern (#%plain-app op:sub1^ n:float-expr)
-    #:do [(log-fl-opt "float sub1")]
-    #:with opt #'(unsafe-fl- n.opt 1.0))
-
-  (pattern (#%plain-app op:random-op prng:opt-expr)
-    #:when (subtypeof? #'prng -Pseudo-Random-Generator)
-    #:do [(log-fl-opt "float random")]
-    #:with opt #'(unsafe-flrandom prng.opt))
-  (pattern (#%plain-app op:random^) ; random with no args
-    #:do [(log-fl-opt "float 0-arg random")
-          ;; We introduce a reference to `current-pseudo-random-generator',
-          ;; but, by optimizing, we're preventing the hidden cost reports
-          ;; from triggering down the line (see hidden-cost.rkt), so we need
-          ;; to do the logging ourselves.
-          (log-optimization-info "hidden parameter (random)" #'op)]
-    #:with opt #'(unsafe-flrandom (current-pseudo-random-generator)))
-
-  ;; warn about (potentially) exact real arithmetic, in general
-  ;; Note: These patterns don't perform optimization. They only produce logging
-  ;;  for consumption by Optimization Coach.
-  (pattern (#%plain-app op:binary-float-op n:opt-expr ...)
-    #:when (maybe-exact-rational? this-syntax)
-    #:do [(log-opt-info "possible exact real arith")]
-    #:with opt #'(op n.opt ...))
-  (pattern (#%plain-app op:binary-float-comp n:opt-expr ...)
-     ;; can't look at return type, since it's always bool
-     #:when (andmap maybe-exact-rational? (syntax->list #'(n ...)))
-     #:do [(log-opt-info "possible exact real arith")]
-     #:with opt #'(op n.opt ...))
-  (pattern (#%plain-app op:unary-float-op n:opt-expr ...)
-     #:when (maybe-exact-rational? this-syntax)
-     #:do [(log-opt-info "possible exact real arith")]
-     #:with opt #'(op n.opt ...))
-  )
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/hidden-costs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/hidden-costs.rkt
deleted file mode 100644
index 1213b4e462..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/hidden-costs.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket/base
-
-(require syntax/parse unstable/sequence
-         (for-template racket/base)
-         "../utils/utils.rkt"
-         (optimizer utils logging)
-         (types abbrev struct-table))
-
-(provide hidden-cost-log-expr)
-
-;; not an exhaustive list
-(define-literal-syntax-class hidden-port-parameter-function
-  (display displayln newline write write-byte write-bytes print printf))
-(define-literal-syntax-class hidden-random-parameter-function
-  (random))
-(define-literal-syntax-class regexp-function
-  (regexp-match regexp-try-match regexp-match-positions regexp-match?
-   regexp-match-peek regexp-match-peek-positions regexp-match-peek-immediate
-   regexp-match-peek-positions-immediate regexp-match-peek-positions
-   regexp-match/end regexp-match-positions/end regexp-match-peek-positions/end
-   regexp-match-peek-positions-immediate/end regexp-split))
-
-;; This syntax class does not perform optimization.
-;; It only logs operations with hidden costs, for use by Optimization Coach.
-(define-syntax-class hidden-cost-log-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-
-  ;; Log functions that access parameters implicitly (e.g. `display', which
-  ;; accesses `current-output-port').
-  (pattern (#%plain-app op:hidden-port-parameter-function args:opt-expr ...)
-    ;; The function is not getting its output port as argument.
-    ;; Since the port is first arg for some functions, second for
-    ;; others, we're conservative, and look for a port in any position.
-    #:when (for/and ([arg (in-syntax #'(args ...))])
-             (not (subtypeof? arg -Output-Port)))
-    #:do [(log-optimization-info "hidden parameter" #'op)]
-    #:with opt (syntax/loc this-syntax (op args.opt ...)))
-  ;; This one only fires if the call to `random' didn't get optimized
-  ;; (which logs the hidden cost itself), i.e. (random <Integer>) .
-  (pattern (#%plain-app op:hidden-random-parameter-function args:opt-expr ...)
-    ;; see above
-    #:when (for/and ([arg (in-syntax #'(args ...))])
-             (not (subtypeof? arg -Pseudo-Random-Generator)))
-    #:do [(log-optimization-info "hidden parameter (random)" #'op)]
-    #:with opt (syntax/loc this-syntax (op args.opt ...)))
-
-  ;; Log calls to struct constructors, so that OC can report those used in
-  ;; hot loops.
-  ;; Note: Sometimes constructors are wrapped in `#%expression', need to watch
-  ;;  for that too.
-  (pattern (#%plain-app (~and op-part (~or op:id (#%expression op:id)))
-                        args:opt-expr ...)
-    #:when (let ([constructor-for (syntax-property #'op 'constructor-for)])
-             (or (and constructor-for (struct-constructor? constructor-for))
-                 (struct-constructor? #'op)))
-    #:do [(log-optimization-info "struct constructor" #'op)]
-    #:with opt (syntax/loc this-syntax (op-part args.opt ...)))
-
-  ;; regexp-match (or other regexp operation) with non-regexp pattern argument
-  ;; (i.e. string or bytes)
-  (pattern (#%plain-app op:regexp-function pattern-arg:opt-expr
-                        args:opt-expr ...)
-    #:when (not (or (subtypeof? #'pattern-arg -Regexp)
-                    (subtypeof? #'pattern-arg -Byte-Regexp)))
-    #:do [(log-optimization-info "non-regexp pattern" #'pattern-arg)]
-    #:with opt (syntax/loc this-syntax (op pattern-arg.opt args.opt ...))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/list.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/list.rkt
deleted file mode 100644
index 5a42c89303..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/list.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket/base
-
-(require syntax/parse racket/match
-         "../utils/utils.rkt"
-         (types abbrev utils type-table)
-         (optimizer utils logging)
-         (for-template racket/base racket/unsafe/ops))
-
-(provide list-opt-expr)
-
-(define-syntax-class known-length-list-expr
-  #:attributes (opt len)
-  (pattern (~and e :opt-expr)
-           #:attr tys (match (type-of #'e)
-                        [(tc-result1: (List: es)) es]
-                        [_ #f])
-           #:when (attribute tys)
-           #:attr len (length (attribute tys))))
-
-(define-unsafe-syntax-class list-ref)
-(define-unsafe-syntax-class list-tail)
-(define-literal-syntax-class length)
-
-(define-merged-syntax-class list-op (list-ref^ list-tail^))
-
-
-(define-syntax-class list-opt-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-  ;; Similar to known-length vectors opts.
-  ;; If we use `list-ref' or `list-tail' on a known-length list with a
-  ;; literal index, we can optimize if the index is within bounds.
-  (pattern (#%plain-app op:list-op l:known-length-list-expr i:value-expr)
-    #:when (<= 0 (attribute i.val) (sub1 (attribute l.len)))
-    #:do [(log-opt "known-length list op" "List access specialization.")]
-    #:with opt #'(op.unsafe l.opt i.opt))
-  ;; We know the length of known-length lists statically.
-  (pattern (#%plain-app op:length^ l:known-length-list-expr)
-    #:do [(log-opt "known-length list length" "Static list length computation.")]
-    #:with opt #`(let () l.opt #,(attribute l.len))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/logging.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/logging.rkt
deleted file mode 100644
index ecf2cc6393..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/logging.rkt
+++ /dev/null
@@ -1,145 +0,0 @@
-#lang racket/base
-
-(require racket/string
-         unstable/syntax unstable/logging syntax/parse
-         data/queue
-         "../utils/tc-utils.rkt")
-
-(provide log-optimization log-missed-optimization log-optimization-info
-         log-opt log-opt-info
-         with-tr-logging-to-queue
-         (struct-out log-entry)
-         (struct-out opt-log-entry)
-         (struct-out missed-opt-log-entry)
-         (struct-out info-log-entry))
-
-;;--------------------------------------------------------------------
-
-(define TR-logging-level 'debug)
-(define TR-logger (make-logger 'TR-optimizer (current-logger)))
-
-(define (emit-log-message l)
-  (log-message TR-logger TR-logging-level (format-log-entry l) l))
-
-;; producing logs can be expensive, don't do it if no-one's listening
-;; to the logs
-(define (anyone-listening?) (log-level? TR-logger TR-logging-level))
-
-;; msg is for consumption by the DrRacket tool
-(struct log-entry (kind msg stx located-stx pos) #:prefab)
-;; for optimizations only (not missed optimizations, those are below)
-(struct opt-log-entry log-entry () #:prefab)
-
-
-(define (log-optimization kind msg stx)
-  (when (anyone-listening?)
-    (emit-log-message
-     (opt-log-entry kind msg stx (locate-stx stx) (syntax-position stx)))))
-
-(define-syntax-rule (log-opt kind msg)
-  (log-optimization kind msg this-syntax))
-
-;;--------------------------------------------------------------------
-
-;; Keep track of optimizations that "almost" happened, with the intention
-;; of reporting them to the user.
-;; This is meant to help users understand what hurts the performance of
-;; their programs.
-
-;; badness : Integer. crude measure of how severe the missed optimizations are
-;;  currently, it's simply a count of how many missed optimizations occur
-;;  within a given syntax object
-;; irritants are the original, potentially indirect causes of the miss
-;; merged-irritants are intermediate steps between stx and an irritant
-;; they are not actual irritants anymore because they were the stx for a miss
-;; that got merged into this miss. we need to keep them around to detect
-;; future potential merges.
-(struct missed-opt-log-entry log-entry
-        (irritants merged-irritants badness)
-        #:prefab)
-
-(define (log-missed-optimization kind msg stx [irritants '()])
-  (when (anyone-listening?)
-    (let (;; for convenience, if a single irritant is given, wrap it in a list
-          ;; implicitly
-          [irritants (if (list? irritants) irritants (list irritants))])
-      (emit-log-message
-       (missed-opt-log-entry kind msg
-                             stx (locate-stx stx) (syntax-position stx)
-                             irritants '() 1)))))
-
-
-;;--------------------------------------------------------------------
-
-;; Log information that is neither an optimization nor a missed optimization,
-;; but can come in handy, in combination with other information, to detect
-;; near misses.
-
-(struct info-log-entry log-entry () #:prefab)
-
-(define (log-optimization-info kind stx)
-  (when (anyone-listening?)
-    (emit-log-message
-     ;; no actual message, since it's not meant for user consumption
-     (info-log-entry kind "" stx (locate-stx stx) (syntax-position stx)))))
-
-
-(define-syntax-rule (log-opt-info kind)
-  (log-optimization-info kind this-syntax))
-
-;;--------------------------------------------------------------------
-
-(define (line+col->string stx)
-  (let ([line (syntax-line stx)]
-        [col  (syntax-column stx)])
-    (if (and line col)
-        (format "~a:~a" line col)
-        "(no location)")))
-
-(define (format-irritants irritants)
-  (if (null? irritants)
-      ""
-      (format " -- caused by: ~a"
-              (string-join
-               (map (lambda (irritant)
-                      (let ([irritant (locate-stx irritant)])
-                        (format "~a ~s"
-                                (line+col->string irritant)
-                                (syntax->datum irritant))))
-                    (sort irritants <
-                          #:key (lambda (x)
-                                  (or (syntax-position x) 0))))
-               ", "))))
-
-;; For command-line printing purposes.
-;; Not as user friendly as what's produced by the DrRacket tool.
-(define (format-log-entry entry)
-  (define stx (log-entry-located-stx entry))
-  (define msg
-    (format "~a ~a ~s -- ~a"
-            (syntax-source-file-name stx)
-            (line+col->string stx)
-            (syntax->datum stx)
-            (log-entry-kind entry)))
-  (cond [(opt-log-entry? entry)
-         (format "TR opt: ~a" msg)]
-        [(missed-opt-log-entry? entry)
-         (define badness (missed-opt-log-entry-badness entry))
-         (format "TR missed opt: ~a~a~a"
-                 msg
-                 (format-irritants (missed-opt-log-entry-irritants entry))
-                 (if (> badness 1)
-                     (format " (~a times)" badness)
-                     ""))]
-        [(info-log-entry? entry)
-         (format "TR info: ~a" msg)]))
-
-;;--------------------------------------------------------------------
-
-(define (with-tr-logging-to-queue queue thunk)
-  (with-intercepted-logging
-   (lambda (l)
-     (enqueue! queue
-      (string-trim (vector-ref l 1) "TR-optimizer: "))) ; remove logger prefix
-   thunk
-   'debug 'TR-optimizer))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/number.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/number.rkt
deleted file mode 100644
index 9ab369e1ac..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/number.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         syntax/parse/experimental/specialize
-         (for-template racket/base)
-         "../utils/utils.rkt"
-         (types numeric-tower union)
-         (optimizer utils logging))
-
-(provide number-opt-expr)
-
-(define-literal-syntax-class unary-op (+ * min max))
-(define-literal-syntax-class real-part)
-(define-literal-syntax-class imag-part)
-(define-literal-syntax-class abs)
-(define-literal-syntax-class magnitude)
-(define-literal-syntax-class angle)
-
-(define-syntax-class/specialize real-expr
-  (subtyped-expr -Real))
-;; We don't want -0.0 here
-(define-syntax-class/specialize non-neg-real-expr
-  (subtyped-expr (Un -PosReal -Zero -InexactRealPosZero)))
-
-
-(define-syntax-class number-opt-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-  ;; these cases are all identity
-  (pattern (#%plain-app op:unary-op f:opt-expr)
-    #:do [(log-opt "unary number" "Identity elimination.")]
-    #:with opt #'f.opt)
-
-  (pattern (#%plain-app op:real-part^ f:real-expr)
-    #:do [(log-opt "unary number" "Projection elimination.")]
-    #:with opt #'f.opt)
-
-  (pattern (#%plain-app op:imag-part^ f:real-expr)
-    #:do [(log-opt "unary number" "Projection elimination.")]
-    #:with opt #'0)
-
-  (pattern (#%plain-app (~or op:abs^ op:magnitude^) f:non-neg-real-expr)
-    #:do [(log-opt "unary number" "Projection elimination.")]
-    #:with opt #'f.opt)
-
-  (pattern (#%plain-app op:angle^ f:non-neg-real-expr)
-    #:do [(log-opt "unary number" "Projection elimination.")]
-    #:with opt #'0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/numeric-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/numeric-utils.rkt
deleted file mode 100644
index 2d2fab6f37..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/numeric-utils.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-
-(require syntax/parse racket/dict syntax/id-table
-         (for-template racket/base racket/flonum racket/fixnum racket/unsafe/ops)
-         "../utils/utils.rkt"
-         (types numeric-tower)
-         (optimizer utils))
-
-(provide (all-defined-out))
-
-;; layer predicates
-;; useful in some cases where subtyping won't do
-(define (in-integer-layer? t)
-  (subtypeof? t -Int))
-(define (in-rational-layer? t)
-  (and (subtypeof? t -Rat)
-       (not (subtypeof? t -Int))))
-(define (in-float-layer? t)
-  (subtypeof? t -Flonum))
-(define (in-real-layer? t)
-  (and (subtypeof? t -Real)
-       (not (subtypeof? t -Rat))
-       (not (subtypeof? t -Flonum))))
-(define (in-complex-layer? t)
-  (and (subtypeof? t -Number)
-       (not (subtypeof? t -Real))))
-
-(define-syntax-class arith-expr
-  #:literal-sets (kernel-literals)
-  (pattern (#%plain-app op:arith-op args ...)))
-(define-syntax-class arith-op
-  (pattern
-   op:id
-   #:when (dict-ref arith-ops #'op (lambda () #f))))
-;; limited to operation that actually perform arithmeric
-;; so, no comparisons, or coercions, or constructors (make-rectangular), accessors, etc.
-(define arith-ops
-  (make-immutable-free-id-table
-   (map (lambda (x) (list x #t))
-        (list #'* #'+ #'- #'/
-              #'max #'min #'add1 #'sub1
-              #'quotient #'remainder #'modulo
-              #'arithmetic-shift #'bitwise-and #'bitwise-ior #'bitwise-xor #'bitwise-not
-              #'abs #'floor #'ceiling #'truncate #'round
-              #'expt #'sqrt #'integer-sqrt #'log #'exp
-              #'cos #'sin #'tan #'acos #'asin #'atan
-              #'gcd #'lcm #'sgn #'sqr #'conjugate
-              #'sinh #'cosh #'tanh
-              #'fx+ #'fx- #'fx* #'fxquotient #'fxremainder #'fxmodulo #'fxabs
-              #'unsafe-fx+ #'unsafe-fx- #'unsafe-fx* #'unsafe-fxquotient #'unsafe-fxremainder #'unsafe-fxmodulo #'unsafe-fxabs
-              #'fxand #'fxior #'fxxor #'fxnot #'fxlshift #'fxrshift
-              #'unsafe-fxand #'unsafe-fxior #'unsafe-fxxor #'unsafe-fxnot #'unsafe-fxlshift #'unsafe-fxrshift
-              #'fxmax #'fxmin #'unsafe-fxmax #'unsafe-fxmin
-              #'flabs #'fl+ #'fl- #'fl* #'fl/ #'flmin #'flmax
-              #'unsafe-flabs #'unsafe-fl+ #'unsafe-fl- #'unsafe-fl* #'unsafe-fl/ #'unsafe-flmin #'unsafe-flmax
-              #'flround #'flfloor #'flceiling #'fltruncate
-              #'unsafe-flround #'unsafe-flfloor #'unsafe-flceiling #'unsafe-fltruncate
-              #'flsin #'flcos #'fltan #'flasin #'flacos #'flatan
-              #'unsafe-flsin #'unsafe-flcos #'unsafe-fltan #'unsafe-flasin #'unsafe-flacos #'unsafe-flatan
-              #'fllog #'flexp #'flsqrt
-              #'unsafe-fllog #'unsafe-flexp #'unsafe-flsqrt))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/optimizer.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/optimizer.rkt
deleted file mode 100644
index 7df9d75c8d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/optimizer.rkt
+++ /dev/null
@@ -1,89 +0,0 @@
-#lang racket/base
-
-(require syntax/parse racket/pretty
-         "../utils/utils.rkt"
-         (private syntax-properties)
-         (types type-table)
-         (optimizer utils
-                    number fixnum float extflonum float-complex
-                    vector string list pair sequence
-                    box struct dead-code apply unboxed-let
-                    hidden-costs))
-
-
-(provide optimize-top)
-
-
-
-(define-syntax-class opt-expr*
-  #:commit
-  #:literal-sets (kernel-literals)
-  #:attributes (opt)
-  ;; Can't optimize this code because it isn't typechecked
-  (pattern opt:ignore^)
-
-  ;; Same as above, but if the stx is in the ignore table
-  (pattern opt:ignore-table^)
-
-  ;; Can't optimize the body of this code because it isn't typechecked
-  (pattern (~and _:kw-lambda^
-             ((~and op let-values)
-              ([(i:id) e-rhs:opt-expr]) e-body:expr ...))
-           #:with opt (quasisyntax/loc/origin this-syntax #'op
-                        (op ([(i) e-rhs.opt]) e-body ...)))
-
-  ;; interesting cases, where something is optimized
-  (pattern :dead-code-opt-expr)
-  (pattern :unboxed-let-opt-expr)
-  (pattern :apply-opt-expr)
-  (pattern :number-opt-expr)
-  (pattern :fixnum-opt-expr)
-  (pattern :float-opt-expr)
-  (pattern :extflonum-opt-expr)
-  (pattern :float-complex-opt-expr)
-  (pattern :vector-opt-expr)
-  (pattern :string-opt-expr)
-  (pattern :list-opt-expr)
-  (pattern :pair-opt-expr)
-  (pattern :sequence-opt-expr)
-  (pattern :box-opt-expr)
-  (pattern :struct-opt-expr)
-  (pattern :hidden-cost-log-expr)
-
-  ;; boring cases, just recur down
-  (pattern ((~and op (~or #%plain-lambda define-values)) formals e:opt-expr ...)
-           #:with opt (quasisyntax/loc/origin this-syntax #'op (op formals e.opt ...)))
-  (pattern ((~and op case-lambda) [formals e:opt-expr ...] ...)
-           ;; optimize all the bodies
-           #:with opt (syntax/loc/origin this-syntax #'op (op [formals e.opt ...] ...)))
-  (pattern ((~and op (~or let-values letrec-values))
-            ([ids e-rhs:opt-expr] ...) e-body:opt-expr ...)
-           #:with opt (syntax/loc/origin this-syntax #'op
-                        (op ([ids e-rhs.opt] ...)
-                          e-body.opt ...)))
-  (pattern ((~and op letrec-syntaxes+values)
-            stx-bindings
-            ([(ids ...) e-rhs:opt-expr] ...)
-            e-body:opt-expr ...)
-           ;; optimize all the rhss and bodies
-           #:with opt (quasisyntax/loc/origin this-syntax #'op
-                        (letrec-syntaxes+values
-                          stx-bindings
-                          ([(ids ...) e-rhs.opt] ...)
-                          e-body.opt ...)))
-  (pattern ((~and kw (~or if begin begin0 set! #%plain-app #%expression
-                          #%variable-reference with-continuation-mark))
-            e:opt-expr ...)
-           #:with opt (quasisyntax/loc/origin this-syntax #'kw
-                        (kw e.opt ...)))
-  (pattern (~and ((~or #%provide #%require begin-for-syntax define-syntaxes module module*)
-                  . _)
-                 opt))
-  (pattern (~and (~or (quote _) (quote-syntax _) (#%top . _) :id) opt)))
-
-(define (optimize-top stx)
-  (parameterize ([optimize (syntax-parser [e:opt-expr* #'e.opt])])
-    (let ((result ((optimize) stx)))
-      (when *show-optimized-code*
-        (pretty-print (syntax->datum result)))
-      result)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/pair.rkt
deleted file mode 100644
index a022ce217c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/pair.rkt
+++ /dev/null
@@ -1,146 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         racket/match
-         (for-template racket/base racket/unsafe/ops racket/list)
-         (for-syntax racket/base syntax/parse racket/syntax)
-         "../utils/utils.rkt"
-         (rep type-rep)
-         (types type-table utils)
-         (typecheck typechecker)
-         (optimizer utils logging))
-
-(provide pair-opt-expr)
-
-(define-unsafe-syntax-class car)
-(define-unsafe-syntax-class cdr)
-(define-unsafe-syntax-class mcar)
-(define-unsafe-syntax-class mcdr)
-(define-unsafe-syntax-class set-mcar!)
-(define-unsafe-syntax-class set-mcdr!)
-
-
-(define-merged-syntax-class pair-op (car^ cdr^))
-(define-merged-syntax-class mpair-op (mcar^ mcdr^ set-mcar!^ set-mcdr!^))
-
-
-(define (has-pair-type? e)
-  (match (type-of e) ; type of the operand
-    [(tc-result1: (Pair: _ _)) #t]
-    [_ #f]))
-(define (has-mpair-type? e)
-  (match (type-of e) ; type of the operand
-    [(tc-result1: (MPair: _ _)) #t]
-    [_ #f]))
-
-(define (log-pair-missed-opt stx irritant)
-  (log-missed-optimization
-   "car/cdr on a potentially empty list"
-   "According to its type, the highlighted list could be empty. Access to it cannot be safely optimized. To fix this, restrict the type to non-empty lists, maybe by wrapping this expression in a check for non-emptiness."
-   stx irritant))
-
-(define-syntax-rule (log-pair-opt)
-  (log-opt "pair" "Pair check elimination."))
-
-(define-syntax-class pair-opt-expr
-  #:commit
-  #:attributes (opt)
-  #:literal-sets (kernel-literals)
-
-  ;; no logging here, redundant with actual pair opt
-  (pattern :pair-derived-opt-expr)
-  (pattern (#%plain-app op:pair-op p:opt-expr)
-    #:when (or (has-pair-type? #'p)
-               ;; in this case, we have a potentially empty list, but
-               ;; it has to be a list, otherwise, there would have been
-               ;; a type error
-               (begin (log-pair-missed-opt this-syntax #'p) #f))
-    #:do [(log-pair-opt)]
-    #:with opt #'(op.unsafe p.opt))
-  (pattern (#%plain-app op:mpair-op p:opt-expr e:opt-expr ...)
-    #:when (or (has-mpair-type? #'p)
-               (begin (log-pair-missed-opt this-syntax #'p) #f))
-    #:do [(log-pair-opt)]
-    #:with opt #'(op.unsafe p.opt e.opt ...)))
-
-
-;; change the source location of a given syntax object
-(define (relocate stx loc-stx)
-  (datum->syntax stx (syntax->datum stx) loc-stx stx stx))
-
-;; if the equivalent sequence of cars and cdrs is guaranteed not to fail,
-;; we can optimize
-
-;; accessors is a list of syntax objects, all #'car or #'cdr
-(define (gen-alt accessors op arg stx)
-  (define (gen-alt-helper accessors)
-    (for/fold [(accum arg)] [(acc (reverse accessors))]
-      (quasisyntax/loc stx (#%plain-app #,(relocate acc op) #,accum))))
-  (let ((ty  (type-of stx))
-        (obj (gen-alt-helper accessors)))
-    ;; we're calling the typechecker, but this is just a shortcut, we're
-    ;; still conceptually single pass (we're not iterating). we could get
-    ;; the same result by statically destructing the types.
-    (tc-expr/check obj ty)
-    obj))
-
-(define-syntax gen-pair-derived-expr
-  (syntax-parser
-    [(_ name:id (orig:id seq ...) ...)
-     (define/with-syntax (syntax-class-name ...) (generate-temporaries #'(orig ...)))
-     (define/with-syntax (lit-class-name ...) (generate-temporaries #'(orig ...)))
-     #'(begin
-         (begin
-           (define-literal-syntax-class lit-class-name (orig))
-           (define-syntax-class syntax-class-name
-             #:commit
-             (pattern (#%plain-app (~var op lit-class-name) arg)
-               #:with alt (gen-alt (list seq ...) #'op #'arg this-syntax)))) ...
-         (define-merged-syntax-class name (syntax-class-name ...)))]))
-
-(gen-pair-derived-expr pair-derived-expr
- (caar #'car #'car)
- (cadr #'car #'cdr)
- (cdar #'cdr #'car)
- (cddr #'cdr #'cdr)
- (caaar #'car #'car #'car)
- (caadr #'car #'car #'cdr)
- (cadar #'car #'cdr #'car)
- (caddr #'car #'cdr #'cdr)
- (cdaar #'cdr #'car #'car)
- (cdadr #'cdr #'car #'cdr)
- (cddar #'cdr #'cdr #'car)
- (cdddr #'cdr #'cdr #'cdr)
- (caaaar #'car #'car #'car #'car)
- (caaadr #'car #'car #'car #'cdr)
- (caadar #'car #'car #'cdr #'car)
- (caaddr #'car #'car #'cdr #'cdr)
- (cadaar #'car #'cdr #'car #'car)
- (cadadr #'car #'cdr #'car #'cdr)
- (caddar #'car #'cdr #'cdr #'car)
- (cadddr #'car #'cdr #'cdr #'cdr)
- (cdaaar #'cdr #'car #'car #'car)
- (cdaadr #'cdr #'car #'car #'cdr)
- (cdadar #'cdr #'car #'cdr #'car)
- (cdaddr #'cdr #'car #'cdr #'cdr)
- (cddaar #'cdr #'cdr #'car #'car)
- (cddadr #'cdr #'cdr #'car #'cdr)
- (cdddar #'cdr #'cdr #'cdr #'car)
- (cddddr #'cdr #'cdr #'cdr #'cdr)
- (first   #'car)
- (rest    #'cdr)
- (second  #'car #'cdr)
- (third   #'car #'cdr #'cdr)
- (fourth  #'car #'cdr #'cdr #'cdr)
- (fifth   #'car #'cdr #'cdr #'cdr #'cdr)
- (sixth   #'car #'cdr #'cdr #'cdr #'cdr #'cdr)
- (seventh #'car #'cdr #'cdr #'cdr #'cdr #'cdr #'cdr)
- (eighth  #'car #'cdr #'cdr #'cdr #'cdr #'cdr #'cdr #'cdr)
- (ninth   #'car #'cdr #'cdr #'cdr #'cdr #'cdr #'cdr #'cdr #'cdr)
- (tenth   #'car #'cdr #'cdr #'cdr #'cdr #'cdr #'cdr #'cdr #'cdr #'cdr))
-
-(define-syntax-class pair-derived-opt-expr
-  #:commit
-  (pattern e:pair-derived-expr
-           #:with e*:pair-opt-expr #'e.alt
-           #:with opt #'e*.opt))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/sequence.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/sequence.rkt
deleted file mode 100644
index 64e255f3ac..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/sequence.rkt
+++ /dev/null
@@ -1,101 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         racket/match
-         unstable/function
-         syntax/parse/experimental/specialize
-         (for-template racket/base racket/unsafe/ops)
-         "../utils/utils.rkt" "../utils/tc-utils.rkt"
-         (rep type-rep)
-         (types abbrev)
-         (optimizer utils logging float))
-
-(provide sequence-opt-expr)
-
-
-(define-syntax-class/specialize string-expr
-  (typed-expr (λ (t) (type-equal? t -String))))
-(define-syntax-class/specialize bytes-expr
-  (typed-expr (λ (t) (type-equal? t -Bytes))))
-(define-syntax-class/specialize list-expr
-  (typed-expr (λ (t)
-                 (match t
-                   [(Listof: _) #t]
-                   [(List: _) #t]
-                   [_ #f]))))
-(define-syntax-class/specialize vector-expr
-  (typed-expr (disjoin Vector? HeterogeneousVector?)))
-
-(define-syntax-rule (log-seq-opt opt-label stx)
-  (log-optimization
-   opt-label
-   (format
-    "~a\n~a~a~a"
-    "Sequence type specialization."
-    "(You may get better performance by using `" opt-label "' directly.)")
-   stx))
-
-(define-syntax-class make-sequence
-  (pattern op:id
-    #:when (id-from? #'op 'make-sequence 'racket/private/for)
-    #:do [(add-disappeared-use (syntax-local-introduce #'op))]))
-
-(define-syntax-class sequence-opt-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-  ;; if we're iterating (with the for macros) over something we know is a list,
-  ;; we can generate code that would be similar to if in-list had been used
-  (pattern (#%plain-app op:make-sequence _ l:list-expr)
-    #:do [(log-seq-opt "in-list" #'l)]
-    #:with opt #'(let ((i l.opt))
-                   (values unsafe-car unsafe-cdr i
-                           (lambda (x) (not (null? x)))
-                           (lambda (x) #t)
-                           (lambda (x y) #t))))
-  ;; idem for vectors
-  (pattern (#%plain-app op:make-sequence _ v:vector-expr)
-    #:do [(log-seq-opt "in-vector" #'v)]
-    #:with opt #'(let* ((i   v.opt)
-                        (len (unsafe-vector-length i)))
-                   (values (lambda (x) (unsafe-vector-ref i x))
-                           (lambda (x) (unsafe-fx+ 1 x))
-                           0
-                           (lambda (x) (unsafe-fx< x len))
-                           (lambda (x) #t)
-                           (lambda (x y) #t))))
-  ;; and (byte) strings
-  (pattern (#%plain-app op:make-sequence _ s:string-expr)
-    #:do [(log-seq-opt "in-string" #'s)]
-    #:with opt #'(let* ((i   s.opt)
-                        (len (string-length i)))
-                   (values (lambda (x) (string-ref i x))
-                           (lambda (x) (unsafe-fx+ 1 x))
-                           0
-                           (lambda (x) (unsafe-fx< x len))
-                           (lambda (x) #t)
-                           (lambda (x y) #t))))
-  (pattern (#%plain-app op:make-sequence _ s:bytes-expr)
-    #:do [(log-seq-opt "in-bytes" #'s)]
-    #:with opt #'(let* ((i   s.opt)
-                        (len (bytes-length i)))
-                   (values (lambda (x) (bytes-ref i x))
-                           (lambda (x) (unsafe-fx+ 1 x))
-                           0
-                           (lambda (x) (unsafe-fx< x len))
-                           (lambda (x) #t)
-                           (lambda (x y) #t))))
-  (pattern (#%plain-app op:make-sequence _ s:int-expr) ; one-arg in-range
-    #:do [(log-seq-opt "in-range" #'s)]
-    #:with opt #'(let* ((end s.opt))
-                   (values (lambda (x) x)
-                           (lambda (x) (unsafe-fx+ 1 x))
-                           0
-                           (lambda (x) (unsafe-fx< x end))
-                           (lambda (x) #t)
-                           (lambda (x y) #t))))
-  (pattern (#%plain-app op:make-sequence arg:opt-expr s:opt-expr)
-    #:do [(log-missed-optimization
-           "non-specialized for clause"
-           "Typed Racket failed to specialize this `for' clause, which introduces run-time dispatch overhead. You can avoid this by limiting the sequence's type to a single kind of sequence (e.g. lists, vectors, or integers) or specializing the sequence manually (e.g. by wrapping it in an `in-list', `in-vector' or `in-range')."
-           #'s)]
-    #:with opt #'(op arg.opt s.opt)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/string.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/string.rkt
deleted file mode 100644
index 4091eb2791..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/string.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         (for-template racket/base racket/unsafe/ops)
-         "../utils/utils.rkt"
-         (optimizer utils logging))
-
-(provide string-opt-expr)
-
-(define-unsafe-syntax-class string-length)
-(define-unsafe-syntax-class bytes-length)
-
-
-(define-syntax-class string-opt-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-  (pattern (#%plain-app op:string-length^ s:opt-expr)
-    #:do [(log-opt "string-length" "String check elimination.")]
-    #:with opt #'(op.unsafe s.opt))
-  (pattern (#%plain-app op:bytes-length^ s:opt-expr)
-    #:do [(log-opt "bytes-length" "Byte string check elimination.")]
-    #:with opt #'(op.unsafe s.opt)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/struct.rkt
deleted file mode 100644
index 8523945b8b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/struct.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         (for-template racket/base racket/unsafe/ops)
-         "../utils/utils.rkt"
-         (utils tc-utils)
-         (types struct-table)
-         (optimizer utils logging))
-
-(provide struct-opt-expr)
-
-(define struct-opt-msg "Struct access specialization.")
-
-(define-syntax-class struct-op
-  #:attributes (message opt idx)
-  (pattern op:id
-    #:when (struct-accessor? #'op)
-    #:attr message "struct ref"
-    #:with idx #`'#,(struct-fn-idx #'op)
-    #:with opt #'unsafe-struct-ref)
-  (pattern op:id
-    #:when (struct-mutator? #'op)
-    #:attr message "struct set"
-    #:with idx #`'#,(struct-fn-idx #'op)
-    #:with opt #'unsafe-struct-set!))
-
-(define-syntax-class struct-opt-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-  ;; we can always optimize struct accessors and mutators
-  ;; if they typecheck, they're safe
-  (pattern (#%plain-app op:struct-op s:opt-expr v:opt-expr ...)
-    #:do [(add-disappeared-use #'op)
-          (log-opt (attribute op.message) struct-opt-msg)]
-    #:with opt #'(op.opt s.opt op.idx v.opt ...)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/unboxed-let.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/unboxed-let.rkt
deleted file mode 100644
index 6178e0473d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/unboxed-let.rkt
+++ /dev/null
@@ -1,296 +0,0 @@
-#lang racket/base
-
-(require syntax/parse syntax/stx unstable/sequence
-         syntax/parse/experimental/template
-         racket/match racket/syntax
-         racket/promise
-         "../utils/utils.rkt"
-         (for-template racket/base)
-         (types numeric-tower utils type-table)
-         (rep type-rep) (env mvar-env)
-         (optimizer utils logging float-complex unboxed-tables))
-
-(provide unboxed-let-opt-expr)
-
-;; possibly replace bindings of complex numbers by bindings of their 2
-;; components useful for intermediate results used more than once and for
-;; loop variables
-(define-syntax-class unboxed-let-opt-expr
-  #:commit
-  #:attributes (opt)
-  (pattern :app-of-unboxed-let-opt-expr)
-  (pattern (~var || (unboxed-let-opt-expr-internal #f))))
-
-;; let loops expand to an application of a letrec-values
-;; thus, the loop function technically escapes from the letrec, but it
-;; escapes in the operator position of a call site we control (here)
-;; we can extend unboxing
-(define-syntax-class app-of-unboxed-let-opt-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-  #:attributes (opt)
-  (pattern (#%plain-app
-             (~and (letrec-values _ :id) ; sole element of the body is an id
-                   (~var operator (unboxed-let-opt-expr-internal #t))
-                   (letrec-values _ loop-fun:unboxed-fun)) .
-             (~var call (float-complex-call-site-opt-expr #'loop-fun.unboxed-info)))
-    #:do [(log-opt "unboxed call site" "Complex number unboxing")
-          (log-optimization "unboxed let loop" arity-raising-opt-msg #'loop-fun)]
-    #:with opt #`(let*-values (((op) operator.opt)) #,((attribute call.opt-app) #'op))))
-
-;; does the bulk of the work
-;; detects which let bindings can be unboxed, same for arguments of let-bound
-;; functions
-(define-syntax-class (unboxed-let-opt-expr-internal let-loop?)
-  #:commit
-  #:literal-sets (kernel-literals)
-  #:attributes (opt)
-  (pattern
-   (letk:let-like-keyword ((~and clause (lhs rhs)) ...)
-                          body:opt-expr ...)
-   #:do [;; Ids that do not escape
-         (define-syntax-class non-escaping-function-id
-           (pattern fun-name:id
-              #:when (not (or (escapes? #'fun-name #'(begin rhs ...) #f)
-                              (escapes? #'fun-name #'(begin body ...) let-loop?)))))
-
-         ;; Syntax classes for detecting clauses which can be unboxed.
-         ;; This is split from actually unboxing so that variables defined in later clauses will be
-         ;; unboxed in expressions in earlier clauses.
-
-         ;; Clauses of form ((v) rhs), currently only supports 1 lhs var
-         (define-syntax-class unboxable-let-clause?
-           (pattern ((id:id) rhs:float-complex-expr)
-             #:when (could-be-unboxed-in? #'id #'(begin body ...))))
-
-         ;; Clauses that define functions that can be lifted
-         (define-syntax-class unboxable-fun-clause?
-           (pattern (~and ((_:non-escaping-function-id) body:expr)
-                          _:unboxable-fun-definition)))
-
-         ;; Bindings are delayed so that all clauses are matched before optimizations happen.
-         ;; This ensures that unboxable variables defined in later clauses are detected before
-         ;; optimization starts.
-         (define-syntax-class unboxed-clause
-            #:attributes (bindings)
-            (pattern v:unboxable-let-clause?
-              #:with (real-binding imag-binding) (binding-names)
-              #:do [(add-unboxed-var! #'v.id #'real-binding #'imag-binding)]
-              #:attr bindings
-                (delay
-                  (syntax-parse #'v
-                    [((id:id) c:unboxed-float-complex-opt-expr)
-                     #:do [(log-opt "unboxed let bindings" arity-raising-opt-msg)]
-                     #'(c.bindings ...
-                        ((real-binding) c.real-binding)
-                        ((imag-binding) c.imag-binding))])))
-            (pattern v:unboxable-fun-clause?
-              #:attr bindings
-                (delay
-                  (syntax-parse #'v
-                    [c:unbox-fun-clause
-                     #'(c.bindings ...)])))
-            (pattern v
-              #:attr bindings
-                (delay
-                  (syntax-parse #'v
-                    [(vs rhs:opt-expr)
-                     #'((vs rhs.opt))]))))
-         (define-syntax-class unboxed-clauses
-           #:attributes (bindings)
-           (pattern (clauses:unboxed-clause ...)
-             #:attr bindings (delay (template ((?@ . clauses.bindings) ...)))))]
-
-   #:attr opt
-     (syntax-parse #'(clause ...)
-      [clauses:unboxed-clauses
-        (delay
-          (quasisyntax/loc/origin
-            this-syntax #'letk.kw
-            (letk.key ... clauses.bindings body.opt ...)))])))
-
-
-
-(define-syntax-class constant-var
-  #:attributes ()
-  (pattern v:id
-    #:when (not (is-var-mutated? #'v))))
-
-;; A function definition is unboxable when the following are true:
-;; 1. Its binding is never mutated.
-;; 2. Its type has no keyword arguments or rest/drest arguments.
-;; 3. At least one of the arguments is of the type FloatComplex and used in a manner which benefits
-;; from unboxing.
-(define-syntax-class unboxable-fun-definition
-  #:attributes ()
-  #:literal-sets (kernel-literals)
-  (pattern ((fun-name:constant-var) (~and fun (#%plain-lambda params body ...)))
-    #:do [(define doms
-            (match (type-of #'fun)
-              [(tc-result1: (Function: (list (arr: doms rngs
-                                                   (and rests #f)
-                                                   (and drests #f)
-                                                   (and kws '())))))
-               doms]
-              [_ #f]))]
-    #:when doms
-    #:do [
-       ;; at least 1 argument has to be of type float-complex
-       ;; and can be unboxed
-       (define unboxed-args
-              (for/list ([param (in-syntax #'params)]
-                         [dom doms]
-                         [i (in-naturals)])
-                (cond
-                  [(and (equal? dom -FloatComplex)
-                        (could-be-unboxed-in?
-                          param
-                          #'(begin body ...)))
-                   ;; we can unbox
-                   (log-optimization "unboxed var -> table" arity-raising-opt-msg param)
-                   #t]
-                  [else #f])))]
-    #:when
-       ;; can we unbox anything?
-       (and (member #t unboxed-args)
-            ;; if so, add to the table of functions with
-            ;; unboxed params, so we can modify its call
-            ;; sites, its body and its header
-            (add-unboxed-fun! #'fun-name unboxed-args))))
-
-
-(define-splicing-syntax-class let-like-keyword
-  #:commit
-  #:literal-sets (kernel-literals)
-  #:attributes ([key 1] kw)
-  (pattern (~and kw let-values)
-           ;; we need let*-values because we bind intermediate unboxed results,
-           ;; and the bindings for the final results refer to them
-           #:with (key ...) #'(let*-values))
-  (pattern (~and kw letrec-values)
-           #:with (key ...) #'(kw))
-  (pattern (~seq (~and kw letrec-syntaxes+values) stx-bindings)
-           #:with (key ...) #'(kw stx-bindings)))
-
-
-(define (direct-child-of? v exp)
-  (for/or ((x (in-syntax exp)))
-    (and (identifier? x)
-         (free-identifier=? x v))))
-
-;; if a variable is used at least once in complex arithmetic operations,
-;; it's worth unboxing
-(define (could-be-unboxed-in? v exp)
-
-  ;; if v is a direct child of exp, that means it's used in a boxed
-  ;; fashion, and is not safe to unboxed
-  ;; if not, recur on the subforms
-  (define (look-at exp)
-    (ormap rec (syntax->list exp)))
-
-  (define (rec exp)
-    (syntax-parse exp
-      ;; can be used in a complex arithmetic expr, can be a direct child
-      [(~and (~not :id) exp:float-complex-arith-expr)
-       (or (direct-child-of? v #'exp)
-           (ormap rec (syntax->list #'exp)))]
-      ;; if the variable gets rebound to something else, we look for unboxing
-      ;; opportunities for the new variable too
-      ;; this case happens in the expansion of the for macros, so we care
-      [(l:let-like-keyword ([ids e-rhs:expr] ...) e-body:expr ...)
-       (define rebindings
-         (filter (lambda (x) x)
-                 (stx-map (syntax-parser
-                           [((id) rhs:identifier)
-                            #:when (free-identifier=? v #'rhs)
-                            #'id]
-                           [_ #f])
-                          #'((ids e-rhs) ...))))
-       (or (look-at #'(e-rhs ... e-body ...))
-           (for/or ((x (in-list rebindings)))
-             (could-be-unboxed-in? x exp)))]
-
-      ;; recur down
-      [e:kernel-expression
-       (look-at #'(e.sub-exprs ...))]))
-
-  ;; of course, if the var is mutated, we can't do anything
-  (and (not (is-var-mutated? v))
-       (rec exp)))
-
-;; Very simple escape analysis for functions.
-;; If a function is used in a non-operator position, we consider it escapes.
-;; If it doesn't escape, we may be able to pass its float complex args unboxed.
-;; If we are in a let loop, don't consider functions that escape by being the
-;; sole thing in the let's body as escaping, since they would only escape to
-;; a call site that we control, which is fine.
-(define (escapes? v exp let-loop?)
-
-  (define (look-at exp)
-    (or (direct-child-of? v exp)
-        (ormap rec (syntax->list exp))))
-
-  (define (rec exp)
-    (syntax-parse exp
-      #:literal-sets (kernel-literals)
-
-      [(#%plain-app rator:expr rands:expr ...)
-       (or (direct-child-of? v #'(rands ...)) ; used as an argument, escapes
-           (ormap rec (syntax->list #'(rator rands ...))))]
-      [e:kernel-expression
-       (look-at #'(e.sub-exprs ...))]))
-
-
-  ;; if the given var is the _only_ element of the body and we're in a
-  ;; let loop, we let it slide
-  (and (not (and let-loop?
-                 (syntax-parse exp
-                   #:literal-sets (kernel-literals)
-                   ;; the body gets wrapped in a begin before it's sent here
-                   [(begin i:identifier)
-                    (free-identifier=? #'i v)]
-                   [_ #f])))
-       (rec exp)))
-
-;; let clause whose rhs is a function with some float complex arguments
-;; these arguments may be unboxed
-;; the new function will have all the unboxed arguments first, then all the
-;; boxed
-(define-syntax-class unbox-fun-clause
-  #:commit
-  #:attributes ([bindings 1])
-  #:literal-sets (kernel-literals)
-  (pattern ((fun:unboxed-fun) (#%plain-lambda params body:opt-expr ...))
-    #:with (real-params ...)
-    (stx-map (lambda (x) (generate-temporary "unboxed-real-")) #'(fun.unboxed ...))
-    #:with (imag-params ...)
-    (stx-map (lambda (x) (generate-temporary "unboxed-imag-")) #'(fun.unboxed ...))
-    #:do [(log-optimization "fun -> unboxed fun" arity-raising-opt-msg #'fun)]
-    #:with (bindings ...)
-    ;; add unboxed parameters to the unboxed vars table
-    (let ((to-unbox (syntax->datum #'(fun.unboxed ...))))
-      (define/with-syntax (unboxed ...)
-        (for/list ([param (in-syntax #'params)]
-                   [i (in-naturals)]
-                   #:when (memq i to-unbox))
-          param))
-      (define/with-syntax (boxed ...)
-        (for/list ([param (in-syntax #'params)]
-                   [i (in-naturals)]
-                   #:unless (memq i to-unbox))
-          param))
-      (for ([orig-param (in-syntax #'(unboxed ...))]
-            [real-part (in-syntax #'(real-params ...))]
-            [imag-part (in-syntax #'(imag-params ...))])
-        (add-unboxed-var! orig-param real-part imag-part))
-
-      ;; real parts of unboxed parameters go first, then all
-      ;; imag parts, then boxed occurrences of unboxed
-      ;; parameters will be inserted when optimizing the body
-      ;; We add the original bindings so that dead code in the body,
-      ;; (which will not be optimized), will have correct bindings
-      #`(((fun) (#%plain-lambda
-                  (real-params ... imag-params ... boxed ...)
-                  (let ([unboxed 'check-syntax-binding] ...)
-                    body.opt ...)))))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/unboxed-tables.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/unboxed-tables.rkt
deleted file mode 100644
index 16563791d1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/unboxed-tables.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-
-(require syntax/id-table syntax/parse racket/dict 
-         "../utils/utils.rkt"
-         (utils tc-utils))
-
-(provide
-  add-unboxed-fun!
-  unboxed-fun
-  add-unboxed-var!
-  unboxed-var)
-
-;; contains the bindings which actually exist as separate bindings for each component
-;; associates identifiers to lists (real-binding imag-binding orig-binding-occurrence)
-(define unboxed-vars-table (make-free-id-table))
-
-(define (add-unboxed-var! orig-binding real-binding imag-binding)
-  (dict-set! unboxed-vars-table orig-binding
-             (list real-binding imag-binding orig-binding)))
-
-(define-syntax-class unboxed-var
-  #:attributes (real-binding imag-binding)
-  (pattern v:id
-    #:with unboxed-info (dict-ref unboxed-vars-table #'v #f)
-    #:when (syntax->datum #'unboxed-info)
-    #:with (real-binding imag-binding orig-binding) #'unboxed-info
-    ;; we need to introduce both the binding and the use at the same time
-    #:do [(add-disappeared-use (syntax-local-introduce #'v))
-          (add-disappeared-binding (syntax-local-introduce #'orig-binding))]))
-
-;; associates the names of functions with unboxed args (and whose call sites have to
-;; be modified) to the arguments which can be unboxed and those which have to be boxed
-;; entries in the table are of the form:
-;; ((unboxed ...) (boxed ...))
-;; all these values are indices, since arg names don't make sense for call sites
-;; the new calling convention for these functions have all real parts of unboxed
-;; params first, then all imaginary parts, then all boxed arguments
-(define unboxed-funs-table (make-free-id-table))
-
-(define (add-unboxed-fun! fun-name unboxed-args)
-  (dict-set! unboxed-funs-table fun-name unboxed-args))
-
-(define-syntax-class unboxed-fun
-  #:attributes ((unboxed 1) unboxed-info)
-  (pattern op:id
-    #:do [(define unboxed-args (dict-ref unboxed-funs-table #'op #f))]
-    #:when unboxed-args
-    #:with ((unboxed ...) (boxed ...))
-           (list
-             (for/list ([i (in-naturals)] [unboxed? unboxed-args] #:when unboxed?) i)
-             (for/list ([i (in-naturals)] [unboxed? unboxed-args] #:unless unboxed?) i))
-    #:with (~and unboxed-info (unboxed-args ...)) unboxed-args))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/utils.rkt
deleted file mode 100644
index dab28803d7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/utils.rkt
+++ /dev/null
@@ -1,157 +0,0 @@
-#lang racket/base
-
-(require racket/match unstable/sequence
-         racket/dict syntax/id-table racket/syntax syntax/stx
-         syntax/parse
-         syntax/parse/experimental/specialize
-         racket/promise
-         (for-syntax racket/base syntax/parse racket/syntax)
-         "../utils/utils.rkt"
-         (only-in (utils literal-syntax-class)
-           [define-literal-syntax-class define-literal-syntax-class*])
-         (for-template racket/base)
-         (types type-table utils subtype)
-         (rep type-rep))
-
-(provide *show-optimized-code*
-         subtypeof? isoftype?
-         mk-unsafe-tbl
-         n-ary->binary n-ary-comp->binary
-         opt-expr optimize
-         value-expr typed-expr subtyped-expr
-         kernel-expression
-         define-unsafe-syntax-class
-         define-literal-syntax-class
-         define-merged-syntax-class
-         syntax/loc/origin quasisyntax/loc/origin)
-
-;; for tracking both origin and source location information
-(define-syntax-rule (syntax/loc/origin loc op body)
-  (syntax-track-origin (syntax/loc loc body) loc op))
-(define-syntax-rule (quasisyntax/loc/origin loc op body)
-  (syntax-track-origin (quasisyntax/loc loc body) loc op))
-
-;; if set to #t, the optimizer will dump its result to stdout before compilation
-(define *show-optimized-code* #f)
-
-;; is the syntax object s's type a subtype of t?
-(define (subtypeof? s t)
-  (match (type-of s)
-    [(tc-result1: (== t (lambda (x y) (subtype y x)))) #t] [_ #f]))
-;; similar, but with type equality
-(define (isoftype? s t)
-  (match (type-of s)
-         [(tc-result1: (== t type-equal?)) #t] [_ #f]))
-
-;; generates a table matching safe to unsafe promitives
-(define (mk-unsafe-tbl generic safe-pattern unsafe-pattern)
-  (for/fold ([h (make-immutable-free-id-table)]) ([g (in-list generic)])
-    (let ([f (format-id g safe-pattern g)] [u (format-id g unsafe-pattern g)])
-      (dict-set (dict-set h g u) f u))))
-
-;; unlike their safe counterparts, unsafe binary operators can only take 2 arguments
-;; this works on operations that are (A A -> A)
-(define (n-ary->binary op stx)
-  (for/fold ([o (stx-car stx)]) ([e (in-syntax (stx-cdr stx))])
-    #`(#,op #,o #,e)))
-;; this works on operations that are (A A -> B)
-(define (n-ary-comp->binary op arg1 arg2 rest)
-  ;; First, generate temps to bind the result of each arg2 args ...
-  ;; to avoid computing them multiple times.
-  (define lifted (stx-map (lambda (x) (generate-temporary)) #`(#,arg2 #,@rest)))
-  ;; Second, build the list ((op arg1 tmp2) (op tmp2 tmp3) ...)
-  (define tests
-    (let loop ([res  (list #`(#,op #,arg1 #,(car lifted)))]
-               [prev (car lifted)]
-               [l    (cdr lifted)])
-      (cond [(null? l) (reverse res)]
-            [else (loop (cons #`(#,op #,prev #,(car l)) res)
-                        (car l)
-                        (cdr l))])))
-  ;; Finally, build the whole thing.
-  #`(let #,(for/list ([lhs (in-list lifted)]
-                      [rhs (in-syntax #`(#,arg2 #,@rest))])
-             #`(#,lhs #,rhs))
-      (and #,@tests)))
-
-;; to avoid mutually recursive syntax classes
-;; will be set to the actual optimization function at the entry point
-;; of the optimizer
-(define optimize (make-parameter #f))
-
-(define-syntax-class opt-expr
-  #:commit
-  #:attributes (opt)
-  (pattern e:expr #:attr opt (delay ((optimize) #'e))))
-
-
-(define-syntax (define-unsafe-syntax-class stx)
-  (define-splicing-syntax-class spec
-    #:attributes (class-name (literals 1) unsafe-id)
-    (pattern (~seq class-name:id (literals:id ...) unsafe-id:id))
-    (pattern literal:id
-      #:with (literals ...) #'(literal)
-      #:with class-name (format-id #'literal "~a^" #'literal)
-      #:with unsafe-id (format-id #'literal "unsafe-~a" #'literal)))
-  (syntax-parse stx
-    [(_ :spec)
-     #'(begin
-         (define-literal-syntax-class literal (literals ...))
-         (define-syntax-class class-name
-           (pattern :literal #:with unsafe #'unsafe-id)))]))
-
-(define-syntax (define-literal-syntax-class stx)
-  (syntax-parse stx
-    [(_ . args)
-     #'(define-literal-syntax-class* #:for-template . args)]))
-
-(define-syntax-rule (define-merged-syntax-class name (syntax-classes ...))
-  (define-syntax-class name
-    #:auto-nested-attributes
-    (pattern (~var || syntax-classes)) ...))
-
-(define-syntax-class (typed-expr predicate)
-  #:attributes (opt)
-  (pattern (~and e :opt-expr)
-           #:when (match (type-of #'e)
-                    [(tc-result1: (? predicate)) #t]
-                    [_ #f])))
-
-(define-syntax-class/specialize (subtyped-expr type)
-  (typed-expr (λ (t) (subtype t type))))
-
-(define-syntax-class value-expr
-  #:attributes (val opt)
-  #:literal-sets (kernel-literals)
-  (pattern (quote v)
-    #:attr val (syntax-e #'v)
-    #:with opt this-syntax)
-  (pattern (~and e :opt-expr)
-    #:when (match (type-of #'e)
-             [(tc-result1: (Value: _)) #t]
-             [_ #f])
-    #:attr val (match (type-of #'e)
-                 [(tc-result1: (Value: v)) v]
-                 [_ #f])))
-
-(define-syntax-class kernel-expression
-  #:commit
-  #:literal-sets (kernel-literals)
-  #:attributes [(sub-exprs 1)]
-  [pattern (begin sub-exprs:expr ...)]
-  [pattern ((~or begin0 #%plain-app) sub-exprs:expr ...+)]
-  [pattern (#%plain-lambda formals sub-exprs:expr ...)]
-  [pattern ((~or if with-continuation-mark) e1:expr e2:expr e3:expr)
-    #:with (sub-exprs ...) #'(e1 e2 e3)]
-  [pattern (~or (#%top . _) (#%variable-reference . _) (quote _) (quote-syntax _) :id)
-    #:with (sub-exprs ...) #'()]
-  [pattern (case-lambda [formals e*:expr ...] ...)
-    #:with (sub-exprs ...) #'(e* ... ...)]
-  [pattern ((~or let-values letrec-values) ([ids e-rhs:expr] ...) e-body:expr ...)
-    #:with (sub-exprs ...) #'(e-rhs ... e-body ...)]
-  [pattern (letrec-syntaxes+values stx-bindings ([(ids ...) e-rhs:expr] ...) e-body:expr ...)
-    #:with (sub-exprs ...) #'(e-rhs ... e-body ...)]
-  [pattern (#%expression e:expr)
-    #:with (sub-exprs ...) #'(e)]
-  [pattern (set! _ e:expr)
-    #:with (sub-exprs ...) #'(e)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/vector.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/vector.rkt
deleted file mode 100644
index 424a154894..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/vector.rkt
+++ /dev/null
@@ -1,119 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         racket/match racket/flonum racket/extflonum
-         (for-template racket/base racket/flonum racket/extflonum racket/unsafe/ops)
-         "../utils/utils.rkt"
-         (rep type-rep)
-         (types type-table utils numeric-tower abbrev)
-         (optimizer utils logging fixnum))
-
-(provide vector-opt-expr)
-
-(define-literal-syntax-class vector-length-proc
-  (vector-length unsafe-vector-length unsafe-vector*-length))
-
-(define-literal-syntax-class vector-length)
-(define-literal-syntax-class vector-ref)
-(define-literal-syntax-class vector-set!)
-(define-literal-syntax-class flvector-length)
-(define-unsafe-syntax-class flvector-ref)
-(define-unsafe-syntax-class flvector-set!)
-(define-literal-syntax-class extflvector-length)
-(define-unsafe-syntax-class extflvector-ref)
-(define-unsafe-syntax-class extflvector-set!)
-
-(define-syntax-class vector-op
-  #:commit
-  ;; we need the non-* versions of these unsafe operations to be chaperone-safe
-  (pattern :vector-ref^  #:with unsafe #'unsafe-vector-ref  #:with unsafe-no-impersonator #'unsafe-vector*-ref)
-  (pattern :vector-set!^ #:with unsafe #'unsafe-vector-set! #:with unsafe-no-impersonator #'unsafe-vector*-set!))
-(define-merged-syntax-class flvector-op (flvector-ref^ flvector-set!^ extflvector-ref^ extflvector-set!^))
-
-(define-syntax-class known-length-vector-expr
-  #:commit
-  #:attributes (len opt)
-  (pattern (~and e :opt-expr)
-    #:attr tys (match (type-of #'e)
-                 [(tc-result1: (HeterogeneousVector: tys)) tys]
-                 [_ #f])
-    #:when (attribute tys)
-    #:attr len (length (attribute tys))))
-
-(define-syntax-class vector-opt-expr
-  #:commit
-  #:literal-sets (kernel-literals)
-  #:attributes (opt)
-  ;; vector-length of a known-length vector
-  (pattern (#%plain-app op:vector-length-proc v:known-length-vector-expr)
-    #:do [(log-opt "known-length vector-length" "Static vector length computation.")]
-    ; v may have side effects
-    #:with opt #`(let () v.opt #,(attribute v.len)))
-  ;; optimize vector-length on all vectors.
-  ;; since the program typechecked, we know the arg is a vector.
-  ;; we can optimize no matter what.
-  (pattern (#%plain-app op:vector-length^ v:opt-expr)
-    #:do [(log-opt "vector-length" "Vector check elimination.")]
-    #:with opt #'(unsafe-vector-length v.opt))
-  ;; same for flvector-length and unsafe-flvector-length
-  (pattern (#%plain-app op:flvector-length^ v:opt-expr)
-    #:do [(log-opt "flvector-length" "Float vector check elimination.")]
-    #:with opt #'(unsafe-flvector-length v.opt))
-  (pattern (#%plain-app op:extflvector-length^ v:opt-expr)
-    #:do [(log-opt "extflvector-length" "Extflonum vector check elimination.")]
-    #:with opt #'(unsafe-extflvector-length v.opt))
-  ;; we can optimize vector ref and set! on vectors of known length if we know
-  ;; the index is within bounds (for now, literal or singleton type)
-  (pattern (#%plain-app op:vector-op v:known-length-vector-expr i:value-expr new:opt-expr ...)
-    #:when (<= 0 (attribute i.val) (sub1 (attribute v.len)))
-    #:do [(log-opt "vector" "Vector bounds checking elimination.")]
-    #:with opt #'(op.unsafe v.opt i.opt new.opt ...))
-
-  ;; we can do the bounds checking separately, to eliminate some of the checks
-  (pattern (#%plain-app op:vector-op v:opt-expr i:fixnum-expr new:opt-expr ...)
-    #:do [(log-opt "vector partial bounds checking elimination"
-                   "Partial bounds checking elimination.")]
-    #:with opt
-      (let ([safe-fallback #'(op new-v new-i new.opt ...)]
-            [i-known-nonneg? (subtypeof? #'i -NonNegFixnum)])
-        #`(let ([new-i i.opt]
-                [new-v v.opt])
-            ;; do the impersonator check up front, to avoid doing it twice (length and op)
-            (if (impersonator? new-v)
-                (if #,(let ([one-sided #'(unsafe-fx< new-i (unsafe-vector-length new-v))])
-                        (if i-known-nonneg?
-                            ;; we know it's nonnegative, one-sided check
-                            one-sided
-                            #`(and (unsafe-fx>= new-i 0)
-                                   #,one-sided)))
-                    (op.unsafe new-v new-i new.opt ...)
-                    #,safe-fallback) ; will error. to give the right error message
-                ;; not an impersonator, can use unsafe-vector* ops
-                (if #,(let ([one-sided #'(unsafe-fx< new-i (unsafe-vector*-length new-v))])
-                        (if i-known-nonneg?
-                            one-sided
-                            #`(and (unsafe-fx>= new-i 0)
-                                   #,one-sided)))
-                    (op.unsafe-no-impersonator new-v new-i new.opt ...)
-                    #,safe-fallback)))))
-  ;; similarly for flvectors and extflvectors
-  (pattern (#%plain-app op:flvector-op v:opt-expr i:fixnum-expr new:opt-expr ...)
-    #:do [(define flvector? (subtypeof? #'v -FlVector))
-          (log-opt (format "~a partial bounds checking elimination"
-                           (if flvector? "flvector" "extflvector"))
-                   "Partial bounds checking elimination.")]
-    #:with opt
-      (let ([safe-fallback #'(op new-v new-i new.opt ...)]
-            [i-known-nonneg? (subtypeof? #'i -NonNegFixnum)])
-        #`(let ([new-i i.opt]
-                [new-v v.opt])
-            (if #,(let ([one-sided #`(unsafe-fx< new-i (#,(if flvector?
-                                                              #'unsafe-flvector-length
-                                                              #'unsafe-extflvector-length)
-                                                        new-v))])
-                    (if i-known-nonneg?
-                        one-sided
-                        #`(and (unsafe-fx>= new-i 0)
-                               #,one-sided)))
-                (op.unsafe new-v new-i new.opt ...)
-                #,safe-fallback)))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/class-literals.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/class-literals.rkt
deleted file mode 100644
index cc545dd40e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/class-literals.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base))
-
-(provide ;; for use in ~literal clauses
-         class-internal
-         :-augment)
-
-;; give it a binding, but it shouldn't be used directly
-(define-syntax (class-internal stx)
-  (raise-syntax-error 'class "should only be used internally"))
-
-(define-syntax (:-augment stx)
-  (raise-syntax-error 'class "should only be used internally"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/parse-classes.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/parse-classes.rkt
deleted file mode 100644
index 79a58759a3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/parse-classes.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         "../utils/literal-syntax-class.rkt"
-         (for-label "../base-env/base-types-extra.rkt"))
-(provide star ddd ddd/bound omit-parens)
-
-(define-literal-syntax-class #:for-label ->)
-
-(define-syntax-class star
-  #:description "*"
-  (pattern star:id
-           #:fail-unless (eq? '* (syntax-e #'star)) "missing *")
-  (pattern star:id
-           #:fail-unless (eq? '...* (syntax-e #'star)) "missing ...*"))
-
-(define-syntax-class ddd
-  #:description "..."
-  (pattern ddd:id
-           #:fail-unless (eq? '... (syntax-e #'ddd)) "missing ..."))
-
-(define-splicing-syntax-class ddd/bound
-  #:description "... followed by variable name"
-  #:attributes (bound)
-  (pattern i:id
-           #:attr s (symbol->string (syntax-e #'i))
-           #:fail-unless ((string-length (attribute s)) . > . 3) #f
-           #:fail-unless (equal? "..." (substring (attribute s) 0 3)) "missing ..."
-           #:attr bound (datum->syntax #'i (string->symbol (substring (attribute s) 3)) #'i #'i))
-  (pattern (~seq _:ddd bound:id)))
-
-;; The body of a Forall type or type annotation after the second :
-;; Allows one level of parentheses to be omitted for infix -> types
-(define-syntax-class omit-parens
-  #:attributes (type)
-  ;; FIXME: the error message when a failure is triggered by this case
-  ;;        is not very good, but I have been unsuccessful with ~fail
-  ;;        or with #:fail-when. -- AT
-  (pattern (~and (:->^ x y ~! z ...) (~fail))
-           #:with type 'dummy)
-  (pattern (~and type ((~or (~between :->^ 1 +inf.0) (~not :->^)) ...)))
-  (pattern (type)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/parse-type.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/parse-type.rkt
deleted file mode 100644
index c7f1d705e4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/parse-type.rkt
+++ /dev/null
@@ -1,863 +0,0 @@
-#lang racket/base
-
-;; This module provides functions for parsing types written by the user
-
-(require "../utils/utils.rkt"
-         (except-in (rep type-rep object-rep) make-arr)
-         (rename-in (types abbrev union utils filter-ops resolve
-                           classes)
-                    [make-arr* make-arr])
-         (utils tc-utils stxclass-util literal-syntax-class)
-         syntax/stx (prefix-in c: (contract-req))
-         syntax/parse unstable/sequence
-         (env tvar-env type-alias-env mvar-env
-              lexical-env index-env row-constraint-env)
-         racket/dict
-         racket/promise
-         racket/format
-         racket/match
-         (only-in unstable/list check-duplicate)
-         "parse-classes.rkt"
-         (for-label
-           (except-in racket/base case-lambda)
-           "../base-env/colon.rkt"
-           "../base-env/base-types-extra.rkt"
-           ;; match on the `case-lambda` binding in the TR primitives
-           ;; rather than the one from Racket, which is no longer bound
-           ;; in most TR modules.
-           (only-in "../base-env/case-lambda.rkt" case-lambda)))
-
-(provide/cond-contract ;; Parse the given syntax as a type
-                       [parse-type (syntax? . c:-> . Type/c)]
-                       ;; Parse the given identifier using the lexical
-                       ;; context of the given syntax object
-                       [parse-type/id (syntax? c:any/c . c:-> . Type/c)]
-                       [parse-tc-results (syntax? . c:-> . tc-results/c)]
-                       [parse-literal-alls (syntax? . c:-> . (c:listof (c:or/c (c:listof identifier?) (c:list/c (c:listof identifier?) identifier?))))])
-
-(provide star ddd/bound
-         current-referenced-aliases
-         current-referenced-class-parents
-         current-type-alias-name)
-
-;; current-type-alias-name : Parameter<(Option Id)>
-;; This parameter stores the name of the type alias that is
-;; being parsed (set in type-alias-helper.rkt), #f if the
-;; parsing is not for a type alias
-(define current-type-alias-name (make-parameter #f))
-
-;; current-referenced-aliases : Parameter<Option<Box<List<Id>>>>
-;; This parameter is used to coordinate with the type-checker to determine
-;; if a type alias should be recursive or not
-;;
-;; interp. the argument is #f if not checking for type aliases.
-;;         Otherwise, it should be a box containing a list of
-;;         identifiers (i.e., type aliases in the syntax)
-(define current-referenced-aliases (make-parameter #f))
-
-;; current-referenced-class-parents : Parameter<Option<Box<List<Id>>>>
-;; This parameter is used to coordinate with the type-checker about
-;; the dependency structure of class types using #:implements
-;;
-;; interp. same as above
-(define current-referenced-class-parents (make-parameter #f))
-
-;; current-arities : Parameter<(Listof Natural)>
-;; Represents the stack of function arities in the potentially
-;; nested function type being parsed. The stack does not include the
-;; innermost function (since syntax classes can check that locally)
-(define current-arities (make-parameter null))
-
-(define-syntax-rule (with-arity arity e ...)
-  (parameterize ([current-arities (cons arity (current-arities))])
-    e ...))
-
-(define-literal-syntax-class #:for-label car)
-(define-literal-syntax-class #:for-label cdr)
-(define-literal-syntax-class #:for-label colon^ (:))
-(define-literal-syntax-class #:for-label quote)
-(define-literal-syntax-class #:for-label cons)
-(define-literal-syntax-class #:for-label Class)
-(define-literal-syntax-class #:for-label Object)
-(define-literal-syntax-class #:for-label Refinement)
-(define-literal-syntax-class #:for-label Instance)
-(define-literal-syntax-class #:for-label List)
-(define-literal-syntax-class #:for-label List*)
-(define-literal-syntax-class #:for-label pred)
-(define-literal-syntax-class #:for-label ->)
-(define-literal-syntax-class #:for-label ->*)
-(define-literal-syntax-class #:for-label case->^ (case-> case-lambda))
-(define-literal-syntax-class #:for-label Rec)
-(define-literal-syntax-class #:for-label U)
-(define-literal-syntax-class #:for-label All)
-(define-literal-syntax-class #:for-label Opaque)
-(define-literal-syntax-class #:for-label Parameter)
-(define-literal-syntax-class #:for-label Vector)
-(define-literal-syntax-class #:for-label Struct)
-(define-literal-syntax-class #:for-label Struct-Type)
-(define-literal-syntax-class #:for-label Values)
-(define-literal-syntax-class #:for-label values)
-(define-literal-syntax-class #:for-label Top)
-(define-literal-syntax-class #:for-label Bot)
-
-;; (Syntax -> Type) -> Syntax Any -> Syntax
-;; See `parse-type/id`. This is a curried generalization.
-(define ((parse/id p) loc datum)
-  (let* ([stx* (datum->syntax loc datum loc loc)])
-    (p stx*)))
-
-(define (parse-literal-alls stx)
-  (syntax-parse stx
-    [(:All^ (~or (vars:id ... v:id dd:ddd) (vars:id ...)) . t:omit-parens)
-     (define vars-list (syntax->list #'(vars ...)))
-     (cons (if (attribute v)
-               (list vars-list #'v)
-               vars-list)
-           (parse-literal-alls #'t.type))]
-    [_ null]))
-
-
-;; Syntax -> Type
-;; Parse a Forall type
-(define (parse-all-type stx)
-  (syntax-parse stx
-    [(:All^ (vars:id ... v:id dd:ddd) . t:omit-parens)
-     (define maybe-dup (check-duplicate-identifier (syntax->list #'(vars ... v))))
-     (when maybe-dup
-       (parse-error "duplicate type variable or index"
-                    "variable or index" (syntax-e maybe-dup)))
-     (let* ([vars (stx-map syntax-e #'(vars ...))]
-            [v (syntax-e #'v)])
-       (extend-indexes v
-         (extend-tvars vars
-           (make-PolyDots (append vars (list v)) (parse-type #'t.type)))))]
-    [(:All^ (vars:id ...) . t:omit-parens)
-     (define maybe-dup (check-duplicate-identifier (syntax->list #'(vars ...))))
-     (when maybe-dup
-       (parse-error "duplicate type variable"
-                    "variable" (syntax-e maybe-dup)))
-     (let* ([vars (stx-map syntax-e #'(vars ...))])
-       (extend-tvars vars
-         (make-Poly vars (parse-type #'t.type))))]
-    ;; Next two are row polymorphic cases
-    [(:All^ (var:id #:row) . t:omit-parens)
-     (add-disappeared-use #'kw)
-     (define var* (syntax-e #'var))
-     ;; When we're inferring the row constraints, there
-     ;; should be no need to extend the constraint environment
-     (define body-type
-       (extend-tvars (list var*) (parse-type #'t.type)))
-     (make-PolyRow
-      (list var*)
-      ;; No constraints listed, so we need to infer the constraints
-      (infer-row-constraints body-type)
-      body-type)]
-    [(:All^ (var:id #:row constr:row-constraints) . t:omit-parens)
-     (add-disappeared-use #'kw)
-     (define var* (syntax-e #'var))
-     (define constraints (attribute constr.constraints))
-     (extend-row-constraints (list var*) (list constraints)
-       (extend-tvars (list var*)
-         (make-PolyRow
-          (list var*)
-          constraints
-          (parse-type #'t.type))))]
-    [(:All^ (_:id ...) _ _ _ ...) (parse-error "too many forms in body of All type")]
-    [(:All^ . rest) (parse-error "bad syntax")]))
-
-;; syntax class for standard keyword syntax (same as contracts), may be
-;; optional or mandatory depending on where it's used
-(define-splicing-syntax-class plain-kw-tys
-  (pattern (~seq k:keyword t:expr)
-           #:attr mand-kw (delay (make-Keyword (syntax-e #'k) (parse-type #'t) #t))
-           #:attr opt-kw  (delay (make-Keyword (syntax-e #'k) (parse-type #'t) #f))))
-
-(define-splicing-syntax-class keyword-tys
-  (pattern kw:plain-kw-tys #:attr Keyword (attribute kw.mand-kw))
-  ;; custom optional keyword syntax for TR
-  (pattern (~seq [k:keyword t:expr])
-           #:attr Keyword (delay (make-Keyword (syntax-e #'k) (parse-type #'t) #f))))
-
-(define-syntax-class non-keyword-ty
-  (pattern (k:expr e ...))
-  (pattern (~and t:expr (~not :colon^) (~not :->^))
-           #:when (not (syntax->list #'t))))
-
-;; syntax classes for parsing ->* function types
-(define-syntax-class ->*-mand
-  #:description "mandatory arguments for ->*"
-  #:attributes (doms kws)
-  (pattern (dom:non-keyword-ty ... kw:plain-kw-tys ...)
-           #:attr doms (syntax->list #'(dom ...))
-           #:attr kws  (attribute kw.mand-kw)))
-
-(define-splicing-syntax-class ->*-opt
-  #:description "optional arguments for ->*"
-  #:attributes (doms kws)
- (pattern (~optional (dom:non-keyword-ty ... kw:plain-kw-tys ...))
-          #:attr doms (if (attribute dom)
-                          (syntax->list #'(dom ...))
-                          null)
-          #:attr kws (if (attribute kw)
-                         (attribute kw.opt-kw)
-                         null)))
-
-(define-splicing-syntax-class ->*-rest
-  #:description "rest argument type for ->*"
-  #:attributes (type)
-  (pattern (~optional (~seq #:rest type:non-keyword-ty))))
-
-;; syntax classes for filters, objects, and related things
-(define-syntax-class path-elem
-  #:description "path element"
-  (pattern :car^
-           #:attr pe (make-CarPE))
-  (pattern :cdr^
-           #:attr pe (make-CdrPE)))
-
-
-(define-syntax-class @
-  #:description "@"
-  (pattern (~datum @)))
-
-(define-syntax-class !
-  #:description "!"
-  (pattern (~datum !)))
-
-(define-splicing-syntax-class simple-latent-filter
-  #:description "latent filter"
-  (pattern (~seq t:expr :@ pe:path-elem ...)
-           #:attr type (parse-type #'t)
-           #:attr path (attribute pe.pe))
-  (pattern t:expr
-           #:attr type (parse-type #'t)
-           #:attr path '()))
-
-(define-syntax-class (prop doms)
-  #:description "filter proposition"
-  #:attributes (prop)
-  (pattern :Top^ #:attr prop -top)
-  (pattern :Bot^ #:attr prop -bot)
-  ;; Here is wrong check
-  (pattern (t:expr :@ ~! pe:path-elem ... (~var o (filter-object doms)))
-           #:attr prop (-filter (parse-type #'t) (-acc-path (attribute pe.pe) (attribute o.obj))))
-  ;; Here is wrong check
-  (pattern (:! t:expr :@ ~! pe:path-elem ... (~var o (filter-object doms)))
-           #:attr prop (-not-filter (parse-type #'t) (-acc-path (attribute pe.pe) (attribute o.obj))))
-  (pattern (:! t:expr)
-           #:attr prop (-not-filter (parse-type #'t) 0))
-  (pattern (and (~var p (prop doms)) ...)
-           #:attr prop (apply -and (attribute p.prop)))
-  (pattern (or (~var p (prop doms)) ...)
-           #:attr prop (apply -or (attribute p.prop)))
-  (pattern ((~literal implies) (~var p1 (prop doms)) (~var p2 (prop doms)))
-           #:attr prop (-imp (attribute p1.prop) (attribute p2.prop)))
-  (pattern t:expr
-           #:attr prop (-filter (parse-type #'t) 0)))
-
-(define-splicing-syntax-class (filter-object doms)
-  #:description "filter object"
-  #:attributes (obj)
-  (pattern i:id
-           #:fail-unless (identifier-binding #'i)
-           "Filters for predicates may not reference identifiers that are unbound"
-           #:fail-when (is-var-mutated? #'i)
-           "Filters for predicates may not reference identifiers that are mutated"
-           #:attr obj (-id-path #'i))
-  (pattern idx:nat
-           #:do [(define arg (syntax-e #'idx))]
-           #:fail-unless (< arg (length doms))
-           (format "Filter proposition's object index ~a is larger than argument length ~a"
-                   arg (length doms))
-           #:attr obj (-arg-path arg 0))
-  (pattern (~seq depth-idx:nat idx:nat)
-           #:do [(define arg (syntax-e #'idx))
-                 (define depth (syntax-e #'depth-idx))]
-           #:fail-unless (<= depth (length (current-arities)))
-           (format "Index ~a used in a filter, but the use is only within ~a enclosing functions"
-                   depth (length (current-arities)))
-           #:do [(define actual-arg
-                   (if (zero? depth)
-                       (length doms)
-                       (list-ref (current-arities) (sub1 depth))))]
-           #:fail-unless (< arg actual-arg)
-           (format "Filter proposition's object index ~a is larger than argument length ~a"
-                   depth actual-arg)
-           #:attr obj (-arg-path arg (syntax-e #'depth-idx))))
-
-
-(define-syntax-class object
-  #:attributes (object)
-  (pattern e:expr
-           #:attr object -empty-obj))
-
-(define-splicing-syntax-class (full-latent doms)
-  #:description "latent propositions and object"
-  (pattern (~seq (~optional (~seq #:+ (~var p+ (prop doms)) ...+) #:defaults ([(p+.prop 1) null]))
-                 (~optional (~seq #:- (~var p- (prop doms)) ...+) #:defaults ([(p-.prop 1) null]))
-                 (~optional (~seq #:object o:object)))
-           #:attr positive (apply -and (attribute p+.prop))
-           #:attr negative (apply -and (attribute p-.prop))
-           #:attr object (or (attribute o.object) -empty-obj)))
-
-(define (parse-types stx-list)
-  (stx-map parse-type stx-list))
-
-(define (parse-quoted-type stx)
-  (syntax-parse stx
-    [(t1 . t2)
-     (-pair (parse-quoted-type #'t1) (parse-quoted-type #'t2))]
-    [t
-     (-val (syntax->datum #'t))]))
-
-(define (parse-type stx)
-  (parameterize ([current-orig-stx stx])
-    (syntax-parse
-        stx
-      [t
-       #:declare t (3d Type/c?)
-       (attribute t.datum)]
-      [(fst . rst)
-       #:fail-unless (not (syntax->list #'rst)) #f
-       (-pair (parse-type #'fst) (parse-type #'rst))]
-      [(:Class^ e ...)
-       (parse-class-type stx)]
-      [(:Object^ e ...)
-       (parse-object-type stx)]
-      [(:Refinement^ p?:id)
-       (match (lookup-type/lexical #'p?)
-         [(and t (Function: (list (arr: (list dom) _ #f #f '()))))
-          (make-Refinement dom #'p?)]
-         [t (parse-error "expected a predicate for argument to Refinement"
-                         "given" t)])]
-      [(:Struct^ t)
-       (let ([v (parse-type #'t)])
-         (match (resolve v)
-           [(and s (? Struct?)) (make-StructTop s)]
-           [_ (parse-error #:delayed? #t
-                           "expected a structure type for argument to Struct"
-                           "given" v)
-              (Un)]))]
-      [(:Struct-Type^ t)
-       (define v (parse-type #'t))
-       (match (resolve v)
-         [(? Struct? s) (make-StructType s)]
-         [_ (parse-error #:delayed? #t
-                         "expected a structure type for argument to Struct-Type"
-                         "given" v)
-            (Un)])]
-      [(:Instance^ t)
-       (let ([v (parse-type #'t)])
-         (if (not (or (F? v) (Mu? v) (Name? v) (Class? v) (Error? v)))
-             (begin (parse-error #:delayed? #t
-                                 "expected a class type for argument to Instance"
-                                 "given" v)
-                    (make-Instance (Un)))
-             (make-Instance v)))]
-      [(:List^ ts ...)
-       (parse-list-type stx)]
-      [(:List*^ ts ... t)
-       (-Tuple* (parse-types #'(ts ...)) (parse-type #'t))]
-      [(:Vector^ ts ...)
-       (make-HeterogeneousVector (parse-types #'(ts ...)))]
-      [(:cons^ fst rst)
-       (-pair (parse-type #'fst) (parse-type #'rst))]
-      [(:pred^ t)
-       (make-pred-ty (parse-type #'t))]
-      [(:case->^ tys ...)
-       (make-Function
-        (for/list ([ty (in-syntax #'(tys ...))])
-          (let ([t (parse-type ty)])
-            (match t
-              [(Function: (list arr)) arr]
-              [_ (parse-error
-                  #:stx ty
-                  "expected a function type for component of case-> type"
-                  "given" t)]))))]
-      [(:Rec^ x:id t)
-       (let* ([var (syntax-e #'x)]
-              [tvar (make-F var)])
-         (extend-tvars (list var)
-           (let ([t* (parse-type #'t)])
-             ;; is t in a productive position?
-             (define productive
-               (let loop ((ty t*))
-                 (match ty
-                  [(Union: elems) (andmap loop elems)]
-                  [(F: _) (not (equal? ty tvar))]
-                  [(App: rator rands stx)
-                   (loop (resolve-app rator rands stx))]
-                  [(Mu: _ body) (loop body)]
-                  [(Poly: names body) (loop body)]
-                  [(PolyDots: names body) (loop body)]
-                  [(PolyRow: _ _ body) (loop body)]
-                  [else #t])))
-             (unless productive
-               (parse-error
-                #:stx stx
-                "recursive types are not allowed directly inside their definition"))
-             (if (memq var (fv t*))
-                 (make-Mu var t*)
-                 t*))))]
-      [(:U^ ts ...)
-       (apply Un (parse-types #'(ts ...)))]
-      [(:quote^ t)
-       (parse-quoted-type #'t)]
-      [(:All^ . rest)
-       (parse-all-type stx)]
-      [(:Opaque^ p?:id)
-       (make-Opaque #'p?)]
-      [(:Parameter^ t)
-       (let ([ty (parse-type #'t)])
-         (-Param ty ty))]
-      [(:Parameter^ t1 t2)
-       (-Param (parse-type #'t1) (parse-type #'t2))]
-      ;; curried function notation
-      [((~and dom:non-keyword-ty (~not :->^)) ...
-        :->^
-        (~and (~seq rest-dom ...) (~seq (~or _ (~between :->^ 1 +inf.0)) ...)))
-       (define doms (syntax->list #'(dom ...)))
-       (with-arity (length doms)
-         (let ([doms (for/list ([d (in-list doms)])
-                       (parse-type d))])
-           (make-Function
-            (list (make-arr
-                   doms
-                   (parse-type (syntax/loc stx (rest-dom ...))))))))]
-      [(~or (:->^ dom rng :colon^ latent:simple-latent-filter)
-            (dom :->^ rng :colon^ latent:simple-latent-filter))
-       ;; use parse-type instead of parse-values-type because we need to add the filters from the pred-ty
-       (with-arity 1
-         (make-pred-ty (list (parse-type #'dom)) (parse-type #'rng) (attribute latent.type)
-                       (-acc-path (attribute latent.path) (-arg-path 0))))]
-      [(~or (:->^ dom:non-keyword-ty ... kws:keyword-tys ... rest:non-keyword-ty ddd:star rng)
-            (dom:non-keyword-ty ... kws:keyword-tys ... rest:non-keyword-ty ddd:star :->^ rng))
-       (with-arity (length (syntax->list #'(dom ...)))
-         (make-Function
-          (list (make-arr
-                 (parse-types #'(dom ...))
-                 (parse-values-type #'rng)
-                 #:rest (parse-type #'rest)
-                 #:kws (map force (attribute kws.Keyword))))))]
-      [(~or (:->^ dom:non-keyword-ty ... rest:non-keyword-ty :ddd/bound rng)
-            (dom:non-keyword-ty ... rest:non-keyword-ty :ddd/bound :->^ rng))
-       (with-arity (length (syntax->list #'(dom ...)))
-         (let* ([bnd (syntax-e #'bound)])
-           (unless (bound-index? bnd)
-             (parse-error
-              #:stx #'bound
-              "used a type variable not bound with ... as a bound on a ..."
-              "variable" bnd))
-           (make-Function
-            (list
-             (make-arr-dots (parse-types #'(dom ...))
-                            (parse-values-type #'rng)
-                            (extend-tvars (list bnd)
-                                          (parse-type #'rest))
-                            bnd)))))]
-      [(~or (:->^ dom:non-keyword-ty ... rest:non-keyword-ty _:ddd rng)
-            (dom:non-keyword-ty ... rest:non-keyword-ty _:ddd :->^ rng))
-       (with-arity (length (syntax->list #'(dom ...)))
-         (let ([var (infer-index stx)])
-           (make-Function
-            (list
-             (make-arr-dots (parse-types #'(dom ...))
-                            (parse-values-type #'rng)
-                            (extend-tvars (list var) (parse-type #'rest))
-                            var)))))]
-      #| ;; has to be below the previous one
-     [(dom:expr ... :->^ rng)
-      (->* (parse-types #'(dom ...))
-           (parse-values-type #'rng))]     |#
-      ;; use expr to rule out keywords
-      [(~or (:->^ dom:non-keyword-ty ... kws:keyword-tys ... rng)
-            (dom:non-keyword-ty ... kws:keyword-tys ... :->^ rng))
-       (define doms (syntax->list #'(dom ...)))
-       (with-arity (length doms)
-         (let ([doms (for/list ([d (in-list doms)])
-                       (parse-type d))])
-           (make-Function
-            (list (make-arr
-                   doms
-                   (parse-values-type #'rng)
-                   #:kws (map force (attribute kws.Keyword)))))))]
-      ;; This case needs to be at the end because it uses cut points to give good error messages.
-      [(~or (:->^ ~! dom:non-keyword-ty ... rng:expr
-             :colon^ (~var latent (full-latent (syntax->list #'(dom ...)))))
-            (dom:non-keyword-ty ... :->^ rng:expr
-             ~! :colon^ (~var latent (full-latent (syntax->list #'(dom ...))))))
-       ;; use parse-type instead of parse-values-type because we need to add the filters from the pred-ty
-       (with-arity (length (syntax->list #'(dom ...)))
-         (->* (parse-types #'(dom ...))
-              (parse-type #'rng)
-              : (-FS (attribute latent.positive) (attribute latent.negative))
-              : (attribute latent.object)))]
-      [(:->*^ mand:->*-mand opt:->*-opt rest:->*-rest rng)
-       (with-arity (length (attribute mand.doms))
-         (define doms (for/list ([d (attribute mand.doms)])
-                        (parse-type d)))
-         (define opt-doms (for/list ([d (attribute opt.doms)])
-                            (parse-type d)))
-         (opt-fn doms opt-doms (parse-values-type #'rng)
-                 #:rest (and (attribute rest.type)
-                             (parse-type (attribute rest.type)))
-                 #:kws (map force (append (attribute mand.kws)
-                                          (attribute opt.kws)))))]
-      [:->^
-       (parse-error #:delayed? #t "incorrect use of -> type constructor")
-       Err]
-      [id:identifier
-       (cond
-         ;; if it's a type variable, we just produce the corresponding reference (which is in the HT)
-         [(bound-tvar? (syntax-e #'id))
-          (lookup-tvar (syntax-e #'id))]
-         ;; if it was in current-indexes, produce a better error msg
-         [(bound-index? (syntax-e #'id))
-          (parse-error "type variable must be used with ..."
-                       "variable" (syntax-e #'id))]
-         ;; if it's a type alias, we expand it (the expanded type is stored in the HT)
-         [(lookup-type-alias #'id parse-type (lambda () #f))
-          =>
-          (lambda (t)
-            (when (current-referenced-aliases)
-              (define alias-box (current-referenced-aliases))
-              (set-box! alias-box (cons #'id (unbox alias-box))))
-            (add-disappeared-use (syntax-local-introduce #'id))
-            t)]
-         [else
-          (parse-error #:delayed? #t (~a "type name `" (syntax-e #'id) "' is unbound"))
-          Err])]
-      [(:Opaque^ . rest)
-       (parse-error "bad syntax in Opaque")]
-      [(:U^ . rest)
-       (parse-error "bad syntax in Union")]
-      [(:Rec^ . rest)
-       (parse-error "bad syntax in Rec")]
-      [(t ... :->^ . rest)
-       (parse-error "bad syntax in ->")]
-      [(id arg args ...)
-       (let loop
-         ([rator (parse-type #'id)]
-          [args (parse-types #'(arg args ...))])
-         (resolve-app-check-error rator args stx)
-         (match rator
-           [(? Name?) (make-App rator args stx)]
-           [(Poly: _ _) (instantiate-poly rator args)]
-           [(Mu: _ _) (loop (unfold rator) args)]
-           [(Error:) Err]
-           [_ Err]))]
-      [t:atom
-       ;; Integers in a "grey area", that is, integers whose runtime type is
-       ;; platform-dependent, cannot be safely assigned singleton types.
-       ;; Short story: (subtype (-val 10000000000000) -Fixnum) has no safe
-       ;;   answer. It's not a fixnum on 32 bits, and saying it's not a fixnum
-       ;;   causes issues with type-dead code detection.
-       ;; Long story: See email trail for PR13501 and #racket IRC logs from
-       ;;   Feb 11 2013.
-       (let ([val (syntax-e #'t)])
-         (when (and (exact-integer? val)
-                    ;; [min-64bit-fixnum, min-portable-fixnum)
-                    (or (and (>= val (- (expt 2 62)))
-                             (<  val (- (expt 2 30))))
-                        ;; (max-portable-index, max-64bit-fixnum]
-                        (and (>  val (sub1 (expt 2 28)))
-                             (<= val (sub1 (expt 2 62))))))
-           (parse-error "non-portable fixnum singleton types are not valid types"
-                        "given" val))
-         (-val val))]
-      [_ (parse-error "expected a valid type"
-                      "given" (syntax->datum stx))])))
-
-;; Syntax -> Type
-;; Parse a (List ...) type
-(define (parse-list-type stx)
-  (parameterize ([current-orig-stx stx])
-    (syntax-parse stx
-      [(:List^ tys ... dty :ddd/bound)
-       (let ([var (syntax-e #'bound)])
-         (unless (bound-index? var)
-           (if (bound-tvar? var)
-               (tc-error/stx #'bound "Used a type variable (~a) not bound with ... as a bound on a ..." var)
-               (tc-error/stx #'bound "Type variable ~a is unbound" var)))
-         (-Tuple* (parse-types #'(tys ...))
-                  (make-ListDots
-                   (extend-tvars (list var)
-                     (parse-type #'dty))
-                   var)))]
-      [(:List^ tys ... dty _:ddd)
-       (let ([var (infer-index stx)])
-         (-Tuple* (parse-types #'(tys ...))
-                  (make-ListDots
-                    (extend-tvars (list var)
-                      (parse-type #'dty))
-                    var)))]
-      [(:List^ tys ...)
-       (-Tuple (parse-types #'(tys ...)))])))
-
-;; Syntax -> Type
-;; Parse a (Values ...) type
-(define (parse-values-type stx)
-  (parameterize ([current-orig-stx stx])
-    (syntax-parse stx
-      [((~or :Values^ :values^) tys ... dty :ddd/bound)
-       (let ([var (syntax-e #'bound)])
-         (unless (bound-index? var)
-           (if (bound-tvar? var)
-               (tc-error/stx #'bound "Used a type variable (~a) not bound with ... as a bound on a ..." var)
-               (tc-error/stx #'bound "Type variable ~a is unbound" var)))
-         (-values-dots (parse-types #'(tys ...))
-                       (extend-tvars (list var)
-                         (parse-type #'dty))
-                       var))]
-      [((~or :Values^ :values^) tys ... dty _:ddd)
-       (let ([var (infer-index stx)])
-         (-values-dots (parse-types #'(tys ...))
-                       (extend-tvars (list var)
-                         (parse-type #'dty))
-                       var))]
-      [((~or :Values^ :values^) tys ...)
-       (-values (parse-types #'(tys ...)))]
-      [t
-       (-values (list (parse-type #'t)))])))
-
-;;; Utilities for (Class ...) type parsing
-
-;; process-class-clauses : Option<F> Type Stx FieldDict MethodDict AugmentDict
-;;                         -> Option<Id> FieldDict MethodDict AugmentDict
-;; Merges #:implements class type and the current class clauses appropriately
-(define (merge-with-parent-type row-var parent-type parent-stx fields methods augments)
-  ;; merge-clause : Dict Dict -> Dict
-  ;; Merge all the non-duplicate entries from the parent types
-  (define (merge-clause parent-clause clause)
-    (for/fold ([clause clause])
-              ([(k v) (in-dict parent-clause)])
-      (if (dict-has-key? clause k)
-          clause
-          (dict-set clause k v))))
-
-  (define (match-parent-type parent-type)
-    (define resolved (resolve parent-type))
-    (match resolved
-      [(Class: row-var _ fields methods augments _)
-       (values row-var fields methods augments)]
-      [_ (parse-error "expected a class type for #:implements clause"
-                      "given" resolved)]))
-  (define-values (super-row-var super-fields
-                  super-methods super-augments)
-    (match-parent-type parent-type))
-
-  (match-define (list (list field-names _) ...) fields)
-  (match-define (list (list method-names _) ...) methods)
-  (match-define (list (list augment-names _) ...) augments)
-  (match-define (list (list super-field-names _) ...) super-fields)
-  (match-define (list (list super-method-names _) ...) super-methods)
-  (match-define (list (list super-augment-names _) ...) super-augments)
-
-  ;; it is an error for both the extending type and extended type
-  ;; to have row variables
-  (when (and row-var super-row-var)
-    (parse-error (~a "class type with row variable cannot"
-                     " extend another type that has a row variable")))
-
-  ;; then append the super types if there were no errors
-  (define merged-fields (merge-clause super-fields fields))
-  (define merged-methods (merge-clause super-methods methods))
-  (define merged-augments (merge-clause super-augments augments))
-
-  ;; make sure augments and methods are disjoint
-  (define maybe-dup-method (check-duplicate (dict-keys merged-methods)))
-  (when maybe-dup-method
-    (parse-error "duplicate method name" "name" maybe-dup-method))
-  (define maybe-dup-augment (check-duplicate (dict-keys merged-augments)))
-  (when maybe-dup-augment
-    (parse-error "duplicate augmentable method name"
-                 "name" maybe-dup-augment))
-
-  (values (or row-var super-row-var) merged-fields
-          merged-methods merged-augments))
-
-;; Syntax -> Type
-;; Parse a (Object ...) type
-;; This is an alternative way to write down an Instance type
-(define (parse-object-type stx)
-  (syntax-parse stx
-    [(kw clause:object-type-clauses)
-     (add-disappeared-use #'kw)
-     (define fields (map list
-                         (stx-map syntax-e #'clause.field-names)
-                         (stx-map parse-type #'clause.field-types)))
-     (define methods (map list
-                          (stx-map syntax-e #'clause.method-names)
-                          (stx-map parse-type #'clause.method-types)))
-     (check-function-types methods)
-     (make-Instance (make-Class #f null fields methods null #f))]))
-
-;; Syntax -> Type
-;; Parse a (Class ...) type
-(define (parse-class-type stx)
-  (syntax-parse stx
-    [(kw (~var clause (class-type-clauses parse-type)))
-     (add-disappeared-use #'kw)
-     (define parent-stxs (stx->list #'clause.implements))
-     (define parent/init-stx (attribute clause.implements/inits))
-     (define parent/init-type (and parent/init-stx (parse-type parent/init-stx)))
-     (define parent-types
-       (let ([types (map parse-type parent-stxs)])
-         (if parent/init-stx
-             (cons parent/init-type types)
-             types)))
-     (define given-inits (attribute clause.inits))
-     (define given-fields (attribute clause.fields))
-     (define given-methods (attribute clause.methods))
-     (define given-augments (attribute clause.augments))
-     (define given-row-var
-       (and (attribute clause.row-var)
-            (parse-type (attribute clause.row-var))))
-     (define given-init-rest
-       (and (attribute clause.init-rest)
-            (parse-type (attribute clause.init-rest))))
-
-     (cond ;; If an Error type flows into the #:row-var position, a
-           ;; delayed error should be raised from the recursive call to
-           ;; `parse-type` so no additional error is needed here.
-           [(Error? given-row-var) Err]
-           [(and given-row-var (not (F? given-row-var)))
-            (parse-error "expected a type variable for #:row-var"
-                         "given" given-row-var)
-            Err]
-           ;; Only proceed to create a class type when the parsing
-           ;; process isn't looking for recursive type alias references.
-           ;; (otherwise the merging process will error)
-           [(or (and (null? parent-stxs) (not parent/init-stx))
-                (not (current-referenced-aliases)))
-
-            (check-function-types given-methods)
-            (check-function-types given-augments)
-
-            ;; merge with all given parent types, erroring if needed
-            (define-values (row-var fields methods augments)
-              (for/fold ([row-var given-row-var]
-                         [fields given-fields]
-                         [methods given-methods]
-                         [augments given-augments])
-                  ([parent-type (reverse parent-types)]
-                   [parent-stx  (reverse (append (or (list parent/init-stx) null)
-                                                 parent-stxs))])
-                (merge-with-parent-type row-var parent-type parent-stx
-                                        fields methods augments)))
-
-            ;; check constraints on row var for consistency with class
-            (when (and row-var (has-row-constraints? (F-n row-var)))
-              (define constraints (lookup-row-constraints (F-n row-var)))
-              (check-constraints given-inits (car constraints))
-              (check-constraints fields (cadr constraints))
-              (check-constraints methods (caddr constraints))
-              (check-constraints augments (cadddr constraints)))
-
-            ;; For the #:implements/inits entry, put the inits into the type
-            ;; as well. They are appended at the end to match the runtime behavior
-            ;; of init arguments.
-            (define parent-inits (get-parent-inits parent/init-type))
-
-            (define class-type
-              (make-Class row-var
-                          (append given-inits parent-inits)
-                          fields methods augments given-init-rest))
-
-            class-type]
-           [else
-            ;; Conservatively assume that if there *are* #:implements
-            ;; clauses, then the current type alias will be recursive
-            ;; through one of the type aliases in the #:implements clauses.
-            ;;
-            ;; This is needed because it's hard to determine if a type
-            ;; in the #:implements clauses depends on the current
-            ;; type alias at this point. Otherwise, we would have to
-            ;; parse all type aliases again.
-            ;;
-            ;; An example type that is a problem without this assumption is
-            ;;   alias = (Class #:implements Foo%) where Foo%
-            ;;           has a class clause referring to alias
-            ;; since "alias" will be a non-recursive alias
-            ;;
-            ;; Without the approximation, we may miss recursive references
-            ;; which can cause infinite looping elsewhere in TR.
-            ;;
-            ;; With the approximation, we have spurious recursive references
-            ;; which may cause more indirection through the Name environment
-            ;; or generate worse contracts.
-            (define alias-box (current-referenced-aliases))
-            (set-box! alias-box (cons (current-type-alias-name)
-                                      (unbox alias-box)))
-            (define class-box (current-referenced-class-parents))
-            (set-box! class-box (append (if parent/init-stx
-                                            (cons parent/init-stx parent-stxs)
-                                            parent-stxs)
-                                        (unbox class-box)))
-            ;; Ok to return Error here, since this type will
-            ;; get reparsed in another pass
-            (make-Error)
-            ])]))
-
-;; get-parent-inits : (U Type #f) -> Inits
-;; Extract the init arguments out of a parent class type
-(define (get-parent-inits parent)
-  (cond [(not parent) null]
-        [else
-         (define resolved (resolve parent))
-         (match resolved
-           [(Class: _ inits _ _ _ _) inits]
-           [_ (parse-error "expected a class type for #:implements/inits clause"
-                           "given" resolved)])]))
-
-;; check-function-types : Dict<Name, Type> -> Void
-;; ensure all types recorded in the dictionary are function types
-(define (check-function-types method-types)
-  ;; TODO: this function should probably go in a utility
-  ;;       module since it's duplicated elsewhere
-  (define (function-type? type)
-    (match (resolve type)
-      [(? Function?) #t]
-      [(Poly: _ body) (function-type? body)]
-      [(PolyDots: _ body) (function-type? body)]
-      [(PolyRow: _ _ body) (function-type? body)]
-      [_ #f]))
-  (for ([(id pre-type) (in-dict method-types)])
-    (define type (car pre-type))
-    (unless (function-type? type)
-      (parse-error "method must have a function type"
-                   "method name" id
-                   "given type" type))))
-
-;; check-constraints : Dict<Name, _> Listof<Name> -> Void
-;; helper to check if the constraints are consistent with the type
-(define (check-constraints type-table constraint-names)
-  (define names-from-type (dict-keys type-table))
-  (define conflicting-name
-    (for/or ([m (in-list names-from-type)])
-      (and (not (memq m constraint-names))
-           m)))
-  (when conflicting-name
-    (parse-error "class member conflicts with row variable constraints"
-                 "conflicting name" conflicting-name)))
-
-(define (parse-tc-results stx)
-  (syntax-parse stx
-    [((~or :Values^ :values^) t ...)
-     (ret (parse-types #'(t ...))
-          (stx-map (lambda (x) -no-filter) #'(t ...))
-          (stx-map (lambda (x) -no-obj) #'(t ...)))]
-    [t (ret (parse-type #'t) -no-filter -no-obj)]))
-
-(define parse-type/id (parse/id parse-type))
-
-;; parse-error : String String String ... ... -> Void
-;; helper for parse-type error messages
-(define (parse-error reason
-                     #:delayed? [delayed? #f]
-                     #:stx [stx (current-orig-stx)]
-                     . rst)
-  (apply tc-error/fields "parse error in type"
-                         #:more reason
-                         #:delayed? delayed?
-                         rst))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/syntax-properties.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/syntax-properties.rkt
deleted file mode 100644
index 164a8c8b0b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/syntax-properties.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang racket/base
-(require
-  syntax/parse
-  (for-syntax racket/base syntax/parse racket/syntax))
-
-(define-syntax define-matcher
-  (syntax-parser
-    [(_ name:id prop:id)
-     #'(define-syntax-class name
-         #:attributes (value)
-         (pattern e
-          #:attr value (prop #'e)
-          #:when (attribute value)))]))
-
-(define-syntax (define-properties stx)
-  (define-syntax-class clause
-    (pattern (name:id sym:id #:mark)
-      #:with syntax-class-name (format-id #'name "~a^" #'name)
-      #:with symbol (generate-temporary #'sym)
-      #:with function
-        #'(λ (stx) (syntax-property stx symbol #t)))
-    (pattern (root:id sym:id)
-      #:with name (format-id #'root "~a-property" #'root)
-      #:with syntax-class-name (format-id #'root "~a^" #'root)
-      #:with symbol (generate-temporary #'sym)
-      #:with function
-        #'(case-lambda
-            ((stx) (syntax-property stx symbol))
-            ((stx value) (syntax-property stx symbol value)))))
-
-  (syntax-parse stx
-    [(_ :clause ...)
-     #`(begin
-         (begin
-            ;; TODO: make this an uninterned symbol once the phasing issue of the unit
-            ;; tests is fixed
-            (define symbol 'sym)
-            (provide name syntax-class-name)
-            (define name function)
-            (define-syntax-class syntax-class-name
-              #:attributes (value)
-              (pattern e
-               #:attr value (syntax-property #'e symbol)
-               #:when (attribute value)))) ...)]))
-
-;;TODO add contracts on the properties
-
-(define-properties
-  (plambda typechecker:plambda)
-  (ignore typechecker:ignore #:mark)
-  (ignore-some typechecker:ignore-some #:mark)
-  (ignore-some-expr typechecker:ignore-some)
-  (contract-def typechecker:contract-def)
-  (contract-def/provide typechecker:contract-def/provide)
-  (external-check typechecker:external-check)
-  (with-type typechecker:with-type #:mark)
-  (type-ascription type-ascription)
-  (type-inst type-inst)
-  (type-label type-label)
-  (type-dotted type-dotted)
-  (exn-predicate typechecker:exn-predicate)
-  (exn-handler typechecker:exn-handler)
-  (exn-body typechecker:exn-body #:mark)
-  (exn-handlers typechecker:exn-handlers #:mark)
-  (struct-info struct-info)
-  (opt-lambda opt-lambda)
-  (kw-lambda kw-lambda)
-  (tail-position typechecker:called-in-tail-position #:mark)
-  (tr:class tr:class #:mark)
-  (tr:class:top-level tr:class:top-level)
-  (tr:class:super-new tr:class:super-new)
-  (tr:class:type-annotation tr:class:type-annotation)
-  (tr:class:super tr:class:super)
-  (tr:class:local-table tr:class:local-table)
-  (tr:class:name-table tr:class:name-table)
-  (tr:class:def tr:class:def)
-  )
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-annotation.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-annotation.rkt
deleted file mode 100644
index a3c8bb17b8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-annotation.rkt
+++ /dev/null
@@ -1,118 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         (rep type-rep)
-         (utils tc-utils)
-         (env global-env mvar-env)
-         (except-in (types subtype abbrev union utils generalize)
-                    -> ->* one-of/c)
-         (private parse-type syntax-properties)
-         (contract-req)
-         syntax/parse
-         racket/match)
-
-(provide type-annotation
-         type-annotation^
-         get-type
-         get-types
-         get-type/infer
-         check-type
-         dotted?)
-
-
-;; get the type annotation of this syntax
-;; syntax -> Maybe[Type]
-;; is let-binding really necessary? - remember to record the bugs!
-(define (type-annotation stx #:infer [let-binding #f])
-  (define (pt prop)
-    (when (and (identifier? stx)
-               let-binding)
-      (define t1 (parse-type/id stx prop))
-      (define t2 (lookup-type stx (lambda () #f)))      
-      (when (and t2 (not (type-equal? t1 t2)))
-        (maybe-finish-register-type stx)
-        (tc-error/delayed #:stx stx "Duplicate type annotation of ~a for ~a, previous was ~a" t1 (syntax-e stx) t2)))
-    (if (syntax? prop)
-        (parse-type prop)
-        (parse-type/id stx prop)))
-  ;(unless let-binding (error 'ohno))
-  ;(printf "in type-annotation:~a\n" (syntax->datum stx))
-  (syntax-parse stx
-    [(~or v:type-label^) (pt (attribute v.value))]
-    [i:typed-id^
-     (maybe-finish-register-type stx)
-     (attribute i.type)]
-    [_ #f]))
-
-(define-syntax-class type-annotation^
-  [pattern i:id
-           #:attr type (type-annotation #'i)
-           #:when (attribute type)])
-
-;; get the type annotation of this identifier, otherwise error
-;; if #:default is provided, return that instead of error
-;; identifier #:default Type -> Type
-(define (get-type stx #:default [default #f] #:infer [infer #t])
-  (parameterize
-      ([current-orig-stx stx])
-    (cond
-      [(type-annotation stx #:infer infer)]
-      [(procedure? default) (default)]
-      [default default]
-      [(not (syntax-original? stx))
-       (tc-error "insufficient type information to typecheck. please add more type annotations")]
-      [else
-       (tc-error "no type information on variable ~a" (syntax-e stx))])))
-
-;; Listof[identifier] #:default Type -> Listof[Type]
-(define (get-types stxs #:default [default #f])
-  (map (lambda (e) (get-type e #:default default)) stxs))
-
-;; stxs : the identifiers, possibly with type annotations on them
-;; expr : the RHS expression
-;; tc-expr : a function like `tc-expr' from tc-expr-unit
-;; tc-expr/check : a function like `tc-expr/check' from tc-expr-unit
-(define/cond-contract (get-type/infer stxs expr tc-expr tc-expr/check)
-  ((listof identifier?) syntax? (syntax? . -> . tc-results/c) (syntax? tc-results/c . -> . tc-results/c)
-   . -> . (listof tc-result?))
-  (match stxs
-    [(list stx ...)
-     (let ([anns (for/list ([s (in-list stxs)]) (type-annotation s #:infer #t))])
-       (if (for/and ([a (in-list anns)]) a)
-           (match (tc-expr/check expr (ret anns))
-             [(tc-results: tys fs os)
-              (map tc-result tys fs os)])
-           (let ([res (tc-expr expr)])
-             (match res
-               [(tc-any-results: _)
-                (tc-error/expr
-                  "Expression should produce ~a values, but produces an unknown number of values"
-                  (length stxs))]
-               [(tc-results: (list (== -Bottom)) _ _)
-                (for/list ([_ (in-range (length stxs))])
-                  (tc-result -Bottom))]
-               [(tc-results: tys fs os)
-                (if (not (= (length stxs) (length tys)))
-                    (tc-error/expr #:return (map (lambda _ (tc-result (Un))) stxs)
-                                   "Expression should produce ~a values, but produces ~a values of types ~a"
-                                   (length stxs) (length tys) (stringify tys))
-                    (for/list ([stx (in-list stxs)] [ty (in-list tys)]
-                               [a (in-list anns)] [f (in-list fs)] [o (in-list os)])
-                      (cond [a (check-type stx ty a) (tc-result a f o)]
-                            ;; mutated variables get generalized, so that we don't infer too small a type
-                            [(is-var-mutated? stx) (tc-result (generalize ty) f o)]
-                            [else (tc-result ty f o)])))]))))]))
-
-;; check that e-type is compatible with ty in context of stx
-;; otherwise, error
-;; syntax type type -> void
-(define (check-type stx e-type ty)
-  (parameterize ([current-orig-stx stx])
-    (unless (subtype e-type ty)
-      ;(printf "orig-stx: ~a" (syntax->datum stx*))
-      (tc-error "Body had type:\n~a\nVariable had type:\n~a\n" e-type ty))))
-
-(define (dotted? stx)
-  (syntax-parse stx
-    [v:type-dotted^ (syntax-e (attribute v.value))]
-    [_ #f]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-contract.rkt
deleted file mode 100644
index 27014f8471..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-contract.rkt
+++ /dev/null
@@ -1,747 +0,0 @@
-#lang racket/base
-
-;; Contract generation for Typed Racket
-
-(require
- "../utils/utils.rkt"
- syntax/parse
- (rep type-rep filter-rep object-rep)
- (utils tc-utils)
- (env type-name-env)
- (rep rep-utils)
- (types resolve union utils printer)
- (prefix-in t: (types abbrev numeric-tower))
- (private parse-type syntax-properties)
- racket/match racket/syntax racket/list
- racket/format
- racket/dict
- unstable/list
- (only-in (types abbrev) -Bottom)
- (static-contracts instantiate optimize structures combinators)
- ;; TODO make this from contract-req
- (prefix-in c: racket/contract)
- (contract-req)
- (for-syntax racket/base)
- (for-template racket/base racket/contract (utils any-wrap)))
-
-(provide
-  (c:contract-out
-    [type->static-contract
-      (c:parametric->/c (a) ((Type/c (c:-> #:reason (c:or/c #f string?) a))
-                             (#:typed-side boolean?) . c:->* . (c:or/c a static-contract?)))]))
-
-(provide change-contract-fixups
-         change-provide-fixups
-         any-wrap/sc
-         extra-requires
-         include-extra-requires?)
-
-;; submod for testing
-(module* test-exports #f (provide type->contract))
-
-(struct contract-def (type flat? maker? typed-side) #:prefab)
-
-;; Checks if the given syntax needs to be fixed up for contract generation
-;; and if yes it returns the information stored in the property
-(define (get-contract-def-property stx)
-  (syntax-parse stx
-    #:literal-sets (kernel-literals)
-    [(define-values (_) e) (contract-def-property #'e)]
-    [_ #f]))
-
-;; type->contract-fail : Syntax Type #:ctc-str String
-;;                       -> #:reason (Option String) -> Void
-;; Curried function that produces a function to report
-;; type->contract failures
-(define ((type->contract-fail to-check to-report
-                              #:ctc-str [ctc-str "contract"])
-         #:reason [reason #f])
-  (tc-error/stx
-   to-report
-   (~a "Type ~a could not be converted to a "
-       ctc-str
-       (if reason (~a ": " reason) "."))
-   to-check))
-
-;; The cache/sc-cache are used to share contract and static contract
-;; definitions respectively across multiple calls to type->contract.
-;; This saves computation time and zo space for excessively large types
-;; (such as mutually recursive class types).
-(define (generate-contract-def stx cache sc-cache)
-  (define prop (get-contract-def-property stx))
-  (match-define (contract-def type-stx flat? maker? typed-side) prop)
-  (define *typ (parse-type type-stx))
-  (define kind (if flat? 'flat 'impersonator))
-  (syntax-parse stx #:literals (define-values)
-    [(define-values (n) _)
-     (define typ
-       (if maker?
-           ((map fld-t (Struct-flds (lookup-type-name (Name-id *typ)))) #f . t:->* . *typ)
-           *typ))
-     (match-define (list defs ctc)
-       (type->contract
-        typ
-        ;; this value is from the typed side (require/typed, make-predicate, etc)
-        ;; unless it's used for with-type
-        #:typed-side (from-typed? typed-side)
-        #:kind kind
-        #:cache cache
-        #:sc-cache sc-cache
-        (type->contract-fail
-         typ type-stx
-         #:ctc-str (if flat? "predicate" "contract"))))
-     (ignore ; should be ignored by the optimizer
-      (quasisyntax/loc stx
-        (begin #,@defs (define-values (n) #,ctc))))]
-    [_ (int-err "should never happen - not a define-values: ~a"
-                (syntax->datum stx))]))
-
-;; Generate a contract for a TR provide form
-(define (generate-contract-def/provide stx cache sc-cache)
-  (match-define (list type untyped-id orig-id blame-id)
-                (contract-def/provide-property stx))
-  (define failure-reason #f)
-  (define result
-    (type->contract type
-                    #:typed-side #t
-                    #:kind 'impersonator
-                    #:cache cache
-                    #:sc-cache sc-cache
-                    ;; FIXME: get rid of this interface, make it functional
-                    (λ (#:reason [reason #f]) (set! failure-reason reason))))
-  (syntax-parse stx
-    #:literal-sets (kernel-literals)
-    [(define-values ctc-id _)
-     ;; no need for ignore, the optimizer doesn't run on this code
-     (cond [failure-reason
-            #`(define-syntax (#,untyped-id stx)
-                (tc-error/fields #:stx stx
-                                 "could not convert type to a contract"
-                                 #:more #,failure-reason
-                                 "identifier" #,(symbol->string (syntax-e orig-id))
-                                 "type" #,(pretty-format-type type #:indent 8)))]
-           [else
-            (match-define (list defs ctc) result)
-            #`(begin #,@defs
-                     (define ctc-id #,ctc)
-                     (define-module-boundary-contract #,untyped-id
-                       #,orig-id ctc-id
-                       #:pos-source #,blame-id
-                       #:srcloc (vector (quote #,(syntax-source orig-id))
-                                        #,(syntax-line orig-id)
-                                        #,(syntax-column orig-id)
-                                        #,(syntax-position orig-id)
-                                        #,(syntax-span orig-id))))])]))
-
-(define extra-requires
-  #'(require
-      ;; the below requires are needed since they provide identifiers
-      ;; that may appear in the residual program
-      (submod typed-racket/private/type-contract predicates)
-      typed-racket/utils/utils
-      (for-syntax typed-racket/utils/utils)
-      typed-racket/utils/any-wrap typed-racket/utils/struct-type-c
-      typed-racket/utils/evt-contract
-      unstable/contract racket/contract/parametric))
-
-;; should the above requires be included in the output?
-(define include-extra-requires? (box #f))
-
-(define (change-contract-fixups forms)
-  (define ctc-cache (make-hash))
-  (define sc-cache (make-hash))
-  (with-new-name-tables
-   (for/list ((e (in-list forms)))
-     (if (not (get-contract-def-property e))
-         e
-         (begin (set-box! include-extra-requires? #t)
-                (generate-contract-def e ctc-cache sc-cache))))))
-
-(define (change-provide-fixups forms)
-  (define ctc-cache (make-hash))
-  (define sc-cache (make-hash))
-  (with-new-name-tables
-   (for/list ([form (in-list forms)])
-     (cond [(contract-def/provide-property form)
-            (set-box! include-extra-requires? #t)
-            (generate-contract-def/provide form ctc-cache sc-cache)]
-           [else form]))))
-
-;; To avoid misspellings
-(define impersonator-sym 'impersonator)
-(define chaperone-sym 'chaperone)
-(define flat-sym 'flat)
-
-(define (contract-kind-max i . args)
-  (define (contract-kind-max2 x y)
-    (cond
-      ((equal? flat-sym x) y)
-      ((equal? flat-sym y) x)
-      ((equal? chaperone-sym x) y)
-      ((equal? chaperone-sym y) x)
-      (else impersonator-sym)))
-  (for/fold ((acc i)) ((v (in-list args)))
-    (contract-kind-max2 v acc)))
-
-(define (contract-kind-min i . args)
-  (define (contract-kind-min2 x y)
-    (cond
-      ((equal? flat-sym x) x)
-      ((equal? flat-sym y) y)
-      ((equal? chaperone-sym x) x)
-      ((equal? chaperone-sym y) y)
-      (else impersonator-sym)))
-  (for/fold ((acc i)) ((v (in-list args)))
-    (contract-kind-min2 v acc)))
-
-
-(define (contract-kind->keyword sym)
-  (string->keyword (symbol->string sym)))
-
-(define (from-typed? side)
-  (case side
-   [(typed both) #t]
-   [(untyped) #f]))
-
-(define (from-untyped? side)
-  (case side
-   [(untyped both) #t]
-   [(typed) #f]))
-
-(define (flip-side side)
-  (case side
-   [(typed) 'untyped]
-   [(untyped) 'typed]
-   [(both) 'both]))
-
-;; type->contract : Type Procedure
-;;                  #:typed-side Boolean #:kind Symbol #:cache Hash
-;;                  -> (U Any (List (Listof Syntax) Syntax))
-(define (type->contract ty init-fail
-                        #:typed-side [typed-side #t]
-                        #:kind [kind 'impersonator]
-                        #:cache [cache (make-hash)]
-                        #:sc-cache [sc-cache (make-hash)])
-  (let/ec escape
-    (define (fail #:reason [reason #f]) (escape (init-fail #:reason reason)))
-    (instantiate
-     (optimize
-      (type->static-contract ty #:typed-side typed-side fail
-                             #:cache sc-cache)
-      #:trusted-positive typed-side
-      #:trusted-negative (not typed-side))
-     fail
-     kind
-     #:cache cache)))
-
-
-
-
-(define any-wrap/sc (chaperone/sc #'any-wrap/c))
-
-(define (no-duplicates l)
-  (= (length l) (length (remove-duplicates l))))
-
-(struct triple (untyped typed both))
-(define (triple-lookup trip side)
-  (case side
-    ((untyped) (triple-untyped trip))
-    ((typed) (triple-typed trip))
-    ((both) (triple-both trip))))
-(define (same sc)
-  (triple sc sc sc))
-
-;; Keep track of the bound names and don't cache types where those are free
-(define bound-names (make-parameter null))
-
-;; Macro to simplify (and avoid reindentation) of the match below
-;;
-;; The sc-cache hashtable is used to memoize static contracts. The keys are
-;; a pair of the Type-seq number for a type and 'untyped or 'typed
-(define-syntax (cached-match stx)
-  (syntax-case stx ()
-    [(_ sc-cache type-expr typed-side-expr match-clause ...)
-     #'(let ([type type-expr]
-             [typed-side typed-side-expr])
-         (define key (cons (Type-seq type) typed-side))
-         (cond [(hash-ref sc-cache key #f)]
-               [else
-                (define sc (match type match-clause ...))
-                (define fvs (fv type))
-                (unless (or (ormap (λ (n) (member n fvs)) (bound-names))
-                            ;; Don't cache types with applications of Name types because
-                            ;; it does the wrong thing for recursive references
-                            (has-name-app? type))
-                  (hash-set! sc-cache key sc))
-                sc]))]))
-
-(define (type->static-contract type init-fail
-                               #:typed-side [typed-side #t]
-                               #:cache [sc-cache (make-hash)])
-  (let/ec return
-    (define (fail #:reason reason) (return (init-fail #:reason reason)))
-    (let loop ([type type] [typed-side (if typed-side 'typed 'untyped)] [recursive-values (hash)])
-      (define (t->sc t #:recursive-values (recursive-values recursive-values))
-        (loop t typed-side recursive-values))
-      (define (t->sc/neg t #:recursive-values (recursive-values recursive-values))
-        (loop t (flip-side typed-side) recursive-values))
-      (define (t->sc/both t #:recursive-values (recursive-values recursive-values))
-        (loop t 'both recursive-values))
-      (define (t->sc/method t) (t->sc/function t fail typed-side recursive-values loop #t))
-      (define (t->sc/fun t) (t->sc/function t fail typed-side recursive-values loop #f))
-
-      (define (only-untyped sc)
-        (if (from-typed? typed-side)
-            (fail #:reason "contract generation not supported for this type")
-            sc))
-      (cached-match sc-cache type typed-side
-        ;; Applications of implicit recursive type aliases
-        ;;
-        ;; We special case this rather than just resorting to standard
-        ;; App resolution (see case below) because the resolution process
-        ;; will make type->static-contract infinite loop.
-        [(App: (Name: name _ #f) _ _)
-         ;; Key with (cons name 'app) instead of just name because the
-         ;; application of the Name is not necessarily the same as the
-         ;; Name type alone
-         (cond [(hash-ref recursive-values (cons name 'app) #f)]
-               [else
-                (define name* (generate-temporary name))
-                (recursive-sc (list name*)
-                              (list
-                               (t->sc (resolve-once type)
-                                      #:recursive-values
-                                      (hash-set recursive-values
-                                                (cons name 'app)
-                                                (recursive-sc-use name*))))
-                              (recursive-sc-use name*))])]
-        ;; Implicit recursive aliases
-        [(Name: name-id args #f)
-         (cond [;; recursive references are looked up in a special table
-                ;; that's handled differently by sc instantiation
-                (lookup-name-sc name-id typed-side)]
-               [else
-                (define rv recursive-values)
-                (define resolved-name (resolve-once type))
-                (register-name-sc name-id
-                                  (λ () (loop resolved-name 'untyped rv))
-                                  (λ () (loop resolved-name 'typed rv))
-                                  (λ () (loop resolved-name 'both rv)))
-                (lookup-name-sc name-id typed-side)])]
-        ;; Ordinary type applications or struct type names, just resolve
-        [(or (App: _ _ _) (Name/struct:)) (t->sc (resolve-once type))]
-        [(Univ:) (if (from-typed? typed-side) any-wrap/sc any/sc)]
-        [(Mu: var (Union: (list (Value: '()) (Pair: elem-ty (F: var)))))
-         (listof/sc (t->sc elem-ty))]
-        [(Base: sym cnt _ _)
-         (flat/sc #`(flat-named-contract '#,sym (flat-contract-predicate #,cnt)) sym)]
-        [(Refinement: par p?)
-         (and/sc (t->sc par) (flat/sc p?))]
-        [(Union: elems)
-         (define-values (numeric non-numeric) (partition (λ (t) (equal? 'number (Type-key t))) elems ))
-         (define numeric-sc (numeric-type->static-contract (apply Un numeric)))
-         (if numeric-sc
-             (apply or/sc numeric-sc (map t->sc non-numeric))
-             (apply or/sc (map t->sc elems)))]
-        [(and t (Function: _)) (t->sc/fun t)]
-        [(Set: t) (set/sc (t->sc t))]
-        [(Sequence: ts) (apply sequence/sc (map t->sc ts))]
-        [(Vector: t) (vectorof/sc (t->sc/both t))]
-        [(HeterogeneousVector: ts) (apply vector/sc (map t->sc/both ts))]
-        [(Box: t) (box/sc (t->sc/both t))]
-        [(Pair: t1 t2)
-         (cons/sc (t->sc t1) (t->sc t2))]
-        [(Promise: t)
-         (promise/sc (t->sc t))]
-        [(Opaque: p?)
-         (flat/sc #`(flat-named-contract (quote #,(syntax-e p?)) #,p?))]
-        [(Continuation-Mark-Keyof: t)
-         (continuation-mark-key/sc (t->sc t))]
-        ;; TODO: this is not quite right for case->
-        [(Prompt-Tagof: s (Function: (list (arr: (list ts ...) _ _ _ _))))
-         (prompt-tag/sc (map t->sc ts) (t->sc s))]
-        ;; TODO
-        [(F: v)
-         (triple-lookup
-           (hash-ref recursive-values v
-             (λ () (error 'type->static-contract
-                          "Recursive value lookup failed. ~a ~a" recursive-values v)))
-           typed-side)]
-        [(VectorTop:) (only-untyped vector?/sc)]
-        [(BoxTop:) (only-untyped box?/sc)]
-        [(ChannelTop:) (only-untyped channel?/sc)]
-        [(Async-ChannelTop:) (only-untyped async-channel?/sc)]
-        [(HashtableTop:) (only-untyped hash?/sc)]
-        [(MPairTop:) (only-untyped mpair?/sc)]
-        [(ThreadCellTop:) (only-untyped thread-cell?/sc)]
-        [(Prompt-TagTop:) (only-untyped prompt-tag?/sc)]
-        [(Continuation-Mark-KeyTop:) (only-untyped continuation-mark-key?/sc)]
-        [(ClassTop:) (only-untyped class?/sc)]
-        [(StructTypeTop:) (struct-type/sc null)]
-        ;; TODO Figure out how this should work
-        ;[(StructTop: s) (struct-top/sc s)]
-
-
-        [(Poly: vs b)
-         (if (not (from-untyped? typed-side))
-             ;; in positive position, no checking needed for the variables
-             (let ((recursive-values (for/fold ([rv recursive-values]) ([v vs])
-                                       (hash-set rv v (same any/sc)))))
-               (t->sc b #:recursive-values recursive-values))
-             ;; in negative position, use parametric contracts.
-             (match-let ([(Poly-names: vs-nm b) type])
-               (define function-type?
-                 (let loop ([ty b])
-                   (match (resolve ty)
-                     [(Function: _) #t]
-                     [(Union: elems) (andmap loop elems)]
-                     [(Poly: _ body) (loop body)]
-                     [(PolyDots: _ body) (loop body)]
-                     [_ #f])))
-               (unless function-type?
-                 (fail #:reason "cannot generate contract for non-function polymorphic type"))
-               (let ((temporaries (generate-temporaries vs-nm)))
-                 (define rv (for/fold ((rv recursive-values)) ((temp temporaries)
-                                                               (v-nm vs-nm))
-                              (hash-set rv v-nm (same (parametric-var/sc temp)))))
-                 (parameterize ([bound-names (append (bound-names) vs-nm)])
-                   (parametric->/sc temporaries
-                     (t->sc b #:recursive-values rv))))))]
-        [(PolyDots: (list vs ... dotted-v) b)
-         (if (not (from-untyped? typed-side))
-             ;; in positive position, no checking needed for the variables
-             (let ((recursive-values (for/fold ([rv recursive-values]) ([v vs])
-                                       (hash-set rv v (same any/sc)))))
-               (t->sc b #:recursive-values recursive-values))
-             ;; in negative position, use parametric contracts.
-             (fail #:reason "cannot generate contract for variable arity polymorphic type"))]
-
-        [(Mu: n b)
-         (match-define (and n*s (list untyped-n* typed-n* both-n*)) (generate-temporaries (list n n n)))
-         (define rv
-           (hash-set recursive-values n
-                     (triple (recursive-sc-use untyped-n*)
-                             (recursive-sc-use typed-n*)
-                             (recursive-sc-use both-n*))))
-         (case typed-side
-           [(both) (recursive-sc
-                     (list both-n*)
-                     (parameterize ([bound-names (cons n (bound-names))])
-                       (list (loop b 'both rv)))
-                     (recursive-sc-use both-n*))]
-           [(typed untyped)
-            (define (rec b side rv)
-              (parameterize ([bound-names (cons n (bound-names))])
-                (loop b side rv)))
-            ;; TODO not fail in cases that don't get used
-            (define untyped (rec b 'untyped rv))
-            (define typed (rec b 'typed rv))
-            (define both (rec b 'both rv))
-  
-            (recursive-sc
-                     n*s
-                     (list untyped typed both)
-                     (recursive-sc-use (if (from-typed? typed-side) typed-n* untyped-n*)))])]
-        [(Instance: (? Mu? t))
-         (t->sc (make-Instance (resolve-once t)))]
-        [(Instance: (? Name? t))
-         (instanceof/sc (t->sc t))]
-        [(Instance: (Class: _ _ fields methods _ _))
-         (match-define (list (list field-names field-types) ...) fields)
-         (match-define (list (list public-names public-types) ...) methods)
-         (object/sc (append (map (λ (n sc) (member-spec 'method n sc))
-                                 public-names (map t->sc/method public-types))
-                            (map (λ (n sc) (member-spec 'field n sc))
-                                 field-names (map t->sc/both field-types))))]
-        [(Class: _ inits fields publics augments _)
-         (match-define (list (list init-names init-types _) ...) inits)
-         (match-define (list (list field-names field-types) ...) fields)
-         (match-define (list (list public-names public-types) ...) publics)
-         (match-define (list (list augment-names augment-types) ...) augments)
-         (define-values (pubment-names pubment-types)
-           (for/lists (_1 _2) ([name (in-list public-names)]
-                               [type (in-list public-types)]
-                               #:when (memq name augment-names))
-             (values name type)))
-         (define-values (override-names override-types)
-           (for/lists (_1 _2) ([name (in-list public-names)]
-                               [type (in-list public-types)]
-                               #:unless (memq name pubment-names))
-             (values name type)))
-         (class/sc (append
-                     (map (λ (n sc) (member-spec 'override n sc))
-                          override-names (map t->sc/method override-types))
-                     (map (λ (n sc) (member-spec 'pubment n sc))
-                          pubment-names (map t->sc/method pubment-types))
-                     (map (λ (n sc) (member-spec 'augment n sc))
-                          augment-names (map t->sc/method augment-types))
-                     (map (λ (n sc) (member-spec 'init n sc))
-                          init-names (map t->sc/neg init-types))
-                     (map (λ (n sc) (member-spec 'field n sc))
-                          field-names (map t->sc/both field-types)))
-                   #f)]
-        [(Struct: nm par (list (fld: flds acc-ids mut?) ...) proc poly? pred?)
-         (cond
-           [(dict-ref recursive-values nm #f)]
-           [proc (fail #:reason "procedural structs are not supported")]
-           [poly?
-            (define nm* (generate-temporary #'n*))
-            (define fields
-              (for/list ([fty flds] [mut? mut?])
-                (t->sc fty #:recursive-values (hash-set
-                                                recursive-values
-                                                nm (recursive-sc-use nm*)))))
-            (recursive-sc (list nm*) (list (struct/sc nm (ormap values mut?) fields))
-                                (recursive-sc-use nm*))]
-           [else (flat/sc #`(flat-named-contract '#,(syntax-e pred?) (lambda (x) (#,pred? x))))])]
-        [(StructType: s)
-         (if (from-untyped? typed-side)
-             (fail #:reason (~a "cannot import structure types from"
-                                "untyped code"))
-             (struct-type/sc null))]
-        [(Syntax: (Base: 'Symbol _ _ _)) identifier?/sc]
-        [(Syntax: t)
-         (syntax/sc (t->sc t))]
-        [(Value: v)
-         (flat/sc #`(flat-named-contract '#,v (lambda (x) (equal? x '#,v))) v)]
-        [(Param: in out) 
-         (parameter/sc (t->sc in) (t->sc out))]
-        [(Hashtable: k v)
-         (hash/sc (t->sc k) (t->sc v))]
-        [(Channel: t)
-         (channel/sc (t->sc t))]
-        [(Evt: t)
-         (evt/sc (t->sc t))]
-        [else
-         (fail #:reason "contract generation not supported for this type")]))))
-
-(define (t->sc/function f fail typed-side recursive-values loop method?)
-  (define (t->sc t #:recursive-values (recursive-values recursive-values))
-    (loop t typed-side recursive-values))
-  (define (t->sc/neg t #:recursive-values (recursive-values recursive-values))
-    (loop t (flip-side typed-side) recursive-values))
-  (match f
-    [(Function: arrs)
-     ;; Try to generate a single `->*' contract if possible.
-     ;; This allows contracts to be generated for functions with both optional and keyword args.
-     ;; (and don't otherwise require full `case->')
-     (define conv (match-lambda [(Keyword: kw kty _) (list kw (t->sc/neg kty))]))
-     (define (partition-kws kws) (partition (match-lambda [(Keyword: _ _ mand?) mand?]) kws))
-     (define (process-dom dom*)  (if method? (cons any/sc dom*) dom*))
-     (cond
-      ;; To generate a single `->*', everything must be the same for all arrs, except for positional
-      ;; arguments which can increase by at most one each time.
-      ;; Note: optional arguments can only increase by 1 each time, to avoid problems with
-      ;;  functions that take, e.g., either 2 or 6 arguments. These functions shouldn't match,
-      ;;  since this code would generate contracts that accept any number of arguments between
-      ;;  2 and 6, which is wrong.
-      ;; TODO sufficient condition, but may not be necessary
-      [(has-optional-args? arrs)
-       (match* ((first arrs) (last arrs))
-         [((arr: first-dom (Values: (list (Result: rngs (FilterSet: (Top:) (Top:)) (Empty:)) ...)) rst #f kws)
-           (arr: last-dom _ _ _ _)) ; all but dom is the same for all
-          (define mand-args (map t->sc/neg first-dom))
-          (define opt-args (map t->sc/neg (drop last-dom (length first-dom))))
-          (define-values (mand-kws opt-kws)
-            (let*-values ([(mand-kws opt-kws) (partition-kws kws)])
-              (values (map conv mand-kws)
-                      (map conv opt-kws))))
-          (define range (map t->sc rngs))
-          (define rest (and rst (listof/sc (t->sc/neg rst))))
-          (function/sc (process-dom mand-args) opt-args mand-kws opt-kws rest range)])]
-      [else
-       (define ((f case->) a)
-         (define (convert-arr arr)
-           (match arr
-             [(arr: dom (Values: (list (Result: rngs _ _) ...)) rst drst kws)
-              (let-values ([(mand-kws opt-kws) (partition-kws kws)])
-                ;; Garr, I hate case->!
-                (when (and (not (empty? kws)) case->)
-                  (fail #:reason (~a "cannot generate contract for case function type"
-                                     " with optional keyword arguments")))
-                (if case->
-                  (arr/sc (process-dom (map t->sc/neg dom))
-                          (and rst (listof/sc (t->sc/neg rst)))
-                          (map t->sc rngs))
-                  (function/sc
-                    (process-dom (map t->sc/neg dom))
-                    null
-                    (map conv mand-kws)
-                    (map conv opt-kws)
-                    (or
-                      (and rst (listof/sc (t->sc/neg rst)))
-                      (and drst (listof/sc (t->sc/neg (car drst)
-                                                      #:recursive-values
-                                                        (hash-set recursive-values (cdr drst) (same any/sc))))))
-                    (map t->sc rngs))))]))
-         (match a
-           ;; functions with no filters or objects
-           [(arr: dom (Values: (list (Result: rngs (FilterSet: (Top:) (Top:)) (Empty:)) ...)) rst drst kws)
-            (convert-arr a)]
-           ;; Functions that don't return
-           [(arr: dom (Values: (list (Result: (== -Bottom) _ _) ...)) rst drst kws)
-            (convert-arr a)]
-           ;; functions with filters or objects
-           [(arr: dom (Values: (list (Result: rngs _ _) ...)) rst drst kws)
-            (if (from-untyped? typed-side)
-                (fail #:reason (~a "cannot generate contract for function type"
-                                   " with filters or objects."))
-                (convert-arr a))]))
-       (define arities
-         (for/list ([t arrs])
-           (match t
-             [(arr: dom _ _ _ _) (length dom)])))
-       (define maybe-dup (check-duplicate arities))
-       (when maybe-dup
-         (fail #:reason (~a "function type has two cases of arity " maybe-dup)))
-       (if (= (length arrs) 1)
-           ((f #f) (first arrs))
-           (case->/sc (map (f #t) arrs)))])]))
-
-;; Predicate that checks for an App type with a recursive
-;; Name type in application position
-(define (has-name-app? type)
-  (let/ec escape
-    (let loop ([type type])
-      (type-case
-       (#:Type loop #:Filter (sub-f loop) #:Object (sub-o loop))
-       type
-       [#:App arg _ _
-        (match arg
-          [(Name: _ _ #f) (escape #t)]
-          [_ type])]))
-    #f))
-
-(module predicates racket/base
-  (require racket/extflonum)
-  (provide nonnegative? nonpositive?
-           extflonum? extflzero? extflnonnegative? extflnonpositive?)
-  (define nonnegative? (lambda (x) (>= x 0)))
-  (define nonpositive? (lambda (x) (<= x 0)))
-  (define extflzero? (lambda (x) (extfl= x 0.0t0)))
-  (define extflnonnegative? (lambda (x) (extfl>= x 0.0t0)))
-  (define extflnonpositive? (lambda (x) (extfl<= x 0.0t0))))
-
-(module numeric-contracts racket/base
-  (require
-    "../utils/utils.rkt"
-    (static-contracts combinators)
-    (for-template
-      racket/base
-      racket/contract
-      (submod ".." predicates)
-      (prefix-in t: (types numeric-predicates))))
-  (provide (all-defined-out))
-
-  (define-syntax-rule (numeric/sc name body)
-    (flat/sc #'(flat-named-contract 'name body) 'name))
-
-  (define positive-byte/sc (numeric/sc Positive-Byte (and/c byte? positive?)))
-  (define byte/sc (numeric/sc Byte byte?))
-  (define positive-index/sc (numeric/sc Positive-Index (and/c t:index? positive?)))
-  (define index/sc (numeric/sc Index t:index?))
-  (define positive-fixnum/sc (numeric/sc Positive-Fixnum (and/c fixnum? positive?)))
-  (define nonnegative-fixnum/sc (numeric/sc Nonnegative-Fixnum (and/c fixnum? nonnegative?)))
-  (define nonpositive-fixnum/sc (numeric/sc Nonpositive-Fixnum (and/c fixnum? nonpositive?)))
-  (define fixnum/sc (numeric/sc Fixnum fixnum?))
-  (define positive-integer/sc (numeric/sc Positive-Integer (and/c exact-integer? positive?)))
-  (define natural/sc (numeric/sc Natural exact-nonnegative-integer?))
-  (define negative-integer/sc (numeric/sc Negative-Integer (and/c exact-integer? negative?)))
-  (define nonpositive-integer/sc (numeric/sc Nonpositive-Integer (and/c exact-integer? nonpostive?)))
-  (define integer/sc (numeric/sc Integer exact-integer?))
-  (define positive-rational/sc (numeric/sc Positive-Rational (and/c t:exact-rational? positive?)))
-  (define nonnegative-rational/sc (numeric/sc Nonnegative-Rational (and/c t:exact-rational? nonnegative?)))
-  (define negative-rational/sc (numeric/sc Negative-Rational (and/c t:exact-rational? negative?)))
-  (define nonpositive-rational/sc (numeric/sc Nonpositive-Rational (and/c t:exact-rational? nonpositive?)))
-  (define rational/sc (numeric/sc Rational t:exact-rational?))
-  (define flonum-zero/sc (numeric/sc Float-Zero (and/c flonum? zero?)))
-  (define nonnegative-flonum/sc (numeric/sc Nonnegative-Float (and/c flonum? nonnegative?)))
-  (define nonpositive-flonum/sc (numeric/sc Nonpositive-Float (and/c flonum? nonpositive?)))
-  (define flonum/sc (numeric/sc Float flonum?))
-  (define single-flonum-zero/sc (numeric/sc Single-Flonum-Zero (and/c single-flonum? zero?)))
-  (define inexact-real-zero/sc (numeric/sc Inexact-Real-Zero (and/c inexact-real? zero?)))
-  (define positive-inexact-real/sc (numeric/sc Positive-Inexact-Real (and/c inexact-real? positive?)))
-  (define nonnegative-single-flonum/sc (numeric/sc Nonnegative-Single-Flonum (and/c single-flonum? nonnegative?)))
-  (define nonnegative-inexact-real/sc (numeric/sc Nonnegative-Inexact-Real (and/c inexact-real? nonpositive?)))
-  (define negative-inexact-real/sc (numeric/sc Negative-Inexact-Real (and/c inexact-real? negative?)))
-  (define nonpositive-single-flonum/sc (numeric/sc Nonpositive-Single-Flonum (and/c single-flonum? nonnegative?)))
-  (define nonpositive-inexact-real/sc (numeric/sc Nonpositive-Inexact-Real (and/c inexact-real? nonpositive?)))
-  (define single-flonum/sc (numeric/sc Single-Flonum single-flonum?))
-  (define inexact-real/sc (numeric/sc Inexact-Real inexact-real?))
-  (define real-zero/sc (numeric/sc Real-Zero (and/c real? zero?)))
-  (define positive-real/sc (numeric/sc Positive-Real (and/c real? positive?)))
-  (define nonnegative-real/sc (numeric/sc Nonnegative-Real (and/c real? nonnegative?)))
-  (define negative-real/sc (numeric/sc Negative-Real (and/c real? negative?)))
-  (define nonpositive-real/sc (numeric/sc Nonpositive-Real (and/c real? nonpositive?)))
-  (define real/sc (numeric/sc Real real?))
-  (define exact-number/sc (numeric/sc Exact-Number (and/c number? exact?)))
-  (define inexact-complex/sc
-    (numeric/sc Inexact-Complex
-                 (and/c number?
-                   (lambda (x)
-                     (and (inexact-real? (imag-part x))
-                          (inexact-real? (real-part x)))))))
-  (define number/sc (numeric/sc Number number?))
-  
-  (define extflonum-zero/sc (numeric/sc ExtFlonum-Zero (and/c extflonum? extflzero?)))
-  (define nonnegative-extflonum/sc (numeric/sc Nonnegative-ExtFlonum (and/c extflonum? extflnonnegative?)))
-  (define nonpositive-extflonum/sc (numeric/sc Nonpositive-ExtFlonum (and/c extflonum? extflnonpositive?)))
-  (define extflonum/sc (numeric/sc ExtFlonum extflonum?))
-
-  )
-(require 'numeric-contracts)
-
-(define (numeric-type->static-contract type)
-  (match type
-    ;; numeric special cases
-    ;; since often-used types like Integer are big unions, this would
-    ;; generate large contracts.
-    [(== t:-PosByte type-equal?) positive-byte/sc]
-    [(== t:-Byte type-equal?) byte/sc]
-    [(== t:-PosIndex type-equal?) positive-index/sc]
-    [(== t:-Index type-equal?) index/sc]
-    [(== t:-PosFixnum type-equal?) positive-fixnum/sc]
-    [(== t:-NonNegFixnum type-equal?) nonnegative-fixnum/sc]
-    ;; -NegFixnum is a base type
-    [(== t:-NonPosFixnum type-equal?) nonpositive-fixnum/sc]
-    [(== t:-Fixnum type-equal?) fixnum/sc]
-    [(== t:-PosInt type-equal?) positive-integer/sc]
-    [(== t:-Nat type-equal?) natural/sc]
-    [(== t:-NegInt type-equal?) negative-integer/sc]
-    [(== t:-NonPosInt type-equal?) nonpositive-integer/sc]
-    [(== t:-Int type-equal?) integer/sc]
-    [(== t:-PosRat type-equal?) positive-rational/sc]
-    [(== t:-NonNegRat type-equal?) nonnegative-rational/sc]
-    [(== t:-NegRat type-equal?) negative-rational/sc]
-    [(== t:-NonPosRat type-equal?) nonpositive-rational/sc]
-    [(== t:-Rat type-equal?) rational/sc]
-    [(== t:-FlonumZero type-equal?) flonum-zero/sc]
-    [(== t:-NonNegFlonum type-equal?) nonnegative-flonum/sc]
-    [(== t:-NonPosFlonum type-equal?) nonpositive-flonum/sc]
-    [(== t:-Flonum type-equal?) flonum/sc]
-    [(== t:-SingleFlonumZero type-equal?) single-flonum-zero/sc]
-    [(== t:-InexactRealZero type-equal?) inexact-real-zero/sc]
-    [(== t:-PosInexactReal type-equal?) positive-inexact-real/sc]
-    [(== t:-NonNegSingleFlonum type-equal?) nonnegative-single-flonum/sc]
-    [(== t:-NonNegInexactReal type-equal?) nonnegative-inexact-real/sc]
-    [(== t:-NegInexactReal type-equal?) negative-inexact-real/sc]
-    [(== t:-NonPosSingleFlonum type-equal?) nonpositive-single-flonum/sc]
-    [(== t:-NonPosInexactReal type-equal?) nonpositive-inexact-real/sc]
-    [(== t:-SingleFlonum type-equal?) single-flonum/sc]
-    [(== t:-InexactReal type-equal?) inexact-real/sc]
-    [(== t:-RealZero type-equal?) real-zero/sc]
-    [(== t:-PosReal type-equal?) positive-real/sc]
-    [(== t:-NonNegReal type-equal?) nonnegative-real/sc]
-    [(== t:-NegReal type-equal?) negative-real/sc]
-    [(== t:-NonPosReal type-equal?) nonpositive-real/sc]
-    [(== t:-Real type-equal?) real/sc]
-    [(== t:-ExactNumber type-equal?) exact-number/sc]
-    [(== t:-InexactComplex type-equal?) inexact-complex/sc]
-    [(== t:-Number type-equal?) number/sc]
-    [(== t:-ExtFlonumZero type-equal?) extflonum-zero/sc]
-    [(== t:-NonNegExtFlonum type-equal?) nonnegative-extflonum/sc]
-    [(== t:-NonPosExtFlonum type-equal?) nonpositive-extflonum/sc]
-    [(== t:-ExtFlonum type-equal?) extflonum/sc]
-    [else #f]))
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/with-types.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/with-types.rkt
deleted file mode 100644
index 33ada5de41..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/with-types.rkt
+++ /dev/null
@@ -1,187 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         (base-env base-types-extra)
-         (except-in (base-env prims) with-handlers λ lambda define)
-         (env type-name-env type-alias-env global-env)
-         (private parse-type type-contract syntax-properties)
-         (typecheck tc-toplevel typechecker)
-         (types utils)
-         (utils lift tc-utils disarm arm literal-syntax-class)
-         racket/promise
-         racket/syntax
-         syntax/flatten-begin
-         syntax/parse
-         unstable/sequence
-         "../tc-setup.rkt"
-         "../standard-inits.rkt"
-         (for-template
-          (except-in racket/base for for* with-handlers lambda λ define
-                     let let* letrec letrec-values let-values
-                     let/cc let/ec do case-lambda struct define-struct
-                     default-continuation-prompt-tag
-                     for/list for/vector for/hash for/hasheq for/hasheqv
-                     for/and for/or for/sum for/product for/lists
-                     for/first for/last for/fold for*/list for*/lists
-                     for*/vector for*/hash for*/hasheq for*/hasheqv for*/and
-                     for*/or for*/sum for*/product for*/first for*/last
-                     for*/fold)
-          (base-env prims)
-          (prefix-in c: racket/contract/region))
-         (for-label racket/base
-                    (base-env base-types-extra)))
-
-(define-literal-syntax-class #:for-label Values)
-(define-literal-syntax-class #:for-label values)
-
-(provide wt-core)
-
-(define (with-type-helper stx body fvids fvtys exids extys resty expr? ctx)
-  (define old-context (unbox typed-context?))
-  (unless (not old-context)
-    (tc-error/stx stx "with-type cannot be used in a typed module."))
-  (set-box! typed-context? #t)
-  (do-standard-inits)
-  (define fv-types (for/list ([t (in-syntax fvtys)])
-                     (parse-type t)))
-  (define ex-types (for/list ([t (in-syntax extys)])
-                     (parse-type t)))
-  (define-values (fv-ctc-ids fv-ctc-defs)
-    (type-stxs->ids+defs (syntax->list fvtys) 'untyped))
-  (define-values (ex-ctc-ids ex-ctc-defs)
-    (type-stxs->ids+defs (syntax->list extys) 'typed))
-  (define-values (region-ctc-ids region-ctc-defs)
-    (if expr?
-        (type-stxs->ids+defs (values-stx->type-stxs resty) 'typed)
-        (values null null)))
-  (define region-tc-result
-    (and expr? (parse-tc-results resty)))
-  (for ([i (in-syntax fvids)]
-        [ty (in-list fv-types)])
-    (register-type i ty))
-  (define-values (lifted-definitions expanded-body)
-    (if expr?
-        (with-syntax ([body body])
-          (wt-expand #'(let () . body) ctx))
-        (with-syntax ([(body ...) body]
-                      [(id ...) exids]
-                      [(ty ...) extys])
-          (wt-expand #'(let () (begin (: id ty) ... body ... (values id ...))) ctx))))
-  (parameterize (;; do we report multiple errors
-                 [delay-errors? #t]
-                 ;; this parameter is just for printing types
-                 ;; this is a parameter to avoid dependency issues
-                 [current-type-names
-                  (lazy
-                    (append 
-                     (type-name-env-map (lambda (id ty)
-                                          (cons (syntax-e id) ty)))
-                     (type-alias-env-map (lambda (id ty)
-                                           (cons (syntax-e id) ty)))))]
-                 ;; reinitialize disappeared uses
-                 [disappeared-use-todo      null]
-                 [disappeared-bindings-todo null]
-                 ;; for error reporting
-                 [orig-module-stx stx]
-                 [expanded-module-stx expanded-body])
-    ;; we can treat the lifted definitions as top-level forms because they
-    ;; are only definitions and not forms that have special top-level meaning
-    ;; to TR
-    (tc-toplevel-form lifted-definitions)
-    (tc-expr/check expanded-body (if expr? region-tc-result (ret ex-types))))
-  (set-box! typed-context? old-context)
-  ;; then clear the new entries from the env ht
-  (for ([i (in-syntax fvids)])
-    (unregister-type i))
-  ;; report errors after setting the typed-context? flag and unregistering
-  ;; types to ensure that the state is cleaned up properly in the REPL
-  (report-all-errors)
-  (with-syntax ([(fv.id ...) fvids]
-                [(cnt ...) fv-ctc-ids]
-                [(ex-id ...) exids]
-                [(ex-cnt ...) ex-ctc-ids]
-                [(region-cnt ...) region-ctc-ids]
-                [(body) (maybe-optimize #`(#,expanded-body))]
-                [check-syntax-help (syntax-property
-                                    (syntax-property
-                                     #'(void)
-                                     'disappeared-binding (disappeared-bindings-todo))
-                                    'disappeared-use (disappeared-use-todo))])
-    (define fixed-up-definitions
-      (change-contract-fixups
-       (flatten-all-begins
-        #`(begin #,lifted-definitions
-                 #,@(if expr? (append region-ctc-defs fv-ctc-defs) null)
-                 #,@(if (not expr?) ex-ctc-defs null)))))
-    (arm
-      (if expr?
-          (quasisyntax/loc stx
-            (let ()
-              check-syntax-help
-              (local-require #,@(cdr (syntax-e extra-requires)))
-              #,@fixed-up-definitions
-              (c:with-contract typed-region
-                               #:results (region-cnt ...)
-                               #:freevars ([fv.id cnt] ...)
-                               body)))
-          (quasisyntax/loc stx
-            (begin
-              (local-require #,@(cdr (syntax-e extra-requires)))
-              (define-values () (begin check-syntax-help (values)))
-              #,@fixed-up-definitions
-              (c:with-contract typed-region
-                               ([ex-id ex-cnt] ...)
-                               (define-values (ex-id ...) body))))))))
-
-;; Syntax (U Symbol List) -> (values Syntax Syntax)
-;; local expansion for with-type expressions
-(define (wt-expand stx ctx)
-  (syntax-parse (local-expand/capture* stx ctx null)
-    #:literal-sets (kernel-literals)
-    [(begin (define-values (x ...) e ...) ... (let-values () . body))
-     (values (disarm* #'(begin (define-values (x ...) e ...) ...))
-             (disarm* (local-expand/capture* #'(let-values () . body) ctx null)))]))
-
-;; Deconstruct values type stx that the user wrote
-(define (values-stx->type-stxs values-stx)
-  (syntax-parse values-stx
-    [((~or :Values^ :values^) t ...)
-     (syntax->list #'(t ...))]
-    [t (list #'t)]))
-
-;; type-stxs->ids+defs : (Listof Syntax) Symbol -> (Listof Id Syntax)
-;; Create identifiers and definition syntaxes for contract generation
-(define (type-stxs->ids+defs type-stxs typed-side)
-  (for/lists (_1 _2) ([t (in-list type-stxs)])
-    (define ctc-id (generate-temporary))
-    (values ctc-id
-            #`(define-values (#,ctc-id)
-                #,(contract-def-property
-                   #'#f `#s(contract-def ,t #f #f ,typed-side))))))
-
-(define (wt-core stx)
-  (define-syntax-class typed-id
-    #:description "[id type]"
-    [pattern (id ty)])
-  (define-splicing-syntax-class free-vars
-    #:description "free variable specification"
-    #:attributes ((id 1) (ty 1))
-    [pattern (~seq #:freevars (:typed-id ...))]
-    [pattern (~seq)
-             #:with (id ...) null
-             #:with (ty ...) null])
-  (define-syntax-class typed-ids
-    #:description "sequence of typed identifiers"
-    #:attributes ((id 1) (ty 1))
-    [pattern (t:typed-id ...)
-             #:with (id ...) #'(t.id ...)
-             #:with (ty ...) #'(t.ty ...)])
-  (define-splicing-syntax-class result-ty
-    #:description "result specification"
-    [pattern (~seq #:result ty:expr)])
-  (syntax-parse stx
-    [(_ :typed-ids fv:free-vars . body)
-     (with-type-helper stx #'body #'(fv.id ...) #'(fv.ty ...) #'(id ...) #'(ty ...) #f #f (syntax-local-context))]
-    [(_ :result-ty fv:free-vars . body)
-     (with-type-helper stx #'body #'(fv.id ...) #'(fv.ty ...) #'() #'() #'ty #t (syntax-local-context))]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/filter-rep.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/filter-rep.rkt
deleted file mode 100644
index cb7235e6d3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/filter-rep.rkt
+++ /dev/null
@@ -1,67 +0,0 @@
-#lang racket/base
-
-;;TODO use contract-req
-(require "rep-utils.rkt" "free-variance.rkt" racket/contract/base
-         racket/lazy-require)
-
-;; TODO use something other than lazy-require.
-(lazy-require ["type-rep.rkt" (Type/c Univ? Bottom?)]
-              ["object-rep.rkt" (Path?)])
-
-(provide Filter/c FilterSet/c name-ref/c hash-name filter-equal?)
-
-(define (Filter/c-predicate? e)
-  (and (Filter? e) (not (NoFilter? e)) (not (FilterSet? e))))
-(define Filter/c (flat-named-contract 'Filter Filter/c-predicate?))
-
-(define FilterSet/c
-  (flat-named-contract
-   'FilterSet
-   (λ (e) (or (FilterSet? e) (NoFilter? e)))))
-
-;; A Name-Ref is any value that represents an object.
-;; As an identifier, it represents a free variable in the environment
-;; As a list, it represents a De Bruijn indexed bound variable
-(define name-ref/c (or/c identifier? (list/c integer? integer?)))
-(define (hash-name v) (if (identifier? v) (hash-id v) (list v)))
-
-(define ((length>=/c len) l)
-  (and (list? l)
-       (>= (length l) len)))
-
-(def-filter Bot () [#:fold-rhs #:base])
-(def-filter Top () [#:fold-rhs #:base])
-
-(def-filter TypeFilter ([t (and/c Type/c (not/c Univ?) (not/c Bottom?))] [p Path?])
-  [#:intern (list (Rep-seq t) (Rep-seq p))]
-  [#:frees (λ (f) (combine-frees (map f (list t p))))]
-  [#:fold-rhs (*TypeFilter (type-rec-id t) (object-rec-id p))])
-
-(def-filter NotTypeFilter ([t (and/c Type/c (not/c Univ?) (not/c Bottom?))] [p Path?])
-  [#:intern (list (Rep-seq t) (Rep-seq p))]
-  [#:frees (λ (f) (combine-frees (map f (list t p))))]
-  [#:fold-rhs (*NotTypeFilter (type-rec-id t) (object-rec-id p))])
-
-;; implication
-(def-filter ImpFilter ([a Filter/c] [c Filter/c]))
-
-(def-filter OrFilter ([fs (and/c (length>=/c 2)
-                                 (listof (or/c TypeFilter? NotTypeFilter? ImpFilter?)))])
-  [#:intern (map Rep-seq fs)]
-  [#:fold-rhs (*OrFilter (map filter-rec-id fs))]
-  [#:frees (λ (f) (combine-frees (map f fs)))])
-
-(def-filter AndFilter ([fs (and/c (length>=/c 2)
-                                  (listof (or/c OrFilter? TypeFilter? NotTypeFilter? ImpFilter?)))])
-  [#:intern (map Rep-seq fs)]
-  [#:fold-rhs (*AndFilter (map filter-rec-id fs))]
-  [#:frees (λ (f) (combine-frees (map f fs)))])
-
-(def-filter FilterSet ([thn Filter/c] [els Filter/c])
-  [#:fold-rhs (*FilterSet (filter-rec-id thn) (filter-rec-id els))])
-
-;; represents no info about the filters of this expression
-;; should only be used for parsing type annotations and expected types
-(def-filter NoFilter () [#:fold-rhs #:base])
-
-(define (filter-equal? a b) (= (Rep-seq a) (Rep-seq b)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/free-variance.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/free-variance.rkt
deleted file mode 100644
index 08ca308823..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/free-variance.rkt
+++ /dev/null
@@ -1,166 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/set
-         racket/lazy-require) 
-
-;; Ugly hack - should use units
-(lazy-require
-  ("../env/type-name-env.rkt" (lookup-type-variance)))
-
-(provide 
-  ;; Variances
-  Covariant Contravariant Invariant Constant Dotted
-  variance? variance->binding
-
-  ;; Construcing frees
-  combine-frees flip-variances
-  make-invariant make-constant 
-  instantiate-frees
-  empty-free-vars
-  single-free-var
-  free-vars-remove
-
-  ;; Examining frees
-  free-vars-hash
-  free-vars-names
-  free-vars-has-key?)
-
-
-;; this file contains support for calculating the free variables/indexes of types
-;; actual computation is done in rep-utils.rkt  and type-rep.rkt
-(define-values (variance? Covariant Contravariant Invariant Constant Dotted)
-  (let ()
-    (define-struct Variance () #:transparent)
-    (define-struct (Covariant Variance) () #:transparent)
-    (define-struct (Contravariant Variance) () #:transparent)
-    (define-struct (Invariant Variance) () #:transparent)
-    (define-struct (Constant Variance) () #:transparent)
-    ;; not really a variance, but is disjoint with the others
-    (define-struct (Dotted Variance) () #:transparent)
-    (values Variance? (make-Covariant) (make-Contravariant) (make-Invariant) (make-Constant) (make-Dotted))))
-
-(define (variance->binding var)
-  (match var
-   ((== Covariant) #'Covariant)
-   ((== Contravariant) #'Contravariant)
-   ((== Invariant) #'Invariant)
-   ((== Constant) #'Constant)
-   ((== Dotted) #'Dotted)))
-
-(define (flip-variance v)
-  (match v
-   ((== Covariant) Contravariant)
-   ((== Contravariant) Covariant)
-   (else v)))
-
-;;All of these are used internally
-;;Only combined-frees is used externally
-(struct combined-frees (table computed) #:transparent)
-(struct app-frees (name args) #:transparent)
-(struct remove-frees (inner name) #:transparent)
-
-
-;; Base constructors
-(define (single-free-var name (variance Covariant))
-  (combined-frees (hasheq name variance) null))
-
-(define empty-free-vars 
-  (combined-frees (hasheq) null))
-
-;; Computed constructor
-(define (instantiate-frees name frees)
-  (combined-frees (hasheq) (list (app-frees name frees))))
-
-
-;; frees -> frees
-(define (flip-variances frees)
-  (match frees
-   ((combined-frees hash computed)
-    (combined-frees
-      (for/hasheq (((k v) hash))
-        (values k (flip-variance v)))
-      (map flip-variances computed)))
-   ((app-frees name args)
-    (app-frees name (map flip-variances args)))
-   ((remove-frees inner name)
-    (remove-frees (flip-variances inner) name))))
-
-
-(define (make-invariant frees)
-  (combined-frees
-    (for/hasheq ((name (free-vars-names frees)))
-      (values name Invariant))
-    null))
-
-(define (make-constant frees)
-  (combined-frees
-    (for/hasheq ((name (free-vars-names frees)))
-      (values name Constant))
-    null))
-
-;; Listof[frees] -> frees
-(define (combine-frees freess)
-  (define-values (hash computed)
-    (for/fold ((hash (hasheq)) (computed null))
-              ((frees freess))
-      (match frees
-       ((combined-frees new-hash new-computed)
-        (values (combine-hashes (list hash new-hash))
-                (append new-computed computed))))))
-  (combined-frees hash computed))
-
-
-(define (free-vars-remove frees name)
-  (match frees
-   ((combined-frees hash computed)
-    (combined-frees (hash-remove hash name)
-                    (map (λ (v) (remove-frees v name)) computed)))))
-
-;;
-(define (free-vars-names vars)
-  (match vars
-    ((combined-frees hash computed)
-     (apply set-union
-            (list->seteq (hash-keys hash))
-            (map free-vars-names computed)))
-    ((remove-frees inner name) (set-remove (free-vars-names inner) name))
-    ((app-frees name args)
-     (apply set-union (map free-vars-names args)))))
-
-(define (free-vars-has-key? vars key)
-  (set-member? (free-vars-names vars) key))
-
-;; Only valid after full type resolution
-(define (free-vars-hash vars)
-  (match vars
-    ((combined-frees hash computed)
-     (combine-hashes (cons hash (map free-vars-hash computed))))
-    ((remove-frees inner name) (hash-remove (free-vars-hash inner) name))
-    ((app-frees name args)
-     (combine-hashes
-       (for/list ((var (lookup-type-variance name)) (arg args))
-        (free-vars-hash
-         (cond
-          ((eq? var Covariant) arg)
-          ((eq? var Contravariant) (flip-variances arg))
-          ((eq? var Invariant) (make-invariant arg))
-          ((eq? var Constant) (make-constant arg)))))))))
-
-
-;; frees = HT[Idx,Variance] where Idx is either Symbol or Number
-;; (listof frees) -> frees
-(define (combine-hashes hashes)
-  (define ((combine-var v) w)
-    (cond
-      [(eq? v w) v]
-      [(eq? v Dotted) w]
-      [(eq? w Dotted) v]
-      [(eq? v Constant) w]
-      [(eq? w Constant) v]
-      [else Invariant]))
-    (for*/fold ([ht #hasheq()])
-      ([old-free (in-list hashes)]
-       [(sym var) (in-hash old-free)])
-      (hash-update ht sym (combine-var var) var)))
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/interning.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/interning.rkt
deleted file mode 100644
index 79fafd25d6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/interning.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-
-(require syntax/id-table racket/dict (for-syntax racket/base syntax/parse))
-
-(provide defintern hash-id)
-
-(define-syntax (defintern stx)
-  (define-splicing-syntax-class extra-kw-spec
-    (pattern (~seq kw:keyword [name:id default:expr])
-             #:with formal #'(kw [name default])))
-  (define-splicing-syntax-class extra-spec
-    (pattern ek:extra-kw-spec
-             #:with e #'ek.name)
-    (pattern e:expr))
-  (syntax-parse stx
-    [(_ name+args make-name key #:extra-args e ...)
-     #'(defintern name+args (lambda () (make-hash)) make-name key #:extra-args e ...)]
-    [(_ (*name:id arg:id ...) make-ht make-name key-expr #:extra-args . (~and ((~seq es:extra-spec) ...) ((~or (~seq ek:extra-kw-spec) e:expr) ...)))
-     (with-syntax ([((extra-formals ...) ...) #'(ek.formal ...)])
-       #'(define *name
-           (let ([table (make-ht)])
-             (lambda (arg ... extra-formals ... ...)
-               (let ([key key-expr])
-                 (hash-ref table key
-                           (lambda ()
-                             (let ([new (make-name (count!) es.e ... arg ...)])
-                               (hash-set! table key new)
-                               new))))))))]))
-
-(define (make-count!)
-  (let ([state 0])
-    (lambda () (begin0 state (set! state (add1 state))))))
-
-(define count! (make-count!))
-(define id-count! (make-count!))
-
-(define identifier-table (make-free-id-table))
-
-(define (hash-id id)
-  (dict-ref
-   identifier-table
-   id
-   (lambda () (let ([c (id-count!)])
-                (dict-set! identifier-table id c)
-                c))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/object-rep.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/object-rep.rkt
deleted file mode 100644
index 42ac53e392..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/object-rep.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-
-;; Representation of "objects" --- these describe the
-;; part of an environment that an expression accesses
-;;
-;; See "Logical Types for Untyped Languages" pg.3
-
-(require "rep-utils.rkt" "free-variance.rkt" "filter-rep.rkt" "../utils/utils.rkt" (contract-req))
-(provide object-equal?)
-
-(def-pathelem CarPE () [#:fold-rhs #:base])
-(def-pathelem CdrPE () [#:fold-rhs #:base])
-(def-pathelem SyntaxPE () [#:fold-rhs #:base])
-(def-pathelem ForcePE () [#:fold-rhs #:base])
-;; t is always a Name (can't put that into the contract b/c of circularity)
-(def-pathelem StructPE ([t Type?] [idx natural-number/c])
-  [#:frees (λ (f) (f t))]
-  [#:fold-rhs (*StructPE (type-rec-id t) idx)])
-
-(def-object Empty () [#:fold-rhs #:base])
-
-(def-object Path ([p (listof PathElem?)] [v name-ref/c])
-  [#:intern (list (map Rep-seq p) (hash-name v))]
-  [#:frees (λ (f) (combine-frees (map f p)))]
-  [#:fold-rhs (*Path (map pathelem-rec-id p) v)])
-
-;; represents no info about the object of this expression
-;; should only be used for parsing type annotations and expected types
-(def-object NoObject () [#:fold-rhs #:base])
-
-(define (object-equal? o1 o2) (= (Rep-seq o1) (Rep-seq o2)))
-
-#|
-(dlo LEmpty () [#:fold-rhs #:base])
-
-(dlo LPath ([p (listof PathElem?)] [idx index/c])
-  [#:frees (λ (f) (combine-frees (map f p)))]
-  [#:fold-rhs (*LPath (map pathelem-rec-id p) idx)])
-|#
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/rep-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/rep-utils.rkt
deleted file mode 100644
index c842c85211..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/rep-utils.rkt
+++ /dev/null
@@ -1,397 +0,0 @@
-#lang racket/base
-(require "../utils/utils.rkt"
-         "../utils/print-struct.rkt"
-         racket/match
-         (contract-req)
-         "free-variance.rkt"
-         "interning.rkt"
-         racket/lazy-require
-         racket/stxparam
-         racket/unsafe/ops
-         (for-syntax
-          racket/match
-          (except-in syntax/parse id identifier keyword)
-          racket/base
-          syntax/struct
-          (contract-req)
-          racket/syntax
-          (rename-in (except-in (utils stxclass-util) bytes byte-regexp regexp byte-pregexp pregexp)
-                     [id* id]
-                     [keyword* keyword])))
-
-
-(lazy-require
-  ["../types/printer.rkt" (print-type print-filter print-object print-pathelem)])
-
-
-(provide == defintern hash-id (for-syntax fold-target))
-
-;; seq: interning-generated count that is used to compare types (type<).
-;; free-vars: cached free type variables
-;; free-idxs: cached free dot sequence variables
-;; stx: originating syntax for error-reporting
-(define-struct Rep (seq free-vars free-idxs stx) #:transparent
-               #:methods gen:equal+hash
-               [(define (equal-proc x y recur)
-                  (eq? (unsafe-Rep-seq x) (unsafe-Rep-seq y)))
-                (define (hash-proc x recur) (unsafe-Rep-seq x))
-                (define (hash2-proc x recur) (unsafe-Rep-seq x))])
-
-;; evil tricks for hygienic yet unhygienic-looking reference
-;; in say def-type for type-ref-id
-(define-for-syntax fold-target #'fold-target)
-(define-for-syntax default-fields (list #'seq #'free-vars #'free-idxs #'stx))
-
-;; parent is for struct inheritance.
-;; ht-stx is the identifier of the intern-table
-;; key? is #f iff the kind generated should not be interned.
-(define-for-syntax (mk parent ht-stx key? the-rec-id)
-  (define-syntax-class opt-contract-id
-    #:attributes (i contract)
-    (pattern i:id
-             #:with contract #'any/c)
-    (pattern [i:id contract]))
-  ;; unhygienic struct function generation
-  (define-syntax-class (idlist name)
-    #:attributes ((i 1) (contract 1) fields maker pred (accessor 1))
-    (pattern (oci:opt-contract-id ...)
-             #:with (i ...) #'(oci.i ...)
-             #:with (contract ...) #'(oci.contract ...)
-             #:with fields #'(i ...)
-             #:with (_ maker pred accessor ...) (build-struct-names name (syntax->list #'fields) #f #t name)))
-
-  ;; applies f to all fields and combines the results.
-  ;; (construction prevents duplicates)
-  (define (combiner f flds)
-    (syntax-parse flds
-      [() #'empty-free-vars]
-      [(e) #`(#,f e)]
-      [(e ...) #`(combine-frees (list (#,f e) ...))]))
-
-  (define-splicing-syntax-class frees-pat
-    #:transparent
-    #:attributes (f1 f2)
-    (pattern (~seq f1:expr f2:expr))
-    ;; [#:frees #f] pattern in e.g. def-type means no free vars or idxs.
-    (pattern #f
-             #:with f1 #'empty-free-vars
-             #:with f2 #'empty-free-vars)
-    ;; [#:frees (λ (f) ...)] should combine free variables or idxs accordingly
-    ;; (given the respective accessor functions)
-    (pattern e:expr
-             #:with f1 #'(e Rep-free-vars)
-             #:with f2 #'(e Rep-free-idxs)))
-
-  ;; fold-pat takes fold-name (e.g. App-fold) and produces the
-  ;; pattern for the match as
-  (define-syntax-class (fold-pat fold-name)
-    #:transparent
-    #:attributes (proc)
-    (pattern #:base
-             #:with proc #`(procedure-rename
-                            (lambda () #,fold-target)
-                            '#,fold-name))
-    (pattern match-expander:expr
-             #:with proc #`(procedure-rename
-                            ;; double quote expander. First unquote below
-                            ;; Second unquote at expansion.
-                            (lambda () #'match-expander)
-                            '#,fold-name)))
-
-  (define-syntax-class form-name
-    (pattern name:id
-             ;; Type -> Type:
-             #:with match-expander (format-id #'name "~a:" #'name)
-             ;; Type -> Type-fold
-             #:with fold (format-id #f "~a-fold" #'name)
-             ;; symbol made keyword of given type's name (e.g. Type -> #:Type)
-             #:with kw (string->keyword (symbol->string (syntax-e #'name)))
-             ;; Type -> *Type
-             #:with *maker (format-id #'name "*~a" #'name)))
-
-  (define (key->list key? v) (if key? (list v) (list)))
-  (lambda (stx)
-    (syntax-parse stx
-      [(dform name:form-name ;; e.g. Function
-              ;; field/contract pairs e.g. ([rator Type/c] [rand Type/c])
-              (~var flds (idlist #'name))
-              (~or
-               (~optional (~and (~fail #:unless key? "#:key not allowed")
-                                ;; expression evaluates to intern key.
-                                ;; e.g. (list rator rand)
-                                [#:key key-expr:expr])
-                          #:defaults ([key-expr #'#f]))
-               ;; intern? is explicitly given when other fields of the type
-               ;; shouldn't matter. (e.g. Opaque)
-               ;; or need further processing (e.g. fld)
-               (~optional [#:intern intern?:expr]
-                          #:defaults
-                          ([intern? (syntax-parse #'flds.fields
-                                      [() #'#f]
-                                      [(f) #'(if (Rep? f) (Rep-seq f) f)]
-                                      [(fields ...) #'(list (if (Rep? fields) (Rep-seq fields) fields) ...)])]))
-               ;; expression that when given a "get free-variables"
-               ;; function, combines the results in the expected fashion.
-               (~optional [#:frees frees:frees-pat]
-                          #:defaults
-                          ([frees.f1 (combiner #'Rep-free-vars #'flds.fields)]
-                           [frees.f2 (combiner #'Rep-free-idxs #'flds.fields)]))
-               ;; This tricky beast is for defining the type/filter/etc.'s
-               ;; part of the fold. The make-prim-type's given
-               ;; rec-ids are bound in this expression's context.
-               (~optional [#:fold-rhs (~var fold-rhs (fold-pat #'name.fold))]
-                          #:defaults ;; defaults to folding down all fields.
-                          ([fold-rhs.proc
-                            ;; This quote makes the inner quasiquote be
-                            ;; evaluated later (3rd element of the hashtable)
-                            ;; in mk-fold.
-                            ;; Thus only def-type'd entities will be properly
-                            ;; folded down.
-                            #`(procedure-rename
-                               (lambda ()
-                                 #'(name.*maker (#,the-rec-id flds.i) ...))
-                               ;; rename to fold name for better error messages
-                               'name.fold)]))
-               ;; how do we contract a value of this type?
-               (~optional [#:contract contract:expr]
-                          ;; defaults to folding down all fields.
-                          #:defaults ([contract
-                                       #'(->* (flds.contract ...)
-                                              (#:syntax (or/c syntax? #f))
-                                              flds.pred)]))
-               (~optional (~and #:no-provide no-provide?))) ...)
-       (with-syntax
-         ;; makes as many underscores as default fields (+1 for key? if provided)
-        ([(ign-pats ...) (let loop ([fs default-fields])
-                           (if (null? fs)
-                               (key->list key? #'_)
-                               (cons #'_ (loop (cdr fs)))))]
-         ;; has to be down here to refer to #'contract
-         [provides (if (attribute no-provide?)
-                       #'(begin)
-                       #'(begin
-                           (provide name.match-expander flds.pred flds.accessor ...)
-                           (provide/cond-contract (rename name.*maker flds.maker contract))))])
-        #`(begin
-            ;; struct "name" defined here.
-            (define-struct (name #,parent) flds.fields #:inspector #f)
-            (define-match-expander name.match-expander
-              (lambda (s)
-                (syntax-parse s
-                  [(_ . fields)
-                   ;; skips past ignores and binds fields for struct "name"
-                   #:with pat (syntax/loc s (ign-pats ... . fields))
-                   ;; This is the match (struct struct-id (pat ...)) form.
-                   (syntax/loc s (struct name pat))])))
-            ;; set the type's keyword in the hashtable to its
-            ;; match expander, fields and fold-rhs's for further construction.
-            (begin-for-syntax
-             (hash-set! #,ht-stx
-                        'name.kw
-                        (list #'name.match-expander
-                              #'flds.fields
-                              ;; first unquote for match-expander
-                              fold-rhs.proc
-                              #f)))
-            #,(quasisyntax/loc stx
-                (with-cond-contract name ([name.*maker contract])
-                     #,(quasisyntax/loc #'name
-                         (defintern (name.*maker . flds.fields)
-                           flds.maker intern?
-                           #:extra-args
-                           frees.f1 frees.f2
-                           #:syntax [orig-stx #f]
-                           #,@(key->list key? #'key-expr)))))
-            provides))])))
-
-;; rec-ids are identifiers that are of the folded type, so we recur on them.
-;; kws is e.g. '(#:Type #:Filter #:Object #:PathElem)
-(define-for-syntax (mk-fold hashtable rec-ids kws)
-  (lambda (stx)
-    (define new-hashtable (hash-copy hashtable))
-    (define-syntax-class clause
-      (pattern
-       ;; Given name, matcher.
-       (k:keyword #:matcher matcher pats ... e:expr)
-       #:attr kw (attribute k.datum)
-       #:attr val (list #'matcher
-                        (syntax/loc this-syntax (pats ...))
-                        (lambda () #'e)
-                        this-syntax))
-      ;; Match on a type (or filter etc) case with keyword k
-      ;; pats are the unignored patterns (say for rator rand)
-      ;; and e is the expression that will run as fold-rhs.
-      (pattern
-       (k:keyword pats ... e:expr)
-       #:attr kw (syntax-e #'k)
-        ;; no given name. Use "keyword:"
-       #:attr val (list (format-id stx "~a:" (attribute kw))
-                        (syntax/loc this-syntax (pats ...))
-                        (lambda () #'e)
-                        this-syntax)))
-    #|
-    e.g. #:App (list #'App: (list #'rator #'rand)
-                     (lambda () #'(*App (type-rec-id rator)
-                                        (map type-rec-id rands)
-                                        stx))
-                     <stx>)
-    |#
-    (define (gen-clause k v)
-      (match v
-        [(list match-expander pats body-f src)
-         ;; makes [(Match-name all-patterns ...) body]
-         (define pat (quasisyntax/loc (or src stx)
-                                      (#,match-expander  . #,pats)))
-         (quasisyntax/loc (or src stx) (#,pat
-                                        ;; evaluate thunk containing rhs syntax
-                                        #,(body-f)))]))
-
-    (define (no-duplicates? lst)
-      (cond [(null? lst) #t]
-            [(member (car lst) (cdr lst)) #f]
-            [else (no-duplicates? (cdr lst))]))
-
-    ;; Accept only keywords in the given list.
-    (define-syntax-class (keyword-in kws)
-      #:attributes (datum)
-      (pattern k:keyword
-               #:fail-unless (memq (attribute k.datum) kws) (format "expected keyword in ~a" kws)
-               #:attr datum (attribute k.datum)))
-    ;; makes a keyword to expr hash table out of given keyword expr pairs.
-    (define-syntax-class (sized-list kws)
-      #:description (format "keyword expr pairs matching with keywords in the list ~a" kws)
-      (pattern ((~seq (~var k (keyword-in kws)) e:expr) ...)
-               #:when (no-duplicates? (attribute k.datum))
-               #:attr mapping (for/hash ([k* (attribute k.datum)]
-                                         [e* (attribute e)])
-                                (values k* e*))))
-    (syntax-parse stx
-      [(tc (~var recs (sized-list kws)) ty clauses:clause ...)
-       ;; map defined types' keywords to their given fold-rhs's.
-       ;; This is done with a new copy of the hash generated in mk
-       ;; so we can give special cases for only specific elements.
-       (for ([k (attribute clauses.kw)]
-             [v (attribute clauses.val)])
-         (hash-set! new-hashtable k v))
-       ;; bind given expressions for #:Type etc to local ids
-       (define rec-ids* (generate-temporaries rec-ids))
-       (with-syntax ([(let-clauses ...)
-                      (for/list ([rec-id* rec-ids*]
-                                 [k kws])
-                        ;; Each rec-id binds to their corresponding given exprs
-                        ;; rec-ids and kws correspond pointwise.
-                        #`[#,rec-id* #,(hash-ref (attribute recs.mapping) k
-                                                 #'values)])]
-                     [(parameterize-clauses ...)
-                      (for/list ([rec-id rec-ids]
-                                 [rec-id* rec-ids*])
-                        #`[#,rec-id (make-rename-transformer #'#,rec-id*)])]
-                     [(match-clauses ...)
-                      ;; create all clauses we fold on, with keyword/body
-                      (hash-map new-hashtable gen-clause)]
-                     [error-msg (quasisyntax/loc stx (error 'tc "no pattern for ~a" #,fold-target))])
-         #`(let (let-clauses ...
-                 ;; binds #'fold-target to the given element to fold down.
-                 ;; e.g. In a type-case, this is commonly "ty." Others perhaps "e".
-                 [#,fold-target ty])
-             (syntax-parameterize (parameterize-clauses ...)
-               ;; then generate the fold
-               #,(quasisyntax/loc stx
-                   (match #,fold-target
-                     match-clauses ...
-                     [_ error-msg])))))])))
-
-
-(define-syntax (make-prim-type stx)
-  (define-syntax-class type-name
-    #:attributes (name define-id key? (field-names 1) case printer hashtable rec-id kw pred? (accessors 1))
-    #:transparent
-    (pattern [name:id ;; e.g. Type
-              define-id:id ;; e.g. def-type
-              kw:keyword ;; e.g. #:Type
-              case:id ;; e.g. type-case
-              printer:id ;; e.g. print-type
-              hashtable:id ;; e.g. type-name-ht
-              rec-id:id ;; e.g. type-rec-id
-              (~optional (~and #:key ;; only given for Type.
-                               (~bind [key? #'#t]
-                                      [(field-names 1) (list #'key)]))
-                         #:defaults ([key? #'#f]
-                                     [(field-names 1) null]))]
-             #:with (_ _ pred? accessors ...)
-             (build-struct-names #'name (syntax->list #'(field-names ...)) #f #t #'name)))
-  (syntax-parse stx
-    [(_ i:type-name ...)
-     #'(begin
-         (provide i.define-id ...
-                  i.name ...
-                  i.pred? ...
-                  i.rec-id ...
-                  i.accessors ... ... ;; several accessors per type.
-                  (for-syntax i.hashtable ... ))
-         ;; make type name and populate hashtable with
-         ;; keyword to (list match-expander-stx fields fold-rhs.proc #f)
-         ;; e.g. def-type type-name-ht #t
-         (define-syntax i.define-id
-           (mk #'i.name #'i.hashtable i.key? #'i.rec-id)) ...
-         (define-for-syntax i.hashtable (make-hasheq)) ...
-         (define-struct/printer (i.name Rep) (i.field-names ...) i.printer) ...
-         (define-syntax-parameter i.rec-id
-           (λ (stx)
-              (raise-syntax-error #f
-                                  (format "used outside ~a" 'i.define-id)
-                                  stx))) ...
-         (provide i.case ...)
-         (define-syntaxes (i.case ...) ;; each fold case gets its own macro.
-           (let ([rec-ids (list #'i.rec-id ...)])
-             (apply values
-                    (map (lambda (ht) ;; each type has a hashtable. For each type...
-                           ;; make its fold function using populated hashtable.
-                           ;; [unsyntax (*1)]
-                           (mk-fold ht
-                                    rec-ids
-                                    ;; '(#:Type #:Filter #:Object #:PathElem)
-                                    '(i.kw ...)))
-                         (list i.hashtable ...))))))]))
-
-(make-prim-type [Type def-type #:Type type-case print-type type-name-ht type-rec-id #:key]
-                [Filter def-filter #:Filter filter-case print-filter filter-name-ht filter-rec-id]
-                [Object def-object #:Object object-case print-object object-name-ht object-rec-id]
-                [PathElem def-pathelem #:PathElem pathelem-case print-pathelem pathelem-name-ht pathelem-rec-id])
-
-;; NOTE: change these if the definitions above change, or everything will segfault
-(define-syntax-rule (unsafe-Rep-seq v) (unsafe-struct*-ref v 0))
-(define-syntax-rule (unsafe-Type-key v) (unsafe-struct*-ref v 4))
-(provide unsafe-Rep-seq unsafe-Type-key)
-
-(define (Rep-values rep)
-  (match rep
-    [(? (lambda (e) (or (Filter? e)
-                        (Object? e)
-                        (PathElem? e)))
-        (app (lambda (v) (vector->list (struct->vector v))) (list-rest tag seq fv fi stx vals)))
-     vals]
-    [(? Type?
-        (app (lambda (v) (vector->list (struct->vector v))) (list-rest tag seq fv fi stx key vals)))
-     vals]))
-
-;; Rep equality and inequality
-(define (rep-equal? s t)
-  (eq? (Rep-seq s) (Rep-seq t)))
-(define (rep<? s t)
-  (< (Rep-seq s) (Rep-seq t)))
-
-(provide
-  Rep-values
-  (rename-out [Rep-seq Type-seq]
-              [Rep-free-vars free-vars*]
-              [Rep-free-idxs free-idxs*]))
-
-(provide/cond-contract
-  [rename rep-equal? type-equal? (Type? Type? . -> . boolean?)]
-  [rename rep<? type<? (Type? Type? . -> . boolean?)]
-  [rename rep<? filter<? (Filter? Filter? . -> . boolean?)]
-  [struct Rep ([seq exact-nonnegative-integer?]
-               [free-vars (hash/c symbol? variance?)]
-               [free-idxs (hash/c symbol? variance?)]
-               [stx (or/c #f syntax?)])])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/type-rep.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/type-rep.rkt
deleted file mode 100644
index 82e629f441..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/type-rep.rkt
+++ /dev/null
@@ -1,1044 +0,0 @@
-#lang racket/base
-
-;; This module provides type representations and utility functions
-;; and pattern matchers on types
-
-(require "../utils/utils.rkt")
-
-;; TODO use contract-req
-(require (utils tc-utils)
-         "rep-utils.rkt" "object-rep.rkt" "filter-rep.rkt" "free-variance.rkt"
-         racket/match racket/list
-         racket/contract
-         racket/lazy-require
-         (for-syntax racket/base syntax/parse))
-
-(provide Mu-name:
-         Poly-names: Poly-fresh:
-         PolyDots-names:
-         PolyRow-names: PolyRow-fresh:
-         Type-seq
-         Mu-unsafe: Poly-unsafe:
-         PolyDots-unsafe:
-         Mu? Poly? PolyDots? PolyRow?
-         Filter? Object?
-         Type/c Type/c?
-         Values/c SomeValues/c
-         Bottom?
-         Poly-n
-         PolyDots-n
-         Class? Row? Row:
-         free-vars*
-         type-equal?
-         remove-dups
-         sub-t sub-f sub-o sub-pe
-         Name/simple: Name/struct:
-         (rename-out [Class:* Class:]
-                     [Class* make-Class]
-                     [Row* make-Row]
-                     [Mu:* Mu:]
-                     [Poly:* Poly:]
-                     [PolyDots:* PolyDots:]
-                     [PolyRow:* PolyRow:]
-                     [Mu* make-Mu]
-                     [Poly* make-Poly]
-                     [PolyDots* make-PolyDots]
-                     [PolyRow* make-PolyRow]
-                     [Mu-body* Mu-body]
-                     [Poly-body* Poly-body]
-                     [PolyDots-body* PolyDots-body]
-                     [PolyRow-body* PolyRow-body]))
-
-
-;; Ugly hack - should use units
-(lazy-require
-  ("../types/union.rkt" (Un))
-  ("../types/resolve.rkt" (resolve-app)))
-
-(define name-table (make-weak-hasheq))
-
-(define Type/c?
-   (λ (e)
-     (and (Type? e)
-          (not (Scope? e))
-          (not (arr? e))
-          (not (fld? e))
-          (not (Values? e))
-          (not (ValuesDots? e))
-          (not (AnyValues? e))
-          (not (Result? e)))))
-
-;; (or/c Type/c Values? Results?)
-;; Anything that can be treated as a Values by sufficient expansion
-(define Values/c?
-   (λ (e)
-     (and (Type? e)
-          (not (Scope? e))
-          (not (arr? e))
-          (not (fld? e))
-          (not (ValuesDots? e))
-          (not (AnyValues? e)))))
-
-(define Type/c (flat-named-contract 'Type Type/c?))
-(define Values/c (flat-named-contract 'Values Values/c?))
-(define Bottom?
-  (match-lambda
-    [(Union: (list)) #t]
-    [else #f]))
-
-;; Name = Symbol
-
-;; Type is defined in rep-utils.rkt
-
-;; t must be a Type
-(def-type Scope ([t (or/c Type/c Scope?)]) [#:key (Type-key t)])
-
-(define (scope-depth k)
-  (flat-named-contract
-   (format "Scope of depth ~a" k)
-   (lambda (sc)
-     (define (f k sc)
-       (cond [(= 0 k) (Type/c? sc)]
-             [(not (Scope? sc)) #f]
-             [else (f (sub1 k) (Scope-t sc))]))
-     (f k sc))))
-
-;; this is ONLY used when a type error ocurrs
-(def-type Error () [#:frees #f] [#:fold-rhs #:base])
-
-;; de Bruijn indexes - should never appear outside of this file
-;; bound type variables
-;; i is an nat
-(def-type B ([i natural-number/c]) [#:frees #f] [#:fold-rhs #:base])
-
-;; free type variables
-;; n is a Name
-(def-type F ([n symbol?]) [#:frees (single-free-var n) empty-free-vars]
-  [#:fold-rhs #:base])
-
-;; Name, an indirection of a type through the environment
-;;
-;; interp.
-;; A type name, potentially recursive or mutually recursive or pointing
-;; to a type for a struct type
-;; id is the name stored in the environment
-;; args are the type parameters for this type (or #f if none)
-;; struct? indicates if this maps to a struct type
-(def-type Name ([id identifier?]
-                [args (or/c #f (listof identifier?))]
-                [struct? boolean?])
-  [#:intern (hash-id id)] [#:frees #f] [#:fold-rhs #:base])
-
-;; rator is a type
-;; rands is a list of types
-;; stx is the syntax of the pair of parens
-(def-type App ([rator Type/c] [rands (listof Type/c)] [stx (or/c #f syntax?)])
-  [#:intern (cons (Rep-seq rator) (map Rep-seq rands))]
-  [#:frees (λ (f)
-              (match rator 
-                ((Name: n _ _)
-                 (instantiate-frees n (map f rands)))
-                (else (f (resolve-app rator rands stx)))))]
-
-  [#:fold-rhs (*App (type-rec-id rator)
-                    (map type-rec-id rands)
-                    stx)])
-
-;; left and right are Types
-(def-type Pair ([left Type/c] [right Type/c]) [#:key 'pair])
-
-;; dotted list -- after expansion, becomes normal Pair-based list type
-(def-type ListDots ([dty Type/c] [dbound (or/c symbol? natural-number/c)])
-  [#:frees (if (symbol? dbound)
-               (free-vars-remove (free-vars* dty) dbound)
-               (free-vars* dty))
-           (if (symbol? dbound)
-               (combine-frees (list (single-free-var dbound) (free-idxs* dty)))
-               (free-idxs* dty))]
-  [#:fold-rhs (*ListDots (type-rec-id dty) dbound)])
-
-;; *mutable* pairs - distinct from regular pairs
-;; left and right are Types
-(def-type MPair ([left Type/c] [right Type/c])
-  [#:frees (λ (f) (make-invariant (combine-frees (list (f left) (f right)))))]
-  [#:key 'mpair])
-
-;; elem is a Type
-(def-type Vector ([elem Type/c])
-  [#:frees (λ (f) (make-invariant (f elem)))]
-  [#:key 'vector])
-
-;; elems are all Types
-(def-type HeterogeneousVector ([elems (listof Type/c)])
-  [#:intern (map Rep-seq elems)]
-  [#:frees (λ (f) (make-invariant (combine-frees (map f elems))))]
-  [#:key 'vector]
-  [#:fold-rhs (*HeterogeneousVector (map type-rec-id elems))])
-
-;; elem is a Type
-(def-type Box ([elem Type/c])
-  [#:frees (λ (f) (make-invariant (f elem)))]
-  [#:key 'box])
-
-;; elem is a Type
-(def-type Channel ([elem Type/c])
-  [#:frees (λ (f) (make-invariant (f elem)))]
-  [#:key 'channel])
-
-;; elem is a Type
-(def-type Async-Channel ([elem Type/c])
-  [#:frees (λ (f) (make-invariant (f elem)))]
-  [#:key 'async-channel])
-
-;; elem is a Type
-(def-type ThreadCell ([elem Type/c])
-  [#:frees (λ (f) (make-invariant (f elem)))]
-  [#:key 'thread-cell])
-
-;; elem is a Type
-(def-type Promise ([elem Type/c])
-  [#:key 'promise])
-
-;; elem is a Type
-(def-type Ephemeron ([elem Type/c])
-  [#:key 'ephemeron])
-
-;; elem is a Type
-(def-type Weak-Box ([elem Type/c])
-  [#:key 'weak-box])
-
-;; elem is a Type
-(def-type CustodianBox ([elem Type/c])
-  [#:key 'custodian-box])
-
-;; elem is a Type
-(def-type Set ([elem Type/c])
-  [#:key 'set])
-
-;; result is a Type
-(def-type Evt ([result Type/c])
-  [#:key #f])
-
-;; name is a Symbol (not a Name)
-;; contract is used when generating contracts from types
-;; predicate is used to check (at compile-time) whether a value belongs
-;; to that base type. This is used to check for subtyping between value
-;; types and base types.
-;; numeric determines if the type is a numeric type
-(def-type Base ([name symbol?] [contract syntax?] [predicate procedure?] [numeric? boolean?])
-  [#:frees #f] [#:fold-rhs #:base] [#:intern name]
-  [#:key (if numeric?
-             'number
-             (case name
-               [(Boolean) 'boolean]
-               [(String) 'string]
-               [(Symbol) 'symbol]
-               [(Keyword) 'keyword]
-               [else #f]))])
-
-;; body is a Scope
-(def-type Mu ([body (scope-depth 1)]) #:no-provide [#:frees (λ (f) (f body))]
-  [#:fold-rhs (*Mu (*Scope (type-rec-id (Scope-t body))))]
-  [#:key (Type-key body)])
-
-;; n is how many variables are bound here
-;; body is a Scope
-(def-type Poly (n body) #:no-provide
-  [#:contract (->i ([n natural-number/c]
-                    [body (n) (scope-depth n)])
-                   (#:syntax [stx (or/c #f syntax?)])
-                   [result Poly?])]
-  [#:frees (λ (f) (f body))]
-  [#:fold-rhs (let ([body* (remove-scopes n body)])
-                (*Poly n (add-scopes n (type-rec-id body*))))]
-  [#:key (Type-key body)])
-
-;; n is how many variables are bound here
-;; there are n-1 'normal' vars and 1 ... var
-;; body is a Scope
-(def-type PolyDots (n body) #:no-provide
-  [#:contract (->i ([n natural-number/c]
-                    [body (n) (scope-depth n)])
-                   (#:syntax [stx (or/c #f syntax?)])
-                   [result PolyDots?])]
-  [#:key (Type-key body)]
-  [#:frees (λ (f) (f body))]
-  [#:fold-rhs (let ([body* (remove-scopes n body)])
-                (*PolyDots n (add-scopes n (type-rec-id body*))))])
-
-;; interp. A row polymorphic function type
-;; constraints are row absence constraints, represented
-;; as a set for each of init, field, methods
-(def-type PolyRow (constraints body) #:no-provide
-  [#:contract (->i ([constraints (list/c list? list? list? list?)]
-                    [body (scope-depth 1)])
-                   (#:syntax [stx (or/c #f syntax?)])
-                   [result PolyRow?])]
-  [#:frees (λ (f) (f body))]
-  [#:fold-rhs (let ([body* (remove-scopes 1 body)])
-                (*PolyRow constraints
-                          (add-scopes 1 (type-rec-id body*))))]
-  [#:key (Type-key body)])
-
-;; pred : identifier
-(def-type Opaque ([pred identifier?])
-  [#:intern (hash-id pred)] [#:frees #f] [#:fold-rhs #:base] [#:key pred])
-
-;; kw : keyword?
-;; ty : Type
-;; required? : Boolean
-(def-type Keyword ([kw keyword?] [ty Type/c] [required? boolean?])
-  [#:frees (λ (f) (f ty))]
-  [#:fold-rhs (*Keyword kw (type-rec-id ty) required?)])
-
-(def-type Result ([t Type/c] [f FilterSet?] [o Object?])
-  [#:frees (λ (frees) (combine-frees (map frees (list t f o))))]
-  [#:fold-rhs (*Result (type-rec-id t) (filter-rec-id f) (object-rec-id o))])
-
-(def-type Values ([rs (listof Result?)])
-  [#:intern (map Rep-seq rs)]
-  [#:frees (λ (f) (combine-frees (map f rs)))]
-  [#:fold-rhs (*Values (map type-rec-id rs))])
-
-
-(def-type AnyValues ([f Filter/c])
-  [#:fold-rhs #:base])
-
-(def-type ValuesDots ([rs (listof Result?)] [dty Type/c] [dbound (or/c symbol? natural-number/c)])
-  [#:intern (list (map Rep-seq rs) (Rep-seq dty) dbound)]
-  [#:frees (if (symbol? dbound)
-               (free-vars-remove (combine-frees (map free-vars* (cons dty rs))) dbound)
-               (combine-frees (map free-vars* (cons dty rs))))
-           (if (symbol? dbound)
-               (combine-frees (cons (single-free-var dbound) 
-                                    (map free-idxs* (cons dty rs))))
-               (combine-frees (map free-idxs* (cons dty rs))))]
-  [#:fold-rhs (*ValuesDots (map type-rec-id rs) (type-rec-id dty) dbound)])
-
-(define SomeValues/c (or/c Values? AnyValues? ValuesDots?))
-
-;; arr is NOT a Type
-(def-type arr ([dom (listof Type/c)]
-               [rng SomeValues/c]
-               [rest (or/c #f Type/c)]
-               [drest (or/c #f (cons/c Type/c (or/c natural-number/c symbol?)))]
-               [kws (listof Keyword?)])
-  [#:intern (list (map Rep-seq dom) (Rep-seq rng) (and rest (Rep-seq rest))
-                  (and drest (cons (Rep-seq (car drest)) (cdr drest)))
-                  (map Rep-seq kws))]
-  [#:frees (combine-frees
-            (append (map (compose flip-variances free-vars*)
-                         (append (if rest (list rest) null)
-                                 (map Keyword-ty kws)
-                                 dom))
-                    (match drest
-                      [(cons t (? symbol? bnd))
-                       (list (free-vars-remove (flip-variances (free-vars* t)) bnd))]
-                      [(cons t _)
-                       (list (flip-variances (free-vars* t)))]
-                      [_ null])
-                    (list (free-vars* rng))))
-           (combine-frees
-            (append (map (compose flip-variances free-idxs*)
-                         (append (if rest (list rest) null)
-                                 (map Keyword-ty kws)
-                                 dom))
-                    (match drest
-                      [(cons t (? symbol? bnd))
-                       (list (single-free-var bnd Contravariant)
-                             (flip-variances (free-idxs* t)))]
-                      [(cons t _)
-                       (list (flip-variances (free-idxs* t)))]
-                      [_ null])
-                    (list (free-idxs* rng))))]
-  [#:fold-rhs (*arr (map type-rec-id dom)
-                    (type-rec-id rng)
-                    (and rest (type-rec-id rest))
-                    (and drest (cons (type-rec-id (car drest)) (cdr drest)))
-                    (map type-rec-id kws))])
-
-;; arities : Listof[arr]
-(def-type Function ([arities (listof arr?)])
-  [#:intern (map Rep-seq arities)]
-  [#:key 'procedure]
-  [#:frees (λ (f) (combine-frees (map f arities)))]
-  [#:fold-rhs (*Function (map type-rec-id arities))])
-
-
-(def-type fld ([t Type/c] [acc identifier?] [mutable? boolean?])
-  [#:frees (λ (f) (if mutable? (make-invariant (f t)) (f t)))]
-  [#:fold-rhs (*fld (type-rec-id t) acc mutable?)]
-  [#:intern (list (Rep-seq t) (hash-id acc) mutable?)])
-
-;; name : identifier
-;; parent : Struct
-;; flds : Listof[fld]
-;; proc : Function Type
-;; poly? : is this type polymorphically variant
-;;         If not, then the predicate is enough for higher order checks
-;; pred-id : identifier for the predicate of the struct
-;; acc-ids : names of the accessors
-;; maker-id : name of the constructor
-(def-type Struct ([name identifier?]
-                  [parent (or/c #f Struct?)]
-                  [flds (listof fld?)]
-                  [proc (or/c #f Function?)]
-                  [poly? boolean?]
-                  [pred-id identifier?])
-  [#:intern (list (hash-id name)
-                  (hash-id pred-id)
-                  (and parent (Rep-seq parent))
-                  (map Rep-seq flds)
-                  (and proc (Rep-seq proc)))]
-  [#:frees (λ (f) (combine-frees (map f (append (if proc (list proc) null)
-                                                (if parent (list parent) null)
-                                                flds))))]
-  [#:fold-rhs (*Struct name
-                       (and parent (type-rec-id parent))
-                       (map type-rec-id flds)
-                       (and proc (type-rec-id proc))
-                       poly?
-                       pred-id)]
-  ;; This should eventually be based on understanding of struct properties.
-  [#:key '(struct procedure)])
-
-;; A structure type descriptor
-(def-type StructTypeTop () [#:fold-rhs #:base] [#:key 'struct-type])
-(def-type StructType ([s (or/c F? B? Struct?)]) [#:key 'struct-type])
-
-;; the supertype of all of these values
-(def-type BoxTop () [#:fold-rhs #:base] [#:key 'box])
-(def-type Weak-BoxTop () [#:fold-rhs #:base] [#:key 'weak-box])
-(def-type ChannelTop () [#:fold-rhs #:base] [#:key 'channel])
-(def-type Async-ChannelTop () [#:fold-rhs #:base] [#:key 'async-channel])
-(def-type VectorTop () [#:fold-rhs #:base] [#:key 'vector])
-(def-type HashtableTop () [#:fold-rhs #:base] [#:key 'hash])
-(def-type MPairTop () [#:fold-rhs #:base] [#:key 'mpair])
-(def-type StructTop ([name Struct?]) [#:key 'struct])
-(def-type ThreadCellTop () [#:fold-rhs #:base] [#:key 'thread-cell])
-(def-type Prompt-TagTop () [#:fold-rhs #:base] [#:key 'prompt-tag])
-(def-type Continuation-Mark-KeyTop ()
-  [#:fold-rhs #:base] [#:key 'continuation-mark-key])
-
-;; v : Racket Value
-(def-type Value (v) [#:frees #f] [#:fold-rhs #:base]
-  [#:key (cond [(or (eq? v 0) (eq? v 1)) 'number]
-               ;; other numbers don't work with the optimizations in subtype.rkt
-               ;; which assume that unions of numbers are subtyped in simple ways
-               [(boolean? v) 'boolean]
-               [(null? v) 'null]
-               [else #f])])
-
-;; elems : Listof[Type]
-(def-type Union ([elems (and/c (listof Type/c)
-                               (lambda (es)
-                                 (or (null? es)
-                                     (let-values ([(sorted? k)
-                                                   (for/fold ([sorted? #t]
-                                                              [last (car es)])
-                                                       ([e (cdr es)])
-                                                     (values
-                                                      (and sorted? (type<? last e))
-                                                      e))])
-                                       sorted?))))])
-  [#:intern (map Rep-seq elems)]
-  [#:frees (λ (f) (combine-frees (map f elems)))]
-  [#:fold-rhs (apply Un (map type-rec-id elems))]
-  [#:key 
-   (let ()
-     (define d
-       (let loop ([ts elems] [res null])
-         (cond [(null? ts) res]
-               [else
-                (define k (Type-key (car ts)))
-                (cond [(not k) (list #f)]
-                      [(pair? k) (loop (cdr ts) (append k res))]
-                      [else (loop (cdr ts) (cons k res))])])))
-     (define d* (remove-duplicates d))
-     (if (and (pair? d*) (null? (cdr d*))) (car d*) d*))])
-
-(def-type Univ () [#:frees #f] [#:fold-rhs #:base])
-
-;; in : Type
-;; out : Type
-(def-type Param ([in Type/c] [out Type/c])
-  [#:key 'procedure]
-  [#:frees (λ (f) (combine-frees (list (f out) (flip-variances (f in)))))])
-
-;; key : Type
-;; value : Type
-(def-type Hashtable ([key Type/c] [value Type/c]) [#:key 'hash]
-  [#:frees (λ (f) (combine-frees (list (make-invariant (f key)) (make-invariant (f value)))))])
-
-(def-type Refinement ([parent Type/c] [pred identifier?])
-  [#:key (Type-key parent)]
-  [#:intern (list (Rep-seq parent) (hash-id pred))]
-  [#:fold-rhs (*Refinement (type-rec-id parent) pred)]
-  [#:frees (λ (f) (f parent))])
-
-
-;; Syntax
-;; t : Type
-;; t is the type of the result of syntax-e, not the result of syntax->datum
-(def-type Syntax ([t Type/c]) [#:key 'syntax])
-
-;; A Row used in type instantiation
-;; For now, this should not appear in user code. It's used
-;; internally to perform row instantiations and to represent
-;; class types.
-;;
-;; invariant: all clauses are sorted by the key name
-(def-type Row ([inits (listof (list/c symbol? Type/c boolean?))]
-               [fields (listof (list/c symbol? Type/c))]
-               [methods (listof (list/c symbol? Function?))]
-               [augments (listof (list/c symbol? Function?))]
-               [init-rest (or/c Type/c #f)])
-  #:no-provide
-  [#:frees (λ (f) (combine-frees
-                   (map f (append (map cadr inits)
-                                  (map cadr fields)
-                                  (map cadr methods)
-                                  (map cadr augments)
-                                  (if init-rest (list init-rest) null)))))]
-  [#:fold-rhs (match (list inits fields methods augments init-rest)
-                [(list
-                  (list (list init-names init-tys reqd) ___)
-                  (list (list fname fty) ___)
-                  (list (list mname mty) ___)
-                  (list (list aname aty) ___)
-                  init-rest)
-                 (*Row
-                  (map list
-                       init-names
-                       (map type-rec-id init-tys)
-                       reqd)
-                  (map list fname (map type-rec-id fty))
-                  (map list mname (map type-rec-id mty))
-                  (map list aname (map type-rec-id aty))
-                  (if init-rest (type-rec-id init-rest) #f))])])
-
-;; Supertype of all Class types, cannot instantiate
-;; or subclass these
-(def-type ClassTop () [#:fold-rhs #:base] [#:key 'class])
-
-;; row-ext : Option<(U F B Row)>
-;; row     : Row
-;;
-;; interp. The first field represents a row extension
-;;         The second field represents the concrete row
-;;         that the class starts with
-;;
-(def-type Class ([row-ext (or/c #f F? B? Row?)]
-                 [row Row?])
-  #:no-provide
-  [#:frees (λ (f) (combine-frees
-                   ;; FIXME: is this correct?
-                   `(,@(or (and (F? row-ext) (list (f row-ext)))
-                           '())
-                     ,(f row))))]
-  [#:key 'class]
-  [#:fold-rhs (match (list row-ext row)
-                [(list row-ext row)
-                 (*Class
-                  (and row-ext (type-rec-id row-ext))
-                  (type-rec-id row))])])
-
-;; cls : Class
-(def-type Instance ([cls Type/c]) [#:key 'instance])
-
-;; sequences
-;; includes lists, vectors, etc
-;; tys : sequence produces this set of values at each step
-(def-type Sequence ([tys (listof Type/c)])
-  [#:intern (map Rep-seq tys)]
-  [#:frees (λ (f) (combine-frees (map f tys)))]
-  [#:key #f] [#:fold-rhs (*Sequence (map type-rec-id tys))])
-
-(def-type Future ([t Type/c]) [#:key 'future])
-
-;; body: the type of the body
-;; handler: the type of the prompt handler
-;;   prompts with this tag will return a union of `body` 
-;;   and the codomains of `handler`
-(def-type Prompt-Tagof ([body Type/c] [handler Type/c])
-  [#:frees (λ (f) (combine-frees (list (make-invariant (f body))
-                                       (make-invariant (f handler)))))]
-  [#:key 'prompt-tag])
-
-;; value: the type of allowable values
-(def-type Continuation-Mark-Keyof ([value Type/c])
-  [#:frees (λ (f) (make-invariant (f value)))]
-  [#:key 'continuation-mark-key])
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; remove-dups: List[Type] -> List[Type]
-;; removes duplicate types from a SORTED list
-(define/cond-contract (remove-dups types)
-  ((listof Rep?) . -> . (listof Rep?))
-  (cond [(null? types) types]
-        [(null? (cdr types)) types]
-        [(type-equal? (car types) (cadr types)) (remove-dups (cdr types))]
-        [else (cons (car types) (remove-dups (cdr types)))]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define (add-scopes n t)
-  (if (zero? n) t
-      (add-scopes (sub1 n) (*Scope t))))
-
-(define (remove-scopes n sc)
-  (if (zero? n)
-      sc
-      (match sc
-        [(Scope: sc*) (remove-scopes (sub1 n) sc*)]
-        [_ (int-err "Tried to remove too many scopes: ~a" sc)])))
-
-
-(define ((sub-f st) e)
-  (filter-case (#:Type st
-                #:Filter (sub-f st)
-                #:PathElem (sub-pe st))
-               e))
-
-
-(define ((sub-o st) e)
-  (object-case (#:Type st
-                #:Object (sub-o st)
-                #:PathElem (sub-pe st))
-               e))
-
-(define ((sub-pe st) e)
-  (pathelem-case (#:Type st
-                         #:PathElem (sub-pe st))
-                 e))
-
-(define ((sub-t st) e)
-  (type-case (#:Type st
-              #:Filter (sub-f st))
-              e))
-
-
-;; abstract-many : Names Type -> Scope^n
-;; where n is the length of names
-(define (abstract-many names ty)
-  ;; mapping : dict[Type -> Natural]
-  (define (nameTo mapping type)
-    (let loop ([outer 0] [ty type])
-      (define (sb t) (loop outer t))
-      ;; transform : Name (Integer -> a) a -> a
-      ;; apply `mapping` to `name*`, returning `default` if it's not there
-      ;; use `f` to wrap the result
-      ;; note that this takes into account the value of `outer`
-      (define (transform name* f default)
-        (cond [(assq name* mapping)
-               => (λ (pr)
-                    (f (+ (cdr pr) outer)))]
-              [else default]))
-      (type-case
-        (#:Type sb #:Filter (sub-f sb) #:Object (sub-o sb))
-       ty
-       [#:F name* (transform name* *B ty)]
-       ;; necessary to avoid infinite loops
-       [#:Union elems (*Union (remove-dups (sort (map sb elems) type<?)))]
-       ;; functions
-       [#:arr dom rng rest drest kws
-              (*arr (map sb dom)
-                    (sb rng)
-                    (if rest (sb rest) #f)
-                    (if drest
-                        (cons (sb (car drest))
-                              (let ([c (cdr drest)])
-                                 (transform c values c)))
-                        #f)
-                    (map sb kws))]
-       [#:ValuesDots rs dty dbound
-              (*ValuesDots (map sb rs)
-                           (sb dty)
-                           (transform dbound values dbound))]
-       [#:ListDots dty dbound
-                   (*ListDots (sb dty)
-                              (transform dbound values dbound))]
-       [#:Mu (Scope: body) (*Mu (*Scope (loop (add1 outer) body)))]
-       [#:PolyRow constraints body*
-                  (let ([body (remove-scopes 1 body*)])
-                    (*PolyRow constraints
-                              (add-scopes 1 (loop (+ 1 outer) body))))]
-       [#:PolyDots n body*
-                   (let ([body (remove-scopes n body*)])
-                     (*PolyDots n (add-scopes n (loop (+ n outer) body))))]
-       [#:Poly n body*
-               (let ([body (remove-scopes n body*)])
-                 (*Poly n (add-scopes n (loop (+ n outer) body))))])))
-  (define n (length names))
-  (define mapping (for/list ([nm (in-list names)]
-                             [i (in-range n 0 -1)])
-                    (cons nm (sub1 i))))
-  (add-scopes n (nameTo mapping ty)))
-
-;; instantiate-many : List[Type] Scope^n -> Type
-;; where n is the length of types
-;; all of the types MUST be Fs
-(define (instantiate-many images sc)
-  ;; mapping : dict[Natural -> Type]
-  (define (replace mapping type)
-    (let loop ([outer 0] [ty type])
-      ;; transform : Integer (Name -> a) a -> a
-      ;; apply `mapping` to `idx`, returning `default` if it's not there
-      ;; use `f` to wrap the result
-      ;; note that this takes into account the value of `outer`
-      (define (transform idx f default)
-        (cond [(assf (lambda (v) (eqv? (+ v outer) idx)) mapping)
-               => (lambda (pr) (f (cdr pr)))]
-              [else default]))
-      (define (sb t) (loop outer t))
-      (define sf (sub-f sb))
-      (type-case
-       (#:Type sb #:Filter sf #:Object (sub-o sb))
-       ty
-       [#:B idx (transform idx values ty)]
-       ;; necessary to avoid infinite loops
-       [#:Union elems (*Union (remove-dups (sort (map sb elems) type<?)))]
-       ;; functions
-       [#:arr dom rng rest drest kws
-              (*arr (map sb dom)
-                    (sb rng)
-                    (if rest (sb rest) #f)
-                    (if drest
-                        (cons (sb (car drest))
-                              (transform (cdr drest) F-n (cdr drest)))
-                        #f)
-                    (map sb kws))]
-       [#:ValuesDots rs dty dbound
-                     (*ValuesDots (map sb rs)
-                                  (sb dty)
-                                  (transform dbound F-n dbound))]
-       [#:ListDots dty dbound
-                   (*ListDots (sb dty)
-                              (transform dbound F-n dbound))]
-       [#:Mu (Scope: body) (*Mu (*Scope (loop (add1 outer) body)))]
-       [#:PolyRow constraints body*
-                  (let ([body (remove-scopes 1 body*)])
-                    (*PolyRow constraints (add-scopes 1 (loop (+ 1 outer) body))))]
-       [#:PolyDots n body*
-                   (let ([body (remove-scopes n body*)])
-                     (*PolyDots n (add-scopes n (loop (+ n outer) body))))]
-       [#:Poly n body*
-               (let ([body (remove-scopes n body*)])
-                 (*Poly n (add-scopes n (loop (+ n outer) body))))])))
-  (define n (length images))
-  (define mapping (for/list ([img (in-list images)]
-                             [i (in-range n 0 -1)])
-                    (cons (sub1 i) img)))
-  (replace mapping (remove-scopes n sc)))
-
-(define (abstract name ty)
-  (abstract-many (list name) ty))
-
-(define (instantiate type sc)
-  (instantiate-many (list type) sc))
-
-;; the 'smart' constructor
-(define (Mu* name body)
-  (let ([v (*Mu (abstract name body))])
-    (hash-set! name-table v name)
-    v))
-
-;; the 'smart' destructor
-(define (Mu-body* name t)
-  (match t
-    [(Mu: scope)
-     (instantiate (*F name) scope)]))
-
-;; the 'smart' constructor
-;;
-;; Corresponds to closing a type in locally nameless representation
-;; (turns free `names` into bound De Bruijn vars)
-;; Also keeps track of the original name in a table to recover names
-;; for debugging or to correlate with surface syntax
-;;
-;; Provide #:original-names if the names that you are closing off
-;; are *different* from the names you want recorded in the table.
-;;
-;; list<symbol> type #:original-names list<symbol> -> type
-;;
-(define (Poly* names body #:original-names [orig names])
-  (if (null? names) body
-      (let ([v (*Poly (length names) (abstract-many names body))])
-        (hash-set! name-table v orig)
-        v)))
-
-;; the 'smart' destructor
-(define (Poly-body* names t)
-  (match t
-    [(Poly: n scope)
-     (unless (= (length names) n)
-       (int-err "Wrong number of names: expected ~a got ~a" n (length names)))
-     (instantiate-many (map *F names) scope)]))
-
-;; the 'smart' constructor
-(define (PolyDots* names body)
-  (if (null? names) body
-      (let ([v (*PolyDots (length names) (abstract-many names body))])
-        (hash-set! name-table v names)
-        v)))
-
-;; the 'smart' destructor
-(define (PolyDots-body* names t)
-  (match t
-    [(PolyDots: n scope)
-     (unless (= (length names) n)
-       (int-err "Wrong number of names: expected ~a got ~a" n (length names)))
-     (instantiate-many (map *F names) scope)]))
-
-;; Constructor and destructor for row polymorphism
-;;
-;; Note that while `names` lets you specify multiple names, it's
-;; expected that row polymorphic types only bind a single name at
-;; a time. This may change in the future.
-;;
-(define (PolyRow* names constraints body #:original-names [orig names])
-  (let ([v (*PolyRow constraints (abstract-many names body))])
-    (hash-set! name-table v orig)
-    v))
-
-(define (PolyRow-body* names t)
-  (match t
-    [(PolyRow: constraints scope)
-     (instantiate-many (map *F names) scope)]))
-
-(print-struct #t)
-
-(define-match-expander Mu-unsafe:
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ bp) #'(? Mu? (app (lambda (t) (Scope-t (Mu-body t))) bp))])))
-
-(define-match-expander Poly-unsafe:
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ n bp) #'(? Poly? (app (lambda (t) (list (Poly-n t) (Poly-body t))) (list n bp)))])))
-
-(define-match-expander PolyDots-unsafe:
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ n bp) #'(? PolyDots? (app (lambda (t) (list (PolyDots-n t) (PolyDots-body t))) (list n bp)))])))
-
-(define-match-expander Mu:*
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ np bp)
-       #'(? Mu?
-            (app (lambda (t) (let ([sym (gensym)])
-                               (list sym (Mu-body* sym t))))
-                 (list np bp)))])))
-
-(define-match-expander Mu-name:
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ np bp)
-       #'(? Mu?
-            (app (lambda (t) (let ([sym (hash-ref name-table t (lambda _ (gensym)))])
-                               (list sym (Mu-body* sym t))))
-                 (list np bp)))])))
-
-;; These match expanders correspond to opening up a type in
-;; locally nameless representation. When the type is opened,
-;; the nameless bound variables are replaced with free
-;; variables with names.
-;;
-;; This match expander wraps the smart constructor
-;; names are generated with gensym
-(define-match-expander Poly:*
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ nps bp)
-       #'(? Poly?
-            (app (lambda (t)
-                   (let* ([n (Poly-n t)]
-                          [syms (build-list n (lambda _ (gensym)))])
-                     (list syms (Poly-body* syms t))))
-                 (list nps bp)))])))
-
-;; This match expander uses the names from the hashtable
-(define-match-expander Poly-names:
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ nps bp)
-       #'(? Poly?
-            (app (lambda (t)
-                   (let* ([n (Poly-n t)]
-                          [syms (hash-ref name-table t (lambda _ (build-list n (lambda _ (gensym)))))])
-                     (list syms (Poly-body* syms t))))
-                 (list nps bp)))])))
-
-;; Helper for fresh match expanders below, creates a
-;; fresh name that prints the same as the original
-(define (fresh-name sym)
-  (string->uninterned-symbol (symbol->string sym)))
-
-;; This match expander creates new fresh names for exploring the body
-;; of the polymorphic type. When lexical scoping of type variables is a concern, you
-;; should use this form.
-(define-match-expander Poly-fresh:
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ nps freshp bp)
-       #'(? Poly?
-            (app (lambda (t)
-                   (let* ([n (Poly-n t)]
-                          [syms (hash-ref name-table t (lambda _ (build-list n (lambda _ (gensym)))))]
-                          [fresh-syms (map fresh-name syms)])
-                     (list syms fresh-syms (Poly-body* fresh-syms t))))
-                 (list nps freshp bp)))])))
-
-;; This match expander wraps the smart constructor
-;; names are generated with gensym
-(define-match-expander PolyDots:*
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ nps bp)
-       #'(? PolyDots?
-            (app (lambda (t)
-                   (let* ([n (PolyDots-n t)]
-                          [syms (build-list n (lambda _ (gensym)))])
-                     (list syms (PolyDots-body* syms t))))
-                 (list nps bp)))])))
-
-;; This match expander uses the names from the hashtable
-(define-match-expander PolyDots-names:
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ nps bp)
-       #'(? PolyDots?
-            (app (lambda (t)
-                   (let* ([n (PolyDots-n t)]
-                          [syms (hash-ref name-table t (lambda _ (build-list n (lambda _ (gensym)))))])
-                     (list syms (PolyDots-body* syms t))))
-                 (list nps bp)))])))
-
-(define-match-expander PolyRow:*
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ nps constrp bp)
-       #'(? PolyRow?
-            (app (lambda (t)
-                   (define sym (gensym))
-                   (list (list sym)
-                         (PolyRow-constraints t)
-                         (PolyRow-body* (list sym) t)))
-                 (list nps constrp bp)))])))
-
-(define-match-expander PolyRow-names:
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ nps constrp bp)
-       #'(? PolyRow?
-            (app (lambda (t)
-                   (define syms (hash-ref name-table t (λ _ (list (gensym)))))
-                   (list syms
-                         (PolyRow-constraints t)
-                         (PolyRow-body* syms t)))
-                 (list nps constrp bp)))])))
-
-(define-match-expander PolyRow-fresh:
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ nps freshp constrp bp)
-       #'(? PolyRow?
-            (app (lambda (t)
-                   (define syms (hash-ref name-table t (λ _ (list (gensym)))))
-                   (define fresh-syms (list (gensym (car syms))))
-                   (list syms fresh-syms
-                         (PolyRow-constraints t)
-                         (PolyRow-body* fresh-syms t)))
-                 (list nps freshp constrp bp)))])))
-
-;; Row*
-;; This is a custom constructor for Row types
-;; Sorts all clauses by the key (the clause name)
-(define (Row* inits fields methods augments init-rest)
-  (*Row inits
-        (sort-row-clauses fields)
-        (sort-row-clauses methods)
-        (sort-row-clauses augments)
-        init-rest))
-
-;; Class*
-;; This is a custom constructor for Class types that
-;; doesn't require writing make-Row everywhere
-(define/cond-contract (Class* row-var inits fields methods augments init-rest)
-  (-> (or/c F? B? Row? #f)
-      (listof (list/c symbol? Type/c boolean?))
-      (listof (list/c symbol? Type/c))
-      (listof (list/c symbol? Function?))
-      (listof (list/c symbol? Function?))
-      (or/c Type/c #f)
-      Class?)
-  (*Class row-var (Row* inits fields methods augments init-rest)))
-
-;; Class:*
-;; This match expander replaces the built-in matching with
-;; a version that will merge the members inside the substituted row
-;; with the existing fields.
-
-;; helper function for the expansion of Class:*
-;; just does the merging
-(define (merge-class/row class-type)
-  (define row (Class-row-ext class-type))
-  (define class-row (Class-row class-type))
-  (define inits (Row-inits class-row))
-  (define fields (Row-fields class-row))
-  (define methods (Row-methods class-row))
-  (define augments (Row-augments class-row))
-  (define init-rest (Row-init-rest class-row))
-  (cond [(and row (Row? row))
-         (define row-inits (Row-inits row))
-         (define row-fields (Row-fields row))
-         (define row-methods (Row-methods row))
-         (define row-augments (Row-augments row))
-         (define row-init-rest (Row-init-rest row))
-         (list row
-               ;; Init types from a mixin go at the start, since
-               ;; mixins only add inits at the start
-               (append row-inits inits)
-               ;; FIXME: instead of sorting here every time
-               ;;        the match expander is called, the row
-               ;;        fields should be merged on substitution
-               (sort-row-clauses (append fields row-fields))
-               (sort-row-clauses (append methods row-methods))
-               (sort-row-clauses (append augments row-augments))
-               ;; The class type's existing init-rest types takes
-               ;; precedence since it's the one that was already assumed
-               ;; (say, in a mixin type's domain). The mismatch will
-               ;; be caught by application type-checking later.
-               (if init-rest init-rest row-init-rest))]
-        [else (list row inits fields methods augments init-rest)]))
-
-;; sorts the given field of a Row by the member name
-(define (sort-row-clauses clauses)
-  (sort clauses symbol<? #:key car))
-
-(define-match-expander Class:*
-  (λ (stx)
-    (syntax-case stx ()
-      [(_ row-pat inits-pat fields-pat methods-pat augments-pat init-rest-pat)
-       #'(? Class?
-            (app merge-class/row
-                 (list row-pat inits-pat fields-pat
-                       methods-pat augments-pat init-rest-pat)))])))
-
-;; alternative to Name: that only matches the name part
-(define-match-expander Name/simple:
-  (λ (stx)
-    (syntax-parse stx
-      [(_ name-pat) #'(Name: name-pat _ _)])))
-
-;; alternative to Name: that only matches struct names
-(define-match-expander Name/struct:
-  (λ (stx)
-    (syntax-parse stx
-      [(_) #'(Name: _ _ #t)]
-      [(_ name-pat) #'(Name: name-pat _ #t)])))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/standard-inits.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/standard-inits.rkt
deleted file mode 100644
index ebe23afadf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/standard-inits.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-
-(require
- racket/base racket/lazy-require "env/env-req.rkt"
- "utils/timing.rkt" ;; only for timing/debugging
- )
-
-(provide do-standard-inits)
-
-(lazy-require
-  [typed-racket/base-env/base-env ((init init-base-env))]
-  [typed-racket/base-env/base-env-numeric ((init init-base-env-numeric))]
-  [typed-racket/base-env/base-structs (initialize-structs)]
-  [typed-racket/base-env/base-env-indexing (initialize-indexing)]
-  [typed-racket/base-env/base-special-env (initialize-special)]
-  [(submod typed-racket/base-env/base-types initialize) (initialize-type-names)])
-
-(define initialized #f)
-(define (do-standard-inits)
-  (unless initialized
-    (do-time "Starting initialization")
-    (initialize-structs)
-    (do-time "Finshed base-structs")
-    (initialize-indexing)
-    (do-time "Finshed base-env-indexing")
-    (init-base-env)
-    (do-time "Finshed base-env")
-    (init-base-env-numeric)
-    (do-time "Finshed base-env-numeric")
-    (initialize-special)
-    (do-time "Finished base-special-env")
-    (initialize-type-names)
-    (do-time "Finished base-types")
-    (set! initialized #t))
-  (do-requires))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/README b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/README
deleted file mode 100644
index bf8d8d7dfe..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/README
+++ /dev/null
@@ -1,45 +0,0 @@
-Static Contracts:
------------------
-
-Purpose:
-Static contracts are a data structure that correspond to a regular contract.
-The two differences are that a static contract corresponds to a contract at a lower phase,
-and that they are designed to support introspection and manipulation.
-
-Operations:
-
-various constructors : * -> static-contract?
-Construct a static contract corresponding to a regular contract.
-
-optimize : static-contract? [#:trusted-positive boolean? #:trusted-negative boolean?] -> static-contract?
-Changes a static contract into another one that is cheaper to check. It also removes contracts
-protecting a trusted side.
-
-instantiate : static-contract? (-> A) [kind/c] -> (or/c syntax? A)
-Turns a static contract into syntax that when evaluated is the corresponding contract.
-The failure continuation is invoked if the translation fails to produce a contract of the right kind.
-
-Internal Implementation Details:
-
-A static contract is one of three things:
-
-recursive-sc:
-  This introduces bindings for recursive contracts.
-recursive-sc-use:
-  This is a reference to a previously introduced recursive contract.
-other:
-  This is a combinator or terminal contract.
-
-These support a couple of different operations:
-
-sc-map: Calls a function on each sub static contract, and builds up a new static contract
-sc-traverse: Calls a function on each sub static contract
-sc-terminal-kind: Tells whether a static contract has no subparts and has a known contract kind
-
-These are not applicable to recursive contract; instantaite uses them in its implementation, and
-directly deals with the recursive casses.
-
-sc->contract: Turns a static contract into syntax
-sc->constraints: Turns a static contract into constraints about the contract kind
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators.rkt
deleted file mode 100644
index 68e33e4390..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-
-;; Reprovides everything from all the files in the combinators directory.
-
-(require (for-syntax racket/base racket/runtime-path))
-
-(begin-for-syntax
-  (define-runtime-path combinator-dir "combinators")
-  (define base-file-names
-    (filter (lambda (v) (regexp-match? #rx".rkt$" v)) (directory-list combinator-dir)))
-  (define file-names (map (lambda (v) (string-append "combinators/" (path->string v)))
-                          base-file-names)))
-
-(define-syntax (gen-provides stx)
-  #`(begin
-      (require #,@file-names)
-      (provide (all-from-out #,@file-names))))
-
-(gen-provides)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/any.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/any.rkt
deleted file mode 100644
index f39d68d035..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/any.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-
-;; Static contract for any/c.
-;; Allows optimizations as many combinators can be simplified if their arguments are any/sc
-;; Ex: (listof/sc any/sc) => list?/sc
-
-(require "../structures.rkt" "../constraints.rkt"
-         racket/match
-         racket/contract
-         (for-template racket/base racket/contract/base)
-         (for-syntax racket/base syntax/parse))
-
-(provide
-  (contract-out
-    [any/sc static-contract?])
-  any/sc:)
-
-
-;;Printing
-(define (any-write-proc v port mode)
-  (if (equal? mode 0)
-      (display "any/sc" port)
-      (display "#<any/sc>" port)))
-
-(struct any-combinator combinator ()
-        #:transparent
-        #:methods gen:sc
-          [(define (sc-map v f) v)
-           (define (sc-traverse v f) (void))
-           (define (sc->contract v f) #'any/c)
-           (define (sc->constraints v f) (simple-contract-restrict 'flat))]
-        #:methods gen:custom-write [(define write-proc any-write-proc)])
-
-(define-match-expander any/sc:
-  (syntax-parser
-    [(_) #'(? any-combinator?)]))
-
-(define any/sc (any-combinator null))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/case-lambda.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/case-lambda.rkt
deleted file mode 100644
index 3c262ea1de..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/case-lambda.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang racket/base
-
-;; Static contract for case->.
-;; Like case-> doesn't support keyword arguments.
-
-(require "../structures.rkt" "../constraints.rkt"
-         racket/list racket/match
-         unstable/contract
-         racket/contract
-         (for-template racket/base racket/contract/base)
-         (for-syntax racket/base syntax/parse))
-
-(provide
-  (contract-out
-    [case->/sc ((listof arr-combinator?) . -> . static-contract?)]
-    [arr/sc (-> (listof static-contract?)
-                (maybe/c static-contract?)
-                (maybe/c (listof static-contract?))
-                static-contract?)])
-  case->/sc:
-  arr/sc:
-  (rename-out [arr-combinator? arr/sc?]))
-
-
-(define (case->/sc arrs)
-  (case-combinator arrs))
-
-(define (arr/sc args rest range)
-  (arr-combinator (arr-seq args rest range)))
-
-(struct case-combinator combinator ()
-  #:transparent
-  #:property prop:combinator-name "case->/sc"
-  #:methods gen:sc
-    [(define (sc-map v f)
-       (case-combinator (map (λ (a) (f a 'covariant)) (combinator-args v))))
-     (define (sc-traverse v f)
-       (for-each (λ (a) (f a 'covariant)) (combinator-args v))
-       (void))
-     (define (sc->contract v f)
-       #`(case-> #,@(map f (combinator-args v))))
-     (define (sc->constraints v f)
-       (merge-restricts* 'chaperone (map f (combinator-args v))))])
-(struct arr-combinator combinator ()
-  #:transparent
-  #:property prop:combinator-name "arr/sc"
-  #:methods gen:sc
-    [(define (sc-map v f)
-       (arr-combinator (arr-seq-sc-map f (combinator-args v))))
-     (define (sc-traverse v f)
-       (arr-seq-sc-map f (combinator-args v))
-       (void))
-     (define (sc->contract v f)
-       (match v
-        [(arr-combinator (arr-seq args rest range))
-         (with-syntax ([(arg-stx ...) (map f args)]
-                       [(rest-stx ...) (if rest #`(#:rest #,(f rest)) #'())]
-                       [range-stx (if range #`(values #,@(map f range)) #'any)])
-           #'(arg-stx ... rest-stx ... . -> . range-stx))]))
-     (define (sc->constraints v f)
-       (merge-restricts* 'chaperone (map f (arr-seq->list (combinator-args v)))))])
-
-(define-match-expander case->/sc:
-  (syntax-parser
-    [(_ args ...)
-     #'(case-combinator (list args ...))]))
-
-(define-match-expander arr/sc:
-  (syntax-parser
-    [(_ args rest range)
-     #'(arr-combinator (arr-seq args rest range))]))
-
-
-(define (arr-seq-sc-map f seq)
-  (match seq
-    [(arr-seq args rest range)
-     (arr-seq
-       (map (λ (a) (f a 'contravariant)) args)
-       (and rest (f rest 'contravariant))
-       (and range (map (λ (a) (f a 'covariant)) range)))]))
-
-(define (arr-seq->list seq)
-  (match seq
-    [(arr-seq args rest range)
-     (append
-       args
-       (if rest (list rest) empty)
-       (or range empty))]))
-
-
-(struct arr-seq (args rest range)
-   #:transparent
-   #:property prop:sequence
-     (match-lambda
-       [(arr-seq args rest range)
-        (append
-          args
-          (if rest (list rest) empty)
-          (if range range empty))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/control.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/control.rkt
deleted file mode 100644
index 670cbaf8ee..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/control.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/base
-
-;; Static contracts for control contracts.
-;; Currently only supports prompt tags.
-
-(require "../structures.rkt" "../constraints.rkt"
-         racket/list racket/match
-         unstable/contract
-         racket/contract
-         (for-template racket/base racket/contract/base)
-         (for-syntax racket/base syntax/parse))
-
-(provide
-  (contract-out
-    [prompt-tag/sc ((listof static-contract?) (maybe/c (listof static-contract?)) . -> . static-contract?)])
-  prompt-tag/sc:)
-
-(struct prompt-tag-combinator combinator ()
-  #:transparent
-  #:property prop:combinator-name "prompt-tag/sc"
-  #:methods gen:sc
-    [(define (sc-map v f)
-       (prompt-tag-combinator (pt-seq-map f (combinator-args v))))
-     (define (sc-traverse v f)
-       (pt-seq-map f (combinator-args v))
-       (void))
-     (define (sc->contract v f)
-       (match v
-        [(prompt-tag-combinator (pt-seq vals call-cc))
-         (with-syntax ([(vals-stx ...) (map f vals)]
-                       [(call-cc-stx ...)
-                        (if call-cc
-                            #`(#:call/cc (values #,@(map f call-cc)))
-                            empty)])
-           #'(prompt-tag/c vals-stx ... call-cc-stx ...))]))
-     (define (sc->constraints v f)
-       (merge-restricts* 'chaperone (map f (pt-seq->list (combinator-args v)))))])
-
-(struct pt-seq (vals call-cc))
-
-(define (prompt-tag/sc vals call-cc)
-  (prompt-tag-combinator (pt-seq vals call-cc)))
-
-(define-match-expander prompt-tag/sc:
-  (syntax-parser
-    [(_ vals call-cc)
-     #'(prompt-tag-combinator (pt-seq vals call-cc))]))
-
-
-
-(define (pt-seq-map f seq)
-  (match seq
-   [(pt-seq vals call-cc)
-    (define (f* a) (f a 'invariant))
-    (pt-seq
-      (map f* vals)
-      (and call-cc (map f* call-cc)))]))
-
-(define (pt-seq->list seq)
-  (match seq
-   [(pt-seq vals call-cc)
-    (append
-      vals
-      (or call-cc empty))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/derived.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/derived.rkt
deleted file mode 100644
index 6f1549ab9a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/derived.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket/base
-
-;; Static contracts for common data types.
-;; These are used during optimizations as simplifications.
-;; Ex: (listof/sc any/sc) => list?/sc
-
-(require "simple.rkt" "structural.rkt"
-         (for-template racket/base racket/list racket/set racket/promise
-                       racket/class racket/async-channel))
-(provide (all-defined-out))
-
-(define identifier?/sc (flat/sc #'identifier?))
-(define box?/sc (flat/sc #'box?))
-(define syntax?/sc (flat/sc #'syntax?))
-(define promise?/sc (flat/sc #'promise?))
-
-(define cons?/sc (flat/sc #'cons?))
-(define list?/sc (flat/sc #'list?))
-
-(define mpair?/sc (flat/sc #'mpair?))
-
-(define set?/sc (flat/sc #'set?))
-(define empty-set/sc (and/sc set?/sc (flat/sc #'set-empty?)))
-
-(define vector?/sc (flat/sc #'vector?))
-
-(define hash?/sc (flat/sc #'hash?))
-(define empty-hash/sc (and/sc hash?/sc (flat/sc #'(λ (h) (zero? (hash-count h))))))
-
-(define channel?/sc (flat/sc #'channel?))
-(define async-channel?/sc (flat/sc #'async-channel?))
-(define thread-cell?/sc (flat/sc #'thread-cell?))
-(define prompt-tag?/sc (flat/sc #'continuation-prompt-tag?))
-(define continuation-mark-key?/sc (flat/sc #'continuation-mark-key?))
-
-(define class?/sc (flat/sc #'class?))
-
-(define struct-type?/sc (flat/sc #'struct-type?))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/function.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/function.rkt
deleted file mode 100644
index 37c1dfae21..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/function.rkt
+++ /dev/null
@@ -1,149 +0,0 @@
-#lang racket/base
-
-;; Static contract for ->.
-;; Supports the whole range of possible options that -> does.
-
-(require "../structures.rkt" "../constraints.rkt"
-         racket/list racket/match
-         racket/contract
-         (for-template racket/base racket/contract/base)
-         (for-syntax racket/base syntax/parse))
-
-(provide
-  (contract-out
-    [function/sc (-> (listof static-contract?)
-                     (listof static-contract?)
-                     (listof (list/c keyword? static-contract?))
-                     (listof (list/c keyword? static-contract?))
-                     (or/c #f static-contract?)
-                     (or/c #f (listof static-contract?))
-                     static-contract?)])
-  ->/sc:)
-
-
-(struct function-combinator combinator (indices mand-kws opt-kws)
-        #:property prop:combinator-name "->/sc"
-        #:methods gen:equal+hash [(define (equal-proc a b recur) (function-sc-equal? a b recur))
-                                  (define (hash-proc v recur) (function-sc-hash v recur))
-                                  (define (hash2-proc v recur) (function-sc-hash2 v recur))]
-        #:methods gen:sc
-          [(define (sc->contract v f) (function-sc->contract v f))
-           (define (sc-map v f) (function-sc-map v f))
-           (define (sc-traverse v f) (function-sc-map v f) (void))
-           (define (sc->constraints v f) (function-sc-constraints v f))])
-
-(define (split-function-args ctcs mand-args-end opt-args-end
-                    mand-kw-args-end opt-kw-args-end rest-end range-end)
-  (values
-    (drop (take ctcs mand-args-end) 0)
-    (drop (take ctcs opt-args-end) mand-args-end)
-    (drop (take ctcs mand-kw-args-end) opt-args-end)
-    (drop (take ctcs opt-kw-args-end) mand-kw-args-end)
-    (and (> rest-end opt-kw-args-end)
-         (first (drop (take ctcs rest-end) opt-kw-args-end)))
-    (and range-end (drop (take ctcs range-end) rest-end))))
-
-(define (function-sc->contract sc recur)
-  (match-define (function-combinator args indices mand-kws opt-kws) sc) 
-
-  (define-values (mand-ctcs opt-ctcs mand-kw-ctcs opt-kw-ctcs rest-ctc range-ctcs)
-    (apply split-function-args (map recur args) indices))
-
-  (define mand-kws-stx (append-map list mand-kws mand-kw-ctcs))
-  (define opt-kws-stx (append-map list opt-kws opt-kw-ctcs))
-  (define rest-ctc-stx
-    (if rest-ctc
-      (list '#:rest rest-ctc)
-      #'()))
-
-  (define range-ctc
-    (if range-ctcs
-      #`(values #,@range-ctcs)
-      #'any))
-
-
-  #`((#,@mand-ctcs #,@mand-kws-stx)
-     (#,@opt-ctcs #,@opt-kws-stx) 
-     #,@rest-ctc-stx
-     . ->* . #,range-ctc))
-
-
-(define (function/sc mand-args opt-args mand-kw-args opt-kw-args rest range)
-  (define mand-args-end (length mand-args))
-  (define opt-args-end (+ mand-args-end (length opt-args)))
-  (define mand-kw-args-end (+ opt-args-end (length mand-kw-args)))
-  (define opt-kw-args-end (+ mand-kw-args-end (length opt-kw-args)))
-  (define rest-end (if rest (add1 opt-kw-args-end) opt-kw-args-end))
-  (define range-end (and range (+ rest-end (length range))))
-  (define mand-kws (map first mand-kw-args))
-  (define opt-kws (map first opt-kw-args))
-  (define end-indices
-    (list mand-args-end opt-args-end mand-kw-args-end opt-kw-args-end rest-end range-end))
-
-  (function-combinator
-    (append
-      mand-args
-      opt-args
-      (map second mand-kw-args)
-      (map second opt-kw-args)
-      (if rest (list rest) null)
-      (or range null))
-    end-indices
-    mand-kws
-    opt-kws))
-
-(define-match-expander ->/sc:
-  (syntax-parser
-    [(_ mand-args opt-args mand-kw-args opt-kw-args rest range)
-     #'(and (? function-combinator?)
-            (app (match-lambda
-                   [(function-combinator args indices mand-kws opt-kws)
-                    (define-values (mand-args* opt-args* mand-kw-args* opt-kw-args* rest* range*)
-                      (apply split-function-args args indices))
-                    (list
-                      mand-args* opt-args*
-                      (map list mand-kws mand-kw-args*)
-                      (map list opt-kws opt-kw-args*)
-                      rest*
-                      range*)])
-                 (list mand-args opt-args mand-kw-args opt-kw-args rest range)))]))
-
-(define (function-sc-map v f)
-  (match-define (function-combinator args indices mand-kws opt-kws) v) 
-
-  (define-values (mand-args opt-args mand-kw-args opt-kw-args rest-arg range-args)
-    (apply split-function-args args indices))
-
-  (define new-args
-    (append 
-      (map (lambda (arg) (f arg 'contravariant))
-           (append mand-args opt-args mand-kw-args opt-kw-args (if rest-arg (list rest-arg) null)))
-      (if range-args
-          (map (lambda (arg) (f arg 'covariant))
-               range-args)
-          empty)))
-
-
-  (function-combinator new-args indices mand-kws opt-kws))
-
-(define (function-sc-constraints v f)
-  (match-define (function-combinator args indices mand-kws opt-kws) v) 
-  (merge-restricts* 'chaperone (map f args)))
-
-(define (function-sc-equal? a b recur)
-  (match-define (function-combinator a-args a-indices a-mand-kws a-opt-kws) a) 
-  (match-define (function-combinator b-args b-indices b-mand-kws b-opt-kws) b) 
-  (and
-    (recur a-indices b-indices)
-    (recur a-mand-kws b-mand-kws)
-    (recur a-opt-kws b-opt-kws)
-    (recur a-args b-args)))
-
-(define (function-sc-hash v recur)
-  (match-define (function-combinator v-args v-indices v-mand-kws v-opt-kws) v) 
-  (+ (recur v-indices) (recur v-mand-kws) (recur v-opt-kws) (recur v-args)))
-
-(define (function-sc-hash2 v recur)
-  (match-define (function-combinator v-args v-indices v-mand-kws v-opt-kws) v) 
-  (+ (recur v-indices) (recur v-mand-kws) (recur v-opt-kws) (recur v-args)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/lengths.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/lengths.rkt
deleted file mode 100644
index d9520e70ec..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/lengths.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-
-;; Static contracts for list and vector lengths.
-;; These are used during optimizations as simplifications.
-;; Ex: (list/sc any/sc) => (list-length/sc 1)
-
-(require
-  "../structures.rkt"
-  "../terminal.rkt"
-  "simple.rkt"
-  racket/contract
-  (for-template racket/base))
-
-(provide
-  (contract-out
-    [rename list-length/sc* list-length/sc (natural-number/c . -> . static-contract?)]
-    [vector-length/sc (natural-number/c . -> . static-contract?)]
-    [empty-list/sc static-contract?]
-    [empty-vector/sc static-contract?]))
-
-(define-terminal-sc list-length/sc (n) #:flat
-   #`(λ (l) (and (list? l) (= #,n (length l)))))
-
-(define-terminal-sc vector-length/sc (n) #:flat
-   #`(λ (l) (and (vector? l) (= #,n (vector-length l)))))
-
-(define (list-length/sc* n)
-  (if (zero? n)
-      empty-list/sc
-      empty-vector/sc))
-
-
-(define empty-list/sc (flat/sc #'null?))
-(define empty-vector/sc (vector-length/sc 0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/name.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/name.rkt
deleted file mode 100644
index 44981dbad7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/name.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang racket/base
-
-;; Static contracts for Name types
-;;
-;; This module keeps track of Name types global to
-;; a single type->contract use, which allows the instantiation
-;; process to lift out the contracts for the potentially
-;; mutually recursive Name types. This reduces the amount of
-;; duplication that would result if we used ordinary recursive
-;; static contracts.
-
-(require "../structures.rkt"
-         "../constraints.rkt"
-         racket/contract
-         racket/dict
-         racket/match
-         racket/syntax
-         syntax/id-table
-         (for-syntax racket/base
-                     syntax/parse))
-
-(provide with-new-name-tables
-         name/sc:
-         lookup-name-defined
-         set-name-defined
-         (contract-out
-          [get-all-name-defs
-           (-> (listof (list/c (listof identifier?)
-                               static-contract?
-                               static-contract?
-                               static-contract?)))]
-          [lookup-name-sc (-> identifier? symbol? (or/c #f static-contract?))]
-          [register-name-sc (-> identifier?
-                                (-> static-contract?)
-                                (-> static-contract?)
-                                (-> static-contract?)
-                                any)]))
-
-(define name-sc-table (make-parameter (make-free-id-table)))
-(define name-defs-table (make-parameter (make-free-id-table)))
-
-;; Use this table to track whether a contract has already been
-;; generated for this name type yet. Stores booleans.
-(define name-defined-table (make-parameter (make-free-id-table)))
-
-;; Lookup whether a contract has been defined for this name
-(define (lookup-name-defined name)
-  (free-id-table-ref (name-defined-table) name #f))
-
-;; Use when a contract has been defined for this name
-(define (set-name-defined name)
-  (free-id-table-set! (name-defined-table) name #t))
-
-(define-syntax-rule (with-new-name-tables e)
-  (parameterize ([name-sc-table (make-free-id-table)]
-                 [name-defs-table (make-free-id-table)]
-                 [name-defined-table (make-free-id-table)])
-    e))
-
-(define (get-all-name-defs)
-  (define name-scs (name-sc-table))
-  (for/list ([(name defs) (in-dict (name-defs-table))])
-    (define scs (free-id-table-ref name-scs name))
-    (define gen-names (map name-combinator-gen-name scs))
-    (cons gen-names defs)))
-
-(define (lookup-name-sc name typed-side)
-  (define result (free-id-table-ref (name-sc-table) name #f))
-  (and result
-       (case typed-side
-         [(both)    (car result)]
-         [(typed)   (cadr result)]
-         [(untyped) (caddr result)])))
-
-(define (register-name-sc name typed-thunk untyped-thunk both-thunk)
-  (define-values (typed-name untyped-name both-name)
-    (values (generate-temporary)
-            (generate-temporary)
-            (generate-temporary)))
-  (free-id-table-set! (name-sc-table)
-                      name
-                      (list (name-combinator null typed-name)
-                            (name-combinator null untyped-name)
-                            (name-combinator null both-name)))
-  (define typed-sc (typed-thunk))
-  (define untyped-sc (untyped-thunk))
-  (define both-sc (both-thunk))
-  (free-id-table-set! (name-defs-table)
-                      name
-                      (list typed-sc untyped-sc both-sc)))
-
-(struct name-combinator combinator (gen-name)
-  #:transparent
-  #:property prop:combinator-name "name/sc"
-  #:methods gen:sc
-  [(define (sc-map v f) v)
-   (define (sc-traverse v f)
-     (void))
-   (define (sc->contract v f)
-     (name-combinator-gen-name v))
-   (define (sc->constraints v f)
-     (variable-contract-restrict (name-combinator-gen-name v)))])
-
-(define-match-expander name/sc:
-  (syntax-parser
-    [(_ var) #'(name-combinator _ var)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/none.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/none.rkt
deleted file mode 100644
index db85680199..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/none.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-
-;; Static contract for none/c.
-;; Allows optimizations as many combinators can be simplified if their arguments are none/sc
-;; Ex: (listof/sc none/sc) => null?/sc
-
-(require "../structures.rkt" "../constraints.rkt"
-         racket/match
-         racket/contract
-         (for-template racket/base racket/contract/base)
-         (for-syntax racket/base syntax/parse))
-
-(provide
-  (contract-out
-    [none/sc static-contract?])
-  none/sc:)
-
-
-;;Printing
-(define (none-write-proc v port mode)
-  (if (equal? mode 0)
-      (display "none/sc" port)
-      (display "#<none/sc>" port)))
-
-(struct none-combinator combinator ()
-        #:transparent
-        #:methods gen:sc
-          [(define (sc-map v f) v)
-           (define (sc-traverse v f) (void))
-           (define (sc->contract v f) #'none/c)
-           (define (sc->constraints v f) (simple-contract-restrict 'flat))]
-        #:methods gen:custom-write [(define write-proc none-write-proc)])
-
-(define-match-expander none/sc:
-  (syntax-parser
-    [(_) #'(? none-combinator?)]))
-
-(define none/sc (none-combinator null))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/object.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/object.rkt
deleted file mode 100644
index b531f9302e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/object.rkt
+++ /dev/null
@@ -1,165 +0,0 @@
-#lang racket/base
-
-;; Static contracts for class constructs.
-;; Currently supports object/c and class/c.
-
-(require "../structures.rkt" "../constraints.rkt"
-         racket/list racket/match
-         racket/contract
-         racket/syntax
-         (for-template racket/base racket/class)
-         (for-syntax racket/base syntax/parse))
-
-(provide
-  (contract-out
-    [struct member-spec ([modifier symbol?] [id symbol?] [sc static-contract?])]
-    [object/sc ((listof object-member-spec?) . -> . static-contract?)]
-    [class/sc ((listof member-spec?) boolean? . -> . static-contract?)]
-    [instanceof/sc (static-contract? . -> . static-contract?)]))
-
-
-
-(struct member-spec (modifier id sc) #:transparent)
-
-(define field-modifiers '(field init init-field inherit-field))
-(define method-modifiers '(method inherit super inner override augment augride))
-
-(struct object-combinator combinator ()
-  #:transparent
-  #:property prop:combinator-name "object/sc"
-  #:methods gen:sc
-    [(define (sc-map v f)
-       (object-combinator (member-seq-sc-map f (combinator-args v))))
-     (define (sc-traverse v f)
-       (member-seq-sc-map f (combinator-args v))
-       (void))
-     (define (sc->contract v f)
-       (object/sc->contract v f))
-     (define (sc->constraints v f)
-       (merge-restricts* 'impersonator (map f (member-seq->list (combinator-args v)))))])
-
-(struct class-combinator combinator (opaque)
-  #:transparent
-  #:property prop:combinator-name "class/sc"
-  #:methods gen:sc
-    [(define (sc-map v f)
-       (match v
-         [(class-combinator args opaque)
-          (class-combinator (member-seq-sc-map f args) opaque)]))
-     (define (sc-traverse v f)
-       (match v
-         [(class-combinator args opaque)
-          (member-seq-sc-map f args)
-          (void)]))
-     (define (sc->contract v f)
-       (class/sc->contract v f))
-     (define (sc->constraints v f)
-       (merge-restricts* 'impersonator (map f (member-seq->list (combinator-args v)))))])
-
-(struct instanceof-combinator combinator ()
-  #:transparent
-  #:property prop:combinator-name "instanceof/sc"
-  #:methods gen:sc
-    [(define (sc-map v f)
-       (match v
-         [(instanceof-combinator (list class))
-          (instanceof-combinator (list (f class 'covariant)))]))
-     (define (sc-traverse v f)
-       (match v
-         [(instanceof-combinator (list class))
-          (f class 'covariant)
-          (void)]))
-     (define (sc->contract v f)
-       (instance/sc->contract v f))
-     (define (sc->constraints v f)
-       (match v
-         [(instanceof-combinator (list class))
-          (f class)]))])
-
-
-(define member-seq->list
-  (match-lambda
-    [(member-seq vals) 
-     (filter-map member-spec-sc vals)]))
-
-(struct member-seq (vals)
-   #:transparent
-   #:property prop:sequence member-seq->list)
-
-(define (member-seq-sc-map f seq)
-  (match seq
-    [(member-seq vals)
-     (member-seq
-       (for/list ([v (in-list vals)])
-          (match v
-            [(member-spec mod id sc)
-             (member-spec mod id (and sc (f sc 'invariant)))])))]))
-
-;; TODO make this the correct subset
-(define object-member-spec? member-spec?)
-
-(define (object/sc specs)
-  (object-combinator (member-seq specs)))
-(define (class/sc specs opaque)
-  (class-combinator (member-seq specs) opaque))
-(define (instanceof/sc class)
-  (instanceof-combinator (list class)))
-
-(define ((member-spec->form f) v)
-  (match v
-    [(member-spec modifier id sc)
-     (with-syntax ([ctc-stx (and sc (f sc) empty)]
-                   [id-stx id])
-       (define id/ctc
-         (if sc #`(#,id #,(f sc)) id))
-       (match modifier
-         ['method id/ctc]
-         ['augment #`(augment #,id/ctc)]
-         ['init #`(init #,id/ctc)]
-         ['field #`(field #,id/ctc)]))]))
-
-(define (spec->id/ctc f modifier vals)
-  (for/lists (_1 _2)
-             ([spec vals]
-              #:when (eq? modifier (member-spec-modifier spec)))
-    (values (member-spec-id spec)
-            (f (member-spec-sc spec)))))
-
-(define (object/sc->contract v f) 
-  (match v
-   [(object-combinator (member-seq vals))
-    #`(object/c #,@(map (member-spec->form f) vals))]))
-(define (class/sc->contract v f) 
-  (match v
-   [(class-combinator (member-seq vals) opaque)
-    (define-values (override-names override-ctcs)
-      (spec->id/ctc f 'override vals))
-    (define-values (pubment-names pubment-ctcs)
-      (spec->id/ctc f 'pubment vals))
-    (define/with-syntax (override-temp ...)
-      (generate-temporaries override-ctcs))
-    (define/with-syntax (pubment-temp ...)
-      (generate-temporaries pubment-ctcs))
-    (define/with-syntax (override-name ...) override-names)
-    (define/with-syntax (pubment-name ...) pubment-names)
-    (define/with-syntax (override-ctc ...) override-ctcs)
-    (define/with-syntax (pubment-ctc ...) pubment-ctcs)
-    (define vals-rest
-      (filter (λ (spec)
-                (not (memq (member-spec-modifier spec)
-                           '(override pubment))))
-              vals))
-    #`(let ([override-temp override-ctc] ...
-            [pubment-temp pubment-ctc] ...)
-        (class/c #,@(if opaque (list '#:opaque) empty)
-                 #,@(map (member-spec->form f) vals-rest)
-                 [override-name override-temp] ...
-                 (override [override-name override-temp] ...)
-                 (super [override-name override-temp] ...)
-                 (inherit [override-name override-temp] ...)
-                 [pubment-name pubment-temp] ...
-                 (inherit [pubment-name pubment-temp] ...)))]))
-(define (instance/sc->contract v f)
-  (match v
-   [(instanceof-combinator (list class))
-    #`(instanceof/c #,(f class))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/parametric.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/parametric.rkt
deleted file mode 100644
index b18c56e10a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/parametric.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang racket/base
-
-;; Static contract for parametric->/c.
-
-(require
-  "../structures.rkt"
-  "../constraints.rkt"
-  "../terminal.rkt"
-  racket/match
-  racket/contract
-  (for-template racket/base racket/contract/parametric)
-  (for-syntax racket/base syntax/parse))
-
-(provide
-  (contract-out
-    [parametric->/sc ((listof identifier?) static-contract? . -> . static-contract?)]
-    [parametric-var/sc (identifier? . -> . static-contract?)])
-  parametric->/sc:
-  (rename-out
-    [parametric-var/sc parametric-var/sc:]
-    [parametric-combinator? parametric->/sc?]))
-
-
-(struct parametric-combinator combinator (vars)
-  #:transparent
-  #:property prop:combinator-name "parametric->/sc"
-  #:methods gen:sc
-    [(define (sc-map v f)
-       (match v
-        [(parametric-combinator (list arg) vars)
-         (parametric-combinator (list (f arg 'covariant)) vars)]))
-     (define (sc-traverse v f)
-       (match v
-        [(parametric-combinator (list arg) vars)
-         (f arg 'covariant)
-         (void)]))
-     (define (sc->contract v f)
-       (match v
-        [(parametric-combinator (list arg) vars)
-         #`(parametric->/c #,vars #,(f arg))]))
-     (define (sc->constraints v f)
-       (match v
-        [(parametric-combinator (list arg) vars)
-         (merge-restricts* 'impersonator  (list (f arg)))]))])
-
-(define (parametric->/sc vars body)
-  (parametric-combinator (list body) vars))
-
-(define-match-expander parametric->/sc:
-  (syntax-parser
-    [(_ vars body)
-     #'(parametric-combinator (list body) vars)]))
-
-(define-terminal-sc parametric-var/sc (id) #:impersonator
-  #:printer (v p mode) (display (syntax-e (parametric-var/sc-id v)) p)
-   id)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/simple.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/simple.rkt
deleted file mode 100644
index 8e003f7161..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/simple.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-
-;; Static contracts that are terminal and have no sub parts.
-;; Unlike contracts defined with define-terminal-contract, equality of these contracts is based solely
-;; on identity. Thus they are most useful for contracts which have no meaningful structure.
-;; Ex: (flat/sc #'number?)
-
-(require
-  "../structures.rkt"
-  "../constraints.rkt"
-  racket/match
-  racket/contract)
-
-(provide
-  (contract-out
-    [flat/sc ((syntax?) ((or/c #f any/c)) . ->* . static-contract?)]
-    [chaperone/sc ((syntax?) ((or/c #f any/c)) . ->* . static-contract?)]
-    [impersonator/sc ((syntax?) ((or/c #f any/c)) . ->* . static-contract?)]))
-
-(define (simple-contract-write-proc v port mode)
-  (match-define (simple-contract syntax kind name) v)
-  (define-values (open close)
-    (if (equal? mode 0)
-        (values "(" ")")
-        (values "#<" ">")))
-  (display open port)
-  (fprintf port "~a/sc" kind)
-  (display " " port)
-  (write (or name (syntax->datum syntax)) port)
-  (display close port))
-
-
-
-(struct simple-contract static-contract (syntax kind name)
-        #:transparent
-        #:methods gen:sc
-         [(define (sc-map v f) v)
-          (define (sc-traverse v f) (void))
-          (define (sc->contract v f) (simple-contract-syntax v))
-          (define (sc->constraints v f) (simple-contract-restrict (simple-contract-kind v)))
-          (define (sc-terminal-kind v) (simple-contract-kind v))]
-        #:methods gen:custom-write [(define write-proc simple-contract-write-proc)])
-
-(define (flat/sc ctc [name #f])
-  (simple-contract ctc 'flat name))
-(define (chaperone/sc ctc [name #f])
-  (simple-contract ctc 'chaperone name))
-(define (impersonator/sc ctc [name #f])
-  (simple-contract ctc 'impersonator name))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/struct.rkt
deleted file mode 100644
index b97e34fe9f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/struct.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-
-;; Static contract for struct/c.
-
-(require "../structures.rkt" "../constraints.rkt"
-         racket/match
-         racket/contract
-         (for-template racket/base racket/contract/base "../../utils/struct-type-c.rkt")
-         (for-syntax racket/base syntax/parse))
-
-
-
-(provide
-  (contract-out
-    [struct/sc (identifier? boolean? (listof static-contract?) . -> . static-contract?)]
-    ;; #f as argument indicates StructTypeTop, which should fail on
-    ;; all reflective operations.
-    [struct-type/sc (any/c . -> . static-contract?)])
-  struct/sc:
-  struct-type/sc:)
-
-
-(struct struct-combinator combinator (name mut?)
-  #:transparent
-  #:property prop:combinator-name "struct/sc"
-  #:methods gen:sc
-    [(define (sc-map v f)
-       (match v
-        [(struct-combinator args name mut?)
-         (struct-combinator (map (λ (a) (f a (if mut? 'invariant 'covariant))) args)
-                            name mut?)]))
-     (define (sc-traverse v f)
-       (match v
-        [(struct-combinator args name mut?)
-         (for-each (λ (a) (f a (if mut? 'invariant 'covariant))) args)
-         (void)]))
-     (define (sc->contract v f)
-       (match v
-        [(struct-combinator args name _)
-         #`(struct/c #,name #,@(map f args))]))
-     (define (sc->constraints v f)
-       (match v
-        [(struct-combinator args _ mut?)
-         (merge-restricts*
-           (if mut? 'chaperone 'flat)
-           (map (lambda (a) (if (not mut?) (add-constraint (f a) 'chaperone) (f a))) args))]))])
-
-(define (struct/sc name mut? fields)
-  (struct-combinator fields name mut?))
-
-(define-match-expander struct/sc:
-  (syntax-parser
-    [(_ name fields)
-     #'(struct-combinator fields name _)]))
-
-;; FIXME: Currently ignores the structure type and fails on all
-;; reflective use.  
-(struct struct-type/sc combinator ()
-  #:transparent
-  #:property prop:combinator-name "struct-type/sc"
-  #:methods gen:sc
-    [(define (sc-map v f)
-       (match v
-         [(struct-type/sc args)
-          (struct-type/sc (map (λ (a) (f a 'covariant)) args))]))
-     (define (sc-traverse v f)
-       (match v
-         [(struct-type/sc args)
-          (for-each (λ (a) (f a 'covariant)) args)
-          (void)]))
-     (define (sc->contract v f)
-       (match v
-         [(struct-type/sc args)
-          #`(struct-type/c #f)]))
-     (define (sc->constraints v f)
-       (match v
-         [(struct-type/sc args) (simple-contract-restrict 'chaperone)]))])
-
-(define-match-expander struct-type/sc:
-  (syntax-parser
-    [(_ args)
-     #'(struct-type/sc args)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/structural.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/structural.rkt
deleted file mode 100644
index 44fc9e66b2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/structural.rkt
+++ /dev/null
@@ -1,161 +0,0 @@
-#lang racket/base
-
-;; Static contracts for structural contracts.
-;; Ex: list/sc, vectorof/sc
-
-(require "../structures.rkt"
-         "../constraints.rkt"
-         racket/match
-         (for-syntax racket/base racket/syntax syntax/stx syntax/parse)
-         racket/set
-         unstable/contract
-         (for-template racket/base
-                       racket/contract/base
-                       racket/set
-                       unstable/contract
-                       "../../utils/evt-contract.rkt")
-         racket/contract)
-
-
-(begin-for-syntax
-  (define-syntax-class variance-keyword
-    #:attributes (variance)
-    [pattern (~and kw (~or #:covariant #:contravariant #:invariant))
-             #:with variance (string->symbol (keyword->string (syntax-e (attribute kw))))])
-
-  (define-syntax-class contract-category-keyword
-    #:attributes (category category-stx)
-    [pattern (~and kw (~or #:flat #:chaperone #:impersonator))
-             #:attr category (string->symbol (keyword->string (syntax-e (attribute kw))))
-             #:with category-stx (attribute category)])
-
-  ;; TODO: Fix category when syntax parse is fixed
-  (define-syntax-class argument-description
-    #:attributes (variance name category category-stx)
-    [pattern ((~or (~optional c:contract-category-keyword)
-                   (~once :variance-keyword)) ...)
-             #:attr name (generate-temporary)
-             #:attr category (or (attribute c.category) 'impersonator)
-             #:with category-stx (attribute category)])
-
-  (define-syntax-class static-combinator-form
-    #:attributes (name struct-name definition combinator2 ->restricts matcher provides map traverse)
-    [pattern (name:id pos:argument-description ... )
-             #:with struct-name (generate-temporary #'name)
-             #:with matcher-name (format-id #'name "~a:" #'name)
-             #:with definition
-               #'(define name (λ (pos.name ...) (struct-name (list pos.name ...))))
-             #:with ->restricts
-               #'(lambda (v recur)
-                   (for/list ([arg (in-list (combinator-args v))]
-                              [kind (in-list (list 'pos.category-stx ...))])
-                     (add-constraint (recur arg) kind)))
-             #:attr combinator2
-               #'(λ (constructor) (λ (pos.name ...) (constructor (list pos.name ...))))
-             #:with matcher
-               #'(define-match-expander matcher-name
-                   (syntax-parser
-                     [(_ pos.name ...)
-                      #'(struct-name (list pos.name ...))]))
-             #:with map
-               #'(lambda (v f)
-                   (struct-name
-                     (for/list ([a (in-list (combinator-args v))]
-                                [kind (in-list (list 'pos.variance ...))])
-                       (f a kind))))
-             #:with traverse
-               #'(lambda (v f)
-                   (for ([a (in-list (combinator-args v))]
-                         [kind (in-list (list 'pos.variance ...))])
-                     (f a kind)))
-             #:with ctc
-                 #`(-> #,@(stx-map (lambda (_) #'static-contract?) #'(pos ...)) static-contract?)
-             #:with provides #'(provide (contract-out [name ctc]) matcher-name)]
-    [pattern (name:id . rest:argument-description)
-             #:with struct-name (generate-temporary #'name)
-             #:with matcher-name (format-id #'name "~a:" #'name)
-             #:with definition #'(define name (λ args (struct-name args)))
-             #:attr combinator2 #'(λ (constructor) (λ args (constructor args)))
-             #:with ->restricts
-               #'(lambda (v recur)
-                   (for/list ([arg (in-list (combinator-args v))])
-                     (add-constraint (recur arg) 'rest.category-stx)))
-             #:with matcher
-               #'(define-match-expander matcher-name
-                   (syntax-parser
-                    [(_ ctc (... ...))
-                     #'(struct-name (list ctc (... ...)))]))
-             #:with map
-               #'(lambda (v f)
-                   (struct-name
-                     (for/list ([a (in-list (combinator-args v))])
-                       (f a 'rest.variance))))
-             #:with traverse
-               #'(lambda (v f)
-                   (for ([a (in-list (combinator-args v))])
-                     (f a 'rest.variance)))
-             #:with ctc
-                 #'(->* () #:rest (listof static-contract?) static-contract?)
-             #:with provides #'(provide (contract-out [name ctc]) matcher-name)]))
-
-
-(define-syntax (combinator-struct stx)
-  (syntax-parse stx
-    [(_ sc:static-combinator-form c:expr kind:contract-category-keyword)
-     #'(begin
-         (struct sc.struct-name combinator ()
-                 #:transparent
-                 #:methods gen:sc
-                   [(define sc-map sc.map)
-                    (define sc-traverse sc.traverse)
-                    (define (sc->contract v recur)
-                      (apply
-                        (sc.combinator2 (lambda (args) #`(c #,@args)))
-                        (map recur (combinator-args v))))
-                    (define (sc->constraints v recur)
-                      (merge-restricts* 'kind.category-stx (sc.->restricts v recur)))]
-                #:methods gen:equal+hash
-                  [(define (equal-proc a b recur)
-                     (and (recur (length (combinator-args a))
-                                 (length (combinator-args b)))
-                          (for/and ([sub-a (in-list (combinator-args a))]
-                                    [sub-b (in-list (combinator-args b))])
-                            (recur sub-a sub-b))))
-                   (define (hash-proc v recur)
-                     (+ (recur 'sc.name)
-                        (for/sum ((sub (in-list (combinator-args v))))
-                           (recur sub))))
-                   (define (hash2-proc v recur)
-                     (+ (recur 'sc.name)
-                        (for/sum ((sub (in-list (combinator-args v))))
-                           (recur sub))))]
-                 #:property prop:combinator-name (symbol->string 'sc.name))
-         sc.matcher
-         sc.definition
-         sc.provides)]))
-
-
-(define-syntax (combinator-structs stx)
-  (syntax-parse stx
-    [(_ (e ...) ...)
-     #`(begin
-         (combinator-struct e ...) ...)]))
-
-(combinator-structs
-  ((or/sc . (#:covariant)) or/c #:flat)
-  ((and/sc . (#:covariant)) and/c #:flat)
-  ((list/sc . (#:covariant)) list/c #:flat)
-  ((listof/sc (#:covariant)) listof #:flat)
-  ((cons/sc (#:covariant) (#:covariant)) cons/c #:flat)
-  ((set/sc (#:covariant #:chaperone)) set/c #:flat)
-  ((vector/sc . (#:invariant)) vector/c #:chaperone)
-  ((vectorof/sc (#:invariant)) vectorof #:chaperone)
-  ((promise/sc (#:covariant)) promise/c #:chaperone)
-  ((syntax/sc (#:covariant #:flat)) syntax/c #:flat)
-  ((hash/sc (#:invariant #:flat) (#:invariant)) hash/c #:chaperone)
-  ((box/sc (#:invariant)) box/c #:chaperone)
-  ((parameter/sc (#:contravariant) (#:covariant)) parameter/c #:chaperone)
-  ((sequence/sc . (#:covariant)) sequence/c #:impersonator)
-  ((channel/sc . (#:invariant)) channel/c #:chaperone)
-  ((continuation-mark-key/sc (#:invariant)) continuation-mark-key/c #:chaperone)
-  ((evt/sc (#:covariant)) tr:evt/c #:chaperone))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/constraints.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/constraints.rkt
deleted file mode 100644
index c6b6b422fe..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/constraints.rkt
+++ /dev/null
@@ -1,288 +0,0 @@
-#lang racket/base
-
-;; Manages the restrictions on what kind of contract is viable.
-;; Some combinators cannot support arbitrary contracts. Ex: hash/c needs a flat contract on the key.
-;; This module provides the functions for manipulating a set of such constraints.
-;;
-;; Constructors:
-;;   simple-contract-restrict: kind? -> contract-restrict?
-;;     This means that the generated contract will be contract of the supplied kind.
-;;
-;;   variable-contract-restrict: identifier? -> contract-restrict?
-;;     This means that the generated contract will be of the same kind as the recursive contract
-;;     referenced by the variable.
-;;
-;;   merge-restricts: kind? contract-restrict? ... -> contract-restrict?
-;;   merge-restricts*: kind? (listof contracct-restrict?) -> contract-restrict?
-;;     This means that the generated contract will be the max of kind and all of the other contract
-;;     restricts.
-;;
-;;   add-constraint: contract-restrict? kind? -> contract-restrict
-;;     This means the kind of the generated contract can not be greater than the supplied kind.
-;;
-;;   close-loop: (lisotf identifier?) (listof contract-restrict?) contract-restrict? -> contract-restrict?
-;;     This takes a bunch of recursive contract identifiers, their corresponding contract-restricts,
-;;     the contract restrict for a body and constructs the appropriate constract restrict.
-;;
-;; Other:
-;;   validate-constraints: contract-restrict? -> void?
-;;     This takes a contract-restrict and raises an exception if it has any violated constraints.
-;;
-;;   contract-restrict-recursive-values: contract-restrict? -> (dict/c identifier? kind?)
-;;     Provides the kinds of all of the internal recursive contracts that are a part of the
-;;     contract-restrict.
-;;
-;;
-;;
-
-(require
-  racket/match
-  racket/list
-  racket/format
-  racket/function
-  racket/contract
-  racket/dict
-  racket/set
-  syntax/id-table
-  "kinds.rkt"
-  "equations.rkt")
-
-(provide
-  simple-contract-restrict
-  variable-contract-restrict
-  merge-restricts*
-  merge-restricts
-  close-loop
-  (contract-out
-    [exn:fail:constraint-failure? predicate/c]
-    [exn:fail:constraint-failure-reason (exn:fail:constraint-failure? . -> . string?)]
-    [validate-constraints (contract-restrict? . -> . void?)]
-    [add-constraint (contract-restrict? contract-kind? . -> . contract-restrict?)])
-  contract-restrict-recursive-values
-
-  contract-restrict?
-  )
-
-(module structs racket/base
-  (require racket/contract
-           racket/match
-           racket/dict
-           racket/list
-           racket/set
-           syntax/id-table
-           "kinds.rkt")
-  (provide
-    (contract-out
-      ;; constraint: value must be below max
-      [struct constraint ([value kind-max?] [max contract-kind?])]
-      ;; kind-max: represents the maximum kind across all of the variables and the specified kind
-      [struct kind-max ([variables free-id-set?] [max contract-kind?])]
-      ;; contract-restrict: represents a contract with value, recursive-values maps mentioned
-      ;; recursive parts to kind-maxes, constraints are constraints that need to hold
-      [struct contract-restrict ([value kind-max?]
-                                 [recursive-values free-id-table?]
-                                 [constraints (set/c constraint?)])]))
-  (define free-id-set? free-id-table?)
-
-  (struct constraint (value max) #:transparent)
-  (struct kind-max (variables max) #:transparent
-          #:methods gen:custom-write
-          [(define (write-proc v port mode)
-             (match-define (kind-max variables max) v)
-             (define recur
-               (case mode
-                 [(#t) write]
-                 [(#f) display]
-                 [else (lambda (p port) (print p port mode))]))
-             (define-values (open close)
-               (if (equal? mode 0)
-                   (values "(" ")")
-                   (values "#<" ">")))
-             (display open port)
-             (fprintf port "kind-max")
-             (display " " port)
-             (display (map syntax-e (dict-keys variables)) port)
-             (display " " port)
-             (recur max port)
-             (display close port))])
-  (struct contract-restrict (value recursive-values constraints)
-          #:methods gen:custom-write
-          [(define (write-proc v port mode)
-             (match-define (contract-restrict value recursive-values constraints) v)
-             (define recur
-               (case mode
-                 [(#t) write]
-                 [(#f) display]
-                 [else (lambda (p port) (print p port mode))]))
-             (define-values (open close)
-               (if (equal? mode 0)
-                   (values "(" ")")
-                   (values "#<" ">")))
-             (display open port)
-             (fprintf port "contract-restrict")
-             (display " " port)
-             (recur value port)
-
-             (display " (" port)
-             (define (recur-pair name val)
-               (fprintf port "(~a " (syntax->datum name))
-               (recur val port)
-               (display ")" port))
-             (define-values (names vals)
-                (let ((assoc (dict->list recursive-values)))
-                  (values (map car assoc) (map cdr assoc))))
-             (when (cons? names)
-               (recur-pair (first names) (first vals))
-               (for ((name (rest names))
-                     (val (rest vals)))
-                    (display " " port)
-                    (recur-pair name val)))
-             (display ") " port)
-             (recur constraints port)
-             (display close port))]
-          #:transparent))
-(require 'structs)
-(provide (struct-out kind-max))
-
-(struct exn:fail:constraint-failure exn:fail (reason))
-
-(define (free-id-set . elems)
-  (for/fold ([table (make-immutable-free-id-table)])
-            ([e (in-list elems)])
-    (dict-set table e #t)))
-
-(define (free-id-set-union tables)
-  (for*/fold ([table (make-immutable-free-id-table)])
-             ([new-table (in-list tables)]
-              [(k _) (in-dict new-table)])
-    (dict-set table k #t)))
-
-(define (free-id-table-union tables)
-  (for*/fold ([table (make-immutable-free-id-table)])
-             ([new-table (in-list tables)]
-              [(k v) (in-dict new-table)])
-    (dict-set table k v)))
-
-(define (simple-contract-restrict kind)
-  (contract-restrict (kind-max (free-id-set) kind) (make-immutable-free-id-table) (set)))
-(define (variable-contract-restrict var)
-  (contract-restrict (kind-max (free-id-set var) 'flat) (make-immutable-free-id-table) (set)))
-
-(define (reason-string actual bound)
-  (define (name k)
-    (case k
-      [(flat chaperone) (~a "a " k " contract")]
-      [(impersonator) "an impersonator contract"]))
-  (~a "required " (name bound) " but generated " (name actual)))
-
-
-(define (trivial-constraint? con)
-  (match con
-    [(constraint _ 'impersonator)
-     #t]
-    [(constraint (kind-max (app dict-count 0) actual) bound)
-     (contract-kind<= actual bound)]
-    [else #f]))
-
-
-(define (add-constraint cr max)
-  (match cr
-    [(contract-restrict v rec constraints)
-     (define con (constraint v max))
-     (if (trivial-constraint? con)
-         cr
-         (contract-restrict v rec (set-add constraints con)))]))
-
-(define (add-recursive-values cr dict) 
-  (match cr
-    [(contract-restrict v rec constraints)
-     (contract-restrict v (free-id-table-union (list rec dict)) constraints)]))
-
-(define (merge-restricts* min crs)
-  (apply merge-restricts min crs))
-
-(define (merge-restricts min . crs)
-  (match crs
-    [(list (contract-restrict vs rec constraints) ...)
-     (contract-restrict (merge-kind-maxes min vs)
-                        (free-id-table-union rec)
-                        (apply set-union (set) constraints))]))
-
-(define (merge-kind-maxes min-kind vs)
-  (match vs
-    [(list (kind-max variables maxes) ...)
-     (kind-max (free-id-set-union variables) (apply combine-kinds min-kind maxes))]))
-
-(define (close-loop names crs body)
-  (define eqs (make-equation-set))
-  (define vars
-    (for*/hash ((name (in-list names)))
-      (values name 
-              (add-variable! eqs (simple-contract-restrict 'flat)))))
-  (define (variable-lookup name)
-    (variable-ref (hash-ref vars name)))
-
-
-  (define (instantiate-cr cr lookup-id)
-    (define (instantiate-kind-max km)
-      (match km
-        [(kind-max ids actual)
-         (define-values (bound-ids unbound-ids)
-           (partition (lambda (id) (member id names)) (dict-keys ids)))
-         (merge-kind-maxes 'flat (cons (kind-max (apply free-id-set unbound-ids) actual)
-                                       (for/list ([id (in-list bound-ids)])
-                                         (contract-restrict-value (lookup-id id)))))]))
-
-    (define (instantiate-constraint con)
-      (match con
-        [(constraint km bound)
-         (constraint (instantiate-kind-max km) bound)]))
-
-    (match cr
-      [(contract-restrict (kind-max ids max) rec constraints)
-       (define-values (bound-ids unbound-ids)
-         (partition (lambda (id) (member id names)) (dict-keys ids)))
-       (merge-restricts* 'flat (cons
-                                 (contract-restrict
-                                   (kind-max (apply free-id-set unbound-ids) max) 
-                                   rec
-                                   (apply set
-                                          (filter (negate trivial-constraint?)
-                                                  (set-map constraints instantiate-constraint))))
-                                 (map lookup-id bound-ids)))]))
-
-  (for ([name names] [cr crs])
-    (add-equation! eqs
-      (hash-ref vars name)
-      (lambda ()
-        (instantiate-cr cr variable-lookup))))
-
-  (define var-values (resolve-equations eqs))
-  (define id-values
-    (for/hash (((name var) vars))
-      (values name (hash-ref var-values var))))
-
-  (define new-rec-values
-    (for/hash (((name value) id-values))
-      (values name (contract-restrict-value value))))
-
-  (for/fold ([cr (instantiate-cr body (lambda (id) (hash-ref id-values id)))])
-            ([rec-values (cons new-rec-values (map contract-restrict-recursive-values
-                                                   (hash-values id-values)))])
-    (add-recursive-values cr rec-values)))
-
-
-
-(define (validate-constraints cr)
-  (match cr
-    [(contract-restrict (kind-max (app dict-count 0) _) rec constraints)
-     (for ([const (in-set constraints)])
-       (match const
-        [(constraint (kind-max (app dict-count 0) kind) bound)
-         (unless (contract-kind<= kind bound)
-           (define reason (reason-string kind bound))
-           (raise (exn:fail:constraint-failure
-                    (format "Violated constraint: ~a" reason)
-                    (current-continuation-marks)
-                    reason)))]))]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/equations.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/equations.rkt
deleted file mode 100644
index cdbe35be41..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/equations.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-
-;; Manages a set of mutually recursive equations, and provids functionality for finding a fix point.
-;; An equation set has two components
-;;  1. a mapping of variables to initial values.
-;;  2. a mapping of variables to thunks that compute new values.
-;; 
-;; Variables are an opaque structure, which support accessing their current value.
-
-
-(provide
-  make-equation-set
-  add-variable!
-  add-equation!
-  resolve-equations
-  variable-ref)
-
-
-(struct var ())
-
-; equations: (hash/c var? (-> value?))
-; initial-values: (hash/c var? (-> value?))
-(struct equation-set (equations initial-values))
-
-(define (make-equation-set)
-  (equation-set (make-hash) (make-hash)))
-
-; add-variable!: (equation-set? value? -> var?)
-(define (add-variable! eqs initial-value)
-  (define a-var (var))
-  (hash-set! (equation-set-initial-values eqs) a-var initial-value)
-  a-var)
-
-; add-equation!: (equation-set? var? (-> value?) -> void?)
-(define (add-equation! eqs var thunk)
-  (hash-set! (equation-set-equations eqs) var thunk))
-
-(define current-variable-values (make-parameter (hash)))
-
-;; resolve-equations (equation-set? -> (hash/c var? value?))
-;; Produces a mapping of variables to values such that every equation holds.
-(define (resolve-equations eqs)
-  (define values (hash-copy (equation-set-initial-values eqs)))
-  (parameterize ((current-variable-values values))
-    (let loop ()
-      (define change #f) 
-      (for (((v thunk) (equation-set-equations eqs)))
-        (define new-value (thunk))
-        (define old-value (hash-ref values v))
-        (unless (equal? new-value old-value)
-          (set! change #t)
-          (hash-set! values v new-value)))
-      (when change
-        (loop)))
-    values))
-
-(define (variable-ref v)
-  (hash-ref (current-variable-values) v (lambda () (error 'variable-ref "No value available."))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/instantiate.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/instantiate.rkt
deleted file mode 100644
index 934310360d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/instantiate.rkt
+++ /dev/null
@@ -1,176 +0,0 @@
-#lang racket/base
-
-;; Provides functionality to take a static contract and turn it into a regular contract.
-
-(require
-  racket/match
-  racket/dict
-  racket/contract
-  racket/syntax
-  (for-template racket/base racket/contract)
-  "combinators.rkt"
-  "combinators/name.rkt"
-  "combinators/case-lambda.rkt"
-  "combinators/parametric.rkt"
-  "kinds.rkt"
-  "parametric-check.rkt"
-  "structures.rkt"
-  "constraints.rkt"
-  "equations.rkt")
-
-(provide
-  (contract-out
-    [instantiate
-      (parametric->/c (a) ((static-contract? (-> #:reason (or/c #f string?) a))
-                           (contract-kind? #:cache hash?)
-                           . ->* . (or/c a (list/c (listof syntax?) syntax?))))]))
-
-;; Providing these so that tests can work directly with them.
-(module* internals #f
-  (provide compute-constraints
-           compute-recursive-kinds
-           instantiate/inner))
-
-;; kind is the greatest kind of contract that is supported, if a greater kind would be produced the
-;; fail procedure is called.
-;;
-;; The cache is used to share contract definitions across multiple calls to
-;; type->contract in a given contract fixup pass. If it's #f then that means don't
-;; do any sharing (useful for testing).
-(define (instantiate sc fail [kind 'impersonator] #:cache [cache #f])
-  (if (parametric-check sc)
-      (fail #:reason "multiple parametric contracts are not supported")
-      (with-handlers [(exn:fail:constraint-failure?
-                        (lambda (exn) (fail #:reason (exn:fail:constraint-failure-reason exn))))]
-        (instantiate/inner sc
-          (compute-recursive-kinds
-            (contract-restrict-recursive-values (compute-constraints sc kind)))
-          cache))))
-
-(define (compute-constraints sc max-kind)
-  (define memo-table (make-hash))
-  (define name-defs (get-all-name-defs))
-  (define (recur sc)
-    (cond [(hash-ref memo-table sc #f)]
-          [else
-           (define result
-             (match sc
-               [(recursive-sc names values body)
-                (close-loop names (map recur values) (recur body))]
-               [(? sc?)
-                (sc->constraints sc recur)]))
-           (hash-set! memo-table sc result)
-           result]))
-  (define constraints
-    (if (null? name-defs)
-        (recur sc)
-        (close-loop (apply append (dict-keys name-defs))
-                    (map recur (apply append (dict-values name-defs)))
-                    (recur sc))))
-  (validate-constraints (add-constraint constraints max-kind))
-  constraints)
-
-
-(define (compute-recursive-kinds recursives)
-  (define eqs (make-equation-set))
-  (define vars
-    (for/hash ([(name _) (in-dict recursives)])
-      (values name (add-variable! eqs 'flat))))
-
-  (define (lookup id)
-    (variable-ref (hash-ref vars id)))
-
-  (for ([(name v) (in-dict recursives)])
-    (match v
-      [(kind-max others max)
-       (add-equation! eqs
-          (hash-ref vars name)
-          (lambda ()
-            (apply combine-kinds max (map lookup (dict-keys others)))))]))
-  (define var-values (resolve-equations eqs))
-  (for/hash (((name var) (in-hash vars)))
-    (values name (hash-ref var-values var))))
-
-
-(define (instantiate/inner sc recursive-kinds cache)
-  (define bound-names (make-parameter null))
-  ;; sc-queue : records the order in which to return syntax objects
-  (define sc-queue null)
-  (define (recur sc)
-    (cond [(and cache (hash-ref cache sc #f)) => car]
-          [(arr/sc? sc) (make-contract sc)]
-          [(parametric->/sc? sc)
-           (match-define (parametric->/sc: vars _) sc)
-           (parameterize ([bound-names (append vars (bound-names))])
-             (make-contract sc))]
-          ;; If any names are bound, the contract can't be shared
-          ;; becuase it depends on the scope it's in
-          [(ormap (λ (n) (name-free-in? n sc)) (bound-names))
-           (make-contract sc)]
-          [else
-           (define ctc (make-contract sc))
-           (cond [cache
-                  (define fresh-id (generate-temporary))
-                  (hash-set! cache sc (cons fresh-id ctc))
-                  (set! sc-queue (cons sc sc-queue))
-                  fresh-id]
-                 [else ctc])]))
-  (define (make-contract sc)
-    (match sc
-      [(recursive-sc names values body)
-       (define raw-names (generate-temporaries names))
-       (define raw-bindings
-         (parameterize ([bound-names (append names (bound-names))])
-           (for/list ([raw-name (in-list raw-names)]
-                      [value (in-list values)])
-             #`[#,raw-name #,(recur value)])))
-       (define bindings
-         (for/list ([name (in-list names)]
-                    [raw-name (in-list raw-names)])
-            #`[#,name (recursive-contract #,raw-name
-                                            #,(kind->keyword
-                                                (hash-ref recursive-kinds name)))]))
-       #`(letrec (#,@bindings #,@raw-bindings)
-           #,(parameterize ([bound-names (append names (bound-names))])
-               (recur body)))]
-      [(? sc? sc)
-       (sc->contract sc recur)]))
-  (define ctc (recur sc))
-  (define name-defs (get-all-name-defs))
-  ;; These are extra contract definitions for the name static contracts
-  ;; that are used for this type. Since these are shared across multiple
-  ;; contracts from a single contract fixup pass, we use the name-defined
-  ;; table to see if we've already defined it. If so, we avoid duplicating
-  ;; the definition later.
-  (define extra-defs
-    (cond [(null? name-defs) null]
-          [else
-           (define names (apply append (dict-keys name-defs)))
-           (for/list ([name (in-list names)]
-                      [sc   (in-list (apply append (dict-values name-defs)))]
-                      #:unless (lookup-name-defined name))
-             (set-name-defined name)
-             #`(define #,name
-                 (recursive-contract #,(recur sc)
-                                     #,(kind->keyword (hash-ref recursive-kinds name)))))]))
-  (list (append ;; These contracts are sub-contract definitions used to
-                ;; increase sharing among contracts in a given fixup pass
-                extra-defs
-                (for/list ([sc (in-list (reverse sc-queue))])
-                  (match-define (cons id ctc) (hash-ref cache sc))
-                  #`(define #,id #,ctc)))
-        ctc))
-
-;; determine if a given name is free in the sc
-(define (name-free-in? name sc)
-  (let/ec escape
-    (define/match (free? sc _)
-      [((or (recursive-sc-use name*)
-            (parametric-var/sc: name*)
-            (name/sc: name*))
-        _)
-       (when (free-identifier=? name name*)
-         (escape #t))]
-      [(_ _) (sc-traverse sc free?)])
-    (free? sc 'dummy)
-    #f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/kinds.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/kinds.rkt
deleted file mode 100644
index d74d7d57a8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/kinds.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket/base
-
-;; Functions for the different kinds of contracts, which are represented by the symbols:
-;; 'flat, 'chaperone, and 'impersonator
-;;
-;; There is an ordering with 'flat < 'chaperone < 'impersonator.
-
-(require racket/match racket/contract)
-
-(provide
-  (contract-out
-    [contract-kind? predicate/c]
-    [contract-kind<= (contract-kind? contract-kind? . -> . boolean?)]
-    [kind->keyword (contract-kind? . -> . keyword?)]
-    [combine-kinds ((contract-kind?) #:rest (listof contract-kind?) . ->* . contract-kind?)]))
-
-(define (contract-kind? v)
-  (case v
-    ((flat chaperone impersonator) #t)
-    (else #f)))
-
-
-(define (contract-kind<= v1 v2)
-  (match* (v1 v2)
-    [('flat _) #t]
-    [('chaperone 'flat) #f]
-    [('chaperone (or 'chaperone 'impersonator)) #t]
-    [('impersonator (or 'flat 'chaperone)) #f]
-    [('impersonator 'impersonator) #t]))
-
-;; Computes the maximum over the supplied kinds.
-(define combine-kinds
-  (case-lambda
-    ((v) v)
-    ((v1 v2 . vs)
-     (define combined (if (contract-kind<= v1 v2) v2 v1))
-     (apply combine-kinds combined vs))))
-
-(define (kind->keyword kind)
-  (case kind
-    ((flat) '#:flat)
-    ((chaperone) '#:chaperone)
-    ((impersonator) '#:impersonator)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/optimize.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/optimize.rkt
deleted file mode 100644
index a20f9f5aaf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/optimize.rkt
+++ /dev/null
@@ -1,232 +0,0 @@
-#lang racket/base
-
-;; Functionality to optimize a static contract to provide faster checking.
-;; Also supports droping checks on either side.
-
-(require
-  "combinators.rkt"
-  "structures.rkt"
-  racket/set
-  racket/syntax
-  racket/dict
-  syntax/id-table
-  racket/list
-  racket/contract
-  racket/match)
-
-
-
-(provide
-  (contract-out
-    [optimize ((static-contract?) (#:trusted-positive boolean? #:trusted-negative boolean?)
-               . ->* . static-contract?)]))
-
-;; Reduce a static contract to a smaller simpler one that protects in the same way
-(define (reduce sc)
-  (match sc
-    ;; none/sc cases
-    [(listof/sc: (none/sc:)) empty-list/sc]
-    [(list/sc: sc1 ... (none/sc:) sc2 ...) none/sc]
-    [(set/sc: (none/sc:)) empty-set/sc]
-    [(syntax/sc: (none/sc:)) none/sc]
-    ;; The following are unsound because chaperones allow operations on these data structures to
-    ;; can call continuations and thus be useful even if they cannot return values.
-    ;[(vectorof/sc: (none/sc:)) empty-vector/sc]
-    ;[(vector/sc: sc1 ... (none/sc:) sc2 ...) none/sc]
-    ;[(box/sc: (none/sc:)) none/sc]
-    ;[(promise/sc: (none/sc:)) none/sc]
-    ;[(hash/sc: (none/sc:) value/sc) empty-hash/sc]
-    ;[(hash/sc: key/sc (none/sc:)) empty-hash/sc]
-
-    ;; any/sc cases
-    [(cons/sc: (any/sc:) (any/sc:)) cons?/sc]
-    [(listof/sc: (any/sc:)) list?/sc]
-    [(list/sc: (and scs (any/sc:)) ...) (list-length/sc (length scs))]
-    [(vectorof/sc: (any/sc:)) vector?/sc]
-    [(vector/sc: (and scs (any/sc:)) ...) (vector-length/sc (length scs))]
-    [(set/sc: (any/sc:)) set?/sc]
-    [(box/sc: (any/sc:)) box?/sc]
-    [(syntax/sc: (any/sc:)) syntax?/sc]
-    [(promise/sc: (any/sc:)) promise?/sc]
-    [(hash/sc: (any/sc:) (any/sc:)) hash?/sc]
-
-    ;; or/sc cases
-    [(or/sc: scs ...)
-     (match scs
-      [(list) none/sc]
-      [(list sc) sc]
-      [(? (λ (l) (member any/sc l))) any/sc]
-      [(? (λ (l) (member none/sc l)))
-       (apply or/sc (remove* (list none/sc) scs))]
-      [else sc])]
-
-    ;; and/sc cases
-    [(and/sc: scs ...)
-     (match scs
-      [(list) any/sc]
-      [(list sc) sc]
-      [(? (λ (l) (member none/sc l))) none/sc]
-      [(? (λ (l) (member any/sc l)))
-       (apply and/sc (remove* (list any/sc) scs))]
-      [else sc])]
-
-
-    ;; case->/sc cases
-    [(case->/sc: arrs ...)
-     (match arrs
-       ;; We can turn case->/sc contracts int ->* contracts in some cases.
-       [(list (arr/sc: args #f ranges) ...) (=> fail)
-        ;; All results must have the same range
-        (unless (equal? (set-count (apply set ranges)) 1)
-          (fail))
-        (define sorted-args (sort args (λ (l1 l2) (< (length l1) (length l2)))))
-        (define shortest-args (first sorted-args))
-        (define longest-args (last sorted-args))
-        ;; The number of arguments must increase by 1 with no gaps
-        (unless (equal? (map length sorted-args)
-                        (range (length shortest-args)
-                               (add1 (length longest-args))))
-          (fail))
-        ;; All arities must be prefixes of the longest arity
-        (unless (for/and ([args (in-list sorted-args)])
-                  (equal? args (take longest-args (length args))))
-          (fail))
-        ;; All the checks passed
-        (function/sc
-          (take longest-args (length shortest-args))
-          (drop longest-args (length shortest-args))
-          empty
-          empty
-          #f
-          (first ranges))]
-       [else sc])]
-
-
-
-    [else sc]))
-
-
-;; Reduce a static contract assuming that we trusted the current positive side
-(define (trusted-side-reduce sc)
-  (match sc
-    [(->/sc: mand-args opt-args mand-kw-args opt-kw-args rest-arg (list (any/sc:) ...))
-     (function/sc mand-args opt-args mand-kw-args opt-kw-args rest-arg #f)]
-    [(arr/sc: args rest (list (any/sc:) ...))
-     (arr/sc args rest #f)]
-    [(none/sc:) any/sc]
-    [(app sc-terminal-kind 'flat) any/sc]
-    [else sc]))
-
-
-
-(define (invert-side v)
-  (case v
-    [(positive) 'negative]
-    [(negative) 'positive]
-    [(both) 'both]))
-
-(define (combine-variance side var)
-  (case var
-    [(covariant) side]
-    [(contravariant) (invert-side side)]
-    [(invariant) 'both]))
-
-(define (remove-unused-recursive-contracts sc)
-  (define root (generate-temporary))
-  (define main-table (make-free-id-table))
-  (define (search)
-    (define table (make-free-id-table))
-    (define (recur sc variance)
-      (match sc
-        [(recursive-sc-use id)
-         (dict-set! table id #t)]
-        [(recursive-sc names values body)
-         (recur body 'covariant)
-         (for ([name (in-list names)]
-               [value (in-list values)])
-          (dict-set! main-table name ((search) value)))]
-        [else
-          (sc-traverse sc recur)]))
-    (lambda (sc)
-      (recur sc 'covariant)
-      table))
-  (define reachable ((search) sc))
-  (define seen (make-free-id-table reachable))
-  (let loop ((to-look-at reachable))
-    (unless (zero? (dict-count to-look-at))
-      (define new-table (make-free-id-table))
-      (for ([(id _) (in-dict to-look-at)])
-        (for ([(id _) (in-dict (dict-ref main-table id))])
-          (unless (dict-has-key? seen id)
-            (dict-set! seen id #t)
-            (dict-set! new-table id #t))))
-      (loop new-table)))
-
-  ;; Determine if the recursive name is referenced in the static contract
-  (define (unused? new-name sc)
-    (let/ec exit
-      (define (recur sc variance)
-        (match sc
-          [(recursive-sc-use (== new-name free-identifier=?))
-           (exit #f)]
-          [else
-            (sc-traverse sc recur)]))
-      (recur sc 'covariant)
-      #t))
-
-  (define (trim sc variance)
-    (match sc
-      [(recursive-sc names values body)
-       (define new-body (trim body 'covariant))
-
-       (define new-name-values
-         (for/list ([name (in-list names)]
-                    [value (in-list values)]
-                    #:when (dict-ref seen name #f))
-            (list name value)))
-       (define new-names (map first new-name-values))
-       (define new-values (map (λ (v) (trim v 'covariant))
-                               (map second new-name-values)))
-       (cond
-         [(empty? new-names) new-body]
-         [(and
-            (equal? (length new-names) 1)
-            (recursive-sc-use? new-body)
-            (free-identifier=? (first new-names) (recursive-sc-use-name new-body))
-            (unused? (first new-names) (first new-values)))
-          (first new-values)]
-         [else
-          (recursive-sc new-names new-values new-body)])]
-      [else
-        (sc-map sc trim)]))
-  (trim sc 'covariant))
-
-
-;; If we trust a specific side then we drop all contracts protecting that side.
-(define (optimize sc #:trusted-positive [trusted-positive #f] #:trusted-negative [trusted-negative #f])
-  ;; single-step: reduce and trusted-side-reduce if appropriate
-  (define (single-step sc side)
-    (define trusted
-      (case side
-        [(positive) trusted-positive]
-        [(negative) trusted-negative]
-        [(both) (and trusted-positive trusted-negative)]))
-
-    (reduce
-      (if trusted
-          (trusted-side-reduce sc)
-          sc)))
-
-  ;; full-pass: single-step at every static contract subpart
-  (define (full-pass sc)
-    (define ((recur side) sc variance)
-      (define new-side (combine-variance side variance))
-      (single-step (sc-map sc (recur new-side)) new-side))
-    ((recur 'positive) sc 'covariant))
-
-  ;; Do full passes until we reach a fix point, and then remove all unneccessary recursive parts
-  (let loop ((sc sc))
-    (define new-sc (full-pass sc))
-    (if (equal? sc new-sc)
-        (remove-unused-recursive-contracts new-sc)
-        (loop new-sc))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/parametric-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/parametric-check.rkt
deleted file mode 100644
index 6810dd10fb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/parametric-check.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang racket/base
-
-;; Implements a check that to determine if a part of a static contract has two (or more) parametric
-;; contracts as direct descendents.
-
-(require
-  racket/match
-  racket/contract
-  racket/dict
-  syntax/id-table
-  "structures.rkt"
-  "equations.rkt"
-  "combinators/parametric.rkt"
-  "combinators/structural.rkt")
-
-(provide
-  (contract-out
-    [parametric-check (static-contract? . -> . boolean?)]))
-
-
-(define (parametric-check sc)
-
-  (define eqs (make-equation-set))
-  (define vars (make-hash))
-  (define rec-vars (make-free-id-table))
-
-  (define (get-var sc)
-    (hash-ref! vars sc (lambda () (add-variable! eqs 0))))
-  (define (get-rec-var id)
-    (dict-ref! rec-vars id (lambda () (add-variable! eqs 0))))
-
-  (define seen (make-hash))
-
-  (define (recur sc variance)
-    (define seen? #f)
-    (match sc
-      ;; skip already seen sc
-      [(? (λ (sc) (hash-ref seen (list sc variance) #f)))
-       (set! seen? #t)]
-      [(or (or/sc: elems ...) (and/sc: elems ...))
-       (add-equation! eqs (get-var sc)
-                      (lambda () (for/sum ((e elems))
-                                   (variable-ref (get-var e)))))]
-      [(parametric-var/sc: id)
-       (add-equation! eqs (get-var sc) (lambda () 1))]
-      [(recursive-sc names values body)
-       (for ([name names] [value values])
-         (add-equation! eqs (get-rec-var name) (lambda () (variable-ref (get-var value)))))
-       (add-equation! eqs (get-var sc) (lambda () (variable-ref (get-var body))))]
-      [(recursive-sc-use id)
-       (add-equation! eqs (get-var sc) (lambda () (variable-ref (get-rec-var id))))]
-      [else
-       (get-var sc)])
-    (unless seen?
-      (hash-set! seen (list sc variance) #t)
-      (sc-traverse sc recur)))
-
-  (recur sc 'covariant)
-
-  (for/or ([(k v) (in-hash (resolve-equations eqs))]
-           #:when (>= v 2))
-    #t))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/structures.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/structures.rkt
deleted file mode 100644
index 549605b9d9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/structures.rkt
+++ /dev/null
@@ -1,162 +0,0 @@
-#lang racket/base
-
-;; Internal structures for representing a static contract.
-
-(require racket/match racket/list racket/generic 
-         racket/contract
-         "kinds.rkt" "constraints.rkt")
-
-(provide
-  (contract-out
-    (struct recursive-sc ([names (listof identifier?)]
-                          [values (listof static-contract?)]
-                          [body static-contract?]))
-    (struct recursive-sc-use ([name identifier?]))
-    (struct combinator ([args sequence?]))
-    (struct static-contract ())
-    [sc-map
-     (static-contract? (static-contract? variance/c . -> . static-contract?) . -> . static-contract?)]
-    [sc-traverse (static-contract? (static-contract? variance/c . -> . any/c) . -> . void?)]
-    [sc->contract (static-contract? (static-contract? . -> . syntax?) . -> . syntax?)]
-    [sc->constraints
-     (static-contract? (static-contract? . -> . contract-restrict?) . -> . contract-restrict?)]
-    [sc-terminal-kind (static-contract? . -> . (or/c #f contract-kind?))]
-    [sc? predicate/c])
-
-  prop:combinator-name
-  gen:sc)
-
-(define variance/c (or/c 'covariant 'contravariant 'invariant))
-
-(define (recursive-sc-write-proc v port mode)
-  (match-define (recursive-sc names vals body) v)
-  (define recur
-    (case mode
-      [(#t) write]
-      [(#f) display]
-      [else (lambda (p port) (print p port mode))]))
-  (define-values (open close)
-    (if (equal? mode 0)
-        (values "(" ")")
-        (values "#<" ">")))
-  (display open port)
-  (fprintf port "rec/sc")
-  (display " (" port)
-  (define (recur-pair name val)
-    (fprintf port "(~a " (syntax->datum name))
-    (recur val port)
-    (display ")" port))
-  (when (cons? names)
-    (recur-pair (first names) (first vals))
-    (for ((name (rest names))
-          (val (rest vals)))
-         (display " " port)
-         (recur-pair name val)))
-  (display ") " port)
-  (recur body port)
-  (display close port))
-
-(define (recursive-sc-use-write-proc v port mode)
-  (display (syntax->datum (recursive-sc-use-name v)) port))
-
-(define (combinator-write-proc v port mode)
-  (match-define (combinator args) v)
-  (define name (combinator-name v))
-  (define recur
-    (case mode
-      [(#t) write]
-      [(#f) display]
-      [else (lambda (p port) (print p port mode))]))
-  (define-values (open close)
-    (if (equal? mode 0)
-        (values "(" ")")
-        (values "#<" ">")))
-  (display open port)
-  (fprintf port name)
-  (for ((arg args))
-       (display " " port)
-       (recur arg port))
-  (display close port))
-
-(define-values (prop:combinator-name
-                has-combinator-name?
-                combinator-name)
-  (make-struct-type-property 'combinator-name
-    (lambda (v _) 
-      (unless (string? v)
-        (raise-argument-error
-          'prop:combinator-name
-          "string?"
-          v))
-      v)))
-
-;; Functionality that all static contracts should support
-(define-generics sc
-  ;; sc-map: static-contract? (static-contract? variance/c -> static-contract?) -> static-contract?
-  ;; Takes a static contract and returns a similar one.
-  ;; Each sub part should be replaced with the value of calling the supplied function on it. The
-  ;; variance argument should be how the sub part relates to the static contract.
-  [sc-map sc f]
-  ;; sc-traverse: static-contract? (static-contract? variance/c -> any/c) -> void?
-  ;; Takes a static contract and traverses it.  Each sub part should be called with supplied function.
-  ;; The variance argument should be how the sub part relates to the static contract.
-  [sc-traverse sc f]
-  ;; sc->contract: static-contract? (static-contract? -> contract?) -> contract?
-  ;; Takes a static contract and returns the corresponding contract.
-  ;; The function argument should be used for sub parts of the static contract.
-  [sc->contract sc f]
-  ;; sc->constraints: static-contract? (static-contract? -> constraint-set?) -> constraint-set?
-  ;; Takes a static contract and computes the constraint set for a static contract.
-  ;; The function argument should be used for sub parts of the static contract.
-  [sc->constraints sc f]
-  ;; sc-terminal-kind: static-contract? -> (or/c #f contract-kind?)
-  ;; Returns the kind of contract that this represents
-  ;; Returns #f if it is not a terminal contract
-  [sc-terminal-kind sc]
-  #:fallbacks
-  [(define (sc-terminal-kind v) #f)])
-
-;; Super struct of static contracts
-(struct static-contract ()
-        #:transparent
-        #:property prop:custom-print-quotable 'never)
-
-;; Represents a recursive contract.
-;; In each value and the body, each name is bound to a the corresponding value contract.
-;; - names : (listof identifier?)
-;; - values : (listof static-contract?)
-;; - body : static-contract?
-;; names and value must have the same length.
-(struct recursive-sc static-contract (names values body)
-        #:transparent
-        #:methods gen:sc
-          [(define (sc-map v f)
-             (match v
-               [(recursive-sc names values body)
-                (recursive-sc names (map (λ (v) (f v 'covariant)) values) (f body 'covariant))]))
-           (define (sc-traverse v f)
-             (match v
-               [(recursive-sc names values body)
-                (for-each (λ (v) (f v 'covariant)) values)
-                (f body 'covariant)
-                (void)]))]
-        #:methods gen:custom-write [(define write-proc recursive-sc-write-proc)])
-
-;; A use of a contract bound by recursive-sc
-;; - name : identifier?
-(struct recursive-sc-use static-contract (name)
-        #:transparent
-        #:methods gen:sc
-          [(define (sc-map v f) v)
-           (define (sc-traverse v f) (void))
-           (define (sc->contract v f) (recursive-sc-use-name v))
-           (define (sc->constraints v f) (variable-contract-restrict (recursive-sc-use-name v)))]
-        #:methods gen:custom-write [(define write-proc recursive-sc-use-write-proc)])
-
-;; Super struct of static contract combinators.
-;; Provides printing functionality.
-;; - args : (sequenceof static-contract?)
-(struct combinator static-contract (args)
-        #:transparent
-        #:property prop:combinator-name "combinator/sc"
-        #:methods gen:custom-write [(define write-proc combinator-write-proc)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/terminal.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/terminal.rkt
deleted file mode 100644
index ce224d5bf9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/terminal.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-
-;; Utilities for defining static contracts that have internal structure but have no sub static
-;; contracts. Example: (length/sc 1).
-
-(require
-  "structures.rkt"
-  "constraints.rkt"
-   racket/match
-  (for-syntax
-    racket/base
-    syntax/parse))
-
-(provide
-  define-terminal-sc)
-
-(begin-for-syntax
-  (define-syntax-class kind-keyword
-    [pattern #:flat #:with sym 'flat]
-    [pattern #:chaperone #:with sym 'chaperone]
-    [pattern #:impersonator #:with sym 'impersonator])
-
-  (define-splicing-syntax-class printer
-    [pattern (~seq #:printer (v p mode) body)
-      #:with (methods ...) #'(#:methods gen:custom-write [(define (write-proc v p mode) body)])]
-    [pattern (~seq)
-      #:with (methods ...) #'()])
-
-  )
-
-
-(define-syntax (define-terminal-sc stx)
-  (syntax-parse stx
-    [(_ name:id (args:id ...) kind:kind-keyword p:printer body:expr)
-     #'(struct name static-contract (args ...)
-         #:transparent
-         p.methods ...
-         #:methods gen:sc
-          [(define (sc-map v f) v)
-           (define (sc-traverse v f) (void))
-           (define (sc->contract v unused-f)
-             (match-define (name args ...) v)
-             body)
-           (define (sc->constraints v f) (simple-contract-restrict 'kind.sym))
-           (define (sc-terminal-kind v) 'kind.sym)])]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/tc-setup.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/tc-setup.rkt
deleted file mode 100644
index d749e8f05e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/tc-setup.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-
-(require "utils/utils.rkt"
-         syntax/stx
-         racket/pretty racket/promise racket/lazy-require
-         (env type-name-env type-alias-env mvar-env)
-         (utils tc-utils disarm mutated-vars lift)
-         "standard-inits.rkt"
-         (for-syntax racket/base)
-         (for-template racket/base))
-(lazy-require [typed-racket/optimizer/optimizer (optimize-top)])
-(lazy-require [typed-racket/typecheck/tc-toplevel (tc-toplevel-form tc-module)])
-
-(provide maybe-optimize init-current-type-names
-         tc-module/full
-         tc-toplevel/full)
-
-(define (maybe-optimize body)
-  ;; do we optimize?
-  (if (optimize?)
-      (begin
-        (do-time "Starting optimizer")
-        (begin0 (stx-map optimize-top body)
-          (do-time "Optimized")))
-      body))
-
-;; -> Promise<Dict<Name, Type>>
-;; initialize the type names for printing
-(define (init-current-type-names)
-  (lazy
-   (append
-    (type-name-env-map (lambda (id ty)
-                         (cons (syntax-e id) ty)))
-    (type-alias-env-map (lambda (id ty)
-                          (cons (syntax-e id) ty))))))
-
-(define-logger online-check-syntax)
-
-(define (tc-setup orig-stx stx expand-ctxt do-expand checker k)
-  (set-box! typed-context? #t)
-  ;(start-timing (syntax-property stx 'enclosing-module-name))
-  (with-handlers
-      (#;[(λ (e) (and (exn:fail? e) (not (exn:fail:syntax? e)) (not (exn:fail:filesystem? e))))
-          (λ (e) (tc-error "Internal Typed Racket Error : ~a" e))])
-    (parameterize (;; do we report multiple errors
-                   [delay-errors? #t]
-                   ;; do we print the fully-expanded syntax?
-                   [print-syntax? #f]
-                   ;; this parameter is just for printing types
-                   ;; this is a parameter to avoid dependency issues
-                   [current-type-names (init-current-type-names)]
-                   ;; reinitialize disappeared uses
-                   [disappeared-use-todo      null]
-                   [disappeared-bindings-todo null])
-      (define fully-expanded-stx (disarm* (do-expand stx expand-ctxt (list #'module*))))
-      (when (show-input?)
-        (pretty-print (syntax->datum fully-expanded-stx)))
-      (do-time "Local Expand Done")
-      (let ([exprs (syntax->list (syntax-local-introduce fully-expanded-stx))])
-        (when (pair? exprs)
-          (log-message online-check-syntax-logger
-                       'info
-                       "TR's expanded syntax objects; this message is ignored"
-                       (cdr exprs))))
-      ;; We do standard inits here because it is costly (~250 msec), and we want
-      ;; expansion errors to happen with out paying that cost
-      (do-standard-inits)
-      (do-time "Initialized Envs")
-      (find-mutated-vars fully-expanded-stx mvar-env)
-      (parameterize ([orig-module-stx (or (orig-module-stx) orig-stx)]
-                     [expanded-module-stx fully-expanded-stx])
-        (do-time "Starting `checker'")
-        (call-with-values (λ () (checker fully-expanded-stx))
-          (λ results
-            (do-time "Typechecking Done")
-            (apply k fully-expanded-stx results)))))))
-
-(define (tc-toplevel/full orig-stx stx k)
-  (tc-setup orig-stx stx 'top-level local-expand/capture* tc-toplevel-form k))
-
-(define (tc-module/full orig-stx stx k)
-  (tc-setup orig-stx stx 'module-begin local-expand tc-module k))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-below.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-below.rkt
deleted file mode 100644
index 006d3851ff..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-below.rkt
+++ /dev/null
@@ -1,236 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         racket/match (prefix-in - (contract-req))
-         racket/format
-         (types utils union subtype filter-ops abbrev)
-         (utils tc-utils)
-         (rep type-rep object-rep filter-rep)
-         (only-in (types printer) pretty-format-type))
-
-(provide/cond-contract
- [check-below (-->i ([s (-or/c Type/c full-tc-results/c)]
-                     [t (s) (if (Type/c? s) Type/c tc-results/c)])
-                    [_ (s) (if (Type/c? s) Type/c full-tc-results/c)])]
- [cond-check-below (-->i ([s (-or/c Type/c full-tc-results/c)]
-                          [t (s) (-or/c #f (if (Type/c? s) Type/c tc-results/c))])
-                         [_ (s) (-or/c #f (if (Type/c? s) Type/c full-tc-results/c))])]
- [fix-results (--> tc-results/c full-tc-results/c)]
- [type-mismatch (-->* ((-or/c Type/c string?) (-or/c Type/c string?))
-                      ((-or/c string? #f))
-                      -any)])
-
-(define (print-object o)
-  (match o
-    [(or (NoObject:) (Empty:)) "no object"]
-    [_ (format "object ~a" o)]))
-
-;; If expected is #f, then just return tr1
-;; else behave as check-below
-(define (cond-check-below tr1 expected)
-  (if expected (check-below tr1 expected) tr1))
-
-;; type-mismatch : Any Any [String] -> Void
-;; Type errors with "type mismatch", arguments may be types or other things
-;; like the length of a list of types
-(define (type-mismatch t1 t2 [more #f])
-  (define t1* (if (Type/c? t1) (pretty-format-type t1 #:indent 12) t1))
-  (define t2* (if (Type/c? t2) (pretty-format-type t2 #:indent 9) t2))
-  (tc-error/fields "type mismatch" #:more more "expected" t1* "given" t2* #:delayed? #t))
-
-;; value-mismatch : tc-results/c tc-results/c -> void?
-;; Helper to print messages of the form
-;;   "Expecte n values, but got m values"
-(define (value-mismatch expected actual)
-  (define (value-string ty)
-    (match ty
-      [(tc-result1: _) "1 value"]
-      [(tc-results: ts) (~a (length ts) " values")]
-      ;; TODO simplify this case
-      [(tc-results: ts _ _ dty _) (~a (length ts) " " (if (= (length ts) 1) "value" "values")
-                                      " and `" dty " ...'")]
-      [(tc-any-results: _) "unknown number"]))
-  (type-mismatch
-    (value-string expected) (value-string actual)
-    "mismatch in number of values"))
-
-;; expected-but-got : (U Type String) (U Type String) -> Void
-;;
-;; Helper to print messages of the form
-;;   "Expected a, but got b"
-;;
-;; Also handles cases like two type variables that
-;; have the same name.
-(define (expected-but-got t1 t2)
-  (match* (t1 t2)
-    [((F: s1) (F: s2))
-     (=> fail)
-     (unless (string=? (symbol->string s1) (symbol->string s2))
-       (fail))
-     ;; FIXME: this case could have a better error message that, say,
-     ;;        prints the binding locations of each type variable.
-     (type-mismatch (format "`~a'" t1) (format "a different `~a'" t2)
-                    "type variables bound in different scopes")]
-    [(_ _) (type-mismatch t1 t2)]))
-
-;; fix-filter: FilterSet [FilterSet] -> FilterSet
-;; Turns NoFilter into the actual filter; leaves other filters alone.
-(define (fix-filter f [f2 -top-filter])
-  (match f
-    [(NoFilter:) f2]
-    [else f]))
-
-;; fix-object: Object [Object] -> Object
-;; Turns NoObject into the actual object; leaves other objects alone.
-(define (fix-object o [o2 -empty-obj])
-  (match o
-    [(NoObject:) o2]
-    [else o]))
-
-;; fix-results: tc-results -> tc-results
-;; Turns NoObject/NoFilter into the Empty/TopFilter
-(define (fix-results r)
-  (match r
-    [(tc-any-results: f) (tc-any-results (fix-filter f -top))]
-    [(tc-results: ts fs os)
-     (ret ts (map fix-filter fs) (map fix-object os))]
-    [(tc-results: ts fs os dty dbound)
-     (ret ts (map fix-filter fs) (map fix-object os) dty dbound)]))
-
-(define (fix-results/bottom r)
-  (match r
-    [(tc-any-results: f) (tc-any-results (fix-filter f -bot))]
-    [(tc-results: ts fs os)
-     (ret ts (for/list ([f fs]) (fix-filter f -bot-filter)) (map fix-object os))]
-    [(tc-results: ts fs os dty dbound)
-     (ret ts (for/list ([f fs]) (fix-filter f -bot-filter)) (map fix-object os) dty dbound)]))
-
-
-
-;; check-below : (/\ (Results Type -> Result)
-;;                   (Results Results -> Result)
-;;                   (Type Results -> Type)
-;;                   (Type Type -> Type))
-(define (check-below tr1 expected)
-  (define (filter-set-better? f1 f2)
-    (match* (f1 f2)
-      [(f f) #t]
-      [(f (NoFilter:)) #t]
-      [((FilterSet: f1+ f1-) (FilterSet: f2+ f2-))
-       (and (implied-atomic? f2+ f1+)
-            (implied-atomic? f2- f1-))]
-      [(_ _) #f]))
-  (define (object-better? o1 o2)
-    (match* (o1 o2)
-      [(o o) #t]
-      [(o (or (NoObject:) (Empty:))) #t]
-      [(_ _) #f]))
-  (define (filter-better? f1 f2)
-    (or (NoFilter? f2)
-        (implied-atomic? f2 f1)))
-
-  (match* (tr1 expected)
-    ;; This case has to be first so that bottom (exceptions, etc.) can be allowed in cases
-    ;; where multiple values are expected.
-    ;; We can ignore the filters and objects in the actual value because they would never be about a value
-    [((tc-result1: (? (lambda (t) (type-equal? t (Un))))) _)
-     (fix-results/bottom expected)]
-
-    [((tc-any-results: f1) (tc-any-results: f2))
-     (unless (filter-better? f1 f2)
-       (type-mismatch f2 f1 "mismatch in filter"))
-     (tc-any-results (fix-filter f2 f1))]
-
-    [((or (tc-results: _ (list (FilterSet: fs+ fs-) ...) _)
-          (tc-results: _ (list (FilterSet: fs+ fs-) ...) _ _ _))
-      (tc-any-results: f2))
-     (define merged-filter (apply -and (map -or fs+ fs-)))
-     (unless (filter-better? merged-filter f2)
-       (type-mismatch f2 merged-filter "mismatch in filter"))
-     (tc-any-results (fix-filter f2 merged-filter))]
-
-
-    [((tc-result1: t1 f1 o1) (tc-result1: t2 f2 o2))
-     (cond
-       [(not (subtype t1 t2))
-        (expected-but-got t2 t1)]
-       [(and (not (filter-set-better? f1 f2))
-             (object-better? o1 o2))
-        (type-mismatch f2 f1 "mismatch in filter")]
-       [(and (filter-set-better? f1 f2)
-             (not (object-better? o1 o2)))
-        (type-mismatch (print-object o2) (print-object o1) "mismatch in object")]
-       [(and (not (filter-set-better? f1 f2))
-             (not (object-better? o1 o2)))
-        (type-mismatch (format "`~a' and `~a'" f2 (print-object o2))
-                       (format "`~a' and `~a'" f1 (print-object o1))
-                       "mismatch in filter and object")])
-     (ret t2 (fix-filter f2 f1) (fix-object o2 o1))]
-
-    ;; case where expected is like (Values a ... a) but got something else
-    [((tc-results: t1 f1 o1) (tc-results: t2 f2 o2 dty dbound))
-     (value-mismatch expected tr1)
-     (fix-results expected)]
-
-    ;; case where you have (Values a ... a) but expected something else
-    [((tc-results: t1 f1 o1 dty dbound) (tc-results: t2 f2 o2))
-     (value-mismatch expected tr1)
-     (fix-results expected)]
-
-    [((tc-results: t1 f1 o1 dty1 dbound)
-      (tc-results: t2 (list (or (NoFilter:) (FilterSet: (Top:) (Top:))) ...)
-                      (list (or (NoObject:) (Empty:)) ...) dty2 dbound))
-     (cond
-       [(= (length t1) (length t2))
-        (unless (andmap subtype t1 t2)
-          (expected-but-got (stringify t2) (stringify t1)))
-        (unless (subtype dty1 dty2)
-          (type-mismatch dty2 dty1 "mismatch in ... argument"))]
-       [else
-         (value-mismatch expected tr1)])
-     (fix-results expected)]
-
-    [((tc-results: t1 f1 o1 dty1 dbound) (tc-results: t2 f2 o2 dty2 dbound))
-     (cond
-       [(= (length t1) (length t2))
-        (unless (andmap subtype t1 t2)
-          (expected-but-got (stringify t2) (stringify t1)))
-        (unless (subtype dty1 dty2)
-          (type-mismatch dty2 dty1 "mismatch in ... argument"))]
-       [else
-         (value-mismatch expected tr1)])
-     (fix-results expected)]
-
-    [((tc-results: t1 f1 o1)
-      (tc-results: t2 (list (or (NoFilter:) (FilterSet: (Top:) (Top:))) ...)
-                      (list (or (NoObject:) (Empty:)) ...)))
-     (unless (= (length t1) (length t2))
-       (value-mismatch expected tr1))
-     (unless (for/and ([t (in-list t1)] [s (in-list t2)]) (subtype t s))
-       (expected-but-got (stringify t2) (stringify t1)))
-     (fix-results expected)]
-
-    [((tc-results: t1 fs os) (tc-results: t2 fs os))
-     (unless (= (length t1) (length t2))
-       (value-mismatch expected tr1))
-     (unless (for/and ([t (in-list t1)] [s (in-list t2)]) (subtype t s))
-       (expected-but-got (stringify t2) (stringify t1)))
-     (fix-results expected)]
-
-    [((tc-results: t1 f1 o1) (tc-results: t2 f2 o2)) (=> continue)
-     (if (= (length t1) (length t2))
-         (continue)
-         (value-mismatch expected tr1))
-     (fix-results expected)]
-
-    [((tc-any-results: _) (? tc-results?))
-     (value-mismatch expected tr1)
-     (fix-results expected)]
-
-    [((? Type/c? t1) (? Type/c? t2))
-     (unless (subtype t1 t2)
-       (expected-but-got t2 t1))
-     expected]
-    [((tc-results: ts fs os dty dbound) (tc-results: ts* fs* os* dty* dbound*))
-     (int-err "dotted types with different bounds/filters/objects in check-below nyi: ~a ~a" tr1 expected)]
-    [(a b) (int-err "unexpected input for check-below: ~a ~a" a b)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt
deleted file mode 100644
index c137d03b88..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt
+++ /dev/null
@@ -1,1528 +0,0 @@
-#lang racket/unit
-
-;; This module provides a unit for type-checking classes
-
-(require "../utils/utils.rkt"
-         racket/dict
-         racket/format
-         racket/list
-         racket/match
-         racket/set
-         syntax/parse
-         syntax/stx
-         "signatures.rkt"
-         (private parse-type syntax-properties)
-         (env lexical-env tvar-env global-env)
-         (types utils abbrev union subtype resolve generalize)
-         (typecheck check-below internal-forms)
-         (utils tc-utils)
-         (rep type-rep)
-         (for-syntax racket/base)
-         (for-template racket/base
-                       (private class-literals)
-                       (typecheck internal-forms)))
-
-(import tc-if^ tc-lambda^ tc-app^ tc-let^ tc-expr^)
-(export check-class^)
-
-;; A super-init-stxs is a
-;;   (super-init-stxs (Listof Syntax) (Dict Symbol Syntax))
-;;
-;; interp. Represents the by-position and by-name initialization
-;;         arguments respectively provided by the class
-(struct super-init-stxs (by-position by-name) #:transparent)
-
-;; time debugging
-(define-syntax do-timing #f)
-(define start-time (make-parameter 0))
-(define-syntax (with-timing stx)
-  (syntax-case stx ()
-    [(with-timing e ...)
-     (if (syntax-local-value #'do-timing)
-         #'(begin
-             (log-info "TR class start timing")
-             (parameterize ([start-time (current-inexact-milliseconds)])
-               e ...))
-         #'(begin e ...))]))
-
-(define-syntax (do-timestamp stx)
-  (syntax-case stx ()
-    [(_ str)
-     (if (syntax-local-value #'do-timing)
-         #'(log-info
-            (format "TR class time @ ~a: ~a"
-                    str (- (current-inexact-milliseconds) (start-time))))
-         #'(void))]))
-
-;; Syntax classes for use in functions below
-(define-syntax-class name-pair
-  (pattern (internal:id external:id)))
-
-(define-syntax-class internal-class-data
-  #:literal-sets (kernel-literals)
-  #:literals (class-internal values)
-  (pattern (let-values ([() (begin (quote-syntax
-                                    (class-internal
-                                     (#:forall type-parameter:id ...)
-                                     (#:all-inits all-init-names:id ...)
-                                     (#:init init-names:name-pair ...)
-                                     (#:init-field init-field-names:name-pair ...)
-                                     (#:init-rest (~optional init-rest-name:id))
-                                     (#:optional-init optional-names:id ...)
-                                     (#:field field-names:name-pair ...)
-                                     (#:public public-names:name-pair ...)
-                                     (#:override override-names:name-pair ...)
-                                     (#:private privates:id ...)
-                                     (#:private-field private-fields:id ...)
-                                     (#:inherit inherit-names:name-pair ...)
-                                     (#:inherit-field inherit-field-names:name-pair ...)
-                                     (#:augment augment-names:name-pair ...)
-                                     (#:pubment pubment-names:name-pair ...)))
-                                   (#%plain-app values))])
-             _)
-           #:with type-parameters #'(type-parameter ...)
-           #:with all-init-internals #'(all-init-names ...)
-           #:with init-internals #'(init-names.internal ...)
-           #:with init-externals #'(init-names.external ...)
-           #:with init-field-internals #'(init-field-names.internal ...)
-           #:with init-field-externals #'(init-field-names.external ...)
-           #:with optional-inits #'(optional-names ...)
-           #:with field-internals #'(field-names.internal ...)
-           #:with field-externals #'(field-names.external ...)
-           #:with public-internals #'(public-names.internal ...)
-           #:with public-externals #'(public-names.external ...)
-           #:with override-internals #'(override-names.internal ...)
-           #:with override-externals #'(override-names.external ...)
-           #:with inherit-externals #'(inherit-names.external ...)
-           #:with inherit-internals #'(inherit-names.internal ...)
-           #:with inherit-field-externals #'(inherit-field-names.external ...)
-           #:with inherit-field-internals #'(inherit-field-names.internal ...)
-           #:with augment-externals #'(augment-names.external ...)
-           #:with augment-internals #'(augment-names.internal ...)
-           #:with pubment-externals #'(pubment-names.external ...)
-           #:with pubment-internals #'(pubment-names.internal ...)
-           #:with private-names #'(privates ...)
-           #:with private-field-names #'(private-fields ...)))
-
-(define-syntax-class initializer-body
-  #:literals (letrec-syntaxes+values)
-  #:attributes (val)
-  (pattern (letrec-syntaxes+values _ _ body:initializer-body)
-           #:with val #'body.val)
-  (pattern (letrec-syntaxes+values _ _
-             (~and e0 (~not letrec-syntaxes+values))
-             e:expr ...)
-           #:with val #'(e0 e ...)))
-
-(define-syntax-class initializer-class
-  #:literals (#%plain-lambda)
-  #:attributes (initializer-body initializer-self-id
-                initializer-args-id)
-  (pattern (#%plain-lambda
-            (self:id super-go:id si_c:id si_inited?:id
-                     si_leftovers:id init-args:id)
-            body:initializer-body)
-           #:with initializer-body #'body.val
-           #:with initializer-self-id #'self
-           #:with initializer-args-id #'init-args))
-
-(define-syntax-class make-methods-body
-  #:literals (let-values letrec-syntaxes+values #%plain-app values)
-  #:attributes (initializer-body initializer-self-id
-                initializer-args-id)
-  (pattern (letrec-values _
-            (#%plain-app
-             values
-             public:expr
-             override:expr
-             augride:expr
-             :initializer-class)))
-  (pattern (let-values () :make-methods-body))
-  (pattern (letrec-syntaxes+values _ _ :make-methods-body)))
-
-(define-syntax-class make-methods-class
-  #:literals (let-values #%plain-lambda)
-  #:attributes (initializer-body initializer-self-id
-                initializer-args-id)
-  (pattern (#%plain-lambda
-            (local-accessor:id local-mutator:id local-method-or-field:id ...)
-            (let-values ([(field-name:id) accessor-or-mutator] ...)
-              :make-methods-body))))
-
-(define-syntax-class class-expansion
-  #:literals (let-values letrec-syntaxes+values #%plain-app quote)
-  #:attributes (superclass-expr
-                make-methods
-                initializer-body
-                initializer-self-id
-                initializer-args-id)
-  (pattern (#%plain-app
-            compose-class:id
-            name:expr
-            superclass-expr:expr
-            interface-expr:expr
-            internal:expr ...
-            (~and make-methods :make-methods-class)
-            (quote :boolean)
-            (quote #f))))
-
-;; This is similar to `type-declaration` from "internal-forms.rkt", but
-;; the expansion is slightly different in a class so we use this instead.
-(define-syntax-class class-type-declaration
-  #:literal-sets (kernel-literals)
-  #:literals (values void :-internal)
-  #:attributes (name type)
-  (pattern (let-values
-             ([() (begin (quote-syntax (:-internal name:id type:expr))
-                         (#%plain-app values))])
-             (#%plain-app void))))
-
-;; Syntax Option<TCResults> -> TCResults
-;; Type-check a class form by trawling its innards
-;;
-;; Assumptions:
-;;  by the time this is called, we can be sure that
-;;  method clauses match up to a corresponding definition
-;;  by the local-expansion done by `class`
-;;
-;;  we know by this point that #'form is an actual typed
-;;  class produced by `class` due to the syntax property
-(define (check-class form [expected #f])
-  (define expected-type
-    (match expected
-      [(tc-result1: type) (resolve type)]
-      [_ #f]))
-  (match expected-type
-    [(? Class? class-type)
-     (ret (parse-and-check form class-type))]
-    [(Poly-names: ns body-type)
-     (match (check-class form (ret body-type))
-       [(tc-result1: t f o)
-        (ret (make-Poly ns t) f o)])]
-    [_ (ret (parse-and-check form #f))]))
-
-;; Syntax Option<Type> -> Type
-;; Parse the syntax and extract useful information to pass to the
-;; main type-checking helper function
-(define (parse-and-check form expected)
-  (syntax-parse form
-    ;; Inspect the expansion of the class macro for the pieces that
-    ;; we need to type-check like superclass, methods, top-level
-    ;; expressions and so on
-    [cls:class-expansion
-     ;; Make sure the superclass is a class
-     ;; FIXME: maybe should check the property on this expression
-     ;;        as a sanity check too
-     (define super-type (tc-expr #'cls.superclass-expr))
-     (define class-name-table
-       (car (trawl-for-property #'cls.make-methods tr:class:name-table-property)))
-     (syntax-parse class-name-table
-       [tbl:internal-class-data
-        ;; Save parse attributes to pass through to helper functions
-        (define type-parameters (syntax->datum #'tbl.type-parameters))
-        (define fresh-parameters (map gensym type-parameters))
-        (define parse-info
-          (hash 'type-parameters     type-parameters
-                'fresh-parameters    fresh-parameters
-                'superclass-expr     #'cls.superclass-expr
-                'make-methods        #'cls.make-methods
-                'initializer-self-id #'cls.initializer-self-id
-                'initializer-args-id #'cls.initializer-args-id
-                'initializer-body    #'cls.initializer-body
-                'optional-inits      (syntax->datum #'tbl.optional-inits)
-                'only-init-internals (syntax->datum #'tbl.init-internals)
-                'only-init-names     (syntax->datum #'tbl.init-externals)
-                ;; the order of these names reflect the order in the class,
-                ;; so use this list when retaining the order is important
-                'init-internals      (syntax->datum #'tbl.all-init-internals)
-                'init-rest-name     (and (attribute tbl.init-rest-name)
-                                         (syntax-e (attribute tbl.init-rest-name)))
-                'public-internals   (syntax->datum #'tbl.public-internals)
-                'override-internals (syntax->datum #'tbl.override-internals)
-                'pubment-internals  (syntax->datum #'tbl.pubment-internals)
-                'augment-internals  (syntax->datum #'tbl.augment-internals)
-                'method-internals
-                (set-union (syntax->datum #'tbl.public-internals)
-                           (syntax->datum #'tbl.override-internals))
-                'field-internals
-                (set-union (syntax->datum #'tbl.field-internals)
-                           (syntax->datum #'tbl.init-field-internals))
-                'inherit-internals
-                (syntax->datum #'tbl.inherit-internals)
-                'inherit-field-internals
-                (syntax->datum #'tbl.inherit-field-internals)
-                'init-names
-                (set-union (syntax->datum #'tbl.init-externals)
-                           (syntax->datum #'tbl.init-field-externals))
-                'field-names
-                (set-union (syntax->datum #'tbl.field-externals)
-                           (syntax->datum #'tbl.init-field-externals))
-                'public-names   (syntax->datum #'tbl.public-externals)
-                'override-names (syntax->datum #'tbl.override-externals)
-                'pubment-names  (syntax->datum #'tbl.pubment-externals)
-                'augment-names  (syntax->datum #'tbl.augment-externals)
-                'inherit-names  (syntax->datum #'tbl.inherit-externals)
-                'inherit-field-names
-                (syntax->datum #'tbl.inherit-field-externals)
-                'private-names  (syntax->datum #'tbl.private-names)
-                'private-fields (syntax->datum #'tbl.private-field-names)
-                'overridable-names
-                (set-union (syntax->datum #'tbl.public-externals)
-                           (syntax->datum #'tbl.override-externals))
-                'augmentable-names
-                (set-union (syntax->datum #'tbl.pubment-externals)
-                           (syntax->datum #'tbl.augment-externals))
-                'method-names
-                (set-union (syntax->datum #'tbl.public-externals)
-                           (syntax->datum #'tbl.override-externals)
-                           (syntax->datum #'tbl.augment-externals)
-                           (syntax->datum #'tbl.pubment-externals))
-                'all-internal
-                (append (syntax->datum #'tbl.init-internals)
-                        (syntax->datum #'tbl.init-field-internals)
-                        (syntax->datum #'tbl.field-internals)
-                        (syntax->datum #'tbl.public-internals)
-                        (syntax->datum #'tbl.override-internals)
-                        (syntax->datum #'tbl.inherit-internals)
-                        (syntax->datum #'tbl.inherit-field-internals)
-                        (syntax->datum #'tbl.pubment-internals)
-                        (syntax->datum #'tbl.augment-internals))
-                'all-external
-                (append (syntax->datum #'tbl.init-externals)
-                        (syntax->datum #'tbl.init-field-externals)
-                        (syntax->datum #'tbl.field-externals)
-                        (syntax->datum #'tbl.public-externals)
-                        (syntax->datum #'tbl.override-externals)
-                        (syntax->datum #'tbl.inherit-externals)
-                        (syntax->datum #'tbl.inherit-field-externals)
-                        (syntax->datum #'tbl.pubment-externals)
-                        (syntax->datum #'tbl.augment-externals))))
-        (with-timing
-          (do-timestamp (format "methods ~a" (dict-ref parse-info 'method-names)))
-          (extend-tvars/new type-parameters fresh-parameters
-                            (do-check expected super-type parse-info)))])]))
-
-;; do-check : Type Type Dict -> Type
-;; The actual type-checking
-(define (do-check expected super-type parse-info)
-  ;; unpack superclass names and types
-  (define-values (super-row super-inits super-fields
-                  super-methods super-augments super-init-rest)
-    (match super-type
-      [(tc-result1: t)
-       (match (resolve t)
-         [(Class: super-row super-inits super-fields
-                  super-methods super-augments super-init-rest)
-          (values super-row super-inits super-fields
-                  super-methods super-augments super-init-rest)]
-         [t
-          (tc-error/fields "type mismatch"
-                           #:more "superclass expression should produce a class"
-                           #:stx (hash-ref parse-info 'superclass-expr)
-                           #:delayed? #t
-                           "expected" "a class"
-                           "given" t)
-          (values #f null null null null #f)])]
-      [_ (int-err "Unhandled result")]))
-  (define super-init-names    (dict-keys super-inits))
-  (define super-field-names   (dict-keys super-fields))
-  (define super-method-names  (dict-keys super-methods))
-  (define super-augment-names (dict-keys super-augments))
-  ;; establish a mapping between internal and external names
-  (define internal-external-mapping
-    (for/hash ([internal (hash-ref parse-info 'all-internal)]
-               [external (hash-ref parse-info 'all-external)])
-      (values internal external)))
-  ;; trawl the body for top-level expressions
-  (define make-methods-stx (hash-ref parse-info 'make-methods))
-  (define top-level-exprs
-    (trawl-for-property make-methods-stx tr:class:top-level-property))
-
-  ;; Filter top level expressions into several groups, each processed
-  ;; into appropriate data structures
-  ;;
-  ;; Augment annotations go in their own table, because they're
-  ;; the only kind of type annotation that is allowed to be duplicate
-  ;; (i.e., m can have type Integer -> Integer and an augment type of
-  ;;          String -> String in the separate tables)
-  (define-values (super-new annotation-table augment-annotation-table
-                  other-top-level-exprs)
-    (handle-top-levels top-level-exprs))
-
-  (setup-pubment-defaults (hash-ref parse-info 'pubment-names)
-                          annotation-table
-                          augment-annotation-table)
-
-  ;; Calculate remaining inits, optional inits, etc.
-  (check-by-name super-new super-inits)
-
-  ;; super-init-rest* - The init-rest passed to the `infer-self-type` function.
-  ;;                    This reflects any changes to the `super-init-rest` type
-  ;;                    that are necessary due to the super constructor call in
-  ;;                    this class.
-  (define-values (super-init-rest* remaining-super-inits)
-    (handle-pos-inits super-new super-inits super-init-rest))
-
-  ;; define which init names are optional
-  (define optional-inits (hash-ref parse-info 'optional-inits))
-  (define optional-external (for/set ([n optional-inits])
-                              (dict-ref internal-external-mapping n)))
-  (define optional-super
-    (for/set ([(name val) (in-dict remaining-super-inits)]
-              #:when (cadr val))
-      name))
-  ;; Type for self in method calls
-  (define self-type
-    (infer-self-type parse-info
-                     super-row
-                     expected
-                     annotation-table
-                     augment-annotation-table
-                     optional-inits
-                     internal-external-mapping
-                     remaining-super-inits
-                     super-fields
-                     super-methods
-                     super-augments
-                     super-init-rest*))
-  (match-define (Instance: (Class: _ inits fields methods augments init-rest))
-                self-type)
-  (do-timestamp "built self type")
-  ;; trawl the body for the local name table
-  (define locals
-    (trawl-for-property make-methods-stx tr:class:local-table-property))
-  (define-values (local-method-table local-private-table local-field-table
-                  local-private-field-table local-init-table
-                  local-init-rest-table
-                  local-inherit-table local-inherit-field-table
-                  local-super-table
-                  local-augment-table local-inner-table)
-    (construct-local-mapping-tables (car locals)))
-
-  ;; trawl the body and find methods and private field definitions
-  (define def-stxs
-    (trawl-for-property make-methods-stx tr:class:def-property))
-  ;; FIXME: private field names should be stored as identifiers since
-  ;;        it's possible to have the same symbolic name for them
-  (define private-field-names (hash-ref parse-info 'private-fields))
-  (define-values (private-field-stxs method-stxs)
-    (for/fold ([private-field-stxs null]
-               [method-stxs null])
-              ([def-stx (in-list def-stxs)])
-      (define name/names (tr:class:def-property def-stx))
-      (if (stx-pair? name/names)
-          (values (cons def-stx private-field-stxs) method-stxs)
-          (if ;; FIXME: see above on syntax-e
-              (memq (syntax-e name/names) private-field-names)
-              (values (cons def-stx private-field-stxs) method-stxs)
-              (values private-field-stxs (cons def-stx method-stxs))))))
-
-  ;; types for private elements
-  (define private-method-types
-    (for/hash ([(name type) (in-dict annotation-table)]
-               #:when (set-member? (hash-ref parse-info 'private-names) name))
-      (values name type)))
-  (define private-field-types (make-hash))
-  (for ([(name type) (in-dict annotation-table)]
-        #:when (set-member? (hash-ref parse-info 'private-fields) name))
-    (hash-set! private-field-types name (list type)))
-
-  (synthesize-private-field-types private-field-stxs
-                                  local-private-field-table
-                                  private-field-types)
-
-  ;; start type-checking elements in the body
-  (define-values (lexical-names lexical-types
-                  lexical-names/top-level lexical-types/top-level)
-    (local-tables->lexical-env parse-info
-                               internal-external-mapping
-                               local-method-table methods
-                               local-field-table fields
-                               local-private-field-table private-field-types
-                               local-init-table inits
-                               local-init-rest-table init-rest
-                               local-inherit-table
-                               local-inherit-field-table
-                               local-super-table
-                               super-methods super-fields
-                               local-augment-table local-inner-table
-                               augments super-augments
-                               local-private-table private-method-types
-                               self-type))
-  (do-timestamp "built local tables")
-  (with-lexical-env/extend lexical-names/top-level lexical-types/top-level
-    (check-super-new super-new super-inits super-init-rest))
-  (do-timestamp "checked super-new")
-  (with-lexical-env/extend lexical-names/top-level lexical-types/top-level
-    (for ([stx other-top-level-exprs])
-      (tc-expr stx)))
-  (do-timestamp "checked other top-level exprs")
-  (with-lexical-env/extend lexical-names/top-level lexical-types/top-level
-    (check-field-set!s (hash-ref parse-info 'initializer-body)
-                       local-field-table
-                       inits))
-  (do-timestamp "checked field initializers")
-  (define checked-method-types
-    (with-lexical-env/extend lexical-names lexical-types
-      (check-methods (append (hash-ref parse-info 'pubment-names)
-                             (hash-ref parse-info 'overridable-names))
-                     internal-external-mapping method-stxs
-                     methods self-type)))
-  (do-timestamp "checked methods")
-  (define checked-augment-types
-    (with-lexical-env/extend lexical-names lexical-types
-      (check-methods (hash-ref parse-info 'augment-names)
-                     internal-external-mapping method-stxs
-                     augments self-type)))
-  (do-timestamp "checked augments")
-  (with-lexical-env/extend lexical-names lexical-types
-    (check-private-methods method-stxs (hash-ref parse-info 'private-names)
-                           private-method-types self-type))
-  (do-timestamp "checked privates")
-  (do-timestamp "finished methods")
-  (define final-class-type
-    (merge-types self-type checked-method-types checked-augment-types))
-  (check-method-presence-and-absence
-   parse-info
-   expected
-   (set-union optional-external optional-super)
-   remaining-super-inits
-   super-field-names
-   super-method-names
-   super-augment-names)
-  (when expected
-    (check-below final-class-type expected))
-  (define class-type-parameters (hash-ref parse-info 'type-parameters))
-  (do-timestamp "done")
-  (if (null? class-type-parameters)
-      final-class-type
-      (make-Poly #:original-names class-type-parameters
-                 (hash-ref parse-info 'fresh-parameters)
-                 final-class-type)))
-
-;; handle-top-levels : (Listof Syntax) ->
-;;                     super-init-stxs Dict Hash (Listof Syntax)
-;; Divide top level expressions into several categories, and put them
-;; in appropriate data structures.
-(define (handle-top-levels exprs)
-  (define super-new #f)
-  (define annotations (make-hash))
-  (define augment-annotations (make-hash))
-  (define other-exprs
-    (for/fold ([other-exprs '()])
-              ([expr exprs])
-      (syntax-parse expr
-        #:literal-sets (kernel-literals)
-        #:literals (:-augment)
-        ;; The second part of this pattern ensures that we find the actual
-        ;; initialization call, rather than the '(declare-super-new) in
-        ;; the expansion.
-        [(~and :tr:class:super-new^ (#%plain-app . rst))
-         (when super-new
-           (tc-error/fields #:delayed? #t
-                            "ill-formed typed class"
-                            #:more "must only call `super-new' a single time"))
-         (set! super-new (find-provided-inits expr))
-         other-exprs]
-        [(~and t:class-type-declaration :tr:class:type-annotation^)
-         (define name (syntax-e #'t.name))
-         (define type (parse-type #'t.type))
-         (unless (check-duplicate-member annotations name type)
-           (hash-set! annotations name type))
-         other-exprs]
-        ;; FIXME: use internal-forms for this instead
-        [(quote-syntax (:-augment name-stx:id type-stx))
-         (define name (syntax-e #'name-stx))
-         (define type (parse-type #'type-stx))
-         (unless (check-duplicate-member augment-annotations name type)
-           (hash-set! augment-annotations name type))
-         other-exprs]
-        [_ (cons expr other-exprs)])))
-  (unless super-new
-    (tc-error/fields #:delayed? #t
-                     "ill-formed typed class"
-                     #:more "must call `super-new' at the top-level of the class")
-    (set! super-new (super-init-stxs null null)))
-  (values super-new
-          annotations
-          augment-annotations
-          other-exprs))
-
-;; check-duplicate-member : Hash Symbol Type -> Boolean
-;; return true if the class member is already annotated
-(define (check-duplicate-member table name type)
-  (and (hash-has-key? table name)
-       (not (equal? (hash-ref table name) type))
-       (tc-error/expr/fields
-        "duplicate type annotation in class"
-        #:stx #`#,name
-        #:return #t
-        "for identifier" name
-        "new type" type
-        "previous type" (hash-ref table name))))
-
-;; check-method-presence-and-absence : Dict Type Set<Symbol> ... -> Void
-;; use the internal class: information to check whether clauses
-;; exist or are absent appropriately
-(define (check-method-presence-and-absence
-         parse-info expected
-         optional-external
-         remaining-super-inits
-         super-field-names super-method-names super-augment-names)
-  (when expected
-   (match-define (Class: _ inits fields methods augments _) expected)
-   (define exp-init-names (dict-keys inits))
-   (define exp-field-names (dict-keys fields))
-   (define exp-method-names (dict-keys methods))
-   (define exp-augment-names (dict-keys augments))
-   (define exp-optional-inits
-     (for/set ([(name val) (in-dict inits)]
-               #:when (cadr val))
-              name))
-   (check-same (set-union (hash-ref parse-info 'init-names)
-                          (dict-keys remaining-super-inits))
-               exp-init-names
-               "initialization argument")
-   (check-same (set-union (hash-ref parse-info 'public-names)
-                          (hash-ref parse-info 'pubment-names)
-                          super-method-names)
-               exp-method-names
-               "public method")
-   (check-same (set-union (hash-ref parse-info 'field-names)
-                          super-field-names)
-               exp-field-names
-               "public field")
-   (check-same (set-union (hash-ref parse-info 'augmentable-names)
-                          super-augment-names)
-               exp-augment-names
-               "public augmentable method")
-   (check-same optional-external exp-optional-inits
-               "optional init argument"))
-  (check-exists super-method-names (hash-ref parse-info 'override-names)
-                "overridable method")
-  (check-exists super-augment-names (hash-ref parse-info 'augment-names)
-                "augmentable method")
-  (check-exists (set-union super-method-names super-augment-names)
-                (hash-ref parse-info 'inherit-names)
-                "method")
-  (check-exists super-field-names (hash-ref parse-info 'inherit-field-names)
-                "field")
-  (check-absent super-field-names (hash-ref parse-info 'field-names)
-                "public field")
-  (check-absent super-method-names (hash-ref parse-info 'public-names)
-                "public method")
-  (check-absent super-augment-names (hash-ref parse-info 'pubment-names)
-                "public augmentable method"))
-
-;; merge-types : Type Dict<Symbol, Type> Dict<Symbol, Type> -> Type
-;; Given a self object type, construct the real class type based on
-;; new information found from type-checking. Only used when an expected
-;; type was not provided.
-(define (merge-types self-type method-types augment-types)
-  (match-define
-   (Instance:
-    (and class-type
-         (Class: row-var inits fields methods augments init-rest)))
-   self-type)
-  (define (make-new-methods methods method-types)
-    (for/fold ([methods methods])
-              ([(name type) (in-dict method-types)])
-      (define old-type (dict-ref methods name #f))
-      ;; sanity check, to ensure that the actual method type
-      ;; is as precise as the annotated type
-      ;; FIXME: should this be a type error and not internal?
-      (when (and old-type (not (subtype (car type) (car old-type))))
-        (int-err (~a "merge-types: actual type ~a not"
-                     " a subtype of annotated type ~a")
-                 (car type) (car old-type)))
-      (dict-set methods name type)))
-  (make-Class row-var inits fields
-              (make-new-methods methods method-types)
-              (make-new-methods augments augment-types)
-              init-rest))
-
-;; local-tables->lexical-env : Dict Dict<Symbol, Symbol>
-;;                             LocalMapping NameTypeDict
-;;                             (for each kind of clause) ...
-;;                             Type
-;;                             -> List<Id> List<Type> List<Id> List<Type>
-;; Construct mappings to put into the lexical type-checking environment
-;; from the class local accessor mappings
-(define (local-tables->lexical-env parse-info
-                                   internal-external-mapping
-                                   local-method-table methods
-                                   local-field-table fields
-                                   local-private-field-table
-                                   private-field-types
-                                   local-init-table inits
-                                   local-init-rest-table init-rest
-                                   local-inherit-table
-                                   local-inherit-field-table
-                                   local-super-table
-                                   super-types super-fields
-                                   local-augment-table local-inner-table
-                                   augments super-augments
-                                   local-private-table
-                                   private-types
-                                   self-type)
-  ;; localize to accessor names via the provided tables
-  (define (localize local-table name-key-or-list)
-    (define names
-      (if (list? name-key-or-list)
-          (apply append (map (λ (k) (hash-ref parse-info k))
-                             name-key-or-list))
-          (hash-ref parse-info name-key-or-list)))
-    (for/list ([m names]) (dict-ref local-table m)))
-  (define-values (localized-method-names
-                  localized-field-pairs
-                  localized-private-field-pairs
-                  localized-inherit-field-pairs
-                  localized-inherit-names
-                  localized-private-methods
-                  localized-override-names
-                  localized-pubment-names
-                  localized-augment-names
-                  localized-inner-names
-                  localized-init-names)
-    (values
-     (localize local-method-table 'method-internals)
-     (localize local-field-table 'field-internals)
-     (localize local-private-field-table 'private-fields)
-     (localize local-inherit-field-table 'inherit-field-internals)
-     (localize local-inherit-table 'inherit-internals)
-     (localize local-private-table 'private-names)
-     (localize local-super-table 'override-internals)
-     (localize local-augment-table 'pubment-internals)
-     (localize local-augment-table 'augment-internals)
-     (localize local-inner-table '(pubment-internals augment-internals))
-     (localize local-init-table 'only-init-internals)))
-  (define-values (localized-field-get-names
-                  localized-field-set-names
-                  localized-private-field-get-names
-                  localized-private-field-set-names
-                  localized-inherit-field-get-names
-                  localized-inherit-field-set-names)
-    (values (map car localized-field-pairs)
-            (map cadr localized-field-pairs)
-            (map car localized-private-field-pairs)
-            (map cadr localized-private-field-pairs)
-            (map car localized-inherit-field-pairs)
-            (map cadr localized-inherit-field-pairs)))
-
-  ;; construct the types for method accessors
-  (define (make-method-types method-names type-map
-                             #:inner? [inner? #f])
-    (for/list ([m (in-set method-names)])
-      (define external (dict-ref internal-external-mapping m))
-      (define maybe-type (dict-ref type-map external #f))
-      (->* (list (make-Univ))
-           (cond [(and maybe-type
-                       (not (equal? (car maybe-type) top-func))
-                       (not inner?))
-                  (function->method (car maybe-type) self-type)]
-                 [(and maybe-type
-                       (not (equal? (car maybe-type) top-func)))
-                  (Un (-val #f)
-                      (function->method (car maybe-type) self-type))]
-                 [else (make-Univ)]))))
-
-  (define method-types
-    (make-method-types (hash-ref parse-info 'method-internals) methods))
-  (define inherit-types
-    (make-method-types
-     (hash-ref parse-info 'inherit-internals)
-     (append super-types super-augments)))
-  (define augment-types
-    (make-method-types (hash-ref parse-info 'augment-internals) augments))
-  (define inner-types
-    (make-method-types
-     (append (hash-ref parse-info 'pubment-internals)
-             (hash-ref parse-info 'augment-internals))
-     augments #:inner? #t))
-
-  ;; construct field accessor types
-  (define (make-field-types field-names type-map #:private? [private? #f])
-    (for/lists (_1 _2) ([f (in-set field-names)])
-      (define external
-        (if private?
-            f
-            (dict-ref internal-external-mapping f)))
-      (define maybe-type (dict-ref type-map external #f))
-      (values
-       (-> (make-Univ) (or (and maybe-type (car maybe-type))
-                           (make-Univ)))
-       (-> (make-Univ) (or (and maybe-type (car maybe-type))
-                           -Bottom)
-           -Void))))
-
-  (define-values (field-get-types field-set-types)
-    (make-field-types (hash-ref parse-info 'field-internals) fields))
-  (define-values (private-field-get-types private-field-set-types)
-    (make-field-types (hash-ref parse-info 'private-fields)
-                      private-field-types
-                      #:private? #t))
-  (define-values (inherit-field-get-types inherit-field-set-types)
-    (make-field-types (hash-ref parse-info 'inherit-field-internals)
-                      super-fields))
-
-  ;; types for privates and super calls
-  (define (make-private-like-types names type-map)
-    (for/list ([f (in-set names)])
-      (define pre-type (dict-ref type-map f #f))
-      (define maybe-type (if (pair? pre-type) (car pre-type) pre-type))
-      (or (and maybe-type
-               (not (equal? maybe-type top-func))
-               (function->method maybe-type self-type))
-          (make-Univ))))
-
-  (define private-method-types
-    (make-private-like-types (hash-ref parse-info 'private-names)
-                             private-types))
-  (define super-call-types
-    (make-private-like-types (hash-ref parse-info 'override-internals)
-                             super-types))
-  (define pubment-types
-    (make-private-like-types (hash-ref parse-info 'pubment-internals)
-                             methods))
-
-  ;; omit init-fields here since they don't have
-  ;; init accessors, only field accessors
-  (define init-types
-    (for/list ([i (in-set (hash-ref parse-info 'only-init-internals))])
-      (define external (dict-ref internal-external-mapping i))
-      (car (dict-ref inits external (list -Bottom)))))
-
-  (define localized-init-rest-name
-    (let ([name (hash-ref parse-info 'init-rest-name)])
-      (if name
-          (list (dict-ref local-init-rest-table name))
-          null)))
-
-  (define init-rest-type
-    (if (hash-ref parse-info 'init-rest-name)
-        (list (or init-rest Univ))
-        null))
-
-  (define all-names (append localized-method-names
-                            localized-private-methods
-                            localized-field-get-names
-                            localized-field-set-names
-                            localized-private-field-get-names
-                            localized-private-field-set-names
-                            localized-inherit-names
-                            localized-inherit-field-get-names
-                            localized-inherit-field-set-names
-                            localized-override-names
-                            localized-pubment-names
-                            localized-augment-names
-                            localized-inner-names))
-  (define all-types (append method-types private-method-types
-                            field-get-types field-set-types
-                            private-field-get-types private-field-set-types
-                            inherit-types
-                            inherit-field-get-types
-                            inherit-field-set-types
-                            super-call-types
-                            pubment-types augment-types inner-types))
-  (values all-names all-types
-          (append all-names
-                  localized-init-names
-                  localized-init-rest-name
-                  ;; Set `self` to the self-type and `init-args`
-                  ;; to Any, so that accessors can use them without
-                  ;; problems.
-                  ;; Be careful though!
-                  (list (hash-ref parse-info 'initializer-self-id)
-                        (hash-ref parse-info 'initializer-args-id)))
-          (append all-types
-                  init-types
-                  init-rest-type
-                  (list self-type (make-Univ)))))
-
-;; check-methods : Listof<Symbol> Listof<Syntax> Dict<Symbol, Symbol> Dict Type
-;;                 -> Dict<Symbol, Type>
-;; Type-check the methods inside of a class
-(define (check-methods names-to-check internal-external-mapping
-                       meths methods self-type)
-  (for/fold ([checked '()])
-            ([meth meths])
-    (define method-name (syntax-e (tr:class:def-property meth)))
-    (define external-name (dict-ref internal-external-mapping method-name #f))
-    (define maybe-expected (and external-name (dict-ref methods external-name #f)))
-    (cond [(and maybe-expected
-                ;; fall back to tc-expr/t if the annotated type
-                ;; was the default type (Procedure)
-                (not (equal? (car maybe-expected) top-func))
-                (set-member? names-to-check external-name))
-           (define pre-method-type (car maybe-expected))
-           (define method-type
-             (function->method pre-method-type self-type))
-           (define expected (ret method-type))
-           (register-method-ids meth self-type method-type)
-           (do-timestamp (format "started checking method ~a" external-name))
-           (tc-expr/check (add-kw-property meth) expected)
-           (do-timestamp (format "finished method ~a" external-name))
-           (cons (list external-name pre-method-type) checked)]
-          ;; Only try to type-check if these names are in the
-          ;; filter when it's provided. This allows us to, say, only
-          ;; type-check pubments/augments.
-          [(set-member? names-to-check external-name)
-           (do-timestamp (format "started checking method ~a" external-name))
-           ;; FIXME: this case doesn't work very well yet for keyword methods
-           ;;        because TR can't recognize that the expansion is a kw
-           ;;        function (unlike the expected case).
-           (register-method-ids meth self-type #f)
-           (define type (tc-expr/t (add-kw-property meth)))
-           (do-timestamp (format "finished method ~a" external-name))
-           (cons (list external-name
-                       (method->function type))
-                 checked)]
-          [else checked])))
-
-;; check-private-methods : Listof<Syntax> Listof<Sym> Dict<Sym, Type> Type
-;;                         -> Void
-;; Type-check private methods
-(define (check-private-methods stxs names types self-type)
-  (for ([stx stxs])
-    (define method-name (syntax-e (tr:class:def-property stx)))
-    (define private? (set-member? names method-name))
-    (define annotation (dict-ref types method-name #f))
-    (cond [(and private? annotation)
-           (define pre-method-type annotation)
-           (define method-type
-             (function->method pre-method-type self-type))
-           (define expected (ret method-type))
-           (register-method-ids stx self-type method-type)
-           (tc-expr/check (add-kw-property stx) expected)]
-          ;; not private, then ignore since it's irrelevant
-          [(not private?) (void)]
-          [else
-           (register-method-ids stx self-type #f)
-           (tc-expr/t (add-kw-property stx))])))
-
-;; check-field-set!s : Syntax Dict<Symbol, Symbol> Dict<Symbol, Type> -> Void
-;; Check that fields are initialized to the correct type
-;; FIXME: use syntax classes for matching and clearly separate the handling
-;;        of field initialization and set! uses
-(define (check-field-set!s stx local-field-table inits)
-  (for ([form (syntax->list stx)])
-    (syntax-parse form
-      #:literal-sets (kernel-literals)
-      ;; init with default
-      [(set! internal-init:id
-             (begin
-               (#%plain-app extract-arg:id
-                            _
-                            (quote init-external:id)
-                            init-args:id
-                            init-val:expr)))
-       (define init-name (syntax-e #'init-external))
-       (check-init-arg init-name
-                       (car (dict-ref inits init-name '(#f)))
-                       #'init-val)]
-      ;; init-field with default
-      [(begin
-         (quote ((~or (~datum declare-field-assignment)
-                      (~datum declare-field-initialization))
-                 _))
-         (let-values (((obj1:id) self:id))
-           (let-values (((x:id)
-                         (#%plain-app extract-arg:id
-                                      _
-                                      (quote name:id)
-                                      init-args:id
-                                      init-val:expr)))
-             (~or (with-continuation-mark _ _
-                    (#%plain-app local-setter:id obj2:id y:id))
-                  (#%plain-app local-setter:id obj2:id y:id)))))
-       #:when (free-identifier=? #'x #'y)
-       #:when (free-identifier=? #'obj1 #'obj2)
-       (define init-name (syntax-e #'name))
-       (check-init-arg init-name
-                       (car (dict-ref inits init-name '(#f)))
-                       #'init-val)]
-      ;; any field or an init-field without default
-      [(begin
-         (quote ((~or (~datum declare-field-assignment)
-                      (~datum declare-field-initialization))
-                 _))
-         (let-values (((obj1:id) self:id))
-           (let-values (((x:id) init-val:expr))
-             (~or (with-continuation-mark _ _
-                    (#%plain-app local-setter:id obj2:id y:id))
-                  (#%plain-app local-setter:id obj2:id y:id)))))
-       #:when (free-identifier=? #'x #'y)
-       #:when (free-identifier=? #'obj1 #'obj2)
-       ;; Remove wcm for checking since TR can't handle these cases
-       (define simplified
-         (syntax/loc form
-           (let-values (((obj1) self))
-             (let-values (((x) init-val))
-               (#%plain-app local-setter obj2 y)))))
-       (tc-expr simplified)]
-      [_ (void)])))
-
-;; check-init-arg : Id Type Syntax -> Void
-;; Check the initialization of an init arg variable against the
-;; expected type provided by an annotation (or the default)
-(define (check-init-arg init-name init-type init-val)
-  (define thunk?
-    (and (stx-pair? init-val)
-         (free-identifier=? #'#%plain-lambda (stx-car init-val))))
-  (unless (equal? (syntax->datum init-val) '(quote #f))
-    (cond [thunk?
-           (define type
-             (tc-expr/check/t init-val (ret (->* null init-type))))
-           (match type
-             [(Function: (list (arr: _ (Values: (list (Result: result _ _)))
-                                     _ _ _)))
-              (check-below result init-type)]
-             [_ (int-err "unexpected init value ~a"
-                         (syntax->datum init-val))])]
-          [else
-           (tc-expr/check init-val (ret init-type))])))
-
-;; synthesize-private-field-types : Listof<Syntax> Dict Hash -> Void
-;; Given top-level expressions in the class, synthesize types from
-;; the initialization expressions for private fields.
-(define (synthesize-private-field-types stxs locals types)
-  (for ([stx (in-list stxs)])
-    (syntax-parse stx
-      #:literal-sets (kernel-literals)
-      [(begin
-         (quote ((~datum declare-field-initialization) _))
-         (let-values ([(obj:id) self])
-           (let-values ([(field:id) initial-value])
-             (with-continuation-mark
-              _ _ (#%plain-app setter:id obj2:id field2:id)))))
-       (define name-stx (tr:class:def-property stx))
-       (define name (if (stx-pair? name-stx)
-                        (syntax-e (stx-car name-stx))
-                        (syntax-e name-stx)))
-       ;; don't synthesize if there's already a type annotation
-       (unless (hash-has-key? types name)
-         ;; FIXME: this always generalizes the private field
-         ;;        type, but it's better to only generalize if
-         ;;        the field is actually mutated.
-         (hash-set! types name
-                    (list (generalize (tc-expr/t #'initial-value)))))]
-      [(let-values ([(initial-value-name:id ...)
-                     (#%plain-app _ initial-value ...)])
-         (begin
-           (quote ((~datum declare-field-initialization) _))
-           (let-values ([(obj:id) self])
-             (let-values ([(field:id) initial-value-name-2:id])
-               (with-continuation-mark
-                _ _ (#%plain-app setter:id obj2:id field2:id)))))
-         ...
-         (#%plain-app _))
-       (define names (map syntax-e (syntax-e (tr:class:def-property stx))))
-       (for ([name (in-list names)]
-             [initial-value-stx (in-list (syntax->list #'(initial-value ...)))])
-         (unless (hash-has-key? types name)
-           (hash-set! types name
-                      (list (generalize (tc-expr/t initial-value-stx))))))])))
-
-;; Syntax -> Dict<Symbol, Id> Dict<Symbol, Id>
-;;           Dict<Symbol, (List Symbol Symbol)> Dict<Symbol, Id>
-;; Construct tables mapping internal method names to the accessors
-;; generated inside the untyped class macro.
-(define (construct-local-mapping-tables stx)
-  (syntax-parse stx
-    #:literal-sets (kernel-literals)
-    #:literals (values)
-    ;; See base-env/class-prims.rkt to see how this in-syntax
-    ;; table is constructed at the surface syntax
-    ;;
-    ;; FIXME: factor out with syntax classes
-    [(let-values ([(method:id ...)
-                   (#%plain-app
-                    values
-                    (#%plain-lambda ()
-                      (quote ((~datum declare-this-escapes)))
-                      (#%plain-app (#%plain-app local-method:id _) _))
-                    ...)]
-                  [(private:id ...)
-                   (#%plain-app
-                    values
-                    (#%plain-lambda ()
-                      (quote ((~datum declare-this-escapes)))
-                      (#%plain-app local-private:id _))
-                    ...)]
-                  [(field:id ...)
-                   (#%plain-app
-                    values
-                    (#%plain-lambda ()
-                      (quote ((~datum declare-field-use) _))
-                      (let-values (((_) _)) (#%plain-app local-field-get:id _))
-                      (begin
-                        (quote ((~datum declare-field-assignment) _))
-                        (let-values (((_) _))
-                          (let-values (((_) _)) (#%plain-app local-field-set:id _ _)))))
-                    ...)]
-                  [(private-field:id ...)
-                   (#%plain-app
-                    values
-                    (#%plain-lambda ()
-                      (quote ((~datum declare-field-use) _))
-                      (let-values (((_) _)) (#%plain-app local-private-get:id _))
-                      (begin
-                        (quote ((~datum declare-field-assignment) _))
-                        (let-values (((_) _))
-                          (let-values (((_) _)) (#%plain-app local-private-set:id _ _)))))
-                    ...)]
-                  [(inherit-field:id ...)
-                   (#%plain-app
-                    values
-                    (#%plain-lambda ()
-                      (quote ((~datum declare-inherit-use) _))
-                      (let-values (((_) _)) (#%plain-app local-inherit-get:id _))
-                      (let-values (((_) _))
-                        (let-values (((_) _)) (#%plain-app local-inherit-set:id _ _))))
-                    ...)]
-                  [(init:id ...)
-                   (#%plain-app
-                    values
-                    (#%plain-lambda ()
-                      ;; check-not-unsafe-undefined
-                      (#%plain-app _ local-init:id _)) ...)]
-                  [(init-rest:id ...)
-                   (#%plain-app
-                    values
-                    (#%plain-lambda ()
-                      ;; check-not-unsafe-undefined
-                      (#%plain-app _ local-init-rest:id _)) ...)]
-                  [(inherit:id ...)
-                   (#%plain-app
-                    values
-                    (#%plain-lambda ()
-                      (quote ((~datum declare-this-escapes)))
-                      (#%plain-app (#%plain-app local-inherit:id _) _))
-                    ...)]
-                  [(override:id ...)
-                   (#%plain-app
-                    values
-                    (#%plain-lambda ()
-                      (quote ((~datum declare-this-escapes)))
-                      (#%plain-app (#%plain-app local-override:id _) _)
-                      (quote ((~datum declare-this-escapes)))
-                      (#%plain-app local-super:id _))
-                    ...)]
-                  [(augment:id ...)
-                   (#%plain-app
-                    values
-                    (#%plain-lambda ()
-                      (quote ((~datum declare-this-escapes)))
-                      (~or (#%plain-app local-augment:id _)
-                           (#%plain-app (#%plain-app local-augment:id _) _))
-                      (quote ((~datum declare-this-escapes)))
-                      (let-values ([(_) (#%plain-app local-inner:id _)])
-                        (if _ (#%plain-app _ _) _)))
-                    ...)])
-       (#%plain-app void))
-     (values (map cons
-                  (append (syntax->datum #'(method ...))
-                          (syntax->datum #'(override ...)))
-                  (append (syntax->list #'(local-method ...))
-                          (syntax->list #'(local-override ...))))
-             (map cons
-                  (syntax->datum #'(private ...))
-                  (syntax->list #'(local-private ...)))
-             (map list
-                  (syntax->datum #'(field ...))
-                  (syntax->list #'(local-field-get ...))
-                  (syntax->list #'(local-field-set ...)))
-             (map list
-                  (syntax->datum #'(private-field ...))
-                  (syntax->list #'(local-private-get ...))
-                  (syntax->list #'(local-private-set ...)))
-             (map cons
-                  (syntax->datum #'(init ...))
-                  (syntax->list #'(local-init ...)))
-             ;; this should only be a singleton list or null
-             (map cons
-                  (syntax->datum #'(init-rest ...))
-                  (syntax->list #'(local-init-rest ...)))
-             (map cons
-                  (syntax->datum #'(inherit ...))
-                  (syntax->list #'(local-inherit ...)))
-             (map list
-                  (syntax->datum #'(inherit-field ...))
-                  (syntax->list #'(local-inherit-get ...))
-                  (syntax->list #'(local-inherit-set ...)))
-             (map cons
-                  (syntax->datum #'(override ...))
-                  (syntax->list #'(local-super ...)))
-             (map cons
-                  (syntax->datum #'(augment ...))
-                  (syntax->list #'(local-augment ...)))
-             (map cons
-                  (syntax->datum #'(augment ...))
-                  (syntax->list #'(local-inner ...))))]))
-
-;; find-provided-inits : Syntax -> super-init-stxs
-;; Find the init arguments that were provided via super-new
-(define (find-provided-inits stx)
-  (syntax-parse stx
-    #:literal-sets (kernel-literals)
-    #:literals (cons list)
-    [(#%plain-app
-      (#%plain-lambda args
-        (#%plain-app super-go _ _ _ _ _ _))
-      pos-arg:expr ...)
-     (super-init-stxs (syntax->list #'(pos-arg ...)) null)]
-    [(#%plain-app super-go _ _ _ _
-                  (~or (#%plain-app list pos-arg:expr ...)
-                       (~and _ (~bind [(pos-arg 1) '()])))
-                  (#%plain-app
-                   list
-                   (#%plain-app cons (quote init-id) arg:expr)
-                   ...))
-     (define provided-inits (syntax->datum #'(init-id ...)))
-     (super-init-stxs
-      (syntax->list #'(pos-arg ...))
-      (map cons provided-inits (syntax->list #'(arg ...))))]))
-
-;; handle-pos-inits : super-init-stxs Dict (Option Type) -> Type Dict
-;; Check if the init-rest type works and return a potentially changed
-;; init-rest type and the remaining init args after
-(define (handle-pos-inits super-new super-inits super-init-rest)
-  (match-define (super-init-stxs provided-pos-args provided-super-inits)
-                super-new)
-  (define provided-init-names (dict-keys provided-super-inits))
-  (define pos-length (length provided-pos-args))
-  (cond [;; too many init arguments, and no init-rest
-           (and (not super-init-rest) (> pos-length (length super-inits)))
-           (values super-init-rest
-                   (tc-error/expr/fields
-                    "invalid `super-make-object' or `super-instantiate'"
-                    #:more "too many positional init arguments provided"
-                    "expected" (length super-inits)
-                    "given" pos-length
-                    #:stx #`(#,@provided-pos-args)
-                    #:return null))]
-          [;; no remaining by-name inits, so change the init-rest type
-           ;; and return a null remaining named inits list
-           (> pos-length (length super-inits))
-           (values (Un) null)]
-          [else
-           (values super-init-rest
-                   (for/list ([(name val) (in-dict (drop super-inits pos-length))]
-                              #:unless (member name provided-init-names))
-                     (cons name val)))]))
-
-;; check-by-name : super-init-stxs Dict -> Void
-;; Check that by-name inits are valid for the superclass
-(define (check-by-name init-stxs super-inits)
-  (match-define (super-init-stxs _ by-name) init-stxs)
-  (for ([(name _) (in-dict by-name)])
-    (unless (dict-ref super-inits name #f)
-      (tc-error/fields
-       "invalid `super-new' or `super-instantiate'"
-       #:more "init argument not accepted by superclass"
-       "init name" name
-       #:stx #`#,name
-       #:delayed? #t))))
-
-;; check-super-new : super-init-stxs Dict Type -> Void
-;; Check if the super-new call is well-typed
-(define (check-super-new super-new super-inits init-rest)
-  (match-define (super-init-stxs provided-pos-args provided-inits)
-                super-new)
-  (define pos-init-diff (- (length provided-pos-args) (length super-inits)))
-  (cond [(and (> pos-init-diff 0) (not init-rest))
-         ;; errror case that's caught above, do nothing
-         (void)]
-        [(> pos-init-diff 0)
-         (define-values (pos-args for-init-rest)
-           (split-at provided-pos-args (length super-inits)))
-         (for ([pos-arg pos-args]
-               [init super-inits])
-           (match-define (list _ type _) init)
-           (tc-expr/check pos-arg (ret type)))
-         (tc-expr/check #`(#%plain-app list #,@for-init-rest)
-                        (ret init-rest))]
-        [else
-         (define-values (pos-inits remaining-inits)
-           (split-at super-inits (length provided-pos-args)))
-         (for ([pos-arg provided-pos-args]
-               [init pos-inits])
-           (match-define (list _ type _) init)
-           (tc-expr/check pos-arg (ret type)))
-         (for ([(init-id init-arg) (in-dict provided-inits)])
-           (define maybe-expected (dict-ref remaining-inits init-id #f))
-           (when maybe-expected
-             (tc-expr/check init-arg (ret (car maybe-expected)))))]))
-
-;; Syntax (Syntax -> Any) -> Listof<Syntax>
-;; Look through the expansion of the class macro in search for
-;; syntax with some property (e.g., methods)
-(define (trawl-for-property form accessor)
-  (define (recur-on-all stx-list)
-    (apply append (map (λ (stx) (trawl-for-property stx accessor))
-                       (syntax->list stx-list))))
-  (syntax-parse form
-    #:literals (let-values letrec-values #%plain-app
-                #%plain-lambda letrec-syntaxes+values)
-    [stx
-     #:when (accessor #'stx)
-     (list form)]
-    [(let-values (b ...) body ...)
-     (recur-on-all #'(b ... body ...))]
-    ;; for letrecs, traverse the RHSs too
-    [(letrec-values ([(x ...) rhs ...] ...) body ...)
-     (recur-on-all #'(rhs ... ... body ...))]
-    [(letrec-syntaxes+values (sb ...) ([(x ...) rhs ...] ...) body ...)
-     (recur-on-all #'(rhs ... ... body ...))]
-    [(#%plain-app e ...)
-     (recur-on-all #'(e ...))]
-    [(#%plain-lambda (x ...) e ...)
-     (recur-on-all #'(e ...))]
-    [_ '()]))
-
-;; setup-pubment-defaults : Listof<Symbol> Hash Hash -> Void
-;; this does a second pass through the type annotations and adds
-;; the pubment types as default augment types if an augment type
-;; was not already provided
-(define (setup-pubment-defaults pubment-names annotations augment-annotations)
-  (for ([name pubment-names])
-    (when (and (not (hash-has-key? augment-annotations name))
-               (hash-has-key? annotations name))
-      (hash-set! augment-annotations
-                 name
-                 (dict-ref annotations name)))))
-
-;; infer-self-type : Dict RowVar Class Dict<Symbol, Type> Dict<Symbol, Type>
-;;                   Set<Symbol> Dict<Symbol, Symbol>
-;;                   Inits Fields Methods Type
-;;                   -> Type
-;; Construct a self object type based on all type annotations
-;; and the expected type
-(define (infer-self-type parse-info
-                         super-row
-                         expected
-                         annotation-table augment-annotation-table
-                         optional-inits
-                         internal-external-mapping
-                         super-inits super-fields super-methods
-                         super-augments super-init-rest)
-  ;; Gets a type for a given name in the class.
-  ;; A type is assigned for each member in this order:
-  ;;   (1) a type annotation from the user
-  ;;   (2) the expected type
-  ;;   (3) Any or Procedure
-  (define (assign-type name expected annotation-table update default-type)
-    (cond [(dict-ref annotation-table name #f) => update]
-          [(and expected (dict-ref expected name #f))
-           => (compose update car)]
-          [default-type => update]))
-
-  ;; construct the new init type dict
-  (define (make-inits names supers expected)
-    (define-values (inits new-inits)
-      (for/fold ([type-dict supers] [new-entries '()])
-                ([name names])
-        (define external (dict-ref internal-external-mapping name))
-        (define (update-dict type)
-          (define entry (list type (set-member? optional-inits name)))
-          ;; new entries have to go on the front, so sort them separately
-          (if (dict-has-key? type-dict external)
-              (values (dict-set type-dict external entry) new-entries)
-              (values type-dict (cons (cons external entry) new-entries))))
-        (assign-type name expected annotation-table update-dict Univ)))
-    (append (reverse new-inits) inits))
-
-  ;; construct type dicts for fields, methods, and augments
-  (define (make-type-dict names supers expected default-type
-                          #:annotations-from [annotation-table annotation-table])
-    (for/fold ([type-dict supers])
-              ([name names])
-      (define external (dict-ref internal-external-mapping name))
-      (define (update-dict type)
-        (define entry (list type))
-        (dict-set type-dict external entry))
-      (assign-type name expected annotation-table update-dict default-type)))
-
-  (define-values (expected-inits expected-fields
-                  expected-publics expected-augments
-                  expected-init-rest)
-    (match expected
-      [(Class: _ inits fields publics augments init-rest)
-       (values inits fields publics augments init-rest)]
-      [_ (values #f #f #f #f #f)]))
-  (define-values (inits fields publics pubments overrides init-rest-name)
-    (values (hash-ref parse-info 'init-internals)
-            (hash-ref parse-info 'field-internals)
-            (hash-ref parse-info 'public-internals)
-            (hash-ref parse-info 'pubment-internals)
-            (hash-ref parse-info 'override-internals)
-            (hash-ref parse-info 'init-rest-name)))
-  (define init-types (make-inits inits super-inits expected-inits))
-  (define field-types (make-type-dict fields super-fields expected-fields Univ))
-
-  ;; This should consider all new public methods, but should also look at
-  ;; overrides to ensure that if an overriden method has a more specific type
-  ;; (via depth subtyping) then it's accounted for.
-  (define public-types (make-type-dict (append publics pubments overrides)
-                                       super-methods expected-publics
-                                       top-func))
-
-  (define augment-types (make-type-dict
-                         pubments super-augments expected-augments top-func
-                         #:annotations-from augment-annotation-table))
-  ;; For the init-rest type, if the user didn't provide one, then
-  ;; take the superclass init-rest. Otherwise, find the annotated type
-  ;; or use (Listof Any) as the type if no annotation exists.
-  (define init-rest-type
-    (cond [(not init-rest-name) super-init-rest]
-          [(dict-ref annotation-table init-rest-name #f)]
-          [else (-lst Univ)]))
-  (make-Instance (make-Class ;; only inherit parent row if it's a variable
-                             ;; FIXME: fix this when substitution with rows
-                             ;;        is made more sensible
-                             (and (or (F? super-row) (B? super-row))
-                                  super-row)
-                             init-types field-types
-                             public-types augment-types init-rest-type)))
-
-;; function->method : Function Type -> Function
-;; Fix up a method's arity from a regular function type
-(define (function->method type self-type)
-  (match type
-    [(Function: (list arrs ...))
-     (define fixed-arrs
-       (for/list ([arr arrs])
-         (match-define (arr: doms rng rest drest kws) arr)
-         (make-arr (cons self-type doms) rng rest drest kws)))
-     (make-Function fixed-arrs)]
-    [(Poly-names: ns body)
-     (make-Poly ns (function->method body self-type))]
-    [(PolyDots-names: ns body)
-     (make-PolyDots ns (function->method body self-type))]
-    [(PolyRow-names: ns constraints body)
-     (make-PolyRow ns constraints (function->method body self-type))]
-    [_ (int-err "function->method: ~a" type)]))
-
-;; method->function : Function -> Function
-;; Turn a "real" method type back into a function type
-(define (method->function type)
-  (match type
-    [(Function: (list arrs ...))
-     (define fixed-arrs
-       (for/list ([arr arrs])
-         (match-define (arr: doms rng rest drest kws) arr)
-         (make-arr (cdr doms) rng rest drest kws)))
-     (make-Function fixed-arrs)]
-    [(Poly-names: ns body)
-     (make-Poly ns (method->function body))]
-    [(PolyDots-names: ns body)
-     (make-PolyDots ns (method->function type))]
-    [(PolyRow-names: ns constraints body)
-     (make-PolyRow ns constraints (method->function type))]
-    [_ (tc-error/expr #:return -Bottom "expected a function type for method")]))
-
-;; register-method-ids : Syntax (Option Type) -> Void
-;; Register types for identifiers in a method that don't come with types
-(define (register-method-ids stx self-type method-type)
-  (define (do-register self-param meth-name)
-    (when method-type
-      (register-type meth-name method-type))
-    (register-type self-param self-type))
-  (syntax-parse stx
-    #:literals (let-values #%plain-lambda case-lambda)
-    [(let-values ([(meth-name:id)
-                   (#%plain-lambda (self-param:id . params)
-                     body ...)])
-       m)
-     (do-register #'self-param #'meth-name)]
-    [(~and (let-values ([(meth-name:id)
-                         (let-values (((core:id)
-                                       (#%plain-lambda params
-                                                       core-body ...)))
-                           method-body ...)])
-             m)
-           (~or kw:kw-lambda^ opt:opt-lambda^))
-     (do-register #'self-param #'meth-name)]
-    ;; case-lambda methods
-    [(let-values ([(meth-name:id)
-                   (case-lambda
-                     [(self x ...) body] ...)])
-       m)
-     (when method-type
-       (register-type #'meth-name method-type))
-     (for ([self-param (in-list (syntax->list #'(self ...)))])
-       (register-type self-param self-type))]
-    [_ (int-err "register-method-ids: internal error")]))
-
-;; Syntax -> Syntax
-;; If the method syntax is for a keyword method, then propagate the keyword
-;; property further into the syntax object.
-(define (add-kw-property stx)
-  (syntax-parse stx
-    #:literal-sets (kernel-literals)
-    [(~and (let-values ([(meth-name:id) core]) m)
-           kw:kw-lambda^)
-      (quasisyntax/loc stx
-        (let-values ([(meth-name)
-                      #,(kw-lambda-property
-                        (syntax/loc stx core)
-                        (attribute kw.value))])
-          m))]
-    [(~and (let-values ([(meth-name:id) core]) m)
-           opt:opt-lambda^)
-     (match-define (list required optional) (attribute opt.value))
-     (quasisyntax/loc stx
-       (let-values ([(meth-name)
-                     #,(opt-lambda-property
-                        (syntax/loc stx core)
-                        (list (add1 required) ; for `this` argument
-                              optional))])
-         m))]
-    [_ stx]))
-
-;; Set<Symbol> Set<Symbol> String -> Void
-;; check that all the required names are actually present
-;;
-;; FIXME: This gives bad error messages. Consider using syntax
-;;        object lists instead of sets.
-(define (check-exists actual required kind)
-  (define missing
-    (for/or ([m (in-set required)])
-      (and (not (set-member? actual m)) m)))
-  (when missing
-    (tc-error/fields #:delayed? #t
-                     "inheritance mismatch"
-                     #:more (~a "the superclass is missing a required " kind)
-                     (~a "missing " kind) missing)))
-
-;; Set<Symbol> Set<Symbol> String -> Void
-;; check that names are absent when they should be
-(define (check-absent actual should-be-absent kind)
-  (define present
-    (for/or ([m (in-set should-be-absent)])
-      (and (set-member? actual m) m)))
-  (when present
-    (tc-error/fields #:delayed? #t
-                     "inheritance mismatch"
-                     #:more (~a "the superclass has a conflicting " kind)
-                     kind present)))
-
-;; Set<Symbol> Set<Symbol> String -> Void
-;; check that the names are exactly the same as expected
-(define (check-same actual expected kind)
-  (define missing
-    (for/or ([m (in-set expected)])
-      (and (not (set-member? actual m)) m)))
-  (when missing
-    (tc-error/fields #:delayed? #t
-                     "type mismatch"
-                     #:more (~a "the class is missing a required " kind)
-                     (~a "missing " kind) missing))
-  (define too-many
-    (for/or ([m (in-set actual)])
-      (and (not (set-member? expected m)) m)))
-  (when too-many
-    (tc-error/fields #:delayed? #t
-                     "type mismatch"
-                     #:more (~a "the class has a " kind " that should be absent")
-                     kind too-many)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-subforms-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-subforms-unit.rkt
deleted file mode 100644
index 43b9954ef6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-subforms-unit.rkt
+++ /dev/null
@@ -1,137 +0,0 @@
-#lang racket/unit
-
-(require "../utils/utils.rkt"
-         syntax/parse
-         racket/match
-         "signatures.rkt" "tc-metafunctions.rkt"
-         "tc-funapp.rkt"
-         (types utils abbrev union resolve subtype match-expanders)
-         (typecheck check-below)
-         (private syntax-properties)
-         (utils tc-utils)
-         (for-syntax racket/base syntax/parse)
-         (for-template racket/base)
-         (rep type-rep filter-rep object-rep))
-
-(import tc-if^ tc-lambda^ tc-app^ tc-let^ tc-expr^)
-(export check-subforms^)
-
-;; Does a depth first search of the syntax object. For each sub object it attempts to match it
-;; against the provide syntax-parse patterns.
-(define-syntax find-syntax
-  (syntax-parser
-    [(_ init-form [clause bodies ...+] ...)
-     #'(let loop ([form init-form])
-         (parameterize ([current-orig-stx form])
-           (syntax-parse form
-             #:literals (quote-syntax)
-             [clause bodies ...] ...
-             ;; avoid going under quote-syntax, nothing to typecheck
-             [(quote-syntax . rst) (void)]
-             [(a . b)
-              (loop #'a)
-              (loop #'b) ]
-             [_ (void)])))]))
-
-;; find the subexpressions that need to be typechecked in an ignored form
-;; syntax (or/c #f tc-results/c) -> full-tc-results/c
-(define (check-subforms/with-handlers form expected)
-  (define predicate-map (make-hash))
-  (define handler-map (make-hash))
-  (define body-results #f)
-
-  ;; syntax tc-result1 type -> tc-results
-  ;; The result of applying the function to a single argument of the type of its first argument
-  (define (get-range-result stx t filter-type)
-    (let loop ((t t))
-      (match t
-        [(Function: (list _ ... (arr: (list arg1) _ _ #f (list (Keyword: _ _ #f) ...)) _ ...))
-         #:when (subtype filter-type arg1)
-         (tc/funapp #'here #'(here) t (list (ret arg1)) #f)]
-        [(Function: (list _ ... (arr: '() _ (? values rest) #f (list (Keyword: _ _ #f) ...)) _ ...))
-         #:when (subtype filter-type rest)
-         (tc/funapp #'here #'(here) t (list (ret rest)) #f)]
-        [(? needs-resolving? t)
-         (loop (resolve t))]
-        [(or (Poly: ns _) (PolyDots: (list ns ... _) _))
-         (loop (instantiate-poly t (map (λ (n) Univ) ns)))]
-        ;; This clause should raise an error via the check-below test
-        [_
-         (cond [;; a redundant test, but it ensures an error message below
-                (not (subtype t (-> filter-type Univ)))
-                (parameterize ([current-orig-stx stx])
-                  (check-below t (-> filter-type Univ)))]
-               [else (int-err "get-range-result: should not happen. type ~a filter ~a"
-                              t filter-type)])
-         (ret (Un))])))
-
-  ;; Syntax Type -> (Option Type)
-  ;; Extract the type for the filter in a predicate type, or #f if
-  ;; the type is an invalid predicate type.
-  (define (get-filter-type stx pred-type)
-    (cond [;; make sure the predicate has an appropriate type
-           (subtype pred-type (-> Univ Univ))
-           (define fun-type
-             (if (needs-resolving? pred-type)
-                 (resolve pred-type)
-                 pred-type))
-           (match fun-type
-             ;; FIXME: Almost all predicates fall into this case, but it may
-             ;;        be worth being more precise here for some rare code.
-             [(PredicateFilter: fs)
-              (match fs
-                [(FilterSet: (TypeFilter: ft (Path: '() '(0 0))) _) ft]
-                [(Bot:) (Un)]
-                [_ Univ])]
-             [_ Univ])]
-          [else
-           ;; if the type is wrong, produce a nice error message
-           (parameterize ([current-orig-stx stx])
-             (check-below pred-type (-> Univ Univ)))
-           #f]))
-
-  ;; -> (Listof Type)
-  ;; Produce a list of result types from the predicate/handler maps
-  (define (get-handler-results)
-    (for/list ([key (in-hash-keys predicate-map)])
-      (match-define (list predicate-stx predicate-type)
-        (hash-ref predicate-map key))
-      (match-define (list handler-stx handler-type)
-        (hash-ref handler-map key))
-      (define filter-type
-        (get-filter-type predicate-stx predicate-type))
-      ;; if the predicate doesn't check, then don't bother
-      ;; with the RHS and return no result
-      (if filter-type
-          (get-range-result handler-stx handler-type filter-type)
-          (ret (Un)))))
-
-  (find-syntax form
-    ;; if this needs to be checked
-    [stx:with-type^
-     ;; the form should be already ascribed the relevant type
-     (tc-expr #'stx)]
-    ;; exception predicate
-    [stx:exn-predicate^
-     (match (single-value #'stx)
-       [(tc-result1: t)
-        (hash-set! predicate-map (attribute stx.value) (list #'stx t))])]
-    ;; this is a handler function
-    [stx:exn-handler^
-     (match (single-value #'stx)
-       [(tc-result1: t)
-        (hash-set! handler-map (attribute stx.value) (list #'stx t))])]
-    ;; this is the body of the with-handlers
-    [stx:exn-body^
-     (set! body-results (tc-expr/check #'stx expected))])
-  (define handler-results (get-handler-results))
-  (merge-tc-results (cons body-results handler-results)))
-
-;; typecheck the expansion of a with-handlers form
-;; syntax -> void
-(define (check-subforms/ignore form)
-  (find-syntax form
-    ;; if this needs to be checked
-    [stx:with-type^
-     ;; the form should be already ascribed the relevant type
-     (void (tc-expr #'stx))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-binding.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-binding.rkt
deleted file mode 100644
index fffb79cbd4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-binding.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt" (contract-req))
-
-(require-for-cond-contract racket/struct-info)
-
-(define-struct binding (name) #:transparent)
-(define-struct (def-binding binding) (ty) #:transparent)
-(define-struct (def-stx-binding binding) () #:transparent)
-(define-struct (def-struct-stx-binding def-stx-binding) (static-info constructor-type) #:transparent)
-
-(provide/cond-contract
- (struct binding ([name identifier?]))
- (struct (def-binding binding) ([name identifier?] [ty any/c]))
- (struct (def-stx-binding binding) ([name identifier?]))
- (struct (def-struct-stx-binding binding) ([name identifier?]
-                                           [static-info (or/c #f struct-info?)]
-                                           [constructor-type any/c])))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-export.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-export.rkt
deleted file mode 100644
index 7197e7ac83..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-export.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-
-(require 
-  (for-syntax syntax/parse racket/base
-              "renamer.rkt"
-              "../utils/tc-utils.rkt"))
-(provide def-export)
-
-(define-syntax (def-export stx)
-  (syntax-parse stx
-    [(def-export export-id:identifier id:identifier cnt-id:identifier)
-     #'(define-syntax export-id
-         (let ([c #'cnt-id])
-           (if (unbox typed-context?)
-               (renamer #'id c)
-               (renamer c))))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/find-annotation.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/find-annotation.rkt
deleted file mode 100644
index 33f8efad84..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/find-annotation.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt" syntax/parse
-         (contract-req)
-         (env lexical-env)
-         (private type-annotation)
-         (for-label racket/base))
-
-(require-for-cond-contract (rep type-rep))
-
-(provide/cond-contract [find-annotation (syntax? identifier? . -> . (or/c #f Type/c))])
-
-(define-syntax-class lv-clause
-  #:transparent
-  (pattern [(v:id ...) e:expr]))
-
-(define-syntax-class lv-clauses
-  #:transparent
-  (pattern (cl:lv-clause ...)
-           #:with (e ...) #'(cl.e ...)
-           #:with (vs ...) #'((cl.v ...) ...)))
-
-(define-syntax-class core-expr
-  #:literal-sets (kernel-literals)
-  #:transparent
-  (pattern (let-values cls:lv-clauses body)
-           #:with (expr ...) #'(cls.e ... body))
-  (pattern (letrec-values cls:lv-clauses body)
-           #:with (expr ...) #'(cls.e ... body))
-  (pattern (letrec-syntaxes+values _ cls:lv-clauses body)
-           #:with (expr ...) #'(cls.e ... body))
-  (pattern (#%plain-app expr ...))
-  (pattern (if expr ...))
-  (pattern (with-continuation-mark expr ...))
-  (pattern (begin expr ...))
-  (pattern (begin0 expr ...))
-  (pattern (#%plain-lambda _ e)
-           #:with (expr ...) #'(e))
-  (pattern (case-lambda [_ expr] ...))
-  (pattern (set! _ e)
-           #:with (expr ...) #'(e))
-  (pattern _
-           #:with (expr ...) #'()))
-
-(define-literal-set find-annotation-literals #:for-label
-    (reverse))
-
-;; expr id -> type or #f
-;; if there is a binding in stx of the form:
-;; (let ([x (reverse name)]) e) or
-;; (let ([x name]) e)
-;; where x has a type annotation, return that annotation, otherwise #f
-(define (find-annotation stx name)
-  (define (find s) (find-annotation s name))
-  (define (match? b)
-    (syntax-parse b
-      #:literal-sets (kernel-literals find-annotation-literals)
-      [c:lv-clause
-       #:with n:id #'c.e
-       #:with (v) #'(c.v ...)
-       #:fail-unless (free-identifier=? name #'n) #f
-       (or (type-annotation #'v) (lookup-type/lexical #'v #:fail (lambda _ #f)))]
-      [c:lv-clause
-       #:with (#%plain-app reverse n:id) #'c.e
-       #:with (v) #'(c.v ...)
-       #:fail-unless (free-identifier=? name #'n) #f
-       (or (type-annotation #'v) (lookup-type/lexical #'v #:fail (lambda _ #f)))]
-      [_ #f]))
-  (syntax-parse stx
-    #:literal-sets (kernel-literals)
-    [(let-values cls:lv-clauses body)
-     (or (ormap match? (syntax->list #'cls))
-	 (find #'body))]
-    [e:core-expr
-     (ormap find (syntax->list #'(e.expr ...)))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/internal-forms.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/internal-forms.rkt
deleted file mode 100644
index a11abf7d33..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/internal-forms.rkt
+++ /dev/null
@@ -1,132 +0,0 @@
-#lang racket/base
-
-(require
-  syntax/parse
-  (for-syntax racket/base racket/syntax
-              syntax/parse syntax/parse/experimental/template)
-  (for-label racket/base))
-
-(provide
-  (for-syntax internal)
-
-  type-alias
-  type-refinement
-  typed-struct
-  typed-struct/exec
-  typed-require
-  typed-require/struct
-  predicate-assertion
-  type-declaration
-  typecheck-failure
-
-  type-alias?
-  typed-struct?
-  typed-struct/exec?)
-
-;; Forms
-(define-syntax-rule (internal-forms set-name nms ...)
-  (begin
-    (provide nms ... set-name)
-    (define-literal-set set-name (nms ...))
-    (define-syntax (nms stx) (raise-syntax-error 'typecheck "Internal typechecker form used out of context" stx)) ...))
-
-(internal-forms internal-literals
- require/typed-internal
- define-type-alias-internal
- define-type-internal
- define-typed-struct-internal
- define-typed-struct/exec-internal
- assert-predicate-internal
- declare-refinement-internal
- :-internal
- typecheck-fail-internal)
-
-
-
-;;; Helpers
-
-(define-splicing-syntax-class dtsi-fields
- #:attributes (mutable type-only maker)
- (pattern
-  (~seq
-    (~or (~optional (~and #:mutable (~bind (mutable #t))))
-         (~optional (~and #:type-only (~bind (type-only #t))))
-         (~optional (~seq #:maker maker))) ...)))
-
-(define-syntax-class struct-name
- (pattern nm:id)
- (pattern (nm:id parent:id)))
-
-
-(define-syntax-class define-typed-struct-body
-  #:attributes (name mutable type-only maker nm (tvars 1) (fields 1) (types 1))
-  (pattern ((~optional (tvars:id ...) #:defaults (((tvars 1) null)))
-            nm:struct-name ([fields:id : types:expr] ...) options:dtsi-fields)
-           #:attr name #'nm.nm
-           #:attr mutable (attribute options.mutable)
-           #:attr type-only (attribute options.type-only)
-           #:attr maker (or (attribute options.maker) #'nm.nm)))
-
-;;; Internal form syntax matching
-
-(define-literal-set internal-form-literals #:for-label
-  (values))
-
-(define-syntax-class internal^
-   #:attributes (value)
-   #:literal-sets (kernel-literals internal-form-literals)
-   (pattern (define-values () (begin (quote-syntax value:expr) (#%plain-app values)))))
-
-(define-syntax (define-internal-classes stx)
-  (define-syntax-class clause
-    (pattern [name:id (lit:id . body:expr)]
-     #:with pred (format-id #'name "~a?" #'name)))
-
-  (syntax-parse stx
-    [(_ :clause ...)
-     (template
-       (begin
-         (begin
-           (define-syntax-class name
-             #:auto-nested-attributes
-             #:literal-sets ((internal-literals #:at name))
-             (pattern i:internal^ #:with (lit . body) #'i.value))
-           (define pred
-             (syntax-parser
-               [(~var _ name) #t]
-               [_ #f]))) ...))]))
-
-
-(define-internal-classes
-  [type-alias
-    (define-type-alias-internal name type args)]
-  [type-refinement
-    (declare-refinement-internal predicate)]
-  [typed-struct
-    (define-typed-struct-internal . :define-typed-struct-body)]
-  [typed-struct/exec
-    (define-typed-struct/exec-internal nm ([fields:id : types] ...) proc-type)]
-  [typed-require
-    (require/typed-internal name type)]
-  [typed-require/struct
-    (require/typed-internal name type #:struct-maker parent)]
-  [predicate-assertion
-    (assert-predicate-internal type predicate)]
-  [type-declaration
-    (:-internal id:identifier type)])
-
-;; Define separately outside of `define-internal-classes` since this form
-;; is meant to appear in expression positions, so it doesn't make sense to use
-;; the `define-values` protocol used for other internal forms.
-(define-syntax-class typecheck-failure
-  #:literal-sets (kernel-literals internal-literals)
-  (pattern (quote-syntax (typecheck-fail-internal stx message:str var))))
-
-;;; Internal form creation
-(begin-for-syntax
-  (define (internal stx)
-    (quasisyntax/loc stx
-      (define-values ()
-        (begin
-          (quote-syntax #,stx)
-          (#%plain-app values))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/provide-handling.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/provide-handling.rkt
deleted file mode 100644
index 592157af59..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/provide-handling.rkt
+++ /dev/null
@@ -1,158 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         unstable/list unstable/sequence syntax/id-table racket/dict racket/syntax
-         racket/struct-info racket/match syntax/parse
-         (only-in (private type-contract) include-extra-requires?)
-         (private syntax-properties)
-         (typecheck renamer def-binding)
-         (utils tc-utils)
-         (for-syntax racket/base)
-         (for-template racket/base "def-export.rkt"))
-
-(provide remove-provides provide? generate-prov get-alternate)
-
-(define (provide? form)
-  (syntax-parse form
-    #:literal-sets (kernel-literals)
-    [(#%provide . rest) form]
-    [_ #f]))
-
-(define (remove-provides forms)
-  (for/list ([e (in-syntax forms)]
-             #:unless (provide? e))
-    e))
-
-(define (freshen-id id)
-  ((make-syntax-introducer) id))
-
-;; generate-prov : dict[id -> def-binding] dict[id -> list[id]] id
-;;                 -> (values listof[syntax] listof[listof[list[id id]]])
-;; defs: defines in this module
-;; provs: provides in this module
-;; pos-blame-id: a #%variable-reference for the module
-
-;; The first returned value is a syntax object of definitions that defines the
-;; contracted versions of the provided identifiers, and the corresponding
-;; provides.
-;;
-;; The second value is a list of two element lists, which are type name aliases.
-(define (generate-prov defs provs pos-blame-id)
-  ;; maps ids defined in this module to an identifier which is the possibly-contracted version of the key
-  (define mapping (make-free-id-table))
-
-  ;; triple/c in the signatures corresponds to three values:
-  ;; (values syntax? identfier? (listof (list/c identifier? identifier?))
-  ;; First return value is a syntax object of definitions
-  ;; Second is the id to export
-  ;; Third is a list of two element lists representing type aliases
-
-  ;; mk : id -> triple/c
-  ;;
-  ;; internal-id : the id being provided
-  ;; if `internal-id' is defined in this module, we will produce a (begin def ... provide) block
-  ;; and a name to provide instead of internal-id.
-  ;;
-  ;; Anything already recorded in the mapping is given an empty (begin) and the already-recorded id
-  ;; otherwise, we will map internal-id to the fresh id in `mapping'
-  (define (mk internal-id)
-    (define new-id (freshen-id internal-id))
-    (cond
-      ;; if it's already done, do nothing
-      [(dict-ref mapping internal-id
-                 ;; if it wasn't there, put it in, and skip this case
-                 (λ () (dict-set! mapping internal-id new-id) #f))
-       => (λ (mapped-id) (values #'(begin) mapped-id null))]
-      [(dict-ref defs internal-id #f)
-       =>
-       (match-lambda
-         [(def-binding _ ty)
-          (mk-value-triple internal-id new-id ty)]
-         [(def-struct-stx-binding _ (? struct-info? si) constr-type)
-          (mk-struct-syntax-triple internal-id new-id si constr-type)]
-         [(def-stx-binding _)
-          (mk-syntax-triple internal-id new-id)])]
-      ;; otherwise, not defined in this module, not our problem
-      [else (values #'(begin) internal-id null)]))
-
-  ;; mk-struct-syntax-triple : identifier? identifier? struct-info? Type/c -> triple/c
-  (define (mk-struct-syntax-triple internal-id new-id si constr-type)
-    (define type-is-constructor? #t) ;Conservative estimate (provide/contract does the same)
-    (match-define (list type-desc constr pred (list accs ...) muts super) (extract-struct-info si))
-    (define-values (defns new-ids aliases)
-      (map/values 3
-                  (lambda (e) (if (identifier? e)
-                                  (mk e)
-                                  (values #'(begin) e null)))
-                  (list* type-desc pred super accs)))
-    (define-values (constr-defn constr-new-id constr-aliases)
-      (cond
-       [(not (identifier? constr))
-        (values #'(begin) #f null)]
-       [(free-identifier=? constr internal-id)
-        (mk-value-triple constr (generate-temporary constr) constr-type)]
-       [else
-        (mk constr)]))
-
-    (define/with-syntax (constr* type-desc* pred* super* accs* ...)
-      (for/list ([i (in-list (cons constr-new-id new-ids))])
-        (and (identifier? i) #`(quote-syntax #,i))))
-
-    (with-syntax* ([id internal-id]
-                   [export-id new-id]
-                   [protected-id (freshen-id #'id)])
-      (values
-        #`(begin
-            #,constr-defn
-            #,@defns
-            (define-syntax protected-id
-              (let ((info (list type-desc* (syntax export-id) pred* (list accs* ...)
-                                (list #,@(map (lambda (x) #'#f) accs)) super*)))
-                #,(if type-is-constructor?
-                      #'(make-struct-info-self-ctor constr* info)
-                      #'info)))
-            (def-export export-id protected-id protected-id))
-        new-id
-        (cons (list #'export-id internal-id)
-              (apply append constr-aliases aliases)))))
-
-
-  ;; mk-syntax-triple : identifier? identifier? -> triple/c
-  (define (mk-syntax-triple internal-id new-id)
-    (with-syntax* ([id internal-id]
-                   [export-id new-id]
-                   [untyped-id (freshen-id #'id)])
-      (define/with-syntax def
-        #`(define-syntax untyped-id
-            (lambda (stx)
-              (tc-error/stx stx "Macro ~a from typed module used in untyped code" 'untyped-id))))
-      (values
-       #`(begin def (def-export export-id id untyped-id))
-       new-id
-       (list (list #'export-id #'id)))))
-
-  ;; mk-value-triple : identifier? identifier? (or/c Type #f) -> triple/c
-  (define (mk-value-triple internal-id new-id ty)
-    (with-syntax* ([id internal-id]
-                   [untyped-id (freshen-id #'id)]
-                   [export-id new-id])
-      (define/with-syntax ctc (generate-temporary 'generated-contract))
-      (define/with-syntax definitions
-        (contract-def/provide-property
-         #'(define-values (ctc) #f)
-         (list ty #'untyped-id #'id pos-blame-id)))
-      (values
-        #'(begin definitions (def-export export-id id untyped-id))
-        new-id
-        null)))
-
-
-  ;; Build the final provide with auxilliary definitions
-  (for/lists (l l*) ([(internal-id external-ids) (in-dict provs)])
-    (define-values (defs id alias) (mk internal-id))
-    (define provide-forms
-      (for/list ([external-id (in-list external-ids)])
-        #`(rename-out [#,id #,external-id])))
-    (when (pair? external-ids) (set-box! include-extra-requires? #t))
-    (values #`(begin #,defs (provide #,@provide-forms))
-            alias)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/renamer.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/renamer.rkt
deleted file mode 100644
index 110f677f95..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/renamer.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/base
-
-(provide renamer get-alternate un-rename)
-
-;; target : identifier
-;; alternate : identifier
-(define-struct typed-renaming (target alternate)
-  #:property prop:rename-transformer 0)
-
-;; identifier -> identifier
-;; get the alternate field of the renaming, if it exists
-(define (get-alternate id)
-  (define-values (v new-id) (syntax-local-value/immediate id (λ _ (values #f #f))))
-  (cond [(typed-renaming? v)
-         (typed-renaming-alternate v)]
-        [(rename-transformer? v)
-         (get-alternate (rename-transformer-target v))]
-        [else id]))
-
-(define (renamer id [alt #f])
-  (if alt
-      (make-typed-renaming (syntax-property id 'not-free-identifier=? #t) alt)
-      (make-rename-transformer (syntax-property id 'not-free-identifier=? #t))))
-
-;; Undo renaming for type lookup.
-;; Used because of macros that mark the identifier used as the binding such as
-;; kw-application or struct constructors
-;;
-;; The syntax-transforming check is for unit tests
-(define (un-rename id)
-  (if (syntax-transforming?)
-      (let-values (((binding new-id) (syntax-local-value/immediate id (lambda () (values #f #f)))))
-        (if (typed-renaming? binding)
-            new-id
-            id))
-      id))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/signatures.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/signatures.rkt
deleted file mode 100644
index ece9c7993a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/signatures.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang racket/base
-(require "../utils/utils.rkt" 
-         racket/unit 
-         (contract-req)
-         (utils unit-utils) (rep type-rep) (types utils))
-(provide (all-defined-out))
-
-(define-signature tc-expr^
-  ([cond-contracted tc-expr (syntax? . -> . full-tc-results/c)]
-   [cond-contracted tc-expr/check (syntax? (or/c tc-results/c #f) . -> . full-tc-results/c)]
-   [cond-contracted tc-expr/check? (syntax? (or/c tc-results/c #f) . -> . (or/c full-tc-results/c #f))]
-   [cond-contracted tc-expr/check/t (syntax? tc-results/c . -> . Type/c)]
-   [cond-contracted tc-expr/check/t? (syntax? (or/c tc-results/c #f) . -> . (or/c Type/c #f))]
-   [cond-contracted tc-body/check (syntax? (or/c tc-results/c #f) . -> . full-tc-results/c)]
-   [cond-contracted tc-expr/t (syntax? . -> . Type/c)]
-   [cond-contracted single-value ((syntax?) ((or/c tc-results/c #f)) . ->* . full-tc-results/c)]))
-
-(define-signature check-subforms^
-  ([cond-contracted check-subforms/ignore (syntax? . -> . void?)]
-   [cond-contracted check-subforms/with-handlers (syntax? (or/c tc-results/c #f) . -> . full-tc-results/c)]))
-
-(define-signature check-class^
-  ([cond-contracted check-class (syntax? (or/c tc-results/c #f) . -> . full-tc-results/c)]))
-
-(define-signature tc-if^
-  ([cond-contracted tc/if-twoarm ((syntax? syntax? syntax?) ((or/c tc-results/c #f)) . ->* . full-tc-results/c)]))
-
-(define-signature tc-literal^
-  ([cond-contracted tc-literal (->* (syntax?) ((or/c Type/c #f)) Type/c)]))
-
-(define-signature tc-send^
-  ([cond-contracted tc/send ((syntax? syntax? syntax? syntax?) ((or/c tc-results/c #f)) . ->* . full-tc-results/c)]))
-
-(define-signature tc-expression^
-  ([cond-contracted tc/#%expression ((syntax?) ((or/c tc-results/c #f)) . ->* . full-tc-results/c)]))
-
-(define-signature tc-lambda^
-  ([cond-contracted tc/lambda (syntax? syntax? syntax? (or/c tc-results/c #f) . -> . full-tc-results/c)]
-   [cond-contracted tc/rec-lambda/check (syntax? syntax? syntax? (listof Type/c) tc-results/c . -> .
-                                                 (values full-tc-results/c full-tc-results/c))]))
-
-(define-signature tc-app^
-  ([cond-contracted tc/app (syntax? (or/c tc-results/c #f) . -> . full-tc-results/c)]
-   [cond-contracted tc/app-regular (syntax? (or/c tc-results/c #f) . -> . full-tc-results/c)]))
-
-(define-signature tc-apply^
-  ([cond-contracted tc/apply (syntax? syntax? . -> . full-tc-results/c)]))
-
-(define-signature tc-let^
-  ([cond-contracted tc/let-values ((syntax? syntax? syntax?) ((or/c #f tc-results/c)) . ->* . full-tc-results/c)]
-   [cond-contracted tc/letrec-values ((syntax? syntax? syntax?) ((or/c #f tc-results/c)) . ->* . full-tc-results/c)]))
-
-(define-signature tc-dots^
-  ([cond-contracted tc/dots (syntax? . -> . (values Type/c symbol?))]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-combined.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-combined.rkt
deleted file mode 100644
index fe6fb00ba9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-combined.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-
-(require "tc-app/tc-app-apply.rkt"
-         "tc-app/tc-app-eq.rkt"
-         "tc-app/tc-app-hetero.rkt"
-         "tc-app/tc-app-keywords.rkt"
-         "tc-app/tc-app-lambda.rkt"
-         "tc-app/tc-app-list.rkt"
-         "tc-app/tc-app-objects.rkt"
-         "tc-app/tc-app-special.rkt"
-         "tc-app/tc-app-values.rkt"
-         "tc-app/tc-app-contracts.rkt"
-         "tc-app/tc-app-main.rkt"
-         "signatures.rkt")
-
-(require racket/unit)
-(provide tc-app-combined@)
-
-(define-compound-unit/infer tc-app-combined@
-  (import tc-expr^ tc-lambda^ tc-let^ tc-apply^ tc-literal^)
-  (export tc-app^)
-
-  (link tc-app-main@
-        tc-app-hetero@ tc-app-list@ tc-app-apply@
-        (() tc-app-values@)
-        tc-app-keywords@
-        tc-app-objects@ tc-app-eq@ tc-app-lambda@ tc-app-special@
-        tc-app-contracts@))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-helper.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-helper.rkt
deleted file mode 100644
index 0d263cd563..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-helper.rkt
+++ /dev/null
@@ -1,404 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         racket/match unstable/list unstable/sequence racket/set racket/list
-         (only-in srfi/1 unzip4) (only-in racket/list make-list)
-         (contract-req)
-         (typecheck check-below tc-subst)
-         (utils tc-utils)
-         (rep type-rep filter-rep)
-         (except-in (types utils abbrev subtype)
-                    -> ->* one-of/c))
-(require-for-cond-contract
-  syntax/stx)
-
-(provide/cond-contract
-  [tc/funapp1
-    ((syntax? stx-list? arr? (listof tc-results/c) (or/c #f tc-results/c))
-     (#:check boolean?)
-     . ->* . full-tc-results/c)])
-(define (tc/funapp1 f-stx args-stx ftype0 argtys expected #:check [check? #t])
-  (match* (ftype0 argtys)
-    ;; we check that all kw args are optional
-    [((arr: dom rng rest #f (and kws (list (Keyword: _ _ #f) ...)))
-      (list (tc-result1: t-a phi-a o-a) ...))
-
-     (when check?
-       (cond [(and (not rest) (not (= (length dom) (length t-a))))
-              (tc-error/fields "could not apply function"
-                               #:more "wrong number of arguments provided"
-                               "expected" (length dom)
-                               "given" (length t-a)
-                               #:delayed? #t)]
-             [(and rest (< (length t-a) (length dom)))
-              (tc-error/fields "could not apply function"
-                               #:more "wrong number of arguments provided"
-                               "expected at least" (length dom)
-                               "given" (length t-a)
-                               #:delayed? #t)])
-       (for ([dom-t (if rest (in-sequence-forever dom rest) (in-list dom))]
-             [a (in-syntax args-stx)]
-             [arg-t (in-list t-a)])
-         (parameterize ([current-orig-stx a]) (check-below arg-t dom-t))))
-     (let* ([dom-count (length dom)])
-       ;; Currently do nothing with rest args and keyword args as there are no support for them in
-       ;; objects yet.
-       (let-values
-           ([(o-a t-a) (for/lists (os ts)
-                         ([_ (in-range dom-count)]
-                          [oa (in-sequence-forever (in-list o-a) -empty-obj)]
-                          [ta (in-sequence-forever (in-list t-a) Univ)])
-                         (values oa ta))])
-           (values->tc-results rng o-a t-a)))]
-    ;; this case should only match if the function type has mandatory keywords
-    ;; but no keywords were provided in the application
-    [((arr: _ _ _ _
-            ;; at least one mandatory keyword
-            (app (λ (kws)
-                   (for/or ([keyword (in-list kws)])
-                     (match keyword
-                       [(Keyword: kw _ #t) kw]
-                       [_ #f])))
-                 (? values req-kw))) _)
-     (when check?
-       (tc-error/fields "could not apply function"
-                        #:more "a required keyword was not supplied"
-                        "missing keyword" req-kw))]
-    [((arr: _ _ _ drest '()) _)
-     (int-err "funapp with drest args ~a ~a NYI" drest argtys)]
-    [((arr: _ _ _ _ kws) _)
-     (int-err "funapp with keyword args ~a NYI" kws)]))
-
-
-(define (make-printable t)
-  (match t
-    [(tc-result1: t) (cleanup-type t)]
-    [(tc-results: ts) (-values (map cleanup-type ts))]
-    [(tc-any-results: f) (-AnyValues -top)]
-    [_ (cleanup-type t)]))
-
-(define (stringify-domain dom rst drst [rng #f])
-  (let ([doms-string (if (null? dom) "" (string-append (stringify (map make-printable dom)) " "))]
-        [rng-string (if rng (format " -> ~a" rng) "")])
-    (cond [drst
-           (format "~a~a ... ~a~a" doms-string (car drst) (cdr drst) rng-string)]
-          [rst
-           (format "~a~a *~a" doms-string rst rng-string)]
-          [else (string-append (stringify (map make-printable dom)) rng-string)])))
-
-;; Generates error messages when operand types don't match operator domains.
-(provide/cond-contract
-  [domain-mismatches
-   ((syntax? syntax? Type/c (listof (listof Type/c)) (listof (or/c #f Type/c))
-     (listof (or/c #f (cons/c Type/c (or/c natural-number/c symbol?))))
-     (listof SomeValues/c) (listof tc-results?) (or/c #f Type/c) any/c)
-    (#:expected (or/c #f tc-results/c)
-     #:return tc-results?
-     #:msg-thunk (-> string? string?))
-    . ->* . tc-results/c)])
-(define (domain-mismatches f-stx args-stx ty doms rests drests rngs arg-tys tail-ty tail-bound
-                           #:expected [expected #f] #:return [return (ret -Bottom)]
-                           #:msg-thunk [msg-thunk (lambda (dom) dom)])
-  (define arguments-str
-    (stringify-domain arg-tys
-                      (if (not tail-bound) tail-ty #f)
-                      (if tail-bound (cons tail-ty tail-bound) #f)))
-  (cond
-    [(null? doms)
-     (tc-error/expr/fields
-      "cannot apply a function with unknown arity"
-      #:more (format "~a has type Procedure which cannot be applied"
-                     (name->function-str (and (identifier? f-stx) f-stx)))
-      #:return return)]
-    [(and (= 1 (length doms)) (not (car rests)) (not (car drests)) (not tail-ty) (not tail-bound))
-     (tc-error/expr
-      #:return return
-      (msg-thunk
-       (apply string-append
-              (if (not (= (length (car doms)) (length arg-tys)))
-                  (format "Wrong number of arguments - Expected ~a, but got ~a\n\n" (length (car doms)) (length arg-tys))
-                  "")
-              (append
-               (for/list ([dom-t (in-list (extend arg-tys (car doms) #f))]
-                          [arg-t (in-list (extend (car doms) arg-tys #f))]
-                          [i (in-naturals 1)])
-                         (let ([dom-t (or dom-t "-none-")]
-                               [arg-t (or arg-t "-none-")])
-                           (format "Argument ~a:\n  Expected: ~a\n  Given:    ~a\n" i (make-printable dom-t) (make-printable arg-t))))
-               (list
-                (if expected
-                    (format "\nResult type:     ~a\nExpected result: ~a\n"
-                            (car rngs) (make-printable expected))
-                    ""))))))]
-    [(= 1 (length doms))
-     (tc-error/expr
-      #:return return
-      (msg-thunk
-       (string-append
-        "Domain: "
-        (stringify-domain (car doms) (car rests) (car drests))
-        "\nArguments: "
-        arguments-str
-        "\n"
-        (if expected
-            (format "Result type: ~a\nExpected result: ~a\n"
-                    (car rngs) (make-printable expected))
-            ""))))]
-    [else
-     (define label  (if expected   "Types: "   "Domains: "))
-     (define nl+spc (if expected "\n       " "\n         "))
-     ;; we restrict the domains shown in the error messages to those that
-     ;; are useful
-     (match-let ([(list pdoms prngs prests pdrests) (possible-domains doms rests drests rngs expected)])
-       ;; if we somehow eliminate all the cases (bogus expected type) fall back to showing the
-       ;; extra cases
-       (let-values ([(pdoms rngs rests drests)
-                     (if (null? pdoms)
-                         (values doms rngs rests drests)
-                         (values pdoms prngs prests pdrests))])
-         ;; only use `tc/funapp1` if `tail-ty` was *not* provided
-         ;; since it either won't error correctly or produces a poor error
-         (cond [(and (not tail-ty) (= (length pdoms) 1))
-                ;; if we narrowed down the possible cases to a single one, have
-                ;; tc/funapp1 generate a better error message
-                (tc/funapp1 f-stx args-stx
-                            (make-arr (car pdoms) (car rngs)
-                                      (car rests) (car drests) null)
-                            arg-tys expected)
-                return]
-               [else
-                ;; if not, print the message as usual
-                (define pdoms* (map make-printable pdoms))
-                (define err-doms
-                  (string-append
-                   label
-                   (stringify (if expected
-                                  (map stringify-domain pdoms* rests drests rngs)
-                                  (map stringify-domain pdoms* rests drests))
-                              nl+spc)
-                   "\nArguments: "
-                   arguments-str
-                   "\n"
-                   (if expected
-                       (format "Expected result: ~a\n" (make-printable expected))
-                       "")))
-                (tc-error/expr
-                 #:return return
-                 (msg-thunk err-doms))])))])) ; generate message
-
-
-;; to avoid long and confusing error messages, in the case of functions with
-;; multiple similar domains (<, >, +, -, etc.), we show only the domains that
-;; are relevant to this specific error
-;; this is done in several ways:
-;; - if a case-lambda case is subsumed by another, we don't need to show it
-;;   (subsumed cases may be useful for their filter information, but this is
-;;   unrelated to error reporting)
-;; - if we have an expected type, we don't need to show the domains for which
-;;   the result type is not a subtype of the expected type
-;; - we can disregard domains that are more restricted than required to get
-;;   the expected type (or all but the most liberal domain when no type is
-;;   expected)
-;;   ex: if we have the 2 following possible domains for an operator:
-;;       Fixnum -> Fixnum
-;;       Integer -> Integer
-;;     and an expected type of Integer for the result of the application,
-;;     we can disregard the Fixnum domain since it imposes a restriction that
-;;     is not necessary to get the expected type
-;; This function can be used in permissive or restrictive mode.
-;; in permissive mode, domains that are not consistent with the expected type
-;; may still be considered possible. This is useful for error messages, where
-;; we want to collapse domains always, regardless of expected type. In
-;; restrictive mode, only domains that are consistent with the expected type can
-;; be considered possible. This is useful when computing the possibly empty set
-;; of domains that would *satisfy* the expected type, e.g. for the :query-type
-;; forms.
-;; TODO separating pruning and collapsing into separate functions may be nicer
-(define (possible-domains doms rests drests rngs expected [permissive? #t])
-
-  ;; is fun-ty subsumed by a function type in others?
-  (define (is-subsumed-in? fun-ty others)
-    ;; a case subsumes another if the first one is a subtype of the other
-    (ormap (lambda (x) (subtype x fun-ty))
-           others))
-
-  ;; currently does not take advantage of multi-valued or arbitrary-valued expected types,
-  (define expected-ty
-    (and expected
-         (match expected
-           [(tc-result1: t) t]
-           [(tc-any-results: (or (Top:) (NoFilter:))) #t] ; anything is a subtype of expected
-           [_ #f]))) ; don't know what it is, don't do any pruning
-  (define (returns-subtype-of-expected? fun-ty)
-    (or (not expected) ; no expected type, anything is fine
-        (eq? expected-ty #t) ; expected is tc-anyresults, anything is fine
-        (and expected-ty ; not some unknown expected tc-result
-             (match fun-ty
-               [(Function: (list (arr: _ rng _ _ _)))
-                (let ([rng (match rng
-                             [(Values: (list (Result: t _ _)))
-                              t]
-                             [(ValuesDots: (list (Result: t _ _)) _ _)
-                              t]
-                             [_ #f])])
-                  (and rng (subtype rng expected-ty)))]))))
-
-  (define orig (map list doms rngs rests drests))
-
-  (define cases
-    (map (compose make-Function list make-arr)
-         doms
-         (map (match-lambda ; strip filters
-               [(AnyValues: f) (-AnyValues -top)]
-               [(Values: (list (Result: t _ _) ...))
-                (-values t)]
-               [(ValuesDots: (list (Result: t _ _) ...) _ _)
-                (-values t)])
-              rngs)
-         rests drests (make-list (length doms) null)))
-
-  ;; iterate in lock step over the function types we analyze and the parts
-  ;; that we will need to print the error message, to make sure we throw
-  ;; away cases consistently
-  (define-values (candidates* parts-acc*)
-    (for/fold ([candidates '()] ; from cases
-               [parts-acc '()]) ; from orig
-        ([c (in-list cases)]
-         ;; the parts we'll need to print the error message
-         [p (in-list orig)])
-      (if (returns-subtype-of-expected? c)
-          (values (cons c candidates) ; we keep this one
-                  (cons p parts-acc))
-          ;; we discard this one
-          (values candidates parts-acc))))
-
-  ;; if none of the cases return a subtype of the expected type, still do some
-  ;; merging, but do it on the entire type
-  ;; only do this if we're in permissive mode
-  (define-values (candidates parts-acc)
-    (if (and permissive? (null? candidates*))
-        (values cases orig)
-        (values candidates* parts-acc*)))
-
-  ;; among the domains that fit with the expected type, we only need to
-  ;; keep the most liberal
-  ;; since we only care about permissiveness of domains, we reconstruct
-  ;; function types with a return type of any then test for subtyping
-  (define fun-tys-ret-any
-    (map (match-lambda
-          [(Function: (list (arr: dom _ rest drest _)))
-           (make-Function (list (make-arr dom
-                                          (-values (list Univ))
-                                          rest drest null)))])
-         candidates))
-
-  ;; Heuristic: often, the last case in the definition (first at this
-  ;; point, we've reversed the list) is the most general of all, subsuming
-  ;; all the others. If that's the case, just go with it. Otherwise, go
-  ;; the slow way.
-  (cond [(and (not (null? fun-tys-ret-any))
-              (andmap (lambda (c) (subtype (car fun-tys-ret-any) c))
-                      fun-tys-ret-any))
-         ;; Yep. Return early.
-         (map list (car parts-acc))]
-        
-        [else
-         ;; No luck, do it the slow way
-         (define parts-res
-           ;; final pass, we only need the parts to print the error message
-           (for/fold ([parts-res '()])
-               ([c (in-list fun-tys-ret-any)]
-                [p (in-list parts-acc)]
-                ;; if a case is a supertype of another, we discard it
-                #:unless (is-subsumed-in? c (remove c fun-tys-ret-any)))
-
-             (cons p parts-res)))
-
-         (call-with-values
-             (lambda () (unzip4 (reverse parts-res)))
-           list)]))
-
-;; Wrapper over possible-domains that works on types.
-(provide/cond-contract
-  [cleanup-type ((Type/c) ((or/c #f Type/c) any/c) . ->* . Type/c)])
-(define (cleanup-type t [expected #f] [permissive? #t])
-  (match t
-    ;; function type, prune if possible.
-    [(Function/arrs: doms rngs rests drests kws)
-     (match-let ([(list pdoms rngs rests drests)
-                  (possible-domains doms rests drests rngs
-                                    (and expected (ret expected))
-                                    permissive?)])
-       (if (= (length pdoms) (length doms))
-           ;; pruning didn't improve things, return the original
-           ;; (Note: pruning may have reordered clauses, so may not be `equal?' to
-           ;;  the original, which may confuse `:print-type''s pruning detection)
-           t
-           ;; pruning helped, return pruned type
-           (make-Function (map make-arr
-                               pdoms rngs rests drests (make-list (length pdoms) null)))))]
-    ;; not a function type. keep as is.
-    [_ t]))
-
-(provide/cond-contract
-  [poly-fail ((syntax? syntax? Type/c (listof tc-results?))
-              (#:name (or/c #f syntax?)
-               #:expected (or/c #f tc-results/c))
-              . ->* . tc-results/c)])
-(define (poly-fail f-stx args-stx t argtypes #:name [name #f] #:expected [expected #f])
-  (match t
-    [(or (Poly-names:
-          msg-vars
-          (Function/arrs: msg-doms msg-rngs msg-rests msg-drests (list (Keyword: _ _ #f) ...)))
-         (PolyDots-names:
-          msg-vars
-          (Function/arrs: msg-doms msg-rngs msg-rests msg-drests (list (Keyword: _ _ #f) ...)))
-         (PolyRow-names:
-          msg-vars _
-          (Function/arrs: msg-doms msg-rngs msg-rests msg-drests (list (Keyword: _ _ #f) ...))))
-     (let ([fcn-string (name->function-str name)])
-       (if (and (andmap null? msg-doms)
-                (null? argtypes))
-           (tc-error/expr (string-append
-                           "Could not infer types for applying polymorphic "
-                           fcn-string
-                           "\n"))
-           (domain-mismatches f-stx args-stx t msg-doms msg-rests msg-drests
-                              msg-rngs argtypes #f #f #:expected expected
-                              #:msg-thunk (lambda (dom)
-                                            (string-append
-                                             "Polymorphic " fcn-string " could not be applied to arguments:\n"
-                                             dom
-                                             (if (not (subset? (apply set-union (seteq) (map fv/list msg-doms))
-                                                               (list->seteq msg-vars)))
-                                                 (string-append "Type Variables: " (stringify msg-vars) "\n")
-                                                 ""))))))]
-    [(or (Poly-names: msg-vars (Function/arrs: msg-doms msg-rngs msg-rests msg-drests kws))
-         (PolyDots-names: msg-vars (Function/arrs: msg-doms msg-rngs msg-rests msg-drests kws))
-         (PolyRow-names: msg-vars _ (Function/arrs: msg-doms msg-rngs msg-rests msg-drests kws)))
-     (let ([fcn-string (if name
-                           (format "function with keywords ~a" (syntax->datum name))
-                           "function with keywords")])
-       (if (and (andmap null? msg-doms)
-                (null? argtypes))
-           (tc-error/expr (string-append
-                           "Could not infer types for applying polymorphic "
-                           fcn-string
-                           "\n"))
-           (domain-mismatches f-stx args-stx t msg-doms msg-rests msg-drests
-                              msg-rngs argtypes #f #f #:expected expected
-                              #:msg-thunk (lambda (dom)
-                                            (string-append
-                                             "Polymorphic " fcn-string " could not be applied to arguments:\n"
-                                             dom
-                                             (if (not (subset? (apply set-union (seteq) (map fv/list msg-doms))
-                                                               (list->seteq msg-vars)))
-                                                 (string-append "Type Variables: " (stringify msg-vars) "\n")
-                                                 ""))))))]))
-
-;; name->function-str : (Option Identifier) -> String
-;; Produce a function name string for error messages
-(define (name->function-str name)
-  (if name
-      (format "function `~a'" (syntax->datum name))
-      "function"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/signatures.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/signatures.rkt
deleted file mode 100644
index e7b325b626..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/signatures.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-(require racket/unit
-         "../../utils/utils.rkt"
-         (contract-req)
-         (utils unit-utils))
-(require-for-cond-contract syntax/parse/experimental/reflect)
-
-(provide (all-defined-out))
-
-(define-for-cond-contract checker/c reified-syntax-class?)
-
-(define-signature tc-app-hetero^
-  ([cond-contracted tc/app-hetero checker/c]))
-
-(define-signature tc-app-list^
-  ([cond-contracted tc/app-list checker/c]))
-
-(define-signature tc-app-apply^
-  ([cond-contracted tc/app-apply checker/c]))
-
-(define-signature tc-app-values^
-  ([cond-contracted tc/app-values checker/c]))
-
-(define-signature tc-app-keywords^
-  ([cond-contracted tc/app-keywords checker/c]))
-
-(define-signature tc-app-objects^
-  ([cond-contracted tc/app-objects checker/c]))
-
-(define-signature tc-app-eq^
-  ([cond-contracted tc/app-eq checker/c]))
-
-(define-signature tc-app-lambda^
-  ([cond-contracted tc/app-lambda checker/c]))
-
-(define-signature tc-app-special^
-  ([cond-contracted tc/app-special checker/c]))
-
-(define-signature tc-app-contracts^
-  ([cond-contracted tc/app-contracts checker/c]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-apply.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-apply.rkt
deleted file mode 100644
index bfd3ace360..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-apply.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/unit
-
-(require "../../utils/utils.rkt"
-         "signatures.rkt"
-         "utils.rkt"
-         syntax/parse racket/match
-         (typecheck signatures)
-         (types abbrev utils)
-         (rep type-rep)
-
-         (for-label
-          racket/base
-          (only-in '#%kernel [apply k:apply])))
-
-
-(import tc-expr^ tc-apply^)
-(export tc-app-apply^)
-
-(define-literal-set apply-literals
-  #:for-label
-  (k:apply apply values))
-
-(define-tc/app-syntax-class (tc/app-apply expected)
-  #:literal-sets (apply-literals)
-  (pattern ((~or apply k:apply) (~and f values) e)
-    (match (single-value #'e)
-      [(tc-result1: (ListDots: dty dbound))
-       (ret null null null dty dbound)]
-      [(tc-result1: (List: ts)) (ret ts)]
-      [_ (tc/apply #'f #'(e))]))
-  (pattern ((~or apply k:apply) f . args)
-    (tc/apply #'f #'args)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-contracts.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-contracts.rkt
deleted file mode 100644
index 9c86bb1c89..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-contracts.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/unit
-
-;; This module provides custom type-checking rules for the expansion
-;; of contracted values
-
-(require "../../utils/utils.rkt"
-         "signatures.rkt"
-         "utils.rkt"
-         syntax/parse
-         (typecheck signatures)
-         (for-template racket/base
-                       ;; shift -1 because it's provided +1
-                       racket/contract/private/provide))
-
-(import tc-expr^)
-(export tc-app-contracts^)
-
-(define-tc/app-syntax-class (tc/app-contracts expected)
-  (pattern (ctc-id:id blame e ...)
-    ;; check that this is an application from the contract system
-    #:when (contract-rename-id-property #'ctc-id)
-    (check-contract #'ctc-id #'(e ...) expected)))
-
-;; Assume that the contracted thing is of the same type the type
-;; environment assigned to the exported identifier. Note that this
-;; is only sound if the contract is a chaperone contract, so don't
-;; put things in the base type environment if they have impersonator
-;; contracts installed.
-(define (check-contract orig-value-id other-args expected)
-  (tc-expr/check #`(#%plain-app
-                    #,(contract-rename-id-property orig-value-id)
-                    . #,other-args)
-                 expected))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-eq.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-eq.rkt
deleted file mode 100644
index 4bca1593c2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-eq.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang racket/unit
-
-(require "../../utils/utils.rkt"
-         "signatures.rkt"
-         "utils.rkt"
-         syntax/parse syntax/stx racket/match
-         (typecheck signatures tc-funapp)
-         (types abbrev union utils)
-         (rep type-rep)
-
-         (for-label racket/base racket/bool))
-
-(import tc-expr^)
-(export tc-app-eq^)
-
-(define-literal-set eq-literals
-  #:for-label
-  (eq? equal? eqv? string=? symbol=? memq member memv))
-
-;; comparators that inform the type system
-;; `=' is not included. Its type is more useful than this typing rule.
-(define-syntax-class comparator
-  #:literal-sets (eq-literals)
-  (pattern (~or eq? equal? eqv? string=? symbol=? member memq memv)))
-
-
-(define-tc/app-syntax-class (tc/app-eq expected)
-  (pattern (eq?:comparator v1 v2)
-    ;; make sure the whole expression is type correct
-    (match* ((tc/funapp #'eq? #'(v1 v2) (tc-expr/t #'eq?)
-                        (stx-map single-value #'(v1 v2)) expected)
-             ;; check thn and els with the eq? info
-             (tc/eq #'eq? #'v1 #'v2))
-      [((tc-result1: t) (tc-result1: t* f o))
-           (ret t f o)])))
-
-
-;; typecheck eq? applications
-;; identifier expr expr -> tc-results
-(define (tc/eq comparator v1 v2)
-  (define (eq?-able e) (or (boolean? e) (keyword? e) (symbol? e) (eof-object? e)))
-  (define (eqv?-able e) (or (eq?-able e) (number? e) (char? e)))
-  (define (equal?-able e) #t)
-  (define (id=? a b)
-    (free-identifier=? a b #f (syntax-local-phase-level)))
-  (define (ok? val)
-    (define-syntax-rule (alt nm pred ...)
-      (and (id=? #'nm comparator)
-           (or (pred val) ...)))
-    (or (alt symbol=? symbol?)
-        (alt string=? string?)
-        (alt eq? eq?-able)
-        (alt eqv? eqv?-able)
-        (alt equal? equal?-able)))
-  (match* ((single-value v1) (single-value v2))
-    [((tc-result1: t _ o) (tc-result1: (Value: (? ok? val))))
-     (ret -Boolean (-FS (-filter (-val val) o) (-not-filter (-val val) o)))]
-    [((tc-result1: (Value: (? ok? val))) (tc-result1: t _ o))
-     (ret -Boolean (-FS (-filter (-val val) o) (-not-filter (-val val) o)))]
-    [((tc-result1: t _ o)
-      (or (and (? (lambda _ (id=? #'member comparator)))
-               (tc-result1: (List: (list (and ts (Value: _)) ...))))
-          (and (? (lambda _ (id=? #'memv comparator)))
-               (tc-result1: (List: (list (and ts (Value: (? eqv?-able))) ...))))
-          (and (? (lambda _ (id=? #'memq comparator)))
-               (tc-result1: (List: (list (and ts (Value: (? eq?-able))) ...))))))
-     (let ([ty (apply Un ts)])
-       (ret (Un (-val #f) t)
-            (-FS (-filter ty o)
-                 (-not-filter ty o))))]
-    [(_ _) (ret -Boolean)]))
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-hetero.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-hetero.rkt
deleted file mode 100644
index 4717bd7aa0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-hetero.rkt
+++ /dev/null
@@ -1,139 +0,0 @@
-#lang racket/unit
-
-(require "../../utils/utils.rkt"
-         syntax/parse syntax/stx racket/match unstable/sequence unstable/syntax
-         "signatures.rkt"
-         "utils.rkt"
-         (types utils abbrev numeric-tower union resolve type-table generalize)
-         (typecheck signatures check-below)
-         (rep type-rep rep-utils)
-         (for-label racket/unsafe/ops racket/base))
-
-(import tc-expr^ tc-app^ tc-literal^)
-(export tc-app-hetero^)
-
-(define-literal-set hetero-literals
-  #:for-label
-  (vector-ref unsafe-vector-ref unsafe-vector*-ref
-   vector-set! unsafe-vector-set! unsafe-vector*-set!
-   unsafe-struct-ref unsafe-struct*-ref
-   unsafe-struct-set! unsafe-struct*-set!
-   vector-immutable vector))
-
-(define (tc/index expr)
-  (syntax-parse expr
-   #:literal-sets (kernel-literals)
-   [(quote i:number)
-    (let ((type (tc-literal #'i)))
-      (add-typeof-expr expr (ret type))
-      (syntax-e #'i))]
-   [_
-    (match (tc-expr expr)
-     [(tc-result1: (Value: (? number? i))) i]
-     [tc-results
-       (check-below tc-results (ret -Integer))
-       #f])]))
-
-(define (index-error i-val i-bound expr type name)
-  (cond 
-    [(not (and (integer? i-val) (exact? i-val)))
-     (tc-error/expr #:stx expr "expected exact integer for ~a index, but got ~a" name i-val)]
-    [(< i-val 0)
-     (tc-error/expr #:stx expr "index ~a too small for ~a ~a" i-val name type)]
-    [(not (< i-val i-bound))
-     (tc-error/expr #:stx expr "index ~a too large for ~a ~a" i-val name type)]))
-
-(define (valid-index? i bound)
- (and (integer? i) (exact? i) (<= 0 i (sub1 bound))))
-
-
-;; FIXME - Do something with paths in the case that a structure/vector is not mutable
-(define (tc/hetero-ref i-e es-t vec-t name)
-  (define i-val (tc/index i-e))
-  (define i-bound (length es-t))
-  (cond
-    [(valid-index? i-val i-bound)
-     (ret (list-ref es-t i-val))]
-    [(not i-val)
-     (ret (apply Un es-t))]
-    [else
-     (index-error i-val i-bound i-e vec-t name)]))
-
-(define (tc/hetero-set! i-e es-t val-e vec-t name)
-  (define i-val (tc/index i-e))
-  (define i-bound (length es-t))
-  (cond 
-    [(valid-index? i-val i-bound)
-     (tc-expr/check val-e (ret (list-ref es-t i-val)))
-     (ret -Void)]
-    [(not i-val)
-     (define val-t (single-value val-e))
-     (for ((es-type (in-list es-t)))
-       (check-below val-t (ret es-type)))
-     (ret -Void)]
-    [else
-     (single-value val-e)
-     (index-error i-val i-bound i-e vec-t name)]))
-
-(define-tc/app-syntax-class (tc/app-hetero expected)
-  #:literal-sets (hetero-literals)
-  (pattern (~and form ((~or unsafe-struct-ref unsafe-struct*-ref) struct:expr index:expr))
-    (match (single-value #'struct)
-      [(tc-result1: (and struct-t (app resolve (Struct: _ _ (list (fld: flds _ _) ...) _ _ _))))
-       (tc/hetero-ref #'index flds struct-t "struct")]
-      [s-ty (tc/app-regular #'form expected)]))
-  ;; vector-ref on het vectors
-  (pattern (~and form ((~or vector-ref unsafe-vector-ref unsafe-vector*-ref) vec:expr index:expr))
-    (match (single-value #'vec)
-      [(tc-result1: (and vec-t (app resolve (HeterogeneousVector: es))))
-       (tc/hetero-ref #'index es vec-t "vector")]
-      [v-ty (tc/app-regular #'form expected)]))
-  ;; unsafe struct-set! 
-  (pattern (~and form ((~or unsafe-struct-set! unsafe-struct*-set!) s:expr index:expr val:expr))
-    (match (single-value #'s)
-      [(tc-result1: (and struct-t (app resolve (Struct: _ _ (list (fld: flds _ _) ...) _ _ _))))
-       (tc/hetero-set! #'index flds #'val struct-t "struct")]
-      [s-ty (tc/app-regular #'form expected)]))
-  ;; vector-set! on het vectors
-  (pattern (~and form ((~or vector-set! unsafe-vector-set! unsafe-vector*-set!) v:expr index:expr val:expr))
-    (match (single-value #'v)
-      [(tc-result1: (and vec-t (app resolve (HeterogeneousVector: es))))
-       (tc/hetero-set! #'index es #'val vec-t "vector")]
-      [v-ty (tc/app-regular #'form expected)]))
-  (pattern (~and form ((~or vector-immutable vector) args:expr ...))
-    (match expected
-      [(tc-result1: (app resolve (Vector: t)))
-       (ret (make-HeterogeneousVector 
-              (for/list ([e (in-syntax #'(args ...))])
-                (tc-expr/check e (ret t))
-                t)))]
-      [(tc-result1: (app resolve (HeterogeneousVector: ts)))
-       (cond
-         [(= (length ts) (syntax-length #'(args ...)))
-          (ret
-            (make-HeterogeneousVector
-              (for/list ([e (in-syntax #'(args ...))]
-                         [t (in-list ts)])
-                (tc-expr/check/t e (ret t))))
-            -true-filter)]
-         [else
-          (tc-error/expr
-            "expected vector with ~a elements, but got ~a"
-            (length ts) (make-HeterogeneousVector (stx-map tc-expr/t #'(args ...))))])]
-      ;; If the expected type is a union, then we examine just the parts
-      ;; of the union that are vectors.  If there's only one of those,
-      ;; we re-run this whole algorithm with that.  Otherwise, we treat
-      ;; it like any other expected type.
-      [(tc-result1: (app resolve (Union: ts))) (=> continue)
-       (define u-ts (for/list ([t (in-list ts)]
-                               #:when (eq? 'vector (Type-key t)))
-                      t))
-       (match u-ts
-         [(list t0) (tc/app #'(#%plain-app . form) (ret t0))]
-         [_ (continue)])]
-      ;; since vectors are mutable, if there is no expected type, we want to generalize the element type
-      [(or #f (tc-any-results: _) (tc-result1: _))
-       (ret (make-HeterogeneousVector
-              (for/list ((e (in-syntax #'(args ...))))
-                (generalize (tc-expr/t e)))))]
-      [_ (ret Err)])))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-keywords.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-keywords.rkt
deleted file mode 100644
index 1328ad3f5a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-keywords.rkt
+++ /dev/null
@@ -1,138 +0,0 @@
-
-#lang racket/unit
-
-(require (rename-in "../../utils/utils.rkt" [infer r:infer])
-         "signatures.rkt"
-         "utils.rkt"
-         syntax/parse syntax/stx racket/match racket/set
-         (typecheck signatures tc-app-helper tc-funapp tc-metafunctions)
-         (types abbrev utils substitute subtype)
-         (rep type-rep)
-         (utils tc-utils)
-         (r:infer infer)
-         (for-label racket/base)
-         ;; adjusted -1 since it's provided for-syntax
-         (only-in (for-template racket/contract/private/provide)
-                  contract-neg-party-property))
-
-
-(import tc-expr^)
-(export tc-app-keywords^)
-
-(define-literal-set keyword-literals #:for-label (list))
-
-(define-tc/app-syntax-class (tc/app-keywords expected)
-  #:literal-sets (kernel-literals keyword-literals)
-  (pattern (~and form
-                 ((#%plain-app cpce s-kp fn kpe kws num)
-                  kw-list
-                  (#%plain-app list . kw-arg-list)
-                  . *pos-args))
-    #:declare cpce (id-from 'checked-procedure-check-and-extract 'racket/private/kw)
-    #:declare s-kp (id-from 'struct:keyword-procedure 'racket/private/kw)
-    #:declare kpe  (id-from 'keyword-procedure-extract 'racket/private/kw)
-    ;; If this application is of a module boundary contract function or not
-    ;; If #t, then the contract system has inserted an extra argument which we
-    ;; need to ignore
-    #:attr boundary-ctc? (contract-neg-party-property #'fn)
-    #:with pos-args (if (attribute boundary-ctc?)
-                        (stx-cdr #'*pos-args)
-                        #'*pos-args)
-    (match (tc-expr #'fn)
-      [(tc-result1:
-        (Poly: vars
-               (Function: (list (and ar (arr: dom rng (and rest #f) (and drest #f) kw-formals))))))
-       (=> fail)
-       (unless (set-empty? (fv/list kw-formals))
-         (fail))
-       (match (stx-map single-value #'pos-args)
-         [(list (tc-result1: argtys-t) ...)
-          (let* ([subst (infer vars null argtys-t dom rng
-                               (and expected (tc-results->values expected)))])
-            (unless subst (fail))
-            (tc-keywords #'form (list (subst-all subst ar))
-                         (type->list (tc-expr/t #'kws)) #'kw-arg-list #'pos-args expected))])]
-      [(tc-result1: (Function: arities))
-       (tc-keywords #'(#%plain-app . form) arities (type->list (tc-expr/t #'kws))
-                    #'kw-arg-list #'pos-args expected)]
-      [(tc-result1: (Poly: _ (Function: _)))
-       (tc-error/expr "Inference for polymorphic keyword functions not supported")]
-      [(tc-result1: t)
-       (tc-error/expr "Cannot apply expression of type ~a, since it is not a function type" t)])))
-
-(define (tc-keywords/internal arity kws kw-args error?)
-  (match arity
-    [(arr: dom rng rest #f ktys)
-     ;; assumes that everything is in sorted order
-     (let loop ([actual-kws kws]
-                [actuals (stx-map tc-expr/t kw-args)]
-                [formals ktys])
-       (match* (actual-kws formals)
-         [('() '())
-          (void)]
-         [(_ '())
-          (if error?
-              (tc-error/delayed "Unexpected keyword argument ~a" (car actual-kws))
-              #f)]
-         [('() (cons fst rst))
-          (match fst
-            [(Keyword: k _ #t)
-             (if error?
-                 (tc-error/delayed "Missing keyword argument ~a" k)
-                 #f)]
-            [_ (loop actual-kws actuals rst)])]
-         [((cons k kws-rest) (cons (Keyword: k* t req?) form-rest))
-          (cond [(eq? k k*) ;; we have a match
-                 (if (subtype (car actuals) t)
-                     ;; success
-                     (loop kws-rest (cdr actuals) form-rest)
-                     ;; failure
-                     (and error?
-                          (tc-error/delayed
-                           "Wrong function argument type, expected ~a, got ~a for keyword argument ~a"
-                           t (car actuals) k)
-                          (loop kws-rest (cdr actuals) form-rest)))]
-                [req? ;; this keyword argument was required
-                 (if error?
-                     (begin (tc-error/delayed "Missing keyword argument ~a" k*)
-                            (loop kws-rest (cdr actuals) form-rest))
-                     #f)]
-                [else ;; otherwise, ignore this formal param, and continue
-                 (loop actual-kws actuals form-rest)])]))]))
-
-(define (tc-keywords form arities kws kw-args pos-args expected)
-  (match arities
-    [(list (and a (arr: dom rng rest #f ktys)))
-     (tc-keywords/internal a kws kw-args #t)
-     (tc/funapp (car (syntax-e form)) kw-args
-                (->* dom rest rng)
-                (stx-map tc-expr pos-args) expected)]
-    [(list (and a (arr: doms rngs rests (and drests #f) ktyss)) ...)
-     (let ([new-arities
-            (for/list ([a (in-list arities)]
-                       ;; find all the arities where the keywords match
-                       #:when (tc-keywords/internal a kws kw-args #f))
-              (match a
-                [(arr: dom rng rest #f ktys) (make-arr* dom rng #:rest rest)]))])
-       (if (null? new-arities)
-           (domain-mismatches
-            (car (syntax-e form)) (cdr (syntax-e form))
-            arities doms rests drests rngs
-            (stx-map tc-expr pos-args)
-            #f #f #:expected expected
-            #:msg-thunk
-            (lambda (dom)
-              (string-append "No function domains matched in function application:\n"
-                             dom)))
-           (tc/funapp (car (syntax-e form)) kw-args
-                      (make-Function new-arities)
-                      (stx-map tc-expr pos-args) expected)))]))
-
-(define (type->list t)
-  (match t
-    [(Pair: (Value: (? keyword? k)) b)
-     (cons k (type->list b))]
-    [(Value: '()) null]
-    [_ (int-err "bad value in type->list: ~a" t)]))
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-lambda.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-lambda.rkt
deleted file mode 100644
index 4a0c2a8633..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-lambda.rkt
+++ /dev/null
@@ -1,122 +0,0 @@
-#lang racket/unit
-
-(require "../../utils/utils.rkt"
-         "signatures.rkt"
-         "utils.rkt"
-         (prefix-in - (contract-req))
-         syntax/parse racket/match racket/list
-         unstable/sequence unstable/syntax
-         (typecheck signatures find-annotation)
-         (types abbrev utils generalize type-table)
-         (private type-annotation syntax-properties)
-         ;; Needed to construct args to tc/let-values
-         (for-template racket/base)
-         (for-label racket/base))
-
-
-(import tc-expr^ tc-let^ tc-lambda^)
-(export tc-app-lambda^)
-
-(define-literal-set lambda-literals
-  #:for-label
-  (null? pair? null))
-
-(define-tc/app-syntax-class (tc/app-lambda expected)
-  #:literal-sets (kernel-literals)
-  ;; let loop
-  (pattern ((letrec-values ([(lp) (~and lam (#%plain-lambda (args ...) . body))]) lp*) . actuals)
-    #:when expected
-    #:when (not (andmap type-annotation (syntax->list #'(lp args ...))))
-    #:when (free-identifier=? #'lp #'lp*)
-    (let-loop-check #'lam #'lp #'actuals #'(args ...) #'body expected))
-  ;; inference for ((lambda
-  (pattern ((~and lam (#%plain-lambda (x ...) . body)) args ...)
-   #:fail-when (plambda-property #'lam) #f
-   #:fail-unless (= (syntax-length #'(x ...))
-                    (syntax-length #'(args ...))) #f
-   #:fail-when (andmap type-annotation (syntax->list #'(x ...))) #f
-   (tc/let-values #'((x) ...) #'(args ...) #'body expected))
-  ;; inference for ((lambda with dotted rest
-  (pattern ((~and lam (#%plain-lambda (x ... . rst:id) . body)) args ...)
-   #:fail-when (plambda-property #'lam) #f
-   #:fail-unless (<= (syntax-length #'(x ...))
-                     (syntax-length #'(args ...))) #f
-   ;; FIXME - remove this restriction - doesn't work because the annotation
-   ;; on rst is not a normal annotation, may have * or ...
-   #:fail-when (type-annotation #'rst) #f
-   #:fail-when (andmap type-annotation (syntax->list #'(x ...))) #f
-   (let-values ([(fixed-args varargs) 
-                 (split-at (syntax->list #'(args ...)) (syntax-length #'(x ...)))])
-     (with-syntax ([(fixed-args ...) fixed-args]
-                   [varg #`(#%plain-app list #,@varargs)])
-       (tc/let-values #'((x) ... (rst)) #`(fixed-args ... varg) #'body
-                      expected)))))
-
-
-(define/cond-contract
-  (let-loop-check lam lp actuals args body expected)
-  (syntax? syntax? syntax? syntax? syntax? tc-results/c . --> . full-tc-results/c)
-  (syntax-parse #`(#,args #,body #,actuals)
-    #:literal-sets (kernel-literals lambda-literals)
-    [((val acc ...)
-      ((~and inner-body (if (#%plain-app (~or pair? null?) val*) thn els)))
-      (actual actuals ...))
-     #:when
-     (and (free-identifier=? #'val #'val*)
-          (ormap (lambda (a) (find-annotation #'inner-body a))
-                 (syntax->list #'(acc ...))))
-     (let* ([ts1 (generalize (tc-expr/t #'actual))]
-            [ann-ts (for/list ([a (in-syntax #'(acc ...))]
-                               [ac (in-syntax #'(actuals ...))])
-                      (let ([type (find-annotation #'inner-body a)])
-                        (if type
-                            (tc-expr/check/t ac (ret type))
-                            (generalize (tc-expr/t ac)))))]
-            [ts (cons ts1 ann-ts)])
-       ;; check that the actual arguments are ok here
-       (for/list ([a (in-syntax #'(actuals ...))]
-                  [t (in-list ann-ts)])
-         (tc-expr/check a (ret t)))
-       ;; then check that the function typechecks with the inferred types
-       (define-values (fun-results body-results)
-         (tc/rec-lambda/check args body lp ts expected))
-       (add-typeof-expr lam fun-results)
-       body-results)]
-    ;; special case `for/list'
-    [((val acc ...)
-      ((~and inner-body (if e1 e2 e3:id)))
-      (~and (null actuals ...) (null-exp . _)))
-     #:when (free-identifier=? #'val #'e3)
-     (let ([ts (for/list ([ac (in-syntax #'(actuals ...))]
-                          [f (in-syntax #'(acc ...))])
-                 (let ([type (type-annotation f #:infer #t)])
-                   (if type
-                       (tc-expr/check/t ac (ret type))
-                       (generalize (tc-expr/t ac)))))]
-           [acc-ty (or
-                    (type-annotation #'val #:infer #t)
-                    (match expected
-                      [(tc-result1: (and t (Listof: _))) t]
-                      [_ #f])
-                    (generalize -Null))])
-       ;; this check is needed because the type annotation may come
-       ;; from `for/fold` and it won't necessarily be a list type
-       (tc-expr/check #'null-exp (ret acc-ty))
-       (define-values (fun-results body-results)
-         (tc/rec-lambda/check args body lp (cons acc-ty ts) expected))
-       (add-typeof-expr lam fun-results)
-       body-results)]
-    ;; special case when argument needs inference
-    [(_ body* _)
-     (let ([ts (for/list ([ac (in-syntax actuals)]
-                          [f (in-syntax args)])
-                 (let* ([infer-t (or (type-annotation f #:infer #t)
-                                     (find-annotation #'(begin . body*) f))])
-                   (if infer-t
-                       (tc-expr/check/t ac (ret infer-t))
-                       (generalize (tc-expr/t ac)))))])
-       (define-values (fun-results body-results)
-         (tc/rec-lambda/check args body lp ts expected))
-       (add-typeof-expr lam fun-results)
-       body-results)]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-list.rkt
deleted file mode 100644
index 6d7f26e802..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-list.rkt
+++ /dev/null
@@ -1,116 +0,0 @@
-#lang racket/unit
-
-
-(require "../../utils/utils.rkt"
-         "signatures.rkt"
-         "utils.rkt"
-         syntax/parse syntax/stx racket/match unstable/sequence
-         (typecheck signatures tc-funapp)
-         (types abbrev utils union substitute)
-         (rep type-rep)
-         (env tvar-env)
-         (prefix-in i: (infer infer))
-
-         (for-label
-          racket/base
-          (only-in '#%kernel [reverse k:reverse])))
-
-
-(import tc-expr^ tc-app^)
-(export tc-app-list^)
-
-(define-literal-set list-literals
-  #:for-label
-  (reverse k:reverse list list* cons map andmap ormap))
-
-(define-syntax-class boolmap
-  #:literal-sets (list-literals)
-  #:attributes (default)
-  (pattern andmap #:attr default #t)
-  (pattern ormap #:attr default #f))
-
-(define-tc/app-syntax-class (tc/app-list expected)
-  #:literal-sets (list-literals)
-  (pattern (~and form (map f arg0 arg ...))
-    (match* ((single-value #'arg0) (stx-map single-value #'(arg ...)))
-      ;; if the argument is a ListDots
-      [((tc-result1: (ListDots: t0 bound0))
-        (list (tc-result1: (or (and (ListDots: t bound) (app (λ _ #f) var))
-                               ;; a devious hack - just generate #f so the test below succeeds
-                               ;; have to explicitly bind `var' since otherwise `var' appears
-                               ;; on only one side of the or
-                               ;; NOTE: safe to include these, `map' will error if any list is
-                               ;; not the same length as all the others
-                               (and (Listof: t var) (app (λ _ #f) bound))))
-              ...))
-       (=> fail)
-       (unless (for/and ([b (in-list bound)]) (or (not b) (eq? bound0 b))) (fail))
-       (define expected-elem-type
-         (match expected
-           [(or #f (tc-any-results: _)) #f]
-           [(tc-result1: (ListDots: elem-type (== bound0))) (ret elem-type)]
-           [(tc-result1: (Listof: elem-type)) (ret elem-type)]
-           [else (fail)]))
-       ;; Do not check this in an environment where bound0 is a type variable.
-       (define f-type (tc-expr/t #'f))
-       ;; Check that the function applies successfully to the element type
-       ;; We need the bound to be considered a type var here so that inference works
-       (match (extend-tvars (list bound0)
-                (tc/funapp #'f #'(arg0 arg ...) f-type (cons (ret t0) (map ret t))
-                           expected-elem-type))
-         [(tc-result1: t) (ret (make-ListDots t bound0))]
-         [(tc-results: ts)
-          (tc-error/expr "Expected one value, but got ~a" (-values ts))])]
-      ;; otherwise, if it's not a ListDots, defer to the regular function typechecking
-      ;; TODO fix double typechecking
-      [(res0 res) (tc/app-regular #'form expected)]))
-  ;; ormap/andmap of ... argument
-  (pattern (~and form (m:boolmap f arg))
-    (match-let* ([arg-ty (tc-expr/t #'arg)]
-                 [ft (tc-expr/t #'f)])
-      (match (match arg-ty
-               ;; if the argument is a ListDots
-               [(ListDots: t bound)
-                ;; just check that the function applies successfully to the element type
-                (extend-tvars (list bound)
-                  (tc/funapp #'f #'(arg) ft (list (ret t)) expected))]
-               ;; otherwise ...
-               [_ #f])
-        [(tc-result1: t) (ret (Un (-val (attribute m.default)) t))]
-        ;; if it's not a ListDots, defer to the regular function typechecking
-        ;; TODO fix double typechecking
-        [_ (tc/app-regular #'form expected)])))
-  ;; special case for `list'
-  (pattern (list . args)
-    (let ()
-      (define vs (stx-map (λ (x) (gensym)) #'args))
-      (define l-type (-Tuple (map make-F vs)))
-      (define subst
-        (match expected
-          [(tc-result1: t)
-           ;; We want to infer the largest vs that are still under the element types
-           (i:infer vs null (list l-type) (list t) (-values (list (-> l-type Univ))))]
-          [_ #f]))
-      (ret (-Tuple
-             (for/list ([i (in-syntax #'args)] [v (in-list vs)])
-               (or (and subst
-                        (tc-expr/check/t? i (ret (subst-all subst (make-F v)))))
-                   (tc-expr/t i)))))))
-  ;; special case for `list*'
-  (pattern (list* (~between args:expr 1 +inf.0) ...)
-    (match-let* ([(list tys ... last) (stx-map tc-expr/t #'(args ...))])
-      (ret (foldr -pair last tys))))
-  ;; special case for `reverse' to propagate expected type info
-  (pattern ((~and fun (~or reverse k:reverse)) arg)
-    (match expected
-      [(tc-result1: (Listof: _))
-       (tc-expr/check #'arg expected)]
-      [(tc-result1: (List: ts))
-       (tc-expr/check #'arg (ret (-Tuple (reverse ts))))
-       (ret (-Tuple ts))]
-      [_
-       (match (single-value #'arg)
-         [(tc-result1: (List: ts))
-          (ret (-Tuple (reverse ts)))]
-         [arg-ty
-          (tc/funapp #'fun #'(arg) (tc-expr/t #'fun) (list arg-ty) expected)])])))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-main.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-main.rkt
deleted file mode 100644
index e873528ebc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-main.rkt
+++ /dev/null
@@ -1,97 +0,0 @@
-#lang racket/unit
-
-(require "../../utils/utils.rkt"
-         "signatures.rkt"
-         "utils.rkt"
-         syntax/parse racket/match 
-         syntax/parse/experimental/reflect
-         (typecheck signatures tc-funapp)
-         (types utils)
-         (rep type-rep filter-rep object-rep))
-
-(import tc-expr^ tc-app-keywords^
-        tc-app-hetero^ tc-app-list^ tc-app-apply^ tc-app-values^
-        tc-app-objects^ tc-app-eq^ tc-app-lambda^ tc-app-special^
-        tc-app-contracts^)
-(export tc-app^)
-
-(define-tc/app-syntax-class (tc/app-regular* expected)
-  (pattern form (tc/app-regular #'form expected)))
-
-(define-syntax-rule (combine-tc/app-syntax-classes class-name case ...)
-  (define-syntax-class (class-name expected)
-    #:attributes (check)
-    (pattern (~reflect v (case expected) #:attributes (check))
-             #:attr check (attribute v.check)) ...))
-
-(combine-tc/app-syntax-classes tc/app-special-cases
-  tc/app-list
-  tc/app-apply
-  tc/app-eq
-  tc/app-hetero
-  tc/app-values
-  tc/app-keywords
-  tc/app-objects
-  tc/app-lambda
-  tc/app-special
-  tc/app-contracts
-  tc/app-regular*)
-
-;; the main dispatching function
-;; syntax (or/c tc-results/c #f) -> tc-results/c
-(define (tc/app form expected)
-  (syntax-parse form
-    [(#%plain-app . (~var v (tc/app-special-cases expected)))
-     ((attribute v.check))]))
-
-
-
-;; TODO: handle drest, and filters/objects
-(define (arr-matches? arr args)
-  (match arr
-    [(arr: domain
-           (Values: (list (Result: v (FilterSet: (Top:) (Top:)) (Empty:)) ...))
-           rest #f (list (Keyword: _ _ #f) ...))
-     (cond
-       [(< (length domain) (length args)) rest]
-       [(= (length domain) (length args)) #t]
-       [else #f])]
-    [_ #f]))
-
-(define (has-filter? arr)
-  (match arr
-    [(arr: _ (Values: (list (Result: v (FilterSet: (Top:) (Top:)) (Empty:)) ...))
-           _ _ (list (Keyword: _ _ #f) ...)) #f]
-    [else #t]))
-
-
-(define (tc/app-regular form expected)
-  (syntax-case form ()
-    [(f . args)
-     (let* ([f-ty (tc-expr/t #'f)]
-            [args* (syntax->list #'args)])
-       (define (matching-arities arrs)
-         (for/list ([arr (in-list arrs)] #:when (arr-matches? arr args*)) arr))
-       (define (has-drest/filter? arrs)
-         (for/or ([arr (in-list arrs)])
-           (or (has-filter? arr) (arr-drest arr))))
-
-       (define arg-tys
-         (match f-ty
-           [(Function: (? has-drest/filter?))
-            (map single-value args*)]
-           [(Function:
-              (app matching-arities
-                (list (arr: doms ranges rests drests _) ..1)))
-            (define matching-domains
-              (in-values-sequence
-                (apply in-parallel
-                  (for/list ((dom (in-list doms)) (rest (in-list rests)))
-                    (in-sequences (in-list dom) (in-cycle (in-value rest)))))))
-            (for/list ([a (in-list args*)] [types matching-domains])
-              (match-define (cons t ts) types)
-              (if (for/and ((t2 (in-list ts))) (equal? t t2))
-                  (tc-expr/check a (ret t))
-                  (single-value a)))]
-           [_ (map single-value args*)]))
-       (tc/funapp #'f #'args f-ty arg-tys expected))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-objects.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-objects.rkt
deleted file mode 100644
index 78086069cd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-objects.rkt
+++ /dev/null
@@ -1,174 +0,0 @@
-#lang racket/unit
-
-(require "../../utils/utils.rkt"
-         "signatures.rkt"
-         "utils.rkt"
-         syntax/parse syntax/stx racket/match unstable/sequence
-         racket/format
-         racket/list
-         (typecheck signatures)
-         (types base-abbrev resolve subtype union utils)
-         (rep type-rep)
-         (utils tc-utils)
-
-         (for-template racket/base)
-         (for-label racket/base))
-
-
-(import tc-expr^)
-(export tc-app-objects^)
-
-(define-literal-set object-literals #:for-label (list cons))
-
-
-;; type-check object initialization and field operations
-(define-tc/app-syntax-class (tc/app-objects expected)
-  #:literal-sets (kernel-literals object-literals)
-  (pattern (dmo b cl
-            (#%plain-app list . pos-args)
-            (#%plain-app list (#%plain-app cons (quote names) named-args) ...))
-     #:declare dmo (id-from 'do-make-object 'racket/private/class-internal)
-     (check-do-make-object #'cl #'pos-args #'(names ...) #'(named-args ...)))
-  (pattern (dmo . args)
-     #:declare dmo (id-from 'do-make-object 'racket/private/class-internal)
-     (int-err "unexpected arguments to do-make-object"))
-  (pattern (gf meth obj)
-     #:declare gf (id-from 'get-field/proc 'racket/private/class-internal)
-     (check-get-field #'meth #'obj))
-  (pattern (gf . args)
-     #:declare gf (id-from 'get-field/proc 'racket/private/class-internal)
-     (int-err "unexpected arguments to get-field/proc"))
-  (pattern (sf field obj val)
-     #:declare sf (id-from 'set-field!/proc 'racket/private/class-internal)
-     (check-set-field #'field #'obj #'val))
-  (pattern (sf . args)
-     #:declare sf (id-from 'set-field!/proc 'racket/private/class-internal)
-     (int-err "unexpected arguments to set-field!/proc")))
-
-;; check-do-make-object : Syntax Syntax Listof<Syntax> Listof<Syntax> -> TCResult
-;; do-make-object now takes blame as its first argument, which isn't checked
-;; (it's just an s-expression)
-(define (check-do-make-object cl arg-stx names named-args)
-  (define pos-args (syntax->list arg-stx))
-  (define given-names (stx-map syntax-e names))
-  (define name-assoc (for/list ([name (in-syntax names)]
-                                [arg (in-syntax named-args)])
-                       (list (syntax-e name) arg)))
-  (match (resolve (tc-expr/t cl))
-    [(Union: '()) (ret (Un))]
-    [(and c (Class: _ inits fields _ _ init-rest))
-     (cond [;; too many positional arguments, fail
-            (and (> (length pos-args) (length inits)) (not init-rest))
-            (tc-error/fields "failure in class instantiation"
-                             #:more "too many positional arguments supplied"
-                             "expected" (format "~a arguments" (length inits))
-                             "given" (format "~a arguments" (length pos-args)))]
-           [;; more args than inits, now feed them to init-rest
-            (and (> (length pos-args) (length inits)))
-            (define-values (pos-for-inits other-pos)
-              (split-at pos-args (length inits)))
-            (for ([pos-arg (in-list pos-for-inits)]
-                  [init (in-list inits)])
-              (match-define (list _ type _) init)
-              (tc-expr/check pos-arg (ret type)))
-            (tc-expr/check #`(#%plain-app list #,@other-pos) (ret init-rest))]
-           [else ; do pos args, then named inits
-            (define-values (inits-for-pos other-inits)
-              (split-at inits (length pos-args)))
-            (for ([pos-arg (in-list pos-args)]
-                  [init (in-list inits-for-pos)])
-              (match-define (list _ type _) init)
-              (tc-expr/check pos-arg (ret type)))
-            (check-named-inits other-inits given-names name-assoc)])
-     (ret (make-Instance c))]
-    [(ClassTop:) (tc-error/expr/fields "failure in class instantiation"
-                                       #:more "cannot instantiate a value of type ClassTop")]
-    [t
-     (tc-error/expr/fields "failure in class instantiation"
-                           #:more "given a value of a non-class type"
-                           "given" t)]))
-
-(define (check-named-inits inits names name-assoc)
-  (define init-names (map car inits))
-  (for ([name names]
-        #:unless (memq name init-names))
-    (tc-error/delayed
-     "unknown named argument ~a for class\nlegal named arguments are ~a"
-     name (stringify init-names)))
-  (for ([init inits])
-    (match-define (list init-name init-type opt?) init)
-    ;; stx if argument was provided, #f if it was
-    ;; not provided (and if mandatory, it errors)
-    (define maybe-stx
-      (cond [(assq init-name name-assoc) => cadr]
-            [(not opt?)
-             (tc-error/delayed "value not provided for named init arg ~a"
-                               init-name)
-             #f]
-            [else #f]))
-    (when maybe-stx
-      (tc-expr/check maybe-stx (ret init-type)))))
-
-;; check-get-field : Syntax Syntax -> TCResult
-;; type-check the `get-field` operation on objects
-(define (check-get-field meth obj)
-  (define maybe-meth-sym
-    (syntax-parse meth [(quote m:id) (syntax-e #'m)] [_ #f]))
-  (define obj-type (tc-expr/t obj))
-  (unless maybe-meth-sym
-    (tc-error/expr "expected a symbolic method name, but got ~a" meth))
-  (define (check obj-type)
-    (match (resolve obj-type)
-      ;; FIXME: handle unions and mu?
-      [(and ty (Instance: (Class: _ _ (list fields ...) _ _ _)))
-       (cond [(assq maybe-meth-sym fields) =>
-              (λ (field-entry) (ret (cadr field-entry)))]
-             [else
-              (tc-error/expr/fields "type mismatch"
-                                    #:more "the object is missing an expected field"
-                                    "field" maybe-meth-sym
-                                    "object type" ty)])]
-      [(Instance: (? needs-resolving? type))
-       (check (make-Instance (resolve type)))]
-      [type
-       (tc-error/expr/fields "type mismatch"
-                             #:more "expected an object value for get-field"
-                             "given" type)]))
-  (check obj-type))
-
-;; check-set-field : Syntax Syntax Syntax -> TCResult
-;; type-check the `set-field!` operation on objects
-(define (check-set-field field obj val)
-  (define maybe-field-sym
-    (syntax-parse field [(quote f:id) (syntax-e #'f)] [_ #f]))
-  (unless maybe-field-sym
-    (tc-error/expr "expected a symbolic field name, but got ~a" field))
-  (define obj-type (tc-expr/t obj))
-  (define val-type (tc-expr/t val))
-  (define (check obj-type)
-    (match (resolve obj-type)
-      ;; FIXME: handle unions
-      [(and ty (Instance: (Class: _ _ (list fields ...) _ _ _)))
-       (cond [(assq maybe-field-sym fields) =>
-              (λ (field-entry)
-                (define field-type (cadr field-entry))
-                (unless (subtype val-type field-type)
-                  (tc-error/fields "type mismatch"
-                                   #:more "set-field! only allowed with compatible types"
-                                   "expected" field-type
-                                   "given" val-type
-                                   #:delayed? #t))
-                (ret -Void))]
-             [else
-              (tc-error/expr/fields "type mismatch"
-                                    #:more (~a "expected an object with field "
-                                               maybe-field-sym)
-                                    "given" ty)])]
-      [(Instance: (? needs-resolving? type))
-       (check (make-Instance (resolve type)))]
-      [type
-       (tc-error/expr/fields "type mismatch"
-                             #:more "expected an object value for set-field!"
-                             "given" type)]))
-  (check obj-type))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-special.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-special.rkt
deleted file mode 100644
index 933b1fefd1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-special.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang racket/unit
-
-(require "../../utils/utils.rkt"
-         "signatures.rkt"
-         "utils.rkt"
-         syntax/parse racket/match
-         unstable/list syntax/stx
-         unstable/sequence
-         (typecheck signatures tc-funapp)
-         (types abbrev utils)
-         (private type-annotation)
-         (rep type-rep filter-rep)
-         (utils tc-utils)
-
-         (for-label racket/base racket/bool '#%paramz))
-
-
-(import tc-expr^)
-(export tc-app-special^)
-
-(define-literal-set special-literals #:for-label
-  (extend-parameterization false? not call-with-values list))
-
-(define-tc/app-syntax-class (tc/app-special expected)
-  #:literal-sets (kernel-literals special-literals)
-  ;; parameterize
-  (pattern (extend-parameterization pmz (~seq params args) ...)
-    (begin
-      (for ([param (in-syntax #'(params ...))]
-            [arg (in-syntax #'(args ...))])
-        (match (single-value param)
-          [(tc-result1: (Param: a b))
-           (tc-expr/check arg (ret a))]
-          [(tc-result1: t)
-           (single-value arg)
-           (tc-error/delayed "expected Parameter, but got ~a" t)]))
-      (ret Univ)))
-  ;; use the additional but normally ignored first argument to make-sequence
-  ;; to provide a better instantiation
-  (pattern ((~var op (id-from 'make-sequence 'racket/private/for))
-            (~and quo (quote (i:id ...))) arg:expr)
-    #:when (andmap type-annotation (syntax->list #'(i ...)))
-    (match (single-value #'op)
-        [(tc-result1: (and t Poly?))
-         (tc-expr/check #'quo (ret Univ))
-         (tc/funapp #'op #'(quo arg)
-                    (instantiate-poly t (extend (list Univ Univ)
-                                                (stx-map type-annotation #'(i ...))
-                                                Univ))
-                    (list (ret Univ) (single-value #'arg))
-                    expected)]))
-  ;; special-case for not - flip the filters
-  (pattern ((~or false? not) arg)
-    (match (single-value #'arg)
-      [(tc-result1: t (FilterSet: f+ f-) _)
-       (ret -Boolean (make-FilterSet f- f+))]))
-  ;; special case for (current-contract-region)'s default expansion
-  ;; just let it through without any typechecking, since module-name-fixup
-  ;; is a private function from syntax/location, so this must have been
-  ;; (quote-module-name) originally.
-  (pattern (op src path)
-    #:declare op (id-from 'module-name-fixup 'syntax/location)
-    (ret Univ))
-  ;; special case for `delay'
-  (pattern (mp1 (#%plain-lambda ()
-                  (#%plain-app mp2 (#%plain-app call-with-values (#%plain-lambda () e) list))))
-    #:declare mp1 (id-from 'make-promise 'racket/promise)
-    #:declare mp2 (id-from 'make-promise 'racket/promise)
-    (ret (-Promise (tc-expr/t #'e)))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-values.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-values.rkt
deleted file mode 100644
index b9866bc0b2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-values.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang racket/unit
-
-(require "../../utils/utils.rkt"
-         "signatures.rkt"
-         "utils.rkt"
-         syntax/parse racket/match unstable/sequence unstable/syntax
-         (typecheck signatures tc-funapp)
-         (types utils)
-
-         (for-label racket/base))
-
-
-(import tc-expr^ tc-app^)
-(export tc-app-values^)
-
-(define-literal-set values-literals #:for-label (values call-with-values))
-
-(define-tc/app-syntax-class (tc/app-values expected)
-  #:literal-sets (values-literals)
-  ;; call-with-values
-  (pattern (call-with-values prod con)
-    (match (tc/funapp #'prod #'() (tc-expr/t #'prod) null #f)
-      [(tc-results: ts fs os)
-       (tc/funapp #'con #'(prod) (tc-expr/t #'con) (map ret ts fs os) expected)]
-      [(tc-results: ts fs os drest dbound)
-       (tc-error/expr "`call-with-values` with ... is not supported")]
-      [(tc-any-results: _)
-       (tc/app-regular this-syntax expected)]))
-  ;; special case for `values' with single argument
-  ;; we just ignore the values, except that it forces arg to return one value
-  (pattern (values arg)
-    (match expected
-     [(or #f (tc-any-results: _)) (single-value #'arg)]
-     [(tc-result1: tp)
-      (single-value #'arg expected)]
-     [(tc-results: ts)
-      (single-value #'arg) ;Type check the argument, to find other errors
-      (tc-error/expr
-        "wrong number of values: expected ~a but got one"
-         (length ts))]
-     ;; match polydots case and error
-     [(tc-results: ts _ _ dty dbound)
-      (single-value #'arg)
-      (tc-error/expr
-        "Expected ~a ..., but got only one value" dty)]))
-  ;; handle `values' specially
-  (pattern (values . args)
-    (match expected
-      [(tc-results: ets efs eos)
-       (match-let ([(list (tc-result1: ts fs os) ...)
-                    (for/list ([arg (in-syntax #'args)]
-                               [et (in-list ets)]
-                               [ef (in-list efs)]
-                               [eo (in-list eos)])
-                      (single-value arg (ret et ef eo)))])
-         (if (= (length ts) (length ets) (syntax-length #'args))
-             (ret ts fs os)
-             (tc-error/expr "wrong number of values: expected ~a but got ~a"
-                            (length ets) (syntax-length #'args))))]
-      [_ (match-let ([(list (tc-result1: ts fs os) ...)
-                      (for/list ([arg (in-syntax #'args)])
-                        (single-value arg))])
-           (ret ts fs os))])))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/utils.rkt
deleted file mode 100644
index 262ab8d7f5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/utils.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require syntax/parse
-         syntax/parse/experimental/reflect
-         (for-syntax racket/base syntax/parse))
-
-(provide define-reified-syntax-class define-tc/app-syntax-class)
-
-(define-syntax-rule (define-reified-syntax-class (id . args) . body)
-  (define id
-    (let ()
-      (define-syntax-class (id . args) . body)
-      (reify-syntax-class id))))
-
-(define-syntax define-tc/app-syntax-class
-  (syntax-parser
-    #:literals (pattern)
-    ((_ (id expected) (~and parse-option (~not (pattern . args))) ...
-        (pattern syntax-pattern pattern-directive ... body) ...+)
-     #'(define-reified-syntax-class (id expected)
-        #:attributes (check) parse-option ...
-        (pattern syntax-pattern pattern-directive ...
-                 #:attr check (lambda () body)) ...))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-apply.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-apply.rkt
deleted file mode 100644
index 05ad1e770f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-apply.rkt
+++ /dev/null
@@ -1,84 +0,0 @@
-#lang racket/unit
-
-(require (rename-in "../utils/utils.rkt" [infer r:infer])
-         racket/match racket/list
-         (typecheck signatures tc-app-helper)
-         (types utils abbrev substitute)
-         (utils tc-utils)
-         (rep type-rep)
-         (r:infer infer))
-
-(import tc-expr^ tc-lambda^ tc-let^ tc-app^)
-(export tc-apply^)
-
-(define (do-ret t)
-  (match t
-    [(Values: (list (Result: ts _ _) ...)) (ret ts)]
-    [(ValuesDots: (list (Result: ts _ _) ...) dty dbound)
-     (ret ts
-          (for/list ([t (in-list ts)]) -top-filter)
-          (for/list ([t (in-list ts)]) -empty-obj)
-          dty dbound)]
-    [_ (int-err "do-ret fails: ~a" t)]))
-
-(define (tc/apply f args)
-  (define f-ty (single-value f))
-  ;; produces the first n-1 elements of the list, and the last element
-  (define (split l) (let-values ([(f r) (split-at l (sub1 (length l)))])
-                      (values f (car r))))
-  (define-values (fixed-args tail)
-    (let ([args* (syntax->list args)])
-      (if (null? args*)
-          (tc-error "apply requires a final list argument, given only a function argument of type ~a" (match f-ty [(tc-result1: t) t]))
-          (split args*))))
-
-  (define arg-tres (map tc-expr fixed-args))
-  (define arg-tys (map (match-lambda [(tc-result1: t _ _) t]) arg-tres))
-  (define full-tail-ty (tc-expr/t tail))
-  (define-values (tail-ty tail-bound)
-    (match full-tail-ty
-      [(ListDots: tail-ty tail-bound)
-       (values tail-ty tail-bound)]
-      [t (values #f #f)]))
-
-  ;; Raises an error message for the case that the arguments do not match any of the domains
-  (define (failure)
-    (match f-ty
-      [(tc-result1:
-         (and t (AnyPoly-names: _ _ (Function: (list (arr: doms rngs rests drests (list (Keyword: _ _ #f) ...)) ..1)))))
-       (domain-mismatches f args t doms rests drests rngs arg-tres full-tail-ty #f
-                          #:msg-thunk (lambda (dom)
-                                        (string-append
-                                         "Bad arguments to function in `apply':\n"
-                                         dom)))]))
-
-  (match f-ty
-    ;; apply of a simple function or polymorphic function
-    [(tc-result1: (AnyPoly: vars dotted-vars (Function: (list (arr: doms rngs rests drests (list (Keyword: _ _ #f) ...)) ..1))))
-     (or
-       (for/or ([domain (in-list doms)]
-                [range (in-list rngs)]
-                [rest (in-list rests)]
-                [drest (in-list drests)])
-         ;; Takes a possible substitution and comuptes the substituted range type if it is not #f
-         (define (finish substitution)
-           (and substitution (do-ret (subst-all substitution range))))
-
-         (finish
-           (infer vars dotted-vars
-                  (list (-Tuple* arg-tys full-tail-ty))
-                  (list (-Tuple* domain
-                                 (cond
-                                   ;; the actual work, when we have a * function
-                                   [rest (make-Listof rest)]
-                                   ;; ... function
-                                   [drest (make-ListDots (car drest) (cdr drest))]
-                                   ;; the function has no rest argument,
-                                   ;; but provides all the necessary fixed arguments
-                                   [else -Null])))
-                  range)))
-       (failure))]
-    [(tc-result1: (AnyPoly: _ _ (Function: '())))
-     (tc-error/expr "Function has no cases")]
-    [(tc-result1: f-ty)
-     (tc-error/expr "Type of argument to apply is not a function type: \n~a" f-ty)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-envops.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-envops.rkt
deleted file mode 100644
index 67fdf3a8aa..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-envops.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang racket/base
-
-(require (rename-in "../utils/utils.rkt" [infer infer-in]))
-(require racket/match racket/list
-         (only-in unstable/list list-update)
-         (for-syntax racket/base syntax/parse)
-         (contract-req)
-         (infer-in infer)
-         (rep type-rep filter-rep object-rep rep-utils)
-         (utils tc-utils)
-         (types tc-result resolve subtype remove-intersect union filter-ops)
-         (env type-env-structs lexical-env)
-         (rename-in (types abbrev)
-                    [-> -->]
-                    [->* -->*]
-                    [one-of/c -one-of/c])
-         (typecheck tc-metafunctions))
-
-(provide
-  with-lexical-env/extend-props)
-
-(define/cond-contract (update t ft pos? lo)
-  (Type/c Type/c boolean? (listof PathElem?) . -> . Type/c)
-  (match* ((resolve t) lo)
-    ;; pair ops
-    [((Pair: t s) (list rst ... (CarPE:)))
-     (-pair (update t ft pos? rst) s)]
-    [((Pair: t s) (list rst ... (CdrPE:)))
-     (-pair t (update s ft pos? rst))]
-
-    ;; syntax ops
-    [((Syntax: t) (list rst ... (SyntaxPE:)))
-     (-Syntax (update t ft pos? rst))]
-
-    ;; promise op
-    [((Promise: t) (list rst ... (ForcePE:)))
-     (-Promise (update t ft pos? rst))]
-
-    ;; struct ops
-    [((Struct: nm par flds proc poly pred)
-      (list rst ... (StructPE: (? (lambda (s) (subtype t s)) s) idx)))
-     (make-Struct nm par
-                  (list-update flds idx (match-lambda
-                                          [(fld: e acc-id #f)
-                                           (make-fld (update e ft pos? rst) acc-id #f)]
-                                          [_ (int-err "update on mutable struct field")]))
-                  proc poly pred)]
-
-    ;; otherwise
-    [(t (list))
-     (if pos?
-         (restrict t ft)
-         (remove t ft))]
-    [((Union: ts) lo)
-     (apply Un (map (lambda (t) (update t ft pos? lo)) ts))]
-    [(t* lo)
-     ;; This likely comes up with (-lst t) and we need to improve the system to make sure this case
-     ;; dosen't happen
-     #;
-     (int-err "update along ill-typed path: ~a ~a ~a" t t* lo)
-     t]))
-
-;; Returns #f if anything becomes (U)
-(define (env+ env fs)
-  (let/ec exit*
-    (define (exit) (exit* #f empty))
-    (define-values (props atoms) (combine-props fs (env-props env) exit))
-    (values
-      (for/fold ([Γ (replace-props env props)]) ([f (in-list atoms)])
-        (match f
-          [(or (TypeFilter: ft (Path: lo x)) (NotTypeFilter: ft (Path: lo x)))
-           (update-type/lexical
-             (lambda (x t)
-               (define new-t (update t ft (TypeFilter? f) lo))
-               (when (type-equal? new-t -Bottom)
-                 (exit))
-               new-t)
-             x Γ)]
-          [_ Γ]))
-      atoms)))
-
-;; run code in an extended env and with replaced props. Requires the body to return a tc-results.
-;; TODO make this only add the new prop instead of the entire environment once tc-id is fixed to
-;; include the interesting props in its filter.
-;; WARNING: this may bail out when code is unreachable
-(define-syntax (with-lexical-env/extend-props stx)
-  (define-splicing-syntax-class unreachable?
-    (pattern (~seq #:unreachable form:expr))
-    (pattern (~seq) #:with form #'(begin)))
-  (syntax-parse stx
-    [(_ ps:expr u:unreachable? . b)
-     #'(let-values ([(new-env atoms) (env+ (lexical-env) ps)])
-         (if new-env
-             (with-lexical-env new-env
-               (add-unconditional-prop (let () . b) (apply -and (append atoms (env-props new-env)))))
-             ;; unreachable, bail out
-             (let ()
-               u.form
-               (ret -Bottom))))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt
deleted file mode 100644
index 563f806590..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt
+++ /dev/null
@@ -1,357 +0,0 @@
-#lang racket/unit
-
-
-(require (rename-in "../utils/utils.rkt" [private private-in])
-         racket/match (prefix-in - (contract-req))
-         "signatures.rkt"
-         "check-below.rkt" "../types/kw-types.rkt"
-         (types utils abbrev union subtype type-table filter-ops remove-intersect resolve generalize)
-         (private-in syntax-properties)
-         (rep type-rep filter-rep)
-         (only-in (infer infer) restrict)
-         (utils tc-utils)
-         (env lexical-env)
-         racket/list
-         racket/private/class-internal
-         syntax/parse
-         (only-in racket/list split-at)
-         (typecheck internal-forms tc-envops)
-         unstable/sequence
-         racket/extflonum
-         ;; Needed for current implementation of typechecking letrec-syntax+values
-         (for-template (only-in racket/base letrec-values)
-                       ;; see tc-app-contracts.rkt
-                       racket/contract/private/provide)
-
-         (for-label (only-in '#%paramz [parameterization-key pz:pk])
-                    (only-in racket/private/class-internal find-method/who)))
-
-(import tc-if^ tc-lambda^ tc-app^ tc-let^ tc-send^ check-subforms^ tc-literal^
-        check-class^ tc-expression^)
-(export tc-expr^)
-
-(define-literal-set tc-expr-literals #:for-label
-  (find-method/who))
-
-
-;; typecheck an identifier
-;; the identifier has variable effect
-;; tc-id : identifier -> tc-results
-(define/cond-contract (tc-id id)
-  (--> identifier? full-tc-results/c)
-  (define rename-id (contract-rename-id-property id))
-  (define id* (or rename-id id))
-  (define ty (lookup-type/lexical id*))
-  (define obj (-id-path id*))
-  (ret ty
-       (if (overlap ty (-val #f))
-           (-FS (-not-filter (-val #f) obj) (-filter (-val #f) obj))
-           -true-filter)
-       obj))
-
-;; typecheck an expression, but throw away the effect
-;; tc-expr/t : Expr -> Type
-(define (tc-expr/t e)
-  (match (single-value e)
-    [(tc-result1: t _ _) t]
-    [t (int-err "tc-expr returned ~a, not a single tc-result, for ~a" t (syntax->datum e))]))
-
-(define (tc-expr/check/t e t)
-  (match (tc-expr/check e t)
-    [(tc-result1: t) t]))
-
-;; typecheck an expression by passing tr-expr/check a tc-results
-(define/cond-contract (tc-expr/check/type form expected)
-  (--> syntax? Type/c tc-results/c)
-  (tc-expr/check form (ret expected)))
-
-(define (tc-expr/check form expected)
-  (parameterize ([current-orig-stx form])
-    ;; the argument must be syntax
-    (unless (syntax? form)
-      (int-err "bad form input to tc-expr: ~a" form))
-    ;; typecheck form
-    (define t (tc-expr/check/internal form expected))
-    (add-typeof-expr form t)
-    (cond-check-below t expected)))
-
-;; typecheck and return a truth value indicating a typecheck failure (#f)
-;; or success (any non-#f value)
-(define (tc-expr/check? form expected)
-  (parameterize ([current-type-error? #f])
-    (with-handlers ([exn:fail:syntax? (λ (_) #f)])
-      (dynamic-wind
-        (λ () (save-errors!))
-        (λ ()
-          (let ([result (tc-expr/check form expected)])
-            (and (not (current-type-error?)) result)))
-        (λ () (restore-errors!))))))
-
-(define (tc-expr/check/t? form expected)
-  (match (tc-expr/check? form expected)
-    [(tc-result1: t) t]
-    [#f #f]))
-
-(define (explicit-fail stx msg var)
-  (cond [(and (identifier? var) (lookup-type/lexical var #:fail (λ _ #f)))
-         =>
-         (λ (t)
-           (tc-error/expr #:stx stx
-                          (string-append (syntax-e msg) "; missing coverage of ~a")
-                          t))]
-         [else (tc-error/expr #:stx stx (syntax-e msg))]))
-
-;; tc-expr/check/internal : syntax maybe[tc-results] -> tc-results
-(define/cond-contract (tc-expr/check/internal form expected)
-  (--> syntax? (-or/c tc-results/c #f) full-tc-results/c)
-  (parameterize ([current-orig-stx form])
-    ;(printf "form: ~a\n" (syntax-object->datum form))
-    ;; the argument must be syntax
-    (unless (syntax? form)
-      (int-err "bad form input to tc-expr: ~a" form))
-    (syntax-parse form
-      #:literal-sets (kernel-literals tc-expr-literals)
-      ;; a TR-annotated class
-      [stx:tr:class^
-       (check-class form expected)]
-      [stx:exn-handlers^
-       (register-ignored! form)
-       (check-subforms/with-handlers form expected) ]
-      ;; explicit failure
-      [t:typecheck-failure
-       (explicit-fail #'t.stx #'t.message #'t.var)]
-      ;; data
-      [(quote #f) (ret (-val #f) -false-filter)]
-      [(quote #t) (ret (-val #t) -true-filter)]
-      [(quote val)
-       (match expected
-         [(tc-result1: t)
-          (ret (tc-literal #'val t) -true-filter)]
-         [_
-          (ret (tc-literal #'val) -true-filter)])]
-      ;; syntax
-      [(quote-syntax datum)
-       (define expected-type
-         (match expected
-           [(tc-result1: t) t]
-           [_ #f]))
-       (ret (find-stx-type #'datum expected-type) -true-filter)]
-      ;; mutation!
-      [(set! id val)
-       (match-let* ([(tc-result1: id-t) (single-value #'id)]
-                    [(tc-result1: val-t) (single-value #'val)])
-         (unless (subtype val-t id-t)
-           (type-mismatch id-t val-t "mutation only allowed with compatible types"))
-         (ret -Void))]
-      ;; top-level variable reference - occurs at top level
-      [(#%top . id) (tc-id #'id)]
-      [(#%variable-reference . _)
-       (ret -Variable-Reference)]
-      ;; identifiers
-      [x:identifier (tc-id #'x)]
-      ;; w-c-m
-      [(with-continuation-mark e1 e2 e3)
-       (define key-t (single-value #'e1))
-       (match key-t
-         [(tc-result1: (Continuation-Mark-Keyof: rhs))
-          (tc-expr/check/type #'e2 rhs)
-          (tc-expr/check #'e3 expected)]
-         [(? (λ (result)
-               (and (identifier? #'e1)
-                    (free-identifier=? #'pz:pk #'e1 #f (syntax-local-phase-level)))))
-          (tc-expr/check/type #'e2 Univ)
-          (tc-expr/check #'e3 expected)]
-         [(tc-result1: key-t)
-          ;(check-below key-t -Symbol)
-          ;; FIXME -- would need to protect `e2` with any-wrap/c contract
-          ;; instead, just fail
-
-          ;(tc-expr/check/type #'e2 Univ)
-          ;(tc-expr/check #'e3 expected)
-          (tc-error/expr "with-continuation-mark requires a continuation-mark-key, but got ~a" key-t)])]
-      ;; application
-      [(#%plain-app . _) (tc/app form expected)]
-      ;; #%expression
-      [(#%expression e) (tc/#%expression form expected)]
-      ;; syntax
-      ;; for now, we ignore the rhs of macros
-      [(letrec-syntaxes+values stxs vals . body)
-       (tc-expr/check (syntax/loc form (letrec-values vals . body)) expected)]
-      ;; begin
-      [(begin . es)
-       (tc-body/check #'es expected)]
-      [(begin0 e)
-       (tc-expr/check #'e expected)]
-      [(begin0 e . es)
-       (begin0
-         (tc-expr/check #'e expected)
-         (tc-body/check #'es (tc-any-results -top)))]
-      ;; if
-      [(if tst thn els) (tc/if-twoarm #'tst #'thn #'els expected)]
-      ;; lambda
-      [(#%plain-lambda formals . body)
-       (tc/lambda form #'(formals) #'(body) expected)]
-      [(case-lambda [formals . body] ...)
-       (tc/lambda form #'(formals ...) #'(body ...) expected)]
-      ;; send
-      [(let-values (((_) meth))
-         (let-values (((_) rcvr))
-           (let-values (((_) (~and find-app (#%plain-app find-method/who _ _ _))))
-             (let-values ([_arg-var args] ...)
-               (if wrapped-object-check
-                   ignore-this-case
-                   (#%plain-app _ _ _arg-var2 ...))))))
-       (register-ignored! form)
-       (tc/send #'find-app #'rcvr #'meth #'(args ...) expected)]
-      ;; kw function def
-      ;; TODO simplify this case
-      [(~and (let-values ([(f) fun]) . body) kw:kw-lambda^)
-       #:when expected
-       (match expected
-         [(tc-result1: (and f (or (Function: _)
-                                  (Poly: _ (Function: _)))))
-          (define actual-kws (attribute kw.value))
-          (check-kw-arity actual-kws f)
-          (tc-expr/check/type #'fun (kw-convert f actual-kws #:split #t))
-          (ret f -true-filter)]
-         [(or (tc-results: _) (tc-any-results: _))
-          (tc-expr/check form #f)])]
-      ;; opt function def
-      [(~and (let-values ([(f) fun]) . body) opt:opt-lambda^)
-       #:when expected
-       (define conv-type
-         (match expected
-           [(tc-result1: fun-type)
-            (match-define (list required-pos optional-pos)
-                          (attribute opt.value))
-            (opt-convert fun-type required-pos optional-pos)]
-           [_ #f]))
-       (if conv-type
-           (begin (tc-expr/check/type #'fun conv-type) expected)
-           (tc-expr/check form #f))]
-      [(~and _:kw-lambda^
-         (let-values ([(f) fun])
-           (let-values _
-             (#%plain-app
-              maker
-              lambda-for-kws
-              (case-lambda ; wrapper function
-                (formals . cl-body) ...)
-              (~or (quote (mand-kw:keyword ...))
-                   (~and _ (~bind [(mand-kw 1) '()])))
-              (quote (all-kw:keyword ...))
-              . rst))))
-       (ret (kw-unconvert (tc-expr/t #'fun)
-                          (syntax->list #'(formals ...))
-                          (syntax->datum #'(mand-kw ...))
-                          (syntax->datum #'(all-kw ...))))]
-      [(~and opt:opt-lambda^
-             (let-values ([(f) fun])
-               (case-lambda (formals . cl-body) ...)))
-       (ret (opt-unconvert (tc-expr/t #'fun)
-                           (syntax->list #'(formals ...))))]
-      ;; let
-      [(let-values ([(name ...) expr] ...) . body)
-       (tc/let-values #'((name ...) ...) #'(expr ...) #'body expected)]
-      [(letrec-values ([(name ...) expr] ...) . body)
-       (tc/letrec-values #'((name ...) ...) #'(expr ...) #'body expected)]
-      ;; other
-      [_ (int-err "cannot typecheck unknown form : ~s" (syntax->datum form))])))
-
-;; type check form in the current type environment
-;; if there is a type error in form, or if it has the wrong annotation, error
-;; otherwise, produce the type of form
-;; syntax[expr] -> type
-(define (tc-expr form)
-  (tc-expr/check form #f))
-
-(define (single-value form [expected #f])
-  (define t (tc-expr/check form expected))
-  (match t
-    [(tc-result1: _ _ _) t]
-    [_ (tc-error/expr
-          #:stx form
-          "expected single value, got multiple (or zero) values")]))
-
-
-;; tc-body/check: syntax? tc-results? -> tc-results?
-;; Body must be a non empty sequence of expressions to typecheck.
-;; The final one will be checked against expected.
-(define (tc-body/check body expected)
-  (match (syntax->list body)
-    [(list es ... e-final)
-     ;; First, typecheck all the forms whose results are discarded.
-     ;; If any one those causes the rest to be unreachable (e.g. `exit' or `error`,
-     ;; then mark the rest as ignored.
-     (let loop ([es es])
-       (cond [(empty? es) ; Done, typecheck the return form.
-              (tc-expr/check e-final expected)]
-             [else
-              ;; Typecheck the first form.
-              (define e (first es))
-              (define results (tc-expr/check e (tc-any-results -no-filter)))
-              (define props
-                (match results
-                  [(tc-any-results: f) (list f)]
-                  [(tc-results: _ (list (FilterSet: f+ f-) ...) _)
-                   (map -or f+ f-)]
-                  [(tc-results: _ (list (FilterSet: f+ f-) ...) _ _ _)
-                   (map -or f+ f-)]))
-              (with-lexical-env/extend-props
-               props
-               ;; If `e` bails out, mark the rest as ignored.
-               #:unreachable (for ([x (in-list (cons e-final (rest es)))])
-                               (register-ignored! x))
-               ;; Keep going with an environment extended with the propositions that are
-               ;; true if execution reaches this point.
-               (loop (rest es)))]))]))
-
-;; find-stx-type : Any [(or/c Type/c #f)] -> Type/c
-;; recursively find the type of either a syntax object or the result of syntax-e
-(define (find-stx-type datum-stx [expected #f])
-  (match datum-stx
-    [(? syntax? (app syntax-e stx-e))
-     (match (and expected (resolve (restrict expected (-Syntax Univ) 'orig)))
-       [(Syntax: t) (-Syntax (find-stx-type stx-e t))]
-       [_ (-Syntax (find-stx-type stx-e))])]
-    [(or (? symbol?) (? null?) (? number?) (? extflonum?) (? boolean?) (? string?) (? char?)
-         (? bytes?) (? regexp?) (? byte-regexp?) (? keyword?))
-     (tc-literal #`#,datum-stx expected)]
-    [(cons car cdr)
-     (match (and expected (resolve (restrict expected (-pair Univ Univ) 'orig)))
-       [(Pair: car-t cdr-t) (-pair (find-stx-type car car-t) (find-stx-type cdr cdr-t))]
-       [_ (-pair (find-stx-type car) (find-stx-type cdr))])]
-    [(vector xs ...)
-     (match (and expected (resolve (restrict expected -VectorTop 'orig)))
-       [(Vector: t)
-        (make-Vector
-         (check-below
-          (apply Un
-                 (for/list ([x (in-list xs)])
-                   (find-stx-type x t)))
-          t))]
-       [(HeterogeneousVector: ts)
-        (make-HeterogeneousVector
-         (for/list ([x (in-list xs)]
-                    [t (in-sequence-forever (in-list ts) #f)])
-           (cond-check-below (find-stx-type x t) t)))]
-       [_ (make-HeterogeneousVector (for/list ([x (in-list xs)])
-                                      (generalize (find-stx-type x #f))))])]
-    [(box x)
-     (match (and expected (resolve (restrict expected -BoxTop 'orig)))
-       [(Box: t) (-box (check-below (find-stx-type x t) t))]
-       [_ (-box (generalize (find-stx-type x)))])]
-    [(? hash? h)
-     (match (and expected (resolve (restrict expected -HashTop 'orig)))
-       [(Hashtable: kt vt)
-        (define kts (hash-map h (lambda (x y) (find-stx-type x kt))))
-        (define vts (hash-map h (lambda (x y) (find-stx-type y vt))))
-        (make-Hashtable
-         (check-below (apply Un kts) kt)
-         (check-below (apply Un vts) vt))]
-       [_ (make-Hashtable (generalize (apply Un (map find-stx-type (hash-keys h))))
-                          (generalize (apply Un (map find-stx-type (hash-values h)))))])]
-    [(? prefab-struct-key)
-     ;; FIXME is there a type for prefab structs?
-     Univ]
-    [_ Univ]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expression.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expression.rkt
deleted file mode 100644
index f1bd73696f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expression.rkt
+++ /dev/null
@@ -1,128 +0,0 @@
-#lang racket/unit
-
-(require
-  "../utils/utils.rkt"
-  (typecheck signatures tc-app-helper check-below)
-  (types utils abbrev classes type-table)
-  (rep type-rep)
-  (utils tc-utils)
-  (env index-env tvar-env scoped-tvar-env)
-  (private syntax-properties parse-type)
-  unstable/syntax
-  racket/format
-  racket/match
-  syntax/stx
-  syntax/parse)
-
-
-(import tc-expr^ check-subforms^)
-(export tc-expression^)
-
-;; Typecheck an (#%expression e) form
-(define (tc/#%expression form expected)
-  (syntax-parse form
-    [(exp:type-inst^ e)
-     (do-inst (tc-expr #'e) (attribute exp.value))]
-    [(exp:type-ascription^ e)
-     (add-scoped-tvars #'e (parse-literal-alls (attribute exp.value)))
-     (tc-expr/check #'e (parse-tc-results (attribute exp.value)))]
-    [(exp:ignore-some-expr^ e)
-     (register-ignored! #'e)
-     (check-subforms/ignore #'e)
-     (fix-results (parse-tc-results (attribute exp.value)))]
-    [(exp:external-check^ e)
-     ((attribute exp.value) #'e)
-     (if expected
-        (tc-expr/check #'e expected)
-        (tc-expr #'e))]
-    [(_ e)
-     (if expected
-         (tc-expr/check #'e expected)
-         (tc-expr #'e))]))
-
-;; do-inst : tc-results? syntax? -> tc-results?
-;; Perform a type instantiation, delegating to the appropriate helper
-;; function depending on if the argument is a row or not
-(define (do-inst tc-res inst)
-  (define inst-type
-    (if (row-syntax? inst) do-row-inst do-normal-inst))
-  (define (error-case number)
-    (tc-error/expr
-      "Cannot instantiate expression that produces ~a values"
-      number))
-  (match tc-res
-    [(tc-results: tys fs os)
-     (match tys
-      [(list ty)
-       (ret (list (inst-type ty inst)) fs os)]
-      [_ (error-case (if (null? tys) 0 "multiple"))])]
-    [_ (error-case "multiple")]))
-
-
-;; row-syntax? Syntax -> Boolean
-;; This checks if the syntax object resulted from a row instantiation
-(define (row-syntax? stx)
-  (define lst (stx->list stx))
-  (and lst (pair? lst)
-       (eq? (syntax-e (car lst)) '#:row)))
-
-;; do-normal-inst : Type Syntax -> Type
-;; Instantiate a normal polymorphic type
-(define (do-normal-inst ty inst)
-  (cond
-    [(not (or (Poly? ty) (PolyDots? ty)))
-     (tc-error/expr #:return -Bottom "Cannot instantiate non-polymorphic type ~a"
-                    (cleanup-type ty))]
-    [(and (Poly? ty)
-          (not (= (syntax-length inst) (Poly-n ty))))
-     (tc-error/expr #:return -Bottom
-                    "Wrong number of type arguments to polymorphic type ~a:\nexpected: ~a\ngot: ~a"
-                    (cleanup-type ty) (Poly-n ty) (syntax-length inst))]
-    [(and (PolyDots? ty) (not (>= (syntax-length inst) (sub1 (PolyDots-n ty)))))
-     ;; we can provide 0 arguments for the ... var
-     (tc-error/expr #:return -Bottom
-                    "Wrong number of type arguments to polymorphic type ~a:\nexpected at least: ~a\ngot: ~a"
-                    (cleanup-type ty) (sub1 (PolyDots-n ty)) (syntax-length inst))]
-    [(PolyDots? ty)
-     ;; In this case, we need to check the last thing.  If it's a dotted var, then we need to
-     ;; use instantiate-poly-dotted, otherwise we do the normal thing.
-     ;; In the case that the list is empty we also do the normal thing
-     (match (syntax->list inst)
-       [(list ty-stxs ... (app syntax-e (cons bound-ty-stx (? identifier? bound-id))))
-        (unless (bound-index? (syntax-e bound-id))
-          (tc-error/stx bound-id "~a is not a type variable bound with ..." (syntax-e bound-id)))
-        (if (= (length ty-stxs) (sub1 (PolyDots-n ty)))
-            (let* ([last-id (syntax-e bound-id)]
-                   [last-ty (extend-tvars (list last-id) (parse-type bound-ty-stx))])
-              (instantiate-poly-dotted ty (map parse-type ty-stxs) last-ty last-id))
-            (tc-error/expr #:return -Bottom "Wrong number of fixed type arguments to polymorphic type ~a:\nexpected: ~a\ngot: ~a"
-                           ty (sub1 (PolyDots-n ty)) (length ty-stxs)))]
-       [stx-list
-        (instantiate-poly ty (map parse-type stx-list))])]
-    [else
-     (instantiate-poly ty (stx-map parse-type inst))]))
-
-;; do-row-inst : Type ClassRow -> Type
-;; Instantiate a row polymorphic function type
-(define (do-row-inst ty row-stx)
-  ;; At this point, we know `stx` represents a row so we can parse it.
-  ;; The parsing is done here because if `inst` did the parsing, it's
-  ;; too early and ends up with an empty type environment.
-  (define row
-    (syntax-parse row-stx
-      [(#:row (~var clauses (row-clauses parse-type)))
-       (attribute clauses.row)]))
-  (cond
-    [(not (PolyRow? ty))
-     (tc-error/expr #:return -Bottom "Cannot instantiate non-row-polymorphic type ~a"
-                    (cleanup-type ty))]
-    [else
-     (match-define (PolyRow: _ constraints _) ty)
-     (check-row-constraints
-      row constraints
-      (λ (name)
-        (tc-error/expr
-         (~a "Cannot instantiate row with member " name
-             " that the given row variable requires to be absent"))))
-     (instantiate-poly ty (list row))]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-funapp.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-funapp.rkt
deleted file mode 100644
index ab9f5b1649..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-funapp.rkt
+++ /dev/null
@@ -1,175 +0,0 @@
-#lang racket/base
-
-(require (rename-in "../utils/utils.rkt" [infer r:infer])
-         racket/match
-         (prefix-in c: (contract-req))
-         (env tvar-env)
-         (for-syntax syntax/parse racket/base)
-         (types utils subtype resolve abbrev
-                substitute classes)
-         (typecheck tc-metafunctions tc-app-helper)
-         (rep type-rep)
-         (r:infer infer))
-
-(require-for-cond-contract syntax/stx)
-
-(provide/cond-contract
-  [tc/funapp
-   (syntax? stx-list? Type/c (c:listof tc-results1/c)
-    (c:or/c #f tc-results/c)
-    . c:-> . full-tc-results/c)])
-
-(define-syntax (handle-clauses stx)
-  (syntax-parse stx
-    [(_  (lsts ... arrs) f-stx args-stx pred infer t args-res expected)
-     (with-syntax ([(vars ... a) (generate-temporaries #'(lsts ... arrs))])
-       (syntax/loc stx
-         (or (for/or ([vars (in-list lsts)] ... [a (in-list arrs)]
-                      #:when (pred vars ... a))
-               (let ([substitution (infer vars ... a)])
-                 (and substitution
-                      (tc/funapp1 f-stx args-stx (subst-all substitution a)
-                                  args-res expected #:check #f))))
-             (poly-fail f-stx args-stx t args-res
-                        #:name (and (identifier? f-stx) f-stx)
-                        #:expected expected))))]))
-
-(define (tc/funapp f-stx args-stx f-type args-res expected)
-  (match-define (list (tc-result1: argtys) ...) args-res)
-  (match f-type
-    ;; we special-case this (no case-lambda) for improved error messages
-    ;; tc/funapp1 currently cannot handle drest arities
-    [(Function: (list (and a (arr: _ _ _ #f _))))
-     (tc/funapp1 f-stx args-stx a args-res expected)]
-    [(Function/arrs: doms rngs rests (and drests #f) kws #:arrs arrs)
-     (or
-      ;; find the first function where the argument types match
-      (for/first ([dom (in-list doms)] [rng (in-list rngs)] [rest (in-list rests)] [a (in-list arrs)]
-                  #:when (subtypes/varargs argtys dom rest))
-        ;; then typecheck here
-        ;; we call the separate function so that we get the appropriate
-        ;; filters/objects
-        (tc/funapp1 f-stx args-stx a args-res expected #:check #f))
-      ;; if nothing matched, error
-      (domain-mismatches
-       f-stx args-stx f-type doms rests drests rngs args-res #f #f
-       #:expected expected
-       #:msg-thunk (lambda (dom)
-                     (string-append
-                      "No function domains matched in function application:\n"
-                      dom))))]
-    ;; any kind of dotted polymorphic function without mandatory keyword args
-    [(PolyDots: (list fixed-vars ... dotted-var)
-       (Function/arrs: doms rngs rests drests (list (Keyword: _ _ #f) ...) #:arrs arrs))
-     (handle-clauses
-      (doms rngs rests drests arrs) f-stx args-stx
-      ;; only try inference if the argument lengths are appropriate
-      (lambda (dom _ rest drest a)
-        (cond [rest (<= (length dom) (length argtys))]
-              [drest (and (<= (length dom) (length argtys))
-                          (eq? dotted-var (cdr drest)))]
-              [else (= (length dom) (length argtys))]))
-      ;; Only try to infer the free vars of the rng (which includes the vars
-      ;; in filters/objects).
-      (λ (dom rng rest drest a)
-        (extend-tvars fixed-vars
-          (cond
-           [drest
-            (infer/dots
-             fixed-vars dotted-var argtys dom (car drest) rng (fv rng)
-             #:expected (and expected (tc-results->values expected)))]
-           [rest
-            (infer/vararg fixed-vars (list dotted-var) argtys dom rest rng
-                          (and expected (tc-results->values expected)))]
-           ;; no rest or drest
-           [else (infer fixed-vars (list dotted-var) argtys dom rng
-                        (and expected (tc-results->values expected)))])))
-      f-type args-res expected)]
-    ;; regular polymorphic functions without dotted rest, 
-    ;; we do not choose any instantiations with mandatory keyword arguments
-    [(Poly: vars (Function/arrs: doms rngs rests #f (list (Keyword: _ _ kw?) ...) #:arrs arrs))
-     (handle-clauses
-      (doms rngs rests kw? arrs) f-stx args-stx
-      ;; only try inference if the argument lengths are appropriate
-      ;; and there's no mandatory kw
-      (λ (dom _ rest kw? a) 
-        (and (andmap not kw?) ((if rest <= =) (length dom) (length argtys))))
-      ;; Only try to infer the free vars of the rng (which includes the vars
-      ;; in filters/objects).
-      (λ (dom rng rest kw? a)
-        (extend-tvars vars
-         (infer/vararg vars null argtys dom rest rng
-                       (and expected (tc-results->values expected)))))
-      f-type args-res expected)]
-    ;; Row polymorphism. For now we do really dumb inference that only works
-    ;; in very restricted cases, but is probably enough for most cases in
-    ;; the Racket codebase. Eventually this should be extended.
-    [(PolyRow: vars constraints (and f-ty (Function/arrs: doms _ _ #f _)))
-     (define (fail)
-       (poly-fail f-stx args-stx f-type args-res
-                  #:name (and (identifier? f-stx) f-stx)
-                  #:expected expected))
-     ;; there's only one row variable in a PolyRow (for now)
-     (define row-var (car vars))
-     ;; only infer if there is only one argument type that has the relevant
-     ;; row type variable in its free variables in all cases
-     (define row-var-idxs
-       (for/list ([dom doms])
-         (define num-occurs
-           (for/list ([dom-type dom] [idx (in-naturals)]
-                      #:when (member row-var (fv dom-type)))
-             idx))
-         (unless (<= (length num-occurs) 1)
-           (fail))
-         (if (null? num-occurs) 0 (car num-occurs))))
-     (unless (or (< (length row-var-idxs) 2)
-                 (apply = row-var-idxs))
-       ;; row var wasn't in the same position in some cases
-       (fail))
-     (define idx (car row-var-idxs))
-     (define resolved-argty (resolve (list-ref argtys idx)))
-     (cond [(Class? resolved-argty)
-            (define substitution
-              (hash row-var
-                    (t-subst (infer-row constraints resolved-argty))))
-            (tc/funapp f-stx args-stx (subst-all substitution f-ty)
-                       args-res expected)]
-           [else (fail)])]
-    ;; procedural structs
-    [(Struct: _ _ _ (? Function? proc-ty) _ _)
-     (tc/funapp f-stx #`(#,(syntax/loc f-stx dummy) . #,args-stx) proc-ty
-                (cons (ret f-type) args-res) expected)]
-    ;; parameters are functions too
-    [(Param: in out)
-     (match argtys
-      [(list) (ret out)]
-      [(list t)
-       (if (subtype t in)
-           (ret -Void -true-filter)
-           (tc-error/expr
-            #:return (ret -Void -true-filter)
-            "Wrong argument to parameter - expected ~a and got ~a"
-            in t))]
-      [_ (tc-error/expr
-           "Wrong number of arguments to parameter - expected 0 or 1, got ~a"
-           (length argtys))])]
-    ;; resolve names, polymorphic apps, mu, etc
-    [(? needs-resolving?)
-     (tc/funapp f-stx args-stx (resolve-once f-type) args-res expected)]
-    ;; a union of functions can be applied if we can apply all of the elements
-    [(Union: (and ts (list (? Function?) ...)))
-     (merge-tc-results
-      (for/list ([fty ts])
-        (tc/funapp f-stx args-stx fty args-res expected)))]
-    ;; error type is a perfectly good fcn type
-    [(Error:) (ret f-type)]
-    ;; otherwise fail
-    [(Poly: ns (Function: arrs))
-     (tc-error/expr
-      (string-append "Cannot infer type instantiation for type ~a. Please add "
-                     "more type annotations")
-      f-type)]
-    [_
-     (tc-error/expr
-      "Cannot apply expression of type ~a, since it is not a function type"
-      f-type)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-if.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-if.rkt
deleted file mode 100644
index eb29a38013..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-if.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/unit
-(require "../utils/utils.rkt"
-         (rep filter-rep)
-         (types utils filter-ops)
-         (utils tc-utils)
-         (typecheck signatures tc-envops tc-metafunctions)
-         (types type-table)
-         racket/match)
-
-;; if typechecking
-(import tc-expr^)
-(export tc-if^)
-
-(define (tc/if-twoarm tst thn els [expected #f])
-  (match (single-value tst)
-    [(tc-result1: _ (FilterSet: fs+ fs-) _)
-     (define expected* (and expected (erase-filter expected)))
-     (define results-t
-       (with-lexical-env/extend-props (list fs+)
-         #:unreachable (warn-unreachable thn)
-         (test-position-add-true tst)
-         (tc-expr/check thn expected*)))
-     (define results-u
-       (with-lexical-env/extend-props (list fs-)
-         #:unreachable (warn-unreachable els)
-         (test-position-add-false tst)
-         (tc-expr/check els expected*)))
-
-     (merge-tc-results (list results-t results-u))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-lambda-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-lambda-unit.rkt
deleted file mode 100644
index 08627eaa4e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-lambda-unit.rkt
+++ /dev/null
@@ -1,514 +0,0 @@
-#lang racket/unit
-
-(require "../utils/utils.rkt"
-         racket/dict racket/list syntax/parse syntax/stx
-         racket/match syntax/id-table racket/set
-         unstable/sequence
-         (contract-req)
-         (rep type-rep object-rep rep-utils)
-         (rename-in (types abbrev utils union)
-                    [-> t:->]
-                    [->* t:->*]
-                    [one-of/c t:one-of/c])
-         (private type-annotation syntax-properties)
-         (types type-table)
-         (typecheck signatures tc-metafunctions tc-subst)
-         (env lexical-env tvar-env index-env scoped-tvar-env)
-         (utils tc-utils)
-         (for-syntax
-           racket/base))
-
-(import tc-expr^)
-(export tc-lambda^)
-
-
-(define-syntax-class cl-rhs
-  #:literal-sets (kernel-literals)
-  #:attributes (i cond)
-  [pattern i:id #:attr cond #f]
-  [pattern (if cond:id i:id e:expr)])
-
-(define-syntax-class rebuild-let*
-  #:literal-sets (kernel-literals)
-  #:attributes (mapping flag-mapping)
-  (pattern (let-values ([(new-id) e:cl-rhs]) body:rebuild-let*)
-           #:attr mapping (dict-set (attribute body.mapping) #'e.i #'new-id)
-           #:attr flag-mapping (if (attribute e.cond)
-                                   (dict-set (attribute body.flag-mapping) #'e.i #'e.cond)
-                                   (attribute body.flag-mapping)))
-  (pattern body:expr
-           #:attr mapping (make-immutable-free-id-table)
-           #:attr flag-mapping (make-immutable-free-id-table)))
-
-(define (expected-str tys-len rest-ty drest arg-len rest)
-  (format "Expected function with ~a argument~a~a, but got function with ~a argument~a~a"
-          tys-len
-          (if (= tys-len 1) "" "s")
-          (if (or rest-ty
-                  drest)
-              " and a rest arg"
-              "")
-          arg-len
-          (if (= arg-len 1) "" "s")
-          (if rest " and a rest arg" "")))
-
-;; tc-lambda-body: Typechecks the body with the given args and names and returns the resulting arr?.
-;; arg-names: The identifiers of the positional args
-;; arg-types: The types of the positional args
-;; raw-rest: Either #f for no rest argument or (list rest-id rest-type) where rest-id is the
-;;           identifier of the rest arg, and rest-type is the type.
-;; expected: The expected type of the body forms.
-;; body: The body of the lambda to typecheck.
-(define/cond-contract
-  (tc-lambda-body arg-names arg-types #:rest [raw-rest #f] #:expected [expected #f] body)
-  (->* ((listof identifier?) (listof Type/c) syntax?)
-       (#:rest (or/c #f (list/c identifier? (or/c Type/c (cons/c Type/c symbol?))))
-        #:expected (or/c #f tc-results/c))
-       arr?)
-  (define-values (rest-id rest)
-    (if raw-rest
-        (values (first raw-rest) (second raw-rest))
-        (values #f #f)))
-
-  (define rest-types
-    (cond
-      [(not rest) (list)]
-      [(cons? rest) (list (make-ListDots (car rest) (cdr rest)))]
-      [else (list (-lst rest))]))
-  (define rest-names
-    (if rest-id (list rest-id) null))
-
-  (make-arr*
-    arg-types
-    (abstract-results
-      (with-lexical-env/extend
-        (append rest-names arg-names)
-        (append rest-types arg-types)
-        (tc-body/check body expected))
-      arg-names #:rest-id rest-id)
-    #:rest (and (Type? rest) rest)
-    #:drest (and (cons? rest) rest)))
-
-;; check-clause: Checks that a lambda clause has arguments and body matching the expected type
-;; arg-list: The identifiers of the positional args in the lambda form
-;; rest-id: The identifier of the rest arg, or #f for no rest arg
-;; body: The body of the lambda to typecheck.
-;; arg-tys: The expected positional argument types.
-;; rest-ty: The expected base type of the rest arg (not poly dotted case)
-;; drest: The expected base type of the rest arg and its bound (poly dotted case)
-;; ret-ty: The expected type of the body of the lambda.
-(define/cond-contract (check-clause arg-list rest-id body arg-tys rest-ty drest ret-ty)
-     ((listof identifier?)
-      (or/c #f identifier?) syntax? (listof Type/c) (or/c #f Type/c)
-      (or/c #f (cons/c Type/c symbol?)) tc-results/c
-      . -> .
-      arr?)
-  (let* ([arg-len (length arg-list)]
-         [tys-len (length arg-tys)]
-         [arg-types (if (andmap type-annotation arg-list)
-                        (get-types arg-list #:default Univ)
-                        (cond
-                          [(= arg-len tys-len) arg-tys]
-                          [(< arg-len tys-len) (take arg-tys arg-len)]
-                          [(> arg-len tys-len) (append arg-tys
-                                                       (map (lambda _ (or rest-ty (Un)))
-                                                            (drop arg-list tys-len)))]))])
-
-    ;; Check that the number of formal arguments is valid for the expected type.
-    ;; Thus it must be able to accept the number of arguments that the expected
-    ;; type has. So we check for two cases: if the function doesn't accept
-    ;; enough arguments, or if it requires too many arguments.
-    ;; This allows a form like (lambda args body) to have the type (-> Symbol
-    ;; Number) with out a rest arg.
-    (when (or (and (< arg-len tys-len) (not rest-id))
-              (and (> arg-len tys-len) (not (or rest-ty drest))))
-      (tc-error/delayed (expected-str tys-len rest-ty drest arg-len rest-id)))
-    (define rest-type
-      (cond
-        [(not rest-id) #f]
-        [drest drest]
-        [(dotted? rest-id)
-         => (λ (b) (cons (extend-tvars (list b) (get-type rest-id #:default Univ)) b))]
-        [else
-         (define base-rest-type
-           (cond
-            [(type-annotation rest-id) (get-type rest-id #:default Univ)]
-            [rest-ty rest-ty]
-            [else Univ]))
-         (define extra-types
-           (if (<= arg-len tys-len)
-               (drop arg-tys arg-len)
-               null))
-         (apply Un base-rest-type extra-types)]))
-
-    (tc-lambda-body arg-list arg-types
-      #:rest (and rest-type (list rest-id rest-type))
-      #:expected ret-ty
-      body)))
-
-;; typecheck a single lambda, with argument list and body
-;; drest-ty and drest-bound are both false or not false
-;; tc/lambda-clause/check: formals syntax listof[Type/c] tc-result
-;;                         option[Type/c] option[(cons Type/c symbol)] -> arr?
-(define (tc/lambda-clause/check formals body arg-tys ret-ty rest-ty drest)
-  (check-clause (formals-positional formals) (formals-rest formals) body arg-tys rest-ty drest ret-ty))
-
-;; typecheck a single opt-lambda clause with argument list and body
-;; tc/opt-lambda-clause: listof[identifier] syntax -> listof[arr?]
-(define (tc/opt-lambda-clause arg-list body aux-table flag-table)
-  ;; arg-types: Listof[Type/c]
-  (define arg-types
-    (for/list ([a (in-list arg-list)])
-      (get-type a #:default (lambda ()
-                              (define id (dict-ref aux-table a #f))
-                              (if id
-                                  (get-type id #:default Univ)
-                                  Univ)))))
-
-  ;; new-arg-types: Listof[Listof[Type/c]]
-  (define new-arg-types
-    (if (= 0 (dict-count flag-table))
-        (list arg-types)
-        (apply append
-               (for/list ([(k v) (in-dict flag-table)])
-                 (list
-                  (for/list ([i (in-list arg-list)]
-                             [t (in-list arg-types)])
-                    (cond [(free-identifier=? i k) t]
-                          [(free-identifier=? i v) (-val #t)]
-                          [else t]))
-                  (for/list ([i (in-list arg-list)]
-                             [t (in-list arg-types)])
-                    (cond [(free-identifier=? i k) (-val #f)]
-                          [(free-identifier=? i v) (-val #f)]
-                          [else t])))))))
-  (for/list ([arg-types (in-list new-arg-types)])
-    (tc-lambda-body arg-list arg-types body)))
-
-
-
-;; formals syntax -> listof[arr?]
-(define (tc/lambda-clause formals body)
-  (define-values (aux-table flag-table)
-    (syntax-parse body
-      [(b:rebuild-let*) (values (attribute b.mapping) (attribute b.flag-mapping))]
-      [_ (values #hash() #hash())]))
-
-  (define arg-list (formals-positional formals))
-  (define rest-id (formals-rest formals))
-  (cond
-    [(and (> (dict-count aux-table) 0) (not rest-id))
-     (tc/opt-lambda-clause arg-list body aux-table flag-table)]
-    [else
-     (define arg-types (get-types arg-list #:default Univ))
-     (define rest-type
-       (cond
-         ;; Lambda with poly dotted rest argument
-         [(and rest-id (dotted? rest-id))
-          =>
-          (lambda (bound)
-            (unless (bound-index? bound)
-              (if (bound-tvar? bound)
-                  (tc-error "Bound on ... type (~a) is not an appropriate type variable" bound)
-                  (tc-error/stx rest-id "Bound on ... type (~a) was not in scope" bound)))
-            (cons (extend-tvars (list bound) (get-type rest-id #:default Univ)) bound))]
-         ;; Lambda with regular rest argument
-         [rest-id
-          (get-type rest-id #:default Univ)]
-         ;; Lambda with no rest argument
-         [else #f]))
-
-     (list
-       (tc-lambda-body arg-list arg-types
-         #:rest (and rest-type (list rest-id rest-type))
-         body))]))
-
-
-;; positional: natural? - the number of positional arguments
-;; rest: boolean? - if there is a positional argument
-;; syntax: syntax? - the improper syntax list of identifiers
-(struct formals (positional rest syntax) #:transparent)
-
-(define (make-formals stx)
-  (let loop ([s stx] [acc null])
-    (cond
-      [(pair? s) (loop (cdr s) (cons (car s) acc))]
-      [(null? s) (formals (reverse acc) #f stx)]
-      [(pair? (syntax-e s)) (loop (stx-cdr s) (cons (stx-car s) acc))]
-      [(null? (syntax-e s)) (formals (reverse acc) #f stx)]
-      [else (formals (reverse acc) s stx)])))
-
-(define (formals->objects formals)
-  (for/list ([i (in-list (append (formals-positional formals)
-                                 (if (formals-rest formals)
-                                     (list (formals-rest formals))
-                                     empty)))])
-    (make-Path null i)))
-
-
-;; An arity is a list (List Natural Boolean), with the number of positional
-;; arguments and whether there is a rest argument.
-;;
-;; An arities-seen is a list (List (Listof Natural) (U Natural Infinity)),
-;; with the list of positional only arities seen and the least number of
-;; positional arguments on an arity with a rest argument seen.
-(define (formals->arity formals)
-  (list
-    (length (formals-positional formals))
-    (and (formals-rest formals) #t)))
-
-(define initial-arities-seen (list empty +inf.0))
-
-;; arities-seen-add : arities-seen? arity? -> arities-seen?
-;; Adds the arity to the arities encoded in the arity-seen.
-(define (arities-seen-add arities-seen arity)
-  (match-define (list positionals min-rest) arities-seen)
-  (match-define (list new-positional new-rest) arity)
-  (define new-min-rest
-    (if new-rest
-        (min new-positional min-rest)
-        min-rest))
-  (list
-    (filter (λ (n) (< n new-min-rest)) (cons new-positional positionals))
-    new-min-rest))
-
-
-;; arities-seen-seen-before? : arities-seen? arity? -> boolean?
-;; Determines if the arity would have been covered by an existing arity in the arity-seen
-(define (arities-seen-seen-before? arities-seen arity)
-  (match-define (list positionals min-rest) arities-seen)
-  (match-define (list new-positional new-rest) arity)
-  (or (>= new-positional min-rest)
-      (and (member new-positional positionals) (not new-rest))))
-
-
-;; tc/mono-lambda : (listof (list formals syntax?)) (or/c #f tc-results) -> (listof arr?)
-;; typecheck a sequence of case-lambda clauses
-(define (tc/mono-lambda formals+bodies expected)
-  (define expected-type
-    (match expected
-      [(tc-result1: t)
-       (let loop ((t t))
-         (match t
-           [(Mu: _ _) (loop (unfold t))]
-           [(Function/arrs: _ _ _ _ '()) t]
-           [_ #f]))]
-      [_ #f]))
-
-  ;; find-matching-arrs: (list/c natural? boolean?) arities-seen? -> (or #f Listof[arr?])
-  ;; Returns a list when we know the expected type, and the list contains all the valid arrs that the
-  ;; clause needs to type as.
-  ;; Returns false if there is not enough information in the expected type to propogate down to the
-  ;; clause
-  (define (find-matching-arrs formal-arity arities-seen)
-    (match-define (list formal-positionals formal-rest) formal-arity)
-    (match expected-type
-      [(Function/arrs: argss rets rests drests '() #:arrs fs)
-       (for/list ([a (in-list argss)] [f (in-list fs)] [r (in-list rests)] [dr (in-list drests)]
-                  #:unless (arities-seen-seen-before? arities-seen (list (length a) (or r dr)))
-                  #:when (if formal-rest
-                             (or r (>= (length a) formal-positionals))
-                             ((if (or r dr) <= =) (length a) formal-positionals)))
-         f)]
-      [_ #f]))
-
-
-  ;; For each clause we figure out which arrs it needs to typecheck as, and also which clauses are
-  ;; dead code.
-  (define-values (used-formals+bodies+arrs arities-seen)
-    (for/fold ((formals+bodies+arrs* empty) (arities-seen initial-arities-seen))
-              ((formal+body formals+bodies))
-      (match formal+body
-        [(list formal body)
-         (define arity (formals->arity formal))
-         (define matching-arrs (find-matching-arrs arity arities-seen))
-         (values
-           (cons
-             (cond
-               [(or (arities-seen-seen-before? arities-seen arity)
-                    (null? matching-arrs))
-                (warn-unreachable body)
-                (add-dead-lambda-branch (formals-syntax formal))
-                (list formal body null)]
-               [else (list formal body matching-arrs)])
-             formals+bodies+arrs*)
-           (arities-seen-add arities-seen arity))])))
-
-  (if (and
-        (andmap (λ (f-b-arr) (empty? (third f-b-arr))) used-formals+bodies+arrs)
-        ;; If the empty function is expected, then don't error out
-        (match expected-type
-          [(Function: (list)) #f]
-          [_ #t]))
-      ;; TODO improve error message.
-      (tc-error/expr #:return (list (make-arr* null (Un) #:rest Univ))
-                     "Expected a function of type ~a, but got a function with the wrong arity"
-                     expected-type)
-      (apply append
-             (for/list ([fb* (in-list used-formals+bodies+arrs)])
-               (match-define (list f* b* t*) fb*)
-               (match t*
-                 [#f (tc/lambda-clause f* b*)]
-                 [(list (arr: argss rets rests drests '()) ...)
-                  (for/list ([args (in-list argss)] [ret (in-list rets)] [rest (in-list rests)] [drest (in-list drests)])
-                    (tc/lambda-clause/check
-                     f* b* args (values->tc-results ret (formals->objects f*)) rest drest))])))))
-
-(define (tc/mono-lambda/type formals bodies expected)
-  (make-Function
-    (tc/mono-lambda
-      (for/list ([f (in-syntax formals)] [b (in-syntax bodies)])
-         (list (make-formals f) b))
-      expected)))
-
-(define (plambda-prop stx)
-  (define d (plambda-property stx))
-  (and d (car (flatten d))))
-
-(define (has-poly-annotation? form)
-  (or (plambda-prop form) (cons? (lookup-scoped-tvar-layer form))))
-
-(define (remove-poly-layer tvarss)
-  (filter cons? (map rest tvarss)))
-
-(define (get-poly-layer tvarss)
-  (map first tvarss))
-
-(define (get-poly-tvarss form)
-  (let ([plambda-tvars
-          (let ([p (plambda-prop form)])
-            (match (and p (map syntax-e (syntax->list p)))
-              [#f #f]
-              [(list var ... dvar '...)
-               (list (list var dvar))]
-              [(list id ...)
-               (list id)]))]
-        [scoped-tvarss
-          (for/list ((tvarss (in-list (lookup-scoped-tvar-layer form))))
-            (for/list ((tvar (in-list tvarss)))
-              (match tvar
-                [(list (list v ...) dotted-v)
-                 (list (map syntax-e v) (syntax-e dotted-v))]
-                [(list v ...) (map syntax-e v)])))])
-    (if plambda-tvars
-        (cons plambda-tvars scoped-tvarss)
-        scoped-tvarss)))
-
-
-;; tc/plambda syntax tvarss-list syntax-list syntax-list type -> Poly
-;; formals and bodies must by syntax-lists
-(define/cond-contract (tc/plambda form tvarss-list formals bodies expected)
-  (syntax? (listof list?) syntax? syntax? (or/c tc-results/c #f) . -> . Type/c)
-  (define/cond-contract (maybe-loop form formals bodies expected)
-    (syntax? syntax? syntax? (or/c tc-results/c #f) . -> . Type/c)
-    (match expected
-      [(tc-result1: (or (Poly: _ _) (PolyDots: _ _) (PolyRow: _ _ _)))
-       (tc/plambda form (remove-poly-layer tvarss-list) formals bodies expected)]
-      [_
-        (define remaining-layers (remove-poly-layer tvarss-list))
-        (if (null? remaining-layers)
-            (tc/mono-lambda/type formals bodies expected)
-            (tc/plambda form remaining-layers formals bodies expected))]))
-  ;; check the bodies appropriately
-  ;; and make both annotated and declared type variables point to the
-  ;; same actual type variables (the fresh names)
-  (define (extend-and-loop form ns formals bodies expected)
-    (let loop ((tvarss tvarss))
-      (match tvarss
-        [(list) (maybe-loop form formals bodies expected)]
-        [(cons (list (list tvars ...) dotted) rest-tvarss)
-         (extend-indexes dotted
-            (extend-tvars/new tvars ns
-              (loop rest-tvarss)))]
-        [(cons tvars rest-tvarss)
-         (extend-tvars/new tvars ns
-           (loop rest-tvarss))])))
-  (define tvarss (get-poly-layer tvarss-list))
-
-  (match expected
-    [(tc-result1: (and t (Poly-fresh: ns fresh-ns expected*)))
-     ;; make sure the declared and annotated type variable arities match up
-     ;; with the expected type variable arity
-     (for ((tvars (in-list tvarss)))
-       (when (and (cons? tvars) (list? (first tvars)))
-         (tc-error
-          "Expected a polymorphic function without ..., but given function/annotation had ..."))
-       (unless (= (length tvars) (length fresh-ns))
-         (tc-error "Expected ~a type variables, but given ~a"
-                   (length fresh-ns) (length tvars))))
-     (make-Poly #:original-names ns fresh-ns (extend-and-loop form fresh-ns formals bodies (ret expected*)))]
-    [(tc-result1: (and t (PolyDots-names: (list ns ... dvar) expected*)))
-     ;; make sure the declared and annotated type variable arities match up
-     ;; with the expected type variable arity
-     (for ((tvars (in-list tvarss)))
-       (match tvars
-         [(list (list vars ...) dotted)
-          (unless (= (length vars) (length ns))
-            (tc-error "Expected ~a non-dotted type variables, but given ~a"
-                      (length ns) (length vars)))]
-         [else
-           (tc-error "Expected a polymorphic function with ..., but function/annotation had no ...")]))
-     (make-PolyDots (append ns (list dvar)) (extend-and-loop form ns formals bodies (ret expected*)))]
-    [(tc-result1: (and t (PolyRow-fresh: ns fresh-ns constraints expected*)))
-     (for ((tvars (in-list tvarss)))
-       (when (and (cons? tvars) (list? (first tvars)))
-         (tc-error
-          "Expected a polymorphic function without ..., but given function/annotation had ..."))
-       (unless (= (length tvars) 1)
-         (tc-error "Expected ~a type variable, but given ~a"
-                   1 (length tvars))))
-     (make-PolyRow
-      #:original-names ns
-      fresh-ns
-      constraints
-      (extend-and-loop form fresh-ns
-                       formals bodies (ret expected*)))]
-    [_
-     (define lengths
-       (for/set ((tvars (in-list tvarss)))
-         (match tvars
-           [(list (list vars ...) dotted)
-            (length vars)]
-           [(list vars ...)
-            (length vars)])))
-     (define dots
-       (for/set ((tvars (in-list tvarss)))
-         (match tvars
-           [(list (list vars ...) dotted) #t]
-           [(list vars ...) #f])))
-     (unless (= 1 (set-count lengths))
-      (tc-error "Expected annotations to have the same number of type variables, but given ~a"
-                (set->list lengths)))
-     (unless (= 1 (set-count dots))
-      (tc-error "Expected annotations to all have ... or none to have ..., but given both"))
-     (define dotted (and (set-first dots) (second (first tvarss))))
-     (define ns (build-list (set-first lengths) (lambda (_) (gensym))))
-     (define results (extend-and-loop form ns formals bodies expected))
-     (if dotted
-         (make-PolyDots (append ns (list dotted)) results)
-         (make-Poly #:original-names (first tvarss) ns results))]))
-
-;; typecheck a sequence of case-lambda clauses, which is possibly polymorphic
-;; tc/lambda : syntax syntax-list syntax-list (or/c tc-results #f) -> tc-results
-(define (tc/lambda form formals bodies expected)
-  (if (or (has-poly-annotation? form)
-          (match expected
-            [(tc-result1: t) (or (Poly? t) (PolyDots? t) (PolyRow? t))]
-            [_ #f]))
-      (ret (tc/plambda form (get-poly-tvarss form) formals bodies expected) -true-filter)
-      (ret (tc/mono-lambda/type formals bodies expected) -true-filter)))
-
-;; formals : the formal arguments to the loop
-;; body : a block containing the body of the loop
-;; name : the name of the loop
-;; args : the types of the actual arguments to the loop
-;; ret : the expected return type of the whole expression
-;; Returns both the tc-results of the function and of the body
-(define (tc/rec-lambda/check formals* body name args return)
-  (define formals (syntax->list formals*))
-  (define ft (t:->* args (tc-results->values return)))
-  (with-lexical-env/extend
-   (cons name formals) (cons ft args)
-   (values
-     (replace-names (map (λ (f) (list f -empty-obj)) (cons name formals)) (ret ft))
-     (replace-names (map (λ (f) (list f -empty-obj)) (cons name formals)) (tc-body/check body return)))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-let-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-let-unit.rkt
deleted file mode 100644
index 0e86abd3dd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-let-unit.rkt
+++ /dev/null
@@ -1,254 +0,0 @@
-#lang racket/unit
-
-(require "../utils/utils.rkt"
-         (except-in (types utils abbrev filter-ops remove-intersect) -> ->* one-of/c)
-         (only-in (types abbrev) (-> t:->) [->* t:->*])
-         (private type-annotation parse-type syntax-properties)
-         (env lexical-env type-alias-helper mvar-env
-              global-env scoped-tvar-env)
-         (rep filter-rep)
-         syntax/free-vars
-         (typecheck signatures tc-metafunctions tc-subst internal-forms tc-envops)
-         (utils tarjan)
-         racket/match (contract-req)
-         racket/list
-         syntax/parse syntax/stx
-         syntax/id-table
-         ;; For internal type forms
-         (for-template (only-in racket/base define-values)))
-
-(require-for-cond-contract (rep type-rep))
-
-(import tc-expr^)
-(export tc-let^)
-
-;; get-names+objects (listof (listof identifier?)) (listof tc-results?) -> (listof (list/c identifier Object?))
-;; Given a list of bindings and the tc-results for the corresponding expressions, return a list of
-;; tuples of the binding-name and corresponding objects from the results.
-;; This is used to replace the names with the objects after the names go out of scope.
-(define (get-names+objects namess results)
-  (append*
-    (for/list ([names namess] [results results])
-      (match results
-        [(list (tc-result: _ _ os) ...)
-         (map list names os)]))))
-
-;; Checks that the body has the expected type when names are bound to the types spcified by results.
-;; The exprs are also typechecked by using expr->type.
-;; TODO: make this function sane.
-(define/cond-contract (do-check expr->type namess expected-results exprs body expected)
-  ((syntax? tc-results/c . -> . any/c)
-   (listof (listof identifier?)) (listof (listof tc-result?))
-   (listof syntax?) syntax? (or/c #f tc-results/c)
-   . -> .
-   tc-results/c)
-  (with-cond-contract t/p ([expected-types (listof (listof Type/c))]
-                           [props          (listof (listof Filter?))])
-    (define-values (expected-types props)
-      (for/lists (e p)
-        ([e-r   (in-list expected-results)]
-         [names (in-list namess)])
-        (match e-r
-          [(list (tc-result: e-ts (FilterSet: fs+ fs-) os) ...)
-           (values e-ts
-                   (apply append
-                          (for/list ([n (in-list names)]
-                                     [t (in-list e-ts)]
-                                     [f+ (in-list fs+)]
-                                     [f- (in-list fs-)])
-                            (cond
-                              [(not (overlap t (-val #f)))
-                               (list f+)]
-                              [(is-var-mutated? n)
-                               (list)]
-                              [else
-                               (list (-imp (-not-filter (-val #f) n) f+)
-                                     (-imp (-filter (-val #f) n) f-))]))))]
-          [(list (tc-result: e-ts (NoFilter:) _) ...)
-           (values e-ts null)]))))
-  ;; extend the lexical environment for checking the body
-  (with-lexical-env/extend
-    (append* namess)
-    (append* expected-types)
-    (replace-names
-      (get-names+objects namess expected-results)
-      (with-lexical-env/extend-props
-        (apply append props)
-        ;; type-check the rhs exprs
-        (for ([expr (in-list exprs)] [results (in-list expected-results)])
-          (match results
-            [(list (tc-result: ts fs os) ...)
-             (expr->type expr (ret ts fs os))]))
-        ;; typecheck the body
-        (tc-body/check body (and expected (erase-filter expected)))))))
-
-(define (tc-expr/maybe-expected/t e names)
-  (syntax-parse names
-    [(i:typed-id^ ...)
-     (tc-expr/check e (-values (attribute i.type)))]
-    [_ (tc-expr e)]))
-
-(define (tc/letrec-values namess exprs body [expected #f])
-  (let* ([names (stx-map syntax->list namess)]
-         [orig-flat-names (apply append names)]
-         [exprs (syntax->list exprs)])
-    ;; Collect the declarations, which are represented as expression.
-    ;; We put them back into definitions to reuse the existing machinery
-    (define-values (type-aliases declarations)
-      (for/fold ([aliases '()] [declarations '()])
-                ([body (in-list exprs)])
-        (syntax-parse #`(define-values () #,body)
-          [t:type-alias
-           (values (cons #'t aliases) declarations)]
-          [t:type-declaration
-           (values aliases (cons (list #'t.id #'t.type) declarations))]
-          [_ (values aliases declarations)])))
-
-    (define-values (alias-names alias-map) (get-type-alias-info type-aliases))
-    (register-all-type-aliases alias-names alias-map)
-
-    (for ([declaration declarations])
-      (match-define (list id type) declaration)
-      (register-type-if-undefined id (parse-type type))
-      (register-scoped-tvars id (parse-literal-alls type)))
-
-    ;; add scoped type variables, before we get to typechecking
-    ;; FIXME: can this pass be fused with the one immediately above?
-    (for ([n (in-list names)] [b (in-list exprs)])
-      (syntax-case n ()
-        [(var) (add-scoped-tvars b (lookup-scoped-tvars #'var))]
-        [_ (void)]))
-
-    ;; First look at the clauses that do not bind the letrec names
-    (define all-clauses
-      (for/list ([name-lst names] [expr exprs])
-        (lr-clause name-lst expr)))
-
-    (define-values (ordered-clauses remaining)
-      (get-non-recursive-clauses all-clauses orig-flat-names))
-
-    (define-values (remaining-names remaining-exprs)
-      (for/lists (_1 _2) ([remaining-clause remaining])
-        (match-define (lr-clause name expr) remaining-clause)
-        (values name expr)))
-
-    ;; Check those and then check the rest in the extended environment
-    (check-non-recursive-clauses
-      ordered-clauses
-      (lambda ()
-        (cond
-          ;; after everything, check the body expressions
-          [(null? remaining-names)
-           (tc-body/check body (and expected (erase-filter expected)))]
-          [else
-           (define flat-names (apply append remaining-names))
-           (do-check tc-expr/check
-                     remaining-names
-                     ;; types the user gave.
-                     (map (λ (l) (map tc-result (map get-type l))) remaining-names)
-                     remaining-exprs body expected)])))))
-
-;; An lr-clause is a
-;;   (lr-clause (Listof Identifier) Syntax)
-;;
-;; interp. represents a letrec binding
-(struct lr-clause (names expr) #:transparent)
-
-;; get-non-recursive-clauses : (Listof lr-clause) (Listof Identifier) ->
-;;                             (Listof lr-clause) (Listof lr-clause)
-;; Find letrec-values clauses that do not create variable cycles. Return
-;; both the non-recursive clauses and the remaining recursive ones.
-(define (get-non-recursive-clauses clauses flat-names)
-
-  ;; First, filter out clauses with no names. Don't do cycle checking on
-  ;; these because they trivially don't form any.
-  (define-values (*non-binding *other-clauses)
-    (for/fold ([non-binding '()] [other-clauses '()])
-              ([clause clauses])
-      (match-define (lr-clause names _) clause)
-      (if (null? names)
-          (values (cons clause non-binding) other-clauses)
-          (values non-binding (cons clause other-clauses)))))
-  (define-values (non-binding other-clauses)
-    (values (reverse *non-binding) (reverse *other-clauses)))
-
-  ;; Set up vertices for Tarjan's algorithm, where each letrec-values
-  ;; clause is a vertex but mapped in the table for each of the clause names
-  (define vertices (make-bound-id-table))
-  (for ([clause other-clauses])
-    (match-define (lr-clause names expr) clause)
-    (define relevant-free-vars
-      (for/list ([var (in-list (free-vars expr))]
-                 #:when (member var flat-names bound-identifier=?))
-        var))
-    (define vertex (make-vertex clause relevant-free-vars))
-    (for ([name (in-list names)])
-      (bound-id-table-set! vertices name vertex)))
-
-  (define components (tarjan vertices))
-
-  ;; no-self-cycle? : (Vertex Id (Listof Id)) -> Boolean
-  (define (no-self-cycle? vertex)
-    (match-define (lr-clause names _) (vertex-data vertex))
-    (for/and ([id (in-list names)])
-      (andmap (λ (id2) (not (bound-identifier=? id id2)))
-              (vertex-adjacent vertex))))
-
-  ;; The components with only one entry are non-recursive if they also
-  ;; contain no self-cycles.
-  (define-values (non-recursive remaining)
-    (for/fold ([non-recursive '()]
-               [remaining '()])
-              ([component components])
-      (cond [(and (= (length component) 1)
-                  (no-self-cycle? (car component)))
-             (values (cons (vertex-data (car component)) non-recursive)
-                     remaining)]
-            [else
-             (values non-recursive
-                     (append (map vertex-data component)
-                             remaining))])))
-  (values (append non-recursive non-binding)
-          remaining))
-
-;; check-non-recursive-clauses : (Listof lr-clause) (-> tc-results) -> tc-results
-;; Given a list of non-recursive clauses, check the clauses in order then call k
-;; in the built up environment.
-(define (check-non-recursive-clauses clauses k)
-  (let loop ([clauses clauses])
-    (cond [(null? clauses) (k)]
-          [else
-           (match-define (lr-clause names expr) (car clauses))
-           (match-define (list (tc-result: ts fs os) ...)
-             (get-type/infer names expr
-                             (lambda (e) (tc-expr/maybe-expected/t e names))
-                             tc-expr/check))
-           (with-lexical-env/extend names ts
-             (replace-names (map list names os)
-               (loop (cdr clauses))))])))
-
-;; this is so match can provide us with a syntax property to
-;; say that this binding is only called in tail position
-(define ((tc-expr-t/maybe-expected expected) e)
-  (syntax-parse e #:literal-sets (kernel-literals)
-    [(~and (#%plain-lambda (fmls:type-annotation^ ...) _) _:tail-position^)
-     #:when expected
-     (define arg-tys (attribute fmls.type))
-     (tc-expr/check e (ret (t:->* arg-tys (tc-results->values expected))))]
-    [_:tail-position^
-     #:when expected
-     (tc-expr/check e expected)]
-    [_ (tc-expr e)]))
-
-(define (tc/let-values namess exprs body [expected #f])
-  (let* (;; a list of each name clause
-         [names (stx-map syntax->list namess)]
-         ;; all the trailing expressions - the ones actually bound to the names
-         [exprs (syntax->list exprs)]
-         ;; the types of the exprs
-         #;[inferred-types (map (tc-expr-t/maybe-expected expected) exprs)]
-         ;; the annotated types of the name (possibly using the inferred types)
-         [results (for/list ([name (in-list names)] [e (in-list exprs)])
-                    (get-type/infer name e (tc-expr-t/maybe-expected expected)
-                                           tc-expr/check))])
-    (do-check void names results exprs body expected)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-literal.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-literal.rkt
deleted file mode 100644
index 8d37cadaae..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-literal.rkt
+++ /dev/null
@@ -1,131 +0,0 @@
-#lang racket/unit
-
-(require "../utils/utils.rkt"
-         racket/match
-         (typecheck signatures check-below)
-         (types abbrev numeric-tower resolve subtype union generalize)
-         (rep type-rep)
-         (only-in (infer infer) restrict)
-         (utils stxclass-util)
-         syntax/parse
-         unstable/function
-         unstable/sequence
-         racket/extflonum)
-
-(import)
-(export tc-literal^)
-
-;; return the type of a literal value
-;; tc-literal: racket-value-syntax [type] -> type
-(define (tc-literal v-stx [expected #f])
-  (define-syntax-class exp
-    (pattern (~and i (~or :number :str :bytes))
-             #:fail-unless expected #f
-             #:fail-unless (subtype (-val (syntax-e #'i)) expected) #f))
-  (syntax-parse v-stx
-    [i:exp expected]
-    [i:boolean (-val (syntax-e #'i))]
-    [i:identifier (-val (syntax-e #'i))]
-    ;; Numbers
-    [0 -Zero]
-    [1 -One]
-    [(~var i (3d (conjoin byte? positive?))) -PosByte]
-    [(~var i (3d byte?)) -Byte]
-    [(~var i (3d (conjoin portable-index? positive?))) -PosIndex]
-    [(~var i (3d (conjoin portable-fixnum? positive?))) -PosFixnum]
-    [(~var i (3d (conjoin portable-fixnum? negative?))) -NegFixnum]
-    [(~var i (3d exact-positive-integer?)) -PosInt]
-    [(~var i (3d (conjoin exact-integer? negative?))) -NegInt]
-    [(~var i (3d (conjoin number? exact? rational? positive?))) -PosRat]
-    [(~var i (3d (conjoin number? exact? rational? negative?))) -NegRat]
-    [(~var i (3d (lambda (x) (eqv? x 0.0)))) -FlonumPosZero]
-    [(~var i (3d (lambda (x) (eqv? x -0.0)))) -FlonumNegZero]
-    [(~var i (3d (lambda (x) (eqv? x +nan.0)))) -FlonumNan]
-    [(~var i (3d(lambda (x) (eqv? x +inf.0)))) (-val +inf.0)]
-    [(~var i (3d (lambda (x) (eqv? x -inf.0)))) (-val -inf.0)]
-    [(~var i (3d (conjoin flonum? positive?))) -PosFlonum]
-    [(~var i (3d (conjoin flonum? negative?))) -NegFlonum]
-    [(~var i (3d flonum?)) -Flonum] ; for nan
-    [(~var i (3d (lambda (x) (eqv? x 0.0f0)))) -SingleFlonumPosZero]
-    [(~var i (3d (lambda (x) (eqv? x -0.0f0)))) -SingleFlonumNegZero]
-    [(~var i (3d (lambda (x) (eqv? x +nan.f)))) -SingleFlonumNan]
-    [(~var i (3d(lambda (x) (eqv? x +inf.f)))) (-val +inf.f)]
-    [(~var i (3d (lambda (x) (eqv? x -inf.f)))) (-val -inf.f)]
-    [(~var i (3d (conjoin single-flonum? positive?))) -PosSingleFlonum]
-    [(~var i (3d (conjoin single-flonum? negative?))) -NegSingleFlonum]
-    [(~var i (3d single-flonum?)) -SingleFlonum] ; for nan
-    [(~var i (3d inexact-real?)) -InexactReal] ; catch-all, just in case
-    [(~var i (3d real?)) -Real] ; catch-all, just in case
-    ;; a complex number can't have a float imaginary part and an exact real part
-    [(~var i (3d (conjoin number? exact?)))
-     -ExactNumber]
-    [(~var i (3d (conjoin number? (lambda (x) (and (flonum? (imag-part x))
-                                                   (flonum? (real-part x)))))))
-     -FloatComplex]
-    [(~var i (3d (conjoin number? (lambda (x) (and (single-flonum? (imag-part x))
-                                                   (single-flonum? (real-part x)))))))
-     -SingleFlonumComplex]
-    ;; can't have real and imaginary parts that are both inexact, but not the same precision
-    [(~var i (3d number?)) -Number] ; otherwise, Number
-    
-    ;; 80-bit flonums
-    [(~var i (3d (lambda (x) (eqv? x 0.0t0)))) -ExtFlonumPosZero]
-    [(~var i (3d (lambda (x) (eqv? x -0.0t0)))) -ExtFlonumNegZero]
-    [(~var i (3d (lambda (x) (eqv? x +nan.t)))) -ExtFlonumNan]
-    [(~var i (3d (lambda (x) (eqv? x +inf.t)))) (-val +inf.t)]
-    [(~var i (3d (lambda (x) (eqv? x -inf.t)))) (-val -inf.t)]
-    [(~var i (3d (conjoin extflonum? (λ (x) (extfl> x 0.0t0))))) -PosExtFlonum]
-    [(~var i (3d (conjoin extflonum? (λ (x) (extfl< x 0.0t0))))) -NegExtFlonum]
-    [(~var i (3d extflonum?)) -ExtFlonum] ; for nan
-    
-    [i:str -String]
-    [i:char -Char]
-    [i:keyword (-val (syntax-e #'i))]
-    [i:bytes -Bytes]
-    [i:byte-pregexp -Byte-PRegexp]
-    [i:byte-regexp -Byte-Regexp]
-    [i:pregexp -PRegexp]
-    [i:regexp  -Regexp]
-    [() -Null]
-    [(i . r)
-     (match (and expected (resolve (restrict expected (-pair Univ Univ) 'orig)))
-       [(Pair: a-ty d-ty)
-        (-pair
-         (tc-literal #'i a-ty)
-         (tc-literal #'r d-ty))]
-       [t 
-        (-pair (tc-literal #'i) (tc-literal #'r))])]
-    [(~var i (3d vector?))
-     (match (and expected (resolve (restrict expected -VectorTop 'orig)))
-       [(Vector: t)
-        (make-Vector
-          (check-below
-            (apply Un
-              (for/list ([l (in-vector (syntax-e #'i))])
-                (tc-literal l t)))
-            t))]
-       [(HeterogeneousVector: ts)
-        (make-HeterogeneousVector
-         (for/list ([l (in-vector (syntax-e #'i))]
-                    [t (in-sequence-forever (in-list ts) #f)])
-           (cond-check-below (tc-literal l t) t)))]
-       [_ (make-HeterogeneousVector (for/list ([l (in-vector (syntax-e #'i))])
-                                      (generalize (tc-literal l #f))))])]
-    [(~var i (3d hash?))
-     (match (and expected (resolve (restrict expected -HashTop 'orig)))
-       [(Hashtable: k v)
-        (let* ([h (syntax-e #'i)]
-               [ks (hash-map h (lambda (x y) (tc-literal x k)))]
-               [vs (hash-map h (lambda (x y) (tc-literal y v)))])
-          (make-Hashtable
-            (check-below (apply Un ks) k)
-            (check-below (apply Un vs) v)))]
-       [_ (let* ([h (syntax-e #'i)]
-                 [ks (hash-map h (lambda (x y) (tc-literal x)))]
-                 [vs (hash-map h (lambda (x y) (tc-literal y)))])
-            (make-Hashtable (generalize (apply Un ks)) (generalize (apply Un vs))))])]
-    [_ Univ]))
-
-
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-metafunctions.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-metafunctions.rkt
deleted file mode 100644
index 3ad139b91b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-metafunctions.rkt
+++ /dev/null
@@ -1,153 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         racket/match racket/list
-         (except-in (types abbrev union utils filter-ops tc-result)
-                    -> ->* one-of/c)
-         (rep type-rep filter-rep object-rep rep-utils)
-         (typecheck tc-subst check-below)
-         (contract-req))
-
-(provide abstract-results
-         combine-props
-         merge-tc-results
-         tc-results->values)
-
-
-(define/cond-contract (abstract-results results arg-names #:rest-id [rest-id #f])
-  ((tc-results/c (listof identifier?)) (#:rest-id (or/c #f identifier?))
-   . ->* . SomeValues/c)
-  (define arg-names* (append arg-names (if rest-id (list rest-id) null)))
-  (tc-results->values
-    (replace-names
-      (for/list ([(nm k) (in-indexed (in-list arg-names*))])
-        (list nm (make-Path null (list 0 k))))
-      results)))
-
-(define (tc-results->values tc)
-  (match (fix-results tc)
-    [(tc-any-results: f)
-     (-AnyValues f)]
-    [(tc-results: ts fs os)
-     (make-Values (map -result ts fs os))]
-    [(tc-results: ts fs os dty dbound)
-     (make-ValuesDots (map -result ts fs os) dty dbound)]))
-
-(define/cond-contract (resolve atoms prop)
-  ((listof Filter/c)
-   Filter/c
-   . -> .
-   Filter/c)
-  (for/fold ([prop prop])
-    ([a (in-list atoms)])
-    (match prop
-      [(AndFilter: ps)
-       (let loop ([ps ps] [result null])
-         (if (null? ps)
-             (apply -and result)
-             (let ([p (car ps)])
-               (cond [(contradictory? a p) -bot]
-                     [(implied-atomic? p a) (loop (cdr ps) result)]
-                     [else (loop (cdr ps) (cons p result))]))))]
-      [_ prop])))
-
-(define (flatten-props ps)
-  (let loop ([ps ps])
-    (match ps
-      [(list) null]
-      [(cons (AndFilter: ps*) ps) (loop (append ps* ps))]
-      [(cons p ps) (cons p (loop ps))])))
-
-(define/cond-contract (combine-props new-props old-props exit)
-  ((listof Filter/c) (listof Filter/c) (-> none/c)
-   . -> .
-   (values (listof (or/c ImpFilter? OrFilter?)) (listof (or/c TypeFilter? NotTypeFilter?))))
-  (define (atomic-prop? p) (or (TypeFilter? p) (NotTypeFilter? p)))
-  (define-values (new-atoms new-formulas) (partition atomic-prop? (flatten-props new-props)))
-  (let loop ([derived-formulas null]
-             [derived-atoms new-atoms]
-             [worklist (append old-props new-formulas)])
-    (if (null? worklist)
-        (values derived-formulas derived-atoms)
-        (let* ([p (car worklist)]
-               [p (resolve derived-atoms p)])
-          (match p
-            [(ImpFilter: a c)
-             (if (for/or ([p (in-list (append derived-formulas derived-atoms))])
-                   (implied-atomic? a p))
-                 (loop derived-formulas derived-atoms (cons c (cdr worklist)))
-                 (loop (cons p derived-formulas) derived-atoms (cdr worklist)))]
-            [(OrFilter: ps)
-             (let ([new-or
-                    (let or-loop ([ps ps] [result null])
-                      (cond
-                        [(null? ps) (apply -or result)]
-                        [(for/or ([other-p (in-list (append derived-formulas derived-atoms))])
-                           (contradictory? (car ps) other-p))
-                         (or-loop (cdr ps) result)]
-                        [(for/or ([other-p (in-list derived-atoms)])
-                           (implied-atomic? (car ps) other-p))
-                         -top]
-                        [else (or-loop (cdr ps) (cons (car ps) result))]))])
-               (if (OrFilter? new-or)
-                   (loop (cons new-or derived-formulas) derived-atoms (cdr worklist))
-                   (loop derived-formulas derived-atoms (cons new-or (cdr worklist)))))]
-            [(or (? TypeFilter?) (? NotTypeFilter?)) (loop derived-formulas (cons p derived-atoms) (cdr worklist))]
-
-            [(AndFilter: ps) (loop derived-formulas derived-atoms (append ps (cdr worklist)))]
-            [(Top:) (loop derived-formulas derived-atoms (cdr worklist))]
-            [(Bot:) (exit)])))))
-
-
-(define (unconditional-prop res)
-  (match res
-    [(tc-any-results: f) f]
-    [(tc-results (list (tc-result: _ (FilterSet: f+ f-) _) ...) _)
-     (apply -and (map -or f+ f-))]))
-
-(define (merge-tc-results results)
-  (define/match (merge-tc-result r1 r2)
-    [((tc-result: t1 (FilterSet: f1+ f1-) o1)
-      (tc-result: t2 (FilterSet: f2+ f2-) o2))
-     (tc-result
-       (Un t1 t2)
-       (-FS (-or f1+ f2+) (-or f1- f2-))
-       (if (equal? o1 o2) o1 -empty-obj))])
-
-  (define/match (same-dty? r1 r2)
-    [(#f #f) #t]
-    [((cons t1 dbound) (cons t2 dbound)) #t]
-    [(_ _) #f])
-  (define/match (merge-dty r1 r2)
-    [(#f #f) #f]
-    [((cons t1 dbound) (cons t2 dbound))
-     (cons (Un t1 t2) dbound)])
-
-  (define/match (number-of-values res)
-    [((tc-results rs #f))
-     (length rs)]
-    [((tc-results rs (cons _ dbound)))
-     (format "~a and ... ~a" (length rs) dbound)])
-
-
-  (define/match (merge-two-results res1 res2)
-    [((tc-result1: (== -Bottom)) res2) res2]
-    [(res1 (tc-result1: (== -Bottom))) res1]
-    [((tc-any-results: f1) res2)
-     (tc-any-results (-or f1 (unconditional-prop res2)))]
-    [(res1 (tc-any-results: f2))
-     (tc-any-results (-or (unconditional-prop res1) f2))]
-    [((tc-results results1 dty1) (tc-results results2 dty2))
-     ;; if we have the same number of values in both cases
-     (cond
-       [(and (= (length results1) (length results2))
-             (same-dty? dty1 dty2))
-        (tc-results (map merge-tc-result results1 results2)
-                    (merge-dty dty1 dty2))]
-       ;; otherwise, error
-       [else
-        (tc-error/expr "Expected the same number of values, but got ~a and ~a"
-                         (length results1) (length results2))])])
-
-  (for/fold ([res (ret -Bottom)]) ([res2 (in-list results)])
-    (merge-two-results res res2)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-send.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-send.rkt
deleted file mode 100644
index bc037c7446..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-send.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/unit
-
-;; This module provides typechecking for `send` method calls
-
-(require "../utils/utils.rkt"
-         racket/match syntax/stx
-         (typecheck signatures tc-funapp tc-metafunctions)
-         (types base-abbrev resolve utils type-table)
-         (rep type-rep)
-         (utils tc-utils))
-
-(import tc-expr^)
-(export tc-send^)
-
-(define (tc/send form rcvr method args [expected #f])
-  ;; do-check : Type/c -> tc-results/c
-  (define (do-check rcvr-type)
-    (match rcvr-type
-      [(Instance: (? needs-resolving? type))
-       (do-check (make-Instance (resolve type)))]
-      [(and obj (Instance: (Class: _ _ _ methods _ _)))
-       (match (tc-expr/t method)
-         [(Value: (? symbol? s))
-          (define ftype
-            (cond [(assq s methods) => cadr]
-                  [else (tc-error/expr/fields
-                         "send: method not understood by object"
-                         "method name" s
-                         "object type" obj
-                         #:return -Bottom)]))
-          (tc/funapp rcvr args ftype (stx-map tc-expr args) expected)]
-         [_ (int-err "non-symbol methods not supported by Typed Racket: ~a"
-                     rcvr-type)])]
-      ;; union of objects, check pointwise and union the results
-      [(Union: (list (and objs (Instance: _)) ...))
-       (merge-tc-results
-        (for/list ([obj (in-list objs)])
-          (do-check obj)))]
-      [_ (tc-error/expr/fields
-          "send: type mismatch"
-          "expected" "an object"
-          "given" rcvr-type)]))
-  (define final-ret (do-check (tc-expr/t rcvr)))
-  (add-typeof-expr form final-ret)
-  final-ret)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-structs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-structs.rkt
deleted file mode 100644
index 12e92a2c78..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-structs.rkt
+++ /dev/null
@@ -1,316 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         syntax/struct syntax/parse racket/function racket/match racket/list
-
-         (prefix-in c: (contract-req))
-         (rep type-rep object-rep free-variance)
-         (private parse-type syntax-properties)
-         (types abbrev utils resolve substitute struct-table)
-         (env global-env type-name-env type-alias-env tvar-env)
-         (utils tc-utils)
-         (typecheck def-binding internal-forms)
-         (for-syntax syntax/parse racket/base))
-
-(require-for-cond-contract racket/struct-info)
-
-(provide tc/struct name-of-struct d-s
-         refine-struct-variance!
-         register-parsed-struct-sty!
-         register-parsed-struct-bindings!)
-
-(define-syntax-class parent
-  #:attributes (name par)
-  (pattern (name:id par:id))
-  (pattern name:id #:attr par #f))
-
-;; sty : Struct?
-;; names : Listof[Identifier]
-;; desc : struct-desc
-;; struct-info : struct-info?
-;; type-only : Boolean
-(struct parsed-struct (sty names desc struct-info type-only) #:transparent)
-
-;; type-name : Id
-;; struct-type : Id
-;; constructor : Id
-;; predicate : Id
-;; getters : Listof[Id]
-;; setters : Listof[Id] or #f
-(struct struct-names (type-name struct-type constructor predicate getters setters) #:transparent)
-
-;;struct-fields: holds all the relevant information about a struct type's types
-(struct struct-desc (parent-fields self-fields tvars mutable proc-ty) #:transparent)
-
-(define (struct-desc-all-fields fields)
-  (append (struct-desc-parent-fields fields) (struct-desc-self-fields fields)))
-(define (struct-desc-parent-count fields)
-  (length (struct-desc-parent-fields fields)))
-
-(define (name-of-struct stx)
-  (syntax-parse stx
-    [(~or t:typed-struct t:typed-struct/exec)
-     #:with nm/par:parent #'t.nm
-     #'nm/par.name]))
-
-
-;; parse name field of struct, determining whether a parent struct was specified
-;; syntax -> (values identifier Option[Name] Option[Struct])
-(define/cond-contract (parse-parent nm/par)
-  (c:-> syntax? (values identifier? (c:or/c Name? #f) (c:or/c Mu? Poly? Struct? #f)))
-  (syntax-parse nm/par
-    [v:parent
-      (if (attribute v.par)
-          (let* ([parent0 (parse-type #'v.par)]
-                 ;; TODO ensure this is a struct
-                 [parent (let loop ((parent parent0))
-                               (cond
-                                 ((Name? parent) (loop (resolve-name parent)))
-                                 ((or (Poly? parent) (Mu? parent) (Struct? parent))
-                                  parent)
-                                 (else
-                                  (tc-error/stx #'v.par "parent type not a valid structure name: ~a"
-                                                (syntax->datum #'v.par)))))])
-                (values #'v.name parent0 parent))
-          (values #'v.name #f #f))]))
-
-
-;; generate struct names given type name, field names
-;; and optional constructor name
-;; all have syntax loc of name
-;; identifier listof[identifier] Option[identifier] ->
-;;   (values identifier identifier list[identifier] list[identifier])
-(define (get-struct-names nm flds maker*)
-  (define (split l)
-    (let loop ([l l] [getters '()] [setters '()])
-      (if (null? l)
-          (values (reverse getters) (reverse setters))
-          (loop (cddr l) (cons (car l) getters) (cons (cadr l) setters)))))
-  (match (build-struct-names nm flds #f #f nm #:constructor-name maker*)
-    [(list sty maker pred getters/setters ...)
-     (let-values ([(getters setters) (split getters/setters)])
-       (struct-names nm sty maker pred getters setters))]))
-
-;; gets the fields of the parent type, if they exist
-;; Option[Struct-Ty] -> Listof[Type]
-(define/cond-contract (get-flds p)
-  (c:-> (c:or/c Struct? #f) (c:listof fld?))
-  (match p
-    [(Struct: _ _ flds _ _ _) flds]
-    [#f null]))
-
-
-;; Constructs the Struct value for a structure type
-;; The returned value has free type variables
-(define/cond-contract (mk/inner-struct-type names desc parent)
-  (c:-> struct-names? struct-desc? (c:or/c Struct? #f) Struct?)
-
-  (let* ([this-flds (for/list ([t (in-list (struct-desc-self-fields desc))]
-                               [g (in-list (struct-names-getters names))])
-                       (make-fld t g (struct-desc-mutable desc)))]
-         [flds (append (get-flds parent) this-flds)])
-    (make-Struct (struct-names-type-name names)
-                 parent flds (struct-desc-proc-ty desc)
-                 (not (null? (struct-desc-tvars desc)))
-                 (struct-names-predicate names))))
-
-
-;; construct all the various types for structs, and then register the approriate names
-;; identifier listof[identifier] type listof[fld] listof[Type] boolean ->
-;;  (values Type listof[Type] listof[Type])
-(define/cond-contract (register-sty! sty names desc)
-  (c:-> Struct? struct-names? struct-desc? void?)
-
-  ;; a type alias needs to be registered here too, to ensure
-  ;; that parse-type will map the identifier to this Name type
-  (define type-name (struct-names-type-name names))
-  (register-resolved-type-alias
-   type-name
-   (make-Name type-name #f #t))
-  (register-type-name type-name
-                      (make-Poly (struct-desc-tvars desc) sty)))
-
-
-
-
-;; Register the approriate types to the struct bindings.
-(define/cond-contract (register-struct-bindings! sty names desc si)
-  (c:-> Struct? struct-names? struct-desc? (c:or/c #f struct-info?) (c:listof binding?))
-
-
-  (define tvars (struct-desc-tvars desc))
-  (define all-fields (struct-desc-all-fields desc))
-  (define self-fields (struct-desc-self-fields desc))
-  (define mutable (struct-desc-mutable desc))
-  (define parent-count (struct-desc-parent-count desc))
-
-
-  ;; the base-type, with free type variables
-  (define name-type
-    (make-Name (struct-names-type-name names)
-               #f #t))
-  (define poly-base
-    (if (null? tvars)
-        name-type
-        (make-App name-type (map make-F tvars) #f)))
-
-  ;; is this structure covariant in *all* arguments?
-  (define covariant?
-    (for*/and ([var (in-list tvars)]
-               [t (in-list all-fields)])
-      (let ([variance (hash-ref (free-vars-hash (free-vars* t)) var Constant)])
-        (or (eq? variance Constant)
-            (and (not mutable) (eq? variance Covariant))))))
-
-  (define (poly-wrapper t) (make-Poly tvars t))
-  (define bindings
-    (list*
-     ;; the list of names w/ types
-     (make-def-binding (struct-names-struct-type names) (make-StructType sty))
-     (make-def-binding (struct-names-predicate names)
-                       (make-pred-ty (if (not covariant?)
-                                         (make-StructTop sty)
-                                         (subst-all (make-simple-substitution
-                                                     tvars (map (const Univ) tvars)) poly-base))))
-     (append
-      (for/list ([g (in-list (struct-names-getters names))]
-                 [t (in-list self-fields)]
-                 [i (in-naturals parent-count)])
-        (let* ([path (make-StructPE poly-base i)]
-               [func (poly-wrapper
-                      (if mutable
-                          (->* (list poly-base) t)
-                          (->acc (list poly-base) t (list path))))])
-          (add-struct-fn! g path #f)
-          (make-def-binding g func)))
-      (if mutable
-          (for/list ([s (in-list (struct-names-setters names))]
-                     [t (in-list self-fields)]
-                     [i (in-naturals parent-count)])
-            (add-struct-fn! s (make-StructPE poly-base i) #t)
-            (make-def-binding s (poly-wrapper (->* (list poly-base t) -Void))))
-          null))))
-
-  (add-struct-constructor! (struct-names-constructor names))
-
-  (define constructor-binding
-     (make-def-binding (struct-names-constructor names) (poly-wrapper (->* all-fields poly-base))))
-
-  (for ([b (cons constructor-binding bindings)])
-    (register-type (binding-name b) (def-binding-ty b)))
-
-  (append
-    (if (free-identifier=? (struct-names-type-name names)
-                           (struct-names-constructor names))
-      null
-      (list constructor-binding))
-   (cons
-     (make-def-struct-stx-binding (struct-names-type-name names) si (def-binding-ty constructor-binding))
-     bindings)))
-
-(define (register-parsed-struct-sty! ps)
-  (match ps
-    ((parsed-struct sty names desc si type-only)
-     (register-sty! sty names desc))))
-
-(define (register-parsed-struct-bindings! ps)
-  (match ps
-    ((parsed-struct sty names desc si type-only)
-     (if type-only
-         null
-         (register-struct-bindings! sty names desc si)))))
-
-;; Listof<Parsed-Struct> -> Void
-;; Refines the variance of struct types in the name environment
-(define (refine-struct-variance! parsed-structs)
-  (define stys (map parsed-struct-sty parsed-structs))
-  (define tvarss (map (compose struct-desc-tvars parsed-struct-desc) parsed-structs))
-  (define names (map Struct-name stys))
-  (refine-variance! names stys tvarss))
-
-;; check and register types for a define struct
-;; tc/struct : Listof[identifier] (U identifier (list identifier identifier))
-;;             Listof[identifier] Listof[syntax]
-;;             -> void
-(define (tc/struct vars nm/par fld-names tys
-                   #:proc-ty [proc-ty #f]
-                   #:maker [maker #f]
-                   #:mutable [mutable #f]
-                   #:type-only [type-only #f])
-  ;; parent field types can't actually be determined here
-  (define-values (nm parent-name parent) (parse-parent nm/par))
-  ;; create type variables for the new type parameters
-  (define tvars (map syntax-e vars))
-  (define new-tvars (map make-F tvars))
-  ;; parse the types
-  (define types
-    ;; add the type parameters of this structure to the tvar env
-    (extend-tvars tvars
-      (parameterize ([current-poly-struct `#s(poly ,nm ,new-tvars)])
-        ;; parse the field types
-        (map parse-type tys))))
-  ;; instantiate the parent if necessary, with new-tvars
-  (define concrete-parent
-    (if (Poly? parent)
-        (if (> (Poly-n parent) (length new-tvars))
-            (tc-error "Could not instantiate parent struct type. Required ~a type variables, received ~a."
-              (Poly-n parent)
-              (length new-tvars))
-            (instantiate-poly parent (take new-tvars (Poly-n parent))))
-        parent))
-  ;; create the actual structure type, and the types of the fields
-  ;; that the outside world will see
-  ;; then register it
-  (define names (get-struct-names nm fld-names maker))
-  (define desc (struct-desc
-                 (map fld-t (get-flds concrete-parent))
-                 types
-                 tvars
-                 mutable
-                 (and proc-ty (parse-type proc-ty))))
-  (define sty (mk/inner-struct-type names desc concrete-parent))
-
-  (parsed-struct sty names desc (struct-info-property nm/par) type-only))
-
-
-;; register a struct type
-;; convenience function for built-in structs
-;; tc/builtin-struct : identifier Maybe[identifier] Listof[identifier]
-;;                     Listof[Type] Maybe[identifier] Listof[Type]
-;;                     -> void
-;; FIXME - figure out how to make this lots lazier
-(define/cond-contract (tc/builtin-struct nm parent fld-names tys kernel-maker)
-     (c:-> identifier? (c:or/c #f identifier?) (c:listof identifier?)
-           (c:listof Type/c) (c:or/c #f identifier?)
-           c:any/c)
-  (define parent-type
-    (and parent (resolve-name (make-Name parent #f #t))))
-  (define parent-tys (map fld-t (get-flds parent-type)))
-
-  (define names (get-struct-names nm fld-names #f))
-  (define desc (struct-desc parent-tys tys null #t #f))
-  (define sty (mk/inner-struct-type names desc parent-type))
-
-  (register-sty! sty names desc)
-  (register-struct-bindings! sty names desc #f)
-  (when kernel-maker
-    (register-type kernel-maker (λ () (->* (struct-desc-all-fields desc) sty)))))
-
-;; syntax for tc/builtin-struct
-(define-syntax (d-s stx)
-  (define-splicing-syntax-class options
-   (pattern (~optional (~seq #:kernel-maker maker:id))
-            #:attr kernel-maker (if (attribute maker) #'(quote-syntax maker) #'#f)))
-
-  (syntax-parse stx
-    [(_ (nm:id par:id) ([fld:id (~datum :) ty] ...) (par-ty ...) opts:options)
-     #'(tc/builtin-struct #'nm #'par
-                          (list #'fld ...)
-                          (list ty ...)
-                          opts.kernel-maker)]
-    [(_ nm:id ([fld:id (~datum :) ty] ...) opts:options)
-     #'(tc/builtin-struct #'nm #f
-                          (list #'fld ...)
-                          (list ty ...)
-                          opts.kernel-maker)]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-subst.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-subst.rkt
deleted file mode 100644
index 456ca52d96..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-subst.rkt
+++ /dev/null
@@ -1,182 +0,0 @@
-#lang racket/base
-
-;; Functions in this file implement the substitution function in
-;; figure 8, pg 8 of "Logical Types for Untyped Languages"
-
-(require "../utils/utils.rkt"
-         racket/match racket/list
-         (contract-req)
-         (except-in (types abbrev utils filter-ops) -> ->* one-of/c)
-         (rep type-rep object-rep filter-rep rep-utils))
-
-(provide add-scope)
-
-(provide/cond-contract
-  [values->tc-results (->* (SomeValues/c (listof Object?)) ((listof Type/c)) full-tc-results/c)]
-  [replace-names (-> (listof (list/c identifier? Object?)) tc-results/c tc-results/c)])
-
-;; Substitutes the given objects into the values and turns it into a tc-result.
-;; This matches up to the substitutions in the T-App rule from the ICFP paper.
-(define (values->tc-results v os [ts (map (λ (o) Univ) os)])
-  (define res
-    (match v
-      [(AnyValues: f)
-       (tc-any-results f)]
-      [(Results: t f o)
-       (ret t f o)]
-      [(Results: t f o dty dbound)
-       (ret t f o dty dbound)]))
-  (for/fold ([res res]) ([(o arg) (in-indexed (in-list os))]
-                         [t (in-list ts)])
-    (subst-tc-results res (list 0 arg) o #t t)))
-
-
-;; replace-names: (listof (list/c identifier? Object?) tc-results? -> tc-results?
-;; For each name replaces all uses of it in res with the corresponding object.
-;; This is used so that names do not escape the scope of their definitions
-(define (replace-names names+objects res)
-  (for/fold ([res res]) ([name/object (in-list names+objects)])
-    (subst-tc-results res (first name/object) (second name/object) #t Univ)))
-
-;; Substitution of objects into a tc-results
-;; This is a combination of all of thes substitions from the paper over the different parts of the
-;; results.
-;; t is the type of the object that we are substituting in. This allows for simplification of some
-;; filters if they conflict with the argument type.
-(define/cond-contract (subst-tc-results res k o polarity t)
-  (-> full-tc-results/c name-ref/c Object? boolean? Type? full-tc-results/c)
-  (define (st t) (subst-type t k o polarity))
-  (define (sf f) (subst-filter f k o polarity))
-  (define (sfs fs) (subst-filter-set fs k o polarity t))
-  (define (so ob) (subst-object ob k o polarity))
-  (match res
-    [(tc-any-results: f) (tc-any-results (sf f))]
-    [(tc-results: ts fs os)
-     (ret (map st ts) (map sfs fs) (map so os))]
-    [(tc-results: ts fs os dt db)
-     (ret (map st ts) (map sfs fs) (map so os) (st dt) db)]))
-
-
-;; Substitution of objects into a filter set
-;; This is essentially ψ+|ψ- [o/x] from the paper
-(define/cond-contract (subst-filter-set fs k o polarity [t Univ])
-  (->* ((or/c FilterSet? NoFilter?) name-ref/c Object? boolean?) (Type/c) FilterSet?)
-  (define extra-filter (-filter t k))
-  (define (add-extra-filter f)
-    (define f* (-and f extra-filter))
-    (cond
-      [(filter-equal? f* extra-filter) -top]
-      [(Bot? f*) -bot]
-      [else f]))
-  (match fs
-    [(FilterSet: f+ f-)
-     (-FS (subst-filter (add-extra-filter f+) k o polarity)
-          (subst-filter (add-extra-filter f-) k o polarity))]
-    [_ -top-filter]))
-
-;; Substitution of objects into a type
-;; This is essentially t [o/x] from the paper
-(define/cond-contract (subst-type t k o polarity)
-  (-> Type/c name-ref/c Object? boolean? Type/c)
-  (define (st t) (subst-type t k o polarity))
-  (define/cond-contract (sf fs) (FilterSet? . -> . FilterSet?) (subst-filter-set fs k o polarity))
-  (type-case (#:Type st
-              #:Filter sf
-              #:Object (lambda (f) (subst-object f k o polarity)))
-              t
-              [#:arr dom rng rest drest kws
-                     (let* ([st* (λ (t) (subst-type t (add-scope k) (add-scope/object o) polarity))])
-                       (make-arr (map st dom)
-                                 (st* rng)
-                                 (and rest (st rest))
-                                 (and drest (cons (st (car drest)) (cdr drest)))
-                                 (map st kws)))]))
-
-;; add-scope : name-ref/c -> name-ref/c
-;; Add a scope to an index name-ref
-(define (add-scope key)
-  (match key
-    [(list fun arg) (list (add1 fun) arg)]
-    [(? identifier?) key]))
-
-;; add-scope/object : Object? -> Object?
-;; Add a scope to an index object
-(define (add-scope/object obj)
-  (match obj
-    [(Empty:) -empty-obj]
-    [(Path: p nm) (make-Path p (add-scope nm))]))
-
-;; Substitution of objects into objects
-;; This is o [o'/x] from the paper
-(define/cond-contract (subst-object t k o polarity)
-  (-> Object? name-ref/c Object? boolean? Object?)
-  (match t
-    [(NoObject:) t]
-    [(Empty:) t]
-    [(Path: p i)
-     (if (name-ref=? i k)
-         (match o
-           [(Empty:) -empty-obj]
-           ;; the result is not from an annotation, so it isn't a NoObject
-           [(NoObject:) -empty-obj]
-           [(Path: p* i*) (make-Path (append p p*) i*)])
-         t)]))
-
-;; Substitution of objects into a filter in a filter set
-;; This is ψ+ [o/x] and ψ- [o/x]
-(define/cond-contract (subst-filter f k o polarity)
-  (-> Filter/c name-ref/c Object? boolean? Filter/c)
-  (define (ap f) (subst-filter f k o polarity))
-  (define (tf-matcher t p i maker)
-    (cond
-      [(name-ref=? i k)
-       (match o
-         [(Empty:)
-          (if polarity -top -bot)]
-         [_
-          (maker
-            (subst-type t k o polarity)
-            (-acc-path p o))])]
-      [(index-free-in? k t) (if polarity -top -bot)]
-      [else f]))
-
-  (match f
-    [(ImpFilter: ant consq)
-     (-imp (subst-filter ant k o (not polarity)) (ap consq))]
-    [(AndFilter: fs) (apply -and (map ap fs))]
-    [(OrFilter: fs) (apply -or (map ap fs))]
-    [(Bot:) -bot]
-    [(Top:) -top]
-    [(TypeFilter: t (Path: p i))
-     (tf-matcher t p i -filter)]
-    [(NotTypeFilter: t (Path: p i))
-     (tf-matcher t p i -not-filter)]))
-
-;; Determine if the object k occurs free in the given type
-(define (index-free-in? k type)
-  (let/ec
-   return
-   (define (for-object o)
-     (object-case (#:Type for-type)
-                  o
-                  [#:Path p i
-                          (if (name-ref=? i k)
-                              (return #t)
-                              o)]))
-   (define (for-type t)
-     (type-case (#:Type for-type
-                 #:Object for-object)
-                t
-                [#:arr dom rng rest drest kws
-                       (let* ([st* (if (pair? k)
-                                       (lambda (t) (index-free-in? (add-scope k) t))
-                                       for-type)])
-                         (for-each for-type dom)
-                         (st* rng)
-                         (and rest (for-type rest))
-                         (and drest (for-type (car drest)))
-                         (for-each for-type kws)
-                         ;; dummy return value
-                         (make-arr* null Univ))]))
-   (for-type type)
-    #f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt
deleted file mode 100644
index b54179b4ff..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt
+++ /dev/null
@@ -1,452 +0,0 @@
-#lang racket/base
-
-(require (rename-in "../utils/utils.rkt" [infer r:infer])
-         racket/syntax syntax/parse syntax/stx syntax/id-table
-         racket/list unstable/list racket/dict racket/match unstable/sequence
-         (prefix-in c: (contract-req))
-         (rep type-rep)
-         (types utils abbrev type-table struct-table)
-         (private parse-type type-annotation syntax-properties)
-         (env global-env init-envs type-name-env type-alias-env
-              lexical-env env-req mvar-env scoped-tvar-env
-              type-alias-helper)
-         (utils tc-utils)
-         (typecheck provide-handling def-binding tc-structs
-                    typechecker internal-forms)
-         syntax/location
-         racket/format
-         (for-template
-          (only-in syntax/location quote-module-name)
-          racket/base
-          racket/contract/private/provide
-          (env env-req)))
-
-(provide/cond-contract
- [tc-module (syntax? . c:-> . (values syntax? syntax?))]
- [tc-toplevel-form (syntax? . c:-> . c:any/c)])
-
-(define-logger online-check-syntax)
-
-(define unann-defs (make-free-id-table))
-
-(define (parse-typed-struct form)
-  (parameterize ([current-orig-stx form])
-    (syntax-parse form
-      [t:typed-struct
-       (tc/struct (attribute t.tvars) #'t.nm (syntax->list #'(t.fields ...)) (syntax->list #'(t.types ...))
-                  #:mutable (attribute t.mutable)
-                  #:maker (attribute t.maker)
-                  #:type-only (attribute t.type-only))]
-      [t:typed-struct/exec
-       (tc/struct null #'t.nm (syntax->list #'(t.fields ...)) (syntax->list #'(t.types ...))
-                  #:proc-ty #'t.proc-type)])))
-
-(define (type-vars-of-struct form)
-  (syntax-parse form
-    [t:typed-struct (attribute t.tvars)]
-    [t:typed-struct/exec null]))
-
-;; syntax? -> (listof def-binding?)
-(define (tc-toplevel/pass1 form)
-  (parameterize ([current-orig-stx form])
-    (syntax-parse form
-      #:literals (values define-values #%plain-app begin define-syntaxes)
-
-      ;; forms that are handled in other ways
-      [(~or _:ignore^ _:ignore-some^)
-       (list)]
-
-      [((~literal module) n:id spec ((~literal #%plain-module-begin) body ...))
-       (list)]
-       ;; module* is not expanded, so it doesn't have a `#%plain-module-begin`
-      [((~literal module*) n:id spec body ...)
-       (list)]
-
-      ;; type aliases have already been handled by an earlier pass
-      [_:type-alias
-       (list)]
-
-      ;; declare-refinement
-      ;; FIXME - this sucks and should die
-      [t:type-refinement
-       (match (lookup-type/lexical #'t.predicate)
-              [(and t (Function: (list (arr: (list dom) (Values: (list (Result: rng _ _))) #f #f '()))))
-               (let ([new-t (make-pred-ty (list dom)
-                                          rng
-                                          (make-Refinement dom #'t.predicate))])
-                 (register-type #'t.predicate new-t))
-               (list)]
-              [t (tc-error "cannot declare refinement for non-predicate ~a" t)])]
-
-      ;; require/typed
-      [r:typed-require
-       (let ([t (parse-type #'r.type)])
-         (register-type #'r.name t)
-         (list (make-def-binding #'r.name t)))]
-
-      [r:typed-require/struct
-       (let* ([t (parse-type #'r.type)]
-              [flds (map fld-t (Struct-flds (lookup-type-name (Name-id t))))]
-              [mk-ty (flds #f . ->* . t)])
-         (register-type #'r.name mk-ty)
-         (list (make-def-binding #'r.name mk-ty)))]
-
-      ;; define-typed-struct (handled earlier)
-      [(~or _:typed-struct _:typed-struct/exec)
-       (list)]
-
-      ;; predicate assertion - needed for define-type b/c or doesn't work
-      [p:predicate-assertion
-       (register-type #'p.predicate (make-pred-ty (parse-type #'p.type)))
-       (list)]
-
-      ;; top-level type annotation
-      [t:type-declaration
-       (register-type/undefined #'t.id (parse-type #'t.type))
-       (register-scoped-tvars #'t.id (parse-literal-alls #'t.type))
-       (list)]
-
-      ;; definitions lifted from contracts should be ignored
-      [(define-values (lifted) expr)
-       #:when (contract-lifted-property #'expr)
-       (list)]
-
-      ;; values definitions
-      [(define-values (var ...) expr)
-       (define vars (syntax->list #'(var ...)))
-       (syntax-parse vars
-         ;; if all the variables have types, we stick them into the environment
-         [(v:type-label^ ...)
-          (let ([ts (map (λ (x) (get-type x #:infer #f)) vars)])
-            (for-each register-type-if-undefined vars ts)
-            (map make-def-binding vars ts))]
-         ;; if this already had an annotation, we just construct the binding reps
-         [(v:typed-id^ ...)
-          (define top-level? (eq? (syntax-local-context) 'top-level))
-          (for ([var (in-list vars)])
-            (when (dict-has-key? unann-defs var)
-              (free-id-table-remove! unann-defs var))
-            (finish-register-type var top-level?))
-          (stx-map make-def-binding #'(v ...) (attribute v.type))]
-         ;; defer to pass1.5
-         [_ (list)])]
-
-      ;; to handle the top-level, we have to recur into begins
-      [(begin . rest)
-       (apply append (stx-map tc-toplevel/pass1 #'rest))]
-
-      ;; define-syntaxes just get noted
-      [(define-syntaxes (var:id ...) . rest)
-       (stx-map make-def-stx-binding #'(var ...))]
-
-      ;; otherwise, do nothing in this pass
-      ;; handles expressions, provides, requires, etc and whatnot
-      [_ (list)])))
-
-;; tc-toplevel/pass1.5 : syntax? -> (listof def-binding?)
-;; Handles `define-values` that still need types synthesized. Runs after
-;; pass1 but before pass2.
-;;
-;; Note: this pass does an extra traversal of the toplevel forms which
-;;       could be optimized by constructing a worklist in pass1 and only
-;;       looking at forms in that list. (if performance becomes an
-;;       issue with this pass we can do that)
-(define (tc-toplevel/pass1.5 form)
-  (parameterize ([current-orig-stx form])
-    (syntax-parse form
-      #:literals (define-values begin)
-      [(~or _:ignore^ _:ignore-some^) (list)]
-
-      ;; definitions lifted from contracts should be ignored
-      [(define-values (lifted) expr)
-       #:when (contract-lifted-property #'expr)
-       (list)]
-
-      [(define-values (var ...) expr)
-       (define vars (syntax->list #'(var ...)))
-       (syntax-parse vars
-         ;; Do nothing for annotated/typed things
-         [(v:type-label^ ...) (list)]
-         [(v:typed-id^ ...) (list)]
-         ;; Special case to infer types for top level defines
-         ;;
-         ;; Checking these will never return errors due to missing
-         ;; types for annotated variables due to pass1. Checking may
-         ;; error due to un-annotated variables that come later in
-         ;; the module (hence we haven't synthesized a type for yet).
-         [_
-          (match (get-type/infer vars #'expr tc-expr tc-expr/check)
-            [(list (tc-result: ts) ...)
-             (for/list ([i (in-list vars)] [t (in-list ts)])
-               (register-type i t)
-               (free-id-table-set! unann-defs i #t)
-               (make-def-binding i t))])])]
-
-      ;; for the top-level, as for pass1
-      [(begin . rest)
-       (apply append (stx-map tc-toplevel/pass1.5 #'rest))]
-
-      [_ (list)])))
-
-;; typecheck the expressions of a module-top-level form
-;; no side-effects
-;; syntax? -> (or/c 'no-type tc-results/c)
-(define (tc-toplevel/pass2 form [expected (tc-any-results -top)])
-  
-  (do-time (format "pass2 ~a line ~a"
-                   (if #t
-                       (substring (~a (syntax-source form))
-                                  (max 0 (- (string-length (~a (syntax-source form))) 20)))
-                       (syntax-source form))
-                   (syntax-line form)))
-  (parameterize ([current-orig-stx form])
-    (syntax-parse form
-      #:literal-sets (kernel-literals)
-      ;; need to special case this to avoid errors at top-level
-      [stx:tr:class^
-       (tc-expr #'stx)]
-
-      ;; these forms we have been instructed to ignore
-      [stx:ignore^
-       'no-type]
-
-      ;; this is a form that we mostly ignore, but we check some interior parts
-      [stx:ignore-some^
-       (register-ignored! form)
-       (check-subforms/ignore form)]
-
-      ;; these forms should always be ignored
-      [((~or define-syntaxes begin-for-syntax #%require #%provide #%declare) . _) 'no-type]
-
-      ;; submodules take care of themselves:
-      [(module n spec (#%plain-module-begin body ...)) 'no-type]
-      ;; module* is not expanded, so it doesn't have a `#%plain-module-begin`
-      [(module* n spec body ...) 'no-type]
-
-      ;; definitions lifted from contracts should be ignored
-      [(define-values (lifted) expr)
-       #:when (contract-lifted-property #'expr)
-       'no-type]
-
-      ;; definitions just need to typecheck their bodies
-      [(define-values () expr)
-       (tc-expr/check #'expr (ret empty))
-       'no-type]
-      [(define-values (var ...) expr)
-       #:when (for/and ([v (in-syntax #'(var ...))])
-                (free-id-table-ref unann-defs v (lambda _ #f)))
-       'no-type]
-      [(define-values (var:typed-id^ ...) expr)
-       (let ([ts (attribute var.type)])
-         (when (= 1 (length ts))
-           (add-scoped-tvars #'expr (lookup-scoped-tvars (stx-car #'(var ...)))))
-         (tc-expr/check #'expr (ret ts)))
-       'no-type]
-
-      ;; to handle the top-level, we have to recur into begins
-      [(begin) 'no-type]
-      [(begin . rest)
-       (for/last ([form (in-syntax #'rest)])
-         (tc-toplevel/pass2 form expected))]
-
-      ;; otherwise, the form was just an expression
-      [_ (if expected
-             (tc-expr/check form expected)
-             (tc-expr form))])))
-
-
-
-;; new implementation of type-check
-(define (parse-def x)
-  (syntax-parse x
-    #:literal-sets (kernel-literals)
-    [(define-values (nm ...) . rest) (syntax->list #'(nm ...))]
-    [_ #f]))
-
-(define (parse-syntax-def x)
-  (syntax-parse x
-    #:literal-sets (kernel-literals)
-    [(define-syntaxes (nm ...) . rest) (syntax->list #'(nm ...))]
-    [_ #f]))
-
-;; actually do the work on a module
-;; produces prelude and post-lude syntax objects
-;; syntax-list -> (values syntax syntax)
-(define (type-check forms0)
-  (define forms (syntax->list forms0))
-  (do-time "before form splitting")
-  (define-values (type-aliases struct-defs stx-defs0 val-defs0 provs)
-    (filter-multiple
-     forms
-     type-alias? 
-     (lambda (e) (or (typed-struct? e) (typed-struct/exec? e)))
-     parse-syntax-def
-     parse-def
-     provide?))
-  (do-time "Form splitting done")
-
-  (define-values (type-alias-names type-alias-map)
-    (get-type-alias-info type-aliases))
-
-  ;; Add the struct names to the type table, but not with a type
-  (let ((names (map name-of-struct struct-defs))
-        (type-vars (map type-vars-of-struct struct-defs)))
-    (for ([name names])
-      (register-resolved-type-alias
-       name (make-Name name #f #t)))
-    (for-each register-type-name names)
-    (for-each add-constant-variance! names type-vars))
-  (do-time "after adding type names")
-
-  (register-all-type-aliases type-alias-names type-alias-map)
-
-  (do-time "starting struct handling")
-  ;; Parse and register the structure types
-  (define parsed-structs
-    (for/list ((def (in-list struct-defs)))
-      (define parsed (parse-typed-struct def))
-      (register-parsed-struct-sty! parsed)
-      parsed))
-
-  (refine-struct-variance! parsed-structs)
-
-  ;; register the bindings of the structs
-  (define struct-bindings (map register-parsed-struct-bindings! parsed-structs))
-  (do-time "before pass1")
-  ;; do pass 1, and collect the defintions
-  (define *defs (apply append
-                       (append
-                        struct-bindings
-                        (map tc-toplevel/pass1 forms))))
-  ;; do pass 1.5 to finish up the definitions
-  (define defs (append *defs (apply append (map tc-toplevel/pass1.5 forms))))
-  (do-time "Finished pass1")
-  ;; separate the definitions into structures we'll handle for provides
-  (define def-tbl
-    (for/fold ([h (make-immutable-free-id-table)])
-      ([def (in-list defs)])
-      ;; TODO figure out why without these checks some tests break
-      (define (plain-stx-binding? def)
-        (and (def-stx-binding? def) (not (def-struct-stx-binding? def))))
-      (define (merge-def-bindings other-def)
-        (cond
-          [(not other-def) def]
-          [(plain-stx-binding? def) other-def]
-          [(plain-stx-binding? other-def) def]
-          [else
-            (int-err "Two conflicting definitions: ~a ~a" def other-def)]))
-      (dict-update h (binding-name def) merge-def-bindings #f)))
-  (do-time "computed def-tbl")
-  ;; typecheck the expressions and the rhss of defintions
-  ;(displayln "Starting pass2")
-  (for-each tc-toplevel/pass2 forms)
-  (do-time "Finished pass2")
-  ;; check that declarations correspond to definitions
-  (check-all-registered-types)
-  ;; log messages to check-syntax to show extra types / arrows before failures
-  (log-message online-check-syntax-logger
-               'info
-               "TR's tooltip syntaxes; this message is ignored"
-               (list (syntax-property #'(void) 'mouse-over-tooltips (type-table->tooltips))))
-  ;; report delayed errors
-  (report-all-errors)
-  (define provide-tbl
-    (for/fold ([h (make-immutable-free-id-table)]) ([p (in-list provs)])
-      (define-syntax-class unknown-provide-form
-        (pattern
-         (~and name
-               (~or (~datum protect) (~datum for-syntax) (~datum for-label) (~datum for-meta)
-                    (~datum struct) (~datum all-from) (~datum all-from-except)
-                    (~datum all-defined) (~datum all-defined-except)
-                    (~datum prefix-all-defined) (~datum prefix-all-defined-except)
-                    (~datum expand)))))
-      (syntax-parse p #:literal-sets (kernel-literals)
-        [(#%provide form ...)
-         (for/fold ([h h]) ([f (in-syntax #'(form ...))])
-           (parameterize ([current-orig-stx f])
-             (syntax-parse f
-               [i:id
-                (dict-update h #'i (lambda (tail) (cons #'i tail)) '())]
-               [((~datum rename) in out)
-                (dict-update h #'in (lambda (tail) (cons #'out tail)) '())]
-               [(name:unknown-provide-form . _)
-                (tc-error "provide: ~a not supported by Typed Racket" (syntax-e #'name.name))]
-               [_ (int-err "unknown provide form")])))]
-        [_ (int-err "non-provide form! ~a" (syntax->datum p))])))
-  ;; compute the new provides
-  (define-values (new-stx/pre new-stx/post)
-    (with-syntax*
-     ([the-variable-reference (generate-temporary #'blame)])
-     (define-values (code aliasess)
-       (generate-prov def-tbl provide-tbl #'the-variable-reference))
-     (define aliases (apply append aliasess))
-     (define/with-syntax (new-provs ...) code)
-     (values
-      #`(begin
-          (begin-for-syntax
-            (module* #%type-decl #f
-	      (#%plain-module-begin ;; avoid top-level printing and config
-	       (require typed-racket/types/numeric-tower typed-racket/env/type-name-env
-			typed-racket/env/global-env typed-racket/env/type-alias-env
-			typed-racket/types/struct-table typed-racket/types/abbrev
-			(rename-in racket/private/sort [sort raw-sort]))
-	       #,(env-init-code)
-	       #,(talias-env-init-code)
-	       #,(tname-env-init-code)
-	       #,(tvariance-env-init-code)
-	       #,(mvar-env-init-code mvar-env)
-	       #,(make-struct-table-code)
-               #,@(for/list ([a (in-list aliases)])
-                    (match a
-                      [(list from to)
-                       #`(add-alias (quote-syntax #,from) (quote-syntax #,to))])))))
-	  (begin-for-syntax (add-mod! (variable-reference->module-path-index
-				       (#%variable-reference)))))
-      #`(begin
-          #,(if (null? (syntax-e #'(new-provs ...)))
-                #'(begin)
-                #'(define the-variable-reference (quote-module-name)))
-          new-provs ...))))
-  (do-time "finished provide generation")
-  (values new-stx/pre new-stx/post))
-
-;; typecheck a whole module
-;; syntax -> (values syntax syntax)
-(define (tc-module stx)
-  (syntax-parse stx
-    [(pmb . forms) (begin0 (type-check #'forms) (do-time "finished type checking"))]))
-
-;; typecheck a top-level form
-;; used only from #%top-interaction
-;; syntax -> (or/c 'no-type tc-results/c)
-(define (tc-toplevel-form form)
-  (syntax-parse form
-    ;; Don't open up `begin`s that are supposed to be ignored
-    [(~and ((~literal begin) e ...)
-           (~not (~or _:ignore^ _:ignore-some^)))
-     (begin0
-       (or (for/last ([form (in-syntax #'(e ...))])
-             (tc-toplevel-form form))
-           'no-type)
-       (report-all-errors))]
-    [_
-     ;; Handle type aliases
-     (when (type-alias? form)
-       (define-values (alias-names alias-map)
-         (get-type-alias-info (list form)))
-       (register-all-type-aliases alias-names alias-map))
-     ;; Handle struct definitions
-     (when (typed-struct? form)
-       (define name (name-of-struct form))
-       (define tvars (type-vars-of-struct form))
-       (register-type-name name)
-       (add-constant-variance! name tvars)
-       (define parsed (parse-typed-struct form))
-       (register-parsed-struct-sty! parsed)
-       (refine-struct-variance! (list parsed))
-       (register-parsed-struct-bindings! parsed))
-     (tc-toplevel/pass1 form)
-     (tc-toplevel/pass1.5 form)
-     (begin0 (tc-toplevel/pass2 form #f)
-             (report-all-errors))]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/typechecker.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/typechecker.rkt
deleted file mode 100644
index 3f37d516bb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/typechecker.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-
-(require (only-in racket/unit
-                  provide-signature-elements
-                  define-values/invoke-unit/infer link)
-         "signatures.rkt"
-         "tc-app-combined.rkt"
-         "tc-if.rkt" "tc-lambda-unit.rkt"
-         "tc-let-unit.rkt" "tc-apply.rkt"
-         "tc-literal.rkt" "tc-expression.rkt"
-         "tc-send.rkt"
-         "tc-expr-unit.rkt" "check-subforms-unit.rkt"
-         "check-class-unit.rkt")
-
-(provide-signature-elements tc-expr^ check-subforms^ tc-literal^)
-
-(define-values/invoke-unit/infer
-  (link tc-if@ tc-lambda@ tc-app-combined@ tc-let@ tc-expr@
-        tc-send@ check-subforms@ tc-apply@ tc-literal@
-        check-class@ tc-expression@))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typed-racket.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typed-racket.rkt
deleted file mode 100644
index 45bad09eff..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typed-racket.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-
-(require
- (for-syntax racket/base racket/lazy-require
-             "standard-inits.rkt")
- (for-syntax "utils/timing.rkt")) ;; only for timing/debugging
-
-(provide (rename-out [module-begin #%module-begin]
-                     [top-interaction #%top-interaction])
-         with-type
-         (for-syntax do-standard-inits))
-
-
-(define-syntax-rule (drivers [name sym] ...)
-  (begin
-    (begin-for-syntax
-      (lazy-require (typed-racket/core (sym ...))))
-    (define-syntax (name stx)
-      (do-time (format "Calling ~a driver" 'name))      
-      (do-time (format "Loaded core ~a" 'sym))
-      (begin0 (sym stx)
-              (do-time "Finished, returning to Racket")))
-    ...))
-
-(drivers [module-begin mb-core] [top-interaction ti-core] [with-type wt-core])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typed-reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typed-reader.rkt
deleted file mode 100644
index a72c31bbc7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typed-reader.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-
-;; Provides raise-read-error and raise-read-eof-error
-(require syntax/readerr)
-(require "private/syntax-properties.rkt")
-
-
-(define (skip-whitespace port)
-  ;; Skips whitespace characters, sensitive to the current
-  ;; readtable's definition of whitespace
-  (let ([ch (peek-char port)])
-    (unless (eof-object? ch)
-      ;; Consult current readtable:
-      (let-values ([(like-ch/sym proc dispatch-proc)
-                    (readtable-mapping (current-readtable) ch)])
-        ;; If like-ch/sym is whitespace, then ch is whitespace
-        (when (and (char? like-ch/sym)
-                   (char-whitespace? like-ch/sym))
-          (read-char port)
-          (skip-whitespace port))))))
-
-(define (skip-comments read-one port src)
-  ;; Recursive read, but skip comments and detect EOF
-  (let loop ()
-    (let ([v (read-one)])
-      (cond
-        [(special-comment? v) (loop)]
-        [(eof-object? v)
-         (let-values ([(l c p) (port-next-location port)])
-           (raise-read-eof-error "unexpected EOF in type annotation" src l c p 1))]
-        [else v]))))
-
-(define (parse port read-one src)
-  (skip-whitespace port)
-  (let ([name (read-one)])
-    (begin0
-      (begin (skip-whitespace port)
-             (let ([next (read-one)])
-               (case (syntax-e next)
-                 ;; type annotation
-                 [(:) (skip-whitespace port)
-                      (type-label-property name (syntax->datum (read-one)))]
-                 [(::) (skip-whitespace port)
-                       (datum->syntax name `(ann ,name : ,(read-one)))]
-                 [(@) (let ([elems (let loop ([es '()])
-                                     (skip-whitespace port)
-                                     (if (equal? #\} (peek-char port))
-                                         (reverse es)
-                                         (loop (cons (read-one) es))))])
-                        (datum->syntax name `(inst ,name : ,@elems)))]
-                 ;; arbitrary property annotation
-                 [(PROP) (skip-whitespace port)
-                         (let* ([prop-name (syntax-e (read-one))])
-                           (skip-whitespace port)
-                           (syntax-property name prop-name (read-one)))]
-                 ;; otherwise error
-                 [else
-                  (let-values ([(l c p) (port-next-location port)])
-                    (raise-read-error (format "typed expression ~a must be followed by :, ::, or @"
-                                              (syntax->datum name)) src l c p 1))])))
-      (skip-whitespace port)
-      (let ([c (read-char port)])
-        (unless (equal? #\} c)
-          (let-values ([(l c p) (port-next-location port)])
-            (raise-read-error (format "typed expression ~a not properly terminated" (syntax->datum name)) src l c p 1)))))))
-
-(define parse-id-type
-  (case-lambda
-    [(ch port src line col pos)
-     ;; `read-syntax' mode
-     (datum->syntax
-      #f
-      (parse port
-             (lambda () (read-syntax src port ))
-             src)
-      (let-values ([(l c p) (port-next-location port)])
-        (list src line col pos (and pos (- p pos)))))]))
-
-(define (readtable)
-  (make-readtable (current-readtable) #\{ 'dispatch-macro parse-id-type))
-
-(define (*read inp)
-  (parameterize ([current-readtable (readtable)])
-    (read inp)))
-
-(define (*read-syntax src port)
-  (parameterize ([current-readtable (readtable)])
-    (read-syntax src port)))
-
-(provide readtable (rename-out [*read read] [*read-syntax read-syntax]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/abbrev.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/abbrev.rkt
deleted file mode 100644
index 6d64a7b7f5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/abbrev.rkt
+++ /dev/null
@@ -1,336 +0,0 @@
-#lang racket/base
-
-;; This module provides abbreviations that are used to construct types
-;; and data that show up in types. These are intended for internal use
-;; within Typed Racket implementation code.
-
-(require "../utils/utils.rkt"
-         racket/list
-         racket/match
-         racket/function
-         racket/undefined
-         unstable/function
-
-         (prefix-in c: (contract-req))
-         (rename-in (rep type-rep filter-rep object-rep)
-                    [make-Base make-Base*])
-         (types union numeric-tower)
-         ;; Using this form so all-from-out works
-         "base-abbrev.rkt" "match-expanders.rkt"
-
-         (for-syntax racket/base syntax/parse)
-
-         ;; for base type contracts and predicates
-         ;; use '#%place to avoid the other dependencies of `racket/place`
-         (for-template
-           racket/base
-           racket/contract/base
-           racket/undefined
-           (only-in racket/pretty pretty-print-style-table?)
-           (only-in racket/udp udp?)
-           (only-in racket/tcp tcp-listener?)
-           (only-in racket/flonum flvector?)
-           (only-in racket/extflonum extflvector?)
-           (only-in racket/fixnum fxvector?)
-           (only-in '#%place place? place-channel?))
-         (only-in racket/pretty pretty-print-style-table?)
-         (only-in racket/udp udp?)
-         (only-in racket/tcp tcp-listener?)
-         (only-in racket/flonum flvector?)
-         (only-in racket/extflonum extflvector?)
-         (only-in racket/fixnum fxvector?)
-         (only-in '#%place place? place-channel?))
-
-(provide (except-out (all-defined-out) make-Base)
-         (all-from-out "base-abbrev.rkt" "match-expanders.rkt"))
-
-;; All the types defined here are not numeric
-(define (make-Base name contract predicate)
-  (make-Base* name contract predicate #f))
-
-;; Convenient constructors
-(define -App make-App)
-(define -mpair make-MPair)
-(define (-Param t1 [t2 t1]) (make-Param t1 t2))
-(define -box make-Box)
-(define -channel make-Channel)
-(define -async-channel make-Async-Channel)
-(define -thread-cell make-ThreadCell)
-(define -Promise make-Promise)
-(define -set make-Set)
-(define -vec make-Vector)
-(define -future make-Future)
-(define -evt make-Evt)
-(define -weak-box make-Weak-Box)
-
-(define (-seq . args) (make-Sequence args))
-
-(define (one-of/c . args)
-  (apply Un (map -val args)))
-
-(define (-opt t) (Un (-val #f) t))
-
-(define (-ne-lst t) (-pair t (-lst t)))
-
-;; Convenient constructor for Values
-;; (wraps arg types with Result)
-(define/cond-contract (-values args)
-  (c:-> (c:listof Type/c) (c:or/c Type/c Values?))
-  (match args
-    ;[(list t) t]
-    [_ (make-Values (for/list ([i (in-list args)]) (-result i)))]))
-
-;; Convenient constructor for ValuesDots
-;; (wraps arg types with Result)
-(define/cond-contract (-values-dots args dty dbound)
-  (c:-> (c:listof Type/c) Type/c (c:or/c symbol? c:natural-number/c)
-        ValuesDots?)
-  (make-ValuesDots (for/list ([i (in-list args)]) (-result i))
-                   dty dbound))
-
-;; Basic types
-(define -Listof (-poly (list-elem) (make-Listof list-elem)))
-(define/decl -Boolean (Un -False -True))
-(define/decl -Undefined
-  (make-Base 'Undefined
-             #'(lambda (x) (eq? x undefined))
-             (lambda (x) (eq? x undefined))))
-(define/decl -Bytes (make-Base 'Bytes #'bytes? bytes?))
-(define/decl -Base-Regexp (make-Base 'Base-Regexp
-                           #'(and/c regexp? (not/c pregexp?))
-                           (conjoin regexp? (negate pregexp?))))
-(define/decl -PRegexp (make-Base 'PRegexp
-				 #'pregexp?
-				 pregexp?))
-(define/decl -Regexp (Un -PRegexp -Base-Regexp))
-(define/decl -Byte-Base-Regexp
-  (make-Base 'Byte-Base-Regexp
-	     #'(and/c byte-regexp? (not/c byte-pregexp?))
-	     (conjoin byte-regexp? (negate byte-pregexp?))))
-(define/decl -Byte-PRegexp
-  (make-Base 'Byte-PRegexp #'byte-pregexp? byte-pregexp?))
-(define/decl -Byte-Regexp (Un -Byte-Base-Regexp -Byte-PRegexp))
-(define/decl -Pattern (Un -Bytes -Regexp -Byte-Regexp -String))
-(define/decl -Keyword (make-Base 'Keyword #'keyword? keyword?))
-(define/decl -Thread (make-Base 'Thread #'thread? thread?))
-(define/decl -Module-Path
-  (Un -Symbol -String
-      (-lst* (-val 'quote) -Symbol)
-      (-lst* (-val 'lib) -String)
-      (-lst* (-val 'file) -String)
-      (-pair (-val 'planet)
-	     (Un (-lst* -Symbol)
-		 (-lst* -String)
-		 (-lst* -String
-			(-lst*
-			 -String -String
-			 #:tail (make-Listof
-				 (Un -Nat
-				     (-lst* (Un -Nat (one-of/c '= '+ '-))
-					    -Nat)))))))))
-(define/decl -Resolved-Module-Path (make-Base 'Resolved-Module-Path #'resolved-module-path? resolved-module-path?))
-(define/decl -Module-Path-Index (make-Base 'Module-Path-Index #'module-path-index? module-path-index?))
-(define/decl -Compiled-Module-Expression (make-Base 'Compiled-Module-Expression #'compiled-module-expression? compiled-module-expression?))
-(define/decl -Compiled-Non-Module-Expression
-  (make-Base 'Compiled-Non-Module-Expression
-             #'(and/c    compiled-expression? (not/c  compiled-module-expression?))
-	     (conjoin  compiled-expression? (negate compiled-module-expression?))))
-(define/decl -Compiled-Expression (Un -Compiled-Module-Expression -Compiled-Non-Module-Expression))
-(define/decl -Cont-Mark-Set (make-Base 'Continuation-Mark-Set #'continuation-mark-set? continuation-mark-set?))
-(define/decl -Path (make-Base 'Path #'path? path?))
-(define/decl -OtherSystemPath
-  (make-Base 'OtherSystemPath
-	     #'(and/c path-for-some-system? (not/c path?))
-	     (conjoin path-for-some-system? (negate path?))))
-(define/decl -Namespace (make-Base 'Namespace #'namespace? namespace?))
-(define/decl -Output-Port (make-Base 'Output-Port #'output-port? output-port?))
-(define/decl -Input-Port (make-Base 'Input-Port #'input-port? input-port?))
-(define/decl -TCP-Listener (make-Base 'TCP-Listener #'tcp-listener? tcp-listener?))
-(define/decl -UDP-Socket (make-Base 'UDP-Socket #'udp? udp?))
-(define/decl -FlVector (make-Base 'FlVector #'flvector? flvector?))
-(define/decl -ExtFlVector (make-Base 'ExtFlVector #'extflvector? extflvector?))
-(define/decl -FxVector (make-Base 'FxVector #'fxvector? fxvector?))
-;; in the type (-Syntax t), t is the type of the result of syntax-e, not syntax->datum
-(define -Syntax make-Syntax)
-(define/decl In-Syntax
-  (-mu e
-       (Un -Null -Boolean -Symbol -String -Keyword -Char -Number
-           (make-Vector (-Syntax e))
-           (make-Box (-Syntax e))
-           (make-Listof (-Syntax e))
-           (-pair (-Syntax e) (-Syntax e)))))
-(define/decl Any-Syntax (-Syntax In-Syntax))
-(define (-Sexpof t)
-  (-mu sexp
-       (Un -Null
-           -Number -Boolean -Symbol -String -Keyword -Char
-           (-pair sexp sexp)
-           (make-Vector sexp)
-           (make-Box sexp)
-           t)))
-(define/decl -Flat
-  (-mu flat
-       (Un -Null -Number -Boolean -Symbol -String -Keyword -Char
-           (-pair flat flat))))
-(define/decl -Sexp (-Sexpof (Un)))
-(define Syntax-Sexp (-Sexpof Any-Syntax))
-(define Ident (-Syntax -Symbol))
-(define -HT make-Hashtable)
-(define/decl -BoxTop (make-BoxTop))
-(define/decl -Weak-BoxTop (make-Weak-BoxTop))
-(define/decl -ChannelTop (make-ChannelTop))
-(define/decl -Async-ChannelTop (make-Async-ChannelTop))
-(define/decl -HashTop (make-HashtableTop))
-(define/decl -VectorTop (make-VectorTop))
-(define/decl -MPairTop (make-MPairTop))
-(define/decl -Thread-CellTop (make-ThreadCellTop))
-(define/decl -Prompt-TagTop (make-Prompt-TagTop))
-(define/decl -Continuation-Mark-KeyTop (make-Continuation-Mark-KeyTop))
-(define/decl -Port (Un -Output-Port -Input-Port))
-(define/decl -SomeSystemPath (Un -Path -OtherSystemPath))
-(define/decl -Pathlike (Un -String -Path))
-(define/decl -SomeSystemPathlike (Un -String -SomeSystemPath))
-(define/decl -Pathlike* (Un -String -Path (-val 'up) (-val 'same)))
-(define/decl -SomeSystemPathlike*
-  (Un -String -SomeSystemPath(-val 'up) (-val 'same)))
-(define/decl -PathConventionType (Un (-val 'unix) (-val 'windows)))
-(define/decl -Pretty-Print-Style-Table
-  (make-Base 'Pretty-Print-Style-Table #'pretty-print-style-table? pretty-print-style-table?))
-(define/decl -Read-Table
-  (make-Base 'Read-Table #'readtable? readtable?))
-(define/decl -Special-Comment
-  (make-Base 'Special-Comment #'special-comment? special-comment?))
-(define/decl -Custodian (make-Base 'Custodian #'custodian? custodian?))
-(define/decl -Parameterization (make-Base 'Parameterization #'parameterization? parameterization?))
-(define/decl -Inspector (make-Base 'Inspector #'inspector inspector?))
-(define/decl -Namespace-Anchor (make-Base 'Namespace-Anchor #'namespace-anchor? namespace-anchor?))
-(define/decl -Variable-Reference (make-Base 'Variable-Reference #'variable-reference? variable-reference?))
-(define/decl -Internal-Definition-Context
-  (make-Base 'Internal-Definition-Context
-	     #'internal-definition-context?
-	     internal-definition-context?))
-(define/decl -Subprocess
-  (make-Base 'Subprocess #'subprocess? subprocess?))
-(define/decl -Security-Guard
-  (make-Base 'Security-Guard #'security-guard? security-guard?))
-(define/decl -Thread-Group
-  (make-Base 'Thread-Group #'thread-group? thread-group?))
-(define/decl -Struct-Type-Property
-  (make-Base 'Struct-Type-Property #'struct-type-property? struct-type-property?))
-(define/decl -Impersonator-Property
-  (make-Base 'Impersonator-Property #'impersonator-property? impersonator-property?))
-(define/decl -Semaphore (make-Base 'Semaphore #'semaphore? semaphore?))
-(define/decl -Bytes-Converter (make-Base 'Bytes-Converter #'bytes-converter? bytes-converter?))
-(define/decl -Pseudo-Random-Generator
-  (make-Base 'Pseudo-Random-Generator #'pseudo-random-generator? pseudo-random-generator?))
-(define/decl -Logger (make-Base 'Logger #'logger? logger?))
-(define/decl -Log-Receiver (make-Base 'LogReceiver #'log-receiver? log-receiver?))
-(define/decl -Log-Level (one-of/c 'fatal 'error 'warning 'info 'debug))
-(define/decl -Place (make-Base 'Place #'place? place?))
-(define/decl -Base-Place-Channel
-  (make-Base 'Base-Place-Channel #'(and/c place-channel? (not/c place?))  (conjoin place-channel? (negate place?))))
-(define/decl -Place-Channel (Un -Place -Base-Place-Channel))
-(define/decl -Will-Executor
-  (make-Base 'Will-Executor #'will-executor? will-executor?))
-
-;; Paths
-(define/decl -car (make-CarPE))
-(define/decl -cdr (make-CdrPE))
-(define/decl -syntax-e (make-SyntaxPE))
-(define/decl -force (make-ForcePE))
-
-;; Type alias names
-(define (-struct-name name)
-  (make-Name name #f #t))
-
-;; Structs
-(define (-struct name parent flds [proc #f] [poly #f] [pred #'dummy])
-  (make-Struct name parent flds proc poly pred))
-
-;; Function type constructors
-(define/decl top-func (make-Function (list)))
-
-(define (asym-pred dom rng filter)
-  (make-Function (list (make-arr* (list dom) rng #:filters filter))))
-
-(define/cond-contract make-pred-ty
-  (c:case-> (c:-> Type/c Type/c)
-            (c:-> (c:listof Type/c) Type/c Type/c Type/c)
-            (c:-> (c:listof Type/c) Type/c Type/c Object? Type/c))
-  (case-lambda
-    [(in out t p)
-     (->* in out : (-FS (-filter t p) (-not-filter t p)))]
-    [(in out t)
-     (make-pred-ty in out t (make-Path null (list 0 0)))]
-    [(t)
-     (make-pred-ty (list Univ) -Boolean t (make-Path null (list 0 0)))]))
-
-(define/decl -true-filter (-FS -top -bot))
-(define/decl -false-filter (-FS -bot -top))
-
-(define (opt-fn args opt-args result #:rest [rest #f] #:kws [kws null])
-  (apply cl->* (for/list ([i (in-range (add1 (length opt-args)))])
-                 (make-Function (list (make-arr* (append args (take opt-args i)) result
-                                                 #:rest rest #:kws kws))))))
-
-(define-syntax-rule (->opt args ... [opt ...] res)
-  (opt-fn (list args ...) (list opt ...) res))
-
-;; class utilities
-
-(begin-for-syntax
- (define-syntax-class names+types
-   #:attributes (data)
-   (pattern [(name:id type) ...]
-            #:with data #'(list (list (quote name) type) ...)))
-
- (define-syntax-class names+types+opt
-   #:attributes (data no-opts)
-   (pattern [(name:id type opt?) ...]
-            #:with data #'(list (list (quote name) type opt?) ...)
-            #:with no-opts #'(list (list (quote name) type) ...)))
-
- (define-splicing-syntax-class -class-clause
-   #:attributes (inits fields methods augments)
-   (pattern (~seq #:init sub-clauses:names+types+opt)
-            #:with inits #'sub-clauses.data
-            #:with fields #'null
-            #:with methods #'null
-            #:with augments #'null)
-   (pattern (~seq #:init-field sub-clauses:names+types+opt)
-            #:with inits #'sub-clauses.data
-            #:with fields #'sub-clauses.no-opts
-            #:with methods #'null
-            #:with augments #'null)
-   (pattern (~seq #:method sub-clauses:names+types)
-            #:with inits #'null
-            #:with fields #'null
-            #:with methods #'sub-clauses.data
-            #:with augments #'null)
-   (pattern (~seq #:field sub-clauses:names+types)
-            #:with inits #'null
-            #:with fields #'sub-clauses.data
-            #:with methods #'null
-            #:with augments #'null)
-   (pattern (~seq #:augment sub-clauses:names+types)
-            #:with inits #'null
-            #:with fields #'null
-            #:with methods #'null
-            #:with augments #'sub-clauses.data)))
-
-(define-syntax (-class stx)
-  (syntax-parse stx
-    [(_ (~or (~optional (~seq #:row var:expr)
-                        #:defaults ([var #'#f]))
-             ?clause:-class-clause) ...)
-     #'(make-Class
-        var
-        (append ?clause.inits ...)
-        (append ?clause.fields ...)
-        (append ?clause.methods ...)
-        (append ?clause.augments ...)
-        #f)]))
-
-(define-syntax-rule (-object . ?clauses)
-  (make-Instance (-class . ?clauses)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/base-abbrev.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/base-abbrev.rkt
deleted file mode 100644
index 433f1e0430..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/base-abbrev.rkt
+++ /dev/null
@@ -1,317 +0,0 @@
-#lang racket/base
-
-;; This file is for the abbreviations needed to implement union.rkt
-;;
-;; The "abbrev.rkt" module imports this module, re-exports it, and
-;; extends it with more types and type abbreviations.
-
-(require "../utils/utils.rkt"
-         (rep type-rep filter-rep object-rep rep-utils)
-         (env mvar-env)
-         racket/match racket/list (prefix-in c: (contract-req))
-         (for-syntax racket/base syntax/parse racket/list)
-         ;; For contract predicates
-         (for-template racket/base))
-
-(provide (all-defined-out)
-         (rename-out [make-Listof -lst]
-                     [make-MListof -mlst]))
-
-;; This table maps types (or really, the sequence number of the type)
-;; to identifiers that are those types. This allows us to avoid
-;; reconstructing the type when using it from its marshaled
-;; representation.  The table is referenced in env/init-env.rkt
-;;
-;; For example, instead of marshalling a big union for `Integer`, we
-;; simply emit `-Integer`, which evaluates to the right type.
-(define predefined-type-table (make-hasheq))
-(define-syntax-rule (declare-predefined-type! id)
-  (hash-set! predefined-type-table (Rep-seq id) #'id))
-(provide predefined-type-table)
-(define-syntax-rule (define/decl id e)
-  (begin (define id e)
-	 (declare-predefined-type! id)))
-
-;; Top and error types
-(define/decl Univ (make-Univ))
-(define/decl -Bottom (make-Union null))
-(define/decl Err (make-Error))
-
-(define/decl -False (make-Value #f))
-(define/decl -True (make-Value #t))
-
-(define -val make-Value)
-
-;; Char type and List type (needed because of how sequences are checked in subtype)
-(define/decl -Char (make-Base 'Char #'char? char? #f))
-(define/decl -Null (-val null))
-(define (make-Listof elem) (-mu list-rec (simple-Un -Null (make-Pair elem list-rec))))
-(define (make-MListof elem) (-mu list-rec (simple-Un -Null (make-MPair elem list-rec))))
-
-;; Needed for evt checking in subtype.rkt
-(define/decl -Symbol (make-Base 'Symbol #'symbol? symbol? #f))
-(define/decl -String (make-Base 'String #'string? string? #f))
-
-;; Void is needed for Params
-(define/decl -Void (make-Base 'Void #'void? void? #f))
-
-;; -Tuple Type is needed by substitute for ListDots
-(define -pair make-Pair)
-(define (-lst* #:tail [tail -Null] . args)
-  (for/fold ([tl tail]) ([a (in-list (reverse args))]) (-pair a tl)))
-(define (-Tuple l)
-  (-Tuple* l -Null))
-(define (-Tuple* l b)
-  (foldr -pair b l))
-
-;; Simple union type constructor, does not check for overlaps
-;; Normalizes representation by sorting types.
-;; Type * -> Type
-;; The input types can be union types, but should not have a complicated
-;; overlap relationship.
-(define simple-Un
-  (let ()
-    ;; List[Type] -> Type
-    ;; Argument types should not overlap or be union types
-    (define (make-union* types)
-      (match types
-        [(list t) t]
-        [_ (make-Union types)]))
-
-    ;; Type -> List[Type]
-    (define (flat t)
-      (match t
-        [(Union: es) es]
-        [_ (list t)]))
-
-    (case-lambda
-      [() -Bottom]
-      [(t) t]
-      [args
-       (make-union* (remove-dups (sort (append-map flat args) type<?)))])))
-
-;; Recursive types
-(define-syntax -v
-  (syntax-rules ()
-    [(_ x) (make-F 'x)]))
-
-(define-syntax -mu
-  (syntax-rules ()
-    [(_ var ty)
-     (let ([var (-v var)])
-       (make-Mu 'var ty))]))
-
-;; Results
-(define/cond-contract (-result t [f -top-filter] [o -empty-obj])
-  (c:->* (Type/c) (FilterSet? Object?) Result?)
-  (cond
-    [(or (equal? t -Bottom) (equal? f -bot-filter))
-     (make-Result -Bottom -bot-filter o)]
-    [else
-     (make-Result t f o)]))
-
-;; Filters
-(define/decl -top (make-Top))
-(define/decl -bot (make-Bot))
-(define/decl -no-filter (make-NoFilter))
-(define/decl -top-filter (make-FilterSet -top -top))
-(define/decl -bot-filter (make-FilterSet -bot -bot))
-(define/decl -no-obj (make-NoObject))
-(define/decl -empty-obj (make-Empty))
-(define (-id-path id)
-  (if (is-var-mutated? id)
-      -empty-obj
-      (make-Path null id)))
-(define (-arg-path arg [depth 0])
-  (make-Path null (list depth arg)))
-(define (-acc-path path-elems o)
-  (match o
-    [(Empty:) -empty-obj]
-    [(Path: p o) (make-Path (append path-elems p) o)]))
-
-(define/cond-contract (-FS + -)
-  (c:-> Filter/c Filter/c FilterSet?)
-  (make-FilterSet + -))
-
-;; Abbreviation for filters
-;; `i` can be an integer or name-ref/c for backwards compatibility
-;; FIXME: Make all callers pass in an object and remove backwards compatibility
-(define/cond-contract (-filter t i)
-  (c:-> Type/c (c:or/c integer? name-ref/c Object?) Filter/c)
-  (define o
-    (cond
-      [(Object? i) i]
-      [(integer? i) (make-Path null (list 0 i))]
-      [(list? i) (make-Path null i)]
-      [else (-id-path i)]))
-  (cond
-    [(Empty? o) -top]
-    [(equal? Univ t) -top]
-    [(equal? -Bottom t) -bot]
-    [else (make-TypeFilter t o)]))
-
-
-;; Abbreviation for not filters
-;; `i` can be an integer or name-ref/c for backwards compatibility
-;; FIXME: Make all callers pass in an object and remove backwards compatibility
-(define/cond-contract (-not-filter t i)
-  (c:-> Type/c (c:or/c integer? name-ref/c Object?) Filter/c)
-  (define o
-    (cond
-      [(Object? i) i]
-      [(integer? i) (make-Path null (list 0 i))]
-      [(list? i) (make-Path null i)]
-      [else (-id-path i)]))
-  (cond
-    [(Empty? o) -top]
-    [(equal? -Bottom t) -top]
-    [(equal? Univ t) -bot]
-    [else (make-NotTypeFilter t o)]))
-
-
-;; A Type that corresponds to the any contract for the
-;; return type of functions
-(define (-AnyValues f) (make-AnyValues f))
-(define/decl ManyUniv (make-AnyValues -top))
-
-;; Function types
-(define/cond-contract (make-arr* dom rng
-                                 #:rest [rest #f] #:drest [drest #f] #:kws [kws null]
-                                 #:filters [filters -top-filter] #:object [obj -empty-obj])
-  (c:->* ((c:listof Type/c) (c:or/c SomeValues/c Type/c))
-         (#:rest (c:or/c #f Type/c)
-          #:drest (c:or/c #f (c:cons/c Type/c symbol?))
-          #:kws (c:listof Keyword?)
-          #:filters FilterSet?
-          #:object Object?)
-         arr?)
-  (make-arr dom (if (Type/c? rng)
-                    (make-Values (list (-result rng filters obj)))
-                    rng)
-            rest drest (sort #:key Keyword-kw kws keyword<?)))
-
-(define-syntax (->* stx)
-  (define-syntax-class c
-    (pattern x:id #:fail-unless (eq? ': (syntax-e #'x)) #f))
-  (syntax-parse stx
-    [(_ dom rng)
-     #'(make-Function (list (make-arr* dom rng)))]
-    [(_ dom rst rng)
-     #'(make-Function (list (make-arr* dom rng #:rest rst)))]
-    [(_ dom rng :c filters)
-     #'(make-Function (list (make-arr* dom rng #:filters filters)))]
-    [(_ dom rng _:c filters _:c object)
-     #'(make-Function (list (make-arr* dom rng #:filters filters #:object object)))]
-    [(_ dom rst rng _:c filters)
-     #'(make-Function (list (make-arr* dom rng #:rest rst #:filters filters)))]
-    [(_ dom rst rng _:c filters : object)
-     #'(make-Function (list (make-arr* dom rng #:rest rst #:filters filters #:object object)))]))
-
-(define-syntax (-> stx)
-  (define-syntax-class c
-    (pattern x:id #:fail-unless (eq? ': (syntax-e #'x)) #f))
-  (syntax-parse stx
-    [(_ dom ... rng _:c filters _:c objects)
-     #'(->* (list dom ...) rng : filters : objects)]
-    [(_ dom ... rng :c filters)
-     #'(->* (list dom ...) rng : filters)]
-    [(_ dom ... rng)
-     #'(->* (list dom ...) rng)]))
-
-(define-syntax ->...
-  (syntax-rules (:)
-    [(_ dom rng)
-     (->* dom rng)]
-    [(_ dom (dty dbound) rng)
-     (make-Function (list (make-arr* dom rng #:drest (cons dty 'dbound))))]
-    [(_ dom rng : filters)
-     (->* dom rng : filters)]
-    [(_ dom (dty dbound) rng : filters)
-     (make-Function (list (make-arr* dom rng #:drest (cons dty 'dbound) #:filters filters)))]))
-
-(define (simple-> doms rng)
-  (->* doms rng))
-
-(define (->acc dom rng path)
-  (make-Function (list (make-arr* dom rng
-                                  #:filters (-FS (-not-filter (-val #f) (make-Path path (list 0 0)))
-                                                 (-filter (-val #f) (make-Path path (list 0 0))))
-                                  #:object (make-Path path (list 0 0))))))
-
-(define (cl->* . args)
-  (define (funty-arities f)
-    (match f
-      [(Function: as) as]))
-  (make-Function (apply append (map funty-arities args))))
-
-(define-syntax cl->
-  (syntax-parser
-   [(_ [(dom ...) rng] ...)
-    #'(cl->* (dom ... . -> . rng) ...)]))
-
-(define-syntax (->key stx)
-  (syntax-parse stx
-                [(_ ty:expr ... (~seq k:keyword kty:expr opt:boolean) ... rng)
-                 #'(make-Function
-                    (list
-                     (make-arr* (list ty ...)
-                                rng
-                                #:kws (sort #:key (match-lambda [(Keyword: kw _ _) kw])
-                                            (list (make-Keyword 'k kty opt) ...)
-                                            keyword<?))))]))
-
-(define-syntax (->optkey stx)
-  (syntax-parse stx
-    [(_ ty:expr ... [oty:expr ...] #:rest rst:expr (~seq k:keyword kty:expr opt:boolean) ... rng)
-     (let ([l (syntax->list #'(oty ...))])
-       (with-syntax ([((extra ...) ...)
-		      (for/list ([i (in-range (add1 (length l)))])
-				(take l i))]
-		     [(rsts ...) (for/list ([i (in-range (add1 (length l)))]) #'rst)])
-		    #'(make-Function
-		       (list
-			(make-arr* (list ty ... extra ...)
-				   rng
-				   #:rest rsts
-				   #:kws (sort #:key (match-lambda [(Keyword: kw _ _) kw])
-					       (list (make-Keyword 'k kty opt) ...)
-					       keyword<?))
-			...))))]
-    [(_ ty:expr ... [oty:expr ...] (~seq k:keyword kty:expr opt:boolean) ... rng)
-     (let ([l (syntax->list #'(oty ...))])
-       (with-syntax ([((extra ...) ...)
-		      (for/list ([i (in-range (add1 (length l)))])
-				(take l i))])
-		    #'(make-Function
-		       (list
-			(make-arr* (list ty ... extra ...)
-				   rng
-				   #:rest #f
-				   #:kws (sort #:key (match-lambda [(Keyword: kw _ _) kw])
-					       (list (make-Keyword 'k kty opt) ...)
-					       keyword<?))
-			...))))]))
-
-(define (make-arr-dots dom rng dty dbound)
-  (make-arr* dom rng #:drest (cons dty dbound)))
-
-;; Convenient syntax for polymorphic types
-(define-syntax -poly
-  (syntax-rules ()
-    [(_ (vars ...) ty)
-     (let ([vars (-v vars)] ...)
-       (make-Poly (list 'vars ...) ty))]))
-
-(define-syntax -polydots
-  (syntax-rules ()
-    [(_ (vars ... dotted) ty)
-     (let ([dotted (-v dotted)]
-           [vars (-v vars)] ...)
-       (make-PolyDots (list 'vars ... 'dotted) ty))]))
-
-(define-syntax -polyrow
-  (syntax-rules ()
-    [(_ (var) consts ty)
-     (let ([var (-v var)])
-       (make-PolyRow (list 'var) consts ty))]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/classes.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/classes.rkt
deleted file mode 100644
index 5d6b8e0145..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/classes.rkt
+++ /dev/null
@@ -1,328 +0,0 @@
-#lang racket/base
-
-;; This module provides helper syntax classes and functions for
-;; working with class/object types and rows
-
-(require "../utils/utils.rkt"
-         (rep type-rep rep-utils)
-         (types resolve)
-         (prefix-in untyped: racket/class)
-         (except-in (base-env class-clauses)
-                    private)
-         racket/dict
-         racket/list
-         racket/match
-         syntax/parse
-         syntax/stx
-         (only-in unstable/list check-duplicate)
-         (only-in unstable/sequence in-syntax)
-         (for-template (base-env class-clauses)))
-
-(provide Class:
-         row-constraints
-         row-clauses
-         infer-row-constraints
-         infer-row
-         check-row-constraints
-         object-type-clauses
-         class-type-clauses)
-
-(define-literal-set class-type-literals
-  (init init-field init-rest field augment
-   untyped:init untyped:init-field untyped:init-rest
-   untyped:field untyped:augment))
-
-;; Data definitions
-;;
-;; A RowConstraint is a
-;;   List(List<Sym>, List<Sym>, List<Sym>, List<Sym>)
-
-;; Syntax -> Syntax
-;; Turn into datums and then flatten
-(define (flatten/datum stx)
-  (flatten (syntax->datum stx)))
-
-;; Syntax classes for rows
-(define-splicing-syntax-class row-constraints
-  #:literal-sets (class-type-literals)
-  (pattern (~seq (~or ((~or init untyped:init) iname:id ...)
-                      ((~or init-field untyped:init-field) ifname:id ...)
-                      ((~or field untyped:field) fname:id ...)
-                      ((~or augment untyped:augment) aname:id ...)
-                      mname:id)
-                 ...)
-            #:attr init-names (flatten/datum #'((iname ...) ...))
-            #:attr init-field-names (flatten/datum #'((ifname ...) ...))
-            #:attr field-names (flatten/datum #'((fname ...) ...))
-            #:attr method-names (syntax->datum #'(mname ...))
-            #:attr augment-names (flatten/datum #'((aname ...) ...))
-            #:attr all-field-names (append (attribute init-field-names)
-                                           (attribute field-names))
-            #:attr all-init-names (append (attribute init-field-names)
-                                          (attribute init-names))
-            #:fail-when
-            (check-duplicate (attribute all-init-names))
-            "duplicate init or init-field clause"
-            #:fail-when
-            (check-duplicate (attribute all-field-names))
-            "duplicate field or init-field clause"
-            #:fail-when
-            (check-duplicate (append (attribute method-names)
-                                     (attribute augment-names)))
-            "duplicate method or augmentable method clause"
-            #:attr constraints
-            (list (attribute all-init-names)
-                  (attribute all-field-names)
-                  (attribute method-names)
-                  (attribute augment-names))))
-
-;; Row RowConstraints (Symbol -> Void) -> Void
-;; Check if the given row satisfies the absence constraints
-;; on the row variable or not. Call the fail thunk if it
-;; doesn't.
-(define (check-row-constraints row constraints fail)
-  (match-define (list init-absents field-absents
-                      method-absents augment-absents)
-                constraints)
-  (match-define (Row: inits fields methods augments _) row)
-  ;; check a given clause type (e.g., init, field)
-  (define (check-clauses row-dict absence-set)
-    (for ([(name _) (in-dict row-dict)])
-      (when (member name absence-set)
-        (fail name))))
-  (check-clauses inits init-absents)
-  (check-clauses fields field-absents)
-  (check-clauses methods method-absents)
-  (check-clauses augments augment-absents))
-
-;; Row types are similar to class types
-(define-splicing-syntax-class (row-clauses parse-type)
-  #:description "Row type clause"
-  #:attributes (row)
-  #:literal-sets (class-type-literals)
-  (pattern (~seq (~or (~optional ((~or init-rest untyped:init-rest)
-                                  init-rest-type:expr))
-                      (~var clause (type-clause parse-type)))
-                 ...)
-           #:attr inits (apply append (attribute clause.init-entries))
-           #:attr fields (apply append (attribute clause.field-entries))
-           #:attr methods (apply append (attribute clause.method-entries))
-           #:attr augments (apply append (attribute clause.augment-entries))
-           #:attr init-rest (and (attribute init-rest-type)
-                                 (parse-type (attribute init-rest-type)))
-           #:attr row (make-Row (attribute inits)
-                                (attribute fields)
-                                (attribute methods)
-                                (attribute augments)
-                                (attribute init-rest))
-           #:fail-when
-           (check-duplicate (map first (attribute inits)))
-           "duplicate init or init-field clause"
-           #:fail-when
-           (check-duplicate (map first (attribute fields)))
-           "duplicate field or init-field clause"
-           #:fail-when
-           (check-duplicate (map first (append (attribute methods)
-                                               (attribute augments))))
-           "duplicate method or augmentable method clause"))
-
-;; Type -> RowConstraint
-;; Infer constraints on a row for a row polymorphic function
-(define (infer-row-constraints type)
-  (define constraints (list null null null null))
-  ;; Crawl the type tree and mutate constraints when a
-  ;; class type with row variable is found.
-  (define (inf type)
-    (type-case
-     (#:Type inf #:Filter (sub-f inf) #:Object (sub-o inf))
-     type
-     [#:Class row inits fields methods augments init-rest
-      (cond
-       [(and row (F? row))
-        (match-define (list init-cs field-cs method-cs augment-cs)
-                      constraints)
-        (set! constraints
-              (list (append (dict-keys inits) init-cs)
-                    (append (dict-keys fields) field-cs)
-                    (append (dict-keys methods) method-cs)
-                    (append (dict-keys augments) augment-cs)))
-        (make-Class row inits fields methods augments init-rest)]
-       [else
-        (match-define (list (list init-names init-tys init-reqds) ...) inits)
-        (match-define (list (list field-names field-tys) ...) fields)
-        (match-define (list (list method-names method-tys) ...) methods)
-        (match-define (list (list augment-names augment-tys) ...) augments)
-        (make-Class
-         (and row (inf row))
-         (map list init-names (map inf init-tys) init-reqds)
-         (map list field-names (map inf field-tys))
-         (map list method-names (map inf method-tys))
-         (map list augment-names (map inf augment-tys))
-         init-rest)])]))
-  (inf type)
-  (map remove-duplicates constraints))
-
-;; infer-row : RowConstraints Type -> Row
-;; Infer a row based on a class type and row constraints
-(define (infer-row constraints class-type)
-  (match-define (list init-cs field-cs method-cs augment-cs)
-                constraints)
-  (match-define (Class: _ inits fields methods augments init-rest)
-                (resolve class-type))
-  (define (dict-remove* dict keys)
-    (for/fold ([dict dict])
-              ([key keys])
-      (dict-remove dict key)))
-  (make-Row (dict-remove* inits init-cs)
-            (dict-remove* fields field-cs)
-            (dict-remove* methods method-cs)
-            (dict-remove* augments augment-cs)
-            init-rest))
-
-;; Syntax -> Syntax
-;; removes two levels of nesting
-(define (flatten-class-clause stx)
-  (flatten (map stx->list (stx->list stx))))
-
-;; Syntax class for object type parsing
-(define-splicing-syntax-class object-type-clauses
-  #:description "Object type clause"
-  #:attributes (field-names field-types method-names method-types)
-  #:literal-sets (class-type-literals)
-  (pattern (~seq (~or ((~or field untyped:field)
-                       field-clause:field-or-method-type ...)
-                      method-clause:field-or-method-type)
-                 ...)
-           #:with field-names (flatten-class-clause #'((field-clause.label ...) ...))
-           #:with field-types (flatten-class-clause #'((field-clause.type ...) ...))
-           #:with method-names #'(method-clause.label ...)
-           #:with method-types #'(method-clause.type ...)
-           #:fail-when
-           (check-duplicate-identifier (syntax->list #'field-names))
-           "duplicate field or init-field clause"
-           #:fail-when
-           (check-duplicate-identifier (syntax->list #'method-names))
-           "duplicate method clause"))
-
-;; Syntax class for class type parsing
-;;
-;; The `parse-type` argument is provided so that parsing can
-;; happen in the syntax class without causing circular module
-;; dependencies
-(define-splicing-syntax-class (class-type-clauses parse-type)
-  #:description "Class type clause"
-  #:attributes (row-var implements implements/inits
-                inits fields methods augments init-rest)
-  #:literal-sets (class-type-literals)
-  (pattern (~seq (~or (~optional (~seq #:row-var row-var:id))
-                      (~seq #:implements implements-id:id)
-                      (~optional (~seq #:implements/inits implements/inits:id))
-                      (~optional ((~or init-rest untyped:init-rest)
-                                  init-rest-type:expr))
-                      (~var clause (type-clause parse-type)))
-                 ...)
-           #:attr inits (apply append (attribute clause.init-entries))
-           #:attr fields (apply append (attribute clause.field-entries))
-           #:attr methods (apply append (attribute clause.method-entries))
-           #:attr augments (apply append (attribute clause.augment-entries))
-           #:attr init-rest (and (attribute init-rest-type)
-                                 (parse-type (attribute init-rest-type)))
-           #:with implements #'(implements-id ...)
-           #:fail-when
-           (check-duplicate (map first (attribute inits)))
-           "duplicate init or init-field clause"
-           #:fail-when
-           (check-duplicate (map first (attribute fields)))
-           "duplicate field or init-field clause"
-           #:fail-when
-           (check-duplicate (map first (attribute methods)))
-           "duplicate method clause"
-           #:fail-when
-           (check-duplicate (map first (attribute augments)))
-           "duplicate augment clause"))
-
-;; Stx Stx Listof<Boolean> (Stx -> Type) -> Listof<(List Symbol Type Boolean)>
-;; Construct init entries for a dictionary for the class type
-(define (make-init-entries labels types optionals parse-type)
-  (for/list ([label (in-syntax labels)]
-             [type (in-syntax types)]
-             [optional? optionals])
-    (list (syntax-e label)
-          (parse-type type)
-          optional?)))
-
-;; Stx Stx (Stx -> Type) -> Listof<(List Symbol Type)>
-;; Construct field/augment entries for a class type dictionary
-(define (make-field/augment-entries labels types parse-type)
-  (for/list ([label (in-syntax labels)]
-             [type (in-syntax types)])
-    (list (syntax-e label) (parse-type type))))
-
-(define-syntax-class (type-clause parse-type)
-  #:attributes (init-entries field-entries
-                method-entries augment-entries)
-  #:literal-sets (class-type-literals)
-  (pattern ((~or init untyped:init) init-clause:init-type ...)
-           #:attr init-entries
-                  (make-init-entries
-                   #'(init-clause.label ...)
-                   #'(init-clause.type ...)
-                   (attribute init-clause.optional?)
-                   parse-type)
-           #:attr field-entries null
-           #:attr method-entries null
-           #:attr augment-entries null)
-  (pattern ((~or init-field untyped:init-field)
-            init-field-clause:init-type ...)
-           #:attr init-entries
-                  (make-init-entries
-                   #'(init-field-clause.label ...)
-                   #'(init-field-clause.type ...)
-                   (attribute init-field-clause.optional?)
-                   parse-type)
-           #:attr field-entries
-                  (make-field/augment-entries
-                   #'(init-field-clause.label ...)
-                   #'(init-field-clause.type ...)
-                   parse-type)
-           #:attr method-entries null
-           #:attr augment-entries null)
-  (pattern ((~or field untyped:field) field-clause:field-or-method-type ...)
-           #:attr init-entries null
-           #:attr field-entries
-                  (make-field/augment-entries
-                   #'(field-clause.label ...)
-                   #'(field-clause.type ...)
-                   parse-type)
-           #:attr method-entries null
-           #:attr augment-entries null)
-  (pattern ((~or augment untyped:augment)
-            augment-clause:field-or-method-type ...)
-           #:attr init-entries null
-           #:attr field-entries null
-           #:attr method-entries null
-           #:attr augment-entries
-                  (make-field/augment-entries
-                   #'(augment-clause.label ...)
-                   #'(augment-clause.type ...)
-                   parse-type))
-  (pattern method-clause:field-or-method-type
-           #:attr init-entries null
-           #:attr field-entries null
-           #:attr method-entries
-                  (list (list (syntax-e #'method-clause.label)
-                              (parse-type #'method-clause.type)))
-           #:attr augment-entries null))
-
-(define-syntax-class init-type
-  #:description "Initialization argument label and type"
-  #:attributes (label type optional?)
-  (pattern
-   (label:id type:expr
-    (~optional (~and #:optional (~bind [optional? #t]))))))
-
-(define-syntax-class field-or-method-type
-  #:description "Pair of field or method label and type"
-  #:attributes (label type)
-  (pattern (label:id type:expr)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/current-seen.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/current-seen.rkt
deleted file mode 100644
index 33baac42e2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/current-seen.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-(require "../utils/utils.rkt" racket/unsafe/ops)
-(require (rep type-rep) (contract-req))
-
-(provide (except-out (all-defined-out) current-seen-mark))
-
-(define current-seen-mark (make-continuation-mark-key 'current-seen))
-(define (current-seen)
-  (continuation-mark-set-first #f current-seen-mark null))
-(define (currently-subtyping?)
-  (continuation-mark-set-first #f current-seen-mark))
-(define-syntax-rule (update-current-seen new-value body)
-  (with-continuation-mark current-seen-mark new-value body))
-
-(define (seen-before s t) (cons (Type-seq s) (Type-seq t)))
-
-(define (remember s t A) 
-  (if (or (Mu? s) (Mu? t)
-          (Name? s) (Name? t)
-          (Instance? s) (Instance? t)
-          (Struct? s) (Struct? t) 
-          (App? s) (App? t))
-      (cons (seen-before s t) A)
-      A))
-(define (seen? ss st cs)
-  (for/or ([i (in-list cs)])
-    (and (eq? ss (unsafe-car i)) (eq? st (unsafe-cdr i)))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/filter-ops.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/filter-ops.rkt
deleted file mode 100644
index d1b18cb774..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/filter-ops.rkt
+++ /dev/null
@@ -1,253 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         racket/list racket/match
-         (prefix-in c: (contract-req))
-         (rep type-rep filter-rep object-rep rep-utils)
-         (only-in (infer infer) restrict)
-         (types union subtype remove-intersect abbrev tc-result))
-
-(provide/cond-contract
-  [-and (c:->* () #:rest (c:listof Filter/c) Filter/c)]
-  [-or (c:->* () #:rest (c:listof Filter/c) Filter/c)]
-  [-imp (c:-> Filter/c Filter/c Filter/c)]
-  [implied-atomic? (c:-> Filter/c Filter/c boolean?)]
-  [complementary? (c:-> Filter/c Filter/c boolean?)]
-  [contradictory? (c:-> Filter/c Filter/c boolean?)]
-  [add-unconditional-filter-all-args (c:-> Function? Type/c Function?)]
-  [add-unconditional-prop (c:-> tc-results/c Filter/c tc-results/c)]
-  [erase-filter (c:-> tc-results/c tc-results/c)]
-  [name-ref=? (c:-> name-ref/c name-ref/c boolean?)])
-
-(define (atomic-filter? p)
-  (or (TypeFilter? p) (NotTypeFilter? p)
-      (Top? p) (Bot? p)))
-
-;; contradictory: Filter/c Filter/c -> boolean?
-;; Returns true if the AND of the two filters is equivalent to Bot
-(define (contradictory? f1 f2)
-  (match* (f1 f2)
-    [((TypeFilter: t1 p) (NotTypeFilter: t2 p))
-     (subtype t1 t2)]
-    [((NotTypeFilter: t2 p) (TypeFilter: t1 p))
-     (subtype t1 t2)]
-    [((Bot:) _) #t]
-    [(_ (Bot:)) #t]
-    [(_ _) #f]))
-
-;; complementary: Filter/c Filter/c -> boolean?
-;; Returns true if the OR of the two filters is equivalent to Top
-(define (complementary? f1 f2)
-  (match* (f1 f2)
-    [((TypeFilter: t1 p) (NotTypeFilter: t2 p))
-     (subtype t2 t1)]
-    [((NotTypeFilter: t2 p) (TypeFilter: t1 p))
-     (subtype t2 t1)]
-    [((Top:) (Top:)) #t]
-    [(_ _) #f]))
-
-(define (name-ref=? a b)
-  (or (equal? a b)
-      (and (identifier? a)
-           (identifier? b)
-           (free-identifier=? a b))))
-
-;; is f1 implied by f2?
-(define (implied-atomic? f1 f2)
-  (match* (f1 f2)
-    [(f f) #t]
-    [((Top:) _) #t]
-    [(_ (Bot:)) #t]
-    [((OrFilter: fs) f2)
-     (and (memf (lambda (f) (filter-equal? f f2)) fs) #t)]
-    [(f1 (AndFilter: fs))
-     (and (memf (lambda (f) (filter-equal? f f1)) fs) #t)]
-    [((TypeFilter: t1 p) (TypeFilter: t2 p))
-     (subtype t2 t1)]
-    [((NotTypeFilter: t2 p) (NotTypeFilter: t1 p))
-     (subtype t2 t1)]
-    [((NotTypeFilter: t1 p) (TypeFilter: t2 p))
-     (not (overlap t1 t2))]
-    [(_ _) #f]))
-
-(define (hash-name-ref i)
-  (if (identifier? i) (hash-id i) i))
-
-;; compact : (Listof prop) bool -> (Listof prop)
-;; props : propositions to compress
-;; or? : is this an OrFilter (alternative is AndFilter)
-;;
-;; This combines all the TypeFilters at the same path into one TypeFilter. If it is an OrFilter the
-;; combination is done using Un, otherwise, restrict. The reverse is done for NotTypeFilters. If it is
-;; an OrFilter this simplifies to -top if any of the atomic filters simplified to -top, and removes
-;; any -bot values. The reverse is done if this is an AndFilter.
-;;
-(define/cond-contract (compact props or?)
-     ((c:listof Filter/c) boolean? . c:-> . (c:listof Filter/c))
-  (define tf-map (make-hash))
-  (define ntf-map (make-hash))
-  (define (restrict-update dict t1 p)
-    (hash-update! dict p (λ (t2) (restrict t1 t2)) Univ))
-  (define (union-update dict t1 p)
-    (hash-update! dict p (λ (t2) (Un t1 t2)) -Bottom))
-
-  (define-values (atomics others) (partition atomic-filter? props))
-  (for ([prop (in-list atomics)])
-    (match prop
-      [(TypeFilter: t1 p)
-       ((if or? union-update restrict-update) tf-map t1 p) ]
-      [(NotTypeFilter: t1 p)
-       ((if or? restrict-update union-update) ntf-map t1 p) ]))
-  (define raw-results
-    (append others
-            (for/list ([(k v) (in-hash tf-map)]) (-filter v k))
-            (for/list ([(k v) (in-hash ntf-map)]) (-not-filter v k))))
-  (if or?
-      (if (member -top raw-results)
-          (list -top)
-          (filter-not Bot? raw-results))
-      (if (member -bot raw-results)
-          (list -bot)
-          (filter-not Top? raw-results))))
-
-
-
-;; invert-filter: Filter/c -> Filter/c
-;; Logically inverts a filter.
-(define (invert-filter p)
-  (match p
-    [(Bot:) -top]
-    [(Top:) -bot]
-    [(TypeFilter: t p) (-not-filter t p)]
-    [(NotTypeFilter: t p) (-filter t p)]
-    [(AndFilter: fs) (apply -or (map invert-filter fs))]
-    [(OrFilter: fs) (apply -and (map invert-filter fs))]
-    [(ImpFilter: f1 f2) (-and f1 (invert-filter f2))]))
-
-;; -imp: Filter/c Filter/c -> Filter/c
-;; Smart constructor for make-ImpFilter
-(define (-imp p1 p2)
-  (match* (p1 p2)
-    [(t t) -top]
-    [((Bot:) _) -top]
-    [(_ (Top:)) -top]
-    [((Top:) _) p2]
-    [(_ (Bot:)) (invert-filter p1)]
-    [(_ _) (make-ImpFilter p1 p2)]))
-
-(define (-or . args)
-  (define mk
-    (case-lambda [() -bot]
-                 [(f) f]
-                 [fs (make-OrFilter (sort fs filter<?))]))
-  (define (distribute args)
-    (define-values (ands others) (partition AndFilter? args))
-    (if (null? ands)
-        (apply mk others)
-        (match-let ([(AndFilter: elems) (car ands)])
-          (apply -and (for/list ([a (in-list elems)])
-                        (apply -or a (append (cdr ands) others)))))))
-  (let loop ([fs args] [result null])
-    (if (null? fs)
-        (distribute (compact result #t))
-        (match (car fs)
-          [(and t (Top:)) t]
-          [(OrFilter: fs*) (loop (append fs* (cdr fs)) result)]
-          [(Bot:) (loop (cdr fs) result)]
-          [t
-           (cond [(for/or ([f (in-list (append (cdr fs) result))])
-                    (complementary? f t))
-                  -top]
-                 [(let ([t-seq (Rep-seq t)])
-                    (for/or ([f (in-list result)])
-                      (or (= (Rep-seq f) t-seq) (implied-atomic? f t))))
-                  (loop (cdr fs) result)]
-                 [else
-                  (loop (cdr fs) (cons t result))])]))))
-
-(define (-and . args)
-  (define mk
-    (case-lambda [() -top]
-                 [(f) f]
-                 [fs (make-AndFilter (sort fs filter<?))]))
-  (define (flatten-ands fs)
-    (let loop ([fs fs] [results null])
-      (match fs
-        [(list) results]
-        [(cons (AndFilter: fs*) fs) (loop fs (append fs* results))]
-        [(cons f fs) (loop fs (cons f results))])))
-  ;; Move all the type filters up front as they are the stronger props
-  (define-values (filters other-args)
-    (partition (λ (f) (or (TypeFilter? f) (NotTypeFilter? f)))
-               (flatten-ands (remove-duplicates args eq? #:key Rep-seq))))
-  (define-values (type-filters not-type-filters)
-    (partition TypeFilter? filters))
-  (let loop ([fs (append type-filters not-type-filters other-args)] [result null])
-    (if (null? fs)
-        (apply mk (compact result #f))
-        (match (car fs)
-          [(and t (Bot:)) t]
-          [(Top:) (loop (cdr fs) result)]
-          [t (cond [(for/or ([f (in-list (append (cdr fs) result))])
-                      (contradictory? f t))
-                    -bot]
-                   [(let ([t-seq (Rep-seq t)])
-                      (for/or ([f (in-list result)])
-                        (or (= (Rep-seq f) t-seq)
-                            (implied-atomic? t f))))
-                    (loop (cdr fs) result)]
-                   [else
-                    (loop (cdr fs) (cons t result))])]))))
-
-;; add-unconditional-prop: tc-results? Filter/c? -> tc-results?
-;; Ands the given proposition to the filters in the tc-results.
-;; Useful to express properties of the form: if this expressions returns at all, we learn this
-(define (add-unconditional-prop results prop)
-  (match results
-    [(tc-any-results: f) (tc-any-results (-and prop f))]
-    [(tc-results: ts (list (FilterSet: fs+ fs-) ...) os)
-     (ret ts
-          (for/list ([f+ fs+] [f- fs-])
-            (-FS (-and prop f+) (-and prop f-)))
-          os)]
-    [(tc-results: ts (list (FilterSet: fs+ fs-) ...) os dty dbound)
-     (ret ts
-          (for/list ([f+ fs+] [f- fs-])
-            (-FS (-and prop f+) (-and prop f-)))
-          os)]))
-
-
-;; ands the given type filter to both sides of the given arr for each argument
-;; useful to express properties of the form: if this function returns at all,
-;; we learn this about its arguments (like fx primitives, or car/cdr, etc.)
-(define (add-unconditional-filter-all-args arr type)
-  (match arr
-    [(Function: (list (arr: dom rng rest drest kws)))
-     (match rng
-       [(Values: (list (Result: tp (FilterSet: -true-filter -false-filter) op)))
-        (let ([new-filters (apply -and (build-list (length dom)
-                                                   (lambda (i)
-                                                     (-filter type i))))])
-          (make-Function
-           (list (make-arr
-                  dom
-                  (make-Values
-                   (list (-result tp
-                                  (-FS (-and -true-filter new-filters)
-                                       (-and -false-filter new-filters))
-                                  op)))
-                  rest drest kws))))])]))
-
-;; tc-results/c -> tc-results/c
-(define (erase-filter tc)
-  (match tc
-    [(tc-any-results: _) (tc-any-results -no-filter)]
-    [(tc-results: ts _ _)
-     (ret ts
-          (for/list ([f (in-list ts)]) -no-filter)
-          (for/list ([f (in-list ts)]) -no-obj))]
-    [(tc-results: ts _ _ dty dbound)
-     (ret ts
-          (for/list ([f (in-list ts)]) -no-filter)
-          (for/list ([f (in-list ts)]) -no-obj)
-          dty dbound)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/generalize.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/generalize.rkt
deleted file mode 100644
index ad675fa2fb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/generalize.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         (rep type-rep)
-         "abbrev.rkt" "subtype.rkt" "substitute.rkt" "union.rkt"
-         "numeric-tower.rkt"
-         racket/match)
-
-(provide generalize)
-
-;; used to produce a more general type for loop variables, vectors, etc.
-;; generalize : Type -> Type
-(define (generalize t)
-  (let/ec exit
-    (let loop ([t* t])
-      (match t*
-        [(Value: '()) (-lst Univ)]
-        [(Value: 0) -Int]
-        [(List: ts) (-lst (apply Un ts))]
-        [(? (lambda (t) (subtype t -Bottom))) Univ]
-        [(? (lambda (t) (subtype t -Int))) -Int]
-        [(? (lambda (t) (subtype t -Rat))) -Rat]
-        [(? (lambda (t) (subtype t -Flonum))) -Flonum]
-        [(? (lambda (t) (subtype t -SingleFlonum))) -SingleFlonum]
-        [(? (lambda (t) (subtype t -InexactReal))) -InexactReal]
-        [(? (lambda (t) (subtype t -Real))) -Real]
-        [(? (lambda (t) (subtype t -ExactNumber))) -ExactNumber]
-        [(? (lambda (t) (subtype t -FloatComplex))) -FloatComplex]
-        [(? (lambda (t) (subtype t -SingleFlonumComplex))) -SingleFlonumComplex]
-        [(? (lambda (t) (subtype t -Number))) -Number]
-        [(? (lambda (t) (subtype t -ExtFlonum))) -ExtFlonum]
-        [(Listof: _) t*]
-        [(Pair: t1 (Value: '())) (-lst t1)]
-        [(MPair: t1 (Value: '())) (-mlst t1)]
-        [(or (Pair: t1 t2) (MPair: t1 t2))
-         (let ([t-new (loop t2)])
-           (define -lst-type
-             ((match t*
-                [(Pair: _ _) -lst]
-                [(MPair: _ _) -mlst])
-              t1))
-           (if (type-compare? -lst-type t-new)
-               -lst-type
-               (exit t)))]
-        [(ListDots: t bound) (-lst (substitute Univ bound t))]
-        [(? (lambda (t) (subtype t -Symbol))) -Symbol]
-        [(Value: #t) -Boolean]
-        [_ t*]))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/kw-types.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/kw-types.rkt
deleted file mode 100644
index 74f9f96408..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/kw-types.rkt
+++ /dev/null
@@ -1,396 +0,0 @@
-#lang racket/base
-
-(require "abbrev.rkt" "../rep/type-rep.rkt"
-         "../utils/tc-utils.rkt"
-         "../base-env/annotate-classes.rkt"
-         "tc-result.rkt"
-         racket/list racket/set racket/dict racket/match
-         racket/format racket/string
-         syntax/parse)
-
-;; convert : [Listof Keyword] [Listof Type] [Listof Type] [Option Type]
-;;           [Option Type] [Option (Pair Type symbol)] boolean -> Type
-(define (convert kw-t plain-t opt-t rng rest drest split?)
-  (define-values (mand-kw-t opt-kw-t) (partition (match-lambda [(Keyword: _ _ m) m]) kw-t))
-
-  (when drest
-    (int-err "drest passed to kw-convert"))
-
-  (define arities
-    (for/list ([i (in-range (length opt-t))])
-      (make-arr* (append plain-t (take opt-t i))
-                 rng
-                 #:kws kw-t
-                 #:rest rest
-                 #:drest drest)))
-  ;; the kw function protocol passes rest args as an explicit list
-  (define rest-type (if rest (-lst rest) empty))
-  (define ts 
-    (flatten
-     (list
-      (for/list ([k (in-list kw-t)])
-        (match k
-          [(Keyword: _ t #t) t]
-          [(Keyword: _ t #f) (list (-opt t) -Boolean)]))
-      plain-t
-      (for/list ([t (in-list opt-t)]) (-opt t))
-      (for/list ([t (in-list opt-t)]) -Boolean)
-      rest-type)))
-  ;; the kw protocol puts the arguments in keyword-sorted order in the
-  ;; function header, so we need to sort the types to match
-  (define sorted-kws
-    (sort kw-t keyword<? #:key (match-lambda [(Keyword: kw _ _) kw])))
-  (define ts/true
-    (flatten
-     (list
-      (for/list ([k (in-list sorted-kws)])
-        (match k
-          [(Keyword: _ t #t) t]
-          [(Keyword: _ t #f) (list t (-val #t))]))
-      plain-t
-      (for/list ([t (in-list opt-t)]) t)
-      (for/list ([t (in-list opt-t)]) (-val #t))
-      rest-type)))
-  (define ts/false
-    (flatten
-     (list
-      (for/list ([k (in-list sorted-kws)])
-        (match k
-          [(Keyword: _ t #t) t]
-          [(Keyword: _ t #f) (list (-val #f) (-val #f))]))
-      plain-t
-      (for/list ([t (in-list opt-t)]) (-val #f))
-      (for/list ([t (in-list opt-t)]) (-val #f))
-      rest-type)))
-  (make-Function
-    (if split?
-        (remove-duplicates
-          (list (make-arr* ts/true rng #:drest drest)
-                (make-arr* ts/false rng #:drest drest)))
-        (list (make-arr* ts rng #:rest rest #:drest drest)))))
-
-
-;; This is used to fix the filters of keyword types.
-;; TODO: This should also explore deeper into the actual types and remove filters in there as well.
-;; TODO: This should not remove the filters but instead make them refer to the actual arguments after
-;; keyword conversion.
-(define (erase-filter/Values values)
-  (match values
-    [(AnyValues: _) ManyUniv]
-    [(Results: ts fs os)
-     (-values ts)]
-    [(Results: ts fs os dty dbound)
-     (-values-dots ts dty dbound)]))
-
-
-(define (prefix-of a b)
-  (define (rest-equal? a b)
-    (match* (a b)
-      [(#f #f) #t]
-      [(#f _) #f]
-      [(_ #f) #f]
-      [(a b) (type-equal? a b)]))
-  (define (drest-equal? a b)
-    (match* (a b)
-      [((list t b) (list t* b*)) (and (type-equal? t t*) (equal? b b*))]
-      [(#f #f) #t]
-      [(_ _) #f]))
-  (define (kw-equal? a b)
-    (and (equal? (length a) (length b))
-         (for/and ([k1 (in-list a)] [k2 (in-list b)])
-           (type-equal? k1 k2))))
-  (match* (a b)
-    [((arr: args result rest drest kws)
-      (arr: args* result* rest* drest* kws*))
-     (and (< (length args) (length args*))
-          (rest-equal? rest rest*)
-          (drest-equal? drest drest*)
-          (type-equal? result result*)
-          (kw-equal? kws kws*)
-          (for/and ([p (in-list args)] [p* (in-list args*)])
-            (type-equal? p p*)))]))
-
-(define (arity-length a)
-  (match a
-    [(arr: args result rest drest kws) (length args)]))
-
-
-(define (arg-diff a1 a2)
-  (match a2
-    [(arr: args _ _ _ _) (drop args (arity-length a1))]))
-
-(define (find-prefixes l)
-  (define l* (sort l < #:key arity-length))
-  (for/fold ([d (list)]) ([e (in-list l*)])
-    (define prefix (for/or ([p (in-dict-keys d)])
-                     (and (prefix-of p e) p)))
-    (if prefix
-        (dict-set d prefix (arg-diff prefix e))
-        (dict-set d e empty))))
-
-;; handle-extra-or-missing-kws : (Listof Keyword) LambdaKeywords
-;;                               -> (Listof Keyword)
-;; Remove keywords in the given list that aren't in the actual lambda
-;; keywords list. This allows the typechecker to check some branches of the
-;; type that match the actual kws. Add extra actual keywords with Bottom type.
-(define (handle-extra-or-missing-kws kws actual-kws)
-  (match-define (lambda-kws actual-mands actual-opts) actual-kws)
-  (define expected-kws (map Keyword-kw kws))
-  (define missing-removed
-    (filter
-     (λ (kw) (or (member (Keyword-kw kw) actual-mands)
-                 (member (Keyword-kw kw) actual-opts)))
-     kws))
-  (append missing-removed
-          (for/list ([kw (in-list (set-subtract actual-mands expected-kws))])
-            (make-Keyword kw -Bottom #t))
-          (for/list ([kw (in-list (set-subtract actual-opts expected-kws))])
-            (make-Keyword kw -Bottom #f))))
-
-;; inner-kw-convert : (Listof arr) (Option LambdaKeywords) Boolean -> Type
-;; Helper function that converts each arr to a Function type and then
-;; merges them into a single Function type.
-(define (inner-kw-convert arrs actual-kws split?)
-  (define table (find-prefixes arrs))
-  (define fns
-    (for/set ([(k v) (in-dict table)])
-      (match k
-        [(arr: mand rng rest drest kws)
-         (define kws* (if actual-kws
-                          (handle-extra-or-missing-kws kws actual-kws)
-                          kws))
-         (convert kws* mand v rng rest drest split?)])))
-  (apply cl->* (set->list fns)))
-
-;; kw-convert : Type (Option LambdaKeywords) [Boolean] -> Type
-;; Given an ordinary function type, convert it to a type that matches the keyword
-;; function protocol
-(define (kw-convert ft actual-kws #:split [split? #f])
-  (match ft
-    [(Function: arrs)
-     (inner-kw-convert arrs actual-kws split?)]
-    [(Poly-names: names f)
-     (make-Poly names (kw-convert f actual-kws #:split split?))]
-    [(PolyDots-names: names f)
-     (make-PolyDots names (kw-convert f actual-kws #:split split?))]))
-
-;; kw-unconvert : Type (Listof Syntax) (Listof Keyword) (Listof Keyword) -> Type
-;; Given a type for a core keyword function, unconvert it to a
-;; normal function type.
-;;
-;; precondition: only call this for functions with no type annotations,
-;;               which means they will never have polymorphic types.
-(define (kw-unconvert ft formalss mand-keywords keywords)
-  (define (lengthish formals)
-    (define lst (syntax->list formals))
-    (if lst (length lst) +inf.0))
-  ;; only need longest formals and smallest formals to determine
-  ;; which arguments are optional non-kw arguments
-  (define max-formals (argmax lengthish formalss))
-  (define min-formals (argmin lengthish formalss))
-  (define-values (raw-non-kw-argc rest?)
-    (syntax-parse max-formals
-      [(_ _ non-kw:id ...)
-       (values (length (syntax->list #'(non-kw ...))) #f)]
-      [(_ _ non-kw:id ... . rst:id)
-       (values (length (syntax->list #'(non-kw ...))) #t)]))
-  (define opt-non-kw-argc
-    (syntax-parse min-formals
-      [(_ _ non-kw:id ...)
-       (- raw-non-kw-argc (length (syntax->list #'(non-kw ...))))]
-      ;; if min and max both have rest args, then there cannot
-      ;; have been any optional arguments
-      [(_ _ non-kw:id ... . rst:id) 0]))
-  ;; counted twice since optionals expand to two arguments
-  (define non-kw-argc (+ raw-non-kw-argc opt-non-kw-argc))
-  (define mand-non-kw-argc (- non-kw-argc (* 2 opt-non-kw-argc)))
-  (match ft
-    [(Function: arrs)
-     (cond [(= (length arrs) 1) ; no optional args (either kw or not)
-            (match-define (arr: doms rng _ _ _) (car arrs))
-            (define kw-length
-              (- (length doms) (+ non-kw-argc (if rest? 1 0))))
-            (define-values (kw-args other-args) (split-at doms kw-length))
-            (define actual-kws
-              (for/list ([kw (in-list keywords)]
-                         [kw-type (in-list kw-args)])
-                (make-Keyword kw kw-type #t)))
-            (define rest-type
-              (and rest? (last other-args)))
-            (make-Function
-             (list (make-arr* (take other-args non-kw-argc)
-                              (erase-filter/Values rng)
-                              #:kws actual-kws
-                              #:rest rest-type)))]
-           [(and (even? (length arrs)) ; had optional args
-                 (>= (length arrs) 2))
-            ;; assumption: only one arr is needed, since the types for
-            ;; the actual domain are the same (the difference is in the
-            ;; second type for the optional keyword protocol)
-            (match-define (arr: doms rng _ _ _) (car arrs))
-            (define kw-length
-              (- (length doms) (+ non-kw-argc (if rest? 1 0))))
-            (define kw-args (take doms kw-length))
-            (define actual-kws (compute-kws mand-keywords keywords kw-args))
-            (define other-args (drop doms kw-length))
-            (define-values (mand-args opt-and-rest-args)
-              (split-at other-args mand-non-kw-argc))
-            (define rest-type
-              (and rest? (last opt-and-rest-args)))
-            (define opt-types (take opt-and-rest-args opt-non-kw-argc))
-            (make-Function
-             (for/list ([to-take (in-range (add1 (length opt-types)))])
-               (make-arr* (append mand-args (take opt-types to-take))
-                          (erase-filter/Values rng)
-                          #:kws actual-kws
-                          #:rest rest-type)))]
-           [else (int-err "unsupported arrs in keyword function type")])]
-    [_ (int-err "unsupported keyword function type")]))
-
-;; check-kw-arity : LambdaKeywords Type -> Void
-;;
-;; Check if the TR lambda property listing the keywords matches up with
-;; the type that we've given. Allows for better error messages than just
-;; relying on tc-expr. Return #f if the function shouldn't be checked.
-(define (check-kw-arity kw-prop f-type)
-  (match-define (lambda-kws actual-mands actual-opts) kw-prop)
-  (define arrs
-    (match f-type
-      [(AnyPoly-names: _ _ (Function: arrs)) arrs]))
-  (for/and ([arr (in-list arrs)])
-    (match-define (arr: _ _ _ _ kws) arr)
-    (define-values (mand-kw-types opt-kw-types) (partition-kws kws))
-    (define mand-kws (map Keyword-kw mand-kw-types))
-    (define opt-kws (map Keyword-kw opt-kw-types))
-    (define missing-opts (set-subtract opt-kws actual-opts))
-    (define missing-mands (set-subtract mand-kws actual-mands))
-    ;; extra optional keywords are okay
-    (define extra-kws (set-subtract actual-mands mand-kws))
-    (unless (and (set-empty? missing-mands)
-                 (set-empty? missing-opts))
-      (tc-error/fields
-       #:delayed? #t
-       "type mismatch"
-       #:more "function is missing keyword arguments"
-       "missing mandatory keywords"
-       (string-join (map ~a missing-mands))
-       "missing optional keywords"
-       (string-join (map ~a missing-opts))
-       "expected type" f-type))
-    (unless (set-empty? extra-kws)
-      (tc-error/fields
-       #:delayed? #t
-       "type mismatch"
-       #:more "function has too many mandatory keyword arguments"
-       "extra keywords"
-       (string-join (map ~a extra-kws))
-       "expected type" f-type))))
-
-;; compute-kws : (Listof Keyword) (Listof Keyword) (Listof Type)
-;;               -> (Listof make-Keyword)
-;; Computes the keyword types for an arr in kw-unconvert
-;;
-;; assumptions: (1) in kw-args, there are two types per optional kw
-;;                  and the first type is the argument type (which is
-;;                  the same in every `arr` in the function type)
-;;              (2) kw-args and keywords are sorted by keyword<? order
-(define (compute-kws mand-keywords keywords kw-args)
-  (let loop ([kw-args kw-args]
-             [keywords keywords]
-             [kw-types '()])
-    (cond [(empty? kw-args) (reverse kw-types)]
-          [(memq (car keywords) mand-keywords)
-           (loop (cdr kw-args) (cdr keywords)
-                 (cons (make-Keyword (car keywords) (car kw-args) #t)
-                       kw-types))]
-          [else ; optional, so there are two arg types
-           (loop (cddr kw-args) (cdr keywords)
-                 (cons (make-Keyword (car keywords) (car kw-args) #f)
-                       kw-types))])))
-
-(define ((opt-convert-arr required-pos optional-pos) arr)
-  (match arr
-    [(arr: args result #f #f '())
-     (define num-args (length args))
-     (and (>= num-args required-pos)
-          (<= num-args (+ required-pos optional-pos))
-          (let* ([required-args (take args required-pos)]
-                 [opt-args (drop args required-pos)]
-                 [missing-opt-args (- (+ required-pos optional-pos) num-args)]
-                 [present-flags (map (λ (t) (-val #t)) opt-args)]
-                 [missing-args (make-list missing-opt-args (-val #f))])
-            (make-arr (append required-args
-                              opt-args
-                              missing-args
-                              present-flags
-                              missing-args)
-                      result
-                      #f
-                      #f
-                      '())))]
-    [(arr: args result _ _ _) #f]))
-
-(define (opt-convert ft required-pos optional-pos)
-  (let/ec exit
-    (let loop ((ft ft))
-      (match ft
-        [(Function: arrs)
-         (let ((arrs (map (opt-convert-arr required-pos optional-pos) arrs)))
-           (if (andmap values arrs)
-               (make-Function arrs)
-               (exit #f)))]
-        [(Poly-names: names f)
-         (make-Poly names (loop f))]
-        [(PolyDots-names: names f)
-         (make-PolyDots names (loop f))]
-        [t t]))))
-
-;; opt-unconvert : Type (Listof Syntax) -> Type
-;; Given a type for a core optional arg function, unconvert it to a
-;; normal function type. See `kw-unconvert` above.
-(define (opt-unconvert ft formalss)
-  (define (lengthish formals)
-    (define lst (syntax->list formals))
-    (if lst (length lst) +inf.0))
-  (define max-formals (argmax lengthish formalss))
-  (define min-formals (argmin lengthish formalss))
-  (define-values (raw-argc rest?)
-    (syntax-parse max-formals
-      [(arg:id ...)
-       (values (length (syntax->list #'(arg ...))) #f)]
-      [(arg:id ... . rst:id)
-       (values (length (syntax->list #'(arg ...))) #t)]))
-  (define opt-argc
-    (syntax-parse min-formals
-      [(arg:id ...)
-       (- raw-argc (length (syntax->list #'(arg ...))))]
-      ;; if min and max both have rest args, then there cannot
-      ;; have been any optional arguments
-      [(arg:id ... . rst:id) 0]))
-  ;; counted twice since optionals expand to two arguments
-  (define argc (+ raw-argc opt-argc))
-  (define mand-argc (- argc (* 2 opt-argc)))
-  (match ft
-    [(Function: arrs)
-     (cond [(and (even? (length arrs)) (>= (length arrs) 2))
-            (match-define (arr: doms rng _ _ _) (car arrs))
-            (define-values (mand-args opt-and-rest-args)
-              (split-at doms mand-argc))
-            (define rest-type
-              (and rest? (last opt-and-rest-args)))
-            (define opt-types (take opt-and-rest-args opt-argc))
-            (make-Function
-             (for/list ([to-take (in-range (add1 (length opt-types)))])
-               (make-arr* (append mand-args (take opt-types to-take))
-                          rng
-                          #:rest rest-type)))]
-           [else (int-err "unsupported arrs in keyword function type")])]
-    [_ (int-err "unsupported keyword function type")]))
-
-;; partition-kws : (Listof Keyword) -> (values (Listof Keyword) (Listof Keyword))
-;; Partition keywords by whether they are mandatory or not
-(define (partition-kws kws)
-  (partition (match-lambda [(Keyword: _ _ mand?) mand?]) kws))
-
-(provide kw-convert kw-unconvert opt-convert opt-unconvert partition-kws
-         check-kw-arity)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/match-expanders.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/match-expanders.rkt
deleted file mode 100644
index 564785a9e9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/match-expanders.rkt
+++ /dev/null
@@ -1,104 +0,0 @@
-#lang racket/base
-
-
-(require "../utils/utils.rkt")
-
-(require (rep type-rep rep-utils)
-         racket/match
-         (types resolve)
-         (contract-req)
-         racket/set
-         (for-syntax racket/base syntax/parse))
-
-(provide Listof: List: MListof: AnyPoly: AnyPoly-names: Function/arrs:
-         PredicateFilter:)
-
-
-(define-match-expander Listof:
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ elem-pat (~optional var-pat #:defaults ([var-pat #'var])))
-       ;; Note: in practice it's unlikely that the second pattern will ever come up
-       ;;       because the sequence number for '() will be low and the union will
-       ;;       be sorted by sequence number. As a paranoid precaution, however,
-       ;;       we will match against both patterns here.
-       (syntax/loc stx (or (Mu: var-pat (Union: (list (Value: '()) (Pair: elem-pat (F: var-pat)))))
-                           (Mu: var-pat (Union: (list (Pair: elem-pat (F: var-pat)) (Value: '()))))))])))
-
-(define-match-expander List:
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ elem-pats)
-       #'(? Type? (app untuple (? values elem-pats) (Value: '())))]
-      [(_ elem-pats #:tail tail-pat)
-       #'(? Type? (app untuple (? values elem-pats) tail-pat))])))
-
-;; Type/c -> (or/c (values/c #f #f) (values/c (listof Type/c) Type/c)))
-;; Returns the prefix of types that are consed on to the last type (a non finite-pair type).
-;; The last type may contain pairs if it is a list type.
-(define (untuple t)
-  (let loop ((t t) (seen (set)))
-    (if (not (set-member? seen (Type-seq t)))
-        (match (resolve t)
-          [(Pair: a b)
-           (define-values (elems tail) (loop b (set-add seen (Type-seq t))))
-           (values (cons a elems) tail)]
-          [_ (values null t)])
-        (values null t))))
-
-(define-match-expander MListof:
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ elem-pat (~optional var-pat #:defaults ([var-pat #'var])))
-       ;; see note above
-       #'(or (Mu: var-pat (Union: (list (Value: '()) (MPair: elem-pat (F: var-pat)))))
-             (Mu: var-pat (Union: (list (MPair: elem-pat (F: var-pat)) (Value: '())))))])))
-
-(define (unpoly t)
-  (match t
-    [(Poly: fixed-vars t)
-     (let-values ([(vars dotted t) (unpoly t)])
-       (values (append fixed-vars vars) dotted t))]
-    [(PolyDots: (list fixed-vars ... dotted-var) t)
-     (let-values ([(vars dotted t) (unpoly t)])
-       (values (append fixed-vars vars) (cons dotted-var dotted) t))]
-    [t (values null null t)]))
-
-(define (unpoly-names t)
-  (match t
-    [(Poly-names: fixed-vars t)
-     (let-values ([(vars dotted t) (unpoly t)])
-       (values (append fixed-vars vars) dotted t))]
-    [(PolyDots-names: (list fixed-vars ... dotted-var) t)
-     (let-values ([(vars dotted t) (unpoly t)])
-       (values (append fixed-vars vars) (cons dotted-var dotted) t))]
-    [t (values null null t)]))
-
-
-;; Match expanders that match any type and separate the outer layers of the poly and poly-dots, from
-;; the inner non polymorphic type.
-(define-match-expander AnyPoly:
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ vars dotted-vars body)
-       #'(app unpoly vars dotted-vars body)])))
-
-(define-match-expander AnyPoly-names:
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ vars dotted-vars body)
-       #'(app unpoly-names vars dotted-vars body)])))
-
-(define-match-expander Function/arrs:
-  (lambda (stx)
-    (syntax-parse stx
-      [(_ doms rngs rests drests kws (~optional (~seq #:arrs arrs) #:defaults ([arrs #'_])))
-       #'(Function: (and arrs (list (arr: doms rngs rests drests kws) (... ...))))])))
-
-;; A match expander for matching the filter on a predicate. This assumes a standard
-;; predicate type of the shape (-> Any Any : SomeType)
-(define-match-expander PredicateFilter:
-  (λ (stx)
-    (syntax-parse stx
-      [(_ fs)
-       #'(Function: (list (arr: (list _) (Values: (list (Result: _ fs _))) _ _ _)))])))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-predicates.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-predicates.rkt
deleted file mode 100644
index c3bc338e78..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-predicates.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-
-(require racket/unsafe/ops
-         racket/performance-hint)
-
-(provide index? exact-rational?)
-
-;; this is required for template in numeric-tower.rkt
-
-(begin-encourage-inline
-
-;; we assume indexes are 2 bits shorter than fixnums
-;; We're generating a reference to fixnum? rather than calling it, so
-;; we're safe from fixnum size issues on different platforms.
-(define (index? x) (and (fixnum? x) (unsafe-fx>= x 0) (fixnum? (* x 4))))
-
-(define (exact-rational? x) (and (rational? x) (exact? x)))
-
-) ; begin-encourage-inline
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-tower.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-tower.rkt
deleted file mode 100644
index e666cda014..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-tower.rkt
+++ /dev/null
@@ -1,331 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         (rename-in (types numeric-predicates base-abbrev)
-                    [simple-Un *Un])
-         (rename-in (rep type-rep) [make-Base make-Base*])
-         unstable/function
-         racket/extflonum
-         ;; For base type contracts
-         (for-template racket/base racket/contract/base racket/extflonum (types numeric-predicates)))
-
-(provide portable-fixnum? portable-index?
-         -Zero -One -PosByte -Byte -PosIndex -Index
-         -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum -Fixnum
-         -PosInt -Nat -NegInt -NonPosInt -Int
-         -PosRat -NonNegRat -NegRat -NonPosRat -Rat
-         -FlonumPosZero -FlonumNegZero -FlonumZero -FlonumNan -PosFlonum -NonNegFlonum -NegFlonum -NonPosFlonum -Flonum
-         -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero -SingleFlonumNan -PosSingleFlonum -NonNegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum -SingleFlonum
-         -InexactRealPosZero -InexactRealNegZero -InexactRealZero -InexactRealNan -PosInexactReal -NonNegInexactReal -NegInexactReal -NonPosInexactReal -InexactReal
-         -RealZero -PosReal -NonNegReal -NegReal -NonPosReal -Real
-         -ExactImaginary -FloatImaginary -SingleFlonumImaginary -InexactImaginary -Imaginary
-         -ExactNumber -ExactComplex -FloatComplex -SingleFlonumComplex -InexactComplex -Number
-         (rename-out (-Int -Integer))
-         -ExtFlonumPosZero -ExtFlonumNegZero -ExtFlonumZero -ExtFlonumNan
-         -PosExtFlonum -NonNegExtFlonum -NegExtFlonum -NonPosExtFlonum -ExtFlonum)
-
-;; all the types defined here are numeric (except 80-bit flonums)
-(define (make-Base name contract predicate)
-  (make-Base* name contract predicate #t))
-
-
-;; Numeric hierarchy
-;; All built as unions of non-overlapping base types.
-;; This should make encoding mathematical properties in the base env easier.
-;; The base types that don't have an interesting mathematical meaning
-;; (e.g. -Byte>1, -PosFixnumNotIndex, etc.) should not be used anywhere, as
-;; they should not be exposed to the user and could easily be misused in
-;; the base type environment. They are not provided.
-;; A lot of these contracts will be overriden in type->contract, so their
-;; hairiness should not be of much consequence.
-
-;; Is the number a fixnum on *all* the platforms Racket supports?  This
-;; works because Racket compiles only on 32+ bit systems.  This check is
-;; done at compile time to typecheck literals -- so use it instead of
-;; `fixnum?' to avoid creating platform-dependent .zo files.
-(define (portable-fixnum? n)
-  (and (exact-integer? n)
-       (< n (expt 2 30))
-       (>= n (- (expt 2 30)))))
-;; same, for indexes
-(define (portable-index? n)
-  (and (exact-integer? n)
-       (< n (expt 2 28))
-       (>= n 0)))
-
-;; Singletons
-(define/decl -Zero (make-Value 0)) ; exact
-(define/decl -One  (make-Value 1))
-
-;; Integers
-(define/decl -Byte>1 (make-Base 'Byte-Larger-Than-One ; unsigned
-				#'(and/c byte? (lambda (x) (> x 1)))
-				(conjoin byte? (lambda (x) (> x 1)))))
-(define/decl -PosByte (*Un -One -Byte>1))
-(define/decl -Byte    (*Un -Zero -PosByte))
-(define/decl -PosIndexNotByte
-  (make-Base 'Positive-Index-Not-Byte
-             ;; index? will be checked at runtime, can be platform-specific
-             ;; portable-index? will be checked at compile-time, must be portable
-             #'(and/c index? positive? (not/c byte?))
-             (lambda (x) (and (portable-index? x)
-                              (positive? x)
-                              (not (byte? x))))))
-(define/decl -PosIndex    (*Un -One -Byte>1 -PosIndexNotByte))
-(define/decl -Index       (*Un -Zero -PosIndex))
-(define/decl -PosFixnumNotIndex
-  (make-Base 'Positive-Fixnum-Not-Index
-             #'(and/c fixnum? positive? (not/c index?))
-             (lambda (x) (and (portable-fixnum? x)
-                              (positive? x)
-                              (not (portable-index? x))))))
-(define/decl -PosFixnum    (*Un -PosFixnumNotIndex -PosIndex))
-(define/decl -NonNegFixnum (*Un -PosFixnum -Zero))
-(define/decl -NegFixnum
-  (make-Base 'Negative-Fixnum
-             #'(and/c fixnum? negative?)
-             (lambda (x) (and (portable-fixnum? x)
-                              (negative? x)))))
-(define/decl -NonPosFixnum (*Un -NegFixnum -Zero))
-(define/decl -Fixnum       (*Un -NegFixnum -Zero -PosFixnum))
-;; This type, and others like it, should *not* be exported, or used for
-;; anything but building unions. Especially, no literals should be given
-;; these types.
-(define/decl -PosIntNotFixnum
-  (make-Base 'Positive-Integer-Not-Fixnum
-             #'(and/c exact-integer? positive? (not/c fixnum?))
-             (lambda (x) (and (exact-integer? x)
-                              (positive? x)
-                              (not (portable-fixnum? x))))))
-(define/decl -PosInt    (*Un -PosIntNotFixnum -PosFixnum))
-(define/decl -NonNegInt (*Un -PosInt -Zero))
-(define/decl -Nat       -NonNegInt)
-(define/decl -NegIntNotFixnum
-  (make-Base 'Negative-Integer-Not-Fixnum
-             #'(and/c exact-integer? negative? (not/c fixnum?))
-             (lambda (x) (and (exact-integer? x)
-                              (negative? x)
-                              (not (portable-fixnum? x))))))
-(define/decl -NegInt    (*Un -NegIntNotFixnum -NegFixnum))
-(define/decl -NonPosInt (*Un -NegInt -Zero))
-(define/decl -Int       (*Un -NegInt -Zero -PosInt))
-
-;; Rationals
-(define/decl -PosRatNotInt
-  (make-Base 'Positive-Rational-Not-Integer
-             #'(and/c exact-rational? positive? (not/c integer?))
-             (lambda (x) (and (exact-rational? x)
-                              (positive? x)
-                              (not (exact-integer? x))))))
-(define/decl -PosRat    (*Un -PosRatNotInt -PosInt))
-(define/decl -NonNegRat (*Un -PosRat -Zero))
-(define/decl -NegRatNotInt
-  (make-Base 'Negative-Rational-Not-Integer
-             #'(and/c exact-rational? negative? (not/c integer?))
-             (lambda (x) (and (exact-rational? x)
-                              (negative? x)
-                              (not (exact-integer? x))))))
-(define/decl -NegRat    (*Un -NegRatNotInt -NegInt))
-(define/decl -NonPosRat (*Un -NegRat -Zero))
-(define/decl -Rat       (*Un -NegRat -Zero -PosRat))
-
-;; Floating-point numbers
-;; NaN is included in all floating-point types
-(define/decl -FlonumNan
-  (make-Base 'Float-Nan
-	     #'(and/c flonum? (lambda (x) (eqv? x +nan.0)))
-	     (lambda (x) (and (flonum? x) (eqv? x +nan.0)))))
-(define/decl -FlonumPosZero
-  (make-Base 'Float-Positive-Zero
-	     #'(lambda (x) (eqv? x 0.0))
-	     (lambda (x) (eqv? x 0.0))))
-(define/decl -FlonumNegZero
-  (make-Base 'Float-Negative-Zero
-	     #'(lambda (x) (eqv? x -0.0))
-	     (lambda (x) (eqv? x -0.0))))
-(define/decl -FlonumZero (*Un -FlonumPosZero -FlonumNegZero -FlonumNan))
-(define/decl -PosFlonumNoNan
-  (make-Base 'Positive-Float-No-NaN
-             #'(and/c flonum? positive?)
-             (lambda (x) (and (flonum? x) (positive? x)))))
-(define/decl -PosFlonum (*Un -PosFlonumNoNan -FlonumNan))
-(define/decl -NonNegFlonum (*Un -PosFlonum -FlonumZero))
-(define/decl -NegFlonumNoNan
-  (make-Base 'Negative-Float-No-NaN
-             #'(and/c flonum? negative?)
-             (lambda (x) (and (flonum? x) (negative? x)))))
-(define/decl -NegFlonum (*Un -NegFlonumNoNan -FlonumNan))
-(define/decl -NonPosFlonum (*Un -NegFlonum -FlonumZero))
-(define/decl -Flonum (*Un -NegFlonumNoNan -FlonumNegZero -FlonumPosZero -PosFlonumNoNan -FlonumNan)) ; 64-bit floats
-;; inexact reals can be flonums (64-bit floats) or 32-bit floats
-(define/decl -SingleFlonumNan
-  (make-Base 'Single-Flonum-Nan
-	     #'(and/c single-flonum? (lambda (x) (eqv? x +nan.f)))
-	     (lambda (x) (and (single-flonum? x) (eqv? x +nan.f)))))
-(define/decl -SingleFlonumPosZero ; disjoint from Flonum 0s
-  (make-Base 'Single-Flonum-Positive-Zero
-             ;; eqv? equates 0.0f0 with itself, but not eq?
-             #'(lambda (x) (eqv? x 0.0f0))
-             (lambda (x) (eqv? x 0.0f0))))
-(define/decl -SingleFlonumNegZero
-  (make-Base 'Single-Flonum-Negative-Zero
-             #'(lambda (x) (eqv? x -0.0f0))
-             (lambda (x) (eqv? x -0.0f0))))
-(define/decl -SingleFlonumZero (*Un -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumNan))
-(define/decl -InexactRealNan     (*Un -FlonumNan -SingleFlonumNan))
-(define/decl -InexactRealPosZero (*Un -SingleFlonumPosZero -FlonumPosZero))
-(define/decl -InexactRealNegZero (*Un -SingleFlonumNegZero -FlonumNegZero))
-(define/decl -InexactRealZero    (*Un -InexactRealPosZero
-                                 -InexactRealNegZero
-                                 -InexactRealNan))
-(define/decl -PosSingleFlonumNoNan
-  (make-Base 'Positive-Single-Flonum-No-Nan
-             #'(and/c single-flonum? positive?)
-             (lambda (x) (and (single-flonum? x) (positive? x)))))
-(define/decl -PosSingleFlonum    (*Un -PosSingleFlonumNoNan -SingleFlonumNan))
-(define/decl -PosInexactReal     (*Un -PosSingleFlonum -PosFlonum))
-(define/decl -NonNegSingleFlonum (*Un -PosSingleFlonum -SingleFlonumZero))
-(define/decl -NonNegInexactReal  (*Un -PosInexactReal -InexactRealZero))
-(define/decl -NegSingleFlonumNoNan
-  (make-Base 'Negative-Single-Flonum-No-Nan
-             #'(and/c single-flonum? negative?)
-             (lambda (x) (and (single-flonum? x) (negative? x)))))
-(define/decl -NegSingleFlonum    (*Un -NegSingleFlonumNoNan -SingleFlonumNan))
-(define/decl -NegInexactReal     (*Un -NegSingleFlonum -NegFlonum))
-(define/decl -NonPosSingleFlonum (*Un -NegSingleFlonum -SingleFlonumZero))
-(define/decl -NonPosInexactReal  (*Un -NegInexactReal -InexactRealZero))
-(define/decl -SingleFlonum       (*Un -NegSingleFlonum -SingleFlonumNegZero -SingleFlonumPosZero -PosSingleFlonum -SingleFlonumNan))
-(define/decl -InexactReal        (*Un -SingleFlonum -Flonum))
-
-;; Reals
-(define/decl -RealZero   (*Un -Zero -InexactRealZero))
-(define/decl -PosReal    (*Un -PosRat -PosInexactReal))
-(define/decl -NonNegReal (*Un -NonNegRat -NonNegInexactReal))
-(define/decl -NegReal    (*Un -NegRat -NegInexactReal))
-(define/decl -NonPosReal (*Un -NonPosRat -NonPosInexactReal))
-(define/decl -Real       (*Un -Rat -InexactReal))
-
-;; Complexes
-;; We could go into _much_ more precision here.
-;; We could have types that reflect the size/exactness of both components
-;; (e.g. PosFixnumNonNegIntComplex), to give more interesting types to
-;; real-part, imag-part and others.
-;; We could have Complex be a 2-argument type constructor (although it
-;; could construct uninhabitable types like (Complex Integer Float), which
-;; can't exist in Racket (parts must be both exact, both inexact, or one is
-;; exact-zero)).  That's future work.
-
-;; Thus, the only possible kinds of complex numbers are:
-;; Zero/Rat, Zero/Flonum, Zero/SingleFlonum.
-;; Rat/Rat, Flonum/Flonum, SingleFlonum/SingleFlonum.
-(define/decl -ExactImaginary
-  (make-Base 'Exact-Imaginary
-             #'(and/c number?
-                      (not/c real?)
-                      (lambda (x)
-                        (and
-                          (eqv? 0 (real-part x))
-                          (exact? (imag-part x)))))
-             (lambda (x) (and (number? x)
-                              (not (real? x))
-                              (eqv? 0 (real-part x))
-                              (exact? (imag-part x))))))
-(define/decl -ExactComplex
-  (make-Base 'Exact-Complex
-             #'(and/c number?
-                      (not/c real?)
-                      (lambda (x)
-                        (and
-                          (not (eqv? 0 (real-part x)))
-                          (exact? (real-part x))
-                          (exact? (imag-part x)))))
-             (lambda (x) (and (number? x)
-                              (not (real? x))
-                              (not (eqv? 0 (real-part x)))
-                              (exact? (real-part x))
-                              (exact? (imag-part x))))))
-(define/decl -FloatImaginary
-  (make-Base 'Float-Imaginary
-	     #'(and/c number?
-		      (lambda (x)
-			(and (flonum? (imag-part x))
-			     (eqv? 0 (real-part x)))))
-	     (lambda (x)
-	       (and (number? x)
-		    (flonum? (imag-part x))
-		    (eqv? 0 (real-part x))))))
-(define/decl -SingleFlonumImaginary 
-  (make-Base 'Single-Flonum-Imaginary
-	     #'(and/c number?
-		      (lambda (x)
-			(and (single-flonum? (imag-part x))
-			     (eqv? 0 (real-part x)))))
-	     (lambda (x)
-	       (and (number? x)
-		    (single-flonum? (imag-part x))
-		    (eqv? 0 (real-part x))))))
-(define/decl -FloatComplex
-  (make-Base 'Float-Complex
-	     #'(and/c number?
-		      (lambda (x)
-			(and (flonum? (imag-part x))
-			     (flonum? (real-part x)))))
-	     (lambda (x)
-	       (and (number? x)
-		    (flonum? (imag-part x))
-		    (flonum? (real-part x))))))
-(define/decl -SingleFlonumComplex
-  (make-Base 'Single-Flonum-Complex
-	     #'(and/c number?
-		      (lambda (x)
-			(and (single-flonum? (imag-part x))
-			     (single-flonum? (real-part x)))))
-	     (lambda (x)
-	       (and (number? x)
-		    (single-flonum? (imag-part x))
-		    (single-flonum? (real-part x))))))
-(define/decl -ExactNumber (*Un -ExactImaginary -ExactComplex -Rat))
-(define/decl -InexactImaginary (*Un -FloatImaginary -SingleFlonumImaginary))
-(define/decl -Imaginary (*Un -ExactImaginary -InexactImaginary))
-(define/decl -InexactComplex (*Un -FloatComplex -SingleFlonumComplex))
-(define/decl -Complex (*Un -Real -Imaginary -ExactComplex -InexactComplex))
-(define/decl -Number -Complex)
-
-;; 80-bit floating-point numbers
-;; +nan.t is included in all 80-bit floating-point types
-(define/decl -ExtFlonumNan
-  (make-Base* 'ExtFlonum-Nan
-              #'(and/c extflonum? (lambda (x) (eqv? x +nan.t)))
-              (lambda (x) (and (extflonum? x) (eqv? x +nan.t)))
-              #f))
-
-(define/decl -ExtFlonumPosZero
-  (make-Base* 'ExtFlonum-Positive-Zero
-              #'(lambda (x) (eqv? x 0.0t0))
-              (lambda (x) (eqv? x 0.0t0))
-              #f))
-
-(define/decl -ExtFlonumNegZero
-  (make-Base* 'ExtFlonum-Negative-Zero
-              #'(lambda (x) (eqv? x -0.0t0))
-              (lambda (x) (eqv? x -0.0t0))
-              #f))
-
-(define/decl -NegExtFlonumNoNan
-  (make-Base* 'Negative-ExtFlonum-No-NaN
-              #'(and/c extflonum? (λ (x) (extfl<= x 0.0t0)))
-              (lambda (x) (and (extflonum? x) (extfl<= x 0.0t0)))
-              #f))
-
-(define/decl -PosExtFlonumNoNan
-  (make-Base* 'Positive-ExtFlonum-No-NaN
-              #'(and/c extflonum? (λ (x) (extfl>= x 0.0t0)))
-              (lambda (x) (and (extflonum? x) (extfl>= x 0.0t0)))
-              #f))
-
-(define/decl -ExtFlonumZero (*Un -ExtFlonumPosZero -ExtFlonumNegZero -ExtFlonumNan))
-(define/decl -PosExtFlonum (*Un -PosExtFlonumNoNan -ExtFlonumNan))
-(define/decl -NonNegExtFlonum (*Un -PosExtFlonum -ExtFlonumZero))
-(define/decl -NegExtFlonum (*Un -NegExtFlonumNoNan -ExtFlonumNan))
-(define/decl -NonPosExtFlonum (*Un -NegExtFlonum -ExtFlonumZero))
-(define/decl -ExtFlonum (*Un -NegExtFlonumNoNan -ExtFlonumNegZero -ExtFlonumPosZero -PosExtFlonumNoNan -ExtFlonumNan))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/printer.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/printer.rkt
deleted file mode 100644
index 4a5e2b073f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/printer.rkt
+++ /dev/null
@@ -1,558 +0,0 @@
-#lang racket/base
-
-;; This module provides functions for printing types and related
-;; data structures such as filters and objects
-
-(require racket/require racket/match unstable/sequence racket/string racket/promise
-         racket/pretty
-         racket/list
-         (prefix-in s: srfi/1)
-         (path-up "rep/type-rep.rkt" "rep/filter-rep.rkt" "rep/object-rep.rkt"
-                  "rep/rep-utils.rkt" "types/subtype.rkt"
-                  "types/match-expanders.rkt"
-                  "types/kw-types.rkt"
-                  "types/utils.rkt"
-                  "types/resolve.rkt"
-                  "utils/utils.rkt"
-                  "utils/tc-utils.rkt")
-         (for-syntax racket/base syntax/parse))
-
-;; printer-type: (one-of/c 'custom 'debug)
-(define-for-syntax printer-type 'custom)
-
-(define-syntax (provide-printer stx)
-  (if (eq? printer-type 'debug)
-      #'(provide (rename-out [debug-printer print-type]
-                             [debug-printer print-filter]
-                             [debug-printer print-object]
-                             [debug-printer print-pathelem]
-                             [debug-pretty-format-type pretty-format-type]))
-      #'(provide print-type print-filter print-object print-pathelem
-                 pretty-format-type)))
-(provide-printer)
-
-(provide print-complex-filters? type-output-sexpr-tweaker
-         current-print-type-fuel current-print-unexpanded)
-
-
-;; do we attempt to find instantiations of polymorphic types to print?
-;; FIXME - currently broken
-(define print-poly-types? #t)
-;; do we use simple type aliases in printing
-(define print-aliases #t)
-
-(define type-output-sexpr-tweaker (make-parameter values))
-(define print-complex-filters? (make-parameter #f))
-
-;; this parameter controls how far down the type to expand type names
-;; interp. 0 -> don't expand
-;;         1 -> expand one level, etc.
-;;    +inf.0 -> expand always
-(define current-print-type-fuel (make-parameter 0))
-
-;; this parameter allows the printer to communicate unexpanded
-;; type aliases to its clients, which is used to cue the user
-(define current-print-unexpanded (make-parameter (box '())))
-
-;; does t have a type name associated with it currently?
-;; has-name : Type -> Maybe[Listof<Symbol>]
-(define (has-name? t)
-  (define candidates
-    (for/list ([(n t*) (in-pairs (in-list (force (current-type-names))))]
-               #:when (and print-aliases (Type? t*) (type-equal? t t*)))
-      n))
-  (and (pair? candidates)
-       (sort candidates string>? #:key symbol->string #:cache-keys? #t)))
-
-;; print-<thing> : <thing> Output-Port Boolean -> Void
-;; print-type also takes an optional (Listof Symbol)
-;;
-;; These four functions call the helpers below to print an
-;; s-expression representation of the given type/pathelem/filter/object.
-(define (print-type type port write? [ignored-names '()])
-  (display (type->sexp type ignored-names) port))
-
-(define (print-pathelem pe port write?)
-  (display (pathelem->sexp pe) port))
-
-(define (print-filter filter port write?)
-  (display (filter->sexp filter) port))
-
-(define (print-object obj port write?)
-  (display (object->sexp obj) port))
-
-;; Table for formatting pretty-printed types
-(define type-style-table
-  (pretty-print-extend-style-table
-   #f '(U All -> ->*) '(and lambda and and)))
-
-;; pretty-format-type : Type -> String
-;; Formats the type using pretty printing
-(define (pretty-format-type type #:indent [indent 0])
-  (define out (open-output-string))
-  (port-count-lines! out)
-  (write-string (make-string indent #\space) out)
-  (parameterize ([pretty-print-current-style-table type-style-table])
-    (pretty-display ((type-output-sexpr-tweaker) (type->sexp type '()))
-                    out))
-  (string-trim #:left? #f (substring (get-output-string out) indent)))
-
-;; filter->sexp : Filter -> S-expression
-;; Print a Filter (see filter-rep.rkt) to the given port
-(define (filter->sexp filt)
-  (define (name-ref->sexp name-ref)
-    (if (syntax? name-ref)
-        (syntax-e name-ref)
-        name-ref))
-  (define (path->sexps path)
-    (if (null? path)
-        '()
-        (list (map pathelem->sexp path))))
-  (match filt
-    [(FilterSet: thn els) `(,(filter->sexp thn) \| ,(filter->sexp els))]
-    [(NoFilter:) '-]
-    [(NotTypeFilter: type (Path: path nm))
-     `(! ,(type->sexp type) @ ,@(path->sexps path) ,(name-ref->sexp nm))]
-    [(TypeFilter: type (Path: path nm))
-     `(,(type->sexp type) @ ,@(path->sexps path) ,(name-ref->sexp nm))]
-    [(Bot:) 'Bot]
-    [(Top:) 'Top]
-    [(ImpFilter: a c)
-     `(ImpFilter ,(filter->sexp a) ,(filter->sexp c))]
-    [(AndFilter: a) `(AndFilter ,@(map filter->sexp a))]
-    [(OrFilter: a) `(OrFilter ,@(map filter->sexp a))]
-    [else `(Unknown Filter: ,(struct->vector filt))]))
-
-;; pathelem->sexp : PathElem -> S-expression
-;; Print a PathElem (see object-rep.rkt) to the given port
-(define (pathelem->sexp pathelem)
-  (match pathelem
-    [(CarPE:) 'car]
-    [(CdrPE:) 'cdr]
-    [(ForcePE:) 'force]
-    [(StructPE: t i) `(,(pathelem->sexp t) ,i)]
-    [else `(Unknown Path Element: ,(struct->vector pathelem))]))
-
-;; object->sexp : Object -> S-expression
-;; Print an Object (see object-rep.rkt) to the given port
-(define (object->sexp object)
-  (match object
-    [(NoObject:) '-]
-    [(Empty:) '-]
-    [(Path: pes i) (append (map pathelem->sexp pes) (list i))]
-    [else `(Unknown Object: ,(struct->vector object))]))
-
-;; cover-union : Type LSet<Type> -> Listof<Symbol> Listof<Type>
-;; Unions are represented as a flat list of branches. In some cases, it would
-;; be nicer to print them using higher-level descriptions instead.
-;; We do set coverage, with the elements of the union being what we want to
-;; cover, and all the names types we know about being the sets.
-(define (cover-union t ignored-names)
-  (match-define (Union: elems) t)
-  (define valid-names
-    ;; We keep only unions, and only those that are subtypes of t.
-    ;; It's no use attempting to cover t with things that go outside of t.
-    (filter (lambda (p)
-              (match p
-                [(cons name (and t* (Union: elts)))
-                 (and (not (member name ignored-names))
-                      (subtype t* t))]
-                [_ #f]))
-            (force (current-type-names))))
-  ;; names and the sets themselves (not the union types)
-  ;; we use srfi/1 lsets as sets, to use custom type equality.
-  (define candidates
-    (map (match-lambda [(cons name (Union: elts)) (cons name elts)])
-         valid-names))
-  ;; some types in the union may not be coverable by the candidates
-  ;; (e.g. type variables, etc.)
-  (define-values (uncoverable coverable)
-    (apply s:lset-diff+intersection type-equal? elems (map cdr candidates)))
-  ;; set cover, greedy algorithm, ~lg n approximation
-  (let loop ([to-cover   coverable]
-             [candidates candidates]
-             [coverage   '()])
-    (cond [(null? to-cover) ; done
-           (define coverage-names (map car coverage))
-           ;; to allow :type to cue the user on unexpanded aliases
-           ;; only union types can flow here, and any of those could be expanded
-           (set-box! (current-print-unexpanded)
-                     (append coverage-names (unbox (current-print-unexpanded))))
-           (values coverage-names uncoverable)] ; we want the names
-          [else
-           ;; pick the candidate that covers the most uncovered types
-           (define (covers-how-many? c)
-             (length (s:lset-intersection type-equal? (cdr c) to-cover)))
-           (define-values (next _)
-             (for/fold ([next      (car candidates)]
-                        [max-cover (covers-how-many? (car candidates))])
-                 ([c (in-list candidates)])
-               (let ([how-many? (covers-how-many? c)])
-                 (if (> how-many? max-cover)
-                     (values c how-many?)
-                     (values next max-cover)))))
-           (loop (s:lset-difference type-equal? to-cover (cdr next))
-                 (remove next candidates)
-                 (cons next coverage))])))
-
-;; arr->sexp : arr -> s-expression
-;; Convert an arr (see type-rep.rkt) to its printable form
-(define (arr->sexp arr)
-  (match arr
-    [(arr: dom rng rest drest kws)
-     (append
-      (list '->)
-      (map type->sexp dom)
-      ;; Format keyword types as strings because the square
-      ;; brackets are significant for printing. Note that
-      ;; as long as the resulting s-expressions are `display`ed
-      ;; this is fine, though it may not pretty-print well.
-      (for/list ([kw (in-list kws)])
-        (match kw
-          [(Keyword: k t req?)
-           (if req?
-               (format "~a ~a" k (type->sexp t))
-               (format "[~a ~a]" k (type->sexp t)))]))
-      (if rest  `(,(type->sexp rest) *)                       null)
-      (if drest `(,(type->sexp (car drest)) ... ,(cdr drest)) null)
-      (match rng
-        [(AnyValues: (Top:)) '(AnyValues)]
-        [(AnyValues: f) `(AnyValues : ,(filter->sexp f))]
-        [(Values: (list (Result: t (FilterSet: (Top:) (Top:)) (Empty:))))
-         (list (type->sexp t))]
-        [(Values: (list (Result: t
-                                 (FilterSet: (TypeFilter: ft (Path: pth (list 0 0)))
-                                             (NotTypeFilter: ft (Path: pth (list 0 0))))
-                                 (Empty:))))
-         ;; Only print a simple filter for single argument functions,
-         ;; since parse-type only accepts simple latent filters on single
-         ;; argument functions.
-         #:when (= 1 (length dom))
-         (if (null? pth)
-             `(,(type->sexp t) : ,(type->sexp ft))
-             `(,(type->sexp t) : ,(type->sexp ft) @
-               ,@(map pathelem->sexp pth)))]
-        ;; Print asymmetric filters with only a positive filter as a
-        ;; special case (even when complex printing is off) because it's
-        ;; useful to users who use functions like `filter`.
-        [(Values: (list (Result: t
-                                 (FilterSet: (TypeFilter: ft (Path: '() (list 0 0))) (Top:))
-                                 (Empty:))))
-         #:when (= 1 (length dom))
-         `(,(type->sexp t) : #:+ ,(type->sexp ft))]
-        [(Values: (list (Result: t fs (Empty:))))
-         (if (print-complex-filters?)
-             `(,(type->sexp t) : ,(filter->sexp fs))
-             (list (type->sexp t)))]
-        [(Values: (list (Result: t lf lo)))
-         (if (print-complex-filters?)
-             `(,(type->sexp t) : ,(filter->sexp lf) ,(object->sexp lo))
-             (list (type->sexp t)))]
-        [_ (list (type->sexp rng))]))]
-    [else `(Unknown Function Type: ,(struct->vector arr))]))
-
-;; format->* : (Listof arr) -> S-Expression
-;; Format arrs that correspond to a ->* type
-(define (format->* arrs)
-  ;; see type-contract.rkt, which does something similar and this code
-  ;; was stolen from/inspired by/etc.
-  (match* ((first arrs) (last arrs))
-    [((arr: first-dom rng rst _ kws)
-      (arr: last-dom _ _ _ _))
-     (define-values (mand-kws opt-kws) (partition-kws kws))
-     (define opt-doms (drop last-dom (length first-dom)))
-     `(->*
-       ,(append* (for/list ([dom (in-list first-dom)])
-                   (type->sexp dom))
-                 (for/list ([mand-kw (in-list mand-kws)])
-                   (match-define (Keyword: k t _) mand-kw)
-                   (list k (type->sexp t))))
-       ,(append* (for/list ([opt-dom (in-list opt-doms)])
-                   (type->sexp opt-dom))
-                 (for/list ([opt-kw (in-list opt-kws)])
-                   (match-define (Keyword: k t _) opt-kw)
-                   (list k (type->sexp t))))
-       ,@(if rst (list '#:rest (type->sexp rst)) null)
-       ,(type->sexp rng))]))
-
-;; cover-case-lambda : (Listof arr) -> (Listof s-expression)
-;; Try to cover a case-> type with ->* types
-(define (cover-case-lambda arrs)
-  ;; sublists : (Listof X) -> (Listof (List (Listof X) (Listof X) (Listof X)))
-  ;; produce sublists of a list in decreasing order, also
-  ;; returning the rest of the list before and after the
-  ;; sublist for each.
-  (define (sublists lst)
-    (define (sublist-n n lst)
-      (for/list ([to-drop (range (- (length lst) (- n 1)))])
-        (define-values (pre mid) (split-at lst to-drop))
-        (define-values (sub post) (split-at mid n))
-        (list pre sub post)))
-    (apply append (for/list ([i (range (length lst) 0 -1)])
-                    (sublist-n i lst))))
-  (let loop ([left-to-cover arrs])
-    ;; try to match the largest sublists possible that correspond to
-    ;; ->* types and then the remainder are formatted normally
-    (define a-match
-      (for/first ([sub (in-list (sublists left-to-cover))]
-                  #:when (has-optional-args? (second sub)))
-        sub))
-    (cond [a-match
-           (match-define (list pre sub post) a-match)
-           (append (loop pre) (list (format->* sub)) (loop post))]
-          [else (map arr->sexp left-to-cover)])))
-
-;; case-lambda->sexp : Type -> S-expression
-;; Convert a case-> type to an s-expression
-(define (case-lambda->sexp type)
-  (match type
-    [(Function: arities)
-     (match arities
-       [(list) '(case->)]
-       [(list a) (arr->sexp a)]
-       [(and arrs (list a b ...))
-        (define cover (cover-case-lambda arrs))
-        (if (> (length cover) 1)
-            `(case-> ,@cover)
-            (car cover))])]))
-
-;; class->sexp : Class [#:object? Boolean] -> S-expression
-;; Convert a class or object type to an s-expression
-(define (class->sexp cls #:object? [object? #f])
-  (match-define (Class: row-var inits fields methods augments init-rest) cls)
-  (define row-var*
-    (if (and row-var (F? row-var)) `(#:row-var ,(F-n row-var)) '()))
-  (define inits*
-    (if (or object? (null? inits))
-        null
-        (list
-         (cons 'init
-               (for/list ([init inits])
-                 (match-define (list name type opt?) init)
-                 (if opt?
-                     (list name (type->sexp type) '#:optional)
-                     (list name (type->sexp type))))))))
-  (define fields*
-    (if (null? fields)
-        null
-        (list
-         (cons 'field
-               (for/list ([name+type (in-list fields)])
-                 (match-define (list name type) name+type)
-                 `(,name ,(type->sexp type)))))))
-  (define methods*
-    (for/list ([name+type (in-list methods)])
-      (match-define (list name type) name+type)
-      `(,name ,(type->sexp type))))
-  (define augments*
-    (cond [(or object? (null? augments)) '()]
-          [else (list (cons 'augment augments))]))
-  (define init-rest*
-    (if (and init-rest (not object?))
-        (list `(init-rest ,init-rest))
-        null))
-  `(,(if object? 'Object 'Class)
-    ,@row-var* ,@inits* ,@init-rest* ,@fields* ,@methods* ,@augments*))
-
-;; type->sexp : Type -> S-expression
-;; convert a type to an s-expression that can be printed
-(define (type->sexp type [ignored-names '()])
-  (define (t->s type)
-    (parameterize ([current-print-type-fuel
-                    (sub1 (current-print-type-fuel))])
-      (type->sexp type)))
-  (define (tuple? t)
-    (match t
-      [(Pair: a (? tuple?)) #t]
-      [(Value: '()) #t]
-      [_ #f]))
-  (define (tuple-elems t)
-    (match t
-      [(Pair: a e) (cons a (tuple-elems e))]
-      [(Value: '()) null]))
-  (match type
-    ;; if we know how it was written, print that
-    [(? Rep-stx a) (syntax->datum (Rep-stx a))]
-    [(Univ:) 'Any]
-    ;; struct names are just printed as the original syntax
-    [(Name/struct: id) (syntax-e id)]
-    ;; If a type has a name, then print it with that name.
-    ;; However, we expand the alias in some cases
-    ;; (i.e., the fuel is > 0) for the :type form.
-    [(app has-name? (? values names))
-     (=> fail)
-     (when (not (null? ignored-names)) (fail))
-     (define fuel (current-print-type-fuel))
-     (cond [(> fuel 0)
-            (parameterize ([current-print-type-fuel (sub1 fuel)])
-              ;; if we still have fuel, print the expanded type and
-              ;; add the name to the ignored list so that the union
-              ;; printer does not try to print with the name.
-              (type->sexp (if (Name? type) (resolve type) type)
-                          (append names ignored-names)))]
-           [else
-            ;; to allow :type to cue the user on unexpanded aliases
-            (when (Union? type) ; only unions can be expanded
-              (set-box! (current-print-unexpanded)
-                        (cons (car names) (unbox (current-print-unexpanded)))))
-            (car names)])]
-    [(StructType: (Struct: nm _ _ _ _ _)) `(StructType ,(syntax-e nm))]
-    ;; this case occurs if the contained type is a type variable
-    [(StructType: ty) `(Struct-Type ,(t->s ty))]
-    [(StructTypeTop:) 'Struct-TypeTop]
-    [(StructTop: (Struct: nm _ _ _ _ _)) `(Struct ,(syntax-e nm))]
-    [(BoxTop:) 'BoxTop]
-    [(Weak-BoxTop:) 'Weak-BoxTop]
-    [(ChannelTop:) 'ChannelTop]
-    [(Async-ChannelTop:) 'Async-ChannelTop]
-    [(ThreadCellTop:) 'ThreadCellTop]
-    [(VectorTop:) 'VectorTop]
-    [(HashtableTop:) 'HashTableTop]
-    [(MPairTop:) 'MPairTop]
-    [(Prompt-TagTop:) 'Prompt-TagTop]
-    [(Continuation-Mark-KeyTop:) 'Continuation-Mark-KeyTop]
-    [(App: rator rands stx)
-     (list* (type->sexp rator) (map type->sexp rands))]
-    ;; Special cases for lists. Avoid printing with these cases if the
-    ;; element type refers to the Mu variable (otherwise it prints the
-    ;; type variable with no binding).
-    [(Listof: elem-ty var)
-     #:when (not (memq var (fv elem-ty)))
-     `(Listof ,(t->s elem-ty))]
-    [(MListof: elem-ty var)
-     #:when (not (memq var (fv elem-ty)))
-     `(MListof ,(t->s elem-ty))]
-    ;; format as a string to preserve reader abbreviations and primitive
-    ;; values like characters (when `display`ed)
-    [(Value: v) (format "~v" v)]
-    [(? tuple? t)
-     `(List ,@(map type->sexp (tuple-elems t)))]
-    [(Base: n cnt _ _) n]
-    [(Opaque: pred) `(Opaque ,(syntax->datum pred))]
-    [(Struct: nm       par (list (fld: t _ _) ...)       proc _ _)
-     `#(,(string->symbol (format "struct:~a" nm))
-        ,(map t->s t)
-        ,@(if proc (list (t->s proc)) null))]
-    [(Function: arities)
-     (parameterize ([current-print-type-fuel
-                     (sub1 (current-print-type-fuel))])
-       (case-lambda->sexp type))]
-    [(arr: _ _ _ _ _) `(arr ,(arr->sexp type))]
-    [(Vector: e) `(Vectorof ,(t->s e))]
-    [(HeterogeneousVector: e) `(Vector ,@(map t->s e))]
-    [(Box: e) `(Boxof ,(t->s e))]
-    [(Weak-Box: e) `(Weak-Boxof ,(t->s e))]
-    [(Future: e) `(Futureof ,(t->s e))]
-    [(Channel: e) `(Channelof ,(t->s e))]
-    [(Async-Channel: e) `(Async-Channelof ,(t->s e))]
-    [(ThreadCell: e) `(ThreadCellof ,(t->s e))]
-    [(Promise: e) `(Promise ,(t->s e))]
-    [(Ephemeron: e) `(Ephemeronof ,(t->s e))]
-    [(CustodianBox: e) `(CustodianBoxof ,(t->s e))]
-    [(Set: e) `(Setof ,(t->s e))]
-    [(Evt: r) `(Evtof ,(t->s r))]
-    [(Union: elems)
-     (define-values (covered remaining) (cover-union type ignored-names))
-     (cons 'U (append covered (map t->s remaining)))]
-    [(Pair: l r) `(Pairof ,(t->s l) ,(t->s r))]
-    [(ListDots: dty dbound) `(List ,(t->s dty) ... ,dbound)]
-    [(F: nm) nm]
-    ;; FIXME (Values are not types and shouldn't need to be considered here
-    [(AnyValues: (Top:)) 'AnyValues]
-    [(AnyValues: f) `(AnyValues : ,(filter->sexp f))]
-    [(Values: (list v)) v]
-    [(Values: (list v ...)) (cons 'values (map t->s v))]
-    [(ValuesDots: v dty dbound)
-     (cons 'values (append (map t->s v) (list (t->s dty) '... dbound)))]
-    [(Param: in out)
-     (if (equal? in out)
-         `(Parameterof ,(t->s in))
-         `(Parameterof ,(t->s in) ,(t->s out)))]
-    [(Hashtable: k v) `(HashTable ,(t->s k) ,(t->s v))]
-    [(Continuation-Mark-Keyof: rhs)
-     `(Continuation-Mark-Keyof ,(t->s rhs))]
-    [(Prompt-Tagof: body handler)
-     `(Prompt-Tagof ,(t->s body) ,(t->s handler))]
-    [(Poly-names: names body)
-     `(All ,names ,(t->s body))]
-    [(PolyDots-names: (list names ... dotted) body)
-     `(All ,(append names (list dotted '...)) ,(t->s body))]
-    ;; FIXME: should this print constraints too
-    [(PolyRow-names: names _ body)
-     `(All (,(car names) #:row) ,(t->s body))]
-    [(Mu: x (Syntax: (Union: (list
-                              (Base: 'Number _ _ _)
-                              (Base: 'Boolean _ _ _)
-                              (Base: 'Symbol _ _ _)
-                              (Base: 'String _ _ _)
-                              (Mu: var (Union: (list (Value: '())
-                                                     (Pair: (F: x) (F: var)))))
-                              (Mu: y (Union: (list (F: x)
-                                                   (Pair: (F: x) (F: y)))))
-                              (Vector: (F: x))
-                              (Box: (F: x))))))
-     'Syntax]
-    [(Mu-name: name body) `(Rec ,name ,(t->s body))]
-    [(B: idx) `(B ,idx)]
-    [(Syntax: t) `(Syntaxof ,(t->s t))]
-    [(Instance: (and (? has-name?) cls)) `(Instance ,(t->s cls))]
-    [(Instance: (? Class? cls)) (class->sexp cls #:object? #t)]
-    [(ClassTop:) 'ClassTop]
-    [(? Class?) (class->sexp type)]
-    [(Result: t (or (NoFilter:) (FilterSet: (Top:) (Top:))) (or (NoObject:) (Empty:))) (type->sexp t)]
-    [(Result: t fs (Empty:)) `(,(type->sexp t) : ,(filter->sexp fs))]
-    [(Result: t fs lo) `(,(type->sexp t) : ,(filter->sexp fs) : ,(object->sexp lo))]
-    [(MPair: s t) `(MPairof ,(t->s s) ,(t->s t))]
-    [(Refinement: parent p?)
-     `(Refinement ,(t->s parent) ,(syntax-e p?))]
-    [(Sequence: ts)
-     `(Sequenceof ,@(map t->s ts))]
-    [(Error:) 'Error]
-    [(fld: t a m) `(fld ,(type->sexp t))]
-    [else `(Unknown Type: ,(struct->vector type))]
-    ))
-
-
-
-(define-syntax (define-debug-printer stx)
-  (syntax-parse stx
-    [(_ debug-printer:id)
-     #:when (eq? printer-type 'debug)
-     #'(begin
-         (require racket/pretty)
-         (require mzlib/pconvert)
-
-         (define (converter v basic sub)
-           (define (gen-constructor sym)
-             (string->symbol (string-append "make-" (substring (symbol->string sym) 7))))
-           (match v
-             [(? Rep? rep)
-              `(,(gen-constructor (car (vector->list (struct->vector rep))))
-                ,@(map sub (Rep-values rep)))]
-             [_ (basic v)]))
-
-         (define (debug-printer v port write?)
-           ((if write? pretty-write pretty-print)
-            (parameterize ((current-print-convert-hook converter))
-              (print-convert v))
-            port)))]
-    [_ #'(begin)]))
-
-(define-debug-printer debug-printer)
-
-;; debug-pretty-format-type : Type -> String
-;; Debugging mode for pretty printing types, which just uses
-;; the debug printer above. Ignores kw argument. Only defined
-;; in debug printing mode.
-(define-syntax (define-debug-pretty-format-type stx)
-  (syntax-parse stx
-    [(_ debug-pretty-format-type:id)
-     (if (eq? printer-type 'debug)
-       #'(define (debug-pretty-format-type type #:indent [indent 0])
-           (define out (open-output-string))
-           (debug-printer type out #t)
-           (get-output-string out))
-       #'(void))]))
-
-(define-debug-pretty-format-type debug-pretty-format-type)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/remove-intersect.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/remove-intersect.rkt
deleted file mode 100644
index bdd8dba94d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/remove-intersect.rkt
+++ /dev/null
@@ -1,132 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         (rep type-rep rep-utils)
-         (types union subtype resolve utils)
-         racket/match)
-
-(provide (rename-out [*remove remove]) overlap)
-
-(define (simple-datum? v)
-  (or (null? v)
-      (symbol? v)
-      (number? v)
-      (boolean? v)
-      (pair? v)
-      (string? v)
-      (keyword? v)
-      (char? v)
-      (void? v)
-      (eof-object? v)))
-
-
-(define (overlap t1 t2)
-  (let ([ks (Type-key t1)] [kt (Type-key t2)])
-    (cond
-      [(type-equal? t1 t2) #t]
-      [(and (symbol? ks) (symbol? kt) (not (eq? ks kt))) #f]
-      [(and (symbol? ks) (pair? kt) (not (memq ks kt))) #f]
-      [(and (symbol? kt) (pair? ks) (not (memq kt ks))) #f]
-      [(and (pair? ks) (pair? kt)
-            (for/and ([i (in-list ks)]) (not (memq i kt))))
-       #f]
-      [else
-       (match (list t1 t2)
-         [(list (Univ:) _) #t]
-         [(list _ (Univ:)) #t]
-         [(list (F: _) _) #t]
-         [(list _ (F: _)) #t]
-         [(list (Opaque: _) _) #t]
-         [(list _ (Opaque: _)) #t]
-         [(list (Name/simple: n) (Name/simple: n*))
-          (or (free-identifier=? n n*)
-              (overlap (resolve-once t1) (resolve-once t2)))]
-         [(list _ (? Name?))
-           (overlap t1 (resolve-once t2))]
-         [(list (? Name?) _)
-           (overlap (resolve-once t1) t2)]
-         [(list (? Mu?) _) (overlap (unfold t1) t2)]
-         [(list _ (? Mu?)) (overlap t1 (unfold t2))]
-
-         [(list (Refinement: t _) t2) (overlap t t2)]
-         [(list t1 (Refinement: t _)) (overlap t1 t)]
-
-         [(list (Union: e) t)
-          (ormap (lambda (t*) (overlap t* t)) e)]
-         [(list t (Union: e))
-          (ormap (lambda (t*) (overlap t t*)) e)]
-         [(or (list _ (? Poly?)) (list (? Poly?) _))
-          #t] ;; these can have overlap, conservatively
-         [(list (Base: s1 _ _ _) (Base: s2 _ _ _)) (or (subtype t1 t2) (subtype t2 t1))]
-         [(list (Base: _ _ _ _) (Value: _)) (subtype t2 t1)] ;; conservative
-         [(list (Value: _) (Base: _ _ _ _)) (subtype t1 t2)] ;; conservative
-         [(list (Syntax: t) (Syntax: t*))
-          (overlap t t*)]
-         [(or (list (Syntax: _) _)
-              (list _ (Syntax: _)))
-          #f]
-         [(list (Base: _ _ _ _) _) #f]
-         [(list _ (Base: _ _ _ _)) #f]
-         [(list (Value: (? pair? v)) (Pair: _ _)) #t]
-         [(list (Pair: _ _) (Value: (? pair? v))) #t]
-         [(list (Pair: a b) (Pair: a* b*))
-          (and (overlap a a*)
-               (overlap b b*))]
-         ;; lots of things are sequences
-         [(list (Sequence: _) _) #t]
-         [(list _ (Sequence: _)) #t]
-         [(or (list (Pair: _ _) _)
-              (list _ (Pair: _ _)))
-          #f]
-         [(list (Value: (? simple-datum? v1))
-                (Value: (? simple-datum? v2)))
-          (equal? v1 v2)]
-         [(or (list (Value: (? simple-datum?))
-                    (or (? Struct?) (? StructTop?) (? Function?)))
-              (list (or (? Struct?) (? StructTop?) (? Function?))
-                    (Value: (? simple-datum?))))
-          #f]
-         [(list (Struct: n _ flds _ _ _)
-                (Struct: n* _ flds* _ _ _)) (=> nevermind)
-          (unless (free-identifier=? n n*) (nevermind))
-          (for/and ([f (in-list flds)] [f* (in-list flds*)])
-            (match* (f f*)
-              [((fld: t _ _) (fld: t* _ _)) (overlap t t*)]))]
-         [(list (Struct: n #f _ _ _ _)
-                (StructTop: (Struct: n* #f _ _ _ _))) (=> nevermind)
-          (unless (free-identifier=? n n*) (nevermind))
-          #t]
-         ;; n and n* must be different, so there's no overlap
-         [(list (Struct: n #f flds _ _ _)
-                (Struct: n* #f flds* _ _ _))
-          #f]
-         [(list (Struct: n #f flds _ _ _)
-                (StructTop: (Struct: n* #f flds* _ _ _)))
-          #f]
-         [(list (and t1 (Struct: _ _ _ _ _ _))
-                (and t2 (Struct: _ _ _ _ _ _)))
-          (or (subtype t1 t2) (subtype t2 t1))]
-         [else #t])])))
-
-
-;(trace overlap)
-
-;; also not yet correct
-;; produces old without the contents of rem
-(define (*remove old rem)
-  (define initial
-    (if (subtype old rem)
-        (Un) ;; the empty type
-        (match (list old rem)
-          [(list (or (App: _ _ _) (? Name?)) t)
-           ;; must be different, since they're not subtypes
-           ;; and n must refer to a distinct struct type
-           old]
-          [(list (Union: l) rem)
-           (apply Un (map (lambda (e) (*remove e rem)) l))]
-          [(list (? Mu? old) t) (*remove (unfold old) t)]
-          [(list (Poly: vs b) t) (make-Poly vs (*remove b rem))]
-          [_ old])))
-  (if (subtype old initial) old initial))
-
-;(trace *remove)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/resolve.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/resolve.rkt
deleted file mode 100644
index 8dc0774946..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/resolve.rkt
+++ /dev/null
@@ -1,163 +0,0 @@
-#lang racket/base
-(require "../utils/utils.rkt")
-
-(require (rep type-rep rep-utils)
-         (env type-name-env)
-         (utils tc-utils)
-         (types utils current-seen)
-         racket/match
-         (contract-req)
-         racket/format)
-
-(provide resolve-name resolve-app needs-resolving?
-         resolve resolve-app-check-error
-         resolver-cache-remove!
-         current-check-polymorphic-recursion)
-(provide/cond-contract [resolve-once (Type/c . -> . (or/c Type/c #f))])
-
-(define-struct poly (name vars) #:prefab)
-
-;; Parameter<Option<Listof<Symbol>>>
-;; This parameter controls whether or not the resolving process
-;; should check for polymorphic recursion in implicit recursive
-;; type names. This should only need to be enabled at type alias
-;; definition time.
-;;
-;; If not #f, it should be a list of symbols that correspond
-;; to the type parameters of the type being parsed.
-(define current-check-polymorphic-recursion (make-parameter #f))
-
-(define (resolve-name t)
-  (match t
-    [(Name/simple: n) (let ([t (lookup-type-name n)])
-                        (if (Type/c? t) t #f))]
-    [_ (int-err "resolve-name: not a name ~a" t)]))
-
-(define already-resolving? (make-parameter #f))
-
-
-(define (resolve-app-check-error rator rands stx)
-  (parameterize ([current-orig-stx stx])
-    (match rator
-      [(Poly-unsafe: n _)
-       (unless (= n (length rands))
-         (tc-error "wrong number of arguments to polymorphic type: expected ~a and got ~a"
-                   n (length rands)))]
-      [(Name/struct: n)
-       (when (and (current-poly-struct)
-                  (free-identifier=? n (poly-name (current-poly-struct))))
-        (define num-rands (length rands))
-        (define num-poly (length (poly-vars (current-poly-struct))))
-        ;; check arity of constructor first
-        (if (= num-rands num-poly)
-            (when (not (or (ormap Error? rands)
-                           (andmap type-equal? rands
-                                   (poly-vars (current-poly-struct)))))
-                  (tc-error (~a "Structure type constructor " rator
-                                " applied to non-regular arguments " rands)))
-            (tc-error (~a "The expected number of arguments for"
-                          " structure type constructor " rator
-                          " does not match the given number:"
-                          " expected " num-poly
-                          ", given " num-rands))))]
-      [(Name: _ args #f)
-       (cond [args
-              (define num-rands (length rands))
-              (define num-args (length args))
-              (unless (= num-rands num-args)
-                (tc-error (~a "The expected number of arguments for "
-                              rator " does not match the given number:"
-                              " expected " num-args
-                              ", given " num-rands)))
-              ;; Does not allow polymorphic recursion since both type
-              ;; inference and equirecursive subtyping for polymorphic
-              ;; recursion are difficult.
-              ;;
-              ;; Type inference is known to be undecidable in general, but
-              ;; practical algorithms do exist[1] that do not diverge in
-              ;; practice.
-              ;;
-              ;; It is possible that equirecursive subtyping with polymorphic
-              ;; recursion is as difficult as equivalence of DPDAs[2], which is
-              ;; known to be decidable[3], but good algorithms may not exist.
-              ;;
-              ;; [1] Fritz Henglein. "Type inference with polymorphic recursion"
-              ;;     TOPLAS 1993
-              ;; [2] Marvin Solomon. "Type definitions with parameters"
-              ;;     POPL 1978
-              ;; [3] Geraud Senizergues.
-              ;;     "L(A)=L(B)? decidability results from complete formal systems"
-              ;;     TCS 2001.
-              ;;
-              ;; check-argument : Type Id -> Void
-              ;; Check argument to make sure there's no polymorphic recursion
-              (define (check-argument given-type arg-name)
-                (define ok?
-                  (if (F? given-type)
-                      (type-equal? given-type (make-F (syntax-e arg-name)))
-                      (not (member (syntax-e arg-name) (fv given-type)))))
-                (unless ok?
-                  (tc-error (~a "Recursive type " rator " cannot be applied at"
-                                " a different type in its recursive invocation"))))
-              (define current-vars (current-check-polymorphic-recursion))
-              (when current-vars
-                (for-each check-argument rands current-vars))]
-             [else
-              (tc-error "Type ~a cannot be applied, arguments were: ~a" rator rands)])]
-      [(Mu: _ _) (void)]
-      [(App: _ _ _) (void)]
-      [(Error:) (void)]
-      [_ (tc-error/delayed "Type ~a cannot be applied, arguments were: ~a" rator rands)])))
-
-
-(define (resolve-app rator rands stx)
-  (parameterize ([current-orig-stx stx]
-                 [already-resolving? #t])
-    (resolve-app-check-error rator rands stx)
-    (match rator
-      [(? Name?)
-       (let ([r (resolve-name rator)])
-         (and r (resolve-app r rands stx)))]
-      [(Poly: _ _) (instantiate-poly rator rands)]
-      [(Mu: _ _) (resolve-app (unfold rator) rands stx)]
-      [(App: r r* s) (resolve-app (resolve-app r r* s) rands stx)]
-      [_ (tc-error "cannot apply a non-polymorphic type: ~a" rator)])))
-
-
-(define (needs-resolving? t)
-  (or (Mu? t) (App? t) (Name? t)))
-
-(define resolver-cache (make-hasheq))
-
-(define (resolve-once t)
-  (define seq (Rep-seq t))
-  (define r (hash-ref resolver-cache seq #f))
-  (or r
-      (let ([r* (match t
-                  [(Mu: _ _) (unfold t)]
-                  [(App: r r* s)
-                   (resolve-app r r* s)]
-                  [(? Name?) (resolve-name t)])])
-        (when (and r*
-                   (not (currently-subtyping?)))
-          (hash-set! resolver-cache seq r*))
-        r*)))
-
-;; resolver-cache-remove! : (Listof Type) -> Void
-;; Removes the given types from the resolver cache. This is
-;; only used by recursive type alias set-up, which sometimes needs to
-;; undo certain resolutions.
-(define (resolver-cache-remove! keys)
-  (for ([key (in-list keys)])
-    (hash-remove! resolver-cache (Rep-seq key))))
-
-;; Repeatedly unfolds Mu, App, and Name constructors until the top type
-;; constructor is not one of them.
-;; Type/c? -> Type/c?
-(define (resolve t)
-  (let loop ((t t))
-    (if (needs-resolving? t)
-        (loop (resolve-once t))
-        t)))
-
-;(trace resolve-app)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/struct-table.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/struct-table.rkt
deleted file mode 100644
index e1b524ff6a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/struct-table.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-
-(require racket/dict syntax/id-table racket/match
-         mzlib/pconvert racket/syntax
-         "../utils/utils.rkt"
-         (prefix-in c: (contract-req))
-         (rep type-rep filter-rep object-rep)
-         (utils tc-utils)
-         (env init-envs))
-
-(define struct-fn-table (make-free-id-table))
-(define struct-constructor-table (make-free-id-table))
-
-(define (add-struct-constructor! id) (dict-set! struct-constructor-table id #t))
-(define (struct-constructor? id) (dict-ref struct-constructor-table id #f))
-
-(define (add-struct-fn! id pe mut?) (dict-set! struct-fn-table id (list pe mut?)))
-
-(define-values (struct-accessor? struct-mutator?)
-  (let ()
-    (define ((mk mut?) id)
-      (cond [(dict-ref struct-fn-table id #f)
-             => (match-lambda [(list pe m) (and (eq? m mut?) pe)] [_ #f])]
-            [else #f]))
-    (values (mk #f) (mk #t))))
-
-(define (struct-fn-idx id)
-  (match (dict-ref struct-fn-table id #f)
-    [(list (StructPE: _ idx) _) idx]
-    [_ (int-err (format "no struct fn table entry for ~a" (syntax->datum id)))]))
-
-(define (make-struct-table-code)
-  (parameterize ([current-print-convert-hook converter]
-                 [show-sharing #f])
-    (define/with-syntax (adds ...)      
-      (for/list ([(k v) (in-dict struct-fn-table)]
-                 #:when (bound-in-this-module k))
-        (match v
-          [(list pe mut?)
-           #`(add-struct-fn! (quote-syntax #,k) #,(print-convert pe) #,mut?)])))
-    #'(begin adds ...)))
-
-(provide/cond-contract
- [add-struct-fn! (identifier? StructPE? boolean? . c:-> . c:any/c)]
- [add-struct-constructor! (identifier? . c:-> . c:any)]
- [struct-constructor? (identifier? . c:-> . boolean?)]
- [struct-accessor? (identifier? . c:-> . (c:or/c #f StructPE?))]
- [struct-mutator? (identifier? . c:-> . (c:or/c #f StructPE?))]
- [struct-fn-idx (identifier? . c:-> . exact-integer?)]
- [make-struct-table-code (c:-> syntax?)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/structural.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/structural.rkt
deleted file mode 100644
index 25ed42f3d4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/structural.rkt
+++ /dev/null
@@ -1,135 +0,0 @@
-#lang racket/base
-
-;; Module for providing recursive operations over types when the operation doesn't care about the
-;; type constructor.
-
-;; This file is meant to implement more general versions of type-case.
-;; Currently supported
-;; * Trivial type constructors (only have Rep? or (listof Rep?) fields)
-;; * A variance aware traversal of a Rep? with the return value having the same type constructor as
-;;    the input.
-;; To be added
-;; * Support for type constructors with non Rep? fields
-;; * Support for objects and filters
-;; * Support for smart constructors for the return value
-;; * Support for return values that are not Rep?
-;; * Parallel traversal of two types
-
-(require
-  "../utils/utils.rkt"
-  racket/match
-  (rep type-rep)
-  (for-syntax
-    racket/base
-    syntax/parse
-    racket/syntax))
-(provide
-  structural?
-  structural-map)
-
-
-(define-for-syntax structural-reps
-  #'([BoxTop ()]
-     [ChannelTop ()]
-     [Async-ChannelTop ()]
-     [ClassTop ()]
-     [Continuation-Mark-KeyTop ()]
-     [Error ()]
-     [HashtableTop ()]
-     [MPairTop ()]
-     [Prompt-TagTop ()]
-     [StructTypeTop ()]
-     [ThreadCellTop ()]
-     [Univ ()]
-     [VectorTop ()]
-
-     [CustodianBox (#:co)]
-     [Ephemeron (#:co)]
-     [Evt (#:co)]
-     [Future (#:co)]
-     [Instance (#:co)]
-     [Promise (#:co)]
-     [Set (#:co)]
-     [StructTop (#:co)]
-     [StructType (#:co)]
-     [Syntax (#:co)]
-     [Pair (#:co #:co)]
-     [Sequence ((#:listof #:co))]
-     [Function ((#:listof #:co))]
-
-     [Param (#:contra #:co)]
-
-     [Continuation-Mark-Keyof (#:inv)]
-     [Box (#:inv)]
-     [Channel (#:inv)]
-     [Async-Channel (#:inv)]
-     [ThreadCell (#:inv)]
-     [Vector (#:inv)]
-     [Hashtable (#:inv #:inv)]
-     [MPair (#:inv #:inv)]
-     [Prompt-Tagof (#:inv #:inv)]
-     [HeterogeneousVector ((#:listof #:inv))]
-
-     ;; Non Types
-     [Result (#:co #:co #:co)]
-     [Values ((#:listof #:co))]
-     [AnyValues (#:co)]))
-
-(begin-for-syntax
-  (define-syntax-class type-name
-    #:attributes (pred? matcher: maker)
-    (pattern t:id
-      #:with pred? (format-id #'t "~a?" #'t)
-      #:with matcher: (format-id #'t "~a:" #'t)
-      #:with maker (format-id #'t "make-~a" #'t))))
-
-(begin-for-syntax
-  (define-syntax-class type-variance
-    #:attributes (sym)
-    (pattern #:co #:with sym 'co)
-    (pattern #:inv #:with sym 'inv)
-    (pattern #:contra #:with sym 'contra))
-
-  (define-syntax-class type-field
-    (pattern var:type-variance)
-    (pattern (#:listof var:type-variance))))
-
-
-
-(define-syntax (gen-structural? stx)
-  (syntax-parse structural-reps
-   [([type:type-name (field:type-field ...)] ...)
-    #'(lambda (t)
-        (or (type.pred? t) ...))]))
-
-;; Returns true if the type/filter/object supports structural operations.
-(define structural? (gen-structural?))
-
-
-(define-syntax (gen-structural-map stx)
-  (syntax-parse stx
-   [(_ input-type:id recur-f:id)
-    (define-syntax-class type-field*
-      #:attributes (recur)
-      (pattern var:type-variance
-        #:with recur #'(λ (t) (recur-f t 'var.sym)))
-      (pattern (#:listof var:type-variance)
-        #:with recur #'(λ (ts) (for/list ([t (in-list ts)]) (recur-f t 'var.sym)))))
-
-    (define-syntax-class type-clause
-      #:attributes (match-clause)
-      (pattern [type:type-name (field:type-field* ...)]
-        #:with (field-pat ...) (generate-temporaries #'(field ...))
-        #:with match-clause
-          #'[(type.matcher: field-pat ...)
-             (type.maker (field.recur field-pat) ...)]))
-
-    (syntax-parse structural-reps
-     [(:type-clause ...)
-       #'(match input-type match-clause ...)])]))
-
-;; Rep? (-> Rep? (or/c 'co 'contra 'inv) Rep?) -> Rep?
-;; Calls `f` on each sub-type with the corresponding variance of the sub-type and combines the results
-;; using the type constructor of the input type
-(define (structural-map t f)
-  (gen-structural-map t f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/substitute.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/substitute.rkt
deleted file mode 100644
index 49bfeb42bb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/substitute.rkt
+++ /dev/null
@@ -1,191 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         racket/match racket/set
-         racket/lazy-require
-         (contract-req)
-         (only-in (types base-abbrev) -Tuple* -lst -Null -result ManyUniv)
-         (rep type-rep rep-utils)
-         (utils tc-utils)
-         (rep free-variance)
-         (env tvar-env))
-(lazy-require ("union.rkt" (Un)))
-
-(provide subst-all substitute substitute-dots substitute-dotted subst
-         (struct-out t-subst) (struct-out i-subst)
-         (struct-out i-subst/starred) (struct-out i-subst/dotted)
-         make-simple-substitution)
-(provide-for-cond-contract substitution/c)
-
-(define-struct/cond-contract subst-rhs () #:transparent)
-(define-struct/cond-contract (t-subst subst-rhs) ([type Type/c]) #:transparent)
-(define-struct/cond-contract (i-subst subst-rhs) ([types (listof Type/c)]) #:transparent)
-(define-struct/cond-contract (i-subst/starred subst-rhs) ([types (listof Type/c)] [starred Type/c]) #:transparent)
-(define-struct/cond-contract (i-subst/dotted subst-rhs) ([types (listof Type/c)] [dty Type/c] [dbound symbol?]) #:transparent)
-
-(define-for-cond-contract substitution/c (hash/c symbol? subst-rhs? #:immutable #t))
-(define-for-cond-contract simple-substitution/c (hash/c symbol? Type/c #:immutable #t))
-
-(define (subst v t e) (substitute t v e))
-
-(define/cond-contract (make-simple-substitution vs ts)
-  (([vs (listof symbol?)] [ts (listof Type/c)]) ()
-   #:pre (vs ts) (= (length vs) (length ts))
-    . ->i . [_ substitution/c])
-  (for/hash ([v (in-list vs)] [t (in-list ts)])
-    (values v (t-subst t))))
-
-;; TODO: Figure out if free var checking/short circuiting is actually a performance improvement.
-
-;; substitute-many : Hash[Name,Type] Type -> Type
-(define/cond-contract (substitute-many subst target)
-  (simple-substitution/c Type? . -> .  Type?)
-  (define (sb t) (substitute-many subst t))
-  (define names (hash-keys subst))
-  (define fvs (free-vars* target))
-  (if (ormap (lambda (name) (free-vars-has-key? fvs name)) names)
-      (type-case (#:Type sb #:Filter (sub-f sb) #:Object (sub-o sb))
-                 target
-                 [#:Union tys (apply Un (map sb tys))]
-                 [#:F name (hash-ref subst name target)]
-                 [#:arr dom rng rest drest kws
-                        (cond
-                          [(and (pair? drest)
-                                (ormap (λ (name)
-                                          (and (equal? name (cdr drest))
-                                               (not (bound-tvar? name))
-                                               name))
-                                       names))
-                           =>
-                           (lambda (name)
-                             (int-err "substitute used on ... variable ~a in type ~a" name target))]
-                          [else
-                           (make-arr (map sb dom)
-                                     (sb rng)
-                                     (and rest (sb rest))
-                                     (and drest (cons (sb (car drest)) (cdr drest)))
-                                     (map sb kws))])]
-                 [#:ValuesDots types dty dbound
-                               (cond
-                                 [(ormap (lambda (x) (and (equal? dbound x) (not (bound-tvar? x)))) names) =>
-                                  (lambda (name)
-                                    (int-err "substitute used on ... variable ~a in type ~a" name target))]
-                                 [else (make-ValuesDots (map sb types) (sb dty) dbound)])]
-                 [#:ListDots dty dbound
-                             (cond
-                               [(ormap (lambda (x) (and (equal? dbound x) (not (bound-tvar? x)))) names) =>
-                                (lambda (name)
-                                  (int-err "substitute used on ... variable ~a in type ~a" name target))]
-                               [else (make-ListDots (sb dty) dbound)])])
-      target))
-
-
-;; substitute : Type Name Type -> Type
-(define/cond-contract (substitute image name target)
-  (Type/c symbol? Type? . -> . Type?)
-  (substitute-many (hash name image) target))
-
-;; implements angle bracket substitution from the formalism
-;; substitute-dots : Listof[Type] Option[type] Name Type -> Type
-(define/cond-contract (substitute-dots images rimage name target)
-  ((listof Type/c) (or/c #f Type/c) symbol? Type?  . -> . Type?)
-  (define (sb t) (substitute-dots images rimage name t))
-  (if (or (set-member? (free-vars-names (free-idxs* target)) name)
-          (set-member? (free-vars-names (free-vars* target)) name))
-      (type-case (#:Type sb #:Filter (sub-f sb)) target
-                 [#:ListDots dty dbound
-                             (if (eq? name dbound)
-                                 ;; We need to recur first, just to expand out any dotted usages of this.
-                                 (let ([expanded (sb dty)])
-                                   (for/fold ([t (if rimage (-lst rimage) -Null)])
-                                     ([img (in-list (reverse images))])
-                                     (make-Pair (substitute img name expanded) t)))
-                                 (make-ListDots (sb dty) dbound))]
-                 [#:ValuesDots types dty dbound
-                               (if (eq? name dbound)
-                                   (if rimage
-                                       ManyUniv
-                                       (make-Values
-                                        (append
-                                         (map sb types)
-                                         ;; We need to recur first, just to expand out any dotted usages of this.
-                                         (let ([expanded (sb dty)])
-                                           (for/list ([img (in-list images)])
-                                             (-result (substitute img name expanded)))))))
-                                   (make-ValuesDots (map sb types) (sb dty) dbound))]
-                 [#:arr dom rng rest drest kws
-                        (if (and (pair? drest)
-                                 (eq? name (cdr drest)))
-                            (make-arr (append
-                                       (map sb dom)
-                                       ;; We need to recur first, just to expand out any dotted usages of this.
-                                       (let ([expanded (sb (car drest))])
-                                         (map (lambda (img) (substitute img name expanded)) images)))
-                                      (sb rng)
-                                      rimage
-                                      #f
-                                      (map sb kws))
-                            (make-arr (map sb dom)
-                                      (sb rng)
-                                      (and rest (sb rest))
-                                      (and drest (cons (sb (car drest)) (cdr drest)))
-                                      (map sb kws)))])
-      target))
-
-;; implements curly brace substitution from the formalism, with the addition
-;; that a substitution can include fixed args in addition to a different dotted arg
-;; substitute-dotted : Listof[Type] Type Name Name Type -> Type
-(define (substitute-dotted pre-image image image-bound name target)
-  (define (sb t) (substitute-dotted pre-image image image-bound name t))
-  ;; We do a quick check on the free variables to see if we can short circuit the substitution
-  (if (or (set-member? (free-vars-names (free-idxs* target)) name)
-          (set-member? (free-vars-names (free-vars* target)) name))
-      (type-case (#:Type sb #:Filter (sub-f sb))
-                 target
-                 [#:ValuesDots types dty dbound
-                               (let ([extra-types (if (eq? name dbound) pre-image null)])
-                                 (make-ValuesDots (append (map sb types) (map -result extra-types))
-                                                  (sb dty)
-                                                  (if (eq? name dbound) image-bound dbound)))]
-                 [#:ListDots dty dbound
-                             (-Tuple*
-                               (if (eq? name dbound) pre-image null)
-                               (make-ListDots (sb dty)
-                                              (if (eq? name dbound) image-bound dbound)))]
-                 [#:F name*
-                      (if (eq? name* name)
-                          image
-                          target)]
-                 [#:arr dom rng rest drest kws
-                        (let ([extra-types (if (and drest (eq? name (cdr drest))) pre-image null)])
-                          (make-arr (append (map sb dom) extra-types)
-                                    (sb rng)
-                                    (and rest (sb rest))
-                                    (and drest
-                                         (cons (substitute image (cdr drest) (sb (car drest)))
-                                               (if (eq? name (cdr drest)) image-bound (cdr drest))))
-                                    (map sb kws)))])
-       target))
-
-;; substitute many variables
-;; subst-all : substitution/c Type -> Type
-(define/cond-contract (subst-all s ty)
-  (substitution/c Type? . -> . Type?)
-
-  (define t-substs
-    (for/fold ([acc (hash)]) ([(v r) (in-hash s)])
-      (match r
-        [(t-subst img)
-         (hash-set acc v img)]
-        [_ acc])))
-  (define t-substed-ty (substitute-many t-substs ty))
-
-  (for/fold ([t t-substed-ty]) ([(v r) (in-hash s)])
-    (match r
-      [(t-subst img) t]
-      [(i-subst imgs)
-       (substitute-dots imgs #f v t)]
-      [(i-subst/starred imgs rest)
-       (substitute-dots imgs rest v t)]
-      [(i-subst/dotted imgs dty dbound)
-       (substitute-dotted imgs dty dbound v t)])))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/subtype.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/subtype.rkt
deleted file mode 100644
index cbdca73cf8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/subtype.rkt
+++ /dev/null
@@ -1,693 +0,0 @@
-#lang racket/base
-(require (except-in "../utils/utils.rkt" infer)
-         racket/match racket/function racket/lazy-require racket/list
-         (prefix-in c: (contract-req))
-         (rep type-rep filter-rep object-rep rep-utils)
-         (utils tc-utils early-return)
-         (types utils resolve base-abbrev match-expanders
-                numeric-tower substitute current-seen)
-         (for-syntax racket/base syntax/parse unstable/sequence))
-
-(lazy-require
-  ("union.rkt" (Un))
-  ("../infer/infer.rkt" (infer)))
-
-(define subtype-cache (make-hash))
-
-(define-syntax-rule (handle-failure e)
-  e)
-
-;; is s a subtype of t?
-;; type type -> boolean
-(define/cond-contract (subtype s t)
-  (c:-> (c:or/c Type/c SomeValues/c) (c:or/c Type/c SomeValues/c) boolean?)
-  (and (subtype* (current-seen) s t) #t))
-
-;; are all the s's subtypes of all the t's?
-;; [type] [type] -> boolean
-(define (subtypes s t) (and (subtypes* (current-seen) s t) #t))
-
-;; check subtyping for two lists of types
-;; List[(cons Number Number)] listof[type] listof[type] -> Opt[List[(cons Number Number)]]
-(define (subtypes* A ss ts)
-  (cond [(and (null? ss) (null? ts) A)]
-        [(or (null? ss) (null? ts)) #f]
-        [(subtype* A (car ss) (car ts))
-         =>
-         (lambda (A*) (subtypes* A* (cdr ss) (cdr ts)))]
-        [else #f]))
-
-;; check if s is a supertype of any element of ts
-(define (supertype-of-one/arr A s ts)
-  (ormap (lambda (e) (arr-subtype*/no-fail A e s)) ts))
-
-(define-syntax (let*/and stx)
-  (syntax-parse stx
-    [(_ () . e) (syntax/loc stx (let () . e))]
-    [(_ ([id expr] . rest) . body)
-     (syntax/loc stx
-       (let ([id expr])
-         (and id (let*/and rest . body))))]))
-
-;; do notation for the subtyping monad
-(define-syntax (subtype-seq stx)
-  (define-syntax-class sub*
-    (pattern e:expr))
-  (syntax-parse stx
-    [(_ init (s:sub* . args) ...+)
-     (with-syntax ([(A* ... A-last) (generate-temporaries #'(s ...))])
-       (with-syntax ([(clauses ...)
-                      (for/list ([s (in-syntax #'(s ...))]
-                                 [args (in-syntax #'(args ...))]
-                                 [A (in-syntax #'(init A* ...))]
-                                 [A-next (in-syntax #'(A* ... A-last))])
-                         #`[#,A-next (#,s #,A . #,args)])])
-        (syntax/loc stx (let*/and (clauses ...)
-			   A-last))))]))
-
-;; kw-subtypes : (Listof (Pairof Num Num)) (Listof Keyword) (Listof Keyword)
-;;               -> (Option (Listof (Pairof Num Num)))
-;;
-;; Given function types F_s and F_t, this procedure is called to check that the
-;; keyword types s-kws for F_s are subtypes of the keyword types t-kws for F_t
-;; when checking that F_s <: F_t (but *not* F_t <: F_s).
-;;
-;; Note that in terms of width, s-kws may have more keywords (i.e., F_s accepts
-;; all keywords that F_t does) but the types in s-kws must be supertypes of those
-;; in t-kws (i.e., F_s domain types are at least as permissive as those of F_t).
-(define (kw-subtypes* A0 s-kws t-kws)
-  (let loop ([A A0] [s s-kws] [t t-kws])
-    (and
-     A
-     (match* (s t)
-       [((cons (Keyword: ks ts rs) rest-s) (cons (Keyword: kt tt rt) rest-t))
-	(cond [(eq? kt ks)
-	       (and ;; if t is optional, s must be as well
-		(or rt (not rs))
-		(loop (subtype* A tt ts) rest-s rest-t))]
-	      ;; optional extra keywords in s are ok
-	      ;; we just ignore them
-	      [(and (not rs) (keyword<? ks kt)) (loop A rest-s t)]
-	      ;; extra keywords in t are a problem
-	      [else #f])]
-       ;; no more keywords to satisfy, the rest in t must be optional
-       [(_ '()) (and (andmap (match-lambda [(Keyword: _ _ rs) (not rs)]) s) A)]
-       ;; we failed to satisfy all the keyword
-       [(_ _) #f]))))
-
-;; simple co/contra-variance for ->
-(define (arr-subtype*/no-fail A0 s t)
-    (match* (s t)
-      ;; the really simple case
-      [((arr: s1 s2 #f #f '())
-        (arr: t1 t2 #f #f '()))
-       (subtype-seq A0
-                    (subtypes* t1 s1)
-                    (subtype* s2 t2))]
-      [((arr: s1 s2 #f #f s-kws)
-        (arr: t1 t2 #f #f t-kws))
-       (subtype-seq A0
-                    (subtypes* t1 s1)
-                    (kw-subtypes* s-kws t-kws)
-                    (subtype* s2 t2))]
-      [((arr: s-dom s-rng s-rest #f s-kws)
-        (arr: t-dom t-rng #f #f t-kws))
-       (subtype-seq A0
-                    (subtypes*/varargs t-dom s-dom s-rest)
-                    (kw-subtypes* s-kws t-kws)
-                    (subtype* s-rng t-rng))]
-      [((arr: s-dom s-rng #f #f s-kws)
-        (arr: t-dom t-rng t-rest #f t-kws))
-       #f]
-      [((arr: s-dom s-rng s-rest #f s-kws)
-        (arr: t-dom t-rng t-rest #f t-kws))
-       (subtype-seq A0
-                    (subtypes*/varargs t-dom s-dom s-rest)
-                    (subtype* t-rest s-rest)
-                    (kw-subtypes* s-kws t-kws)
-                    (subtype* s-rng t-rng))]
-      ;; handle ... varargs when the bounds are the same
-      [((arr: s-dom s-rng #f (cons s-drest dbound) s-kws)
-        (arr: t-dom t-rng #f (cons t-drest dbound) t-kws))
-       (subtype-seq A0
-                    (subtype* t-drest s-drest)
-                    (subtypes* t-dom s-dom)
-                    (kw-subtypes* s-kws t-kws)
-                    (subtype* s-rng t-rng))]
-      [(_ _) #f]))
-
-;; check subtyping of filters, so that predicates subtype correctly
-(define (filter-subtype* A0 s t)
-  (match* (s t)
-   [(f f) A0]
-   [((Bot:) t) A0]
-   [(s (Top:)) A0]
-   [(_ _) #f]))
-
-(define (subtypes/varargs args dom rst)
-  (handle-failure (and (subtypes*/varargs null args dom rst) #t)))
-
-(define (subtypes*/varargs A0 argtys dom rst)
-  (let loop-varargs ([dom dom] [argtys argtys] [A A0])
-    (cond
-      [(not A) #f]
-      [(and (null? dom) (null? argtys)) A]
-      [(null? argtys) #f]
-      [(and (null? dom) rst)
-       (cond [(subtype* A (car argtys) rst) => (lambda (A) (loop-varargs dom (cdr argtys) A))]
-             [else #f])]
-      [(null? dom) #f]
-      [(subtype* A (car argtys) (car dom)) => (lambda (A) (loop-varargs (cdr dom) (cdr argtys) A))]
-      [else #f])))
-
-;(trace subtypes*/varargs)
-
-(define/cond-contract (combine-arrs arrs)
-  (c:-> (c:listof arr?) (c:or/c #f arr?))
-  (match arrs
-    [(list (and a1 (arr: dom1 rng1 #f #f '())) (arr: dom rng #f #f '()) ...)
-     (cond
-       [(null? dom) (make-arr dom1 rng1 #f #f '())]
-       [(not (apply = 1 (length dom1) (map length dom))) #f]
-       [(not (for/and ([rng2 (in-list rng)]) (type-equal? rng1 rng2)))
-        #f]
-       [else (make-arr (apply map Un (cons dom1 dom)) rng1 #f #f '())])]
-    [_ #f]))
-
-(define-match-expander NameStruct:
-  (lambda (stx)
-    (syntax-case stx ()
-      [(_ i)
-       #'(or (and (Name/struct:)
-                  (app resolve-once (? Struct? i)))
-             (App: (and (Name/struct:)
-                        (app resolve-once (Poly: _ (? Struct? i))))
-                   _ _))])))
-
-(define (subtype/flds* A flds flds*)
-  (for/fold ([A A]) ([f (in-list flds)] [f* (in-list flds*)] #:break (not A))
-    (and
-     A
-     (match* (f f*)
-       [((fld: t _ #t) (fld: t* _ #t))
-	(subtype-seq A
-		     (subtype* t* t)
-		     (subtype* t t*))]
-       [((fld: t _ #f) (fld: t* _ #f))
-	(subtype* A t t*)]
-       [(_ _) #f]))))
-
-(define (unrelated-structs s1 s2)
-  (define (in-hierarchy? s par)
-    (define s-name
-      (match s
-        [(Poly: _ (Struct: s-name _ _ _ _ _)) s-name]
-        [(Struct: s-name _ _ _ _ _) s-name]))
-    (define p-name
-      (match par
-        [(Poly: _ (Struct: p-name _ _ _ _ _)) p-name]
-        [(Struct: p-name _ _ _ _ _) p-name]))
-    (or (free-identifier=? s-name p-name)
-        (match s
-          [(Poly: _ (? Struct? s*)) (in-hierarchy? s* par)]
-          [(Struct: _ (and (Name/struct:) p) _ _ _ _)
-           (in-hierarchy? (resolve-once p) par)]
-          [(Struct: _ (? Struct? p) _ _ _ _) (in-hierarchy? p par)]
-          [(Struct: _ (Poly: _ p) _ _ _ _) (in-hierarchy? p par)]
-          [(Struct: _ #f _ _ _ _) #f]
-          [_ (int-err "wtf is this? ~a" s)])))
-  (not (or (in-hierarchy? s1 s2) (in-hierarchy? s2 s1))))
-
-(define/cond-contract (type-equiv? A0 s t)
-  (c:-> list? Type? Type? c:any/c)
-  (subtype-seq A0
-	       (subtype* s t)
-	       (subtype* t s)))
-
-(define bottom-key (Rep-seq -Bottom))
-(define top-key (Rep-seq Univ))
-
-;; the algorithm for recursive types transcribed directly from TAPL, pg 305
-;; List[(cons Number Number)] type type -> List[(cons Number Number)] or #f
-;; is s a subtype of t, taking into account previously seen pairs A
-(define/cond-contract (subtype* A s t)
-  (c:-> (c:listof (c:cons/c fixnum? fixnum?)) Type? Type? c:any/c)
-  (define ss (unsafe-Rep-seq s))
-  (define st (unsafe-Rep-seq t))
-  (early-return
-   #:return-when (or (eq? ss st) (seen? ss st A)) A
-   (define cr (hash-ref subtype-cache (cons ss st) 'missing))
-   #:return-when (boolean? cr) (and cr A)
-   (define ks (unsafe-Type-key s))
-   (define kt (unsafe-Type-key t))
-   #:return-when (and (symbol? ks) (symbol? kt) (not (eq? ks kt))) #f
-   #:return-when (and (symbol? ks) (pair? kt) (not (memq ks kt))) #f
-   #:return-when 
-   (and (pair? ks) (pair? kt)
-        (for/and ([i (in-list ks)]) (not (memq i kt))))
-   #f
-   #:return-when (eq? ss bottom-key) A
-   #:return-when (eq? st top-key) A
-   (define A0 (remember s t A))
-   (define r
-     ;; FIXME -- make this go into only the places that need it -- slows down new-metrics.rkt significantly
-     (update-current-seen A0
-       (match* (s t)
-         ;; these cases are above as special cases
-         ;; [((Union: (list)) _) A0] ;; this is extremely common, so it goes first
-         ;; [(_ (Univ:)) A0]
-         ;; error is top and bot
-         [(_ (Error:)) A0]
-         [((Error:) _) A0]
-         ;; (Un) is bot
-         [(_ (Union: (list))) #f]
-         ;; value types
-         [((Value: v1) (Value: v2))
-          #:when (equal? v1 v2) A0]
-         ;; values are subtypes of their "type"
-         [((Value: v) (Base: _ _ pred _)) (if (pred v) A0 #f)]
-         ;; tvars are equal if they are the same variable
-         [((F: t) (F: t*)) (if (eq? t t*) A0 #f)]
-         ;; Avoid needing to resolve things that refer to different structs.
-         ;; Saves us from non-termination
-         ;; Must happen *before* the sequence cases, which sometimes call `resolve' in match expanders
-         [((or (? Struct? s1) (NameStruct: s1)) (or (? Struct? s2) (NameStruct: s2)))
-          #:when (unrelated-structs s1 s2)
-          #f]
-         ;; similar case for structs and base types, which are obviously unrelated
-         [((Base: _ _ _ _) (or (? Struct? s1) (NameStruct: s1)))
-          #f]
-         [((or (? Struct? s1) (NameStruct: s1)) (Base: _ _ _ _))
-          #f]
-         ;; same for all values.
-         [((Value: (? (negate struct?) _)) (or (? Struct? s1) (NameStruct: s1)))
-          #f]
-         [((or (? Struct? s1) (NameStruct: s1)) (Value: (? (negate struct?) _)))
-          #f]
-         ;; sequences are covariant
-         [((Sequence: ts) (Sequence: ts*))
-          (subtypes* A0 ts ts*)]
-         [((Listof: t) (Sequence: (list t*)))
-          (subtype* A0 t t*)]
-         [((Pair: t1 t2) (Sequence: (list t*)))
-          (subtype-seq A0 (subtype* t1 t*) (subtype* t2 (-lst t*)))]
-         [((MListof: t) (Sequence: (list t*)))
-          (subtype* A0 t t*)]
-         ;; To check that mutable pair is a sequence we check that the cdr
-         ;; is both an mutable list and a sequence
-         [((MPair: t1 t2) (Sequence: (list t*)))
-          (subtype-seq A0
-                       (subtype* t1 t*)
-                       (subtype* t2 (simple-Un -Null (make-MPairTop)))
-                       (subtype* t2 t))]
-         ;; Note: this next case previously used the List: match expander, but
-         ;;       using that would cause an infinite loop in certain cases
-         ;;       (i.e., Struct types, see PR 14364) because the expander
-         ;;       uses `resolve`. This is not normally a problem, but during
-         ;;       subtyping it's dangerous to call functions that can cause
-         ;;       substitution and thus more subtyping checks.
-         ;;
-         ;;       Instead, we can just check for Null here since combined with
-         ;;       the Pair: case above and resolution of types like Mu, all the
-         ;;       List: cases should be covered.
-         [((Value: '()) (Sequence: (list t*))) A0]
-         [((HeterogeneousVector: ts) (Sequence: (list t*)))
-          (subtypes* A0 ts (map (λ (_) t*) ts))]
-         [((Vector: t) (Sequence: (list t*)))
-          (subtype* A0 t t*)]
-         [((Base: 'FlVector _ _ _) (Sequence: (list t*)))
-          (subtype* A0 -Flonum t*)]
-         [((Base: 'ExtFlVector _ _ _) (Sequence: (list t*)))
-          (subtype* A0 -ExtFlonum t*)]
-         [((Base: 'FxVector _ _ _) (Sequence: (list t*)))
-          (subtype* A0 -Fixnum t*)]
-         [((Base: 'String _ _ _) (Sequence: (list t*)))
-          (subtype* A0 -Char t*)]
-         [((Base: 'Bytes _ _ _) (Sequence: (list t*)))
-          (subtype* A0 -Byte t*)]
-         [((Base: 'Input-Port _ _ _) (Sequence: (list t*)))
-          (subtype* A0 -Nat t*)]
-         [((Value: (? exact-nonnegative-integer? n)) (Sequence: (list t*)))
-          (define possibilities
-            (list
-             (list byte? -Byte)
-             (list portable-index? -Index)
-             (list portable-fixnum? -NonNegFixnum)
-             (list values -Nat)))
-          (define type
-            (for/or ((pred-type (in-list possibilities)))
-              (match pred-type
-                ((list pred? type)
-                 (and (pred? n) type)))))
-          (subtype* A0 type t*)]
-         [((Base: _ _ _ #t) (Sequence: (list t*)))
-          (define type
-            ;; FIXME: thread the store through here
-            (for/or ((t (in-list (list -Byte -Index -NonNegFixnum -Nat))))
-              (or (and (subtype* A0 s t) t))))
-          (if type
-              (subtype* A0 type t*)
-              #f)]
-         [((Hashtable: k v) (Sequence: (list k* v*)))
-          (subtypes* A0 (list k v) (list k* v*))]
-         [((Set: t) (Sequence: (list t*)))
-          (subtype* A0 t t*)]
-         ;; special-case for case-lambda/union with only one argument              
-         [((Function: arr1) (Function: (list arr2)))
-          (cond [(null? arr1) #f]
-                [else
-                 (define comb (combine-arrs arr1))
-                 (or (and comb (arr-subtype*/no-fail A0 comb arr2))
-                     (supertype-of-one/arr A0 arr2 arr1))])]
-         ;; case-lambda
-         [((Function: arr1) (Function: arr2))
-          (if (null? arr1) #f
-              (let loop-arities ([A* A0]
-                                 [arr2 arr2])
-                (cond
-                  [(null? arr2) A*]
-                  [(supertype-of-one/arr A* (car arr2) arr1) => (lambda (A) (loop-arities A (cdr arr2)))]
-                  [else #f])))]
-         ;; recur structurally on pairs
-         [((Pair: a d) (Pair: a* d*))
-          (subtypes* A0 (list a d) (list a* d*))]
-         ;; recur structurally on dotted lists, assuming same bounds
-         [((ListDots: s-dty dbound) (ListDots: t-dty dbound*))
-          (and (eq? dbound dbound*)
-               (subtype* A0 s-dty t-dty))]
-         ;; For dotted lists and regular lists, we check that (All (dbound) s-dty) is a subtype
-         ;; of t-elem, so that no matter what dbound is instatiated with s-dty is still a subtype
-         ;; of t-elem. We cannot just replace dbound with Univ because of variance issues.
-         [((ListDots: s-dty dbound) (Listof: t-elem))
-          (subtype* A0 (-poly (dbound) s-dty) t-elem)]
-         ;; quantification over two types preserves subtyping
-         [((Poly: ns b1) (Poly: ms b2))               
-          #:when (= (length ns) (length ms))
-          ;; substitute ns for ms in b2 to make it look like b1
-          (subtype* A0 b1 (subst-all (make-simple-substitution ms (map make-F ns)) b2))]
-         [((PolyDots: (list ns ... n-dotted) b1)
-           (PolyDots: (list ms ... m-dotted) b2))
-          (cond
-            [(< (length ns) (length ms))
-             (define-values (short-ms rest-ms) (split-at ms (length ns)))
-             ;; substitute ms for ns in b1 to make it look like b2
-             (define subst
-               (hash-set (make-simple-substitution ns (map make-F short-ms))
-                         n-dotted (i-subst/dotted (map make-F rest-ms) (make-F m-dotted) m-dotted)))
-             (subtype* A0 (subst-all subst b1) b2)]
-            [else
-             (define-values (short-ns rest-ns) (split-at ns (length ms)))
-             ;; substitute ns for ms in b2 to make it look like b1
-             (define subst
-               (hash-set (make-simple-substitution ms (map make-F short-ns))
-                         m-dotted (i-subst/dotted (map make-F rest-ns) (make-F n-dotted) n-dotted)))
-             (subtype* A0 b1 (subst-all subst b2))])]
-         [((PolyDots: (list ns ... n-dotted) b1)
-           (Poly: (list ms ...) b2))
-          #:when (<= (length ns) (length ms))
-          ;; substitute ms for ns in b1 to make it look like b2
-          (define subst
-            (hash-set (make-simple-substitution ns (map make-F (take ms (length ns))))
-                      n-dotted (i-subst (map make-F (drop ms (length ns))))))
-          (subtype* A0 (subst-all subst b1) b2)]
-         [((Refinement: par _) t)
-          (subtype* A0 par t)]
-         ;; use unification to see if we can use the polytype here
-         [((Poly: vs b) s)
-          #:when (infer vs null (list b) (list s) Univ)
-          A0]
-         [((PolyDots: (list vs ... vdotted) b) s)
-          #:when (infer vs (list vdotted) (list b) (list s) Univ)
-          A0]
-         [(s (or (Poly: vs b) (PolyDots: vs b)))
-          #:when (null? (fv b))
-          (subtype* A0 s b)]
-         ;; rec types, applications and names (that aren't the same)
-         [((? needs-resolving? s) other)
-          (let ([s* (resolve-once s)])
-            (if (Type/c? s*) ;; needed in case this was a name that hasn't been resolved yet
-                (subtype* A0 s* other)
-                #f))]
-         [(other (? needs-resolving? t))
-          (let ([t* (resolve-once t)])
-            (if (Type/c? t*) ;; needed in case this was a name that hasn't been resolved yet
-                (subtype* A0 other t*)
-                #f))]
-         ;; for unions, we check the cross-product
-         ;; some special cases for better performance
-         ;; first, if both types are numeric, they will be built from the same base types
-         ;; so we can check for simple set inclusion of the union components
-         [((Base: _ _ _ #t) (Union: l2))
-          #:when (eq? kt 'number)
-          (and (memq s l2) A0)]
-         [((Union: l1) (Union: l2))
-          #:when (and (eq? ks 'number) (eq? kt 'number))
-          ;; l1 should be a subset of l2
-          ;; since union elements are sorted, a linear scan works
-          (let loop ([l1 l1] [l2 l2])
-            (cond [(null? l1)
-                   A0]
-                  [(null? l2)
-                   #f]
-                  [(eq? (car l1) (car l2))
-                   (loop (cdr l1) (cdr l2))]
-                  [else
-                   (loop l1 (cdr l2))]))]
-         [((Union: es) t)
-          (and 
-           (for/and ([elem (in-list es)])
-             (subtype* A0 elem t))
-           A0)]
-         [(s (Union: es))
-          (and (for/or ([elem (in-list es)])
-                 (subtype* A0 s elem))
-               A0)]
-         ;; subtyping on immutable structs is covariant
-         [((Struct: nm _ flds proc _ _) (Struct: nm* _ flds* proc* _ _)) 
-          #:when (free-identifier=? nm nm*) 
-          (let ([A (cond [(and proc proc*) (subtype* A0 proc proc*)]
-                         [proc* #f]
-                         [else A0])])
-            (and A (subtype/flds* A flds flds*)))]
-         [((Struct: nm _ _ _ _ _) (StructTop: (Struct: nm* _ _ _ _ _)))
-          #:when (free-identifier=? nm nm*)
-          A0]
-         ;; All struct-type types are subtypes of the struct type top type
-         [((StructType: _) (StructTypeTop:)) A0]
-         ;; Promises are covariant
-         [((Promise: s) (Promise: t))
-          (subtype* A0 s t)]
-         ;ephemerons are covariant
-         [((Ephemeron: s) (Ephemeron: t))
-          (subtype* A0 s t)]
-         [((CustodianBox: s) (CustodianBox: t))
-          (subtype* A0 s t)]
-         [((Set: t) (Set: t*)) (subtype* A0 t t*)]
-         ;; Evts are covariant
-         [((Evt: t) (Evt: t*)) (subtype* A0 t t*)]
-         [((Base: 'Semaphore _ _ _) (Evt: t))
-          (subtype* A0 s t)]
-         [((Base: 'Output-Port _ _ _) (Evt: t))
-          (subtype* A0 s t)]
-         [((Base: 'Input-Port _ _ _) (Evt: t))
-          (subtype* A0 s t)]
-         [((Base: 'TCP-Listener _ _ _) (Evt: t))
-          (subtype* A0 s t)]
-         [((Base: 'Thread _ _ _) (Evt: t))
-          (subtype* A0 s t)]
-         [((Base: 'Subprocess _ _ _) (Evt: t))
-          (subtype* A0 s t)]
-         [((Base: 'Will-Executor _ _ _) (Evt: t))
-          (subtype* A0 s t)]
-         [((Base: 'LogReceiver _ _ _) (Evt: t))
-          (subtype* A0
-                    (make-HeterogeneousVector
-                     (list -Symbol -String Univ
-                           (Un (-val #f) -Symbol)))
-                    t)]
-         [((CustodianBox: t) (Evt: t*))
-          ;; Note that it's the whole box type that's being
-          ;; compared against t* here
-          (subtype* A0 s t*)]
-         [((Channel: t) (Evt: t*)) (subtype* A0 t t*)]
-         [((Async-Channel: t) (Evt: t*)) (subtype* A0 t t*)]
-         ;; Invariant types
-         [((Box: s) (Box: t)) (type-equiv? A0 s t)]
-         [((Box: _) (BoxTop:)) A0]
-         [((Weak-Box: s) (Weak-Box: t)) (type-equiv? A0 s t)]
-         [((Weak-Box: _) (Weak-BoxTop:)) A0]
-         [((ThreadCell: s) (ThreadCell: t)) (type-equiv? A0 s t)]
-         [((ThreadCell: _) (ThreadCellTop:)) A0]
-         [((Channel: s) (Channel: t)) (type-equiv? A0 s t)]
-         [((Channel: _) (ChannelTop:)) A0]
-         [((Async-Channel: s) (Async-Channel: t)) (type-equiv? A0 s t)]
-         [((Async-Channel: _) (Async-ChannelTop:)) A0]
-         [((Vector: s) (Vector: t)) (type-equiv? A0 s t)]
-         [((Vector: _) (VectorTop:)) A0]
-         [((HeterogeneousVector: _) (VectorTop:)) A0]
-         [((HeterogeneousVector: (list e ...)) (Vector: e*))
-          (for/fold ((A A0)) ((e (in-list e)) #:break (not A))
-            (and A (type-equiv? A e e*)))]
-         [((HeterogeneousVector: (list s* ...)) (HeterogeneousVector: (list t* ...)))
-          (if (= (length s*) (length t*))
-              (for/fold ((A A0)) ((s (in-list s*)) (t (in-list t*)) #:break (not A))
-                (type-equiv? A s t))
-              #f)]
-         [((MPair: s1 s2) (MPair: t1 t2))
-          (subtype-seq A0
-                       (type-equiv? s1 t1)
-                       (type-equiv? s2 t2))]
-         [((MPair: _ _) (MPairTop:)) A0]
-         [((Hashtable: s1 s2) (Hashtable: t1 t2))
-          (subtype-seq A0
-                       (type-equiv? s1 t1)
-                       (type-equiv? s2 t2))]
-         [((Hashtable: _ _) (HashtableTop:)) A0]
-         [((Prompt-Tagof: s1 s2) (Prompt-Tagof: t1 t2))
-          (subtype-seq A0
-                       (type-equiv? s1 t1)
-                       (type-equiv? s2 t2))]
-         [((Prompt-Tagof: _ _) (Prompt-TagTop:)) A0]
-         [((Continuation-Mark-Keyof: s) (Continuation-Mark-Keyof: t))
-          (type-equiv? A0 s t)]
-         [((Continuation-Mark-Keyof: _) (Continuation-Mark-KeyTop:)) A0]
-         ;; subtyping on structs follows the declared hierarchy
-         [((Struct: nm (? Type/c? parent) _ _ _ _) other)
-          (subtype* A0 parent other)]
-         ;; subtyping on values is pointwise, except special case for Bottom
-         [((Values: (list (Result: (== -Bottom) _ _))) _)
-          A0]
-         [((Values: vals1) (Values: vals2)) (subtypes* A0 vals1 vals2)]
-         [((ValuesDots: s-rs s-dty dbound) (ValuesDots: t-rs t-dty dbound))
-          (subtype-seq A0
-                       (subtypes* s-rs t-rs)
-                       (subtype* s-dty t-dty))]
-         [((AnyValues: s-f) (AnyValues: t-f))
-          (filter-subtype* A0 s-f t-f)]
-         [((or (Values: (list (Result: _ fs _) ...))
-               (ValuesDots: (list (Result: _ fs _) ...) _ _))
-           (AnyValues: t-f))
-          (for/or ([f (in-list fs)])
-            (match f
-              [(FilterSet: f+ f-)
-               (subtype-seq A0
-                            (filter-subtype* f+ t-f)
-                            (filter-subtype* f- t-f))]))]
-         [((Result: t (FilterSet: ft ff) o) (Result: t* (FilterSet: ft* ff*) o))
-          (subtype-seq A0
-                       (subtype* t t*)
-                       (filter-subtype* ft ft*)
-                       (filter-subtype* ff ff*))]
-         [((Result: t (FilterSet: ft ff) o) (Result: t* (FilterSet: ft* ff*) (Empty:)))
-          (subtype-seq A0
-                       (subtype* t t*)
-                       (filter-subtype* ft ft*)
-                       (filter-subtype* ff ff*))]
-         ;; subtyping on other stuff
-         [((Syntax: t) (Syntax: t*))
-          (subtype* A0 t t*)]
-         [((Future: t) (Future: t*))
-          (subtype* A0 t t*)]
-         [((Param: s-in s-out) (Param: t-in t-out))
-          (subtype-seq A0
-                       (subtype* t-in s-in)
-                       (subtype* s-out t-out))]
-         [((Param: in out) t)
-          (subtype* A0 (cl->* (-> out) (-> in -Void)) t)]
-         [((Instance: (? needs-resolving? s)) other)
-          (let ([s* (resolve-once s)])
-            (if (Type/c? s*)
-                (subtype* A0 (make-Instance s*) other)
-                #f))]
-         [(other (Instance: (? needs-resolving? t)))
-          (let ([t* (resolve-once t)])
-            (if (Type/c? t*)
-                (subtype* A0 other (make-Instance t*))
-                #f))]
-         [((Instance: (Class: _ _ field-map method-map augment-map _))
-           (Instance: (Class: _ _ field-map* method-map* augment-map* _)))
-          (define (subtype-clause? map map*)
-            (and (for/and ([key+type (in-list map*)])
-                   (match-define (list key type) key+type)
-                   (assq key map))
-                 (let/ec escape
-                   (for/fold ([A A0])
-                             ([key+type (in-list map)])
-                     (match-define (list key type) key+type)
-                     (define result (assq (car key+type) map*))
-                     (or (and (not result) A)
-                         (let ([type* (cadr result)])
-                           (or (subtype* A type type*)
-                               (escape #f))))))))
-          (and ;; Note that init & augment clauses don't matter for objects
-               (subtype-clause? method-map method-map*)
-               (subtype-clause? field-map field-map*))]
-         [((? Class?) (ClassTop:)) A0]
-         [((Class: row inits fields methods augments init-rest)
-           (Class: row* inits* fields* methods* augments* init-rest*))
-          ;; TODO: should the result be folded instead?
-          (define sub (curry subtype* A))
-          ;; check that each of inits, fields, methods, etc. are
-          ;; equal by sorting and checking type equality
-          (define (equal-clause? clause clause* [inits? #f])
-            (cond
-             [(not inits?)
-              (match-define (list (list names types) ...) clause)
-              (match-define (list (list names* types*) ...) clause*)
-              (and (= (length names) (length names*))
-                   (andmap equal? names names*)
-                   (andmap sub types types*))]
-             [else
-              (match-define (list (list names types opt?) ...)
-                            clause)
-              (match-define (list (list names* types* opt?*) ...)
-                            clause*)
-              (and (= (length names) (length names*))
-                   (andmap equal? names names*)
-                   (andmap sub types types*)
-                   (andmap equal? opt? opt?*))]))
-          ;; There is no non-trivial width subtyping on class types, but it's
-          ;; possible for two "equal" class types to look different
-          ;; in the representation. We deal with that here.
-          (and (or (and (or (Row? row) (not row))
-                        (or (Row? row*) (not row*)))
-                   (equal? row row*))
-               (equal-clause? inits inits* #t)
-               (equal-clause? fields fields*)
-               (equal-clause? methods methods*)
-               (equal-clause? augments augments*)
-               (sub init-rest init-rest*))]
-         ;; otherwise, not a subtype
-         [(_ _) #f])))
-     (when (null? A)
-       (hash-set! subtype-cache (cons ss st) r))
-     r))
-
-(define (type-compare? a b)
-  (or (type-equal? a b)
-      (and (subtype a b) (subtype b a))))
-
-;; List[(cons Number Number)] type type -> maybe[List[(cons Number Number)]]
-(define subtype*/no-fail subtype*)
-
-(provide/cond-contract
- [subtype (c:-> (c:or/c Type/c SomeValues/c) (c:or/c Type/c SomeValues/c) boolean?)]
- [type-compare? (c:-> (c:or/c Type/c SomeValues/c) (c:or/c Type/c SomeValues/c) boolean?)]
- [subtypes (c:-> (c:listof (c:or/c Type/c SomeValues/c))
-                 (c:listof (c:or/c Type/c SomeValues/c))
-                 boolean?)]
- [subtypes/varargs (c:-> (c:listof Type/c) (c:listof Type/c) (c:or/c Type/c #f) boolean?)])
-
-;(require racket/trace)
-;(trace subtype*)
-;(trace supertype-of-one/arr)
-;(trace arr-subtype*/no-fail)
-;(trace subtype*/no-fail)
-;(trace subtypes*)
-;(trace subtype)
-
-;(subtype (-> Univ B) (-> Univ Univ))
-;(subtype (make-poly '(a) (make-tvar 'a)) (make-lst N))
-
-;;problem:
-;; (subtype (make-Mu 'x (make-Syntax (make-Union (list (make-Base 'Number #'number? number?) (make-F 'x))))) (make-Syntax (make-Univ)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-error.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-error.rkt
deleted file mode 100644
index 28a193cc91..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-error.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         (rep type-rep)
-         (utils tc-utils)
-         (types tc-result)
-         "base-abbrev.rkt"
-         (prefix-in c: (contract-req))
-         racket/match)
-
-(provide/cond-contract
- [tc-error/expr ((string?) (#:return c:any/c #:stx syntax?) #:rest (c:listof c:any/c)
-                 . c:->* . c:any/c)]
- [tc-error/expr/fields ((string?) (#:more (c:or/c string? #f) #:return c:any/c #:stx syntax?)
-                        #:rest (c:listof c:any/c) . c:->* . c:any/c)]
-
- [lookup-fail (identifier? . c:-> . Type/c)]
- [lookup-type-fail (identifier? . c:-> . Type/c)]
- [lookup-variance-fail (identifier? . c:-> . void?)])
-
-;; produce a type-checking error, and also return a result (e.g., a tc-result)
-(define (tc-error/expr msg
-                       #:return [return (ret -Bottom)]
-                       #:stx [stx (current-orig-stx)]
-                       . rest)
-  (apply tc-error/delayed #:stx stx msg rest)
-  return)
-
-;; like `tc-error/expr`, but with modern error syntax
-(define (tc-error/expr/fields msg
-                              #:more [more #f]
-                              #:stx [stx (current-orig-stx)]
-                              #:return [return (ret -Bottom)]
-                              . rst)
-  (apply tc-error/fields #:more more #:stx stx #:delayed? #t msg rst)
-  return)
-
-;; error for unbound variables
-(define (lookup-fail e)
-  (match (identifier-binding e)
-    ['lexical (tc-error/expr/fields "missing type for identifier"
-                                    #:more "consider adding a type annotation with `:'"
-                                    "identifier" (syntax-e e)
-                                    #:return -Bottom)]
-    [#f (tc-error/expr/fields "missing type for top-level identifier"
-                              #:more "either undefined or missing a type annotation"
-                              "identifier" (syntax-e e)
-                              #:return -Bottom)]
-    [(list _ _ nominal-source-mod nominal-source-id _ _ _)
-     (define-values (mod-path base-path)
-       (module-path-index-split nominal-source-mod))
-     (cond [(and (not mod-path) (not base-path))
-            (tc-error/expr/fields "missing type for identifier"
-                                  #:more "consider adding a type annotation with `:'"
-                                  "identifier" (syntax-e e)
-                                  #:return -Bottom)]
-           [(equal? mod-path '(lib "typed/racket"))
-            (tc-error/expr/fields
-             "missing type for identifier"
-             #:more
-             (string-append "The `racket' language does not seem"
-                            " to have a type for this identifier;"
-                            " please file a bug report")
-             "identifier" (syntax-e e)
-             "from module" mod-path
-             #:return -Bottom)]
-           [else
-            (tc-error/expr/fields "missing type for identifier"
-                                  #:more "consider using `require/typed' to import it"
-                                  "identifier" (syntax-e e)
-                                  "from module" mod-path
-                                  #:return -Bottom)])]))
-
-(define (lookup-type-fail i)
-  (tc-error/expr #:return -Bottom "~a is not bound as a type" (syntax-e i)))
-
-(define (lookup-variance-fail i)
-  (int-err "~a is bound but missing a variance" (syntax-e i)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-result.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-result.rkt
deleted file mode 100644
index f6e57d1d44..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-result.rkt
+++ /dev/null
@@ -1,166 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         (rep type-rep filter-rep)
-         (utils tc-utils)
-         (types base-abbrev)
-         racket/match
-         (prefix-in c: (contract-req)))
-
-;; this structure represents the result of typechecking an expression
-(define-struct/cond-contract tc-result
-  ([t Type/c] [f FilterSet/c] [o Object?])
-  #:transparent)
-(define-struct/cond-contract tc-results
-  ([ts (c:listof tc-result?)] [drest (c:or/c (c:cons/c Type/c symbol?) #f)])
-  #:transparent)
-(define-struct/cond-contract tc-any-results ([f (c:or/c Filter/c NoFilter?)]) #:transparent)
-
-(define (tc-results/c v)
-  (or (tc-results? v)
-      (tc-any-results? v)))
-
-(define (tc-results1/c v)
-  (and (tc-results? v)
-       (= (length (tc-results-ts v)) 1)))
-
-;; Contract to check that values are tc-results/c and do not contain -no-filter or -no-obj.
-;; Used to contract the return values of typechecking functions.
-(define (full-tc-results/c r)
-  (match r
-    [(tc-any-results: f) (not (equal? -no-filter f))]
-    [(tc-results: _ fs os)
-     (and
-       (not (member -no-filter fs))
-       (not (member -no-obj os)))]
-    [(tc-results: _ fs os _ _)
-     (and
-       (not (member -no-filter fs))
-       (not (member -no-obj os)))]
-    [else #f]))
-
-
-(define-match-expander tc-result:
-  (syntax-rules ()
-   [(_ tp fp op) (tc-result tp fp op)]
-   [(_ tp) (tc-result tp _ _)]))
-
-;; expand-tc-results: (Listof tc-result) -> (Values (Listof Type) (Listof FilterSet) (Listof Object))
-(define (expand-tc-results results)
-  (values (map tc-result-t results) (map tc-result-f results) (map tc-result-o results)))
-
-(define-match-expander tc-results:
-  (syntax-rules ()
-   [(_ tp)
-    (tc-results (app expand-tc-results tp _ _) #f)]
-   [(_ tp fp op)
-    (tc-results (app expand-tc-results tp fp op) #f)]
-   [(_ tp fp op dty dbound)
-    (tc-results (app expand-tc-results tp fp op) (cons dty dbound))]))
-
-(define-match-expander tc-any-results:
-  (syntax-rules ()
-   [(_ f)
-    (tc-any-results f)]))
-
-
-(define-match-expander tc-result1:
-  (syntax-rules ()
-   [(_ tp) (tc-results: (list tp))]
-   [(_ tp fp op) (tc-results: (list tp) (list fp) (list op))]))
-
-(define (tc-results-ts* tc)
-  (match tc
-    [(tc-results: t) t]))
-
-(define-match-expander Result1:
-  (syntax-rules ()
-   [(_ tp) (Results: (list tp))]
-   [(_ tp fp op) (Results: (list tp) (list fp) (list op))]))
-
-;; expand-Results: (Listof Rresult) -> (Values (Listof Type) (Listof FilterSet) (Listof Object))
-(define (expand-Results results)
-  (values (map Result-t results) (map Result-f results) (map Result-o results)))
-
-
-(define-match-expander Results:
-  (syntax-rules ()
-   [(_ tp) (Values: (app expand-Results tp _ _))]
-   [(_ tp fp op) (Values: (app expand-Results tp fp op))]
-   [(_ tp fp op dty dbound) (ValuesDots: (app expand-Results tp fp op) dty dbound)]))
-
-;; make-tc-result*: Type/c FilterSet/c Object? -> tc-result?
-;; Smart constructor for a tc-result.
-(define (-tc-result type [filter -top-filter] [object -empty-obj])
-  (cond
-    [(or (equal? type -Bottom) (equal? filter -bot-filter))
-     (tc-result -Bottom -bot-filter object)]
-    [else
-     (tc-result type filter object)]))
-
-
-;; convenience function for returning the result of typechecking an expression
-(define ret
-  (case-lambda [(t)
-                (make-tc-results
-                 (cond [(Type/c? t)
-                        (list (-tc-result t -top-filter -empty-obj))]
-                       [else
-                        (for/list ([i (in-list t)])
-                          (-tc-result i -top-filter -empty-obj))])
-                 #f)]
-               [(t f)
-                (make-tc-results
-                 (if (Type/c? t)
-                     (list (-tc-result t f -empty-obj))
-                     (for/list ([i (in-list t)] [f (in-list f)])
-                       (-tc-result i f -empty-obj)))
-                 #f)]
-               [(t f o)
-                (make-tc-results
-                 (if (and (list? t) (list? f) (list? o))
-                     (map -tc-result t f o)
-                     (list (-tc-result t f o)))
-                 #f)]
-               [(t f o dty)
-                (int-err "ret used with dty without dbound")]
-               [(t f o dty dbound)
-                (make-tc-results
-                 (if (and (list? t) (list? f) (list? o))
-                     (map -tc-result t f o)
-                     (list (-tc-result t f o)))
-                 (cons dty dbound))]))
-
-;(trace ret)
-
-(provide/cond-contract
- [ret
-  (c:->i ([t (c:or/c Type/c (c:listof Type/c))])
-         ([f (t) (if (list? t)
-                     (c:listof FilterSet/c)
-                     FilterSet/c)]
-          [o (t) (if (list? t)
-                     (c:listof Object?)
-                     Object?)]
-          [dty Type/c]
-          [dbound symbol?])
-         [res tc-results/c])])
-
-(define tc-result-equal? equal?)
-
-(provide tc-result: tc-results: tc-any-results: tc-result1: Result1: Results:
-         tc-results)
-(provide/cond-contract
- [rename -tc-result tc-result
-   (c:case->
-     (Type/c . c:-> . tc-result?)
-     (Type/c FilterSet/c Object? . c:-> . tc-result?))]
- [tc-any-results ((c:or/c Filter/c NoFilter?) . c:-> . tc-any-results?)]
- [tc-result-t (tc-result? . c:-> . Type/c)]
- [rename tc-results-ts* tc-results-ts (tc-results? . c:-> . (c:listof Type/c))]
- [tc-result-equal? (tc-result? tc-result? . c:-> . boolean?)]
- [tc-result? (c:any/c . c:-> . boolean?)]
- [tc-results? (c:any/c . c:-> . boolean?)]
- [tc-results/c c:flat-contract?]
- [tc-results1/c c:flat-contract?]
- [full-tc-results/c c:flat-contract?])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/type-table.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/type-table.rkt
deleted file mode 100644
index cec367f749..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/type-table.rkt
+++ /dev/null
@@ -1,212 +0,0 @@
-#lang racket/base
-
-;; This module provides functions that manipulate tables mapping expressions
-;; to type information or other properties. This allows the optimizer or
-;; other downstream analyses to use information from the type-checker.
-
-;; TODO figure out why these imports are needed even though they don't seem to be.
-(require racket/match
-         syntax/parse
-         "../utils/utils.rkt"
-         (contract-req)
-         (rep type-rep)
-         (types utils union printer)
-         (typecheck tc-app-helper)
-         (utils tc-utils)
-         (for-template racket/base))
-
-(provide/cond-contract
- [add-typeof-expr (syntax? tc-results/c . -> . any/c)]
- [type-of (syntax? . -> . tc-results/c)]
- [reset-type-table (-> any/c)]
- [type-table->tooltips
-  (-> (listof (vector/c any/c integer? integer? (or/c string? (-> string?)))))]
- [test-position-add-true (syntax? . -> . any)]
- [test-position-add-false (syntax? . -> . any)]
- [test-position-takes-true-branch (syntax? . -> . boolean?)]
- [test-position-takes-false-branch (syntax? . -> . boolean?)]
- [add-dead-lambda-branch (syntax? . -> . any)]
- [dead-lambda-branch? (syntax? . -> . boolean?)]
- [;; Register that the given expression should be ignored
-  register-ignored! (syntax? . -> . any)]
- [;; Look up whether a given expression is ignored
-  is-ignored? (syntax? . -> . boolean?)])
-
-(provide ;; Syntax class for is-ignored?
-         ignore-table^)
-
-(define type-table (make-hasheq))
-
-;; A struct that helps track tooltip types for a given location
-;;   seen    - (Listof Syntax)
-;;   results - a TC-Result
-(struct tooltip (seen results) #:transparent)
-
-;; tooltip-table : (Hash (List Int Int) tooltip)
-;; This table keeps track of the same types as the type table
-;; but indexed on source location for tooltips and only retaining the
-;; last type for a given location.
-(define tooltip-table (make-hash))
-
-(define (reset-type-table) (set! type-table (make-hasheq)))
-
-(define (add-typeof-expr e t)
-  (when (and (syntax-position e) (syntax-span e))
-    ;; Only keep the latest type for a given location, which means that
-    ;; since typechecking proceeds inside-out we will only record the most
-    ;; relevant type for the expansion of macros (which often have misleading
-    ;; syntax locations on the subexpressions).
-    (hash-update!
-     tooltip-table
-     (list (syntax-position e) (syntax-span e))
-     (λ (old)
-       (match-define (tooltip seen results) old)
-       (if (member e seen)
-           ;; the car should be the latest stx for the location
-           (if (equal? e (car seen))
-               ;; combine types seen at the latest
-               (tooltip seen ((combine t) results))
-               old)
-           (tooltip (cons e seen) t)))
-     (tooltip (list e) t)))
-  (when (optimize?)
-    (hash-update! type-table e (combine t) t)))
-
-;; when typechecking a case-> type, types get added for
-;; the same subexpression multiple times, combine them
-(define ((combine new) old)
-  (match* (old new)
-    [((tc-result1: old-t) (tc-result1: t-t))
-     (ret (Un old-t t-t))]
-    [((tc-results: old-ts) (tc-results: t-ts))
-     ;; filters don't matter at this point, since only
-     ;; the optimizer reads this table
-     (unless (= (length old-ts) (length t-ts))
-       (int-err
-        "type table: number of values don't agree ~a ~a"
-        old-ts t-ts))
-     (ret (map Un old-ts t-ts))]
-    [(_ _) new])) ; irrelevant to the optimizer, just clobber
-
-(define (type-of e)
-  (hash-ref type-table e
-            (lambda () (int-err (format "no type for ~a at: ~a line ~a col ~a"
-                                        (syntax->datum e)
-                                        (syntax-source e)
-                                        (syntax-line e)
-                                        (syntax-column e))))))
-
-;; This macro is used to create a thunk that closes over the type
-;; names that should be used to print the type. This is needed to ensure that
-;; DrRacket can show the tooltips with the right abbreviations.
-(define-syntax-rule (printer-thunk tbl e)
-  (λ () (parameterize ([current-type-names tbl]) e)))
-
-;; Convert the contents of the type table to a format that check-syntax
-;; can understand in order to draw type tooltips
-(define (type-table->tooltips)
-  (define type-names (current-type-names))
-  (for/fold ([tooltips '()])
-            ([(pos+span stx+results) (in-hash tooltip-table)]
-             #:unless (error-at-stx-loc? (car (tooltip-seen stx+results))))
-    (match-define (list pos span) pos+span)
-    (match-define (tooltip (cons stx _) results) stx+results)
-    ;; `printed-type-thunks` is #f if we should skip the type because it's
-    ;; something not worth printing like Bottom or Error.
-    (define printed-type-thunks
-      (match results
-        [(tc-result1: type)
-         (and (not (or (Error? type) (Bottom? type)))
-              ;; cleanup-type is essential here so that this doesn't slow
-              ;; down compilation excessively (e.g., serializing the 4k type
-              ;; of the + function)
-              (printer-thunk type-names
-                (pretty-format-type (cleanup-type type))))]
-        [(or (tc-results: types)
-             (tc-results: types _ _ _ _)) ; FIXME, account for dty/dbound
-         (printer-thunk type-names
-           (apply string-append
-                  (for/list ([(type index) (in-indexed (in-list types))])
-                    (format "Value ~a:~n  ~a~n"
-                            (add1 index)
-                            (pretty-format-type (cleanup-type type)
-                                                #:indent 2)))))]
-        [(tc-any-results: _) "AnyValues"]))
-    (cond [(not printed-type-thunks) tooltips]
-          [else
-           (append (make-tooltip-vector stx printed-type-thunks pos span)
-                   tooltips)])))
-
-;; make-tooltip-vector : Syntax Thunk Int Int -> (Listof Vector)
-;; Compute the tooltip info to put in syntax properties
-(define (make-tooltip-vector stx type-thunk position span)
-  ;; Try to use the original syntax to guide the shape of the tooltip
-  (define located (locate-stx stx))
-  (cond ;; Put the tooltip only on the parens for compound expressions
-        ;; but put them on the whole expression for literals. This avoids
-        ;; overlapping tooltips.
-        [(or (not (pair? (syntax-e located)))
-             ;; special-case quote because there's no worry of overlap
-             ;; in a (quote ...) and because literals expand out to a
-             ;; use of quote.
-             (let ([fst (car (syntax-e located))])
-               (and (identifier? fst)
-                    (free-identifier=? fst #'quote))))
-         (list (vector stx
-                       (sub1 (syntax-position stx))
-                       (+ (sub1 (syntax-position stx)) (syntax-span stx))
-                       type-thunk))]
-        [else
-         (list (vector stx
-                       (sub1 (syntax-position stx))
-                       (syntax-position stx)
-                       type-thunk)
-               (vector stx
-                       (sub1 (+ (sub1 (syntax-position stx))
-                                (syntax-span stx)))
-                       (+ (sub1 (syntax-position stx))
-                          (syntax-span stx))
-                       type-thunk))]))
-
-;; For expressions in test position keep track of if it evaluates to true/false
-(define test-position-table/true (make-hasheq))
-(define test-position-table/false (make-hasheq))
-
-(define (test-position-add-true expr)
-  (hash-set! test-position-table/true expr #t))
-(define (test-position-add-false expr)
-  (hash-set! test-position-table/false expr #t))
-
-(define (test-position-takes-true-branch expr)
-  (hash-ref test-position-table/true expr #f))
-(define (test-position-takes-false-branch expr)
-  (hash-ref test-position-table/false expr #f))
-
-;; keeps track of lambda branches that never get evaluated, so that the
-;; optimizer can eliminate dead code. The key is the formals syntax object.
-;; 1 possible value: #t
-(define lambda-dead-table (make-hasheq))
-
-(define (add-dead-lambda-branch formals)
-  (when (optimize?)
-    (hash-set! lambda-dead-table formals #t)))
-(define (dead-lambda-branch? formals)
-  (hash-ref lambda-dead-table formals #f))
-
-;; The following provides functions for manipulating the ignore-table, which
-;; stores expressions that should be ignored for type-checking, optimization,
-;; and other type-related analyses.
-;;
-;; Since the type-checker doesn't add annotations to its input syntax, if
-;; the type-checker discovers that something should be ignored by future
-;; passes, it needs to use this side-channel.
-(define ignore-table (make-hasheq))
-
-(define (register-ignored! stx)
-  (hash-set! ignore-table stx #t))
-
-(define (is-ignored? stx)
-  (hash-ref ignore-table stx #f))
-
-(define-syntax-class ignore-table^
-  (pattern _ #:when (is-ignored? this-syntax)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/union.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/union.rkt
deleted file mode 100644
index 16b7b7d47d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/union.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         (rep type-rep rep-utils)
-         (prefix-in c: (contract-req))
-         (types subtype base-abbrev resolve current-seen)
-         racket/match
-         racket/list)
-
-
-(provide/cond-contract
- [Un (() #:rest (c:listof Type/c) . c:->* . Type/c)])
-
-;; List[Type] -> Type
-;; Argument types should not overlap or be union types
-(define (make-union* types)
-  (match types
-    [(list t) t]
-    [_ (make-Union types)]))
-
-;; a is a Type (not a union type)
-;; b is a List[Type] (non overlapping, non Union-types)
-;; The output is a non overlapping list of non Union types.
-;; The overlapping constraint is lifted if we are in the midst of subtyping. This is because during
-;; subtyping calls to subtype are expensive.
-(define (merge a b)
-  (define b* (make-union* b))
-  (match* (a b)
-    ;; If a union element is a Name application, then it should not
-    ;; be checked for subtyping since that can cause infinite
-    ;; loops if this is called during type instantiation.
-    [((App: (? Name? rator) rands stx) _)
-     ;; However, we should check if it's a well-formed application
-     ;; so that bad applications are rejected early.
-     (resolve-app-check-error rator rands stx)
-     (cons a b)]
-    [(_ _) #:when (currently-subtyping?) (cons a b)]
-    [((? (λ _ (subtype a b*))) _) b]
-    [((? (λ _ (subtype b* a))) _) (list a)]
-    [(_ _) (cons a (filter-not (λ (b-elem) (subtype b-elem a)) b))]))
-
-;; Type -> List[Type]
-(define (flat t)
-  (match t
-    [(Union: es) es]
-    [_ (list t)]))
-
-;; Union constructor
-;; Normalizes representation by sorting types.
-;; Type * -> Type
-;; The input types can overlap and be union types
-(define Un
-  (case-lambda 
-    [() -Bottom]
-    [(t) t]
-    [args 
-     (define ts (foldr merge '()
-                       (remove-dups (sort (append-map flat args) type<?))))
-     (make-union* ts)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/utils.rkt
deleted file mode 100644
index ce508eb028..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/utils.rkt
+++ /dev/null
@@ -1,128 +0,0 @@
-#lang racket/base
-
-(require "../utils/utils.rkt"
-         (rep type-rep rep-utils)
-         (utils tc-utils)
-         "substitute.rkt" "tc-result.rkt" "tc-error.rkt"
-         (rep free-variance) 
-         racket/match
-         racket/set
-         racket/list
-         (contract-req))
-
-
-(provide (all-from-out "tc-result.rkt" "tc-error.rkt"))
-
-
-;; unfold : Type -> Type
-;; must be applied to a Mu
-(define (unfold t)
-  (match t
-    [(Mu: name b)
-     (define (sb target)
-       (type-case (#:Type sb #:Filter (sub-f sb) #:Object (sub-o sb))
-         target
-         [#:F name* (if (eq? name name*) t target)]))
-     (sb b)]))
-
-(define (instantiate-poly t types)
-  (match t
-    [(Poly: ns body)
-     (unless (= (length types) (length ns))
-       (int-err "instantiate-poly: wrong number of types: expected ~a, got ~a"
-                (length ns) (length types)))
-     (subst-all (make-simple-substitution ns types) body)]
-    [(PolyDots: (list fixed ... dotted) body)
-     (unless (>= (length types) (length fixed))
-       (int-err
-        "instantiate-poly: wrong number of types: expected at least ~a, got ~a"
-        (length fixed) (length types)))
-     (let* ([fixed-tys (take types (length fixed))]
-            [rest-tys (drop types (length fixed))]
-            [body* (subst-all (make-simple-substitution fixed fixed-tys)
-                              body)])
-       (substitute-dots rest-tys #f dotted body*))]
-    [(PolyRow: names _ body)
-     (unless (= (length types) (length names))
-       (int-err "instantiate-poly: wrong number of types: expected ~a, got ~a"
-                (length names) (length types)))
-     (subst-all (make-simple-substitution names types) body)]
-    [_ (int-err "instantiate-poly: requires Poly type, got ~a" t)]))
-
-(define (instantiate-poly-dotted t types image var)
-  (match t
-    [(PolyDots: (list fixed ... dotted) body)
-     (unless (= (length fixed) (length types))
-       (int-err (string-append "instantiate-poly-dotted: wrong number of"
-                               " types: expected ~a, got ~a, types were ~a")
-                (length fixed) (length types) types))
-     (let ([body* (subst-all (make-simple-substitution fixed types) body)])
-       (substitute-dotted null image var dotted body*))]
-    [_ (int-err "instantiate-poly-dotted: requires PolyDots type, got ~a" t)]))
-
-
-;; fv : Type -> Listof[Symbol]
-(define (fv t) (set->list (free-vars-names (free-vars* t))))
-(define (fi t) (set->list (free-vars-names (free-idxs* t))))
-
-;; fv/list : Listof[Type] -> Setof[Symbol]
-(define (fv/list ts)
-  (apply set-union (seteq) (map (compose free-vars-names free-vars*) ts)))
-
-;; a parameter for the current polymorphic structure being defined
-;; to allow us to prevent non-regular datatypes
-(define-struct poly (name vars) #:prefab)
-(define current-poly-struct (make-parameter #f))
-
-;; UNUSED
-;; a table indicating what variables should be abstracted away before using
-;; this expected type keyed on the numeric Rep sequence
-(define to-be-abstr
-  (make-weak-hash))
-
-(provide to-be-abstr)
-
-;; has-optional-args? : (Listof arr) -> Boolean
-;; Check if the given arrs meet the necessary conditions to be printed
-;; with a ->* constructor or for generating a ->* contract
-(define (has-optional-args? arrs)
- (and (> (length arrs) 1)
-      ;; No polydots
-      (for/and ([arr (in-list arrs)])
-        (match arr [(arr: _ _ _ drest _) (not drest)]))
-      ;; Keyword args, range and rest specs all the same.
-      (let* ([xs (map (match-lambda [(arr: _ rng rest-spec _ kws)
-                                (list rng rest-spec kws)])
-                      arrs)]
-             [first-x (first xs)])
-        (for/and ([x (in-list (rest xs))])
-          (equal? x first-x)))
-      ;; Positionals are monotonically increasing by at most one.
-      (let-values ([(_ ok?)
-                    (for/fold ([positionals (arr-dom (first arrs))]
-                               [ok-so-far?  #t])
-                              ([arr (in-list (rest arrs))])
-                      (match arr
-                        [(arr: dom _ _ _ _)
-                         (define ldom         (length dom))
-                         (define lpositionals (length positionals))
-                         (values dom
-                                 (and ok-so-far?
-                                      (or (= ldom lpositionals)
-                                          (= ldom (add1 lpositionals)))
-                                      (equal? positionals (take dom lpositionals))))]))])
-        ok?)))
-
-(provide/cond-contract
- [unfold (Mu? . -> . Type/c)]
- [instantiate-poly ((or/c Poly? PolyDots? PolyRow?) (listof Type/c)
-                    . -> . Type/c)]
- [instantiate-poly-dotted
-  (PolyDots? (listof Type/c) Type/c symbol? . -> . Type/c)] 
- [fv (Rep? . -> . (listof symbol?))]
- [fi (Rep? . -> . (listof symbol?))]
- [fv/list ((listof Type/c) . -> . (set/c symbol?))]
- [current-poly-struct (parameter/c (or/c #f poly?))]
- [has-optional-args? (-> (listof arr?) any)]
- )
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/any-wrap.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/any-wrap.rkt
deleted file mode 100644
index d195118508..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/any-wrap.rkt
+++ /dev/null
@@ -1,123 +0,0 @@
-#lang racket/base
-
-(require racket/match racket/contract/combinator
-         racket/fixnum racket/flonum racket/extflonum
-         racket/set
-         racket/undefined
-         (only-in (combine-in racket/private/promise)
-                  promise?
-                  prop:force promise-forcer))
-
-(define (base-val? e)
-  (or (number? e) (string? e) (char? e) (symbol? e)
-      (null? e) (regexp? e) (eq? undefined e) (path? e)
-      (regexp? e) (keyword? e) (bytes? e) (boolean? e) (void? e)
-      ;; Base values because you can only store flonums/fixnums in these
-      ;; and not any higher-order values. This isn't sound if we ever
-      ;; introduce bounded polymorphism for Flvector/Fxvector.
-      (flvector? e) (fxvector? e) (extflvector? e)))
-
-(define (val-first-projection b)
-  (define (fail neg-party v)
-    (raise-blame-error 
-     (blame-swap b) #:missing-party neg-party
-     v 
-     "Attempted to use a higher-order value passed as `Any` in untyped code: ~v" v))
-  
-  (define (wrap-struct neg-party s)
-    (define (extract-functions struct-type)
-      (define-values (sym init auto ref set! imms par skip?)
-        (struct-type-info struct-type))
-      (when skip? (fail neg-party s)) ;; "Opaque struct type!")
-      (define-values (fun/chap-list _)
-        (for/fold ([res null]
-                   [imms imms])
-          ([n (in-range (+ init auto))])
-          (if (and (pair? imms) (= (car imms) n))
-              ;; field is immutable
-              (values
-               (list* (make-struct-field-accessor ref n)
-                      (lambda (s v) (any-wrap/traverse neg-party v))
-                      res)
-               (cdr imms))
-              ;; field is mutable
-              (values
-               (list* (make-struct-field-accessor ref n)
-                      (lambda (s v) (any-wrap/traverse neg-party v))
-                      (make-struct-field-mutator set! n)
-                      (lambda (s v) (fail neg-party s))
-                      res)
-               imms))))
-      (cond
-        [par (append fun/chap-list (extract-functions par))]
-        [else fun/chap-list]))
-    (define-values (type skipped?) (struct-info s))
-    (when skipped? (fail neg-party s));  "Opaque struct type!"
-    (apply chaperone-struct s (extract-functions type)))
- 
-  (define (any-wrap/traverse neg-party v)
-    (match v
-      [(? base-val?)
-       v]
-      [(cons x y) (cons (any-wrap/traverse neg-party x) (any-wrap/traverse neg-party y))]
-      [(? vector? (? immutable?))
-       ;; fixme -- should have an immutable for/vector
-       (vector->immutable-vector
-        (for/vector #:length (vector-length v)
-          ([i (in-vector v)]) (any-wrap/traverse neg-party i)))]
-      [(? box? (? immutable?)) (box-immutable (any-wrap/traverse neg-party (unbox v)))]
-      ;; fixme -- handling keys properly makes it not a chaperone
-      ;; [(? hasheq? (? immutable?))
-      ;;  (for/hasheq ([(k v) (in-hash v)]) (values k v))]
-      ;; [(? hasheqv? (? immutable?))
-      ;;  (for/hasheqv ([(k v) (in-hash v)]) (values k v))]
-      
-      [(? (λ (e) 
-            (and (hash? e) (immutable? e) 
-                 (not (hash-eqv? e)) (not (hash-eq? e)))))
-       (for/hash ([(k v) (in-hash v)]) (values (any-wrap/traverse neg-party k)
-                                               (any-wrap/traverse neg-party v)))]
-      [(? vector?) (chaperone-vector v
-                                     (lambda (v i e) (any-wrap/traverse neg-party e))
-                                     (lambda (v i e) (fail neg-party v)))]
-      [(? box?) (chaperone-box v
-                               (lambda (v e) (any-wrap/traverse neg-party e))
-                               (lambda (v e) (fail neg-party v)))]
-      [(? hash?) (chaperone-hash v
-                                 (lambda (h k)
-                                   (values k (lambda (h k v) (any-wrap/traverse neg-party v)))) ;; ref
-                                 (lambda (h k n)
-                                   (if (immutable? v) 
-                                       (values k n)
-                                       (fail neg-party v))) ;; set
-                                 (lambda (h v) v) ;; remove
-                                 (lambda (h k) (any-wrap/traverse neg-party k)))] ;; key
-      [(? evt?) (chaperone-evt v (lambda (e) (values e (λ (v) (any-wrap/traverse neg-party v)))))]
-      [(? set?)
-       (for/set ([i (in-set v)]) (any-wrap/traverse neg-party i))]
-      ;; could do something with generic sets here if they had
-      ;; chaperones, or if i could tell if they were immutable.
-      [(? struct?) (wrap-struct neg-party v)]
-      [(? procedure?)
-       (chaperone-procedure v (lambda args (fail neg-party v)))]
-      [(? promise?)
-       (chaperone-struct
-        v
-        promise-forcer
-        (λ (_ proc) 
-          (chaperone-procedure
-           proc
-           (λ (promise)
-             (values (λ (val) (any-wrap/traverse neg-party val))
-                     promise)))))]
-      [_ (fail neg-party v)]))
-  (λ (v) (λ (neg-party) (any-wrap/traverse neg-party v))))
-
-(define any-wrap/c
-  (make-chaperone-contract
-   #:name 'Any
-   #:first-order (lambda (x) #t)
-   #:projection (λ (blame) (λ (val) (((val-first-projection blame) val) #f)))
-   #:val-first-projection val-first-projection))
-
-(provide any-wrap/c)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/arm.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/arm.rkt
deleted file mode 100644
index 5ef8bb1641..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/arm.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-(require (for-template racket/base) syntax/stx)
-
-(provide arm)
-
-;; For simplicity, protect everything produced by Typed Racket.
-(define (arm stx)
-  (syntax-case stx (#%plain-module-begin
-                    #%require #%provide #%declare begin
-                    define-values define-syntaxes
-                    begin-for-syntax)
-    [(#%plain-module-begin . _) (syntax-property (syntax-arm stx)
-                                                 'taint-mode
-                                                 'opaque)]
-    [(#%require . _) stx]
-    [(#%provide . _) stx]
-    [(#%declare . _) stx]
-    [(begin form ...)
-     (quasisyntax/loc stx (begin #,@(stx-map arm #'(form ...))))]
-    [(begin-for-syntax form ...)
-     (quasisyntax/loc stx (begin-for-syntax #,@(stx-map arm #'(form ...))))]
-    [(define-values ids expr)
-     (quasisyntax/loc stx (define-values ids #,(arm #'expr)))]
-    [(define-syntaxes ids expr)
-     (quasisyntax/loc stx (define-syntaxes ids #,(arm #'expr)))]
-    [_ (syntax-arm stx)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/disappeared-use.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/disappeared-use.rkt
deleted file mode 100644
index 7b463de97b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/disappeared-use.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-
-(provide (all-defined-out))
-;; list of syntax objects that should count as disappeared uses
-(define disappeared-use-todo (make-parameter '()))
-(define (add-disappeared-use t)
-  (disappeared-use-todo (cons t (disappeared-use-todo))))
-(define disappeared-bindings-todo (make-parameter '()))
-(define (add-disappeared-binding t)
-  (disappeared-bindings-todo (cons t (disappeared-bindings-todo))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/disarm.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/disarm.rkt
deleted file mode 100644
index 3d9ffcd209..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/disarm.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-
-(provide (protect-out disarm*))
-
-;; Typed Racket runs after macro expansion, and it must be priviledged,
-;; so it can just disarm all taints (and arm everything afterward).
-
-(define (disarm* stx)
-  (let loop ([v stx])
-    (cond
-     [(syntax? v)
-      (let* ([stx (syntax-disarm v orig-insp)]
-             [r (loop (syntax-e stx))])
-        (if (eq? r (syntax-e stx))
-            stx
-            (datum->syntax stx r stx stx)))]
-     [(pair? v) (let ([a (loop (car v))]
-                      [d (loop (cdr v))])
-                  (if (and (eq? a (car v))
-                           (eq? d (cdr v)))
-                      v
-                      (cons a d)))]
-     [else v])))
-
-(define orig-insp (variable-reference->module-declaration-inspector
-                   (#%variable-reference)))
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/early-return.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/early-return.rkt
deleted file mode 100644
index 91705830df..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/early-return.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base syntax/parse))
-(provide early-return)
-
-(define-syntax (early-return stx)
-  (syntax-parse stx
-    [(_ e:expr ... #:return-when e0:expr e1:expr rest ...)
-     (syntax/loc stx
-       (let ()
-         e ...
-         (if e0 e1
-             (early-return rest ...))))]
-    [(_ e:expr ... #:return-unless e0:expr e1:expr rest ...)
-     (syntax/loc stx
-       (let ()
-         e ...
-         (if e0
-             (early-return rest ...)
-             e1)))]
-    [(_ e:expr ...) (syntax/loc stx (let () e ...))]))
-
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/evt-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/evt-contract.rkt
deleted file mode 100644
index d3e00a6cd8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/evt-contract.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-
-;; A custom evt/c for TR that is stricter than the one that
-;; comes with Racket. In particular, this will prevent the channel's
-;; writing end from being used once it's been exported as an Evtof.
-
-(require racket/contract)
-
-(provide tr:evt/c)
-
-;; tr:evt/c : Contract * -> Contract
-(define (tr:evt/c maybe-ctc)
-  (define ctc (coerce-contract 'evt/c maybe-ctc))
-  (unless (chaperone-contract? ctc)
-    (raise-argument-error 'evt/c "chaperone-contract?" ctc))
-  (make-tr-evt/c ctc))
-
-;; evt/c-proj : Contract -> (Blame -> Any -> Any)
-(define (evt/c-proj ctc)
-  (define real-evt/c (evt/c (tr-evt/c-ctc ctc)))
-  (define real-proj (contract-projection real-evt/c))
-  (λ (blame)
-    (define real-proj* (real-proj blame))
-    (λ (v)
-      ;; Must not allow a value of type (Evtof X) to be used as
-      ;; a value of any type that is invariant in X (i.e., has a
-      ;; writing end). For now, this is just channels.
-      ;;
-      ;; If we support custom evts via struct properties, then
-      ;; we may need to tighten this restrictions.
-      (if (channel? v)
-          (real-proj*
-           (chaperone-channel
-            v
-            (λ (ch) (values ch values))
-            (λ (ch val)
-              (raise-blame-error
-               blame ch
-               "cannot put on a channel used as a typed evt"))))
-          (real-proj* v)))))
-
-;; evt/c-first-order : Contract -> Any -> Boolean
-(define ((evt/c-first-order ctc) v) (evt? v))
-
-;; evt/c-name : Contract -> Sexp
-(define (evt/c-name ctc)
-  (build-compound-type-name 'evt/c (tr-evt/c-ctc ctc)))
-
-;; evt/c-stronger? : Contract Contract -> Boolean
-(define (evt/c-stronger? this that)
-  (define this-ctcs (tr-evt/c-ctc this))
-  (define that-ctcs (tr-evt/c-ctc that))
-  (contract-stronger? this that))
-
-(define-struct tr-evt/c (ctc)
-  #:property prop:chaperone-contract
-  (build-chaperone-contract-property
-   #:projection evt/c-proj
-   #:first-order evt/c-first-order
-   #:stronger evt/c-stronger?
-   #:name evt/c-name))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/lift.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/lift.rkt
deleted file mode 100644
index ec3488586b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/lift.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-;; This module provides helpers for syntax lifting
-
-(require syntax/parse
-         (for-template racket/base))
-
-(provide local-expand/capture*)
-
-;; like `local-expand/capture-lifts` but expands the lifted expression, which
-;; allows us to type-check lifted expressions at the top-level
-(define (local-expand/capture* stx ctx stop-ids)
-  (define-values (defs expr)
-    ;; at each iteration, get lifted definitions and the expanded expression
-    (let loop ([stx stx])
-      (define stx* (local-expand/capture-lifts stx ctx stop-ids))
-      (syntax-parse stx*
-        #:literals (begin define-values)
-        [(begin (define-values (n) e) ... e*)
-         (define-values (sub-defss defs)
-           (for/lists (_1 _2) ([e (in-list (syntax->list #'(e ...)))]
-                               [n (in-list (syntax->list #'(n ...)))])
-             ;; lifted expressions may re-lift, so recur
-             (define-values (sub-defs e-expanded) (loop e))
-             (values sub-defs #`(define-values (#,n) #,e-expanded))))
-         (values (append (apply append sub-defss) defs) #'e*)])))
-  #`(begin #,@defs #,expr))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/literal-syntax-class.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/literal-syntax-class.rkt
deleted file mode 100644
index f77337c157..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/literal-syntax-class.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-
-(require
-  "../utils/utils.rkt"
-  syntax/parse
-  (utils tc-utils)
-  (for-syntax
-    racket/base
-    racket/syntax
-    syntax/parse
-    unstable/sequence))
-
-(provide define-literal-syntax-class)
-
-
-
-(define-syntax (define-literal-syntax-class stx)
-  (define-splicing-syntax-class spec
-    #:attributes (name (literals 1))
-    (pattern (~seq name:id (literals:id ...)))
-    (pattern literal:id
-             #:with (literals ...) #'(literal)
-             #:with name (format-id #'literal "~a^" #'literal)))
-  (syntax-parse stx
-    ((_ phase-spec :spec)
-     ;; We need pattern ids that have the all have the same lexical context as the literal-set binding
-     (define add-context
-       (let ((introducer (make-syntax-introducer)))
-         (λ (sym) (introducer (datum->syntax #f sym)))))
-     (define/with-syntax literal-set (add-context 'lit-set))
-     (define/with-syntax (pattern-literals ...)
-        (for/list ([_ (in-syntax #'(literals ...))]
-                   [n (in-naturals)])
-          (add-context (string->symbol (format "pat~a" n)))))
-     #'(begin
-         (define-literal-set literal-set phase-spec
-           ([pattern-literals literals] ...))
-
-         (define-syntax-class name
-           #:attributes ()
-           #:commit
-           #:literal-sets ([literal-set])
-           (pattern (~and op (~or pattern-literals ...))
-                    #:do [(add-disappeared-use (syntax-local-introduce #'op))]))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/mutated-vars.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/mutated-vars.rkt
deleted file mode 100644
index d7dd928d5d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/mutated-vars.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang racket/base
-
-(require racket/dict syntax/parse syntax/id-table unstable/sequence)
-
-;; find and add to mapping all the set!'ed variables in form
-;; if the supplied mapping is mutable, mutates it
-;; default is immutability
-;; syntax [table] -> table
-(define (find-mutated-vars form [tbl (make-immutable-free-id-table)])
-  (define add (if (dict-mutable? tbl)
-                  (lambda (t i) (dict-set! t i #t) t)
-                  (lambda (t i) (dict-set t i #t))))
-  (let loop ([stx form] [tbl tbl])
-    ;; syntax-list -> table
-    (define (fmv/list lstx)
-      (for/fold ([tbl tbl]) ([stx (in-syntax lstx)])
-        (loop stx tbl)))
-    (syntax-parse stx
-      #:literal-sets (kernel-literals)
-      ;; what we care about: set!
-      [(set! v e)
-       (add (loop #'e tbl) #'v)]
-      ;; forms with expression subforms
-      [(define-values (var ...) expr)
-       (loop #'expr tbl)]
-      [(#%expression e) (loop #'e tbl)]
-      [(#%plain-app . rest) (fmv/list #'rest)]
-      [(begin . rest) (fmv/list #'rest)]
-      [(begin0 . rest) (fmv/list #'rest)]
-      [(#%plain-lambda _ . rest) (fmv/list #'rest)]
-      [(case-lambda (_  rest ...) ...)
-       (fmv/list #'(rest ... ...))]
-      [(if . es) (fmv/list #'es)]
-      [(with-continuation-mark . es) (fmv/list #'es)]
-      [(let-values ([_ e] ...) b ...) (fmv/list #'(b ... e ...))]
-      [(letrec-values ([_ e] ...) b ...) (fmv/list #'(b ... e ...))]
-      [(letrec-syntaxes+values _ ([_ e] ...) b ...) (fmv/list #'(b ... e ...))]
-      [(#%plain-module-begin . forms) (fmv/list #'forms)]
-      ;; all the other forms don't have any expression subforms (like #%top)
-      [_ tbl])))
-
-(provide find-mutated-vars)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/print-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/print-struct.rkt
deleted file mode 100644
index 2b074c72bb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/print-struct.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base syntax/parse))
-(provide define-struct/printer)
-
-(define-syntax (define-struct/printer stx)
-  (syntax-parse stx
-    [(form name (flds ...) printer:expr)
-     #`(define-struct name (flds ...)
-         #:property prop:custom-print-quotable 'never
-         ;; Eta expansion so that printer is not evaluated
-         ;; until needed.
-         #:methods gen:custom-write
-         [(define (write-proc v port write?)
-            (printer v port write?))]
-         #:transparent)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/require-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/require-contract.rkt
deleted file mode 100644
index 491dc9cad7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/require-contract.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket/base
-
-;; This module provides helper macros for `require/typed`
-
-(require racket/contract/region racket/contract/base
-         syntax/location
-         (for-syntax racket/base
-                     syntax/parse
-                     (prefix-in tr: "../typecheck/renamer.rkt")))
-
-(provide require/contract define-ignored)
-
-(define-syntax (define-ignored stx)
-  (syntax-case stx ()
-    [(_ name expr)
-     (syntax-case (local-expand/capture-lifts #'expr
-                                              'expression
-                                              null #;(list #'define-values))
-       (begin define-values)
-       [(begin (define-values (n) e) ... e*)
-        #`(begin (define-values (n) e) ...
-                 (define name #,(syntax-property #'e*
-                                                 'inferred-name
-                                                 (syntax-e #'name))))]
-       [(begin e)
-        #`(define name #,(syntax-property #'e
-                                          'inferred-name
-                                          (syntax-e #'name)))])]))
-
-(define-syntax (get-alternate stx)
-  (syntax-case stx ()
-    [(_ id)
-     (tr:get-alternate #'id)]))
-
-;; Requires an identifier from an untyped module into a typed module
-;; nm is the import
-;; hidden is an id that will end up being the actual definition
-;; nm will be bound to a rename transformer so that it is not provided
-;; with all-defined-out
-(define-syntax (require/contract stx)
-  (define-syntax-class renameable
-    (pattern nm:id
-             #:with orig-nm #'nm
-             #:with orig-nm-r ((make-syntax-introducer) #'nm))
-    (pattern (orig-nm:id nm:id)
-             #:with orig-nm-r ((make-syntax-introducer) #'nm)))
-
-  (syntax-parse stx
-    [(require/contract nm:renameable hidden:id cnt lib)
-     #`(begin (define-syntax nm.nm
-                (make-rename-transformer
-                 (syntax-property (syntax-property (quote-syntax hidden)
-                                                   'not-free-identifier=? #t)
-                                  'not-provide-all-defined #t)))
-              (define-ignored hidden
-                (let ()
-                  ;; Use `local-require` in order to use this internal
-                  ;; definition context instead of defining at the top-level.
-                  ;; This avoids top-level hopelessness to do with
-                  ;; `local-expand` and definitions.
-                  (local-require (only-in lib [nm.orig-nm nm.orig-nm-r]))
-                  (contract cnt
-                            (get-alternate nm.orig-nm-r)
-                            '(interface for #,(syntax->datum #'nm.nm))
-                            (current-contract-region)
-                            (quote nm.nm)
-                            (quote-srcloc nm.nm)))))]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/struct-type-c.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/struct-type-c.rkt
deleted file mode 100644
index 6b64cc074c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/struct-type-c.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket/base
-(provide struct-type/c)
-(require racket/contract/combinator)
-
-;; struct-type/c generates contracts which protect structure type
-;; descriptors. These descriptors can be used reflectively to create
-;; constructors, accessors, mutators, predicates, and other
-;; structure-related functions.
-
-;; Currently, this is a very simple implentation which always rejects
-;; all reflective access. A better implementation would check that the
-;; procedures created by reflective access to the structure obey
-;; appropriate invariants.
-
-(define (val-first-projection b)
-  (define (fail neg-party v)
-    (raise-blame-error 
-     (blame-swap b) #:missing-party neg-party
-     v 
-     "Attempted to use a struct type reflectively in untyped code: ~v" v))
-  (λ (v)
-    (λ (neg-party)
-      (chaperone-struct-type 
-       v
-       ;; the below interposition functions could be improved to fail later, 
-       ;; when the functions they produce are actually used.
-
-       ;; interposition for `struct-type-info`
-       (λ _ (fail neg-party v))
-       ;; interposition for `struct-type-make-constructor`
-       (λ _ (fail neg-party v))
-       ;; guard for interposition on subtypes
-       (λ _ (fail neg-party v))))))
-
-(define (struct-type/c sty) ;; currently ignores sty
-  (make-chaperone-contract
-   #:name "struct-type/c"
-   #:first-order struct-type?
-   #:projection (λ (blame) (λ (val) (((val-first-projection blame) val) #f)))
-   #:val-first-projection val-first-projection))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/stxclass-util.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/stxclass-util.rkt
deleted file mode 100644
index 62dfbba84d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/stxclass-util.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket/base
-
-(require (except-in syntax/parse id keyword)
-         (for-syntax syntax/parse
-                     racket/base
-                     (only-in racket/syntax generate-temporary)))
-
-(provide (except-out (all-defined-out) id keyword)
-         (rename-out [id id*] [keyword keyword*]))
-
-(define-syntax (parse/get stx)
-  (syntax-parse stx
-    [(_ arg:expr attr:id pat)
-     (let* ([i (generate-temporary)]
-            [get-i (datum->syntax
-                    i
-                    (string->symbol
-                     (string-append (symbol->string (syntax-e i))
-                                    "."
-                                    (symbol->string (syntax-e #'attr)))))])
-       (quasisyntax/loc stx
-         (syntax-parse arg
-           [#,i #:declare #,i pat #'#,get-i])))]))
-
-(define (atom? v)
-  (or (number? v) (string? v) (boolean? v) (symbol? v) (char? v) (bytes? v) (regexp? v)))
-
-(define-syntax-class (3d pred)
-  (pattern s
-           #:attr datum (syntax-e #'s)
-           #:fail-unless (pred (attribute datum)) #f))
-
-(define-syntax-rule (define-pred-stxclass name pred)
-  (define-syntax-class name #:attributes (datum)
-    (pattern x
-             #:fail-unless (pred (syntax-e #'x)) #f
-             #:attr datum (syntax-e #'x))))
-
-(define-pred-stxclass atom atom?)
-(define-pred-stxclass byte-pregexp byte-pregexp?)
-(define-pred-stxclass byte-regexp byte-regexp?)
-(define-pred-stxclass pregexp pregexp?)
-(define-pred-stxclass regexp regexp?)
-(define-pred-stxclass bytes bytes?)
-(define-pred-stxclass id symbol?)
-(define-pred-stxclass keyword keyword?)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/tarjan.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/tarjan.rkt
deleted file mode 100644
index b032e27761..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/tarjan.rkt
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang racket/base
-
-;; This module provides an implementation of Tarjan's algorithm that
-;; will find the strongly connected components in a graph.
-
-(require data/queue
-         racket/dict)
-
-(provide tarjan
-         make-vertex
-         (struct-out vertex))
-
-;; The graph for the algorithm is defined by a dictionary mapping
-;; keys to vertices (see the contract on `tarjan` below). The vertices
-;; encode edges by holding the keys to adjacent vertices.
-
-;; A (Vertex K V) is a
-;;   (vertex V Boolean (Option Integer) (Option Integer) (Listof K))
-;;
-;; interp. a vertex in a graph, we only use this for Tarjan's algorithm
-;;   data     - data in the vertex, might be the key
-;;   stack?   - whether this vertex is on the stack (for speed)
-;;   index    - index tracked in Tarjan's algorithm
-;;   lowlink  - see index
-;;   adjacent - list of adjacent vertices by key
-(struct vertex (data [stack? #:mutable] [index #:mutable]
-                     [lowlink #:mutable] adjacent)
-        #:transparent)
-
-;; make-vertex : V (Listof K) -> (Vertex K V)
-;; A more convenient constructor for vertices
-(define (make-vertex key adjacent)
-  (vertex key #f #f #f adjacent))
-
-;; tarjan : (Dict K (Vertex K V)) -> (Listof (Listof (Vertex K V)))
-;; Implements Tarjan's algorithm. See Wikipedia
-;; http://en.wikipedia.org/wiki/Tarjan's_strongly_connected_components_algorithm
-;;
-;; Note that because this accumulates the result with `cons`, the components
-;; are actually output in topological order rather than *reverse* topological order.
-;; If you want reverse topological order, reverse the result.
-(define (tarjan vertices)
-  (define (strongly-connected vtx)
-    (set-vertex-index! vtx index)
-    (set-vertex-lowlink! vtx index)
-    (set! index (add1 index))
-    (enqueue-front! stack vtx)
-    (set-vertex-stack?! vtx #t)
-    (for ([successor-key (in-list (vertex-adjacent vtx))])
-      (define successor (dict-ref vertices successor-key))
-      (cond [(not (vertex-index successor))
-             (strongly-connected successor)
-             (set-vertex-lowlink! vtx
-                                  (min (vertex-lowlink vtx)
-                                       (vertex-lowlink successor)))]
-            [(vertex-stack? successor)
-             (set-vertex-lowlink! vtx
-                                  (min (vertex-lowlink vtx)
-                                       (vertex-index successor)))]))
-    ;; sets a result component if this was a root vertex
-    (when (= (vertex-lowlink vtx) (vertex-index vtx))
-      (define new-scc
-        (for/list ([elem (in-queue stack)]
-                   #:final (equal? vtx elem))
-          (dequeue! stack)
-          (set-vertex-stack?! elem #f)
-          elem))
-      (set! sccs (cons new-scc sccs))))
-
-  ;; the body
-  (define index 0)
-  (define stack (make-queue))
-  (define sccs '())
-  (for ([(key vtx) (in-dict vertices)]
-        #:unless (vertex-index vtx))
-    (strongly-connected vtx))
-  sccs)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/tc-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/tc-utils.rkt
deleted file mode 100644
index 1d644d2633..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/tc-utils.rkt
+++ /dev/null
@@ -1,301 +0,0 @@
-#lang racket/base
-
-#|
-This file is for utilities that are only useful for Typed Racket, but
-don't depend on any other portion of the system
-|#
-
-(require syntax/source-syntax "disappeared-use.rkt"
-         racket/match racket/promise racket/string
-         syntax/parse (for-syntax racket/base syntax/parse)
-         (only-in unstable/sequence in-slice))
-
-(provide ;; parameters
-         current-orig-stx
-         orig-module-stx
-         expanded-module-stx
-         current-type-error?
-         print-syntax?
-         warn-unreachable?
-         delay-errors?
-         current-type-names
-
-         stringify
-         locate-stx
-         warn-unreachable
-
-         save-errors!
-         restore-errors!
-         reset-errors!
-         report-first-error
-         report-all-errors
-         error-at-stx-loc?
-         tc-error/fields
-         tc-error/delayed
-         tc-error
-         tc-error/stx
-         int-err
-
-         typed-context?
-         make-env
-         id-from?
-         id-from
-
-         (all-from-out "disappeared-use.rkt"))
-
-;; a parameter representing the original location of the syntax being
-;; currently checked
-(define current-orig-stx (make-parameter #'here))
-(define orig-module-stx (make-parameter #f))
-(define expanded-module-stx (make-parameter #f))
-
-;; a parameter that represents whether a type error has occurred (#t) or
-;; not (#f) in the current dynamic extent
-(define current-type-error? (make-parameter #f))
-
-(define (stringify l [between " "])
-  (define (intersperse v l)
-    (cond [(null? l) null]
-          [(null? (cdr l)) l]
-          [else (cons (car l) (cons v (intersperse v (cdr l))))]))
-  (apply string-append
-         (intersperse between (map (lambda (s) (format "~a" s)) l))))
-
-;; do we print the fully-expanded syntax in error messages?
-(define print-syntax? (make-parameter #f))
-
-
-(define warn-unreachable? (make-parameter #t))
-
-(define (warn-unreachable e)
-  (let ([l (current-logger)]
-        [stx (locate-stx e)])
-    (when (and (warn-unreachable?)
-               (log-level? l 'warning)
-               (and (syntax-transforming?)
-                    (syntax-original? (syntax-local-introduce e)))
-               #;(and (orig-module-stx)
-                      (eq? (debugf syntax-source-module e)
-                           (debugf syntax-source-module (orig-module-stx))))
-               #;(syntax-source-module stx))
-      (log-message l 'warning
-                   (format "Typed Racket has detected unreachable code: ~.s"
-                           (locate-stx e))
-                   e))))
-
-(define locate-stx
-  ;; this hash handles using `locate-stx` even when orig/expand change
-  (let ([recover-table (make-hash)])
-    (lambda (stx)
-      (define omodule (orig-module-stx))
-      (define emodule (expanded-module-stx))
-      (cond [(and (not (print-syntax?)) omodule emodule stx)
-	     (define recover
-	       (hash-ref! recover-table (cons omodule emodule)
-			  (lambda () (recover-source-syntax omodule emodule))))
-	     (or (recover stx) stx)]
-	    [else stx]))))
-
-(define (raise-typecheck-error msg stxs)
-  (if (null? (cdr stxs))
-      (raise-syntax-error (string->symbol "Type Checker") msg (car stxs))
-      (raise-syntax-error (string->symbol "Type Checker") msg #f #f stxs)))
-
-(define delayed-errors null)
-
-(define-struct err (msg stx) #:prefab)
-
-(define-values (save-errors! restore-errors!)
-  (let ([v (box #f)])
-    (values (lambda () (set-box! v delayed-errors))
-            (lambda () (set! delayed-errors (unbox v))))))
-
-(define (reset-errors!) (set! delayed-errors null))
-
-(define (report-first-error)
-  (match (reverse delayed-errors)
-    [(list) (void)]
-    [(cons (struct err (msg stx)) _)
-     (reset-errors!)
-     (raise-typecheck-error msg stx)]))
-
-(define (report-all-errors)
-  (match (reverse delayed-errors)
-    [(list) (void)]
-    ;; if there's only one, we don't need multiple-error handling
-    [(list (struct err (msg stx)))
-     (reset-errors!)
-     (log-type-error msg stx)
-     (raise-typecheck-error msg stx)]
-    [l
-     (let ([stxs
-            (for/list ([e (in-list l)])
-              (with-handlers ([exn:fail:syntax?
-                               (λ (e) ((error-display-handler) (exn-message e) e))])
-                (log-type-error (err-msg e) (err-stx e))
-                (raise-typecheck-error (err-msg e) (err-stx e)))
-              (err-stx e))])
-       (reset-errors!)
-       (unless (null? stxs)
-         (raise-typecheck-error (format "Summary: ~a errors encountered"
-                                        (length stxs))
-                                (apply append stxs))))]))
-
-;; Returns #t if there's a type error recorded at the same position as
-;; the given syntax object. Does not return a useful result if the
-;; source, position, or span are #f.
-(define (error-at-stx-loc? stx)
-  (for/or ([an-err (in-list delayed-errors)])
-    (match-define (struct err (_ stxes)) an-err)
-    (define stx* (and (not (null? stxes)) (car stxes)))
-    (and stx*
-         (equal? (syntax-source stx*) (syntax-source stx))
-         (= (syntax-position stx*) (syntax-position stx))
-         (= (syntax-span stx*) (syntax-span stx)))))
-
-;; send type errors to DrRacket's tooltip system
-(define-logger online-check-syntax)
-(define (log-type-error msg stxes)
-  (define stx (and (not (null? stxes)) (car stxes)))
-  (when (and stx
-             (syntax-position stx)
-             (syntax-span stx))
-    (define tooltip-info
-      ;; see type-table.rkt for why we do this
-      (if (or (not (pair? (syntax-e stx)))
-              (let ([fst (car (syntax-e stx))])
-                (and (identifier? fst)
-                     (free-identifier=? fst #'quote))))
-          (list (vector stx
-                        (sub1 (syntax-position stx))
-                        (+ (sub1 (syntax-position stx)) (syntax-span stx))
-                        msg))
-          (list (vector stx
-                        (sub1 (syntax-position stx))
-                        (syntax-position stx)
-                        msg)
-                (vector stx
-                        (sub1 (+ (sub1 (syntax-position stx))
-                                 (syntax-span stx)))
-                        (+ (sub1 (syntax-position stx))
-                           (syntax-span stx))
-                        msg))))
-    (log-message online-check-syntax-logger
-                 'info
-                 "TR's type error tooltip syntaxes; this message is ignored"
-                 (list (syntax-property #'(void) 'mouse-over-tooltips tooltip-info)))))
-
-(define delay-errors? (make-parameter #f))
-
-(define (tc-error/delayed msg #:stx [stx* (current-orig-stx)] . rest)
-  (let ([stx (locate-stx stx*)])
-    (unless (syntax? stx)
-      (int-err "erroneous syntax was not a syntax object: ~a ~a"
-               stx (syntax->datum stx*)))
-    (current-type-error? #t)
-    (if (delay-errors?)
-        (set! delayed-errors (cons (make-err (apply format msg rest)
-                                             (list stx))
-                                   delayed-errors))
-        (raise-typecheck-error (apply format msg rest) (list stx)))))
-
-;; Produce a type error using modern Racket error syntax.
-;; Avoid using format directives in the `msg`, `more`, and `field`
-;; strings in the rest argument (may cause unexpected errors)
-(define (tc-error/fields msg
-                         #:more [more #f]
-                         #:stx [stx (current-orig-stx)]
-                         #:delayed? [delayed? #f]
-                         . rst)
-  (unless (even? (length rst))
-    (raise-argument-error
-     'tc-error/fields
-     "alternating fields and values"
-     rst))
-  (define-values (field-strs vals)
-    (for/fold ([field-strs null] [vals null])
-              ([field+value (in-slice 2 rst)])
-      (match-define (list field value) field+value)
-      (define field-strs*
-        (cons (format "  ~a: ~~a" field) field-strs))
-      (values field-strs* (cons value vals))))
-  (define more-msg (if more (string-append ";\n " more "\n") "\n"))
-  (define all-fields (string-join (reverse field-strs) "\n"))
-  (define final-msg
-    (string-trim #:left? #f (string-append msg more-msg all-fields)))
-  (if delayed?
-      (apply tc-error/delayed #:stx stx final-msg (reverse vals))
-      (apply tc-error/stx stx final-msg (reverse vals))))
-
-;; produce a type error, using the current syntax
-(define (tc-error msg . rest)
-  (let* ([ostx (current-orig-stx)]
-         [ostxs (if (list? ostx) ostx (list ostx))]
-         [stxs (map locate-stx ostxs)])
-    (current-type-error? #t)
-    ;; If this isn't original syntax, then we can get some pretty bogus error
-    ;; messages.  Note that this is from a macro expansion, so that introduced
-    ;; vars and such don't confuse the user.
-    (cond
-     [(or (not (orig-module-stx))
-          (for/and ([s (in-list ostxs)])
-            (eq? (syntax-source s) (syntax-source (orig-module-stx)))))
-      (raise-typecheck-error (apply format msg rest) stxs)]
-     [else (raise-typecheck-error
-            (apply format (string-append "Error in macro expansion -- " msg)
-                   rest)
-            stxs)])))
-
-;; produce a type error, given a particular syntax
-(define (tc-error/stx stx msg . rest)
-  (parameterize ([current-orig-stx stx])
-    (apply tc-error msg rest)))
-
-;; parameter for currently-defined type aliases
-;; this is used only for printing type names
-(define current-type-names (make-parameter (lazy '())))
-
-;; for reporting internal errors in the type checker
-(define-struct (exn:fail:tc exn:fail) ())
-
-;; raise an internal error - typechecker bug!
-(define (int-err msg . args)
-  (raise (make-exn:fail:tc
-          (string-append
-           "Internal Typechecker Error: "
-           (apply format msg args)
-           (format "\nwhile typechecking:\n~a\noriginally:\n~a"
-                   (syntax->datum (current-orig-stx))
-                   (syntax->datum (locate-stx (current-orig-stx)))))
-          (current-continuation-marks))))
-
-;; are we currently expanding in a typed module (or top-level form)?
-(define typed-context? (box #f))
-
-;; environment constructor
-(define-syntax (make-env stx)
-  (define-syntax-class spec
-    #:transparent
-    #:attributes (ty id)
-    (pattern [nm:identifier ~! ty]
-             #:fail-when (and (not (list? (identifier-template-binding #'nm))) #'nm)
-             "not a bound identifier"
-             #:with id #'(quote-syntax nm))
-    (pattern [e:expr ty]
-             #:with id #'e))
-  (syntax-parse stx
-    [(_ e:spec ...)
-     #'(list (list e.id e.ty) ...)]))
-
-;; id: identifier
-;; sym: a symbol
-;; mod: a quoted require spec like 'racket/base
-;; is id the name sym defined in mod?
-(define (id-from? id sym mod)
-  (and (eq? (syntax-e id) sym)
-       (eq? (module-path-index-resolve (syntax-source-module id))
-            ((current-module-name-resolver) mod #f #f #f))))
-
-(define-syntax-class (id-from sym mod)
-  (pattern i:id
-           #:fail-unless (id-from? #'i sym mod) #f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/timing.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/timing.rkt
deleted file mode 100644
index 122583fad5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/timing.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-(provide start-timing do-time)
-
-;; some macros to do some timing, only when `timing?' is #t
-(define-for-syntax timing? #t)
-
-(define-logger tr-timing)
-
-(define last-time #f) (define initial-time #f) (define gc-time #f)
-(define (set!-initial-time t) (set! initial-time t))
-(define (set!-last-time t) (set! last-time t))
-(define (set!-gc-time t) (set! gc-time t))
-(define (pad str len pad-char)
-  (define l (string-length str))
-  (if (>= l len)
-      str
-      (string-append str (make-string (- len l) pad-char))))
-(define-syntaxes (start-timing do-time)
-  (if timing?
-      (values
-       (syntax-rules ()
-         [(_ msg)
-          (log-tr-timing-debug
-           (begin
-             (when last-time
-               (error 'start-timing "Timing already started"))
-             (set!-last-time (current-process-milliseconds))
-             (set!-initial-time last-time)
-             (set!-gc-time (current-gc-milliseconds))
-             (format "~a at ~a"
-                     (pad "Starting" 32 #\space) initial-time)))])
-       (syntax-rules ()
-         [(_ msg)
-          (log-tr-timing-debug
-           (begin
-             (unless last-time
-               (start-timing msg))
-             (let* ([t (current-process-milliseconds)]
-                    [gc (current-gc-milliseconds)]
-                    [old last-time]
-                    [diff (- t old)]
-                    [gc-diff (- gc gc-time)]
-                    [new-msg (pad msg 40 #\space)])
-               (set!-last-time t)
-               (set!-gc-time gc)
-               (format "~a at ~a\tlast step: ~a\tgc: ~a\ttotal: ~a"
-                       new-msg t diff gc-diff (- t initial-time)))))]))
-      (values (lambda _ #'(void)) (lambda _ #'(void)))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/unit-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/unit-utils.rkt
deleted file mode 100644
index aeec3dcf38..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/unit-utils.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base) "utils.rkt" racket/unit)
-
-(provide cond-contracted)
-
-(define-signature-form (cond-contracted stx)
-  (syntax-case stx ()
-    [(_ nm cnt)
-     (if enable-contracts?
-         (list #'[contracted (nm cnt)])
-         (list #'nm))]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/utils.rkt
deleted file mode 100644
index 36a6a8b04e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/utils.rkt
+++ /dev/null
@@ -1,202 +0,0 @@
-#lang racket/base
-
-#|
-This file is for utilities that are of general interest,
-at least theoretically.
-|#
-
-(require (for-syntax racket/base syntax/parse racket/string unstable/sequence)
-         racket/require-syntax racket/provide-syntax
-         racket/struct-info "timing.rkt")
-
-(provide
- ;; optimization
- optimize?
- ;; timing
- start-timing do-time
- ;; logging
- show-input?
- ;; provide macros
- rep utils typecheck infer env private types static-contracts)
-
-(define optimize? (make-parameter #t))
-(define-for-syntax enable-contracts? (and (getenv "PLT_TR_CONTRACTS") #t))
-
-(define-syntax do-contract-req
-  (if enable-contracts?
-      (lambda (stx) (datum->syntax stx '(begin
-                                         (require racket/contract/base)
-                                         (require racket/contract/region))))
-      (syntax-rules () [(_) (begin)])))
-(do-contract-req)
-
-(define show-input? (make-parameter #f))
-
-;; fancy require syntax
-(define-syntax (define-requirer stx)
-  (syntax-parse stx
-    [(_ nm:id nm-out:id)
-     #`(...
-        (begin
-          (define-require-syntax (nm stx)
-            (syntax-parse stx
-              [(form id:identifier ...)
-               (with-syntax ([(id* ...)
-                              (for/list ([id (in-syntax #'(id ...))])
-                                (datum->syntax
-                                 id
-                                 `(lib
-                                   ,(datum->syntax
-                                     #f
-                                     (string-join
-                                      (list "typed-racket"
-                                            (symbol->string (syntax-e #'nm))
-                                            (string-append (symbol->string (syntax-e id)) ".rkt"))
-                                      "/")
-                                     id id))
-                                 id id))])
-                 (syntax-property (syntax/loc stx (combine-in id* ...))
-                                  'disappeared-use
-                                  #'form))]))
-          (define-provide-syntax (nm-out stx)
-            (syntax-parse stx
-              [(_ id:identifier ...)
-               (with-syntax ([(id* ...)
-                              (for/list ([id (in-syntax #'(id ...))])
-                                (datum->syntax
-                                 id
-                                 `(lib
-                                   ,(datum->syntax
-                                     #f
-                                     (string-join
-                                      (list "typed-racket"
-                                            (symbol->string (syntax-e #'nm))
-                                            (string-append (symbol->string (syntax-e id)) ".rkt"))
-                                      "/")
-                                     id id))))])
-                 (syntax/loc stx (combine-out (all-from-out id*) ...)))]))
-          (provide nm nm-out)))]))
-
-
-(define-requirer rep rep-out)
-(define-requirer infer infer-out)
-(define-requirer typecheck typecheck-out)
-(define-requirer utils utils-out)
-(define-requirer env env-out)
-(define-requirer private private-out)
-(define-requirer types types-out)
-(define-requirer optimizer optimizer-out)
-(define-requirer base-env base-env-out)
-(define-requirer static-contracts static-contracts-out)
-
-;; turn contracts on and off - off by default for performance.
-(provide (for-syntax enable-contracts?)
-         provide/cond-contract
-         with-cond-contract
-         define-struct/cond-contract
-         define/cond-contract
-         contract-req
-         define/cond-contract/provide
-         define-for-cond-contract
-         provide-for-cond-contract
-         require-for-cond-contract)
-
-(define-require-syntax contract-req
-  (if enable-contracts?
-      (lambda (stx) (datum->syntax stx 'racket/contract))
-      (syntax-rules ()
-        [(_) (combine-in)])))
-
-(define-syntax define-for-cond-contract
-  (if enable-contracts?
-      (make-rename-transformer #'define)
-      (syntax-parser
-        [(_ args:expr body:expr) #'(begin)])))
-
-(define-syntax provide-for-cond-contract
-  (if enable-contracts?
-      (make-rename-transformer #'provide)
-      (syntax-parser
-        [(_ provide-spec:expr ...) #'(begin)])))
-
-(define-syntax require-for-cond-contract
-  (if enable-contracts?
-      (make-rename-transformer #'require)
-      (syntax-parser
-        [(_ require-spec:expr ...) #'(begin)])))
-
-
-(define-syntax-rule (define/cond-contract/provide (name . args) c . body)
-  (begin (define/cond-contract name c
-           (begin
-            (define (name . args) body)
-            name))
-         (provide/cond-contract [name c])))
-
-;; these are versions of the contract forms conditionalized by `enable-contracts?'
-(define-syntax provide/cond-contract
-  (if enable-contracts?
-      (make-rename-transformer #'provide/contract)
-      (lambda (stx)
-        (define-syntax-class clause
-          #:attributes (i)
-          (pattern [(~datum struct) (~or nm:id (nm:id super:id)) (flds ...)]
-                   #:with i #'(struct-out nm))
-          (pattern [(~datum rename) out:id in:id cnt:expr]
-                   #:with i #'(rename-out [out in]))
-          (pattern [i:id cnt:expr]))
-        (syntax-parse stx
-          [(_ c:clause ...)
-           #'(provide c.i ...)]))))
-
-(define-syntax with-cond-contract
-  (if enable-contracts?
-      (make-rename-transformer #'with-contract)
-      (lambda (stx)
-        (syntax-parse stx
-          [(_ name (~or #:results #:result) spec . body)
-           #'(let () . body)]
-          [(_ name specs . body)
-           #'(begin . body)]))))
-
-(define-syntax define/cond-contract
-  (if enable-contracts?
-      (make-rename-transformer #'define/contract)
-      (lambda (stx)
-        (syntax-parse stx
-          [(_ head cnt . body)
-           (syntax/loc stx (define head . body))]))))
-
-(define-syntax define-struct/cond-contract
-  (if enable-contracts?
-      (make-rename-transformer #'define-struct/contract)
-      (syntax-rules ()
-        [(_ hd ([i c] ...) . opts)
-         (define-struct hd (i ...) . opts)])))
-
-
-(provide make-struct-info-self-ctor)
-;Copied from racket/private/define-struct
-;FIXME when multiple bindings are supported
-(define (self-ctor-transformer orig stx)
-  (define (transfer-srcloc orig stx)
-    (datum->syntax orig (syntax-e orig) stx orig))
-  (syntax-case stx ()
-    [(self arg ...) (datum->syntax stx
-                                   (cons (syntax-property (transfer-srcloc orig #'self)
-                                                          'constructor-for
-                                                          (syntax-local-introduce #'self))
-                                         (syntax-e (syntax (arg ...))))
-                                   stx
-                                   stx)]
-    [_ (transfer-srcloc orig stx)]))
-
-
-(define make-struct-info-self-ctor
- (let ()
-  (struct struct-info-self-ctor (id info)
-          #:property prop:procedure
-                     (lambda (ins stx)
-                      (self-ctor-transformer (struct-info-self-ctor-id ins) stx))
-          #:property prop:struct-info (λ (x) (extract-struct-info (struct-info-self-ctor-info x))))
-  struct-info-self-ctor))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/file/md5.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/file/md5.rkt
deleted file mode 100644
index 727950f4c5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/file/md5.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket/base
-(require/typed file/md5
-               [md5 (case->
-                      ((U Bytes String Input-Port) -> Bytes)
-                      ((U Bytes String Input-Port) Boolean -> Bytes))])
-(provide md5)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/file/tar.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/file/tar.rkt
deleted file mode 100644
index 4d34a624b5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/file/tar.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang typed/racket/base
-;; typed-racket wrapper on file/tar
-;; yc 2009/2/25
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; basic type aliases.
-(define-type-alias Path-String (U Path String))
-
-(require/typed file/tar
-               ;; tar appears to return exact-nonenegative-integer? instead of void?
-               [tar (Path-String Path-String * -> Integer)]
-               ;; tar->output appears to take (listof path) instead of (listof path-string?)
-               ;; it also appears to return exact-nonenegative-integer?
-               [tar->output (case-lambda ((Listof Path) -> Integer)
-                                         ((Listof Path) Output-Port -> Integer))]
-               ;; tar->gzip
-               ;; missing from file/tar but available in mzlib/tar
-               ;; actually returns void?
-               [tar-gzip (Path-String Path-String * -> Void)]
-               )
-
-(provide tar tar->output tar-gzip)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/no-check-helper.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/no-check-helper.rkt
deleted file mode 100644
index e57fc733fb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/no-check-helper.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-
-;; This module provides compatibility macros for no-check mode
-
-(require
- (except-in typed-racket/base-env/prims
-            require/typed require/opaque-type require-typed-struct require/typed/provide)
- typed-racket/base-env/base-types-extra
- (for-syntax racket/base syntax/parse syntax/struct
-             syntax/parse/experimental/template))
-(provide (all-from-out racket/base)
-         (all-defined-out)
-         (all-from-out typed-racket/base-env/prims
-                       typed-racket/base-env/base-types-extra))
-
-
-(define-syntaxes (require/typed require/typed/provide)
-  (let ()
-    (define-syntax-class opt-rename
-      #:attributes (nm spec)
-      (pattern nm:id
-               #:with spec #'nm)
-      (pattern (orig-nm:id internal-nm:id)
-               #:with spec #'(orig-nm internal-nm)
-               #:with nm #'internal-nm))
-    (define-syntax-class simple-clause
-      #:attributes (nm ty name)
-      (pattern [nm:opt-rename ty]
-               #:with name (attribute nm.nm)))
-    (define-syntax-class struct-clause
-      #:attributes (nm (body 1) (opts 1))
-      (pattern [(~or #:struct (~datum struct)) nm:opt-rename (body ...)
-                                               opts:struct-option ...]))
-    (define-syntax-class opaque-clause
-      #:attributes (ty pred opt)
-      (pattern [(~or #:opaque (~datum opaque)) ty:id pred:id]
-               #:with opt #'())
-      (pattern [(~or #:opaque (~datum opaque)) ty:id pred:id #:name-exists]
-               #:with opt #'(#:name-exists)))
-    (define-splicing-syntax-class struct-option
-      (pattern (~seq #:constructor-name cname:id))
-      (pattern (~seq #:extra-constructor-name extra-cname:id)))
-    (values
-     (syntax-parser 
-       [(_ lib (~or sc:simple-clause strc:struct-clause oc:opaque-clause) ...)
-        (template
-         (begin
-           (require/opaque-type oc.ty oc.pred lib . oc.opt) ...
-           (require/typed sc.nm sc.ty lib) ...
-           (require-typed-struct strc.nm (strc.body ...) (?@ . strc.opts) ... lib) ...))]
-       [(_ nm:opt-rename ty lib (~optional [~seq #:struct-maker parent]) ...)
-        #'(require (only-in lib nm.spec))]) 
-     (syntax-parser
-       [(_ lib (~or sc:simple-clause strc:struct-clause oc:opaque-clause) ...)
-        (template
-         (begin
-           (require/opaque-type oc.ty oc.pred lib . oc.opt) ...
-           (provide oc.pred) ...
-           (require/typed sc.nm sc.ty lib) ...
-           (provide sc.nm) ...
-           (require-typed-struct strc.nm (strc.body ...) (?@ . strc.opts) ... lib) ...
-           (provide (struct-out strc.nm)) ...))]
-       [(_ nm:opt-rename ty lib (~optional [~seq #:struct-maker parent]) ...)
-        #'(begin (require (only-in lib nm.spec))
-                 (provide nm.nm))]))))
-
-(define-syntax-rule (require/opaque-type ty pred lib . _)
-  (require (only-in lib pred)))
-
-(define-syntax (require-typed-struct stx)
-  (syntax-parse stx #:literals (:)
-    [(_ (~or nm:id (nm:id _:id)) ([fld : ty] ...)
-        (~or (~and (~seq) (~bind [cname #'#f] [extra-cname #'#f]))
-             (~and (~seq #:constructor-name cname)
-                   (~bind [extra-cname #'#f]))
-             (~and (~seq #:extra-constructor-name extra-cname)
-                   (~bind [cname #'#f])))
-        lib)
-     (with-syntax ([(struct-info maker pred sel ...)
-                    (build-struct-names #'nm (syntax->list #'(fld ...)) #f #t
-                                        #:constructor-name
-                                        (if (syntax-e #'cname) #'cname #'nm))])
-       #`(require (only-in lib
-                           struct-info
-                           maker
-                           #,@(if (syntax-e #'extra-cname)
-                                  #'(extra-cname)
-                                  #'())
-                           pred sel ...)))]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/rewriter.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/rewriter.rkt
deleted file mode 100644
index 295e4affda..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/rewriter.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket/base
-(require (for-syntax syntax/parse racket/base syntax/id-table racket/dict))
-
-(define-for-syntax code-insp
-  (variable-reference->module-declaration-inspector
-   (#%variable-reference)))
-
-(define-for-syntax (rewrite stx tbl from)
-  (define (rw stx)
-     (syntax-parse (syntax-disarm stx code-insp) #:literal-sets (kernel-literals)
-       [i:identifier
-        (dict-ref tbl #'i #'i)]
-       ;; no expressions here
-       [((~or (~literal #%top) (~literal quote) (~literal quote-syntax)) . _) stx]
-       [(#%plain-lambda formals expr ...)
-        (quasisyntax/loc stx (#%plain-lambda formals #,@(map rw (syntax->list #'(expr ...)))))]
-       [(case-lambda [formals expr ...] ...)
-        (with-syntax ([((expr* ...) ...) (for*/list ([exprs (in-list (syntax->list #'((expr ...) ...)))]
-                                                     [e (in-list (syntax->list exprs))])
-                                           (rw e))])
-          (quasisyntax/loc stx (case-lambda [formals expr* ...] ...)))]
-       [(let-values ([(id ...) rhs] ...) expr ...)
-        (with-syntax ([(rhs* ...) (map rw (syntax->list #'(rhs ...)))]
-                      [(expr* ...) (map rw (syntax->list #'(expr ...)))])
-          (quasisyntax/loc stx (let-values ([(id ...) rhs*] ...) expr* ...)))]
-       [(letrec-values ([(id ...) rhs] ...) expr ...)
-        (with-syntax ([(rhs* ...) (map rw (syntax->list #'(rhs ...)))]
-                      [(expr* ...) (map rw (syntax->list #'(expr ...)))])
-          (quasisyntax/loc stx (letrec-values ([(id ...) rhs*] ...) expr* ...)))]
-       [(letrec-syntaxes+values ([(sid ...) srhs] ...) ([(id ...) rhs] ...) expr ...)
-        (with-syntax ([(srhs* ...) (map rw (syntax->list #'(srhs ...)))]
-                      [(rhs* ...) (map rw (syntax->list #'(rhs ...)))]
-                      [(expr* ...) (map rw (syntax->list #'(expr ...)))])
-          (quasisyntax/loc stx (letrec-syntaxes+values ([(sid ...) srhs*] ...) ([(id ...) rhs*] ...) expr* ...)))]
-       [((~and kw
-               (~or if begin begin0 set! #%plain-app #%expression
-                    #%variable-reference with-continuation-mark))
-         expr ...)
-        (quasisyntax/loc stx (#,#'kw #,@(map rw (syntax->list #'(expr ...)))))]))
-  (rw stx))
-
-(define-syntax (define-rewriter stx)
-  (syntax-case stx ()
-    [(_ orig-name new-name [from to] ...)
-     #'(begin
-         (define-for-syntax from-list (list #'from ...))
-         (define-for-syntax tbl (make-immutable-free-id-table (map cons from-list (list #'to ...))))
-         (define-syntax (new-name stx)
-           (syntax-case stx ()
-             [(_ . args)
-              (let ([result (local-expand (syntax/loc stx (orig-name . args)) (syntax-local-context) null)])
-                (rewrite result tbl from-list))])))]))
-
-(provide define-rewriter)
-#;(define-syntax-rule (m x) (+ x 7))
-
-#;(define-rewriter m n [+ -])
-
-#;(n 77)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/utils.rkt
deleted file mode 100644
index 7fadcec2fd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/utils.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket/base
-
-(define-syntax-rule (dt nm t)
-  (begin (define-type-alias nm t) (provide nm)))
-
-(provide dt)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/wrap.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/wrap.rkt
deleted file mode 100644
index 8052e4d206..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/private/wrap.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket
-
-(define-syntax (mb stx)
-  (syntax-case stx ()
-    [(_ id)
-     #'(#%plain-module-begin
-	(require id)
-	(provide (all-from-out id)))]))
-
-(provide (rename-out [mb #%module-begin]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket.rkt
deleted file mode 100644
index 0c9e713408..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed-racket/minimal
-
-(require typed/racket/base racket/require
-         (subtract-in racket typed/racket/base racket/contract
-                      typed/racket/class)
-         typed/racket/class
-	 (for-syntax racket/base))
-(provide (all-from-out racket
-                       typed/racket/base
-                       typed/racket/class)
-	 (for-syntax (all-from-out racket/base))
-         class)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base.rkt
deleted file mode 100644
index ff139a34e7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang typed-racket/minimal
-
-(providing (libs (except racket/base #%module-begin #%top-interaction
-                         with-handlers default-continuation-prompt-tag
-                         define λ lambda define-struct for for*
-                         let let* let-values letrec letrec-values
-                         let/cc let/ec do case-lambda struct
-                         for/list for/vector for/hash for/hasheq for/hasheqv
-                         for/and for/or for/sum for/product for/lists
-                         for/first for/last for/fold for*/list for*/lists
-                         for*/vector for*/hash for*/hasheq for*/hasheqv for*/and
-                         for*/or for*/sum for*/product for*/first for*/last
-                         for*/fold))
-           (basics #%module-begin #%top-interaction))
-
-(require typed-racket/base-env/extra-procs
-         (except-in typed-racket/base-env/prims
-           require-typed-struct-legacy
-           require/typed-legacy)
-         typed-racket/base-env/base-types
-         typed-racket/base-env/base-types-extra)
-(provide (rename-out [define-type-alias define-type])
-         (all-from-out typed-racket/base-env/prims)
-         (all-from-out typed-racket/base-env/base-types)
-         (all-from-out typed-racket/base-env/base-types-extra)
-         assert defined? with-type for for*)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/lang/reader.rkt
deleted file mode 100644
index 9432d448c3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/lang/reader.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang s-exp syntax/module-reader
-
-typed/racket/base
-
-#:read r:read
-#:read-syntax r:read-syntax
-#:info make-info
-#:language-info make-language-info
-
-(define (make-info key default use-default)
-  (case key
-    [(drscheme:toolbar-buttons)
-     ;; If Optimization Coach is installed, load it.
-     (with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
-       (collection-path "optimization-coach")
-       (list (dynamic-require 'optimization-coach/tool
-                              'optimization-coach-drracket-button)))]
-    [else (use-default key default)]))
-
-(define make-language-info
-  `#(typed-racket/language-info get-info ()))
-
-
-(require (prefix-in r: typed-racket/typed-reader))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/no-check.rkt
deleted file mode 100644
index 45eb6f6008..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/no-check.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed-racket/minimal
-
-(require racket/require typed/racket/no-check (subtract-in typed/racket/base typed/racket/no-check))
-(provide (all-from-out typed/racket/base typed/racket/no-check))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/no-check/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/no-check/lang/reader.rkt
deleted file mode 100644
index 4af7c2e3be..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/base/no-check/lang/reader.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang s-exp syntax/module-reader
-
-typed/racket/base/no-check
-
-#:read r:read
-#:read-syntax r:read-syntax
-
-(require (prefix-in r: typed-racket/typed-reader))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/class.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/class.rkt
deleted file mode 100644
index 10a99e2a7f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/class.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-
-(require racket/require
-         (subtract-in racket/class
-                      typed-racket/base-env/class-prims)
-         typed-racket/base-env/class-prims)
-
-(provide (all-from-out typed-racket/base-env/class-prims)
-         (all-from-out racket/class))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/date.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/date.rkt
deleted file mode 100644
index c4a718ce2d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/date.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang typed/racket/base
-(require "../private/utils.rkt")
-(require/typed/provide 
- racket/date
- [date->seconds (case-> (date -> Integer)
-                        (date Any -> Integer))]
- [date->string (case-> (date -> String)
-                       (date Any -> String))]
- [current-date (-> date)]
- [date-display-format (Parameterof (U 'american 'chinese 'german 'indian 
-                                      'irish 'iso-8601 'rfc2822 'julian))]
- [find-seconds (case-> (Integer Integer Integer Integer Integer Integer -> Integer)
-                       (Integer Integer Integer Integer Integer Integer Any -> Integer))]
- [date->julian/scalinger (date -> Integer)]
- [julian/scalinger->string (Integer -> String)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/lang/reader.rkt
deleted file mode 100644
index 7ce2471b8b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/lang/reader.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang s-exp syntax/module-reader
-
-typed/racket
-
-#:read r:read
-#:read-syntax r:read-syntax
-#:info make-info
-#:language-info make-language-info
-
-(define (make-info key default use-default)
-  (case key
-    [(drscheme:toolbar-buttons)
-     ;; If Optimization Coach is installed, load it.
-     (with-handlers ([exn:fail:filesystem? (lambda _ '())]) ; not found
-       (collection-path "optimization-coach")
-       (list (dynamic-require 'optimization-coach/tool
-                              'optimization-coach-drracket-button)))]
-    [else (use-default key default)]))
-
-(define make-language-info
-  `#(typed-racket/language-info get-info ()))
-
-
-(require (prefix-in r: typed-racket/typed-reader))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/no-check.rkt
deleted file mode 100644
index 1d7abb52af..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/no-check.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed-racket/minimal
-
-(require racket/require typed/private/no-check-helper
-         (subtract-in typed/racket typed/private/no-check-helper))
-(provide (all-from-out typed/racket typed/private/no-check-helper))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/no-check/lang/reader.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/no-check/lang/reader.rkt
deleted file mode 100644
index 0f9a2271b8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/no-check/lang/reader.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang s-exp syntax/module-reader
-
-typed/racket/no-check
-
-#:read r:read
-#:read-syntax r:read-syntax
-
-(require (prefix-in r: typed-racket/typed-reader))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/system.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/system.rkt
deleted file mode 100644
index 57db3086a8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed/racket/system.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang s-exp typed/private/wrap racket/system
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/unstable/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/unstable/info.rkt
deleted file mode 100644
index 5eb161fba1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/unstable/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define test-responsibles '(("match.rkt" samth)
-                            ("logging.rkt" stamourv)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/unstable/logging.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/unstable/logging.rkt
deleted file mode 100644
index f8419aa109..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/unstable/logging.rkt
+++ /dev/null
@@ -1,94 +0,0 @@
-#lang racket/base
-
-(require racket/contract/base)
-
-(define level/c (or/c 'fatal 'error 'warning 'info 'debug))
-(define log-spec/c (listof (or/c symbol? #f)))
-(define log-message/c (vector/c level/c string? any/c (or/c symbol? #f)))
-
-;; helper used below
-(define (receiver-thread receiver stop-chan intercept)
-  (thread
-   (lambda ()
-     (define (clear-events)
-       (let ([l (sync/timeout 0 receiver)])
-         (when l ; still something to read
-           (intercept l) ; interceptor gets the whole vector
-           (clear-events))))
-     (let loop ()
-       (let ([l (sync receiver stop-chan)])
-         (cond [(eq? l 'stop)
-                ;; we received all the events we were supposed
-                ;; to get, read them all (w/o waiting), then
-                ;; stop
-                (clear-events)]
-               [else ; keep going
-                (intercept l)
-                (loop)]))))))
-
-(struct listener (stop-chan
-                  ;; ugly, but the thread and the listener need to know each
-                  ;; other
-                  [thread #:mutable]
-                  [rev-messages #:mutable]
-                  [done? #:mutable]))
-
-;; [level] -> listener
-(define (start-recording . log-spec)
-  (let* ([receiver     (apply make-log-receiver (current-logger) log-spec)]
-         [stop-chan    (make-channel)]
-         [cur-listener (listener stop-chan #f '() #f)]
-         [t (receiver-thread
-             receiver stop-chan
-             (lambda (l)
-               (set-listener-rev-messages!
-                cur-listener
-                (cons l (listener-rev-messages cur-listener)))))])
-    (set-listener-thread! cur-listener t)
-    cur-listener))
-
-;; listener -> listof messages
-(define (stop-recording cur-listener)
-  (unless (listener-done? cur-listener)
-    (channel-put (listener-stop-chan cur-listener)
-                 'stop) ; stop the receiver thread
-    (thread-wait (listener-thread cur-listener))
-    (set-listener-done?! cur-listener #t))
-  (reverse (listener-rev-messages cur-listener)))
-
-(provide/contract
- [start-recording (->* () #:rest log-spec/c listener?)]
- [stop-recording  (-> listener? (listof log-message/c))])
-
-
-(define (with-intercepted-logging interceptor proc . log-spec)
-  (let* ([orig-logger (current-logger)]
-         ;; We use a local logger to avoid getting messages that didn't
-         ;; originate from proc. Since it's a child of the original logger,
-         ;; the rest of the program still sees the log entries.
-         [logger      (make-logger #f orig-logger)]
-         [receiver    (apply make-log-receiver logger log-spec)]
-         [stop-chan   (make-channel)]
-         [t           (receiver-thread receiver stop-chan interceptor)])
-    (begin0
-        (parameterize ([current-logger logger])
-          (proc))
-      (channel-put stop-chan 'stop) ; stop the receiver thread
-      (thread-wait t))))
-
-(define (with-logging-to-port port proc . log-spec)
-  (apply with-intercepted-logging
-         (lambda (l) (displayln (vector-ref l 1) ; actual message
-                                port))
-         proc
-         log-spec))
-
-(provide/contract [with-intercepted-logging
-                   (->* ((-> log-message/c any)
-                         (-> any))
-                        #:rest log-spec/c
-                        any)]
-                  [with-logging-to-port
-                   (->* (output-port? (-> any))
-                        #:rest log-spec/c
-                        any)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/unstable/match.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/unstable/match.rkt
deleted file mode 100644
index d40270f8a2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/unstable/match.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/match
-         (for-syntax racket/base)
-         (for-syntax syntax/parse))
-
-(provide match? match*? as object)
-
-(define-syntax-rule (match? e p ...)
-  (match e [p #t] ... [_ #f]))
-
-(define-match-expander as
-  (syntax-rules ()
-    [(as ([x e] ...) p ...) (and (app (lambda (y) e) x) ... p ...)]))
-
-;; Added by asumu
-;; Like match? but with match*
-(define-syntax (match*? stx)
-  (syntax-parse stx
-   [(_ (e ...) (p ...) ...)
-    (with-syntax ([(?_ ...) (generate-temporaries #'(e ...))])
-     #'(match* (e ...) [(p ...) #t] ... [(?_ ...) #f]))]))
-
-;; Added by asumu
-;; Match expander for objects from racket/class
-(define-match-expander object
-  (λ (stx)
-    (define-syntax-class field
-      #:attributes (name pat)
-      (pattern
-        ((~datum field)
-         name
-         (~optional pat #:defaults ([pat #'name])))))
-
-    (syntax-parse stx
-      [(object f:field ...)
-       #'(and (? object?)
-              (and (? (λ (o) (field-bound? f.name o)))
-                   (app (λ (o) (get-field f.name o))
-                        f.pat))
-              ...)]
-      [(object class f:field ...)
-       #'(and (? (λ (o) (is-a? o class)))
-              (object f ...))])))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/LICENSE.txt b/pkgs/typed-racket-pkgs/typed-racket-more/LICENSE.txt
deleted file mode 100644
index 119ee7d588..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-typed-racket-more
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt
deleted file mode 100644
index 7926e1ce2f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("srfi-lite-lib"
-               "base"
-	       "net-lib"
-               "draw-lib"
-               "rackunit-lib"
-               "rackunit-gui"
-               "snip-lib"
-               "typed-racket-lib"
-               "gui-lib"
-               "pict-lib"
-               "sandbox-lib"))
-
-(define pkg-desc "Types for various libraries")
-
-(define pkg-authors '(samth stamourv))
-
-(define version "1.1")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/file/gif.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/file/gif.rkt
deleted file mode 100644
index af4824e422..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/file/gif.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/opaque-type GIF-Stream gif-stream? file/gif)
-
-(define-type GIF-Colormap (Listof (Vector Integer Integer Integer)))
-
-(require/typed/provide file/gif
-  [gif-start ( Output-Port Integer Integer Integer (U #f GIF-Colormap) -> GIF-Stream )]
-  [gif-add-image ( GIF-Stream Integer Integer Integer Integer Any (U #f GIF-Colormap) Bytes -> Void )]
-  [gif-add-control ( GIF-Stream (U 'any 'keep 'restore-bg 'restore-prev) Any Integer (U #f Integer) -> Void)]
-  [gif-add-loop-control ( GIF-Stream Integer -> Void )]
-  [gif-add-comment ( GIF-Stream Bytes -> Void )]
-  [gif-end ( GIF-Stream -> Void )]
-  [quantize ( Bytes -> (values Bytes GIF-Colormap (U #f Integer)))])
-
-(provide gif-stream? GIF-Stream GIF-Colormap)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework.rkt
deleted file mode 100644
index 96280930e4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework.rkt
+++ /dev/null
@@ -1,742 +0,0 @@
-#lang s-exp typed-racket/base-env/extra-env-lang
-
-;; A typed wrapper for the framework library
-
-(require framework
-         framework/splash
-         (for-syntax (only-in (rep type-rep)
-                              make-Instance
-                              make-HeterogeneousVector
-                              [make-Opaque -opq]))
-         "racket/private/gui-types.rkt"
-         (for-syntax (submod "racket/private/gui-types.rkt" #%type-decl))
-         "private/framework-types.rkt"
-         (for-syntax (submod "private/framework-types.rkt" #%type-decl)))
-
-(provide (all-from-out "private/framework-types.rkt"))
-
-(begin-for-syntax
- (define -Button% (parse-type #'Button%))
- (define -Event% (parse-type #'Event%))
- (define -Color% (parse-type #'Color%))
- (define -Style-Delta% (parse-type #'Style-Delta%))
- (define -Area-Container<%> (parse-type #'Area-Container<%>))
- (define -Panel% (parse-type #'Panel%))
- (define -Vertical-Panel% (parse-type #'Vertical-Panel%))
- (define -Snip-Class% (parse-type #'Snip-Class%))
- (define -Keymap% (parse-type #'Keymap%))
- (define -Top-Level-Window<%> (parse-type #'Top-Level-Window<%>))
- (define -Dialog% (parse-type #'Dialog%))
- (define -Frame% (parse-type #'Frame%))
- (define -Menu% (parse-type #'Menu%))
- (define -Menu-Item% (parse-type #'Menu-Item%))
- (define -Bitmap% (parse-type #'Bitmap%))
- (define -Menu-Item-Container<%> (parse-type #'Menu-Item-Container<%>))
- (define -Window<%> (parse-type #'Window<%>))
- (define -Cursor% (parse-type #'Cursor%))
- (define -Popup-Menu% (parse-type #'Popup-Menu%))
- (define -Editor<%> (parse-type #'Editor<%>))
- (define -Snip% (parse-type #'Snip%))
- (define -Area-Container-Window<%> (parse-type #'Area-Container-Window<%>))
- (define -Text% (parse-type #'Text%))
- (define -Editor-Wordbreak-Map% (parse-type #'Editor-Wordbreak-Map%))
- (define -DC<%> (parse-type #'DC<%>))
- (define -Canvas% (parse-type #'Canvas%))
- (define -Key-Event% (parse-type #'Key-Event%))
- (define -Mouse-Event% (parse-type #'Mouse-Event%))
- (define -Radio-Box% (parse-type #'Radio-Box%))
- (define -Check-Box% (parse-type #'Check-Box%))
- (define -Choice% (parse-type #'Choice%))
- (define -List-Box% (parse-type #'List-Box%))
- (define -Area<%> (parse-type #'Area<%>))
- (define -Frame:Editor<%> (parse-type #'Frame:Editor<%>))
-
- (define -Color-Prefs:Color-Scheme-Style-Name (-opq #'color-prefs:color-scheme-style-name?))
- (define -Color-Prefs:Known-Color-Scheme-Name (-opq #'color-prefs:known-color-scheme-name?))
- (define -Color-Model:Xyz (-opq #'color-model:xyz?))
- (define -Eventspace (-opq #'eventspace?))
- (define -Handler:Handler (-opq #'handler:handler?))
- (define -Printable Univ) ; FIXME printable/c from 27
- (define -Exn:Unknown-Preference (-opq #'exn:unknown-preference?))
- (define -Preferences:Snapshot (-opq #'preferences:snapshot?))
- (define -Continuation-Mark-Set (-opq #'continuation-mark-set?))
- (define -Struct Univ) ; FIXME
- (define -Text:Range (-opq #'text:range?))
-
- ; Frequently reused instances
- (define -Color%-Instance (make-Instance -Color%))
- (define -Mouse-Event%-Instance (make-Instance -Mouse-Event%))
- (define -Key-Event%-Instance (make-Instance -Key-Event%))
- (define -Canvas%-Instance (make-Instance -Canvas%))
- (define -Vertical-Panel%-Instance (make-Instance -Vertical-Panel%))
- (define -Area-Container<%>-Instance (make-Instance -Area-Container<%>))
- (define -Area-Container-Window<%>-Instance (make-Instance -Area-Container-Window<%>))
- (define -Snip%-Instance (make-Instance -Snip%))
- (define -Editor<%>-Instance (make-Instance -Editor<%>))
- (define -Cursor%-Instance (make-Instance -Cursor%))
- (define -Menu%-Instance (make-Instance -Menu%))
- (define -Frame:Editor<%>-Instance (make-Instance -Frame:Editor<%>))
- (define -Button%-Instance (make-Instance -Button%))
- (define -Event%-Instance (make-Instance -Event%))
- (define -Bitmap%-Instance (make-Instance -Bitmap%))
- (define -Top-Level-Window<%>-Instance (make-Instance -Top-Level-Window<%>))
- (define -Dialog%-Instance (make-Instance -Dialog%))
- (define -Frame%-Instance (make-Instance -Frame%))
- (define -Style-Delta%-Instance (make-Instance -Style-Delta%))
- (define -Keymap%-Instance (make-Instance -Keymap%))
- (define -Area<%>-Instance (make-Instance -Area<%>))
- (define -Window<%>-Instance (make-Instance -Window<%>))
- (define -DC<%>-Instance (make-Instance -DC<%>)))
-
-(type-environment
- [application:current-app-name (-Param -String)]
- ;; 3 Autosave
- [autosave:register
-  ((make-Instance (parse-type #'Editor<%>-And-Autosave:Autosavable<%>)) . -> . -Void)]
- [autosave:toc-path -Path]
- [autosave:restore-autosave-files/gui (-> -Void)]
- ;; 4 Canvas
- [canvas:basic-mixin (parse-type #'Canvas:Basic-Mixin)]
- [canvas:color-mixin (parse-type #'Canvas:Color-Mixin)]
- [canvas:delegate-mixin (parse-type #'Canvas:Delegate-Mixin)]
- [canvas:info-mixin (parse-type #'Canvas:Info-Mixin)]
- [canvas:wide-snip-mixin (parse-type #'Canvas:Wide-Snip-Mixin)]
- [canvas:basic% (parse-type #'Canvas:Basic%)]
- [canvas:color% (parse-type #'Canvas:Color%)]
- [canvas:info% (parse-type #'Canvas:Info%)]
- [canvas:delegate% (parse-type #'Canvas:Delegate%)]
- [canvas:wide-snip% (parse-type #'Canvas:Wide-Snip%)]
- ;; 5 Color Model
- [color-model:rgb->xyz (-Nat -Nat -Nat . -> . -Color-Model:Xyz)]
- [color-model:rgb-color-distance
-  (-Nat -Nat -Nat -Nat -Nat -Nat . -> . -NonNegReal)]
- [color-model:xyz->rgb
-  (-NonNegReal -NonNegReal -NonNegReal . -> . (-Tuple (list -Nat -Nat -Nat)))]
- [#:opaque Color-Model:Xyz color-model:xyz?]
- [color-model:xyz-x (-Color-Model:Xyz . -> . -NonNegReal)]
- [color-model:xyz-y (-Color-Model:Xyz . -> . -NonNegReal)]
- [color-model:xyz-z (-Color-Model:Xyz . -> . -NonNegReal)]
- ;; 6 Color Prefs
- [color-prefs:set-default/color-scheme
-  (-Symbol (Un -Color%-Instance -String) (Un -Color%-Instance -String)
-           . -> . -Void)]
- [color-prefs:register-color-preference
-  (->optkey
-   -Symbol -String (Un -Color%-Instance -Style-Delta%-Instance)
-   [(Un -String -Color%-Instance -False)]
-   #:background (-opt -Color%-Instance) #f
-   -Void)]
- [color-prefs:add-background-preferences-panel (-> -Void)]
- [color-prefs:add-to-preferences-panel
-  (-String (-Vertical-Panel%-Instance . -> . -Void) . -> . -Void)]
- [color-prefs:build-color-selection-panel
-  (->optkey
-   -Area-Container<%>-Instance -Symbol -String -String
-   []
-   #:background -Boolean #f
-   -Void)]
- [color-prefs:marshall-style-delta
-  (-Style-Delta%-Instance . -> . -Printable)]
- [color-prefs:unmarshall-style-delta
-  (-Printable . -> . (-opt -Style-Delta%-Instance))]
- [color-prefs:white-on-black (-> -Void)]
- [color-prefs:black-on-white (-> -Void)]
- [color-prefs:add-color-scheme-entry
-  (->optkey
-   -Symbol (Un -String -Color%-Instance) (Un -String -Color%-Instance)
-   []
-   #:style (-opt -String) #f
-   #:bold? -Boolean #f
-   #:underline? -Boolean #f
-   #:italic? -Boolean #f
-   #:background (Un -False -String -Color%-Instance) #f
-   -Void)]
- [color-prefs:add-color-scheme-preferences-panel
-  (->optkey
-   []
-   #:extras ((make-Instance -Panel%) . -> . Univ) #f
-   -Void)]
- [color-prefs:register-info-based-color-schemes (-> -Void)]
- [color-prefs:set-current-color-scheme (-Symbol . -> . -Void)]
- [color-prefs:get-current-color-scheme-name (-> -Color-Prefs:Color-Scheme-Style-Name)]
- [#:opaque Color-Prefs:Known-Color-Scheme-Name color-prefs:known-color-scheme-name?]
- [#:opaque Color-Prefs:Color-Scheme-Style-Name color-prefs:color-scheme-style-name?]
- [color-prefs:lookup-in-color-scheme
-  ;; TODO less precise than doc
-  (-Color-Prefs:Known-Color-Scheme-Name . -> . (Un -Style-Delta%-Instance -Color%-Instance))]
- [color-prefs:set-in-color-scheme
-  (-Color-Prefs:Known-Color-Scheme-Name
-   (Un -Style-Delta%-Instance
-       -Color%-Instance)
-   . -> . -Void)]
- [color-prefs:register-color-scheme-entry-change-callback
-  (->opt
-   -Color-Prefs:Known-Color-Scheme-Name
-   ((Un -Style-Delta%-Instance -Color%-Instance) . -> . Univ)
-   [-Boolean]
-   -Void)]
- [color-prefs:get-color-scheme-names
-  (-> (-values (list (-set Univ) (-set Univ))))] ; TODO doc doesn't say set of what
- ;; 7 Color
- [color:text-mixin (parse-type #'Color:Text-Mixin)]
- [color:text% (parse-type #'Color:Text%)]
- [color:text-mode-mixin (parse-type #'Color:Text-Mode-Mixin)]
- [color:text-mode% (parse-type #'Color:Text-Mode%)]
- [color:get-parenthesis-colors-table
-  (-> (-lst (-Tuple (list -Symbol
-                             -String
-                             (-vec -Color%-Instance)
-                             (Un (-val 'low) (-val 'high))))))]
- [color:misspelled-text-color-style-name (-> -String)]
- ;; 8 Comment Box
- [comment-box:snip% (parse-type #'Comment-Box:Snip%)]
- [comment-box:snipclass (make-Instance -Snip-Class%)]
- ;; 9 Decorated Editor Snip
- ; TODO: all syntax, and docs suggests they're deprecated?
- ;; 10 Editor Snip
- [editor-snip:decorated-mixin (parse-type #'Editor-Snip:Decorated-Mixin)]
- [editor-snip:decorated% (parse-type #'Editor-Snip:Decorated%)]
- [editor-snip:decorated-snipclass% (parse-type #'Editor-Snip:Decorated-Snipclass%)]
-  ;; 11 Editor
- [editor:basic-mixin (parse-type #'Editor:Basic-Mixin)]
- [editor:standard-style-list-mixin (parse-type #'Editor:Standard-Style-List-Mixin)]
- [editor:keymap-mixin (parse-type #'Editor:Keymap-Mixin)]
- [editor:autowrap-mixin (parse-type #'Editor:Autowrap-Mixin)]
- [editor:file-mixin (parse-type #'Editor:File-Mixin)]
- [editor:backup-autosave-mixin (parse-type #'Editor:Backup-Autosave-Mixin)]
- [editor:info-mixin (parse-type #'Editor:Info-Mixin)]
- [editor:set-current-preferred-font-size (-Nat . -> . -Void)]
- [editor:get-current-preferred-font-size (-> -Nat)]
- [editor:font-size-pref->current-font-size
-  ((make-HeterogeneousVector (list (-HT (-ne-lst (-Tuple (list -Nat -Nat))) -Nat)
-                                   -Nat))
-   . -> .
-   -Nat)]
- [editor:get-change-font-size-when-monitors-change? (-> -Boolean)]
- [editor:set-change-font-size-when-monitors-change? (-Boolean . -> . -Void)]
- [editor:set-default-font-color
-  (->opt
-   -Color%-Instance
-   [(-opt -Color%-Instance)]
-   -Void)]
- [editor:get-default-color-style-name (-> -String)]
- [editor:set-standard-style-list-delta
-  (-String -Style-Delta%-Instance . -> . -Void)]
- [editor:set-standard-style-list-pref-callbacks (-> Univ)]
- [editor:get-standard-style-list
-  (-> (make-Instance (parse-type #'Style-List%)))]
- [editor:add-after-user-keymap
-  (-Keymap%-Instance (-lst -Keymap%-Instance)
-   . -> . (-lst -Keymap%-Instance))]
- ;; 12 Exit
- [exit:exiting? (-> -Boolean)]
- [exit:set-exiting (-Boolean . -> . -Void)]
- [exit:insert-on-callback ((-> -Void) . -> . (-> -Void))]
- [exit:insert-can?-callback ((-> -Boolean) . -> . (-> -Void))]
- [exit:can-exit? (-> -Boolean)]
- [exit:on-exit (-> -Void)]
- [exit:exit (-> -Void)]
- [exit:user-oks-exit (-> -Boolean)]
- ;; 13 Finder
- [finder:dialog-parent-parameter
-  (-Param (Un -False -Dialog%-Instance -Frame%-Instance))]
- [finder:default-extension (-Param -String)]
- [finder:default-filters
-  (-Param (-lst (-Tuple (list -String -String))))]
-
- [finder:common-put-file (->opt
-                          [-String
-                           (-opt -Path)
-                           -Boolean
-                           -String
-                           (-opt -Byte-Regexp)
-                           -String
-                           (-opt -Top-Level-Window<%>-Instance)]
-                          (-opt -Path))]
- [finder:common-get-file (->opt
-                          [(-opt -Path)
-                           -String
-                           (-opt -Byte-Regexp)
-                           -String
-                           (-opt -Top-Level-Window<%>-Instance)]
-                          (-opt -Path))]
- [finder:std-put-file (->opt
-                       [-String
-                        (-opt -Path)
-                        -Boolean
-                        -String
-                        (-opt -Byte-Regexp)
-                        -String
-                        (-opt -Top-Level-Window<%>-Instance)]
-                       (-opt -Path))]
- [finder:std-get-file (->opt
-                       [(-opt -Path)
-                        -String
-                        (-opt -Byte-Regexp)
-                        -String
-                        (-opt -Top-Level-Window<%>-Instance)]
-                       (-opt -Path))]
- [finder:put-file (->opt
-                   [-String
-                    (-opt -Path)
-                    -Boolean
-                    -String
-                    (-opt -Byte-Regexp)
-                    -String
-                    (-opt -Top-Level-Window<%>-Instance)]
-                   (-opt -Path))]
- [finder:get-file (->opt
-                   [(-opt -Path)
-                    -String
-                    (Un -Byte-Regexp -String -False)
-                    -String
-                    (-opt -Top-Level-Window<%>-Instance)]
-                   (-opt -Path))]
- ;; 14 Frame
- [frame:basic-mixin (parse-type #'Frame:Basic-Mixin)]
- [frame:focus-table-mixin (parse-type #'Frame:Focus-Table-Mixin)]
- [frame:size-pref-mixin (parse-type #'Frame:Size-Pref-Mixin)]
- [frame:register-group-mixin (parse-type #'Frame:Register-Group-Mixin)]
- [frame:status-line-mixin (parse-type #'Frame:Status-Line-Mixin)]
- [frame:info-mixin (parse-type #'Frame:Info-Mixin)]
- [frame:text-info-mixin (parse-type #'Frame:Text-Info-Mixin)]
- [frame:pasteboard-info-mixin (parse-type #'Frame:Pasteboard-Info-Mixin)]
- [frame:standard-menus-mixin (parse-type #'Frame:Standard-Menus-Mixin)]
- [frame:editor-mixin (parse-type #'Frame:Editor-Mixin)]
- [frame:text-mixin (parse-type #'Frame:Text-Mixin)]
- [frame:pasteboard-mixin (parse-type #'Frame:Pasteboard-Mixin)]
- [frame:delegate-mixin (parse-type #'Frame:Delegate-Mixin)]
- [frame:searchable-mixin (parse-type #'Frame:Searchable-Mixin)]
- [frame:searchable-text-mixin (parse-type #'Frame:Searchable-Text-Mixin)]
- [frame:basic% (parse-type #'Frame:Basic%)]
- [frame:size-pref% (parse-type #'Frame:Size-Pref%)]
- [frame:info% (parse-type #'Frame:Info%)]
- [frame:text-info% (parse-type #'Frame:Info%)]
- [frame:pasteboard-info% (parse-type #'Frame:Pasteboard-Info%)]
- [frame:status-line% (parse-type #'Frame:Status-Line%)]
- [frame:standard-menus% (parse-type #'Frame:Standard-Menus%)]
- [frame:editor% (parse-type #'Frame:Editor%)]
- [frame:text% (parse-type #'Frame:Text%)]
- [frame:searchable% (parse-type #'Frame:Searchable%)]
- [frame:delegate% (parse-type #'Frame:Delegate%)]
- [frame:pasteboard% (parse-type #'Frame:Pasteboard%)]
- [frame:setup-size-pref
-  (->optkey
-   -Symbol -NonNegReal -NonNegReal
-   []
-   #:maximized? -Boolean #f
-   #:position-preferences (-opt -Symbol) #f
-   -Void)]
- [frame:add-snip-menu-items (->opt -Menu%-Instance
-                                   -Menu-Item% ; FIXME (subclass?/c menu-item%)
-                                   [((make-Instance -Menu-Item%) . -> . -Void)]
-                                   -Void)]
- [frame:reorder-menus (-Frame%-Instance . -> . -Void)]
- [frame:remove-empty-menus (-Frame%-Instance . -> . -Void)]
- [frame:current-icon
-  (-Param  (Un -False -Bitmap%-Instance (-pair -Bitmap%-Instance -Bitmap%-Instance)))]
- [frame:lookup-focus-table
-  (->opt [-Eventspace] (-lst (make-Instance (parse-type #'Frame:Focus-Table<%>))))]
- ;; 15 Group
- [group:% (parse-type #'Group:%)]
- [group:get-the-frame-group (-> (make-Instance (parse-type #'Group:%)))]
- [group:on-close-action (-> -Void)]
- [group:can-close-check (-> -Boolean)]
- [group:add-to-windows-menu ((-Menu%-Instance . -> . Univ) . -> . Univ)]
- [group:create-windows-menu
-  ((make-Instance -Menu-Item-Container<%>) . -> . -Menu%-Instance)]
- ;; 16 GUI Utilities
- [gui-utils:trim-string (-String -PosInt . -> . -String)]
- [gui-utils:quote-literal-label
-  (->optkey -String [] #:quote-amp? Univ #f -String)]
- [gui-utils:format-literal-label ((list -String) Univ . ->* . -String)]
- [gui-utils:cancel-on-right? (-> -Boolean)]
- [gui-utils:ok/cancel-buttons
-  (->optkey
-   -Area-Container<%>-Instance
-   (-Button%-Instance -Event%-Instance . -> . Univ)
-   (-Button%-Instance -Event%-Instance . -> . Univ)
-   [-String -String]
-   #:confirm-style (-lst -Symbol) #f
-   (-values (list -Button%-Instance -Button%-Instance)))]
- [gui-utils:next-untitled-name (-> -String)]
- [gui-utils:cursor-delay (cl-> [{} -Real]
-                               [{-Real} -Void])]
- [gui-utils:show-busy-cursor (->opt (-> Univ) [-Integer] Univ)]
- [gui-utils:delay-action (-Real (-> -Void) (-> -Void) . -> . (-> -Void))]
- [gui-utils:local-busy-cursor
-  (->opt -Window<%>-Instance (-> Univ) [-Integer] Univ)]
- [gui-utils:unsaved-warning
-  (->opt -String -String
-         [-Boolean
-          (Un -False -Frame%-Instance -Dialog%-Instance)
-          -Boolean]
-         (Un (-val 'continue) (-val 'save) (-val 'cancel)))]
-
- [gui-utils:get-choice
-  (->opt -String -String -String
-         [-String
-          Univ
-          (Un -False -Frame%-Instance -Dialog%-Instance)
-          (Un (-val 'app) (-val 'caution) (-val 'stop))
-          (-opt (cl-> [{-Boolean} -Void]
-                      [{} -Boolean]))
-          -String]
-         Univ)]
- [gui-utils:get-clicked-clickback-delta
-  (->opt [-Style-Delta%-Instance] -Boolean)]
- [gui-utils:get-clickback-delta
-  (->opt [-Style-Delta%-Instance] -Boolean)]
- ;; 17 Handler
- [#:opaque Handler:Handler handler:handler?]
- [handler:handler-name (-Handler:Handler . -> . -String)]
- [handler:handler-extension
-  (-Handler:Handler . -> . (Un (-Path . -> . -Boolean) (-lst -String)))]
- [handler:handler-handler
-  (-Handler:Handler . -> . (-Path . -> . -Frame:Editor<%>-Instance))]
- [handler:insert-format-handler
-  (-String
-   (Un -String (-lst -String) (-Path . -> . -Boolean))
-   (-Path . -> . (-opt -Frame:Editor<%>-Instance))
-   . -> . -Void)]
- [handler:find-named-format-handler
-  (-String . -> . (-Path . -> . -Frame:Editor<%>-Instance))]
- [handler:find-format-handler
-  (-Path . -> . (-Path . -> . -Frame:Editor<%>-Instance))]
- [handler:edit-file
-  ((-opt -Frame:Editor<%>-Instance)
-   [(-> -Frame:Editor<%>-Instance)]
-   . ->opt . (-opt -Frame:Editor<%>-Instance))]
- [handler:current-create-new-window
-  (-Param ((-opt -Path) . -> . -Frame%-Instance))]
- [handler:open-file ([(Un -False -Path -String)]
-                     . ->opt . (-opt (make-Instance (parse-type #'Frame:Basic<%>))))]
- [handler:install-recent-items (-Menu%-Instance . -> . -Void)]
- [handler:set-recent-items-frame-superclass
-  ;; FIXME (implementation?/c frame:standard-menus<%>)
-  ((parse-type #'Frame:Standard-Menus<%>) . -> . -Void)]
- [handler:add-to-recent (-Path . -> . -Void)]
- [handler:set-recent-position (-Path -Nat -Nat . -> . -Void)]
- [handler:size-recently-opened-files (-Nat . -> . -Void)]
- ;; 18 Icon
- [icon:get-paren-highlight-bitmap (-> -Bitmap%-Instance)]
- [icon:get-eof-bitmap (-> -Bitmap%-Instance)]
- [icon:get-autowrap-bitmap (-> -Bitmap%-Instance)]
- [icon:get-lock-bitmap (-> -Bitmap%-Instance)]
- [icon:get-unlock-bitmap (-> -Bitmap%-Instance)]
- [icon:get-anchor-bitmap (-> -Bitmap%-Instance)]
- [icon:get-left/right-cursor (-> -Cursor%-Instance)]
- [icon:get-up/down-cursor (-> -Cursor%-Instance)]
- [icon:get-gc-on-bitmap (-> -Bitmap%-Instance)]
- [icon:get-gc-off-bitmap (-> -Bitmap%-Instance)]
- ;; 19 Keymap
- [keymap:aug-keymap-mixin (parse-type #'Keymap:Aug-Keymap-Mixin)]
- [keymap:aug-keymap% (parse-type #'Keymap:Aug-Keymap%)]
- [keymap:remove-user-keybindings-file (Univ . -> . Univ)]
- [keymap:add-user-keybindings-file (Univ . -> . Univ)]
- [keymap:add-to-right-button-menu
-  (-Param  ((make-Instance -Popup-Menu%)
-            -Editor<%>-Instance
-            -Event%-Instance
-            . -> . -Void))]
- [keymap:add-to-right-button-menu/before
-  (-Param  ((make-Instance -Popup-Menu%)
-            -Editor<%>-Instance
-            -Event%-Instance
-            . -> . -Void))]
- [keymap:call/text-keymap-initializer ((-> Univ) . -> . Univ)]
- [keymap:canonicalize-keybinding-string (-String . -> . -String)]
- [keymap:get-editor (-> -Keymap%-Instance)]
- [keymap:get-file (-> -Keymap%-Instance)]
- [keymap:get-user (-> -Keymap%-Instance)]
- [keymap:get-global (-> -Keymap%-Instance)]
- [keymap:get-search (-> -Keymap%-Instance)]
- [keymap:make-meta-prefix-list (-String [-Boolean] . ->opt . (-lst -String))]
- [keymap:send-map-function-meta
-  (-Keymap%-Instance
-   -String
-   -String
-   [-Boolean]
-   #:alt-as-meta-keymap (-opt -Keymap%-Instance) #f
-   . ->optkey . -Void)]
- [keymap:setup-editor (-Keymap%-Instance . -> . -Void)]
- [keymap:setup-file (-Keymap%-Instance . -> . -Void)]
- [keymap:setup-global (-Keymap%-Instance . -> . -Void)]
- [keymap:setup-search (-Keymap%-Instance . -> . -Void)]
- [keymap:set-chained-keymaps ((make-Instance (parse-type #'Keymap:Aug-Keymap<%>))
-                              (-lst -Keymap%-Instance)
-                              . -> . -Void)]
- [keymap:remove-chained-keymap (-Editor<%>-Instance
-                                (make-Instance (parse-type #'Keymap:Aug-Keymap<%>))
-                                . -> . -Void)]
- [keymap:region-click (Univ
-                       Univ
-                       (-NonNegReal -Boolean -NonNegReal -NonNegReal . -> . Univ)
-                       . -> . Univ)]
- ;; 20 Menu
- [menu:can-restore-mixin (parse-type #'Menu:Can-Restore-Mixin)]
- [menu:can-restore-underscore-mixin (parse-type #'Menu:Can-Restore-Underscore-Mixin)]
- [menu:can-restore-menu-item% (parse-type #'Menu:Can-Restore-Menu-Item%)]
- [menu:can-restore-checkable-menu-item% (parse-type #'Menu:Can-Restore-Checkable-Menu-Item%)]
- [menu:can-restore-underscore-menu% (parse-type #'Menu:Can-Restore-Underscore-Menu%)]
- ;; 21 Mode
- [mode:surrogate-text% (parse-type #'Mode:Surrogate-Text%)]
- [mode:host-text-mixin (parse-type #'Mode:Host-Text-Mixin)]
- ;; 22 Number Snip
- [number-snip:snip-class% (parse-type #'Number-Snip:Snip-Class%)]
- [number-snip:make-repeating-decimal-snip (-Real -Boolean . -> . -Snip%-Instance)]
- [number-snip:make-fraction-snip (-Real -Boolean . -> . -Snip%-Instance)]
- ;; 23 Panel
- [panel:single-mixin (parse-type #'Panel:Single-Mixin)]
- [panel:single-window-mixin (parse-type #'Panel:Single-Window-Mixin)]
- [panel:single% (parse-type #'Panel:Single%)]
- [panel:single-pane% (parse-type #'Panel:Single-Pane%)]
- [panel:dragable-mixin (parse-type #'Panel:Dragable-Mixin)]
- [panel:vertical-dragable-mixin (parse-type #'Panel:Vertical-Dragable-Mixin)]
- [panel:horizontal-dragable-mixin (parse-type #'Panel:Horizontal-Dragable-Mixin)]
- [panel:vertical-dragable% (parse-type #'Panel:Vertical-Dragable%)]
- [panel:horizontal-dragable% (parse-type #'Panel:Horizontal-Dragable%)]
- [panel:splitter-mixin (parse-type #'Panel:Splitter-Mixin)]
- [panel:discrete-sizes-mixin (parse-type #'Panel:Discrete-Sizes-Mixin)]
- [panel:horizontal-discrete-sizes% (parse-type #'Panel:Horizontal-Discrete-Sizes%)]
- [panel:vertical-discrete-sizes% (parse-type #'Panel:Vertical-Discrete-Sizes%)]
- [panel:dragable-container-size
-  ((-lst (-Tuple (list -Real -Real -Boolean -Boolean)))
-   -Real
-   -Boolean
-   . -> . (-values (list -Real -Real)))]
- [panel:dragable-place-children
-  ((-lst (-Tuple (list -Real -Real -Boolean -Boolean)))
-   -Real
-   -Real
-   (-lst -Real #|between/c 0 1|#)
-   -Real
-   -Boolean
-   . -> . (-values (list (-lst (-Tuple (list -Nat -Nat -Nat -Nat)))
-                         (-lst (-Tuple (list -Nat -Nat))))))]
- ;; 24 Pasteboard
- [pasteboard:basic% (parse-type #'Pasteboard:Basic%)]
- [pasteboard:standard-style-list% (parse-type #'Pasteboard:Standard-Style-List%)]
- [pasteboard:keymap% (parse-type #'Pasteboard:Keymap%)]
- [pasteboard:file% (parse-type #'Pasteboard:File%)]
- [pasteboard:backup-autosave% (parse-type #'Pasteboard:Backup-Autosave%)]
- [pasteboard:info% (parse-type #'Pasteboard:Info%)]
- ;; 25 Path Utils
- [path-utils:generate-autosave-name ((Un -False -Pathlike -SomeSystemPath) . -> . -String)]
- [path-utils:generate-backup-name (-Path . -> . -Path)]
- ;; 26 Preferences
- [preferences:put-preferences/gui ((-lst -Symbol) (-lst Univ) . -> . Univ)]
- [preferences:get-preference/gui (-Symbol [(-> -Void)] . ->opt . Univ)]
- [preferences:add-panel
-  ((Un -String (-ne-lst -String))
-   (-Area-Container-Window<%>-Instance . -> . -Area-Container-Window<%>-Instance)
-   . -> . Univ)]
- [preferences:add-editor-checkbox-panel (-> -Void)]
- [preferences:add-general-checkbox-panel (-> -Void)]
- [preferences:add-warnings-checkbox-panel (-> -Void)]
- [preferences:add-scheme-checkbox-panel (-> -Void)]
- [preferences:add-to-warnings-checkbox-panel
-  ((-Vertical-Panel%-Instance . -> . -Void) . -> . -Void)]
- [preferences:add-to-scheme-checkbox-panel
-  ((-Vertical-Panel%-Instance . -> . -Void) . -> . -Void)]
- [preferences:add-to-editor-checkbox-panel
-  ((-Vertical-Panel%-Instance . -> . -Void) . -> . -Void)]
- [preferences:add-to-general-checkbox-panel
-  ((-Vertical-Panel%-Instance . -> . -Void) . -> . -Void)]
- [preferences:add-font-panel (-> -Void)]
- [preferences:show-dialog (-> -Void)]
- [preferences:hide-dialog (-> -Void)]
- [preferences:add-on-close-dialog-callback ((-> -Void) . -> . -Void)]
- [preferences:add-can-close-dialog-callback ((-> -Boolean) . -> . -Void)]
- [preferences:add-check
-  (-Area-Container<%>-Instance
-   -Symbol
-   -String
-   [(-Boolean . -> . Univ)
-    (Univ . -> . -Boolean)]
-   . ->opt . -Void)]
- ;; 27 Preferences, Textual
- [preferences:get (-> -Symbol -Sexp)]
- [preferences:set (-> -Symbol -Sexp -Void)]
- [preferences:add-callback (-Symbol (-Symbol Univ . -> . Univ) [-Boolean] . ->opt . (-> -Void))]
- [preferences:set-default
-  (->optkey
-   -Symbol -Sexp (-> Univ -Boolean)
-   []
-   #:aliases (-lst -Symbol) #f
-   #:rewrite-aliases (-lst (-> Univ Univ)) #f
-   -Void)]
- [preferences:default-set? (-Symbol . -> . -Boolean)]
- [preferences:set-un/marshall
-  (-Symbol (Univ . -> . -Printable) (-Printable . -> . Univ) . -> . -Void)]
- [preferences:restore-defaults (-> -Void)]
- [preferences:register-save-callback ((-Boolean . -> . Univ) . -> . -Symbol)]
- [preferences:unregister-save-callback (-Symbol . -> . -Void)]
- [exn:make-unknown-preference (-String -Continuation-Mark-Set . -> . -Exn:Unknown-Preference)]
- [#:opaque Exn:Unknown-Preference exn:unknown-preference?]
- [exn:struct:unknown-preference -Struct]
- [preferences:low-level-put-preferences
-  (-Param ((-lst -Symbol) (-lst Univ) . -> . Univ))]
- [preferences:low-level-get-preference
-  (-Param (-Symbol [(-> Univ)] . ->opt . Univ))]
- [#:opaque Preferences:Snapshot preferences:snapshot?]
- [preferences:restore-prefs-snapshot (-Preferences:Snapshot . -> . -Void)]
- [preferences:get-prefs-snapshot (-> -Preferences:Snapshot)]
- ;; 28 Racket
- [racket:sexp-snip% (parse-type #'Racket:Sexp-Snip%)]
- [racket:text-mixin (parse-type #'Racket:Text-Mixin)]
- [racket:text-mode-mixin (parse-type #'Racket:Text-Mode-Mixin)]
- [racket:set-mode-mixin (parse-type #'Racket:Set-Mode-Mixin)]
- [racket:text% (parse-type #'Racket:Text%)]
- [racket:text-mode% (parse-type #'Racket:Text-Mode%)]
- [racket:text-balanced? ((make-Instance -Text%) [-Nat (-opt -Nat)] . ->opt . -Boolean)]
- [racket:add-preferences-panel (-> -Void)]
- [racket:get-keymap (-> -Keymap%-Instance)]
- [racket:add-coloring-preferences-panel (-> Univ)]
- [racket:get-color-prefs-table
-  (-> (-lst (-Tuple (list -Symbol -Color%-Instance -String))))]
- [racket:get-white-on-black-color-prefs-table
-  (-> (-lst (-Tuple (list -Symbol -Color%-Instance -String))))]
- [racket:short-sym->pref-name (-Symbol . -> . -Symbol)]
- [racket:short-sym->style-name (-String . -> . -Symbol)]
- [racket:get-wordbreak-map (-> (make-Instance -Editor-Wordbreak-Map%))]
- [racket:init-wordbreak-map (-Keymap%-Instance . -> . -Void)]
- [racket:setup-keymap (-Keymap%-Instance . -> . -Void)]
- ;; 29 Text
- [text:basic-mixin (parse-type #'Text:Basic-Mixin)]
- [text:line-spacing-mixin (parse-type #'Text:Line-Spacing-Mixin)]
- [text:first-line-mixin (parse-type #'Text:First-Line-Mixin)]
- [text:foreground-color-mixin (parse-type #'Text:Foreground-Color-Mixin)]
- [text:hide-caret/selection-mixin (parse-type #'Text:Hide-Caret/Selection-Mixin)]
- [text:nbsp->space-mixin (parse-type #'Text:Nbsp->Space-Mixin)]
- [text:column-guide-mixin (parse-type #'Text:Column-Guide-Mixin)]
- [text:normalize-paste-mixin (parse-type #'Text:Normalize-Paste-Mixin)]
- [text:searching-mixin (parse-type #'Text:Searching-Mixin)]
- [text:return-mixin (parse-type #'Text:Return-Mixin)]
- [text:wide-snip-mixin (parse-type #'Text:Wide-Snip-Mixin)]
- [text:1-pixel-string-snip% (parse-type #'Text:1-Pixel-String-Snip%)]
- [text:1-pixel-tab-snip% (parse-type #'Text:1-Pixel-Tab-Snip%)]
- [text:delegate-mixin (parse-type #'Text:Delegate-Mixin)]
- [text:info-mixin (parse-type #'Text:Info-Mixin)]
- [text:clever-file-format-mixin (parse-type #'Text:Clever-File-Format-Mixin)]
- [text:crlf-line-endings-mixin (parse-type #'Text:Crlf-Line-Endings-Mixin)]
- [text:file-mixin (parse-type #'Text:File-Mixin)]
- [text:ports-mixin (parse-type #'Text:Ports-Mixin)]
- [text:input-box-mixin (parse-type #'Text:Input-Box-Mixin)]
- [text:autocomplete-mixin (parse-type #'Text:Autocomplete-Mixin)]
- [text:basic% (parse-type #'Text:Basic%)]
- [text:line-spacing% (parse-type #'Text:Line-Spacing%)]
- [text:hide-caret/selection% (parse-type #'Text:Hide-Caret/Selection%)]
- [text:nbsp->space% (parse-type #'Text:Nbsp->Space%)]
- [text:normalize-paste% (parse-type #'Text:Normalize-Paste%)]
- [text:delegate% (parse-type #'Text:Delegate%)]
- [text:wide-snip% (parse-type #'Text:Wide-Snip%)]
- [text:standard-style-list% (parse-type #'Text:Standard-Style-List%)]
- [text:input-box% (parse-type #'Text:Input-Box%)]
- [text:keymap% (parse-type #'Text:Keymap%)]
- [text:return% (parse-type #'Text:Return%)]
- [text:autowrap% (parse-type #'Text:Autowrap%)]
- [text:file% (parse-type #'Text:File%)]
- [text:clever-file-format% (parse-type #'Text:Clever-File-Format%)]
- [text:backup-autosave% (parse-type #'Text:Backup-Autosave%)]
- [text:searching% (parse-type #'Text:Searching%)]
- [text:info% (parse-type #'Text:Info%)]
- [text:line-numbers-mixin (parse-type #'Text:Line-Numbers-Mixin)]
- [#:opaque Text:Range text:range?]
- [text:range-start (-Text:Range . -> . -Nat)]
- [text:range-end (-Text:Range . -> . -Nat)]
- [text:range-caret-space? (-Text:Range . -> . -Boolean)]
- [text:range-style (-Text:Range . -> . -Nat)] ; FIXME: doc says nat...
- [text:range-color (-Text:Range . -> . (Un -String -Color%-Instance))]
- [text:autocomplete-append-after (-Param -String)]
- [text:autocomplete-limit (-Param -PosInt)]
- [text:get-completions/manuals ((-opt (-lst -Symbol)) . -> . (-lst -String))]
- [text:lookup-port-name ((-opt (make-Instance (parse-type #'Editor:Basic<%>))) . -> . -Symbol)]
- ;; 30 Splash
- [start-splash
-  ((Un -Pathlike
-       -Bitmap%-Instance
-       (make-HeterogeneousVector
-        (list
-         (Un (-DC<%>-Instance . -> . -Void)
-             (-DC<%>-Instance -Nat -Nat -Nat -Nat . -> . -Void))
-         -Nat
-         -Nat)))
-   -String
-   -Nat
-   []
-   #:allow-funny? -Boolean #f
-   #:frame-icon (Un -False
-                    -Bitmap%-Instance
-                    (-pair -Bitmap%-Instance -Bitmap%-Instance)) #f
-   . ->optkey . -Void)]
- [shutdown-splash (-> -Void)]
- [close-splash (-> -Void)]
- [add-splash-icon (-Bitmap%-Instance -Nat -Nat . -> . -Void)]
- [get-splash-bitmap (-> (-opt -Bitmap%-Instance))]
- [set-splash-bitmap (-Bitmap%-Instance . -> . -Void)]
- [get-splash-canvas (-> -Canvas%-Instance)]
- [get-splash-eventspace (-> -Eventspace)]
- [get-splash-paint-callback
-  (-> (-DC<%>-Instance -Nat -Nat -Nat -Nat . -> . -Void))]
- [set-splash-paint-callback
-  ((-> (-DC<%>-Instance -Nat -Nat -Nat -Nat . -> . -Void)) . -> . -Void)]
- [set-splash-progress-bar?! (-Boolean . -> . -Void)]
- [set-splash-char-observer ((-Key-Event%-Instance . -> . Univ) . -> . -Void)]
- [set-splash-event-callback ((-Mouse-Event%-Instance . -> . Univ) . -> . -Void)]
- [get-splash-event-callback (-> (-Mouse-Event%-Instance . -> . Univ))]
- [set-refresh-splash-on-gauge-change?! ((-Nat -Nat . -> . Univ) . -> . -Void)]
- [get-splash-width (-> -Nat)]
- [get-splash-height (-> -Nat)]
- [refresh-splash (-> -Void)]
- ;; 31 Test
- [test:button-push ((Un -String -Button%-Instance) . -> . -Void)]
- [test:set-radio-box!
-  ((Un -String -Regexp (make-Instance -Radio-Box%)) (Un -String -Nat) . -> . -Void)]
- [test:set-radio-box-item! ((Un -String -Regexp) . -> . -Void)]
- [test:set-check-box! ((Un -String (make-Instance -Check-Box%)) -Boolean . -> . -Void)]
- [test:set-choice! ((Un -String (make-Instance -Choice%))
-                    (Un -String -PosInt)
-                    . -> . -Void)]
- [test:set-list-box! ((Un -String (make-Instance -List-Box%))
-                      (Un -String -Nat)
-                      . -> . -Void)]
- [test:keystroke ((Un -Char -Symbol)
-                  [(-lst (Un (-val 'alt) (-val 'control) (-val 'meta) (-val 'shift)
-                                (-val 'noalt) (-val 'nocontrol) (-val 'nometa) (-val 'noshift)))]
-                  . ->opt . -Void)]
- [test:menu-select ((list -String) (-lst -String) . ->* . -Void)]
- [test:mouse-click ((Un (-val 'left) (-val 'middle) (-val 'right))
-                    -Int
-                    -Int
-                    [(-lst (Un (-val 'alt) (-val 'control) (-val 'meta) (-val 'shift)
-                                  (-val 'noalt) (-val 'nocontrol) (-val 'nometa) (-val 'noshift)))]
-                    . ->opt . -Void)]
- [test:run-interval (cl-> [{-Real} -Void]
-                          [{} -Real])]
- [test:current-get-eventspaces (-Param (-> (-lst -Eventspace)))]
- [test:new-window (-Window<%>-Instance . -> . -Void)]
- [test:close-top-level-window (-Top-Level-Window<%>-Instance . -> . -Void)]
- [test:top-level-focus-window-has? ((-Area<%>-Instance . -> . -Boolean) . -> . -Boolean)]
- [test:number-pending-actions (-> -Nat)]
- [test:reraise-error (-> -Void)]
- [test:run-one ((-> -Void) . -> . -Void)]
- [test:use-focus-table (-Param (Un -Boolean (-val 'debug)))]
- [test:get-active-top-level-window (-> (Un -False -Frame%-Instance -Dialog%-Instance))]
- [label-of-enabled/shown-button-in-top-level-window? (-String . -> . -Boolean)]
- [enabled-shown-button? (-Button%-Instance . -> . -Boolean)]
- [button-in-top-level-focusd-window? (-Button%-Instance . -> . -Boolean)]
- ;; 32 Version
- [version:add-spec (Univ Univ . -> . -Void)]
- [version:version (-> -String)]
- ;; 33 Backwards Compatibility
- [scheme:text-mixin (parse-type #'Racket:Text-Mixin)]
- [scheme:text% (parse-type #'Racket:Text%)]
- [scheme:text-mode-mixin (parse-type #'Racket:Text-Mode-Mixin)]
- [scheme:text-mode% (parse-type #'Racket:Text-Mode%)]
- [scheme:set-mode-mixin (parse-type #'Racket:Set-Mode-Mixin)]
- [scheme:sexp-snip% (parse-type #'Racket:Sexp-Snip%)]
- ; other ones not obvious. Maybe just drop compatibility for now? ^^
- ;; 34 Signatures
- ;; 35 Unit
- )
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/framework.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/framework.rkt
deleted file mode 100644
index 8b059e8b86..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/framework.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang typed/racket/base
-
-(require racket/class
-         typed/private/utils
-         typed/mred/mred)
-
-(define-type Style-List%
-  (Class [find-named-style (String -> (Instance (Class [get-font (-> (Instance Font%))])))]))
-
-(require/typed/provide
- framework/framework
- [preferences:set-default (Symbol Sexp (Any -> Boolean) -> Void)]
- [preferences:set (Symbol Sexp -> Void)]
- [editor:get-standard-style-list
-  (-> (Instance Style-List%))]
- [racket:text% Text:Basic%]
- [gui-utils:ok/cancel-buttons
-  ((Instance Horizontal-Panel%)
-   ((Instance Button%) (Instance Event%) -> Void)
-   ((Instance Button%) (Instance Event%) -> Void)
-   -> (values Any Any))])
-
-(require/typed/provide "prefs-contract.rkt"
-                       [preferences:get-drracket:large-letters-font (-> (U #f (Pair String Integer)))])
-
-(require (only-in "prefs-contract.rkt" preferences:get))
-(provide preferences:get)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/prefs-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/prefs-contract.rkt
deleted file mode 100644
index db52f5d7c8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/prefs-contract.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base)
-         framework/framework)
-
-(provide (rename-out [-preferences:get preferences:get])
-         preferences:get-drracket:large-letters-font)
-
-(define (preferences:get-drracket:large-letters-font)
-  (preferences:get 'drracket:large-letters-font))
-
-(define-syntax (-preferences:get stx)
-  (syntax-case stx (quote)
-    [(_ (quote sym))
-     (with-syntax ([nm (datum->syntax stx (string->symbol (string-append "preferences:get" "-" (symbol->string (syntax-e #'sym)))))])
-       (syntax/loc stx (nm)))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/mred/mred.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/mred/mred.rkt
deleted file mode 100644
index e65d7f2901..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/mred/mred.rkt
+++ /dev/null
@@ -1,186 +0,0 @@
-#lang typed/racket/base
-
-(require typed/racket/class
-         typed/private/utils)
-
-(provide Frame%
-         Bitmap%
-         Font-List%
-         Font%
-         Dialog%
-         Text-Field%
-         Horizontal-Panel%
-         Choice%
-         Message%
-         Horizontal-Pane%
-         Editor-Canvas%
-         Bitmap-DC%
-         Color%
-         Snip%
-         Text:Basic%
-         Text%
-         Button%
-         Event%)
-
-(define-type Frame%
-  (Rec This
-    (Class (init [label String]
-                 [parent (Option This) #:optional]
-                 [width (Option Integer) #:optional]
-                 [height (Option Integer) #:optional]
-                 [x (Option Integer) #:optional]
-                 [y (Option Integer) #:optional]
-                 ;; more
-                 )
-           [show (Any -> Void)])))
-
-(define-type Bitmap%
-  (Class (init-rest (U (List Exact-Positive-Integer Exact-Positive-Integer)
-                       (List Exact-Positive-Integer Exact-Positive-Integer Any)
-                       (List Exact-Positive-Integer Exact-Positive-Integer Any Any)
-                       (List Exact-Positive-Integer Exact-Positive-Integer Any Any Real)))
-         [get-width (-> Integer)]
-         [get-height (-> Integer)]))
-
-(define-type Font-List%
-  (Class
-   [find-or-create-font
-    (case-> (Integer Symbol Symbol Symbol -> (Instance Font%))
-            (Integer String Symbol Symbol Symbol -> (Instance Font%))
-            (Integer String Symbol Symbol Symbol Symbol -> (Instance Font%)))]))
-
-(define-type Font%
-  (Class [get-face (-> (Option String))]
-         [get-point-size (-> Integer)]))
-
-(define-type Dialog%
-  (Class (init [label String]
-               [parent Any #:optional]
-               [width Integer #:optional])
-         [show (Any -> Void)]))
-
-(define-type Text-Field%
-  (Class (init [label String]
-               [parent (Instance Dialog%)]
-               [callback (Any Any -> Any) #:optional])
-         [get-value (-> String)]
-         [focus (-> Void)]))
-
-(define-type Horizontal-Panel%
-  (Class (init [parent (Instance Dialog%)]
-               [stretchable-height Any #:optional]
-               [alignment (List Symbol Symbol) #:optional])))
-
-(define-type Choice%
-  (Class (init [parent (Instance Horizontal-Panel%)]
-               [label String]
-               [choices (Listof Any)]
-               [callback (Any Any -> Any)])
-         [get-selection (-> (Option Natural))]
-         [set-selection (Integer -> Any)]
-         [get-string-selection (-> (Option String))]
-         [set-string-selection (String -> Void)]))
-
-(define-type Message%
-  (Class (init [parent (Instance Horizontal-Panel%)]
-               [label String])
-         [set-label ((U String (Instance Bitmap%)) -> Void)]))
-
-(define-type Horizontal-Pane%
-  (Class (init [parent (Instance Horizontal-Panel%)])))
-
-(define-type Editor-Canvas%
-  (Class (init [parent (Instance Dialog%)]
-               [editor (Instance Text:Basic%)])
-         [set-line-count ((U #f Integer) -> Void)]))
-
-(define-type Bitmap-DC%
-  (Class (init [bitmap (Instance Bitmap%)])
-         [get-text-extent (String (Instance Font%) ->
-                                    (values Nonnegative-Real Nonnegative-Real
-                                            Nonnegative-Real Nonnegative-Real))]
-         [get-pixel (Number Number (Instance Color%) -> Boolean)]
-         [set-bitmap ((Option (Instance Bitmap%)) -> Void)]
-         [clear (-> Void)]
-         [set-font ((Instance Font%) -> Void)]
-         [draw-text (String Number Number -> Void)]))
-
-(define-type Color%
-  (Class (init-rest (U Null
-                       (List Byte Byte Byte)
-                       (List Byte Byte Byte Real)))
-         [red (-> Number)]))
-
-(define-type Snip%
-  (Class [get-count (-> Integer)]))
-
-(define-type Text:Basic%
-    (Class [begin-edit-sequence (-> Void)]
-           [end-edit-sequence (-> Void)]
-           [lock (Boolean -> Void)]
-           [last-position (-> Number)]
-           [last-paragraph (-> Exact-Nonnegative-Integer)]
-           [delete (Number Number -> Void)]
-           [auto-wrap (Any -> Void)]
-           [paragraph-end-position (Number -> Integer)]
-           [paragraph-start-position (Number -> Integer)]
-           [get-start-position (-> Integer)]
-           [get-end-position (-> Integer)]
-           [get-text (Integer (U Integer 'eof) -> String)]
-           [insert (String Number Number -> Void)]))
-
-(define-type Text%
-  (Class [begin-edit-sequence (-> Void)]
-         [end-edit-sequence (-> Void)]
-         [lock (Boolean -> Void)]
-         [last-position (-> Number)]
-         [last-paragraph (-> Exact-Nonnegative-Integer)]
-         [delete (Number Number -> Void)]
-         [auto-wrap (Any -> Void)]
-         [paragraph-end-position (Number -> Integer)]
-         [paragraph-start-position (Number -> Integer)]
-         [get-start-position (-> Integer)]
-         [get-end-position (-> Integer)]
-         [while-unlocked ((-> Any) -> Any)]
-         [get-text (Integer (U Integer 'eof) -> String)]
-         [insert (String Number Number -> Void)]))
-
-(define-type Button%
-  (Rec B%
-    (Class (init [label String]
-                 [parent (Instance Frame%)]
-                 [callback (B% Any -> Any)]))))
-
-(define-type Event%
-  (Class))
-
-(require/typed/provide
- racket/gui
- [frame% Frame%]
- [button% Button%]
- [event% Event%]
- [the-font-list (Instance Font-List%)]
- [dialog% Dialog%]
- [text-field% Text-Field%]
- [horizontal-panel% Horizontal-Panel%]
- [choice% Choice%]
- [get-face-list (-> (Listof String))]
- [message% Message%]
- [horizontal-pane% Horizontal-Pane%]
- [editor-canvas% Editor-Canvas%]
- [bitmap-dc% Bitmap-DC%]
- [bitmap% Bitmap%]
- [make-bitmap
-  (case->
-   (Exact-Positive-Integer Exact-Positive-Integer -> (Instance Bitmap%))
-   (Exact-Positive-Integer Exact-Positive-Integer Any -> (Instance Bitmap%)))]
- [color% Color%]
- [make-color
-  (case->
-   (Byte Byte Byte -> (Instance Color%))
-   (Byte Byte Byte Real -> (Instance Color%)))]
- [snip% Snip%]
- [message-box (String String -> (U 'ok 'cancel 'yes 'no))]
- [open-input-text-editor
-  ((Instance Text%) Integer (U 'end Integer) ((Instance Snip%) -> (Instance Snip%)) (Instance Text%) Boolean -> Input-Port)])
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/base64.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/base64.rkt
deleted file mode 100644
index 10f4392fdb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/base64.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/typed/provide net/base64
-  [base64-encode-stream (case-lambda (Input-Port Output-Port -> Void)
-                                     (Input-Port Output-Port Bytes -> Void))]
-  [base64-decode-stream (Input-Port Output-Port -> Void)]
-  [base64-encode (Bytes -> Bytes)]
-  [base64-decode (Bytes -> Bytes)])
-
-(provide base64-encode-stream base64-decode-stream base64-encode base64-decode)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/cgi.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/cgi.rkt
deleted file mode 100644
index 321e30bc51..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/cgi.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/typed/provide net/cgi
-  [get-bindings (-> (Listof (cons (U Symbol String) String)))]
-  [get-bindings/post (-> (Listof (Pair (U Symbol String) String)))]
-  [get-bindings/get (-> (Listof (Pair (U Symbol String) String)))]
-  [output-http-headers (-> Void)]
-  [generate-html-output (case-lambda (String (Listof String) -> Void)
-				     (String (Listof String) String String String String String -> Void))]
-  [generate-error-output ((Listof String) -> (U))]
-  [bindings-as-html ((Listof (cons (U Symbol String) String)) -> (Listof String))]
-  [extract-bindings ((U Symbol String) (Listof (cons (U Symbol String) String)) -> ( Listof  String))]
-  [extract-binding/single ((U Symbol String) (Listof (Pair (U Symbol String) String)) ->  String)]
-  [get-cgi-method (-> (U "GET" "POST"))]
-  [string->html (String -> String)]
-  [generate-link-text (String String -> String)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/cookie.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/cookie.rkt
deleted file mode 100644
index bf78fc0000..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/cookie.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/opaque-type Cookie cookie? net/cookie)
-
-(require/typed/provide net/cookie
-  [set-cookie (String String -> Cookie)]
-  [cookie:add-comment (Cookie String -> Cookie)]
-  [cookie:add-domain (Cookie String -> Cookie)]
-  [cookie:add-max-age (Cookie Number -> Cookie)]
-  [cookie:add-path (Cookie String -> Cookie)]
-  [cookie:secure (Cookie Boolean -> Cookie)]
-  [cookie:version (Cookie Number -> Cookie)]
-
-  [print-cookie (Cookie -> String)]
-
-  [get-cookie (String String -> (Listof String))]
-  [get-cookie/single (String String -> (Option String))])
-
-(require-typed-struct (cookie-error exn:fail) () #:extra-constructor-name make-cookie-error net/cookie)
-
-(provide Cookie cookie? (struct-out cookie-error))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/dns.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/dns.rkt
deleted file mode 100644
index 1f8e42d3ec..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/dns.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/typed/provide net/dns
-  [dns-get-address (String String [#:ipv6? Any] -> String)]
-  [dns-get-name (String String -> String)]
-  [dns-get-mail-exchanger (String String -> String )]
-  [dns-find-nameserver (-> (Option String))])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/ftp.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/ftp.rkt
deleted file mode 100644
index 3299ab67e8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/ftp.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/opaque-type FTP-Connection ftp-connection? net/ftp)
-
-(require/typed/provide net/ftp
-  [ftp-cd (FTP-Connection String -> Void)]
-  [ftp-establish-connection (String Number String String -> FTP-Connection)]
-  [ftp-close-connection (FTP-Connection -> Void)]
-  [ftp-directory-list (FTP-Connection -> (Listof (List (U "-" "d" "l") String String)))]
-  [ftp-download-file (FTP-Connection Path String -> Void)]
-  [ftp-make-file-seconds (String -> Number)])
-
-(provide ftp-connection? FTP-Connection)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/gifwrite.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/gifwrite.rkt
deleted file mode 100644
index a2e550b734..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/gifwrite.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/racket/base
-
-(require typed/file/gif)
-(provide (all-from-out typed/file/gif))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/git-checkout.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/git-checkout.rkt
deleted file mode 100644
index 1fcd70fe5d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/git-checkout.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang s-exp typed-racket/base-env/extra-env-lang
-
-;; This module provides a typed version of net/git-checkout
-
-(require net/git-checkout)
-
-(type-environment
- [git-checkout
-  (->key -String -String
-         #:dest-dir (-opt -Pathlike) #t
-         #:ref -String #f
-         #:transport (one-of/c 'git 'http 'https) #f
-         #:depth (-opt -Integer) #f
-         #:status-printf (->* (list -String) Univ -Void) #f
-         #:tmp-dir (-opt -Pathlike) #f
-         #:clean-tmp-dir? Univ #f
-         #:verify-server? Univ #f
-         #:port -Integer #f
-         -String)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/head.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/head.rkt
deleted file mode 100644
index 66c7530bee..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/head.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/typed/provide net/head
-  [empty-header String]
-  [validate-header (String -> Void)]
-  [extract-field (Bytes (U Bytes String) -> (Option Bytes))]
-  [remove-field (String String -> String)]
-  [insert-field (String String String -> String)]
-  [replace-field (String String String -> String)]
-  [extract-all-fields ((U String Bytes) -> (Listof (cons (U String Bytes) (U Bytes String))))]
-  [append-headers (String String -> String)]
-  [standard-message-header (String (Listof String) (Listof String) (Listof String) String -> String)]
-  [data-lines->data ((Listof String) -> String)]
-  [extract-addresses (String Symbol -> (U (Listof String) (Listof (Listof String))))]
-  [assemble-address-field ((Listof String) -> String)])
-
-(provide
- empty-header
- validate-header
- extract-field
- remove-field
- insert-field
- replace-field
- extract-all-fields
- append-headers
- standard-message-header
- data-lines->data
- extract-addresses
- assemble-address-field)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/http-client.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/http-client.rkt
deleted file mode 100644
index a5cc778e1c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/http-client.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang typed/racket/base
-
-(define-type BString (U Bytes String))
-
-(require (only-in typed/openssl
-                  SSL-Client-Context))
-
-(require/typed/provide net/http-client
-  [#:opaque HTTP-Connection http-conn?]
-  [http-conn (-> HTTP-Connection)]
-  [http-conn-live? (-> HTTP-Connection Boolean)]
-  
-  [http-conn-open!
-   (->* [HTTP-Connection BString]
-        [#:ssl? (U Boolean Symbol SSL-Client-Context) #:port Positive-Integer]
-        Void)]
-  
-  [http-conn-open 
-   (->* [BString]
-        [#:ssl? (U Boolean Symbol SSL-Client-Context) #:port Positive-Integer]
-        HTTP-Connection)]
-  
-  [http-conn-close! (-> HTTP-Connection Void)]
-  [http-conn-abandon! (-> HTTP-Connection Void)]
-  
-  [http-conn-send!
-   (->* [HTTP-Connection BString]
-        [#:version BString #:method (U BString Symbol) #:close? Boolean #:headers (Listof BString)
-                   #:content-decode (Listof Symbol) #:data (Option BString)]
-        Void)]
-  
-  [http-conn-recv!
-   (->* [HTTP-Connection]
-        [#:content-decode (Listof Symbol) #:close? Boolean]
-        (values Bytes (Listof Bytes) Input-Port))]
-  
-  [http-conn-sendrecv!
-   (->* [HTTP-Connection BString]
-        [#:version BString #:method (U BString Symbol) #:headers (Listof BString)
-                   #:data (Option BString) #:content-decode (Listof Symbol) #:close? Boolean]
-        (values Bytes (Listof Bytes) Input-Port))]
-  
-  [http-sendrecv
-   (->* [BString BString]
-        [#:ssl? (U Boolean Symbol SSL-Client-Context) #:port Positive-Integer #:version BString
-                #:method (U BString Symbol) #:headers (Listof BString) #:data (Option BString) 
-                #:content-decode (Listof Symbol)]
-        (values Bytes (Listof Bytes) Input-Port))])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/imap.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/imap.rkt
deleted file mode 100644
index ce2bd631dc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/imap.rkt
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/opaque-type IMAP-Connection imap-connection? net/imap)
-
-(define-type-alias bstring (U String Bytes))
-
-(require/typed/provide net/imap
-  [imap-port-number (Number -> Void)]
-
-  [imap-connect (String String String String -> (values IMAP-Connection Number Number))]
-  [imap-connect* (Number Number String String String -> (values IMAP-Connection Number Number))]
-  [imap-disconnect (IMAP-Connection -> Void)]
-  [imap-force-disconnect (IMAP-Connection -> Void)]
-  [imap-reselect (IMAP-Connection String -> (values Number Number))]
-  [imap-examine (IMAP-Connection String -> (values Number Number))]
-  [imap-noop (IMAP-Connection -> (values Number Number))]
-  [imap-status (IMAP-Connection String (Listof Symbol) -> (Listof (Listof Number)))]
-  [imap-poll (IMAP-Connection -> Void)]
-
-  [imap-new? (IMAP-Connection -> Boolean)]
-  [imap-messages (IMAP-Connection -> Number)]
-  [imap-recent (IMAP-Connection -> Number)]
-  [imap-uidnext (IMAP-Connection -> (Option Number))]
-  [imap-uidvalidity (IMAP-Connection -> (Option Number))]
-  [imap-unseen (IMAP-Connection -> (Option Number))]
-  [imap-reset-new! (IMAP-Connection -> Void)]
-
-  [imap-get-expunges (IMAP-Connection -> (Listof Number))]
-  [imap-pending-expunges? (IMAP-Connection -> Boolean)]
-  [imap-get-updates (IMAP-Connection -> (Listof (cons Number (Listof (Pair Any Any)))))]
-  [imap-pending-updates? (IMAP-Connection -> Boolean)]
-
-  [imap-get-messages
-   (IMAP-Connection (Listof Number) Symbol -> (Listof (Listof (U Number String String (Listof Symbol)))))]
-  [imap-copy  (IMAP-Connection (Listof Number) String -> Void)]
-  [imap-append (IMAP-Connection String String -> Void)]
-  [imap-store (IMAP-Connection Symbol (Listof Number) Symbol -> Void)]
-  [imap-flag->symbol (Symbol -> Symbol)]
-  [symbol->imap-flag (Symbol -> Symbol)]
-  [imap-expunge (IMAP-Connection -> Void)]
-
-  [imap-mailbox-exists? (IMAP-Connection String -> Boolean)]
-  [imap-create-mailbox (IMAP-Connection String -> Void)]
-
-  [imap-list-child-mailboxes
-   (case-lambda (IMAP-Connection bstring -> (Listof (cons (Listof Symbol) (cons String '()))))
-                (IMAP-Connection bstring (Option bstring) -> (Listof (List (Listof Symbol) String))))]
-  [imap-mailbox-flags (IMAP-Connection String -> (Listof Symbol))]
-  [imap-get-hierarchy-delimiter (IMAP-Connection -> String)])
-
-(provide
- imap-connection?
- IMAP-Connection)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/mime.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/mime.rkt
deleted file mode 100644
index f65294e99c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/mime.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-;; -- basic mime structures --
-(require-typed-struct disposition
-                      ([type : Symbol]
-                       [filename : String]
-                       [creation : String]
-                       [modification : String]
-                       [read : String]
-                       [size : Number]
-                       [params : (Listof (Pair Symbol String))])
-                      #:extra-constructor-name make-disposition
-                      net/mime)
-(require-typed-struct entity  ([type : (U Symbol String)]
-                               [subtype : (U Symbol String)]
-                               [charset : (U Symbol String)]
-                               [encoding : Symbol]
-                               [disposition : disposition ]
-                               [params : (Listof (cons Symbol String))]
-                               [id : String]
-                               [description : String]
-                               [other : String]
-                               [fields : (Listof String)]
-                               [parts : (Listof String) ]
-                               [body : (Output-Port -> Void)])
-                      #:extra-constructor-name make-entity
-                      net/mime)
-(require-typed-struct message
-                      ([version : String] [entity :  entity] [fields : (Listof Symbol)])
-                      #:extra-constructor-name make-message
-                      net/mime)
-
-
-;; -- exceptions raised --
-#| ;; constructors not exported
-(require-typed-struct mime-error () net/mime)
-(require-typed-struct (unexpected-termination mime-error) ([msg : String]) net/mime)
-(require-typed-struct (missing-multipart-boundary-parameter mime-error) () net/mime)
-(require-typed-struct (malformed-multipart-entity mime-error) ([msg : String]) net/mime)
-(require-typed-struct (empty-mechanism mime-error) () net/mime)
-(require-typed-struct (empty-type mime-error) () net/mime)
-(require-typed-struct (empty-subtype mime-error) () net/mime)
-(require-typed-struct (empty-disposition-type mime-error) () net/mime)
-|#
-;; -- mime methods --
-(require/typed/provide net/mime
-  [mime-analyze ((U Bytes Input-Port) Any -> message)])
-
-(provide
- ;; -- basic mime structures --
- (struct-out message)
- (struct-out entity)
- (struct-out disposition)
- #|
- (struct-out mime-error)
- (struct-out unexpected-termination)
- (struct-out missing-multipart-boundary)
- (struct-out malformed-multipart-entity)
- (struct-out empty-mechanism)
- (struct-out empty-type)
- (struct-out empty-subtype)
- (struct-out empty-disposition-type)
-|#
- )
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/nntp.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/nntp.rkt
deleted file mode 100644
index cb540e0ac9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/nntp.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require-typed-struct/provide
- communicator ([sender : Number] [receiver : Number] [server : String] [port : Number])
- #:extra-constructor-name make-communicator
- net/nntp)
-
-(require/typed/provide net/nntp
-  [connect-to-server (case-lambda (String -> communicator) (String Number -> communicator))]
-  [disconnect-from-server (communicator -> Void)]
-  [authenticate-user  (communicator String String -> Void)]
-  [open-news-group (communicator String -> (values Number Number Number))]
-  [head-of-message  (communicator Number -> (Listof String))]
-  [body-of-message (communicator Number -> (Listof String))]
-  [newnews-since  (communicator Number -> (Listof String))]
-  [generic-message-command (communicator Number -> (Listof String))]
-  [make-desired-header  (String -> String)]
-  [extract-desired-headers ((Listof String) (Listof String) -> (Listof String))])
-
-(require-typed-struct/provide (nntp exn:fail)
-  () #:extra-constructor-name make-nntp net/nntp)
-(require-typed-struct/provide (unexpected-response nntp)
-  ([code : Number] [text : String]) #:extra-constructor-name make-unexpected-response net/nntp)
-(require-typed-struct/provide (bad-status-line nntp)
-  ([line : String]) #:extra-constructor-name make-bad-status-line net/nntp)
-(require-typed-struct/provide (premature-close nntp)
-  ([communicator : communicator]) #:extra-constructor-name make-premature-close net/nntp)
-(require-typed-struct/provide (bad-newsgroup-line nntp)
-  ([line : String]) #:extra-constructor-name make-bad-newsgroup-line net/nntp)
-(require-typed-struct/provide (non-existent-group nntp)
-  ([group : String]) #:extra-constructor-name make-non-existent-group net/nntp)
-(require-typed-struct/provide (article-not-in-group nntp)
-  ([article : Number]) #:extra-constructor-name make-article-not-in-group net/nntp)
-(require-typed-struct/provide (no-group-selected nntp)
-  () #:extra-constructor-name make-no-group-selected net/nntp)
-(require-typed-struct/provide (article-not-found nntp)
-  ([article : Number]) #:extra-constructor-name make-article-not-found net/nntp)
-(require-typed-struct/provide (authentication-rejected nntp)
-  () #:extra-constructor-name make-authentication-rejected net/nntp)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/pop3.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/pop3.rkt
deleted file mode 100644
index 0190ceef9e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/pop3.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require-typed-struct/provide communicator
-			      ([sender : Number] [receiver : Number] [server : String] [port : Number] [state : Symbol])
-                  #:extra-constructor-name make-communicator
-			      net/pop3)
-
-(require/typed/provide net/pop3
-  [connect-to-server (case-lambda (String -> communicator) (String Number -> communicator))]
-
-  [disconnect-from-server (communicator -> Void)]
-  [authenticate/plain-text (String String communicator -> Void)]
-  [get-mailbox-status (communicator -> (values Number Number))]
-  [get-message/complete  (communicator Number -> (values (Listof String)(Listof String)))]
-  [get-message/headers  (communicator Number -> (Listof String))]
-  [get-message/body (communicator Number -> (Listof String))]
-  [delete-message (communicator Number -> Void)]
-  [get-unique-id/single  (communicator Number -> String)]
-  [get-unique-id/all (communicator -> (Listof (cons Number String)))]
-
-  [make-desired-header  (String -> String)]
-  [extract-desired-headers ((Listof String)(Listof String)-> (Listof String))])
-
-
-(require-typed-struct/provide (pop3 exn)
-  () #:extra-constructor-name make-pop3 net/pop3)
-(require-typed-struct/provide (cannot-connect pop3)
-  () #:extra-constructor-name make-cannot-connect net/pop3)
-(require-typed-struct/provide (username-rejected pop3)
-  () #:extra-constructor-name make-username-rejected net/pop3)
-(require-typed-struct/provide (password-rejected pop3)
-  () #:extra-constructor-name make-password-rejected net/pop3)
-
-(require-typed-struct/provide (not-ready-for-transaction pop3)
-  ([communicator : communicator])
-  #:extra-constructor-name make-not-ready-for-transaction net/pop3)
-(require-typed-struct/provide (not-given-headers pop3)
-  ([communicator : communicator] [message : Integer])
-  #:extra-constructor-name make-not-given-headers net/pop3)
-(require-typed-struct/provide (illegal-message-number pop3)
-  ([communicator : communicator] [message : Integer])
-  #:extra-constructor-name make-illegal-message-number net/pop3)
-(require-typed-struct/provide (cannot-delete-message pop3)
-  ([communicator : communicator] [message : Integer])
-  #:extra-constructor-name make-cannot-delete-message net/pop3)
-(require-typed-struct/provide (disconnect-not-quiet pop3)
-  ([communicator : communicator])
-  #:extra-constructor-name make-disconnect-not-quiet net/pop3)
-(require-typed-struct/provide (malformed-server-response pop3)
-  ([communicator : communicator])
-  #:extra-constructor-name make-malformed-server-response net/pop3)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/qp.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/qp.rkt
deleted file mode 100644
index 814161cac7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/qp.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/typed/provide net/qp
-  [qp-encode ( String -> String )]
-  [qp-decode ( String -> String )]
-  [qp-encode-stream (case-lambda (Input-Port Output-Port -> Void) (Input-Port Output-Port String -> Void) )]
-  [qp-decode-stream ( Input-Port Output-Port -> Void )])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/sendmail.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/sendmail.rkt
deleted file mode 100644
index 958d75df1a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/sendmail.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/typed/provide net/sendmail
-  [send-mail-message/port
-   (String String (Listof String) (Listof String) (Listof String) String * -> Output-Port)]
-  [send-mail-message
-   (String String (Listof String) (Listof String) (Listof String) (Listof String) String * -> Output-Port)])
-
-(provide send-mail-message/port send-mail-message #;no-mail-recipients)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/sendurl.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/sendurl.rkt
deleted file mode 100644
index 84d90af1e7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/sendurl.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket/base
-(require/typed net/sendurl
-               [send-url (String -> Void)]
-               [unix-browser-list (Listof Symbol)]
-               [browser-preference? (String -> Boolean)]
-               [external-browser  (-> (U Symbol #f (Pair String String)))])
-
-(provide send-url unix-browser-list browser-preference? external-browser)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/smtp.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/smtp.rkt
deleted file mode 100644
index 18791c9847..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/smtp.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/typed/provide net/smtp
-  [smtp-send-message (String String (Listof String) String (Listof String) -> Void)]
-  [smtp-sending-end-of-message (Parameter (-> Any))])
-
-(provide smtp-send-message smtp-sending-end-of-message)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/uri-codec.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/uri-codec.rkt
deleted file mode 100644
index ed89cf33ec..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/uri-codec.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require/typed/provide net/uri-codec
-  [uri-encode ( String -> String )]
-  [uri-decode ( String -> String )]
-
-  [form-urlencoded-encode ( String -> String )]
-  [form-urlencoded-decode ( String -> String )]
-
-  [alist->form-urlencoded ( (Listof (cons Symbol String)) -> String )]
-  [form-urlencoded->alist ( String -> (Listof (cons Symbol String)) )]
-  [current-alist-separator-mode (Parameter Symbol)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/url.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/url.rkt
deleted file mode 100644
index 35e3f93cfc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/url.rkt
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang typed/racket/base
-
-(require typed/private/utils)
-
-(require-typed-struct/provide path/param ([path : (U String 'up 'same)] [param : (Listof String)]) net/url)
-
-(require-typed-struct/provide
- url ([scheme : (Option String)]
-      [user : (Option String)]
-      [host : (Option String)]
-      [port : (Option Integer)]
-      [path-absolute? : Boolean]
-      [path : (Listof path/param)]
-      [query : (Listof (Pair Symbol (Option String)))]
-      [fragment : (Option String)])
- net/url)
-
-(require/opaque-type URL-Exception url-exception? net/url)
-(provide URL-Exception url-exception?)
-
-(require/opaque-type HTTP-Connection http-connection? net/url)
-(provide HTTP-Connection http-connection?)
-
-(define-type-alias PortT (case-lambda (url -> Input-Port) (url (Listof String)-> Input-Port)))
-(define-type-alias PortT/String (case-lambda (url String -> Input-Port) (url String (Listof String)-> Input-Port)))
-(define-type-alias PortT/Bytes (case-lambda (url Bytes -> Input-Port) (url Bytes (Listof String)-> Input-Port)))
-(provide PortT PortT/String PortT/Bytes)
-
-(require/typed/provide net/url
-
-  [path->url (Path-String -> url)]
-  [url->path (case-lambda (url -> Path) (url (U 'unix 'windows) -> Path))]
-
-  [file-url-path-convention-type (Parameter (U 'unix 'windows))]
-
-  [get-pure-port
-   (case-> (url [#:redirections Natural] -> Input-Port)
-           (url (Listof String) [#:redirections Natural] -> Input-Port))]
-  [head-pure-port PortT]
-  [delete-pure-port PortT]
-
-  [get-impure-port PortT]
-  [head-impure-port PortT]
-  [delete-impure-port PortT]
-
-  [post-pure-port PortT/Bytes]
-  [put-pure-port PortT/Bytes]
-
-  [post-impure-port PortT/Bytes]
-  [put-impure-port PortT/Bytes]
-
-  [display-pure-port (Input-Port -> Void)]
-  [purify-port (Input-Port -> String)]
-
-  [get-pure-port/headers
-   (case-> (url [#:redirections Natural]
-                [#:status? Boolean]
-                [#:connection (Option HTTP-Connection)]
-                -> (values Input-Port String))
-           (url (Listof String)
-                [#:redirections Natural]
-                [#:status? Boolean]
-                [#:connection (Option HTTP-Connection)]
-                -> (values Input-Port String)))]
-
-  [make-http-connection (-> HTTP-Connection)]
-  [http-connection-close (HTTP-Connection -> Void)]
-
-  [call/input-url (All (T) (case-lambda
-                             [url (url -> Input-Port) (Input-Port -> T) -> T]
-                             [url (url (Listof String) -> Input-Port) (Input-Port -> T) (Listof String) -> T]))]
-
-  [current-proxy-servers (Parameter (Listof (List String String Integer)))]
-
-  [http-sendrecv/url
-   (url [#:method (U Bytes String Symbol)]
-        [#:headers (Listof (U Bytes String))]
-        [#:data (Option (U Bytes String))]
-        [#:content-decode (Listof Symbol)]
-        -> (values Bytes (Listof Bytes) Input-Port))]
-
-  [netscape/string->url (String -> url)]
-  [string->url (String -> url)]
-  [url->string (url -> String)]
-  [combine-url/relative (url String -> url)])
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl.rkt
deleted file mode 100644
index e623d8c4ea..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl.rkt
+++ /dev/null
@@ -1,96 +0,0 @@
-#lang typed/racket/base
-
-(require "openssl/types.rkt")
-(provide (all-from-out "openssl/types.rkt"))
-
-(require/typed/provide openssl
-  [ssl-available? Boolean]
-  [ssl-load-fail-reason (Option String)]
-  
-  ;; 1: TCP-like Client Procedures
-  [ssl-connect
-   (->* (String Exact-Positive-Integer)
-        ((U SSL-Client-Context SSL-Protocol))
-        (Values Input-Port Output-Port))]
-  [ssl-connect/enable-break
-   (->* (String Exact-Positive-Integer)
-        ((U SSL-Client-Context SSL-Protocol))
-        (Values Input-Port Output-Port))]
-  
-  [ssl-secure-client-context (-> SSL-Client-Context)]
-  [ssl-make-client-context (SSL-Protocol -> SSL-Client-Context)]
-  )
-
-;;;; 2: TCP-like Server Procedures
-(require/typed/provide openssl
-  [ssl-listen (->* (Exact-Positive-Integer) ;; port, <= 65535
-                   (Exact-Nonnegative-Integer Boolean (Option String))
-                   SSL-Listener)]
-  [ssl-close (-> SSL-Listener Void)]
-  ;; ssl-listener? provided above
-  
-  [ssl-accept
-   (-> SSL-Listener (Values Input-Port Output-Port))]
-  [ssl-accept/enable-break
-   (-> SSL-Listener (Values Input-Port Output-Port))]
-  [ssl-abandon-port (-> Port Void)] ;; XXX SSL-Port
-
-  [ssl-make-server-context (SSL-Protocol -> SSL-Server-Context)]
-  )
-
-;;;; 3: SSL Wrapper Interface
-
-(require/typed/provide openssl
-  [ports->ssl-ports
-   (-> Input-Port Output-Port
-       [#:mode (U 'connect 'accept)]
-       [#:context (U SSL-Client-Context SSL-Server-Context)]
-       [#:encrypt SSL-Protocol]
-       [#:close-original? Boolean]
-       [#:shutdown-on-close? Boolean]
-       [#:error/ssl (Any -> Void)] ;; FIXME find type for error proc
-       [#:hostname (Option String)]
-       ; ->
-       (Values Input-Port Output-Port))]
-  )
-
-;;;; 4: Context Procedures
-
-(require/typed/provide openssl
-  [ssl-load-verify-source!
-   (-> SSL-Context SSL-Verify-Source [#:try? Any] Void)]
-  [ssl-default-verify-sources (Parameterof SSL-Verify-Source)]
-  [ssl-load-default-verify-sources! (-> SSL-Context Void)]
-  [ssl-load-verify-root-certificates!
-   (-> (U SSL-Context SSL-Listener) Path-String Void)]
-  [ssl-set-ciphers! (-> SSL-Context String Void)]
-  [ssl-seal-context! (-> SSL-Context Void)]
-  [ssl-load-certificate-chain!
-   (-> (U SSL-Context SSL-Listener) Path-String Void)]
-  [ssl-load-private-key!
-   (->* ((U SSL-Context SSL-Listener) Path-String)
-        (Boolean Boolean)
-        Void)]
-  [ssl-load-suggested-certificate-authorities!
-   (-> (U SSL-Context SSL-Listener) Path-String Void)]
-  )
-
-;;;; 5: Peer Verification
-
-(require/typed/provide openssl
-  [ssl-set-verify!
-   (-> (U SSL-Context SSL-Listener Port) Any ;; XXX SSL-Port
-       Void)]
-  [ssl-try-verify!
-   (-> (U SSL-Context SSL-Listener Port) Any ;; XXX SSL-Port
-       Void)]
-  [ssl-peer-verified? (-> Port Boolean)] ;; XXX SSL-Port
-  [ssl-set-verify-hostname! (-> SSL-Context Any Void)]
-  [ssl-peer-certificate-hostnames
-   (-> Port (Listof String))]  ;; XXX SSL-Port
-  [ssl-peer-check-hostname
-   (-> Port String Boolean)]  ;; XXX SSL-Port
-  [ssl-peer-subject-name (-> Port (Option Bytes))] ;; XXX SSL-Port
-  [ssl-peer-issuer-name  (-> Port (Option Bytes))] ;; XXX SSL-Port
-  )
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl/md5.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl/md5.rkt
deleted file mode 100644
index 4aacf35395..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl/md5.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket/base
-
-(require/typed/provide openssl/md5
-  [md5 (-> Input-Port String)]
-  [md5-bytes (-> Input-Port Bytes)]
-  )
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl/sha1.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl/sha1.rkt
deleted file mode 100644
index 4df96987df..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl/sha1.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket/base
-
-(require/typed/provide openssl/sha1
-  [sha1 (-> Input-Port String)]
-  [sha1-bytes (-> Input-Port Bytes)]
-  [bytes->hex-string (-> Bytes String)]
-  [hex-string->bytes (-> String Bytes)]
-  )
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl/types.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl/types.rkt
deleted file mode 100644
index b5c2435a27..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/openssl/types.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang typed/racket/base
-
-#| Datatypes used by typed/openssl, based on the untyped openssl module. |#
-
-(provide SSL-Protocol
-         SSL-Client-Context ssl-client-context?
-         SSL-Server-Context ssl-server-context?
-         SSL-Context
-         SSL-Listener ssl-listener?
-         ;; ssl-port? is provided below
-         SSL-Verify-Source
-         )
-
-(define-type SSL-Protocol
-  (U 'auto 'sslv2-or-v3 'sslv2 'sslv3 'tls 'tls11 'tls12))
-
-(require/opaque-type SSL-Client-Context ssl-client-context? openssl)
-
-(require/opaque-type SSL-Listener ssl-listener? openssl)
-(provide SSL-Listener ssl-listener?)
-
-(require/typed/provide openssl
-  ;; XXX Would be better if we could make a type SSL-Port as a subtype
-  ;; of Port, but for now that's impossible so we'll just provide this
-  ;; predicate that guarantees Port-ness.
-  [ssl-port? (-> Any Boolean ;; TODO: Add this -->  : #:+ Port
-                 )]
-  )
-
-(require/opaque-type SSL-Server-Context ssl-server-context? openssl)
-
-(define-type SSL-Context (U SSL-Client-Context SSL-Server-Context))
-
-
-
-;;;; Host Verification ;;;;
-
-(define-type SSL-Verify-Source
-  (U Path-String
-     (List 'directory Path-String)
-     (List 'win32-store String)
-     (List 'macosx-keychain Path-String)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/pict.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/pict.rkt
deleted file mode 100644
index ffb1523196..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/pict.rkt
+++ /dev/null
@@ -1,254 +0,0 @@
-#lang s-exp typed-racket/base-env/extra-env-lang
-
-;; Typed base-env wrapper for the pict library
-
-(require pict
-         (for-syntax (only-in typed-racket/rep/type-rep
-                              make-Name
-                              make-Union)))
-
-(begin-for-syntax
- (define -pict (-struct-name #'pict))
- (define -pict-path
-   (make-Union (list (-val #f) -pict (-lst -pict))))
- (define -child (-struct-name #'child))
- (define -linestyle
-   (one-of/c 'transparent 'solid 'xor 'hilite
-             'dot 'long-dash 'short-dash 'dot-dash
-             'xor-dot 'xor-long-dash 'xor-short-dash
-             'xor-dot-dash))
- (define -pin-arrow-line
-   (->key -Real
-          -pict
-          -pict-path
-          (-> -pict -pict-path (-values (list -Real -Real)))
-          -pict-path
-          (-> -pict -pict-path (-values (list -Real -Real)))
-          #:start-angle (-opt -Real) #f
-          #:end-angle (-opt -Real) #f
-          #:start-pull -Real #f
-          #:end-pull -Real #f
-          #:line-width (-opt -Real) #f
-          ;; FIXME: color%
-          #:color (-opt (Un -String)) #f
-          #:alpha -Real #f
-          #:style -linestyle #f
-          #:under? Univ #f
-          #:solid? Univ #f
-          #:hide-arrowhead? Univ #f
-          -pict))
- (define -pict-finder
-   (-> -pict -pict-path (-values (list -Real -Real))))
- (define -append-type
-   (cl->*
-     (->* (list -Real -pict) -pict -pict)
-     (->* (list -pict) -pict -pict)))
- (define -superimpose-type
-   (->* (list -pict) -pict -pict)))
-
-(type-environment
- [#:struct pict ([draw : Univ]
-                 [width : -Real]
-                 [height : -Real]
-                 [ascent : -Real]
-                 [children : (-lst -child)]
-                 [panbox : Univ]
-                 [last : -pict-path])
-           #:extra-constructor-name make-pict]
- [#:struct child ([pict : -pict]
-                  [dx : -Real]
-                  [dy : -Real]
-                  [sx : -Real]
-                  [sy : -Real]
-                  [sxy : -Real]
-                  [syx : -Real])
-           #:extra-constructor-name make-child]
-
- ;; dc
- [blank (cl->* (-> -pict)
-               (-> -Real -pict)
-               (-> -Real -Real -pict)
-               (-> -Real -Real -Real -pict)
-               (-> -Real -Real -Real -Real -pict))]
- ;; text
- [hline (->key -Real -Real #:segment (-opt -Real) #f -pict)]
- [vline (->key -Real -Real #:segment (-opt -Real) #f -pict)]
- [frame (->key -pict
-               #:segment (-opt -Real) #f
-               ;; FIXME: add color% with class support
-               #:color (-opt -String) #f
-               #:line-width (-opt -Real) #f
-               -pict)]
- [ellipse (-> -Real -Real -pict)]
- [circle (-> -Real -pict)]
- [filled-ellipse
-  (->key -Real -Real #:draw-border? Univ #f -pict)]
- [disk
-  (->key -Real #:draw-border? Univ #f -pict)]
- [rectangle (-> -Real -Real -pict)]
- [filled-rectangle
-  (->key -Real -Real #:draw-border? Univ #f -pict)]
- [rounded-rectangle
-  (->optkey -Real -Real [-Real] #:angle -Real #f -pict)]
- [filled-rounded-rectangle
-  (->optkey -Real -Real [-Real]
-            #:angle -Real #f
-            #:draw-border? Univ #f
-            -pict)]
- ;; FIXME: add bitmap% and image-snip%
- [bitmap (-> (Un -Pathlike) -pict)]
- [arrow (-> -Real -Real -pict)]
- [arrowhead (-> -Real -Real -pict)]
- [pip-line (-> -Real -Real -Real -pict)]
- [pip-arrow-line (-> -Real -Real -Real -pict)]
- [pip-arrows-line (-> -Real -Real -Real -pict)]
- [pin-line
-  (->key -pict
-         -pict-path
-         (-> -pict -pict-path (-values (list -Real -Real)))
-         -pict-path
-         (-> -pict -pict-path (-values (list -Real -Real)))
-         #:start-angle (-opt -Real) #f
-         #:end-angle (-opt -Real) #f
-         #:start-pull -Real #f
-         #:end-pull -Real #f
-         #:line-width (-opt -Real) #f
-         ;; FIXME: color%
-         #:color (-opt (Un -String)) #f
-         #:alpha -Real #f
-         #:style -linestyle #f
-         #:under? Univ #f
-         -pict)]
- [pin-arrow-line -pin-arrow-line]
- [pin-arrows-line -pin-arrow-line]
- [bitmap-draft-mode (-Param Univ Univ)]
-
- ;; 3 Pict Combiners
- [vl-append -append-type]
- [vc-append -append-type]
- [vr-append -append-type]
- [ht-append -append-type]
- [htl-append -append-type]
- [hc-append -append-type]
- [hbl-append -append-type]
- [hb-append -append-type]
-
- [lt-superimpose -superimpose-type]
- [ltl-superimpose -superimpose-type]
- [lc-superimpose -superimpose-type]
- [lbl-superimpose -superimpose-type]
- [lb-superimpose -superimpose-type]
- [ct-superimpose -superimpose-type]
- [ctl-superimpose -superimpose-type]
- [cc-superimpose -superimpose-type]
- [cbl-superimpose -superimpose-type]
- [cb-superimpose -superimpose-type]
- [rt-superimpose -superimpose-type]
- [rtl-superimpose -superimpose-type]
- [rc-superimpose -superimpose-type]
- [rbl-superimpose -superimpose-type]
- [rb-superimpose -superimpose-type]
-
- [pin-over
-  (cl->*
-    (-> -pict -Real -Real -pict)
-    (-> -pict -pict-path
-        (-> -pict -pict-path (-values (list -Real -Real)))
-        -pict))]
- [pin-under
-  (cl->*
-    (-> -pict -Real -Real -pict)
-    (-> -pict -pict
-        (-> -pict -pict (-values (list -Real -Real)))
-        -pict))]
-
- ;; FIXME: table has a weird type
-
- ;; 4 Pict Drawing Adjusters
- [scale
-  (cl->* (-> -pict -Real -pict)
-         (-> -pict -Real -Real -pict))]
- [scale-to-fit
-  (cl->* (-> -pict -Real -pict)
-               (-> -pict -Real -Real -pict))]
- [rotate (-> -pict -Real -pict)]
- [ghost (-> -pict -pict)]
- [linewidth (-> (-opt -Real) -pict -pict)]
- [linestyle (-> -linestyle -pict -pict)]
- [colorize (-> -pict (Un -String (-lst* -Integer -Integer -Integer)) -pict)]
- [cellophane (-> -pict -Real -pict)]
- [clip (-> -pict -pict)]
- [inset/clip
-  (cl->* (-> -pict -Real -pict)
-         (-> -pict -Real -Real -pict)
-         (-> -pict -Real -Real -Real -Real -pict))]
- [black-and-white (-Param Univ Univ)]
-
- ;; 5 Bounding Box Adjusters
- [inset
-  (cl->* (-> -pict -Real -pict)
-         (-> -pict -Real -Real -pict)
-         (-> -pict -Real -Real -Real -Real -pict))]
- [clip-descent (-> -pict -pict)]
- [lift-above-baseline (-> -pict -Real -pict)]
- [drop-below-ascent (-> -pict -Real -pict)]
- [baseless (-> -pict -pict)]
- [refocus (-> -pict -pict -pict)]
- [panorama (-> -pict -pict)]
- [use-last (-> -pict -pict-path -pict)]
- [use-last* (-> -pict -pict-path -pict)]
-
- ;; 6 Pict Finders
- [lt-find -pict-finder]
- [ltl-find -pict-finder]
- [lc-find -pict-finder]
- [lbl-find -pict-finder]
- [lb-find -pict-finder]
- [ct-find -pict-finder]
- [ctl-find -pict-finder]
- [cbl-find -pict-finder]
- [cb-find -pict-finder]
- [rt-find -pict-finder]
- [rtl-find -pict-finder]
- [rc-find -pict-finder]
- [rbl-find -pict-finder]
- [rb-find -pict-finder]
- [pict-path? (make-pred-ty -pict-path)]
- [launder (-> -pict -pict)]
-
- ;; 7.1 Dingbats
- ;; FIXME: color% for many of these
- [cloud (->opt -Real -Real [-String] -pict)]
- [file-icon (->opt -Real -Real -String [Univ] -pict)]
- [standard-fish
-  (->key -Real -Real
-         #:direction (one-of/c 'left 'right) #f
-         #:color -String #f
-         #:eye-color (-opt -String) #f
-         #:open-mouth (Un -Boolean -Real) #f
-         -pict)]
- [jack-o-lantern (->opt -Real [-String -String] -pict)]
- [angel-wing (-> -Real -Real Univ -pict)]
- [desktop-machine (->opt -Real [(-lst (one-of/c 'plt 'binary 'devil))] -pict)]
- ;; thermometer
-
- ;; 8 Animation Helpers
- [fade-pict (->key -Real -pict -pict
-                   #:combine (-> -pict -pict -pict) #f
-                   -pict)]
- [fade-around-pict (-> -Real -pict (-> -pict -pict) -pict)]
- [slide-pict (-> -pict -pict -pict -pict -Real -pict)]
- [sequence-animations (->* '() (-> -Real -pict) (-> -Real -pict))]
- [reverse-animations (->* '() (-> -Real -pict) (-> -Real -pict))]
- [fast-start (-> -Real -Real)]
- [fast-end (-> -Real -Real)]
- [fast-edges (-> -Real -Real)]
- [fast-middle (-> -Real -Real)]
- [split-phase (-> -Real (-values (list -Real -Real)))]
-
- ;; 10 Miscellaneous
- [hyperlinkize (-> -pict -pict)]
- ;; FIXME:
- ;; scale-color
- ;; color-series
- )
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/private/framework-types.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/private/framework-types.rkt
deleted file mode 100644
index 3da829946b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/private/framework-types.rkt
+++ /dev/null
@@ -1,1834 +0,0 @@
-#lang typed/racket
-
-;; Types for the framework library
-
-(require "../racket/private/gui-types.rkt")
-
-;; Frequently reused types
-(define-type Style-Delta%-Instance (Instance Style-Delta%))
-(define-type Snip%-Instance (Instance Snip%))
-(define-type Color%-Instance (Instance Color%))
-(define-type Frame:Basic<%>-Instance (Instance Frame:Basic<%>))
-(define-type Canvas%-Instance (Instance Canvas%))
-(define-type Menu%-Instance (Instance Menu%))
-(define-type Key-Event%-Instance (Instance Key-Event%))
-(define-type Mouse-Event%-Instance (Instance Mouse-Event%))
-(define-type Control-Event%-Instance (Instance Control-Event%))
-(define-type Menu-Item%-Instance (Instance Menu-Item%))
-(define-type Canvas:Basic<%>-Instance (Instance Canvas:Basic<%>))
-(define-type Text%-Instance (Instance Text%))
-(define-type Editor-Canvas%-Instance (Instance Editor-Canvas%))
-(define-type Editor<%>-Instance (Instance Editor<%>))
-(define-type Area-Container<%>-Instance (Instance Area-Container<%>))
-(define-type Dialog%-Instance (Instance Dialog%))
-
-;; 3 Autosave
-(provide Autosave:Autosavable<%>
-         Editor<%>-And-Autosave:Autosavable<%>)
-
-(define-type Autosave:Autosavable<%>
-  (Class [do-autosave (-> (Option Path))]))
-
-(define-type Editor<%>-And-Autosave:Autosavable<%>
-  (Class #:implements Autosave:Autosavable<%>
-         #:implements Editor<%>))
-
-;; 4 Canvas
-(provide Canvas:Basic<%>
-         Canvas:Basic-Mixin
-         Canvas:Basic%
-         Canvas:Color<%>
-         Canvas:Color-Mixin
-         Canvas:Color%
-         Canvas:Delegate<%>
-         Canvas:Delegate-Mixin
-         Canvas:Delegate%
-         Canvas:Info<%>
-         Canvas:Info-Mixin
-         Canvas:Info%
-         Canvas:Wide-Snip<%>
-         Canvas:Wide-Snip-Mixin
-         Canvas:Wide-Snip%)
-
-;; TODO: I'm not sure about interface for classes
-
-(define-type Canvas:Basic<%>
-  (Class #:implements Editor-Canvas%))
-
-(define-type Canvas:Basic-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Editor-Canvas%)
-    ->
-    (Class #:row-var r #:implements Canvas:Basic<%>)))
-
-(define-type Canvas:Color<%>
-  (Class #:implements Canvas:Basic<%>))
-
-(define-type Canvas:Color-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Canvas:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Canvas:Color<%>)))
-
-(define-type Canvas:Delegate<%>
-  (Class #:implements Canvas:Basic<%>))
-
-(define-type Canvas:Delegate-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Canvas:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Canvas:Delegate<%>)))
-
-(define-type Canvas:Info<%>
-  (Class #:implements Canvas:Basic<%>))
-
-(define-type Canvas:Info-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Canvas:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Canvas:Info<%>)))
-
-(define-type Canvas:Wide-Snip<%>
-  (Class #:implements Canvas:Basic<%>
-         [recalc-snips (-> Void)]
-         [add-wide-snip (Snip%-Instance -> Void)]
-         [add-tall-snip (Snip%-Instance -> Void)]))
-
-(define-type Canvas:Wide-Snip-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Canvas:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Canvas:Wide-Snip<%>)))
-
-;; FIXME: see frame cases
-(define-syntax-rule (define-canvas-like-class name parent-type)
-  (define-type name
-    (Class #:implements parent-type
-           (init [parent (Instance Area-Container<%>)]
-                 [editor (U (Instance Pasteboard%) (Instance Text%) #f) #:optional]
-                 [style (Listof (U 'no-border 'control-border 'combo
-                                   'no-hscroll 'no-vscroll
-                                   'hide-hscroll 'hide-vscroll
-                                   'auto-vscoll 'auto-hscroll
-                                   'resize-corner 'no-focus 'deleted
-                                   'transparent))
-                        #:optional]
-                 [scrolls-per-page Positive-Integer #:optional]
-                 [label (Option String) #:optional]
-                 [wheel-step (Option Positive-Integer) #:optional]
-                 [line-count (Option Positive-Integer) #:optional]
-                 [horizontal-inset Natural #:optional]
-                 [vertical-inset Natural #:optional]
-                 [enabled Any #:optional]
-                 [vert-margin Natural #:optional]
-                 [horiz-margin Natural #:optional]
-                 [min-width (Option Natural) #:optional]
-                 [min-height (Option Natural) #:optional]
-                 [stretchable-width Any #:optional]
-                 [stretchable-height Any #:optional]))))
-(define-canvas-like-class Canvas:Basic% Canvas:Basic<%>)
-(define-canvas-like-class Canvas:Color% Canvas:Color<%>)
-(define-canvas-like-class Canvas:Delegate% Canvas:Delegate<%>)
-(define-canvas-like-class Canvas:Info% Canvas:Info<%>)
-(define-canvas-like-class Canvas:Wide-Snip% Canvas:Wide-Snip<%>)
-
-;; 7 Color
-(provide Color:Text<%>
-         Color:Text%
-         Color:Text-Mixin
-         Color:Text-Mode<%>
-         Color:Text-Mode%
-         Color:Text-Mode-Mixin)
-
-(define-type Color:Text<%>
-  (Class #:implements Text:Basic<%>
-         [start-colorer ((Symbol -> String)
-                         (U (Input-Port
-                             -> (Values Any
-                                        Symbol
-                                        (Option Symbol)
-                                        (Option Positive-Integer)
-                                        (Option Positive-Integer)))
-                            (Input-Port
-                             Positive-Integer
-                             Any ; TODO (not/c dont-stop?)
-                             -> (Values Any
-                                        Symbol
-                                        (Option Symbol)
-                                        (Option Positive-Integer)
-                                        (Option Positive-Integer)
-                                        Positive-Integer
-                                        Any)))
-                         (Listof (List Symbol Symbol))
-                         -> Void)]
-         [stop-colorer ([] [Boolean] . ->* . Void)]
-         [force-stop-colorer (Boolean -> Void)]
-         [is-stopped? (-> Boolean)]
-         [is-frozen? (-> Boolean)]
-         [freeze-colorer (-> Void)]
-         [thaw-colorer ([] [Boolean Boolean] . ->* . Void)]
-         [reset-region (Natural (U Natural 'end) -> Void)]
-         [reset-regions ((Listof (List Natural (U Natural 'end))) -> Void)]
-         [get-spell-check-strings (-> Boolean)]
-         [set-spell-check-strings (Boolean -> Void)]
-         [get-spell-check-text (-> Boolean)]
-         [set-spell-check-text (Boolean -> Void)]
-         [set-spell-current-dict ((Option String) -> Void)]
-         [get-spell-current-dict (-> (Option String))]
-         [get-spell-suggestions (Natural -> (Option (List Natural Natural (Listof String))))]
-         [get-regions (-> (Listof (List Natural (U Natural 'end))))]
-         [skip-whitespace (Natural (U 'forward 'backward) Boolean -> Natural)]
-         [backward-match (Natural Natural -> (U Natural))]
-         [backward-containing-sexp (Natural Natural -> (Option Natural))]
-         [forward-match (Natural Natural -> (Option Natural))]
-         [insert-close-paren ([Natural Char Boolean Boolean]
-                              [(U #f 'adjacent 'forward)]
-                              . ->* . Void)]
-         [classify-position (Natural -> (Option Symbol))]
-         [get-token-range (Natural -> (Values (Option Natural) (Option Natural)))]
-         [on-lexer-valid (Boolean -> Any)]
-         [is-lexer-valid? (-> Boolean)]))
-
-(define-type Color:Text-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Color:Text<%>)))
-
-;; Color:Text% defined below in the Text% section
-
-(define-type Color:Text-Mode<%> (Class))
-
-(define-type Color:Text-Mode-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Mode:Surrogate-Text<%>)
-    ->
-    (Class #:row-var r #:implements Color:Text-Mode<%>)))
-
-(define-type Color:Text-Mode%
-  (Class #:implements Color:Text-Mode<%>))
-
-;; 8 Comment Box
-(provide Comment-Box:Snip%)
-(define-type Comment-Box:Snip%
-  ;; TODO: refine return type?
-  (Class #:implements Editor-Snip:Decorated%
-         #:implements Readable-Snip<%>))
-
-;; 10 Editor Snip
-(provide Editor-Snip:Decorated<%>
-         Editor-Snip:Decorated%
-         Editor-Snip:Decorated-Mixin
-         Editor-Snip:Decorated-Snipclass%)
-
-(define-type Editor-Snip:Decorated<%>
-  (Class #:implements Editor-Snip%
-         [get-corner-bitmap (-> (Option (Instance Bitmap%)))]
-         [get-color (-> (U String Color%-Instance))]
-         [get-menu (-> (Option (Instance Popup-Menu%)))]
-         [get-position (-> (U 'top-right 'left-top))]
-         [reset-min-sizes (-> Void)]))
-
-(define-type Editor-Snip:Decorated-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Snip%)
-    ->
-    (Class #:row-var r #:implements Editor-Snip:Decorated<%>
-           [get-corner-bitmap (-> #f)]
-           [get-color (-> (U "white" "black"))]
-           [get-menu (-> #f)]
-           [get-position (-> 'top-right)])))
-
-(define-type Editor-Snip:Decorated%
-  (Class #:implements Editor-Snip:Decorated<%>
-         ;; note, no `editor` init argument
-         (init [with-border? Any #:optional]
-               [left-margin Natural #:optional]
-               [top-margin Natural #:optional]
-               [right-margin Natural #:optional]
-               [bottom-margin Natural #:optional]
-               [left-inset Natural #:optional]
-               [top-inset Natural #:optional]
-               [right-inset Natural #:optional]
-               [bottom-inset Natural #:optional]
-               [min-width Nonnegative-Real #:optional]
-               [max-width Nonnegative-Real #:optional]
-               [min-height Nonnegative-Real #:optional]
-               [max-height Nonnegative-Real #:optional])
-         [make-snip (-> (Instance Editor-Snip:Decorated%))]
-         [make-editor (-> Editor<%>-Instance)]
-         [copy (-> (Instance Editor-Snip:Decorated<%> #|FIXME Editor-Snip:Decorated%|#))]))
-
-(define-type Editor-Snip:Decorated-Snipclass%
-  (Class #:implements Snip-Class%
-         [make-snip ((Instance Editor-Stream-In%) -> (Instance Editor-Snip:Decorated<%>))]
-         [read ((Instance Editor-Stream-In%) -> (Instance Editor-Snip:Decorated<%>))]))
-
-;; 11 Editor
-(provide Editor:Basic<%>
-         Editor:Basic-Mixin
-         Editor:Standard-Style-List<%>
-         Editor:Standard-Style-List-Mixin
-         Editor:Keymap<%>
-         Editor:Keymap-Mixin
-         Editor:Autowrap<%>
-         Editor:Autowrap-Mixin
-         Editor:File<%>
-         Editor:File-Mixin
-         Editor:Backup-Autosave<%>
-         Editor:Backup-Autosave-Mixin
-         Editor:Info<%>
-         Editor:Info-Mixin)
-
-(define-type Editor:Basic<%>
-  (Class #:implements Editor<%>
-         [has-focus? (-> Boolean)]
-         [local-edit-sequence? (-> Boolean)]
-         [run-after-edit-sequence ([(-> Void)]
-                                   [(Option Symbol)]
-                                   . ->* .
-                                   Void)]
-         [get-top-level-window (-> (Option (Instance Top-Level-Window<%>)))]
-         [save-file-out-of-date? (-> Boolean)]
-         [save-file/gui-error ([]
-                               [(Option String)
-                                (U 'guess 'standard 'text 'text-force-cr 'same 'copy)
-                                Boolean]
-                               . ->* .
-                               Boolean)]
-         [load-file/gui-error ([]
-                               [(Option String)
-                                (U 'guess 'standard 'text 'text-force-cr 'same 'copy)
-                                Boolean]
-                               . ->* .
-                               Boolean)]
-         [on-close (-> Void)]
-         [can-close? (-> Boolean)]
-         [close (-> Boolean)]
-         [get-filename/untitled-name (-> String)]
-         [get-pos/text (Mouse-Event%-Instance -> (Values (Option Natural)
-                                                         (Option Editor<%>-Instance)))]
-         [get-pos/text-dc-location (Integer Integer -> (Values (Option Natural)
-                                                               (Option Editor<%>-Instance)))]))
-
-(define-type Editor:Basic-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Editor<%>)
-    ->
-    (Class #:row-var r #:implements Editor:Basic<%>)))
-
-(define-type Editor:Standard-Style-List<%>
-  (Class #:implements Editor<%>))
-
-(define-type Editor:Standard-Style-List-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Editor<%>)
-    ->
-    (Class #:row-var r #:implements Editor:Standard-Style-List<%>)))
-
-(define-type Editor:Keymap<%>
-  (Class #:implements Editor:Basic<%>
-         [get-keymaps (-> (Listof (Instance Keymap%)))]))
-
-(define-type Editor:Keymap-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Editor:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Editor:Keymap<%>)))
-
-(define-type Editor:Autowrap<%>
-  (Class #:implements Editor:Basic<%>))
-
-(define-type Editor:Autowrap-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Editor:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Editor:Autowrap<%>)))
-
-(define-type Editor:File<%>
-  (Class #:implements Editor:Keymap<%>
-         [get-can-close-parent (-> (U #f (Instance Frame%) Dialog%-Instance))]
-         [update-frame-filename (-> Void)]
-         [allow-close-with-no-filename? (-> Boolean)]
-         [user-saves-or-not-modified? (#t -> Boolean)] ; FIXME: fishy docs
-         ))
-
-(define-type Editor:File-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Editor:Keymap<%>)
-    ->
-    (Class #:row-var r #:implements Editor:File<%>)))
-
-(define-type Editor:Backup-Autosave<%>
-  (Class #:implements Editor:Basic<%>
-         [backup? (-> Boolean)]
-         [autosave? (-> Boolean)]
-         [do-autosave (-> (Option Path))]
-         [remove-autosave (-> Void)]))
-
-(define-type Editor:Backup-Autosave-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Editor:Basic<%>)
-    ->
-    (Class #:row-var r
-           #:implements Editor:Backup-Autosave<%>
-           #:implements Autosave:Autosavable<%>)))
-
-(define-type Editor:Info<%>
-  (Class #:implements Editor:Basic<%>))
-
-(define-type Editor:Info-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Editor:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Editor:Info<%>)))
-
-;; 14 Frame
-(provide Frame:Basic<%>
-         Frame:Basic%
-         Frame:Basic-Mixin
-         Frame:Focus-Table<%>
-         Frame:Focus-Table-Mixin
-         Frame:Size-Pref<%>
-         Frame:Size-Pref%
-         Frame:Size-Pref-Mixin
-         Frame:Register-Group<%>
-         Frame:Register-Group-Mixin
-         Frame:Status-Line<%>
-         Frame:Status-Line%
-         Frame:Status-Line-Mixin
-         Frame:Info<%>
-         Frame:Info%
-         Frame:Info-Mixin
-         Frame:Text-Info<%>
-         Frame:Text-Info%
-         Frame:Text-Info-Mixin
-         Frame:Pasteboard-Info<%>
-         Frame:Pasteboard-Info%
-         Frame:Pasteboard-Info-Mixin
-         Frame:Standard-Menus<%>
-         Frame:Standard-Menus%
-         Frame:Standard-Menus-Mixin
-         Frame:Editor<%>
-         Frame:Editor%
-         Frame:Editor-Mixin
-         Frame:Text<%>
-         Frame:Text%
-         Frame:Text-Mixin
-         Frame:Pasteboard<%>
-         Frame:Pasteboard%
-         Frame:Pasteboard-Mixin
-         Frame:Delegate<%>
-         Frame:Delegate%
-         Frame:Delegate-Mixin
-         Frame:Searchable<%>
-         Frame:Searchable%
-         Frame:Searchable-Mixin
-         Frame:Searchable-Text<%>
-         Frame:Searchable-Text-Mixin)
-
-(define-type Frame:Basic<%>
-  (Class #:implements Frame%
-         [get-area-container% (-> Area-Container<%> #|FIXME (implementation?/c area-container<%>)|#)]
-         [get-area-container (-> Area-Container<%>-Instance)]
-         [get-menu-bar% (-> ClassTop #|FIXME (subclass?/c menu-bar%)|#)]
-         [make-root-area-container
-          (Area-Container<%> #|FIXME (implementation?/c area-container<%>)|#
-           Area-Container<%>-Instance
-           -> Area-Container<%>-Instance)]
-         [close (-> Void)]
-         [editing-this-file? (Path -> Boolean)]
-         [get-filename ([] [(Option (Boxof Boolean))] . ->* . (Option Path))]
-         [make-visible (String -> Void)]))
-
-(define-type Frame:Basic-Mixin
-  (All (r #:row)
-       (Class #:row-var r #:implements Frame%)
-       ->
-       (Class #:row-var r #:implements Frame:Basic<%>)))
-
-(define-type Frame:Focus-Table<%>
-  (Class #:implements Frame%))
-
-(define-type Frame:Focus-Table-Mixin
-  (All (r #:row)
-       (Class #:row-var r #:implements Frame%)
-       ->
-       (Class #:row-var r #:implements Frame:Focus-Table<%>)))
-
-(define-type Frame:Size-Pref<%>
-  (Class #:implements Frame:Basic<%>
-         [adjust-size-when-monitor-setup-changes? (-> Boolean)]))
-
-(define-type Frame:Size-Pref-Mixin
- (All (r #:row)
-      (Class #:row-var r #:implements Frame%)
-      ->
-      (Class #:row-var r #:implements Frame:Size-Pref<%>
-             (init [size-preferences Symbol]
-                   [position-preferences-key (Option Symbol) #:optional]
-                   [width (Option Natural)]
-                   [height (Option Natural)]
-                   [x (Option Integer)]
-                   [y (Option Integer)]))))
-
-(define-type Frame:Register-Group<%>
-  (Class #:implements Frame:Basic<%>))
-
-(define-type Frame:Register-Group-Mixin
-  (All (r #:row)
-       (Class #:row-var r #:implements Frame:Basic<%>)
-       ->
-       (Class #:row-var r #:implements Frame:Register-Group<%>)))
-
-(define-type Frame:Status-Line<%>
-  ;; Note: if you change this next line to
-  ;; #:implements Frame%, then the mixin using this
-  ;; type below should be ruled out by sealing contracts.
-  ;;
-  ;; TODO: implement sealing contracts and make sure
-  ;; that mistake is ruled out
-  (Class #:implements Frame:Basic<%>
-         [open-status-line (Symbol -> Void)]
-         [close-status-line (Symbol -> Void)]
-         [update-status-line
-          (Symbol (Option String) -> Void)]))
-
-(define-type Frame:Status-Line-Mixin
-  (All (r #:row)
-       (Class #:row-var r #:implements Frame:Basic<%>)
-       ->
-       (Class #:row-var r #:implements Frame:Status-Line<%>)))
-
-(define-type Frame:Info<%>
-  (Class #:implements Frame:Basic<%>
-         [determine-width
-          (String Editor-Canvas%-Instance Text%-Instance -> Integer)]
-         [lock-status-changed (-> Void)]
-         [udpate-info (-> Void)]
-         [set-info-canvas ((Option (Instance Canvas:Basic%)) -> Void)]
-         [get-info-canvas (-> (Option (Instance Canvas:Basic%)))]
-         [get-info-editor (-> (Option Editor<%>-Instance))]
-         [get-info-panel (-> (Instance Horizontal-Panel%))]
-         [show-info (-> Void)]
-         [hide-info (-> Void)]
-         [is-info-hidden? (-> Boolean)]))
-
-(define-type Frame:Info-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Frame:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Frame:Info<%>)))
-
-(define-type Frame:Text-Info<%>
-  (Class #:implements Frame:Info<%>
-         [set-macro-recording (Boolean -> Void)]
-         [overwrite-status-changed (-> Void)]
-         [anchor-status-changed (-> Void)]
-         [editor-position-changed (-> Void)]
-         [add-line-number-menu-items ((Instance Menu-Item-Container<%>) -> Void)]))
-
-(define-type Frame:Text-Info-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Frame:Info<%>)
-    ->
-    (Class #:row-var r #:implements Frame:Text-Info<%>)))
-
-(define-type Frame:Pasteboard-Info<%>
-  (Class #:implements Frame:Info<%>))
-
-(define-type Frame:Pasteboard-Info-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Frame:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Frame:Pasteboard-Info<%>)))
-
-(define-type Frame:Standard-Menus<%>
-  (Class #:implements Frame:Basic<%>
-         [on-close (-> Void)]
-         [get-menu% (-> (Instance Menu:Can-Restore-Underscore-Menu%))]
-         [get-menu-item% (-> (Instance Menu:Can-Restore-Menu-Item%))]
-         [get-checkable-menu-item%
-          (-> (Instance Menu:Can-Restore-Checkable-Menu-Item%))]
-         [get-file-menu (-> Menu%-Instance)]
-         [get-edit-menu (-> Menu%-Instance)]
-         [get-help-menu (-> Menu%-Instance)]
-         [file-menu:get-new-item (-> (Option Menu-Item%-Instance))]
-         [file-menu:create-new? (-> Boolean)]
-         [file-menu:new-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [file-menu:new-on-demand (Menu-Item%-Instance -> Void)]
-         [file-menu:new-string (-> String)]
-         [file-menu:new-help-string (-> String)]
-         [file-menu:between-new-and-open (Menu-Item%-Instance -> Void)]
-         [file-menu:get-open-item (-> (Option Menu-Item%-Instance))]
-         [file-menu:create-open? (-> Boolean)]
-         [file-menu:open-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [file-menu:open-on-demand (Menu-Item%-Instance -> Void)]
-         [file-menu:open-string (-> String)]
-         [file-menu:open-help-string (-> String)]
-         [file-menu:get-open-recent-item (-> (Option Menu-Item%-Instance))]
-         [file-menu:create-open-recent? (-> Boolean)]
-         [file-menu:open-recent-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [file-menu:open-recent-on-demand (Menu-Item%-Instance -> Void)]
-         [file-menu:open-recent-string (-> String)]
-         [file-menu:open-recent-help-string (-> String)]
-         [file-menu:between-open-and-revert (Menu-Item%-Instance -> Void)]
-         [file-menu:get-revert-item (-> (Option Menu-Item%-Instance))]
-         [file-menu:create-revert? (-> Boolean)]
-         [file-menu:revert-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [file-menu:revert-on-demand (Menu-Item%-Instance -> Void)]
-         [file-menu:revert-string (-> String)]
-         [file-menu:revert-help-string (-> String)]
-         [file-menu:between-revert-and-save (Menu-Item%-Instance -> Void)]
-         [file-menu:get-save-item (-> (Option Menu-Item%-Instance))]
-         [file-menu:create-save? (-> Boolean)]
-         [file-menu:save-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [file-menu:save-on-demand (Menu-Item%-Instance -> Void)]
-         [file-menu:save-string (-> String)]
-         [file-menu:save-help-string (-> String)]
-         [file-menu:get-save-as-item (-> (Option Menu-Item%-Instance))]
-         [file-menu:create-save-as? (-> Boolean)]
-         [file-menu:save-as-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [file-menu:save-as-on-demand (Menu-Item%-Instance -> Void)]
-         [file-menu:save-as-string (-> String)]
-         [file-menu:save-as-help-string (-> String)]
-         [file-menu:between-save-as-and-print (Menu-Item%-Instance -> Void)]
-         [file-menu:get-print-item (-> (Option Menu-Item%-Instance))]
-         [file-menu:create-print? (-> Boolean)]
-         [file-menu:print-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [file-menu:print-on-demand (Menu-Item%-Instance -> Void)]
-         [file-menu:print-string (-> String)]
-         [file-menu:print-help-string (-> String)]
-         [file-menu:between-print-and-close (Menu-Item%-Instance -> Void)]
-         [file-menu:get-close-item (-> (Option Menu-Item%-Instance))]
-         [file-menu:create-close? (-> Boolean)]
-         [file-menu:close-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [file-menu:close-on-demand (Menu-Item%-Instance -> Void)]
-         [file-menu:close-string (-> String)]
-         [file-menu:close-help-string (-> String)]
-         [file-menu:between-close-and-quit (Menu-Item%-Instance -> Void)]
-         [file-menu:get-quit-item (-> (Option Menu-Item%-Instance))]
-         [file-menu:create-quit? (-> Boolean)]
-         [file-menu:quit-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [file-menu:quit-on-demand (Menu-Item%-Instance -> Void)]
-         [file-menu:quit-string (-> String)]
-         [file-menu:quit-help-string (-> String)]
-         [file-menu:after-quit (Menu-Item%-Instance -> Void)]
-         [edit-menu:get-undo-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-undo? (-> Boolean)]
-         [edit-menu:undo-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:undo-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:undo-string (-> String)]
-         [edit-menu:undo-help-string (-> String)]
-         [edit-menu:get-redo-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-redo? (-> Boolean)]
-         [edit-menu:redo-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:redo-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:redo-string (-> String)]
-         [edit-menu:redo-help-string (-> String)]
-         [edit-menu:between-redo-and-cut (Menu-Item%-Instance -> Void)]
-         [edit-menu:get-cut-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-cut? (-> Boolean)]
-         [edit-menu:cut-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:cut-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:cut-string (-> String)]
-         [edit-menu:cut-help-string (-> String)]
-         [edit-menu:between-cut-and-copy (Menu-Item%-Instance -> Void)]
-         [edit-menu:get-copy-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-copy? (-> Boolean)]
-         [edit-menu:copy-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:copy-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:copy-string (-> String)]
-         [edit-menu:copy-help-string (-> String)]
-         [edit-menu:between-copy-and-paste (Menu-Item%-Instance -> Void)]
-         [edit-menu:get-paste-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-paste? (-> Boolean)]
-         [edit-menu:paste-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:paste-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:paste-string (-> String)]
-         [edit-menu:paste-help-string (-> String)]
-         [edit-menu:between-paste-and-clear (Menu-Item%-Instance -> Void)]
-         [edit-menu:get-clear-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-clear? (-> Boolean)]
-         [edit-menu:clear-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:clear-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:clear-string (-> String)]
-         [edit-menu:clear-help-string (-> String)]
-         [edit-menu:between-clear-and-select-all (Menu-Item%-Instance -> Void)]
-         [edit-menu:get-select-all-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-select-all? (-> Boolean)]
-         [edit-menu:select-all-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:select-all-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:select-all-string (-> String)]
-         [edit-menu:select-all-help-string (-> String)]
-         [edit-menu:between-select-all-and-find (Menu-Item%-Instance -> Void)]
-         [edit-menu:get-find-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-find? (-> Boolean)]
-         [edit-menu:find-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:find-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:find-string (-> String)]
-         [edit-menu:find-help-string (-> String)]
-         [edit-menu:get-find-from-selection-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-find-from-selection? (-> Boolean)]
-         [edit-menu:find-from-selection-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:find-from-selection-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:find-from-selection-string (-> String)]
-         [edit-menu:find-from-selection-help-string (-> String)]
-         [edit-menu:get-find-next-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-find-next? (-> Boolean)]
-         [edit-menu:find-next-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:find-next-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:find-next-string (-> String)]
-         [edit-menu:find-next-help-string (-> String)]
-         [edit-menu:get-find-previous-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-find-previous? (-> Boolean)]
-         [edit-menu:find-previous-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:find-previous-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:find-previous-string (-> String)]
-         [edit-menu:find-previous-help-string (-> String)]
-         [edit-menu:get-show/hide-replace-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-show/hide-replace? (-> Boolean)]
-         [edit-menu:show/hide-replace-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:show/hide-replace-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:show/hide-replace-string (-> String)]
-         [edit-menu:show/hide-replace-help-string (-> String)]
-         [edit-menu:get-replace-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-replace? (-> Boolean)]
-         [edit-menu:replace-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:replace-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:replace-string (-> String)]
-         [edit-menu:replace-help-string (-> String)]
-         [edit-menu:get-replace-all-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-replace-all? (-> Boolean)]
-         [edit-menu:replace-all-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:replace-all-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:replace-all-string (-> String)]
-         [edit-menu:replace-all-help-string (-> String)]
-         [edit-menu:get-find-case-sensitive-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-find-case-sensitive? (-> Boolean)]
-         [edit-menu:find-case-sensitive-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:find-case-sensitive-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:find-case-sensitive-string (-> String)]
-         [edit-menu:find-case-sensitive-help-string (-> String)]
-         [edit-menu:between-find-and-preferences (Menu-Item%-Instance -> Void)]
-         [edit-menu:get-preferences-item (-> (Option Menu-Item%-Instance))]
-         [edit-menu:create-preferences? (-> Boolean)]
-         [edit-menu:preferences-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [edit-menu:preferences-on-demand (Menu-Item%-Instance -> Void)]
-         [edit-menu:preferences-string (-> String)]
-         [edit-menu:preferences-help-string (-> String)]
-         [edit-menu:after-preferences (Menu-Item%-Instance -> Void)]
-         [help-menu:before-about (Menu-Item%-Instance -> Void)]
-         [help-menu:get-about-item (-> (Option Menu-Item%-Instance))]
-         [help-menu:create-about? (-> Boolean)]
-         [help-menu:about-callback
-          (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-         [help-menu:about-on-demand (Menu-Item%-Instance -> Void)]
-         [help-menu:about-string (-> String)]
-         [help-menu:about-help-string (-> String)]
-         [help-menu:after-about (Menu-Item%-Instance -> Void)]))
-
-(define-type Frame:Standard-Menus-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Frame:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Frame:Standard-Menus<%>)))
-
-(define-type Frame:Editor<%>
-  (Class #:implements Frame:Standard-Menus<%>
-         [get-entire-label (-> String)]
-         [get-label-prefix (-> String)]
-         [set-label-prefix (String -> Void)]
-         [get-canvas% (-> ClassTop #|FIXME (subclass?/c editor-canvas%)|#)]
-         [get-canvas<%> (-> (Instance Canvas:Basic%))]
-         [get-editor% (-> Editor<%> #|FIXME (implementation?/c editor<%>)|#)]
-         [get-editor<%> (-> Any #|FIXME interface?|#)]
-         [make-editor (-> Editor<%>-Instance)]
-         [revert (-> Void)]
-         [save ([]
-                [(U 'guess 'standard 'text 'text-force-cr 'same 'copy)]
-                . ->* . Boolean)]
-         [save-as ([]
-                   [(U 'guess 'standard 'text 'text-force-cr 'same 'copy)]
-                   . ->* . Boolean)]
-         [get-canvas (-> Canvas%-Instance)]
-         [get-editor (-> Editor<%>-Instance)]))
-
-(define-type Frame:Editor-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Frame:Standard-Menus<%>)
-    ->
-    (Class #:row-var r #:implements Frame:Editor<%>
-           (init [filename String]
-                 [editor% Editor:Basic<%> #|FIXME (implementation?/c editor:basic<%>)|#]
-                 [parent (Option (Instance Frame%)) #:optional]
-                 [width (Option Natural)]
-                 [height (Option Natural)]
-                 [x (Option Integer)]
-                 [y (Option Integer)]
-                 [style (Listof (U 'no-resize-border 'no-caption
-                                   'no-system-menu 'hide-menu-bar
-                                   'mdi-parent 'mdi-child
-                                   'toolbar-button 'float 'metal))]
-                 [enabled Any]
-                 [border Natural]
-                 [spacing Natural]
-                 [alignment (List (U 'left 'center 'right)
-                                  (U 'top 'center 'bottom))]
-                 [min-width Natural]
-                 [min-height Natural]
-                 [stretchable-width Any]
-                 [stretchable-height Any]))))
-
-(define-type Frame:Text<%>
-  (Class #:implements Frame:Editor<%>))
-
-(define-type Frame:Text-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Frame:Editor<%>)
-    ->
-    (Class #:row-var r #:implements Frame:Text<%>
-           (init [editor% Text% #|FIXME (extends text%)|#]))))
-
-(define-type Frame:Pasteboard<%>
-  (Class #:implements Frame:Editor<%>))
-
-(define-type Frame:Pasteboard-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Frame:Editor<%>)
-    ->
-    (Class #:row-var r #:implements Frame:Pasteboard<%>
-           (init [editor% Pasteboard% #|FIXME (extends pasteboard%)|#]))))
-
-(define-type Frame:Delegate<%>
-  (Class #:implements Frame:Status-Line<%>
-         #:implements Frame:Text<%>
-         [get-delegated-text (-> (Option (Instance Text:Delegate<%>)))]
-         [set-delegated-text ((Option (Instance Text:Delegate<%>)) -> Void)]
-         [delegated-text-shown? (-> Boolean)]
-         [hide-delegated-text (-> Void)]
-         [show-delegated-text (-> Void)]
-         [delegate-moved (-> Void)]))
-
-(define-type Frame:Delegate-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Frame:Status-Line<%>
-           #:implements Frame:Text<%>)
-    ->
-    (Class #:row-var r #:implements Frame:Delegate<%>)))
-
-(define-type Frame:Searchable<%>
-  (Class #:implements Frame:Basic<%>
-         [search ((U 'forward 'backward) -> Void)]
-         [search-replace (-> Boolean)]
-         [replace-all (-> Void)]
-         [get-text-to-search (-> Text%-Instance)]
-         [set-text-to-search
-          ((Option (Instance Text% #|FIXME (subclass?/c text%)|#)) -> Void)]
-         [search-hidden? (-> Boolean)]
-         [hide-search (-> Void)]
-         [unhide-search ([Boolean]
-                         [#:new-search-string-from-selection? Boolean]
-                         . ->* . Void)]
-         [unhide-search-and-toggle-focus ([]
-                                          [#:new-search-string-from-selection? Boolean]
-                                          . ->* . Void)]
-         [get-case-sensitive-search? (-> Boolean)]
-         [search-hits-changed (-> Void)]))
-
-(define-type Frame:Searchable-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Frame:Standard-Menus<%>)
-    ->
-    (Class #:row-var r #:implements Frame:Searchable<%>
-           [edit-menu:find-callback (-> Boolean)]
-           [edit-menu:create-find? (-> #t)]
-           ; FIXME: doc says "Overrides <method not found>" from here on
-           [edit-menu:find-again-callback
-            (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-           [edit-menu:create-find-again? (-> #t)]
-           [edit-menu:find-again-backwards-callback
-            (Menu-Item%-Instance Control-Event%-Instance -> Void)]
-           [edit-menu:create-find-again-backwards? (-> #t)]
-           ; end bug doc saying "Overrides <method not found>"
-           [edit-menu:create-replace-all? (-> #t)]
-           [edit-menu:create-find-case-sensitive? (-> #t)])))
-
-(define-type Frame:Searchable-Text<%>
-  (Class #:implements Frame:Searchable<%>
-         #:implements Frame:Text<%>))
-
-(define-type Frame:Searchable-Text-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Frame:Text<%>
-           #:implements Frame:Searchable<%>)
-    ->
-    (Class #:row-var r #:implements Frame:Searchable-Text<%>)))
-
-;; FIXME: when #:implements/inits clauses are supported, consider
-;;        using that instead of this macro
-(define-syntax-rule (define-frame-like-class name parent-type)
-  (define-type name
-    (Class (init [label String]
-                 [parent (Option (Instance Frame%)) #:optional]
-                 [width (Option Integer) #:optional]
-                 [height (Option Integer) #:optional]
-                 [x (Option Integer) #:optional]
-                 [y (Option Integer) #:optional]
-                 [style (Listof (U 'no-resize-border 'no-caption
-                                   'no-system-menu 'hide-menu-bar
-                                   'toolbar-button 'float 'metal))
-                        #:optional]
-                 [enabled Any #:optional]
-                 [border Natural #:optional]
-                 [spacing Natural #:optional]
-                 [alignment (List (U 'left 'center 'right)
-                                  (U 'top 'center 'bottom))
-                            #:optional]
-                 [min-width (Option Natural) #:optional]
-                 [min-height (Option Natural) #:optional]
-                 [stretchable-width Any #:optional]
-                 [stretchable-height Any #:optional])
-           #:implements parent-type)))
-(define-frame-like-class Frame:Basic% Frame:Register-Group<%>)
-(define-type Frame:Size-Pref%
-  (Class (init [size-preferences-key Symbol]
-               [position-preferences-key (Option Symbol) #:optional]
-               [width (Option Integer) #:optional]
-               [height (Option Integer) #:optional]
-               [x (Option Integer) #:optional]
-               [y (Option Integer) #:optional]
-               [style (Listof (U 'no-resize-border 'no-caption
-                                 'no-system-menu 'hide-menu-bar
-                                 'toolbar-button 'float 'metal))
-                      #:optional]
-               [enabled Any #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         #:implements Frame:Size-Pref<%>))
-(define-frame-like-class Frame:Info% Frame:Info<%>)
-(define-frame-like-class Frame:Text-Info% Frame:Text-Info<%>)
-(define-frame-like-class Frame:Pasteboard-Info% Frame:Pasteboard-Info<%>)
-(define-frame-like-class Frame:Standard-Menus% Frame:Standard-Menus<%>)
-(define-frame-like-class Frame:Status-Line% Frame:Status-Line<%>)
-(define-type Frame:Editor%
-  (Class (init [filename String]
-               ;; FIXME: actually polymorphic in this class, which is
-               ;;        hard to represent without row polymorphic classes
-               [editor% Editor:Basic<%>])
-         #:implements Frame:Editor<%>))
-(define-type Frame:Text%
-  (Class (init [filename String]
-               ;; FIXME: see above
-               [editor% Text%])
-         #:implements Frame:Text<%>))
-;; FIXME: the type of editor% here should actually be stricter, but the docs
-;;        for framework do not specify what it should be
-(define-type Frame:Searchable%
-  (Class (init [filename String]
-               [editor% Text%])
-         #:implements Frame:Searchable<%>))
-(define-type Frame:Delegate%
-  (Class (init [filename String]
-               [editor% Text%])
-         #:implements Frame:Delegate<%>))
-(define-type Frame:Pasteboard%
-  (Class (init [filename String]
-               [editor% Pasteboard%])
-         #:implements Frame:Pasteboard<%>))
-
-;; 15 Group
-(provide Group:%)
-
-(define-type Group:%
-  (Class [get-mdi-parent (-> (Option (Instance Frame%)))]
-         [get-frames (-> (Listof Frame:Basic<%>-Instance))]
-         [frame-label-changed (Frame:Basic<%>-Instance -> Void)]
-         [frame-shown/hidden (-> Void)]
-         [for-each-frame ((Frame:Basic<%>-Instance -> Void) -> Void)]
-         [get-active-frame (-> Frame:Basic<%>-Instance)]
-         [set-active-frame (Frame:Basic<%>-Instance -> Void)]
-         [insert-frame (Frame:Basic<%>-Instance -> Void)]
-         [remove-frame (Frame:Basic<%>-Instance -> Void)]
-         [clear (-> Boolean)]
-         [on-close-all (-> Void)]
-         [can-close-all? (-> Boolean)]
-         [locate-file ((Option Frame:Basic<%>-Instance) -> Path)]))
-
-;; 19 Keymap
-(provide Keymap:Aug-Keymap<%>
-         Keymap:Aug-Keymap%
-         Keymap:Aug-Keymap-Mixin)
-
-(define-type Keymap:Aug-Keymap<%>
-  (Class #:implements Keymap%
-         [get-chained-keymaps (-> (Listof (Instance Keymap%)))]
-         [get-map-function-table (-> (HashTable String String))]
-         [get-map-function-table/ht ((HashTable String String) -> (HashTable String String))]))
-
-(define-type Keymap:Aug-Keymap-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Keymap%)
-    ->
-    (Class #:row-var r #:implements Keymap:Aug-Keymap<%>)))
-
-(define-type Keymap:Aug-Keymap%
-  (Class #:implements Keymap:Aug-Keymap<%>))
-
-;; 20 Menu
-(provide Menu:Can-Restore<%>
-         Menu:Can-Restore-Mixin
-         Menu:Can-Restore-Underscore<%>
-         Menu:Can-Restore-Underscore-Mixin
-         Menu:Can-Restore-Menu-Item%
-         Menu:Can-Restore-Checkable-Menu-Item%
-         Menu:Can-Restore-Underscore-Menu%)
-
-(define-type Menu:Can-Restore<%>
-  (Class #:implements Selectable-Menu-Item<%>
-         [restore-keybinding (-> Void)]))
-
-(define-type Menu:Can-Restore-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Selectable-Menu-Item<%>)
-    ->
-    (Class #:row-var r #:implements Menu:Can-Restore<%>)))
-
-(define-type Menu:Can-Restore-Underscore<%>
-  (Class #:implements Labelled-Menu-Item<%>
-         [erase-underscores (-> Void)]
-         [restore-underscores (-> Void)]))
-
-(define-type Menu:Can-Restore-Underscore-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Labelled-Menu-Item<%>)
-    ->
-    (Class #:row-var r #:implements Menu:Can-Restore-Underscore<%>)))
-
-(define-type Menu:Can-Restore-Menu-Item%
-  (Class (init [label String]
-               [parent (U (Instance Menu%) (Instance Popup-Menu%))]
-               [callback ((Instance Menu-Item%) (Instance Control-Event%)
-                          -> Any)]
-               [shortcut (U Char Symbol #f) #:optional]
-               [help-string (Option String) #:optional]
-               [demand-callback
-                ((Instance Menu-Item%) -> Any)
-                #:optional]
-               [shortcut-prefix (Listof (U 'alt 'cmd 'meta 'ctl
-                                           'shift 'option))
-                                #:optional])
-         #:implements Menu:Can-Restore<%>))
-(define-type Menu:Can-Restore-Checkable-Menu-Item%
-  (Class (init [label String]
-               [parent (U (Instance Menu%) (Instance Popup-Menu%))]
-               [callback ((Instance Checkable-Menu-Item%) (Instance Control-Event%)
-                          -> Any)]
-               [shortcut (U Char Symbol #f) #:optional]
-               [help-string (Option String) #:optional]
-               [demand-callback
-                ((Instance Checkable-Menu-Item%) -> Any)
-                #:optional]
-               [shortcut-prefix (Listof (U 'alt 'cmd 'meta 'ctl
-                                           'shift 'option))
-                                #:optional])
-         #:implements Menu:Can-Restore<%>))
-(define-type Menu:Can-Restore-Underscore-Menu%
-  (Class (init [label String]
-               [parent (U (Instance Menu%) (Instance Popup-Menu%)
-                          (Instance Menu-Bar%))]
-               [help-string (Option String) #:optional]
-               [demand-callback ((Instance Menu%) -> Any)
-                                #:optional])
-         #:implements Menu:Can-Restore<%>))
-
-;; 21 Mode
-(provide Mode:Surrogate-Text<%>
-         Mode:Surrogate-Text%
-         Mode:Host-Text<%>
-         Mode:Host-Text-Mixin)
-
-(define-type File-Format (U 'guess 'same 'copy 'standard 'text 'text-force-cr))
-(define-type Image-Kind (U 'unknown 'unknown/mask 'unknown/alpha
-                           'gif 'gif/mask 'gif/alpha
-                           'jpeg 'png 'png/mask 'png/alpha
-                           'xbm 'xpm 'bmp 'pict))
-(define-type Draw-Caret (U 'no-caret 'show-inactive-caret 'show-caret (Pairof Natural Natural)))
-(define-type Edit-Op (U 'undo 'redo 'clear 'cut 'copy 'paste
-                        'kill 'select-all 'insert-text-box
-                        'insert-pasteboard-box 'insert-image))
-
-(define-type Mode:Surrogate-Text<%>
-  (Class [on-enable-surrogate (Text%-Instance -> Any)]
-         [on-disable-surrogate (Text%-Instance -> Any)]))
-
-(define-type Mode:Surrogate-Text%
-  (Class #:implements Mode:Surrogate-Text<%>
-         [on-change (Text%-Instance (-> Void) -> Void)]
-         [on-char (Text%-Instance (-> Void) Key-Event%-Instance -> Void)]
-         [on-default-char (Text%-Instance (-> Void) Key-Event%-Instance -> Void)]
-         [on-default-client (Text%-Instance (-> Any) Any -> Any)]
-         [on-display-size (Text%-Instance (-> Void) -> Void)]
-         [on-edit-sequence (Text%-Instance (-> Void) -> Void)]
-         [on-event (Text%-Instance (-> Void) Mouse-Event%-Instance -> Void)]
-         [on-focus (Text%-Instance (-> Void) Any -> Void)]
-         [on-load-file (Text%-Instance (-> Void) Path File-Format -> Void)]
-         [on-local-char (Text%-Instance (-> Void) Key-Event%-Instance -> Void)]
-         [on-local-event (Text%-Instance (-> Void) Mouse-Event%-Instance -> Void)]
-         [on-new-box (Text%-Instance (-> Snip%-Instance) (U 'text 'pasteboard) -> Snip%-Instance)]
-         #;[on-new-image-snip ; TODO: reeanable when Image-Snip% is available
-          (Text%-Instance (-> (Instance Image-Snip%)) Path Image-Kind Any Any -> (Instance Image-Snip%))]
-         [on-paint
-          (Text%-Instance (-> Void) Any (Instance DC<%>) Real Real Real Real Real Real Draw-Caret -> Void)]
-         [on-save-file (Text%-Instance (-> Void) Path File-Format -> Void)]
-         [on-snip-modified (Text%-Instance (-> Void) Snip%-Instance Any -> Void)]
-         [on-change-style (Text%-Instance (-> Any) Natural Natural -> Any)]
-         [on-delete (Text%-Instance (-> Void) Natural Natural -> Void)]
-         [on-insert (Text%-Instance (-> Void) Natural Natural -> Void)]
-         [on-new-string-snip
-          (Text%-Instance (-> (Instance String-Snip%)) -> (Instance String-Snip%))]
-         [on-new-tab-snip (Text%-Instance (-> (Instance Tab-Snip%)) -> (Instance Tab-Snip%))]
-         [on-set-size-constraint (Text%-Instance (-> Void) -> Void)]
-         [after-change-style (Text%-Instance (-> Void) Natural Natural -> Void)]
-         [after-delete (Text%-Instance (-> Void) Natural Natural -> Void)]
-         [after-insert (Text%-Instance (-> Void) Natural Natural -> Void)]
-         [after-set-position (Text%-Instance (-> Void) -> Void)]
-         [after-set-size-constraint (Text%-Instance (-> Void) -> Void)]
-         [after-edit-sequence (Text%-Instance (-> Void) -> Void)]
-         [after-load-file (Text%-Instance (-> Void) Any -> Void)]
-         [after-save-file (Text%-Instance (-> Void) Any -> Void)]
-         [can-change-style? (Text%-Instance (-> Boolean) Natural Natural -> Boolean)]
-         [can-delete? (Text%-Instance (-> Boolean) Natural Natural -> Boolean)]
-         [can-insert? (Text%-Instance (-> Boolean) Natural Natural -> Boolean)]
-         [can-set-size-constraint? (Text%-Instance (-> Boolean) -> Boolean)]
-         [can-do-edit-operation? ([Text%-Instance (-> Boolean) Edit-Op]
-                                  [Any]
-                                  . ->* . Boolean)]
-         [can-load-file? (Text%-Instance (-> Boolean) Path File-Format -> Boolean)]
-         [can-save-file? (Text%-Instance (-> Boolean) Path File-Format -> Boolean)]
-         [put-file
-          (Text%-Instance
-           (-> (Option Path-String))
-           (Option Path-String) (Option Path-String)
-           -> (Option Path-String))]))
-
-(define-type Mode:Host-Text<%>
-  (Class [get-surrogate (-> (Option (Instance Mode:Surrogate-Text<%>)))]
-         [set-surrogate ((Option (Instance Mode:Surrogate-Text<%>)) -> Void)]))
-
-(define-type Mode:Host-Text-Mixin
-  (All (r #:row)
-    (Class #:row-var r)
-    ->
-    (Class #:row-var r #:implements Mode:Host-Text<%>)))
-
-;; 22 Number Snip
-(provide Number-Snip:Snip-Class%)
-
-(define-type Number-Snip:Snip-Class%
-  (Class #:implements Snip-Class%))
-
-;; 23 Panel
-(provide Panel:Single<%>
-         Panel:Single%
-         Panel:Single-Mixin
-         Panel:Single-Window<%>
-         Panel:Single-Window-Mixin
-         Panel:Single-Pane%
-         Panel:Dragable<%>
-         Panel:Dragable-Mixin
-         Panel:Vertical-Dragable<%>
-         Panel:Vertical-Dragable%
-         Panel:Vertical-Dragable-Mixin
-         Panel:Horizontal-Dragable<%>
-         Panel:Horizontal-Dragable%
-         Panel:Horizontal-Dragable-Mixin
-         Panel:Splitter<%>
-         Panel:Splitter-Mixin
-         Panel:Discrete-Sizes<%>
-         Panel:Discrete-Sizes-Mixin
-         Panel:Horizontal-Discrete-Sizes%
-         Panel:Vertical-Discrete-Sizes%
-         Panel:Discrete-Child<%>)
-
-(define-type Panel:Single<%>
-  (Class #:implements Area-Container<%>
-         [active-child (case->
-                        [(Instance Area<%>) -> Void]
-                        [-> (Instance Area<%>)])]))
-
-(define-type Panel:Single-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Area-Container<%>)
-    ->
-    (Class #:row-var r #:implements Panel:Single<%>)))
-
-(define-type Panel:Single-Window<%>
-  (Class #:implements Panel:Single<%>
-         #:implements Window<%>))
-
-(define-type Panel:Single-Window-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Panel:Single<%>
-           #:implements Window<%>)
-    ->
-    (Class #:row-var r #:implements Panel:Single-Window<%>)))
-
-(define-syntax-rule (define-panel-like-class name parent-type)
-  (define-type name
-    (Class (init [parent (Instance Area-Container<%>)]
-                 [style (Listof (U 'border 'deleted
-                                   'hscroll 'auto-hscroll
-                                   'vscroll 'auto-vscroll))
-                        #:optional]
-                 [enabled Any #:optional]
-                 [vert-margin Natural #:optional]
-                 [horiz-margin Natural #:optional]
-                 [border Natural #:optional]
-                 [spacing Natural #:optional]
-                 [alignment (List (U 'left 'center 'right)
-                                  (U 'top 'center 'bottom))
-                            #:optional]
-                 [min-width (Option Natural) #:optional]
-                 [min-height (Option Natural) #:optional]
-                 [stretchable-width Any #:optional]
-                 [stretchable-height Any #:optional])
-           #:implements parent-type)))
-
-(define-panel-like-class Panel:Single% Panel:Single<%>)
-
-(define-type Panel:Single-Pane%
-  (Class (init [parent (U (Instance Frame%) (Instance Dialog%)
-                          (Instance Panel%) (Instance Pane%))]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         #:implements Panel:Single<%>))
-
-(define-type Panel:Dragable<%>
-  (Class #:implements Window<%>
-         #:implements Area-Container<%>
-         [after-percentage-change (-> Void)]
-         [get-default-percentages
-          (Positive-Integer -> (Listof Nonnegative-Real #|FIXME (between/c 0 1)|#))]
-         [right-click-in-gap
-          (Mouse-Event%-Instance (Instance Subarea<%>) (Instance Subarea<%>) -> Void)]
-         [set-percentages ((Listof Real) -> Void)]
-         [get-percentages (-> (Listof Real))]
-         [get-vertical? (-> Boolean)]
-         [set-orientation (Boolean -> Void)]))
-
-(define-panel-like-class Panel:Vertical-Dragable<%> Panel:Dragable<%>)
-(define-panel-like-class Panel:Horizontal-Dragable<%> Panel:Dragable<%>)
-
-(define-type Panel:Dragable-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Window<%>
-           #:implements Area-Container<%>)
-    ->
-    (Class #:row-var r #:implements Panel:Dragable<%>)))
-
-(define-type Panel:Vertical-Dragable-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Panel:Dragable<%>)
-    ->
-    (Class #:row-var r #:implements Panel:Vertical-Dragable<%>)))
-
-(define-type Panel:Horizontal-Dragable-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Panel:Dragable<%>)
-    ->
-    (Class #:row-var r #:implements Panel:Horizontal-Dragable<%>)))
-
-(define-panel-like-class Panel:Vertical-Dragable% Panel:Vertical-Dragable<%>)
-(define-panel-like-class Panel:Horizontal-Dragable% Panel:Horizontal-Dragable<%>)
-
-(define-type Panel:Splitter<%>
-  (Class [split-vertical ((Instance Canvas<%>)
-                          ((Instance Panel:Splitter<%>) -> (Instance Canvas<%>))
-                          -> (Instance Canvas<%>))]
-         [split-horizontal ((Instance Canvas<%>)
-                            ((Instance Panel:Splitter<%>) -> (Instance Canvas<%>))
-                            -> (Instance Canvas<%>))]
-         [collapse ((Instance Canvas<%>) -> Void)]))
-
-(define-type Panel:Splitter-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Area-Container<%>
-           #:implements Panel:Dragable<%>)
-    ->
-    (Class #:row-var r #:implements Panel:Splitter<%>)))
-
-(define-type Panel:Discrete-Sizes<%>
-  (Class [set-orientation (Boolean -> Void)]
-         [get-orientation (-> Boolean)]))
-
-(define-type Panel:Discrete-Child<%>
-  (Class [get-discrete-widths (-> (Listof Natural))]
-         [get-discrete-heights (-> (Listof Natural))]))
-
-(define-type Panel:Discrete-Sizes-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Panel%)
-    ->
-    (Class #:row-var r
-           #:implements Panel:Discrete-Sizes<%>
-           #:implements Panel:Discrete-Child<%>)))
-
-(define-panel-like-class Panel:Horizontal-Discrete-Sizes% Panel:Discrete-Sizes<%>)
-(define-panel-like-class Panel:Vertical-Discrete-Sizes%   Panel:Discrete-Sizes<%>)
-
-;; 24 Pasteboard
-(provide Pasteboard:Basic%
-         Pasteboard:Standard-Style-List%
-         Pasteboard:Keymap%
-         Pasteboard:File%
-         Pasteboard:Backup-Autosave%
-         Pasteboard:Info%)
-
-(define-type Pasteboard:Basic%
-  (Class #:implements Editor:Basic<%>))
-
-(define-type Pasteboard:Standard-Style-List%
-  (Class #:implements Editor:Standard-Style-List<%>))
-
-(define-type Pasteboard:Keymap%
-  (Class #:implements Editor:Keymap<%>))
-
-(define-type Pasteboard:File%
-  (Class #:implements Editor:File<%>))
-
-(define-type Pasteboard:Backup-Autosave%
-  (Class #:implements Editor:Backup-Autosave<%>))
-
-(define-type Pasteboard:Info%
-  (Class #:implements Editor:Info<%>))
-
-;; 28 Racket
-(provide Racket:Sexp-Snip<%>
-         Racket:Sexp-Snip%
-         Racket:Text<%>
-         Racket:Text%
-         Racket:Text-Mixin
-         Racket:Text-Mode<%>
-         Racket:Text-Mode%
-         Racket:Text-Mode-Mixin
-         Racket:Set-Mode-Mixin)
-
-(define-type Racket:Sexp-Snip<%>
-  (Class [get-saved-snips (-> (Listof Snip%-Instance))]))
-
-(define-type Racket:Sexp-Snip%
-  (Class #:implements Snip%
-         #:implements Racket:Sexp-Snip<%>
-         #:implements Readable-Snip<%>))
-
-(define-type Racket:Text<%>
-  (Class #:implements Text:Basic<%>
-         #:implements Mode:Host-Text<%>
-         #:implements Color:Text<%>
-         [get-limit (-> Integer)]
-         [balance-parens (Key-Event%-Instance -> Void)]
-         [tabify-on-return? (-> Boolean)]
-         [tabify ([] [Integer] . ->* . Void)]
-         [tabify-selection ([] [Integer Integer] . ->* . Void)]
-         [tabify-all (-> Void)]
-         [insert-return (-> Void)]
-         [box-comment-out-selection ((U 'start Integer) (U 'end Integer) -> Void)]
-         [comment-out-selection (Integer Integer -> Void)]
-         [uncomment-selection (Integer Integer -> Void)]
-         [get-forward-sexp (Integer -> (Option Integer))]
-         [remove-sexp (Integer -> Void)]
-         [forward-sexp (Integer -> Void)]
-         [flash-forward-sexp (Integer -> Void)]
-         [get-backward-sexp (Integer -> (Option Integer))]
-         [flash-backward-sexp (Integer -> Void)]
-         [backward-sexp (Integer -> Void)]
-         [find-up-sexp (Integer -> (Option Integer))]
-         [up-sexp (Integer -> Void)]
-         [find-down-sexp (Integer -> (Option Integer))]
-         [down-sexp (Integer -> Void)]
-         [remove-parens-forward (Integer -> Void)]
-         [select-forward-sexp (-> Void)]
-         [select-backward-sexp (-> Void)]
-         [select-up-sexp (-> Void)]
-         [select-down-sexp (-> Void)]
-         [transpose-sexp (Integer -> Void)]
-         [mark-matching-parenthesis (Positive-Integer -> Void)]
-         [get-tab-size (-> Integer)]
-         [set-tab-size (Integer -> Void)]
-         [introduce-let-ans (Integer -> Void)]
-         [move-sexp-out (Integer -> Void)]))
-
-(define-type Racket:Text-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Text:Basic<%>
-           #:implements Mode:Host-Text<%>
-           #:implements Color:Text<%>
-           #:implements Text:Autocomplete<%>)
-    ->
-    (Class #:row-var r #:implements Racket:Text<%>)))
-
-(define-type Racket:Text-Mode<%> (Class))
-
-(define-type Racket:Text-Mode-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Color:Text-Mode<%>
-           #:implements Mode:Surrogate-Text<%>)
-    ->
-    (Class #:row-var r #:implements Racket:Text-Mode<%>)))
-
-(define-type Racket:Set-Mode-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Racket:Text<%>
-           #:implements Mode:Host-Text<%>)
-    ->
-    (Class #:row-var r #:implements Racket:Text-Mode<%>)))
-
-(define-type Racket:Text%
-  (Class (init [line-spacing Nonnegative-Real #:optional]
-               [tab-stops (Listof Real) #:optional]
-               [auto-wrap Any #:optional])
-         #:implements Racket:Text-Mode<%>
-         #:implements Racket:Text<%>
-         #:implements Text:Autocomplete<%>
-         #:implements Mode:Host-Text<%>))
-
-(define-type Racket:Text-Mode%
-  (Class #:implements Racket:Text-Mode<%>))
-
-;; 29 Text
-(provide Text:Basic<%>
-         Text:Basic%
-         Text:Basic-Mixin
-         Text:Line-Spacing<%>
-         Text:Line-Spacing%
-         Text:Line-Spacing-Mixin
-         Text:First-Line<%>
-         Text:First-Line-Mixin
-         Text:Foreground-Color<%>
-         Text:Foreground-Color-Mixin
-         Text:Hide-Caret/Selection<%>
-         Text:Hide-Caret/Selection%
-         Text:Hide-Caret/Selection-Mixin
-         Text:Nbsp->Space<%>
-         Text:Nbsp->Space%
-         Text:Nbsp->Space-Mixin
-         Text:Column-Guide<%>
-         Text:Column-Guide-Mixin
-         Text:Normalize-Paste<%>
-         Text:Normalize-Paste%
-         Text:Normalize-Paste-Mixin
-         Text:Searching<%>
-         Text:Searching%
-         Text:Searching-Mixin
-         Text:Return<%>
-         Text:Return%
-         Text:Return-Mixin
-         Text:Wide-Snip<%>
-         Text:Wide-Snip%
-         Text:Wide-Snip-Mixin
-         Text:Delegate<%>
-         Text:Delegate%
-         Text:Delegate-Mixin
-         Text:Info<%>
-         Text:Info%
-         Text:Info-Mixin
-         Text:Clever-File-Format<%>
-         Text:Clever-File-Format%
-         Text:Clever-File-Format-Mixin
-         Text:Crlf-Line-Endings<%>
-         Text:Crlf-Line-Endings-Mixin
-         Text:File<%>
-         Text:File%
-         Text:File-Mixin
-         Text:Ports<%>
-         Text:Ports-Mixin
-         Text:Input-Box<%>
-         Text:Input-Box%
-         Text:Input-Box-Mixin
-         Text:Autocomplete<%>
-         Text:Autocomplete-Mixin
-         Text:Line-Numbers<%>
-         Text:Line-Numbers-Mixin
-         Text:1-Pixel-String-Snip%
-         Text:1-Pixel-Tab-Snip%
-         Text:Standard-Style-List%
-         Text:Keymap%
-         Text:Autowrap%
-         Text:Backup-Autosave%)
-
-(define-type Text:Basic<%>
-  (Class #:implements Text%
-         [highlight-range
-          ([Natural Natural (U String Color%-Instance)]
-           [Boolean
-            (U 'high 'low)
-            (U 'rectangle 'ellipse 'hollow-ellipse 'dot)
-            #:adjust-on-insert/delete Boolean
-            #:key Any]
-           . ->* . ; FIXME: result type depends on `adjust-on-insert/delete`
-           (U Void (-> Void)))]
-         [unhighlight-range ([Natural Natural (U String Color%-Instance)]
-                             [Boolean (U 'rectangle 'ellipse 'hollow-ellipse)]
-                             . ->* . Void)]
-         [unhighlight-ranges/key (Any -> Void)]
-         [unhighlight-ranges ((Natural
-                               Natural
-                               Color%-Instance
-                               Boolean
-                               (U 'rectangle 'ellipse 'hollow-ellipse)
-                               (U Boolean Natural)
-                               Any
-                               -> Boolean)
-                              -> Void)]
-         [get-highlighted-ranges (-> (Listof Any #|FIXME Text:Range?|#))]
-         [get-styles-fixed (-> Boolean)]
-         [get-fixed-style (-> (Instance Style<%>))]
-         [set-styles-fixed (Boolean -> Void)]
-         [move/copy-to-edit ([Text%-Instance Integer Integer Integer]
-                             [#:try-to-move? Boolean]
-                             . ->* . Void)]
-         [initial-autowrap-bitmap
-          (-> (Option (Instance Bitmap%)))]
-         [get-port-name
-          (-> (U Path-String Symbol #f))]
-         [port-name-matches? (Any -> Boolean)]
-         [get-edition-number (-> Natural)]
-         [get-start-of-line (Natural -> Natural)]))
-
-(define-type Text:Basic-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Text%
-           #:implements Editor:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Text:Basic<%>)))
-
-(define-type Text:Line-Spacing<%>
-  (Class #:implements Text:Basic<%>))
-
-(define-type Text:Line-Spacing-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Text:Line-Spacing<%>)))
-
-(define-type Text:First-Line<%>
-  (Class #:implements Text%
-         [highlight-first-line (Boolean -> Void)]
-         [first-line-currently-drawn-specially? (-> Boolean)]
-         [get-first-line-height (-> Natural)]
-         [is-special-first-line? (String -> Boolean)]))
-
-(define-type Text:First-Line-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text%)
-    ->
-    (Class #:row-var r #:implements Text:First-Line<%>)))
-
-(define-type Text:Foreground-Color<%>
-  (Class #:implements Text:Basic<%>
-         #:implements Editor:Standard-Style-List<%>))
-
-(define-type Text:Foreground-Color-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Text:Basic<%>
-           #:implements Editor:Standard-Style-List<%>)
-    ->
-    (Class #:row-var r #:implements Text:Foreground-Color<%>)))
-
-(define-type Text:Hide-Caret/Selection<%>
-  (Class #:implements Text:Basic<%>))
-
-(define-type Text:Hide-Caret/Selection-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Text:Hide-Caret/Selection<%>)))
-
-(define-type Text:Nbsp->Space<%>
-  (Class #:implements Text%))
-
-(define-type Text:Nbsp->Space-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text%)
-    ->
-    (Class #:row-var r #:implements Text:Nbsp->Space<%>)))
-
-(define-type Text:Column-Guide<%>
-  (Class #:implements Text%))
-
-(define-type Text:Column-Guide-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text%)
-    ->
-    (Class #:row-var r #:implements Text:Column-Guide<%>)))
-
-(define-type Text:Normalize-Paste<%>
-  (Class #:implements Text:Basic<%>
-         [ask-normalize? (-> Boolean)]
-         [string-normalize (String -> String)]))
-
-(define-type Text:Normalize-Paste-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Text:Normalize-Paste<%>)))
-
-(define-type Text:Searching<%>
-  (Class #:implements Text:Basic<%>
-         #:implements Editor:Keymap<%>
-         [set-searching-state
-          ((Option String) Boolean Boolean Boolean -> Void)]
-         [set-search-anchor ((Option Natural) -> Void)]
-         [get-search-hit-count (-> Natural)]
-         [get-replace-search-hit (-> (Option Natural))]
-         [set-replace-start ((Option Natural) -> Void)]
-         [get-search-bubbles (-> (Listof (List (Pairof Natural Natural)
-                                               (U 'normal-search-color
-                                                  'dark-search-color
-                                                  'light-search-color))))]))
-
-(define-type Text:Searching-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Text:Basic<%>
-           #:implements Editor:Keymap<%>)
-    ->
-    (Class #:row-var r #:implements Text:Searching<%>)))
-
-(define-type Text:Return<%>
-  (Class #:implements Text%))
-
-(define-type Text:Return-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text%)
-    ->
-    (Class (init [return (-> Boolean)])
-           #:row-var r #:implements Text:Return<%>)))
-
-(define-type Text:Wide-Snip<%>
-  (Class #:implements Text:Basic<%>
-         [add-wide-snip (Snip%-Instance -> Void)]
-         [add-tall-snip (Snip%-Instance -> Void)]))
-
-(define-type Text:Wide-Snip-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Text:Wide-Snip<%>)))
-
-(define-type Text:Delegate<%>
-  (Class #:implements Text:Basic<%>
-         [get-delegate (-> (Option Text%-Instance))]
-         [set-delegate ((Option Text%-Instance) -> Void)]))
-
-(define-type Text:1-Pixel-String-Snip%
-  (Class #:implements String-Snip%)) ; FIXME: ok?
-
-(define-type Text:1-Pixel-Tab-Snip%
-  (Class #:implements Tab-Snip%)) ; FIXME: ok?
-
-(define-type Text:Delegate-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text:Basic<%>)
-    ->
-    (Class #:row-var r #:implements Text:Delegate<%>)))
-
-(define-type Text:Info<%>
-  (Class #:implements Text:Basic<%>))
-
-(define-type Text:Info-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Text:Basic<%>
-           #:implements Editor:Keymap<%>)
-    ->
-    (Class #:row-var r #:implements Text:Info<%>)))
-
-(define-type Text:Clever-File-Format<%>
-  (Class #:implements Text%))
-
-(define-type Text:Clever-File-Format-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text%)
-    ->
-    (Class #:row-var r #:implements Text:Clever-File-Format<%>)))
-
-(define-type Text:Crlf-Line-Endings<%>
-  (Class #:implements Text%))
-
-(define-type Text:Crlf-Line-Endings-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text%)
-    ->
-    (Class #:row-var r #:implements Text:Crlf-Line-Endings<%>)))
-
-(define-type Text:File<%>
-  (Class #:implements Text:Basic<%>
-         #:implements Editor:File<%>
-         [get-read-write? (-> Boolean)]
-         [while-unlocked ((-> Any) -> Any)]))
-
-(define-type Text:File-Mixin
-  (All (r #:row)
-    (Class #:row-var r
-           #:implements Text:Basic<%>
-           #:implements Editor:File<%>)
-    ->
-    (Class #:row-var r #:implements Text:File<%>)))
-
-(define-type Text:Ports<%>
-  (Class [delete/io (Integer Integer -> Void)]
-         [do-submission (-> Void)]
-         [get-insertion-point (-> Integer)]
-         [set-insertion-point (Integer -> Void)]
-         [get-unread-start-point (-> Integer)]
-         [set-unread-start-point (Integer -> Void)]
-         [set-allow-edits (Boolean -> Void)]
-         [get-allow-edits (-> Boolean)]
-         [insert-between ((U Snip%-Instance String) -> Void)]
-         [insert-before ((U Snip%-Instance String) -> Void)]
-         [submit-to-port? (Key-Event%-Instance -> Boolean)]
-         [on-sumit (-> Void)]
-         [send-eof-to-in-port (-> Void)]
-         [send-eof-to-box-in-port (-> Void)]
-         [reset-input-box (-> Void)]
-         [clear-output-ports (-> Void)]
-         [clear-input-port (-> Void)]
-         [clear-box-input-port (-> Void)]
-         [get-out-style-delta (-> (U Style-Delta%-Instance String))]
-         [get-err-style-delta (-> (U Style-Delta%-Instance String))]
-         [get-value-style-delta (-> (U Style-Delta%-Instance String))]
-         [get-in-port (-> Input-Port)]
-         [get-in-box-port (-> Input-Port)]
-         [get-out-port (-> Output-Port)]
-         [get-err-port (-> Output-Port)]
-         [get-value-port (-> Output-Port)]
-         [after-io-insertion (-> Void)]
-         [get-box-input-editor-snip% (-> Snip% #|Fixme (Subclass?/C editor-snip%)|#)]
-         [get-box-input-text% (-> (Instance Text:Input-Box<%>))]))
-
-(define-type Text:Ports-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text:Wide-Snip<%>)
-    ->
-    (Class #:row-var r #:implements Text:Ports<%>)))
-
-(define-type Text:Input-Box<%>
-  (Class #:implements Text%))
-
-(define-type Text:Input-Box-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text%)
-    ->
-    (Class #:row-var r #:implements Text:Input-Box<%>)))
-
-(define-type Text:Autocomplete<%>
-  (Class #:implements Text%
-         [auto-complete (-> Void)]
-         [get-autocomplete-border-color (-> (U String Color%-Instance))]
-         [get-autocomplete-background-color (-> (U String Color%-Instance))]
-         [get-autocomplete-selected-color (-> (U String Color%-Instance))]
-         [completion-mode-key-event? (Key-Event%-Instance -> Boolean)]
-         [get-all-words (-> (Listof String))]
-         [get-word-at (Positive-Integer -> String)]))
-
-(define-type Text:Autocomplete-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text%)
-    ->
-    (Class #:row-var r #:implements Text:Autocomplete<%>)))
-
-(define-syntax-rule (define-text-like-class name parent-type)
-  (define-type name
-    (Class #:implements parent-type
-           (init [line-spacing Nonnegative-Real #:optional]
-                 [tab-stops (Listof Real) #:optional]
-                 [auto-wrap Any #:optional]))))
-(define-text-like-class Text:Basic% Text:Basic<%>)
-(define-text-like-class Text:Line-Spacing% Text:Line-Spacing<%>)
-(define-text-like-class Text:Hide-Caret/Selection% Text:Hide-Caret/Selection<%>)
-(define-text-like-class Text:Nbsp->Space% Text:Nbsp->Space<%>)
-(define-text-like-class Text:Normalize-Paste% Text:Normalize-Paste<%>)
-(define-text-like-class Text:Delegate% Text:Delegate<%>)
-(define-text-like-class Text:Wide-Snip% Text:Wide-Snip<%>)
-(define-text-like-class Text:Standard-Style-List% Editor:Standard-Style-List<%>)
-(define-text-like-class Text:Input-Box% Text:Input-Box<%>)
-(define-text-like-class Text:Keymap% Editor:Keymap<%>)
-(define-text-like-class Text:Autowrap% Editor:Autowrap<%>)
-(define-text-like-class Text:File% Text:File<%>)
-(define-text-like-class Text:Clever-File-Format% Text:Clever-File-Format<%>)
-(define-text-like-class Text:Backup-Autosave% Editor:Backup-Autosave<%>)
-(define-text-like-class Text:Searching% Text:Searching<%>)
-(define-text-like-class Text:Info% Text:Info<%>)
-(define-text-like-class Color:Text% Color:Text<%>)
-(define-type Text:Return%
-  (Class #:implements Text:Return<%>
-           (init [return (-> Boolean)]
-                 [line-spacing Nonnegative-Real #:optional]
-                 [tab-stops (Listof Real) #:optional]
-                 [auto-wrap Any #:optional])))
-
-(define-type Text:Line-Numbers<%>
-  (Class [show-line-numbers! (Boolean -> Void)]
-         [show-line-numbers? (-> Boolean)]
-         [set-line-numbers-color (String -> Void)]))
-
-(define-type Text:Line-Numbers-Mixin
-  (All (r #:row)
-    (Class #:row-var r #:implements Text%)
-    ->
-    (Class #:row-var r
-           #:implements Text%
-           #:implements Text:Line-Numbers<%>)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/async-channel.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/async-channel.rkt
deleted file mode 100644
index 804c269204..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/async-channel.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang s-exp typed-racket/base-env/extra-env-lang
-
-;; This module provides a typed version of racket/async-channel
-
-(require racket/async-channel
-         (for-syntax (only-in (rep type-rep) make-Async-ChannelTop)))
-
-;; Section 11.2.4 (Buffered Asynchronous Channels)
-(type-environment
- [make-async-channel (-poly (a) (->opt [(-opt -PosInt)] (-async-channel a)))]
- [async-channel? (make-pred-ty (make-Async-ChannelTop))]
- [async-channel-get (-poly (a) ((-async-channel a) . -> . a))]
- [async-channel-try-get (-poly (a) ((-async-channel a) . -> . (-opt a)))]
- [async-channel-put (-poly (a) ((-async-channel a) a . -> . -Void))]
- [async-channel-put-evt (-poly (a) (-> (-async-channel a) a (-mu x (-evt x))))])
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/draw.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/draw.rkt
deleted file mode 100644
index ea5854c1c7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/draw.rkt
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang s-exp typed-racket/base-env/extra-env-lang
-
-;; This module provides a base type environment including
-;; racket/draw bindings
-
-(begin
- (require racket/draw/private/bitmap
-          racket/draw/private/bitmap-dc
-          racket/draw/private/brush
-          racket/draw/private/color
-          racket/draw/private/font
-          racket/draw/private/gl-config
-          racket/draw/private/gl-context
-          racket/draw/private/gradient
-          racket/draw/private/pen
-          racket/draw/private/region
-          (for-syntax (only-in (rep type-rep) make-Instance))
-          (only-in typed/racket/base -> U)
-          "private/gui-types.rkt"
-          (for-syntax (submod "private/gui-types.rkt" #%type-decl)))
-
- (provide (all-from-out racket/draw/private/bitmap
-                        racket/draw/private/bitmap-dc
-                        racket/draw/private/brush
-                        racket/draw/private/color
-                        racket/draw/private/font
-                        racket/draw/private/pen
-                        racket/draw/private/region)
-          LoadFileKind
-          Font-Family
-          Font-Style
-          Font-Weight
-          Font-Smoothing
-          Font-Hinting
-          Bitmap%
-          Bitmap-DC%
-          Brush-Style
-          Brush%
-          Brush-List%
-          Color%
-          Color-Database<%>
-          DC<%>
-          Font%
-          Font-List%
-          GL-Config%
-          GL-Context<%>
-          Linear-Gradient%
-          Pen%
-          Pen-List%
-          Pen-Style
-          Pen-Cap-Style
-          Pen-Join-Style
-          Point%
-          Radial-Gradient%
-          Region%))
-
-(begin-for-syntax
-  (define -LoadFileKind (parse-type #'LoadFileKind)))
-
-(type-environment
- [the-brush-list (make-Instance (parse-type #'Brush-List%))]
- [the-pen-list (make-Instance (parse-type #'Pen-List%))]
- [the-font-list (make-Instance (parse-type #'Font-List%))]
- [make-bitmap
-  (->optkey -PosInt -PosInt [Univ] #:backing-scale -Real #f
-            (make-Instance (parse-type #'Bitmap%)))]
- [read-bitmap
-  (->optkey (Un -Pathlike -Input-Port)
-            [-LoadFileKind (Un (make-Instance (parse-type #'Color%)) (-val #f)) Univ]
-            #:backing-scale -Real #f
-            #:try-@2x? Univ #f
-            (make-Instance (parse-type #'Bitmap%)))]
- [make-color
-  (->optkey -Byte -Byte -Byte
-            [-Real]
-            #:immutable? Univ #f
-            (make-Instance (parse-type #'Color%)))]
-
- [bitmap% (parse-type #'Bitmap%)]
- [bitmap-dc% (parse-type #'Bitmap-DC%)]
- [brush% (parse-type #'Brush%)]
- [brush-list% (parse-type #'Brush-List%)]
- [color% (parse-type #'Color%)]
- [the-color-database (make-Instance (parse-type #'Color-Database<%>))]
- [font% (parse-type #'Font%)]
- [font-list% (parse-type #'Font-List%)]
- [get-current-gl-context (parse-type #'(-> (U #f GL-Context<%>)))]
- [gl-config% (parse-type #'GL-Config%)]
- [linear-gradient% (parse-type #'Linear-Gradient%)]
- [pen% (parse-type #'Pen%)]
- [radial-gradient% (parse-type #'Radial-Gradient%)]
- [region% (parse-type #'Region%)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/gui.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/gui.rkt
deleted file mode 100644
index fd060ee3cc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/gui.rkt
+++ /dev/null
@@ -1,333 +0,0 @@
-#lang s-exp typed-racket/base-env/extra-env-lang
-
-;; This module provides a base type environment including
-;; most GUI library bindings
-
-(require racket/require
-         (subtract-in racket/gui/base
-                      racket/draw
-                      (except-in racket/snip get-the-snip-class-list))
-         (for-syntax (only-in (rep type-rep)
-                              make-Instance
-                              make-Opaque))
-         "draw.rkt"
-         "snip.rkt"
-         "private/gui-types.rkt"
-         (for-syntax (submod "private/gui-types.rkt" #%type-decl)))
-
-(provide (all-from-out "draw.rkt")
-         (all-from-out "snip.rkt")
-         (all-from-out "private/gui-types.rkt"))
-
-(begin-for-syntax
- (define -Eventspace (make-Opaque #'eventspace?))
- (define -Color% (parse-type #'Color%))
- (define -Color%-Obj (make-Instance -Color%)))
-
-(type-environment
- [button% (parse-type #'Button%)]
- [canvas% (parse-type #'Canvas%)]
- [check-box% (parse-type #'Check-Box%)]
- [checkable-menu-item% (parse-type #'Checkable-Menu-Item%)]
- [choice% (parse-type #'Choice%)]
- [clipboard-client% (parse-type #'Clipboard-Client%)]
- [combo-field% (parse-type #'Combo-Field%)]
- [column-control-event% (parse-type #'Column-Control-Event%)]
- [control-event% (parse-type #'Control-Event%)]
- [cursor% (parse-type #'Cursor%)]
- [dialog% (parse-type #'Dialog%)]
- [event% (parse-type #'Event%)]
- [frame% (parse-type #'Frame%)]
- [gauge% (parse-type #'Gauge%)]
- [group-box-panel% (parse-type #'Group-Box-Panel%)]
- [grow-box-spacer-pane% (parse-type #'Grow-Box-Spacer-Pane%)]
- [horizontal-pane% (parse-type #'Horizontal-Pane%)]
- [horizontal-panel% (parse-type #'Horizontal-Panel%)]
- [key-event% (parse-type #'Key-Event%)]
- [list-box% (parse-type #'List-Box%)]
- [menu% (parse-type #'Menu%)]
- [menu-bar% (parse-type #'Menu-Bar%)]
- [menu-item% (parse-type #'Menu-Item%)]
- [message% (parse-type #'Message%)]
- [mouse-event% (parse-type #'Mouse-Event%)]
- [pane% (parse-type #'Pane%)]
- [panel% (parse-type #'Panel%)]
- [popup-menu% (parse-type #'Popup-Menu%)]
- [printer-dc% (parse-type #'Printer-DC%)]
- [radio-box% (parse-type #'Radio-Box%)]
- [separator-menu-item% (parse-type #'Separator-Menu-Item%)]
- [scroll-event% (parse-type #'Scroll-Event%)]
- [slider% (parse-type #'Slider%)]
- [tab-panel% (parse-type #'Tab-Panel%)]
- [text-field% (parse-type #'Text-Field%)]
- [timer% (parse-type #'Timer%)]
- [vertical-pane% (parse-type #'Vertical-Pane%)]
- [vertical-panel% (parse-type #'Vertical-Panel%)]
- [the-font-list (make-Instance (parse-type #'Font-List%))]
- [get-face-list
-  (->optkey [(one-of/c 'mono 'all)]
-            #:all-variants? Univ #f
-            (-lst -String))]
- [editor-canvas% (parse-type #'Editor-Canvas%)]
- [message-box (-> -String -String (one-of/c 'ok 'cancel 'yes 'no))]
- [open-input-text-editor
-  (->optkey (make-Instance (parse-type #'Text%))
-            [-Integer
-             (Un (-val 'end) -Integer)
-             (-> (make-Instance (parse-type #'Snip%))
-                 (make-Instance (parse-type #'Snip%)))
-             (make-Instance (parse-type #'Text%))
-             -Boolean]
-            #:lock-while-reading? Univ #f
-            -Input-Port)]
- ;; Editor classes
- [editor-admin% (parse-type #'Editor-Admin%)]
- [editor-canvas% (parse-type #'Editor-Canvas%)]
- [editor-data% (parse-type #'Editor-Data%)]
- [editor-data-class% (parse-type #'Editor-Data-Class%)]
- [editor-stream-in% (parse-type #'Editor-Stream-In%)]
- [editor-stream-in-base% (parse-type #'Editor-Stream-In-Base%)]
- [editor-stream-out% (parse-type #'Editor-Stream-Out%)]
- [editor-stream-out-base% (parse-type #'Editor-Stream-Out-Base%)]
- [keymap% (parse-type #'Keymap%)]
- [pasteboard% (parse-type #'Pasteboard%)]
- [text% (parse-type #'Text%)]
- ;; 4.1 Dialogs
- [get-file
-  (->optkey [(Un (-val #f) -String)
-             (Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (Un (-val #f) -Pathlike)
-             (Un (-val #f) -Pathlike)
-             (Un (-val #f) -String)
-             (-lst (one-of/c 'packages 'enter-packages 'common))
-             (-lst (-lst* -String -String))]
-            #:dialog-mixin (Un) #f
-            (Un (-val #f) -Path))]
- [get-file-list
-  (->optkey [(Un (-val #f) -String)
-             (Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (Un (-val #f) -Pathlike)
-             (Un (-val #f) -Pathlike)
-             (Un (-val #f) -String)
-             (-lst (one-of/c 'packages 'enter-packages 'common))
-             (-lst (-lst* -String -String))]
-            #:dialog-mixin (Un) #f
-            (Un (-val #f) (-lst -Path)))]
- [put-file
-  (->optkey [(Un (-val #f) -String)
-             (Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (Un (-val #f) -Pathlike)
-             (Un (-val #f) -Pathlike)
-             (Un (-val #f) -String)
-             (-lst (one-of/c 'packages 'enter-packages 'common))
-             (-lst (-lst* -String -String))]
-            #:dialog-mixin (Un) #f
-            (Un (-val #f) -Path))]
- [get-directory
-  (->optkey [(Un (-val #f) -String)
-             (Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (Un (-val #f) -Pathlike)
-             (-lst (one-of/c 'enter-packages 'common))]
-            ;; FIXME: better type for this argument
-            #:dialog-mixin (Un) #f
-            (Un (-val #f) -Path))]
- [message-box
-  (->optkey -String -String
-            [(Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (-lst (one-of/c 'ok 'ok-cancel 'yes-no
-                             'caution 'stop 'no-icon))]
-            #:dialog-mixin (Un) #f
-            (one-of/c 'ok 'cancel 'yes 'no))]
- [message-box/custom
-  (->optkey -String -String
-            (Un -String (make-Instance (parse-type #'Bitmap%)) (-val #f))
-            (Un -String (make-Instance (parse-type #'Bitmap%)) (-val #f))
-            (Un -String (make-Instance (parse-type #'Bitmap%)) (-val #f))
-            [(Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (-lst (one-of/c 'stop 'caution 'no-icon 'number-order
-                             'disallow-close 'no-default
-                             'default=1 'default=2 'default=3))
-             Univ]
-            #:dialog-mixin (Un) #f
-            Univ)]
- [message+check-box
-  (->optkey -String -String -String
-            [(Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (-lst (one-of/c 'ok 'ok-cancel 'yes-no
-                             'caution 'stop 'no-icon 'checked))]
-            #:dialog-mixin (Un) #f
-            (-values (list (one-of/c 'ok 'cancel 'yes 'no)
-                           -Boolean)))]
- [message+check-box
-  (->optkey -String -String -String
-            [(Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (-lst (one-of/c 'ok 'ok-cancel 'yes-no
-                             'caution 'stop 'no-icon 'checked))]
-            #:dialog-mixin (Un) #f
-            (-values (list (one-of/c 'ok 'cancel 'yes 'no)
-                           -Boolean)))]
- [message+check-box/custom
-  (->optkey -String -String -String
-            (Un -String (make-Instance (parse-type #'Bitmap%)) (-val #f))
-            (Un -String (make-Instance (parse-type #'Bitmap%)) (-val #f))
-            (Un -String (make-Instance (parse-type #'Bitmap%)) (-val #f))
-            [(Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (-lst (one-of/c 'stop 'caution 'no-icon 'number-order
-                             'disallow-close 'no-default
-                             'default=1 'default=2 'default=3))
-             Univ]
-            #:dialog-mixin (Un) #f
-            Univ)]
- [get-text-from-user
-  (->optkey -String -String
-            [(Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (-lst (one-of/c 'password 'disallow-invalid))]
-            #:validate (-> -String -Boolean) #f
-            #:dialog-mixin (Un) #f
-            (Un (-val #f) -String))]
- [get-choices-from-user
-  (->optkey -String -String (-lst -String)
-            [(Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (-lst -Integer)
-             (-lst (one-of/c 'single 'multiple 'extended))]
-            (Un (-val #f) (-lst -Nat)))]
- [get-choices-from-user
-  (->optkey [(Un (-val #f) -String)
-             (Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (Un -Color%-Obj
-                 (-val #f))
-             (-lst (-val 'alpha))]
-            (Un (-val #f) -Color%-Obj))]
- [get-font-from-user
-  (->optkey [(Un (-val #f) -String)
-             (Un (-val #f)
-                 (make-Instance (parse-type #'Frame%))
-                 (make-Instance (parse-type #'Dialog%)))
-             (Un (make-Instance (parse-type #'Font%)) (-val #f))
-             -Null]
-            (Un (-val #f) (make-Instance (parse-type #'Font%))))]
- [can-get-page-setup-from-user? (-> -Boolean)]
- ;; 4.2 Eventspaces
- [#:opaque Eventspace eventspace?]
- [make-eventspace (-> -Eventspace)]
- [current-eventspace (-Param -Eventspace -Eventspace)]
- [event-dispatch-handler (-Param (-> -Eventspace Univ) (-> -Eventspace Univ))]
- [eventspace-event-evt
-  (cl->* (-> (-evt -Eventspace))
-         (-> -Eventspace (-evt -Eventspace)))]
- [eventspace-shutdown? (-> -Eventspace -Boolean)]
- [eventspace-handler-thread (-> -Eventspace (-opt -Thread))]
- [check-for-break (-> -Boolean)]
- [get-top-level-windows
-  (-> (-lst (Un (make-Instance (parse-type #'Frame%))
-                (make-Instance (parse-type #'Dialog%)))))]
- [get-top-level-focus-window
-  (-> (Un (-val #f)
-          (make-Instance (parse-type #'Frame%))
-          (make-Instance (parse-type #'Dialog%))))]
- [get-top-level-edit-target-window
-  (-> (Un (-val #f)
-          (make-Instance (parse-type #'Frame%))
-          (make-Instance (parse-type #'Dialog%))))]
- [special-control-key
-  (cl->* (-> Univ -Void) (-> -Boolean))]
- [special-option-key
-  (cl->* (-> Univ -Void) (-> -Boolean))]
- [queue-callback (->opt (-> Univ) [Univ] -Void)]
- [yield
-  (-poly (a)
-    (cl->* (-> -Boolean)
-           (-> (-val 'wait) (-val #t))
-           (-> (-evt a) a)))]
- [sleep/yield (-> -NonNegReal -Void)]
- ;; 4.4 Global Graphics
- [flush-display (-> -Void)]
- [get-display-count (-> -PosInt)]
- [get-display-depth (-> -Nat)]
- [get-display-left-top-inset
-  (cl->* (->key #:monitor -Nat #f
-                (-values (list (Un (-val #f) -Nat)
-                               (Un (-val #f) -Nat))))
-         (->key Univ #:monitor -Nat #f
-                (-values (list (Un (-val #f) -Nat)
-                               (Un (-val #f) -Nat)))))]
- [get-display-size
-  (cl->* (->key #:monitor -Nat #f
-                (-values (list (Un (-val #f) -Nat)
-                               (Un (-val #f) -Nat))))
-         (->key Univ #:monitor -Nat #f
-                (-values (list (Un (-val #f) -Nat)
-                               (Un (-val #f) -Nat)))))]
- [is-color-display? (-> -Boolean)]
- ;; 4.5 Fonts
- [menu-control-font (make-Instance (parse-type #'Font%))]
- [normal-control-font (make-Instance (parse-type #'Font%))]
- [small-control-font (make-Instance (parse-type #'Font%))]
- [tiny-control-font (make-Instance (parse-type #'Font%))]
- [view-control-font (make-Instance (parse-type #'Font%))]
- ;; 4.6 Miscellaneous
- [begin-busy-cursor (-> -Void)]
- [bell (-> -Void)]
- [dimension-integer? (-> Univ -Boolean)]
- [end-busy-cursor (-> -Void)]
- [file-creator-and-type
-  (cl->* (-> -Path (-values (list -Bytes -Bytes)))
-         (-> -Path -Bytes -Bytes -Void))]
- [find-graphical-system-path
-  (-> (one-of/c 'init-file 'x-display) (-opt -Path))]
- [get-default-shortcut-prefix
-  (-> (Un (-lst* (-val 'ctl))
-          (-lst* (-val 'cmd))
-          (-lst (one-of/c 'alt 'cmd 'meta 'ctl 'shift 'option))))]
- [get-panel-background (-> -Color%-Obj)]
- [get-highlight-background-color (-> -Color%-Obj)]
- [get-highlight-text-color (-> (-opt -Color%-Obj))]
- ; get-window-text-extent
- ; graphical-read-eval-print-loop
- ; textual-read-eval-print-loop
- ; get-current-mouse-state
- [hide-cursor-until-moved (-> -Void)]
- [is-busy? (-> -Boolean)]
- [label->plain-label (-> -String -String)]
- ; make-gl-bitmap
- [make-gui-empty-namespace (-> -Namespace)]
- [make-gui-namespace (-> -Namespace)]
- ; make-screen-bitmap
- ; play-sound
- ; position-integer?
- ; positive-dimension-integer?
- ; register-collecting-blit
- ; unregister-collecting-blit
- ; send-message-to-window
- ; spacing-integer?
- [system-position-ok-before-cancel? (-> -Boolean)]
- ; the-clipboard
- ; the-x-selection-clipboard
- ; label-string?
- ; key-code-symbol?
- ;; 8 Editor functions
- [get-the-snip-class-list (-> (make-Instance (parse-type #'Snip-Class-List<%>)))])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/private/gui-types.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/private/gui-types.rkt
deleted file mode 100644
index 19baec1841..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/private/gui-types.rkt
+++ /dev/null
@@ -1,2819 +0,0 @@
-#lang typed/racket
-
-;; Type definitions for typed/racket/gui, typed/racket/draw,
-;; and typed/racket/snip
-
-;; racket/draw
-
-(provide LoadFileKind
-         Font-Family
-         Font-Style
-         Font-Weight
-         Font-Smoothing
-         Font-Hinting
-         Bitmap%
-         Bitmap-DC%
-         Brush-Style
-         Brush%
-         Brush-List%
-         Color%
-         Color-Database<%>
-         DC<%>
-         Font%
-         Font-List%
-         GL-Config%
-         GL-Context<%>
-         Linear-Gradient%
-         Pen%
-         Pen-List%
-         Pen-Style
-         Pen-Cap-Style
-         Pen-Join-Style
-         Point%
-         Radial-Gradient%
-         Region%)
-
-(define-type LoadFileKind
- (U 'unknown 'unknown/mask 'unknown/alpha
-    'gif 'gif/mask 'gif/alpha
-    'jpeg 'jpeg/alpha
-    'png 'png/mask 'png/alpha
-    'xbm 'xbm/alpha 'xpm 'xpm/alpha
-    'bmp 'bmp/alpha))
-
-(define-type Bitmap%
-  (Class
-   (init-rest (U (List Integer Integer)
-                 (List Integer Integer Any)
-                 (List Integer Integer Any Any)
-                 (List Integer Integer Any Any Real)
-                 (List (U Path-String Input-Port))
-                 (List (U Path-String Input-Port) Any)
-                 (List (U Path-String Input-Port)
-                       Any (Option (Instance Color%)))
-                 (List (U Path-String Input-Port)
-                       Any (Option (Instance Color%)) Any)
-                 (List (U Path-String Input-Port)
-                       Any (Option (Instance Color%)) Any
-                       Real)
-                 (List Bytes Integer Integer)))
-   [get-argb-pixels
-    (case-> (Real Real
-                  Exact-Nonnegative-Integer Exact-Nonnegative-Integer
-                  Bytes -> Void)
-            (Real Real
-                  Exact-Nonnegative-Integer Exact-Nonnegative-Integer
-                  Bytes Any -> Void)
-            (Real Real
-                  Exact-Nonnegative-Integer Exact-Nonnegative-Integer
-                  Bytes Any Any -> Void))]
-   [get-depth (-> Exact-Nonnegative-Integer)]
-   [get-handle (-> Any)]
-   [get-height (-> Exact-Positive-Integer)]
-   [get-loaded-mask (-> (Option (Instance Bitmap%)))]
-   [get-width (-> Exact-Positive-Integer)]
-   [has-alpha-channel? (-> Boolean)]
-   [is-color? (-> Boolean)]
-   [load-file (case->
-               ((U String Path Input-Port) -> Boolean)
-               ((U String Path Input-Port) LoadFileKind -> Boolean)
-               ((U String Path Input-Port) LoadFileKind (Option (Instance Color%)) -> Boolean)
-               ((U String Path Input-Port) LoadFileKind (Option (Instance Color%)) Any -> Boolean))]
-   [make-dc (-> (Instance Bitmap-DC%))]
-   [ok? (-> Boolean)]
-   [save-file (case->
-               ((U Path-String Output-Port) (U 'png 'jpeg 'xbm 'xpm 'bmp) -> Boolean)
-               ((U Path-String Output-Port) (U 'png 'jpeg 'xbm 'xpm 'bmp) Natural -> Boolean))]
-   [set-argb-pixels
-    (case-> (Real Real
-                  Exact-Nonnegative-Integer Exact-Nonnegative-Integer
-                  Bytes -> Void)
-            (Real Real
-                  Exact-Nonnegative-Integer Exact-Nonnegative-Integer
-                  Bytes Any -> Void)
-            (Real Real
-                  Exact-Nonnegative-Integer Exact-Nonnegative-Integer
-                  Bytes Any Any -> Void))]
-   [set-loaded-mask ((Instance Bitmap%) -> Void)]))
-
-(define-type Color%
-  (Class (init-rest (U (List)
-                       (List Byte Byte Byte)
-                       (List Byte Byte Byte Real)
-                       (List String)))
-         [red (-> Byte)]
-         [green (-> Byte)]
-         [blue (-> Byte)]
-         [alpha (-> Real)]
-         [set (case->
-               (Byte Byte Byte -> Void)
-               (Byte Byte Byte Real -> Void))]
-         [copy-from ((Instance Color%) -> (Instance Color%))]
-         [is-immutable? (-> Boolean)]
-         [ok? (-> #t)]))
-
-(define-type Color-Database<%>
-  (Class [find-color (String -> (Option (Instance Color%)))]
-         [get-names (-> (Listof String))]))
-
-(define-type Pen-Style
-  (U 'transparent 'solid 'xor 'hilite
-     'dot 'long-dash 'short-dash 'dot-dash
-     'xor-dot 'xor-long-dash 'xor-short-dash
-     'xor-dot-dash))
-
-(define-type Pen-Cap-Style (U 'round 'projecting 'butt))
-(define-type Pen-Join-Style (U 'round 'bevel 'miter))
-
-(define-type Brush-Style
-  (U 'transparent 'solid 'opaque
-     'xor 'hilite 'panel
-     'bdiagonal-hatch 'crossdiag-hatch
-     'fdiagonal-hatch 'cross-hatch
-     'horizontal-hatch 'vertical-hatch))
-
-(define-type Brush%
-  (Class (init [color (U String (Instance Color%)) #:optional]
-               [style Brush-Style #:optional]
-               [stipple (Option (Instance Bitmap%)) #:optional]
-               [gradient (Option (U (Instance Radial-Gradient%)
-                                    (Instance Linear-Gradient%))) #:optional]
-               [transformation (Option (Vector (Vector Real Real Real
-                                                       Real Real Real)
-                                               Real Real Real Real Real))
-                               #:optional])
-         [get-color (-> (Instance Color%))]
-         [get-gradient (-> (Option (U (Instance Radial-Gradient%)
-                                      (Instance Linear-Gradient%))))]
-         [get-handle (-> (Option Any))]
-         [get-stipple (-> (Option (Instance Bitmap%)))]
-         [get-style (-> Brush-Style)]
-         [get-transformation (-> (Option (Vector (Vector Real Real Real
-                                                       Real Real Real)
-                                                 Real Real Real Real Real)))]
-         [is-immutable? (-> Boolean)]
-         [set-color (case-> ((U (Instance Color%) String) -> Void)
-                            (Byte Byte Byte -> Void))]
-         [set-stipple
-          (case-> ((Option (Instance Bitmap%)) -> Void)
-                  ((Option (Instance Bitmap%))
-                   (Option (Vector (Vector Real Real Real
-                                           Real Real Real)
-                                   Real Real Real Real Real))
-                   -> Void))]
-         [set-style (Brush-Style -> Void)]))
-
-(define-type Brush-List%
-  (Class [find-or-create-brush
-          (case->
-           ((U (Instance Color%) String) Brush-Style -> (Option (Instance Brush%))))]))
-
-(define-type Pen%
-  (Class (init [color (U String (Instance Color%)) #:optional]
-               [width Real #:optional]
-               [style Pen-Style #:optional]
-               [cap Pen-Cap-Style #:optional]
-               [join Pen-Join-Style #:optional]
-               [stipple (Option (Instance Bitmap%)) #:optional])
-         [get-cap (-> Pen-Cap-Style)]
-         [get-color (-> (Instance Color%))]
-         [get-join (-> Pen-Join-Style)]
-         [get-stipple (-> (Option (Instance Bitmap%)))]
-         [get-width (-> Real)]
-         [is-immutable? (-> Boolean)]
-         [set-cap (Pen-Cap-Style -> Void)]
-         [set-color (case-> ((U (Instance Color%) String) -> Void)
-                            (Byte Byte Byte -> Void))]
-         [set-join (Pen-Join-Style -> Void)]
-         [set-stipple ((Option (Instance Bitmap%)) -> Void)]
-         [set-style (Pen-Style -> Void)]
-         [set-width (Real -> Void)]))
-
-(define-type Pen-List%
-  (Class [find-or-create-pen
-          (case->
-           ((U String (Instance Color%)) Real Pen-Style
-            -> (Instance Pen%))
-           ((U String (Instance Color%)) Real Pen-Style
-            Pen-Cap-Style
-            -> (Instance Pen%))
-           ((U String (Instance Color%)) Real Pen-Style
-            Pen-Cap-Style Pen-Join-Style
-            -> (Instance Pen%)))]))
-
-(define-type Linear-Gradient%
-  (Class (init [x0 Real] [y0 Real]
-               [x1 Real] [y1 Real]
-               [stops (Listof (List Real (Instance Color%)))])
-         [get-line (-> (values Real Real Real Real))]
-         [get-stops (-> (Listof (List Real (Instance Color%))))]))
-
-(define-type Radial-Gradient%
-  (Class (init [x0 Real] [y0 Real] [r0 Real]
-               [x1 Real] [y1 Real] [r1 Real]
-               [stops (Listof (List Real (Instance Color%)))])
-         [get-circles (-> (values Real Real Real Real Real Real))]
-         [get-stops (-> (Listof (List Real (Instance Color%))))]))
-
-(define-type DC<%>
-  (Class [cache-font-metrics-key (-> Integer)]
-         [clear (-> Void)]
-         [copy
-          (Real Real Nonnegative-Real Nonnegative-Real Real Real -> Void)]
-         [draw-arc
-          (Real Real Nonnegative-Real Nonnegative-Real Real Real -> Void)]
-         [draw-bitmap
-          (case->
-           ((Instance Bitmap%) Real Real -> Boolean)
-           ((Instance Bitmap%) Real Real (U 'solid 'opaque 'xor) -> Boolean)
-           ((Instance Bitmap%) Real Real
-            (U 'solid 'opaque 'xor) (Instance Color%) -> Boolean)
-           ((Instance Bitmap%) Real Real
-            (U 'solid 'opaque 'xor) (Instance Color%)
-            (Option (Instance Bitmap%)) -> Boolean))]
-         [draw-bitmap-section
-          (case->
-           ((Instance Bitmap%) Real Real Real Real
-            Nonnegative-Real Nonnegative-Real
-            -> Boolean)
-           ((Instance Bitmap%) Real Real Real Real
-            Nonnegative-Real Nonnegative-Real
-            (U 'solid 'opaque 'xor) -> Boolean)
-           ((Instance Bitmap%) Real Real Real Real
-            Nonnegative-Real Nonnegative-Real
-            (U 'solid 'opaque 'xor) (Instance Color%) -> Boolean)
-           ((Instance Bitmap%) Real Real Real Real
-            Nonnegative-Real Nonnegative-Real
-            (U 'solid 'opaque 'xor) (Instance Color%)
-            (Option (Instance Bitmap%)) -> Boolean))]
-         [draw-ellipse (Real Real Nonnegative-Real Nonnegative-Real -> Void)]
-         [draw-line (Real Real Real Real -> Void)]
-         [draw-lines (->* ((U (Listof (Instance Point%))
-                              (Listof (Pairof Real Real))))
-                          (Real Real)
-                          Void)]
-         [draw-path (->* ((Instance DC-Path%))
-                         (Real Real (U 'odd-even 'winding))
-                         Void)]
-         [draw-point (Real Real -> Void)]
-         [draw-polygon (->* ((U (Listof (Instance Point%))
-                                (Listof (Pairof Real Real))))
-                            (Real Real (U 'odd-even 'winding))
-                            Void)]
-         [draw-rectangle (Real Real Nonnegative-Real Nonnegative-Real -> Void)]
-         [draw-rounded-rectangle
-          (case-> (Real Real Nonnegative-Real Nonnegative-Real -> Void)
-                  (Real Real Nonnegative-Real Nonnegative-Real Real -> Void))]
-         [draw-spline (Real Real Real Real Real Real -> Void)]
-         [draw-text (case-> (String Number Number -> Void)
-                            (String Number Number Any -> Void)
-                            (String Number Number Any Natural -> Void)
-                            (String Number Number Any Natural Real -> Void))]
-         [end-doc (-> Void)]
-         [end-page (-> Void)]
-         [erase (-> Void)]
-         [flush (-> Void)]
-         [get-alpha (-> Nonnegative-Real)]
-         [get-background (-> (Instance Color%))]
-         [get-brush (-> (Instance Brush%))]
-         [get-char-height (-> Nonnegative-Real)]
-         [get-char-width (-> Nonnegative-Real)]
-         [get-clipping-region (-> (Option (Instance Region%)))]
-         [get-device-scale (-> (Values Nonnegative-Real Nonnegative-Real))]
-         [get-font (-> (Instance Font%))]
-         [get-gl-context (-> (Option (Instance GL-Context<%>)))]
-         [get-initial-matrix (-> (Vector Real Real Real Real Real Real))]
-         [get-origin (-> (Values Real Real))]
-         [get-pen (-> (Instance Pen%))]
-         [get-path-bounding-box (-> (Instance DC-Path%)
-                                    (U 'path 'stroke 'fill)
-                                    (values Real Real Real Real))]
-         [get-rotation (-> Real)]
-         [get-scale (-> (Values Real Real))]
-         [get-size (-> (Values Nonnegative-Real Nonnegative-Real))]
-         [get-smoothing (-> (U 'unsmoothed 'smoothed 'aligned))]
-         [get-text-background (-> (Instance Color%))]
-         [get-text-extent
-          (case->
-           (String ->
-                   (values Nonnegative-Real Nonnegative-Real
-                           Nonnegative-Real Nonnegative-Real))
-           (String (Option (Instance Font%)) ->
-                   (values Nonnegative-Real Nonnegative-Real
-                           Nonnegative-Real Nonnegative-Real))
-           (String (Option (Instance Font%)) Any ->
-                   (values Nonnegative-Real Nonnegative-Real
-                           Nonnegative-Real Nonnegative-Real))
-           (String (Option (Instance Font%)) Any Natural ->
-                   (values Nonnegative-Real Nonnegative-Real
-                           Nonnegative-Real Nonnegative-Real)))]
-         [get-text-foreground (-> (Instance Color%))]
-         [get-text-mode (-> (U 'solid 'transparent))]
-         [get-transformation
-          (-> (Vector (Vector Real Real Real Real Real Real)
-                      Real Real Real Real Real))]
-         [glyph-exists? (Char -> Boolean)]
-         [ok? (-> Boolean)]
-         [resume-flush (-> Void)]
-         [rotate (Real -> Void)]
-         [scale (Real Real -> Void)]
-         [set-alpha (Nonnegative-Real -> Void)]
-         [set-background ((U (Instance Color%) String) -> Void)]
-         [set-brush (case->
-                     ((Instance Brush%) -> Void)
-                     ((U (Instance Color%) String) Brush-Style -> Void))]
-         [set-clipping-rect
-          (Real Real Nonnegative-Real Nonnegative-Real -> Void)]
-         [set-clipping-region ((Option (Instance Region%)) -> Void)]
-         [set-font ((Instance Font%) -> Void)]
-         [set-initial-matrix ((Vector Real Real Real Real Real Real) -> Void)]
-         [set-origin (Real Real -> Void)]
-         [set-pen (case->
-                   ((Instance Pen%) -> Void)
-                   ((U (Instance Color%) String) Real Pen-Style -> Void))]
-         [set-rotation (Real -> Void)]
-         [set-scale (Real Real -> Void)]
-         [set-smoothing ((U 'unsmoothed 'smoothed 'aligned) -> Void)]
-         [set-text-background ((U (Instance Color%) String) -> Void)]
-         [set-text-foreground ((U (Instance Color%) String) -> Void)]
-         [set-text-mode ((U 'solid 'transparent) -> Void)]
-         [set-transformation
-          ((Vector (Vector Real Real Real Real Real Real)
-                      Real Real Real Real Real)
-           -> Void)]
-         [start-doc (String -> Void)]
-         [start-page (-> Void)]
-         [suspend-flush (-> Void)]
-         [transform ((Vector Real Real Real Real Real Real) -> Void)]
-         [translate (Real Real -> Void)]
-         [try-color ((Instance Color%) (Instance Color%) -> Void)]))
-
-(define-type DC-Path%
-  (Class [append (-> (Instance DC-Path%) Void)]
-         [arc (->* (Real Real Real Real Real Real)
-                   (Any)
-                   Void)]
-         [close (-> Void)]
-         [curve-to (-> Real Real Real Real Real Real Void)]
-         [ellipse (-> Real Real Real Real Void)]
-         [get-bounding-box (-> (values Real Real Real Real))]
-         [line-to (-> Real Real Void)]
-         [lines (->* ((U (Listof (Instance Point%))
-                         (Listof (Pairof Real Real))))
-                     (Real Real)
-                     Void)]
-         [move-to (-> Real Real Void)]
-         [open? (-> Boolean)]
-         [rectangle (-> Real Real Real Real Void)]
-         [reset (-> Void)]
-         [reverse (-> Void)]
-         [rotate (-> Real Void)]
-         [rounded-rectangle
-          (->* (Real Real Real Real)
-               (Real)
-               Void)]
-         [scale (-> Real Real Void)]
-         [text-outline (->* ((Instance Font%) String Real Real)
-                            (Any)
-                            Void)]
-         [transform (-> (Vector Real Real Real Real Real Real) Void)]
-         [translate (-> Real Real Void)]))
-
-(define-type Region%
-  (Class (init [dc (Option (Instance DC<%>))])
-         [get-bounding-box (-> (Values Real Real Real Real))]
-         [get-dc (-> (Option (Instance DC<%>)))]
-         [in-region? (Real Real -> Boolean)]
-         [intersect ((Instance Region%) -> Void)]
-         [is-empty? (-> Boolean)]
-         [set-arc
-          (Real Real Nonnegative-Real Nonnegative-Real
-           Real Real -> Void)]
-         [set-ellipse
-          (Real Real Nonnegative-Real Nonnegative-Real -> Void)]
-         [set-path
-          (->* ((Instance DC-Path%))
-               (Real Real (U 'odd-even 'winding))
-               Void)]
-         [set-polygon
-          (case->
-           ((U (Listof (Instance Point%)) (Listof (Pairof Real Real)))
-            -> Void)
-           ((U (Listof (Instance Point%)) (Listof (Pairof Real Real)))
-            Real -> Void)
-           ((U (Listof (Instance Point%)) (Listof (Pairof Real Real)))
-            Real Real -> Void)
-           ((U (Listof (Instance Point%)) (Listof (Pairof Real Real)))
-            Real Real (U 'odd-even 'winding)
-            -> Void))]
-         [set-rectangle
-          (Real Real Real Real -> Void)]
-         [set-rounded-rectangle
-          (case->
-           (Real Real Real Real -> Void)
-           (Real Real Real Real Real -> Void))]
-         [subtract ((Instance Region%) -> Void)]
-         [union ((Instance Region%) -> Void)]
-         [xor ((Instance Region%) -> Void)]))
-
-(define-type Point%
-  (Class (init-rest (U (List) (List Real Real)))
-         [get-x (-> Real)]
-         [get-y (-> Real)]
-         [set-x (Real -> Void)]
-         [set-y (Real -> Void)]))
-
-(define-type GL-Config%
-  (Class [get-accum-size (-> Natural)]
-         [get-depth-size (-> Natural)]
-         [get-double-buffered (-> Boolean)]
-         [get-legacy? (-> Boolean)]
-         [get-multisample-size (-> Natural)]
-         [get-share-context (-> (Option (Instance GL-Context<%>)))]
-         [get-stencil-size (-> Natural)]
-         [get-stereo (-> Boolean)]
-         [set-accum-size (Integer -> Void)]
-         [set-depth-size (Integer -> Void)]
-         [set-double-buffered (Any -> Void)]
-         [set-legacy? (-> Any Void)]
-         [set-multisample-size (Integer -> Void)]
-         [set-share-context ((Option (Instance GL-Context<%>)) -> Void)]
-         [set-stencil-size (Integer -> Void)]
-         [set-stereo (Any -> Void)]))
-
-(define-type GL-Context<%>
-  (Class [call-as-current
-          (case-> ((-> Any) -> Any)
-                  ((-> Any) (Evtof Any) -> Any)
-                  ((-> Any) (Evtof Any) Any -> Any))]
-         ;; FIXME: a typed/ffi binding with Opaque cpointer type
-         ;; would be better here
-         [get-handle (-> Any)]
-         [ok? (-> Boolean)]
-         [swap-buffers (-> Void)]))
-
-(define-type Bitmap-DC%
-  (Class #:implements DC<%>
-         (init [bitmap (Option (Instance Bitmap%))])
-         [get-argb-pixels
-          (case-> (Real Real Integer Integer Bytes -> Void)
-                  (Real Real Integer Integer Bytes Any -> Void)
-                  (Real Real Integer Integer Bytes Any Any -> Void))]
-         [get-bitmap (-> (Option (Instance Bitmap%)))]
-         [get-pixel (Real Real (Instance Color%) -> Boolean)]
-         [set-argb-pixels
-          (case-> (Real Real Integer Integer Bytes -> Void)
-                  (Real Real Integer Integer Bytes Any -> Void)
-                  (Real Real Integer Integer Bytes Any Any -> Void))]
-         [set-bitmap ((Option (Instance Bitmap%)) -> Void)]
-         [set-pixel (Real Real (Instance Color%) -> Boolean)]))
-
-(define-type Font-List%
-  (Class
-   [find-or-create-font
-    (case-> (Integer (U Symbol String) Symbol Symbol -> (Instance Font%))
-            (Integer (U Symbol String) Symbol Symbol Any -> (Instance Font%))
-            (Integer (U Symbol String) Symbol Symbol Any Any -> (Instance Font%))
-            (Integer (U Symbol String) Symbol Symbol Any Any Any -> (Instance Font%))
-            (Integer (U Symbol String) Symbol Symbol Any Any Any Any -> (Instance Font%))
-            (Integer (U Symbol String) Symbol Symbol Any Any Any Any Font-Hinting -> (Instance Font%)))]))
-
-(define-type Font-Family
-  (U 'default 'decorative 'roman 'script 'swiss
-     'modern 'symbol 'system))
-
-(define-type Font-Style (U 'normal 'italic 'slant))
-
-(define-type Font-Weight (U 'normal 'bold 'light))
-
-(define-type Font-Smoothing (U 'default 'partly-smoothed
-                               'smoothed 'unsmoothed))
-
-(define-type Font-Hinting (U 'aligned 'unaligned))
-
-(define-type Font%
-  (Class [get-face (-> (Option String))]
-         [get-family (-> Font-Family)]
-         [get-hinting (-> Font-Hinting)]
-         [get-point-size (-> Positive-Integer)]
-         [get-size-in-pixels (-> Boolean)]
-         [get-smoothing (-> Font-Smoothing)]
-         [get-style (-> Font-Style)]
-         [get-underlined (-> Boolean)]
-         [get-weight (-> Font-Weight)]
-         [screen-glyph-exists?
-          (case-> (Char -> Boolean)
-                  (Char Any -> Boolean))]))
-
-;; racket/gui
-
-(provide Area<%>
-         Area-Container<%>
-         Area-Container-Window<%>
-         Button%
-         Canvas<%>
-         Canvas%
-         Check-Box%
-         Checkable-Menu-Item%
-         Choice%
-         Clipboard-Client%
-         Clipboard<%>
-         Combo-Field%
-         Control<%>
-         Column-Control-Event%
-         Control-Event%
-         Control-Event-Type
-         Cursor%
-         Dialog%
-         Event%
-         Frame%
-         Gauge%
-         Group-Box-Panel%
-         Grow-Box-Spacer-Pane%
-         Horizontal-Pane%
-         Horizontal-Panel%
-         Key-Event%
-         Labelled-Menu-Item<%>
-         List-Box%
-         List-Control<%>
-         Menu%
-         Menu-Bar%
-         Menu-Item<%>
-         Menu-Item%
-         Menu-Item-Container<%>
-         Message%
-         Mouse-Event%
-         Pane%
-         Panel%
-         Popup-Menu%
-         Printer-DC%
-         Radio-Box%
-         Selectable-Menu-Item<%>
-         Separator-Menu-Item%
-         Scroll-Event%
-         Slider%
-         Subarea<%>
-         Subwindow<%>
-         Tab-Panel%
-         Text-Field%
-         Timer%
-         Top-Level-Window<%>
-         Vertical-Pane%
-         Vertical-Panel%
-         Window<%>)
-
-(define-type Area<%>
-  (Class [get-graphical-min-size (-> (Values Natural Natural))]
-         [get-parent (-> (Option (Instance Area-Container<%>)))]
-         [get-top-level-window (-> (U (Instance Frame%) (Instance Dialog%)))]
-         [min-width (case-> (-> Integer)
-                            (Integer -> Void))]
-         [min-height (case-> (-> Integer)
-                             (Integer -> Void))]
-         [stretchable-height
-          (case-> (-> Boolean)
-                  (Any -> Void))]
-         [stretchable-width
-          (case-> (-> Boolean)
-                  (Any -> Void))]))
-
-(define-type Window<%>
-  (Class #:implements Area<%>
-         [accept-drop-files (case-> (-> Boolean)
-                                    (Any -> Void))]
-         [client->screen
-          (Integer Integer -> (Values Integer Integer))]
-         [enable (Any -> Void)]
-         [focus (-> Void)]
-         [get-client-handle (-> Any)]
-         [get-client-size (-> (Values Natural Natural))]
-         [get-cursor (-> (Option (Instance Cursor%)))]
-         [get-handle (-> Any)]
-         [get-height (-> Natural)]
-         [get-label
-          (-> (U String (Instance Bitmap%) (U 'app 'caution 'stop)
-                 (List (Instance Bitmap%) String (U 'left 'top 'right 'bottom))
-                 #f))]
-         [get-plain-label (-> (Option String))]
-         [get-size (-> (Values Natural Natural))]
-         [get-width (-> Natural)]
-         [get-x (-> Integer)]
-         [get-y (-> Integer)]
-         [has-focus? (-> Boolean)]
-         [is-enabled? (-> Boolean)]
-         [is-shown? (-> Boolean)]
-         [on-drop-file (Path -> Void)]
-         [on-focus (Any -> Void)]
-         [on-move (Integer Integer -> Void)]
-         [on-size (Natural Natural -> Void)]
-         [on-subwindow-char ((Instance Window<%>) (Instance Key-Event%) -> Boolean)]
-         [on-subwindow-event ((Instance Window<%>) (Instance Mouse-Event%) -> Boolean)]
-         [on-subwindow-focus ((Instance Window<%>) Any -> Void)]
-         [on-superwindow-enable (Any -> Void)]
-         [on-superwindow-show (Any -> Void)]
-         [popup-menu ((Instance Popup-Menu%) Natural Natural -> Void)]
-         [refresh (-> Void)]
-         [screen->client
-          (Integer Integer -> (Values Integer Integer))]
-         [set-cursor ((Option (Instance Cursor%)) -> Void)]
-         [set-label (String -> Void)]
-         [show (Any -> Void)]
-         [warp-pointer (Integer Integer -> Void)]))
-
-(define-type Area-Container<%>
-  (Class #:implements Area<%>
-         [add-child ((Instance Subwindow<%>) -> Void)]
-         [after-new-child ((Instance Subarea<%>) -> Void)]
-         [begin-container-sequence (-> Void)]
-         [border (case-> (-> Natural) (Natural -> Void))]
-         [change-children
-          (((Listof (Instance Subarea<%>))
-            ->
-            (Listof (Instance Subarea<%>)))
-           -> Void)]
-         [container-flow-modified (-> Void)]
-         [container-size ((Listof (List Natural Natural Any Any))
-                          -> (Values Natural Natural))]
-         [delete-child ((Instance Subwindow<%>) -> Void)]
-         [end-container-sequence (-> Void)]
-         [get-alignment (-> (Values (U 'right 'center 'left)
-                                    (U 'bottom 'center 'top)))]
-         [get-children (-> (Listof (Instance Subarea<%>)))]
-         [place-children ((Listof (List Natural Natural Any Any))
-                          Natural Natural
-                          -> (Listof (List Natural Natural Natural Natural)))]
-         [reflow-container (-> Void)]
-         [set-alignment ((U 'right 'center 'left) (U 'bottom 'center 'top)
-                         -> Void)]
-         [spacing (case-> (-> Natural) (Natural -> Void))]))
-
-(define-type Area-Container-Window<%>
-  (Class #:implements Area-Container<%>
-         #:implements Window<%>))
-
-(define-type Top-Level-Window<%>
-  (Class #:implements Area-Container-Window<%>
-         (augment [can-close? (-> Boolean)])
-         [can-exit? (-> Boolean)]
-         [get-eventspace (-> Any)] ; FIXME: Eventspace type
-         [move (Integer Integer -> Void)]
-         [on-activate (Any -> Void)]
-         (augment [on-close (-> Void)])
-         [on-exit (-> Void)]
-         [on-message (Any -> Void)]
-         (augment [display-changed (-> Any)])
-         [set-icon
-          (case->
-           ((Instance Bitmap%) -> Void)
-           ((Instance Bitmap%) (Instance Bitmap%)  -> Void)
-           ((Instance Bitmap%) (Instance Bitmap%) (U 'small 'large 'both)
-            -> Void))]))
-
-(define-type Subarea<%>
-  (Class #:implements Area<%>))
-
-(define-type Subwindow<%>
-  (Class #:implements Subarea<%>
-         #:implements Window<%>))
-
-(define-type Canvas<%>
-  (Class #:implements Subwindow<%>
-         [accept-tab-focus (case-> [-> Boolean]
-                                   [Any -> Void])]
-         [flush (-> Void)]
-         [get-canvas-background (-> (Option (Instance Color%)))]
-         [get-dc (-> (Instance DC<%>))]
-         [min-client-height
-          (case-> (-> Natural)
-                  (Natural -> Void))]
-         [min-client-width
-          (case-> (-> Natural)
-                  (Natural -> Void))]
-         [on-char ((Instance Key-Event%) -> Void)]
-         [on-event ((Instance Mouse-Event%) -> Void)]
-         [on-paint (-> Void)]
-         [on-tab-in (-> Void)]
-         [resume-flush (-> Void)]
-         [set-canvas-background ((Instance Color%) -> Void)]
-         [set-resize-corner (Any -> Void)]
-         [suspend-flush (-> Void)]))
-
-(define-type Canvas%
-  (Class #:implements Canvas<%>
-         (init [parent (Instance Area-Container<%>)] ; FIXME
-               [style (Listof (U 'border 'control-border 'combo
-                                 'vscroll 'hscroll 'resize-corner
-                                 'gl 'no-autoclear 'transparent
-                                 'no-focus 'deleted))
-                      #:optional]
-               [paint-callback ((Instance Canvas%) (Instance DC<%>) -> Any)
-                               #:optional]
-               [label (Option String) #:optional]
-               [gl-config (Option Any) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [get-scroll-page ((U 'horizontal 'vertical) -> Exact-Positive-Integer)]
-         [get-scroll-pos ((U 'horizontal 'vertical) -> Exact-Positive-Integer)]
-         [get-scroll-range ((U 'horizontal 'vertical) -> Exact-Positive-Integer)]
-         [get-view-start (-> (Values Natural Natural))]
-         [get-virtual-size (-> (Values Natural Natural))]
-         [init-auto-scrollbars
-          ((Option Natural) (Option Natural) Real Real -> Void)]
-         [init-manual-scrollbars
-          ((Option Natural) (Option Natural)
-           Exact-Positive-Integer Exact-Positive-Integer
-           Natural Natural -> Void)]
-         [make-bitmap
-          (Exact-Positive-Integer Exact-Positive-Integer -> (Instance Bitmap%))]
-         [on-paint (-> Void)]
-         [on-scroll (Any -> Void)]
-         [refresh-now
-          (->* ()
-               ((-> (Instance DC<%>) Any) #:flush? Any)
-               Void)]
-         [scroll ((Option Real) (Option Real) -> Void)]
-         [set-scroll-page
-          ((U 'horizontal 'vertical) Exact-Positive-Integer -> Void)]
-         [set-scroll-pos
-          ((U 'horizontal 'vertical) Exact-Positive-Integer -> Void)]
-         [set-scroll-range
-          ((U 'horizontal 'vertical) Exact-Positive-Integer -> Void)]
-         [show-scrollbars (Any Any -> Void)]
-         [swap-gl-buffers (-> Void)]
-         [with-gl-context ((-> Any) [#:fail (-> Any)] -> Any)]))
-
-(define-type Cursor%
-  (Class (init [id  Symbol])
-         [ok? (-> Boolean)]))
-
-(define-type Frame%
-  (Class #:implements Top-Level-Window<%>
-         (init [label String]
-               [parent (Option (Instance Frame%)) #:optional]
-               [width (Option Integer) #:optional]
-               [height (Option Integer) #:optional]
-               [x (Option Integer) #:optional]
-               [y (Option Integer) #:optional]
-               [style (Listof (U 'no-resize-border 'no-caption
-                                 'no-system-menu 'hide-menu-bar
-                                 'toolbar-button 'float 'metal))
-                      #:optional]
-               [enabled Any #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [create-status-line (-> Void)]
-         [get-menu-bar (-> (Option (Instance Menu-Bar%)))]
-         [has-status-line? (-> Boolean)]
-         [iconize (Any -> Void)]
-         [is-iconized? (-> Boolean)]
-         [is-maximized? (-> Boolean)]
-         [maximize (Any -> Void)]
-         [modified (case-> (-> Boolean) (Any -> Void))]
-         [on-menu-char ((Instance Key-Event%) -> Boolean)]
-         [on-toolbar-button-click (-> Void)]
-         [set-status-text (String -> Void)]))
-
-(define-type Dialog%
-  (Class #:implements Top-Level-Window<%>
-         (init [label String]
-               [parent (U #f (Instance Dialog%) (Instance Frame%))
-                       #:optional]
-               [width (Option Natural) #:optional]
-               [height (Option Natural) #:optional]
-               [x (Option Natural) #:optional]
-               [y (Option Natural) #:optional]
-               [style (Listof (U 'no-caption 'resize-border
-                                 'no-sheet 'close-button))
-                      #:optional]
-               [enabled Any #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [show-without-yield (-> Void)]))
-
-(define-type Text-Field%
-  (Class #:implements Control<%>
-         (init [label (Option String)]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [callback ((Instance Text-Field%)
-                          (Instance Control-Event%) -> Any)
-                         #:optional]
-               [init-value String #:optional]
-               [style (Listof (U 'single 'multiple 'hscroll 'password
-                                 'vertical-label 'horizontal-label
-                                 'deleted))
-                      #:optional]
-               [font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [get-editor (-> (Instance Text%))]
-         [get-field-background (-> (Instance Color%))]
-         [get-value (-> String)]
-         [set-field-background ((Instance Color%) -> Void)]
-         [set-value (String -> Void)]))
-
-(define-type Combo-Field%
-  (Class #:implements Text-Field%
-         (init [label (Option String)]
-               [choices (Listof String)]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [callback ((Instance Combo-Field%)
-                          (Instance Control-Event%) -> Any)
-                         #:optional]
-               [init-value String #:optional]
-               [style (Listof (U 'vertical-label 'horizontal-label
-                                 'deleted))
-                      #:optional]
-               [font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [append (String -> Void)]
-         [get-menu (-> (Instance Popup-Menu%))]
-         [on-popup ((Instance Control-Event%) -> Void)]))
-
-(define-type Check-Box%
-  (Class #:implements Control<%>
-         (init [label (U String (Instance Bitmap%))]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [callback ((Instance Check-Box%)
-                          (Instance Control-Event%) -> Any)
-                         #:optional]
-               [style (Listof 'deleted) #:optional]
-               [value Any #:optional]
-               [font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [get-value (-> Boolean)]
-         [set-label ((U String (Instance Bitmap%)) -> Void)]
-         [set-value (Any -> Void)]))
-
-(define-type Gauge%
-  (Class #:implements Control<%>
-         (init [label (Option String)]
-               [range Integer]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [style (Listof (U 'horizontal 'vertical
-                                 'vertical-label 'horizontal-label
-                                 'deleted)) #:optional]
-               [font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [get-range (-> Positive-Integer)]
-         [get-value (-> Natural)]
-         [set-range (Integer -> Void)]
-         [set-value (Integer -> Void)]))
-
-(define-type Radio-Box%
-  (Class #:implements Control<%>
-         (init [label (Option String)]
-               [choices (U (Listof String) (Listof (Instance Bitmap%)))]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [callback ((Instance Radio-Box%)
-                          (Instance Control-Event%) -> Any)
-                         #:optional]
-               [style (Listof (U 'horizontal 'vertical
-                                 'vertical-label 'horizontal-label
-                                 'deleted))
-                 #:optional]
-               [selection (Option Integer) #:optional]
-               [font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [enable (case-> (Any -> Void)
-                         (Integer Any -> Void))]
-         [get-item-label (Integer -> String)]
-         [get-item-plain-label (Integer -> String)]
-         [get-number (-> Natural)]
-         [get-selection (-> (Option Natural))]
-         [is-enabled? (case-> (-> Boolean)
-                              (Integer -> Boolean))]
-         [set-selection ((Option Integer) -> Void)]))
-
-(define-type Slider%
-  (Class #:implements Control<%>
-         (init [label (Option String)]
-               [min-value Integer]
-               [max-value Integer]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [callback ((Instance Slider%)
-                          (Instance Control-Event%) -> Any)
-                         #:optional]
-               [init-value Integer #:optional]
-               [style (Listof (U 'horizontal 'vertical 'plain
-                                 'vertical-label 'horizontal-label
-                                 'deleted))
-                 #:optional]
-               [font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [get-value (-> Natural)]
-         [set-value (Integer -> Void)]))
-
-(define-type Choice%
-  (Class #:implements List-Control<%>
-         (init [label String]
-               [choices (Listof String)]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [callback ((Instance Choice%)
-                          (Instance Control-Event%) -> Any)
-                         #:optional]
-               [style (Listof (U 'single 'multiple 'hscroll 'password
-                                 'vertical-label 'horizontal-label
-                                 'deleted))
-                      #:optional]
-               [selection Integer #:optional]
-               [font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])))
-
-(define-type List-Box%
-  (Class #:implements List-Control<%>
-         (init [label (Option String)]
-               [choices (Listof String)]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [callback ((Instance List-Box%)
-                          (Instance Control-Event%) -> Any)
-                         #:optional]
-               [style (Listof (U 'single 'multiple 'extended
-                                 'vertical-label 'horizontal-label
-                                 'variable-columns 'column-headers
-                                 'clickable-headers 'reorderable-headers
-                                 'deleted))
-                      #:optional]
-               [selection (Option Integer) #:optional]
-               [font (Instance Font%) #:optional]
-               [label-font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional]
-               [columns (Pairof String (Listof String)) #:optional]
-               [column-order (Option (Listof Integer)) #:optional])
-         [append (case-> (String -> Void)
-                         (String Any -> Void))]
-         [append-column (String -> Void)]
-         [delete-column (Integer -> Void)]
-         [get-column-labels
-          (-> (Pairof String (Listof String)))]
-         [get-column-order (-> (Listof Natural))]
-         [get-column-width
-          (Integer -> (Values Natural Natural Natural))]
-         [get-data (Integer -> Any)]
-         [get-first-visible-item (-> Natural)]
-         [get-label-font (-> (Instance Font%))]
-         [get-selections (-> (Listof Natural))]
-         [is-selected? (Integer -> Boolean)]
-         [number-of-visible-items (-> Positive-Integer)]
-         [select (case-> (Integer -> Void)
-                         (Integer Any -> Void))]
-         [set ((Listof String) -> Void)]
-         [set-column-label (Integer String -> Void)]
-         [set-column-order ((Listof Integer) -> Void)]
-         [set-column-width
-          (Integer Integer Integer Integer -> Void)]
-         [set-data (Integer Any -> Void)]
-         [set-first-visible-item (Integer -> Void)]
-         [set-string
-          (case-> (Integer String -> Void)
-                  (Integer String Integer -> Void))]))
-
-(define-type Menu%
-  (Class #:implements Menu-Item-Container<%>
-         #:implements Labelled-Menu-Item<%>
-         (init [label String]
-               [parent (U (Instance Menu%) (Instance Popup-Menu%)
-                          (Instance Menu-Bar%))]
-               [help-string (Option String) #:optional]
-               [demand-callback ((Instance Menu%) -> Any)
-                                #:optional])))
-
-(define-type Menu-Bar%
-  (Class #:implements Menu-Item-Container<%>
-         (init [parent (U (Instance Frame%) 'root)]
-               [demand-callback ((Instance Menu-Bar%) -> Any)
-                                #:optional])
-         [enable (Any -> Void)]
-         [get-frame (-> (U (Instance Frame%) 'root))]
-         [is-enabled? (-> Boolean)]))
-
-(define-type Menu-Item<%>
-  (Class [delete (-> Void)]
-         [get-parent (-> (U (Instance Menu%) (Instance Popup-Menu%)
-                            (Instance Menu-Bar%)))]
-         [is-deleted? (-> Boolean)]
-         [restore (-> Void)]))
-
-(define-type Separator-Menu-Item%
-  (Class #:implements Menu-Item<%>
-         (init [parent (U (Instance Menu%) (Instance Popup-Menu%))
-                       #:optional])))
-
-(define-type Labelled-Menu-Item<%>
-  (Class #:implements Menu-Item<%>
-         [enable (Any -> Void)]
-         [get-help-string (-> (Option String))]
-         [get-label (-> String)]
-         [get-plain-label (-> String)]
-         [is-enabled? (-> Boolean)]
-         [on-demand (-> Void)]
-         [set-help-string ((Option String) -> Void)]
-         [set-label (String -> Void)]))
-
-(define-type Selectable-Menu-Item<%>
-  (Class #:implements Labelled-Menu-Item<%>
-         [command ((Instance Control-Event%) -> Void)]
-         [get-shortcut (-> (U Char Symbol #f))]
-         [get-shortcut-prefix
-          (-> (Listof (U 'alt 'cmd 'meta 'ctl 'shift 'option)))]
-         [set-shortcut ((U Char Symbol #f) -> Void)]
-         [set-shortcut-prefix
-          ((Listof (U 'alt 'cmd 'meta 'ctl 'shift 'option)) -> Void)]))
-
-(define-type Checkable-Menu-Item%
-  (Class #:implements Selectable-Menu-Item<%>
-         (init [label String]
-               [parent (U (Instance Menu%) (Instance Popup-Menu%))]
-               [callback ((Instance Checkable-Menu-Item%) (Instance Control-Event%)
-                          -> Any)]
-               [shortcut (U Char Symbol #f) #:optional]
-               [help-string (Option String) #:optional]
-               [demand-callback
-                ((Instance Checkable-Menu-Item%) -> Any)
-                #:optional]
-               [shortcut-prefix (Listof (U 'alt 'cmd 'meta 'ctl
-                                           'shift 'option))
-                                #:optional])
-         [check (Any -> Void)]
-         [is-checked? (-> Boolean)]))
-
-(define-type Menu-Item-Container<%>
-  (Class [get-items (-> (Listof (Instance Menu-Item<%>)))]
-         [on-demand (-> Void)]))
-
-(define-type Menu-Item%
-  (Class #:implements Selectable-Menu-Item<%>
-         (init [label String]
-               [parent (U (Instance Menu%) (Instance Popup-Menu%))]
-               [callback ((Instance Menu-Item%) (Instance Control-Event%)
-                          -> Any)]
-               [shortcut (U Char Symbol #f) #:optional]
-               [help-string (Option String) #:optional]
-               [demand-callback
-                ((Instance Menu-Item%) -> Any)
-                #:optional]
-               [shortcut-prefix (Listof (U 'alt 'cmd 'meta 'ctl
-                                           'shift 'option))
-                                #:optional])))
-
-(define-type Popup-Menu%
-  (Class #:implements Menu-Item-Container<%>
-         (init [title (Option String) #:optional]
-               [popdown-callback
-                ((Instance Popup-Menu%) (Instance Control-Event%) -> Any)
-                #:optional]
-               [demand-callback (Any -> Any) #:optional]
-               [font (Instance Font%) #:optional])
-         [get-font (-> (Instance Font%))]
-         [get-popup-target (-> (Option (U (Instance Window<%>)
-                                          (Instance Editor<%>))))]
-         [set-min-width (Natural -> Void)]))
-
-(define-type Clipboard-Client%
-  (Class [add-type (String -> Void)]
-         [get-data (String -> (U Bytes String #f))]
-         [get-types (-> (Listof String))]
-         [on-replaced (-> Void)]))
-
-(define-type Clipboard<%>
-  (Class [get-clipboard-bitmap (Integer -> (Option (Instance Bitmap%)))]
-         [get-clipboard-data (String Integer -> (U Bytes String #f))]
-         [get-clipboard-string (Integer -> String)]
-         [same-clipboard-client?
-          ((Instance Clipboard-Client%) -> Boolean)]
-         [set-clipboard-bitmap
-          ((Instance Bitmap%) Integer -> Void)]
-         [set-clipboard-client
-          ((Instance Clipboard-Client%) Integer -> Void)]
-         [set-clipboard-string
-          (String Integer -> Void)]))
-
-(define-type Control-Event-Type
-  (U 'button 'check-box 'choice
-     'list-box 'list-box-dclick 'list-box-column
-     'text-field 'text-field-enter
-     'menu 'slider 'radio-box 'tab-panel
-     'menu-popdown 'menu-popdown-none))
-
-(define-type Event%
-  (Class (init [time-stamp Integer #:optional])
-         [get-time-stamp (-> Integer)]
-         [set-time-stamp (Integer -> Void)]))
-
-(define-type Control-Event%
-  (Class #:implements Event%
-         (init [event-type Control-Event-Type]
-               [time-stamp Integer #:optional])
-         [get-event-type (-> Control-Event-Type)]
-         [set-event-type (Control-Event-Type -> Void)]))
-
-(define-type Column-Control-Event%
-  (Class #:implements Control-Event%
-         (init [column Integer]
-               [event-type 'list-box-column]
-               [time-stamp Integer #:optional])
-         [get-column (-> Natural)]
-         [set-column (Integer -> Void)]))
-
-(define-type Key-Event%
-  (Class #:implements Event%
-         (init [key-code (U Char Symbol) #:optional]
-               [x Integer #:optional]
-               [y Integer #:optional]
-               [shift-down Any #:optional]
-               [control-down Any #:optional]
-               [meta-down Any #:optional]
-               [alt-down Any #:optional]
-               [time-stamp Integer #:optional]
-               [caps-down Any #:optional])
-         [get-alt-down (-> Boolean)]
-         [get-caps-down (-> Boolean)]
-         [get-control-down (-> Boolean)]
-         [get-key-code (-> (U Char Symbol))]
-         [get-key-release-code (-> (U Char Symbol))]
-         [get-meta-down (-> Boolean)]
-         [get-other-altgr-key-code (-> (Option (U Char Symbol)))]
-         [get-other-caps-key-code (-> (Option (U Char Symbol)))]
-         [get-other-shift-key-code (-> (Option (U Char Symbol)))]
-         [get-shift-down (-> Boolean)]
-         [get-x (-> Integer)]
-         [get-y (-> Integer)]
-         [set-alt-down (Any -> Void)]
-         [set-caps-down (Any -> Void)]
-         [set-control-down (Any -> Void)]
-         [set-key-code ((U Char Symbol) -> Void)]
-         [set-key-release-code ((U Char Symbol) -> Void)]
-         [set-meta-down (Any -> Void)]
-         [set-other-altgr-key-code ((U Char Symbol False) -> Void)]
-         [set-other-caps-key-code ((U Char Symbol False) -> Void)]
-         [set-other-shift-key-code ((U Char Symbol False) -> Void)]
-         [set-shift-down (Any -> Void)]
-         [set-x (Integer -> Void)]
-         [set-y (Integer -> Void)]))
-
-(define-type Mouse-Event%
-  (Class #:implements Event%
-         (init [event-type (U 'enter 'leave 'left-down 'left-up
-                              'middle-down 'middle-up
-                              'right-down 'right-up 'motion)]
-               [left-down Any #:optional]
-               [middle-down Any #:optional]
-               [right-down Any #:optional]
-               [x Integer #:optional]
-               [y Integer #:optional]
-               [shift-down Any #:optional]
-               [control-down Any #:optional]
-               [meta-down Any #:optional]
-               [alt-down Any #:optional]
-               [time-stamp Integer #:optional]
-               [caps-down Any #:optional])
-         [button-changed? (case-> (-> Boolean)
-                                  ((U 'left 'middle 'right 'any) -> Boolean))]
-         [button-down? (case-> (-> Boolean)
-                               ((U 'left 'middle 'right 'any) -> Boolean))]
-         [button-up? (case-> (-> Boolean)
-                             ((U 'left 'middle 'right 'any) -> Boolean))]
-         [dragging? (-> Boolean)]
-         [entering? (-> Boolean)]
-         [get-event-type (-> (U 'enter 'leave 'left-down 'left-up
-                                'middle-down 'middle-up
-                                'right-down 'right-up 'motion))]
-         [get-alt-down (-> Boolean)]
-         [get-caps-down (-> Boolean)]
-         [get-control-down (-> Boolean)]
-         [get-left-down (-> Boolean)]
-         [get-meta-down (-> Boolean)]
-         [get-middle-down (-> Boolean)]
-         [get-right-down (-> Boolean)]
-         [get-shift-down (-> Boolean)]
-         [get-x (-> Integer)]
-         [get-y (-> Integer)]
-         [leaving? (-> Boolean)]
-         [moving? (-> Boolean)]
-         [set-event-type ((U 'enter 'leave 'left-down 'left-up
-                             'middle-down 'middle-up
-                             'right-down 'right-up 'motion)
-                          ->
-                          Void)]
-         [set-alt-down (Any -> Void)]
-         [set-caps-down (Any -> Void)]
-         [set-control-down (Any -> Void)]
-         [set-left-down (Any -> Void)]
-         [set-meta-down (Any -> Void)]
-         [set-middle-down (Any -> Void)]
-         [set-right-down (Any -> Void)]
-         [set-shift-down (Any -> Void)]
-         [set-x (Integer -> Void)]
-         [set-y (Integer -> Void)]))
-
-(define-type Scroll-Event%
-  (Class #:implements Event%
-         (init [event-type (U 'top 'buttom 'line-up 'line-down
-                              'page-up 'page-down 'thumb)
-                           #:optional]
-               [direction (U 'horizontal 'vertical)
-                          #:optional]
-               [position Integer #:optional]
-               [time-stamp Integer #:optional])
-         [get-direction (-> (U 'horizontal 'vertical))]
-         [get-event-type (-> (U 'top 'buttom 'line-up 'line-down
-                                'page-up 'page-down 'thumb))]
-         [get-position (-> Natural)]
-         [set-direction ((U 'horizontal 'vertical) -> Void)]
-         [set-event-type ((U 'top 'buttom 'line-up 'line-down
-                             'page-up 'page-down 'thumb)
-                          ->
-                          Void)]
-         [set-position (Integer -> Void)]))
-
-(define-type Pane%
-  (Class #:implements Area-Container<%>
-         #:implements Subarea<%>
-         (init [parent (U (Instance Frame%) (Instance Dialog%)
-                          (Instance Panel%) (Instance Pane%))]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])))
-
-(define-type Grow-Box-Spacer-Pane%
-  (Class #:implements Pane%
-          (init [parent (Instance Area-Container<%>)] ; FIXME
-                [vert-margin Natural #:optional]
-                [horiz-margin Natural #:optional]
-                [border Natural #:optional]
-                [spacing Natural #:optional]
-                [alignment (List (U 'left 'center 'right)
-                                 (U 'top 'center 'bottom))
-                           #:optional]
-                [min-width (Option Natural) #:optional]
-                [min-height (Option Natural) #:optional]
-                [stretchable-width Any #:optional]
-                [stretchable-height Any #:optional])))
-
-(define-type Horizontal-Pane%
-  (Class #:implements Pane%
-         (init [parent (Instance Area-Container<%>)] ; FIXME
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])))
-
-(define-type Vertical-Pane%
-  (Class #:implements Pane%
-         (init [parent (Instance Area-Container<%>)] ; FIXME
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])))
-
-(define-type Panel%
-  (Class #:implements Area-Container-Window<%>
-         #:implements Subwindow<%>
-         (init [parent (Instance Area-Container<%>)] ; FIXME
-               [style (Listof (U 'border 'deleted
-                                 'hscroll 'auto-hscroll
-                                 'vscroll 'auto-vscroll))
-                      #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])))
-
-(define-type Horizontal-Panel%
-  (Class #:implements Panel%
-         (init [parent (Instance Area-Container<%>)] ; FIXME
-               [style (Listof (U 'border 'deleted
-                                 'hscroll 'auto-hscroll
-                                 'vscroll 'auto-vscroll))
-                      #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [set-orientation (Boolean -> Void)]
-         [get-orientation (-> Boolean)]))
-
-(define-type Vertical-Panel%
-  (Class #:implements Panel%
-         (init [parent (Instance Area-Container<%>)] ; FIXME
-               [style (Listof (U 'border 'deleted
-                                 'hscroll 'auto-hscroll
-                                 'vscroll 'auto-vscroll))
-                      #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [set-orientation (Boolean -> Void)]
-         [get-orientation (-> Boolean)]))
-
-(define-type Group-Box-Panel%
-  (Class #:implements Vertical-Panel%
-         (init [label String]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [style (Listof 'deleted) #:optional]
-               [font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])))
-
-(define-type Tab-Panel%
-  (Class #:implements Vertical-Panel%
-         (init [choices (Listof String)]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [callback
-                ((Instance Tab-Panel%) (Instance Control-Event%)
-                 -> Any)
-                #:optional]
-               [style (Listof (U 'no-border 'deleted))
-                      #:optional]
-               [font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [append (String -> Void)]
-         [delete (Integer -> Void)]
-         [get-item-label (Integer -> String)]
-         [get-number (-> Natural)]
-         [get-selection (-> (Option Natural))]
-         [set ((Listof String) -> Void)]
-         [set-item-label (Integer String -> Void)]
-         [set-selection (Integer -> Void)]))
-
-(define-type Control<%>
-  (Class #:implements Subwindow<%>
-         [command ((Instance Control-Event%) -> Void)]))
-
-(define-type List-Control<%>
-  (Class #:implements Control<%>
-         [append (String -> Void)]
-         [clear (-> Void)]
-         [delete (Integer -> Void)]
-         [find-string (String -> (Option Natural))]
-         [get-number (-> Natural)]
-         [get-selection (-> (Option Natural))]
-         [get-string (Integer -> String)]
-         [get-string-selection (-> (Option String))]
-         [set-selection (Integer -> Void)]
-         [set-string-selection (String -> Void)]))
-
-(define-type Message%
-  (Class #:implements Control<%>
-         (init [label (U String (Instance Bitmap%)
-                         (U 'app 'caution 'stop))]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [style (Listof 'deleted) #:optional]
-               [font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-                 [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [border Natural #:optional]
-               [spacing Natural #:optional]
-               [alignment (List (U 'left 'center 'right)
-                                (U 'top 'center 'bottom))
-                          #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional]
-               [auto-resize Any #:optional])
-         [set-label ((U String (Instance Bitmap%)) -> Void)]
-         [auto-resize (case-> (-> Boolean)
-                              (Any -> Void))]))
-
-(define-type Editor-Canvas%
-  (Class #:implements Canvas<%>
-         (init [parent (Instance Area-Container<%>)] ; FIXME
-               [editor (U (Instance Pasteboard%) (Instance Text%) #f) #:optional]
-               [style (Listof (U 'no-border 'control-border 'combo
-                                 'no-hscroll 'no-vscroll
-                                 'hide-hscroll 'hide-vscroll
-                                 'auto-vscoll 'auto-hscroll
-                                 'resize-corner 'no-focus 'deleted
-                                 'transparent))
-                      #:optional]
-               [scrolls-per-page Positive-Integer #:optional]
-               [label (Option String) #:optional]
-               [wheel-step (Option Positive-Integer) #:optional]
-               [line-count (Option Positive-Integer) #:optional]
-               [horizontal-inset Natural #:optional]
-               [vertical-inset Natural #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])
-         [allow-scroll-to-last
-          (case-> (-> Boolean) (Any -> Void))]
-         [allow-tab-exit
-          (case-> (-> Boolean) (Any -> Void))]
-         [call-as-primary-owner ((-> Any) -> Any)]
-         [force-display-focus
-          (case-> (-> Boolean) (Any -> Void))]
-         [get-editor (-> (Option (U (Instance Text%) (Instance Pasteboard%))))]
-         [get-line-count (-> (Option Positive-Integer))]
-         [horizontal-inset
-          (case-> (-> Positive-Integer)
-                  (Positive-Integer -> Void))]
-         [lazy-refresh
-          (case-> (-> Boolean) (Any -> Void))]
-         [on-char ((Instance Key-Event%) -> Void)]
-         [on-event ((Instance Mouse-Event%) -> Void)]
-         [on-focus (Any -> Void)]
-         [on-paint (-> Void)]
-         [on-size (Natural Natural -> Void)]
-         [scroll-to
-          (case-> (Real Real
-                   Nonnegative-Real Nonnegative-Real
-                   Any -> Boolean)
-                  (Real Real
-                   Nonnegative-Real Nonnegative-Real
-                   Any (U 'start 'end 'none) -> Boolean))]
-         [scroll-with-bottom-base
-          (case-> (-> Boolean) (Any -> Void))]
-         [set-editor
-          (case-> ((Option (U (Instance Text%) (Instance Pasteboard%))) -> Void)
-                  ((Option (U (Instance Text%) (Instance Pasteboard%))) Any -> Void))]
-         [set-line-count ((U #f Positive-Integer) -> Void)]
-         [vertical-inset
-          (case-> (-> Positive-Integer)
-                  (Positive-Integer -> Void))]
-         [wheel-step
-          (case-> (-> (Option Positive-Integer))
-                  ((Option Positive-Integer) -> Void))]))
-
-(define-type Timer%
-  (Class (init [notify-callback (-> Any) #:optional]
-               [interval (Option Integer) #:optional]
-               [just-once? Any #:optional])
-         [interval (-> (Option Natural))]
-         [notify (-> Void)]
-         [start (case-> (Integer -> Void)
-                        (Integer Any -> Void))]
-         [stop (-> Void)]))
-
-(define-type Text%
-  (Class #:implements Editor<%>
-         (init [line-spacing Nonnegative-Real #:optional]
-               [tab-stops (Listof Real) #:optional]
-               [auto-wrap Any #:optional])
-         [after-change-style (Integer Integer -> Void)]
-         [after-delete (Integer Integer -> Void)]
-         [after-insert (Integer Integer -> Void)]
-         [after-merge-snips (Integer -> Void)]
-         [after-set-position (-> Void)]
-         [after-set-size-constraint (-> Void)]
-         [after-split-snip (Integer -> Void)]
-         [call-clickback (Integer Integer -> Void)]
-         [can-change-style? (Integer Integer -> Boolean)]
-         [can-delete? (Integer Integer -> Boolean)]
-         [can-insert? (Integer Integer -> Boolean)]
-         [can-set-size-constraint? (-> Boolean)]
-         [caret-hidden? (-> Boolean)]
-         [change-style
-          (case-> ((U #f (Instance Style-Delta%) (Instance Style<%>)) -> Void)
-                  ((U #f (Instance Style-Delta%) (Instance Style<%>))
-                   (U Integer 'start) -> Void)
-                  ((U #f (Instance Style-Delta%) (Instance Style<%>))
-                   (U Integer 'start) (U Integer 'end) -> Void)
-                  ((U #f (Instance Style-Delta%) (Instance Style<%>))
-                   (U Integer 'start) (U Integer 'end) Any -> Void))]
-         [copy
-          (case-> (-> Void)
-                  (Any -> Void)
-                  (Any Integer -> Void)
-                  (Any Integer (U Integer 'start) -> Void)
-                  (Any Integer (U Integer 'start) (U Integer 'end) -> Void))]
-         [copy-self-to ((U (Instance Text%) (Instance Pasteboard%)) -> Void)]
-         [cut
-          (case-> (-> Void)
-                  (Any -> Void)
-                  (Any Integer -> Void)
-                  (Any Integer (U Integer 'start) -> Void)
-                  (Any Integer (U Integer 'start) (U Integer 'end) -> Void))]
-         [delete
-          (case-> (-> Void)
-                  ((U Integer 'start) -> Void)
-                  ((U Integer 'start) (U Integer 'back) -> Void)
-                  ((U Integer 'start) (U Integer 'back) Any -> Void))]
-         [do-copy (Integer Integer Integer Any -> Void)]
-         [do-paste (Integer Integer -> Void)]
-         [do-paste-x-selection (Integer Integer -> Void)]
-         [erase (-> Void)]
-         [extend-position (Integer -> Void)]
-         [find-line
-          (case-> (Real -> Natural) (Real (Option (Boxof Any)) -> Void))]
-         [find-newline
-          (case-> (-> (Option Natural))
-                  ((U 'forward 'backward) -> (Option Natural))
-                  ((U 'forward 'backward) (U Integer 'start) -> (Option Natural))
-                  ((U 'forward 'backward) (U Integer 'start) (U Integer 'eof) -> (Option Natural)))]
-         [find-next-non-string-snip ((Option (Instance Snip%)) -> (Option (Instance Snip%)))]
-         [find-position
-          (case-> (Real Real -> Natural)
-                  (Real Real (Option (Boxof Any)) -> Void)
-                  (Real Real (Option (Boxof Any)) (Option (Boxof Any)) -> Void)
-                  (Real Real (Option (Boxof Any))
-                   (Option (Boxof Any)) (Option (Boxof Any)) -> Void))]
-         [find-position-in-line
-          (case-> (Integer Real -> Natural)
-                  (Integer Real (Option (Boxof Any)) -> Void)
-                  (Integer Real (Option (Boxof Any)) (Option (Boxof Any)) -> Void)
-                  (Integer Real (Option (Boxof Any))
-                   (Option (Boxof Any)) (Option (Boxof Any)) -> Void))]
-         [find-snip
-          (case-> (Integer (U 'before-or-none 'before 'after 'after-or-none)
-                   -> (Option (Instance Snip%)))
-                  (Integer (U 'before-or-none 'before 'after 'after-or-none)
-                   (Option (Boxof Natural)) -> (Option (Instance Snip%))))]
-         [find-string
-          (case-> (String -> (Option Natural))
-                  (String (U 'forward 'backward) -> (Option Natural))
-                  (String (U 'forward 'backward) (U Integer 'start) -> (Option Natural))
-                  (String (U 'forward 'backward) (U Integer 'start)
-                   (U Integer 'eof) -> (Option Natural))
-                  (String (U 'forward 'backward) (U Integer 'start)
-                   (U Integer 'eof) Any -> (Option Natural))
-                  (String (U 'forward 'backward) (U Integer 'start)
-                   (U Integer 'eof) Any Any -> (Option Natural)))]
-         [find-string-all
-          (case-> (String -> (Listof Natural))
-                  (String (U 'forward 'backward) -> (Listof Natural))
-                  (String (U 'forward 'backward) (U Integer 'start) -> (Listof Natural))
-                  (String (U 'forward 'backward) (U Integer 'start)
-                   (U Integer 'eof) -> (Listof Natural))
-                  (String (U 'forward 'backward) (U Integer 'start)
-                   (U Integer 'eof) Any -> (Listof Natural))
-                  (String (U 'forward 'backward) (U Integer 'start)
-                   (U Integer 'eof) Any Any -> (Listof Natural)))]
-         [find-wordbreak ((Option (Boxof Integer)) (Option (Boxof Integer))
-                          (U 'caret 'line 'selection 'user1 'user2) -> Void)]
-         [flash-off (-> Void)]
-         [flash-on
-          (case-> (Integer Integer -> Void)
-                  (Integer Integer Any -> Void)
-                  (Integer Integer Any Any -> Void)
-                  (Integer Integer Any Any Integer -> Void))]
-         [get-anchor (-> Boolean)]
-         [get-between-threshold (-> Nonnegative-Real)]
-         [get-character (Integer -> Char)]
-         [get-end-position (-> Natural)]
-         [get-extend-start-position (-> Natural)]
-         [get-extend-end-position (-> Natural)]
-         [get-file-format (-> (U 'standard 'text 'text-force-cr))]
-         [get-line-spacing (-> Nonnegative-Real)]
-         [get-overwrite-mode (-> Boolean)]
-         [get-padding (-> (Values Nonnegative-Real Nonnegative-Real
-                                  Nonnegative-Real Nonnegative-Real))]
-         [get-position
-          (case-> ((Option (Boxof Integer)) -> Void)
-                  ((Option (Boxof Integer)) (Option (Boxof Integer)) -> Void))]
-         [get-region-data (Integer Integer -> (Option Editor-Data%))]
-         [get-revision-number (-> Nonnegative-Real)]
-         [get-snip-position ((Instance Snip%) -> (Option Natural))]
-         #| FIXME: final
-         [get-snip-position-and-location
-          (case->
-           ((Instance Snip%) (Option (Boxof Integer)) -> (Option Natural))
-           ((Instance Snip%) (Option (Boxof Integer))
-            (Option (Boxof Real)) -> (Option Natural))
-           ((Instance Snip%) (Option (Boxof Integer))
-            (Option (Boxof Real)) (Option (Boxof Real)) -> (Option Natural)))]
-         |#
-         [get-start-position (-> Natural)]
-         [get-styles-sticky (-> Boolean)]
-         [get-tabs
-          (case-> (-> (Listof Real))
-                  ((Option (Boxof Integer)) -> (Listof Real))
-                  ((Option (Boxof Integer)) (Option (Boxof Real)) -> (Listof Real))
-                  ((Option (Boxof Integer)) (Option (Boxof Real))
-                   (Option (Boxof Any)) -> (Listof Real)))]
-         [get-text (Integer (U Integer 'eof) -> String)]
-         [get-top-line-base (-> Nonnegative-Real)]
-         [get-visible-line-range
-          (case-> ((Option (Boxof Integer)) (Option (Boxof Real)) -> Void)
-                  ((Option (Boxof Integer)) (Option (Boxof Real)) Any -> Void))]
-         [get-visible-position-range
-          (case-> ((Option (Boxof Integer)) (Option (Boxof Real)) -> Void)
-                  ((Option (Boxof Integer)) (Option (Boxof Real)) Any -> Void))]
-         #| FIXME
-         [get-wordbreak-map (-> (Option (Instance Editor-Wordbreak-Map%)))]
-         |#
-         [hide-caret (-> Any Void)]
-         [insert
-          (case->
-           ;; collapsed cases for contract generation
-           ((U Char String (Instance Snip%)) -> Void)
-           ((U Char String Integer (Instance Snip%))
-            (U String Integer) -> Void)
-           ((U Char String Integer (Instance Snip%))
-            (U String Integer)
-            (U Integer 'same)
-            -> Void)
-           ((U String Integer (Instance Snip%))
-            (U String Integer)
-            (U Integer 'same)
-            Any
-            -> Void)
-           (Integer String Integer (U Integer 'same) Any -> Void))]
-         [kill (case-> (-> Void)
-                       (Integer -> Void)
-                       (Integer Integer Integer -> Void))]
-         [last-line (-> Natural)]
-         [last-paragraph (-> Natural)]
-         [last-position (-> Natural)]
-         [line-end-position (case-> (Integer -> Integer) (Integer Any -> Integer))]
-         [line-length (Integer -> Natural)]
-         [line-location (case-> (Integer -> Integer) (Integer Any -> Integer))]
-         [line-paragraph (Integer -> Natural)]
-         [line-start-position (case-> (Integer -> Integer) (Integer Any -> Integer))]
-         [move-position
-          (case-> ((U 'home 'end 'right 'left 'up 'down) -> Void)
-                  ((U 'home 'end 'right 'left 'up 'down) Any -> Void)
-                  ((U 'home 'end 'right 'left 'up 'down) Any
-                   (U 'simple 'word 'page 'line) -> Void))]
-         [on-change-style (Integer Integer -> Void)]
-         [on-default-char ((Instance Key-Event%) -> Void)]
-         [on-default-event ((Instance Mouse-Event%) -> Void)]
-         [on-delete (Integer Integer -> Void)]
-         [on-insert (Integer Integer -> Void)]
-         [on-new-string-snip (-> (Instance String-Snip%))]
-         #| FIXME
-         [on-new-tab-snip (-> (Instance Tab-Snip%))]
-         |#
-         [on-reflow (-> Void)]
-         [on-set-size-constraint (-> Void)]
-         [paragraph-end-line (Integer -> Integer)]
-         [paragraph-end-position
-          (case-> (Integer -> Natural)
-                  (Integer Any -> Natural))]
-         [paragraph-start-line (Integer -> Integer)]
-         [paragraph-start-position
-          (case-> (Integer -> Natural)
-                  (Integer Any -> Natural))]
-         [paste
-          (case-> (-> Void)
-                  (Integer -> Void)
-                  (Integer (U Integer 'start 'end) -> Void)
-                  (Integer (U Integer 'start 'end) (U Integer 'same) -> Void))]
-         [paste-next (-> Void)]
-         [paste-x-selection
-          (case-> (-> Void)
-                  (Integer -> Void)
-                  (Integer (U Integer 'start 'end) -> Void)
-                  (Integer (U Integer 'start 'end) (U Integer 'same) -> Void))]
-         [position-line (case-> (Integer -> Integer) (Integer Any -> Integer))]
-         [position-location
-          (case-> (Integer -> Integer)
-                  (Integer (Option (Boxof Real)) -> Integer)
-                  (Integer (Option (Boxof Real)) (Option (Boxof Real)) -> Integer)
-                  (Integer (Option (Boxof Real)) (Option (Boxof Real))
-                   Any -> Integer)
-                  (Integer (Option (Boxof Real)) (Option (Boxof Real))
-                   Any Any -> Integer)
-                  (Integer (Option (Boxof Real)) (Option (Boxof Real))
-                   Any Any Any -> Integer))]
-         [position-locations
-          (case-> (Integer -> Integer)
-                  (Integer (Option (Boxof Real)) -> Integer)
-                  (Integer (Option (Boxof Real)) (Option (Boxof Real)) -> Integer)
-                  (Integer (Option (Boxof Real)) (Option (Boxof Real))
-                   (Option (Boxof Real)) -> Integer)
-                  (Integer (Option (Boxof Real)) (Option (Boxof Real))
-                   (Option (Boxof Real)) (Option (Boxof Real)) -> Integer)
-                  (Integer (Option (Boxof Real)) (Option (Boxof Real))
-                   (Option (Boxof Real)) (Option (Boxof Real)) Any -> Integer)
-                  (Integer (Option (Boxof Real)) (Option (Boxof Real))
-                   (Option (Boxof Real)) (Option (Boxof Real)) Any Any -> Integer))]
-         [position-paragraph (case-> (Integer -> Integer) (Integer Any -> Integer))]
-         [read-from-file
-          (case-> ((Instance Editor-Stream-In%) -> Boolean)
-                  ((Instance Editor-Stream-In%) Any -> Boolean)
-                  ((Instance Editor-Stream-In%) (U Integer 'start) Any -> Boolean))]
-         [remove-clickback (Integer Integer -> Void)]
-         [scroll-to-position
-          (case-> (Integer -> Boolean)
-                  (Integer Any -> Boolean)
-                  (Integer Any (U Integer 'same) -> Boolean)
-                  (Integer Any (U Integer 'same) (U 'start 'end 'none) -> Boolean))]
-         [set-anchor (Any -> Void)]
-         [set-autowrap-bitmap ((Option (Instance Bitmap%)) -> (Option (Instance Bitmap%)))]
-         [set-between-threshold (Real -> Void)]
-         [set-clickback
-          (case-> (Integer Integer ((Instance Text%) Natural Natural -> Any) -> Void)
-                  (Integer Integer ((Instance Text%) Natural Natural -> Any)
-                   (Option (Instance Style-Delta%)) -> Void)
-                  (Integer Integer ((Instance Text%) Natural Natural -> Any)
-                   (Option (Instance Style-Delta%)) Any -> Void))]
-         [set-file-format ((U 'standard 'text 'text-force-cr) -> Void)]
-         [set-line-spacing (Real -> Void)]
-         [set-overwrite-mode (Any -> Void)]
-         [set-padding (Real Real Real Real -> Void)]
-         [set-paragraph-alignment (Integer (U 'left 'center 'right) -> Void)]
-         [set-paragraph-margins (Integer Real Real Real -> Void)]
-         [set-position
-          (case-> (Integer -> Void)
-                  (Integer (U Integer 'same) -> Void)
-                  (Integer (U Integer 'same) Any -> Void)
-                  (Integer (U Integer 'same) Any Any -> Void)
-                  (Integer (U Integer 'same) Any Any (U 'default 'x 'local) -> Void))]
-         [set-position-bias-scroll
-          (case-> ((U 'start-only 'start 'none 'end 'end-only)
-                   Integer -> Void)
-                  ((U 'start-only 'start 'none 'end 'end-only)
-                   Integer (U Integer 'same) -> Void)
-                  ((U 'start-only 'start 'none 'end 'end-only)
-                   Integer (U Integer 'same) Any -> Void)
-                  ((U 'start-only 'start 'none 'end 'end-only)
-                   Integer (U Integer 'same) Any Any -> Void)
-                  ((U 'start-only 'start 'none 'end 'end-only)
-                   Integer (U Integer 'same) Any Any (U 'default 'x 'local) -> Void))]
-         [set-region-data (Integer Integer (Instance Editor-Data%) -> Void)]
-         [set-styles-sticky (Any -> Void)]
-         [set-tabs (case-> ((Listof Real) -> Void)
-                           ((Listof Real) Real -> Void)
-                           ((Listof Real) Real Any -> Void))]
-         [set-wordbreak-func
-          (((Instance Text%) (Option (Boxof Natural)) (Option (Boxof Natural))
-            Symbol -> Any)
-           -> Void)]
-         #| FIXME
-         [set-wordbreak-map ((Option (Instance Editor-Wordbreak-Map%)) -> Void)]
-         |#
-         [split-snip (Integer -> Void)]
-         [write-to-file
-          (case-> ((Instance Editor-Stream-Out%) -> Boolean)
-                  ((Instance Editor-Stream-Out%) Integer -> Boolean)
-                  ((Instance Editor-Stream-Out%) Integer (U Integer 'eof) -> Boolean))]
-         (augment
-          [after-change-style (Integer Integer -> Void)]
-          [after-delete (Integer Integer -> Void)]
-          [after-insert (Integer Integer -> Void)]
-          [after-merge-snips (Integer -> Void)]
-          [after-set-position (-> Void)]
-          [after-set-size-constraint (-> Void)]
-          [after-split-snip (Integer -> Void)]
-          [can-change-style? (Integer Integer -> Boolean)]
-          [can-delete? (Integer Integer -> Boolean)]
-          [can-insert? (Integer Integer -> Boolean)]
-          [can-set-size-constraint? (-> Boolean)]
-          [on-change-style (Integer Integer -> Void)]
-          [on-delete (Integer Integer -> Void)]
-          [on-insert (Integer Integer -> Void)]
-          [on-reflow (-> Void)]
-          [on-set-size-constraint (-> Void)])))
-
-(define-type Button%
-  (Class #:implements Control<%>
-         (init [label (U String (Instance Bitmap%)
-                         (List (Instance Bitmap%) String
-                               (U 'left 'top 'right 'bottom)))]
-               [parent (Instance Area-Container<%>)] ; FIXME
-               [callback ((Instance Button%) (Instance Control-Event%) -> Any)
-                         #:optional]
-               [style (Listof (U 'border 'deleted)) #:optional]
-               [font (Instance Font%) #:optional]
-               [enabled Any #:optional]
-               [vert-margin Natural #:optional]
-               [horiz-margin Natural #:optional]
-               [min-width (Option Natural) #:optional]
-               [min-height (Option Natural) #:optional]
-               [stretchable-width Any #:optional]
-               [stretchable-height Any #:optional])))
-
-(define-type Printer-DC%
-  (Class #:implements DC<%>
-         (init [parent (U (Instance Frame%) (Instance Dialog%)
-                          #f)
-                       #:optional])))
-
-;; editor classes
-
-(provide Editor<%>
-         Editor-Admin%
-         Editor-Canvas%
-         Editor-Data%
-         Editor-Data-Class%
-         Editor-Stream-In%
-         Editor-Stream-Out%
-         Editor-Stream-In-Base%
-         Editor-Stream-Out-Base%
-         Keymap%
-         Pasteboard%
-         Text%)
-
-(define-type Edit-Operation
-  (U 'undo 'redo 'clear 'cut 'copy 'paste
-     'kill 'select-all 'insert-text-box
-     'insert-pasteboard-box 'insert-image))
-
-(define-type Load/Save-Format
-  (U 'guess 'same 'copy 'standard 'text 'text-force-cr))
-
-(define-type Editor<%>
-  (Class [add-canvas ((Instance Editor-Canvas%) -> Void)]
-         [add-undo ((-> Any) -> Void)]
-         [adjust-cursor
-          ((Instance Mouse-Event%) -> (Option (Instance Cursor%)))]
-         [after-edit-sequence (-> Void)]
-         [after-load-file (Any -> Void)]
-         [after-save-file (Any -> Void)]
-         [auto-wrap
-          (case-> (-> Boolean) (Any -> Void))]
-         [begin-edit-sequence
-          (case-> (-> Void)
-                  (Any -> Void)
-                  (Any Any -> Void))]
-         [begin-write-header-footer-to-file
-          ((Instance Editor-Stream-Out%) String (Boxof Integer) -> Void)]
-         [blink-caret (-> Void)]
-         [can-do-edit-operation?
-          (case-> (Edit-Operation -> Boolean)
-                  (Edit-Operation Any -> Boolean))]
-         [can-load-file? (Path Load/Save-Format -> Boolean)]
-         [can-save-file? (Path Load/Save-Format -> Boolean)]
-         [clear (-> Void)]
-         [clear-undos (-> Void)]
-         [copy (case-> (-> Void) (Any -> Void) (Any Integer -> Void))]
-         [copy-self (-> (U (Instance Text%) (Instance Pasteboard%)))]
-         [copy-self-to
-          ((U (Instance Text%) (Instance Pasteboard%)) -> Void)]
-         [cut (case-> (-> Void) (Any -> Void) (Any Integer -> Void))]
-         [dc-location-to-editor-location (Real Real -> (Values Real Real))]
-         [default-style-name (-> String)]
-         [do-edit-operation
-          (case-> (Edit-Operation -> Void)
-                  (Edit-Operation Any -> Void)
-                  (Edit-Operation Any Integer -> Void))]
-         [editor-location-to-dc-location (Real Real -> (Values Real Real))]
-         [end-edit-sequence (-> Void)]
-         [end-write-header-footer-to-file
-          ((Instance Editor-Stream-Out%) Integer -> Void)]
-         [find-first-snip (-> (Option (Instance Snip%)))]
-         [find-scroll-line (Real -> Natural)]
-         [get-active-canvas (-> (Option (Instance Editor-Canvas%)))]
-         [get-admin (-> (Option (Instance Editor-Admin%)))]
-         [get-canvas (-> (Option (Instance Editor-Canvas%)))]
-         [get-canvases (-> (Listof (Instance Editor-Canvas%)))]
-         [get-dc (-> (Option (Instance DC<%>)))]
-         [get-descent (-> Nonnegative-Real)]
-         [get-extent
-          ((Option (Boxof Real)) (Option (Boxof Real)) -> Void)]
-         [get-file ((Option Path) -> (Option Path-String))]
-         [get-filename
-          ((Option (Boxof Any)) -> (Option Path-String))]
-         [get-flattened-text (-> String)]
-         [get-focus-snip (-> (Option (Instance Snip%)))]
-         [get-inactive-caret-threshold (-> (U 'no-caret 'show-inactive-caret 'show-caret))]
-         [get-keymap (-> (Option Keymap%))]
-         [get-load-overwrites-styles (-> Boolean)]
-         [get-max-height (-> (U Nonnegative-Real 'none))]
-         [get-max-undo-history (-> (U Natural 'forever))]
-         [get-max-view-size (-> (Values Real Real))]
-         [get-max-width (-> (U Nonnegative-Real 'none))]
-         [get-min-height (-> (U Nonnegative-Real 'none))]
-         [get-min-width (-> (U Nonnegative-Real 'none))]
-         [get-paste-text-only (-> Boolean)]
-         [get-snip-data ((Instance Snip%) -> (Option (Instance Editor-Data%)))]
-         [get-snip-location
-          (case-> ((Instance Snip%) -> Boolean)
-                  ((Instance Snip%) (Option (Boxof Real)) -> Boolean)
-                  ((Instance Snip%) (Option (Boxof Real))
-                   (Option (Boxof Real)) -> Boolean)
-                  ((Instance Snip%) (Option (Boxof Real))
-                   (Option (Boxof Real)) Any -> Boolean))]
-         [get-space (-> Nonnegative-Real)]
-         [get-style-list (-> (Instance Style-List%))]
-         [get-view-size
-          ((Option (Boxof Real)) (Option (Boxof Real)) -> Void)]
-         [global-to-local
-          ((Option (Boxof Real)) (Option (Boxof Real)) -> Void)]
-         ;; FIXME: finality
-         #|
-         [in-edit-sequence? (-> Boolean)]
-         |#
-         [insert ((Instance Snip%) -> Void)]
-         [insert-box ((U 'text 'pasteboard) -> Void)]
-         [insert-file
-          (case->
-           (Path-String -> Boolean)
-           (Path-String (U 'guess 'same 'copy 'standard
-                           'text 'text-force-cr)
-                        -> Boolean)
-           (Path-String (U 'guess 'same 'copy 'standard
-                           'text 'text-force-cr)
-                        Any -> Boolean))]
-         [insert-image
-          (case->
-           (-> Void)
-           ((Option Path-String) -> Void)
-           ((Option Path-String) (U 'unknown 'unknown/mask 'unknown/alpha
-                                    'gif 'gif/mask 'gif/alpha
-                                    'jpeg 'png 'png/mask 'png/alpha
-                                    'xbm 'xpm 'bmp 'pict)
-            -> Void)
-           ((Option Path-String) (U 'unknown 'unknown/mask 'unknown/alpha
-                                    'gif 'gif/mask 'gif/alpha
-                                    'jpeg 'png 'png/mask 'png/alpha
-                                    'xbm 'xpm 'bmp 'pict)
-            Any -> Void)
-           ((Option Path-String) (U 'unknown 'unknown/mask 'unknown/alpha
-                                    'gif 'gif/mask 'gif/alpha
-                                    'jpeg 'png 'png/mask 'png/alpha
-                                    'xbm 'xpm 'bmp 'pict)
-            Any Any -> Void))]
-         [insert-port
-          (case->
-           (Input-Port -> (U 'standard 'text 'text-force-cr))
-           (Input-Port (U 'guess 'same 'copy 'standard
-                           'text 'text-force-cr)
-                       -> (U 'standard 'text 'text-force-cr))
-           (Input-Port (U 'guess 'same 'copy 'standard
-                           'text 'text-force-cr)
-                       Any -> (U 'standard 'text 'text-force-cr)))]
-         [invalidate-bitmap-cache
-          (case->
-           (Real -> Void)
-           (Real Real -> Void)
-           (Real Real (U Real 'end 'display-end) -> Void)
-           (Real Real (U Real 'end 'display-end) (U Real 'end 'display-end) -> Void))]
-         [is-locked? (-> Boolean)]
-         [is-modified? (-> Boolean)]
-         [is-printing? (-> Boolean)]
-         [kill (case-> (-> Void) (Integer -> Void))]
-         [load-file
-          (case->
-           (-> Boolean)
-           ((Option Path-String) -> Boolean)
-           ((Option Path-String) Load/Save-Format
-            -> Boolean)
-           ((Option Path-String) Load/Save-Format
-            Any -> Boolean))]
-         [local-to-global
-          ((Option (Boxof Real)) (Option (Boxof Real)) -> Void)]
-         [locations-computed? (-> Boolean)]
-         [lock (Any -> Void)]
-         ;; FIXME: we don't handle final methods with contracts
-         #|
-         [locked-for-flow? (-> Boolean)]
-         [locked-for-read? (-> Boolean)]
-         [locked-for-write? (-> Boolean)]
-         |#
-         [needs-update
-          ((Instance Snip%) Real Real Real Real -> Void)]
-         [num-scroll-lines (-> Natural)]
-         [on-change (-> Void)]
-         [on-char ((Instance Key-Event%) -> Void)]
-         [on-default-char ((Instance Key-Event%) -> Void)]
-         [on-default-event ((Instance Mouse-Event%) -> Void)]
-         [on-display-size (-> Void)]
-         [on-display-size-when-ready (-> Void)]
-         [on-edit-sequence (-> Void)]
-         [on-event ((Instance Mouse-Event%) -> Void)]
-         [on-focus (Any -> Void)]
-         [on-load-file (Path Load/Save-Format -> Void)]
-         [on-local-char ((Instance Key-Event%) -> Void)]
-         [on-local-event ((Instance Mouse-Event%) -> Void)]
-         [on-new-box ((U 'text 'pasteboard) -> (Instance Snip%))]
-         [on-new-image-snip
-          (Path (U 'unknown 'unknown/mask 'unknown/alpha
-                   'gif 'gif/mask 'gif/alpha
-                   'jpeg 'png 'png/mask 'png/alpha
-                   'xbm 'xpm 'bmp 'pict)
-                Any Any -> (Instance Snip%))]
-         [on-paint
-          (Any (Instance DC<%>) Real Real Real Real
-               Real Real (U 'no-caret 'show-inactive-caret
-                            'show-caret (Pairof Integer Integer))
-               -> Void)]
-         [on-save-file (Path Load/Save-Format -> Void)]
-         [on-snip-modified ((Instance Snip%) Any -> Void)]
-         [own-caret (Any -> Void)]
-         [paste (case-> (-> Void) (Integer -> Void))]
-         [paste-x-selection (case-> (-> Void) (Integer -> Void))]
-         [print
-          (case-> (-> Void)
-                  (Any -> Void)
-                  (Any Any -> Void)
-                  (Any Any (U 'standard 'postscript 'pdf) -> Void)
-                  (Any Any (U 'standard 'postscript 'pdf)
-                       (U #f (Instance Frame%) (Instance Dialog%))
-                       -> Void)
-                  (Any Any (U 'standard 'postscript 'pdf)
-                       (U #f (Instance Frame%) (Instance Dialog%))
-                       Any
-                       -> Void)
-                  (Any Any (U 'standard 'postscript 'pdf)
-                       (U #f (Instance Frame%) (Instance Dialog%))
-                       Any Any
-                       -> Void))]
-         [print-to-dc
-          (case-> ((Instance DC<%>) -> Void)
-                  ((Instance DC<%>) Integer -> Void))]
-         [put-file ((Option Path) (Option Path) -> (Option Path-String))]
-         [read-footer-from-file
-          ((Instance Editor-Stream-In%) String -> Boolean)]
-         [read-from-file
-          (case->
-           ((Instance Editor-Stream-In%) -> Boolean)
-           ((Instance Editor-Stream-In%) Any -> Boolean))]
-         [read-header-from-file
-          ((Instance Editor-Stream-In%) String -> Boolean)]
-         [redo (-> Void)]
-         [refresh
-          (Real Real Real Real (U 'no-caret 'show-inactive-caret 'show-caret
-                                  (Pairof Integer Integer))
-                (Option (Instance Color%))
-                -> Void)]
-         [refresh-delayed? (-> Boolean)]
-         [release-snip ((Instance Snip%) -> Boolean)]
-         [remove-canvas ((Instance Editor-Canvas%) -> Void)]
-         [resized ((Instance Snip%) Any -> Void)]
-         [save-file
-          (case-> (-> Boolean)
-                  ((Option Path-String) -> Boolean)
-                  ((Option Path-String) Load/Save-Format -> Boolean)
-                  ((Option Path-String) Load/Save-Format Any -> Boolean))]
-         [save-port
-          (case-> (Output-Port -> Boolean)
-                  (Output-Port Load/Save-Format -> Boolean)
-                  (Output-Port Load/Save-Format Any -> Boolean))]
-         [scroll-editor-to
-          (Real Real Real Real Any (U 'start 'end 'none) -> Boolean)]
-         [scroll-line-location (Integer -> Nonnegative-Real)]
-         [scroll-to
-          (case->
-           ((Instance Snip%) Real Real Real Real Any -> Boolean)
-           ((Instance Snip%) Real Real Real Real Any (U 'start 'end 'none)
-            -> Boolean))]
-         [select-all (-> Void)]
-         [set-active-canvas ((Instance Editor-Canvas%) -> Void)]
-         [set-admin ((Option (Instance Editor-Admin%)) -> Void)]
-         [set-caret-owner
-          (case-> ((Option Snip%) -> Void)
-                  ((Option Snip%) (U 'immediate 'display 'global) -> Void))]
-         [set-cursor
-          (case-> ((Option (Instance Cursor%)) -> Void)
-                  ((Option (Instance Cursor%)) Any -> Void))]
-         [set-filename
-          (case-> ((Option Path-String) -> Void)
-                  ((Option Path-String) Any -> Void))]
-         [set-inactive-caret-threshold
-          ((U 'no-caret 'show-inactive-caret 'show-caret) -> Void)]
-         [set-keymap
-          (case-> (-> Void) ((Option Keymap%) -> Void))]
-         [set-load-overwrites-styles (Any -> Void)]
-         [set-max-height ((U Integer 'none) -> Void)]
-         [set-max-undo-history ((U Integer 'forever) -> Void)]
-         [set-max-width ((U Integer 'none) -> Void)]
-         [set-min-height ((U Integer 'none) -> Void)]
-         [set-min-width ((U Integer 'none) -> Void)]
-         [set-modified (Any -> Void)]
-         [set-paste-text-only (Any -> Void)]
-         [set-snip-data ((Instance Snip%) (Instance Editor-Data%) -> Void)]
-         [set-style-list ((Instance Style-List%) -> Void)]
-         [size-cache-invalid (-> Void)]
-         [style-has-changed ((Option (Instance Style<%>)) -> Void)]
-         [undo (-> Void)]
-         [use-file-text-mode (case-> (-> Boolean) (Any -> Void))]
-         [write-footers-to-file ((Instance Editor-Stream-Out%) -> Boolean)]
-         [write-headers-to-file ((Instance Editor-Stream-Out%) -> Boolean)]
-         [write-to-file ((Instance Editor-Stream-Out%) -> Boolean)]
-         (augment [after-edit-sequence (-> Void)]
-                  [after-load-file (Any -> Void)]
-                  [after-save-file (Any -> Void)]
-                  [can-load-file? (Path Load/Save-Format -> Boolean)]
-                  [can-save-file? (Path Load/Save-Format -> Boolean)]
-                  [on-change (-> Void)]
-                  [on-display-size (-> Void)]
-                  [on-edit-sequence (-> Void)]
-                  [on-load-file (Path Load/Save-Format -> Void)]
-                  [on-save-file (Path Load/Save-Format -> Void)]
-                  [on-snip-modified ((Instance Snip%) Any -> Void)])))
-
-(define-type Editor-Admin%
-  (Class [get-dc
-          (case-> (-> (Option (Instance DC<%>)))
-                  ((Option (Boxof Real)) -> (Option (Instance DC<%>)))
-                  ((Option (Boxof Real)) (Option (Boxof Real))
-                   -> (Option (Instance DC<%>))))]
-         [get-max-view
-          (case->
-           ((Option (Boxof Real)) (Option (Boxof Real))
-            (Option (Boxof Real)) (Option (Boxof Real))
-            -> Void)
-           ((Option (Boxof Real)) (Option (Boxof Real))
-            (Option (Boxof Real)) (Option (Boxof Real))
-            Any -> Void))]
-         [get-view
-          (case->
-           ((Option (Boxof Real)) (Option (Boxof Real))
-            (Option (Boxof Real)) (Option (Boxof Real))
-            -> Void)
-           ((Option (Boxof Real)) (Option (Boxof Real))
-            (Option (Boxof Real)) (Option (Boxof Real))
-            Any -> Void))]
-         [grab-caret
-          (case-> (-> Void)
-                  ((U 'immediate 'display 'global) -> Void))]
-         [needs-update (Real Real Real Real -> Void)]
-         [popup-menu ((Instance Popup-Menu%) Real Real -> Boolean)]
-         [refresh-delayed? (-> Boolean)]
-         [resized (Any -> Void)]
-         [scroll-to
-          (case-> (Real Real
-                   Nonnegative-Real Nonnegative-Real
-                   Any -> Boolean)
-                  (Real Real
-                   Nonnegative-Real Nonnegative-Real
-                   Any (U 'start 'end 'none) -> Boolean))]
-         [update-cursor (-> Void)]))
-
-(define-type Editor-Data%
-  (Class [get-dataclass (-> (Option (Instance Editor-Data-Class%)))]
-         [get-next (-> (Option Editor-Data%))]
-         [set-dataclass ((Instance Editor-Data-Class%) -> Void)]
-         [set-next ((Option Editor-Data%) -> Void)]
-         [write ((Instance Editor-Stream-Out%) -> Boolean)]))
-
-(define-type Editor-Data-Class%
-  (Class [get-classname (-> String)]
-         [read ((Option Editor-Stream-In%) -> (Option Editor-Data%))]
-         [set-classname (String -> Void)]))
-
-(define-type Editor-Stream-In-Base%
-  (Class [bad? (-> Boolean)]
-         [read (-> (Vectorof Char) Natural)]
-         [read-bytes (-> Bytes Natural)]
-         [read-byte (-> (U Byte #f))]
-         [seek (-> Integer Void)]
-         [skip (-> Integer Void)]
-         [tell (-> Natural)]))
-
-(define-type Editor-Stream-Out-Base%
-  (Class [bad? (-> Boolean)]
-         [seek (-> Integer Void)]
-         [tell (-> Natural)]
-         [write (-> (Listof Char) Void)]
-         [write-bytes (-> Bytes Void)]))
-
-(define-type Editor-Stream-In%
-  (Class (init-rest (List (Instance Editor-Stream-In-Base%)))
-         [get
-          ((U (Boxof Integer) (Boxof Real)) -> (Instance Editor-Stream-In%))]
-         [get-bytes
-          (case->
-           (-> (Option Bytes))
-           ((Option (Boxof Integer)) -> (Option Bytes)))]
-         [get-exact (-> Integer)]
-         [get-fixed ((Boxof Integer) -> (Instance Editor-Stream-In%))]
-         [get-fixed-exact (-> Integer)]
-         [get-inexact (-> Real)]
-         [get-unterminated-bytes
-          (case->
-           (-> (Option Bytes))
-           ((Option (Boxof Integer)) -> (Option Bytes)))]
-         [jump-to (Integer -> Void)]
-         [ok? (-> Boolean)]
-         [remove-boundary (-> Void)]
-         [set-boundary (Integer -> Void)]
-         [skip (Integer -> Void)]
-         [tell (-> Natural)]))
-
-(define-type Editor-Stream-Out%
-  (Class (init-rest (List (Instance Editor-Stream-Out-Base%)))
-         [jump-to (Integer -> Void)]
-         [ok? (-> Boolean)]
-         [pretty-finish (-> Void)]
-         [pretty-start (-> Void)]
-         [put
-          (case->
-           ((U Bytes Integer Real) -> (Instance Editor-Stream-Out%))
-           (Integer Bytes -> (Instance Editor-Stream-Out%)))]
-         [put-fixed (Integer -> (Instance Editor-Stream-Out%))]
-         [put-unterminated (Bytes -> (Instance Editor-Stream-Out%))]
-         [tell (-> Natural)]))
-
-(define-type Keymap%
-  (Class [add-function (String (Any (Instance Event%) -> Any) -> Void)]
-         [break-sequence (-> Void)]
-         [call-function
-          (case->
-           (String Any (Instance Event%) -> Boolean)
-           (String Any (Instance Event%) Any -> Boolean))]
-         [chain-to-keymap ((Instance Keymap%) Any -> Void)]
-         [get-double-click-interval (-> Natural)]
-         [handle-key-event (Any (Instance Key-Event%) -> Boolean)]
-         [handle-mouse-event (Any (Instance Mouse-Event%) -> Boolean)]
-         [map-function (String String -> Void)]
-         [remove-chained-keymap ((Instance Keymap%) -> Void)]
-         [remove-grab-key-function (-> Void)]
-         [remove-grab-mouse-function (-> Void)]
-         [set-break-sequence-callback ((-> Any) -> Void)]
-         [set-double-click-interval (Integer -> Void)]
-         [set-grab-key-function
-          (((Option String) (Instance Keymap%) Any
-            (Instance Key-Event%) -> Any)
-           -> Void)]
-         [set-grab-mouse-function
-          (((Option String) (Instance Keymap%) Any
-            (Instance Mouse-Event%) -> Any)
-           -> Void)]))
-
-(define-type Pasteboard%
-  (Class #:implements Editor<%>
-         [add-selected
-          (case-> ((Instance Snip%) -> Void)
-                  (Real Real Nonnegative-Real Nonnegative-Real -> Void))]
-         [after-delete ((Instance Snip%) -> Void)]
-         [after-insert
-          ((Instance Snip%) (Option (Instance Snip%)) Real Real -> Void)]
-         [after-interactive-move ((Instance Mouse-Event%) -> Void)]
-         [after-interactive-resize ((Instance Snip%) -> Void)]
-         [after-move-to ((Instance Snip%) Real Real Any -> Void)]
-         [after-reorder ((Instance Snip%) (Instance Snip%) Any -> Boolean)]
-         [after-resize ((Instance Snip%) Real Real Any -> Void)]
-         [after-select ((Instance Snip%) Any -> Void)]
-         [can-delete? ((Instance Snip%) -> Boolean)]
-         [can-insert?
-          ((Instance Snip%) (Option (Instance Snip%)) Real Real -> Boolean)]
-         [can-interactive-move? ((Instance Mouse-Event%) -> Boolean)]
-         [can-interactive-resize? ((Instance Snip%) -> Boolean)]
-         [can-move-to? ((Instance Snip%) Real Real Any -> Boolean)]
-         [can-reorder? ((Instance Snip%) (Instance Snip%) Any -> Boolean)]
-         [can-resize? ((Instance Snip%) Real Real -> Boolean)]
-         [can-select? ((Instance Snip%) Any -> Boolean)]
-         [change-style
-          (case-> (-> Void)
-                  ((U #f (Instance Style-Delta%) (Instance Style<%>)) -> Void)
-                  ((U #f (Instance Style-Delta%) (Instance Style<%>))
-                   (Option (Instance Snip%)) -> Void))]
-         [delete (case-> (-> Void) ((Instance Snip%) -> Void))]
-         [do-copy (Integer Any -> Void)]
-         [do-paste (Integer -> Void)]
-         [do-paste-x-selection (Integer -> Void)]
-         [erase (-> Void)]
-         [find-next-selected-snip
-          ((Option (Instance Snip%)) -> (Option (Instance Snip%)))]
-         [find-snip
-          (case-> (Real Real -> (Option (Instance Snip%)))
-                  (Real Real (Option (Instance Snip%))
-                   -> (Option (Instance Snip%))))]
-         [get-center (-> (Values Real Real))]
-         [get-dragable (-> Boolean)]
-         [get-scroll-step (-> Nonnegative-Real)]
-         [get-selection-visible (-> Boolean)]
-         [insert (case-> ((Instance Snip%) -> Void)
-                         ((Instance Snip%) (Option (Instance Snip%)) Real Real -> Void)
-                         ((Instance Snip%) Real Real -> Void)
-                         ((Instance Snip%) (Option (Instance Snip%)) -> Void))]
-         [interactive-adjust-mouse ((Boxof Real) (Boxof Real) -> Void)]
-         [interactive-adjust-move
-          ((Instance Snip%) (Boxof Real) (Boxof Real) -> Void)]
-         [interactive-adjust-resize
-          ((Instance Snip%) (Boxof Real) (Boxof Real) -> Void)]
-         [is-selected? ((Instance Snip%) -> Boolean)]
-         [lower ((Instance Snip%) -> Void)]
-         [move
-          (case-> (Real Real -> Void)
-                  ((Instance Snip%) Real Real -> Void))]
-         [move-to ((Instance Snip%) Real Real -> Void)]
-         [no-selected (-> Void)]
-         [on-delete ((Instance Snip%) -> Void)]
-         [on-double-click
-          ((Instance Snip%) (Instance Mouse-Event%) -> Void)]
-         [on-insert
-          ((Instance Snip%) (Option (Instance Snip%)) Real Real -> Void)]
-         [on-interactive-move ((Instance Mouse-Event%) -> Void)]
-         [on-interactive-resize ((Instance Snip%) -> Void)]
-         [on-move-to ((Instance Snip%) Real Real Any -> Void)]
-         [on-reorder ((Instance Snip%) (Instance Snip%) Any -> Void)]
-         [on-resize ((Instance Snip%) Real Real -> Void)]
-         [on-select ((Instance Snip%) Any -> Void)]
-         [raise ((Instance Snip%) -> Void)]
-         [remove ((Instance Snip%) -> Void)]
-         [remove-selected ((Instance Snip%) -> Void)]
-         [resize ((Instance Snip%) Real Real -> Void)]
-         [set-after ((Instance Snip%) (Option (Instance Snip%)) -> Void)]
-         [set-before ((Instance Snip%) (Option (Instance Snip%)) -> Void)]
-         [set-dragable (Any -> Void)]
-         [set-scroll-step (Real -> Void)]
-         [set-selected ((Instance Snip%) -> Void)]
-         [set-selection-visible (Any -> Void)]
-         (augment [after-delete ((Instance Snip%) -> Void)]
-                  [after-insert
-                   ((Instance Snip%) (Option (Instance Snip%)) Real Real -> Void)]
-                  [after-interactive-move ((Instance Mouse-Event%) -> Void)]
-                  [after-interactive-resize ((Instance Snip%) -> Void)]
-                  [after-move-to ((Instance Snip%) Real Real Any -> Void)]
-                  [after-reorder ((Instance Snip%) (Instance Snip%) Any -> Boolean)]
-                  [after-resize ((Instance Snip%) Real Real Any -> Void)]
-                  [after-select ((Instance Snip%) Any -> Void)]
-                  [can-delete? ((Instance Snip%) -> Boolean)]
-                  [can-insert?
-                   ((Instance Snip%) (Option (Instance Snip%)) Real Real -> Boolean)]
-                  [can-interactive-move? ((Instance Mouse-Event%) -> Boolean)]
-                  [can-interactive-resize? ((Instance Snip%) -> Boolean)]
-                  [can-move-to? ((Instance Snip%) Real Real Any -> Boolean)]
-                  [can-reorder? ((Instance Snip%) (Instance Snip%) Any -> Boolean)]
-                  [can-resize? ((Instance Snip%) Real Real -> Boolean)]
-                  [can-select? ((Instance Snip%) Any -> Boolean)]
-                  [on-delete ((Instance Snip%) -> Void)]
-                  [on-insert
-                   ((Instance Snip%) (Option (Instance Snip%)) Real Real -> Void)]
-                  [on-interactive-move ((Instance Mouse-Event%) -> Void)]
-                  [on-interactive-resize ((Instance Snip%) -> Void)]
-                  [on-move-to ((Instance Snip%) Real Real Any -> Void)]
-                  [on-reorder ((Instance Snip%) (Instance Snip%) Any -> Void)]
-                  [on-resize ((Instance Snip%) Real Real -> Void)]
-                  [on-select ((Instance Snip%) Any -> Void)])))
-
-;; racket/snip
-
-(provide Readable-Snip<%>
-         Snip%
-         Snip-Admin%
-         Snip-Class%
-         Snip-Class-List<%>
-         String-Snip%
-         Style<%>
-         Style-Delta%
-         Style-List%
-         Tab-Snip%)
-
-(define-type Readable-Snip<%>
-  (Class [read-special (Any (Option Natural) (Option Natural) (Option Natural) -> Any)]))
-
-(define-type Snip-Edit-Operation
-  (U 'undo 'redo 'clear 'cut 'copy
-     'paste 'kill 'select-all
-     'insert-text-box 'insert-pasteboard-box
-     'insert-image))
-
-(define-type Style-Delta%
-  (Class (init-rest
-          (U (List)
-             (List (U 'change-nothing 'change-normal
-                      'change-toggle-underline 'change-toggle-size-in-pixels
-                      'change-normal-color 'change-bold))
-             (List (U 'change-family 'change-style
-                      'change-toggle-style 'change-weight
-                      'change-toggle-weight 'change-smoothing
-                      'change'toggle-smoothing 'change-alignment)
-                   Symbol)
-             (List (U 'change-size 'change-bigger 'change-smaller)
-                   Byte)
-             (List (U 'change-underline 'change-size-in-pixels)
-                   Any)))
-         [collapse ((Instance Style-Delta%) -> Boolean)]
-         [copy ((Instance Style-Delta%) -> Void)]
-         [equal? ((Instance Style-Delta%) -> Boolean)]
-         [get-alignment-off (-> (U 'base 'top 'center 'bottom))]
-         [get-alignment-on (-> (U 'base 'top 'center 'bottom))]
-         #| FIXME
-         [get-background-add (-> (Instance Add-Color<%>))]
-         [get-background-mult (-> (Instance Mult-Color<%>))]
-         |#
-         [get-face (-> (Option String))]
-         [get-family (-> Font-Family)]
-         #| FIXME
-         [get-foreground-add (-> (Instance Add-Color<%>))]
-         [get-foreground-mult (-> (Instance Mult-Color<%>))]
-         |#
-         [get-size-add (-> Byte)]
-         [get-size-in-pixels-off (-> Boolean)]
-         [get-size-in-pixels-on (-> Boolean)]
-         [get-size-mult (-> Real)]
-         [get-smoothing-off (-> Font-Smoothing)]
-         [get-smoothing-on (-> Font-Smoothing)]
-         [get-style-off (-> Font-Style)]
-         [get-style-on (-> Font-Style)]
-         [get-transparent-text-backing-off (-> Boolean)]
-         [get-transparent-text-backing-on (-> Boolean)]
-         [get-underlined-off (-> Boolean)]
-         [get-underlined-on (-> Boolean)]
-         [get-weight-off (-> Font-Weight)]
-         [get-weight-on (-> Font-Weight)]
-         [set-alignment-off ((U 'base 'top 'center 'bottom) -> Void)]
-         [set-alignment-on ((U 'base 'top 'center 'bottom) -> Void)]
-         [set-delta
-          (case-> ((U 'change-nothing 'change-normal 'change-toggle-underline
-                      'change-toggle-size-in-pixels 'change-normal-color
-                      'change-bold)
-                   -> (Instance Style-Delta%))
-                  ((U 'change-family 'change-style 'change-toggle-style 'change-weight
-                      'change-toggle-weight 'change-smoothing 'change-toggle-smoothing
-                      'change-alignment 'change-size 'change-bigger
-                      'change-smaller 'change-underline 'change-size-in-pixel)
-                   Any -> (Instance Style-Delta%)))]
-         [set-delta-background ((U String (Instance Color%)) -> (Instance Style-Delta%))]
-         [set-delta-face
-          (case-> (String -> (Instance Style-Delta%))
-                  (String Font-Family -> (Instance Style-Delta%)))]
-         [set-delta-foreground ((U String (Instance Color%)) -> (Instance Style-Delta%))]
-         [set-face ((Option String) -> Void)]
-         [set-family (Font-Family -> Void)]
-         [set-size-add (Byte -> Void)]
-         [set-size-in-pixels-off (Any -> Void)]
-         [set-size-in-pixels-on (Any -> Void)]
-         [set-size-mult (Real -> Void)]
-         [set-smoothing-off (Font-Smoothing -> Void)]
-         [set-smoothing-on (Font-Smoothing -> Void)]
-         [set-style-off (Font-Style -> Void)]
-         [set-style-on (Font-Style -> Void)]
-         [set-transparent-text-backing-off (Any -> Void)]
-         [set-transparent-text-backing-on (Any -> Void)]
-         [set-underlined-off (Any -> Void)]
-         [set-underlined-on (Any -> Void)]
-         [set-weight-off (Font-Weight -> Void)]
-         [set-weight-on (Font-Weight -> Void)]))
-
-(define-type Style<%>
-  (Class [get-alignment (-> (U 'top 'center 'bottom))]
-         [get-background (-> (Instance Color%))]
-         [get-base-style (-> (Option (Instance Style<%>)))]
-         [get-delta ((Instance Style-Delta%) -> Void)]
-         [get-face (-> (Option String))]
-         [get-family (-> (U 'default 'decorative 'roman 'script
-                            'swiss 'modern 'symbol 'system))]
-         [get-font (-> (Instance Font%))]
-         [get-foreground (-> (Instance Color%))]
-         [get-name (-> (Option String))]
-         [get-shift-style (-> (Instance Style<%>))]
-         [get-size (-> Byte)]
-         [get-size-in-pixels (-> Boolean)]
-         [get-smoothing
-          (-> (U 'default 'partly-smoothed 'smoothed 'unsmoothed))]
-         [get-style (-> (U 'normal 'italic 'slant))]
-         [get-text-descent ((Instance DC<%>) -> Nonnegative-Real)]
-         [get-text-height ((Instance DC<%>) -> Nonnegative-Real)]
-         [get-text-space ((Instance DC<%>) -> Nonnegative-Real)]
-         [get-text-width ((Instance DC<%>) -> Nonnegative-Real)]
-         [get-transparent-text-backing (-> Boolean)]
-         [get-underlined (-> Boolean)]
-         [get-weight (-> (U 'normal 'bold 'light))]
-         [is-join? (-> Boolean)]
-         [set-base-style (Any -> (Instance Style<%>))]
-         [set-delta ((Instance Style-Delta%) -> Void)]
-         [set-shift-style ((Instance Style<%>) -> Void)]
-         [switch-to ((Instance DC<%>) (Option (Instance Style<%>)) -> Void)]))
-
-(define-type Style-List%
-  (Class ; FIXME: this is a final method
-         ; [basic-style (-> (Instance Style<%>))]
-         [convert ((Instance Style<%>) -> (Instance Style<%>))]
-         [find-named-style
-          (String -> (Option (Instance Style<%>)))]
-         [find-or-create-join-style
-          ((Instance Style<%>) (Instance Style<%>) -> (Instance Style<%>))]
-         [find-or-create-style
-          ((Instance Style<%>) (Instance Style-Delta%) -> (Instance Style<%>))]
-         [forget-notification (Any -> Void)]
-         [index-to-style (Natural -> (Option (Instance Style<%>)))]
-         [new-named-style (String (Instance Style<%>) -> (Instance Style<%>))]
-         [notify-on-change
-          (((Option (Instance Style<%>)) -> Any) -> Any)]
-         [number (-> Natural)]
-         [replace-named-style
-          (String (Instance Style<%>) -> (Instance Style<%>))]
-         [style-to-index
-          ((Instance Style<%>) -> (Option Natural))]))
-
-(define-type Snip-Admin%
-  (Class [get-dc (-> (Option (Instance DC<%>)))]
-         [get-editor (-> (U (Instance Text%) (Instance Pasteboard%)))]
-         [get-view
-          (case-> ((Option (Boxof Real)) (Option (Boxof Real))
-                   (Option (Boxof Nonnegative-Real))
-                   (Option (Boxof Nonnegative-Real))
-                   -> Void)
-                  ((Option (Boxof Real)) (Option (Boxof Real))
-                   (Option (Boxof Nonnegative-Real))
-                   (Option (Boxof Nonnegative-Real))
-                   (Option (Instance Snip%))
-                   -> Void))]
-         [get-view-size ((Option (Boxof Nonnegative-Real))
-                         (Option (Boxof Nonnegative-Real))
-                         -> Void)]
-         [modified ((Instance Snip%) Any -> Void)]
-         [needs-update
-          ((Instance Snip%) Real Real Real Real -> Void)]
-         [popup-menu
-          ((Instance Popup-Menu%) (Instance Snip%) Real Real -> Boolean)]
-         [recounted ((Instance Snip%) Any -> Void)]
-         [release-snip ((Instance Snip%) -> Boolean)]
-         [resized ((Instance Snip%) Any -> Void)]
-         [scroll-to
-          (case->
-           ((Instance Snip%) Real Real Real Real Any -> Boolean)
-           ((Instance Snip%) Real Real Real Real Any (U 'start 'end 'none)
-            -> Boolean))]
-         [set-caret-owner
-          ((Option Snip%) (U 'immediate 'display 'global) -> Void)]
-         [update-cursor (-> Void)]
-         [get-line-spacing (-> Nonnegative-Real)]
-         [get-selected-text-color (-> (Option (Instance Color%)))]
-         [call-with-busy-cursor ((-> Any) -> Any)]
-         [get-tabs
-          (case-> (-> (Listof Real))
-                  ((Option (Boxof Natural)) -> (Listof Real))
-                  ((Option (Boxof Natural)) (Option (Boxof Real))
-                   -> (Listof Real))
-                  ((Option (Boxof Natural)) (Option (Boxof Real))
-                   (Option (Boxof Any)) -> (Listof Real)))]))
-
-(define-type Snip-Class%
-  (Class [get-classname (-> String)]
-         [get-version (-> Integer)]
-         [read ((Instance Editor-Stream-In%) -> (Option (Instance Snip%)))]
-         [read-header ((Instance Editor-Stream-In%) -> Boolean)]
-         [reading-version ((Instance Editor-Stream-In%) -> Integer)]
-         [set-classname (String -> Void)]
-         [set-version (Integer -> Void)]
-         [write-header ((Instance Editor-Stream-Out%) -> Boolean)]))
-
-(define-type Snip%
-  (Class [adjust-cursor
-          ((Instance DC<%>) Real Real Real Real
-           (Instance Mouse-Event%) -> (Option (Instance Cursor%)))]
-         [blink-caret
-          ((Instance DC<%>) Real Real -> Void)]
-         [can-do-edit-operation?
-          (case-> (Snip-Edit-Operation -> Boolean)
-                  (Snip-Edit-Operation Any -> Boolean))]
-         [copy (-> (Instance Snip%))]
-         [do-edit-operation
-          (case-> (Snip-Edit-Operation -> Void)
-                  (Snip-Edit-Operation Any -> Void)
-                  (Snip-Edit-Operation Any Integer -> Void))]
-         [draw
-          ((Instance DC<%>) Real Real Real Real Real Real Real Real
-           (U 'no-caret 'show-inactive-caret 'show-caret
-              (Pairof Natural Natural)) -> Void)]
-         [equal-to?
-          ((Instance Snip%) (Any Any -> Boolean) -> Boolean)]
-         [other-equal-to?
-          ((Instance Snip%) (Any Any -> Boolean) -> Boolean)]
-         [equal-hash-code-of ((Any -> Integer) -> Integer)]
-         [equal-secondary-hash-code-of ((Any -> Integer) -> Integer)]
-         [find-scroll-step (Real -> Natural)]
-         [get-admin (-> (Option (Instance Snip-Admin%)))]
-         [get-count (-> Integer)]
-         [get-extent
-          (case->
-           ((Instance DC<%>) Real Real -> Void)
-           ((Instance DC<%>) Real Real
-            (Option (Boxof Nonnegative-Real)) -> Void)
-           ((Instance DC<%>) Real Real
-            (Option (Boxof Nonnegative-Real)) (Option (Boxof Nonnegative-Real))
-            -> Void)
-           ((Instance DC<%>) Real Real
-            (Option (Boxof Nonnegative-Real)) (Option (Boxof Nonnegative-Real))
-            (Option (Boxof Nonnegative-Real)) -> Void)
-           ((Instance DC<%>) Real Real
-            (Option (Boxof Nonnegative-Real)) (Option (Boxof Nonnegative-Real))
-            (Option (Boxof Nonnegative-Real)) (Option (Boxof Nonnegative-Real))
-            -> Void)
-           ((Instance DC<%>) Real Real
-            (Option (Boxof Nonnegative-Real)) (Option (Boxof Nonnegative-Real))
-            (Option (Boxof Nonnegative-Real)) (Option (Boxof Nonnegative-Real))
-            (Option (Boxof Nonnegative-Real)) -> Void)
-           ((Instance DC<%>) Real Real
-            (Option (Boxof Nonnegative-Real)) (Option (Boxof Nonnegative-Real))
-            (Option (Boxof Nonnegative-Real)) (Option (Boxof Nonnegative-Real))
-            (Option (Boxof Nonnegative-Real)) (Option (Boxof Nonnegative-Real))
-            -> Void))]
-         [get-flags (-> (Listof Symbol))]
-         [get-num-scroll-steps (-> Natural)]
-         [get-scroll-step-offset (Natural -> Nonnegative-Real)]
-         [get-snipclass (-> (Option Snip-Class%))]
-         [get-style (-> (Instance Style<%>))]
-         [get-text
-          (case-> (Natural Natural -> String)
-                  (Natural Natural Any -> String))]
-         [get-text!
-          (String Natural Natural Natural -> Void)]
-         [is-owned? (-> Boolean)]
-         [match? ((Instance Snip%) -> Boolean)]
-         [merge-with ((Instance Snip%) -> (Option (Instance Snip%)))]
-         [next (-> (Option (Instance Snip%)))]
-         [on-char
-          ((Instance DC<%>) Real Real Real Real
-           (Instance Key-Event%) -> Void)]
-         [on-event
-          ((Instance DC<%>) Real Real Real Real
-           (Instance Mouse-Event%) -> Void)]
-         [on-goodbye-event ((Instance DC<%>) Real Real Real Real
-                            (Instance Mouse-Event%) -> Void)]
-         [own-caret (Any -> Void)]
-         [partial-offset ((Instance DC<%>) Real Real Natural -> Real)]
-         [previous (-> (Option (Instance Snip%)))]
-         [release-from-owner (-> Boolean)]
-         [resize (Nonnegative-Real Nonnegative-Real -> Boolean)]
-         [set-admin ((Option (Instance Snip-Admin%)) -> Void)]
-         [set-count (Integer -> Void)]
-         [set-flags ((Listof Symbol) -> Void)]
-         [set-snipclass ((Instance Snip-Class%) -> Void)]
-         [set-style ((Instance Style<%>) -> Void)]
-         [set-unmodified (-> Void)]
-         [size-cache-invalid (-> Void)]
-         [split (Natural (Boxof (Instance Snip%))
-                 (Boxof (Instance Snip%)) -> Void)]
-         [write ((Instance Editor-Stream-Out%) -> Void)]))
-
-(define-type Snip-Class-List<%>
-  (Class [add ((Instance Snip-Class%) -> Void)]
-         [find (String -> (Option (Instance Snip-Class%)))]
-         [find-position ((Instance Snip-Class%) -> Natural)]
-         [nth (Integer -> (Option (Instance Snip-Class%)))]
-         [number (-> Natural)]))
-
-(define-type String-Snip%
-  (Class #:implements Snip%
-         (init-rest (U (List) (List (U String Integer))))
-         [insert (case-> (String Natural -> Void)
-                         (String Natural Natural -> Void))]
-         [read (Natural (Instance Editor-Stream-In%) -> Void)]))
-
-(define-type Tab-Snip%
-  (Class #:implements String-Snip%))
-
-;; 7 Editor Classes
-(provide Editor-Snip%
-         Editor-Wordbreak-Map%)
-(define-type Editor-Snip%
-  (Class #:implements Snip%
-         (init [editor (Option (Instance Editor<%>)) #:optional]
-               [with-border? Any #:optional]
-               [left-margin Natural #:optional]
-               [top-margin Natural #:optional]
-               [right-margin Natural #:optional]
-               [bottom-margin Natural #:optional]
-               [left-inset Natural #:optional]
-               [top-inset Natural #:optional]
-               [right-inset Natural #:optional]
-               [bottom-inset Natural #:optional]
-               [min-width Nonnegative-Real #:optional]
-               [max-width Nonnegative-Real #:optional]
-               [min-height Nonnegative-Real #:optional]
-               [max-height Nonnegative-Real #:optional])
-         [border-visible? (-> Boolean)]
-         [get-align-top-line (-> Boolean)]
-         [get-editor (-> (U #f (Instance Text%) (Instance Pasteboard%)))]
-         [get-inset ((Boxof Natural) (Boxof Natural) (Boxof Natural) (Boxof Natural) -> Void)]
-         [get-margin ((Boxof Natural) (Boxof Natural) (Boxof Natural) (Boxof Natural) -> Void)]
-         [get-max-height (-> (U Nonnegative-Real 'none))]
-         [get-max-width (-> (U Nonnegative-Real 'none))]
-         [get-min-height (-> (U Nonnegative-Real 'none))]
-         [get-min-width (-> (U Nonnegative-Real 'none))]
-         [get-tight-text-fit (-> Boolean)]
-         [resize (Nonnegative-Real Nonnegative-Real -> Boolean)]
-         [set-align-top-line (Any -> Void)]
-         [set-editor ((U (Instance Text%) (Instance Pasteboard%) #f) -> Void)]
-         [set-inset (Natural Natural Natural Natural -> Void)]
-         [set-margin (Natural Natural Natural Natural -> Void)]
-         [set-max-height ((U Nonnegative-Real 'none) -> Void)]
-         [set-max-width ((U Nonnegative-Real 'none) -> Void)]
-         [set-min-height ((U Nonnegative-Real 'none) -> Void)]
-         [set-min-width ((U Nonnegative-Real 'none) -> Void)]
-         [set-tight-text-fit (Any -> Void)]
-         [show-border (Any -> Void)]
-         [style-background-used? (-> Boolean)]
-         [use-style-background (Any -> Void)]))
-
-(define-type Wordbreak-Map-Value (U 'caret 'line 'selection 'user1 'user2))
-(define-type Editor-Wordbreak-Map%
-  (Class
-   [get-map (Char -> (Listof Wordbreak-Map-Value))]
-   [set-map (Char (Listof Wordbreak-Map-Value) -> Void)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/sandbox.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/sandbox.rkt
deleted file mode 100644
index 6b96c83ec2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/sandbox.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang s-exp typed-racket/base-env/extra-env-lang
-
-;; This module provides a base type environment for
-;; racket/sandbox
-
-(require racket/sandbox
-         (for-syntax (only-in typed-racket/rep/type-rep make-ValuesDots)))
-
-(provide exn:fail:resource?
-         exn:fail:resource-resource)
-
-(type-environment
- ;; 14.12 Sandboxed Evaluation
- ;; 14.12.1 Customizing Evaluators
- ;; 14.12.1 Interacting with Evaluators
- ;; 14.12.3 Miscellaneous
- [gui? -Boolean]
- [call-with-limits
-  (-polydots (a)
-    (-> (-opt -Integer) (-opt -Integer)
-        (-> (make-ValuesDots null a 'a))
-        (make-ValuesDots null a 'a)))]
- [call-with-deep-time-limit
-  (-polydots (a)
-    (-> (-opt -Integer)
-        (-> (make-ValuesDots null a 'a))
-        (make-ValuesDots null a 'a)))]
- [#:struct (exn:fail:resource exn:fail)
-           ([resource : (one-of/c 'time 'memory 'deep-time)])
-           (-String -Cont-Mark-Set)
-           #:no-provide])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/snip.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/snip.rkt
deleted file mode 100644
index aee0e6261a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/racket/snip.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang s-exp typed-racket/base-env/extra-env-lang
-
-;; This module provides a base type environment including
-;; racket/snip bindings
-
-(require racket/snip/private/snip
-         racket/snip/private/snip-admin
-         racket/snip/private/style
-         "private/gui-types.rkt"
-         (for-syntax (submod "private/gui-types.rkt" #%type-decl)))
-
-(provide Snip%
-         Snip-Admin%
-         Snip-Class%
-         String-Snip%
-         Style<%>
-         Style-Delta%
-         Style-List%)
-
-(type-environment
- [snip% (parse-type #'Snip%)]
- [snip-admin% (parse-type #'Snip-Admin%)]
- [snip-class% (parse-type #'Snip-Class%)]
- [string-snip% (parse-type #'String-Snip%)]
- [style-delta% (parse-type #'Style-Delta%)]
- [style-list% (parse-type #'Style-List%)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit.rkt
deleted file mode 100644
index 6b9d16d170..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require typed/rackunit/main)
-(provide (all-from-out typed/rackunit/main))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/gui.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/gui.rkt
deleted file mode 100644
index 1965c9d44f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/gui.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/racket
-(require typed/rackunit
-         typed/private/utils)
-
-(require/typed/provide
- rackunit/gui
- [test/gui
-  (Test * -> Any)]
- [make-gui-runner
-  (-> (Test * -> Any))])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/info.rkt
deleted file mode 100644
index 84ad0ac2d5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/main.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/main.rkt
deleted file mode 100644
index f74fce0f64..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/main.rkt
+++ /dev/null
@@ -1,183 +0,0 @@
-#lang typed/racket
-(require typed/private/utils
-         typed/private/rewriter
-         "type-env-ext.rkt")
-
-(define-type check-ish-ty
-  (case-lambda
-    (Any Any -> Any)
-    (Any Any String -> Any)))
-(define-type (Predicate A) (A -> Boolean))
-(define-type (Thunk A) (-> A))
-
-; 3.2
-(require/typed/provide
- rackunit
- [check-eq? check-ish-ty]
- [check-not-eq? check-ish-ty]
- [check-eqv? check-ish-ty]
- [check-not-eqv? check-ish-ty]
- [check-equal? check-ish-ty]
- [check-not-equal? check-ish-ty]
- [check-pred
-  (All (A)
-       (case-lambda
-         ((A -> Any) A -> Any)
-         ((A -> Any) A String -> Any)))]
- [check-=
-  (case-lambda
-    (Real Real Real -> Any)
-    (Real Real Real String -> Any))]
- [check-true
-  (case-lambda
-    (Any -> Any)
-    (Any String -> Any))]
- [check-false
-  (case-lambda
-    (Any -> Any)
-    (Any String -> Any))]
- [check-not-false
-  (case-lambda
-    (Any -> Any)
-    (Any String -> Any))]
- [check-exn
-  (case-lambda
-    ((U (Predicate Any) Regexp) (Thunk Any) -> Any)
-    ((U (Predicate Any) Regexp) (Thunk Any) String -> Any))]
- [check-not-exn
-  (case-lambda
-    ((Thunk Any) -> Any)
-    ((Thunk Any) String -> Any))]
- [check-regexp-match
-  (Regexp String -> Any)]
-
-
- [check (All (A B)
-             (case-lambda
-               ((A B -> Any) A B -> Any)
-               ((A B -> Any) A B String -> Any)))]
-
- [fail
-  (case-lambda
-    (-> Void)
-    (String -> Void))])
-
-; 3.2.1
-(require-typed-struct check-info
-                      ([name : Symbol] [value : Any])
-                      rackunit)
-(define-type CheckInfo check-info)
-(provide (struct-out check-info) CheckInfo)
-(require/typed/provide
- rackunit
- [make-check-name (String -> CheckInfo)]
- [make-check-params ((Listof Any) -> CheckInfo)]
- [make-check-location ((List Any (Option Number) (Option Number) (Option Number) (Option Number)) -> CheckInfo)]
- [make-check-expression (Any -> CheckInfo)]
- [make-check-message (String -> CheckInfo)]
- [make-check-actual (Any -> CheckInfo)]
- [make-check-expected (Any -> CheckInfo)]
- [with-check-info* (All (A) ((Listof CheckInfo) (Thunk A) -> A))])
-(require (only-in rackunit with-check-info))
-(provide with-check-info)
-
-; 3.2.2
-(require (only-in rackunit define-simple-check define-binary-check define-check fail-check))
-(provide define-simple-check define-binary-check define-check fail-check)
-
-; 3.3
-(require (prefix-in t: (except-in rackunit struct:check-info struct:exn:test struct:exn:test:check struct:test-result struct:test-failure
-                                  struct:test-error struct:test-success)))
-(define-rewriter t:test-begin test-begin
-  [t:current-test-case-around current-test-case-around]
-  [t:check-around check-around]
-  [t:current-check-handler current-check-handler]
-  [t:current-check-around current-check-around])
-(define-rewriter t:test-case test-case
-  [t:current-test-case-around current-test-case-around]
-  [t:check-around check-around]
-  [t:current-check-handler current-check-handler]
-  [t:current-check-around current-check-around])
-(provide test-begin test-case)
-
-(require/opaque-type TestCase test-case? rackunit)
-(provide TestCase test-case?)
-
-
-
-(require (only-in rackunit test-suite))
-(provide test-suite)
-(require/opaque-type TestSuite test-suite? rackunit)
-(provide TestSuite test-suite?)
-
-(define-type Test (U TestCase TestSuite))
-(provide Test)
-
-(require/typed/provide
- rackunit
- [make-test-suite
-  (case-lambda
-    (String (Listof Test) -> TestSuite)
-    ; XXX #:before #:after
-    )])
-
-(require (only-in rackunit define-test-suite define/provide-test-suite))
-(provide define-test-suite define/provide-test-suite)
-
-(require/typed/provide
- rackunit
- [current-test-name (Parameter (Option String))]
- [current-test-case-around (Parameter ((Thunk Any) -> Any))]
- [test-suite-test-case-around ((Thunk Any) -> Any)]
- [test-suite-check-around ((Thunk Any) -> Any)])
-
-; 3.4
-(require (only-in rackunit before after around delay-test))
-(provide before after around delay-test)
-
-; 3.5
-; XXX require/expose seems WRONG for typed/scheme
-
-; 3.7
-(require-typed-struct (exn:test exn) () rackunit)
-(require-typed-struct (exn:test:check exn:test) ([stack : (Listof CheckInfo)]) rackunit)
-(require-typed-struct test-result ([test-case-name : (Option String)]) rackunit)
-(require-typed-struct (test-failure test-result) ([result : Any]) rackunit)
-(require-typed-struct (test-error test-result) ([result : Any]) rackunit)
-(require-typed-struct (test-success test-result) ([result : Any]) rackunit)
-(provide (struct-out exn:test) (struct-out exn:test:check)
-         (struct-out test-result)
-         (struct-out test-failure) (struct-out test-error) (struct-out test-success))
-
-(define-type (Tree A)
-  (Rec The-Tree
-       (Listof (U A The-Tree))))
-
-(require/typed/provide
- rackunit
- [run-test-case
-  ((Option String) (Thunk Any) -> test-result)]
- [run-test
-  (Test -> (Tree test-result))]
- ; XXX Requires keywords and weird stuff
- #;[fold-test-results
-    XXX]
- ; XXX Requires knowing more about test cases and structs
- #;[foldts-test-suite
-    XXX])
-
-
-; 5.1
-(require/typed/provide
- rackunit
- [current-check-handler
-  (Parameter (-> (U (Rec flat
-                      (U Boolean Complex Char
-                         Null Symbol String
-                         Keyword (Pairof flat flat)))
-                 exn)
-                 Any))]
- [current-check-around
-  (Parameter ((Thunk Any) -> Any))])
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/text-ui.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/text-ui.rkt
deleted file mode 100644
index 81a88f8178..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/text-ui.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/racket
-(require typed/rackunit
-         typed/private/utils)
-
-(define-type Verbosity
-  (U 'quiet 'normal 'verbose))
-
-(require/typed/provide
- rackunit/text-ui
- [run-tests
-  (case-lambda
-    (Test -> Natural)
-    (Test Verbosity -> Natural))])
-(provide Verbosity)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/type-env-ext.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/type-env-ext.rkt
deleted file mode 100644
index c73a078099..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/type-env-ext.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-
-(require typed-racket/utils/utils
-         (prefix-in ru: (combine-in rackunit rackunit/private/test-case rackunit/private/check))
-         (for-syntax
-          racket/base syntax/parse
-          (utils tc-utils)
-          (env init-envs)
-          (except-in (rep filter-rep object-rep type-rep) make-arr)
-          (rename-in (types abbrev union) [make-arr* make-arr])))
-
-(define-for-syntax unit-env
-  (make-env
-   [ru:check-around
-    (-poly (a) (-> (-> a) a))]
-   ;; current-test-case-around
-   [(syntax-parse (local-expand #'(ru:test-begin 0) 'expression null)
-      #:context #'ru:test-begin
-      [(_ _ . _) #'ctca])
-    (-poly (a) (-> (-> a) a))]))
-
-(begin-for-syntax (initialize-type-env unit-env))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/srfi/14.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/srfi/14.rkt
deleted file mode 100644
index 44e9f2c74b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/srfi/14.rkt
+++ /dev/null
@@ -1,227 +0,0 @@
-#lang typed/racket/base
-(require/opaque-type Char-Set char-set? srfi/14)
-
-(define-type-alias Cursor (Pair 0 (Listof (Pair Integer Integer))))
-
-(provide Char-Set Cursor)
-
-(require/typed
- srfi/14
- ;; Predicates & comparison
- [char-set= (Char-Set * -> Boolean)]
- [char-set<= (Char-Set * -> Boolean)]
- [char-set-hash
-  (case-lambda (Char-Set -> Integer)
-               (Char-Set Integer -> Integer))]
-
- ;; Iterating over character sets
- [char-set-cursor (Char-Set -> Cursor)]
- [char-set-ref (Char-Set Cursor -> Char)]
- [char-set-cursor-next (Char-Set Cursor -> Cursor)]
- [end-of-char-set? (Cursor -> Boolean)]
- [char-set-map ((Char -> Char) Char-Set -> Char-Set)]
-
- ;; Creating character sets
- [char-set-copy (Char-Set -> Char-Set)]
- [char-set (Char * -> Char-Set)]
- [list->char-set
-  (case-lambda
-    ((Listof Char) -> Char-Set)
-    ((Listof Char) Char-Set -> Char-Set))]
- [list->char-set! ((Listof Char) Char-Set -> Char-Set)]
- [string->char-set
-  (case-lambda
-    (String -> Char-Set)
-    (String Char-Set -> Char-Set))]
- [string->char-set! (String Char-Set -> Char-Set)]
- [char-set-filter
-  (case-lambda
-    ((Char -> Any) Char-Set -> Char-Set)
-    ((Char -> Any) Char-Set Char-Set -> Char-Set))]
- [char-set-filter!
-  ((Char -> Any) Char-Set Char-Set -> Char-Set)]
- [ucs-range->char-set
-  (case-lambda (Integer Integer -> Char-Set)
-               (Integer Integer Any -> Char-Set)
-               (Integer Integer Any Char-Set -> Char-Set))]
- [ucs-range->char-set!
-  (Integer Integer Any Char-Set -> Char-Set)]
- [->char-set ((U String Char Char-Set) -> Char-Set)]
-
- ;; Querying character sets
- [char-set-size (Char-Set -> Integer)]
- [char-set-count ((Char -> Any) Char-Set -> Integer)]
- [char-set->list (Char-Set -> (Listof Char))]
- [char-set->string (Char-Set -> String)]
- [char-set-contains? (Char-Set Char -> Boolean)]
-
- ;; Character-set algebra
- [char-set-adjoin  (Char-Set Char * -> Char-Set)]
- [char-set-delete  (Char-Set Char * -> Char-Set)]
- [char-set-adjoin! (Char-Set Char * -> Char-Set)]
- [char-set-delete! (Char-Set Char * -> Char-Set)]
- [char-set-complement   (Char-Set -> Char-Set)]
- [char-set-union        (Char-Set * -> Char-Set)]
- [char-set-intersection (Char-Set * -> Char-Set)]
- [char-set-difference   (Char-Set Char-Set * -> Char-Set)]
- [char-set-xor          (Char-Set * -> Char-Set)]
- [char-set-diff+intersection
-  (Char-Set Char-Set * -> (values Char-Set Char-Set))]
- [char-set-complement!   (Char-Set -> Char-Set)]
- [char-set-union!        (Char-Set Char-Set * -> Char-Set)]
- [char-set-intersection! (Char-Set Char-Set * -> Char-Set)]
- [char-set-difference!   (Char-Set Char-Set * -> Char-Set)]
- [char-set-xor!          (Char-Set Char-Set * -> Char-Set)]
- [char-set-diff+intersection!
-  (Char-Set Char-Set Char-Set * -> (values Char-Set Char-Set))]
-
- ;; Standard character sets
- [char-set:lower-case Char-Set]
- [char-set:upper-case Char-Set]
- [char-set:title-case Char-Set]
- [char-set:letter Char-Set]
- [char-set:digit Char-Set]
- [char-set:letter+digit Char-Set]
- [char-set:graphic Char-Set]
- [char-set:printing Char-Set]
- [char-set:whitespace Char-Set]
- [char-set:iso-control Char-Set]
- [char-set:punctuation Char-Set]
- [char-set:symbol Char-Set]
- [char-set:hex-digit Char-Set]
- [char-set:blank Char-Set]
- [char-set:ascii Char-Set]
- [char-set:empty Char-Set]
- [char-set:full Char-Set]
- [char-set-fold (All (A) ((Char A -> A) A Char-Set -> A))]
- [char-set-unfold
-  (All (A)
-       (case-lambda
-        ((A -> Any) (A -> Char) (A -> A) A -> Char-Set)
-        ((A -> Any) (A -> Char) (A -> A) A Char-Set -> Char-Set)))]
- [char-set-unfold!
-  (All (A) ((A -> Any) (A -> Char) (A -> A) A Char-Set -> Char-Set))]
- [char-set-for-each (All (A) ((Char -> A) Char-Set -> (U A Void)))]
- [char-set-any (All (A) ((Char -> A) Char-Set -> (U A #f)))]
- [char-set-every (All (A) ((Char -> A) Char-Set -> (U A Boolean)))]
- ) ; end of require/typed
-
-;; Definitions provided here for polymorphism
-#;
-(define (char-set-fold comb base cs)
-  (let loop ((c (char-set-cursor cs)) (b base))
-    (cond [(end-of-char-set? c) b]
-          [else
-           (loop (char-set-cursor-next cs c)
-                 (comb (char-set-ref cs c) b))])))
-#;
-(define char-set-unfold
-  (pcase-lambda: (A)
-     [([p : (A -> Any)] [f : (A -> Char)] [g : (A -> A)] [seed : A])
-      (char-set-unfold p f g seed char-set:empty)]
-     [([p : (A -> Any)] [f : (A -> Char)] [g : (A -> A)] [seed : A]
-                        [base-cs : Char-Set])
-      (char-set-unfold! p f g seed (char-set-copy base-cs))]))
-#;
-(define (char-set-unfold! p f g seed base-cs)
-  (let lp ((seed seed) (cs base-cs))
-        (if (p seed) cs                                 ; P says we are done.
-            (lp (g seed)                                ; Loop on (G SEED).
-                (char-set-adjoin! cs (f seed))))))
-
-#;
-(define (char-set-for-each f cs)
-  (char-set-fold (lambda: ([c : Char] [b : (U A Void)]) (f c))
-                 (void)
-                 cs))
-#;
-(define (char-set-any pred cs)
-  (let loop ((c (char-set-cursor cs)))
-    (and (not (end-of-char-set? c))
-         (or (pred (char-set-ref cs c))
-             (loop (char-set-cursor-next cs c))))))
-#;
-(define (char-set-every pred cs)
-  (let loop ((c (char-set-cursor cs)) (b (ann #t (U #t A))))
-    (cond [(end-of-char-set? c) b]
-          [else (and b
-                     (loop (char-set-cursor-next cs c)
-                           (pred (char-set-ref cs c))))])))
-
-(provide
- ;; Predicates & comparison
- char-set?
- char-set=
- char-set<=
- char-set-hash
-
- ;; Iterating over character sets
- char-set-cursor
- char-set-ref
- char-set-cursor-next
- end-of-char-set?
- char-set-fold
- char-set-unfold
- char-set-unfold!
- char-set-for-each
- char-set-map
-
- ;; Creating character sets
- char-set-copy
- char-set
- list->char-set
- list->char-set!
- string->char-set
- string->char-set!
- char-set-filter
- char-set-filter!
- ucs-range->char-set
- ucs-range->char-set!
- ->char-set
-
- ;; Querying character sets
- char-set-size
- char-set-count
- char-set->list
- char-set->string
- char-set-contains?
- char-set-every
- char-set-any
-
- ;; Character-set algebra
- char-set-adjoin
- char-set-delete
- char-set-adjoin!
- char-set-delete!
- char-set-complement
- char-set-union
- char-set-intersection
- char-set-difference
- char-set-xor
- char-set-diff+intersection
- char-set-complement!
- char-set-union!
- char-set-intersection!
- char-set-difference!
- char-set-xor!
- char-set-diff+intersection!
-
- ;; Standard character sets
- char-set:lower-case
- char-set:upper-case
- char-set:title-case
- char-set:letter
- char-set:digit
- char-set:letter+digit
- char-set:graphic
- char-set:printing
- char-set:whitespace
- char-set:iso-control
- char-set:punctuation
- char-set:symbol
- char-set:hex-digit
- char-set:blank
- char-set:ascii
- char-set:empty
- char-set:full
- ) ; end of provide
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/syntax/stx.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/syntax/stx.rkt
deleted file mode 100644
index db3cc89b25..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/syntax/stx.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang s-exp typed-racket/base-env/extra-env-lang
-
-(require syntax/stx)
-
-(module types typed/racket/base
-  (provide Stxof
-           Stx-Null
-           Stx-Pairof
-           Stx-Listof)
-  (define-type (Stxof t)
-    (U t (Syntaxof t)))
-  (define-type Stx-Null
-    (Stxof Null))
-  (define-type (Stx-Pairof a b)
-    (Stxof (Pairof a b)))
-  (define-type (Stx-Listof a)
-    (Rec lst
-         (U Stx-Null
-            (Stx-Pairof a lst)))))
-(require 'types)
-(provide (all-from-out 'types))
-
-(begin-for-syntax
-  (define (-Stxof t)
-    (Un t (-Syntax t)))
-  (define -Stx-Null
-    (-Stxof -Null))
-  (define (-Stx-Pairof a b)
-    (-Stxof (-pair a b)))
-  (define (-Stx-Listof a)
-    (-mu lst
-         (Un -Stx-Null
-             (-Stx-Pairof a lst)))))
-
-(type-environment
- [stx-null? (make-pred-ty -Stx-Null)]
- [stx-pair? (make-pred-ty (-Stx-Pairof Univ Univ))]
- [stx-list? (make-pred-ty (-Stx-Listof Univ))]
- [stx->list (-poly (a)
-              (cl->* (-> (-Stx-Listof a) (-lst a))
-                     (-> (-Syntax Univ)
-                         (Un (-val #f) (-lst (-Syntax Univ))))))]
- [stx-car (-poly (a b)
-            (cl->*
-             (-> (-Stx-Pairof a b) a)
-             (-> (-Stx-Listof a) a)))]
- [stx-cdr (-poly (a b)
-            (cl->*
-             (-> (-Stx-Pairof a b) b)
-             (-> (-lst a) (-lst a))
-             (-> (-Stx-Listof a) (-Stx-Listof a))))]
- [stx-map (-polydots (c a b)
-            (cl->*
-             (-> (-> a c) (-Stx-Pairof a (-Stx-Listof a)) (-pair c (-lst c)))
-             ((list
-               ((list a) (b b) . ->... . c)
-               (-Stx-Listof a))
-              ((-Stx-Listof b) b) . ->... .(-lst c))))]
- [module-or-top-identifier=?
-  (-> (-Syntax -Symbol) (-Syntax -Symbol) -Boolean)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/untyped-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/untyped-utils.rkt
deleted file mode 100644
index 7de4817520..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/untyped-utils.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     syntax/parse
-                     syntax/stx
-                     racket/syntax
-                     typed-racket/utils/tc-utils)
-         typed-racket/utils/tc-utils)
-
-(provide syntax-local-typed-context?
-         define-typed/untyped-identifier
-         require/untyped-contract)
-
-(define (syntax-local-typed-context?)
-  (unbox typed-context?))
-
-(define-for-syntax (rename-head stx id)
-  (syntax-case stx ()
-    [(_ . args)  (quasisyntax/loc stx (#,id . args))]
-    [_  (quasisyntax/loc stx #,id)]))
-
-(define-for-syntax ((typed/untyped-renamer typed-name untyped-name) stx)
-  (if (unbox typed-context?)
-      (rename-head stx typed-name)
-      (rename-head stx untyped-name)))
-
-(define-syntax (define-typed/untyped-identifier stx)
-  (syntax-parse stx
-    [(_ name:id typed-name:id untyped-name:id)
-     (syntax/loc stx
-       (define-syntax name
-         (typed/untyped-renamer #'typed-name #'untyped-name)))]))
-
-(define-for-syntax (freshen ids)
-  (stx-map (lambda (id) ((make-syntax-introducer) id)) ids))
-
-(define-syntax (require/untyped-contract stx)
-  (syntax-parse stx #:literals (begin)
-    [(_ (begin form ...) from-module-spec:expr [name:id T:expr] ...)
-     (with-syntax* ([(typed-name ...)  (generate-temporaries #'(name ...))]
-                    [(untyped-name ...)  (freshen #'(name ...))]
-                    [(untyped2-name ...)  (generate-temporaries #'(name ...))]
-                    [(untyped3-name ...)  (generate-temporaries #'(name ...))]
-                    [(macro-name ...)  (generate-temporaries #'(name ...))]
-                    [typed-module  (generate-temporary #'typed-module)]
-                    [untyped-module  (generate-temporary #'untyped-module)])
-       (syntax/loc stx
-         (begin
-           (module typed-module typed/racket/base
-             (begin form ...)
-             (require (rename-in (only-in from-module-spec name ...)
-                                 [name untyped2-name] ...))
-             (provide untyped-name ...)
-             (: untyped-name T) ...
-             (define untyped-name untyped2-name) ...)
-           
-           (module untyped-module racket/base
-             (require typed/untyped-utils
-                      (rename-in (only-in from-module-spec name ...)
-                                 [name typed-name] ...)
-                      (rename-in (only-in (submod ".." typed-module) untyped-name ...)
-                                 [untyped-name untyped3-name] ...))
-             (provide macro-name ...)
-             (define-typed/untyped-identifier macro-name typed-name untyped3-name) ...)
-           
-           (require (rename-in (submod "." untyped-module) [macro-name name] ...)))))]
-    [(_ from-module-spec:expr [name:id T:expr] ...)
-     (syntax/loc stx (require/untyped-contract (begin) from-module-spec [name T] ...))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/LICENSE.txt b/pkgs/typed-racket-pkgs/typed-racket-test/LICENSE.txt
deleted file mode 100644
index be16399c66..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-typed-racket-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/info.rkt
deleted file mode 100644
index 1b09e7b9ad..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/info.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("typed-racket" "typed-racket-more" "typed-racket-compatibility"
-               "unstable" "unstable-2d"))
-(define build-deps '("racket-index"
-                     "scheme-lib"
-                     "base"
-                     "racket-benchmarks"
-                     "compatibility-lib"
-                     "rackunit-lib"
-                     "compiler-lib"
-                     "redex-lib"
-                     "htdp-lib"
-                     "sandbox-lib"
-                     "pconvert-lib"
-                     "unstable-flonum-lib"
-                     "unstable-list-lib"
-                     "unstable"))
-(define update-implies '("typed-racket"))
-
-(define pkg-desc "tests for \"typed-racket\"")
-
-(define pkg-authors '(samth stamourv))
-
-(define version "1.1")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/info.rkt
deleted file mode 100644
index 3d635a672a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define name "Typed Racket Test Suite")
-
-;; No need to compile the actual integration tests, just the harness.
-(define compile-omit-paths
-  '("typed-racket/succeed"
-    "typed-racket/fail"
-    "typed-racket/xfail"
-    "typed-racket/optimizer" ;; FIXME: should be improved by stamourv
-    "typed-racket/tr-random-testing.rkt" ;; Requires recompiling all of redex when rebuilding TR tests
-    ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/all-bad-syntax.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/all-bad-syntax.rkt
deleted file mode 100644
index daf10f545b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/all-bad-syntax.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed-scheme
-
-(require scheme/list)
-
-(define-type-alias (BT a) (U Boolean (node a)))
-(define-struct: (a) node ([key : a] [l : (BT a)] [r : (BT a)]))
-
-(: traverse-4 (All (a i) (BT a) (a ( -> i) ( -> i) -> i) i -> i))
-(define (traverse-4 abt f i)
-  (cond
-    [(boolean? abt) i]
-    [(node? abt) (f (node-key abt)
-                    (lambda () (traverse-4 (node-l abt) f i))
-                    (lambda () (traverse-4 (node-r abt) f i)))]))
-
-(define: (a) (inorder-4 [abt : (BT a)]) : (Listof a)
-  (traverse-4 abt
-              (lambda: ([key : a] [lt : ( -> (Listof a))] [rt : ( -> (Listof a))])
-                (append (lt)
-                        (list key)
-                        (rt)))
-              #;empty))
-(+ 'foo)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/ann-map-funcs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/ann-map-funcs.rkt
deleted file mode 100644
index f8ba9fb486..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/ann-map-funcs.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;
-(exn-pred 3)
-#lang typed-scheme
-
-(: map-with-funcs (All (b a ...) ((a ... a -> b) * -> (a ... a -> (Listof b)))))
-
-(define (map-with-funcs . fs)
- (lambda as
-   (map (lambda: ([f : (a ... a -> b)])
-          (apply f as))
-        fs)))
-
-(ann (map-with-funcs + - * /) (Number Number * -> (Listof Integer)))
-
-(ann (map-with-funcs + - * /) (Number * -> (Listof Number)))
-
-(ann (map-with-funcs + - * /) (Integer * -> (Listof Number)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/apply-dots.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/apply-dots.rkt
deleted file mode 100644
index fd2b031378..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/apply-dots.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed-scheme
-
-(plambda: (a ...) ([z : String] . [w : Number *])
-          (apply (case-lambda: (([x : Number] . [y : Number ... a]) x))
-                 w))
-
-(plambda: (a ...) ([z : String] . [w : Number *])
-          (apply (case-lambda: (([x : Number] . [y : Number ... a]) x)
-                               (([x : String] [y : String] . [z : String *]) 0)
-                               ([y : String *] 0))
-                 w))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/async-channel-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/async-channel-contract.rkt
deleted file mode 100644
index fb3b2795d8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/async-channel-contract.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#;
-(exn-pred #rx"could not convert type to a contract.*Async-Channelof")
-#lang racket/load
-
-;; Test typed-untyped interaction with channels
-
-(module typed typed/racket
-  (require typed/racket/async-channel)
-  (: ch (Async-Channelof (Boxof Integer)))
-  (define ch (make-async-channel))
-  (: putter (-> Thread))
-  (define (putter)
-    (thread (λ () (async-channel-put ch (box 3)))))
-  (provide putter ch))
-
-(require 'typed)
-(putter)
-(set-box! (async-channel-get ch) "not an integer")
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/back-and-forth.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/back-and-forth.rkt
deleted file mode 100644
index 8d530ca7c9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/back-and-forth.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#;
-(exn-pred exn:fail:contract? #rx"blaming: violator" #rx"f: contract violation")
-
-#lang scheme/load
-
-(module m typed/scheme
-  (: f (Number -> Number))
-  (define (f x) (add1 x))
-  (define g 17)
-  (provide f g))
-
-(module violator scheme
-  (require 'm)
-  (f 'foo))
-
-(module o typed/scheme
-  (require 'violator))
-
-(require 'o)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-ann.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-ann.rkt
deleted file mode 100644
index 1a70f854d0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-ann.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed/scheme
-
-
-(: f : Number -> Number)
-(define (f a b)
-  (+ a b))
-
-(define: (g [a : Number] [b : Number]) : Number
-  (+ a b))
-
-(f 1 2)
-(g 1 2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-any.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-any.rkt
deleted file mode 100644
index 3fc5acc832..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-any.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang scheme/load
-
-(module m typed-scheme
-  (: f Any)
-  (define f (lambda: ([x : Number]) (add1 x)))
-  (provide f))
-
-(module n scheme
-  (require 'm)
-  (f "foo"))
-
-(require 'n)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-first.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-first.rkt
deleted file mode 100644
index eb0fd623d3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-first.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed-scheme
-(require scheme/list)
-(first (cons 1 2))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-hash-ref.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-hash-ref.rkt
deleted file mode 100644
index 9829037331..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-hash-ref.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/scheme
-
-(: table (HashTable Integer (-> Integer)))
-(define table
-  (make-immutable-hash null))
-
-(: lookup (Integer -> Integer))
-(define (lookup n)
-
-  (: thunk (-> Integer))
-  (define thunk
-    (hash-ref table n (lambda () 0)))
-
-  (thunk))
-
-(lookup 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-map-poly.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-map-poly.rkt
deleted file mode 100644
index 280bd9bc54..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-map-poly.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;
-(exn-pred exn:fail:contract? ".*interface for bad-map.*")
-#lang scheme/load
-
-(module bad-map scheme
-  (provide bad-map)
-  (define (bad-map f l)
-    (list (f 'quux))))
-
-(module use-bad-map typed-scheme
-  (require/typed 'bad-map
-                 [bad-map (All (A B) ((A -> B) (Listof A) -> (Listof B)))])
-  (bad-map add1 (list 12 13 14)))
-
-(require 'use-bad-map)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-struct-top.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-struct-top.rkt
deleted file mode 100644
index ac7f0f3dd0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-struct-top.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn:pred #rx"Argument to Struct must be a structure")
-#lang typed/racket
-
-;; Make sure `Struct` constructor rejects bad arguments
-(: x (Struct Integer))
-(define x 3)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-type-app.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-type-app.rkt
deleted file mode 100644
index 3af92cbbc4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/bad-type-app.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;
-(exn-pred exn:fail:syntax?)
-#lang typed-scheme
-
-(define-typed-struct type ())
-
-(define-typed-struct (type-base type) ([name : Symbol]) #:transparent)
-(define-typed-struct (type-var  type) ([uniq : (U Symbol Number)]) #:transparent)
-(define-typed-struct (type-dots type) ([base : type])   #:transparent)
-
-(define-typed-struct (type-fun  type) ([args  : (Listof type)] [ret : type])  #:transparent)
-(define-typed-struct (type-un   type) ([cases : (Listof type)])               #:transparent)
-(define-typed-struct (type-vals type) ([elems : (Listof type)])               #:transparent)
-
-(define-typed-struct (type-poly type) ([vars  : (Listof (U (type-dots type-var) type-var))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/box-fail.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/box-fail.rkt
deleted file mode 100644
index 4d53f3ef53..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/box-fail.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed-scheme
-
-(let: ([x : (Boxof Number) (box "foo")]) x)
-
-(let ()
-  (: x (Boxof Number))
-  (define x (box "foo"))
-  x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda1.rkt
deleted file mode 100644
index 6d98ac7668..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda1.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;
-(exn-pred 1)
-#lang typed/racket
-(: f (case->
-  (Symbol Symbol *  -> Integer)
-  (Symbol * -> Symbol)))
-(define f (case-lambda
-            ((x . y) 4)
-             (w 'x)
-        ))
-
-((ann f (Symbol * -> Symbol)) 'x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda2.rkt
deleted file mode 100644
index 73bf35840a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda2.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/racket
-(: f (case->
-  (Symbol -> Symbol)
-  (Symbol Symbol -> Symbol)))
-(define f (case-lambda
-            ((x) x)
-             (w w)
-            ((x y) x)
-        ))
-
-(f 'x 'y)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda3.rkt
deleted file mode 100644
index e34df02640..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda3.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;
-(exn-pred 1)
-#lang typed/racket
-
-
-(: f (case->
-       (String -> String)
-       (String String -> String)
-       (String Symbol * -> String)))
-(define f
-  (case-lambda
-    ((x) x)
-    ((x y) y)
-    ((x . w) x)))
-
-(f "x" 'y)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda4.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda4.rkt
deleted file mode 100644
index 71e7c63595..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-lambda4.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;
-(exn-pred 1)
-#lang typed/racket
-
-
-(: f (case->
-       (Symbol * -> String)))
-(define f
-  (case-lambda
-    ((x . w) "hello")))
-
-(f 'x 'y)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-union-subtype.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-union-subtype.rkt
deleted file mode 100644
index 8d237b9d05..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/case-union-subtype.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang typed/racket #:no-optimize
-
-
-(define-type T
-     (case->
-       (String Symbol -> Symbol)
-       (Symbol String -> Symbol)))
-
-(define-type S ((U String Symbol) (U String Symbol) -> Symbol))
-
-(: f T)
-(define (f x y)
-  (if (and (string? x) (string? y))
-      "BROKEN"
-      'ok))
-
-(: g S)
-(define g f)
-
-(g "Hello" "World")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-mod1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-mod1.rkt
deleted file mode 100644
index 09c5ddff42..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-mod1.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn-pred exn:fail:contract? #rx".*produced: 3" #rx".*promised: String.*" )
-
-#lang typed/racket/base
-
-(cast 3 String)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-mod2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-mod2.rkt
deleted file mode 100644
index 3cf608025d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-mod2.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#;
-(exn-pred exn:fail:contract? #rx".*produced: 3" #rx".*promised: String.*" )
-
-#lang typed/racket/base
-
-((cast (lambda () 3) (-> String)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-mod3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-mod3.rkt
deleted file mode 100644
index 741e28994f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-mod3.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#;
-(exn-pred exn:fail:syntax? #rx".*free variables.*")
-
-#lang typed/racket/base
-
-(: f (All (a) (Number -> a)))
-(define (f x) (cast x a))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-top-level1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-top-level1.rkt
deleted file mode 100644
index 0b1b10d312..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-top-level1.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn-pred exn:fail:syntax? #rx".*could not be converted.*")
-
-#lang racket/load
-
-(require typed/racket)
-
-(cast 2 (All (a) (Ephemeronof a)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-top-level2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-top-level2.rkt
deleted file mode 100644
index c987633d1f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cast-top-level2.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#;
-(exn-pred exn:fail:syntax? #rx"free variables")
-
-#lang racket/load
-
-(require typed/racket/base)
-
-(define: (a) (f (x : Number)) : a
-  (cast x a))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/channel-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/channel-contract.rkt
deleted file mode 100644
index 4c8c8a98ab..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/channel-contract.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;
-(exn-pred #rx"expected: Integer.*blaming: top-level")
-#lang racket/load
-
-;; Test typed-untyped interaction with channels
-
-(module typed typed/racket
-  (: ch (Channelof (Boxof Integer)))
-  (define ch (make-channel))
-  (: putter (-> Thread))
-  (define (putter)
-    (thread (λ () (channel-put ch (box 3)))))
-  (provide putter ch))
-
-(require 'typed)
-(putter)
-(set-box! (channel-get ch) "not an integer")
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/check-expect-fail.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/check-expect-fail.rkt
deleted file mode 100644
index 7fd3ef0c99..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/check-expect-fail.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/scheme
-
-(require typed/test-engine/scheme-tests)
-(check-expect 3 (+ 1 'foo))
-
-(test)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cl-bug.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cl-bug.rkt
deleted file mode 100644
index 139d06eacc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cl-bug.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed-scheme
-
-(: f3 (case-lambda (Integer * -> Integer) (Number * -> Number)))
-(define (f3 x y) (+ x y))
-
-(: f2 (case-lambda (Number * -> Number)))
-(define (f2 x y) (+ x y))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cnt-err1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cnt-err1.rkt
deleted file mode 100644
index 905c27919d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cnt-err1.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#;
-(exn-pred exn:fail:contract? ".*cons/c.*" #rx".*contract.*\\(->.*")
-
-#lang scheme/load
-
-(module tree typed-scheme
- (define-type-alias Tree (Rec T (U (Pair T T) Number)))
-
- (: tree-sum (Tree -> Number))
- (define (tree-sum t)
-   (cond
-     [(number? t) t]
-     [else (+ (tree-sum (car t))
-              (tree-sum (cdr t)))]))
-
- (provide tree-sum))
-
-(module client scheme
- (require 'tree)
- (define (try-it bad?)
-   (if bad?
-       (tree-sum (cons 5 #f))
-       (tree-sum (cons 5 6))))
- (provide try-it))
-
-(require 'client)
-
-(try-it #t)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cnt-struct-err.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cnt-struct-err.rkt
deleted file mode 100644
index c0625f4c4c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/cnt-struct-err.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang scheme/load
-
-(module m typed-scheme
-  (define-struct: x ([f : (Number -> Number)]))
-  (: my-x x)
-  (define my-x (make-x (lambda: ([z : Number]) z)))
-  (provide (all-defined-out)))
-
-(module n2 scheme/base
-
-  (require 'm scheme/match)
-  (match my-x
-    [(struct x (f)) (f #f)]))
-
-
-(require 'n2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/contract-conversion-error.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/contract-conversion-error.rkt
deleted file mode 100644
index 3503527048..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/contract-conversion-error.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;
-(exn-pred #rx"function type has two cases of arity 1")
-#lang racket/load
-
-;; This tests the error message for contract generation errors
-;; that come from module provides.
-;;
-;; In particular, it should give a reason for why it failed
-
-(module a typed/racket (define v values) (provide v))
-(require 'a)
-v
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-1.rkt
deleted file mode 100644
index e65ade723f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-1.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang racket/load
-
-;; check typed-untyped interaction with continuations
-
-;; continuations & prompt tags
-(module typed typed/racket
-  (provide call-f)
-
-  (: tag (Prompt-Tagof String (Integer -> String)))
-  (define tag (make-continuation-prompt-tag))
-
-  (: call-f (((Prompt-Tagof String (Integer -> String)) -> String) -> String))
-  (define (call-f f)
-    (call-with-continuation-prompt
-     (λ () (f tag))
-     tag
-     (λ: ([x : Integer]) (number->string x)))))
-
-(module untyped racket
-  (require 'typed)
-
-  (call-f
-   (λ (tag)
-     (abort-current-continuation tag "bad"))))
-
-(require 'untyped)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-2.rkt
deleted file mode 100644
index 0ee3fe3d1c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-2.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang racket/load
-
-;; check typed-untyped interaction with call/cc
-
-;; continuations & prompt tags
-(module typed typed/racket
-  (provide tag call-f)
-
-  (: tag (Prompt-Tagof String (Integer -> String)))
-  (define tag (make-continuation-prompt-tag))
-
-  (: call-f (((Prompt-Tagof String (Integer -> String)) -> String) -> String))
-  (define (call-f f)
-    (call-with-continuation-prompt
-     (λ () (f tag))
-     tag
-     (λ: ([x : Integer]) (number->string x)))))
-
-;; call/cc
-(module untyped racket
-  (require 'typed)
-
-  ;; construct an abortive continuation
-  (define (make-abort-k tag)
-    (call-with-continuation-prompt
-     (λ () (call/cc (λ (k) k) tag))
-     tag))
-
-  (call-f
-   (λ (tag) ((make-abort-k tag) 'bad))))
-
-(require 'untyped)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-3.rkt
deleted file mode 100644
index dbbbf142ca..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-3.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang racket/load
-
-;; check typed-untyped interaction with default tag
-
-(module untyped racket
-  (provide call-f)
-
-  (define (call-f f)
-    (call-with-continuation-prompt
-     (λ () (f 0))
-     (default-continuation-prompt-tag)
-     ;; this application should fail due to the any wrapping
-     ;; for the TR function that's aborted here
-     (λ (x) (x "string")))))
-
-(module typed typed/racket
-  (require/typed 'untyped
-                 [call-f ((Integer -> Integer) -> Integer)])
-
-  (call-f
-   (λ: ([x : Integer])
-     ;; this abort should wrap with an Any wrapper
-     (abort-current-continuation
-      (default-continuation-prompt-tag)
-      (λ (x) x)))))
-
-(require 'typed)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-4.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-4.rkt
deleted file mode 100644
index 1f3a50adbe..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-4.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang racket/load
-
-;; check typed-untyped interaction with cont marks
-
-(module typed typed/racket
-  (provide call-f)
-
-  (: key (Continuation-Mark-Keyof (Integer -> String)))
-  (define key (make-continuation-mark-key))
-
-  (: call-f (((Continuation-Mark-Keyof (Integer -> String)) -> String)
-             -> String))
-  (define (call-f f)
-    (with-continuation-mark
-     key (λ (n) (number->string n))
-     (f key))))
-
-(module untyped racket
-  (require 'typed)
-
-  (call-f
-   (λ (key)
-     (string-append "hello "
-                    ((continuation-mark-set-first #f key) 'bad)))))
-
-(require 'untyped)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-5.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-5.rkt
deleted file mode 100644
index 7603f94306..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-5.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang racket/load
-
-;; check typed-untyped interaction with cont marks
-
-(module typed typed/racket
-  (provide key f)
-
-  (: key (Continuation-Mark-Keyof String))
-  (define key (make-continuation-mark-key))
-
-  (: f (-> String))
-  (define (f)
-    (apply string-append
-           (continuation-mark-set->list
-            (current-continuation-marks)
-            key))))
-
-(module untyped racket
-  (require 'typed)
-
-  (with-continuation-mark
-   key 'hello ; should be string
-   (f)))
-
-(require 'untyped)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-6.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-6.rkt
deleted file mode 100644
index 4043b83978..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/control-test-6.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang racket/load
-
-;; check Any wrapper for default-continuation-prompt-tag
-
-(module typed typed/racket
-  (provide f)
-
-  (: f (-> Void))
-  (define (f)
-    (abort-current-continuation
-     (default-continuation-prompt-tag)
-     (λ: ([x : Number]) (+ 1 x)))))
-
-(module untyped racket
-  (require 'typed)
-
-  (call-with-continuation-prompt
-   (λ () (f))
-   (default-continuation-prompt-tag)
-   ;; behavioral values are not allowed to pass
-   ;; through the Any contract to here
-   (λ (f) (f 3))))
-
-(require 'untyped)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/dead-substruct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/dead-substruct.rkt
deleted file mode 100644
index 2e79f4aecd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/dead-substruct.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed/scheme
-
-(define-struct: parent ((x : Integer)))
-(define-struct: (child1 parent) ((y : Integer)))
-(define-struct: (child2 parent) ((y : Float)))
-
-(: f (parent -> Integer))
-(define (f x)
-  (cond [(child1? x) (+ "a" "b")] ; rhs was considered dead code
-        [(child2? x) 2]
-        [else (error "eh?")]))
-
-(f (make-child1 1 2))
-(f (make-child2 1 2.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/define-values-bottom.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/define-values-bottom.rkt
deleted file mode 100644
index f737176737..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/define-values-bottom.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#;
-(exn-pred "runtime")
-#lang typed/racket
-
-;; Make sure -Bottom and multiple values play nice together at the module level.
-(define-values (a b)
-  (error 'runtime))
-
-b
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/define-zero-values.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/define-zero-values.rkt
deleted file mode 100644
index 8fd0b06f81..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/define-zero-values.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed/racket
-
-(define-values () (+ 1 "x"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/dup-ann.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/dup-ann.rkt
deleted file mode 100644
index 7fd2210082..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/dup-ann.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed/racket
-(: bar : (String -> String))
-(: bar : (Number -> Number))
-(define (bar x)
-  (+ x 1))
-
-
-(define: (foo) : Number
-  (: bar : (Number -> Number))
-  (define: (bar [x : Number]) : Number
-    (+ x 1))
-  (bar 5))
-
-
-(: baz Number)
-(define: baz : Number 7)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/duplicate-ann.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/duplicate-ann.rkt
deleted file mode 100644
index e7a4e37b4c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/duplicate-ann.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scheme/load
-
-(module square typed-scheme
-
-  ;(provide: [square (Integer -> Integer)])
-  (provide: [square (Integer -> Integer)])
-  ;(: square (Number -> Number))
-  (define: (square [n : Number]) : Number
-    (* n n))
-  )
-
-(module squareclient typed-scheme
-
-  (require 'square)
-
-  (square 10)  ;; 100
-  (integer? 10.1)  ;; #f
-  (square 10.1)  ;; 102.009999...
-  )
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/error-pruning1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/error-pruning1.rkt
deleted file mode 100644
index 0e37e7cfe0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/error-pruning1.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;
-(exn-pred #px"^((?!Integer).)+$")
-#lang typed/racket
-
-;; Tests that function type pruning in errors is working. If the string
-;; "Integer" shows up the error (which should be about Number), then
-;; pruning is broken.
-;; Because `exn-pred' only checks the first line of the error, only one
-;; error expression per file (otherwise, the first line is a summary).
-
-(add1 'foo1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/error-pruning2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/error-pruning2.rkt
deleted file mode 100644
index 1fe5967fc1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/error-pruning2.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;
-(exn-pred #px"^((?!Integer).)+$")
-#lang typed/racket
-
-;; Tests that function type pruning in errors is working. If the string
-;; "Integer" shows up the error (which should be about Number), then
-;; pruning is broken.
-;; Because `exn-pred' only checks the first line of the error, only one
-;; error expression per file (otherwise, the first line is a summary).
-
-(+ 'foo1 3)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/error-pruning3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/error-pruning3.rkt
deleted file mode 100644
index 3222394075..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/error-pruning3.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;
-(exn-pred #px"^((?!Integer).)+$")
-#lang typed/racket
-
-;; Tests that function type pruning in errors is working. If the string
-;; "Integer" shows up the error (which should be about Number), then
-;; pruning is broken.
-;; Because `exn-pred' only checks the first line of the error, only one
-;; error expression per file (otherwise, the first line is a summary).
-
-(+ 'foo1 "a")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/even-odd-recursive-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/even-odd-recursive-contract.rkt
deleted file mode 100644
index 00c2370861..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/even-odd-recursive-contract.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#;
-(exn-pred #rx"blaming: \\(interface for even->odd\\)")
-#lang racket/load
-
-;; Test mutually recursive type alias contract generation
-;; with polymorphism
-
-(module untyped racket
-  (define (even->odd elem lst) (cons 3 lst))
-  (provide even->odd))
-
-(module poly-even/odd typed/racket
-  (define-type (Even A) (U Null (Pairof A (Odd A))))
-  (define-type (Odd A) (Pairof A (Even A)))
-
-  (: even-lst (Even Integer))
-  (define even-lst '(1 2 3 4))
-
-  (: odd-lst (Odd Integer))
-  (define odd-lst '(1 2 3))
-
-  (require/typed 'untyped
-                 [even->odd (All (A) (A (Even A) -> (Odd A)))])
-
-  (even->odd 3 even-lst) )
-
-(require 'poly-even/odd)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/exn-any.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/exn-any.rkt
deleted file mode 100644
index 48b4dab902..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/exn-any.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;
-(exn-pred "Any")
-#lang racket/load
-
-(module m typed/racket
-  (struct: s ())
-  
-  (struct: s2 s ())
-  (define:  v : Any (s2))
-  (provide v))
-
-(module n racket
-  (require 'm)
-  v)
-
-(require 'n)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/explicit-fail.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/explicit-fail.rkt
deleted file mode 100644
index c59b8ca41e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/explicit-fail.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;
-(exn-fail "incomplete coverage; missing coverage of Negative-Integer")
-#lang typed/racket
-
-(define-syntax (cond* stx)
-  (syntax-case stx ()
-    [(_ x clause ...)
-     #`(cond clause ... [else (typecheck-fail #,stx "incomplete coverage" #:covered-id x)])]))
-
-(: f : (U String Integer) -> Boolean)
-(define (f x)
-  (cond* x
-         [(string? x) #t]
-         [(exact-nonnegative-integer? x) #f]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/flat-contract-name.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/flat-contract-name.rkt
deleted file mode 100644
index 5a5e8ca0d0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/flat-contract-name.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;
-(exn-pred #rx"expected: 0")
-
-#lang racket
-
-;; The purpose of this test is to make sure that contract
-;; errors for (Value x) types print in a good way
-
-(module a typed/racket
-  (define: (f [x : Zero]) : Zero x)
-  (provide f))
-
-(require 'a)
-(f "foo")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/for-multiple-annotations.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/for-multiple-annotations.rkt
deleted file mode 100644
index e2f8ca6e7e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/for-multiple-annotations.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn-pred "bad syntax")
-#lang typed/racket/base
-
-(for: : Void : Void ((i 5))
-  (displayln i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/formal-len-mismatches.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/formal-len-mismatches.rkt
deleted file mode 100644
index 371e3e7b48..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/formal-len-mismatches.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang typed-scheme
-
-(: f (Integer Integer Integer * -> Integer))
-(define (f x)
-  (+ #\c x))
-
-(: f2 (Integer Integer * -> Integer))
-(define (f2 x y . z)
-  (apply + #\c x y z))
-
-(: f4 (Integer Integer -> Integer))
-(define (f4 x y w . z)
-  (apply + #\c x y w z))
-
-(: f3 (Integer Integer -> Integer))
-(define (f3 x . z)
-  (apply + #\c x z))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/gadt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/gadt.rkt
deleted file mode 100644
index cc3458b62d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/gadt.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang typed-scheme
-#|
-data Exp a =
-Num :: Int -> Exp Int
-Sum :: Int -> Int -> Exp Int
-Zero :: Exp Int -> Exp Bool
-|#
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias top Any)
-
-#;(define-typed-struct (a) Exp ([flag : a]))
-(define-typed-struct (a) Num ([v : number]))
-(define-typed-struct (a) Zero ([e : (Un (Num number) (Zero number))]))
-
-(define-type-alias (Expr a) (Un (Num a) (Zero a)))
-
-(pdefine: (a) (ev [x : (Expr a)]) : a
-	  (cond
-	   [(Num? x) (Num-v x)]
-	   [(Zero? x) (= 0 #{(#{ev :: (All (b) ((Expr b) -> b))} #{(Zero-e x) :: (Expr number)}) :: number})]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/heterogeneous-vector-bad-ann.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/heterogeneous-vector-bad-ann.rkt
deleted file mode 100644
index e938f63b92..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/heterogeneous-vector-bad-ann.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed/racket
-
-(ann (vector (ann 1 Symbol)) (Vector Number Symbol))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/ht-infer.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/ht-infer.rkt
deleted file mode 100644
index 1e5eed96ca..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/ht-infer.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang scheme/load
-
-(module before typed/scheme
-
-  (provide (all-defined-out))
-
-  (define-struct: Sigil ())
-
-  (: list->english ((Listof String) -> String))
-  (define (list->english strs) (error 'fail))
-
-  (define-type-alias (Set X) (HashTable X '()))
-
-  (: empty-set (All (T) (-> (Set T))))
-  (define (empty-set) (error 'fail))
-
-  (: set->list (All (T) ((Set T) -> (Listof T))))
-  (define (set->list set) (error 'fail))
-  )
-
-(module after typed/scheme
-  (require 'before)
-
-  (: f ((Set Sigil) -> Any))
-  (define (f x1)
-    (let* ([x2 (set->list x1)])
-      (list->english x2)
-      (error 'NO! "Way!"))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/inexact-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/inexact-complex.rkt
deleted file mode 100644
index 1619911c9f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/inexact-complex.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed/scheme
-
-(ann 1+2i Inexact-Complex)
-
-(: f (Real -> Inexact-Complex))
-(define (f x)
-  (* x 2.0)) ; x can be exact 0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/infer-dots.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/infer-dots.rkt
deleted file mode 100644
index 04af012527..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/infer-dots.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed-scheme
-
-(require typed-racket/base-env/extra-procs)
-
-(map + (list 1 2 3) (list 10 20 30) (list 'a 'b 'c))
-
-;; Arity mismatch.
-(: g (Integer Integer Integer -> Integer))
-(define (g x y z) 0)
-
-(map g (list 1 2 3) (list 4 5 6))
-
-(: h (Integer Integer Integer * -> Integer))
-(define (h x y . z) 0)
-
-(map h (list 1 2 3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/internal-ann.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/internal-ann.rkt
deleted file mode 100644
index f38852fd2d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/internal-ann.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#lang typed/scheme/base
-
-(define (f x)
- (: g (Integer -> Integer))
- (define (g x)
-   (+ x 2))
- (g x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/internal-vector-error.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/internal-vector-error.rkt
deleted file mode 100644
index 9da9cc3fa9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/internal-vector-error.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;
-(exn-pred #rx"expected: 2 values\n  given: 1 value")
-#lang typed/racket
-
-;; This test ensures that the following snippet doesn't
-;; result in an internal error.
-;;
-;; see
-;; http://lists.racket-lang.org/dev/archive/2013-January/011614.html
-
-(: f (-> (Values String (Vector Integer Integer))))
-(define (f) (vector 1 2))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/log-not-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/log-not-complex.rkt
deleted file mode 100644
index 450a6596c4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/log-not-complex.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#;
-(exn-pred 1)
-#lang typed/scheme
-
-(ann (log 2.0) Inexact-Complex)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-mod1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-mod1.rkt
deleted file mode 100644
index 16d1664d4c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-mod1.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn-pred exn:fail:syntax? #rx".*could not be converted to a predicate.*")
-
-#lang typed/racket/base
-
-(make-predicate (Number -> Number))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-mod2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-mod2.rkt
deleted file mode 100644
index eaa8ebbe26..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-mod2.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#;
-(exn-pred exn:fail:syntax? #rx".*free variables.*")
-
-#lang typed/racket/base
-
-(: f (All (a) (Number -> (Any -> Boolean : a))))
-(define (f x) (make-predicate a))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-top-level1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-top-level1.rkt
deleted file mode 100644
index 4b4de09674..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-top-level1.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#;
-(exn-pred exn:fail:syntax? #rx".*could not be converted to a predicate.*")
-
-#lang racket/load
-(require typed/racket/base)
-
-(make-predicate (Number -> Number))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-top-level2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-top-level2.rkt
deleted file mode 100644
index 32a02e0798..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/make-predicate-top-level2.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn-pred exn:fail:syntax? #rx"free variables")
-
-#lang racket/load
-(require typed/racket/base)
-
-(: f (All (a) (Number -> (Any -> Boolean : a))))
-(define (f x) (make-predicate a))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/mandatory-kw.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/mandatory-kw.rkt
deleted file mode 100644
index a388301c4e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/mandatory-kw.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;
-(exn:pred (lambda (e) (regexp-match? "Type Checker" e)))
-#lang typed/racket
-
-;; This should raise a type error and not an internal error
-
-(: f (#:foo False -> False))
-(define (f #:foo foo) foo)
-
-;; bad call that's missing a mandatory keyword
-(f)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/missing-rest-arguments.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/missing-rest-arguments.rkt
deleted file mode 100644
index ee3ca0f409..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/missing-rest-arguments.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed/racket
-
-(: f (Symbol Symbol * -> Symbol))
-(: g (All (A ...) (Symbol A ... A -> Symbol)))
-(define (f x y) x)
-(define (g x y) x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/multiple-annotations-define.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/multiple-annotations-define.rkt
deleted file mode 100644
index 5e6b118082..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/multiple-annotations-define.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn-pred 1 "Body had type:.*Variable had type:.*")
-#lang typed/racket
-
-
-(: a Integer)
-(: b String)
-(define-values (a b c) (values 1 2 3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/nested-tvars.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/nested-tvars.rkt
deleted file mode 100644
index 21438e598b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/nested-tvars.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed-scheme
-
-(: f (All (a) (a -> a)))
-(define (f x)
- (: g (All (b) (a (Listof a) -> (Listof a))))
- (define (g x y) y)
- (g "foo" (list "foo")))
-
-(f 3)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/non-portable-fixnum-singleton.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/non-portable-fixnum-singleton.rkt
deleted file mode 100644
index 04cd1a0bbf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/non-portable-fixnum-singleton.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn-pred exn:fail:syntax?)
-#lang typed/racket
-;; singleton types for values who runtime type depends is platform-dependent are unsafe
-;; PR13501
-(define: z : 10000000000000 10000000000000)
-
-(ann (if (and #t (fixnum? z)) z 0) (U 0 1))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/non-productive-rec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/non-productive-rec.rkt
deleted file mode 100644
index 83101903ec..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/non-productive-rec.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn-pred 1)
-
-#lang typed/racket/base
-(define-type Hole (Rec Hole (U Number Hole)))
-(ann "aaa" Hole)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/non-productive-rec2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/non-productive-rec2.rkt
deleted file mode 100644
index 12e0d20c73..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/non-productive-rec2.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#;
-(exn-pred 1)
-
-#lang typed/racket
-
-(define-struct: node ({left : Tree} {right : Tree}) #:transparent)
-(define-type Tree (Rec Tree (U Number Tree)))
-;; Tree = Number | (node Tree Tree)
-
-(: tree-sum (Tree -> Number))
-;; sum up all numbers in the tree
-(define (tree-sum t)
-  (cond
-    [(number? t) t]
-    [else (+ (tree-sum (node-left t)) (tree-sum (node-right t)))]))
-
-(define n (node (node 12000000000000.1 .0000000000000000000000001) 2))
-
-(tree-sum n)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/nonnegative-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/nonnegative-float.rkt
deleted file mode 100644
index ac7974818a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/nonnegative-float.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#;
-(exn-pred 1)
-#lang typed/scheme
-
-(ann (- 1.0 0.5) Nonnegative-Float) ; can't prove it's nonnegative
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/opaque-overlap.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/opaque-overlap.rkt
deleted file mode 100644
index 20b244186f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/opaque-overlap.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;
-(exn-pred "'success")
-
-;; PR 12434
-(module B typed/racket
-
- (require/typed racket
-   [opaque NN number?]
-   [pi NN])
-  
-  (define a string)
- ;; => 'failure
-  (ann (match pi
-         [(list n) 'success]
-         [other 'failure])
-       (U #;'success 'failure)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/other-module-mutation.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/other-module-mutation.rkt
deleted file mode 100644
index 22cd7204b1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/other-module-mutation.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/load
-
-(module mutator typed/racket
-   (define: y : Integer 0)
-
-   (: set-y! (Integer -> Void))
-   (define (set-y! v)
-     (set! y v))
-
-   (provide y set-y!))
-
-(module user typed/racket
-   (require 'mutator)
-
-   (: foo (Zero -> Zero))
-   (define (foo y)
-     (printf "(foo ~v)~n" y)
-     y)
-
-   (cond [(zero? y) (set-y! 10)
-                     (foo y)]
-         [else y]))
-
-(require 'user)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/plambda-dup-tvar.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/plambda-dup-tvar.rkt
deleted file mode 100644
index 9cf2889d1b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/plambda-dup-tvar.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#;
-(exn-pred exn:fail:syntax?)
-#lang typed/racket
-
-;; don't allow duplicate type variable names
-
-(plambda: (a a a) ([x : a]) x)
-(popt-lambda: (a a a) ([x : a]) x)
-(pcase-lambda: (a a a) ([x : a]) x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-dup-name.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-dup-name.rkt
deleted file mode 100644
index e88d893726..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-dup-name.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn:pred (lambda (e) (regexp-match? "duplicate type variable" e)))
-#lang typed/racket
-
-;; don't allow duplicate type variable names
-
-(: f (All (A A) (A -> (List A))))
-(define (f a) (list a))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-expect-error.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-expect-error.rkt
deleted file mode 100644
index c4277c7b70..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-expect-error.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#;
-(exn-pred "Boolean")
-#lang typed-scheme
-
-(: f (All (A) (case-lambda (String -> Boolean) (A -> Boolean))))
-(define (f x) #t)
-
-(: x Number)
-(define x (f 3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-struct-parent.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-struct-parent.rkt
deleted file mode 100644
index 345ce3420b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-struct-parent.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket
-
-(define-struct: (A) Box ([value : A]))
-(define-struct: (A) (Child-Box Box) ())
-
-
-(ann (Box-value (Child-Box 'sym)) Nothing)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-struct-parent2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-struct-parent2.rkt
deleted file mode 100644
index 5107ecb3dc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-struct-parent2.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#;
-("Could not instantiate parent struct type")
-#lang typed/racket
-
-(define-struct: (A) Box ([value : A]))
-(define-struct: (Child-Box Box) ())
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-struct-parent3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-struct-parent3.rkt
deleted file mode 100644
index 0d7b269b74..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/poly-struct-parent3.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#;
-("Could not instantiate parent struct type")
-#lang typed/racket
-
-(define-struct: (A B) Box ([value : A]
-                           [other : B]))
-(define-struct: (C) (Child-Box Box) ())
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polydots-dup-name.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polydots-dup-name.rkt
deleted file mode 100644
index 5fa6e21bec..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polydots-dup-name.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#;
-(exn:pred (lambda (e) (regexp-match? "duplicate type variable or index" e)))
-#lang typed/racket
-
-;; don't allow duplicate names in indexes and tvars
-
-(: f (All (A A ...) (A A ... A -> (List A ... A))))
-
-(define (f a . xs)
-  (map (λ: ([x : A]) a) xs))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polymorphic-recursion-2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polymorphic-recursion-2.rkt
deleted file mode 100644
index 29f808fc5b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polymorphic-recursion-2.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn-pred #rx"cannot be applied at a different type")
-#lang typed/racket
-
-;; Polymorphic recursion should fail
-
-(define-type (Foo A) (Listof (Foo (Listof A))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polymorphic-recursion-3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polymorphic-recursion-3.rkt
deleted file mode 100644
index 13b80b0fcd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polymorphic-recursion-3.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;
-(exn-pred #rx"cannot be applied at a different type")
-#lang typed/racket
-
-;; Polymorphic recursion should fail through mutual recursion
-
-(define-type (Foo A) (Listof (Bar (Listof A))))
-(define-type (Bar B) (Listof (Foo (Listof B))))
-
-(define-type (Foo2 A) (Listof (Bar2 (Listof A))))
-(define-type (Bar2 B) (Listof (Foo2 B)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polymorphic-recursion.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polymorphic-recursion.rkt
deleted file mode 100644
index 997571a11f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/polymorphic-recursion.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#;
-(exn-pred #rx"cannot be applied at a different type")
-#lang typed/racket
-
-;; Example from Wikipedia
-;; http://en.wikipedia.org/w/index.php?title=Polymorphic_recursion&oldid=543854337
-
-;; Note that the following code does not work, but some
-;; of it could work if polymorphic recursion were implemented
-;; in the future.
-;;
-;; Right now the type definition of Nested should throw a static error
-
-(struct: (A B) :<: ([left : A] [right : B])
-         #:transparent)
-(struct: ε ())
-
-;; Note that this type uses polymorphic recursion
-(define-type (Nested A)
-  (U (:<: A (Nested (Listof A))) ε))
-
-(: nested (Nested Integer))
-(define nested
-  (:<: 1 (:<: (list 2 3 4) (:<: (list (list 4 5) (list 7) (list 8 9)) (ε)))))
-
-;; inference loops forever for this one...
-(: nested-length (All (A) ((Nested A) -> Integer)))
-(define (nested-length n)
-  (if (ε? n)
-      0
-      ;; explicit instantiation needed
-      (add1 ((inst nested-length (Listof A)) (:<:-right n)))))
-
-;; Test subtyping with polymorphic recursion
-(: nested2 (Nested Number))
-(define nested2 nested)
-
-(provide nested nested-length :<: Nested ε)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/port-to-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/port-to-list.rkt
deleted file mode 100644
index 490f72e33b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/port-to-list.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed/racket
-(car (car
-      (parameterize ((current-input-port (open-input-string "2")))
-              ((inst port->list (List Number))))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr10350.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr10350.rkt
deleted file mode 100644
index 24731daef8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr10350.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed-scheme
-(require/typed
- scheme/base
- [values (All (T) ((Any -> Boolean) -> (Any -> Boolean : T)))])
-
-(: number->string? (Any -> Boolean : (Number -> String)))
-(define (number->string? x)
-  (((inst values (Number -> String)) procedure?) x))
-
-(: f (Number -> String))
-(define f
-  (if (number->string? +) + number->string))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr10594.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr10594.rkt
deleted file mode 100644
index c0cffc7a73..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr10594.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#;
-(exn-pred exn:fail:contract? #rx".*contract violation.*blaming: U.*")
-#lang scheme/load
-
-(module T typed-scheme
-
-  (define-struct: [a] thing ([get : a]))
-
-  (: thing->string ((thing String) -> String))
-  (define (thing->string x)
-    (string-append "foo" (thing-get x)))
-
-  (provide (all-defined-out)))
-
-(module U scheme
-
-  (require 'T)
-
-  (thing->string (make-thing 5)))
-
-(require 'U)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr10936.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr10936.rkt
deleted file mode 100644
index 855aa11de5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr10936.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed/racket
-(define: my-rest : (All (elem) (elem elem * -> (Listof elem)))
-  (lambda ( #{ arg : elem} . #{ tail : (Listof elem) }) 
-    (rest tail)))
-(define: my-rest2 : (All (elem) (elem elem * -> (Listof elem)))
-  (lambda ( #{ arg : elem} . #{ tail : elem }) 
-    (rest tail)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11560.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11560.rkt
deleted file mode 100644
index ed3515dec0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11560.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang typed/racket/base
-(ann (ann 5 Real) Integer)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11686.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11686.rkt
deleted file mode 100644
index 83d371fc8d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11686.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-
-#lang racket/load
-
-(module T typed/racket
-
-  (struct: [X] doll ([contents : X]))
-
-  (define-type RussianDoll
-    (Rec RD (U 'center (doll RD))))
-
-  (: f (RussianDoll -> RussianDoll))
-  (define (f rd) rd)
-
-  (: md (All (x) (x -> (doll x))))
-  (define md doll)
-
-  (provide (all-defined-out)))
-
-(module U racket
- (require 'T)
- (f (md 3)))
-
-(require 'U)
-
-
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11772.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11772.rkt
deleted file mode 100644
index 0e96bf4771..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11772.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang typed/racket
-
-(require racket/list)
-
-(define-type expression 'expression)
-
-
-(: foo (expression -> expression))
-(define (foo expr)
-  (define-values (a b)
-    (for/fold: : (values (Listof Symbol) expression)
-               ((remaining-funs : (Listof Symbol) empty)
-                (body : expression 'expression))
-               ((fun : Symbol empty))
-               (if (empty? (filter even? '(1 2))) ;non-trival list
-                   (values remaining-funs body)
-                   (values (cons fun remaining-funs body)))))
-
-  ;error is on line above. paren should be moved before body
-  (error 'dont-care))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11998.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11998.rkt
deleted file mode 100644
index 72320dad80..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr11998.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/load
-(module p typed/racket
-  (struct: (a) p ((v : a)))
-  (provide p p-v))
-
-(module p2 typed/racket
-  (struct: (a) p ((v : a)))
-  (provide p))
-
-
-(module m typed/racket
-  (require (only-in 'p p-v) 'p2)
-  (p-v (p 0)))
-
-(require 'm)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr12706.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr12706.rkt
deleted file mode 100644
index 40e71b5f79..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr12706.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed/racket
-
-(: foo (Nonnegative-Float -> Nonnegative-Float))
-(define (foo x)
-  (cond [(> x 0.0)  1.0]
-        [else  (ann x String)]))
-
-(foo 0.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr12985.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr12985.rkt
deleted file mode 100644
index b7e0ec8478..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr12985.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed/racket/base
-
-(define-type T (Rec T (U (Pair String T) (Pair Char T))))
-(define-type S (Rec S (Pair (U String Char) S)))
-
-(: f (S -> S))
-(: g (T -> T))
-
-(define (f x) (cons "string" (cons #\a x)))
-(define g f)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13123.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13123.rkt
deleted file mode 100644
index 5ef84986fb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13123.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/racket
-
-(: unsound-cast (All (a b) (a b -> a)))
-(define (unsound-cast w r)
-  (let: ([x : a w])
-    (: set-x (All (a)
-                  (a -> Void)))
-    (define (set-x y)
-      (set! x y))
-    (set-x r)
-    x))
-
-(: wrong Integer)
-(define wrong (unsound-cast 42 'oops))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13209.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13209.rkt
deleted file mode 100644
index 78a9aee7f5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13209.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;
-(exn-pred #rx"arguments for structure type constructor")
-#lang typed/racket
-
-;; Test for PR 13209
-;;
-;; The use of `node` at the end has the wrong number of
-;; type arguments. This should not raise an internal error.
-
-(struct: (α) leaf ({value : α}))
-(struct: (α) node ({left : [Tree α]} {right : [Tree α]}))
-
-(define-type (Tree α) (mu Tree (U (leaf α) (node Tree Tree))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13218.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13218.rkt
deleted file mode 100644
index 931f36b1e3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13218.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket
-
-(: sum ((Listof Flonum) -> Flonum))
-(define (sum ws) (apply + ws))
-
-(ann (sum '()) Flonum)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233-2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233-2.rkt
deleted file mode 100644
index 4b4e1216ec..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233-2.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;
-(exn:pred #rx"Expected Zero, but got (U Nonpositive-Integer Byte-Larger-Than-One Positive-Index-Not-Byte Positive-Fixnum-Not-Index Positive-Integer-Not-Fixnum)")
-#lang typed/racket
-
-;; test odd? filter
-
-(: foo (Integer -> String))
-(define (foo n)
-  (if (odd? n)
-      "dummy"
-      (o n)))
-
-(: o (One -> String))
-(define (o x) "dummy")
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233-3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233-3.rkt
deleted file mode 100644
index da8d1380d4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233-3.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;
-(exn:pred #rx"Expected Zero, but got (U Negative-Integer Positive-Integer)")
-#lang typed/racket
-
-;; test even? filter
-
-(: foo (Integer -> String))
-(define (foo n)
-  (if (even? n)
-      "dummy"
-      (z n)))
-
-(: z (Zero -> String))
-(define (z x) "dummy")
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233-4.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233-4.rkt
deleted file mode 100644
index e6eb235df3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233-4.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;
-(exn:pred #rx"Expected One, but got (U Nonpositive-Integer Byte-Larger-Than-One Positive-Index-Not-Byte Positive-Fixnum-Not-Index Positive-Integer-Not-Fixnum)")
-#lang typed/racket
-
-;; test even? filter
-
-(: foo (Integer -> String))
-(define (foo n)
-  (if (even? n)
-      (o n)
-      "dummy"))
-
-(: o (One -> String))
-(define (o x) "dummy")
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233.rkt
deleted file mode 100644
index 37962e995d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13233.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;
-(exn-pred "expected: Zero\n  given:")
-#lang typed/racket
-
-;; test odd? filter
-
-(: foo (Integer -> Zero))
-(define (foo n)
-  (if (odd? n)
-      0
-      n))
-
-(: ZERO Zero)
-(define ZERO (foo 2))
-
-ZERO
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13274.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13274.rkt
deleted file mode 100644
index d1d9fad5f3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13274.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang racket/base
-
-(module f-t typed/racket
-  (: flomap-transform (case-> (Integer Integer -> Integer)
-                              (Integer Integer Integer Integer Integer Integer -> Integer)))
-  (define flomap-transform
-    (case-lambda
-      [(fm t)                             fm]
-      [(fm t x-start y-start x-end y-end) fm]))
-  (provide flomap-transform))
-
-(require 'f-t)
-
-(flomap-transform 2 3 4) ; only accepts 2 or 6 arguments
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13289.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13289.rkt
deleted file mode 100644
index 62c5d19c5a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13289.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#;
-(exn-pred #rx"fail/pr13289.rkt:9:10:.*in: Natural")
-#lang typed/racket
-
-;; This test ensures that the error message for misuse of
-;; type names has a source location and reports with the correct
-;; syntax
-
-(assert 2 Natural)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365-variation-1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365-variation-1.rkt
deleted file mode 100644
index 1d8a69d2e2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365-variation-1.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn-pred #rx"expected: 0 values and `a ...'")
-#lang typed/racket
-
-(: f (All (a ...) (a ... a -> (Values a ... a))))
-(define (f . x) x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365-variation-2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365-variation-2.rkt
deleted file mode 100644
index 55f32de8cd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365-variation-2.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn-pred #rx"expected: 1 value and `a ...'\n  given: 1 value")
-#lang typed/racket
-
-(: f (All (a ...) (a ... a -> (Values String a ... a))))
-(define (f . x) x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365-variation-3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365-variation-3.rkt
deleted file mode 100644
index b73fda5459..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365-variation-3.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn-pred #rx"Expected a ...")
-#lang typed/racket
-
-(: f (All (a ...) (a ... a -> (Values a ... a))))
-(define (f . x) (values 1))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365.rkt
deleted file mode 100644
index bf44de0d7f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13365.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn-pred #rx"expected: 0 values and `a ...'")
-#lang typed/racket
-
-(: f (All (a ...) (a ... a -> (Values a ... a))))
-(define f (lambda: (x : a ... a) x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13446.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13446.rkt
deleted file mode 100644
index 7cc6481131..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13446.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;
-(exn-pred #rx"blaming: top-level")
-#lang racket/load
-
-(module a typed/racket
-  (provide p)
-  (: p (Parameterof String Index))
-  (define p (make-parameter 0 string-length)))
-
-(require 'a)
-(p 0)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13448.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13448.rkt
deleted file mode 100644
index d3ebfd0265..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13448.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-(: foo
-   (case-> 
-     (Number -> Number)
-     (Number String -> Number)
-     (Number String String * -> Number)))
-(define (foo x (s1 "") . s) x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13526.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13526.rkt
deleted file mode 100644
index 3a02bef687..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13526.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn-pred #rx"Expected result: AnyValues")
-
-#lang typed/racket
-
-(map "hello" "world")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13562.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13562.rkt
deleted file mode 100644
index 1343853fe3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13562.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn-pred #rx"struct:: expected the literal")
-
-#lang typed/racket
-
-;; Check that #:methods is ruled out
-(struct: foo ([a : Integer]) #:methods gen:dict [])
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13577.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13577.rkt
deleted file mode 100644
index 4a136bde57..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13577.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn-pred #rx"expected: Integer")
-
-#lang typed/racket
-
-(for/sum ([k (in-naturals)])
-  (/ 1 (* k k)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13581.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13581.rkt
deleted file mode 100644
index 4284443549..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13581.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/racket
-(: g (All (a ...) (a ... a -> (List a ... a))))
-(define (g . rst)
-  (map
-   ;; 'a' is in scope due to map rule
-   (lambda: ([y : a]) 
-     (map
-      ;; in scope again
-      (lambda: ([z : a])
-        (set! y z)
-        z)
-      rst)
-     y)
-   rst))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13588.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13588.rkt
deleted file mode 100644
index 7d85f46e98..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13588.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#;
-(exn-pred #rx"identifier bound to a structure type")
-#lang typed/racket/base
-(require/typed racket/async-channel
-  [#:struct (async-channel +) ()])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13662.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13662.rkt
deleted file mode 100644
index 20f04a3ea3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13662.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#;
-(exn-pred #rx"contract violation" #rx"blaming: untyped")
-#lang racket/load
-
-(module typed typed/racket
-  (provide b g)
-
-  (: b (Boxof (All (a) (a -> a))))
-  (define b ((inst box (All (a) (a -> a))) (lambda (a) a)))
-  
-  (: g (Integer -> Integer))
-  (define (g x)
-    ((unbox b) x)))
-
-(module untyped racket
-  (require 'typed)
-  (set-box! b (lambda (x) "hello"))
-  (g 5))
-
-(require 'untyped)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13663.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13663.rkt
deleted file mode 100644
index 32babd732b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13663.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;
-(exn-pred #rx"contract violation" #rx"blaming: top-level")
-#lang racket/load
-
-(module typed typed/racket
-  (provide g)
-
-  (: f (Byte -> Natural))
-  (define (f x) (add1 x))
-  (: g ((Boxof Any) -> Void))
-  (define (g b) 
-    (set-box! b f)))
-
-(require 'typed)
-(define b (box #f))
-(g b)
-(displayln ((unbox b) "foo"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13664.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13664.rkt
deleted file mode 100644
index c081ff5937..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13664.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#;
-(exn-pred #rx"arity mismatch")
-#lang racket/load
-
-(module untyped racket
-  (provide f)
-  (define (f g)
-    (g "foo")))
-    
-
-(module typed typed/racket
-  (require/typed 'untyped
-    [f (Procedure -> Any)])
-
-  (: g (Byte -> Natural))
-  (define (g x) (add1 x))
-  
-  (f g))
-
-(require 'typed)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13665.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13665.rkt
deleted file mode 100644
index 37e3bc110b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13665.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#;
-(exn-pred #rx"contract violation"
-          #rx"higher-order value passed as `Any` in untyped code"
-          #rx"blaming: top-level")
-#lang racket/load
-
-(module typed typed/racket
-  (provide g)
-
-  (define-type Foo (Rec a (U (List Any) (Boxof a))))
-
-
-  (: f (Byte -> Natural))
-  (define (f x) (add1 x))
-  (: g (Foo -> Void))
-  (define (g b) 
-    (when (box? b)
-      (set-box! b (list f)))))
-
-(require 'typed)
-(define b (box (list #f)))
-(g b)
-(displayln ((first (unbox b)) "foo"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13746.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13746.rkt
deleted file mode 100644
index d03778a5b8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13746.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn:pred #rx"Procedure could not be converted to a predicate")
-#lang typed/racket
-
-(define-predicate A? Procedure)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13815.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13815.rkt
deleted file mode 100644
index c78e19357f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13815.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn:pred #rx"Type (All (a) Flonum) could not be converted to a contract")
-#lang typed/racket
-(require/typed racket/base [list (All (a) Float)])
-(* 3.3 list)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13893.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13893.rkt
deleted file mode 100644
index 376187b647..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13893.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#;
-(exn:pred #rx"Bad arguments to function in apply")
-#lang typed/racket
-
-;; Make sure that case-> types with multiple branches that
-;; includes a * domain produce a type error instead of
-;; accidentally type-checking.
-
-;; from the PR
-(: x (Listof Number))
-(define x (apply + (list 1 2 "3")))
-
-(: g (-> (Listof Number)))
-(define (g) (apply + (list 1 2 "3")))
-
-;; additional case
-(: f (case-> (Integer * -> Integer)
-             (Real * -> Real)))
-(define (f . args) (+ 1 (list-ref args 2)))
-(apply f (list 1 2 "3"))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13962.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13962.rkt
deleted file mode 100644
index 740e6e1e17..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr13962.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;
-(exn-pred "identifier bound to a structure type")
-#lang racket
-
-(module a racket
-  (provide struct:posn make-posn posn? posn-x posn-y
-           ;; this confuses require/typed
-           [rename-out (posn-thing posn)])
-
-  (struct posn (x y) #:transparent)
-  (define (make-posn x y) (posn x y))
-  (define posn-thing 0))
-
-(module b typed/racket
-  (require/typed (submod ".." a)
-                 [#:struct posn ([x : Real] [y : Real])]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14121.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14121.rkt
deleted file mode 100644
index f1f0431f60..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14121.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;
-(exn-pred #rx"expected: Number\n  given: \\(U Integer String\\)")
-#lang racket/load
-
-;; Test for PR 14121
-;; Top-level variables cannot be refined with occurrence typing
-;; because it's not possible to detect future set!s reliably
-
-(require typed/racket)
-
-(: x (U Integer String))
-(define x 3)
-(define f (if (integer? x) (lambda () (add1 x)) (lambda () 3)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14144.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14144.rkt
deleted file mode 100644
index e28ea1121e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14144.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;
-(exn-pred #rx"expected: 'foo\n  given: 'bar")
-#lang racket/load
-
-;; Test for PR 14144
-;; Make sure that the second definition is checked
-;; against the synthesized type for the first definition
-
-(require typed/racket)
-
-(define x 'foo)
-(define x 'bar)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14173.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14173.rkt
deleted file mode 100644
index 6c69b9fd3d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14173.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;
-(exn-pred "use a higher-order value")
-#lang racket
-
-(module t typed/racket #:no-optimize
-  (provide f g)
-
-  (define f (ann (case-lambda [() (add1 "hello")] [(x) x]) (Number -> Number)))
-  (define g (ann f Any)))
-
-(require 't)
-(f 1)
-(g)
\ No newline at end of file
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246-2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246-2.rkt
deleted file mode 100644
index aab76f85bf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246-2.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;
-(exn-pred #rx"Type Checker: Declaration for `n' provided, but `n' has no definition")
-#lang typed/racket
-
-;; Similar to pr14246.rkt, but for local definitions
-(: foo : Number -> Number)
-(define (foo a)
-  (: n : Number)
-  (: i : Integer)
-  (: s : String)
-  a)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246.rkt
deleted file mode 100644
index 89552370f7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14246.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn-pred #rx"Type Checker: Declaration for `n' provided, but `n' has no definition")
-#lang typed/racket
-
-;; Test for the error message for unbound module bindings
-;; with type annotations
-(: n String)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14389.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14389.rkt
deleted file mode 100644
index 842f098b5d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14389.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;
-(exn-pred (regexp-quote "in: from"))
-#lang typed/racket/base
-
-;; Test for PR 14389. Make sure that the reported source location
-;; points to the expression, not the whole submodule contents.
-
-(require racket/flonum)
-(module+ test
-  (require typed/rackunit)
-  (define (from upto)
-    (for/flvector ([i (in-range from upto)])
-      0.0)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14508.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14508.rkt
deleted file mode 100644
index 13e5dd1df3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14508.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#;
-(exn-pred 1)
-#lang typed/racket
-
-(: f (All (a ...) (-> a ... a (values a ... a))))
-(define (f . xs)
-  (apply values 3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14544.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14544.rkt
deleted file mode 100644
index 566a0b2365..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14544.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#;
-(exn-pred (regexp-quote "in: (define (f x y z) (+ y z))"))
-#lang typed/racket
-
-(: f (-> Number Number Number))
-(define (f x y z) (+ y z))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14568.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14568.rkt
deleted file mode 100644
index 1c8488bf24..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14568.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#;
-(exn-pred 1)
-#lang typed/racket
-
-(: rational->fle (-> Exact-Rational (Values Flonum Flonum)))
-(define (rational->fle r)
-  (let-values ([(s r)  (values (sgn r) (abs r))])
-    (define e
-      (- (integer-length (numerator r))
-         (integer-length (denominator r))))
-    (let loop ([r  (/ r (expt 2 e))] [e e])
-      (cond [(< r 1)  (loop (* r 2) (- e 1))]
-            [(>= r 2)  (loop (/ r 2) (+ e 1))]
-            [else
-             (ann r Positive-Byte) ; should not typecheck
-             (values (* (real->double-flonum s)
-                        (real->double-flonum r))  ; optimizer changes to ->fl
-                     (real->double-flonum e))]))))
-
-(rational->fle 1/7)  ; optimization causes contract violation
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14615.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14615.rkt
deleted file mode 100644
index fb5e18d44c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/pr14615.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket/base
-(require racket/gui)
-(define (f)
-  (let ([fn (put-file)])
-    (when fn
-      (values fn))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/predicate-box.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/predicate-box.rkt
deleted file mode 100644
index 483641774e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/predicate-box.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang typed/racket
-
-(define: b : (Boxof Any) (box 4))
-
-(define-predicate boxof-integer? (Boxof Integer))
-
-(define (set-b-box! v) (set-box! b v))
-
-(: a-very-listy-integer (-> Integer))
-(define (a-very-listy-integer)
-  (cond [(boxof-integer? b)  (set-b-box! '(1 2 3))
-                             (unbox b)]
-        [else  (error 'a-very-listy-integer "can't happen")]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/procedure-top.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/procedure-top.rkt
deleted file mode 100644
index bce5eac489..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/procedure-top.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang racket
-
-;; fail version
-
-(module example typed/racket
-  ;; coerces into unapplicable function
-  (: id (Procedure -> Procedure))
-  (define (id x) x)
-
-  (: f (Integer -> Integer))
-  (define (f x) (+ x 1))
-
-  (define g (id f))
-
-  ;; contract here should make sure g is not applicable
-  (provide g))
-
-(require 'example)
-
-;; g should now be unapplicable via case-> contract
-(g 3)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/promise-any.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/promise-any.rkt
deleted file mode 100644
index ca8ebc6e86..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/promise-any.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;
-(exn-pred #rx"Attempted to use a higher-order value passed as `Any`")
-#lang racket
-
-(module typed typed/racket
-  (: d Any)
-  (define d (delay (lambda: ([x : Integer]) (+ x 1))))
-  (provide d))
-
-(require 'typed)
-
-;; this line should raise a ctc error
-((force d) 6)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/recursive-type-application.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/recursive-type-application.rkt
deleted file mode 100644
index 4e21100290..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/recursive-type-application.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn-pred #rx"does not match the given number:")
-#lang typed/racket
-
-;; Check bad arity for recursive invocation of Foo
-
-(define-type (Foo A) (Listof (Foo A A)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/require-typed-missing.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/require-typed-missing.rkt
deleted file mode 100644
index 896cd5d8c7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/require-typed-missing.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;
-(exn-pred "at least one")
-#lang typed/racket
-
-
-(require/typed  (make-main (([Listof Node] [Listof Edge] -> Graph)
-                            (State Number Number MouseEvent -> State)
-                            (State KeyEvent -> State)
-                            (State -> Scene)
-                            (Any -> Boolean)
-                            (State -> Boolean)
-                            (Stop -> Graph)
-                            (Any -> Edge)
-                            (Edge -> Graph)
-                            ->
-                            (Boolean -> Graph))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/require-typed-wrong.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/require-typed-wrong.rkt
deleted file mode 100644
index d35a4f94ad..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/require-typed-wrong.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;
-(exn-pred ".*contract.*")
-#lang scheme/load
-
-(module m typed-scheme
-  (: x (Number -> Number))
-  (define (x n) (add1 n))
-  (provide x))
-
-(module n typed-scheme
-  (require (only-in 'm))
-  (require/typed 'm [x (String -> Number)])
-  (x "foo"))
-
-(require 'n)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/reverse-special.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/reverse-special.rkt
deleted file mode 100644
index 6fd7b667a3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/reverse-special.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;
-(exn-pred 3)
-#lang typed/scheme
-
-(ann (list 1 2 'foo) (Listof Number))
-
-(ann (reverse (list 1 2 'foo)) (Listof Number))
-
-
-
-
-
-(ann (reverse (list 1 2 'foo)) (List String Number Number))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/rts-prov.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/rts-prov.rkt
deleted file mode 100644
index 616c2ab681..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/rts-prov.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;
-(exn-pred exn:fail:syntax? #rx".*unbound identifier.*make-q.*")
-
-#lang scheme/load
-
-(module l scheme
-  (define-struct q ())
-  (provide (all-defined-out)))
-
-(module m typed-scheme
-  (require-typed-struct q () #:extra-constructor-name make-q 'l)
-  (provide (all-defined-out)))
-
-(module n typed-scheme
-  (require 'm)
-  (: f q)
-  (define f (make-q)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/safe-letrec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/safe-letrec.rkt
deleted file mode 100644
index 671f28030b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/safe-letrec.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#;
-(exn-pred "x:.*cannot use before initialization")
-#lang typed/racket
-
-;; This test previously tested TR's static analysis of undefined
-;; variables, but it now just delegates to Racket's dynamic checks.
-
-(+ (letrec: ([x : Float x]) x) 1) ; PR 11511
-
-(letrec: ([x : Float (+ x 1)]) 0) ; error in rhs
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/same-type-variable-error-msg.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/same-type-variable-error-msg.rkt
deleted file mode 100644
index 1a3f922fce..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/same-type-variable-error-msg.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;
-(exn-pred #rx"type variables bound in different scopes")
-#lang typed/racket
-
-;; Test that the error message in this case mentions
-;; that the type variables look the same but are
-;; different
-
-(: f (All (a) (a -> a)))
-(define (f x)
-  (: g (All (a) (a -> a)))
-  (define (g y) x)
-  x)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/set-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/set-struct.rkt
deleted file mode 100644
index 35198dd0e9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/set-struct.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;
-(exn-pred exn:fail:syntax? ".*unbound.*")
-
-
-#lang typed-scheme
-
-(define-typed-struct A ([x : Number] [y : Boolean]))
-
-(define: (f [a : A]) : Number
-  (set-A-x! a 4)
-  (set-A-y! a #f)
-  (+ 4 (A-x a)))
-
-(display (f (make-A 11 #t)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/set-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/set-tests.rkt
deleted file mode 100644
index fad4d5f408..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/set-tests.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-;; should FAIL!
-
-#lang typed-scheme
-
-(let*: ((x : Any 1)
-	(f : (-> Void) (lambda () (set! x (quote foo)))))
-       (if (number? x) (begin (f) (add1 x)) 12))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/single-letrec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/single-letrec.rkt
deleted file mode 100644
index f7cec77309..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/single-letrec.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed/racket
-
-(: f (Pair 'bad 'worse))
-(define f
-  (letrec ((y y)) y))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/struct-provide.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/struct-provide.rkt
deleted file mode 100644
index 41c9b777f1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/struct-provide.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;
-(exn-pred exn:fail:syntax? #rx".*typed module.*")
-#lang scheme/load
-
-(module m typed-scheme
-  (require (for-syntax scheme/base))
-  (define-syntax (q stx) #'#f)
-  (provide (all-defined-out)))
-
-(module n scheme
-  (require 'm)
-  q)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/submod-req-cnt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/submod-req-cnt.rkt
deleted file mode 100644
index 51cc7092fb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/submod-req-cnt.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang racket/load
-
-(module outer typed/racket  
-  (: f : Integer -> Integer)
-  (define (f x) (add1 x))
-  
-  (provide f)
-  
-  (module* m racket
-    (require (submod ".."))
-    (f "foo"))
-  
-  (module* main racket
-    (require (submod ".." m))))
-
-(require (submod 'outer main))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/subtype-int-err.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/subtype-int-err.rkt
deleted file mode 100644
index 97422ead0f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/subtype-int-err.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed/scheme/base
-
-(: gen-lambda-n-rest ((Any -> Any)
-                      -> (Any -> (Any Any Any Any * -> Any))))
-(define (gen-lambda-n-rest body)
-  (error 'fail))
-
-(: gen-lambda (Integer Any -> (Any -> (Any * -> Any))))
-(define (gen-lambda nb-vars body)
-  (case nb-vars
-    ((3)  (gen-lambda-3 body))
-    (else (gen-lambda-n nb-vars body))))
-
-(: gen-lambda-3 (Any -> (Any -> (Any Any Any -> Any))))
-(define (gen-lambda-3 body)
-  (error 'fail))
-
-(: gen-lambda-n (Integer Any -> (Any -> (Any Any Any Any * -> Any))))
-(define (gen-lambda-n nb-vars body)
-  (error 'fail))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/tc-error-format.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/tc-error-format.rkt
deleted file mode 100644
index 3c66890601..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/tc-error-format.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#;
-(exn-pred #rx"expected: Nothing\n  given: '~s")
-#lang typed/racket
-(ann '~s Nothing)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/too-many-errors.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/too-many-errors.rkt
deleted file mode 100644
index 6d72684730..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/too-many-errors.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/scheme
-
-(: f : Number  -> Number)
-(define (f a b)
- (+ a b))
-
-(define: (g [a : Number] [b : Number]) : Number
- (+ a b))
-
-(f 1 2)
-(g 1 2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/type-variable-scope-1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/type-variable-scope-1.rkt
deleted file mode 100644
index b48b9fd948..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/type-variable-scope-1.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#;
-(exn:pred (lambda (e) (regexp-match? "Expected 1 type variables" e)))
-#lang typed/racket
-
-;; Testing type variable scope
-
-;; This should fail because of the type variable arities
-(: f (All (b) (b -> b)))
-(define f
-  (plambda: (a b) ([x : b]) x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/type-variable-scope-2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/type-variable-scope-2.rkt
deleted file mode 100644
index 06dcf41c60..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/type-variable-scope-2.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;
-(exn:pred (lambda (e) (regexp-match? "Mutation only allowed" e)))
-#lang typed/racket
-
-;; Testing type variable scope
-
-;; This should fail for the same reason as PR 13123
-(: i (All (x) (x -> x)))
-(define i
-  (plambda: (b) ([x : b])
-    (plambda: (b) ([y : b])
-      (set! x y))
-    x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/type-variable-scope-3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/type-variable-scope-3.rkt
deleted file mode 100644
index 918dc26550..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/type-variable-scope-3.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#;
-(exn:pred (lambda (e) (regexp-match? "Mutation only allowed" e)))
-#lang typed/racket
-
-;; Test type variable scope
-
-;; The 'a' is bound in two different scopes
-(plambda: (a) ([x : a])
-  (plambda: (a) ([y : a]) (set! x y)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unbound-non-reg.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unbound-non-reg.rkt
deleted file mode 100644
index 5b286373ad..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unbound-non-reg.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#;
-(exn-pred 2)
-#lang typed/racket
-
-
-(define-struct: (T) Node ([v : T] [l : (BinTreeof t)] [r : (BinTreeof t)]))
-(define-type (BinTreeof t) (U 'empty [Node t]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unbound-type.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unbound-type.rkt
deleted file mode 100644
index 6789d23ddd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unbound-type.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#;
-(exn-pred 1)
-#lang typed-scheme
-
-
-(: f (Foo -> String))
-(define (f x) (string-append x))
-
-(f 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/undefined.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/undefined.rkt
deleted file mode 100644
index 5048e7d6ca..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/undefined.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#;
-(exn-pred "x:.*cannot use before initialization")
-#lang scheme/load
-
-;; This test used to fail due to a type error, but TR no longer
-;; tracks undefined statically, so it is just a dynamic error.
-
-(module A scheme
-
-  (define (f x) (add1 x))
-
-  (provide f))
-
-(module B typed/scheme
-
-  (require/typed 'A [f (Integer -> Integer)])
-
-  (let ()
-
-    (: x Integer)
-    (define x (f x))
-
-    (void)))
-
-(require 'B)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unsafe-struct-parent.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unsafe-struct-parent.rkt
deleted file mode 100644
index e473436856..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unsafe-struct-parent.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#;
-(exn-pred 7)
-#lang typed/scheme
-(require racket/unsafe/ops)
-
-(define-struct: foo ((x : Integer) (y : String)))
-(define-struct: (bar foo) ((z : Float)))
-
-(define a (make-foo 1 "1"))
-(define b (make-bar 2 "2" 2.0))
-
-(+ (unsafe-struct-ref a 1) 2)
-(+ (unsafe-struct-ref b 1) 2)
-
-(unsafe-struct-set! a 0 "2")
-(unsafe-struct-set! a 1 2)
-(unsafe-struct-set! b 0 3.0)
-(unsafe-struct-set! b 1 3)
-(unsafe-struct-set! b 2 "3")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unsafe-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unsafe-struct.rkt
deleted file mode 100644
index a185937b46..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/unsafe-struct.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;
-(exn-pred 3)
-#lang typed/scheme
-(require racket/unsafe/ops)
-
-(define-struct: x ((a : Integer) (b : String)) #:mutable)
-
-(define x1 (make-x 1 "1"))
-
-(+ (unsafe-struct-ref x1 1) 1)
-
-(unsafe-struct-set! x1 0 "2")
-(unsafe-struct-set! x1 1 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/untyped-srfi1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/untyped-srfi1.rkt
deleted file mode 100644
index d1cf41337e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/untyped-srfi1.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#;
-(exn-pred ".*identifier: map.*" ".*srfi.*")
-#lang typed-scheme
-
-(require srfi/1)
-
-map
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/user-filter-with-bad-index-object.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/user-filter-with-bad-index-object.rkt
deleted file mode 100644
index 94ac92a3b6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/user-filter-with-bad-index-object.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;
-(exn-pred #rx"Filter proposition's object index 3 is larger than argument length 1")
-#lang typed/racket
-
-;; This test ensures that a filter object like '3' is
-;; invalid when the function type only has 1 argument.
-
-(ann (λ (x)
-       (define f
-         (ann (λ (y) (exact-integer? x))
-              (Any -> Boolean : #:+ (Integer @ 3) #:- (! Integer @ x))))
-       (if (f 'dummy)
-           (add1 x)
-           2))
-     (Any -> Integer))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/values-dots.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/values-dots.rkt
deleted file mode 100644
index bbf8c2b51c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/values-dots.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#;
-(exn-pred 10)
-#lang typed-scheme
-
-(require typed-racket/base-env/extra-procs)
-
-(: map-with-funcs (All (b ...) ((b ... b -> b) ... b -> (b ... b -> (values b ... b)))))
-(define (map-with-funcs . fs)
-  (lambda bs
-    (apply values (map (plambda: (c) ([f : (b ... b -> c)])
-                         (apply f bs)) fs))))
-
-(map-with-funcs (lambda () 1))
-
-(map-with-funcs (lambda: ([x : Integer] [y : Integer] . [z : Integer *])
-                         (+ x y)))
-
-(map-with-funcs (lambda: ([x : Integer] [y : Integer])
-                         (+ x y)))
-
-(map-with-funcs + - * / string-append)
-
-((map-with-funcs + - * /) 1 2 3)
-((map-with-funcs + - * /) 1 2 3 4 5)
-((map-with-funcs + - * /) 1 2 3 "foo")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/values-int-err.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/values-int-err.rkt
deleted file mode 100644
index 06c3d1c3fc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/values-int-err.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn:pred (lambda (e) (not (regexp-match? "match:" e))))
-
-
-#lang typed/racket/base
-
-(: bob (-> (Values Real Real)))
-(define (bob) 0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-asserts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-asserts.rkt
deleted file mode 100644
index b543f7b91d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-asserts.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#;
-(exn-pred exn:fail?)
-#lang typed/racket
-
-(let ([x 1] [y "2"])
-  (with-asserts ([x string?] [y integer?])
-                x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-asserts2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-asserts2.rkt
deleted file mode 100644
index 79ec314a93..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-asserts2.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#;
-(exn-pred exn:fail?)
-#lang typed/racket
-
-(let ([x 1] [y "2"])
-  (with-asserts ([x string?])
-                x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-asserts3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-asserts3.rkt
deleted file mode 100644
index f38cb1e683..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-asserts3.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#;
-(exn-pred exn:fail?)
-#lang typed/racket
-
-(let ([x #f])
-  (with-asserts ([x])
-                x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type-bug.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type-bug.rkt
deleted file mode 100644
index 0fcb77db65..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type-bug.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang scheme
-(require (prefix-in T: typed/scheme))
-((T:with-type #:result (T:Integer T:-> T:Integer) add1) 1/2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type-unregister.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type-unregister.rkt
deleted file mode 100644
index a65a707798..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type-unregister.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;
-(exn-pred #rx"missing a type annotation")
-#lang racket/load
-
-(require (only-in typed/racket with-type String)
-         unstable/macro-testing)
-
-;; Ensure that types are unregistered in the type environment for free
-;; variables for a `with-type` at the top-level
-
-(define x "foo")
-
-(with-handlers ([exn:fail:syntax? void])
-  (convert-compile-time-error
-   (with-type #:result String #:freevars ([x String]) (string-append x 3))))
-
-;; should error because `x` shouldn't have a type
-(with-type #:result String (string-append x "bar"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type1.rkt
deleted file mode 100644
index 0bdefd3b48..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type1.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang scheme
-(require typed/scheme)
-
-((with-type #:result (Number -> Number)
-   (lambda: ([x : Number]) (add1 x)))
- #f)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type2.rkt
deleted file mode 100644
index 114a8f366c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type2.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang scheme
-
-(require typed/scheme)
-
-(let ([x 'hello])
-  (with-type
-   #:result String
-   #:freevars ([x String])
-   (string-append x ", world")))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type3.rkt
deleted file mode 100644
index 330cd13d7c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/with-type3.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;
-(exn-pred exn:fail:contract?)
-#lang scheme
-
-(require typed/scheme)
-
-(define-values (a b)
-  (with-type
-   #:result (values String (Number -> Number))
-   (values "foo" (lambda (x) x))))
-
-(b a)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/wrong-arity.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/wrong-arity.rkt
deleted file mode 100644
index f5bb85991e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/fail/wrong-arity.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#;
-(exn-pred "wrong arity")
-#lang typed/racket
-(: f (Number Number -> Number))
-(define (f x) 0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/info.rkt
deleted file mode 100644
index fc16e2486e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define test-omit-paths '("fail"
-                          "xfail"))
-(define test-command-line-arguments
-  '(("succeed/priority-queue.scm" ())
-    ("succeed/hw01.scm" ())
-    ("succeed/foo.scm" ())
-    ("succeed/batched-queue.scm" ())))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/main.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/main.rkt
deleted file mode 100644
index 896d7d2d10..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/main.rkt
+++ /dev/null
@@ -1,166 +0,0 @@
-#lang racket/base
-
-(require rackunit rackunit/text-ui racket/file
-         mzlib/etc racket/port
-         compiler/compiler setup/setup racket/promise
-         racket/match syntax/modcode
-         racket/promise
-         "unit-tests/all-tests.rkt"
-         "unit-tests/test-utils.rkt"
-         "optimizer/run.rkt"
-         "places.rkt" "send-places.rkt")
-
-(define (scheme-file? s)
-  (regexp-match ".*[.](rkt|ss|scm)$" (path->string s)))
-
-(define-namespace-anchor a)
-
-(define (exn-matches . args)
-  (values
-   (lambda (val)
-     (and (exn? val)
-          (for/and ([e args])
-                   (cond [(procedure? e) (e val)]
-                         [(number? e)
-                          (and (exn:fail:syntax? val)
-                               (= e (length (exn:fail:syntax-exprs val))))]
-                         [(or (string? e) (regexp? e))
-                          (regexp-match e (exn-message val))]
-                         [else (error 'exn-pred "bad argument" e)]))))
-   args))
-
-
-(define (exn-pred p)
-  (let ([sexp (with-handlers
-                  ([exn:fail? (lambda _ #f)])
-                (call-with-input-file*
-                 p
-                 (lambda (prt)
-                   (read-line prt 'any) (read prt))))])
-    (match sexp
-      [(list-rest 'exn-pred e)
-       (eval `(exn-matches . ,e) (namespace-anchor->namespace a))]
-      [_
-       (exn-matches ".*Type Checker.*" exn:fail:syntax?)])))
-
-(define (mk-tests dir test #:error [error? #f])
-  (lambda ()
-    (define path (build-path (this-expression-source-directory) dir))
-    (define prms
-      (for/list ([p (directory-list path)]
-                 #:when (scheme-file? p)
-		 ;; skip backup files
-		 #:when (not (regexp-match #rx".*~" (path->string p))))
-        (define p* (build-path path p))
-        (define prm (list path p 
-                          (if (places)
-                              (delay/thread
-                                (run-in-other-place p* error?))
-                              (delay 
-                                (parameterize ([read-accept-reader #t]
-                                               [current-load-relative-directory path]
-                                               [current-directory path]
-                                               [current-output-port (open-output-nowhere)])
-                                  (dr p))))))
-        prm))
-    (define tests
-      (for/list ([e prms])
-        (match-define (list path p prm) e)
-        (test-suite
-         (path->string p)
-         (test
-          (build-path path p)
-          (λ ()
-            (when (verbose?)
-              (log-warning (format "TR tests: waiting for ~a ~a" dir p)))
-            (force prm))))))
-    (make-test-suite dir tests)))
-
-(define succ-tests (mk-tests "succeed"
-                             (lambda (p thnk) 
-                               (check-not-exn thnk))))
-(define fail-tests (mk-tests "fail"
-                             (lambda (p thnk)
-                               (define-values (pred info) (exn-pred p))
-                               (parameterize ([error-display-handler void])
-                                 (with-check-info
-                                  (['predicates info])
-                                  (check-exn pred thnk))))
-                             #:error #t))
-
-(define (int-tests)
-  (test-suite "Integration tests"
-              (succ-tests)
-              (fail-tests)))
-
-(define (compile-benchmarks)
-  (define shootout (collection-path "tests" "racket" "benchmarks" "shootout" "typed"))
-  (define common (collection-path "tests" "racket" "benchmarks" "common" "typed"))
-  (define (mk dir)
-    (let ((promised-results
-            (for/hash ([file (in-list (directory-list dir))]
-                        #:when (scheme-file? file))
-              (values (path->string file)
-                      (delay/thread (compile-path (build-path dir file)))))))
-      (make-test-suite (path->string dir)
-        (for/list ([(name results) promised-results])
-           (test-suite name
-              (check-not-exn (λ () (force results))))))))
-
-
-  (test-suite "Compiling Benchmark tests"
-              (mk shootout)
-              (mk common)))
-
-(define (compile-math)
-  (test-suite "Compiling Math library"
-              (check-true
-               (parameterize ([current-output-port (open-output-nowhere)])
-                 (setup #:collections '(("math")))))))
-
-
-(define (just-one p*)
-  (define-values (path p b) (split-path p*))
-  (define f
-    (let ([dir (path->string path)])
-      (cond [(regexp-match? #rx"fail/$" dir )
-             (lambda (p thnk)
-               (define-values (pred info) (exn-pred p))
-               (parameterize ([error-display-handler void])
-                 (with-check-info
-                  (['predicates info])
-                  (check-exn pred thnk))))]
-            [(regexp-match? #rx"succeed/$" dir)
-             (lambda (p thnk) (check-not-exn thnk))]
-            [(regexp-match? #rx"optimizer/tests/$" dir)
-             (lambda (p* thnk) (test-opt p))]
-            [(regexp-match? #rx"optimizer/missed-optimizations/$" dir)
-             (lambda (p* thnk) (test-missed-optimization p))]
-            [else
-              (error 'just-one "Unknown test kind for test: ~a" p*)])))
-  (test-suite
-   (path->string p)
-   (f
-    (build-path path p)
-    (lambda ()
-      (parameterize ([read-accept-reader #t]
-                     [current-load-relative-directory
-                      (path->complete-path path)]
-                     [current-directory path]
-                     [current-output-port (open-output-nowhere)])
-        (dr p))))))
-
-
-(define (test/gui suite)
-  (((dynamic-require 'rackunit/private/gui/gui 'make-gui-runner))
-   suite))
-
-
-(define (go tests) (test/gui tests))
-(define (go/text tests)
-  (force (delay/thread (run-tests tests 'verbose))))
-
-(provide go go/text just-one places start-workers
-         verbose?
-         int-tests unit-tests compile-benchmarks compile-math
-         optimization-tests missed-optimization-tests)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/nightly-run.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/nightly-run.rkt
deleted file mode 100644
index 2ca63ca5a9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/nightly-run.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-
-(module test racket/base
-  (displayln "run as program for tests"))
-
-(require racket/runtime-path)
-(define-runtime-path run "run.rkt")
-(parameterize ([current-command-line-arguments '#("--nightly")])
-  (dynamic-require run #f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/known-bugs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/known-bugs.rkt
deleted file mode 100644
index f7f9b649e6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/known-bugs.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang racket/base
-
-(require
-  rackunit
-  racket/sandbox
-  racket/flonum racket/fixnum racket/unsafe/ops
-  racket/math
-  syntax/srcloc
-  (for-syntax
-    racket/base
-    syntax/parse))
-
-(provide tests)
-
-
-(define (mk-eval lang)
-  (call-with-trusted-sandbox-configuration
-   (λ ()
-     (parameterize ([sandbox-memory-limit 300])
-       (make-evaluator lang)))))
-(define racket-eval (mk-eval 'racket))
-(define tr-eval     (mk-eval 'typed/racket))
-
-(define-syntax bad-opt
-  (syntax-parser
-    [(_ exp:expr)
-     #`(test-case #,(format "~a" (syntax->datum #'exp))
-         (define r-value (racket-eval #'exp))
-         (define tr-value (tr-eval #'exp))
-         (with-check-info (['r-value r-value]
-                           ['tr-value tr-value]
-                           ['location (build-source-location-list (quote-syntax exp))])
-           (when (equal? r-value tr-value)
-             (fail-check "Known bug no longer exists."))))]))
-
-(define-syntax good-opt
-  (syntax-parser
-    [(_ exp:expr)
-     #`(test-case #,(format "~a" (syntax->datum #'exp))
-         (define r-value (racket-eval #'exp))
-         (define tr-value (tr-eval #'exp))
-         (with-check-info (['r-value r-value]
-                           ['tr-value tr-value]
-                           ['location (build-source-location-list (quote-syntax exp))])
-           (when (not (equal? r-value tr-value))
-             (fail-check "Optimizer regression"))))]))
-
-
-;; TODO add this as a test
-;; type-before = Single-Flonum-Complex
-;; type-after = Float-Complex
-;; redex-check: <collects>/tests/typed-racket/tr-random-testing.rkt:258
-;; counterexample found after 499 attempts:
-;(log (make-rectangular -inf.f -inf.f))
-
-(define tests
-  (test-suite "Known bugs"
-
-    ;; Arguments are converted to inexact too early
-    (bad-opt (* (make-rectangular -inf.0 1) (* 1 1)))
-    (bad-opt (/ -inf.0-inf.0i 8))
-    (good-opt (- (* -1 1 +nan.0) 1.0+1.0i))
-    (good-opt (- (* (/ 6 11) (/ 1.2345678f0 123456.7f0)) (make-rectangular 0.0 0.3)))
-    (bad-opt (/ 1.0 0.0+0.0i))
-    (good-opt (+ 0.0+0.0i (* 1 1 +inf.0)))
-    (bad-opt (* 1.0f-30 1.0f-30 1.0e60+1.0e60i))
-
-    ;; Unary division has bad underflow
-    (good-opt (/ (make-rectangular 1e+100 1e-300)))
-    (good-opt (/ 0.5+1.7e+308i))
-    (bad-opt (/ 1 (make-rectangular 1e+100 1e-300)))
-    (bad-opt (/ 1 0.5+1.7e+308i))
-
-    ;; Division of complex 0 should only make part of the result nan
-    (good-opt (/ 0.0+0.0i))
-    (bad-opt (/ 1 0.0+0.0i))
-    (bad-opt (/ 1.5 -3.0+9.8e-324i))
-
-    ;; Division of complex infinity should only make part of the result nan
-    (good-opt (/ (make-rectangular 1.0 +inf.0)))
-    (good-opt (/ (make-rectangular +inf.0 1.0)))
-    (bad-opt (/ 1 (make-rectangular 1.0 +inf.0)))
-    (bad-opt (/ 1 (make-rectangular +inf.0 1.0)))
-
-    ;; Exp of large real should have 0 imaginary component
-    (good-opt (+ (exp 1.7976931348623151e+308) 0.0+0.0i))
-
-    ;; Multiplication of multiple args should keep exact semantics for exact args
-    (bad-opt (* (expt 10 500) (expt 10 -500) 1.0+1.0i))
-
-    ;; Addition of multiple args should keep exact semantics for exact args
-    (bad-opt (+ (expt 10 501) (expt -10 501) 1.0+1.0i))
-
-    ;; Magnitude should not overflow unless necessary
-    (bad-opt (magnitude 3.0e300+4.0e300i))
-
-    ;; Negation should correctly compute sign of 0.0
-    (good-opt (- 0.0+0.0i))
-    (bad-opt (- 0+0i 0.0+0.0i))
-
-    ;; Conjugate should correctly compute sign of 0.0
-    (good-opt (conjugate 0.0+0.0i))))
-
-(module+ main
-  (require rackunit/text-ui)
-  (void (run-tests tests)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/all-real.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/all-real.rkt
deleted file mode 100644
index 74191e613d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/all-real.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#;#;
-#<<END
-TR info: all-real.rkt 15:0 (+ (ann 3 Real) (ann 4 Real)) -- possible exact real arith
-TR info: all-real.rkt 16:0 (* (ann 3 Real) (ann 4 Real)) -- possible exact real arith
-TR missed opt: all-real.rkt 15:0 (+ (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 15:8 3, 15:21 4
-TR missed opt: all-real.rkt 16:0 (* (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 16:8 3, 16:21 4
-END
-#<<END
-7
-12
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-;; all-real expressions
-;; They currently get reported as missed float optimizations.
-;; Whether that's the right thing or not is debatable.
-;; pro: more often than not, Real types pop up when the type system can't
-;;      prove something, but the user really wants a float type, so reporting
-;;      is likely to be helpful
-;; con: all-real expressions can arise from integer-only computations
-;;      (ex: (+ (sqrt 4) 2) : Positive-Real), so reporting a missed float opt
-;;      sounds wrong
-;; If we decide against reporting these cases in the future, it's only a matter
-;; of adding a check to make sure at least one of the subexpressions is in the
-;; Float layer in addition to the entire expression being in the Real layer.
-
-(+ (ann 3 Real) (ann 4 Real))
-(* (ann 3 Real) (ann 4 Real))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum-no-bound.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum-no-bound.rkt
deleted file mode 100644
index b2519bd40e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum-no-bound.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#;#;
-#<<END
-TR info: fixnum-no-bound.rkt 2:0 (fx+ (ann 2 Fixnum) (ann 3 Fixnum)) -- non-optimized fixnum op
-TR info: fixnum-no-bound.rkt 3:0 (fx- (ann 2 Fixnum) (ann 3 Fixnum)) -- non-optimized fixnum op
-TR info: fixnum-no-bound.rkt 4:0 (fx* (ann 2 Fixnum) (ann 3 Fixnum)) -- non-optimized fixnum op
-TR info: fixnum-no-bound.rkt 5:0 (fxquotient (ann 2 Fixnum) (ann 3 Fixnum)) -- non-optimized fixnum op
-TR info: fixnum-no-bound.rkt 6:0 (fxmodulo (ann 2 Fixnum) (ann 3 Fixnum)) -- non-optimized fixnum op
-TR info: fixnum-no-bound.rkt 7:0 (fxremainder (ann 2 Fixnum) (ann 3 Fixnum)) -- non-optimized fixnum op
-END
-#<<END
-5
--1
-6
-0
-2
-2
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-(require racket/fixnum)
-(fx+ (ann 2 Fixnum) (ann 3 Fixnum))
-(fx- (ann 2 Fixnum) (ann 3 Fixnum))
-(fx* (ann 2 Fixnum) (ann 3 Fixnum))
-(fxquotient (ann 2 Fixnum) (ann 3 Fixnum))
-(fxmodulo (ann 2 Fixnum) (ann 3 Fixnum))
-(fxremainder (ann 2 Fixnum) (ann 3 Fixnum))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum.rkt
deleted file mode 100644
index 1ca6c29dd7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum.rkt
+++ /dev/null
@@ -1,109 +0,0 @@
-#;#;
-#<<END
-TR info: fixnum.rkt 12:0 (fx* (values (ann x Index)) (values (ann y Index))) -- non-optimized fixnum op
-TR info: fixnum.rkt 15:0 (fx+ (+ 300 301) (+ 301 302)) -- non-optimized fixnum op
-TR info: fixnum.rkt 16:0 (fxquotient -4 -5) -- non-optimized fixnum op
-TR info: fixnum.rkt 44:28 (- 1 (expt 2 (- (system-type (quote word)) 2))) -- possible exact real arith
-TR info: fixnum.rkt 44:33 (expt 2 (- (system-type (quote word)) 2)) -- possible exact real arith
-TR info: fixnum.rkt 45:28 (expt 2 (- (system-type (quote word)) 2)) -- possible exact real arith
-TR missed opt: fixnum.rkt 10:0 (+ (ann z Fixnum) 234) -- out of fixnum range
-TR missed opt: fixnum.rkt 11:0 (* (ann x Index) (ann y Index)) -- out of fixnum range
-TR missed opt: fixnum.rkt 14:0 (+ (+ 300 301) (+ 301 302)) -- out of fixnum range
-TR missed opt: fixnum.rkt 27:0 (sub1 min-fixnum) -- out of fixnum range
-TR missed opt: fixnum.rkt 33:0 (add1 max-fixnum) -- out of fixnum range
-TR missed opt: fixnum.rkt 37:3 (- max-fixnum min-fixnum) -- out of fixnum range
-TR missed opt: fixnum.rkt 38:3 (- min-fixnum max-fixnum) -- out of fixnum range
-TR missed opt: fixnum.rkt 40:3 (+ max-fixnum max-fixnum) -- out of fixnum range
-TR missed opt: fixnum.rkt 41:3 (+ min-fixnum min-fixnum) -- out of fixnum range
-TR missed opt: fixnum.rkt 45:3 (quotient min-fixnum -1) -- out of fixnum range
-TR opt: fixnum.rkt 14:15 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 14:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 15:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 15:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 28:0 (add1 min-fixnum) -- fixnum add1
-TR opt: fixnum.rkt 30:0 (- max-fixnum) -- unary fixnum
-TR opt: fixnum.rkt 31:0 (abs max-fixnum) -- unary number
-TR opt: fixnum.rkt 32:0 (sub1 max-fixnum) -- fixnum sub1
-TR opt: fixnum.rkt 35:0 (= (- max-fixnum max-fixnum) 0) -- binary fixnum comp
-TR opt: fixnum.rkt 35:3 (- max-fixnum max-fixnum) -- fixnum bounded expr
-TR opt: fixnum.rkt 36:0 (= (- min-fixnum min-fixnum) 0) -- binary fixnum comp
-TR opt: fixnum.rkt 36:3 (- min-fixnum min-fixnum) -- fixnum bounded expr
-TR opt: fixnum.rkt 42:0 (= (+ max-fixnum min-fixnum) -1) -- binary fixnum comp
-TR opt: fixnum.rkt 42:3 (+ max-fixnum min-fixnum) -- fixnum bounded expr
-TR opt: fixnum.rkt 44:3 (quotient max-fixnum -1) -- nonzero fixnum bounded expr
-TR opt: fixnum.rkt 7:10 (* x y) -- fixnum bounded expr
-END
-#<<END
-468
-234
-234
-3
-1204
-1204
-0
-4611686018427387904
-4611686018427387904
--4611686018427387905
--4611686018427387903
--4611686018427387903
-4611686018427387903
-4611686018427387902
-4611686018427387904
-#t
-#t
-#t
-#t
-#t
-#t
-#t
-#t
-#t
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(require racket/fixnum)
-
-
-(define x 3)
-(define y 78)
-(define z (* x y)) ; this should be optimized
-
-;; this should not, (+ Fixnum Byte), but it may look like it should
-(+ (ann z Fixnum) 234)
-(* (ann x Index) (ann y Index))
-(fx* (values (ann x Index)) (values (ann y Index))) ; not reported, by design
-(abs (ann -3 Fixnum))
-(+ (+ 300 301) (+ 301 302))
-(fx+ (+ 300 301) (+ 301 302)) ; not reported, by design
-(fxquotient -4 -5) ; not reported, by design
-
-(: min-fixnum Negative-Fixnum)
-(define min-fixnum
-  (cast (- (expt 2 (- (system-type 'word) 2))) Negative-Fixnum))
-(: max-fixnum Positive-Fixnum)
-(define max-fixnum
-  (cast (- (expt 2 (- (system-type 'word) 2)) 1) Positive-Fixnum))
-
-(- min-fixnum)
-(abs min-fixnum)
-(sub1 min-fixnum)
-(add1 min-fixnum)
-
-(- max-fixnum)
-(abs max-fixnum)
-(sub1 max-fixnum)
-(add1 max-fixnum)
-
-(= (- max-fixnum max-fixnum) 0)
-(= (- min-fixnum min-fixnum) 0)
-(= (- max-fixnum min-fixnum) (- (expt 2 (sub1 (system-type 'word))) 1))
-(= (- min-fixnum max-fixnum) (- 1 (expt 2 (sub1 (system-type 'word)))))
-
-(= (+ max-fixnum max-fixnum) (- (expt 2 (sub1 (system-type 'word))) 2))
-(= (+ min-fixnum min-fixnum) (- (expt 2 (sub1 (system-type 'word)))))
-(= (+ max-fixnum min-fixnum) -1)
-
-(= (quotient max-fixnum -1) (- 1 (expt 2 (- (system-type 'word) 2))))
-(= (quotient min-fixnum -1) (expt 2 (- (system-type 'word) 2)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/mandelbrot.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/mandelbrot.rkt
deleted file mode 100644
index dbc2fbab6f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/mandelbrot.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#;#;
-#<<END
-TR info: mandelbrot.rkt 10:15 (/ (* 2.0 y) n) -- possible exact real arith
-TR info: mandelbrot.rkt 10:18 (* 2.0 y) -- possible exact real arith
-TR info: mandelbrot.rkt 11:15 (/ (* 2.0 x) n) -- possible exact real arith
-TR info: mandelbrot.rkt 11:18 (* 2.0 x) -- possible exact real arith
-TR info: mandelbrot.rkt 21:28 (* 2 zr zi) -- possible exact real arith
-TR missed opt: mandelbrot.rkt 10:12 (- (/ (* 2.0 y) n) 1.0) -- all args float-arg-expr, result not Float -- caused by: 10:15 (/ (* 2.0 y) n)
-TR missed opt: mandelbrot.rkt 10:12 (- (/ (* 2.0 y) n) 1.0) -- exact ops inside float expr -- caused by: 10:15 (/ (* 2.0 y) n)
-TR missed opt: mandelbrot.rkt 10:15 (/ (* 2.0 y) n) -- all args float-arg-expr, result not Float -- caused by: 10:18 (* 2.0 y), 10:28 n
-TR missed opt: mandelbrot.rkt 10:18 (* 2.0 y) -- all args float-arg-expr, result not Float -- caused by: 10:25 y
-TR missed opt: mandelbrot.rkt 11:12 (- (/ (* 2.0 x) n) 1.5) -- all args float-arg-expr, result not Float -- caused by: 11:15 (/ (* 2.0 x) n)
-TR missed opt: mandelbrot.rkt 11:12 (- (/ (* 2.0 x) n) 1.5) -- exact ops inside float expr -- caused by: 11:15 (/ (* 2.0 x) n)
-TR missed opt: mandelbrot.rkt 11:15 (/ (* 2.0 x) n) -- all args float-arg-expr, result not Float -- caused by: 11:18 (* 2.0 x), 11:28 n
-TR missed opt: mandelbrot.rkt 11:18 (* 2.0 x) -- all args float-arg-expr, result not Float -- caused by: 11:25 x
-TR missed opt: mandelbrot.rkt 18:14 (> (+ zrq ziq) 4) -- generic comparison -- caused by: 18:29 4
-TR missed opt: mandelbrot.rkt 21:25 (- (* 2 zr zi) ci) -- all args float-arg-expr, result not Float -- caused by: 21:28 (* 2 zr zi)
-TR missed opt: mandelbrot.rkt 21:28 (* 2 zr zi) -- all args float-arg-expr, result not Float -- caused by: 21:31 2
-TR opt: mandelbrot.rkt 15:21 (* zr zr) -- binary float
-TR opt: mandelbrot.rkt 16:21 (* zi zi) -- binary float
-TR opt: mandelbrot.rkt 18:17 (+ zrq ziq) -- binary float
-TR opt: mandelbrot.rkt 20:25 (+ (- zrq ziq) cr) -- binary float
-TR opt: mandelbrot.rkt 20:28 (- zrq ziq) -- binary float
-END
-""
-
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-;; from Matthew's talk at Mozilla
-;; 2 things were blocking futures:
-;; - (> (+ zrq ziq) 4) ; generic comparison
-;; - (* 2 zr zi) ; generic multiplication
-;; OC reports both
-
-(: mandelbrot : Integer Integer Integer Integer -> Integer)
-(define (mandelbrot iterations x y n)
-  (let ([ci (- (/ (* 2.0 y) n) 1.0)]
-        [cr (- (/ (* 2.0 x) n) 1.5)])
-    (let loop ([i 0] [zr 0.0] [zi 0.0])
-      (if (> i iterations)
-          i
-          (let ([zrq (* zr zr)]
-                [ziq (* zi zi)])
-            (cond
-             [(> (+ zrq ziq) 4) i]
-             [else (loop (add1 i)
-                         (+ (- zrq ziq) cr)
-                         (- (* 2 zr zi) ci))]))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/marketplace-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/marketplace-struct.rkt
deleted file mode 100644
index 0ef8ed62cf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/marketplace-struct.rkt
+++ /dev/null
@@ -1,162 +0,0 @@
-#;#;
-#<<END
-TR info: marketplace-struct.rkt 38:9 vm -- struct constructor
-TR info: marketplace-struct.rkt 38:9 vm -- struct constructor
-TR info: marketplace-struct.rkt 89:39 process -- struct constructor
-TR info: marketplace-struct.rkt 96:3 vm -- struct constructor
-TR missed opt: marketplace-struct.rkt 118:34 (in-hash-keys (vm-processes state)) -- non-specialized for clause
-TR missed opt: marketplace-struct.rkt 127:32 (in-hash-keys (vm-processes state)) -- non-specialized for clause
-TR missed opt: marketplace-struct.rkt 132:46 (in-hash-keys (process-endpoints p)) -- non-specialized for clause
-TR opt: marketplace-struct.rkt 103:2 (struct-copy vm state (processes (hash-set (vm-processes state) (Process-pid wp) wp))) -- dead else branch
-TR opt: marketplace-struct.rkt 103:2 (struct-copy vm state (processes (hash-set (vm-processes state) (Process-pid wp) wp))) -- struct ref
-TR opt: marketplace-struct.rkt 103:45 (vm-processes state) -- struct ref
-TR opt: marketplace-struct.rkt 110:23 (vm-processes state) -- struct ref
-TR opt: marketplace-struct.rkt 111:10 (if wp (struct-copy vm state (processes (hash-remove (vm-processes state) pid))) state) -- dead else branch
-TR opt: marketplace-struct.rkt 111:10 (if wp (struct-copy vm state (processes (hash-remove (vm-processes state) pid))) state) -- struct ref
-TR opt: marketplace-struct.rkt 112:60 (vm-processes state) -- struct ref
-TR opt: marketplace-struct.rkt 118:48 (vm-processes state) -- struct ref
-TR opt: marketplace-struct.rkt 127:46 (vm-processes state) -- struct ref
-TR opt: marketplace-struct.rkt 132:60 (process-endpoints p) -- struct ref
-TR opt: marketplace-struct.rkt 133:35 (process-endpoints p) -- struct ref
-END
-""
-#lang typed/racket/base
-#reader tests/typed-racket/optimizer/reset-port
-
-;; excerpt from marketplace
-;; a struct constructor logging bug was causing this to fail
-
-(require racket/match)
-
-(define-type PID Number)
-(define-type (InterruptK State) (State -> (Transition State)))
-(define-type (TrapK Event State) (Event -> (InterruptK State)))
-(struct: (State)
-	 transition ([state : State])
-	 #:transparent)
-(define-type (Transition State) (transition State))
-(struct: role ([orientation : Orientation]
-	       [interest-type : InterestType])
-	 #:transparent)
-(define-type Role role)
-(define-type Orientation (U 'publisher 'subscriber))
-(define-type (Constreeof X) (Rec CT (U X (Pairof CT CT) False Void Null)))
-(struct: process-spec ([boot : (PID -> CoTransition)])
-	 #:transparent)
-(define-type ProcessSpec process-spec)
-(define-type InterestType (U 'participant 'observer 'everything))
-(define-type (Handler State) (TrapK EndpointEvent State))
-(define-type EndpointEvent (U PresenceEvent
-			      AbsenceEvent
-			      MessageEvent))
-(struct: presence-event ([role : Role]) #:transparent)
-(struct: absence-event ([role : Role]) #:transparent)
-(struct: message-event ([role : Role]) #:transparent)
-(define-type PresenceEvent presence-event)
-(define-type AbsenceEvent absence-event)
-(define-type MessageEvent message-event)
-(define-type CoTransition (All (Result) (All (State) (Transition State) -> Result) -> Result))
-
-
-
-(struct: vm ([processes : (HashTable PID Process)]
-	     [next-process-id : PID])
-	 #:transparent)
-
-(struct: (State)
-	 process ([debug-name : Any]
-		  [pid : PID]
-		  [state : State]
-		  [spawn-ks : (Listof (Pairof Integer (TrapK PID State)))] ;; hmm
-		  [endpoints : (HashTable Any (endpoint State))]
-		  [meta-endpoints : (HashTable Any (endpoint State))])
-	 #:transparent)
-
-(struct: (State)
-	 endpoint ([id : eid]
-		   [role : role]
-		   [handler : (Handler State)])
-	 #:transparent)
-
-(struct: eid ([pid : PID]
-	      [pre-eid : Any])
-	 #:transparent)
-
-(define-type Process		(All (R) (CoProcess R) -> R))
-(define-type (CoProcess R)	(All (State) (process State) -> R))
-
-(: mkProcess : (All (State) ((CoProcess Process) State)))
-;; A kind of identity function, taking the components of a process to
-;; a process.
-(define (mkProcess p)
-  (lambda (k) ((inst k State) p)))
-
-(: Process-pid : Process -> PID)
-(define (Process-pid wp) ((inst wp PID) process-pid))
-
-;; Unwraps a process. Result is the type of the result of the
-;; expression; State is a type variable to be bound to the process's
-;; private state type. p is to be bound to the unwrapped process; wp
-;; is the expression producing the wrapped process. body... are the
-;; forms computing a value of type Result.
-(define-syntax-rule (unwrap-process State Result (p wp) body ...)
-  (let ()
-    (: coproc : (All (State) (process State) -> Result))
-    (define (coproc p)
-      body ...)
-    ((inst wp Result) coproc)))
-
-;;---------------------------------------------------------------------------
-
-(: make-vm : process-spec -> vm)
-(define (make-vm boot)
-  (define primordial (mkProcess ((inst process Void)
-				 '#:primordial
-				 -1
-				 (void)
-				 (list)
-				 #hash()
-				 #hash())))
-  (vm (hash-set (ann #hash() (HashTable PID Process))
-		(Process-pid primordial)
-		primordial)
-      0))
-
-(: inject-process : vm Process -> vm)
-(define (inject-process state wp)
-  (struct-copy vm state [processes (hash-set (vm-processes state) (Process-pid wp) wp)]))
-
-(: always-false : -> False)
-(define (always-false) #f)
-
-(: extract-process : vm PID -> (values vm (Option Process)))
-(define (extract-process state pid)
-  (define wp (hash-ref (vm-processes state) pid always-false))
-  (values (if wp
-	      (struct-copy vm state [processes (hash-remove (vm-processes state) pid)])
-	      state)
-	  wp))
-
-(: process-map : (All (State) (process State) -> (process State)) vm -> vm)
-(define (process-map f state)
-  (for/fold ([state state]) ([pid (in-hash-keys (vm-processes state))])
-    (let-values (((state wp) (extract-process state pid)))
-      (if (not wp)
-	  state
-	  (unwrap-process State vm (p wp)
-	    (inject-process state (mkProcess (f p))))))))
-
-(: endpoint-fold : (All (A) (All (State) (process State) (endpoint State) A -> A) A vm -> A))
-(define (endpoint-fold f seed state)
-  (for/fold ([seed seed]) ([pid (in-hash-keys (vm-processes state))])
-    (let-values (((state wp) (extract-process state pid)))
-      (if (not wp)
-	  seed
-	  (unwrap-process State A (p wp)
-	    (for/fold ([seed seed]) ([pre-eid (in-hash-keys (process-endpoints p))])
-	      (define ep (hash-ref (process-endpoints p) pre-eid))
-	      ((inst f State) p ep seed)))))))
-
-;;; Local Variables:
-;;; eval: (put 'unwrap-process 'scheme-indent-function 3)
-;;; End:
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file1.rkt
deleted file mode 100644
index e40e8aa3d0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file1.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR info: multi-file1.rkt 5:2 (* x (ann 3 Integer)) -- possible exact real arith
-TR missed opt: multi-file1.rkt 5:2 (* x (ann 3 Integer)) -- all args float-arg-expr, result not Float -- caused by: 5:12 3
-END
-""
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-(provide f)
-
-(: f : Float -> Real)
-(define (f x)
-  (* x (ann 3 Integer)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt
deleted file mode 100644
index 53c30a7c0e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;#;
-#<<END
-TR opt: multi-file2.rkt 3:10 (+ 3 5) -- fixnum bounded expr
-TR opt: multi-file2.rkt 3:3 (* 3.4 (+ 3 5)) -- binary float
-END
-#<<END
-81.6
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-(require "multi-file1.rkt")
-
-(f (* 3.4 (+ 3 5)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multiple-irritants.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multiple-irritants.rkt
deleted file mode 100644
index cc311212bc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multiple-irritants.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR info: multiple-irritants.rkt 2:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- possible exact real arith
-TR missed opt: multiple-irritants.rkt 2:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- all args float-arg-expr, result not Float -- caused by: 2:8 4, 2:24 5
-END
-#<<END
-120.0
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(* (ann 4 Integer) (ann 5 Integer) 6.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/nested-same-kind.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/nested-same-kind.rkt
deleted file mode 100644
index f9e5d1b943..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/nested-same-kind.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#;#;
-#<<END
-TR info: nested-same-kind.rkt 5:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- possible exact real arith
-TR info: nested-same-kind.rkt 5:7 (* 3.0 (ann 4 Integer)) -- possible exact real arith
-TR info: nested-same-kind.rkt 6:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- possible exact real arith
-TR info: nested-same-kind.rkt 6:14 (* 3.0 (ann 4 Integer)) -- possible exact real arith
-TR info: nested-same-kind.rkt 6:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- possible exact real arith
-TR info: nested-same-kind.rkt 7:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- possible exact real arith
-TR info: nested-same-kind.rkt 7:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- possible exact real arith
-TR info: nested-same-kind.rkt 8:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- possible exact real arith
-TR info: nested-same-kind.rkt 8:27 (* 3.0 (ann 4 Integer)) -- possible exact real arith
-TR info: nested-same-kind.rkt 8:3 (* 3.0 (ann 4 Integer)) -- possible exact real arith
-TR missed opt: nested-same-kind.rkt 5:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 5:7 (* 3.0 (ann 4 Integer))
-TR missed opt: nested-same-kind.rkt 5:7 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 5:19 4
-TR missed opt: nested-same-kind.rkt 6:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- all args float-arg-expr, result not Float -- caused by: 6:7 (* 2.0 (* 3.0 (ann 4 Integer)))
-TR missed opt: nested-same-kind.rkt 6:14 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 6:26 4
-TR missed opt: nested-same-kind.rkt 6:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 6:14 (* 3.0 (ann 4 Integer))
-TR missed opt: nested-same-kind.rkt 7:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- all args float-arg-expr, result not Float -- caused by: 7:7 (* 3.0 (ann 4 Integer) (ann 5 Integer))
-TR missed opt: nested-same-kind.rkt 7:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- all args float-arg-expr, result not Float -- caused by: 7:19 4, 7:35 5
-TR missed opt: nested-same-kind.rkt 8:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 8:3 (* 3.0 (ann 4 Integer)), 8:27 (* 3.0 (ann 4 Integer))
-TR missed opt: nested-same-kind.rkt 8:27 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 8:39 4
-TR missed opt: nested-same-kind.rkt 8:3 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 8:15 4
-END
-#<<END
-24.0
-24.0
-120.0
-144.0
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-;; when a single "bubble" causes missed optimizations to cascade, a single
-;; close call should be reported, with the outermost expression being reported
-;; but with the innermost flagged as the cause
-
-(* 2.0 (* 3.0 (ann 4 Integer)))
-(* 1.0 (* 2.0 (* 3.0 (ann 4 Integer))))
-(* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer)))
-(* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/pair.rkt
deleted file mode 100644
index d82c928918..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/pair.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#;#;
-#<<END
-TR missed opt: pair.rkt 12:16 (cdr (cdr (cdr (cdr (list 1 2 3))))) -- car/cdr on a potentially empty list -- caused by: 12:21 (cdr (cdr (cdr (list 1 2 3))))
-TR missed opt: pair.rkt 15:0 (mcar (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 15:6 (values (ann (mlist 1) (MListof Byte)))
-TR missed opt: pair.rkt 17:0 (mcdr (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 17:6 (values (ann (mlist 1) (MListof Byte)))
-TR missed opt: pair.rkt 21:0 (set-mcar! (values (ann (mlist 2) (MListof Byte))) 2) -- car/cdr on a potentially empty list -- caused by: 21:11 (values (ann (mlist 2) (MListof Byte)))
-TR missed opt: pair.rkt 23:0 (set-mcdr! (values (ann (mlist 2) (MListof Byte))) (values (ann (mlist 2) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 23:11 (values (ann (mlist 2) (MListof Byte)))
-TR missed opt: pair.rkt 29:17 (mcar (quote ())) -- car/cdr on a potentially empty list -- caused by: 29:23 (quote ())
-TR missed opt: pair.rkt 30:17 (mcdr (quote ())) -- car/cdr on a potentially empty list -- caused by: 30:23 (quote ())
-TR missed opt: pair.rkt 31:17 (set-mcar! (quote ()) 2) -- car/cdr on a potentially empty list -- caused by: 31:28 (quote ())
-TR missed opt: pair.rkt 32:17 (set-mcdr! (ann (quote ()) (MListof Integer)) (ann (mlist 3) (MListof Integer))) -- car/cdr on a potentially empty list -- caused by: 32:33 (quote ())
-TR missed opt: pair.rkt 6:0 (car (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 6:10 (list 1 2 3)
-TR missed opt: pair.rkt 8:0 (cdr (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 8:10 (list 1 2 3)
-TR opt: pair.rkt 10:0 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 10:5 (cdr (list 1 2 3)) -- pair
-TR opt: pair.rkt 11:0 (cdr (cdr (cdr (list 1 2 3)))) -- pair
-TR opt: pair.rkt 11:10 (cdr (list 1 2 3)) -- pair
-TR opt: pair.rkt 11:5 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 12:21 (cdr (cdr (cdr (list 1 2 3)))) -- pair
-TR opt: pair.rkt 12:26 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 12:31 (cdr (list 1 2 3)) -- pair
-TR opt: pair.rkt 16:0 (mcar (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 18:0 (mcdr (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 19:0 (mcdr (mcdr (mlist 1 2 3))) -- pair
-TR opt: pair.rkt 19:6 (mcdr (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 20:0 (mcdr (mcdr (mcdr (mlist 1 2 3)))) -- pair
-TR opt: pair.rkt 20:12 (mcdr (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 20:6 (mcdr (mcdr (mlist 1 2 3))) -- pair
-TR opt: pair.rkt 22:0 (set-mcar! (mlist 2 3 4) 2) -- pair
-TR opt: pair.rkt 25:0 (mcar (mcons 2 3)) -- pair
-TR opt: pair.rkt 26:0 (mcdr (mcons 2 3)) -- pair
-TR opt: pair.rkt 27:0 (set-mcar! (mcons 2 3) 3) -- pair
-TR opt: pair.rkt 28:0 (set-mcdr! (mcons 2 3) 4) -- pair
-TR opt: pair.rkt 7:0 (car (list 1 2 3)) -- pair
-TR opt: pair.rkt 9:0 (cdr (list 1 2 3)) -- pair
-END
-#<<END
-1
-1
-'(2 3)
-'(2 3)
-'(3)
-'()
-1
-1
-'()
-(mcons 2 (mcons 3))
-(mcons 3)
-'()
-2
-3
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-(require compatibility/mlist)
-
-;; car/cdr can be optimized if they are guaranteed to be applied only to
-;; non-empty lists. otherwise, we miss a potential optimization
-
-(car (ann (list 1 2 3) (Listof Byte)))
-(car (list 1 2 3)) ; non-empty list type, shouldn't be reported
-(cdr (ann (list 1 2 3) (Listof Byte)))
-(cdr (list 1 2 3))
-(cdr (cdr (list 1 2 3)))
-(cdr (cdr (cdr (list 1 2 3))))
-(define (dummy) (cdr (cdr (cdr (cdr (list 1 2 3)))))) ; unsafe, so missed opt
-
-;; similar for mpairs
-(mcar (values (ann (mlist 1) (MListof Byte))))
-(mcar (mlist 1 2 3))
-(mcdr (values (ann (mlist 1) (MListof Byte))))
-(mcdr (mlist 1 2 3))
-(mcdr (mcdr (mlist 1 2 3)))
-(mcdr (mcdr (mcdr (mlist 1 2 3))))
-(set-mcar! (values (ann (mlist 2) (MListof Byte))) 2)
-(set-mcar! (mlist 2 3 4) 2)
-(set-mcdr! (values (ann (mlist 2) (MListof Byte))) (values (ann (mlist 2) (MListof Byte))))
-
-(mcar (mcons 2 3))
-(mcdr (mcons 2 3))
-(set-mcar! (mcons 2 3) 3)
-(set-mcdr! (mcons 2 3) 4)
-(define (dummy2) (mcar '()))
-(define (dummy3) (mcdr '()))
-(define (dummy4) (set-mcar! '() 2))
-(define (dummy5) (set-mcdr! (ann '() (MListof Integer)) (ann (mlist 3) (MListof Integer))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/precision-loss.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/precision-loss.rkt
deleted file mode 100644
index 9c79e8e62c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/precision-loss.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#;#;
-#<<END
-TR info: precision-loss.rkt 10:3 (- 3/4) -- possible exact real arith
-TR info: precision-loss.rkt 12:39 (+ 1/4 3/4) -- possible exact real arith
-TR info: precision-loss.rkt 18:0 (* (* (r 3/4) 2/3) (car (list (* 2.0 (* (r 3/4) 2/3)))) 2.0) -- possible exact real arith
-TR info: precision-loss.rkt 18:3 (* (r 3/4) 2/3) -- possible exact real arith
-TR info: precision-loss.rkt 19:14 (* 2.0 (* (r 3/4) 2/3)) -- possible exact real arith
-TR info: precision-loss.rkt 19:21 (* (r 3/4) 2/3) -- possible exact real arith
-TR info: precision-loss.rkt 6:3 (* 3/4 2/3) -- possible exact real arith
-TR missed opt: precision-loss.rkt 10:0 (+ (- 3/4) 2.0) -- exact ops inside float expr -- caused by: 10:3 (- 3/4)
-TR missed opt: precision-loss.rkt 12:0 (+ (vector-ref (quote #(2/3 1/2 3/4)) (assert (+ 1/4 3/4) exact-integer?)) 2.0) -- all args float-arg-expr, result not Float -- caused by: 12:3 (vector-ref (quote #(2/3 1/2 3/4)) (assert (+ 1/4 3/4) exact-integer?))
-TR missed opt: precision-loss.rkt 18:0 (* (* (r 3/4) 2/3) (car (list (* 2.0 (* (r 3/4) 2/3)))) 2.0) -- all args float-arg-expr, result not Float -- caused by: 18:3 (* (r 3/4) 2/3), 19:3 (car (list (* 2.0 (* (r 3/4) 2/3))))
-TR missed opt: precision-loss.rkt 18:3 (* (r 3/4) 2/3) -- all args float-arg-expr, result not Float -- caused by: 18:6 (r 3/4), 18:14 2/3
-TR missed opt: precision-loss.rkt 19:14 (* 2.0 (* (r 3/4) 2/3)) -- all args float-arg-expr, result not Float -- caused by: 19:21 (* (r 3/4) 2/3)
-TR missed opt: precision-loss.rkt 19:21 (* (r 3/4) 2/3) -- all args float-arg-expr, result not Float -- caused by: 19:24 (r 3/4), 19:32 2/3
-TR missed opt: precision-loss.rkt 6:0 (+ (* 3/4 2/3) 2.0) -- exact ops inside float expr -- caused by: 6:3 (* 3/4 2/3)
-TR opt: precision-loss.rkt 10:0 (+ (- 3/4) 2.0) -- binary float
-TR opt: precision-loss.rkt 19:3 (car (list (* 2.0 (* (r 3/4) 2/3)))) -- pair
-TR opt: precision-loss.rkt 6:0 (+ (* 3/4 2/3) 2.0) -- binary float
-TR opt: precision-loss.rkt 8:0 (+ 3/4 2.0) -- binary float
-END
-#<<END
-2.5
-2.75
-1.25
-2.5
-1.0
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-(: r (Real -> Real))
-(define (r x) x)
-;; warn when the extra precision gained by doing exact computations would
-;; be lost when the results are mixed with floats, resulting in extra
-;; computation cost for (usually) no gain
-(+ (* 3/4 2/3) ; exact computation
-   2.0) ; extra precision lost
-(+ 3/4 2.0) ; here, since the exact subexpression is atomic, it will get
-;; coerced anyway, so there's not much need for a warning
-(+ (- 3/4) ; should work on unary exprs too
-   2.0)
-(+ (vector-ref '#(2/3 1/2 3/4) (assert (+ 1/4 3/4) exact-integer?)) ; and this is not an arith expr
-   2.0)
-
-;; in this case, the return type is Real, so we can't optimize
-;; however, given that the return _value_ will be a float, the precision
-;; is thrown away nonetheless, so a warning is warranted
-(* (* (r 3/4) 2/3)
-   (car (list (* 2.0 (* (r 3/4) 2/3))))
-   2.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/real-in-float-expr.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/real-in-float-expr.rkt
deleted file mode 100644
index df9cb0d770..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/real-in-float-expr.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#;#;
-#<<END
-TR info: real-in-float-expr.rkt 11:0 (* (ann 2 Natural) 2.0) -- possible exact real arith
-TR info: real-in-float-expr.rkt 2:0 (* (ann 3 Real) 2.3) -- possible exact real arith
-TR info: real-in-float-expr.rkt 9:0 (+ 2/3 3/4) -- possible exact real arith
-TR missed opt: real-in-float-expr.rkt 11:0 (* (ann 2 Natural) 2.0) -- all args float-arg-expr, result not Float -- caused by: 11:8 2
-TR missed opt: real-in-float-expr.rkt 2:0 (* (ann 3 Real) 2.3) -- all args float-arg-expr, result not Float -- caused by: 2:8 3
-TR opt: real-in-float-expr.rkt 7:0 (* 2 3) -- fixnum bounded expr
-TR opt: real-in-float-expr.rkt 8:0 (+ 2 3) -- fixnum bounded expr
-END
-#<<END
-6.8999999999999995
-6
-5
-6
-5
-17/12
-4.0
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(* (ann 3 Real) ; with type Real, typechecker must assume it could be exact 0
-   2.3)
-
-(* (ann 2 Integer) (ann 3 Integer)) ; but these have nothing to do with floats, should not be logged
-(+ (ann 2 Integer) (ann 3 Integer))
-(* 2 3)
-(+ 2 3)
-(+ 2/3 3/4)
-
-(* (ann 2 Natural) 2.0) ; close calls that result in Nonnegative-Real and co (i.e. not directly Real) should be reported too
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/regexp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/regexp.rkt
deleted file mode 100644
index 98edf17cf1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/regexp.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#;#;
-#<<END
-TR info: regexp.rkt 2:14 "foo" -- non-regexp pattern
-TR info: regexp.rkt 3:14 #"foo" -- non-regexp pattern
-END
-#<<END
-'("foo")
-'(#"foo")
-'("foo")
-'(#"foo")
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(regexp-match "foo" "foo")
-(regexp-match #"foo" #"foo")
-(regexp-match (regexp "foo") "foo") ; ok
-(regexp-match (byte-regexp #"foo") #"foo") ; ok
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/sequence.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/sequence.rkt
deleted file mode 100644
index 010476c6b5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/sequence.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-TR missed opt: sequence.rkt 4:22 s -- non-specialized for clause
-END
-""
-#lang typed/racket/base
-#reader tests/typed-racket/optimizer/reset-port
-
-(: seq-generic : (Sequenceof Integer) -> Void)
-(define (seq-generic s)
-  (for: ([x : Integer s])
-    (void)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/struct-constructor.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/struct-constructor.rkt
deleted file mode 100644
index 7b9c0cc7e9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/struct-constructor.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR info: struct-constructor.rkt 6:7 foo -- struct constructor
-END
-""
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(provide (struct-out foo))
-
-(struct: foo ())
-
-(void (foo))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unary-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unary-float.rkt
deleted file mode 100644
index 510aeda2b1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unary-float.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#;#;
-#<<END
-TR info: unary-float.rkt 2:0 (sin (ann 3.4 Real)) -- possible exact real arith
-TR info: unary-float.rkt 3:0 (sin 3) -- possible exact real arith
-TR info: unary-float.rkt 4:0 (abs (ann 3.4 Real)) -- possible exact real arith
-TR missed opt: unary-float.rkt 2:0 (sin (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 2:10 3.4
-TR missed opt: unary-float.rkt 3:0 (sin 3) -- all args float-arg-expr, result not Float -- caused by: 3:5 3
-TR missed opt: unary-float.rkt 4:0 (abs (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 4:10 3.4
-END
-#<<END
--0.2555411020268312
-0.1411200080598672
-3.4
-3
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(sin (ann 3.4 Real))
-(sin 3)
-(abs (ann 3.4 Real))
-(abs (ann 3 Integer)) ; stays within Integer, should not be reported
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unexpected-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unexpected-complex.rkt
deleted file mode 100644
index a1f9591870..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unexpected-complex.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#;#;
-#<<END
-TR missed opt: unexpected-complex.rkt 4:0 (sqrt (ann 4 Integer)) -- unexpected complex type
-TR opt: unexpected-complex.rkt 5:0 (+ 1.2+3.4i 2.0) -- unboxed binary float complex
-TR opt: unexpected-complex.rkt 5:12 2.0 -- float in complex ops
-TR opt: unexpected-complex.rkt 5:3 1.2+3.4i -- unboxed literal
-END
-#<<END
-2
-3.2+3.4i
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-;; a Complex type is "unexpected" if it pops up in an expressions for which
-;; all subexpressions have a Real type
-(sqrt (ann 4 Integer))
-(+ 1.2+3.4i 2.0) ; this one is expected, though
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/reset-port.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/reset-port.rkt
deleted file mode 100644
index 913fb56786..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/reset-port.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-;; Reader extension used by the optimizer tests to make changes to the logging less disruptive to
-;; existing logging.
-
-(provide read-syntax)
-
-(define (read-syntax name port)
-  (read-line port)
-  (when (port-counts-lines? port)
-    (set-port-next-location! port 1 0 1))
-  (make-special-comment 'typed-racket/optimizer/reset-port))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt
deleted file mode 100644
index e9644c2164..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang racket
-(require racket/runtime-path compiler/compiler
-         rackunit rackunit/text-ui
-         typed-racket/optimizer/logging
-         "../send-places.rkt")
-
-(provide optimization-tests missed-optimization-tests
-         test-opt test-missed-optimization test-file?
-         generate-log tests-dir missed-optimizations-dir)
-
-(define (get-expected-results file)
-  (with-input-from-file file
-    (lambda () ; from the test file
-      (read-line) ; skip the #;#;
-      (values (for/list ((l (in-lines (open-input-string (read))))) l)
-              (read)))))
-
-;; we log optimizations and compare to an expected log to make sure that all
-;; the optimizations we expected did indeed happen
-(define (compare-logs name dir promised-logs)
-  (test-suite
-    (format "Log Comparison for ~a" name)
-    (test-begin
-      (define-values (log output) (force promised-logs))
-      (define-values (expected-log expected-output)
-        (get-expected-results (build-path dir name)))
-
-      (check-equal? log expected-log)
-      (check-equal? output expected-output))))
-
-
-(define-runtime-path tests-dir                "./tests")
-(define-runtime-path missed-optimizations-dir "./missed-optimizations")
-
-;; these two return lists of tests to be run for that category of tests
-(define (test-opt name)
-  (compare-logs name
-                tests-dir
-                (delay/thread (generate-log name tests-dir))))
-(define (test-missed-optimization name)
-  (compare-logs name
-                missed-optimizations-dir
-                (delay/thread (generate-log name missed-optimizations-dir))))
-
-(define (test-file? name)
-  (and (regexp-match ".*rkt$" name)
-       ;; skip emacs temp unsaved file backups
-       (not (regexp-match "^\\.#" name))))
-
-(define (mk-test-opt name logs)
-  (compare-logs name tests-dir logs))
-(define (mk-test-missed-optimization name logs)
-  (compare-logs name missed-optimizations-dir logs))
-
-;; proc returns the list of tests to be run on each file
-(define (mk-suite suite-name dir proc)
-  (test-suite suite-name
-    (let* ((logs (for/hash ([name (directory-list dir)]
-                            #:when (test-file? name))
-                   (values name (delay/thread (generate-log name dir))))))
-      (make-test-suite ""
-        (for/list (((name logs) logs))
-          (proc name logs))))))
-
-(define (optimization-tests)
-  (mk-suite "Optimization Tests"
-            tests-dir
-            mk-test-opt))
-(define (missed-optimization-tests)
-  (mk-suite "Missed Optimization Tests"
-            missed-optimizations-dir
-            mk-test-missed-optimization))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/add1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/add1.rkt
deleted file mode 100644
index f696da4199..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/add1.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#;#;
-#<<END
-TR missed opt: add1.rkt 2:0 (add1 (ann 5 Fixnum)) -- out of fixnum range
-TR missed opt: add1.rkt 4:0 (sub1 (ann 3 Fixnum)) -- out of fixnum range
-TR opt: add1.rkt 1:5 (add1 5) -- fixnum add1
-TR opt: add1.rkt 3:5 (sub1 3) -- fixnum sub1
-TR opt: add1.rkt 5:5 (add1 2.3) -- float add1
-TR opt: add1.rkt 6:5 (sub1 2.25) -- float sub1
-END
-#<<END
-6
-6
-2
-2
-3.3
-1.25
-
-END
-#lang typed/racket #:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(ann (add1 5) Fixnum)
-(add1 (ann 5 Fixnum))
-(ann (sub1 3) Fixnum)
-(sub1 (ann 3 Fixnum))
-(ann (add1 2.3) Float)
-(ann (sub1 2.25) Float)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/annotations.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/annotations.rkt
deleted file mode 100644
index 0c68184f82..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/annotations.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#;#;
-#<<END
-TR opt: annotations.rkt 10:15 (+ 1.0 2.0) -- binary float
-TR opt: annotations.rkt 2:10 (+ 1.0 2.0) -- binary float
-TR opt: annotations.rkt 5:10 (+ 1.0 2.0) -- binary float
-TR opt: annotations.rkt 8:10 (+ 1.0 2.0) -- binary float
-END
-""
-#lang typed/racket #:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(define a (+ 1.0 2.0))
-
-(: b Float)
-(define b (+ 1.0 2.0))
-
-(: c Any)
-(define c (+ 1.0 2.0))
-
-(define d (ann (+ 1.0 2.0) Any))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/apply-plus.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/apply-plus.rkt
deleted file mode 100644
index 64904c537c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/apply-plus.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR opt: apply-plus.rkt 2:0 (apply + (map add1 (list 1 2 3))) -- apply-map
-TR opt: apply-plus.rkt 3:0 (apply * (map add1 (list 1 2 3))) -- apply-map
-END
-#<<END
-9
-24
-
-END
-
-#lang typed/racket
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(apply + (map add1 (list 1 2 3)))
-(apply * (map add1 (list 1 2 3)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/begin-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/begin-float.rkt
deleted file mode 100644
index 7736e374e4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/begin-float.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR opt: begin-float.rkt 2:7 (- 2.0 3.0) -- binary float
-TR opt: begin-float.rkt 3:7 (* 2.0 3.0) -- binary float
-END
-#<<END
--1.0
-6.0
-
-END
-
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(begin (- 2.0 3.0)
-       (* 2.0 3.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-fixnum.rkt
deleted file mode 100644
index 1cd39208b5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-fixnum.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: binary-fixnum.rkt 4:15 (vector-length v) -- vector-length
-TR opt: binary-fixnum.rkt 4:2 (bitwise-and (vector-length v) 1) -- binary fixnum
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(: f (All (X) ((Vectorof X) -> Natural)))
-(define (f v)
-  (bitwise-and (vector-length v) 1))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-nonzero-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-nonzero-fixnum.rkt
deleted file mode 100644
index cc2fea8eb1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-nonzero-fixnum.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;#;
-#<<END
-TR opt: binary-nonzero-fixnum.rkt 2:0 (modulo (vector-length (quote #(1 2 3))) 2) -- binary nonzero fixnum
-TR opt: binary-nonzero-fixnum.rkt 2:8 (vector-length (quote #(1 2 3))) -- known-length vector-length
-END
-#<<END
-1
-
-END
-
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(modulo (vector-length '#(1 2 3)) 2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/both-if-branches-dead.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/both-if-branches-dead.rkt
deleted file mode 100644
index b8ce769baf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/both-if-branches-dead.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: both-if-branches-dead.rkt 4:6 12 -- dead then branch
-TR opt: both-if-branches-dead.rkt 5:6 (* 3 4) -- dead else branch
-END
-""
-#lang typed/racket/base
-#reader tests/typed-racket/optimizer/reset-port
-;; Test that code where neither branch is taken works
-(let/ec: k : Any
-  (if (k (void))
-      12
-      (* 3 4)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/bounds-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/bounds-check.rkt
deleted file mode 100644
index 30c3e7feb4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/bounds-check.rkt
+++ /dev/null
@@ -1,107 +0,0 @@
-#;#;
-#<<END
-TR info: bounds-check.rkt 18:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 20:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 22:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 39:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 41:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 43:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 60:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 62:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 64:1 displayln -- hidden parameter
-TR opt: bounds-check.rkt 12:2 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 15:2 (vector-set! v i n) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 27:2 (flvector-ref v i) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 30:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 33:2 (flvector-ref v i) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 36:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 48:2 (extflvector-ref v i) -- extflvector partial bounds checking elimination
-TR opt: bounds-check.rkt 51:2 (extflvector-set! v i n) -- extflvector partial bounds checking elimination
-TR opt: bounds-check.rkt 54:2 (extflvector-ref v i) -- extflvector partial bounds checking elimination
-TR opt: bounds-check.rkt 57:2 (extflvector-set! v i n) -- extflvector partial bounds checking elimination
-TR opt: bounds-check.rkt 66:0 (extflvector-length efv) -- extflvector-length
-TR opt: bounds-check.rkt 6:2 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 9:2 (vector-set! v i n) -- vector partial bounds checking elimination
-END
-#<<END
-3
-4
-5
-3.0
-4.0
-5.0
-3.0t0
-4.0t0
-5.0t0
-4
-
-END
-
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(require racket/flonum racket/extflonum)
-
-(: f (All (X) ((Vectorof X) Fixnum -> X)))
-(define (f v i)
-  (vector-ref v i))
-(: g (All (X) ((Vectorof X) Fixnum X -> Void)))
-(define (g v i n)
-  (vector-set! v i n))
-(: h (All (X) ((Vectorof X) Index -> X)))
-(define (h v i)
-  (vector-ref v i))
-(: a (All (X) ((Vectorof X) Index X -> Void)))
-(define (a v i n)
-  (vector-set! v i n))
-
-(define: v : (Vectorof Integer) (vector 1 2 3 4))
-(displayln (f v 2))
-(g v 2 4)
-(displayln (h v 2))
-(a v 2 5)
-(displayln (f v 2))
-
-
-(: ff (FlVector Fixnum -> Float))
-(define (ff v i)
-  (flvector-ref v i))
-(: fg (FlVector Fixnum Float -> Void))
-(define (fg v i n)
-  (flvector-set! v i n))
-(: fh (FlVector Index -> Float))
-(define (fh v i)
-  (flvector-ref v i))
-(: fa (FlVector Index Float -> Void))
-(define (fa v i n)
-  (flvector-set! v i n))
-
-(define: fv : FlVector (flvector 1.0 2.0 3.0 4.0))
-(displayln (ff fv 2))
-(fg fv 2 4.0)
-(displayln (fh fv 2))
-(fa fv 2 5.0)
-(displayln (ff fv 2))
-
-
-(: b (ExtFlVector Fixnum -> ExtFlonum))
-(define (b v i)
-  (extflvector-ref v i))
-(: c (ExtFlVector Fixnum ExtFlonum -> Void))
-(define (c v i n)
-  (extflvector-set! v i n))
-(: d (ExtFlVector Index -> ExtFlonum))
-(define (d v i)
-  (extflvector-ref v i))
-(: e (ExtFlVector Index ExtFlonum -> Void))
-(define (e v i n)
-  (extflvector-set! v i n))
-
-(define: efv : ExtFlVector (extflvector 1.0t0 2.0t0 3.0t0 4.0t0))
-(displayln (b efv 2))
-(c efv 2 4.0t0)
-(displayln (d efv 2))
-(e efv 2 5.0t0)
-(displayln (b efv 2))
-
-(extflvector-length efv)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/box.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/box.rkt
deleted file mode 100644
index 326b8f9167..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/box.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#;#;
-#<<END
-TR opt: box.rkt 4:0 (unbox x) -- box
-TR opt: box.rkt 5:0 (set-box! x 2) -- box
-TR opt: box.rkt 6:0 (unbox x) -- box
-END
-#<<END
-1
-2
-
-END
-
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(: x (Boxof Integer))
-(define x (box 1))
-(unbox x)
-(set-box! x 2)
-(unbox x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-arrow.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-arrow.rkt
deleted file mode 100644
index cf6a5e6f10..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-arrow.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#;#;
-#<<END
-TR info: case-arrow.rkt 15:12 (* (- max min) x) -- possible exact real arith
-TR info: case-arrow.rkt 15:15 (- max min) -- possible exact real arith
-TR info: case-arrow.rkt 15:2 (+ min (/ (* (- max min) x) p)) -- possible exact real arith
-TR info: case-arrow.rkt 15:9 (/ (* (- max min) x) p) -- possible exact real arith
-TR missed opt: case-arrow.rkt 15:12 (* (- max min) x) -- all args float-arg-expr, result not Float -- caused by: 15:15 (- max min), 15:27 x
-TR missed opt: case-arrow.rkt 15:15 (- max min) -- all args float-arg-expr, result not Float -- caused by: 15:18 max, 15:22 min
-TR missed opt: case-arrow.rkt 15:2 (+ min (/ (* (- max min) x) p)) -- all args float-arg-expr, result not Float -- caused by: 15:5 min, 15:9 (/ (* (- max min) x) p)
-TR missed opt: case-arrow.rkt 15:9 (/ (* (- max min) x) p) -- all args float-arg-expr, result not Float -- caused by: 15:12 (* (- max min) x), 15:30 p
-END
-""
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-;; Typechecking functions with case-> types causes the body to be typechecked
-;; multiple times, which is fine, except that it used to cause the type table
-;; to only have information for the last branch (clobbering). This would cause
-;; this program to be optimized, which is not safe.
-
-(define p (- (expt 2 31) 1))
-(define A (expt 7 5))
-(define x 42)
-
-(: gen-random : (case→ (Integer Integer → Exact-Rational)
-                       (Float   Float   → Float)))
-(define (gen-random min max)
-  (set! x (modulo (* A x) p))
-  (+ min (/ (* (- max min) x) p)))
-
-(void (gen-random 2.3 7.4))
-(void (gen-random 2   7))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-lambda-dead-branch.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-lambda-dead-branch.rkt
deleted file mode 100644
index f948281906..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-lambda-dead-branch.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#;#;
-#<<END
-TR opt: case-lambda-dead-branch.rkt 12:5 (x y) -- dead case-lambda branch
-TR opt: case-lambda-dead-branch.rkt 6:5 (x y) -- dead case-lambda branch
-END
-""
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(: f (case-> (Symbol Symbol -> String)))
-(define f
-  (case-lambda
-    (w "hello")
-    ((x y) (add1 "hello"))))
-
-(: g (case-> (Symbol -> String)))
-(define g
-  (case-lambda
-    ((x) "hello")
-    ((x y) (add1 "hello"))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/complex-exp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/complex-exp.rkt
deleted file mode 100644
index cad0ae7677..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/complex-exp.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;#;
-#<<END
-TR missed opt: complex-exp.rkt 2:3 (exp 0) -- non-complex value in complex arithmetic
-TR opt: complex-exp.rkt 2:0 (- (exp 0) 1.0+2.0i) -- unboxed binary float complex
-TR opt: complex-exp.rkt 2:11 1.0+2.0i -- unboxed literal
-TR opt: complex-exp.rkt 2:3 (exp 0) -- non float complex in complex ops
-TR opt: complex-exp.rkt 2:8 0 -- non float complex in complex ops
-END
-#<<END
-0.0-2.0i
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(- (exp 0) 1.0+2.0i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct.rkt
deleted file mode 100644
index 09deb556f7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#;#;
-#<<END
-END
-""
-#lang typed/scheme #:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-;; will be imported by cross-module-struct2
-(provide (struct-out x))
-(define-struct: x ((x : Integer)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct2.rkt
deleted file mode 100644
index 813fa7d480..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct2.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;#;
-#<<END
-TR opt: cross-module-struct2.rkt 4:0 (x-x a) -- struct ref
-END
-#<<END
-1
-
-END
-#lang typed/scheme #:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(require (file "cross-module-struct.rkt"))
-(define a (make-x 1))
-(x-x a)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-case-lambda.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-case-lambda.rkt
deleted file mode 100644
index b6dc675f5e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-case-lambda.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#;#;
-#<<END
-TR opt: dead-case-lambda.rkt 4:10 () -- dead case-lambda branch
-TR opt: dead-case-lambda.rkt 6:10 (d . rst) -- dead case-lambda branch
-END
-#<<END
-(arity-at-least 0)
-
-END
-
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(procedure-arity
-  (ann (case-lambda
-         [() (void)]
-         [(d) (void)]
-         [(d . rst) (void)])
-          (Any -> Any)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-else.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-else.rkt
deleted file mode 100644
index fa229b5f3e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-else.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#;#;
-#<<END
-TR info: dead-else.rkt 1:1 display -- hidden parameter
-TR info: dead-else.rkt 4:1 display -- hidden parameter
-TR opt: dead-else.rkt 2:13 (+ 2.0 3.0) -- binary float
-TR opt: dead-else.rkt 3:13 (+ 4.0 5.0) -- dead else branch
-TR opt: dead-else.rkt 5:13 (+ 2.0 3.0) -- binary float
-TR opt: dead-else.rkt 6:13 (+ 4.0 5.0) -- dead else branch
-END
-"5.05.0"
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(display (if (number? 3)
-             (+ 2.0 3.0)
-             (+ 4.0 5.0)))
-(display (if #t
-             (+ 2.0 3.0)
-             (+ 4.0 5.0)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt
deleted file mode 100644
index 5ca1f792ff..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt
+++ /dev/null
@@ -1,210 +0,0 @@
-#;#;
-#<<END
-TR info: dead-inf-comp.rkt 110:41 displayln -- hidden parameter
-TR missed opt: dead-inf-comp.rkt 10:4 (< rat -inf.0) -- generic comparison -- caused by: 10:7 rat
-TR missed opt: dead-inf-comp.rkt 110:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- generic comparison -- caused by: 110:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i))
-TR missed opt: dead-inf-comp.rkt 13:4 (< -inf.0 rat) -- generic comparison -- caused by: 13:14 rat
-TR missed opt: dead-inf-comp.rkt 17:4 (> +inf.0 rat) -- generic comparison -- caused by: 17:14 rat
-TR missed opt: dead-inf-comp.rkt 20:4 (> rat +inf.0) -- generic comparison -- caused by: 20:7 rat
-TR missed opt: dead-inf-comp.rkt 23:4 (> -inf.0 rat) -- generic comparison -- caused by: 23:14 rat
-TR missed opt: dead-inf-comp.rkt 26:4 (> rat -inf.0) -- generic comparison -- caused by: 26:7 rat
-TR missed opt: dead-inf-comp.rkt 30:4 (<= rat +inf.0) -- generic comparison -- caused by: 30:8 rat
-TR missed opt: dead-inf-comp.rkt 33:4 (<= +inf.0 rat) -- generic comparison -- caused by: 33:15 rat
-TR missed opt: dead-inf-comp.rkt 36:4 (<= rat -inf.0) -- generic comparison -- caused by: 36:8 rat
-TR missed opt: dead-inf-comp.rkt 39:4 (<= -inf.0 rat) -- generic comparison -- caused by: 39:15 rat
-TR missed opt: dead-inf-comp.rkt 43:4 (>= +inf.0 rat) -- generic comparison -- caused by: 43:15 rat
-TR missed opt: dead-inf-comp.rkt 46:4 (>= rat +inf.0) -- generic comparison -- caused by: 46:8 rat
-TR missed opt: dead-inf-comp.rkt 49:4 (>= -inf.0 rat) -- generic comparison -- caused by: 49:15 rat
-TR missed opt: dead-inf-comp.rkt 4:4 (< rat +inf.0) -- generic comparison -- caused by: 4:7 rat
-TR missed opt: dead-inf-comp.rkt 52:4 (>= rat -inf.0) -- generic comparison -- caused by: 52:8 rat
-TR missed opt: dead-inf-comp.rkt 7:4 (< +inf.0 rat) -- generic comparison -- caused by: 7:14 rat
-TR opt: dead-inf-comp.rkt 100:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 103:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 107:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 110:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 110:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 110:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 110:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 110:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 110:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 110:36 3 -- in-range
-TR opt: dead-inf-comp.rkt 11:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 15:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 19:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 21:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 24:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 28:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 32:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 34:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 37:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 41:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 45:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 47:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 50:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 54:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 59:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 61:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 64:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 68:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 6:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 72:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 74:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 77:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 81:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 85:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 87:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 8:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 90:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 94:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 98:4 (quote dead) -- dead else branch
-END
-#<<END
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-'live
-5
-7
-9
-
-END
-#lang typed/racket/base
-#reader tests/typed-racket/optimizer/reset-port
-
-(define: rat : Exact-Rational 2/3)
-
-(if (< rat +inf.0)
-    'live
-    'dead)
-(if (< +inf.0 rat)
-    'dead
-    'live)
-(if (< rat -inf.0)
-    'dead
-    'live)
-(if (< -inf.0 rat)
-    'live
-    'dead)
-
-(if (> +inf.0 rat)
-    'live
-    'dead)
-(if (> rat +inf.0)
-    'dead
-    'live)
-(if (> -inf.0 rat)
-    'dead
-    'live)
-(if (> rat -inf.0)
-    'live
-    'dead)
-
-(if (<= rat +inf.0)
-    'live
-    'dead)
-(if (<= +inf.0 rat)
-    'dead
-    'live)
-(if (<= rat -inf.0)
-    'dead
-    'live)
-(if (<= -inf.0 rat)
-    'live
-    'dead)
-
-(if (>= +inf.0 rat)
-    'live
-    'dead)
-(if (>= rat +inf.0)
-    'dead
-    'live)
-(if (>= -inf.0 rat)
-    'dead
-    'live)
-(if (>= rat -inf.0)
-    'live
-    'dead)
-
-;; single flonums
-(if (< rat +inf.f)
-    'live
-    'dead)
-(if (< +inf.f rat)
-    'dead
-    'live)
-(if (< rat -inf.f)
-    'dead
-    'live)
-(if (< -inf.f rat)
-    'live
-    'dead)
-
-(if (> +inf.f rat)
-    'live
-    'dead)
-(if (> rat +inf.f)
-    'dead
-    'live)
-(if (> -inf.f rat)
-    'dead
-    'live)
-(if (> rat -inf.f)
-    'live
-    'dead)
-
-(if (<= rat +inf.f)
-    'live
-    'dead)
-(if (<= +inf.f rat)
-    'dead
-    'live)
-(if (<= rat -inf.f)
-    'dead
-    'live)
-(if (<= -inf.f rat)
-    'live
-    'dead)
-
-(if (>= +inf.f rat)
-    'live
-    'dead)
-(if (>= rat +inf.f)
-    'dead
-    'live)
-(if (>= -inf.f rat)
-    'dead
-    'live)
-(if (>= rat -inf.f)
-    'live
-    'dead)
-
-
-(for: ([i (in-range 5 +inf.0 2)] [j 3]) (displayln i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-substructs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-substructs.rkt
deleted file mode 100644
index 5a37b8b539..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-substructs.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#;#;
-#<<END
-TR info: dead-substructs.rkt 15:4 make-child1 -- struct constructor
-TR info: dead-substructs.rkt 16:4 make-child2 -- struct constructor
-END
-#<<END
-1
-2
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-;; originally from nucleic3
-;; cond on substructs, branches were considered dead
-
-(define-struct: parent ((x : Integer)))
-(define-struct: (child1 parent) ((y : Integer)))
-(define-struct: (child2 parent) ((y : Float)))
-
-(: f (parent -> Integer))
-(define (f x)
-  (cond [(child1? x) 1]
-        [(child2? x) 2]
-        [else (error "eh?")]))
-
-(f (make-child1 1 2))
-(f (make-child2 1 2.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-then.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-then.rkt
deleted file mode 100644
index 1f7d548e37..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-then.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#;#;
-#<<END
-TR info: dead-then.rkt 1:1 display -- hidden parameter
-TR info: dead-then.rkt 4:1 display -- hidden parameter
-TR opt: dead-then.rkt 2:13 (+ 2.0 3.0) -- dead then branch
-TR opt: dead-then.rkt 3:13 (+ 4.0 5.0) -- binary float
-TR opt: dead-then.rkt 5:13 (+ 2.0 3.0) -- dead then branch
-TR opt: dead-then.rkt 6:13 (+ 4.0 5.0) -- binary float
-END
-"9.09.0"
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(display (if (number? "eh")
-             (+ 2.0 3.0)
-             (+ 4.0 5.0)))
-(display (if #f
-             (+ 2.0 3.0)
-             (+ 4.0 5.0)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-begin-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-begin-float.rkt
deleted file mode 100644
index 756c79c646..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-begin-float.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-TR info: define-begin-float.rkt 1:18 display -- hidden parameter
-TR opt: define-begin-float.rkt 1:26 (- 2.0 3.0) -- binary float
-TR opt: define-begin-float.rkt 2:17 (* 2.0 3.0) -- binary float
-END
-"-1.0"
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(define a (begin (display (- 2.0 3.0))
-                 (* 2.0 3.0)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-call-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-call-float.rkt
deleted file mode 100644
index df3ed24d36..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-call-float.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#;#;
-#<<END
-TR opt: define-call-float.rkt 2:16 (+ 1.0 2.0) -- binary float
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(define x (cons (+ 1.0 2.0) 3.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-float.rkt
deleted file mode 100644
index ecd972eb96..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-float.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#;#;
-#<<END
-TR opt: define-float.rkt 2:10 (+ 1.0 2.0) -- binary float
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(define x (+ 1.0 2.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-pair.rkt
deleted file mode 100644
index fef902c632..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-pair.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#;#;
-#<<END
-TR opt: define-pair.rkt 2:10 (car (quote (1 3))) -- pair
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(define x (car '(1 3)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair.rkt
deleted file mode 100644
index 4a082f9cd9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#;#;
-#<<END
-TR opt: derived-pair.rkt 2:0 (caar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 2:0 (caar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 3:0 (cadr (cons 1 (cons 2 3))) -- pair
-TR opt: derived-pair.rkt 3:0 (cadr (cons 1 (cons 2 3))) -- pair
-TR opt: derived-pair.rkt 4:0 (cdar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 4:0 (cdar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 5:0 (cddr (cons 1 (cons 2 3))) -- pair
-TR opt: derived-pair.rkt 5:0 (cddr (cons 1 (cons 2 3))) -- pair
-END
-#<<END
-1
-2
-2
-3
-
-END
-#lang typed/racket #:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(caar (cons (cons 1 2) 3))
-(cadr (cons 1 (cons 2 3)))
-(cdar (cons (cons 1 2) 3))
-(cddr (cons 1 (cons 2 3)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair2.rkt
deleted file mode 100644
index 39db486058..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair2.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#;#;
-#<<END
-TR opt: derived-pair2.rkt 2:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 2:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 2:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 3:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 3:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 3:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 4:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 4:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 4:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 5:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 5:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 5:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 6:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 6:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 6:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 7:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 7:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 7:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 8:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 8:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 8:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 9:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 9:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 9:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-END
-#<<END
-1
-2
-2
-3
-2
-3
-3
-4
-
-END
-#lang typed/racket #:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(caaar (cons (cons (cons 1 2) 3) 4))
-(caadr (cons 1 (cons (cons 2 3) 4)))
-(cadar (cons (cons 1 (cons 2 3)) 4))
-(caddr (cons 1 (cons 2 (cons 3 4))))
-(cdaar (cons (cons (cons 1 2) 3) 4))
-(cdadr (cons 1 (cons (cons 2 3) 4)))
-(cddar (cons (cons 1 (cons 2 3)) 4))
-(cdddr (cons 1 (cons 2 (cons 3 4))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair3.rkt
deleted file mode 100644
index fe6fdba2db..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair3.rkt
+++ /dev/null
@@ -1,105 +0,0 @@
-#;#;
-#<<END
-TR opt: derived-pair3.rkt 10:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 10:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 10:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 10:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 11:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 11:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 11:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 11:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 12:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 12:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 12:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 12:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 13:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 13:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 13:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 13:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 14:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 14:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 14:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 14:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 15:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 15:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 15:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 15:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 16:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 16:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 16:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 16:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 17:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 17:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 17:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 17:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 2:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 2:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 2:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 2:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 3:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 3:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 3:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 3:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 4:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 4:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 4:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 4:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 5:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 5:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 5:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 5:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 6:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 6:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 6:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 6:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 7:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 7:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 7:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 7:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 8:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 8:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 8:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 8:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 9:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 9:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 9:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 9:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-END
-#<<END
-1
-2
-2
-3
-2
-3
-3
-4
-2
-3
-3
-4
-3
-4
-4
-5
-
-END
-#lang typed/racket #:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(caaaar (cons (cons (cons (cons 1 2) 3) 4) 5))
-(caaadr (cons 1 (cons (cons (cons 2 3) 4) 5)))
-(caadar (cons (cons 1 (cons (cons 2 3) 4)) 5))
-(caaddr (cons 1 (cons 2 (cons (cons 3 4) 5))))
-(cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5))
-(cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5)))
-(caddar (cons (cons 1 (cons 2 (cons 3 4))) 5))
-(cadddr (cons 1 (cons 2 (cons 3 (cons 4 5)))))
-(cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5))
-(cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5)))
-(cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5))
-(cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5))))
-(cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5))
-(cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5)))
-(cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5))
-(cddddr (cons 1 (cons 2 (cons 3 (cons 4 5)))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/different-langs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/different-langs.rkt
deleted file mode 100644
index 3c9eb6c155..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/different-langs.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;#;
-#<<END
-TR info: different-langs.rkt 3:0 (/ 1 2) -- possible exact real arith
-END
-#<<END
-1/2
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-;; to see if the harness supports having the 2 versions of a test being
-;; written in different languages
-(/ 1 2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/double-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/double-float.rkt
deleted file mode 100644
index 38a6f7213f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/double-float.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: double-float.rkt 2:0 (+ 2.0 2.0 2.0) -- binary float
-END
-#<<END
-6.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 2.0 2.0 2.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/drop-pure-pred.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/drop-pure-pred.rkt
deleted file mode 100644
index add9101f53..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/drop-pure-pred.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;#;
-#<<END
-TR opt: drop-pure-pred.rkt 6:6 (list 2) -- dead else branch
-END
-#<<END
-'(1)
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(let ()
-  (define x 7)
-  (if (exact-integer? x)
-      (list 1)
-      (list 2)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/exact-inexact.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/exact-inexact.rkt
deleted file mode 100644
index 904cbaa226..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/exact-inexact.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#;#;
-#<<END
-TR missed opt: exact-inexact.rkt 8:16 (expt 1.0f0 2.0f0) -- all args float-arg-expr, result not Float -- caused by: 8:22 1.0f0, 8:28 2.0f0
-TR missed opt: exact-inexact.rkt 9:21 (expt 1.0f0 2.0f0) -- all args float-arg-expr, result not Float -- caused by: 9:27 1.0f0, 9:33 2.0f0
-TR opt: exact-inexact.rkt 2:0 (exact->inexact (expt 10 100)) -- int to float
-TR opt: exact-inexact.rkt 3:0 (round (exact->inexact (expt 2.3 3.2))) -- unary float
-TR opt: exact-inexact.rkt 3:23 (expt 2.3 3.2) -- binary float
-TR opt: exact-inexact.rkt 3:7 (exact->inexact (expt 2.3 3.2)) -- float to float
-TR opt: exact-inexact.rkt 4:0 (real->double-flonum (expt 10 100)) -- int to float
-TR opt: exact-inexact.rkt 5:0 (round (real->double-flonum (expt 2.3 3.2))) -- unary float
-TR opt: exact-inexact.rkt 5:28 (expt 2.3 3.2) -- binary float
-TR opt: exact-inexact.rkt 5:7 (real->double-flonum (expt 2.3 3.2)) -- float to float
-TR opt: exact-inexact.rkt 8:0 (exact->inexact (expt 1.0f0 2.0f0)) -- single-float to single-float
-TR opt: exact-inexact.rkt 9:0 (real->single-flonum (expt 1.0f0 2.0f0)) -- single-float to single-float
-END
-#<<END
-1e+100
-14.0
-1e+100
-14.0
-1.0f0
-1.0f0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(exact->inexact (expt 10 100)) ; must not be a fixnum
-(round (exact->inexact (expt 2.3 3.2))) ; already a float
-(real->double-flonum (expt 10 100)) ; must not be a fixnum
-(round (real->double-flonum (expt 2.3 3.2))) ; already a float
-
-;; single floats
-(exact->inexact (expt 1.0f0 2.0f0))
-(real->single-flonum (expt 1.0f0 2.0f0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/expt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/expt.rkt
deleted file mode 100644
index ee32a1d6bf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/expt.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#;#;
-#<<END
-TR missed opt: expt.rkt 13:5 (expt -2.0 0.5) -- unexpected complex type
-TR missed opt: expt.rkt 6:13 (expt (sin 0.25) 1.0) -- unexpected complex type
-TR opt: expt.rkt 12:5 (expt 2.0 3.0) -- binary float
-TR opt: expt.rkt 6:19 (sin 0.25) -- unary float
-END
-#<<END
-"8.00000"
-"0.00000"
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-;; PR 12526
-;; result of expt was Float-Complex, and shouldn't have been
-;; this let to incorrect optimization
-(define (crash)
-  (real-part (expt (sin 0.25) 1.0)))
-
-;; to avoid machine-specific precision issues
-(: out : Number -> String)
-(define (out v) (real->decimal-string (real-part v) 5))
-
-(out (expt 2.0 3.0))
-(out (expt -2.0 0.5)) ; not a valid optimization, returns a complex
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/extflonums.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/extflonums.rkt
deleted file mode 100644
index 3a2405a0fc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/extflonums.rkt
+++ /dev/null
@@ -1,104 +0,0 @@
-#;#;
-#<<END
-TR opt: extflonums.rkt 10:5 (extfl* 1.0t0 1.0t0) -- binary extflonum
-TR opt: extflonums.rkt 11:5 (extfl/ 1.0t0 1.0t0) -- binary extflonum
-TR opt: extflonums.rkt 12:0 (extfl= 1.0t0 1.0t0) -- binary extflonum
-TR opt: extflonums.rkt 13:0 (extfl< 1.0t0 1.0t0) -- binary extflonum
-TR opt: extflonums.rkt 14:0 (extfl> 1.0t0 1.0t0) -- binary extflonum
-TR opt: extflonums.rkt 15:0 (extfl<= 1.0t0 1.0t0) -- binary extflonum
-TR opt: extflonums.rkt 16:0 (extfl>= 1.0t0 1.0t0) -- binary extflonum
-TR opt: extflonums.rkt 17:0 (extflmin 1.0t0 1.0t0) -- binary extflonum
-TR opt: extflonums.rkt 18:0 (extflmax 1.0t0 1.0t0) -- binary extflonum
-TR opt: extflonums.rkt 19:0 (extflexpt 1.0t0 1.0t0) -- binary extflonum
-TR opt: extflonums.rkt 21:5 (extflabs 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 22:5 (extflround 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 23:5 (extflfloor 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 24:5 (extflceiling 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 25:5 (extfltruncate 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 26:5 (extflsin 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 27:5 (extflcos 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 28:5 (extfltan 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 29:5 (extflasin 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 30:5 (extflacos 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 31:5 (extflatan 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 32:5 (extfllog 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 33:5 (extflexp 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 34:5 (extflsqrt 1.0t0) -- unary extflonum
-TR opt: extflonums.rkt 36:14 (bitwise-and 1 2) -- binary fixnum
-TR opt: extflonums.rkt 36:5 (->extfl (bitwise-and 1 2)) -- fixnum to extflonum conversion
-TR opt: extflonums.rkt 37:18 (bitwise-and 1 2) -- binary fixnum
-TR opt: extflonums.rkt 37:5 (real->extfl (bitwise-and 1 2)) -- fixnum to extflonum conversion
-TR opt: extflonums.rkt 8:5 (extfl+ 1.0t0 1.0t0) -- binary extflonum
-TR opt: extflonums.rkt 9:5 (extfl- 1.0t0 1.0t0) -- binary extflonum
-END
-#<<END
-"2.00000"
-"0.00000"
-"1.00000"
-"1.00000"
-#t
-#f
-#f
-#t
-#t
-1.0t0
-1.0t0
-1.0t0
-"1.00000"
-"1.00000"
-"1.00000"
-"1.00000"
-"1.00000"
-"0.84147"
-"0.54030"
-"1.55741"
-"1.57080"
-"0.00000"
-"0.78540"
-"0.00000"
-"2.71828"
-"1.00000"
-"0.00000"
-"0.00000"
-
-END
-
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(require racket/extflonum)
-
-;; to avoid machine-specific precision issues
-(: out : ExtFlonum -> String)
-(define (out v) (real->decimal-string (extfl->inexact v) 5))
-
-(out (extfl+ 1.0t0 1.0t0))
-(out (extfl- 1.0t0 1.0t0))
-(out (extfl* 1.0t0 1.0t0))
-(out (extfl/ 1.0t0 1.0t0))
-(extfl= 1.0t0 1.0t0)
-(extfl< 1.0t0 1.0t0)
-(extfl> 1.0t0 1.0t0)
-(extfl<= 1.0t0 1.0t0)
-(extfl>= 1.0t0 1.0t0)
-(extflmin 1.0t0 1.0t0)
-(extflmax 1.0t0 1.0t0)
-(extflexpt 1.0t0 1.0t0)
-
-(out (extflabs 1.0t0))
-(out (extflround 1.0t0))
-(out (extflfloor 1.0t0))
-(out (extflceiling 1.0t0))
-(out (extfltruncate 1.0t0))
-(out (extflsin 1.0t0))
-(out (extflcos 1.0t0))
-(out (extfltan 1.0t0))
-(out (extflasin 1.0t0))
-(out (extflacos 1.0t0))
-(out (extflatan 1.0t0))
-(out (extfllog 1.0t0))
-(out (extflexp 1.0t0))
-(out (extflsqrt 1.0t0))
-
-(out (->extfl (bitwise-and 1 2)))
-(out (real->extfl (bitwise-and 1 2)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/false-huh-dead-code.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/false-huh-dead-code.rkt
deleted file mode 100644
index 03351b416a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/false-huh-dead-code.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;#;
-#<<END
-TR opt: false-huh-dead-code.rkt 1:16 1 -- dead then branch
-TR opt: false-huh-dead-code.rkt 2:13 1 -- dead then branch
-END
-#<<END
-2
-2
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-(if (false? #t) 1 2)
-(if (not #t) 1 2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-bounded-expr.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-bounded-expr.rkt
deleted file mode 100644
index 83cd2fc861..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-bounded-expr.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#;#;
-#<<END
-TR info: fixnum-bounded-expr.rkt 34:0 (fx+ (+ 300 301) (+ 301 302)) -- non-optimized fixnum op
-TR info: fixnum-bounded-expr.rkt 37:0 (fx- (ann 3 Fixnum) (ann 4 Fixnum)) -- non-optimized fixnum op
-TR info: fixnum-bounded-expr.rkt 40:0 (fx* 300 300) -- non-optimized fixnum op
-TR info: fixnum-bounded-expr.rkt 43:0 (fxquotient -4 -5) -- non-optimized fixnum op
-TR missed opt: fixnum-bounded-expr.rkt 25:2 (+ x y) -- out of fixnum range
-TR opt: fixnum-bounded-expr.rkt 12:2 (- x (* y y)) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 12:7 (* y y) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 19:2 (+ x y) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 22:2 (+ x y) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 27:0 (abs 45) -- unary number
-TR opt: fixnum-bounded-expr.rkt 30:0 (fx+ 5 2) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 31:0 (fx+ (+ 34 231) (* 24 25)) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 31:16 (* 24 25) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 31:5 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 32:0 (fx+ (+ (+ 34 231) 23) -4) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 32:5 (+ (+ 34 231) 23) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 32:8 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 33:0 (fx+ -4 (+ (+ 34 231) 23)) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 33:11 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 33:8 (+ (+ 34 231) 23) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 34:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 34:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 36:0 (fx- (+ 300 301) (+ 301 302)) -- fixnum fx-
-TR opt: fixnum-bounded-expr.rkt 36:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 36:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 39:0 (fx* 4 5) -- fixnum fx*
-TR opt: fixnum-bounded-expr.rkt 42:0 (fxquotient (ann 34 Nonnegative-Fixnum) (ann -4 Negative-Fixnum)) -- fixnum fxquotient
-TR opt: fixnum-bounded-expr.rkt 45:0 (fxabs (ann 64235 Nonnegative-Fixnum)) -- fixnum fxabs
-TR opt: fixnum-bounded-expr.rkt 6:2 (+ x (sqr y)) -- fixnum bounded expr
-END
-#<<END
-28
-89525
-28
-89525
-291
-291
-291
-45
-3
-7
-865
-284
-284
-1204
--2
--1
-20
-90000
--8
-0
-64235
-4
-
-END
-#lang typed/racket
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(require racket/fixnum)
-
-(: f : Index Byte -> Nonnegative-Fixnum)
-(define (f x y)
-  (+ x (sqr y)))
-(f 3 5)
-(f 35236 233)
-
-(: g : Index Byte -> Fixnum)
-(define (g x y)
-  (- x (* y y)))
-(f 3 5)
-(f 35236 233)
-
-
-(let: ([x : Byte 45]
-       [y : Byte 246])
-  (+ x y))
-(let: ([x : Index 45]
-       [y : Index 246])
-  (+ x y))
-(let: ([x : Fixnum 45]
-       [y : Fixnum 246])
-  (+ x y)) ; this one can't be optimized, return type is not Fixnum
-
-(abs 45) ; ok
-(abs (ann -3 Fixnum)) ; not ok, result is not a fixnum
-
-(fx+ 5 2)
-(fx+ (+ 34 231) (* 24 25)) ; ok, (+ Index Index)
-(fx+ (+ (+ 34 231) 23) -4) ; ok, (+ Nonnegative-Fixnum Nonnegative-Fixnum)
-(fx+ -4 (+ (+ 34 231) 23)) ; ok, mirror case
-(fx+ (+ 300 301) (+ 301 302)) ; not ok, (+ Fixnum Fixnum)
-
-(fx- (+ 300 301) (+ 301 302)) ; ok, (+ Nonnegative-Fixnum Nonnegative-Fixnum)
-(fx- (ann 3 Fixnum) (ann 4 Fixnum)) ; not ok
-
-(fx* 4 5) ; ok, (* Byte Byte)
-(fx* 300 300) ; not ok
-
-(fxquotient (ann 34 Nonnegative-Fixnum) (ann -4 Negative-Fixnum))
-(fxquotient -4 -5) ; not ok
-
-(fxabs (ann 64235 Nonnegative-Fixnum)) ; ok
-(fxabs -4) ; not ok
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-comparison.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-comparison.rkt
deleted file mode 100644
index b69b5c8a3b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-comparison.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;#;
-#<<END
-TR opt: fixnum-comparison.rkt 2:0 (< (vector-length (quote #(1 2 3))) (string-length "asdf")) -- binary fixnum comp
-TR opt: fixnum-comparison.rkt 2:29 (string-length "asdf") -- string-length
-TR opt: fixnum-comparison.rkt 2:3 (vector-length (quote #(1 2 3))) -- known-length vector-length
-END
-#<<END
-#t
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(< (vector-length '#(1 2 3)) (string-length "asdf"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-comp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-comp.rkt
deleted file mode 100644
index 36de66f57f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-comp.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: float-comp.rkt 2:0 (< 1.0 2.0) -- binary float comp
-END
-#<<END
-#t
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(< 1.0 2.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate-top.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate-top.rkt
deleted file mode 100644
index 68981206f5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate-top.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-conjugate-top.rkt 2:0 (conjugate (+ 1.0+2.0i 2.0+4.0i)) -- unboxed unary float complex
-TR opt: float-complex-conjugate-top.rkt 2:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-conjugate-top.rkt 2:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-conjugate-top.rkt 2:23 2.0+4.0i -- unboxed literal
-END
-#<<END
-3.0-6.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(conjugate (+ 1.0+2.0i 2.0+4.0i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate.rkt
deleted file mode 100644
index 7bb5b6bf90..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-conjugate.rkt 2:0 (+ (conjugate 1.0+2.0i) (conjugate 2.0+4.0i)) -- unboxed binary float complex
-TR opt: float-complex-conjugate.rkt 2:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-conjugate.rkt 2:24 (conjugate 2.0+4.0i) -- unboxed unary float complex
-TR opt: float-complex-conjugate.rkt 2:3 (conjugate 1.0+2.0i) -- unboxed unary float complex
-TR opt: float-complex-conjugate.rkt 2:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-conjugate.rkt 3:0 (conjugate 1.0+0.0i) -- unboxed unary float complex
-TR opt: float-complex-conjugate.rkt 3:11 1.0+0.0i -- unboxed literal
-END
-#<<END
-3.0-6.0i
-1.0-0.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ (conjugate 1.0+2.0i) (conjugate 2.0+4.0i))
-(conjugate 1.0+0.0i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-div.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-div.rkt
deleted file mode 100644
index 8472af92b1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-div.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-div.rkt 2:0 (/ 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-div.rkt 2:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-div.rkt 2:21 3.0+6.0i -- unboxed literal
-TR opt: float-complex-div.rkt 2:3 1.0+2.0i -- unboxed literal
-END
-#<<END
-0.03333333333333333-0.06666666666666667i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(/ 1.0+2.0i 2.0+4.0i 3.0+6.0i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-fixnum.rkt
deleted file mode 100644
index 4bc39e2812..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-fixnum.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-fixnum.rkt 2:0 (+ (modulo 2 1) 1.0+2.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-fixnum.rkt 2:16 1.0+2.0i -- unboxed literal
-TR opt: float-complex-fixnum.rkt 2:25 3.0+6.0i -- unboxed literal
-TR opt: float-complex-fixnum.rkt 2:3 (modulo 2 1) -- binary nonzero fixnum
-TR opt: float-complex-fixnum.rkt 2:3 (modulo 2 1) -- non float complex in complex ops
-END
-#<<END
-4.0+8.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ (modulo 2 1) 1.0+2.0i 3.0+6.0i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-div.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-div.rkt
deleted file mode 100644
index f3bef3e5ca..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-div.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-float-div.rkt 10:18 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 10:27 3.0 -- float in complex ops
-TR opt: float-complex-float-div.rkt 10:6 (/ 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 10:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 11:18 2.0 -- float in complex ops
-TR opt: float-complex-float-div.rkt 11:22 3.0 -- float in complex ops
-TR opt: float-complex-float-div.rkt 11:6 (/ 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 11:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 12:13 2.0 -- float in complex ops
-TR opt: float-complex-float-div.rkt 12:17 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 12:6 (/ 1.0 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 12:9 1.0 -- float in complex ops
-TR opt: float-complex-float-div.rkt 3:51 (real-part x) -- complex accessor elimination
-TR opt: float-complex-float-div.rkt 3:62 x -- unbox float-complex
-TR opt: float-complex-float-div.rkt 4:51 (imag-part x) -- complex accessor elimination
-TR opt: float-complex-float-div.rkt 4:62 x -- unbox float-complex
-TR opt: float-complex-float-div.rkt 6:13 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 6:6 (/ 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 6:9 1.0 -- float in complex ops
-TR opt: float-complex-float-div.rkt 7:18 2.0 -- float in complex ops
-TR opt: float-complex-float-div.rkt 7:6 (/ 1.0+2.0i 2.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 7:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 8:13 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 8:22 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 8:6 (/ 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 8:9 1.0 -- float in complex ops
-TR opt: float-complex-float-div.rkt 9:18 2.0 -- float in complex ops
-TR opt: float-complex-float-div.rkt 9:22 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 9:6 (/ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 9:9 1.0+2.0i -- unboxed literal
-END
-#<<END
-'("0.1000000000-0.2000000000" "0.50000000001.0000000000" "-0.0200000000-0.0266666667" "0.16666666670.0000000000" "0.16666666670.0000000000" "0.16666666670.3333333333" "0.0333333333-0.0666666667")
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(map (lambda: ((x : Float-Complex))
-              (string-append (real->decimal-string (real-part x) 10)
-                             (real->decimal-string (imag-part x) 10)))
-     (list
-      (/ 1.0 2.0+4.0i)
-      (/ 1.0+2.0i 2.0)
-      (/ 1.0 2.0+4.0i 3.0+6.0i)
-      (/ 1.0+2.0i 2.0 3.0+6.0i)
-      (/ 1.0+2.0i 2.0+4.0i 3.0)
-      (/ 1.0+2.0i 2.0 3.0)
-      (/ 1.0 2.0 3.0+6.0i)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-mul.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-mul.rkt
deleted file mode 100644
index 5fb5f1c255..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-mul.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-float-mul.rkt 2:0 (* 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 2:3 1.0 -- float in complex ops
-TR opt: float-complex-float-mul.rkt 2:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 3:0 (* 1.0+2.0i 2.0) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 3:12 2.0 -- float in complex ops
-TR opt: float-complex-float-mul.rkt 3:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 4:0 (* 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 4:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 4:3 1.0 -- float in complex ops
-TR opt: float-complex-float-mul.rkt 4:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 5:0 (* 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 5:12 2.0 -- float in complex ops
-TR opt: float-complex-float-mul.rkt 5:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 5:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 6:0 (* 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 6:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 6:21 3.0 -- float in complex ops
-TR opt: float-complex-float-mul.rkt 6:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 7:0 (* 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 7:12 2.0 -- float in complex ops
-TR opt: float-complex-float-mul.rkt 7:16 3.0 -- float in complex ops
-TR opt: float-complex-float-mul.rkt 7:3 1.0+2.0i -- unboxed literal
-END
-#<<END
-2.0+4.0i
-2.0+4.0i
--18.0+24.0i
--18.0+24.0i
--18.0+24.0i
-6.0+12.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(* 1.0 2.0+4.0i)
-(* 1.0+2.0i 2.0)
-(* 1.0 2.0+4.0i 3.0+6.0i)
-(* 1.0+2.0i 2.0 3.0+6.0i)
-(* 1.0+2.0i 2.0+4.0i 3.0)
-(* 1.0+2.0i 2.0 3.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-small.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-small.rkt
deleted file mode 100644
index b607287bee..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-small.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-float-small.rkt 2:0 (+ 1.0+2.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 2:12 3.0 -- float in complex ops
-TR opt: float-complex-float-small.rkt 2:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 3:0 (+ 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 3:3 1.0 -- float in complex ops
-TR opt: float-complex-float-small.rkt 3:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 4:0 (- 1.0+2.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 4:12 3.0 -- float in complex ops
-TR opt: float-complex-float-small.rkt 4:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 5:0 (- 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 5:3 1.0 -- float in complex ops
-TR opt: float-complex-float-small.rkt 5:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 6:0 (+ 1.0+2.0i (+ 1.0 2.0)) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 6:12 (+ 1.0 2.0) -- binary float
-TR opt: float-complex-float-small.rkt 6:12 (+ 1.0 2.0) -- float in complex ops
-TR opt: float-complex-float-small.rkt 6:15 1.0 -- float in complex ops
-TR opt: float-complex-float-small.rkt 6:15 1.0 -- float in complex ops
-TR opt: float-complex-float-small.rkt 6:19 2.0 -- float in complex ops
-TR opt: float-complex-float-small.rkt 6:3 1.0+2.0i -- unboxed literal
-END
-#<<END
-4.0+2.0i
-3.0+4.0i
--2.0+2.0i
--1.0-4.0i
-4.0+2.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 1.0+2.0i 3.0)
-(+ 1.0 2.0+4.0i)
-(- 1.0+2.0i 3.0)
-(- 1.0 2.0+4.0i)
-(+ 1.0+2.0i (+ 1.0 2.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float.rkt
deleted file mode 100644
index 6ef7afac68..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-float.rkt 2:0 (+ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float.rkt 2:12 2.0 -- float in complex ops
-TR opt: float-complex-float.rkt 2:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 2:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float.rkt 3:0 (- 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float.rkt 3:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 3:3 1.0 -- float in complex ops
-TR opt: float-complex-float.rkt 3:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float.rkt 4:0 (- 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float.rkt 4:12 2.0 -- float in complex ops
-TR opt: float-complex-float.rkt 4:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 4:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float.rkt 5:0 (- 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float.rkt 5:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float.rkt 5:21 3.0 -- float in complex ops
-TR opt: float-complex-float.rkt 5:3 1.0+2.0i -- unboxed literal
-END
-#<<END
-6.0+8.0i
--4.0-10.0i
--4.0-4.0i
--4.0-2.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 1.0+2.0i 2.0 3.0+6.0i)
-(- 1.0 2.0+4.0i 3.0+6.0i)
-(- 1.0+2.0i 2.0 3.0+6.0i)
-(- 1.0+2.0i 2.0+4.0i 3.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-i.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-i.rkt
deleted file mode 100644
index 4a4100ecef..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-i.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-i.rkt 2:0 (+ 1.0+2.0i (* 0+1.0i 2.0+4.0i)) -- unboxed binary float complex
-TR opt: float-complex-i.rkt 2:12 (* 0+1.0i 2.0+4.0i) -- non float complex in complex ops
-TR opt: float-complex-i.rkt 2:15 0+1.0i -- unboxed literal
-TR opt: float-complex-i.rkt 2:15 0+1.0i -- unboxed literal
-TR opt: float-complex-i.rkt 2:21 2.0+4.0i -- unboxed literal
-TR opt: float-complex-i.rkt 2:3 1.0+2.0i -- unboxed literal
-END
-#<<END
--3.0+4.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 1.0+2.0i (* +1.0i 2.0+4.0i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-integer.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-integer.rkt
deleted file mode 100644
index 1160311edb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-integer.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-integer.rkt 2:0 (+ (expt 2 100) 1.0+2.0i) -- unboxed binary float complex
-TR opt: float-complex-integer.rkt 2:16 1.0+2.0i -- unboxed literal
-TR opt: float-complex-integer.rkt 2:3 (expt 2 100) -- non float complex in complex ops
-END
-#<<END
-1.2676506002282294e+30+2.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ (expt 2 100) 1.0+2.0i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-mult.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-mult.rkt
deleted file mode 100644
index 3a99453a80..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-mult.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-mult.rkt 2:0 (* 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-mult.rkt 2:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 2:21 3.0+6.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 2:3 1.0+2.0i -- unboxed literal
-END
-#<<END
--66.0-12.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(* 1.0+2.0i 2.0+4.0i 3.0+6.0i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-number-mul.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-number-mul.rkt
deleted file mode 100644
index 15885570ce..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-number-mul.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-number-mul.rkt 1:0 (imag-part (* 0.0+1.0i (* 1 2))) -- complex accessor elimination
-TR opt: float-complex-number-mul.rkt 1:11 (* 0.0+1.0i (* 1 2)) -- unboxed binary float complex
-TR opt: float-complex-number-mul.rkt 1:14 0.0+1.0i -- unboxed literal
-TR opt: float-complex-number-mul.rkt 1:23 (* 1 2) -- fixnum bounded expr
-TR opt: float-complex-number-mul.rkt 1:23 (* 1 2) -- non float complex in complex ops
-TR opt: float-complex-number-mul.rkt 1:26 1 -- non float complex in complex ops
-TR opt: float-complex-number-mul.rkt 1:26 1 -- non float complex in complex ops
-TR opt: float-complex-number-mul.rkt 1:28 2 -- non float complex in complex ops
-END
-#<<END
-2.0
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-(imag-part (* 0.0+1.0i (* 1 2)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts.rkt
deleted file mode 100644
index 651ace066e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-parts.rkt 2:0 (real-part 1.0+2.0i) -- complex accessor elimination
-TR opt: float-complex-parts.rkt 2:11 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts.rkt 3:0 (imag-part 1.0+2.0i) -- complex accessor elimination
-TR opt: float-complex-parts.rkt 3:11 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts.rkt 4:0 (real-part 1.0+2.0i) -- complex accessor elimination
-TR opt: float-complex-parts.rkt 4:11 1.0+2.0i -- unboxed literal
-END
-#<<END
-1.0
-2.0
-1.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(real-part 1.0+2.0i)
-(imag-part 1+2.0i)
-(real-part 1.0+2i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts2.rkt
deleted file mode 100644
index c34eec8c61..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts2.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-parts2.rkt 4:0 (real-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 4:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 4:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 4:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 5:0 (unsafe-flreal-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 5:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 5:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 5:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 6:0 (imag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 6:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 6:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 6:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 7:0 (unsafe-flimag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 7:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 7:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 7:32 2.0+4.0i -- unboxed literal
-END
-#<<END
-3.0
-3.0
-6.0
-6.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(require racket/unsafe/ops)
-
-(real-part (+ 1.0+2.0i 2.0+4.0i))
-(unsafe-flreal-part (+ 1.0+2.0i 2.0+4.0i))
-(imag-part (+ 1.0+2.0i 2.0+4.0i))
-(unsafe-flimag-part (+ 1.0+2.0i 2.0+4.0i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts3.rkt
deleted file mode 100644
index d6a7941e63..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts3.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-parts3.rkt 4:0 (+ 1.0+2.0i (real-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 4:12 (real-part (+ 2.0+4.0i 3.0+6.0i)) -- complex accessor elimination
-TR opt: float-complex-parts3.rkt 4:12 (real-part (+ 2.0+4.0i 3.0+6.0i)) -- float in complex ops
-TR opt: float-complex-parts3.rkt 4:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 4:26 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 4:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 4:35 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 5:0 (+ 1.0+2.0i (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 5:12 (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i)) -- complex accessor elimination
-TR opt: float-complex-parts3.rkt 5:12 (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i)) -- float in complex ops
-TR opt: float-complex-parts3.rkt 5:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 5:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 5:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 5:44 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 6:0 (+ 1.0+2.0i (imag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 6:12 (imag-part (+ 2.0+4.0i 3.0+6.0i)) -- complex accessor elimination
-TR opt: float-complex-parts3.rkt 6:12 (imag-part (+ 2.0+4.0i 3.0+6.0i)) -- float in complex ops
-TR opt: float-complex-parts3.rkt 6:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 6:26 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 6:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 6:35 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 7:0 (+ 1.0+2.0i (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 7:12 (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i)) -- complex accessor elimination
-TR opt: float-complex-parts3.rkt 7:12 (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i)) -- float in complex ops
-TR opt: float-complex-parts3.rkt 7:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 7:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 7:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 7:44 3.0+6.0i -- unboxed literal
-END
-#<<END
-6.0+2.0i
-6.0+2.0i
-11.0+2.0i
-11.0+2.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(require racket/unsafe/ops)
-
-(+ 1.0+2.0i (real-part (+ 2.0+4.0i 3.0+6.0i)))
-(+ 1.0+2.0i (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i)))
-(+ 1.0+2.0i (imag-part (+ 2.0+4.0i 3.0+6.0i)))
-(+ 1.0+2.0i (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-sin.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-sin.rkt
deleted file mode 100644
index aee5cb7763..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-sin.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#;#;
-#<<END
-TR info: float-complex-sin.rkt 2:13 (sin (* t 6.28)) -- possible exact real arith
-TR info: float-complex-sin.rkt 2:18 (* t 6.28) -- possible exact real arith
-TR missed opt: float-complex-sin.rkt 2:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 2:18 (* t 6.28)
-TR missed opt: float-complex-sin.rkt 2:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 2:21 t
-TR opt: float-complex-sin.rkt 2:10 (+ (sin (* t 6.28)) 0.0+0.0i) -- unboxed binary float complex
-TR opt: float-complex-sin.rkt 2:13 (sin (* t 6.28)) -- non float complex in complex ops
-TR opt: float-complex-sin.rkt 2:30 0.0+0.0i -- unboxed literal
-END
-#<<END
--0.0031853017931379904+0.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-((lambda: ((t : Integer))
-          (+ (sin (* t 6.28)) 0.0+0.0i))
- 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-unary.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-unary.rkt
deleted file mode 100644
index cf324b031f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-unary.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex-unary.rkt 2:0 (real-part (+ 1.0+2.0i (+ (* 3.0+4.0i 5.0+6.0i)))) -- complex accessor elimination
-TR opt: float-complex-unary.rkt 2:11 (+ 1.0+2.0i (+ (* 3.0+4.0i 5.0+6.0i))) -- unboxed binary float complex
-TR opt: float-complex-unary.rkt 2:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-unary.rkt 2:23 (+ (* 3.0+4.0i 5.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-unary.rkt 2:26 (* 3.0+4.0i 5.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-unary.rkt 2:26 (* 3.0+4.0i 5.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-unary.rkt 2:29 3.0+4.0i -- unboxed literal
-TR opt: float-complex-unary.rkt 2:29 3.0+4.0i -- unboxed literal
-TR opt: float-complex-unary.rkt 2:38 5.0+6.0i -- unboxed literal
-TR opt: float-complex-unary.rkt 2:38 5.0+6.0i -- unboxed literal
-TR opt: float-complex-unary.rkt 3:0 (real-part (+ 7.0+8.0i (* (+ 9.0+10.0i 11.0+12.0i)))) -- complex accessor elimination
-TR opt: float-complex-unary.rkt 3:11 (+ 7.0+8.0i (* (+ 9.0+10.0i 11.0+12.0i))) -- unboxed binary float complex
-TR opt: float-complex-unary.rkt 3:14 7.0+8.0i -- unboxed literal
-TR opt: float-complex-unary.rkt 3:23 (* (+ 9.0+10.0i 11.0+12.0i)) -- unboxed unary float complex
-TR opt: float-complex-unary.rkt 3:26 (+ 9.0+10.0i 11.0+12.0i) -- unboxed binary float complex
-TR opt: float-complex-unary.rkt 3:26 (+ 9.0+10.0i 11.0+12.0i) -- unboxed binary float complex
-TR opt: float-complex-unary.rkt 3:29 9.0+10.0i -- unboxed literal
-TR opt: float-complex-unary.rkt 3:29 9.0+10.0i -- unboxed literal
-TR opt: float-complex-unary.rkt 3:39 11.0+12.0i -- unboxed literal
-TR opt: float-complex-unary.rkt 3:39 11.0+12.0i -- unboxed literal
-END
-#<<END
--8.0
-27.0
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(real-part (+ 1.0+2.0i (+ (* 3.0+4.0i 5.0+6.0i))))
-(real-part (+ 7.0+8.0i (* (+ 9.0+10.0i 11.0+12.0i))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex.rkt
deleted file mode 100644
index b71d402cb6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#;#;
-#<<END
-TR opt: float-complex.rkt 2:0 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex.rkt 2:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex.rkt 2:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex.rkt 3:0 (- 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex.rkt 3:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex.rkt 3:3 1.0+2.0i -- unboxed literal
-END
-#<<END
-3.0+6.0i
--1.0-2.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 1.0+2.0i 2.0+4.0i)
-(- 1.0+2.0i 2.0+4.0i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-fun.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-fun.rkt
deleted file mode 100644
index 8dff52f886..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-fun.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-TR opt: float-fun.rkt 4:2 (+ x 1.0) -- binary float
-END
-""
-#lang typed/racket
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(: f (Float -> Float))
-(define (f x)
-  (+ x 1.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-promotion.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-promotion.rkt
deleted file mode 100644
index a00e8cad8e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-promotion.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR opt: float-promotion.rkt 2:0 (+ (assert (modulo 1 2) exact-positive-integer?) 2.0) -- binary float
-TR opt: float-promotion.rkt 2:11 (modulo 1 2) -- binary nonzero fixnum
-TR opt: float-promotion.rkt 3:0 (+ (expt 100 100) 2.0) -- binary float
-END
-#<<END
-3.0
-1e+200
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ (assert (modulo 1 2) exact-positive-integer?) 2.0)
-(+ (expt 100 100) 2.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-real.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-real.rkt
deleted file mode 100644
index 3d175ca6c0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-real.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#;#;
-#<<END
-TR info: float-real.rkt 3:15 (* (ann 2 Integer) 3.2) -- possible exact real arith
-TR info: float-real.rkt 4:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- possible exact real arith
-TR info: float-real.rkt 4:7 (* (ann 2 Integer) 3.1) -- possible exact real arith
-TR missed opt: float-real.rkt 3:15 (* (ann 2 Integer) 3.2) -- all args float-arg-expr, result not Float -- caused by: 3:23 2
-TR missed opt: float-real.rkt 4:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- all args float-arg-expr, result not Float -- caused by: 4:7 (* (ann 2 Integer) 3.1)
-TR missed opt: float-real.rkt 4:7 (* (ann 2 Integer) 3.1) -- all args float-arg-expr, result not Float -- caused by: 4:15 2
-TR opt: float-real.rkt 2:0 (+ 2.3 (ann 3 Positive-Real)) -- binary float
-TR opt: float-real.rkt 3:0 (+ 2.3 (assert (* (ann 2 Integer) 3.2) positive?)) -- binary float
-END
-#<<END
-5.3
-8.7
-14.26
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-;; reals within float expressions should be coerced when it's safe to do so
-(+ 2.3 (ann 3 Positive-Real)) ; safe
-(+ 2.3 (assert (* (ann 2 Integer) 3.2) positive?)) ; inner = unsafe, outer = unsafe
-(* 2.3 (* (ann 2 Integer) 3.1)) ; all unsafe
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flrandom.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flrandom.rkt
deleted file mode 100644
index 6a27401265..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flrandom.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR info: flrandom.rkt 3:7 random -- hidden parameter (random)
-TR info: flrandom.rkt 4:7 random -- hidden parameter (random)
-TR opt: flrandom.rkt 3:6 (random) -- float 0-arg random
-TR opt: flrandom.rkt 5:6 (random (current-pseudo-random-generator)) -- float random
-TR opt: flrandom.rkt 6:6 (flrandom (current-pseudo-random-generator)) -- float random
-END
-""
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(require racket/flonum)
-(void (random)) ; yes
-(void (random 2)) ; no
-(void (random (current-pseudo-random-generator))) ; yes
-(void (flrandom (current-pseudo-random-generator))) ; yes
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flvector-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flvector-length.rkt
deleted file mode 100644
index 702871dfd2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flvector-length.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: flvector-length.rkt 2:0 (flvector-length (flvector 0.0 1.2)) -- flvector-length
-END
-#<<END
-2
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(require racket/flonum)
-(flvector-length (flvector 0.0 1.2))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx-fl.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx-fl.rkt
deleted file mode 100644
index c8601d2975..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx-fl.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: fx-fl.rkt 2:0 (exact->inexact 1) -- fixnum to float
-END
-#<<END
-1.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(exact->inexact 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx2fl.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx2fl.rkt
deleted file mode 100644
index de8e650aa9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx2fl.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#;#;
-#<<END
-TR missed opt: fx2fl.rkt 15:40 (* 1024 i) -- out of fixnum range
-TR opt: fx2fl.rkt 10:20 (+ s (/ 1.0 (fx->fl i))) -- binary float
-TR opt: fx2fl.rkt 10:25 (/ 1.0 (fx->fl i)) -- binary float
-TR opt: fx2fl.rkt 10:32 (fx->fl i) -- fixnum to float
-TR opt: fx2fl.rkt 12:9 (for/fold: : Float ((s : Float 0.0)) ((i : Fixnum (in-range 1 100000001))) (+ s (/ 1.0 (fx->fl (* 1024 i))))) -- dead else branch
-TR opt: fx2fl.rkt 12:9 (for/fold: : Float ((s : Float 0.0)) ((i : Fixnum (in-range 1 100000001))) (+ s (/ 1.0 (fx->fl (* 1024 i))))) -- dead else branch
-TR opt: fx2fl.rkt 12:9 (for/fold: : Float ((s : Float 0.0)) ((i : Fixnum (in-range 1 100000001))) (+ s (/ 1.0 (fx->fl (* 1024 i))))) -- dead else branch
-TR opt: fx2fl.rkt 13:22 s -- dead else branch
-TR opt: fx2fl.rkt 13:22 s -- dead else branch
-TR opt: fx2fl.rkt 15:20 (+ s (/ 1.0 (fx->fl (* 1024 i)))) -- binary float
-TR opt: fx2fl.rkt 15:25 (/ 1.0 (fx->fl (* 1024 i))) -- binary float
-TR opt: fx2fl.rkt 7:9 (for/fold: : Float ((s : Float 0.0)) ((i : Fixnum (in-range 1 100000001))) (+ s (/ 1.0 (fx->fl i)))) -- dead else branch
-TR opt: fx2fl.rkt 7:9 (for/fold: : Float ((s : Float 0.0)) ((i : Fixnum (in-range 1 100000001))) (+ s (/ 1.0 (fx->fl i)))) -- dead else branch
-TR opt: fx2fl.rkt 7:9 (for/fold: : Float ((s : Float 0.0)) ((i : Fixnum (in-range 1 100000001))) (+ s (/ 1.0 (fx->fl i)))) -- dead else branch
-TR opt: fx2fl.rkt 8:22 s -- dead else branch
-TR opt: fx2fl.rkt 8:22 s -- dead else branch
-END
-""
-#lang typed/racket
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(require racket/fixnum)
-
-;; from http://stackoverflow.com/questions/22868795/how-to-optimize-this-piece-of-racket-code
-
-(define: (test) : Float
-         (for/fold: : Float
-                    ([s : Float 0.0])
-                    ([i : Fixnum (in-range 1 100000001)])
-                    (+ s (/ 1.0 (fx->fl i))))) ; should be optimized
-(define: (test2) : Float
-         (for/fold: : Float
-                    ([s : Float 0.0])
-                    ([i : Fixnum (in-range 1 100000001)])
-                    (+ s (/ 1.0 (fx->fl (* 1024 i)))))) ; should not
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-bytes.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-bytes.rkt
deleted file mode 100644
index 3e5afe9ef3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-bytes.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;#;
-#<<END
-TR info: in-bytes.rkt 2:7 display -- hidden parameter
-TR opt: in-bytes.rkt 1:20 #"123" -- in-bytes
-END
-"495051"
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(for: ((i : Integer #"123"))
-      (display i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt
deleted file mode 100644
index 503bcc6547..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;#;
-#<<END
-TR info: in-list.rkt 2:7 display -- hidden parameter
-TR opt: in-list.rkt 1:20 (quote (1 2 3)) -- in-list
-END
-"123"
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(for: ((i : Natural '(1 2 3)))
-      (display i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt
deleted file mode 100644
index 00dd1b5c66..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;#;
-#<<END
-TR info: in-range.rkt 2:3 display -- hidden parameter
-TR opt: in-range.rkt 1:9 4 -- in-range
-END
-"0123"
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(for ([i 4])
-  (display i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt
deleted file mode 100644
index 12270e0302..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;#;
-#<<END
-TR info: in-string.rkt 2:7 display -- hidden parameter
-TR opt: in-string.rkt 1:17 "123" -- in-string
-END
-"123"
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(for: ((i : Char "123"))
-      (display i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt
deleted file mode 100644
index 1b3e4960b3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;#;
-#<<END
-TR info: in-vector.rkt 2:7 display -- hidden parameter
-TR opt: in-vector.rkt 1:20 (vector 1 2 3) -- in-vector
-END
-"123"
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(for: ((i : Integer (vector 1 2 3)))
-      (display i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-binary-nonzero-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-binary-nonzero-fixnum.rkt
deleted file mode 100644
index 0b9b4d1a4b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-binary-nonzero-fixnum.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;#;
-#<<END
-TR info: invalid-binary-nonzero-fixnum.rkt 3:3 display -- hidden parameter
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(: f ( -> Void))
-(define (f) ; in a function, to prevent evaluation
-  (display (quotient 4 0))) ; 2 fixnums, but the second is 0, cannot optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-derived-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-derived-pair.rkt
deleted file mode 100644
index 334f0d10e7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-derived-pair.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;#;
-#<<END
-TR missed opt: invalid-derived-pair.rkt 10:6 (cadr x) -- car/cdr on a potentially empty list -- caused by: 10:6 (cadr x)
-TR missed opt: invalid-derived-pair.rkt 5:2 (cadr x) -- car/cdr on a potentially empty list -- caused by: 5:2 (cadr x)
-END
-""
-#lang typed/racket #:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-;; can't optimize, the lists may not be long enough
-(: f ((Listof Integer) -> Integer))
-(define (f x)
-  (cadr x))
-(: g ((Listof Integer) -> Integer))
-(define (g x)
-  (if (null? x)
-      0
-      (cadr x)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-exact-inexact.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-exact-inexact.rkt
deleted file mode 100644
index 1299697a29..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-exact-inexact.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-TR opt: invalid-exact-inexact.rkt 1:0 (exact->inexact 1.0) -- float to float
-END
-#<<END
-1.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(exact->inexact 1.0) ; not an integer, can't optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-comp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-comp.rkt
deleted file mode 100644
index 907e66025a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-comp.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR missed opt: invalid-float-comp.rkt 2:0 (< 1.0 2) -- generic comparison -- caused by: 2:7 2
-END
-#<<END
-#t
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(< 1.0 2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-promotion.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-promotion.rkt
deleted file mode 100644
index a96fad8077..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-promotion.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;#;
-#<<END
-TR info: invalid-float-promotion.rkt 2:0 (/ (ann 1 Integer) 2.0) -- possible exact real arith
-TR info: invalid-float-promotion.rkt 3:0 (* (ann 2/3 Exact-Rational) 3.0) -- possible exact real arith
-TR missed opt: invalid-float-promotion.rkt 2:0 (/ (ann 1 Integer) 2.0) -- all args float-arg-expr, result not Float -- caused by: 2:8 1
-TR missed opt: invalid-float-promotion.rkt 3:0 (* (ann 2/3 Exact-Rational) 3.0) -- all args float-arg-expr, result not Float -- caused by: 3:8 2/3
-END
-#<<END
-0.5
-2.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-;; the ann are necessary, since (* PosReal Float) -> Float (exact 0 is not in PosReal)
-(/ (ann 1 Integer) 2.0) ; result is not a float, can't optimize
-(* (ann 2/3 Exact-Rational) 3.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-fxquotient.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-fxquotient.rkt
deleted file mode 100644
index a2218a2d9a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-fxquotient.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR info: invalid-fxquotient.rkt 5:14 (fxquotient 3 0) -- non-optimized fixnum op
-TR missed opt: invalid-fxquotient.rkt 3:21 (quotient fixnum-min -1) -- out of fixnum range
-END
-#<<END
-#t
-
-END
-#lang typed/racket/base
-(require racket/fixnum)
-#reader tests/typed-racket/optimizer/reset-port
-
-(define: fixnum-min : Nonpositive-Fixnum (assert (- (expt 2 30)) fixnum?))
-(define: q : Natural (quotient fixnum-min -1)) ; this can't be optimized safely
-(= 1073741824 q)
-(define (bad) (fxquotient 3 0)) ; can't be optimized
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-inexact-complex-parts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-inexact-complex-parts.rkt
deleted file mode 100644
index 1442471be4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-inexact-complex-parts.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;#;
-#<<END
-END
-#<<END
-1
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(real-part 1+2i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-log-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-log-complex.rkt
deleted file mode 100644
index 4467baca0b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-log-complex.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR missed opt: invalid-log-complex.rkt 2:11 (log (ann 2.0 Float)) -- unexpected complex type
-END
-#<<END
-0.6931471805599453
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(real-part (log (ann 2.0 Float)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-flrectangular.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-flrectangular.rkt
deleted file mode 100644
index b5494c0543..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-flrectangular.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;#;
-#<<END
-END
-#<<END
-1+2i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(make-rectangular 1 2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-polar.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-polar.rkt
deleted file mode 100644
index 8539dc81a5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-polar.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-END
-#<<END
-0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(make-polar 0 0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-mpair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-mpair.rkt
deleted file mode 100644
index ddcd13cf89..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-mpair.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;#;
-#<<END
-TR missed opt: invalid-mpair.rkt 3:2 (mcar x) -- car/cdr on a potentially empty list -- caused by: 3:8 x
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(: f ((MListof Integer) -> Integer))
-(define (f x)
-  (mcar x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-sqrt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-sqrt.rkt
deleted file mode 100644
index 28994b54f0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-sqrt.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-TR missed opt: invalid-sqrt.rkt 1:0 (sqrt -2.0) -- unexpected complex type
-END
-#<<END
-0+1.4142135623730951i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(sqrt -2.0) ; not a nonnegative flonum, can't optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let.rkt
deleted file mode 100644
index 3f3b9446b8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#;#;
-#<<END
-TR info: invalid-unboxed-let.rkt 6:3 display -- hidden parameter
-TR info: invalid-unboxed-let.rkt 7:3 display -- hidden parameter
-TR info: invalid-unboxed-let.rkt 8:3 display -- hidden parameter
-TR info: invalid-unboxed-let.rkt 9:3 display -- hidden parameter
-TR opt: invalid-unboxed-let.rkt 2:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 2:13 1.0+2.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 2:22 2.0+4.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 2:6 (t1 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed let bindings
-TR opt: invalid-unboxed-let.rkt 3:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 3:13 3.0+6.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 3:22 4.0+8.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 6:11 (+ t1 t1) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 6:14 t1 -- leave var unboxed
-TR opt: invalid-unboxed-let.rkt 6:17 t1 -- leave var unboxed
-END
-"6.0+12.0i7.0+14.0i1.0+2.0i1"
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(let ((t1 (+ 1.0+2.0i 2.0+4.0i)) ; can be unboxed
-      (t2 (+ 3.0+6.0i 4.0+8.0i)) ; can't be unboxed
-      (t3 1.0+2.0i) ; can't be unboxed
-      (t4 1))
-  (display (+ t1 t1))
-  (display t2)
-  (display t3)
-  (display t4))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let2.rkt
deleted file mode 100644
index d02f04a034..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let2.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#;#;
-#<<END
-TR opt: invalid-unboxed-let2.rkt 5:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let2.rkt 5:33 1.0+2.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 5:42 2.0+4.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 5:52 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let2.rkt 5:55 3.0+6.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 5:64 4.0+8.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 6:2 (+ t1 t2) -- unboxed binary float complex
-TR opt: invalid-unboxed-let2.rkt 6:5 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let2.rkt 6:8 t2 -- unbox float-complex
-END
-#<<END
-10.0+20.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-
-
-;; unboxing of let bindings does not currently work with multiple values
-(let-values (((t1 t2) (values (+ 1.0+2.0i 2.0+4.0i) (+ 3.0+6.0i 4.0+8.0i))))
-  (+ t1 t2))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-ref.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-ref.rkt
deleted file mode 100644
index 01d037eae3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-ref.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;#;
-#<<END
-TR opt: invalid-vector-ref.rkt 3:2 (vector-ref x 0) -- vector partial bounds checking elimination
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(: f ((Vectorof Integer) -> Integer))
-(define (f x)
-  (vector-ref x 0)) ; type is (Vectorof Integer), length is unknown, can't optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-set.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-set.rkt
deleted file mode 100644
index d096d573e2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-set.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#;#;
-#<<END
-TR opt: invalid-vector-set.rkt 3:2 (vector-set! x 0 2) -- vector partial bounds checking elimination
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(: f ((Vectorof Integer) -> Void))
-(define (f x)
-  (vector-set! x 0 2)) ; type is (Vectorof Integer), length is ot known, can't optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-length-lists.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-length-lists.rkt
deleted file mode 100644
index 451b485689..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-length-lists.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#;#;
-#<<END
-TR opt: known-length-lists.rkt 10:0 (list-ref l k) -- known-length list op
-TR opt: known-length-lists.rkt 11:0 (list-tail l i) -- known-length list op
-TR opt: known-length-lists.rkt 12:0 (list-tail l j) -- known-length list op
-TR opt: known-length-lists.rkt 13:0 (list-tail l k) -- known-length list op
-TR opt: known-length-lists.rkt 14:0 (list-ref l 0) -- known-length list op
-TR opt: known-length-lists.rkt 15:0 (list-ref l 1) -- known-length list op
-TR opt: known-length-lists.rkt 16:0 (list-ref l 2) -- known-length list op
-TR opt: known-length-lists.rkt 17:0 (list-tail l 0) -- known-length list op
-TR opt: known-length-lists.rkt 18:0 (list-tail l 1) -- known-length list op
-TR opt: known-length-lists.rkt 19:0 (list-tail l 2) -- known-length list op
-TR opt: known-length-lists.rkt 7:0 (length l) -- known-length list length
-TR opt: known-length-lists.rkt 8:0 (list-ref l i) -- known-length list op
-TR opt: known-length-lists.rkt 9:0 (list-ref l j) -- known-length list op
-END
-#<<END
-3
-1
-2
-3
-'(1 2 3)
-'(2 3)
-'(3)
-1
-2
-3
-'(1 2 3)
-'(2 3)
-'(3)
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(define i 0)
-(define j 1)
-(define: k : 2 2) ; otherwise will typecheck as Positive-Byte
-(define l (ann '(1 2 3) (List Byte Byte Byte)))
-
-(length l)
-(list-ref l i)
-(list-ref l j)
-(list-ref l k)
-(list-tail l i)
-(list-tail l j)
-(list-tail l k)
-(list-ref l 0)
-(list-ref l 1)
-(list-ref l 2)
-(list-tail l 0)
-(list-tail l 1)
-(list-tail l 2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-vector-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-vector-length.rkt
deleted file mode 100644
index 5e756f61dd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-vector-length.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;#;
-#<<END
-TR opt: known-vector-length.rkt 2:0 (+ 2 (vector-length (ann (vector 1 2) (Vector Integer Integer)))) -- fixnum bounded expr
-TR opt: known-vector-length.rkt 2:5 (vector-length (ann (vector 1 2) (Vector Integer Integer))) -- known-length vector-length
-END
-#<<END
-4
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 2 (vector-length (ann (vector 1 2) (Vector Integer Integer))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-float.rkt
deleted file mode 100644
index 65ec170b1e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-float.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;#;
-#<<END
-TR opt: let-float.rkt 2:9 (+ 3.0 2.0) -- binary float
-TR opt: let-float.rkt 3:2 (* 9.0 x) -- binary float
-END
-#<<END
-45.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(let ((x (+ 3.0 2.0)))
-  (* 9.0 x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-loop-effects.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-loop-effects.rkt
deleted file mode 100644
index 478730ad09..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-loop-effects.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#;#;
-#<<END
-TR info: let-loop-effects.rkt 10:34 displayln -- hidden parameter
-TR info: let-loop-effects.rkt 11:34 displayln -- hidden parameter
-TR info: let-loop-effects.rkt 9:34 displayln -- hidden parameter
-TR opt: let-loop-effects.rkt 10:48 (add1 y) -- fixnum add1
-TR opt: let-loop-effects.rkt 11:26 (begin (displayln (quote z)) z) -- unbox float-complex
-TR opt: let-loop-effects.rkt 11:48 z -- unboxed complex variable
-TR opt: let-loop-effects.rkt 12:11 x -- leave var unboxed
-TR opt: let-loop-effects.rkt 12:13 z -- leave var unboxed
-TR opt: let-loop-effects.rkt 12:8 (+ x z) -- unboxed binary float complex
-TR opt: let-loop-effects.rkt 4:0 (real-part (let: loop : Float-Complex ((x : Float-Complex 0.0+0.0i) (y : Integer 0) (z : Float-Complex 0.0+0.0i)) (if (zero? y) (+ 1.0+0.0i (loop (begin (displayln (quote x)) x) (begin (displayln (quote y)) (add1 y)) (begin (displayln (quote z)) z))) (+ x z)))) -- complex accessor elimination
-TR opt: let-loop-effects.rkt 5:2 (let: loop : Float-Complex ((x : Float-Complex 0.0+0.0i) (y : Integer 0) (z : Float-Complex 0.0+0.0i)) (if (zero? y) (+ 1.0+0.0i (loop (begin (displayln (quote x)) x) (begin (displayln (quote y)) (add1 y)) (begin (displayln (quote z)) z))) (+ x z))) -- unbox float-complex
-TR opt: let-loop-effects.rkt 5:2 (let: loop : Float-Complex ((x : Float-Complex 0.0+0.0i) (y : Integer 0) (z : Float-Complex 0.0+0.0i)) (if (zero? y) (+ 1.0+0.0i (loop (begin (displayln (quote x)) x) (begin (displayln (quote y)) (add1 y)) (begin (displayln (quote z)) z))) (+ x z))) -- unboxed call site
-TR opt: let-loop-effects.rkt 5:31 x -- unboxed var -> table
-TR opt: let-loop-effects.rkt 5:49 0.0+0.0i -- unboxed literal
-TR opt: let-loop-effects.rkt 5:8 loop -- fun -> unboxed fun
-TR opt: let-loop-effects.rkt 5:8 loop -- unboxed let loop
-TR opt: let-loop-effects.rkt 7:31 z -- unboxed var -> table
-TR opt: let-loop-effects.rkt 7:49 0.0+0.0i -- unboxed literal
-TR opt: let-loop-effects.rkt 9:11 1.0+0.0i -- unboxed literal
-TR opt: let-loop-effects.rkt 9:20 (loop (begin (displayln (quote x)) x) (begin (displayln (quote y)) (add1 y)) (begin (displayln (quote z)) z)) -- call to fun with unboxed args
-TR opt: let-loop-effects.rkt 9:20 (loop (begin (displayln (quote x)) x) (begin (displayln (quote y)) (add1 y)) (begin (displayln (quote z)) z)) -- unbox float-complex
-TR opt: let-loop-effects.rkt 9:20 (loop (begin (displayln (quote x)) x) (begin (displayln (quote y)) (add1 y)) (begin (displayln (quote z)) z)) -- unboxed call site
-TR opt: let-loop-effects.rkt 9:26 (begin (displayln (quote x)) x) -- unbox float-complex
-TR opt: let-loop-effects.rkt 9:48 x -- unboxed complex variable
-TR opt: let-loop-effects.rkt 9:8 (+ 1.0+0.0i (loop (begin (displayln (quote x)) x) (begin (displayln (quote y)) (add1 y)) (begin (displayln (quote z)) z))) -- unboxed binary float complex
-END
-#<<END
-x
-y
-z
-1.0
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-
-;; Ensure that loop unboxing doesn't change order of effects
-(real-part
-  (let: loop : Float-Complex ((x : Float-Complex 0.0+0.0i)
-                              (y : Integer 0)
-                              (z : Float-Complex 0.0+0.0i))
-    (if (zero? y)
-        (+ 1.0+0.0i (loop (begin (displayln 'x) x)
-                          (begin (displayln 'y) (add1 y))
-                          (begin (displayln 'z) z)))
-        (+ x z))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-rhs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-rhs.rkt
deleted file mode 100644
index f794c361aa..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-rhs.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;#;
-#<<END
-TR opt: let-rhs.rkt 4:9 (+ 1.0 2.0) -- binary float
-END
-#<<END
-3.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-
-
-(let ((x (+ 1.0 2.0)))
-  x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/list.rkt
deleted file mode 100644
index 91b25a4bff..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/list.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#;#;
-#<<END
-TR missed opt: list.rkt 6:0 (rest (rest l)) -- car/cdr on a potentially empty list -- caused by: 6:6 (rest l)
-TR opt: list.rkt 3:0 (first l) -- pair
-TR opt: list.rkt 4:0 (rest l) -- pair
-TR opt: list.rkt 5:0 (second l) -- pair
-TR opt: list.rkt 5:0 (second l) -- pair
-TR opt: list.rkt 6:6 (rest l) -- pair
-TR opt: list.rkt 7:0 (third l) -- pair
-TR opt: list.rkt 7:0 (third l) -- pair
-TR opt: list.rkt 7:0 (third l) -- pair
-TR opt: list.rkt 8:0 (fourth l) -- pair
-TR opt: list.rkt 8:0 (fourth l) -- pair
-TR opt: list.rkt 8:0 (fourth l) -- pair
-TR opt: list.rkt 8:0 (fourth l) -- pair
-END
-#<<END
-1
-'(2 3 4)
-2
-'(3 4)
-3
-4
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(define: l : (List Integer Integer Integer Integer) '(1 2 3 4))
-(first l)
-(rest l)
-(second l)
-(rest (rest l))
-(third l)
-(fourth l)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/literal-int.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/literal-int.rkt
deleted file mode 100644
index c54314ecbf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/literal-int.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR opt: literal-int.rkt 4:0 (+ 1 2.0) -- binary float
-END
-#<<END
-3.0
-1
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-
-
-(+ 1 2.0)
-1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/magnitude.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/magnitude.rkt
deleted file mode 100644
index a306f8dc36..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/magnitude.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;#;
-#<<END
-TR opt: magnitude.rkt 4:0 (magnitude 3.0+4.0i) -- unboxed unary float complex
-TR opt: magnitude.rkt 4:11 3.0+4.0i -- unboxed literal
-END
-#<<END
-5.0
-
-END
-#lang typed/racket/base
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-
-
-(magnitude 3.0+4.0i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-flrectangular.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-flrectangular.rkt
deleted file mode 100644
index 2fe9c2b3e5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-flrectangular.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;#;
-#<<END
-TR opt: make-flrectangular.rkt 2:0 (make-rectangular 1.0 2.2) -- binary float comp
-TR opt: make-flrectangular.rkt 3:0 (make-flrectangular 1.0 2.2) -- binary float comp
-END
-#<<END
-1.0+2.2i
-1.0+2.2i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(require racket/flonum)
-(make-rectangular 1.0 2.2)
-(make-flrectangular 1.0 2.2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-polar.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-polar.rkt
deleted file mode 100644
index c5206e47c6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-polar.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#;#;
-#<<END
-TR opt: make-polar.rkt 3:6 (make-polar 1.0 1.0) -- make-polar
-TR opt: make-polar.rkt 3:6 (make-polar 1.0 1.0) -- make-rectangular elimination
-TR opt: make-polar.rkt 6:12 1.0+2.0i -- unboxed literal
-TR opt: make-polar.rkt 6:21 (make-polar 2.0 4.0) -- make-rectangular elimination
-TR opt: make-polar.rkt 6:6 (p (+ 1.0+2.0i (make-polar 2.0 4.0))) -- unboxed let bindings
-TR opt: make-polar.rkt 6:9 (+ 1.0+2.0i (make-polar 2.0 4.0)) -- unboxed binary float complex
-TR opt: make-polar.rkt 7:39 (real-part p) -- complex accessor elimination
-TR opt: make-polar.rkt 7:50 p -- leave var unboxed
-TR opt: make-polar.rkt 8:39 (imag-part p) -- complex accessor elimination
-TR opt: make-polar.rkt 8:50 p -- leave var unboxed
-END
-#<<END
-"-0.3070.486"
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-;; top level
-(void (make-polar 1.0 1.0))
-
-;; nested
-(let ((p (+ 1.0+2.0i (make-polar 2.0 4.0))))
-  (string-append (real->decimal-string (real-part p) 3)
-                 (real->decimal-string (imag-part p) 3)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/maybe-exact-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/maybe-exact-complex.rkt
deleted file mode 100644
index ece8805aac..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/maybe-exact-complex.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;#;
-#<<END
-TR opt: maybe-exact-complex.rkt 2:0 (+ 1.0+2.0i 2+4i) -- unboxed binary float complex
-TR opt: maybe-exact-complex.rkt 2:12 2+4i -- unboxed literal
-TR opt: maybe-exact-complex.rkt 2:3 1.0+2.0i -- unboxed literal
-END
-#<<END
-3.0+6.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 1.0+2.0i 2+4i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/module-path.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/module-path.rkt
deleted file mode 100644
index fb42e033ec..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/module-path.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;#;
-#<<END
-TR opt: module-path.rkt 3:0 (unless (module-path? 2) #f) -- dead then branch
-END
-#<<END
-#t
-#f
-#f
-
-END
-#lang typed/racket #:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(if (module-path? "a") #t #f)
-(if (module-path? "\0") #t #f)
-(unless (module-path? 2) #f)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/mpair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/mpair.rkt
deleted file mode 100644
index 2b7d31a8f0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/mpair.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#;#;
-#<<END
-TR opt: mpair.rkt 13:6 (mcar x) -- pair
-TR opt: mpair.rkt 4:0 (mcar x) -- pair
-TR opt: mpair.rkt 5:0 (mcdr x) -- pair
-TR opt: mpair.rkt 6:0 (set-mcar! x (+ 1 2)) -- pair
-TR opt: mpair.rkt 6:13 (+ 1 2) -- fixnum bounded expr
-TR opt: mpair.rkt 7:0 (set-mcdr! x (+ 1.0 2.0)) -- pair
-TR opt: mpair.rkt 7:13 (+ 1.0 2.0) -- binary float
-END
-#<<END
-1
-1.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(: x (MPairof Integer Float))
-(define x (mcons 1 1.0))
-(mcar x)
-(mcdr x)
-(set-mcar! x (+ 1 2))
-(set-mcdr! x (+ 1.0 2.0))
-
-(: f ((MListof Integer) -> Integer))
-(define (f x)
-  (if (null? x)
-      0
-      (mcar x)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/multi-flcomp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/multi-flcomp.rkt
deleted file mode 100644
index 14bc3726f3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/multi-flcomp.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#;#;
-#<<END
-TR missed opt: multi-flcomp.rkt 3:0 (<= 1.0 2.0 3) -- generic comparison -- caused by: 3:12 3
-TR opt: multi-flcomp.rkt 2:0 (<= 1.0 2.0 3.0) -- multi float comp
-TR opt: multi-flcomp.rkt 4:0 (<= 1.0 2.0 3.0 4.0) -- multi float comp
-TR opt: multi-flcomp.rkt 5:0 (<= 1.0 2.0 3.0 (+ 2.0 2.0)) -- multi float comp
-TR opt: multi-flcomp.rkt 5:16 (+ 2.0 2.0) -- binary float
-TR opt: multi-flcomp.rkt 6:0 (<= 1.0 2.0 (+ 2.0 2.0) 3.0) -- multi float comp
-TR opt: multi-flcomp.rkt 6:12 (+ 2.0 2.0) -- binary float
-END
-#<<END
-#t
-#t
-#t
-#t
-#f
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(<= 1.0 2.0 3.0)
-(<= 1.0 2.0 3) ; unsafe, last one is not a float
-(<= 1.0 2.0 3.0 4.0)
-(<= 1.0 2.0 3.0 (+ 2.0 2.0))
-(<= 1.0 2.0 (+ 2.0 2.0) 3.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float-complex.rkt
deleted file mode 100644
index 120eea9ecc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float-complex.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR opt: n-ary-float-complex.rkt 2:0 (+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: n-ary-float-complex.rkt 2:12 2.0+4.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 2:21 3.0+6.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 2:3 1.0+2.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 2:30 4.0+8.0i -- unboxed literal
-END
-#<<END
-10.0+20.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float.rkt
deleted file mode 100644
index e657d6ffe4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: n-ary-float.rkt 2:0 (+ 1.0 2.0 3.0) -- binary float
-END
-#<<END
-6.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 1.0 2.0 3.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float-complex.rkt
deleted file mode 100644
index cac4a808bd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float-complex.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR opt: nested-float-complex.rkt 2:0 (+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i)) -- unboxed binary float complex
-TR opt: nested-float-complex.rkt 2:12 (- 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: nested-float-complex.rkt 2:15 2.0+4.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 2:24 3.0+6.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 2:3 1.0+2.0i -- unboxed literal
-END
-#<<END
-0.0+0.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float.rkt
deleted file mode 100644
index 10959a71ed..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;#;
-#<<END
-TR opt: nested-float.rkt 2:0 (+ 2.0 (+ 3.0 4.0)) -- binary float
-TR opt: nested-float.rkt 2:7 (+ 3.0 4.0) -- binary float
-END
-#<<END
-9.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 2.0 (+ 3.0 4.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float2.rkt
deleted file mode 100644
index 948a19e0b6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float2.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;#;
-#<<END
-TR opt: nested-float2.rkt 2:0 (+ 2.0 (* 3.0 4.0)) -- binary float
-TR opt: nested-float2.rkt 2:7 (* 3.0 4.0) -- binary float
-END
-#<<END
-14.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 2.0 (* 3.0 4.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-let-loop.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-let-loop.rkt
deleted file mode 100644
index a13d1f9f79..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-let-loop.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#;#;
-#<<END
-TR opt: nested-let-loop.rkt 11:20 (loop1 (cdr x) (+ r s)) -- call to fun with unboxed args
-TR opt: nested-let-loop.rkt 11:20 (loop1 (cdr x) (+ r s)) -- unboxed call site
-TR opt: nested-let-loop.rkt 11:27 (cdr x) -- pair
-TR opt: nested-let-loop.rkt 11:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 11:38 r -- leave var unboxed
-TR opt: nested-let-loop.rkt 11:40 s -- leave var unboxed
-TR opt: nested-let-loop.rkt 12:20 (loop2 (cdr y) (+ s (car x) (car y))) -- call to fun with unboxed args
-TR opt: nested-let-loop.rkt 12:20 (loop2 (cdr y) (+ s (car x) (car y))) -- unboxed call site
-TR opt: nested-let-loop.rkt 12:27 (cdr y) -- pair
-TR opt: nested-let-loop.rkt 12:35 (+ s (car x) (car y)) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 12:38 s -- leave var unboxed
-TR opt: nested-let-loop.rkt 12:40 (car x) -- pair
-TR opt: nested-let-loop.rkt 12:40 (car x) -- unbox float-complex
-TR opt: nested-let-loop.rkt 12:48 (car y) -- pair
-TR opt: nested-let-loop.rkt 12:48 (car y) -- unbox float-complex
-TR opt: nested-let-loop.rkt 2:0 (let: loop1 : Float-Complex ((x : (Listof Float-Complex) (quote (1.0+2.0i 2.0+4.0i))) (r : Float-Complex 0.0+0.0i)) (if (null? x) r (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))))) -- unboxed call site
-TR opt: nested-let-loop.rkt 2:6 loop1 -- fun -> unboxed fun
-TR opt: nested-let-loop.rkt 2:6 loop1 -- unboxed let loop
-TR opt: nested-let-loop.rkt 4:28 0.0+0.0i -- unboxed literal
-TR opt: nested-let-loop.rkt 4:8 r -- unboxed var -> table
-TR opt: nested-let-loop.rkt 6:10 r -- unboxed complex variable
-TR opt: nested-let-loop.rkt 7:10 (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))) -- unboxed call site
-TR opt: nested-let-loop.rkt 7:16 loop2 -- fun -> unboxed fun
-TR opt: nested-let-loop.rkt 7:16 loop2 -- unboxed let loop
-TR opt: nested-let-loop.rkt 9:18 s -- unboxed var -> table
-TR opt: nested-let-loop.rkt 9:38 0.0+0.0i -- unboxed literal
-END
-#<<END
-20.0+40.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(let: loop1 : Float-Complex
-      ((x : (Listof Float-Complex)   '(1.0+2.0i 2.0+4.0i))
-       (r : Float-Complex   0.0+0.0i))
-      (if (null? x)
-          r
-          (let: loop2 : Float-Complex
-                ((y : (Listof Float-Complex)   '(3.0+6.0i 4.0+8.0i))
-                 (s : Float-Complex   0.0+0.0i))
-                (if (null? y)
-                    (loop1 (cdr x) (+ r s))
-                    (loop2 (cdr y) (+ s (car x) (car y)))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair1.rkt
deleted file mode 100644
index 4ef3bee81e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair1.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;#;
-#<<END
-TR opt: nested-pair1.rkt 2:0 (car (cdr (quote (1 2)))) -- pair
-TR opt: nested-pair1.rkt 2:5 (cdr (quote (1 2))) -- pair
-END
-#<<END
-2
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(car (cdr '(1 2)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair2.rkt
deleted file mode 100644
index 3b53d4e712..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair2.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;#;
-#<<END
-TR opt: nested-pair2.rkt 2:0 (car (cdr (cons 3 (cons (cons 2 (quote ())) 1)))) -- pair
-TR opt: nested-pair2.rkt 2:5 (cdr (cons 3 (cons (cons 2 (quote ())) 1))) -- pair
-END
-#<<END
-'(2)
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(car (cdr (cons 3 (cons (cons 2 '()) 1))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-unboxed-let.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-unboxed-let.rkt
deleted file mode 100644
index fc67ee76d3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-unboxed-let.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#;#;
-#<<END
-TR opt: nested-unboxed-let.rkt 2:12 1.0+2.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 2:21 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 2:6 (x (+ 1.0+2.0i 2.0+3.0i)) -- unboxed let bindings
-TR opt: nested-unboxed-let.rkt 2:9 (+ 1.0+2.0i 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 3:11 (+ x 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 3:14 x -- leave var unboxed
-TR opt: nested-unboxed-let.rkt 3:16 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 3:8 (x (+ x 2.0+3.0i)) -- unboxed let bindings
-TR opt: nested-unboxed-let.rkt 4:4 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 4:7 x -- leave var unboxed
-TR opt: nested-unboxed-let.rkt 4:9 3.0+6.0i -- unboxed literal
-END
-#<<END
-8.0+14.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(let ((x (+ 1.0+2.0i 2.0+3.0i)))
-  (let ((x (+ x 2.0+3.0i)))
-    (+ x 3.0+6.0i)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/one-arg-arith.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/one-arg-arith.rkt
deleted file mode 100644
index 21ff23f7c7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/one-arg-arith.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#;#;
-#<<END
-TR opt: one-arg-arith.rkt 10:0 (+ (expt 2 100)) -- unary number
-TR opt: one-arg-arith.rkt 11:0 (* 1) -- unary number
-TR opt: one-arg-arith.rkt 12:0 (* 1.0) -- unary number
-TR opt: one-arg-arith.rkt 13:0 (* (expt 2 100)) -- unary number
-TR opt: one-arg-arith.rkt 14:0 (min 1) -- unary number
-TR opt: one-arg-arith.rkt 15:0 (min 1.0) -- unary number
-TR opt: one-arg-arith.rkt 16:0 (min (expt 2 100)) -- unary number
-TR opt: one-arg-arith.rkt 17:0 (max 1) -- unary number
-TR opt: one-arg-arith.rkt 18:0 (max 1.0) -- unary number
-TR opt: one-arg-arith.rkt 19:0 (max (expt 2 100)) -- unary number
-TR opt: one-arg-arith.rkt 4:0 (- 12) -- unary fixnum
-TR opt: one-arg-arith.rkt 5:0 (- 12.0) -- unary float
-TR opt: one-arg-arith.rkt 6:0 (/ 4.2) -- unary float
-TR opt: one-arg-arith.rkt 8:0 (+ 1) -- unary number
-TR opt: one-arg-arith.rkt 9:0 (+ 1.0) -- unary number
-END
-#<<END
--12
--12.0
-0.23809523809523808
-1
-1.0
-1267650600228229401496703205376
-1
-1.0
-1267650600228229401496703205376
-1
-1.0
-1267650600228229401496703205376
-1
-1.0
-1267650600228229401496703205376
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-
-
-(- 12)
-(- 12.0)
-(/ 4.2)
-
-(+ 1)
-(+ 1.0)
-(+ (expt 2 100))
-(* 1)
-(* 1.0)
-(* (expt 2 100))
-(min 1)
-(min 1.0)
-(min (expt 2 100))
-(max 1)
-(max 1.0)
-(max (expt 2 100))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-fun.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-fun.rkt
deleted file mode 100644
index e93756caae..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-fun.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;#;
-#<<END
-TR opt: pair-fun.rkt 6:6 (car x) -- pair
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(: f ((Listof Integer) -> Integer))
-(define (f x)
-  (if (null? x)
-      1
-      (car x)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt
deleted file mode 100644
index c607dc66f9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#;#;
-#<<END
-TR opt: pair-known-length-list.rkt 4:0 (car x) -- pair
-TR opt: pair-known-length-list.rkt 5:0 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 6:0 (car (cdr x)) -- pair
-TR opt: pair-known-length-list.rkt 6:5 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 7:0 (cdr (cdr x)) -- pair
-TR opt: pair-known-length-list.rkt 7:5 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 8:0 (car (cdr (cdr x))) -- pair
-TR opt: pair-known-length-list.rkt 8:10 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 8:5 (cdr (cdr x)) -- pair
-TR opt: pair-known-length-list.rkt 9:0 (cdr (cdr (cdr x))) -- pair
-TR opt: pair-known-length-list.rkt 9:10 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 9:5 (cdr (cdr x)) -- pair
-END
-#<<END
-1
-'(2 3)
-2
-'(3)
-3
-'()
-
-END
-#lang typed/racket #:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(: x (List Integer Integer Integer))
-(define x (list 1 2 3))
-(car x)
-(cdr x)
-(car (cdr x))
-(cdr (cdr x))
-(car (cdr (cdr x)))
-(cdr (cdr (cdr x)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr12475.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr12475.rkt
deleted file mode 100644
index a5d5940193..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr12475.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#;#;
-#<<END
-TR opt: pr12475.rkt 10:3 (quote 0.0+0.0i) -- unboxed literal
-TR opt: pr12475.rkt 4:2 ((letrec-values (((for-loop) (lambda (so-far-init) (if (quote #t) (* so-far-init (quote 1.0)) so-far-init)))) for-loop) (quote 0.0+0.0i)) -- unboxed call site
-TR opt: pr12475.rkt 4:21 for-loop -- fun -> unboxed fun
-TR opt: pr12475.rkt 5:29 so-far-init -- unboxed var -> table
-TR opt: pr12475.rkt 7:26 (* so-far-init (quote 1.0)) -- unboxed binary float complex
-TR opt: pr12475.rkt 7:29 so-far-init -- leave var unboxed
-TR opt: pr12475.rkt 7:41 (quote 1.0) -- float in complex ops
-TR opt: pr12475.rkt 8:26 so-far-init -- dead else branch
-TR opt: pr12475.rkt 9:5 for-loop -- unboxed let loop
-END
-""
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(: coefficients->poly (-> Float-Complex))
-(define (coefficients->poly)
-  ((letrec-values (((for-loop)
-                    (lambda (so-far-init)
-                      (if '#t
-                          (* so-far-init '1.0)
-                          so-far-init))))
-     for-loop)
-   '0.0+0.0i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13468.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13468.rkt
deleted file mode 100644
index 6ecbe30120..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13468.rkt
+++ /dev/null
@@ -1,160 +0,0 @@
-#;#;
-#<<END
-TR missed opt: pr13468.rkt 5:5 (/ (ann 0.0+0.0i Float-Complex) (ann 1 Number)) -- Float-Complex division, potential exact 0s on the rhss -- caused by: 5:42 1
-TR missed opt: pr13468.rkt 8:5 (expt (ann -5.0 Flonum) (ann 2.0 Flonum)) -- unexpected complex type
-TR opt: pr13468.rkt 12:5 (magnitude (ann 0 Zero)) -- unary number
-TR opt: pr13468.rkt 13:5 (magnitude (ann 1 One)) -- unary number
-TR opt: pr13468.rkt 14:5 (magnitude (ann 6 Byte)) -- unary number
-TR opt: pr13468.rkt 15:5 (magnitude (ann 6 Index)) -- unary number
-TR opt: pr13468.rkt 17:5 (magnitude (ann 6 Positive-Fixnum)) -- unary number
-TR opt: pr13468.rkt 18:5 (magnitude (ann 6 Nonnegative-Fixnum)) -- unary number
-TR opt: pr13468.rkt 23:5 (magnitude (ann 6 Positive-Integer)) -- unary number
-TR opt: pr13468.rkt 24:5 (magnitude (ann 6 Nonnegative-Integer)) -- unary number
-TR opt: pr13468.rkt 29:5 (magnitude (ann 0.0 Flonum-Zero)) -- unary float
-TR opt: pr13468.rkt 30:5 (magnitude (ann 6.0 Positive-Flonum)) -- unary number
-TR opt: pr13468.rkt 31:5 (magnitude (ann 6.0 Nonnegative-Flonum)) -- unary float
-TR opt: pr13468.rkt 32:5 (magnitude (ann -6.0 Nonpositive-Flonum)) -- unary float
-TR opt: pr13468.rkt 33:5 (magnitude (ann -6.0 Negative-Flonum)) -- unary float
-TR opt: pr13468.rkt 34:5 (magnitude (ann 6.0 Flonum)) -- unary float
-TR opt: pr13468.rkt 38:5 (real-part (ann 0 Zero)) -- unary number
-TR opt: pr13468.rkt 39:5 (real-part (ann 1 One)) -- unary number
-TR opt: pr13468.rkt 3:13 6.0+2.3i -- unbox float-complex
-TR opt: pr13468.rkt 3:13 6.0+2.3i -- unbox float-complex
-TR opt: pr13468.rkt 3:5 (- (ann 6.0+2.3i Float-Complex)) -- unboxed unary float complex
-TR opt: pr13468.rkt 40:5 (real-part (ann 6 Byte)) -- unary number
-TR opt: pr13468.rkt 41:5 (real-part (ann 6 Index)) -- unary number
-TR opt: pr13468.rkt 43:5 (real-part (ann 6 Positive-Fixnum)) -- unary number
-TR opt: pr13468.rkt 44:5 (real-part (ann 6 Nonnegative-Fixnum)) -- unary number
-TR opt: pr13468.rkt 45:5 (real-part (ann -6 Nonpositive-Fixnum)) -- unary number
-TR opt: pr13468.rkt 46:5 (real-part (ann -6 Negative-Fixnum)) -- unary number
-TR opt: pr13468.rkt 47:5 (real-part (ann 6 Fixnum)) -- unary number
-TR opt: pr13468.rkt 49:5 (real-part (ann 6 Positive-Integer)) -- unary number
-TR opt: pr13468.rkt 4:13 6.0+2.3i -- unbox float-complex
-TR opt: pr13468.rkt 4:13 6.0+2.3i -- unbox float-complex
-TR opt: pr13468.rkt 4:5 (/ (ann 6.0+2.3i Float-Complex)) -- unboxed unary float complex
-TR opt: pr13468.rkt 50:5 (real-part (ann 6 Nonnegative-Integer)) -- unary number
-TR opt: pr13468.rkt 51:5 (real-part (ann -6 Nonpositive-Integer)) -- unary number
-TR opt: pr13468.rkt 52:5 (real-part (ann -6 Negative-Integer)) -- unary number
-TR opt: pr13468.rkt 53:5 (real-part (ann 6 Integer)) -- unary number
-TR opt: pr13468.rkt 55:5 (real-part (ann 0.0 Flonum-Zero)) -- unary number
-TR opt: pr13468.rkt 56:5 (real-part (ann 6.0 Positive-Flonum)) -- unary number
-TR opt: pr13468.rkt 57:5 (real-part (ann 6.0 Nonnegative-Flonum)) -- unary number
-TR opt: pr13468.rkt 58:5 (real-part (ann -6.0 Nonpositive-Flonum)) -- unary number
-TR opt: pr13468.rkt 59:5 (real-part (ann -6.0 Negative-Flonum)) -- unary number
-TR opt: pr13468.rkt 60:5 (real-part (ann 6.0 Flonum)) -- unary number
-TR opt: pr13468.rkt 64:5 (imag-part (ann 5.6 Real)) -- unary number
-END
-#<<END
--6.0-2.3i
-0.1453136352627755-0.055703560184063944i
-0.0+0.0i
-25.0
-0
-1
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-6
-0.0
-6.0
-6.0
-6.0
-6.0
-6.0
-0
-1
-6
-6
-6
-6
--6
--6
-6
-6
-6
--6
--6
-6
-0.0
-6.0
-6.0
--6.0
--6.0
-6.0
-0
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-;; Most bothersome missing cases:
-(ann (- (ann 6.0+2.3i Float-Complex)) Float-Complex)
-(ann (/ (ann 6.0+2.3i Float-Complex)) Float-Complex)
-(ann (/ (ann 0.0+0.0i Float-Complex) (ann 1+0i Number)) Float-Complex)
-
-;; Would be nice to maintain flonum-ness here:
-(ann (expt (ann -5.0 Flonum) (ann 2.0 Flonum)) (U Flonum Float-Complex))
-
-;; In general, for real numbers, `magnitude' should have the same cases as `abs'
-
-(ann (magnitude (ann 0 Zero)) Zero)
-(ann (magnitude (ann 1 One)) One)
-(ann (magnitude (ann 6 Byte)) Byte)
-(ann (magnitude (ann 6 Index)) Index)
-
-(ann (magnitude (ann 6 Positive-Fixnum)) Positive-Fixnum)
-(ann (magnitude (ann 6 Nonnegative-Fixnum)) Nonnegative-Fixnum)
-(ann (magnitude (ann -6 Nonpositive-Fixnum)) Nonnegative-Integer)
-(ann (magnitude (ann -6 Negative-Fixnum)) Positive-Integer)
-(ann (magnitude (ann 6 Fixnum)) Integer)
-
-(ann (magnitude (ann 6 Positive-Integer)) Positive-Integer)
-(ann (magnitude (ann 6 Nonnegative-Integer)) Nonnegative-Integer)
-(ann (magnitude (ann -6 Nonpositive-Integer)) Nonnegative-Integer)
-(ann (magnitude (ann -6 Negative-Integer)) Positive-Integer)
-(ann (magnitude (ann 6 Integer)) Integer)
-
-(ann (magnitude (ann 0.0 Flonum-Zero)) Flonum-Zero)
-(ann (magnitude (ann 6.0 Positive-Flonum)) Positive-Flonum)
-(ann (magnitude (ann 6.0 Nonnegative-Flonum)) Nonnegative-Flonum)
-(ann (magnitude (ann -6.0 Nonpositive-Flonum)) Nonnegative-Flonum)
-(ann (magnitude (ann -6.0 Negative-Flonum)) Positive-Flonum)
-(ann (magnitude (ann 6.0 Flonum)) Flonum)
-
-;; In general, for real numbers, `real-part' should return the same type
-
-(ann (real-part (ann 0 Zero)) Zero)
-(ann (real-part (ann 1 One)) One)
-(ann (real-part (ann 6 Byte)) Byte)
-(ann (real-part (ann 6 Index)) Index)
-
-(ann (real-part (ann 6 Positive-Fixnum)) Positive-Fixnum)
-(ann (real-part (ann 6 Nonnegative-Fixnum)) Nonnegative-Fixnum)
-(ann (real-part (ann -6 Nonpositive-Fixnum)) Nonpositive-Fixnum)
-(ann (real-part (ann -6 Negative-Fixnum)) Negative-Fixnum)
-(ann (real-part (ann 6 Fixnum)) Fixnum)
-
-(ann (real-part (ann 6 Positive-Integer)) Positive-Integer)
-(ann (real-part (ann 6 Nonnegative-Integer)) Nonnegative-Integer)
-(ann (real-part (ann -6 Nonpositive-Integer)) Nonpositive-Integer)
-(ann (real-part (ann -6 Negative-Integer)) Negative-Integer)
-(ann (real-part (ann 6 Integer)) Integer)
-
-(ann (real-part (ann 0.0 Flonum-Zero)) Flonum-Zero)
-(ann (real-part (ann 6.0 Positive-Flonum)) Positive-Flonum)
-(ann (real-part (ann 6.0 Nonnegative-Flonum)) Nonnegative-Flonum)
-(ann (real-part (ann -6.0 Nonpositive-Flonum)) Nonpositive-Flonum)
-(ann (real-part (ann -6.0 Negative-Flonum)) Negative-Flonum)
-(ann (real-part (ann 6.0 Flonum)) Flonum)
-
-;; This one surprised me with the exactness of its return value, but it seems
-;; to be true:
-(ann (imag-part (ann 5.6 Real)) Zero)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13788.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13788.rkt
deleted file mode 100644
index fa17956aba..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13788.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-TR opt: pr13788.rkt 2:0 (vector-length (vector 1 2 3)) -- known-length vector-length
-END
-#<<END
-3
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(vector-length (vector 1 2 3)) ; should not print the vector
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr14284.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr14284.rkt
deleted file mode 100644
index f3bc8083bb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr14284.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#;#;
-#<<END
-TR info: pr14284.rkt 5:26 displayln -- hidden parameter
-TR opt: pr14284.rkt 3:13 0.0+2.0i -- unboxed literal
-TR opt: pr14284.rkt 3:6 (+ 1.0 0.0+2.0i) -- unboxed binary float complex
-TR opt: pr14284.rkt 3:9 1.0 -- float in complex ops
-TR opt: pr14284.rkt 4:27 x -- unboxed var -> table
-TR opt: pr14284.rkt 4:4 optimizable -- fun -> unboxed fun
-TR opt: pr14284.rkt 6:25 (+ x y) -- unboxed binary float complex
-TR opt: pr14284.rkt 6:28 x -- leave var unboxed
-TR opt: pr14284.rkt 6:30 y -- unbox float-complex
-TR opt: pr14284.rkt 7:15 3.0+3.0i -- unboxed literal
-TR opt: pr14284.rkt 7:2 (optimizable 3.0+3.0i "a" "b") -- call to fun with unboxed args
-TR opt: pr14284.rkt 7:2 (optimizable 3.0+3.0i "a" "b") -- unboxed call site
-END
-#<<END
-a
-4.0+5.0i
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(letrec:
-  ([y (+ 1.0 0.0+2.0i)]
-   [optimizable (lambda: ([x : Float-Complex] [a : String] [b : String])
-                         (displayln a)
-                         (+ x y))])
-  (optimizable 3.0+3.0i "a" "b"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr14380.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr14380.rkt
deleted file mode 100644
index 4674996d0f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr14380.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#;#;
-#<<END
-TR info: pr14380.rkt 11:15 foo -- struct constructor
-END
-#<<END
-#<procedure:unbox>
-#<procedure:magnitude>
-#<procedure:list-ref>
-#<procedure:+>
-#<procedure:car>
-#<procedure:string-length>
-#<procedure:foo-x>
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-;; Test for PR14380. None of these should get optimized.
-
-(begin0 unbox (box 3))
-(begin0 magnitude 3.0+5.0i)
-(begin0 list-ref '(a b c) 0)
-(begin0 + 3)
-(begin0 car '(a b))
-(begin0 string-length "foo")
-(struct foo ([x : String]))
-(begin0 foo-x (foo "foo"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/projections.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/projections.rkt
deleted file mode 100644
index 6921d6c260..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/projections.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#;#;
-#<<END
-TR opt: projections.rkt 10:0 (abs -0.0) -- unary float
-TR opt: projections.rkt 11:0 (magnitude -0.0) -- unary float
-TR opt: projections.rkt 2:0 (real-part 1) -- unary number
-TR opt: projections.rkt 3:0 (imag-part 2) -- unary number
-TR opt: projections.rkt 4:0 (abs 3) -- unary number
-TR opt: projections.rkt 5:0 (magnitude 4) -- unary number
-TR opt: projections.rkt 6:0 (angle 5) -- unary number
-TR opt: projections.rkt 7:0 (abs 0.0) -- unary number
-TR opt: projections.rkt 8:0 (magnitude 0.0) -- unary number
-TR opt: projections.rkt 9:0 (angle 0.0) -- unary number
-END
-#<<END
-1
-0
-3
-4
-0
-0.0
-0.0
-0
-0.0
-0.0
-3.141592653589793
-
-END
-
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(real-part 1)
-(imag-part 2)
-(abs 3)
-(magnitude 4)
-(angle 5)
-(abs 0.0)
-(magnitude 0.0)
-(angle 0.0)
-(abs -0.0)
-(magnitude -0.0)
-(angle -0.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/quote.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/quote.rkt
deleted file mode 100644
index 12ab5c627a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/quote.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-END
-#<<END
-'(+ 1.0 2.0)
-
-END
-
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-'(+ 1.0 2.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/rational-literal.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/rational-literal.rkt
deleted file mode 100644
index 9161612bc8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/rational-literal.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-TR opt: rational-literal.rkt 2:0 (+ 3/4 1.2) -- binary float
-END
-#<<END
-1.95
-
-END
-#lang typed/racket #:optimize
-#reader tests/typed-racket/optimizer/reset-port
-;; rational literals should be promoted to floats at compile time
-(+ 3/4 1.2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/real-part-loop.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/real-part-loop.rkt
deleted file mode 100644
index db36e06d54..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/real-part-loop.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#;#;
-#<<END
-TR opt: real-part-loop.rkt 3:1 (let loop ((v 0.0+1.0i)) (if (> (real-part v) 70000.2) 0 (loop (+ v 3.6)))) -- unboxed call site
-TR opt: real-part-loop.rkt 3:13 v -- unboxed var -> table
-TR opt: real-part-loop.rkt 3:15 0.0+1.0i -- unboxed literal
-TR opt: real-part-loop.rkt 3:6 loop -- fun -> unboxed fun
-TR opt: real-part-loop.rkt 3:6 loop -- unboxed let loop
-TR opt: real-part-loop.rkt 4:20 v -- leave var unboxed
-TR opt: real-part-loop.rkt 4:6 (> (real-part v) 70000.2) -- binary float comp
-TR opt: real-part-loop.rkt 4:9 (real-part v) -- complex accessor elimination
-TR opt: real-part-loop.rkt 6:12 (+ v 3.6) -- unboxed binary float complex
-TR opt: real-part-loop.rkt 6:15 v -- leave var unboxed
-TR opt: real-part-loop.rkt 6:17 3.6 -- float in complex ops
-TR opt: real-part-loop.rkt 6:6 (loop (+ v 3.6)) -- call to fun with unboxed args
-TR opt: real-part-loop.rkt 6:6 (loop (+ v 3.6)) -- unboxed call site
-END
-#<<END
-0
-
-END
-#lang typed/racket/base
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(ann
- (let loop ([v 0.0+1.0i])
-  (if (> (real-part v) 70000.2)
-      0
-      (loop (+ v 3.6))))
- Integer)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/silent-dead-branch.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/silent-dead-branch.rkt
deleted file mode 100644
index 8f01903b1e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/silent-dead-branch.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: silent-dead-branch.rkt 6:0 (when (number? "1") 1) -- dead then branch
-END
-""
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-;; then branch gets eliminated, which puts the test in a begin
-;; however, doing that at the toplevel causes the result of (number? "1")
-;; to be printed, which is bad.
-;; this was PR 11928
-(when (number? "1") 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-float.rkt
deleted file mode 100644
index 2159d067f1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-float.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: simple-float.rkt 2:0 (+ 2.0 3.0) -- binary float
-END
-#<<END
-5.0
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(+ 2.0 3.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-pair.rkt
deleted file mode 100644
index be02bd22d4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-pair.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: simple-pair.rkt 2:0 (car (cons 1 2)) -- pair
-END
-#<<END
-1
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(car (cons 1 2))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt-segfault.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt-segfault.rkt
deleted file mode 100644
index 55ddcf43b2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt-segfault.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#;#;
-#<<END
-TR missed opt: sqrt-segfault.rkt 10:31 (sqrt dist2) -- unexpected complex type
-TR opt: sqrt-segfault.rkt 8:14 (- 0.0 0.0) -- binary float
-TR opt: sqrt-segfault.rkt 9:14 (* dx dx) -- binary float
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-;; from the nbody-generic benchmark.
-;; the result of sqrt was an Float-Complex, so float complex opts kicked
-;; in but they resulted in segfaulting code.
-;; the problem was that having Float be a subtype of Float-Complex was wrong
-;; since you can't do unsafe-flreal-part of a float
-
-(let* ([dx    (- 0.0 0.0)]
-       [dist2 (* dx dx)]
-       [mag   (assert (* dist2 (sqrt dist2)) flonum?)])
-  (void))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt.rkt
deleted file mode 100644
index 402ce76097..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-TR opt: sqrt.rkt 4:2 (sqrt x) -- unary float
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(: f (Nonnegative-Float -> Nonnegative-Float))
-(define (f x)
-  (sqrt x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/string-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/string-length.rkt
deleted file mode 100644
index cb3cc5ba7f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/string-length.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;#;
-#<<END
-TR opt: string-length.rkt 2:0 (string-length "eh") -- string-length
-TR opt: string-length.rkt 3:0 (bytes-length #"eh") -- bytes-length
-END
-#<<END
-2
-2
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(string-length "eh")
-(bytes-length #"eh")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/structs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/structs.rkt
deleted file mode 100644
index d689ca7ea2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/structs.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR info: structs.rkt 2:11 pt -- struct constructor
-TR opt: structs.rkt 3:0 (pt-x a) -- struct ref
-TR opt: structs.rkt 4:0 (set-pt-y! a 5) -- struct set
-END
-#<<END
-3
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-(define-struct: pt ((x : Integer) (y : Integer)) #:mutable)
-(define a (pt 3 4))
-(pt-x a)
-(set-pt-y! a 5)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/ternary-equality.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/ternary-equality.rkt
deleted file mode 100644
index e251d86b46..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/ternary-equality.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;#;
-#<<END
-TR opt: ternary-equality.rkt 4:0 (= 1 1 1) -- multi fixnum comp
-END
-#<<END
-#t
-
-END
-#lang typed/racket/base
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-;; PR 12479
-;; was incorrectly optimized in the same way as fixnum bitwise-and and co
-(= 1 1 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum-nested.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum-nested.rkt
deleted file mode 100644
index cffde5db7c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum-nested.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#;#;
-#<<END
-TR opt: unary-fixnum-nested.rkt 2:0 (bitwise-not (bitwise-not (length (quote (1 2 3))))) -- unary fixnum
-TR opt: unary-fixnum-nested.rkt 2:13 (bitwise-not (length (quote (1 2 3)))) -- unary fixnum
-TR opt: unary-fixnum-nested.rkt 2:26 (length (quote (1 2 3))) -- known-length list length
-END
-#<<END
-3
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(bitwise-not (bitwise-not (length '(1 2 3))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum.rkt
deleted file mode 100644
index f68af668c4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;#;
-#<<END
-TR opt: unary-fixnum.rkt 2:0 (bitwise-not 4) -- unary fixnum
-TR opt: unary-fixnum.rkt 3:0 (- (ann 2 Nonnegative-Fixnum)) -- unary fixnum
-END
-#<<END
--5
--2
-2
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(bitwise-not 4)
-(- (ann 2 Nonnegative-Fixnum))
-(- (ann -2 Negative-Fixnum)) ; can't optimize negatives
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-float.rkt
deleted file mode 100644
index 343c2f734b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-float.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: unary-float.rkt 2:0 (sin 2.0) -- unary float
-END
-#<<END
-0.9092974268256817
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(sin 2.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-minus-float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-minus-float-complex.rkt
deleted file mode 100644
index 0d24c7a1c9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-minus-float-complex.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#;#;
-#<<END
-TR opt: unary-minus-float-complex.rkt 1:0 (imag-part (- 0.0+0.0i)) -- complex accessor elimination
-TR opt: unary-minus-float-complex.rkt 1:11 (- 0.0+0.0i) -- unboxed unary float complex
-TR opt: unary-minus-float-complex.rkt 1:14 0.0+0.0i -- unboxed literal
-TR opt: unary-minus-float-complex.rkt 1:14 0.0+0.0i -- unboxed literal
-END
-#<<END
--0.0
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-(imag-part (- 0.0+0.0i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-exp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-exp.rkt
deleted file mode 100644
index c599ff078b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-exp.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-exp.rkt 10:25 (exp 12.2-4.7i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 10:30 12.2-4.7i -- unboxed literal
-TR opt: unboxed-exp.rkt 11:25 (exp -12.2+4.7i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 11:30 -12.2+4.7i -- unboxed literal
-TR opt: unboxed-exp.rkt 4:39 (real-part p) -- complex accessor elimination
-TR opt: unboxed-exp.rkt 4:50 p -- unbox float-complex
-TR opt: unboxed-exp.rkt 5:39 (imag-part p) -- complex accessor elimination
-TR opt: unboxed-exp.rkt 5:50 p -- unbox float-complex
-TR opt: unboxed-exp.rkt 7:25 (exp 2.0+3.4i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 7:30 2.0+3.4i -- unboxed literal
-TR opt: unboxed-exp.rkt 8:25 (exp 0.0+0.0i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 8:30 0.0+0.0i -- unboxed literal
-TR opt: unboxed-exp.rkt 9:25 (exp -12.2-4.7i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 9:30 -12.2-4.7i -- unboxed literal
-END
-#<<END
-"-7.14373-1.88821"
-"1.000000.00000"
-"-0.000000.00001"
-"-2462.73189198773.89558"
-"-0.00000-0.00001"
-
-END
-#lang typed/racket
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(: complex->decimal-string (Float-Complex -> String))
-(define (complex->decimal-string p)
-  (string-append (real->decimal-string (real-part p) 5)
-                 (real->decimal-string (imag-part p) 5)))
-
-(complex->decimal-string (exp 2.0+3.4i))
-(complex->decimal-string (exp 0.0+0.0i))
-(complex->decimal-string (exp -12.2-4.7i))
-(complex->decimal-string (exp 12.2-4.7i))
-(complex->decimal-string (exp -12.2+4.7i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-for.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-for.rkt
deleted file mode 100644
index 8200c6fe87..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-for.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-for.rkt 2:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- call to fun with unboxed args
-TR opt: unboxed-for.rkt 2:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- fun -> unboxed fun
-TR opt: unboxed-for.rkt 2:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site
-TR opt: unboxed-for.rkt 2:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site
-TR opt: unboxed-for.rkt 2:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
-TR opt: unboxed-for.rkt 2:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
-TR opt: unboxed-for.rkt 2:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let loop
-TR opt: unboxed-for.rkt 2:31 sum -- leave var unboxed
-TR opt: unboxed-for.rkt 2:31 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 2:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 2:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 2:31 sum -- unboxed var -> table
-TR opt: unboxed-for.rkt 2:53 0.0+0.0i -- unboxed literal
-TR opt: unboxed-for.rkt 3:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 3:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 3:33 (quote (1.0+2.0i 2.0+4.0i)) -- in-list
-TR opt: unboxed-for.rkt 3:33 (quote (1.0+2.0i 2.0+4.0i)) -- unbox float-complex
-TR opt: unboxed-for.rkt 4:11 sum -- leave var unboxed
-TR opt: unboxed-for.rkt 4:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 4:9 i -- leave var unboxed
-END
-#<<END
-3.0+6.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(for/fold: : Float-Complex   ((sum : Float-Complex   0.0+0.0i))
-           ((i : Float-Complex   '(1.0+2.0i 2.0+4.0i)))
-      (+ i sum))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-constants-fail1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-constants-fail1.rkt
deleted file mode 100644
index 1561ccffb0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-constants-fail1.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#;#;
-#<<END
-TR info: unboxed-let-constants-fail1.rkt 4:22 displayln -- hidden parameter
-TR opt: unboxed-let-constants-fail1.rkt 3:16 ((x) 5.0+5.0i) -- unboxed let bindings
-TR opt: unboxed-let-constants-fail1.rkt 3:21 5.0+5.0i -- unboxed literal
-TR opt: unboxed-let-constants-fail1.rkt 4:40 x -- unboxed complex variable
-TR opt: unboxed-let-constants-fail1.rkt 5:16 ((z) x) -- unboxed let bindings
-TR opt: unboxed-let-constants-fail1.rkt 5:21 x -- leave var unboxed
-TR opt: unboxed-let-constants-fail1.rkt 6:13 (+ x z) -- unboxed binary float complex
-TR opt: unboxed-let-constants-fail1.rkt 6:16 x -- leave var unboxed
-TR opt: unboxed-let-constants-fail1.rkt 6:18 z -- leave var unboxed
-TR opt: unboxed-let-constants-fail1.rkt 6:2 (real-part (+ x z)) -- complex accessor elimination
-END
-#<<END
-#f
-10.0
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-
-(letrec-values (((x) 5.0+5.0i)
-                ((_) (displayln (exact? x)))
-                ((z) x))
-  (real-part (+ x z)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-constants.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-constants.rkt
deleted file mode 100644
index 9ef6478299..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-constants.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let-constants.rkt 3:16 ((x) 5.0+5.0i) -- unboxed let bindings
-TR opt: unboxed-let-constants.rkt 3:21 5.0+5.0i -- unboxed literal
-TR opt: unboxed-let-constants.rkt 4:16 ((z) x) -- unboxed let bindings
-TR opt: unboxed-let-constants.rkt 4:21 x -- leave var unboxed
-TR opt: unboxed-let-constants.rkt 5:13 (+ x z) -- unboxed binary float complex
-TR opt: unboxed-let-constants.rkt 5:16 x -- leave var unboxed
-TR opt: unboxed-let-constants.rkt 5:18 z -- leave var unboxed
-TR opt: unboxed-let-constants.rkt 5:2 (real-part (+ x z)) -- complex accessor elimination
-END
-#<<END
-10.0
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-
-(letrec-values (((x) 5.0+5.0i)
-                ((z) x))
-  (real-part (+ x z)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions1.rkt
deleted file mode 100644
index e7cd4e22f3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions1.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let-functions1.rkt 3:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions1.rkt 3:42 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 3:45 x -- leave var unboxed
-TR opt: unboxed-let-functions1.rkt 3:47 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 3:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions1.rkt 4:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 4:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions1.rkt 4:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
-TR opt: unboxed-let-functions1.rkt 4:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 4:8 1.0+2.0i -- unboxed literal
-END
-#<<END
-6.0+12.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-;; simple case, function with single complex arg
-(let ((f (lambda: ((x :   Float-Complex)) (+ x 3.0+6.0i))))
-  (f (+ 1.0+2.0i 2.0+4.0i)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions2.rkt
deleted file mode 100644
index 841a59c451..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions2.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let-functions2.rkt 3:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions2.rkt 3:42 y -- unboxed var -> table
-TR opt: unboxed-let-functions2.rkt 3:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions2.rkt 4:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 4:21 x -- leave var unboxed
-TR opt: unboxed-let-functions2.rkt 4:23 y -- leave var unboxed
-TR opt: unboxed-let-functions2.rkt 5:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 5:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- call to fun with unboxed args
-TR opt: unboxed-let-functions2.rkt 5:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- unboxed call site
-TR opt: unboxed-let-functions2.rkt 5:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 5:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 6:5 3.0+6.0i -- unboxed literal
-END
-#<<END
-6.0+12.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-;; function with multiple complex args
-(let ((f (lambda: ((x :   Float-Complex) (y : Float-Complex))
-                  (+ x y))))
-  (f (+ 1.0+2.0i 2.0+4.0i)
-     3.0+6.0i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions3.rkt
deleted file mode 100644
index 878a690b3c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions3.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let-functions3.rkt 3:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions3.rkt 3:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions3.rkt 4:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 4:21 x -- leave var unboxed
-TR opt: unboxed-let-functions3.rkt 4:23 y -- float in complex ops
-TR opt: unboxed-let-functions3.rkt 5:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions3.rkt 5:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- call to fun with unboxed args
-TR opt: unboxed-let-functions3.rkt 5:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- unboxed call site
-TR opt: unboxed-let-functions3.rkt 5:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 5:8 1.0+2.0i -- unboxed literal
-END
-#<<END
-6.0+6.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-;; function with a mix of complex and non-complex args
-(let ((f (lambda: ((x : Float-Complex) (y : Float))
-                  (+ x y))))
-  (f (+ 1.0+2.0i 2.0+4.0i)
-     3.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions4.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions4.rkt
deleted file mode 100644
index 71540e9b53..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions4.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let-functions4.rkt 3:32 x -- unboxed var -> table
-TR opt: unboxed-let-functions4.rkt 3:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions4.rkt 4:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 4:21 x -- leave var unboxed
-TR opt: unboxed-let-functions4.rkt 4:23 y -- float in complex ops
-TR opt: unboxed-let-functions4.rkt 5:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions4.rkt 5:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
-TR opt: unboxed-let-functions4.rkt 6:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions4.rkt 6:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 6:8 1.0+2.0i -- unboxed literal
-END
-#<<END
-6.0+6.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-;; function with a mix of complex and non-complex args, non-complex first
-(let ((f (lambda: ((y : Float) (x : Float-Complex))
-                  (+ x y))))
-  (f 3.0
-     (+ 1.0+2.0i 2.0+4.0i)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions5.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions5.rkt
deleted file mode 100644
index 541ee2bd07..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions5.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let-functions5.rkt 9:12 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions5.rkt 9:15 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions5.rkt 9:24 2.0+4.0i -- unboxed literal
-END
-#<<END
-3.0+6.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-
-
-;; invalid: f "escapes", according to our analysis
-(letrec: ((f : (Float-Complex -> Float-Complex)
-             (lambda: ((x : Float-Complex))
-                      (let: ((y : (Float-Complex -> Float-Complex) f))
-                            x))))
-         (f (+ 1.0+2.0i 2.0+4.0i)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions6.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions6.rkt
deleted file mode 100644
index d7234c348a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions6.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let-functions6.rkt 2:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) (+ z 0.0+1.0i) (loop (+ z (car l)) (cdr l)))) -- unboxed call site
-TR opt: unboxed-let-functions6.rkt 2:31 z -- unboxed var -> table
-TR opt: unboxed-let-functions6.rkt 2:51 0.0+0.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 2:6 loop -- fun -> unboxed fun
-TR opt: unboxed-let-functions6.rkt 2:6 loop -- unboxed let loop
-TR opt: unboxed-let-functions6.rkt 5:10 (+ z 0.0+1.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 5:13 z -- leave var unboxed
-TR opt: unboxed-let-functions6.rkt 5:15 0.0+1.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 6:10 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions6.rkt 6:10 (loop (+ z (car l)) (cdr l)) -- unboxed call site
-TR opt: unboxed-let-functions6.rkt 6:16 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 6:19 z -- leave var unboxed
-TR opt: unboxed-let-functions6.rkt 6:21 (car l) -- non float complex in complex ops
-TR opt: unboxed-let-functions6.rkt 6:21 (car l) -- pair
-TR opt: unboxed-let-functions6.rkt 7:16 (cdr l) -- pair
-END
-#<<END
-6.0+1.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(let: loop :   Float-Complex ((z : Float-Complex   0.0+0.0i)
-                              (l : (Listof Integer) '(1 2 3)))
-      (if (null? l)
-          (+ z 0.0+1.0i)
-          (loop (+ z (car l))
-                (cdr l))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions7.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions7.rkt
deleted file mode 100644
index 8953a41913..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions7.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let-functions7.rkt 3:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) z (loop (+ z (car l)) (cdr l)))) -- unboxed call site
-TR opt: unboxed-let-functions7.rkt 3:31 z -- unboxed var -> table
-TR opt: unboxed-let-functions7.rkt 3:51 0.0+0.0i -- unboxed literal
-TR opt: unboxed-let-functions7.rkt 3:6 loop -- fun -> unboxed fun
-TR opt: unboxed-let-functions7.rkt 3:6 loop -- unboxed let loop
-TR opt: unboxed-let-functions7.rkt 6:6 z -- unboxed complex variable
-TR opt: unboxed-let-functions7.rkt 7:12 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions7.rkt 7:15 z -- leave var unboxed
-TR opt: unboxed-let-functions7.rkt 7:17 (car l) -- non float complex in complex ops
-TR opt: unboxed-let-functions7.rkt 7:17 (car l) -- pair
-TR opt: unboxed-let-functions7.rkt 7:6 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions7.rkt 7:6 (loop (+ z (car l)) (cdr l)) -- unboxed call site
-TR opt: unboxed-let-functions7.rkt 8:12 (cdr l) -- pair
-END
-#<<END
-6.0+0.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-
-(let: loop : Float-Complex   ((z : Float-Complex   0.0+0.0i)
-                              (l : (Listof Integer) '(1 2 3)))
-  (if (null? l)
-      z ; boxed use. z should be unboxed anyway
-      (loop (+ z (car l))
-            (cdr l))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions8.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions8.rkt
deleted file mode 100644
index 747e47955b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions8.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let-functions8.rkt 2:64 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions8.rkt 2:67 x -- unbox float-complex
-TR opt: unboxed-let-functions8.rkt 2:69 2.0+4.0i -- unboxed literal
-END
-#<<END
-3.0+6.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(letrec: ((f : (Float-Complex -> Float-Complex)     (lambda (x) (+ x 2.0+4.0i)))
-          (g : (Float-Complex -> Float-Complex)     f)) ; f escapes! can't unbox its args
-  (f 1.0+2.0i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let.rkt
deleted file mode 100644
index 9c95466c09..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let.rkt 2:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 2:14 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let.rkt 2:23 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let.rkt 2:7 (t1 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-let.rkt 3:11 (- t1 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 3:14 t1 -- leave var unboxed
-TR opt: unboxed-let.rkt 3:17 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let.rkt 3:7 (t2 (- t1 3.0+6.0i)) -- unboxed let bindings
-TR opt: unboxed-let.rkt 4:11 4.0+8.0i -- unboxed literal
-TR opt: unboxed-let.rkt 4:7 (t3 4.0+8.0i) -- unboxed let bindings
-TR opt: unboxed-let.rkt 5:2 (+ t2 t3) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 5:5 t2 -- leave var unboxed
-TR opt: unboxed-let.rkt 5:8 t3 -- leave var unboxed
-END
-#<<END
-4.0+8.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(let* ((t1 (+ 1.0+2.0i 2.0+4.0i))
-       (t2 (- t1 3.0+6.0i))
-       (t3 4.0+8.0i))
-  (+ t2 t3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let2.rkt
deleted file mode 100644
index 5fa89f3baf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let2.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let2.rkt 2:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 2:13 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 2:22 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 2:6 (t1 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-let2.rkt 3:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 3:13 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 3:22 4.0+8.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 3:6 (t2 (+ 3.0+6.0i 4.0+8.0i)) -- unboxed let bindings
-TR opt: unboxed-let2.rkt 4:2 (+ t1 t2) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 4:5 t1 -- leave var unboxed
-TR opt: unboxed-let2.rkt 4:8 t2 -- leave var unboxed
-END
-#<<END
-10.0+20.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(let ((t1 (+ 1.0+2.0i 2.0+4.0i))
-      (t2 (+ 3.0+6.0i 4.0+8.0i)))
-  (+ t1 t2))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let3.rkt
deleted file mode 100644
index 72628bc009..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let3.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-let3.rkt 11:6 x -- unboxed complex variable
-TR opt: unboxed-let3.rkt 12:11 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 12:6 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let3.rkt 12:9 x -- leave var unboxed
-TR opt: unboxed-let3.rkt 9:12 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 9:21 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 9:6 (x (+ 1.0+2.0i 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-let3.rkt 9:9 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-END
-#<<END
-3.0+6.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-;; both boxed and unboxed uses, we unbox anyway
-;; causes unnecessary boxing/unboxing if we take a boxed path when
-;; unboxing a complex literal or variable, but I expect this case
-;; to be uncommon
-;; by comparison, cases where we leave a result unboxed and box it
-;; if needed (like here) or cases where this would unbox loop variables
-;; are likely to be more common, and more interesting
-(let ((x (+ 1.0+2.0i 2.0+4.0i)))
-  (if (even? 2)
-      x
-      (+ x 2.0+4.0i)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec-syntaxes+values.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec-syntaxes+values.rkt
deleted file mode 100644
index 3ba5378c74..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec-syntaxes+values.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-letrec-syntaxes+values.rkt 3:25 ((x) (+ 1.0+2.0i 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-letrec-syntaxes+values.rkt 3:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 3:33 1.0+2.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 3:42 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 4:24 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 4:27 x -- leave var unboxed
-TR opt: unboxed-letrec-syntaxes+values.rkt 4:29 2.0+4.0i -- unboxed literal
-END
-#<<END
-5.0+10.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(letrec-syntaxes+values (((s) (syntax-rules () [(_ x) x])))
-                        (((x) (+ 1.0+2.0i 2.0+4.0i)))
-                        (+ x 2.0+4.0i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec.rkt
deleted file mode 100644
index 3046ceb0e3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-letrec.rkt 5:10 (x : Float-Complex 1.0+2.0i) -- unboxed let bindings
-TR opt: unboxed-letrec.rkt 5:31 1.0+2.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 6:10 (y : Float-Complex (+ 2.0+4.0i 3.0+6.0i)) -- unboxed let bindings
-TR opt: unboxed-letrec.rkt 6:31 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 6:34 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 6:43 3.0+6.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 7:2 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 7:5 x -- leave var unboxed
-TR opt: unboxed-letrec.rkt 7:7 y -- leave var unboxed
-END
-#<<END
-6.0+12.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-
-
-(letrec: ((f : (Any -> Any) (lambda: ((x : Any)) (f x)))
-          (x : Float-Complex   1.0+2.0i)
-          (y : Float-Complex   (+ 2.0+4.0i 3.0+6.0i)))
-  (+ x y))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-make-rectangular.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-make-rectangular.rkt
deleted file mode 100644
index f3deda5f17..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-make-rectangular.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#;#;
-#<<END
-TR opt: unboxed-make-rectangular.rkt 5:6 (x (make-rectangular 1.0 2.0)) -- unboxed let bindings
-TR opt: unboxed-make-rectangular.rkt 5:9 (make-rectangular 1.0 2.0) -- make-rectangular elimination
-TR opt: unboxed-make-rectangular.rkt 6:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-make-rectangular.rkt 6:5 x -- leave var unboxed
-TR opt: unboxed-make-rectangular.rkt 6:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 7:6 (x (unsafe-make-flrectangular 1.0 2.0)) -- unboxed let bindings
-TR opt: unboxed-make-rectangular.rkt 7:9 (unsafe-make-flrectangular 1.0 2.0) -- make-rectangular elimination
-TR opt: unboxed-make-rectangular.rkt 8:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-make-rectangular.rkt 8:5 x -- leave var unboxed
-TR opt: unboxed-make-rectangular.rkt 8:7 2.0+4.0i -- unboxed literal
-END
-#<<END
-3.0+6.0i
-3.0+6.0i
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-
-(require racket/unsafe/ops)
-
-(let ((x (make-rectangular 1.0 2.0)))
-  (+ x 2.0+4.0i))
-(let ((x (unsafe-make-flrectangular 1.0 2.0)))
-  (+ x 2.0+4.0i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-bounds-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-bounds-check.rkt
deleted file mode 100644
index dc529efe19..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-bounds-check.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#;#;
-#<<END
-TR opt: vector-bounds-check.rkt 15:0 (vector-ref (make-my-vector) 0) -- vector partial bounds checking elimination
-TR opt: vector-bounds-check.rkt 16:0 (flvector-ref (make-my-flvector) (ann 0 Fixnum)) -- flvector partial bounds checking elimination
-END
-#<<END
-1.0
-1.0
-
-END
-#lang typed/racket
-(require racket/flonum)
-#reader tests/typed-racket/optimizer/reset-port
-
-(define: been-there-vector?   : Boolean #f)
-(define: been-there-flvector? : Boolean #f)
-(define (make-my-vector)
-  (if been-there-vector?
-      (error "make-my-vector should only be called once!")
-      (set! been-there-vector? #t))
-  (ann (vector 1.0 2.0 3.0) (Vectorof Flonum)))
-(define (make-my-flvector)
-  (if been-there-flvector?
-      (error "make-my-flvector should only be called once!")
-      (set! been-there-flvector? #t))
-  (flvector 1.0 2.0 3.0))
-
-(vector-ref (make-my-vector) 0)
-(flvector-ref (make-my-flvector) (ann 0 Fixnum))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt
deleted file mode 100644
index 68ad998e35..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#;#;
-#<<END
-END
-""
-#lang racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(define v (vector 'b 'a))
-(provide v) 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt
deleted file mode 100644
index 926533f3f9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR opt: vector-chaperone2.rkt 6:10 (vector-ref v i) -- vector partial bounds checking elimination
-END
-#<<END
-'b
-
-END
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-(require/typed "vector-chaperone1.rkt"
-               (v (Vectorof Symbol)))
-(: i Fixnum)
-(define i 0)
-(: x Symbol)
-(define x (vector-ref v i))
-x
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-impersonator.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-impersonator.rkt
deleted file mode 100644
index 51dd036598..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-impersonator.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#;#;
-#<<END
-END
-#<<END
-passed
-
-END
-
-#lang typed/racket
-
-(: x (Vectorof Number))
-(define x (make-vector 0 0))
-(: y (Vectorof Float))
-(define z (cast x '#()))
-(define y (cast z (Vectorof Float)))
-
-;; should error
-(with-handlers ([exn:fail:contract?
-                 (lambda: ([e : exn])
-                   (when (regexp-match "index is out of range for empty vector"
-                                       (exn-message e))
-                     (display "passed\n")))])
-  (vector-set! y 1 3.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-nested.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-nested.rkt
deleted file mode 100644
index fc995ff206..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-nested.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#;#;
-#<<END
-TR opt: vector-length-nested.rkt 2:0 (vector-length (vector-ref (ann (vector (vector 1 2) 2 3) (Vector (Vectorof Integer) Integer Integer)) 0)) -- vector-length
-TR opt: vector-length-nested.rkt 3:1 (vector-ref (ann (vector (vector 1 2) 2 3) (Vector (Vectorof Integer) Integer Integer)) 0) -- vector
-END
-#<<END
-2
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(vector-length
- (vector-ref
-  (ann (vector (vector 1 2) 2 3)
-       (Vector (Vectorof Integer) Integer Integer))
-  0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length.rkt
deleted file mode 100644
index 39219faab1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#;#;
-#<<END
-TR opt: vector-length.rkt 2:0 (vector-length (vector 1 2 3)) -- known-length vector-length
-TR opt: vector-length.rkt 3:0 (vector-length (ann (vector 4 5 6) (Vectorof Integer))) -- vector-length
-END
-#<<END
-3
-3
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(vector-length (vector 1 2 3))
-(vector-length (ann (vector 4 5 6) (Vectorof Integer)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref-set-ref.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref-set-ref.rkt
deleted file mode 100644
index 4d5a78bc31..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref-set-ref.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#;#;
-#<<END
-TR opt: vector-ref-set-ref.rkt 4:0 (vector-ref x 0) -- vector
-TR opt: vector-ref-set-ref.rkt 5:0 (vector-set! x 1 "2") -- vector
-TR opt: vector-ref-set-ref.rkt 6:0 (vector-ref x 1) -- vector
-END
-#<<END
-1
-"2"
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(: x (Vector Integer String))
-(define x (vector 1 "1"))
-(vector-ref x 0)
-(vector-set! x 1 "2")
-(vector-ref x 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref.rkt
deleted file mode 100644
index c6f3b65c61..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: vector-ref.rkt 2:0 (vector-ref (ann (vector 1 2) (Vector Integer Integer)) 0) -- vector
-END
-#<<END
-1
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(vector-ref (ann (vector 1 2) (Vector Integer Integer)) 0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref2.rkt
deleted file mode 100644
index 1e0f4ae37e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref2.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#;#;
-#<<END
-TR opt: vector-ref2.rkt 2:0 (vector-ref (vector 1 2 3) 0) -- vector
-END
-#<<END
-1
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(vector-ref (vector 1 2 3) 0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set-quote.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set-quote.rkt
deleted file mode 100644
index 6cf34ff857..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set-quote.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-TR opt: vector-set-quote.rkt 2:0 (vector-set! (ann (vector (quote (1 2))) (Vector Any)) 0 (quote (+ 1.0 2.0))) -- vector
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(vector-set! (ann (vector '(1 2)) (Vector Any))
-             0
-             '(+ 1.0 2.0)) ; we should not optimize under quote
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set.rkt
deleted file mode 100644
index b40159db1d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#;#;
-#<<END
-TR opt: vector-set.rkt 2:0 (vector-set! (ann (vector 1 2) (Vector Integer Integer)) 0 1) -- vector
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(vector-set! (ann (vector 1 2) (Vector Integer Integer))
-             0
-             1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set2.rkt
deleted file mode 100644
index 130ee31179..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set2.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#;#;
-#<<END
-TR opt: vector-set2.rkt 2:0 (vector-set! (vector 1 2) 0 2) -- vector
-END
-""
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(vector-set! (vector 1 2) 0 2) ; type is (Vectorof Integer), length is ot known, can't optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt
deleted file mode 100644
index 6921a2aa15..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#;#;
-#<<END
-TR opt: vector-sum.rkt 10:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 10:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 10:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 10:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 10:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 10:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 10:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 11:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 11:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 11:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 12:15 sum -- dead else branch
-TR opt: vector-sum.rkt 12:15 sum -- dead else branch
-TR opt: vector-sum.rkt 12:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
-TR opt: vector-sum.rkt 12:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- dead else branch
-TR opt: vector-sum.rkt 12:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- dead else branch
-TR opt: vector-sum.rkt 12:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- dead else branch
-TR opt: vector-sum.rkt 12:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 14:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 14:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 9:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 9:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 9:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 9:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 9:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-END
-""
-#lang typed/racket
-#reader tests/typed-racket/optimizer/reset-port
-
-;; micro-benchmark to measure the effectiveness of partial bounds checking
-;; elimination
-
-(define: l : Index 10000000)
-
-(define: v : (Vectorof Float) (make-vector l 0.0))
-
-(for ([i (in-range 1)])
-  (for: ([i : Nonnegative-Fixnum (in-range l)])
-    (vector-set! v i (sin (exact->inexact i))))
-  (for/fold: ([sum : Float 0.0])
-      ([i : Nonnegative-Fixnum (in-range l)])
-    (+ sum (vector-ref v i))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/with-type.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/with-type.rkt
deleted file mode 100644
index 7baffb2961..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/with-type.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#;#;
-#<<END
-TR opt: with-type.rkt 6:18 (#%app + x val) -- binary float
-END
-#<<END
-34.6
-
-END
-#lang racket
-#reader tests/typed-racket/optimizer/reset-port
-
-(require typed/racket)
-
-(with-type ([fun (Float -> Float)]
-            [val Float])
-  (define (fun x) (+ x val))
-  (define val 17.3))
-
-(fun val)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/zero.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/zero.rkt
deleted file mode 100644
index 1bc6767325..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/zero.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#;#;
-#<<END
-TR opt: zero.rkt 2:0 (zero? 1) -- fixnum zero?
-TR opt: zero.rkt 3:0 (zero? (sqrt 3.0)) -- float zero?
-TR opt: zero.rkt 3:7 (sqrt 3.0) -- unary float
-END
-#<<END
-#f
-#f
-
-END
-#lang typed/scheme
-#:optimize
-#reader tests/typed-racket/optimizer/reset-port
-
-(zero? 1)
-(zero? (sqrt 3.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt
deleted file mode 100644
index 4f41e41786..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket
-
-(require "run.rkt" "../send-places.rkt")
-
-(module test racket/base
-  (displayln "run as program for tests"))
-
-;; Assuming that only the log format changed, update test files to the
-;; new format.
-;; Running this after changes to the behavior of the optimizer is a
-;; BAD idea, since in the case of regressions, the new broken behavior
-;; would become the expected behavior.
-;; Use this script with caution.
-
-(define (transform file dir)
-  (define (write-stringln s)
-    (write-string s)
-    (newline))
-  ;; generate the new log, that will become the expected log
-  (define-values (new-tr-log new-output) (generate-log file dir))
-  (define source-code
-    (call-with-input-file* (build-path dir file)
-      (lambda (in)
-        (read-line in) ; drop the #;#;
-        (read in) ; drop the old expected tr log
-        (read in) ; drop the old expected output
-        (port->string in))))
-  (with-output-to-file (build-path dir file) #:exists 'truncate
-    (lambda ()
-      (write-stringln "#;#;")
-      (write-stringln "#<<END")
-      (for ((entry new-tr-log))
-        (write-stringln entry))
-      (write-stringln "END")
-      (if (regexp-match "\n" new-output)
-          (begin
-            (write-stringln "#<<END")
-            (write-stringln new-output)
-            (write-string "END"))
-          (begin
-            (write new-output)))
-          (write-string source-code))))
-
-;; proc returns the list of tests to be run on each file
-(define (transform-dirs dirs)
-  (define results
-    (for*/list ([dir (in-list dirs)]
-                [name (directory-list dir)]
-                #:when (test-file? name))
-      (delay/thread (transform name dir))))
-  (for-each force results))
-
-(start-workers)
-(cond [(= (vector-length (current-command-line-arguments)) 0)
-       (transform-dirs (list tests-dir missed-optimizations-dir))]
-      [else ; set of paths to transform (only works if run from the optimizer tests dir)
-       (define results
-         (for/list ([f (in-vector (current-command-line-arguments))])
-           (define-values (dir-path file-name _) (split-path f))
-           (define dir (path->string dir-path))
-           (delay/thread
-             (transform
-               file-name
-               (cond [(equal? dir "tests/")
-                      tests-dir]
-                     [(equal? dir "missed-optimizations/")
-                      missed-optimizations-dir])))))
-       (for-each force results)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/performance/infer-timing.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/performance/infer-timing.rkt
deleted file mode 100644
index 0cf94cc5ad..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/performance/infer-timing.rkt
+++ /dev/null
@@ -1,423 +0,0 @@
-#lang racket
-
-(require typed-racket/infer/infer
-         typed-racket/types/union
-         typed-racket/types/filter-ops
-         typed-racket/types/abbrev
-         typed-racket/rep/type-rep
-         typed-racket/types/numeric-tower
-         typed-racket/types/base-abbrev
-         typed-racket/types/subtype
-         typed-racket/base-env/base-env-numeric
-         (only-in (combine-in typed-racket/types/numeric-tower
-                              typed-racket/types/abbrev)
-                  [-Number N] [-Boolean B] [-Symbol Sym] [-Real R] [-PosInt -Pos]))
-
-
-
-(define (negation-pattern pos neg non-neg non-pos)
-    (list (-> pos neg)
-          (-> non-neg non-pos)
-          (-> neg pos)
-          (-> non-pos non-neg)
-          (-> -Zero pos neg)
-          (-> -Zero non-neg non-pos)
-          (-> -Zero neg pos)
-          (-> -Zero non-pos non-neg)))
-
-  ;; Used because (- min-fixnum) > max-fixnum
-  (define (half-negation-pattern pos neg non-neg non-pos)
-    (list (-> pos neg)
-          (-> non-neg non-pos)
-          (-> -Zero pos neg)
-          (-> -Zero non-neg non-pos)))
-
-(define all-int-types
-    (list -Zero -One -PosByte -Byte -PosIndex -Index
-          -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum -Fixnum
-          -PosInt -Nat -NegInt -NonPosInt -Int))
-  (define rat-types (list -PosRat -NonNegRat -NegRat -NonPosRat -Rat))
-
-  (define all-rat-types (append all-int-types rat-types))
-  (define all-flonum-types
-    (list -FlonumPosZero -FlonumNegZero -FlonumZero -FlonumNan
-          -PosFlonum -NonNegFlonum -NegFlonum -NonPosFlonum -Flonum))
-  (define single-flonum-types
-    (list -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero -SingleFlonumNan
-          -PosSingleFlonum -NonNegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum -SingleFlonum))
-  (define inexact-real-types
-    (list -InexactRealPosZero -InexactRealNegZero -InexactRealZero -InexactRealNan
-          -PosInexactReal -NonNegInexactReal -NegInexactReal -NonPosInexactReal -InexactReal))
-  (define all-float-types (append all-flonum-types single-flonum-types inexact-real-types))
-  (define real-types (list -RealZero -PosReal -NonNegReal -NegReal -NonPosReal -Real))
-  (define all-real-types (append all-rat-types all-float-types real-types))
-  (define number-types
-    (list -ExactNumber -FloatComplex -SingleFlonumComplex -InexactComplex -Number))
-  (define all-number-types (append all-real-types number-types))
-
-
-  ;; convenient to build large case-lambda types
-  (define (from-cases . cases)
-    (apply cl->* (flatten cases)))
-  ;; for fixnum-specific operations. if they return at all, we know
-  ;; their args were fixnums. otherwise, an error would have been thrown
-  ;; for the moment, this is only useful if the result is used as a test
-  ;; once we have a set of filters that are true/false based on reaching
-  ;; a certain point, this will be more useful
-  (define (fx-from-cases . cases)
-    (apply from-cases (map (lambda (x)
-                             (add-unconditional-filter-all-args
-                              x -Fixnum))
-                           (flatten cases))))
-
-  (define (binop t [r t])
-    (t t . -> . r))
-  (define (varop t [r t])
-    (->* (list) t r))
-  (define (varop-1+ t [r t])
-    (->* (list t) t r))
-
-  (define (unop t) (-> t t))
-
-  (define (commutative-binop a1 a2 [r a2])
-    (list (-> a1 a2 r) (-> a2 a1 r)))
-  ;; when having at least one of a given type matters (e.g. adding one+ Pos and Nats)
-  (define (commutative-case t1 t2 [r t1])
-    (list (->* (list t1 t2) t2 r)
-          (->* (list t2 t1) t2 r)
-          (->* (list t2 t2 t1) t2 r)))
-
-  (define (comp t1 [t2 t1])
-    (-> t1 t2 B))
-  ;; simple case useful with equality predicates.
-  ;; if the equality is true, we know that general arg is in fact of specific type.
-  (define (commutative-equality/filter general specific)
-    (list (-> general specific B : (-FS (-filter specific 0) -top))
-          (-> specific general B : (-FS (-filter specific 1) -top))))
-
-  (define (exclude-zero non-neg pos [zero -Zero])
-    (list (-> zero non-neg B : (-FS (-filter zero 1) (-filter pos 1)))
-          (-> non-neg zero B : (-FS (-filter zero 0) (-filter pos 0)))))
-
-
-  (define round-type ; also used for truncate
-    (lambda ()
-      (from-cases
-       (map unop all-int-types)
-       (-> -NonNegRat -Nat)
-       (-> -NonPosRat -NonPosInt)
-       (-> -Rat -Int)
-       (map unop (list -FlonumPosZero -FlonumNegZero -FlonumZero
-                       -NonNegFlonum -NonPosFlonum -Flonum
-                       -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero
-                       -NonNegSingleFlonum -NonPosSingleFlonum -SingleFlonum
-                       -InexactRealPosZero -InexactRealNegZero -InexactRealZero
-                       -NonNegInexactReal -NonPosInexactReal -InexactReal
-                       -RealZero -NonNegReal -NonPosReal -Real)))))
-  
-  (define (inexact-zero->exact-zero-type)
-    (for/list ([t (in-list
-                    (list -FlonumPosZero -FlonumNegZero -FlonumZero
-                          -SingleFlonumPosZero -SingleFlonumNegZero -SingleFlonumZero
-                          -InexactRealPosZero -InexactRealNegZero -InexactRealZero
-                          -RealZero))])
-      (-> t -Zero)))
-  
-  (define (exact-round-type) ; also used for exact-truncate
-    (from-cases
-     (map unop all-int-types)
-     (inexact-zero->exact-zero-type)
-     (-> (Un -NonNegRat -NonNegFlonum -NonNegSingleFlonum -NonNegInexactReal -NonNegReal) -Nat)
-     (-> (Un -NonPosRat -NonPosFlonum -NonPosSingleFlonum -NonPosInexactReal -NonPosReal) -NonPosInt)
-     (-> (Un -Rat -Flonum -SingleFlonum -InexactReal -Real) -Int)))
-
-(define mul-ty
-  (from-cases
-    (-> -One)
-    (commutative-case -Zero N -Zero)
-    (map (lambda (t) (commutative-binop -One t))
-         all-number-types)
-    (-> -PosByte -PosByte -PosIndex)
-    (-> -Byte -Byte -Index)
-    (-> -PosByte -PosByte -PosByte -PosFixnum)
-    (-> -Byte -Byte -Byte -NonNegFixnum)
-    (map unop all-int-types)
-    (varop -PosInt)
-    (varop -Nat)
-    (-> -NegInt -NegInt)
-    (-> -NonPosInt -NonPosInt)
-    (-> -NegInt -NegInt -PosInt)
-    (commutative-binop -NegInt -PosInt -NegInt)
-    (-> -NonPosInt -NonPosInt -Nat)
-    (commutative-binop -NonPosInt -Nat -NonPosInt)
-    (-> -NegInt -NegInt -NegInt -NegInt)
-    (-> -NonPosInt -NonPosInt -NonPosInt -NonPosInt)
-    (map varop (list -Int -PosRat -NonNegRat))
-    (-> -NegRat -NegRat)
-    (-> -NonPosRat -NonPosRat)
-    (-> -NegRat -NegRat -PosRat)
-    (commutative-binop -NegRat -PosRat -NegRat)
-    (-> -NonPosRat -NonPosRat -NonNegRat)
-    (commutative-binop -NonPosRat -NonNegRat -NonPosRat)
-    (-> -NegRat -NegRat -NegRat -NegRat)
-    (-> -NonPosRat -NonPosRat -NonPosRat -NonPosRat)
-    (map unop rat-types)
-    (varop -Rat)
-    (varop-1+ -FlonumZero)
-    ; no pos * -> pos, possible underflow
-    (varop-1+ -NonNegFlonum)
-    ;; can't do NonPos NonPos -> NonNeg: (* -1.0 0.0) -> NonPos!
-    (-> -NegFlonum -NegFlonum -NonNegFlonum) ; possible underflow, so no neg neg -> pos
-    (-> -NegFlonum -NegFlonum -NegFlonum -NonPosFlonum) ; see above
-    ;; limited flonum contagion rules
-    ;; (* <float> 0) is exact 0 (i.e. not a float)
-    (commutative-case -NonNegFlonum -PosReal) ; real args don't include 0
-    (commutative-case -Flonum (Un -PosReal -NegReal) -Flonum)
-    (map unop all-flonum-types)
-    (map varop-1+ (list -Flonum -SingleFlonumZero -NonNegSingleFlonum))
-    ;; we could add contagion rules for negatives, but we haven't for now
-    (-> -NegSingleFlonum -NegSingleFlonum -NonNegSingleFlonum) ; possible underflow, so no neg neg -> pos
-    (-> -NegSingleFlonum -NegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum)
-    (commutative-case -NonNegSingleFlonum (Un -PosRat -NonNegSingleFlonum))
-    (commutative-case -SingleFlonum (Un -PosRat -NegRat -SingleFlonum) -SingleFlonum)
-    (map unop single-flonum-types)
-    (map varop-1+ (list -SingleFlonum -InexactRealZero -NonNegInexactReal))
-    (-> -NegInexactReal -NegInexactReal -NonNegInexactReal)
-    (-> -NegInexactReal -NegInexactReal -NegInexactReal -NonPosInexactReal)
-    (commutative-case -NonNegInexactReal (Un -PosRat -NonNegInexactReal))
-    (commutative-case -InexactReal (Un -PosRat -NegRat -InexactReal) -InexactReal)
-    (map unop inexact-real-types)
-    (varop-1+ -InexactReal)
-    ;; reals
-    (map unop real-types)
-    (varop -NonNegReal) ; (* +inf.0 0.0) -> +nan.0
-    (-> -NegReal -NegReal -NonNegReal)
-    (commutative-binop -NegReal -PosReal -NonPosReal)
-    (-> -NegReal -NegReal -NegReal -NonPosReal)
-    (varop -Real)
-    ;; complexes
-    (commutative-case -FloatComplex (Un -InexactComplex -InexactReal -PosRat -NegRat) -FloatComplex)
-    (commutative-case -SingleFlonumComplex (Un -SingleFlonumComplex -SingleFlonum -PosRat -NegRat) -SingleFlonumComplex)
-    (commutative-case -InexactComplex (Un -InexactComplex -InexactReal -PosRat -NegRat) -InexactComplex)
-    (map unop number-types)
-    (varop N)))
-
-[define /-ty
-  (from-cases ; very similar to multiplication, without closure properties for integers
-    (commutative-case -Zero N -Zero)
-    (unop -One)
-    (map (lambda (t) (-> t -One t))
-         all-number-types)
-    (varop-1+ -PosRat)
-    (varop-1+ -NonNegRat)
-    (-> -NegRat -NegRat)
-    (-> -NonPosRat -NonPosRat)
-    (-> -NegRat -NegRat -PosRat)
-    (commutative-binop -NegRat -PosRat -NegRat)
-    (-> -NonPosRat -NonPosRat -NonNegRat)
-    (commutative-binop -NonPosRat -NonNegRat -NonPosRat)
-    (-> -NegRat -NegRat -NegRat -NegRat)
-    (-> -NonPosRat -NonPosRat -NonPosRat -NonPosRat)
-    (varop-1+ -Rat)
-    (-> -FlonumZero (Un -PosFlonum -NegFlonum)) ; one of the infinities
-    ;; No (-> -NonNegFlonum -NonNegFlonum -NonNegFlonum), (/ 0.1 -0.0) => -inf.0
-    ;; No (-> -NonPosFlonum -NonPosFlonum), (/ 0.0) => +inf.0
-    (-> -NegFlonum -NegFlonum -NonNegFlonum)
-    (-> -NegFlonum -NegFlonum -NegFlonum -NonPosFlonum)
-    ;; limited flonum contagion rules
-    ;; (/ 0 <float>) is exact 0 (i.e. not a float)
-    (-> -PosFlonum -PosReal -NonNegFlonum)
-    (-> -PosReal -PosFlonum -NonNegFlonum)
-    (commutative-case -PosFlonum -PosReal -NonNegFlonum)
-    (->* (list (Un -PosReal -NegReal -Flonum) -Flonum) -Flonum -Flonum)
-    (->* (list -Flonum) -Real -Flonum) ; if any argument after the first is exact 0, not a problem
-    (varop-1+ -Flonum)
-    (-> -SingleFlonumZero (Un -PosSingleFlonum -NegSingleFlonum)) ; one of the infinities
-    ;; we could add contagion rules for negatives, but we haven't for now
-    (-> -NegSingleFlonum -NegSingleFlonum -NonNegSingleFlonum) ; possible underflow, so no neg neg -> pos
-    (-> -NegSingleFlonum -NegSingleFlonum -NegSingleFlonum -NonPosSingleFlonum)
-    (commutative-case -PosSingleFlonum (Un -PosRat -PosSingleFlonum) -NonNegSingleFlonum)
-    (commutative-case -SingleFlonum (Un -PosRat -NegRat -SingleFlonum) -SingleFlonum)
-    (varop-1+ -SingleFlonum)
-    (-> -InexactRealZero (Un -PosInexactReal -NegInexactReal))
-    (-> -NegInexactReal -NegInexactReal -NonNegInexactReal)
-    (-> -NegInexactReal -NegInexactReal -NegInexactReal -NonPosInexactReal)
-    (commutative-case -PosInexactReal (Un -PosRat -PosInexactReal) -NonNegInexactReal)
-    (commutative-case -InexactReal (Un -PosRat -NegRat -InexactReal) -InexactReal)
-    (varop-1+ -InexactReal)
-    ;; reals
-    (varop-1+ -PosReal -NonNegReal)
-    (-> -NegReal -NonPosReal)
-    (-> -NegReal -NegReal -NonNegReal)
-    (-> -NegReal -PosReal -NonPosReal)
-    (-> -PosReal -NegReal -NonPosReal)
-    (-> -NegReal -NegReal -NegReal -NonPosReal)
-    (varop-1+ -Real)
-    ;; complexes
-    (varop-1+ -FloatComplex)
-    (commutative-case -FloatComplex (Un -InexactComplex -InexactReal -PosRat -NegRat) -FloatComplex)
-    (->* (list -FloatComplex) N -FloatComplex) ; if any argument after the first is exact 0, not a problem
-    (varop-1+ -SingleFlonumComplex)
-    (commutative-case -SingleFlonumComplex (Un -SingleFlonumComplex -SingleFlonum -PosRat -NegRat) -SingleFlonumComplex)
-    (varop-1+ -InexactComplex)
-    (commutative-case -InexactComplex (Un -InexactComplex -InexactReal -PosRat -NegRat) -InexactComplex)
-    (varop-1+ N))]
-
-(define minus-ty
-  (from-cases
-    (binop -Zero)
-    (half-negation-pattern -PosFixnum -NegFixnum -NonNegFixnum -NonPosFixnum)
-    (negation-pattern -PosInt -NegInt -Nat -NonPosInt)
-    (negation-pattern -PosRat -NegRat -NonNegRat -NonPosRat)
-    (negation-pattern -PosFlonum -NegFlonum -NonNegFlonum -NonPosFlonum)
-    (negation-pattern -PosSingleFlonum -NegSingleFlonum -NonNegSingleFlonum -NonPosSingleFlonum)
-    (negation-pattern -PosInexactReal -NegInexactReal -NonNegInexactReal -NonPosInexactReal)
-    (negation-pattern -PosReal -NegReal -NonNegReal -NonPosReal)
-    (map (lambda (t) (-> t -Zero t))
-         (list -One -PosByte -Byte -PosIndex -Index
-               -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum -Fixnum))
-    (-> -One -One -Zero)
-    (-> -PosByte -One -Byte)
-    (-> -PosIndex -One -Index)
-    (-> -PosFixnum -One -NonNegFixnum)
-    (-> -PosInt -One -Nat)
-    (-> -NonNegFixnum -NonNegFixnum -Fixnum)
-    (-> -NegFixnum -NonPosFixnum -Fixnum)
-    (->* (list -PosInt -NonPosInt) -NonPosInt -PosInt)
-    (->* (list -Nat -NonPosInt) -NonPosInt -Nat)
-    (->* (list -NegInt -Nat) -Nat -NegInt)
-    (->* (list -NonPosInt -Nat) -Nat -NonPosInt)
-    (varop-1+ -Int)
-    (->* (list -PosRat -NonPosRat) -NonPosRat -PosRat)
-    (->* (list -NonNegRat -NonPosRat) -NonPosRat -NonNegRat)
-    (->* (list -NegRat -NonNegRat) -NonNegRat -NegRat)
-    (->* (list -NonPosRat -NonNegRat) -NonNegRat -NonPosRat)
-    (varop-1+ -Rat)
-    ;; floats - uncertain about sign properties in the presence of
-    ;; under/overflow, so these are left out
-    (varop-1+ -Flonum)
-    (commutative-case -Flonum -Real -Flonum)
-    (varop-1+ -SingleFlonum)
-    (commutative-case -SingleFlonum (Un -SingleFlonum -Rat) -SingleFlonum)
-    (varop-1+ -InexactReal)
-    (commutative-case -InexactReal (Un -InexactReal -Rat) -InexactReal)
-    (map varop-1+ (list -Real -ExactNumber))
-    (varop-1+ -FloatComplex)
-    (commutative-case -FloatComplex N -FloatComplex)
-    (varop-1+ -SingleFlonumComplex)
-    (commutative-case -SingleFlonumComplex (Un -SingleFlonumComplex -ExactNumber) -SingleFlonumComplex)
-    (varop-1+ -InexactComplex)
-    (commutative-case -InexactComplex (Un -InexactComplex -ExactNumber) -InexactComplex)
-    (varop-1+ N)))
-
-(define plus-ty
-  (from-cases
-   (-> -Zero)
-   (binop -Zero)
-   (map (lambda (t) (commutative-binop t -Zero t))
-        (list -One -PosByte -Byte -PosIndex -Index
-              -PosFixnum -NonNegFixnum -NegFixnum -NonPosFixnum -Fixnum))
-   (-> -PosByte -PosByte -PosIndex)
-   (-> -Byte -Byte -Index)
-   (-> -PosByte -PosByte -PosByte -PosIndex)
-   (-> -Byte -Byte -Byte -Index)
-   (commutative-binop -PosIndex -Index -PosFixnum)
-   (-> -PosIndex -Index -Index -PosFixnum)
-   (-> -Index -PosIndex -Index -PosFixnum)
-   (-> -Index -Index -PosIndex -PosFixnum)
-   (-> -Index -Index -NonNegFixnum)
-   (-> -Index -Index -Index -NonNegFixnum)
-   (commutative-binop -NegFixnum -One -NonPosFixnum)
-   (commutative-binop -NonPosFixnum -NonNegFixnum -Fixnum)
-   (commutative-case -PosInt -Nat -PosInt)
-   (commutative-case -NegInt -NonPosInt -NegInt)
-   (map unop all-int-types)
-   (map varop (list -Nat -NonPosInt -Int))
-   (commutative-case -PosRat -NonNegRat -PosRat)
-   (commutative-case -NegRat -NonPosRat -NegRat)
-   (map unop rat-types)
-   (map varop (list -NonNegRat -NonPosRat -Rat))
-   ;; flonum + real -> flonum
-   (commutative-case -PosFlonum -NonNegReal -PosFlonum)
-   (commutative-case -PosReal -NonNegFlonum -PosFlonum)
-   (commutative-case -NegFlonum -NonPosReal -NegFlonum)
-   (commutative-case -NegReal -NonPosFlonum -NegFlonum)
-   (commutative-case -NonNegFlonum -NonNegReal -NonNegFlonum)
-   (commutative-case -NonPosFlonum -NonPosReal -NonPosFlonum)
-   (commutative-case -Flonum -Real -Flonum)
-   (map unop all-flonum-types)
-   (varop-1+ -Flonum)
-   ;; single-flonum + rat -> single-flonum
-   (commutative-case -PosSingleFlonum (Un -NonNegRat -NonNegSingleFlonum) -PosSingleFlonum)
-   (commutative-case (Un -PosRat -PosSingleFlonum) -NonNegSingleFlonum -PosSingleFlonum)
-   (commutative-case -NegSingleFlonum (Un -NonPosRat -NonPosSingleFlonum) -NegSingleFlonum)
-   (commutative-case (Un -NegRat -NegSingleFlonum) -NonPosSingleFlonum -NegSingleFlonum)
-   (commutative-case -NonNegSingleFlonum (Un -NonNegRat -NonNegSingleFlonum) -NonNegSingleFlonum)
-   (commutative-case -NonPosSingleFlonum (Un -NonPosRat -NonPosSingleFlonum) -NonPosSingleFlonum)
-   (commutative-case -SingleFlonum (Un -Rat -SingleFlonum) -SingleFlonum)
-   (map unop single-flonum-types)
-   (varop-1+ -SingleFlonum)
-   ;; inexact-real + real -> inexact-real
-   (commutative-case -PosInexactReal -NonNegReal -PosInexactReal)
-   (commutative-case -PosReal -NonNegInexactReal -PosInexactReal)
-   (commutative-case -NegInexactReal -NonPosReal -NegInexactReal)
-   (commutative-case -NegReal -NonPosInexactReal -NegInexactReal)
-   (commutative-case -NonNegInexactReal -NonNegReal -NonNegInexactReal)
-   (commutative-case -NonPosInexactReal -NonPosReal -NonPosInexactReal)
-   (commutative-case -InexactReal -Real -InexactReal)
-   (map unop inexact-real-types)
-   ;; real
-   (commutative-case -PosReal -NonNegReal -PosReal)
-   (commutative-case -NegReal -NonPosReal -NegReal)
-   (map unop real-types)
-   (map varop (list -NonNegReal -NonPosReal -Real -ExactNumber))
-   ;; complex
-   (commutative-case -FloatComplex N -FloatComplex)
-   (commutative-case -Flonum -InexactComplex -FloatComplex)
-   (commutative-case -SingleFlonumComplex (Un -Rat -SingleFlonum -SingleFlonumComplex) -SingleFlonumComplex)
-   (commutative-case -InexactComplex (Un -Rat -InexactReal -InexactComplex) -InexactComplex)
-   (map unop number-types)
-   (varop N)))
-
-(define (bigtree n b1 b2)
-  (if (zero? n) b1
-      (-pair (bigtree (sub1 n) b2 b1)
-             (bigtree (sub1 n) b1 b2))))
-
-(define (tree-ty e)
-  (-mu x (Un e (-pair x x))))
-
-(define (treecall n)
-  (define b1 -String)
-  (define b2 -Symbol)
-  (infer (list 'v) null
-         (list (bigtree n b1 b2))
-         (list (tree-ty (-v v)))
-         -Nat -Nat))
-
-(define (bigcall n types)
-  (define vars (for/list ([_ n]) (gensym 'g)))
-  (define vars-t (map make-F vars))
-  (define fun-tys (for/list ([t vars-t]) (->* vars-t t)))
-  (define res-ty (->* vars-t (-Tuple vars-t)))
-  (infer vars null (take types n) fun-tys res-ty Univ))
-
-(define ts (list plus-ty mul-ty minus-ty /-ty))
-
-(define (go n hsbencher)
-  (displayln `(big ,n))
-  (define ty-list (append ts ts))
-  (collect-garbage) (collect-garbage) (collect-garbage)
-  (define run (λ () (void (bigcall n ty-list))))
-  (cond [hsbencher
-         (define-values (vs t r gc)
-           (time-apply run null))
-         (printf "SELFTIMED: ~a\n" (/ t 1000.))]
-        [else (time (run))]))
-
-(module+ main
-  (require racket/cmdline)
-  (define hsbencher #f)
-  (command-line 
-   #:once-each ["--hsbencher" "format for hsbencher" (set! hsbencher #t)]
-   #:args ([n "4"]) (go (string->number n) hsbencher)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/performance/module-loading-memory.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/performance/module-loading-memory.rkt
deleted file mode 100644
index 1518db4d3c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/performance/module-loading-memory.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/load
-
-(displayln "The printouts below are designed to trick drdr into graphing them;")
-(displayln "they aren't times, but memory usage.")
-
-(define (print-memory)
-  (for ((i 10))
-    (collect-garbage))
-  (let ([n (current-memory-use)])
-   (printf "cpu time: ~a real time: ~a gc time: ~a\n" n n n)))
-
-
-
-(print-memory)
-(module tr typed/racket)
-(print-memory)
-(require 'tr)
-(print-memory)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/performance/module-loading.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/performance/module-loading.rkt
deleted file mode 100644
index 780f375cee..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/performance/module-loading.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/load
-
-(require racket/base racket/stream racket/syntax)
-
-(define (make-mod name required-name)
-  #`(module #,name typed/racket/base
-      (require '#,required-name)))
-
-
-
-(define (make-program N)
-  (define the-names
-    (let ()
-      (define (names) (stream-cons (generate-temporary) (names)))
-      (names)))
-  #`(begin
-      (module #,(stream-first the-names) typed/racket/base)
-      #,@(for/list ((_ N)
-                    (name (stream-rest the-names))
-                    (required-name the-names))
-          #`(begin
-              #,(make-mod name required-name)
-              (require '#,name)))))
-
-(time (eval (make-program 40)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt
deleted file mode 100644
index 0520a73516..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt
+++ /dev/null
@@ -1,120 +0,0 @@
-#lang racket
-
-(require racket/place typed-racket/optimizer/logging
-         unstable/open-place syntax/modcode data/queue)
-(provide start-worker dr serialize-exn deserialize-exn s-exn? generate-log/place compile-path/place verbose?)
-
-(define verbose? (make-parameter #f))
-
-(struct s-exn (message) #:prefab)
-(struct s-exn:fail s-exn () #:prefab)
-(struct s-exn:fail:syntax s-exn:fail (exprs) #:prefab)
-(struct s-exn:fail:contract s-exn:fail () #:prefab)
-
-(define (serialize-exn e)
-  (match e
-    [(exn:fail:syntax msg _ exprs)
-     (s-exn:fail:syntax msg (map syntax->datum exprs))]
-    [(exn:fail:contract msg _)
-     (s-exn:fail:contract msg)]
-    [(exn:fail msg _)
-     (s-exn:fail msg)]
-    [(exn msg _)
-     (s-exn msg)]))
-(define (deserialize-exn e)
-  (match e
-    [(s-exn:fail:syntax msg exprs)
-     (exn:fail:syntax msg (current-continuation-marks) 
-                      (map (λ (e) (datum->syntax #f e)) exprs))]
-    [(s-exn:fail:contract m)
-     (exn:fail:contract m (current-continuation-marks))]    
-    [(s-exn:fail m)
-     (exn:fail m (current-continuation-marks))]
-    [(s-exn m)
-     (exn m (current-continuation-marks))]))
-
-(define (dr p)
-  (parameterize ([current-namespace (make-base-empty-namespace)])
-    (dynamic-require `(file ,(if (string? p) p (path->string p))) #f)))
-
-
-(define (start-worker get-ch name)
-  (define verb (verbose?))
-  (open-place ch
-    (let loop ()
-      (match (place-channel-get get-ch)                
-        [(vector 'log name dir res)
-         (dynamic-require 'typed-racket/core #f)
-         (with-handlers ([exn:fail? 
-                          (λ (e) (place-channel-put res (serialize-exn e)))])
-           (define lg (generate-log/place name dir))
-           (place-channel-put res lg))
-         (loop)]
-        [(vector 'compile path res)
-         (with-handlers ([exn:fail? 
-                          (λ (e) (place-channel-put res (serialize-exn e)))])
-            (compile-path/place path)
-            (place-channel-put res (void)))
-         (loop)]
-        [(vector p* res error?) 
-         (define-values (path p b) (split-path p*))
-         (with-handlers ([exn? (λ (e) (place-channel-put res (serialize-exn e)))])
-           (parameterize ([read-accept-reader #t]
-                          [current-load-relative-directory
-                           (path->complete-path path)]
-                          [current-directory path]
-                          [current-output-port (open-output-nowhere)]                        
-                          [error-display-handler (if error? void (error-display-handler))]) 
-             (dr p)
-             (place-channel-put res #t)))
-         (loop)]))))
-
-(define (compile-path/place path)
-  (get-module-code
-    path
-    #:choose (lambda (src zo so) 'src)))
-
-
-(define-namespace-anchor anchor)
-
-(define (generate-log/place name dir)
-  ;; some tests require other tests, so some fiddling is required
-  (define file (simplify-path (build-path dir name)))
-  (define orig-load/use-compiled (current-load/use-compiled))
-  (define orig-use-compiled-file-paths (use-compiled-file-paths))
-  (define full-tr-logs (make-queue))
-  (define sub-tr-logs (make-queue))
-
-  (define (test-load/use-compiled path name)
-    (parameterize [(use-compiled-file-paths null)
-                   (current-load/use-compiled reset-load/use-compiled)]
-      (orig-load/use-compiled path name)))
-  (define (reset-load/use-compiled path name)
-    (parameterize [(use-compiled-file-paths orig-use-compiled-file-paths)
-                   (current-load/use-compiled orig-load/use-compiled)]
-        (with-tr-logging-to-queue
-          sub-tr-logs
-          (thunk
-            (orig-load/use-compiled path name)))))
-
-  (define regular-output
-    (with-output-to-string
-      (lambda ()
-        (with-tr-logging-to-queue
-          full-tr-logs
-          (thunk
-            (parameterize ([current-namespace (make-base-empty-namespace)]
-                           [current-load/use-compiled test-load/use-compiled])
-              (define orig-namespace (namespace-anchor->namespace anchor))
-              (namespace-attach-module orig-namespace 'racket)
-              (namespace-attach-module orig-namespace 'typed-racket/core)
-              (dynamic-require file #f)))))))
-
-  (define tr-logs
-    (let ((tr-logs (queue->list full-tr-logs)))
-      (sort
-        (for/fold ((tr-logs tr-logs)) ((entry (in-queue sub-tr-logs)))
-          (remove entry tr-logs))
-        string<?)))
-
-  (list tr-logs regular-output))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/random-real.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/random-real.rkt
deleted file mode 100644
index 0f00283114..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/random-real.rkt
+++ /dev/null
@@ -1,116 +0,0 @@
-#lang racket
-
-(require unstable/flonum)
-
-(provide random-exponential random-laplace
-         random-flonum random-single-flonum
-         random-integer->random-exact-rational
-         random-integer->random-flonum
-         random-integer->random-single-flonum
-         random-integer->random-real)
-
-;; Returns a rational flonum from an exponential distribution
-;; About half the numbers from this distribution are < scale, and half are > scale
-(define (random-exponential [scale 1.0])
-  (let loop ()
-    (define r (random))
-    ;; appx. probability 1.11e-16 this loops:
-    (cond [(= r 0)  (loop)]
-          [else  (exact->inexact (* (- (log (random))) scale))])))
-
-;; Randomly signs a flonum from random-exponential
-(define (random-laplace [scale 1.0])
-  (define r (random-exponential scale))
-  (if ((random) . < . 0.5) r (- r)))
-
-;; Returns an integer from Uniform(0,2^64-1)
-(define (random-flonum-bits)
-  (for/fold ([i 0]) ([_  (in-range 4)])
-    (+ (* i #x10000) (random #x10000))))
-
-;; Returns a rational flonum with bits uniformly distributed
-(define (random-flonum)
-  (let loop ()
-    (define x (bit-field->flonum (random-flonum-bits)))
-    ;; appx. 0.0005 probability this loops
-    (if (rational? x) x (loop))))
-
-;; Returns a single flonum with bits uniformly distributed; sometimes -inf.f or +inf.f
-(define (random-single-flonum*)
-  (define s (random #b10))  ; sign bit
-  (define e (random #b100000000))  ; exponent
-  (define f (random #b100000000000000000000000))  ; fractional part
-  ;; Formula from Wikipedia page on IEEE 754 binary32 format
-  (real->single-flonum
-   (* (if (= s 0) 1 -1)
-      (+ 1 (/ f #b100000000000000000000000))
-      (expt 2 (- e 127)))))
-
-;; Returns a rational single flonum with bits uniformly distributed
-(define (random-single-flonum)
-  (let loop ()
-    (define x (random-single-flonum*))
-    (if (rational? x) x (loop))))
-
-;; Converts random integers to random exact rationals
-(define (random-integer->random-exact-rational E)
-  (cond
-    [(= E 0)  0]  ; code below would pick 0/0
-    [else
-     ;; random fraction
-     (define n (exact-ceiling (random-exponential E)))
-     (define d (exact-ceiling (random-exponential E)))
-     (cond
-       [(= d 0)  0]  ; appx. probability 1.11e-16
-       [else
-        (define x (/ n d))
-        (if ((random) . < . 0.5) x (- x))])]))
-
-;; Converts random integers to random double flonums
-;; Often returns very large or small numbers (near the limits of floating-point range)
-;; Sometimes returns +nan.0, +inf.0 or -inf.0
-(define (random-integer->random-flonum E)
-  (define r (random))
-  (cond
-    ;; probability 0.25: random flonum, laplace-distributed with scale E
-    [(r . < . 0.25)  (random-laplace (abs E))]
-    ;; probability 0.25: random flonum with uniform bits
-    [(r . < . 0.50)  (random-flonum)]
-    ;; probability 0.35: very small or very large flonum
-    [(r . < . 0.85)
-     (define r (random))
-     (cond [(r . < . 0.5)
-            (define x (ordinal->flonum E))
-            (cond [(= x 0.0)  (if ((random) . < . 0.5) 0.0 -0.0)]
-                  [else  x])]
-           [(r . < . 0.75)
-            (flstep -inf.0 (abs E))]
-           [else
-            (flstep +inf.0 (- (abs E)))])]
-    ;; probability 0.05 each: +nan.0, +inf.0, -inf.0
-    [(r . < . 0.90)  +nan.0]
-    [(r . < . 0.95)  +inf.0]
-    [else            -inf.0]))
-
-;; Converts random integers to random single flonums
-;; Sometimes returns +nan.f, +inf.f or -inf.f
-(define (random-integer->random-single-flonum E)
-  (define r (random))
-  (cond
-    ;; probability 0.50: random single flonum, laplace-distributed with scale E
-    [(r . < . 0.50)  (real->single-flonum (random-laplace (abs E)))]
-    ;; probability 0.35: random single flonum with uniform bits
-    [(r . < . 0.85)  (random-single-flonum)]
-    ;; probability 0.05 each: +nan.f, +inf.f, -inf.f
-    [(r . < . 0.90)  +nan.f]
-    [(r . < . 0.95)  +inf.f]
-    [else            -inf.f]))
-
-;; Converts random integers to random reals
-(define (random-integer->random-real E)
-  (define r (random))
-  ;; probability 0.25 each
-  (cond [(r . < . 0.25)  E]
-        [(r . < . 0.50)  (random-integer->random-exact-rational E)]
-        [(r . < . 0.75)  (random-integer->random-flonum E)]
-        [else            (random-integer->random-single-flonum E)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/run.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/run.rkt
deleted file mode 100644
index c2830205e3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/run.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang racket
-(require racket/vector racket/gui/dynamic rackunit)
-
-(require "main.rkt")
-
-(define exec (make-parameter go/text))
-(define nightly? (make-parameter #f))
-(define unit? (make-parameter #f))
-(define int? (make-parameter #f))
-(define opt? (make-parameter #f))
-(define missed-opt? (make-parameter #f))
-(define bench? (make-parameter #f))
-(define math? (make-parameter #f))
-(define single (make-parameter #f))
-(current-namespace (make-base-namespace))
-(command-line
- #:once-each
- ["-v" "verbose" (verbose? #t)]
- ["--unit" "run the unit tests" (unit? #t)]
- ["--int" "run the integration tests" (int? #t)]
- ["--opt" "run the optimization tests" (opt? #t)]
- ["--missed-opt" "run the missed optimization tests" (missed-opt? #t)]
- ["--benchmarks" "compile the typed benchmarks" (bench? #t)]
- ["--math" "compile the math library" (math? #t)]
- ["--just" path "run only this test" (single (just-one path))]
- ["--nightly" "for the nightly builds" (begin (nightly? #t) (unit? #t) (opt? #t) (missed-opt? #t) (places 1))]
- ["--all" "run all tests" (begin (unit? #t) (int? #t) (opt? #t) (missed-opt? #t) (bench? #t) (math? #t))]
- ["-j" num "number of places to use" 
-       (let ([n (string->number num)])
-         (places (and (integer? n) (> n 1) n)))]
- ["--gui" "run using the gui"
-          (if (gui-available?)
-              (exec go)
-              (error "GUI not available"))])
-
-(start-workers)
-
-(if (and (nightly?) (eq? 'cgc (system-type 'gc)))
-    (printf "Skipping Typed Racket tests.\n")
-    (let ([to-run (cond [(single) (single)]
-                        [else
-                         (make-test-suite
-                          "Typed Racket Tests"
-                          (append (if (unit?)       (list unit-tests)                  '())
-                                  (if (int?)        (list (int-tests))                 '())
-                                  (if (opt?)        (list (optimization-tests))        '())
-                                  (if (missed-opt?) (list (missed-optimization-tests)) '())
-                                  (if (bench?)      (list (compile-benchmarks))        '())
-                                  (if (math?)       (list (compile-math))              '())))])])
-      (unless (= 0 ((exec) to-run))
-        (eprintf "Typed Racket Tests did not pass.\n")
-        (exit 1))))
-
-;; Test mode:
-(module test racket/base
-  (require syntax/location)
-  (parameterize ([current-command-line-arguments (vector "--nightly")])
-    (dynamic-require (quote-module-path "..") 0))
-  (module config info
-    (define timeout 1800)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/send-places.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/send-places.rkt
deleted file mode 100644
index a129f5c1c6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/send-places.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket
-
-(require "places.rkt")
-
-(require racket/place data/queue racket/async-channel)
-(provide generate-log start-workers run-in-other-place places verbose? compile-path)
-
-(define places (make-parameter (and (place-enabled?) (min 8 (processor-count)))))
-
-(define-values (enq-ch deq-ch) (place-channel))
-(define (start-workers)
-  (when (places)
-    (for ([i (places)])
-      (start-worker deq-ch i))))
-
-(define (run-in-other-place p* error?)
-  (define-values (res-ch res-ch*) (place-channel))
-  (place-channel-put enq-ch (vector p* res-ch* error?))
-  (define res (place-channel-get res-ch))
-  (when (s-exn? res)
-    (raise (deserialize-exn res))))
-
-
-(define (generate-log name dir)
-  (apply values
-    (cond [(places)
-           (define-values (res-ch res-ch*) (place-channel))
-           (place-channel-put enq-ch (vector 'log name dir res-ch*))
-           (define res (place-channel-get res-ch))
-           (if (s-exn? res)
-               (raise (deserialize-exn res))
-               res)]
-          [else
-           (generate-log/place name dir)])))
-
-(define (compile-path file)
-  (cond [(places)
-         (define-values (res-ch res-ch*) (place-channel))
-         (place-channel-put enq-ch (vector 'compile file res-ch*))
-         (define res (place-channel-get res-ch))
-         (if (s-exn? res)
-             (raise (deserialize-exn res))
-             res)]
-        [else
-         (compile-path/place file)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/2d-typed.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/2d-typed.rkt
deleted file mode 100644
index 6cca65908d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/2d-typed.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#lang unstable/2d typed/racket/base
-(require unstable/2d/match)
-
-(: f : Integer Integer -> Integer)
-(define (f x y)
-  #2dmatch
-  ╔════════════════╦═══╦════════════════════════╗
-  ║   y            ║ 0 ║       #{b : Integer}   ║
-  ║ x              ║   ║                        ║
-  ╠════════════════╬═══╬════════════════════════╣
-  ║  0             ║ 0 ║      0                 ║
-  ╠════════════════╬═══╬════════════════════════╣
-  ║#{a : Integer}  ║ 0 ║     (let loop ([a a]   ║
-  ║                ║   ║                [b b])  ║
-  ║                ║   ║        (loop a b))     ║
-  ╚════════════════╩═══╩════════════════════════╝) 
-
-(f 0 1)
\ No newline at end of file
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/andmap.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/andmap.rkt
deleted file mode 100644
index c1c40d3cc6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/andmap.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed-scheme
-
-(andmap = (list 1 2 3) (list 1 2 3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/annotation-test.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/annotation-test.rkt
deleted file mode 100644
index c84323284c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/annotation-test.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed-scheme
-(define-type-alias top2 Any)
-
-(define: (x) : Number 23)
-
-(let: ([y : top2 x])
-      y)
-
-(let: ([z : Number 4])
-      #{z :: top2})
-
-#{(x) :: top2}
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/any-hash.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/any-hash.rkt
deleted file mode 100644
index 201c49cc84..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/any-hash.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/load
-
-(module m typed/racket/base
-  (provide (struct-out container))
-  (struct: container ([value : Any])))
-
-(require 'm racket/base)
-(container-value (container (hasheq 'foo "foo")))
\ No newline at end of file
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/any-wrap-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/any-wrap-list.rkt
deleted file mode 100644
index 9576df4b77..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/any-wrap-list.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/load
-
-(module m typed/racket
-  (provide f)
-  (define: f : Any '(a (2 3))))
-
-(module n racket
-  (require 'm)
-  (list? (second f)))
-
-(require 'n)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/apply-append.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/apply-append.rkt
deleted file mode 100644
index fc99651732..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/apply-append.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed-scheme
-
-(apply append '((1 2 3) (4 5 6)))
-(apply append (list (list 1 2 3) (list 4 5 6)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/apply-dots-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/apply-dots-list.rkt
deleted file mode 100644
index cd1b832f10..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/apply-dots-list.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-;; Change the lang to scheme for untyped version
-#lang typed-scheme
-
-(define tests (list (list (λ() 1) 1 "test 1")
-                   (list (λ() 2) 2 "test 2")))
-
-; Comment out the type signature when running untyped
-(: check-all (All (A ...) ((List (-> A) A String) ... A -> Void)))
-(define (check-all . tests)
- (let aux ([tests tests]
-           [num-passed 0])
-   (if (null? tests)
-       (printf "~a tests passed.\n" num-passed)
-       (let ((test (car tests)))
-         (let ((actual ((car test)))
-               (expected (cadr test))
-               (msg (caddr test)))
-           (if (equal? actual expected)
-               (aux (cdr tests) (+ num-passed 1))
-               (printf "Test failed: ~a. Expected ~a, got ~a.\n"
-                       msg expected actual)))))))
-
-(apply check-all tests) ; Works in untyped, but not in typed
-(check-all (car tests) (cadr tests)) ; Works in typed or untyped
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/apply-dots.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/apply-dots.rkt
deleted file mode 100644
index d7ad17a005..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/apply-dots.rkt
+++ /dev/null
@@ -1,65 +0,0 @@
-#lang typed-scheme
-
-(plambda: (a ...) ([z : String] . [w : Number ... a])
-          (apply (lambda: ([x : Number] . [y : Number ... a]) x)
-                 1 w))
-
-(plambda: (a ...) ([z : String] . [w : Number ... a])
-          (apply (lambda: ([x : Number] . [y : Number *]) x)
-                 1 w))
-
-(plambda: (a ...) ([z : String] . [w : Number *])
-          (apply (lambda: ([x : Number] . [y : Number *]) x)
-                 1 w))
-
-(plambda: (a ...) ([z : String] . [w : Number *])
-          (apply (case-lambda: (([x : Number] . [y : Number ... a]) x)
-                               (([x : String] [y : String] . [z : String *]) 0)
-                               ([y : Number *] 0))
-                 w))
-
-;; */*/poly
-(plambda: (a ...) ([z : String] . [w : Number *])
-          (apply (plambda: (b) ([x : b] . [y : Number *]) x)
-                 1 w))
-
-(plambda: (a ...) ([z : String] . [w : Number *])
-          (apply (plambda: (b) ([x : b] . [y : Number *]) x)
-                 1 2 3 w))
-
-;; */*/polydots
-(plambda: (a ...) ([z : String] . [w : Number *])
-          (apply (plambda: (b ...) ([x : Number] . [y : Number *]) x)
-                 1 w))
-
-(plambda: (a ...) ([z : String] . [w : Number *])
-          (apply (plambda: (b ...) ([x : Number] . [y : Number *]) x)
-                 1 1 1 w))
-
-;; */.../poly
-(plambda: (a ...) ([z : String] . [w : Number ... a])
-          (apply (plambda: (b) ([x : Number] . [y : Number *]) x)
-                 1 w))
-
-(plambda: (a ...) ([z : String] . [w : Number ... a])
-          (apply (plambda: (b) ([x : Number] . [y : Number *]) x)
-                 1 1 1 1 w))
-
-;; */.../polydots
-#;(plambda: (a ...) ([z : String] . [w : Number ... a])
-          (apply (plambda: (b ...) ([x : Number] . [y : Number *]) x)
-                 1 w))
-
-#;(plambda: (a ...) ([z : String] . [w : Number ... a])
-          (apply (plambda: (b ...) ([x : Number] . [y : Number *]) x)
-                 1 1 1 1 w))
-
-;; .../.../poly
-(plambda: (a ...) ([z : String] . [w : Number ... a])
-          (apply (plambda: (b) ([x : Number] . [y : Number ... a]) x)
-                 1 w))
-
-#;(plambda: (a ...) ([z : String] . [w : Number ... a])
-          (apply (plambda: (b ...) ([x : Number] . [y : Number ... a]) x)
-                 1 w))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/area.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/area.rkt
deleted file mode 100644
index b37407c5c0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/area.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed-scheme
-(define-typed-struct rectangle ([width : Number] [height : Number]))
-(define-typed-struct circle ([radius : Number]))
-
-(define-type-alias shape (U rectangle circle))
-
-(define: (area [sh : shape]) : Number
-  (cond [(circle? sh)
-         (* (ann 3.1416 : Number) (circle-radius sh) (circle-radius sh))]
-        [else
-         (* (rectangle-width sh) (rectangle-height sh))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/arrow-star-contracts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/arrow-star-contracts.rkt
deleted file mode 100644
index a81faeeb7c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/arrow-star-contracts.rkt
+++ /dev/null
@@ -1,120 +0,0 @@
-#lang racket/base
-
-(require typed/rackunit)
-
-(module defs typed/racket/base
-  (provide (all-defined-out))
-
-  (: foo0k (case-> ([#:kw Real] -> Real)))
-  (define (foo0k #:kw [kw 0])
-    kw)
-
-  (: foo01k (case-> ([#:kw Real] -> Real)
-                    (Real [#:kw Real] -> Real)))
-  (define (foo01k [x 0] #:kw [kw 0])
-    (+ x kw))
-
-  (: foo012k (case-> ([#:kw Real] -> Real)
-                     (Real [#:kw Real] -> Real)
-                     (Real Real [#:kw Real] -> Real)))
-  (define (foo012k [x 0] [y 0] #:kw [kw 0])
-    (+ x y kw))
-
-  (: foo12k (case-> (Real [#:kw Real] -> Real)
-                    (Real Real [#:kw Real] -> Real)))
-  (define (foo12k x [y 0] #:kw [kw 0])
-    (+ x y kw))
-
-  (: foo123k (case-> (Real [#:kw Real] -> Real)
-                     (Real Real [#:kw Real] -> Real)
-                     (Real Real Real [#:kw Real] -> Real)))
-  (define (foo123k x [y 0] [z 0] #:kw [kw 0])
-    (+ x y z kw))
-
-  (: foo23k (case-> (Real Real [#:kw Real] -> Real)
-                    (Real Real Real [#:kw Real] -> Real)))
-  (define (foo23k x y [z 0] #:kw [kw 0])
-    (+ x y z kw))
-
-  (: foo234k (case-> (Real Real [#:kw Real] -> Real)
-                     (Real Real Real [#:kw Real] -> Real)
-                     (Real Real Real Real [#:kw Real] -> Real)))
-  (define (foo234k x y [z 0] [w 0] #:kw [kw 0])
-    (+ x y z w kw))
-  )
-
-(require 'defs)
-
-(void foo0k)
-(void foo01k)
-(void foo12k)
-
-(check-equal? (foo0k) 0)
-(check-exn exn:fail:contract? (λ () (foo0k 1)))
-(check-equal? (foo0k #:kw 10) 10)
-(check-exn exn:fail:contract? (λ () (foo0k 1 #:kw 10)))
-
-(check-equal? (foo01k) 0)
-(check-equal? (foo01k 1) 1)
-(check-exn exn:fail:contract? (λ () (foo01k 1 1)))
-(check-equal? (foo01k #:kw 10) 10)
-(check-equal? (foo01k 1 #:kw 10) 11)
-(check-exn exn:fail:contract? (λ () (foo01k 1 1 #:kw 10)))
-
-(check-exn exn:fail:contract? (λ () (foo12k)))
-(check-equal? (foo12k 1) 1)
-(check-equal? (foo12k 1 1) 2)
-(check-exn exn:fail:contract? (λ () (foo12k 1 1 1)))
-(check-exn exn:fail:contract? (λ () (foo12k #:kw 10)))
-(check-equal? (foo12k 1 #:kw 10) 11)
-(check-equal? (foo12k 1 1 #:kw 10) 12)
-(check-exn exn:fail:contract? (λ () (foo12k 1 1 1 #:kw 10)))
-
-(void foo012k)
-(void foo123k)
-(void foo23k)
-(void foo234k)
-
-(check-equal? (foo012k) 0)
-(check-equal? (foo012k 1) 1)
-(check-equal? (foo012k 1 1) 2)
-(check-exn exn:fail:contract? (λ () (foo012k 1 1 1)))
-(check-equal? (foo012k #:kw 10) 10)
-(check-equal? (foo012k 1 #:kw 10) 11)
-(check-equal? (foo012k 1 1 #:kw 10) 12)
-(check-exn exn:fail:contract? (λ () (foo012k 1 1 1 #:kw 10)))
-
-(check-exn exn:fail:contract? (λ () (foo123k)))
-(check-equal? (foo123k 1) 1)
-(check-equal? (foo123k 1 1) 2)
-(check-equal? (foo123k 1 1 1) 3)
-(check-exn exn:fail:contract? (λ () (foo123k 1 1 1 1)))
-(check-exn exn:fail:contract? (λ () (foo123k #:kw 10)))
-(check-equal? (foo123k 1 #:kw 10) 11)
-(check-equal? (foo123k 1 1 #:kw 10) 12)
-(check-equal? (foo123k 1 1 1 #:kw 10) 13)
-(check-exn exn:fail:contract? (λ () (foo123k 1 1 1 1 #:kw 10)))
-
-(check-exn exn:fail:contract? (λ () (foo23k)))
-(check-exn exn:fail:contract? (λ () (foo23k 1)))
-(check-equal? (foo23k 1 1) 2)
-(check-equal? (foo23k 1 1 1) 3)
-(check-exn exn:fail:contract? (λ () (foo23k 1 1 1 1)))
-(check-exn exn:fail:contract? (λ () (foo23k #:kw 10)))
-(check-exn exn:fail:contract? (λ () (foo23k 1 #:kw 10)))
-(check-equal? (foo23k 1 1 #:kw 10) 12)
-(check-equal? (foo23k 1 1 1 #:kw 10) 13)
-(check-exn exn:fail:contract? (λ () (foo23k 1 1 1 1 #:kw 10)))
-
-(check-exn exn:fail:contract? (λ () (foo234k)))
-(check-exn exn:fail:contract? (λ () (foo234k 1)))
-(check-equal? (foo234k 1 1) 2)
-(check-equal? (foo234k 1 1 1) 3)
-(check-equal? (foo234k 1 1 1 1) 4)
-(check-exn exn:fail:contract? (λ () (foo234k 1 1 1 1 1)))
-(check-exn exn:fail:contract? (λ () (foo234k #:kw 10)))
-(check-exn exn:fail:contract? (λ () (foo234k 1 #:kw 10)))
-(check-equal? (foo234k 1 1 #:kw 10) 12)
-(check-equal? (foo234k 1 1 1 #:kw 10) 13)
-(check-equal? (foo234k 1 1 1 1 #:kw 10) 14)
-(check-exn exn:fail:contract? (λ () (foo234k 1 1 1 1 1 #:kw 10)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/at-exp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/at-exp.rkt
deleted file mode 100644
index 291826524a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/at-exp.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang at-exp typed/racket
-
-(define contents
- (lambda args args))
-
-(define doc @contents{x y})
-
-@contents{x y}
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/bad-map-infer.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/bad-map-infer.rkt
deleted file mode 100644
index 6e9a97d7f8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/bad-map-infer.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed-scheme
-
-(: cross1 ((Listof Number) -> (Listof Number)))
-(define (cross1 m)
-  (map (lambda: ([m1 : Number]) #{(error 'bad) :: Number}) m))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/barland.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/barland.rkt
deleted file mode 100644
index 3923ab46c6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/barland.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang typed-scheme
-(define-type-alias top Any)
-(define-type-alias set (top -> top))
-
-(define: (autos [elt : top]) : top (memq elt '(vw saab bmw audi)))
-
-(define: (element-of? [elt : top] [s : set]) : top (s elt))
-
-;; CHANGE - use exact-integer?
-(define: (evens [elt : top]) : top (and (exact-integer? elt) (even? elt)))
-
-(define-typed-struct pr ([fst : top] [snd : top]))
-
-#;(define: (length=2? [any : top]) : boolean
-(and (pair? any)
-     (pair? (cdr any))
-     (empty? (cdr (cdr any)))))
-
-(define: (cartesian-product [A : set] [B : set]) : set
-  (lambda: ([elt : top])
-	   (and (pr? elt)
-		(element-of? (pr-fst elt) A)
-		(element-of? (pr-snd elt) B))))
-
-
-
-(define: evenEuroCars : set (cartesian-product evens autos))
-#;(display (element-of? (make-pr 4 'bmw) evenEuroCars)) ; = #t
-#;(display (element-of? (make-pr 'bmw 4) evenEuroCars)) ; = #f
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/basic-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/basic-tests.rkt
deleted file mode 100644
index 02c1af3bf2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/basic-tests.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang typed-scheme
-;;syntax-only requires
-(require (only-in mzlib/etc let+))
-(require (only-in mzlib/match match))
-
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias top Any)
-
-					;(provide (all-defined))
-(define: x* : Number 3)
-
-(define #{x** : number} 3)
-
-#{(and 3 4) :: (Un boolean number)}
-#{(and 3 4) :: (Un boolean number)}
-
-#;(define: match-test : number
-(match 3
-       [(? number? #{x : number}) (+ 17 x)]
-       [_ 12]))
-
-
-(define-typed-struct pt ([x : Number] [y : number]))
-
-(define-typed-struct (3dpt pt) ([z : number]))
-
-(define: x-struct : pt (make-pt 3 4))
-
-(define: z-struct : 3dpt (make-3dpt 3 4 5))
-
-(define: z*-struct : pt z-struct)
-
-(define: x-mem : number (pt-x x-struct))
-
-(define: (pt-add [v : top]) : number
-  (cond
-   [(pt? v) (+ (pt-x v) (pt-y v))]
-   [else 0]))
-
-(define: (zpt-add [v : top]) : number
-  (cond
-   [(3dpt? v) (+ (pt-x v) (pt-y v))]
-   [else 0]))
-
-#;(define: (pt-add/match [v : top]) : number
-(match v
-       [($ pt #{x : number} #{y : number}) (+ x y)]
-       [_ 0]))
-
-#;(pt-add/match x-struct)
-
-#;(define-typed-struct pt ([z number]))
-
-;; this had better not work
-#;(define: pt-unsound : boolean
-(cond [(pt? x-struct) (= (pt-z x-struct))]
-      [else #t]))
-
-(define: a-bool : boolean (pt? 6))
-
-(define: blarz : number
-  (let*: ([x : number 3]
-	  [y : number (+ x 1)])
-	 (add1 y)))
-
-(define: looping : number
-  (let: loop : number ([a : Real 1] [b : Real 10]) (if (> a b) 1000 (loop (add1 a) (sub1 b)))))
-
-#;(make-pt 'x 'y)
-
-(define: x : number 3)
-(add1 x)
-#;(define-syntax foo
-(syntax-rules ()
-  [(foo x1 y1) (= x1 y1)]))
-
-(define: (f [x : number] [y : number]) : number (+ x y))
-(define: (g [x : number] [y : number]) : boolean
-  (let+ (#;[val #{z : number} #f]
-	 [val #{x1 : number} (* x x)]
-	 [rec #{y1 : number} (* y y)])
-	#|(define-syntax foo
-	(syntax-rules ()
-	[(foo) (= x1 y1)]))
-	(foo)|#
-	(= x1 y1)))
-(g (if (g (add1 x) (add1 (add1 x))) 10 100) 30)
-
-(map (lambda: ([e : Number]) e) (list 1 2 3))
-
-
-(define: mymap : (All (a b) ((a -> b) (Listof a) -> (Listof b)))
-  (plambda: (a b) ([f : (a -> b)] [l : (Listof a)])
-    (cond [(null? l) '()]
-          [else (cons (f (car l))
-                      (mymap f (cdr l)))])))
-
-(mymap add1 (cons 1 (cons 2 (cons 3 #{'() :: (Listof number)}))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/batched-queue.scm b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/batched-queue.scm
deleted file mode 100644
index 00db386424..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/batched-queue.scm
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang typed-scheme
-;; CHANGES
-;; added annotations on all bound variables and structs
-;; require typed foldl
-;; made empty into a nullary function
-;; added annotations on empty lists
-;; added annotation on use of polymorphic functions in higher-order contexts
-
-;; fixme -- how do we require polymorphic functions?
-#;(require (only (lib "list.ss") foldl))
-#;(require (only "typed-list.ss" foldl))
-
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias top Any)
-
-(define-typed-struct (a) queue ([front : (Listof a)] [rear : (Listof a)]))
-
-					; Invariants
-					;   1.  q empty <=> (null? (queue-front q))
-					;   2.  elements of q  =  (append (queue-front q) (reverse (queue-rear q)))
-
-
-;; fixme -- shouldn't have to be a function
-(pdefine: (a) (empty) : (queue a) (make-queue #{'() :: (Listof a)} #{'() :: (Listof a)}))
-
-(pdefine: (a) (empty? [q : (queue a)]) : boolean
-	  (null? (queue-front q)))
-
-(pdefine: (a) (insert-last [x : a] [q : (queue a)]) : (queue a)
-	  (let ([front (queue-front q)])
-	    (if (null? front)
-		(make-queue (cons x front) '())
-		(make-queue front (cons x (queue-rear q))))))
-
-(define:  insert : (All (a) (a (queue a) -> (queue a))) insert-last)
-
-(pdefine: (a) (insert* [xs : (Listof a)] [q : (queue a)]) : (queue a)
-	  ;; fixme - annoying annotation
-	  (foldl #{insert :: (a (queue a) -> (queue a))} q xs))
-
-(pdefine: (a) (remove-first [q : (queue a)]) : (queue a)
-	  (let ([front (queue-front q)])
-	    (if (null? front)
-		(error 'remove-first "can't remove element from empty queue; given " q)
-		(if (null? (cdr front))
-		    (make-queue (reverse (queue-rear q)) '())
-		    (make-queue (cdr front) (queue-rear q))))))
-
-(pdefine: (a) (first+remove [q : (queue a)]) : (values a (queue a))
-	  (let ([front (queue-front q)])
-	    (if (null? front)
-		(error 'remove-first "can't remove element from empty queue; given " q)
-		(values (car front)
-			(if (null? (cdr front))
-			    (make-queue (reverse (queue-rear q)) '())
-			    (make-queue (cdr front) (queue-rear q)))))))
-
-(define: -remove : (All (a) ((queue a) -> (queue a))) remove-first)
-
-(pdefine: (a) (first [q : (queue a)]) : a
-	  (when (empty? q)
-		(error 'first "There is no first element in an empty queue; given " q))
-	  (car (queue-front q)))
-
-(pdefine: (a) (elements: [q : (queue a)]) : (Listof a)
-	  (append (queue-front q)
-		  (reverse (queue-rear q))))
-
-(pdefine: (a b) (fold [f : (a b -> b)] [init : b] [q : (queue a)]) : b
-	  (foldl f
-		 (foldl f init (queue-front q))
-		 (reverse (queue-rear q))))
-
-(pdefine: (a) (size [q : (queue a)]) : number
-					; NOTE: T(size) = O(n)
-	  (+ (length (queue-front q))
-	     (length (queue-rear q))))
-
-;; 12 definitions checked
-;; generators removed
-
-;; TESTS
-
-(= 0 (size ((inst empty Number))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/begin0-error.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/begin0-error.rkt
deleted file mode 100644
index d8a05fe6d1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/begin0-error.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#lang typed/racket
-
-(define-type SN (U String Number))
-
-(define-predicate sn? SN)
-
-(struct: (α) node ({left : α} {right : α}))
-
-(: create-node (Any Any -> String))
-(define (create-node x y)
-  (begin0
-    "foo"
-    (unless #t
-      (error 'bad ""))))
-
-(: create-node2 (All (B) (B B -> (node SN))))
-(define (create-node2 x y)
-  (if (and (sn? x) (sn? y))
-      (node x y)
-      (error 'bad "")))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/both-recursive-types.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/both-recursive-types.rkt
deleted file mode 100644
index 29283af824..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/both-recursive-types.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang typed/racket
-
-;; Make sure that recursive types defined using
-;; different recursion methods are compatible with
-;; each other
-
-(define-type (L1 A) (U Null (Pairof A (L1 A))))
-(define-type (L2 A) (Rec X (U Null (Pairof A X))))
-(define-type (L3 A) (Rec X (U Null (Pairof A (L3 A)))))
-
-(: x (L1 Integer))
-(define x '(1 2 3))
-
-(: y (L2 Number))
-(define y x)
-
-(: z (L3 Number))
-(define z x)
-
-(: a (Listof Number))
-(define a x)
-
-(: b (L1 Number))
-(define b a)
-
-(: c (L1 Number))
-(define c y)
-
-(: d (L1 Number))
-(define d z)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/box-num.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/box-num.rkt
deleted file mode 100644
index c0e3742820..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/box-num.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed-scheme
-
-(let: ([x : (Boxof Number) (box 1)]) x)
-
-(let ()
-  (: x (Boxof Number))
-  (define x (box 1))
-  x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/broken-let-syntax.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/broken-let-syntax.rkt
deleted file mode 100644
index 07e3b6defb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/broken-let-syntax.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed-scheme
-
-(let: ([x : Number 1])
-      (let-syntax ([m (syntax-rules ()
-			[(_) x])])
-	(m)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/call-comp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/call-comp.rkt
deleted file mode 100644
index 8f90e4339d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/call-comp.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang typed/racket
-
-(require racket/control)
-
-(: tag (Prompt-Tagof Integer (Integer -> Integer)))
-(define tag (make-continuation-prompt-tag))
-
-(call-with-continuation-prompt
- (λ ()
-    (+ 1
-       ((inst call-with-composable-continuation Integer (Integer -> Integer)
-              Integer)
-        (lambda: ([k : (Integer -> Integer)]) (k 1))
-        tag)))
- tag
- (λ: ([x : Integer]) (+ 1 x)))
-
-((inst call/ec Integer Integer Integer) (lambda ([f : (Integer Integer -> Nothing)]) (f 0 1)))
-(let/cc k : (values String Symbol Boolean)
-   (values
-    (+ 5 (k "result arity matters, only first arg can be a different type" 'hahaha #t))
-    'must-be-symbol
-    #f))
-
-(: r : (All (a b ...) (-> a b ... b (values a b ... b))))
-(define (r A . bs) (let/ec break : (values a b ... b) (apply break A bs)))
-(r 0 1 2 3 4 5)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/case-lambda-rest.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/case-lambda-rest.rkt
deleted file mode 100644
index 1fe24b7dac..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/case-lambda-rest.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/load
-
-(module a typed/racket
-  (provide foo)
-  (: foo
-     (case-> 
-       (Number String * -> Number)
-       (Number String String * -> Number)))
-  (define (foo x . args) x))
-
-(require 'a)
-(foo 3 "x")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/case-lambda1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/case-lambda1.rkt
deleted file mode 100644
index fa3cb79c80..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/case-lambda1.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/racket
-
-
-(: f (case->
-       (String Symbol * -> (U String Symbol))))
-(define f
-  (case-lambda
-    (w (first w))))
-
-(f "x" 'y)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cast-mod.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cast-mod.rkt
deleted file mode 100644
index 2b3c475892..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cast-mod.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket/base
-
-(cast 2 Number)
-(cast 2 Integer)
-(cast (list 2 4) (Listof Byte))
-(cast (vector 2 4) (Vectorof Byte))
-
-
-((cast (lambda (x) 7) (String -> Number)) "seven")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cast-no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cast-no-check.rkt
deleted file mode 100644
index d8b4bb3e6b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cast-no-check.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/racket/no-check
-
-(cast 5 Number)
-(cast 5 String)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cast-top-level.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cast-top-level.rkt
deleted file mode 100644
index b55f91f7f8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cast-top-level.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/load
-
-(require typed/racket/base)
-
-(cast 2 Number)
-(cast 2 Integer)
-(cast (list 2 4) (Listof Byte))
-(cast (vector 2 4) (Vectorof Byte))
-
-
-((cast (lambda (x) 7) (String -> Number)) "seven")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/check-expect.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/check-expect.rkt
deleted file mode 100644
index 2d52564c04..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/check-expect.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/scheme
-
-(require typed/test-engine/scheme-tests)
-(check-expect 3 4)
-
-(test)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/check-within.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/check-within.rkt
deleted file mode 100644
index c0ab86669b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/check-within.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#lang typed-scheme
-
-(require scheme/math typed/test-engine/scheme-tests)
-
-(define-struct: circle ({radius : Number}))
-(: circle-area (circle -> Number))
-
-(check-within (+ 1 2.14) pi .1)
-(check-range 2 1 3)
-(check-member-of 'a 'b 'c 'd 'a 'z)
-(check-error (error "fail") "fail")
-
-(define (circle-area c)
- (* pi (circle-radius c) (circle-radius c)))
-
-(test)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cl-bug.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cl-bug.rkt
deleted file mode 100644
index c5de036e14..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cl-bug.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed-scheme
-
-(: f (case-lambda (Integer * -> Integer) (Number * -> Number)))
-(define (f . x) (+ 1 2))
-
-(: f4 (case-lambda (Integer * -> Integer) (Number * -> Number)))
-(define (f4 . x) (apply + x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cl-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cl-tests.rkt
deleted file mode 100644
index 801b71ffe3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cl-tests.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang typed-scheme
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias top Any)
-
-(define: a : (number -> number) (lambda: ([x : number]) x))
-(define: f : (case-lambda (number -> number)
-			  (boolean boolean -> boolean))
-  (case-lambda
-   [(#{x : number}) (add1 x)]
-   [(#{a : boolean} #{b : boolean}) (and a b)]))
-
-(define: f* : (case-lambda (number -> number)
-			   (boolean boolean -> boolean))
-  (case-lambda:
-   [([x : number]) (add1 x)]
-   [([a : boolean] [b : boolean]) (and a b)]))
-
-(f 5)
-
-(f #t #f)
-
-#;(f #t)
-
-(define-type-alias idfunty (All (a) (a -> a)))
-(define-type-alias (idfunty2 a) (a -> a))
-
-(define: g : (idfunty number) (lambda: ([x : number]) x))
-
-(define: (h [f : (idfunty number)]) : number (f 5))
-(define: (h* [f : (idfunty2 number)]) : number (f 5))
-
-(h f*)
-(h* f*)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cl.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cl.rkt
deleted file mode 100644
index f7acfb1b43..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cl.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed-scheme
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias top Any)
-
-(define: f : (case-lambda [number -> number] [boolean boolean -> boolean])
-  (case-lambda [(#{a : number}) a]
-	       [(#{b : boolean} #{c : boolean}) (and b c)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cmdline.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cmdline.rkt
deleted file mode 100644
index 9dd293c1b4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cmdline.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang typed-scheme
-
-(require scheme/cmdline)
-
-(: version-str String)
-(define version-str "0.1")
-
-(current-command-line-arguments (vector "counter.mch"))
-
-(: verbose-mode (Parameter Boolean))
-(define verbose-mode (make-parameter #f))
-
-(: optimize-level (Parameter Integer))
-(define optimize-level (make-parameter 0))
-
-(: model-checking-mode (Parameter Any))
-(define model-checking-mode (make-parameter 'sat))
-
-(: file-to-model-check String)
-(define file-to-model-check
- (command-line
-  #:program "eboc" ;; Should be name of executable
-  #:once-each
-  [("-v" "--verbose") "Compile with verbose messages"
-                      (verbose-mode #t)]
-  [("-m" "--mode") #{mode : String} "Mode to run the model checker on (sat, satbin)"
-                   (model-checking-mode (string-append mode))]
-  #:once-any
-  [("-o" "--optimize-1") "Compile with optimization level 1"
-                         (optimize-level 1)]
-  ["--optimize-2"        (; show help on separate lines
-                          "Compile with optimization level 2,"
-                          "which includes all of level 1")
-                         (optimize-level 2)]
-
-  #:args (#{filename : String}) ; expect one command-line argument: <filename>
-  ; return the argument as a filename to compile
-  filename))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/continuation-mark.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/continuation-mark.rkt
deleted file mode 100644
index fbf96bfadd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/continuation-mark.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/load
-
-;; successful typed-untyped interaction with cont marks
-
-(module typed typed/racket
-  (provide call-f)
-
-  (: key (Continuation-Mark-Keyof String))
-  (define key (make-continuation-mark-key))
-
-  (: call-f (((Continuation-Mark-Keyof String) -> String) -> String))
-  (define (call-f f)
-    (with-continuation-mark key "hello" (f key))))
-
-(module untyped racket
-  (require 'typed)
-
-  (call-f
-   (λ (key)
-     (string-append (continuation-mark-set-first #f key)
-                    " world"))))
-
-(require 'untyped)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/contract-opt+kw.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/contract-opt+kw.rkt
deleted file mode 100644
index d7151db8ad..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/contract-opt+kw.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/load
-
-(module defs typed/racket
-  (provide (all-defined-out))
-
-  (: foo (case-> ([#:extra Integer] -> Integer)
-                 (Integer [#:extra Integer] -> Integer)))
-  (define (foo [x 0] #:extra [y 0]) (+ x y))
-
-  ;; this is not contractable, yet (keywords not the same)
-  (: bar (case-> (Integer [#:extra Integer] -> Integer)
-                 (Integer [#:extra String]  -> Integer)))
-  (define (bar x #:extra [y "a"]) (+ x (if (integer? y) y (string-length y))))
-
-  (: baz (case-> (#:extra Integer -> Integer)
-                 (Integer #:extra Integer -> Integer)))
-  (define (baz [x 0] #:extra y) (+ x y))
-
-  (: qux (case-> (#:extra Integer [#:super-extra Integer] -> Integer)
-                 (Integer #:extra Integer [#:super-extra Integer] -> Integer)))
-  (define (qux [x 0] #:extra y #:super-extra [z 0]) (+ x y z)))
-
-(require 'defs)
-(foo)
-(foo 1)
-(foo #:extra 1)
-(foo 1 #:extra 1)
-
-; (bar 3) ; not contractable
-
-(baz #:extra 1)
-(baz 1 #:extra 1)
-
-(qux #:extra 1)
-(qux 1 #:extra 1)
-(qux #:extra 1 #:super-extra 2)
-(qux 1 #:extra 1 #:super-extra 3)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/contract-struct-equality.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/contract-struct-equality.rkt
deleted file mode 100644
index 9fec887527..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/contract-struct-equality.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/load
-
-(module typed typed/racket
- (provide g)
- (struct: (A) foo ((v : A)))
- (: f (foo Byte))
- (define f (foo 2))
- (: g (-> (foo Byte)))
- (define (g) f))
-
-(module typed-client typed/racket
-  (require 'typed)
-  (unless (equal? (g) (g))
-    (error 'typed2 "Failed")))
-
-
-(module untyped-client racket
-  (require 'typed)
-  (unless (equal? (g) (g))
-    (error 'typed2 "Failed")))
-
-(require 'typed-client)
-(require 'untyped-client)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cps.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cps.rkt
deleted file mode 100644
index 9e919db339..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cps.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang typed/scheme
-
-;; variables
-(define-type Var Symbol)
-(define-type UserVar Var)
-(define-struct: ContVar ([v : Var]))
-(define-type AnyVar (U UserVar ContVar))
-
-;; constructors
-(define-struct: (V A) lamV ([x : V] [b : A]))
-(define-struct: (A B) app ([rator : A] [rand : B]))
-
-(define-type (lam A) (lamV Var A))
-(define-type (lamC A) (lamV ContVar A))
-
-;; non-partitioned CPS (from Dimitrios Vardoulakis)
-(define-type Λ (Rec L (U Var (lam L) (app L L))))
-(define-type Uv (Rec Uv
-                     (U Var (lam (lam (U (app (app Uv Uv) (Rec Cv (U Var (lam (U (app (app Uv Uv) Cv)
-                                                                                 (app Cv Uv))))))
-                                         (app (Rec Cv (U Var (lam (U (app (app Uv Uv) Cv)
-                                                                     (app Cv Uv)))))
-                                              Uv)))))))
-
-(define-type Cv (Rec Cv (U Var (lam (U (app (app Uv Uv) Cv)
-                                       (app Cv Uv))))))
-(define-type Call (U (app (app Uv Uv) Cv)
-                     (app Cv Uv)))
-(define-type CPS (U Cv Uv Call))
-
-(: f (CPS -> Λ))
-(define (f x) x)
-
-;; partitioned CPS (from Sabry and Felleisen LaSC 93)
-(define-type Λ2 (Rec L (U AnyVar (lamV AnyVar L) (app L L))))
-
-(define-type K (Rec K (U ContVar (app (U Var (lamC K)) K) (lam (app K (U Var (lamC K)))))))
-(define-type P (app K (U Var (lamC K))))
-(define-type W (U Var (lamC K)))
-
-(: f* (P -> Λ2))
-(define (f* x) x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/curry.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/curry.rkt
deleted file mode 100644
index 49894d74f7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/curry.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang typed/racket
-
-(: f2 (Boolean Integer Integer -> Integer))
-(define (f2 add? i1 i2)
-  (if add?
-      (+ i1 i2)
-      (- i1 i2)))
-
-(: f3 (Boolean Integer Integer Integer -> Integer))
-(define (f3 add? i1 i2 i3)
-  (if add?
-      (+ i1 i2 i3)
-      (- i1 i2 i3)))
-
-(define f1a (curry f2 #t))
-(define f1b (curry f3 #t))
-(define f2a (curry f2))
-(define f2b (curry f3))
-
-(f2 #t 2 3)
-(f2 #f 2 1)
-(f1a 10 20)
-(f1b 10 20 30)
-((f2a #t) 10 20)
-((f2b #t) 10 20 30)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/custodian.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/custodian.rkt
deleted file mode 100644
index 49571f1377..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/custodian.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-
-;; Make sure the Custodian type is bound
-
-(: cust Custodian)
-(define cust (current-custodian))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/custom-printer.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/custom-printer.rkt
deleted file mode 100644
index 50675788ab..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/custom-printer.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/racket
-;; This test ensures that there is some way to customize struct
-;; printouts -- if properties are removed or changed, there should be
-;; some way to do something equivalent to what's done in this test.
-(require mzlib/pconvert-prop)
-(struct: foo ()
-  #:property prop:custom-print-quotable 'never
-  #:property prop:print-convert-constructor-name 'foo
-  #:property prop:custom-write (λ (x p w?) (display "#foo" p)))
-(unless (equal? "#foo #foo" (format "~a ~s" (foo) (foo)))
-  (error "bad output"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cyclic-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cyclic-list.rkt
deleted file mode 100644
index 18e84f3f6c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/cyclic-list.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket
-
-(define-type CyclicSymbols (Rec X (Pair Symbol X)))
-
-(: mycar : (CyclicSymbols -> Symbol))
-(define (mycar lst)
-  (car lst))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/datum-to-syntax.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/datum-to-syntax.rkt
deleted file mode 100644
index e162861d2b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/datum-to-syntax.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed/scheme
-
-(: convert (Number -> Syntax))
-(define (convert n) (datum->syntax #f n))
-
-(: convert/loc (Number Syntax -> Syntax))
-(define (convert/loc n loc) (datum->syntax #f n loc))
-
-(: convert/prop (Number Syntax -> Syntax))
-(define (convert/prop n prop) (datum->syntax #f n #f prop))
-
-(: convert/cert (Number Syntax -> Syntax))
-(define (convert/cert n cert) (datum->syntax #f n #f #f cert))
-
-(convert 3)
-(convert/loc 3 #'loc)
-(convert/prop 3 #'prop)
-(convert/cert 3 #'cert)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/def-pred.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/def-pred.rkt
deleted file mode 100644
index 6d54886def..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/def-pred.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/scheme
-
-(define-predicate int-or-bool? (U Integer Boolean))
-
-(int-or-bool? 7)
-
-(define-predicate int-list? (Rec List (Pair Integer (U '() List))))
-(int-list? 1)
-(int-list? '(1 2 3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/define-forward-reference.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/define-forward-reference.rkt
deleted file mode 100644
index 6441e6862a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/define-forward-reference.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang typed/racket
-
-;; Test forward references to definitions that occur later in
-;; the file (with an annotation) but are referred to from a
-;; definition earlier in the file
-
-(define (f x) (g x))
-
-(: g (-> Any String))
-(define (g x) "hello world")
-
-;;;
-
-(define c%
-  (class object%
-    (super-new)
-    (define/public (m x)
-      (g1 x))))
-
-(: g1 (-> Any String))
-(define (g1 x) "hello world")
-
-;;;
-
-(define (f2 x) (h2 "foo"))
-(define (g2 x) (h2 "bar"))
-
-(: h2 (-> String String))
-(define (h2 x) (string-append x "baz"))
-
-;;; PR 11544
-
-(define (some/function x) constant)
-(: constant Any)
-(define constant 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/define-poly-value.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/define-poly-value.rkt
deleted file mode 100644
index c498313e64..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/define-poly-value.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket
-
-;; Test the define: non-function form
-
-(define: (a) x : (Sequenceof a) empty-sequence)
-(define: (a) f : (Integer a -> (Vectorof a)) make-vector)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/define-type-omit-define.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/define-type-omit-define.rkt
deleted file mode 100644
index 4b1355261c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/define-type-omit-define.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket
-
-(define-syntax (x stx) #'5)
-
-(define-type x Number #:omit-define-syntaxes)
-
-(ann 7 x)
-
-(add1 x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/discrete-dist.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/discrete-dist.rkt
deleted file mode 100644
index 2c5caf5a4a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/discrete-dist.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang typed/racket
-
-;; A test case boiled down from code in the math collection
-
-(require racket/promise)
-
-(: sequence->normalized-weighted-samples
-   (All (A) (Symbol (Sequenceof A) -> (Values (Listof A) (Listof Positive-Flonum)))))
-(define (sequence->normalized-weighted-samples name xs)
-  ;; the implementation of this is not important for this test
-  (values (sequence->list xs) '(1.0)))
-
-(: discrete-dist
-   ;; the case-> type here causes the problem
-   (All (A) (case-> ((Sequenceof A) -> (Sequenceof A))
-                    ((Sequenceof A) (Option (Sequenceof Real)) -> (Sequenceof A)))))
-(define (discrete-dist xs [ws #f])
-  (let-values ([(xs _) (sequence->normalized-weighted-samples 'discrete-dist xs)])
-    ;; the bug this test is supposed to catch causes the
-    ;; following annotation to fail due to two type variables
-    ;; not being equal
-    (ann xs (Listof A))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/do.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/do.rkt
deleted file mode 100644
index 61cbea4e5d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/do.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang typed-scheme
-
-(define-type-alias Nb Number)
-
-(let: ([x : Nb 3]) x)
-
-(let ([x '(1 3 5 7 9)])
-  (let: doloop : Nb
-	([x : (Listof Nb) x]
-	 [sum : Number 0])
-	(if (null? x) sum
-	    (doloop (cdr x) (+ sum (car x))))))
-
-(let ((x '(1 3 5 7 9)))
-  (do: : Nb ((x : (Listof Nb) x (cdr x))
-	     (sum : Number 0 (+ sum (car x))))
-       ((null? x) sum)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/dot-intro.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/dot-intro.rkt
deleted file mode 100644
index 1d0dd5337b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/dot-intro.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang typed-scheme
-
-(define x
-  (plambda: (a ...) ([x : Number] . [y : Number ... a])
-    (ormap zero? (map add1 y))))
-
-(define y
-  (plambda: (a ...) ([x : Number] . [y : a ... a])
-    (ormap null? (map list y))))
-
-(define y*
-  (plambda: (a ...) ([x : Number] . [y : a ... a])
-    (andmap null? (map list y))))
-
-
-(plambda: (a ...) ([x : Number] . [y : Number ... a])
-  y)
-
-(plambda: (a ...) ([x : Number] . [y : Number ... a])
-  (map add1 y))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/dotted-identity.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/dotted-identity.rkt
deleted file mode 100644
index 78a839766b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/dotted-identity.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed-scheme
-
-(: f (All (a ...) ((a ... a -> Integer) -> (a ... a -> Integer))))
-(define (f x) x)
-
-(: y (Integer Integer -> Integer))
-(define (y a b) (+ a b))
-
-#{(f y) :: (Integer Integer -> Integer)}
-
-(: z (Integer * -> Integer))
-(define (z . xs) (apply + xs))
-
-((f z) 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18)
-
-(f z)
-
-#{(f z) :: (Integer * -> Integer)}
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/dotted-identity2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/dotted-identity2.rkt
deleted file mode 100644
index c00f16b91a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/dotted-identity2.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed-scheme
-
-;; I don't believe the below should work, but it points out where that internal error is coming from.
-
-(: f (All (a ...) ((a ... a -> Integer) -> (a ... a -> Integer))))
-(define (f x) x)
-
-(: g (All (b ...) ( -> (b ... b -> Integer))))
-(define (g) (lambda xs 0))
-
-(f (g))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/empty-case-arrow.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/empty-case-arrow.rkt
deleted file mode 100644
index 0996ea405a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/empty-case-arrow.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed/racket
-(: f (case->))
-(define (f x) 0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/empty-or.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/empty-or.rkt
deleted file mode 100644
index e4292b89aa..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/empty-or.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang typed-scheme
-
-(require scheme/bool scheme/list typed/test-engine/scheme-tests)
-
-(define-type-alias Atom (U Number #f))
-
-(: mrg ([Listof Atom] [Listof Atom] -> [Listof Number]))
-;; add corresponding numbers, drop false, stop at end of shortest list
-
-(check-expect (mrg (list 1 false 2) (list 3 4 5 false 10)) (list 4 4 7))
-
-(define (mrg l k)
- (cond
-   [(or (empty? l) (empty? k))
-    empty]
-   [(and (not (car l)) (not (car k)))
-    (cons 0 (mrg (rest l) (rest k)))]
-   [(not (car l))
-    (cons (car k) (mrg (rest l) (rest k)))]
-   [(not (car k))
-    (cons (car l) (mrg (rest l) (rest k)))]
-   [else
-    (cons (+ (car l) (car k)) (mrg (rest l) (rest k)))]))
-
-(test)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/ephemerons.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/ephemerons.rkt
deleted file mode 100644
index 0e6b80f40f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/ephemerons.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/scheme
-
-(define key (gensym))
-
-(: eph-one (Ephemeronof Integer))
-(define eph-one (make-ephemeron key 1))
-
-(ephemeron? eph-one)
-
-(ephemeron-value eph-one)
-
-(: get-number ((Ephemeronof Number) -> Number))
-(define (get-number e)
- (or (ephemeron-value e) 0))
-
-(get-number eph-one)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/even-odd-recursive-type.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/even-odd-recursive-type.rkt
deleted file mode 100644
index 0902cb8bdb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/even-odd-recursive-type.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket
-
-(require rackunit)
-
-(module num-even/odd typed/racket
-  (define-type Even (U Null (Pairof Number Odd)))
-  (define-type Odd (Pairof Number Even))
-
-  (: even-lst Even)
-  (define even-lst '(1 2 3 4))
-
-  (: odd-lst Odd)
-  (define odd-lst '(1 2 3)))
-
-(module poly-even/odd typed/racket
-  (define-type (Even A) (U Null (Pairof A (Odd A))))
-  (define-type (Odd A) (Pairof A (Even A)))
-
-  (: even-lst (Even Integer))
-  (define even-lst '(1 2 3 4))
-
-  (: odd-lst (Odd Integer))
-  (define odd-lst '(1 2 3))
-
-  (: even->odd (All (A) (A (Even A) -> (Odd A))))
-  (define (even->odd elem lst)
-    (cons elem lst))
-
-  (provide even->odd Even Odd even-lst odd-lst))
-
-;; make sure it works in a let
-(module let-even/odd typed/racket
-  (let ()
-    (define-type (Even A) (U Null (Pairof A (Odd A))))
-    (define-type (Odd B) (Pairof B (Even B)))
-
-    (: even-lst (Even Integer))
-    (define even-lst '(1 2 3 4))
-
-    (: odd-lst (Odd Integer))
-    (define odd-lst '(1 2 3))
-
-    (cons 3 even-lst)))
-
-(module even/odd* typed/racket
-  ;; weird variant that alternates types between
-  ;; Even and Odd
-  (define-type (Even A B) (U Null (Pairof A (Odd A B))))
-  (define-type (Odd A B) (Pairof B (Even A B)))
-
-  (: even-lst (Even Integer String))
-  (define even-lst '(1 "b" 3 "a"))
-
-  (: odd-lst (Odd Integer String))
-  (define odd-lst '("b" 2 "a"))
-
-  ;; specialized for more interesting contract
-  (: even->odd (String (Even Integer String) -> (Odd Integer String)))
-  (define (even->odd elem lst) (cons elem lst))
-
-  (provide even-lst odd-lst even->odd))
-
-(require (prefix-in a: 'num-even/odd))
-(require (prefix-in b: 'poly-even/odd))
-(require (prefix-in c: 'let-even/odd))
-(require (prefix-in d: 'even/odd*))
-
-;; make sure contract generation on even/odd* worked
-(cons 3 d:odd-lst)
-(check-equal? (d:even->odd "c" d:even-lst) '("c" 1 "b" 3 "a"))
-(check-exn exn:fail:contract? (λ () (d:even->odd 1 d:even-lst)))
-
-(b:even->odd "c" b:even-lst)
-(check-exn exn:fail:contract? (λ () (b:even->odd "c" b:odd-lst)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/even-odd.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/even-odd.rkt
deleted file mode 100644
index 8a0de924a4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/even-odd.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang typed/scheme
-
-(define-struct: (A) Z ([b : A]))
-(define-struct: (A) O ([b : A]))
-
-(define-type Bitstring (Rec B (U '() (Z B) (O B))))
-(define-type EvenParity (Rec Even (U '() (Z Even) (O (Rec Odd (U (Z Odd) (O Even)))))))
-(define-type OddParity (Rec Odd (U (Z Odd) (O (Rec Even (U '() (Z Even) (O Odd)))))))
-
-(define: x : (Z EvenParity) (make-Z null))
-(Z-b x)
-
-
-(: append-one (case-lambda (EvenParity -> OddParity)
-                           (OddParity -> EvenParity)
-                           (Bitstring -> Bitstring)))
-(define (append-one l)
-  (if (null? l)
-      (make-O '())
-      (if (Z? l)
-          (make-Z (append-one (Z-b l)))
-          (make-O (append-one (O-b l))))))
-
-(: bs-id (Bitstring -> Bitstring))
-(define (bs-id x) x)
-
-(define: z : Bitstring (bs-id (append-one null)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/events-with-async-channel.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/events-with-async-channel.rkt
deleted file mode 100644
index 60c163a2b0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/events-with-async-channel.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang typed/racket
-(require typed/racket/async-channel)
-
-;; Integration test for synchronizable events, using async-channels
-;;
-;; example from unstable/logging
-
-(define-type Log-Receiver-Sync-Result
-  (Vector Symbol String Any (Option Symbol)))
-
-(: receiver-thread
-   (Log-Receiver (Async-Channelof 'stop)
-    (Log-Receiver-Sync-Result -> Void)
-    -> Thread))
-(define (receiver-thread receiver stop-chan intercept)
-  (thread
-   (lambda ()
-     (: clear-events (-> Void))
-     (define (clear-events)
-       (let ([l : (Option Log-Receiver-Sync-Result)
-               (sync/timeout 0 receiver)])
-         (when l ; still something to read
-           (intercept l) ; interceptor gets the whole vector
-           (clear-events))))
-     (let loop ()
-       (let ([l : (U Log-Receiver-Sync-Result 'stop)
-               (sync receiver stop-chan)])
-         (cond [(eq? l 'stop)
-                ;; we received all the events we were supposed
-                ;; to get, read them all (w/o waiting), then
-                ;; stop
-                (clear-events)]
-               [else ; keep going
-                (intercept l)
-                (loop)]))))))
-
-(struct: listener ([stop-chan : (Async-Channelof 'stop)]
-                   ;; ugly, but the thread and the listener need to know each
-                   ;; other
-                   [thread : (Option Thread)]
-                   [rev-messages : (Listof Log-Receiver-Sync-Result)]
-                   [done? : Any])
-          #:mutable)
-
-(: start-recording (Log-Level -> listener))
-(define (start-recording log-level)
-  (let* ([receiver     (make-log-receiver (current-logger) log-level)]
-         [stop-chan    ((inst make-async-channel 'stop))]
-         [cur-listener (listener stop-chan #f '() #f)]
-         [t (receiver-thread
-             receiver stop-chan
-             (lambda: ([l : Log-Receiver-Sync-Result])
-               (set-listener-rev-messages!
-                cur-listener
-                (cons l (listener-rev-messages cur-listener)))))])
-    (set-listener-thread! cur-listener t)
-    cur-listener))
-
-(: stop-recording (listener -> (Listof Log-Receiver-Sync-Result)))
-(define (stop-recording cur-listener)
-  (define the-thread (listener-thread cur-listener))
-  (unless (or (not the-thread)
-              (listener-done? cur-listener))
-    (async-channel-put (listener-stop-chan cur-listener)
-                 'stop) ; stop the receiver thread
-    (thread-wait the-thread)
-    (set-listener-done?! cur-listener #t))
-  (reverse (listener-rev-messages cur-listener)))
-
-(: with-intercepted-logging
-   (((Vector Symbol String Any (Option Symbol)) -> Void)
-    (-> Void)
-    Log-Level
-    -> Void))
-(define (with-intercepted-logging interceptor proc log-level)
-  (let* ([orig-logger (current-logger)]
-         ;; We use a local logger to avoid getting messages that didn't
-         ;; originate from proc. Since it's a child of the original logger,
-         ;; the rest of the program still sees the log entries.
-         [logger      (make-logger #f orig-logger)]
-         [receiver    (make-log-receiver logger log-level)]
-         [stop-chan   ((inst make-async-channel 'stop))]
-         [t           (receiver-thread receiver stop-chan interceptor)])
-    (begin0
-        (parameterize ([current-logger logger])
-          (proc))
-      (async-channel-put stop-chan 'stop) ; stop the receiver thread
-      (thread-wait t))))
-
-(require typed/rackunit)
-
-;; extracted from unstable/logging tests
-(let ([l (start-recording 'warning)])
-  (log-warning "1")
-  (log-warning "2")
-  (log-warning "3")
-  (log-info "4")
-  (stop-recording l) ; stopping should be idempotent
-  (let ([out (stop-recording l)])
-    (check-equal? (map (lambda: ([l : Log-Receiver-Sync-Result])
-                         (vector-ref l 1)) out)
-                  '("1" "2" "3"))
-    (check-true (andmap (lambda: ([l : Log-Receiver-Sync-Result])
-                          (eq? (vector-ref l 0) 'warning))
-                        out))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/events.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/events.rkt
deleted file mode 100644
index 8366162748..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/events.rkt
+++ /dev/null
@@ -1,105 +0,0 @@
-#lang typed/racket
-
-;; Integration test for synchronizable events
-;;
-;; example from unstable/logging
-
-(define-type Log-Receiver-Sync-Result
-  (Vector Symbol String Any (Option Symbol)))
-
-(: receiver-thread
-   (Log-Receiver (Channelof 'stop)
-    (Log-Receiver-Sync-Result -> Void)
-    -> Thread))
-(define (receiver-thread receiver stop-chan intercept)
-  (thread
-   (lambda ()
-     (: clear-events (-> Void))
-     (define (clear-events)
-       (let: ([l : (Option Log-Receiver-Sync-Result)
-               (sync/timeout 0 receiver)])
-         (when l ; still something to read
-           (intercept l) ; interceptor gets the whole vector
-           (clear-events))))
-     (let loop ()
-       (let: ([l : (U Log-Receiver-Sync-Result 'stop)
-               (sync receiver stop-chan)])
-         (cond [(eq? l 'stop)
-                ;; we received all the events we were supposed
-                ;; to get, read them all (w/o waiting), then
-                ;; stop
-                (clear-events)]
-               [else ; keep going
-                (intercept l)
-                (loop)]))))))
-
-(struct: listener ([stop-chan : (Channelof 'stop)]
-                   ;; ugly, but the thread and the listener need to know each
-                   ;; other
-                   [thread : (Option Thread)]
-                   [rev-messages : (Listof Log-Receiver-Sync-Result)]
-                   [done? : Any])
-          #:mutable)
-
-(: start-recording (Log-Level -> listener))
-(define (start-recording log-level)
-  (let* ([receiver     (make-log-receiver (current-logger) log-level)]
-         [stop-chan    ((inst make-channel 'stop))]
-         [cur-listener (listener stop-chan #f '() #f)]
-         [t (receiver-thread
-             receiver stop-chan
-             (lambda: ([l : Log-Receiver-Sync-Result])
-               (set-listener-rev-messages!
-                cur-listener
-                (cons l (listener-rev-messages cur-listener)))))])
-    (set-listener-thread! cur-listener t)
-    cur-listener))
-
-(: stop-recording (listener -> (Listof Log-Receiver-Sync-Result)))
-(define (stop-recording cur-listener)
-  (define the-thread (listener-thread cur-listener))
-  (unless (or (not the-thread)
-              (listener-done? cur-listener))
-    (channel-put (listener-stop-chan cur-listener)
-                 'stop) ; stop the receiver thread
-    (thread-wait the-thread)
-    (set-listener-done?! cur-listener #t))
-  (reverse (listener-rev-messages cur-listener)))
-
-(: with-intercepted-logging
-   (((Vector Symbol String Any (Option Symbol)) -> Void)
-    (-> Void)
-    Log-Level
-    -> Void))
-(define (with-intercepted-logging interceptor proc log-level)
-  (let* ([orig-logger (current-logger)]
-         ;; We use a local logger to avoid getting messages that didn't
-         ;; originate from proc. Since it's a child of the original logger,
-         ;; the rest of the program still sees the log entries.
-         [logger      (make-logger #f orig-logger)]
-         [receiver    (make-log-receiver logger log-level)]
-         [stop-chan   ((inst make-channel 'stop))]
-         [t           (receiver-thread receiver stop-chan interceptor)])
-    (begin0
-        (parameterize ([current-logger logger])
-          (proc))
-      (channel-put stop-chan 'stop) ; stop the receiver thread
-      (thread-wait t))))
-
-(require typed/rackunit)
-
-;; extracted from unstable/logging tests
-(let ([l (start-recording 'warning)])
-  (log-warning "1")
-  (log-warning "2")
-  (log-warning "3")
-  (log-info "4")
-  (stop-recording l) ; stopping should be idempotent
-  (let ([out (stop-recording l)])
-    (check-equal? (map (lambda: ([l : Log-Receiver-Sync-Result])
-                         (vector-ref l 1)) out)
-                  '("1" "2" "3"))
-    (check-true (andmap (lambda: ([l : Log-Receiver-Sync-Result])
-                          (eq? (vector-ref l 0) 'warning))
-                        out))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/exceptions.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/exceptions.rkt
deleted file mode 100644
index 797945ff48..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/exceptions.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang typed/racket
-
-(: abort (Parameter (Any -> Nothing)))
-
-(define abort (make-parameter (lambda (x) (error 'abort))))
-
-(define-syntax (with-abort stx)
- (syntax-case stx ()
-  ((_ body ...)
-   #'(call/cc (lambda: ((k : (Any -> Nothing)))
-                (parameterize ((abort k))
-                  body ...))))))
-
-(call-with-exception-handler
- (lambda (v) (displayln v) ((abort) v))
- (lambda ()
-  (with-abort 2)
-  (with-abort (raise 3))
-  (with-abort (error 'foo))
-  (with-abort (error 'foo "Seven"))
-  (with-abort (error 'foo "Seven ~a" 5))
-  (with-abort (raise-user-error 'foo))
-  (with-abort (raise-user-error 'foo "Seven"))
-  (with-abort (raise-user-error 'foo "Seven ~a" 5))
-  (with-abort (raise-type-error 'slash "foo" 1))
-  (with-abort (raise-type-error 'slash "foo" 1 #\a #\c))
-
-  (with-abort (raise-mismatch-error 'er "foo" 2))
-
-  (with-abort (raise-syntax-error #f "stx-err"))
-  (with-abort (raise-syntax-error #f "stx-err" 45))
-  (with-abort (raise-syntax-error #f "stx-err" 4 5))
-  (with-abort (raise-syntax-error #f "stx-err" 4 5 (list #'stx)))
-
-  (void)
-  ))
-
-(parameterize ((uncaught-exception-handler (lambda (x) ((abort) x)))
-               (error-escape-handler (lambda () (void)))
-               (error-display-handler (lambda: ((s : String) (e : Any)) (void)))
-               (error-print-width 4)
-               (error-print-context-length 10)
-               (error-value->string-handler (lambda: ((v : Any) (n : Natural)) "str"))
-               (error-print-source-location 'yes))
- (void))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fix.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fix.rkt
deleted file mode 100644
index 508423eadf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fix.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang typed-scheme
-
-(: make-recursive : (All (S T) (((S -> T) -> (S -> T)) -> (S -> T))))
-(define (make-recursive f)
-  (define-type-alias Tau (Rec Tau (Tau -> (S -> T))))
-  ((lambda: ([x : Tau]) (f (lambda: ([z : S]) ((x x) z))))
-   (lambda: ([x : Tau]) (f (lambda: ([z : S]) ((x x) z))))))
-
-(: fact : (Number -> Number))
-(define fact (make-recursive
-              (lambda: ([fact : (Number -> Number)])
-                (lambda: ([n : Number])
-                  (if (zero? n)
-                      1
-                      (* n (fact (- n 1))))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fixnum.rkt
deleted file mode 100644
index e679832eeb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fixnum.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang typed/scheme
-
-(require
- scheme/fixnum)
-
-;; Test the all the fixnum operations have been wrapped with types
-
-;; We aren't really testing the semantics of the
-;; operations. The checks are just to catch anything that is
-;; really badly wrong.
-
-(: check (All (a) ((a a -> Boolean) a a -> Boolean)))
-;; Simple check function as RackUnit doesn't work in Typed Scheme (yet)
-(define (check f a b)
-  (if (f a b)
-      #t
-      (error (format "Check (~a ~a ~a) failed" f a b))))
-
-(check = (fx+ 1 2) 3)
-(check = (fx- 2 3) -1)
-(check = (fx* 2 4) 8)
-(check = (fxquotient 4 2) 2)
-(check = (fxremainder 4 3) 1)
-(check = (fxmodulo 10 3) 1)
-(check = (fxabs -1) 1)
-(check = (fxand 2 4) (bitwise-and 2 4))
-(check = (fxior 2 4) (bitwise-ior 2 4))
-(check = (fxxor 3 5) (bitwise-xor 3 5))
-(check = (fxnot 4) (bitwise-not 4))
-(check = (fxlshift 4 2) (arithmetic-shift 4 2))
-(check = (fxrshift 32 2) (arithmetic-shift 32 -2))
-
-(check equal? (fx= 1 1) #t)
-(check equal? (fx< 2 4) #t)
-(check equal? (fx> 4 2) #t)
-(check equal? (fx<= 2 2) #t)
-(check equal? (fx>= 4 4) #t)
-(check equal? (fxmin 3 2) 2)
-(check equal? (fxmax 3 4) 4)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/float-internal-err.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/float-internal-err.rkt
deleted file mode 100644
index 77c633ad6c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/float-internal-err.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed/scheme
-
-(require racket/flonum)
-
-(define-syntax FLOAT*    (syntax-rules () ((FLOAT* x ...) (ann (* (ann x Float) ...) Float))))
-(define-syntax FLOATsin  (syntax-rules () ((FLOATsin  x)  (ann (flsin (ann x Float)) Float))))
-
-(: tfo-align Any)
-(define (tfo-align) 0.0
-
- (let* ((x (FLOAT* 0.0 (FLOATsin 0.))))
-   0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/flonum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/flonum.rkt
deleted file mode 100644
index e09fe2bfcb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/flonum.rkt
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang typed/racket
-
-(require
- racket/flonum
- racket/extflonum
- racket/unsafe/ops)
-
-(: check (All (a) ((a a -> Boolean) a a -> Boolean)))
-;; Simple check function as RackUnit doesn't work in Typed Scheme (yet)
-(define (check f a b)
-  (if (f a b)
-      #t
-      (error (format "Check (~a ~a ~a) failed" f a b))))
-
-(: check-pred (All (a) ((a -> Boolean) a -> Boolean)))
-(define (check-pred pred v)
-  (if (pred v)
-      #t
-      (error (format "Check predicate (~a ~a) failed" pred v))))
-
-(: true? (Any -> Boolean))
-(define (true? x)
-  (if x #t #f))
-
-;; Check that flonum (safe and unsafe) functions work as expected
-
-(check = (flabs 1.45) (unsafe-flabs 1.45))
-(check = (fl+ 1.45 2.36) (unsafe-fl+ 1.45 2.36))
-(check = (fl- 1.45 2.36) (unsafe-fl- 1.45 2.36))
-(check = (fl* 1.45 2.36) (unsafe-fl* 1.45 2.36))
-(check = (fl/ 1.45 2.36) (unsafe-fl/ 1.45 2.36))
-(check-pred true? (fl= 1.45 1.45))
-(check-pred true? (fl<= 1.45 1.45))
-(check-pred true? (fl>= 1.45 1.45))
-(check-pred true? (fl> 1.45 1.36))
-(check-pred true? (fl< 1.36 1.45))
-(check-pred true? (unsafe-fl= 1.45 1.45))
-(check-pred true? (unsafe-fl<= 1.45 1.45))
-(check-pred true? (unsafe-fl>= 1.45 1.45))
-(check-pred true? (unsafe-fl> 1.45 1.36))
-(check-pred true? (unsafe-fl< 1.36 1.45))
-(check = (flmin 1.45 2.36) (unsafe-flmin 1.45 2.36))
-(check = (flmax 1.45 2.36) (unsafe-flmax 1.45 2.36))
-(check = (flround 1.45) (unsafe-flround 1.45))
-(check = (flfloor 1.45) (unsafe-flfloor 1.45))
-(check = (flceiling 1.45) (unsafe-flceiling 1.45))
-(check = (fltruncate 1.45) (unsafe-fltruncate 1.45))
-(check = (flsin 1.45) (unsafe-flsin 1.45))
-(check = (flcos 1.45) (unsafe-flcos 1.45))
-(check = (fltan 1.45) (unsafe-fltan 1.45))
-(check = (flatan 1.45) (unsafe-flatan 1.45))
-(check = (flasin .45) (unsafe-flasin .45))
-(check = (flacos .45) (unsafe-flacos .45))
-(check = (fllog 1.45) (unsafe-fllog 1.45))
-(check = (flexp 1.45) (unsafe-flexp 1.45))
-(check = (flsqrt 1.45) (unsafe-flsqrt 1.45))
-(check = (->fl 1) 1.0)
-(check = (unsafe-fx->fl 1) 1.0)
-
-(check extfl= (extflabs 1.45t0) (unsafe-extflabs 1.45t0))
-(check extfl= (extfl+ 1.45t0 2.36t0) (unsafe-extfl+ 1.45t0 2.36t0))
-(check extfl= (extfl- 1.45t0 2.36t0) (unsafe-extfl- 1.45t0 2.36t0))
-(check extfl= (extfl* 1.45t0 2.36t0) (unsafe-extfl* 1.45t0 2.36t0))
-(check extfl= (extfl/ 1.45t0 2.36t0) (unsafe-extfl/ 1.45t0 2.36t0))
-(check-pred true? (extfl= 1.45t0 1.45t0))
-(check-pred true? (extfl<= 1.45t0 1.45t0))
-(check-pred true? (extfl>= 1.45t0 1.45t0))
-(check-pred true? (extfl> 1.45t0 1.36t0))
-(check-pred true? (extfl< 1.36t0 1.45t0))
-(check-pred true? (unsafe-extfl= 1.45t0 1.45t0))
-(check-pred true? (unsafe-extfl<= 1.45t0 1.45t0))
-(check-pred true? (unsafe-extfl>= 1.45t0 1.45t0))
-(check-pred true? (unsafe-extfl> 1.45t0 1.36t0))
-(check-pred true? (unsafe-extfl< 1.36t0 1.45t0))
-(check extfl= (extflmin 1.45t0 2.36t0) (unsafe-extflmin 1.45t0 2.36t0))
-(check extfl= (extflmax 1.45t0 2.36t0) (unsafe-extflmax 1.45t0 2.36t0))
-(check extfl= (extflround 1.45t0) (unsafe-extflround 1.45t0))
-(check extfl= (extflfloor 1.45t0) (unsafe-extflfloor 1.45t0))
-(check extfl= (extflceiling 1.45t0) (unsafe-extflceiling 1.45t0))
-(check extfl= (extfltruncate 1.45t0) (unsafe-extfltruncate 1.45t0))
-(check extfl= (extflsin 1.45t0) (unsafe-extflsin 1.45t0))
-(check extfl= (extflcos 1.45t0) (unsafe-extflcos 1.45t0))
-(check extfl= (extfltan 1.45t0) (unsafe-extfltan 1.45t0))
-(check extfl= (extflatan 1.45t0) (unsafe-extflatan 1.45t0))
-(check extfl= (extflasin .45t0) (unsafe-extflasin .45t0))
-(check extfl= (extflacos .45t0) (unsafe-extflacos .45t0))
-(check extfl= (extfllog 1.45t0) (unsafe-extfllog 1.45t0))
-(check extfl= (extflexp 1.45t0) (unsafe-extflexp 1.45t0))
-(check extfl= (extflsqrt 1.45t0) (unsafe-extflsqrt 1.45t0))
-(check extfl= (->extfl 1) 1.0t0)
-(check extfl= (unsafe-fx->extfl 1) 1.0t0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/flvector.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/flvector.rkt
deleted file mode 100644
index 192e754842..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/flvector.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang typed/scheme
-
-(require
- scheme/flonum
- scheme/unsafe/ops)
-
-;; Test the all the flvector operations have been wrapped with types
-
-;; We aren't really testing the semantics of the
-;; operations. The checks are just to catch anything that is
-;; really badly wrong.
-
-(: check (All (a) ((a a -> Boolean) a a -> Boolean)))
-;; Simple check function as RackUnit doesn't work in Typed Scheme (yet)
-(define (check f a b)
-  (if (f a b)
-      #t
-      (error (format "Check (~a ~a ~a) failed" f a b))))
-
-;; Check the FlVector type is exported
-(define: v : FlVector (flvector 1. 2. 3.))
-(define-struct: Foo ([vec : FlVector]) #:transparent)
-
-(check equal? (flvector 1. 2. 3. 4.) (flvector 1. 2. 3. 4.))
-(check equal? (flvector? (flvector 1. 2. 3.)) #t)
-(check equal? (make-flvector 3 3.0) (flvector 3. 3. 3.))
-(check = (flvector-length (flvector 1. 2. 3.)) 3)
-(check = (flvector-ref (flvector 1. 2. 3.) 0) 1.)
-(check =
-       (let ([v (flvector 1. 2. 3.)])
-         (flvector-set! v 0 10.)
-         (flvector-ref v 0))
-       10.)
-
-;; Unsafe operations
-
-(check = (unsafe-flvector-length (flvector 1. 2. 3.)) 3)
-(check = (unsafe-flvector-ref (flvector 1. 2. 3.) 0) 1.)
-(check =
-       (let ([v (flvector 1. 2. 3.)])
-         (unsafe-flvector-set! v 0 10.)
-         (unsafe-flvector-ref v 0))
-       10.)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fold-left-inst.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fold-left-inst.rkt
deleted file mode 100644
index e8bfbfe046..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fold-left-inst.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang typed-scheme
-
-(: fold-left (All (c a b ...) ((c a b ... b -> c) c (Listof a) (Listof b) ... b -> c)))
-(define (fold-left f c as . bss)
-  (if (or (null? as)
-          (ormap null? bss))
-      c
-      (apply (inst fold-left c a b ... b) f
-             (apply f c (car as) (map car bss))
-             (cdr as) (map cdr bss))))
-
-(: fold-right (All (c a b ...) ((c a b ... b -> c) c (Listof a) (Listof b) ... b -> c)))
-(define (fold-right f c as . bss)
-  (if (or (null? as)
-          (ormap null? bss))
-      c
-      (apply f
-             (apply (inst fold-left c a b ... b) f c (cdr as) (map cdr bss))
-             (car as) (map car bss))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fold-left.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fold-left.rkt
deleted file mode 100644
index 19a1e60b98..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fold-left.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang typed-scheme
-
-(: fold-left (All (c a b ...) ((c a b ... b -> c) c (Listof a) (Listof b) ... b -> c)))
-(define (fold-left f c as . bss)
-  (if (or (null? as)
-          (ormap null? bss))
-      c
-      (apply fold-left f
-             (apply f c (car as) (map car bss))
-             (cdr as) (map cdr bss))))
-
-(: fold-right (All (c a b ...) ((c a b ... b -> c) c (Listof a) (Listof b) ... b -> c)))
-(define (fold-right f c as . bss)
-  (if (or (null? as)
-          (ormap null? bss))
-      c
-      (apply f
-             (apply fold-right f c (cdr as) (map cdr bss))
-             (car as) (map car bss))))
-
-;; Matthias -- tell me why this returns 4.
-((plambda: (x ...) [xs : x ... x]
-    (apply fold-left
-           (lambda: ([a : Integer] [b : Integer] . [xs : x ... x])
-             (+ a b))
-           3
-           (list 1 2 3)
-           (map list xs)))
- 3 4 5)
-
-((plambda: (x ...) [xs : x ... x]
-    (apply fold-right
-           (lambda: ([a : Integer] [b : Integer] . [xs : x ... x])
-             (+ a b))
-           3
-           (list 1 2 3)
-           (map list xs)))
- 3 4 5)
-
-(fold-left  (lambda: ([a : (Listof Integer)] [c : Integer]) (cons c a)) null (list 3 4 5 6))
-(fold-right (lambda: ([a : (Listof Integer)] [c : Integer]) (cons c a)) null (list 3 4 5 6))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/foldo.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/foldo.rkt
deleted file mode 100644
index 37040f6b78..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/foldo.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-(module foldo mzscheme
-  (require (lib "file.rkt") (lib "match.rkt"))
-  (provide apply-to-scheme-files)
-
-   (define-syntax (define-excluder stx)
-
-    (define (path->clause c)
-      (syntax-case c ()
-        [(item ...)
-         #`[`(#,@(reverse (syntax-e #'(item ...))) ,_ (... ...)) #t]]
-        [item
-         #`[`(item) #t]]))
-
-    (syntax-case stx ()
-      [(_ name path ...)
-       (with-syntax ([(match-clause ...) (map path->clause (syntax-e #'(path ...)))])
-         #`(define (name p )
-             (let* ([dirnames (map path->string (explode-path p))])
-               (match (reverse dirnames) ; goofy backwards matching because ... matches greedily
-                 match-clause ...
-                 [_ #f]))))]))
-
-  (define-excluder default-excluder
-    "compiled" ".git")
-
-  (define exclude-directory?  (make-parameter default-excluder))
-
-  ;; ----------------------------------------
-  ;; apply-to-scheme-files: (path[file] -> X) path[directory] -> (listof X)
-  ;; applies the given function to each .rkt or .ss or .scm file in the given
-  ;; directory hierarchy; returns all results in a list
-  (define  (apply-to-scheme-files f root )
-     ;;FOLD-FILES
-
-    (fold-files
-     (lambda (path kind acc)
-       (case kind
-         [(file)
-          (let ([extension (filename-extension path)])
-            (cond
-              [(not extension) acc ]
-              [(regexp-match #rx"(rkt|rktl|ss|scm)$" extension)
-               (let ([resl (f path)])
-                 (if resl
-                     (cons resl acc)
-                     acc ))]
-              [else acc ]))]
-        [(dir)
-          (let* ([p (normalize-path path root)])
-            (if ((exclude-directory?) p)
-              (values acc #f)
-               acc ))]
-         [(link) acc ]
-         [else (error "never happen")]))
-     '()
-      root
-      ))
-  )
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/foo.scm b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/foo.scm
deleted file mode 100644
index 98be94b8d4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/foo.scm
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang scheme/load
-(module m mzscheme
-  (define x 3)
-  (define (y z) (add1 z))
-  (provide (all-defined)))
-
-(module bang-tests typed-scheme
-  (define: x : Number 1)
-  x
-  (provide x)
-  (set! x 4)
-  (when #t 3))
-
-
-(module trequire typed-scheme
-  (require 'bang-tests)
-  (define: y : Number x))
-
-(module require-tests typed-scheme
-  (provide z)
-  (require/typed 'm (x Number))
-  (+ x 3)
-  (require/typed 'm (y (Number -> Number)))
-  (define: z : Number (y (+ x 4))))
-
-
-(module provide-type typed-scheme
-  (define-type-alias top2 Any)
-
-  (define-typed-struct (a) container ([v : a]))
-
-  (container-v (make-container 3))
-
-  (provide top2 container container-v make-container)
-  )
-
-(module require-type typed-scheme
-  (require 'provide-type)
-
-  (let: ([x : top2 3])
-        x)
-
-  (define: (f [x : (container Number)]) : Number
-    (container-v x))
-
-  (f (make-container (ann 7 : Number)))
-
-  )
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-ann.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-ann.rkt
deleted file mode 100644
index 580d12112c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-ann.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed/racket
-
-(ann (for ([#{i : Integer} '(1 2 3)]) (display i)) Void)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-hash.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-hash.rkt
deleted file mode 100644
index 6e15d463d3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-hash.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang typed/racket/base
-
-(require typed/rackunit)
-
-(check-pred
- hash?
- (for/hash: : (HashTable Integer Symbol)
-            ((a (list 1 2 3)))
-  (values a 'a)))
-
-(check-pred
- hash?
- (for/hash: : (HashTable Integer Symbol)
-            ((a (list 1 2 3))
-             (b '(a b c)))
-  (values a b)))
-
-(check-pred
- hash?
- (for*/hasheq: : (HashTable Integer Symbol)
-             ((a (list 1 2 3))
-              (b '(a b c)))
-  (values a b)))
-
-
-(check-pred
- hash-eq?
- (for/hasheq: : (HashTable Integer Symbol)
-            ((a (list 1 2 3)))
-  (values a 'a)))
-
-(check-pred
- hash-eq?
- (for/hasheq: : (HashTable Integer Symbol)
-            ((a (list 1 2 3))
-             (b '(a b c)))
-  (values a b)))
-
-(check-pred
- hash-eq?
- (for*/hasheq: : (HashTable Integer Symbol)
-             ((a (list 1 2 3))
-              (b '(a b c)))
-  (values a b)))
-
-
-(check-pred
- hash-eqv?
- (for/hasheqv: : (HashTable Integer Symbol)
-            ((a (list 1 2 3)))
-  (values a 'a)))
-
-(check-pred
- hash-eqv?
- (for/hasheqv: : (HashTable Integer Symbol)
-            ((a (list 1 2 3))
-             (b '(a b c)))
-  (values a b)))
-
-(check-pred
- hash-eqv?
- (for*/hasheqv: : (HashTable Integer Symbol)
-             ((a (list 1 2 3))
-              (b '(a b c)))
-  (values a b)))
-
-
-
-(for*/hash: : (HashTable Number Number)
-            ((v : Number '(1 2 3))
-             (x : Number '(4 5 6)))
-     (values v x))
-
-
-
-(for/hash: : (HashTable Symbol Symbol)
-    ((v : Symbol '(a b c)))
-  (values v v))
-
-(for/hash: : (HashTable Symbol Symbol)
-    ([(k b) (in-hash (make-immutable-hash '((a . a) (b . b))))])
-  (values k b))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-in-range.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-in-range.rkt
deleted file mode 100644
index be21ba2306..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-in-range.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed/racket
-
-(for: ([i : Integer (in-range 10 0 -1)]) i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-list.rkt
deleted file mode 100644
index f9e8c190b6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-list.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/scheme
-
-(ann (for/list ([z #"foobar"]) (add1 z)) (Listof Integer))
-
-(: explode (String -> (Listof Char)))
-(define (explode s)
-  (for/list ([i s]) i))
-
-(ann 
-  (for*/list: : (Listof Natural)
-    ((x : Natural (list 1 2 4))
-     (y : Natural (list 2 3 4)))
-    (+ x y))
-  (Listof Natural))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-lists.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-lists.rkt
deleted file mode 100644
index 67ab75b7c9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-lists.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed-scheme
-
-(: f ((Listof Number) -> (Listof Number)))
-(define (f x)
-  (for/lists (#{y : (Listof Number)}) ([e (in-list x)])
-             e))
-
-(for/lists: ([a : (Listof Number)])
-  ([e (in-list '(1 2 3))])
-  e)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-no-anns.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-no-anns.rkt
deleted file mode 100644
index 951bc5683a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-no-anns.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/racket
-
-;; test for optional annotation on for:-bound variables
-
-(for: ([i (in-range 10)] ; no annotation
-       [j : Integer (in-range 10 20)])
-      (display (+ i j)))
-
-(for/fold: : Integer ([acc 0])
-           ([i (in-range 10)])
-           (+ i acc))
-
-(let ((x '(1 3 5 7 9)))
-  (do: : Number ((x x (cdr x))
-                 (sum 0 (+ sum (car x))))
-       ((null? x) sum)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-no-body-anns.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-no-body-anns.rkt
deleted file mode 100644
index e1f5ed82b7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-no-body-anns.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket
-
-(ann (for/list ([#{i : Number} (in-list '(1 2 3))]) i) (Listof Number))
-(ann (for/list: ([i : Number (in-list '(1 2 3))]) i) (Listof Number))
-
-(+ (for/fold: ([acc : Number 0])
-       ([i (in-list '(1 2 3))])
-     (+ i acc))
-   1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-over-hash.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-over-hash.rkt
deleted file mode 100644
index be9e007bc7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-over-hash.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed/racket
-
-(: v : (Listof Number))
-(define v (for/list ([(k v) (make-hash (list (cons 1 2) (cons 3 4)))])
-            (+ k v)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-seq.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-seq.rkt
deleted file mode 100644
index c0536e5b53..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-seq.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang typed/racket
-
-(: Approximate (Natural -> Void))
-(define (Approximate n) ; works
- (for: : Void ([i : Integer (in-range 10)])
-     (display i)))
-
-(for: : Void ((i : Integer (ann '(1 2 3) (Sequenceof Integer))) ; doesn't
-              (j : Char "abc"))
-     (display (list i j)))
-
-
-(for: : Void ; doesn't
-     ([from-to : (List Symbol Symbol)
-               (ann '([a t] [c g]) (Sequenceof (List Symbol Symbol)))])
-     #t)
-
-
-(for/list: : (Listof Integer) ([i : Integer (in-range 10)]) i) ; works
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-set.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-set.rkt
deleted file mode 100644
index 6129a30db8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-set.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed/racket
-(for ([i (set 1 2 3)])
-  (displayln i))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-vector.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-vector.rkt
deleted file mode 100644
index 61663f8612..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for-vector.rkt
+++ /dev/null
@@ -1,459 +0,0 @@
-#lang typed/racket
-
-(require (for-syntax syntax/parse)
-         racket/unsafe/ops
-         typed/rackunit
-         racket/flonum
-         racket/extflonum)
-
-(check-equal? (for/vector: #:length 4 ([i  (in-range 4)]) : Float
-                (real->double-flonum i))
-              (vector 0.0 1.0 2.0 3.0))
-
-(check-exn exn? (λ () (for/vector: #:length 4 ([i  (in-range 0)]) : Float
-                        (real->double-flonum i))))
-
-(check-equal? (for/vector: #:length 4 () : Float
-                1.2)
-              (vector 1.2 1.2 1.2 1.2))
-
-(check-equal? (for/vector: #:length 4 ([i  (in-range 2)]) : Float
-                (real->double-flonum i))
-              (vector 0.0 1.0 0.0 0.0))
-
-(check-equal? (for/vector: #:length 4 ([i  (in-range 5)]) : Float
-                (real->double-flonum i))
-              (vector 0.0 1.0 2.0 3.0))
-
-(check-equal? (for/vector: #:length 0 ([i  (in-range 5)]) : Float
-                (real->double-flonum i))
-              (vector))
-
-(check-equal? (for/vector: ([i  (in-range 4)]) : Float
-                (real->double-flonum i))
-              (vector 0.0 1.0 2.0 3.0))
-
-(check-equal? (for/vector: () : Float 1.2)
-              (vector 1.2))
-
-(check-equal? (for/vector: ([i  (in-range 0)]) : Float
-                (real->double-flonum i))
-              (vector))
-
-(check-equal? (for/vector: #:length 4 ([x  (in-range 2)]
-                                       #:when #t
-                                       [y  (in-range 2)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector 0.0 1.0 1.0 2.0))
-
-(check-exn exn? (λ () (for/vector: #:length 4 ([x  (in-range 0)]
-                                               #:when #t
-                                               [y  (in-range 2)]) : Float
-                        (real->double-flonum (+ x y)))))
-
-(check-equal? (for/vector: #:length 4 ([x  (in-range 2)]
-                                       #:when #t
-                                       [y  (in-range 1)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector 0.0 1.0 0.0 0.0))
-
-(check-equal? (for/vector: #:length 4 ([x  (in-range 2)]
-                                       #:when #t
-                                       [y  (in-range 3)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector 0.0 1.0 2.0 1.0))
-
-(check-equal? (for/vector: #:length 0 ([x  (in-range 2)]
-                                       #:when #t
-                                       [y  (in-range 3)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector))
-
-(check-equal? (for/vector: ([x  (in-range 2)]
-                            #:when #t
-                            [y  (in-range 2)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector 0.0 1.0 1.0 2.0))
-
-(check-equal? (for/vector: ([x  (in-range 0)]
-                            #:when #t
-                            [y  (in-range 2)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector))
-
-;; ===================================================================================================
-;; for*/vector:
-
-(check-equal? (for*/vector: #:length 4 ([i  (in-range 4)]) : Float
-                (real->double-flonum i))
-              (vector 0.0 1.0 2.0 3.0))
-
-(check-exn exn? (λ () (for*/vector: #:length 4 ([i  (in-range 0)]) : Float
-                        (real->double-flonum i))))
-
-(check-equal? (for*/vector: #:length 4 () : Float
-                1.2)
-              (vector 1.2 1.2 1.2 1.2))
-
-(check-equal? (for*/vector: #:length 4 ([i  (in-range 2)]) : Float
-                (real->double-flonum i))
-              (vector 0.0 1.0 0.0 0.0))
-
-(check-equal? (for*/vector: #:length 4 ([i  (in-range 5)]) : Float
-                (real->double-flonum i))
-              (vector 0.0 1.0 2.0 3.0))
-
-(check-equal? (for*/vector: #:length 0 ([i  (in-range 5)]) : Float
-                (real->double-flonum i))
-              (vector))
-
-(check-equal? (for*/vector: ([i  (in-range 4)]) : Float
-                (real->double-flonum i))
-              (vector 0.0 1.0 2.0 3.0))
-
-(check-equal? (for*/vector: () : Float 1.2)
-              (vector 1.2))
-
-(check-equal? (for*/vector: ([i  (in-range 0)]) : Float
-                (real->double-flonum i))
-              (vector))
-
-(check-equal? (for*/vector: #:length 4 ([x  (in-range 2)]
-                                        [y  (in-range 2)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector 0.0 1.0 1.0 2.0))
-
-(check-exn exn? (λ () (for*/vector: #:length 4 ([x  (in-range 0)]
-                                                [y  (in-range 2)]) : Float
-                        (real->double-flonum (+ x y)))))
-
-(check-equal? (for*/vector: #:length 4 ([x  (in-range 2)]
-                                        [y  (in-range 1)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector 0.0 1.0 0.0 0.0))
-
-(check-equal? (for*/vector: #:length 4 ([x  (in-range 2)]
-                                        [y  (in-range 3)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector 0.0 1.0 2.0 1.0))
-
-(check-equal? (for*/vector: #:length 0 ([x  (in-range 2)]
-                                        [y  (in-range 3)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector))
-
-(check-equal? (for*/vector: ([x  (in-range 2)]
-                             [y  (in-range 2)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector 0.0 1.0 1.0 2.0))
-
-(check-equal? (for*/vector: ([x  (in-range 0)]
-                             [y  (in-range 2)]) : Float
-                (real->double-flonum (+ x y)))
-              (vector))
-
-;; ===================================================================================================
-;; for/flvector:
-
-(check-equal? (for/flvector: #:length 4 ([i  (in-range 4)])
-                (real->double-flonum i))
-              (flvector 0.0 1.0 2.0 3.0))
-
-(check-equal? (for/flvector: #:length 4 ([i  (in-range 0)])
-                (real->double-flonum i))
-              (flvector 0.0 0.0 0.0 0.0))
-
-(check-equal? (for/flvector: #:length 4 ()
-                1.2)
-              (flvector 1.2 0.0 0.0 0.0))
-
-(check-equal? (for/flvector: #:length 4 ([i  (in-range 2)])
-                (real->double-flonum i))
-              (flvector 0.0 1.0 0.0 0.0))
-
-(check-equal? (for/flvector: #:length 4 ([i  (in-range 5)])
-                (real->double-flonum i))
-              (flvector 0.0 1.0 2.0 3.0))
-
-(check-equal? (for/flvector: #:length 0 ([i  (in-range 5)])
-                (real->double-flonum i))
-              (flvector))
-
-(check-equal? (for/flvector: ([i  (in-range 4)])
-                (real->double-flonum i))
-              (flvector 0.0 1.0 2.0 3.0))
-
-(check-equal? (for/flvector: () 1.2)
-              (flvector 1.2))
-
-(check-equal? (for/flvector: ([i  (in-range 0)])
-                (real->double-flonum i))
-              (flvector))
-
-(check-equal? (for/flvector: #:length 4 ([x  (in-range 2)]
-                                         #:when #t
-                                         [y  (in-range 2)])
-                (real->double-flonum (+ x y)))
-              (flvector 0.0 1.0 1.0 2.0))
-
-(check-equal? (for/flvector: #:length 4 ([x  (in-range 0)]
-                                         #:when #t
-                                         [y  (in-range 2)])
-                (real->double-flonum (+ x y)))
-              (flvector 0.0 0.0 0.0 0.0))
-
-(check-equal? (for/flvector: #:length 4 ([x  (in-range 2)]
-                                         #:when #t
-                                         [y  (in-range 1)])
-                (real->double-flonum (+ x y)))
-              (flvector 0.0 1.0 0.0 0.0))
-
-(check-equal? (for/flvector: #:length 4 ([x  (in-range 2)]
-                                         #:when #t
-                                         [y  (in-range 3)])
-                (real->double-flonum (+ x y)))
-              (flvector 0.0 1.0 2.0 1.0))
-
-(check-equal? (for/flvector: #:length 0 ([x  (in-range 2)]
-                                         #:when #t
-                                         [y  (in-range 3)])
-                (real->double-flonum (+ x y)))
-              (flvector))
-
-(check-equal? (for/flvector: ([x  (in-range 2)]
-                              #:when #t
-                              [y  (in-range 2)])
-                (real->double-flonum (+ x y)))
-              (flvector 0.0 1.0 1.0 2.0))
-
-(check-equal? (for/flvector: ([x  (in-range 0)]
-                              #:when #t
-                              [y  (in-range 2)])
-                (real->double-flonum (+ x y)))
-              (flvector))
-
-;; ===================================================================================================
-;; for*/flvector:
-
-(check-equal? (for*/flvector: #:length 4 ([i  (in-range 4)])
-                (real->double-flonum i))
-              (flvector 0.0 1.0 2.0 3.0))
-
-(check-equal? (for*/flvector: #:length 4 ([i  (in-range 0)])
-                (real->double-flonum i))
-              (flvector 0.0 0.0 0.0 0.0))
-
-(check-equal? (for*/flvector: #:length 4 ()
-                1.2)
-              (flvector 1.2 0.0 0.0 0.0))
-
-(check-equal? (for*/flvector: #:length 4 ([i  (in-range 2)])
-                (real->double-flonum i))
-              (flvector 0.0 1.0 0.0 0.0))
-
-(check-equal? (for*/flvector: #:length 4 ([i  (in-range 5)])
-                (real->double-flonum i))
-              (flvector 0.0 1.0 2.0 3.0))
-
-(check-equal? (for*/flvector: #:length 0 ([i  (in-range 5)])
-                (real->double-flonum i))
-              (flvector))
-
-(check-equal? (for*/flvector: ([i  (in-range 4)])
-                (real->double-flonum i))
-              (flvector 0.0 1.0 2.0 3.0))
-
-(check-equal? (for*/flvector: () 1.2)
-              (flvector 1.2))
-
-(check-equal? (for*/flvector: ([i  (in-range 0)])
-                (real->double-flonum i))
-              (flvector))
-
-(check-equal? (for*/flvector: #:length 4 ([x  (in-range 2)]
-                                          [y  (in-range 2)])
-                (real->double-flonum (+ x y)))
-              (flvector 0.0 1.0 1.0 2.0))
-
-(check-equal? (for*/flvector: #:length 4 ([x  (in-range 0)]
-                                          [y  (in-range 2)])
-                (real->double-flonum (+ x y)))
-              (flvector 0.0 0.0 0.0 0.0))
-
-(check-equal? (for*/flvector: #:length 4 ([x  (in-range 2)]
-                                          [y  (in-range 1)])
-                (real->double-flonum (+ x y)))
-              (flvector 0.0 1.0 0.0 0.0))
-
-(check-equal? (for*/flvector: #:length 4 ([x  (in-range 2)]
-                                          [y  (in-range 3)])
-                (real->double-flonum (+ x y)))
-              (flvector 0.0 1.0 2.0 1.0))
-
-(check-equal? (for*/flvector: #:length 0 ([x  (in-range 2)]
-                                          [y  (in-range 3)])
-                (real->double-flonum (+ x y)))
-              (flvector))
-
-(check-equal? (for*/flvector: ([x  (in-range 2)]
-                               [y  (in-range 2)])
-                (real->double-flonum (+ x y)))
-              (flvector 0.0 1.0 1.0 2.0))
-
-(check-equal? (for*/flvector: ([x  (in-range 0)]
-                               [y  (in-range 2)])
-                (real->double-flonum (+ x y)))
-              (flvector))
-
-;; ===================================================================================================
-;; for/extflvector:
-
-(check-equal? (for/extflvector: #:length 4 ([i  (in-range 4)])
-                (real->extfl i))
-              (extflvector 0.0t0 1.0t0 2.0t0 3.0t0))
-
-(check-equal? (for/extflvector: #:length 4 ([i  (in-range 0)])
-                (real->extfl i))
-              (extflvector 0.0t0 0.0t0 0.0t0 0.0t0))
-
-(check-equal? (for/extflvector: #:length 4 ()
-                1.2t0)
-              (extflvector 1.2t0 0.0t0 0.0t0 0.0t0))
-
-(check-equal? (for/extflvector: #:length 4 ([i  (in-range 2)])
-                (real->extfl i))
-              (extflvector 0.0t0 1.0t0 0.0t0 0.0t0))
-
-(check-equal? (for/extflvector: #:length 4 ([i  (in-range 5)])
-                (real->extfl i))
-              (extflvector 0.0t0 1.0t0 2.0t0 3.0t0))
-
-(check-equal? (for/extflvector: #:length 0 ([i  (in-range 5)])
-                (real->extfl i))
-              (extflvector))
-
-(check-equal? (for/extflvector: ([i  (in-range 4)])
-                (real->extfl i))
-              (extflvector 0.0t0 1.0t0 2.0t0 3.0t0))
-
-(check-equal? (for/extflvector: () 1.2t0)
-              (extflvector 1.2t0))
-
-(check-equal? (for/extflvector: ([i  (in-range 0)])
-                (real->extfl i))
-              (extflvector))
-
-(check-equal? (for/extflvector: #:length 4 ([x  (in-range 2)]
-                                            #:when #t
-                                            [y  (in-range 2)])
-                (real->extfl (+ x y)))
-              (extflvector 0.0t0 1.0t0 1.0t0 2.0t0))
-
-(check-equal? (for/extflvector: #:length 4 ([x  (in-range 0)]
-                                            #:when #t
-                                            [y  (in-range 2)])
-                (real->extfl (+ x y)))
-              (extflvector 0.0t0 0.0t0 0.0t0 0.0t0))
-
-(check-equal? (for/extflvector: #:length 4 ([x  (in-range 2)]
-                                            #:when #t
-                                            [y  (in-range 1)])
-                (real->extfl (+ x y)))
-              (extflvector 0.0t0 1.0t0 0.0t0 0.0t0))
-
-(check-equal? (for/extflvector: #:length 4 ([x  (in-range 2)]
-                                            #:when #t
-                                            [y  (in-range 3)])
-                (real->extfl (+ x y)))
-              (extflvector 0.0t0 1.0t0 2.0t0 1.0t0))
-
-(check-equal? (for/extflvector: #:length 0 ([x  (in-range 2)]
-                                            #:when #t
-                                            [y  (in-range 3)])
-                (real->extfl (+ x y)))
-              (extflvector))
-
-(check-equal? (for/extflvector: ([x  (in-range 2)]
-                                 #:when #t
-                                 [y  (in-range 2)])
-                (real->extfl (+ x y)))
-              (extflvector 0.0t0 1.0t0 1.0t0 2.0t0))
-
-(check-equal? (for/extflvector: ([x  (in-range 0)]
-                                 #:when #t
-                                 [y  (in-range 2)])
-                (real->extfl (+ x y)))
-              (extflvector))
-
-;; ===================================================================================================
-;; for*/extflvector:
-
-(check-equal? (for*/extflvector: #:length 4 ([i  (in-range 4)])
-                (real->extfl i))
-              (extflvector 0.0t0 1.0t0 2.0t0 3.0t0))
-
-(check-equal? (for*/extflvector: #:length 4 ([i  (in-range 0)])
-                (real->extfl i))
-              (extflvector 0.0t0 0.0t0 0.0t0 0.0t0))
-
-(check-equal? (for*/extflvector: #:length 4 ()
-                1.2t0)
-              (extflvector 1.2t0 0.0t0 0.0t0 0.0t0))
-
-(check-equal? (for*/extflvector: #:length 4 ([i  (in-range 2)])
-                (real->extfl i))
-              (extflvector 0.0t0 1.0t0 0.0t0 0.0t0))
-
-(check-equal? (for*/extflvector: #:length 4 ([i  (in-range 5)])
-                (real->extfl i))
-              (extflvector 0.0t0 1.0t0 2.0t0 3.0t0))
-
-(check-equal? (for*/extflvector: #:length 0 ([i  (in-range 5)])
-                (real->extfl i))
-              (extflvector))
-
-(check-equal? (for*/extflvector: ([i  (in-range 4)])
-                (real->extfl i))
-              (extflvector 0.0t0 1.0t0 2.0t0 3.0t0))
-
-(check-equal? (for*/extflvector: () 1.2t0)
-              (extflvector 1.2t0))
-
-(check-equal? (for*/extflvector: ([i  (in-range 0)])
-                (real->extfl i))
-              (extflvector))
-
-(check-equal? (for*/extflvector: #:length 4 ([x  (in-range 2)]
-                                             [y  (in-range 2)])
-                (real->extfl (+ x y)))
-              (extflvector 0.0t0 1.0t0 1.0t0 2.0t0))
-
-(check-equal? (for*/extflvector: #:length 4 ([x  (in-range 0)]
-                                             [y  (in-range 2)])
-                (real->extfl (+ x y)))
-              (extflvector 0.0t0 0.0t0 0.0t0 0.0t0))
-
-(check-equal? (for*/extflvector: #:length 4 ([x  (in-range 2)]
-                                             [y  (in-range 1)])
-                (real->extfl (+ x y)))
-              (extflvector 0.0t0 1.0t0 0.0t0 0.0t0))
-
-(check-equal? (for*/extflvector: #:length 4 ([x  (in-range 2)]
-                                             [y  (in-range 3)])
-                (real->extfl (+ x y)))
-              (extflvector 0.0t0 1.0t0 2.0t0 1.0t0))
-
-(check-equal? (for*/extflvector: #:length 0 ([x  (in-range 2)]
-                                             [y  (in-range 3)])
-                (real->extfl (+ x y)))
-              (extflvector))
-
-(check-equal? (for*/extflvector: ([x  (in-range 2)]
-                                  [y  (in-range 2)])
-                (real->extfl (+ x y)))
-              (extflvector 0.0t0 1.0t0 1.0t0 2.0t0))
-
-(check-equal? (for*/extflvector: ([x  (in-range 0)]
-                                  [y  (in-range 2)])
-                (real->extfl (+ x y)))
-              (extflvector))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for.rkt
deleted file mode 100644
index d532965206..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/for.rkt
+++ /dev/null
@@ -1,455 +0,0 @@
-#lang typed/scheme
-
-(: check (All (a) ((a a -> Boolean) a a -> Boolean)))
-;; Simple check function as RackUnit doesn't work in Typed Scheme (yet)
-(define (check f a b)
-  (if (f a b)
-      #t
-      (error (format "Check (~a ~a ~a) failed" f a b))))
-
-;; Each test is there twice, once with the type annotation before the for
-;; clauses, and once after.
-
-(check string=?
-       (with-output-to-string
-         (lambda ()
-           (for: : Void ([i : Integer (in-range 10)])
-                 (display i))))
-       "0123456789")
-(check string=?
-       (with-output-to-string
-         (lambda ()
-           (for: ([i : Integer (in-range 10)]) : Void
-                 (display i))))
-       "0123456789")
-
-(check string=?
-       (with-output-to-string
-         (lambda ()
-           (for: : Void
-                 ((i : Integer '(1 2 3))
-                  (j : Char "abc")
-                  #:when (odd? i)
-                  (k : Boolean #(#t #t))
-                  #:when k)
-                 (display (list i j k)))))
-       "(1 a #t)(1 a #t)(3 c #t)(3 c #t)")
-(check string=?
-       (with-output-to-string
-         (lambda ()
-           (for: ((i : Integer '(1 2 3))
-                  (j : Char "abc")
-                  #:when (odd? i)
-                  (k : Boolean #(#t #t))
-                  #:when k)
-                 : Void
-                 (display (list i j k)))))
-       "(1 a #t)(1 a #t)(3 c #t)(3 c #t)")
-
-(check equal?
-       (for/list: : (Listof Integer) ([i : Integer (in-range 10)]) i)
-       '(0 1 2 3 4 5 6 7 8 9))
-(check equal?
-       (for/list: ([i : Integer (in-range 10)]) : (Listof Integer) i)
-       '(0 1 2 3 4 5 6 7 8 9))
-
-(check equal?
-       (for/list: : (Listof Integer)
-                  ((i : Integer '(1 2 3))
-                   (j : Integer '(10 20 30))
-                   #:when (odd? i))
-                  (+ i j 10))
-       '(21 43))
-(check equal?
-       (for/list: ((i : Integer '(1 2 3))
-                   (j : Integer '(10 20 30))
-                   #:when (odd? i))
-                  : (Listof Integer)
-                  (+ i j 10))
-       '(21 43))
-
-(check equal?
-       (for/list: : (Listof Integer)
-                  ((i : Integer '(1 2 3))
-                   (j : Integer '(10 20 30))
-                   #:unless (odd? i))
-                  (+ i j 10))
-       '(32))
-(check equal?
-       (for/list: ((i : Integer '(1 2 3))
-                   (j : Integer '(10 20 30))
-                   #:unless (odd? i))
-                  : (Listof Integer)
-                  (+ i j 10))
-       '(32))
-
-(check equal?
-       (for/or: : Boolean
-                ((i : Integer '(1 2 3)))
-                (>= i 3))
-       #t)
-(check equal?
-       (for/or: ((i : Integer '(1 2 3)))
-                : Boolean
-                (>= i 3))
-       #t)
-
-(check equal?
-       (for/or: : Boolean
-                ((i : Integer '(1 2 3))
-                 (j : Integer '(2 1 3)))
-                (>= i j))
-       #t)
-(check equal?
-       (for/or: ((i : Integer '(1 2 3))
-                 (j : Integer '(2 1 3)))
-                : Boolean
-                (>= i j))
-       #t)
-
-(check equal?
-       (let-values: ([([x : (Listof Integer)] [y : (Listof Integer)])
-                      (for/lists: : (values (Listof Integer) (Listof Integer))
-                                  ((x : (Listof Integer))
-                                   (y : (Listof Integer)))
-                                  ((i : Integer '(1 2 3))
-                                   #:when #t
-                                   (j : Integer '(10 20 30))
-                                   #:when (> j 12))
-                                  (values i j))])
-                    (append x y))
-       '(1 1 2 2 3 3 20 30 20 30 20 30))
-(check equal?
-       (let-values: ([([x : (Listof Integer)] [y : (Listof Integer)])
-                      (for/lists: ((x : (Listof Integer))
-                                   (y : (Listof Integer)))
-                                  ((i : Integer '(1 2 3))
-                                   #:when #t
-                                   (j : Integer '(10 20 30))
-                                   #:when (> j 12))
-                                  : (values (Listof Integer) (Listof Integer))
-                                  (values i j))])
-                    (append x y))
-       '(1 1 2 2 3 3 20 30 20 30 20 30))
-
-(check =
-       (for/fold: : Integer
-                  ((acc : Integer 0))
-                  ((i : Integer '(1 2 3))
-                   (j : Integer '(10 20 30)))
-                  (+ acc i j))
-       66)
-(check =
-       (for/fold: ((acc : Integer 0))
-                  ((i : Integer '(1 2 3))
-                   (j : Integer '(10 20 30)))
-                  : Integer
-                  (+ acc i j))
-       66)
-
-(check =
-       (for/fold: : Integer
-                  ((acc : Integer 0))
-                  ((i : Integer '(1 2 3))
-                   #:when (even? i)
-                   (j : Integer '(10 20 30))
-                   #:when #t
-                   (k : Integer '(100 200 300)))
-                  (+ acc i j k))
-       1998)
-(check =
-       (for/fold: ((acc : Integer 0))
-                  ((i : Integer '(1 2 3))
-                   #:when (even? i)
-                   (j : Integer '(10 20 30))
-                   #:when #t
-                   (k : Integer '(100 200 300)))
-                  : Integer
-                  (+ acc i j k))
-       1998)
-
-(check string=?
-       (with-output-to-string
-         (lambda ()
-           (for*: : Void
-                  ((i : Integer '(1 2 3))
-                   (j : Integer '(10 20 30)))
-                  (display (list i j)))))
-       "(1 10)(1 20)(1 30)(2 10)(2 20)(2 30)(3 10)(3 20)(3 30)")
-(check string=?
-       (with-output-to-string
-         (lambda ()
-           (for*: ((i : Integer '(1 2 3))
-                   (j : Integer '(10 20 30)))
-                  : Void
-                  (display (list i j)))))
-       "(1 10)(1 20)(1 30)(2 10)(2 20)(2 30)(3 10)(3 20)(3 30)")
-
-(check equal?
-       (let-values: ([([x : (Listof Integer)] [y : (Listof Integer)])
-                      (for*/lists: : (values (Listof Integer) (Listof Integer))
-                                   ((x : (Listof Integer))
-                                    (y : (Listof Integer)))
-                                   ((i : Integer '(1 2 3))
-                                    (j : Integer '(10 20 30))
-                                    #:when (> j 12))
-                                   (values i j))])
-                    (append x y))
-       '(1 1 2 2 3 3 20 30 20 30 20 30))
-(check equal?
-       (let-values: ([([x : (Listof Integer)] [y : (Listof Integer)])
-                      (for*/lists: ((x : (Listof Integer))
-                                    (y : (Listof Integer)))
-                                   ((i : Integer '(1 2 3))
-                                    (j : Integer '(10 20 30))
-                                    #:when (> j 12))
-                                   : (values (Listof Integer) (Listof Integer))
-                                   (values i j))])
-                    (append x y))
-       '(1 1 2 2 3 3 20 30 20 30 20 30))
-
-(check =
-       (for*/fold: : Integer
-                   ((acc : Integer 0))
-                   ((i : Integer '(1 2 3))
-                    #:when (even? i)
-                    (j : Integer '(10 20 30))
-                    (k : Integer '(100 200 300)))
-                   (+ acc i j k))
-       1998)
-(check =
-       (for*/fold: ((acc : Integer 0))
-                   ((i : Integer '(1 2 3))
-                    #:when (even? i)
-                    (j : Integer '(10 20 30))
-                    (k : Integer '(100 200 300)))
-                   : Integer
-                   (+ acc i j k))
-       1998)
-
-(check =
-       (for*/fold: : Integer
-                   ((acc : Integer 0))
-                   ((i : Integer '(1 2 3))
-                    #:unless (even? i)
-                    (j : Integer '(10 20 30))
-                    (k : Integer '(100 200 300)))
-                   (+ acc i j k))
-       3996)
-(check =
-       (for*/fold: ((acc : Integer 0))
-                   ((i : Integer '(1 2 3))
-                    #:unless (even? i)
-                    (j : Integer '(10 20 30))
-                    (k : Integer '(100 200 300)))
-                   : Integer
-                   (+ acc i j k))
-       3996)
-
-(check =
-       (for/sum: : Integer
-                 ([i : Integer (in-range 10)])
-                 i)
-       45)
-(check =
-       (for/sum: ([i : Integer (in-range 10)])
-                 : Integer
-                 i)
-       45)
-
-(check =
-       (for/sum: : Integer
-                 ([i : Integer (in-range 10)]
-                  [j : Integer (in-range 10)])
-                 (+ i j))
-       90)
-(check =
-       (for/sum: ([i : Integer (in-range 10)]
-                  [j : Integer (in-range 10)])
-                 : Integer
-                 (+ i j))
-       90)
-
-(check =
-       (for/product: : Integer
-                     ([i : Integer (in-range 10)])
-                     i)
-       0)
-(check =
-       (for/product: ([i : Integer (in-range 10)])
-                     : Integer
-                     i)
-       0)
-
-(check =
-       (for/product: : Integer
-                     ([i : Integer (in-range 1 10)])
-                     i)
-       362880)
-(check =
-       (for/product: ([i : Integer (in-range 1 10)])
-                     : Integer
-                     i)
-       362880)
-
-(check =
-       (for/product: : Integer
-                     ([i : Integer (in-range 1 10)]
-                      [j : Integer (in-range 1 10)])
-                     (+ i j))
-       185794560)
-(check =
-       (for/product: ([i : Integer (in-range 1 10)]
-                      [j : Integer (in-range 1 10)])
-                     : Integer
-                     (+ i j))
-       185794560)
-
-;; for/product: had problems with Real due to an unannotated accumulator
-(check =
-       (for/product: : Real
-                     ([i (in-list (list 1.2 -1.0 0.5))])
-         i)
-       -0.6)
-(check =
-       (for/product: ([i (in-list (list 1.2 -1.0 0.5))])
-         : Real
-         i)
-       -0.6)
-
-;; multiclause versions of these don't currently work properly
-(check =
-       (for*/sum: : Integer
-                  ([i : Integer (in-range 10)])
-                  i)
-       45)
-(check =
-       (for*/sum: ([i : Integer (in-range 10)])
-                  : Integer
-                  i)
-       45)
-
-(check =
-       (for*/product: : Integer
-                      ([i : Integer (in-range 10)])
-                      i)
-       0)
-(check =
-       (for*/product: ([i : Integer (in-range 10)])
-                      : Integer
-                      i)
-       0)
-
-(check =
-       (for*/product: : Integer
-                      ([i : Integer (in-range 1 10)])
-                      i)
-       362880)
-(check =
-       (for*/product: ([i : Integer (in-range 1 10)])
-                      : Integer
-                      i)
-       362880)
-
-
-;; Integers as sequences.
-(check =
-       (for/sum: : Integer
-                 ([i : Byte 4])
-                 i)
-       6)
-(check =
-       (for/sum: ([i : Byte 4])
-                 : Integer
-                 i)
-       6)
-
-(check =
-       (for/sum: : Integer
-                 ([i : Index (ann 4 Index)])
-                 i)
-       6)
-(check =
-       (for/sum: ([i : Index (ann 4 Index)])
-                 : Integer
-                 i)
-       6)
-
-(check =
-       (for/sum: : Integer
-                 ([i : Nonnegative-Fixnum (ann 4 Fixnum)])
-                 i)
-       6)
-(check =
-       (for/sum: ([i : Nonnegative-Fixnum (ann 4 Fixnum)])
-                 : Integer
-                 i)
-       6)
-
-(check =
-       (for/sum: : Integer
-                 ([i : Natural (ann 4 Integer)])
-                 i)
-       6)
-(check =
-       (for/sum: ([i : Natural (ann 4 Integer)])
-                 : Integer
-                 i)
-       6)
-
-(check string=?
-       (with-output-to-string
-         (lambda ()
-           (for: ([x 10] #:unless (> x 3)) (display x))))
-       "0123")
-
-(check equal?
-       (for/hasheq: : (HashTable Integer String) ([k (list 2 3 4)]) (values k "val"))
-       #hasheq((2 . "val") (3 . "val") (4 . "val")))
-(check equal?
-       (for/hasheq: ([k (list 2 3 4)]) : (HashTable Integer String) (values k "val"))
-       #hasheq((2 . "val") (3 . "val") (4 . "val")))
-
-(check equal?
-       (for/vector: ([i : Natural (in-range 3)]) 5)
-       (vector 5 5 5))
-
-(check equal?
-       (for/vector: : (Vectorof Number) ([i : Natural (in-range 3)]) 5)
-       (vector 5 5 5))
-(check equal?
-       (for/vector: ([i : Natural (in-range 3)]) : Number 5)
-       (vector 5 5 5))
-
-
-(check equal?
-       (for/list: : (Listof Natural)
-                  ((i : Natural (and (in-naturals)))
-                   (j : Natural (and (in-range 5))))
-             (+ i j))
-       (list 0 2 4 6 8))
-(check equal?
-       (for/list: ((i : Natural (and (in-naturals)))
-                   (j : Natural (and (in-range 5))))
-             : (Listof Natural)
-             (+ i j))
-       (list 0 2 4 6 8))
-
-;; break and final clauses
-;; TODO typechecker can't handle these
-;; (check string=?
-;;        (with-output-to-string
-;;          (lambda ()
-;;            (for: ([x 10] #:break (> x 3)) (display x))))
-;;        "0123")
-;; (check string=?
-;;        (with-output-to-string
-;;          (lambda ()
-;;            (for: ([x 10]) #:break (> x 3) (display x))))
-;;        "0123")
-;; (check =
-;;        (for/sum: : Integer ([x : Integer 10] #:break (> x 3)) (ann x Integer))
-;;        6)
-;; (check =
-;;        (for/sum: : Integer ([x 10] #:final (> x 3)) x)
-;;        10)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/force-delay.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/force-delay.rkt
deleted file mode 100644
index fd411d55db..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/force-delay.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed-scheme
-
-(require scheme/promise)
-
-;((plambda: (a) ([x : a]) x) (error 'foo))
-
-(force (delay 3))
-
-(call-with-values (lambda () 3) list)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/format.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/format.rkt
deleted file mode 100644
index f1e9bb6420..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/format.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang typed/racket
-
-;; Test racket/format. Should be a unit test, but lifts don't
-;; work well with TR's top-level currently.
-
-(require racket/format)
-
-(~a "foo" 'a 3)
-(~a "foo" 'a 3 #:separator ", " #:width 20)
-(~a "foo" 'a 3 #:max-width 20 #:min-width 10)
-(~s "foo" 'a 3)
-(~s "foo" 'a 3 #:separator ", " #:width 20)
-(~s "foo" 'a 3 #:max-width 20 #:min-width 10)
-(~v "foo" 'a 3)
-(~v "foo" 'a 3 #:separator ", " #:width 20)
-(~v "foo" 'a 3 #:max-width 20 #:min-width 10)
-(~.a "foo" 'a 3)
-(~.a "foo" 'a 3 #:separator ", " #:width 20)
-(~.a "foo" 'a 3 #:max-width 20 #:min-width 10)
-(~.s "foo" 'a 3)
-(~.s "foo" 'a 3 #:separator ", " #:width 20)
-(~.s "foo" 'a 3 #:max-width 20 #:min-width 10)
-(~.v "foo" 'a 3)
-(~.v "foo" 'a 3 #:separator ", " #:width 20)
-(~.v "foo" 'a 3 #:max-width 20 #:min-width 10)
-(~r 234234)
-(~r 3.5 #:sign '+ #:base 3 #:precision 3
-    #:notation 'positional #:format-exponent "fooo"
-    #:min-width 10 #:pad-string ",")
-(~r 3.5 #:sign (list "x" "y" (list "z" "z"))
-    #:notation (lambda (_) 'positional))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/function.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/function.rkt
deleted file mode 100644
index 2c89a26be5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/function.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang typed/racket
-
-;; Test imports from racket/function
-
-(identity 5)
-(identity (lambda (x) "test"))
-
-((const 'foo) 1 2 3)
-
-(filter (negate symbol?) '(1 a 2 b 3 c))
-(map (negate equal?) '(1 2 3) '(1 1 1))
-
-((curry (lambda (x y) (cons x y)) 5) '())
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fx-filter.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fx-filter.rkt
deleted file mode 100644
index c95dd2c75e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/fx-filter.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/racket
-
-;; test filters on fx primitives that tell us that if the function
-;; returns at all, its arguments were fixnums
-;; currently only works if the fx operation is used in test position,
-;; due to the way filters are used. this should be improved in the
-;; future
-
-(require racket/fixnum)
-
-(: f : Integer -> Fixnum)
-(define (f x)
-  (if (fx+ x 4) x x))
-(: g : Integer -> Fixnum)
-(define (g x)
-  (if (fxnot x) x x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/generalize-vectors.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/generalize-vectors.rkt
deleted file mode 100644
index 7ac26bebde..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/generalize-vectors.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang typed/scheme
-
-(define x (vector 1.0 2.0)) ; should generalize to (Vectorof Float) even though it only contains Nonnegative-Floats
-(vector-set! x 0 -2.0)
-
-(define y (make-vector 2 1.0))
-(vector-set! y 0 -2.0)
-
-(define z #(1.0 2.0))
-(ann z (Vectorof Float))
-
-(define w (build-vector 3 (lambda: ((x : Integer)) (add1 x))))
-(vector-set! w 0 -2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/gui-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/gui-contract.rkt
deleted file mode 100644
index 1bdd1dc760..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/gui-contract.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-
-;; Make sure contracts for GUI types can be generated in a
-;; reasonable amount of time and space.
-
-(require racket/sandbox)
-
-(call-with-limits
- 120
- 500
- (λ () (eval '(begin (module a typed/racket
-                       (require typed/racket/gui)
-                       (define x (make-object bitmap% 100 100))
-                       (provide x))
-                     (require 'a)
-                     x)
-             (make-base-namespace))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hari-vector-bug.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hari-vector-bug.rkt
deleted file mode 100644
index dbf7d9a82a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hari-vector-bug.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang typed/racket
-(define-struct: (A) Base ([prevbase : (Block A)]
-                          [elems : (Vectorof A)]))
-(define-struct: Mt ())
-
-(define-type-alias Block (All (A) (U Mt (Base A))))
-
-(: get-base : (All (A) ((Block A) -> (Base A))))
-(define (get-base block)
- (if (Mt? block)
-     (error "" 'get-base)
-     (make-Base (Base-prevbase block)
-                (Base-elems block))))
-
-(: get-base2 : (All (A) ((Block A) -> (Base A))))
-(define (get-base2 block)
- (if (Base? block)
-     (make-Base (Base-prevbase block)
-                (Base-elems block))
-     (error "" 'get-base)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hash-literal.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hash-literal.rkt
deleted file mode 100644
index 1c24f8e09e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hash-literal.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/racket
-
-(define: x : (HashTable String String) #hash())
-(ann #hash() (HashTable String String))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hash-ref.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hash-ref.rkt
deleted file mode 100644
index acd8587efb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hash-ref.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scheme/load
-
-(module m typed-scheme
-  (define x ({inst make-hash Symbol Number}))
-  (hash-ref! x 'key (lambda () 1))
-  (hash-ref x 'key (lambda () 7))
-  (provide x))
-
-(module n scheme
-  (require 'm)
-  (hash-ref x 'key))
-
-(require 'n)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/het-vec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/het-vec.rkt
deleted file mode 100644
index 7edbb8199e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/het-vec.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang typed/scheme
-
-(ann (vector-ref (ann #(1 foo 3) (Vector Integer Symbol Any)) 0) Integer)
-
-(define: x : (Vector Number String Symbol) (vector 1 "foo" 'bar))
-
-(define: y : 2 2)
-
-(ann (vector-ref x 1) String)
-(ann (vector-ref x y) Symbol)
-
-(: ref : Integer -> (U Number String Symbol))
-(define (ref i) (vector-ref x i))
-
-(ann (vector-ref #(1.0 2.0) 0) Flonum)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/het-vec2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/het-vec2.rkt
deleted file mode 100644
index e7243d7d8d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/het-vec2.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang typed/racket
-
-(ann (vector 1 2 3) (U String (Vector Integer Integer Integer) (Vectorof Number)))
-
-(define v (ann (vector 1 2 3) (Vector Integer Integer Integer)))
-(define v* (ann #(1 2 3) (Vector Integer Integer Integer)))
-
-(vector-ref v 2)
-(vector-ref v 0)
-(define: x : Natural 0)
-(define: x* : 0 0)
-
-(vector-ref (vector 1 2 3) x)
-(vector-ref v x*)
-
-;(vector-set! v x 7)
-(vector-set! v x* 7)
-
-
-(vector-length v)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/ho-box.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/ho-box.rkt
deleted file mode 100644
index 35edc08e5f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/ho-box.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket
-
-(: f (Boxof (Number -> Number)))
-(define f (box (lambda: ([x : Number]) x)))
-
-(provide f)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hw01.scm b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hw01.scm
deleted file mode 100644
index 8441448819..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/hw01.scm
+++ /dev/null
@@ -1,110 +0,0 @@
-#lang typed-scheme
-
-(: sqr (Real -> Real))
-(define (sqr x) (* x x))
-
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias symbol Symbol)
-(define-type-alias top Any)
-
-;(require "support.ss")
-
-;; ---------------------------------------------------------------------
-;; 2a
-
-;; triangle: number number -> number
-;; Calculates the area of a triange
-(define: (triangle [b : number] [h : number]) : number
-  (* b (/ h 2)))
-
-;; tests:
-(= 4 (triangle 2 4))
-(= 20 (triangle 5 8))
-
-;; ---------------------------------------------------------------------
-;; 2b
-
-;; total-profit: integer -> number
-;; Calculates profit made by the theater
-(define: (total-profit [people : number]) : number
-  (- (* people 5)
-     (+ (* people .5) 20)))
-
-;; tests:
-(= -20 (total-profit 0))
-(= 25 (total-profit 10))
-
-;; ---------------------------------------------------------------------
-;; 3a
-
-;; interest: number ->number
-;; Calculates interest for a given sum
-(define: (interest [sum : Real]) : number
-  (* sum
-     (cond [(<= sum 1000) .04]
-	   [(<= sum 5000) .045]
-	   [else .05])))
-
-;; tests:
-(=   0   (interest 0))
-(=  20   (interest 500))
-(=  40   (interest 1000))
-(= 112.5 (interest 2500))
-(= 500   (interest 10000))
-
-;; ---------------------------------------------------------------------
-;; 3b
-
-;; how-many: int int int -> int
-;; Returns the number of roots in the equation
-(define: (how-many [a : Integer] [b : Integer] [c : Integer]) : Integer
-  (cond [(> (sqr b) (* 4 a c)) 2]
-	[(< (sqr b) (* 4 a c)) 0]
-	[else 1]))
-
-;; tests:
-(= 1 (how-many 1 2 1))
-(= 2 (how-many 1 3 1))
-(= 0 (how-many 1 1 1))
-
-;; ---------------------------------------------------------------------
-;; 4
-
-;; what-kind: int int int -> symbol
-;; Determines the type of the eqation
-(define: (what-kind [a : Integer] [b : Integer] [c : Integer]) : symbol
-  (cond [(= a 0) 'degenerate]
-	[(> (sqr b) (* 4 a c)) 'two]
-	[(< (sqr b) (* 4 a c)) 'none]
-	[else 'one]))
-
-;; tests:
-(eq? 'one (what-kind 1 2 1))
-(eq? 'two (what-kind 1 3 1))
-(eq? 'none (what-kind 1 1 1))
-(eq? 'degenerate (what-kind 0 1 1))
-
-;; ---------------------------------------------------------------------
-;; 5
-
-;; list-length: (list-of any) -> integer
-;; Computes the length of a list
-(define: (list-length [loa : (Listof top)]) : number
-  (if (null? loa)
-      0
-      (+ 1 (list-length (cdr loa)))))
-
-#| tail recursive version:
-(define (list-length-helper loa acc)
-  (if (null? loa)
-      acc
-      (list-length-helper (cdr loa) (+ acc 1))))
-(define (list-length loa)
-  (list-length-helper loa 0))
-|#
-
-  ;; tests:
-  (= 0 (list-length '()))
-  (= 2 (list-length '(1 2)))
-  (= 3 (list-length '(1 2 (1 2 3 4))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/icfp-examples.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/icfp-examples.rkt
deleted file mode 100644
index dd070e153c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/icfp-examples.rkt
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang typed/scheme
-
-;; Example 1
-(define: x : Any 7)
-(if (number? x) (add1 x) 0)
-
-;; Example 2
-(define: (f [x : (U String Number)]) : Number
-  (if (number? x) (add1 x) (string-length x)))
-
-;; Example 3
-(define: v : Number 12)
-(define: l : (Listof Number) (list 1 2 3 12))
-(let ([x (member v l)])
-   (if x
-       (add1 (car x))
-       (error 'fail)))
-
-;; Example 4
-(if (or (number? x) (string? x)) (f x) 0)
-
-;; Example 5
-(define: y : Any "foo")
-(if (and (number? x) (string? y))
-    (+ x (string-length y))
-    0)
-
-;; Example 6 has an intentional error
-(define: z : (U Number String) 7)
-#;(if (and (number? z) (string? y))
-    (+ z (string-length y))
-    (string-length z))
-
-;; Example 7
-(if (if (number? x) (string? y) #f)
-    (+ x (string-length y))
-    0)
-
-;; Example 8
-(: strnum? (Any -> Boolean : (U String Number)))
-(define (strnum? x)
-  (or (string? x) (number? x)))
-
-;; Example 9
-(if (let ([tmp (number? x)]) (if tmp tmp (string? x))) (f x) 0)
-
-;; Example 10
-(define: p : (Pair Any Any) (cons 1 2))
-(if (number? (car p)) (add1 (car p)) 7)
-
-;; Example 11
-(define: (g [arg : (Pair Number Number)]) : Number 0)
-(lambda: ([p : (Pair Any Any)])
-  (if (and (number? (car p)) (number? (cdr p)))
-      (g p)
-      'no))
-
-;; Example 12
-(: carnum? : (Pair Any Any) -> Boolean : Number @ car)
-(define (carnum? x)
-  (number? (car x)))
-
-;; Example 13
-(cond [(and (number? x) (string? z)) (add1 x)]
-      [(number? x) (add1 z)]
-      [else 0])
-
-;; Example 14
-(lambda: ([input : (U Number String)]
-          [extra : (Pair Any Any)])
-  (cond
-    [(and (number? input) (number? (car extra)))
-     (+ input (car extra))]
-    [(number? (car extra))
-     (+ (string-length input) (car extra))]
-    [else 0]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/if-splitting-test.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/if-splitting-test.rkt
deleted file mode 100644
index 802d7067ce..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/if-splitting-test.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang typed-scheme
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias symbol Symbol)
-(define-type-alias top Any)
-(define-type-alias list-of Listof)
-(define: l : (list-of number)
-  (cons 1 (cons 2 (cons 3 #{'() : (list-of number)}))))
-
-(define: (g [x : number]) : number
-  (cond [(memv x l) => car]
-	[else 0]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/inexact-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/inexact-complex.rkt
deleted file mode 100644
index 04e1c1b576..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/inexact-complex.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/scheme
-
-(ann 1.1+2.0i Inexact-Complex)
-(ann 1+2.0i Inexact-Complex)
-(ann (real-part 1.1+2.0i) Float)
-(ann (real-part 1+2.0i) Float)
-(ann (imag-part 1.1+2.0i) Float)
-(ann (+ 2.0 2.0+2.0i) Inexact-Complex)
-(ann (+ 2 2.0+2.0i) Inexact-Complex)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/infer-dots.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/infer-dots.rkt
deleted file mode 100644
index d5a43c14e4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/infer-dots.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed-scheme
-
-(require typed-racket/base-env/extra-procs)
-
-(: f (Integer Integer -> Integer))
-(define (f x y) (+ x y))
-
-(map f (list 1 2 3) (list 10 20 30))
-
-(map + (list 1 2 3) (list 10 20 30) (list 10 20 30))
-
-(map + (list 1 2 3) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30) (list 10 20 30))
-
-(: h (Integer Integer Integer * -> Integer))
-(define (h x y . z) (apply + (cons x (cons y z))))
-
-(map h (list 1 2 3) (list 4 5 6))
-(map h (list 1 2 3) (list 4 5 6) (list 4 5 6))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/infer-funargs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/infer-funargs.rkt
deleted file mode 100644
index 4d93a41aca..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/infer-funargs.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang typed-scheme
-
-(define-struct: Environment
- ((parent : (Option Environment))
-  (bindings : (HashTable Symbol Integer)))
- #:mutable)
-
-(: make-empty-env (case-lambda [-> Environment]
-                              [Environment -> Environment]))
-(define make-empty-env
- (case-lambda:
-  [() (make-Environment #f (make-hasheq))]
-  [((parent : Environment)) (make-Environment parent (make-hasheq))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/inst-dots.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/inst-dots.rkt
deleted file mode 100644
index 05d56c278e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/inst-dots.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-
-(require typed-racket/base-env/extra-procs)
-
-((inst map Number Number Number Number Number Number Number)
- +
- (list 1 2 3) (list 2 3 4) (list 1 2 3) (list 2 3 4) (list 1 2 3) (list 2 3 4))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/inst-expected.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/inst-expected.rkt
deleted file mode 100644
index 73e2c2d8c6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/inst-expected.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed-scheme
-
-(: id (All (a) (a -> a)))
-(define (id x) x)
-
-(: f (String -> String))
-(define f #{id @ String})
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/int-def-colon.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/int-def-colon.rkt
deleted file mode 100644
index 3372f8cfcb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/int-def-colon.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed-scheme
-
-(define-type-alias Int Integer)
-
-(: foo ( -> Int))
-(define (foo)
- (: loop (Int -> Int))
- (define (loop x)
-   (loop x))
- (loop 0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/internal-scoped-tvar.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/internal-scoped-tvar.rkt
deleted file mode 100644
index 98b984556c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/internal-scoped-tvar.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket/base
-
-(let ()
-  (: f : (All (A) (A -> A)))
-  (define (f x) ((inst values A) x))
-  7)
\ No newline at end of file
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/keyword-function-order.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/keyword-function-order.rkt
deleted file mode 100644
index 974d78f968..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/keyword-function-order.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-
-;; Tests for keyword ordering issues with mandatory keyword
-;; arguments
-
-(module a racket
-  (define (f a #:w [w "w"] #:x x #:y [y "y"]) x)
-  (provide f))
-
-(module b typed-racket/base-env/extra-env-lang
-  (require (submod ".." a))
-  (type-environment
-    [f (->key -Symbol
-              ;; this alphabetic ordering of keywords should
-              ;; be preserved in the kw type conversion for applications,
-              ;; rather than separating mandatory/optional as for lambdas
-              #:w -String #f
-              #:x -Symbol #t
-              #:y -String #f
-              -Symbol)]))
-
-(module c typed/racket
-  (require (submod ".." b))
-  (f 'a #:x 'x))
-
-(require 'c)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/kw-def.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/kw-def.rkt
deleted file mode 100644
index 2b7965f169..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/kw-def.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang typed/racket
-
-(: f (case-> 
-      (Integer [#:k Integer] -> Integer)
-      (Integer String [#:k Integer] -> Integer)))
-(define f
-  (lambda (x [z 2] #:k [y 1]) (+ x y)))
-
-(: f2 (case-> 
-       (Integer [#:k Integer] -> Integer)
-       (Integer String [#:k Integer] -> Integer)))
-(define (f2 x [z 2] #:k [y 1]) (+ x y))
-
-(f 0)
-(f 0 "s")
-(f 0 #:k 1)
-(f 0 "s" #:k 1)
-(f 0 #:k 1 "s")
-
-(f2 0)
-(f2 0 "s")
-(f2 0 #:k 1)
-(f2 0 "s" #:k 1)
-(f2 0 #:k 1 "s")
-
-(: g (Integer #:k Integer -> Integer))
-(define g
-  (lambda (x #:k y) (+ x y)))
-
-(: g2 (Integer #:k Integer -> Integer))
-(define (g2 x #:k y) (+ x y))
-
-(g 0 #:k 1)
-(g2 0 #:k 1)
-
-;; Additional keyword function tests
-;; FIXME: These really belong in the unit tests, but for some reason
-;;        the unit tests don't work well with keywords.
-(: f0:a (#:a String -> (List String)))
-(define (f0:a #:a a) (list a))
-
-(: f1:a (Symbol #:a String -> (List Symbol String)))
-(define (f1:a x #:a a) (list x a))
-
-(: f1:a? (Symbol [#:a String] -> (List Symbol String)))
-(define (f1:a? x #:a [a "a"]) (list x a))
-
-(: f1+:a (String #:a String String * -> (Listof String)))
-(define (f1+:a x #:a a . args) (cons x (cons a args)))
-
-(: f1+:a? (String [#:a String] String * -> (Listof String)))
-(define (f1+:a? x #:a [a "a"] . args) (cons x (cons a args)))
-
-(: f0:a:b (#:a String #:b Symbol -> (List String Symbol)))
-(define (f0:a:b #:a a #:b b) (list a b))
-
-(: f0:a?:b ([#:a String] #:b Symbol -> (List String Symbol)))
-(define (f0:a?:b #:a [a "a"] #:b b) (list a b))
-
-(: f1:a:b (String #:a String #:b Symbol -> (List String String Symbol)))
-(define (f1:a:b x #:a a #:b b) (list x a b))
-
-(: f1:a?:b (String [#:a String] #:b Symbol -> (List String String Symbol)))
-(define (f1:a?:b x #:a [a "a"] #:b b) (list x a b))
-
-(: f1+:a:b (String #:a String #:b String String * -> (Listof String)))
-(define (f1+:a:b x #:a a #:b b . args) (cons x (cons a (cons b args))))
-
-(: f0:a:b? (#:a String [#:b Symbol] -> (List String Symbol)))
-(define (f0:a:b? #:a a #:b [b 'b]) (list a b))
-
-(: f0:a?:b? ([#:a String] [#:b Symbol] -> (List String Symbol)))
-(define (f0:a?:b? #:a [a "a"] #:b [b 'b]) (list a b))
-
-(: f1:a:b? (String #:a String [#:b Symbol] -> (List String String Symbol)))
-(define (f1:a:b? x #:a a #:b [b 'b]) (list x a b))
-
-(: f1:a?:b? (String [#:a String] [#:b Symbol] -> (List String String Symbol)))
-(define (f1:a?:b? x #:a [a "a"] #:b [b 'b]) (list x a b))
-
-(: f1+:a:b? (String #:a String [#:b String] String * -> (Listof String)))
-(define (f1+:a:b? x #:a a #:b [b "b"] . args)
-  (cons x (cons a (cons b args))))
-
-(: f1+:a?:b? (String [#:a String] [#:b String] String * -> (Listof String)))
-(define (f1+:a?:b? x #:a [a "a"] #:b [b "b"] . args)
-  (cons x (cons a (cons b args))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/kw.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/kw.rkt
deleted file mode 100644
index 116a6dcc02..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/kw.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed/scheme
-
-(lambda ()
-  (open-input-file "foo" #:mode 'binary)
-  (open-input-file "foo" #:mode 'text)
-  (open-input-file "foo"))
-
-((inst sort Real Real) (list 1 2 3) >)
-
-((inst sort Real Real) (list 1 2 3) #:key (λ: ([x : Real]) (/ 1 x)) >)
-
-((inst sort Real String) (list 1 2 3) #:key number->string string<?)
-
-((inst sort Real String) (list 1 2 3) #:key number->string string<? #:cache-keys? #t)
-
-(remove-duplicates  '("foo"))
-
-(sort (list 1 2 3) >)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/leftist-heap.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/leftist-heap.rkt
deleted file mode 100644
index e8d2b89953..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/leftist-heap.rkt
+++ /dev/null
@@ -1,294 +0,0 @@
-;;; leftist-heap.scm  --  Jens Axel Søgaard  --  28th dec 2005
-
-;;; LEFTIST HEAP [Okasaki, p.17-20]
-
-; A *Leftist heap* is a heap-ordered binary tree with the /leftist property/:
-; The rank of any left child is at least as large as the rank of its right sibling.
-; The *rank* of a node is the length of the its *right spine*, which is the
-; rightmost path from the node to an empty node.
-
-;;; Time             worst case
-;  delete-min         O(log n)
-;  empty              O(1)
-;  empty?             O(1)
-;  find-min           O(1)
-;  insert             O(log n)
-;  union              O(log n)
-
-;;; changes
-;; annotations
-;; foldl from typed-list
-;; eta-expand cons (line 193)
-;; added error case for one-armed if
-;; need rest args
-;; didn't attempt generators
-
-#lang typed-scheme
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias symbol Symbol)
-(define-type-alias top Any)
-(define-type-alias list-of Listof)
-(require
-   (except-in srfi/67 current-compare =? <?)
-   #;"typed-list.rkt"
-   #;srfi/42
-   #;(only mzlib/list foldl))
-
-  #;(provide (all-defined))
-  (provide comparator Heap elements empty fold heap-node? find-min empty? insert insert* delete-min size union)
-
-  #;(define-type-alias top top)
-
-  (define-type-alias comparator (top top -> number))
-
-  ;; fixme - type aliases should work in require
-
-  (require/typed srfi/67
-    [current-compare (-> (top top -> number))]
-    [=? ((top top -> number) top top -> boolean)]
-    [<? ((top top -> number) top top -> boolean)])
-
-  ;;; DATA DEFINITION
-
-  ; A HEAP is either
-  ;    (make-heap-empty cmp)
-  ; or
-  ;    (make-heap-node cmp rank elm left right)
-  ; where
-  ;   cmp  is a compare function,
-  ;   rank is an integer, and
-  ;   left and right are heaps.
-
-  (define-typed-struct heap              ([compare : comparator]))
-  (define-typed-struct (heap-empty heap) ())
-  (define-typed-struct (a) (heap-node heap)
-    ([rank : Real] [elm : a] [left : (Un (heap-node a) heap-empty)] [right : (Un (heap-node a) heap-empty)]))
-
-  (define-type-alias (Heap a) (Un (heap-node a) heap-empty))
-
-  ;;; CORE HEAP OPERATIONS
-
-  ;; FIXME
-  (: empty (All (a) (case-lambda (-> (Heap a)) (comparator -> (Heap a)))))
-  (define empty
-    (case-lambda
-      [()    (make-heap-empty (current-compare))]
-      [(#{cmp : comparator}) (make-heap-empty cmp)]))
-
-  (define: empty? : (pred heap-empty) heap-empty?)
-
-  (pdefine: (a) (rank [h : (Heap a)]) : Real
-    (if (empty? h)
-        0
-        (heap-node-rank h)))
-
-  (pdefine: (a) (make [x : a] [a : (Heap a)] [b : (Heap a)]) : (Heap a)
-    (let ([ra (rank a)]
-          [rb (rank b)]
-          [cmp (heap-compare a)])
-      (if (>= ra rb)
-          (make-heap-node cmp (add1 rb) x a b)
-          (make-heap-node cmp (add1 ra) x b a))))
-
-  (pdefine: (a) (union [h1 : (Heap a)] [h2 : (Heap a)]) : (Heap a)
-    (cond
-      [(empty? h1) h2]
-      [(empty? h2) h1]
-      [else        (let* ([x (heap-node-elm h1)]
-                          [y (heap-node-elm h2)])
-                          (if<=? ((heap-compare h1) x y)
-                                (make x (heap-node-left h1) (union (heap-node-right h1) h2))
-                                (make y (heap-node-left h2) (union h1 (heap-node-right h2)))))]))
-
-  (pdefine: (a) (insert [x : a] [h : (Heap a)]) : (Heap a)
-    (let: ([cmp : comparator (heap-compare h)])
-      (union (make-heap-node cmp 1 x (make-heap-empty cmp) (make-heap-empty cmp))
-             h)))
-
-  ;; No changes other than variable annotations
-  (pdefine: (a) (delete [x : a] [h : (Heap a)]) : (Heap a)
-    (define: (delete/sf [x : a] [h : (Heap a)] [s : ((Heap a) -> (Heap a))] [f : (-> (Heap a))]) : (Heap a)
-      (cond
-        [(empty? h)
-         (s h)]
-        [(=? (heap-compare h) x (heap-node-elm h))
-         (s (union (heap-node-left h) (heap-node-right h)))]
-        [(<? (heap-compare h) x (heap-node-elm h))
-         (f)]
-        [else
-         (let ([cmp (heap-compare h)])
-           (let ([y (heap-node-elm h)]
-                 [l (heap-node-left h)]
-                 [r (heap-node-right h)])
-             (delete/sf x l
-                        (lambda: ([h1 : (Heap a)]) (s (make y h1 r)))
-                        (lambda ()   (delete/sf x r
-                                                (lambda: ([h1 : (Heap a)]) (s (make y l h1)))
-                                                (lambda () (f)))))))]))
-    (delete/sf x h
-               (lambda: ([h1 : (Heap a)]) h1)
-               (lambda ()   h)))
-
-  ;; annotated w/ no errors
-  (pdefine: (a) (delete-all [x : a] [h : (Heap a)]) : (Heap a)
-    (define: (delete-all/sf [x : a] [h : (Heap a)] [s : ((Heap a) -> (Heap a))] [f : (-> (Heap a))]) : (Heap a)
-      (cond
-        [(empty? h)
-         (s h)]
-        [(=? (heap-compare h) x (heap-node-elm h))
-         (s (union (delete-all x (heap-node-left h))
-                   (delete-all x (heap-node-right h))))]
-        [(<? (heap-compare h) x (heap-node-elm h))
-         (f)]
-        [else
-         (let ([cmp (heap-compare h)])
-           (let ([y (heap-node-elm h)]
-                 [l (heap-node-left h)]
-                 [r (heap-node-right h)])
-             (delete-all/sf x l
-                        (lambda: ([l1 : (Heap a)]) (s (delete-all/sf x r
-                                                                     (lambda: ([r1 : (Heap a)]) (make y l1 r1))
-                                                                     (lambda ()   (make y l1 r)))))
-                        (lambda ()   (delete-all/sf x r
-                                                    (lambda: ([r1 : (Heap a)]) (s (make y l r1)))
-                                                    (lambda ()   (f)))))))]))
-    (delete-all/sf x h
-                   (lambda: ([h1 : (Heap a)]) h1)
-                   (lambda ()   h)))
-
-  (pdefine: (a) (find-min [h : (heap-node a)]) : a
-    (heap-node-elm h))
-
-  (pdefine: (a) (delete-min [h : (heap-node a)]) : (Heap a)
-    (union (heap-node-left h) (heap-node-right h)))
-
-  (pdefine: (a) (get [x : a] [h : (Heap a)]) : (Un #f a)
-    (let ([cmp (heap-compare h)])
-      (define: (inner-get [h : (Heap a)] [s : (a -> a)] [f : (-> (Un #f a))]) : (Un #f a)
-        (if (empty? h)
-            (f)
-            (if=? (cmp x (heap-node-elm h))
-                  (s (heap-node-elm h))
-                  (inner-get (heap-node-left h) s
-                             (lambda () (inner-get (heap-node-right h) s
-                                                   f))))))
-      (inner-get h (lambda: ([x : a]) x) (lambda () #f))))
-
-  ;;;
-  ;;; EXTRA OPERATIONS
-  ;;;
-
-  (pdefine: (a) (delete* [xs : (list-of a)] [h : (Heap a)]) : (Heap a)
-    (foldl {ann delete : (a (Heap a) -> (Heap a))} h xs))
-
-  (pdefine: (a r) (fold [f : (a r -> r)] [b : r] [h : (Heap a)]) : r
-    (if (empty? h)
-        b
-        (fold f
-              (fold f
-                    (f (heap-node-elm h) b)
-                    (heap-node-left h))
-              (heap-node-right h))))
-
-  (pdefine: (a) (elements [h : (Heap a)]) : (list-of a)
-    (fold (lambda: ([x : a] [l : (list-of a)]) (cons x l)) '() h))
-
-  (pdefine: (a) (count [x : a] [h : (Heap a)]) : number
-    (let ([cmp (heap-compare h)])
-      (fold (lambda: ([y : a] [s : number])
-              (if=? (cmp x y)
-                    (add1 s)
-                    s))
-            0 h)))
-
-  (pdefine: (a) (-heap . [xs : a *]) : (Heap a)
-    (list->heap xs))
-
-
-  (define: list->heap : (All (a) (case-lambda (comparator (list-of a) -> (Heap a)) ((list-of a) -> (Heap a))))
-    ; time: O(n)
-    (pcase-lambda: (a)
-      [([l : (list-of a)])     (list->heap (current-compare) l)]
-      [([cmp : comparator] [l : (list-of a)])
-       (let* ([e  (#{empty @ a} cmp)]
-              [hs (map (lambda: ([x : a]) (insert x e)) l)])
-         ; (list heap) -> (list heap)
-         ;  merge adjacent pairs of heaps
-         (define: (merge-pairs [hs : (Listof (Heap a))]) : (list-of (Heap a))
-           (cond
-             [(or (null? hs)
-                  (null? (cdr hs))) hs]
-             [else
-              (cons (union (car hs) (cadr hs))
-                    (merge-pairs (cddr hs)))]))
-         (if (null? hs)
-             e
-             (let: loop : (Heap a) ([hs : (list-of (Heap a)) hs])
-               ; merge adjacent pairs of heaps until one is left
-               (cond
-                 [(null? hs)       (error 'never-happen)]
-                 [(null? (cdr hs)) (car hs)]
-                 [else             (loop (merge-pairs hs))]))))]))
-
-
-
-  (pdefine: (a) (insert* [xs : (list-of a)] [h : (Heap a)]) : (Heap a)
-    (union (list->heap (heap-compare h) xs) h))
-
-  ; select : set -> element
-  (pdefine: (a) (select [s : (Heap a)]) : a
-    (if (empty? s)
-        (error 'select "can't select an element from an empty heap")
-        (find-min s)))
-
-  (define: singleton : (All (a) (case-lambda (a -> (Heap a)) (comparator a -> (Heap a))))
-    (pcase-lambda: (a)
-      [([x : a])     (insert x (#{empty @ a}))]
-      [([cmp : comparator] [x : a]) (insert x (make-heap-empty cmp))]))
-
-  (pdefine: (a) (size [h : (Heap a)]) : Real
-    ; NOTE: T(size)=O(n)
-    (cond
-      [(heap-empty? h) 0]
-      [else            (+ (size (heap-node-left h))
-                          1
-                          (size (heap-node-right h)))]))
-
-  #|
-  ;;;
-  ;;; support for srfi-42
-  ;;;
-
-  (define-syntax heap-ec
-    (syntax-rules ()
-      [(heap-ec cmp etc1 etc ...)
-       (fold-ec (empty cmp) etc1 etc ... insert)]))
-
-  (define-syntax :heap
-    (syntax-rules (index)
-      ((:heap cc var (index i) arg)
-       (:parallel cc (:stack var arg) (:integers i)) )
-      ((:heap cc var arg)
-       (:do cc
-            (let ())
-            ((t arg))
-            (not (empty? t))
-            (let ((var (find-min t))))
-            #t
-            ((delete-min t)) ))))
-
-  (define (:heap-dispatch args)
-    (cond
-      [(null? args)
-       'heap]
-      [(and  (heap? (car args)))
-       (:generator-proc (:heap (car args)))]
-      [else
-       #f]))
-
-  (:-dispatch-set!
-   (dispatch-union (:-dispatch-ref) :heap-dispatch))
-
-  |#
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/let-no-anns.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/let-no-anns.rkt
deleted file mode 100644
index 15ff1f3e59..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/let-no-anns.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/racket
-
-(let: ((x : Integer 3)
-       (y 4))
-      (+ x y))
-
-(let: ((x 3) (y 4))
-      (+ x y))
-
-(let*: ((x 3)
-        (y : Integer (+ x 1)))
-       (+ x y))
-
-(letrec: ((x 3)
-          (y : (Integer -> Integer) (lambda (x) (y x))))
-         x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/let-partial-annotations.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/let-partial-annotations.rkt
deleted file mode 100644
index 8b402854ff..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/let-partial-annotations.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket/base
-
-(: f : Integer -> (Listof Any))
-(define (f x)
-  (let: loop ([i : Integer 0] [l '()])
-        (if (> i x)
-            l
-            (loop (add1 i) (cons i l)))))
-(f 10)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/let-values-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/let-values-tests.rkt
deleted file mode 100644
index fe16662bc6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/let-values-tests.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang typed-scheme
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias symbol Symbol)
-(define-type-alias top Any)
-(define-type-alias list-of Listof)
-(let-values ([(#{x : number} #{y : number}) (values 3 4)]
-	     [(#{z : number}) (values 3)]
-	     #;[(#{fact : (number -> number)})
-	     (lambda: ([x : number])
-	     (if (zero? x) 1 (* x (fact (- x 1)))))]
-	     #;[(#{z : number}) (- x y)])
-	    (+ x y))
-
-(letrec-values ([(#{x : number} #{y : number}) (values 3 4)])
-	       (+ x y))
-(letrec-values ([(#{x : number} #{y : number}) (values 3 4)]
-		[(#{z : number}) (- x y)]
-		[(#{fact : (number -> number)})
-		 (lambda: ([x : number])
-			  (if (zero? x) 1 (* x (fact (- x 1)))))])
-	       (+ x y))
-
-(define-values (#{x : number} #{y : number}) (values 1 2))
-#;(define-values (#{z : number}) (values 1 2))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/lifting-top-level.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/lifting-top-level.rkt
deleted file mode 100644
index 82758b61ae..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/lifting-top-level.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/load
-
-;; Test to make sure lifting is okay at the top-level for TR
-;;
-;; Would be best as a unit test, but the local expansion done in
-;; tests is different from the local expansion done for #%top-interaction
-
-(require typed/racket)
-
-(define-syntax (m stx)
-  (syntax-local-lift-expression #'(string-append "foo" "bar")))
-(m)
-
-(define-syntax (n* stx)
-  (syntax-local-lift-expression #'(string-append "foo" "bar")))
-(define-syntax (m* stx)
-  (syntax-local-lift-expression #'(n*)))
-(m*)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/list-dots.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/list-dots.rkt
deleted file mode 100644
index 1c19fff0b0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/list-dots.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang typed/racket
-
-;; tests for the new iteration of ...
-
-(: f (All (a ...) ((List a ...) -> (List a ... a))))
-(define (f x) x)
-
-(: g (All (a ...) (a ... -> (List a ...))))
-(define (g . x) x)
-
-(g 7 7 7)
-
-(: h (All (a ...) (a ... -> (Listof Any))))
-(define (h . x) x)
-
-(: h2 (All (a ...) ((Pair String a) ... -> (Listof (Pair String Any)))))
-(define (h2 . x) x)
-
-(: h3 (All (a ...) ((Pair String a) ... -> (Listof Any))))
-(define (h3 . x) x)
-
-(: h4 (All (a ...) (a ... -> Number)))
-(define (h4 . x) (length x))
-
-(: i (All (a ...) (List a ...) (a ... -> Number) -> Number))
-(define (i xs f) (apply f xs))
-
-(: i2 (All (a ...) (List a ...) (Any * -> Number) -> Number))
-(define (i2 xs f) (apply f xs))
-
-(: i3 (All (a ...) (List a ...) (List a ...) ((Pairof a a) ... -> Number) -> Number))
-(define (i3 xs ys f) (apply f (map cons xs ys)))
-
-(: i4 (All (a ...) (List a ...) (Listof Number) ((Pairof a Number) ... -> Number) -> Number))
-(define (i4 xs ys f) (apply f (map cons xs ys)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/list-ref-vec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/list-ref-vec.rkt
deleted file mode 100644
index 56b4d30d26..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/list-ref-vec.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed-scheme
-
-(: x : (Listof (Vectorof Integer)))
-(define x (list (vector 1 2 3)))
-
-(list-ref x 0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/list-struct-sum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/list-struct-sum.rkt
deleted file mode 100644
index aab802936a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/list-struct-sum.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#lang typed-scheme
-(require scheme/list)
-
-(define-type-alias (ListOf X) (U Empty (Cons X)))
-(define-struct: Empty ())
-(define-struct: (X) Cons ((first : X) (rest : (ListOf X))))
-
-(: sum ((ListOf Number) -> Number))
-(define (sum alon)
- (cond
-   [(Empty? alon) 0]
-   [else (+ (Cons-first alon)
-            (sum (Cons-rest alon)))]))
-
-
-(: sum2 ((ListOf Number) -> Number))
-(define (sum2 alon)
- (cond
-   [(Empty? alon) 0]
-   [(Cons? alon) (+ (Cons-first alon)
-                    (sum2 (Cons-rest alon)))]))
-
-(sum (make-Cons 5 (make-Cons 3 (make-Cons 1 (make-Empty)))))
-(sum2 (make-Cons 5 (make-Cons 3 (make-Cons 1 (make-Empty)))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/little-schemer.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/little-schemer.rkt
deleted file mode 100644
index 087fa50f02..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/little-schemer.rkt
+++ /dev/null
@@ -1,455 +0,0 @@
-#lang typed-scheme
-#;(require mzlib/etc)
-#;(require "prims.rkt")
-(require mzlib/match
-         (for-syntax scheme/base))
-
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias symbol Symbol)
-(define-type-alias top Any)
-(define-type-alias list-of Listof)
-
-(define-type-alias atom (Un Number Symbol Boolean))
-
-(define: atom? : (Any -> Boolean : atom) (lambda: ([v : Any]) (if (number? v) #t (if (symbol? v) #t (boolean? v)))))
-
-(define-syntax (cond* stx)
-  (syntax-case stx (else)
-    [(_ [pred expr id rhs] . rest)
-     (quasisyntax/loc stx
-         (let ([id expr])
-           (if (pred id)
-               rhs
-               #,(syntax/loc #'rest (cond . rest)))))]
-    [(_ [else . rest]) #'(begin . rest)]
-    [(_ [p . rhs] . rest)
-     #'(if p (begin . rhs)
-           (cond* . rest))]))
-
-(define-type-alias lat (list-of atom))
-
-(define: (lat? [l : (list-of top)]) : boolean
-  (cond [(null? l) #t]
-	[(atom? (car l)) (lat? (cdr l))]
-	[else #f]))
-
-(define: (member? [a : atom] [l : lat]) : boolean
-  (cond
-   [(null? l) #f]
-   [else (or (equal? a (car l))
-	     (member? a (cdr l)))]))
-
-(define: (rember [a : symbol] [l : (list-of symbol)]) : (list-of symbol)
-  (cond
-   [(null? l) l]
-   [(eq? (car l) a) (cdr l)]
-   [else (cons (car l) (rember a (cdr l)))]))
-
-(define: (multisubst [new : symbol] [old : symbol] [lat : (list-of symbol)]) : (list-of symbol)
-  (cond
-   [(null? lat) lat]
-   [(eq? (car lat) old) (cons new (multisubst new old (cdr lat)))]
-   [else (cons (car lat) (multisubst new old (cdr lat)))]))
-
-(define: (tup+ [t1 : (list-of number)] [t2 : (list-of number)]) : (list-of number)
-  (cond
-   [(null? t1) t2]
-   [(null? t2) t1]
-   [else (cons (+ (car t1) (car t2))
-	       (tup+ (cdr t1) (cdr t2)))]))
-
-(define: (len [l : (list-of top)]) : number
-  (cond
-   [(null? l) 0]
-   [else (add1 (len (cdr l)))]))
-
-(define: (pick [n : number] [lat : (list-of symbol)]) : symbol
-  (cond
-   [(zero? (sub1 n)) (car lat)]
-   [else (pick (sub1 n) (cdr lat))]))
-
-(define: (no-nums [lat : (list-of atom)]) : (list-of atom)
-  (cond
-   [(null? lat) lat]
-   [(number? (car lat)) (no-nums (cdr lat))]
-   [else (cons (car lat) (no-nums (cdr lat)))]))
-
-(define: (one? [n : number]) : boolean
-  (= n 1))
-
-(define: (rempick [n : number] [lat : (list-of atom)]) : (list-of atom)
-  (cond
-   [(one? n) (cdr lat)]
-   [else (cons (car lat)
-	       (rempick (sub1 n) (cdr lat)))]))
-
-(define: (foo2 [x : top]) : boolean
-  (if (number? x) (= x x) #f))
-
-;; doesn't work because of and! - bug in type system
-(define: (eqan? [a1 : top] [a2 : top]) : boolean
-  (cond [(and (number? a1) (number? a2)) (= a1 a2)]
-	[else (eq? a1 a2)]))
-
-(define: (occur [a : atom] [lat : (list-of atom)]) : number
-  (cond [(null? lat) 0]
-	[(eq? (car lat) a) (add1 (occur a (cdr lat)))]
-	[else (occur a (cdr lat))]))
-
-(define-type-alias SExp (mu x (U atom (Listof x))))
-
-
-;; (atom? (car l)) doesn't do anything - bug in type system
-#;(define: (rember* [a : atom] [l : (list-of SExp)]) : (list-of SExp)
-(cond
- [(null? l) l]
- [(atom? (car l))
-  (cond [(eq? (car l) a) (rember* a (cdr l))]
-	[else (cons (car l) (rember* a (cdr l)))])]
- [else (cons (rember* a (car l)) (rember* a (cdr l)))]))
-
-(define: (rember* [a : atom] [l : (list-of SExp)]) : (list-of SExp)
-  (cond
-   [(null? l) l]
-   [else
-    (let ([c (car l)])
-      (cond
-        [(atom? c)
-         (cond [(eq? c a) (rember* a (cdr l))]
-               [else (cons c (rember* a (cdr l)))])]
-        [else (cons (rember* a c) (rember* a (cdr l)))]))]))
-
-(define: (insertR* [new : atom] [old : atom] [l : (list-of SExp)]) : (list-of SExp)
-  (cond
-   [(null? l) l]
-   [else
-    (let ([c (car l)])
-      (cond
-        [(atom? c)
-         (cond
-           [(eq? c old)
-            (cons old (cons new (insertR* new old (cdr l))))]
-           [else
-            (cons c
-                  (insertR* new old (cdr l)))])]
-        [else (cons (insertR* new old c)
-                    (insertR* new old (cdr l)))]))]))
-
-(define: (occur* [a : atom] [l : (list-of SExp)]) : number
-  (cond*
-   [(null? l) 0]
-   [atom? (car l) c
-	  (cond [(eq? c a) (add1 (occur* a (cdr l)))]
-		[else (occur* a (cdr l))])]
-   [else (+ (occur* a c)
-	    (occur* a (cdr l)))]))
-
-(define: (member* [a : atom] [l : (list-of SExp)]) : boolean
-  (cond*
-   [(null? l) #f]
-   [atom? (car l) c
-	  (or (eq? a c) (member* a (cdr l)))]
-   [else (or (member* a c) (member* a (cdr l)))]))
-
-(define: (^ [n : number] [m : number]) : number
-  (if (= m 0) 1 (* n (^ n (sub1 m)))))
-
-(define: (1st-sub-exp [ae : (list-of SExp)]) : SExp
-  (car ae))
-
-(define: (2nd-sub-exp [ae : (list-of SExp)]) : SExp
-  (car (cdr (cdr ae))))
-
-(define: (operator [ae : (list-of SExp)]) : SExp
-  (car (cdr ae)))
-
-(define-type-alias num-exp (Rec N (U Number (List N (U '+ '* '^) N))))
-
-(define: (value [nexp : num-exp]) : number
-  (cond
-   [(atom? nexp) nexp]
-   [(eq? (car (cdr nexp)) '+)
-    (+ (value (car nexp))
-       (value (car (cdr (cdr nexp)))))]
-   [(eq? (car (cdr nexp)) '*)
-    (* (value (car nexp))
-       (value (car (cdr (cdr nexp)))))]
-   [else
-    (^ (value (car nexp))
-       (value (car (cdr (cdr nexp)))))]
-   ))
-
-#;(define-type aexp (Un atom (list-of aexp)))
-
-(define: (set? [l : (list-of atom)]) : boolean
-  (cond
-   [(null? l) #t]
-   [(member? (car l) (cdr l)) #f]
-   [else (set? (cdr l))]))
-
-(define: (multirember [a : atom] [l : (list-of atom)]) : (list-of atom)
-  (cond
-   [(null? l) l]
-   [(equal? a (car l)) (multirember a (cdr l))]
-   [else (cons (car l) (multirember a (cdr l)))]))
-
-(define: (makeset [l : lat]) : lat
-  (cond
-   [(null? l) l]
-   [else (cons (car l)
-	       (makeset (multirember (car l) (cdr l))))]))
-
-(define: (subset? [set1 : lat] [set2 : lat]) : boolean
-  (cond
-   [(null? set1) #t]
-   [(member? (car set1) set2)
-    (subset? (cdr set1) set2)]
-   [else #f]))
-
-(define: (subset2? [set1 : (list-of atom)] [set2 : (list-of atom)]) : boolean
-  (cond
-   [(null? set1) #t]
-   [else (and (member? (car set1) set2)
-	      (subset? (cdr set1) set2))]))
-
-(define: (intersect? [set1 : (list-of atom)] [set2 : (list-of atom)]) : boolean
-  (cond
-   [(null? set1) #t]
-   [else (or (member? (car set1) set2)
-	     (intersect? (cdr set1) set2))]))
-
-(define: (eqset? [set1 : (list-of atom)] [set2 : (list-of atom)]) : boolean
-  (and (subset? set1 set2) (subset? set2 set1)))
-
-(define: (intersect [set1 : (list-of atom)] [set2 : (list-of atom)]) : (list-of atom)
-  (cond
-   [(null? set1) set1]
-   [(member? (car set1) set2)
-    (cons (car set1) (intersect (cdr set1) set2))]
-   [else (intersect (cdr set1) set2)])
-  )
-
-(define: (union [set1 : (list-of atom)] [set2 : (list-of atom)]) : (list-of atom)
-  (cond
-   [(null? set1) set2]
-   [(member? (car set1) set2)
-    (union (cdr set1) set2)]
-   [else (cons (car set1) (intersect (cdr set1) set2))])
-  )
-
-(define: (rember-f [test? : (atom atom -> boolean)] [a : atom] [l : (list-of atom)]) : (list-of atom)
-  (cond
-   [(null? l) l]
-   [(test? (car l) a) (cdr l)]
-   [else (cons (car l) (rember-f test? a (cdr l)))]))
-
-(define: (rember-f-curry [test? : (atom atom -> boolean)]) : (atom lat -> lat)
-  (lambda: ([a : atom] [l : (list-of atom)])
-	   (cond
-	    [(null? l) l]
-	    [(test? (car l) a) (cdr l)]
-	    [else (cons (car l) ((rember-f-curry test?) a (cdr l)))])))
-
-(define: eq?-c : (atom -> (atom -> boolean))
-  (lambda: ([a : atom])
-	   (lambda: ([x : atom])
-		    (eq? x a))))
-
-(define: (insertR-f [test? : (atom atom -> boolean)] [new : atom] [old : atom] [l : (list-of atom)]) : (list-of atom)
-  (cond
-   [(null? l) l]
-   [(test? (car l) old)
-    (cons old (cons new (cdr l)))]
-   [else (cons (car l)
-	       (insertR-f test? new old (cdr l)))]))
-
-(define: (seqL [new : atom] [old : atom] [l : (list-of atom)]) : (list-of atom)
-  (cons new (cons old l)))
-
-
-(define: (seqR [new : atom] [old : atom] [l : (list-of atom)]) : (list-of atom)
-  (cons old (cons new l)))
-
-(define: (insertR-g [seq : (atom atom lat -> lat)]
-		    [test? : (atom atom -> boolean)]
-		    [new : atom] [old : atom] [l : (list-of atom)])
-  : (list-of atom)
-  (cond
-   [(null? l) l]
-   [(test? (car l) old)
-    (seq new old (cdr l))]
-   [else (cons (car l)
-	       (insertR-g seq test? new old (cdr l)))]))
-
-(define: (insertR-g-curry [seq : (atom atom (list-of atom) -> (list-of atom))])
-  : ((atom atom -> boolean) atom atom (list-of atom) -> (list-of atom))
-  (lambda: ([test? : (atom atom -> boolean)]
-	    [new : atom] [old : atom] [l : (list-of atom)])
-	   (cond
-	    [(null? l) l]
-	    [(test? (car l) old)
-	     (seq new old (cdr l))]
-	    [else (cons (car l)
-			((insertR-g-curry seq) test? new old (cdr l)))])))
-
-(define: (seqS [new : atom] [old : atom] [l : lat]) : lat
-  (cons new l))
-
-#;(define: subst : ((atom atom -> boolean) atom atom (list-of atom) -> (list-of atom))
-(insertR-g-curry seqS))
-
-(define: (atom->function [x : atom]) : (number number -> number)
-  (case x
-    [(+) +]
-    [(*) *]
-    [else ^]))
-
-;; doesn't work - is operator really a number? (bug in type system)
-;; also infinite loops checking num-exp <: SExp
-#;(define: (value-new [nexp : num-exp]) : number
-(cond
- [(number? nexp) nexp]
- [else ((atom->function (operator nexp))
-	(value-new (1st-sub-exp nexp))
-	(value-new (2nd-sub-exp nexp)))]))
-
-(define: (multiremberT [test? : (atom -> boolean)] [l : (list-of atom)]) : (list-of atom)
-  (cond
-   [(null? l) l]
-   [(test? (car l)) (multiremberT test? (cdr l))]
-   [else (cons (car l) (multiremberT test? (cdr l)))]))
-
-(define: (build [a : SExp] [b : SExp]) : (list-of SExp)
-  (cons a (cons b '())))
-
-(define: (first [pair : (list-of SExp)]) : SExp
-  (car pair))
-
-(define: (second [pair : (list-of SExp)]) : SExp
-  (car (cdr pair)))
-
-;; need to specify more about the list in the type here  - type system bug
-#;(define: (shift [pair : (list-of SExp)]) : (list-of SExp)
-(build (first (first pair))
-       (build (second (first pair))
-	      (second pair))))
-
-;; changed to test for exact-integer? before even? check.
-(define: (collatz [n : number]) : number
-  (cond [(one? n) 1]
-	[(and (exact-integer? n) (even? n)) (collatz (/ n 2))]
-	[else (collatz (add1 (* 3 n)))]))
-
-
-(define: (ack [n : number] [m : number]) : number
-  (cond
-   [(zero? n) (add1 m)]
-   [(zero? m) (ack (sub1 n) 1)]
-   [else (ack (sub1 n)
-	      (ack n (sub1 m)))]))
-
-
-					;(define-type-alias entry (list-of (list-of atom)))
-
-(define: empty-atom : (list-of (list-of atom)) '())
-
-;; FIXME
-(define: mymap : (All (a b) ((a -> b) (list-of a) -> (list-of b)))
-  (plambda: (a b) ([f : (a -> b)] [l : (list-of a)])
-    (cond [(null? l) '()]
-          [else (cons (f (car l))
-                      (mymap f (cdr l)))])))
-
-(mymap add1 (cons 1 (cons 2 (cons 3 '()))))
-
-(define-type-alias entry (list-of lat))
-
-(define-type-alias table (list-of entry))
-
-
-(define: (new-entry  [keys : (list-of atom)]
-		     [vals : (list-of atom)]) : entry
-		     (cons keys (cons vals empty-atom)))
-
-(define: (numbered? [aexp : num-exp]) : boolean
-  (cond
-   [(number? aexp) #t]
-   [(atom? aexp) #f]
-   [else (and (numbered? (car aexp))
-	      (numbered? (car (cdr (cdr aexp)))))]))
-
-(define: (lookup-in-entry-help [name : atom] [names : (list-of atom)] [values : (list-of atom)] [entry-f : (atom -> atom)]) : atom
-  (cond [(null? names) (entry-f name)]
-	[(eq? (car names) name) (car values)]
-	[else (lookup-in-entry-help name (cdr names) (cdr values) entry-f)]))
-
-(define: (lookup-in-entry [name : atom] [e : entry] [fail : (atom -> atom)]) : atom
-  (lookup-in-entry-help name (car e) (car (cdr e)) fail))
-
-(define: extend-table : (entry table -> table) #{cons @ entry Any})
-
-(define: (lookup-in-table [name : atom] [t : table] [fail : (atom -> atom)]) : atom
-  (cond
-   [(null? t) (fail name)]
-   [else (lookup-in-entry
-	  name
-	  (car t)
-	  (lambda: ([name : atom])
-		   (lookup-in-table name (cdr t) fail)))]))
-
-(define-type-alias action (atom table -> SExp))
-
-(define: (*const [e : SExp] [t : table]) : SExp
-  (cond
-   [(number? e) e]
-   [(eq? e #t) #t]
-   [(eq? e #f) #f]
-   [else (build 'primitive e)]))
-
-(define: (initial-table [name : atom]) : atom
-  (error 'fail))
-
-(define: (*identifier [e : atom] [tbl : table]) : SExp
-  (lookup-in-table e tbl initial-table))
-
-(define: (atom->action [e : atom]) : action
-  (cond
-   [(number? e) *const]
-   #;[(string? e) (error "shouldn't get strings")] ;; FIXME - had to change the code
-   [else
-    (case e
-      [(#t #f cons car cdr null? eq? atom? zero? add1 sub1 number?) *const]
-      [else *identifier])]))
-
-(define: (*quote [a : atom] [t : table]) : SExp (error 'fail))
-(define: (*lambda [a : atom] [t : table]) : SExp (error 'fail))
-(define: (*cond [a : atom] [t : table]) : SExp (error 'fail))
-(define: (*application [a : atom] [t : table]) : SExp (error 'fail))
-
-(define: (list->action [e : (list-of SExp)]) : action
-  (cond*
-   [atom? (car e) it
-	  (case it
-	    [(quote) *quote]
-	    [(lambda) *lambda]
-	    [(cond) *cond]
-	    [else *application])]
-   [else *application]))
-
-
-(define: (expression->action [e : SExp]) : action
-  (cond
-   [(atom? e) (atom->action e)]
-   [else (list->action e)]))
-
-#;(define: (meaning [e : SExp] [t : table]) : SExp
-((expression->action e) e t))
-
-#;(define: (value [e : SExp]) : SExp
-(meaning e '()))
-
-#;(provide (all-defined))
-
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/logic.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/logic.rkt
deleted file mode 100644
index 9e7dd184e1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/logic.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#lang typed-scheme
-
-(: f ((U Number #f) (cons Any Any) -> Number))
-(define (f x y)
- (cond
-   [(and (number? x) (number? (car y))) (+ x (car y))]
-   [(number? (car y)) (+ (bool-to-0-or-1 x) (car y))]
-   [(number? x) x]
-   [else 0]))
-
-(: bool-to-0-or-1 (Boolean -> Number))
-(define (bool-to-0-or-1 b)
- (if b 1 0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/lots-o-bugs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/lots-o-bugs.rkt
deleted file mode 100644
index d268e482e5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/lots-o-bugs.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang typed-scheme
-
-;; (All (a ...) ( -> (a ... a -> Integer)))
-
-(plambda: (a ...) ()
-          (lambda: [ys : a ... a] 3))
-
-(define x (plambda: (a ...) () (lambda: [ys : a ... a] 3)))
-
-
-
-(: y (All (a ...) ( -> (a ... a -> Integer))))
-(define y (plambda: (a ...) () (lambda: [ys : a ... a] 3)))
-
-(: z (All (a ...) ( -> (a ... a -> Integer))))
-(define z (lambda () (lambda ys 3)))
-
-#;((plambda: (a ...) () (lambda: [ys : a ... a] 3)))
-
-#;((plambda: (a ...) [xs : a ... a] (lambda: [ys : a ... a] 3))
-   1 2 3 "foo")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/make-predicate-mod.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/make-predicate-mod.rkt
deleted file mode 100644
index 8756c800a0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/make-predicate-mod.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket/base
-
-(: f (Any -> Boolean : Number))
-(define f (make-predicate Number))
-
-(: g (Listof Number))
-(define g (filter f '(1 2 3 4 "5")))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/make-predicate-top-level.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/make-predicate-top-level.rkt
deleted file mode 100644
index ff21ea8d97..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/make-predicate-top-level.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/load
-
-(require typed/racket)
-
-(: f (Any -> Boolean : Number))
-(define f (make-predicate Number))
-
-(: g (Listof Number))
-(define g (filter f '(1 2 3 4 "5")))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/make-top-predicate.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/make-top-predicate.rkt
deleted file mode 100644
index 9dfd725e1a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/make-top-predicate.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/racket
-(require typed/racket/async-channel)
-
-(make-predicate VectorTop)
-(make-predicate BoxTop)
-(make-predicate ChannelTop)
-(make-predicate Async-ChannelTop)
-(make-predicate HashTableTop)
-(make-predicate MPairTop)
-(make-predicate Thread-CellTop)
-(make-predicate Prompt-TagTop)
-(make-predicate Continuation-Mark-KeyTop)
-(make-predicate ClassTop)
-
-
- 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mandelbrot.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mandelbrot.rkt
deleted file mode 100644
index 47663efdad..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mandelbrot.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang typed/racket/base #:optimize
-(require racket/future racket/flonum)
-(define: MAX-ITERS : Positive-Fixnum 50)
-(define MAX-DIST 2.0)
-(define: N : Positive-Fixnum 512)
-(: mandelbrot-point : Integer Integer -> Integer)
-(define (mandelbrot-point x y)
-  (define c
-    (+ (- (/ (* 2.0 (->fl x)) N) 1.5)
-       (* 0.0+1.0i (- (/ (* 2.0 (->fl y)) N) 1.0))))
-  (let loop ((i 0) (z 0.0+0.0i))
-    (cond
-      [(> i MAX-ITERS) (char->integer #\*)]
-      [(> (magnitude z) MAX-DIST)
-       (char->integer #\space)]
-      [else (loop (add1 i) (+ (* z z) c))])))
-
-(: fs (Listof (Futureof Bytes)))
-(define fs
-  (for/list ([y (in-range N)])
-    (let ([bstr (make-bytes N)])
-      (future
-       (lambda ()
-         (for ([x (in-range N)])
-           (bytes-set! bstr x (mandelbrot-point x y)))
-         bstr)))))
-
-(lambda ()
-  (for: ([f : (Futureof Bytes) (in-list fs)])
-    (write-bytes (touch f))
-    (newline)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/manual-examples.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/manual-examples.rkt
deleted file mode 100644
index ab3e274cd2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/manual-examples.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang scheme/load
-(module tlang mzscheme
-  (require (prefix tl: typed-scheme))
-  (provide (all-from typed-scheme)))
-
-
-(module even-odd typed-scheme
-  (define: (my-odd? [n : Number]) : Boolean
-    (if (zero? n) #f
-        (my-even? (- n 1))))
-
-  (define: (my-even? [n : Number]) : Boolean
-    (if (zero? n) #t
-        (my-odd? (- n 1))))
-
-  (display (my-even? 12)))
-
-(module date typed-scheme
-
-  (define-typed-struct my-date ([day : Number] [month : String] [year : Number]))
-
-  (define: (format-date [d : my-date]) : String
-    (format "Today is day ~a of ~a in the year ~a" (my-date-day d) (my-date-month d) (my-date-year d)))
-
-  (display (format-date (make-my-date 28 "November" 2006)))
-
-  )
-
-(module tree typed-scheme
-  (define-typed-struct leaf ([val : Number]))
-  (define-typed-struct node ([left : (Un node leaf)] [right : (Un node leaf)]))
-
-  (define: (tree-height [t : (Un node leaf)]) : Integer
-    (cond [(leaf? t) 1]
-          [else (max (tree-height (node-left t))
-                     (tree-height (node-right t)))]))
-
-  (define: (tree-sum [t : (Un node leaf)]) : Number
-    (cond [(leaf? t) (leaf-val t)]
-          [else (+ (tree-sum (node-left t))
-                   (tree-sum (node-right t)))])))
-
-(module tree typed-scheme
-  (define-typed-struct leaf ([val : Number]))
-  (define-typed-struct node ([left : (Un node leaf)] [right : (Un node leaf)]))
-
-  (define-type-alias tree (Un node leaf))
-
-  (define: (tree-height [t : tree]) : Integer
-    (cond [(leaf? t) 1]
-          [else (max (tree-height (node-left t))
-                     (tree-height (node-right t)))]))
-
-  (define: (tree-sum [t : tree]) : Number
-    (cond [(leaf? t) (leaf-val t)]
-          [else (+ (tree-sum (node-left t))
-                   (tree-sum (node-right t)))])))
-
-(module add-list typed-scheme
-  (define: (sum-list [l : (Listof Number)]) : Number
-    (cond [(null? l) 0]
-          [else (+ (car l) (sum-list (cdr l)))])))
-
-(module maybe typed-scheme
-  (define-typed-struct Nothing ())
-  (define-typed-struct (a) Just ([v : a]))
-
-  (define-type-alias (Maybe a) (Un Nothing (Just a)))
-
-  (define: (find [v : Number] [l : (Listof Number)]) : (Maybe Number)
-    (cond [(null? l) (make-Nothing)]
-          [(= v (car l)) (make-Just v)]
-          [else (find v (cdr l))])))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/map-nonempty.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/map-nonempty.rkt
deleted file mode 100644
index bdb2f05324..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/map-nonempty.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/scheme
-
-(: x (Pair Integer (Listof Integer)))
-(define x (cons 1 (list 1 2 3 4)))
-
-(apply max (ann (map add1 x) : (Pair Integer (Listof Integer))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/map1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/map1.rkt
deleted file mode 100644
index 5c4e67a0d7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/map1.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed-scheme
-
-(: f ((U String Number) -> Void))
-(define (f x) (void))
-
-(map f (list 1 2 3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/map2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/map2.rkt
deleted file mode 100644
index 0d7d692893..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/map2.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed-scheme
-
-(map add1 #{(list 1 2 3) :: (Listof Integer)})
-(map add1 #{(list 1 2 3) :: (Listof Number)})
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-dots.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-dots.rkt
deleted file mode 100644
index c8a526c5f9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-dots.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed-scheme
-
-(require scheme/match)
-
-(: parse-sexpr : Any -> Number)
-(define (parse-sexpr sexpr)
-  (match sexpr
-    [(list #{(? symbol? a) : (Listof Symbol)} ...) 1]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-dots2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-dots2.rkt
deleted file mode 100644
index b2ea59a072..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-dots2.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed-scheme
-
-(require scheme/match)
-
-(: post-eval : -> Number)
-;; evaluates a postfix sequence of items, using a stack
-(define (post-eval)
-  (match '(1 2)
-    [(list (? number? #{stack : (Listof Number)}) ...) 3]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-expander-problem.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-expander-problem.rkt
deleted file mode 100644
index 4adecb673d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-expander-problem.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang typed-scheme
-
-#;(require mzlib/etc)
-;(require "prims.rkt")
-(require mzlib/match)
-
-(define-typed-struct pt ([x : Number] [y : Number]))
-
-(require (for-syntax scheme/base))
-
-
-(define-match-expander blah #:match (lambda (stx) (syntax-case stx ()
-						    [(_ . a) #'($ . a)])))
-
-(define: (pt-add/match/blah [v : Any]) : Number
-  (match v
-	 [(blah pt #{x : Number} #{y : Number}) (+ x y)]
-	 [_ 0]))
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-tests.rkt
deleted file mode 100644
index 3686d07c2f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match-tests.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed-scheme
-
-(require scheme/match)
-
-(match "abc"
-  [(regexp "^abc") 1])
-
-(match (list 1 1)
-  [(list x x) 1])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match.rkt
deleted file mode 100644
index b103770a32..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/match.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed-scheme
-
-(require scheme/match)
-
-(match 1
-  [2 3]
-  [x 4])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/member-pred.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/member-pred.rkt
deleted file mode 100644
index 26d255524d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/member-pred.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang typed/scheme
-
-(: foo : Any -> (U 'x 'y))
-(define (foo x)
-  (ann
-   (if (member x '(x y))
-       x
-       'x)
-   (U 'x 'y))
-
-  (ann
-   (if (memv x '(x y))
-       x
-       'x)
-   (U 'x 'y))
-
-  (if (memq x '(x y))
-      x
-      'x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/metrics.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/metrics.rkt
deleted file mode 100644
index 80ae64ca13..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/metrics.rkt
+++ /dev/null
@@ -1,557 +0,0 @@
-#lang typed-scheme
-(provide results run-all-tests)
-
-#;(require "../list.scm"
-         "../etc.rkt")
-(require/typed "foldo.rkt"
-  (apply-to-scheme-files
-                ((Path -> (Listof (Listof (U #f (Listof (U Real #f))))))
-                 Path
-                 -> (Listof (U #f (Listof  (Listof ( U #f (Listof (U Real #f))))))))))
-
-(define-type-alias top Any)
-(define-type-alias str String)
-
-(require/typed mzlib/file
-  [filename-extension (Path -> (U #f Bytes))]
-  [normalize-path (Path Path -> Path)]
-  [explode-path (Path -> (Listof Path))])
-(require/typed "patch.rkt" [srfi48::format (Port String String top * -> top)])
-;; FIXME - prefix
-#;(require/typed srfi48:format ( Port String String top * -> top) (prefix-in srfi48: (lib "48.rkt" "srfi")))
-(require (lib "match.rkt")
-         ;(lib "file.rkt")
-         ;(lib "list.rkt")
-         ;(lib "etc.rkt")
-         (prefix-in srfi13: (lib "13.rkt" "srfi"))
-         ;(prefix srfi48: (lib "48.rkt" "srfi"))
-         )
-
-(define-type-alias Sexpr Any)
-(define-type-alias number Real)
-(define-type-alias boolean Boolean)
-(define-type-alias NumF (U number #f))
-(define-type-alias NumFs (Listof NumF))
-(define-type-alias NumFss (Listof NumFs))
-(define-type-alias NumB (U boolean number))
-;;C is either Sexpr or Listof Sepr
-;;X = (Listof (U number #f)) - not needed as a parameter
-(define-type-alias (Unit X C) ((C ->  X) -> (Path -> (Listof (U #f X)))))
-
-;; ============================================================
-;; CONFIG
-(define: COLLECTS-PATH : (Parameter Path Path ) (make-parameter (build-path "/proj/scheme/plt/collects" #;"~/svn/plt/collects/")))
-(define: PLANET-CODE-PATH : (Parameter Path Path) (make-parameter (build-path "~/Desktop/most-recent-archives/" #;"~/local/src/planet/most-recent-archives/")))
-
-; collects-path : a path to the collects directory to compare
-; planet-code-path : a path to the "other" code to compare (i.e. unpacked, most recent versions
-;   of all planet packages)
-
-;; ============================================================
-;; STATS
-
-;; t-test : (listof number) (listof number) -> number
-;; computes t value for the given sequences. t-tests measure
-;; the extent to which difference in mean between two sets of
-;; _interval-valued_ samples (e.g. distances, times, weights, counts ...)
-;; can be explained by chance. Generally speaking, higher absolute
-;; values of t correspond to higher confidence that an observed difference
-;; in mean cannot be explained by chance.
-(define: (t-test [seqA : (Listof Real)] [seqB : (Listof Real)]) : Real
-  (manual-t-test
-   (avg seqA) (avg seqB)
-   (variance seqA) (variance seqB)
-   (length seqA) (length seqB)))
-
-(define: (manual-t-test [avga : number] [avgb : number] [vara : number]
-                        [varb : number] [cta : number] [ctb : number]) : number
-  (/ (- avga avgb)
-     (assert (sqrt (+ (/ vara cta) (/ varb ctb))) real?)))
-
-;; chi-square : (listof [0,1]) (listof [0,1]) -> number
-;; chi-square is a simple measure of the extent to which the
-;; difference in the frequency of 0's and 1's in the first
-;; sequence and their frequency in the second sequence can
-;; be explained by chance. higher numbers means higher confidence
-;; that they cannot.
-(define: (chi-square [seqA : (Listof number)] [seqB : (Listof number)]) :  number
-  (with-handlers ([exn:fail? (lambda: ([e : exn]) +nan.0)])
-    (let* ([ct-a (length seqA)]
-           [ct-b (length seqB)]
-           [total-subjects (+ ct-a ct-b)]
-           [a-hits (apply + seqA)]
-           [b-hits (apply + seqB)] ;; these assume that the data is coded as 1 = present, 0 = not present
-           [a-misses (- ct-a a-hits)]
-           [b-misses (- ct-b b-hits)]
-           [table
-            `((,a-hits ,b-hits)
-              (,a-misses ,b-misses))]
-           [expected (lambda: ([i : Integer] [j : Integer])
-                              (/ (* (row-total i table) (col-total j table)) total-subjects))])
-      (exact->inexact
-       (table-sum
-        (lambda: ([i : Integer] [j : Integer])
-                 (/ (sqr (- (expected i j) (table-ref i j table))) (expected i j)))
-        table)))))
-
-;; ============================================================
-;; UNITS OF MEASUREMENT IMPLEMENTATIONS
-
-;; per-module : path ((listof expr) -> (number | #f)) -> (path -> (listof (number | #f)))  === Unit P
-(pdefine: (X) (per-module [f : ((Listof Sexpr) ->  X )]) : (Path -> (cons (U #f X) '()))
-          (lambda: ([path : Path])
-                   (with-handlers ([exn:fail:read? (lambda: ([e : exn]) (list #f))])  ;; with handler
-                     (let ([initial-sexp (with-input-from-file path read)])
-                       (match initial-sexp
-                         [`(module ,_ ,_  . , (? list? bodies)) ;; FIXME - use ... instead of .
-                          (list (f bodies))]
-                         [_ (list #f)])))))
-
-
-;; per-module-top-level-expression : path (expr -> (number | #f)) -> (path -> (listof (number | #f)))
-(define: (per-module-top-level-expression [f : (Sexpr -> (Listof NumF))] ) : ( Path -> (Listof (U #f (Listof NumF))))
-  (let ([calc (per-module (lambda: ([exprs : (Listof Sexpr)]) (map f exprs)))])
-    (lambda: ([p : Path]) (let* ([r  (calc p)]
-                                 [carr (car r)]) ;;carr added
-                            (if carr  carr
-                                (list carr)))))) ;; list carr instead of r
-
-;; ============================================================
-;; BASIC CALCULATIONS
-;; (for use with metric definitions below)
-
-;; ----------------------------------------
-;; depth
-
-(define: (sexp-depth [sexp : Any]) : number
-  (cond
-    [(list? sexp) ;; (pair? sexp)
-     (+ (max-sexp-depth sexp) 1)]
-    [else 0]))
-
-(define: (max-sexp-depth [losx : (Listof Any)]) : number
-  (improper-foldr (lambda: ([t : Any] [r : number]) (max (sexp-depth t) r)) 0 losx))
-
-(define: (avg-sexp-depth [sexps : (Listof Any)]) : number
-  (cond
-    [(null? sexps) 0]
-    [else (avg (map sexp-depth sexps))]))
-
-;; ----------------------------------------
-;; setbang counts
-
-(define-type-alias (IList e) (mu x (Un e '() (cons e x))))
-
-;; count-setbangs/ilist : ((ilistof expr) -> number)
-(define: (count-setbangs/ilist [exprs : (Listof Any)]) : number
-  (apply + (imap count-setbangs/expr exprs)))
-
-;; FIXME - changes having to do with match ...
-(define: (count-setbangs/expr [expr : Any]) : number
-  (match expr
-    [`(,(? setbang?) . ,rest ) ;(,(? setbang?) ,rest ...)
-     (if (list? rest)
-         (+ 1 (count-setbangs/ilist rest))
-         0)] ;; mostly occurs in syntax patterns
-    [('quote _) 0]
-    [('quasiquote _) 0] ; undercount potentially, but how many `,(set! ...)'s can there be?
-    [`(,e1 . ,e2)
-     (if (list? expr)
-         (count-setbangs/ilist expr)
-         (error " l" expr ))]   ;;FIXME - do something intelligent here
-    [_ 0]))
-
-;; setbang? : sexp -> boolean
-(define: (setbang? [v : Any]) : Any
-  (and (symbol? v)
-       (regexp-match #rx"^set(-.*)?!" (symbol->string v))))
-
-;; count-fns
-(define: (count-fns-with-setbangs [exprs : (Listof Sexpr)]) : number
-  (apply + (map (lambda: ([e : Sexpr]) (if (= (count-setbangs/expr e) 0) 0 1)) exprs)))
-(define: (module-has-setbangs? [exprs : (Listof Sexpr)]) : Boolean
-  (ormap expr-uses-setbangs? exprs))
-(define: (expr-uses-setbangs? [expr : Sexpr]) : Boolean
-  (not (= (count-setbangs/expr expr) 0)))
-
-(define: (setbangs-per-1000-atoms [exprs : (Listof Any)]) : NumF
-  (if (null? exprs)
-      #f
-      (let ([set!s (count-setbangs/ilist exprs)]
-            [atoms (atoms exprs)])
-        (* (/ set!s atoms) 1000.0))))
-
-;; ----------------------------------------
-;; contracts
-
-
-(define: (uses-contracts [exprs : (Listof Sexpr)]) : Boolean
-  (ormap (lambda: ([e : Sexpr])
-                  (match e
-                    [`(provide/contract . ,_) #t]
-                    [_ #f]))
-         exprs))
-
-(define: (contracted-provides [exprs : (Listof Sexpr)]):  number
-  (foldl
-   (lambda: ([t : Sexpr] [r : number])
-            (match t
-              ;; FIXME match ...
-              [`(provide/contract . ,p ) ;(provide/contract ,p ...)
-               (if (list? p)
-                   (+ (length p) r)
-                   r)] ;; extra case added
-              [_ r]))
-   0
-   exprs))
-
-;; FIXME - same problem with match ...
-(define: (uncontracted-provides [exprs : (Listof Sexpr)]) : number
-  (foldl
-   (lambda: ([t : Sexpr] [r : number])
-            (match t
-              [`(provide . ,p ) ;(provide ,p ...)
-               (if (list? p)
-                   (+ (length p) r)
-                   r)]
-              [_ r]))
-   0
-   exprs))
-
-;; ----------------------------------------
-;; macros
-
-(define: (number-of-macro-definitions [expr : Sexpr]) : number
-  (match expr
-    [`(define-syntax ,_ ...) 1]
-    [`(define-syntaxes (,s . ,r ). ,_ ) ;`(define-syntaxes (,s ...) ,_ ...)
-     (if (and (list?  expr)(list? r))
-         (length (cons s r));;s -> cadr expr
-         (error "corrupted file"))]
-    [`(define-syntax-set (,s . ,r) . ,_ ) ;(define-syntax-set (,s ...) ,_ ...)
-     (if (and (list? expr) (list? r))
-         (length (cons s r))
-         (error "corrupted file"))]
-    [_ 0]))
-
-(define: (num-of-define-syntax [exprs : (Listof Sexpr)]) : number
-  (foldl (lambda: ([t : Sexpr] [r : number]) (+ (number-of-macro-definitions t) r)) 0 exprs))
-
-;; ----------------------------------------
-;; expression size
-
-(define: (atoms [sexp : Any]) : number
-  (cond
-    [(null? sexp) 0]
-    [(not (pair? sexp)) 1]
-    [else (+ (atoms (car sexp)) (atoms (cdr sexp)))]))
-
-(define: (max-atoms [exprs : (Listof Sexpr)]) : NumF
-  (let ([atom-counts (map atoms exprs)])
-    (if (null? atom-counts)
-        #f
-        (apply max 0 atom-counts)))) ;; FIXME: expected at least 2 argument--->   0 added !!!
-
-(define: (avg-atoms [exprs : (Listof Sexpr)]) : NumF
-  (let ([atom-counts (map atoms exprs)])
-    (if (null? atom-counts)
-        #f
-        (avg (map atoms exprs)))))
-
-(define: (total-atoms [exprs : (Listof Sexpr)]) : number
-  (apply + (map atoms exprs)))
-
-
-;; ============================================================
-;; METRIC DEFINITIONS
-;; 'a 'b metric : (string * (listof sexp -> 'a option) * ((listof 'a) (listof 'a) -> 'b)
-(define-typed-struct (b c d) metric ([analysis-unit : (Unit (Listof NumF) c)]
-                                     [computation : (c -> d)]
-                                     [>display : ((Listof d) (Listof d) -> b)]))
-(define-type-alias Metric metric)
-(define-type-alias Table (Listof (Listof Real)))
-(define-type-alias Atom-display (cons Symbol (Listof Real)))
-
-(define: (standard-display [name : Symbol]
-                           [summarize : ((Listof number) -> number)]
-                           [significance-test : ((Listof number)(Listof number) -> number)])
-  : ((Listof NumF) (Listof NumF) -> Atom-display)
-  ;; FIXME - use lambda instead of (define ((
-  (lambda: ([seqA : (Listof NumF)] [seqB : (Listof NumF)])
-           (let ([clean-seqA (nonfalses seqA)]
-                 [clean-seqB (nonfalses seqB)])
-             (list name (summarize clean-seqA) (summarize clean-seqB) (significance-test clean-seqA clean-seqB)))))
-
-(pdefine: (c) (interval [u : (Unit (Listof NumF) c)]
-                        [name : Symbol]
-                        [compute : (c -> NumF)])
-          : (Metric Atom-display c NumF)
-          (make-metric u compute (standard-display name avg t-test)))
-
-(pdefine: (c) (count [u : (Unit (Listof NumF) c)]
-                     [name : Symbol]
-                     [compute : (c -> Boolean)])
-          : (Metric  Atom-display c NumF)
-          (make-metric u (lambda: ([es : c]) #{(if (compute es) 1 0) :: NumF}) (standard-display name avg chi-square)))
-
-(pdefine: (c) (combine-metrics [ms : (Listof (Metric Atom-display c NumF))])
-          : (Metric (Listof Atom-display) c (Listof NumF))
-          (let ([u (metric-analysis-unit (car ms))])
-            ;; This test now redundant b/c of typechecking
-            (unless (andmap (lambda: ([m : (Metric Atom-display c NumF) ]) (eq? u (metric-analysis-unit m))) ms)
-              (error 'combine-metrics "all combined metrics must operate on the same unit of analysis"))
-
-            (make-metric
-             u
-             (lambda: ([exprs : c] ) (map (lambda: ([m : (Metric Atom-display c NumF)]) ((metric-computation m) exprs)) ms))
-             (lambda: ([seqA : (Listof (Listof NumF))] [seqB : (Listof (Listof NumF))])
-                      (map (lambda: ([m : (Metric Atom-display c NumF)]
-                                     [sA : (Listof NumF)]
-                                     [sB : (Listof NumF)])
-                                    ((metric->display m) sA sB)) ms (pivot seqA) (pivot seqB))))))
-
-;; FIXME - should go in helper file
-;; FIXME - (filter (lambda (x) x) l)
-(pdefine: (X) (nonfalses [l : (Listof (U #f X))]) : (Listof X)
-          (let: loop : (Listof X) ([lst :(Listof (U #f X)) l])
-                (if (null? lst)
-                    '()
-                    (let ([x (car lst)])
-                      (if x
-                          (cons x (loop (cdr lst)))
-                          (loop (cdr lst)))))))
-
-(define: (avg [l : (Listof number)]) : number
-  (/ (exact->inexact (apply + l)) (length l)))
-(define: (avg* [l : (Listof number)]) : number
-  (avg (nonfalses l)))
-
-(require (for-syntax scheme/base))
-
-(define-syntax (define-metrics stx)
-  (syntax-case stx ()
-    [(define-metrics all-metrics-id unit-of-analysis type (name kind fn) ...) ;;TYPE ADDED !!!!
-     (with-syntax ([(kind-app ...) (for/list ([k (syntax->list #'(kind ...))]
-                                              [n (syntax->list #'(name ...))]
-                                              [f (syntax->list #'(fn ...))])
-                                     (quasisyntax/loc k (#,k u '#,n #,f)))])
-       (syntax/loc
-           stx
-         (begin
-           (define: u : ((type -> (Listof NumF)) -> (Path -> (Listof (U #f(Listof NumF))))) unit-of-analysis )
-           (define: name : (Metric Atom-display type NumF) kind-app) ...
-           (define: all-metrics-id : (Metric (Listof Atom-display) type (Listof NumF)) (combine-metrics (list name ...))))))]))
-
-(define-metrics module-metrics #{per-module @ (Listof NumF)} (Listof Sexpr)
-  (maximum-sexp-depth        interval  max-sexp-depth)
-  (average-sexp-depth        interval  avg-sexp-depth)
-  (number-of-setbangs/mod    interval  count-setbangs/ilist)
-  (number-of-exprs           #{interval @ (Listof Any)}  #{length @ Any})
-  (uses-setbang?/mod         count     module-has-setbangs?)
-  (uses-contracts?           count     uses-contracts)
-  (number-of-contracts       interval  contracted-provides)
-  (num-uncontracted-provides interval  uncontracted-provides)
-  (number-of-macro-defs      interval  num-of-define-syntax)
-  (maximum-num-atoms         interval  max-atoms)
-  (average-num-atoms         interval  avg-atoms)
-  (total-num-atoms/mod       interval  total-atoms)
-  (set!s-per-1000-atoms      interval  setbangs-per-1000-atoms))
-
-(define-metrics tl-expr-metrics per-module-top-level-expression  Sexpr
-  (uses-setbang?/fn          count     expr-uses-setbangs?)
-  (number-of-setbangs/fn     interval  count-setbangs/expr)
-  (total-num-atoms/fn        interval  atoms))
-
-(define: all-metrics : (Listof (U (Metric (Listof Atom-display) Sexpr (Listof NumF))
-                                  (Metric (Listof Atom-display) (Listof Sexpr) (Listof NumF))))
-  (list module-metrics tl-expr-metrics))
-
-;; ============================================================
-;; EXPERIMENT RUNNING
-
-;; FIXME - everything in untyped file (foldo.rkt) b/c fold-files has terrible api
-#;(define-syntax (define-excluder stx)
-
-    (define (path->clause c)
-      (syntax-case c ()
-        [(item ...)
-         #`[`(#,@(reverse (syntax-e #'(item ...))) ,_ (... ...)) #t]]
-        [item
-         #`[`(item) #t]]))
-
-    (syntax-case stx ()
-      [(_ name path ...)
-       (with-syntax ([(match-clause ...) (map path->clause (syntax-e #'(path ...)))])
-         #`(define: (name [p : Path]) : top
-             (let* ([dirnames (map path->string (explode-path p))])
-               (match (reverse dirnames) ; goofy backwards matching because ... matches greedily
-                 match-clause ...
-                 [_ #f]))))]))
-
-#;(define-excluder default-excluder
-    "compiled" ".svn" #;("collects" "drscheme") #;("collects" "framework"))
-
-#;(define: exclude-directory? : (Parameter (Path -> Any)) (make-parameter default-excluder))
-
-;; ----------------------------------------
-;; apply-to-scheme-files: (path[file] -> X) path[directory] -> (listof X)
-;; applies the given function to each .rkt or .ss or .scm file in the given
-;; directory hierarchy; returns all results in a list
-#;(define:  (apply-to-scheme-files [f : (Path -> (Listof(Listof(Listof NumF))))]
-                                   [root : Path])
-    : (Listof (Listof(Listof(Listof NumF)))) ;;FOLD-FILES
-
-    (fold-files
-     (lambda: ([path : Path] [kind : Symbol]
-                             [acc : (Listof (Listof(Listof(Listof NumF))))])
-              (case kind
-                [(file)
-                 (let ([extension (filename-extension path)])
-                   (cond
-                     [(not extension) #;acc (values acc #t)]
-                     [(regexp-match #rx"(ss|scm)$" extension)
-                      (let ([resl (f path)])
-                        (if resl
-                            #;(cons resl acc) (values (cons resl acc) #t) ;;values added
-                            #;acc (values acc #t)))]
-                     [else #;acc (values acc #t)]))]
-                [(dir)
-                 (let* ([p (normalize-path path root)])
-                   (if ((exclude-directory?) p)
-                       #; acc (values acc #f)
-                       #;acc (values acc #t)))]         ;; values added
-                [(link) #;acc (values acc #t)]
-                [else (error "never happen")]))  ;;error added
-     '()
-     root
-     #t)) ;;value added
-
-(define-typed-struct (a b c) result ([metric : (Metric b c a)] [seqA : (Listof a)] [seqB : (Listof a)]))
-(define-type-alias Result result)
-
-;; get-sequences : (listof 'a metric) path -> (listof (listof 'a))
-
-(pdefine: (b c) (get-sequences [metrics : (Listof (U (Metric  b c (Listof NumF))))]
-                                 [path : Path])
-          :  (Listof (Listof (Listof NumF)))
-          (let* ([metric-fns ; : (Listof (Path -> (Listof (U #f(Listof NumF)))))
-                  (map (lambda: ([m : (Metric  b c (Listof NumF))])
-                                ((metric-analysis-unit m)
-                                 (metric-computation m))) metrics)]
-                 [#{result-seqs  : (Listof (U #f (Listof (Listof ( U #f (Listof NumF))))))}
-                  (apply-to-scheme-files
-                   (lambda: ([file : Path])
-                            (map (lambda: ([fn : (Path -> (Listof (U #f (Listof NumF))))]) (fn file)) metric-fns)) path)])
-            (map (lambda: ([l :  (Listof(Listof (Option (Listof NumF))))])
-                          ;; FIXME - problem with inference and ordering
-                          (nonfalses (apply append l)))
-                 (pivot (nonfalses result-seqs)))))
-
-;; compare* : (listof metric) -> (listof result)
-(: compare* (All (b c)
-                 ((Listof (Metric b c (Listof NumF)))
-                  ->
-                  (Listof (Result (Listof NumF) b c)))))
-(define (compare* metrics)
-  (let* ([seqAs (get-sequences metrics (COLLECTS-PATH))]
-         [seqBs (get-sequences metrics (PLANET-CODE-PATH))])
-    (map #{make-result @ (Listof NumF) b c} metrics seqAs seqBs)))
-
-(pdefine: (a b c) (show [result : (Result a b c)]) : b
-          ((metric->display (result-metric  result))
-           (result-seqA result )
-           (result-seqB result )))
-
-(define: (a) (pretty-print-result [result : (Result (Listof NumF) (Listof Atom-display) a)]) : Void
-  (for-each
-   (lambda: ([l : (Listof Any)])
-            (apply srfi48::format ;;sfri48:format
-                   (current-output-port)
-                   "~26F  | ~8,2F  | ~6,2F  | ~12,2F\n"
-                   (format "~a" (car l))
-                   (cdr l)))
-   (list* '("test name" "collects" "planet" "significance")  ;;list instead of list*
-          '("---------" "--------" "------" "------------")
-          (show result ))))
-
-;; applies only to the combined metric [or more generally to listof-answer results]
-(pdefine: (a b c) (total [experiment-number : Integer] [result : (Result (Listof number) b c)]) : (Listof number)
-          (define: (total/s [s : Table]) : number (apply + (list-ref (pivot s) experiment-number)))
-          (list (total/s (result-seqA result)) (total/s (result-seqB result))))
-
-;; ============================================================
-;; UTILITY
-
-(pdefine: (X Y) (imap [f : (X -> Y)] [il : (Listof X)]) : (Listof Y)
-          (cond
-            [(null? il) '()]
-            [(not (pair? il)) (list (f il))]
-            [else (cons (f (car il)) (imap f (cdr il)))]))
-
-(pdefine: (X) (pivot [l : (Listof (Listof X))]): (Listof (Listof X))
-          (cond
-            [(null? l) '()]
-            [else
-             (let ([n (length (car l))])
-               (build-list n (lambda: ([i : Integer]) (map (lambda: ([j : (Listof X)]) (list-ref j i)) l))))]))
-
-(define: (sqr [x : Real]) : Real (* x x))
-(define: (variance [xs : (Listof Real)]): Real
-  (let ([avg (/ (apply + xs) (length xs))])
-    (/ (apply + (map (lambda: ([x : number]) (sqr (- x avg))) xs))
-       (sub1 (length xs)))))
-
-(define: (table-ref [i : Integer] [j : Integer] [table : Table]): number
-  (list-ref (list-ref table i) j))
-(define: (row-total [i : Integer] [table : Table]) : number
-  (apply + (list-ref table i)))
-(define: (col-total [j : Integer] [table : Table]) : number
-  (apply + (map (lambda: ([x : (Listof number)]) (list-ref x j)) table)))
-(define: (table-sum [f : (Integer Integer -> Real)] [table : Table]) : number
-  (let ([rows (length table)]
-        [cols (length (car table))])
-    (let loop ([i 0] [j 0] [#{sum : Real} 0])
-          (cond
-            [(>= j cols) sum]
-            [(>= i rows) (loop 0 (add1 j) sum)]
-            [else        (loop (add1 i) j (+ sum (f i j)))]))))
-
-(pdefine: (Y) (improper-foldr [f : (Any Y -> Y)] [b : Y] [l : Any]) : Y
-          (cond
-            [(null? l) b]
-            [(not (pair? l))
-             (f l b)]
-            [else
-             (f (car l) (improper-foldr f b (cdr l)))]))
-
-;; unused (and untypeable)
-#;(define: (/* . [args : (Listof number)]) : number  ;;((number)) against (number) and USELESS
-    (apply map (lambda: ([ns : number]) (apply / ns)) args))
-
-
-;; ============================================================
-;; MAIN ENTRY POINT
-
-(define: results :
-  #;Any
-  ;; FIXME bug in typed scheme when this type is used
-
-  (Listof (U (Result (Listof NumF) (Listof Atom-display) (Listof Sexpr))
-             (Result (Listof NumF) (Listof Atom-display) Sexpr)))
-  '())
-; just in case i want to do some more analysis on the results afterwards,
-; so i don't have to waste a minute if i forget to bind the return value to something
-(define: (run-all-tests) : top
-  (let*: ([rs1 :  (Listof (Result (Listof NumF) (Listof Atom-display) (Listof Any)))
-               (#{compare* @ (Listof Atom-display) (Listof Any)}
-                (list module-metrics))]
-          [rs2 :  (Listof (Result (Listof NumF) (Listof Atom-display) Any))
-               (#{compare* @ (Listof Atom-display) Any}
-                (list tl-expr-metrics))])
-         (let
-             ([rs (append rs1 rs2)])
-           (set! results rs)
-           (for-each #{pretty-print-result @ (Listof Any)} rs1)
-           (for-each #{pretty-print-result @ Any} rs2)
-           rs)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/module-lang.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/module-lang.rkt
deleted file mode 100644
index 3b47b96be0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/module-lang.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang scheme/load
-
-(module m typed-scheme
-  (: f (All (a) (a -> a)))
-  (define (f x) x)
-  (provide f))
-
-(module n typed-scheme
-  (require 'm))
-
-(require typed-scheme)
-
-(require 'n)
-
-(current-namespace (module->namespace ''n))
-
-(f 1)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/module-plus.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/module-plus.rkt
deleted file mode 100644
index e203182bdb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/module-plus.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/racket
-
-(: f : Integer -> Integer)
-(define (f x) x)
-
-(module+ main
-  (: g : Integer -> Integer)
-  (f (+ 3 5)))
-
-(module+ main
-  (define (g x) (add1 x)))
-
-(module+ main
-  (g (f 7)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/module-repl.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/module-repl.rkt
deleted file mode 100644
index 74c31e06d4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/module-repl.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/load
-
-(module m typed/racket (define x 1))
-
-(require 'm)
-
-(current-namespace (module->namespace ''m))
-
-(eval 'x)
-(eval 5)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mpair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mpair.rkt
deleted file mode 100644
index 708cf975f4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mpair.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket
-
-(define: x : (MPairof Integer Integer) (mcons 1 2))
-(set-mcar! x -7)
-(mcar x)
-(mcdr x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mu-rec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mu-rec.rkt
deleted file mode 100644
index 4de1546e1c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mu-rec.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed-scheme
-
-(define: (evenp [n : Number]) : Boolean
-  (if (zero? n) #t (oddp (- n 1))))
-
-(define: (oddp [n : Number]) : Boolean
-  (if (zero? n) #f (evenp (- n 1))))
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/multi-arr-parse.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/multi-arr-parse.rkt
deleted file mode 100644
index 9e04542101..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/multi-arr-parse.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/scheme
-
-(: foo : (Integer -> Integer -> Integer))
-(define ((foo x) y) 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mutable-poly-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mutable-poly-struct.rkt
deleted file mode 100644
index 4c1f16bd84..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mutable-poly-struct.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket
-
-(define-struct: (A) X ([b : A]) #:mutable)
-
-set-X-b!
-
-(struct: (A) Foo ([x : Integer]) #:mutable)
-(define x (Foo 10))
-(set-Foo-x! x 100)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mutable-struct-pred.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mutable-struct-pred.rkt
deleted file mode 100644
index fbc998e68e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/mutable-struct-pred.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/scheme
-
-(define-struct: x ([y : Any]) #:mutable)
-
-(define: the-x : Any (make-x 1))
-
-(if (x? the-x)
-    (x-y the-x)
-    0)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/namespace-anchor.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/namespace-anchor.rkt
deleted file mode 100644
index 60e58b9724..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/namespace-anchor.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket/base
-
-;; Tests namespace anchors. Not a unit test because `define-namespace-anchor`
-;; only works at the top-level or in a module.
-
-(: x Namespace-Anchor)
-(define-namespace-anchor x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/nested-poly.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/nested-poly.rkt
deleted file mode 100644
index 5e51e83545..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/nested-poly.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang typed-scheme
-
-(require typed-racket/base-env/extra-procs)
-
-(: f (All (A ...) (All (B ...) (A ... A -> Integer))))
-
-(define (f . xs) 5)
-
-(: map-with-funcs
-   (All (A ...)
-        (All (B ...)
-             ((B ... B -> A) ... A ->
-              (B ... B -> (values A ... A))))))
-(define (map-with-funcs . fs)
-  (lambda as
-    (apply values (map (plambda: (C) ([f : (B ... B -> C)])
-                                 (apply f as))
-                        fs))))
-
-(inst map-with-funcs Integer Integer Integer Integer)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/new-metrics.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/new-metrics.rkt
deleted file mode 100644
index da284ac88e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/new-metrics.rkt
+++ /dev/null
@@ -1,508 +0,0 @@
-#lang typed-scheme
-(provide results run-all-tests)
-
-(require (except-in scheme/list count) scheme/math scheme/path mzlib/match
-         (prefix-in srfi13: srfi/13) scheme/file
-         (for-syntax scheme/base))
-
-
-(require/typed (prefix-in srfi48: srfi/48)
-               [srfi48:format ( Port String String Any * -> Any)] )
-
-(define-type-alias NumF (U Number #f))
-
-(define-type-alias (Unit C) ((C ->  (Listof NumF)) -> (Path -> (Listof (U #f (Listof NumF))))))
-
-;; ============================================================
-;; CONFIG
-(define COLLECTS-PATH (make-parameter (build-path "/home/samth/Desktop/collects-tmp/")))
-(define PLANET-CODE-PATH (make-parameter (build-path "/home/samth/Desktop/most-recent-archives/")))
-
-; collects-path : a path to the collects directory to compare
-; planet-code-path : a path to the "other" code to compare (i.e. unpacked, most recent versions
-;   of all planet packages)
-
-;; ============================================================
-;; STATS
-
-(: t-test  ((Listof Number) (Listof Number) -> Number))
-;; computes t value for the given sequences. t-tests measure
-;; the extent to which difference in mean between two sets of
-;; _interval-valued_ samples (e.g. distances, times, weights, counts ...)
-;; can be explained by chance. Generally speaking, higher absolute
-;; values of t correspond to higher confidence that an observed difference
-;; in mean cannot be explained by chance.
-(define (t-test seqA seqB)
-  (manual-t-test
-   (avg seqA) (avg seqB)
-   (variance seqA) (variance seqB)
-   (length seqA) (length seqB)))
-
-(: manual-t-test (Number Number Number Number Number Number -> Number))
-(define (manual-t-test avga avgb vara varb cta ctb)
-  (/ (- avga avgb)
-     (assert (sqrt (+ (/ vara cta) (/ varb ctb))) number?)))
-
-(: chi-square  ((Listof Number) (Listof Number) -> Number))
-;; chi-square is a simple measure of the extent to which the
-;; difference in the frequency of 0's and 1's in the first
-;; sequence and their frequency in the second sequence can
-;; be explained by chance. higher numbers means higher confidence
-;; that they cannot.
-(define (chi-square seqA seqB)
-  (with-handlers ([exn:fail? (λ (e) +nan.0)])
-    (let* ([ct-a (length seqA)]
-           [ct-b (length seqB)]
-           [total-subjects (+ ct-a ct-b)]
-           [a-hits (apply + seqA)]
-           [b-hits (apply + seqB)] ;; these assume that the data is coded as 1 = present, 0 = not present
-           [a-misses (- ct-a a-hits)]
-           [b-misses (- ct-b b-hits)]
-           [table
-            `((,a-hits ,b-hits)
-              (,a-misses ,b-misses))]
-           [expected (λ: ([i : Integer] [j : Integer])
-                         (/ (* (row-total i table) (col-total j table)) total-subjects))])
-      (exact->inexact
-       (table-sum
-        (λ (i j) (/ (sqr (- (expected i j) (table-ref i j table))) (expected i j)))
-        table)))))
-
-;; ============================================================
-;; UNITS OF MEASUREMENT IMPLEMENTATIONS
-
-(: per-module (All (X) (((Listof Any) ->  X) -> (Path -> (List (U #f X))))))
-(define (per-module f)
-  (λ (path)
-    (with-handlers ([exn:fail:read? (λ (e) (list #f))])
-      (let ([initial-sexp (with-input-from-file path read)])
-        (match initial-sexp
-          [`(module ,_ ,_  ,bodies ...)
-           (list (f bodies))]
-          [_ (list #f)])))))
-
-(: per-module-top-level-expression ((Any -> (Listof NumF)) -> MetricFn))
-(define (per-module-top-level-expression f)
-  (let ([calc (per-module (λ: ([exprs : (Listof Any)]) (map f exprs)))])
-    (λ (p) (let ([r  (calc p)]) (if (car r) (car r) r)))))
-
-;; ============================================================
-;; BASIC CALCULATIONS
-;; (for use with metric definitions below)
-
-;; ----------------------------------------
-;; depth
-
-(: sexp-depth (Any -> Integer))
-(define (sexp-depth sexp)
-  (cond
-    [(pair? sexp)
-     (+ (max-sexp-depth sexp) 1)]
-    [else 0]))
-
-(: max-sexp-depth (Any -> Integer))
-(define (max-sexp-depth losx)
-  (improper-foldr (λ: ([t : Any] [r : Integer]) (max (sexp-depth t) r)) 0 losx))
-
-(: avg-sexp-depth ((Listof Any) -> Number))
-(define (avg-sexp-depth sexps)
-  (cond
-    [(null? sexps) 0]
-    [else (avg (map sexp-depth sexps))]))
-
-;; ----------------------------------------
-;; setbang counts
-
-(: count-setbangs/ilist (Any -> Number))
-(define (count-setbangs/ilist exprs)
-  (apply + (imap count-setbangs/expr exprs)))
-(: count-setbangs/expr (Any -> Number))
-(define (count-setbangs/expr expr)
-  (match expr
-    [`(,(? setbang?) ,rest ...) (+ 1 (count-setbangs/ilist rest))]
-    [('quote _) 0]
-    [('quasiquote _) 0] ; undercount potentially, but how many `,(set! ...)'s can there be?
-    [`(,e1 . ,e2) (count-setbangs/ilist expr)]
-    [_ 0]))
-
-(: setbang?  (Any -> Any))
-(define (setbang? v)
-  (and (symbol? v)
-       (regexp-match #rx"^set(-.*)?!" (symbol->string v))))
-
-;; count-fns
-(: count-fns-with-setbangs ((Listof Any) -> Number))
-(define (count-fns-with-setbangs exprs)
-  (apply + (map (λ (e) (if (= (count-setbangs/expr e) 0) 0 1)) exprs)))
-(: module-has-setbangs? ((Listof Any) -> Boolean))
-(define (module-has-setbangs? exprs) (ormap expr-uses-setbangs? exprs))
-(: expr-uses-setbangs? (Any -> Boolean))
-(define (expr-uses-setbangs? expr)
-  (not (= (count-setbangs/expr expr) 0)))
-
-(: setbangs-per-1000-atoms ((Listof Any) -> NumF))
-(define (setbangs-per-1000-atoms exprs)
-  (if (null? exprs)
-      #f
-      (let ([set!s (count-setbangs/ilist exprs)]
-            [atoms (atoms exprs)])
-        (* (/ set!s atoms) 1000.0))))
-
-;; ----------------------------------------
-;; contracts
-
-(: uses-contracts ((Listof Any) -> Boolean))
-(define (uses-contracts exprs)
-  (ormap (λ (e)
-           (ann
-            (match e
-              [`(provide/contract ,_ ...) #t]
-              [_ #f])
-            : Boolean))
-         exprs))
-
-(: contracted-provides ((Listof Any) -> Number))
-(define (contracted-provides exprs)
-  (foldl
-   (λ: ([t : Any] [r : Number])
-       (ann
-        (match t
-          [(provide/contract ,p ...) (+ (length p) r)]
-          [_ r]) : Number))
-   0
-   exprs))
-
-(: uncontracted-provides ((Listof Any) -> Number))
-(define (uncontracted-provides exprs)
-  (foldl
-   (λ: ([t : Any] [r : Number])
-       (ann
-        (match t
-          [`(provide ,p  ...) (+ (length p) r)]
-          [_ r]) : Number))
-   0
-   exprs))
-
-;; ----------------------------------------
-;; macros
-
-(: number-of-macro-definitions (Any -> Number))
-(define (number-of-macro-definitions expr)
-  (match expr
-    [`(define-syntax ,_ ...) 1]
-    [`(define-syntaxes (,s ...) ,_ ...) (length s)]
-    [`(define-syntax-set (,s ...) ,_ ...) (length s)]
-    [_ 0]))
-
-(: num-of-define-syntax ((Listof Any) -> Number))
-(define (num-of-define-syntax exprs)
-  (foldl (λ: ([t : Any] [r : Number]) (+ (number-of-macro-definitions t) r)) 0 exprs))
-
-;; ----------------------------------------
-;; expression size
-
-(: atoms (Any -> Integer))
-(define (atoms sexp)
-  (cond
-    [(null? sexp) 0]
-    [(not (pair? sexp)) 1]
-    [else (+ (atoms (car sexp)) (atoms (cdr sexp)))]))
-
-(: max-atoms ((Listof Any) -> NumF))
-(define (max-atoms exprs)
-  (let ([atom-counts (map atoms exprs)])
-    (if (null? atom-counts)
-        #f
-        (apply max atom-counts))))
-
-(: avg-atoms ((Listof Any) -> NumF))
-(define (avg-atoms exprs)
-  (let ([atom-counts (map atoms exprs)])
-    (if (null? atom-counts)
-        #f
-        (avg (map atoms exprs)))))
-
-(: total-atoms ((Listof Any) -> Number))
-(define (total-atoms exprs)
-  (apply + (map atoms exprs)))
-
-
-;; ============================================================
-;; METRIC DEFINITIONS
-;; 'a 'b metric : (string * (listof sexp -> 'a option) * ((listof 'a) (listof 'a) -> 'b)
-(define-typed-struct (b c d) metric ([analysis-unit : (Unit c)]
-                                     [computation : (c -> d)]
-                                     [>display : ((Listof d) (Listof d) -> b)]))
-
-(define-type-alias Table (Listof (Listof Number)))
-(define-type-alias Atom-display (cons Symbol (Listof Number)))
-
-(: standard-display (Symbol ((Listof Number) -> Number) ((Listof Number) (Listof Number) -> Number)
-                     -> ((Listof NumF) (Listof NumF) -> Atom-display)))
-(define ((standard-display name summarize significance-test) seqA seqB)
-    (let ([clean-seqA (nonfalses seqA)]
-          [clean-seqB (nonfalses seqB)])
-      (list name (summarize clean-seqA) (summarize clean-seqB) (significance-test clean-seqA clean-seqB))))
-
-(: interval (All (c) ((Unit c) Symbol (c -> NumF) -> (metric Atom-display c NumF))))
-(define (interval u name compute) (make-metric u compute (standard-display name avg t-test)))
-
-(: count (All (c) ((Unit c) Symbol (c -> Boolean) -> (metric  Atom-display c NumF))))
-(define (count u name compute) (make-metric u (λ: ([es : c]) (if (compute es) 1 0)) (standard-display name avg chi-square)))
-
-(: combine-metrics (All (c) ((Listof (metric Atom-display c NumF)) -> (metric (Listof Atom-display) c (Listof NumF)))))
-(define (combine-metrics ms)
-  (let ([u (metric-analysis-unit (car ms))])
-    ;; This test now redundant b/c of typechecking
-    (unless (andmap (λ: ([m : (metric Atom-display c NumF) ]) (eq? u (metric-analysis-unit m))) ms)
-      (error 'combine-metrics "all combined metrics must operate on the same unit of analysis"))
-
-    (make-metric
-     u
-     (λ: ([exprs : c]) (map (λ: ([m : (metric Atom-display c NumF)]) ((metric-computation m) exprs)) ms))
-     (λ: ([seqA : (Listof (Listof NumF))] [seqB : (Listof (Listof NumF))])
-              (map (λ: ([m : (metric Atom-display c NumF)]
-                             [sA : (Listof NumF)]
-                             [sB : (Listof NumF)])
-                            ((metric->display m) sA sB)) ms (pivot seqA) (pivot seqB))))))
-
-;; FIXME - (filter (lambda (x) x) l)
-(: nonfalses (All (X) ((Listof (U #f X)) -> (Listof X))))
-(define (nonfalses l)
-  (let loop ([lst l])
-    (if (null? lst)
-        '()
-        (let ([x (car lst)])
-          (if x
-              (cons x (loop (cdr lst)))
-              (loop (cdr lst)))))))
-
-(: avg ((Listof Number) -> Number))
-(define (avg l) (/ (exact->inexact (apply + l)) (length l)))
-(: avg* ((Listof Number) -> Number))
-(define (avg* l) (avg (nonfalses l)))
-
-(define-syntax define-metrics
-  (syntax-rules ()
-    [(define-metrics all-metrics-id unit-of-analysis  (name kind fn) ...)
-     (begin
-       (define u unit-of-analysis)
-       (define name (kind u 'name fn )) ...
-       (define all-metrics-id (combine-metrics (list name ...))))]))
-
-(define-metrics module-metrics #{per-module @ (Listof NumF)}
-  (maximum-sexp-depth        interval  max-sexp-depth)
-  (average-sexp-depth        interval  avg-sexp-depth)
-  (number-of-setbangs/mod    interval  count-setbangs/ilist)
-  (number-of-exprs           interval  #{length @ Any})
-  (uses-setbang?/mod         count     module-has-setbangs?)
-  (uses-contracts?           count     uses-contracts)
-  (number-of-contracts       interval  contracted-provides)
-  (num-uncontracted-provides interval  uncontracted-provides)
-  (number-of-macro-defs      interval  num-of-define-syntax)
-  (maximum-num-atoms         interval  max-atoms)
-  (average-num-atoms         interval  avg-atoms)
-  (total-num-atoms/mod       interval  total-atoms)
-  (set!s-per-1000-atoms      interval  setbangs-per-1000-atoms))
-
-(define-metrics tl-expr-metrics per-module-top-level-expression
-  (uses-setbang?/fn          count     expr-uses-setbangs?)
-  (number-of-setbangs/fn     interval  count-setbangs/expr)
-  (total-num-atoms/fn        interval  atoms))
-
-(: all-metrics (List (metric (Listof Atom-display) (Listof Any) (Listof NumF))
-                     (metric (Listof Atom-display) Any (Listof NumF)) ))
-(define all-metrics (list module-metrics tl-expr-metrics))
-
-;; ============================================================
-;; EXPERIMENT RUNNING
-
-(define-syntax (define-excluder stx)
-
-  (define (path->clause c)
-    (syntax-case c ()
-      [(item ...)
-       #`[`(#,@(reverse (syntax-e #'(item ...))) ,_ (... ...)) #t]]
-      [item
-       #`[`(item) #t]]))
-
-  (syntax-case stx ()
-    [(_ name path ...)
-     (with-syntax ([(match-clause ...) (map path->clause (syntax-e #'(path ...)))])
-       #`(define (name p )
-           (let* ([dirnames (map path->string (filter path? (explode-path p)))])
-             (match (reverse dirnames) ; goofy backwards matching because ... matches greedily
-               match-clause ...
-               [_ #f]))))]))
-
-(: default-excluder (Path -> Boolean))
-(define-excluder default-excluder
-  "compiled" ".svn" #;("collects" "drscheme") #;("collects" "framework"))
-
-(define exclude-directory? (make-parameter default-excluder))
-
-;; ----------------------------------------
-;; apply-to-scheme-files: (path[file] -> X) path[directory] -> (listof X)
-;; applies the given function to each .rkt or .ss or .scm file in the given
-;; directory hierarchy; returns all results in a list
-(: apply-to-scheme-files (All (X) ((Path -> X) Path -> (Listof X))))
-(define  (apply-to-scheme-files f root)
-  (fold-files
-   (λ: ([path : Path] [kind : (U 'file 'dir 'link)] [acc : (Listof X)])
-     (case kind
-       [(file)
-        (let ([extension (filename-extension path)])
-          (cond
-            [(not extension) (values acc #t)]
-            [(regexp-match #rx"(ss|scm)$" extension)
-             (let ([resl (f path)])
-               (if resl
-                   (values (cons resl acc) #t)
-                   (values acc #t)))]
-            [else (values acc #t)]))]
-       [(dir)
-        (let* ([p (normalize-path path root)])
-          (if ((exclude-directory?) p)
-              (values acc #f)
-              (values acc #t)))]
-       [(link) (values acc #t)]))
-   '()
-   root))
-(define-typed-struct (a b c) result ([metric : (metric b c a)] [seqA : (Listof a)] [seqB : (Listof a)]))
-(define-type-alias MetricFn (Path -> (Listof (U #f (Listof NumF)))))
-
-(define-type-alias (M b c) (metric b c (Listof NumF)))
-(define-type-alias (M2 b c c*) (U (M b c) (M b c*)))
-
-;; get-sequences : (listof 'a metric) path -> (listof (listof 'a))
-(: get-sequences (All (b c C) ((List (M b c) (M b C)) Path -> (Listof (Listof (Listof NumF))))))
-(define (get-sequences metrics path)
-  (: selector (case-lambda [(M b c) -> MetricFn] [(M b C) -> MetricFn]))
-  (define (selector m) ((metric-analysis-unit m) (metric-computation m)))
-  (let* ([metric-fns (map #{selector :: ((M2 b c C) -> MetricFn)} metrics)]
-         [result-seqs (apply-to-scheme-files
-                       (λ: ([file : Path])
-                           (map (λ: ([fn : MetricFn]) (fn file)) metric-fns)) path)])
-    (map
-     (λ: ([l : (Listof (Listof (U #f (Listof NumF))))])
-         (nonfalses (apply append l)))
-     (pivot (nonfalses result-seqs)))))
-
-
-(: compare*
-   (All (b c c*)
-        ((List (M b c) (M b c*))
-         ->
-         (List (result (Listof NumF) b c)
-               (result (Listof NumF) b c*)))))
-(define (compare* metrics)
-  (let* ([seqAs (get-sequences metrics (COLLECTS-PATH))]
-         [seqBs (get-sequences metrics (PLANET-CODE-PATH))])
-    (list
-     (make-result (car metrics) (car seqAs) (car seqBs))
-     (make-result (cadr metrics) (cadr seqAs) (cadr seqBs)))))
-
-(: show (All (a b c) ((result a b c) -> b)))
-(define (show result)
-  ((metric->display (result-metric result))
-   (result-seqA result)
-   (result-seqB result)))
-
-(: pretty-print-result
-   (case-lambda
-     ((result (Listof NumF) (Listof Atom-display) (Listof Any)) -> Void)
-     ((result (Listof NumF) (Listof Atom-display) Any) -> Void)))
-(define (pretty-print-result result)
-  (for-each
-   (λ: ([l : (Listof Any)])
-            (apply srfi48:format
-                   (current-output-port)
-                   "~26F  | ~8,2F  | ~6,2F  | ~12,2F\n"
-                   (format "~a" (car l))
-                   (cdr l)))
-   (list* '("test name" "collects" "planet" "significance")
-          '("---------" "--------" "------" "------------")
-          (show result))))
-
-;; applies only to the combined metric [or more generally to listof-answer results]
-(: total (All (b c) (Integer (result (Listof Number) b c) -> (Listof Number))))
-(define (total experiment-number result)
-  (: total/s (Table -> Number))
-  (define (total/s s) (apply + (list-ref (pivot s) experiment-number)))
-  (list (total/s (result-seqA result)) (total/s (result-seqB result))))
-
-;; ============================================================
-;; UTILITY
-
-(: imap (All (Y) ((Any -> Y) Any -> (Listof Y))))
-(define (imap f il)
-  (cond
-    [(null? il) '()]
-    [(not (pair? il)) (list (f il))]
-    [else (cons (f (car il)) (imap f (cdr il)))]))
-
-(: pivot (All (X) ((Listof (Listof X)) -> (Listof (Listof X)))))
-(define (pivot l)
-  (cond
-    [(null? l) '()]
-    [else
-     (let ([n (length (car l))])
-       (build-list n (λ: ([i : Integer]) (map (λ: ([j : (Listof X)]) (list-ref j i)) l))))]))
-
-(: variance ((Listof Number) -> Number))
-(define (variance xs)
-  (let ([avg (/ (apply + xs) (length xs))])
-    (/ (apply + (map (λ: ([x : Number]) (sqr (- x avg))) xs))
-       (sub1 (length xs)))))
-
-(: table-ref (Integer Integer Table -> Number))
-(define (table-ref i j table)
-  (list-ref (list-ref table i) j))
-(: row-total (Integer Table -> Number))
-(define (row-total i table)
-  (apply + (list-ref table i)))
-(: col-total (Integer Table -> Number))
-(define (col-total j table)
-  (apply + (map (λ: ([x : (Listof Number)]) (list-ref x j)) table)))
-(: table-sum ((Integer Integer -> Number) Table -> Number))
-(define (table-sum f table)
-  (let ([rows (length table)]
-        [cols (length (car table))])
-    (let loop  ([i 0] [j 0] [#{sum : Number} 0])
-      (cond
-        [(>= j cols) sum]
-        [(>= i rows) (loop 0 (add1 j) sum)]
-        [else        (loop (add1 i) j (+ sum (f i j)))]))))
-
-(: improper-foldr (All (Y) ((Any Y -> Y) Y Any -> Y)))
-(define (improper-foldr f b l)
-  (cond
-    [(null? l) b]
-    [(not (pair? l))
-     (f l b)]
-    [else
-     (f (car l) (improper-foldr f b (cdr l)))]))
-
-(: /* (All (a ...) ((Listof Number) (Listof Number) ... a -> (Listof Number))))
-(define (/* arg . args)
-    (apply map (λ: ([n : Number] . [ns : Number ... a]) (apply / n ns)) arg args))
-
-
-;; ============================================================
-;; MAIN ENTRY POINT
-
-(: results (U #f (Listof (U (result (Listof NumF) (Listof Atom-display) (Listof Any))
-                            (result (Listof NumF) (Listof Atom-display) Any)))))
-(define results #f) ; just in case i want to do some more analysis on the results afterwards,
-; so i don't have to waste a minute if i forget to bind the return value to something
-
-(define (run-all-tests)
-  (let ([rs (compare* all-metrics)])
-        (set! results rs)
-    (for-each
-     (ann pretty-print-result ((U (result (Listof NumF) (Listof Atom-display) (Listof Any))
-                                  (result (Listof NumF) (Listof Atom-display) Any))
-                               -> Any))
-     rs)
-    rs))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/no-bound-fl.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/no-bound-fl.rkt
deleted file mode 100644
index 1f9bd5265a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/no-bound-fl.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed-scheme
-
-(: fold-left (All (a b ...) ((a b ... -> a) a (Listof b) ... -> a)))
-(define (fold-left f a . bss)
-  (if (ormap null? bss)
-      a
-      (apply fold-left
-             f
-             (apply f a (map car bss))
-             (map cdr bss))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/non-recursive-and-recursive-type-aliases.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/non-recursive-and-recursive-type-aliases.rkt
deleted file mode 100644
index 20be1e4d9b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/non-recursive-and-recursive-type-aliases.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang typed/racket
-
-;; This test used to fail when the non-recursive type
-;; aliases were registered *after* the recursive ones.
-;;
-;; Thanks to Havvy from IRC for the test
-
-(define-type magic/int Integer)
-(define-type magic/float Flonum)
-(define-type magic/str String)
-(define-type magic/symbol Symbol)
-(define-type magic/map HashTable)
-(define-type magic/invokable (magic/any * -> magic/any))
-(define-type magic/any (U magic/int
-                          magic/float
-                          magic/str
-                          magic/symbol
-                          magic/map
-                          magic/invokable))
-
-(: x magic/any)
-(define x "magic/str")
-
-(: f magic/invokable)
-(define f (lambda: (rst : magic/any *) (car rst)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/nonnegative-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/nonnegative-float.rkt
deleted file mode 100644
index de361d7650..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/nonnegative-float.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/scheme
-
-(ann (+ 1.0 2.1) Nonnegative-Float)
-(ann (+ 1 2.1) Nonnegative-Float)
-(ann (* 1.2 3.1) Nonnegative-Float)
-(ann (sqrt 3.5) Nonnegative-Float)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/null-program.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/null-program.rkt
deleted file mode 100644
index 5b678dfa8d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/null-program.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang typed/racket/base
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/num-equal-filter.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/num-equal-filter.rkt
deleted file mode 100644
index f1e9f33a5b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/num-equal-filter.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket
-
-(: f : Nonnegative-Integer -> Boolean)
-(define (f x)
-  (cond [(= 0 x) #t]
-        [else (f (sub1 x))])) ; here, x is Positive-Integer
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/opt-arg-test.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/opt-arg-test.rkt
deleted file mode 100644
index 0fdffa59c5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/opt-arg-test.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed/racket
-
-(: f (case-> (-> Integer)
-             (Integer -> Integer)))
-(define (f [#{z : Integer} 0]) z)
-#;
-(define-values
-  (f)
-  (let-values (((#{core3 : (case-> (Integer True -> Integer)
-                                   (Univ False -> Integer))})
-                (lambda (z1 z2) (let-values (((#{z : Integer}) (if z2 z1 '0)))
-                                  (let-values () z)))))
-    (case-lambda (() (#%app core3 '#f '#f)) 
-                 ((z1) (#%app core3 z1 '#t)))))
-
-
-(add1 (f 0))
-(add1 (f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/opt-lambda.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/opt-lambda.rkt
deleted file mode 100644
index 5a55dd7bbb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/opt-lambda.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket
-
-(: opt (case-lambda ( -> Void)
-                    (Integer -> Void)))
-(define opt
-  (opt-lambda: ((n : Integer 0))
-    (display n)))
-(opt)
-(opt 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/optimize-simple.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/optimize-simple.rkt
deleted file mode 100644
index 035a3c7519..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/optimize-simple.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed/racket #:optimize
-
-(+ 3 4)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/or-sym.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/or-sym.rkt
deleted file mode 100644
index cef5063568..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/or-sym.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang typed/scheme
-
-#;#;
-(: g (Any -> Boolean : (U 'r 's)))
-(define (g x)
-  (let ([q x])
-    (let ([op2 (eq? 'r x)])
-      (if op2 op2 (eq? 's x)))))
-
-
-(define: f? : (Any -> Boolean : (U 'q 'r 's))
-  (lambda (x)
-    (let ([op1 (eq? 'q x)])
-      (if op1 op1
-        (let ([op2 (eq? 'r x)])
-               (if op2
-                   ;; !#f_op2
-                   op2
-                   (eq? 's x)))))))
-
-(define: f2? : (Any -> Boolean : (U 'q 'r 's))
-  (lambda (x)
-    (or (eq? 'q x)
-        (eq? 'r x)
-        (eq? 's x))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/overloading.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/overloading.rkt
deleted file mode 100644
index e7c5397621..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/overloading.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed-scheme
-
-(: f (case-lambda (Number -> Number) (Boolean -> Boolean)))
-(define (f x) (if (number? x) 1 #f))
-
-(: x Boolean)
-(define x (f #t))
-
-(: xx Number)
-(define xx (f 0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pair-test.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pair-test.rkt
deleted file mode 100644
index cb0fc9491f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pair-test.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed-scheme
-
-(define: x : (Number . Boolean) (cons 3 #f))
-
-(define: y : Number (car x))
-
-(define: z : Boolean (cdr x))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pair-test2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pair-test2.rkt
deleted file mode 100644
index 8e35e52c04..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pair-test2.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang typed/scheme
-
-(define: x : (Listof (Listof Integer))
-  '((1 1 1) (2 2 2) (3 3 3) (4 4 4) (5 5 5)))
-
-(ann (caar x)   Integer)
-(ann (cdar x)   (Listof Integer))
-(ann (cadr x)   (Listof Integer))
-(ann (cddr x)   (Listof (Listof Integer)))
-(ann (caadr x)  Integer)
-(ann (cdadr x)  (Listof Integer))
-(ann (cadar x)  Integer)
-(ann (cddar x)  (Listof Integer))
-(ann (caddr x)  (Listof Integer))
-(ann (cdddr x)  (Listof (Listof Integer)))
-(ann (caddar x) Integer)
-(ann (cdddar x) (Listof Integer))
-(ann (cadadr x) Integer)
-(ann (cddadr x) (Listof Integer))
-(ann (caaddr x) Integer)
-(ann (cdaddr x) (Listof Integer))
-(ann (cadddr x) (Listof Integer))
-(ann (cddddr x) (Listof (Listof Integer)))
-
-
-(define: y : (Listof (Listof (Listof Integer)))
-  '(((11 11) (12 12) (13 13))
-    ((21 21) (22 22) (23 23))
-    ((31 31) (32 32) (33 33))))
-
-(ann (caaar y)  Integer)
-(ann (cdaar y)  (Listof Integer))
-(ann (cadaar y) Integer)
-(ann (cddaar y) (Listof Integer))
-(ann (caadar y) Integer)
-(ann (cdadar y) (Listof Integer))
-(ann (caaadr y) Integer)
-(ann (cdaadr y) (Listof Integer))
-
-
-(define: z : (Listof (Listof (Listof (Listof Integer))))
-  '((((111 111) (112 112))
-     ((121 121) (122 122)))
-    (((211 211) (212 212))
-     ((221 221) (222 222)))))
-
-(ann (caaaar z) Integer)
-(ann (cdaaar z) (Listof Integer))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pair-test3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pair-test3.rkt
deleted file mode 100644
index e45bd796fa..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pair-test3.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang typed/scheme
-
-(define: x : (Pair (Pair (Pair (Pair Integer String)
-                               (Pair True Null))
-                         (Pair (Pair False Char)
-                               (Pair String Null)))
-                   (Pair (Pair (Pair String Integer)
-                               (Pair Float Null))
-                         (Pair (Pair (Vectorof Float) True)
-                               (Pair (Listof Float) False))))
-  '((((1 . "1") . (#t))
-     . ((#f . #\f) . ("2")))
-    . ((("3" . 4) . (1.0))
-       . ((#(2.0 3.0 -4.0) . #t)
-          . ((2.0 3.0 4.0) . #f)))))
-
-
-(ann (caar x)   (Pair (Pair Integer String) (Pair True Null)))
-(ann (caaar x)  (Pair Integer String))
-(ann (caaaar x) Integer)
-(ann (cdaaar x) String)
-(ann (cdaar x)  (Pair True Null))
-(ann (cadaar x) True)
-(ann (cddaar x) Null)
-
-(ann (cdar x)   (Pair (Pair False Char) (Pair String Null)))
-(ann (cadar x)  (Pair False Char))
-(ann (caadar x) False)
-(ann (cdadar x) Char)
-(ann (cddar x)  (Pair String Null))
-(ann (caddar x) String)
-(ann (cdddar x) Null)
-
-(ann (cadr x)   (Pair (Pair String Integer) (Pair Float Null)))
-(ann (caadr x)  (Pair String Integer))
-(ann (caaadr x) String)
-(ann (cdaadr x) Integer)
-(ann (cdadr x)  (Pair Float Null))
-(ann (cadadr x) Float)
-(ann (cddadr x) Null)
-
-(ann (cddr x)   (Pair (Pair (Vectorof Float) True) (Pair (Listof Float) False)))
-(ann (caddr x)  (Pair (Vectorof Float) True))
-(ann (caaddr x) (Vectorof Float))
-(ann (cdaddr x) True)
-(ann (cdddr x)  (Pair (Listof Float) False))
-(ann (cadddr x) (Listof Float))
-(ann (cddddr x) False)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/param.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/param.rkt
deleted file mode 100644
index afba015a5f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/param.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/racket
-
-(parameterize ([current-directory ".."])
-  (current-directory)
-  (current-directory ".."))
-
-
-(: old-param Parameterization)
-(define old-param (current-parameterization))
-
-(current-directory "..")
-
-(call-with-parameterization old-param (lambda () (current-directory)))
-
-(parameterization? old-param)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parameter-c.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parameter-c.rkt
deleted file mode 100644
index 95743ae043..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parameter-c.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket/base
-
-(require/typed
- rackunit
- [current-check-around  (Parameter Any)])
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parameter-proc.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parameter-proc.rkt
deleted file mode 100644
index d6aabd3b31..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parameter-proc.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-(require/typed racket
-               (current-directory (-> Path)))
-
-(unless (equal? (parameter? current-directory)
-                (if (parameter? current-directory) #t #f))
-  (error 'unsound!))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parametric-require-tr-base.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parametric-require-tr-base.rkt
deleted file mode 100644
index e27eb677d9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parametric-require-tr-base.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/racket/base
-
-(require/typed racket/base
-    (values (All (a) (a -> a))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parse-path.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parse-path.rkt
deleted file mode 100644
index eebd80495d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/parse-path.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/scheme
-
-(: f ((Pair Any Any) -> Boolean : Number @ car))
-(define f (lambda: ([x : (Pair Any Any)]) (number? (car x))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/patch.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/patch.rkt
deleted file mode 100644
index 4dc7c76342..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/patch.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-(module patch scheme
-  (define srfi48::format format)
-  (provide srfi48::format))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/paths.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/paths.rkt
deleted file mode 100644
index af9699c485..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/paths.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang typed/racket
-
-(: foo-path Path)
-(define foo-path (build-path "foo" "bar" 'same 'up))
-
-;Check predicates are always true
-(+ (if (path? foo-path) 2 'two)
-   (if (path-for-some-system? foo-path) 3 'three))
-
-(: current-system (U 'unix 'windows))
-(define current-system (system-path-convention-type))
-
-(: other-system (U 'unix 'windows))
-(define other-system
- (case (system-path-convention-type)
-  ((unix) 'windows)
-  ((windows) 'unix)))
-
-(: other-foo-path Path-For-Some-System)
-(define other-foo-path
- (build-path/convention-type other-system
-  (string->some-system-path "foo" other-system)
-  (string->some-system-path "bar" other-system)
-  'same
-  'up))
-
-
-(path->string foo-path)
-(some-system-path->string other-foo-path)
-(path->bytes foo-path)
-(path->bytes other-foo-path)
-
-(bytes->path #"foo" other-system)
-(string->path "foo")
-
-(bytes->path-element #"foo" other-system)
-(string->path-element "foo")
-
-
-(cleanse-path foo-path)
-(cleanse-path other-foo-path)
-
-(expand-user-path foo-path)
-
-(absolute-path? other-foo-path)
-(relative-path? other-foo-path)
-(complete-path? other-foo-path)
-
-
-
-
-(split-path foo-path)
-(split-path other-foo-path)
-
-
-;Original Soundness bug
-(when (path? other-foo-path) (error 'path "This shouldn't be raised"))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pathstrings.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pathstrings.rkt
deleted file mode 100644
index 4aacd9b33a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pathstrings.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang typed/racket
-
-(: no-exec (-> Void))
-(define (no-exec)
-
-
- (call-with-output-file "file.tmp"
-  (lambda: ((port : Output-Port))
-   (write "hello world" port)))
- (call-with-input-file "file.tmp"
-  (lambda: ((port : Input-Port))
-   (read port)))
-
- (directory-list "/")
- (make-directory "tmp-dir")
-
- (path-only "file.tmp")
-
- (system #"echo foo")
- (system* "/bin/echo" "zzz" #"foo" (string->path "/"))
- (system/exit-code #"echo foo")
- (system*/exit-code "/bin/echo" "zzz" #"foo" (string->path "/"))
- (system #:set-pwd? #t #"echo foo")
- (system* #:set-pwd? #t "/bin/echo" "zzz" #"foo" (string->path "/"))
- (system/exit-code #:set-pwd? #t #"echo foo")
- (system*/exit-code #:set-pwd? #t "/bin/echo" "zzz" #"foo" (string->path "/"))
-
- (void))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pict.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pict.rkt
deleted file mode 100644
index 4a56b5cce8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pict.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/racket
-
-;; Test typed/pict
-
-(require typed/pict)
-
-(pict-children (blank 50 50))
-(hline 1 5)
-(vline 1 5)
-(frame (circle 5) #:segment 2)
-
-(define hl (hline 1 5))
-(define-values (x y) (lt-find hl hl))
-
-(standard-fish 40 20 #:direction 'left #:color "olive")
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/places-helper.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/places-helper.rkt
deleted file mode 100644
index 012740dd4b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/places-helper.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang typed/racket/no-check
-
-(provide double-place echo-place)
-
-
-(: double-place (Place-Channel -> Void))
-(define (double-place pch)
- (place-channel-put pch (* 2 (place-channel-get pch))))
-
-
-(: echo-place (Place-Channel -> Void))
-(define (echo-place pch)
- (place-channel-put pch (place-channel-get pch)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/places.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/places.rkt
deleted file mode 100644
index 11bd1d68f1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/places.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang typed/racket
-
-(: p Place)
-(: p2 Place)
-(: p3 Place)
-
-(define p (dynamic-place 'tests/typed-racket/succeed/places-helper 'double-place))
-(place-channel-put/get p 10)
-(place-wait p)
-
-
-(define p2 (dynamic-place 'tests/typed-racket/succeed/places-helper 'double-place))
-(place-channel-put/get p2 -2+4i)
-(place-wait p2)
-
-
-(define p3 (dynamic-place 'tests/typed-racket/succeed/places-helper 'echo-place))
-(place-channel-put/get p3 'echo-this)
-(place-wait p3)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-dots.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-dots.rkt
deleted file mode 100644
index a31d5f3325..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-dots.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/scheme/base
-
-(: map-with-funcs (All (b ...) ((List (b ... b -> b) ... b ) -> (b ... b -> (values b ... b)))))
-(define (map-with-funcs fs)
-  (lambda bs
-    (apply values (map (plambda: (c) ([f : (b ... b -> c)])
-                         (apply f bs)) fs))))
-
-(map-with-funcs (list + - /))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-ret-ann.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-ret-ann.rkt
deleted file mode 100644
index c8e0c90168..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-ret-ann.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#lang typed/scheme/base
-(: f (Integer -> (All (X) (X -> X))))
-(define (f x)
- (add1 x)
- (lambda (x) x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-same-annotation.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-same-annotation.rkt
deleted file mode 100644
index fcf7f4ddcf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-same-annotation.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/racket/base
-(require racket/list)
-
-(: f1 (All (A) (Listof A) -> (Listof A)))
-(define (f1 a)
-  (map (λ: ([a : A]) a) empty))
-
-(: f2 (All (A) (Listof A) -> (Listof A)))
-(define (f2 a)
-  (map (λ: ([a : A]) a) empty))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct-parent.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct-parent.rkt
deleted file mode 100644
index 9e9514d9bf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct-parent.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang typed/racket
-
-(define-struct: (A) Box ([value : A]) #:transparent)
-(define-struct: (A B) (Child-Box Box) ([other-value : B]) #:transparent)
-
-(: v1 Symbol)
-(define v1 (Box-value (Child-Box 'sym "str")))
-(: v2 String)
-(define v2 (Child-Box-other-value (Child-Box 'sym "str")))
-
-
-(struct: (A) Box2 ([proc : (-> A)]))
-(struct: (A) Strict-Box2 Box2 ())
-(struct: (A) Mutable-Box2 Strict-Box2 ([value : (Vector A)]))
-
-(: box-mutable2 (All (A) ((Box2 A) -> (Mutable-Box2 A))))
-(define (box-mutable2 b)
-  (define v ((Box2-proc b)))
-  (define vs (vector v))
-  (Mutable-Box2 (λ () (vector-ref vs 0)) vs))
-
-(: box-strict2 (All (A) ((Box2 A) -> (Box2 A))))
-(define (box-strict2 b)
-  (cond
-    [(Strict-Box2? b)  b]
-    [else (box-mutable2 b)]))
-
-(box-mutable2 (Box2 (λ () 0)))
-(box-strict2 (box-mutable2 (Box2 (λ () 0))))
-(ann (ann (box-mutable2 (Box2 (λ () 0))) (Mutable-Box2 Integer)) (Box2 Number))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct-pred.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct-pred.rkt
deleted file mode 100644
index afcd2bd70a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct-pred.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket
-
-(struct: (X) s ([v : X]))
-
-(: f : (All (X) (U 'foo (s X)) -> (s X)))
-(define (f t)
-  (match t
-    [(s value) (s value)]
-    [_ (error 'fail)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct-union.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct-union.rkt
deleted file mode 100644
index 04a503a04d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct-union.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#lang racket/load
-
-
-(module test typed/racket
-
-
- (provide a:list-helper)
-
- (define-type (Append-List+ elem) (U (a:singleton elem) (a:join elem)))
-
- (define-struct: (elem) a:join
-   ((left : (Append-List+ elem)) (right : (Append-List+ elem)))
-   #:transparent)
-
- (define-struct: (elem) a:singleton
-   ((elem : elem)) #:transparent)
-
- (: a:list-helper (All (elem) ((Pair elem (Listof elem)) -> (Append-List+ elem))))
- (define (a:list-helper elems)
-   (cond
-     ((empty? (cdr elems)) (make-a:singleton (car elems)))
-     (else (make-a:join (make-a:singleton (car elems))
-                        (a:list-helper (cdr elems))))))
- )
-
-(module test2 racket
- (require 'test)
- (a:list-helper (list 1 2)))
-
-(require 'test2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct.rkt
deleted file mode 100644
index c5750ce4af..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-struct.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed-scheme
-(define-typed-struct (a) bag ([val : a]))
-
-(provide make-bag)
-
-(let: ([x : (bag Number) (make-bag #{3 :: Number})]
-       [y : (bag Boolean) (make-bag #{#t :: Boolean})])
-      (+ 4 (bag-val x))
-      (not (bag-val y)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-subtype.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-subtype.rkt
deleted file mode 100644
index 9e6ed0524d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-subtype.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang typed-scheme
-
-(: f (All (a) (a -> a)))
-(define (f x) x)
-
-(define: x : (Number -> Number) f)
-
-#;
-((lambda: ([f : (All (a ...) (a ... a -> Number))]) 12)
- +)
-
-#;(Lambda (a ...)
-  ((lambda: ([f : (a .. a -> Number)]) 12) +))
-
-#|
-(: g (All (a ...) ((a ... a -> Number) -> Number)))
-
-(define (g x) 3)
-
-|#
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-tests.rkt
deleted file mode 100644
index c3d8212fbf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/poly-tests.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang typed-scheme
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias symbol Symbol)
-(define-type-alias top Any)
-(define-type-alias list-of Listof)
-#;(require "prims.rkt")
-(define: mymap : (All (a b) ((a -> b) (list-of a) -> (list-of b)))
-  (plambda: (a b) ([f : (a -> b)] [l : (list-of a)])
-    (cond [(null? l) '()]
-          [else (cons (f (car l))
-                      (mymap f (cdr l)))])))
-
-(pdefine: (a b) (mymap2 [f : (a -> b)] [l : (list-of a)]) : (list-of b)
-	  (cond [(null? l) '()]
-		[else (cons (f (car l))
-			    (mymap2 f (cdr l)))]))
-
-(define: x : (list-of number)
-  (mymap (lambda: ([x : number]) (+ 3 x)) (cons 1 (cons 4 #{'() : (list-of number)}))))
-
-(define: x2 : (list-of number)
-  (mymap2 (lambda: ([x : number]) (+ 3 x)) (cons 1 (cons 4 #{'() : (list-of number)}))))
-
-(provide x2)
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/ports.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/ports.rkt
deleted file mode 100644
index 4c6f8af6a5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/ports.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang typed/racket
-
-
-(current-locale)
-
-
-(define my-input (open-input-string "This (is a long) input \"string\""))
-(define-values (my-output-reader my-output) (make-pipe))
-(define my-error-port (open-output-bytes))
-
-(port-count-lines! my-input)
-
-(input-port? my-input)
-(output-port? my-output-reader)
-
-(port-closed? my-error-port)
-(file-stream-port? my-output)
-(terminal-port? my-output)
-
-(parameterize ((current-input-port my-input)
-               (current-output-port my-output)
-               (current-error-port my-error-port))
-  (write (read))
-  (newline)
-  (flush-output))
-
-(file-stream-buffer-mode my-input)
-(file-position my-input)
-(port-next-location my-input)
-
-(read my-output-reader)
-(get-output-bytes my-error-port)
-
-(close-input-port my-input)
-(close-input-port my-output-reader)
-(close-output-port my-output)
-(close-output-port my-error-port)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10057.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10057.rkt
deleted file mode 100644
index 30f900750f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10057.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed-scheme
-(require scheme/match)
-(ann (match '(a b c)
-       [(list sym more ...) 1]
-       [else 1]) Integer)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10318.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10318.rkt
deleted file mode 100644
index 2a135b7fe0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10318.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang typed-scheme
-
-(define-struct: rect ((nw : Symbol) (width : Number) (height : Number)))
-(define-struct: circ ((cntr : Symbol)  (radius : Number)))
-(define-struct: over ((top : Shape) (bot : Shape)))
-
-(define-type-alias Shape (Rec Shape (U Plain over [Listof Plain])))
-(define-type-alias Plain (U rect circ))
-;; (define-type-alias Rect (U (make-rect Posn Number Number)))
-;; Circ  = (make-circ Posn Number)
-
-(: area (Shape -> Number))
-;; the area of all rectangles in this s
-(define (area s)
-  (cond
-    [(plain? s) (plain-area s)]
-    [(over? s) (+ (area (over-top s)) (area (over-bot s)))]
-    [else (apply + (map rect-area (filter rect? s)))]))
-
-(: plain? (Any -> Boolean : Plain))
-;; is this p a plain shape?
-(define (plain? p)
-  (or (rect? p) (circ? p)))
-
-(: plain-area (Plain -> Number))
-;; the area of this plain shape s
-(define (plain-area s)
-  (cond
-    [(rect? s) (rect-area s)]
-    [(circ? s) 0]))
-
-(: rect-area (rect -> Number))
-;; the area of this rectangle r
-(define (rect-area s)
-  (* (rect-width s) (rect-height s)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10319.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10319.rkt
deleted file mode 100644
index 18d7719b14..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10319.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#lang typed-scheme
-
-(define-type-alias LSN (Rec LSN (U '() (cons Number LSN) (cons Symbol LSN))))
-
-(: sum (LSN -> Number))
-;; add all numbers in this lsn
-(define (sum lsn)
-  (cond
-    [(null? lsn) 0]
-    [(number? (car lsn)) (+ (car lsn) (sum (cdr lsn)))]
-    [else (sum (cdr lsn))]))
-
-(sum '(a b 2 3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10342.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10342.rkt
deleted file mode 100644
index b29baca382..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10342.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed-scheme
-(require/typed
- scheme/base
- [opaque WeakBox weak-box?]
- [make-weak-box (Any -> WeakBox)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10470.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10470.rkt
deleted file mode 100644
index 44c1c33cfb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10470.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-(module pr10470 typed-scheme
-
-  (define-type-alias (Memo alpha) (U (Option alpha) (-> (Option alpha))))
-
-  (define-struct: table ([val : (Memo Number)]) #:mutable)
-
-  (: f (table -> (Option Number)))
-  (define (f tab)
-    (let ([proc-or-num (table-val tab)])
-      (cond
-        [(procedure? proc-or-num)
-         (let ([result (proc-or-num)])
-           (set-table-val! tab result)
-           result)]
-        [else proc-or-num]))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10552.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10552.rkt
deleted file mode 100644
index 64b4ae7bc5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10552.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed-scheme
-
-(: z (All (A) (A -> ((Listof A) A -> (Listof A)))))
-(define (z _) (lambda (x y) (cons y x)))
-(define zz (z cons))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10562.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10562.rkt
deleted file mode 100644
index 8ba15861eb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10562.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/racket
-(: foo : (Rec this (List Number (Boxof (U #f this)))))
-(define foo (list 1 (box #f)))
-(set-box! (second foo) foo)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10718+10755.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10718+10755.rkt
deleted file mode 100644
index ac8ed36c44..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10718+10755.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang typed/scheme
-
-(: g ((U Integer #f) -> Integer))
-(define (g x)
-  (cond
-    [(or (equal? x 0) (equal? x #f)) 0]
-    [else x]))
-
-(define-type-alias Source (U Symbol #f))
-
-(: source? (Any -> Boolean : Source))
-(define (source? x)
-  (if (false? x)
-      #t
-      (symbol? x)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10729.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10729.rkt
deleted file mode 100644
index 0400b82634..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10729.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/scheme
-(: lon? (Any -> Boolean : (Listof Number)))
-(define (lon? x)
-  (and (list? x) (andmap number? x)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10765.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10765.rkt
deleted file mode 100644
index 8c90cd2c84..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10765.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/load
-
-(module A typed/racket
-
- (struct: Point ([x : Integer] [y : Integer]))
-
- (provide (all-defined-out)))
-
-(module B typed/racket
- (require 'A)
-
- (: lift (Point -> Point))
- (define (lift p)
-   (struct-copy Point p [x (add1 (Point-x p))]))
- (lift (Point 3 4)))
-
-(require 'B)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10937.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10937.rkt
deleted file mode 100644
index d945690d0f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10937.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/scheme
-
-
-
-(define-type (T+ elem)
-  (U (A elem)))
-
-(define-type (T elem)
-  (U T+ 2))
-
-(define-struct: (x) A ())
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10939.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10939.rkt
deleted file mode 100644
index 75e5fcfd70..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr10939.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/scheme
-
-(define-type (T elem)
-  (U 'other a:empty))
-
-(define-predicate a:list? (T Any))
-
-(define-struct: a:empty ())
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11099.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11099.rkt
deleted file mode 100644
index 3f172bbc40..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11099.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/racket
-
-(struct: (X) b ([bar : (Vectorof X)]))
-
-(define: b-val : (b Integer)
-  (b (ann (vector 1) (Vectorof Integer))))
-
-
-(if (b? b-val)
-    (b-bar b-val) 
-    #f)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11171.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11171.rkt
deleted file mode 100644
index 0f66d023f4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11171.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/load
-
-(module UNTYPED racket/base
-  (struct IntTree
-    (elem left right))
-
-  (provide (struct-out IntTree)))
-
-(module TYPED typed/racket
-  (require/typed 'UNTYPED
-                 [struct IntTree
-                   ([elem  : Integer]
-                    [left  : IntTree]
-                    [right : IntTree])]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11172.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11172.rkt
deleted file mode 100644
index 91758d2dc7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11172.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/load
-
-;; Test for PR 11172
-
-(module a typed/racket (: n Positive-Integer) (define n 10) (provide: [n Integer]))
-(module b typed/racket (define n 10) (provide: [n Integer]))
-(module c typed/racket (provide: [n Integer]) (define n 10))
-(module d typed/racket (provide: [n Integer]) (: n Positive-Integer) (define n 10))
-
-(require 'a)
-n
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11193.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11193.rkt
deleted file mode 100644
index c7105af6aa..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11193.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/load
-
-(module a racket
- (define-struct foo (bar baz))
- (define f (lambda (x) (+ (foo-bar x) 3)))
-
- (provide [struct-out foo]
-          f))
-
-(module b typed/racket
- (require/typed 'a
-                [struct foo ([bar : Number] [baz : String])]
-                [f (foo -> Number)])
-
- (f (foo 3 "4")))
-
-(require 'b)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11194.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11194.rkt
deleted file mode 100644
index a619a77f0e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11194.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/load
-
-(module untyped racket
- (struct foo (bar baz))
- (define f (lambda (x) (+ (foo-baz x) 3)))
-
- (provide [struct-out foo]
-          f))
-
-(module typed typed/racket
- (require/typed 'untyped
-                [struct foo ([bar : Number] [baz : String])]))
-
-(require 'typed)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11314.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11314.rkt
deleted file mode 100644
index a6125a7a32..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11314.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/load
-
-(module A racket
-  (define-struct point [x y])
-    (point 1 2)
-      (provide (all-defined-out)))
-
-(module B typed/racket
-  (require/typed 'A
-      [struct point ([x : Integer] [y : Integer])])
-      (point 1 2)
-      (struct: pt ([x : Integer] [y : Integer]))
-        (pt 1 2))
-
-(require 'A)
-(require 'B)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11390.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11390.rkt
deleted file mode 100644
index 20397bf6bf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11390.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang typed/racket
-
-;Doesn't TypeCheck
-(struct: foo ())
-(struct: foo-num foo ((v : Number)))
-(struct: foo-str foo ((v : String)))
-
-#|
-;TypeChecks
-(struct: foo-num ((v : Number)))
-(struct: foo-str ((v : String)))
-|#
-
-
-(: extract-foo (case-lambda
-                 (foo-num -> Number)
-                 (foo-str -> String)))
-
-(define (extract-foo foo)
-  (cond
-    ((foo-num? foo) (foo-num-v foo))
-    ((foo-str? foo) (foo-str-v foo))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11392.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11392.rkt
deleted file mode 100644
index 78a832abe8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11392.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed/racket
-(struct: foo ((n : Number)))
-(struct: bar ((n : Number)))
-
-
-(define-type foobar (U foo bar))
-(define-predicate foobar? foobar)
-
-(: baz ((List) -> "two"))
-
-(define (baz x)
-  (if (foobar? x) 2 "two"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11425.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11425.rkt
deleted file mode 100644
index 6d6efc364a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11425.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/load
-
-(module sgn-exporter typed/racket/base
-  (require/typed
-   racket/math
-   [sgn  (Integer -> Fixnum)])
-  (provide (all-defined-out)))
-
-(module sgn-importer typed/racket/base
-  (require racket/math 'sgn-exporter))
-
-(require 'sgn-exporter)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11504.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11504.rkt
deleted file mode 100644
index e319bab3de..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11504.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-
-(define-type Animal (U cat dog))
-(define-predicate animal? Animal)
-
-(struct: cat ([lives : Natural]))
-(struct: dog ([bark : Natural] [bite : Natural]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11509.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11509.rkt
deleted file mode 100644
index 8e98fea947..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11509.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/load
-
-(module server racket
-  (define-struct pt [x y])
-  (define-struct (cpt pt) [color])
-  (provide (all-defined-out)))
-
-(module client racket
-  (require 'server)
-  (match (cpt 100 200 'red)
-    [(cpt x y c) (list x y c)]))
-
-(module tclient typed/racket
-  (require-typed-struct
-   pt ([x : Integer] [y : Integer])
-   'server)
-  (require-typed-struct
-   (cpt pt) ([color : Symbol])
-   'server)
-  (match (cpt 100 200 'red)
-    [(cpt x y c) (list x y c)]))
-
-(require 'client)
-
-(require 'tclient)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11532.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11532.rkt
deleted file mode 100644
index f04b6b2657..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11532.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/racket
-(define-type T (All [X Y ...] String))
-(: f (All [A] (T -> Any)))
-(define f void)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11545+11776.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11545+11776.rkt
deleted file mode 100644
index a6548877d3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11545+11776.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/racket
-
-(: stuff (All [X ...] (X ... X -> (Listof Any))))
-(define (stuff . xs) xs)
-
-(: thing (-> (Listof Any)))
-(define (thing)
-  ((inst stuff)))
-
-(inst values Any)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11560.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11560.rkt
deleted file mode 100644
index 5aaa5e6872..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11560.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang typed/racket/base
-(ann (ann 5 Integer) Real)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11578.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11578.rkt
deleted file mode 100644
index 4cf7a98788..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11578.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/load
-
-(module a typed/racket/base
-  (provide foo)
-    (struct: foo ()))
-
-(module b racket/base
-  (require 'a)
-    (foo))
-
-
-(require 'b)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11617.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11617.rkt
deleted file mode 100644
index a530ebaacc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11617.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/load
-
-(module A typed/racket
-  (provide (all-defined-out))
-  (struct: one ([thing : Any]))
-  (define-match-expander uno
-    (syntax-rules ()
-      [(_ x) (one x)]))
-  (match (one 2)
-    [(uno dos) dos]))
-
-(require 'A)
-
-(module B typed/racket
-  (require 'A)
-  (match (one 2)
-    [(uno dos) dos]))
-
-(require 'B)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11669.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11669.rkt
deleted file mode 100644
index b3cd68891c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11669.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/load
-
-(require typed/racket)
-
-;; Test that struct: and define-struct: work at the
-;; top-level.
-;;
-;; Test for PR 11669
-(struct: Foo ([x : Integer]))
-(define-struct: Bar ([y : Foo]))
-(define-type Qux (U String Integer))
-(struct: Quux ([qux : Qux]))
-Quux-qux
-Foo
-make-Bar
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11686.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11686.rkt
deleted file mode 100644
index 2ad820dc8e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11686.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/load
-
-(module T typed/racket
-
-  (struct: [X] doll ([contents : X]))
-
-  (define-type RussianDoll
-    (Rec RD (U 'center (doll RD))))
-
-  (: f (RussianDoll -> RussianDoll))
-  (define (f rd) rd)
-
-  (provide (all-defined-out)))
-
-(require 'T)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11709.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11709.rkt
deleted file mode 100644
index f6bdbd0b09..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11709.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang typed/racket
-
-(define stop-value (gensym))
-
-(: an-alist : (All (A B) (Listof (Pair A B)) -> (Rec R (-> (values (-> (values A B))  (-> R))))))
-(define (an-alist lst)
-  (lambda: ()
-    (if (null? lst) (raise stop-value)
-        (let ([first (car lst)]
-              [rest  (cdr lst)])
-          (values
-           (lambda: () (values (car first) (cdr first)))
-           (lambda: () (an-alist rest)))))))
-
-(define alist (an-alist (list (cons 1 2) (cons 3 4) (cons 5 6))))
-
-(call-with-values alist values) ; this works
-
-(call-with-values alist (λ (e a) a)) 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11728.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11728.rkt
deleted file mode 100644
index 190940e0df..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11728.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/load
-
-
-(module b typed/racket/base
-  (provide (all-defined-out))    
-  (define-struct: string-type () #:transparent))
-
-(module c typed/racket/base
-  (provide (all-defined-out))    
-  (define-struct: string-type () #:transparent))
-
-(module a typed/racket/base
-  
-
-  (require 
-   (prefix-in one: 'b)
-   (prefix-in two: 'c)
-   )  
-  
-  
-  (provide foo)
-  
-  (: foo two:string-type)
-  (define foo (two:string-type)))
-
-(require 'a)
-foo
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11747.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11747.rkt
deleted file mode 100644
index 0ff1afad4d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11747.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang typed/racket/base
-
-(require racket/match racket/list)
-
-(provide check-type-declarations)
-
-(define-type type-declaration #t)
-(define-type type-environment #t)
-
-(define-type dag (HashTable Symbol (U Symbol #f)))
-
-(: check-type-declarations ((Listof type-declaration) type-environment -> Void))
-(define (check-type-declarations types env)
-  (: compute-reference-dag ((Listof type-declaration) dag -> dag))
-  (define (compute-reference-dag types dag)
-      (compute-reference-dag types dag))
-
-  (: cycle-exists? (Symbol dag -> Boolean))
-  (define (cycle-exists? symbol a-dag)
-      (cycle-exists? symbol a-dag))
-
-  (: reference-dag dag)
-  (: cycle Boolean)
-  (define reference-dag (compute-reference-dag types (make-immutable-hash empty)))
-  (define cycle (cycle-exists? 'name reference-dag))
-  (void))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11756.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11756.rkt
deleted file mode 100644
index 6970d8558a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11756.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/racket/base
-
-(: test : (All (X) X -> (All (Y) Y -> X)))
-(define (test n)
-  (: helper : (All (Z) Z -> X))
-  (define (helper m) n)
-  helper)
-
-; if the below is commented out the code runs without errors
-(provide test)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11859.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11859.rkt
deleted file mode 100644
index 3e2c787130..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11859.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/load
-(module stream typed/racket
-  (define-type (Stream a) (Rec s (Promise (U Null (Pair a s)))))
-  (provide Stream))
-(module m typed/racket
-  (require 'stream)
-  (: x (Stream Integer))
-  (define x (delay '())))
-(require 'm)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11866.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11866.rkt
deleted file mode 100644
index 0c60e7428e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11866.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/load
-(module a typed/racket
-  (struct: S ((x : Integer)) #:transparent)
-    (provide (all-defined-out)))
-
-(module b typed/racket/no-check
-  (require 'a)
-    (S 5))
-
-(require 'b)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11887.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11887.rkt
deleted file mode 100644
index 5863f22edb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11887.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket
-
-(define-struct: [e f] doll ((inside : (Option (doll e f)))
-                            (elt1 : e)
-                                                        (elt2 : f)))
-
-(: singleton (All (e f) (e f -> (doll e f))))
-(define (singleton e f)
-  (make-doll #f e f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11897.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11897.rkt
deleted file mode 100644
index 70fc6ddaa1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11897.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket
-
-(: x Index)
-(define x 7)
-
-(provide x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11901.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11901.rkt
deleted file mode 100644
index 5e269ea187..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11901.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed/racket/base
-(define-type (adder lhs rhs) (lhs rhs -> Number))
-(define-struct: (lhs rhs) adder-box ((a : adder)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11912.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11912.rkt
deleted file mode 100644
index bb00fc50b5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11912.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang typed/racket
-
-(require typed/rackunit)
-
-(check-exn (lambda (exn) #t)
-           (lambda () (/ 1 0)))
-
-(check-equal? 2 2)
-(check-not-exn (lambda () (begin0 3 4)))
-
-(check-true #t)
-(check-false #f)
-(check-not-false 4)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11971.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11971.rkt
deleted file mode 100644
index 6002f521ee..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr11971.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/load
-
-(module a racket
-  (provide (struct-out foo))
-  (define-struct foo (proc) #:property prop:procedure (struct-field-index proc)))
-
-(module b typed/racket
-  (require/typed 'a
-                 (struct foo ((proc : (Number Number -> Number)))))
-  (if (procedure? (foo +))
-       #t
-       (error 'wrong-branch))) 
-
-(require 'b)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12224.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12224.rkt
deleted file mode 100644
index 6975ae1f35..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12224.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/load
-
-(module t1 typed/racket/base
-  (provide (all-defined-out))
-  (define-struct: f ([n : ((Promise Number) -> Number)])))
-
-(module t2 typed/racket/base
-  (require racket/promise 't1)
-  (: g (f (Promise Number) -> Number))
-  (define (g fx k)
-      ((f-n fx) k)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12644.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12644.rkt
deleted file mode 100644
index dc113c2505..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12644.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang typed/racket
-
-(define-type inf (Rec inf (Any -> inf)))
-(: f inf)
-(define (f x) f)
-
-(: g (All (x) (x -> x)))
-(define (g x) x)
-
-(: v (Listof (U inf Number)))
-(define v
-  (list
-    (with-handlers ((number? add1)) 3)
-    (with-handlers ((void f)) 4)))
-
-
-(list
-  (with-handlers ((void values)) 6)
-  (with-handlers ((number? add1)) 7)
-  (with-handlers ((void f)) 8)
-  (with-handlers ((void g)) 9))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12678.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12678.rkt
deleted file mode 100644
index d83186f3f9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12678.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket
-
-(define: memo : (HashTable Natural String)  (make-immutable-hash empty))
-(define strs '("Hello" "Goodbye"))
-
-(for/fold: : (HashTable Natural String)
-    ([memo : (HashTable Natural String)  (make-immutable-hash empty)])
-    ([i : Natural  (in-naturals)] [str : String  (in-list strs)])
-  (hash-set memo i str))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12806.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12806.rkt
deleted file mode 100644
index 7a4149d046..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12806.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/load
-
-(module a typed/racket
-  (struct: (V) foo ((v : V)))
-  (provide foo))
-
-(module b racket
-  (require 'a)
-
-  (foo 2))
-
-(require 'b)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12807.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12807.rkt
deleted file mode 100644
index 0e0095e150..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12807.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/load
-(module a typed/racket
-  (define (foo x) (list x))
-  (provide
-    (rename-out (foo foo2))
-    foo))
-
-(module b racket
-  (require 'a)
-  (foo 2)
-  (foo2 3))
-
-(require 'b)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12905.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12905.rkt
deleted file mode 100644
index 9644b270a7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12905.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang typed/racket
-
-(: f1 (case-> (Number -> Number) (Number 4 -> Number)))
-(define (f1 x (y 4)) y)
-
-(f1 2 4)
-
-(: f2 (4 -> (Values Number Number)))
-(define (f2 x) (values x x))
-
-(f2 4)
-
-(: f3 (4 Number * -> Number))
-(define (f3 x . y) x)
-
-(f3 4)
-
-(: f4 (4 * -> Number))
-(define (f4 . y) 5)
-
-(f4 4 4)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12913.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12913.rkt
deleted file mode 100644
index 494553ea98..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12913.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket
-
-;; Test that `define-type` works at the top-level
-
-(define ns (make-base-namespace))
-(eval '(require typed/racket) ns)
-(eval '(define-type Foo (U String Symbol)) ns)
-(eval '(: x Foo) ns)
-(eval '(define x 'x) ns)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12970.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12970.rkt
deleted file mode 100644
index c2541a8cd1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12970.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket/base
-
-(struct: (D) Boxer ((f : (Boxer2 D))))
-(struct: (D) Boxer2 ((f : (D -> Void))))
-
-(: f-Boxer (All (D) ((Boxer D) D -> Void)))
-(define (f-Boxer boxer v)
-  ((Boxer2-f (Boxer-f boxer)) v)) 
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12974.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12974.rkt
deleted file mode 100644
index 513a3a6ad5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr12974.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed/racket
-
-(define (f)
-  (let loop ((i 5))
-    (if (zero? i)
-        (void)
-        (loop (sub1 i))))
-  2)
-
-(let loop ((i 5))
-  (if (zero? i)
-      (void)
-      (loop (sub1 i))))
-
-
-(define (g)
-  (values 1 2)
-  2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13094.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13094.rkt
deleted file mode 100644
index 9405a28bc8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13094.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed/racket
-
-;; Test alpha equivalent types
-
-(: x (All (A) (A -> A)))
-(define x (plambda: (C) ((f : C)) f))
-
-(: y (All (A) (A A -> A)))
-(define y (plambda: (C) ((f : C) (g : A)) f))
-
-(: z (All (B) (B (B -> B) -> B)))
-(define z (plambda: (C) ((x : C) (f : (B -> B))) (f x)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13124.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13124.rkt
deleted file mode 100644
index 16bcfc4229..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13124.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang typed/racket/base
-
-;; Test for PR 13124
-
-(: foo (-> Flonum))
-(define (foo)
-  (: bn (Flonum -> Flonum))
-  (define (bn n)
-    (cond [(= n 0.0)
-           1.0]
-          [else (let loop ([s  0.0] [i  0.0])
-                  (cond [(i . < . n)
-                         (loop (+ s (bn i))
-                               (+ i 1.0))]
-                        [else  s]))]))
-  ;; we want this `v` to type-check without extra annotation
-  (define v 0.0)
-  v)
-
-;; simpler version
-(: foo2 (-> Integer))
-(define (foo2)
-  (: bn (Integer -> Integer))
-  (define (bn n)
-    (if (= n 0)
-        1 (bn (- n 1))))
-  (define v 1)
-  0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13155.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13155.rkt
deleted file mode 100644
index 745cd9e06d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13155.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-
-(module defs typed/racket/base
-  (provide foo)
-  (: foo Integer)
-  (define foo 4)
-  )
-
-(module private-defs typed/racket/base
-  (require (submod ".." defs))
-  (provide foo)
-  )
-
-(require 'private-defs)
-foo
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13160.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13160.rkt
deleted file mode 100644
index ad0a06db8f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13160.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/load
-
-(module a typed/racket/base
-  (provide (struct-out the-struct))
-  (struct: the-struct ((a : Number))))
-
-
-(module b typed/racket/base
-  (require 'a)
-  (provide (struct-out the-struct)))
-
-(require 'b)
-(the-struct 5)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13161.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13161.rkt
deleted file mode 100644
index 453c91be8c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13161.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/racket/base
-
-(provide (struct-out x)
-         make-x)
-
-(struct: x () #:transparent)
-
-(: make-x : -> x)
-(define (make-x)
-    (x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13185.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13185.rkt
deleted file mode 100644
index d2f5e60cf0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13185.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang typed/racket
-(for/vector: : (Vectorof Natural) ([i : Natural (in-range 20)]) i)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13326.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13326.rkt
deleted file mode 100644
index 9a8ee99c0c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13326.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket
-
-(require rackunit)
-
-;; the setup here is just to make it play nice with Rackunit
-(check-not-exn
- (λ ()
-  (parameterize ([current-error-port (open-output-nowhere)])
-    (eval
-     (quote
-      (begin
-        ;; This is the actual test case
-        (module typed typed/racket
-          (require typed/rackunit)
-
-          ;; Any wrappings should be okay here
-          (check-equal? (delay 0) (delay 0)))
-        (require 'typed)))
-     (make-base-namespace)))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13339.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13339.rkt
deleted file mode 100644
index 28da2e3a96..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13339.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang typed/racket
-
-(require racket/flonum
-         typed/rackunit)
-
-(: neg (Real -> Real))
-(define (neg x) (- x))
-
-(: flneg (Flonum -> Flonum))
-(define (flneg x) (fl* -1.0 x))
-
-(check-eqv? (neg +inf.0) -inf.0)
-(check-eqv? (neg -inf.0) +inf.0)
-(check-eqv? (neg +nan.0) +nan.0)
-(check-eqv? (neg -0.0) +0.0)
-(check-eqv? (neg +0.0) -0.0)
-
-(check-eqv? (flneg +inf.0) (neg +inf.0))
-(check-eqv? (flneg -inf.0) (neg -inf.0))
-(check-eqv? (flneg +nan.0) (neg +nan.0))
-(check-eqv? (flneg -0.0)   (neg -0.0))
-(check-eqv? (flneg +0.0)   (neg +0.0))
-
-(check-eqv? (- +inf.0) (neg +inf.0))
-(check-eqv? (- -inf.0) (neg -inf.0))
-(check-eqv? (- +nan.0) (neg +nan.0))
-(check-eqv? (- -0.0)   (neg -0.0))
-(check-eqv? (- +0.0)   (neg +0.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13412.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13412.rkt
deleted file mode 100644
index 387e3283e1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13412.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed/racket
-
-(define-type (Tree A) (U (Listof A) (node A)))
-(struct: (A) node ([val : A]
-                   [left : (Tree A)]
-                   [right : (Tree A)]))
-
-(: tree-set (All (A) (A (Tree A) -> (Tree A))))
-(define (tree-set y t)
-  (cond [(node? t)  (node y (node-left t) (node-right t))]
-        [else  (list y)]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13464.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13464.rkt
deleted file mode 100644
index d9a6b0bd8f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13464.rkt
+++ /dev/null
@@ -1,157 +0,0 @@
-#lang racket
-
-(module defs typed/racket
-  (provide (all-defined-out))
-
-  (: neg-flonum     Negative-Flonum)
-  (: pos-flonum     Positive-Flonum)
-  (: non-neg-flonum Nonnegative-Flonum)
-  (: non-pos-flonum Nonpositive-Flonum)
-
-  (: neg-single-flonum     Negative-Single-Flonum)
-  (: pos-single-flonum     Positive-Single-Flonum)
-  (: non-neg-single-flonum Nonnegative-Single-Flonum)
-  (: non-pos-single-flonum Nonpositive-Single-Flonum)
-
-  (: neg-ineact-real     Negative-Inexact-Real)
-  (: pos-ineact-real     Positive-Inexact-Real)
-  (: non-neg-ineact-real Nonnegative-Inexact-Real)
-  (: non-pos-ineact-real Nonpositive-Inexact-Real)
-
-  (: neg-real     Negative-Real)
-  (: pos-real     Positive-Real)
-  (: non-neg-real Nonnegative-Real)
-  (: non-pos-real Nonpositive-Real)
-  
-  (: neg-extflonum     Negative-ExtFlonum)
-  (: pos-extflonum     Positive-ExtFlonum)
-  (: non-neg-extflonum Nonnegative-ExtFlonum)
-  (: non-pos-extflonum Nonpositive-ExtFlonum)
-
-
-  (define neg-flonum     +nan.0)
-  (define pos-flonum     +nan.0)
-  (define non-neg-flonum +nan.0)
-  (define non-pos-flonum +nan.0)
-
-  (define neg-single-flonum     +nan.f)
-  (define pos-single-flonum     +nan.f)
-  (define non-neg-single-flonum +nan.f)
-  (define non-pos-single-flonum +nan.f)
-
-  (define neg-ineact-real     +nan.0)
-  (define pos-ineact-real     +nan.0)
-  (define non-neg-ineact-real +nan.0)
-  (define non-pos-ineact-real +nan.0)
-
-  (define neg-real     +nan.0)
-  (define pos-real     +nan.0)
-  (define non-neg-real +nan.0)
-  (define non-pos-real +nan.0)
-
-  (define neg-extflonum     +nan.t)
-  (define pos-extflonum     +nan.t)
-  (define non-neg-extflonum +nan.t)
-  (define non-pos-extflonum +nan.t)
-
-  
-  ;; extra tests for zeroes
-  (: non-neg-flonum+0 Nonnegative-Flonum)
-  (: non-pos-flonum+0 Nonpositive-Flonum)
-  (: non-neg-flonum-0 Nonnegative-Flonum)
-  (: non-pos-flonum-0 Nonpositive-Flonum)
-
-  (: non-neg-single-flonum+0 Nonnegative-Single-Flonum)
-  (: non-pos-single-flonum+0 Nonpositive-Single-Flonum)
-  (: non-neg-single-flonum-0 Nonnegative-Single-Flonum)
-  (: non-pos-single-flonum-0 Nonpositive-Single-Flonum)
-
-  (: non-neg-ineact-real+0 Nonnegative-Inexact-Real)
-  (: non-pos-ineact-real+0 Nonpositive-Inexact-Real)
-  (: non-neg-ineact-real-0 Nonnegative-Inexact-Real)
-  (: non-pos-ineact-real-0 Nonpositive-Inexact-Real)
-
-  (: non-neg-real+0 Nonnegative-Real)
-  (: non-pos-real+0 Nonpositive-Real)
-  (: non-neg-real-0 Nonnegative-Real)
-  (: non-pos-real-0 Nonpositive-Real)
-
-  (: non-neg-extflonum+0 Nonnegative-ExtFlonum)
-  (: non-pos-extflonum+0 Nonpositive-ExtFlonum)
-  (: non-neg-extflonum-0 Nonnegative-ExtFlonum)
-  (: non-pos-extflonum-0 Nonpositive-ExtFlonum)
-
-  (define non-neg-flonum+0 0.0)
-  (define non-pos-flonum+0 0.0)
-  (define non-neg-flonum-0 -0.0)
-  (define non-pos-flonum-0 -0.0)
-
-  (define non-neg-single-flonum+0 0.0f0)
-  (define non-pos-single-flonum+0 0.0f0)
-  (define non-neg-single-flonum-0 -0.0f0)
-  (define non-pos-single-flonum-0 -0.0f0)
-
-  (define non-neg-ineact-real+0 0.0)
-  (define non-pos-ineact-real+0 0.0)
-  (define non-neg-ineact-real-0 -0.0)
-  (define non-pos-ineact-real-0 -0.0)
-
-  (define non-neg-real+0 0.0)
-  (define non-pos-real+0 0.0)
-  (define non-neg-real-0 -0.0)
-  (define non-pos-real-0 -0.0)
-
-  (define non-neg-extflonum+0 0.0t0)
-  (define non-pos-extflonum+0 0.0t0)
-  (define non-neg-extflonum-0 -0.0t0)
-  (define non-pos-extflonum-0 -0.0t0)
-  )
-
-
-(require 'defs)
-
-neg-flonum
-pos-flonum
-non-neg-flonum
-non-pos-flonum
-neg-single-flonum
-pos-single-flonum
-non-neg-single-flonum
-non-pos-single-flonum
-neg-ineact-real
-pos-ineact-real
-non-neg-ineact-real
-non-pos-ineact-real
-neg-real
-pos-real
-non-neg-real
-non-pos-real
-neg-extflonum
-pos-extflonum
-non-neg-extflonum
-non-pos-extflonum
-
-non-neg-flonum+0
-non-pos-flonum+0
-non-neg-flonum-0
-non-pos-flonum-0
-
-non-neg-single-flonum+0
-non-pos-single-flonum+0
-non-neg-single-flonum-0
-non-pos-single-flonum-0
-
-non-neg-ineact-real+0
-non-pos-ineact-real+0
-non-neg-ineact-real-0
-non-pos-ineact-real-0
-
-non-neg-real+0
-non-pos-real+0
-non-neg-real-0
-non-pos-real-0
-
-non-neg-extflonum+0
-non-pos-extflonum+0
-non-neg-extflonum-0
-non-pos-extflonum-0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13490.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13490.rkt
deleted file mode 100644
index 968350b6bf..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13490.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/racket
-(define: z : 0+3.14i 0+3.14i)
-(number->string z)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13503.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13503.rkt
deleted file mode 100644
index ede1c3088f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13503.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/load
-(require typed/racket)
-(:print-type +)
-(:print-type (values 2 3 4))
-(:print-type (error 'ManyTypes))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13576.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13576.rkt
deleted file mode 100644
index 5860dbc4e2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13576.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/racket/base
-
-(define: (A ...) (lister args : A ... A) : (List A ... A)
-   args)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13584.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13584.rkt
deleted file mode 100644
index 5b83a17627..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13584.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang typed/racket
-
-(: f (case->
-      (-> Boolean)
-      (Input-Port -> Boolean)
-      (Bytes -> Boolean)))
-
-(define (f (p #f))
-  (cond ((input-port? p) #t)
-        ((bytes? p) #f)
-        (else #f)))
-
-(assert (call-with-input-bytes #"port" f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13646.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13646.rkt
deleted file mode 100644
index dfa0fdab2d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13646.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang typed/racket
-
-(struct: (A) Queue ([elem : A]))
-
-(: qmap : 
-   (All (A B ...) 
-        (case->
-          ((A -> A) (Queue A) -> (Queue A))
-          ((A B ... B -> A) (Queue A) (Queue B) ... B -> (Queue A)))))
-(define qmap
-  (pcase-lambda:
-    (A B ...)
-    [([func : (A -> A)] [deq  : (Queue A)])
-     deq]
-    [([func : (A B ... B -> A)]
-      [deq  : (Queue A)] . [deqs : (Queue B) ... B])
-     deq]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13691.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13691.rkt
deleted file mode 100644
index d26cdfbdc3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13691.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed/racket
-
-(let: loop : Integer ([b #t]) 3)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13710.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13710.rkt
deleted file mode 100644
index 27e691889b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13710.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang typed/racket
-
-(: convert-it (Any -> (HashTable Symbol Number)))
-(define (convert-it a)
-  (if (hash? a)
-      (begin
-        (hash-ref a 3)
-        (hash-has-key? a 3)
-        (ann (hash-remove a 3) HashTableTop)
-        (hash-remove! a 3)
-        (length (hash-map a (lambda: ([x : Any] [y : Any]) x)))
-        (hash-for-each a (lambda: ([x : Any] [y : Any]) (display x)))
-        (add1 (hash-count a))
-        (length (hash-keys a))
-        (length (hash-values a))
-        (length (hash->list a))
-        (for ([(k v) (in-hash a)])
-          (display k))
-        (for/hash: : (HashTable Symbol Number) ([v (in-hash-values a)])
-          (values 'x 1))
-        (for/hash: : (HashTable Symbol Number) ([k (in-hash-keys a)])
-          (values 'x 1)))
-      (error 'convert-it "not a hash ~s" a)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13747.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13747.rkt
deleted file mode 100644
index abd9aa1216..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13747.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket
-
-;; Test that `require/typed` works at the top-level
-
-(require racket/sandbox)
-
-(define evaluator
-  (call-with-trusted-sandbox-configuration
-   (λ () (make-evaluator 'typed/racket))))
-
-(evaluator '(require/typed racket/base [values (Integer -> Integer)]))
-(evaluator '(values 1))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13821.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13821.rkt
deleted file mode 100644
index 69378bcc0b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13821.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang typed/racket
-
-;; Test for PR 13821
-;;
-;; Make sure type instantiation with struct names doesn't
-;; loop forever
-
-(struct: (X) union ([fst : (ISet X)] [snd : (ISet X)]) #:transparent)
-(struct: (X) intersection ([fst : (ISet X)] [snd : (ISet X)]) #:transparent)
-(struct: (X) complement ([fst : (ISet X)] [snd : (ISet X)]) #:transparent)
-(define-type (ISet X) (U (union X) (intersection X) (complement X) (Setof X)))
-
-;; This involves type instantiation and could loop forever
-;; with the bug
-(: iset->set (All (X) ((ISet X) -> (Setof X))))
-(define (iset->set A)
-  (union? A)
-  (error 'unimplemented))
-
-;; A simpler way to reproduce the problem
-(union? 5)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13870.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13870.rkt
deleted file mode 100644
index 05cdcb9c6f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13870.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang typed/racket/base
-
-;; Test for PR 13870
-
-(require racket/match)
-
-(: sum ((Listof Integer) -> Integer))
-(define (sum l)
-  (match l
-    [(list) 0]
-    [(list x xs ...) (+ x (sum xs))]))
-
-(sum (list 1 2 3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13901.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13901.rkt
deleted file mode 100644
index 17cb1526b7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13901.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket/load
-
-;; This test ensures that require/typed/provide works for
-;; all of the clauses that are documented for require/typed
-
-(require rackunit)
-
-(module a typed/racket
-  (require/typed/provide
-   racket/base
-   [#:opaque Evt evt?]
-   [never-evt Evt]))
-(require 'a)
-
-(check-false (evt? 5))
-(check-true (evt? never-evt))
-
-(module b-provider racket
-  (struct foo (value))
-  (provide (struct-out foo)))
-
-(module b typed/racket
-  (require/typed/provide
-   'b-provider
-   [#:struct foo ([value : Exact-Nonnegative-Integer])]))
-(require 'b)
-
-(module c-provider racket
-  (struct bar (x))
-  (struct baz bar (y z))
-  (provide (struct-out bar)
-           (struct-out baz)))
-
-(module c typed/racket
-  (require/typed/provide
-   'c-provider
-   [#:struct bar ([x : Integer])]
-   [#:struct (baz bar) ([y : String] [z : String])]))
-(require 'c)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13937.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13937.rkt
deleted file mode 100644
index 0b8ffb9db6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr13937.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/racket
-
-;; Test for PR 13937
-
-;; This does not directly test the issue in PR 13937, but
-;; tests a workaround using `in-hash-pairs`.
-;;
-;; This should be a unit test, but the typecheck tests do
-;; not play nice with base-special-env bindings like `in-hash-pairs`
-;;
-(for/hash: : (HashTable Symbol Integer)
-  ([p : (Pairof Symbol Integer) (in-hash-pairs #hash((a . 5)))])
-  (values (car p) (cdr p)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14138.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14138.rkt
deleted file mode 100644
index 7dba4c4aa9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14138.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed/racket
-(: f (case->))
-(define (f x) (add1 "foo"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14355.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14355.rkt
deleted file mode 100644
index aa87a9b672..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14355.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket
-
-;; Test for PR 14355. Ideally would be a unit test, but
-;; the bug could not be triggered via the harness
-
-;; make sure this doesn't result in an internal error
-(cast (cast "x" String) String)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14364.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14364.rkt
deleted file mode 100644
index 04c1f8823a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14364.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-
-;; A test for PR 14364. Should not infinite loop.
-
-(struct: (X) Foo ([y : (U X (Pair (Foo X) (Foo X)))]))
-(: x (Foo String))
-(define x (Foo "a"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14374.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14374.rkt
deleted file mode 100644
index 872dbe039f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14374.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/racket
-
-;; Test for PR 14374. Ensure that flvector is okay for Any
-
-(require typed/rackunit
-         racket/fixnum
-         racket/flonum)
-
-(check-equal? (flvector 0.0) (flvector 0.0))
-(check-equal? (fxvector 0) (fxvector 0))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14458.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14458.rkt
deleted file mode 100644
index 958d820ba1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14458.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed/racket
-
-;; Test for PR 14458. Make sure that overlap checking on
-;; invariant struct types works against simple data types.
-
-(struct: (X) S ([z : (Vectorof X)]))
-(define-type (T X) (U 'Leaf (S X)))
-
-(: f (∀ (X) (T X) → Any))
-(define (f s)
-  (match s
-    [(S _) 42]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14463.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14463.rkt
deleted file mode 100644
index 6bd3257606..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14463.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang typed/racket/no-check
-
-;; Test for PR 14463. Check that require/typed with #:opaque works
-;; in no-check mode
-
-(module untyped racket
-  (provide f thing?)
-  (define (f x) x)
-  (define (thing? x) #t))
-
-(require/typed 'untyped
-               [#:opaque Thing thing?]
-               [f (Thing -> Thing)])
-
-(thing? 3)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14567.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14567.rkt
deleted file mode 100644
index 4a51845c1d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14567.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed/racket
-(provide f)
-(define-type C (Pair Number (Pair Number C)))
-(: f (C -> Boolean))
-(define (f x) (list? x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14568.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14568.rkt
deleted file mode 100644
index 14b0fa9e60..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14568.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed/racket
-
-(: rational->fle (-> Exact-Rational (Values Flonum Flonum)))
-(define (rational->fle r)
-  (let-values ([(s r)  (values (sgn r) (abs r))])
-    (define e
-      (- (integer-length (numerator r))
-         (integer-length (denominator r))))
-    (let loop ([r  (/ r (expt 2 e))] [e e])
-      (cond [(< r 1)  (loop (* r 2) (- e 1))]
-            [(>= r 2)  (loop (/ r 2) (+ e 1))]
-            [else
-             ;; (ann r Positive-Byte)  ; wrongly typechecks
-             (values (* (real->double-flonum s)
-                        (real->double-flonum r))  ; optimizer changes to ->fl
-                     (real->double-flonum e))]))))
-
-(rational->fle 1/7)  ; optimization causes contract violation
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14582.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14582.rkt
deleted file mode 100644
index c1eea2663c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14582.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang typed/racket/base
-(define-type CodeOfBoolean (Code Boolean))
-(define-type CodeOfInteger (Code Integer))
-(define-type CodeOfAny
-  (U CodeOfInteger
-     CodeOfBoolean))
-
-(define-type (Code Type)
-  (U Type
-     (If Type)
-     (Begin Type)))
-
-
-(struct (Type) If
-  ([cond : CodeOfBoolean]
-   [then : (Code Type)]
-   [else : (Code Type)])
-  #:transparent)
-
-
-
-(define-type (ListEndingIn ListType EndType)
-  (U (Pair EndType Null)
-     (Pair ListType (ListEndingIn ListType EndType))))
-
-(struct (Type) Begin
-  ([exprs : (ListEndingIn CodeOfAny (Code Type))]))
-
-
-(define QuotedCode : CodeOfInteger
-  (If #t
-      1
-      (Begin
-       (list 2 #f (If #t 3 4)))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14587.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14587.rkt
deleted file mode 100644
index 5ea3b6a5ad..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14587.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket
-(require typed/racket)
-(with-type #:result Any
-  (for/fold ([prod : Natural 1])
-            ([x : Natural '(1 2 3 4 5)])
-    (* x prod)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14702.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14702.rkt
deleted file mode 100644
index 970bcfd406..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14702.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang typed/racket
-(define (f [x : Integer]) : Integer (f x))
\ No newline at end of file
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14823.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14823.rkt
deleted file mode 100644
index 69337e4df1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14823.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket/base
-
-(: f : Real → Real)
-(define (f x)
-  (+ 1 (expt 1.0 x)))
-(f 0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14828.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14828.rkt
deleted file mode 100644
index 9aacfe6fca..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14828.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-
-(: emit-subroutines (-> (Listof String) Void))
-(define (emit-subroutines code*)
-  (exit 0)
-  (for : Void ([code : String code*])
-       (display code)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14829.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14829.rkt
deleted file mode 100644
index d856f5d772..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr14829.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-
-;; Test for PR 14829. Make sure the type is not printed
-;; for expressions that return Bottom.
-
-(require rackunit
-         racket/sandbox)
-
-(define out (open-output-string))
-
-(define tr-eval
-  (parameterize ([sandbox-output out])
-    (call-with-trusted-sandbox-configuration
-     (λ () (make-evaluator 'typed/racket)))))
-
-(with-handlers ([exn? values])
-  (tr-eval '(error "foo")))
-
-(check-equal? "" (get-output-string out))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9043.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9043.rkt
deleted file mode 100644
index 83199504b2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9043.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang scheme/load
-
-(module foo scheme
-
-  (define-struct foo (x y))
-  (provide (struct-out foo)))
-
-(module client typed-scheme
-  (require-typed-struct foo ([x : Number] [y : Symbol]) 'foo))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9046.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9046.rkt
deleted file mode 100644
index 6bfa62b58a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9046.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang scheme/load
-
-;; provide another source to import srcloc? to avoid
-;; collisions with the version from mzscheme.
-(module srcloc scheme/base
-
-  (provide (rename-out [srcloc? s:srcloc?])))
-
-(module foo typed-scheme
-
-  (require/opaque-type Srcloc s:srcloc? 'srcloc))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9048.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9048.rkt
deleted file mode 100644
index e23bfb0abd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9048.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang scheme/load
-
-(module source mzscheme
-
-    (require mzlib/contract)
-
-    (define-struct ast (loc))
-
-    (provide/contract (struct ast ([loc srcloc?])))
-  )
-
-(module client typed-scheme
-
-  (require-typed-struct ast ([loc : Any]) 'source))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9053-2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9053-2.rkt
deleted file mode 100644
index 93c513b0e6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9053-2.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#;
-(exn-pred exn:fail:syntax?)
-#lang scheme/load
-
-(module source scheme/base
-
-  (define-struct term (posn))           ;; lambda-calc term w/ srcloc info
-  (define-struct (var term) (id))
-  (define-struct (lam term) (arg body))
-  (define-struct (app term) (rator rand))
-
-  (provide (all-defined-out)))
-
-(module client typed-scheme
-
-  (require-typed-struct term ([posn : Number]) 'source)
-  (require-typed-struct (var term) (
-                             [id : Symbol])
-                        'source))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9053.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9053.rkt
deleted file mode 100644
index 27d4d4211f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9053.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scheme/load
-
-(module source scheme/base
-
-  (define-struct term (posn))           ;; lambda-calc term w/ srcloc info
-  (define-struct (var term) (id))
-  (define-struct (lam term) (arg body))
-  (define-struct (app term) (rator rand))
-
-  (provide (all-defined-out)))
-
-(module client typed-scheme
-
-  (require-typed-struct term ([posn : Number]) 'source)
-  (require-typed-struct var (
-                             [id : Symbol])
-                        'source))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9054.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9054.rkt
deleted file mode 100644
index 7b6acb1094..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/pr9054.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang scheme/load
-
-(module source mzscheme
-
-  (define-struct term (posn))           ;; lambda-calc term w/ srcloc info
-  (define-struct (var term) (id))
-  (define-struct (lam term) (arg body))
-  (define-struct (app term) (rator rand))
-
-  (provide (all-defined)))
-
-(module alias typed-scheme
-
-  (define-type-alias Srcloc Any)
-
-  (require-typed-struct term ([posn : Srcloc]) 'source))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/priority-queue.scm b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/priority-queue.scm
deleted file mode 100644
index 0b9c4a033d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/priority-queue.scm
+++ /dev/null
@@ -1,103 +0,0 @@
-#lang typed-scheme
-;;; priority-queue.scm  --  Jens Axel Søgaard
-;;; PURPOSE
-
-; This file implements priority queues on top of
-; a heap library.
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias symbol Symbol)
-(define-type-alias top Any)
-(define-type-alias list-of Listof)
-(require (prefix-in heap: "leftist-heap.ss")
-	 (except-in (lib "67.ss" "srfi") number-compare current-compare =? <?)
-	 (only-in "leftist-heap.ss" comparator))
-(require/typed
-  srfi/67
-  [number-compare (number number -> number)]
-  [current-compare (-> (top top -> number))]
-  [=? ((top top -> number) top top -> boolean)]
-  [<? ((top top -> number) top top -> boolean)])
-
-; a priority-queue is a heap of  (cons <priority> <element>)
-
-(define-type-alias (elem a) (cons number a))
-
-(define-typed-struct (a) priority-queue ([heap : (heap:Heap (elem a))]))
-
-(define-type-alias (pqh a) (heap:Heap (elem a)))
-
-; conveniences
-(pdefine: (a) (heap [pq : (priority-queue a)]) : (pqh a) (priority-queue-heap pq))
-(pdefine: (a) (pri [p : (elem a)]) : number (car p))
-(pdefine: (a) (elm [p : (elem a)]) : a  (cdr p))
-(pdefine: (a) (make [h : (pqh a)]) : (priority-queue a)  (make-priority-queue h))
-
-; sort after priority
-; TODO: and then element?
-(pdefine: (a) (compare [p1 : (elem a)] [p2 : (elem a)]) : number
-	  (number-compare (pri p1) (pri p2)))
-
-;;; OPERATIONS
-
-(define: (num-elems [h : (heap:Heap (cons number number))]) : (list-of (cons number number))
-  (heap:elements h))
-
-(pdefine: (a) (elements [pq : (priority-queue a)]) : (list-of a)
-          (map #{elm :: ((elem a) -> a)} (heap:elements (heap pq))))
-
-(pdefine: (a) (elements+priorities [pq : (priority-queue a)]) : (values (list-of a) (list-of number))
-	  (let: ([eps : (list-of (elem a)) (heap:elements (heap pq))])
-		(values (map #{elm :: ((elem a) -> a)} eps)
-			(map #{pri :: ((elem a) -> number)} eps))))
-
-(pdefine: (a) (empty? [pq : (priority-queue a)]) : boolean
-	  (heap:empty? (heap pq)))
-
-(define: empty : (All (a) (case-lambda (-> (priority-queue a)) (comparator -> (priority-queue a))))
-  (pcase-lambda: (a)
-    [() (#{empty @ a} (current-compare))]
-    [([cmp : comparator]) (make (#{heap:empty :: (case-lambda (-> (pqh a))
-                                                              (comparator -> (pqh a)))} cmp))]))
-
-(pdefine: (e r) (fold [f : ((cons number e) r -> r)] [b : r] [a : (priority-queue e)]) : r
-	  (heap:fold f b (#{heap :: ((priority-queue e) -> (pqh e))} a)))
-
-
-;; "bug" found - handling of empty heaps
-(pdefine: (a) (find-min [pq : (priority-queue a)]) : a
-	  (let ([h (heap pq)])
-            (if (heap:empty? h)
-                (error "priority queue empty")
-                (elm (heap:find-min h)))))
-
-(pdefine: (a) (find-min-priority [pq : (priority-queue a)]) : number
-	  (let ([h (heap pq)])
-	    (if (heap:empty? h)
-		(error "priority queue empty")
-                (pri (heap:find-min h)))))
-
-(pdefine: (a) (insert [x : a] [p : number] [pq : (priority-queue a)]) : (priority-queue a)
-	  (make (heap:insert (cons p x) (heap pq))))
-
-;; FIXME -- too many annotations needed on cons
-(pdefine: (a) (insert* [xs : (list-of a)] [ps : (list-of number)] [pq : (priority-queue a)]) : (priority-queue a)
-          (make (heap:insert* (map #{cons @ number a} ps xs) (heap pq))))
-
-(pdefine: (a) (delete-min [pq : (priority-queue a)]) : (priority-queue a)
-	  (let ([h (heap pq)])
-	    (if (heap:empty? h)
-                (error "priority queue empty")
-		(make (heap:delete-min h)))))
-
-
-(pdefine: (a) (size [pq : (priority-queue a)]) : number
-	  (heap:size (heap pq)))
-
-(pdefine: (a) (union [pq1 : (priority-queue a)] [pq2 : (priority-queue a)]) : (priority-queue a)
-	  (make (heap:union (heap pq1) (heap pq2))))
-
-
-#;(require "signatures/priority-queue-signature.scm")
-#;(provide-priority-queue)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/procedure-top.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/procedure-top.rkt
deleted file mode 100644
index 338bccc23e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/procedure-top.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket
-
-;; succeed version
-
-(module example typed/racket
-  ;; coerces into unapplicable function
-  (: id (Procedure -> Procedure))
-  (define (id x) x)
-
-  (: f (Integer -> Integer))
-  (define (f x) (+ x 1))
-
-  (define g (id f))
-
-  ;; contract here should allow application
-  (provide id))
-
-(require 'example)
-
-;; id's argument is procedure?, result is (case->)
-(id +)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/promise.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/promise.rkt
deleted file mode 100644
index e61e682100..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/promise.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/racket
-
-(require typed/rackunit)
-
-;; Test path reasoning for promises
-
-(: foo : (Promise (U Integer String)) -> (U Number False))
-(define (foo del)
-  (if (integer? (force del))
-      (+ 1 (force del))
-      (string->number (force del))))
-
-(check-equal? (foo (delay 5)) 6)
-(check-equal? (foo (delay "5")) 5)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/prompt-tag.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/prompt-tag.rkt
deleted file mode 100644
index f7fb1b405c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/prompt-tag.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang typed/racket
-
-(: pt (Prompt-Tagof String (Integer -> Integer)))
-(define pt (make-continuation-prompt-tag))
-
-;; Test abort
-(call-with-continuation-prompt
- (λ () (string-append "foo" (abort-current-continuation pt 5)))
- pt
- (λ: ([x : Integer]) x))
-
-(: pt2 (Prompt-Tagof Integer ((Integer -> Integer) -> Integer)))
-(define pt2 (make-continuation-prompt-tag))
-
-;; Test call/comp & abort
-(call-with-continuation-prompt
- (λ () (+ 1 ((inst call-with-composable-continuation
-                   Integer ((Integer -> Integer) -> Integer) Integer)
-             (λ: ([k : (Integer -> Integer)])
-               (abort-current-continuation pt2 k))
-             pt2)))
- pt2
- (λ: ([f : (Integer -> Integer)]) (f 5)))
-
-;; Test the default handler
-(: pt3 (Prompt-Tagof Integer ((-> Integer) -> Integer)))
-(define pt3 (make-continuation-prompt-tag))
-
-(+ 2
-   (call-with-continuation-prompt
-    (λ () (+ 1 (abort-current-continuation pt3 (λ () 5))))
-    pt3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-case-rest.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-case-rest.rkt
deleted file mode 100644
index 02681eb360..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-case-rest.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket
-
-(provide foo)
-
-(define foo
- (case-lambda:
-   (((x : Number)) x)
-   (((x : Number) (y : Number) z : Number *) y)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-poly-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-poly-struct.rkt
deleted file mode 100644
index 3fc0efad2a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-poly-struct.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scheme/load
-
-(module m typed-scheme
-  (define-struct: (A) x ([v : A]))
-  (provide make-x x-v))
-
-(module n scheme
-  (require 'm)
-  (x-v (make-x 1)))
-
-(require 'm)
-(require 'n)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-sexp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-sexp.rkt
deleted file mode 100644
index f7da73c865..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-sexp.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#lang scheme/load
-
-(module m typed-scheme
- (provide f)
- (: f Sexp)
- (define f 5))
-
-(require 'm)
-
-f
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-struct-untyped.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-struct-untyped.rkt
deleted file mode 100644
index 191bdbf2ac..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-struct-untyped.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang scheme/load
-
-(module m typed-scheme
-  (define-struct: x ([f : (Number -> Number)]))
-  (: my-x x)
-  (define my-x (make-x (lambda: ([z : Number]) z)))
-  (provide (all-defined-out)))
-
-(module n2 scheme/base
-
-  (require 'm scheme/match)
-  (match my-x
-    [(struct x (f)) (f 7)]))
-
-
-(require 'n2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-struct.rkt
deleted file mode 100644
index e06f04bddd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-struct.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang scheme/load
-
-
-(module m typed-scheme
-  (define-typed-struct A ())
-  (define-typed-struct (x A) ([y : Number] [z : Boolean]))
-  (: foo (x -> Number))
-  (define (foo z) 1)
-  (provide (all-defined-out)))
-
-(module n scheme
-  (require (prefix-in m: 'm))
-  (m:foo (m:make-x 1 #f))
-  m:x?)
-
-(require 'n)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-syntax.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-syntax.rkt
deleted file mode 100644
index 057a42664b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/provide-syntax.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed-scheme
-
-(define-syntax-rule (foo) 1)
-
-(provide foo)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/racket-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/racket-struct.rkt
deleted file mode 100644
index 354a669886..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/racket-struct.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-
-(struct: x ([y : Number]))
-
-(x 1)
-(x-y (x 7))
-(ann x? (Any -> Boolean : x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rackunit.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rackunit.rkt
deleted file mode 100644
index 936b6b59f1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rackunit.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang typed/scheme/base
-
-(require typed/rackunit)
-(: my-+ : Integer Integer -> Integer)
-
-(define (my-+ a b)
-  (if (zero? a)
-      b
-      (my-+ (sub1 a) (add1 b))))
-
-(: my-* : Integer Integer -> Integer)
-(define (my-* a b)
-  (if (= 1 a)
-      b
-      (my-* (sub1 a) (my-+ b b))))
-
-(check-equal? (my-+ 1 1) 2 "Simple addition")
-
-(test-begin
- (check-equal? (my-+ 1 1) 2 "Simple addition")
- (check-equal? (my-* 2 2) 4 "Simple multiplication"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/random-bits.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/random-bits.rkt
deleted file mode 100644
index 4caf3d4ae3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/random-bits.rkt
+++ /dev/null
@@ -1,621 +0,0 @@
-; MODULE DEFINITION FOR SRFI-27
-; =============================
-;
-; Sebastian.Egner@philips.com, Mar-2002, in PLT 204
-;
-; This file contains the top-level definition for the 54-bit integer-only
-; implementation of SRFI 27 for the PLT 204 DrScheme system.
-;
-; 1. The core generator is implemented in 'mrg32k3a-a.scm'.
-; 2. The generic parts of the interface are in 'mrg32k3a.scm'.
-; 3. The non-generic parts (record type, time, error) are here.
-;
-; load the module with
-;   (require srfi/random-bits)
-;
-; history of this file:
-;   SE, 17-May-2003: initial version
-
-(module random-bits typed-scheme
-  #;(require srfi/9)
-  #;(require srfi/23)
-
-  (provide
-   random-integer random-real default-random-source
-   make-random-source random-source? random-source-state-ref
-   random-source-state-set! random-source-randomize!
-   random-source-pseudo-randomize!
-   random-source-make-integers random-source-make-reals)
-
-  (define-type-alias Nb Integer)
-  (define-type-alias Flt Number)
-  (define-type-alias Nbs (Listof Nb))
-  (define-type-alias State (Vectorof Integer))
-  (define-type-alias SpList (cons 'lecuyer-mrg32k3a (Listof Nb)))
-  (define-typed-struct :random-source (
-                                       [state-ref : ( -> SpList)]
-                                       [state-set! : ((Listof Nb)-> Void)]
-                                       [randomize! : ( -> Void)]
-                                       [pseudo-randomize! : (Integer Integer -> Void)]
-                                       [make-integers : (-> (Integer -> Integer)) ]
-                                       [make-reals : ( Nb * -> ( -> Number))]))
-  (define-type-alias Random :random-source)
-  (define: (:random-source-make
-            [state-ref : ( -> SpList)]
-            [state-set! : ((Listof Nb)-> Void)]
-            [randomize! : ( -> Void)]
-            [pseudo-randomize! : (Integer Integer -> Void)]
-            [make-integers : (-> (Integer -> Integer)) ]
-            [make-reals : (Nb * -> (-> Number))])
-            : Random
-    (make-:random-source state-ref state-set! randomize! pseudo-randomize! make-integers make-reals ))
-
-  #;(define-record-type :random-source
-    (:random-source-make
-     state-ref
-     state-set!
-     randomize!
-     pseudo-randomize!
-     make-integers
-     make-reals)
-     :random-source?
-    (state-ref :random-source-state-ref)
-    (state-set! :random-source-state-set!)
-    (randomize! :random-source-randomize!)
-    (pseudo-randomize! :random-source-pseudo-randomize!)
-    (make-integers :random-source-make-integers)
-    (make-reals :random-source-make-reals))
-
-  (define: :random-source-current-time : ( -> Nb )
-   current-milliseconds) ;;on verra apres
-
-; implementation begins here
-
-; 54-BIT INTEGER IMPLEMENTATION OF THE "MRG32K3A"-GENERATOR
-; =========================================================
-;
-; Sebastian.Egner@philips.com, Mar-2002.
-;
-; This file is an implementation of Pierre L'Ecuyer's MRG32k3a
-; pseudo random number generator. Please refer to 'mrg32k3a.scm'
-; for more information.
-;
-; compliance:
-;   Scheme R5RS with integers covering at least {-2^53..2^53-1}.
-;
-; history of this file:
-;   SE, 18-Mar-2002: initial version
-;   SE, 22-Mar-2002: comments adjusted, range added
-;   SE, 25-Mar-2002: pack/unpack just return their argument
-
-; the actual generator
-
-
-(define: (mrg32k3a-random-m1 [state : State]) : Nb
-  (let ((x11 (vector-ref state 0))
-	(x12 (vector-ref state 1))
-	(x13 (vector-ref state 2))
-	(x21 (vector-ref state 3))
-	(x22 (vector-ref state 4))
-	(x23 (vector-ref state 5)))
-    (let ((x10 (modulo (- (* 1403580 x12) (* 810728 x13)) 4294967087))
-	  (x20 (modulo (- (* 527612 x21) (* 1370589 x23)) 4294944443)))
-      (vector-set! state 0 x10)
-      (vector-set! state 1 x11)
-      (vector-set! state 2 x12)
-      (vector-set! state 3 x20)
-      (vector-set! state 4 x21)
-      (vector-set! state 5 x22)
-      (modulo (- x10 x20) 4294967087))))
-
-; interface to the generic parts of the generator
-
-(define: (mrg32k3a-pack-state [unpacked-state : State]) : State
-  unpacked-state)
-
-(define: (mrg32k3a-unpack-state [state : State] ) : State
-  state)
-
-(define: (mrg32k3a-random-range) : Integer ; m1
-  4294967087)
-
-(define: (mrg32k3a-random-integer [state : State] [range : Nb]) : Nb ; rejection method
-  (let* ((q (quotient 4294967087 range))
-	 (qn (* q range)))
-    (do:  : Nb ((x : Nb (mrg32k3a-random-m1 state) (mrg32k3a-random-m1 state))) ;;no alias accepted
-	((< x qn) (quotient x q)))))
-
-(define: (mrg32k3a-random-real [state : State]) : Number ; normalization is 1/(m1+1)
-  (* 0.0000000002328306549295728 (+ 1.0 (mrg32k3a-random-m1 state))))
-
-
-; GENERIC PART OF MRG32k3a-GENERATOR FOR SRFI-27
-; ==============================================
-;
-; Sebastian.Egner@philips.com, 2002.
-;
-; This is the generic R5RS-part of the implementation of the MRG32k3a
-; generator to be used in SRFI-27. It is based on a separate implementation
-; of the core generator (presumably in native code) and on code to
-; provide essential functionality not available in R5RS (see below).
-;
-; compliance:
-;   Scheme R5RS with integer covering at least {-2^53..2^53-1}.
-;   In addition,
-;     SRFI-23: error
-;
-; history of this file:
-;   SE, 22-Mar-2002: refactored from earlier versions
-;   SE, 25-Mar-2002: pack/unpack need not allocate
-;   SE, 27-Mar-2002: changed interface to core generator
-;   SE, 10-Apr-2002: updated spec of mrg32k3a-random-integer
-
-; Generator
-; =========
-;
-; Pierre L'Ecuyer's MRG32k3a generator is a Combined Multiple Recursive
-; Generator. It produces the sequence {(x[1,n] - x[2,n]) mod m1 : n}
-; defined by the two recursive generators
-;
-;   x[1,n] = (               a12 x[1,n-2] + a13 x[1,n-3]) mod m1,
-;   x[2,n] = (a21 x[2,n-1] +                a23 x[2,n-3]) mod m2,
-;
-; where the constants are
-;   m1       = 4294967087 = 2^32 - 209    modulus of 1st component
-;   m2       = 4294944443 = 2^32 - 22853  modulus of 2nd component
-;   a12      =  1403580                   recursion coefficients
-;   a13      =  -810728
-;   a21      =   527612
-;   a23      = -1370589
-;
-; The generator passes all tests of G. Marsaglia's Diehard testsuite.
-; Its period is (m1^3 - 1)(m2^3 - 1)/2 which is nearly 2^191.
-; L'Ecuyer reports: "This generator is well-behaved in all dimensions
-; up to at least 45: ..." [with respect to the spectral test, SE].
-;
-; The period is maximal for all values of the seed as long as the
-; state of both recursive generators is not entirely zero.
-;
-; As the successor state is a linear combination of previous
-; states, it is possible to advance the generator by more than one
-; iteration by applying a linear transformation. The following
-; publication provides detailed information on how to do that:
-;
-;    [1] P. L'Ecuyer, R. Simard, E. J. Chen, W. D. Kelton:
-;        An Object-Oriented Random-Number Package With Many Long
-;        Streams and Substreams. 2001.
-;        To appear in Operations Research.
-;
-; Arithmetics
-; ===========
-;
-; The MRG32k3a generator produces values in {0..2^32-209-1}. All
-; subexpressions of the actual generator fit into {-2^53..2^53-1}.
-; The code below assumes that Scheme's "integer" covers this range.
-; In addition, it is assumed that floating point literals can be
-; read and there is some arithmetics with inexact numbers.
-;
-; However, for advancing the state of the generator by more than
-; one step at a time, the full range {0..2^32-209-1} is needed.
-
-
-; Required: Backbone Generator
-; ============================
-;
-; At this point in the code, the following procedures are assumed
-; to be defined to execute the core generator:
-;
-;   (mrg32k3a-pack-state unpacked-state) -> packed-state
-;   (mrg32k3a-unpack-state packed-state) -> unpacked-state
-;      pack/unpack a state of the generator. The core generator works
-;      on packed states, passed as an explicit argument, only. This
-;      allows native code implementations to store their state in a
-;      suitable form. Unpacked states are #(x10 x11 x12 x20 x21 x22)
-;      with integer x_ij. Pack/unpack need not allocate new objects
-;      in case packed and unpacked states are identical.
-;
-;   (mrg32k3a-random-range) -> m-max
-;   (mrg32k3a-random-integer packed-state range) -> x in {0..range-1}
-;      advance the state of the generator and return the next random
-;      range-limited integer.
-;        Note that the state is not necessarily advanced by just one
-;      step because we use the rejection method to avoid any problems
-;      with distribution anomalies.
-;        The range argument must be an exact integer in {1..m-max}.
-;      It can be assumed that range is a fixnum if the Scheme system
-;      has such a number representation.
-;
-;   (mrg32k3a-random-real packed-state) -> x in (0,1)
-;      advance the state of the generator and return the next random
-;      real number between zero and one (both excluded). The type of
-;      the result should be a flonum if possible.
-
-; Required: Record Data Type
-; ==========================
-;
-; At this point in the code, the following procedures are assumed
-; to be defined to create and access a new record data type:
-;
-;   (:random-source-make a0 a1 a2 a3 a4 a5) -> s
-;     constructs a new random source object s consisting of the
-;     objects a0 .. a5 in this order.
-;
-;   (:random-source? obj) -> bool
-;     tests if a Scheme object is a :random-source.
-;
-;   (:random-source-state-ref         s) -> a0
-;   (:random-source-state-set!        s) -> a1
-;   (:random-source-randomize!        s) -> a2
-;   (:random-source-pseudo-randomize! s) -> a3
-;   (:random-source-make-integers     s) -> a4
-;   (:random-source-make-reals        s) -> a5
-;     retrieve the values in the fields of the object s.
-
-; Required: Current Time as an Integer
-; ====================================
-;
-; At this point in the code, the following procedure is assumed
-; to be defined to obtain a value that is likely to be different
-; for each invokation of the Scheme system:
-;
-;   (:random-source-current-time) -> x
-;     an integer that depends on the system clock. It is desired
-;     that the integer changes as fast as possible.
-
-
-; Accessing the State
-; ===================
-
-(define: (mrg32k3a-state-ref [packed-state : State ]) : (cons 'lecuyer-mrg32k3a (Listof Nb))
-  (cons 'lecuyer-mrg32k3a
-        (vector->list (mrg32k3a-unpack-state packed-state))))
-
-(define: (mrg32k3a-state-set [external-state : (Listof Nb)]) : State
-
-  (define: (check-value [x : Nb] [m : Nb]) : Boolean
-    (if (and (integer? x)
-             (exact? x)
-             (<= 0 x (- m 1)))
-        #t
-        (error "illegal value" x)))
-
-  (if (and (list? external-state)
-           (= (length external-state) 7)
-           (eq? (car external-state) 'lecuyer-mrg32k3a))
-      (let: ((s : (Listof Nb) (cdr external-state)))
-        (check-value (list-ref s 0) mrg32k3a-m1)
-        (check-value (list-ref s 1) mrg32k3a-m1)
-        (check-value (list-ref s 2) mrg32k3a-m1)
-        (check-value (list-ref s 3) mrg32k3a-m2)
-        (check-value (list-ref s 4) mrg32k3a-m2)
-        (check-value (list-ref s 5) mrg32k3a-m2)
-        (when (or (zero? (+ (list-ref s 0) (list-ref s 1) (list-ref s 2)))
-                  (zero? (+ (list-ref s 3) (list-ref s 4) (list-ref s 5))))
-          (error "illegal degenerate state" external-state))
-        (mrg32k3a-pack-state (list->vector s)))
-      (error "malformed state" external-state)))
-
-
-; Pseudo-Randomization
-; ====================
-;
-; Reference [1] above shows how to obtain many long streams and
-; substream from the backbone generator.
-;
-; The idea is that the generator is a linear operation on the state.
-; Hence, we can express this operation as a 3x3-matrix acting on the
-; three most recent states. Raising the matrix to the k-th power, we
-; obtain the operation to advance the state by k steps at once. The
-; virtual streams and substreams are now simply parts of the entire
-; periodic sequence (which has period around 2^191).
-;
-; For the implementation it is necessary to compute with matrices in
-; the ring (Z/(m1*m1)*Z)^(3x3). By the Chinese-Remainder Theorem, this
-; is isomorphic to ((Z/m1*Z) x (Z/m2*Z))^(3x3). We represent such a pair
-; of matrices
-;   [ [[x00 x01 x02],
-;      [x10 x11 x12],
-;      [x20 x21 x22]], mod m1
-;     [[y00 y01 y02],
-;      [y10 y11 y12],
-;      [y20 y21 y22]]  mod m2]
-; as a vector of length 18 of the integers as written above:
-;   #(x00 x01 x02 x10 x11 x12 x20 x21 x22
-;     y00 y01 y02 y10 y11 y12 y20 y21 y22)
-;
-; As the implementation should only use the range {-2^53..2^53-1}, the
-; fundamental operation (x*y) mod m, where x, y, m are nearly 2^32,
-; is computed by breaking up x and y as x = x1*w + x0 and y = y1*w + y0
-; where w = 2^16. In this case, all operations fit the range because
-; w^2 mod m is a small number. If proper multiprecision integers are
-; available this is not necessary, but pseudo-randomize! is an expected
-; to be called only occasionally so we do not provide this implementation.
-
-(define: mrg32k3a-m1 : Nb 4294967087) ; modulus of component 1
-(define: mrg32k3a-m2 : Nb 4294944443) ; modulus of component 2
-
-(define: mrg32k3a-initial-state : (Vectorof Nb); 0 3 6 9 12 15 of A^16, see below
-  '#( 1062452522
-      2961816100
-       342112271
-      2854655037
-      3321940838
-      3542344109))
-
-(define: mrg32k3a-generators : (Listof State) '(#(0 0 0 0 0)) ) ; computed when needed -> Changer #f by a State to hava right type.
-(define: (mrg32k3a-pseudo-randomize-state [i : Integer] [j : Integer]) : State
-
-  (define: (product [A : State] [B : State]) : State ; A*B in ((Z/m1*Z) x (Z/m2*Z))^(3x3)
-
-    (define: w     : Nb 65536) ; wordsize to split {0..2^32-1}
-    (define: w-sqr1 : Nb 209)   ; w^2 mod m1
-    (define: w-sqr2 : Nb 22853) ; w^2 mod m2
-
-    (define: (lc [i0 : Natural] [i1 : Natural] [i2 : Natural] [j0 : Natural] [j1 : Natural] [j2 : Natural] [m : Nb] [w-sqr : Nb ]): Nb ; linear combination
-      (let ((a0h (quotient (vector-ref A i0) w))
-            (a0l (modulo   (vector-ref A i0) w))
-            (a1h (quotient (vector-ref A i1) w))
-            (a1l (modulo   (vector-ref A i1) w))
-            (a2h (quotient (vector-ref A i2) w))
-            (a2l (modulo   (vector-ref A i2) w))
-            (b0h (quotient (vector-ref B j0) w))
-            (b0l (modulo   (vector-ref B j0) w))
-            (b1h (quotient (vector-ref B j1) w))
-            (b1l (modulo   (vector-ref B j1) w))
-            (b2h (quotient (vector-ref B j2) w))
-            (b2l (modulo   (vector-ref B j2) w)))
-        (modulo
-         (+ (* (+ (* a0h b0h)
-                  (* a1h b1h)
-                  (* a2h b2h))
-               w-sqr)
-            (* (+ (* a0h b0l)
-                  (* a0l b0h)
-                  (* a1h b1l)
-                  (* a1l b1h)
-                  (* a2h b2l)
-                  (* a2l b2h))
-               w)
-            (* a0l b0l)
-            (* a1l b1l)
-            (* a2l b2l))
-         m)))
-
-    (vector
-     (lc  0  1  2   0  3  6  mrg32k3a-m1 w-sqr1) ; (A*B)_00 mod m1
-     (lc  0  1  2   1  4  7  mrg32k3a-m1 w-sqr1) ; (A*B)_01
-     (lc  0  1  2   2  5  8  mrg32k3a-m1 w-sqr1)
-     (lc  3  4  5   0  3  6  mrg32k3a-m1 w-sqr1) ; (A*B)_10
-     (lc  3  4  5   1  4  7  mrg32k3a-m1 w-sqr1)
-     (lc  3  4  5   2  5  8  mrg32k3a-m1 w-sqr1)
-     (lc  6  7  8   0  3  6  mrg32k3a-m1 w-sqr1)
-     (lc  6  7  8   1  4  7  mrg32k3a-m1 w-sqr1)
-     (lc  6  7  8   2  5  8  mrg32k3a-m1 w-sqr1)
-     (lc  9 10 11   9 12 15  mrg32k3a-m2 w-sqr2) ; (A*B)_00 mod m2
-     (lc  9 10 11  10 13 16  mrg32k3a-m2 w-sqr2)
-     (lc  9 10 11  11 14 17  mrg32k3a-m2 w-sqr2)
-     (lc 12 13 14   9 12 15  mrg32k3a-m2 w-sqr2)
-     (lc 12 13 14  10 13 16  mrg32k3a-m2 w-sqr2)
-     (lc 12 13 14  11 14 17  mrg32k3a-m2 w-sqr2)
-     (lc 15 16 17   9 12 15  mrg32k3a-m2 w-sqr2)
-     (lc 15 16 17  10 13 16  mrg32k3a-m2 w-sqr2)
-     (lc 15 16 17  11 14 17  mrg32k3a-m2 w-sqr2)))
-
-  (define: (power [A : State ] [e : Nb]) : State ; A^e
-    (cond
-     ((zero? e)
-      '#(1 0 0 0 1 0 0 0 1 1 0 0 0 1 0 0 0 1))
-     ((= e 1)
-      A)
-     ((even? e)
-      (power (product A A) (quotient e 2)))
-     (else
-      (product (power A (- e 1)) A))))
-
-  (define: (power-power [A : State] [b : Nb]) : State ; A^(2^b)
-    (if (zero? b)
-        A
-        (power-power (product A A) (- b 1))))
-
-  (define: A  : State                      ; the MRG32k3a recursion
-    '#(     0 1403580 4294156359
-            1       0          0
-            0       1          0
-       527612       0 4293573854
-            1       0          0
-            0       1          0))
-
-  ; check arguments
-  (when (not (and (integer? i)
-                  (exact? i)
-                  (integer? j)
-                  (exact? j)))
-    (error "i j must be exact integer" i j))
-
-  ; precompute A^(2^127) and A^(2^76) only once
-
-  (when #t #;(not mrg32k3a-generators)
-    (set! mrg32k3a-generators
-          (list (power-power A 127)
-                (power-power A  76)
-                (power A 16))))
-
-  ; compute M = A^(16 + i*2^127 + j*2^76)
-  (let ((M (product
-            (list-ref mrg32k3a-generators 2)
-            (product
-             (power (list-ref mrg32k3a-generators 0)
-                    (modulo i (expt 2 28)))
-             (power (list-ref mrg32k3a-generators 1)
-                    (modulo j (expt 2 28)))))))
-    (mrg32k3a-pack-state
-     (vector
-      (vector-ref M 0)
-      (vector-ref M 3)
-      (vector-ref M 6)
-      (vector-ref M 9)
-      (vector-ref M 12)
-      (vector-ref M 15)))))
-
-; True Randomization
-; ==================
-;
-; The value obtained from the system time is feed into a very
-; simple pseudo random number generator. This in turn is used
-; to obtain numbers to randomize the state of the MRG32k3a
-; generator, avoiding period degeneration.
-
-(define: (mrg32k3a-randomize-state [state : State]) : State
-
-  ; G. Marsaglia's simple 16-bit generator with carry
-  (define: m : Nb 65536)
-  (define: x : Nb (modulo (:random-source-current-time) m))
-  (define: (random-m) : Nb
-    (let ((y (modulo x m)))
-      (set! x (+ (* 30903 y) (quotient x m)))
-      y))
-  (define: (random [n : Nb]) : Nb ; m < n < m^2
-    (modulo (+ (* (random-m) m) (random-m)) n))
-
-  ; modify the state
-  (let ((m1 mrg32k3a-m1)
-        (m2 mrg32k3a-m2)
-        (s (mrg32k3a-unpack-state state)))
-    (mrg32k3a-pack-state
-     (vector
-      (+ 1 (modulo (+ (vector-ref s 0) (random (- m1 1))) (- m1 1)))
-      (modulo (+ (vector-ref s 1) (random m1)) m1)
-      (modulo (+ (vector-ref s 2) (random m1)) m1)
-      (+ 1 (modulo (+ (vector-ref s 3) (random (- m2 1))) (- m2 1)))
-      (modulo (+ (vector-ref s 4) (random m2)) m2)
-      (modulo (+ (vector-ref s 5) (random m2)) m2)))))
-
-
-; Large Integers
-; ==============
-;
-; To produce large integer random deviates, for n > m-max, we first
-; construct large random numbers in the range {0..m-max^k-1} for some
-; k such that m-max^k >= n and then use the rejection method to choose
-; uniformly from the range {0..n-1}.
-
-(define: mrg32k3a-m-max : Integer
-  (mrg32k3a-random-range))
-
-(define: (mrg32k3a-random-power [state : State] [k : Nb]) : Nb ; n = m-max^k, k >= 1
-  (if (= k 1)
-      (mrg32k3a-random-integer state mrg32k3a-m-max)
-      (+ (* (mrg32k3a-random-power state (- k 1)) mrg32k3a-m-max)
-         (mrg32k3a-random-integer state mrg32k3a-m-max))))
-
-(define: (mrg32k3a-random-large [state : State] [n : Nb]) : Nb ; n > m-max
-  (do: : Integer ((k : Integer 2 (+ k 1))
-                  (mk : Integer (* mrg32k3a-m-max mrg32k3a-m-max) (* mk mrg32k3a-m-max)))
-      ((>= mk n)
-       (let* ((mk-by-n (quotient mk n))
-              (a (* mk-by-n n)))
-         (do: : Integer ((x : Integer (mrg32k3a-random-power state k)
-                            (mrg32k3a-random-power state k)))
-              ((< x a) (quotient x mk-by-n)))))))
-
-
-; Multiple Precision Reals
-; ========================
-;
-; To produce multiple precision reals we produce a large integer value
-; and convert it into a real value. This value is then normalized.
-; The precision goal is unit <= 1/(m^k + 1), or 1/unit - 1 <= m^k.
-; If you know more about the floating point number types of the
-; Scheme system, this can be improved.
-
-(define: (mrg32k3a-random-real-mp [state : State] [unit : Real]) : Number
-  (do: : Real ((k : Integer 1 (+ k 1))
-               (u : Real (- (/ 1 unit) 1) (/ u mrg32k3a-m1)))
-      ((<= u 1)
-       (/ (exact->inexact (+ (mrg32k3a-random-power state k) 1))
-          (exact->inexact (+ (expt mrg32k3a-m-max k) 1))))))
-
-
-; Provide the Interface as Specified in the SRFI
-; ==============================================
-;
-; An object of type random-source is a record containing the procedures
-; as components. The actual state of the generator is stored in the
-; binding-time environment of make-random-source.
-
-(define: (make-random-source) : Random
-  (let: ((state : State (mrg32k3a-pack-state ; make a new copy
-                         (list->vector (vector->list mrg32k3a-initial-state)))))
-    (:random-source-make
-     (lambda: ()
-       (mrg32k3a-state-ref state))
-     (lambda: ([new-state : (Listof Integer)])
-       (set! state (mrg32k3a-state-set new-state)))
-     (lambda: ()
-       (set! state (mrg32k3a-randomize-state state)))
-     (lambda: ([i : Integer] [j : Integer])
-       (set! state (mrg32k3a-pseudo-randomize-state i j)))
-     (lambda: ()
-       (lambda: ([n : Nb])
-         (cond
-          ((not (and (integer? n) (exact? n) (positive? n)))
-           (error "range must be exact positive integer" n))
-          ((<= n mrg32k3a-m-max)
-           (mrg32k3a-random-integer state n))
-          (else
-           (mrg32k3a-random-large state n)))))
-     (lambda: [args : Nb *]
-       (cond
-        ((null? args)
-         (lambda ()
-           (mrg32k3a-random-real state)))
-        ((null? (cdr args))
-         (let: ((unit : Flt (car args)))
-           (cond
-            ((not (and (real? unit) (< 0 unit 1)))
-             (error "unit must be real in (0,1)" unit))
-            ((<= (- (/ 1 unit) 1) mrg32k3a-m1)
-             (lambda: ()
-               (mrg32k3a-random-real state)))
-            (else
-             (lambda: ()
-               (mrg32k3a-random-real-mp state unit))))))
-        (else
-         (error "illegal arguments" args)))))))
-
-(define: random-source? : (Any -> Boolean : Random)
-  :random-source?)
-
-(define: (random-source-state-ref [s : Random]) : SpList
-  ((:random-source-state-ref s)))
-
-(define: (random-source-state-set! [s : Random] [state : Nbs]) : Void
-  ((:random-source-state-set! s) state))
-
-(define: (random-source-randomize! [s : Random]) : Void
-  ((:random-source-randomize! s)))
-
-(define: (random-source-pseudo-randomize! [s : Random] [i : Nb] [j : Nb]): Void
-  ((:random-source-pseudo-randomize! s) i j))
-
-; ---
-
-(define: (random-source-make-integers [s : Random]): (Nb -> Nb)
-  ((:random-source-make-integers s)))
-
-(define: (random-source-make-reals [s : Random] . [unit : Nb *]) : ( -> Flt)
-  (apply (:random-source-make-reals s)  unit))
-
-; ---
-
-(define: default-random-source : Random
-  (make-random-source))
-
-(define: random-integer : (Nb -> Nb)
-  (random-source-make-integers default-random-source))
-
-(define: random-real : ( -> Flt )
-  (random-source-make-reals default-random-source))
-
-
-) ; module ends
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rec-het-vec-infer.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rec-het-vec-infer.rkt
deleted file mode 100644
index 5efb685c1c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rec-het-vec-infer.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/racket
-
-(define-type (Set X) (Rec Set (U Null (Vector X Set))))
-
-(: get-set-root (All (X) ((Set X) -> X)))
-(define (get-set-root s) (error 'fail))
-
-(: set-size (All (X) ((Set X) -> X)))
-(define (set-size x) (get-set-root x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rec-type-alias-variance.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rec-type-alias-variance.rkt
deleted file mode 100644
index a27df24093..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rec-type-alias-variance.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang typed/racket
-
-;; Test subtyping and variance for recursive type aliases
-
-(define-type (B X)
-  (U (Listof X) (Setof (B X))))
-
-(: b1 (B String))
-(define b1 (list "foo"))
-
-(: b2 (B (U String Symbol)))
-(define b2 b1)
-
-(: f (All (Y) (Y -> (B Y))))
-(define (f x) (list x))
-
-(: g (All (X) (X -> (B X))))
-(define g f)
-
-;; Adapted from struct variance test
-(define-type (Boxer D) (List (Boxer2 D)))
-(define-type (Boxer2 D) (List (D -> Void) (Boxer D)))
-
-(: f-Boxer (All (D) ((Boxer D) D -> Void)))
-(define (f-Boxer boxer v)
-  ((car (car boxer)) v))
-
-;; The last line in this example would error without
-;; registering the variance
-(define-type (Even A) (U Null (Pairof A (Odd A))))
-(define-type (Odd A) (Pairof A (Even A)))
-
-(: even->odd (All (A) (A (Even A) -> (Odd A))))
-(define (even->odd elem lst)
-  (cons elem lst))
-
-(even->odd 3 '(1 2))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rec-types.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rec-types.rkt
deleted file mode 100644
index 66764b258a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/rec-types.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang typed-scheme
-
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias symbol Symbol)
-(define-type-alias top Any)
-(define-type-alias list-of Listof)
-(define-type-alias comparator (top top -> number))
-
-
-(define-typed-struct (a) heap              ([compare : comparator]))
-(define-typed-struct (a) (heap-empty heap) ())
-(define-typed-struct (a) (heap-node heap)
-  ([rank : number] [elm : a] [left : (Un (heap-node a) (heap-empty a))] [right : (Un (heap-node a) (heap-empty a))]))
-
-(define-type-alias (Heap a) (Un (heap-empty a) (heap-node a)))
-
-
-(pdefine: (b) (heap-size [h : (Heap b)]) : number
-	  (cond [(heap-empty? h) 0]
-		[(heap-node? h)
-		 (+ 1 (+ (heap-size (heap-node-left h))
-			 (heap-size (heap-node-right h))))]
-		;; FIXME - shouldn't need else clause
-		[else (error "Never happens!")]))
-
-
-(define-typed-struct npheap              ([compare : comparator]))
-(define-typed-struct (npheap-empty npheap) ())
-(define-typed-struct (npheap-node npheap)
-  ([rank : number] [elm : symbol] [left : (Un npheap-node npheap-empty)] [right : (Un npheap-node npheap-empty)]))
-
-(define-type-alias npHeap (Un npheap-empty npheap-node))
-
-
-(define: (npheap-size [h : npHeap]) : number
-  (cond [(npheap-empty? h) 0]
-	[else
-	 (+ 1 (+ (npheap-size (npheap-node-left h))
-		 (npheap-size (npheap-node-right h))))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/recursive-type-alias-terminates.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/recursive-type-alias-terminates.rkt
deleted file mode 100644
index 299d590cc7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/recursive-type-alias-terminates.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/load
-
-;; Test that contracts for mutually recursive class types do not
-;; cause infinite loops when they execute.
-
-(module a typed/racket
-  (define-type X%
-    (Class [m (-> (Instance Y%) String)]))
-  (define-type Y%
-    (Class [m (-> (Instance X%) Any)]))
-  (: x X%)
-  (define x (class object%
-              (super-new)
-              (define/public (m y) "foo")))
-  (: y Y%)
-  (define y (class object%
-              (super-new)
-              (define/public (m x) 0)))
-  (provide x y))
-
-(require 'a)
-(send (new x) m (new y))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/recursive-type-alias-top-level.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/recursive-type-alias-top-level.rkt
deleted file mode 100644
index 33131e2214..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/recursive-type-alias-top-level.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket
-
-;; Make sure type aliases are registered from a module
-;; to another context appropriately
-
-(require racket/sandbox)
-
-(define evaluator
-  (call-with-trusted-sandbox-configuration
-   (λ () (make-evaluator 'typed/racket))))
-
-(evaluator '(require typed/racket))
-(evaluator '(module a typed/racket
-              (define-type (Foo A) (Option (Listof (Foo A))))
-              (: x (Foo Integer))
-              (define x #f)
-              (provide x)))
-(evaluator '(require 'a))
-(evaluator 'x)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/refinement-even.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/refinement-even.rkt
deleted file mode 100644
index 71e15c4dba..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/refinement-even.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang typed-scheme
-
-(declare-refinement even?)
-(define-type-alias Even (Refinement even?))
-
-(: x Integer)
-(define x 4)
-
-(: y Even)
-(define y (if (even? x) x (error 'bad)))
-
-(: f (Even -> String))
-(define (f e) (format "~a" e))
-
-(f y)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/regexp-match-kw.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/regexp-match-kw.rkt
deleted file mode 100644
index 3469e6cfa8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/regexp-match-kw.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket 
-
-(ann (regexp-match* "foo" "foobar") (Listof String))
-(ann (regexp-match* "foo" #"foobar") (Listof Bytes))
-(ann (regexp-match* #"foo" "foobar") (Listof Bytes))
-(ann (regexp-match* #"foo" #"foobar") (Listof Bytes))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/req-type-sub.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/req-type-sub.rkt
deleted file mode 100644
index 0f141e9901..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/req-type-sub.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket
-
-(define (f x) (add1 x))
-(provide f)
-(module* m typed/racket
-  (require/typed (submod "..") [f (Integer -> Integer)])
-  (f 7))
-
-(module* n typed/racket
-  (require/typed (submod "..") [f (Integer -> String)])
-  (f 7))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-poly.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-poly.rkt
deleted file mode 100644
index 28b6ef2e36..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-poly.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed-scheme
-
-(require "simple-poly.rkt")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-procedure.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-procedure.rkt
deleted file mode 100644
index 42fe3f7dee..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-procedure.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang typed/scheme
-(require/typed scheme [procedure-arity (Procedure -> Natural)])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-struct.rkt
deleted file mode 100644
index eda72d23e6..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-struct.rkt
+++ /dev/null
@@ -1,206 +0,0 @@
-#lang racket/load
-
-(module untyped racket
- (provide (all-defined-out))
- (struct a (v))
- (struct b a (v))
- (struct c (v) #:constructor-name c-maker)
- (struct d c (v) #:constructor-name d-maker)
- (define-struct e (v))
- (define-struct (f e) (v))
- (struct g (v) #:extra-constructor-name make-g)
- (struct h g (v) #:extra-constructor-name make-h))
-
-(module typed typed/racket
- (require/typed 'untyped
-  (struct a ((v : Integer)))
-  (struct (b a) ((v : String)))
-  (struct c ((v : Integer)) #:constructor-name c-maker)
-  (struct (d c) ((v : String)) #:constructor-name d-maker)
-  (struct e ((v : Integer)) #:extra-constructor-name make-e)
-  (struct (f e) ((v : String)) #:extra-constructor-name make-f))
-
- (a 0)
- (b 1 "2")
- (c-maker 3)
- (d-maker 4 "5")
- (make-e 6)
- (make-f 7 "8")
- (e 9)
- (f 10 "11"))
-(require 'typed)
-
-
-(module typed2 typed/racket/base
- (require/typed 'untyped
-  (struct a ((v : Integer)))
-  (struct (b a) ((v : String)))
-  (struct c ((v : Integer)) #:constructor-name c-maker)
-  (struct (d c) ((v : String)) #:constructor-name d-maker)
-  (struct e ((v : Integer)) #:extra-constructor-name make-e)
-  (struct (f e) ((v : String)) #:extra-constructor-name make-f))
-
- (a 0)
- (b 1 "2")
- (c-maker 3)
- (d-maker 4 "5")
- (make-e 6)
- (make-f 7 "8")
- (e 9)
- (f 10 "11"))
-(require 'typed2)
-
-
-(module typed3 typed-scheme
- (require/typed 'untyped
-  (struct a ((v : Integer)) #:constructor-name a)
-  (struct (b a) ((v : String)) #:constructor-name b)
-  (struct c ((v : Integer)) #:constructor-name c-maker)
-  (struct (d c) ((v : String)) #:constructor-name d-maker)
-  (struct e ((v : Integer)) #:extra-constructor-name make-e)
-  (struct (f e) ((v : String)) #:extra-constructor-name make-f)
-  (struct g ((v : Integer)))
-  (struct (h g) ((v : String))))
-
- (a 0)
- (b 1 "2")
- (c-maker 3)
- (d-maker 4 "5")
- (make-e 6)
- (make-f 7 "8")
- (e 9)
- (f 10 "11")
- (make-g 12)
- (make-h 13 "14")
- (g 15)
- (h 16 "17"))
-
-(require 'typed3)
-
-
-(module typed4 typed/scheme
- (require/typed 'untyped
-  (struct a ((v : Integer)) #:constructor-name a)
-  (struct (b a) ((v : String)) #:constructor-name b)
-  (struct c ((v : Integer)) #:constructor-name c-maker)
-  (struct (d c) ((v : String)) #:constructor-name d-maker)
-  (struct e ((v : Integer)) #:extra-constructor-name make-e)
-  (struct (f e) ((v : String)) #:extra-constructor-name make-f)
-  (struct g ((v : Integer)))
-  (struct (h g) ((v : String))))
-
- (a 0)
- (b 1 "2")
- (c-maker 3)
- (d-maker 4 "5")
- (make-e 6)
- (make-f 7 "8")
- (e 9)
- (f 10 "11")
- (make-g 12)
- (make-h 13 "14")
- (g 15)
- (h 16 "17"))
-
-(require 'typed4)
-
-
-(module typed5 typed/scheme/base
- (require/typed 'untyped
-  (struct a ((v : Integer)) #:constructor-name a)
-  (struct (b a) ((v : String)) #:constructor-name b)
-  (struct c ((v : Integer)) #:constructor-name c-maker)
-  (struct (d c) ((v : String)) #:constructor-name d-maker)
-  (struct e ((v : Integer)) #:extra-constructor-name make-e)
-  (struct (f e) ((v : String)) #:extra-constructor-name make-f)
-  (struct g ((v : Integer)))
-  (struct (h g) ((v : String))))
-
- (a 0)
- (b 1 "2")
- (c-maker 3)
- (d-maker 4 "5")
- (make-e 6)
- (make-f 7 "8")
- (e 9)
- (f 10 "11")
- (make-g 12)
- (make-h 13 "14")
- (g 15)
- (h 16 "17"))
-
-(require 'typed5)
-
-
-(module typed6 typed/racket
-  (require-typed-struct a ((v : Integer)) 'untyped)
-  (require-typed-struct (b a) ((v : String)) 'untyped)
-  (require-typed-struct c ((v : Integer)) #:constructor-name c-maker 'untyped)
-  (require-typed-struct (d c) ((v : String)) #:constructor-name d-maker 'untyped)
-  (require-typed-struct e ((v : Integer)) #:extra-constructor-name make-e 'untyped)
-  (require-typed-struct (f e) ((v : String)) #:extra-constructor-name make-f 'untyped)
-
- (a 0)
- (b 1 "2")
- (c-maker 3)
- (d-maker 4 "5")
- (make-e 6)
- (make-f 7 "8")
- (e 9)
- (f 10 "11"))
-
-(require 'typed6)
-
-
-(module typed7 typed/scheme
-  (require-typed-struct a ((v : Integer)) #:constructor-name a 'untyped)
-  (require-typed-struct (b a) ((v : String)) #:constructor-name b 'untyped)
-  (require-typed-struct c ((v : Integer)) #:constructor-name c-maker 'untyped)
-  (require-typed-struct (d c) ((v : String)) #:constructor-name d-maker 'untyped)
-  (require-typed-struct e ((v : Integer)) #:extra-constructor-name make-e 'untyped)
-  (require-typed-struct (f e) ((v : String)) #:extra-constructor-name make-f 'untyped)
-  (require-typed-struct g ((v : Integer)) 'untyped)
-  (require-typed-struct (h g) ((v : String)) 'untyped)
-
-
- (a 0)
- (b 1 "2")
- (c-maker 3)
- (d-maker 4 "5")
- (make-e 6)
- (make-f 7 "8")
- (e 9)
- (f 10 "11")
- (make-g 12)
- (make-h 13 "14")
- (g 15)
- (h 16 "17"))
-
-(require 'typed7)
-
-(module typed8 typed-scheme
-  (require-typed-struct a ((v : Integer)) #:constructor-name a 'untyped)
-  (require-typed-struct (b a) ((v : String)) #:constructor-name b 'untyped)
-  (require-typed-struct c ((v : Integer)) #:constructor-name c-maker 'untyped)
-  (require-typed-struct (d c) ((v : String)) #:constructor-name d-maker 'untyped)
-  (require-typed-struct e ((v : Integer)) #:extra-constructor-name make-e 'untyped)
-  (require-typed-struct (f e) ((v : String)) #:extra-constructor-name make-f 'untyped)
-  (require-typed-struct g ((v : Integer)) 'untyped)
-  (require-typed-struct (h g) ((v : String)) 'untyped)
-
-
- (a 0)
- (b 1 "2")
- (c-maker 3)
- (d-maker 4 "5")
- (make-e 6)
- (make-f 7 "8")
- (e 9)
- (f 10 "11")
- (make-g 12)
- (make-h 13 "14")
- (g 15)
- (h 16 "17"))
-
-(require 'typed8)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-substruct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-substruct.rkt
deleted file mode 100644
index 1461dde0b0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-substruct.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang scheme/load
-
-(module m scheme
-  (define-struct X (x) #:transparent)
-  (define-struct (Y X) (y) #:transparent)
-  (provide (all-defined-out)))
-
-(module n typed-scheme
-  (require-typed-struct X ([x : Number]) #:extra-constructor-name make-X 'm)
-  (require-typed-struct (Y X) ([y : Number]) #:extra-constructor-name make-Y 'm)
-  (make-X 43)
-  (define: x : Any 3)
-  (if (Y? x)
-      (X-x x)
-      4))
-
-(require 'n)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-tests.rkt
deleted file mode 100644
index 1fa0bf15fe..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-tests.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang scheme/load
-#reader typed-racket/typed-reader
-(module bang-tests typed-scheme
-  (define #{x : Number} 1)
-  (provide x)
-  )
-
-(module trequire typed-scheme
-  (require 'bang-tests)
-  (define: y : Number x)
-  (display y))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-contravariant-filter.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-contravariant-filter.rkt
deleted file mode 100644
index ab777642f5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-contravariant-filter.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/load
-
-(module untyped racket
-  (provide f)
-  (define (f g) 'g))
-    
-
-(module typed typed/racket
-  (require/typed 'untyped
-    [f ((Any -> Boolean : Symbol) -> Symbol)]))
-
-(require 'typed)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-no-check.rkt
deleted file mode 100644
index 37885a9e10..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-no-check.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang typed/racket/no-check
-
-;; This test checks require/typed options under no-check mode
-
-(module untyped racket
-  (define f values)
-  (struct bar (x y))
-  (struct baz (x y))
-  (define-struct quux (x y))
-  (provide f
-           (struct-out bar)
-           (struct-out baz)
-           (struct-out quux)))
-
-;; opaque is tested in pr14463.rkt
-(require/typed 'untyped
-               [f (-> String String)]
-               [(f g) (-> String String)]
-               [struct bar ([x : Integer] [y : Integer])]
-               [#:struct baz ([x : Integer] [y : Integer])]
-               [#:struct quux ([x : Integer] [y : Integer])
-                #:constructor-name make-quux])
-
-(f 3) (g 3)
-(bar 1 2)
-(make-quux 1 2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-parse.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-parse.rkt
deleted file mode 100644
index faa1164829..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-parse.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/load
-
-(module m1 racket
-  (define x (make-parameter 1))
-  (define y 1)
-  (provide y)
-  (provide/contract [x (parameter/c number?)]))
-
-(module m2 typed/racket
-  (require/typed 'm1
-                 [y Number]
-                 [x (Parameterof Number)])
-  (x 1)
-  (x))
-
-(require 'm2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-rename.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-rename.rkt
deleted file mode 100644
index ffa51d6ab5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/require-typed-rename.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed-scheme
-
-(require/typed srfi/67 [(char-compare s67:char-compare) (Char Char -> Integer)])
-
-s67:char-compare
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/richard-bugs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/richard-bugs.rkt
deleted file mode 100644
index 16a889e7af..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/richard-bugs.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed-scheme
-
-(: x : '())
-(define x '())
-
-
-(define-typed-struct even-struct ([x : (U #f odd-struct)]))
-(define-typed-struct odd-struct ([x : (U #f even-struct)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/runtime-path.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/runtime-path.rkt
deleted file mode 100644
index 06252c32e0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/runtime-path.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/racket
-
-(require racket/runtime-path)
-
-(define-runtime-path foo "bar")
-(define-runtime-path foo2 '(lib "racket"))
-(define-runtime-paths (bar baz) (values "bar" "baz"))
-(define-runtime-module-path-index x "quux")
-(define-runtime-module-path z "with-type.rkt")
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/safe-letrec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/safe-letrec.rkt
deleted file mode 100644
index 12e5060eac..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/safe-letrec.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang typed/racket
-
-;; make sure letrec takes into account that some bindings may be undefined
-
-(letrec: ([x : Number 3])
-  x)
-(letrec: ([x : Number 3]
-          [y : (-> Number) (lambda () x)]) ; lambdas are safe
-  y)
-(letrec: ([a : (-> Void) (lambda () (b))]
-          [b : (-> Void) (lambda () (a))])
-  a)
-(letrec: ([x : (Number -> Number) (lambda (y) (+ y 3))]
-          [y : Number (x 4)])
-  y)
-(letrec-values: ([([a : (-> Number)]) (lambda () 3)]
-                 [([b : (-> Number)]) (lambda () (a))]
-                 [([x : Number] [y : Number])  (values (b) (b))])
-  x)
-(letrec: ([x : Number 3]
-          [y : (Number -> Number) (lambda (x) (if z 0 1))] ; not transitively safe, but safe
-          [z : Number x])
-  z)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/scoped-type-vars.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/scoped-type-vars.rkt
deleted file mode 100644
index 44d9624b1d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/scoped-type-vars.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang typed/racket/base
-
-
-(: f1 (All (A) (A -> A)))
-(define f1 (lambda: ((x : A)) x))
-
-(: f2 (All (A) (A A A -> A)))
-(define f2
-  (ann 
-    (plambda: (C) ((x : A) (y : B) (z : C)) (or x y z))
-    (All (B) (B B B -> B))))
-
-(: f3 (All (A ...) (All (B ...) (A ... A -> (B ... B -> Natural)))))
-(define f3 (lambda: (x : A ... A) (lambda: (y : B ... B) (+ (length x) (length y)))))
-
-;; PR 13622
-(: f4 (All (x) (All (y z) (x x x -> Any))))
-(define f4 (plambda: (x) ((x : x) (y : x) (z : x)) (or x y z)))
-
-;; PR 13539
-(: f5 (All (A) (All (B) (A B -> Integer))))
-(define (f5 x y)
-  (: z B)
-  (define z y)
-  5)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/scratch.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/scratch.rkt
deleted file mode 100644
index c7a9b06528..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/scratch.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed-scheme
-
-(let: ((x : Any 3)) (if (number? x) (add1 x) 12))
-(let: ((v : (Un Number Boolean) #f)) (if (boolean? v) 5 (+ v 1)))
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/seasoned-schemer.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/seasoned-schemer.rkt
deleted file mode 100644
index 3aa746f344..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/seasoned-schemer.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang typed-scheme
-#;(require mzlib/etc)
-#;(require "prims.rkt")
-(require mzlib/match)
-
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias symbol Symbol)
-(define-type-alias top Any)
-(define-type-alias list-of Listof)
-(define-type-alias atom (Un Number Symbol Boolean))
-
-(define: atom? : (Any -> Boolean : atom) (lambda: ([v : Any]) (if (number? v) #t (if (symbol? v) #t (boolean? v)))))
-
-
-(define-type-alias lat (list-of atom))
-
-(define: (member? [a : atom] [l : lat]) : boolean
-  (cond
-   [(null? l) #f]
-   [(equal? a (car l)) #t]
-   [else (member? a (cdr l))]))
-
-(define: (two-in-a-row [l : lat]) : boolean
-  (cond
-   [(null? l) #f]
-   [(null? (cdr l)) #f]
-   [(equal? (car l) (car (cdr l))) #t]
-   [else (two-in-a-row (cdr l))]))
-
-
-(define: (two-in-a-row2 [l : lat]) : boolean
-  (define: (two-in-a-row-b [prec : atom] [alat : lat]) : boolean
-    (cond
-     [(null? alat) #f]
-     [else (or (eq? (car alat) prec)
-	       (two-in-a-row-b (car alat) (cdr alat)))]))
-  (cond
-   [(null? l) #f]
-   [else (two-in-a-row-b (car l) (cdr l))]))
-
-(define-type-alias lon (list-of number))
-
-(define: (sum-of-prefixes-b [sonssf : number] [tup : lon]) : lon
-  (cond
-   [(null? tup) '()]
-   [else (cons (+ sonssf (car tup))
-	       (sum-of-prefixes-b (+ sonssf (car tup))
-				  (cdr tup)))]))
-
-(define: (sum-of-prefixes [tup : lon]) : lon
-  (sum-of-prefixes-b 0 tup))
-
-(define: (one? [n : number]) : boolean
-  (= n 1))
-
-(pdefine: (e) (pick [n : number] [lat : (list-of e)]) : e
-	  (cond [(one? n) (car lat)]
-		[else (pick (sub1 n) (cdr lat))]))
-
-(define: (scramble-b [tup : lon] [rev-pre : lon]) : lon
-  (cond [(null? tup) '()]
-	[else (cons (pick (car tup) (cons (car tup) rev-pre))
-		    (scramble-b (cdr tup)
-				(cons (car tup) rev-pre)))]))
-
-(define: (scramble [tup : lon]) : lon
-  (scramble-b tup '()))
-
-(pick 2 (cons 'a (cons 'd (cons 'c #{'() : (list-of symbol)}))))
-
-(define: (multirember [a : atom] [l : lat]) : lat
-  (letrec ([#{mr : (lat -> lat)}
-	    (lambda: ([l : lat])
-		     (cond [(null? l) l]
-			   [(eq? a (car l)) (mr (cdr l))]
-			   [else (cons (car l) (mr (cdr l)))]))])
-    (mr l)))
-
-(pdefine: (e) (multirember-f [f : (e e -> boolean)] [a : e] [l : (list-of e)]) : (list-of e)
-	  (let: mr : (list-of e) ([l : (list-of e) l])
-		(cond [(null? l) l]
-		      [(f a (car l)) (mr (cdr l))]
-		      [else (cons (car l) (mr (cdr l)))]))
-	  #;(letrec ([#{mr : ((list-of e) -> (list-of e))}
-	  (lambda: ([l : (list-of e)])
-	  (cond [(null? l) l]
-	  [(f a (car l)) (mr (cdr l))]
-	  [else (cons (car l) (mr (cdr l)))]))])
-	  (mr l)))
-
-(define-type-alias set lat)
-
-(define: (union [set1 : set] [set2 : set]) : set
-  (cond [(null? set1) set2]
-	[(member? (car set1) set2) (union (cdr set1) set2)]
-	[else (cons (car set1) (union (cdr set1) set2))]))
-
-(define: (intersect [set1 : set] [set2 : set]) : set
-  (define: (I [set1 : set]) : set
-    (cond [(null? set1) set1]
-	  [(member? (car set1) set2) (cons (car set1) (I (cdr set1)))]
-	  [else (I (cdr set1))]))
-  (cond [(null? set2) set2]
-	[else (I set1)]))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/send.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/send.rkt
deleted file mode 100644
index e70a940f66..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/send.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-
-(module fish racket/base
-  (require racket/class)
-  (define fish%
-    (class object%
-      (init-field weight)
-      (define/public (get-weight) weight)
-      (define/public (inc-weight-by! x negate?) 
-        (set! weight (+ (if negate? (- weight) weight) x)))
-      (super-new)))
-  (provide fish%))
-
-(module fish-client typed/racket/base
-  (require typed/racket/class)
-  (require/typed (submod ".." fish) [fish% Fish%])
-  
-  (define-type-alias Fish% (Class (init [weight Real])
-                                  [get-weight (-> Real)]
-                                  [inc-weight-by! (Real Boolean -> Void)]))
-  
-  (: f ((Instance Fish%) -> Real))
-  (define (f b) (send b get-weight))
-  
-  (: g (Real -> (Instance Fish%)))
-  (define (g w) (new fish% [weight w]))
-  
-  (: h ((Instance Fish%) -> Void))
-  (define (h b) (send b inc-weight-by! 2 #f))
-  
-  (unless (= 0 (f (g 0))) (error 'send.rkt "expected 0"))
-  (unless (= 3 (let ([b (g 1)])
-                 (h b)
-                 (f b)))
-    (error 'send.rkt "expected 3")))
-
-(require (submod "." fish-client))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/sequence-cnt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/sequence-cnt.rkt
deleted file mode 100644
index 269a97b79b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/sequence-cnt.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/load
-
-(module m typed/racket
-  (provide s)
-  (: s (Sequenceof Integer))
-  (define s (list 1 2 3)))
-
-(module n racket
-  (require 'm)
-  (for ([i s]) (add1 i)))
-
-(require 'n)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/sequences.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/sequences.rkt
deleted file mode 100644
index 568899c49e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/sequences.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/scheme
-
-(ann (for ([z (list 1 2 3)]) (add1 z)) Void)
-(ann (for ([z (vector 1 2 3)]) (add1 z)) Void)
-(ann (for ([z "foobar"]) (string z)) Void)
-(ann (for ([z #"foobar"]) (add1 z)) Void)
-(ann (for ([z (open-input-string "foobar")]) (add1 z)) Void)
-
-(ann (for ([z (in-list (list 1 2 3))]) (add1 z)) Void)
-(ann (for ([z (in-vector (vector 1 2 3))]) (add1 z)) Void)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/set-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/set-contract.rkt
deleted file mode 100644
index 54774ba95b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/set-contract.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-
-(define-predicate string-set? (Setof String))
-
-(string-set? (set 1 2 3))
-
-(string-set? (set "1" "2" "3"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/set.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/set.rkt
deleted file mode 100644
index fbba06f90c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/set.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang typed/racket
-
-(define s (set 0 1 2 3))
-(define q (seteq 0 1 2 3))
-(define v (seteqv 0 1 2 3))
-(define s0 (ann (set) (Setof Byte)))
-
-(set-empty? s)
-(set-empty? q)
-(set-empty? v)
-(set-empty? s0)
-
-(set-count s)
-(set-count q)
-(set-count v)
-(set-count s0)
-
-(set-member? s 0)
-(set-member? q 0)
-(set-member? v 0)
-(set-member? s0 0)
-
-(set-add s 4)
-(set-add q 4)
-(set-add v 4)
-(set-add s0 4)
-
-(set-remove s 4)
-(set-remove q 4)
-(set-remove v 4)
-(set-remove s0 4)
-
-(subset? s s0)
-(set-map v add1)
-(set-for-each s0 display)
-
-(set-equal? s)
-(set-eqv? v)
-(set-eq? q)
-(cast (and (set? s0) s0) (Setof Any))
-(generic-set? s0)
-(in-set s)
-(for ([x (in-set s)])
-  s0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-fake-or.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-fake-or.rkt
deleted file mode 100644
index 5621e8cd25..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-fake-or.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/scheme
-
-(define: x : Any 7)
-(define: (f [x : (U String Number)]) : Number
-  (if (number? x) (add1 x) (string-length x)))
-(if (if (number? x)
-        #t
-        (string? x))
-    (f x)
-    0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-implies.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-implies.rkt
deleted file mode 100644
index e58fc0df2a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-implies.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed/scheme
-
-;; Example 13
-(define: x : Any 7)
-(define: z : (U Number String) 7)
-(if (and (number? x) (string? z))
-    (add1 x)
-    (if (number? x)
-        (add1 z)
-        0))
-
-;(and (number? x) (string? z))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-kw-app.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-kw-app.rkt
deleted file mode 100644
index 6f36f474a7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-kw-app.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket
-
-((values file->string) "/dev/null" #:mode 'binary)
-(file->string "/dev/null" #:mode 'text)
-
-file->value file->bytes
-
-(file->lines #:mode 'text #:line-mode 'linefeed "/dev/null")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-occurr.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-occurr.rkt
deleted file mode 100644
index 72eb125023..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-occurr.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang typed/racket
-
-(: x (U #f Number))
-(define x 7)
-
-(if x (add1 x) 7)
-
-(if (number? x) (add1 x) 7)
-
-(define: y : (Pair Any Any) (cons 1 2))
-
-(if (number? (car y)) (add1 (car y)) 7)
-
-(if ((lambda: ([z : Any]) (string? z)) x) (add1 x) 0)
-(if ((lambda: ([z : Any]) (number? z)) x) (add1 x) 0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-or.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-or.rkt
deleted file mode 100644
index 3d0fe71fb8..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-or.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/scheme
-(define: x : Any 7)
-(define: (f [x : (U String Number)]) : Number 0)
-
-(let ([tmp (number? x)]) (if tmp tmp (string? x)))
-
-(if (let ([tmp (number? x)])
-      (if tmp tmp (string? x)))
-    (f x)
-    0)
-
-(: strnum? (Any -> Boolean : (U String Number)))
-(define (strnum? x)
-  (or (string? x) (number? x)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-poly.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-poly.rkt
deleted file mode 100644
index e52545f1f4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/simple-poly.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-(module simple-poly typed-scheme
-  (: f (All (a) (a -> a)))
-  (define (f x) x)
-  (define: z : Any 2)
-  (provide f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/single-flonum-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/single-flonum-contract.rkt
deleted file mode 100644
index 619ea28768..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/single-flonum-contract.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/racket
-(provide (all-defined-out))
-(: foo Single-Flonum)
-(define foo 1.0f0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/somesystempath.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/somesystempath.rkt
deleted file mode 100644
index e6c664ad57..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/somesystempath.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang typed/racket
-
-(: unix-path Path-For-Some-System)
-(define unix-path (string->some-system-path "file.rkt" 'unix))
-
-(: windows-path Path-For-Some-System)
-(define windows-path (string->some-system-path "file.rkt" 'windows))
-
-(for: ((p : Path-For-Some-System (list unix-path windows-path)))
- (let ((long-path (build-path p 'up 'same p)))
-   (unless (path-for-some-system? p)
-    (error "Predicate failed"))
-   (explode-path long-path)
-
-   (filename-extension p)
-   (path-only long-path)
-   (some-system-path->string long-path)
-
-   ))
-
-
-(when (equal? 'unix (system-path-convention-type))
- (find-relative-path (simplify-path (path->complete-path "foo")) (simplify-path (path->complete-path "foo/foo/foo"))))
-
-
-
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/sort-infer.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/sort-infer.rkt
deleted file mode 100644
index c53e3c82db..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/sort-infer.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed/racket
-(define ss '("one" "two" "three")) ; (Listof String)
-(sort ss string<?)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-base.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-base.rkt
deleted file mode 100644
index f3e6d4ceeb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-base.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket/base
-
-(: f (Integer -> Any))
-(define (f x) (add1 x))
-
-(lambda (#{x : String}) (string-append " " x))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-base.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-base.rkt
deleted file mode 100644
index 8323187a68..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-base.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket/base/no-check
-
-(: f (Integer -> Any))
-(define (f x) (add1 ""))
-
-(lambda (#{x : String}) (string-append " " x))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-scheme-base.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-scheme-base.rkt
deleted file mode 100644
index 2c95d8cc2d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-scheme-base.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/scheme/base/no-check
-
-(: f (Integer -> Any))
-(define (f x) (add1 ""))
-
-(lambda (#{x : String}) (string-append " " x))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-scheme.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-scheme.rkt
deleted file mode 100644
index d94b0ffb00..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-scheme.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/scheme/no-check
-
-(: f (Integer -> Any))
-(define (f x) (add1 ""))
-
-(lambda (#{x : String}) (string-append " " x))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-ts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-ts.rkt
deleted file mode 100644
index 5c13b257ca..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check-ts.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed-scheme/no-check
-
-(: f (Integer -> Any))
-(define (f x) (add1 ""))
-
-(lambda (#{x : String}) (string-append " " x))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check.rkt
deleted file mode 100644
index df409d2c7e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-no-check.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket/no-check
-
-(: f (Integer -> Any))
-(define (f x) (add1 ""))
-
-(lambda (#{x : String}) (string-append " " x))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-scheme-base.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-scheme-base.rkt
deleted file mode 100644
index 498f1dad7b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-scheme-base.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/scheme/base
-
-(: f (Integer -> Any))
-(define (f x) (add1 x))
-
-(lambda (#{x : String}) (string-append " " x))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-scheme.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-scheme.rkt
deleted file mode 100644
index f6f3ff2d38..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-scheme.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/scheme
-
-(: f (Integer -> Any))
-(define (f x) (add1 x))
-
-(lambda (#{x : String}) (string-append " " x))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-ts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-ts.rkt
deleted file mode 100644
index 00782c87f9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features-ts.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed-scheme
-
-(: f (Integer -> Any))
-(define (f x) (add1 x))
-
-(lambda (#{x : String}) (string-append " " x))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features.rkt
deleted file mode 100644
index d99f5b89ec..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/standard-features.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-
-(: f (Integer -> Any))
-(define (f x) (add1 x))
-
-(lambda (#{x : String}) (string-append " " x))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/star-sizes.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/star-sizes.rkt
deleted file mode 100644
index b5995780fc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/star-sizes.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed-scheme
-
-(: f (All (a) ((Integer a * -> Integer) -> Integer)))
-(define (f g) 0)
-
-(f +)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/stream.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/stream.rkt
deleted file mode 100644
index 23b8646a36..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/stream.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang typed/racket
-#:optimize
-
-(provide Stream stream-cons stream-car stream-cdr empty-stream?)
-
-(define-type Stream
-  (All (A)
-    (Rec S
-      (U Null (Boxof (U (-> (Pair A S))
-                        (Pair A S)))))))
-
-(: empty-stream? : (All (A) ((Stream A) -> Boolean)))
-(define (empty-stream? stream) (null? stream))
-
-(define-syntax-rule (stream-cons x stream)
-  (box (lambda () (cons x stream))))
-
-(: stream-car : (All (A) ((Stream A) -> A)))
-(define (stream-car stream)
-  (if (null? stream)
-    (error 'stream-car "empty stream: ~e" stream)
-    (let ([p (unbox stream)])
-      (if (procedure? p)
-        (let ([pair (p)])
-          (set-box! stream pair)
-          (car pair))
-        (car p)))))
-
-(: stream-cdr : (All (A) ((Stream A) -> (Stream A))))
-(define (stream-cdr stream)
-  (if (null? stream)
-    (error 'stream-cdr "empty stream: ~e" stream)
-    (let ([p (unbox stream)])
-      (if (procedure? p)
-        (let ([pair (p)])
-          (set-box! stream pair)
-          (cdr pair))
-        (cdr p)))))
-
-(: stream : (All (A) (A * -> (Stream A))))
-(define (stream . xs)
-  (: loop : (All (A) ((Listof A) -> (Stream A))))
-  (define (loop xs)
-    (if (null? xs)
-      '()
-      (box (cons (car xs) (loop (cdr xs))))))
-  (loop xs))
-
-(: stream->list : (All (A) ((Stream A) -> (Listof A))))
-(define (stream->list stream)
-  (if (null? stream)
-    '()
-    (cons (stream-car stream) (stream->list (stream-cdr stream)))))
-
-(: rotate : (All (A) ((Stream A) (Listof A) (Stream A) -> (Stream A))))
-(define (rotate frnt rer accum)
-  (let ([carrer (car rer)])
-    ;; Manually expanded `stream-cons', and added type annotations
-    (if (empty-stream? frnt)
-        (stream-cons carrer accum)
-        (stream-cons
-         (stream-car frnt)
-         ((inst rotate A)
-          (stream-cdr frnt)
-          (cdr rer)
-          (box (lambda () (cons carrer accum))))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/string-const.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/string-const.rkt
deleted file mode 100644
index cc9e702918..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/string-const.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/racket
-
-(require string-constants/string-constant)
-
-(string-constant cancel)
-(string-constants cancel)
-
-(this-language)
-(all-languages)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-cert.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-cert.rkt
deleted file mode 100644
index 68f6e4b02b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-cert.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang scheme/load
-
-(module for-broken typed-scheme
-
-  (define-typed-struct type ())
-
-  (provide (all-defined-out)))
-
-(module broken typed-scheme
-
-  (require (prefix-in t: 'for-broken))
-  (define-typed-struct binding  ([type : t:type]))
-  ;; Comment out the below and it works fine.
-  (provide (all-defined-out)))
-
-(require 'broken)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-exec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-exec.rkt
deleted file mode 100644
index 0964a5d9e4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-exec.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed-scheme
-(define-typed-struct/exec X ([a : Number] [b : Boolean]) [(lambda: ([x : X]) (+ 3 (X-a x))) : (X -> Number)])
-((make-X 1 #f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-mutable-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-mutable-contract.rkt
deleted file mode 100644
index ff228fb4bb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-mutable-contract.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/load
-
-(module promise typed/racket/base
-  (require (for-syntax racket/base))
-  (provide MyPromise)
-  (define-struct: (a) MyPromise ([thunk : (-> a)])
-    #:mutable))
-
-(module user racket/base
-  (require 'promise)
-  (MyPromise (lambda () #f)))
-  
-
-(require 'user)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-mutable.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-mutable.rkt
deleted file mode 100644
index ec8285cb5f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-mutable.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket
-
-(struct: foo ([x : Integer]) #:mutable)
-
-(: f (Integer -> foo))
-(define (f x) (foo x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-no-colon.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-no-colon.rkt
deleted file mode 100644
index 14856db83d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-no-colon.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang typed/racket
-
-;; Test struct forms without colons. Ideally should be
-;; unit tests, but these have to be at the top-level.
-
-(struct foo ([x : String] [y : Symbol]))
-(string-append (foo-x (foo "a" 'b)) "b")
-(symbol->string (foo-y (foo "a" 'b)))
-
-(define-struct foo2 ([x : String] [y : Symbol]))
-(string-append (foo2-x (make-foo2 "a" 'b)) "b")
-(symbol->string (foo2-y (make-foo2 "a" 'b)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-out.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-out.rkt
deleted file mode 100644
index 1bda9ca88f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-out.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/load
-
-(module untyped racket/base
- (struct posn (x y))
- (provide (struct-out posn)))
-
-(module typed typed/racket/base
- (require-typed-struct posn ((x : Real) (y : Real)) 'untyped)
- (provide (struct-out posn)))
-
-(require 'typed)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-path-update.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-path-update.rkt
deleted file mode 100644
index cd38904210..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-path-update.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang typed/scheme
-
-(define-struct: foo [(bar : Integer)])
-
-(: f (foo -> Integer))
-(define (f x)
-  (if (zero? (foo-bar x))
-      (error 'f "Nooooooo!")
-      (foo-bar x)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-struct-out.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-struct-out.rkt
deleted file mode 100644
index 87c8c396d5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-struct-out.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket
-
-(struct: x ())
-(define-struct: y ())
-
-(x) (y)
-
-(provide (struct-out x) (struct-out y))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-top-recursive.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-top-recursive.rkt
deleted file mode 100644
index 21daa5acb9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-top-recursive.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket/base
-
-(struct: (v) a ((x : v)) #:mutable)
-
-(: z (Struct (Rec b (a (U #f b)))))
-(define z (a #f))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-type-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-type-contract.rkt
deleted file mode 100644
index 4f984d7b0a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/struct-type-contract.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/load
-
-(module m1 typed/racket
-  (struct x ())
-  (define: y : Struct-TypeTop struct:x)
-  (provide struct:x y))
-
-(module m2 racket
-  (require 'm1)
-  struct:x y)
-
-(require 'm2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/structs-across-modules.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/structs-across-modules.rkt
deleted file mode 100644
index 0cbd9dabf4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/structs-across-modules.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/load
-
-(module t1 typed/racket
-  (provide node)
-  (struct: node ()))
-
-(module t2 typed/racket
-  (require 't1)
-  (: v node)
-  (define v (node)))
-(module u racket
-  (require 't1)
-  (node))
-
-(require 't2)
-(require 'u)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/structs-variance.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/structs-variance.rkt
deleted file mode 100644
index b50972d74e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/structs-variance.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/racket
-
-(struct: (A) x ([f : (A -> A)]))
-(struct: (B) y ([f : (x B)]))
-
-(: f : (U Integer (y Integer)) -> Integer)
-(define (f v)
-  (if (y? v)
-      ((x-f (y-f v)) 0)
-      v))
-
-(f 17)
-
-(f (y (x (lambda: ([n : Integer]) (+ 2 n)))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/structs-variance2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/structs-variance2.rkt
deleted file mode 100644
index 55b1d5351c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/structs-variance2.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-
-(struct: (a) foo ((v : ((baz a) -> Symbol))))
-(struct: (a) bar ((v : ((foo a) -> Symbol))))
-(struct: (a) baz ((v : ((bar a) -> Symbol))))
-
-(ann (ann (foo (lambda (x) 'x)) (foo String)) (foo Symbol))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/stx.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/stx.rkt
deleted file mode 100644
index 8d22b70f48..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/stx.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang typed/racket
-
-;; Test that the typed/syntax/stx library can be used
-
-(require typed/syntax/stx
-         typed/rackunit)
-
-(check-true (stx-null? null))
-(check-true (stx-null? #'()))
-(check-false (stx-null? #'(a)))
-
-(check-true (stx-pair? (cons #'a #'b)))
-(check-true (stx-pair? #'(a . b)))
-
-(check-true (stx-list? #'(a b c d)))
-(check-false (stx-list? #'a))
-
-(ann (stx->list #'(a b c d)) (Listof (Syntaxof Symbol)))
-(ann (syntax-e (car (stx->list #'(a b c d)))) Symbol)
-(ann (stx->list (list #'a #'b)) (Listof (Syntaxof Symbol)))
-(ann (stx->list (list 'a 'b)) (Listof Symbol))
-(ann (add1 (car (stx->list '(1 2 3)))) Positive-Index)
-(ann (stx->list #'(a b . (c d))) (Listof (Syntaxof Symbol)))
-(ann (stx->list (cons #'a #'(b . (c d)))) (Listof (Syntaxof Symbol)))
-;; Make sure case-> type doesn't have intersecting domains with
-;; incompatible result types
-(ann (assert (stx->list (ann #'(a b c) (Syntaxof Any))))
-     (Listof (Syntaxof Any)))
-
-(ann (stx-car #'(a b)) (Syntaxof 'a))
-(ann (stx-cdr #'(a b)) (List (Syntaxof 'b)))
-
-(ann (stx-map (λ: ([id : Identifier]) (free-identifier=? id #'a))
-              #'(a b c d))
-     (Listof Boolean))
-(ann (stx-map (λ: ([id : Symbol]) (symbol=? id 'a))
-              '(a b c d))
-     (Listof Boolean))
-(ann (stx-map (λ: ([id : Identifier]) (free-identifier=? id #'a))
-              (cons #'a #'(b . (c d))))
-     (Listof Boolean))
-(ann (stx-map (λ: ([x : (Syntaxof Real)] [y : (Syntaxof Real)])
-                (+ (syntax-e x) (syntax-e y)))
-              #'(1 2 3)
-              #'(1 2 3))
-     (Listof Real))
-(ann (stx-map +
-              '(1 2 3)
-              '(1 2 3))
-     (Listof Real))
-(ann (stx-map (λ: ([x : (Syntaxof Real)] [y : (Syntaxof Real)])
-                (+ (syntax-e x) (syntax-e y)))
-              #'(1 . (2 3))
-              (cons #'1 #'(2 . (3))))
-     (Listof Real))
-
-(module-or-top-identifier=? #'a #'b)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/submod-vector.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/submod-vector.rkt
deleted file mode 100644
index 19d439e845..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/submod-vector.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket
-(module test typed/racket
-  (provide v-ref)
-
-  (: v-ref ((Vectorof Symbol) Index -> Symbol))
-  (define (v-ref v i) (vector-ref v i)))
-
-(require (submod "." test))
-
-(v-ref (vector 'foo) 0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/submodules.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/submodules.rkt
deleted file mode 100644
index 2b5e4893b5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/submodules.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/racket
-
-(: g : Number -> Number)
-(define (g x) (add1 x))
-
-(provide g)
-
-(module* main #f
-  (g (assert (string->number 
-	      (vector-ref (current-command-line-arguments) 0)))))
-
-;; Test mode:
-(module test racket/base
-  (require syntax/location)
-  (parameterize ([current-command-line-arguments (vector "1")])
-    (dynamic-require (quote-module-path "..") #f)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/subst-poly-dots.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/subst-poly-dots.rkt
deleted file mode 100644
index 8023901942..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/subst-poly-dots.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang typed/racket
-
-(: f (All (A B ...) (A ... B -> (List (Boxof A) ... B))))
-(define (f . args)
-    (map (inst box A) args))
-
-(: h (-> Nothing))
-(define (h) (h))
-
-(: g (All (A B ...) (A ... B -> (Values (Boxof A) ... B))))
-(define (g . args)
-   (h))
-
-
-(ann ((inst f String Symbol Symbol) "c" "d") (List (Boxof String) (Boxof String)))
-(lambda (x)
-  (ann ((inst g String Symbol Symbol) "c" "d") (values (Boxof String) (Boxof String))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/test-child-field.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/test-child-field.rkt
deleted file mode 100644
index 2d97b993a7..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/test-child-field.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/racket
-
-(define-struct:  x ([a : Any]))
-(define-struct: (A) (y x) ([b : A]))
-
-(: f : (y Any) -> String)
-(define (f v)
-  (if (string? (y-b v))
-      (y-b v)
-      "foo"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/test.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/test.rkt
deleted file mode 100644
index b0d716434a..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/test.rkt
+++ /dev/null
@@ -1,101 +0,0 @@
-#lang typed-scheme
-
-(define: x : (U Number #f) 1)
-(if x #{x :: Number} 1)
-(lambda () 1)
-(lambda: ([y : Number]) (if #t y y))
-
-(plambda: (a) ([y : Number]) (if y #t #f))
-(plambda: (a) ([y : a]) y)
-(plambda: (a) ([y : a]) y)
-(plambda: () ([y : Boolean]) (if y #t #f))
-
-#{(if #t #t #t) :: Boolean}
-
-(let () 3)
-(let ([x 1] [y 2]) x)
-#{(let ([x 1] [y 2]) x) :: Number}
-(let: ([x : Number 1] [y : Integer 2]) x)
-#{(let: ([x : Integer 1] [y : Integer 2]) x) :: Integer}
-
-#{(let*: ([x : Number 1] [x : Integer 2]) x) :: Integer}
-#{(let*: ([x : Number 1] [x : Integer 2]) #{x :: Integer}) :: Integer}
-
-#{(letrec: ([x : Integer 1] [y : Integer 2]) #{x :: Integer}) :: Integer}
-(letrec: ([x : Integer 1] [y : Integer 2]) #{x :: Integer})
-(let ()
-  (define x 1)
-  (define y 2)
-  x)
-(letrec: ([z : (-> Any) (lambda () z)]) 1)
-(letrec: ([z : (-> Any) (lambda () w)]
-          [w : (-> Any) (lambda () z)]) z)
-(let ()
-  (define: (z) : Any w)
-  (define: (w) : Any z)
-  z)
-(let ()
-  (define: (z [x : Number]) : Any w)
-  (define: (w) : Any z)
-  z)
-(case-lambda: [() 1]
-              [([x : Number]) x])
-;; Error
-#;#{(case-lambda: [() 1]
-                [([x : Number]) x]) :: String}
-#{(lambda: ([x : Number]) 1) :: (Number -> Number)}
-#{(lambda: ([x : Number]) 1) :: Any}
-#{(lambda: ([x : Number]) 1) :: (Integer -> Any)}
-#{(lambda: ([x : Number]) x) :: (Number -> Number)}
-#{(lambda: ([x : Number]) x) :: (Integer -> Any)}
-(define zzz 1)
-(set! zzz 2)
-
-(define-struct: xxx ())
-(define-struct: xxx2 ([y : Number]))
-(define-struct: xxx3 ([y : Number] [z : Number]))
-(define-struct: xxx4 ([y : Number] [z : xxx4]))
-(define-struct: xxx5 ([y : Number] [z : xxx4]))
-(define-struct: (A) xxx6 ([y : A] [z : xxx4]))
-xxx6-y
-(with-continuation-mark ((inst make-continuation-mark-key Integer)) 1 1)
-'foo
-'(foo foo foo)
-(define-type-alias NNN Number)
-(define-type-alias (NNN2 A) (Listof Number))
-(define-type-alias (NNN3 A) (Listof A))
-(define-syntax-rule (m x) 1)
-(m 2)
-#{1 :: 1}
-(lambda: ([x : String]) (lambda () (set! x "foo")))
-#'(x y z)
-(begin0 1 1 1)
-(begin 1 1 1)
-(#%expression (begin 1 1 1))
-
-(values 1)
-(values 1 1)
-(values)
-
-(: ff (Number -> Number))
-(define (ff x) x)
-(ff 1)
-
-(lambda: ([y : String][x : Number]) (values 1 x 1))
-(lambda: ([x : Number]) (values 1 x 1))
-(lambda () (values 1 1))
-(lambda () 1)
-#{(lambda (x) x) :: (Number -> Number)}
-
-{ann (values (lambda (x) x) (lambda (x) x)) (values (Number -> Number) (String -> String))}
-
-(list 1 2 3)
-(ann (list 1 2 3) (Pair Number (Listof Integer)))
-(ann (list 1 2 3) (Listof Integer))
-(ann (list 1 2 3) (Listof Number))
-
-(list* 1 2 3)
-(ann (list* 1 2 3 (list)) (Pair Number (Listof Integer)))
-
-((lambda (x) 1) 1)
-((lambda (x y) 1) 1 2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/test2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/test2.rkt
deleted file mode 100644
index f590a5d788..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/test2.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang typed-scheme
-
-(: f (Number String -> Number))
-(define (f x z) #;(f x z) 7)
-(lambda: ([x : Any] [y : Any]) (values (number? y) (number? x)))
-(lambda: ([x : Any] [y : Any]) (values (number? x) (number? y)))
-(lambda: ([x : Any] [y : Any]) (values (and (number? x) (boolean? y)) (number? y)))
-(lambda: ([x : Any]) (values (number? x) (number? x)))
-(: g (Any -> Boolean : Number))
-(define g (lambda: ([x : Any]) (number? x)))
-(: q ((Number -> Number) -> Number))
-(define q (lambda: ([x : (Number -> Number)]) (x 1)))
-;(q (lambda (z) (f z "foo")))
-
-(: p (Number * -> Number))
-(define (p . x) 7)
-
-(lambda x (number? x))
-(+)
-(+ 1 2 3)
-(+ 1 2 3.5)
-
-(define-struct: (Z) X ([y : Z]))
-(define:  my-x : (X Number) (make-X 1))
-(X-y my-x)
-
-; FIXME - doesn't work yet
-(number? (X-y my-x))
-(if (number? (X-y my-x)) (+ 1 (X-y my-x)) 7)
-
-
-(define: (f2) : (U) (error 'foo))
-(lambda: ([x : Number]) #{((f2)) :: (U)})
-
-(: f3 (U (Number -> Number) (Number -> String)))
-(define (f3 x) 7)
-
-(define: x : (List Any Any) (list 1 23 ))
-(car x)
-(if (number? (car x)) (add1 (car #{x :: (Pair Number Any)})) 7)
-(if (number? (car x)) (add1 (car x)) 7)
-
-;; error
-;(f 12 "hi")
-
-(map + (list 1 2 3))
-(map + (list 1 2 3) (list 1 2 3))
-;; error
-;(map + (list 1 2 3) (list 1 2 "foo"))
-
-((lambda (a b . c) (+ a b (car c))) 1 2 3 4)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/threads-and-async-channels.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/threads-and-async-channels.rkt
deleted file mode 100644
index 6ca6189e7b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/threads-and-async-channels.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang typed/racket
-(require typed/racket/async-channel)
-
-;; same as threads-and-channels.rkt, but with async-channels
-
-(: chan (Async-Channelof Symbol))
-(define chan (make-async-channel))
-
-(define (reader)
-  (thread
-   (lambda ()
-     (let loop : True ((i : Integer 10))
-       (if (= i 0)
-           #t
-           (begin (async-channel-get chan)
-                  (loop (- i 1))))))))
-
-(: writer (Symbol -> Thread))
-(define (writer x)
-  (thread
-   (lambda ()
-     (async-channel-put chan x)
-     (async-channel-put chan x))))
-
-(reader)
-(writer 'a)
-(writer 'b)
-(writer 'c)
-(writer 'd)
-(writer 'e)
-
-
-(define-type JumpingChannel (Rec JumpingChannel (Async-Channelof (Pair JumpingChannel Symbol))))
-(: jump-chan JumpingChannel)
-(define jump-chan (make-async-channel))
-
-(define (jumping-reader)
-  (thread
-   (lambda ()
-     (let loop : True ((i : Integer 3)
-                        (c : JumpingChannel jump-chan))
-       (if (= i 0)
-           #t
-           (loop (- i 1)
-                 (car (async-channel-get c))))))))
-
-(jumping-reader)
-(let ((c2 : JumpingChannel (make-async-channel)))
-  (async-channel-put jump-chan (cons c2 'a))
-  (let ((c3 : JumpingChannel (make-async-channel)))
-    (async-channel-put c2 (cons c3 'b))
-    (let ((c4 : JumpingChannel (make-async-channel)))
-      (async-channel-put c3 (cons c4 'c)))))
-
-
-
-
-(: tc (Thread-Cellof Integer))
-(define tc (make-thread-cell 0))
-
-(thread-cell-set! tc 1)
-
-(thread-wait (thread (lambda ()
-                       (displayln (thread-cell-ref tc))
-                       (thread-cell-set! tc 2)
-                       (displayln (thread-cell-ref tc)))))
-
-(thread-cell-ref tc)
-
-(define blocked-thread
- (thread (lambda ()
-           (async-channel-get ((inst make-async-channel 'unused))))))
-
-
-(thread-suspend blocked-thread)
-(kill-thread blocked-thread)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/threads-and-channels.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/threads-and-channels.rkt
deleted file mode 100644
index 7c41cac654..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/threads-and-channels.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang typed/racket
-
-(: chan (Channelof Symbol))
-(define chan (make-channel))
-
-(define (reader)
-  (thread
-   (lambda ()
-     (let: loop : True ((i : Integer 10))
-       (if (= i 0)
-           #t
-           (begin (channel-get chan)
-                  (loop (- i 1))))))))
-
-(: writer (Symbol -> Thread))
-(define (writer x)
-  (thread
-   (lambda ()
-     (channel-put chan x)
-     (channel-put chan x))))
-
-(reader)
-(writer 'a)
-(writer 'b)
-(writer 'c)
-(writer 'd)
-(writer 'e)
-
-
-(define-type JumpingChannel (Rec JumpingChannel (Channelof (Pair JumpingChannel Symbol))))
-(: jump-chan JumpingChannel)
-(define jump-chan (make-channel))
-
-(define (jumping-reader)
-  (thread
-   (lambda ()
-     (let: loop : True ((i : Integer 3)
-                        (c : JumpingChannel jump-chan))
-       (if (= i 0)
-           #t
-           (loop (- i 1)
-                 (car (channel-get c))))))))
-
-(jumping-reader)
-(let: ((c2 : JumpingChannel (make-channel)))
-  (channel-put jump-chan (cons c2 'a))
-  (let: ((c3 : JumpingChannel (make-channel)))
-    (channel-put c2 (cons c3 'b))
-    (let: ((c4 : JumpingChannel (make-channel)))
-      (channel-put c3 (cons c4 'c)))))
-
-
-
-
-(: tc (Thread-Cellof Integer))
-(define tc (make-thread-cell 0))
-
-(thread-cell-set! tc 1)
-
-(thread-wait (thread (lambda ()
-                       (displayln (thread-cell-ref tc))
-                       (thread-cell-set! tc 2)
-                       (displayln (thread-cell-ref tc)))))
-
-(thread-cell-ref tc)
-
-(define blocked-thread
- (thread (lambda ()
-           (channel-get ((inst make-channel 'unused))))))
-
-
-(thread-suspend blocked-thread)
-(kill-thread blocked-thread)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/time.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/time.rkt
deleted file mode 100644
index 2b03c6aa14..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/time.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang typed-scheme
-(require scheme/port)
-
-(: foo : Number Number -> Number)
-(define (foo x y)
-  (* x y))
-
-(: bar : Number -> Number)
-(define (bar c)
-  (: loop : Real Number -> Number)
-  (define (loop n acc)
-    (if (< 0 n)
-	(loop (- n 1) (+ (foo c n) acc))
-	acc))
-  (loop 10000000 0))
-(parameterize ([current-output-port (open-output-nowhere)])
-  (time (bar 0)))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/top-level-begin-for-syntax.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/top-level-begin-for-syntax.rkt
deleted file mode 100644
index 17e6a05f93..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/top-level-begin-for-syntax.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/load
-
-;; Test for PR 13878, ensure that this doesn't produce
-;; an internal type-checker error
-
-(require typed/racket)
-(begin-for-syntax 3)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/top-level-begin.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/top-level-begin.rkt
deleted file mode 100644
index aaabebafdb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/top-level-begin.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket
-
-;; Test various (begin ...)s at the top-level. In
-;; particular, avoid a (begin) regression.
-
-(define ns (make-base-namespace))
-(eval '(require typed/racket) ns)
-(eval '(begin) ns)
-(eval '(begin 1 2) ns)
-(eval '(begin (+ 1 2) 5 3 "foo") ns)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/top-level-make-predicate.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/top-level-make-predicate.rkt
deleted file mode 100644
index 6866e88530..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/top-level-make-predicate.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/load
-;; Test for PR 14030
-(require typed/racket)
-(make-predicate Integer)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/toplevel-redefinition.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/toplevel-redefinition.rkt
deleted file mode 100644
index f3133c3c7c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/toplevel-redefinition.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/load
-
-;; Test that variable redefinition works at the top-level
-
-(require typed/racket)
-(: x Integer)
-(define x 3)
-(define x 5)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-alias-omit-define-syntaxes.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-alias-omit-define-syntaxes.rkt
deleted file mode 100644
index 3f0aeac832..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-alias-omit-define-syntaxes.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-(define-type (Type1 t) t #:omit-define-syntaxes)
-(define-type (Type1* t) t)
-(define-type Type2 (All (t) t) #:omit-define-syntaxes)
-(define-type Type2* (All (t) t))
-(define-type Type3 Symbol #:omit-define-syntaxes)
-(define-type Type3* Symbol)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-alias-rec-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-alias-rec-struct.rkt
deleted file mode 100644
index f25d920ffb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-alias-rec-struct.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket/base
-;; Iteratee
-(define-type (Alias A D) (U #f (Main A D)))
-
-(struct: (A D) Main
-  ([resume : (Alias A D)])) ;
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-printer-single-level.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-printer-single-level.rkt
deleted file mode 100644
index 7794788c5c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-printer-single-level.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket
-
-;; Make sure that the type printer expands only a single
-;; level for (:type ...)
-
-(require rackunit
-         racket/sandbox)
-
-(define out (open-output-string))
-
-(define tr-eval
-  (parameterize ([sandbox-output out])
-    (call-with-trusted-sandbox-configuration
-     (thunk (make-evaluator 'typed/racket)))))
-
-(tr-eval '(require typed/racket))
-(tr-eval '(define-type Foo (U String Integer)))
-(tr-eval '(define-type Bar (Foo -> Foo)))
-
-(tr-eval '(:type Foo))
-(tr-eval '(:type Bar))
-(tr-eval '(:type (Number -> Integer)))
-
-;; if #:verbose, make sure it's the full type
-(tr-eval '(:type #:verbose Bar))
-
-(check-equal? (get-output-string out)
-              (string-append "(U Integer String)\n[can expand further: Integer]"
-                             "(-> Foo Foo)\n[can expand further: Foo]"
-                             "(-> Number Integer)\n[can expand further: Integer Number]"
-                             "(-> (U String\n"
-                             "       0\n"
-                             "       1\n"
-                             "       Byte-Larger-Than-One\n"
-                             "       Positive-Index-Not-Byte\n"
-                             "       Positive-Fixnum-Not-Index\n"
-                             "       Negative-Fixnum\n"
-                             "       Positive-Integer-Not-Fixnum\n"
-                             "       Negative-Integer-Not-Fixnum)\n"
-                             "    (U String\n"
-                             "       0\n"
-                             "       1\n"
-                             "       Byte-Larger-Than-One\n"
-                             "       Positive-Index-Not-Byte\n"
-                             "       Positive-Fixnum-Not-Index\n"
-                             "       Negative-Fixnum\n"
-                             "       Positive-Integer-Not-Fixnum\n"
-                             "       Negative-Integer-Not-Fixnum))\n"))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-variable-scope.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-variable-scope.rkt
deleted file mode 100644
index bb77a952d0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/type-variable-scope.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang typed/racket
-
-;; Testing type variable scope
-;;
-;; These should all succeed
-
-(: f (All (b) (b -> b)))
-(define f
-  (plambda: (a) ([x : a]) x))
-
-(: g (All (a) (a -> a)))
-(define g
-  (plambda: (b) ([x : b]) x))
-
-(: h (All (x y) (x -> x)))
-(define h
-  (plambda: (a b) ([x : a]) x))
-
-(: i (All (x) (x -> x)))
-(define i
-  (plambda: (b) ([x : b])
-    (plambda: (b) ([y : b])
-      y)
-    x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/typeann-letrec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/typeann-letrec.rkt
deleted file mode 100644
index 3a56eb16ce..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/typeann-letrec.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed-scheme
-
-(letrec-syntaxes+values () ([(#{x : Number}) (values 1)]) #{(vector x) :: (Vectorof Number)})
-(letrec-values ([(#{x : Number}) (values 1)]) #{(vector x) :: (Vectorof Number)})
-(letrec ([#{x : Number} (values 1)]) #{(vector x) :: (Vectorof Number)})
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/typed-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/typed-list.rkt
deleted file mode 100644
index 06b4e4b5c9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/typed-list.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed-scheme
-(provide -foldl)
-
-(pdefine: (a b) (-foldl [f : (a b -> b)] [e : b] [l : (Listof a)]) : b
-	  (if (null? l)
-              e
-	      (foldl f (f (car l) e) (cdr l))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/typed-scheme-no-check-arrow.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/typed-scheme-no-check-arrow.rkt
deleted file mode 100644
index 14024b2d00..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/typed-scheme-no-check-arrow.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang typed-scheme/no-check
-(: foo : Void -> Void)
-(define (foo x) x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/unsafe-struct-parent.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/unsafe-struct-parent.rkt
deleted file mode 100644
index 82ecf76740..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/unsafe-struct-parent.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang typed/scheme
-(require racket/unsafe/ops)
-
-(define-struct: foo ((x : Integer) (y : String)))
-(define-struct: (bar foo) ((z : Float)))
-
-(define a (make-foo 1 "1"))
-(define b (make-bar 2 "2" 2.0))
-
-(= (+ (unsafe-struct-ref a 0) 2) 3)
-(string=? (string-append (unsafe-struct-ref a 1) "\n") "1\n")
-(= (+ (unsafe-struct-ref b 0) 2) 4)
-(string=? (string-append (unsafe-struct-ref b 1) "\n") "2\n")
-(= (+ (unsafe-struct-ref b 2) 2.0) 4.0)
-
-(unsafe-struct-set! a 0 2)
-(unsafe-struct-set! a 1 "2")
-(unsafe-struct-set! b 0 3)
-(unsafe-struct-set! b 1 "3")
-(unsafe-struct-set! b 2 3.0)
-
-(= (+ (unsafe-struct-ref a 0) 2) 4)
-(string=? (string-append (unsafe-struct-ref a 1) "\n") "2\n")
-(= (+ (unsafe-struct-ref b 0) 2) 5)
-(string=? (string-append (unsafe-struct-ref b 1) "\n") "3\n")
-(= (+ (unsafe-struct-ref b 2) 2.0) 5.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/unsafe-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/unsafe-struct.rkt
deleted file mode 100644
index df6bff14fa..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/unsafe-struct.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang typed/scheme
-(require racket/unsafe/ops)
-
-(define-struct: x ((a : Integer) (b : String)) #:mutable)
-
-(define x1 (make-x 1 "1"))
-
-(= (+ (unsafe-struct-ref x1 0) 2) 3)
-(string=? (string-append (unsafe-struct-ref x1 1) "\n") "1\n")
-
-(unsafe-struct-set! x1 0 2)
-(unsafe-struct-set! x1 1 "2")
-(= (+ (unsafe-struct-ref x1 0) 2) 4)
-(string=? (string-append (unsafe-struct-ref x1 1) "\n") "2\n")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/values-dots.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/values-dots.rkt
deleted file mode 100644
index 5d10bb6e81..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/values-dots.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang typed/scheme/base
-
-(require typed-racket/base-env/extra-procs)
-
-
-(call-with-values (lambda () (values 1 2)) (lambda: ([x : Number] [y : Number]) (+ x y)))
-
-(#{call-with-values @ Integer Integer Integer} (lambda () (values 1 2)) (lambda: ([x : Integer] [y : Integer]) (+ x y)))
-
-
-(call-with-values (lambda () (values 1 2)) (lambda: ([x : Integer] [y : Integer]) (+ x y)))
-
-(: map-with-funcs (All (b ...) ((b ... b -> b) ... b -> (b ... b -> (values b ... b)))))
-(define (map-with-funcs . fs)
-  (lambda bs
-    (apply values (map (plambda: (c) ([f : (b ... b -> c)])
-                         (apply f bs)) fs))))
-
-(map-with-funcs + - * /)
-
-(inst map-with-funcs Integer Integer)
-
-(map-with-funcs
- (lambda: ([x : Integer] [y : Integer]) (+ x y))
- (lambda: ([x : Integer] [y : Integer]) (- x y)) )
-
-(((inst map-with-funcs Integer Integer)
-    (lambda: ([x : Integer] [y : Integer]) (+ x y))
-    (lambda: ([x : Integer] [y : Integer]) (- x y)))
-   3 4)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/values-dots2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/values-dots2.rkt
deleted file mode 100644
index 91abc3124d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/values-dots2.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/racket/base
-
-(: map-with-funcs (All (b c d e ) ((b c d e -> b)
-                                  (b c d e -> c) 
-                                  (b c d e -> d) 
-                                  (b c d e -> e) 
-                                  -> 
-                                  (b c d e -> (List b c d e)))))
-(define (map-with-funcs f1 f2 f3 f4)
-  (lambda (b0 c0 d0 e0 )
-    (list (f1 b0 c0 d0 e0 )
-          (f2 b0 c0 d0 e0 )
-          (f3 b0 c0 d0 e0 )
-          (f4 b0 c0 d0 e0 ))))
-
-(map-with-funcs + - * /)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/values-object.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/values-object.rkt
deleted file mode 100644
index 3504fdaf4e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/values-object.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket
-
-(define v values)
-;(define v identity)
-
-(: f (Boolean -> #f))
-(define (f x) (if (v x) #f x))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/varargs-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/varargs-tests.rkt
deleted file mode 100644
index ccf4ec59e3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/varargs-tests.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang typed-scheme
-
-
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias symbol Symbol)
-(define-type-alias top Any)
-(define-type-alias list-of Listof)
-(+ (+)
-   (+ 1 2)
-   (+ 1)
-   (+ 3 4 5 6)
-   (- 1)
-   (- 1 2)
-   (- 3 4 5 6 7 (+ 45)))
-
-(apply + '(2 3 4))
-
-
-(define: f : (number boolean * -> number)
-  (lambda: ([x : number] . [y : boolean *])
-           (if (and (pair? y) (car y)) x (- x))))
-
-(define: f-cl : (number boolean * -> number)
-  (case-lambda: [([x : number] . [y : boolean *])
-		 (if (and (pair? y) (car y)) x (- x))]))
-
-(define: (f* [x : number] . [y : boolean *]) : number
-  (if (and (pair? y) (car y)) x (- x)))
-
-(f 3)
-
-(f 3 #t #f)
-
-(apply f 3 '(#f))
-
-(f* 3)
-
-(f* 3 #t #f)
-
-(apply f* 3 '(#f))
-
-(f-cl 3)
-
-(f-cl 3 #t #f)
-
-(apply f-cl 3 '(#f))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/variance-test.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/variance-test.rkt
deleted file mode 100644
index 63ac07cc5b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/variance-test.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang typed/racket
-
-;; Test a variance regression
-
-(struct: (A) Foo ([elems : (Vectorof A)]))
-
-(: make-foo (All (A) (A -> (Foo A))))
-(define (make-foo x) (Foo (vector x)))
-
-;; Need a module+ here because this test failed
-;; originally when variance information wasn't preserved
-;; across modules.
-(module+ test
-  ;; should type check, but won't if the element has
-  ;; the Any type incorrectly
-  (+ 1 (vector-ref (Foo-elems (make-foo 1)) 0)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/vec-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/vec-tests.rkt
deleted file mode 100644
index cb2f4b4a56..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/vec-tests.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed-scheme
-(define: x : (Vectorof Number) (build-vector 5 (lambda: ([x : Number]) 0)))
-(define: y : Number (vector-ref x 1))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/vector-chap.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/vector-chap.rkt
deleted file mode 100644
index 7ca8aa758c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/vector-chap.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/load
-
-(module m1 racket
-  (define (f x y) (equal? x y))
-  (provide f))
-
-(module m2 typed/racket
-  (require/typed 'm1 [f (Any Any -> Boolean)])
-  (f (vector 1 2) (vector 1 2)))
-
-(require 'm2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/vector-union.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/vector-union.rkt
deleted file mode 100644
index 27a3bd06de..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/vector-union.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang typed/racket
-
-
-(: v (U (Vector String) (Vector Symbol)))
-;(define v (vector "hello"))
-(define v (vector 'hello))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-asserts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-asserts.rkt
deleted file mode 100644
index c6dc9b3210..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-asserts.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang typed/racket
-
-(let ([x 1] [y "2"])
-  (with-asserts ([x integer?] [y string?])
-                x))
-(let ([x 1] [y "2"])
-  (with-asserts ([x integer?])
-                x))
-(let ([x 1] [y "2"])
-  (with-asserts ()
-                x))
-(let ([x 1] [y "2"])
-  (with-asserts ([x])
-                x))
-
-(: f : (U Integer String) -> Integer)
-(define (f x)
-  (with-asserts ([x integer?])
-                x))
-(f 1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-handlers-rest-arg.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-handlers-rest-arg.rkt
deleted file mode 100644
index b8820e7416..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-handlers-rest-arg.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang typed/racket/base
-
-(define (run-ground-vm)
-  (with-handlers ([exn:break? void])
-    (void)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-handlers.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-handlers.rkt
deleted file mode 100644
index bfbb1a150c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-handlers.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#lang typed-scheme
-
-(define: (f [i : Integer]) : (Pair String Char)
- (cons "foo" #\space))
-
-(define: (is-happiness-a-warm-gun?) : Boolean
- (with-handlers ([integer? (lambda: ([x : Any]) #t)])
-   (f 42)
-   #t))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-syntax.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-syntax.rkt
deleted file mode 100644
index ecece286d1..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-syntax.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/racket
-(require racket/syntax)
-
-(: f : -> (Syntaxof Any))
-(define (f)
-  (with-syntax* ([(x ...) (list 1 2 3)])
-    #`(#,(syntax +) x ...)))
-  
\ No newline at end of file
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-type-lift.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-type-lift.rkt
deleted file mode 100644
index ebfcb45465..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-type-lift.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-
-;; Test syntax lifting in `with-type`
-
-(require rackunit typed/racket)
-
-(with-type #:result Number
-  (define-syntax (m stx)
-    (syntax-local-lift-expression #'(+ 1 2)))
-  (m))
-
-(define-syntax (m2 stx)
-  (syntax-local-lift-expression #'(+ 1 2)))
-
-(with-type #:result Number (m2))
-
-(with-type ([val Number]) (define val (m2)))
-(check-equal? val 3)
-
-(with-type #:result (Listof String)
-  ;; casts do lifts for the contract
-  (define x (cast '() (Listof String)))
-  ;; as do predicates
-  (make-predicate (Listof String))
-  x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-type-typed-context-flag.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-type-typed-context-flag.rkt
deleted file mode 100644
index 1c3d3e4888..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-type-typed-context-flag.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/load
-
-(require (only-in typed/racket with-type)
-         unstable/macro-testing)
-
-;; Test that the typed-context? flag is properly reset
-
-(with-handlers ([exn:fail:syntax? void])
-  (convert-compile-time-error
-   (with-type [] (+ 1 "foo"))))
-
-;; this should succeed instead of an error due to the typed-context?
-;; flag being set to #t
-(with-type [] (+ 1 3))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-type.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-type.rkt
deleted file mode 100644
index 5f5ef5cf24..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/with-type.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang scheme
-(require typed/scheme)
-
-(with-type #:result Number 3)
-
-(let ([x "hello"])
-  (with-type #:result String
-    #:freevars ([x String])
-    (string-append x ", world")))
-
-(define-values (a b)
-  (with-type #:result (values Number String)
-             (values 3 "foo")))
-
-(with-type ([fun (Number -> Number)]
-            [val Number])
-  (define (fun x) x)
-  (define val 17))
-
-(fun val)
-val
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/tr-random-testing.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/tr-random-testing.rkt
deleted file mode 100644
index 7e5a00b87f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/tr-random-testing.rkt
+++ /dev/null
@@ -1,252 +0,0 @@
-#lang racket
-
-;; Random testing of type preservation for reals.
-
-(require redex/reduction-semantics
-         racket/flonum racket/unsafe/ops
-         racket/sandbox racket/cmdline
-         "random-real.rkt")
-
-(require typed-racket/utils/utils
-         (typecheck typechecker)
-         (utils tc-utils)
-         (types subtype utils))
-
-(require (prefix-in b: (base-env base-env))
-         (prefix-in n: (base-env base-env-numeric)))
-
-(b:init) (n:init)
-(define-namespace-anchor anch)
-
-(define-language tr-arith
-  [n real]
-  ;; randomly generate F, not E, because literal numbers self-evaluate
-  ;; (i.e. generates a useless test)
-  [E* n E F S I]
-  ;; racket/math
-  ;; [E (degrees->radians E)
-  ;;    (radians->degrees E)
-  ;;    (exact-round E)
-  ;;    (exact-floor E)
-  ;;    (exact-ceiling E)
-  ;;    (exact-truncate E)
-  ;;    (nan? E)
-  ;;    (infinite? E)
-  ;;    ]
-  ;; more likely to be floats
-  [F* (real->double-flonum n) F] ; TODO fix pre-processing to avoid cast
-  [F (* F* ...)
-     (+ F* ...)
-     (- F* ...)
-     (/ F* ...)
-     (max F* ...)
-     (min F* ...)
-     (add1 F*)
-     (sub1 F*)
-     (abs F*)
-     (floor F*)
-     (ceiling F*)
-     (truncate F*)
-     (round F*)
-     (cos F*)
-     (sin F*)
-     (tan F*)
-     (sqr F*)
-     (flabs F*)
-     (flround F*)
-     (flfloor F*)
-     (flceiling F*)
-     (fltruncate F*)
-     (flsin F*)
-     (flcos F*)
-     (fltan F*)
-     (flatan F*)
-     (flasin F*)
-     (flacos F*)
-     (fllog F*)
-     (flexp F*)
-     (flsqrt F*)
-     (unsafe-flabs F*)
-     (unsafe-flmin F* F*)
-     (unsafe-flmax F* F*)
-     (unsafe-flsqrt F*)
-     (fl+ F* F*)
-     (fl- F* F*)
-     (fl* F* F*)
-     (fl/ F* F*)
-     (flmin F* F*)
-     (flmax F* F*)
-     (flexpt F* F*)
-     (unsafe-fl+ F* F*)
-     (unsafe-fl- F* F*)
-     (unsafe-fl* F* F*)
-     (unsafe-fl/ F* F*)]
-  ;; not many single-flonum-specific ops, so will mostly be used in E context
-  [S (real->single-flonum n)
-     (inexact->exact S)
-     (real->double-flonum S)]
-  ;; more likely to be integers
-  [I* (exact-round n) I] ; TODO fix pre-processing to avoid cast
-  [I (* I* ...)
-     (+ I* ...)
-     (- I* ...)
-     (max I* ...)
-     (min I* ...)
-     (add1 I*)
-     (sub1 I*)
-     (abs I*)
-     (floor I*)
-     (ceiling I*)
-     (truncate I*)
-     (round I*)
-     (sqr I*)
-     (modulo I* I*)
-     (remainder I* I*)
-     (quotient I* I*)
-     (gcd I*)
-     (gcd I* I*)
-     (gcd I* I* I*)
-     (lcm I*)
-     (lcm I* I*)
-     (lcm I* I* I*)
-     (arithmetic-shift I* I*)
-     (bitwise-and I* ...)
-     (bitwise-ior I* ...)
-     (bitwise-xor I* ...)
-     (bitwise-not I*)
-     (integer-length I*)
-     ]
-  [E (* E* ...)
-     (+ E* ...)
-     (- E* ...)
-     (/ E* ...)
-     (max E* ...)
-     (min E* ...)
-     (add1 E*)
-     (sub1 E*)
-     (abs E*)
-     (floor E*)
-     (ceiling E*)
-     (truncate E*)
-     (round E*)
-     (sqrt E*)
-     (log E*)
-     (exp E*)
-     (cos E*)
-     (sin E*)
-     (tan E*)
-     (sqr E*)
-     (make-rectangular E* E*)
-     (make-polar E* E*)
-     (sinh E*)
-     (cosh E*)
-     (tanh E*)
-     (expt E* E*)
-     ])
-;; generated from: (map car (file->list "base-env-parts"))
-
-(define (get-type e [typecheck (compose tc-expr expand)])
-  (parameterize ([delay-errors? #f]
-                 [current-namespace (namespace-anchor->namespace anch)]
-                 [orig-module-stx (quote-syntax e)])
-    (typecheck (datum->syntax #'here e))))
-
-(define (right-type? before)
-  (define type-before (match (get-type before) [(tc-result1: b) b]))
-  (define after (with-handlers ([values values])
-                  (eval before (namespace-anchor->namespace anch))))
-  (cond [(exn? after)  #t]
-        [else
-         (define type-after (get-type after tc-literal))
-         (define subtype? (subtype type-after type-before))
-         (unless subtype?
-           (printf "type-before = ~v~ntype-after = ~v~n" type-before type-after))
-         subtype?]))
-
-;; Redex can't generate reals, so we convert ints to reals.
-(define (exp->real-exp E) ; numbers or symbols or lists
-  (cond [(number? E)
-         (random-integer->random-real
-          (exact-round
-           ;; doesn't handle non-rationals
-           ;; not a problem, we generate those specially
-           (if (rational? E)
-               E
-               0)))] ; arbitrary
-        [(list? E)
-         (map exp->real-exp E)]
-        [else
-         E]))
-
-(define max-mem 1000)
-
-(define num-exceptions 0)
-
-(define (mk-eval lang)
-  (call-with-trusted-sandbox-configuration
-   (λ ()
-     (parameterize ([sandbox-memory-limit max-mem])
-       (make-evaluator lang #:requires '(racket/flonum racket/unsafe/ops))))))
-(define racket-eval (mk-eval 'racket))
-(define tr-eval     (mk-eval 'typed/racket))
-
-(define (check-all-reals sexp)
-  (when verbose? (displayln sexp))
-  (or (with-handlers
-          ;; something went wrong, almost certainly typechecking failed
-          ;; in which case we ignore the expression
-          ([exn?  (λ (e)
-                    (set! num-exceptions (+ num-exceptions 1))
-                    #t)])
-        (get-type sexp)
-        #f) ; go on and check preservation
-      (and (right-type? sexp)
-           ;; do we get the same result with and without optimization?
-           (let ()
-             (define racket-failed?  #f)
-             (define both-failed?    #f)
-             (define racket-result
-               (with-handlers
-                   ;; something went wrong, e.g. division by zero
-                   ;; TR must fail too
-                   ([exn? (λ (e) (set! racket-failed? #t))])
-                 (racket-eval sexp)))
-             (define tr-result
-               (with-handlers
-                   ;; did Racket error too?
-                   ([exn? (λ (e) (when racket-failed?
-                                   (set! both-failed? #t)))])
-                 (tr-eval sexp)))
-             (or both-failed?
-                 (and (not racket-failed?)
-                      (or (=      racket-result tr-result)
-                          ;; for NaN, which is not = to itself
-                          (equal? racket-result tr-result))))))))
-
-(define n-attempts 1000)
-(define seed       (+ 1 (random (expt 2 30))))
-(define verbose?   #f)
-(command-line
- #:once-each
- [("-n") n "Number of attempts" (set! n-attempts (string->number n))]
- [("-s") s "RNG seed"           (set! seed (string->number s))]
- [("-v")   "Print test cases"   (set! verbose? #t)])
-
-(random-seed seed)
-(printf "seed: ~s~n" seed)
-(flush-output) ; DrDr doesn't print the above if the testing segfaults.
-
-(call-with-limits
- #f max-mem
- (lambda ()
-   (redex-check tr-arith E (check-all-reals (term E))
-                #:attempts n-attempts
-                #:prepare exp->real-exp
-                #:keep-going? #t)))
-
-(printf "bad tests (usually typechecking failed): ~v~n" num-exceptions)
-
-(module+ test
-  (module config info
-    (define timeout 300)
-    (define random? #t)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/all-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/all-tests.rkt
deleted file mode 100644
index c6abd6326c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/all-tests.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket/base
-
-(require
- rackunit
- (for-syntax racket/base syntax/parse racket/syntax))
-
-(provide unit-tests)
-
-(define-syntax define-tests
-  (syntax-parser
-    [(_ test-name:id files:expr ...)
-     (define/with-syntax (new-names ...)
-       (generate-temporaries #'(files ...)))
-     #'(begin
-         (require (only-in files [tests new-names]) ...)
-         (define test-name
-           (make-test-suite
-             "Unit Tests"
-             (list new-names ...))))]))
-
-(define-tests unit-tests
-  "typecheck-tests.rkt"
-  "subtype-tests.rkt"
-  "type-equal-tests.rkt"
-  "remove-intersect-tests.rkt"
-  "static-contract-conversion-tests.rkt"
-  "static-contract-optimizer-tests.rkt"
-  "parse-type-tests.rkt"
-  "subst-tests.rkt"
-  "infer-tests.rkt"
-  "keyword-expansion-test.rkt"
-  "special-env-typecheck-tests.rkt"
-  "contract-tests.rkt"
-  "interactive-tests.rkt"
-  "type-printer-tests.rkt"
-  "type-alias-helper.rkt"
-  "class-tests.rkt"
-  "class-util-tests.rkt"
-  "check-below-tests.rkt"
-  "init-env-tests.rkt"
-  "filter-tests.rkt"
-  "metafunction-tests.rkt"
-  "generalize-tests.rkt"
-  "rep-tests.rkt"
-  "prims-tests.rkt"
-  "tooltip-tests.rkt")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/check-below-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/check-below-tests.rkt
deleted file mode 100644
index bec2dfc134..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/check-below-tests.rkt
+++ /dev/null
@@ -1,220 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt"
-         rackunit racket/list racket/match racket/format
-         syntax/srcloc syntax/location
-         (types abbrev union tc-result)
-         (utils tc-utils)
-         (rep filter-rep object-rep type-rep)
-         (typecheck check-below)
-         (for-syntax racket/base syntax/parse))
-
-(provide tests)
-(gen-test-main)
-
-;; Ensure that we never return a filter of NoFilter or an object of NoObject.
-(define (check-filter f)
-  (match f
-    [(NoFilter:) (fail-check "Result has no filter (instead of a top filter).")]
-    [_ (void)]))
-
-(define (check-object o)
-  (match o
-    [(NoObject:) (fail-check "Result has no object (instead of an empty object).")]
-    [_ (void)]))
-
-(define (check-result result)
-  (match result
-    [(tc-results: ts fs os)
-     (for-each check-filter fs)
-     (for-each check-object os) ]
-    [(tc-results: ts fs os dty bound)
-     (for-each check-filter fs)
-     (for-each check-object os)]
-    [(tc-any-results: f)
-     (check-filter f)]
-    [(? Type/c?)
-     (void)]))
-
-
-(define-syntax (test-below stx)
-  (syntax-parse stx
-    [(_ t1:expr t2:expr (~optional (~seq #:result expected-result:expr)
-                                     #:defaults [(expected-result #'t2)]))
-     #`(test-case (~a 't1 " <: " 't2)
-         (with-check-info (['location (build-source-location-list (quote-srcloc #,stx))]
-                           ['expected expected-result])
-           (define result (check-below t1 t2))
-           (with-check-info (['actual result])
-             (check-result result)
-             (unless (equal? expected-result result)
-               (fail-check "Check below did not return expected result.")))))]
-    [(_ #:fail (~optional message:expr #:defaults [(message #'#rx"type mismatch")])
-        t1:expr t2:expr
-        (~optional (~seq #:result expected-result:expr)
-                     #:defaults [(expected-result #'t2)]))
-     #`(test-case (~a 't1 " !<: " 't2)
-         (with-check-info (['location (build-source-location-list (quote-srcloc #,stx))]
-                           ['expected expected-result])
-           (define result
-             (parameterize ([delay-errors? #t])
-               (check-below t1 t2)))
-           (with-check-info (['actual result])
-             (define exn
-               (let/ec exit
-                 (with-handlers [(exn:fail? exit)]
-                   (report-all-errors)
-                   (fail-check "Check below did not fail."))))
-             (check-result result)
-             (unless (equal? expected-result result)
-               (fail-check "Check below did not return expected result."))
-             (check-regexp-match message (exn-message exn)))))]))
-
-
-(define tests
-  (test-suite "Check Below"
-    (test-below -Bottom Univ)
-    (test-below #:fail -Symbol -String)
-
-    (test-below
-      (ret -Bottom)
-      (ret (list Univ Univ) (list -true-filter -no-filter) (list -no-obj -empty-obj))
-      #:result (ret (list Univ Univ) (list -true-filter -bot-filter) (list -empty-obj -empty-obj)))
-
-    (test-below
-      (ret -Bottom)
-      (ret (list Univ) (list -no-filter) (list -no-obj) Univ 'B)
-      #:result (ret (list Univ) (list -bot-filter) (list -empty-obj) Univ 'B))
-
-    ;; Bottom is not below everything if the number of values doesn't match up.
-    (test-below #:fail
-      (ret (list -Bottom -Bottom))
-      (ret (list Univ) (list -true-filter) (list -no-obj))
-      #:result (ret (list Univ) (list -true-filter) (list -empty-obj)))
-
-    (test-below #:fail
-      (ret (list))
-      (ret (list Univ) (list -true-filter) (list -no-obj))
-      #:result (ret (list Univ) (list -true-filter) (list -empty-obj)))
-
-    (test-below
-      (ret (list -Symbol) (list -top-filter) (list -empty-obj))
-      (ret (list Univ) (list -no-filter) (list -no-obj))
-      #:result (ret (list Univ) (list -top-filter) (list -empty-obj)))
-
-    (test-below
-      (ret (list -Symbol) (list -true-filter) (list -empty-obj))
-      (ret (list Univ) (list -top-filter) (list -empty-obj)))
-
-    (test-below #:fail
-      (ret (list -Symbol) (list -top-filter) (list -empty-obj))
-      (ret (list Univ) (list -true-filter) (list -no-obj))
-      #:result (ret (list Univ) (list -true-filter) (list -empty-obj)))
-
-    (test-below #:fail #rx"no object"
-      (ret (list -Symbol) (list -top-filter) (list -empty-obj))
-      (ret (list Univ) (list -top-filter) (list (make-Path empty #'x))))
-
-    (test-below #:fail #rx"no object"
-      (ret (list -Symbol) (list -top-filter) (list -empty-obj))
-      (ret (list Univ) (list -true-filter) (list (make-Path empty #'x))))
-
-    (test-below (ret -Bottom) (tc-any-results -no-filter) #:result (tc-any-results -bot))
-    (test-below (ret Univ) (tc-any-results -top) #:result (tc-any-results -top))
-    (test-below (tc-any-results -bot) (tc-any-results -no-filter) #:result (tc-any-results -bot))
-    (test-below
-      (ret (list -Symbol -String) (list -true-filter -bot-filter))
-      (tc-any-results -no-filter)
-      #:result (tc-any-results -bot))
-    (test-below (ret -Symbol -bot-filter) (tc-any-results -no-filter) #:result (tc-any-results -bot))
-
-    (test-below (ret -Symbol -true-filter -empty-obj) (tc-any-results -no-filter)
-      #:result (tc-any-results -top))
-    (test-below (ret (list -Symbol -String)) (tc-any-results -no-filter)
-      #:result (tc-any-results -top))
-    (test-below
-      (ret (list -Symbol -String) (list -true-filter -false-filter) (list -empty-obj -empty-obj))
-      (tc-any-results -no-filter)
-      #:result (tc-any-results -top))
-
-
-    (test-below #:fail
-      (ret -Symbol)
-      (ret (list -Symbol -Symbol) (list -top-filter -no-filter) (list -no-obj -empty-obj))
-      #:result (ret (list -Symbol -Symbol) (list -top-filter -top-filter) (list -empty-obj -empty-obj)))
-
-    (test-below #:fail
-      (tc-any-results -top)
-      (ret -Symbol))
-
-
-    (test-below #:fail
-      (ret -Symbol -true-filter -empty-obj)
-      (ret -Symbol -true-filter -empty-obj Univ 'B))
-
-    (test-below #:fail
-      (ret -Symbol -true-filter -empty-obj Univ 'B)
-      (ret -Symbol -true-filter -empty-obj))
-
-    (test-below #:fail
-      (ret -Symbol)
-      (ret -Symbol -no-filter -empty-obj Univ 'B)
-      #:result (ret -Symbol -top-filter -empty-obj Univ 'B))
-
-    (test-below #:fail
-      (tc-any-results -top)
-      (ret -Symbol -no-filter -empty-obj Univ 'B)
-      #:result (ret (list -Symbol) (list -top-filter) (list -empty-obj) Univ 'B))
-
-    (test-below #:fail
-      (ret -Symbol -top-filter -empty-obj Univ 'B)
-      (ret (list -Symbol -Symbol) (list -top-filter -top-filter)  (list -empty-obj -empty-obj) Univ 'B))
-
-    (test-below (ret -Symbol -true-filter -empty-obj Univ 'B)
-                (tc-any-results -no-filter)
-                #:result (tc-any-results -top))
-
-    (test-below
-      (ret -Symbol)
-      (ret -Symbol -no-filter -empty-obj)
-      #:result (ret -Symbol -top-filter -empty-obj))
-
-    (test-below
-      (ret -Symbol -true-filter)
-      (ret -Symbol -no-filter -empty-obj)
-      #:result (ret -Symbol -true-filter -empty-obj))
-
-    (test-below #:fail
-      (ret -Symbol -true-filter)
-      (ret (list Univ -Symbol) (list -no-filter -top-filter))
-      #:result (ret (list Univ -Symbol) (list -top-filter -top-filter)))
-
-
-    (test-below
-      (ret (list Univ) (list -true-filter) (list -empty-obj))
-      (ret Univ -no-filter)
-      #:result (ret (list Univ) (list -true-filter) (list -empty-obj)))
-
-    ;; Enable these once check-below is fixed
-    ;; Currently does not fail
-    #;
-    (test-below #:fail
-      (ret (list Univ) (list -top-filter) (list -empty-obj) Univ 'B)
-      (ret (list Univ) (list -false-filter) (list -no-obj) Univ 'B)
-      #:result (ret (list Univ) (list -false-filter) (list -empty-obj) Univ 'B))
-
-    ;; Currently does not fail
-    #;
-    (test-below #:fail
-      (ret (list Univ) (list -top-filter) (list -empty-obj))
-      (ret (list Univ) (list -false-filter) (list -no-obj) Univ 'B)
-      #:result (ret (list Univ) (list -false-filter) (list -empty-obj) Univ 'B))
-
-    ;; Currently does not fail
-    #;
-    (test-below #:fail
-      (ret (list Univ Univ) (list -top-filter -top-filter) (list -empty-obj -empty-obj))
-      (ret (list Univ Univ) (list -false-filter -false-filter) (list -no-obj -no-obj))
-      #:result (ret (list Univ Univ) (list -false-filter -false-filter) (list -empty-obj -empty-obj)))
-
-  ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/class-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/class-tests.rkt
deleted file mode 100644
index c7b3763970..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/class-tests.rkt
+++ /dev/null
@@ -1,1686 +0,0 @@
-#lang racket/base
-
-;; Unit tests for typed classes
-
-(require (submod "typecheck-tests.rkt" test-helpers)
-         (except-in "test-utils.rkt" private)
-         (for-syntax racket/base
-                     typed-racket/tc-setup
-                     typed-racket/utils/tc-utils))
-
-(provide tests)
-(gen-test-main)
-
-(begin-for-syntax
-  ;; for checking the printing of type aliases
-  (current-type-names (init-current-type-names)))
-
-;; see typecheck-tests.rkt for rationale on imports
-(require rackunit
-         typed/racket/class
-         (except-in typed-racket/utils/utils private)
-         (except-in (base-env extra-procs prims class-prims
-                              base-types base-types-extra)
-                    define lambda λ case-lambda)
-         (prefix-in tr: (only-in (base-env prims) define lambda λ case-lambda))
-         (for-syntax (rep type-rep filter-rep object-rep)
-                     (rename-in (types abbrev union numeric-tower filter-ops utils)
-                                [Un t:Un]
-                                [-> t:->])))
-
-(define tests
-  (test-suite
-   "class typechecking tests"
-   #reader typed-racket/typed-reader
-   ;; Basic class with init and public method
-   [tc-e (let ()
-           (: c% (Class (init [x Integer])
-                        [m (Integer -> Integer)]))
-           (define c%
-             (class object%
-               (super-new)
-               (init x)
-               (define/public (m x) 0)))
-           (send (new c% [x 1]) m 5))
-         -Integer]
-   ;; Fails, bad superclass expression
-   [tc-err (let ()
-             (: d% (Class (init [x Integer])
-                          [m (Integer -> Integer)]))
-             (define d% (class 5
-                          (super-new)
-                          (init x)
-                          (define/public (m x) 0)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"superclass expression should produce a class"]
-   ;; Method using argument type
-   [tc-e (let ()
-           (: e% (Class (init [x Integer])
-                        [m (Integer -> Integer)]))
-           (define e% (class object%
-                        (super-new)
-                        (init x)
-                        (define/public (m x) x)))
-           (void))
-         -Void]
-   ;; Send inside a method
-   [tc-e (let ()
-           (: f% (Class (init [x Integer])
-                        [m (Integer -> Integer)]))
-           (define f% (class object%
-                        (super-new)
-                        (init x)
-                        (define/public (m x) (send this m 3))))
-           (void))
-         -Void]
-   ;; Fails, send to missing method
-   [tc-err (let ()
-             (: g% (Class (init [x Integer #:optional])
-                          [m (Integer -> Integer)]))
-             (define g% (class object%
-                          (super-new)
-                          (init [x 0])
-                          (define/public (m x) (send this z))))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"method not understood.*method name: z"]
-   ;; Send to other methods
-   [tc-e (let ()
-           (: h% (Class [n (-> Integer)]
-                        [m (Integer -> Integer)]))
-           (define h% (class object%
-                        (super-new)
-                        (define/public (n) 0)
-                        (define/public (m x) (send this n))))
-           (void))
-         -Void]
-   ;; Local sends
-   [tc-e (let ()
-           (: i% (Class [n (-> Integer)]
-                        [m (Integer -> Integer)]))
-           (define i% (class object%
-                        (super-new)
-                        (define/public (n) 0)
-                        (define/public (m x) (n))))
-           (void))
-         -Void]
-   ;; Send to non object
-   [tc-err (send 4 m 3)
-      #:ret (ret (-val 5) -bot-filter)
-      #:expected (ret (-val 5) -no-filter -no-obj)]
-   ;; Fails, sending to multiple/unknown values
-   [tc-err (send (values 'a 'b) m 'c)
-           #:msg #rx"expected single value"]
-   [tc-err (send (eval "3") m 'c)
-           #:msg #rx"expected single value"]
-   ;; Send to a union of objects in various ways
-   [tc-e (let ()
-           (: f (-> (U (Object [m (-> String)])
-                       (Object [m (-> Symbol)]
-                               [n (-> Void)]))
-                    (U Symbol String)))
-           (define (f o) (send o m))
-           (f (new (class object% (super-new) (define/public (m) "foo")))))
-         (t:Un -String -Symbol)]
-   [tc-e (let ()
-           (: f (-> (U (Object [m (-> (values String Symbol))])
-                       (Object [m (-> (values Symbol String))]
-                               [n (-> Void)]))
-                    (values (U Symbol String) (U Symbol String))))
-           (define (f o) (send o m))
-           (f (new (class object% (super-new)
-                     (define/public (m) (values "foo" 'bar))))))
-         #:ret (ret (list (t:Un -String -Symbol) (t:Un -String -Symbol)))]
-   [tc-err
-    (let ()
-      (define obj
-        (if (> (random) 0.5)
-            (new (class object% (super-new)
-                   (define/public (m) "foo")))
-            (new (class object% (super-new)
-                   (define/public (m) (values "foo" "bar"))))))
-      (send obj m))
-    #:msg #rx"Expected the same number of values.*got 1 and 2"]
-   ;; Field access via get-field
-   [tc-e (let ()
-           (: j% (Class (field [n Integer])
-                        [m (-> Integer)]))
-           (define j% (class object%
-                        (super-new)
-                        (field [n 0])
-                        (define/public (m) (get-field n this))))
-           (void))
-         -Void]
-   ;; Test set-field!
-   [tc-e (set-field! x
-           (new (class object%
-                  (super-new)
-                  (field [x : String "foo"])))
-           "bar")
-         -Void]
-   ;; fails, check set-field! type error
-   [tc-err (set-field! x
-             (new (class object%
-                    (super-new)
-                    (field [x : String "foo"])))
-             'not-string)
-           #:ret (ret -Void)
-           #:msg #rx"set-field! only allowed with"]
-   ;; fails, field's default value has wrong type
-   [tc-err (class object% (super-new)
-             (: x Symbol)
-             (field [x "foo"]))
-           #:ret (ret (-class #:field ([x -Symbol])))
-           #:msg #rx"expected: Symbol.*given: String"]
-   ;; Fail, field access to missing field
-   [tc-err (let ()
-             (: k% (Class [m (-> Integer)]))
-             (define k% (class object%
-                          (super-new)
-                          (define/public (m) (get-field n this))))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"missing an expected field.*field: n"]
-   ;; Fail, conflict with parent field
-   [tc-err (let ()
-             (: j% (Class (field [n Integer])
-                          [m (-> Integer)]))
-             (define j% (class object%
-                          (super-new)
-                          (field [n 0])
-                          (define/public (m) (get-field n this))))
-             (: l% (Class (field [n Integer])
-                          [m (-> Integer)]))
-             (define l% (class j%
-                          (field [n 17])
-                          (super-new)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"has a conflicting public field.*field: n"]
-   ;; Fail, conflict with parent method
-   [tc-err (let ()
-             (: j% (Class [m (-> Integer)]))
-             (define j% (class object%
-                          (super-new)
-                          (define/public (m) 15)))
-             (: m% (Class [m (-> Integer)]))
-             (define m% (class j%
-                          (super-new)
-                          (define/public (m) 17)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"has a conflicting public method.*method: m"]
-   ;; Inheritance
-   [tc-e (let ()
-           (: j% (Class (field [n Integer])
-                        [m (-> Integer)]))
-           (define j% (class object%
-                        (super-new)
-                        (field [n 0])
-                        (define/public (m) (get-field n this))))
-           (: n% (Class (field [n Integer])
-                        [m (-> Integer)]))
-           (define n% (class j% (super-new)))
-           (void))
-         -Void]
-   ;; fail, superclass expression is not a class with no expected type
-   [tc-err (class "foo" (super-new))
-           #:ret (ret (-class))
-           #:msg "expected: a class"]
-   ;; should fail, too many methods
-   [tc-err (let ()
-             (: o% (Class))
-             (define o% (class object%
-                          (super-new)
-                          (define/public (m) 0)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"public method that should be absent.*method: m"]
-   ;; same as previous
-   [tc-err (let ()
-             (: c% (Class [m (Integer -> Integer)]))
-             (define c% (class object% (super-new)
-                          (define/public (m x) (add1 x))
-                          (define/public (n) 0)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"public method that should be absent.*method: n"]
-   ;; fails, too many inits
-   [tc-err (let ()
-             (: c% (Class))
-             (define c% (class object% (super-new)
-                          (init x)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"initialization argument that should be absent.*argument: x"]
-   ;; fails, init should be optional but is mandatory
-   [tc-err (let ()
-             (: c% (Class (init [str String #:optional])))
-             (define c% (class object% (super-new)
-                          (init str)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"missing a required optional init argument.*argument: str"]
-   ;; fails, too many fields
-   [tc-err (let ()
-             (: c% (Class (field [str String])))
-             (define c% (class object% (super-new)
-                          (field [str "foo"] [x 0])))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"has a public field that should be absent.*public field: x"]
-   ;; test that an init with no annotation still type-checks
-   ;; (though it will have the Any type)
-   [tc-e (let () (class object% (super-new) (init x)) (void)) -Void]
-   ;; test that a field with no annotation still type-checks
-   ;; (though it will have the Any type)
-   [tc-e (let () (class object% (super-new) (field [x 0])) (void)) -Void]
-   ;; Mixin on classes without row polymorphism
-   [tc-e (let ()
-           (: mixin ((Class [m (-> Integer)])
-                     ->
-                     (Class [m (-> Integer)]
-                            [n (-> String)])))
-           (define (mixin cls)
-             (class cls
-               (super-new)
-               (define/public (n) "hi")))
-
-           (: arg-class% (Class [m (-> Integer)]))
-           (define arg-class%
-             (class object%
-               (super-new)
-               (define/public (m) 0)))
-
-           (mixin arg-class%)
-           (void))
-         -Void]
-   ;; Fail, bad mixin
-   [tc-err (let ()
-             (: mixin ((Class [m (-> Integer)])
-                       ->
-                       (Class [m (-> Integer)]
-                              [n (-> String)])))
-             (define (mixin cls)
-               (class cls
-                 (super-new)))
-
-             (: arg-class% (Class [m (-> Integer)]))
-             (define arg-class%
-               (class object%
-                 (super-new)
-                 (define/public (m) 0)))
-
-             (mixin arg-class%))
-           #:ret (ret (-class #:method ([m (t:-> -Integer)] [n (t:-> -String)])))
-           #:msg #rx"missing a required public method.*missing public method: n"]
-   ;; Fail, bad mixin argument
-   [tc-err (let ()
-             (: mixin ((Class [m (-> Symbol)])
-                       ->
-                       (Class [m (-> Symbol)]
-                              [n (-> String)])))
-             (define (mixin cls)
-               (class cls
-                 (super-new)
-                 (define/public (n) "hi")))
-
-             (: arg-class% (Class [k (-> Symbol)]))
-             (define arg-class%
-               (class object%
-                 (super-new)
-                 (define/public (k) 'k)))
-
-             (mixin arg-class%)
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"expected: \\(Class \\(m \\(-> Symbol\\)\\)\\)"]
-   ;; classes that don't use define/public directly
-   [tc-e (let ()
-           (: c% (Class [m (Number -> String)]))
-           (define c%
-             (class object%
-               (super-new)
-               (public m)
-               (define-values (m)
-                 (lambda (x) (number->string x)))))
-            (send (new c%) m 4))
-         -String]
-   ;; check that classes work in let clauses
-   [tc-e (let: ([c% : (Class [m (Number -> String)])
-                 (class object%
-                   (super-new)
-                   (public m)
-                   (define-values (m)
-                     (lambda (x) (number->string x))))])
-           (send (new c%) m 4))
-         -String]
-   ;; check a good super-new call
-   [tc-e (let ()
-           (: c% (Class (init [x Integer])))
-           (define c% (class object% (super-new) (init x)))
-           (: d% (Class))
-           (define d% (class c% (super-new [x (+ 3 5)])))
-           (void))
-         -Void]
-   ;; fails, missing super-new
-   [tc-err (let ()
-             (: c% (Class (init [x Integer])))
-             (define c% (class object% (init x)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"must call `super-new'"]
-   ;; fails, non-top-level super-new
-   ;; FIXME: this case also spits out additional untyped identifier
-   ;;        errors which should be squelched maybe
-   [tc-err (let ()
-             (: c% (Class (init [x Integer])))
-             (define c% (class object% (let () (super-new)) (init x)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"must call `super-new'"]
-   ;; fails, bad super-new argument
-   [tc-err (let ()
-             (: c% (Class (init [x Symbol])))
-             (define c% (class object% (super-new) (init x)))
-             (: d% (Class))
-             (define d% (class c% (super-new [x "bad"])))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"expected: Symbol.*given: String"]
-   ;; test override
-   [tc-e (let ()
-           (: c% (Class [m (Integer -> Integer)]))
-           (define c% (class object% (super-new)
-                        (define/public (m y) (add1 y))))
-           (: d% (Class [m (Integer -> Integer)]))
-           (define d% (class c% (super-new)
-                        (define/override (m y) (* 2 y))))
-           (void))
-         -Void]
-   ;; test local call to overriden method
-   [tc-e (let ()
-           (: c% (Class [m (Integer -> Integer)]))
-           (define c% (class object% (super-new)
-                        (define/public (m y) (add1 y))))
-           (: d% (Class [n (Integer -> Integer)]
-                        [m (Integer -> Integer)]))
-           (define d% (class c% (super-new)
-                        (define/public (n x) (m x))
-                        (define/override (m y) (* 2 y))))
-           (void))
-         -Void]
-   ;; fails, superclass missing public for override
-   [tc-err (let ()
-             (: d% (Class [m (String -> String)]))
-             (define d% (class object% (super-new)
-                          (define/override (m y)
-                            (string-append (assert y string?) "foo"))))
-             (void))
-           #:ret (ret -Void)]
-   ;; local field access and set!
-   [tc-e (let ()
-           (: c% (Class (field [x Integer])
-                        [m (Integer -> Integer)]))
-           (define c% (class object% (super-new)
-                        (field [x 0])
-                        (define/public (m y)
-                          (begin0 x (set! x (+ x 1))))))
-           (void))
-         -Void]
-   ;; test top-level expressions in the class
-   [tc-e (let ()
-           (: c% (Class [m (Integer -> Integer)]))
-           (define c% (class object% (super-new)
-                        (define/public (m y) 0)
-                        (+ 3 5)))
-           (void))
-         -Void]
-   ;; test top-level method call
-   [tc-e (let ()
-           (: c% (Class [m (Integer -> Integer)]))
-           (define c% (class object% (super-new)
-                        (define/public (m y) 0)
-                        (m 3)))
-           (void))
-         -Void]
-   ;; test top-level field access
-   [tc-e (let ()
-           (: c% (Class (field [f String])))
-           (define c% (class object% (super-new)
-                        (field [f "foo"])
-                        (string-append f "z")))
-           (void))
-         -Void]
-   ;; fails, bad top-level expression
-   [tc-err (let ()
-             (: c% (Class [m (Symbol -> Symbol)]))
-             (define c% (class object% (super-new)
-                          (define/public (m y) 'a)
-                          (string-append (string->symbol "a") "a")))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"expected: String.*given: Symbol"]
-   ;; fails, ill-typed method call
-   [tc-err (let ()
-             (: c% (Class [m (Symbol -> Symbol)]))
-             (define c% (class object% (super-new)
-                          (define/public (m y) 'a)
-                          (m "foo")))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"expected: Symbol.*given: String"]
-   ;; fails, ill-typed field access
-   [tc-err (let ()
-             (: c% (Class (field [f String])))
-             (define c% (class object% (super-new)
-                          (field [f "foo"])
-                          (set! f 'a)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"expected: String.*given: 'a"]
-   ;; test private field
-   [tc-e (let ()
-           (class object%
-             (super-new)
-             (: x Integer)
-             (define x 5)
-             (set! x 8)
-             (+ x 1))
-           (: d% (Class (field [y String])))
-           (define d%
-             (class object%
-               (super-new)
-               (: x Integer)
-               (define x 5)
-               (: y String)
-               (field [y "foo"])))
-           (void))
-         -Void]
-   ;; fails, bad private field set!
-   [tc-err (class object%
-             (super-new)
-             (: x Symbol)
-             (define x 'a)
-             (set! x "foo"))
-           #:ret (ret (-class))
-           #:msg #rx"expected: Symbol.*given: String"]
-   ;; fails, bad private field default
-   [tc-err (class object%
-             (super-new)
-             (: x Symbol)
-             (define x "foo"))
-           #:ret (ret (-class))
-           #:msg #rx"expected: Symbol.*given: String"]
-   ;; ok, synthesis works on private fields
-   [tc-e (class object% (super-new)
-           (define x "foo") (string-append x "bar"))
-         (-class)]
-   ;; private field with function
-   [tc-e (class object%
-           (super-new)
-           (: f (-> String))
-           (define (f) "foo"))
-         (-class)]
-   [tc-err (let ()
-             (class object%
-               (super-new)
-               (: f (-> String))
-               (define (f) 'bad))
-             (error "foo"))
-           #:msg #rx"type mismatch.*expected: \\(-> String\\)"]
-   ;; multiple names in define-values private fields
-   [tc-e (class object%
-           (super-new)
-           (define-values (x y z) (values 'x 'y 'z)))
-         (-class)]
-   ;; test private method
-   [tc-e (let ()
-           (class object% (super-new)
-             (: x (-> Integer))
-             (define/private (x) 3)
-             (: m (-> Integer))
-             (define/public (m) (x)))
-           (void))
-         -Void]
-   ;; fails, public and private types conflict
-   [tc-err (class object% (super-new)
-             (: x (-> Symbol))
-             (define/private (x) 'a)
-             (: m (-> String))
-             (define/public (m) (x)))
-           #:ret (ret (-class #:method ([m (t:-> -String)])))
-           #:msg #rx"expected: String.*given: Symbol"]
-   ;; fails, not enough annotation on private
-   [tc-err (class object% (super-new)
-             (define/private (x) 3)
-             (: m (-> Integer))
-             (define/public (m) (x)))
-           #:ret (ret (-class #:method ([m (t:-> -Integer)])))
-           #:msg #rx"Cannot apply expression of type Any"]
-   ;; fails, ill-typed private method implementation
-   [tc-err (class object% (super-new)
-             (: x (-> Symbol))
-             (define/private (x) "bad result"))
-           #:ret (ret (-class))
-           #:msg #rx"expected: Symbol.*given: String"]
-   ;; test optional init arg
-   [tc-e (let ()
-           (: c% (Class (init [x Integer #:optional])))
-           (define c% (class object% (super-new)
-                        (: x Integer)
-                        (init [x 0])))
-           (void))
-         -Void]
-   ;; test init coverage when all optionals are
-   ;; in the superclass
-   [tc-e (let ()
-           (: c% (Class (init [x Integer #:optional])))
-           (: d% (Class (init [x Integer #:optional])))
-           (define c% (class object% (super-new)
-                        (: x Integer)
-                        (init [x 0])))
-           (define d% (class c% (super-new)))
-           (void))
-         -Void]
-   ;; fails, expected mandatory but got optional
-   [tc-err (let ()
-             (: c% (Class (init [x Integer])))
-             (define c% (class object% (super-new)
-                          (: x Integer)
-                          (init [x 0])))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"has a optional init argument that should be absent"]
-   ;; fails, mandatory init not provided
-   [tc-err (let ()
-             (define d% (class object% (super-new)
-                          (: x Integer)
-                          (init x)))
-             (new d%))
-           #:ret (ret (-object #:init ([x -Integer #f])))
-           #:msg #rx"value not provided for named init arg x"]
-   ;; test that provided super-class inits don't count
-   ;; towards the type of current class
-   [tc-e (let ()
-           (: c% (Class))
-           (define c% (class (class object% (super-new)
-                               (: x Integer)
-                               (init x))
-                        (super-new [x 3])))
-           (void))
-         -Void]
-   ;; fails, super-class init already provided
-   [tc-err (let ()
-             (define c% (class (class object% (super-new)
-                                 (: x Integer)
-                                 (init x))
-                          (super-new [x 3])))
-             (new c% [x 5]))
-           #:ret (ret (-object))]
-   ;; fails, super-new can only be called once per class
-   [tc-err (class object% (super-new) (super-new))
-           #:ret (ret (-class))
-           #:msg #rx"`super-new' a single time"]
-   ;; test passing an init arg to super-new
-   [tc-e (let ()
-           (define c% (class (class object% (super-new)
-                               (: x Integer)
-                               (init x))
-                        (: x Integer)
-                        (init x)
-                        (super-new [x x])))
-           (new c% [x 5])
-           (void))
-         -Void]
-   ;; fails, bad argument type to super-new
-   [tc-err (class (class object% (super-new)
-                    (: x Integer)
-                    (init x))
-             (: x String)
-             (init x)
-             (super-new [x x]))
-           #:ret (ret (-class #:init ([x -String #f])))]
-   ;; fails, superclass does not accept this init arg
-   [tc-err (class object% (super-new [x 3]))
-           #:ret (ret (-class))
-           #:msg "not accepted by superclass"]
-   ;; test inherit method
-   [tc-e (let ()
-           (class (class object% (super-new)
-                    (: m (Integer -> Integer))
-                    (define/public (m x) (add1 x)))
-             (super-new)
-             (inherit m)
-             (m 5))
-           (void))
-         -Void]
-   ;; test inherit method in another method (next 3)
-   [tc-e (let ()
-           (class (class object% (super-new)
-                    (: m (-> String String))
-                    (define/public (m x) (string-append x "m")))
-             (super-new)
-             (inherit m)
-             (: n (-> String))
-             (define/public (n) (m "foo")))
-           (void))
-         -Void]
-   [tc-e (let ()
-           (class (class object% (super-new)
-                    (: m (-> String String))
-                    (define/public (m x) (string-append x "m")))
-             (super-new)
-             (inherit m)
-             (define/public (n) (m "foo")))
-           (void))
-         -Void]
-   [tc-e (let ()
-           (class (class object% (super-new)
-                    (: m (-> String String))
-                    (define/public (m x) (string-append x "m")))
-             (super-new)
-             (inherit m)
-             (define/private (n) (m "foo")))
-           (void))
-         -Void]
-   ;; test internal name with inherit
-   [tc-e (let ()
-           (class (class object% (super-new)
-                    (: m (Integer -> Integer))
-                    (define/public (m x) (add1 x)))
-             (super-new)
-             (inherit [n m])
-             (n 5))
-           (void))
-         -Void]
-   ;; test inherit field
-   [tc-e (let ()
-           (class (class object% (super-new)
-                    (field [x : Integer 0]))
-             (super-new)
-             (inherit-field x))
-           (void))
-         -Void]
-   ;; test internal name with inherit-field
-   [tc-e (let ()
-           (class (class object% (super-new)
-                    (field [x : String "b"]))
-             (super-new)
-             (inherit-field [y x])
-             (set! y "a"))
-           (void))
-         -Void]
-   ;; fails, superclass missing inherited field
-   [tc-err (class (class object% (super-new))
-             (super-new)
-             (inherit-field [y x]))
-           #:ret (ret (-class))
-           #:msg #rx"superclass is missing a required field"]
-   ;; fails, missing super method for inherit
-   [tc-err (class (class object% (super-new)) (super-new) (inherit z))
-           #:ret (ret (-class))]
-   ;; fails, bad argument type to inherited method
-   [tc-err (class (class object% (super-new)
-                    (: m (Integer -> Integer))
-                    (define/public (m x) (add1 x)))
-             (super-new)
-             (inherit m)
-             (m "foo"))
-           #:ret (ret (-class #:method ([m (t:-> -Integer -Integer)])))]
-   ;; test that keyword methods type-check
-   ;; FIXME: send with keywords does not work yet
-   [tc-e (let ()
-           (: c% (Class [n (Integer #:foo Integer -> Integer)]))
-           (define c%
-             (class object%
-               (super-new)
-               (define/public (n x #:foo foo)
-                 (+ foo x))))
-           (void))
-         -Void]
-   ;; test instance subtyping
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (: x (U False Number))
-               (field [x 0])))
-           (: x (Instance (Class)))
-           (define x (new c%))
-           (void))
-         -Void]
-   ;; failing instance subtyping
-   [tc-err (let ()
-             (define x (new (class object% (super-new) (define/public (m) "m"))))
-             (ann x (Object [n (-> String)]))
-             (error "foo"))
-           #:msg #rx"expected: .*n.*given:.*m.*"]
-   ;; test use of `this` in field default
-   [tc-e (let ()
-           (class object%
-             (super-new)
-             (: x Integer)
-             (field [x 0])
-             (: y Integer)
-             (field [y (get-field x this)]))
-           (void))
-         -Void]
-   ;; test super calls
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (: m (String -> String))
-               (define/public (m x) "a")))
-           (define d%
-             (class c%
-               (super-new)
-               (define/override (m x)
-                 (string-append "x" (super m "b")))))
-           (send (new d%) m "c"))
-         -String]
-   ;; test super calls at top-level
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (: m (Integer -> Integer))
-               (define/public (m x) 0)))
-           (define d%
-             (class c%
-               (super-new)
-               (super m 5)
-               (define/override (m x) 5)))
-           (void))
-         -Void]
-   ;; fails, bad super call argument
-   [tc-err (let ()
-             (define c%
-               (class object%
-                 (super-new)
-                 (: m (Integer -> Integer))
-                 (define/public (m x) 0)))
-             (define d%
-               (class c%
-                 (super-new)
-                 (super m "foo")
-                 (define/override (m x) 5))))]
-
-   ;; test different internal/external names
-   [tc-e (let ()
-           (define c% (class object% (super-new)
-                        (public [m n])
-                        (define m (lambda () 0))))
-           (send (new c%) n)
-           (void))
-         -Void]
-   ;; test local calls with internal/external
-   [tc-e (let ()
-           (define c% (class object% (super-new)
-                        (: m (-> String))
-                        (public [m n])
-                        (define m (lambda () "a"))
-                        (: z (-> String))
-                        (define/public (z) (m))))
-           (send (new c%) z))
-         -String]
-   ;; internal/external the same is ok
-   [tc-e (let ()
-           (define c% (class object% (super-new)
-                        (public [m m])
-                        (define m (lambda () "a"))))
-           (send (new c%) m))
-         #:ret (ret -String -true-filter)]
-   ;; fails, internal name not accessible
-   [tc-err (let ()
-             (define c% (class object% (super-new)
-                          (public [m n])
-                          (define m (lambda () 0))))
-             (send (new c%) m))]
-   ;; test internal/external with expected
-   [tc-e (let ()
-           (: c% (Class [n (-> String)]))
-           (define c% (class object% (super-new)
-                        (public [m n])
-                        (define m (lambda () "a"))))
-           (send (new c%) n))
-         -String]
-   ;; test internal/external field
-   [tc-e (let ()
-           (define c% (class object% (super-new)
-                        (: f String)
-                        (field ([f g] "a"))))
-           (get-field g (new c%)))
-         -String]
-   ;; fail, internal name not accessible
-   [tc-err (let ()
-             (define c% (class object% (super-new)
-                          (: f String)
-                          (field ([f g] "a"))))
-             (get-field f (new c%)))]
-   ;; test internal/external init
-   [tc-e (let ()
-           (define c% (class object% (super-new)
-                        (: i String)
-                        (init ([i j]))))
-           (new c% [j "a"])
-           (void))
-         -Void]
-   ;; fails, internal name not accessible
-   [tc-err (let ()
-             (define c% (class object% (super-new)
-                          (: i Integer)
-                          (init ([i j]))))
-             (new c% [i 5]))
-           #:ret (ret (-object #:init ([j -Integer #f])))]
-   ;; test that different internal names can map to the same external name
-   ;; and that the internal-external name mapping is set correctly.
-   [tc-e (class object%
-           (super-new)
-           (: x* String)
-           (init [(x* x)])
-           (field [x "x"]))
-         (-class #:init ([x -String #f]) #:field ([x Univ]))]
-   ;; test init default values
-   [tc-e (let ()
-           (class object% (super-new)
-             (: z Integer)
-             (init [z 0]))
-           (void))
-         -Void]
-   ;; fails, bad default init value
-   [tc-err (class object% (super-new)
-             (: z Integer)
-             (init [z "foo"]))
-           #:ret (ret (-class #:init ([z -Integer #t])))
-           #:msg #rx"expected: Integer.*given: String"]
-   ;; test init field default value
-   [tc-e (let ()
-           (define c% (class object% (super-new)
-                 (: x Integer)
-                 (init-field ([x y] 0))))
-           (void))
-         -Void]
-   ;; fails, wrong init-field default
-   [tc-err (class object% (super-new)
-             (: x Integer)
-             (init-field ([x y] "foo")))
-           #:ret (ret (-class #:init ([y -Integer #t]) #:field ([y -Integer])))]
-   ;; test type-checking method with internal/external
-   [tc-err (let ()
-             (: c% (Class [n (Integer -> Integer)]))
-             (define c% (class object% (super-new)
-                          (public [m n])
-                          (define m (lambda () 0)))))]
-   ;; test type-checking without expected class type
-   [tc-e (let ()
-           (define c% (class object% (super-new)
-                        (: m (String -> String))
-                        (define/public (m x) "a")))
-           (send (new c%) m "b"))
-         -String]
-   ;; fails, because the local call type is unknown
-   ;; and is assumed to be Any
-   [tc-err (class object% (super-new)
-             (define/public (m) (n))
-             (define/public (n x) 0))
-           #:ret (ret (-class #:method ([m (t:-> -Bottom)] [n (t:-> Univ -Zero : -true-filter)])))
-           #:msg #rx"since it is not a function type"]
-   ;; test type-checking for classes without any
-   ;; internal type annotations on methods
-   [tc-e (let ()
-           (define c% (class object% (super-new)
-                        (define/public (m) "a")))
-           (send (new c%) m))
-         #:ret (ret -String -true-filter)]
-   ;; test inheritance without expected
-   [tc-e (let ()
-           (define c% (class (class object% (super-new)
-                               (: m (-> String))
-                               (define/public (m) "a"))
-                        (super-new)
-                        (: n (-> String))
-                        (define/public (n) "b")))
-           (send (new c%) m)
-           (send (new c%) n))
-         -String]
-   ;; test fields without expected class type
-   [tc-e (let ()
-           (define c% (class object% (super-new)
-                        (: x String)
-                        (field [x "a"])))
-           (get-field x (new c%)))
-         -String]
-   ;; row polymorphism, basic example with instantiation
-   [tc-e (let ()
-           (: f (All (A #:row (field x))
-                  ((Class #:row-var A)
-                   ->
-                   (Class #:row-var A (field [x Integer])))))
-           (define (f cls)
-             (class cls (super-new)
-               (field [x 5])))
-           (inst f #:row (field [y Integer]))
-           (void))
-         -Void]
-   ;; fails, because the instantiation uses a field that
-   ;; is supposed to be absent via the row constraint
-   [tc-err (let ()
-             (: f (All (A #:row (field x))
-                    ((Class #:row-var A)
-                     ->
-                     (Class #:row-var A (field [x Integer])))))
-             (define (f cls)
-               (class cls (super-new)
-                 (field [x 5])))
-             (inst f #:row (field [x Integer])))
-           #:ret (ret (t:-> (-class 
-                              #:row (make-Row null `([x ,-Integer]) null null #f))
-                            (-class
-                              #:row (make-Row null `([x ,-Integer]) null null #f)
-                              #:field ([x -Integer])))
-                      -true-filter)]
-   ;; fails, mixin argument is missing required field
-   [tc-err (let ()
-             (: f (All (A #:row (field x))
-                    ((Class #:row-var A)
-                     ->
-                     (Class #:row-var A (field [x Integer])))))
-             (define (f cls)
-               (class cls (super-new)
-                 (field [x 5])))
-             (define instantiated
-               (inst f #:row (field [y Integer])))
-             (instantiated
-              (class object% (super-new))))
-           #:ret (ret (-class
-                        #:row (make-Row null (list (list 'y -Integer)) null null #f)
-                        #:field ([x -Integer])))]
-   ;; fails, the argument object lacks required fields (with inference)
-   [tc-err (let ()
-             (: mixin (All (r #:row)
-                         (-> (Class (field [x Any]) #:row-var r)
-                             (Class (field [x Any]) #:row-var r))))
-             (define (mixin cls) cls)
-             (mixin object%))
-           #:ret (ret (-class #:row (make-Row null null null null #f)
-                              #:field ([x Univ])))
-           #:msg (regexp-quote "expected: (Class (field (x Any)))")]
-   ;; mixin application succeeds
-   [tc-e (let ()
-           (: f (All (A #:row (field x))
-                  ((Class #:row-var A)
-                   ->
-                   (Class #:row-var A (field [x Integer])))))
-           (define (f cls)
-             (class cls (super-new)
-               (field [x 5])))
-           (define instantiated
-             (inst f #:row (field [y Integer])))
-           (instantiated
-            (class object% (super-new)
-              (: y Integer)
-              (field [y 0])))
-           (void))
-         -Void]
-   ;; Basic row constraint inference
-   [tc-e (let ()
-           (: f (All (A #:row) ; inferred
-                  ((Class #:row-var A)
-                   ->
-                   (Class #:row-var A (field [x Integer])))))
-           (define (f cls)
-             (class cls (super-new)
-               (field [x 5])))
-           (inst f #:row (field [y Integer]))
-           (void))
-         -Void]
-   ;; fails, inferred constraint and instantiation don't match
-   [tc-err (let ()
-             (: f (All (A #:row)
-                    ((Class #:row-var A)
-                     ->
-                     (Class #:row-var A (field [x Integer])))))
-             (define (f cls)
-               (class cls (super-new)
-                 (field [x 5])))
-             (inst f #:row (field [x Integer])))
-           #:ret (ret (t:-> (-class 
-                              #:row (make-Row null `([x ,-Integer]) null null #f))
-                            (-class
-                              #:row (make-Row null `([x ,-Integer]) null null #f)
-                              #:field ([x -Integer])))
-                      -true-filter)]
-   ;; test bad manipulation of rows for inheritance
-   [tc-e (let ()
-           (: c% (Class (init [x String] [y String])))
-           (define c% (class object% (super-new) (init x y)))
-           (: f (All (r #:row) (-> (Class #:row-var r) (Class #:row-var r))))
-           (define (f x) x)
-           ;; should have the same type as c%
-           (define c2% (f c%))
-           (: d% (Class (init [y String])))
-           ;; should be the same as inheriting from c%
-           (define d% (class c2% (super-new [x "foo"])))
-           (void))
-         -Void]
-   ;; Check simple use of pubment
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (: m : String -> String)
-               (define/pubment (m x) "a")))
-           (send (new c%) m "b"))
-         -String]
-   ;; Local calls to pubment method
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (: m : String -> String)
-               (define/pubment (m x) "a")
-               (: n (-> String))
-               (define/public (n) (m "b"))))
-           (send (new c%) n))
-         -String]
-   ;; Inheritance with augment
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (: m : String -> String)
-               (define/pubment (m x) "a")))
-           (define d%
-             (class c%
-               (super-new)
-               (define/augment (m x) (string-append x "b"))))
-           (send (new c%) m "c"))
-         -String]
-   ;; Pubment with inner
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (: m : String -> String)
-               (define/pubment (m x)
-                 (inner "a" m x))))
-           (define d%
-             (class c%
-               (super-new)
-               (define/augment (m x)
-                 (string-append "foo" x))))
-           (send (new c%) m "b"))
-         -String]
-   ;; make sure augment type is reflected in class type
-   [tc-e (let ()
-           (: c% (Class (augment [m (String -> Integer)])
-                        [m (Integer -> Integer)]))
-           (define c%
-             (class object% (super-new)
-               (: m (Integer -> Integer)
-                  #:augment (String -> Integer))
-               (define/pubment (m x) x)))
-           (void))
-         -Void]
-   ;; pubment with different augment type
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (: m (Symbol -> Symbol)
-                  #:augment (String -> String))
-               (define/pubment (m x)
-                 (inner "" m "foo") 'a)))
-           (define d%
-             (class c%
-               (super-new)
-               (define/augment (m x)
-                 (string-append x "bar"))))
-           (send (new c%) m 'b))
-         -Symbol]
-   ;; fail, bad inner argument
-   [tc-err (let ()
-             (define c%
-               (class object%
-                 (super-new)
-                 (: m (Symbol -> Symbol)
-                    #:augment (String -> String))
-                 (define/pubment (m x)
-                   (inner "" m x) 'a)))
-             (define d%
-               (class c%
-                 (super-new)
-                 (define/augment (m x)
-                   (string-append x "bar"))))
-             (send (new c%) m 'b))
-           #:ret (ret -Symbol)
-           #:msg #rx"expected: String.*given: Symbol"]
-   ;; Fail, bad inner default
-   [tc-err (class object%
-             (super-new)
-             (: m (Symbol -> Symbol))
-             (define/pubment (m x)
-               (inner "foo" m x)))
-           #:ret (ret (-class #:method ([m (t:-> -Symbol -Symbol)])
-                              #:augment ([m (t:-> -Symbol -Symbol)])))
-           #:msg #rx"expected: Symbol.*given: String"]
-   ;; Fail, wrong number of arguments to inner
-   [tc-err (class object%
-             (super-new)
-             (: m (Integer -> Integer))
-             (define/pubment (m x)
-               (inner 3 m)))
-           #:ret (ret (-class #:method ([m (t:-> -Integer -Integer)])
-                              #:augment ([m (t:-> -Integer -Integer)])))
-           #:msg #rx"wrong number of arguments provided.*expected: 2"]
-   ;; Fail, bad augment type
-   [tc-err (let ()
-             (define c%
-               (class object%
-                 (super-new)
-                 (: m (Symbol -> Symbol))
-                 (define/pubment (m x)
-                   (inner 'a m x))))
-             (define d%
-               (class c%
-                 (super-new)
-                 (define/augment (m x) "bad type")))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"expected: Symbol.*given: String"]
-   ;; Fail, cannot augment non-augmentable method
-   [tc-err (let ()
-             (define c%
-               (class object%
-                 (super-new)
-                 (: m (Integer -> Integer))
-                 (define/public (m x) 0)))
-             (define d%
-               (class c%
-                 (super-new)
-                 (define/augment (m x) 1)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"superclass is missing a required augmentable method"]
-   ;; Pubment with separate internal/external names
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (: n (Symbol -> Symbol))
-               (pubment [n m])
-               (define n (λ (x) 'a))))
-           (send (new c%) m 'b))
-         -Symbol]
-   ;; Pubment with expected class type
-   [tc-e (let ()
-           (: c% (Class [m (String -> String)]
-                        (augment [m (String -> String)])))
-           (define c%
-             (class object%
-               (super-new)
-               (define/pubment (m x) "a")))
-           (send (new c%) m "b"))
-         -String]
-   ;; fails, expected type not a class
-   [tc-err (let ()
-             (: c% String)
-             (define c%
-               (class object%
-                 (super-new)
-                 (: x Symbol)
-                 (init-field x)))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"expected: String"]
-   ;; test polymorphic class
-   [tc-e (let ()
-           (: c% (All (A) (Class (init-field [x A]))))
-           (define c%
-             (class object%
-               (super-new)
-               (init-field x)))
-           (new (inst c% Integer) [x 0])
-           (void))
-         -Void]
-   ;; fails due to ill-typed polymorphic class body
-   [tc-err (let ()
-             (: c% (All (A) (Class (init-field [x A]))))
-             (define c%
-               (class object%
-                 (super-new)
-                 (init-field x)
-                 (set! x "a")))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"expected: A.*given: String"]
-   ;; test polymorphism with keyword
-   [tc-e (let ()
-           (define point%
-             (class object%
-               #:∀ (X)
-               (super-new)
-               (init-field [x : X] [y : X])))
-           (new (inst point% Integer) [x 0] [y 5])
-           (new (inst point% String) [x "foo"] [y "bar"])
-           (void))
-         -Void]
-   ;; test polymorphism with two type parameters
-   [tc-e (let ()
-           (define point%
-             (class object%
-               #:forall (X Y)
-               (super-new)
-               (init-field [x : X] [y : Y])))
-           (new (inst point% Integer String) [x 0] [y "foo"])
-           (new (inst point% String Integer) [x "foo"] [y 3])
-           (void))
-         -Void]
-   ;; test class polymorphism with method
-   [tc-e (let ()
-           (define id%
-             (class object%
-               #:forall (X)
-               (super-new)
-               (: m (X -> X))
-               (define/public (m x) x)))
-           (send (new (inst id% String)) m "a"))
-         -String]
-   ;; fails because m is not parametric
-   [tc-err (class object%
-             #:forall (X)
-             (super-new)
-             (: m (X -> X))
-             (define/public (m x) "a"))
-           #:ret (ret (-poly (X) (-class #:method ([m (t:-> X X)]))))
-           #:msg #rx"expected: X.*given: String"]
-   ;; fails because default init value cannot be polymorphic
-   [tc-err (class object%
-             #:forall (Z)
-             (super-new)
-             (init-field [x : Z] [y : Z 0]))
-           #:ret (ret (-poly (Z) (-class #:init-field ([x Z #f] [y Z #t]))))
-           #:msg #rx"expected: Z.*given: Zero"]
-   ;; fails because default field value cannot be polymorphic
-   [tc-err (class object%
-             #:forall (Z)
-             (super-new)
-             (field [x : Z "a"]))
-           #:ret (ret (-poly (Z) (-class #:field ([x Z]))))
-           #:msg #rx"expected: Z.*given: String"]
-   ;; test in-clause type annotations (next several tests)
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (field [x : String "a"])))
-           (string-append "b" (get-field x (new c%))))
-         -String]
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (init-field [x : String "a"])))
-           (string-append "c" (get-field x (new c% [x "b"]))))
-         -String]
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (public [m : (String -> String)])
-               (define (m x) (string-append x "foo"))))
-           (send (new c%) m "bar"))
-         -String]
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (private [m : (String -> String)])
-               (define (m x) (string-append x "foo"))))
-           (void))
-         -Void]
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (field [(x y) : String "a"])))
-           (string-append "foo" (get-field y (new c%))))
-         -String]
-   ;; fails, duplicate type annotation
-   [tc-err (class object%
-             (super-new)
-             (: x String)
-             (field [x : Symbol 0]))
-           #:ret (ret (-class #:field ([x -String])))
-           #:msg #rx"duplicate type annotation.*new type: Symbol"]
-   ;; fails, expected type and annotation don't match
-   [tc-err (let ()
-             (: c% (Class (field [x String])))
-             (define c% (class object% (super-new)
-                          (field [x : Symbol 'a])))
-             (void))
-           #:ret (ret -Void)
-           #:msg #rx"expected: \\(Class \\(field \\(x String"]
-   ;; fails, but make sure it's not an internal error
-   [tc-err (class object% (super-new)
-             (define/pubment (foo x) 0)
-             (define/public (g x) (foo 3)))
-           #:ret (ret (-class #:method ([g (t:-> Univ -Bottom)]
-                                        [foo (t:-> Univ -Zero : -true-filter)])
-                              #:augment ([foo top-func])))
-           #:msg #rx"Cannot apply expression of type Any"]
-   ;; the next several tests are for positional init arguments
-   [tc-e (let ()
-           (define c% (class object% (super-new) (init a b)))
-           (new c% [a "a"] [b "b"])
-           (make-object c% "a" "b")
-           (instantiate c% ("a") [b "b"])
-           (void))
-         -Void]
-   [tc-e (let ()
-           (define c% (class object% (super-new) (init a [b 'b])))
-           (new c% [a "a"] [b "b"])
-           (new c% [a "a"])
-           (make-object c% "a")
-           (make-object c% "a" "b")
-           (instantiate c% () [a "a"] [b "b"])
-           (instantiate c% ("a") [b "b"])
-           (instantiate c% ("a" "b"))
-           (void))
-         -Void]
-   [tc-e (let ()
-           (define c% (class (class object%
-                               (super-new)
-                               (init [b 'b]))
-                        (super-new) (init [a 'a])))
-           (new c% [a "a"] [b "b"])
-           (new c% [b "b"])
-           (new c% [a "a"])
-           (make-object c% "a")
-           (make-object c% "a" "b")
-           (instantiate c% () [a "a"] [b "b"])
-           (instantiate c% ("a") [b "b"])
-           (instantiate c% ("a" "b"))
-           (void))
-         -Void]
-   [tc-e (let ()
-           (define c% (class object%
-                        (super-new)
-                        (init-rest [rst : (List String String)])))
-           (make-object c% "a" "b")
-           (void))
-         -Void]
-   [tc-e (let ()
-           (define c% (class object%
-                        (super-new)
-                        (init [a : Symbol])
-                        (init-rest [rst : (List String String)])))
-           (make-object c% 'a "b" "c")
-           (void))
-         -Void]
-   [tc-e (let ()
-           (define c% (class object%
-                        (super-new)
-                        (init-rest [rst : (U (List Symbol)
-                                             (List String String))])))
-           (make-object c% "b" "c")
-           (make-object c% 'a)
-           (void))
-         -Void]
-   [tc-err (let ()
-             (define c% (class object%
-                          (super-new)
-                          (init-rest [rst : (List Symbol)])))
-             (make-object c% "wrong"))
-           #:ret (ret (make-Instance (make-Class #f null null null null (-Tuple (list -Symbol)))))
-           #:msg #rx"expected: \\(List Symbol.*given: \\(List String"]
-   ;; PR 14408, test init-field order
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (init-field [x : String] [y : Symbol])))
-           (make-object c% "str" 'sym)
-           (void))
-         -Void]
-   ;; a variant of the last, but testing that init and init-field
-   ;; interleave correctly in the class type
-   [tc-e (let ()
-           (define c%
-             (class object%
-               (super-new)
-               (init [a : 'a]) (init-field [x : 'x] [y : 'y]) (init [b 'b])))
-           (make-object c% 'a 'x 'y 'b)
-           (void))
-         -Void]
-   ;; fail, too many positional arguments to superclass
-   [tc-err (class object% (super-make-object "foo"))
-           #:ret (ret (-class))
-           #:msg #rx"too many positional init arguments"]
-   ;; check that case-lambda methods work
-   [tc-e (let ()
-           (class object%
-             (super-new)
-             (field [y : Integer 0])
-             (: m (case-> (Any -> Integer)))
-             (public m)
-             (define m (case-lambda [(x) y])))
-           (define c%
-             (class object%
-               (super-new)
-               (: m (case-> (Any -> Void)))
-               (public m)
-               (define m (case-lambda [(x) (void)]))))
-           (send (new c%) m 'anything))
-         -Void]
-   ;; fails, test that case-lambda bodies are checked
-   [tc-err (class object%
-             (super-new)
-             (: m (case-> (Any -> Integer)))
-             (public m)
-             (define m (case-lambda [(x) "bad"])))
-           #:ret (ret (-class #:method [(m (t:-> Univ -Integer))]))
-           #:msg #rx"expected: Integer.*given: String"]
-   ;; test that rest args work
-   [tc-e (let ()
-           (class object% (super-new)
-             (: m (-> Integer * Integer))
-             (define/public (m . xs) (apply + xs)))
-           (void))
-         -Void]
-   ;; test that Name types are ok with get-field and as an
-   ;; expected type for class type-checking
-   [tc-e (let ()
-           (define-type-alias Foo%
-             (Class (init-field [x String])
-                                [m (-> (Instance Foo%) String)]))
-           (: foo% Foo%)
-           (define foo%
-             (class object% (super-new)
-               (init-field x)
-               (define/public (m a-foo) (get-field x a-foo))))
-           (void))
-         -Void]
-   ;; test that filters are correctly handled for polymorphic classes
-   [tc-e (let ()
-           (class object%
-             (super-new)
-             (init x)))
-         #:ret (ret (-poly (A) (-class #:init ([x A #f]))))
-         #:expected (ret (-poly (A) (-class #:init ([x A #f]))) -no-filter -no-obj)]
-   ;; test uses of a macro in the body of the class
-   [tc-e
-    (let ()
-      (define c%
-        (class object%
-          (super-new)
-          (define-syntax-rule (my-meth (m arg ...) . body)
-            (define/public (m arg ...) . body))
-          (my-meth (hello) (displayln "hello world"))))
-      (send (new c%) hello))
-    -Void]
-   ;; the next few tests check failing class instantiation
-   [tc-err (make-object object% 1)
-           #:msg #rx"expected: 0 arguments.*given: 1 arguments"]
-   [tc-err (make-object (ann object% ClassTop))
-           #:msg #rx"cannot instantiate.*ClassTop"]
-   [tc-err (make-object 3)
-           #:msg #rx"value of a non-class type"]
-   ;; PR 14726
-   ;; test opt-arg but non-keyword method
-   [tc-e (let ()
-           (define-type-alias A%
-             (Class [foo (->* [Integer] Void)]))
-           (: a% A%)
-           (define a%
-             (class object%
-               (super-new)
-               (define/public (foo [i #f]) (void))))
-           (new a%))
-         (-object #:method ([foo (t:-> -Integer -Void)]))]
-   [tc-e (let ()
-           (define-type-alias A%
-             (Class [foo (->* [] [Integer] Void)]))
-           (: a% A%)
-           (define a%
-             (class object%
-               (super-new)
-               (define/public (foo [i #f]) (void))))
-           (new a%))
-         (-object #:method ([foo (cl->* (t:-> -Void) (t:-> -Integer -Void))]))]
-   ;; PR 14810 - make sure inner type mapping has the right order
-   [tc-e (let ()
-           (define-type-alias Foo%
-             (Class [m (-> Any Symbol)]
-                    [o (-> Any Any Symbol)]
-                    (augment [m (-> Any Symbol)]
-                             [o (-> Any Any Symbol)])))
-           (define-type-alias Bar% (Class #:implements Foo%))
-           (: foo% Foo%)
-           (define foo%
-             (class object%
-               (super-new)
-               (define/pubment (m x) 'foo-m)
-               (define/pubment (o x y) 'foo-o)))
-           (: bar% Bar%)
-           (define bar%
-             (class foo%
-               (super-new)
-               (define/augment (m x) (inner 'bar-m m x))
-               (define/augment (o x y) (inner 'bar-o o x y))))
-           (void))
-         -Void]
-   ;; Test implements clauses
-   [tc-e (let ()
-           (define-type-alias A% (Class [foo (-> Void)]))
-           (define-type-alias B% (Class #:implements A% [bar (-> Void)]))
-           (: b% B%)
-           (define b% (class object%
-                        (super-new)
-                        (define/public (foo) (void))
-                        (define/public (bar) (void))))
-           (new b%))
-         (-object #:method ([foo (t:-> -Void)] [bar (t:-> -Void)]))]
-   [tc-err (let ()
-             (define-type-alias A% (Class [foo (-> Void)]))
-             (define-type-alias B% (Class #:implements A% [bar (-> Void)]))
-             (: b% B%)
-             (define b% (class object%
-                          (super-new)
-                          (define/public (bar) (void))))
-             (error "foo"))
-           #:msg "type mismatch.*required public method"]
-   [tc-e (let ()
-           (define-type-alias A% (Class (init [y Symbol])))
-           (define-type-alias B% (Class #:implements/inits A% (init [x String])))
-           (: b% B%)
-           (define b% (class object%
-                        (super-new)
-                        (init x y)))
-           (make-object b% "foo" 'bar)
-           (void))
-        -Void]
-   [tc-e (let ()
-           (define-type-alias A% (Class (init [y Symbol])))
-           (define-type-alias B% (Class [m (-> Void)]))
-           (define-type-alias C% (Class #:implements/inits A%
-                                        #:implements B%
-                                        (init [x String])))
-           (: c% C%)
-           (define c% (class object%
-                        (super-new)
-                        (define/public (m) (void))
-                        (init x y)))
-           (make-object c% "foo" 'bar)
-           (void))
-        -Void]
-   [tc-err (let ()
-             (define-type-alias A% (Class (init [y String])))
-             (define-type-alias B% (Class #:implements/inits A%
-                                          #:implements/inits A%))
-             (error "foo"))
-           ;; FIXME: this error message is pretty bad
-           #:msg "expected Class type clause"]
-   [tc-err (let ()
-             (define-type-alias A% (Class (init [y String])))
-             (define-type-alias B% (Class #:implements/inits A% (init [x String])))
-             (: b% B%)
-             (define b% (class object%
-                          (super-new)
-                          (init y x)))
-             (error "foo"))
-           #:msg "type mismatch"]
-   ;; PR 14669 (next two)
-   [tc-e (let ()
-           (define-type-alias A (Class [m (-> Any)]))
-           (define-type-alias B (Class #:implements A [m (-> Void)]))
-           (define-type-alias C (Class #:implements A))
-           (define-type-alias D (Class #:implements C #:implements B))
-           (: d% D)
-           (define d% (class object% (super-new) (define/public (m) (void))))
-           (send (new d%) m))
-         -Void]
-   [tc-e (let ()
-           (define-type-alias A (Class [m (-> Any)]))
-           (define-type-alias B (Class #:implements A [m (-> Void)]))
-           (define-type-alias C (Class #:implements A))
-           (define-type-alias D (Class #:implements B #:implements C))
-           (: d% D)
-           (define d% (class object% (super-new) (define/public (m) (void))))
-           (send (new d%) m))
-         Univ]
-   ;; Test for an infinite loop bug during subtyping for classes
-   [tc-e (let ()
-           (define-type-alias A% (Class [get-this (-> (Instance A%))]))
-           (define-type-alias B% (Class [get-this (-> (Instance B%))]))
-           (: a% A%)
-           (define a%
-             (class object%
-               (super-new)
-               (define/public (get-this) this)))
-           (: b% B%)
-           (define b%
-             (class a%
-               (super-new)
-               (define/override (get-this) this)))
-           (void))
-         -Void]
-   ;; Test that depth subtyping is accounted for with overriden methods
-   [tc-e (let ()
-           (define-type-alias B% (Class [n (-> Real)]))
-           (: b% B%)
-           (define b%
-             (class object%
-               (super-new)
-               (define/public (n) 123.456)))
-           (define-type-alias C% (Class #:implements B% [n (-> Integer)]))
-           (: c% C%)
-           (define c%
-             (class b%
-               (super-new)
-               (override* [n (lambda () 5)])))
-           (send (new c%) n))
-         -Integer]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/class-util-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/class-util-tests.rkt
deleted file mode 100644
index 985e0eec52..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/class-util-tests.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-
-;; Tests for utilities and helpers for the internals of
-;; class type-checking, parsing, etc.
-
-(require (except-in "test-utils.rkt" private)
-         racket/class
-         rackunit
-         syntax/id-table
-         syntax/parse
-         syntax/stx
-         ;; phase-shift down for use in tests below
-         (for-template (submod typed-racket/base-env/class-prims internal)
-                       (submod typed-racket/base-env/class-clauses internal)
-                       (only-in typed-racket/base-env/class-clauses
-                                class-clause clause init-clause)))
-
-(provide tests)
-(gen-test-main)
-
-;; equal? check but considers id & stx pair equality for the
-;; specific test cases that appear here (it's not a general check)
-(define (equal?/id x y)
-  (cond [(and (identifier? x) (identifier? y))
-         (free-identifier=? x y)]
-        [(and (syntax? x) (syntax? y))
-         (and (identifier? (stx-car x))
-              (identifier? (stx-car y))
-              (free-identifier=? (stx-car x) (stx-car y))
-              (free-identifier=? (stx-car (stx-cdr x))
-                                 (stx-car (stx-cdr y))))]
-        [else (equal?/recur x y equal?/id)]))
-
-;; utility macro for checking if a syntax matches a
-;; given syntax class
-(define-syntax-rule (syntax-parses? stx syntax-class)
-  (syntax-parse stx
-    [(~var _ syntax-class) #t]
-    [_ #f]))
-
-;; for rackunit with equal?/id
-(define-binary-check (check-equal?/id equal?/id actual expected))
-
-(define tests
-  (test-suite "Class utility tests"
-    (check-true (syntax-parses? #'x init-decl))
-    (check-true (syntax-parses? #'([x y]) init-decl))
-    (check-true (syntax-parses? #'(x 0) init-decl))
-    (check-true (syntax-parses? #'([x y] 0) init-decl))
-
-    (check-equal?/id
-     (get-optional-inits
-      (list (init-clause #'(init [x 0]) #'init #'([x x])
-                         (list #f) (list #t))
-            (init-clause #'(init [(a b)]) #'init #'([a b])
-                         (list #f) (list #f))))
-     (list #'x))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/contract-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/contract-tests.rkt
deleted file mode 100644
index a9a426c7dd..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/contract-tests.rkt
+++ /dev/null
@@ -1,255 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt"
-         (for-syntax racket/base
-                     syntax/parse)
-         (for-template racket/base)
-         (private type-contract)
-         (rep type-rep)
-         (types abbrev numeric-tower union)
-         (static-contracts combinators optimize)
-         (submod typed-racket/private/type-contract numeric-contracts)
-         (submod typed-racket/private/type-contract test-exports)
-         (only-in racket/contract contract)
-         racket/match
-         rackunit)
-(provide tests)
-(gen-test-main)
-
-
-(define-syntax-rule (t e)
-  (test-case (format "~a" 'e)
-    (let ((v e))
-      (with-check-info (('type v))
-        (type->contract
-          e
-          (λ (#:reason [reason #f])
-            (fail-check (or reason "Type could not be converted to contract"))))))))
-
-(define-syntax-rule (t-sc e-t e-sc)
-  (test-case (format "~a" '(e-t -> e-sc))
-    (let ([t e-t] [sc e-sc])
-      (with-check-info (['type t] ['expected sc])
-        (define actual
-          (optimize
-            (type->static-contract
-              t
-              (λ (#:reason [reason #f])
-                (fail-check (or reason "Type could not be converted to contract"))))))
-        (with-check-info (['actual actual])
-          (unless (equal? actual sc)
-            (fail-check "Static contract didn't match expected")))))))
-
-
-(define-syntax-rule (t/fail e expected-reason)
-  (test-case (format "~a" 'e)
-   (let ((v e))
-     (with-check-info (('expected expected-reason)
-                       ('type v))
-       (define reason
-         (let/ec exit
-           (let ([contract (type->contract v (λ (#:reason [reason #f])
-                                                (exit (or reason "No reason given"))))])
-             (with-check-info (('contract (syntax->datum contract)))
-               (fail-check "type could be converted to contract")))))
-       (unless (regexp-match? expected-reason reason)
-         (with-check-info (('reason reason))
-           (fail-check "Reason didn't match expected.")))))))
-
-;; construct a namespace for use in typed-untyped interaction tests
-(define (ctc-namespace)
-  (parameterize ([current-namespace (make-base-namespace)])
-    (namespace-require 'racket/contract)
-    (namespace-require 'unstable/contract)
-    (namespace-require 'typed-racket/utils/any-wrap)
-    (namespace-require 'typed-racket/utils/evt-contract)
-    (namespace-require '(submod typed-racket/private/type-contract predicates))
-    (current-namespace)))
-
-;; (t-int type (-> any any) any)
-;; Use #:typed (default) to simulate typed export,
-;; #:untyped for untyped export.
-(define-syntax-rule (t-int arg ...)
-  (t-int/check arg ... check-not-exn))
-
-(define (check-re re)
-  (λ (thunk)
-    (check-exn
-     (λ (e)
-       (and (exn:fail? e)
-            (regexp-match? re (exn-message e))))
-     thunk)))
-
-;; (t-int/fail type (-> any any) any #:msg regexp)
-;; Like t-int, but checks failing cases. Takes a regexp for checking
-;; the exception message.
-(define-syntax-rule (t-int/fail arg ... #:msg re)
-  (t-int/check arg ... (check-re re)))
-
-;; tests typed-untyped interaction
-(define-syntax (t-int/check stx)
-  (syntax-parse stx
-    [(_ type-expr fun-expr val-expr
-        (~or (~and (~or (~seq) (~seq #:typed))
-                   (~bind [typed-side #'#t]))
-             (~and (~seq #:untyped)
-                   (~bind [typed-side #'#f])))
-        check)
-     (define pos (if (syntax-e #'typed-side) 'typed 'untyped))
-     (define neg (if (syntax-e #'typed-side) 'untyped 'typed))
-     #`(test-case (format "~a for ~a in ~a" 'type-expr 'val-expr 'fun-expr)
-         (let ([type-val type-expr] [fun-val fun-expr] [val val-expr])
-           (with-check-info (['type type-val] ['test-value val])
-             (define ctc-result
-               (type->contract type-val
-                               #:typed-side typed-side
-                               (λ (#:reason [reason #f])
-                                 (fail-check (or reason "Type could not be converted to contract")))))
-             (match-define (list extra-stxs ctc-stx) ctc-result)
-             (define ctced-val
-               (eval #`(let ()
-                         #,@(map (λ (stx) (syntax-shift-phase-level stx 1))
-                                 extra-stxs)
-                         (contract #,(syntax-shift-phase-level ctc-stx 1)
-                                   #,val
-                                   #,(quote (quote #,pos))
-                                   #,(quote (quote #,neg))))
-                     (ctc-namespace)))
-             (check (λ () (fun-val ctced-val))))))]))
-
-(define tests
-  (test-suite "Contract Tests"
-              (t (-Number . -> . -Number))
-              (t (-Promise -Number))
-              (t (-set Univ)) 
-              (t (make-pred-ty -Symbol))
-              (t (->key -Symbol #:key -Boolean #t Univ))
-              (t (make-Function
-                   (list (make-arr* (list Univ) -Boolean #:kws (list (make-Keyword '#:key Univ #t))
-                                    #:filters (-FS (-filter -Symbol 0) (-not-filter -Symbol 0))))))
-              (t (-struct #'struct-name #f (list (make-fld -Symbol #'acc #f))))
-              ;; Adapted from PR 13815
-              (t (-poly (a) (-> a a)))
-              (t (-poly (a) (-mu X (-> a X))))
-              (t (-poly (a) (-poly (b) (-> a a))))
-              (t (-poly (a) (-App (-poly (b) (-> a a)) (list -Number) #'#f)))
-
-              (t (-poly (a) -Flonum))
-              (t (-poly (a) (-set -Number)))
-              (t (-poly (a) (-lst a)))
-              (t (-poly (a) (-vec a)))
-              (t (-> (-poly (A B) (-> (Un A (-mu X (Un A (-lst X)))) (Un A (-mu X (Un A (-lst X))))))
-                     (-> -Symbol (-mu X (Un -Symbol (-lst X))))))
-
-              (t (-polydots (a) -Symbol))
-              (t (-polydots (a) (->... (list) (a a) -Symbol)))
-
-              (t (-mu x (-Syntax x)))
-              (t (-> (-> Univ -Bottom : -bot-filter) -Bottom : -bot-filter))
-              (t (-poly (A B) (-> A B (Un A B))))
-
-
-              (t/fail ((-poly (a) (-vec a)) . -> . -Symbol)
-                      "cannot generate contract for non-function polymorphic type")
-              (t/fail (-> (-poly (a b) (-> (Un a b) (Un a b))) Univ)
-                      "multiple parametric contracts are not supported")
-              (t/fail
-                (-> (-poly (A B) (-> (Un B (-mu X (Un A (-lst X)))) (Un B (-mu X (Un A (-lst X))))))
-                    (-> -Symbol (-mu X (Un -Symbol (-lst X)))))
-                "multiple parametric contracts are not supported")
-              (t/fail (-> (-polydots (a) (->... (list) (a a) -Symbol)) Univ)
-                      "cannot generate contract for variable arity polymorphic type")
-
-              (t/fail
-                (make-Function
-                  (list (make-arr* (list) -Boolean #:kws (list (make-Keyword '#:key Univ #f)))
-                    (make-arr* (list Univ) -Boolean #:kws (list (make-Keyword '#:key2 Univ #f)))))
-                "case function type with optional keyword arguments")
-              (t/fail (-> (make-pred-ty -Symbol)-Symbol)
-                      "function type with filters or objects")
-              (t/fail (cl->*
-                        (-> -Boolean -Boolean)
-                        (-> -Symbol -Symbol))
-                      "two cases of arity 1")
-              (t/fail (-struct #'struct-name #f (list (make-fld -Symbol #'acc #f)) (-> -Symbol))
-                      "procedural structs are not supported")
-              (t/fail (-Syntax (-> -Boolean -Boolean))
-                      "required a flat contract but generated a chaperone contract")
-              (t/fail (-Syntax (-seq -Boolean))
-                      "required a flat contract but generated an impersonator contract")
-              (t/fail (-set (-seq -Boolean))
-                      "required a chaperone contract but generated an impersonator contract")
-
-              (t/fail
-                (make-Function
-                  (list
-                    (make-arr* (list) -Boolean #:kws (list (make-Keyword '#:key Univ #t)))
-                    (make-arr* (list Univ Univ) -Boolean #:kws (list (make-Keyword '#:key2 Univ #t)))))
-                "case function type with optional keyword arguments")
-              (t/fail (-vec (-struct #'struct-name #f (list (make-fld (-seq -Symbol) #'acc #f)) #f #t))
-                      "required a chaperone contract but generated an impersonator contract")
-
-              (t-sc -Number number/sc)
-              (t-sc -Integer integer/sc)
-              (t-sc (-lst Univ) (listof/sc any-wrap/sc))
-              (t-sc (Un (-lst Univ) -Number) (or/sc number/sc (listof/sc any-wrap/sc)))
-
-              ;; classes
-              (t-sc (-class) (class/sc null #f))
-              (t-sc (-class #:init ([x -Number #f] [y -Number #f]))
-                    (class/sc (list (member-spec 'init 'x number/sc)
-                                    (member-spec 'init 'y number/sc))
-                              #f))
-              (t-sc (-class #:init ([x -Number #f] [y -Number #t]))
-                    (class/sc (list (member-spec 'init 'x number/sc)
-                                    (member-spec 'init 'y number/sc))
-                              #f))
-              (t-sc (-class #:init ([x -Number #f]) #:init-field ([y -Integer #f]))
-                    (class/sc (list (member-spec 'init 'x number/sc)
-                                    (member-spec 'init 'y integer/sc)
-                                    (member-spec 'field 'y integer/sc))
-                              #f))
-
-              ;; typed/untyped interaction tests
-              (t-int (-poly (a) (-> a a))
-                     (λ (f) (f 1))
-                     (λ (x) 1)
-                     #:typed)
-              (t-int/fail (-poly (a) (-> a a))
-                          (λ (f) (f 1))
-                          (λ (x) 1)
-                          #:untyped
-                          #:msg #rx"produced: 1.*blaming: untyped")
-              (t-int (cl->* (->* '() -String -String)
-                            (->* (list -Symbol) -Symbol -Symbol))
-                     (λ (f) (f "a" "b"))
-                     (case-lambda [xs (car xs)]
-                                  [(sym . xs) sym]))
-              (t-int (make-Evt -String)
-                     (λ (x) (channel-get x))
-                     (let ([ch (make-channel)])
-                       (thread (λ () (channel-put ch "ok")))
-                       ch)
-                     #:untyped)
-              (t-int/fail (make-Evt -String)
-                          (λ (x) (channel-get x))
-                          (let ([ch (make-channel)])
-                            (thread (λ () (channel-put ch 'bad)))
-                            ch)
-                          #:untyped
-                          #:msg #rx"promised: String.*produced: 'bad")
-              (t-int/fail (make-Evt (-> -String -String))
-                          (λ (x) ((sync x) 'bad))
-                          (let ([ch (make-channel)])
-                            (thread
-                             (λ ()
-                               (channel-put ch (λ (x) (string-append x "x")))))
-                            ch)
-                          #:typed
-                          #:msg #rx"expected: String.*given: 'bad")
-              (t-int/fail (make-Evt -String)
-                          (λ (x) (channel-put x "bad"))
-                          (make-channel)
-                          #:untyped
-                          #:msg #rx"cannot put on a channel")
-              ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/evaluator.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/evaluator.rkt
deleted file mode 100644
index dddb337569..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/evaluator.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/base
-;; Allow evaluation at phase1
-(require (for-syntax racket/base syntax/parse))
-(provide phase1-eval phase1-phase0-eval)
-
-(define-namespace-anchor anchor)
-(define namespace (namespace-anchor->empty-namespace anchor))
-
-;; See discussion of this function here:
-;; http://www.mail-archive.com/dev@racket-lang.org/msg10759.html
-;; http://lists.racket-lang.org/dev/archive/2014-May/014273.html
-(define (prep! varref)
-  (define p (variable-reference->resolved-module-path varref))
-  (when p
-    (parameterize ([current-namespace namespace])
-      (dynamic-require p 0))))
-
-
-(define-syntax phase1-phase0-run
-  (syntax-parser
-    [(_ form:expr ...)
-     #'(let-syntax ([go (lambda (stx) form ...)]) (go))]))
-
- (define-syntax phase1-phase0-eval
-   (syntax-parser
-     [(_ form:expr ...)
-      #'(begin
-          (prep! (#%variable-reference))
-          (eval-syntax (quote-syntax (phase1-phase0-run form ...)) namespace))]))
-
-  (define-syntax phase1-eval
-    (syntax-parser
-      [(_ form:expr ...)
-       #'(begin
-           (prep! (#%variable-reference))
-           (phase1-phase0-eval form ... #'(void)))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/filter-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/filter-tests.rkt
deleted file mode 100644
index 051a874d9f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/filter-tests.rkt
+++ /dev/null
@@ -1,148 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt"
-         rackunit racket/format
-         (rep filter-rep)
-         (types abbrev union filter-ops)
-         (for-syntax racket/base syntax/parse))
-
-(provide tests)
-(gen-test-main)
-
-(define (not-implied-atomic? x y) (not (implied-atomic? x y)))
-
-(define-syntax (test-opposite stx)
-  (define-syntax-class complementary
-     (pattern #:complementary #:with check #'check-true)
-     (pattern #:not-complementary #:with check #'check-false))
-  (define-syntax-class contradictory
-     (pattern #:contradictory #:with check #'check-true)
-     (pattern #:not-contradictory #:with check #'check-false))
-  (syntax-parse stx
-    [(_ comp:complementary contr:contradictory f1* f2*)
-     (syntax/loc stx
-       (test-case (~a '(opposite f1* f2*))
-         (define f1 f1*)
-         (define f2 f2*)
-         (comp.check (complementary? f1 f2) "Complementary")
-         (contr.check (contradictory? f1 f2) "Contradictory")))]))
-
-
-(define tests
-  (test-suite "Filters"
-    (test-suite "Opposite"
-      (test-opposite #:not-complementary #:contradictory
-        (-filter -Symbol 0)
-        (-not-filter (Un -Symbol -String) 0))
-
-      (test-opposite #:complementary #:not-contradictory
-        (-filter (Un -Symbol -String) 0)
-        (-not-filter -Symbol 0))
-
-      (test-opposite #:complementary #:contradictory
-        (-not-filter -Symbol 0)
-        (-filter -Symbol 0))
-
-      (test-opposite #:not-complementary #:not-contradictory
-        (-filter -Symbol 1)
-        (-not-filter -Symbol 0))
-
-      (test-opposite #:not-complementary #:not-contradictory
-        (-not-filter -Symbol 0)
-        (-filter -String 0))
-
-      (test-opposite #:not-complementary #:not-contradictory
-        (-not-filter -Symbol 0)
-        (-filter -String 0))
-
-      (test-opposite #:not-complementary #:contradictory
-        -bot
-        -bot)
-
-      (test-opposite #:not-complementary #:contradictory
-        -bot
-        -top)
-
-      (test-opposite #:complementary #:not-contradictory
-        -top
-        -top)
-
-    )
-
-    (test-suite "Implied Atomic"
-      (check implied-atomic?
-             -top -top)
-      (check implied-atomic?
-             -bot -bot)
-      (check implied-atomic?
-             -top -bot)
-      (check not-implied-atomic?
-             -bot -top)
-      (check implied-atomic?
-             -top (-filter -Symbol 0))
-      (check implied-atomic?
-             (-filter -Symbol 0) -bot)
-      (check implied-atomic?
-             (-filter (Un -String -Symbol) 0)
-             (-filter -Symbol 0))
-      (check not-implied-atomic?
-             (-filter -Symbol 0)
-             (-filter (Un -String -Symbol) 0))
-      (check implied-atomic?
-             (-not-filter -Symbol 0)
-             (-not-filter (Un -String -Symbol) 0))
-      (check not-implied-atomic?
-             (-not-filter (Un -String -Symbol) 0)
-             (-not-filter -Symbol 0))
-      (check not-implied-atomic?
-             (-filter -Symbol 1)
-             (-filter -Symbol 0))
-      (check implied-atomic?
-             (-filter -Symbol #'x)
-             (-filter -Symbol #'x))
-      (check implied-atomic?
-             (-or (-filter -Symbol 1) (-filter -Symbol #'x))
-             (-filter -Symbol #'x))
-      (check implied-atomic?
-             (-filter -Symbol #'x)
-             (-and (-filter -Symbol 1) (-filter -Symbol #'x)))
-      (check implied-atomic?
-             (-not-filter (-val #f) #'x)
-             (-filter -Symbol #'x))
-    )
-
-    (test-suite "Implication"
-      (check-equal? (-imp -bot (-filter -Symbol #'x)) -top)
-      (check-equal? (-imp -top (-filter -Symbol #'x)) (-filter -Symbol #'x))
-      (check-equal? (-imp (-filter -Symbol #'x) -top) -top)
-      (check-equal? (-imp (-filter -Symbol #'x) -bot) (-not-filter -Symbol #'x))
-      (check-equal? (-imp (-not-filter -Symbol #'x) -bot) (-filter -Symbol #'x))
-      (check-equal? (-imp (-imp (-not-filter -Symbol #'x) (-not-filter -Symbol #'y)) -bot)
-                    (-and (-not-filter -Symbol #'x) (-filter -Symbol #'y)))
-      (check-equal?
-        (-imp (-not-filter -Symbol #'x)
-              (-not-filter -Symbol #'y))
-        (make-ImpFilter (-not-filter -Symbol #'x)
-                        (-not-filter -Symbol #'y))))
-
-    (test-suite "Simplification"
-      (check-equal?
-        (-and (-filter -Symbol #'x) (-not-filter (-val #f) #'x))
-        (-filter -Symbol #'x))
-      (check-equal?
-        (-and (-not-filter (-val #f) #'x) (-filter -Symbol #'x))
-        (-filter -Symbol #'x))
-
-      (check-equal?
-        (-and (-filter (-val #f) #'y)
-              (-or (-filter (-val #f) #'y)
-                   (-filter (-val #f) #'x)))
-        (-filter (-val #f) #'y))
-
-      (check-equal?
-        (-and (-not-filter (-val #f) #'y)
-              (-or (-not-filter (-val #f) #'y)
-                   (-not-filter (-val #f) #'x)))
-        (-not-filter (-val #f) #'y)))
-
-  ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/generalize-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/generalize-tests.rkt
deleted file mode 100644
index 9eb2a3cdac..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/generalize-tests.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt"
-         racket/format
-         rackunit
-         (rep rep-utils)
-         (types generalize abbrev union)
-         (for-syntax racket/base syntax/parse))
-
-(provide tests)
-(gen-test-main)
-
-(define-syntax check-generalize
-  (syntax-parser
-    [(_ t*:expr exp*:expr)
-     #'(test-case (~a `(t* => exp*))
-         (define actual (generalize t*))
-         (define expected exp*)
-         (with-check-info (['actual actual]
-                           ['expected expected])
-           (unless (type-equal? actual expected)
-             (fail-check "Didn't generalize to expected type."))))]))
-
-
-(define tests
-  (test-suite "Generalize Tests"
-    (check-generalize -Null (-lst Univ))
-    (check-generalize
-      (-pair -Symbol (-lst -Symbol))
-      (-lst -Symbol))
-    (check-generalize
-      (-pair -Symbol (Un -Null (-pair -Symbol (-lst -Symbol))))
-      (-lst -Symbol))
-    ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt
deleted file mode 100644
index e394eb6de5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt
+++ /dev/null
@@ -1,293 +0,0 @@
-#lang racket/base
-(require
-  "test-utils.rkt"
-  rackunit
-  racket/list
-  (for-syntax racket/base syntax/parse)
-  syntax/location syntax/srcloc
-  (rep type-rep)
-  (r:infer infer promote-demote)
-
-  (types union substitute numeric-tower utils abbrev))
-
-(provide tests)
-(gen-test-main)
-
-(define-syntax-rule (fv-t ty elems ...)
-  (let ([ty* ty])
-    (test-check (format "~a" 'ty)
-                equal?
-                (fv ty*)
-                (list (quote elems) ...))))
-
-(begin-for-syntax
-  (define-splicing-syntax-class result
-    (pattern (~seq) #:with v #'#f #:with exp #'#f)
-    (pattern (~seq #:result [v:expr exp:expr])))
-  (define-splicing-syntax-class vars
-    (pattern (~seq) #:with vars #'empty)
-    (pattern (~seq #:vars vars:expr)))
-  (define-splicing-syntax-class indices
-    (pattern (~seq) #:with indices #'empty)
-    (pattern (~seq #:indices indices:expr)))
-  (define-splicing-syntax-class pass
-    (pattern (~seq) #:with pass #'#t)
-    (pattern #:pass #:with pass #'#t)
-    (pattern #:fail #:with pass #'#f)))
-
-(define-syntax (infer-t stx)
-  (syntax-parse stx
-    ([_ S:expr T:expr . rest]
-     (syntax/loc stx
-       (infer-l (list S) (list T) . rest)))))
-
-(define-syntax (infer-l stx)
-  (syntax-parse stx
-    ([_ S:expr T:expr :vars :indices R:result :pass]
-     (quasisyntax/loc stx
-       (test-case (format "~a ~a~a" S T (if pass "" " should fail"))
-         (with-check-info (['location (build-source-location-list (quote-srcloc #,stx))])
-           (define substitution (infer vars indices S T R.v))
-           (define result (and substitution R.v (subst-all substitution R.v)))
-           (cond
-             [pass
-               (unless substitution
-                 (fail-check "Could not infer a substitution"))
-               (when result
-                 (with-check-info (['actual result] ['expected R.exp])
-                   (unless (equal? result R.exp)
-                     (fail-check "Did not infer the expected result."))))]
-             [fail
-               (when substitution
-                 (fail-check "Inferred an unexpected substitution."))])))))))
-
-
-(define-syntax-rule (i2-t t1 t2 (a b) ...)
-  (test-equal? (format "~a ~a" t1 t2)
-               (infer (fv t1) null (list t2) (list t1) (-lst* (make-F a) ...) #f)
-               (make-immutable-hash (list (cons a (t-subst b)) ...))))
-
-(define-syntax-rule (i2-l t1 t2 fv (a b) ...)
-  (test-equal? (format "~a ~a" t2 t1)
-               (infer fv null t2 t1 (-lst* (make-F a) ...) #f)
-               (make-immutable-hash (list (cons a (t-subst b)) ...))))
-
-(define (f t1 t2) (infer (fv t1) null (list t1) (list t2) #f))
-
-(define-syntax-rule (i2-f t1 t2)
-  (infer-t t2 t1 #:vars (fv t2) #:fail))
-
-(define N -Number)
-(define B -Boolean)
-
-(define-syntax (pd-t stx)
-  (syntax-parse stx
-    ([_ S:expr (vars:id ...) D:expr P:expr]
-     (quasisyntax/loc stx
-       (test-case (format "~a => ~a < ~a < ~a" '(vars ...) 'D 'S 'P)
-         (define S-v S)
-         (define promoted (var-promote S-v '(vars ...)))
-         (define demoted (var-demote S-v '(vars ...)))
-         #,(syntax/loc stx
-             (check-equal? promoted P "Promoted value doesn't match expected."))
-         #,(syntax/loc stx
-             (check-equal? demoted D "Demoted value doesn't match expected.")))))))
-
-
-(define fv-tests
-  (test-suite "Tests for fv"
-              (fv-t -Number)
-              [fv-t (-v a) a]
-              [fv-t (-poly (a) a)]
-              [fv-t (-poly (a b c d e) a)]
-              [fv-t (-poly (b) (-v a)) a]
-              [fv-t (-poly (b c d e) (-v a)) a]
-              [fv-t (-mu a (-lst a))]
-              [fv-t (-mu a (-lst (-pair a (-v b)))) b]
-
-              [fv-t (->* null (-v a) -Number) a] ;; check that a is CONTRAVARIANT
-              ))
-
-(define pd-tests
-  (test-suite "Tests for var-promote/var-demote"
-    (pd-t Univ () Univ Univ)
-    (pd-t (-v a) () (-v a) (-v a))
-    (pd-t (-v a) (a) -Bottom Univ)
-    (pd-t (-v a) (b) (-v a) (-v a))
-
-    (pd-t (-vec (-v a)) (a) (-vec -Bottom) (-vec Univ))
-    (pd-t (-vec (-lst (-v a))) (a) (-vec -Bottom) (-vec Univ))
-    (pd-t (-vec (-v a)) (b) (-vec (-v a)) (-vec (-v a)))
-
-    (pd-t (-box (-v a)) (a) (-box -Bottom) (-box Univ))
-    (pd-t (-box (-lst (-v a))) (a) (-box -Bottom) (-box Univ))
-    (pd-t (-box (-v a)) (b) (-box (-v a)) (-box (-v a)))
-
-    (pd-t (-channel (-v a)) (a) (-channel -Bottom) (-channel Univ))
-    (pd-t (-channel (-lst (-v a))) (a) (-channel -Bottom) (-channel Univ))
-    (pd-t (-channel (-v a)) (b) (-channel (-v a)) (-channel (-v a)))
-
-    (pd-t (-thread-cell (-v a)) (a) (-thread-cell -Bottom) (-thread-cell Univ))
-    (pd-t (-thread-cell (-lst (-v a))) (a) (-thread-cell -Bottom) (-thread-cell Univ))
-    (pd-t (-thread-cell (-v a)) (b) (-thread-cell (-v a)) (-thread-cell (-v a)))
-
-    (pd-t (-HT (-v a) (-v a)) (a) (-HT -Bottom -Bottom) (-HT Univ Univ))
-    (pd-t (-HT (-lst (-v a)) (-lst (-v a))) (a) (-HT -Bottom -Bottom) (-HT Univ Univ))
-    (pd-t (-HT (-v a) (-v a)) (b) (-HT (-v a) (-v a)) (-HT (-v a) (-v a)))
-
-    (pd-t (-Param (-v a) (-v b)) (a b) (-Param Univ -Bottom) (-Param -Bottom Univ))
-    (pd-t (-Param (-lst (-v a)) (-lst (-v b))) (a b)
-          (-Param (-lst Univ) (-lst -Bottom))
-          (-Param (-lst -Bottom) (-lst Univ)))
-
-    (pd-t (->* (list (-lst (-v a))) (-lst (-v a)) (-lst (-v a))) (a)
-          (->* (list (-lst Univ)) (-lst Univ) (-lst -Bottom))
-          (->* (list (-lst -Bottom)) (-lst -Bottom) (-lst Univ)))
-
-    (pd-t (->key #:a (-lst (-v a)) #t #:b (-lst (-v a)) #f -Symbol) (a)
-          (->key #:a (-lst Univ) #t #:b (-lst Univ) #f -Symbol)
-          (->key #:a (-lst -Bottom) #t #:b (-lst -Bottom) #f -Symbol))
-
-    (pd-t (->... (list) ((-lst (-v a)) b) -Symbol) (a)
-          (->... (list) ((-lst Univ) b) -Symbol)
-          (->... (list) ((-lst -Bottom) b) -Symbol))
-
-
-    ))
-
-(define infer-tests
-  (test-suite "Tests for infer"
-    (infer-t Univ Univ)
-    (infer-t (-v a) Univ)
-    (infer-t (-v a) (-v a) #:result [(-v a) (-v a)])
-    (infer-t Univ (-v a) #:fail)
-    (infer-t Univ (-v a) #:vars '(a))
-    (infer-t (-v a) Univ #:vars '(a))
-    (infer-t (-v a) -Bottom #:vars '(a))
-    (infer-t (-v a) (-v b) #:fail)
-    (infer-t (-v a) (-v b) #:vars '(a))
-    (infer-t (-v a) (-v b) #:vars '(b))
-
-    (infer-t (make-ListDots -Symbol 'b) (-lst -Symbol) #:indices '(b)
-             #:result [(make-ListDots (-v b) 'b) -Null])
-    (infer-t (make-ListDots (-v a) 'b) (-lst -Symbol) #:vars '(a) #:indices '(b)
-             #:result [(-lst* (make-ListDots (-v b) 'b) (-v a))
-                       (-lst* (-lst -Bottom) -Bottom)])
-    (infer-t (make-ListDots (-v b) 'b) (-lst -Symbol) #:indices '(b)
-             #:result [(make-ListDots (-v b) 'b) (-lst -Bottom)])
-
-    (infer-t (-lst -Symbol) (make-ListDots -Symbol 'b) #:indices '(b)
-             #:result [(make-ListDots (-v b) 'b) (-lst -Bottom)])
-    (infer-t (-lst -Symbol) (make-ListDots (-v b) 'b) #:indices '(b)
-             #:result [(make-ListDots (-v b) 'b) (-lst -Symbol)])
-    (infer-t (make-ListDots (-v b) 'b) (-lst Univ) #:indices '(b))
-    (infer-t (make-ListDots (-v a) 'a) (-lst Univ))
-    (infer-t (make-ListDots (-lst (-v a)) 'a) (-lst (-lst Univ)))
-    (infer-t (make-ListDots (-vec (-v a)) 'a) (-lst (-vec Univ)) #:fail)
-
-    (infer-t (make-ListDots (-v a) 'b) (make-ListDots -Symbol 'b) #:vars '(a))
-    (infer-t (make-ListDots (-v b) 'b) (make-ListDots -Symbol 'b) #:indices '(b))
-    (infer-t (make-ListDots -Symbol 'b) (make-ListDots (-v b) 'b) #:indices '(b))
-    (infer-t (make-ListDots -Symbol 'b) (make-ListDots Univ 'b) #:indices '(b))
-    (infer-t (make-ListDots (-v b) 'b) (make-ListDots (-v b) 'b) #:indices '(b))
-    (infer-t (make-ListDots (-v b) 'b) (make-ListDots Univ 'b) #:indices '(b))
-    (infer-t (-pair (-v a) (make-ListDots (-v b) 'b))
-             (-pair (-v a) (make-ListDots (-v b) 'b))
-             #:result [(-v a) (-v a)])
-
-    [infer-t (->... null ((-v a) a) (-v b)) (-> -Symbol -String) #:vars '(b) #:indices '(a)]
-    [infer-t (->... null ((-v a) a) (make-ListDots (-v a) 'a)) (-> -String -Symbol  (-lst* -String -Symbol)) #:indices '(a)]
-    [infer-t (->... (list (-v b)) ((-v a) a) (-v b)) (-> -String -Symbol -String) #:vars '(b) #:indices '(a)]
-    [infer-t (->... (list (-v b)) ((-v a) a) (-v b))
-             (->... (list -Symbol) (-String a) (-v b))
-             #:vars '(b) #:indices '(a)
-             #:result [(-lst* (make-ListDots (-v a) 'a) (-v b))
-                       (-lst* (-lst -String) -Symbol)]]
-    [infer-t (->* (list -Symbol) -String -Void)
-             (->... (list) ((-v a) a) -Void)
-             #:indices '(a)
-             #:result [(-lst* (make-ListDots (-v a) 'a))
-                       (-lst* (-lst* -Bottom #:tail (-lst -Bottom)))]]
-    [infer-t (->* (list) -String -Void) (->... (list) (-String a) -Void)]
-
-    [infer-l (list (->... null ((-v b) b) (-v a))  (-> (-v a) -Boolean))
-             (list (-> -String            -Symbol) (-> -Symbol   -Boolean))
-             #:vars '(a)
-             #:indices '(b)]
-    [infer-l (list (->... null ((-v a) a) (-v b)) (make-ListDots (-v a) 'a))
-             (list (-> -Symbol -Symbol -String) (-lst* -Symbol -Symbol))
-             #:vars '(b)
-             #:indices '(a)]
-
-    [infer-t (-> (-values (list -String))) (-> (-values-dots (list) -Symbol 'b)) #:indices '(b) #:fail]
-    [infer-t (make-ListDots -String 'a) (make-ListDots -Symbol 'b) #:indices '(b) #:fail]
-    [infer-t (make-ListDots -String 'a) (make-ListDots -Symbol 'b) #:indices '(a) #:fail]
-    [infer-t (-lst* -String) (make-ListDots -Symbol 'b) #:indices '(b) #:fail]
-    [infer-t (->* (list -Symbol) -Symbol -Void) (->* (list) (-v a) -Void) #:vars '(a) #:fail]
-
-    [infer-t (-> (-values (list -Bottom))) (-> (-values (list (-v b) (-v b)))) #:vars '(a)]
-    [infer-t (-> (-values (list (-v a)))) (-> (-values (list (-v b) (-v b)))) #:vars '(a)]
-
-    [infer-t
-     (-pair (->... (list) ((-v b) b) Univ) (make-ListDots (-lst (-v b)) 'b))
-     (-lst* (-> Univ Univ))
-     #:indices '(b) #:fail]
-    [infer-t
-     (-lst* (-> Univ Univ))
-     (-pair (->... (list) ((-v b) b) Univ) (make-ListDots (-lst (-v b)) 'b))
-     #:indices '(b) #:fail]
-    [infer-t
-     (-pair (->... (list) ((-v b) b) Univ) (make-ListDots (-v b) 'b))
-     (-pair (-> -Symbol Univ) (-lst -String))
-     #:indices '(b) #:fail]
-    [infer-t
-     (-pair (-> -Symbol Univ) (-lst -String))
-     (-pair (->... (list) ((-v b) b) Univ) (make-ListDots (-v b) 'b))
-     #:indices '(b) #:fail]
-
-    [infer-t
-      (-lst (-mu A (Un (-v b) (-lst A))))
-      (-mu C (Un (-v b2) (-lst C)))
-      #:vars '(b2)
-      #:result [(-vec (-v b2)) (-vec (-lst (-mu A (Un (-v b) (-lst A)))))]]
-
-    [infer-t
-      (-mlst (-val 'b))
-      (-mlst (-v a))
-      #:vars '(a)
-      #:result [(-seq (-v a)) (-seq (-val 'b))]]
-
-    ;; Currently Broken
-    ;(infer-t (make-ListDots -Symbol 'b) (-pair -Symbol (-lst -Symbol)) #:indices '(b))
-    [i2-t (-v a) N ('a N)]
-    [i2-t (-pair (-v a) (-v a)) (-pair N (Un N B)) ('a (Un N B))]
-    [i2-t (-lst (-v a)) (-lst* N N) ('a N)]
-    [i2-t (-lst (-v a)) (-lst* N B) ('a (Un N B))]
-    [i2-t Univ (Un N B)]
-    [i2-t ((-v a) . -> . (-v b)) (-> N N) ('b N) ('a (Un))]
-    [i2-t (-> (-v a) (-v a)) (->* null B B) ('a B)]
-
-
-    [i2-l (list (-v a) (-v a) (-v b))
-          (list (Un (-val 1) (-val 2)) N N)
-          '(a b) ('b N) ('a N)]
-    [i2-l (list (-> (-v a) Univ) (-lst (-v a)))
-          (list (-> N (Un N B)) (-lst N))
-          '(a) ('a N)]
-    [i2-l (list (-> (-v a) (-v b)) (-lst (-v a)))
-          (list (-> N N) (-lst (Un (-val 1) (-val 2))))
-          '(a b) ('b N) ('a (Un (-val 1) (-val 2)))]
-    [i2-l (list  (-lst (-v a)))
-          (list  (-lst (Un B N)))
-          '(a) ('a (Un N B))]
-    ;; error tests
-    [i2-f (-lst (-v a)) Univ]
-    [i2-f (->* null B B) (-> (-v a) (-v b))]
-    ))
-
-
-(define tests
-  (test-suite "All inference tests"
-    pd-tests
-    fv-tests
-    infer-tests))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/init-env-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/init-env-tests.rkt
deleted file mode 100644
index c44f42583e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/init-env-tests.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt"
-         rackunit
-         mzlib/pconvert
-         (env init-envs)
-         (types abbrev union))
-
-(provide tests)
-(gen-test-main)
-
-(define (convert v)
-  (parameterize ((current-print-convert-hook converter)
-                 ;; ignore sharing in all cases
-                 (current-build-share-hook (λ (v basic sub) 'atomic))
-                 (show-sharing #f)
-                 (booleans-as-true/false #f))
-   (syntax->datum (datum->syntax #f (print-convert v)))))
-
-
-(define tests
-  (test-suite "Init Env"
-    (test-suite "Convert"
-      (check-equal?
-        (convert (-> -String -Symbol))
-        '(simple-> (list -String) -Symbol))
-      (check-equal?
-        (convert (make-pred-ty -String))
-        '(make-pred-ty (list Univ) -Boolean -String (make-Path `() (list 0 0))))
-      (check-equal?
-        (convert (->acc (list (-lst -String)) -String (list -car)))
-        '(->acc (list (-lst -String)) -String `(,-car)))
-      (check-equal?
-        (convert (-mu x (-lst* Univ (-box x))))
-        '(make-Mu 'x (make-Pair Univ (make-Pair (make-Box (make-F 'x)) -Null))))
-    )
-  ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/interactive-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/interactive-tests.rkt
deleted file mode 100644
index 1099a088ea..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/interactive-tests.rkt
+++ /dev/null
@@ -1,182 +0,0 @@
-#lang racket/base
-
-(require
-  "test-utils.rkt"
-  racket/base
-  racket/port
-  racket/promise
-  rackunit
-  (for-syntax
-    racket/base
-    racket/format
-    syntax/parse))
-
-(provide tests)
-(gen-test-main)
-
-(define-namespace-anchor anchor)
-
-(define base-ns
-  (delay
-    (define ns (namespace-anchor->empty-namespace anchor))
-    (parameterize ([current-namespace ns])
-      (namespace-require 'typed/racket/base))
-    ns))
-
-;; get-ns: boolean? -> namespace?
-;; Returns a namespace with the bindings of typed/racket/base.
-;; If the argument is true, then it is a new namespace. This is slower but allows for tests that need
-;; to mutate the namespace to not clash with each other.
-(define (get-ns fresh)
-  (if fresh
-      (let ([ns (variable-reference->empty-namespace
-                  (eval '(#%variable-reference) (force base-ns)))])
-        (parameterize ([current-namespace ns])
-          (namespace-require 'typed/racket/base)
-          ns))
-      (force base-ns)))
-
-(begin-for-syntax
-  (define-splicing-syntax-class fresh-kw
-    (pattern (~seq) #:attr fresh #'#f)
-    (pattern #:fresh #:attr fresh #'#t)))
-
-(define-syntax (test-form-exn stx)
-  (syntax-parse stx
-    [(_ f:fresh-kw regexp:expr form:expr)
-     (quasisyntax/loc stx
-       (test-case #,(~a (syntax->datum #'form))
-         (check-exn
-           regexp
-           (lambda ()
-             (eval `(#%top-interaction .
-                     ,(syntax->datum #'form)) (get-ns f.fresh))))))]))
-
-(define-syntax (test-form-not-exn stx)
-  (syntax-parse stx
-    [(_ f:fresh-kw form:expr)
-     (quasisyntax/loc stx
-       (test-case #,(~a (syntax->datum #'form))
-         (check-not-exn
-           (lambda ()
-             (eval `(#%top-interaction .
-                     ,(syntax->datum #'form)) (get-ns f.fresh))))))]))
-
-(define-syntax (test-form stx)
-  (syntax-parse stx
-    [(_ f:fresh-kw (~seq regexp:expr form:expr) ...)
-     (quasisyntax/loc stx
-       (test-case #,(~a (syntax->datum #'(form ...)))
-         (define ns (get-ns f.fresh))
-         (check-regexp-match
-           regexp
-           (with-output-to-string
-             (lambda ()
-               (eval `(#%top-interaction .
-                       ,(syntax->datum #'form)) ns)))) ...))]))
-
-;; Add 'only at the toplevel tests'
-(define tests
-  (test-suite "Interactive tests"
-
-    (test-form #:fresh
-      #rx"" (module test racket)
-      #rx"" (define module displayln)
-      #rx"racket" (module 'racket))
-
-    (test-form (regexp-quote "String")
-      "foo")
-    (test-form (regexp-quote "String")
-      (begin "foo"))
-    (test-form (regexp-quote "String")
-      (begin "foo" "bar"))
-    (test-form #rx"^$"
-      (begin))
-    (test-form #rx"^$"
-      (define x "foo"))
-    (test-form #rx"^$"
-      (begin (: x String)
-             (define x "foo")))
-    (test-form #rx"^$"
-      (struct foo ()))
-
-    ;; Make sure that optimized expressions work
-    (test-form #rx"Flonum"
-      (+ 1.0 2.0))
-
-    ;; PR 14487
-    (test-form-not-exn
-      (require/typed racket/base
-                     [#:opaque Evt evt?]
-                     [alarm-evt (Real -> Evt)]
-                     [sync (Evt -> Any)]))
-
-    ;; PR 14380
-    (test-form-not-exn (begin - (void)))
-
-    ;; test message for undefined id
-    (test-form-exn #rx"either undefined or missing a type annotation"
-      (a-name-that-isnt-bound))
-
-    ;; Make sure unannotated definitions with the wrong number of values
-    ;; don't produce an internal error
-    (test-form-exn #rx"Expression should produce 1 values"
-      (define zzzzz (values 1 2)))
-
-    (test-form #rx"1"
-      (:type 1))
-    (test-form (regexp-quote "(U Positive-Byte Zero)")
-      (:type Byte))
-    (test-form (regexp-quote "(U 0 1 Byte-Larger-Than-One")
-      (:type #:verbose Byte))
-    (test-form-exn #rx":type.*applied to arguments"
-      :type)
-    (test-form-exn #rx":type.*only valid at the top-level"
-      (list (:type)))
-    (test-form-exn #rx"exactly one argument"
-      (:type))
-    (test-form-exn #rx"exactly one argument"
-      (:type 1 2))
-    (test-form-exn #rx"exactly one argument"
-      (:type #:verbose))
-
-    (test-form #rx"Positive-Index"
-      (:print-type (+ 1 1)))
-    (test-form (regexp-quote "(values One One)")
-      (:print-type (values 1 1)))
-    (test-form-exn #rx":print-type.*applied to arguments"
-      :print-type)
-    (test-form-exn #rx":print-type.*only valid at the top-level"
-      (list (:print-type)))
-    (test-form-exn #rx"exactly one argument"
-      (:print-type))
-    (test-form-exn #rx"exactly one argument"
-      (:print-type 1 2))
-    (test-form (regexp-quote "has no type")
-      (:print-type (begin (begin))))
-    (test-form (regexp-quote "has no type")
-      (:print-type (require racket/format)))
-
-    (test-form (regexp-quote "(-> 4 Zero Zero)")
-      (:query-type/args * 4 0))
-    (test-form-exn #rx":query-type/args.*applied to arguments"
-      :query-type/args)
-    (test-form-exn #rx":query-type/args.*only valid at the top-level"
-      (list (:query-type/args)))
-    (test-form-exn #rx"at least one argument"
-      (:query-type/args))
-
-    (test-form (regexp-quote "(case-> (-> One One) (-> One))")
-      (:query-type/result * 1))
-    (test-form #rx"not in the given function's range.\n"
-      (:query-type/result + String))
-    (test-form-exn #rx":query-type/result.*applied to arguments"
-      :query-type/result)
-    (test-form-exn #rx":query-type/result.*only valid at the top-level"
-      (list (:query-type/result)))
-    (test-form-exn #rx"exactly two arguments"
-      (:query-type/result))
-    (test-form-exn #rx"exactly two arguments"
-      (:query-type/result 1 2 3))
-    (test-form #rx"not in the given function's range"
-      (:query-type/result syntax-local-expand-expression Boolean))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/keyword-expansion-test.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/keyword-expansion-test.rkt
deleted file mode 100644
index b5a8ce6850..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/keyword-expansion-test.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt" 
-         (rep type-rep)
-         (types utils kw-types abbrev numeric-tower)
-         racket/match racket/set
-         rackunit)
-(provide tests)
-(gen-test-main)
-
-(define-syntax-rule (t arg expected)
-  (begin
-    (test-equal? (format "~a" '(arg expected))
-                 (kw-convert arg #f)
-                 expected)))
-
-(define (extract-arrs t)
-  (match t
-    [(Function: arrs) (apply set arrs)]
-    [t t]))
-
-(define-syntax-rule (t-opt ((req-arg ...) (opt-arg ...)) expected)
-  (let ()
-    (test-equal? (format "~a" '(opt-convert (->opt req-arg ... (opt-arg ...) result) expected))
-                 (extract-arrs
-                   (opt-convert (->opt req-arg ... (opt-arg ...) result)
-                                (length (list 'req-arg ...))
-                                (length (list 'opt-arg ...))))
-                 (extract-arrs expected))))
-
-
-(define flag -Boolean)
-(define true (-val #t))
-(define false (-val #f))
-(define result (-val 'result))
-(define one (-val 'one))
-(define two (-val 'two))
-(define three (-val 'three))
-(define four (-val 'four))
-
-(define tests
-  (test-suite "Tests for keyword expansion"
-
-    [t (-> result) (-> result)]
-    [t (-> one result)
-       (-> one result)]
-    [t (-> one two three four result)
-       (-> one two three four result)]
-    [t (->opt (one) result)
-       (-> (-opt one) flag result)]
-    [t (->opt (one two) result)
-       (-> (-opt one) (-opt two) flag flag result)]
-    [t (->opt one (two three) result)
-       (-> one (-opt two) (-opt three) flag flag result)]
-
-    [t-opt (() ()) (-> result)]
-    [t-opt ((one) ())
-           (-> one result)]
-    [t-opt ((one two three four) ())
-       (-> one two three four result)]
-    [t-opt (() (one))
-           (cl->*
-             (-> one true result)
-             (-> false false result))]
-    [t-opt (() (one two))
-           (cl->*
-             (-> one two true true result)
-             (-> one false true false result)
-             (-> false false false false result))]
-    [t-opt ((one) (two three))
-           (cl->*
-             (-> one two three true true result)
-             (-> one two false true false  result)
-             (-> one false false false false result))]
-    ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/metafunction-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/metafunction-tests.rkt
deleted file mode 100644
index dd2f696ab0..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/metafunction-tests.rkt
+++ /dev/null
@@ -1,161 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt"
-         rackunit racket/format
-         (typecheck tc-metafunctions tc-subst)
-         (rep filter-rep type-rep object-rep)
-         (types abbrev union filter-ops tc-result)
-         (for-syntax racket/base syntax/parse))
-
-(provide tests)
-(gen-test-main)
-
-(define-syntax (test-combine-props stx)
-  (syntax-parse stx
-    [(_ new:expr existing:expr expected:expr box-v:expr)
-     (quasisyntax/loc stx
-       (test-case (~a '(new + existing = expected))
-         (define success
-           (let/ec exit
-             (define-values (res-formulas res-props) (combine-props new existing exit))
-             #,(syntax/loc stx (check-equal? (append res-formulas res-props) expected))
-             #t))
-         #,(syntax/loc stx (check-equal? success box-v))))]))
-
-
-(define tests
-  (test-suite "Metafunctions"
-
-    (test-suite "combine-props"
-
-      (test-combine-props
-        (list (-or (-not-filter -String #'x) (-not-filter -String #'y)))
-        (list (-filter (Un -String -Symbol) #'x) (-filter (Un -String -Symbol) #'y))
-        (list (-or (-not-filter -String #'y) (-not-filter -String #'x))
-              (-filter (Un -String -Symbol) #'y) (-filter (Un -String -Symbol) #'x))
-        #t)
-
-      (test-combine-props
-        (list (-or (-filter -String #'x) (-filter -String #'y)))
-        (list (-filter (Un -String -Symbol) #'x) (-filter (Un -String -Symbol) #'y))
-        (list (-or (-filter -String #'y) (-filter -String #'x))
-              (-filter (Un -String -Symbol) #'y) (-filter (Un -String -Symbol) #'x))
-        #t)
-    )
-
-    (test-suite "merge-tc-results"
-      (check-equal?
-        (merge-tc-results (list))
-        (ret -Bottom))
-      (check-equal?
-        (merge-tc-results (list (ret Univ)))
-        (ret Univ))
-      (check-equal?
-        (merge-tc-results (list (ret Univ -top-filter (make-Path null #'x))))
-        (ret Univ -top-filter (make-Path null #'x)))
-      (check-equal?
-        (merge-tc-results (list (ret -Bottom) (ret -Symbol -top-filter (make-Path null #'x))))
-        (ret -Symbol -top-filter (make-Path null #'x)))
-      (check-equal?
-        (merge-tc-results (list (ret -String) (ret -Symbol)))
-        (ret (Un -Symbol -String)))
-      (check-equal?
-        (merge-tc-results (list (ret -String -true-filter) (ret -Symbol -true-filter)))
-        (ret (Un -Symbol -String) -true-filter))
-      (check-equal?
-        (merge-tc-results (list (ret (-val #f) -false-filter) (ret -Symbol -true-filter)))
-        (ret (Un -Symbol (-val #f)) -top-filter))
-      (check-equal?
-        (merge-tc-results (list (ret (list (-val 0) (-val 1))) (ret (list (-val 1) (-val 2)))))
-        (ret (list (Un (-val 0) (-val 1)) (Un (-val 1) (-val 2)))))
-      (check-equal?
-        (merge-tc-results (list (ret null null null -Symbol 'x) (ret null null null -String 'x)))
-        (ret null null null (Un -Symbol -String) 'x))
-    )
-
-
-    (test-suite "values->tc-results"
-      (check-equal?
-        (values->tc-results (make-Values (list (-result -Symbol))) (list -empty-obj) (list Univ))
-        (ret -Symbol))
-
-      (check-equal?
-        (values->tc-results (make-Values (list (-result -Symbol) (-result -String))) 
-                            (list -empty-obj -empty-obj) (list Univ Univ))
-        (ret (list -Symbol -String)))
-
-      (check-equal?
-        (values->tc-results (make-Values (list (-result -Symbol (-FS -top -bot)))) (list -empty-obj) (list Univ))
-        (ret -Symbol (-FS -top -bot)))
-
-      (check-equal?
-        (values->tc-results (make-Values (list (-result -Symbol (-FS -top -bot) (make-Path null '(0 0)))))
-                            (list -empty-obj) (list Univ))
-        (ret -Symbol (-FS -top -bot)))
-
-      (check-equal?
-        (values->tc-results (make-Values (list (-result (-opt -Symbol) (-FS (-filter -String '(0 0)) -top))))
-                            (list -empty-obj) (list Univ))
-        (ret (-opt -Symbol) -top-filter))
-
-      (check-equal?
-        (values->tc-results (make-Values (list (-result (-opt -Symbol) (-FS (-not-filter -String '(0 0)) -top))))
-                            (list -empty-obj) (list Univ))
-        (ret (-opt -Symbol) -top-filter))
-
-      (check-equal?
-        (values->tc-results (make-Values (list (-result (-opt -Symbol) (-FS (-imp (-not-filter (-val #f) '(0 0))
-                                                                           (-not-filter -String #'x))
-                                                                     -top))))
-                            (list -empty-obj) (list Univ))
-        (ret (-opt -Symbol) -top-filter))
-
-      (check-equal?
-        (values->tc-results (make-Values (list (-result (-opt -Symbol) (-FS (-not-filter -String '(0 0)) -top)
-                                                 (make-Path null '(0 0)))))
-                            (list (make-Path null #'x)) (list Univ))
-        (ret (-opt -Symbol) (-FS (-not-filter -String #'x) -top) (make-Path null #'x)))
-
-      ;; Check additional filters
-      (check-equal?
-        (values->tc-results (make-Values (list (-result (-opt -Symbol) (-FS (-not-filter -String '(0 0)) -top)
-                                                 (make-Path null '(0 0)))))
-                            (list (make-Path null #'x)) (list -String))
-        (ret (-opt -Symbol) -false-filter (make-Path null #'x)))
-
-      ;; Substitute into ranges correctly
-      (check-equal?
-        (values->tc-results (make-Values (list (-result (-opt (-> Univ -Boolean : (-FS (-filter -Symbol '(0 0)) -top))))))
-                            (list (make-Path null #'x)) (list Univ))
-        (ret (-opt (-> Univ -Boolean : (-FS (-filter -Symbol '(0 0)) -top)))))
-
-      (check-equal?
-        (values->tc-results (make-Values (list (-result (-opt (-> Univ -Boolean : (-FS (-filter -Symbol '(1 0)) -top))))))
-                            (list (make-Path null #'x)) (list Univ))
-        (ret (-opt (-> Univ -Boolean : (-FS (-filter -Symbol #'x) -top)))))
-
-      ;; Substitute into filter of any values
-      (check-equal?
-        (values->tc-results (make-AnyValues (-filter -String '(0 0)))
-                            (list (make-Path null #'x)) (list Univ))
-        (tc-any-results (-filter -String #'x)))
-
-
-      (check-equal?
-        (values->tc-results (-values-dots null (-> Univ -Boolean : (-FS (-filter -String '(1 0)) -top)) 'b)
-                            (list (make-Path null #'x)) (list Univ))
-        (ret null null null (-> Univ -Boolean : (-FS (-filter -String #'x) -top)) 'b))
-
-    )
-
-    (test-suite "replace-names"
-      (check-equal?
-        (replace-names (list (list #'x (make-Path null (list 0 0))))
-                       (ret Univ -top-filter (make-Path null #'x)))
-        (ret Univ -top-filter (make-Path null (list 0 0))))
-      (check-equal?
-        (replace-names (list (list #'x (make-Path null (list 0 0))))
-                       (ret (-> Univ Univ : -top-filter : (make-Path null #'x))))
-        (ret (-> Univ Univ : -top-filter : (make-Path null (list 1 0)))))
-    )
-  ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/parse-type-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/parse-type-tests.rkt
deleted file mode 100644
index e16ca15e0b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/parse-type-tests.rkt
+++ /dev/null
@@ -1,373 +0,0 @@
-#lang racket/base
-(require "test-utils.rkt"
-         "evaluator.rkt"
-         (for-syntax
-           racket/base
-           racket/dict
-           racket/set
-           syntax/parse
-           (base-env base-structs)
-           (env tvar-env type-alias-env mvar-env)
-           (utils tc-utils)
-           (private parse-type)
-           (rep type-rep)
-
-           (submod typed-racket/base-env/base-types initialize)
-           (rename-in (types union abbrev numeric-tower resolve)
-                      [Un t:Un] [-> t:->] [->* t:->*]))
-         (only-in typed-racket/typed-racket do-standard-inits)
-         (base-env base-types base-types-extra colon)
-         ;; needed for parsing case-lambda/case-> types
-         (only-in (base-env case-lambda) case-lambda)
-         (prefix-in un: (only-in racket/class init init-field field augment))
-         (only-in typed/racket/class init init-field field augment)
-
-         rackunit)
-
-(provide tests)
-(gen-test-main)
-
-
-(define mutated-var #f)
-(define not-mutated-var #f)
-
-(begin-for-syntax
-  (do-standard-inits)
-  (register-mutated-var #'mutated-var))
-
-(define-syntax (pt-test stx)
-  (syntax-parse stx
-    [(_ (~datum FAIL) ty-stx:expr
-        (~optional tvar-env:expr #:defaults [(tvar-env #'initial-tvar-env)])
-        (~optional (~seq #:msg msg*:expr) #:defaults [(msg* #'#f)]))
-     (quasisyntax/loc stx
-       (test-case #,(format "~a" (syntax->datum #'ty-stx))
-         (define msg msg*)
-         (define actual-message
-           (phase1-phase0-eval
-             (with-handlers ([exn:fail:syntax? (lambda (exn) #`#,(exn-message exn))])
-               (parameterize ([current-tvars tvar-env]
-                              [delay-errors? #f])
-                 (parse-type (quote-syntax ty-stx)))
-               #'#f)))
-         (unless actual-message
-           (fail-check "No syntax error when parsing type."))
-         (when msg
-           (unless (regexp-match? msg actual-message)
-             (with-check-info (['expected msg] ['actual actual-message])
-               (fail-check "parse-type raised the wrong error message"))))))]
-    [(_ ty-stx:expr ty-val:expr
-        (~optional tvar-env:expr #:defaults [(tvar-env #'initial-tvar-env)]))
-     (quasisyntax/loc
-       stx
-       (test-case #,(format "~a" (syntax->datum #'ty-stx))
-         (define-values (expected actual same?)
-           (phase1-phase0-eval
-             (parameterize ([current-tvars tvar-env]
-                            [delay-errors? #f])
-                (define expected ty-val)
-                (define actual (parse-type (quote-syntax ty-stx)))
-                #`(values #,expected #,actual #,(type-equal? actual expected)))))
-          (unless same?
-            (with-check-info (['expected expected] ['actual actual])
-              (fail-check "Unequal types")))))]))
-
-(define-syntax pt-tests
-  (syntax-rules ()
-    [(_ nm [elems ...] ...)
-     (test-suite nm
-                 (pt-test elems ...) ...)]))
-
-(define-for-syntax N -Number)
-(define-for-syntax B -Boolean)
-(define-for-syntax Sym -Symbol)
-
-(define tests
-  (pt-tests
-   "parse-type tests"
-   [FAIL UNBOUND]
-   [FAIL List]
-   [FAIL (All (A) (List -> Boolean))]
-   [Number N]
-   [Any Univ]
-   [(List Number String) (-Tuple (list N -String))]
-   [(All (Number) Number) (-poly (a) a)]
-   [(Number . Number) (-pair N N)]
-   [(Listof Boolean) (make-Listof  B)]
-   [(Vectorof (Listof Symbol)) (make-Vector (make-Listof Sym))]
-   [(pred Number) (make-pred-ty N)]
-   [(-> (values Number Boolean Number)) (t:-> (-values (list N B N)))]
-   [(Number -> Number) (t:-> N N)]
-   [(All (A) Number -> Number) (-poly (a) (t:-> N N))]
-   [(All (A) Number -> Number -> Number) (-poly (a) (t:-> N (t:-> N N)))]
-   [(All (A) Number -> Number -> Number -> Number)
-    (-poly (a) (t:-> N (t:-> N (t:-> N N))))]
-   [FAIL (All (A) -> Number Number)]
-   [FAIL (All (A) Listof Any)]
-   [(All (A) (Number -> Number)) (-poly (a) (t:-> N N))]
-   [(All (A) (-> Number Number)) (-poly (a) (t:-> N N))]
-   [(All (A) A -> A) (-poly (a) (t:-> a a))]
-   [(All (A) A → A) (-poly (a) (t:-> a a))]
-   [FAIL (All (A) → A A)]
-   [(All (A) (A -> A)) (-poly (a) (t:-> a a))]
-   [(All (A) (-> A A)) (-poly (a) (t:-> a a))]
-   [FAIL (All (A) -> Integer -> Integer -> Integer)]
-   ;; requires transformer time stuff that doesn't work
-   #;[(Refinement even?) (make-Refinement #'even?)]
-   [(Number Number Number Boolean -> Number) (N N N B . t:-> . N)]
-   [(-> Number Number Number Boolean Number) (N N N B . t:-> . N)]
-   [(Number Number Number * -> Boolean) ((list N N) N . t:->* . B)]
-   [(-> Number Number Number * Boolean) ((list N N) N . t:->* . B)]
-   ;[((. Number) -> Number) (->* (list) N N)] ;; not legal syntax
-   [(U Number Boolean) (t:Un N B)]
-   [(U Number Boolean Number) (t:Un N B)]
-   [(U Number Boolean 1) (t:Un N B)]
-   [(All (a) (Listof a)) (-poly (a) (make-Listof  a))]
-   [(All (a ...) (a ... a -> Integer)) (-polydots (a) ( (list) (a a) . ->... . -Integer))]
-   [(All (a ...) (-> a ... a Integer)) (-polydots (a) ( (list) (a a) . ->... . -Integer))]
-   [(∀ (a) (Listof a)) (-poly (a) (make-Listof  a))]
-   [(∀ (a ...) (a ... a -> Integer)) (-polydots (a) ( (list) (a a) . ->... . -Integer))]
-   [(∀ (a ...) (-> a ... a Integer)) (-polydots (a) ( (list) (a a) . ->... . -Integer))]
-   [(All (a ...) (a ... -> Number))
-    (-polydots (a) ((list) [a a] . ->... . N))]
-   [(All (a ...) (-> a ... Number))
-    (-polydots (a) ((list) [a a] . ->... . N))]
-   [(All (a ...) (-> (values a ...)))
-    (-polydots (a) (t:-> (make-ValuesDots (list) a 'a)))]
-
-   ;; PR 14554, non-productive recursive type
-   [FAIL (Rec x (All (A #:row) x))]
-
-   [(case-lambda (Number -> Boolean) (Number Number -> Number)) (cl-> [(N) B]
-                                                                      [(N N) N])]
-   [(case-> (Number -> Boolean) (Number Number -> Number)) (cl-> [(N) B]
-                                                                 [(N N) N])]
-   [(case-> (Number -> Boolean) (-> Number Number Number)) (cl-> [(N) B]
-                                                                 [(N N) N])]
-   [1 (-val 1)]
-   [#t (-val #t)]
-   [#f (-val #f)]
-   ["foo" (-val "foo")]
-   ['(1 2 3) (-Tuple (map -val '(1 2 3)))]
-
-   [(Listof Number) (make-Listof  N)]
-
-   [a (-v a) (dict-set initial-tvar-env 'a (-v a))]
-
-   [(Any -> Boolean : Number) (make-pred-ty -Number)]
-   [(-> Any Boolean : Number) (make-pred-ty -Number)]
-   [(Any -> Boolean : #:+ (Number @ 0) #:- (! Number @ 0))
-    (make-pred-ty -Number)]
-   [(-> Any Boolean : #:+ (Number @ 0) #:- (! Number @ 0))
-    (make-pred-ty -Number)]
-   [(Any -> Boolean : #:+ (! Number @ 0) #:- (Number @ 0))
-    (t:->* (list Univ) -Boolean : (-FS (-not-filter -Number 0) (-filter -Number 0)))]
-   [(-> Any Boolean : #:+ (! Number @ 0) #:- (Number @ 0))
-    (t:->* (list Univ) -Boolean : (-FS (-not-filter -Number 0) (-filter -Number 0)))]
-   [(-> Any (-> Any Boolean : #:+ (Number @ 1 0) #:- (! Number @ 1 0)))
-    (t:-> Univ
-          (t:->* (list Univ) -Boolean : (-FS (-filter -Number '(1 0)) (-not-filter -Number '(1 0)))))]
-   [(-> Any Any (-> Any Boolean : #:+ (Number @ 1 1) #:- (! Number @ 1 1)))
-    (t:-> Univ Univ
-          (t:->* (list Univ) -Boolean : (-FS (-filter -Number '(1 1)) (-not-filter -Number '(1 1)))))]
-   [(-> Any #:foo Any (-> Any Boolean : #:+ (Number @ 1 0) #:- (! Number @ 1 0)))
-    (->key Univ #:foo Univ #t
-           (t:->* (list Univ) -Boolean : (-FS (-filter -Number '(1 0)) (-not-filter -Number '(1 0)))))]
-   [(All (a b) (-> (-> a Any : #:+ b) (Listof a) (Listof b)))
-    (-poly (a b) (t:-> (asym-pred a Univ (-FS (-filter b 0) -top)) (-lst a) (-lst b)))]
-   [(All (a b) (-> (-> a Any : #:+ (! b)) (Listof a) (Listof b)))
-    (-poly (a b) (t:-> (asym-pred a Univ (-FS (-not-filter b 0) -top)) (-lst a) (-lst b)))]
-   [(All (a b) (-> (-> a Any : #:- b) (Listof a) (Listof b)))
-    (-poly (a b) (t:-> (asym-pred a Univ (-FS -top (-filter b 0))) (-lst a) (-lst b)))]
-   [(All (a b) (-> (-> a Any : #:- (! b)) (Listof a) (Listof b)))
-    (-poly (a b) (t:-> (asym-pred a Univ (-FS -top (-not-filter b 0))) (-lst a) (-lst b)))]
-   [(Number -> Number -> Number)
-    (t:-> -Number (t:-> -Number -Number))]
-   [(-> Number (-> Number Number))
-    (t:-> -Number (t:-> -Number -Number))]
-   [(Integer -> (All (X) (X -> X)))
-    (t:-> -Integer (-poly (x) (t:-> x x)))]
-   [(-> Integer (All (X) (-> X X)))
-    (t:-> -Integer (-poly (x) (t:-> x x)))]
-   [FAIL -> #:msg "incorrect use of -> type constructor"]
-   [FAIL (Any -> Any #:object 0) #:msg "expected the identifier `:'"]
-   [FAIL (-> Any Any #:+ (String @ x)) #:msg "expected the identifier `:'"]
-   [FAIL (-> Any Boolean : #:+ (Number @ 1 0) #:- (! Number @ 1 0))
-         #:msg "Index 1 used in"]
-   [FAIL (-> Any (-> Any Boolean : #:+ (Number @ 1 1) #:- (! Number @ 1 1)))
-         #:msg "larger than argument length"]
-
-
-   [(Any -> Boolean : #:+ (Symbol @ not-mutated-var))
-    (t:-> Univ -Boolean : (-FS (-filter -Symbol (-id-path #'not-mutated-var)) -top))]
-   [FAIL (Any -> Boolean : #:+ (Symbol @ mutated-var))
-         #:msg "may not reference identifiers that are mutated"]
-   [(Any -> Boolean : #:+ (! Symbol @ not-mutated-var))
-    (t:-> Univ -Boolean : (-FS (-not-filter -Symbol (-id-path #'not-mutated-var)) -top))]
-   [FAIL (Any -> Boolean : #:+ (! Symbol @ mutated-var))
-         #:msg "may not reference identifiers that are mutated"]
-   [FAIL (Any -> Boolean : #:+ (String @ unbound))
-         #:msg "may not reference identifiers that are unbound"]
-
-
-   ;; ->* types
-   [(->* (String Symbol) Void) (t:-> -String -Symbol -Void)]
-   [(->* (String Symbol) (String) Void)
-    (->opt -String -Symbol [-String] -Void)]
-   [(->* (String Symbol) (String Symbol) Void)
-    (->opt -String -Symbol [-String -Symbol] -Void)]
-   [(->* (String Symbol) (String) (values Void String))
-    (->opt -String -Symbol [-String] (-values (list -Void -String)))]
-   [(->* (String Symbol) (String) #:rest Symbol Void)
-    (->optkey -String -Symbol [-String] #:rest -Symbol -Void)]
-   [(All (a) (->* (a Symbol) (String) #:rest Symbol Void))
-    (-poly (a) (->optkey a -Symbol [-String] #:rest -Symbol -Void))]
-   [(->* (Integer) (String #:foo Integer) Void)
-    (->optkey -Integer [-String] #:foo -Integer #f -Void)]
-   [(->* (Integer #:bar Integer) (String) Void)
-    (->optkey -Integer [-String] #:bar -Integer #t -Void)]
-   [(->* (Integer #:bar Integer) (String #:foo Integer) Void)
-    (->optkey -Integer [-String] #:bar -Integer #t #:foo -Integer #f -Void)]
-   [(->* (Any (-> Any Boolean : #:+ (String @ 1 0))) Void)
-    (t:-> Univ (t:->* (list Univ) -Boolean : (-FS (-filter -String '(1 0)) -top))
-          -Void)]
-   [FAIL (->* (Any (-> Any Boolean : #:+ (String @ 2 0))) Void)
-         #:msg "Index 2 used in"]
-
-   [(Opaque foo?) (make-Opaque #'foo?)]
-   ;; PR 14122
-   [FAIL (Opaque 3)]
-
-   ;; struct types
-   [(Struct-Type arity-at-least) (make-StructType (resolve -Arity-At-Least))]
-   [FAIL (Struct-Type Integer)]
-   [FAIL (Struct-Type foo)]
-   [Struct-TypeTop (make-StructTypeTop)]
-
-   ;; keyword function types
-   [(#:a String -> String)
-    (->optkey [] #:a -String #t -String)]
-   [([#:a String] -> String)
-    (->optkey [] #:a -String #f -String)]
-   [(#:a String #:b String -> String)
-    (->optkey [] #:a -String #t #:b -String #t -String)]
-   [([#:a String] #:b String -> String)
-    (->optkey [] #:a -String #f #:b -String #t -String)]
-   [(#:a String [#:b String] -> String)
-    (->optkey [] #:a -String #t #:b -String #f -String)]
-   [(String #:a String -> String)
-    (->optkey -String [] #:a -String #t -String)]
-   [(String #:a String String * -> String)
-    (->optkey -String [] #:rest -String #:a -String #t -String)]
-   [(String [#:a String] String * -> String)
-    (->optkey -String [] #:rest -String #:a -String #f -String)]
-
-   ;;; Classes
-   [(Class) (-class)]
-   [(Class (init [x Number] [y Number]))
-    (-class #:init ([x -Number #f] [y -Number #f]))]
-   [(Class (un:init [x Number] [y Number]))
-    (-class #:init ([x -Number #f] [y -Number #f]))]
-   [(Class (init [x Number] [y Number #:optional]))
-    (-class #:init ([x -Number #f] [y -Number #t]))]
-   [(Class (init [x Number]) (init-field [y Number]))
-    (-class #:init ([x -Number #f]) #:init-field ([y -Number #f]))]
-   [(Class [m (Number -> Number)])
-    (-class #:method ([m (t:-> N N)]))]
-   [(Class [m (Number -> Number)] (init [x Number]))
-    (-class #:init ([x -Number #f]) #:method ([m (t:-> N N)]))]
-   [(Class [m (Number -> Number)] (field [x Number]))
-    (-class #:field ([x -Number]) #:method ([m (t:-> N N)]))]
-   [(Class [m (Number -> Number)] (un:field [x Number]))
-    (-class #:field ([x -Number]) #:method ([m (t:-> N N)]))]
-   [(Class (augment [m (Number -> Number)]))
-    (-class #:augment ([m (t:-> N N)]))]
-   [(Class (un:augment [m (Number -> Number)]))
-    (-class #:augment ([m (t:-> N N)]))]
-   [(Class (augment [m (Number -> Number)]) (field [x Number]))
-    (-class #:augment ([m (t:-> N N)]) #:field ([x -Number]))]
-   [(Class (augment [m (-> Number)]) [m (-> Number)])
-    (-class #:method ([m (t:-> N)]) #:augment ([m (t:-> N)]))]
-   [FAIL (Class foobar)]
-   [FAIL (Class [x UNBOUND])]
-   [FAIL (Class [x Number #:random-keyword])]
-   [FAIL (Class (random-clause [x Number]))]
-   [FAIL (Class [m Number])]
-   [FAIL (Class (augment [m Number]))]
-   ;; test duplicates
-   [FAIL (Class [x Number] [x Number])]
-   [FAIL (Class (init [x Number]) (init [x Number]))]
-   [FAIL (Class (init [x Number]) (init-field [x Number]))]
-   [FAIL (Class (field [x Number]) (init-field [x Number]))]
-   [FAIL (Class (augment [m (-> Number)] [m (-> Number)]))]
-   [FAIL (Class (augment [m (-> Number)]) (augment [m (-> Number)]))]
-   [FAIL (Class [m (-> Number)] [m (-> Number)])]
-   ;; test #:row-var
-   [(All (r #:row) (Class #:row-var r))
-    (make-PolyRow (list 'r)
-                  (list null null null null)
-                  (-class #:row (make-F 'r)))]
-   [FAIL (All (r #:row) (Class #:implements (Class #:row-var r)))]
-   [FAIL (All (r #:row) (Class #:implements (Class) #:row-var r))]
-   [FAIL (Class #:row-var 5)]
-   [FAIL (Class #:row-var (list 3))]
-   [FAIL (Class #:row-var x)]
-   [FAIL (Class #:implements (Class #:row-var r) #:row-var x)]
-   [FAIL (Class #:implements (Class #:row-var r) #:row-var r)]
-   [FAIL (All (r #:row)
-           (All (x #:row)
-            (Class #:implements (Class #:row-var r) #:row-var x)))]
-   [FAIL (All (r #:row) (Class #:implements (Class #:row-var r) #:row-var r))]
-   ;; Test #:implements, some of these used to work but now they have to
-   ;; refer to type aliases. Testing actual type aliases is hard here though.
-   [FAIL (Class #:implements (Class [m (Number -> Number)]) (field [x Number]))]
-   [FAIL (Class #:implements (Class [m (Number -> Number)])
-                #:implements (Class [n (Number -> Number)])
-                (field [x Number]))]
-   [FAIL (Class #:implements (Class [m (Number -> Number)])
-                #:implements (Class [m (Number -> Number)])
-                (field [x Number]))]
-   [FAIL (Class #:implements (Class (init [x Integer]) [m (Number -> Number)])
-                (field [x Number]))]
-   [FAIL (Class #:implements Number)]
-   [FAIL (Class #:implements Number [m (Number -> Number)])]
-   [FAIL (Class #:implements (Class [m (Number -> Number)]) [m String])]
-   [FAIL (Class #:implements (Class [m (Number -> Number)])
-                #:implements (Class [m (String -> String)])
-                (field [x Number]))]
-   [FAIL (Class #:implements (Class (augment [m (Number -> Number)]))
-                #:implements (Class (augment [m (String -> String)]))
-                (field [x Number]))]
-   [FAIL (Class #:implements (Class (augment [m (Number -> Number)]))
-                (augment [m (-> Number)]))]
-   ;; Test Object types
-   [(Object) (-object)]
-   [(Object [m (Number -> Number)])
-    (-object #:method ([m (t:-> N N)]))]
-   [(Object [m (Number -> Number)] (field [f Number]))
-    (-object #:method ([m (t:-> N N)]) #:field ([f N]))]
-   [FAIL (Object foobar)]
-   [FAIL (Object [x UNBOUND])]
-   [FAIL (Object [x Number #:random-keyword])]
-   [FAIL (Object (random-clause [x Number]))]
-   [FAIL (Object [x Number] [x Number])]
-   [FAIL (Object (field [x Number]) (field [x Number]))]
-   [FAIL (Object [x Number] [x Number])]
-   [FAIL (Object [m Number])]
-   ;; Test row polymorphic types
-   [(All (r #:row) ((Class #:row-var r) -> (Class #:row-var r)))
-    (-polyrow (r) (list null null null null)
-      (t:-> (-class #:row r) (-class #:row r)))]
-   [(All (r #:row (init x y z) (field f) m n)
-      ((Class #:row-var r) -> (Class #:row-var r)))
-    (-polyrow (r) (list '(x y z) '(f) '(m n) '())
-      (t:-> (-class #:row r) (-class #:row r)))]
-   ;; Class types cannot use a row variable that doesn't constrain
-   ;; all of its members to be absent in the row
-   [FAIL (All (r #:row (init x))
-           ((Class #:row-var r (init y)) -> (Class #:row-var r)))]
-   [FAIL (All (r #:row (init x y z) (field f) m n)
-           ((Class #:row-var r a b c) -> (Class #:row-var r)))]
-   ))
-
-;; FIXME - add tests for parse-values-type, parse-tc-results
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/prims-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/prims-tests.rkt
deleted file mode 100644
index 500761fa42..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/prims-tests.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-
-;; Tests for Typed Racket primitive macros
-
-(require "test-utils.rkt"
-         (base-env base-types-extra)
-         (base-env prims)
-         rackunit
-         unstable/macro-testing)
-
-(provide tests)
-(gen-test-main)
-
-(define-syntax-rule (check-ok exp)
-  (check-not-exn (λ () (convert-compile-time-error exp))))
-(define-syntax-rule (check-bad exp regex)
-  (check-exn regex (λ () (convert-compile-time-error exp))))
-
-;; These tests don't run the type-checker, they just correct expansion
-;; and error checking in primitive macros
-(define tests
-  (test-suite "Prims tests"
-    (check-bad (let () (: x : Listof Any) 'dummy)
-               #rx"multiple types")
-    (check-bad (let () (: x : -> String String) 'dummy)
-               #rx"multiple types")
-    (check-ok (let () (: x : String -> String -> String)
-                      (define x 0)
-                      'dummy))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/remove-intersect-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/remove-intersect-tests.rkt
deleted file mode 100644
index fe2da6ec3f..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/remove-intersect-tests.rkt
+++ /dev/null
@@ -1,75 +0,0 @@
-#lang racket/base
-(require "test-utils.rkt"
-         (for-syntax racket/base)
-         (r:infer infer)
-         (types abbrev numeric-tower subtype union remove-intersect)
-         rackunit)
-(provide tests)
-(gen-test-main)
-
-(define-syntax (over-tests stx)
-  (syntax-case stx ()
-    [(_ [t1 t2 res] ...)
-     #'(test-suite "Tests for overlap"
-                   (test-check (format "~a ~a" 't1 't2) (lambda (a b) (eq? (not (not a)) b)) (overlap t1 t2) res) ...)]))
-
-(define overlap-tests
-  (over-tests
-   [-Number -Integer #t]))
-
-(define-syntax (restr-tests stx)
-  (syntax-case stx ()
-    [(_ [t1 t2 res] ...)
-     #'(test-suite "Tests for restrict"
-                   (test-check (format "~a ~a" 't1 't2) type-compare? (restrict t1 t2) res) ...)]))
-
-
-(define restrict-tests
-  (restr-tests
-   [-Number (Un -Number -Symbol) -Number]
-   [-Number -Number -Number]
-   [(Un (-val 'foo) (-val 6)) (Un -Number -Symbol) (Un (-val 'foo) (-val 6))]
-   [-Number (-mu a (Un -Number -Symbol (make-Listof a))) -Number]
-   [(Un -Number -Boolean) (-mu a (Un -Number -Symbol (make-Listof a))) -Number]
-   [(-mu x (Un -Number (make-Listof x))) (Un -Symbol -Number -Boolean) -Number]
-   [(Un -Number -String -Symbol -Boolean) -Number -Number]
-
-   [(-lst -Number) (-pair Univ Univ) (-pair -Number (-lst -Number))]
-   [(-lst -Number) (-poly (a) (-lst a)) (-lst -Number)]
-   ;; FIXME
-   #;
-   [-Listof -Sexp (-lst (Un B N -String Sym))]
-   #;
-   [-Sexp -Listof (-lst -Sexp)]
-   [(-val "one") -Fixnum (Un)]
-   [(Un (-val "one") (-val "two")) (Un (-val "one") (-val 1)) (-val "one")]
-   ))
-
-(define-syntax (remo-tests stx)
-  (syntax-case stx ()
-    [(_ [t1 t2 res] ...)
-     (syntax/loc stx
-       (test-suite "Tests for remove"
-                   (test-check (format "~a ~a" 't1 't2) type-compare? (remove t1 t2) res) ...))]))
-
-(define remove-tests
-  (remo-tests
-   [(Un -Number -Symbol) -Number -Symbol]
-   [-Number -Number (Un)]
-   [(-mu x (Un -Number -Symbol (make-Listof x))) -Number (Un -Symbol (make-Listof (-mu x (Un -Number -Symbol (make-Listof x)))))]
-   [(-mu x (Un -Number -Symbol -Boolean (make-Listof x))) -Number (Un -Symbol -Boolean (make-Listof (-mu x (Un -Number -Symbol -Boolean (make-Listof x)))))]
-   [(Un (-val #f) (-mu x (Un -Number -Symbol (make-Listof (-v x)))))
-    (Un -Boolean -Number)
-    (Un -Symbol (make-Listof (-mu x (Un -Number -Symbol (make-Listof x)))))]
-   [(Un (-val 'foo) (-val 6)) (Un -Number -Symbol) (Un)]
-   [(-> (Un -Symbol -Number) -Number) (-> -Number -Number) (Un)]
-   [(Un (-poly (a) (make-Listof a)) (-> -Number -Number)) (-> -Number -Number) (-poly (a) (make-Listof a))]
-   [(Un -Symbol -Number) (-poly (a) -Number) -Symbol]
-   [(-pair -Number (-v a)) (-pair Univ Univ) (Un)]
-   ))
-
-(define tests
-  (test-suite "Remove Intersect"
-     remove-tests
-     restrict-tests
-     overlap-tests))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/rep-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/rep-tests.rkt
deleted file mode 100644
index 8154c9dc1d..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/rep-tests.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-
-;; Tests for TR representation data structures such as types
-
-(require "test-utils.rkt"
-         rackunit
-         typed-racket/rep/rep-utils
-         typed-racket/rep/type-rep
-         typed-racket/types/abbrev)
-
-(provide tests)
-(gen-test-main)
-
-(define tests
-  (test-suite
-   "Tests for TR IR data structures"
-
-   ;; Make sure that unsafe operations return the same results as safe ones
-   (check-equal? (Rep-seq -String) (unsafe-Rep-seq -String))
-   (check-equal? (Rep-seq (-pair -String -String)) (unsafe-Rep-seq (-pair -String -String)))
-   (check-equal? (Type-key -String) (unsafe-Type-key -String))
-   (check-equal? (Type-key (-pair -String -String)) (unsafe-Type-key (-pair -String -String)))
-   ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt
deleted file mode 100644
index 5de1ce7982..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt
+++ /dev/null
@@ -1,148 +0,0 @@
-#lang racket
-
-(require "test-utils.rkt"
-         "evaluator.rkt"
-         (for-syntax racket/base)
-         (for-template racket/base)
-         (rep type-rep filter-rep object-rep)
-         (for-syntax (rename-in (types utils union numeric-tower abbrev filter-ops)
-                                [Un t:Un]
-                                [-> t:->]))
-         (utils tc-utils utils)
-         (utils mutated-vars)
-
-         rackunit rackunit/text-ui
-         syntax/parse
-         racket/file racket/port
-         syntax/location
-         (for-syntax syntax/kerncase syntax/parse racket/syntax
-                     (types abbrev numeric-tower utils)
-                     (utils mutated-vars) (env mvar-env)
-                     (utils tc-utils) (typecheck typechecker))
-         typed-racket/base-env/prims
-         typed-racket/base-env/base-types
-         (for-syntax typed-racket/standard-inits))
-(provide tests)
-(gen-test-main)
-
-(begin-for-syntax (do-standard-inits))
-
-(define-syntax-rule (tc-e/t e t) (tc-e e #:ret (ret t -true-filter)))
-
-(define-syntax (tc-e stx)
-  (syntax-parse stx
-    [(tc-e expr ty) (syntax/loc stx (tc-e expr #:ret (ret ty)))]
-    [(id a #:ret b)
-     (syntax/loc stx
-       (test-case (format "~a ~a" (quote-line-number id) 'a)
-         (let-values
-           ([(res1 expanded)
-             (phase1-phase0-eval
-               (let ([ex (local-expand #'a 'expression null)])
-                 (find-mutated-vars ex mvar-env)
-                 #`(values '#,(tc-expr ex) '#,(syntax->datum ex))))]
-            [(res2) (phase1-phase0-eval #`'#,b)])
-           (with-check-info (['expanded expanded])
-             (unless (tc-result-equal/test? res1 res2)
-               (fail-check "Expression didn't have expected type."))))))]))
-
-(define tests
-  (test-suite
-   "Special Typechecker tests"
-   ;; should work but don't -- need expected type
-   #|
-[tc-e (for/list ([(k v) (in-hash #hash((1 . 2)))]) 0) (-lst -Zero)]
-[tc-e (in-list (list 1 2 3)) (-seq -Integer)]
-[tc-e (in-vector (vector 1 2 3)) (-seq -Integer)]
-|#
-
-   [tc-e (in-hash #hash((1 . 2))) (-seq -Integer -Integer)]
-   [tc-e (in-hash-keys #hash((1 . 2))) (-seq -Integer)]
-   [tc-e (in-hash-values #hash((1 . 2))) (-seq -Integer)]
-
-   (tc-e (file->string "tmp") -String)
-   (tc-e (file->string "tmp" #:mode 'binary) -String)
-   (tc-e (file->string "tmp" #:mode 'text) -String)
-
-   (tc-e (file->bytes "tmp") -Bytes)
-   (tc-e (file->bytes "tmp" #:mode 'binary) -Bytes)
-   (tc-e (file->bytes "tmp" #:mode 'text) -Bytes)
-
-   (tc-e (file->list "tmp") (-lst Univ))
-   (tc-e ((inst file->list Any) "tmp" #:mode 'binary) (-lst Univ))
-   (tc-e ((inst file->list Any) "tmp" #:mode 'text) (-lst Univ))
-
-   (tc-e (file->list "tmp" (lambda (x) "string")) (-lst -String))
-   (tc-e ((inst file->list String) "tmp" (lambda (x) "string") #:mode 'binary) (-lst -String))
-   (tc-e ((inst file->list String) "tmp" (lambda (x) "string") #:mode 'text) (-lst -String))
-
-   (tc-e (file->lines "tmp") (-lst -String))
-   (tc-e (file->lines "tmp" #:mode 'text) (-lst -String))
-   (tc-e (file->lines "tmp" #:line-mode (first (shuffle '(linefeed return return-linefeed any any-one)))
-                      #:mode 'binary)  (-lst -String))
-
-
-   (tc-e (file->bytes-lines "tmp") (-lst -Bytes))
-   (tc-e (file->bytes-lines "tmp" #:mode 'text) (-lst -Bytes))
-   (tc-e (file->bytes-lines "tmp" #:line-mode (first (shuffle '(linefeed return return-linefeed any any-one)))
-                            #:mode 'binary)  (-lst -Bytes))
-
-   (tc-e (display-to-file "a" "tmp" #:mode (if (= 1 2) 'binary 'text)
-                          #:exists (first (shuffle '(error append update replace truncate truncate/replace))))
-         -Void)
-
-   (tc-e (write-to-file "a" "tmp" #:mode (if (= 1 2) 'binary 'text)
-                        #:exists (first (shuffle '(error append update replace truncate truncate/replace))))
-         -Void)
-
-
-   (tc-e (display-lines-to-file (list 2 'esha "esht") "tmp" #:separator #f
-                                #:mode (if (= 1 2) 'binary 'text)
-                                #:exists (first (shuffle '(error append update replace truncate truncate/replace))))
-         -Void)
-
-   (tc-e (get-preference 'pref (lambda () 'error) 'timestamp #f #:use-lock? #t #:timeout-lock-there #f #:lock-there #f) Univ)
-
-
-   (tc-e (make-handle-get-preference-locked .3 'sym (lambda () 'eseh) 'timestamp #f #:lock-there #f #:max-delay .45)
-         (t:-> -Pathlike Univ))
-
-   (tc-e (call-with-file-lock/timeout #f 'exclusive (lambda () 'res) (lambda () 'err)
-                                      #:lock-file "lock"
-                                      #:delay .01
-                                      #:max-delay .2) (one-of/c 'res 'err))
-
-   (tc-e (make-derived-parameter current-input-port
-                                 (lambda: ((s : String)) (open-input-file s))
-                                 object-name) (-Param -String Univ))
-
-   ;; exception handling
-   [tc-e (with-handlers ([void (λ (x) (values 0 0))]) (values  "" ""))
-         #:ret (ret (list (t:Un -Zero -String) (t:Un -Zero -String))
-                    (list -true-filter -true-filter))]
-
-   (tc-e (make-temporary-file) -Path)
-   (tc-e (make-temporary-file "ee~a") -Path)
-   (tc-e (make-temporary-file "ee~a" 'directory) -Path)
-   (tc-e (make-temporary-file "ee~a" "temp" "here") -Path)
-
-   ;; more sequences
-   [tc-e (sequence-ref (in-directory) 0) -Path]
-   [tc-e (in-mlist (ann (mcons 'a null) (MListof 'a))) (-seq (-val 'a))]
-   [tc-e (in-producer (λ () 'hi)) (-seq (-val 'hi))]
-   [tc-e (in-producer (λ: ([x : String]) 'hi) symbol? "foo")
-         (-seq (-val 'hi))]
-   [tc-e (in-value 'hi) (-seq (-val 'hi))]
-   [tc-e (in-indexed '(a b c)) (-seq (one-of/c 'a 'b 'c) -Nat)]
-   [tc-e (in-sequences '(a b) '(z y)) (-seq (one-of/c 'a 'b 'z 'y))]
-   [tc-e (in-cycle '(a b) '(z y)) (-seq (one-of/c 'a 'b 'z 'y))]
-   [tc-e (in-parallel '(a b) '(z y)) (-seq (one-of/c 'a 'b) (one-of/c 'z 'y))]
-   [tc-e (in-values-sequence (in-parallel '(a b) '(z y)))
-         (-seq (-lst* (one-of/c 'a 'b) (one-of/c 'z 'y)))]
-   [tc-e (in-values-sequence '(a b c))
-         (-seq (-lst* (one-of/c 'a 'b 'c)))]
-   [tc-e (in-values*-sequence (in-parallel '(a b) '(z y)))
-         (-seq (-lst* (one-of/c 'a 'b) (one-of/c 'z 'y)))]
-   [tc-e (in-values*-sequence '(a b c))
-         (-seq (one-of/c 'a 'b 'c))]
-   ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/static-contract-conversion-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/static-contract-conversion-tests.rkt
deleted file mode 100644
index eeb87090cc..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/static-contract-conversion-tests.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt" "evaluator.rkt"
-         rackunit
-         (only-in racket/contract contract?)
-         syntax/srcloc syntax/location
-         (for-syntax
-           syntax/parse
-           racket/base
-           (private type-contract)
-           (static-contracts instantiate)
-           (types abbrev numeric-tower union)))
-
-(provide tests)
-(gen-test-main)
-
-(define-syntax t/sc
-  (syntax-parser
-    [(_ e:expr)
-     (syntax/loc #'e
-       (test-case
-         (format "Conversion:~a" (quote-line-number e))
-         (with-check-info (['type 'e]
-                           ['location (build-source-location-list (quote-srcloc e))])
-           (phase1-phase0-eval
-             (define sc
-                (type->static-contract e (lambda (#:reason _) #f)))
-             (if sc
-                 #`(with-check-info (['static '#,sc])
-                     (phase1-phase0-eval
-                       (define ctc (cadr
-                                     (instantiate '#,sc
-                                       (lambda (#:reason _) (error "static-contract could not be converted to a contract")))))
-                       #,#'#`(with-check-info (['contract '#,ctc])
-                          (define runtime-contract #,ctc)
-                          (check-pred contract? runtime-contract))))
-                 #'(fail-check "Type could not be converted to a static contract"))))))]))
-
-(define-syntax t/fail
-  (syntax-parser
-    [(_ e:expr (~optional (~seq #:typed-side typed-side) #:defaults ([typed-side #'#t])))
-     #`(test-case (format "~a" 'e)
-         (define sc
-           (phase1-phase0-eval
-             (let/ec exit
-               #`'#,(type->static-contract e (lambda (#:reason _) (exit #'#f)) #:typed-side typed-side))))
-         (when sc
-           (with-check-info (['static sc])
-             (fail-check "Type was incorrectly converted to contract"))))]))
-
-
-(define tests
-  (test-suite "Conversion Tests"
-    (t/sc (-Number . -> . -Number))
-    (t/sc (cl->* (-> -Symbol)
-                 (-Symbol . -> . -Symbol)))
-    (t/sc (cl->* (-> -Symbol)
-                 (-Symbol -Symbol . -> . -Symbol)))
-    (t/sc (cl->* (-Symbol . -> . -Symbol)
-                 (-Symbol -Symbol . -> . -Symbol)))
-    (t/sc (-Promise -Number))
-    (t/sc (-lst -Symbol))
-    (t/sc -Boolean)
-    (t/sc Univ)
-    (t/sc (-set Univ))
-    (t/sc (-poly (a) (-lst a)))
-    (t/fail ((-poly (a) (-vec a)) . -> . -Symbol))
-    (t/fail (-poly (a) (-lst a)) #:typed-side #f)
-    (t/sc (-mu a (-lst a)))
-    (t/sc (-mu a (-box a)))
-    (t/sc (-mu sexp (Un -Null -Symbol (-pair sexp sexp) (-vec sexp) (-box sexp))))
-    (t/sc (-mu a (-> a a)))
-    (t/sc (-seq -Symbol))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/static-contract-optimizer-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/static-contract-optimizer-tests.rkt
deleted file mode 100644
index ac9167b816..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/static-contract-optimizer-tests.rkt
+++ /dev/null
@@ -1,332 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt"
-         racket/list racket/format rackunit
-         (static-contracts instantiate optimize combinators structures)
-         (for-syntax racket/base syntax/parse))
-
-(provide tests)
-(gen-test-main)
-
-(define-syntax (check-optimize stx)
-  (syntax-parse stx
-    [(_ argument* #:pos positive-expected* #:neg negative-expected*)
-     #'(test-suite (~a 'argument*)
-         (test-case "Trusted Positive"
-           (check-optimize-helper argument* positive-expected* #t #f))
-         (test-case "Trusted Negative"
-           (check-optimize-helper argument* negative-expected* #f #t)))]))
-
-(define (check-optimize-helper argument expected trusted-positive trusted-negative)
-  (define trusted-side
-    (cond
-      [(and trusted-positive trusted-negative) 'both]
-      [trusted-positive 'positive]
-      [trusted-negative 'negative]
-      [else 'neither]))
-  (with-check-info*
-    (list (make-check-info 'original argument)
-          (make-check-info 'trusted trusted-side)
-          (make-check-expected expected))
-    (λ ()
-      (let ([opt (optimize argument
-                   #:trusted-positive trusted-positive
-                   #:trusted-negative trusted-negative)])
-        (with-check-info* (list (make-check-actual opt))
-          (lambda ()
-            (unless (equal? opt expected)
-              (fail-check))))))))
-
-(define-syntax (check-syntax stx)
-  (syntax-parse stx
-    [(_ argument* expected*)
-     #'(test-case (~a 'argument*)
-         (define argument argument*)
-         (define expected expected*)
-         (with-check-info*
-           (list (make-check-info 'original argument)
-                 (make-check-expected expected))
-           (λ ()
-             (let ([ctc (syntax->datum
-                         (cadr
-                          (instantiate
-                            (optimize argument #:trusted-positive #t)
-                            (λ (#:reason [reason #f]) (error 'nyi))
-                            'impersonator)))])
-               (with-check-info* (list (make-check-actual ctc))
-                 (λ ()
-                   (unless (equal? ctc expected)
-                     (fail-check))))))))]))
-
-;; Ids with unique identity so that equals works
-(define foo-id #'foo)
-(define bar-id #'bar)
-
-(define syntax-tests
-  (test-suite "Optimized Syntax Tests"
-    (check-syntax list?/sc
-      'any/c)
-    (check-syntax (arr/sc null #f (list list?/sc))
-      '(-> any))
-    (check-syntax (hash/sc list?/sc list?/sc)
-      '(hash/c list? list?))
-
-    ))
-
-
-(define optimizer-tests
-  (test-suite "Optimizer Tests"
-    ;; Lists
-    (check-optimize (listof/sc any/sc)
-      #:pos any/sc
-      #:neg list?/sc)
-    (check-optimize (listof/sc none/sc)
-      #:pos any/sc
-      #:neg empty-list/sc)
-
-    ;; Heterogeneous Lists
-    ;; TODO fix ability to test equality here
-    #;
-    (check-optimize (list/sc any/sc)
-      #:pos any/sc
-      #:neg (list-length/sc 1))
-    (check-optimize (list/sc none/sc)
-      #:pos any/sc
-      #:neg none/sc)
-    (check-optimize (list/sc)
-      #:pos any/sc
-      #:neg empty-list/sc)
-
-    ;; Sets
-    (check-optimize (set/sc any/sc)
-      #:pos any/sc
-      #:neg set?/sc)
-    (check-optimize (set/sc none/sc)
-      #:pos any/sc
-      #:neg empty-set/sc)
-
-
-    ;; Vectors
-    (check-optimize (vectorof/sc any/sc)
-      #:pos any/sc
-      #:neg vector?/sc)
-    (check-optimize (vectorof/sc none/sc)
-      #:pos (vectorof/sc none/sc)
-      #:neg (vectorof/sc none/sc))
-
-    ;; Heterogeneous Vectors
-    ;; TODO fix ability to test equality here
-    #;
-    (check-optimize (vector/sc any/sc)
-      #:pos any/sc
-      #:neg (vector-length/sc 1))
-    (check-optimize (vector/sc none/sc)
-      #:pos (vector/sc none/sc)
-      #:neg (vector/sc none/sc))
-    ;; TODO fix ability to test equality here
-    #;
-    (check-optimize (vector/sc)
-      #:pos any/sc
-      #:neg empty-vector/sc)
-    (check-optimize (vector/sc set?/sc)
-      #:pos (vector/sc set?/sc)
-      #:neg (vector/sc set?/sc))
-
-    ;; HashTables
-    (check-optimize (hash/sc any/sc any/sc)
-      #:pos any/sc
-      #:neg hash?/sc)
-    (check-optimize (hash/sc none/sc any/sc)
-      #:pos (hash/sc none/sc any/sc)
-      #:neg (hash/sc none/sc any/sc))
-    (check-optimize (hash/sc any/sc none/sc)
-      #:pos (hash/sc any/sc none/sc)
-      #:neg (hash/sc any/sc none/sc))
-
-    ;; And
-    (check-optimize (and/sc set?/sc)
-      #:pos any/sc
-      #:neg set?/sc)
-    (check-optimize (and/sc set?/sc any/sc)
-      #:pos any/sc
-      #:neg set?/sc)
-    (check-optimize (and/sc set?/sc none/sc)
-      #:pos any/sc
-      #:neg none/sc)
-    (check-optimize (and/sc)
-      #:pos any/sc
-      #:neg any/sc)
-    (check-optimize (and/sc any/sc any/sc)
-      #:pos any/sc
-      #:neg any/sc)
-
-
-    ;; Or
-    (check-optimize (or/sc set?/sc)
-      #:pos any/sc
-      #:neg set?/sc)
-    (check-optimize (or/sc set?/sc any/sc)
-      #:pos any/sc
-      #:neg any/sc)
-    (check-optimize (or/sc set?/sc none/sc)
-      #:pos any/sc
-      #:neg set?/sc)
-    (check-optimize (or/sc)
-      #:pos any/sc
-      #:neg none/sc)
-    (check-optimize (or/sc none/sc none/sc)
-      #:pos any/sc
-      #:neg none/sc)
-
-    ;; None
-    (check-optimize none/sc
-      #:pos any/sc
-      #:neg none/sc)
-
-    ;; Boxes
-    (check-optimize (box/sc any/sc)
-      #:pos any/sc
-      #:neg box?/sc)
-    (check-optimize (box/sc none/sc)
-      #:pos (box/sc none/sc)
-      #:neg (box/sc none/sc))
-    (check-optimize (box/sc set?/sc)
-      #:pos (box/sc set?/sc)
-      #:neg (box/sc set?/sc))
-
-    ;; Syntax Objects
-    (check-optimize (syntax/sc any/sc)
-      #:pos any/sc
-      #:neg syntax?/sc)
-    (check-optimize (syntax/sc none/sc)
-      #:pos any/sc
-      #:neg none/sc)
-    (check-optimize (syntax/sc set?/sc)
-      #:pos any/sc
-      #:neg (syntax/sc set?/sc))
-
-    ;; Promises
-    (check-optimize (promise/sc any/sc)
-      #:pos any/sc
-      #:neg promise?/sc)
-    (check-optimize (promise/sc none/sc)
-      #:pos any/sc
-      #:neg (promise/sc none/sc))
-    (check-optimize (promise/sc set?/sc)
-      #:pos any/sc
-      #:neg (promise/sc set?/sc))
-    (check-optimize (promise/sc (box/sc set?/sc))
-      #:pos (promise/sc (box/sc set?/sc))
-      #:neg (promise/sc (box/sc set?/sc)))
-
-    (check-optimize
-      (function/sc (list (listof/sc any/sc))
-                   (list)
-                   (list)
-                   (list)
-                   #f
-                   (list (listof/sc any/sc)))
-      #:pos
-      (function/sc (list list?/sc)
-                   (list)
-                   (list)
-                   (list)
-                   #f
-                   #f)
-      #:neg
-      (function/sc (list any/sc)
-                   (list)
-                   (list)
-                   (list)
-                   #f
-                   (list list?/sc)))
-    (check-optimize
-      (function/sc (list (listof/sc any/sc))
-                   (list)
-                   (list)
-                   (list)
-                   #f
-                   (list any/sc))
-      #:pos
-      (function/sc (list list?/sc)
-                   (list)
-                   (list)
-                   (list)
-                   #f
-                   #f)
-      #:neg
-      (function/sc (list any/sc)
-                   (list)
-                   (list)
-                   (list)
-                   #f
-                   (list any/sc)))
-
-    (check-optimize (case->/sc empty)
-      #:pos (case->/sc empty)
-      #:neg (case->/sc empty))
-    (check-optimize (parameter/sc list?/sc set?/sc)
-      #:pos (parameter/sc list?/sc any/sc)
-      #:neg (parameter/sc any/sc set?/sc))
-
-    (check-optimize
-      (case->/sc (list (arr/sc (list (listof/sc any/sc)) (listof/sc (set/sc any/sc)) (list (listof/sc any/sc)))))
-      #:pos (case->/sc (list (arr/sc (list list?/sc) (listof/sc set?/sc) #f)))
-      #:neg (case->/sc (list (arr/sc (list any/sc) any/sc (list list?/sc)))))
-
-    (check-optimize
-      (object/sc (list (member-spec 'field 'x (listof/sc any/sc))))
-      #:pos (object/sc (list (member-spec 'field 'x list?/sc)))
-      #:neg (object/sc (list (member-spec 'field 'x list?/sc))))
-
-    (check-optimize
-      (class/sc (list (member-spec 'field 'x (listof/sc any/sc))) #f)
-      #:pos (class/sc (list (member-spec 'field 'x list?/sc)) #f)
-      #:neg (class/sc (list (member-spec 'field 'x list?/sc)) #f))
-
-    (check-optimize
-      (recursive-sc (list foo-id bar-id)
-                    (list (listof/sc (recursive-sc-use foo-id))
-                          (listof/sc (recursive-sc-use bar-id)))
-                    (recursive-sc-use foo-id))
-      #:pos (recursive-sc (list foo-id)
-                          (list (listof/sc (recursive-sc-use foo-id)))
-                          (recursive-sc-use foo-id))
-      #:neg (recursive-sc (list foo-id)
-                          (list (listof/sc (recursive-sc-use foo-id)))
-                          (recursive-sc-use foo-id)))
-
-    (check-optimize
-      (recursive-sc (list foo-id bar-id)
-                    (list (listof/sc any/sc )
-                          (listof/sc any/sc))
-                    (recursive-sc-use foo-id))
-      #:pos any/sc
-      #:neg list?/sc)
-
-    (check-optimize (cons/sc any/sc list?/sc)
-      #:pos any/sc
-      #:neg (cons/sc any/sc list?/sc))
-
-    (check-optimize
-      (case->/sc
-        (list
-          (arr/sc empty #f (list set?/sc))
-          (arr/sc (list identifier?/sc) #f (list (listof/sc set?/sc)))))
-      #:pos  (function/sc (list)
-                          (list identifier?/sc)
-                          (list)
-                          (list)
-                          #f
-                          #f)
-      #:neg (case->/sc
-              (list
-                (arr/sc empty #f (list set?/sc))
-                (arr/sc (list any/sc) #f (list (listof/sc set?/sc))))))
-
-    ))
-
-(define tests
-  (test-suite "Static Contracts"
-    syntax-tests
-    optimizer-tests))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subst-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subst-tests.rkt
deleted file mode 100644
index a03957753e..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subst-tests.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt"
-         (rep type-rep)
-         (types utils abbrev numeric-tower substitute)
-         rackunit)
-(provide tests)
-(gen-test-main)
-
-(define-syntax-rule (s img var tgt result)
-  (test-eq? (format "~a" '(img tgt)) (substitute img 'var tgt) result))
-
-
-(define-syntax-rule (s* imgs rest var tgt result)
-  (test-eq? (format "~a" '(img tgt)) (substitute-dots (list . imgs) rest 'var tgt) result))
-
-(define-syntax-rule (s... imgs var tgt result)
-  (test-eq? (format "~a" '(img tgt)) (substitute-dots (list . imgs) #f 'var tgt) result))
-
-(define tests
-  (test-suite "Tests for substitution"
-    (s -Number a (-v a) -Number)
-    (s* (-Symbol -String) #f a (make-ListDots (-v a) 'a) (-lst* -Symbol -String))
-    (s* (-Symbol -String) Univ a (make-ListDots (-v a) 'a) (-lst* -Symbol -String #:tail (-lst Univ)))
-    (s... (-Number -Boolean) a (make-Function (list (make-arr-dots null -Number (-v a) 'a))) (-Number -Boolean . -> . -Number))
-    (s... (-Number -Boolean) a (make-Function (list (make-arr-dots (list -String) -Number (-v a) 'a))) (-String -Number -Boolean . -> . -Number))
-    (s... (-Number -Boolean) a (make-Function (list (make-arr-dots (list -String) -Number (-v b) 'a))) (-String (-v b) (-v b) . -> . -Number))
-    (s... (-Number -Boolean) a (make-Function (list (make-arr-dots (list -String) -Number (-v b) 'b)))
-          (make-Function (list (make-arr-dots (list -String) -Number (-v b) 'b))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subtype-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subtype-tests.rkt
deleted file mode 100644
index 7eda6560c5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subtype-tests.rkt
+++ /dev/null
@@ -1,350 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt"
-         (types subtype numeric-tower union utils abbrev)
-         (rep type-rep)
-         (env init-envs type-env-structs)
-         rackunit
-         (for-syntax racket/base))
-
-(provide tests)
-(gen-test-main)
-
-(define-syntax (subtyping-tests stx)
-  (define (single-test stx)
-    (syntax-case stx (FAIL)
-      [(FAIL t s) (syntax/loc stx (test-check (format "FAIL ~a" '(t s)) (lambda (a b) (not (subtype a b))) t s))]
-      [(t s) (syntax/loc stx (test-check (format "~a" '(t s)) subtype t s))]))
-  (syntax-case stx ()
-    [(_ cl ...)
-     (with-syntax ([(new-cl ...) (map single-test (syntax->list #'(cl ...)))])
-                  (syntax/loc stx
-                              (begin (test-suite "Tests for subtyping"
-                                                 new-cl ...))))]))
-
-
-
-(define t1 (-mu T (-lst (Un (-v a) T))))
-(define t2 (unfold t1))
-
-(define tests
-  (subtyping-tests
-   ;; trivial examples
-   (Univ Univ)
-   (-Number Univ)
-   (-Boolean Univ)
-   (-Symbol Univ)
-   (-Void Univ)
-   [-Number -Number]
-   [(Un (-pair Univ (-lst Univ)) -Null) (-lst Univ)]
-   [(-lst* -Number -Number (-val 'foo)) (-lst Univ)]
-   [(-lst* -Number -Number (-val 'foo)) (-lst (Un -Number -Symbol))]
-   [(-pair (-val 6) (-val 6)) (-pair -Number -Number)]
-   [(-val 6) (-val 6)]
-   ;; unions
-   [(Un -Number) -Number]
-   [(Un -Number -Number) -Number]
-   [(Un -Number -Symbol) (Un -Symbol -Number)]
-   [(Un (-val 6) (-val 7)) -Number]
-   [(Un (-val #f) (Un (-val 6) (-val 7))) (Un -Number (Un -Boolean -Symbol))]
-   [(Un (-val #f) (Un (-val 6) (-val 7))) (-mu x (Un -Number (Un -Boolean -Symbol)))]
-   [(Un -Number (-val #f) (-mu x (Un -Number -Symbol (make-Listof x))))
-    (-mu x (Un -Number -Symbol -Boolean (make-Listof x)))]
-   ;; sexps vs list*s of nums
-   [(-mu x (Un -Number -Symbol (make-Listof x))) (-mu x (Un -Number -Symbol -Boolean (make-Listof x)))]
-   [(-mu x (Un -Number (make-Listof x))) (-mu x (Un -Number -Symbol (make-Listof x)))]
-   [(-mu x (Un -Number (make-Listof x))) (-mu y (Un -Number -Symbol (make-Listof y)))]
-   ;; a hard one
-   [(-mu x (Un -Number (-lst* x -Symbol x))) -Sexp]
-   [t1 (unfold t1)]
-   [(unfold t1) t1]
-   ;; simple function types
-   ((Univ . -> . -Number) (-Number . -> . Univ))
-   [(Univ Univ Univ . -> . -Number) (Univ Univ -Number . -> . -Number)]
-   ;; simple list types
-   [(make-Listof -Number) (make-Listof Univ)]
-   [(make-Listof -Number) (make-Listof -Number)]
-   [FAIL (make-Listof -Number) (make-Listof -Symbol)]
-   [(-mu x (make-Listof x)) (-mu x* (make-Listof x*))]
-   [(-pair -Number -Number) (-pair Univ -Number)]
-   [(-pair -Number -Number) (-pair -Number -Number)]
-   ;; from page 7
-   [(-mu t (-> t t)) (-mu s (-> s s))]
-   [(-mu s (-> -Number s)) (-mu t (-> -Number (-> -Number t)))]
-   ;; polymorphic types
-   [(-poly (t) (-> t t)) (-poly (s) (-> s s))]
-   [FAIL (make-Listof -Number) (-poly (t) (make-Listof t))]
-   [(-poly (a) (make-Listof (-v a))) (make-Listof -Number)]     ;;
-   [(-poly (a) -Number) -Number]
-
-   [(-val 6) -Number]
-   [(-val 'hello) -Symbol]
-   [(-set -Number) (make-Sequence (list -Number))]
-   [-FlVector (make-Sequence (list -Flonum))]
-   [-FlVector (make-Sequence (list -Number))]
-   [-FxVector (make-Sequence (list -Fixnum))]
-   [-FxVector (make-Sequence (list -Number))]
-   [((Un -Symbol -Number) . -> . -Number) (-> -Number -Number)]
-   [(-poly (t) (-> -Number t)) (-mu t (-> -Number t))]
-   ;; not subtypes
-   [FAIL (-val 'hello) -Number]
-   [FAIL (-val #f) -Symbol]
-   [FAIL (Univ Univ -Number -Number . -> . -Number) (Univ Univ Univ . -> . -Number)]
-   [FAIL (-Number . -> . -Number) (-> Univ Univ)]
-   [FAIL (Un -Number -Symbol) -Number]
-   [FAIL -Number (Un (-val 6) (-val 11))]
-   [FAIL -Symbol (-val 'Sym)]
-   [FAIL (Un -Symbol -Number) (-poly (a) -Number)]
-   ;; bugs found
-   [(Un (-val 'foo) (-val 6)) (Un (-val 'foo) (-val 6))]
-   [(-poly (a) (make-Listof (-v a))) (make-Listof (-mu x (Un (make-Listof x) -Number)))]
-   [FAIL (make-Listof (-mu x (Un (make-Listof x) -Number))) (-poly (a) (make-Listof a))]
-   [(-val -34.2f0) -NegSingleFlonum]
-   ;; case-lambda
-   [(cl-> [(-Number) -Number] [(-Boolean) -Boolean]) (-Number . -> . -Number)]
-   ;; special case for unused variables
-   [-Number (-poly (a) -Number)]
-   [FAIL (cl-> [(-Number) -Boolean] [(-Boolean) -Number]) (-Number . -> . -Number)]
-   ;; varargs
-   [(->* (list -Number) Univ -Boolean) (->* (list -Number) -Number -Boolean)]
-   [(->* (list Univ) -Number -Boolean) (->* (list -Number) -Number -Boolean)]
-   [(->* (list -Number) -Number -Boolean) (->* (list -Number) -Number -Boolean)]
-   [(->* (list -Number) -Number -Boolean) (->* (list -Number) -Number Univ)]
-   [(->* (list -Number) -Number -Number) (->* (list -Number -Number) -Number)]
-   [(->* (list -Number) -Number -Number) (->* (list -Number -Number -Number) -Number)]
-   [(->* (list -Number -Number) -Boolean -Number) (->* (list -Number -Number) -Number)]
-   [FAIL (->* (list -Number) -Number -Boolean) (->* (list -Number -Number -Number) -Number)]
-   [(->* (list -Number -Number) -Boolean -Number) (->* (list -Number -Number -Boolean -Boolean) -Number)]
-
-   [(-poly (a) (cl-> [() a]
-                     [(-Number) a]))
-    (cl-> [() (-pair -Number (-v b))]
-          [(-Number) (-pair -Number (-v b))])]
-
-   [(-values (list -Number)) (-values (list Univ))]
-
-   [(-poly (b) ((Un (make-Base 'foo #'dummy values #f)
-                    (-struct #'bar #f
-                             (list (make-fld -Number #'values #f) (make-fld b #'values #f))))
-                . -> . (-lst b)))
-    ((Un (make-Base 'foo #'dummy values #f) (-struct #'bar #f (list (make-fld -Number #'values #f) (make-fld (-pair -Number (-v a)) #'values #f))))
-     . -> . (-lst (-pair -Number (-v a))))]
-   [(-poly (b) ((-struct #'bar #f (list (make-fld -Number #'values #f) (make-fld b #'values #f))) . -> . (-lst b)))
-    ((-struct #'bar #f (list (make-fld -Number #'values #f) (make-fld (-pair -Number (-v a)) #'values #f))) . -> . (-lst (-pair -Number (-v a))))]
-
-   [(-poly (a) (a . -> . (make-Listof a))) ((-v b) . -> . (make-Listof (-v b)))]
-   [(-poly (a) (a . -> . (make-Listof a))) ((-pair -Number (-v b)) . -> . (make-Listof (-pair -Number (-v b))))]
-
-   [FAIL (-poly (a b) (-> a a)) (-poly (a b) (-> a b))]
-   [FAIL (-poly (a) (-poly (b) (-pair a b))) (-poly (a) (-poly (b) (-pair b a)))]
-
-   ;; The following currently are not subtypes, because they are not replacable
-   ;; in an instantiation context. It may be sound for them to be subtypes but
-   ;; the implications of that change are unknown.
-   [FAIL (-poly (x) (-lst x)) (-poly (x y) (-lst x))]
-   [FAIL (-poly (y z) (-lst y)) (-poly (z y) (-lst y))]
-   [FAIL (-poly (y) (-poly (z) (-pair y z))) (-poly (y z) (-pair y z))]
-   [FAIL (-poly (y z) (-pair y z)) (-poly (y) (-poly (z) (-pair y z)))]
-
-
-   ;; polymorphic function types should be subtypes of the function top
-   [(-poly (a) (a . -> . a)) top-func]
-   (FAIL (-> Univ) (null Univ . ->* . Univ))
-
-   [(cl->* (-Number . -> . -String) (-Boolean . -> . -String)) ((Un -Boolean -Number) . -> . -String)]
-   [(-struct #'a #f null) (-struct #'a #f null)]
-   [(-struct #'a #f (list (make-fld -String #'values #f))) (-struct #'a #f (list (make-fld -String #'values #f)))]
-   [(-struct #'a #f (list (make-fld -String #'values #f))) (-struct #'a #f (list (make-fld Univ #'values #f)))]
-   [(-val 0.0f0) -SingleFlonum]
-   [(-val -0.0f0) -SingleFlonum]
-   [(-val 1.0f0) -SingleFlonum]
-   [(-pair -String (-lst -String)) (-seq -String)]
-   [FAIL (-pair -String (-lst -Symbol)) (-seq -String)]
-   [FAIL (-pair -String (-vec -String)) (-seq -String)]
-   [(-mpair -String (-mlst -String)) (-seq -String)]
-   [FAIL (-mpair -String (-mlst -Symbol)) (-seq -String)]
-   [FAIL (-mpair -String (-vec -String)) (-seq -String)]
-   [(-mpair -String (-mlst (-val "hello"))) (-seq -String)]
-
-   [(-Param -Byte -Byte) (-Param (-val 0) -Int)]
-   [FAIL (-Param -Byte -Byte) (-Param -Int -Int)]
-   [(-Param -String -Symbol) (cl->* (-> -Symbol) (-> -String -Void))]
-
-   [(-vec t1) (-vec t2)]
-   [(make-HeterogeneousVector (list t1)) (-vec t2)]
-   [(make-HeterogeneousVector (list t1 t2)) (make-HeterogeneousVector (list t2 t1))]
-   [(-box t1) (-box t2)]
-   [(-thread-cell t1) (-thread-cell t2)]
-   [(-channel t1) (-channel t2)]
-   [(-mpair t1 t2) (-mpair t2 t1)]
-   [(-HT t1 t2) (-HT t2 t1)]
-   [(make-Prompt-Tagof t1 t2) (make-Prompt-Tagof t2 t1)]
-   [(make-Continuation-Mark-Keyof t1) (make-Continuation-Mark-Keyof t2)]
-
-   ;; evts
-   [(-evt t1) (-evt t2)]
-   [FAIL (-evt -Byte) (-evt -String)]
-   [-Semaphore (-evt -Semaphore)]
-   [FAIL -Semaphore (-evt -Int)]
-   [-Output-Port (-evt -Output-Port)]
-   [FAIL -Output-Port (-evt -Int)]
-   [-Input-Port (-evt -Input-Port)]
-   [FAIL -Input-Port (-evt -Int)]
-   [-TCP-Listener (-evt -TCP-Listener)]
-   [FAIL -TCP-Listener (-evt -Int)]
-   [-Thread (-evt -Thread)]
-   [FAIL -Thread (-evt -Int)]
-   [-Subprocess (-evt -Subprocess)]
-   [FAIL -Subprocess (-evt -Int)]
-   [-Will-Executor (-evt -Will-Executor)]
-   [FAIL -Will-Executor (-evt -Int)]
-   [(make-CustodianBox -String) (-evt (make-CustodianBox -String))]
-   [FAIL (make-CustodianBox -String) (-evt -String)]
-   [(-channel -String) (-evt -String)]
-   [FAIL (-channel -String) (-evt -Int)]
-   [-Log-Receiver (-evt (make-HeterogeneousVector
-                          (list -Symbol -String Univ
-                                (Un (-val #f) -Symbol))))]
-   [FAIL -Log-Receiver (-evt -Int)]
-
-   [(-val 5) (-seq -Nat)]
-   [(-val 5) (-seq -Byte)]
-   [-Index (-seq -Index)]
-   [-NonNegFixnum (-seq -NonNegFixnum)]
-   [-Index (-seq -Nat)]
-   [FAIL (-val -5) (-seq -Nat)]
-   [FAIL -Fixnum (-seq -Fixnum)]
-   [FAIL -NonNegFixnum (-seq -Index)]
-   [FAIL (-val 5.0) (-seq -Nat)]
-
-   [(-polydots (a) (->... (list Univ) (a a) (make-ValuesDots null a 'a)))
-    (-polydots (a) (->... (list -String) (a a) (make-ValuesDots null a 'a)))]
-
-   [(-polydots (a) (->... null (Univ a) (make-ValuesDots (list (-result a)) a 'a)))
-    (-polydots (a) (->... null (-String a) (make-ValuesDots (list (-result a)) a 'a)))]
-
-   [(-polydots (a) (->... null (a a) (make-ValuesDots (list (-result -String)) -String 'a)))
-    (-polydots (a) (->... null (a a) (make-ValuesDots (list (-result Univ)) Univ 'a)))]
-
-   [(-polydots (a) (->... null (Univ a) (-values (list Univ))))
-    (->* null Univ Univ)]
-
-
-   [(-polydots (a) (->... null (a a) (make-ListDots a 'a)))
-    (-> -String -Symbol (-Tuple (list -String -Symbol)))]
-   [(-> -String -Symbol (-Tuple (list -String -Symbol)))
-    (-polydots (a) (-> -String -Symbol (-lst (Un -String -Symbol))))]
-
-   [(-polydots (a) (->... null (a a) (make-ListDots a 'a)))
-    (-poly (a b) (-> a b (-Tuple (list a b))))]
-
-   [(-polydots (b a) (-> (->... (list b) (a a) (make-ValuesDots (list (-result b)) a 'a)) Univ))
-    (-polydots (a) (-> (->... (list) (a a) (make-ValuesDots null a 'a)) Univ))]
-
-   [(-polydots (a) (->... (list) (a a) (make-ListDots a 'a)))
-    (-polydots (b a) (->... (list b) (a a) (-pair b (make-ListDots a 'a))))]
-
-   [FAIL
-    (-polydots (c a b) (->... (list (->... (list a) (b b) c) (-vec a)) ((-vec b) b) (-vec c)))
-    (->* (list (->* (list) -Symbol -Symbol)) (-vec -Symbol) (-vec -Symbol))]
-
-   [(-> Univ -Boolean : (-FS (-filter -Symbol 0) (-not-filter -Symbol 0)))
-    (-> Univ -Boolean : -top-filter)]
-   [(-> Univ -Boolean : -bot-filter)
-    (-> Univ -Boolean : (-FS (-filter -Symbol 0) (-not-filter -Symbol 0)))]
-   [(-> Univ -Boolean : (-FS (-filter -Symbol 0) (-not-filter -Symbol 0)))
-    (-> (Un -Symbol -String) -Boolean : (-FS (-filter -Symbol 0) (-not-filter -Symbol 0)))]
-   [FAIL
-    (-> Univ -Boolean : (-FS (-filter -Symbol 0) (-not-filter -Symbol 0)))
-    (-> Univ -Boolean : (-FS (-filter -String 0) (-not-filter -String 0)))]
-
-   [FAIL (make-ListDots (-box (make-F 'a)) 'a) (-lst (-box Univ))]
-   [(make-ListDots (-> -Symbol (make-F 'a)) 'a) (-lst (-> -Symbol Univ))]
-
-   [FAIL (make-ValuesDots (list) -Symbol 'a) (make-ValuesDots (list (-result -String)) -String 'a)]
-   [(-values (list -Bottom)) (-values (list -String -Symbol))]
-
-   [(-> Univ -Bottom) (-> Univ (-values (list -String -Symbol)))]
-   [(-> Univ -Bottom) (-> Univ (-values-dots null -String 'x))]
-
-   [FAIL (make-pred-ty -String) (-> Univ (-AnyValues (-filter -String 0)))]
-
-   ;; keyword function types
-   [(->key #:x -Symbol #f Univ) (->key Univ)]
-   [FAIL (->key #:x -Symbol #t Univ) (->key Univ)]
-   [FAIL (->key Univ) (->key #:x -Symbol #t Univ)]
-   [(->key #:x -Symbol #f #:y -Symbol #f Univ) (->key Univ)]
-   [FAIL (->key #:x -Symbol #f #:y -Symbol #t Univ) (->key Univ)]
-   [(->key #:x -Symbol #f #:y -Symbol #f Univ) (->key #:x -Symbol #f Univ)]
-   [(->key #:x -Symbol #f #:y -Symbol #f Univ) (->key #:x -Symbol #t Univ)]
-   [FAIL (->key #:x -Symbol #f Univ) (->key #:x -Symbol #f #:y -Symbol #f Univ)]
-   [(->key #:x -Symbol #f #:y -Symbol #f Univ)
-    (->key #:x -Symbol #t #:y -Symbol #t Univ)]
-   [FAIL
-    (->key #:x -Symbol #t #:y -Symbol #f Univ)
-    (->key #:x -Symbol #f #:y -Symbol #t Univ)]
-   [(->key #:x (-opt -String) #f #:y -Symbol #f Univ)
-    (->key #:x -String #t Univ)]
-   [FAIL
-    (->key #:x -String #f #:y -Symbol #f Univ)
-    (->key #:x (-opt -String) #t Univ)]
-   [(->key -String #:x -Symbol #f #:y -Symbol #f Univ)
-    (->key -String #:x -Symbol #t Univ)]
-   [FAIL
-    (->key -String #:x -Symbol #f #:y -Symbol #f Univ)
-    (->key -Void #:x -Symbol #t Univ)]
-   [(->optkey -String [-String] #:x -Symbol #f #:y -Symbol #f Univ)
-    (->key -String #:x -Symbol #t Univ)]
-   [(->optkey -String [-String] #:x -Symbol #f #:y -Symbol #f Univ)
-    (->optkey -String [-String] #:x -Symbol #t Univ)]
-   [FAIL
-    (->optkey -String [-String] #:x -Symbol #f #:y -Symbol #f Univ)
-    (->optkey -String [-Void] #:x -Symbol #t Univ)]
-   [FAIL
-    (->key -String #:x -Symbol #f #:y -Symbol #f Univ)
-    (->optkey -String [-Void] #:x -Symbol #t Univ)]
-
-   ;; classes and objects
-   [(-class #:method ((m (-> -Nat))) #:augment ((m (-> -Nat))))
-    (-class #:method ((m (-> -Nat))) #:augment ((m (-> -Nat))))]
-   [(-object #:method ((m (-> -Nat))) #:augment ((m (-> -Nat))))
-    (-object #:method ((m (-> -Nat))) #:augment ((m (-> -Nat))))]
-   [(-object #:method ((m (-> -Nat)) (n (-> -Nat))))
-    (-object #:method ((m (-> -Nat))))]
-   [(-object #:method ((f (-> -Nat))) #:augment ((m (-> -Nat)) (n (-> -Nat))))
-    (-object #:augment ((m (-> -Nat))))]
-   [(-object #:field ((a -Nat)) #:method ((m (-> -Nat)) (n (-> -Nat))))
-    (-object #:method ((m (-> -Nat))))]
-   [(-object #:field ((x -Symbol)))
-    (-object #:field ((x -Symbol)))]
-   [(-object #:field ((x -Symbol)))
-    (-object #:field ((x (Un -Symbol (-val #f)))))]
-   [FAIL
-    (-object #:field ((a -Symbol)))
-    (-object #:field ((x -Symbol)))]
-   [FAIL
-    (-object #:field ((a -Symbol)))
-    (-object #:field ((x -String)))]
-   [FAIL
-    (-object #:field ((x -Symbol)))
-    (-object #:field ((x -String)))]
-   [FAIL
-    (-object #:method ((m (-> -String)) (n (-> -String))))
-    (-object #:method ((x (-> -String))))]
-   [(-object #:method ((m (-> -String)) (n (-> -String))))
-    (-object #:method ((m (-> -String))))]
-   [FAIL
-    (-object #:method ())
-    (-object #:method ((m (-> -String))))]
-   [FAIL
-    (-object #:method ((m (-> -Nat)) (n (-> -Nat))))
-    (-object #:method ((l (-> -Nat)) (m (-> -Nat))))]
-   [(-object #:method ((m (-> -Nat)) (n (-> -Nat))))
-    (-object #:method ((n (-> -Nat)) (m (-> -Nat))))]
-   [FAIL
-    (-class #:method ((m (-> -Nat))))
-    (-class #:method ((m (-> -Nat))) #:augment ((m (-> -Nat))))]
-   [FAIL
-    (-class #:method ((m (-> -Nat))) #:augment ((m (-> -Nat))))
-    (-class #:method ((m (-> -Nat))))]
-   ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt
deleted file mode 100644
index 1521c79f71..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-
-(require racket/require-syntax
-         racket/match
-         racket/gui/dynamic
-         typed-racket/utils/utils
-         (for-syntax racket/base syntax/parse)
-         (types utils)
-         (rep type-rep)
-         rackunit rackunit/text-ui)
-
-(provide private typecheck (rename-out [infer r:infer]) utils env rep types base-env static-contracts
-         (all-defined-out))
-
-;; FIXME - do something more intelligent
-(define (tc-result-equal/test? a b)
-  (equal? a b))
-
-(define-syntax (check-type-equal? stx)
-  (syntax-case stx ()
-    [(_ nm a b)
-     (syntax/loc stx (test-check nm type-equal? a b))]))
-
-(define-syntax gen-test-main
-  (syntax-parser
-    [(stx:id)
-     #`(module* main #f
-         (require rackunit/text-ui)
-         (void (run-tests #,(datum->syntax #'stx 'tests))))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/tooltip-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/tooltip-tests.rkt
deleted file mode 100644
index 99ead4307c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/tooltip-tests.rkt
+++ /dev/null
@@ -1,103 +0,0 @@
-#lang racket/base
-
-;; Tests for Typed Racket tooltips that are normally displayed in DrRacket.
-;; These tests capture those results by listening to a logger and checks that
-;; certain types are recorded at the right locations.
-
-(require "test-utils.rkt"
-         racket/match
-         rackunit
-         unstable/list
-         (for-syntax racket/base))
-
-(provide tests)
-(gen-test-main)
-
-(define-for-syntax debug? #f)
-(define-syntax (debug stx)
-  (syntax-case stx ()
-    [(_ e) debug? #'e]
-    [_ #'(void)]))
-
-(define-logger online-check-syntax)
-(define receiver
-  (make-log-receiver online-check-syntax-logger 'info 'online-check-syntax))
-
-;; This checks the given predicate on the tooltip vectors and will also
-;; check that there's only one tooltip provided per location
-(define-syntax-rule (check-tooltip exp pred)
-  (check-true (run-tooltip-test (quote exp) pred)))
-
-(define (run-tooltip-test sexp pred)
-  (define namespace (make-base-namespace))
-  (define-values (in out) (make-pipe))
-  (port-count-lines! in)
-  (port-count-lines! out)
-  (write `(module a typed/racket ,sexp) out)
-  (parameterize ([current-logger online-check-syntax-logger]
-                 [current-namespace namespace])
-    (eval-syntax (namespace-syntax-introduce (read-syntax 'tester in))))
-
-  (log-message online-check-syntax-logger 'info 'online-check-syntax "done" 'done)
-
-  (define result (process-tooltips pred))
-  (clear)
-  result)
-
-(define (process-tooltips pred)
-  (let loop ()
-    (define result (sync receiver))
-    (cond [(eq? 'done (vector-ref result 2)) 'no-tooltips]
-          [else
-           (define stxs (vector-ref result 2))
-           (define tooltips
-             (and (list? stxs)
-                  (syntax? (car stxs))
-                  (syntax-property (car stxs) 'mouse-over-tooltips)))
-           (if tooltips
-               (and (pred tooltips)
-                    (unique-locations? tooltips))
-               (loop))])))
-
-(define (clear)
-  (let loop ()
-    (when (sync/timeout 0 receiver)
-      (loop))))
-
-;; has-type-at? : (Listof (List String Int Int)) -> (Listof Vector) -> Boolean
-(define ((has-types-at? lst) tooltips)
-  ;; turn debug? on to print the tooltip types and locations
-  (debug
-   (for ([tooltip (in-list tooltips)])
-     (match-define (vector stx start* end* type*) tooltip)
-     (printf "~a ~a ~a~n" start* end* (if (procedure? type*) (type*) type*))))
-  (for/and ([entry (in-list lst)])
-    (match-define (list regex start end) entry)
-    (for/or ([tooltip (in-list tooltips)])
-      (match-define (vector stx start* end* type*) tooltip)
-      (and (= start start*)
-           (= end end*)
-           (regexp-match? regex (if (procedure? type*) (type*) type*))))))
-
-;; ensures there are no duplicate type tooltips for a single syntax location
-(define (unique-locations? tooltips)
-  (define locations
-    (for/list ([tooltip (in-list tooltips)])
-      (match-define (vector _ start end _) tooltip)
-      (list start end)))
-  (if (check-duplicate locations)
-      'duplicate-tooltips
-      #t))
-
-(define tests
-  (test-suite "Tooltip tests"
-    (check-tooltip (string-append "foo" "bar")
-                   (has-types-at? (list (list "^String$" 38 43))))
-    (check-tooltip (for/list : (Listof Integer) ([i (list 1 2 3)]) i)
-                   (has-types-at? (list (list "^\\(Listof Integer\\)$" 23 24)
-                                        (list "^\\(Listof Integer\\)$" 72 73))))
-    (check-tooltip (class object% (super-new) (field [x : Integer 0]) x (set! x 3))
-                   (has-types-at? (list (list "^Integer$" 74 75))))
-    (check-tooltip (values 1 2)
-                   (has-types-at? (list (list #rx"Value 1:.*One.*Value 2:.*Positive-Byte"
-                                              23 24))))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-alias-helper.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-alias-helper.rkt
deleted file mode 100644
index d0452a5b89..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-alias-helper.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang racket/base
-
-;; Unit tests for the type-alias-helper.rkt module
-
-(require "test-utils.rkt"
-         racket/set
-         rackunit
-         syntax/id-table
-         typed-racket/env/type-alias-helper)
-
-(provide tests)
-(gen-test-main)
-
-;; two aliases in their own components
-(define example-1
-  (list (cons #'x (list #'x))
-        (cons #'y (list #'y))))
-;; all one component
-(define example-2
-  (list (cons #'x (list #'x #'y))
-        (cons #'y (list #'x))))
-;; two components, one with two nodes
-(define example-3
-  (list (cons #'x (list #'y))
-        (cons #'y (list #'x))
-        (cons #'z (list))))
-;; one with cycles, two that form a line
-(define example-4
-  (list (cons #'x (list #'y))
-        (cons #'y (list #'x))
-        (cons #'a (list #'b))
-        (cons #'b (list))))
-;; two large cycles
-(define example-5
-  (list (cons #'x (list #'y #'z))
-        (cons #'y (list #'x))
-        (cons #'z (list #'x #'y))
-        (cons #'a (list #'b))
-        (cons #'b (list #'c))
-        (cons #'c (list #'a))))
-;; check topological order
-(define example-6
-  (list (cons #'a (list #'b))
-        (cons #'d (list))
-        (cons #'c (list #'d #'e))
-        (cons #'b (list #'c))
-        (cons #'e (list #'f))
-        (cons #'f (list))))
-
-;; helper function for the tests below
-;; ignores order of ids in the components and the
-;; order of the components (because neither are stable
-;; except for topological ordering).
-(define (equal-id-sets? x y)
-  (define (id-lsts->id-sets id-lsts)
-    (for/set ([id-lst id-lsts])
-      (for/set ([id id-lst]) (syntax-e id))))
-  (equal? (id-lsts->id-sets x)
-          (id-lsts->id-sets y)))
-
-(define-binary-check (check-equal?/id equal-id-sets? actual expected))
-
-(define tests
- (test-suite
-  "Tests for type-alias-helper"
-  (check-equal?/id (find-strongly-connected-type-aliases example-1)
-                   (list (list #'x) (list #'y)))
-  (check-equal?/id (find-strongly-connected-type-aliases example-2)
-                   (list (list #'x #'y)))
-  (check-equal?/id (find-strongly-connected-type-aliases example-3)
-                   (list (list #'z) (list #'x #'y)))
-  (check-equal?/id (find-strongly-connected-type-aliases example-4)
-                   (list (list #'a) (list #'b) (list #'y #'x)))
-  (check-equal?/id (find-strongly-connected-type-aliases example-5)
-                   (list (list #'b #'a #'c) (list #'z #'x #'y)))
-  (check-equal?/id (find-strongly-connected-type-aliases example-6)
-                   (list (list #'a) (list #'b) (list #'c)
-                         (list #'e) (list #'f) (list #'d)))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-equal-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-equal-tests.rkt
deleted file mode 100644
index 70c3a2fafe..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-equal-tests.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket/base
-
-(require "test-utils.rkt" (for-syntax racket/base)
-         (rep type-rep)
-         (types abbrev numeric-tower union)
-         rackunit)
-
-(provide tests)
-(gen-test-main)
-
-(define (-base x) (make-Base x #'dummy values #f))
-
-
-(define-syntax (te-tests stx)
-  (define (single-test stx)
-    (syntax-case stx (FAIL)
-      [(FAIL t s) (syntax/loc stx (test-check (format "FAIL ~a" '(t s))
-                                    (lambda (a b) (not (type-equal? a b))) t s))]
-      [(t s) (syntax/loc stx (test-check (format "~a" '(t s)) type-equal? t s))]))
-  (syntax-case stx ()
-    [(_ cl ...)
-     #`(test-suite "Tests for type equality"
-         #,@(map single-test (syntax->list #'(cl ...))))]))
-
-(define (fld* t) (make-fld t (datum->syntax #'here 'values) #f))
-
-(define tests
-  (te-tests
-   [-Number -Number]
-   [(Un -Number) -Number]
-   [(Un -Number -Symbol -Boolean) (Un -Number -Boolean -Symbol)]
-   [(Un -Number -Symbol -Boolean) (Un -Symbol -Boolean -Number)]
-   [(Un -Number -Symbol -Boolean) (Un -Symbol -Number -Boolean)]
-   [(Un -Number -Symbol -Boolean) (Un -Boolean (Un -Symbol -Number))]
-   [(Un -Number -Symbol) (Un -Symbol -Number)]
-   [(-poly (x) (-> (Un -Symbol -Number) x)) (-poly (xyz) (-> (Un -Number -Symbol) xyz))]
-   [(-mu x (Un -Number -Symbol x)) (-mu y (Un -Number -Symbol y))]
-   ;; found bug
-   [FAIL (Un (-mu heap-node
-                  (-struct #'heap-node #f
-                           (map fld* (list (-base 'comparator) -Number (-v a) (Un heap-node (-base 'heap-empty))))))
-             (-base 'heap-empty))
-         (Un (-mu heap-node
-                  (-struct #'heap-node #f
-                           (map fld* (list (-base 'comparator) -Number (-pair -Number -Number) (Un heap-node (-base 'heap-empty))))))
-             (-base 'heap-empty))]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-printer-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-printer-tests.rkt
deleted file mode 100644
index 4af5eb9f6c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-printer-tests.rkt
+++ /dev/null
@@ -1,166 +0,0 @@
-#lang racket/base
-
-;; Tests for type, filter, object, etc. printers for Typed Racket
-
-(require "test-utils.rkt"
-         rackunit
-         typed-racket/standard-inits
-         typed-racket/tc-setup
-         typed-racket/rep/type-rep
-         typed-racket/types/abbrev
-         typed-racket/types/numeric-tower
-         typed-racket/types/printer
-         typed-racket/types/union
-         typed-racket/utils/tc-utils
-         (submod typed-racket/base-env/base-types initialize))
-
-(provide tests)
-(gen-test-main)
-
-(define (prints-as? thing str)
-  (string=? (format "~a" thing) str))
-
-(define (pretty-prints-as? thing str)
-  (string=? (pretty-format-type thing) str))
-
-(define-binary-check (check-prints-as? prints-as? actual expected))
-(define-binary-check (check-pretty-prints-as? pretty-prints-as? actual expected))
-
-;; Using `do-standard-inits` here does not work when the file is invoked
-;; individually (rather than through the test harness)
-(initialize-type-names)
-(current-type-names (init-current-type-names))
-
-(define tests
-  (test-suite
-   "Printing tests"
-   (test-suite
-    "Type printing tests"
-    (check-prints-as? (-val 3) "3")
-    (check-prints-as? (-val 'a) "'a")
-    (check-prints-as? (-val #\a) "#\\a")
-    (check-prints-as? Univ "Any")
-    (check-prints-as? (Un (-val #t) (-val #f)) "Boolean")
-    (check-prints-as? (-lst -Nat) "(Listof Nonnegative-Integer)")
-    (check-prints-as? (make-App (-poly (a) (-lst a)) (list -Nat) #'foo)
-                      "(Listof Nonnegative-Integer)")
-    (check-prints-as? (make-Mu 'x (Un -Null (-pair -Nat (make-F 'x))))
-                      "(Listof Nonnegative-Integer)")
-    (check-prints-as? (-lst* -String -Symbol) "(List String Symbol)")
-
-    ;; next three cases for PR 14552
-    (check-prints-as? (-mu x (Un (-pair x x) -Null)) "(Rec x (U Null (Pairof x x)))")
-    (check-prints-as? (-mu x (Un (-pair (-box x) x) -Null)) "(Rec x (U Null (Pairof (Boxof x) x)))")
-    (check-prints-as? (-mu x (Un (-mpair x x) -Null)) "(Rec x (U Null (MPairof x x)))")
-
-    (check-prints-as? -Custodian "Custodian")
-    (check-prints-as? (make-Opaque #'integer?) "(Opaque integer?)")
-    (check-prints-as? (make-Vector -Nat) "(Vectorof Nonnegative-Integer)")
-    (check-prints-as? (make-HeterogeneousVector (list -Symbol -String))
-                      "(Vector Symbol String)")
-    (check-prints-as? (-box (-val 3)) "(Boxof 3)")
-    (check-prints-as? (make-Future -Void) "(Futureof Void)")
-    (check-prints-as? (-> -String -Void) "(-> String Void)")
-    (check-prints-as? (Un -String -Void) "(U String Void)")
-    (check-prints-as? (-pair -String -Void) "(Pairof String Void)")
-    (check-prints-as? (make-ListDots -Boolean 'x) "(List Boolean ... x)")
-    (check-prints-as? (make-F 'X) "X")
-    (check-prints-as? (make-Values (list (-result -String) (-result -Symbol)))
-                      "(values String Symbol)")
-    (check-prints-as? (make-ValuesDots (list (-result -String) (-result -Symbol)) (make-F 'x) 'x)
-                      "(values String Symbol x ... x)")
-    (check-prints-as? (-polydots (a b) (->... (list a) (b b) a))
-                      "(All (a b ...) (-> a b ... b a))")
-    (check-prints-as? (-mu x (-lst x)) "(Rec x (Listof x))")
-    (check-prints-as? (-seq -String -Symbol) "(Sequenceof String Symbol)")
-    (check-prints-as? (-poly (a) (-> a -Void)) "(All (a) (-> a Void))")
-    (check-prints-as? (-> -Input-Port (make-Values (list (-result -String -true-filter)
-                                                         (-result -String -true-filter))))
-                      "(-> Input-Port (values (String : (Top | Bot)) (String : (Top | Bot))))")
-    (check-prints-as? (make-pred-ty -String)
-                      "(-> Any Boolean : String)")
-    (check-prints-as? (asym-pred Univ -Boolean (-FS (-filter -String 0) -top))
-                      "(-> Any Boolean : #:+ String)")
-    (check-prints-as? (-> Univ Univ -Boolean : (-FS (-filter -String 0) -top))
-                      "(-> Any Any Boolean)")
-    (check-prints-as? (-> Univ Univ -Boolean : (-FS (-filter -String 1) -top))
-                      "(-> Any Any Boolean)")
-    ;; PR 14510 (next three tests)
-    (check-prints-as? (-> Univ (-> Univ -Boolean : (-FS (-filter -String '(1 0))
-                                                        (-not-filter -String '(1 0)))))
-                      "(-> Any (-> Any Boolean))")
-    (check-prints-as? (-> Univ Univ -Boolean : (-FS (-filter -String '(0 1))
-                                                    (-not-filter -String '(0 1))))
-                      "(-> Any Any Boolean)")
-    (check-prints-as? (-> Univ Univ -Boolean : (-FS (-filter -String '(0 0))
-                                                    (-not-filter -String '(0 0))))
-                      "(-> Any Any Boolean)")
-    (check-prints-as? (-> Univ (make-Values (list (-result -String -top-filter -empty-obj)
-                                                  (-result -String -top-filter -empty-obj))))
-                      "(-> Any (values String String))")
-    ;; this case tests that the Number union is printed with its name
-    ;; rather than its expansion (a former bug)
-    (check-prints-as? (->* '() -Number -Void) "(-> Number * Void)")
-    (check-prints-as? (->key Univ -Pathlike
-                             #:exists
-                             (one-of/c 'error 'append 'update 'replace
-                                       'truncate 'truncate/replace)
-                             #f
-                             #:mode
-                             (one-of/c 'binary 'text)
-                             #f
-                             -Void)
-                      (string-append "(-> Any Path-String [#:exists (U 'error"
-                                     " 'append 'update 'replace 'truncate"
-                                     " 'truncate/replace)] [#:mode (U"
-                                     " 'binary 'text)] Void)"))
-    (check-prints-as? (-> Univ (-AnyValues -top)) "(-> Any AnyValues)")
-    (check-prints-as? (-> Univ (-AnyValues (-filter -String '(0 0))))
-                      "(-> Any AnyValues : (String @ (0 0)))")
-    (check-prints-as? (-AnyValues -top) "AnyValues")
-    (check-prints-as? (-AnyValues (-filter -String '(0 0)))
-                      "(AnyValues : (String @ (0 0)))")
-
-    (check-prints-as? (->opt Univ [] -Void) "(-> Any Void)")
-    (check-prints-as? (->opt [-String] -Void) "(->* () (String) Void)")
-    (check-prints-as? (->opt Univ [-String] -Void) "(->* (Any) (String) Void)")
-    (check-prints-as? (->opt Univ -Symbol [-String] -Void)
-                      "(->* (Any Symbol) (String) Void)")
-    (check-prints-as? (->optkey Univ [-String] #:x -String #f -Void)
-                      "(->* (Any) (String #:x String) Void)")
-    (check-prints-as? (->optkey Univ [-String] #:x -String #t -Void)
-                      "(->* (Any #:x String) (String) Void)")
-    (check-prints-as? (->optkey Univ [-String] #:x -String #t -Void)
-                      "(->* (Any #:x String) (String) Void)")
-    (check-prints-as? (->optkey Univ [-String] #:rest -String #:x -String #t -Void)
-                      "(->* (Any #:x String) (String) #:rest String Void)")
-    (check-prints-as? (cl->* (->opt -Pathlike [-String] -Void)
-                             (->optkey Univ [-String] #:rest -String #:x -String #t -Void))
-                      (string-append "(case-> (->* (Path-String) (String) Void) "
-                                     "(->* (Any #:x String) (String) #:rest String Void))")))
-   (test-suite
-    "Pretty printing tests"
-    (check-pretty-prints-as? (-val 3) "3")
-    (check-pretty-prints-as? (-val 'a) "'a")
-    (check-pretty-prints-as? (-val #\a) "#\\a")
-    (check-pretty-prints-as? Univ "Any")
-    (check-pretty-prints-as? (Un (-val #t) (-val #f)) "Boolean")
-    (check-pretty-prints-as? (-lst -Nat) "(Listof Nonnegative-Integer)")
-    (check-pretty-prints-as?
-     (-polydots (c a b)
-       (cl->*
-        (-> (-> a c) (-pair a (-lst a)) (-pair c (-lst c)))
-        ((list
-          ((list a) (b b) . ->... . c)
-          (-lst a))
-         ((-lst b) b) . ->... .(-lst c))))
-     (string-append "(All (c a b ...)\n"
-                    "  (case->\n"
-                    "   (-> (-> a c) (Pairof a (Listof a)) (Pairof c (Listof c)))\n"
-                    "   (-> (-> a b ... b c) (Listof a) (Listof b) ... b (Listof c))))"))
-    (check-pretty-prints-as?
-     (-poly (a) (cl->* (-> (-Syntax a) Univ Univ (-Syntax a))
-                       (-> (-Syntax Univ) Univ Univ)))
-     (string-append "(All (a)\n"
-                    "  (case-> (-> (Syntaxof a) Any Any (Syntaxof a)) (-> (Syntaxof Any) Any Any)))")))))
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/typecheck-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/typecheck-tests.rkt
deleted file mode 100644
index 3cc0c05a1c..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/typecheck-tests.rkt
+++ /dev/null
@@ -1,3409 +0,0 @@
-#lang racket/base
-
-(module cross-phase-failure racket/base
-  (require
-    rackunit
-    racket/contract)
-
-  (provide
-    (contract-out
-      [rename cross-phase-failure* cross-phase-failure
-        (->* (string?) (#:actual any/c #:expected any/c) cross-phase-failure?)]
-      [cross-phase-failure? predicate/c]
-      [cross-phase-failure-message (-> cross-phase-failure? string?)]
-      [rename cross-phase-failure-check-infos* cross-phase-failure-check-infos
-        (-> cross-phase-failure? (listof check-info?))]))
-
-  (struct cross-phase-failure (message check-infos) #:prefab)
-
-  (define no-arg (gensym 'no-arg))
-
-  (define (cross-phase-failure* message #:actual [actual no-arg] #:expected [expected no-arg])
-    (cross-phase-failure
-      message
-      (append
-        (if (eq? actual no-arg) null (list (list 'actual actual)))
-        (if (eq? expected no-arg) null (list (list 'expected expected))))))
-
-  (define (cross-phase-failure-check-infos* cpf)
-    (map (λ (args) (apply check-info args)) (cross-phase-failure-check-infos cpf))))
-
-;; Functions for testing correct behavior of typechecking
-(module tester racket/base
-  (require
-    (submod ".." cross-phase-failure)
-    typed-racket/utils/utils
-    racket/base racket/match
-    (types tc-result printer)
-    syntax/parse
-    (for-template (only-in typed-racket/typed-racket do-standard-inits))
-    (typecheck typechecker check-below)
-    (utils mutated-vars tc-utils)
-    (env mvar-env))
-  (provide
-    test-literal test-literal/fail
-    test test/proc test/fail)
-
-
-  (do-standard-inits)
-  (print-complex-filters? #t)
-  
-  ;; tr-expand: syntax? -> syntax?
-  ;; Expands out a form and annotates it with necesarry TR machinery.
-  (define (tr-expand stx)
-    (define expanded-stx (local-expand stx 'expression '()))
-    (find-mutated-vars expanded-stx mvar-env)
-    expanded-stx)
-
-
-  ;; tc: syntax? (option/c tc-results?) -> tc-results?
-  ;; Typechecks the expression using the expected information if provided.
-  (define (tc expr expected)
-    (if expected
-        (tc-expr/check expr expected)
-        (tc-expr expr)))
-
-
-  (define (check-tc-results result golden #:name name)
-    (unless (equal? golden result)
-      (define base-message (format "~a did not return the expected value." name))
-
-      (define extra-message1
-        (if (parameterize ([delay-errors? #f])
-              (with-handlers ([exn:fail? (lambda (_) #f)])
-                (check-below result golden)
-                #t))
-            " It returned a more precise value."
-            ""))
-
-      (define extra-message2
-        (match* (result golden)
-          [((tc-result1: rt rf ro) (tc-result1: gt gf go))
-           (cond
-             [(not (equal? rt gt))
-              " The types don't match."]
-             [(not (equal? rf gf))
-              " The filters don't match."]
-             [(not (equal? ro go))
-              " They objects don't match."])]
-          [(_ _) ""]))
-
-      (raise (cross-phase-failure
-               #:actual result
-               #:expected golden
-               (string-append base-message extra-message1 extra-message2)))))
-
-  ;; test: syntax? tc-results? [(option/c tc-results?)] -> void?
-  ;; Checks that the expression typechecks using the expected type to the golden result.
-  (define (test expr golden (expected #f))
-    (test/proc expr (lambda (_) golden) expected))
-
-  ;; test/proc: syntax? (syntax? -> tc-results?) [(option/c tc-results?)] -> void?
-  ;; Checks that the expression typechecks to golden result. The golden result is computed by applying
-  ;; the golden function to the expanded syntax of the expression.
-  (define (test/proc expr golden-fun (expected #f))
-    (define expanded-expr (tr-expand expr))
-    (define result (tc expanded-expr expected))
-    (define golden (golden-fun expanded-expr))
-    (check-tc-results result golden #:name "tc-expr"))
-
-
-  ;; test/fail syntax? tc-results? (or/c string? regexp?) (option/c tc-results?) -> void?
-  ;; Checks that the expression doesn't typecheck using the expected type, returns the golden type,
-  ;; and raises an error message matching the golden message
-  (define (test/fail code golden message expected)
-    (dynamic-wind
-      void
-      (λ ()
-        (with-handlers ([exn:fail:syntax?
-                         (lambda (exn)
-                           (when message
-                             (unless (regexp-match? message (exn-message exn))
-                               (raise (cross-phase-failure
-                                        #:actual (exn-message exn)
-                                        #:expected message
-                                        "tc-expr raised the wrong error message")))))])
-          (define result
-            (parameterize ([delay-errors? #t])
-              (tc (tr-expand code) expected)))
-          (check-tc-results result golden #:name "tc-expr")
-          (report-first-error)
-          (raise (cross-phase-failure
-                   #:actual result
-                   "tc-expr did not raise an error"))))
-      (λ () (reset-errors!))))
-
-
-  ;; test-literal syntax? tc-results? (option/c tc-results?) -> void?
-  ;; Checks that the literal typechecks using the expected type to the golden result.
-  (define (test-literal literal golden expected)
-    (define result (tc-literal literal expected))
-    (check-tc-results result golden #:name "tc-literal"))
-
-  ;; test-literal/fail syntax? (or/c string? regexp?) (option/c tc-results?) -> void?
-  ;; Checks that the literal doesn't typecheck using the expected type and the golden message
-  (define (test-literal/fail literal message expected)
-    (with-handlers ([exn:fail:syntax?
-                     (lambda (exn)
-                       (unless (regexp-match? message (exn-message exn))
-                         (raise (cross-phase-failure
-                                  #:actual (exn-message exn)
-                                  #:expected message
-                                  "tc-literal raised the wrong error message"))))])
-      (define result (tc-literal literal expected))
-      (raise (cross-phase-failure
-               #:actual result
-               "tc-literal did not raise an error")))))
-
-
-(require
-  'cross-phase-failure
-  "evaluator.rkt"
-  (except-in "test-utils.rkt" private)
-  syntax/location syntax/srcloc
-  (for-syntax
-    racket/base
-    syntax/parse
-    'tester))
-
-(provide tests)
-(gen-test-main)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Helpers for actual checks
-
-(module+ test-helpers
-  (provide tc-e
-           tc-e/t
-           tc-err
-           tc-l
-           tc-l/err))
-
-(begin-for-syntax
-  (define-splicing-syntax-class return
-    (pattern ty:expr #:attr v #'(ret ty))
-    (pattern (~seq #:ret r:expr) #:attr v #'r))
-
-  (define-splicing-syntax-class err-return
-    (pattern (~seq #:ret r:expr) #:attr v #'r)
-    (pattern (~seq) #:attr v #'(ret -Bottom)))
-
-  (define-splicing-syntax-class expected
-    (pattern (~seq #:expected v:expr))
-    (pattern (~seq) #:attr v #'#f))
-
-  ;; for specifying the error message in a test
-  (define-splicing-syntax-class expected-msg
-    (pattern (~seq #:msg v:expr))
-    (pattern (~seq) #:attr v #'#f)))
-
-(define-syntax (test-phase1 stx)
-  (syntax-parse stx
-    ([_ name:expr body:expr ...]
-     (quasisyntax/loc stx
-       (test-case (format "~a ~a" (quote-line-number name) 'name)
-         (with-check-info (['location (build-source-location-list (quote-srcloc #,stx))])
-           (with-handlers ([cross-phase-failure?
-                            (λ (tf)
-                              (with-check-info*
-                                (cross-phase-failure-check-infos tf)
-                                (lambda ()
-                                  (fail-check (cross-phase-failure-message tf)))))])
-             (phase1-eval body ...))))))))
-
-
-;;Constructs the syntax that calls eval and returns the answer to the user
-(define-syntax (tc-e stx)
-  (syntax-parse stx
-    [(_ code:expr #:proc p)
-     (quasisyntax/loc stx
-       (test-phase1 code
-         (test/proc (quote-syntax code) p)))]
-    [(_ code:expr return:return ex:expected)
-     (quasisyntax/loc stx
-       (test-phase1 code
-         (test (quote-syntax code) return.v ex.v)))]))
-
-(define-syntax (tc-e/t stx)
-  (syntax-parse stx
-    [(_ e t) (syntax/loc stx (tc-e e #:ret (ret t -true-filter)))]))
-
-;; check that a literal typechecks correctly
-(define-syntax (tc-l stx)
-  (syntax-parse stx
-    [(_ lit ty exp:expected)
-     (quasisyntax/loc stx
-       (test-phase1 #,(syntax/loc #'lit (LITERAL lit))
-         (test-literal (quote-syntax lit) ty exp.v)))]))
-
-
-;; check that typechecking this expression fails
-(define-syntax (tc-err stx)
-  (syntax-parse stx
-    [(_ code:expr ret:err-return ex:expected msg:expected-msg)
-     (quasisyntax/loc stx
-        (test-phase1 #,(syntax/loc #'code (FAIL code))
-           (test/fail (quote-syntax code) ret.v msg.v ex.v)))]))
-
-(define-syntax (tc-l/err stx)
-  (syntax-parse stx
-    [(_ lit:expr ex:expected msg:expected-msg)
-     (quasisyntax/loc stx
-       (test-phase1 #,(syntax/loc #'lit (LITERAL/FAIL lit))
-         (test-literal/fail (quote-syntax lit) msg.v ex.v)))]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(require
-  rackunit
-
-  ;; Needed for bindings of identifiers in expressions
-  racket/bool
-  (except-in racket/class class)
-  racket/file
-  racket/fixnum
-  racket/flonum
-  racket/extflonum
-  racket/function
-  racket/future
-  racket/list
-  racket/math
-  racket/path
-  racket/place
-  racket/port
-  racket/sequence
-  racket/set
-  racket/string
-  racket/system
-  racket/tcp
-  racket/udp
-  racket/vector
-  syntax/stx
-
-  (except-in typed-racket/utils/utils private)
-  ;; Needed for bindings of types and TR primitives in expressions
-  (except-in (base-env extra-procs prims base-types base-types-extra)
-    define lambda λ case-lambda)
-  ;; For tests that rely on kw/opt properties
-  (prefix-in tr: (only-in (base-env prims) define lambda λ case-lambda))
-  ;; Needed for the `let-name` syntax class before
-  (prefix-in r: (only-in racket/base let-values))
-  ;; Needed for constructing TR types in expected values
-  (for-syntax
-    (rep type-rep filter-rep object-rep)
-    (base-env base-structs)
-    (rename-in (types abbrev union numeric-tower filter-ops utils resolve)
-               [Un t:Un]
-               [-> t:->])))
-
-(begin-for-syntax
-  ;; More tests need to be written to use these macros.
-  (define-syntax-class (let-name n)
-    #:literals (r:let-values)
-    (pattern (r:let-values ([(i:id) _] ...) . _)
-             #:with x (list-ref (syntax->list #'(i ...)) n)))
-
-  (define-syntax-rule (get-let-name id n e)
-    (syntax-parser
-     [p #:declare p (let-name n)
-        #:with id #'p.x
-        e]))
-
-  (define (-path t var)
-    (ret t
-         (-FS (-not-filter (-val #f) var)
-              (-filter (-val #f) var))
-         (make-Path null var))))
-
-
-(define tests
-  (test-suite
-    "Typechecker tests"
-    #reader typed-racket/typed-reader
-      (test-suite
-        "tc-expr tests"
-
-        [tc-e
-         (let: ([x : (U Number (cons Number Number)) (cons 3 4)])
-               (if (pair? x)
-                   (+ 1 (car x))
-                   5))
-         -Number]
-        (tc-e/t 0 -Zero)
-        (tc-e/t 1 -One)
-        (tc-e/t (if (let ([y 12]) y) 3 4) -PosByte)
-        (tc-e/t 2 -PosByte)
-        (tc-e/t 3 -PosByte)
-        (tc-e/t 100 -PosByte)
-        (tc-e/t 255 -PosByte)
-        (tc-e/t 256 -PosIndex)
-        (tc-e/t -1 -NegFixnum)
-        (tc-e/t -100 -NegFixnum)
-        (tc-e/t 1000 -PosIndex)
-        (tc-e/t 268435455 -PosIndex)
-        (tc-e/t -268435456 -NegFixnum)
-        (tc-e/t 268435456 -PosFixnum)
-        (tc-e/t -268435457 -NegFixnum)
-        (tc-e/t 1073741823 -PosFixnum)
-        (tc-e/t -1073741824 -NegFixnum)
-        (tc-e/t 1073741824 -PosInt)
-        (tc-e/t -1073741825 -NegInt)
-        (tc-e/t "foo" -String)
-        (tc-e (+ 3 4) -PosIndex)
-        (tc-e (- 1) -NegFixnum)
-        (tc-e (- 1073741823) -NegFixnum)
-        (tc-e (- -4) -PosInt)
-        (tc-e (- (ann -5 Nonpositive-Fixnum)) -Nat)
-        (tc-e/t 1152921504606846975 -PosInt)
-        (tc-e/t -1152921504606846975 -NegInt)
-        (tc-e (- 3253463567262345623) -NegInt)
-        (tc-e (- -23524623547234734568) -PosInt)
-        (tc-e (- 241.3) -NegFlonum)
-        (tc-e (- -24.3) -PosFlonum)
-        (tc-e/t 34.2f0 -PosSingleFlonum)
-        (tc-e/t -34.2f0 -NegSingleFlonum)
-
-        (tc-e (- (ann 1000 Index) 1) -Fixnum)
-        (tc-e (- (ann 1000 Positive-Index) 1) -Index)
-        (tc-e (- (ann 1000 Fixnum) 1) -Int)
-        (tc-e (- (ann 1000 Nonnegative-Fixnum) 1) -Fixnum)
-        (tc-e (- (ann 1000 Positive-Fixnum) 1) -NonNegFixnum)
-        (tc-e (- (ann 1000 Exact-Positive-Integer) 1) -Nat)
-
-        (tc-e (fx- (ann 1000 Index) 1) -Fixnum)
-        (tc-e (fx- (ann 1000 Positive-Index) 1) -Index)
-        (tc-e (fx- (ann 1000 Fixnum) 1) -Fixnum)
-        (tc-e (fx- (ann 1000 Nonnegative-Fixnum) 1) -Fixnum)
-        (tc-e (fx- (ann 1000 Positive-Fixnum) 1) -NonNegFixnum)
-        (tc-e (fx- (ann 1000 Exact-Positive-Integer) 1) -NonNegFixnum)
-
-
-        (tc-e (*) -One)
-
-        (tc-e (gcd 1/2) -PosRat)
-        (tc-e (gcd 3 1/2) -PosRat)
-        (tc-e (gcd (ann 3 Integer) 1/2) -NonNegRat)
-        (tc-e (gcd (ann 3 Integer) -1/2) -NonNegRat)
-        (tc-e (lcm 1/2) -PosRat)
-        (tc-e (lcm 3 1/2) -PosRat)
-        (tc-e (lcm (ann 3 Integer) 1/2) -NonNegRat)
-        (tc-e (lcm (ann 3 Integer) -1/2) -NonNegRat)
-        (tc-e (expt 0.5 0.3) -NonNegFlonum)
-        (tc-e (expt 0.5 2) (t:Un -NonNegFlonum -One))
-        (tc-e (expt 0.5 0) -One)
-        (tc-e (expt -1/2 -1/2) -Number)
-        (tc-e (expt (ann 0.5 Float) (ann 2 Integer)) (t:Un -Flonum -One))
-        (tc-e (expt (ann 0.5f0 Single-Flonum) (ann 2 Integer)) (t:Un -SingleFlonum -One))
-        (tc-e (expt (*) -0.0) (t:Un -NonNegFlonum -One))
-        (tc-e (expt (*) 2.4521075152139656e-300) (t:Un -NonNegFlonum -One))
-        (tc-e (expt (*) -0.0) (t:Un -NonNegFlonum -One))
-        (tc-e (expt -0.0 -1.0) (t:Un -Flonum -FloatComplex))
-        (tc-e (expt 0 (flabs (cos (real->double-flonum 2))))
-              -NonNegReal)
-        (tc-e (expt
-               (sub1 (gcd (exact-round 1)))
-               (- (ceiling (real->double-flonum -2.6897657f0))))
-              -NonNegReal)
-        (tc-e (expt (sqrt (+)) (cosh (flcos (real->double-flonum 0))))
-              -NonNegReal)
-        (tc-e (expt
-               (tan (real->double-flonum 6))
-               (lcm (*) (exact-round -1.7976931348623153e+308) 6))
-              (t:Un (-val 1) -Flonum))
-        (tc-e (flexpt 0.5 0.3) -NonNegFlonum)
-        (tc-e (flexpt 0.00000000001 100000000000.0) -NonNegFlonum)
-        (tc-e (flexpt -2.0 -0.5) -Flonum) ; NaN
-        (tc-e (extflexpt 0.5t0 0.3t0) -NonNegExtFlonum)
-        (tc-e (extflexpt 0.00000000001t0 100000000000.0t0) -NonNegExtFlonum)
-        (tc-e (extflexpt -2.0t0 -0.5t0) -ExtFlonum) ; NaN
-        (tc-e (tanh (ann 0 Nonnegative-Integer)) -NonNegReal)
-        (tc-e (sinh (ann 0 Nonpositive-Integer)) -NonPosReal)
-        (tc-e (angle -1) (t:Un -InexactReal -Zero))
-        (tc-e (angle 2.3) -Zero)
-        (tc-e (magnitude 3/4) -PosRat)
-        (tc-e (magnitude 3+2i) -NonNegReal)
-        (tc-e (min (ann 3 Fixnum) (ann 3 Fixnum)) -Fixnum)
-        (tc-e (min (ann -2 Negative-Fixnum) (ann 3 Fixnum)) -NegFixnum)
-        (tc-e (min (ann 3 Fixnum) (ann -2 Negative-Fixnum)) -NegFixnum)
-        (tc-e (exact->inexact (ann 3 Number)) (t:Un -InexactReal -InexactComplex))
-        (tc-e (real->double-flonum #e1e-500) -NonNegFlonum)
-        (tc-e (real->double-flonum #e-1e-500) -NonPosFlonum)
-        (tc-e (real->single-flonum #e1e-500) -NonNegSingleFlonum)
-        (tc-e (real->single-flonum #e-1e-500) -NonPosSingleFlonum)
-        (tc-e (real->single-flonum 1e-300) -NonNegSingleFlonum)
-        (tc-e (real->single-flonum -1e-300) -NonPosSingleFlonum)
-        (tc-e (extfl->inexact 1t-500) -NonNegFlonum)
-        (tc-e (extfl->inexact -1t-500) -NonPosFlonum)
-        (tc-e (real->extfl #e1e-8192) -NonNegExtFlonum)
-        (tc-e (real->extfl #e-1e-8192) -NonPosExtFlonum)
-        (tc-err (let: ([z : 10000000000000 10000000000000]) z)) ; unsafe
-        (tc-err (let: ([z : -4611686018427387904 -4611686018427387904]) z)) ; unsafe
-        (tc-e/t (let: ([z : -4611686018427387905 -4611686018427387905]) z)
-                (-val -4611686018427387905))
-        (tc-err (let: ([z : -1073741825 -1073741825]) z)) ; unsafe
-        (tc-e/t (let: ([z : -1073741824 -1073741824]) z) (-val -1073741824))
-        (tc-e/t (let: ([z : 268435455 268435455]) z) (-val 268435455))
-        (tc-err (let: ([z : 268435456 268435456]) z)) ; unsafe
-        (tc-err (let: ([z : 4611686018427387903 4611686018427387903]) z)) ; unsafe
-        (tc-e/t (let: ([z : 4611686018427387904 4611686018427387904]) z) (-val 4611686018427387904))
-
-        [tc-e/t (lambda: () 3) (t:-> -PosByte : -true-filter)]
-        [tc-e/t (lambda: ([x : Number]) 3) (t:-> -Number -PosByte : -true-filter)]
-        [tc-e/t (lambda: ([x : Number] [y : Boolean]) 3)
-                (t:-> -Number -Boolean -PosByte : -true-filter)]
-        [tc-e/t (lambda () 3) (t:-> -PosByte : -true-filter)]
-        [tc-e (values 3 4) #:ret (ret (list -PosByte -PosByte) (list -true-filter -true-filter))]
-        [tc-e (cons 3 4) (-pair -PosByte -PosByte)]
-        [tc-e (cons 3 (ann '() : (Listof Integer))) (make-Listof -Integer)]
-        [tc-e (void) -Void]
-        [tc-e (void 3 4) -Void]
-        [tc-e (void #t #f '(1 2 3)) -Void]
-        [tc-e/t #() (make-HeterogeneousVector (list))]
-        [tc-err #(3)
-           #:ret (ret (make-HeterogeneousVector (list -Integer -Integer)))
-           #:expected (ret (make-HeterogeneousVector (list -Integer -Integer)))]
-        [tc-err #(3 4 5)
-           #:ret (ret (make-HeterogeneousVector (list -Integer -Integer)))
-           #:expected (ret (make-HeterogeneousVector (list -Integer -Integer)))]
-        [tc-e/t #(3 4 5) (make-HeterogeneousVector (list -Integer -Integer -Integer))]
-        [tc-e/t '(2 3 4) (-lst* -PosByte -PosByte -PosByte)]
-        [tc-e/t '(2 3 #t) (-lst* -PosByte -PosByte (-val #t))]
-        [tc-e/t #(2 3 #t) (make-HeterogeneousVector (list -Integer -Integer -Boolean))]
-        [tc-e (vector 2 "3" #t) (make-HeterogeneousVector (list -Integer -String -Boolean))]
-        [tc-e (vector) (make-HeterogeneousVector (list))]
-        [tc-e (vector) #:ret (tc-any-results -top) #:expected (tc-any-results -no-filter)]
-        [tc-err (vector)
-           #:ret (ret -Integer)
-           #:expected (ret -Integer)]
-        [tc-e (vector-immutable 2 "3" #t) (make-HeterogeneousVector (list -Integer -String -Boolean))]
-        [tc-e (make-vector 4 1) (-vec -Integer)]
-        [tc-e (build-vector 4 (lambda (x) 1)) (-vec -Integer)]
-        [tc-e (range 0) -Null]
-        [tc-e (range 1) (-lst* -Zero)]
-        [tc-e (range 4) (-lst -Byte)]
-        [tc-e (range (ann 10 : Index)) (-lst -Index)]
-        [tc-e (range (ann 10 : Fixnum)) (-lst -NonNegFixnum)]
-        [tc-e (range (ann 10.0 : Real)) (-lst -Nat)]
-        [tc-e (range 2 4 1) (-lst -PosByte)]
-        [tc-e (range 0 4 1) (-lst -Byte)]
-        [tc-e (range 0.0 4/2 0.5) (-lst -Flonum)]
-        [tc-e/t '(#t #f) (-lst* (-val #t) (-val #f))]
-        [tc-e/t (plambda: (a) ([l : (Listof a)]) (car l))
-                (make-Poly '(a) (t:-> (make-Listof (-v a)) (-v a)))]
-        [tc-e/t (plambda: (a) ([l : (Listof a)]) (car l))
-                (make-Poly '(a) (t:-> (make-Listof (-v a)) (-v a)))]
-        [tc-e/t (case-lambda: [([a : Number] [b : Number]) (+ a b)]) (t:-> -Number -Number -Number)]
-        [tc-e/t (tr:case-lambda [([a : Number] [b : Number]) (+ a b)])
-                (t:-> -Number -Number -Number)]
-        [tc-e/t (let: ([x : Number 5]) x) -Number]
-        [tc-e (let-values ([(x) 4]) (+ x 1)) -PosIndex]
-        [tc-e (let-values ([(x y) (values 3 #t)]) (and (= x 1) (not y)))
-              #:ret (ret -Boolean -false-filter)]
-        [tc-e/t (values 3) -PosByte]
-        [tc-e (values) #:ret (ret null)]
-        [tc-e (values 3 #f) #:ret (ret (list -PosByte (-val #f)) (list -true-filter -false-filter))]
-        [tc-e (map #{values @ Symbol} '(a b c)) (-pair -Symbol (make-Listof -Symbol))]
-        [tc-e (andmap add1 (ann '() (Listof Number))) (t:Un (-val #t) -Number)]
-        [tc-e (ormap add1 (ann '() (Listof Number))) (t:Un (-val #f) -Number)]
-        [tc-e (letrec: ([fact : (Number -> Number)
-                              (lambda: ([n : Number]) (if (zero? n) 1 (* n (fact (- n 1)))))])
-                       (fact 20))
-              -Number]
-        [tc-e (let: fact : Number ([n : Number 20])
-                    (if (zero? n) 1 (* n (fact (- n 1)))))
-              -Number]
-        [tc-e (let: ([v : Any 5])
-                    (if (number? v) (+ v 1) 3))
-              -Number]
-        [tc-e (let: ([v : Any #f])
-                    (if (number? v) (+ v 1) 3))
-              -Number]
-        [tc-e (let: ([v : (Un Number Boolean) #f])
-                    (if (boolean? v) 5 (+ v 1)))
-              -Number]
-        [tc-e (let: ([f : (Number Number -> Number) +]) (f 3 4)) -Number]
-        [tc-e (let: ([+ : (Boolean -> Number) (lambda: ([x : Boolean]) 3)]) (+ #f)) -Number]
-        [tc-e (when #f #t) -Void]
-        [tc-e (when (number? #f) (+ 4 5)) -Void]
-        [tc-e (let: ([x : (Un #f Number) 7])
-                    (if x (+ x 1) 3))
-              -Number]
-        [tc-e (let: ([x : Number 1])
-                    (if (and (number? x) #t)
-                        (+ x 4)
-                        'bc))
-              -Number]
-        [tc-e/t (let: ((x : Number 3)) (if (boolean? x) (not x) #t)) (-val #t)]
-        [tc-e/t (begin 3) -PosByte]
-        [tc-e/t (begin #f 3) -PosByte]
-        [tc-e/t (begin #t) (-val #t)]
-        [tc-e/t (begin0 #t) (-val #t)]
-        [tc-e/t (begin0 #t 3) (-val #t)]
-        [tc-e/t #t (-val #t)]
-        [tc-e #f #:ret (ret (-val #f) -false-filter)]
-        [tc-e/t '#t (-val #t)]
-        [tc-e '#f #:ret (ret (-val #f) -false-filter)]
-        [tc-e/t (if #f 'a 3) -PosByte]
-        [tc-e/t (if #f #f #t) (t:Un (-val #t))]
-        [tc-e (when #f 3) -Void]
-        [tc-e/t '() -Null]
-        [tc-e/t (let: ([x : (Listof Number) '(1)])
-                      (cond [(pair? x) 1]
-                            [(null? x) 1]))
-              -One]
-        [tc-e/t (lambda: ([x : Number] . [y : Number *]) (car y))
-                (->* (list -Number) -Number -Number)]
-        [tc-e ((lambda: ([x : Number] . [y : Number *]) (car y)) 3) -Number]
-        [tc-e ((lambda: ([x : Number] . [y : Number *]) (car y)) 3 4 5) -Number]
-        [tc-e ((lambda: ([x : Number] . [y : Number *]) (car y)) 3 4) -Number]
-        [tc-e (apply (lambda: ([x : Number] . [y : Number *]) (car y)) 3 '(4)) -Number]
-        [tc-e (apply (lambda: ([x : Number] . [y : Number *]) (car y)) 3 '(4 6 7)) -Number]
-        [tc-e (apply (lambda: ([x : Number] . [y : Number *]) (car y)) 3 '()) -Number]
-
-        [tc-e/t (lambda: ([x : Number] . [y : Boolean *]) (car y))
-                (->* (list -Number) -Boolean -Boolean)]
-        [tc-e ((lambda: ([x : Number] . [y : Boolean *]) (car y)) 3) -Boolean]
-        [tc-e (apply (lambda: ([x : Number] . [y : Boolean *]) (car y)) 3 '(#f)) -Boolean]
-        [tc-e (lambda args (void)) #:ret (ret (t:-> -String -Void) -true-filter)
-                                   #:expected (ret (t:-> -String -Void) -true-filter)]
-        [tc-e (lambda (x y . z)
-                (+ x y (+ (length z))))
-              #:ret (ret (t:-> -Byte -Index -Number) -true-filter)
-              #:expected (ret (t:-> -Byte -Index -Number) -true-filter)]
-
-        [tc-e/t (let: ([x : Number 3])
-                      (when (number? x) #t))
-              (-val #t)]
-        [tc-e (let: ([x : Number 3])
-                    (when (boolean? x) #t))
-              -Void]
-
-        [tc-e (integer-bytes->integer '#"abcd" #t) -Nat]
-        [tc-e (integer-bytes->integer '#"abcd" #f) -Int]
-
-        [tc-e/t (let: ([x : Any 3])
-                    (if (list? x)
-                        (begin (car x) 1)
-                        2))
-              -PosByte]
-
-
-        [tc-e (let: ([x : (U Number Boolean) 3])
-                    (if (not (boolean? x))
-                        (add1 x)
-                        3))
-              -Number]
-
-        [tc-e/t (let ([x 1]) x) -One]
-        [tc-e (let ([x 1]) (boolean? x)) #:ret (ret -Boolean -false-filter)]
-        [tc-e (boolean? number?) #:ret (ret -Boolean -false-filter)]
-
-        [tc-e (let: ([x : (Option Number) #f]) x) (t:Un -Number (-val #f))]
-        [tc-e (let: ([x : Any 12]) (not (not x))) -Boolean]
-
-        [tc-e (let: ([x : (Option Number) #f])
-                    (if (let ([z 1]) x)
-                        (add1 x)
-                        12))
-              -Number]
-        [tc-err (5 4) #:msg "Cannot apply expression of type"]
-        [tc-err (apply 5 '(2))]
-        [tc-err (map (lambda: ([x : Any] [y : Any]) 1) '(1))]
-        [tc-e (map add1 '(1)) (-pair -PosByte (-lst -PosByte))]
-
-        [tc-e/t (let ([x 5])
-                (if (eq? x 1)
-                    12
-                    14))
-              -PosByte]
-
-        [tc-e (car (append (list 1 2) (list 3 4))) -PosByte]
-
-        [tc-e
-         (let-syntax ([a
-                       (syntax-rules ()
-                         [(_ e) (let ([v 1]) e)])])
-           (let: ([v : String "a"])
-                 (string-append "foo" (a v))))
-         -String]
-        [tc-e (string-join '("hello" "world") " ") -String]
-        [tc-e (string-join '("hello" "world")) -String]
-        [tc-e (string-join '("hello" "world") #:before-first "a") -String]
-        [tc-e (add-between '(1 2 3) 0) (-lst -Byte)]
-        [tc-e (add-between '(1 2 3) 'a) (-lst (t:Un -PosByte (-val 'a)))]
-        [tc-e ((inst add-between Positive-Byte Symbol) '(1 2 3) 'a #:splice? #t #:before-first '(b))
-              (-lst (t:Un -PosByte -Symbol))]
-
-        [tc-e (apply (plambda: (a) [x : a *] x) '(5)) (-lst -PosByte)]
-        [tc-e (apply append (list '(1 2 3) '(4 5 6))) (-lst -PosByte)]
-
-        [tc-err ((case-lambda: [([x : Number]) x]
-                               [([y : Number] [x : Number]) x])
-                 1 2 3)]
-        [tc-err ((case-lambda: [([x : Number]) x]
-                               [([y : Number] [x : Number]) x])
-                 1 'foo)]
-
-        [tc-err (apply
-                 (case-lambda: [([x : Number]) x]
-                               [([y : Number] [x : Number]) x])
-                 '(1 2 3))]
-        [tc-err (apply
-                 (case-lambda: [([x : Number]) x]
-                               [([y : Number] [x : Number]) x])
-                 '(1 foo))]
-        [tc-err ((tr:case-lambda [([x : Number]) x]
-                                 [([y : Number] [x : Number]) x])
-                 1 2 3)]
-        [tc-err ((tr:case-lambda [([x : Number]) x]
-                                 [([y : Number] [x : Number]) x])
-                 1 'foo)]
-
-        [tc-err (apply
-                 (tr:case-lambda [([x : Number]) x]
-                                 [([y : Number] [x : Number]) x])
-                 '(1 2 3))]
-        [tc-err (apply
-                 (tr:case-lambda [([x : Number]) x]
-                                 [([y : Number] [x : Number]) x])
-                 '(1 foo))]
-
-        [tc-e (let: ([x : Any #f])
-                    (if (number? (let ([z 1]) x))
-                        (add1 x)
-                        12))
-              -Number]
-
-        [tc-e (let: ([x : (Option Number) #f])
-                    (if x
-                        (add1 x)
-                        12))
-              -Number]
-
-
-        [tc-e null #:ret (ret (-val null) -true-filter (-id-path #'null))]
-
-        [tc-e/t (let* ([sym 'squarf]
-                       [x (if (= 1 2) 3 sym)])
-                  x)
-                (t:Un (-val 'squarf) -PosByte)]
-
-        [tc-e/t (if #t 1 2) -One]
-
-
-        ;; eq? as predicate
-        [tc-e/t (let: ([x : (Un 'foo Number) 'foo])
-                      (if (eq? x 'foo) 3 x))
-                -Number]
-        [tc-e/t (let: ([x : (Un 'foo Number) 'foo])
-                      (if (eq? 'foo x) 3 x))
-                -Number]
-
-        [tc-err (let: ([x : (U String 'foo) 'foo])
-                      (if (string=? x 'foo)
-                          "foo"
-                          x))
-          #:ret (ret (t:Un -String (-val 'foo)) -true-filter)]
-
-        [tc-e/t (let: ([x : (U String 5) 5])
-                        (if (eq? x 5)
-                            "foo"
-                            x))
-                  (t:Un -String (-val 5))]
-
-        [tc-e (let* ([sym 'squarf]
-                     [x (if (= 1 2) 3 sym)])
-                (if (eq? x sym) 3 x))
-              #:ret (ret -PosByte -true-filter)]
-        [tc-e (let* ([sym 'squarf]
-                     [x (if (= 1 2) 3 sym)])
-                (if (eq? sym x) 3 x))
-              #:ret (ret -PosByte -true-filter)]
-        ;; equal? as predicate for symbols
-        [tc-e/t (let: ([x : (Un 'foo Number) 'foo])
-                      (if (equal? x 'foo) 3 x))
-                -Number]
-        [tc-e/t (let: ([x : (Un 'foo Number) 'foo])
-                      (if (equal? 'foo x) 3 x))
-                -Number]
-
-        [tc-e (let* ([sym 'squarf]
-                     [x (if (= 1 2) 3 sym)])
-                (if (equal? x sym) 3 x))
-              #:ret (ret -PosByte -true-filter)]
-        [tc-e (let* ([sym 'squarf]
-                     [x (if (= 1 2) 3 sym)])
-                (if (equal? sym x) 3 x))
-              #:ret (ret -PosByte -true-filter)]
-
-        [tc-e (let: ([x : (Listof Symbol)'(a b c)])
-                    (cond [(memq 'a x) => car]
-                          [else 'foo]))
-              -Symbol]
-
-        [tc-e (list 2 3 4) (-lst* -PosByte -PosByte -PosByte)]
-        [tc-e (list 2 3 4 'a) (-lst* -PosByte -PosByte -PosByte (-val 'a))]
-
-        [tc-e `(1 2 ,(+ 3 4)) (-lst* -One -PosByte -PosIndex)]
-
-        [tc-e (let: ([x : Any 1])
-                    (when (and (list? x) (not (null? x)))
-                      (car x)))
-              Univ]
-
-        [tc-err (let: ([x : Any 3])
-                      (car x))]
-        [tc-err (car 3)]
-        [tc-err (map 3 12)]
-        [tc-err (car 3)]
-
-        [tc-e/t (let: ([x : Any 1])
-                  (if (and (list? x) (not (null? x)))
-                      x
-                      'foo))
-                (t:Un (-val 'foo) (-pair Univ (-lst Univ)))]
-
-        [tc-e (cadr (cadr (list 1 (list 1 2 3) 3))) -PosByte]
-
-
-
-        ;;; tests for and
-        [tc-e (let: ([x : Any 1]) (and (number? x) (boolean? x)))
-              #:ret (ret -Boolean -false-filter)]
-        [tc-e (let: ([x : Any 1]) (and (number? x) x))
-              (t:Un -Number (-val #f))]
-        [tc-e (let: ([x : Any 1]) (and x (boolean? x)))
-              -Boolean]
-
-        [tc-e/t (let: ([x : Any 3])
-                      (if (and (list? x) (not (null? x)))
-                          (begin (car x) 1) 2))
-              -PosByte]
-
-        ;; set! tests
-        [tc-e (let: ([x : Any 3])
-                    (set! x '(1 2 3))
-                    (if (number? x) x 2))
-              Univ]
-
-        ;; or tests - doesn't do anything good yet
-
-        #| FIXME: This should pass, but the filter is different for some reason
-        [tc-e (let: ([x : Any 3])
-                    (if (or (boolean? x) (number? x))
-                        (if (boolean? x) 12 x)
-                        47))
-              -Number]
-        |#
-
-        ;; test for fake or
-        [tc-e (let: ([x : Any 1])
-                    (if (if (number? x)
-                            #t
-                            (boolean? x))
-                        (if (boolean? x) 1 (+ 1 x))
-                        4))
-              -Number]
-        ;; these don't invoke the or rule
-        [tc-e (let: ([x : Any 1]
-                     [y : Any 12])
-                    (if (if (number? x)
-                            #t
-                            (boolean? y))
-                        (if (boolean? x) 1 x)
-                        4))
-              #:ret (ret Univ -true-filter)]
-        [tc-e (let: ([x : Any 1])
-                    (if (if ((lambda: ([x : Any]) x) 12)
-                            #t
-                            (boolean? x))
-                        (if (boolean? x) 1 x)
-                        4))
-              #:ret (ret Univ -true-filter)]
-        ;; T-AbsPred
-        [tc-e/t (let ([p? (lambda: ([x : Any]) (number? x))])
-                  (lambda: ([x : Any]) (if (p? x) (add1 x) (add1 12))))
-                (t:-> Univ -Number)]
-        [tc-e/t (let ([p? (lambda: ([x : Any]) (not (number? x)))])
-                  (lambda: ([x : Any]) (if (p? x) 12 (add1 x))))
-                (t:-> Univ -Number : (-FS -top (-filter -Number 0)))]
-        [tc-e/t (let* ([z 1]
-                       [p? (lambda: ([x : Any]) (number? z))])
-                  (lambda: ([x : Any]) (if (p? x) 11 12)))
-                (t:-> Univ -PosByte : -true-filter)]
-        [tc-e/t (let* ([z 1]
-                       [p? (lambda: ([x : Any]) (number? z))])
-                  (lambda: ([x : Any]) (if (p? x) x 12)))
-                (t:-> Univ Univ : (-FS  (-not-filter (-val #f) 0) (-filter (-val #f) 0))
-                                : (make-Path null '(0 0)))]
-        [tc-e/t (let* ([z (ann 1 : Any)]
-                       [p? (lambda: ([x : Any]) (not (number? z)))])
-                  (lambda: ([x : Any]) (if (p? x) (ann (add1 7) Any) 12)))
-                (t:-> Univ Univ)]
-        [tc-e/t (let* ([z 1]
-                       [p? (lambda: ([x : Any]) (not (number? z)))])
-                  (lambda: ([x : Any]) (if (p? x) x 12)))
-                (t:-> Univ -PosByte : -true-filter)]
-        [tc-e/t (let* ([z 1]
-                       [p? (lambda: ([x : Any]) z)])
-                  (lambda: ([x : Any]) (if (p? x) x 12)))
-                (t:-> Univ Univ : (-FS (-not-filter (-val #f) 0) (-filter (-val #f) 0))
-                                : (make-Path null '(0 0)))]
-
-        [tc-e (not 1)
-          #:ret (ret -Boolean -false-filter)]
-
-        [tc-err ((lambda () 1) 2)
-          #:ret (ret (-val 1) -true-filter)]
-        [tc-err (apply (lambda () 1) '(2))]
-        [tc-err ((lambda: ([x : Any] [y : Any]) 1) 2)
-          #:ret (ret (-val 1) -true-filter)]
-        [tc-err (map map '(2))]
-        [tc-err ((plambda: (a) ([x : (a -> a)] [y : a]) (x y)) 5)]
-        [tc-err ((plambda: (a) ([x : a] [y : a]) x) 5)]
-        [tc-err (ann 5 : String)
-          #:ret (ret -String -true-filter)]
-
-        ;; these don't work because the type annotation gets lost in marshalling
-        #|
-        [tc-e (letrec-syntaxes+values () ([(#{x : Number}) (values 1)]) (add1 x)) -Number]
-        [tc-e (letrec-values ([(#{x : Number}) (values 1)]) (add1 x)) -Number]
-        [tc-e (letrec ([#{x : Number} (values 1)]) (add1 x)) -Number]
-        |#
-
-        [tc-e (letrec: ([x : Number (values 1)]) (add1 x)) -Number]
-
-        ;; This test case used to test Undefined, but the `x` is now Bottom because
-        ;; cyclic definitions can be given *any* type. This is ok since cyclic definitions
-        ;; are just errors that TR does not handle (because #<undefined> no longer leaks out
-        ;; in such cases).
-        [tc-e (let ()
-                 (: complicated Boolean)
-                 (define complicated #f)
-                 (: undefined (Un))
-                 (define undefined (letrec: ((x : (Un) x)) x))
-                 (letrec: ((x : (Un) (if complicated undefined undefined))
-                           (y : (Un) (if complicated x undefined)))
-                   y))
-          -Bottom]
-
-        ;; This case fails, unlike the last one, since the types in the
-        ;; cycle are inconsistent. Note that this will error (if it typechecked)
-        ;; because of the uninitialized variables.
-        [tc-err (let ()
-                 (: x String)
-                 (define x y)
-                 (: y Symbol)
-                 (define y x)
-                 y)
-                #:ret (ret -Symbol -true-filter)
-                #:msg #rx"expected: String|expected: Symbol"]
-
-        ;; Test ill-typed code in letrec RHS
-        [tc-err (let () (: x String) (define x 'foo) x)
-                #:ret (ret -String -true-filter)
-                #:msg #rx"expected: String.*given: 'foo"]
-
-        [tc-err (let ([x (add1 5)])
-                  (set! x "foo")
-                  x)
-          #:ret (ret -Integer -true-filter)]
-        ;; w-c-m
-        [tc-e/t (with-continuation-mark
-                  ((inst make-continuation-mark-key Symbol)) 'mark
-                  3)
-              -PosByte]
-        [tc-err (with-continuation-mark (5 4) 1
-                  3)]
-        [tc-err (with-continuation-mark 1 (5 4)
-                  3)]
-        [tc-err (with-continuation-mark 1 2 (5 4))]
-
-        [tc-err (with-continuation-mark 'x 'y 'z)
-          #:ret (ret (-val 'z) -bot-filter)
-          #:expected (ret (-val 'z) -no-filter -no-obj)]
-
-
-        ;; call-with-values
-
-        [tc-e (call-with-values (lambda () (values 1 2))
-                                (lambda: ([x : Number] [y : Number]) (+ x y)))
-              -Number]
-        [tc-e (call-with-values (lambda () 1)
-                                (lambda: ([x : Number]) (+ x 1)))
-              -Number]
-        [tc-err (call-with-values (lambda () 1)
-                                  (lambda: () 2))
-          #:ret (ret -PosByte -true-filter)]
-
-        [tc-err (call-with-values (lambda () (values 2))
-                                  (lambda: ([x : Number] [y : Number]) (+ x y)))
-          #:ret (ret -Number)]
-        [tc-err (call-with-values 5
-                                  (lambda: ([x : Number] [y : Number]) (+ x y)))
-          #:ret (ret -Number)]
-        [tc-err (call-with-values (lambda () (values 2))
-                                  5)]
-        [tc-err (call-with-values (lambda () (values 2 1))
-                                  (lambda: ([x : String] [y : Number]) (+ x y)))]
-        ;; quote-syntax
-        [tc-e/t #'3 (-Syntax -PosByte)]
-        [tc-e/t #'(2 3 4) (-Syntax (-lst* (-Syntax -PosByte) (-Syntax -PosByte) (-Syntax -PosByte)))]
-        [tc-e/t #'id (-Syntax (-val 'id))]
-        [tc-e/t #'#(1 2 3) (-Syntax (make-HeterogeneousVector (list (-Syntax -One) (-Syntax -PosByte) (-Syntax -PosByte))))]
-        [tc-e/t (ann #'#(1 2 3) (Syntaxof (Vectorof (Syntaxof (U 1 2 3 'foo)))))
-                (-Syntax (-vec (-Syntax (t:Un (-val 1) (-val 2) (-val 3) (-val 'foo)))))]
-        [tc-e/t (ann #'#(1 2 3) (Syntaxof (Vector (Syntaxof (U 1 'foo))
-                                                  (Syntaxof (U 2 'bar))
-                                                  (Syntaxof (U 3 'baz)))))
-                (-Syntax (make-HeterogeneousVector (list (-Syntax (t:Un (-val 1) (-val 'foo)))
-                                                         (-Syntax (t:Un (-val 2) (-val 'bar)))
-                                                         (-Syntax (t:Un (-val 3) (-val 'baz))))))]
-        [tc-e/t #'#&2 (-Syntax (-box (-Syntax -PosByte)))]
-        [tc-e/t (ann #'#&2 (Syntaxof (Boxof (Syntaxof (U 2 'foo)))))
-                (-Syntax (-box (-Syntax (t:Un (-val 2) (-val 'foo)))))]
-        [tc-e/t #'#hash([1 . 1] [2 . 2]) (-Syntax (make-Hashtable -Int (-Syntax -PosByte)))]
-        [tc-e/t (ann #'#hash([1 . 1] [2 . 2]) (Syntaxof (HashTable (U 1 2 'foo)
-                                                                   (Syntaxof (U 1 2 'bar)))))
-                (-Syntax (make-Hashtable (t:Un (-val 1) (-val 2) (-val 'foo))
-                                         (-Syntax (t:Un (-val 1) (-val 2) (-val 'bar)))))]
-
-        ;; testing some primitives
-        [tc-e (let ([app apply]
-                    [f (lambda: [x : Number *] 3)])
-                (app f (list 1 2 3)))
-              -PosByte]
-        [tc-e ((lambda () (call/cc (lambda: ([k : (Number -> (U))]) (if (read) 5 (k 10))))))
-              -Number]
-
-        [tc-e (number->string 5) -String]
-
-        [tc-e (let-values ([(a b) (quotient/remainder 5 12)]
-                           [(a*) (quotient 5 12)]
-                           [(b*) (remainder 5 12)])
-                (+ a b a* b*))
-              -Nat]
-
-        [tc-e (raise-type-error 'foo "bar" 5) (t:Un)]
-        [tc-e (raise-type-error 'foo "bar" 7 (list 5)) (t:Un)]
-
-        #| FIXME: this typechecks, but the equality check seems broken
-        [tc-e
-         (let ((x '(1 3 5 7 9)))
-           (do: : Number ((x : (Listof Number) x (cdr x))
-                          (sum : Number 0 (+ sum (car x))))
-                ((null? x) sum)))
-         -Number]
-        |#
-
-        ;; inference with internal define
-        [tc-e (let ()
-                (define x 1)
-                (define y 2)
-                (define z (+ x y))
-                (* x z))
-              -PosIndex]
-
-        [tc-e/t (let ()
-                  (define: (f [x : Number]) : Number
-                    (define: (g [y : Number]) : Number
-                      (let*-values ([(z w) (values (g (f x)) 5)])
-                        (+ z w)))
-                    (g 4))
-                  5)
-                -PosByte]
-
-        [tc-err (let ()
-                  (define x x)
-                  1)]
-        [tc-err (let ()
-                  (define (x) (y))
-                  (define (y) (x))
-                  1)]
-
-        [tc-e ((case-lambda:
-                [[x : Number *] (+ 1 (car x))])
-               5)
-              -Number]
-        [tc-e ((tr:case-lambda
-                [[x : Number *] (+ 1 (car x))])
-               5)
-              -Number]
-
-        [tc-e `(4 ,@'(3)) (-pair -PosByte (-lst* -PosByte))]
-
-        [tc-e
-         (let ((x '(1 3 5 7 9)))
-           (do: : Number ((x : (Listof Number) x (cdr x))
-                          (sum : Number 0 (+ sum (car x))))
-                ((null? x) sum)))
-         #:ret (ret -Number -top-filter -empty-obj)]
-
-        [tc-e/t (if #f 1 'foo) (-val 'foo)]
-
-        [tc-e (list* 1 2 3) (-pair -One (-pair -PosByte -PosByte))]
-        [tc-err (list*)]
-
-        [tc-err (apply append (list 1) (list 2) (list 3) (list (list 1) "foo"))]
-        [tc-e (apply append (list 1) (list 2) (list 3) (list (list 1) (list 1))) (-lst -PosByte)]
-        [tc-e (apply append (list 1) (list 2) (list 3) (list (list 1) (list "foo")))
-              (-lst (t:Un -String -PosByte))]
-        [tc-e (plambda: (b ...) [y : b ... b] (apply append (map list y)))
-         #:ret (ret (-polydots (b) (->... (list) (b b) (-lst Univ))) -true-filter)]
-        [tc-e/t (plambda: (b ...) [y : (Listof Integer) ... b] (apply append y))
-                (-polydots (b) (->... (list) ((-lst -Integer) b) (-lst -Integer)))]
-
-        [tc-err (plambda: (a ...) ([z : String] . [w : Number ... a])
-                          (apply (plambda: (b) ([x : Number] . [y : Number ... a]) x)
-                                 1 1 1 1 w))
-         #:ret (ret (-polydots (a) (->... (list -String) (-Number a) -Bottom)) -true-filter)]
-
-        [tc-err (plambda: (a ...) ([z : String] . [w : Number])
-                          (apply (plambda: (b) ([x : Number] . [y : Number ... a]) x)
-                                 1 w))]
-
-        [tc-e/t (plambda: (a ...) ([z : String] . [w : Number ... a])
-                        (apply (plambda: (b ...) ([x : Number] . [y : Number ... b]) x)
-                               1 w))
-              (-polydots (a) ((list -String) (-Number a) . ->... . -Number))]
-        [tc-e/t (let ([f (plambda: (a ...) [w : a ... a] w)])
-                  (f 1 "hello" #\c))
-                (-lst* -One -String -Char)]
-        ;; instantiating non-dotted terms
-        [tc-e/t (inst (plambda: (a) ([x : a]) x) Integer)
-                (make-Function (list (make-arr* (list -Integer) -Integer
-                                                #:filters (-FS (-not-filter (-val #f) (list 0 0))
-                                                               (-filter (-val #f) (list 0 0)))
-                                                #:object (make-Path null (list 0 0)))))]
-        [tc-e/t (inst (plambda: (a) [x : a *] (apply list x)) Integer)
-                ((list) -Integer . ->* . (-lst -Integer))]
-
-        ;; instantiating dotted terms
-        [tc-e/t (inst (plambda: (a ...) [xs : a ... a] 3) Integer Boolean Integer)
-                (-Integer -Boolean -Integer . t:-> . -PosByte : -true-filter)]
-        [tc-e/t (inst (plambda: (a ...) [xs : (a ... a -> Integer) ... a] 3) Integer Boolean Integer)
-                ((-Integer -Boolean -Integer . t:-> . -Integer)
-                 (-Integer -Boolean -Integer . t:-> . -Integer)
-                 (-Integer -Boolean -Integer . t:-> . -Integer)
-                 . t:-> . -PosByte : -true-filter)]
-
-        [tc-e/t (plambda: (z x y ...) () (inst map z x y ... y))
-              (-polydots (z x y)
-                         (t:-> (cl->*
-                                ((t:-> x z) (-pair x (-lst x)) . t:-> . (-pair z (-lst z)))
-                                ((list ((list x) (y y) . ->... . z) (-lst x)) 
-                                 ((-lst y) y) 
-                                 . ->... . (-lst z)))
-                               : -true-filter 
-                               : (-id-path #'map)))]
-
-        ;; error tests
-        [tc-err (+ 3 #f)]
-        [tc-err (let: ([x : Number #f]) x)
-          #:ret (ret -Number -true-filter)]
-        [tc-err (let: ([x : Number #f]) (+ 1 x))
-          #:ret (ret -Number)]
-
-        [tc-err
-         (let: ([x : Any '(foo)])
-               (if (null? x) 1
-                   (if (list? x)
-                       (add1 x)
-                       12)))
-         #:ret (ret -PosByte -true-filter)]
-
-        [tc-err (let*: ([x : Any 1]
-                        [f : (-> Void) (lambda () (set! x 'foo))])
-                       (if (number? x)
-                           (begin (f) (add1 x))
-                           12))
-          #:ret (ret -PosByte -true-filter)]
-
-        [tc-err (ann 3 (Rec a a))]
-        [tc-err (ann 3 (Rec a (U a 3)))]
-        [tc-err (ann 3 (Rec a (Rec b a)))]
-
-        #| FIXME: why should this error?
-        [tc-err (lambda: ([x : Any])
-                         (if (number? (not (not x)))
-                             (add1 x)
-                             12))]
-        |#
-
-        [tc-e (filter exact-integer? (list 1 2 3 'foo))
-              (-lst -Integer)]
-
-        [tc-e (filter even? (filter exact-integer? (list 1 2 3 'foo)))
-              (-lst -Integer)]
-
-        [tc-e (filter (ann (λ: ((x : (U Symbol String)))
-                               (if (symbol? x) 'x #f)) ((U Symbol String) -> (U Symbol #f) : Symbol))
-                      (list "three" 'four 'five "six"))
-              (-lst -Symbol)]
-
-
-        [tc-e (vector-filter path-string? (ann (vector "a" 4 5 "b") (Vectorof Any)))
-              (-vec (t:Un -Path -String))]
-
-        [tc-e (sequence-filter module-path? (ann (vector "a" 4 5 "b") (Vectorof Any)))
-              (-seq (t:Un -Module-Path))]
-
-
-        #|
-        [tc-err (plambda: (a ...) [as : a ... a]
-                          (apply fold-left (lambda: ([c : Integer] [a : Char] . [xs : a ... a]) c)
-                                 3 (list #\c) as))]
-        [tc-err (plambda: (a ...) [as : a ... a]
-                          (apply fold-left (lambda: ([c : Integer] [a : String] . [xs : a ... a]) c)
-                                 3 (list #\c) (map list as)))]
-        [tc-err (plambda: (a ...) [as : a ... a]
-                          (apply fold-left (lambda: ([c : Integer] [a : Char] . [xs : a ... a]) c)
-                                 3 (list #\c) (map list (map list as))))]
-
-        [tc-e/t (plambda: (a ...) [as : a ... a]
-                          (apply fold-left (lambda: ([c : Integer] [a : Char] . [xs : a ... a]) c)
-                                 3 (list #\c) (map list as)))
-                (-polydots (a) ((list) (a a) . ->... . -Integer))]
-        |#
-
-        [tc-e (foldl (lambda: ([x : Integer] [acc : String]) acc) "" '(1 2 3))
-              -String]
-        [tc-e (foldl (lambda: ([x : Integer] [y : Float] [acc : String]) acc) "" '(1 2 3) '(1.2 3.4 5.6))
-              -String]
-        [tc-e (foldl (lambda: ([x : Integer] [y : Float] [z : Symbol ] [acc : String]) acc) "" '(1 2 3) '(1.2 3.4 5.6) '(a b c))
-              -String]
-        [tc-e (foldr (lambda: ([x : Integer] [acc : String]) acc) "" '(1 2 3))
-              -String]
-        [tc-e (foldr (lambda: ([x : Integer] [y : Float] [acc : String]) acc) "" '(1 2 3) '(1.2 3.4 5.6))
-              -String]
-        [tc-e (foldr (lambda: ([x : Integer] [y : Float] [z : Symbol ] [acc : String]) acc) "" '(1 2 3) '(1.2 3.4 5.6) '(a b c))
-              -String]
-
-        ;; First is same as second, but with map explicitly instantiated.
-        [tc-e/t (plambda: (a ...) [ys : (a ... a -> Number) *]
-                (lambda: [zs : a ... a]
-                  ((inst map Number (a ... a -> Number))
-                   (lambda: ([y : (a ... a -> Number)])
-                     (apply y zs))
-                   ys)))
-              (-polydots (a) ((list) ((list) (a a) . ->... . -Number) . ->* .
-                                     ((list) (a a) . ->... . (-lst -Number)) : -true-filter))]
-        [tc-e/t (plambda: (a ...) [ys : (a ... a -> Number) *]
-                (lambda: [zs : a ... a]
-                  (map (lambda: ([y : (a ... a -> Number)])
-                         (apply y zs))
-                       ys)))
-              (-polydots (a) ((list) ((list) (a a) . ->... . -Number) . ->* .
-                                     ((list) (a a) . ->... . (-lst -Number)) : -true-filter))]
-
-        [tc-e/t (lambda: ((x : (All (t) t)))
-                       ((inst (inst x (All (t) (t -> t)))
-                              (All (t) t))
-                        x))
-              ((-poly (a) a)  . t:-> . (-poly (a) a))]
-
-        ;; We need to make sure that even if a isn't free in the dotted type, that it gets replicated
-        ;; appropriately.
-        [tc-e/t (inst (plambda: (a ...) [ys : Number ... a]
-                                (apply + ys))
-                      Boolean String Number)
-                (-Number -Number -Number . t:-> . -Number)]
-
-        [tc-e (assq 'foo #{'((a b) (foo bar)) :: (Listof (List Symbol Symbol))})
-              (t:Un (-val #f) (-lst* -Symbol -Symbol))]
-
-        [tc-e/t (ann (lambda (x) x) (All (a) (a -> a)))
-                (-poly (a) (a . t:-> . a))]
-        [tc-e (apply values (list 1 2 3)) #:ret (ret (list -One -PosByte -PosByte))]
-
-        [tc-e/t (ann (if #t 3 "foo") Integer) -Integer]
-
-        [tc-e/t (plambda: (a ...) ([x : Number] . [y : a ... a])
-                          (andmap null? (map list y)))
-                (-polydots (a) ((list -Number) (a a) . ->... . -Boolean))]
-        [tc-e (ann (error 'foo) (values Number Number)) #:ret (ret (list -Bottom -Bottom))]
-
-        [tc-e (string->number "123")
-              (t:Un (-val #f) -Number)]
-
-        [tc-e #{(make-hash) :: (HashTable Number Number)}
-              (-HT -Number -Number)]
-        [tc-e #{(make-immutable-hash) :: (HashTable String Symbol)}
-              (-HT -String -Symbol)]
-        [tc-e (hash-has-key? (make-hash '((1 . 2))) 1) -Boolean]
-
-        [tc-err (let: ([fact : (Number -> Number)
-                             (lambda: ([n : Number]) (if (zero? n) 1 (* n (fact (- n 1)))))])
-                        (fact 20))
-          #:ret (ret -Number)]
-
-        [tc-err (ann (lambda: ([x : Any]) #f) (Any -> Boolean : String))
-          #:ret (ret (make-pred-ty -String) -true-filter)]
-
-
-        [tc-e (time (+ 3 4)) -PosIndex]
-
-
-
-        [tc-e
-         (call-with-values (lambda () ((inst time-apply Number Number Number) + (list 1 2)))
-                           (lambda: ([v : (Listof Number)]
-                                     [cpu : Number]
-                                     [user : Number]
-                                     [gc : Number])
-                             'whatever))
-         #:ret (ret (-val 'whatever) -true-filter)]
-        [tc-e
-         (call-with-values (lambda () 
-                             ((inst time-apply Number Number Number Number Number Number Number)
-                              + (list 1 2 3 4 5 6)))
-                           (lambda: ([v : (Listof Number)]
-                                     [cpu : Number]
-                                     [user : Number]
-                                     [gc : Number])
-                             'whatever))
-         #:ret (ret (-val 'whatever) -true-filter)]
-        [tc-e (let: ([l : (Listof Any) (list 1 2 3)])
-                (if (andmap number? l)
-                    (+ 1 (car l))
-                    7))
-              -Number]
-        (tc-e (or (string->number "7") 7)
-              #:ret (ret -Number -true-filter))
-        [tc-e (let ([x 1]) (if x x (add1 x)))
-              #:ret (ret -One -true-filter)]
-        [tc-e (let: ([x : (U (Vectorof Integer) String) (vector 1 2 3)])
-                (if (vector? x) (vector-ref x 0) (string-length x)))
-         -Integer]
-        [tc-e (let ()
-                (define: foo : (Integer * -> Integer) +)
-                (foo 1 2 3 4 5))
-              -Integer]
-        [tc-e (let ()
-                (define: x : Any 7)
-                (if (box? x) (unbox x) (+ 1)))
-              Univ]
-        [tc-e (floor 1/2) -Nat]
-        [tc-e (ceiling 1/2) -PosInt]
-        [tc-e (truncate 0.5) -NonNegFlonum]
-        [tc-e (truncate -0.5) -NonPosFlonum]
-        [tc-e/t (ann (lambda (x) (lambda (x) x))
-                     (Integer -> (All (X) (X -> X))))
-                (t:-> -Integer (-poly (x) (t:-> x x)))]
-        [tc-e/t (lambda: ([x : Any])
-                         (or (eq? 'q x)
-                             (eq? 'r x)
-                             (eq? 's x)))
-                (make-pred-ty (t:Un (-val 'q) (-val 'r) (-val 's)))]
-        [tc-e (let: ([x : Exact-Positive-Integer 1])
-                (vector-ref #("a" "b") x)
-                (vector-ref #("a" "b") (sub1 x))
-                (vector-ref #("a" "b") (- x 1)))
-              -String]
-        [tc-err (string-append "bar" (if (zero? (ann 0.0 Float)) #f "foo"))
-          #:ret (ret -String)]
-        [tc-err (do: : Void
-                     ([j : Natural (+ i 'a) (+ j i)])
-                     ((>= j 10))
-                     #f)
-          #:ret (ret -Void -top-filter -empty-obj)]
-        [tc-err (apply +)]
-        [tc-e/t
-         (let ([x eof])
-           (if (procedure? x)
-               x
-               (lambda (z) (eq? x z))))
-         (make-pred-ty (-val eof))]
-        [tc-e ((inst map Number (Pairof Number Number))
-               car
-               (ann (list (cons 1 2) (cons 2 3) (cons 4 5)) (Listof (Pairof Number Number))))
-              (-lst -Number)]
-        [tc-err (list (values 1 2))
-          #:ret (ret (-Tuple (list -Bottom)))]
-
-
-        ;;Path tests
-        (tc-e (path-string? "foo") -Boolean)
-        (tc-e (path-string? (string->path "foo")) #:ret (ret -Boolean -true-filter))
-        (tc-e (bytes->path #"foo" 'unix) -SomeSystemPath)
-        (tc-e (bytes->path #"foo") -Path)
-        (tc-e (bytes->path-element #"foo") -Path)
-        (tc-e (bytes->path-element #"foo" 'windows) -SomeSystemPath)
-
-        (tc-e (cleanse-path "foo") -Path)
-        (tc-e (cleanse-path (string->some-system-path "foo" 'unix)) -SomeSystemPath)
-        (tc-e (simplify-path "foo") -Path)
-        (tc-e (simplify-path "foo" #t) -Path)
-        (tc-e (simplify-path (string->some-system-path "foo" 'unix) #f) -SomeSystemPath)
-        (tc-e (path->directory-path "foo") -Path)
-        (tc-e (path->directory-path (string->some-system-path "foo" 'unix)) -SomeSystemPath)
-
-        (tc-e (resolve-path "foo") -Path)
-        (tc-e (expand-user-path "foo") -Path)
-
-        ;;String Tests
-        (tc-e (string? "a") #:ret (ret -Boolean -true-filter))
-        (tc-e (string? 2) #:ret (ret -Boolean -false-filter))
-
-        (tc-e (string->immutable-string (string #\a #\b)) -String)
-        (tc-e (string-length (make-string 5 #\z)) -Index)
-        (tc-e (string-copy (build-string 26 integer->char)) -String)
-        (tc-e (string-copy! (make-string 4) 0 "foob") -Void)
-        (tc-e (string-copy! (make-string 4) 1 "bark" 1) -Void)
-        (tc-e (string-copy! (make-string 4) 1 "zend" 1 2) -Void)
-
-        (tc-e (string-fill! (make-string 5) #\Z) -Void)
-
-        (tc-e (string-append) -String)
-        (tc-e (string-append "a" "b") -String)
-        (tc-e (string-append "c" "d" "f") -String)
-
-        (tc-e (string->list "abcde") (-lst -Char))
-        (tc-e (list->string (list #\a #\d #\d)) -String)
-
-        (tc-e (string=? "a" "a") -Boolean)
-        (tc-e (string<? "a" "a") -Boolean)
-        (tc-e (string>? "a" "a") -Boolean)
-        (tc-e (string<=? "a" "a") -Boolean)
-        (tc-e (string>=? "a" "a") -Boolean)
-
-        (tc-e (string-upcase "a") -String)
-        (tc-e (string-downcase "a") -String)
-        (tc-e (string-titlecase "a") -String)
-        (tc-e (string-foldcase "a") -String)
-
-
-        (tc-e (string-ci=? "a" "A") -Boolean)
-        (tc-e (string-ci<? "a" "A") -Boolean)
-        (tc-e (string-ci>? "a" "A") -Boolean)
-        (tc-e (string-ci<=? "a" "A") -Boolean)
-        (tc-e (string-ci>=? "a" "A") -Boolean)
-
-
-        (tc-e (string-normalize-nfd "a") -String)
-        (tc-e (string-normalize-nfkd "a") -String)
-        (tc-e (string-normalize-nfc "a") -String)
-        (tc-e (string-normalize-nfkc "a") -String)
-
-
-
-        (tc-e (string-locale=? "a" "a") -Boolean)
-        (tc-e (string-locale<? "a" "a") -Boolean)
-        (tc-e (string-locale>? "a" "a") -Boolean)
-
-        (tc-e (string-locale-upcase "a") -String)
-        (tc-e (string-locale-downcase "a") -String)
-
-
-        (tc-e (string-locale-ci=? "a" "A") -Boolean)
-        (tc-e (string-locale-ci<? "a" "A") -Boolean)
-        (tc-e (string-locale-ci>? "a" "A") -Boolean)
-
-        ;Symbols
-
-        (tc-e (symbol? 'foo) #:ret (ret -Boolean -true-filter))
-        (tc-e (symbol? 2) #:ret (ret -Boolean -false-filter))
-
-        (tc-e (symbol-interned? 'foo) -Boolean)
-        (tc-e (symbol-interned? (string->unreadable-symbol "bar")) -Boolean)
-        (tc-e (symbol-interned? (string->uninterned-symbol "bar")) -Boolean)
-        (tc-e (symbol-interned? (gensym 'foo)) -Boolean)
-        (tc-e (symbol-interned? (gensym "foo")) -Boolean)
-
-        (tc-e (symbol-unreadable? (gensym)) -Boolean)
-        (tc-e (symbol-unreadable? 'foo) -Boolean)
-        (tc-e (string->unreadable-symbol "bar") -Symbol)
-        (tc-e (string->uninterned-symbol "bar") -Symbol)
-
-        (tc-e (symbol->string 'foo) -String)
-        (tc-e (string->symbol (symbol->string 'foo)) -Symbol)
-
-        ;Booleans
-        (tc-e (not #f) #:ret (ret -Boolean -true-filter))
-        (tc-e (false? #f) #:ret (ret -Boolean -true-filter))
-        (tc-e (not #t) #:ret (ret -Boolean -false-filter))
-        ;; It's not clear why the following test doesn't work,
-        ;; but it works fine in the real typechecker
-        ;(tc-e (false? #t) #:ret (ret -Boolean -false-filter))
-
-
-        (tc-e (boolean? true) #:ret (ret -Boolean -true-filter))
-        (tc-e (boolean? 6) #:ret (ret -Boolean -false-filter))
-        (tc-e (immutable? (cons 3 4)) -Boolean)
-
-        (tc-e (boolean=? #t false) -Boolean)
-        (tc-e (symbol=? 'foo 'foo) -Boolean)
-
-        (tc-e (equal? 1 2) -Boolean)
-        (tc-e (eqv? 1 2) -Boolean)
-        (tc-e (eq? 1 2) -Boolean)
-        (tc-e (equal?/recur 'foo 'bar eq?) -Boolean)
-
-
-
-        (tc-e (shuffle '("a" "b")) (-lst -String))
-
-
-        ;Regexps
-        (tc-e (regexp-match "foo" "foobar") (-opt (-pair -String (-lst (-opt -String)))))
-        (tc-e (regexp-match #"foo" #"foobar") (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-        (tc-e (regexp-match #rx"foo" "foobar") (-opt (-pair -String (-lst (-opt -String)))))
-        (tc-e (regexp-match #rx#"foo" #"foobar") (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-        (tc-e (regexp-match #px"foo" "foobar") (-opt (-pair -String (-lst (-opt -String)))))
-        (tc-e (regexp-match #px#"foo" #"foobar") (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-
-        (tc-e (regexp-match "foo" #"foobar") (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-        (tc-e (regexp-match #"foo" "foobar") (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-        (tc-e (regexp-match #rx"foo" #"foobar") (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-        (tc-e (regexp-match #rx#"foo" "foobar") (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-        (tc-e (regexp-match #px"foo" #"foobar") (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-        (tc-e (regexp-match #px#"foo" "foobar") (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-
-        (tc-e (regexp-match "foo" (string->path "tmp")) (-opt (-pair -String (-lst (-opt -String)))))
-        (tc-e (regexp-match #"foo" (string->path "tmp")) (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-        (tc-e (regexp-match "foo" (open-input-string "tmp"))
-              (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-        (tc-e (regexp-match #"foo" (open-input-string "tmp"))
-              (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-
-        (tc-err (regexp-try-match "foo" "foobar")
-          #:ret (ret (t:Un (-val #f) (-pair -Bytes (-lst (t:Un (-val #f) -Bytes))))))
-        (tc-e (regexp-try-match "foo" (open-input-string "foobar"))
-              (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-
-        (tc-err (regexp-match-peek "foo" "foobar")
-          #:ret (ret (t:Un (-val #f) (-pair -Bytes (-lst (t:Un (-val #f) -Bytes))))))
-        (tc-e (regexp-match-peek "foo" (open-input-string "foobar"))
-              (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-
-        (tc-err (regexp-match-peek-immediate "foo" "foobar")
-          #:ret (ret (t:Un (-val #f) (-pair -Bytes (-lst (t:Un (-val #f) -Bytes))))))
-        (tc-e (regexp-match-peek-immediate "foo" (open-input-string "foobar"))
-              (-opt (-pair -Bytes (-lst (-opt -Bytes)))))
-
-
-
-        [tc-e (regexp-match/end "foo" "foobar")
-              #:ret (ret (list (-opt (-pair -String (-lst (-opt -String)))) (-opt -Bytes)))]
-
-        (tc-e (regexp-split "foo" "foobar") (-pair -String (-lst -String)))
-        (tc-e (regexp-split "foo" #"foobar") (-pair -Bytes (-lst -Bytes)))
-        (tc-e (regexp-split #"foo" "foobar") (-pair -Bytes (-lst -Bytes)))
-        (tc-e (regexp-split #"foo" #"foobar") (-pair -Bytes (-lst -Bytes)))
-
-        (tc-err (regexp-split "foo" (path->string "foobar"))
-          #:ret (ret (-pair -String (-lst -String))))
-
-        (tc-e (regexp-replace "foo" "foobar" "rep") -String)
-        (tc-e (regexp-replace #"foo" "foobar" "rep") -Bytes)
-        (tc-e (regexp-replace "foo" #"foobar" "rep") -Bytes)
-        (tc-e (regexp-replace "foo" #"foobar" #"rep") -Bytes)
-
-        (tc-err (regexp-replace "foo" "foobar" #"rep"))
-        (tc-e (regexp-replace "foo" "foobar" (lambda: (args : String *) "foo")) -String)
-        (tc-e (regexp-replace "foo" #"foobar" (lambda: (args : Bytes *) #"foo")) -Bytes)
-        (tc-err (regexp-replace "foo" "foobar" (lambda: (args : Bytes *) #"foo")))
-        (tc-err (regexp-replace #"foo" "foobar" (lambda: (args : String *) "foo")))
-
-        ;File System
-        (tc-e (find-system-path 'home-dir) -Path)
-        (tc-e (path-list-string->path-list "/bin:/sbin:/usr/bin" null) (-lst -Path))
-        (tc-e (find-executable-path "racket" "collects" #t) (-opt -Path))
-
-        (tc-e (file-exists? "/usr") -Boolean)
-        (tc-e (link-exists? "/usr") -Boolean)
-        (tc-e (delete-file "does-not-exist") -Void)
-
-        (tc-e (rename-file-or-directory "old" "new") -Void)
-        (tc-e (rename-file-or-directory "old" "new" #t) -Void)
-
-        (tc-e (file-or-directory-modify-seconds "dir") -NonNegFixnum)
-        (tc-e (file-or-directory-modify-seconds "dir" #f) -NonNegFixnum)
-        (tc-e (file-or-directory-modify-seconds "dir" 20) -Void)
-        (tc-e (file-or-directory-modify-seconds "dir" #f (lambda () "error"))
-              (t:Un -NonNegFixnum -String))
-        (tc-e (file-or-directory-modify-seconds "dir" 20 (lambda () "error")) (t:Un -Void -String))
-
-        (tc-e (file-or-directory-permissions "tmp") (-lst (one-of/c 'read 'write 'execute)))
-        (tc-e (file-or-directory-permissions "tmp" #f) (-lst (one-of/c 'read 'write 'execute)))
-        (tc-e (file-or-directory-permissions "tmp" 'bits) -NonNegFixnum)
-        (tc-e (file-or-directory-permissions "tmp" 4) -Void)
-
-        (tc-e (file-or-directory-identity "tmp") -PosInt)
-        (tc-e (file-or-directory-identity "tmp" 3) -PosInt)
-
-        (tc-e (file-size "tmp") -Nat)
-
-        (tc-e (copy-file "tmp/src" "tmp/dest") -Void)
-        (tc-e (make-file-or-directory-link "tmp/src" "tmp/dest") -Void)
-
-        (tc-e (current-drive) -Path)
-
-        (tc-e (directory-exists? "e") -Boolean)
-        (tc-e (make-directory "e") -Void)
-
-        (tc-e (delete-directory "e") -Void)
-
-        (tc-e (directory-list) (-lst -Path))
-        (tc-e (directory-list "tmp") (-lst -Path))
-        (tc-e (filesystem-root-list) (-lst -Path))
-
-
-
-
-        (tc-e (copy-directory/files "tmp/src" "tmp/dest") -Void)
-        (tc-e (delete-directory/files "tmp/src") -Void)
-
-        (tc-e (find-files (lambda (p) #t)) (-lst -Path))
-        (tc-e (find-files (lambda (p) #t) #f) (-lst -Path))
-        (tc-e (find-files (lambda (p) #t) "start") (-lst -Path))
-
-        (tc-e (pathlist-closure (list "thpm" "htmp")) (-lst -Path))
-        (tc-e (fold-files (lambda: ((p : Path) (type : Symbol) (res : 'res))
-                            (if (eq? type 'dir) (values res #t) (values res 'ignored))) 'res)
-              (-val 'res))
-        (tc-e (fold-files (lambda: ((p : Path) (type : Symbol) (res : 'res)) res) 'res "tmp" #f)
-              (-val 'res))
-
-        (tc-e (make-directory* "tmp/a/b/c") -Void)
-
-
-        (tc-e (put-preferences (list 'sym 'sym2) (list 'v1 'v2)) -Void)
-
-        (tc-e (preferences-lock-file-mode) (one-of/c 'exists 'file-lock))
-
-        (tc-e (make-lock-file-name "tmp.file") -Pathlike)
-        (tc-e (make-lock-file-name "tmp.dir" "tmp.file") -Pathlike)
-
-
-        ;New set operations
-        (tc-e (set-union (set 'one) (set 'two)) (-set (one-of/c 'one 'two)))
-        (tc-e (set-intersect (set 'one) (set 'two)) (-set (-val 'one)))
-        (tc-e (set-subtract (set 'one) (set 'two)) (-set (-val 'one)))
-        (tc-e (set-symmetric-difference (set 'one) (set 'two)) (-set (one-of/c 'one 'two)))
-
-        (tc-e (list->set (list 'one 'two)) (-set (one-of/c 'one 'two)))
-        (tc-e (list->seteq (list 'one 'two)) (-set (one-of/c 'one 'two)))
-        (tc-e (list->seteqv (list 'one 'two)) (-set (one-of/c 'one 'two)))
-        (tc-e (set->list (set 'one 'two)) (-lst (one-of/c 'one 'two)))
-
-
-        ;Syntax
-
-        (tc-e (syntax? #'id) #:ret (ret -Boolean -true-filter))
-        (tc-e (syntax? 2) #:ret (ret -Boolean -false-filter))
-
-        (tc-e (syntax-source #'here) Univ)
-        (tc-e (syntax-line #'here) (-opt -PosInt))
-        (tc-e (syntax-column #'here) (-opt -Nat))
-        (tc-e (syntax-position #'here) (-opt -PosInt))
-        (tc-e (syntax-span #'here) (-opt -Nat))
-
-
-        ;Parameters
-        (tc-e (parameter-procedure=? current-input-port current-output-port) -Boolean)
-
-        ;Namespaces
-        (tc-e (namespace? 2) #:ret (ret -Boolean -false-filter))
-        (tc-e (namespace? (make-empty-namespace)) #:ret (ret -Boolean -true-filter))
-
-        (tc-e (namespace-anchor? 3) #:ret (ret -Boolean -false-filter))
-        (tc-e/t (lambda: ((x : Namespace-Anchor)) (namespace-anchor? x))
-                (t:-> -Namespace-Anchor -Boolean : -true-filter))
-
-
-        (tc-e (variable-reference? 3) #:ret (ret -Boolean -false-filter))
-        (tc-e/t (lambda: ((x : Variable-Reference)) (variable-reference? x))
-                (t:-> -Variable-Reference  -Boolean : -true-filter))
-
-        (tc-e (system-type 'os) (one-of/c 'unix 'windows 'macosx))
-        (tc-e (system-type 'gc) (one-of/c 'cgc '3m))
-        (tc-e (system-type 'link) (one-of/c 'static 'shared 'dll 'framework))
-        (tc-e (system-type 'so-suffix) -Bytes)
-        (tc-e (system-type 'machine) -String)
-        (tc-err (system-type 'other))
-
-        (tc-e (tcp-listen 49 45) -TCP-Listener)
-        (tc-e (tcp-connect "google.com" 80) (list -Input-Port -Output-Port))
-
-
-        (tc-e (udp-open-socket) -UDP-Socket)
-        (tc-e (udp-close (udp-open-socket)) -Void)
-
-        (tc-e (udp-addresses (udp-open-socket)) (list -String -String))
-        (tc-e (udp-addresses (udp-open-socket) #f) (list -String -String))
-        (tc-e (udp-addresses (udp-open-socket) #t)
-              (list -String -NonNegFixnum -String -NonNegFixnum))
-
-        ;Byte converters
-        (tc-e (bytes-open-converter "UTF-8" "UTF-8") (-opt -Bytes-Converter))
-        (tc-e (let ()
-               (define: c : Bytes-Converter (assert (bytes-open-converter "UTF-8" "UTF-8")))
-               (bytes-convert c #"abcde"))
-              (list -Bytes -Nat (one-of/c 'complete 'continues 'aborts 'error)))
-        (tc-e (let ()
-               (define: c : Bytes-Converter (assert (bytes-open-converter "UTF-8" "UTF-8")))
-               (bytes-convert c #"abcde" 0 5 (make-bytes 10)))
-              (list -Nat -Nat (one-of/c 'complete 'continues 'aborts 'error)))
-
-        (tc-e (let ()
-               (define: c : Bytes-Converter (assert (bytes-open-converter "UTF-8" "UTF-8")))
-               (bytes-convert-end c))  (list -Bytes (one-of/c 'complete 'continues)))
-
-        (tc-e (let ()
-               (define: c : Bytes-Converter (assert (bytes-open-converter "UTF-8" "UTF-8")))
-               (bytes-convert-end c (make-bytes 10)))  (list -Nat (one-of/c 'complete 'continues)))
-
-        ;Subprocess
-        (tc-e (subprocess #f #f #f (string->path "/usr/bin/echo")
-                          "string" (string->path "path") #"bytes")
-              (list
-                -Subprocess
-                -Input-Port
-                -Output-Port
-                -Input-Port))
-
-        (tc-e (subprocess (current-output-port) (current-input-port) (current-error-port)
-                          (string->path "/usr/bin/echo") 'exact "arg")
-              (list
-                -Subprocess
-                (-val #f)
-                (-val #f)
-                (-val #f)))
-
-        (tc-e (let ()
-                (: p Subprocess)
-                (: std-out (Option Input-Port))
-                (: std-in  (Option Output-Port))
-                (: std-err (Option Input-Port))
-                (define-values (p std-out std-in std-err)
-                 (subprocess #f #f #f (string->path "/bin/bash")))
-                (subprocess? p))
-              #:ret (ret -Boolean -true-filter))
-
-        (tc-e (car (process "hello"))
-              -Input-Port)
-        (tc-e (car (process* "hello"))
-              -Input-Port)
-
-        #;
-        (tc-e (let ()
-                (: std-out Input-Port)
-                (: std-in  Output-Port)
-                (: std-err Input-Port)
-                (: proc-id Natural)
-                (: f Any)
-                (define-values (std-out std-in proc-id std-err f)
-                 (apply values (process/ports #f #f #f "/bin/bash")))
-                proc-id)
-              -Nat)
-
-
-        #;
-        (tc-e (let ()
-                (: std-out #f)
-                (: std-in  #f)
-                (: std-err #f)
-                (: proc-id Natural)
-                (: f Any)
-                (define-values (std-out std-in proc-id std-err f)
-                 (apply values (process*/ports (current-output-port)
-                                               (current-input-port)
-                                               (current-error-port)
-                                               "/bin/bash"
-                                               "arg1"
-                                               #"arg2")))
-                proc-id)
-              -Nat)
-
-        ;Compilation
-        (tc-e (compile-syntax #'(+ 1 2)) -Compiled-Expression)
-        (tc-e (let: ((e : Compiled-Expression (compile #'(+ 1 2))))
-                (compiled-expression? e))
-              #:ret (ret -Boolean -true-filter))
-        (tc-e (let: ((e : Compiled-Expression (compile #'(module + racket 2))))
-                (compiled-module-expression? e)) -Boolean)
-
-        ;Impersonator Property
-        (tc-e (make-impersonator-property 'prop)
-              (list -Impersonator-Property (t:-> Univ -Boolean) (t:-> Univ Univ)))
-        (tc-e (let-values: ((((prop : Impersonator-Property)
-                              (pred : (Any -> Any))
-                              (acc : (Any -> Any)))
-                             (make-impersonator-property 'prop)))
-               (impersonator-property? prop))
-              #:ret (ret -Boolean -true-filter))
-
-        ;Security Guards
-        (tc-e (make-security-guard (current-security-guard)
-                                   (lambda args (void))
-                                   (lambda args (void)))
-              -Security-Guard)
-        (tc-e (let: ((s : Security-Guard (current-security-guard)))
-                (security-guard? s))
-              #:ret (ret -Boolean -true-filter))
-
-
-        ;Custodians
-        (tc-e (make-custodian) -Custodian)
-        (tc-e (let: ((c : Custodian (current-custodian)))
-                (custodian? c))
-              #:ret (ret -Boolean -true-filter))
-        (tc-e (let: ((c : (Custodian-Boxof Integer) (make-custodian-box (current-custodian) 1)))
-                (custodian-box-value c)) -Int)
-
-        ;Thread Groups
-        (tc-e (make-thread-group) -Thread-Group)
-        (tc-e (let: ((tg : Thread-Group (current-thread-group)))
-                (thread-group? tg))
-              #:ret (ret -Boolean -true-filter))
-
-
-        ;Inspector
-        (tc-e (make-inspector) -Inspector)
-        (tc-e (let: ((i : Inspector (current-inspector)))
-                (inspector? i))
-              #:ret (ret -Boolean -true-filter))
-
-        ;Continuation Prompt Tags ang Continuation Mark Sets
-        ;; TODO: supporting default-continuation-prompt-tag means we need to
-        ;;       specially handle abort-current-continuation in the type system
-        ;(tc-e (default-continuation-prompt-tag) -Prompt-Tag)
-        (tc-e (let: ((pt : (Prompt-Tagof Integer Integer) (make-continuation-prompt-tag)))
-                   (continuation-marks #f pt)) -Cont-Mark-Set)
-        (tc-e (let: ((set : Continuation-Mark-Set (current-continuation-marks)))
-                   (continuation-mark-set? set)) #:ret (ret -Boolean -true-filter))
-
-        ;Logging
-        (tc-e (make-logger 'name) -Logger)
-        (tc-e (let: ((l : Logger (make-logger)))
-                (let: ((lr : Log-Receiver (make-log-receiver l 'error)))
-                 (log-message l 'error "Message" 'value))) -Void)
-
-        ;Events
-        (tc-e (sync (make-semaphore)) -Semaphore)
-        (tc-e (sync (tcp-listen 5555)) -TCP-Listener)
-        (tc-e (sync (tcp-listen 5555) (make-semaphore))
-              (make-Union (list -TCP-Listener -Semaphore)))
-        (tc-e (sync (thread (λ () 0))) -Thread)
-        (tc-e (sync (make-will-executor)) -Will-Executor)
-        (tc-e (sync (make-custodian-box (current-custodian) 0))
-              (make-CustodianBox (-val 0)))
-        (tc-e (sync ((inst make-channel String))) -String)
-        (tc-e (sync always-evt) (-mu x (make-Evt x)))
-        (tc-e (sync never-evt) -Bottom)
-        (tc-e (sync never-evt always-evt) (-mu x (make-Evt x)))
-        (tc-e (sync (system-idle-evt)) -Void)
-        (tc-e (sync (choice-evt (system-idle-evt))) -Void)
-        (tc-e (sync (choice-evt (system-idle-evt)
-                                ((inst make-channel String))))
-              (make-Union (list -String -Void)))
-        (tc-e (sync/timeout 100 (make-semaphore) (tcp-listen 5555))
-              (make-Union (list (-val #f) -TCP-Listener -Semaphore)))
-        (tc-e (handle-evt ((inst make-channel Number))
-                          (λ: ([x : Number]) (number->string x)))
-              (make-Evt -String))
-        (tc-e (wrap-evt ((inst make-channel Number))
-                        (λ: ([x : Number]) (number->string x)))
-              (make-Evt -String))
-        (tc-e (guard-evt (inst make-channel String))
-              (make-Evt -String))
-        (tc-e (sync (replace-evt always-evt (lambda (x) 3)))
-              (-mu x (make-Evt x)))
-        (tc-e (sync (replace-evt always-evt (lambda (x)
-                                              (alarm-evt (+ (current-inexact-milliseconds) 1000)))))
-              (-mu x (make-Evt x)))
-        (tc-err (let: ([a : (U (Evtof Any) String) always-evt])
-                  (if (handle-evt? a) a (string->symbol a)))
-          #:ret (ret (t:Un -Symbol (make-Evt Univ))))
-        (tc-err (let: ([a : (U (Evtof Any) String) always-evt])
-                  (if (channel-put-evt? a) a (string->symbol a)))
-          #:ret (ret (t:Un -Symbol (make-Evt (-mu x (make-Evt x))))))
-        (tc-err (let: ([a : (U (Evtof Any) String) always-evt])
-                  (if (semaphore-peek-evt? a) a (string->symbol a)))
-          #:ret (ret (t:Un -Symbol (make-Evt (-mu x (make-Evt x))))))
-
-        ;Semaphores
-        (tc-e (make-semaphore) -Semaphore)
-        (tc-e (let: ((s : Semaphore (make-semaphore 3)))
-                      (semaphore-post s)) -Void)
-
-        ;Random Numbers
-        (tc-e (make-pseudo-random-generator) -Pseudo-Random-Generator)
-        (tc-e (let: ((pg : Pseudo-Random-Generator (make-pseudo-random-generator)))
-                (pseudo-random-generator->vector pg))
-              (make-HeterogeneousVector (list -PosInt -PosInt -PosInt -PosInt -PosInt -PosInt)))
-
-        ;Structure Type Properties
-        (tc-e (make-struct-type-property 'prop)
-              (list -Struct-Type-Property (t:-> Univ -Boolean) (t:-> Univ Univ)))
-        (tc-e (let-values: ((((prop : Struct-Type-Property)
-                              (pred : (Any -> Any)) (acc : (Any -> Any)))
-                             (make-struct-type-property 'prop)))
-               (struct-type-property? prop))
-              #:ret (ret -Boolean -true-filter))
-
-        ;; Weak boxes
-        [tc-e (make-weak-box "foo") (-weak-box -String)]
-        [tc-e (weak-box-value (make-weak-box "foo")) (-opt -String)]
-        [tc-e (weak-box-value (ann (make-weak-box "foo") Weak-BoxTop))
-              Univ]
-        [tc-e (weak-box-value (make-weak-box "foo") 'bar)
-              (t:Un (-val 'bar) -String)]
-        [tc-err (let ()
-                  (define b1 (make-weak-box "foo"))
-                  (: b2 (Weak-Boxof (U Symbol String)))
-                  (define b2 b1)
-                  (error "foo"))
-                #:msg #rx"expected: \\(Weak-Boxof \\(U Symbol String\\)\\)"]
-
-        ;Wills
-        (tc-e (make-will-executor) -Will-Executor)
-        ;; FIXME: Broken because ManyUniv doesn't have a corresponding tc-result
-        #|
-        (tc-e (let: ((w : Will-Executor (make-will-executor)))
-                (will-register w 'a (lambda: ((s : Symbol)) (void)))
-                (will-execute w)) #:ret tc-any-results)
-        |#
-
-        ;Promises
-        ;For some reason they are failing in the test suite
-        #|
-        (tc-e (delay 's) (-Promise -Symbol))
-        (tc-e (let: ((p : (Promise Symbol) (delay 's)))
-                  (promise-running? p)) -Boolean)
-        |#
-
-
-        ;Kernel Structs, check that their hidden identifiers type
-        (tc-e (void exn
-                    exn:fail
-                    exn:fail:contract
-                    exn:fail:contract:arity
-                    exn:fail:contract:divide-by-zero
-                    exn:fail:contract:non-fixnum-result
-                    exn:fail:contract:continuation
-                    exn:fail:contract:variable
-                    exn:fail:syntax
-                    exn:fail:read
-                    exn:fail:read:eof
-                    exn:fail:read:non-char
-                    exn:fail:filesystem
-                    exn:fail:filesystem:exists
-                    exn:fail:filesystem:version
-                    exn:fail:network
-                    exn:fail:out-of-memory
-                    exn:fail:unsupported
-                    exn:fail:user
-                    exn:break
-                    arity-at-least
-                    date
-                    srcloc)
-              -Void)
-        [tc-e (raise (exn:fail:contract "1" (current-continuation-marks))) (t:Un)]
-        [tc-err (exn:fail:contract)
-          #:ret (ret (resolve (-struct-name #'exn:fail:contract)))]
-        [tc-e (#%variable-reference) -Variable-Reference]
-        [tc-e (#%variable-reference x) -Variable-Reference]
-        [tc-e (#%variable-reference +) -Variable-Reference]
-        [tc-e (apply (λ: ([x : String] [y : String])
-                       (string-append x y)) (list "foo" "bar")) -String]
-        [tc-e (apply (plambda: (a) ([x : a] [y : a]) x) (list "foo" "bar")) -String]
-        [tc-e (ann
-               (case-lambda [(x) (add1 x)]
-                            [(x y) (add1 x)])
-               (case-> (Integer -> Integer)
-                       (Integer Integer -> Integer)))
-              #:ret (ret (cl->* (t:-> -Integer -Integer)
-                                (t:-> -Integer -Integer -Integer))
-                         -true-filter)]
-        [tc-e (let ([my-pred (λ () #f)])
-                (for/and: : Any ([i (in-range 4)])
-                          (my-pred)))
-              #:ret (ret Univ -top-filter -empty-obj)]
-        [tc-e
-         (let ()
-           (define: long : (List 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 Integer)
-             (list 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1))
-
-           (define-syntax-rule (go acc ...)
-             (begin (ann (acc long) One) ...))
-
-           (go first second third fourth fifth sixth seventh eighth ninth tenth))
-         (-val 1)]
-
-        [tc-e (vector-append #(1) #(2))
-              (-vec -Integer)]
-        [tc-e/t (ann #() (Vectorof Integer))
-                (-vec -Integer)]
-
-        [tc-e (let: ([x : Float 0.0])
-                (= 0 x))
-              -Boolean]
-        [tc-e (let: ([x : Inexact-Real 0.0])
-                (= 0 x))
-              -Boolean]
-        [tc-e (let: ([x : Real 0.0])
-                (= 0 x))
-              -Boolean]
-
-        [tc-e/t (ann (lambda: ([x : Boolean])
-                       (if x x #t))
-                     (Boolean -> #t))
-                (t:-> -Boolean (-val #t))]
-
-        [tc-e (sequence? 'foo)
-              -Boolean]
-        [tc-err (stop-before (inst empty-sequence Symbol) zero?)]
-        [tc-e (stop-before (inst empty-sequence Integer) zero?)
-              (-seq -Int)]
-        [tc-e (stop-after (inst empty-sequence Integer) zero?)
-              (-seq -Int)]
-        [tc-e (sequence->list (inst empty-sequence Symbol))
-              (-lst -Symbol)]
-        [tc-e (sequence-length (inst empty-sequence Symbol))
-              -Nat]
-        [tc-e (sequence-ref (inst empty-sequence Symbol) 0)
-              -Symbol]
-        [tc-e (sequence-tail (inst empty-sequence Symbol) 0)
-              (-seq -Symbol)]
-        [tc-e (sequence-append empty-sequence (inst empty-sequence Symbol))
-              (-seq -Symbol)]
-        [tc-e (sequence-append (inst empty-sequence Symbol) (inst empty-sequence Integer))
-              (-seq (t:Un -Symbol -Int))]
-        [tc-e (sequence-map add1 (inst empty-sequence Integer))
-              (-seq -Int)]
-        [tc-err (sequence-andmap zero? (inst empty-sequence Symbol))]
-        [tc-e (sequence-andmap zero? (inst empty-sequence Integer))
-              -Boolean]
-        [tc-e (sequence-andmap add1 (inst empty-sequence Integer))
-              (t:Un -Int (-val #t))]
-        [tc-e (sequence-ormap zero? (inst empty-sequence Integer))
-              -Boolean]
-        [tc-e (sequence-ormap add1 (inst empty-sequence Integer))
-              (t:Un -Int (-val #f))]
-        [tc-e (sequence-fold (lambda: ([y : (Listof Symbol)] [x : Symbol]) (cons x y))
-                             null empty-sequence)
-              (-lst -Symbol)]
-        [tc-e (sequence-count zero? (inst empty-sequence Integer))
-              -Nat]
-        [tc-e (sequence-filter zero? (inst empty-sequence Integer))
-              (-seq (-val 0))]
-        [tc-e (sequence-add-between (inst empty-sequence Integer) 'foo)
-              (-seq (t:Un -Int (-val 'foo)))]
-        [tc-e (let ()
-                (define: x : Any (vector 1 2 3))
-                (if (vector? x) (vector-ref x 0) #f))
-              Univ]
-        [tc-e ((inst vector Index) 0)
-              (-vec -Index)]
-        [tc-err ((inst list Void) 1 2 3)
-          #:ret (ret (-lst -Void))]
-        [tc-e ((inst list Any) 1 2 3)
-              (-lst Univ)]
-
-        [tc-e (let ()
-                (define f
-                  (lambda: ((x : Boolean) (y : String))
-                    (if x y "false")))
-                (apply f (list #f "2")))
-              -String]
-        [tc-err (let ()
-                  (: f (All (i ...) Any -> (values Any ... i)))
-                  (define (f x) (values 1 2)))]
-        [tc-err (let ()
-                  (: g (All (i ...) Any -> (values Any ... i)))
-                  (define (g x) 2))]
-        [tc-err
-          (let ((s (ann (set 2) Any)))
-            (if (set? s) (ann s (Setof String)) ((inst set String))))
-          #:ret (ret (-set -String))]
-
-        [tc-e (split-at (list 0 2 3 4 5 6) 3)
-              (list (-lst -Byte) (-lst -Byte))]
-        [tc-e (vector-split-at (vector 2 3 4 5 6) 3)
-              (list (-vec -Integer) (-vec -Integer))]
-
-        [tc-e/t (ann ((letrec ((x (lambda args 3))) x) 1 2) Byte) -Byte]
-        [tc-e (vector-ref (ann (vector 'a 'b) (Vector Symbol Symbol)) 0)
-              -Symbol]
-        [tc-err (vector-ref (ann (vector 'a 'b) (Vector Symbol Symbol)) 4)]
-        [tc-e (vector-ref (ann (vector 'a 'b) (Vector Symbol Symbol)) (+ -1 2))
-              -Symbol]
-        [tc-e (vector-set! (ann (vector 'a 'b) (Vector Symbol Symbol)) 0 'c)
-              -Void]
-        [tc-err (vector-set! (ann (vector 'a 'b) (Vector Symbol Symbol)) -4 'c)]
-        [tc-e (vector-set! (ann (vector 'a 'b) (Vector Symbol Symbol)) (+ -1 2) 'c)
-              -Void]
-        [tc-err
-          (ann
-            ((letrec ((x (lambda (acc v) (if v (list v) acc)))) x) null (list 'bad 'prog))
-            (Listof Symbol))
-          #:ret (ret (-lst -Symbol) -top-filter -empty-obj)]
-        [tc-e (filter values empty)
-              (-lst -Bottom)]
-        [tc-e (lambda lst (map (plambda: (b) ([x : b]) x) lst))
-              (-polydots (a) (->... (list) (a a) (make-ListDots a 'a)))
-              #:expected (ret (-polydots (a) (->... (list) (a a) (make-ListDots a 'a))))]
-
-        [tc-e/t (ann (lambda (x) #t) (All (a) Any))
-                (-poly (a) Univ)]
-        [tc-e
-           ((inst filter Any Symbol) symbol? null)
-           (-lst -Symbol)]
-        [tc-e/t (ann (plambda: (A -Boolean ...) ((a : A) b : B ... B)
-                       (apply (inst values A B ... B) a b)) 
-                     (All (A B ...) (A B ... -> (values A B ... B))))
-              (-polydots (a b) ((list a) (b b) . ->... . (make-ValuesDots (list (-result a)) b 'b)))]
-        [tc-e/t (ann (ann 'x Symbol) Symbol) -Symbol]
-
-        [tc-err (lambda (x) x)
-          #:ret (ret (-poly (a) (cl->* (t:-> a a) (t:-> a a a))))
-          #:expected (ret (-poly (a) (cl->* (t:-> a a) (t:-> a a a))))]
-        [tc-err (plambda: (A) ((x : A)) x)
-          #:ret (ret (list -Symbol -Symbol))
-          #:expected (ret (list -Symbol -Symbol))]
-
-        [tc-e/t
-          (case-lambda
-            [w 'result]
-            [(x) (add1 "hello")])
-          (->* (list) Univ (-val 'result) : -true-filter)]
-
-        [tc-e
-           (opt-lambda: ((x : Symbol 'a)) x)
-           #:ret (ret (t:-> -Symbol -Symbol) -true-filter)
-           #:expected (ret (t:-> -Symbol -Symbol) -true-filter)]
-
-        [tc-e/t (inst (ann (lambda (a) a) (All (a) (a -> a))) Symbol)
-                (t:-> -Symbol -Symbol)]
-
-        ;; This test makes sure that a user written filter
-        ;; can reference an identifier object in addition to
-        ;; an integer object.
-        [tc-e/t
-         (λ (x)
-           (define f
-             (ann (λ (y) (exact-integer? x))
-                  ;; note the filters
-                  (Any -> Boolean : #:+ (Integer @ x) #:- (! Integer @ x))))
-           (if (f 'dummy) (add1 x) 2))
-         (t:-> Univ -Integer : (-FS -top (-filter -Integer 0)))]
-
-        ;; This test ensures that curried predicates have
-        ;; the correct filters so that they can be used for
-        ;; occurrence typing.
-        [tc-e
-         (let ()
-           (define f (λ (x) (λ (y) (number? x))))
-           (: b (U Number String))
-           (define b 5)
-           (define g (f b))
-           ;; this doesn't type-check unless OT is working
-           (if (g "foo") (add1 b) 3)
-           (void))
-         ;; type doesn't really matter, just make sure it typechecks
-         -Void]
-
-        ;; Tests the absence of a regression with curried functions
-        ;; (should not trigger an error with free-identifier=?)
-        [tc-e (lambda (x) (lambda (y) y))
-              #:ret
-              (ret (t:-> Univ (t:-> Univ Univ : (-FS (-not-filter (-val #f) (list 0 0))
-                                                     (-filter (-val #f) (list 0 0)))
-                                              : (make-Path null (list 0 0)))
-                              : -true-filter)
-                   -true-filter)]
-
-       ;; The following ensures that the correct filter can be
-       ;; written by the user
-       [tc-e
-        (let ()
-          (: f (Any -> (Any -> Boolean : #:+ (Symbol @ 1 0)
-                            #:- (! Symbol @ 1 0))
-                    : #:+ Top #:- Bot))
-          (define f (λ (x) (λ (y) (symbol? x))))
-          (: b (U Symbol String))
-          (define b 'sym)
-          (define g (f b))
-          (if (g "foo") (symbol->string b) "str")
-          (void))
-        ;; type doesn't really matter, just make sure it typechecks
-        -Void]
-
-       ;; Unit test for PR 13298. Should raise an unbound id error
-       ;; instead of just allowing `x` to be undefined
-       [tc-err (let () (: x Number) 3)]
-
-       ;; Sets as sequences
-       [tc-e (in-set (set 1 2 3)) (-seq -PosByte)]
-       [tc-e
-        (let ()
-          (: lst (Listof Integer))
-          (define lst
-            (for/list: : (Listof Integer) ([i : Integer (set 1 2 3)]) i))
-          (void))
-        -Void]
-       [tc-e
-        (let ()
-          (for: ([k : Symbol (in-set (set 'x 'y 'z))]) (displayln k))
-          (void))
-        -Void]
-
-       ;; PR 14139
-       [tc-e
-        (let ()
-          (: f : (U (Setof Integer) Integer) → (Setof Integer))
-          (define (f s) (if (set? s) s (set)))
-          (void))
-        -Void]
-
-       ;; negate
-       [tc-e
-        (let ()
-          (: x (U Symbol Void))
-          (define x 'foo)
-          (if ((negate void?) x) (symbol->string x) "foo"))
-        -String]
-       [tc-e
-        (let ()
-          (: pos? (Real -> Boolean : #:+ (Positive-Real @ 0) #:- (Nonpositive-Real @ 0)))
-          (define pos? (lambda: ([x : Real]) (positive? x)))
-          (: x Real)
-          (define x 3)
-          (if ((negate pos?) x) x -5))
-        #:ret (ret -NonPosReal -true-filter)]
-
-       [tc-err
-         (hash-ref! (ann (make-hash) (HashTable #f (-> #t))) #f (lambda () #t))]
-       [tc-e
-         (hash-ref (ann (make-hash) (HashTable #f #t)) #f #f)
-         -Boolean]
-
-       ;; regexp-replaces
-       [tc-e
-        (regexp-replaces "zero-or-more?" '([#rx"-" "_"] [#rx"(.*)\\?$" "is_\\1"]))
-        (t:Un -String -Bytes)]
-       [tc-e
-        (regexp-replaces "zero-or-more?" '(["e" "o"] ["o" "oo"]))
-        (t:Un -String -Bytes)]
-
-       ;; racket/string
-       [tc-e
-        (string-append* "a" '("c" "d"))
-        -String]
-       [tc-e
-        (string-append* (cdr (append* (map (λ: ([x : String]) (list ", " x))
-                                           '("Alpha" "Beta" "Gamma")))))
-        -String]
-       [tc-e
-        (string-join '("x" "y" "z") ", "
-                     #:before-first "Todo: "
-                     #:before-last " and "
-                     #:after-last ".")
-        -String]
-       [tc-e
-        (string-normalize-spaces "  foo bar  baz \r\n\t")
-        -String]
-       [tc-e
-        (string-replace "foo bar baz" "bar" "blah")
-        -String]
-       [tc-e
-        (string-split "  " #:trim? #f)
-        (-lst -String)]
-       [tc-e
-        (string-trim "  foo bar  baz \r\n\t" " " #:repeat? #t)
-        -String]
-
-       ;; remove and friends
-       [tc-e (remq #f '(1 2 3 4)) (-lst -PosByte)]
-       [tc-e (remv #f '(1 2 3 4)) (-lst -PosByte)]
-       [tc-e (remove #f '(1 2 3 4)) (-lst -PosByte)]
-       [tc-e (remove* '(1 2) '(a b c d)) (-lst (one-of/c 'a 'b 'c 'd))]
-       [tc-e (remq* '(1 2) '(a b c d)) (-lst (one-of/c 'a 'b 'c 'd))]
-       [tc-e (remv* '(1 2) '(a b c d)) (-lst (one-of/c 'a 'b 'c 'd))]
-
-       ;; functions from racket/list
-       [tc-e (takef '(a b "x" "y") symbol?) (-lst -Symbol)]
-       [tc-e (takef-right '(a b "x" "y") string?) (-lst -String)]
-       [tc-e (dropf '("a" b "x" "y") string?)
-             (-lst (t:Un -String (-val 'b)))]
-       [tc-e (dropf-right '("a" b "x" "y") string?)
-             (-lst (t:Un -String (-val 'b)))]
-       [tc-e (splitf-at '("a" b "x" "y") string?)
-             #:ret (ret (list (-lst -String)
-                              (-lst (t:Un -String (-val 'b)))))]
-       [tc-e (splitf-at-right '("a" b "x" "y") string?)
-             #:ret (ret (list (-lst (t:Un -String (-val 'b)))
-                              (-lst -String)))]
-       [tc-e (permutations '(a b c d)) (-lst (-lst (one-of/c 'a 'b 'c 'd)))]
-       [tc-e (in-permutations '(a b c d)) (-seq (-lst (one-of/c 'a 'b 'c 'd)))]
-
-       ;; test functions which do lookup with the "wrong type", where the
-       ;; result type shouldn't be widened to include that type
-       [tc-e (memq 3 '(a b c)) (t:Un (-val #f) (-lst (one-of/c 'a 'b 'c)))]
-       [tc-e (memv 3 '(a b c)) (t:Un (-val #f) (-lst (one-of/c 'a 'b 'c)))]
-       [tc-e (member 3 '(a b c)) (t:Un (-val #f) (-lst (one-of/c 'a 'b 'c)))]
-       [tc-e (member 3 '(a b c) equal?) (t:Un (-val #f) (-lst (one-of/c 'a 'b 'c)))]
-       [tc-e (assq 3 '((a . 5) (b . 7))) (t:Un (-val #f) (-pair (one-of/c 'a 'b) -PosByte))]
-       [tc-e (assv 3 '((a . 5) (b . 7))) (t:Un (-val #f) (-pair (one-of/c 'a 'b) -PosByte))]
-       [tc-e (assoc 3 '((a . 5) (b . 7))) (t:Un (-val #f) (-pair (one-of/c 'a 'b) -PosByte))]
-       [tc-e (set-remove (set 1 2 3) 'a) (-set -PosByte)]
-       ;; don't return HashTableTop
-       [tc-e (hash-remove #hash((a . 5) (b . 7)) 3) (-HT -Symbol -Integer)]
-       [tc-e (hash-remove #hash((a . 5) (b . 7)) 3) (-HT -Symbol -Integer)]
-       ;; these should actually work
-       [tc-e (vector-memq 3 #(a b c)) (t:Un (-val #f) -Index)]
-       [tc-e (vector-memv 3 #(a b c)) (t:Un (-val #f) -Index)]
-       [tc-e (vector-member 3 #(a b c)) (t:Un (-val #f) -Index)]
-
-       ;; tests for struct type types
-       [tc-e (let-values ([(_1 _2 _3 _4 _5 _6 parent _7)
-                           (struct-type-info
-                            (let-values ([(type _1 _2 _3 _4)
-                                          (make-struct-type 'foo #f 3 0)])
-                              type))])
-               parent)
-             (-opt (make-StructTypeTop))]
-       [tc-e (let-values ([(name _1 _2 getter setter _3 _4 _5)
-                           (struct-type-info struct:arity-at-least)])
-               (getter (arity-at-least 3) 0))
-             Univ]
-       [tc-e/t (assert (let-values ([(type _) (struct-info (arity-at-least 3))])
-                       type))
-               (make-StructTypeTop)]
-       [tc-err (let-values ([(name _1 _2 getter setter _3 _4 _5)
-                             (struct-type-info struct:arity-at-least)])
-                 (getter 'bad 0))
-         #:ret (ret Univ)]
-       [tc-err (struct-type-make-constructor 'bad)
-         #:ret (ret top-func)]
-       [tc-err (struct-type-make-predicate 'bad)]
-
-       [tc-e
-         (call-with-values (lambda () (eval #'(+ 1 2))) (inst list Any))
-         (-lst Univ)]
-
-       ;; futures & places primitives
-       [tc-e (future (λ () "foo")) (-future -String)]
-       [tc-e (would-be-future (λ () "foo")) (-future -String)]
-       [tc-e (touch (future (λ () "foo"))) -String]
-       [tc-e (current-future) (-opt (-future Univ))]
-       [tc-e (add1 (processor-count)) -PosInt]
-       [tc-e (assert (current-future) future?)
-             #:ret (ret (-future Univ) -true-filter)]
-       [tc-e (futures-enabled?) -Boolean]
-       [tc-e (place-enabled?) -Boolean]
-       [tc-e (dynamic-place "a.rkt" 'a #:at #f) -Place]
-       [tc-e (dynamic-place (string->path "a.rkt") 'a #:at #f) -Place]
-       [tc-e/t (let-values
-                 ([(p _1 _2 _3)
-                   (dynamic-place* "a.rkt" 'a #:in (open-input-string "hi"))])
-                 p)
-               -Place]
-       [tc-e (let ([p (dynamic-place "a.rkt" 'a)])
-               (place-break p)
-               (place-break p 'terminate)
-               (place-kill p)
-               (list (place-wait p)
-                     (place-dead-evt p)))
-             (-lst* -Int (-mu x (make-Evt x)))]
-       [tc-e (let ()
-               (define-values (c1 c2) (place-channel))
-               (place-channel-get c2)
-               (place-channel-get c2)
-               (place-channel-put/get c2 "b")
-               (place-channel-put c1 "a"))
-             -Void]
-       [tc-e (place-message-allowed? 'msg) -Boolean]
-
-       ;; fxvectors & flvectors
-       [tc-e (let ()
-               (define fx1 (fxvector 0 500 34))
-               (define fx2 (make-fxvector 20 3))
-               (fx+ (fxvector-ref fx1 0) 2)
-               (fxvector-set! fx2 1 5)
-               (fxvector-length fx1)
-               (fxvector-copy fx2 0 5))
-             -FxVector]
-       [tc-e (let ()
-               (define s1 (in-flvector (flvector 1.0 2.0 3.0)))
-               (define f1 (sequence-ref s1 0))
-               (define s2 (in-fxvector (fxvector 1 2 3)))
-               (define f2 (sequence-ref s2 2))
-               (define s3 (in-extflvector (extflvector 1.0t0 2.0t0 3.0t0)))
-               (define f3 (sequence-ref s3 1))
-               (list f1 f2 f3))
-             (-lst* -Flonum -Fixnum -ExtFlonum)]
-
-       ;; for/hash, for*/hash - PR 14306
-       [tc-e (for/hash: : (HashTable Symbol String)
-               ([x (in-list '(x y z))]
-                [y (in-list '("a" "b" "c"))]
-                #:when (eq? x 'x))
-               (values x y))
-             #:ret (ret (-HT -Symbol -String)
-                        (-FS -top -top)
-                        -empty-obj)]
-       [tc-e (for*/hash: : (HashTable Symbol String)
-               ([k (in-list '(x y z))]
-                [v (in-list '("a" "b"))]
-                #:when (eq? k 'x))
-               (values k v))
-             #:ret (ret (-HT -Symbol -String)
-                        (-FS -top -top)
-                        -empty-obj)]
-
-       ;; PR 13937
-       [tc-e (let ()
-               (: foo ((HashTable String Symbol) -> (HashTable Symbol String)))
-               (define (foo map)
-                 (for/hash : (HashTable Symbol String)
-                             ([(str sym) map])
-                   (values sym str)))
-               (foo #hash(("foo" . foo))))
-             (-HT -Symbol -String)]
-
-       ;; for/hash doesn't always need a return annotation inside
-       [tc-e/t (let ()
-                 (tr:define h : (HashTable Any Any)
-                   (for/hash ([(k v) (in-hash #hash(("a" . a)))])
-                     (values v k)))
-                 h)
-               (-HT Univ Univ)]
-
-       ;; call-with-input-string and friends - PR 14050
-       [tc-e (call-with-input-string "abcd" (lambda: ([input : Input-Port]) (values 'a 'b)))
-             #:ret (ret (list (-val 'a) (-val 'b)))]
-       [tc-e (call-with-input-bytes #"abcd" (lambda: ([input : Input-Port]) (values 'a 'b)))
-             #:ret (ret (list (-val 'a) (-val 'b)))]
-
-       [tc-e (lambda: ([x : (U (Parameter Symbol) Symbol)])
-               (if (parameter? x)
-                   (x)
-                   x))
-             #:ret (ret (t:-> (t:Un (-Param -Symbol -Symbol) -Symbol) -Symbol))
-             #:expected (ret (t:-> (t:Un (-Param -Symbol -Symbol) -Symbol) -Symbol))]
-
-       ;; time-apply and similar functions (test improved inference)
-       [tc-e (let ()
-               (: f (All (b a ...) (-> (List a ... a) b b)))
-               (define (f lst x) x)
-               (f '(a b) "foo"))
-             -String]
-       [tc-e (time-apply (lambda: ([x : Symbol] [y : Symbol]) "foo") '(a b))
-             #:ret (ret (list (-lst* -String) -Nat -Nat -Nat))]
-
-       ;; test kw function without type annotation
-       [tc-e (let () (tr:define (f x #:y y) y) (f 'a #:y 'b)) Univ]
-       [tc-e (let () (tr:define (f x [a "a"] #:y y) y) (f 'a #:y 'b)) Univ]
-       [tc-e (let () (tr:define (f x #:y y . args) y) (f 'a 'b #:y 'c)) Univ]
-       [tc-e (let () (tr:define (f x [a "a"] #:y y . args) y) (f 'a 'b #:y 'c)) Univ]
-       [tc-e (let () (tr:define (f x #:y y #:z z) y) (f 'a #:y 'c #:z 'd)) Univ]
-       [tc-e (let () (tr:define (f x #:y [y "y"] #:z z) y)
-                     (f 'a #:y 'y #:z 'd) (f 'a #:z 'd)) Univ]
-       [tc-e (let () (tr:define (f x #:y [y "y"] #:z [z "z"]) y)
-                     (f 'a) (f 'a #:z 'd) (f 'a #:y 'y #:z 'd)) Univ]
-       [tc-e (let () (tr:define (f x #:y y #:z z) y) (f 'a #:y 'c #:z 'd)) Univ]
-       [tc-e (let () (tr:define (f x [a "a"] #:y y #:z z) y) (f 'a #:y 'c #:z 'd)) Univ]
-       [tc-e (let () (tr:define (f x #:y [y 'y]) y) (f "a" #:y "b")) Univ]
-       [tc-e (let () (tr:define (f x [a "a"] #:y [y 'y]) y) (f "a" #:y "b")) Univ]
-       [tc-e (let () (tr:define (f x #:y [y 'y] . args) y) (f "a" "b" #:y "b")) Univ]
-       [tc-e (let () (tr:define (f x [a "a"] #:y [y 'y] . args) y) (f "a" "b" #:y "b")) Univ]
-       ;; FIXME: these tests work in the REPL correctly, but not in the test harness
-       ;;        probably due to the reader type annotations
-       #|
-       [tc-e (let () (tr:define (f #{x : Symbol} #:y y) x) (f 'a #:y 'b)) -Symbol]
-       [tc-err (let () (tr:define (f #{x : Symbol} #:y y) y) (f "a" #:y 'b))
-               #:msg #rx"expected: Symbol.*given: String"]
-       |#
-       [tc-e (tr:lambda (x #:y y) y) (->key Univ #:y Univ #t Univ)]
-       [tc-e ((tr:lambda (x #:y y) y) 'a #:y 'b) Univ]
-       [tc-e ((tr:lambda (x #:y y . args) y) 'a #:y 'b) Univ]
-       [tc-e ((tr:lambda (x #:y [y 'y] . args) y) 'a #:y 'b) Univ]
-       [tc-err (let () (tr:define (f x #:y y) (string-append x "foo")) (void))
-         #:ret (ret -Void)
-         #:msg #rx"expected: String.*given: Any"]
-       [tc-err (let () (tr:define (f x #:y y) y) (f "a"))
-         #:ret (ret Univ)
-         #:msg #rx"required keyword was not supplied"]
-
-       ;; test lambdas with mixed type expressions, typed keywords, typed
-       ;; optional arguments
-       [tc-e (tr:lambda (x [y : String]) (string-append y "b"))
-             #:ret (ret (t:-> Univ -String -String) -true-filter)]
-       [tc-e (tr:lambda (x [y : String] . z) (string-append y "b"))
-             #:ret (ret (->* (list Univ -String) Univ -String) -true-filter)]
-       [tc-e (tr:lambda (x [y : String] . [z : String *]) (string-append y "b"))
-             #:ret (ret (->* (list Univ -String) -String -String) -true-filter)]
-       [tc-e (tr:lambda (x [y : String]) : String (string-append y "b"))
-             #:ret (ret (t:-> Univ -String -String) -true-filter)]
-       [tc-e (tr:lambda (x z [y : String]) (string-append y "b"))
-             #:ret (ret (t:-> Univ Univ -String -String) -true-filter)]
-       [tc-e (tr:lambda (x z [y : String] . w) (string-append y "b"))
-             #:ret (ret (->* (list Univ Univ -String) Univ -String) -true-filter)]
-       [tc-e (tr:lambda (x z [y : String] . [w : String *]) (string-append y "b"))
-             #:ret (ret (->* (list Univ Univ -String) -String -String) -true-filter)]
-       [tc-e (tr:lambda (x z [y : String]) : String (string-append y "b"))
-             #:ret (ret (t:-> Univ Univ -String -String) -true-filter)]
-       [tc-err (tr:lambda (x [y : String]) : Symbol (string-append y "b"))
-         #:ret (ret (t:-> Univ -String -Symbol) -true-filter)
-         #:msg "expected: Symbol.*given: String"]
-       [tc-err (tr:lambda (x [y : String "a"] z) (string-append y "b"))
-               #:msg "expected optional lambda argument"]
-       [tc-e (tr:lambda (x [y : String "a"]) (string-append y "b"))
-             (->opt Univ [-String] -String)]
-       [tc-e (tr:lambda (x [y : String "a"] . z) (string-append y "b"))
-             (->optkey Univ [-String] #:rest Univ -String)]
-       [tc-e (tr:lambda (x [y : String "a"] . [z : String *]) (string-append y "b"))
-             (->optkey Univ [-String] #:rest -String -String)]
-       [tc-e (tr:lambda (x y [z : String "a"]) (string-append z "b"))
-             (->opt Univ Univ [-String] -String)]
-       [tc-e (tr:lambda (w x [y : String "y"] [z : String "z"]) (string-append y z))
-             (->opt Univ Univ [-String -String] -String)]
-       [tc-e (tr:lambda (w [x : String] [y : String "y"] [z : String "z"])
-               (string-append x z))
-             (->opt Univ -String [-String -String] -String)]
-       [tc-e (tr:lambda (x #:y [y : String]) (string-append y "b"))
-             (->key Univ #:y -String #t -String)]
-       [tc-e (tr:lambda (x #:y [y : String] . z) (string-append y "b"))
-             (->optkey Univ [] #:rest Univ #:y -String #t -String)]
-       [tc-e (tr:lambda (x #:y [y : String] . [z : String *]) (string-append y "b"))
-             (->optkey Univ [] #:rest -String #:y -String #t -String)]
-       [tc-e (tr:lambda (x #:y [y : String]) : String (string-append y "b"))
-             (->key Univ #:y -String #t -String)]
-       [tc-e (tr:lambda (x #:y [y : String "a"]) (string-append y "b"))
-             (->key Univ #:y -String #f -String)]
-       [tc-e (tr:lambda (x #:y [y : String "a"]) : String (string-append y "b"))
-             (->key Univ #:y -String #f -String)]
-       [tc-e (tr:lambda (x #:y [y : String] [z "z"]) (string-append y "b"))
-             (->optkey Univ [Univ] #:y -String #t -String)]
-       [tc-e (tr:lambda (x #:y [y : String "a"] [z "z"]) (string-append y "b"))
-             (->optkey Univ [Univ] #:y -String #f -String)]
-       [tc-e (tr:lambda (x [z "z"] #:y [y : String]) (string-append y "b"))
-             (->optkey Univ [Univ] #:y -String #t -String)]
-       [tc-e (tr:lambda (x [z "z"] #:y [y : String "a"]) (string-append y "b"))
-             (->optkey Univ [Univ] #:y -String #f -String)]
-       [tc-e (tr:lambda (x [z "z"] #:y [y : String "a"]) : String (string-append y "b"))
-             (->optkey Univ [Univ] #:y -String #f -String)]
-       [tc-e (tr:lambda (x #:y [y : String] [z : String "z"]) (string-append y z))
-             (->optkey Univ [-String] #:y -String #t -String)]
-       [tc-e (tr:lambda (x #:y [y : String] [z : String "z"] . w) (string-append y z))
-             (->optkey Univ [-String] #:rest Univ #:y -String #t -String)]
-       [tc-e (tr:lambda (x #:y [y : String] [z : String "z"] . [w : String *]) (string-append y z))
-             (->optkey Univ [-String] #:rest -String #:y -String #t -String)]
-       [tc-e (tr:lambda (x #:y [y : String "y"] [z : String "z"]) (string-append y z))
-             (->optkey Univ [-String] #:y -String #f -String)]
-       [tc-e (tr:lambda (x [z : String "z"] #:y [y : String]) (string-append y z))
-             (->optkey Univ [-String] #:y -String #t -String)]
-       [tc-e (tr:lambda (x [z : String "z"] #:y [y : String "a"]) (string-append y z))
-             (->optkey Univ [-String] #:y -String #f -String)]
-       [tc-e (tr:lambda (x #:y [y : String] #:z [z : String]) (string-append y z))
-             (->key Univ #:y -String #t #:z -String #t -String)]
-       [tc-e (tr:lambda (x #:y [y : String] #:z [z : String "z"]) (string-append y z))
-             (->key Univ #:y -String #t #:z -String #f -String)]
-       [tc-e (tr:lambda (x #:y [y : String "y"] #:z [z : String "z"]) (string-append y z))
-             (->key Univ #:y -String #f #:z -String #f -String)]
-       ;; for these next three tests, test the application instead of the
-       ;; type of the function because the precise filters are hard to
-       ;; get right in the expected result type and polymorphic types are
-       ;; harder to test for equality.
-       [tc-e ((inst (tr:lambda #:forall (A) (x [y : A]) y) String) 'a "foo")
-             #:ret (ret -String -true-filter)]
-       [tc-e ((inst (tr:lambda #:∀ (A) (x [y : A]) y) String) 'a "foo")
-             #:ret (ret -String -true-filter)]
-       [tc-e ((inst (tr:lambda #:forall (A ...) (x . [rst : A ... A]) rst) String) 'a "foo")
-             #:ret (ret (-lst* -String) -true-filter)]
-       #| FIXME: does not work yet, TR thinks the type variable is unbound
-       [tc-e (inst (tr:lambda #:forall (A) (x [y : A] [z : String "z"]) y) String)
-             #:ret (ret (->opt Univ -String [-String] -String) -true-filter)]
-       |#
-
-       ;; test `define` with mixed type annotations
-       [tc-e (let () (tr:define y "bar")
-                     (tr:define x : String "foo")
-                     (string-append x y))
-             -String]
-       [tc-e (let () (tr:define ((f [x : String]) y) x)
-                     ;; FIXME: does not work due to a bug in
-                     ;; lambda type-checking
-                     ;(tr:define ((g x) [y : String]) y)
-                     (string-append ((f "foo") 'y) "bar"))
-             -String]
-       [tc-e (let () (tr:define #:forall (A ...) (f x . [rst : A ... A]) rst)
-                     (f 'a "b" "c"))
-             #:ret (ret (-lst* -String -String) -true-filter)]
-
-       ;; test new :-less forms that allow fewer annotations
-       [tc-e/t (let ([x "foo"]) x) -String]
-       [tc-e (let ([x : String "foo"]) (string-append x "bar"))
-             -String]
-       [tc-e (let ([x : String "foo"] [y 'y]) (string-append x "bar"))
-             -String]
-       [tc-e (let ([y 'y] [x : String "foo"]) (string-append x "bar"))
-             -String]
-       [tc-e (let ([y 'y] [x : String "foo"]) (string-append x "bar"))
-             -String]
-       [tc-e (let #:forall (A) ([x : A "foo"]) x)
-             #:ret (ret -String -true-filter)]
-       [tc-e (let #:forall (A) ([y 'y] [x : A "foo"]) x)
-             #:ret (ret -String -true-filter)]
-       [tc-e/t (let* ([x "foo"]) x) -String]
-       [tc-e (let* ([x : String "foo"]) (string-append x "bar"))
-             -String]
-       [tc-e (let* ([x : String "foo"] [y 'y]) (string-append x "bar"))
-             -String]
-       [tc-e (let* ([y 'y] [x : String "foo"]) (string-append x "bar"))
-             -String]
-       [tc-e (let* ([y 'y] [x : String "foo"]) (string-append x "bar"))
-             -String]
-       [tc-e/t (letrec ([x "foo"]) x) -String]
-       [tc-e (letrec ([x : String "foo"]) (string-append x "bar"))
-             -String]
-       [tc-e (letrec ([x : String "foo"] [y 'y]) (string-append x "bar"))
-             -String]
-       [tc-e (letrec ([y 'y] [x : String "foo"]) (string-append x "bar"))
-             -String]
-       [tc-e (letrec ([y 'y] [x : String "foo"]) (string-append x "bar"))
-             -String]
-       [tc-e/t (let-values ([(x y) (values "foo" "bar")]) x) -String]
-       [tc-e (let-values ([(x y) (values "foo" "bar")]
-                          [([z : String]) (values "baz")])
-               (string-append x y z))
-             -String]
-       [tc-e (let-values ([([x : String] [y : String]) (values "foo" "bar")])
-               (string-append x y))
-             -String]
-       [tc-e/t (letrec-values ([(x y) (values "foo" "bar")]) x)
-               -String]
-       [tc-e (letrec-values ([(x y) (values "foo" "bar")]
-                             [([z : String]) (values "baz")])
-               (string-append x y z))
-             -String]
-       [tc-e (letrec-values ([([x : String] [y : String]) (values "foo" "bar")])
-               (string-append x y))
-             -String]
-       [tc-e (let loop ([x "x"]) x)
-             #:ret (ret Univ -true-filter)]
-       [tc-e (let loop ([x : String "x"]) x)
-             #:ret (ret -String -true-filter)]
-       [tc-e (let/cc k "foo") -String]
-       [tc-e (let/ec k "foo") -String]
-       [tc-e (let/cc k : String (k "foo")) -String]
-       [tc-e (let/ec k : String (k "foo")) -String]
-       [tc-e (ann (do ([x : Integer 0 (add1 x)]) ((> x 10) x) (displayln x))
-                  Integer)
-             #:ret (ret -Integer -top-filter -empty-obj)]
-       [tc-e (do : Integer ([x : Integer 0 (add1 x)]) ((> x 10) x) (displayln x))
-             #:ret (ret -Integer -top-filter -empty-obj)]
-       [tc-e (tr:case-lambda [(x [y : String]) x])
-             #:ret (ret (t:-> Univ -String Univ
-                              : (-FS (-not-filter (-val #f) (list 0 0))
-                                     (-filter (-val #f) (list 0 0)))
-                              : (make-Path null (list 0 0)))
-                        -true-filter)]
-       [tc-e (tr:case-lambda [(x [y : String] . rst) x])
-             #:ret (ret (->* (list Univ -String) Univ Univ
-                             : (-FS (-not-filter (-val #f) (list 0 0))
-                                    (-filter (-val #f) (list 0 0)))
-                             : (make-Path null (list 0 0)))
-                        -true-filter)]
-       [tc-e (tr:case-lambda [(x [y : String] . [rst : String *]) x])
-             #:ret (ret (->* (list Univ -String) -String Univ
-                             : (-FS (-not-filter (-val #f) (list 0 0))
-                                    (-filter (-val #f) (list 0 0)))
-                             : (make-Path null (list 0 0)))
-                        -true-filter)]
-       [tc-e (tr:case-lambda #:forall (A) [([x : A]) x])
-             #:ret (ret (-poly (A)
-                          (t:-> A A
-                                : (-FS (-not-filter (-val #f) (list 0 0))
-                                       (-filter (-val #f) (list 0 0)))
-                                : (make-Path null (list 0 0))))
-                        -true-filter)]
-
-       ;; PR 13651 and related
-       [tc-e (tr:lambda #:forall (a ...) ([f : (-> String (values a ... a))])
-               (f "foo"))
-             #:ret (ret (-polydots (a)
-                          (t:-> (t:-> -String (make-ValuesDots '() a 'a))
-                                (make-ValuesDots '() a 'a)))
-                        -true-filter)]
-       [tc-e (inst (plambda: (A B ...) ((a : A) b : B ... B)
-                     ((ann (lambda () (apply (inst values A B ... B) a b))
-                           (-> (values A B ... B)))))
-                   String String Symbol)
-             #:ret (ret (t:-> -String -String -Symbol
-                              (-values (list -String -String -Symbol)))
-                        -true-filter)]
-
-       ;; make-input-port, make-output-port (examples from Reference)
-       [tc-e (let ()
-               (define /dev/null-in
-                 (make-input-port
-                  'null
-                  (lambda (s) eof)
-                  (lambda (skip s progress-evt) eof)
-                  void
-                  (lambda () never-evt)
-                  (lambda (k progress-evt done-evt)
-                    (error "no successful peeks!"))))
-               (read-char /dev/null-in))
-             (t:Un -Char (-val eof))]
-       [tc-e (let ()
-               (define infinite-ones
-                 (let ([one! (tr:lambda ([s : Bytes])
-                               (bytes-set! s 0 (char->integer #\1)) 1)])
-                   (make-input-port
-                    'ones
-                    one!
-                    (tr:lambda ([s : Bytes] skip progress-evt) (one! s))
-                    void)))
-               (read-string 5 infinite-ones))
-             (t:Un -String (-val eof))]
-       [tc-e (let ()
-               (define infinite-voids
-                 (make-input-port
-                  'voids
-                  (lambda (s) (lambda args 'void))
-                  (lambda (skip s evt) (lambda args 'void))
-                  void))
-               (read-char-or-special infinite-voids))
-             Univ]
-       [tc-e (let ()
-               (define mod3-cycle/one-thread
-                 (let* ([n 2]
-                        [mod! (tr:lambda ([s : Bytes] [delta : Integer])
-                                (bytes-set! s 0 (+ 48 (modulo (+ n delta) 3)))
-                                1)])
-                   (make-input-port
-                    'mod3-cycle/not-thread-safe
-                    (tr:lambda ([s : Bytes])
-                      (set! n (modulo (add1 n) 3))
-                      (mod! s 0))
-                    (tr:lambda ([s : Bytes] [skip : Integer] evt)
-                      (mod! s skip))
-                    void)))
-               (read-string 5 mod3-cycle/one-thread))
-             (t:Un -String (-val eof))]
-       [tc-e (let ()
-               (define /dev/null-out
-                 (make-output-port
-                  'null
-                  always-evt
-                  (tr:lambda (s [start : Integer] [end : Integer] non-block? breakable?)
-                    (- end start))
-                  void
-                  (lambda (special non-block? breakable?) #t)
-                  (tr:lambda (s [start : Integer] [end : Integer])
-                    (wrap-evt always-evt (lambda (x) (- end start))))
-                  (lambda (special) always-evt)))
-               (display "hello" /dev/null-out))
-             -Void]
-       [tc-e (let ()
-               (: accum-list (Listof Char))
-               (define accum-list null)
-               (define accumulator/not-thread-safe
-                 (make-output-port
-                  'accum/not-thread-safe
-                  always-evt
-                  (tr:lambda ([s : Bytes] [start : Integer] [end : Integer] _1 _2)
-                    (set! accum-list
-                          (append accum-list
-                                  (map integer->char
-                                       (bytes->list (subbytes s start end)))))
-                    (- end start))
-                  void))
-               (display "hello" accumulator/not-thread-safe))
-             -Void]
-
-       ;; Additional tests for recursive type aliases
-       [tc-e ;; The types here are valid, but uninhabitable.
-             (let () (define-type-alias A (Listof B))
-                     (define-type-alias B (Listof A))
-                     "dummy")
-             #:ret (ret -String -true-filter)]
-       [tc-e (let () (define-type-alias A (Listof B))
-                     (define-type-alias B (U #f (Listof A)))
-                     (: a A)
-                     (define a (list #f (list (list #f))))
-                     (void))
-             -Void]
-       [tc-err (let () (define-type-alias A (Class #:implements A)) "dummy")
-               #:msg "Recursive #:implements clause not allowed"]
-       [tc-err (let () (define-type-alias X (U X #f)) "dummy")
-               #:msg "recursive types are not allowed directly inside"]
-       [tc-err (let () (define-type-alias X (All (A #:row) X)) "dummy")
-               #:msg "recursive types are not allowed directly inside"]
-
-       ;; Check the more precise Tarjan's algorithm-based letrec-values type checking
-       [tc-e ;; An example from Eric Dobson (see gh372) that shows that precisely
-             ;; finding cycles is necessary for checking more letrecs.
-             (let ()
-               (: foo (-> String))
-               (define (foo)
-                 (: bn (Integer -> Integer))
-                 (define (bn n) (if (= n 0) 1 (bn (- n 1))))
-                 (define v (bn 0))
-                 "foo")
-               (foo))
-             -String]
-       [tc-e/t (letrec-values ([(a b) (values x y)]
-                               [(x y) (values "x" "y")])
-                 a)
-               -String]
-       [tc-e/t (letrec-values ([(a b) (values x "b")]
-                               [(x y) (values "x" "y")])
-                 a)
-               -String]
-       [tc-e/t (letrec-values ([(a b) (values "a" "b")]
-                               [(x y) (values z z)]
-                               [(z) a])
-                 z)
-               -String]
-       [tc-err (letrec-values ([(a b) (values x "b")]
-                               [(x y) (values a b)])
-                 a)
-               #:msg "type information"]
-       [tc-err (letrec-values ([(a) (values x)]
-                               [(x) (values z)]
-                               [(z) (values a)])
-                 a)
-               #:msg "type information"]
-       ;; make sure no-binding cases like the middle expression are checked
-       [tc-err (let () (define r "r") (string-append r 'foo) (define x "x") "y")
-         #:ret (ret -String -true-filter)
-         #:msg "expected: String.*given: 'foo"]
-
-       ;; Polydotted types are not checking equality correctly
-       [tc-err (ann (lambda () (let ([my-values values]) (my-values)))
-                 (All (A ...) (-> (Values Symbol ... A))))
-         #:ret (ret (-polydots (A) (t:-> (-values-dots null -Symbol 'A))) -true-filter)]
-
-       [tc-e (list 'x)
-             #:ret (ret (-Tuple (list -Symbol)))
-             #:expected (ret (-Tuple (list -Symbol)) -no-filter -no-obj)]
-       [tc-e (list 'y)
-             #:ret (ret (-lst -Symbol))
-             #:expected (ret (-lst -Symbol) -no-filter -no-obj)]
-       [tc-e (reverse (list 'x 'y))
-             #:ret (ret (-Tuple (list (-val 'y) (-val 'x))))
-             #:expected (ret (-Tuple (list (-val 'y) (-val 'x))) -no-filter -no-obj)]
-
-       [tc-err (vector 1 2)
-         #:ret (ret (make-HeterogeneousVector (list -Byte -Byte)) -false-filter -empty-obj)
-         #:expected (ret (make-HeterogeneousVector (list -Byte -Byte)) -false-filter -no-obj)]
-
-       [tc-err (values 'x)
-         #:ret (ret (list -Symbol -Symbol)
-                    (list -bot-filter -bot-filter)
-                    (list -empty-obj -empty-obj))
-         #:expected (ret (list -Symbol -Symbol) (list -no-filter -no-filter ) (list -no-obj -no-obj))]
-
-       [tc-err (values 'x 'y 'z)
-         #:ret (ret (list -Symbol -Symbol)
-                    (list -bot-filter -bot-filter)
-                    (list -empty-obj -empty-obj))
-         #:expected (ret (list -Symbol -Symbol) (list -no-filter -no-filter ) (list -no-obj -no-obj))]
-
-       [tc-err (values 'y)
-         #:ret (ret (list -Symbol) (list -bot-filter ) (list -empty-obj) Univ 'B)
-         #:expected (ret (list -Symbol) (list -no-filter ) (list -no-obj) Univ 'B)]
-
-       [tc-err (values (values 'x 'y))
-         #:ret (ret (-val 'x) -bot-filter)
-         #:expected (ret (-val 'x) -no-filter -no-obj)]
-
-       [tc-err (if (random) (values 1 2) 3)
-         #:ret (ret (-val 3) -true-filter)
-         #:expected (ret (-val 3) -no-filter -no-obj)]
-
-       [tc-err
-         (let* ([x 42]
-                [n x])
-           (set! n 43)
-           (if #t
-               (add1 "")
-               0))
-         #:ret (ret -Bottom)]
-
-       [tc-e
-         (let: ([x : Any 4])
-           (if (let: ([y x]) (number? y))
-               (add1 x)
-               4))
-         -Number]
-
-       [tc-e
-         (let ()
-           (: g (-> Boolean))
-           (define (g) (g))
-           (: x Any)
-           (define x 0)
-           (number? x))
-         -Boolean]
-
-       [tc-e
-         (let ()
-           (: g (Any -> Boolean : #:+ (Number @ 0) #:- Bot))
-           (define (g x)
-             (or (number? x)
-                 (g x)))
-           (: x Any)
-           (define x 0)
-           (g x)
-           (add1 x))
-         -Number]
-
-       [tc-e
-         (let: ([x : Any 1])
-           (unless (number? x)
-             (error 'foo))
-           (add1 x))
-         -Number]
-
-       [tc-e
-         (let: ([x : Any 1])
-           (let ()
-             (unless (number? x)
-               (error 'foo))
-             #t)
-           (add1 x))
-         -Number]
-
-       [tc-e/t
-         (let ()
-           (: f (Number -> Number))
-           (define (f x)
-             (cond
-               ((zero? x) x)
-               (else (add1 (f (sub1 x))))))
-
-           (define y (f 7))
-           4)
-         -PosByte]
-
-       [tc-err
-         (let ()
-           (: z (case-> (Symbol -> Symbol)
-                        (Number -> Number)))
-           (define z (lambda (a) a))
-           (z "y"))
-         #:ret (ret -String -bot-filter)
-         #:expected (ret -String -no-filter -no-obj)]
-
-       [tc-err
-         (let ()
-           (: z (case->
-                  (-> Number #:b Symbol Number)
-                  (-> Symbol #:b Symbol Symbol)))
-           (define z (lambda (a #:b b) a))
-           (z "y" #:b "y"))
-         #:ret (ret -String -bot-filter)
-         #:expected (ret -String -no-filter -no-obj)]
-
-       [tc-e/t
-         (lambda (x)
-           (unless (number? x)
-             (error 'foo)))
-         (t:-> Univ -Void : (-FS (-filter -Number 0) (-filter -Number 0)))]
-
-       [tc-e
-         (let ([x : (U) (error 'fail)])
-           (if (number? x) (add1 x) 0))
-         -Bottom]
-
-       [tc-err
-         (let ([f (lambda (x y) y)])
-           (f 1))
-         #:ret (ret Univ -top-filter)]
-
-       [tc-err
-         (let ([f (lambda (x y) y)])
-           (f 1 2 3))
-         #:ret (ret Univ -true-filter)]
-
-       [tc-err
-         (case-lambda
-           ((x y . z) 'x)
-           ((x . y) 'x)
-           (w (first w)))
-         #:ret
-           (ret (cl->* (->* (list -Symbol -Symbol) -Symbol -Symbol)
-                       (->* (list) -String -String)))
-         #:expected
-           (ret (cl->* (->* (list -Symbol -Symbol) -Symbol -Symbol)
-                       (->* (list) -String -String)))]
-
-       [tc-e
-         (case-lambda
-           [() 1]
-           [args 2])
-         #:ret (ret (t:-> (-val 1)) -true-filter)
-         #:expected (ret (t:-> (-val 1)) -no-filter)]
-
-       [tc-e
-         (case-lambda
-           [(x . y) 2]
-           [args 1])
-         #:ret (ret (cl->* (t:-> (-val 1)) (t:-> Univ (-val 2))) -true-filter)
-         #:expected (ret (cl->* (t:-> (-val 1)) (t:-> Univ (-val 2))) -no-filter)]
-
-       [tc-e
-         (case-lambda
-           [(x) 2]
-           [args 1])
-         #:ret (ret (cl->* (t:-> (-val 1)) (t:-> Univ (-val 2))) -true-filter)
-         #:expected (ret (cl->* (t:-> (-val 1)) (t:-> Univ (-val 2))) -no-filter)]
-
-       [tc-err
-         (case-lambda
-           [(x . y) 1]
-           [args 2])
-         #:ret (ret (cl->* (t:-> (-val 1)) (t:-> Univ (-val 1))) -true-filter)
-         #:expected (ret (cl->* (t:-> (-val 1)) (t:-> Univ (-val 1))) -no-filter)]
-
-       ;; typecheck-fail should fail
-       [tc-err (typecheck-fail #'stx "typecheck-fail")
-               #:msg #rx"typecheck-fail"]
-       [tc-err (string-append (typecheck-fail #'stx "typecheck-fail") "bar")
-               #:ret (ret -String)
-               #:msg #rx"typecheck-fail"]
-
-       [tc-e
-         (let: ([f : (All (b ...) (Any ... b -> Any)) (lambda x 'x)])
-           (lambda xs (apply f xs)))
-         #:ret (ret (->* (list) Univ Univ))
-         #:expected (ret (->* (list) Univ Univ))]
-
-       [tc-e
-         (let: ([f : (All (b ...) (Any ... b -> Any)) (lambda x 'x)])
-           (lambda xs (apply f (ann (cons 'y xs) (cons Symbol (Listof Any))))))
-         #:ret (ret (->* (list) Univ Univ))
-         #:expected (ret (->* (list) Univ Univ))]
-
-       [tc-e
-         (let: ([f : (All (b ...) (Any ... b -> Any)) (lambda x 'x)])
-           (lambda xs (apply f 'y xs)))
-         #:ret (ret (->* (list) Univ Univ))
-         #:expected (ret (->* (list) Univ Univ))]
-
-       [tc-err
-         (let: ([f : (case->) (case-lambda)])
-            (apply f empty))
-         #:ret (ret -Bottom)
-         #:msg #rx"has no cases"]
-       [tc-err
-         (let: ([f : (All (A) (case->)) (case-lambda)])
-            (apply f empty))
-         #:ret (ret -Bottom)
-         #:msg #rx"has no cases"]
-       [tc-err
-         (let: ([f : (All (A ...) (case->)) (case-lambda)])
-            (apply f empty))
-         #:ret (ret -Bottom)
-         #:msg #rx"has no cases"]
-
-       [tc-err
-         (let: ([f : (case->) (case-lambda)])
-            (apply f empty))
-         #:ret (ret -Bottom)
-         #:msg #rx"has no cases"]
-       [tc-err
-         (let: ([f : (All (A) (case->)) (case-lambda)])
-            (apply f empty))
-         #:ret (ret -Bottom)
-         #:msg #rx"has no cases"]
-       [tc-err
-         (let: ([f : (All (A ...) (case->)) (case-lambda)])
-            (apply f empty))
-         #:ret (ret -Bottom)
-         #:msg #rx"has no cases"]
-
-       [tc-e/t
-         (let: ([f : (All (a) (a a * -> Void)) (λ _ (void))])
-           (plambda: (A B ...) ([xs : (List Any A ... B)])
-             (apply f xs)))
-         (-polydots (a b) (t:-> (-pair Univ  (make-ListDots a 'b)) -Void))]
-       [tc-e/t
-         (let: ([f : (All (a) (a a * -> Void)) (λ _ (void))])
-           (plambda: (A B ...) ([xs : (List A ... B)])
-             (apply f (first xs) xs)))
-         (-polydots (a b) (t:-> (make-ListDots a 'b) -Void))]
-
-       [tc-e/t
-         (let ()
-           (: a Symbol)
-           (define a b)
-           (: b Symbol)
-           (define b 'x)
-           a)
-         -Symbol]
-
-       [tc-e
-         (let ()
-           (: x Integer)
-           (define x
-             (let ()
-               (: f (Integer -> Integer))
-               (define (f y)
-                 (g (g y)))
-               (f 4)))
-           (: g (Integer -> Integer))
-           (define (g x)
-             (* x x))
-           'x)
-         -Symbol
-         #:expected (ret -Symbol)]
-
-       [tc-e
-         (ann (for/list ([z #"foobar"]) (add1 z)) (Listof Integer))
-         (-lst -Int)]
-
-       [tc-e
-         (lambda (a . b) (apply values a b))
-
-         #:ret (ret (-polydots (A B ...) (->... (list A) (B B) (-values-dots (list A) B 'B))))
-         #:expected (ret (-polydots (A B ...) (->... (list A) (B B) (-values-dots (list A) B 'B))))
-         ]
-       [tc-e
-         (tr:lambda (x #:y [y 3]) x)
-         #:ret (ret (->key Univ #:y Univ #f Univ) -true-filter)
-         #:expected (ret (->key Univ #:y Univ #f Univ) -no-filter)]
-       [tc-err
-         (lambda xs (plambda: (b) ([x : Any]) 3))
-         #:ret (ret (-polydots (a) (->... (list) (a a) (-values-dots (list) a 'a))))
-         #:expected (ret (-polydots (a) (->... (list) (a a) (-values-dots (list) a 'a))))]
-
-
-       [tc-e
-         (tr:lambda xs (tr:lambda (x) 
-                         (apply values (map (tr:lambda (z) (tr:lambda (y) (symbol? x))) xs))))
-         #:ret
-           (ret (-polydots (a ...)
-                  (->... (list) (a a)
-                         (-values (list
-                                   (t:-> Univ
-                                         (-values-dots 
-                                          (list)
-                                          (t:-> Univ -Boolean 
-                                                : (-FS (-filter -Symbol (list 1 0)) -top)) 'a)))))))
-           #:expected
-           (ret (-polydots (a ...)
-                  (->... 
-                   (list) (a a) 
-                   (-values 
-                    (list
-                     (t:-> Univ 
-                           (-values-dots 
-                            (list) 
-                            (t:-> Univ -Boolean : (-FS (-filter -Symbol (list 1 0)) -top)) 'a)))))))]
-
-       [tc-err
-         (inst (eval '3) Any)
-         #:ret (ret -Bottom)]
-       [tc-err
-         (lambda xs (inst (apply values (plambda: (b) ([x : b]) x) xs) Symbol))
-         #:ret (ret (-polydots (a ...) (->... (list) (a a)
-                                              (-values-dots (list (t:-> -Symbol -Symbol)) a 'a))))
-         #:expected (ret (-polydots (a ...) 
-                                    (->... (list) (a a)
-                                           (-values-dots (list (t:-> -Symbol -Symbol)) a 'a))))]
-
-       [tc-err
-         (lambda xs (andmap (lambda: ([x : (Vectorof Any)]) x) xs))
-         #:ret (ret (-polydots (a ...) (->... (list) ((-vec a) a) (t:Un (-val #f) (-vec Univ)))))
-         #:expected (ret (-polydots (a ...) (->... (list) ((-vec a) a)
-                                                   (t:Un (-val #f) (-vec Univ)))))]
-       [tc-err
-         (lambda xs (andmap (lambda: ([x : #f]) x) xs))
-         #:ret (ret (-polydots (a ...) (->... (list) ((-val #f) a) (-val #f))))
-         #:expected (ret (-polydots (a ...) (->... (list) ((-val #f) a) (-val #f))))]
-
-       [tc-e
-        ((letrec ([lp (lambda (x) lp)]) lp) 'y)
-        #:ret (ret (t:-> -Symbol Univ) -true-filter)
-        #:expected (ret (t:-> -Symbol Univ) -no-filter -no-obj)]
-
-       [tc-e
-         (list (vector 1 2 3))
-        #:ret (ret (-seq (-vec Univ)))
-        #:expected (ret (-seq (-vec Univ)))]
-
-       ;; PR 14557 - apply union of functions with different return values
-       [tc-err
-        (let ()
-          (: f (U (-> Void) (-> (values Void Void))))
-          (define (f) (void))
-          (f))
-        #:msg #rx"Expected the same number of values.*1 and 2"]
-       [tc-e
-        (let ()
-          (: f (U (-> (values String Symbol)) (-> (values Void Void))))
-          (define (f) (values "foo" 'bar))
-          (f))
-        #:ret (ret (list (t:Un -String -Void) (t:Un -Symbol -Void)))]
-       [tc-e (syntax->datum #`(#,(lambda (x) x)))
-             #:ret (ret Univ)]
-       [tc-e (stx->list #'(a . b))
-             #:ret (ret (t:Un (-lst (-Syntax Univ)) (-val #f)))]
-
-       [tc-e/t
-         (lambda (x)
-           (define (g y)
-               (unless (string? y)
-                 (error 'bad-input))
-               (eval y))
-           (g x)
-           x)
-         (t:-> Univ -String
-               : (-FS (-and (-filter -String '(0 0)) (-not-filter (-val #f) '(0 0))) -bot)
-               : (make-Path null '(0 0)))]
-
-       ;; PR 14576
-       [tc-e
-         (let: ([foo : (All (b ...) ((List (b ... b -> b) ... b) -> Void)) (lambda (x) (void))])
-           (foo (list (λ: ([x : String] [y : Symbol]) x) (λ: ([x : String] [y : Symbol]) y))))
-         -Void]
-
-       ;; PR 14579
-       [tc-e
-        (let: ([foo : (All (b ...) ((List (List b ... b) ... b) -> (List (List b ... b) ... b)))
-                 (lambda (x) x)])
-          (foo (list (list "string"))))
-        (-lst* (-lst* -String))]
-
-       ;; PR 14577
-       [tc-err
-        (let: ([foo : (All (b ...) ((List (List b ... b) ... b) -> (List (List b ... b) ... b)))
-                 (lambda (x) x)])
-          (foo (list (list))))
-        #:ret (ret -Bottom)]
-
-       ;; PR 14580
-       [tc-err
-        (let: ([foo : (All (b ...) ((List (List b ... b) ... b) -> (List (List b ... b) ... b)))
-                 (lambda (x) x)])
-          (foo (list (list "string" 'symbol))))
-        #:ret (ret (-lst* (-lst* -String)))
-        #:expected (ret (-lst* (-lst* -String)))]
-
-       ;; PR 13898
-       [tc-err
-        (let ()
-          (: f ([#:foo Any] -> (Option Natural)))
-          (tr:define (f #:foo x) 0)
-          (error "dummy"))
-        #:msg #rx"missing keyword arguments.*#:foo"]
-
-       [tc-err
-        (let ()
-          (: f (-> [#:foo Any] Zero))
-          (tr:define (f #:foo [foo 'foo] #:bar bar) 0)
-          (error "dummy"))
-        #:msg #rx"too many mandatory keyword arguments.*#:foo"]
-
-       ;; PR 14583
-       [tc-e
-        (let ()
-          (: f (-> String))
-          (tr:define (f #:foo [foo 'foo]) "foo")
-          (f))
-        -String]
-       [tc-err
-        (let ()
-          (: f (-> String))
-          (tr:define (f #:foo [foo 'foo]) foo)
-          (error "dummy"))
-        #:msg #rx"expected: String.*given: 'foo"]
-
-       ;; Make sure -Bottom and multiple values play nice together.
-       [tc-e
-        (let ()
-          (define-values (a b) (error 'nyi))
-          b)
-        -Bottom]
-
-       [tc-e
-         ((if (even? 4) add1 (inst values Integer)) 4)
-         -Int]
-
-       ;; PR 14601
-       [tc-err
-        (let ()
-          (: f Procedure)
-          (define f (lambda () 'hi))
-          (f))
-        #:msg "function with unknown arity"]
-
-       ;; PR 13259
-       [tc-err
-        (let ()
-          (: y String)
-          (define y (for/fold: ((x : String null)) ((v : String null)) x))
-          y)
-        #:ret (ret -String -true-filter)
-        #:msg #rx"expected: String.*given: (Null|'\\(\\))"]
-
-       ;; PR 14493
-       [tc-err
-        (let ()
-          (define f values)
-          (: g (Any -> Boolean))
-          (define (g x) (f x))
-          (error "foo"))
-        #:msg #rx"Polymorphic function `f' could not be applied"]
-
-       ;; PR 14509
-       [tc-e
-        (let ()
-         (: f (-> Any (-> Any Boolean : #:+ (Number @ 1 0))))
-         (define f (λ (x) (λ (y) (number? x))))
-
-         (: g (-> Any (-> Boolean : #:+ (Number @ 1 0))))
-         (define g (λ (x) (λ () (number? x))))
-         (void))
-        -Void]
-
-       ;; with-handlers
-       [tc-e
-         (with-handlers ([exn:fail? (λ (exn) 4)])
-            5)
-         #:ret (ret -Nat -true-filter)
-         #:expected (ret -Nat -no-filter)]
-       [tc-e
-         (with-handlers ([exn:fail? (λ (exn) #f)])
-            5)
-         #:ret (ret Univ -top-filter)
-         #:expected (ret Univ -no-filter)]
-       [tc-e
-        (with-handlers ([void (λ: ([x : Any]) #t)]) #f)
-        -Boolean]
-       [tc-err
-        (with-handlers ([values (lambda: ([e : String]) (string-append e "bar"))])
-          (raise "foo"))
-        #:msg #rx"expected: \\(-> Any Any\\).*given: \\(-> String String\\)"]
-       [tc-err
-        (with-handlers (["foo" (lambda: ([e : String]) (string-append e "bar"))])
-          (raise "foo"))
-        #:msg #rx"expected: \\(-> Any Any\\).*given: String"]
-       [tc-err
-        (with-handlers ([string? (lambda (e) (string-append e "bar"))])
-          (raise "foo"))
-        #:ret (ret -String)
-        #:msg #rx"expected: String.*given: Any"]
-       [tc-err
-        (with-handlers ([string? (lambda: ([e : String]) (string-append e "bar"))]
-                        [symbol? (lambda (x) (symbol->string x))])
-          (raise 'foo))
-        #:ret (ret -String)
-        #:msg #rx"expected: Symbol.*given: Any"]
-       
-       [tc-err
-        (raise (λ ([x : Number]) (add1 x)))]
-       
-       [tc-err
-        (raise (exn:fail:syntax "" (current-continuation-marks)
-                                (list (datum->syntax #f add1))))]
-
-       ;; PR 14218
-       [tc-e (ann (values "foo" "bar") (Values String String))
-             #:ret (ret (list -String -String))]
-       [tc-e (let ()
-               (tr:define (foo) : (Values String String) (values "foo" "bar"))
-               (void))
-             -Void]
-
-       ;; Make sure unannotated definitions with the wrong number of values
-       ;; don't produce an internal error
-       [tc-err (let () (define x (values 1 2)) (error "dummy"))
-               #:msg #rx"Expression should produce 1 values"]
-
-       ;; PR 14758
-       [tc-e (ann (list 'change-size 30)
-                  (U (List 'change-family Symbol)
-                     (List 'change-size Byte)))
-             (t:Un (-lst* (-val 'change-family) -Symbol)
-                   (-lst* (-val 'change-size) -Byte))]
-
-       ;; PR 14747
-       [tc-e (let ()
-               (define-type-alias XExpr
-                 (U String Symbol Char
-                    (Pairof Symbol (Pairof (Listof (List Symbol String)) (Listof XExpr)))
-                    (Pairof Symbol (Listof XExpr))))
-               (: bug XExpr)
-               (define bug
-                 (let: ([elem : XExpr "some xexpr"])
-                   `(li ,elem)))
-               (void))
-             -Void]
-
-       ;; PR 13653
-       [tc-e (let ()
-               (lambda: ((a : Symbol))
-                 (ann (values a a) (Values Symbol Symbol)))
-               (void))
-             -Void]
-        )
-
-  (test-suite
-   "tc-literal tests"
-   (tc-l 5 -PosByte)
-   (tc-l -5 -NegFixnum)
-   (tc-l 0 -Zero)
-   (tc-l 0.0 -FlonumPosZero)
-   (tc-l -0.0 -FlonumNegZero)
-   (tc-l 5# -PosFlonum)
-   (tc-l 5.0 -PosFlonum)
-   (tc-l 5.1 -PosFlonum)
-   (tc-l -5# -NegFlonum)
-   (tc-l -5.0 -NegFlonum)
-   (tc-l -5.1 -NegFlonum)
-   (tc-l 0.0t0 -ExtFlonumPosZero)
-   (tc-l -0.0t0 -ExtFlonumNegZero)
-   (tc-l 5#t0 -PosExtFlonum)
-   (tc-l 5.0t0 -PosExtFlonum)
-   (tc-l 5.1t0 -PosExtFlonum)
-   (tc-l -5#t0 -NegExtFlonum)
-   (tc-l -5.0t0 -NegExtFlonum)
-   (tc-l -5.1t0 -NegExtFlonum)
-   (tc-l 1+1i -ExactNumber)
-   (tc-l 1+1.0i -FloatComplex)
-   (tc-l 1.0+1i -FloatComplex)
-   (tc-l 1.0+1.1i -FloatComplex)
-   (tc-l #t (-val #t))
-   (tc-l "foo" -String)
-   (tc-l foo (-val 'foo))
-   (tc-l #:foo (-val '#:foo))
-   (tc-l #f (-val #f))
-   (tc-l #"foo" -Bytes)
-   [tc-l () -Null]
-   [tc-l (3 . 4) (-pair -PosByte -PosByte)]
-   [tc-l #hash() (make-Hashtable Univ Univ)]
-   [tc-l #hash((1 . 2) (3 . 4)) (make-Hashtable -Integer -Integer)]
-   [tc-l #hasheq((a . q) (b . w)) (make-Hashtable -Symbol -Symbol)]
-   [tc-l #hash{[:a . :b]}
-         (let ([rec-type (-mu X (make-Hashtable (t:Un -Symbol X) (t:Un -Symbol X)))])
-           (make-Hashtable (t:Un -Symbol rec-type) (t:Un -Symbol rec-type)))
-         #:expected (-mu X (make-Hashtable (t:Un -Symbol X) (t:Un -Symbol X)))]
-   [tc-l #hash{[:a . :b]}
-         (make-Hashtable (-val ':a) (-val ':b))
-         #:expected (t:Un (-val #f) (make-Hashtable (-val ':a) (-val ':b)))]
-   [tc-l #(:a :b)
-         (-vec (t:Un (-val ':a) (-val ':b) (-mu X (-vec (t:Un (-val ':a) (-val ':b) X)))))
-         #:expected (-mu X (-vec (t:Un (-val ':a) (-val ':b) X)))]
-   [tc-l (#(:a) . :b)
-         (-pair (-vec (t:Un (-val ':a)
-                            (-mu X (-pair (-vec (t:Un (-val ':a) X)) (t:Un (-val ':b) X)))))
-                (-val ':b))
-         #:expected (-mu X (-pair (-vec (t:Un (-val ':a) X)) (t:Un (-val ':b) X)))]
-   [tc-l/err #(1 2) #:expected (make-HeterogeneousVector (list -Number -Symbol))
-                    #:msg #rx"expected: Symbol"]
-   )
-  ))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/with-tr-contracts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/with-tr-contracts.rkt
deleted file mode 100644
index 15fd59cce9..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/with-tr-contracts.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket
-
-(void (putenv "PLT_TR_CONTRACTS" "1"))
-
-(define ns (make-base-namespace))
-(current-namespace ns)
-(use-compiled-file-paths null)
-
-((dynamic-require 'tests/typed-racket/main 'go/text)
- (dynamic-require 'tests/typed-racket/main 'unit-tests))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/ann-map-funcs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/ann-map-funcs.rkt
deleted file mode 100644
index f2973cb678..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/ann-map-funcs.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang typed/racket
-
-;; This test is similar to unholy-terror.
-;; Recent changes to the numeric tower makes this generate a ridiculous amount
-;; of inference constraints.
-;; Changes to the inference engine breaks inference on this test, but unlike
-;; unholy terror, this one fails quite fast, so it's not as bad.
-;; Reverting these changes would make inference work again, given enough time
-;; and memory (on the order of hours, and gigabytes of memory).
-;; For future reference, ~600k inference constraints were generated (due to a
-;; repeated cross product) before I killed it.
-
-(: map-with-funcs (All (b a ...) ((a ... a -> b) * -> (a ... a -> (Listof b)))))
-
-(define (map-with-funcs . fs)
- (lambda as
-   (map (lambda: ([f : (a ... a -> b)])
-          (apply f as))
-        fs)))
-
-(ann (map-with-funcs + - * /) (Number Number * -> (Listof Number)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/applicative.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/applicative.rkt
deleted file mode 100644
index d474e20785..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/applicative.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang typed-scheme
-
-(: id (All (a) (a -> a)))
-(define (id x) x)
-
-(: pure (All (a) (a -> (All (Env) (Env -> a)))))
-(define (pure c)
- (plambda: (Env) ([env : Env]) c))
-
-(pure 4)
-; REPL reports type (Any -> Integer)
-; Shouldn't it be (All (Env) (Env -> Integer))?
-
-(pure id)
-; REPL reports type (Any -> (All (a) (a -> a)))
-; Shouldn't it be (All (Env) (Env -> (All (a) (a -> a))))?
-
-(: ap (All (Env a b) ((Env -> (a -> b)) (Env -> a) -> (Env -> b))))
-(define (ap f x)
- (λ (env)
-   ((f env) (x env))))
-
-(ap (pure id) (pure 4))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/apply-map-bug.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/apply-map-bug.rkt
deleted file mode 100644
index e5366668a4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/apply-map-bug.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#lang typed-scheme
-
-(: add-lists ((Listof Number) (Listof Number) * -> (Listof Number)))
-(define (add-lists lst . lsts)
- (apply map #{+ :: (Number Number * -> Number)} lst lsts))
-
-(add-lists '(1 2 3) '(4 5 6) '(7 8 9))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/cl-expected.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/cl-expected.rkt
deleted file mode 100644
index f94a0c25c3..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/cl-expected.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang typed/scheme
-
-
-(: add (case-lambda (Integer -> Integer) (Integer Integer -> Integer)))
-(define add
-  (case-lambda
-    [(x) (add x 0)]
-    [(x y) (+ x y)]))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/expectations.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/expectations.rkt
deleted file mode 100644
index 54b8059a9b..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/expectations.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang typed/racket
-
-
-(: f1 ((U 4 'four) -> Boolean : Number))
-(define (f1 x) (number? x))
-(f1 4)
-
-(: f2 (All (b ...) (b ... b -> Number)))
-(define (f2 . y)
-  (: f2-inner (4 b ... b -> Number))
-  (define (f2-inner x . z) 5)
-  (apply f2-inner 4 y))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/for-inference.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/for-inference.rkt
deleted file mode 100644
index 38ac335799..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/for-inference.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang typed/scheme
-
-;; Inference fails when #:when clauses are used, except when there's
-;; only one, and it's the last clause.
-;; for:, for*: are unaffected, since they currently expand their
-;; #:when clauses manually, unlike for/list: and co, who punt it to
-;; non-annotated versions of the macros, to avoid breaking semantics.
-;; for/fold:, for*/fold:, for/lists: and for*/lists: are not affected
-;; either. The inferencer can handle their expansion, apparently no
-;; matter how many #:when clauses we throw at them.
-;; Of course, for*/list: and co won't work, since they are equivalent
-;; to for/list: and co with #:when clauses.
-;; These are currently documented as not working.
-(for/list: : (Listof Integer)
-           ((i : Exact-Positive-Integer '(1 2 3))
-            #:when (odd? i)
-            (j : Exact-Positive-Integer '(10 20 30)))
-           (+ i j 10))
-
-(for/list: : (Listof Integer)
-           (#:when #t
-            (i : Exact-Positive-Integer '(1 2 3))
-            (j : Exact-Positive-Integer '(10 20 30)))
-           (+ i j 10))
-
-(for*/list: : (Listof (Listof Integer))
-            ((i : Exact-Positive-Integer '(1 2 3))
-             (j : Exact-Positive-Integer '(10 20 30)))
-            (list i j))
-
-;; The right type for the return value would be:
-;; (values (Listof Integer) (Listof Integer)).
-;; The problem here is with the error message. Somehow, source location
-;; information is lost and the whole module is blamed.
-(for/lists: : (Listof Integer)
-            ((x : (Listof Integer))
-             (y : (Listof Integer)))
-            ((i : Exact-Positive-Integer '(1 2 3))
-             (j : Exact-Positive-Integer '(10 20 30)))
-            (values i j))
-
-;; This is a legitimate use of multi-valued seq-exprs, but it causes
-;; the typechecker to throw an internal error.
-;; Multi-valued seq-exprs are currently turned off and documented as
-;; not working.
-(for/list: : (Listof Integer)
-           ((([i : Exact-Positive-Integer]
-              [j : Exact-Positive-Integer])
-             (list (values 1 10) (values 2 20) (values 2 30)))
-            #:when (odd? i))
-           (+ i j 10))
-
-;; Types can't be inferred for the expansion of for/first: at all.
-(for/first: : Integer
-            ((i : Exact-Positive-Integer '(1 2 3)))
-            i)
-
-;; Same for for/last:
-(for/last: : (Option Integer)
-           ((i : Exact-Positive-Integer '(1 2 3)))
-           i)
-
-;; unlike the usual cases with #:when clauses, inference does something, but does it wrong
-(for/list: : (Listof Integer)
-           (#:when #t
-            (i : Exact-Positive-Integer '(1 2 3))
-            (j : Exact-Positive-Integer '(10 20 30)))
-           (+ i j 10))
-
-;; that same bug makes for/hash:, for/hasheq: and for/hasheqv: unusable
-;; this infers Nothing for the type of the elements of the HashTable
-;; since they don't work, these functions are not currently documented
-(for/hash: : (HashTable Integer Char)
-           ((i : Exact-Positive-Integer '(1 2 3))
-            (j : Char "abc"))
-           (values i j))
-
-;; same thing for for/and:
-(for/and: : Boolean
-          ((i : Exact-Positive-Integer '(1 2 3)))
-          (< i 3))
-
-;; for/vector: would need stronger inference. same for for*/vector and
-;; both flvector variants
-(for/vector: : (Vectorof Integer)
-             ((x : Integer (in-range 10)))
-             x)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/inst+special-case.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/inst+special-case.rkt
deleted file mode 100644
index bf38d91e24..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/inst+special-case.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang typed/racket
-
-;; In tc-app, code paths for annotated operators and special case typing rules
-;; (for, e.g., `vector-ref') are mutually exclusive.
-;; The annotated operator case matches first and falls back to the regular
-;; application rules, skipping the special cases.
-;; This example, because it uses a heterogenous vector, needs the special type
-;; rule, and therefore doesn't typecheck.
-
-(ann ((inst vector-ref String) #(1.0) 0) Float)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/internal-typed-submod.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/internal-typed-submod.rkt
deleted file mode 100644
index f8362711e4..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/internal-typed-submod.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang typed/racket
- 
-(module zoo typed/racket
-  (provide tiger)
-  
-  (: tiger String)
-  (define tiger "Tony"))
- 
-(require 'zoo)           
- 
-tiger
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/opt-lambda.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/opt-lambda.rkt
deleted file mode 100644
index 9c794942b5..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/opt-lambda.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang typed/racket/base
-
-
-(opt-lambda: ((p : Symbol) (log? : Any #f) (1-p? : Any #f)) (ann p Symbol))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/pr10618.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/pr10618.rkt
deleted file mode 100644
index 57ad03d797..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/pr10618.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang scheme/load
-
-(module bar scheme
-  (define (f x) x)
-  (provide f))
-
-(module foo typed/scheme
-  (require/typed 'bar (f (Node -> Integer)))
-  (define-struct: node ({x : Integer}))
-  (define-type-alias Node node))
-
-(require 'foo)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/priority-queue.scm b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/priority-queue.scm
deleted file mode 100644
index f1fa7c8532..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/priority-queue.scm
+++ /dev/null
@@ -1,101 +0,0 @@
-#lang typed-scheme
-;;; priority-queue.scm  --  Jens Axel Søgaard
-;;; PURPOSE
-
-; This file implements priority queues on top of
-; a heap library.
-(define-type-alias number Number)
-(define-type-alias boolean Boolean)
-(define-type-alias symbol Symbol)
-(define-type-alias top Any)
-(define-type-alias list-of Listof)
-(require (prefix-in heap: "leftist-heap.ss")
-	 (except-in (lib "67.ss" "srfi") number-compare current-compare =? <?)
-	 (only-in "leftist-heap.ss" comparator))
-(require/typed number-compare (number number -> number) (lib "67.ss" "srfi"))
-(require/typed current-compare (-> (top top -> number)) (lib "67.ss" "srfi"))
-(require/typed =? ((top top -> number) top top -> boolean) (lib "67.ss" "srfi"))
-(require/typed <? ((top top -> number) top top -> boolean) (lib "67.ss" "srfi"))
-
-; a priority-queue is a heap of  (cons <priority> <element>)
-
-(define-type-alias (elem a) (cons number a))
-
-(define-typed-struct (a) priority-queue ([heap : (heap:Heap (elem a))]))
-
-(define-type-alias (pqh a) (heap:Heap (elem a)))
-
-; conveniences
-(pdefine: (a) (heap [pq : (priority-queue a)]) : (pqh a) (priority-queue-heap pq))
-(pdefine: (a) (pri [p : (elem a)]) : number (car p))
-(pdefine: (a) (elm [p : (elem a)]) : a  (cdr p))
-(pdefine: (a) (make [h : (pqh a)]) : (priority-queue a)  (make-priority-queue h))
-
-; sort after priority
-; TODO: and then element?
-(pdefine: (a) (compare [p1 : (elem a)] [p2 : (elem a)]) : number
-	  (number-compare (pri p1) (pri p2)))
-
-;;; OPERATIONS
-
-(define: (num-elems [h : (heap:Heap (cons number number))]) : (list-of (cons number number))
-  (heap:elements h))
-
-(pdefine: (a) (elements [pq : (priority-queue a)]) : (list-of a)
-          (map #{elm :: ((elem a) -> a)} (heap:elements (heap pq))))
-
-(pdefine: (a) (elements+priorities [pq : (priority-queue a)]) : (values (list-of a) (list-of number))
-	  (let: ([eps : (list-of (elem a)) (heap:elements (heap pq))])
-		(values (map #{elm :: ((elem a) -> a)} eps)
-			(map #{pri :: ((elem a) -> number)} eps))))
-
-(pdefine: (a) (empty? [pq : (priority-queue a)]) : boolean
-	  (heap:empty? (heap pq)))
-
-(define: empty : (All (a) (case-lambda (-> (priority-queue a)) (comparator -> (priority-queue a))))
-  (pcase-lambda: (a)
-		 [()    (#{empty @ a} (current-compare))]
-		 [([cmp : comparator]) (make (#{heap:empty :: (case-lambda (-> (pqh a))
-									   (comparator -> (pqh a)))} cmp))]))
-
-(pdefine: (e r) (fold [f : ((cons number e) r -> r)] [b : r] [a : (priority-queue e)]) : r
-	  (heap:fold f b (#{heap :: ((priority-queue e) -> (pqh e))} a)))
-
-
-;; "bug" found - handling of empty heaps
-(pdefine: (a) (find-min [pq : (priority-queue a)]) : a
-	  (let ([h (heap pq)])
-	    (if (heap:heap-node? h)
-		(elm (heap:find-min h))
-		(error "priority queue empty"))))
-
-(pdefine: (a) (find-min-priority [pq : (priority-queue a)]) : number
-	  (let ([h (heap pq)])
-	    (if (heap:heap-node? h)
-		(pri (heap:find-min h))
-		(error "priority queue empty"))))
-
-(pdefine: (a) (insert [x : a] [p : number] [pq : (priority-queue a)]) : (priority-queue a)
-	  (make (heap:insert (cons p x) (heap pq))))
-
-;; FIXME -- too many annotations needed on cons
-(pdefine: (a) (insert* [xs : (list-of a)] [ps : (list-of number)] [pq : (priority-queue a)]) : (priority-queue a)
-          (make (heap:insert* (map #{cons @ number a} ps xs) (heap pq))))
-
-(pdefine: (a) (delete-min [pq : (priority-queue a)]) : (priority-queue a)
-	  (let ([h (heap pq)])
-	    (if (heap:heap-node? h)
-		(make (heap:delete-min h))
-		(error "priority queue empty"))))
-
-
-(pdefine: (a) (size [pq : (priority-queue a)]) : number
-	  (heap:size (heap pq)))
-
-(pdefine: (a) (union [pq1 : (priority-queue a)] [pq2 : (priority-queue a)]) : (priority-queue a)
-	  (make (heap:union (heap pq1) (heap pq2))))
-
-
-#;(require "signatures/priority-queue-signature.scm")
-#;(provide-priority-queue)
-
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/rec-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/rec-contract.rkt
deleted file mode 100644
index 922a54bdfb..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/rec-contract.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang scheme/load
-
-(module m typed-scheme
-  (: f (Rec X (Number -> X)))
-  (define (f n) f )
-  (provide f)
-  )
-
-(module mm scheme
-  (require 'm)
-  (f 1))
-
-(require 'mm)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/typed-language-require.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/typed-language-require.rkt
deleted file mode 100644
index e56b1e2544..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/typed-language-require.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/load
-
-(module m typed/racket
-  (provide #%module-begin)
-  (: f : Integer -> Integer)
-  (define (f x) (add1 x))
-  (provide add1 #%datum #%app f))
-
-(module n 'm
-  5
-  (add1 (f 7)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/unholy-terror.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/unholy-terror.rkt
deleted file mode 100644
index 2166707a68..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/unholy-terror.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang typed-scheme
-
-;; Changes to the numeric tower cause this test to generate a ridiculous
-;; number of inference constraints. Inference takes 5+ minutes.
-
-(apply (plambda: (a ...) [ys : (a ... a -> Number) *]
-         (lambda: [zs : a ... a]
-            (map (lambda: ([y : (a ... a -> Number)])
-                   (apply y zs))
-                 ys)))
-       (list (lambda: ([x : Number] [y : Number]) (+ x y))
-             (lambda: ([x : Number] [y : Number]) (- x y))
-             (lambda: ([x : Number] [y : Number]) (* x y))
-             (lambda: ([x : Number] [y : Number]) (/ x y))))
-
-((apply (plambda: (a ...) [ys : (a ... a -> Number) *]
-          (lambda: [zs : a ... a]
-            (map (lambda: ([y : (a ... a -> Number)])
-                   (apply y zs))
-                 ys)))
-        (list (lambda: ([x : Number] [y : Number]) (+ x y))
-              (lambda: ([x : Number] [y : Number]) (- x y))
-              (lambda: ([x : Number] [y : Number]) (* x y))
-              (lambda: ([x : Number] [y : Number]) (/ x y))))
- 3 4)
-
-(apply (plambda: (a ...) [ys : (a ... a -> Number) *]
-         (lambda: [zs : a ... a]
-                  (map (lambda: ([y : (a ... a -> Number)])
-                                (apply y zs))
-                       ys)))
-       (list + - * /))
-
-((plambda: (a ...) [ys : (a ... a -> Number) *]
-   (lambda: [zs : a ... a]
-     (map (lambda: ([y : (a ... a -> Number)])
-            (apply y zs))
-          ys)))
- (lambda: ([x : Number] [y : Number]) (+ x y))
- (lambda: ([x : Number] [y : Number]) (- x y))
- (lambda: ([x : Number] [y : Number]) (* x y))
- (lambda: ([x : Number] [y : Number]) (/ x y)))
-
-(((plambda: (a ...) [ys : (a ... a -> Number) *]
-    (lambda: [zs : a ... a]
-      (map (lambda: ([y : (a ... a -> Number)])
-             (apply y zs))
-           ys)))
-  (lambda: ([x : Number] [y : Number]) (+ x y))
-  (lambda: ([x : Number] [y : Number]) (- x y))
-  (lambda: ([x : Number] [y : Number]) (* x y))
-  (lambda: ([x : Number] [y : Number]) (/ x y)))
- 3 4)
-
-((plambda: (a ...) [ys : (a ... a -> Number) *]
-   (lambda: [zs : a ... a]
-     (map (lambda: ([y : (a ... a -> Number)])
-            (apply y zs))
-          ys)))
- + - * /)
-
-(: map-with-funcs (All (b a ...) ((a ... a -> b) * -> (a ... a -> (Listof b)))))
-(define (map-with-funcs . fs)
-  (lambda as
-    (map (lambda: ([f : (a ... a -> b)])
-           (apply f as))
-         fs)))
-(map-with-funcs + - * /)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/xmodule-mutation.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/xmodule-mutation.rkt
deleted file mode 100644
index fb8dfc4f72..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/xfail/xmodule-mutation.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/load
-
-(module m typed/racket
-  (: x Any)
-  (define x "foo")
-  (: f (-> Void))
-  (define (f) (set! x 1))
-  (provide f x))
-
-(module n typed/racket
-  (require 'm)
-  (if (string? x)
-      (begin
-        (f)
-        ;; this should be a type error!
-        (string-append x "foo"))
-      0))
-
-(require 'n)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed/tests/test-docs-complete.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed/tests/test-docs-complete.rkt
deleted file mode 100644
index 5efb86b122..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-;; these are currently undocumented in `racket' as well
-(define exclude '(make-primitive-class
-                  make-custom-set
-                  make-mutable-custom-set
-                  make-weak-custom-set
-                  place-sleep))
-(check-docs (quote typed-scheme) #:skip exclude)
-(check-docs (quote typed/scheme) #:skip exclude)
-(check-docs (quote typed/scheme/base) #:skip exclude)
-(check-docs (quote typed/racket) #:skip exclude)
-(check-docs (quote typed/racket/base) #:skip exclude)
diff --git a/pkgs/typed-racket-pkgs/typed-racket/LICENSE.txt b/pkgs/typed-racket-pkgs/typed-racket/LICENSE.txt
deleted file mode 100644
index 09fb893720..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-typed-racket
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/typed-racket-pkgs/typed-racket/info.rkt b/pkgs/typed-racket-pkgs/typed-racket/info.rkt
deleted file mode 100644
index 6f050a9bc2..0000000000
--- a/pkgs/typed-racket-pkgs/typed-racket/info.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("typed-racket-lib"
-               "typed-racket-doc"))
-(define implies '("typed-racket-lib"
-                  "typed-racket-doc"))
-
-(define pkg-desc "The implementation of the Typed Racket language")
-
-(define pkg-authors '(samth stamourv))
-
-(define version "1.1")
\ No newline at end of file
diff --git a/pkgs/unstable-2d/LICENSE.txt b/pkgs/unstable-2d/LICENSE.txt
deleted file mode 100644
index d156008232..0000000000
--- a/pkgs/unstable-2d/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-2d
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-2d/info.rkt b/pkgs/unstable-2d/info.rkt
deleted file mode 100644
index 034419b5ed..0000000000
--- a/pkgs/unstable-2d/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base" "scribble-lib" "syntax-color-lib"))
-
-(define pkg-desc "Experimental 2d syntax")
-
-(define pkg-authors '(robby))
diff --git a/pkgs/unstable-2d/unstable/2d/cond.rkt b/pkgs/unstable-2d/unstable/2d/cond.rkt
deleted file mode 100644
index f0365eb01c..0000000000
--- a/pkgs/unstable-2d/unstable/2d/cond.rkt
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-
-(provide 2dcond)
-(define-syntax (2dcond stx)
-  (syntax-case stx ()
-    [(_ widths heights 
-        [(cell ...) rhs ...] ...)
-     (let ()
-       
-       (define last-col (- (length (syntax->list #'widths)) 1))
-       (define last-row (- (length (syntax->list #'heights)) 1))
-       
-       ;; coord-to-content : hash[(list num num) -o> (listof syntax)]
-       (define coord-to-content (make-hash))
-       (define let-bindings '()) 
-       
-       ;; build up the coord-to-content mapping
-       ;; side-effect: record need for let bindings to
-       ;; cover the the situation where multiple cells
-       ;; are joined together
-       (for ([cells-stx (in-list (syntax->list #'((cell ...) ...)))]
-             [rhses (in-list (syntax->list #'((rhs ...) ...)))])
-         (define cells (syntax->datum cells-stx))
-         
-         (cond
-           [(member (list 0 0) cells)
-            (unless (null? (syntax-e rhses))
-              (raise-syntax-error '2dcond 
-                                  "cell at 0,0 must be empty"
-                                  stx))]
-           [else
-            (when (null? (syntax-e rhses))
-              (raise-syntax-error '2dcond 
-                                  (format "cell at ~a,~a must not be empty"
-                                          (list-ref (car cells) 0)
-                                          (list-ref (car cells) 1))
-                                  stx))])
-         
-         (cond
-           [(member (list 0 0) cells) (void)]
-           [(and (or (member (list 0 last-row) cells)
-                     (member (list last-col 0) cells))
-                 (syntax-case rhses (else)
-                   [(else) #t]
-                   [_ #f]))
-            ;; found an 'else' (in a reasonable place)
-            ;; => treat it like a #t in that cell
-            (hash-set! coord-to-content 
-                       (car cells)
-                       (list #'#t))]
-           [(and 
-             ;; only one cell:
-             (null? (cdr cells))
-             ;; not in the left-edge (questions)
-             (not (= 0 (car (car cells)))))
-            ;; then we don't need a let binding
-            (hash-set! coord-to-content 
-                       (car cells)
-                       (syntax->list rhses))]
-           [else
-            (for ([cell (in-list cells)])
-              (define x (list-ref cell 0))
-              (define y (list-ref cell 1))
-              (with-syntax ([(id) (generate-temporaries (list (format "2dcond~a-~a" x y)))]
-                            [(rhs ...) rhses])
-                (set! let-bindings (cons #`[id (λ () rhs ...)]
-                                         let-bindings))
-                (hash-set! coord-to-content cell (list #'(id)))))]))
-       
-       (define num-of-cols (length (syntax->list #'widths)))
-       (define num-of-rows (length (syntax->list #'heights)))
-       #`(let #,let-bindings
-           #,(for/fold ([else-branch #'(2dcond-runtime-error #f)])
-               ([x-flip (in-range 1 num-of-cols)])
-               (define x (- num-of-cols x-flip))
-               #`(if (let () #,@(hash-ref coord-to-content (list x 0)))
-                     (cond
-                       #,@(for/list ([y (in-range 1 num-of-rows)])
-                            #`[(let () #,@(hash-ref coord-to-content (list 0 y)))
-                               #,@(hash-ref coord-to-content (list x y))])
-                       [else (2dcond-runtime-error #,x)])
-                     #,else-branch))))]))
-
-(define (2dcond-runtime-error dir)
-  (define str
-    (if dir
-        (format "all of the y-direction questions were false (x coordinate ~a was true)"
-                dir)
-        "all of the x-direction questions were false"))
-  (error '2dcond str))
diff --git a/pkgs/unstable-2d/unstable/2d/dir-chars.rkt b/pkgs/unstable-2d/unstable/2d/dir-chars.rkt
deleted file mode 100644
index bad808b148..0000000000
--- a/pkgs/unstable-2d/unstable/2d/dir-chars.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-(require racket/list)
-(provide adjustable-chars
-         double-barred-chars
-         up-chars
-         dn-chars
-         lt-chars
-         rt-chars)
-
-(define up-chars
-  '(#\╬ 
-    #\╩ #\╣ #\╠
-    #\╝ #\╚
-    #\║
-    #\+ #\|))
-
-(define dn-chars
-  '(#\╬ 
-    #\╦ #\╣ #\╠
-    #\╗ #\╔
-    #\║
-    #\+ #\|))
-
-(define lt-chars
-  '(#\╬ 
-    #\╩ #\╦ #\╣
-    #\╝ #\╗ 
-    #\═ 
-    #\+ #\- #\=))
-
-(define rt-chars
-  '(#\╬ 
-    #\╩ #\╦ #\╠
-    #\╔ #\╚
-    #\═
-    #\+ #\- #\=))
-
-(define adjustable-chars
-  (remove-duplicates
-   (append up-chars dn-chars lt-chars rt-chars)))
-
-(define double-barred-chars
-  (remove* '(#\+ #\- #\= #\|) 
-           adjustable-chars))
diff --git a/pkgs/unstable-2d/unstable/2d/lang/reader.rkt b/pkgs/unstable-2d/unstable/2d/lang/reader.rkt
deleted file mode 100644
index b9b9a69a09..0000000000
--- a/pkgs/unstable-2d/unstable/2d/lang/reader.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-(require syntax/module-reader
-         (only-in "../private/readtable.rkt" make-2d-readtable))
-
-(provide (rename-out [2d-read read]
-                     [2d-read-syntax read-syntax]
-                     [2d-get-info get-info]))
-
-(define (wrap-reader p)
-  (lambda args
-    (parameterize ([current-readtable (make-2d-readtable)])
-      (apply p args))))
-
-(define-values (2d-read 2d-read-syntax 2d-get-info)
-  (make-meta-reader
-   '2d
-   "language path"
-   (lambda (bstr)
-     (let* ([str (bytes->string/latin-1 bstr)]
-            [sym (string->symbol str)])
-       (and (module-path? sym)
-            (vector
-             ;; try submod first:
-             `(submod ,sym reader)
-             ;; fall back to /lang/reader:
-             (string->symbol (string-append str "/lang/reader"))))))
-   wrap-reader
-   wrap-reader
-   (lambda (proc)
-     (lambda (key defval)
-       (case key
-         [(color-lexer)
-          (define theirs 
-            (or (and proc (proc key #f))
-                (dynamic-require 'syntax-color/racket-lexer 'racket-lexer)))
-          ((dynamic-require 'unstable/2d/lexer '2d-lexer) theirs)]
-         [else (if proc (proc key defval) defval)])))))
diff --git a/pkgs/unstable-2d/unstable/2d/lexer.rkt b/pkgs/unstable-2d/unstable/2d/lexer.rkt
deleted file mode 100644
index b40285cb19..0000000000
--- a/pkgs/unstable-2d/unstable/2d/lexer.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "private/lexer.rkt")
-(provide 2d-lexer)
diff --git a/pkgs/unstable-2d/unstable/2d/match.rkt b/pkgs/unstable-2d/unstable/2d/match.rkt
deleted file mode 100644
index 164892a2b4..0000000000
--- a/pkgs/unstable-2d/unstable/2d/match.rkt
+++ /dev/null
@@ -1,117 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     (only-in racket/match/parse parse)
-                     racket/match/patterns)
-         racket/match)
-
-(provide 2dmatch)
-(define-syntax (2dmatch stx)
-  (syntax-case stx ()
-    [(_ widths heights [(cell ...) rhs ...] ...)
-     (let ()
-       
-       ;; coord-to-content : hash[(list num num) -o> (listof syntax)]
-       (define coord-to-content (make-hash))
-       
-       ;; pattern-vars : hash[(list num num) -o> (listof identifier)]
-       ;; for each cell on the boundary, tell us which vars are 
-       ;; bound in the corresponding pattern
-       (define pattern-vars (make-hash))
-       
-       (define let-bindings '()) 
-       
-       (define main-args #f)
-       
-       (define (on-boundary? cells)
-         (ormap (λ (lst) (or (= 0 (list-ref lst 0))
-                             (= 0 (list-ref lst 1))))
-                cells))
-       
-       (define (cell-stx-object cell) 
-         (datum->syntax #f " " cell))
-       
-       ;; build up the coord-to-content mapping for the 
-       ;; boundary cells and build up the pattern-vars table
-       (for ([cells-stx (in-list (syntax->list #'((cell ...) ...)))]
-             [rhses (in-list (syntax->list #'((rhs ...) ...)))])
-         (define cells (syntax->datum cells-stx))
-         (define rhses-lst (syntax->list rhses))
-         (cond
-           [(member (list 0 0) cells) 
-            (unless (and rhses-lst (= 2 (length rhses-lst)))
-              (raise-syntax-error '2dmatch "cell at 0,0 must contain two expressions"
-                                  (cell-stx-object (car cells))))
-            (with-syntax ([(left-x right-x) (generate-temporaries rhses)]
-                          [(left-arg right-arg) rhses])
-              (set! let-bindings (list* #`[right-x right-arg]
-                                        #`[left-x left-arg]
-                                        let-bindings))
-              (set! main-args #'(left-x right-x)))]
-           [(on-boundary? cells)
-            (unless (and rhses-lst (= 1 (length rhses-lst)))
-              (raise-syntax-error '2dmatch 
-                                  (format 
-                                   "cell at ~a,~a must contain exactly one match pattern, found ~a"
-                                   (list-ref (car cells) 0) (list-ref (car cells) 1)
-                                   (length rhses-lst))
-                                  stx
-                                  (cell-stx-object (car (syntax-e cells-stx)))))
-            (define pat (car (syntax->list rhses)))
-            (hash-set! pattern-vars (car cells) (bound-vars (parse pat)))
-            (hash-set! coord-to-content (car cells) pat)]))
-       
-       ;; build up the coord-to-content mapping for the non-boundary cells
-       ;; use the pattern-vars table to build up the let-bindings that
-       ;; bind identifiers to functions that end up getting called in the match clauses
-       (for ([cells-stx (in-list (syntax->list #'((cell ...) ...)))]
-             [rhses (in-list (syntax->list #'((rhs ...) ...)))])
-         (define cells (syntax->datum cells-stx))
-         (define rhses-lst (syntax->list rhses))
-         (unless (on-boundary? cells)
-           (when (null? (syntax-e rhses))
-             (raise-syntax-error '2dmatch 
-                                 (format "cell at ~a,~a should not be empty"
-                                         (list-ref (car cells) 0)
-                                         (list-ref (car cells) 1))
-                                 stx
-                                 (cell-stx-object (car cells))))
-           (define horizontal-vars (hash-ref pattern-vars (list (list-ref (car cells) 0) 0)))
-           (define vertical-vars (hash-ref pattern-vars (list 0 (list-ref (car cells) 1))))
-           
-           (define (intersect vs1 vs2)
-             (for/list ([v1 (in-list vs1)]
-                        #:when (is-in? v1 vs2))
-               v1))
-           
-           (define (is-in? v1 v2s)
-             (for/or ([v2 (in-list v2s)])
-               (free-identifier=? v1 v2)))
-           
-           (for ([cell (in-list (cdr cells))])
-             (set! horizontal-vars (intersect horizontal-vars 
-                                              (hash-ref pattern-vars (list (list-ref cell 0) 0))))
-             (set! vertical-vars (intersect vertical-vars 
-                                            (hash-ref pattern-vars (list 0 (list-ref cell 1))))))
-           
-           (with-syntax ([(id) (generate-temporaries (list (format "2d-~a-~a" 
-                                                                   (list-ref (car cells) 0)
-                                                                   (list-ref (car cells) 1))))])
-             (define app #`(id #,@horizontal-vars #,@vertical-vars))
-             (for ([cell (in-list cells)])
-               (hash-set! coord-to-content cell app))
-             (set! let-bindings
-                   (cons #`[id #,(syntax-property
-                                  #`(λ (#,@horizontal-vars #,@vertical-vars) #,@rhses)
-                                  'typechecker:called-in-tail-position
-                                  #t)]
-                         let-bindings)))))
-       
-       (define num-of-cols (length (syntax->list #'widths)))
-       (define num-of-rows (length (syntax->list #'heights)))
-       #`(let #,(reverse let-bindings)
-           (match*/derived #,main-args #,stx
-             #,@(for*/list ([x (in-range 1 num-of-cols)]
-                            [y (in-range 1 num-of-rows)])
-                  #`[(#,(hash-ref coord-to-content (list x 0))
-                      #,(hash-ref coord-to-content (list 0 y)))
-                     #,(hash-ref coord-to-content (list x y))]))))]))
diff --git a/pkgs/unstable-2d/unstable/2d/private/lexer.rkt b/pkgs/unstable-2d/unstable/2d/private/lexer.rkt
deleted file mode 100644
index 01abcc2754..0000000000
--- a/pkgs/unstable-2d/unstable/2d/private/lexer.rkt
+++ /dev/null
@@ -1,465 +0,0 @@
-#lang racket/base
-(require "read-util.rkt"
-         "../dir-chars.rkt"
-         racket/set
-         racket/port
-         racket/contract
-         syntax-color/lexer-contract)
-
-#|
-
-todo:
- - break up the table into pieces
-   to better cope with edits
-
-|#
-
-(provide (contract-out [2d-lexer (-> lexer/c lexer/c)])
-         cropped-regions)
-
-(define (2d-lexer chained-lexer)
-  (define uniform-chained-lexer
-    (cond
-      [(procedure-arity-includes? chained-lexer 3)
-       chained-lexer]
-      [else
-       (λ (port offset mode)
-         (define-values (val tok paren start end) (chained-lexer port))
-         (values val tok paren start end 0 #f))]))
-  (define (2dcond-lexer port offset _mode)
-    (define a-2d-lexer-state (or _mode (2d-lexer-state '() #f #f)))
-    (cond
-      [(pair? (2d-lexer-state-pending-tokens a-2d-lexer-state))
-       (define-values (line col pos) (port-next-location port))
-       (define-values (val tok paren start end)
-         (apply values (car (2d-lexer-state-pending-tokens a-2d-lexer-state))))
-       
-       ;; this helper function checks to make sure that what's
-       ;; in the port is actually what was predicted by the
-       ;; 'val' -- it isn't necessary for correct operation, but
-       ;; helps find bugs earlier
-       (define (check-char i c2)
-         ;; here we want to check to make sure we're in sync, but:
-         
-         ;; 1) some lexers don't return strings (or return strings
-         ;;    of the wrong sizes); these will be non-strings here
-         (when (string? val)
-           ;; 2) whitespace is not always right
-           ;;    (the ones outside the table, 
-           ;;    specifically, are always just spaces)
-           (unless (eq? tok 'white-space)
-             
-             ;; 3) sometimes we get specials in the port
-             (when (char? c2)
-
-               (define c1 (string-ref val i))
-               (unless (equal? c1 c2)
-                 (error '2d/lexer.rkt "expected a ~s, got ~s while feeding token ~s" 
-                        c1 c2 
-                        (car (2d-lexer-state-pending-tokens a-2d-lexer-state))))))))
-       
-       ;; actually read the characters in
-       (define last-i (- end start))
-       (let loop ([i 0]
-                  
-                  ;; str-offset helps deal with the way line-counting ports handle 
-                  ;; \r\n combinations. That is, (- end start) will be a number that
-                  ;; doesn't match the length of the string in the case that there 
-                  ;; are \r\n pairs in the port. We'll increment str-offset for each 
-                  ;; of those and then use str-offset when indexing into the string
-                  [str-offset 0])
-         (unless (= i last-i)
-           (define c2 (read-char-or-special port))
-           (check-char (+ str-offset i) c2)
-           (cond
-             [(and (equal? c2 #\return)
-                   (equal? (peek-char-or-special port) #\newline))
-              (read-char-or-special port)
-              (check-char (+ str-offset i 1) #\newline)
-              (loop (+ i 1)
-                    (+ str-offset 1))]
-             [else 
-              (loop (+ i 1)
-                    str-offset)])))
-       
-       (define next-tokens 
-         (cdr (2d-lexer-state-pending-tokens 
-               a-2d-lexer-state)))
-       (define new-state
-         (struct-copy 2d-lexer-state
-                      a-2d-lexer-state
-                      [pending-tokens next-tokens]))
-       (values val tok paren 
-               pos
-               (+ (- end start) pos)
-               start
-               (if (null? next-tokens)
-                   new-state
-                   (dont-stop new-state)))]
-      [(equal? #\# (peek-char-or-special port))
-       (define pp (peeking-input-port port))
-       (define chars (list (read-char-or-special pp) 
-                           (read-char-or-special pp) 
-                           (read-char-or-special pp)))
-       (cond
-         [(equal? chars '(#\# #\2 #\d))
-          (start-new-2d-cond-lexing port a-2d-lexer-state uniform-chained-lexer offset)]
-         [else
-          (call-chained-lexer uniform-chained-lexer port offset a-2d-lexer-state)])]
-      [else
-       (call-chained-lexer uniform-chained-lexer port offset a-2d-lexer-state)]))
-  2dcond-lexer)
-
-
-(define double-barred-chars-regexp
-  (regexp
-   (format "[~a]" (apply string double-barred-chars))))
-
-(define (call-chained-lexer uniform-chained-lexer port offset a-2d-lexer-state)
-  (define-values (a b c d e f new-mode) 
-    (uniform-chained-lexer port offset (2d-lexer-state-chained-state a-2d-lexer-state)))
-  (values a b c d e f (2d-lexer-state '() #f new-mode)))
-
-(struct 2d-lexer-state (pending-tokens read-state chained-state))
-
-(define (start-new-2d-cond-lexing port a-2d-lexer-state uniform-chained-lexer offset)
-  (define-values (line col pos) (port-next-location port))
-  ;; consume #\# #\2 and #\d that must be there (peeked them earlier)
-  (read-char-or-special port)
-  (read-char-or-special port)
-  (read-char-or-special port)
-  ;; read in the keyword and get those tokens
-  
-  (define-values (backwards-chars eol-string)
-    (let loop ([kwd-chars '(#\d #\2 #\#)])
-      (define c (peek-char port))
-      (cond [(eof-object? c) (values kwd-chars "")]
-            [(and (equal? c #\return)
-                  (equal? (peek-char port 1) #\newline))
-             (values kwd-chars (string c #\newline))]
-            [(or (equal? c #\return)
-                 (equal? c #\newline))
-             (values kwd-chars (string c))]
-            [else 
-             (read-char-or-special port) ;; actually get the char
-             (loop (cons c kwd-chars))])))
-  (define first-tok-string
-    (apply string (reverse backwards-chars)))
-  (cond
-    [(eof-object? (peek-char port))
-     (values first-tok-string 
-             'error 
-             #f
-             pos 
-             (+ pos (string-length first-tok-string))
-             0
-             a-2d-lexer-state)]
-    [else
-     (define base-position
-       ;; one might think that this should depend on the length of eol-string
-       ;; but ports that have port-count-lines! enabled count the \r\n combination
-       ;; as a single position in the port, not two.
-       (let-values ([(_1 _2 c-pos) (port-next-location port)])
-         c-pos))
-     (define peek-port (peeking-input-port port))
-     ;; pull the newline out of the peek-port
-     (for ([x (in-range (string-length eol-string))]
-           [c1 (in-string eol-string)])
-       (define c2 (read-char-or-special peek-port))
-       (unless (equal? c1 c2)
-         (error 'unstable/2d/lexer.rkt "got an unexpected char.1 ~s vs ~s" c1 c2)))
-     
-     (define the-state (make-state line pos (string-length first-tok-string)))
-     (setup-state the-state)
-
-     ;; would like to be able to stop this loop
-     ;; and process only part of the table,
-     ;; but that works only when there are no broken
-     ;; edges of the table that span the place I want to stop.
-     (define failed
-       (with-handlers ((exn:fail:read? values))
-         (let loop ([map #f])
-           (define new-map
-             (parse-2dcond-one-step peek-port (object-name peek-port) #f #f pos the-state map))
-           (when new-map
-             (loop new-map)))))
-     
-     (define newline-token
-       (list eol-string 'white-space #f 
-             (+ pos (string-length first-tok-string))
-             ;; no matter how long eol-string is, it counts for 1 position only.
-             (+ pos (string-length first-tok-string) 1)))
-     
-     (cond
-       [(exn:fail:read:eof? failed)
-        ;; in this case, the source location for the error
-        ;; should be the beginning of the #2d token, 
-        ;; so we just turn the whole thing red in a single token
-        (define tok-string 
-          (string-append
-           first-tok-string
-           (apply string
-                  (let loop ()
-                    (define c (read-char port))
-                    (cond
-                      [(eof-object? c) '()]
-                      [else (cons c (loop))])))))
-        (values tok-string 'error #f
-                pos (+ pos (string-length tok-string))
-                0
-                #f)]
-       [else
-        (define final-tokens
-          (cond
-            [(exn:fail:read? failed)
-             (define error-pos (- (srcloc-position (car (exn:fail:read-srclocs failed)))
-                                  base-position)) ;; account for the newline
-             (when (< error-pos 0)
-               (error 'unstable/2d/lexer.rkt "got error-pos < 0: ~s ~s" 
-                      (srcloc-position (car (exn:fail:read-srclocs failed)))
-                      base-position))
-             (define peek-port2 (peeking-input-port port))
-             (port-count-lines! peek-port2)
-             (define (pull-chars n)
-               (apply
-                string
-                (let loop ([n n])
-                  (cond
-                    [(zero? n) '()]
-                    [else 
-                     (define c (read-char-or-special peek-port2))
-                     (cond
-                       [(char? c)
-                        (cons c (loop (- n 1)))]
-                       [else
-                        ;; drop replace specials with spaces
-                        (cons #\space (loop (- n 1)))])]))))
-             (cond
-               
-               [else
-                
-                ;; pull the newline out of peek-port2
-                (for ([x (in-range (string-length eol-string))]) (read-char-or-special peek-port2))
-                
-                (define before-token (list (pull-chars error-pos)
-                                           'no-color
-                                           #f
-                                           (+ base-position 1)
-                                           (+ base-position 1 error-pos)))
-                (define end-of-table-approx
-                  (let ([peek-port3 (peeking-input-port peek-port2)])
-                    (port-count-lines! peek-port3)
-                    (define (read-line/check-double-barred)
-                      (let loop ([found-double-barred? #f])
-                        (define c (read-char-or-special peek-port3))
-                        (cond
-                          [(or (equal? c #\n) (eof-object? c))
-                           found-double-barred?]
-                          [else (loop (or found-double-barred?
-                                          (member c double-barred-chars)))])))
-                    (let loop ()
-                      (define found-double-barred? (read-line/check-double-barred))
-                      (cond
-                        [found-double-barred?
-                         (loop)]
-                        [else
-                         (define-values (line col pos) (port-next-location peek-port3))
-                         pos]))))
-                (define after-token
-                  (list (pull-chars (- end-of-table-approx 1))
-                        'error
-                        #f
-                        (+ base-position 1 error-pos)
-                        (+ base-position 1 error-pos end-of-table-approx -1)))
-                (if (zero? error-pos)
-                    (list newline-token after-token)
-                    (list newline-token before-token after-token))])]
-            [else
-             
-             (define lhses (close-cell-graph cell-connections 
-                                             (length table-column-breaks)
-                                             (length rows)))
-             (define scratch-string (make-string (for/sum ([ss (in-list rows)])
-                                                   (for/sum ([s (in-list ss)])
-                                                     (string-length s)))
-                                                 #\space))
-             (define collected-tokens '())
-             (define rows-as-vector (apply vector (reverse rows)))
-             (for ([set-of-indicies (in-list (sort (set->list lhses) compare/xy 
-                                                   #:key smallest-representative))])
-               (define regions
-                 (fill-scratch-string set-of-indicies 
-                                      rows-as-vector
-                                      scratch-string 
-                                      table-column-breaks 
-                                      initial-space-count
-                                      #t))
-               (define port (open-input-string scratch-string))
-               (port-count-lines! port)
-               (let loop ([mode (2d-lexer-state-chained-state a-2d-lexer-state)])
-                 (define-values (_1 _2 current-pos) (port-next-location port))
-                 (define-values (tok-str tok paren start end backup new-mode)
-                   (uniform-chained-lexer port (+ pos offset) mode))
-                 (unless (equal? 'eof tok)
-                   (for ([sub-region (in-list (cropped-regions start end regions))])
-                     (define start (- (car sub-region) current-pos))
-                     (define end (- (cdr sub-region) current-pos))
-                     (set! collected-tokens 
-                           (cons (list (if (and (string? tok-str)
-                                                (< start (string-length tok-str))
-                                                (<= end (string-length tok-str)))
-                                           (substring tok-str start end)
-                                           (list 'strange-token tok-str))
-                                       tok
-                                       paren 
-                                       (+ base-position (car sub-region)) 
-                                       (+ base-position (cdr sub-region)))
-                                 collected-tokens)))
-                   (loop new-mode))))
-             
-             (define (collect-double-barred-token pending-start i offset str)
-               (when pending-start
-                 (set! collected-tokens (cons (list (substring str pending-start i)
-                                                    'parenthesis
-                                                    #f
-                                                    (+ base-position offset pending-start)
-                                                    (+ base-position offset i))
-                                              collected-tokens))))
-             
-             (for/fold ([offset 1]) ([strs (in-list (reverse (cons (list current-line) rows)))])
-               (for/fold ([offset offset]) ([str (in-list strs)])
-                 (let loop ([i 0]
-                            [pending-start #f])
-                   (cond
-                     [(< i (string-length str))
-                      (define c (string-ref str i))
-                      (cond
-                        [(member c double-barred-chars)
-                         (loop (+ i 1)
-                               (if pending-start pending-start i))]
-                        [else
-                         (collect-double-barred-token pending-start i offset str)
-                         (loop (+ i 1) #f)])]
-                     [else
-                      (collect-double-barred-token pending-start i offset str)]))
-                 (+ (string-length str) offset)))
-             
-             (define sorted-tokens (sort collected-tokens <
-                                         #:key (λ (x) (list-ref x 3))))
-             
-             ;; there will be gaps that correspond to the places outside of the
-             ;; outermost rectangle (at a minimum, newlines); this fills those 
-             ;; in with whitespace tokens
-             ;; NOTE: this code does not deal properly with \r\n newline combinations
-             (define cracks-filled-in-tokens
-               (let loop ([fst newline-token]
-                          [tokens sorted-tokens])
-                 (cond
-                   [(null? tokens) (list fst)]
-                   [else
-                    (define snd (car tokens))
-                    (cond
-                      [(= (list-ref fst 4)
-                          (list-ref snd 3))
-                       (cons fst (loop snd (cdr tokens)))]
-                      [else
-                       (define new-start (list-ref fst 4))
-                       (define new-end (list-ref snd 3))
-                       (list* fst
-                              (list 
-                               ; these are not the real characters ...
-                               (make-string (- new-end new-start) #\space)
-                               'white-space
-                               #f 
-                               new-start
-                               new-end)
-                              (loop snd (cdr tokens)))])])))
-             cracks-filled-in-tokens]))
-     
-        (values first-tok-string 'hash-colon-keyword #f
-                pos (+ pos (string-length first-tok-string)) 
-                0
-                (dont-stop
-                 (2d-lexer-state final-tokens
-                                 #t
-                                 (2d-lexer-state-chained-state a-2d-lexer-state))))])]))
-
-(define (cropped-regions start end regions)
-  (define result-regions '())
-  (define (add start end)
-    (unless (= start end)
-      (set! result-regions (cons (cons start end) result-regions))))
-  (let loop ([regions regions]
-             [start start]
-             [end end])
-    (unless (null? regions)
-      (define region (car regions))
-      (cond
-        [(<= start (car region))
-         (cond
-           [(<= end (car region))
-            (void)]
-           [(<= end (cdr region))
-            (add (car region) end)]
-           [else 
-            (add (car region) (cdr region))
-            (loop (cdr regions)
-                  (cdr region)
-                  end)])]
-        [(<= start (cdr region))
-         (cond
-           [(<= end (cdr region))
-            (add start end)]
-           [else 
-            (add start (cdr region))
-            (loop (cdr regions)
-                  (cdr region) 
-                  end)])]
-        [else 
-         (loop (cdr regions) start end)])))
-  result-regions)
-  
-
-#|
-(define scratch-string (make-string (for/sum ([ss (in-vector lines)])
-                                      (for/sum ([s (in-list ss)])
-                                        (string-length s)))
-                                    #\space))
-
-(define heights
-  (for/list ([line (in-vector lines)])
-    (length line)))
-
-`(,(string->symbol (string-append "2d" (apply string kwd-chars)))
-  
-  ,table-column-breaks
-  ,heights
-  
-  ,@(for/list ([set-of-indicies (in-list (sort (set->list lhses) compare/xy 
-                                               #:key smallest-representative))])
-      (fill-scratch-string set-of-indicies 
-                           lines 
-                           scratch-string 
-                           table-column-breaks 
-                           initial-space-count)
-      (define scratch-port (open-input-string scratch-string))
-      (when post-2d-line (port-count-lines! scratch-port))
-      (set-port-next-location! scratch-port post-2d-line post-2d-col post-2d-span)
-      `[,(sort (set->list set-of-indicies) compare/xy)
-        ,@(read-subparts source scratch-port 
-                         initial-space-count table-column-breaks heights set-of-indicies
-                         previous-readtable /recursive)]))
-|#
-
-#;
-(module+ main 
-  (define p (open-input-string (string-append
-                                "╔══╦══╗\n"
-                                "║1 ║2 ║\n"
-                                "╠══╬══╣\n"
-                                "║4 ║3 ║\n"
-                                "╚══╩══╝\n")))
-  (port-count-lines! p)
-  ;; account for the "#2d" that was read from the first line
-  (call-with-values (λ () (tokenize-2dcond p "source" 1 0 1 2))
-                    list))
diff --git a/pkgs/unstable-2d/unstable/2d/private/read-util.rkt b/pkgs/unstable-2d/unstable/2d/private/read-util.rkt
deleted file mode 100644
index 931b3a6c82..0000000000
--- a/pkgs/unstable-2d/unstable/2d/private/read-util.rkt
+++ /dev/null
@@ -1,698 +0,0 @@
-#lang racket/base
-#|
-
-ideas:
-- 2dcond
-- 2dmatch
-- literal tables in scribble layout?
-- something for 2d graphics?
-
-example uses:
-- unifier
-- subtyping relation
-- merge (from merge-sort)
-
-|#
-
-(require racket/port
-         syntax/readerr
-         racket/match
-         racket/set
-         ;syntax/rect
-         "../dir-chars.rkt"
-         (for-syntax racket/base
-                     racket/list))
-
-
-(provide parse-2dcond
-         parse-2dcond-one-step
-         
-         setup-state
-         make-state
-         copy-state
-         
-         chars->desc
-         smallest-representative
-         all-line-of-interest
-         current-lines
-         close-cell-graph
-         compare/xy
-         fill-scratch-string)
-
-(define all-line-of-interest (make-hash))
-(define current-lines (make-parameter #f))
-(define-syntax (line-of-interest stx)
-  (with-syntax ([line (syntax-line stx)])
-    (syntax-local-lift-expression #'(hash-set! all-line-of-interest line #t))
-    #'(visited line)))
-(define (visited line) 
-  (define t (current-lines))
-  (when t
-    (hash-remove! t line)))
-
-;; fill-scratch-string : (setof (list/c number? number?))
-;;                       (vector (listof string?))
-;;                       (or/c string? #f)
-;;                       (listof number)
-;;                       number
-;;                       [boolean?]
-;;                    -> (if scratch-string 
-;;                           (listof (cons/c number? number?)) 
-;;                           void?)
-;; scratch-string gets filled in from the 'lines' argument. 
-;; If compute-regions? is #t, then this function constructs the regions of the
-;; string that are have been filled in (as a list of pairs of start/end coordinates)
-;; and returns that (not counting the regions outside of the table to the right--
-;; these get filled in to the string, but the regions are not included)
-;; the resulting regions are sorted (smaller to bigger values) and non-overlapping
-(define (fill-scratch-string set-of-indicies 
-                             lines
-                             scratch-string
-                             table-column-breaks
-                             initial-space-count
-                             [compute-regions? #f])
-  
-  (define scratch-pos 0)
-  
-  (define eols '())
-  (define segments '())
-  (define cur-seg-start #f)
-  (define cur-seg-end #f)
-  (define (add-keeper)
-    (cond
-      [(equal? cur-seg-end scratch-pos)
-       (set! cur-seg-end (+ cur-seg-end 1))]
-      [else
-       (record-position)
-       (set! cur-seg-start scratch-pos)
-       (set! cur-seg-end (+ scratch-pos 1))]))
-  (define (record-position)
-    (when (and cur-seg-start cur-seg-end)
-      ;; port positions count from 1, but here
-      ;; we're counting from 0 in the string, so inc
-      (set! segments (cons (cons (+ cur-seg-start 1)
-                                 (+ cur-seg-end 1))
-                           segments))))
-  
-  (define-syntax-rule 
-    (set-scratch! in? c) 
-    (begin
-      (let ([x c])
-        ;(unless (char-whitespace? x) (printf "putting ~s @ ~s\n" x scratch-pos))
-        (string-set! scratch-string scratch-pos x))
-      (when in? (when compute-regions? (add-keeper)))))
-  (define-syntax-rule
-    (clear-scratch!)
-    (when scratch-string (string-set! scratch-string scratch-pos #\space)))
-  (define-syntax-rule
-    (inc-scratch-pos! e)
-    (set! scratch-pos (+ scratch-pos e)))
-  (for ([lines (in-vector lines)]
-        [y (in-naturals)])
-    (for ([line (in-list lines)]
-          [l-num (in-naturals)])
-      (define first-line? (zero? l-num))
-      ;; skip over initial spaces: we know that the string is already right here
-      ;; because it is initialized with spaces and never changed
-      ;; the +1 is for the first character (in the current line)
-      ;; of the table, which is always a table edge character
-      (inc-scratch-pos! (+ initial-space-count 1))
-      (define end-of-table-position
-        (for/fold ([start-pos-in-line (+ initial-space-count 1)])
-          ([table-column-break (in-list table-column-breaks)]
-           [x (in-naturals)])
-          (cond
-            [(and (set-member? set-of-indicies (list x y))
-                  (or (not first-line?)
-                      (set-member? set-of-indicies (list x (- y 1)))))
-             (for ([j (in-range table-column-break)])
-               (set-scratch! #t (string-ref line (+ j start-pos-in-line)))
-               (inc-scratch-pos! 1))
-             (if (if first-line?
-                     (and (set-member? set-of-indicies (list (+ x 1) (- y 1)))
-                          (set-member? set-of-indicies (list (+ x 1) y))
-                          (set-member? set-of-indicies (list x (- y 1))))
-                     (set-member? set-of-indicies (list (+ x 1) y)))
-                 (set-scratch! #t (string-ref line (+ table-column-break start-pos-in-line)))
-                 (clear-scratch!))
-             (inc-scratch-pos! 1)]
-            [else
-             (for ([j (in-range table-column-break)])
-               (clear-scratch!)
-               (inc-scratch-pos! 1))
-             (clear-scratch!)
-             (inc-scratch-pos! 1)])
-          (+ start-pos-in-line table-column-break 1)))
-      (set! eols (cons (cons end-of-table-position (string-length line))
-                       eols))
-      (for ([j (in-range end-of-table-position (string-length line))])
-        (set-scratch! #f (string-ref line j))
-        (inc-scratch-pos! 1))))
-  
-  (when compute-regions?
-    (record-position)
-    (reverse segments)))
-
-(define (compare/xy p1 p2)
-  (cond
-    [(= (list-ref p1 0) (list-ref p2 0))
-     (< (list-ref p1 1) (list-ref p2 1))]
-    [else
-     (< (list-ref p1 0) (list-ref p2 0))]))
-
-(define (smallest-representative set)
-  (define lst (set->list set))
-  (let loop ([best (car lst)]
-             [rest (cdr lst)])
-    (cond
-      [(null? rest) best]
-      [else
-       (cond
-         [(compare/xy best (car rest))
-          (loop best (cdr rest))]
-         [else
-          (loop (car rest) (cdr rest))])])))
-
-(define (close-cell-graph edges width height)
-  (define res (make-hash))
-  (for ([x (in-range width)])
-    (for ([y (in-range height)])
-      (hash-set! res (list x y) (set (list x y)))))
-  
-  (let loop ()
-    (define something-changed? #f)
-    (define (add-all n1 n2)
-      (define in-n1 (hash-ref res n1))
-      (define in-n2 (hash-ref res n2))
-      (for ([new-node (in-set in-n1)])
-        (unless (set-member? in-n2 new-node)
-          (set! something-changed? #t)
-          (hash-set! res n2 (set-add in-n2 new-node)))))
-    
-    (for ([(node-src nodes) (in-hash edges)])
-      (for ([node-dest (in-set nodes)])
-        (add-all node-dest node-src)
-        (add-all node-src node-dest)))
-    
-    (when something-changed? (loop)))
-  
-  (apply set (hash-map res (λ (x y) y))))
-
-(begin-for-syntax
-  (define state-components
-    ;; these are the state variables for the parse-2d-cond procedure
-    '((current-line-number _line)
-      (current-line-start-position (+ (or _pos 0) chars-read))
-      (current-line #f)
-      (current-line-length 0)
-      (initial-space-count 0)
-      (initial-column-guide #f)
-      (newline-char-count 0)
-      (table-column-breaks '())
-      (table-column-guides '())
-      (right-edge-column #f)
-      (pending-row '())
-      (rows '())
-      (current-row 0)
-      (cell-connections (make-hash))
-      (position-of-first-cell (hash)))))
-
-(define-syntax (setup-state stx)
-  (syntax-case stx ()
-    [(_ state-struct-id #;state-accessor #;state-mutator)
-     #`(begin
-         #,@(for/list ([state-component (in-list state-components)]
-                       [i (in-naturals)])
-              (with-syntax ([id (datum->syntax #'state-struct-id (car state-component))]
-                            [i i])
-                #'(define-syntax id
-                    (make-set!-transformer
-                     (λ (stx)
-                       (syntax-case stx (set!)
-                         [(set! x e)
-                          #'(state-mutator state-struct-id i e)]
-                         [x
-                          (identifier? #'x)
-                          #'(state-accessor state-struct-id i)])))))))]))
-
-(define-syntax (state-struct stx)
-  (syntax-case stx ()
-    [(_ make-state state-accessor state-mutator copy-state)
-     #`(begin
-         (define-values (state-type state-constructor state? state-accessor state-mutator)
-           (make-struct-type 'parse-2d-cond-state #f #,(length state-components) 0 #f '() #f))
-         (define (make-state _line _pos chars-read)
-           (state-constructor #,@(for/list ([state-component (in-list state-components)])
-                                   (list-ref state-component 1))))
-         (define (copy-state the-state)
-           (state-constructor #,@(for/list ([state-component (in-list state-components)]
-                                            [i (in-naturals)])
-                                   #`(state-accessor the-state #,i)))))]))
-
-(state-struct make-state state-accessor state-mutator copy-state)
-
-(define (parse-2dcond port source _line _col _pos chars-read)
-  (define the-state (make-state _line _pos chars-read))
-  (let loop ([map #f])
-    (define new-map
-      (parse-2dcond-one-step port source _line _col _pos the-state map))
-    (cond
-      [new-map
-       (loop new-map)]
-      [else
-       (setup-state the-state)
-       (values cell-connections 
-               (apply vector (reverse rows))
-               table-column-breaks
-               initial-space-count
-               position-of-first-cell)])))
-
-(struct guide (char srcloc) #:transparent)
-
-  
-;; parse-2dcond returns four values:
-;;  - a hash table encoding a graph that shows where the 
-;;    broken walls are in the 2d
-;;  - a vector of lists of strings containing the all of the line
-;;    of the table except the last one; the first string in each
-;;    list is the boundary line between the two rows
-;;  - a list of numbers showing the size of each column, not 
-;;    counting the separator character (and not taking into
-;;    acount broken walls)
-;;  - the number of spaces to the left of the 2d (same for all lines)
-(define (parse-2dcond-one-step port source _line _col _pos the-state last-left-map)
-  
-  ;; this sets up all of the state variables so they 
-  ;; look up the fields of 'the-state' and mutate
-  ;; the fields of 'the-state'; state-components lists
-  ;; of the state variables and their initial values
-  (setup-state the-state)
-  
-  
-  (define (add-node col row) 
-    (define k (list col row))
-    (unless (hash-ref cell-connections k #f)
-      (hash-set! cell-connections k (set))))
-  (define (add-edge col1 row1 col2 row2)
-    (define (add-->edge col1 row1 col2 row2)
-      (add-node col1 row1)
-      (define k (list col1 row1))
-      (hash-set! cell-connections k (set-add (hash-ref cell-connections k) (list col2 row2))))
-    (add-->edge col1 row1 col2 row2)
-    (add-->edge col2 row2 col1 row1))
-    
-  (define (fetch-next-line)
-    (when current-line
-      (set! pending-row (cons current-line pending-row)))
-    (set! current-line-start-position 
-          (+ current-line-start-position 
-             current-line-length
-             newline-char-count))
-    (when current-line-number
-      (set! current-line-number (+ current-line-number 1)))
-    (define chars
-      (let loop ([chars-read 0])
-        (define c (read-char-or-special port))
-        (cond
-          [(eof-object? c) 
-           (raise-read-eof-error
-            "unexpected eof; "
-            source _line _col _pos 
-            (and _pos (- (+ current-line-start-position chars-read) _pos)))]
-          [(not (char? c))
-           (readerr "unexpected special" chars-read)]
-          [(equal? c #\return)
-           (cond
-             [(equal? #\newline (peek-char-or-special port))
-              (set! newline-char-count 2)
-              (list c (read-char-or-special port))]
-             [else
-              (set! newline-char-count 1)
-              (list c)])]
-          [(equal? c #\newline)
-           (set! newline-char-count 1)
-           (list c)]
-          [(and (equal? c #\╝) (equal? right-edge-column chars-read))
-           ;; if we find a ╝ at the width of the table, 
-           ;; then we don't want
-           ;; to consume any more characters and
-           ;; instead to allow subsequent characters
-           ;; to be part of some other thing that's 
-           ;; being read (presumably a close paren)
-           (set! newline-char-count 0)
-           (list c)]
-          [else
-           (cons c (loop (+ chars-read 1)))])))
-    (set! current-line (apply string chars))
-    (set! current-line-length (- (string-length current-line) newline-char-count)))
-  
-  (define (process-first-line)
-    (fetch-next-line)
-    (let loop ([pos 0])
-      (cond
-        [(< pos current-line-length)
-         (cond
-           [(equal? #\space (string-ref current-line pos))
-            (loop (+ pos 1))]
-           [(equal? #\╔ (string-ref current-line pos))
-            (set! initial-column-guide (make-a-guide pos))
-            (set! initial-space-count pos)]
-           [else
-            (line-of-interest)
-            (readerr "expected the first non-whitespace character in the table to be ╔"
-                     pos)])]
-        [else
-         (line-of-interest)
-         (readerr "expected some non-whitespace characters in the first line of the table"
-                  0
-                  pos)]))
-    (let loop ([pos (+ initial-space-count 1)]
-               [current-column-width 0]
-               [column 0]
-               [column-breaks '()]
-               [column-guides '()])
-      (cond
-        [(< pos current-line-length)
-         (case (string-ref current-line pos)
-           [(#\╦) 
-            (add-node column 0)
-            (loop (+ pos 1) 0 (+ column 1)
-                  (cons current-column-width column-breaks)
-                  (cons (make-a-guide pos) column-guides))]
-           [(#\═) (loop (+ pos 1) (+ current-column-width 1) column 
-                        column-breaks column-guides)]
-           [(#\╗) 
-            (add-node column 0)
-            (whitespace-to-end (+ pos 1))
-            (set! table-column-breaks (reverse (cons current-column-width column-breaks)))
-            (set! right-edge-column pos)
-            (set! table-column-guides (reverse (cons (make-a-guide pos) column-guides)))]
-           [else 
-            (line-of-interest)
-            (readerr "expected only ═ ╦ and ╗ characters along the top of the grid" pos)])]
-        [else 
-         (line-of-interest)
-         (readerr "expected ╗ to terminate the first line" pos)])))
-  
-  (define (process-a-line current-map previous-line-separator?)
-    (fetch-next-line)
-    ;; check leading space
-    (let loop ([n 0])
-      (cond
-        [(= n initial-space-count) (void)]
-        [(and (< n current-line-length)
-              (equal? #\space (string-ref current-line n)))
-         (loop (+ n 1))]
-        [else
-         (line-of-interest)
-         (readerr "expected leading space" n)]))
-    (case (string-ref current-line initial-space-count)
-      [(#\║) (values (continue-line current-map previous-line-separator?) #t)]
-      [(#\╠) (values (start-new-block current-map) #f)]
-      [(#\╚) (values (finish-table current-map) #f)]
-      [else 
-       (line-of-interest)
-       (readerr/expected '(#\║ #\╠ #\╚)
-                         initial-space-count
-                         #:guides (list initial-column-guide))]))
-  
-  (define (start-new-block previous-map)
-    (set! current-row (+ current-row 1))
-    (add-node 0 current-row)
-
-    (set! rows (cons (reverse pending-row) rows))
-    (set! pending-row '())
-    
-    (let loop ([current-cell-size (car table-column-breaks)]
-               [table-column-breaks (cdr table-column-breaks)]
-               [pos (+ initial-space-count 1)]
-               
-               ;; whether or not the section of the line
-               ;; we're currently traversing is there (or not)
-               [cell-wall-broken? #f]
-               
-               ;; the srcloc of the spot that led us to the decision
-               ;; of which boolean that cell-wall-broken? should be
-               [cell-wall-guide (make-a-guide initial-space-count)]
-               
-               ;; this is the result, being built up backwards
-               [map '()]
-               
-               ;; this is the map from the previous cell;
-               ;; it tells us which characters here have to point upwards
-               [previous-map previous-map]
-               
-               [current-column 0])
-      (cond
-        [(zero? current-cell-size)
-         (unless (< pos current-line-length)
-           (line-of-interest)
-           (readerr "line ended too soon" pos))
-         (define sep (string-ref current-line pos))
-         (cond
-           [(and cell-wall-broken? (not (car previous-map)))
-            (unless (equal? sep #\╔)
-              (when (double-barred-char? sep)
-                (line-of-interest)
-                (readerr "expected not to find a cell boundary character" pos)))]
-           [else
-            (define allowed-chars
-              (if (null? table-column-breaks)
-                  (list (get-one (not cell-wall-broken?) (car previous-map) #f #f)
-                        (get-one (not cell-wall-broken?) (car previous-map) #f #t))
-                  (list (get-one (not cell-wall-broken?) (car previous-map) #f #f)
-                        (get-one (not cell-wall-broken?) (car previous-map) #f #t)
-                        (get-one (not cell-wall-broken?) (car previous-map) #t #f)
-                        (get-one (not cell-wall-broken?) (car previous-map) #t #t))))
-            (unless (member sep allowed-chars)
-              (line-of-interest)
-              (readerr/expected (filter values allowed-chars) pos))])
-         (cond
-           [(null? table-column-breaks) 
-            (whitespace-to-end (+ pos 1))
-            (reverse (cons #t map))]
-           [else
-            (define next-cell-wall-broken? (not (member sep rt-chars)))
-            (define edge-going-down? (and (member sep dn-chars) #t))
-            (define next-column (+ current-column 1))
-            (add-node next-column current-row)
-            (when next-cell-wall-broken?
-              (add-edge next-column current-row
-                        next-column (- current-row 1)))
-            (unless edge-going-down?
-              (add-edge next-column current-row
-                        (- next-column 1) current-row))
-            (loop (car table-column-breaks)
-                  (cdr table-column-breaks)
-                  (+ pos 1)
-                  next-cell-wall-broken? 
-                  (make-a-guide pos)
-                  (cons edge-going-down? map)
-                  (cdr previous-map)
-                  next-column)])]
-        [else
-         (unless (< pos current-line-length)
-           (line-of-interest)
-           (readerr "line ended in the middle of a cell" pos))
-         (cond
-           [cell-wall-broken?
-            (when (double-barred-char? (string-ref current-line pos))
-              (line-of-interest)
-              (readerr 
-               (format "expected not to find a cell boundary character (based on earlier ~a)"
-                       (guide-char cell-wall-guide))
-               pos
-               #:guides (list cell-wall-guide)))]
-           [else
-            (unless (equal? (string-ref current-line pos) #\═)
-              (line-of-interest)
-              (readerr/expected '(#\═) pos #:guides (list cell-wall-guide)))])
-         (loop (- current-cell-size 1) 
-               table-column-breaks 
-               (+ pos 1)
-               cell-wall-broken?
-               cell-wall-guide
-               map
-               previous-map
-               current-column)])))
-  
-  (define (continue-line map previous-line-separator?)
-    (let loop ([current-cell-size (car table-column-breaks)]
-               [table-column-breaks (cdr table-column-breaks)]
-               [map map]
-               [pos (+ initial-space-count 1)]
-               [column-number 0]
-               [starting-a-new-cell? #t])
-      (cond
-        [(zero? current-cell-size)
-         (unless (< pos current-line-length)
-           (line-of-interest)
-           (readerr "line ended at the boundary of a cell, expected the edge of the cell" pos))
-         (cond
-           [(car map)
-            (unless (equal? (string-ref current-line pos) #\║)
-              (line-of-interest)
-              (readerr/expected '(#\║) pos))]
-           [else
-            (when (double-barred-char? (string-ref current-line pos))
-              (line-of-interest)
-              (readerr "expected not to find a cell boundary character" pos))])
-         (cond
-           [(null? table-column-breaks)
-            (whitespace-to-end (+ pos 1))]
-           [else
-            (loop (car table-column-breaks)
-                  (cdr table-column-breaks)
-                  (cdr map)
-                  (+ pos 1)
-                  (+ column-number 1)
-                  #t)])]
-        [else
-         (unless (< pos current-line-length)
-           (line-of-interest)
-           (readerr "line ended in the middle of a cell" pos))
-         (when (double-barred-char? (string-ref current-line pos))
-           (line-of-interest)
-           (readerr "expected not to find a cell boundary character" pos))
-         (when previous-line-separator?
-           (when starting-a-new-cell?
-             (set! position-of-first-cell
-                   (hash-set
-                    position-of-first-cell
-                    (list column-number current-row)
-                    (guide-srcloc (make-a-guide pos))))))
-         (loop (- current-cell-size 1)
-               table-column-breaks
-               map
-               (+ pos 1)
-               column-number
-               #f)]))
-    map)
-  
-  
-  (define (finish-table map)
-    (set! rows (cons (reverse pending-row) rows))
-    (let loop ([current-cell-size (car table-column-breaks)]
-               [table-column-breaks (cdr table-column-breaks)]
-               [map map]
-               [pos (+ initial-space-count 1)])
-      (cond
-        [(zero? current-cell-size) 
-         (unless (< pos current-line-length)
-           (line-of-interest)
-           (readerr "line ended in the middle of a cell" pos))
-         (define expected-char
-           (cond
-             [(null? table-column-breaks) #\╝]
-             [(car map) #\╩]
-             [else #\═]))
-         (unless (equal? (string-ref current-line pos) expected-char)
-           (line-of-interest)
-           (readerr/expected (list expected-char) pos))
-         (cond
-           [(null? table-column-breaks)
-            #f]
-           [else
-            (loop (car table-column-breaks)
-                  (cdr table-column-breaks)
-                  (cdr map)
-                  (+ pos 1))])]
-        [else
-         (unless (< pos current-line-length)
-           (line-of-interest)
-           (readerr "line ended in the middle of a cell" pos))
-         (unless (equal? (string-ref current-line pos) #\═)
-           (line-of-interest)
-           (readerr/expected '(#\═) pos))
-         (loop (- current-cell-size 1)
-               table-column-breaks
-               map 
-               (+ pos 1))])))
-  
-  (define (whitespace-to-end pos)
-    (let loop ([pos pos])
-      (when (< pos current-line-length)
-        (define c (string-ref current-line pos))
-        (cond
-          [(equal? #\space c)
-           (loop (+ pos 1))]
-          [(equal? #\; c)
-           (void)]
-          [else
-           (line-of-interest)
-           (readerr "expected only whitespace outside of the table" pos)]))))  
-  
-  (define (make-a-guide pos-in-line)
-    (guide (string-ref current-line pos-in-line)
-           (srcloc source current-line-number pos-in-line
-                   (+ current-line-start-position pos-in-line)
-                   1)))
-
-  (define (readerr/expected chars pos-in-line #:guides [guides '()])
-    (readerr (format "expected ~a~a~a" 
-                     (if (null? (cdr chars))
-                         ""
-                         "one of ")
-                     (chars->desc chars "or")
-                     (if (null? guides)
-                         ""
-                         (format " (based on earlier ~a)"
-                                 (chars->desc (map guide-char guides)
-                                              "and"))))
-             pos-in-line
-             #:guides guides))
-  
-  (define (readerr msg pos-in-line [span 1] #:guides [guides '()])
-    (raise-read-error msg 
-                      source
-                      current-line-number
-                      pos-in-line
-                      (+ current-line-start-position pos-in-line)
-                      span
-                      #:extra-srclocs (map guide-srcloc guides)))
-  
-  (let loop ([map (or last-left-map
-                      (begin
-                        (process-first-line)
-                        (map (λ (x) #t) table-column-breaks)))]
-             [previous-line-separator? #t])
-    (define-values (next-map continue?) (process-a-line map previous-line-separator?))
-    (cond
-      [continue? (loop next-map #f)]
-      [next-map next-map]
-      [else #f])))
-     
-;; chars : non-empty-list-of-char -> string
-(define (chars->desc chars sep)
-  (cond
-    [(null? (cdr chars))
-     (format "~a" (car chars))]
-    [else
-     (define commas? (pair? (cddr chars)))
-     (apply 
-      string-append
-      (let loop ([chars chars]
-                 [first? #t])
-        (cond
-          [(null? (cdr chars))
-           (list (format "~a~a ~a"
-                         (if first? "" " ")
-                         sep
-                         (car chars)))]
-          [else
-           (cons (format "~a~a~a" 
-                         (if first? "" " ")
-                         (car chars)
-                         (if commas? "," ""))
-                 (loop (cdr chars) #f))])))]))
-
-(define (double-barred-char? c) (member c double-barred-chars))
-
-(define (get-one lt? up? rt? dn?)
-  (define (cmb a b) (if a b (not b)))
-  (for/or ([c (in-list double-barred-chars)])
-    (and (cmb lt? (member c lt-chars))
-         (cmb up? (member c up-chars))
-         (cmb rt? (member c rt-chars))
-         (cmb dn? (member c dn-chars))
-         c)))
diff --git a/pkgs/unstable-2d/unstable/2d/private/readtable.rkt b/pkgs/unstable-2d/unstable/2d/private/readtable.rkt
deleted file mode 100644
index 254fc76a6d..0000000000
--- a/pkgs/unstable-2d/unstable/2d/private/readtable.rkt
+++ /dev/null
@@ -1,172 +0,0 @@
-#lang racket/base
-#|
-
-ideas:
-- 2dcond
-- 2dmatch
-- literal tables in scribble layout?
-- something for graphics?
-
-example uses:
-- unifier
-- subtyping relation
-
-|#
-
-(require "read-util.rkt"
-         racket/set
-         ;syntax/rect
-         "../dir-chars.rkt"
-         racket/port)
-
-
-(provide make-2d-readtable)
-
-(define (make-2d-readtable)
-  (define previous-readtable (current-readtable))
-  (make-readtable 
-   previous-readtable 
-   #\2
-   'dispatch-macro 
-   (case-lambda
-     [(char port)
-      (define-values (line col pos) (port-next-location port))
-      
-      ;; the "-2"s here are because the initial line and column
-      ;; are supposed be at the beginning of the thing read, not
-      ;; after the "#2" has been consumed.
-      (dispatch-proc char port #f line 
-                     (and col (- col 2))
-                     (and pos (- pos 2))
-                     read/recursive previous-readtable)]
-     [(char port source _line _col _pos)
-      (dispatch-proc char port source _line _col _pos 
-                     (λ (a b c) (read-syntax/recursive source a b c))
-                     previous-readtable)])))
-
-(define (dispatch-proc char port source _line _col _pos /recursive previous-readtable)
-  (define next-char (peek-char port))
-  (cond
-    [(equal? next-char #\d)
-     (define chars-read 2) ;; account for the # and the 2
-     (define (rc) 
-       (set! chars-read (+ chars-read 1))
-       (read-char port))
-     (rc) ;; get the #\d
-     (define kwd-chars
-       (let loop ()
-         (define c (rc))
-         (cond
-           [(eof-object? c)
-            (raise (make-exn:fail:read:eof 
-                    "expected a newline to follow #2d"
-                    (current-continuation-marks)
-                    (list (srcloc source 
-                                  _line _col _pos
-                                  (+ _pos chars-read)))))]
-           [(equal? c #\newline) '()]
-           [(equal? c #\return) 
-            (when (equal? #\newline (peek-char port))
-              (rc))
-            '()]
-           [else (cons c (loop))])))
-     (define-values (post-2d-line post-2d-col post-2d-span) (port-next-location port))
-     (define-values (cell-connections 
-                     lines 
-                     table-column-breaks 
-                     initial-space-count 
-                     position-of-first-cell)
-       (parse-2dcond port source _line _col _pos chars-read))
-     (define lhses (close-cell-graph cell-connections 
-                                     (length table-column-breaks)
-                                     (vector-length lines)))
-     (define scratch-string (make-string (for/sum ([ss (in-vector lines)])
-                                           (for/sum ([s (in-list ss)])
-                                             (string-length s)))
-                                         #\space))
-     
-     (define heights
-       (for/list ([line (in-vector lines)])
-         (length line)))
-     
-     (define kwd-str (string-append "2d" (apply string kwd-chars)))
-     (define kwd-port (open-input-string kwd-str))
-     (port-count-lines! kwd-port)
-     (set-port-next-location! kwd-port _line (and _col (+ _col 1)) (and _pos (+ _pos 1)))
-     (define kwd-stx (read-syntax source kwd-port))
-     
-     (define line-width (+ initial-space-count 
-                           (apply + table-column-breaks)
-                           (max 0 (- (length table-column-breaks) 1))))
-     
-     (define (add-srclocs indicies)
-       (for/list ([index (in-list indicies)])
-         (define srcloc (hash-ref position-of-first-cell index))
-         (datum->syntax #f
-                        index
-                        (vector (srcloc-source srcloc)
-                                #f ;; line
-                                #f ;; col
-                                (srcloc-position srcloc)
-                                1))))
-     
-     `(,kwd-stx
-       
-       ,table-column-breaks
-       ,heights
-       
-       ,@(for/list ([set-of-indicies (in-list (sort (set->list lhses) compare/xy 
-                                                    #:key smallest-representative))])
-           (fill-scratch-string set-of-indicies 
-                                lines 
-                                scratch-string 
-                                table-column-breaks 
-                                initial-space-count)
-           (define scratch-port (open-input-string scratch-string))
-           (when post-2d-line (port-count-lines! scratch-port))
-           (set-port-next-location! scratch-port post-2d-line post-2d-col post-2d-span)
-           `[,(add-srclocs (sort (set->list set-of-indicies) compare/xy))
-             ,@(read-subparts source scratch-port 
-                              initial-space-count table-column-breaks heights set-of-indicies
-                              /recursive)]))]
-    [else
-     (/recursive 
-      (input-port-append #f (open-input-string "#2") port)
-      #f
-      previous-readtable)]))
-
-
-(define (read-subparts source scratch-port 
-                       initial-space-count table-column-breaks heights lhs
-                       /recursive)
-  (with-handlers (#;
-                  [exn:fail:read?
-                   (λ (exn)
-                     (define constructor
-                       (cond
-                         [(exn:fail:read:eof? exn) exn:fail:read:eof/rects]
-                         [(exn:fail:read:non-char? exn) exn:fail:read:non-char/rects]
-                         [else exn:fail:read/rects]))
-                     (raise 
-                      (constructor (exn-message exn)
-                                   (exn-continuation-marks exn)
-                                   (exn:fail:read-srclocs exn)
-                                   (build-rectangles
-                                    source
-                                    initial-space-count table-column-breaks heights lhs))))])
-    (let loop ()
-      (define o (/recursive scratch-port #f (current-readtable)))
-      (cond
-        [(eof-object? o) '()]
-        [else (cons o (loop))]))))
-
-#;
-(define (build-rectangles source table-column-breaks heights set-of-indicies)
-  (for/list ([pr (in-set set-of-indicies)])
-    (define x (list-ref pr 0))
-    (define y (list-ref pr 1))
-    (srcloc-rect source 
-                 ?-start-position
-                 (list-ref table-column-breaks x)
-                 (list-ref heights y))))
-
diff --git a/pkgs/unstable-2d/unstable/2d/tabular.rkt b/pkgs/unstable-2d/unstable/2d/tabular.rkt
deleted file mode 100644
index d3d50bbf99..0000000000
--- a/pkgs/unstable-2d/unstable/2d/tabular.rkt
+++ /dev/null
@@ -1,132 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         scribble/base
-         scribble/core)
-(provide 2dtabular)
-(define-syntax (2dtabular stx)
-  (syntax-case stx ()
-    [(_ cols rows cells ...)
-     (let ()
-       (define row-count (length (syntax->list #'rows)))
-       (define col-count (length (syntax->list #'cols)))
-       (define table (make-hash))
-       (define the-sep #f)
-       (define the-style #f)
-       (define ignore-first-line? #f)
-       (define has-keywords? #f)
-       (for ([cell (in-list (syntax->list #'(cells ...)))])
-         (syntax-case cell ()
-           [[(coord ...) body ...]
-            (let ()
-              (define coords
-                (sort
-                 (for/list ([coord (in-list (syntax->list #'(coord ...)))])
-                   (define lst (syntax->datum coord))
-                   (cons (car lst)
-                         (cadr lst)))
-                 <
-                 #:key car))
-              (define bodies (syntax->list #'(body ...)))
-              (unless (or (null? (cdr coords)) (apply = (map cdr coords)))
-                (raise-syntax-error '2dtabular
-                                    "cells may not span rows"
-                                    stx
-                                    #f
-                                    bodies))
-              (define keyword-line? 
-                (and (= (+ (cdr (car coords)) 1) row-count)
-                     (= (length coords) col-count)
-                     (ormap (λ (x) (keyword? (syntax-e x))) bodies)))
-              (when keyword-line? (set! has-keywords? #t))
-              (cond
-                [keyword-line?
-                 ;; last row, spans the entire table, contains keywords
-                 ;; => treat as keyword arguments to tabular
-                 (let loop ([bodies bodies])
-                   (syntax-case bodies ()
-                     [(#:style style-arg . rest)
-                      (begin
-                        (set! the-style #'style-arg)
-                        (loop #'rest))]
-                     [(#:style)
-                      (raise-syntax-error '2dtabular 
-                                          "expected a style to follow the #:style keyword"
-                                          stx
-                                          (car bodies))]
-                     [(#:sep sep-arg . rest)
-                      (begin
-                       (set! the-sep #'sep-arg)
-                       (loop #'rest))]
-                     [(#:sep)
-                      (raise-syntax-error '2dtabular 
-                                          "expected a separator to follow the #:sep keyword"
-                                          stx
-                                          (car bodies))]
-                     [(#:ignore-first-row . rest)
-                      (begin (set! ignore-first-line? #t)
-                             (loop #'rest))]
-                     [() (void)]
-                     [(a . b)
-                      (cond
-                        [(special-comment? (syntax-e #'a))
-                         (loop #'b)]
-                        [else
-                         (raise-syntax-error '2dtabular
-                                             "expected either the keyword #:style #:sep or #:ignore-first-row"
-                                             stx
-                                             #'a)])]))]
-                [else
-                 (define no-comment-bodies
-                   (for/list ([body (in-list bodies)]
-                              #:unless (special-comment? (syntax-e body)))
-                     (when (keyword? (syntax-e body))
-                       (raise-syntax-error '2dtabular
-                                           "unexpected keyword"
-                                           stx
-                                           body))
-                     body))
-                 (hash-set! table 
-                            (car coords) 
-                            #`(build-block #,@no-comment-bodies))
-                 (for ([coord (in-list (cdr coords))])
-                   (hash-set! table coord #''cont))]))]))
-       #`(tabular #,@(if the-style #`(#:style #,the-style) #'())
-                  #,@(if the-sep #`(#:sep #,the-sep) #'())
-                  (list #,@(for/list ([y (in-range 
-                                          (if ignore-first-line? 1 0)
-                                          (if has-keywords?
-                                              (- row-count 1)
-                                              row-count))])
-                             #`(list #,@(for/list ([x (in-range col-count)])
-                                          (hash-ref table (cons x y))))))))]))
-
-(define (build-block . block-or-contents)
-  (define (build-block pending)
-    (paragraph (style #f '()) (reverse pending)))
-  
-  (define blocks
-    (let loop ([args block-or-contents]
-               [pending '()])
-      (cond
-        [(null? args) 
-         (if (null? pending)
-             '()
-             (list (build-block pending)))]
-        [else
-         (define arg (car args))
-         (cond
-           [(content? arg)
-            (loop (cdr args) (cons arg pending))]
-           [else
-            (if (null? pending)
-                (cons arg (loop (cdr args) '()))
-                (list* (build-block pending)
-                       arg
-                       (loop (cdr args) '())))])])))
-  
-  (nested-flow (style #f '()) blocks))
-
-         
-         
-         
-         
\ No newline at end of file
diff --git a/pkgs/unstable-contract-lib/LICENSE.txt b/pkgs/unstable-contract-lib/LICENSE.txt
deleted file mode 100644
index 1b9c7b1239..0000000000
--- a/pkgs/unstable-contract-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-contract-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-contract-lib/info.rkt b/pkgs/unstable-contract-lib/info.rkt
deleted file mode 100644
index 449ee65bff..0000000000
--- a/pkgs/unstable-contract-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "Experimental libraries for working with contracts")
-
-(define pkg-authors '(robby ryanc))
diff --git a/pkgs/unstable-contract-lib/unstable/contract.rkt b/pkgs/unstable-contract-lib/unstable/contract.rkt
deleted file mode 100644
index 85ff504491..0000000000
--- a/pkgs/unstable-contract-lib/unstable/contract.rkt
+++ /dev/null
@@ -1,228 +0,0 @@
-#lang racket/base
-(require racket/contract/base racket/contract/combinator)
-
-(define path-piece?
-  (or/c path-string? (symbols 'up 'same)))
-
-(define port-number? (between/c 1 65535))
-(define tcp-listen-port? (between/c 0 65535))
-
-(define (non-empty-string? x)
-  (and (string? x) (not (zero? (string-length x)))))
-
-;; ryanc added:
-
-;; (if/c predicate then/c else/c) applies then/c to satisfying
-;;   predicate, else/c to those that don't.
-(define (if/c predicate then/c else/c)
-  #|
-  Naive version:
-    (or/c (and/c predicate then/c)
-          (and/c (not/c predicate) else/c))
-  But that applies predicate twice.
-  |#
-  (let ([then-ctc (coerce-contract 'if/c then/c)]
-        [else-ctc (coerce-contract 'if/c else/c)])
-    (define name (build-compound-type-name 'if/c predicate then-ctc else-ctc))
-    ;; Special case: if both flat contracts, make a flat contract.
-    (if (and (flat-contract? then-ctc)
-             (flat-contract? else-ctc))
-        ;; flat contract
-        (let ([then-pred (flat-contract-predicate then-ctc)]
-              [else-pred (flat-contract-predicate else-ctc)])
-          (define (pred x)
-            (if (predicate x) (then-pred x) (else-pred x)))
-          (flat-named-contract name pred))
-        ;; ho contract
-        (let ([then-proj (contract-projection then-ctc)]
-              [then-fo (contract-first-order then-ctc)]
-              [else-proj (contract-projection else-ctc)]
-              [else-fo (contract-first-order else-ctc)])
-          (define ((proj blame) x)
-            (if (predicate x)
-                ((then-proj blame) x)
-                ((else-proj blame) x)))
-          (make-contract
-           #:name name
-           #:projection proj
-           #:first-order
-           (lambda (x) (if (predicate x) (then-fo x) (else-fo x))))))))
-
-;; failure-result/c : contract
-;; Describes the optional failure argument passed to hash-ref, for example.
-;; If the argument is a procedure, it must be a thunk, and it is applied. Otherwise
-;; the argument is simply the value to return.
-(define failure-result/c
-  (if/c procedure? (-> any) any/c))
-
-;; rename-contract : contract any/c -> contract
-;; If the argument is a flat contract, so is the result.
-(define (rename-contract ctc name)
-  (let ([ctc (coerce-contract 'rename-contract ctc)])
-    (if (flat-contract? ctc)
-        (flat-named-contract name (flat-contract-predicate ctc))
-        (let* ([ctc-fo (contract-first-order ctc)]
-               [proj (contract-projection ctc)])
-          (make-contract #:name name
-                           #:projection proj
-                           #:first-order ctc-fo)))))
-
-;; Added by asumu
-;; option/c : contract -> contract
-(define (option/c ctc-arg)
-  (define ctc (coerce-contract 'option/c ctc-arg))
-  (cond [(flat-contract? ctc) (flat-option/c ctc)]
-        [(chaperone-contract? ctc) (chaperone-option/c ctc)]
-        [else (impersonator-option/c ctc)]))
-
-(define (option/c-name ctc)
-  (build-compound-type-name 'option/c (base-option/c-ctc ctc)))
-
-(define (option/c-projection ctc)
-  (define ho-proj (contract-projection (base-option/c-ctc ctc)))
-  (λ (blame)
-    (define partial (ho-proj blame))
-    (λ (val)
-      (if (not val) val (partial val)))))
-
-(define ((option/c-first-order ctc) v)
-  (or (not v) (contract-first-order-passes? (base-option/c-ctc ctc) v)))
-
-(define (option/c-stronger? this that)
-  (and (base-option/c? that)
-       (contract-stronger? (base-option/c-ctc this)
-                           (base-option/c-ctc that))))
-
-(struct base-option/c (ctc))
-
-(struct flat-option/c base-option/c ()
-        #:property prop:flat-contract
-        (build-flat-contract-property
-          #:name option/c-name
-          #:first-order option/c-first-order
-          #:stronger option/c-stronger?))
-
-(struct chaperone-option/c base-option/c ()
-        #:property prop:chaperone-contract
-        (build-chaperone-contract-property
-          #:name option/c-name
-          #:first-order option/c-first-order
-          #:projection option/c-projection
-          #:stronger option/c-stronger?))
-
-(struct impersonator-option/c base-option/c ()
-        #:property prop:contract
-        (build-contract-property
-          #:name option/c-name
-          #:first-order option/c-first-order
-          #:projection option/c-projection
-          #:stronger option/c-stronger?))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Flat Contracts
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define truth/c
-  (flat-named-contract '|truth value| (lambda (x) #t)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Contracted Sequences
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (sequence/c #:min-count [min-count #f] . elem/cs)
-  (define ctcs (for/list ([elem/c (in-list elem/cs)])
-                 (coerce-contract 'sequence/c elem/c)))
-  (define elem/mk-projs 
-    (for/list ([ctc (in-list ctcs)])
-      (contract-projection ctc)))
-  (define n-cs (length elem/cs))
-  (make-contract
-   #:name (apply build-compound-type-name 'sequence/c 
-                 (append
-                  (if min-count
-                      (list '#:min-count min-count)
-                      '())
-                  ctcs))
-   #:first-order sequence?
-   #:projection
-   (λ (orig-blame)
-     (define blame (blame-add-context orig-blame "an element of"))
-     (define ps (for/list ([mk-proj (in-list elem/mk-projs)])
-                  (mk-proj blame)))
-     (λ (seq)
-       (unless (sequence? seq)
-         (raise-blame-error
-          orig-blame seq
-          '(expected: "a sequence" given: "~e")
-          seq))
-       (make-do-sequence
-        (lambda ()
-          (let*-values ([(more? next) (sequence-generate seq)])
-            (values
-             (lambda (idx)
-               (call-with-values next
-                                 (lambda elems
-                                   (define n-elems (length elems))
-                                   (unless (= n-elems n-cs)
-                                     (raise-blame-error
-                                      blame seq
-                                      '(expected: "a sequence of ~a values" given: "~a values\n values: ~e")
-                                      n-cs n-elems elems))
-                                   (apply
-                                    values
-                                    (for/list ([elem (in-list elems)]
-                                               [p (in-list ps)])
-                                      (p elem))))))
-             add1
-             0
-             (lambda (idx) 
-               (define ans (more?))
-               (when (and min-count (idx . < . min-count))
-                 (unless ans
-                   (raise-blame-error 
-                    orig-blame
-                    seq
-                    '(expected: "a sequence that contains at least ~a values" given: "~e")
-                    min-count
-                    seq)))
-               ans)
-             (lambda elems #t)
-             (lambda (idx . elems) #t)))))))))
-
-;; Added by ntoronto
-
-(define (treeof elem-contract)
-  (or/c elem-contract
-        (listof (recursive-contract (treeof elem-contract) #:flat))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Exports
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(provide/contract
- [path-piece? contract?]
- [port-number? contract?]
- [tcp-listen-port? contract?]
-
- [non-empty-string? predicate/c]
-
- [if/c (-> procedure? contract? contract? contract?)]
- [failure-result/c contract?]
- [rename-contract (-> contract? any/c contract?)]
- [rename option/c maybe/c (-> contract? contract?)]
-
- [truth/c flat-contract?]
-
- [sequence/c (->* () 
-                  (#:min-count (or/c #f exact-nonnegative-integer?))
-                  #:rest (listof contract?) 
-                  contract?)]
- 
- [treeof (contract? . -> . contract?)])
-
diff --git a/pkgs/unstable-debug-lib/LICENSE.txt b/pkgs/unstable-debug-lib/LICENSE.txt
deleted file mode 100644
index 6b22aca404..0000000000
--- a/pkgs/unstable-debug-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-debug-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-debug-lib/info.rkt b/pkgs/unstable-debug-lib/info.rkt
deleted file mode 100644
index 0586481936..0000000000
--- a/pkgs/unstable-debug-lib/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"
-               "unstable-pretty-lib"))
-
-(define pkg-desc "Experimental libraries for debugging")
-
-(define pkg-authors '(samth))
diff --git a/pkgs/unstable-debug-lib/unstable/debug.rkt b/pkgs/unstable-debug-lib/unstable/debug.rkt
deleted file mode 100644
index 7d613a5f2b..0000000000
--- a/pkgs/unstable-debug-lib/unstable/debug.rkt
+++ /dev/null
@@ -1,194 +0,0 @@
-#lang racket/base
-
-(provide debug
-         dprintf
-         debugf
-         begin/debug
-         define/debug
-         define/private/debug
-         define/public/debug
-         define/override/debug
-         define/augment/debug
-         let/debug
-         let*/debug
-         letrec/debug
-         let-values/debug
-         let*-values/debug
-         letrec-values/debug
-         with-syntax/debug
-         with-syntax*/debug
-         parameterize/debug)
-
-(require racket/match
-         unstable/pretty
-         syntax/srcloc
-         syntax/location
-         racket/syntax
-         (for-syntax racket/base syntax/parse racket/syntax))
-
-(define-syntax (let/debug stx)
-  (syntax-parse stx
-    [(_ (~optional loop:id) ([lhs:id rhs:expr] ...) body:expr ...+)
-     #`(debug
-        #:name '#,(if (attribute loop) #'loop #'let/debug)
-        #:source (quote-srcloc #,stx)
-        (let #,@(if (attribute loop) (list #'loop) null)
-          ([lhs (debug #:name 'lhs rhs)] ...)
-          (debug body) ...))]))
-
-(define-syntaxes
-  [ let*/debug
-    letrec/debug
-    let-values/debug
-    let*-values/debug
-    letrec-values/debug
-    with-syntax/debug
-    with-syntax*/debug
-    parameterize/debug ]
-
-  (let ()
-
-    (define ((expander binder-id) stx)
-      (with-syntax ([binder binder-id])
-        (syntax-parse stx
-          [(binder/debug:id ([lhs rhs:expr] ...) body:expr ...+)
-           #`(debug
-              #:name 'binder/debug
-              #:source (quote-srcloc #,stx)
-              (binder
-               ([lhs (debug #:name 'lhs rhs)] ...)
-               (debug body) ...))])))
-
-    (values (expander #'let*)
-            (expander #'letrec)
-            (expander #'let-values)
-            (expander #'let*-values)
-            (expander #'letrec-values)
-            (expander #'with-syntax)
-            (expander #'with-syntax*)
-            (expander #'parameterize))))
-
-(define-syntaxes
-  [ define/debug
-    define/private/debug
-    define/public/debug
-    define/override/debug
-    define/augment/debug ]
-
-  (let ()
-
-    (define-syntax-class header
-      #:attributes [name]
-      (pattern (name:id . _))
-      (pattern (inner:header . _) #:attr name (attribute inner.name)))
-
-    (define ((expander definer-id) stx)
-      (with-syntax ([definer definer-id])
-        (syntax-parse stx
-          [(definer/debug:id name:id body:expr)
-           #`(definer name
-               (debug
-                #:name 'name
-                #:source (quote-srcloc #,stx)
-                body))]
-          [(definer/debug:id spec:header body:expr ...+)
-           #`(definer spec
-               (debug
-                #:name 'spec.name
-                #:source (quote-srcloc #,stx)
-                (let () body ...)))])))
-
-    (values (expander #'define)
-            (expander #'define/private)
-            (expander #'define/public)
-            (expander #'define/override)
-            (expander #'define/augment))))
-
-(define-syntax (begin/debug stx)
-  (syntax-parse stx
-    [(_ term:expr ...)
-     #`(debug
-        #:name 'begin/debug
-        #:source (quote-srcloc #,stx)
-        (begin (debug term) ...))]))
-
-(define-syntax (debugf stx)
-
-  (define-splicing-syntax-class argument
-    #:attributes ([debugged 1])
-    (pattern arg:expr
-             #:attr [debugged 1] (list #'(debug arg)))
-    (pattern (~seq kw:keyword arg:expr)
-             #:attr [debugged 1] (list #'kw #'(debug arg))))
-
-  (syntax-parse stx
-    [(_ f:expr arg:argument ...)
-     #`(debug
-        #:name 'debugf
-        #:source (quote-srcloc #,stx)
-        (#%app (debug f) arg.debugged ... ...))]))
-
-(define-syntax (debug stx)
-  (syntax-parse stx
-    [(_ (~or (~optional (~seq #:name name:expr))
-             (~optional (~seq #:source source:expr)))
-        ...
-        body:expr)
-     (with-syntax* ([name (or (attribute name) #'(quote body))]
-                    [source (or (attribute source) #'(quote-srcloc body))])
-       #'(debug/proc
-          name
-          source
-          (lambda () (#%expression body))))]))
-
-(define (debug/proc name source thunk)
-
-  (define src (source-location->prefix source))
-
-  (define (err e)
-    (if (exn? e)
-      (dprintf "raised exception: ~a" (exn-message e))
-      (dprintf "raised non-exception: ~a" (pretty-format/print e)))
-    (raise e))
-
-  (define depth (current-debug-depth))
-
-  (dynamic-wind
-
-    (lambda ()
-      (parameterize ([current-debug-depth depth])
-        (dprintf ">> ~a~a" src (pretty-format/write name 'infinity))))
-
-    (lambda ()
-      (parameterize ([current-debug-depth (add1 depth)])
-        (with-handlers ([(lambda _ #t) err])
-          (call-with-values thunk
-            (match-lambda*
-              [(list v)
-               (dprintf "result: ~a"
-                 (pretty-format/print v 'infinity))
-               v]
-              [(list vs ...)
-               (dprintf "results: (values~a)"
-                 (apply string-append
-                   (for/list ([v (in-list vs)])
-                     (string-append " " (pretty-format/print v 'infinity)))))
-               (apply values vs)])))))
-
-    (lambda ()
-      (parameterize ([current-debug-depth depth])
-        (dprintf "<< ~a~a" src (pretty-format/write name 'infinity))))))
-
-(define (dprintf fmt . args)
-  (define message (apply format fmt args))
-  (define terminated
-    (if (regexp-match? "\n$" message) message (string-append message "\n")))
-  (define prefix
-    (make-string (* debug-indent (current-debug-depth)) #\space))
-  (define indented
-    (regexp-replace* "(?m:.+)" terminated (string-append prefix "&")))
-  (write-string indented (current-error-port))
-  (void))
-
-(define current-debug-depth (make-parameter 0))
-(define debug-indent 2)
diff --git a/pkgs/unstable-flonum-pkgs/unstable-flonum-doc/LICENSE.txt b/pkgs/unstable-flonum-pkgs/unstable-flonum-doc/LICENSE.txt
deleted file mode 100644
index 03d5b0beb0..0000000000
--- a/pkgs/unstable-flonum-pkgs/unstable-flonum-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-flonum-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-flonum-pkgs/unstable-flonum-doc/info.rkt b/pkgs/unstable-flonum-pkgs/unstable-flonum-doc/info.rkt
deleted file mode 100644
index 6a7880f832..0000000000
--- a/pkgs/unstable-flonum-pkgs/unstable-flonum-doc/info.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang info
-
-(define collection "unstable")
-
-(define scribblings
-  '(("unstable-flonum.scrbl" (multi-page) (experimental))))
-
-(define deps '("base"
-               "scribble-lib"
-               "unstable"
-               "unstable-flonum-lib"))
-
-(define build-deps '("plot" ; used for an example
-                     "racket-doc"))
-(define update-implies '("unstable-flonum-lib"))
-
-(define pkg-desc "Experimental libraries for flonum computations (documentation)")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/unstable-flonum-pkgs/unstable-flonum-doc/unstable-flonum.scrbl b/pkgs/unstable-flonum-pkgs/unstable-flonum-doc/unstable-flonum.scrbl
deleted file mode 100644
index da8f3070a8..0000000000
--- a/pkgs/unstable-flonum-pkgs/unstable-flonum-doc/unstable-flonum.scrbl
+++ /dev/null
@@ -1,103 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval
-          unstable/scribblings/utils
-          (for-label racket unstable/flonum racket/flonum))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/flonum
-                     (rename-in (except-in plot plot plot3d)
-                                [plot-bitmap  plot]
-                                [plot3d-bitmap  plot3d])))
-
-@unstable-title[#:tag "flonum"]{Flonums}
-@unstable[@author+email["Neil Toronto" "ntoronto@racket-lang.org"]]
-
-@defmodule[unstable/flonum]
-
-@defproc[(flonum->bit-field [x flonum?]) (integer-in 0 (- (expt 2 64) 1))]{
-Returns the bits comprising @racket[x] as an integer.
-A convenient shortcut for composing @racket[integer-bytes->integer] with @racket[real->floating-point-bytes].
-@examples[#:eval the-eval
-                 (number->string (flonum->bit-field -inf.0) 16)
-                 (number->string (flonum->bit-field +inf.0) 16)
-                 (number->string (flonum->bit-field -0.0) 16)
-                 (number->string (flonum->bit-field 0.0) 16)
-                 (number->string (flonum->bit-field -1.0) 16)
-                 (number->string (flonum->bit-field 1.0) 16)
-                 (number->string (flonum->bit-field +nan.0) 16)]
-}
-
-@defproc[(bit-field->flonum [i (integer-in 0 (- (expt 2 64) 1))]) flonum?]{
-The inverse of @racket[flonum->bit-field].
-}
-
-@defproc[(flonum->ordinal [x flonum?]) (integer-in (- (- (expt 2 63) 1)) (- (expt 2 63) 1))]{
-Returns the signed ordinal index of @racket[x] in a total order over flonums.
-
-When inputs are not @racket[+nan.0], this function is monotone and symmetric;
-i.e. if @racket[(fl<= x y)] then @racket[(<= (flonum->ordinal x) (flonum->ordinal y))],
-and @racket[(= (flonum->ordinal (- x)) (- (flonum->ordinal x)))].
-@examples[#:eval the-eval
-                 (flonum->ordinal -inf.0)
-                 (flonum->ordinal +inf.0)
-                 (flonum->ordinal -0.0)
-                 (flonum->ordinal 0.0)
-                 (flonum->ordinal -1.0)
-                 (flonum->ordinal 1.0)
-                 (flonum->ordinal +nan.0)]
-These properties mean that @racket[flonum->ordinal] does not distinguish @racket[-0.0] and @racket[0.0].
-
-The following plot demonstrates how the density of floating-point numbers decreases with magnitude:
-@examples[#:eval the-eval
-                 (parameterize ([y-axis-ticks? #f])
-                   (plot (list (function (compose flonum->ordinal exact->inexact) 1/4 8)
-                               (y-axis 1/2) (y-axis 1) (y-axis 2) (y-axis 4))))]
-}
-
-@defproc[(ordinal->flonum [i (integer-in (- (- (expt 2 63) 1)) (- (expt 2 63) 1))]) flonum?]{
-The inverse of @racket[flonum->ordinal].
-}
-
-@defproc[(flonums-between [x flonum?] [y flonum?]) exact-integer?]{
-Returns the number of flonums between @racket[x] and @racket[y], excluding one endpoint.
-Equivalent to @racket[(- (flonum->ordinal y) (flonum->ordinal x))].
-@examples[#:eval the-eval
-                 (flonums-between 0.0 1.0)
-                 (flonums-between 1.0 2.0)
-                 (flonums-between 2.0 3.0)
-                 (flonums-between 1.0 +inf.0)]
-}
-
-@defproc[(flstep [x flonum?] [n exact-integer?]) flonum?]{
-Returns the flonum @racket[n] flonums away from @racket[x], according to @racket[flonum->ordinal]. If @racket[x] is @racket[+nan.0], returns @racket[+nan.0].
-@examples[#:eval the-eval
-                 (flstep 0.0 1)
-                 (flstep (flstep 0.0 1) -1)
-                 (flstep 0.0 -1)
-                 (flstep +inf.0 1)
-                 (flstep +inf.0 -1)
-                 (flstep -inf.0 -1)
-                 (flstep -inf.0 1)
-                 (flstep +nan.0 1000)]
-}
-
-@defproc[(flnext [x flonum?]) flonum?]{
-Equivalent to @racket[(flstep x 1)].
-}
-
-@defproc[(flprev [x flonum?]) flonum?]{
-Equivalent to @racket[(flstep x -1)].
-}
-
-@deftogether[(@defthing[-max.0 flonum?]
-              @defthing[-min.0 flonum?]
-              @defthing[+min.0 flonum?]
-              @defthing[+max.0 flonum?])]{
-The rational flonums with maximum and minimum magnitude.
-@examples[#:eval the-eval
-                 (list -max.0 +max.0 -min.0 +min.0)
-                 (plot (function sqrt 0 (* 20 +min.0)))]
-}
-
-@(close-eval the-eval)
diff --git a/pkgs/unstable-flonum-pkgs/unstable-flonum-lib/LICENSE.txt b/pkgs/unstable-flonum-pkgs/unstable-flonum-lib/LICENSE.txt
deleted file mode 100644
index ba880bf499..0000000000
--- a/pkgs/unstable-flonum-pkgs/unstable-flonum-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-flonum-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-flonum-pkgs/unstable-flonum-lib/info.rkt b/pkgs/unstable-flonum-pkgs/unstable-flonum-lib/info.rkt
deleted file mode 100644
index b77c15ba61..0000000000
--- a/pkgs/unstable-flonum-pkgs/unstable-flonum-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "Experimental libraries for flonum computations")
-
-(define pkg-authors '(ntoronto))
diff --git a/pkgs/unstable-flonum-pkgs/unstable-flonum-lib/unstable/flonum.rkt b/pkgs/unstable-flonum-pkgs/unstable-flonum-lib/unstable/flonum.rkt
deleted file mode 100644
index 0c91f95dcb..0000000000
--- a/pkgs/unstable-flonum-pkgs/unstable-flonum-lib/unstable/flonum.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket/base
-
-(require racket/unsafe/ops)
-
-(provide flonum->bit-field bit-field->flonum
-         flonum->ordinal ordinal->flonum
-         flstep flnext flprev
-         -max.0 -min.0 +min.0 +max.0
-         flonums-between)
-
-(define (flonum->bit-field x)
-  (cond [(flonum? x)  (integer-bytes->integer (real->floating-point-bytes x 8) #f)]
-        [else  (raise-type-error 'flonum->bit-field "flonum" x)]))
-
-(define (bit-field->flonum i)
-  (cond [(and (exact-integer? i) (i . >= . 0) (i . <= . #xffffffffffffffff))
-         (floating-point-bytes->real (integer->integer-bytes i 8 #f))]
-        [else
-         (raise-type-error 'bit-field->flonum "exact integer in [0,#xffffffffffffffff]" i)]))
-
-(define (flonum->ordinal x)
-  (cond [(flonum? x)  (cond [(x . < . 0)  (- (flonum->bit-field (- x)))]
-                            [else            (flonum->bit-field (unsafe-flabs x))])] ; abs for -0.0
-        [else  (raise-type-error 'flonum->ordinal "flonum" x)]))
-
-(define (ordinal->flonum i)
-  (cond [(and (exact-integer? i) (i . >= . #x-7fffffffffffffff) (i . <= . #x7fffffffffffffff))
-         (cond [(i . < . 0)  (- (bit-field->flonum (- i)))]
-               [else            (bit-field->flonum i)])]
-        [else
-         (raise-type-error
-          'ordinal->flonum "exact integer in [#x-7fffffffffffffff,#xffffffffffffffff]" i)]))
-
-(define +inf-ordinal (flonum->ordinal +inf.0))
-(define -inf-ordinal (flonum->ordinal -inf.0))
-
-(define (flstep x n)
-  (cond [(not (flonum? x))  (raise-type-error 'flstep "flonum" 0 x n)]
-        [(not (exact-integer? n))  (raise-type-error 'flstep "exact integer" 1 x n)]
-        [(eqv? x +nan.0)  +nan.0]
-        [(and (eqv? x +inf.0) (n . >= . 0))  +inf.0]
-        [(and (eqv? x -inf.0) (n . <= . 0))  -inf.0]
-        [else  (define i (+ n (flonum->ordinal x)))
-               (cond [(i . < . -inf-ordinal)  -inf.0]
-                     [(i . > . +inf-ordinal)  +inf.0]
-                     [else  (ordinal->flonum i)])]))
-
-(define (flnext x) (flstep x 1))
-(define (flprev x) (flstep x -1))
-
-(define -max.0 (flnext -inf.0))
-(define -min.0 (flprev 0.0))
-(define +min.0 (flnext 0.0))
-(define +max.0 (flprev +inf.0))
-
-(define (flonums-between x y)
-  (cond [(not (flonum? x))  (raise-type-error 'flonums-between "flonum" 0 x y)]
-        [(not (flonum? y))  (raise-type-error 'flonums-between "flonum" 1 x y)]
-        [else  (- (flonum->ordinal y) (flonum->ordinal x))]))
diff --git a/pkgs/unstable-latent-contract-lib/LICENSE.txt b/pkgs/unstable-latent-contract-lib/LICENSE.txt
deleted file mode 100644
index 09a5d32681..0000000000
--- a/pkgs/unstable-latent-contract-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-latent-contract-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-latent-contract-lib/info.rkt b/pkgs/unstable-latent-contract-lib/info.rkt
deleted file mode 100644
index 594e0dbad1..0000000000
--- a/pkgs/unstable-latent-contract-lib/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"
-               "scribble-lib"))
-
-(define pkg-desc "Experimental libraries for contracts at definitions")
-
-(define pkg-authors '(mflatt ntoronto))
diff --git a/pkgs/unstable-latent-contract-lib/unstable/latent-contract.rkt b/pkgs/unstable-latent-contract-lib/unstable/latent-contract.rkt
deleted file mode 100644
index fb7ce3b15a..0000000000
--- a/pkgs/unstable-latent-contract-lib/unstable/latent-contract.rkt
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang racket/base
-
-(require (for-syntax racket/base
-                     racket/syntax
-                     syntax/parse
-                     racket/provide-transform
-                     syntax/define)
-         racket/contract)
-
-(provide define/latent-contract activate-contract-out)
-
-(begin-for-syntax
-  (struct value/latent-contract (value contract)
-    #:property prop:procedure
-    (λ (v/lc stx)
-      (define value (value/latent-contract-value v/lc))
-      (syntax-case stx ()
-        [(_ . args)  (quasisyntax/loc stx (#,value . args))]
-        [_           (quasisyntax/loc stx #,value)]))))
-
-(define-syntax (define/latent-contract stx)
-  (syntax-parse stx
-    [(_ (head . args) contract:expr body:expr ...+)
-     (define-values (name value)
-       (normalize-definition (syntax/loc stx (define (head . args) body ...)) #'lambda #t #t))
-     (syntax-protect
-      (quasisyntax/loc stx
-        (define/latent-contract #,name contract #,value)))]
-    [(_ name:id contract:expr value:expr)
-     (with-syntax ([value-name     (format-id #f "~a" #'name)]
-                   [contract-name  (format-id #f "~a-contract" #'name)])
-       (syntax-protect
-        (syntax/loc stx
-          (begin (define value-name value)
-                 (define contract-name contract)
-                 (define-syntax name
-                   (value/latent-contract #'value-name #'contract-name))))))]))
-
-(define-for-syntax (activate->contract-out stx id)
-  (let* ([err  (λ () (raise-syntax-error 'activate-contract-out "no latent contract" id))]
-         [v/lc  (syntax-local-value id err)])
-    (when (not (value/latent-contract? v/lc)) (err))
-    (with-syntax ([contract  (value/latent-contract-contract v/lc)])
-      (quasisyntax/loc stx [#,id contract]))))
-
-(define-syntax activate-contract-out/end
-  (make-provide-pre-transformer
-   (λ (stx phases)
-     (syntax-case stx ()
-       [(_ id ...)  (with-syntax ([(item ...)  (for/list ([id  (in-list (syntax->list #'(id ...)))])
-                                                 (activate->contract-out stx id))])
-                      (pre-expand-export
-                       (syntax-protect
-                        (syntax/loc stx (contract-out item ...)))
-                       phases))]))))
-
-(define-for-syntax (phases->abs-phases phases)
-  (map (λ (phase) (and phase (+ phase (syntax-local-phase-level))))
-       (if (null? phases) '(0) phases)))
-
-(define-for-syntax (make-lifting-provide-pre-transformer target-id)
-  (make-provide-pre-transformer
-   (λ (stx phases)
-     (syntax-case stx ()
-       [(_ args ...)  (let ()
-                        (for ([phase  (in-list (phases->abs-phases phases))])
-                          (syntax-local-lift-module-end-declaration
-                           (syntax-protect
-                            (quasisyntax/loc stx
-                              (provide (for-meta #,phase (#,target-id args ...)))))))
-                        (syntax/loc stx (combine-out)))]))))
-
-(define-syntax activate-contract-out
-  (make-lifting-provide-pre-transformer #'activate-contract-out/end))
diff --git a/pkgs/unstable-latent-contract-lib/unstable/latent-contract/defthing.rkt b/pkgs/unstable-latent-contract-lib/unstable/latent-contract/defthing.rkt
deleted file mode 100644
index b38c5bddff..0000000000
--- a/pkgs/unstable-latent-contract-lib/unstable/latent-contract/defthing.rkt
+++ /dev/null
@@ -1,193 +0,0 @@
-#lang racket/base
-
-;; Definitions with contracts and contract documentation.
-
-(require racket/contract unstable/latent-contract racket/provide racket/match
-         (for-syntax racket/base racket/list racket/syntax syntax/parse racket/provide-transform
-                     "serialize-syntax.rkt")
-         (prefix-in s. scribble/manual)
-         (prefix-in s. scribble/core)
-         (prefix-in s. scribble/html-properties))
-
-(provide defthing defproc defparam defcontract
-         only-doc-out doc-apply)
-
-(begin-for-syntax
-  (define-syntax-class argument-spec
-    #:description "argument specification"
-    (pattern [name:id contract:expr])
-    (pattern [name:id contract:expr default:expr])
-    (pattern [kw:keyword name:id contract:expr])
-    (pattern [kw:keyword name:id contract:expr default:expr])))
-
-;; ===================================================================================================
-;; Helpers
-
-(define-for-syntax (get-required-contract arg-stx)
-  (syntax-parse arg-stx
-    [(name:id contract:expr)             (list #'contract)]
-    [(kw:keyword name:id contract:expr)  (list #'kw #'contract)]
-    [_  empty]))
-
-(define-for-syntax (get-optional-contract arg-stx)
-  (syntax-parse arg-stx
-    [(name:id contract:expr default:expr)             (list #'contract)]
-    [(kw:keyword name:id contract:expr default:expr)  (list #'kw #'contract)]
-    [_  empty]))
-
-(define-for-syntax (remove-contract arg-stx)
-  (syntax-parse arg-stx
-    [(name:id contract:expr)                          (list #'name)]
-    [(name:id contract:expr default:expr)             (list #'(name default))]
-    [(kw:keyword name:id contract:expr)               (list #'kw #'name)]
-    [(kw:keyword name:id contract:expr default:expr)  (list #'kw #'(name default))]))
-
-(define-for-syntax (parameter-name->arg-name name-stx)
-  (define name-str (symbol->string (syntax->datum name-stx)))
-  (define arg-name-str
-    (cond [(regexp-match #rx".*-(.*)$" name-str)  => (λ (m) (last m))]
-          [(regexp-match #rx"^$" name-str)        => (λ (m) "value")]
-          [else  (substring name-str 0 1)]))
-  (datum->syntax name-stx (string->symbol arg-name-str)))
-
-;; ===================================================================================================
-;; Forms to define things with a contract and documentation
-
-;; Define a thing, optionally documenting the value of the thing
-(define-syntax (defthing stx)
-  (syntax-parse stx
-    [(_ name:id contract:expr #:document-value value:expr)
-     (with-syntax ([name:doc             (format-id #'name "~a:doc" #'name)]
-                   [serialized-contract  (serialize-syntax #'contract)]
-                   [serialized-value     (serialize-syntax #'value)])
-       (syntax/loc stx
-         (begin
-           (define/latent-contract name contract value)
-           (define-syntax (name:doc doc-stx)
-             (syntax-case doc-stx ()
-               [(ctx . pre-flows)
-                (with-syntax ([doc-name      (datum->syntax #'ctx (syntax-e #'name))]
-                              [doc-contract  (unserialize-syntax #'ctx 'serialized-contract)]
-                              [doc-value     (unserialize-syntax #'ctx 'serialized-value)])
-                  (syntax/loc doc-stx
-                    (s.defthing doc-name doc-contract #:value doc-value
-                                . pre-flows)))])))))]
-    [(_ name:id contract:expr value:expr)
-     (with-syntax ([name:doc             (format-id #'name "~a:doc" #'name)]
-                   [serialized-contract  (serialize-syntax #'contract)])
-       (syntax/loc stx
-         (begin
-           (define/latent-contract name contract value)
-           (define-syntax (name:doc doc-stx)
-             (syntax-case doc-stx ()
-               [(ctx . pre-flows)
-                (with-syntax ([doc-name      (datum->syntax #'ctx (syntax-e #'name))]
-                              [doc-contract  (unserialize-syntax #'ctx 'serialized-contract)])
-                  (syntax/loc doc-stx
-                    (s.defthing doc-name doc-contract . pre-flows)))])))))]))
-
-(define-for-syntax (wrap-procedure-body stx)
-  (syntax-case stx ()
-    [(e)  #'e]
-    [(e ...)  #'(let () e ...)]))
-
-;; Define a procedure
-(define-syntax (defproc stx)
-  (syntax-parse stx
-    [(_ (name:id arg:argument-spec ...) result:expr #:document-body body ...+)
-     (define arg-list (syntax->list #'(arg ...)))
-     (with-syntax ([name:doc            (format-id #'name "~a:doc" #'name)]
-                   [(new-arg ...)       (append* (map remove-contract arg-list))]
-                   [(req-contract ...)  (append* (map get-required-contract arg-list))]
-                   [(opt-contract ...)  (append* (map get-optional-contract arg-list))]
-                   [serialized-args     (serialize-syntax #'(arg ...))]
-                   [serialized-result   (serialize-syntax #'result)]
-                   [serialized-body     (serialize-syntax (wrap-procedure-body #'(body ...)))])
-       (syntax/loc stx
-         (begin
-           (define/latent-contract (name new-arg ...) (->* (req-contract ...) (opt-contract ...)
-                                                           result)
-             body ...)
-           (define-syntax (name:doc doc-stx)
-             (syntax-case doc-stx ()
-               [(ctx . pre-flows)
-                (with-syntax ([doc-name    (datum->syntax #'ctx (syntax-e #'name))]
-                              [doc-args    (unserialize-syntax #'ctx 'serialized-args)]
-                              [doc-result  (unserialize-syntax #'ctx 'serialized-result)]
-                              [doc-body    (unserialize-syntax #'ctx 'serialized-body)])
-                  (syntax/loc doc-stx
-                    (s.defproc (doc-name . doc-args) doc-result #:value doc-body
-                               . pre-flows)))])))))]
-    [(_ (name:id arg:argument-spec ...) result:expr body ...+)
-     (define arg-list (syntax->list #'(arg ...)))
-     (with-syntax ([name:doc            (format-id #'name "~a:doc" #'name)]
-                   [(new-arg ...)       (append* (map remove-contract arg-list))]
-                   [(req-contract ...)  (append* (map get-required-contract arg-list))]
-                   [(opt-contract ...)  (append* (map get-optional-contract arg-list))]
-                   [serialized-args     (serialize-syntax #'(arg ...))]
-                   [serialized-result   (serialize-syntax #'result)])
-       (syntax/loc stx
-         (begin
-           (define/latent-contract (name new-arg ...) (->* (req-contract ...) (opt-contract ...)
-                                                           result)
-             body ...)
-           (define-syntax (name:doc doc-stx)
-             (syntax-case doc-stx ()
-               [(ctx . pre-flows)
-                (with-syntax ([doc-name    (datum->syntax #'ctx (syntax-e #'name))]
-                              [doc-args    (unserialize-syntax #'ctx 'serialized-args)]
-                              [doc-result  (unserialize-syntax #'ctx 'serialized-result)])
-                  (syntax/loc doc-stx
-                    (s.defproc (doc-name . doc-args) doc-result . pre-flows)))])))))]))
-
-;; Define a parameter
-(define-syntax (defparam stx)
-  (syntax-parse stx
-    [(_ name:id arg:id contract:expr default:expr)
-     (with-syntax ([name:doc             (format-id #'name "~a:doc" #'name)]
-                   [serialized-contract  (serialize-syntax #'contract)]
-                   [serialized-default   (serialize-syntax #'default)])
-       (syntax/loc stx
-         (begin
-           (define/latent-contract name (parameter/c contract) (make-parameter default))
-           (define-syntax (name:doc doc-stx)
-             (syntax-case doc-stx ()
-               [(ctx . pre-flows)
-                (with-syntax ([doc-name      (datum->syntax #'ctx (syntax-e #'name))]
-                              [doc-arg       (datum->syntax #'ctx (syntax-e #'arg))]
-                              [doc-contract  (unserialize-syntax #'ctx 'serialized-contract)]
-                              [doc-default   (unserialize-syntax #'ctx 'serialized-default)])
-                  #'(s.defparam doc-name doc-arg doc-contract #:value doc-default
-                                . pre-flows))])))))]
-    [(_ name:id contract:expr default:expr)
-     (quasisyntax/loc stx
-       (defparam name #,(parameter-name->arg-name #'name) contract default))]))
-
-;; Define a contract or a procedure that returns a contract
-(define-syntax (defcontract stx)
-  (syntax-parse stx
-    [(_ name:id value:expr)
-     (syntax/loc stx (defthing name contract? #:document-value value))]
-    [(_ (name:id arg:argument-spec ...) body)
-     (syntax/loc stx (defproc (name arg ...) contract? #:document-body body))]))
-
-;; ===================================================================================================
-;; Getting documentation
-
-(define-syntax only-doc-out
-  (make-provide-pre-transformer
-   (λ (stx modes)
-     (syntax-case stx ()
-       [(_ provide-spec)
-        (pre-expand-export
-         (syntax/loc stx
-           (matching-identifiers-out #rx".*:doc$" provide-spec))
-         modes)]))))
-
-;; Applies the documentation transformer (use within a scribble/manual module)
-(define-syntax (doc-apply stx)
-  (syntax-parse stx
-    [(_ name:id . pre-flows)
-     (with-syntax ([name:doc  (format-id #'name "~a:doc" #'name)])
-       (syntax-protect
-        (syntax/loc stx (name:doc . pre-flows))))]))
diff --git a/pkgs/unstable-latent-contract-lib/unstable/latent-contract/serialize-syntax.rkt b/pkgs/unstable-latent-contract-lib/unstable/latent-contract/serialize-syntax.rkt
deleted file mode 100644
index 28520583eb..0000000000
--- a/pkgs/unstable-latent-contract-lib/unstable/latent-contract/serialize-syntax.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang racket/base
-
-;; Serialize and unserialize syntax objects
-
-;; Serializing doesn't store lexical information, so unserializing requires an extra piece of
-;; information: the new lexical context. Therefore, 'unserialize' acts a lot like 'replace-context'.
-
-;; Serializing also doesn't store ALL the syntax properties - just the ones with symbol keys.
-
-(require racket/match)
-
-(provide serialize-syntax unserialize-syntax)
-
-;; serialize-props : syntax -> (listof (cons symbol value))
-;; Serializes the properties of a syntax object.
-(define (serialize-props stx)
-  (map (λ (key) (cons key (syntax-property stx key)))
-       (syntax-property-symbol-keys stx)))
-
-;; unserialize-props : syntax (listof (cons symbol value)) -> syntax
-;; Unserializes properties; returns a new syntax object that is like the old but with the properties.
-(define (unserialize-props stx props)
-  (for/fold ([stx stx]) ([kv  (in-list props)])
-    (match-define (cons key v) kv)
-    (syntax-property stx key v)))
-
-;; serialize-loc : syntax -> list
-;; Serializes the source location of a syntax object, as a list. This is one of the formats that
-;; datum->syntax accepts as a source location, so there is no need for unserialize-loc.
-(define (serialize-loc stx)
-  (list (syntax-source stx)
-        (syntax-line stx)
-        (syntax-column stx)
-        (syntax-position stx)
-        (syntax-span stx)))
-
-;; serialize-syntax : syntax -> list
-;; Serializes a syntax object.
-(define (serialize-syntax e)
-  (cond
-    [(syntax? e)  (list 'syntax
-                        (serialize-syntax (syntax-e e))
-                        (serialize-loc e)
-                        (serialize-props e))]
-    [(pair? e)    (list 'pair (serialize-syntax (car e)) (serialize-syntax (cdr e)))]
-    [(vector? e)  (list 'vector (serialize-syntax (vector->list e)))]
-    [(box? e)     (list 'box (serialize-syntax (unbox e)))]
-    [(prefab-struct-key e) => (λ (k) (list 'struct k (serialize-syntax (struct->vector e))))]
-    [else         (list 'datum e)]))
-
-;; unserialize-syntax : syntax list -> syntax
-;; Unserializes a syntax object, and associates with each part of it the given context.
-(define (unserialize-syntax ctx lst)
-  (let loop ([lst lst])
-    ;(printf "lst = ~v~n" lst)
-    (match lst
-      [(list 'syntax lst loc props)  (unserialize-props (datum->syntax ctx (loop lst) loc) props)]
-      [(list 'pair lst1 lst2)        (cons (loop lst1) (loop lst2))]
-      [(list 'vector lst)            (list->vector (loop lst))]
-      [(list 'box lst)               (box (loop lst))]
-      [(list 'struct k lst)          (apply make-prefab-struct k (loop lst))]
-      [(list 'datum e)               e])))
diff --git a/pkgs/unstable-list-lib/LICENSE.txt b/pkgs/unstable-list-lib/LICENSE.txt
deleted file mode 100644
index c5e457960c..0000000000
--- a/pkgs/unstable-list-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-list-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-list-lib/info.rkt b/pkgs/unstable-list-lib/info.rkt
deleted file mode 100644
index 9ac84d05b8..0000000000
--- a/pkgs/unstable-list-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "Experimental libraries for list operations")
-
-(define pkg-authors '(ryanc samth))
diff --git a/pkgs/unstable-list-lib/unstable/bytes.rkt b/pkgs/unstable-list-lib/unstable/bytes.rkt
deleted file mode 100644
index ecb1264d57..0000000000
--- a/pkgs/unstable-list-lib/unstable/bytes.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-(require racket/contract/base)
-
-(provide/contract
- [read/bytes (bytes? . -> . printable/c)]
- [write/bytes (printable/c . -> . bytes?)])
-
-(define (read/bytes bs)
-  (read (open-input-bytes bs)))
-;; Eli: This is a really bad name for something that is often called
-;;   `read-from-string', or `read-from-bytes' in this case.  I first read it as
-;;   "read with bytes".  Regardless, I see little point in composing two
-;;   functions where the two names are clear enough -- you might consider
-;;   looking at the version in CL.
-;; Ryan: I agree. More useful would be a version that checked that the
-;; bytes contains only one S-expr and errors otherwise.
-
-(define (write/bytes v)
-  (define by (open-output-bytes))
-  (write v by)
-  (get-output-bytes by))
-;; Eli: Same bad name as above.  Also, is there any point in this given
-;;   (format "~s" v), and the fact that using the resulting string for printout
-;;   will get the same result.
diff --git a/pkgs/unstable-list-lib/unstable/class-iop.rkt b/pkgs/unstable-list-lib/unstable/class-iop.rkt
deleted file mode 100644
index 69663d1fbd..0000000000
--- a/pkgs/unstable-list-lib/unstable/class-iop.rkt
+++ /dev/null
@@ -1,224 +0,0 @@
-#lang racket/base
-;; owner: ryanc
-(require racket/class
-         (for-syntax racket/base
-                     syntax/parse
-                     racket/syntax
-                     "private/class-iop-ct.rkt"))
-(provide define-interface
-         define-interface/dynamic
-         define-interface-expander
-
-         (rename-out [send: send/i]
-                     [send*: send*/i]
-                     [send/apply: send/apply/i]
-
-                     [define: define/i]
-                     #| lambda: |#
-
-                     [init: init/i]
-                     [init-field: init-field/i]
-                     [init-private: init-private/i]))
-
-;; Configuration
-(define-for-syntax warn-on-dynamic-interfaces? #f)
-(define-for-syntax warn-on-dynamic-object-check-generation? #f)
-(define-for-syntax define-dotted-names #f)
-
-;; define-interface SYNTAX
-;; (define-interface NAME (IDENTIFIER ...))
-;; Defines NAME as an interface.
-(define-syntax (define-interface stx)
-  (syntax-parse stx
-    [(_ name:id (super:static-interface ...) (m:method-entry ...))
-     (with-syntax ([((super-method ...) ...)
-                    (map static-interface-members (attribute super.value))])
-       #'(define-interface/dynamic name
-           (let ([name (interface (super ...) m.method ... ...)]) name)
-           (super-method ... ... m.method ... ...)))]))
-
-;; define-interface/dynamic SYNTAX
-;; (define-interface/dynamic NAME EXPR (IDENTIFIER ...))
-;; Defines NAME as a static interface containing the names listed.
-;; The EXPR is used as the dynamic componenent of the interface, and 
-;; it should contain a superset of the names listed.
-(define-syntax (define-interface/dynamic stx)
-  (syntax-parse stx
-    [(_ name:id dynamic-interface:expr (mname:id ...))
-     (with-syntax ([(dynamic-name) (generate-temporaries #'(name))])
-       #'(begin (define dynamic-name
-                  (let ([dynamic-name dynamic-interface])
-                    (for-each 
-                     (lambda (m)
-                       (unless (method-in-interface? m dynamic-name)
-                         (error 'name "dynamic interface missing method '~s'" m)))
-                     '(mname ...))
-                    dynamic-name))
-                (define-syntax name
-                  (make-static-interface #'dynamic-name '(mname ...)))))]))
-
-(define-syntax (define-interface-expander stx)
-  (syntax-parse stx
-    [(_ name:id rhs:expr)
-     #'(define-syntax name (make-interface-expander rhs))]))
-
-;; Helper
-
-(begin-for-syntax
-  (define (check-method-in-interface for-whom method si)
-    (unless (member (syntax-e method) (static-interface-members si))
-      (raise-syntax-error (syntax-e for-whom)
-                          "method not in static interface"
-                          method))))
-
-;; Checked send
-
-(define-syntax (send: stx)
-  (syntax-parse stx
-    [(send: obj:expr iface:static-interface method:id . args)
-     (begin (check-method-in-interface #'send: #'method (attribute iface.value))
-            (syntax/loc stx
-              (send (check-object<:interface send: obj iface)
-                    method . args)))]))
-
-(define-syntax (send*: stx)
-  (syntax-parse stx
-    [(send*: obj:expr iface:static-interface (method:id . args) ...)
-     (begin (for ([method (syntax->list #'(method ...))])
-              (check-method-in-interface #'send*: method (attribute iface.value)))
-            (syntax/loc stx 
-              (send* (check-object<:interface send*: obj iface)
-                (method . args) ...)))]))
-
-(define-syntax (send/apply: stx)
-  (syntax-parse stx
-    [(send/apply: obj:expr iface:static-interface method:id . args)
-     (begin (check-method-in-interface #'send/apply: #'method (attribute iface.value))
-            (syntax/loc stx 
-              (send/apply (check-object<:interface send/apply: obj iface)
-                          method . args)))]))
-
-;;
-
-;; check-object<:interface SYNTAX
-(define-syntax (check-object<:interface stx)
-  (syntax-parse stx
-    [(_ for-whom obj:checked-binding iface:static-interface)
-     (if (eq? (checked-binding-iface (attribute obj.value)) (attribute iface.value))
-         #'obj
-         (syntax/loc stx
-           (check-object<:interface for-whom
-                                    (#%expression obj)
-                                    (#%expression iface))))]
-    [(_ for-whom obj:expr iface:expr)
-     (begin
-       (when warn-on-dynamic-object-check-generation?
-         (printf "dynamic object check: ~s,~s\n"
-                 (syntax-source #'obj)
-                 (syntax-line #'obj)))
-       #'(dynamic:check-object<:interface 'for-whom obj iface))]))
-
-(define (dynamic:check-object<:interface for-whom obj iface)
-  (unless (is-a? obj iface)
-    (error for-whom "interface check failed on: ~e" obj))
-  obj)
-
-;;
-
-(define-syntax (define: stx)
-  (syntax-parse stx
-    [(_ name:id iface:static-interface expr)
-     (let ([si (attribute iface.value)])
-       (with-syntax ([(name-internal) (generate-temporaries #'(name))]
-                     [(method ...) (static-interface-members si)]
-                     [(name.method ...)
-                      (map (lambda (m)
-                             (format-id #'name "~a.~a" (syntax-e #'name) m))
-                           (static-interface-members si))])
-         #`(begin (define name-internal
-                    (check-object<:interface define: expr iface))
-                  (define-syntax name
-                    (make-checked-binding
-                     #'name-internal
-                     (syntax-local-value #'iface)))
-                  #,(if define-dotted-names
-                        #'(begin
-                            (define-syntax name.method
-                              (syntax-rules ()
-                                [(name.method . args)
-                                 (send: name iface method . args)]))
-                            ...)
-                        #'(begin)))))]
-    [(_ (f:id . args) . body)
-     #'(define f (lambda: args . body))]))
-
-(define-syntax (lambda: stx)
-  ;; FIXME: rewrite as stxclass
-  (define (arg->define stx temp)
-    (syntax-case stx ()
-      [(arg : iface)
-       (and (identifier? #'arg)
-            (eq? ': (syntax-e #':)))
-       #`(define: arg iface #,temp)]
-      [arg
-       (identifier? #'arg)
-       #`(define-syntax arg (make-rename-transformer #'#,temp))]))
-  (syntax-parse stx
-    [(_ (arg ...) . body)
-     (let ([temporaries (generate-temporaries #'(arg ...))])
-       (with-syntax ([(temp ...) temporaries]
-                     [(checked-definition ...)
-                      (map arg->define
-                           (syntax->list #'(arg ...))
-                           temporaries)])
-         #'(lambda (temp ...)
-             (let ()
-               checked-definition ...
-               (let () . body)))))]))
-
-
-;; FIXME: unsafe due to mutation
-(define-syntax (init-field: stx)
-  (syntax-parse stx
-    [(_ (name:id iface:static-interface . default) ...)
-     #'(begin (init1: init-field name iface . default) ...)]))
-
-(define-syntax (init: stx)
-  (syntax-parse stx
-    [(_ (name:id iface:static-interface . default) ...)
-     #'(begin (init1: init name iface . default) ...)]))
-
-(define-syntax (init1: stx)
-  (syntax-parse stx
-    [(_ init name:id iface:static-interface . default)
-     (with-syntax ([(name-internal) (generate-temporaries #'(name))])
-       #'(begin (init ((name-internal name) . default))
-                (void (check-object<:interface init: name-internal iface))
-                (define-syntax name 
-                  (make-checked-binding
-                   #'name-internal
-                   (syntax-local-value #'iface)))))]))
-
-(define-syntax (init-private stx)
-  (syntax-parse stx
-    [(init-private form ...)
-     #'(begin (init-private1 form) ...)]))
-
-(define-syntax (init-private1 stx)
-  (syntax-parse stx
-    [(init-private1 id:id)
-     (with-syntax ([(id-internal) (generate-temporaries #'(id))])
-       #'(begin (init (id-internal id))
-                (define id id-internal)))]))
-
-(define-syntax (init-private: stx)
-  (syntax-parse stx
-    [(_ (name:id iface:static-interface) ...)
-     #'(begin (init-private1: name iface) ...)]))
-
-(define-syntax (init-private1: stx)
-  (syntax-parse stx
-    [(_ name:id iface:static-interface)
-     (with-syntax ([(id-internal) (generate-temporaries #'(id))])
-       #'(begin (init (id-internal name))
-                (define: name iface id-internal)))]))
diff --git a/pkgs/unstable-list-lib/unstable/function.rkt b/pkgs/unstable-list-lib/unstable/function.rkt
deleted file mode 100644
index 1f6fcbef24..0000000000
--- a/pkgs/unstable-list-lib/unstable/function.rkt
+++ /dev/null
@@ -1,131 +0,0 @@
-#lang racket/base
-(require racket/match
-         (for-syntax racket/base racket/list))
-(provide conjoin
-         disjoin)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Higher-Order Boolean Operations
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; ryanc: adjusted limit of inner cases from 8 to 2
-;; All uses so far seem to be predicates, so more cases seem
-;; unnecessary. Also, all uses so far are first-order, so
-;; outer case-lambda* might be better replaced with macro.
-
-(define conjoin
-  (case-lambda*
-   [(f ... 8)
-    (make-intermediate-procedure
-     'conjoined
-      [(x (... ...) 2) (and (f x (... ...)) ...)]
-      [xs (and (apply f xs) ...)]
-      #:keyword
-      [(keys vals . args)
-       (and (keyword-apply f keys vals args) ...)])]
-   [fs
-    (make-intermediate-procedure
-     'conjoined
-     [(x ... 2) (andmap (lambda (f) (f x ...)) fs)]
-     [xs (andmap (lambda (f) (apply f xs)) fs)]
-     #:keyword
-     [(keys vals . args)
-      (andmap (lambda (f) (keyword-apply f keys vals args)) fs)])]))
-
-(define disjoin
-  (case-lambda*
-   [(f ... 8)
-    (make-intermediate-procedure
-     'disjoined
-      [(x (... ...) 2) (or (f x (... ...)) ...)]
-      [xs (or (apply f xs) ...)]
-      #:keyword
-      [(keys vals . args)
-       (or (keyword-apply f keys vals args) ...)])]
-   [fs
-    (make-intermediate-procedure
-     'disjoined
-     [(x ... 2) (ormap (lambda (f) (f x ...)) fs)]
-     [xs (ormap (lambda (f) (apply f xs)) fs)]
-     #:keyword
-     [(keys vals . args)
-      (ormap (lambda (f) (keyword-apply f keys vals args)) fs)])]))
-
-(define-syntax (make-intermediate-procedure stx)
-  (syntax-case stx [quote]
-    [(_ (quote name) positional-clause ... #:keyword keyword-clause)
-     (syntax/loc stx
-       (make-keyword-procedure
-        (let* ([name (case-lambda keyword-clause)]) name)
-        (let* ([name (case-lambda* positional-clause ...)]) name)))]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Automatic case-lambda repetition
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-for-syntax (split-syntax-at orig stx id)
-  (let loop ([found #f]
-             [seen null]
-             [stx stx])
-    (syntax-case stx []
-      [(head . tail)
-       (and (identifier? #'head)
-            (free-identifier=? #'head id))
-       (if found
-           (raise-syntax-error
-            #f
-            (format "duplicate occurrence of ~a" (syntax-e id))
-            orig
-            #'head)
-           (loop (list (reverse seen) #'head #'tail)
-                 (cons #'head seen)
-                 #'tail))]
-      [(head . tail) (loop found (cons #'head seen) #'tail)]
-      [_ found])))
-
-(define-for-syntax (expand-ellipsis-clause stx pattern expr)
-  (cond
-   [(split-syntax-at stx pattern #'(... ...))
-    =>
-    (lambda (found)
-      (syntax-case found [...]
-        [([pre ... repeat] (... ...) [count post ... . tail])
-         (and (identifier? #'repeat)
-              (exact-nonnegative-integer? (syntax-e #'count)))
-         (build-list
-          (add1 (syntax-e #'count))
-          (lambda (i)
-            (with-syntax ([(var ...)
-                           (generate-temporaries
-                            (build-list i (lambda (j) #'repeat)))]
-                          [body expr])
-              (list
-               (syntax/loc pattern (pre ... var ... post ... . tail))
-               (syntax/loc expr
-                 (let-syntax ([the-body
-                               (lambda _
-                                 (with-syntax ([(repeat (... ...)) #'(var ...)])
-                                   #'body))])
-                   the-body))))))]
-        [(pre mid post)
-         (raise-syntax-error
-          #f
-          "expected ellipsis between identifier and natural number literal"
-          stx
-          #'mid)]))]
-   [else (list (list pattern expr))]))
-
-(define-syntax (case-lambda* stx)
-  (syntax-case stx []
-    [(_ [pattern body] ...)
-     (with-syntax ([([pattern body] ...)
-                    (append-map
-                     (lambda (p e) (expand-ellipsis-clause stx p e))
-                     (syntax->list #'(pattern ...))
-                     (syntax->list #'(body ...)))])
-       (syntax/loc stx
-         (case-lambda [pattern body] ...)))]))
diff --git a/pkgs/unstable-list-lib/unstable/hash.rkt b/pkgs/unstable-list-lib/unstable/hash.rkt
deleted file mode 100644
index e4a6f5e2b1..0000000000
--- a/pkgs/unstable-list-lib/unstable/hash.rkt
+++ /dev/null
@@ -1,53 +0,0 @@
-#lang racket/base
-(require racket/contract/base)
-
-;; Eli: See comment for `dict-union' and `dict-union!' -- these two do
-;; make sense, but if they're in, then generalizing them to dictionaries
-;; seems to make little sense.  If they are useful, I'd much rather see
-;; a more direct connection -- for example, make the dict functions
-;; convert all dicts to hashes and then union them -- this will also
-;; make the performance cost more obvious (and will actually be faster
-;; in most cases of non-hash dictionaries).
-
-(define ((hash-duplicate-error name) key value1 value2)
-  (error name "duplicate values for key ~e: ~e and ~e" key value1 value2))
-
-(define (hash-union
-         #:combine [combine #f]
-         #:combine/key [combine/key
-                        (if combine
-                          (lambda (k x y) (combine x y))
-                          (hash-duplicate-error 'hash-union))]
-         one . rest)
-  (for*/fold ([one one]) ([two (in-list rest)] [(k v) (in-hash two)])
-    (hash-set one k (if (hash-has-key? one k)
-                        (combine/key k (hash-ref one k) v)
-                        v))))
-
-(define (hash-union!
-         #:combine [combine #f]
-         #:combine/key [combine/key
-                        (if combine
-                          (lambda (k x y) (combine x y))
-                          (hash-duplicate-error 'hash-union))]
-         one . rest)
-  (for* ([two (in-list rest)] [(k v) (in-hash two)])
-    (hash-set! one k (if (hash-has-key? one k)
-                         (combine/key k (hash-ref one k) v)
-                         v))))
-
-(provide/contract
- [hash-union (->* [(and/c hash? immutable?)]
-                  [#:combine
-                   (-> any/c any/c any/c)
-                   #:combine/key
-                   (-> any/c any/c any/c any/c)]
-                  #:rest (listof hash?)
-                  (and/c hash? immutable?))]
- [hash-union! (->* [(and/c hash? (not/c immutable?))]
-                   [#:combine
-                   (-> any/c any/c any/c)
-                   #:combine/key
-                   (-> any/c any/c any/c any/c)]
-                   #:rest (listof hash?)
-                   void?)])
diff --git a/pkgs/unstable-list-lib/unstable/list.rkt b/pkgs/unstable-list-lib/unstable/list.rkt
deleted file mode 100644
index 2d79d6f339..0000000000
--- a/pkgs/unstable-list-lib/unstable/list.rkt
+++ /dev/null
@@ -1,215 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         racket/dict
-         (for-syntax racket/base))
-
-; list-prefix? : list? list? -> boolean?
-; Is l a prefix or r?
-(define (list-prefix? ls rs)
-  (or (null? ls)
-      (and (pair? rs)
-           (equal? (car ls) (car rs))
-           (list-prefix? (cdr ls) (cdr rs)))))
-
-;; Eli: How about a version that removes the equal prefix from two lists
-;; and returns the tails -- this way you can tell if they're equal, or
-;; one is a prefix of the other, or if there was any equal prefix at
-;; all.  (Which can be useful for things like making a path relative to
-;; another path.)  A nice generalization is to make it get two or more
-;; lists, and return a matching number of values.
-
-(define (internal-split-common-prefix as bs same? keep-prefix?)
-  (let loop ([as as] [bs bs])
-    (if (and (pair? as) (pair? bs) (same? (car as) (car bs)))
-        (let-values ([(prefix atail btail) (loop (cdr as) (cdr bs))])
-          (values (and keep-prefix? (cons (car as) prefix)) atail btail))
-        (values null as bs))))
-
-(define (split-common-prefix as bs #:same? [same? equal?])
-  (internal-split-common-prefix as bs same? #t))
-
-(define (take-common-prefix as bs #:same? [same? equal?])
-  (let-values ([(prefix atail btail) (internal-split-common-prefix as bs same? #t)])
-    prefix))
-
-(define (drop-common-prefix as bs #:same? [same? equal?])
-  (let-values ([(prefix atail btail) (internal-split-common-prefix as bs same? #f)])
-    (values atail btail)))
-
-(provide/contract
- [list-prefix? (list? list? . -> . boolean?)]
- [split-common-prefix
-  (->* (any/c any/c) (#:same? procedure?) (values list? any/c any/c))]
- [take-common-prefix
-  (->* (any/c any/c) (#:same? procedure?) list?)]
- [drop-common-prefix
-  (->* (any/c any/c) (#:same? procedure?) (values any/c any/c))])
-
-
-(define (filter-multiple l . fs)
-  (apply values
-         (map (lambda (f) (filter f l)) fs)))
-
-;; Listof[A] Listof[B] B -> Listof[B]
-;; pads out t to be as long as s
-(define (extend s t extra)
-  (append t (build-list (max 0 (- (length s) (length t))) (lambda _ extra))))
-
-(provide filter-multiple extend)
-
-;; ryanc added:
-
-(provide/contract
- [check-duplicate
-  (->* (list?)
-       (#:key (-> any/c any/c)
-        #:same? (or/c dict? (-> any/c any/c any/c)))
-       any)])
-
-;; check-duplicate : (listof X)
-;;                   #:key (X -> K)
-;;                   #:same? (or/c (K K -> bool) dict?)
-;;                -> X or #f
-(define (check-duplicate items
-                        #:key [key values]
-                        #:same? [same? equal?])
-  (cond [(procedure? same?)
-         (cond [(eq? same? equal?)
-                (check-duplicate/t items key (make-hash) #t)]
-               [(eq? same? eq?)
-                (check-duplicate/t items key (make-hasheq) #t)]
-               [(eq? same? eqv?)
-                (check-duplicate/t items key (make-hasheqv) #t)]
-               [else
-                (check-duplicate/list items key same?)])]
-        [(dict? same?)
-         (let ([dict same?])
-           (if (dict-mutable? dict)
-               (check-duplicate/t items key dict #t)
-               (check-duplicate/t items key dict #f)))]))
-(define (check-duplicate/t items key table mutating?)
-  (let loop ([items items] [table table])
-    (and (pair? items)
-         (let ([key-item (key (car items))])
-           (if (dict-ref table key-item #f)
-               (car items)
-               (loop (cdr items) (if mutating?
-                                     (begin (dict-set! table key-item #t) table)
-                                     (dict-set table key-item #t))))))))
-(define (check-duplicate/list items key same?)
-  (let loop ([items items] [sofar null])
-    (and (pair? items)
-         (let ([key-item (key (car items))])
-           (if (for/or ([prev (in-list sofar)])
-                 (same? key-item prev))
-               (car items)
-               (loop (cdr items) (cons key-item sofar)))))))
-
-;; Eli: Just to have a record of this: my complaint about having this
-;; code separately from `remove-duplicates' still stands.  Specifically,
-;; that function decides when to use a hash table to make things faster,
-;; and this code would benefit from the same.  It would be much better
-;; to extend that function so it can be used for both tasks rather than
-;; a new piece of code that does it (only do it in a worse way, re
-;; performance).  Doing this can also benefit `remove-duplicates' -- for
-;; example, make it accept a container so that users can choose how
-;; when/if to use a hash table.
-
-;; sam added from carl
-
-(define-syntax (values->list stx)
-  (syntax-case stx ()
-    [(vl expr)
-     (syntax/loc stx
-       (call-with-values (lambda () expr) list))]))
-
-(define (map/list n f ls)
-  (cond
-   [(andmap null? ls) (build-list n (lambda (i) null))]
-   [(andmap pair? ls)
-    (let* ([vs (values->list (apply f (map car ls)))]
-           [k (length vs)])
-      (unless (= k n)
-        (error 'map/values
-               "~a produced ~a values, not ~a: ~e"
-               f k n vs))
-      (map cons vs (map/list n f (map cdr ls))))]
-   [else (error 'map/values "list lengths differ")]))
-
-(define (map/values n f . ls)
-  (apply values (map/list n f ls)))
-
-(define (map2 f . ls)
-  (apply values (map/list 2 f ls)))
-
-(provide map2 map/values)
-
-;; dvanhorn added:
-
-(define (remf f ls)
-  (cond [(null? ls) '()]
-        [(f (car ls)) (cdr ls)]
-        [else 
-         (cons (car ls)
-               (remf f (cdr ls)))]))
-
-(provide/contract [remf (-> procedure? list? list?)])
-
-
-;; stamourv added:
-
-;; (x -> y) (listof x) [(y y -> bool)] -> (listof (listof x))
-;; groups together elements that are considered equal
-;; =? should be reflexive, transitive and commutative
-(define (group-by key l [=? equal?])
-  (define classes
-    (for/fold ([res '()]) ; list of lists
-        ([elt (in-list l)])
-      (let loop ([classes     res] ; "zipper" of the equivalence classes
-                 [rev-classes '()])
-        (cond [(null? classes)
-               ;; did not find an equivalence class, create a new one
-               (cons (list elt) res)]
-              [(=? (key elt) (key (car (car classes))))
-               ;; found the equivalence class
-               (append rev-classes ; we keep what we skipped
-                       ;; we extend the current class
-                       (list (cons elt (car classes)))
-                       (cdr classes))] ; and add the rest
-              [else ; keep going
-               (loop (cdr classes)
-                     (cons (car classes) rev-classes))]))))
-  ;; reverse each class, so that group-by is stable
-  (map reverse classes))
-
-;; (listof x) ... -> (listof (listof x))
-(define (cartesian-product . ls)
-  (define (cp-2 as bs)
-    (for*/list ([i (in-list as)] [j (in-list bs)]) (cons i j)))
-  (foldr cp-2 (list (list)) ls))
-
-
-(provide/contract
- [group-by (->* (procedure? list?) (procedure?)
-                list?)]
- [cartesian-product (->* () #:rest any/c (listof (listof any/c)))])
-
-;; endobson added:
-
-(define (list-update l i f)
-  (cond
-    [(zero? i) (cons (f (car l)) (cdr l))]
-    [else (cons (car l) (list-update (cdr l) (sub1 i) f))]))
-
-(define (list-set l k v)
-  (list-update l k (lambda (_) v)))
-
-(provide/contract
- [list-update (->i [(list list?)
-                    (index (list) (and/c (>=/c 0) (</c (length list))))
-                    (updater (-> any/c any/c))]
-                   [_ list?])]
- [list-set  (->i [(list list?)
-                  (index (list) (and/c (>=/c 0) (</c (length list))))
-                  (value any/c)]
-                 [_ list?])])
diff --git a/pkgs/unstable-list-lib/unstable/private/class-iop-ct.rkt b/pkgs/unstable-list-lib/unstable/private/class-iop-ct.rkt
deleted file mode 100644
index fc6c462f01..0000000000
--- a/pkgs/unstable-list-lib/unstable/private/class-iop-ct.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang racket/base
-;; owner: ryanc
-(require (for-template racket/base
-                       racket/class)
-         syntax/parse
-         syntax/stx)
-
-(provide static-interface?
-         make-static-interface
-         static-interface-dynamic
-         static-interface-members
-
-         make-checked-binding
-         checked-binding?
-         checked-binding-dynamic
-         checked-binding-iface
-
-         checked-binding
-         static-interface
-
-         interface-expander?
-         make-interface-expander
-         interface-expander-proc
-
-         interface-expander
-         method-entry)
-
-
-(define-struct static-interface (dynamic members)
-  #:omit-define-syntaxes
-  #:property prop:procedure
-             (lambda (self stx)
-               (syntax-case stx ()
-                 [(ifname . args)
-                  (datum->syntax stx (cons #'(#%expression ifname) #'args) stx)]
-                 [ifname
-                  (identifier? #'ifname)
-                  (static-interface-dynamic self)])))
-
-(define-struct raw-checked-binding (dynamic iface)
-  #:omit-define-syntaxes
-  #:property prop:procedure
-             (lambda (self stx)
-               (syntax-case stx (set!)
-                 [(set! var expr)
-                  #`(let ([newval expr])
-                      (unless (is-a? newval #,(static-interface-dynamic
-                                               (raw-checked-binding-iface self)))
-                        (error 'check "interface check failed on: ~e" newval))
-                      (set! #,(raw-checked-binding-dynamic self) newval))]
-                 [(var . args)
-                  (datum->syntax stx (cons #'(#%expression var) #'args) stx)]
-                 [var
-                  (identifier? #'var)
-                  (raw-checked-binding-dynamic self)]
-                 [else
-                  (raise-syntax-error #f "oops" stx)])))
-
-(define (make-checked-binding dynamic iface)
-  (make-set!-transformer
-   (make-raw-checked-binding dynamic iface)))
-
-(define (checked-binding? x)
-  (and (set!-transformer? x)
-       (raw-checked-binding? (set!-transformer-procedure x))))
-
-(define (checked-binding-dynamic x)
-  (raw-checked-binding-dynamic (set!-transformer-procedure x)))
-
-(define (checked-binding-iface x)
-  (raw-checked-binding-iface (set!-transformer-procedure x)))
-
-
-(define-struct interface-expander (proc)
-  #:omit-define-syntaxes)
-
-
-;; Syntax
-
-(define-syntax-class static-interface
-  (pattern x
-           #:declare x (static static-interface? 'static-interface)
-           #:attr value (attribute x.value)))
-
-(define-syntax-class checked-binding
-  (pattern x
-           #:declare x (static checked-binding? 'checked-binding)
-           #:attr value (attribute x.value)))
-
-(define-syntax-class interface-expander
-  (pattern x
-           #:declare x (static interface-expander? 'interface-expander)
-           #:attr value (attribute x.value)))
-
-(define-syntax-class method-entry
-  (pattern m:id
-           #:with (method ...) #'(m))
-  (pattern (macro:interface-expander . args)
-           #:with (method ...)
-                  (with-syntax ([((m ...) ...)
-                                 (for/list ([m (stx->list
-                                                ((interface-expander-proc (attribute macro.value))
-                                                 #'(macro . args)))])
-                                   (syntax-parse m
-                                     [m:method-entry #'(m.method ...)]))])
-                    #'(m ... ...))))
diff --git a/pkgs/unstable-macro-testing-lib/LICENSE.txt b/pkgs/unstable-macro-testing-lib/LICENSE.txt
deleted file mode 100644
index 97455d66ce..0000000000
--- a/pkgs/unstable-macro-testing-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-macro-testing-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-macro-testing-lib/info.rkt b/pkgs/unstable-macro-testing-lib/info.rkt
deleted file mode 100644
index 466fe13423..0000000000
--- a/pkgs/unstable-macro-testing-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "Experimental libraries for testing macros")
-
-(define pkg-authors '(ryanc))
diff --git a/pkgs/unstable-macro-testing-lib/unstable/macro-testing.rkt b/pkgs/unstable-macro-testing-lib/unstable/macro-testing.rkt
deleted file mode 100644
index a953d25947..0000000000
--- a/pkgs/unstable-macro-testing-lib/unstable/macro-testing.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     racket/syntax
-                     syntax/strip-context
-                     syntax/keyword))
-(provide phase1-eval
-         convert-syntax-error
-         convert-compile-time-error)
-
-(begin-for-syntax
- (define (exn->raise-syntax e)
-   (cond [(exn:fail:syntax? e)
-          #`(raise (make-exn:fail:syntax
-                    #,(exn-message e)
-                    (current-continuation-marks)
-                    ;; Lexical context must be stripped to avoid "unsealed local-definition context
-                    ;; found in fully expanded form" error in cases like the following:
-                    ;;   (convert-syntax-error (let () (define x) x))
-                    #,(with-syntax ([(expr ...) (map strip-context (exn:fail:syntax-exprs e))])
-                        #'(list (quote-syntax expr) ...))))]
-         [(exn? e)
-          (with-syntax ([make-exn
-                         (cond [(exn:fail? e) #'make-exn:fail]
-                               [else #'make-exn])])
-            #`(raise (make-exn #,(exn-message e)
-                               (current-continuation-marks))))]
-         [else
-          #`(raise (make-exn #,(format "non-exception value raised: ~e" e)
-                             (current-continuation-marks)))])))
-
-(define-syntax (phase1-eval stx)
-  (if (eq? (syntax-local-context) 'expression)
-      (syntax-case stx ()
-        [(phase1-eval ct-expr . options)
-         (let ()
-           (define opts (parse-keyword-options/eol
-                         #'options
-                         `((#:quote  ,check-identifier)
-                           (#:catch? ,check-stx-boolean))
-                         #:no-duplicates? #t
-                         #:context stx))
-           (define quote-form (options-select-value opts '#:quote #:default #'quote))
-           (define catch? (options-select-value opts '#:catch? #:default #t))
-           (with-handlers ([(lambda (e) catch?) exn->raise-syntax])
-             (with-syntax ([quote quote-form]
-                           [result (syntax-local-eval #'ct-expr)])
-               #'(quote result)))
-           #|
-           ;; Alternative version
-           (with-syntax ([quote-form quote-form]
-                         [catch? catch?])
-             #'(let-syntax ([aux-macro
-                             (lambda _
-                               (with-handlers ([(lambda (e) catch?) exn->raise-syntax])
-                                 (with-syntax ([result ct-expr])
-                                   ;; want syntax-local-introduce ?
-                                   #'(quote-form result))))])
-                 (aux-macro)))
-           |#)])
-      #`(#%expression #,stx)))
-
-(begin-for-syntax
- (define (do-convert-ct-error stx exn-pred?)
-   (if (eq? (syntax-local-context) 'expression)
-       (syntax-case stx ()
-         [(_ expr)
-          (with-handlers ([exn-pred? exn->raise-syntax]
-                          [void
-                           (lambda (e)
-                             (eprintf "didn't catch ~e\n" e)
-                             (raise e))])
-            (local-expand #'expr 'expression null))])
-       #`(#%expression #,stx))))
-
-(define-syntax (convert-syntax-error stx)
-  (parameterize ((error-print-source-location #f))
-    (do-convert-ct-error stx exn:fail:syntax?)))
-
-(define-syntax (convert-compile-time-error stx)
-  (do-convert-ct-error stx (lambda (e) #t)))
diff --git a/pkgs/unstable-options-lib/LICENSE.txt b/pkgs/unstable-options-lib/LICENSE.txt
deleted file mode 100644
index 1783bc177f..0000000000
--- a/pkgs/unstable-options-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-options-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-options-lib/info.rkt b/pkgs/unstable-options-lib/info.rkt
deleted file mode 100644
index 7a39d4b7e3..0000000000
--- a/pkgs/unstable-options-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "Experimental libraries for option contracts")
-
-(define pkg-authors '(chrdimo robby))
diff --git a/pkgs/unstable-options-lib/unstable/options.rkt b/pkgs/unstable-options-lib/unstable/options.rkt
deleted file mode 100644
index b1c0779b48..0000000000
--- a/pkgs/unstable-options-lib/unstable/options.rkt
+++ /dev/null
@@ -1,544 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/contract/base
-         racket/contract/combinator
-         (for-syntax racket/base))
-
-(provide (rename-out [_option/c option/c])
-         #;transfer-option exercise-option waive-option tweak-option transfer/c
-         has-option? has-option-with-contract?
-         invariant/c)
-
-
-(require syntax/location 
-         (for-syntax racket/provide-transform)
-         (for-syntax racket/list)
-         (for-syntax racket/struct-info))
-
-(define-for-syntax (get-struct-info id who)
-  (cond
-    [(and (identifier? id)
-          (struct-info? (syntax-local-value id (λ () #f))))
-     (let ([si (extract-struct-info (syntax-local-value id))])  
-       (with-syntax ([id id]
-                     [pred (third si)] 
-                     [(accessor ...) (fourth si)]
-                     [(mutator ...) (fifth si)])
-         #'(list pred (list accessor ...) (list mutator ...) 'id)))]
-    [else
-     (raise-syntax-error who "expected a struct identifier" id)]))
-
-
-(define-for-syntax (convert-args args this-one who) 
-  (let loop ([args args]
-             [new-args null])
-    (cond
-      [(null? args) (reverse new-args)]
-      [(keyword? (syntax-e (car args)))
-       (if (null? (cdr args))
-           (reverse (cons (car args) new-args))
-           (cond [(eq? (syntax-e (car args)) '#:struct)
-                  (loop (cddr args)
-                        (list* (get-struct-info (cadr args) who) (car args) new-args))]
-                 [else
-                  (loop (cddr args)
-                        (list* (cadr args) (car args) new-args))]))]
-      [else
-       (loop (cdr args)
-             (cons (syntax-property
-                    (car args)
-                    'racket/contract:positive-position
-                    this-one)
-                   new-args))])))
-
-(define (same-type v s-info)
-  (let ([pred (first s-info)])
-    (and pred (pred v))))
-
-(define (no-mutators? s-info)
-  (if (symbol? s-info) 
-      #t
-      (andmap boolean? (third s-info))))
-
-(struct info (val proj blame with))
-
-(define-values (impersonator-prop:proxy proxy? proxy-info) 
-  (make-impersonator-property 'proxy))
-
-(define (build-wrap-proc val)
-  (let-values ([(arity) (procedure-arity val)]
-               [(rkeys akeys) (procedure-keywords val)])
-    (cond 
-      [(and akeys (empty? akeys))
-       values]
-      [else
-       (make-keyword-procedure
-        (λ (kwds kwd-args . other-args)
-          (apply values kwd-args other-args))
-        (λ args
-          (apply values args)))]))) 
-
-(define (build-proxy with ctc val proj blame)
-  (let* ([proxy-info (info val proj blame with)]
-         [ival
-          (cond [(procedure? val)
-                 (chaperone-procedure
-                  val
-                  (build-wrap-proc val)
-                  impersonator-prop:contracted ctc
-                  impersonator-prop:proxy proxy-info)]
-                [(vector? val)
-                 (chaperone-vector
-                  val
-                  (λ (v i val) val)
-                  (λ (v i val) val)
-                  impersonator-prop:contracted ctc
-                  impersonator-prop:proxy proxy-info)]
-                [(hash? val)
-                 (chaperone-hash
-                  val
-                  (λ (h k) (values k (λ (h k v) v)))
-                  (λ (h k v) (values k v))
-                  (λ (h k) k)
-                  (λ (h k) k)
-                  impersonator-prop:contracted ctc
-                  impersonator-prop:proxy proxy-info)]
-                [else 
-                 (chaperone-struct
-                  val
-                  (first (second (option-structid ctc)))
-                  (λ (v f) f)
-                  impersonator-prop:contracted ctc
-                  impersonator-prop:proxy proxy-info)])])
-    (cond [with ((proj blame) ival)]
-          [else ival])))
-
-
-(define (run-tester tester val orig-proj blame here)
-  (let ([indy-blame (blame-replace-negative blame here)]
-        [option-blame
-         (λ (blame context)
-           (blame-add-context blame context))])  
-    (unless (tester ((orig-proj indy-blame) val))
-      (raise-blame-error 
-       (option-blame indy-blame (format "option contract tester ~e of" tester)) 
-       val
-       ""))))
-
-
-(define (optionc-name c)
-  (apply build-compound-type-name 'option/c 
-         (contract-name (option-orig-ctc c))
-         (append 
-          (if (option-with c)
-              (list '#:with-contract #t)
-              null)
-          (if (eq? (option-tester c) 'dont-care)
-              null
-              (list '#:tester (option-tester c)))
-          (if (eq? (option-flat c) #f)
-              null
-              (list '#:flat? #t))
-          (if (eq? (option-immutable c) 'dont-care)
-              null
-              (list '#:immutable (option-immutable c)))
-          (if (eq? (option-invariant c) 'dont-care)
-              null
-              (list '#:invariant (option-invariant c)))
-          (if (eq? (option-structid c) 'none)
-              null
-              (list '#:struct (fourth (option-structid c)))))))
-
-(define (check-option structid invariant flat immutable val blame) 
-    (when (and (eq? invariant 'dont-care)
-               (or  (not (eq? immutable 'dont-care))
-                    (not (eq? flat #f))))
-      (raise-blame-error 
-       blame
-       val
-       '(expected "an invariant keyword argument (based on presence of other keyword arguments)")))
-    (unless (or (and (procedure? val) (not (parameter? val)) (eq? structid 'none))
-                (and (vector? val) (eq? structid 'none))
-                (and (hash? val) (eq? structid 'none))
-                (and (not (eq? structid 'none)) (same-type val structid)))
-      (if (eq? structid 'none)
-          (raise-blame-error blame val '(expected "a procedure or a vector or a hash" given: "~e")
-                             val)  
-          (raise-blame-error blame val '(expected "a struct of type ~a" given: "~e")
-                             (fourth structid) val))))
-
-
-
-(define (build-orig-proj c inv flat immutable structid here)
-  (cond [(eq? inv 'dont-care) c]
-        [else
-         (invariantc c inv #:struct structid #:flat? flat #:immutable immutable here)]))
-
-(struct option (orig-ctc with tester invariant  flat immutable structid here)
-  #:property prop:contract
-  (build-contract-property
-   #:name 
-   optionc-name
-   #:first-order
-   (λ (ctc)
-     (λ (val)
-       ((contract-first-order (option-orig-ctc ctc)) val)))
-   #:projection
-   (λ (ctc)
-     (let*  ([with (option-with ctc)]
-                 [tester (option-tester ctc)]
-                 [invariant (option-invariant ctc)]
-                 [flat (option-flat ctc)]
-                 [immutable (option-immutable ctc)]
-                 [structid (option-structid ctc)]
-                 [here (option-here ctc)]
-                 [orig-ctc (option-orig-ctc ctc)]
-                 [orig-proj (contract-projection (option-orig-ctc ctc))]
-                 [exec-ctc-proj (contract-projection
-                                 (build-orig-proj orig-ctc invariant flat immutable structid here))])
-       (λ (blame)
-         (λ (val)
-           (check-option structid invariant flat immutable val blame)
-           (unless (symbol? tester)
-             (run-tester tester val orig-proj blame here))
-           (build-proxy with ctc val exec-ctc-proj
-                        (blame-add-context
-                         blame
-                         "the option of"))))))))
-
-(define (option/c ctc
-                  #:with-contract [with #f]
-                  #:tester [tester 'dont-care]
-                  #:invariant [invariant 'dont-care] 
-                  #:flat? [flat #f] 
-                  #:immutable [immutable 'dont-care]
-                  #:struct [structid 'none]
-                  here)
-  (option ctc with tester invariant flat immutable structid here))
-
-
-
-(define-syntax (_option/c stx)
-  (syntax-case stx ()
-    [x
-     (identifier? #'x)
-     (syntax-property
-      (syntax/loc stx option/c)
-      'racket/contract:contract
-      (vector (gensym 'ctc) (list stx) null))]
-    [(optionc arg ...) 
-     (let ([args (syntax->list #'(arg ...))]
-           [this-one (gensym 'option-ctc)])
-       (with-syntax ([(new-arg ...) (convert-args args this-one 'option/c)])
-         (syntax-property
-          (syntax/loc stx
-            (option/c new-arg ... (quote-module-name)))
-          'racket/contract:contract
-          (vector this-one (list #'optionc) null))))]))
-
-
-(struct transferc ()
-  #:property prop:contract
-  (build-contract-property
-   #:projection
-   (λ (ctc)
-     (λ (blame)
-       (λ (val)
-         (let ([s val]
-               [pos-blame (blame-positive blame)]
-               [neg-blame (blame-negative blame)])
-           (cond [(proxy? val)
-                  (let ([info (proxy-info s)])
-                    (build-proxy
-                     (info-with info)
-                     (value-contract s)
-                     (info-val info)
-                     (info-proj info)
-                     (blame-update (info-blame info) pos-blame neg-blame)))]
-                 [else val])))))))
-
-(define/final-prop transfer/c (transferc))
-
-(define (has-option? val)
-  (and (has-contract? val) 
-       (option? (value-contract val))))
-
-(define (has-option-with-contract? val)
-  (and (has-contract? val) 
-       (option? (value-contract val))
-       (info-with (proxy-info val))))
-
-(define (tweak-option val)
-  (cond [(proxy? val)
-         (let ((info (proxy-info val)))
-           (build-proxy
-            (not (info-with info))
-            (value-contract val)
-            (info-val info)
-            (info-proj info)
-            (info-blame info)))]
-        [else val]))
-
-(define (exercise-option val)
-  (cond [(proxy? val)
-         (let ([info (proxy-info val)])
-           (((info-proj info)
-             (info-blame info))
-            (info-val info)))]
-        [else val]))
-
-(define (waive-option val)
-  (cond [(proxy? val) (info-val (proxy-info val))]
-        [else val]))
-
-
-
-;                                                                                                                
-;                                                                                                                
-;                                                                                                                
-;                                                                                                   ;            
-;      ;                                                 ;                                         ;             
-;      ;                                                 ;                           ;             ;             
-;                                                                                    ;            ;              
-;    ;;;      ;; ;;;   ;;;   ;;;    ;;;;    ;;;  ;;    ;;;        ;;;;    ;; ;;;   ;;;;;;;        ;       ;;; ;  
-;      ;       ;;   ;   ;     ;         ;     ;;;        ;            ;    ;;   ;    ;            ;      ;   ;;  
-;      ;       ;    ;   ;    ;          ;     ;          ;            ;    ;    ;    ;           ;      ;     ;  
-;      ;       ;    ;    ;   ;     ;;;;;;     ;          ;       ;;;;;;    ;    ;    ;           ;      ;        
-;      ;       ;    ;     ; ;     ;     ;     ;          ;      ;     ;    ;    ;    ;          ;       ;        
-;      ;       ;    ;     ; ;     ;    ;;     ;          ;      ;    ;;    ;    ;    ;    ;     ;        ;    ;  
-;   ;;;;;;;   ;;;  ;;;    ;;;      ;;;; ;;  ;;;;;;    ;;;;;;;    ;;;; ;;  ;;;  ;;;    ;;;;     ;          ;;;;   
-;                                                                                              ;                 
-;                                                                                                                
-;                                                                                                                
-;                                                                                                                
-;                                                                                                                
-
-
-
-(define-struct invariant-info (ctc invariant structid flat immutable here))
-
-
-
-
-(define (invariantc-name c)
-  (let ([immutable (invariant-info-immutable c)]
-        [flat (invariant-info-flat c)]
-        [invariant (invariant-info-invariant c)]
-        [structid  (invariant-info-structid c)])
-    (apply build-compound-type-name 'invariant/c 
-           (contract-name (invariant-info-ctc c))
-           invariant
-           (append
-            (if (eq? structid 'none)
-                null
-                (list '#:struct (fourth structid)))
-            (if flat
-                (list '#:flat? #t)
-                null)
-            (if (eq? immutable 'dont-care)
-                null
-                (list '#:immutable immutable))))))
-
-
-
-
-
-(define (check-invariant c) 
-  (let ([orig-ctc (invariant-info-ctc c)]
-        [immutable (invariant-info-immutable c)]
-        [invariant (invariant-info-invariant c)]
-        [structid (invariant-info-structid c)])
-    (λ (val fail first-order?)
-      (unless (or (and (vector? val) (eq? structid 'none))
-                  (and (hash? val) (eq? structid 'none))
-                  (and (not (eq? structid 'none)) (same-type val structid)))
-        (if (eq? structid 'none)
-            (fail val '(expected "a vector or a hash" given: "~e") val)  
-            (fail val '(expected "a struct of type ~a" given: "~e") (fourth structid) val)))
-      (cond
-        [(eq? immutable #t)
-         (unless (or (immutable? val) (and (not (symbol? structid)) (no-mutators? structid)))
-           (fail val '(expected "immutable data" given: "~e") val))]
-        [(eq? immutable #f)
-         (when (or (immutable? val) 
-                   (and (not (symbol? structid)) (no-mutators? structid)))
-           (fail val '(expected "mutable data" given: "~e") val))]
-        [else (void)])       
-      (when first-order?
-        (unless (contract-first-order-passes? orig-ctc val)
-          (let ([kind (cond [(vector? val) "vector"]
-                            [(hash? val) "hash"]
-                            [else "struct"])])                            
-            (fail val '(expected: "~s that satisfies ~s" given: "~e") 
-                  kind
-                  (contract-name orig-ctc)
-                  val))))
-      #t)))
-
-(define (invariantc-first-order ctc)
-  (let ([check (check-invariant ctc)])
-    (λ (val)
-      (let/ec return
-        (check val (λ _ (return #f)) #t)))))
-
-(define-struct (immutable-invariantc invariant-info) ()
-  #:property prop:flat-contract
-  (build-flat-contract-property
-   #:name invariantc-name
-   #:first-order invariantc-first-order
-   #:projection 
-   (λ (ctc) 
-     (define check (check-invariant ctc))
-     (λ (blame) 
-       (define raise-blame (λ (val . args) 
-                             (apply raise-blame-error blame val args)))
-       (λ (val)
-         (check val raise-blame #f)
-         (let ([orig-proj (contract-projection (invariant-info-ctc ctc))]
-               [indy-blame  (blame-replace-negative blame (invariant-info-here ctc))]
-               [invariant (invariant-info-invariant ctc)])
-           (unless (invariant ((orig-proj indy-blame) val))
-             (let ([kind (cond [(vector? val) 'vector]
-                               [(hash? val) 'hash]
-                               [else 'struct])])  
-               (raise-blame-error 
-                blame
-                val
-                (format "expected ~s that satisfies ~s given: ~e" kind invariant val))))
-           ((orig-proj blame) val)))))))
-
-
-
-(define (build-inv-proxy ctc val inv proj blame indy-blame impersonate?)
-  (define (run-invariant kind blame) 
-    (unless (inv ((proj indy-blame) val))
-      (raise-blame-error 
-       blame
-       val
-       (format "expected ~s that satisfies ~s given: ~e" kind inv val))))
-  (cond [(vector? val)
-         (let ([vector-wrapper 
-                (λ (wrapper ) 
-                  (wrapper
-                   ((proj blame) val)
-                   (λ (vec i v) (run-invariant 'vector blame) v)
-                   (λ (vec i v) (vector-set! vec i v) (run-invariant 'vector (blame-swap blame)) v)
-                   impersonator-prop:contracted ctc))])
-           (if impersonate? 
-               (vector-wrapper impersonate-vector) 
-               (vector-wrapper chaperone-vector)))]
-        [(hash? val)
-         (let ([hash-wrapper
-                (λ (wrapper) 
-                  (wrapper
-                   ((proj blame) val)
-                   (λ (h k) (run-invariant 'hash blame) (values k (λ (h k v) v)))
-                   (λ (h k v) 
-                     (if (immutable? h) (hash-set h k v) (hash-set! h k v))
-                     (run-invariant 'hash (blame-swap blame)) (values k v))
-                   (λ (h k) 
-                     (if (immutable? h) (hash-remove h k) (hash-remove! h k))
-                     (run-invariant 'hash (blame-swap blame)) k)
-                   (λ (h k) (run-invariant 'hash blame) k)
-                   impersonator-prop:contracted ctc))])
-           (if impersonate? 
-               (hash-wrapper impersonate-hash) 
-               (hash-wrapper chaperone-hash)))]
-        [else
-         (let* ([s-info (invariant-info-structid ctc)]
-                [base-val ((proj blame) val)]
-                [a-wrap (λ (v f) (run-invariant 'struct blame) f)]
-                [m-wrap (λ (m)
-                          (λ (v f) 
-                            (m base-val f) (run-invariant 'struct (blame-swap blame)) f))]
-                [wrapped-accessors (foldr (λ (first rest) 
-                                            (if (procedure? first)
-                                                (list* first a-wrap rest)
-                                                rest))
-                                          '()
-                                          (second s-info))]
-                [wrapped-mutators (foldr (λ (first rest) 
-                                           (if (procedure? first)
-                                               (list* first (m-wrap first) rest)
-                                               rest))
-                                         '()
-                                         (third s-info))]
-                [struct-wrapper
-                 (λ (wrapper) 
-                   (apply
-                    wrapper
-                    base-val
-                    (append wrapped-accessors wrapped-mutators (list impersonator-prop:contracted ctc))))])
-           (if impersonate? 
-               (struct-wrapper impersonate-struct) 
-               (struct-wrapper chaperone-struct)))]))
-
-
-
-(define (invariantc-ho-projection impersonate?)
-  (λ (ctc)
-    (let ([orig-ctc (invariant-info-ctc ctc)]
-          [immutable (invariant-info-immutable ctc)]
-          [check (check-invariant ctc)]
-          [invariant (invariant-info-invariant ctc)]
-          [here (invariant-info-here ctc)])
-      (λ (blame)
-        (let ([indy-blame (blame-replace-negative blame here)]
-              [proj (contract-projection orig-ctc) ]
-              [raise-blame (λ (val . args) 
-                             (apply raise-blame-error blame val args))])
-          (λ (val)
-            (check val raise-blame #f)
-            (unless (invariant (((contract-projection orig-ctc) indy-blame) val))
-              (let ([kind (cond [(vector? val) 'vector]
-                                [(hash? val) 'hash]
-                                [else 'struct])])  
-                (raise-blame-error 
-                 blame
-                 val
-                 (format "expected ~s that satisfies ~s given: ~e" kind invariant val))))
-            (build-inv-proxy ctc val invariant proj blame indy-blame impersonate?)))))))
-
-
-(define-struct (chaperone-invariantc invariant-info) ()
-  #:property prop:chaperone-contract
-  (build-chaperone-contract-property
-   #:name invariantc-name
-   #:first-order invariantc-first-order
-   #:projection (invariantc-ho-projection #f)))
-
-(define-struct (impersonator-invariantc invariant-info) ()
-  #:property prop:contract
-  (build-contract-property
-   #:name invariantc-name
-   #:first-order invariantc-first-order
-   #:projection (invariantc-ho-projection #t)))
-
-(define-syntax (invariant/c stx)
-  (syntax-case stx ()
-    [x
-     (identifier? #'x)
-     (syntax-property
-      (syntax/loc stx invariant/c)
-      'racket/contract:contract
-      (vector (gensym 'ctc) (list stx) null))]
-    [(invc arg ...)
-     (let ([args (syntax->list #'(arg ...))]
-           [this-one (gensym 'invariant-ctc)])
-       (with-syntax ([(new-arg ...) (convert-args args this-one 'invariant/c)])
-         (syntax-property
-          (syntax/loc stx
-            (invariantc new-arg ... (quote-module-name)))
-          'racket/contract:contract
-          (vector this-one (list #'invc) null))))]))
-
-(define (invariantc c inv #:struct [structid 'none] #:flat? [flat #f] #:immutable [immutable 'dont-care] here)
-  (cond
-    [(or flat
-         (and (eq? immutable #t)
-              (flat-contract? c)))
-     (make-immutable-invariantc c inv structid flat immutable here)]
-    [(chaperone-contract? c)
-     (make-chaperone-invariantc c inv structid flat immutable here)]
-    [else
-     (make-impersonator-invariantc c inv structid flat immutable here)]))
diff --git a/pkgs/unstable-parameter-group-lib/LICENSE.txt b/pkgs/unstable-parameter-group-lib/LICENSE.txt
deleted file mode 100644
index 4f79ae80d2..0000000000
--- a/pkgs/unstable-parameter-group-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-parameter-group-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-parameter-group-lib/info.rkt b/pkgs/unstable-parameter-group-lib/info.rkt
deleted file mode 100644
index dc3cbe3c79..0000000000
--- a/pkgs/unstable-parameter-group-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "Experimental libraries for parameter groups")
-
-(define pkg-authors '(mflatt ntoronto))
diff --git a/pkgs/unstable-parameter-group-lib/unstable/parameter-group.rkt b/pkgs/unstable-parameter-group-lib/unstable/parameter-group.rkt
deleted file mode 100644
index 5394bb0ddc..0000000000
--- a/pkgs/unstable-parameter-group-lib/unstable/parameter-group.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang racket/base
-
-;; Provides a way to treat a group of parameters as a parameter itself
-
-(require racket/match racket/list
-         (for-syntax racket/base racket/syntax syntax/parse racket/match)
-         ;; Can't make parameter lists first-class values without these:
-         (only-in '#%paramz parameterization-key extend-parameterization))
-
-(provide parameter-group? define-parameter-group parameterize/group parameterize*/group)
-
-;; A wrapper for a group of parameters that acts like a parameter-procedure
-(struct parameter-group (proc extract-extension)
-  #:property prop:procedure (struct-field-index proc))
-
-;; Given the left and right side of a 'parameterize' binding, returns a list of alternating
-;; parameters and parameter values
-(define (extract-extension p v)
-  (cond [(parameter? p)        (list p v)]
-        [(parameter-group? p)  ((parameter-group-extract-extension p) v)]
-        [else  (raise-type-error 'parameterize "parameter or parameter-group" p)]))
-
-(define-syntax (define-parameter-group stx)
-  (syntax-parse stx
-    [(_ name:id (param ...) #:struct struct-name:id)
-     (with-syntax ([(param-name ...)  (generate-temporaries (syntax->list #'(param ...)))]
-                   [(temp-name ...)   (generate-temporaries (syntax->list #'(param ...)))]
-                   [proc              (format-id #'name "~a-proc" #'name)]
-                   [extract           (format-id #'name "~a-extract" #'name)])
-       (syntax-protect
-        (syntax/loc stx
-          (define name
-            (let ([param-name  param] ...)
-              (unless (or (parameter? param-name) (parameter-group? param-name))
-                (raise-type-error 'define-parameter-group "parameter or parameter-group" param-name))
-              ...
-              (define proc
-                (case-lambda
-                  [()   (struct-name (param-name) ...)]
-                  [(v)  (match v
-                          [(struct-name temp-name ...)  (param-name temp-name) ... (void)]
-                          [_  (raise-type-error 'name (symbol->string 'struct-name) v)])]))
-              (define (extract v)
-                (match v
-                  [(struct-name temp-name ...)  (append (extract-extension param-name temp-name) ...)]
-                  [_  (raise-type-error 'name (symbol->string 'struct-name) v)]))
-              (parameter-group proc extract))))))]
-    [(_ name:id (param-name:id ...))
-     (with-syntax ([struct-name  (format-id #'name "~a-value" #'name)])
-       (syntax-protect
-        (syntax/loc stx
-          (begin (struct struct-name (param-name ...) #:transparent)
-                 (define-parameter-group name (param-name ...) #:struct struct-name)))))]))
-
-;; Corresponds to parameterize
-(define-syntax (parameterize/group stx)
-  (syntax-case stx ()
-    [(_ () expr1 expr ...)
-     (syntax-protect (syntax/loc stx (let () expr1 expr ...)))]
-    [(_ ([p v] ...) expr1 expr ...)
-     (with-syntax* ([(p-name ...)  (generate-temporaries (syntax->list #'(p ...)))]
-                    [(p/v ...)  (apply append (map list 
-                                                   (syntax->list #'(p-name ...))
-                                                   (syntax->list #'(v ...))))])
-       (syntax-protect
-        (syntax/loc stx
-          (with-continuation-mark parameterization-key
-            (let ([p-name p] ...)
-              (if (and (parameter? p-name) ...)
-                  (extend-parameterization
-                   (continuation-mark-set-first #f parameterization-key)
-                   p/v ...)
-                  (apply extend-parameterization
-                         (continuation-mark-set-first #f parameterization-key)
-                         (append (extract-extension p-name v) ...))))
-            (let () expr1 expr ...)))))]))
-
-;; Corresponds to parameterize*
-(define-syntax parameterize*/group
-  (syntax-rules ()
-      [(_ () body1 body ...)
-       (let () body1 body ...)]
-      [(_ ([lhs1 rhs1] [lhs rhs] ...) body1 body ...)
-       (parameterize/group
-        ([lhs1 rhs1])
-        (parameterize*/group
-         ([lhs rhs] ...)
-         body1 body ...))]))
diff --git a/pkgs/unstable-pkgs/unstable-doc/LICENSE.txt b/pkgs/unstable-pkgs/unstable-doc/LICENSE.txt
deleted file mode 100644
index f36edf48b8..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-pkgs/unstable-doc/automata/info.rkt b/pkgs/unstable-pkgs/unstable-doc/automata/info.rkt
deleted file mode 100644
index 84ad0ac2d5..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/automata/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/unstable-pkgs/unstable-doc/automata/scribblings/automata.scrbl b/pkgs/unstable-pkgs/unstable-doc/automata/scribblings/automata.scrbl
deleted file mode 100644
index 4bf6ff542e..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/automata/scribblings/automata.scrbl
+++ /dev/null
@@ -1,217 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/bnf
-          scribble/eval
-          unstable/scribblings/utils
-          (for-label racket/base
-                     racket/contract
-                     racket/list))
-
-@(define our-eval (make-base-eval))
-
-@title{Automata: Compiling State Machines}
-@unstable[@author+email["Jay McCarthy" "jay@racket-lang.org"]]
-
-@defmodule[unstable/automata]
-
-This package provides macros and functions for writing state machines over @racketmodname[racket/match] patterns (as opposed to concrete characters.)
-
-@section[#:tag "machine"]{Machines}
-
-@defmodule[unstable/automata/machine]
-@(require (for-label unstable/automata/machine))
-@interaction-eval[#:eval our-eval (require unstable/automata/machine)]
-
-Each of the subsequent macros compile to instances of the machines provided by this module. This is a documented feature of the modules, so these functions should be used to, for example, determine if the machine is currently accepting.
-
-@defstruct*[machine ([next (any/c . -> . machine?)])]{
- An applicable structure for machines. When the structure is applied, the @racket[next] field is used as the procedure.
-}
-
-@defstruct*[(machine-accepting machine) ([next (any/c . -> . machine?)])]{
- A sub-structure of @racket[machine] that is accepting.
-}
-
-@defproc[(machine-accepts? [m machine?] [i (listof any/c)])
-         boolean?]{
- Returns @racket[#t] if @racket[m] ends in an accepting state after consuming every element of @racket[i].
-}
-
-@defproc[(machine-accepts?/prefix-closed [m machine?] [i (listof any/c)])
-         boolean?]{
- Returns @racket[#t] if @racket[m] stays in an accepting state during the consumption of every element of @racket[i].
-}
-
-@defthing[machine-null machine?]{
- A machine that is never accepting.
-}
-
-@defthing[machine-epsilon machine?]{
- A machine that is initially accepting and never accepting afterwards.
-}
-
-@defthing[machine-sigma* machine?]{
- A machine that is always accepting.
-}
-
-@defproc[(machine-complement [m machine?])
-         machine?]{
- A machine that inverts the acception criteria of @racket[m].
-}
-
-@defproc[(machine-star [m machine?])
-         machine?]{
- A machine that simulates the Kleene star of @racket[m]. @racket[m] may be invoked many times.
-}
-
-@defproc[(machine-union [m0 machine?] [m1 machine?])
-         machine?]{
- A machine that simulates the union of @racket[m0] and @racket[m1].
-}
-
-@defproc[(machine-intersect [m0 machine?] [m1 machine?])
-         machine?]{
- A machine that simulates the intersection of @racket[m0] and @racket[m1].
-}
-
-@defproc[(machine-seq [m0 machine?] [m1 machine?])
-         machine?]{
- A machine that simulates the sequencing of @racket[m0] and @racket[m1]. @racket[m1] may be invoked many times.
-}
-
-@defproc[(machine-seq* [m0 machine?] [make-m1 (-> machine?)])
-         machine?]{
- A machine that simulates the sequencing of @racket[m0] and @racket[(make-m1)].
- @racket[(make-m1)] may be invoked many times.
-}
-
-
-@section[#:tag "dfa"]{Deterministic Finite Automata}
-
-@defmodule[unstable/automata/dfa]
-@(require (for-label unstable/automata/dfa))
-@interaction-eval[#:eval our-eval (require unstable/automata/dfa)]
-
-This module provides a macro for deterministic finite automata.
-
-@defform[(dfa start
-              (end ...)
-              [state ([evt next-state]
-                      ...)]
-              ...)
-         #:contracts 
-         ([start identifier?]
-          [end identifier?]
-          [state identifier?]
-          [next-state identifier?])]{
- A @racket[machine] that starts in state @racket[start] where each state behaves as specified in the rules. If a @racket[state] is in @racket[(end ...)], then it is constructed with @racket[machine-accepting]. @racket[next-state] need not be a state from this DFA.
-   
-   @defexamples[#:eval our-eval
- (define M
-   (dfa s1 (s1)
-        [s1 ([0 s2]
-             [(? even?) s1])]
-        [s2 ([0 s1]
-             [(? even?) s2])]))
- (machine-accepts? M (list 2 0 4 0 2))
- (machine-accepts? M (list 0 4 0 2 0))
- (machine-accepts? M (list 2 0 2 2 0 8))
- (machine-accepts? M (list 0 2 0 0 10 0))
- (machine-accepts? M (list))
- (machine-accepts? M (list 4 0))]
-}
-
-@section[#:tag "nfa"]{Non-Deterministic Finite Automata}
-
-@defmodule[unstable/automata/nfa]
-@(require (for-label unstable/automata/nfa))
-@interaction-eval[#:eval our-eval (require unstable/automata/nfa)]
-
-This module provides a macro for non-deterministic finite automata.
-
-@defform[(nfa (start:id ...)
-              (end:id ...)
-              [state:id ([evt:expr (next-state:id ...)]
-                         ...)]
-              ...)
-         #:contracts 
-         ([start identifier?]
-          [end identifier?]
-          [state identifier?]
-          [next-state identifier?])]{
- A @racket[machine] that starts in state @racket[(set start ...)] where each state behaves as specified in the rules. If a state is in @racket[(end ...)], then the machine is accepting. @racket[next-state] must be a state from this NFA.
-   
- These machines are efficiently compiled to use the smallest possible bit-string as a set representation and unsafe numeric operations where appropriate for inspection and adjusting the sets.
-   
-   @defexamples[#:eval our-eval
-(define M
-  (nfa (s1 s3) (s1 s3)
-       [s1 ([0 (s2)]
-            [1 (s1)])]
-       [s2 ([0 (s1)]
-            [1 (s2)])]
-       [s3 ([0 (s3)]
-            [1 (s4)])]
-       [s4 ([0 (s4)]
-            [1 (s3)])]))
-(machine-accepts? M (list 1 0 1 0 1))
-(machine-accepts? M (list 0 1 0 1 0))
-(machine-accepts? M (list 1 0 1 1 0 1))
-(machine-accepts? M (list 0 1 0 0 1 0))
-(machine-accepts? M (list))
-(machine-accepts? M (list 1 0))]
-}
-
-@section[#:tag "nfa-ep"]{Non-Deterministic Finite Automata (with epsilon transitions)}
-
-@defmodule[unstable/automata/nfa-ep]
-@(require (for-label unstable/automata/nfa-ep))
-@interaction-eval[#:eval our-eval (require unstable/automata/nfa-ep)]
-
-This module provides a macro for non-deterministic finite automata with epsilon transitions.
-
-@defidform[epsilon]{
- A binding for use in epsilon transitions.
-}
-
-@defform[#:literals (epsilon)
-         (nfa/ep (start:id ...)
-                 (end:id ...)
-                 [state:id ([epsilon (epsilon-state:id ...)]
-                            ...
-                            [evt:expr (next-state:id ...)]
-                            ...)]
-                 ...)
-         #:contracts 
-         ([start identifier?]
-          [end identifier?]
-          [state identifier?]
-          [epsilon-state identifier?]
-          [next-state identifier?])]{
- Extends @racket[nfa] with epsilon transitions, which must be listed first for each state. 
-   
-   @defexamples[#:eval our-eval
-(define M
-  (nfa/ep (s0) (s1 s3)
-          [s0 ([epsilon (s1)]
-               [epsilon (s3)])]
-          [s1 ([0 (s2)]
-               [1 (s1)])]
-          [s2 ([0 (s1)]
-               [1 (s2)])]
-          [s3 ([0 (s3)]
-               [1 (s4)])]
-          [s4 ([0 (s4)]
-               [1 (s3)])]))
-(machine-accepts? M (list 1 0 1 0 1))
-(machine-accepts? M (list 0 1 0 1 0))
-(machine-accepts? M (list 1 0 1 1 0 1))
-(machine-accepts? M (list 0 1 0 0 1 0))
-(machine-accepts? M (list))
-(machine-accepts? M (list 1 0))]
-}
-
-@include-section["re.scrbl"]
-
-
-@close-eval[our-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/automata/scribblings/re.scrbl b/pkgs/unstable-pkgs/unstable-doc/automata/scribblings/re.scrbl
deleted file mode 100644
index 0a30a7bedf..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/automata/scribblings/re.scrbl
+++ /dev/null
@@ -1,209 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/bnf
-          scribble/eval
-          (for-label racket/base
-                     racket/function
-                     racket/contract
-                     racket/list))
-
-@(define our-eval (make-base-eval))
-
-@title[#:tag "re"]{Regular Expressions}
-
-@defmodule[unstable/automata/re]
-@(require (for-label unstable/automata/re
-                     unstable/automata/machine))
-@interaction-eval[#:eval our-eval (require unstable/automata/re)]
-
-This module provides a macro for regular expression compilation.
-
-@defform/subs[#:literals (complement seq union star epsilon nullset dseq rec unquote)
-                         (re re-pat)
-                         ([re-pat (rec id re-pat)
-                                  (unquote expr)
-                                  (complement re-pat)
-                                  (seq re-pat ...)
-                                  (union re-pat ...)
-                                  (star re-pat)
-                                  epsilon
-                                  nullset
-                                  re-transformer
-                                  (re-transformer . datum)
-                                  (dseq pat re-pat)
-                                  pat])]{
- Compiles a regular expression over match patterns to a @racket[machine].
-
- The interpretation of the pattern language is mostly intuitive. The
- pattern language may be extended with @racket[define-re-transformer].
- @racket[dseq] allows bindings of the @racket[match] pattern to be used
- in the rest of the regular expression. (Thus, they are not
- @emph{really} regular expressions.)  @racket[unquote] escapes to Racket
- to evaluate an expression that evaluates to a regular expression (this
- happens once, at compile time.) @racket[rec] binds a Racket identifier
- to a delayed version of the inner expression; even if the expression is
- initially accepting, this delayed version is never accepting.
-
- The compiler will use an NFA, provided @racket[complement] and
- @racket[dseq] are not used. Otherwise, many NFAs connected with the
- machine simulation functions from
- @racketmodname[unstable/automata/machine] are used.
-}
-
-@(define-syntax-rule (defidforms (id ...) . dat)
-   (deftogether ((defidform id) ...) . dat))
-
-@defidforms[(complement seq union star epsilon nullset dseq rec)]{
-  Bindings for use in @racket[re].
-}
-
-@defform[(define-re-transformer id expr)]{
- Binds @racket[id] as an regular expression transformer used by the @racket[re] macro. The expression should evaluate to a function that accepts a syntax object and returns a syntax object that uses the regular expression pattern language.
-}
-
-@section[#:tag "re-ext"]{Extensions}
-
-@defmodule[unstable/automata/re-ext]
-@(require (for-label unstable/automata/re-ext))
-@interaction-eval[#:eval our-eval (require unstable/automata/re-ext)]
-
-This module provides a few transformers that extend the syntax of regular expression patterns.
-
-@defform[(opt re-pat)]{ Optionally matches @racket[re-pat]. }
-@defform[(plus re-pat)]{ Matches one or more @racket[re-pat] in sequence. }
-@defform[(rep re-pat num)]{ Matches @racket[re-pat] in sequence @racket[num] times, where @racket[num] must be syntactically a number. }
-@defform[(difference re-pat_0 re-pat_1)]{ Matches everything that @racket[re-pat_0] does, except what @racket[re-pat_1] matches. }
-@defform[(intersection re-pat_0 re-pat_1)]{ Matches the intersection of @racket[re-pat_0] and @racket[re-pat_1]. }
-@defform[(seq/close re-pat ...)]{ Matches the prefix closure of the sequence @racket[(seq re-pat ...)]. }
-
-@section[#:tag "re-ex"]{Examples}
-
-@interaction-eval[#:eval our-eval (require unstable/automata/machine racket/function)]
-
-@defexamples[
-#:eval our-eval
-(define-syntax-rule (test-re R (succ ...) (fail ...))
-  (let ([r (re R)])
-    (printf "Success: ~v => ~v\n" succ (machine-accepts? r succ))
-    ...
-    (printf "Failure: ~v => ~v\n" fail (machine-accepts? r fail))
-    ...))
-(test-re epsilon
-          [(list)]
-          [(list 0)])
- 
- (test-re nullset
-          []
-          [(list) (list 1)])
- 
- (test-re "A"
-          [(list "A")]
-          [(list)
-           (list "B")])
- 
- (test-re (complement "A")
-          [(list)
-           (list "B")
-           (list "A" "A")]
-          [(list "A")])
- 
- (test-re (union 0 1)
-          [(list 1)
-           (list 0)]
-          [(list)
-           (list 0 1)
-           (list 0 1 1)])
- 
- (test-re (seq 0 1)
-          [(list 0 1)]
-          [(list)
-           (list 0)
-           (list 0 1 1)])
- 
- (test-re (star 0)
-          [(list)
-           (list 0)
-           (list 0 0)]
-          [(list 1)])
- 
- (test-re (opt "A")
-          [(list)
-           (list "A")]
-          [(list "B")])
- 
- (define-re-transformer my-opt
-   (syntax-rules ()
-     [(_ pat)
-      (union epsilon pat)]))
- 
- (test-re (my-opt "A")
-          [(list)
-           (list "A")]
-          [(list "B")])
- 
- (test-re (plus "A")
-          [(list "A")
-           (list "A" "A")]
-          [(list)])
- 
- (test-re (rep "A" 3)
-          [(list "A" "A" "A")]
-          [(list)
-           (list "A")
-           (list "A" "A")])
- 
- (test-re (difference (? even?) 2)
-          [(list 4)
-           (list 6)]
-          [(list 3)
-           (list 2)])
- 
- (test-re (intersection (? even?) 2)
-          [(list 2)]
-          [(list 1)
-           (list 4)])
- 
- (test-re (complement (seq "A" (opt "B")))
-          [(list "A" "B" "C")]
-          [(list "A")
-           (list "A" "B")])
- 
- (test-re (seq epsilon 1)
-          [(list 1)]
-          [(list 0)
-           (list)])
- 
- (test-re (seq 1 epsilon)
-          [(list 1)]
-          [(list 0)
-           (list)])
- 
- (test-re (seq epsilon
-               (union (seq (star 1) (star (seq 0 (star 1) 0 (star 1))))
-                      (seq (star 0) (star (seq 1 (star 0) 1 (star 0)))))
-               epsilon)
-          [(list 1 0 1 0 1)
-           (list 0 1 0 1 0)
-           (list 1 0 1 1 0 1)
-           (list 0 1 0 0 1 0)
-           (list)]
-          [(list 1 0)])
- 
- (test-re (star (complement 1))
-          [(list 0 2 3 4)
-           (list)
-           (list 2)
-           (list 234 5 9 1 9 0)
-           (list 1 0)
-           (list 0 1)]
-          [(list 1)])
- 
- (test-re (dseq x (? (curry equal? x)))
-          [(list 0 0)
-           (list 1 1)]
-          [(list)
-           (list 1)
-           (list 1 0)])]
-
-
-@close-eval[our-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/info.rkt b/pkgs/unstable-pkgs/unstable-doc/info.rkt
deleted file mode 100644
index 9faf6e0b3e..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/info.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang info
-
-(define collection "unstable")
-
-(define scribblings
-  '(("scribblings/unstable.scrbl" (multi-page) (experimental))
-    ("scribblings/gui/unstable-gui.scrbl" (multi-page) (experimental))))
-(define deps '("base"))
-(define build-deps '("rackunit-doc"
-                     "scheme-lib"
-                     "at-exp-lib"
-                     "compatibility-lib"
-                     "draw-lib"
-                     "gui-lib"
-                     "pict-lib"
-                     "racket-doc"
-                     "rackunit-lib"
-                     "scribble-lib"
-                     "slideshow-lib"
-                     "typed-racket-lib"
-                     "unstable-contract-lib"
-                     "unstable-debug-lib"
-                     "unstable-lib"
-                     "unstable-list-lib"
-                     "unstable-macro-testing-lib"
-                     "unstable-options-lib"
-                     "unstable-parameter-group-lib"
-                     "unstable-pretty-lib"
-                     "unstable-2d"
-                     "draw-doc"
-                     "gui-doc"
-                     "pict-doc"
-                     "scribble-doc"
-                     "slideshow-doc"))
-(define update-implies '("unstable-lib"))
-
-(define pkg-desc "documentation part of \"unstable\"")
-
-(define pkg-authors '(jay samth cce ryanc))
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/2d.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/2d.scrbl
deleted file mode 100644
index 1fefcccc60..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/2d.scrbl
+++ /dev/null
@@ -1,250 +0,0 @@
-#lang scribble/doc
-@(require scribble/base
-          scribble/manual
-          "utils.rkt"
-          scribble/core
-          (for-label unstable/2d/cond
-                     unstable/2d/match
-                     racket/file
-                     racket/contract
-                     racket/base))
-
-@title[#:tag "2d"]{2D Syntax}
-
-@defmodulelang[unstable/2d]{The @racketmodname[unstable/2d] language installs
-@litchar{#2d} reader support in the readtable, and then chains to the reader of
-another language that is specified immediately after
-@racketmodname[unstable/2d].}
-
-The @litchar{#2d} syntax extension adds the ability use
-a two-dimensional grid syntax. That is, you can draw an ASCII-art
-grid and then treat that as an expression. For example,
-here is a simple equality function that operates on pairs and
-numbers, written using a @litchar{#2d} conditional expression:
-@codeblock{
-  #lang unstable/2d racket
-  (require unstable/2d/cond)
-
-  (define (same? a b)
-    #2dcond
-    ╔═════════════╦═══════════════════════╦═════════════╗
-    ║             ║       (pair? a)       ║ (number? a) ║
-    ╠═════════════╬═══════════════════════╬═════════════╣
-    ║ (pair? b)   ║ (and (same? (car a)   ║     #f      ║
-    ║             ║             (car b))  ║             ║
-    ║             ║      (same? (cdr a)   ║             ║
-    ║             ║             (cdr b))) ║             ║
-    ╠═════════════╬═══════════════════════╬═════════════╣
-    ║ (number? b) ║          #f           ║   (= a b)   ║
-    ╚═════════════╩═══════════════════════╩═════════════╝)
-}
-
-This notation works in two stages: reading, and parsing (just as in
-Racket in general). The reading stage converts anything that begins
-with @litchar{#2d} into a parenthesized expression (possibly signaling
-errors if the @litchar{═} and @litchar{║} and @litchar{╬}
-characters do not line up in the right places).
-
-Since the first line contains @litchar{#2dcond}, the reader will 
-produce a sequence whose first position is the identifier @racket[2dcond].
-
-That macro will take over and then expand into ordinary conditional
-expressions, in this case figuring out whether or not the inputs
-are pairs or numbers and evaluating the code in the appropriate cell.
-
-At the reader level, the syntax @litchar{#2d} notation checks
-the number of columns in the first row and uses that as a guide
-for where subsequent rows may appear. Once that first row is set,
-it serves as a guide to where the columns may appear in subsequent 
-rows, although following columns may be merged. 
-
-This merging can simplify
-some uses of @litchar{#2d} expressions. For example, consider this
-expression that captures subtyping relationships between a few of the
-Typed Racket numeric types, this time using a @litchar{#2d} match
-expression:
-@codeblock{
-  #lang unstable/2d racket
-  (require unstable/2d/match)
-  
-  (define (subtype? a b)
-    #2dmatch
-    ╔══════════╦══════════╦═══════╦══════════╗
-    ║   a  b   ║ 'Integer ║ 'Real ║ 'Complex ║
-    ╠══════════╬══════════╩═══════╩══════════╣
-    ║ 'Integer ║             #t              ║
-    ╠══════════╬══════════╗                  ║
-    ║ 'Real    ║          ║                  ║
-    ╠══════════╣          ╚═══════╗          ║
-    ║ 'Complex ║        #f        ║          ║
-    ╚══════════╩══════════════════╩══════════╝)
-}
-
-There are a number of cell walls missing here, but this is still a
-well-formed @litchar{#2d} expression. In this case, the @racket[2dmatch]
-treats any of the situations that fall into the larger regions as
-the same.
-
-In general, a @litchar{#2d} expression, when read, turns into an expression
-with at least two sub-pieces (not counting the initial name). The first is
-a sequence of numbers giving the widths of the top row of cells;
-the second is also a sequence of numbers, this time giving the heights
-of the leftmost column of cells. The remaining sequence describe the cells
-content. The first element of each is itself a sequence of coordinates,
-one for each of the cells that are connected together. The remaining elements
-are the subexpressions in the given cells.
-
-For example, this:
-
-@codeblock{
-  #lang unstable/2d racket
-  '#2dex
-  ╔══════════╦══════════╗
-  ║    0     ║    1     ║
-  ╠══════════╬══════════╣
-  ║    2     ║    3     ║
-  ╚══════════╩══════════╝
-}
-
-evaluates to
-@racketblock['(2dex (10 10)
-                    (2 2)
-                    (((0 0)) 0)
-                    (((0 1)) 2)
-                    (((1 0)) 1)
-                    (((1 1)) 3))]
-
-and this
-@codeblock{
-  #lang unstable/2d racket
-  '#2dex
-  ╔══════════╦══════════╦══════════╗
-  ║    0     ║    1 2   ║   3 4    ║
-  ╠══════════╬══════════╩══════════╣
-  ║    5     ║         6           ║
-  ╚══════════╩═════════════════════╝
-}
-evaluates to
-@racketblock['(2dex (10 10 10)
-                    (2 2)
-                    (((0 0)) 0)
-                    (((0 1)) 5)
-                    (((1 0)) 1 2)
-                    (((1 1) (2 1)) 6)
-                    (((2 0)) 3 4))]
-
-In addition, the cells coordinates pairs have source locations of the first
-character that is inside the corresponding cell. (Currently the span
-is always @racket[1], but that may change.)
-
-@section{Editing 2D}
-
-DrRacket provides a number of keybindings to help editing @litchar{#2d} expressions.
-See @seclink["Keyboard Shortcuts" #:doc '(lib "scribblings/drracket/drracket.scrbl") #:indirect? #t]{DrRacket's keyboard shortcuts}.
-
-@section{2D Cond}
-
-@defmodule[unstable/2d/cond]
-
-@defform/subs[(2dcond cond-content)
-              ([cond-content (code:line question-row
-                                        body-row
-                                        ⋮)
-                             (code:line question-row
-                                        body-row
-                                        ⋮
-                                        else-row)]
-               [question-row (code:line empty-cell question-cell ⋯)
-                             (code:line empty-cell question-cell ⋯ else-cell)]
-               [body-row (code:line question-cell exprs-cell ⋯)]
-               [else-row (code:line question-cell exprs-cell ⋯ else-cell)]
-               [question-cell (code:line ╔═════════════╗
-                                         ║question-expr║
-                                         ╚═════════════╝)]
-               
-               [empty-cell (code:line ╔═══╗
-                                      ║   ║
-                                      ╚═══╝)]
-               
-               [exprs-cell (code:line ╔═════════════╗
-                                      ║expr expr ...║
-                                      ╚═════════════╝)]
-               [else-cell (code:line ╔══════╗
-                                     ║ else ║
-                                     ╚══════╝)])]{
-  Evaluates the first row of question expressions until 
-  one of them returns a true value (signaling an error if none do),
-  then evaluates the first column of question expressions until
-  one of them returns a true value (signaling an error if none do),
-  and then evaluates the cell in the middle where both point to,
-  returning the result of the last expression in that cell.
-}
-
-@section{2D Match}
-
-@defmodule[unstable/2d/match]
-
-@defform/subs[(2dmatch match-content)
-              ([match-content (code:line match-first-row
-                                         match-row
-                                         ⋮)]
-               [match-first-row (code:line two-expr-cell match-pat-cell ⋯)]
-               [match-row (code:line match-pat-cell exprs-cell ⋯)]
-               [two-expr-cell (code:line ╔═════════════════╗
-                                         ║col-expr row-expr║
-                                         ╚═════════════════╝)]
-               
-               [match-pat-cell (code:line ╔═════╗
-                                          ║ pat ║
-                                          ╚═════╝)]
-               
-               [exprs-cell (code:line ╔═════════════╗
-                                      ║expr expr ...║
-                                      ╚═════════════╝)])]{
-  Matches @racket[col-expr] against each of patterns 
-  in the first column of the table and matches @racket[row-expr]
-  against each of the patterns in the row row, and then evaluates
-  the corresponding @racket[exprs-cell], returning the value of the 
-  last expression in that cell.
-}
-
-@section{2D Tabular}
-
-@defmodule[unstable/2d/tabular]
-
-@defform/subs[(2dmatch tabular-content)
-                                           
-              ([tabular-content (code:line tabular-row
-                                           ⋮)
-                                (code:line tabular-row
-                                           ⋮
-                                           style-cell)]
-               [tabular-row (code:line tabular-cell ⋯)]
-               [tabular-cell (code:line ╔════════════════╗
-                                        ║tabular-expr ...║
-                                        ╚════════════════╝)]
-               [style-cell (code:line ╔═════════════════╗
-                                      ║style-content ...║
-                                      ╚═════════════════╝)]
-               [style-content (code:line #:style style-expr)
-                              (code:line #:sep sep-expr)
-                              #:ignore-first-row])
-              
-              #:contracts ([style-expr style?]
-                           [sep-expr (or/c block? content? #f)]
-                           [tabular-expr (or/c block? content?)])]{
-  Constructs a @racket[tabular] matching the given cells. 
-          
-  If a cell spans multiple columns, then the resulting
-  @racket[tabular] has @racket['cont] in the corresponding 
-  list element. No cells may span rows.
-               
-  The @racket[#:style] and @racket[#:sep] arguments are just passed
-  to @racket[tabular]. 
-  
-  If the @racket[#:ignore-first-row] keyword is provided, then the first
-  row of the @racket[2dtabular] expression is ignored. This can be used
-  in case the first row of the rendered table should not have all of the
-  columns (as @litchar{#2d} syntax requires that the first row contain
-  a cell for each column that appears in the table).
-}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/bytes.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/bytes.scrbl
deleted file mode 100644
index 7efa3b11c0..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/bytes.scrbl
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scribble/doc
-@(require scribble/base scribble/manual "utils.rkt"
-          (for-label racket/base unstable/bytes
-                     racket/contract))
-
-@title[#:tag "bytes"]{Bytes}
-@unstable-header[]
-
-@defmodule[unstable/bytes]
-
-@defproc[(read/bytes [b bytes?])
-         printable/c]{
- @racket[read]s a value from @racket[b] and returns it.
-}
-
-@defproc[(write/bytes [v printable/c])
-         bytes?]{
- @racket[write]s @racket[v] to a bytes and returns it.
-}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/class-iop.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/class-iop.scrbl
deleted file mode 100644
index d77b14779b..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/class-iop.scrbl
+++ /dev/null
@@ -1,143 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          "utils.rkt"
-          (for-label unstable/class-iop
-                     racket/class
-                     racket/contract
-                     racket/base))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/class unstable/class-iop (for-syntax racket/base)))
-
-@title[#:tag "class-iop"]{Interface-Oriented Programming for Classes}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/class-iop]
-
-@defform[(define-interface name-id (super-ifc-id ...) (method-id ...))]{
-
-Defines @racket[name-id] as a static interface extending the
-interfaces named by the @racket[super-ifc-id]s and containing the
-methods specified by the @racket[method-id]s.
-
-A static interface name is used by the checked method call variants
-(@racket[send/i], @racket[send*/i], and @racket[send/apply/i]). When
-used as an expression, a static interface name evaluates to an
-interface value.
-
-@examples[#:eval the-eval
-(define-interface stack<%> () (empty? push pop))
-stack<%>
-(define stack%
-  (class* object% (stack<%>)
-    (define items null)
-    (define/public (empty?) (null? items))
-    (define/public (push x) (set! items (cons x items)))
-    (define/public (pop) (begin (car items) (set! items (cdr items))))
-    (super-new)))
-]
-}
-
-@defform[(define-interface/dynamic name-id ifc-expr (method-id ...))]{
-
-Defines @racket[name-id] as a static interface with dynamic
-counterpart @racket[ifc-expr], which must evaluate to an interface
-value. The static interface contains the methods named by the
-@racket[method-id]s. A run-time error is raised if any
-@racket[method-id] is not a member of the dynamic interface
-@racket[ifc-expr].
-
-Use @racket[define-interface/dynamic] to wrap interfaces from other
-sources.
-
-@examples[#:eval the-eval
-(define-interface/dynamic object<%> (class->interface object%) ())
-object<%>
-]
-}
-
-@defform[(send/i obj-exp static-ifc-id method-id arg-expr ...)]{
-
-Checked variant of @racket[send]. 
-
-The argument @racket[static-ifc-id] must be defined as a static
-interface. The method @racket[method-id] must be a member of the
-static interface @racket[static-ifc-id]; otherwise a compile-time
-error is raised.
-
-The value of @racket[obj-expr] must be an instance of the interface
-@racket[static-ifc-id]; otherwise, a run-time error is raised.
-
-@examples[#:eval the-eval
-(define s (new stack%))
-(send/i s stack<%> push 1)
-(send/i s stack<%> popp)
-(send/i (new object%) stack<%> push 2)
-]
-}
-
-@defform[(send*/i obj-expr static-ifc-id (method-id arg-expr ...) ...)]{
-
-Checked variant of @racket[send*].
-
-@examples[#:eval the-eval
-(send*/i s stack<%>
-  (push 2)
-  (pop))
-]
-}
-
-@defform[(send/apply/i obj-expr static-ifc-id method-id arg-expr ... list-arg-expr)]{
-
-Checked variant of @racket[send/apply].
-
-@examples[#:eval the-eval
-(send/apply/i s stack<%> push (list 5))
-]
-}
-
-@defform[(define/i id static-ifc-id expr)]{
-
-Checks that @racket[expr] evaluates to an instance of
-@racket[static-ifc-id] before binding it to @racket[id]. If
-@racket[id] is subsequently changed (with @racket[set!]), the check is
-performed again.
-
-No dynamic object check is performed when calling a method (using
-@racket[send/i], etc) on a name defined via @racket[define/i].
-
-}
-
-@deftogether[[
-@defform[(init/i (id static-ifc-id maybe-default-expr) ...)]
-@defform[(init-field/i (id static-ifc-id maybe-default-expr) ...)]
-@defform/subs[(init-private/i (id static-ifc-id maybe-default-expr) ...)
-              ([maybe-default-expr (code:blank)
-                                   default-expr])]]]{
-
-Checked versions of @racket[init] and @racket[init-field]. The value
-attached to each @racket[id] is checked against the given interface.
-
-No dynamic object check is performed when calling a method (using
-@racket[send/i], etc) on a name bound via one of these forms.  Note
-that in the case of @racket[init-field/i] this check omission is
-unsound in the presence of mutation from outside the class. This
-should be fixed.
-
-}
-
-@defform[(define-interface-expander id transformer-expr)]{
-
-Defines @racket[id] as a macro that can be used within
-@racket[define-interface] forms.
-
-@examples[#:eval the-eval
-(define-interface-expander stack-methods
-  (lambda (stx) #'[empty? push pop]))
-(define-interface stack<%> ()
-  ((stack-methods)))
-(interface->method-names stack<%>)
-]
-}
-
-@close-eval[the-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/contract.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/contract.scrbl
deleted file mode 100644
index 449404f811..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/contract.scrbl
+++ /dev/null
@@ -1,143 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt" (for-label racket unstable/contract))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/contract racket/dict unstable/contract))
-
-@title[#:tag "contract"]{Contracts}
-@unstable-header[]
-
-@defmodule[unstable/contract]
-
-@defproc[(non-empty-string? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is a string and is not empty;
-returns @racket[#f] otherwise.
-}
-
-@defthing[port-number? contract?]{
-Equivalent to @racket[(between/c 1 65535)].
-}
-
-@defthing[tcp-listen-port? contract?]{
-Equivalent to @racket[(between/c 0 65535)].
-}
-
-@defthing[path-piece? contract?]{
-Equivalent to @racket[(or/c path-string? (symbols 'up 'same))].
-}
-
-@addition{Ryan Culpepper}
-
-@defproc[(if/c [predicate (-> any/c any/c)]
-               [then-contract contract?]
-               [else-contract contract?])
-         contract?]{
-
-Produces a contract that, when applied to a value, first tests the
-value with @racket[predicate]; if @racket[predicate] returns true, the
-@racket[then-contract] is applied; otherwise, the
-@racket[else-contract] is applied. The resulting contract is a flat
-contract if both @racket[then-contract] and @racket[else-contract] are
-flat contracts.
-
-For example, the following contract enforces that if a value is a
-procedure, it is a thunk; otherwise it can be any (non-procedure)
-value:
-  @racketblock[(if/c procedure? (-> any) any/c)]
-Note that the following contract is @bold{not} equivalent:
-  @racketblock[(or/c (-> any) any/c) (code:comment "wrong!")]
-The last contract is the same as @racket[any/c] because
-@racket[or/c] tries flat contracts before higher-order contracts.
-}
-
-@defthing[failure-result/c contract?]{
-
-A contract that describes the failure result arguments of procedures
-such as @racket[hash-ref].
-
-Equivalent to @racket[(if/c procedure? (-> any) any/c)].
-}
-
-@defproc[(rename-contract [contract contract?]
-                          [name any/c])
-         contract?]{
-
-Produces a contract that acts like @racket[contract] but with the name
-@racket[name].
-
-The resulting contract is a flat contract if @racket[contract] is a
-flat contract.
-}
-
-@addition{Asumu Takikawa}
-
-@defproc[(maybe/c [contract contract?]) contract?]{
-
-Creates a contract that acts like @racket[contract] but will also
-accept @racket[#f]. Intended to describe situations where a failure
-or default value may be used.
-}
-
-@addition[@author+email["Carl Eastlund" "cce@racket-lang.org"]]
-
-@defthing[truth/c flat-contract?]{
-
-This contract recognizes Racket truth values, i.e., any value, but with a more
-informative name and description.  Use it in negative positions for arguments
-that accept arbitrary truth values that may not be booleans.
-
-}
-
-@defproc[(sequence/c [#:min-count min-count (or/c #f exact-nonnegative-integer?) #f]
-                     [elem/c contract?] ...)
-         contract?]{
-
-Wraps a @tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{sequence},
-obligating it to produce as many values as there are @racket[elem/c] contracts,
-and obligating each value to satisfy the corresponding @racket[elem/c].  The
-result is not guaranteed to be the same kind of sequence as the original value;
-for instance, a wrapped list is not guaranteed to satisfy @racket[list?].
-
-If @racket[min-count] is a number, the stream is required to have at least that many elements in it.
-
-@defexamples[
-#:eval the-eval
-(define/contract predicates
-  (sequence/c (-> any/c boolean?))
-  (in-list (list integer?
-                 string->symbol)))
-(for ([P predicates])
-  (printf "~s\n" (P "cat")))
-(define/contract numbers&strings
-  (sequence/c number? string?)
-  (in-dict (list (cons 1 "one")
-                 (cons 2 "two")
-                 (cons 3 'three))))
-(for ([(N S) numbers&strings])
-  (printf "~s: ~a\n" N S))
-(define/contract a-sequence
-  (sequence/c #:min-count 2 char?)
-  "x")
-(for ([x a-sequence]
-      [i (in-naturals)])
-  (printf "~a is ~a\n" i x))
-]
-
-}
-
-@addition{@author+email["Neil Toronto" "neil.toronto@gmail.com"]}
-
-@defproc[(treeof [elem-contract contract?]) contract?]{
-Identifies values that meet the contract @racket[elem-contract], lists of such values, lists of lists, and so on.
-@examples[#:eval the-eval
-                 (define number-tree/c (treeof number?))
-                 (flat-contract? number-tree/c)
-                 (define number-tree? (flat-contract-predicate number-tree/c))
-                 (number-tree? 4)
-                 (number-tree? '(4 5))
-                 (number-tree? '((4 5) 6))
-                 (number-tree? '(4 . 5))]
-}
-
-@(close-eval the-eval)
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/custom-write.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/custom-write.scrbl
deleted file mode 100644
index 59546adf5e..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/custom-write.scrbl
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang scribble/doc
-@(require scribble/base
-          scribble/manual
-          scribble/eval
-          "utils.rkt"
-          (for-label unstable/custom-write
-                     racket/base
-                     racket/contract
-                     racket/pretty))
-
-@title[#:tag "custom-write"]{Struct Printing}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/custom-write]
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/custom-write racket/pretty))
-
-@defproc[(make-constructor-style-printer
-            [get-constructor (-> any/c (or/c symbol? string?))]
-            [get-contents    (-> any/c sequence?)])
-         (-> any/c output-port? (or/c #t #f 0 1) void?)]{
-
-Produces a function suitable as a value for @racket[prop:custom-write]. The
-function prints values in ``constructor style.'' When the value is
-@racket[print]ed as an expression, it is shown as an application of the
-constructor (as returned by @racket[get-constructor]) to the contents (as
-returned by @racket[get-contents]). When given to @racket[write], it is shown as
-an unreadable value with the constructor separated from the contents by a colon.
-
-@examples[#:eval the-eval
-(struct point (x y)
-  #:property prop:custom-write
-  (make-constructor-style-printer
-   (lambda (obj) 'point)
-   (lambda (obj) (list (point-x obj) (point-y obj)))))
-(print (point 1 2))
-(write (point 1 2))
-]
-
-The function also cooperates with @racket[pretty-print]:
-
-@examples[#:eval the-eval
-(parameterize ((pretty-print-columns 10))
-  (pretty-print (point #e3e6 #e4e6)))
-(parameterize ((pretty-print-columns 10))
-  (pretty-write (point #e3e6 #e4e6)))
-]
-}
-
-
-@defthing[prop:auto-custom-write
-          (struct-type-property/c 'constructor)]{
-
-When attached to a struct type, automatically generates a printer using
-@racket[make-constructor-style-printer] and attaches it to the struct type's
-@racket[prop:custom-write] property. It also sets the
-@racket[prop:custom-print-quotable] property to @racket['never].
-
-@examples[#:eval the-eval
-(struct point3 (x y z)
-  #:property prop:auto-custom-write 'constructor)
-(print (point3 3 4 5))
-(write (point3 3 4 5))
-]
-}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/debug.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/debug.scrbl
deleted file mode 100644
index 4e637c3172..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/debug.scrbl
+++ /dev/null
@@ -1,97 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt"
-          (for-label racket unstable/debug unstable/syntax))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/debug))
-
-@title{Debugging}
-@unstable[@author+email["Carl Eastlund" "cce@racket-lang.org"]]
-
-@defmodule[unstable/debug]
-
-This module provides macros and functions for printing out debugging
-information.
-
-@defform/subs[
-(debug options ... expr)
-([options (code:line #:name name-expr)
-          (code:line #:source srcloc-expr)])
-]{
-
-Writes debugging information about the evaluation of @racket[expr] to the
-current error port.  The name and source location of the expression may be
-overridden by keyword options; their defaults are the syntactic form of the
-expression and its syntactic source location, respectively.
-
-@examples[#:eval the-eval
-(debug 0)
-(debug #:name "one, two, three" (values 1 2 3))
-(debug #:source (make-srcloc 'here 1 2 3 4)
-  (error 'function "something went wrong"))
-]
-
-}
-
-@defproc[(dprintf [fmt string?] [arg any/c] ...) void?]{
-
-Constructs a message in the same manner as @racket[format] and writes it to
-@racket[(current-error-port)], with indentation reflecting the number of nested
-@racket[debug] forms.
-
-@examples[#:eval the-eval
-(dprintf "level: ~a" 0)
-(debug (dprintf "level: ~a" 1))
-(debug (debug (dprintf "level: ~a" 2)))
-]
-
-}
-
-@defform/subs[
-(debugf function-expr argument ...)
-([argument argument-expr (code:line argument-keyword argument-expr)])
-]{
-
-Logs debugging information for @racket[(#%app function-expr argument ...)],
-including the evaluation and results of the function and each argument.
-
-@examples[#:eval the-eval
-(debugf + 1 2 3)
-]
-
-}
-
-@deftogether[(
-@defform[(begin/debug expr ...)]
-@defform*[[(define/debug id expr)
-           (define/debug (head args) body ...+)]]
-@defform*[[(define/private/debug id expr)
-           (define/private/debug (head args) body ...+)]]
-@defform*[[(define/public/debug id expr)
-           (define/public/debug (head args) body ...+)]]
-@defform*[[(define/override/debug id expr)
-           (define/override/debug (head args) body ...+)]]
-@defform*[[(define/augment/debug id expr)
-           (define/augment/debug (head args) body ...+)]]
-@defform*[[(let/debug ([lhs-id rhs-expr] ...) body ...+)
-           (let/debug loop-id ([lhs-id rhs-expr] ...) body ...+)]]
-@defform[(let*/debug ([lhs-id rhs-expr] ...) body ...+)]
-@defform[(letrec/debug ([lhs-id rhs-expr] ...) body ...+)]
-@defform[(let-values/debug ([(lhs-id ...) rhs-expr] ...) body ...+)]
-@defform[(let*-values/debug ([(lhs-id ...) rhs-expr] ...) body ...+)]
-@defform[(letrec-values/debug ([(lhs-id ...) rhs-expr] ...) body ...+)]
-@defform[(with-syntax/debug ([pattern stx-expr] ...) body ...+)]
-@defform[(with-syntax*/debug ([pattern stx-expr] ...) body ...+)]
-@defform[(parameterize/debug ([param-expr value-expr] ...) body ...+)]
-)]{
-
-These macros add logging based on @racket[debug] to the evaluation of
-expressions in @racket[begin], @racket[define], @racket[define/private],
-@racket[define/public], @racket[define/override], @racket[define/augment],
-@racket[let], @racket[let*], @racket[letrec], @racket[let-values],
-@racket[let*-values], @racket[letrec-values], @racket[with-syntax],
-@racket[with-syntax*], and @racket[parameterize].
-
-}
-
-@(close-eval the-eval)
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/define.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/define.scrbl
deleted file mode 100644
index 9e8c8c73bd..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/define.scrbl
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt"
-          (for-label racket unstable/define
-                     (only-in mzlib/etc define-syntax-set)))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/define (for-syntax racket/base)))
-
-@title{Definitions}
-@unstable[@author+email["Carl Eastlund" "cce@racket-lang.org"]]
-
-@defmodule[unstable/define]
-
-Provides macros for creating and manipulating definitions.
-
-@defform[(at-end expr)]{
-
-When used at the top level of a module, evaluates @racket[expr] at the end of
-the module.  This can be useful for calling functions before their definitions.
-
-@defexamples[
-#:eval the-eval
-(module Failure scheme
-  (f 5)
-  (define (f x) x))
-(require 'Failure)
-(module Success scheme
-  (require unstable/define)
-  (at-end (f 5))
-  (define (f x) x))
-(require 'Success)
-]
-
-}
-
-@defform[(in-phase1 e)]{
-
-Executes @racket[e] during phase 1 (the syntax transformation phase)
-relative to its context, during pass 1 if it occurs in a head expansion
-position.
-
-}
-
-@defform[(in-phase1/pass2 e)]{
-
-Executes @racket[e] during phase 1 (the syntax transformation phase)
-relative to its context, during pass 2 (after head expansion).
-
-}
-
-@(close-eval the-eval)
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/error.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/error.scrbl
deleted file mode 100644
index fb9e746ab9..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/error.scrbl
+++ /dev/null
@@ -1,118 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt"
-          (for-label racket/base racket/contract unstable/error))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/error))
-
-@title[#:tag "error"]{Errors}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/error]
-
-@defproc[(error* [name symbol?]
-                 [message string?]
-                 [field (let ([option/c (or/c 'value 'multi 'maybe)])
-                          (or/c string? (cons/c string? (listof option/c))))]
-                 [value any/c] ... ...
-                 [#:continued continued-message (or/c string? (listof string?)) null])
-         any]{
-
-Raises an exception with a message composed according to the Racket
-@tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{error
-message convention}. The raised exception is an instance of
-@racket[exn:fail].
-
-The composed error message includes details consisting of the
-alternating @racket[field] and @racket[value] arguments. By default,
-@racket[value] is formatted as if by @racket[display] unless it is
-@racket[#f], in which case the detail line is omitted. The following
-options affect the formatting of the detail line:
-
-@itemlist[
-
-@item{@racket['multi] formats each element in the corresponding @racket[value],
-which must be a list, as a separate line; if @racket['maybe] is also provided,
-then the detail line is omitted if the list is empty}
-
-@item{@racket['value] formats the value using
-@racket[error-value->string-handler]; the detail line is not omittable
-unless @racket['maybe] or @racket['multi] is also provided}
-
-]
-
-@examples[#:eval the-eval
-
-(error* 'mcbean "too many stars upon thars"
-        '("given" value) 'star-bellied-sneetch
-        '("stars" value) 3)
-
-(error* 'hal "unable to open pod bay doors"
-        #:continued "this mission is too important to let you jeopardize it"
-        "threat" "David Bowman"
-        "detection" "lip reading")
-
-(error* 'car "missing car keys"
-        '("searched" multi)
-        (list "dresser" "desk" "kitchen table" "under sofa"
-              "behind microwave" "in washing machine")
-        "last seen"
-        #f)
-]
-}
-
-@defproc[(raise-syntax-error* 
-              [message string?]
-              [expr (or/c syntax? #f)]
-              [sub-expr (or/c syntax? #f)]
-              [field (let ([option/c (or/c 'value 'multi 'maybe)])
-                       (or/c string? (cons/c string? (listof option/c))))]
-              [value any/c] ... ...
-              [#:continued continued-message (or/c string? (listof string?)) null])
-         any]{
-
-Like @racket[raise-syntax-error] but with the formatting of
-@racket[error*]. The raised exception is an instance of
-@racket[exn:fail:syntax]. Like @racket[raise-syntax-error], the
-inclusion of @racket[expr] and @racket[sub-expr] in the details of the
-error message is controlled by the
-@racket[error-print-source-location] paramter; if they included, they
-are included before the other details specified by @racket[field] and
-@racket[value]. Unlike @racket[raise-syntax-error], both @racket[expr]
-and @racket[sub-expr] are mandatory arguments.
-}
-
-@defproc[(compose-error-message
-                         [name (or/c symbol? #f)]
-                         [message string?]
-                         [field (let ([option/c (or/c 'value 'multi 'maybe)])
-                                  (or/c string? (cons/c string? (listof option/c))))]
-                         [value any/c] ... ...
-                         [#:continued continued-message (or/c string? (listof string?)) null])
-         string?]{
-
-Like @racket[error*], but produces a string conforming to
-the Racket @tech[#:doc '(lib
-"scribblings/reference/reference.scrbl")]{error message convention}.
-}
-
-@defproc[(compose-error-detail
-             [field string?]
-             [options (listof (or/c 'value 'multi 'maybe))]
-             [value any/c])
-         string?]{
-
-Formats a single detail for an error message. The @racket[options]
-behave as described in @racket[error*].
-
-The resulting string begins with a newline unless it is empty, so it
-can be appended to the end of a base error message.
-}
-
-@(close-eval the-eval)
-
-@addition{Jay McCarthy}
-
-@defproc[(exn:not-break? [x any/c]) boolean?]{Identifies values that are not @racket[exn:break?], i.e. values that are safe to catch with @racket[with-handlers].}
-
-@defproc[(error-display [x any/c]) void?]{Calls @racket[(error-display-handler)] with the proper arguments whehter @racket[x] is an exception, or not.}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/function.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/function.scrbl
deleted file mode 100644
index 9cac1e30b0..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/function.scrbl
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt" (for-label racket unstable/function))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/function))
-
-@title{Functions}
-@unstable[@author+email["Carl Eastlund" "cce@racket-lang.org"]]
-
-@defmodule[unstable/function]
-
-This module provides tools for higher-order programming and creating functions.
-
-@section{Higher Order Predicates}
-
-@defproc[((conjoin [f (-> A ... boolean?)] ...) [x A] ...) boolean?]{
-
-Combines calls to each function with @racket[and].  Equivalent to
-@racket[(and (f x ...) ...)]
-
-@defexamples[
-#:eval the-eval
-(define f (conjoin exact? integer?))
-(f 1)
-(f 1.0)
-(f 1/2)
-(f 0.5)
-]
-
-}
-
-@defproc[((disjoin [f (-> A ... boolean?)] ...) [x A] ...) boolean?]{
-
-Combines calls to each function with @racket[or].  Equivalent to
-@racket[(or (f x ...) ...)]
-
-@defexamples[
-#:eval the-eval
-(define f (disjoin exact? integer?))
-(f 1)
-(f 1.0)
-(f 1/2)
-(f 0.5)
-]
-
-}
-
-@(close-eval the-eval)
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/future.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/future.scrbl
deleted file mode 100644
index e9bb6f2e38..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/future.scrbl
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt"
-          (for-label racket/base
-                     racket/future
-                     unstable/future))
-
-@title[#:tag "future"]{Futures}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/future]
-
-@deftogether[[
-@defform[(for/async (for-clause ...) body ...+)]
-@defform[(for*/async (for-clause ...) body ...+)]]]{
-
-Like @racket[for] and @racket[for*], but each iteration of the
-@racket[body] is executed in a separate @racket[future], and
-the futures may be @racket[touch]ed in any order.
-}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/notify.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/notify.scrbl
deleted file mode 100644
index 7dd883d1f8..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/notify.scrbl
+++ /dev/null
@@ -1,158 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "../utils.rkt"
-          (for-label racket/base unstable/gui/notify racket/contract
-                     racket/class))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/class unstable/private/notify))
-
-@title[#:tag "gui-notify"]{Notify-boxes}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/gui/notify]
-
-@defclass[notify-box% object% ()]{
-
-A notify-box contains a mutable cell. The notify-box notifies its
-listeners when the contents of the cell is changed.
-
-@examples[#:eval the-eval
-(define nb (new notify-box% (value 'apple)))
-(send nb get)
-(send nb set 'orange)
-(send nb listen (lambda (v) (printf "New value: ~s\n" v)))
-(send nb set 'potato)
-]
-
-@defconstructor[([value any/c])]{
-  Creates a notify-box initially containing @racket[value].
-}
-@defmethod[(get) any/c]{
-  Gets the value currently stored in the notify-box.
-}
-@defmethod[(set [v any/c]) void?]{
-  Updates the value stored in the notify-box and notifies the listeners.
-}
-@defmethod[(listen [listener (-> any/c any)]) void?]{
-  Adds a callback to be invoked on the new value when the notify-box's
-  contents change.
-}
-@defmethod[(remove-listener [listener (-> any/c any)]) void?]{
-  Removes a previously-added callback.
-}
-@defmethod[(remove-all-listeners) void?]{
-  Removes all previously registered callbacks.
-}
-}
-
-@defproc[(notify-box/pref
-          [proc (case-> (-> any/c) (-> any/c void?))]
-          [#:readonly? readonly? boolean? #f])
-         (is-a?/c notify-box%)]{
-
-Creates a notify-box with an initial value of @racket[(proc)]. Unless
-@racket[readonly?] is true, @racket[proc] is invoked on the new value
-when the notify-box is updated.
-
-Useful for tying a notify-box to a preference or parameter. Of course,
-changes made directly to the underlying parameter or state are not
-reflected in the notify-box.
-
-@examples[#:eval the-eval
-(define animal (make-parameter 'ant))
-(define nb (notify-box/pref animal))
-(send nb listen (lambda (v) (printf "New value: ~s\n" v)))
-(send nb set 'bee)
-(animal 'cow)
-(send nb get)
-(send nb set 'deer)
-(animal)
-]
-}
-
-@defform[(define-notify name value-expr)
-         #:contracts ([value-expr (is-a?/c notify-box%)])]{
-
-Class-body form. Declares @racket[name] as a field and
-@racketidfont{get-@racket[name]}, @racketidfont{set-@racket[name]},
-and @racketidfont{listen-@racket[name]} as methods that delegate to
-the @method[notify-box% get], @method[notify-box% set], and
-@method[notify-box% listen] methods of @racket[value].
-
-The @racket[value-expr] argument must evaluate to a notify-box, not
-just the initial contents for a notify box.
-
-Useful for aggregating many notify-boxes together into one
-``configuration'' object.
-
-@examples[#:eval the-eval
-(define config%
-  (class object%
-    (define-notify food (new notify-box% (value 'apple)))
-    (define-notify animal (new notify-box% (value 'ant)))
-    (super-new)))
-(define c (new config%))
-(send c listen-food
-        (lambda (v) (when (eq? v 'honey) (send c set-animal 'bear))))
-(let ([food (get-field food c)])
-  (send food set 'honey))
-(send c get-animal)
-]
-}
-
-@defproc[(menu-option/notify-box 
-          [parent (or/c (is-a?/c menu%) (is-a?/c popup-menu%))]
-          [label label-string?]
-          [notify-box (is-a?/c notify-box%)])
-         (is-a?/c checkable-menu-item%)]{
-
-Creates a @racket[checkable-menu-item%] tied to @racket[notify-box]. The menu item is
-checked whenever @racket[(send notify-box get)] is true. Clicking the
-menu item toggles the value of @racket[notify-box] and invokes its listeners.
-}
-
-@defproc[(check-box/notify-box
-          [parent (or/c (is-a?/c frame%) (is-a?/c dialog%)
-                        (is-a?/c panel%) (is-a?/c pane%))]
-          [label label-string?]
-          [notify-box (is-a?/c notify-box%)])
-         (is-a?/c check-box%)]{
-
-Creates a @racket[check-box%] tied to @racket[notify-box]. The
-check-box is checked whenever @racket[(send notify-box get)] is
-true. Clicking the check box toggles the value of @racket[notify-box]
-and invokes its listeners.
-}
-
-@defproc[(choice/notify-box
-          [parent (or/c (is-a?/c frame%) (is-a?/c dialog%)
-                        (is-a?/c panel%) (is-a?/c pane%))]
-          [label label-string?]
-          [choices (listof label-string?)]
-          [notify-box (is-a?/c notify-box%)])
-         (is-a?/c choice%)]{
-
-Creates a @racket[choice%] tied to @racket[notify-box]. The choice
-control has the value @racket[(send notify-box get)] selected, and
-selecting a different choice updates @racket[notify-box] and invokes
-its listeners.
-
-If the value of @racket[notify-box] is not in @racket[choices], either
-initially or upon an update, an error is raised.
-}
-
-@defproc[(menu-group/notify-box
-          [parent (or/c (is-a?/c menu%) (is-a?/c popup-menu%))]
-          [labels (listof label-string?)]
-          [notify-box (is-a?/c notify-box%)])
-         (listof (is-a?/c checkable-menu-item%))]{
-
-Returns a list of @racket[checkable-menu-item%] controls tied to
-@racket[notify-box]. A menu item is checked when its label is
-@racket[(send notify-box get)]. Clicking a menu item updates
-@racket[notify-box] to its label and invokes @racket[notify-box]'s
-listeners.
-}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/pict.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/pict.scrbl
deleted file mode 100644
index 4a51b600d3..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/pict.scrbl
+++ /dev/null
@@ -1,625 +0,0 @@
-#lang scribble/manual
-@(require "../utils.rkt"
-          scribble/eval
-          (for-label racket/base
-                     racket/contract
-                     racket/class
-                     racket/draw
-                     racket/future
-                     pict
-                     unstable/contract
-                     unstable/gui/pict))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/math pict unstable/gui/pict))
-
-@title[#:tag "pict"]{Pict Utilities}
-@unstable[@author+email["Carl Eastlund" "cce@racket-lang.org"]]
-
-@defmodule[unstable/gui/pict]
-
-The functions and macros exported by this module are also exported by
-@racketmodname[unstable/gui/slideshow].
-
-@;{----------------------------------------}
-
-@section{Pict Colors}
-
-@defproc[(color [c color/c] [p pict?]) pict?]{
-
-Applies color @racket[c] to picture @racket[p].  Equivalent to @racket[(colorize
-p c)].
-
-@examples[#:eval the-eval
-(color "red" (disk 20))
-]
-}
-
-@deftogether[(
-@defproc[(red [pict pict?]) pict?]
-@defproc[(orange [pict pict?]) pict?]
-@defproc[(yellow [pict pict?]) pict?]
-@defproc[(green [pict pict?]) pict?]
-@defproc[(blue [pict pict?]) pict?]
-@defproc[(purple [pict pict?]) pict?]
-@defproc[(black [pict pict?]) pict?]
-@defproc[(brown [pict pict?]) pict?]
-@defproc[(gray [pict pict?]) pict?]
-@defproc[(white [pict pict?]) pict?]
-@defproc[(cyan [pict pict?]) pict?]
-@defproc[(magenta [pict pict?]) pict?]
-)]{
-
-These functions apply appropriate colors to picture @racket[p].
-
-@examples[#:eval the-eval
-(red (disk 20))
-]
-}
-
-@deftogether[(
-@defproc[(light [color color/c]) color/c]
-@defproc[(dark [color color/c]) color/c]
-)]{
-
-These functions produce ligher or darker versions of a color.
-
-@examples[#:eval the-eval
-(hc-append (colorize (disk 20) "red")
-           (colorize (disk 20) (dark "red"))
-           (colorize (disk 20) (light "red")))
-]
-}
-
-@defthing[color/c flat-contract?]{
-
-This contract recognizes color strings, @racket[color%] instances, and RGB color
-lists.
-}
-
-@;{----------------------------------------}
-
-@section{Pict Manipulation}
-
-@defproc[(fill [pict pict?] [width (or/c real? #f)] [height (or/c real? #f)])
-         pict?]{
-
-Extends @racket[pict]'s bounding box to a minimum @racket[width] and/or
-@racket[height], placing the original picture in the middle of the space.
-
-@examples[#:eval the-eval
-(frame (fill (disk 20) 40 40))
-]
-}
-
-@defproc[(scale-to [pict pict?]
-                   [width real?]
-                   [height real?]
-                   [#:mode mode (or/c 'preserve 'inset 'distort) 'preserve])
-         pict?]{
-
-Scales @racket[pict] so that its width and height are at most
-@racket[width] and @racket[height], respectively. If @racket[mode] is
-@racket['preserve], the width and height are scaled by the same factor
-so @racket[pict]'s aspect ratio is preserved; the result's bounding
-box may be smaller than @racket[width] by @racket[height]. If
-@racket[mode] is @racket['inset], the aspect ratio is preserved as
-with @racket['preserve], but the resulting pict is centered in a
-bounding box of exactly @racket[width] by @racket[height]. If
-@racket[mode] is @racket['distort], the width and height are scaled
-separately.
-
-@examples[#:eval the-eval
-(frame (scale-to (circle 100) 40 20))
-(frame (scale-to (circle 100) 40 20 #:mode 'inset))
-(frame (scale-to (circle 100) 40 20 #:mode 'distort))
-]
-}
-
-@subsection{Conditional Manipulations}
-
-These pict transformers all take boolean arguments that determine whether to
-transform the pict or leave it unchanged.  These transformations can be useful
-for staged slides, as the resulting pict always has the same size and shape, and
-its contents always appear at the same position, but changing the boolean
-argument between slides can control when the transformation occurs.
-
-@deftogether[(
-@defproc[(show [pict pict?] [show? truth/c #t]) pict?]
-@defproc[(hide [pict pict?] [hide? truth/c #t]) pict?]
-)]{
-
-These functions conditionally show or hide an image, essentially choosing
-between @racket[pict] and @racket[(ghost pict)].  The only difference between
-the two is the default behavior and the opposite meaning of the @racket[show?]
-and @racket[hide?] booleans.  Both functions are provided for mnemonic purposes.
-}
-
-@defproc[(strike [pict pict?] [strike? truth/c #t]) pict?]{
-
-Displays a strikethrough image by putting a line through the middle of
-@racket[pict] if @racket[strike?] is true; produces @racket[pict] unchanged
-otherwise.
-
-@examples[#:eval the-eval
-(strike (colorize (disk 20) "yellow"))
-]
-}
-
-@defproc[(shade [pict pict?]
-                [shade? truth/c #t]
-                [#:ratio ratio (real-in 0 1) 1/2])
-         pict?]{
-
-Shades @racket[pict] to show with @racket[ratio] of its normal opacity; if
-@racket[ratio] is @racket[1] or @racket[shade?] is @racket[#f], shows
-@racket[pict] unchanged.
-
-@examples[#:eval the-eval
-(shade (colorize (disk 20) "red"))
-]
-}
-
-@subsection{Conditional Combinations}
-
-These pict control flow operators decide which pict of several to use.  All
-branches are evaluated; the resulting pict is a combination of the pict chosen
-by normal conditional flow with @racket[ghost] applied to all the other picts.
-The result is a picture large enough to accommodate each alternative, but showing
-only the chosen one.  This is useful for staged slides, as the pict chosen may
-change with each slide but its size and position will not.
-
-@defform/subs[(pict-if maybe-combine test-expr then-expr else-expr)
-              ([maybe-combine code:blank (code:line #:combine combine-expr)])]{
-
-Chooses either @racket[then-expr] or @racket[else-expr] based on
-@racket[test-expr], similarly to @racket[if].  Combines the chosen, visible
-image with the other, invisible image using @racket[combine-expr], defaulting to
-@racket[pict-combine].
-
-@examples[#:eval the-eval
-(let ([f (lambda (x)
-           (pict-if x
-                    (disk 20)
-                    (disk 40)))])
-  (hc-append 10
-             (frame (f #t))
-             (frame (f #f))))
-]
-}
-
-@defform/subs[(pict-cond maybe-combine [test-expr pict-expr] ...)
-              ([maybe-combine code:blank (code:line #:combine combine-expr)])]{
-
-Chooses a @racket[pict-expr] based on the first successful @racket[test-expr],
-similarly to @racket[cond].  Combines the chosen, visible image with the other,
-invisible images using @racket[combine-expr], defaulting to
-@racket[pict-combine].
-
-@examples[#:eval the-eval
-(let ([f (lambda (x)
-           (pict-cond
-             [(eq? x 'circle) (circle 20)]
-             [(eq? x 'disk) (disk 40)]
-             [(eq? x 'text) (text "ok" null 20)]))])
-  (hc-append 10
-             (frame (f 'circle))
-             (frame (f 'disk))
-             (frame (f 'text))))
-]
-}
-
-@defform/subs[(pict-case test-expr maybe-combine [literals pict-expr] ...)
-              ([maybe-combine code:blank (code:line #:combine combine-expr)])]{
-
-Chooses a @racket[pict-expr] based on @racket[test-expr] and each list of
-@racket[literals], similarly to @racket[case].  Combines the chosen, visible
-image with the other, invisible images using @racket[combine-expr], defaulting
-to @racket[pict-combine].
-
-@examples[#:eval the-eval
-(let ([f (lambda (x)
-           (pict-case x
-             [(circle) (circle 20)]
-             [(disk) (disk 40)]
-             [(text) (text "ok" null 20)]))])
-  (hc-append 10
-             (frame (f 'circle))
-             (frame (f 'disk))
-             (frame (f 'text))))
-]
-}
-
-@defform/subs[(pict-match test-expr maybe-combine [pattern pict-expr] ...)
-              ([maybe-combine code:blank (code:line #:combine combine-expr)])]{
-
-Chooses a @racket[pict-expr] based on @racket[test-expr] and each
-@racket[pattern], similarly to @racket[match].  Combines the chosen, visible
-image with the other, invisible images using @racket[combine-expr], defaulting
-to @racket[pict-combine].
-
-}
-
-@defform[#:id pict-combine pict-combine]{
-
-This syntax parameter determines the default pict combining form used by the
-above macros.  It defaults to @racket[lbl-superimpose].
-}
-
-@defform[(with-pict-combine combine-id body ...)]{
-
-Sets @racket[pict-combine] to refer to @racket[combine-id] within each of the
-@racket[body] terms, which are spliced into the containing context.
-
-@examples[#:eval the-eval
-(let ([f (lambda (x)
-           (with-pict-combine cc-superimpose
-             (pict-case x
-               [(circle) (circle 20)]
-               [(disk) (disk 40)]
-               [(text) (text "ok" null 20)])))])
-  (hc-append 10
-             (frame (f 'circle))
-             (frame (f 'disk))
-             (frame (f 'text))))
-]
-}
-
-@section{Shapes with Borders}
-
-@addition{Vincent St-Amour}
-
-@deftogether[(
-@defproc[(ellipse/border [w real?] [h real?]
-                         [#:color color color/c "white"]
-                         [#:border-color border-color color/c "black"]
-                         [#:border-width border-width real? 2])
-         pict?]
-@defproc[(circle/border [diameter real?]
-                        [#:color color color/c "white"]
-                        [#:border-color border-color color/c "black"]
-                        [#:border-width border-width real? 2])
-         pict?]
-@defproc[(rectangle/border [w real?] [h real?]
-                           [#:color color color/c "white"]
-                           [#:border-color border-color color/c "black"]
-                           [#:border-width border-width real? 2])
-         pict?]
-@defproc[(rounded-rectangle/border [w real?] [h real?]
-                                   [#:color color color/c "white"]
-                                   [#:border-color border-color color/c "black"]
-                                   [#:border-width border-width real? 2]
-                                   [#:corner-radius corner-radius real? -0.25]
-                                   [#:angle angle real? 0])
-         pict?]
-)]{
-These functions create shapes with border of the given color and width.
-
-@examples[#:eval the-eval
-(ellipse/border 80 40 #:border-color "blue")
-(rounded-rectangle/border 60 60 #:color "red" #:angle 1 #:border-width 3)
-(circle/border 40 #:color "green" #:border-color "purple")
-(rectangle/border 200 20 #:border-width 5)
-]
-}
-
-@section{Lines with Labels}
-
-@addition{Scott Owens}
-
-@deftogether[(
-@defproc[(pin-label-line [label pict?] [pict pict?]
-                         [src-pict pict-path?]
-			 [src-coord-fn (-> pict-path? (values real? real?))]
-                         [dest-pict pict-path?]
-			 [dest-coord-fn (-> pict-path? (values real? real?))]
-			 [#:start-angle start-angle (or/c real? #f) #f]
-			 [#:end-angle end-angle (or/c real? #f) #f]
-			 [#:start-pull start-pull real? 1/4]
-			 [#:end-pull end-pull real? 1/4]
-			 [#:line-width line-width (or/c real? #f) #f]
-			 [#:color color (or/c #f string? (is-a?/c color%)) #f]
-			 [#:alpha alpha (real-in 0 1) 1]
-			 [#:style style pen-style/c 'solid]
-			 [#:under? under? any/c #f]
-			 [#:x-adjust x-adjust real? 0]
-			 [#:y-adjust y-adjust real? 0])
-	 pict?]
-@defproc[(pin-arrow-label-line [label pict?] [arrow-size real?] [pict pict?]
-                         [src-pict pict-path?]
-			 [src-coord-fn (-> pict-path? (values real? real?))]
-                         [dest-pict pict-path?]
-			 [dest-coord-fn (-> pict-path? (values real? real?))]
-			 [#:start-angle start-angle (or/c real? #f) #f]
-			 [#:end-angle end-angle (or/c real? #f) #f]
-			 [#:start-pull start-pull real? 1/4]
-			 [#:end-pull end-pull real? 1/4]
-			 [#:line-width line-width (or/c real? #f) #f]
-			 [#:color color (or/c #f string? (is-a?/c color%)) #f]
-			 [#:alpha alpha (real-in 0 1) 1]
-			 [#:style style pen-style/c 'solid]
-			 [#:solid? solid? boolean? #t]
-			 [#:under? under? any/c #f]
-			 [#:hide-arrowhead? hide-arrowhead? any/c #f]
-			 [#:x-adjust x-adjust real? 0]
-			 [#:y-adjust y-adjust real? 0])
-	 pict?]
-@defproc[(pin-arrows-label-line [label pict?] [arrow-size real?] [pict pict?]
-                         [src-pict pict-path?]
-			 [src-coord-fn (-> pict-path? (values real? real?))]
-                         [dest-pict pict-path?]
-			 [dest-coord-fn (-> pict-path? (values real? real?))]
-			 [#:start-angle start-angle (or/c real? #f) #f]
-			 [#:end-angle end-angle (or/c real? #f) #f]
-			 [#:start-pull start-pull real? 1/4]
-			 [#:end-pull end-pull real? 1/4]
-			 [#:line-width line-width (or/c real? #f) #f]
-			 [#:color color (or/c #f string? (is-a?/c color%)) #f]
-			 [#:alpha alpha (real-in 0 1) 1]
-			 [#:style style pen-style/c 'solid]
-			 [#:solid? solid? boolean? #t]
-			 [#:under? under? any/c #f]
-			 [#:hide-arrowhead? hide-arrowhead? any/c #f]
-			 [#:x-adjust x-adjust real? 0]
-			 [#:y-adjust y-adjust real? 0])
-	 pict?]
-)]{
-These functions behave like @racket[pin-line], @racket[pin-arrow-line]
-and @racket[pin-arrows-line] with the addition of a label attached to
-the line.
-
-@examples[#:eval the-eval
-(let* ([a (red (disk 20))]
-       [b (blue (filled-rectangle 20 20))]
-       [p (vl-append a (hb-append (blank 100) b))])
-  (pin-arrow-label-line 
-   (rotate (text "label" null 10) (/ pi -4))
-   10 p
-   a rb-find
-   b lt-find))
-]
-}
-
-@section{Blur}
-@addition{Ryan Culpepper}
-
-@defproc[(blur [p pict?]
-               [h-radius (and/c real? (not/c negative?))]
-               [v-radius (and/c real? (not/c negative?)) h-radius])
-         pict?]{
-
-Blurs @racket[p] using an iterated box blur that approximates a
-gaussian blur. The @racket[h-radius] and @racket[v-radius] arguments
-control the strength of the horizontal and vertical components of the
-blur, respectively. They are given in terms of pict units, which may
-not directly correspond to screen pixels.
-
-The @racket[blur] function takes work proportional to
-@racketblock[(* (pict-width p) (pict-height p))]
-but it may be sped up by a factor of up to @racket[(processor-count)]
-due to the use of @racket[future]s.
-
-@examples[#:eval the-eval
-(blur (text "blur" null 40) 5)
-(blur (text "more blur" null 40) 10)
-(blur (text "much blur" null 40) 20)
-(blur (text "horiz. blur" null 40) 10 0)
-]
-The resulting pict has the same bounding box as @racket[p], so when
-picts are automatically @racket[clip]ped (as in Scribble documents),
-the pict should be @racket[inset] by the blur radius.
-@examples[#:eval the-eval
-(inset (blur (text "more blur" null 40) 10) 10)
-]
-}               
-
-@defproc[(shadow [p pict?]
-                 [radius (and/c real? (not/c negative?))]
-                 [dx real? 0]
-                 [dy real? dx]
-                 [#:color color (or/c #f string? (is-a?/c color%)) #f]
-                 [#:shadow-color shadow-color (or/c #f string? (is-a?/c color%)) #f])
-         pict?]{
-
-Creates a shadow effect by superimposing @racket[p] over a
-blurred version of @racket[p]. The shadow is offset from @racket[p] by
-(@racket[dx], @racket[dy]) units.
-
-If @racket[color] is not @racket[#f], the foreground part is
-@racket[(colorize p color)]; otherwise it is just @racket[p]. If
-@racket[shadow-color] is not @racket[#f], the shadow part is produced
-by blurring @racket[(colorize p shadow-color)]; otherwise it is
-produced by blurring @racket[p].
-
-The resulting pict has the same bounding box as @racket[p].
-
-@examples[#:eval the-eval
-(inset (shadow (text "shadow" null 50) 10) 10)
-(inset (shadow (text "shadow" null 50) 10 5) 10)
-(inset (shadow (text "shadow" null 50) 
-               5 0 2 #:color "white" #:shadow-color "red")
-       10)
-]
-}
-
-@defproc[(blur-bitmap! [bitmap (is-a?/c bitmap%)]
-                       [h-radius (and/c real? (not/c negative?))]
-                       [v-radius (and/c real? (not/c negative?)) h-radius])
-         void?]{
-
-Blurs @racket[bitmap] using blur radii @racket[h-radius] and
-@racket[v-radius].
-}
-
-
-@subsection{Tagged Picts}
-
-@defproc[(tag-pict [p pict?] [tag symbol?]) pict?]{
-
-Returns a pict like @racket[p] that carries a symbolic tag. The tag
-can be used with @racket[find-tag] to locate the pict.
-}
-
-@defproc[(find-tag [p pict?] [find tag-path?])
-         (or/c pict-path? #f)]{
-
-Locates a sub-pict of @racket[p]. Returns a pict-path that can be used
-with functions like @racket[lt-find], etc.
-
-@examples[#:eval the-eval
-(let* ([a (tag-pict (red (disk 20)) 'a)]
-       [b (tag-pict (blue (filled-rectangle 20 20)) 'b)]
-       [p (vl-append a (hb-append (blank 100) b))])
-  (pin-arrow-line 10 p
-                  (find-tag p 'a) rb-find
-                  (find-tag p 'b) lt-find))
-]
-}
-
-@defproc[(find-tag* [p pict?] [find tag-path?])
-         (listof pict-path?)]{
-
-Like @racket[find-tag], but returns all pict-paths corresponding to
-the given tag-path.
-
-@examples[#:eval the-eval
-(let* ([a (lambda () (tag-pict (red (disk 20)) 'a))]
-       [b (lambda () (tag-pict (blue (filled-rectangle 20 20)) 'b))]
-       [as (vc-append 10 (a) (a) (a))]
-       [bs (vc-append 10 (b) (b) (b))]
-       [p (hc-append as (blank 60 0) bs)])
-  (for*/fold ([p p])
-      ([apath (in-list (find-tag* p 'a))]
-       [bpath (in-list (find-tag* p 'b))])
-    (pin-arrow-line 4 p
-                    apath rc-find
-                    bpath lc-find)))
-]
-}
-
-@defproc[(tag-path? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is a symbol or a non-empty list of
-symbols, @racket[#f] otherwise.
-}
-
-@section{Shadow Frames}
-
-@defproc[(shadow-frame [pict pict?] ...
-                       [#:sep separation real? 5]
-                       [#:margin margin real? 20]
-                       [#:background-color bg-color (or/c string? (is-a?/c color%)) "white"]
-                       [#:frame-color frame-color (or/c string? (is-a?/c color%)) "gray"]
-                       [#:frame-line-width frame-line-width (or/c real? #f) 0]
-                       [#:shadow-side-length shadow-side-length real? 4]
-                       [#:shadow-top-y-offset shadow-top-y-offset real? 10]
-                       [#:shadow-bottom-y-offset shadow-bottom-y-offset real? 4]
-                       [#:shadow-descent shadow-descent (and/c real? (not/c negative?)) 40]
-                       [#:shadow-alpha-factor shadow-alpha-factor real? 3/4]
-                       [#:blur blur-radius (and/c real? (not/c negative?)) 20])
-         pict?]{
-
-Surrounds the @racket[pict]s with a rectangular frame that casts a
-symmetric ``curled paper'' shadow.
-
-The @racket[pict]s are vertically appended with @racket[separation]
-space between them. They are placed on a rectangular background of
-solid @racket[bg-color] with @racket[margin] space on all sides. A
-frame of @racket[frame-color] and @racket[frame-line-width] is added
-around the rectangle. The rectangle casts a shadow that extends
-@racket[shadow-side-length] to the left and right, starts
-@racket[shadow-top-y-offset] below the top of the rectangle and
-extends to @racket[shadow-bottom-y-offset] below the bottom of the
-rectangle in the center and an additional @racket[shadow-descent]
-below that on the sides. The shadow is painted using a linear
-gradient; @racket[shadow-alpha-factor] determines its density at the
-center. Finally, the shadow is blurred by @racket[blur-radius]; all
-previous measurements are pre-blur measurements.
-
-@examples[#:eval the-eval
-(scale (shadow-frame (text "text in a nifty frame" null 60)) 1/2)
-]
-}
-
-@defproc[(arch [outer-width real?]
-               [inner-width real?]
-               [solid-height real?]
-               [leg-height real?])
-         pict?]{
-
-Creates an arch.
-
-@examples[#:eval the-eval
-(colorize (arch 100 80 20 20) "red")
-]
-}
-
-@section{Drawing}
-@addition{Jay McCarthy}
-
-@defproc[(draw-pict-centered [p pict?] [dc (is-a?/c dc<%>)] [w real?] [h real?]) void?]{
- Draws the pict @racket[p] on @racket[dc] centered in a @racket[w]x@racket[h] rectangle.
-}
-
-@section{Additional combinators}
-
-@addition{Asumu Takikawa}
-
-@defproc[(backdrop [pict pict?] [#:color color color/c "white"]) pict?]{
-Adds a background highlighted with @racket[color] to
-@racket[pict].
-
-@examples[#:eval the-eval
-  (backdrop (circle 20) #:color "whitesmoke")
-  (backdrop (text "broccoli rabé") #:color "PaleGreen")
-]}
-
-@defproc[(cross-out [pict pict?]
-                    [#:width width real? 1]
-                    [#:style style
-                     (or/c 'transparent 'solid 'xor
-                           'hilite 'dot 'long-dash 'short-dash
-                           'dot-dash 'xor-dot 'xor-long-dash
-                           'xor-short-dash 'xor-dot-dash)
-                     'solid]
-                    [#:color color color/c "black"])
-                    pict?]{
-  Crosses out @racket[pict] with two diagonal lines drawn with
-  the given line @racket[width] and with the line @racket[style].
-  The lines are colored with @racket[color].
-
-@examples[#:eval the-eval
-  (cross-out (circle 20))
-  (cross-out (rectangle 30 20) #:width 2 #:style 'long-dash)
-  (cross-out (text "rapini") #:width 3 #:color "red")
-]}
-
-@(close-eval the-eval)
-
-@section{Alignment}
-
-@(require (for-label unstable/gui/pict/align))
-@defmodule[unstable/gui/pict/align]
-
-@defthing[align/c contract?]{A contract for the values @racket['(lt ct rt lc cc rc lb cb rb)].}
-@defthing[halign/c contract?]{A contract for the values @racket['(l c r)].}
-@defthing[valign/c contract?]{A contract for the values @racket['(t c b)].}
-
-@defproc[(align->h [a align/c]) halign/c]{Extracts the @racket[halign/c] part from @racket[a].}
-@defproc[(align->v [a align/c]) valign/c]{Extracts the @racket[valign/c] part from @racket[a].}
-
-@defproc[(align->frac [a (or/c halign/c valign/c)]) real?]{Computes the fraction corresponding to an alignment where the top-left is @racket[0].}
-
-@defproc[(halign->vcompose [ha halign/c]) procedure?]{Returns the @racket[h*-append] function for horizontal alignment.}
-@defproc[(valign->hcompose [va valign/c]) procedure?]{Returns the @racket[v*-append] function for vertical alignment.}
-
-@defproc[(pin-over/align [scene pict?] [x real?] [y real?] [halign halign/c] [valign valign/c] [pict pict?]) pict?]{Pins @racket[pict] over @racket[scene] centered at @racket[x]x@racket[y] aligned as specified in @racket[halign] and @racket[valign].}
-
-@section{PLT Logos}
-
-@(require (for-label unstable/gui/pict/plt-logo))
-@defmodule[unstable/gui/pict/plt-logo]
-
-@addition{Jay McCarthy}
-
-@defproc[(make-plt-title-background [w real?] [h real?]) pict?]{Draws the PLT logo inside a @racket[w]x@racket[h] rectangle.}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/prefs.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/prefs.scrbl
deleted file mode 100644
index 7c766b9044..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/prefs.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/manual
-@(require "../utils.rkt"
-          (for-label unstable/gui/prefs
-                     racket/contract
-                     racket/base))
-
-@title[#:tag "gui-prefs"]{Preferences}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/gui/prefs]
-
-@defproc[(pref:get/set [pref symbol?])
-         (case-> (-> any/c) (-> any/c void?))]{
-
-Returns a procedure that when applied to zero arguments retrieves the
-current value of the preference
-(@racketmodname[framework/preferences]) named @racket[pref] and when
-applied to one argument updates the preference named @racket[pref].
-
-}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/pslide.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/pslide.scrbl
deleted file mode 100644
index 24753f574d..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/pslide.scrbl
+++ /dev/null
@@ -1,427 +0,0 @@
-#lang scribble/doc
-@(require scribble/base
-          scribble/manual
-          scribble/eval
-          "../utils.rkt"
-          (for-label racket/base
-                     slideshow
-                     unstable/gui/ppict
-                     unstable/gui/pslide
-                     unstable/gui/pict))
-
-@title[#:tag "ppict"]{Progressive Picts and Slides}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require pict unstable/gui/ppict unstable/gui/private/tag-pict))
-
-@section[#:tag "ppicts"]{Progressive Picts}
-
-@defmodule[unstable/gui/ppict]
-
-A @deftech{progressive pict} or ``ppict'' is a kind of @racket[pict]
-that has an associated ``pict placer,'' which generally represents a
-position and alignment. New picts can be placed on the progressive
-pict by calling @racket[ppict-add], and the placer can be updated by
-calling @racket[ppict-go]. The @racket[ppict-do] form provides a
-compact notation for sequences of those two operations.
-
-@deftogether[[
-@defform[(ppict-do base-expr ppict-do-fragment ...)]
-@defform/subs[(ppict-do* base-expr ppic-do-fragment ...)
-              ([ppict-do-fragment (code:line #:go placer-expr)
-                                  (code:line #:set pict-expr)
-                                  (code:line #:next)
-                                  (code:line #:alt (ppict-do-fragment ...))
-                                  (code:line elem-expr)])
-              #:contracts ([base-expr pict?]
-                           [placer-expr placer?]
-                           [pict-expr pict?]
-                           [elem-expr (or/c pict? real? #f)])]]]{
-
-Builds a pict (and optionally a list of intermediate picts)
-progressively. The @racket[ppict-do] form returns only the final pict;
-any uses of @racket[#:next] are ignored. The @racket[ppict-do*] form
-returns two values: the final pict and a list of all partial picts
-emitted due to @racket[#:next] (the final pict is not included).
-
-A @racket[#:go] fragment changes the current placer. A @racket[#:set]
-fragment replaces the current pict state altogether with a new
-computed pict. A @racket[#:next] fragment saves a pict including only
-the contents emitted so far (but whose alignment takes into account
-picts yet to come). A @racket[#:alt] fragment saves the current pict
-state, executes the sub-sequence that follows, saves the result (as if
-the sub-sequence ended with @racket[#:next]), then restores the saved
-pict state before continuing.
-
-The @racket[elem-expr]s are interpreted by the current placer. A
-numeric @racket[elem-expr] usually represents a spacing change, but
-some placers do not support them. A spacing change only affects added
-picts up until the next placer is installed; when a new placer is
-installed, the spacing is reset, usually to @racket[0].
-
-The @racket[ppict-do-state] form tracks the current state of the
-pict. It is updated before a @racket[#:go] or @racket[#:set] fragment
-or before a sequence of @racket[elem-expr]s. It is not updated in the
-middle of a chain of @racket[elem-expr]s, however.
-
-@examples[#:eval the-eval
-(define base
-  (ppict-do (colorize (rectangle 200 200) "gray")
-            #:go (coord 1/2 1/2 'cc)
-            (colorize (hline 200 1) "gray")
-            #:go (coord 1/2 1/2 'cc)
-            (colorize (vline 1 200) "gray")))
-base
-]
-The use of @racket[ppict-do] in the defnition of @racket[base] above
-is equivalent to
-@racketblock[
-(let* ([pp (colorize (rectangle 200 200) "gray")]
-       [pp (ppict-go pp (coord 1/2 1/2 'cc))]
-       [pp (ppict-add pp (colorize (hline 200 1) "gray"))]
-       [pp (ppict-go pp (coord 1/2 1/2 'cc))]
-       [pp (ppict-add pp (colorize (vline 1 200) "gray"))])
-  pp)
-]
-
-@examples[#:eval the-eval
-(define circles-down-1
-  (ppict-do base
-            #:go (grid 2 2 2 1 'ct)
-            10
-            (circle 20)
-            (circle 20)
-            30
-            (circle 20)))
-circles-down-1
-(define circles-down-2
-  (ppict-do circles-down-1
-            (colorize (circle 20) "red")
-            40
-            (colorize (circle 20) "red")))
-(code:line (inset circles-down-2 20) (code:comment "draws outside its bounding box"))
-(inset (clip circles-down-2) 20)
-(ppict-do base
-          #:go (coord 0 0 'lt)
-          (tag-pict (circle 20) 'circA)
-          #:go (coord 1 1 'rb)
-          (tag-pict (circle 20) 'circB)
-          #:set (let ([p ppict-do-state])
-                  (pin-arrow-line 10 p
-                                  (find-tag p 'circA) rb-find
-                                  (find-tag p 'circB) lt-find)))
-(let-values ([(final intermediates)
-              (ppict-do* base
-                         #:go (coord 1/4 1/2 'cb)
-                         (text "shapes:")
-                         #:go (coord 1/2 1/2 'lb)
-                         #:alt [(circle 20)]
-                         #:alt [(rectangle 20 20)]
-                         (text "and more!"))])
-  (append intermediates (list final)))
-]
-
-More examples of @racket[ppict-do] are scattered throughout this
-section.
-}
-
-@defidform[ppict-do-state]{
-
-Tracks the current state of a @racket[ppict-do] or @racket[ppict-do*]
-form.
-}
-
-@defproc[(ppict? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is a @tech{progressive pict},
-@racket[#f] otherwise.
-}
-
-@defproc[(ppict-go [p pict?] [pl placer?]) ppict?]{
-
-Creates a @tech{progressive pict} with the given base pict @racket[p]
-and the placer @racket[pl].
-}
-
-@deftogether[[
-@defproc[(ppict-add [pp ppict?]
-                    [elem (or/c pict? real? #f 'next)] ...)
-         pict?]
-@defproc[(ppict-add* [pp ppict?]
-                     [elem (or/c pict? real? #f 'next)] ...)
-         (values pict? (listof pict?))]]]{
-
-Creates a new pict by adding each @racket[elem] pict on top of
-@racket[pp] according to @racket[pp]'s placer. The result pict may or
-may not be a @tech{progressive pict}, depending on the placer
-used. The @racket[ppict-add] function only the final pict; any
-occurrences of @racket['next] are ignored. The @racket[ppict-add*]
-function returns two values: the final pict and a list of all partial
-picts emitted due to @racket['next] (the final pict is not included).
-
-An @racket[elem] that is a real number changes the spacing for
-subsequent additions. A @racket[elem] that is @racket[#f] is
-discarded; it is permitted as a convenience for conditionally
-including sub-picts. Note that @racket[#f] is not equivalent to
-@racket[(blank 0)], since the latter will cause spacing to be added
-around it.
-}
-
-@defproc[(placer? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is a placer, @racket[#f] otherwise.
-}
-
-@defproc[(refpoint-placer? [x any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[x] is a placer based on a reference
-point, @racket[#f] otherwise.
-}
-
-@defproc[(coord [rel-x real?] 
-                [rel-y real?]
-                [align (or/c 'lt 'ct 'rt 'lc 'cc 'rc 'lb 'cb 'rb) 'cc]
-                [#:abs-x abs-x real? 0]
-                [#:abs-y abs-y real? 0]
-                [#:compose composer procedure? #, @elem{computed from @racket[align]}])
-         refpoint-placer?]{
-
-Returns a placer that places picts according to @racket[rel-x] and
-@racket[rel-y], which are interpeted as fractions of the width and
-height of the base @tech{progressive pict}. That is, @racket[0],
-@racket[0] is the top left corner of the base's bounding box, and
-@racket[1], @racket[1] is the bottom right. Then @racket[abs-x] and
-@racket[abs-y] offsets are added to get the final reference point.
-
-Additions are aligned according to @racket[align], a symbol whose name
-consists of a horizontal alignment character followed by a vertical
-alignment character. For example, if @racket[align] is @racket['lt],
-the pict is placed so that its left-top corner is at the reference
-point; if @racket[align] is @racket['rc], the pict is placed so that
-the center of its bounding box's right edge coincides with the
-reference point.
-
-By default, if there are multiple picts to be placed, they are
-vertically appended, aligned according to the horizontal component of
-@racket[align]. For example, if @racket[align] is @racket['cc], the
-default @racket[composer] is @racket[vc-append]; for @racket['lt], the
-default @racket[composer] is @racket[vl-append]. The spacing is
-initially @racket[0].
-
-@examples[#:eval the-eval
-(ppict-do base 
-          #:go (coord 1/2 1/2 'rb)
-          (colorize (circle 20) "red")
-          #:go (coord 1/2 1/2 'lt)
-          (colorize (circle 20) "darkgreen"))
-(ppict-do base
-          #:go (coord 1 0 'rt #:abs-x -5 #:abs-y 10)
-          50 (code:comment "change spacing")
-          (text "abc")
-          (text "12345")
-          0  (code:comment "and again")
-          (text "ok done"))
-(ppict-do base
-          #:go (coord 0 0 'lt #:compose ht-append)
-          (circle 10)
-          (circle 20)
-          (circle 30))
-]
-}
-
-@defproc[(grid [cols exact-positive-integer?]
-               [rows exact-positive-integer?]
-               [col exact-integer?]
-               [row exact-integer?]
-               [align (or/c 'lt 'ct 'rt 'lc 'cc 'rc 'lb 'cb 'rb) 'cc]
-               [#:abs-x abs-x real? 0]
-               [#:abs-y abs-y real? 0]
-               [#:compose composer procedure? #, @elem{computed from @racket[align]}])
-         refpoint-placer?]{
-
-Returns a placer that places picts according to a position in a
-virtual grid. The @racket[row] and @racket[col] indexes are numbered
-starting at @racket[1].
-
-Uses of @racket[grid] can be translated into uses of @racket[coord],
-but the translation depends on the alignment. For example,
-@racket[(grid 2 2 1 1 'lt)] is equivalent to @racket[(coord 0 0 'lt)],
-but @racket[(grid 2 2 1 1 'rt)] is equivalent to @racket[(coord 1/2 0 'rt)].
-
-@examples[#:eval the-eval
-(define none-for-me-thanks
-  (ppict-do base
-            #:go (grid 2 2 1 1 'lt)
-            (text "You do not like")
-            (colorize (text "green eggs and ham?") "darkgreen")))
-none-for-me-thanks
-(ppict-do none-for-me-thanks
-          #:go (grid 2 2 2 1 'rb)
-          (colorize (text "I do not like them,") "red")
-          (text "Sam-I-am."))
-]
-}
-
-@defproc[(cascade [step-x (or/c real? 'auto) 'auto]
-                  [step-y (or/c real? 'auto) 'auto])
-         placer?]{
-
-Returns a placer that places picts by evenly spreading them diagonally
-across the base pict in ``cascade'' style. This placer does not
-support changing the spacing by including a real number within the
-pict sequence.
-
-When a list picts is to be placed, their bounding boxes are normalized
-to the maximum width and height of all picts in the list; each pict is
-centered in its new bounding box. The picts are then cascaded so there
-is @racket[step-x] space between each of the picts' left edges; there
-is also @racket[step-x] space between the base pict's left edge and
-the first pict's left edge. Similarly for @racket[step-y] and the
-vertical spacing.
-
-If @racket[step-x] or @racket[step-y] is @racket['auto], the spacing
-between the centers of the picts to be placed is determined
-automatically so that the inter-pict spacing is the same as the
-spacing between the last pict and the base.
-
-@examples[#:eval the-eval
-(ppict-do base
-          #:go (cascade)
-          (colorize (filled-rectangle 100 100) "red")
-          (colorize (filled-rectangle 100 100) "blue"))
-(ppict-do base
-          #:go (cascade 40 20)
-          (colorize (filled-rectangle 100 100) "red")
-          (colorize (filled-rectangle 100 100) "blue"))
-]
-}
-
-@defproc[(tile [cols exact-positive-integer?]
-               [rows exact-positive-integer?])
-         placer?]{
-
-Returns a placer that places picts by tiling them in a grid
-@racket[cols] columns wide and @racket[rows] rows high.
-
-@examples[#:eval the-eval
-(ppict-do base
-          #:go (tile 2 2)
-          (circle 50)
-          (rectangle 50 50)
-          (jack-o-lantern 50)
-          (standard-fish 50 30 #:color "red"))
-]
-}
-
-@defproc[(at-find-pict [find-path (or/c tag-path? pict-path?)]
-                       [finder procedure? cc-find]
-                       [align (or/c 'lt 'ct 'rt 'lc 'cc 'rc 'lb 'cb 'rb) 'cc]
-                       [#:abs-x abs-x real? 0]
-                       [#:abs-y abs-y real? 0]
-                       [#:compose composer procedure? #, @elem{computed from @racket[align]}])
-         refpoint-placer?]{
-
-Returns a placer that places picts according to a reference point
-based on an existing pict within the base.
-
-@examples[#:eval the-eval
-(ppict-do base
-          #:go (cascade)
-          (tag-pict (standard-fish 40 20 #:direction 'right #:color "red") 'red-fish)
-          (tag-pict (standard-fish 50 30 #:direction 'left #:color "blue") 'blue-fish)
-          #:go (at-find-pict 'red-fish rc-find 'lc #:abs-x 10)
-          (text "red fish"))
-]
-}
-
-@defproc[(merge-refpoints [x-placer refpoint-placer?] 
-                          [y-placer refpoint-placer?])
-         refpoint-placer?]{
-
-Returns a placer like @racket[x-placer] except that the y-coordinate of its
-reference point is computed by @racket[y-placer].
-
-@examples[#:eval the-eval
-(ppict-do base
-          #:go (cascade)
-          (tag-pict (standard-fish 40 20 #:direction 'right #:color "red") 'red-fish)
-          (tag-pict (standard-fish 50 30 #:direction 'left #:color "blue") 'blue-fish)
-          #:go (merge-refpoints (coord 1 0 'rc)
-                                (at-find-pict 'red-fish))
-          (text "red fish"))
-]
-}
-
-
-@section[#:tag "pslide"]{Progressive Slides}
-
-@defmodule[unstable/gui/pslide]
-
-@defform[(pslide ppict-do-fragment ...)]{
-
-Produce slide(s) using @tech{progressive picts}. See @racket[ppict-do]
-for an explanation of @racket[ppict-do-fragment]s.
-
-Note that like @racket[slide] but unlike @racket[ppict-do*], the
-number of slides produced is one greater than the number of
-@racket[#:next] uses; that is, a slide is created for the final pict.
-
-Remember to include @racket[gap-size] after updating the current
-placer if you want @racket[slide]-like spacing.
-
-@examples[#:eval the-eval
-(eval:alts (pslide #:go (coord 0 0 'lt)
-                   (t "You do not like")
-                   (colorize (t "green eggs and ham?") "darkgreen")
-                   #:next
-                   #:go (coord 1 1 'rb)
-                   (colorize (t "I do not like them,") "red")
-                   (t "Sam-I-am."))
-           (let-values ([(final slides0)
-                         (ppict-do* (colorize (filled-rectangle 200 150) "white")
-                                    #:go (coord 1/20 1/20 'lt) ;; for margins
-                                    (text "You do not like")
-                                    (colorize (text "green eggs and ham?")
-                                              "darkgreen")
-                                    #:next
-                                    #:go (coord 19/20 19/20 'rb) ;; for margins
-                                    (colorize (text "I do not like them,") "red")
-                                    (text "Sam-I-am.")
-                                    #:next)])
-             (let ([slides
-                    (inset
-                     (vl-append -10 
-                                (colorize (text "slides" '(bold . roman)) "white")
-                                (inset (apply hc-append 20 slides0) 15))
-                     5)])
-               (cc-superimpose
-                (colorize (filled-rectangle (pict-width slides) (pict-height slides))
-                          "darkgray")
-                slides))))
-]
-
-Note that the text is not flush against the sides of the slide,
-because @racket[pslide] uses a base pict the size of the client
-area, excluding the margins.
-}
-
-@defparam[pslide-base-pict make-base-pict (-> pict)]{
-
-Controls the initial pict used by @racket[pslide]. The default value
-is
-@racketblock[
-(lambda () (blank client-w client-h))
-]
-}
-
-@defparam[pslide-default-placer placer placer?]{
-
-Controls the initial placer used by @racket[pslide]. The default value
-is
-@racketblock[
-(coord 1/2 1/2 'cc)
-]
-}
-
-@(close-eval the-eval)
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/scribble.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/scribble.scrbl
deleted file mode 100644
index 0d945fa187..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/scribble.scrbl
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang scribble/manual
-@(require "../utils.rkt"
-          (for-label slideshow
-                     unstable/contract
-                     unstable/gui/scribble))
-
-@title{Scribble Utilities}
-@unstable[@author+email["Jon Rafkind" "rafkind@racket-lang.org"]]
-
-@defmodule[unstable/gui/scribble]
-
-@defproc[(codeblock->pict [block block?]) pict?]{
-
-Converts a scribble block element into a pict.
-}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/slideshow.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/slideshow.scrbl
deleted file mode 100644
index 9280bbc9fb..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/slideshow.scrbl
+++ /dev/null
@@ -1,216 +0,0 @@
-#lang scribble/manual
-@(require "../utils.rkt"
-          (for-label slideshow
-                     unstable/contract
-                     unstable/gui/slideshow))
-
-@title{Slideshow Presentations}
-@unstable[@author+email["Carl Eastlund" "cce@racket-lang.org"]]
-
-@defmodule[unstable/gui/slideshow]
-
-This module also exports everything provided by
-@racketmodname[unstable/gui/pict].
-
-@section{Text Formatting}
-
-@defform[(with-size size expr)]{
-
-Sets @racket[current-font-size] to @racket[size] while running @racket[expr].
-
-}
-
-@defform[(with-scale scale expr)]{
-
-Multiplies @racket[current-font-size] by @racket[scale] while running
-@racket[expr].
-
-}
-
-@deftogether[(
-@defform[(big text)]
-@defform[(small text)]
-)]{
-
-Scale @racket[current-font-size] by @racket[3/2] or @racket[2/3], respectively,
-while running @racket[text].
-
-}
-
-@defform[(with-font font expr)]{
-
-Sets @racket[current-main-font] to @racket[font] while running @racket[expr].
-
-}
-
-@defform[(with-style style expr)]{
-
-Adds @racket[style] to @racket[current-main-font] (via @racket[cons]) while
-running @racket[expr].
-
-}
-
-@deftogether[(
-@defform[(bold text)]
-@defform[(italic text)]
-@defform[(subscript text)]
-@defform[(superscript text)]
-@defform[(caps text)]
-)]{
-
-Adds the attributes for bold, italic, superscript, subscript, or small caps
-text, respectively, to @racket[current-main-font] while running @racket[text].
-
-}
-
-@section{Tables}
-
-@defproc[(tabular [row (listof (or/c string? pict?))] ...
-                  [#:gap gap natural-number/c gap-size]
-                  [#:hgap hgap natural-number/c gap]
-                  [#:vgap vgap natural-number/c gap]
-                  [#:align align (->* [] [] #:rest (listof pict?) pict?) lbl-superimpose]
-                  [#:halign halign (->* [] [] #:rest (listof pict?) pict?) align]
-                  [#:valign valign (->* [] [] #:rest (listof pict?) pict?) align])
-         pict?]{
-
-Constructs a table containing the given @racket[row]s, all of which must be of
-the same length.  Applies @racket[t] to each string in a @racket[row] to
-construct a pict.  The @racket[hgap], @racket[vgap], @racket[halign], and
-@racket[valign] are used to determine the horizontal and vertical gaps and
-alignments as in @racket[table] (except that every row and column is uniform).
-
-}
-
-@section{Multiple Columns}
-
-@defform[(two-columns one two)]{
-
-Constructs a two-column pict using @racket[one] and @racket[two] as the two
-columns.  Sets @racket[current-para-width] appropriately in each column.
-
-}
-
-@defproc[(mini-slide [pict pict?] ...) pict?]{
-
-Appends each @racket[pict] vertically with space between them, similarly to the
-@racket[slide] function.
-
-}
-
-@defproc[(columns [pict pict?] ...) pict?]{
-
-Combines each @racket[pict] horizontally, aligned at the top, with space in
-between.
-
-}
-
-@defform[(column width body ...)]{
-
-Sets @racket[current-para-width] to @racket[width] during execution of the
-@racket[body] expressions.
-
-}
-
-@defproc[(column-size [n exact-positive-integer?]
-                      [r real? (/ n )])
-         real?]{
-
-Computes the width of one column out of @racket[n] that takes up a ratio of
-@racket[r] of the available space (according to @racket[current-para-width]).
-
-}
-
-@section{Staged Slides}
-
-@defform[(staged [name ...] body ...)]{
-
-Executes the @racket[body] terms once for each stage @racket[name].  The terms
-may include expressions and mutually recursive definitions.  Within the body,
-each @racket[name] is bound to a number from @racket[1] to the number of stages
-in order.  Furthermore, during execution @racket[stage] is bound to the number
-of the current stage and @racket[stage-name] is bound to a symbol representing
-the @racket[name] of the current stage.  By comparing @racket[stage] to the
-numeric value of each @racket[name], or @racket[stage-name] to quoted symbols of
-the form @racket['name], the user may compute based on the progression of the
-stages.
-}
-
-@deftogether[(
-@defform[#:id stage stage]
-@defform[#:id stage-name stage-name]
-)]{
-
-These keywords are bound during the execution of @racket[staged] and should not
-be used otherwise.
-}
-
-@defform[(slide/staged [name ...] arg ...)]{
-
-Creates a staged slide.  Equivalent to @racket[(staged [name ...] (slide arg
-...))].
-
-Within a staged slide, the boolean arguments to @racket[hide], @racket[show],
-@racket[strike], and @racket[shade] can be used to determine in which stages to
-perform a transformation.  The macros @racket[pict-if], @racket[pict-cond],
-@racket[pict-case], and @racket[pict-match] may also be used to create images
-which change naturally between stages.
-}
-
-@section{Revealing Slides}
-
-@addition{Jon Rafkind}
-
-@defform[(reveal number expr ...)]{
-
-Expands to either @racket[(show expr ...)] or @racket[(hide expr ...)] if
-@racket[number] is greater than or equal to the current revealed slide within a
-@racket[revealing-slide].
-
-}
-
-@defform[(revealing-slide expr ...)]{
-
-Creates N slides where N is the maximum number given to a @racket[reveal]
-expression as the first argument. Each slide has the current reveal number
-incremented by one so progressive slides can reveal picts in that appear in
-arbitrary places.
-
-@racketblock[
-(revealing-slide
-  (hc-append (reveal 0 @t{I show up first})
-             (reveal 1 @t{I show up second}))
-  (reveal 1 @t{I also show up second}))
-]
-
-}
-
-@defform[(items-slide (name ...) expr ...)]{
-
-Creates N slides where N is the maximum number given to a @racket[reveal]
-similar to @racket[revealing-slide]. Each slide will show the names on the left
-hand side using right justification and only one reveal will be displayed on the
-right. The order of the names will be matched with the current reveal number so
-the first item will be displayed while the first reveal is displayed. Reveals
-that are not active will have their corresponding items displayed but in a light
-font so as to indicate inactivity.
-
-@racketblock[
-(items-slide ("item1" "item2" "item3")
-  (reveal 0
-    @t{I will show up for item1})
-  (reveal 1
-    @t{I will show up for item2})
-  (reveal 2
-    @t{I will show up for item3}))
-]
-
-}
-
-@section{Miscellaneous Slide Utilities}
-
-@addition{Scott Owens}
-
-@defproc[(blank-line) pict?]{
-Adds a blank line of the current font size's height.
-}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/snip.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/snip.scrbl
deleted file mode 100644
index 97a3a0e0a5..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/snip.scrbl
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang scribble/manual
-
-@(require "../utils.rkt"
-          (for-label racket/base
-                     racket/class
-                     racket/gui/base
-                     unstable/gui/snip
-                     racket/contract))
-
-@title[#:tag "snip"]{Snip Utilities}
-@unstable[@author+email["Neil Toronto" "neil.toronto@gmail.com"]]
-
-@defmodule[unstable/gui/snip]
-
-@defclass[snip-canvas% editor-canvas% ()]{
-A canvas that contains a single snip.
-
-Snips cannot be placed directly on dialogs, frames and panels.
-To use an interactive snip in a GUI,
-it must be inserted into an editor, which itself must be placed on a special canvas, which can be placed in a GUI container.
-To provide a seamless user experience, the editor should be enabled but not writable,
-not be able to receive focus, not have scrollbars, and other small details.
-
-The @racket[snip-canvas%] class handles these details, making it easy to use interactive snips as normal GUI elements.
-
-@defconstructor[([parent (or/c (is-a?/c frame%) (is-a?/c dialog%)
-                               (is-a?/c panel%) (is-a?/c pane%))]
-                 [make-snip ((integer-in 0 10000) (integer-in 0 10000) . -> . snip%)]
-                 [style (listof (one-of/c 'no-border 'control-border 'combo
-                                          'resize-corner 'no-focus 'deleted
-                                          'transparent)) null]
-                 [label (or/c label-string? false/c) #f]
-                 [horizontal-inset (integer-in 0 1000) 5]
-                 [vertical-inset (integer-in 0 1000) 5]
-                 [enabled any/c #t]
-                 [vert-margin (integer-in 0 1000) 0]
-                 [horiz-margin (integer-in 0 1000) 0]
-                 [min-width (integer-in 0 10000) 0]
-                 [min-height (integer-in 0 10000) 0]
-                 [stretchable-width any/c #t]
-                 [stretchable-height any/c #t])]{
-Unlike instances of @racket[editor-canvas%], each instance of this class creates and manages its own editor.
-The editor contains one object: a @racket[snip%] instance created by @racket[make-snip].
-
-The @racket[make-snip] function receives the requested width and height of the snip, which are calculated from the size of the snip canvas.
-It is called the first time the snip canvas is resized, which most likely coincides with the first time the snip canvas is shown.
-The snip is thus created @italic{lazily}: only when needed, at the size needed.
-See @method[snip-canvas% on-size] for more details and an example.
-
-The @racket[style] list is prepended with @racket['no-hscroll] and @racket['no-vscroll] before being passed to the @racket[editor-canvas%] constructor.
-The other constructor arguments are passed untouched.
-}
-
-@defmethod[(get-snip) (or/c (is-a?/c snip%) #f)]{
-Returns the wrapped snip, or @racket[#f] if @racket[make-snip] has not been called yet.
-}
-
-@defmethod[#:mode override 
-           (on-size [width (integer-in 0 10000)]
-                    [height (integer-in 0 10000)])
-           void?]{
-This is called when the snip canvas is resized.
-
-On the first call, @method[snip-canvas% on-size] calls @racket[make-snip] with width and height arguments
-respectively @racket[(max 0 (- width (* 2 horizontal-inset)))] and @racket[(max 0 (- height (* 2 vertical-inset)))].
-It then inserts the resulting snip into its editor.
-
-On subsequent calls, @method[snip-canvas% on-size] calls the snip's @method[snip% resize] method, calculating the width and height arguments the same way.
-
-When a @racket[snip-canvas%] instance is intended to wrap an existing @racket[snip%] instance, @racket[make-snip] should simply resize it and return it.
-
-Example: functions from @racketmodname[plot #:indirect]
-create snips and call a function similar to the following to place plots in a frame:
-@racketblock[
-(define (make-snip-frame snip w h label)
-  (define (make-snip width height)
-    (send snip resize width height)
-    snip)
-  
-  (define frame
-    (new frame%
-         [label label]
-         [width (+ 5 5 5 5 w)]
-         [height (+ 5 5 5 5 h)]))
-  
-  (new snip-canvas%
-       [parent frame]
-       [make-snip make-snip]
-       [horiz-margin 5] [vert-margin 5]
-       [horizontal-inset 5] [vertical-inset 5])
-  
-  frame)]
-}
-
-} @; defclass snip-canvas%
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/unstable-gui.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/unstable-gui.scrbl
deleted file mode 100644
index 827179f4b0..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/gui/unstable-gui.scrbl
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang scribble/doc
-@(require scribble/base
-          scribble/manual
-          (for-label scribble/base))
-
-@title[#:style '(toc) #:tag "unstable-gui"]{Unstable GUI: May Change Without Warning}
-
-This manual documents GUI libraries available in the
-@racketidfont{unstable} collection. See @other-doc['(lib
-"unstable/scribblings/unstable.scrbl")] for more information about
-unstable libraries.
-
-@local-table-of-contents[#:style 'immediate-only]
-
-@include-section["notify.scrbl"]
-@include-section["prefs.scrbl"]
-@include-section["pict.scrbl"]
-@include-section["slideshow.scrbl"]
-@include-section["pslide.scrbl"]
-@include-section["snip.scrbl"]
-@include-section["scribble.scrbl"]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/hash.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/hash.scrbl
deleted file mode 100644
index fd34a55353..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/hash.scrbl
+++ /dev/null
@@ -1,72 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt" (for-label scheme unstable/hash))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/hash))
-
-@title{Hash Tables}
-@unstable[@author+email["Carl Eastlund" "cce@racket-lang.org"]]
-
-@defmodule[unstable/hash]
-
-This module provides tools for manipulating hash tables.
-
-@defproc[(hash-union [h0 (and/c hash? hash-can-functional-set?)]
-                     [h hash?] ...
-                     [#:combine combine
-                                (-> any/c any/c any/c)
-                                (lambda _ (error 'hash-union ....))]
-                     [#:combine/key combine/key
-                                    (-> any/c any/c any/c any/c)
-                                    (lambda (k a b) (combine a b))])
-         (and/c hash? hash-can-functional-set?)]{
-
-Computes the union of @racket[h0] with each hash table @racket[h] by functional
-update, adding each element of each @racket[h] to @racket[h0] in turn.  For each
-key @racket[k] and value @racket[v], if a mapping from @racket[k] to some value
-@racket[v0] already exists, it is replaced with a mapping from @racket[k] to
-@racket[(combine/key k v0 v)].
-
-@defexamples[
-#:eval the-eval
-(hash-union (make-immutable-hash '([1 . one]))
-            (make-immutable-hash '([2 . two]))
-            (make-immutable-hash '([3 . three])))
-(hash-union (make-immutable-hash '([1 . (one uno)] [2 . (two dos)]))
-            (make-immutable-hash '([1 . (ein une)] [2 . (zwei deux)]))
-            #:combine/key (lambda (k v1 v2) (append v1 v2)))
-]
-
-}
-
-@defproc[(hash-union! [h0 (and/c hash? hash-mutable?)]
-                      [h hash?] ...
-                      [#:combine combine
-                                 (-> any/c any/c any/c)
-                                 (lambda _ (error 'hash-union ....))]
-                      [#:combine/key combine/key
-                                     (-> any/c any/c any/c any/c)
-                                     (lambda (k a b) (combine a b))])
-         void?]{
-
-Computes the union of @racket[h0] with each hash table @racket[h] by mutable
-update, adding each element of each @racket[h] to @racket[h0] in turn.  For each
-key @racket[k] and value @racket[v], if a mapping from @racket[k] to some value
-@racket[v0] already exists, it is replaced with a mapping from @racket[k] to
-@racket[(combine/key k v0 v)].
-
-@defexamples[
-#:eval the-eval
-(define h (make-hash))
-h
-(hash-union! h (make-immutable-hash '([1 . (one uno)] [2 . (two dos)])))
-h
-(hash-union! h
-             (make-immutable-hash '([1 . (ein une)] [2 . (zwei deux)]))
-             #:combine/key (lambda (k v1 v2) (append v1 v2)))
-h
-]
-
-}
-
-@(close-eval the-eval)
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/info.rkt b/pkgs/unstable-pkgs/unstable-doc/scribblings/info.rkt
deleted file mode 100644
index f80b7d66a1..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define test-responsibles '(("utils.rkt" samth)
-                            ("sequence.scrbl" samth)
-                            ("match.scrbl" samth)
-                            ("logging.scrbl" stamourv)
-                            ("hash.scrbl" samth)
-                            ("debug.scrbl" samth)))
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/lazy-require.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/lazy-require.scrbl
deleted file mode 100644
index e48a912e03..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/lazy-require.scrbl
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval
-          "utils.rkt"
-          (for-label racket/base
-                     racket/runtime-path
-                     unstable/lazy-require
-                     compiler/cm-accomplice))
-
-@title[#:tag "lazy-require"]{Lazy Require}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/lazy-require]
-
-@defform[(begin-on-demand #:export (fun-id ...)
-            body ...+)]{
-
-Defines each @racket[fun-id] as a function that, when called,
-dynamically loads and executes the @racket[body] forms. The
-@racket[body] forms must contain definitions for each @racket[fun-id],
-and the value of each @racket[fun-id] must be a function.
-
-A @racket[body] form may be any module-level form except
-@racket[provide]. In particular, @racket[require] forms are allowed.
-
-The @racket[body] forms are placed within a submodule that extends the
-scope of the enclosing module (ie, @racket[module*] with @racket[#f]
-in the language position). Consequently, any references to sibling
-submodules must include a with @racket[".."] module path element.
-}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/list.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/list.scrbl
deleted file mode 100644
index 116dc2cdb7..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/list.scrbl
+++ /dev/null
@@ -1,225 +0,0 @@
-#lang scribble/doc
-@(require scribble/base scribble/manual scribble/eval "utils.rkt"
-          (for-label racket/base racket/dict syntax/id-table racket/contract
-                     unstable/list))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/list))
-
-@title[#:tag "list"]{Lists}
-@unstable-header[]
-
-@defmodule[unstable/list]
-
-@defproc[(list-prefix? [l list?]
-                       [r list?])
-         boolean?]{
- True if @racket[l] is a prefix of @racket[r].
-@examples[#:eval the-eval
-(list-prefix? '(1 2) '(1 2 3 4 5))
-]
-}
-
-@defproc[(take-common-prefix [l list?] [r list?]
-                             [#:same? same? equal?])
-         list?]{
-
-  Returns the longest common prefix of @racket[l] and @racket[r].
-
-@examples[#:eval the-eval
-(take-common-prefix '(a b c d) '(a b x y z))
-]
-}
-
-@defproc[(drop-common-prefix [l list?] [r list?]
-                             [#:same same? equal?])
-         (values list? list?)]{
-
-  Returns the tails of @racket[l] and @racket[r] with the common
-  prefix removed.
-
-@examples[#:eval the-eval
-(drop-common-prefix '(a b c d) '(a b x y z))
-]
-}
-
-@defproc[(split-common-prefix [l list?] [r list?]
-                              [#:same? same? equal?])
-         (values list? list? list?)]{
-
-  Returns the longest common prefix together with the tails of
-  @racket[l] and @racket[r] with the common prefix removed.
-
-@examples[#:eval the-eval
-(split-common-prefix '(a b c d) '(a b x y z))
-]
-}
-
-@addition{Sam Tobin-Hochstadt}
-
-@defproc[(filter-multiple [l list?] [f procedure?] ...) (values list? ...)]{
-Produces @racket[(values (filter f l) ...)].
-
-@examples[#:eval the-eval
-(filter-multiple (list 1 2 3 4 5) even? odd?)
-]
-}
-
-@defproc[(extend [l1 list?] [l2 list?] [v any/c]) list?]{
-Extends @racket[l2] to be as long as @racket[l1] by adding @racket[(-
-(length l1) (length l2))] copies of @racket[v] to the end of
-@racket[l2].
-
-@examples[#:eval the-eval
-(extend '(1 2 3) '(a) 'b)
-]}
-
-
-@addition{Ryan Culpepper}
-
-@defproc[(check-duplicate [lst list?]
-                          [#:key extract-key (-> any/c any/c) (lambda (x) x)]
-                          [#:same? same?
-                                   (or/c (any/c any/c . -> . any/c)
-                                         dict?)
-                                   equal?])
-         (or/c any/c #f)]{
-
-Returns the first duplicate item in @racket[lst]. More precisely, it
-returns the first @racket[_x] such that there was a previous
-@racket[_y] where @racket[(same? (extract-key _x) (extract-key _y))].
-
-The @racket[same?] argument can either be an equivalence predicate
-such as @racket[equal?] or @racket[eqv?] or a dictionary. In the
-latter case, the elements of the list are mapped to @racket[#t] in the
-dictionary until an element is discovered that is already mapped to a
-true value. The procedures @racket[equal?], @racket[eqv?], and
-@racket[eq?] automatically use a dictionary for speed.
-
-@(the-eval '(require syntax/id-table racket/dict))
-@examples[#:eval the-eval
-(check-duplicate '(1 2 3 4))
-(check-duplicate '(1 2 3 2 1))
-(check-duplicate '((a 1) (b 2) (a 3)) #:key car)
-(define id-t (make-free-id-table))
-(check-duplicate (syntax->list #'(a b c d a b))
-                 #:same? id-t)
-(dict-map id-t list)
-]
-}
-
-
-@addition{Carl Eastlund}
-
-@defproc[(map/values [n natural-number/c]
-                     [f (-> A ... (values B_1 ... B_n))]
-                     [lst (listof A)]
-                     ...)
-         (values (listof B_1) ... (listof B_n))]{
-
-Produces lists of the respective values of @racket[f] applied to the elements in
-@racket[lst ...] sequentially.
-
-@defexamples[
-#:eval the-eval
-(map/values
- 3
- (lambda (x)
-   (values (+ x 1) x (- x 1)))
- (list 1 2 3))
-]
-
-}
-
-@defproc[(map2 [f (-> A ... (values B C))] [lst (listof A)] ...)
-         (values (listof B) (listof C))]{
-
-Produces a pair of lists of the respective values of @racket[f] applied to the
-elements in @racket[lst ...] sequentially.
-
-@defexamples[
-#:eval the-eval
-(map2 (lambda (x) (values (+ x 1) (- x 1))) (list 1 2 3))
-]
-
-}
-
-@addition{David Van Horn}
-
-@defproc[(remf [pred procedure?]
-               [lst list?])
-         list?]{
-Returns a list that is like @racket[lst], omitting the first element of @racket[lst] 
-for which @racket[pred] produces a true value.
-
-@defexamples[
-#:eval the-eval
-(remf negative? '(1 -2 3 4 -5))
-]
-
-}
-
-@addition{Vincent St-Amour}
-
-@defproc[(group-by [extract-key (-> A B)]
-                   [lst (listof A)]
-                   [=? (-> B B any/c) equal?])
-         (listof (listof A))]{
-
-Groups the given list into equivalence classes, with equivalence being
-determined by @racket[=?]. Within each equivalence class, @racket[group-by]
-preserves the ordering of the original list. The ordering of the equivalence
-classes themselves is unspecified.
-
-@examples[#:eval the-eval
-(group-by (lambda (x) (modulo x 3)) '(1 2 1 2 54 2 5 43 7 2 643 1 2 0))
-]
-}
-
-@defproc[(cartesian-product [lst (listof A)] ...)
-         (listof (listof A))]{
-
-Computes the n-ary cartesian product of the given lists.
-
-@examples[#:eval the-eval
-(cartesian-product '(1 2 3) '(a b c))
-(cartesian-product '(4 5 6) '(d e f) '(#t #f))
-]
-}
-
-
-@addition{Eric Dobson}
-
-
-@defproc[(list-update [lst list?]
-                      [index (and/c (>=/c 0) (</c (length lst)))]
-                      [updater (-> any/c any/c)])
-         list?]{
-
-Returns a list that is the same as @racket[lst] except at the specified index.
-The element at the specified index is @racket[(updater (list-ref lst index))].
-
-@examples[#:eval the-eval
-(list-update '(zero one two) 1 symbol->string)
-]
-}
-
-
-@defproc[(list-set [lst list?]
-                   [index (and/c (>=/c 0) (</c (length lst)))]
-                   [value any/c])
-         list?]{
-
-Returns a list that is the same as @racket[lst] except at the specified index.
-The element at the specified index is @racket[value].
-
-@examples[#:eval the-eval
-(list-set '(zero one two) 2 "two")
-]
-
-
-}
-
-
-
-@close-eval[the-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/logging.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/logging.scrbl
deleted file mode 100644
index d2728e1394..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/logging.scrbl
+++ /dev/null
@@ -1,94 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt" (for-label racket unstable/logging))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/logging))
-
-@title{Logging}
-@unstable[@author+email["Vincent St-Amour" "stamourv@racket-lang.org"]]
-
-@defmodule[unstable/logging]
-
-This module provides tools for logging.
-
-@defproc[(with-logging-to-port
-           [port output-port?] [proc (-> any)]
-           [log-spec (or/c 'fatal 'error 'warning 'info 'debug symbol? #f)] ...)
-         any]{
-
-Runs @racket[proc], outputting any logging that would be received by
-@racket[(make-log-receiver (current-logger) log-spec ...)] to @racket[port].
-Returns whatever @racket[proc] returns.
-
-@defexamples[
-#:eval the-eval
-(let ([my-log (open-output-string)])
-  (with-logging-to-port my-log
-    (lambda ()
-      (log-warning "Warning World!")
-      (+ 2 2))
-    'warning)
-  (get-output-string my-log))]}
-
-
-@defproc[(with-intercepted-logging
-           [interceptor (-> (vector/c
-                              (or/c 'fatal 'error 'warning 'info 'debug)
-                              string?
-                              any/c
-                              (or/c symbol? #f))
-                             any)]
-           [proc (-> any)]
-           [log-spec (or/c 'fatal 'error 'warning 'info 'debug symbol? #f)] ...)
-         any]{
-
-Runs @racket[proc], calling @racket[interceptor] on any log message that would
-be received by @racket[(make-log-receiver (current-logger) log-spec ...)].
-@racket[interceptor] receives the entire log vectors
-(see @secref["receiving-logged-events" #:doc '(lib "scribblings/reference/reference.scrbl")])
-as arguments. Returns whatever @racket[proc] returns.
-
-@defexamples[
-#:eval the-eval
-(let ([warning-counter 0])
-  (with-intercepted-logging
-    (lambda (l)
-      (when (eq? (vector-ref l 0) ; actual level
-                 'warning)
-        (set! warning-counter (add1 warning-counter))))
-    (lambda ()
-      (log-warning "Warning!")
-      (log-warning "Warning again!")
-      (+ 2 2))
-    'warning)
-  warning-counter)]}
-
-
-A lower-level interface to logging is also available.
-
-@deftogether[[
-  @defproc[(start-recording
-            [log-spec (or/c 'fatal 'error 'warning 'info 'debug symbol? #f)] ...)
-           listener?]
-  @defproc[(stop-recording [listener listener?])
-           (listof (vector/c (or/c 'fatal 'error 'warning 'info 'debug)
-                             string?
-                             any/c
-                             (or/c symbol? #f)))]]]{
-
-@racket[start-recording] starts recording log messages matching the given
-@racket[log-spec] (see @racket[make-log-receiver] for how @racket[log-spec] is
-interpreted). Messages will be recorded until stopped by passing the returned
-listener object to @racket[stop-recording]. @racket[stop-recording] will then
-return a list of the log messages that have been reported.
-
-@defexamples[
-#:eval the-eval
-(define l (start-recording 'warning))
-(log-warning "1")
-(log-warning "2")
-(stop-recording l)
-]}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/macro-testing.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/macro-testing.scrbl
deleted file mode 100644
index 707874ee35..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/macro-testing.scrbl
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt"
-          (for-label racket/base 
-                     racket/contract
-                     racket/struct-info
-                     rackunit
-                     unstable/macro-testing))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require rackunit unstable/macro-testing (for-syntax racket/base racket/struct-info)))
-
-@title[#:tag "macro-testing"]{Macro Testing}
-@unstable-header[]
-
-@defmodule[unstable/macro-testing]
-
-@defform/subs[(phase1-eval ct-expr maybe-quote maybe-catch?)
-              ([maybe-quote (code:line)
-                            (code:line #:quote quote-id)]
-               [maybe-catch? (code:line)
-                             (code:line #:catch? catch?)])]{
-
-Evaluates @racket[ct-expr] at compile time and quotes the result using
-@racket[quote-id], which defaults to @racket[quote]. Another suitable
-argument for @racket[quote-id] is @racket[quote-syntax].
-
-If @racket[catch?] is @racket[#t], then if the evaluation of
-@racket[ct-expr] raises a compile-time exception, it is caught and
-converted to a run-time exception.
-
-@examples[#:eval the-eval
-(struct point (x y))
-(phase1-eval (extract-struct-info (syntax-local-value #'point)))
-(phase1-eval (extract-struct-info (syntax-local-value #'point))
-             #:quote quote-syntax)
-]
-}
-
-@defform[(convert-compile-time-error expr)]{
-
-Equivalent to @racket[(#%expression expr)] except if expansion of
-@racket[expr] causes a compile-time exception to be raised; in that
-case, the compile-time exception is converted to a run-time exception
-raised when the expression is evaluated.
-
-Use @racket[convert-compile-time-error] to write tests for
-compile-time error checking like syntax errors:
-
-@examples[#:eval the-eval
-(check-exn #rx"missing an \"else\" expression"
-           (lambda () (convert-compile-time-error (if 1 2))))
-(check-exn #rx"missing formals and body"
-           (lambda () (convert-compile-time-error (lambda))))
-]
-
-Without the use of @racket[convert-compile-time-error], the checks
-above would not be executed because the test program would not compile.
-}
-
-@defform[(convert-syntax-error expr)]{
-
-Like @racket[convert-compile-time-error], but only catches compile-time
-@racket[exn:fail:syntax?] exceptions and sets
-@racket[error-print-source-location] to @racket[#f] around the
-expansion of @racket[expr] to make the message easier to match
-exactly.
-
-@examples[#:eval the-eval
-(check-exn #rx"^lambda: bad syntax$"
-           (lambda () (convert-syntax-error (lambda))))
-]
-}
-
-@(close-eval the-eval)
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/markparam.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/markparam.scrbl
deleted file mode 100644
index 60b1baefb7..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/markparam.scrbl
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt" (for-label racket unstable/markparam))
-
-@title{Mark Parameters}
-@unstable[@author+email["Jay McCarthy" "jay@racket-lang.org"]]
-
-@defmodule[unstable/markparam]
-
-This library provides a simplified version of parameters that are backed by continuation marks, rather than parameterizations. This means they are slightly slower, are not inherited by child threads, do not have initial values, and cannot be imperatively mutated.
-
-@defstruct*[mark-parameter ()]{
- The struct for mark parameters. It is guaranteed to be serializable and transparent. If used as a procedure, it calls @racket[mark-parameter-first] on itself.
- }
-
-@defproc[(mark-parameter-first [mp mark-parameter?]
-                               [tag continuation-prompt-tag? default-continuation-prompt-tag])
-         any/c]{
- Returns the first value of @racket[mp] up to @racket[tag].
- }
-               
-@defproc[(mark-parameter-all [mp mark-parameter?]
-                             [tag continuation-prompt-tag? default-continuation-prompt-tag])
-         list?]{
- Returns the values of @racket[mp] up to @racket[tag].
- }   
-  
-@defproc[(mark-parameters-all [mps (listof mark-parameter?)]
-                              [none-v [any/c #f]]
-                              [tag continuation-prompt-tag? default-continuation-prompt-tag])
-         (listof vector?)]{
-  Returns the values of the @racket[mps] up to @racket[tag]. The length
-  of each vector in the result list is the same as the length of
-  @racket[mps], and a value in a particular vector position is the value
-  for the corresponding mark parameter in @racket[mps]. Values for
-  multiple mark parameter appear in a single vector only when the mark
-  parameters are for the same continuation frame in the current
-  continuation. The @racket[none-v] argument is used for vector elements
-  to indicate the lack of a value.
-}
-
-@defform[(mark-parameterize ([mp expr] ...) body-expr ...)]{
-  Parameterizes @racket[(begin body-expr ...)] by associating each
-  @racket[mp] with the evaluation of @racket[expr] in the
-  parameterization of the entire expression.
-}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/match.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/match.scrbl
deleted file mode 100644
index ce7b2857e8..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/match.scrbl
+++ /dev/null
@@ -1,115 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt"
-          (for-label unstable/match racket/match racket/contract racket/base))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/class racket/match unstable/match))
-
-@title[#:tag "match"]{Match}
-@unstable-header[]
-
-@defmodule[unstable/match]
-
-@addition[@author+email["Carl Eastlund" "cce@racket-lang.org"]]
-
-@defform[(match? val-expr pat ...)]{
-
-Returns @racket[#t] if the result of @racket[val-expr] matches any of
-@racket[pat], and returns @racket[#f] otherwise.
-
-@defexamples[
-#:eval the-eval
-(match? (list 1 2 3)
-  (list a b c)
-  (vector x y z))
-(match? (vector 1 2 3)
-  (list a b c)
-  (vector x y z))
-(match? (+ 1 2 3)
-  (list a b c)
-  (vector x y z))
-]
-
-}
-
-@defform[(as ([lhs-id rhs-expr] ...) pat ...)]{
-
-As a match expander, binds each @racket[lhs-id] as a pattern variable with the
-result value of @racket[rhs-expr], and continues matching each subsequent
-@racket[pat].
-
-@defexamples[
-#:eval the-eval
-(match (list 1 2 3)
-  [(as ([a 0]) (list b c d)) (list a b c d)])
-]
-
-}
-
-@addition[@author+email["Asumu Takikawa" "asumu@racket-lang.org"]]
-
-@defform[(match*? (val-expr ...) (pat ...) ...)]{
-
-Similar to @racket[match?], but uses @racket[match*] and accepts
-multiple @racket[val-expr] and corresponding @racket[pat] in each
-clause to match on.
-
-@defexamples[
-#:eval the-eval
-(match*? (1 2 3)
-  (a b c)
-  (x #f z))
-(match*? (1 2 3)
-  (a (? odd?) c)
-  (x y z))
-(match*? (#f #f #f)
-  (1 2 3)
-  (4 5 6))
-]}
-
-@defform/subs[
-  #:literals (field)
-  (object maybe-class field-clause ...)
-  ([maybe-class
-    code:blank
-    class-expr]
-   [field-clause (field field-id maybe-pat)]
-   [maybe-pat
-    code:blank
-    pat])]{
-
-A match expander that checks if the matched value is an object
-and contains the fields named by the @racket[field-id]s. If
-@racket[pat]s are provided, the value in each field is matched to
-its corresponding @racket[pat]. If a @racket[pat] is not provided,
-it defaults to the name of the field.
-
-If @racket[class-expr] is provided, the match expander will also
-check that the supplied object is an instance of the class
-that the given expression evaluates to.
-
-@defexamples[
-#:eval the-eval
-(define point%
-  (class object%
-    (super-new)
-    (init-field x y)))
-
-(match (make-object point% 3 5)
-  [(object point% (field x) (field y))
-   (sqrt (+ (* x x) (* y y)))])
-
-(match (make-object point% 0 0)
-  [(object (field x (? zero?))
-           (field y (? zero?)))
-   'origin])
-
-(match (make-object object%)
-  [(object (field x) (field y))
-   'ok]
-  [_ 'fail])
-]
-
-}
-
-@close-eval[the-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/open-place.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/open-place.scrbl
deleted file mode 100644
index 5b3a288fce..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/open-place.scrbl
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt"
-          (for-label unstable/open-place racket/place racket/contract racket/base))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/class racket/place unstable/open-place))
-
-@title[#:tag "open-place"]{Open @racket[place] expressions}
-@unstable-header[]
-
-@defmodule[unstable/open-place]
-
-@addition[@author+email["Sam Tobin-Hochstadt" "samth@racket-lang.org"]]
-
-@defform[(open-place id body ...+)]{ 
-
-Like @racket[(place id body ...)], but @racket[body ...] may have free lexical
-variables, which are automatically sent to the newly-created @tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{place}.
-Note that these variables must have values accepted by
-@racket[place-message-allowed?], otherwise an @racket[exn:fail:contract] exception is raised.
-}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/options.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/options.scrbl
deleted file mode 100644
index d6fbe76a98..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/options.scrbl
+++ /dev/null
@@ -1,242 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval unstable/scribblings/utils racket (for-label racket/contract unstable/options))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/contract unstable/options))
-
-@title[#:tag "options"]{Option Contracts}
-@unstable-header[]
-
-@defmodule[unstable/options]
-
-This module introduces @defterm{option contracts}, a flavor of behavioral
-software contracts. With option contracts developers control in a
-programmatic manner whether, when, and how often contracts are
-checked. Using this flavor of contracts, Racketeers can mimic any compiler
-flag system but also create run-time informed checking systems. 
-
-@defproc[(option/c [c contract?]
-                   [#:with-contract with boolean? #f]
-                   [#:tester tester (or/c (-> any boolean?) 'dont-care) 'dont-care]
-                   [#:invariant invariant (or/c (-> any boolean?) 'dont-care) 'dont-care]
-                   [#:immutable immutable (or/c #t #f 'dont-care) 'dont-care]
-                   [#:flat? flat? boolean? #f]
-                   [#:struct struct-id (or/c identifier? 'none) 'none])
-         contract?]{                                             
-                                             
-Returns a contract that recognizes vectors or hashes or instances of 
-struct @racket[struct-id]. The data structure must match @racket[c] and pass the
-@racket[tester]. 
-
-When an @racket[option/c] contract is attached to a value, the value is checked against the 
-@racket[tester], if @racket[tester] is a predicate. After that,
-contract checking is disabled for the value, if @racket[with] is @racket[#f]. If @racket[with]
-is @racket[#t] contract checking for the value remains enabled for @racket[c].
-
-If @racket[waive-option] is applied to a value guarded by an @racket[option/c]
-contract, then @racket[waive-option] returns the value after removing the @racket[option/c] guard.
-If @racket[exercise-option] is applied to a value guarded by an @racket[option/c]
-contract, then @racket[exercise-option] returns the value with contract checking 
-enabled for @racket[c]. If the @racket[invariant] argument is a predicate, then 
-@racket[exercise-option] returns the value with contract checking enabled for 
-@racket[(invariant/c c 
-                          invariant
-                          #:immutable immutable
-                          #:flat? flat?
-                          #:struct struct-id)].
-
-The arguments @racket[flat?] and @racket[immutable] should be provided only if @racket[invariant]
-is a predicate. In any other case, the result is a contract error.
-
-@defexamples[
-#:eval the-eval
-
-(module server0 racket
-  (require unstable/options)
-  (provide 
-   (contract-out 
-    [vec (option/c (vectorof number?))]))
-  (define vec (vector 1 2 3 4)))
-(require 'server0)
-(vector-set! vec 1 'foo)
-(vector-ref vec 1)
-
-(module server1 racket
-  (require unstable/options)
-  (provide 
-   (contract-out 
-    [vec (option/c (vectorof number?) #:with-contract #t)]))
-  (define vec (vector 1 2 3 4)))
-(require 'server1)
-(vector-set! vec 1 'foo)
-
-(module server2 racket
-  (require unstable/options)
-  (provide 
-   (contract-out 
-    [vec (option/c (vectorof number?) #:tester sorted?)]))
-  (define vec (vector 1 42 3 4))
-  (define (sorted? vec)
-    (for/and ([el vec]
-              [cel (vector-drop vec 1)])
-             (<= el cel))))
-(require 'server2)
-]  
-
-
-}
-
-@defproc[(exercise-option [x any/c]) any/c]{
-
-Returns @racket[x] with contract checking enabled if an @racket[option/c] guards
-@racket[x]. In any other case it returns @racket[x]. The result of @racket[exercise-option]
-loses the guard related to @racket[option/c], if it has one to begin with, and thus its contract checking status cannot change further.
-                                            
-@defexamples[
-#:eval the-eval
-(module server3 racket
-  (require unstable/options)
-  (provide (contract-out [foo (option/c (-> number? symbol?))]))
-  (define foo (λ (x) x)))
-(require 'server3 unstable/options)
-(define e-foo (exercise-option foo))
-(foo 42)
-(e-foo 'wrong)
-((exercise-option e-foo) 'wrong)
-]  
-} 
-                                      
-@defthing[transfer/c contract?]{
-
-A contract that accepts any value. If the value is guarded with an 
-@racket[option/c] contract, @racket[transfer/c] modifies the blame 
-information for the @racket[option/c] contract by adding the providing module and its client 
-to the positive and negative blame parties respectively. If the value is not a value guarded with an 
-@racket[option/c] contract, then @racket[transfer/c] is equivalent to @racket[any/c].
-}                   
-
- @defexamples[
-#:eval the-eval
-(module server4 racket
-  (require unstable/options)
-  (provide (contract-out [foo (option/c (-> number? symbol?))]))
-  (define foo (λ (x) x)))
-(module middleman racket
-  (require unstable/options 'server4)
-  (provide (contract-out [foo transfer/c])))
-(require 'middleman unstable/options)
-(define e-foo (exercise-option foo))
-(e-foo 1)
-;(e-foo 'wrong)
-(module server5 racket
-  (require unstable/options)
-  (provide (contract-out [boo transfer/c]))
-  (define (boo x) x))
-(require 'server5)
-(boo 42)] 
-
-
-
-@defproc[(waive-option [x any/c]) any/c]{ 
-
-If an @racket[option/c] guards @racket[x], then @racket[waive-option] returns 
-@racket[x] without the @racket[option/c] guard. 
-In any other case it returns @racket[x]. The result of @racket[waive-option]
-loses the guard related to @racket[option/c], if it had one to begin with, and thus its contract checking status cannot change further.
-
-@defexamples[
-#:eval the-eval
-(module server6 racket
-  (require unstable/options)
-  (provide (contract-out [bar (option/c (-> number? symbol?))]))
-  (define bar (λ (x) x)))
-(require 'server6 unstable/options)
-(define e-bar (waive-option bar))
-(e-bar 'wrong)
-((waive-option e-bar) 'wrong)]  
-}    
-
-@defproc[(tweak-option [x any/c]) any/c]{ 
-
-If an @racket[option/c] guards @racket[x] and contract checking for @racket[x] is enabled, 
-then @racket[tweak-option] returns 
-@racket[x] with contract checking for @racket[x] disabled. 
-If an @racket[option/c] guards @racket[x] and contract checking for @racket[x] is disabled, 
-then @racket[tweak-option] returns 
-@racket[x] with contract checking for @racket[x] enabled. 
-In any other case it returns @racket[x]. The result of @racket[tweak-option]
-retains the guard related to @racket[option/c] if it has one to begin with and thus its contract checking status can change further
-using @racket[tweak-option], @racket[exercise-option] or @racket[waive-option].
-
-@defexamples[
-#:eval the-eval
-(module server7 racket
-  (require unstable/options)
-  (provide (contract-out [bar (option/c (-> number? symbol?))]))
-  (define bar (λ (x) x)))
-(require 'server7 unstable/options)
-(define t-bar (tweak-option bar))
-(t-bar 'wrong)
-((tweak-option t-bar) 'wrong)
-((waive-option t-bar) 'wrong)
-((exercise-option t-bar) 'wrong)
-]  
-}    
- 
- 
-@defproc[(has-option? [v any/c]) boolean?]{
-  Returns @racket[#t] if @racket[v] has an option contract.
-}
-
-@defproc[(has-option-with-contract? [v any/c]) boolean?]{
-  Returns @racket[#t] if @racket[v] has an option contract with contract checking enabled.
-}
-
-@defproc[(invariant/c [c contract?]
-                   [invariant (-> any boolean?)]
-                   [#:immutable immutable (or/c #t #f 'dont-care) 'dont-care]
-                   [#:flat? flat? boolean? #f]
-                   [#:struct struct-id (or/c identifier? 'none) 'none])
-         contract?]{
-
-Returns a contract that recognizes vectors or hashes or instances of 
-struct @racket[struct-id]. The data structure must match @racket[c] and satisfy the
-@racket[invariant] argument. 
-
-If the @racket[flat?] argument is @racket[#t], then the resulting contract is
-a flat contract, and the @racket[c] arguments must also be flat contracts.  Such
-flat contracts will be unsound if applied to a mutable data structure, as they will not
-check future operations on the vector.
-
-If the @racket[immutable] argument is @racket[#t] and the @racket[c] arguments are
-flat contracts, the result will be a flat contract.  If the @racket[c] arguments
-are chaperone contracts, then the result will be a chaperone contract.
-
-
-@defexamples[
-#:eval the-eval
-(module server8 racket
-   (require unstable/options)
-   (provide
-     change
-     (contract-out 
-      [vec (invariant/c 
-            any/c
-            sorted?)]))
-  (define vec (vector 1 2 3 4 5))
-  (define (change) (vector-set! vec 2 42))
-  (define (sorted? vec)
-    (for/and ([el vec]
-              [cel (vector-drop vec 1)])
-      (<= el cel))))
-(require 'server8)
-(vector-set! vec 2 42)
-(change)
-(vector-ref vec 2)]
-
-}
-
-
-                   
-@(close-eval the-eval)
-
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/parameter-group.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/parameter-group.scrbl
deleted file mode 100644
index e34077c8f3..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/parameter-group.scrbl
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang scribble/manual
-
-@(require scribble/eval "utils.rkt" (for-label racket unstable/parameter-group))
-
-@title{Parameter Groups}
-@unstable[@author+email["Neil Toronto" "ntoronto@racket-lang.org"]]
-
-@defmodule[unstable/parameter-group]
-
-Parameter groups are parameter-like @italic{views} that represent multiple parameters.
-
-@(define evaluator (make-base-eval))
-
-@examples[#:eval evaluator
-                 (require unstable/parameter-group)
-                 (define param1 (make-parameter 1))
-                 (define param2 (make-parameter 2))
-                 (define-parameter-group params (param1 param2))
-                 (params)
-                 (parameterize/group ([params  (params-value 10 20)])
-                   (list (param1) (param2)))
-                 (params)
-                 (params (params-value 100 200))
-                 (list (param1) (param2))]
-
-Use parameter groups to conveniently set multiple parameters.
-For example, the @racketmodname[plot #:indirect] library uses parameter groups
-to save and restore appearance-controlling parameters when it must draw plots within a thunk.
-
-@defproc[(parameter-group? [v any/c]) boolean?]{
-Returns @racket[#t] when @racket[v] is a parameter group.
-}
-
-@defform/subs[(define-parameter-group name (param-or-group-expr ...) options)
-              ([options code:blank
-                        (code:line #:struct struct-name)])
-              #:contracts ([param-or-group-expr (or/c parameter? parameter-group?)])]{
-Defines a new parameter group.
-
-If @racket[struct-name] is not given, @racket[define-parameter-group] defines a new struct @racket[<name>-value] to hold the values of parameters.
-
-If @racket[struct-name] is given, it must have a constructor @racket[(struct-name param-or-group-expr ...)] that accepts as many arguments as there are parameters in the group, and a @racket[struct-name] match expander that accepts as many patterns as there are parameters.
-
-@examples[#:eval evaluator
-                 (struct two-params (p1 p2) #:transparent)
-                 (define-parameter-group params* (param1 param2) #:struct two-params)
-                 (params*)]
-}
-
-@defform[(parameterize/group ([param-or-group-expr  value-expr] ...)
-           body-expr ...+)
-         #:contracts ([param-or-group-expr (or/c parameter? parameter-group?)])]{
-Corresponds to @racket[parameterize], but can parameterize parameter groups as well as parameters.
-}
-
-@defform[(parameterize*/group ([param-or-group-expr  value-expr] ...)
-           body-expr ...+)
-         #:contracts ([param-or-group-expr (or/c parameter? parameter-group?)])]{
-Corresponds to @racket[parameterize*], but can parameterize parameter groups as well as parameters.
-}
-
-
-@close-eval[evaluator]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/pretty.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/pretty.scrbl
deleted file mode 100644
index 23d03d080c..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/pretty.scrbl
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt" (for-label racket unstable/pretty))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/pretty unstable/pretty))
-
-@title{Pretty-Printing}
-@unstable[@author+email["Carl Eastlund" "cce@racket-lang.org"]]
-
-@defmodule[unstable/pretty]
-
-This module provides tools for pretty-printing.
-
-@defproc[(pretty-format/write [x any/c]
-                              [columns
-                               (or/c exact-nonnegative-integer? 'infinity)
-                               (pretty-print-columns)])
-         string?]{
-
-This procedure behaves like @racket[pretty-format], but it formats values
-consistently with @racket[write] instead of @racket[print].
-
-@examples[#:eval the-eval
-(struct both [a b] #:transparent)
-(pretty-format/write (list (both (list 'a 'b) (list "a" "b"))))
-]
-
-}
-
-@defproc[(pretty-format/display [x any/c]
-                                [columns
-                                 (or/c exact-nonnegative-integer? 'infinity)
-                                 (pretty-print-columns)])
-         string?]{
-
-This procedure behaves like @racket[pretty-format], but it formats values
-consistently with @racket[display] instead of @racket[print].
-
-@examples[#:eval the-eval
-(struct both [a b] #:transparent)
-(pretty-format/display (list (both (list 'a 'b) (list "a" "b"))))
-]
-
-}
-
-@defproc[(pretty-format/print [x any/c]
-                              [columns
-                               (or/c exact-nonnegative-integer? 'infinity)
-                               (pretty-print-columns)])
-         string?]{
-
-This procedure behaves the same as @racket[pretty-format], but is named
-more explicitly to describe how it formats values.  It is included for
-symmetry with @racket[pretty-format/write] and @racket[pretty-format/display].
-
-@examples[#:eval the-eval
-(struct both [a b] #:transparent)
-(pretty-format/print (list (both (list 'a 'b) (list "a" "b"))))
-]
-
-}
-
-@addition{@author+email["Vincent St-Amour" "stamourv@racket-lang.org"]}
-@defproc[(break-lines [s string?] [columns exact-nonnegative-integer? (pretty-print-columns)])
-         string?]{
-Splits the string @racket[s] into multiple lines, each of width at most
-@racket[columns], splitting only at whitespace boundaries.
-@examples[#:eval the-eval
-(display (break-lines "This string is more than 80 characters long. It is 98 characters long, nothing more, nothing less."))
-]
-}
-
-
-@(close-eval the-eval)
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/recontract.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/recontract.scrbl
deleted file mode 100644
index 7b2039b1ee..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/recontract.scrbl
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval 
-          "utils.rkt"
-          (for-label racket/base
-                     racket/contract
-                     unstable/recontract))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/contract/base unstable/recontract))
-
-@title[#:tag "recontract"]{Re-Contracting Identifiers}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/recontract]
-
-@defform[(recontract-out id ...)]{
-
-Provides each @racket[id] with its existing contract, but changes the
-positive blame party of the contract to the enclosing module, instead
-of the module that originally attached the contract to @racket[id].
-Each @racket[id] must be imported from a module that exports it via
-@racket[contract-out] or @racket[recontract-out]; otherwise a syntax
-error is raised.
-
-Use @racket[recontract-out] when you want to use the same contracts
-both between different parts of a library and between the library and
-its clients. The library should use @racket[recontract-out] in the
-public interface modules so that clients do not see references to
-private implementation modules in contract errors.
-
-@examples[#:eval the-eval
-(module private racket
-  (define (f x) (if (positive? x) x 'wrong))
-  (provide (contract-out [f (-> real? real?)])))
-
-(module public racket
-  (require 'private unstable/recontract)
-  (provide (recontract-out f)))
-
-(require 'public)
-(f 1)
-(f -2)
-(f 'apple)
-]
-}
-
-@(close-eval the-eval)
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/sandbox.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/sandbox.scrbl
deleted file mode 100644
index 8b503f4e68..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/sandbox.scrbl
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt"
-          (for-label racket/base racket/contract unstable/sandbox scribble/eval))
-
-@title[#:tag "sandbox"]{Sandbox}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/sandbox]
-
-@defproc[(make-log-based-eval [log-file path-string?]
-                              [mode (or/c 'record 'replay)])
-         (-> any/c any)]{
-
-Creates an evaluator (like @racket[make-base-eval]) that uses a log
-file to either record or replay evaluations.
-
-If @racket[mode] is @racket['record], the evaluator records every
-interaction to @racket[log-file], replacing @racket[log-file] if it
-already exists. The result of each interaction must be
-@seclink["serialization" #:doc '(lib
-"scribblings/reference/reference.scrbl")]{serializable}.
-
-If @racket[mode] is @racket['replay], the evaluator uses the contents
-of @racket[log-file] instead of actually performing evaluatings. For
-each interaction, it compares the term to evaluate against the next
-interaction recorded in @racket[log-file]. If the term matches, the
-stored result is returned; if not, the evaluator raises an error
-indicating that it is out of sync with @racket[log-file].
-
-Use @racket[make-log-based-eval] to document libraries when the
-embedded examples rely on external features that may not be present or
-appropriately configured on all machines.
-}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/sequence.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/sequence.scrbl
deleted file mode 100644
index c291515800..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/sequence.scrbl
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt"
-          (for-label racket/base unstable/sequence racket/contract))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/sequence))
-@(define-syntax speed
-    (syntax-rules ()
-      [(_ id what)
-       (t "An " (racket id) " application can provide better performance for "
-          (elem what)
-          " iteration when it appears directly in a " (racket for)
-          " clause.")]))
-
-@title[#:tag "sequence"]{Sequences}
-@unstable[@author+email["Sam Tobin-Hochstadt" "samth@ccs.neu.edu"]]
-
-@defmodule[unstable/sequence]
-
-
-@defproc[(in-syntax [stx syntax?]) sequence?]{
-Produces a sequence equivalent to @racket[(syntax->list lst)].
-@speed[in-syntax "syntax"]
-
-@examples[#:eval the-eval
-(for/list ([x (in-syntax #'(1 2 3))])
-  x)]}
-
-@defproc[(in-pairs [seq sequence?]) sequence?]{
-Produces a sequence equivalent to
- @racket[(in-parallel (sequence-lift car seq) (sequence-lift cdr seq))].
-}
-
-@defproc[(in-sequence-forever [seq sequence?] [val any/c]) sequence?]{
-Produces a sequence whose values are the elements of @racket[seq], followed by @racket[val] repeated.
-}
-
-@defproc[(sequence-lift [f procedure?] [seq sequence?]) sequence?]{
-Produces the sequence of @racket[f] applied to each element of @racket[seq].
-@examples[#:eval the-eval
-(for/list ([x (sequence-lift add1 (in-range 10))])
-  x)]
-}
-
-
-@addition{David Vanderson}
-
-@defproc[(in-slice [length exact-positive-integer?] [seq sequence?])
-         sequence?]{
-  Returns a sequence where each element is a list with @racket[length]
-  elements from the given sequence.
-
-  @examples[#:eval the-eval
-  (for/list ([e (in-slice 3 (in-range 8))]) e)
-  ]
-}
-
-
-@close-eval[the-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/socket.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/socket.scrbl
deleted file mode 100644
index 4d159b47ce..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/socket.scrbl
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang scribble/manual
-@(require "utils.rkt"
-          (for-label racket/base
-                     racket/contract
-                     unstable/socket))
-
-@title[#:tag "unix-socket"]{Unix Domain Sockets}
-@unstable-header[]
-
-@defmodule[unstable/socket]
-
-@defthing[unix-socket-available?
-          boolean?]{
-
-A boolean value that indicates whether unix domain sockets are
-available and supported on the current platform. The supported
-platforms are Linux and Mac OS X; unix domain sockets are not
-supported on Windows and other Unix variants.
-}
-
-@defproc[(unix-socket-connect [socket-path unix-socket-path?])
-         (values input-port? output-port?)]{
-
-Connects to the unix domain socket associated with
-@racket[socket-path] and returns an input port and output port for
-communicating with the socket.
-}
-
-@defproc[(unix-socket-path? [v any/c]) boolean?]{
-
-Returns @racket[#t] if @racket[v] is a valid unix domain socket path
-for the current system, according to the following cases:
-
-@itemlist[
-
-@item{If @racket[v] is a path (@racket[path-string?]), then the
-current platform must be either Linux or Mac OS X, and the length of
-@racket[v]'s corresponding absolute path must be less than or equal to
-the platform-specific length (108 bytes on Linux, 104 bytes on Mac OS
-X). Example: @racket["/tmp/mysocket"].}
-
-@item{If @racket[v] is a bytestring (@racket[bytes?]), then the
-current platform must be Linux, @racket[v] must start with a
-@racket[0] (NUL) byte, and its length must be less than or equal to
-108 bytes. Such a value refers to a socket in the Linux abstract
-socket namespace. Example: @racket[#"\0mysocket"].}
-
-]
-
-Otherwise, returns @racket[#f].
-}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/string.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/string.scrbl
deleted file mode 100644
index 99e3c5308f..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/string.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/doc
-@(require scribble/base
-          scribble/manual
-          "utils.rkt"
-          (for-label unstable/string
-                     racket/contract
-                     racket/base))
-
-@title[#:tag "string"]{Strings}
-@unstable-header[]
-
-@defmodule[unstable/string]
-
-@addition{Vincent St-Amour}
-
-@defproc[(regexp-filter [pattern (or/c string? bytes? regexp? byte-regexp?)]
-                        [lst (listof (or/c string? bytes? path? input-port?))])
-         (listof (or/c string? bytes? path? input-port?))]{
-Keeps only the elements of @racket[lst] that match @racket[pattern].
-}
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/struct.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/struct.scrbl
deleted file mode 100644
index ab89427313..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/struct.scrbl
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang scribble/manual
-@(require scribble/eval "utils.rkt"
-          (for-label racket/base unstable/struct racket/contract))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/struct))
-
-@title[#:tag "struct"]{Structs}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/struct]
-
-@defform[(make struct-id expr ...)]{
-
-Creates an instance of @racket[struct-id], which must be bound as a
-struct name. The number of @racket[expr]s is statically checked
-against the number of fields associated with @racket[struct-id]. If
-they are different, or if the number of fields is not known, an error
-is raised at compile time.
-
-@examples[#:eval the-eval
-  (define-struct triple (a b c))
-  (make triple 3 4 5)
-  (make triple 2 4)
-]
-}
-
-@defproc[(struct->list [v any/c]
-                       [#:on-opaque on-opaque (or/c 'error 'return-false 'skip) 'error])
-         (or/c list? #f)]{
-
-Returns a list containing the struct instance @racket[v]'s
-fields. Unlike @racket[struct->vector], the struct name itself is not
-included.
-
-If any fields of @racket[v] are inaccessible via the current inspector
-the behavior of @racket[struct->list] is determined by
-@racket[on-opaque]. If @racket[on-opaque] is @racket['error] (the
-default), an error is raised. If it is @racket['return-false],
-@racket[struct->list] returns @racket[#f]. If it is @racket['skip],
-the inaccessible fields are omitted from the list.
-
-@examples[#:eval the-eval
-(define-struct open (u v) #:transparent)
-(struct->list (make-open 'a 'b))
-(struct->list #s(pre 1 2 3))
-(define-struct (secret open) (x y))
-(struct->list (make-secret 0 1 17 22))
-(struct->list (make-secret 0 1 17 22) #:on-opaque 'return-false)
-(struct->list (make-secret 0 1 17 22) #:on-opaque 'skip)
-(struct->list 'not-a-struct #:on-opaque 'return-false)
-(struct->list 'not-a-struct #:on-opaque 'skip)
-]
-}
-
-@close-eval[the-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/syntax.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/syntax.scrbl
deleted file mode 100644
index bc4eea5976..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/syntax.scrbl
+++ /dev/null
@@ -1,130 +0,0 @@
-#lang scribble/manual
-@(require scribble/struct scribble/decode scribble/eval "utils.rkt"
-          (for-label racket/base racket/contract syntax/kerncase
-                     racket/syntax unstable/syntax))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require unstable/syntax (for-syntax racket/base unstable/syntax)))
-
-@title[#:tag "syntax"]{Syntax}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/syntax]
-
-@defproc[(explode-module-path-index [mpi module-path-index?])
-         (listof (or/c module-path? resolved-module-path? #f))]{
-
-Unfolds @racket[mpi] using @racket[module-path-index-split], returning
-a list of the relative module paths together with the terminal
-resolved module path or @racket[#f] for the ``self'' module.
-
-@examples[#:eval the-eval
-(explode-module-path-index (car (identifier-binding #'lambda)))
-(explode-module-path-index (caddr (identifier-binding #'lambda)))
-(explode-module-path-index (car (identifier-binding #'define-values)))
-]
-}
-
-@defform[(phase-of-enclosing-module)]{
-
-Returns the phase level of the module in which the form occurs (and
-for the instantiation of the module in which the form is
-executed). For example, if a module is required directly by the
-``main'' module (or the top level), its phase level is 0. If a module
-is required for-syntax by the ``main'' module (or the top level), its
-phase level is 1.
-
-@examples[#:eval the-eval
-(module helper racket
-  (require unstable/syntax)
-  (displayln (phase-of-enclosing-module)))
-(require 'helper)
-(require (for-meta 1 'helper))
-]
-}
-
-@defproc[(make-variable-like-transformer [reference-stx syntax?]
-                                         [setter-stx (or/c syntax? #f) #f])
-         set!-transformer?]{
-
-Creates a transformer that replaces references to the macro identifier
-with @racket[reference-stx]. Uses of the macro in operator position
-are interpreted as an application with @racket[reference-stx] as the
-function and the arguments as given.
-
-If the macro identifier is used as the target of a @racket[set!] form,
-then the @racket[set!] form expands into the application of
-@racket[setter-stx] to the @racket[set!] expression's right-hand side,
-if @racket[setter-stx] is syntax; otherwise, the identifier is
-considered immutable and a syntax error is raised.
-
-@examples[#:eval the-eval
-(define the-box (box add1))
-(define-syntax op
-  (make-variable-like-transformer
-   #'(unbox the-box)
-   #'(lambda (v) (set-box! the-box v))))
-(op 5)
-(set! op 0)
-op
-]
-
-}
-
-@;{----}
-
-@addition{@author+email["Vincent St-Amour" "stamourv@racket-lang.org"]}
-@defproc[(format-unique-id [lctx (or/c syntax? #f)]
-                           [fmt string?]
-                           [v (or/c string? symbol? identifier? keyword? char? number?)] ...
-                           [#:source src (or/c syntax? #f) #f]
-                           [#:props props (or/c syntax? #f) #f]
-                           [#:cert cert (or/c syntax? #f) #f])
-         identifier?]{
-Like @racket[format-id], but returned identifiers are guaranteed to be unique.
-}
-@defproc[(syntax-within? [a syntax?] [b syntax?])
-         boolean?]{
-Returns true is syntax @racket[a] is within syntax @racket[b] in the source.
-Bounds are inclusive.
-}
-
-@;{----}
-
-@addition{@author+email["Eric Dobson" "eric.n.dobson@gmail.com"]}
-
-@defproc[(syntax-length [stx syntax?]) exact-nonnegative-integer?]{
-Performs @racket[(length (syntax->list stx))].
-
-@examples[#:eval the-eval
-(syntax-length #'(d e f))]
-}
-
-@addition[@author+email["Carl Eastlund" "cce@racket-lang.org"]]
-
-@section{Syntax Object Source Locations}
-
-@deftogether[(
-@defproc[(syntax-source-directory [stx syntax?]) (or/c path? #f)]
-@defproc[(syntax-source-file-name [stx syntax?]) (or/c path? #f)]
-)]{
-
-These produce the directory and file name, respectively, of the path with which
-@racket[stx] is associated, or @racket[#f] if @racket[stx] is not associated
-with a path.
-
-@defexamples[
-#:eval the-eval
-(define loc
-  (list (build-path "/tmp" "dir" "somewhere.rkt")
-        #f #f #f #f))
-(define stx1 (datum->syntax #f 'somewhere loc))
-(syntax-source-directory stx1)
-(syntax-source-file-name stx1)
-(define stx2 (datum->syntax #f 'nowhere #f))
-(syntax-source-directory stx2)
-(syntax-source-directory stx2)
-]
-}
-
-@close-eval[the-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/unstable.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/unstable.scrbl
deleted file mode 100644
index 750b6ce4fc..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/unstable.scrbl
+++ /dev/null
@@ -1,110 +0,0 @@
-#lang scribble/doc
-@(require scribble/base
-          scribble/manual
-          "utils.rkt"
-          (for-syntax racket/base racket/path)
-          (for-label scribble/base))
-
-@unstable-title[#:tag "unstable"]
-
-This manual documents some of the libraries available in the
-@racketidfont{unstable} collection. See also @other-doc['(lib
-"unstable/scribblings/gui/unstable-gui.scrbl") #:indirect "unstable
-GUI libraries"].
-
-The name @racketidfont{unstable} is intended as a warning that the
-@bold{interfaces} in particular are unstable. Developers of planet
-packages and external projects should avoid using modules in the
-unstable collection. Contracts may change, names may change or
-disappear, even entire modules may move or disappear without warning
-to the outside world.
-
-Developers of unstable libraries must follow the guidelines in
-@secref{guidelines}.
-
-@local-table-of-contents[#:style 'immediate-only]
-
-@;{--------}
-
-@section[#:tag "guidelines"]{Guidelines for Developing @racketidfont{unstable} Libraries}
-
-Any collection developer may add modules to the
-@racketidfont{unstable} collection.
-
-Every module needs an owner to be responsible for it.
-
-@itemize[
-
-@item{If you add a module, you are its owner. Add a comment with your
-name at the top of the module.}
-
-@item{If you add code to someone else's module, tag your additions
-with your name. The module's owner may ask you to move your code to a
-separate module if they don't wish to accept responsibility for it.}
-]
-
-When changing a library, check all uses of the library in the
-collections tree and update them if necessary. Notify users of major
-changes.
-
-Place new modules according to the following rules. (These rules are
-necessary for maintaining PLT's separate text, gui, and drracket
-distributions.)
-
-@itemize[
-
-@item{Non-GUI modules go under @tt{unstable} (or subcollections
-thereof). Put the documentation in @tt{unstable/scribblings} and
-include with @racket[include-section] from
-@tt{unstable/scribblings/unstable.scrbl}.}
-
-@item{GUI modules go under @tt{unstable/gui}. Put the documentation
-in @tt{unstable/scribblings/gui} and include them with
-@racket[include-section] from @tt{unstable/scribblings/gui.scrbl}.}
-
-@item{Do not add modules depending on DrRacket to the
-@tt{unstable} collection.}
-
-@item{Put tests in @tt{tests/unstable}.}
-]
-
-Keep documentation and tests up to date.
-
-
-@;{--------}
-
-@;{
-  Add new documentation links to the list immediately below.
-}
-
-@include-section["../automata/scribblings/automata.scrbl"]
-@include-section["bytes.scrbl"]
-@include-section["contract.scrbl"]
-@include-section["wrapc.scrbl"]
-@include-section["debug.scrbl"]
-@include-section["define.scrbl"]
-@include-section["error.scrbl"]
-@include-section["future.scrbl"]
-@include-section["function.scrbl"]
-@include-section["hash.scrbl"]
-@include-section["class-iop.scrbl"] ;; Interface-oriented Programming
-@include-section["lazy-require.scrbl"]
-@include-section["list.scrbl"]
-@include-section["logging.scrbl"]
-@include-section["macro-testing.scrbl"]
-@include-section["markparam.scrbl"]
-@include-section["match.scrbl"]
-@include-section["open-place.scrbl"]
-@include-section["options.scrbl"]
-@include-section["parameter-group.scrbl"]
-@include-section["pretty.scrbl"]
-@include-section["recontract.scrbl"]
-@include-section["sandbox.scrbl"]
-@include-section["sequence.scrbl"]
-@include-section["string.scrbl"]
-@include-section["struct.scrbl"]
-@include-section["custom-write.scrbl"] ;; Struct Printing
-@include-section["syntax.scrbl"]
-@include-section["../temp-c/scribblings/temp-c.scrbl"]
-@include-section["socket.scrbl"] ;; Unix Domain Sockets
-@include-section["2d.scrbl"]
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/utils.rkt b/pkgs/unstable-pkgs/unstable-doc/scribblings/utils.rkt
deleted file mode 100644
index 5d62e5897b..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/utils.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang at-exp racket/base
-(require scribble/base scribble/manual scribble/core scribble/eval)
-(provide unstable
-         unstable-title
-         unstable-header
-         addition)
-
-#|
-Place either @unstable or @unstable-header immediately after the
-@title form, before any @defmodule form or introductory/summary text.
-|#
-
-(define (unstable . authors)
-  (make-compound-paragraph plain
-    (list (apply author authors)
-          (unstable-header))))
-
-(define (unstable-header)
-  @para{This library is @emph{unstable};
-        compatibility will not be maintained.
-        See @secref["unstable" #:doc '(lib "unstable/scribblings/unstable.scrbl")]
-        for more information.})
-
-(define (addition name)
-  @margin-note{The subsequent bindings were added by @|name|.})
-
-(define unstable-title
-  (make-keyword-procedure
-   (lambda (kws kw-args . content)
-     (keyword-apply title kws kw-args
-                    "Unstable"
-                    (if (null? content) "" " ")
-                    content
-                    ": May Change Without Warning"
-                    null))))
diff --git a/pkgs/unstable-pkgs/unstable-doc/scribblings/wrapc.scrbl b/pkgs/unstable-pkgs/unstable-doc/scribblings/wrapc.scrbl
deleted file mode 100644
index 50b2824cf3..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/scribblings/wrapc.scrbl
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang scribble/manual
-@(require scribble/struct scribble/decode scribble/eval "utils.rkt"
-          (for-label racket/base racket/contract unstable/wrapc racket/syntax syntax/parse))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require racket/contract (for-syntax racket/base unstable/wrapc)))
-
-@title[#:tag "wrapc"]{Contracts for Macro Subexpressions}
-@unstable[@author+email["Ryan Culpepper" "ryanc@racket-lang.org"]]
-
-@defmodule[unstable/wrapc]
-
-This library provides a procedure @racket[wrap-expr/c] for applying
-contracts to macro subexpressions.
-
-@defproc[(wrap-expr/c [contract-expr syntax?]
-                      [expr syntax?]
-                      [#:positive pos-blame
-                                  (or/c syntax? string? module-path-index?
-                                        'from-macro 'use-site 'unknown)
-                                  'use-site]
-                      [#:negative neg-blame
-                                  (or/c syntax? string? module-path-index?
-                                        'from-macro 'use-site 'unknown)
-                                  'from-macro]
-                      [#:name expr-name
-                              (or/c identifier? symbol? string? #f) #f]
-                      [#:macro macro-name
-                               (or/c identifier? symbol? string? #f) #f]
-                      [#:context context (or/c syntax? #f) (current-syntax-context)])
-         syntax?]{
-
-Returns a syntax object representing an expression that applies the
-contract represented by @racket[contract-expr] to the value produced
-by @racket[expr].
-
-The other arguments have the same meaning as for @racket[expr/c].
-
-@examples[#:eval the-eval
-(define-syntax (myparameterize1 stx)
-  (syntax-case stx ()
-    [(_ ([p v]) body)
-     (with-syntax ([cp (wrap-expr/c
-                        #'parameter? #'p
-                        #:name "the parameter argument"
-                        #:context stx)])
-       #'(parameterize ([cp v]) body))]))
-(myparameterize1 ([current-input-port
-                   (open-input-string "(1 2 3)")])
-  (read))
-(myparameterize1 (['whoops 'something])
-  'whatever)
-
-(module mod racket
-  (require (for-syntax unstable/wrapc))
-  (define-syntax (app stx)
-    (syntax-case stx ()
-      [(app f arg)
-       (with-syntax ([cf (wrap-expr/c
-                          #'(-> number? number?)
-                          #'f
-                          #:name "the function argument"
-                          #:context stx)])
-         #'(cf arg))]))
-  (provide app))
-(require 'mod)
-(app add1 5)
-(app add1 'apple)
-(app (lambda (x) 'pear) 5)
-]
-}
-
-@close-eval[the-eval]
diff --git a/pkgs/unstable-pkgs/unstable-doc/temp-c/info.rkt b/pkgs/unstable-pkgs/unstable-doc/temp-c/info.rkt
deleted file mode 100644
index 84ad0ac2d5..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/temp-c/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/unstable-pkgs/unstable-doc/temp-c/scribblings/temp-c.scrbl b/pkgs/unstable-pkgs/unstable-doc/temp-c/scribblings/temp-c.scrbl
deleted file mode 100644
index a638d7217e..0000000000
--- a/pkgs/unstable-pkgs/unstable-doc/temp-c/scribblings/temp-c.scrbl
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          scribble/bnf
-          scribble/eval
-          unstable/scribblings/utils
-          (for-label racket/base
-                     racket/contract
-                     racket/match
-                     racket/list))
-
-@(define our-eval (make-base-eval))
-
-@title[#:tag "temp-c"]{Temporal Contracts: Explicit Contract Monitors}
-@unstable[@author+email["Jay McCarthy" "jay@racket-lang.org"]]
-
-@defmodule[unstable/temp-c]
-
-The contract system implies the presence of a "monitoring system" that ensures that contracts are not violated. The @racketmodname[racket/contract] system compiles this monitoring system into checks on values that cross a contracted boundary. This module provides a facility to pass contract boundary crossing information to an explicit monitor for approval. This monitor may, for example, use state to enforce temporal constraints, such as a resource is locked before it is accessed.
-
-@section{Warning! Experimental!}
-
-This library is truly experimental and the interface is likely to
-drastically change as we get more experience making use of temporal
-contracts. In particular, the library comes with no advice about
-designing temporal contracts, which are much more subtle than standard
-contracts. This subtlety is compounded because, while temporal
-contract violations have accurate blame information, we cannot yet
-connect violations to sub-pieces of the temporal formula.
-
-For example, applying @racket[f] to @racket["three"] when it is
-contracted to only accept numbers will error by blaming the caller and
-providing the explanation "expected a <number?>, received: "three"".
-In contrast, applying @racket[g] to @racket["even"] and then to
-@racket["odd"] when @racket[g] is contracted to accept strings on
-every odd invocation, but numbers on every even invocation, will error
-by blaming the second (odd) call, but will not provide any explanation
-except "the monitor disallowed the call with arguments: "odd"".
-Translating non-acceptance of an event trace by an automata into a
-palatable user explanation is an open problem.
-
-@section[#:tag "monitor"]{Monitors}
-
-@defmodule[unstable/temp-c/monitor]
-@(require (for-label unstable/temp-c/monitor))
-
-@deftogether[[
-@defstruct*[monitor ([label symbol?]) #:transparent]
-@defstruct*[(monitor:proj monitor)
-            ([label symbol?] [proj-label symbol?] [v any/c])
-             #:transparent]
-@defstruct*[(monitor:call monitor)
-            ([label symbol?] [proj-label symbol?] [f procedure?] 
-             [app-label symbol?] [kws (listof keyword?)] [kw-args list?] [args list?])
-            #:transparent]
-@defstruct*[(monitor:return monitor)
-            ([label symbol?] [proj-label symbol?] [f procedure?] 
-             [app-label symbol?] [kws (listof keyword?)] [kw-args list?] [args list?]
-             [rets list?])
-             #:transparent]
-@defproc[(monitor/c [monitor-allows? (-> monitor? boolean?)]
-                    [label symbol?]
-                    [c contract?])
-         contract?]
-]]{
-  
-  @racket[monitor/c] creates a new contract around @racket[c] that uses @racket[monitor-allows?] to approve
-  contract boundary crossings. (@racket[c] approves positive crossings first.)
-  
-  Whenever a value @racket[v] is projected by the result of @racket[monitor/c], @racket[monitor-allows?]
-  must approve a @racket[(monitor:proj label proj-label v)] structure, where @racket[proj-label] is a unique
-  symbol for this projection.
-  
-  If @racket[monitor-allows?] approves and the value is not a function, then the value is returned.
-  
-  If the value is a function, then a projection is returned, whenever it is called, @racket[monitor-allows?]
-  must approve a @racket[(monitor:call label proj-label v app-label kws kw-args args)] structure,
-  where @racket[app-label] is a unique symbol for this application and @racket[kws], @racket[kw-args], @racket[args]
-  are the arguments passed to the function.
-  
-  Whenever it returns, @racket[monitor-allows?]
-  must approve a @racket[(monitor:return label proj-label v app-label kws kw-args args rets)] structure,
-  where @racket[ret] are the return values of the application.
-  
-  The unique projection label allows explicitly monitored contracts to be useful when used in a first-class way 
-  at different boundaries.
-  
-  The unique application label allows explicitly monitored contracts to pair calls and returns when functions
-  return multiple times or never through the use of continuations.
-  
-}
-  
-Here is a short example that uses an explicit monitor to ensure that @racket[_malloc] and @racket[_free] are
-used correctly.
-@racketblock[
- (define allocated (make-weak-hasheq))
- (define memmon
-   (match-lambda
-     [(monitor:return 'malloc _ _ _ _ _ _ (list addr))
-      (hash-set! allocated addr #t)
-      #t]
-     [(monitor:call 'free _ _  _ _ _ (list addr))
-      (hash-has-key? allocated addr)]
-     [(monitor:return 'free _ _ _ _ _ (list addr) _)
-      (hash-remove! allocated addr)
-      #t]
-     [_
-      #t]))
- (provide/contract
-  [malloc (monitor/c memmon 'malloc (-> number?))]
-  [free (monitor/c memmon 'free (-> number? void))])
-]
-           
-@section[#:tag "dsl"]{Domain Specific Language}
-
-@defmodule[unstable/temp-c/dsl]
-@(require (for-label racket/match
-                     racket/contract
-                     unstable/temp-c/dsl
-                     unstable/automata/re
-                     unstable/automata/re-ext))
-
-Constructing explicit monitors using only @racket[monitor/c] can be a bit onerous. This module provides some helpful tools for making the definition easier. It provides everything from @racketmodname[unstable/temp-c/monitor], as well as all bindings from @racketmodname[unstable/automata/re] and @racketmodname[unstable/automata/re-ext]. The latter provide a DSL for writing "dependent" regular expression machines over arbitrary @racketmodname[racket/match] patterns.
-
-First, a few @racket[match] patterns are available to avoid specify all the details of monitored events (since most of the time the detailed options are unnecessary.)
-
-@defform[(call n a ...)]{ A @racket[match] expander for call events to the labeled function @racket[n] with arguments @racket[a]. }
-@defform[(ret n a ...)]{ A @racket[match] expander for return events to the labeled function @racket[n] with return values @racket[a]. }
-
-@defform[(with-monitor contract-expr re-pat)]{ Defines a monitored contract where the structural portion of the contract is the @racket[contract-expr] (which may included embedded @racket[label] expressions) and where the temporal portion of the contract is the regular expression given by @racket[re-pat]. (Note: @racket[re-pat] is not a Racket expression that evaluates to a regular expression. It is a literal regular expression.)  An optional @racket[#:concurrent] may be added between the contract and the regular expression to ensure that the machine is safe against race-conditions.}
-
-@defform[(label id contract-expr)]{ Labels a portion of a structural contract inside of @racket[with-monitor] with the label @racket[id]. }
-
-Here is a short example for @racket[_malloc] and @racket[_free]:
-@racketblock[
-(with-monitor 
-    (cons/c (label 'malloc (-> addr?))
-            (label 'free (-> addr? void?)))
-  (complement 
-   (seq (star _)
-        (dseq (call 'free addr)
-              (seq
-               (star (not (ret 'malloc (== addr))))
-               (call 'free (== addr)))))))
-]
diff --git a/pkgs/unstable-pkgs/unstable-lib/HISTORY.txt b/pkgs/unstable-pkgs/unstable-lib/HISTORY.txt
deleted file mode 100644
index 226c8c3eef..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/HISTORY.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Version 6.0, January 2014
- Removed unstable/file
- unstable/error: added raise-syntax-error*
- unstable/syntax: added syntax-length
-
-Version 5.3.6, August 2013
- unstable/match: added match*?
-
-Version 5.3.4, May 2013
- Added unstable/redex
- Added unstable/socket
- Added unstable/macro-testing
- Added unstable/options
- Renamed option/c (from unstable/contract) to maybe/c
-
diff --git a/pkgs/unstable-pkgs/unstable-lib/LICENSE.txt b/pkgs/unstable-pkgs/unstable-lib/LICENSE.txt
deleted file mode 100644
index 71d82da349..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-pkgs/unstable-lib/arrow.rkt b/pkgs/unstable-pkgs/unstable-lib/arrow.rkt
deleted file mode 100644
index 4179c481d4..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/arrow.rkt
+++ /dev/null
@@ -1,204 +0,0 @@
-#lang racket/base
-
-(require racket/class
-         racket/math
-         racket/draw)
-
-(provide draw-arrow)
-
-(define largest 16383)
-(define smallest -16383)
-
-(define arrow-head-angle (/ pi 8))
-(define cos-arrow-head-angle (cos arrow-head-angle))
-(define sin-arrow-head-angle (sin arrow-head-angle))
-
-; If alpha is the angle between the x axis and the Start->End vector:
-;
-; p2-x = end-x + arrow-head-size * cos(alpha + pi - arrow-head-angle)
-;      = end-x - arrow-head-size * cos(alpha - arrow-head-angle)
-;      = end-x - arrow-head-size * (cos(alpha) * cos(arrow-head-angle) + sin(alpha) * sin(arrow-head-angle))
-;      = end-x - arrow-head-size-cos-arrow-head-angle * cos-alpha - arrow-head-size-sin-arrow-head-angle * sin-alpha
-;      = end-x - arrow-head-size-cos-arrow-head-angle-cos-alpha - arrow-head-size-sin-arrow-head-angle-sin-alpha
-;
-; p2-y = end-y + arrow-head-size * sin(alpha + pi - arrow-head-angle)
-;      = end-y - arrow-head-size * sin(alpha - arrow-head-angle)
-;      = end-y - arrow-head-size * (sin(alpha) * cos(arrow-head-angle) - cos(alpha) * sin(arrow-head-angle))
-;      = end-y - arrow-head-size-cos-arrow-head-angle * sin-alpha + arrow-head-size-sin-arrow-head-angle * cos-alpha
-;      = end-y - arrow-head-size-cos-arrow-head-angle-sin-alpha + arrow-head-size-sin-arrow-head-angle-cos-alpha
-;
-; p3-x = end-x + arrow-head-size * cos(alpha + pi + arrow-head-angle)
-;      = end-x - arrow-head-size * cos(alpha + arrow-head-angle)
-;      = end-x - arrow-head-size * (cos(alpha) * cos(arrow-head-angle) - sin(alpha) * sin(arrow-head-angle))
-;      = end-x - arrow-head-size-cos-arrow-head-angle * cos-alpha + arrow-head-size-sin-arrow-head-angle * sin-alpha
-;      = end-x - arrow-head-size-cos-arrow-head-angle-cos-alpha + arrow-head-size-sin-arrow-head-angle-sin-alpha
-;
-; p3-y = end-y + arrow-head-size * sin(alpha + pi + arrow-head-angle)
-;      = end-y - arrow-head-size * sin(alpha + arrow-head-angle)
-;      = end-y - arrow-head-size * (sin(alpha) * cos(arrow-head-angle) + cos(alpha) * sin(arrow-head-angle))
-;      = end-y - arrow-head-size-cos-arrow-head-angle * sin-alpha - arrow-head-size-sin-arrow-head-angle * cos-alpha
-;      = end-y - arrow-head-size-cos-arrow-head-angle-sin-alpha - arrow-head-size-sin-arrow-head-angle-cos-alpha
-
-; dc<%> real real real real real real -> void
-; draw one arrow
-(define (draw-arrow dc uncropped-pre-start-x uncropped-pre-start-y uncropped-pre-end-x uncropped-pre-end-y dx dy
-                    #:pen-width [pen-width #f]
-                    #:arrow-head-size [arrow-head-size 8]
-                    #:arrow-root-radius [arrow-root-radius 2.5])
-  
-  (define arrow-head-size-cos-arrow-head-angle (* arrow-head-size cos-arrow-head-angle))
-  (define arrow-head-size-sin-arrow-head-angle (* arrow-head-size sin-arrow-head-angle))
-  
-  (define arrow-root-diameter (* 2 arrow-root-radius))
-  (define the-pen-width (or pen-width (send (send dc get-pen) get-width)))
-  (let ([uncropped-start-x (+ uncropped-pre-start-x dx (- (/ the-pen-width 2)))]
-        [uncropped-start-y (+ uncropped-pre-start-y dy)]
-        [uncropped-end-x (+ uncropped-pre-end-x dx (- (/ the-pen-width 2)))]
-        [uncropped-end-y (+ uncropped-pre-end-y dy)]
-        [old-smoothed (send dc get-smoothing)])
-    (let*-values ([(start-x start-y) (crop-to uncropped-start-x uncropped-start-y uncropped-end-x uncropped-end-y)]
-                  [(end-x end-y) (crop-to uncropped-end-x uncropped-end-y uncropped-start-x uncropped-start-y)])
-      (send dc set-smoothing 'aligned)
-      (define saved-pen (send dc get-pen))
-      (when pen-width
-        (send dc set-pen
-              (let ([p (send dc get-pen)])
-                (send the-pen-list find-or-create-pen 
-                      (send p get-color)
-                      pen-width
-                      (send p get-style)
-                      (send p get-cap)
-                      (send p get-join)))))
-      (send dc draw-line start-x start-y end-x end-y)
-      (send dc set-pen saved-pen)
-      (when (and (< smallest start-x largest)
-                 (< smallest start-y largest))
-        (send dc draw-ellipse 
-              (- start-x arrow-root-radius) (- start-y arrow-root-radius)
-              arrow-root-diameter arrow-root-diameter))
-      (when (and (< smallest end-x largest)
-                 (< smallest end-y largest))
-        (unless (and (= start-x end-x) (= start-y end-y))
-          (let* ([offset-x (- end-x start-x)]
-                 [offset-y (- end-y start-y)]
-                 [arrow-length (sqrt (+ (* offset-x offset-x) (* offset-y offset-y)))]
-                 [cos-alpha (/ offset-x arrow-length)]
-                 [sin-alpha (/ offset-y arrow-length)]
-                 [arrow-head-size-cos-arrow-head-angle-cos-alpha (* arrow-head-size-cos-arrow-head-angle cos-alpha)]
-                 [arrow-head-size-cos-arrow-head-angle-sin-alpha (* arrow-head-size-cos-arrow-head-angle sin-alpha)]
-                 [arrow-head-size-sin-arrow-head-angle-cos-alpha (* arrow-head-size-sin-arrow-head-angle cos-alpha)]
-                 [arrow-head-size-sin-arrow-head-angle-sin-alpha (* arrow-head-size-sin-arrow-head-angle sin-alpha)]
-                 ; pt1 is the tip of the arrow, pt2 is the first point going clockwise from pt1
-                 [pt1 (make-object point% end-x end-y)]
-                 [pt2 (make-object point%
-                        (- end-x arrow-head-size-cos-arrow-head-angle-cos-alpha arrow-head-size-sin-arrow-head-angle-sin-alpha)
-                        (+ end-y (- arrow-head-size-cos-arrow-head-angle-sin-alpha) arrow-head-size-sin-arrow-head-angle-cos-alpha))]
-                 [pt3 (make-object point%
-                        (+ end-x (- arrow-head-size-cos-arrow-head-angle-cos-alpha) arrow-head-size-sin-arrow-head-angle-sin-alpha)
-                        (- end-y arrow-head-size-cos-arrow-head-angle-sin-alpha arrow-head-size-sin-arrow-head-angle-cos-alpha))])
-            (send dc draw-polygon (list pt1 pt2 pt3)))))
-      (send dc set-smoothing old-smoothed))))
-
-;; crop-to : number number number number -> (values number number)
-;; returns x,y if they are in the range defined by largest and smallest
-;; otherwise returns the coordinates on the line from x,y to ox,oy
-;; that are closest to x,y and are in the range specified by
-;; largest and smallest
-(define (crop-to x y ox oy)
-  (cond
-    [(and (< smallest x largest) (< smallest y largest))
-     (values x y)]
-    [else
-     (let* ([xy-pr (cons x y)]
-            [left-i (find-intersection x y ox oy smallest smallest smallest largest)]
-            [top-i (find-intersection x y ox oy smallest smallest largest smallest)]
-            [right-i (find-intersection x y ox oy largest smallest largest largest)]
-            [bottom-i (find-intersection x y ox oy smallest largest largest largest)]
-            [d-top (and top-i (dist top-i xy-pr))]
-            [d-bottom (and bottom-i (dist bottom-i xy-pr))]
-            [d-left (and left-i (dist left-i xy-pr))]
-            [d-right (and right-i (dist right-i xy-pr))])
-       (cond
-         [(smallest? d-top d-bottom d-left d-right)
-          (values (car top-i) (cdr top-i))]
-         [(smallest? d-bottom d-top d-left d-right)
-          (values (car bottom-i) (cdr bottom-i))]
-         [(smallest? d-left d-top d-bottom d-right)
-          (values (car left-i) (cdr left-i))]
-         [(smallest? d-right d-top d-bottom d-left)
-          (values (car right-i) (cdr right-i))]
-         [else 
-          ;; uh oh... if this case happens, that's bad news...
-          (values x y)]))]))
-
-;; smallest? : (union #f number)^4 -> boolean
-;; returns #t if can is less and o1, o2, and o3
-;; if can is #f, return #f. If o1, o2, or o3 is #f, assume that can is smaller than them
-(define (smallest? can o1 o2 o3)
-  (and can
-       (andmap (λ (x) (< can x))
-               (filter (λ (x) x)
-                       (list o1 o2 o3)))))
-
-
-;; inside? : (union #f (cons number number)) -> (union #f (cons number number))
-;; returns the original pair if the coordinates are between smallest and largest
-;; and returns #f if the pair is #f or the coordinates are outside.
-(define (inside? pr)
-  (and pr
-       (let ([x (car pr)]
-             [y (cdr pr)])
-         (if (and (< smallest x largest)
-                  (< smallest y largest))
-             pr
-             #f))))
-
-;; find-intersection : (number^2)^2 -> (union (cons number number) #f)
-;; finds the intersection between the lines specified by
-;; (x1,y1) -> (x2,y2) and (x3,y3) -> (x4,y4)
-(define (find-intersection x1 y1 x2 y2 x3 y3 x4 y4)
-  (cond
-    [(and (= x1 x2) (= x3 x4))
-     #f]
-    [(and (= x1 x2) (not (= x3 x4)))
-     (let* ([m2 (/ (- y3 y4) (- x3 x4))]
-            [b2 (- y3 (* m2 x3))])
-       (cons x1
-             (+ (* m2 x1) b2)))]
-    [(and (not (= x1 x2)) (= x3 x4))
-     (let* ([m1 (/ (- y1 y2) (- x1 x2))]
-            [b1 (- y1 (* m1 x1))])
-       (cons x3
-             (+ (* m1 x3) b1)))]
-    [(and (not (= x1 x2)) (not (= x3 x4)))
-     (let* ([m1 (/ (- y1 y2) (- x1 x2))]
-            [b1 (- y1 (* m1 x1))]
-            [m2 (/ (- y3 y4) (- x3 x4))]
-            [b2 (- y3 (* m2 x3))])
-       (if (= m1 m2)
-           #f
-           (let* ([x (/ (- b1 b2) (- m2 m1))]
-                  [y (+ (* m1 x) b1)])
-             (cons x y))))]))
-
-;; dist : (cons number number) (cons number number) -> number
-(define (dist p1 p2)
-  (sqrt (+ (sqr (- (car p1) (car p2)))
-           (sqr (- (cdr p1) (cdr p2))))))
-
-;; localled defined test code....
-;; use module language to run tests
-(module+ test
-  (require rackunit)
-  (check-equal? (find-intersection 0 1 0 10 0 2 0 20) #f)
-  (check-equal? (find-intersection 0 1 0 10 0 0 10 10) (cons 0 0))
-  (check-equal? (find-intersection 0 0 10 10 0 1 0 10) (cons 0 0))
-  (check-equal? (find-intersection 0 0 3 3 2 2 4 4) #f)
-  (check-equal? (find-intersection -3 3 3 -3 -3 -3 3 3) (cons 0 0))
-  (check-equal? (smallest? 3 1 2 3) #f)
-  (check-equal? (smallest? 0 1 2 3) #t)
-  (check-equal? (smallest? 1 0 2 3) #f)
-  (check-equal? (smallest? 1 0 #f 4) #f)
-  (check-equal? (smallest? 1 #f #f 4) #t)
-  (check-equal? (smallest? 1 #f #f #f) #t)
-  (check-equal? (dist (cons 1 1) (cons 4 5)) 5))
\ No newline at end of file
diff --git a/pkgs/unstable-pkgs/unstable-lib/automata/dfa.rkt b/pkgs/unstable-pkgs/unstable-lib/automata/dfa.rkt
deleted file mode 100644
index 39c93ba322..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/automata/dfa.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-
-(require "machine.rkt"
-         racket/local
-         racket/match
-         (for-syntax racket/base
-                     syntax/parse
-                     syntax/id-table
-                     racket/dict
-                     unstable/sequence))
-
-(define-syntax (dfa stx)
-  (syntax-parse
-   stx
-   [(_ start:id
-       (end:id ...)
-       [state:id ([evt:expr next-state:id]
-                  ...)]
-       ...)
-    
-    (define end? (make-bound-id-table))
-    (for ([e (in-syntax #'(end ...))])
-      (dict-set! end? e #t))
-    
-    (with-syntax
-        ([(state-constructor ...)
-          (for/list ([st (in-syntax #'(state ...))])
-            (if (dict-ref end? st #f)
-                #'machine-accepting
-                #'machine))])
-      (syntax/loc stx
-        (local
-          [; state : input -> next-state
-           (define state
-             (state-constructor
-              '(dfa [evt next-state]
-                    ...)
-              (match-lambda
-                [evt next-state]
-                ...)))
-           ...]
-          start)))]))
-
-(provide dfa)
diff --git a/pkgs/unstable-pkgs/unstable-lib/automata/info.rkt b/pkgs/unstable-pkgs/unstable-lib/automata/info.rkt
deleted file mode 100644
index 84ad0ac2d5..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/automata/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/unstable-pkgs/unstable-lib/automata/machine.rkt b/pkgs/unstable-pkgs/unstable-lib/automata/machine.rkt
deleted file mode 100644
index 899c637f06..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/automata/machine.rkt
+++ /dev/null
@@ -1,174 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list)
-
-(struct machine (guts next)
-        #:mutable
-        #:property prop:procedure
-        (λ (m i)
-          ((machine-next m) i)))
-(struct machine-accepting machine ())
-
-(define (machine->accepting m)
-  (if (machine-accepting? m)
-      m
-      (machine-accepting 
-       (machine-guts m) 
-       (machine-next m))))
-(define (machine->non-accepting m)
-  (if (machine-accepting? m)
-      (machine 
-       (machine-guts m) 
-       (machine-next m))
-      m))
-(define (replace-guts ng m)
-  (define const
-    (if (machine-accepting? m) machine-accepting machine))
-  (const ng (machine-next m)))  
-
-(define (machine-complement m)
-  (define const
-    (if (machine-accepting? m) machine machine-accepting))
-  (const
-   `(complement ,m)
-   (λ (input)
-     (machine-complement (m input)))))
-
-(define (machine-union m1 m2)
-  (cond
-    [(eq? m1 machine-null)
-     m2]
-    [(eq? m2 machine-null)
-     m1]
-    [(eq? m1 machine-epsilon)
-     (machine->accepting m2)]
-    [(eq? m2 machine-epsilon)
-     (machine->accepting m1)]
-    [else
-     (define const
-       (if (or (machine-accepting? m1)
-               (machine-accepting? m2))
-           machine-accepting
-           machine))
-     (const
-      `(union ,m1 ,m2)
-      (λ (input)
-        (machine-union (m1 input) (m2 input))))]))
-
-(define (machine-intersect m1 m2)
-  (machine-complement
-   (machine-union
-    (machine-complement m1)
-    (machine-complement m2))))
-
-(define (machine-seq* m1 make-m2)
-  (cond
-    [(eq? m1 machine-epsilon)
-     (make-m2)]
-    [(eq? m1 machine-null)
-     machine-null]
-    [else
-     (define next
-       (machine
-        `(seq* ,m1 ,make-m2)
-        (λ (input)
-          (machine-seq* (m1 input) make-m2))))
-     (if (machine-accepting? m1)
-         (machine-union next (make-m2))
-         next)]))
-
-(define (machine-seq m1 m2)
-  (machine-seq* m1 (λ () m2)))
-
-(define (machine-star m1)
-  (cond
-    [(eq? m1 machine-epsilon)
-     machine-sigma*]
-    [(eq? m1 machine-null)
-     machine-null]
-    [else
-     (machine->accepting
-      (machine-seq* 
-       ; Since seq* will force the RHS if m1 is accepting, this could go into
-       ; an infinite loop. However, by removing the accepting-ness, we don't change
-       ; the overall behavior because we ultimately make it initially accepting.
-       (machine->non-accepting m1)
-       (λ () (machine-star m1))))]))
-
-(define (machine-delay make-m)
-  (define m
-    (machine
-     `(delay ,make-m)
-     (λ (input)
-       ; XXX We don't change its accepting-ness
-       (define nm (make-m))
-       (set-machine-guts! m (machine-guts nm))
-       (set-machine-next! m (machine-next nm))
-       (nm input))))
-  m)
-
-(define (machine-accepts? m evts)
-  (if (empty? evts)
-      (machine-accepting? m)
-      (machine-accepts? (m (first evts)) (rest evts))))
-(define (machine-accepts?/prefix-closed m evts)
-  (if (empty? evts)
-      (machine-accepting? m)
-      (let ([n (m (first evts))])
-        (and (machine-accepting? n)
-             (machine-accepts? n (rest evts))))))
-
-(define machine-null
-  (machine 'null (λ (input) machine-null)))
-(define machine-epsilon
-  (machine-accepting 'epsilon (λ (input) machine-null)))
-(define machine-sigma*
-  (machine-accepting 'sigma* (λ (input) machine-sigma*)))
-
-(require racket/match)
-(define (machine-explain m)
-  (match (machine-guts m)
-    [`(complement ,i)
-     `(complement ,(machine-explain i))]
-    [`(seq* ,a ,b)
-     ; If a is epsilon, then we shouldn't show this, but we would've
-     ; just returned b anyways.
-     (machine-explain a)]
-    [`(union ,a ,b)
-     `(union ,(machine-explain a)
-             ,(machine-explain b))]
-    [`(delay ,i)
-     ; If we have run it before, we'll never get this.
-     `delay]
-    [`null
-     `null]
-    [`epsilon
-     `epsilon]
-    [`sigma*
-     `sigma*]
-    [any
-     any]))
-
-(define-syntax-rule (provide/contract* [id ctc] ...)
-  (provide id ...))
-
-(provide machine?
-         machine-accepting?
-         machine
-         machine-accepting)
-(provide/contract*
- [machine-explain (machine? . -> . any/c)]
- [machine-accepts? (machine? (listof any/c) . -> . boolean?)]
- [machine-accepts?/prefix-closed (machine? (listof any/c) . -> . boolean?)]
- #;[struct machine ([next (any/c . -> . machine?)])]
- #;[struct (machine-accepting machine) ([next (any/c . -> . machine?)])]
- [machine-null machine?]
- [machine-epsilon machine?]
- [machine-sigma* machine?]
- [machine-complement (machine? . -> . machine?)]
- [machine-union (machine? machine? . -> . machine?)]
- [machine-intersect (machine? machine? . -> . machine?)]
- [machine-delay ((-> machine?) . -> . machine?)]
- [machine-seq* (machine? (-> machine?) . -> . machine?)]
- [machine-seq (machine? machine? . -> . machine?)]
- [machine-star (machine? . -> . machine?)])
diff --git a/pkgs/unstable-pkgs/unstable-lib/automata/nfa-ep.rkt b/pkgs/unstable-pkgs/unstable-lib/automata/nfa-ep.rkt
deleted file mode 100644
index 20c690a2aa..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/automata/nfa-ep.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-(require "nfa.rkt"
-         (for-syntax syntax/parse
-                     syntax/stx
-                     racket/syntax
-                     syntax/id-table
-                     racket/dict
-                     racket/list
-                     racket/base))
-
-(define-syntax (epsilon stx) (raise-syntax-error 'epsilon "Outside nfa/ep" stx))
-(define-syntax (nfa/ep stx)
-  (syntax-parse
-   stx
-   #:literals (epsilon)
-   [(_ (start:id ...)
-       (end:id ...)
-       [state:id ([epsilon (epsilon-state:id ...)]
-                  ...
-                  [evt:expr (next-state:id ...)]
-                  ...)]
-       ...)
-    (define state->epsilon (make-bound-id-table))
-    (for ([stx (in-list (syntax->list #'([state epsilon-state ... ...] ...)))])
-      (syntax-case stx ()
-        [[state . es]
-         (bound-id-table-set! state->epsilon #'state (syntax->list #'es))]))
-    (define seen? (make-parameter (make-immutable-bound-id-table)))
-    (define (state->epsilons state)
-      (if (dict-has-key? (seen?) state)
-          empty
-          (parameterize ([seen? (bound-id-table-set (seen?) state #t)])
-            (define es (bound-id-table-ref state->epsilon state empty))
-            (list* state (append-map state->epsilons es)))))
-    (with-syntax*
-        ([((start* ...) ...)
-          (stx-map state->epsilons #'(start ...))]
-         [((((next-state* ...) ...) ...) ...)
-          (stx-map (λ (ns*)
-                     (stx-map (λ (ns)
-                                (stx-map state->epsilons ns))
-                              ns*))
-                   #'(((next-state ...) ...) ...))])
-      (syntax/loc stx
-        (nfa (start* ... ...)
-             (end ...)
-             [state ([evt (next-state* ... ...)]
-                     ...)]
-             ...)))]))
-
-(provide epsilon
-         nfa/ep)
diff --git a/pkgs/unstable-pkgs/unstable-lib/automata/nfa-star.rkt b/pkgs/unstable-pkgs/unstable-lib/automata/nfa-star.rkt
deleted file mode 100644
index f205ebc4fe..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/automata/nfa-star.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-(require "nfa-ep.rkt"
-         (for-syntax racket/base))
-
-(define-syntax (nfa* stx)
-  (syntax-case stx ()
-   [(_ starts (accepting-rule ...) (non-accepting-rule ...))
-    (with-syntax
-        ([([accepting-state . _] ...) #'(accepting-rule ...)])
-      (quasisyntax/loc stx
-        (nfa/ep starts (accepting-state ...)
-                accepting-rule ...
-                non-accepting-rule ...)))]))
-
-(provide nfa*
-         epsilon)
diff --git a/pkgs/unstable-pkgs/unstable-lib/automata/nfa.rkt b/pkgs/unstable-pkgs/unstable-lib/automata/nfa.rkt
deleted file mode 100644
index 2a22afc90a..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/automata/nfa.rkt
+++ /dev/null
@@ -1,88 +0,0 @@
-#lang racket/base
-
-(require "machine.rkt"
-         racket/local
-         racket/unsafe/ops
-         racket/match
-         racket/set
-         racket/list
-         (for-syntax syntax/parse
-                     syntax/stx
-                     syntax/id-table
-                     racket/syntax
-                     racket/dict
-                     racket/list
-                     racket/base))
-
-(define-syntax (nfa stx)
-  (syntax-parse
-   stx
-   [(_ (start:id ...)
-       (end:id ...)
-       [state:id ([evt:expr (next-state:id ...)]
-                  ...)]
-       ...)
-    (define how-many (length (syntax->list #'(state ...))))
-    
-    (define state->num (make-bound-id-table))
-    (for ([state (in-list (syntax->list #'(state ...)))]
-          [i (in-range how-many)])
-      (dict-set! state->num state i))
-    
-    (define (set->num sl)
-      (for/fold ([end-set 0])
-        ([end (in-list (syntax->list sl))])
-        (bitwise-ior end-set
-                     (arithmetic-shift 1 (dict-ref state->num end)))))
-    (define end-set (set->num #'(end ...)))
-    (define start-set (set->num #'(start ...)))
-    
-    (define is-fixnum? (fixnum? how-many))
-    
-    (with-syntax*
-        ([(state_n ...) (build-list how-many (λ (x) x))]
-         [end-set end-set]
-         [start-set start-set]
-         [((next-state_n ...) ...)
-          (for/list ([states (in-list (syntax->list #'(((next-state ...) ...) ...)))])
-            (stx-map set->num states))]
-         ; Use optimized version if there are not too many states
-         [op= (if is-fixnum? #'unsafe-fx= #'=)]
-         [bit-shift (if is-fixnum? #'unsafe-fxlshift #'arithmetic-shift)]
-         [bit-ior (if is-fixnum? #'unsafe-fxior #'bitwise-ior)]
-         [bit-and (if is-fixnum? #'unsafe-fxand #'bitwise-and)])
-      (syntax/loc stx
-        (local
-          [; run : (seteq state) input -> (seteq state)
-           (define (run current-states input)
-             (define next 0)
-             (define compare 1)
-             (begin
-               (unless (op= 0 (bit-and current-states compare))
-                 (match input
-                   [evt (set! next (bit-ior next next-state_n))]
-                   ...
-                   [_ #f]))
-               (set! compare (bit-shift compare 1)))
-             ...
-             next)
-           ; accepting? : (seteq state) -> boolean
-           (define (accepting? states)
-             (not (op= 0 (bit-and states end-set))))
-           ; producer : input -> an-nfa-state
-           ; make-an-nfa-state : (seteq state) -> an-nfa-state
-           (define (make-an-nfa-state next)
-             (define constructor
-               (if (accepting? next)
-                   machine-accepting
-                   machine))
-             (constructor
-              `(nfa ,next)
-              (λ (input)
-                (make-an-nfa-state (run next input)))))
-           ; initial : an-nfa-state
-           (define initial
-             (make-an-nfa-state start-set))]
-          initial)))]))
-
-(provide nfa)
diff --git a/pkgs/unstable-pkgs/unstable-lib/automata/re-compile.rkt b/pkgs/unstable-pkgs/unstable-lib/automata/re-compile.rkt
deleted file mode 100644
index be5d8c5d5e..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/automata/re-compile.rkt
+++ /dev/null
@@ -1,155 +0,0 @@
-#lang racket/base
-(require syntax/parse
-         racket/syntax
-         unstable/syntax
-         "re-help.rkt"
-         (for-template racket/base
-                       racket/match
-                       "machine.rkt"
-                       (except-in "nfa-star.rkt" epsilon)
-                       (prefix-in nfa: "nfa-star.rkt")))
-
-(define-literal-set re-ops (complement seq union star epsilon nullset dseq rec unquote))
-
-(define-syntax-class sre 
-  #:literal-sets (re-ops)
-  #:description "Fully Expanded Regular Expression"
-  ; nfa is used for res without complement or dseq
-  ; machine is used for others
-  ; all-machines is machines all the way down, no nfas
-  ; best is the best thing to embed in a machine
-  #:attributes (nfa machine all-machines best)
-  (pattern ((~and op unquote) e:expr)
-           #:do [(record-disappeared-uses (list #'op))]
-           #:attr nfa #f
-           #:attr machine
-           ; XXX contract to be a machine?
-           #`e
-           #:attr all-machines (attribute machine)
-           #:attr best (attribute machine))
-  
-  ; XXX This may not need to be built in because of unquote
-  (pattern ((~and op rec) v:id lhs:sre)
-           #:do [(record-disappeared-uses (list #'op))]
-           #:attr nfa #f
-           #:attr machine
-           #`(letrec ([inner
-                       (let-syntax ([v
-                                     (make-set!-transformer
-                                      (lambda (stx)
-                                        (syntax-case stx (set!)
-                                          ; Redirect mutation of x to y
-                                          [(set! _ _) 
-                                           (raise-syntax-error 'rec "Cannot mutate a rec binding" stx)]
-                                          ; Normal use of x really gets x
-                                          [id (identifier? #'id)  #'(machine-delay (λ () inner))])))])
-                         #,(attribute lhs.best))])
-               inner)
-           #:attr all-machines (attribute machine)
-           #:attr best (attribute machine))
-  
-  (pattern ((~and op complement) lhs:sre)
-           #:do [(record-disappeared-uses (list #'op))]
-           #:attr nfa #f
-           #:attr machine
-           #`(machine-complement #,(attribute lhs.best))
-           #:attr all-machines 
-           #`(machine-complement #,(attribute lhs.all-machines))
-           #:attr best (attribute machine))
-  
-  (pattern ((~and op star) lhs:sre)
-           #:do [(record-disappeared-uses (list #'op))]
-           #:attr nfa 
-           (and (attribute lhs.nfa)
-                (with-syntax*
-                    ([start_star (generate-temporary 'start_star)]
-                     [(_ (starts_1 ...) ([accepting-state_1 (accepting-rule_1 ...)] ...) (non-accepting_1 ...))
-                      (attribute lhs.nfa)])
-                  #'(nfa* (start_star) 
-                          ([start_star ([nfa:epsilon (starts_1 ...)])])
-                          ([accepting-state_1 ([nfa:epsilon (start_star)] accepting-rule_1 ...)] ...
-                           non-accepting_1 ...))))
-           #:attr machine
-           #`(machine-star #,(attribute lhs.best))
-           #:attr all-machines
-           #`(machine-star #,(attribute lhs.all-machines))
-           #:attr best (or (attribute nfa) (attribute machine)))
-  
-  (pattern ((~and op seq) lhs:sre rhs:sre)
-           #:do [(record-disappeared-uses (list #'op))]
-           #:attr nfa
-           (and (attribute lhs.nfa)
-                (attribute rhs.nfa)
-                (with-syntax* 
-                    ([(_ (starts_1 ...) ([accepting-state_1 (accepting-rule_1 ...)] ...) (non-accepting_1 ...))
-                      (attribute lhs.nfa)]
-                     [(_ (starts_2 ...) (accepting_2 ...) (non-accepting_2 ...))
-                      (attribute rhs.nfa)]
-                     [([accepting-state_2 . _] ...) #'(accepting_2 ...)])
-                  #'(nfa* (starts_1 ...)
-                          (accepting_2 ...)
-                          ([accepting-state_1 ([nfa:epsilon (starts_2 ...)] accepting-rule_1 ...)] ...
-                           non-accepting_1 ...
-                           non-accepting_2 ...))))
-           #:attr machine
-           #`(machine-seq #,(attribute lhs.best) #,(attribute rhs.best))
-           #:attr all-machines
-           #`(machine-seq #,(attribute lhs.all-machines) #,(attribute rhs.all-machines))
-           #:attr best (or (attribute nfa) (attribute machine)))
-  
-  (pattern ((~and op union) lhs:sre rhs:sre)
-           #:do [(record-disappeared-uses (list #'op))]
-           #:attr nfa
-           (and (attribute lhs.nfa)
-                (attribute rhs.nfa)
-                (with-syntax* 
-                    ([(_ (starts_1 ...) (accepting_1 ...) (non-accepting_1 ...)) (attribute lhs.nfa)]
-                     [(_ (starts_2 ...) (accepting_2 ...) (non-accepting_2 ...)) (attribute rhs.nfa)])
-                  #'(nfa* (starts_1 ... starts_2 ...)
-                          (accepting_1 ... accepting_2 ...)
-                          (non-accepting_1 ... non-accepting_2 ...))))
-           #:attr machine
-           #`(machine-union #,(attribute lhs.best) #,(attribute rhs.best))
-           #:attr all-machines
-           #`(machine-union #,(attribute lhs.all-machines) #,(attribute rhs.all-machines))
-           #:attr best (or (attribute nfa) (attribute machine)))
-  
-  (pattern (~and op epsilon)
-           #:do [(record-disappeared-uses (list #'op))]
-           #:attr nfa
-           (with-syntax ([start (generate-temporary 'start)])
-             #'(nfa* (start) ([start ()]) ()))
-           #:attr machine
-           #'machine-epsilon
-           #:attr all-machines (attribute machine)
-           #:attr best (attribute machine))
-  
-  (pattern (~and op nullset)
-           #:do [(record-disappeared-uses (list #'op))]
-           #:attr nfa
-           (with-syntax ([end (generate-temporary 'end)])
-             #'(nfa* (end) () ([end ()])))
-           #:attr machine
-           #'machine-null
-           #:attr all-machines (attribute machine)
-           #:attr best (attribute machine))
-           
-  (pattern ((~and op dseq) pat:expr rhs:sre)
-           #:do [(record-disappeared-uses (list #'op))]
-           #:attr nfa #f
-           #:attr machine
-           #`(machine '(dseq pat) (match-lambda [pat #,(attribute rhs.best)] [_ machine-null]))
-           #:attr all-machines (attribute machine)
-           #:attr best (attribute machine))
-  
-  (pattern pat:expr
-           #:attr nfa
-           (with-syntax ([start (generate-temporary #'pat)]
-                         [end (generate-temporary 'end)])
-             #'(nfa* (start) ([end ()]) ([start ([pat (end)])])))
-           #:attr machine
-           #'(machine 'pat (match-lambda [pat machine-epsilon] [_ machine-null]))
-           #:attr all-machines (attribute machine)
-           #:attr best (attribute machine)))
-
-(provide sre)
diff --git a/pkgs/unstable-pkgs/unstable-lib/automata/re-ext.rkt b/pkgs/unstable-pkgs/unstable-lib/automata/re-ext.rkt
deleted file mode 100644
index c456ca3a31..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/automata/re-ext.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang racket/base
-(require "re.rkt"
-         (for-syntax syntax/parse
-                     racket/base))
-
-(define-re-transformer seq/close
-  (syntax-rules ()
-    [(_)
-     epsilon]
-    [(_ a b ...)
-     (opt (seq a (seq/close b ...)))]))
-
-(define-re-transformer opt
-  (syntax-rules ()
-    [(_ pat)
-     (union epsilon pat)]))
-(define-re-transformer plus
-  (syntax-rules ()
-    [(_ pat)
-     (seq pat (star pat))]))
-(define-re-transformer rep
-  (syntax-parser
-   [(_ pat k:number)
-    (with-syntax
-        ([(pat_i ...) (build-list (syntax->datum #'k) (λ (i) #'pat))])
-      #'(seq pat_i ...))]))
-(define-re-transformer difference
-  (syntax-rules ()
-    [(_ A B)
-     (intersection A (complement B))]))
-(define-re-transformer intersection
-  (syntax-rules ()
-    [(_ A B)
-     (complement (union (complement A) (complement B)))]))
-
-(provide seq/close opt plus rep difference intersection)
diff --git a/pkgs/unstable-pkgs/unstable-lib/automata/re-help.rkt b/pkgs/unstable-pkgs/unstable-lib/automata/re-help.rkt
deleted file mode 100644
index b8b9a1ae8f..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/automata/re-help.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-(struct re-transformer (>re))
-(provide (struct-out re-transformer))
-
-(require (for-syntax racket/base))
-(define-syntax (nullset stx) (raise-syntax-error 'nullset "Outside re" stx))
-(define-syntax (epsilon stx) (raise-syntax-error 'epsilon "Outside re" stx))
-(define-syntax (complement stx) (raise-syntax-error 'complement "Outside re" stx))
-(define-syntax (seq stx) (raise-syntax-error 'seq "Outside re" stx))
-(define-syntax (union stx) (raise-syntax-error 'union "Outside re" stx))
-(define-syntax (star stx) (raise-syntax-error 'star "Outside re" stx))
-(define-syntax (dseq stx) (raise-syntax-error 'dseq "Outside re" stx))
-(define-syntax (rec stx) (raise-syntax-error 'rec "Outside re" stx))
-
-(provide nullset epsilon complement seq union star dseq rec)
diff --git a/pkgs/unstable-pkgs/unstable-lib/automata/re.rkt b/pkgs/unstable-pkgs/unstable-lib/automata/re.rkt
deleted file mode 100644
index d7c75439e9..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/automata/re.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang racket/base
-(require "machine.rkt"
-         "re-help.rkt"
-         racket/match
-         (for-syntax syntax/parse
-                     racket/syntax
-                     unstable/syntax
-                     racket/base
-                     "re-help.rkt"
-                     "re-compile.rkt"))
-
-(define-syntax-rule (define-re-transformer id lam)
-  (define-syntax id (re-transformer lam)))
-
-(define-for-syntax code-insp (variable-reference->module-declaration-inspector
-                              (#%variable-reference)))
-
-(define-for-syntax (re-expand stx)
-  (syntax-parse
-   (syntax-disarm stx code-insp)
-   #:literals (complement seq union star epsilon nullset dseq rec unquote)
-   [((~and op complement) lhs:expr)
-    (quasisyntax/loc stx
-      (op #,(re-expand #'lhs)))]
-   [((~and op rec) v:id lhs:expr)
-    (quasisyntax/loc stx
-      (op v #,(re-expand #'lhs)))]
-   [((~and op unquote) e:expr)
-    (quasisyntax/loc stx
-      (op e))]
-   [((~and op star) lhs:expr)
-    (quasisyntax/loc stx
-      (op #,(re-expand #'lhs)))]
-   [((~and op seq) lhs:expr)
-    (re-expand #'lhs)]
-   [((~and op seq) lhs:expr rhs:expr)
-    (quasisyntax/loc stx
-      (op #,(re-expand #'lhs) #,(re-expand #'rhs)))]
-   [((~and op seq) lhs:expr rest:expr ...)
-    (quasisyntax/loc stx
-      #,(re-expand #'(op lhs (op rest ...))))]
-   [((~and op union) lhs:expr)
-    (re-expand #'lhs)]
-   [((~and op union) lhs:expr rhs:expr)
-    (quasisyntax/loc stx
-      (op #,(re-expand #'lhs) #,(re-expand #'rhs)))]
-   [((~and op union) lhs:expr rest:expr ...)
-    (quasisyntax/loc stx
-      #,(re-expand #'(op lhs (op rest ...))))]
-   [(~and e (~var transformer (static re-transformer? "re transformer")))
-    (record-disappeared-uses (list #'transformer))
-    (quasisyntax/loc stx
-      #,(re-expand ((re-transformer->re (attribute transformer.value)) #'e)))]
-   [(~and e ((~var transformer (static re-transformer? "re transformer")) . _))
-    (record-disappeared-uses (list #'transformer))
-    (quasisyntax/loc stx
-      #,(re-expand ((re-transformer->re (attribute transformer.value)) #'e)))]
-   [((~and op dseq) pat:expr rhs:expr)
-    (quasisyntax/loc stx
-      (op pat #,(re-expand #'rhs)))]
-   [_
-    stx]))
-
-(define-for-syntax (re-compile stx)
-  (syntax-parse
-   stx
-   [the-re:sre
-    (attribute the-re.best)]))
-
-(define-syntax (re stx)
-  (with-disappeared-uses
-      (syntax-case stx ()
-        [(_ the-re)
-         (re-compile (re-expand #'the-re))])))
-
-(provide
- complement seq union star epsilon nullset dseq rec unquote
- define-re-transformer
- re)
diff --git a/pkgs/unstable-pkgs/unstable-lib/define.rkt b/pkgs/unstable-pkgs/unstable-lib/define.rkt
deleted file mode 100644
index 67537f2bd4..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/define.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     racket/list
-                     racket/match
-                     racket/syntax
-                     unstable/syntax))
-(provide in-phase1
-         in-phase1/pass2
-         at-end)
-
-(define-syntax (at-end stx)
-  (syntax-case stx ()
-    [(_ e ...)
-     (match (syntax-local-context)
-       ['module
-         (begin
-           (syntax-local-lift-module-end-declaration
-            (syntax/loc stx (begin e ...)))
-           (syntax/loc stx (begin)))]
-       [ctx (wrong-syntax stx
-                          "can only be used in module context; got: ~s"
-                          ctx)])]))
-
-(define-syntax (in-phase1 stx)
-  (syntax-case stx []
-    [(_ e)
-     (match (syntax-local-context)
-       ['expression (syntax/loc stx (let-syntax ([dummy e]) (void)))]
-       [(or 'module 'top-level (? pair?))
-        (syntax/loc stx
-          (begin
-            (define-syntax (macro stx*) (begin e (syntax/loc stx* (begin))))
-            (macro)))]
-       ['module-begin (wrong-syntax stx "cannot be used as module body")])]))
-
-(define-syntax (in-phase1/pass2 stx)
-  (syntax-case stx []
-    [(_ e)
-     (match (syntax-local-context)
-       [(? pair?)
-        (syntax/loc stx (define-values [] (begin (in-phase1 e) (values))))]
-       [(or 'expression 'top-level 'module 'module-begin)
-        (syntax/loc stx (#%expression (in-phase1 e)))])]))
diff --git a/pkgs/unstable-pkgs/unstable-lib/future.rkt b/pkgs/unstable-pkgs/unstable-lib/future.rkt
deleted file mode 100644
index be2dd58e40..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/future.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(require racket/future
-         (for-syntax racket/base))
-(provide for/async
-         for*/async)
-
-;; Note: order of touches not guaranteed.
-
-(define-syntaxes (for/async for*/async)
-  (let ()
-    (define ((transformer for/fold/derived-id) stx)
-      (syntax-case stx ()
-        [(_ (clause ...) . body)
-         (quasisyntax/loc stx
-           (let ([futures
-                  (#,for/fold/derived-id #,stx ([fs null]) (clause ...)
-                                         (cons (future (lambda () . body)) fs))])
-             ;; touches futures in original order
-             (let loop ([fs futures])
-               (cond [(pair? fs) (begin (loop (cdr fs)) (touch (car fs)))]
-                     [else (void)]))))]))
-    (values (transformer #'for/fold/derived)
-            (transformer #'for*/fold/derived))))
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/pict.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/pict.rkt
deleted file mode 100644
index f44143b847..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/pict.rkt
+++ /dev/null
@@ -1,544 +0,0 @@
-#lang racket/base
-(require pict
-         racket/contract/base racket/match
-         racket/splicing racket/stxparam racket/draw
-         racket/block racket/class
-         (for-syntax racket/base)
-         "private/blur.rkt")
-(provide (all-from-out "private/blur.rkt"))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Picture Manipulation
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; ryanc: 'inset-to' might be a better name than 'fill'
-(define (fill pict w h)
-  (cc-superimpose
-   pict
-   (blank (or w (pict-width pict))
-          (or h (pict-height pict)))))
-
-(provide colorize/alpha)
-(define (colorize/alpha pict r g b a)
-  (colorize pict (make-object color% r g b a)))
-
-(define (color c p) (colorize p c))
-
-(define color/c
-  (or/c string? ;; might be faster
-        ;;(and/c string? (lambda (s) (send the-color-database find-color s)))
-        (is-a?/c color%)
-        (list/c byte? byte? byte?)))
-
-(define-syntax-rule (define-colors name ...)
-  (begin (define (name pict) (color (symbol->string 'name) pict)) ...))
-
-(define-colors
-  red orange yellow green blue purple
-  black brown gray white cyan magenta)
-
-(define (light c) (scale-color 2 c))
-(define (dark c) (scale-color 1/2 c))
-
-(provide/contract
- [color/c flat-contract?]
- [red     (-> pict? pict?)]
- [orange  (-> pict? pict?)]
- [yellow  (-> pict? pict?)]
- [green   (-> pict? pict?)]
- [blue    (-> pict? pict?)]
- [purple  (-> pict? pict?)]
- [black   (-> pict? pict?)]
- [brown   (-> pict? pict?)]
- [gray    (-> pict? pict?)]
- [white   (-> pict? pict?)]
- [cyan    (-> pict? pict?)]
- [magenta (-> pict? pict?)]
- [light (-> color/c color/c)]
- [dark (-> color/c color/c)]
- [color (-> color/c pict? pict?)]
- [fill
-  (-> pict?
-      (or/c (real-in 0 +inf.0) #f)
-      (or/c (real-in 0 +inf.0) #f)
-      pict?)])
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Space-smart picture selection
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-syntax-parameter pict-combine #'ltl-superimpose)
-
-(define-syntax-rule (with-pict-combine combine body ...)
-  (splicing-syntax-parameterize
-   ([pict-combine #'combine])
-   body ...))
-
-(define-syntax (pict-if stx)
-  (syntax-case stx ()
-    [(_ #:combine combine test success failure)
-     (syntax/loc stx
-       (let* ([result test])
-         (combine (show success result)
-                  (hide failure result))))]
-    [(_ test success failure)
-     (quasisyntax/loc stx
-       (pict-if #:combine #,(syntax-parameter-value #'pict-combine)
-                test success failure))]))
-
-(define-syntax (pict-cond stx)
-  (syntax-case stx (else)
-    [(_ #:combine combine [test expr] ... [else default])
-     (with-syntax ([(pict ...) (generate-temporaries #'(expr ...))])
-       (syntax/loc stx
-         (let ([pict expr] ... [final default])
-           (combine (cond [test pict] ... [else final])
-                    (ghost pict) ... (ghost final)))))]
-    [(_ #:combine combine [test pict] ...)
-     (syntax/loc stx
-       (pict-cond #:combine combine [test pict] ... [else (blank 0 0)]))]
-    [(_ [test expr] ...)
-     (quasisyntax/loc stx
-       (pict-cond #:combine #,(syntax-parameter-value #'pict-combine)
-                  [test expr] ...))]))
-
-(define-syntax (pict-case stx)
-  (syntax-case stx (else)
-    [(_ test #:combine combine [literals expr] ... [else default])
-     (with-syntax ([(pict ...) (generate-temporaries #'(expr ...))])
-       (syntax/loc stx
-         (let ([pict expr] ... [final default])
-           (combine (case test [literals pict] ... [else final])
-                    (ghost pict) ... (ghost final)))))]
-    [(_ test #:combine combine [literals expr] ...)
-     (syntax/loc stx
-       (pict-case test #:combine combine
-                  [literals expr] ... [else (blank 0 0)]))]
-    [(_ test [literals expr] ...)
-     (quasisyntax/loc stx
-       (pict-case test #:combine #,(syntax-parameter-value #'pict-combine)
-                  [literals expr] ...))]))
-
-(define-syntax (pict-match stx)
-  (syntax-case stx ()
-    [(_ test #:combine combine [pattern expr] ...)
-     (with-syntax ([(pict ...) (generate-temporaries #'(expr ...))])
-       (syntax/loc stx
-         (let ([pict expr] ...)
-           (combine (match test [pattern pict] ... [_ (blank 0 0)])
-                    (ghost pict) ...))))]
-    [(_ test [pattern expr] ...)
-     (quasisyntax/loc stx
-       (pict-match test #:combine #,(syntax-parameter-value #'pict-combine)
-                   [pattern expr] ...))]))
-
-(provide/contract
- [hide (->* [pict?] [any/c] pict?)]
- [show (->* [pict?] [any/c] pict?)]
- [strike (->* [pict?] [any/c] pict?)]
- [shade (->* [pict?] [any/c #:ratio (real-in 0 1)] pict?)])
-(provide staged stage stage-name
-         before at after before/at at/after
-         pict-if pict-cond pict-case pict-match
-         pict-combine with-pict-combine)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Slide Staging
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-for-syntax (stage-keyword stx)
-  (raise-syntax-error #f "not in the body of a staged slide" stx))
-
-(define-syntax-parameter stage stage-keyword)
-(define-syntax-parameter stage-name stage-keyword)
-
-(define-syntax (staged stx)
-  (syntax-case stx ()
-    [(_ [name ...] body ...)
-     (let* ([ids (syntax->list #'(name ...))])
-
-       (for ([id (in-list ids)] #:unless (identifier? id))
-         (raise-syntax-error #f "expected an identifier" stx id))
-
-       (with-syntax ([(num ...)
-                      (for/list ([i (in-naturals 1)] [id (in-list ids)])
-                        (datum->syntax #'here i id))])
-
-         (syntax/loc stx
-           (let* ([name num] ...)
-             (define (staged-computation number symbol)
-               (syntax-parameterize
-                   ([stage (make-rename-transformer #'number)]
-                    [stage-name (make-rename-transformer #'symbol)])
-                 (block body ...)))
-             (begin (staged-computation name 'name) ...)))))]))
-
-(define-syntax-rule (before name) (< stage name))
-(define-syntax-rule (before/at name) (<= stage name))
-(define-syntax-rule (at/after name) (>= stage name))
-(define-syntax-rule (after name) (> stage name))
-(define-syntax-rule (before/after name) (not (= stage name)))
-(define-syntax-rule (at name ...) (or (= stage name) ...))
-
-(define (hide pict [hide? #t])
-  (if hide? (ghost pict) pict))
-
-(define (show pict [show? #t])
-  (if show? pict (ghost pict)))
-
-(define (shade pict [shade? #t] #:ratio [ratio 0.5])
-  (if shade? (cellophane pict ratio) pict))
-
-(define (strike pict [strike? #t])
-  (if strike?
-      (pin-over pict
-                0
-                (/ (pict-height pict) 2)
-                (pip-line (pict-width pict) 0 0))
-      pict))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Misc
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; the following has been added by stamourv, then replaced with implementations
-;; adapted from Ian Johnson
-
-(define (draw-shape/border dc-path color border-color border-width)
-  (define-values (color* style)
-    (if color
-        (values color 'solid)
-        (values "white" 'transparent)))
-  (let-values ([(x y w h) (send dc-path get-bounding-box)])
-    (dc (λ (dc dx dy)
-          (define old-brush (send dc get-brush))
-          (define old-pen   (send dc get-pen))
-          (send dc set-brush
-                (send the-brush-list find-or-create-brush color* style))
-          (send dc set-pen (send the-pen-list
-                                 find-or-create-pen
-                                 border-color
-                                 border-width
-                                 (send old-pen get-style)))
-          (send dc draw-path dc-path (- dx x) (- dy y))
-          (send dc set-brush old-brush)
-          (send dc set-pen   old-pen))
-        w h)))
-
-(define (ellipse/border ew eh
-                        #:color [color #f]
-                        #:border-color [border-color "black"]
-                        #:border-width [border-width 2])
-  (define dc-path (new dc-path%))
-  (send dc-path ellipse 0 0 ew eh)
-  (draw-shape/border dc-path color border-color border-width))
-(define (circle/border d
-                       #:color [color #f]
-                       #:border-color [border-color "black"]
-                       #:border-width [border-width 2])
-  (ellipse/border d d
-                  #:color color #:border-color border-color
-                  #:border-width border-width))
-(define (rounded-rectangle/border w h
-                                  #:color [color #f]
-                                  #:border-color [border-color "black"]
-                                  #:border-width [border-width 2]
-                                  #:corner-radius [corner-radius -0.25]
-                                  #:angle [angle 0])
-  (define dc-path (new dc-path%))
-  (send dc-path rounded-rectangle 0 0 w h corner-radius)
-  (send dc-path rotate angle)
-  (draw-shape/border dc-path color border-color border-width))
-(define (rectangle/border w h
-                          #:color [color #f]
-                          #:border-color [border-color "black"]
-                          #:border-width [border-width 2]
-                          #:corner-radius [corner-radius -0.25])
-  (define dc-path (new dc-path%))
-  (send dc-path rectangle 0 0 w h)
-  (draw-shape/border dc-path color border-color border-width))
-
-(define shape/border-contract
-  (->* [real? real?]
-       [#:color color/c #:border-color color/c #:border-width real?]
-       pict?))
-(provide/contract
- [ellipse/border shape/border-contract]
- [rectangle/border shape/border-contract]
- [rounded-rectangle/border
-  (->* [real? real?]
-       [#:color color/c #:border-color color/c #:border-width real? #:corner-radius real? #:angle real?]
-       pict?)]
- [circle/border
-  (->* [real?]
-       [#:color color/c #:border-color color/c #:border-width real?]
-       pict?)])
-
-;; the following has been written by Scott Owens
-;; and updated and added by stamourv
-
-(define (label-line label pict src-pict src-coord-fn dest-pict dest-coord-fn
-                    #:x-adjust (x-adjust 0) #:y-adjust (y-adjust 0))
-  (let-values (((src-x src-y) (src-coord-fn pict src-pict))
-               ((dest-x dest-y) (dest-coord-fn pict dest-pict)))
-    (let* ((src (make-rectangular src-x src-y))
-           (dest (make-rectangular dest-x dest-y))
-           (adjust (make-rectangular x-adjust y-adjust))
-           (v (- dest src))
-           (h2 (pict-height label)))
-      ;; Ensure that the src is left of dest
-      (when (< (real-part v) 0)
-        (set! v (- v))
-        (set! src dest))
-      (let ((p (+ src
-                  ;; Move the label to sit atop the line.
-                  (/ (* h2 -i v) (magnitude v) 2)
-                  ;; Center the label in the line.
-                  (/ (- v (make-rectangular (pict-width label)
-                                            (pict-height label)))
-                     2)
-                  adjust)))
-        (pin-over
-         pict
-         (real-part p)
-         (imag-part p)
-         label)))))
-
-(define (pin-label-line label pict
-                        src-pict src-coord-fn
-                        dest-pict dest-coord-fn
-                        #:start-angle (start-angle #f)
-                        #:end-angle (end-angle #f)
-                        #:start-pull (start-pull 1/4)
-                        #:end-pull (end-pull 1/4)
-                        #:line-width (line-width #f)
-                        #:color (color #f)
-                        #:alpha (alpha 1)
-                        #:style (style 'solid)
-                        #:under? (under? #f)
-                        #:x-adjust (x-adjust 0)
-                        #:y-adjust (y-adjust 0))
-  (label-line
-   label
-   (pin-line
-    pict src-pict src-coord-fn dest-pict dest-coord-fn
-    #:start-angle start-angle #:end-angle end-angle
-    #:start-pull start-pull #:end-pull end-pull
-    #:line-width line-width #:color color #:alpha alpha #:style style #:under? under?)
-   src-pict src-coord-fn dest-pict dest-coord-fn
-   #:x-adjust x-adjust #:y-adjust y-adjust))
-
-(define-values (pin-arrow-label-line
-                pin-arrows-label-line)
-  (let ()
-    (define ((mk fn)
-             label arrow-size pict
-             src-pict src-coord-fn
-             dest-pict dest-coord-fn
-             #:start-angle (start-angle #f)
-             #:end-angle (end-angle #f)
-             #:start-pull (start-pull 1/4)
-             #:end-pull (end-pull 1/4)
-             #:line-width (line-width #f)
-             #:color (color #f)
-             #:alpha (alpha 1)
-             #:under? (under? #f)
-             #:solid? (solid? #t)
-             #:style (style 'solid)
-             #:hide-arrowhead? (hide-arrowhead? #f)
-             #:x-adjust (x-adjust 0)
-             #:y-adjust (y-adjust 0))
-      (label-line
-       label
-       (fn
-        arrow-size pict src-pict src-coord-fn dest-pict dest-coord-fn
-        #:start-angle start-angle #:end-angle end-angle
-        #:start-pull start-pull #:end-pull end-pull
-        #:line-width line-width #:color color #:under? under?
-        #:style style
-        #:alpha alpha
-        #:solid? solid?
-        #:hide-arrowhead? hide-arrowhead?)
-       src-pict src-coord-fn dest-pict dest-coord-fn
-       #:x-adjust x-adjust #:y-adjust y-adjust))
-    (values (mk pin-arrow-line)
-            (mk pin-arrows-line))))
-(define pin-arrow-label-line-contract
-  (->* [pict? real? pict?
-        pict-path? (-> pict? pict-path? (values real? real?))
-        pict-path? (-> pict? pict-path? (values real? real?))]
-       [#:start-angle (or/c real? #f) #:end-angle (or/c real? #f)
-        #:start-pull real? #:end-pull real?
-        #:line-width (or/c real? #f)
-        #:color (or/c #f string? (is-a?/c color%))
-        #:style pen-style/c
-        #:alpha (real-in 0 1)
-        #:solid? any/c
-        #:under? any/c #:hide-arrowhead? any/c
-        #:x-adjust real? #:y-adjust real?]
-       pict?))
-
-(provide/contract
- [pin-label-line
-  (->* [pict? pict?
-        pict-path? (-> pict? pict-path? (values real? real?))
-        pict-path? (-> pict? pict-path? (values real? real?))]
-       [#:start-angle (or/c real? #f) #:end-angle (or/c real? #f)
-        #:start-pull real? #:end-pull real?
-        #:line-width (or/c real? #f)
-        #:color (or/c #f string? (is-a?/c color%))
-        #:under? any/c
-        #:x-adjust real? #:y-adjust real?]
-       pict?)]
- [pin-arrow-label-line pin-arrow-label-line-contract]
- [pin-arrows-label-line pin-arrow-label-line-contract])
-
-;; the following are by ryanc
-
-(define (scale-to p w h #:mode [mode 'preserve])
-  (let* ([w0 (pict-width p)]
-         [h0 (pict-height p)]
-         [wfactor0 (if (zero? w0) 1 (/ w w0))]
-         [hfactor0 (if (zero? h0) 1 (/ h h0))])
-    (let-values ([(wfactor hfactor)
-                  (case mode
-                    ((preserve inset)
-                     (let ([factor (min wfactor0 hfactor0)])
-                       (values factor factor)))
-                    ((distort)
-                     (values wfactor0 hfactor0)))])
-      (let ([scaled-pict (scale p wfactor hfactor)])
-        (case mode
-          ((inset)
-           (cc-superimpose (blank w h) scaled-pict))
-          (else
-           scaled-pict))))))
-
-(provide/contract
- [scale-to
-  (->* (pict? real? real?)
-       (#:mode (or/c 'preserve 'inset 'distort))
-       pict?)])
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Other pict combinators
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; The following were added by asumu
-(provide (contract-out
-          [backdrop (->* (pict?) (#:color color/c) pict?)]
-          [cross-out (->* (pict?)
-                          (#:width real?
-                           #:style (or/c 'transparent 'solid 'xor
-                                         'hilite 'dot 'long-dash 'short-dash
-                                         'dot-dash 'xor-dot 'xor-long-dash
-                                         'xor-short-dash 'xor-dot-dash)
-                           #:color color/c)
-                          pict?)]))
-
-;; backdrop
-;; adds a background highlighted with the given color
-(define (backdrop pict #:color [color "white"])
-  (pin-under
-   pict 0 0
-   (colorize (filled-rectangle
-              (pict-width pict)
-              (pict-height pict))
-             color)))
-
-;; cross-out
-;; crosses out the pict with two lines of the given color
-(define (cross-out pict
-                   #:width [width 1]
-                   #:style [style 'solid]
-                   #:color [color "black"])
-  (cc-superimpose
-   pict
-   (dc (λ (dc dx dy)
-         (define old-pen (send dc get-pen))
-         (send dc set-pen
-               (new pen% [width width] [style style] [color color]))
-         (send dc draw-line
-               dx dy
-               (+ dx (pict-width pict)) (+ dy (pict-height pict)))
-         (send dc draw-line
-               (+ dx (pict-width pict)) dy
-               dx (+ dy (pict-height pict)))
-         (send dc set-pen old-pen))
-       (pict-width pict)
-       (pict-height pict))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Tagged picts
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(require "private/tag-pict.rkt")
-
-(provide/contract
- [tag-path?
-  (-> any/c boolean?)]
- [tag-pict
-  (-> pict? symbol? pict?)]
- [pict-tag
-  (-> pict? (or/c symbol? #f))]
- [find-tag
-  (-> pict? tag-path? (or/c pict-path? #f))]
- [find-tag*
-  (-> pict? tag-path?
-      (listof pict-path?))])
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Shadow frame
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(require "private/shframe.rkt")
-
-(provide/contract
- [shadow-frame
-  (->* ()
-       (#:background-color (or/c string? (is-a?/c color%))
-        #:frame-color (or/c string? (is-a?/c color%))
-        #:frame-line-width (or/c real? #f)
-        #:shadow-side-length real?
-        #:shadow-top-y-offset real?
-        #:shadow-bottom-y-offset real?
-        #:shadow-descent (and/c real? (not/c negative?))
-        #:shadow-alpha-factor real?
-        #:blur (and/c real? (not/c negative?))
-        #:margin real?
-        #:sep real?)
-       #:rest (listof pict?)
-       pict?)]
- [arch
-  (-> real? real? real? real?
-      pict?)])
-
-;; draw
-
-(define (draw-pict-centered p dc aw ah)
-  (define pw (pict-width p))
-  (define ph (pict-height p))
-  (define (inset x y)
-    (/ (- x y) 2))
-  (draw-pict p dc (inset aw pw) (inset ah ph)))
-
-(provide
- (contract-out
-  [draw-pict-centered 
-   (-> pict? (is-a?/c dc<%>) real? real?
-       void?)]))
-
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/pict/align.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/pict/align.rkt
deleted file mode 100644
index e3b5270411..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/pict/align.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang racket/base
-(require pict
-         racket/contract/base)
-
-(define (pin-over/align scene x y halign valign pict)
-  (let ([localrefx (* (pict-width pict) (align->frac halign))]
-        [localrefy (* (pict-height pict) (align->frac valign))])
-    (pin-over scene (- x localrefx) (- y localrefy) pict)))
-
-(define (align->frac align)
-  (case align
-    ((t l)   0)
-    ((c)   1/2)
-    ((b r)   1)))
-
-(define (align->h align)
-  (case align
-    ((lt lc lb) 'l)
-    ((ct cc cb) 'c)
-    ((rt rc rb) 'r)))
-
-(define (align->v align)
-  (case align
-    ((lt ct rt) 't)
-    ((lc cc rc) 'c)
-    ((lb cb rb) 'b)))
-
-(define (halign->vcompose halign)
-  (case halign
-    ((l) vl-append)
-    ((c) vc-append)
-    ((r) vr-append)))
-
-(define (valign->hcompose align)
-  (case align
-    ((t) ht-append)
-    ((c) hc-append)
-    ((b) hb-append)))
-
-(define align/c
-  (or/c 'lt 'ct 'rt
-        'lc 'cc 'rc
-        'lb 'cb 'rb))
-(define halign/c
-  (or/c 'l 'c 'r))
-(define valign/c
-  (or/c 't 'c 'b))
-
-(provide
- (contract-out
-  ;; xxx more specific
-  [halign->vcompose (-> halign/c procedure?)]
-  [valign->hcompose (-> valign/c procedure?)]
-  [pin-over/align (-> pict? real? real? halign/c valign/c pict? pict?)]
-  [align->frac (-> (or/c halign/c valign/c) real?)]
-  [align/c contract?]
-  [halign/c contract?]
-  [align->h (-> align/c halign/c)]
-  [valign/c contract?]
-  [align->v (-> align/c valign/c)]))
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/pict/plt-logo.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/pict/plt-logo.rkt
deleted file mode 100644
index 692899af72..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/pict/plt-logo.rkt
+++ /dev/null
@@ -1,223 +0,0 @@
-#lang racket/base
-(require pict
-         racket/contract/base
-         racket/gui/base
-         racket/class
-         racket/math)
-
-(provide
- (contract-out
-  [make-plt-title-background (-> real? real? pict?)]))
-
-;; xxx document and provide
-;; (provide make-plt-title-background
-;;          make-plt-title-background*
-;;          plt-red-color
-;;          plt-blue-color
-;;          plt-background-color
-;;          plt-lambda-color
-;;          plt-pen-color
-;;          plt-pen-style)
-
-(define plt-red-color (make-object color% 242 183 183))
-(define plt-blue-color (make-object color% 183 202 242))
-(define plt-background-color (make-object color% 209 220 248))
-(define plt-lambda-color (send the-color-database find-color "white"))
-(define plt-pen-color "black")
-(define plt-pen-style 'transparent)
-
-(define (with-dc-settings dc thunk)
-  (let ([alpha (send dc get-alpha)]
-        [smoothing (send dc get-smoothing)]
-        [pen (send dc get-pen)]
-        [brush (send dc get-brush)])
-    (thunk)
-    (send dc set-alpha alpha)
-    (send dc set-smoothing smoothing)
-    (send dc set-pen pen)
-    (send dc set-brush brush)))
-
-(define (make-plt-title-background*
-         w h
-         plt-red-color plt-blue-color plt-background-color plt-lambda-color
-         plt-pen-color plt-pen-style
-         #:edge-cleanup-pen [edge-cleanup-pen #f])
-  (let ()
-    (define left-lambda-path
-      (let ([p (new dc-path%)])
-        (send p move-to 153 44)
-        (send p line-to 161.5 60)
-        (send p curve-to 202.5 49 230 42 245 61)
-        (send p curve-to 280.06 105.41 287.5 141 296.5 186)
-        (send p curve-to 301.12 209.08 299.11 223.38 293.96 244)
-        (send p curve-to 281.34 294.54 259.18 331.61 233.5 375)
-        (send p curve-to 198.21 434.63 164.68 505.6 125.5 564)
-        (send p line-to 135 572)
-        p))
-
-    (define left-logo-path
-      (let ([p (new dc-path%)])
-        (send p append left-lambda-path)
-        (send p arc 0 0 630 630 (* 235/360 2 pi) (* 121/360 2 pi) #f)
-        p))
-
-    (define bottom-lambda-path
-      (let ([p (new dc-path%)])
-        (send p move-to 135 572)
-        (send p line-to 188.5 564)
-        (send p curve-to 208.5 517 230.91 465.21 251 420)
-        (send p curve-to 267 384 278.5 348 296.5 312)
-        (send p curve-to 301.01 302.98 318 258 329 274)
-        (send p curve-to 338.89 288.39 351 314 358 332)
-        (send p curve-to 377.28 381.58 395.57 429.61 414 477)
-        (send p curve-to 428 513 436.5 540 449.5 573)
-        (send p line-to 465 580)
-        (send p line-to 529 545)
-        p))
-
-    (define bottom-logo-path
-      (let ([p (new dc-path%)])
-        (send p append bottom-lambda-path)
-        (send p arc 0 0 630 630 (* 314/360 2 pi) (* 235/360 2 pi) #f)
-        p))
-
-    (define right-lambda-path
-      (let ([p (new dc-path%)])
-        (send p move-to 153 44)
-        (send p curve-to 192.21 30.69 233.21 14.23 275 20)
-        (send p curve-to 328.6 27.4 350.23 103.08 364 151)
-        (send p curve-to 378.75 202.32 400.5 244 418 294)
-        (send p curve-to 446.56 375.6 494.5 456 530.5 537)
-        (send p line-to 529 545)
-        p))
-
-    (define right-logo-path
-      (let ([p (new dc-path%)])
-        (send p append right-lambda-path)
-        (send p arc 0 0 630 630 (* 314/360 2 pi) (* 121/360 2 pi) #t)
-        p))
-
-    (define lambda-path ;; the lambda by itself (no circle)
-      (let ([p (new dc-path%)])
-        (send p append left-lambda-path)
-        (send p append bottom-lambda-path)
-        (let ([t (make-object dc-path%)])
-          (send t append right-lambda-path)
-          (send t reverse)
-          (send p append t))
-        (send p close)
-        p))
-
-    ;; This function draws the paths with suitable colors:
-    (define (paint-plt dc dx dy)
-      (send dc set-smoothing 'aligned)
-      (let ([old-pen (send dc get-pen)]
-            [old-brush (send dc get-brush)]
-            [old-clip (send dc get-clipping-region)])
-
-        (send dc set-pen plt-pen-color 0 plt-pen-style)
-
-        (cond
-          [(procedure? plt-lambda-color)
-           (with-dc-settings
-            dc
-            (λ ()
-              (plt-lambda-color dc)
-              (send dc draw-path lambda-path dx dy)))]
-          [plt-lambda-color
-           (send dc set-brush plt-lambda-color 'solid)
-           (send dc draw-path lambda-path dx dy)]
-          [else
-           (void)])
-
-        ;; Draw red regions
-        (cond
-          [(is-a? plt-red-color bitmap%)
-           (let ([rgn1 (new region% [dc dc])]
-                 [rgn2 (new region% [dc dc])])
-             (send rgn1 set-path left-logo-path dx dy)
-             (send rgn2 set-path bottom-logo-path dx dy)
-             (send rgn2 union rgn1)
-             (send dc set-clipping-region rgn2)
-
-             ;; the left and top values of the bounding box seem to change over time,
-             ;; so I've just put reasonable numbers below.
-             (let-values ([(sw sh) (send dc get-scale)])
-               (send dc set-scale 1 1)
-               (send dc draw-bitmap plt-red-color 220 100)
-               (send dc set-scale sw sh)))
-           (send dc set-clipping-region old-clip)
-           (cleanup-edges left-logo-path dc dx dy)
-           (cleanup-edges bottom-logo-path dc dx dy)]
-          [(procedure? plt-red-color)
-           (with-dc-settings
-            dc
-            (λ ()
-              (plt-red-color dc)
-              (send dc draw-path left-logo-path dx dy)
-              (send dc draw-path bottom-logo-path dx dy)))]
-          [else
-           (send dc set-brush plt-red-color 'solid)
-           (send dc draw-path left-logo-path dx dy)
-           (send dc draw-path bottom-logo-path dx dy)])
-
-        ;; Draw blue region
-        (cond
-          [(is-a? plt-blue-color bitmap%)
-           (let ([rgn (new region% [dc dc])])
-             (send rgn set-path right-logo-path dx dy)
-             (send dc set-clipping-region rgn)
-
-             ;; the left and top values of the bounding box seem to change over time,
-             ;; so I've just put reasonable numbers below.
-             (let-values ([(sw sh) (send dc get-scale)])
-               (send dc set-scale 1 1)
-               (send dc draw-bitmap plt-blue-color 430 50)
-               (send dc set-scale sw sh))
-             (send dc set-clipping-region old-clip)
-             (cleanup-edges right-logo-path dc dx dy))]
-          [(procedure? plt-blue-color)
-           (with-dc-settings
-            dc
-            (λ ()
-              (plt-blue-color dc)
-              (send dc draw-path right-logo-path dx dy)))]
-          [else
-           (send dc set-brush plt-blue-color 'solid)
-           (send dc draw-path right-logo-path dx dy)])
-
-        (send dc set-pen old-pen)
-        (send dc set-brush old-brush)
-        (send dc set-clipping-region old-clip)))
-
-    (define (cleanup-edges path dc dx dy)
-      (when edge-cleanup-pen
-        (let ([pen (send dc get-pen)]
-              [brush (send dc get-brush)]
-              [alpha (send dc get-alpha)])
-          (send dc set-pen edge-cleanup-pen)
-          (send dc set-brush "black" 'transparent)
-          (send dc set-alpha .8)
-          (send dc draw-path path dx dy)
-          (send dc set-pen pen)
-          (send dc set-brush brush)
-          (send dc set-alpha alpha))))
-
-    (clip
-     (pin-over
-      (if plt-background-color
-        (colorize (filled-rectangle w h)
-                  plt-background-color)
-        (blank w h))
-      320
-      50
-      (scale (dc paint-plt 630 630 0 0) 12/10)))))
-
-(define (make-plt-title-background w h)
-  (make-plt-title-background* w h
-                              plt-red-color
-                              plt-blue-color
-                              plt-background-color
-                              plt-lambda-color
-                              plt-pen-color
-                              plt-pen-style))
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/ppict.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/ppict.rkt
deleted file mode 100644
index 4c2fe5266b..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/ppict.rkt
+++ /dev/null
@@ -1,85 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     syntax/parse
-                     syntax/parse/experimental/contract
-                     "private/ppict-syntax.rkt")
-         racket/contract/base
-         pict
-         unstable/gui/pict/align
-         "private/ppict.rkt"
-         "private/tag-pict.rkt")
-
-(define-for-syntax (ppict-do*-transformer who stx)
-  (syntax-parse stx
-    [(_ base . fs)
-     #:declare base (expr/c #'pict?)
-     #:declare fs (fragment-sequence who #'xp #'rpss)
-     #'(let ([xp base.c] [rpss null])
-         fs.code)]))
-
-(define-syntax (ppict-do stx)
-  #`(let-values ([(final _picts)
-                  #,(ppict-do*-transformer 'ppict-do stx)])
-      final))
-
-(define-syntax (ppict-do* stx)
-  (ppict-do*-transformer 'ppict-do* stx))
-
-;; ----
-
-(provide ppict-do
-         ppict-do*
-         ppict-do-state)
-
-(provide ppict?
-         placer?
-         refpoint-placer?)
-
-(provide/contract
- [ppict-go
-  (-> pict? placer? ppict?)]
- [ppict-add
-  (->* (ppict?)
-       ()
-       #:rest (listof (or/c pict? real? #f 'next))
-       pict?)]
- [ppict-add*
-  (->* (ppict?)
-       ()
-       #:rest (listof (or/c pict? real? #f 'next))
-       (values pict? (listof pict?)))]
- [ppict-placer
-  (-> ppict? placer?)]
- [coord
-  (->* (real? real?)
-       (align/c
-        #:abs-x real?
-        #:abs-y real?
-        #:compose procedure?)
-       refpoint-placer?)]
- [grid
-  (->* (exact-positive-integer? exact-positive-integer?
-        exact-integer? exact-integer?)
-       (align/c
-        #:abs-x real?
-        #:abs-y real?
-        #:compose procedure?)
-       refpoint-placer?)]
- [cascade
-  (->* ()
-       ((or/c real? 'auto) (or/c real? 'auto))
-       placer?)]
- [tile
-  (-> exact-positive-integer? exact-positive-integer?
-      placer?)]
- [at-find-pict
-  (->* ((or/c tag-path? pict-path?))
-       (procedure?
-        align/c
-        #:abs-x real?
-        #:abs-y real?
-        #:compose procedure?)
-       refpoint-placer?)]
- [merge-refpoints
-  (-> refpoint-placer? refpoint-placer?
-      refpoint-placer?)])
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/private/blur.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/private/blur.rkt
deleted file mode 100644
index 0374b2aa8a..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/private/blur.rkt
+++ /dev/null
@@ -1,195 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/unsafe/ops
-         racket/contract/base
-         racket/class
-         racket/draw
-         unstable/future
-         pict)
-
-(define nneg-real/c (and/c real? (not/c negative?)))
-
-(provide/contract
- [blur
-  (->* (pict? nneg-real/c)
-       (nneg-real/c
-        #:pre-inset? any/c)
-       pict?)]
- [shadow
-  (->* (pict? nneg-real/c)
-       (real? real?
-        #:color (or/c #f string? (is-a?/c color%))
-        #:shadow-color (or/c #f string? (is-a?/c color%)))
-       pict?)]
- [blur-bitmap!
-  (->* ((is-a?/c bitmap%) exact-nonnegative-integer?)
-       (exact-nonnegative-integer?)
-       void?)])
-
-;; ----
-
-(define (blur p hbr [vbr hbr]
-              #:pre-inset? [pre-inset? #t])
-  (let* ([p
-          (cond [pre-inset? (inset p hbr vbr)]
-                [else p])]
-         [blurred (*blur p hbr vbr)])
-    (cond [pre-inset? (inset blurred (- hbr) (- vbr))]
-          [else blurred])))
-
-(define (shadow p br [dx 0] [dy dx]
-                #:color [c #f]
-                #:shadow-color [shc #f]
-                #:auto-inset? [auto-inset? #f])
-  ;; FIXME: should auto-inset also use dx, dy?
-  (define (colorize* p c)
-    (if c (colorize p c) p))
-  (let ([result
-         (pin-under (colorize* p c)
-                    dx dy
-                    (blur (colorize* p shc) br))])
-    (cond [auto-inset? (inset result br)]
-          [else result])))
-
-(define (blur-bitmap! bmp hbr [vbr hbr])
-  (blur! bmp hbr vbr))
-
-;; ----
-
-(define MAX-RADIUS (expt 2 10))
-(define MAX-WEIGHT (expt 2 5))
-(define BOX-ITERATIONS 3)
-
-(define (*blur p hbr vbr)
-  (let* ([w (pict-width p)]
-         [h (pict-height p)]
-         [drawer (make-pict-drawer p)])
-    (dc (lambda (dc x y)
-          (let-values ([(sx sy) (send dc get-scale)])
-            (let* ([pxw (ceil/e (* w sx))]
-                   [pxh (ceil/e (* h sy))]
-                   [hbr* (min (ceil/e (* hbr sx)) pxw MAX-RADIUS)]
-                   [vbr* (min (ceil/e (* vbr sy)) pxh MAX-RADIUS)]
-                   [bmp (make-object bitmap% pxw pxh #f #t)]
-                   [bdc (new bitmap-dc% (bitmap bmp))])
-              (send bdc set-scale sx sy)
-              (send bdc set-font (send dc get-font))
-              (send bdc set-pen (send dc get-pen))
-              (send bdc set-brush (send dc get-brush))
-              (send bdc set-text-foreground (send dc get-text-foreground))
-              (when (or (zero? hbr*) (zero? vbr*))
-                ;; probably not worth smoothing when about to blur
-                ;; except when blurring by zero
-                (send bdc set-smoothing (send dc get-smoothing)))
-              (drawer bdc 0 0)
-              (blur! bmp hbr* vbr*)
-              (send dc set-scale 1.0 1.0)
-              (send dc draw-bitmap bmp (* x sx) (* y sy))
-              (send dc set-scale sx sy))))
-        w h)))
-
-(define (blur! bmp hbr vbr)
-  (let* ([w (send bmp get-width)]
-         [h (send bmp get-height)]
-         [pix (make-bytes (* w h 4))]
-         [out (make-bytes (* w h 4))])
-    (send bmp get-argb-pixels 0 0 w h pix #f #t)
-    (let ([hbr (ceil/e (/ hbr BOX-ITERATIONS))]
-          [vbr (ceil/e (/ vbr BOX-ITERATIONS))])
-      (box-h pix out hbr w h BOX-ITERATIONS)
-      (let-values ([(pix* out*)
-                    (cond [(even? BOX-ITERATIONS) (values out pix)]
-                          [else (values pix out)])])
-        (box-v pix* out* vbr w h BOX-ITERATIONS)))
-    (send bmp set-argb-pixels 0 0 w h pix #f #t)
-    (void)))
-
-;; ----
-
-;; iterated box blur
-
-(define-syntax-rule (box-line* radius start end get-val set-val)
-  (let ([non-zero-alpha?
-         (for/or ([outi (in-range start end)])
-           (positive? (get-val outi 0)))])
-    (cond [non-zero-alpha?
-           (for/fold ([wA 0] [wR 0] [wG 0] [wB 0] [wW 0])
-             ([leadI (in-range start (+ end radius))])
-             ;; (eprintf "leadI = ~s, wA = ~s, wW = ~s\n" leadI wA wW)
-             (let*-values ([(outI) (unsafe-fx- leadI radius)]
-                           [(tailI) (unsafe-fx- leadI (unsafe-fx+ radius radius))]
-                           [(addA addR addG addB addW)
-                            (cond [(unsafe-fx< leadI end)
-                                   (values (get-val leadI 0)
-                                           (get-val leadI 1)
-                                           (get-val leadI 2)
-                                           (get-val leadI 3)
-                                           1)]
-                                  [else (values 0 0 0 0 0)])]
-                           [(dropA dropR dropG dropB dropW)
-                            (cond [(unsafe-fx>= tailI start)
-                                   (values (get-val tailI 0)
-                                           (get-val tailI 1)
-                                           (get-val tailI 2)
-                                           (get-val tailI 3)
-                                           1)]
-                                  [else (values 0 0 0 0 0)])]
-                           [(nwA) (unsafe-fx+ wA addA)]
-                           [(nwR) (unsafe-fx+ wR addR)]
-                           [(nwG) (unsafe-fx+ wG addG)]
-                           [(nwB) (unsafe-fx+ wB addB)]
-                           [(nwW) (unsafe-fx+ wW addW)])
-               (when (and (unsafe-fx>= outI start) (unsafe-fx< outI end))
-                 ;; (eprintf "setting ~a = (~a,...)\n" outI (quotient nwA nwW))
-                 (set-val outI 0 (unsafe-fxquotient nwA nwW))
-                 (set-val outI 1 (unsafe-fxquotient nwR nwW))
-                 (set-val outI 2 (unsafe-fxquotient nwG nwW))
-                 (set-val outI 3 (unsafe-fxquotient nwB nwW)))
-               (values (unsafe-fx- nwA dropA)
-                       (unsafe-fx- nwR dropR)
-                       (unsafe-fx- nwG dropG)
-                       (unsafe-fx- nwB dropB)
-                       (unsafe-fx- nwW dropW))))]
-          [else
-           (for ([outI (in-range start end)])
-             (set-val outI 0 0)
-             (set-val outI 1 0)
-             (set-val outI 2 0)
-             (set-val outI 3 0))])))
-
-(define (box-h in out radius w h iterations)
-  (for/async ([row (in-range h)])
-    (for ([iter (in-range iterations)])
-      (let ([start (* row w)]
-            [end (* (add1 row) w)]
-            [in (if (even? iter) in out)]
-            [out (if (even? iter) out in)])
-        (define-syntax-rule (get-val i offset)
-          (bytes-ref in (unsafe-fx+ offset (unsafe-fx* 4 i))))
-        (define-syntax-rule (set-val i offset v)
-          (bytes-set! out (unsafe-fx+ offset (unsafe-fx* 4 i)) v))
-        (box-line* radius start end get-val set-val)))))
-
-(define (box-v in out radius w h iterations)
-  (for/async ([col (in-range w)])
-    (for ([iter (in-range iterations)])
-      (let ([start 0]
-            [end h]
-            [in (if (even? iter) in out)]
-            [out (if (even? iter) out in)])
-        (define-syntax-rule (get-val i offset)
-          (bytes-ref in (unsafe-fx+ (unsafe-fx* 4 (unsafe-fx+ (unsafe-fx* w i) col)) offset)))
-        (define-syntax-rule (set-val i offset v)
-          (bytes-set! out (unsafe-fx+ (unsafe-fx* 4 (unsafe-fx+ (unsafe-fx* w i) col)) offset) v))
-        (box-line* radius start end get-val set-val)))))
-
-(define (ceil/e x) (inexact->exact (ceiling x)))
-
-;; ----
-
-;; used for benchmarking to force effectively lazy dc pict constructor
-(define (p->bmp p)
-  (let* ([bmp (make-object bitmap% (ceil/e (pict-width p)) (ceil/e (pict-height p)))]
-         [bdc (new bitmap-dc% (bitmap bmp))])
-    (draw-pict p bdc 0 0)
-    bmp))
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/private/ppict-syntax.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/private/ppict-syntax.rkt
deleted file mode 100644
index b094017d9f..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/private/ppict-syntax.rkt
+++ /dev/null
@@ -1,108 +0,0 @@
-#lang racket/base
-(require syntax/parse syntax/parse/experimental/contract
-         (for-template racket/base
-                       racket/contract/base
-                       racket/stxparam
-                       pict
-                       "ppict.rkt"))
-(provide fragment-sequence)
-
-(define-syntax-class (fragment-sequence who xp-var rpss-var)
-  #:commit
-  #:local-conventions ([p (elem who)]
-                       #|[b (bind-fragment who)]|#
-                       [g (go-fragment who)]
-                       [s (set-fragment who)]
-                       [a (alt-fragment who)]
-                       [fs (fragment-sequence who xp-var rpss-var)]
-                       [pl (expr/c #'placer? #:name "argument to #:go")])
-  (pattern ()
-           #:with code
-           #`(values #,xp-var
-                     (apply append (reverse #,rpss-var))))
-  (pattern (p ...+ . fs)
-           #:with code
-           #`(let*-values ([(#,xp-var picts)
-                            (ppict-add/internal '#,who #,xp-var
-                                                (syntax-parameterize
-                                                    ([ppict-do-state
-                                                      (make-rename-transformer #'#,xp-var)])
-                                                    (list p.code ...)))]
-                           [(#,rpss-var)
-                            (cons picts #,rpss-var)])
-               fs.code))
-  (pattern (g . fs)
-           #:with code
-           #`(let-values ([(#,xp-var)
-                           (syntax-parameterize ([ppict-do-state
-                                                  (make-rename-transformer #'#,xp-var)])
-                             (ppict-go #,xp-var g.placer))])
-               fs.code))
-  #|
-  (pattern (b . fs)
-           #:with code
-           #`(let*-values ([(b.var ...)
-                            (syntax-parameterize ([ppict-do-state
-                                                   (make-rename-transformer #'#,xp-var)])
-                              b.rhs)])
-               fs.code))
-  |#
-  (pattern (s . fs)
-           #:with code
-           #`(let*-values ([(#,xp-var picts)
-                            (let ([pict-or-fun
-                                   (syntax-parameterize ([ppict-do-state
-                                                          (make-rename-transformer #'#,xp-var)])
-                                     s.p)])
-                              (if (pict? pict-or-fun)
-                                  (values pict-or-fun null)
-                                  (pict-or-fun)))]
-                           [(#,rpss-var) (cons picts #,rpss-var)])
-               fs.code))
-  (pattern (a . fs)
-           #:with code
-           #`(let*-values ([(alt-final alt-picts) (a.code #,xp-var)]
-                           [(#,rpss-var) (cons (append alt-picts (list alt-final)) #,rpss-var)])
-               ;; Note: fs.code continues with new rpss-var (shadowed), old xp-var
-               fs.code)))
-
-(define-splicing-syntax-class (go-fragment who)
-  #:description "#:go fragment"
-  (pattern (~seq #:go pl)
-           #:declare pl (expr/c #'placer? #:name "placer argument of #:go fragment")
-           #:with placer #'pl.c))
-
-#|
-(define-splicing-syntax-class (bind-fragment who)
-  #:description "#:bind fragment"
-  (pattern (~seq #:bind vs:var/vars rhs:expr)
-           #:with (var ...) #'(vs.var ...)))
-|#
-
-(define-splicing-syntax-class (set-fragment who)
-  #:description "#:set fragment"
-  (pattern (~seq #:set p0)
-           #:declare p0 (expr/c #'(or/c pict? (-> (values pict? (listof pict?))))
-                                #:name "argument of #:set fragment")
-           #:with p #'p0.c))
-
-(define-splicing-syntax-class (alt-fragment who)
-  #:description "#:alt fragment"
-  (pattern (~seq #:alt altfs)
-           #:declare altfs (fragment-sequence who #'alt-xp #'alt-rpss)
-           #:with code
-           #'(lambda (alt-xp) (let ([alt-rpss null]) altfs.code))))
-
-(define-splicing-syntax-class (elem who)
-  #:description "element fragment"
-  (pattern (~seq #:next)
-           #:with code #''next)
-  (pattern (~seq e)
-           #:declare e (expr/c #'(or/c pict? real? #f) #:name "element")
-           #:with code #'e.c))
-
-(define-syntax-class var/vars
-  #:description "variable or sequence of variables"
-  (pattern var1:id
-           #:with (var ...) #'(var1))
-  (pattern (var:id ...)))
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/private/ppict.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/private/ppict.rkt
deleted file mode 100644
index 20b6211f8e..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/private/ppict.rkt
+++ /dev/null
@@ -1,308 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/list
-         racket/class
-         racket/stxparam
-         racket/contract/base
-         pict
-         unstable/gui/pict/align
-         "tag-pict.rkt")
-
-#|
-TODO
-- [lcr]bl alignments... not sure about [lcr]tl
-- document composer contract
-- generalize ppict-add to ppict-add* (put 'next support there)
-- find a way to support slide animation
-|#
-
-;; ============================================================
-;; Progressive Picts
-
-#|
-A ppict contains a pict and a placer (or #f).
-A placer = (placer (pict (listof (U pict real #f)) -> ppict))
-In a placer function's arguments:
-  a number means to change the separation spacing
-  a #f is just ignored
-  FIXME: clarify, for following or including current gap?
-|#
-(struct ppict pict (placer))
-
-(define (mk-ppict p placer)
-  (ppict (pict-draw p)
-         (pict-width p)
-         (pict-height p)
-         (pict-ascent p)
-         (pict-descent p)
-         (list (make-child p 0 0 1 1 0 0))
-         #f
-         (pict-last p)
-         placer))
-
-(define (ppict-pict dp)
-  (child-pict (car (pict-children dp))))
-
-;; ----
-
-(define-syntax-parameter ppict-do-state
-  (lambda (stx)
-    (raise-syntax-error #f "used out of context" stx)))
-
-;; ppict-go : pict placer -> ppict
-(define (ppict-go dp pl)
-  (cond [(ppict? dp)
-         (mk-ppict (ppict-pict dp) pl)]
-        [(pict? dp)
-         (mk-ppict dp pl)]))
-
-;; ppict-add : ppict (U pict real #f 'next) ... -> ppict
-(define (ppict-add dp . parts)
-  (let-values ([(final intermediates)
-                (ppict-add/internal 'ppict-add dp parts)])
-    final))
-
-;; ppict-add* : ppict (U pict real #f 'next) ... -> (values ppict (listof pict))
-(define (ppict-add* dp . parts)
-  (ppict-add/internal 'ppict-add* dp parts))
-
-;; ppict-add/internal : symbol pict (listof (U pict real #f 'next))
-;;                   -> (values pict (listof pict)
-;; In second return value, one pict per 'next occurrence.
-;; FIXME: avoid applying ghost to previously ghosted pict?
-(define (ppict-add/internal who base parts)
-  (cond [(for/and ([part (in-list parts)]) (eq? part 'next))
-         ;; Special case; don't need a ppict
-         (values base (make-list (length parts) base))]
-        [else
-         (unless (ppict? base) (error who "missing placer"))
-         (let ([placer (ppict-placer base)]
-               [base-pict (ppict-pict base)]
-               [elem-chunks
-                ;; (listof (listof pict?))
-                ;;   length is N+1, where N is number of 'next in chunk
-                ;;   ghosted before visible
-                (let elab ([chunk parts])
-                  (cond [(and (pair? chunk) (eq? 'next (car chunk)))
-                         (let ([elab-rest (elab (cdr chunk))])
-                           (cons (map ghost* (car elab-rest)) elab-rest))]
-                        [(and (pair? chunk) (not (eq? 'next (car chunk))))
-                         (for/list ([elem-chunk (in-list (elab (cdr chunk)))])
-                           (cons (car chunk) elem-chunk))]
-                        [(null? chunk) (list null)]))])
-           (let out-loop ([chunks elem-chunks] [rpicts null])
-             (cond [(null? (cdr chunks))
-                    (values (send placer place base-pict (car chunks))
-                            (reverse rpicts))]
-                   [else
-                    (out-loop (cdr chunks)
-                              (cons (send placer place base-pict (car chunks))
-                                    rpicts))])))]))
-
-;; ----
-
-(define (placer? x) (is-a? x placer<%>))
-(define (refpoint-placer? x) (is-a? x refpoint%))
-
-(define (merge-refpoints x y)
-  (send x take-y-from y))
-
-(define placer<%>
-  (interface ()
-    ;; place : pict (listof (U pict real #f)) -> pict
-    place))
-
-(define refpoint%
-  (class* object% (placer<%>)
-    (init-field xa ya depxy halign valign compose
-                [sep 0]
-                [cont? #f])
-    (super-new)
-
-    (define/public (place scene picts)
-      (define-values (dx dy)
-        (let-values ([(depx depy) (if depxy (depxy scene) (values 0 0))])
-          (values (+ depx xa)
-                  (+ depy ya))))
-      (define-values (newpict newsep)
-        (apply-compose compose sep (cons (and cont? (blank 0)) picts)))
-      (define newscene
-        (pin-over/align scene dx dy halign valign newpict))
-      (cond [(and (eq? valign 't) (eq? compose (halign->vcompose halign)))
-             ;; ie, going top-down and compose is the natural compose for this align
-             (mk-ppict newscene
-                       (new refpoint%
-                            (xa dx) (ya (+ dy (pict-height newpict))) (depxy #f)
-                            (halign halign) (valign valign)
-                            (compose compose) (sep newsep) (cont? #t)))]
-            [(and (eq? halign 'l) (eq? compose (valign->hcompose valign)))
-             ;; ie, going left-right and compose is the natural compose ...
-             (mk-ppict newscene
-                       (new refpoint%
-                            (xa (+ dx (pict-width newpict))) (ya dy) (depxy #f)
-                            (halign halign) (valign valign)
-                            (compose compose) (sep newsep) (cont? #t)))]
-            [else newscene]))
-
-    (define/public (take-y-from other)
-      (new refpoint%
-           (xa xa)
-           (ya (get-field ya other))
-           (depxy (let ([odepxy (get-field depxy other)])
-                    (lambda (base)
-                      (let-values ([(x _y) (if depxy (depxy base) (values 0 0))]
-                                   [(_x y) (if odepxy (odepxy base) (values 0 0))])
-                        (values x y)))))
-           (halign halign)
-           (valign valign)
-           (compose compose)
-           (sep sep)
-           (cont? cont?)))))
-
-;; --
-
-(define (grid cols rows col row [align 'cc]
-              #:abs-x [abs-x 0]
-              #:abs-y [abs-y 0]
-              #:compose [compose (halign->vcompose (align->h align))])
-  ;; row, column indexes are 1-based
-  (define halign (align->h align))
-  (define valign (align->v align))
-  (define xfrac (/ (+ (sub1 col) (align->frac halign)) cols))
-  (define yfrac (/ (+ (sub1 row) (align->frac valign)) rows))
-  (new refpoint%
-       (xa abs-x) (ya abs-y)
-       (depxy (lambda (p)
-                (values (* xfrac (pict-width p))
-                        (* yfrac (pict-height p)))))
-       (halign halign) (valign valign) (compose compose)))
-
-(define (coord xfrac yfrac [align 'cc]
-               #:abs-x [abs-x 0]
-               #:abs-y [abs-y 0]
-               #:compose [compose (halign->vcompose (align->h align))])
-  (define halign (align->h align))
-  (define valign (align->v align))
-  (new refpoint%
-       (xa abs-x) (ya abs-y)
-       (depxy (lambda (p)
-                (values (* xfrac (pict-width p))
-                        (* yfrac (pict-height p)))))
-       (halign halign) (valign valign) (compose compose)))
-
-;; ----
-
-(define cascade%
-  (class* object% (placer<%>)
-    (init-field step-x0 step-y0)
-    (super-new)
-
-    (define/public (place scene elems)
-      (for ([e (in-list elems)])
-        (when (real? e) (error 'cascade "spacing changes not allowed: ~e" e)))
-      (let* ([picts (filter pict? elems)]
-             [max-w (apply max 1 (map pict-width picts))]  ;; avoid 0
-             [max-h (apply max 1 (map pict-height picts))] ;; avoid 0
-             [auto-step-x (/ (- (pict-width scene) max-w) (+ 1 (length picts)))]
-             [auto-step-y (/ (- (pict-height scene) max-h) (+ 1 (length picts)))]
-             [step-x (if (eq? step-x0 'auto) auto-step-x step-x0)]
-             [step-y (if (eq? step-y0 'auto) auto-step-y step-y0)]
-             [bbox (blank max-w max-h)]
-             [newscene
-              (for/fold ([scene scene])
-                  ([pict (in-list picts)]
-                   [i (in-naturals 1)])
-                (pin-over scene (* i step-x) (* i step-y) (cc-superimpose bbox pict)))])
-        ;; Can't continue a cascade, since depends on number of picts.
-        ;; FIXME: If step is given rather than computed, then we can.
-        newscene))))
-
-;; cascade : ... -> placer
-(define (cascade [step-x0 'auto] [step-y0 'auto])
-  ;; Auto cascade by largest bounding box.
-  ;; FIXME: add align arg, determines position of each pict w/in bbox
-  (new cascade% (step-x0 step-x0) (step-y0 step-y0)))
-
-(define tile%
-  (class* object% (placer<%>)
-    (init-field cols rows
-                [start-at 0])
-    (super-new)
-
-    (define/public (place scene elems)
-      (for ([e (in-list elems)])
-        (when (real? e) (error 'tile "spacing changes not allowed: ~e" e)))
-      (let* ([picts (filter pict? elems)]
-             [scene-w (pict-width scene)]
-             [scene-h (pict-height scene)]
-             [dx (/ scene-w cols)]
-             [dy (/ scene-h rows)]
-             [newscene
-              (for/fold ([scene scene])
-                  ([pict (in-list picts)]
-                   [i (in-naturals start-at)])
-                (let ([r (quotient i cols)]
-                      [c (remainder i cols)])
-                  (pin-over/align scene
-                                  (+ (/ dx 2) (* c dx))
-                                  (+ (/ dy 2) (* r dy))
-                                  'c 'c pict)))])
-        (mk-ppict newscene
-                  (new tile%
-                       (cols cols)
-                       (rows rows)
-                       (start-at (+ start-at (length picts)))))))))
-
-(define (tile cols rows)
-  (new tile% (cols cols) (rows rows)))
-
-;; at-find-pict : ... -> placer
-(define (at-find-pict path
-                      [find cc-find]
-                      [align 'cc]
-                      #:abs-x [abs-x 0]
-                      #:abs-y [abs-y 0]
-                      #:compose [compose (halign->vcompose (align->h align))])
-  (define halign (align->h align))
-  (define valign (align->v align))
-  (new refpoint%
-       (xa abs-x) (ya abs-y)
-       (depxy (lambda (p)
-                (let ([pict-path (if (tag-path? path) (find-tag p path) path)])
-                  (unless pict-path
-                    (error 'at-find-path "failed finding ~e" path))
-                  (find p pict-path))))
-       (halign halign) (valign valign) (compose compose)))
-
-;; ----
-
-;; apply-compose : compose real (listof (U #f pict real)) -> (values pict real)
-;; Returns composed pict and last given separator num in elems (or init-sep, if none)
-(define (apply-compose compose init-sep elems)
-  (define (start-loop sep elems)
-    (cond [(and (pair? elems) (real? (car elems)))
-           (start-loop (car elems) (cdr elems))]
-          [(and (pair? elems) (pict? (car elems)))
-           (join-loop (car elems) sep (cdr elems))]
-          [(null? elems)
-           (blank 0)]))
-  (define (join-loop base sep elems)
-    (cond [(and (pair? elems) (real? (car elems)))
-           (join-loop base (car elems) (cdr elems))]
-          [(and (pair? elems) (pict? (car elems)))
-           (join-loop (compose sep base (car elems))
-                      sep
-                      (cdr elems))]
-          [(null? elems) base]))
-  (values (start-loop init-sep (filter values elems))
-          (last (cons init-sep (filter real? elems)))))
-
-;; ----
-
-(define (ghost* x)
-  (if (pict? x) (ghost x) x))
-
-;; ============================================================
-;; Exports
-
-(provide (all-defined-out))
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/private/shframe.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/private/shframe.rkt
deleted file mode 100644
index f220142b18..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/private/shframe.rkt
+++ /dev/null
@@ -1,190 +0,0 @@
-#lang racket/base
-(require racket/math
-         racket/class
-         racket/draw
-         pict
-         "blur.rkt")
-(provide shadow-frame
-         arch)
-
-;; ============================================================
-;; Boxes with Keynote-style shadows
-
-(define (shadow-frame #:background-color [background-color "white"]
-                      #:frame-color [frame-color "gray"]
-                      #:frame-line-width [frame-line-width 0]
-                      #:shadow-side-length [s-side-len 4.0]
-                      #:shadow-top-y-offset [s-top-dy 10.0]
-                      #:shadow-bottom-y-offset [s-bot-dy 4.0]
-                      #:shadow-descent [s-desc 40.0]
-                      #:shadow-alpha-factor [s-alpha 3/4]
-                      #:blur [blur-radius 20]
-                      #:margin [margin-len 20]
-                      #:sep [sep 5]
-                      . picts)
-  ;; shadow-alpha-factor:
-  ;;   - default 3/4 good for a heavy shadow, if blur is enabled
-  ;;   - about 1/4 or 1/5 good for light shadow w/o blur
-  (let* ([pict (apply vl-append sep picts)]
-         [pict (inset pict margin-len)]
-         [w (pict-width pict)]
-         [h (pict-height pict)]
-         [main-box (frame (colorize (filled-rectangle w h) background-color)
-                          #:color frame-color #:line-width frame-line-width)]
-         [w* (+ w s-side-len s-side-len)]
-         [shadow (arch w* w* (+ h (- s-bot-dy s-top-dy)) s-desc)]
-         [shadow (brush/linear-gradient
-                  shadow
-                  (mk-shadow-grad-stops w* s-side-len s-alpha))]
-         [shadow
-          (cond [(zero? blur-radius) shadow]
-                [#t ;; use-smart-blur?
-                 (smart-blur shadow w h blur-radius
-                             s-side-len s-top-dy s-bot-dy s-desc)]
-                [else (blur shadow blur-radius)])]
-         [result
-          (pin-under (cc-superimpose main-box pict)
-                     (- s-side-len) s-top-dy
-                     shadow)]
-         [result
-          (inset result s-side-len 0
-                 s-side-len (+ s-desc (- s-top-dy s-bot-dy)))])
-    (inset result blur-radius)))
-
-;; smart-blur: blur only visible edges
-(define (smart-blur shadow w0 h0 blur-radius s-side-len s-top-dy s-bot-dy s-desc)
-  (define (blur-part p x1 y1 x2 y2 lpad tpad rpad bpad)
-    (let* ([p (viewport p (- x1 lpad) (- y1 tpad) (+ x2 rpad) (+ y2 bpad))]
-           [p (blur p blur-radius #:pre-inset? #f)]
-           [p (clip (inset p (- lpad) (- tpad) (- rpad) (- bpad)))])
-      p))
-  (define (viewport p x1 y1 x2 y2)
-    (clip (pin-over (blank (- x2 x1) (- y2 y1)) (- x1) (- y1) p)))
-  (let* ([shadow* (inset shadow blur-radius)]
-         [w* (pict-width shadow*)]
-         [h* (pict-height shadow*)]
-         [BR blur-radius]
-
-         [yTopBot (+ BR (- s-top-dy))]
-         [yMidBot (+ yTopBot h0)]
-         [xLeftRight (+ BR s-side-len)]
-
-         [top-part
-          (blur-part shadow*
-                     0 0 w* yTopBot
-                     0 0 0 BR)]
-         [left-part
-          (blur-part shadow*
-                     0 yTopBot xLeftRight yMidBot
-                     0 BR BR BR)]
-         [right-part
-          (blur-part shadow*
-                     (- w* xLeftRight) yTopBot w* yMidBot
-                     BR BR 0 BR)]
-         [bot-part
-          (blur-part shadow*
-                     0 yMidBot w* h*
-                     0 BR 0 0)]
-
-         [result (blank w* h*)]
-         [result (pin-over result 0 0 top-part)]
-         [result (pin-over result 0 yTopBot left-part)]
-         [result (pin-over result (- w* xLeftRight) yTopBot right-part)]
-         [result (pin-over result 0 yMidBot bot-part)])
-    (inset result (- blur-radius))))
-
-(define (mk-shadow-grad-stops w s-side-len s-alpha)
-  (let* ([epsA (/ s-side-len w)]
-         [epsZ (- 1.0 epsA)]
-         [alphaA (max 0 (min 1 (* s-alpha 0.16)))]
-         [alphaB (max 0 (min 1 (* s-alpha 0.25)))]
-         [alphaC (max 0 (min 1 (* s-alpha 1.00)))])
-    (list (list 0.00 (make-object color% 0 0 0 alphaA))
-          (list epsA (make-object color% 0 0 0 alphaB))
-          (list 0.25 (make-object color% 0 0 0 alphaC))
-          (list 0.75 (make-object color% 0 0 0 alphaC))
-          (list epsZ (make-object color% 0 0 0 alphaB))
-          (list 1.00 (make-object color% 0 0 0 alphaA)))))
-
-;; ----
-
-(define (arch outer-w inner-w solid-h leg-h)
-  (dc (lambda (dc X Y)
-        (draw-arch dc X Y outer-w inner-w solid-h leg-h))
-      outer-w (+ solid-h leg-h)))
-
-(define (draw-arch dc X Y outer-w inner-w solid-h leg-h)
-  (cond [(zero? leg-h)
-         (send dc draw-rectangle X Y outer-w solid-h)]
-        [else
-         (let ([path (new dc-path%)])
-           (dc-path-arch path X Y outer-w inner-w solid-h leg-h)
-           (send dc draw-path path))]))
-
-;; closes path's current sub-path and draws the outline of an arch, clockwise
-;; requires leg-h != 0
-(define (dc-path-arch path X Y outer-w inner-w solid-h leg-h)
-  (let* ([xA X]
-         [xB (+ X outer-w)]
-         [xMid (/ (+ xA xB) 2.0)]
-         [ySolidEnd (+ Y solid-h)]
-         [yEnd (+ Y solid-h leg-h)]
-         [hdx (/ (- outer-w inner-w) 2.0)]
-         [xAi (+ xA hdx)]
-         [xBi (- xB hdx)]
-         [radius (+ (/ leg-h 2) (/ (sqr inner-w) 8 leg-h))]
-         [diameter (+ radius radius)]
-         [theta (asin (/ (- radius leg-h) radius))])
-    (send* path
-      (move-to xA Y)
-      (line-to xB Y)
-      (line-to xB ySolidEnd)
-      (line-to xB yEnd)
-      (line-to xBi yEnd)
-      (arc (- xMid radius) ySolidEnd
-           diameter diameter
-           theta
-           (- pi theta))
-      ;; ends at *roughly* xAi yEnd
-      (line-to xAi yEnd)
-      (line-to xA yEnd)
-      (line-to xA ySolidEnd)
-      (line-to xA Y))))
-
-;; ====
-
-(define no-pen (make-object pen% "BLACK" 1 'transparent))
-
-(define (brush/linear-gradient p stops)
-  (let* ([drawer (make-pict-drawer p)]
-         [w (pict-width p)]
-         [h (pict-height p)])
-    (dc (lambda (dc X Y)
-          (let* ([grad
-                  (new linear-gradient%
-                       ;; Apparently gradient handles scaling,
-                       ;; rotation, etc automatically (???)
-                       (x0 X) (y0 Y) (x1 (+ X w)) (y1 Y)
-                       (stops stops))]
-                 [new-brush (new brush% (gradient grad))]
-                 [old-pen (send dc get-pen)]
-                 [old-brush (send dc get-brush)])
-            (send* dc
-              (set-pen no-pen)
-              (set-brush new-brush))
-            (drawer dc X Y)
-            (send* dc
-              (set-pen old-pen)
-              (set-brush old-brush))))
-        w h)))
-
-#|
-;; FIXME:
-;;   (arch ....) by itself draws outline
-;;   (colorize (arch ....) "red") draws filled (no outline, or same color)
-
-Problem: picts, colorize, etc not designed to inherit brush. See
-texpict/utils: filled-rectangle, eg, makes new brush from pen color;
-rectangle makes new transparent brush.
-
-|#
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/private/tag-pict.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/private/tag-pict.rkt
deleted file mode 100644
index 0131be92b2..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/private/tag-pict.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang racket/base
-(require pict)
-(provide tag-pict
-         find-tag
-         find-tag*
-         tag-path?
-         pict-tag)
-
-(struct tagged-pict pict (tag))
-;; tag is symbol
-
-(define (tag-pict p tg)
-  (tagged-pict (pict-draw p)
-               (pict-width p)
-               (pict-height p)
-               (pict-ascent p)
-               (pict-descent p)
-               (list (make-child p 0 0 1 1 0 0))
-               #f
-               (pict-last p)
-               tg))
-
-;; find-tag** : pict tag-path boolean -> (listof pict-path)
-(define (find-tag** p tagpath all?)
-  (let ([tagpath (if (symbol? tagpath) (list tagpath) tagpath)])
-    (define-syntax-rule (append* e1 e2)
-      (let ([x e1])
-        (cond [(or all? (null? x)) (append x e2)]
-              [else x])))
-    (define (loop p tagpath)
-      (cond [(pair? tagpath)
-             (childrenloop (pict-children p) tagpath)]
-            [(null? tagpath)
-             (list (list p))]))
-    (define (pairloop p tagpath)
-      (append*
-       (cond [(and (tagged-pict? p)
-                   (eq? (tagged-pict-tag p) (car tagpath)))
-              (for/list ([r (in-list (loop p (cdr tagpath)))])
-                (cons p r))]
-             [else null])
-       (childrenloop (pict-children p) tagpath)))
-    (define (childrenloop children tagpath)
-      (cond [(pair? children)
-             (append* (pairloop (child-pict (car children)) tagpath)
-                      (childrenloop (cdr children) tagpath))]
-            [(null? children)
-             null]))
-    (loop p tagpath)))
-
-(define (find-tag p tagpath)
-  (let ([r (find-tag** p tagpath #f)])
-    (and (pair? r) (car r))))
-
-(define (find-tag* p tagpath)
-  (find-tag** p tagpath #t))
-
-(define (tag-path? x)
-  (or (symbol? x)
-      (and (list? x) (pair? x) (andmap symbol? x))))
-
-(define (pict-tag p)
-  (and (tagged-pict? p) (tagged-pict-tag p)))
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/pslide.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/pslide.rkt
deleted file mode 100644
index c647a6ed55..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/pslide.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     syntax/parse
-                     "private/ppict-syntax.rkt")
-         racket/contract/base
-         slideshow/base
-         pict
-         "private/ppict.rkt")
-
-;; ============================================================
-;; Progressive Slides
-
-(define pslide-base-pict
-  (make-parameter (lambda () (blank client-w client-h))))
-
-(define pslide-default-placer
-  (make-parameter (coord 1/2 1/2 'cc)))
-
-;; pslide* : symbol (pict -> (values pict (listof pict)) -> void
-(define (pslide* who proc)
-  (let* ([init-pict ((pslide-base-pict))]
-         [init-placer (pslide-default-placer)])
-    (let-values ([(final picts)
-                  (proc (ppict-go init-pict init-placer))])
-      (for-each slide picts)
-      (slide final)
-      (void))))
-
-;; ----
-
-(define-syntax (pslide stx)
-  (syntax-parse stx
-    [(_ . fs)
-     #:declare fs (fragment-sequence 'pslide #'xp #'rpss)
-     #'(pslide* 'pslide
-                (lambda (xp)
-                  (let ([rpss null])
-                    fs.code)))]))
-
-;; ============================================================
-;; Exports
-
-(provide/contract
- [pslide-base-pict
-  (parameter/c (-> pict?))]
- [pslide-default-placer
-  (parameter/c placer?)])
-
-(provide pslide)
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/scribble.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/scribble.rkt
deleted file mode 100644
index 876fe28931..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/scribble.rkt
+++ /dev/null
@@ -1,146 +0,0 @@
-#lang racket/base
-
-(require (prefix-in s: (combine-in scribble/manual scribble/core))
-         (prefix-in slideshow: (combine-in slideshow/base pict))
-         racket/draw
-         racket/class ;; only for make-object
-         racket/match)
-
-(provide codeblock->pict)
-
-;; Converts a scribble codeblock into a slideshow pict. Most useful with at-exp
-;; @codeblock{
-;; #lang racket
-;;
-;;   (define (x z)
-;;     (+ z 2))
-;; }
-(define (codeblock->pict block)
-  (define (color-text name what)
-    (define (float-part v)
-      (inexact->exact (round (* 255 v))))
-
-    (define-syntax-rule (define-color name r g b)
-                        (define name (make-object color%
-                                                  (float-part r)
-                                                  (float-part g)
-                                                  (float-part b))))
-    ;; \definecolor{PaleBlue}{rgb}{0.90,0.90,1.0}
-    ;; \definecolor{LightGray}{rgb}{0.90,0.90,0.90}
-    ;; \definecolor{CommentColor}{rgb}{0.76,0.45,0.12}
-    ;; \definecolor{ParenColor}{rgb}{0.52,0.24,0.14}
-    ;; \definecolor{IdentifierColor}{rgb}{0.15,0.15,0.50}
-    ;; \definecolor{ResultColor}{rgb}{0.0,0.0,0.69}
-    ;; \definecolor{ValueColor}{rgb}{0.13,0.55,0.13}
-    ;; \definecolor{OutputColor}{rgb}{0.59,0.00,0.59}
-
-    (define-color value-color 0.13 0.55 0.13)
-    (define-color identifier-color 0.15 0.15 0.50)
-    (define-color pale-blue 0.90 0.90 1.0)
-    (define-color light-gray 0.90 0.90 0.90)
-    (define-color comment-color 0.76 0.45 0.12)
-    (define-color paren-color 0.52 0.24 0.14)
-    (define-color result-color 0.0 0.0 0.69)
-    (define-color output-color 0.59 0.0 0.59)
-    (define-color black 0.0 0.0 0.0)
-
-    ;; FIXME
-    (define-color blue 0 0 1)
-
-    ;; FIXME
-    (define-color red 1 0 0)
-
-    ;; FIXME
-    (define-color light-grey 0.8 0.8 0.8)
-
-    (define (get-color name)
-      (match name
-        ["RktMeta" identifier-color]
-        ["RktPn" paren-color]
-        ["RktPlain" black]
-        ["RktKw" black]
-        ["RktCmt" comment-color]
-        ["RktPn" paren-color]
-        ["RktInBG" paren-color]
-        ["RktSym" identifier-color]
-        ["RktVal" value-color]
-        ["RktValLink" blue]
-        ["RktModLink" blue]
-        ["RktRes" result-color]
-        ["RktOut" output-color]
-        ["RktMeta" identifier-color]
-        ["RktMod" black]
-        ["RktRdr" black]
-        ["RktVarCol" identifier-color]
-
-        ;; FIXME
-        ;; \RktVarCol{\textsl{#1}}}
-        ["RktVar" (get-color "RktVarCol")]
-
-        ["RktErrCol" red]
-
-        ;; FIXME:
-        ;; {{\RktErrCol{\textrm{\textit{#1}}}}}
-        ["RktErr" (get-color "RktErrCol")]
-
-        ;; FIXME:
-        ;; {\RktOpt}[1]{#1}
-        ;;
-        ["RktOpt" black]
-
-        ;; FIXME: 
-        ;;  }[1]{\incolorbox{LightGray}{\RktInBG{#1}}}
-        ["RktIn" light-grey]
-
-        ;; FIXME:
-        ;;  }[1]{\colorbox{PaleBlue}{\hspace{-0.5ex}\RktInBG{#1}\hspace{-0.5ex}}}
-        ["highlighted" pale-blue]
-        [else (error 'color-text "unknown type type '~a'" name)]))
-
-    (define out (slideshow:text what '(bold . modern) (slideshow:current-font-size)))
-    (slideshow:colorize out (get-color name)))
-
-  (define (append-all combiner)
-    (lambda (elements)
-      (apply combiner (slideshow:blank) elements)))
-
-  (define hc-append-all (append-all slideshow:hc-append))
-  (define vl-append-all (append-all slideshow:vl-append))
-
-  (define (convert-element element)
-    (match element
-      [(struct s:element (style content))
-       (match style
-         #;
-         ['hspace (tt " ")]
-         ['hspace (slideshow:tt (s:content->string content))]
-         #;
-         ['hspace (blank 20 1)]
-         [(struct s:style (name properties))
-          (color-text name (s:content->string content))])]))
-
-  (define (convert-block block)
-    (match block
-      [(struct s:paragraph (style content))
-       (hc-append-all 
-         (for/list ([element content])
-           (match element
-             [(? string?) (slideshow:t element)]
-             [(struct s:element (style content)) (convert-element element)]
-             [else (error 'convert-block "don't know what to do with ~a" element)])))]))
-
-  (define (convert-row row)
-    (hc-append-all
-      (for/list ([element row])
-        (convert-block element))))
-    
-  ;; (pretty-print block)
-  (match block
-    [(struct s:nested-flow (style (list blocks ...)))
-     (hc-append-all
-       (for/list ([block blocks])
-         (match block
-           [(struct s:table (style (list rows ...)))
-            (vl-append-all
-              (for/list ([row rows])
-                (convert-row row)))])))]))
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/slideshow.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/slideshow.rkt
deleted file mode 100644
index c47abedf97..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/slideshow.rkt
+++ /dev/null
@@ -1,238 +0,0 @@
-#lang racket/base
-(require slideshow/base pict
-         racket/contract/base racket/list racket/match
-         racket/stxparam
-         (for-syntax racket/base racket/list racket/set syntax/parse)
-         "pict.rkt")
-(provide (all-from-out "pict.rkt"))
-
-(define-syntax-rule (define-with-parameter name parameter)
-  (define-syntax-rule (name value body (... ...))
-    (parameterize ([parameter value]) body (... ...))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Font Controls
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-with-parameter with-size current-font-size)
-(define-syntax-rule (with-scale scale expr)
-  (with-size (inexact->exact (ceiling (* scale (current-font-size)))) expr))
-(define-syntax-rule (define-scale name scale)
-  (define-syntax-rule (name expr) (with-scale scale expr)))
-(define-scale big 3/2)
-(define-scale small 2/3)
-
-(define-with-parameter with-font current-main-font)
-(define-syntax-rule (with-style style expr)
-  (with-font (cons style (current-main-font)) expr))
-(define-syntax-rule (define-style name style)
-  (define-syntax-rule (name expr) (with-style style expr)))
-(define-style bold 'bold)
-(define-style italic 'italic)
-(define-style subscript 'subscript)
-(define-style superscript 'superscript)
-(define-style caps 'caps)
-
-(provide with-size
-         with-scale
-         big
-         small
-
-         with-font
-         with-style
-         bold
-         italic
-         subscript
-         superscript
-         caps)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Slide / Paragraph Manipulation
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-with-parameter column current-para-width)
-
-(define (columns . picts)
-  (apply hc-append gap-size (map baseless picts)))
-
-(define (column-size n [r (/ n)])
-  (* r (- (current-para-width) (* (sub1 n) gap-size))))
-
-(define-syntax-rule (two-columns a b)
-  (columns (column (column-size 2) a)
-           (column (column-size 2) b)))
-
-(define (mini-slide . picts)
-  (apply vc-append gap-size picts))
-
-(provide column
-         columns
-         column-size
-         two-columns
-         mini-slide)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Simple Tables
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define =!
-  (case-lambda
-    [(n) n]
-    [(n . ns)
-     (if (apply = n ns)
-         n
-         (error '=! "not all equal: ~a" (cons n ns)))]))
-
-(define (elem->pict elem)
-  (if (string? elem) (t elem) elem))
-
-(define (tabular #:gap [gap gap-size]
-                 #:vgap [vgap gap]
-                 #:hgap [hgap gap]
-                 #:align [align lbl-superimpose]
-                 #:halign [halign align]
-                 #:valign [valign align]
-                 . cells)
-  (let* ([rows (length cells)]
-         [cols (apply =! (map length cells))]
-         [picts (map elem->pict (append* cells))])
-    (table cols picts halign valign hgap vgap)))
-
-(module+ test
-  (void (tabular
-         (list (colorize (frame (filled-rectangle 8 8)
-                                #:color "black" #:line-width 1)
-                         "white")
-               (text "Before" '() 7))
-         (list (colorize (frame (filled-rectangle 8 8)
-                                #:color "black" #:line-width 1)
-                         "Dark Gray")
-               (text "After" '() 7))
-         #:gap 5 #:valign cc-superimpose)))
-
-(define (matrixof c)
-  (and/c (listof (listof c))
-         (flat-named-contract "matrix"
-           (match-lambda
-             [(list) #t]
-             [(list _) #t]
-             [(list xs ...) (apply = (map length xs))]))))
-
-(provide/contract
- [tabular (->* []
-               [#:gap natural-number/c
-                #:hgap natural-number/c
-                #:vgap natural-number/c
-                #:align (->* [] [] #:rest (listof pict?) pict?)
-                #:halign (->* [] [] #:rest (listof pict?) pict?)
-                #:valign (->* [] [] #:rest (listof pict?) pict?)]
-               #:rest (matrixof (or/c string? pict?))
-               pict?)])
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Slide Staging
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-syntax-rule (slide/staged [name ...] body ...)
-  (staged [name ...] (slide body ...)))
-
-(provide slide/staged)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;  Misc
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define (blank-line)
-  (blank 0 (current-font-size)))
-
-(provide/contract
- [blank-line (-> pict?)])
-
-;; Revealing slides. Similar to staging slides, can probably be implemented
-;; in terms of staged slides.
-
-(provide reveal revealing-slide items-slide)
-
-(define-syntax-parameter reveal (lambda (stx) (raise-syntax-error 'reveal "reveal")))
-
-(define-for-syntax (find-reveals stx)
-  (syntax-case stx (reveal)
-    [(reveal n stuff ...)
-     (set-add (find-reveals #'(stuff ...)) (syntax-e #'n))]
-    [(x rest ...) (set-union (find-reveals #'x) (find-reveals #'(rest ...)))]
-    [else (set)]))
-
-(define-for-syntax (largest stuff)
-  (define all (sort (set->list stuff) >))
-  (if (null? all) -1 (first all)))
-   
-;; reveals elements one at a time but uses ghost so that the slide doesn't
-;; change its layout during each reveal.
-;; for each element you want to reveal wrap the element in a (reveal):
-;;   (reveal N element) 
-;;
-;; where N is the order of the reveal you want. 0 will be shown first, then 1, 2, ...
-(define-syntax (revealing-slide stx)
-  (syntax-case stx ()
-    [(_ stuff ...)
-     (let ()
-       (define max-reveals (largest (find-reveals stx)))
-       (define slides (for/list ([i (add1 max-reveals)])
-                        (with-syntax ([i i])
-                          (syntax (syntax-parameterize
-                                    ([reveal (syntax-rules ()
-                                               [(reveal n pict)
-                                                (show pict (>= i n))]
-                                               [(reveal n) (>= i n)])])
-                                    (slide stuff ...))))))
-       (with-syntax ([(slides ...) slides])
-         #'(begin slides ...)))]))
-
-;; (items-slide ("a" "b" "c") #:title "whatever" (reveal 0 ...) (reveal 1 ...) (reveal 2 ...)
-;; this will show a, b, c on the left side with one of them highlighted at a time.
-;; the first element, a, will be synchronized with showing the first reveal, then
-;; the second element, b, will be synchronized with the second reveal, etc.
-(define-syntax (items-slide stx)
-  (syntax-parse stx
-    [(_ (item ...) (~seq keyword-name:keyword keyword-value:expr) ... stuff:expr ...)
-     (let ()
-       (define max-reveals (length (syntax->list #'(item ...))))
-       (define slides (for/list ([i max-reveals])
-                        (with-syntax ([i i]
-                                      [(keywords ...)
-                                       (apply append (syntax->list
-                                                       #'((keyword-name keyword-value) ...)))])
-                          (syntax (syntax-parameterize ([reveal (syntax-rules ()
-                                                                  [(reveal n pict)
-                                                                   (show pict (= i n))])])
-                                    (let ([show-items
-                                            (for/fold ([start (blank)])
-                                                      ([in '(item ...)]
-                                                       [current (in-naturals)])
-                                                      (vr-append start
-                                                                 (if (= current i)
-                                                                   (text in null (current-font-size))
-                                                                   (colorize/alpha (text in null (- (current-font-size) 3))
-
-                                                                             0 0 0 0.3))
-                                                                 (blank 1 10)))]
-                                          [data (for/fold ([start (blank)])
-                                                          ([thing (list stuff ...)])
-                                                          (lt-superimpose start thing))])
-                                      (slide keywords ...
-                                             (ht-append
-                                               show-items
-                                               (blank 50 1)
-                                               data))))))))
-       (with-syntax ([(slides ...) slides])
-         #'(begin slides ...)))]))
diff --git a/pkgs/unstable-pkgs/unstable-lib/gui/snip.rkt b/pkgs/unstable-pkgs/unstable-lib/gui/snip.rkt
deleted file mode 100644
index c4108b7252..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/gui/snip.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang racket/base
-
-(require racket/gui/base racket/class)
-
-(provide snip-canvas%)
-
-(define snip-canvas%
-  (class editor-canvas%
-    (init parent
-          make-snip
-          [style null]
-          [label #f]
-          [horizontal-inset 5]
-          [vertical-inset 5]
-          [enabled #t]
-          [vert-margin 0]
-          [horiz-margin 0]
-          [min-width 0]
-          [min-height 0]
-          [stretchable-width #t]
-          [stretchable-height #t])
-    
-    (define snip #f)
-    (define text (new read-only-text%))
-    (send text set-writable #f)
-    
-    (define/public (get-snip) snip)
-    
-    (define/override (on-size w h)
-      (update-snip w h)
-      (super on-size w h))
-    
-    (define (update-snip w h)
-      (define snip-w (max 0 (- w (* 2 horizontal-inset))))
-      (define snip-h (max 0 (- h (* 2 vertical-inset))))
-      (cond [snip  (send snip resize snip-w snip-h)]
-            [else  (set-snip (make-snip snip-w snip-h))]))
-    
-    (define (set-snip s)
-      (unless (is-a? s snip%)
-        (raise-type-error 'set-snip "snip%" s))
-      (set! snip s)
-      (send text set-writable #t)
-      (send text begin-edit-sequence #f)
-      (send text erase)
-      (send text insert snip)
-      (send text end-edit-sequence)
-      (send text set-writable #f))
-    
-    (super-new [parent parent]
-               [editor text]
-               [horizontal-inset horizontal-inset]
-               [vertical-inset vertical-inset]
-               [label label]
-               [enabled enabled]
-               [style (list* 'no-hscroll 'no-vscroll style)]
-               [vert-margin vert-margin]
-               [horiz-margin horiz-margin]
-               [min-width min-width]
-               [min-height min-height]
-               [stretchable-width stretchable-width]
-               [stretchable-height stretchable-height])))
-
-(define read-only-text%
-  (class text%
-    (define writable? #t)
-    (define/public (set-writable w?) (set! writable? w?))
-    
-    (define/augment (can-change-style? start len) writable?)
-    (define/augment (can-delete? start len) writable?)
-    (define/augment (can-insert? start len) writable?)
-    (define/augment (can-load-file? filename format) writable?)
-    (define/augment (can-save-file? filename format) writable?)
-    (define/override (can-do-edit-operation? op [recursive? #t])
-      (case op
-        [(copy select-all)  #t]
-        [else    writable?]))
-    
-    (super-new)
-    (send this hide-caret #t)))
diff --git a/pkgs/unstable-pkgs/unstable-lib/info.rkt b/pkgs/unstable-pkgs/unstable-lib/info.rkt
deleted file mode 100644
index 65fc09ce9c..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang info
-
-(define collection "unstable")
-
-(define deps '("base"
-               "draw-lib"
-               "gui-lib"
-               "pict-lib"
-               "scribble-lib"
-               "slideshow-lib"
-               "unstable-macro-testing-lib"))
-(define implies '("unstable-macro-testing-lib"))
-(define build-deps '("rackunit-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"unstable\"")
-
-(define pkg-authors '(jay samth cce ryanc))
diff --git a/pkgs/unstable-pkgs/unstable-lib/lazy-require.rkt b/pkgs/unstable-pkgs/unstable-lib/lazy-require.rkt
deleted file mode 100644
index ada04ff02a..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/lazy-require.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/lazy-require)
-(provide lazy-require
-         begin-on-demand)
-
-#|
-begin-on-demand notes/todo
-
-Currently like lazy-require: only supports functions.
-
-The #:export kw is clunky... one might think it would be nice to just
-re-use 'provide' syntax. Would get rename, prefix, etc for free. OTOH,
-might be misleading: might seem like provide should apply to
-*apparent* enclosing module, not module implicitly created by
-begin-on-demand.
-
-Another nice idea would be to implement lazy-require in terms of
-begin-on-demand and real require. Unfortunately, that would mean we
-couldn't have cyclic lazy-requires, which is very useful.
-|#
-
-(define-syntax (begin-on-demand stx)
-  (syntax-case stx ()
-    [(begin-on-demand #:export (exp ...) body ...)
-     (with-syntax ([fresh-name (gensym 'on-demand-submodule)])
-       #'(begin
-           (module* fresh-name #f
-             (no-provide body ...)
-             (check-procedure exp 'exp) ...
-             (provide exp ...))
-           (define-namespace-anchor anchor)
-           (define get-sym
-             (let ([sub-mpi
-                    (module-path-index-join '(submod "." fresh-name)
-                                            (variable-reference->resolved-module-path
-                                             (#%variable-reference)))])
-               (lambda (sym)
-                 (parameterize ((current-namespace (namespace-anchor->namespace anchor)))
-                   (dynamic-require sub-mpi sym)))))
-           (define exp (make-lazy-function 'exp get-sym)) ...))]))
-
-(define-syntax (no-provide stx)
-  (syntax-case stx ()
-    [(_ form)
-     (let ([eform (local-expand #'form
-                                (syntax-local-context)
-                                #f)])
-       (syntax-case eform (begin #%provide)
-         [(begin e ...)
-          #'(begin (no-provide e) ...)]
-         [(#%provide . _)
-          (raise-syntax-error #f "provide not allowed" eform)]
-         [_ eform]))]
-    [(_ form ...)
-     #'(begin (no-provide form) ...)]))
-
-(define (check-procedure x name)
-  (unless (procedure? x)
-    (error 'begin-on-demand "name bound on-demand is not a procedure: ~a" name)))
diff --git a/pkgs/unstable-pkgs/unstable-lib/open-place.rkt b/pkgs/unstable-pkgs/unstable-lib/open-place.rkt
deleted file mode 100644
index 8309fb55d3..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/open-place.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket/base
-
-(require (for-syntax syntax/parse racket/base syntax/free-vars racket/syntax)
-         racket/place)
-
-(provide open-place)
-
-(define-syntax (open-place stx)
-  (syntax-parse stx
-    [(_ ch:id body:expr ...)
-     (define b #'(let () body ...))
-     (define/with-syntax b* (local-expand b 'expression null))
-     (define/with-syntax (fvs ...) (free-vars #'b*))
-     (define/with-syntax (i ...) (for/list ([(v i) (in-indexed (syntax->list #'(fvs ...)))]) i))
-     (define/with-syntax (v p) (generate-temporaries '(v p)))
-     #'(let ()
-         (define p (place ch (let* ([v (place-channel-get ch)]
-                                    [fvs (vector-ref v i)] ...)
-                               b*)))
-         (define vec (vector fvs ...))
-         (for ([e (in-vector vec)]
-               [n (in-list (syntax->list (quote-syntax (fvs ...))))])
-           (unless (place-message-allowed? e)
-             (raise-arguments-error 'open-place 
-                                    "free variable values must be allowable as place messages"
-                                    (symbol->string (syntax-e n)) e)))
-         (place-channel-put p vec)
-         p)]))
diff --git a/pkgs/unstable-pkgs/unstable-lib/recontract.rkt b/pkgs/unstable-pkgs/unstable-lib/recontract.rkt
deleted file mode 100644
index d4a78b2075..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/recontract.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require racket/contract/base)
-(provide recontract-out)
diff --git a/pkgs/unstable-pkgs/unstable-lib/string.rkt b/pkgs/unstable-pkgs/unstable-lib/string.rkt
deleted file mode 100644
index 935d200e68..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/string.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require racket/contract/base)
-
-;; added by stamourv
-
-(define (regexp-filter r log)
-  (for/list ([l (in-list log)] #:when (regexp-match r l))
-    l))
-(provide/contract
- [regexp-filter ((or/c string? bytes? regexp? byte-regexp?)
-                 (listof (or/c string? bytes? path? input-port?))
-                 . -> . (listof (or/c string? bytes? path? input-port?)))])
diff --git a/pkgs/unstable-pkgs/unstable-lib/temp-c/dsl.rkt b/pkgs/unstable-pkgs/unstable-lib/temp-c/dsl.rkt
deleted file mode 100644
index d2fa1d558b..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/temp-c/dsl.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/stxparam
-         (for-syntax racket/base)
-         "monitor.rkt"
-         unstable/automata/machine
-         unstable/automata/re
-         unstable/automata/re-ext)
-(provide call ret with-monitor label
-         re->monitor-predicate/concurrent
-         re->monitor-predicate/serial
-         (all-from-out "monitor.rkt"
-                       unstable/automata/re
-                       unstable/automata/re-ext))
-
-(define-syntax-parameter stx-monitor-id
-  (λ (stx) (raise-syntax-error 'label "Used outside monitor" stx)))
-
-(define-syntax-rule (label n K)
-  (monitor/c stx-monitor-id n K))
-
-(define-syntax with-monitor
-  (syntax-rules ()
-    [(_ K)
-     (let ([monitor (λ (x) #t)])
-       (syntax-parameterize ([stx-monitor-id (make-rename-transformer #'monitor)])
-                            K))]
-    [(_ K T)
-     (let ([monitor (re->monitor-predicate/serial (re T))])
-       (syntax-parameterize ([stx-monitor-id (make-rename-transformer #'monitor)])
-                            K))]
-    [(_ K #:concurrent T)
-     (let ([monitor (re->monitor-predicate/concurrent (re T))])
-       (syntax-parameterize ([stx-monitor-id (make-rename-transformer #'monitor)])
-                            K))]))
-
-(define (re->monitor-predicate/concurrent m)
-  (define inner-accepts?
-    (re->monitor-predicate/serial m))
-  (define t
-    (thread 
-     (λ ()
-       (let loop ()
-         (define m (thread-receive))
-         (define evt (car m))
-         (define qt (cdr m))
-         (thread-resume qt (current-thread))
-         (thread-send qt (inner-accepts? evt)
-                      (λ () (error 'monitor "Failed to contact requester")))
-         (loop)))))
-  (define (accepts? evt)
-    (thread-resume t (current-thread))
-    (thread-send t (cons evt (current-thread))
-                 (λ () (error 'monitor "Failed to contact monitor")))
-    (thread-receive))
-  accepts?)
-
-(define (re->monitor-predicate/serial m)
-  (define current-re m)
-  (λ (evt)
-    #;(printf "~v\n" evt)
-    (set! current-re (current-re evt))
-    (machine-accepting? current-re)))
-
-(define-match-expander call
-  (syntax-rules ()
-    [(_ n p ...)
-     (monitor:call n _ _ _ _ _ (list p ...))]))
-
-(define-match-expander ret
-  (syntax-rules ()
-    [(_ n p ...)
-     (monitor:return n _ _ _ _ _ _ (list p ...))]))
diff --git a/pkgs/unstable-pkgs/unstable-lib/temp-c/info.rkt b/pkgs/unstable-pkgs/unstable-lib/temp-c/info.rkt
deleted file mode 100644
index 84ad0ac2d5..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/temp-c/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/unstable-pkgs/unstable-lib/temp-c/monitor.rkt b/pkgs/unstable-pkgs/unstable-lib/temp-c/monitor.rkt
deleted file mode 100644
index c91ecc887c..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/temp-c/monitor.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/contract)
-
-(struct monitor (label) #:transparent)
-(struct monitor:proj monitor (proj-label v) #:transparent)
-(struct monitor:call monitor (proj-label f app-label kws kw-args args) #:transparent)
-(struct monitor:return monitor (proj-label f app-label kws kw-args args rets) #:transparent)
-
-(define (monitor/c monitor-allows? label c)
-  (define ctc (coerce-contract 'monitored c))
-  (make-contract
-   #:name (build-compound-type-name 'monitored label c)
-   #:projection
-   (λ (b)
-     (define proj ((contract-projection ctc) b))
-     (define bs (blame-swap b))
-     (λ (x)
-       (define proj-label (gensym label))
-       (define proj-x (proj x))
-       ; XXX Find a way to get a meaningful reason why the monitor failed
-       (if (monitor-allows? (monitor:proj label proj-label proj-x))
-           (if (procedure? proj-x)
-               (make-keyword-procedure
-                ; XXX Could I specialize for a few arguments/returns/no kws?
-                (λ (kws kw-args . args)
-                  (define app-label (gensym label))
-                  (if (monitor-allows? (monitor:call label proj-label proj-x app-label kws kw-args args))
-                      (call-with-values
-                       (λ () (keyword-apply proj-x kws kw-args args))
-                       (λ rets
-                         (if (monitor-allows? (monitor:return label proj-label proj-x app-label kws kw-args args rets))
-                             (apply values rets)
-                             (raise-blame-error b x "temporal monitor disallowed return of ~e" rets))))
-                      (cond
-                        [(and (empty? kws) (empty? kw-args))
-                         (raise-blame-error bs x "temporal monitor disallowed call with\n\targuments ~e" args)]
-                        [else
-                         (raise-blame-error bs x "temporal monitor disallowed call with\n\tkeywords ~e\n\tkeyword arguments ~e\n\tnormal arguments ~e" kws kw-args args)]))))
-               proj-x)
-           (raise-blame-error b x "temporal monitor disallowed projection of ~e" x))))))
-
-(provide (struct-out monitor)
-         (struct-out monitor:proj)
-         (struct-out monitor:call)
-         (struct-out monitor:return)
-         monitor/c)
diff --git a/pkgs/unstable-pkgs/unstable-lib/time.rkt b/pkgs/unstable-pkgs/unstable-lib/time.rkt
deleted file mode 100644
index df54abe409..0000000000
--- a/pkgs/unstable-pkgs/unstable-lib/time.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-
-;; An improved `time' variant: better output, and repetitions with averages
-(provide time*)
-
-(require racket/list)
-
-(define (time/proc thunk times)
-  (define throw
-    (if (<= times 0)
-      (error 'time "bad count: ~e" times)
-      (floor (* times 2/7))))
-  (define results #f)
-  (define timings '())
-  (define (run n)
-    (when (<= n times)
-      (when (> times 1) (printf "; run #~a..." n) (flush-output))
-      (let ([r (call-with-values (lambda () (time-apply thunk '())) list)])
-        (set! results (car r))
-        (set! timings (cons (cdr r) timings))
-        (when (> times 1)
-          (printf " ->")
-          (if (null? results)
-            (printf " (0 values returned)")
-            (begin (printf " ~.s" (car results))
-                   (for ([r (in-list (cdr results))]) (printf ", ~s" r))
-                   (newline))))
-        (run (add1 n)))))
-  (collect-garbage)
-  (collect-garbage)
-  (collect-garbage)
-  (run 1)
-  (set! timings (sort timings < #:key car)) ; sort by cpu-time
-  (set! timings (drop timings throw))       ; throw extreme bests
-  (set! timings (take timings (- (length timings) throw))) ; and worsts
-  (set! timings (let ([n (length timings)]) ; average
-                  (map (lambda (x) (round (/ x n))) (apply map + timings))))
-  (let-values ([(cpu real gc) (apply values timings)])
-    (when (> times 1)
-      (printf "; ~a runs, ~a best/worst removed, ~a left for average:\n"
-              times throw (- times throw throw)))
-    (printf "; cpu time: ~sms = ~sms + ~sms gc; real time: ~sms\n"
-            cpu (- cpu gc) gc real))
-  (apply values results))
-
-(define-syntax time*
-  (syntax-rules ()
-    [(_ n expr0 expr ...) (time/proc (lambda () expr0 expr ...) n)]
-    [(_ expr0 expr ...)   (time/proc (lambda () expr0 expr ...) 1)]))
diff --git a/pkgs/unstable-pkgs/unstable-test/LICENSE.txt b/pkgs/unstable-pkgs/unstable-test/LICENSE.txt
deleted file mode 100644
index b71bf4f6f8..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-pkgs/unstable-test/info.rkt b/pkgs/unstable-pkgs/unstable-test/info.rkt
deleted file mode 100644
index b8f383a270..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/info.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"))
-(define build-deps '("racket-index"
-                     "scheme-lib"
-                     "at-exp-lib"
-                     "compatibility-lib"
-                     "eli-tester"
-                     "gui-lib"
-                     "planet-lib"
-                     "racket-test"
-                     "rackunit-lib"
-                     "syntax-color-lib"
-                     "typed-racket-lib"
-                     "unstable-contract-lib"
-                     "unstable-debug-lib"
-                     "unstable-lib"
-                     "unstable-list-lib"
-                     "unstable-options-lib"
-                     "unstable-parameter-group-lib"
-                     "unstable-2d"))
-(define update-implies '("unstable-lib"))
-
-(define pkg-desc "tests for \"unstable\"")
-
-(define pkg-authors '(jay samth cce ryanc robby))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/test-docs-complete.rkt b/pkgs/unstable-pkgs/unstable-test/tests/test-docs-complete.rkt
deleted file mode 100644
index beacdf4358..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/test-docs-complete.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/base
-(require rackunit/docs-complete)
-(check-docs (quote unstable/wrapc))
-(check-docs (quote unstable/syntax))
-(check-docs (quote unstable/struct))
-(check-docs (quote unstable/string))
-(check-docs (quote unstable/sequence))
-(check-docs (quote unstable/pretty))
-(check-docs (quote unstable/match))
-(check-docs (quote unstable/markparam) #:skip #rx"^deserialize-info:")
-(check-docs (quote unstable/list))
-(check-docs (quote unstable/hash))
-(check-docs (quote unstable/function))
-(check-docs (quote unstable/find))
-(check-docs (quote unstable/debug))
-(check-docs (quote unstable/contract))
-(check-docs (quote unstable/class-iop))
-(check-docs (quote unstable/bytes))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/cond-test.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/cond-test.rkt
deleted file mode 100644
index 67d2d58ee8..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/cond-test.rkt
+++ /dev/null
@@ -1,104 +0,0 @@
-#lang unstable/2d racket/base
-(require unstable/2d/cond
-         rackunit)
-
-(define (basic a b c d)
-  #2dcond
-  ╔═══╦═══╦═══╗
-  ║   ║ a ║ b ║
-  ╠═══╬═══╬═══╣
-  ║ c ║ 1 ║ 2 ║
-  ╠═══╬═══╬═══╣
-  ║ d ║ 3 ║ 4 ║
-  ╚═══╩═══╩═══╝)
-
-(define ((matches reg) exn) (regexp-match? reg (exn-message exn)))
-
-(check-equal? (basic #t #t #t #t) 1)
-(check-equal? (basic #t #f #t #f) 1)
-(check-equal? (basic #f #t #t #t) 2)
-(check-equal? (basic #f #t #t #f) 2)
-(check-equal? (basic #t #t #f #t) 3)
-(check-equal? (basic #t #f #f #t) 3)
-(check-equal? (basic #f #t #f #t) 4)
-(check-exn (matches #rx"x-direction questions") 
-           (λ () (basic #f #f #f #f)))
-(check-exn (matches #rx"y-direction questions.*x coordinate 1")
-           (λ () (basic #t #f #f #f)))
-(check-exn (matches #rx"y-direction questions.*x coordinate 2")
-           (λ () (basic #f #t #f #f)))
-
-(define (bot-right-cell a b c d)
-  #2dcond
-  ╔═══╦═══╦═══╗
-  ║   ║ a ║ b ║
-  ╠═══╬═══╩═══╣
-  ║ c ║ 1     ║
-  ╠═══╣   ╔═══╣
-  ║ d ║   ║ 2 ║
-  ╚═══╩═══╩═══╝)
-
-(check-equal? (bot-right-cell #t #t #t #t) 1)
-(check-equal? (bot-right-cell #t #f #t #f) 1)
-(check-equal? (bot-right-cell #f #t #t #t) 1)
-(check-equal? (bot-right-cell #f #t #t #f) 1)
-(check-equal? (bot-right-cell #t #t #f #t) 1)
-(check-equal? (bot-right-cell #t #f #f #t) 1)
-(check-equal? (bot-right-cell #f #t #f #t) 2)
-
-(define (top-left-cell a b c d)
-  #2dcond
-  ╔═══╦═══╦═══╗
-  ║   ║ a ║ b ║
-  ╠═══╬═══╬═══╣
-  ║ c ║ 1 ║   ║
-  ╠═══╬═══╝   ║
-  ║ d ║     2 ║
-  ╚═══╩═══════╝)
-
-(check-equal? (top-left-cell #t #t #t #t) 1)
-(check-equal? (top-left-cell #t #f #t #f) 1)
-(check-equal? (top-left-cell #f #t #t #t) 2)
-(check-equal? (top-left-cell #f #t #t #f) 2)
-(check-equal? (top-left-cell #t #t #f #t) 2)
-(check-equal? (top-left-cell #t #f #f #t) 2)
-(check-equal? (top-left-cell #f #t #f #t) 2)
-
-(let ([sp (open-output-string)])
-  (define (f x) (printf "~a\n" x) #f)
-  (parameterize ([current-output-port sp])
-    #2dcond
-    ╔═════╦═══════╦═══════╦════╗
-    ║     ║ (f 1) ║ (f 2) ║ #t ║
-    ╠═════╬═══════╩═══════╩════╣
-    ║(f 3)║                    ║
-    ╠═════╣                    ║
-    ║(f 4)║        222         ║
-    ╠═════╣                    ║
-    ║  #t ║                    ║
-    ╚═════╩════════════════════╝)
-  (check-equal? (get-output-string sp)
-                "1\n2\n3\n4\n"))
-
-
-(define (try-else a b c)
-  #2dcond
-  ╔════╦════╦════╗
-  ║    ║ a  ║else║
-  ╠════╬════╬════╣
-  ║ b  ║ 1  ║  2 ║
-  ╠════╬════╬════╣
-  ║ c  ║ 3  ║  4 ║
-  ╠════╬════╬════╣
-  ║else║ 5  ║  6 ║
-  ╚════╩════╩════╝)
-
-(require rackunit)
-(check-equal? (try-else #t #t #f) 1)
-(check-equal? (try-else #f #t #f) 2)
-(check-equal? (try-else #t #f #f) 5)
-(check-equal? (try-else #f #f #f) 6)
-
-
-
-
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/info.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/info.rkt
deleted file mode 100644
index bb17d7a170..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all robby)))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/lexer-stress-test.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/lexer-stress-test.rkt
deleted file mode 100644
index be905169e5..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/lexer-stress-test.rkt
+++ /dev/null
@@ -1,77 +0,0 @@
-#lang racket/gui
-
-(require framework/private/color-local-member-name
-         syntax-color/racket-lexer
-         unstable/2d/lexer
-         framework)
-
-(define f (new frame% [label ""] [width 400] [height 600]))
-(define t (new (class racket:text%
-                 (define/override (tokenizing-give-up-early) 
-                   (when (zero? (random 2))
-                     (do-something))
-                   #t)
-                 (super-new))))
-(define ec (new editor-canvas% [parent f] [editor t]))
-
-(define count 0)
-
-(define (do-something)
-  (queue-callback (λ () 
-                    (set! count (+ count 1))
-                    (cond
-                      [(< count 100)
-                       (cond
-                         [(send t find-string "-" 'forward 0)
-                          =>
-                          (λ (x)
-                            (send t delete x (+ x 1)))]
-                         [else
-                          ;; these two numbers are dependent
-                          ;; on the string constant below
-                          (define n (+ 36 (random 448)))
-                          (define howmany (+ 1 (random 2)))
-                          (for ([x (in-range howmany)])
-                            (send t insert "-" n n))])]
-                      [else
-                       (send tmr stop)
-                       (send f show #f)]))))
-
-(define tmr (new timer% [notify-callback do-something] [interval 100]))
-
-(send f show #t)
-
-(send t insert
-      #<<---
-#lang unstable/2d racket/base
-
-#2dx
-╔═══╦═══╦═══╦═══╗
-║ 1 ║ 2 ║ 3 ║ 4 ║
-╠═══╬═══╩═══╩═══╣
-║ 5 ║("abcdef") ║
-╠═══╣(|zz zzz|) ║
-║ 6 ║(31415926) ║
-╠═══╬═══╦═══╦═══╣
-║ 7 ║ 8 ║ 9 ║ 0 ║
-╠═══╬═══╬═══╬═══╣
-║ A ║ B ║ C ║ D ║
-╠═══╬═══╩═══╩═══╣
-║ E ║("ghijkl") ║
-╠═══╣(|xx xxx|) ║
-║ F ║(27182818) ║
-╠═══╬═══╦═══╦═══╣
-║ G ║ H ║ I ║ J ║
-╠═══╬═══╬═══╬═══╣
-║ K ║ L ║ M ║ N ║
-╠═══╬═══╩═══╩═══╣
-║ O ║("mnopqs") ║
-╠═══╣(|yy yyy|) ║
-║ P ║(whatever) ║
-╠═══╬═══╦═══╦═══╣
-║ Q ║ R ║ S ║ T ║
-╚═══╩═══╩═══╩═══╝
-
----
-)
-
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/lexer-test.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/lexer-test.rkt
deleted file mode 100644
index 4b2a0107ae..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/lexer-test.rkt
+++ /dev/null
@@ -1,369 +0,0 @@
-#lang at-exp racket/base
-(require rackunit
-         syntax-color/racket-lexer
-         syntax-color/scribble-lexer
-         syntax-color/lexer-contract
-         unstable/options
-         unstable/2d/private/lexer
-         racket/port)
-
-(check-equal? (cropped-regions 0 10 '()) '())
-(check-equal? (cropped-regions 0 10 '((0 . 10))) '((0 . 10)))
-(check-equal? (cropped-regions 0 10 '((0 . 5) (7 . 10))) '((7 . 10) (0 . 5)))
-(check-equal? (cropped-regions 0 10 '((-1 . 4))) '((0 . 4)))
-(check-equal? (cropped-regions 0 10 '((-4 . -3))) '())
-(check-equal? (cropped-regions 0 10 '((20 . 30))) '())
-(check-equal? (cropped-regions 0 10 '((1 . 4) (5 . 20))) '((5 . 10) (1 . 4)))
-(check-equal? (cropped-regions 0 10 '((-5 . 10))) '((0 . 10)))
-(check-equal? (cropped-regions 13 37 '((11 . 13))) '())
-
-(define (run-lexer #:sub-lexer [sub-lexer/no-ex racket-lexer] . strs/specials)
-  (define sub-lexer (if (has-option? sub-lexer/no-ex)
-                        (exercise-option sub-lexer/no-ex)
-                        sub-lexer/no-ex))
-  (define-values (in out) (make-pipe-with-specials))
-  (thread
-   (λ ()
-     (let loop ([s strs/specials])
-       (cond
-         [(list? s)
-          (for ([s (in-list strs/specials)])
-            (loop s))]
-         [(string? s) (display s out)]
-         [else (write-special s out)]))
-     (close-output-port out)))
-  (port-count-lines! in)
-  (define the-lexer (exercise-option (2d-lexer sub-lexer)))
-  (let loop ([mode #f])
-    (define-values (val tok paren start end backup new-mode) 
-      (the-lexer in 0 mode))
-    (cons (list val tok paren start end backup)
-          (cond
-            [(equal? tok 'eof) '()]
-            [else (loop (if (dont-stop? new-mode)
-                            (dont-stop-val new-mode)
-                            new-mode))]))))
-
-(check-equal?
- (run-lexer "1234\n#2d\n")
- `(("1234" constant #f 1 5 0)
-   ("\n" white-space #f 5 6 0) 
-   ("#2d\n" error #f 6 10 0) 
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- (run-lexer "#2dsomething")
- `(("#2dsomething" error #f 1 13 0)
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- (run-lexer "#2dsomething\n")
- `(("#2dsomething\n" error #f 1 14 0)
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- (run-lexer "#2dsomething\n╔═══╗\n║   ║")
- `(("#2dsomething\n╔═══╗\n║   ║" error #f 1 25 0)
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- (run-lexer "#2dsomething\n  \n")
- `(("#2dsomething" hash-colon-keyword #f 1 13 0)
-   ("\n" white-space #f 13 14 13) 
-   ("  \n" error #f 14 17 14)
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- @run-lexer{#2d
-            ╔══╦═══╗
-            ║+ ║"a"║
-            ╠══╬═══╣
-            ║34║"b"║
-            ╚══╩═══╝}
- `(("#2d" hash-colon-keyword #f 1 4 0)
-   ("\n" white-space #f 4 5 4)
-   ("╔══╦═══╗" parenthesis #f 5 13 5)
-   (" " white-space #f 13 14 13)
-   ("║" parenthesis #f 14 15 14)
-   ("+" symbol #f 15 16 15)
-   (" " white-space #f 16 17 16)
-   ("║" parenthesis #f 17 18 17)
-   ("\"a\"" string #f 18 21 18)
-   ("║" parenthesis #f 21 22 21)
-   (" " white-space #f 22 23 22)
-   ("╠══╬═══╣" parenthesis #f 23 31 23)
-   (" " white-space #f 31 32 31)
-   ("║" parenthesis #f 32 33 32)
-   ("34" constant #f 33 35 33)
-   ("║" parenthesis #f 35 36 35)
-   ("\"b\"" string #f 36 39 36)
-   ("║" parenthesis #f 39 40 39)
-   (" " white-space #f 40 41 40)
-   ("╚══╩═══╝" parenthesis #f 41 49 41)
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- @run-lexer["#2d\r\n"]{╔══╦═══╗
-                       ║+ ║"a"║
-                       ╠══╬═══╣
-                       ║34║"b"║
-                       ╚══╩═══╝}
- `(("#2d" hash-colon-keyword #f 1 4 0)
-   ("\r\n" white-space #f 4 5 4)
-   ("╔══╦═══╗" parenthesis #f 5 13 5)
-   (" " white-space #f 13 14 13)
-   ("║" parenthesis #f 14 15 14)
-   ("+" symbol #f 15 16 15)
-   (" " white-space #f 16 17 16)
-   ("║" parenthesis #f 17 18 17)
-   ("\"a\"" string #f 18 21 18)
-   ("║" parenthesis #f 21 22 21)
-   (" " white-space #f 22 23 22)
-   ("╠══╬═══╣" parenthesis #f 23 31 23)
-   (" " white-space #f 31 32 31)
-   ("║" parenthesis #f 32 33 32)
-   ("34" constant #f 33 35 33)
-   ("║" parenthesis #f 35 36 35)
-   ("\"b\"" string #f 36 39 36)
-   ("║" parenthesis #f 39 40 39)
-   (" " white-space #f 40 41 40)
-   ("╚══╩═══╝" parenthesis #f 41 49 41)
-   (,eof eof #f #f #f 0)))
-
-(printf "skipping the \\r\\n test: see the cracks-filled-in-tokens definition for where the bug lies\n")
-#;
-(check-equal?
- (run-lexer "#2d\r\n"
-            "╔══╦═══╗\r\n"
-            "║+ ║abc║\r\n"
-            "╠══╬═══╣\r\n"
-            "║34║def║\r\n"
-            "╚══╩═══╝\r\n")
- `(("#2d" hash-colon-keyword #f 1 4 0)
-   ("\r\n" white-space #f 4 5 4)
-   ("╔══╦═══╗" parenthesis #f 5 13 5)
-   (" " white-space #f 13 14 13)
-   ("║" parenthesis #f 14 15 14)
-   ("+" symbol #f 15 16 15)
-   (" " white-space #f 16 17 16)
-   ("║" parenthesis #f 17 18 17)
-   ("\"a\"" string #f 18 21 18)
-   ("║" parenthesis #f 21 22 21)
-   (" " white-space #f 22 23 22)
-   ("╠══╬═══╣" parenthesis #f 23 31 23)
-   ("  " white-space #f 31 32 31)
-   ("║" parenthesis #f 32 33 32)
-   ("34" constant #f 33 35 33)
-   ("║" parenthesis #f 35 36 35)
-   ("\"b\"" string #f 36 39 36)
-   ("║" parenthesis #f 39 40 39)
-   (" " white-space #f 40 41 40)
-   ("╚══╩═══╝" parenthesis #f 41 49 41)
-   (,eof eof #f #f #f 0)))
-
-;; test tokens that cross lines (and thus need cropping)
-(check-equal?
- @run-lexer{#2d
-            ╔══╦═══╗
-            ║+ ║"a ║
-            ║+ ║ a"║
-            ╠══╬═══╣
-            ║34║"b"║
-            ╚══╩═══╝}
- `(("#2d" hash-colon-keyword #f 1 4 0)
-   ("\n" white-space #f 4 5 4)
-   ("╔══╦═══╗" parenthesis #f 5 13 5)
-   (" " white-space #f 13 14 13)
-   ("║" parenthesis #f 14 15 14)
-   ("+" symbol #f 15 16 15)
-   (" " white-space #f 16 17 16)
-   ("║" parenthesis #f 17 18 17)
-   ("\"a " string #f 18 21 18)
-   ("║" parenthesis #f 21 22 21)
-   (" " white-space #f 22 23 22)
-   ("║" parenthesis #f 23 24 23)
-   ("+" symbol #f 24 25 24)
-   (" " white-space #f 25 26 25)
-   ("║" parenthesis #f 26 27 26)
-   (" a\"" string #f 27 30 27)
-   ("║" parenthesis #f 30 31 30)
-   (" " white-space #f 31 32 31)
-   ("╠══╬═══╣" parenthesis #f 32 40 32)
-   (" " white-space #f 40 41 40)
-   ("║" parenthesis #f 41 42 41)
-   ("34" constant #f 42 44 42)
-   ("║" parenthesis #f 44 45 44)
-   ("\"b\"" string #f 45 48 45)
-   ("║" parenthesis #f 48 49 48)
-   (" " white-space #f 49 50 49)
-   ("╚══╩═══╝" parenthesis #f 50 58 50)
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- @run-lexer{#2d
-            ╔══╦═══╗
-            ║+ ║ "a"║
-            ╠══╬═══╣
-            ║34║"b"║
-            ╚══╩═══╝}
- `(("#2d" hash-colon-keyword #f 1 4 0)
-   ("\n" white-space #f 4 5 4)
-   ("╔══╦═══╗\n║+ ║ \"a" no-color #f 5 21 5)
-   ("\"║\n╠══╬═══╣\n║34║\"b\"║\n╚══╩═══╝" error #f 21 50 21)
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- @run-lexer["#2d\r\n"]{╔══╦═══╗
-                       ║+ ║ "a"║
-                       ╠══╬═══╣
-                       ║34║"b"║
-                       ╚══╩═══╝}
- `(("#2d" hash-colon-keyword #f 1 4 0)
-   ("\r\n" white-space #f 4 5 4)
-   ("╔══╦═══╗\n║+ ║ \"a" no-color #f 5 21 5)
-   ("\"║\n╠══╬═══╣\n║34║\"b\"║\n╚══╩═══╝" error #f 21 50 21)
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- (run-lexer "   #2d\n"
-            "   ╔═╦═╗\n"
-            "   ║1║2║\n"
-            "   ╠═╬═╣\n"
-            "   ║3║4║\n"
-            "   ╚═╩═╝\n")
-  `(("   " white-space #f 1 4 0)
-    ("#2d" hash-colon-keyword #f 4 7 0)
-    ("\n" white-space #f 7 8 7)
-    ("   " white-space #f 8 11 8)
-    ("╔═╦═╗" parenthesis #f 11 16 11)
-    ("    " white-space #f 16 20 16)
-    ("║" parenthesis #f 20 21 20)
-    ("1" constant #f 21 22 21)
-    ("║" parenthesis #f 22 23 22)
-    ("2" constant #f 23 24 23)
-    ("║" parenthesis #f 24 25 24)
-    ("    " white-space #f 25 29 25)
-    ("╠═╬═╣" parenthesis #f 29 34 29)
-    ("    " white-space #f 34 38 34)
-    ("║" parenthesis #f 38 39 38)
-    ("3" constant #f 39 40 39)
-    ("║" parenthesis #f 40 41 40)
-    ("4" constant #f 41 42 41)
-    ("║" parenthesis #f 42 43 42)
-    ("    " white-space #f 43 47 43) ("╚═╩═╝" parenthesis #f 47 52 47)
-    ("\n" white-space #f 52 53 0)
-    (,eof eof #f #f #f 0)))
-
-(define-values (dont-care dont-care?)
-  (let ()
-    (struct dont-care ())
-    (values (dont-care) dont-care?)))
-
-(define (equal?/dont-care x y)
-  (let loop ([x x][y y])
-    (cond
-      [(or (dont-care? x) (dont-care? y))
-       #t]
-      [(and (pair? x) (pair? y))
-       (and (loop (car x) (car y))
-            (loop (cdr x) (cdr y)))]
-      [else (equal? x y)])))
-
-(check-pred
- (λ (x) 
-   (equal?/dont-care 
-    x
-    `(("#2d" hash-colon-keyword #f 1 4 0)
-      ("\n" white-space #f 4 5 4)
-      ("╔═════╦═══════╗" parenthesis #f 5 20 5)
-      (" " white-space #f 20 21 20)
-      ("║" parenthesis #f 21 22 21)
-      ("@" parenthesis #f 22 23 22)
-      ("f" symbol #f 23 24 23)
-      ("{" parenthesis |{| 24 25 24)
-      (,dont-care text #f 25 26 25)
-      ("}" parenthesis |}| 26 27 26)
-      ("║" parenthesis #f 27 28 27)
-      (" " white-space #f 28 29 28)
-      ("@" parenthesis #f 29 30 29)
-      ("g" symbol #f 30 31 30)
-      ("{" parenthesis |{| 31 32 31)
-      (,dont-care text #f 32 33 32)
-      ("}" parenthesis |}| 33 34 33)
-      (" " white-space #f 34 35 34)
-      ("║" parenthesis #f 35 36 35)
-      (" " white-space #f 36 37 36)
-      ("╠═════╬═══════╣" parenthesis #f 37 52 37)
-      (" " white-space #f 52 53 52)
-      ("║" parenthesis #f 53 54 53)
-      ("@" parenthesis #f 54 55 54)
-      ("h" symbol #f 55 56 55)
-      ("{" parenthesis |{| 56 57 56)
-      (,dont-care text #f 57 58 57)
-      ("}" parenthesis |}| 58 59 58)
-      ("║" parenthesis #f 59 60 59)
-      (" " white-space #f 60 61 60)
-      ("@" parenthesis #f 61 62 61)
-      ("i" symbol #f 62 63 62)
-      ("{" parenthesis |{| 63 64 63)
-      (,dont-care text #f 64 65 64)
-      ("}" parenthesis |}| 65 66 65)
-      (" " white-space #f 66 67 66)
-      ("║" parenthesis #f 67 68 67)
-      (" " white-space #f 68 69 68)
-      ("╚═════╩═══════╝" parenthesis #f 69 84 69)
-      ("\n" white-space #f 84 85 0)
-      (,eof eof #f 85 85 0))))
- (run-lexer #:sub-lexer scribble-lexer
-            "#2d\n"
-            "╔═════╦═══════╗\n"
-            "║@f{x}║ @g{y} ║\n"
-            "╠═════╬═══════╣\n"
-            "║@h{z}║ @i{w} ║\n"
-            "╚═════╩═══════╝\n"))
-
-(check-equal?
- (run-lexer "#2" 'not-a-char)
- `(("#2" error #f 1 3 0) 
-   ("" no-color #f 3 4 0) 
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- (run-lexer "#2d\n" 'not-a-char)
- `(("#2d" hash-colon-keyword #f 1 4 0)
-   ("\n" white-space #f 4 5 4)
-   (" " error #f 5 6 5)
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- (run-lexer "#2d\n╔" 'not-a-char)
- `(("#2d" hash-colon-keyword #f 1 4 0)
-   ("\n" white-space #f 4 5 4)
-   ("╔" no-color #f 5 6 5)
-   (" " error #f 6 7 6)
-   (,eof eof #f #f #f 0)))
-
-
-(check-equal?
- (run-lexer "#2dsomething\n"
-            "╔═══╗\n"
-            "║ " 'special " ║\n"
-            "╚═══╝")
- `(("#2dsomething" hash-colon-keyword #f 1 13 0) 
-   ("\n" white-space #f 13 14 13) 
-   ("╔═══╗\n║ " no-color #f 14 22 14)
-   ("  ║\n╚═══╝" error #f 22 31 22)
-   (,eof eof #f #f #f 0)))
-
-(check-equal?
- (run-lexer "#2dsomething\n"
-            "╔═══╗\n"
-            'special
-             "   ║\n"
-            "╚═══╝")
- `(("#2dsomething" hash-colon-keyword #f 1 13 0)
-   ("\n" white-space #f 13 14 13)
-   ("╔═══╗\n" no-color #f 14 20 14)
-   ("    ║\n╚═══╝" error #f 20 31 20)
-   (,eof eof #f #f #f 0)))
-
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/match-test.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/match-test.rkt
deleted file mode 100644
index da01c44332..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/match-test.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang unstable/2d racket
-(require unstable/2d/match
-         rackunit)
-
-(check-equal?
- #2dmatch
- ╔═══════╦══════╦══════════╗
- ║     1 ║  'x  ║  x       ║
- ║ 2     ║      ║          ║
- ╠═══════╬══════╬══════════╣
- ║   y   ║  #f  ║(list x y)║
- ╚═══════╩══════╩══════════╝
- (list 1 2))
-
-(define (≤ t1 t2)
-  #2dmatch
-  ╔══════════╦══════╦═══════╦══════════╦═════════════════╗
-  ║     t2   ║ 'Int ║ 'Real ║ 'Complex ║   `(-> ,t2d     ║
-  ║ t1       ║      ║       ║          ║        ,t2r)    ║
-  ╠══════════╬══════╩═══════╩══════════╬═════════════════╣
-  ║  'Int    ║                         ║                 ║
-  ╠══════════╬══════╗          #t      ║                 ║
-  ║ 'Real    ║      ║                  ║       #f        ║
-  ╠══════════╣      ╚═══════╗          ║                 ║
-  ║'Complex  ║              ║          ║                 ║
-  ╠══════════╣              ╚══════════╬═════════════════╣
-  ║`(-> ,t1d ║      #f                 ║(and (≤ t2d t1d) ║
-  ║     ,t1r)║                         ║     (≤ t1r t2r))║
-  ╚══════════╩═════════════════════════╩═════════════════╝)
-  
-(check-equal? (≤ 'Int 'Int) #t)
-(check-equal? (≤ 'Int 'Real) #t)
-(check-equal? (≤ 'Real 'Int) #f)
-(check-equal? (≤ 'Complex 'Complex) #t)
-(check-equal? (≤ 'Complex 'Int) #f)
-(check-equal? (≤ '(-> Real Int) '(-> Int Real)) #t)
-(check-equal? (≤ '(-> Int Complex) '(-> Int Real)) #f)
-
-(check-equal?
- #2dmatch
- ╔════════╦═══╗
- ║      3 ║ x ║
- ║ 1      ║   ║
- ╠════════╬═══╣
- ║   2    ║   ║
- ╠════════╣ x ║
- ║   1    ║   ║
- ╚════════╩═══╝
- 3)
-
-(check-equal?
- #2dmatch
- ╔════════╦═══╗
- ║      3 ║ x ║
- ║ 1      ║   ║
- ╠════════╬═══╣
- ║   z    ║   ║
- ╠════════╣ x ║
- ║   q    ║   ║
- ╚════════╩═══╝
- 3)
-
-(check-equal?
- #2dmatch
- ╔════════╦═══════╗
- ║      3 ║   x   ║
- ║ 1      ║       ║
- ╠════════╬═══════╣
- ║   y    ║       ║
- ╠════════╣(+ x y)║
- ║   y    ║       ║
- ╚════════╩═══════╝
- 4)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/readtable-test.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/readtable-test.rkt
deleted file mode 100644
index a2308e65c2..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/2d/readtable-test.rkt
+++ /dev/null
@@ -1,718 +0,0 @@
-#lang racket/base
-
-(require rackunit
-         unstable/2d/private/read-util
-         unstable/2d/private/readtable
-         racket/set)
-
-(define touched-lines-table (make-hash))
-
-(check-equal? (chars->desc '(#\a) "or")
-              "a")
-(check-equal? (chars->desc '(#\a #\b) "or")
-              "a or b")
-(check-equal? (chars->desc '(#\a #\b #\c) "or")
-              "a, b, or c")
-(check-equal? (chars->desc '(#\a #\b #\c #\d) "or")
-              "a, b, c, or d")
-(check-equal? (chars->desc '(#\a #\b #\c #\d #\e) "or")
-              "a, b, c, d, or e")
-
-(check-equal? (read (open-input-string "#2(x)"))
-              (parameterize ([current-readtable (make-2d-readtable)])
-                (read (open-input-string "#2(x)"))))
-(check-equal? (with-handlers ((exn:fail? exn-message))
-                (read (open-input-string "#2x(x)")))
-              (with-handlers ((exn:fail? exn-message))
-                (parameterize ([current-readtable (make-2d-readtable)])
-                  (read (open-input-string "#2x(x)")))))
-(check-true (syntax? (read-syntax 'hi (open-input-string "#2(x)"))))
-(check-equal? (read (open-input-string "#2(x)"))
-              (parameterize ([current-readtable (make-2d-readtable)])
-                (syntax->datum (read-syntax 'hi (open-input-string "#2(x)")))))
-
-(parameterize ([current-readtable (make-2d-readtable)])
-  (define sp (open-input-string 
-              (string-append "#2d\n"
-                             "╔══╦══╗\n"
-                             "║1 ║2 ║\n"
-                             "╠══╬══╣\n"
-                             "║4 ║3 ║\n"
-                             "╚══╩══╝\n")))
-  (define wp
-    (make-input-port 'name sp sp void #f #f
-                     (λ () (values #f #f #f))
-                     void))
-  (port-count-lines! wp)
-  ;; make sure that if there is no source location information,
-  ;; we still get some result back.
-  (check-true (pair? (read wp))))
-
-(parameterize ([current-readtable (make-2d-readtable)])
-  (define sp (open-input-string 
-              (string-append "#2d\n"
-                             "╔══╦══╗\n"
-                             "║1 ║2 ║\n"
-                             "╠══╬══╣\n"
-                             "║4 ║3 ║\n"
-                             "╚══╩══╝\n")))
-  (port-count-lines! sp)
-  ;; make sure that if there is no source location information,
-  ;; we still get some result back.
-  (define stx (read-syntax "the source" sp))
-  (define initial-keyword (car (syntax-e stx)))
-  (check-not-false (syntax-source initial-keyword))
-  (check-not-false (syntax-line initial-keyword))
-  (check-not-false (syntax-column initial-keyword))
-  (check-not-false (syntax-position initial-keyword))
-  (check-not-false (syntax-span initial-keyword))
-  (check-not-false (syntax-original? initial-keyword))
-  (check-not-equal? (syntax-position stx) 
-                    (syntax-position initial-keyword)))
-
-(define (get-err-locs inputs)
-  (with-handlers ([exn:fail:read? exn:fail:read-srclocs])
-    (define p (open-input-string (apply string-append inputs)))
-    (port-count-lines! p)
-    (parameterize ([current-readtable (make-2d-readtable)])
-      (read-syntax #f p))
-    #f))
-
-(define (get-something inputs i)
-  (define p (open-input-string (apply string-append inputs)))
-  (port-count-lines! p)
-  ;; account for the "#2d" that was read from the first line
-  (call-with-values (λ () (parse-2dcond p "source" 1 0 1 2))
-                    (λ x (list-ref x i))))
-
-(define (get-graph inputs) (get-something inputs 0))
-(define (get-all-lines inputs) (get-something inputs 1))
-(define (get-table-column-breaks inputs) (get-something inputs 2))
-(define (get-initial-space-count inputs) (get-something inputs 3))
-
-
-(check-equal? (get-err-locs 
-               '("#2d\n"
-                 "╔══╦══╗\n"
-                 "║1 ║2 ║\n"
-                 "╠══╬══╣\n"
-                 "║4 ║3 ║\n"
-                 "╚══╩══╝\n"))
-              #f)
-(check-equal? (get-err-locs 
-               '("#2d\n"
-                 "╔══╦══╗\n"
-                 "║λ ║2 ║\n"
-                 "╠══╬══╣\n"
-                 "║1 ║黃 ║\n"
-                 "╚══╩══╝\n"))
-              #f)
-(check-equal? (get-err-locs 
-               '("#2d\n"
-                 "  ╔══╦══╗\n"
-                 "  ║1 ║4 ║\n"
-                 "  ╠══╬══╣\n"
-                 "  ║2 ║3 ║\n"
-                 "  ╚══╩══╝\n"))
-              #f)
-(check-equal? (get-err-locs 
-               '("#2d\n"
-                 "  ╔══╦══╦══╗\n"
-                 "  ║1 ║2 ║3 ║\n"
-                 "  ╠══╬══╬══╣\n"
-                 "  ║6 ║5 ║4 ║\n"
-                 "  ╠══╬══╬══╣\n"
-                 "  ║7 ║8 ║9 ║\n"
-                 "  ╚══╩══╩══╝\n"))
-              #f)
-(check-equal? (get-err-locs 
-               '("#2d\n"
-                 "  ╔══╦══╦══╗\n"
-                 "  ║ 1║ 2║ 3║\n"
-                 "  ╠══╬══╩══╣\n"
-                 "  ║ 4║     ║\n"
-                 "  ╠══╣  6  ║\n"
-                 "  ║ 5║     ║\n"
-                 "  ╚══╩═════╝\n"))
-              #f)
-(check-equal? (get-err-locs 
-               '("#2d\n"
-                 "  ╔══╦══╦══╗\n"
-                 "  ║ 1║ 2║ 3║\n"
-                 "  ╠══╬══╩══╣\n"
-                 "  ║ 4║5    ║\n"
-                 "  ╠══╬═════╣\n"
-                 "  ║ 6║7    ║\n"
-                 "  ╚══╩═════╝\n"))
-              #f)
-(check-equal? (get-err-locs 
-               '("#2d\n"
-                 "  ╔══╦══╦══╦══╗\n"
-                 "  ║ 1║ 2║ 3║ 4║\n"
-                 "  ╠══╬══╬══╩══╣\n"
-                 "  ║ 4║ 5║  6  ║\n"
-                 "  ╚══╩══╩═════╝\n"))
-              #f)
-(check-equal? (get-err-locs 
-               '("#2d\n"
-                 "  ╔══╦══╦══╗\n"
-                 "  ║1 ║2 ║3 ║\n"
-                 "  ╠══╬══╬══╣\n"
-                 "  ║4 ║  ║  ║\n"
-                 "  ╠══╣  ║  ║\n"
-                 "  ║5 ║6 ║7 ║\n"
-                 "  ╚══╩══╩══╝\n"))
-              #f)
-
-(check-equal? (get-err-locs 
-               '("#2d\n"
-                 "  ╔══╦══╗\n"
-                 "  ║1 ║4 ║  ;; comment\n"
-                 "  ╠══╬══╣  ;; comment  \n"
-                 "  ║2 ║3 ║\n"
-                 "  ╚══╩══╝\n"))
-              #f)
-
-(define lines-table (hash-copy all-line-of-interest))
-
-(parameterize ([current-lines lines-table])
-  (check-regexp-match #rx"expected a newline"
-                      (with-handlers ((exn:fail? exn-message))
-                        (parameterize ([current-readtable (make-2d-readtable)])
-                          (read (open-input-string "#2d")))))
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦══╗\n"
-                   "     ║  ║\n"
-                   "  ╠══╬══╣\n"
-                   "  ║  ║  ║\n"
-                   "  ╚══╩══╝\n"))
-                (list (srcloc #f 3 2 17 1)
-                      (srcloc #f 2 2 7 1)))
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦══╗\n"
-                   "  ║ ═║  ║\n"
-                   "  ╠══╬══╣\n"
-                   "  ║  ║  ║\n"
-                   "  ╚══╩══╝\n"))
-                (list (srcloc #f 3 4 19 1)))
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦══╗\n"
-                   " ║  ║  ║\n"
-                   " ╠══╬══╣\n"
-                   " ║  ║  ║\n"
-                   " ╚══╩══╝\n"))
-                (list (srcloc #f 3 1 16 1)))
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦══╗\n"
-                   "  ║  ║  ║\n"
-                   "  ╠══╬══\n"
-                   "  ║  ║  ║\n"
-                   "  ╚══╩══╝\n"))
-                (list (srcloc #f 4 8 33 1)))
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦══╗\n"
-                   "  ║  ║  ║\n"
-                   "  ╠═\n"
-                   "  ║  ║  ║\n"
-                   "  ╚══╩══╝\n"))
-                (list (srcloc #f 4 4 29 1)))
-  (check-equal? (get-err-locs
-                 '("#2d\n"
-                   "  +----+\n"
-                   "  |    |\n"
-                   "  +----+\n"))
-                (list (srcloc #f 2 2 7 1)))
-  (check-equal? (get-err-locs
-                 '("#2d\n"
-                   "   \n"))
-                (list (srcloc #f 2 0 5 3)))
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦══\n"))
-                (list (srcloc #f 2 8 13 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦══╦═══╗\n"
-                   "  ║  ║  ║   ║\n"
-                   "  ╠══╬══╩═══╣\n"
-                   "  ║  ║      ║\n"
-                   "  ╠══╣  ═   ║\n"
-                   "  ║  ║      ║\n"
-                   "  ╚══╩══════╝\n"))
-                (list (srcloc #f 6 8 69 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦══╦═══╗\n"
-                   "  ║  ║  ║   ║\n"
-                   "  ╠══╬══╩═══╣\n"
-                   "  ║  ║      ║\n"
-                   "  ╠══╬══╝═══╣\n"
-                   "  ║  ║      ║\n"
-                   "  ╚══╩══════╝\n")) 
-                (list (srcloc #f 6 8 69 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦═══╦═══╗\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╬═══╬═══╣\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╣ ═ ╠═══╣\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╚══╩═══╩═══╝\n")) 
-                (list (srcloc #f 6 7 72 1)
-                      (srcloc #f 6 5 70 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦═══╦═══╗\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╬═══╬═══╣\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╬═ ═╬═══╣\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╚══╩═══╩═══╝\n")) 
-                (list (srcloc #f 6 7 72 1)
-                      (srcloc #f 6 5 70 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦═══╦═══╗\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╬═══╬═══╣\n"
-                   "  ║  ║   ║   \n"
-                   "  ╠══╬═══╬═══╣\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╚══╩═══╩═══╝\n")) 
-                (list (srcloc #f 5 13 63 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦═══╦═══╗\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╩═══╬═══╣\n"
-                   "  ║      ║   ║\n"
-                   "  ║          ║\n"
-                   "  ║      ║   ║\n"
-                   "  ╠══╦═══╬═══╣\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╚══╩═══╩═══╝\n")) 
-                (list (srcloc #f 6 9 74 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦═══╦═══╗\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╩═══╬═══╣\n"
-                   "  ║      ║   ║\n"
-                   "  ║  ╩   ║   ║\n"
-                   "  ║      ║   ║\n"
-                   "  ╠══╦═══╬═══╣\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╚══╩═══╩═══╝\n")) 
-                (list (srcloc #f 6 5 70 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦═══╦═══╗\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╩═══╬═══╣\n"
-                   "  ║      ║   ║\n"
-                   "  ║   \n"
-                   "  ║      ║   ║\n"
-                   "  ╠══╦═══╬═══╣\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╚══╩═══╩═══╝\n")) 
-                (list (srcloc #f 6 6 71 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦═══╦═══╗\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╩═══╬═══╣\n"
-                   "  ║      ║   ║\n"
-                   "  ╚══════╩═\n")) 
-                (list (srcloc #f 6 11 76 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦═══╦═══╗\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╩═══╬═══╣\n"
-                   "  ║      ║   ║\n"
-                   "  ╚══════\n")) 
-                (list (srcloc #f 6 9 74 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦═══╦═══╗\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╩═══╬═══╣\n"
-                   "  ║      ║   ║\n"
-                   "  ╚══════╩═══X\n")) 
-                (list (srcloc #f 6 13 78 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦═══╦═══╗\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╩═══╬═══╣\n"
-                   "  ║      ║   ║\n"
-                   "  ╚══════╩══X╝\n")) 
-                (list (srcloc #f 6 12 77 1)))
-  
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "  ╔══╦═══╦═══╗\n"
-                   "  ║  ║   ║   ║\n"
-                   "  ╠══╩═══╬═══╣\n"
-                   "  ║      ║   ║     NOT WHITESPACE\n"
-                   "  ╚══════╩═══╝\n")) 
-                (list (srcloc #f 5 19 69 1)))
-
-  (check-equal? (get-err-locs 
-                 '("#2d\n"
-                   "╔══╦-══╗\n"
-                   "║  ║   ║\n"
-                   "╠══╬-══╣\n"
-                   "║  ║   ║\n"
-                   "╚══╩-══╝\n"))
-                (list (srcloc #f 2 4 9 1))))
-
-(let ([lines (hash-map lines-table (λ (x y) x))])
-  (unless (null? lines)
-    (eprintf "no test case for errors on lines: ~s\n"
-             (sort lines <))))
-
-
-(check-equal? (get-graph
-               '("  ╔══╦══╦══╗\n"
-                 "  ║ 1║ 2║ 3║\n"
-                 "  ╠══╬══╩══╣\n"
-                 "  ║ 4║     ║\n"
-                 "  ╠══╣  6  ║\n"
-                 "  ║ 5║     ║\n"
-                 "  ╚══╩═════╝\n"))
-              (make-hash
-               (list (cons (list 0 0) (set))
-                     (cons (list 0 1) (set))
-                     (cons (list 0 2) (set))
-                     (cons (list 1 0) (set))
-                     (cons (list 2 0) (set))
-                     
-                     (cons (list 1 1) (set (list 1 2) (list 2 1)))
-                     (cons (list 2 1) (set (list 1 1) (list 2 2)))
-                     (cons (list 1 2) (set (list 1 1) (list 2 2)))
-                     (cons (list 2 2) (set (list 1 2) (list 2 1))))))
-
-(check-equal? (get-graph
-               '("  ╔══╦══╦══╗\n"
-                 "  ║1 ║2 ║3 ║\n"
-                 "  ╠══╬══╬══╣\n"
-                 "  ║6 ║5 ║4 ║\n"
-                 "  ╠══╬══╬══╣\n"
-                 "  ║7 ║8 ║9 ║\n"
-                 "  ╚══╩══╩══╝\n"))
-              (make-hash
-               (list (cons (list 0 0) (set))
-                     (cons (list 0 1) (set))
-                     (cons (list 0 2) (set))
-                     (cons (list 1 0) (set))
-                     (cons (list 1 1) (set))
-                     (cons (list 1 2) (set))
-                     (cons (list 2 0) (set))
-                     (cons (list 2 1) (set))
-                     (cons (list 2 2) (set)))))
-
-(check-equal? (get-graph
-               '("  ╔══╦══╦══╦══╗\n"
-                 "  ║1 ║2 ║3 ║4 ║\n"
-                 "  ╠══╬══╩══╩══╣\n"
-                 "  ║6 ║5       ║\n"
-                 "  ╠══╣  ╔══╗  ║\n"
-                 "  ║7 ║  ║10║  ║\n"
-                 "  ╠══╣  ╚══╝  ║\n"
-                 "  ║7 ║        ║\n"
-                 "  ╚══╩════════╝\n"))
-              (make-hash
-               (list (cons (list 0 0) (set))
-                     (cons (list 0 1) (set))
-                     (cons (list 0 2) (set))
-                     (cons (list 0 3) (set))
-                     
-                     (cons (list 1 0) (set))
-                     (cons (list 1 1) (set (list 1 2) (list 2 1)))
-                     (cons (list 1 2) (set (list 1 1) (list 1 3)))
-                     (cons (list 1 3) (set (list 1 2) (list 2 3)))
-                     
-                     (cons (list 2 0) (set))
-                     (cons (list 2 1) (set (list 1 1) (list 3 1)))
-                     (cons (list 2 2) (set))
-                     (cons (list 2 3) (set (list 1 3) (list 3 3)))
-                     
-                     (cons (list 3 0) (set))
-                     (cons (list 3 1) (set (list 2 1) (list 3 2)))
-                     (cons (list 3 2) (set (list 3 1) (list 3 3)))
-                     (cons (list 3 3) (set (list 3 2) (list 2 3))))))
-
-(check-equal? (get-all-lines '("  ╔══╦══╗\n"
-                               "  ║1 ║  ║\r"
-                               "  ╠══╬══╣\r\n"
-                               "  ║2 ║  ║\r"
-                               "  ╠══╬══╣\n"
-                               "  ║3 ║  ║\n"
-                               "  ╚══╩══╝\n"))
-              '#(("  ╔══╦══╗\n"   "  ║1 ║  ║\r")
-                 ("  ╠══╬══╣\r\n" "  ║2 ║  ║\r")
-                 ("  ╠══╬══╣\n"   "  ║3 ║  ║\n")))
-
-(check-equal? (get-table-column-breaks '("  ╔══╦══╗\n"
-                                         "  ║1 ║  ║\n"
-                                         "  ╠══╬══╣\n"
-                                         "  ║2 ║  ║\n"
-                                         "  ╠══╬══╣\n"
-                                         "  ║3 ║  ║\n"
-                                         "  ╚══╩══╝\n"))
-              (list 2 2))
-(check-equal? (get-initial-space-count '("  ╔══╦══╗\n"
-                                         "  ║1 ║  ║\n"
-                                         "  ╠══╬══╣\n"
-                                         "  ║2 ║  ║\n"
-                                         "  ╠══╬══╣\n"
-                                         "  ║3 ║  ║\n"
-                                         "  ╚══╩══╝\n"))
-              2)
-
-(check-equal? (close-cell-graph (make-hash) 2 2)
-              (set (set (list 0 0))
-                   (set (list 0 1))
-                   (set (list 1 0))
-                   (set (list 1 1))))
-
-(check-equal? (close-cell-graph (make-hash 
-                                 (list
-                                  (cons (list 0 0) (set (list 0 1)))))
-                     2 2)
-              (set (set (list 0 0) (list 0 1))
-                   (set (list 1 0))
-                   (set (list 1 1))))
-
-
-(check-equal? (close-cell-graph (make-hash 
-                                 (list
-                                  (cons (list 0 0) (set (list 0 1)))
-                                  (cons (list 0 1) (set (list 1 1)))))
-                     2 2)
-              (set (set (list 0 0) (list 0 1) (list 1 1))
-                   (set (list 1 0))))
-(check-equal? (close-cell-graph (make-hash 
-                                 (list
-                                  (cons (list 0 0) (set (list 0 1)))
-                                  (cons (list 0 1) (set (list 1 1)))
-                                  (cons (list 1 1) (set (list 1 0)))))
-                     2 2)
-              (set (set (list 0 0) (list 0 1) (list 1 1) (list 1 0))))
-
-(check-true  (compare/xy (list 0 0) (list 1 1)))
-(check-false (compare/xy (list 1 1) (list 0 0)))
-(check-true  (compare/xy (list 1 0) (list 1 1)))
-(check-false (compare/xy (list 1 1) (list 1 0)))
-(check-false (compare/xy (list 1 0) (list 1 0)))
-
-(check-equal? (smallest-representative (set (list 0 0) (list 1 0) (list 0 1) (list 1 1)))
-              (list 0 0))
-(check-equal? (smallest-representative (set (list 1 1) (list 0 1) (list 1 0) (list 0 0)))
-              (list 0 0))
-
-(let ()
-  (define scratch (string-copy "                                "))
-  (fill-scratch-string (set '(0 0))
-                       #(("╔══╦══╗\n" "║12║34║\n") ("╠══╬══╣\n" "║56║78║\n"))
-                       scratch
-                       '(2 2)
-                       0)
-  (check-equal? scratch
-                "       \n 12    \n       \n       \n"))
-
-(let ()
-  (define scratch (string-copy "                                "))
-  (fill-scratch-string (set '(1 0))
-                       #(("╔══╦══╗\n" "║12║34║\n") ("╠══╬══╣\n" "║56║78║\n"))
-                       scratch
-                       '(2 2)
-                       0)
-  (check-equal? scratch
-                "       \n    34 \n       \n       \n"))
-
-(let ()
-  (define scratch (string-copy "                                "))
-  (fill-scratch-string (set '(0 1))
-                       #(("╔══╦══╗\n" "║12║34║\n") ("╠══╬══╣\n" "║56║78║\n"))
-                       scratch
-                       '(2 2)
-                       0)
-  (check-equal? scratch
-                "       \n       \n       \n 56    \n"))
-
-(let ()
-  (define scratch (string-copy "                                "))
-  (fill-scratch-string (set '(1 1))
-                       #(("╔══╦══╗\n" "║12║34║\n") ("╠══╬══╣\n" "║56║78║\n"))
-                       scratch
-                       '(2 2)
-                       0)
-  (check-equal? scratch
-                "       \n       \n       \n    78 \n"))
-
-(let ()
-  (define scratch (string-copy "       \n    34 \n       \n       \n"))
-  (fill-scratch-string (set '(1 0) '(1 1))
-                       #(("╔══╦══╗\n" "║12║34║\n") ("╠══╣56║\n" "║78║90║\n"))
-                       scratch
-                       '(2 2)
-                       0)
-  (check-equal? scratch
-                "       \n    34 \n    56 \n    90 \n"))
-
-(let ()
-  (define scratch (string-copy "       \n    34 \n       \n       \n"))
-  (fill-scratch-string (set '(0 1) '(1 1))
-                       #(("╔══╦══╗\n" "║12║34║\n") ("╠══╩══╣\n" "║56789║\n"))
-                       scratch
-                       '(2 2)
-                       0)
-  (check-equal? scratch
-                "       \n       \n       \n 56789 \n"))
-
-(let ()
-  (define scratch (string-copy "       \n    34 \n       \n       \n"))
-  (fill-scratch-string (set '(0 1) '(1 0) '(1 1))
-                       #(("╔══╦══╗\n" "║12║34║\n") ("╠══╝56║\n" "║7890A║\n"))
-                       scratch
-                       '(2 2) 
-                       0)
-  (check-equal? scratch
-                "       \n    34 \n    56 \n 7890A \n"))
-
-(let ()
-  (define scratch (string-copy "                                "))
-  (fill-scratch-string (set '(0 0))
-                       #(("╔═════╗\n" "║12345║\n" "║67890║\n" "║ABCDE║\n"))
-                       scratch
-                       '(5)
-                       0)
-  
-  (check-equal? scratch
-                "       \n 12345 \n 67890 \n ABCDE \n"))
-
-(let ()
-  (define scratch (make-string 66 #\space))
-  (fill-scratch-string (set '(1 2) '(1 1) '(2 2) '(2 1))
-                       #(("╔══╦══╦══╗\n" "║12║34║56║\n")
-                         ("╠══╬══╩══╣\n" "║78║90ABC║\n")
-                         ("╠══╣DEFGH║\n" "║IJ║KLMNO║\n"))
-                       scratch
-                       '(2 2 2)
-                       0)
-  
-  (check-equal? scratch
-                "          \n          \n          \n    90ABC \n    DEFGH \n    KLMNO \n"))
-
-(let ()
-  (define scratch (make-string 120 #\space))
-  (fill-scratch-string 
-   (set '(1 2) '(1 3) '(2 3))
-   #(("╔═╦════╦═════╗\n" "║1║2345║67890║\n")
-     ("╠═╬════╩═════╣\n" "║a║bcdefghijk║\n")
-     ("╠═╬════╗lmnop║\n" "║q║rstu║vwxyz║\n")
-     ("╠═╣ABCD╚═════╣\n" "║E║FGHIJKLMNO║\n"))
-   scratch
-   '(1 4 5)
-   0)
-  (check-equal? (string-append
-                 "              \n"
-                 "              \n"
-                 "              \n"
-                 "              \n"
-                 "              \n"
-                 "   rstu       \n"
-                 "   ABCD       \n"
-                 "   FGHIJKLMNO \n")
-                scratch))
-
-(let ()
-  (define scratch (make-string 495 #\space))
-  (fill-scratch-string
-   (set '(1 2) '(1 3) '(1 4) '(2 3) '(2 4) '(3 4))
-   #(("╔════════╦════╦═════╦════════╦═════════════╗\n"
-      "║        ║'Int║'Real║'Complex║ `(-> ,c ,d) ║\n")
-     ("╠════════╬════╩═════╩════════╬═════════════╣\n"
-      "║'Int    ║                   ║             ║\n")
-     ("╠════════╬════╗      #t      ║             ║\n"
-      "║'Real   ║    ║              ║      #f     ║\n")
-     ("╠════════╣    ╚═════╗        ║             ║\n" 
-      "║'Complex║          ║        ║             ║\n")
-     ("╠════════╣          ╚════════╬═════════════╣\n"
-      "║`(-> ,a ║    #f             ║(and (≤ c a) ║\n"
-      "║     ,b)║                   ║     (≤ b d))║\n"))
-   scratch
-   '(8 4 5 8 13)
-   0)
-  ;; just make sure there are no border characters in there.
-  (check-regexp-match #rx"^[\n#f ]*$" scratch))
-
-(let ()
-  (define str (make-string 84 #\space))
-  (fill-scratch-string (set '(1 2) '(1 1) '(2 1))
-                       '#(("╔═══╦═══╦═══╗\n" 
-                           "║   ║ a ║ b ║\n")
-                          ("╠═══╬═══╩═══╣\n"
-                           "║ c ║ 1     ║\n")
-                          ("╠═══╣   ╔═══╣\n"
-                           "║ d ║   ║ 2 ║\n"))
-                       str
-                       '(3 3 3)
-                       0)
-  (check-equal? str
-                "             \n             \n             \n      1      \n             \n             \n"))
-
-(let ()
-  (define scratch (string-copy "                                "))
-  (check-equal? (fill-scratch-string (set '(0 0))
-                                     #(("╔══╦══╗\n" "║12║34║\n") ("╠══╬══╣\n" "║56║78║\n"))
-                                     scratch
-                                     '(2 2)
-                                     0
-                                     #t)
-                '((10 . 12))))
-
-(let ()
-  (define sp (open-input-string 
-              (string-append "#(#2d\n"
-                             "  ╔══╦══╗\n"
-                             "  ║1 ║2 ║\n"
-                             "  ╠══╬══╣\n"
-                             "  ║4 ║3 ║\n"
-                             "  ╚══╩══╝)1\n")))
-  (parameterize ([current-readtable (make-2d-readtable)])
-    (check-true (vector? (read sp)))
-    (check-equal? (read sp) 1)))
-
-
-(let ()
-  (define sp (open-input-string "#2dwhatever\n"))
-  (port-count-lines! sp)
-  (define exn
-    (with-handlers ((exn:fail:read:eof? values))
-      (parameterize ([current-readtable (make-2d-readtable)])
-        (read sp))))
-  (check-regexp-match #rx"expected eof" (exn-message exn))
-  (check-equal? (exn:fail:read-srclocs exn)
-                (list (srcloc #f 1 0 1 12))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/dfa-test.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/dfa-test.rkt
deleted file mode 100644
index 2c10d809a6..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/dfa-test.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(require unstable/automata/dfa
-         unstable/automata/machine
-         tests/eli-tester)
-
-(define M
-  (dfa s1 (s1 s3)
-       [s1 ([0 s2]
-            [1 s1])]
-       [s2 ([0 s1]
-            [1 s2])]
-       [s3 ([0 s3]
-            [1 s4])]
-       [s4 ([0 s4]
-            [1 s3])]))
-
-(test
- (machine-accepts? M (list 1 0 1 0 1))
- (machine-accepts? M (list 0 1 0 1 0)) => #f
- (machine-accepts? M (list 1 0 1 1 0 1))
- (machine-accepts? M (list 0 1 0 0 1 0))
- (machine-accepts? M (list))
- (machine-accepts? M (list 1 0)) => #f)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/explain.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/explain.rkt
deleted file mode 100644
index 6f365def1b..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/explain.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket
-(require unstable/automata/re
-         unstable/automata/re-ext
-         unstable/automata/machine
-         unstable/match
-         tests/eli-tester)
-
-(define r (re (seq 1 2 3)))
-(define r0 (r 1))
-(machine-accepting? (r0 1))
-(machine-explain r0)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/info.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/info.rkt
deleted file mode 100644
index 84ad0ac2d5..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/nfa-ep-test.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/nfa-ep-test.rkt
deleted file mode 100644
index fb88e74bbb..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/nfa-ep-test.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-(require unstable/automata/nfa-ep
-         unstable/automata/machine
-         tests/eli-tester)
-
-(define M
-  (nfa/ep (s0) (s1 s3)
-       [s0 ([epsilon (s1)]
-            [epsilon (s3)])]
-       [s1 ([0 (s2)]
-            [1 (s1)])]
-       [s2 ([0 (s1)]
-            [1 (s2)])]
-       [s3 ([0 (s3)]
-            [1 (s4)])]
-       [s4 ([0 (s4)]
-            [1 (s3)])]))
-
-(test
- (machine-accepts? M (list 1 0 1 0 1))
- (machine-accepts? M (list 0 1 0 1 0))
- (machine-accepts? M (list 1 0 1 1 0 1))
- (machine-accepts? M (list 0 1 0 0 1 0))
- (machine-accepts? M (list))
- (machine-accepts? M (list 1 0)) => #f)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/nfa-star-test.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/nfa-star-test.rkt
deleted file mode 100644
index 2897796217..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/nfa-star-test.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-(require unstable/automata/nfa-star
-         unstable/automata/machine
-         tests/eli-tester)
-
-(define M
-  (nfa*
-   (s0)
-   ([s1 ([0 (s2)]
-         [1 (s1)])]
-    [s3 ([0 (s3)]
-         [1 (s4)])])
-   ([s0 ([epsilon (s1)]
-         [epsilon (s3)])]
-    [s2 ([0 (s1)]
-         [1 (s2)])]
-    [s4 ([0 (s4)]
-         [1 (s3)])])))
-
-(test
- (machine-accepts? M (list 1 0 1 0 1))
- (machine-accepts? M (list 0 1 0 1 0))
- (machine-accepts? M (list 1 0 1 1 0 1))
- (machine-accepts? M (list 0 1 0 0 1 0))
- (machine-accepts? M (list))
- (machine-accepts? M (list 1 0)) => #f)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/nfa-test.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/nfa-test.rkt
deleted file mode 100644
index 256b9e2a85..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/nfa-test.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(require unstable/automata/nfa
-         unstable/automata/machine
-         tests/eli-tester)
-
-(define M
-  (nfa (s1 s3) (s1 s3)
-       [s1 ([0 (s2)]
-            [1 (s1)])]
-       [s2 ([0 (s1)]
-            [1 (s2)])]
-       [s3 ([0 (s3)]
-            [1 (s4)])]
-       [s4 ([0 (s4)]
-            [1 (s3)])]))
-
-(test
- (machine-accepts? M (list 1 0 1 0 1))
- (machine-accepts? M (list 0 1 0 1 0))
- (machine-accepts? M (list 1 0 1 1 0 1))
- (machine-accepts? M (list 0 1 0 0 1 0))
- (machine-accepts? M (list))
- (machine-accepts? M (list 1 0)) => #f)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/re-test.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/re-test.rkt
deleted file mode 100644
index b3d8bd3881..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/automata/re-test.rkt
+++ /dev/null
@@ -1,155 +0,0 @@
-#lang racket
-(require unstable/automata/machine
-         unstable/automata/re
-         unstable/automata/re-ext
-         unstable/match
-         tests/eli-tester)
-
-(define-syntax-rule (test-re* R (succ ...) (fail ...))
-  (let ()
-    (define r (re R))
-    (test #:failure-prefix (format "~s" 'R)
-          (test
-           (machine-accepts? r succ) ...
-           (not (machine-accepts? r fail)) ...))))
-(define-syntax-rule (test-re R (succ ...) (fail ...))
-  (test (test-re* R (succ ...) (fail ...))
-        (test-re* (complement R) (fail ...) (succ ...))))
-
-(test
- (test-re epsilon
-          [(list)]
-          [(list 0)])
- 
- (test-re nullset
-          []
-          [(list) (list 1)])
- 
- (test-re "A"
-          [(list "A")]
-          [(list)
-           (list "B")])
- 
- (test-re (complement "A")
-          [(list)
-           (list "B")
-           (list "A" "A")]
-          [(list "A")])
- 
- (test-re (union 0 1)
-          [(list 1)
-           (list 0)]
-          [(list)
-           (list 0 1)
-           (list 0 1 1)])
- 
- (test-re (seq 0 1)
-          [(list 0 1)]
-          [(list)
-           (list 0)
-           (list 0 1 1)])
- 
- (test-re (star 0)
-          [(list)
-           (list 0)
-           (list 0 0)]
-          [(list 1)])
- 
- (test-re (opt "A")
-          [(list)
-           (list "A")]
-          [(list "B")])
- 
- (test-re (plus "A")
-          [(list "A")
-           (list "A" "A")]
-          [(list)])
- 
- (test-re (rep "A" 3)
-          [(list "A" "A" "A")]
-          [(list)
-           (list "A")
-           (list "A" "A")])
- 
- (test-re (difference (? even?) 2)
-          [(list 4)
-           (list 6)]
-          [(list 3)
-           (list 2)])
- 
- (test-re (intersection (? even?) 2)
-          [(list 2)]
-          [(list 1)
-           (list 4)])
- 
- (test-re (complement (seq "A" (opt "B")))
-          [(list "A" "B" "C")]
-          [(list "A")
-           (list "A" "B")])
- 
- (test-re (seq epsilon 1)
-          [(list 1)]
-          [(list 0)
-           (list)])
- 
- (test-re (seq 1 epsilon)
-          [(list 1)]
-          [(list 0)
-           (list)])
- 
- (test-re (seq epsilon
-               (union (seq (star 1) (star (seq 0 (star 1) 0 (star 1))))
-                      (seq (star 0) (star (seq 1 (star 0) 1 (star 0)))))
-               epsilon)
-          [(list 1 0 1 0 1)
-           (list 0 1 0 1 0)
-           (list 1 0 1 1 0 1)
-           (list 0 1 0 0 1 0)
-           (list)]
-          [(list 1 0)])
- 
- (test-re (star (complement 1))
-          [(list 0 2 3 4)
-           (list)
-           (list 2)
-           ; This is correct, because the complement machine
-           ; could accept '(234 5 9 1), which is not '(1)
-           ; Then the star kicks in and it accepts '(9 0)
-           (list 234 5 9 1 9 0)
-           (list 1 0)
-           (list 0 1)]
-          [(list 1)])
- 
- (test-re (dseq x (== x))
-          [(list 0 0)
-           (list 1 1)]
-          [(list)
-           (list 1)
-           (list 1 0)])
- 
- (test-re (seq 1 (seq 2 3))
-          [(list 1 2 3)]
-          [(list 1)
-           (list 1 2)])
- 
- (test-re (rec x
-            (union #f
-                   (seq 1 ,x)))
-          [(list #f)
-           (list 1 #f)
-           (list 1 1 #f)
-           (list 1 1 1 #f)]
-          [(list 1)
-           (list 2)
-           (list 1 1 2)])
- 
- (test-re (seq/close 1 2 3)
-          [(list)
-           (list 1)
-           (list 1 2)
-           (list 1 2 3)]
-          [(list 2)
-           (list 1 3)
-           (list 2 3)
-           (list 1 2 3 4)])
- )
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/contract.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/contract.rkt
deleted file mode 100644
index ecffc475bc..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/contract.rkt
+++ /dev/null
@@ -1,73 +0,0 @@
-#lang racket
-
-(require rackunit rackunit/text-ui unstable/contract "helpers.rkt")
-
-(run-tests
- (test-suite "contract.rkt"
-   (test-suite "Flat Contracts"
-     (test-suite "truth/c"
-       (test-ok (with/c truth/c #t))
-       (test-ok (with/c truth/c #f))
-       (test-ok (with/c truth/c '(x)))))
-   (test-suite "Higher Order Contracts"
-     (test-suite "predicate/c"
-       (test-ok ([with/c predicate/c integer?] 1))
-       (test-ok ([with/c predicate/c integer?] 1/2))
-       (test-bad ([with/c predicate/c values] 'x))))
-   (test-suite "Collection Contracts"
-     (test-suite "sequence/c"
-       (test-ok
-        (for ([x (with/c (sequence/c integer?) (list 1 2 3 4))])
-          (void)))
-       (test-bad
-        (for ([x (with/c (sequence/c integer?) (list 1 2 'c 4))])
-          (void)))
-       (test-bad
-        (for ([x (with/c (sequence/c integer? symbol?) (list 1 2 3 4))])
-          (void)))
-       (test-ok
-         (for ([(x y) (with/c (sequence/c integer? symbol?)
-                              (in-dict (list (cons 1 'one) (cons 2 'two))))])
-           (void)))
-       (test-bad
-         (for ([(x y) (with/c (sequence/c integer? symbol?)
-                              (in-dict (list (cons 1 'one) (cons 2 "two"))))])
-           (void)))
-       (test-bad
-         (for ([(x y) (with/c (sequence/c integer?)
-                              (in-dict (list (cons 1 'one) (cons 2 'two))))])
-           (void)))
-       (let ([s (sequence->stream (contract (sequence/c #:min-count 2 any/c) "x" 'pos 'neg))])
-         (check-equal? (stream-first s) #\x)
-         (check-exn (λ (x) (and (exn:fail? x)
-                                (regexp-match #rx"blaming: pos" (exn-message x))))
-                    (lambda () (stream-first (stream-rest s)))))))
-   (test-suite "Data structure contracts"
-     (test-suite "maybe/c"
-       (test-true "flat" (flat-contract? (maybe/c number?)))
-       (test-true "chaperone" (chaperone-contract? (maybe/c (box/c number?))))
-       (test-true "impersonator" (impersonator-contract? (maybe/c (object/c))))
-       (test-ok (with/c (maybe/c number?) 0))
-       (test-ok (with/c (maybe/c number?) #f))
-       (test-ok (with/c (maybe/c (-> number? number?)) #f))
-       (test-ok (with/c (maybe/c (-> number? number?)) +))
-       (test-ok (with/c (maybe/c (class/c (field [x number?])))
-                        (class object% (super-new) (field [x 0]))))
-       (test-ok (with/c (maybe/c (class/c (field [x number?]))) #f))
-       (test-ok (with/c (class/c (field [c (maybe/c string?)]))
-                        (class object% (super-new) (field [c #f]))))
-       (test-bad (with/c (maybe/c number?) "string"))
-       (test-bad (with/c (maybe/c (-> number? number?))
-                         (lambda (x y) x)))
-       (test-bad
-         ([with/c (maybe/c (-> number? number?))
-                  (lambda (x) (void))]
-          0))
-       (test-bad (with/c (maybe/c (class/c (field [x number?])))
-                        (class object% (super-new))))
-       (test-bad (with/c (maybe/c (class/c (field [x number?]))) 5))
-       (test-bad
-         (get-field c (with/c (class/c (field [c (maybe/c string?)]))
-                              (class object%
-                                (super-new)
-                                (field [c 70])))))))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/debug.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/debug.rkt
deleted file mode 100644
index 0bbc6758a8..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/debug.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket
-
-(require rackunit rackunit/text-ui unstable/debug "helpers.rkt")
-
-(run-tests
- (test-suite "debug.rkt"
-   (test-suite "dprintf"
-     (test
-      (let ()
-        (parameterize ([current-error-port (open-output-string)])
-          (dprintf "Danger, ~a!" "Will Robinson")
-          (check-equal?
-           (get-output-string (current-error-port))
-           "Danger, Will Robinson!\n")))))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/function.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/function.rkt
deleted file mode 100644
index 86fe58675a..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/function.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket
-(require rackunit rackunit/text-ui unstable/function
-         "helpers.rkt")
-
-(run-tests
- (test-suite "function.rkt"
-
-   (test-suite "Higher Order Predicates"
-
-     (test-suite "conjoin"
-       (test-case "no functions"
-         (check-true ((conjoin) 'x #:y 'z)))
-       (test-case "true"
-         (check-true ((conjoin integer? exact?) 1)))
-       (test-case "false"
-         (check-false ((conjoin integer? exact?) 1.0)))
-       (test-case "false"
-         (check-false ((conjoin integer? exact?) 0.5))))
-
-     (test-suite "disjoin"
-       (test-case "no functions"
-         (check-false ((disjoin) 'x #:y 'z)))
-       (test-case "true"
-         (check-true ((disjoin integer? exact?) 1)))
-       (test-case "true"
-         (check-true ((disjoin integer? exact?) 1/2)))
-       (test-case "false"
-         (check-false ((disjoin integer? exact?) 0.5)))))
-   ))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/hash.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/hash.rkt
deleted file mode 100644
index 6cd69891e8..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/hash.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket
-
-(require rackunit rackunit/text-ui unstable/hash "helpers.rkt")
-
-(run-tests
- (test-suite "hash.rkt"
-   (test-suite "hash-union"
-     (test-ok (hash-union #hash([1 . one] [2 . two])
-                          #hash([3 . three] [4 . four]))
-              #hash([4 . four] [3 . three] [1 . one] [2 . two])))
-   (test-suite "hash-union!"
-     (test-ok (define h (make-hash))
-              (hash-union! h #hash([1 . one] [2 . two]))
-              (hash-union! h #hash([3 . three] [4 . four]))
-              (check-equal? (hash-copy
-                             #hash([1 . one] [2 . two] [3 . three] [4 . four]))
-                            h)))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/helpers.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/helpers.rkt
deleted file mode 100644
index 722a228bc6..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/helpers.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang racket
-
-(provide test
-         test-ok check-ok
-         test-bad check-bad
-         check-not
-         check/sort
-         with/c)
-
-(require rackunit racket/pretty)
-
-(define-syntax-rule (test e ...)
-  (test-case (parameterize ([pretty-print-columns 50])
-               (pretty-format/write '(test e ...)))
-    e ...))
-(define-syntax-rule (test-ok e ...) (test (check-ok e ...)))
-(define-syntax-rule (test-bad e ...) (test (check-bad e ...)))
-(define-syntax-rule (check-ok e ...) (check-not-exn (lambda () e ...)))
-(define-syntax-rule (check-bad e ...) (check-exn exn:fail? (lambda () e ...)))
-
-(define (pretty-format/write x)
-  (with-output-to-string
-    (lambda () (pretty-write x))))
-
-(define-syntax-rule (with/c c e)
-  (let () (with-contract value ([value c]) (define value e)) value))
-
-(define-check (check-not compare actual expected)
-  (with-check-info*
-   (list (make-check-info 'comparison compare)
-         (make-check-actual actual)
-         (make-check-expected expected))
-   (lambda ()
-     (let* ([result (compare actual expected)])
-       (when result
-         (with-check-info*
-          (list (make-check-info 'result result))
-          (lambda () (fail-check))))))))
-
-(define (check/sort actual expected
-                    #:< <<
-                    #:= [== equal?])
-  (with-check-info*
-   (list (make-check-name 'check/sort)
-         (make-check-info '< <<)
-         (make-check-info '= ==)
-         (make-check-info 'actual actual)
-         (make-check-info 'expected expected))
-   (lambda ()
-     (let* ([actual-sorted (sort actual <<)]
-            [actual-length (length actual-sorted)]
-            [expected-sorted (sort expected <<)]
-            [expected-length (length expected-sorted)])
-       (with-check-info*
-        (list (make-check-info 'actual-sorted actual-sorted)
-              (make-check-info 'expected-sorted expected-sorted))
-        (lambda ()
-          (unless (= actual-length expected-length)
-            (with-check-info*
-             (list (make-check-message
-                    (format "expected ~a elements, but got ~a"
-                            expected-length actual-length)))
-             (lambda () (fail-check))))
-          (let*-values
-              ([(actuals expecteds)
-                (for/lists
-                    [actuals expecteds]
-                    ([actual (in-list actual-sorted)]
-                     [expected (in-list actual-sorted)]
-                     #:unless (== actual expected))
-                  (values actual expected))])
-            (unless (and (null? actuals) (null? expecteds))
-              (with-check-info*
-               (list (make-check-info 'actual-failed actuals)
-                     (make-check-info 'expected-failed expecteds))
-               (lambda () (fail-check)))))))))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/info.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/info.rkt
deleted file mode 100644
index b6e66bbee4..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define test-responsibles '(("options.rkt" (robby chrdimo))
-                            ("logging.rkt" stamourv)
-                            ("list.rkt" jay)))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/latent-contract.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/latent-contract.rkt
deleted file mode 100644
index 689f077691..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/latent-contract.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/load
-
-(require rackunit)
-
-(module module0 racket/base
-  (require racket/contract unstable/latent-contract)
-  
-  (provide identity listify)
-  
-  (define/latent-contract (identity x) (real? . -> . real?)
-    x)
-  (define/latent-contract (listify x) (parametric->/c [a] (a . -> . (listof a)))
-    (list x)))
-
-(module module1 racket/base
-  (require 'module0 unstable/latent-contract)
-  (provide (activate-contract-out identity listify)))
-
-(require 'module0)
-
-(check-true (procedure? identity))
-(check-true (procedure? listify))
-(check-equal? (identity 1) 1)
-(check-equal? (identity 'x) 'x)
-(check-equal? (listify 1) (list 1))
-
-(require 'module1)
-
-(check-true (procedure? identity))
-(check-true (procedure? listify))
-(check-equal? (identity 1) 1)
-(check-exn exn:fail:contract? (λ () (identity 'x)))
-(check-equal? (listify 1) (list 1))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/list.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/list.rkt
deleted file mode 100644
index bd421ed06d..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/list.rkt
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang scheme
-(require unstable/list)
-(require tests/eli-tester)
-(test
- (remf positive? '()) => '()
- (remf positive? '(1 -2 3 4 -5)) => '(-2 3 4 -5)
- (remf even? '(1 -2 3 4 -5)) => '(1 3 4 -5)
- (remf (λ (x) #f) '(1 -2 3 4 -5)) => '(1 -2 3 4 -5))
-
-(require rackunit rackunit/text-ui)
-
-(run-tests
- (test-suite "unstable/list"
-   (test-suite "map2"
-     (test-case "numerator and denominator"
-       (let*-values ([(ns ds)
-                      (map2
-                       (lambda (r)
-                         (values (numerator r) (denominator r)))
-                       (list 1/2 3/4 5/6))])
-         (check-equal? (list ns ds) (list '(1 3 5) '(2 4 6))))))
-   (test-suite "map/values"
-     (test-case "complex numerator and denominator"
-       (let*-values ([(rns rds ins ids)
-                      (map/values
-                       4
-                       (lambda (c)
-                         (values (numerator (real-part c))
-                                 (denominator (real-part c))
-                                 (numerator (imag-part c))
-                                 (denominator (imag-part c))))
-                       (list 1/2+3/4i 5/6+7/8i))])
-         (check-equal? (list rns rds ins ids)
-                       (list '(1 5) '(2 6) '(3 7) '(4 8)))))
-     (test-case "multiple lists"
-       (let*-values ([(as bs cs)
-                      (map/values 3 values '(1 2 3) '(4 5 6) '(7 8 9))])
-         (check-equal? as '(1 2 3))
-         (check-equal? bs '(4 5 6))
-         (check-equal? cs '(7 8 9)))))
-   (test-suite "group-by"
-     (check-equal? (group-by values '(1 4 2 56 2 3))
-                   '((3) (56) (2 2) (4) (1)))
-     (check-equal? (group-by values '(1 2 1 2 54 2 5 43 7 2 643 1 2 0))
-                   '((0) (2 2 2 2 2) (7) (43) (5) (54) (643) (1 1 1)))
-     (check-equal? (group-by values
-                             '(1 4 2 56 2 3)
-                             (lambda (x y) (or (and (even? x) (even? y))
-                                               (and (odd?  x) (odd?  y)))))
-                   '((4 2 56 2) (1 3)))
-     (check-equal? (group-by car '((1 a) (4 b) (2 c) (56 d) (2 e) (3 f)))
-                    '(((3 f)) ((56 d)) ((2 c) (2 e)) ((4 b)) ((1 a))))
-     (check-equal? (group-by even? '(1 2 3 4 5 6))
-                   '((2 4 6) (1 3 5))))
-   (test-suite "cartesian-product"
-     (check-equal? (cartesian-product '(1 2 3) '(a b c))
-                   '((1 a) (1 b) (1 c)
-                     (2 a) (2 b) (2 c)
-                     (3 a) (3 b) (3 c)))
-     (check-equal? (cartesian-product '(4 5 6) '(d e f) '(#t #f))
-                   '((4 d #t) (4 d #f) (4 e #t) (4 e #f) (4 f #t) (4 f #f)
-                     (5 d #t) (5 d #f) (5 e #t) (5 e #f) (5 f #t) (5 f #f)
-                     (6 d #t) (6 d #f) (6 e #t) (6 e #f) (6 f #t) (6 f #f))))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/logging.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/logging.rkt
deleted file mode 100644
index b715be9fed..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/logging.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang racket/base
-
-(require rackunit rackunit/text-ui unstable/logging)
-
-(run-tests
- (test-suite "logging.rkt"
-   (test-case "start/stop-recording"
-     (let ([l (start-recording 'warning)])
-       (log-warning "1")
-       (log-warning "2")
-       (log-warning "3")
-       (log-info "4")
-       (stop-recording l) ; stopping should be idempotent
-       (let ([out (stop-recording l)])
-         (check-equal? (map (lambda (l) (vector-ref l 1)) out)
-                       '("1" "2" "3"))
-         (check-true (andmap (lambda (l) (eq? (vector-ref l 0) 'warning))
-                             out)))))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/macro-testing.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/macro-testing.rkt
deleted file mode 100644
index f4206fb147..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/macro-testing.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-(require rackunit)
-
-(define ns (make-base-namespace))
-(eval '(require unstable/macro-testing) ns)
-
-(define-check (check-expand/eval term)
-  ;; Checks that term expands w/o error, and that expanded form is writable...
-  (check-not-exn (lambda () (format "~s" (parameterize ((current-namespace ns)) (expand term)))))
-  ;; ...then checks that term evals raising an error.
-  (check-exn (lambda _ #t) (lambda () (eval term ns))))
-
-(test-case "convert-*-error"
-  (check-expand/eval '(convert-syntax-error (lambda)))
-  (check-expand/eval '(convert-compile-time-error (lambda)))
-  ;; syntax exn for term with unsealed intdefctx:
-  (check-expand/eval '(convert-syntax-error (let () (define x) x)))
-  (check-expand/eval '(convert-compile-time-error (let () (define x) x))))
-
-(test-case "phase1-eval"
-  (eval '(require (for-syntax racket racket/struct-info)) ns)
-  (eval '(struct point (x y)) ns)
-  (define ct-expr '(extract-struct-info (syntax-local-value #'point)))
-  (check-pred list? (eval `(phase1-eval ,ct-expr) ns))
-  (check-pred syntax? (eval `(phase1-eval ,ct-expr #:quote quote-syntax) ns)))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/markparam.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/markparam.rkt
deleted file mode 100644
index 3f86aa6ee6..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/markparam.rkt
+++ /dev/null
@@ -1,129 +0,0 @@
-#lang racket
-(require unstable/markparam
-         racket/serialize
-         tests/eli-tester)
-
-(define x (mark-parameter))
-(define y (mark-parameter))
-(test
- (mark-parameter? x)
- (mark-parameter? (deserialize (serialize x)))
- (deserialize (serialize x)) => x
- 
- (apply eq? (deserialize (serialize (list x x))))
- 
- #:failure-prefix "empty"
- (mark-parameterize 
-  ()
-  (test 
-   (x) => #f
-   (mark-parameter-first x) => #f
-   (mark-parameter-first y) => #f
-   (mark-parameter-all x) => empty
-   (mark-parameter-all y) => empty
-   (mark-parameters-all (list x)) => empty
-   (mark-parameters-all (list y)) => empty
-   (mark-parameters-all (list x y)) => empty))
- 
- #:failure-prefix "x 1"
- (mark-parameterize 
-  ([x 1])
-  (test
-   (x) => 1
-   (mark-parameter-first x) => 1
-   (mark-parameter-first y) => #f
-   (mark-parameter-all x) => (list 1)
-   (mark-parameter-all y) => empty
-   (mark-parameters-all (list x)) => (list (vector 1))
-   (mark-parameters-all (list y)) => empty
-   (mark-parameters-all (list x y)) => (list (vector 1 #f))
-   (mark-parameters-all (list x y) 20) => (list (vector 1 20))))
- 
- #:failure-prefix "x 2 > x 1"
- (mark-parameterize 
-  ([x 2])
-  (mark-parameterize 
-   ([x 1])
-   (test
-    (mark-parameter-first x) => 1
-    (mark-parameter-first y) => #f
-    (mark-parameter-all x) => (list 1)
-    (mark-parameter-all y) => empty
-    (mark-parameters-all (list x)) => (list (vector 1))
-    (mark-parameters-all (list y)) => empty
-    (mark-parameters-all (list x y)) => (list (vector 1 #f))
-    (mark-parameters-all (list x y) 20) => (list (vector 1 20)))))
- 
- #:failure-prefix "x 2 > list > x 1"
- (mark-parameterize 
-  ([x 2])
-  (list
-   (mark-parameterize 
-    ([x 1])
-    (test
-     (mark-parameter-first x) => 1
-     (mark-parameter-first y) => #f
-     (mark-parameter-all x) => (list 1 2)
-     (mark-parameter-all y) => empty
-     (mark-parameters-all (list x)) => (list (vector 1) (vector 2))
-     (mark-parameters-all (list y)) => empty
-     (mark-parameters-all (list x y)) => (list (vector 1 #f) (vector 2 #f))
-     (mark-parameters-all (list x y) 20) => (list (vector 1 20) (vector 2 20))))))
- 
- #:failure-prefix "x 2 > list > x 1"
- (mark-parameterize 
-  ([x 2])
-  (list
-   (mark-parameterize 
-    ([x 1])
-    (test
-     (mark-parameter-first x) => 1
-     (mark-parameter-first y) => #f
-     (mark-parameter-all x) => (list 1 2)
-     (mark-parameter-all y) => empty
-     (mark-parameters-all (list x)) => (list (vector 1) (vector 2))
-     (mark-parameters-all (list y)) => empty
-     (mark-parameters-all (list x y)) => (list (vector 1 #f) (vector 2 #f))
-     (mark-parameters-all (list x y) 20) => (list (vector 1 20) (vector 2 20))))))
- 
-  #:failure-prefix "x 2 > list > y 1"
- (mark-parameterize 
-  ([x 2])
-  (list
-   (mark-parameterize 
-    ([y 1])
-    (test
-     (mark-parameter-first x) => 2
-     (mark-parameter-first y) => 1
-     (mark-parameter-all x) => (list 2)
-     (mark-parameter-all y) => (list 1)
-     (mark-parameters-all (list x)) => (list (vector 2))
-     (mark-parameters-all (list y)) => (list (vector 1))
-     (mark-parameters-all (list x y)) => (list (vector #f 1) (vector 2 #f))
-     (mark-parameters-all (list x y) 20) => (list (vector 20 1) (vector 2 20))))))
- 
- #:failure-prefix "x 1 y 2"
- (mark-parameterize 
-  ([x 1] [y 2])
-  (test
-   (mark-parameter-first x) => 1
-   (mark-parameter-first y) => 2
-   (mark-parameter-all x) => (list 1)
-   (mark-parameter-all y) => (list 2)
-   (mark-parameters-all (list x)) => (list (vector 1))
-   (mark-parameters-all (list y)) => (list (vector 2))
-   (mark-parameters-all (list x y)) => (list (vector 1 2))
-   (mark-parameters-all (list x y) 20) => (list (vector 1 2))))
- 
- #:failure-prefix "x 1 y x"
- (mark-parameterize 
-  ([x 1] [y (mark-parameter-first x)])
-  (test
-   (mark-parameter-first x) => 1
-   (mark-parameter-first y) => #f
-   (mark-parameter-all x) => (list 1)
-   (mark-parameter-all y) => (list #f)
-   (mark-parameters-all (list x)) => (list (vector 1))
-   (mark-parameters-all (list y)) => (list (vector #f))
-   (mark-parameters-all (list x y)) => (list (vector 1 #f))
-   (mark-parameters-all (list x y) 20) => (list (vector 1 #f)))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/match.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/match.rkt
deleted file mode 100644
index 59966edc60..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/match.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket
-
-(require unstable/match rackunit rackunit/text-ui "helpers.rkt")
-
-(run-tests
- (test-suite "match.rkt"
-   (test-suite "match?"
-     (test
-      (check-true (match? (list 1 2 3)
-                    (list a b c)
-                    (vector x y z))))
-     (test
-      (check-true (match? (vector 1 2 3)
-                    (list a b c)
-                    (vector x y z))))
-     (test
-      (check-false (match? (+ 1 2 3)
-                     (list a b c)
-                     (vector x y z)))))
-   (test-suite "as"
-     (test
-      (match (list 1 2 3)
-        [(as ([a 0]) (list b c d)) (list a b c d)])
-      (list 0 1 2 3)))
-   (test-suite "match*?"
-     (test
-      (check-true (match*? (1 2 3)
-                    (a b c)
-                    (#f y z))))
-     (test
-      (check-true (match*? (1 2 3)
-                    (a b #f)
-                    (x y z))))
-     (test
-      (check-false (match*? (1 2 3)
-                     (a #f c)
-                     (#f y z)))))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/options.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/options.rkt
deleted file mode 100644
index b496ece537..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/options.rkt
+++ /dev/null
@@ -1,2083 +0,0 @@
-#lang racket
-
-
-(require rackunit rackunit/text-ui unstable/options)
-
-
-(define-syntax-rule (test-pass test-name expr) 
-  (test-case test-name (check-pass expr)))
-
-(define-syntax-rule (check-pass expr)
-  (check-not-exn (λ () expr)))
-
-(define-syntax-rule (test-fail test-name expr error-msg) 
-  (test-case test-name (check-fail expr error-msg)))
-
-(define-syntax-rule (check-fail expr error-msg)
-  (check-exn (λ (exn)
-               (and
-                (exn:fail? exn)
-                (regexp-match?
-                 (regexp-quote error-msg)
-                 (exn-message exn))))
-             (λ () expr)))
-
-
-(define-syntax test-contract-fail
-  (syntax-rules ()
-    [(test-contract-fail test-name expr error-msg)
-     (test-case test-name (check-contract-fail expr error-msg))]
-    [(test-contract-fail test-name  expr error-msg extra-msg)
-     (test-case test-name 
-                (check-contract-fail expr error-msg extra-msg))]))
-
-
-(define-syntax check-contract-fail
-  (syntax-rules ()
-    [(check-contract-fail expr error-msg)
-     (check-exn (λ (exn)
-                  (and (exn:fail? exn)
-                       (has-proper-blame? error-msg (exn-message exn))))
-                (λ () expr))]
-    [(check-contract-fail expr error-msg extra-msg)
-     (check-exn (λ (exn)
-                  (and (exn:fail? exn)
-                       (has-proper-blame? error-msg (exn-message exn) extra-msg)))
-                (λ () expr))]))
-
-(define (has-proper-blame? blame msg [extra ""])
-  (define options-preface 
-    (regexp-quote "blaming multiple parties:"))
-  (define (multi-blame->regexp blame)
-    (foldr 
-     (λ (fst rst) (string-append (format "\n  ~a" fst) rst))
-     ""
-     blame))
-  (define reg
-    (cond
-      [(string? blame) (string-append "blaming: " (regexp-quote blame))]
-      [(list? blame)  (string-append
-                       options-preface
-                       (multi-blame->regexp blame))]
-      [else #f]))
-  (define extra-reg (regexp-quote extra))
-  (and reg (regexp-match? reg msg) (regexp-match? extra-reg msg)))
-
-
-(define-syntax-rule (script e ...)
-  (parameterize ([current-namespace (make-base-namespace)])
-    (namespace-require '(for-syntax racket/base))
-    (eval 'e) ...))
-
-
-(run-tests
- (test-suite "options.rkt"
-             
-             
-             (test-suite "options"
-                         
-                         (test-suite "option/c"
-                                     
-                                     (test-contract-fail 
-                                      "failed tester"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec 
-                                                    (option/c
-                                                     any/c
-                                                     #:tester sorted?)]))
-                                         (define vec (vector 1 3 2 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (require 'server))
-                                      "server"
-                                      "option contract tester")
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c with misbehaving tester (indy)"
-                                      (script
-                                       (module ctc racket
-                                         (require unstable/options)
-                                         (provide indy-ctc)
-                                         (define indy-ctc
-                                           (option/c
-                                            (-> number? number?)
-                                            #:tester (λ (f) (f 'foo)))))
-                                       (module server racket
-                                         (require unstable/options)
-                                         (require 'ctc)
-                                         (provide (contract-out [f indy-ctc]))
-                                         (define f values))
-                                       (require 'server))
-                                      "ctc")
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c no invariant but immutable"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (option/c 
-                                                         any/c
-                                                         #:immutable #t)]))
-                                         (define vec (vector 1 2 3 4 5)))
-                                       (require 'server))
-                                      "server"
-                                      "an invariant keyword argument (based on presence of other keyword arguments)")
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c no invariant but flat"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (option/c 
-                                                         any/c
-                                                         #:flat? #t)]))
-                                         (define vec (vector 1 2 3 4 5)))
-                                       (require 'server))
-                                      "server"
-                                      "an invariant keyword argument (based on presence of other keyword arguments)")
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c no invariant but flat and immutable"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (option/c 
-                                                         any/c
-                                                         #:flat? #t
-                                                         #:immutable #t)]))
-                                         (define vec (vector 1 2 3 4 5)))
-                                       (require 'server))
-                                      "server"
-                                      "an invariant keyword argument (based on presence of other keyword arguments)")  
-                                     
-                                     (test-pass
-                                      "passes with option/c on function with keyword arguments"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [f (option/c 
-                                                       (-> number? #:more number? number?))]))
-                                         (define (f x #:more y) y))
-                                       (require unstable/options)
-                                       (require 'server)
-                                       (f 2 #:more 3)
-                                       ((exercise-option f) 2 #:more 3))) 
-                                     
-                                     (test-pass
-                                      "passes with option/c on function with optional keyword arguments"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [f (option/c (->* (number?) (#:more number?) number?))]))
-                                         (define (f x #:more [y 3]) y))
-                                       (require unstable/options)
-                                       (require 'server)
-                                       (f 2)
-                                       (f 2 #:more 4)
-                                       ((exercise-option f) 2 #:more 4)
-                                       ((exercise-option f) 2))) 
-                                     
-                                     (test-pass
-                                      "passes with option/c on function with case-lambda"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [f (option/c (case-> 
-                                                                 (-> number? number? number?)
-                                                                 (-> number? number?)))]))
-                                         (define f (case-lambda 
-                                                     [(lo hi) (max lo hi)]
-                                                     [(single) single])))
-                                       (require unstable/options)
-                                       (require 'server)
-                                       (f 2)
-                                       (f 2 4)
-                                       ((exercise-option f) 2 4)
-                                       ((exercise-option f) 2))) 
-                                     
-                                     (test-contract-fail
-                                      "fails with option/c on function with case-lambda"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [f (option/c (case-> 
-                                                                 (-> number? number? number?)
-                                                                 (-> number? number?)))]))
-                                         (define f (case-lambda 
-                                                     [(lo hi) (max lo hi)]
-                                                     [(single) single])))
-                                       (require unstable/options)
-                                       (require 'server)
-                                       (f 2)
-                                       (f 2 4)
-                                       ((exercise-option f) 2 "boo")
-                                       ((exercise-option f) 2))
-                                      "top-level") 
-                                     
-                                     (test-pass
-                                      "passes with option/c with invariant and flat and immutable"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (option/c 
-                                                         any/c
-                                                         #:invariant values
-                                                         #:flat? #t
-                                                         #:immutable #t)]))
-                                         (define vec #(1 2 3 4 5)))
-                                       (require 'server))) 
-                                     
-                                     (test-contract-fail
-                                      "failed derived invariant/c (immutable) "
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (option/c 
-                                                         any/c
-                                                         #:invariant values
-                                                         #:immutable #t)]))
-                                         (define vec (vector 1 2 3 4 5)))
-                                       (module client racket
-                                         (require unstable/options)
-                                         (require 'server)
-                                         (exercise-option vec))
-                                       (require 'client))
-                                      "server") 
-                                     
-                                     (test-contract-fail
-                                      "failed derived invariant/c (procedure) "
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [f (option/c 
-                                                       any/c
-                                                       #:invariant values)]))
-                                         (define f values))
-                                       (module client racket
-                                         (require unstable/options)
-                                         (require 'server)
-                                         (exercise-option f))
-                                       (require 'client))
-                                      "server")
-                                     
-                                     (test-fail 
-                                      "failed option/c for struct (unbound struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (option/c 
-                                                       any/c
-                                                       #:struct boo)]))
-                                         (struct foo (a b))
-                                         (define s (foo 2 2)))
-                                       (require 'server))
-                                      "expected a struct identifier") 
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c for struct (missing struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (option/c any/c)]))
-                                         (struct foo (a b))
-                                         (define s (foo 2 2)))
-                                       (require 'server))
-                                      "server"
-                                      "a vector or a hash") 
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c for struct (wrong struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (option/c 
-                                                       any/c
-                                                       #:struct boo)]))
-                                         (struct foo (a b))
-                                         (struct boo (a b))
-                                         (define s (foo 2 2)))
-                                       (require 'server))
-                                      "server"
-                                      "a struct of type boo")  
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c for struct (vector for struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (option/c 
-                                                       any/c
-                                                       #:struct foo)]))
-                                         (struct foo (a b))
-                                         (define s (vector 2 2)))
-                                       (require 'server))                                      
-                                      "server"
-                                      "a struct of type foo"))         
-                         
-                         (test-suite "option/c with contract"
-                                     
-                                     (test-pass
-                                      "passes with simple procedure contract"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo 
-                                                                 (option/c
-                                                                  (-> number? number?)
-                                                                  #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (require 'server)
-                                       (boo 42)))
-                                     
-                                     (test-contract-fail
-                                      "fails (negative) with simple procedure contract"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo 
-                                                                 (option/c
-                                                                  (-> number? number?)
-                                                                  #:with-contract #t)]))
-                                         (define (boo x) 42))
-                                       (require 'server)
-                                       (boo 'wrong))
-                                      "top-level")
-                                     
-                                     (test-contract-fail
-                                      "fails (positive) with simple procedure contract"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo 
-                                                                 (option/c
-                                                                  (-> number? number?)
-                                                                  #:with-contract #t)]))
-                                         (define (boo x) 'wrong))
-                                       (require unstable/options 'server)
-                                       (boo 42))
-                                      "server")
-                                     
-                                     (test-contract-fail 
-                                      "failed tester"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec 
-                                                    (option/c
-                                                     any/c
-                                                     #:with-contract #t
-                                                     #:tester sorted?)]))
-                                         (define vec (vector 1 3 2 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (require 'server))
-                                      "server"
-                                      "option contract tester")
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c with misbehaving tester (indy)"
-                                      (script
-                                       (module ctc racket
-                                         (require unstable/options)
-                                         (provide indy-ctc)
-                                         (define indy-ctc
-                                           (option/c
-                                            (-> number? number?)
-                                            #:with-contract #t 
-                                            #:tester (λ (f) (f 'foo)))))
-                                       (module server racket
-                                         (require unstable/options)
-                                         (require 'ctc)
-                                         (provide (contract-out [f indy-ctc]))
-                                         (define f values))
-                                       (require 'server))
-                                      "ctc")
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c no invariant but immutable"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (option/c 
-                                                         any/c
-                                                         #:with-contract #t
-                                                         #:immutable #t)]))
-                                         (define vec (vector 1 2 3 4 5)))
-                                       (require 'server))
-                                      "server"
-                                      "an invariant keyword argument (based on presence of other keyword arguments)")
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c no invariant but flat"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (option/c 
-                                                         any/c
-                                                         #:with-contract #t
-                                                         #:flat? #t)]))
-                                         (define vec (vector 1 2 3 4 5)))
-                                       (require 'server))
-                                      "server"
-                                      "an invariant keyword argument (based on presence of other keyword arguments)")
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c no invariant but flat and immutable"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (option/c 
-                                                         any/c
-                                                         #:flat? #t
-                                                         #:with-contract #t
-                                                         #:immutable #t)]))
-                                         (define vec (vector 1 2 3 4 5)))
-                                       (require 'server))
-                                      "server"
-                                      "an invariant keyword argument (based on presence of other keyword arguments)")  
-                                     
-                                     (test-pass
-                                      "passes with option/c on function with keyword arguments"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [f (option/c 
-                                                       (-> number? #:more number? number?)
-                                                       #:with-contract #t)]))
-                                         (define (f x #:more y) y))
-                                       (require unstable/options)
-                                       (require 'server)
-                                       (f 2 #:more 3)
-                                       ((exercise-option f) 2 #:more 3))) 
-                                     
-                                     (test-pass
-                                      "passes with option/c on function with optional keyword arguments"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [f (option/c
-                                                       (->* (number?) (#:more number?) number?)
-                                                       #:with-contract #t)]))
-                                         (define (f x #:more [y 3]) y))
-                                       (require unstable/options)
-                                       (require 'server)
-                                       (f 2)
-                                       (f 2 #:more 4)
-                                       ((exercise-option f) 2 #:more 4)
-                                       ((exercise-option f) 2))) 
-                                     
-                                     (test-pass
-                                      "passes with option/c on function with case-lambda"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [f (option/c 
-                                                       (case-> 
-                                                        (-> number? number? number?)
-                                                        (-> number? number?))
-                                                       #:with-contract #t)]))
-                                         (define f (case-lambda 
-                                                     [(lo hi) (max lo hi)]
-                                                     [(single) single])))
-                                       (require unstable/options)
-                                       (require 'server)
-                                       (f 2)
-                                       (f 2 4)
-                                       ((exercise-option f) 2 4)
-                                       ((exercise-option f) 2))) 
-                                     
-                                     (test-contract-fail
-                                      "fails with option/c on function with case-lambda"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [f (option/c
-                                                       (case-> 
-                                                        (-> number? number? number?)
-                                                        (-> number? number?))
-                                                       #:with-contract #t)]))
-                                         (define f (case-lambda 
-                                                     [(lo hi) (max lo hi)]
-                                                     [(single) single])))
-                                       (require unstable/options)
-                                       (require 'server)
-                                       (f 2 "boo"))
-                                      "top-level") 
-                                     
-                                     (test-pass
-                                      "passes with option/c with invariant and flat and immutable"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (option/c 
-                                                         any/c
-                                                         #:with-contract #t
-                                                         #:invariant values
-                                                         #:flat? #t
-                                                         #:immutable #t)]))
-                                         (define vec #(1 2 3 4 5)))
-                                       (require 'server))) 
-                                     
-                                     (test-contract-fail
-                                      "failed derived invariant/c (immutable) "
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (option/c 
-                                                         any/c
-                                                         #:with-contract #t
-                                                         #:invariant values
-                                                         #:immutable #t)]))
-                                         (define vec (vector 1 2 3 4 5)))
-                                       (require 'server))
-                                      "server") 
-                                     
-                                     (test-contract-fail
-                                      "failed derived invariant/c (procedure) "
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [f (option/c 
-                                                       any/c
-                                                       #:with-contract #t
-                                                       #:invariant values)]))
-                                         (define f values))
-                                       (require 'server))
-                                      "server")
-                                     
-                                     (test-fail 
-                                      "failed option/c for struct (unbound struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (option/c 
-                                                       any/c
-                                                       #:with-contract #t
-                                                       #:struct boo)]))
-                                         (struct foo (a b))
-                                         (define s (foo 2 2)))
-                                       (require 'server))
-                                      "expected a struct identifier") 
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c for struct (missing struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (option/c any/c #:with-contract #t)]))
-                                         (struct foo (a b))
-                                         (define s (foo 2 2)))
-                                       (require 'server))
-                                      "server"
-                                      "a vector or a hash") 
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c for struct (wrong struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (option/c 
-                                                       any/c
-                                                       #:struct boo
-                                                       #:with-contract #t)]))
-                                         (struct foo (a b))
-                                         (struct boo (a b))
-                                         (define s (foo 2 2)))
-                                       (require 'server))
-                                      "server"
-                                      "a struct of type boo")  
-                                     
-                                     (test-contract-fail 
-                                      "failed option/c for struct (vector for struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (option/c 
-                                                       any/c
-                                                       #:struct foo               
-                                                       #:with-contract #t)]))
-                                         (struct foo (a b))
-                                         (define s (vector 2 2)))
-                                       (require 'server))                                      
-                                      "server"
-                                      "a struct of type foo"))
-                         
-                         (test-suite "transfer/c"
-                                     
-                                     (test-pass
-                                      "passes after two transfers"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       (boo 1)))
-                                     
-                                     (test-pass
-                                      "passes after two transfers (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo 
-                                                                 (option/c 
-                                                                  (-> number? number?)
-                                                                  #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       (boo 1)))
-                                     
-                                     
-                                     
-                                     (test-contract-fail
-                                      "fails (positive) after one transfer (with-contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo 
-                                                                 (option/c
-                                                                  (-> number? number?)
-                                                                  #:with-contract #t)]))
-                                         (define (boo x) 'wrong))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require 'client)
-                                       (displayln (boo 42))
-                                       (boo 42))
-                                      (list "client" "server"))
-                                     
-                                     (test-contract-fail
-                                      "fails (negative) after one transfer (with-contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo 
-                                                                 (option/c
-                                                                  (-> number? number?)
-                                                                  #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require 'client)
-                                       (boo 'wrong))
-                                      (list "top-level" "client"))
-                                     
-                                     (test-contract-fail
-                                      "fails (positive) after two transfers (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo 
-                                                                 (option/c 
-                                                                  (-> number? number?)
-                                                                  #:with-contract #t)]))
-                                         (define (boo x) 'wrong))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       (boo 1))
-                                      (list "middle1" "middle0" "server")) 
-                                     
-                                     (test-contract-fail
-                                      "fails (negative) after two transfers (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo 
-                                                                 (option/c 
-                                                                  (-> number? number?)
-                                                                  #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       (boo 'wrong))
-                                      (list "top-level" "middle1" "middle0"))
-                                     
-                                     (test-pass
-                                      "passes after void transfer"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo transfer/c]))
-                                         (define (boo x) x))
-                                       (require 'server)))
-                                     
-                                     (test-pass
-                                      "passes after void client's transfer"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (-> number? number?)]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require 'client)
-                                       (boo 42)))
-                                     
-                                     (test-pass
-                                      "passes after void client's transfer after exercise"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         (define e-boo (exercise-option boo))
-                                         (provide (contract-out [e-boo transfer/c])))
-                                       (require 'client)
-                                       (e-boo 42)))
-                                     
-                                     (test-pass
-                                      "passes after void client's transfer after exercise (with-contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         (define e-boo (exercise-option boo))
-                                         (provide (contract-out [e-boo transfer/c])))
-                                       (require 'client)
-                                       (e-boo 42)))
-                                     
-                                     (test-contract-fail
-                                      "fails (positive-ho) after three transfers and exercise (with-contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo 
-                                                                 (option/c
-                                                                 (-> number? number?)
-                                                                 #:with-contract #t)]
-                                                                [bar (-> transfer/c number?)]))
-                                         (define (boo x) 'wrong)
-                                         (define (bar f) ((exercise-option f) 42)))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c]
-                                                                [bar transfer/c])))
-                                       (module client1 racket
-                                         (require unstable/options 'client)
-                                         (provide (contract-out [boo transfer/c]
-                                                                [bar transfer/c])))                                      
-                                       (require 'client1)
-                                       (bar boo))
-                                      (list "client" "client1" "client" "server"))
-                                     
-                                     (test-contract-fail
-                                      "fails (negative-ho) after three transfers and exercise (with-contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo 
-                                                                 (option/c
-                                                                 (-> number? number?)
-                                                                 #:with-contract #t)]
-                                                                [bar (-> transfer/c number?)]))
-                                         (define (boo x) 'wrong)
-                                         (define (bar f) ((exercise-option f) 'wrong)))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c]
-                                                                [bar transfer/c])))
-                                       (module client1 racket
-                                         (require unstable/options 'client)
-                                         (provide (contract-out [boo transfer/c]
-                                                                [bar transfer/c])))                                      
-                                       (require 'client1)
-                                       (bar boo))
-                                      (list "server" "top-level" "client1" "client"))) 
-                         
-                         (test-suite "exercise-option"
-                                     
-                                     (test-pass
-                                      "passes after two transfers and exercise"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       ((exercise-option boo) 1)))
-                                     
-                                     (test-contract-fail
-                                      "positive contract failure after successful transfer and exercise"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) "wrong!"))
-                                       (module middle racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module client racket
-                                         (require unstable/options 'middle)
-                                         ((exercise-option boo) 42))
-                                       (require 'client))
-                                      (list "middle" "server"))   
-                                     
-                                     (test-contract-fail
-                                      "negative contract failure after successful transfer and exercise"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module middle racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module client racket
-                                         (require unstable/options 'middle)
-                                         ((exercise-option boo) "wrong!"))
-                                       (require 'client))
-                                      (list "client" "middle"))   
-                                     
-                                     (test-pass
-                                      "passes after void exercise"
-                                      (script
-                                       (require unstable/options)
-                                       (define (boo x) x)
-                                       (exercise-option boo)))
-                                     
-                                     (test-contract-fail
-                                      "passes after exercise after succesful exercise"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         ((exercise-option (exercise-option boo)) "error"))
-                                       (require 'client))
-                                      "client")
-                                     
-                                     (test-pass
-                                      "passes after transfer after succesful exercise"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         (define e-boo (exercise-option boo))
-                                         (provide (contract-out [e-boo transfer/c])))
-                                       (require 'client)))
-                                     
-                                     
-                                     (test-pass
-                                      "passes after two transfers and exercise (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       ((exercise-option boo) 1)))
-                                     
-                                     (test-contract-fail
-                                      "positive contract failure after successful transfer and exercise (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c 
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) "wrong!"))
-                                       (module middle racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module client racket
-                                         (require unstable/options 'middle)
-                                         ((exercise-option boo) 42))
-                                       (require 'client))
-                                      (list "middle" "server"))   
-                                     
-                                     (test-contract-fail
-                                      "negative contract failure after successful transfer and exercise (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c 
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module middle racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module client racket
-                                         (require unstable/options 'middle)
-                                         ((exercise-option boo) "wrong!"))
-                                       (require 'client))
-                                      (list "client" "middle"))   
-                                     
-                                     
-                                     (test-contract-fail
-                                      "passes after exercise after succesful exercise (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c 
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         ((exercise-option (exercise-option boo)) "error"))
-                                       (require 'client))
-                                      "client")
-                                     
-                                     (test-pass
-                                      "passes after transfer after succesful exercise (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c 
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         (define e-boo (exercise-option boo))
-                                         (provide (contract-out [e-boo transfer/c])))
-                                       (require 'client))))
-                         
-                         
-                         (test-suite "waive-option"
-                                     
-                                     (test-pass
-                                      "passes after two transfers and waive"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       ((waive-option boo) 1)))
-                                     
-                                     
-                                     (test-pass
-                                      "passes after waive"
-                                      (script
-                                       (require unstable/options)
-                                       (define (boo x) x)
-                                       (waive-option boo)))
-                                     
-                                     (test-pass
-                                      "passes after waive after succesful waive"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (require unstable/options 'server)
-                                       ((waive-option (waive-option boo)) "error")))
-                                     
-                                     (test-contract-fail
-                                      "fails with waive after succesful exercise"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         ((waive-option (exercise-option boo)) "error"))
-                                       (require 'client))
-                                      "client")
-                                     
-                                     (test-pass
-                                      "passes with transfer after succesful waive"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         (define e-boo (waive-option boo))
-                                         (provide (contract-out [e-boo transfer/c])))
-                                       (require 'client)))
-                                     
-                                     (test-pass
-                                      "passes after two transfers and waive (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       ((waive-option boo) 1)))          
-                                     
-                                     
-                                     (test-pass
-                                      "passes after waive after succesful waive (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c 
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (require unstable/options 'server)
-                                       ((waive-option (waive-option boo)) "error")))
-                                     
-                                     (test-contract-fail
-                                      "fails with waive after succesful exercise (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c 
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         ((waive-option (exercise-option boo)) "error"))
-                                       (require 'client))
-                                      "client")
-                                     
-                                     (test-pass
-                                      "passes with transfer after succesful waive (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c 
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         (define e-boo (waive-option boo))
-                                         (provide (contract-out [e-boo transfer/c])))
-                                       (require 'client))))
-                         
-                         (test-suite "tweak-option"
-                                     
-                                     (test-pass
-                                      "passes after two transfers and tweak"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       ((tweak-option boo) 1)))
-                                     
-                                     (test-contract-fail
-                                      "fails (negative) after two transfers and tweak"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       ((tweak-option boo) 'wrong))
-                                      (list "top-level" "middle1" "middle0"))
-                                     
-                                     (test-contract-fail
-                                      "fails (positive) after two transfers and tweak"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) 'wrong))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       ((tweak-option boo) 42))
-                                      (list "middle1" "middle0" "server"))
-                                     
-                                     (test-contract-fail 
-                                      "fails (negative) two transfers and tweak"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       ((tweak-option boo) 42)
-                                       ((tweak-option boo) 'wrong))
-                                      (list "top-level" "middle1" "middle0"))
-                                     
-                                     (test-pass
-                                      "passes after two transfers and tweak (with-contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c 
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module middle0 racket
-                                         (require unstable/options 'server)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (module middle1 racket
-                                         (require unstable/options 'middle0)
-                                         (provide (contract-out [boo transfer/c])))
-                                       (require unstable/options 'middle1)
-                                       ((tweak-option boo) 1)))
-                                     
-                  
-                                     (test-pass
-                                      "passes after tweak"
-                                      (script
-                                       (require unstable/options)
-                                       (define (boo x) x)
-                                       (tweak-option boo)))
-                                     
-                                     (test-pass
-                                      "fails after tweak after succesful tweak"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (require unstable/options 'server)
-                                       ((tweak-option (tweak-option boo)) "error")))
-                                     
-                                     (test-contract-fail
-                                      "fails after tweak after succesful tweak (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c 
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (require unstable/options 'server)
-                                       ((tweak-option (tweak-option boo)) "error"))
-                                      "top-level")
-                                      
-                                     
-                                     (test-contract-fail
-                                      "fails with tweak after succesful exercise"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         ((tweak-option (exercise-option boo)) "error"))
-                                       (require 'client))
-                                      "client")
-                                     
-                                     (test-contract-fail
-                                      "fails with exercise after tweak exercise"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c (-> number? number?))]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         ((exercise-option (tweak-option boo)) "error"))
-                                       (require 'client))
-                                      "client")
-                                     
-                                     (test-contract-fail
-                                      "fails with exercise after tweak exercise (with contract)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out [boo (option/c 
-                                                                      (-> number? number?)
-                                                                      #:with-contract #t)]))
-                                         (define (boo x) x))
-                                       (module client racket
-                                         (require unstable/options 'server)
-                                         ((exercise-option (tweak-option boo)) "error"))
-                                       (require 'client))
-                                      "client")))
-             
-             
-             
-             
-             (test-suite "invariant/c"
-                         
-                         (test-suite "general"
-                                     
-                                     (test-contract-fail
-                                      "failed invariant/c on invalid kind of data"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [f (invariant/c 
-                                                       any/c
-                                                       values)]))
-                                         (define f (λ (x) x)))
-                                       (require 'server))
-                                      "server"
-                                      "a vector or a hash")
-                                     
-                                     (test-contract-fail
-                                      "failed invariant/c because of misbehaving invariant (indy)"
-                                      (script
-                                       (module ctc racket
-                                         (require unstable/options)
-                                         (provide  indy-ctc)
-                                         (define (sorted? vec)
-                                           (vector-set! vec 1 'a)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel)))
-                                         (define indy-ctc
-                                           (invariant/c (vectorof number?) sorted?)))
-                                       (module server racket
-                                         (require unstable/options)
-                                         (require 'ctc)
-                                         (provide (contract-out 
-                                                   [vec indy-ctc]))
-                                         (define vec (vector 1 2 3 4 5)))
-                                       (require 'server))
-                                      "ctc"))                   
-                         
-                         
-                         
-                         (test-suite "vectors"
-                                     
-                                     (test-pass 
-                                      "passes with invariant for vector"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (invariant/c 
-                                                         any/c
-                                                         sorted?)]))
-                                         (define vec (vector 1 2 3 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (require 'server)))
-                                     
-                                     (test-contract-fail 
-                                      "failed invariant for vector"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (invariant/c 
-                                                         any/c
-                                                         sorted?)]))
-                                         (define vec (vector 1 3 2 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (require 'server))
-                                      "server"
-                                      "expected vector that satisfies")
-                                     
-                                     (test-contract-fail 
-                                      "failed underlying vector/c contract"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (invariant/c 
-                                                         (vectorof number?)
-                                                         sorted?)
-                                                        ]))
-                                         (define vec (vector 1 'foo 3 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (require 'server))
-                                      "server") 
-                                     
-                                     (test-contract-fail 
-                                      "failed immutable invariant/c for vector"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (invariant/c 
-                                                         any/c
-                                                         sorted?
-                                                         #:immutable #t)]))
-                                         (define vec (vector 1 2 3 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (require 'server))
-                                      "server"
-                                      "immutable data")
-                                     
-                                     (test-contract-fail 
-                                      "failed mutable invariant/c for vector"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (invariant/c 
-                                                         any/c
-                                                         sorted?
-                                                         #:immutable #f)]))
-                                         (define vec #(1 2 3 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (require 'server))
-                                      "server"
-                                      "mutable data")
-                                     
-                                     
-                                     (test-pass 
-                                      "passes with immutable invariant/c for vector"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (invariant/c 
-                                                         any/c
-                                                         sorted?
-                                                         #:immutable #t)]))
-                                         (define vec #(1 2 3 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (require 'server)))
-                                     
-                                     (test-pass 
-                                      "passes with mutable invariant/c for vector"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (invariant/c 
-                                                         any/c
-                                                         sorted?
-                                                         #:immutable #f)]))
-                                         (define vec (vector 1 2 3 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (require 'server)))
-                                     
-                                     (test-pass 
-                                      "passes with mutable flat invariant/c for vector"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (invariant/c 
-                                                         any/c
-                                                         sorted?
-                                                         #:immutable #f
-                                                         #:flat? #t)]))
-                                         (define vec (vector 1 2 3 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (require 'server)))
-                                     
-                                     (test-pass 
-                                      "passes with mutation on mutable flat invariant/c for vector"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (invariant/c 
-                                                         any/c
-                                                         sorted?
-                                                         #:immutable #f
-                                                         #:flat? #t)]))
-                                         (define vec (vector 1 2 3 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (module client racket
-                                         (require unstable/options)
-                                         (require 'server)
-                                         (vector-set! vec 1 10))
-                                       (require 'client)))
-                                     
-                                     (test-contract-fail 
-                                      "failed mutation on mutable invariant/c for vector"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [vec (invariant/c 
-                                                         any/c
-                                                         sorted?
-                                                         #:immutable #f
-                                                         #:flat? #f)]))
-                                         (define vec (vector 1 2 3 4 5))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (module client racket
-                                         (require unstable/options)
-                                         (require 'server)
-                                         (vector-set! vec 1 10))
-                                       (require 'client))
-                                      "client"
-                                      "expected vector that satisfies")
-                                     
-                                     (test-contract-fail 
-                                      "failed read after callback mutation on mutable invariant/c for vector"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide
-                                          change
-                                          (contract-out 
-                                           [vec (invariant/c 
-                                                 any/c
-                                                 sorted?
-                                                 #:immutable #f
-                                                 #:flat? #f)]))
-                                         (define vec (vector 1 2 3 4 5))
-                                         (define (change) (vector-set! vec 1 10))
-                                         (define (sorted? vec)
-                                           (for/and ([el vec]
-                                                     [cel (vector-drop vec 1)])
-                                             (<= el cel))))
-                                       (module client racket
-                                         (require unstable/options)
-                                         (require 'server)
-                                         (change)
-                                         (vector-ref vec 2))
-                                       (require 'client))
-                                      "server"
-                                      "expected vector that satisfies"))
-                         
-                         
-                         (test-suite "hashes"
-                                     
-                                     (test-pass 
-                                      "passes with invariant for hash"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [h (invariant/c 
-                                                       any/c
-                                                       a-is-one)]))
-                                         (define h (hash 'a 1 'b 2 'c 3 'd 4 'd 5))
-                                         (define (a-is-one h)
-                                           (= (hash-ref h 'a) 1)))
-                                       (require 'server)))
-                                     
-                                     (test-contract-fail 
-                                      "failed invariant for hash"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [h (invariant/c 
-                                                       any/c
-                                                       a-is-one)]))
-                                         (define h (hash 'a 2 'b 2 'c 3 'd 4 'd 5))
-                                         (define (a-is-one h)
-                                           (= (hash-ref h 'a) 1)))
-                                       (require 'server))
-                                      "server"
-                                      "expected hash that satisfies")
-                                     
-                                     (test-contract-fail 
-                                      "failed underlying hash/c contract"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [h (invariant/c 
-                                                       (hash/c symbol? number?)
-                                                       a-is-one)]))
-                                         (define h (hash 'a 2 'b 'b 'c 3 'd 4 'd 5))
-                                         (define (a-is-one h)
-                                           (= (hash-ref h 'a) 1)))
-                                       (require 'server))
-                                      "server") 
-                                     
-                                     (test-contract-fail 
-                                      "failed immutable invariant/c for hash"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [h (invariant/c 
-                                                       (hash/c symbol? number?)
-                                                       a-is-one
-                                                       #:immutable #t)]))
-                                         (define h (make-hash (list (cons 'a 2) (cons 'b 2))))
-                                         (define (a-is-one h)
-                                           (= (hash-ref h 'a) 1)))
-                                       (require 'server))
-                                      "server"
-                                      "immutable data")
-                                     
-                                     (test-contract-fail 
-                                      "failed mutable invariant/c for hash"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [h (invariant/c 
-                                                       (hash/c symbol? number?)
-                                                       a-is-one
-                                                       #:immutable #f)]))
-                                         (define h (hash  'a 2 'b 2))
-                                         (define (a-is-one h)
-                                           (= (hash-ref h 'a) 1)))
-                                       (require 'server))
-                                      "server"
-                                      "mutable data")
-                                     
-                                     (test-pass 
-                                      "passes with immutable invariant/c for hash"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [h (invariant/c 
-                                                       (hash/c symbol? number?)
-                                                       a-is-one
-                                                       #:immutable #t)]))
-                                         (define h (hash  'a 1 'b 2))
-                                         (define (a-is-one h)
-                                           (= (hash-ref h 'a) 1)))
-                                       (require 'server)))
-                                     
-                                     (test-pass 
-                                      "passes with mutable invariant/c for hash"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [h (invariant/c 
-                                                       (hash/c symbol? number?)
-                                                       a-is-one
-                                                       #:immutable #f)]))
-                                         (define h (make-hash  (list (cons 'a 1) (cons 'b 2))))
-                                         (define (a-is-one h)
-                                           (= (hash-ref h 'a) 1)))
-                                       (require 'server))) 
-                                     
-                                     
-                                     (test-pass 
-                                      "passes with mutable flat invariant/c for hash"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [h (invariant/c 
-                                                       (hash/c symbol? number?)
-                                                       a-is-one
-                                                       #:flat? #t
-                                                       #:immutable #f)]))
-                                         (define h (make-hash  (list (cons 'a 1) (cons 'b 2))))
-                                         (define (a-is-one h)
-                                           (= (hash-ref h 'a) 1)))
-                                       (require 'server))) 
-                                     
-                                     (test-pass 
-                                      "passes with mutation on mutable flat invariant/c for hash"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [h (invariant/c 
-                                                       (hash/c symbol? number?)
-                                                       a-is-one
-                                                       #:flat? #t
-                                                       #:immutable #f)]))
-                                         (define h (make-hash  (list (cons 'a 1) (cons 'b 2))))
-                                         (define (a-is-one h)
-                                           (= (hash-ref h 'a) 1)))
-                                       (module client racket
-                                         (require unstable/options)
-                                         (require 'server)
-                                         (hash-set! h 'a 10))
-                                       (require 'client))) 
-                                     
-                                     
-                                     (test-contract-fail 
-                                      "failed mutation on mutable invariant/c for hash"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [h (invariant/c 
-                                                       (hash/c symbol? number?)
-                                                       a-is-one
-                                                       #:flat? #f
-                                                       #:immutable #f)]))
-                                         (define h (make-hash  (list (cons 'a 1) (cons 'b 2))))
-                                         (define (a-is-one h)
-                                           (= (hash-ref h 'a) 1)))
-                                       (module client racket
-                                         (require unstable/options)
-                                         (require 'server)
-                                         (hash-set! h 'a 10))
-                                       (require 'client))
-                                      "client"
-                                      "expected hash that satisfies")
-                                     
-                                     (test-contract-fail 
-                                      "failed read after callback mutation on mutable invariant/c for hash"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide
-                                          change
-                                          (contract-out 
-                                           [h (invariant/c 
-                                               (hash/c symbol? number?)
-                                               a-is-one
-                                               #:flat? #f
-                                               #:immutable #f)]))
-                                         (define h (make-hash  (list (cons 'a 1) (cons 'b 2))))
-                                         (define (change) (hash-set! h 'a 2))
-                                         (define (a-is-one h)
-                                           (= (hash-ref h 'a) 1)))
-                                       (module client racket
-                                         (require unstable/options)
-                                         (require 'server)
-                                         (change)
-                                         (hash-ref h 'b))
-                                       (require 'client))
-                                      "server"
-                                      "expected hash that satisfies"))
-                         
-                         (test-suite "structs"
-                                     
-                                     (test-pass 
-                                      "passes with invariant for struct"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide 
-                                          (contract-out 
-                                           [s (invariant/c 
-                                               any/c
-                                               a-is-one
-                                               #:struct foo)]))
-                                         (struct foo (a b))
-                                         (define s (foo 1 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server)))
-                                     
-                                     (test-contract-fail 
-                                      "failed invariant for struct"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (invariant/c 
-                                                       any/c
-                                                       a-is-one
-                                                       #:struct foo)]))
-                                         (struct foo (a b))
-                                         (define s (foo 2 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server))
-                                      "server"
-                                      "expected struct that satisfies")
-                                     
-                                     
-                                     (test-fail 
-                                      "failed invariant/c for struct (unbound struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (invariant/c 
-                                                       any/c
-                                                       a-is-one
-                                                       #:struct boo)]))
-                                         (struct foo (a b))
-                                         (define s (foo 2 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server))
-                                      "expected a struct identifier") 
-                                     
-                                     (test-contract-fail 
-                                      "failed invariant/c for struct (missing struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (invariant/c 
-                                                       any/c
-                                                       a-is-one)]))
-                                         (struct foo (a b))
-                                         (struct boo (a b))
-                                         (define s (foo 2 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server))
-                                      "server"
-                                      "a vector or a hash") 
-                                     
-                                     (test-contract-fail 
-                                      "failed invariant/c for struct (wrong struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (invariant/c 
-                                                       any/c
-                                                       a-is-one
-                                                       #:struct boo)]))
-                                         (struct foo (a b))
-                                         (struct boo (a b))
-                                         (define s (foo 2 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server))
-                                      "server"
-                                      "a struct of type boo")  
-                                     
-                                     (test-contract-fail 
-                                      "failed invariant/c for struct (vector for struct id)"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (invariant/c 
-                                                       any/c
-                                                       a-is-one
-                                                       #:struct foo)]))
-                                         (struct foo (a b))
-                                         (define s (vector 2 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server))
-                                      "server"
-                                      "a struct of type foo") 
-                                     
-                                     
-                                     (test-contract-fail 
-                                      "failed underlying struct/dc contract"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (invariant/c 
-                                                       (struct/dc foo [a number?] [b number?])
-                                                       a-is-one
-                                                       #:struct foo)]))
-                                         (struct foo (a b))
-                                         (define s (foo '3 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server))
-                                      "server") 
-                                     
-                                     (test-contract-fail 
-                                      "failed immutable invariant/c for struct"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (invariant/c 
-                                                       (struct/dc foo [a number?] [b number?])
-                                                       a-is-one
-                                                       #:immutable #t
-                                                       #:struct foo)]))
-                                         (struct foo (a b) #:mutable)
-                                         (define s (foo '3 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server))
-                                      "server"
-                                      "immutable data") 
-                                     
-                                     (test-contract-fail 
-                                      "failed mutable invariant/c for struct"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (invariant/c 
-                                                       (struct/dc foo [a number?] [b number?])
-                                                       a-is-one
-                                                       #:immutable #f
-                                                       #:struct foo)]))
-                                         (struct foo (a b))
-                                         (define s (foo '3 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server))
-                                      "server"
-                                      "mutable data") 
-                                     
-                                     (test-pass 
-                                      "passes with immutable invariant/c for struct"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (invariant/c 
-                                                       (struct/dc foo [a number?] [b number?])
-                                                       a-is-one
-                                                       #:immutable #t
-                                                       #:struct foo)]))
-                                         (struct foo (a b))
-                                         (define s (foo 1 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server))) 
-                                     
-                                     (test-pass 
-                                      "passes with mutable invariant/c for struct"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (invariant/c 
-                                                       (struct/dc foo [a number?] [b number?])
-                                                       a-is-one
-                                                       #:immutable #f
-                                                       #:struct foo)]))
-                                         (struct foo (a b) #:mutable)
-                                         (define s (foo 1 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server))) 
-                                     
-                                     (test-pass 
-                                      "passes with mutable flat invariant/c for struct"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide (contract-out 
-                                                   [s (invariant/c 
-                                                       (struct/dc foo [a number?] [b number?])
-                                                       a-is-one
-                                                       #:flat? #t
-                                                       #:immutable #f
-                                                       #:struct foo)]))
-                                         (struct foo (a b) #:mutable)
-                                         (define s (foo 1 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (require 'server)))                                                                        
-                                     
-                                     (test-pass 
-                                      "passes with mutation on mutable flat invariant/c for struct"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide 
-                                          set-foo-a!
-                                          (contract-out 
-                                           [s (invariant/c 
-                                               (struct/dc foo [a number?] [b number?])
-                                               a-is-one
-                                               #:flat? #t
-                                               #:immutable #f
-                                               #:struct foo)]))
-                                         (struct foo (a b) #:mutable)
-                                         (define s (foo 1 2))
-                                         (define (a-is-one s)
-                                           (= (foo-a s) 1)))
-                                       (module client racket
-                                         (require unstable/options)
-                                         (require 'server)
-                                         (set-foo-a! s 10))
-                                       (require 'client)))                                              
-                                     
-                                     
-                                     (test-contract-fail 
-                                      "failed mutation on mutable invariant/c for struct"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide 
-                                          set-foo-a!
-                                          foo-b
-                                          (contract-out 
-                                           [s (invariant/c 
-                                               (struct/dc foo [a (-> any/c number?)] [b number?])
-                                               a-is-one
-                                               #:immutable #f
-                                               #:struct foo)]))
-                                         (struct foo (a b) #:mutable)
-                                         (define s (foo (λ (x) 1) 2))
-                                         (define (a-is-one s)
-                                           (= ((foo-a s) 'anything) 1)))
-                                       (module client racket
-                                         (require unstable/options)
-                                         (require 'server)
-                                         (set-foo-a! s (λ (x) 2))
-                                         (foo-b s))
-                                       (require 'client))    
-                                      "client"
-                                      "expected struct that satisfies")
-                                     
-                                     (test-contract-fail 
-                                      "failed mutation on mutable invariant/c for struct"
-                                      (script
-                                       (module server racket
-                                         (require unstable/options)
-                                         (provide 
-                                          change
-                                          foo-b
-                                          (contract-out 
-                                           [s (invariant/c 
-                                               (struct/dc foo [a (-> any/c number?)] [b number?])
-                                               a-is-one
-                                               #:immutable #f
-                                               #:struct foo)]))
-                                         (struct foo (a b) #:mutable)
-                                         (define s (foo (λ (x) 1) 2))
-                                         (define (change) (set-foo-a! s (λ (x) 2))) 
-                                         (define (a-is-one s)
-                                           (= ((foo-a s) 'anything) 1)))
-                                       (module client racket
-                                         (require unstable/options)
-                                         (require 'server)
-                                         (change)
-                                         (foo-b s))
-                                       (require 'client))    
-                                      "server"
-                                      "expected struct that satisfies")))))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/parameter-group.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/parameter-group.rkt
deleted file mode 100644
index b87654a4f1..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/parameter-group.rkt
+++ /dev/null
@@ -1,81 +0,0 @@
-#lang racket/base
-
-(require rackunit unstable/parameter-group)
-
-(define p1 (make-parameter 1))
-(define p2 (make-parameter 2))
-
-(define-parameter-group ps1 (p1 p2))
-
-(check-true (parameter-group? ps1))
-(check-equal? (ps1) (ps1-value 1 2))  
-(check-equal? (parameterize/group () (ps1)) (ps1))
-(check-equal? (parameterize*/group () (ps1)) (ps1))
-(check-equal? (parameterize/group ([ps1  (ps1-value 10 20)]) (ps1))
-              (ps1-value 10 20))
-(check-equal? (parameterize/group ([p1 10] [p2 20]) (ps1))
-              (ps1-value 10 20))
-(check-equal? (parameterize/group ([ps1  (ps1-value 10 20)]) (list (p1) (p2)))
-              (list 10 20))
-(check-equal? (ps1) (ps1-value 1 2))
-
-(check-exn exn:fail:contract? (λ () (ps1 (list 1 2 3))))
-(check-exn exn:fail:contract? (λ () (parameterize ([ps1  (list 1 2 3)]) (ps1))))
-
-(ps1 (ps1-value 10 20))
-
-(check-equal? (ps1) (ps1-value 10 20))
-(check-equal? (parameterize/group ([ps1  (ps1-value 1 2)]) (ps1))
-              (ps1-value 1 2))
-(check-equal? (parameterize/group ([p1 1] [p2 2]) (ps1))
-              (ps1-value 1 2))
-(check-equal? (parameterize/group ([ps1  (ps1-value 1 2)]) (list (p1) (p2)))
-              (list 1 2))
-(check-equal? (ps1) (ps1-value 10 20))
-
-(p1 1)
-(p2 2)
-
-(define p3 (make-parameter 3))
-
-(define-parameter-group ps2 (ps1 p3))
-
-(check-equal? (ps2) (ps2-value (ps1-value 1 2) 3))
-(check-equal? (parameterize/group ([ps2  (ps2-value (ps1-value 10 20) 30)]) (ps2))
-              (ps2-value (ps1-value 10 20) 30))
-(check-equal? (parameterize/group ([p1 10] [p2 20] [p3 30]) (ps2))
-              (ps2-value (ps1-value 10 20) 30))
-(check-equal? (parameterize/group ([ps2  (ps2-value (ps1-value 10 20) 30)]) (list (p1) (p2) (p3)))
-              (list 10 20 30))
-(check-equal? (ps2) (ps2-value (ps1-value 1 2) 3))
-
-(ps2 (ps2-value (ps1-value 10 20) 30))
-
-(check-equal? (ps2) (ps2-value (ps1-value 10 20) 30))
-(check-equal? (parameterize/group ([ps2  (ps2-value (ps1-value 1 2) 3)]) (ps2))
-              (ps2-value (ps1-value 1 2) 3))
-(check-equal? (parameterize/group ([p1 1] [p2 2] [p3 3]) (ps2))
-              (ps2-value (ps1-value 1 2) 3))
-(check-equal? (parameterize/group ([ps2  (ps2-value (ps1-value 1 2) 3)]) (list (p1) (p2) (p3)))
-              (list 1 2 3))
-(check-equal? (ps2) (ps2-value (ps1-value 10 20) 30))
-
-(p1 1)
-(p2 2)
-(p3 3)
-
-(check-equal? (parameterize/group ([ps1  (ps1-value 10 20)]
-                                   [ps2  (ps2-value (ps1) 30)])
-                                  (ps2))
-              (ps2-value (ps1-value 1 2) 30))
-
-(check-equal? (parameterize*/group ([ps1  (ps1-value 10 20)]
-                                    [ps2  (ps2-value (ps1) 30)])
-                                   (ps2))
-              (ps2-value (ps1-value 10 20) 30))
-
-(check-equal? (ps1-value-p1 (ps1)) 1)
-(check-equal? (ps1-value-p2 (ps1)) 2)
-(check-equal? (ps1-value-p1 (ps2-value-ps1 (ps2))) 1)
-(check-equal? (ps1-value-p2 (ps2-value-ps1 (ps2))) 2)
-(check-equal? (ps2-value-p3 (ps2)) 3)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/planet-syntax.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/planet-syntax.rkt
deleted file mode 100644
index bbb1757589..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/planet-syntax.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang racket
-
-(require mzlib/etc
-         rackunit
-         rackunit/text-ui
-         planet/syntax
-         "helpers.rkt")
-
-(define here
-  (datum->syntax
-   #f 'here
-   (list (build-path (this-expression-source-directory)
-                     (this-expression-file-name))
-         1 1 1 1)))
-
-(run-tests
- (test-suite "planet-syntax.rkt"
-
-   (test-suite "syntax-source-planet-package"
-     (test-case "fail"
-       (check-equal? (syntax-source-planet-package (datum->syntax #f 'fail))
-                     #f)))
-
-   (test-suite "syntax-source-planet-package-owner"
-     (test-case "fail"
-       (check-equal? (syntax-source-planet-package-owner
-                      (datum->syntax #f 'fail))
-                     #f)))
-
-   (test-suite "syntax-source-planet-package-name"
-     (test-case "fail"
-       (check-equal? (syntax-source-planet-package-name
-                      (datum->syntax #f 'fail))
-                     #f)))
-
-   (test-suite "syntax-source-planet-package-major"
-     (test-case "fail"
-       (check-equal? (syntax-source-planet-package-major
-                      (datum->syntax #f 'fail))
-                     #f)))
-
-   (test-suite "syntax-source-planet-package-minor"
-     (test-case "fail"
-       (check-equal? (syntax-source-planet-package-minor
-                      (datum->syntax #f 'fail))
-                     #f)))
-
-   (test-suite "syntax-source-planet-package-symbol"
-     (test-case "fail"
-       (check-equal? (syntax-source-planet-package-minor
-                      (datum->syntax #f 'fail))
-                     #f)))
-
-   (test-suite "make-planet-path")))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/sequence.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/sequence.rkt
deleted file mode 100644
index f73614da88..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/sequence.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-
-(require rackunit rackunit/text-ui unstable/sequence)
-
-(run-tests
- (test-suite "sequence.rkt"
-  (check-equal? (for/list ([x (sequence-lift add1 (in-range 10))])
-                  x)
-                '(1 2 3 4 5 6 7 8 9 10))
-  (check-equal? (for/list ([x (sequence-lift 
-                               + (in-parallel (in-range 10) (in-range 10)))])
-                  x)
-                '(0 2 4 6 8 10 12 14 16 18))
-  (check-equal? (for/list ([x (in-sequence-forever (in-range 5) 5)]
-                           [y (in-range 10)])
-                  x)
-                '(0 1 2 3 4 5 5 5 5 5))
-  (check-equal? (for/list ([(x y) (in-pairs '((1 . 1) (2 . 2) (3 . 3)))])
-                  (+ x y))
-                '(2 4 6))   
-  (check-true (sequence? (in-slice 1 '())))
-  (check-equal? '() (for/list ([v (in-slice 1 '())]) v))
-  (check-equal? '((0 1)) (for/list ([v (in-slice 3 (in-range 2))]) v))
-  (check-equal? '((0 1 2) (3 4 5))
-                (for/list ([v (in-slice 3 (in-range 6))]) v))
-  (check-equal? '((0 1 2) (3 4 5) (6 7))
-                (for/list ([v (in-slice 3 (in-range 8))]) v))
-  (check-exn exn:fail:contract?
-             (lambda () (for/list ([x (in-slice 0 (in-range 8))]) x)))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/set.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/set.rkt
deleted file mode 100644
index 341207b456..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/set.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket
-
-(require rackunit rackunit/text-ui racket/set "helpers.rkt")
-
-(define (check/set a-set a-list
-                   #:= [== equal?]
-                   #:< [< symbol<?])
-  (check/sort (set->list a-set) a-list #:= == #:< <))
-
-(define-syntax-rule (test/set arg ...)
-  (test (check/set arg ...)))
-
-(run-tests
- (test-suite "set.rkt"
-   (test-suite "Conversions"
-     (test-suite "list->set"
-       (test/set (list->set (list 'a 'b 'c)) (list 'a 'b 'c))
-       (test/set (list->set (list 'c 'b 'a)) (list 'a 'b 'c)))
-     (test-suite "list->seteq"
-       (test/set (list->seteq (list 'a 'b 'c)) (list 'a 'b 'c))
-       (test/set (list->seteq (list 'c 'b 'a)) (list 'a 'b 'c)))
-     (test-suite "list->seteqv"
-       (test/set (list->seteqv (list 'a 'b 'c)) (list 'a 'b 'c))
-       (test/set (list->seteqv (list 'c 'b 'a)) (list 'a 'b 'c)))
-     (test-suite "set->list"
-       (test (check/sort (set->list (set 1 2 3)) (list 1 2 3) #:< <))))
-   (test-suite "Comparisons"
-     (test-suite "set=?"
-       (test (check-false (set=? (set 1) (set 1 2 3))))
-       (test (check-false (set=? (set 1 2 3) (set 1))))
-       (test (check-true (set=? (set 1 2 3) (set 1 2 3)))))
-     (test-suite "proper-subset?"
-       (test (check-true (proper-subset? (set 1) (set 1 2 3))))
-       (test (check-false (proper-subset? (set 1 2 3) (set 1))))
-       (test (check-false (proper-subset? (set 1 2 3) (set 1 2 3))))))
-   (test-suite "Combinations"
-     (test-suite "set-symmetric-difference"
-       (test/set (set-symmetric-difference (set 1) (set 1 2) (set 1 2 3)) (list 1 3) #:< <)
-       (test/set (set-symmetric-difference (set 1) (set 2) (set 3)) (list 1 2 3) #:< <)
-       (test/set (set-symmetric-difference (set 1 2) (set 2 3) (set 1 3)) (list) #:< <)))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/socket.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/socket.rkt
deleted file mode 100644
index d4fcb8ce2c..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/socket.rkt
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang racket
-(require racket/port
-         rackunit
-         unstable/socket)
-
-(define (call-in-custodian proc)
-  (parameterize ((current-subprocess-custodian-mode 'kill))
-    (parameterize ((current-custodian (make-custodian)))
-      (call-with-continuation-barrier
-       (lambda ()
-         (dynamic-wind void
-                       proc
-                       (lambda ()
-                         (custodian-shutdown-all (current-custodian)))))))))
-
-;; Commands for creating socket listeners
-;;  - netcat is commonly available, but cannot use Linux abstract namespace
-;;  - socat can use Linux abstract namespace, but is less common
-;; So use netcat for path test and socat for abstract-name test.
-
-(define netcat
-  (for/first ([netcat '("/bin/nc" "/usr/bin/nc")]
-              #:when (and (file-exists? netcat)
-                          (memq 'execute (file-or-directory-permissions netcat))))
-    netcat))
-
-(define socat
-  (for/first ([socat '("/usr/bin/socat")]
-              #:when (and (file-exists? socat)
-                          (memq 'execute (file-or-directory-permissions socat))))
-    socat))
-
-(define-check (check-comm msg out in)
-  (write-bytes msg out)
-  (flush-output out)
-  (check-equal? (sync/timeout 1 (read-bytes-evt (bytes-length msg) in))
-                msg))
-
-(define (close-ports . ports)
-  (for ([port ports])
-    (cond [(input-port? port) (close-input-port port)]
-          [(output-port? port) (close-output-port port)])))
-
-;; Test path-based socket
-
-(cond
- [(and unix-socket-available? netcat)
-  (test-case "unix socket"
-    ;; Uses netcat to create a simple unix domain socket server
-    (define tmp ((values make-temporary-file)))
-    (delete-file tmp)
-    (call-in-custodian
-     (lambda ()
-       (define-values (ncprocess ncout ncin ncerr)
-         (subprocess #f #f #f netcat "-Ul" (path->string tmp)))
-       (sleep 0.5)
-       (define-values (from-sock to-sock)
-         (unix-socket-connect tmp))
-       (check-comm #"hello" to-sock ncout)
-       (check-comm #"charmed" ncin from-sock)
-       (check-comm #"well\ngoodbye, then" to-sock ncout)
-       (close-ports to-sock from-sock)
-       (close-ports ncin ncout ncerr)
-       (or (sync/timeout 1 ncprocess)
-           (subprocess-kill ncprocess))
-       ))
-    (when (file-exists? tmp) (delete-file tmp)))]
- [else
-  (printf "cannot test unix sockets: ~a\n"
-          (if netcat
-              "unix sockets not supported"
-              "netcat not found"))])
-
-;; Test Linux abstract name socket
-
-(cond
- [(and unix-socket-available? socat)
-  (test-case "unix socket w/ abstract name"
-    ;; Uses socat to create a simple unix domain socket server
-    (call-in-custodian
-     (lambda ()
-       (define name #"TestRacketABC")
-       (define-values (ncprocess ncout ncin ncerr)
-         (subprocess #f #f #f socat (format "ABSTRACT-LISTEN:~a" name) "STDIO"))
-       (sleep 0.5)
-       (define-values (from-sock to-sock)
-         (unix-socket-connect (bytes-append #"\0" name)))
-       (check-comm #"hello" to-sock ncout)
-       (check-comm #"charmed" ncin from-sock)
-       (check-comm #"well\ngoodbye, then" to-sock ncout)
-       (close-ports to-sock from-sock)
-       (close-ports ncin ncout ncerr)
-       (or (sync/timeout 1 ncprocess)
-           (subprocess-kill ncprocess))
-       (void)
-       )))]
- [(not socat)
-  (printf "cannot test unix sockets w/ abstract namespace: socat not found\n")])
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/syntax.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/syntax.rkt
deleted file mode 100644
index 76da3f8065..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/syntax.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket
-
-(require mzlib/etc
-         rackunit
-         rackunit/text-ui
-         racket/syntax
-         (for-syntax unstable/syntax)
-         unstable/syntax
-         "helpers.rkt")
-
-(define here
-  (datum->syntax
-   #f 'here
-   (list (build-path (this-expression-source-directory)
-                     (this-expression-file-name))
-         1 1 1 1)))
-
-(run-tests
- (test-suite "syntax.rkt"
-
-   (test-suite "Syntax Source Locations"
-
-     (test-suite "syntax-source-file-name"
-       (test-case "here"
-         (check-equal? (syntax-source-file-name here)
-                       (this-expression-file-name)))
-       (test-case "fail"
-         (check-equal? (syntax-source-file-name (datum->syntax #f 'fail))
-                       #f)))
-
-     (test-suite "syntax-source-directory"
-       (test-case "here"
-         (check-equal? (syntax-source-directory here)
-                       (this-expression-source-directory)))
-       (test-case "fail"
-         (check-equal? (syntax-source-directory (datum->syntax #f 'fail))
-                       #f))))
-
-   (test-suite "Pattern Bindings"
-
-     (test-suite "with-syntax*"
-       (test-case "identifier"
-         (check bound-identifier=?
-                (with-syntax* ([a #'id] [b #'a]) #'b)
-                #'id))))
-
-   (let ()
-     (define-syntax a #'a)
-     (define-syntax b #'b)
-     (define-syntax c #'(a b c))
-     (define-syntax c1 (car (syntax->list (syntax-local-value #'c))))
-     (define-syntax c2 (cadr (syntax->list (syntax-local-value #'c))))
-     (define-syntax (*syntax-within? stx)
-       (syntax-case stx ()
-         [(_ x y)
-          #`#,(syntax-within? (syntax-local-value #'x)
-                              (syntax-local-value #'y))]))
-     (test-suite "syntax-within?"
-                 (test-case "reflexive"
-                            (check-equal? (*syntax-within? a a) #t))
-                 (test-case "unrelated"
-                            (check-equal? (*syntax-within? a b) #f))
-                 (test-case "child"
-                            (check-equal? (*syntax-within? c1 c) #t))
-                 (test-case "parent"
-                            (check-equal? (*syntax-within? c c1) #f))
-                 (test-case "sibling"
-                            (check-equal? (*syntax-within? c2 c1) #f))))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/bench-affine.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/bench-affine.rkt
deleted file mode 100644
index e8ac15f4ca..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/bench-affine.rkt
+++ /dev/null
@@ -1,85 +0,0 @@
-#lang racket
-
-; The code
-(define (raw f)
-  (f (λ () (void))))
-
-(define (client seed use-affine)
-  (random-seed seed)
-  (use-affine
-   (λ (f)
-     (define used? #f)
-     (for ([i (in-range 10000)])
-       (sync (alarm-evt (random 100)))
-       (unless (or used? (zero? (random 3)))
-         (set! used? #t)
-         (f))))))
-
-(define (bad-client use-affine)
-  (use-affine
-   (λ (f)
-     (f)
-     (f))))
-
-; The benchmarks
-(define ctc
-  (contract
-   (-> (-> (-> any/c) any/c) any/c)
-   raw 'pos 'neg))
-
-(define aff->
-  (make-contract
-   #:name 'affine
-   #:first-order procedure?
-   #:projection
-   (λ (b)
-     (λ (f)
-       (define called? #f)
-       (λ ()
-         (when called?
-           (raise-blame-error b f "called twice!"))
-         (set! called? #t)
-         (define x (f))
-         x)))))
-(define ad-hoc
-  (contract
-   (-> (-> aff-> any/c) any/c)
-   raw 'pos 'neg))
-
-(require unstable/temp-c/dsl)
-(define (rgx)
-  (contract
-   (with-monitor 
-    (-> (-> (label 'affine (-> any/c)) any/c) any/c)
-    (complement
-     (seq (star _)
-          (call 'affine)
-          (star _)
-          (call 'affine))))
-   raw 'pos 'neg))
-
-; The runner
-(require tests/stress)
-(define seed (+ 1 (random (expt 2 30))))
-(define-syntax-rule (STRESS version ...)
-  (begin
-    (with-handlers ([exn? (λ (x) (void))])
-      (bad-client version)
-      (printf "~a does not fail when it should\n" 'version))
-    ...
-    (with-handlers ([exn? (λ (x) 
-                            (printf "~a fails when it should not\n" 'version))])
-      (client seed version))
-    ...
-    (newline)
-    (stress 4 
-            [(format "~a" 'version)
-             (client seed version)]
-            ...)))
-
-(STRESS raw ctc ad-hoc (rgx))
-
-
-(module+ test
-  (module config info
-    (define random? #t)))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/bench.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/bench.rkt
deleted file mode 100644
index 9ae7b2695c..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/bench.rkt
+++ /dev/null
@@ -1,97 +0,0 @@
-#lang racket/base
-
-(module raw-sort racket
-  (define (insert <= e l)
-    (cond
-      [(empty? l)
-       (list e)]
-      [(<= e (first l))
-       (list* e l)]
-      [else
-       (list* (first l)
-              (insert <= e (rest l)))]))
-  (define (sort <= l)
-    (if (empty? l)
-        empty
-        (insert <= (first l)
-                (sort <= (rest l)))))
-  (provide sort))
-
-(module ctc-sort racket
-  (require (submod ".." raw-sort))
-  (provide/contract
-   [sort (-> (-> any/c any/c boolean?)
-             (listof any/c)
-             (listof any/c))]))
-
-(module qdsl-sort racket
-  (require unstable/temp-c/dsl (submod ".." raw-sort) unstable/match)
-  (provide make-sort)
-  (define (make-sort)
-    (contract
-     (with-monitor (label 'sort (-> (label 'order (-> any/c any/c boolean?))
-                                    (listof any/c)
-                                    (listof any/c)))
-       (complement
-        (seq (star _) 
-             (dseq
-              (monitor:proj 'order proj _)
-              (seq (star _)
-                   (monitor:return 'sort _ _ _ _ _ _ _) (star _)
-                   (monitor:call 'order (== proj) _ _ _ _ _))))))
-     sort 'pos 'neg)))
-
-(module dsl-sort racket
-  (require unstable/temp-c/dsl (submod ".." raw-sort))
-  (provide make-sort)
-  (define (make-sort)
-    (contract (with-monitor (label 'sort (-> (label 'order (-> any/c any/c boolean?))
-                                             (listof any/c)
-                                             (listof any/c)))
-                (complement
-                 (seq (star _)
-                      (monitor:proj 'order _ _) (star _)
-                      (monitor:return 'sort _ _ _ _ _ _ _) (star _)
-                      (monitor:call 'order _  _ _ _ _ _))))
-              sort
-              'pos 'neg)))
-
-(module smart-sort racket
-  (require unstable/temp-c/monitor (submod ".." raw-sort))
-  (define returned? #f)
-  (define (sort-monitor evt)
-    (match evt
-      [(monitor:proj 'order proj _)
-       #t]
-      [(monitor:return 'sort _ _ _ _ _ (list f _) _)
-       (set! returned? #t)]
-      [(monitor:call 'order proj _ _ _ _ _)
-       (not returned?)]
-      [_ #t]))
-  (provide/contract
-   [sort (monitor/c sort-monitor 'sort
-                    (-> (monitor/c sort-monitor 'order (-> any/c any/c boolean?))
-                        (listof any/c)
-                        (listof any/c)))]))
-
-(module sort-timer racket
-  (require (prefix-in dsl: (submod ".." dsl-sort))
-           (prefix-in qdsl: (submod ".." qdsl-sort))
-           (prefix-in smart: (submod ".." smart-sort))
-           (prefix-in raw: (submod ".." raw-sort))
-           (prefix-in ctc: (submod ".." ctc-sort))
-           tests/stress)
-  
-  (define l (build-list 200 (compose random add1)))
-  (stress 1
-          ["raw" (raw:sort <= l)]
-          ["ctc" (ctc:sort <= l)]
-          ["qdsl" ((qdsl:make-sort) <= l)]
-          ["dsl" ((dsl:make-sort) <= l)]
-          ["smart" (smart:sort <= l)]))
-
-(require 'sort-timer)
-
-(module+ test
-  (module config info
-    (define random? #t)))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/dr-err-help.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/dr-err-help.rkt
deleted file mode 100644
index 122c85fc6b..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/dr-err-help.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require syntax/parse
-         (for-template racket/base))
-
-(define-syntax-class sre 
-  #:attributes (machine)
-  
-  (pattern pat:expr
-           #:attr machine
-           #'1))
-
-(provide sre)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/dr-err.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/dr-err.rkt
deleted file mode 100644
index c077d00280..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/dr-err.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/load
-(module re racket/base
-  (require (for-syntax syntax/parse
-                       racket/base
-                       tests/unstable/temp-c/dr-err-help))
-  
-  (define-syntax (re stx)
-    (syntax-parse
-     stx
-     [(_ the-re:sre)
-      (attribute the-re.machine)]))
-  
-  (re _))
-
-(require 're)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-con.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-con.rkt
deleted file mode 100644
index a48283f8ba..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-con.rkt
+++ /dev/null
@@ -1,51 +0,0 @@
-#lang racket
-(require unstable/temp-c/dsl
-         tests/eli-tester)
-
-(define count 0)
-(define (evil? v)
-  (define nc (add1 count))
-  (sleep (random))
-  (set! count nc)
-  #t)
-
-(define (test-spec spec)
-  (define (f g) g)
-  (define f/c (contract spec f 'pos 'neg))
-  
-  (define x #f)
-  (define (body)
-    (with-handlers ([exn? (λ (e) (set! x e))])
-      (f/c 1)))
-  (define t1
-    (thread body))
-  (define t2
-    (thread body))
-  
-  (thread-wait t1)
-  (thread-wait t2)
-  (when x
-    (raise x)))
-
-(define-syntax-rule (dupe r c K T)
-  (begin (define r (with-monitor K T))
-         (define c (with-monitor K #:concurrent T))))
-
-(dupe Race Concurrent
-      (label 'f (number? . -> . number?))
-      (seq (monitor:proj 'f _ _)
-           (star (union (call 'f (? evil?))
-                        (ret 'f _)))))
-
-(test
- #:failure-prefix "Race"
- (test
-  (set! count 0)
-  (test-spec Race)
-  ; This 1 represents the presence of the race
-  count => 1)
- #:failure-prefix "Concurrent"
- (test
-  (set! count 0)
-  (test-spec Concurrent)
-  count => 2))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-dsl.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-dsl.rkt
deleted file mode 100644
index b21176d581..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-dsl.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang racket
-(require unstable/temp-c/dsl
-         tests/eli-tester)
-
-(define (test-spec spec f)
-  (define i 0)
-  (define MallocFreeImpl
-    (cons (λ () (begin0 i (set! i (add1 i))))
-          (λ (a) (void))))
-  (define MallocFreeProt
-    (contract spec MallocFreeImpl
-              'pos 'neg))
-  
-  (match-define (cons malloc free) MallocFreeProt)
-  (f malloc free))
-
-(define (good malloc free)
-  (define a (malloc))
-  (free a)
-  (define e (malloc))
-  (define f (malloc))
-  (free e)
-  (free f)
-  (define c (malloc))
-  (define d (malloc))
-  (free d)
-  (free c))
-
-(define (bad malloc free)
-  (define b (malloc))
-  (free b)
-  (free b))
-
-(define addr? number?)
-
-(define NoFreeSpec
-  (with-monitor 
-      (cons/c (label 'malloc (-> addr?))
-              (label 'free (-> addr? void?)))
-    ; It is okay as long as you never call free
-    (complement (seq (star _) (call 'free _) (star _)))))
-(test (test-spec NoFreeSpec good) =error> "disallowed"
-      (test-spec NoFreeSpec bad) =error> "disallowed")
-
-(define NoFreeTwiceSpec
-  (with-monitor 
-      (cons/c (label 'malloc (-> addr?))
-              (label 'free (-> addr? void?)))
-    (complement (seq (star _) (call 'free _) (star _) (call 'free _) (star _)))))
-(test (test-spec NoFreeTwiceSpec good) =error> "disallowed"
-      (test-spec NoFreeTwiceSpec bad) =error> "disallowed")
-
-(define MallocFreeBalancedSpec
-  (with-monitor 
-      (cons/c (label 'malloc (-> addr?))
-              (label 'free (-> addr? void?)))
-    (star 
-     (seq (call 'malloc)
-          (ret 'malloc _)
-          (call 'free _)
-          (ret 'free _)))))
-(test (test-spec MallocFreeBalancedSpec good) =error> "disallowed" 
-      (test-spec MallocFreeBalancedSpec bad) =error> "disallowed")
-
-(define MallocFreeSpec
-  (with-monitor 
-      (cons/c (label 'malloc (-> addr?))
-              (label 'free (-> addr? void?)))
-    (complement (seq (star _)
-                     (call 'free _)
-                     (star (not (ret 'malloc _)))
-                     (call 'free _)))))
-(test (test-spec MallocFreeSpec good) =error> "disallowed" 
-      (test-spec MallocFreeSpec bad) =error> "disallowed")
-
-(define MallocFreeSpecNQ
-  (with-monitor 
-      (cons/c (label 'malloc (-> addr?))
-              (label 'free (-> addr? void?)))
-    (complement 
-     (seq (star _)
-          (call 'free x)
-          (star (not (ret 'malloc x)))
-          (call 'free x)))))
-(test (test-spec MallocFreeSpecNQ good) =error> "disallowed" 
-      (test-spec MallocFreeSpecNQ bad) =error> "disallowed")
-
-(require unstable/match)
-(define MallocFreeSpecQ
-  (with-monitor 
-      (cons/c (label 'malloc (-> addr?))
-              (label 'free (-> addr? void?)))
-    (complement 
-     (seq (star _)
-          (dseq (call 'free addr)
-                (seq
-                 (star (not (ret 'malloc (== addr))))
-                 (call 'free (== addr))))))))
-(test (test-spec MallocFreeSpecQ good)
-      (test-spec MallocFreeSpecQ bad) =error> "disallowed")
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-lock.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-lock.rkt
deleted file mode 100644
index 6f973d9ebe..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-lock.rkt
+++ /dev/null
@@ -1,125 +0,0 @@
-#lang racket/load
-
-#| This file is an attempt to show a different style of monitor
-   that doesn't record the event trace, but rather records the
-   pertinent information.
-|#
-
-(module lock racket
-  (require unstable/temp-c/monitor)
-  (define (use-resource f)
-    (define (protect label g)
-      (contract (monitor/c monitor label (-> void)) g
-                'pos 'neg))
-    
-    (define locked? #f)
-    (define returned? #f)
-    (define (monitor evt)
-      (match evt
-        [(monitor:return 'user _ _ app _ _ _ _)
-         (set! returned? #t)]
-        [(monitor:return 'lock p  _ _ _ _ _ _)
-         (set! locked? #t)]
-        [(monitor:return 'unlock p _ _ _ _ _ _)
-         (set! locked? #f)]
-        [_
-         (void)])
-      (and
-       (match evt
-         ; Must not lock or unlock twice
-         [(monitor:call 'lock p _ _ _ _ _)
-          (not locked?)]
-         [(monitor:call 'unlock p _ _ _ _ _)
-          locked?]
-         ; Must not use resource unless locked
-         [(monitor:call 'use p _ _ _ _ _)
-          locked?]
-         ; Otherwise, okay
-         [_
-          #t])
-       ; Must not use anything after return
-       (match evt
-         [(monitor:call 'lock p _ _ _ _ _)
-          (not returned?)]
-         [(monitor:call 'unlock p _ _ _ _ _)
-          (not returned?)]
-         [(monitor:call 'use p _ _ _ _ _)
-          (not returned?)]
-         ; Otherwise, okay
-         [_
-          #t])))
-    
-    ((contract (monitor/c monitor 'user any/c) f
-               'pos 'neg)
-     (protect 'lock (λ () (void)))
-     (protect 'use (λ () (void)))
-     (protect 'unlock (λ () (void)))))
-  
-  (provide/contract
-   [use-resource
-    (-> (-> (-> void) (-> void) (-> void)
-            any/c)
-        any/c)]))
-
-(module tester racket
-  (require tests/eli-tester
-           'lock)
-  (test
-   (use-resource
-    (λ (lock use unlock)
-      (lock) (use) (unlock)
-      (lock) (use) (use) (unlock)))
-   =>
-   (void)
-   
-   (use-resource
-    (λ (lock use unlock)
-      (lock) (use) (unlock)
-      (use-resource
-       (λ (lock1 use1 unlock1)
-         ; Note out of order unlocking
-         (lock1) (lock)
-         (use) (use1)
-         (unlock1) (unlock)))
-      (lock) (use) (use) (unlock)))
-   =>
-   (void)
-   
-   (use-resource
-    (λ (lock use unlock)
-      (use)))
-   =error>
-   "disallowed"
-   
-   (use-resource
-    (λ (lock use unlock)
-      (lock) (use) (unlock) (unlock)))
-   =error>
-   "disallowed"
-   
-   (use-resource
-    (λ (lock use unlock)
-      (lock) (lock)))
-   =error>
-   "disallowed"
-   
-   (use-resource
-    (λ (lock use unlock)
-      (lock) (unlock) (use)))
-   =error>
-   "disallowed"
-   
-   ((use-resource (λ (lock use unlock) lock)))
-   =error>
-   "disallowed"
-   
-   ((use-resource (λ (lock use unlock) use)))
-   =error>
-   "disallowed"
-   
-   ((use-resource (λ (lock use unlock) unlock)))
-   =error>
-   "disallowed"
-   ))
-
-(require 'tester)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias-a.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias-a.rkt
deleted file mode 100644
index 10a344974f..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias-a.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket
-(require unstable/temp-c/dsl
-         unstable/match)
-
-(define memory%
-  (class object%
-    (super-new)
-    (define/public (malloc) 1)
-    (define/public (free n) (void))))
-
-(provide/contract
- [memory%
-  (with-monitor
-      (class/c [malloc (label 'malloc (->m number?))]
-               [free (label 'free (->m number? void))])
-    (complement
-     (seq (star _)
-          (dseq (call 'free _ addr)
-                (seq
-                 (star (not (ret 'malloc (== addr))))
-                 (call 'free _ (== addr)))))))])
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias-b.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias-b.rkt
deleted file mode 100644
index e846b5f446..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias-b.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket
-(require tests/eli-tester
-         "ex-matthias-a.rkt")
-
-(define memory (new memory%))
-
-(define a (send memory malloc))
-(test
- (send memory free a)
- (send memory free a) =error> #rx"disallowed call")
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias-ctc.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias-ctc.rkt
deleted file mode 100644
index 081e477f18..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias-ctc.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/load
-(module a racket  
-  (define memory%
-    (class object%
-      (super-new)
-      (define/public (malloc) 1)
-      (define/public (free n) (void))))
-  
-  (provide/contract
-   [memory%
-    (class/c [malloc (->m number?)]
-             [free (->m number? void)])]))
-
-(module b racket
-  (require 'a tests/eli-tester)
-  
-  (define memory (new memory%))
-  
-  (define a (send memory malloc))
-  (test
-   (send memory free a) 
-   (send memory free "foo") =error> #rx"expected: number\\?"
-   (send memory free a)))
-
-(require 'b)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias.rkt
deleted file mode 100644
index 526f69b80b..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-matthias.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/load
-(module a racket
-  (require unstable/temp-c/dsl
-           unstable/match)
-  
-  (define memory%
-    (class object%
-      (super-new)
-      (define/public (malloc) 1)
-      (define/public (free n) (void))))
-  
-  (provide/contract
-   [memory%
-    (with-monitor
-        (class/c [malloc (label 'malloc (->m number?))]
-                 [free (label 'free (->m number? void))])
-      (complement
-       (seq (star _)
-            (dseq (call 'free _ addr)
-                  (seq
-                   (star (not (ret 'malloc (== addr))))
-                   (call 'free _ (== addr)))))))]))
-
-(module b racket
-  (require 'a tests/eli-tester)
-  
-  (define memory (new memory%))
-  
-  (define a (send memory malloc))
-  (test
-   (send memory free a)
-   (send memory free a)
-   =error> #rx"disallowed call"))
-
-(require 'b)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-mem.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-mem.rkt
deleted file mode 100644
index 84e26ea46a..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-mem.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/load
-
-#| This file shows that we can still track some things without an "interval"
-|#
-
-(module mem racket
-  (require unstable/temp-c/monitor)
-  
-  (define free-list empty)
-  (define last-addr 0)
-  (define (malloc)
-    (if (empty? free-list)
-        (begin0 last-addr
-                (set! last-addr (add1 last-addr)))
-        (begin0 (first free-list)
-                (set! free-list (rest free-list)))))
-  (define (free addr)
-    (set! free-list (cons addr free-list)))
-  
-  (define allocated (make-weak-hasheq))
-  (define (mem-monitor evt)
-    ; Only allow freeing of allocated things, disallow double frees
-    ; and track addrs using malloc returns
-    (match evt
-      [(monitor:return 'malloc _ _ _ _ _ _ (list addr))
-       (hash-set! allocated addr #t)
-       #t]
-      [(monitor:call 'free _ _  _ _ _ (list addr))
-       (hash-has-key? allocated addr)]
-      [(monitor:return 'free _ _ _ _ _ (list addr) _)
-       (hash-remove! allocated addr)
-       #t]
-      [_
-       #t]))
-  
-  (provide/contract
-   [malloc (monitor/c mem-monitor 'malloc (-> number?))]
-   [free (monitor/c mem-monitor 'free (-> number? void))]))
-
-(module mem-test racket
-  (require tests/eli-tester
-           'mem)
-  (test
-   (malloc)
-   
-   (free (malloc))
-   
-   (free -1) =error> "disallow"
-   
-   (free (malloc))
-   
-   (let ([a (malloc)])
-     (free a)
-     (free a))
-   =error>
-   "disallow"))
-
-(require 'mem-test)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-memclass.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-memclass.rkt
deleted file mode 100644
index ee51cfb1c3..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ex-memclass.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/load
-
-#| This file shows that we can still track some things without an "interval"
-|#
-
-(module mem racket
-  (require unstable/temp-c/monitor)
-  (define heap%
-    (class object%
-      (define free-list empty)
-      (define last-addr 0)
-      (define/public (malloc)
-        (if (empty? free-list)
-            (begin0 last-addr
-                    (set! last-addr (add1 last-addr)))
-            (begin0 (first free-list)
-                    (set! free-list (rest free-list)))))
-      (define/public (free addr)
-        (set! free-list (cons addr free-list)))
-      
-      (super-new)))
-  
-  (define allocated (make-weak-hasheq))
-  (define (the-monitor evt)
-    ; Only allow freeing of allocated things, disallow double frees
-    ; and track addrs using malloc returns
-    (match evt
-      [(monitor:return 'malloc _ _ _ _ _ _ (list addr))
-       (hash-set! allocated addr #t)
-       #t]
-      [(monitor:call 'free _ _  _ _ _ (list _ addr))
-       (hash-has-key? allocated addr)]
-      [(monitor:return 'free _ _ _ _ _ (list _ addr) _)
-       (hash-remove! allocated addr)
-       #t]
-      [_
-       #t]))
-  
-  (provide/contract
-   [heap% 
-    (class/c 
-     [malloc (monitor/c the-monitor 'malloc (->m number?))]
-     [free (monitor/c the-monitor 'free (->m number? void))])]))
-
-(module mem-test racket
-  (require tests/eli-tester
-           'mem)
-  (define h (new heap%))
-  (test
-   (send h malloc)
-   
-   (send h free (send h malloc))
-   
-   (send h free -1) =error> "disallow"
-   
-   (send h free (send h malloc))
-   
-   (let ([a (send h malloc)])
-     (send h free a)
-     (send h free a))
-   =error>
-   "disallow"))
-
-(require 'mem-test)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/future-ctc.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/future-ctc.rkt
deleted file mode 100644
index e34d2fa1fd..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/future-ctc.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang racket
-(require unstable/temp-c/dsl
-         tests/eli-tester)
-
-(define manual-strange/c
-  (make-contract
-   #:name "amazing contract"
-   #:first-order procedure?
-   #:projection
-   (λ (b)
-     (λ (x)
-       (λ (f)
-         (define ready? #f)
-         (letrec-values
-             ([(? o) 
-               (x 
-                (λ (y)
-                  (cond
-                    [(not ready?)
-                     (raise-blame-error b x "cannot call until return")]
-                    [(not (? y))
-                     (raise-blame-error b x "expected a value of ~a" ?)]
-                    [else
-                     (f y)])))])
-           (set! ready? #t)
-           (values ? o)))))))
-
-(define hot-strange/c
-  (with-monitor
-      (label 'strange
-             (-> (label 'strategy
-                        (-> any/c ; The monitor will make it tighter
-                            any/c))
-                 (values (-> any/c boolean?)
-                         any/c)))
-    (complement
-     (union
-      ; You can't call strategy until strange returns
-      (seq (star _) (call 'strange _)
-           (star (not (ret 'strange _ _)))
-           (call 'strategy _))
-      ; You can't call strategy with something that violates the predicate
-      (seq (star _) (call 'strange _) (star _)
-           (dseq (ret 'strange predicate? _)
-                 (seq (star _)
-                      (call 'strategy (not (? predicate?))))))))))
-
-(define (try-it-out strange/c)
-  (define strange-fun/ctc
-    (contract strange/c 
-              (λ (f)
-                (values number? f))
-              'pos 'neg))
-  
-  (define bad-strange-fun/ctc
-    (contract strange/c 
-              (λ (f)
-                (f 4)
-                (values number? f))
-              'pos 'neg))
-  
-  (define-values (? o) (strange-fun/ctc (λ (x) x)))
-  (test
-   (o 4) => 4
-   (o "string") =error> "broke"
-   
-   (bad-strange-fun/ctc (λ (x) x)) =error> "broke"))
-
-(test
- ; ->i doesn't work
- (->i ([strategy (predicate?) (-> predicate? any/c)])
-      (values [predicate? (-> any/c boolean?)]
-              [object any/c]))
- =error>
- "an argument cannot depend on a result"
- 
- ; but the manual version does
- (try-it-out manual-strange/c)
- ; and so does the temporal version
- (try-it-out hot-strange/c))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/id-bench.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/id-bench.rkt
deleted file mode 100644
index c963c3f8ba..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/id-bench.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket/base
-(require tests/stress
-         unstable/temp-c/dsl
-         racket/match
-         racket/contract)
-
-(define (id x) x)
-
-(define raw 
-  id)
-(define ctc 
-  (contract (-> integer? integer?) id
-            'pos 'neg))
-(define monitor-ctc
-  (contract (monitor/c (λ (x) #t) 'f
-                       (-> integer? integer?))
-            id 'pos 'neg))
-(define monitor-ctc+atomic
-  (contract (monitor/c
-             (let ([called? #f])
-               (match-lambda
-                 [(? monitor:proj? x)
-                  #t]
-                 [(? monitor:call? x)
-                  (begin0 (not called?)
-                          (set! called? #t))]
-                 [(? monitor:return? x)
-                  (begin0 called?
-                          (set! called? #f))]))
-             'f
-             (-> integer? integer?))
-            id 'pos 'neg))
-(define dsl-ctc
-  (contract (with-monitor (-> integer? integer?))
-            id 'pos 'neg))
-(define dsl-ctc+atomic
-  (contract (with-monitor (label 'f (-> integer? integer?))
-              (seq (? monitor:proj?)
-                   (star 
-                    (seq (call 'f _)
-                         (ret 'f _)))
-                   ; We need this to preserve prefix-closure
-                   (opt (call 'f _))))
-            id 'pos 'neg))
-
-(define-syntax-rule (stress-it x ver ...)
-  (let ([x* x])
-    (printf "Running ~a iterations\n" x*)
-    (stress 1
-            [(symbol->string 'ver)
-             (printf "Running ~a\n" 'ver)
-             (for ([i (in-range x*)])
-               (ver 1))]
-            ...)))
-
-(stress-it 
- (expt 10 4)
- raw
- ctc
- monitor-ctc
- monitor-ctc+atomic
- dsl-ctc
- dsl-ctc+atomic)
-
-
-(module+ test
-  (module config info
-    (define random? #t)))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/info.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/info.rkt
deleted file mode 100644
index 84ad0ac2d5..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '((all jay)))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/test-temporal-no-call-after-return.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/test-temporal-no-call-after-return.rkt
deleted file mode 100644
index ffb3bfefdf..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/test-temporal-no-call-after-return.rkt
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang racket/load
-
-#| -----------------------------------------------------------------------------
-   testing temporal contracts: 
-
-   let t =  (new turn board player-tiles player-score tile-bag)
-   let t come with two methods: bump and observe 
-
-        (send . take-turn t)
-admin --------------------------------------------------------> player 
-       TEMPORAL: don't call bump on t after this call returns 
-
-|#
-(require errortrace)
-
-;; -----------------------------------------------------------------------------
-;; the interface module, defines turn% and how player is called via take-turn 
-(module player-admin-interface racket 
-  (require unstable/temp-c/dsl
-           unstable/match)
-  
-  (define turn%
-    (class object% 
-      (init-field value)
-      (define/public (observe) value)
-      (define/public (bump) (set! value (+ value 1)))
-      (super-new)))
-  
-  (define player/c
-    (with-monitor
-        (class/c [take-turn (label 'take-turn 
-                                   (->m 
-                                    (object/c [observe (label 'observe (->m natural-number/c))]
-                                              [bump (label 'bump (->m any/c))])
-                                    any/c))])
-      (complement
-       (seq (star _)
-            (dseq (monitor:return 'take-turn _ _ _ _ _ (list _ t) _)
-                  (seq (star _)
-                       (call 'bump (== t))))))))
-  
-  (provide player/c turn%))
-
-;; -----------------------------------------------------------------------------
-;; the player module defines a player and slabs on the requires player contract 
-
-(module player racket
-  (require 'player-admin-interface)
-  
-  (define player% 
-    (class object% 
-      (init-field name)
-      (define turn #false)
-      (define/public (take-turn t)
-        (if turn 
-            (send turn bump)
-            (send t bump))
-        (set! turn t))            
-      (super-new)))
-  
-  (provide/contract
-   [player% player/c]))
-
-;; -----------------------------------------------------------------------------
-;; the admin module creates player, admin, and has admin call player 
-
-(module admin racket
-  (require 'player-admin-interface 'player tests/eli-tester)
-  
-  (define admin%
-    (class object%
-      (init-field player)
-      
-      (define/public (run)
-        (define turn1 (new turn% [value 1]))
-        (send player take-turn turn1)
-        (define value1 (send turn1 observe))
-        ;; --- 
-        (define turn2 (new turn% [value 10]))
-        (test 
-         (send player take-turn turn2)
-         =error>
-         #rx"disallowed call")
-        ;; --- 
-        (list 'bad-for-turn1: (not (= 2 (send turn1 observe)))
-              'bad-for-turn2: (= 10 (send turn2 observe))))
-      
-      (super-new)))
-  
-  ;; main
-  (define player (new player% [name "a"]))
-  (define admin (new admin% [player player]))
-  (displayln (send admin run)))
-
-;; -----------------------------------------------------------------------------
-;; run program run 
-
-(require 'admin)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/test-temporal-no-call-after-return2.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/test-temporal-no-call-after-return2.rkt
deleted file mode 100644
index e9e364ccf9..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/test-temporal-no-call-after-return2.rkt
+++ /dev/null
@@ -1,101 +0,0 @@
-#lang racket/load
-
-#| -----------------------------------------------------------------------------
-   testing temporal contracts: 
-
-   let t =  (new turn board player-tiles player-score tile-bag)
-   let t come with two methods: bump and observe 
-
-        (send . take-turn t)
-admin --------------------------------------------------------> player 
-       TEMPORAL: don't call bump on t after this call returns 
-
-|#
-(require errortrace)
-
-;; -----------------------------------------------------------------------------
-;; the interface module, defines turn% and how player is called via take-turn 
-(module player-admin-interface racket 
-  (require unstable/temp-c/dsl
-           unstable/match)
-  
-  (define turn%
-    (class object% 
-      (init-field value)
-      (define/public (observe) value)
-      (define/public (bump) (set! value (+ value 1)))
-      (super-new)))
-  
-  (define mon
-    (re->monitor-predicate/serial
-     (re
-      (complement
-       (seq (star _)
-            (dseq (monitor:return 'take-turn _ _ _ _ _ (list _ t) _)
-                  (seq (star _)
-                       (call 'bump (== t)))))))))
-  
-  (define turn/c
-    (object/c [observe (monitor/c mon 'observe (->m natural-number/c))]
-              [bump (monitor/c mon 'bump (->m any/c))]))
-  
-  (define player/c
-    (class/c [take-turn (monitor/c mon 'take-turn (->m turn/c any/c))]))
-  
-  (provide player/c turn%))
-
-;; -----------------------------------------------------------------------------
-;; the player module defines a player and slabs on the requires player contract 
-
-(module player racket
-  (require 'player-admin-interface)
-  
-  (define player% 
-    (class object% 
-      (init-field name)
-      (define turn #false)
-      (define/public (take-turn t)
-        (if turn 
-            (send turn bump)
-            (send t bump))
-        (set! turn t))            
-      (super-new)))
-  
-  (provide/contract
-   [player% player/c]))
-
-;; -----------------------------------------------------------------------------
-;; the admin module creates player, admin, and has admin call player 
-
-(module admin racket
-  (require 'player-admin-interface 'player tests/eli-tester)
-  
-  (define admin%
-    (class object%
-      (init-field player)
-      
-      (define/public (run)
-        (define turn1 (new turn% [value 1]))
-        (send player take-turn turn1)
-        (define value1 (send turn1 observe))
-        ;; --- 
-        (define turn2 (new turn% [value 10]))
-        (test 
-         (send player take-turn turn2)
-         =error>
-         #rx"disallowed call")
-        ;; --- 
-        (list 'bad-for-turn1: (not (= 2 (send turn1 observe)))
-              'bad-for-turn2: (= 10 (send turn2 observe))))
-      
-      (super-new)))
-  
-  ;; main
-  (define player (new player% [name "a"]))
-  (define admin (new admin% [player player]))
-  (displayln (send admin run)))
-
-;; -----------------------------------------------------------------------------
-;; run program run 
-
-(require 'admin)
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench-com.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench-com.rkt
deleted file mode 100644
index 9233ef1782..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench-com.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(provide player)
-
-(define ((player mark) b board-ref board-set)
-  (for*/or ([r (in-range 3)]
-            [c (in-range 3)])
-    (if (board-ref b r c)
-        #f
-        (board-set b r c mark))))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench-ctc.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench-ctc.rkt
deleted file mode 100644
index 6b762bd15c..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench-ctc.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require "ttt.rkt"
-         "ttt-bench-com.rkt")
-
-(tic-tac-toe (player 'O) (player 'X))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench-raw.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench-raw.rkt
deleted file mode 100644
index d5092d3eea..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench-raw.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require "ttt.rkt"
-         "ttt-bench-com.rkt")
-
-(tic-tac-toe:raw (player 'O) (player 'X))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench.rkt
deleted file mode 100644
index 6c576be9d0..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-bench.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-(require tests/stress
-         racket/system
-         racket/runtime-path
-         compiler/find-exe)
-
-(define racket-pth (find-exe))
-
-(define-runtime-path ttt:raw "ttt-bench-raw.rkt")
-(define-runtime-path ttt:ctc "ttt-bench-ctc.rkt")
-
-racket-pth
-
-(define (bench p)
-  (system* racket-pth "-t" p))
-
-(define-syntax-rule (stress-it ver ...)
-  (let ([x* 1])
-    (printf "Running ~a iterations\n" x*)
-    (stress 10
-            [(symbol->string 'ver)
-             (printf "Running ~a\n" 'ver)
-             (for ([i (in-range x*)])
-               (bench ver))]
-            ...)))
-
-(stress-it 
- ttt:raw
- ttt:ctc)
-
-
-(module+ test
-  (module config info
-    (define random? #t)))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-players.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-players.rkt
deleted file mode 100644
index bc205f9287..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt-players.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang racket/base
-(require "ttt.rkt"
-         tests/eli-tester)
-
-(define (print-board b board-ref)
-  (for ([r (in-range 3)])
-    (for ([c (in-range 3)])
-      (define m (board-ref b r c))
-      (printf "|~a|" (or m " ")))
-    (printf "\n---------\n")))
-
-(define (read-number m l)
-  (printf "~a > ~a: " m l)
-  (read))
-
-(define (interactive-player mark)
-  (λ (b board-ref board-set)
-    (print-board b board-ref)
-    (let loop ()
-      (define row (read-number mark "Row"))
-      (define col (read-number mark "Column"))
-      (if (board-ref b row col)
-          (begin (printf "Don't be a cheater :(\n")
-                 (loop))
-          (board-set b row col mark)))))
-
-#;(tic-tac-toe (interactive-player 'O)
-               (interactive-player 'X))
-
-(define (random-player mark)
-  (define (turn b board-ref board-set)
-    (define r (random 3))
-    (define c (random 3))
-    (if (board-ref b r c)
-        (turn b board-ref board-set)
-        (board-set b r c mark)))
-  turn)
-
-(tic-tac-toe (random-player 'O) (random-player 'X))
-(tic-tac-toe (random-player 'O) (random-player 'X))
-
-(define (cheater-1 mark)
-  (define (turn b board-ref board-set)
-    (or
-     (for*/or ([r (in-range 3)]
-               [c (in-range 3)])
-       (and (board-ref b r c)
-            (board-set b r c mark)))
-     (board-set b 0 0 mark)))
-  turn)
-
-(test
- (tic-tac-toe (cheater-1 'O) (random-player 'X))
- =error> "monitor disallowed"
- (tic-tac-toe (random-player 'O) (cheater-1 'X))
- =error> "monitor disallowed")
-
-(define (cheater-2 mark)
-  (define (turn b board-ref board-set)
-    (board-set
-     (board-set
-      (board-set b 2 2 mark)
-      0 0 mark)
-     1 1 mark))
-  turn)
-
-(test
- (tic-tac-toe (cheater-2 'O) (random-player 'X))
- =error> "monitor disallowed"
- (tic-tac-toe (random-player 'O) (cheater-2 'X))
- =error> "monitor disallowed")
-
-
-(module+ test
-  (module config info
-    (define random? #t)))
diff --git a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt.rkt b/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt.rkt
deleted file mode 100644
index 7436fc62ae..0000000000
--- a/pkgs/unstable-pkgs/unstable-test/tests/unstable/temp-c/ttt.rkt
+++ /dev/null
@@ -1,180 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         tests/eli-tester)
-
-; A space is #f, 'X, or 'O
-(define space/c 
-  (or/c false/c 'X 'O))
-
-; A board is a (hasheq (hasheq space space space) x 3 )
-(define posn/c
-  (or/c 0 1 2))
-(define board/c
-  (hash/c posn/c
-          (hash/c posn/c
-                  space/c
-                  #:immutable #t)
-          #:immutable #t))
-
-(define empty-board
-  (hasheq 0 (hasheq 0 #f 1 #f 2 #f)
-          1 (hasheq 0 #f 1 #f 2 #f)
-          2 (hasheq 0 #f 1 #f 2 #f)))
-
-(define winning-o-board/col
-  (hasheq 0 (hasheq 0 'O 1 #f 2 #f)
-          1 (hasheq 0 'O 1 #f 2 #f)
-          2 (hasheq 0 'O 1 #f 2 #f)))
-(define winning-x-board/row
-  (hasheq 0 (hasheq 0 'O 1 #f 2 #f)
-          1 (hasheq 0 'X 1 'X 2 'X)
-          2 (hasheq 0 'O 1 #f 2 #f)))
-(define winning-x-board/left
-  (hasheq 0 (hasheq 0 'X 1 #f 2 #f)
-          1 (hasheq 0 'O 1 'X 2 'X)
-          2 (hasheq 0 'O 1 #f 2 'X)))
-(define winning-o-board/right
-  (hasheq 0 (hasheq 0 'X 1 #f 2 'O)
-          1 (hasheq 0 'O 1 'O 2 'X)
-          2 (hasheq 0 'O 1 #f 2 'X)))
-
-(define (board-ref b r c)
-  (hash-ref (hash-ref b r) c))
-
-(test
- (board-ref empty-board 0 0) => #f
- (board-ref winning-o-board/right 1 2) => 'X)
-
-(define equal?*
-  (match-lambda*
-    [(list) #t]
-    [(list e) e]
-    [(list* e1 e2 es)
-     (and (equal? e1 e2)
-          (apply equal?* e2 es))]))
-
-(test
- (equal?*)
- (equal?* 1)
- (equal?* 1 1)
- (equal?* 1 1 1)
- (equal?* 1 1 1 2) => #f)
-
-(define (winning-board? b)
-  (or
-   ; Cols
-   (for/or ([c (in-range 3)])
-     (equal?*
-      (board-ref b 0 c)
-      (board-ref b 1 c)
-      (board-ref b 2 c)))
-   ; Rows
-   (for/or ([r (in-range 3)])
-     (equal?*
-      (board-ref b r 0)
-      (board-ref b r 1)
-      (board-ref b r 2)))
-   ; Left diagonal
-   (equal?* (board-ref b 0 0)
-            (board-ref b 1 1)
-            (board-ref b 2 2))
-   ; Right diagonal
-   (equal?* (board-ref b 0 2)
-            (board-ref b 1 1)
-            (board-ref b 2 0))))
-
-(test
- (winning-board? empty-board) => #f
- 
- (winning-board? winning-o-board/col) => 'O
- (winning-board? winning-x-board/row) => 'X
- (winning-board? winning-x-board/left) => 'X
- (winning-board? winning-o-board/right) => 'O)
-
-(define (board-set b r c m)
-  #;(printf "b[~a][~a] = ~a\n" r c m)
-  (hash-update b r (λ (r) (hash-set r c m))))
-
-(test
- (board-set
-  (board-set
-   (board-set empty-board
-              0 0 'O)
-   1 0 'O)
-  2 0 'O)
- =>
- winning-o-board/col)
-
-(define (full-board? b)
-  (for/and ([r (in-range 3)]
-            [c (in-range 3)])
-    (board-ref b r c)))
-
-(test
- (full-board?
-  (for/fold ([b empty-board])
-    ([r (in-range 3)]
-     [c (in-range 3)])
-    (board-set b r c 'X))))
-
-(define (tic-tac-toe o-player x-player)
-  (let loop ([board empty-board]
-             [os-turn? #t
-                       #;(zero? (random 2))])
-    (cond
-      [(winning-board? board)
-       => (λ (winner)
-            (printf "~a wins!\n" winner))]
-      [(full-board? board)
-       (printf "Stalemate!\n")]
-      [else
-       (loop 
-        ((if os-turn? 
-             o-player
-             x-player)
-         board board-ref board-set)
-        (not os-turn?))])))
-
-(require unstable/match
-         unstable/temp-c/dsl)
-(provide
- (rename-out [tic-tac-toe
-              tic-tac-toe:raw]))
-(provide/contract
- [tic-tac-toe
-  (with-monitor
-      (label 'game
-             (-> (label 'turn
-                        (-> board/c 
-                            (board/c posn/c posn/c . -> . space/c)
-                            (label 'board-set
-                                   (board/c posn/c posn/c
-                                            (and space/c (not/c false/c))
-                                            . -> . board/c))
-                            board/c))
-                 (label 'turn
-                        (-> board/c 
-                            (board/c posn/c posn/c . -> . space/c)
-                            (label 'board-set
-                                   (board/c posn/c posn/c
-                                            (and space/c (not/c false/c))
-                                            . -> . board/c))
-                            board/c))
-                 void))
-    (complement
-     (union
-      ; A board set hits something that was hit before
-      (seq (star _)
-           (call 'game _ _)
-           (star _)
-           (dseq (call 'board-set _ r c _)
-                 (seq (star (not (ret 'game _)))
-                      (call 'board-set _ (== r) (== c) _))))
-      ; A player takes two turns
-      (seq (star _)
-           (call 'turn _ _ _)
-           (? monitor:proj?)
-           (call 'board-set _ _ _ _)
-           (ret 'board-set _)
-           (call 'board-set _ _ _ _)))))])
diff --git a/pkgs/unstable-pkgs/unstable/LICENSE.txt b/pkgs/unstable-pkgs/unstable/LICENSE.txt
deleted file mode 100644
index 1bd14c2a76..0000000000
--- a/pkgs/unstable-pkgs/unstable/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-pkgs/unstable/info.rkt b/pkgs/unstable-pkgs/unstable/info.rkt
deleted file mode 100644
index 8872ee635d..0000000000
--- a/pkgs/unstable-pkgs/unstable/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("unstable-lib"
-               "unstable-doc"))
-(define implies '("unstable-lib"
-                  "unstable-doc"))
-
-(define pkg-desc "Experimental libraries")
-
-(define pkg-authors '(jay samth cce ryanc))
diff --git a/pkgs/unstable-pretty-lib/LICENSE.txt b/pkgs/unstable-pretty-lib/LICENSE.txt
deleted file mode 100644
index a532f8bb04..0000000000
--- a/pkgs/unstable-pretty-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-pretty-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-pretty-lib/info.rkt b/pkgs/unstable-pretty-lib/info.rkt
deleted file mode 100644
index 22ef1bd1d2..0000000000
--- a/pkgs/unstable-pretty-lib/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base"))
-
-(define pkg-desc "Experimental libraries for pretty printing")
-
-(define pkg-authors '(cce))
diff --git a/pkgs/unstable-pretty-lib/unstable/pretty.rkt b/pkgs/unstable-pretty-lib/unstable/pretty.rkt
deleted file mode 100644
index 1321ecac89..0000000000
--- a/pkgs/unstable-pretty-lib/unstable/pretty.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-(require racket/pretty)
-
-(provide pretty-format/write
-         pretty-format/display
-         pretty-format/print)
-
-(define ((pretty-format/pretty f) v [columns (pretty-print-columns)])
-  (parameterize ([current-output-port (open-output-string)]
-                 [pretty-print-columns columns])
-    (f v)
-    (get-output-string (current-output-port))))
-
-(define pretty-format/write (pretty-format/pretty pretty-write))
-(define pretty-format/display (pretty-format/pretty pretty-display))
-(define pretty-format/print (pretty-format/pretty pretty-print))
-
-;; Ryan: There doesn't seem to be any 'format' going on. Perhaps call
-;; them pretty-write-to-string, etc?
-;; Bleh, just saw pretty-format in racket/pretty :(
-
-
-;; by stamourv
-
-(provide break-lines)
-
-;; Takes a string, and breaks it into lines.
-(define (break-lines s [columns (pretty-print-columns)])
-  (define res (open-output-string))
-  (for/fold ([len 0])
-      ([word (in-list (regexp-split #px"[[:blank:]]+" s))])
-    (let ([new-len (+ len (string-length word) 1)])
-      (cond [(< new-len columns)
-             (display (format "~a~a" (if (= len 0) "" " ") word) res)
-             new-len]
-            [else ; break the line
-             (display (format "\n~a" word) res)
-             (string-length word)])))
-  (get-output-string res))
diff --git a/pkgs/unstable-redex/LICENSE.txt b/pkgs/unstable-redex/LICENSE.txt
deleted file mode 100644
index 07b30b14f1..0000000000
--- a/pkgs/unstable-redex/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unstable-redex
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/unstable-redex/gui/redex.rkt b/pkgs/unstable-redex/gui/redex.rkt
deleted file mode 100644
index e13971ffb9..0000000000
--- a/pkgs/unstable-redex/gui/redex.rkt
+++ /dev/null
@@ -1,358 +0,0 @@
-#lang racket/base
-(require racket/contract
-         redex/reduction-semantics
-         redex/pict
-         pict
-         racket/list)
-
-;; TO DO:
-;; - chained binary operators
-;;   eg (+ 1 2 3) => "1 + 2 + 3"
-;; - helper for thin spaces around operators/functions ?
-;; - rewriters for more conventions (eg subst, env, judgments, ...)
-
-(provide
- (contract-out
-  ;; Using and controlling rewriters
-  [with-rewriters
-   (-> (-> any) any)]
-  [current-atomic-rewriters
-   (parameter/c (plistof symbol? atomic-rewriter/c))]
-  [current-compound-rewriters
-   (parameter/c (plistof symbol? compound-rewriter/c))]
-  [current-unquote-rewriters
-   (parameter/c (plistof (-> lw? any/c) (-> lw? lw?)))]
-  [add-atomic-rewriters!
-   (->* [] [] #:rest (plistof symbol? atomic-rewriter/c)
-        void?)]
-  [add-compound-rewriters!
-   (->* [] [] #:rest (plistof symbol? compound-rewriter/c)
-        void?)]
-  [add-unquote-rewriters!
-   (->* [] [] #:rest (plistof (-> lw? any/c) (-> lw? lw?))
-        void?)]
-  ;; Rewriter constructors
-  [only-first-rw
-   (-> compound-rewriter/c)]
-  [binary-rw
-   (->* [content/c]
-        [#:parenthesize-arg (or/c #t #f (listof symbol?) (-> lw? any/c))
-         #:parenthesize-left (or/c #t #f (listof symbol?) (-> lw? any/c))
-         #:parenthesize-right (or/c #t #f (listof symbol?) (-> lw? any/c))]
-        compound-rewriter/c)]
-  [prefix-rw
-   (-> content/c
-       compound-rewriter/c)]
-  [postfix-rw
-   (-> content/c
-       compound-rewriter/c)]
-  [function-rw
-   (-> content/c
-       compound-rewriter/c)]
-  [splice-rw
-   (-> compound-rewriter/c)]
-  [constant-rw
-   (-> content/c
-       compound-rewriter/c)]
-  [bracket-rw
-   (->* [(or/c 'round 'square 'curly 'angle (list/c (or/c string? pict?) (or/c string? pict?)))]
-        [#:comma? any/c]
-        compound-rewriter/c)]
-  [set-cons-rw
-   (-> compound-rewriter/c)]
-  ;; Contracts
-  [compound-rewriter/c
-   contract?]
-  [plistof
-   (-> contract? contract? contract?)]
-  #|
-  [content/c
-   contract?]
-  |#))
-
-(define (plistof key/c val/c)
-  (letrec ([ctc
-            (recursive-contract
-             (or/c '()
-                   (cons/c key/c (cons/c val/c ctc))))])
-    ctc))
-
-(define content/c
-  (or/c string? pict? lw? (-> (or/c string? pict? lw?))))
-
-(define atomic-rewriter/c
-  (or/c string? pict? (-> (or/c string? pict?))))
-
-(define compound-rewriter/c
-  (-> (listof lw?)
-      (listof (or/c string? pict? lw?))))
-
-;; ============================================================
-
-(define current-atomic-rewriters (make-parameter null))
-(define current-compound-rewriters (make-parameter null))
-(define current-unquote-rewriters (make-parameter null))
-
-(define (add-atomic-rewriters! . args)
-  (push-rewriters! 'add-atomic-rewriters! current-atomic-rewriters args))
-(define (add-compound-rewriters! . args)
-  (push-rewriters! 'add-compound-rewrites! current-compound-rewriters args))
-(define (add-unquote-rewriters! . args)
-  (push-rewriters! 'add-unquote-rewrites! current-unquote-rewriters args))
-
-(define (with-rewriters thunk)
-  (with-atomic-rewriter*
-   (lambda ()
-     (with-compound-rewriter*
-      (lambda ()
-        (with-unquote-rewriter*
-         (lambda ()
-           (thunk))
-         (reverse (current-unquote-rewriters))))
-      (reverse (current-compound-rewriters))))
-   (reverse (current-atomic-rewriters))))
-
-;; ============================================================
-
-(define (push-rewriters! who param args)
-  (unless (even? (length args))
-    (error who "expected even number of arguments, got: ~e" args))
-  (param (append args (param))))
-
-;; Note: l is reversed, so rewriter comes first, symbol/pred comes second.
-(define (with-atomic-rewriter* thunk l)
-  (if (null? l)
-      (thunk)
-      (with-atomic-rewriter
-       (cadr l)
-       (let ([rw (car l)])
-         (cond [(string? rw)
-                (lambda () (text rw (default-style) (default-font-size)))]
-               [(pict? rw)
-                (lambda () rw)]
-               [else rw]))
-       (with-atomic-rewriter* thunk (cddr l)))))
-(define (with-compound-rewriter* thunk l)
-  (if (null? l)
-      (thunk)
-      (with-compound-rewriter
-       (cadr l) (car l)
-       (with-compound-rewriter* thunk (cddr l)))))
-(define (with-unquote-rewriter* thunk l)
-  (with-unquote-rewriter
-   (lambda (lw)
-     (let loop ([l l])
-       (cond [(null? l)
-              lw]
-             [else
-              (let ([pred (cadr l)]
-                    [tx (car l)])
-                (cond [(pred lw) (tx lw)]
-                      [else (loop (cddr l))]))])))
-   (thunk)))
-
-;; ============================================================
-
-(define (only-first-rw)
-  (compound-rw 'only-first-rw
-    (lambda (lws)
-      (let ([arg-lw (list-ref lws 2)])
-        (list arg-lw)))))
-
-(define (binary-rw op
-                   #:parenthesize-arg [parenthesize-arg #f]
-                   #:parenthesize-left [parenthesize-left parenthesize-arg]
-                   #:parenthesize-right [parenthesize-right parenthesize-arg])
-  (compound-rw 'binary-rw
-    (lambda (lws)
-      (let ([left (list-ref lws 2)]
-            [right (list-ref lws 3)])
-        ;; (list left (just-after op left) (between "" left right) right)
-        ;; (list left (just-after op left) "" right)
-        (append (maybe-parenthesize left parenthesize-left)
-                (list (between (->string/pict op) left right))
-                (maybe-parenthesize right parenthesize-right))))
-    2 2))
-
-(define (prefix-rw pre
-                   #:parenthesize-arg [parenthesize-arg #f])
-  (compound-rw 'prefix-rw
-    (lambda (lws)
-      (let ([arg-lw (list-ref lws 2)])
-        (append (list (just-before (->string/pict pre) arg-lw))
-                (maybe-parenthesize arg-lw parenthesize-arg))))
-    1 1))
-
-(define (postfix-rw post
-                    #:parenthesize-arg [parenthesize-arg #f])
-  (compound-rw 'postfix-rw
-    (lambda (lws)
-      (let ([arg-lw (list-ref lws 2)])
-        (append (maybe-parenthesize arg-lw parenthesize-arg)
-                (list (just-after (->string/pict post) arg-lw)))))
-    1 1))
-
-(define (function-rw name)
-  (compound-rw 'function-rw
-    (lambda (lws)
-      (list* (re-lw (->string/pict name) (list-ref lws 1))
-             (between "(" (list-ref lws 1) (list-ref lws 2))
-             (comma-ize (cddr lws) #t)))))
-
-(define (bracket-rw brackets #:tall? [tall? #f] #:comma? [comma? #t])
-  (let-values ([(left-bracket right-bracket)
-                (cond [(symbol? brackets)
-                       (case brackets
-                         ((round) (values "(" ")"))
-                         ((square) (values "[" "]"))
-                         ((curly) (values "{" "}"))
-                         ((angle) (values "〈" "〉"))
-                         ;; FIXME: more
-                         (else (error 'bracket-rw "unknown bracket kind: ~e" brackets)))]
-                      [(list? brackets)
-                       (values (first brackets) (second brackets))])])
-    (compound-rw 'bracket-rw
-      (lambda (lws)
-        (let ([lwA (first lws)]
-              [lwZ (last lws)]
-              [elems (drop-right (drop lws 2) 1)])
-          (append (list (re-lw (if tall? (taller left-bracket) left-bracket) lwA)
-                        "")
-                  (if comma? (comma-ize elems #f) elems)
-                  (list (re-lw (if tall? (taller right-bracket) right-bracket) lwZ))))))))
-
-(define (splice-rw)
-  (compound-rw 'splice-rw
-    (lambda (lws)
-      (drop-right (drop lws 2) 1))))
-
-(define (constant-rw s)
-  (compound-rw 'constant-rw
-    (lambda (lws)
-      (list (re-lw s (first lws))))))
-
-(define (set-cons-rw)
-  (compound-rw 'set-cons-rw
-    (lambda (lws)
-      (list (just-before "{" (list-ref lws 2))
-            (list-ref lws 2)
-            (just-after "}∪" (list-ref lws 2))
-            (between "" (list-ref lws 2) (list-ref lws 3))
-            (list-ref lws 3)))))                                  
-
-;; ============================================================
-
-;; Content = (U string symbol pict (listof (U 'spring lw)))
-
-;; between : Content lw lw -> lw
-;; Makes an lw with given content and location between given lws.
-(define (between s a b)
-  (build-lw s
-            (lw-line a)
-            0
-            (+ (lw-column a) (lw-column-span a))
-            (max 0 (- (lw-column b)
-                      (+ (lw-column a) (lw-column-span a))))))
-
-;; re-lw : Content lw -> lw
-;; Makes an lw with locations of old lw and new content.
-(define (re-lw new-e lw)
-  (build-lw new-e
-            (lw-line lw) (lw-line-span lw)
-            (lw-column lw) (lw-column-span lw)))
-
-;; refit : (listof lw) (listof lw) -> (listof lw)
-;; Add empty lws ("") around new based on locations of old lws (??)
-;; Soaks up logical space ????
-(define (refit orig new)
-  (append (list (between "" (just-before "" (car orig)) (car new)))
-          new
-          (list (between "" (just-after "" (last new)) (just-after "" (last orig))))))
-
-(define (compound-rw who proc [min-args 0] [max-args +inf.0]
-                     #:refit? [refit? #t])
-  ((if refit? refit-rw values)
-   (lambda (lws)
-     (unless (>= (length lws) 3)
-       (error who "expected list of at least 3 lws, got: ~e" lws))
-     (let ([lwA (first lws)]
-           [lwB (second lws)]
-           [lwZ (last lws)])
-       (unless (member (lw-e lwA) '("(" "[" "{"))
-         (error who "expected first lw to contain open-paren, got: ~e" lwA))
-       (unless (symbol? (lw-e lwB))
-         (error who "expected second lw to contain symbol, got: ~e" lwB))
-       (unless (member (lw-e lwZ) '(")" "]" "}"))
-         (error who "expected last lw to contain close-paren, got: ~e" lwZ))
-       (let ([args (- (length lws) 3)])
-         (unless (<= min-args args max-args)
-           (if (= min-args max-args)
-               (error who "expected ~s argument(s), got ~s: ~e"
-                      min-args args lws)
-               (error who "expected between ~s and ~s arguments, got ~s: ~e"
-                      min-args max-args args lws))))
-       (proc lws)))))
-
-(define ((refit-rw proc) lws)
-  (refit lws (proc lws)))
-
-(define (taller s)
-  (define p
-    (cond [(string? s) (text s (default-style) (default-font-size))]
-          [(pict? s) s]))
-  (define h (pict-height p))
-  (drop-below-ascent (scale (launder p) 1 1.3) (* 0.1 h)))
-
-(define (comma-ize lws contains-close-paren?)
-  (let loop ([lws lws])
-    (cond [(and contains-close-paren?
-                (or (null? (cdr lws))
-                    (null? (cddr lws))))
-           lws]
-          [(and (not contains-close-paren?)
-                (or (null? lws)
-                    (null? (cdr lws))))
-           lws]
-          [(positive? (lw-line-span (car lws)))
-           ;; a line break?
-           (cons (car lws) (loop (cdr lws)))]
-          [else (list*
-                 (car lws)
-                 (between ", " (car lws) (cadr lws))
-                 (loop (cdr lws)))])))
-
-;; ->string/pict : (U string pict (-> (U string pict)) -> (U string pict)
-(define (->string/pict c)
-  (cond [(pict? c) c]
-        [(string? c) c] ;; ((current-text) c (default-style) (default-font-size))
-        [else (c)]))
-
-;; maybe-parenthesize : lw _ -> (nonempty-listof lw)
-(define (maybe-parenthesize arg paren-spec)
-  (if (parenthesize? arg paren-spec)
-      (parenthesize-lws (list arg))
-      (list arg)))
-
-;; parenthesize? : lw (U #t #f (listof symbol) (-> lw boolean)) -> boolean
-(define (parenthesize? arg parenthesize-arg)
-  (cond [(boolean? parenthesize-arg) parenthesize-arg]
-        [(list? parenthesize-arg)
-         (let ([contents (lw-e arg)])
-           (and (not (lw-unq? arg))
-                (not (lw-metafunction? arg))
-                (list? contents)
-                (>= (length contents) 3)
-                (member (lw-e (first contents)) '("(" "[" "{"))
-                (member (lw-e (last contents)) '(")" "]" "}"))
-                (member (lw-e (second contents)) parenthesize-arg)
-                #t))]
-        [(procedure? parenthesize-arg)
-         (parenthesize-arg arg)]))
-
-;; parenthesize-lws : (nonempty-listof lw) -> (nonempty-listof lw)
-(define (parenthesize-lws lws)
-  (let ([lwA (first lws)]
-        [lwZ (last lws)])
-    (append (list (just-before "(" lwA))
-            lws
-            (list (just-after ")" lwZ)))))
diff --git a/pkgs/unstable-redex/gui/unstable-redex.scrbl b/pkgs/unstable-redex/gui/unstable-redex.scrbl
deleted file mode 100644
index 7f1405ba28..0000000000
--- a/pkgs/unstable-redex/gui/unstable-redex.scrbl
+++ /dev/null
@@ -1,344 +0,0 @@
-#lang scribble/manual
-@(require racket/stxparam scribble/base scribble/eval
-          unstable/scribblings/utils
-          (for-syntax racket/base syntax/srcloc)
-          (for-label racket/base racket/contract pict redex unstable/gui/redex))
-
-@(define the-eval (make-base-eval))
-@(the-eval '(require redex/reduction-semantics redex/pict unstable/gui/redex pict))
-
-@unstable-title[#:tag "redex"]{Redex}
-@unstable-header[]
-
-@defmodule[unstable/gui/redex]
-
-This library provides functions to help typesetting for
-@racketmodname[redex] models. The following example program provides
-an overview of the features:
-
-@with-eval-preserve-source-locations[
-@interaction[#:eval the-eval
-(define-language ZF
-  [e empty
-     (Set e)
-     (Union e_1 e_2)
-     (Powerset e)
-     ZZ
-     variable-not-otherwise-mentioned]
-  [formula (same? e_1 e_2)
-           (in? e_1 e_2)
-           true
-           false
-           (implies formula_1 formula_2)])
-]]
-
-By default, Redex models are typeset as S-expressions with some basic
-styling that distinguishes literals from nonterminal names, handles
-subscripting, etc.
-
-@with-eval-preserve-source-locations[
-@interaction[#:eval the-eval
-(language->pict ZF)
-(term->pict ZF (in? x (Set 1 2 3 ...)))
-]]
-
-This library provides helper functions for creating and using
-rewriters that transform the S-expression model terms into other
-notations.
-
-@with-eval-preserve-source-locations[
-@interaction[#:eval the-eval
-(add-atomic-rewriters!
- 'empty "∅"
- 'formula "φ"
- 'ZZ (text "Z" '(bold . modern) (default-font-size)) ;; "\u2124" doesn't work with latex/pdf output
- 'variable-not-otherwise-mentioned
-     (lambda () (text "x, y, z, ..." (literal-style) (default-font-size)))
- 'true (lambda () (text "true" '(caps . modern) (default-font-size)))
- 'false (lambda () (text "false" '(caps . modern) (default-font-size))))
-(add-compound-rewriters!
- 'same? (binary-rw " = ")
- 'in? (binary-rw " ∈ ")
- 'Set (bracket-rw 'curly)
- 'Powerset (function-rw "P") ;; "𝒫 " doesn't work with latex/pdf output
- 'Union (binary-rw "∪")
- 'implies (binary-rw " ⇒ " #:parenthesize-left '(implies)))
-(with-rewriters
-  (lambda ()
-    (language->pict ZF)))
-(with-rewriters
-  (lambda ()
-    (render-term ZF (in? x (Set 1 2 3 ...)))))
-]]
-
-@; ----------------------------------------
-
-@defproc[(with-rewriters [proc (-> any)])
-         any]{
-
-Calls @racket[proc] with the rewriters of
-@racket[current-atomic-rewriters], @racket[current-compound-rewriters],
-and @racket[current-unquote-rewriters].
-}
-
-@defparam[current-atomic-rewriters rewriters
-          (let ([atomic-rewriter/c
-                 (or/c string? pict?
-                       (-> (or/c string? pict?)))])
-            (plistof symbol? atomic-rewriter/c))]{
-
-Parameter of atomic rewriters (as in @racket[with-atomic-rewriter])
-used by @racket[with-rewriters].
-}
-
-@defparam[current-compound-rewriters rewriters
-          (plistof symbol? compound-rewriter/c)]{
-
-Parameter of compound rewriters (as in
-@racket[with-compound-rewriter]) used by @racket[with-rewriters].
-}
-
-@defparam[current-unquote-rewriters rewriters
-          (plistof (-> lw? any/c) (-> lw? lw?))]{
-
-Parameter of unquote rewriters (as in @racket[with-unquote-rewriter])
-used by @racket[with-rewriters].
-}
-
-@deftogether[[
-@defproc[(add-atomic-rewriters! [rewriters
-                                 (let ([atomic-rewriter/c
-                                        (or/c string? pict?
-                                               (-> (or/c string? pict?)))])
-                                   (plistof symbol? atomic-rewriter/c))])
-         void?]
-@defproc[(add-compound-rewriters! [rewriters
-                                   (plistof symbol? compound-rewriter/c)])
-         void?]
-@defproc[(add-unquote-rewriters! [rewriters
-                                  (plistof (-> lw? any/c) (-> lw? lw?))])
-         void?]]]{
-
-Add rewriters to the @racket[current-atomic-rewriters],
-@racket[current-compound-rewriters], or
-@racket[current-unquote-rewriters], respectively.
-}
-
-@defproc[(plistof [key/c contract?] [value/c contract?])
-         contract?]{
-
-Contract for even-length lists of alternating @racket[key/c] and
-@racket[value/c] values.
-
-Equivalent to
-@racketblock[
-(letrec ([ctc
-          (recursive-contract
-           (or/c '()
-                 (cons/c key/c (cons/c value/c ctc))))])
-  ctc)
-]
-}
-
-@defthing[compound-rewriter/c contract?]{
-
-Contract for compound rewriters, which take a list of @racket[lw]
-structs and returns a list of @racket[lw]s, @racket[pict]s, or
-strings.
-
-Equivalent to 
-@racketblock[
-(-> (listof lw?)
-    (listof (or/c lw? pict? string?)))
-]
-}
-
-@defproc[(binary-rw [operator (or/c string? pict? (-> (or/c string? pict?)))]
-                    [#:parenthesize-arg parenthesize-arg
-                                        (or/c #t #f (listof symbol?) (-> lw? any/c))
-                                        #f]
-                    [#:parenthesize-left parenthesize-left
-                                         (or/c #t #f (listof symbol?) (-> lw? any/c))
-                                         parenthesize-arg]
-                    [#:parenthesize-right parenthesize-right
-                                          (or/c #t #f (listof symbol?) (-> lw? any/c))
-                                          parenthesize-arg])
-         compound-rewriter/c]{
-
-Typesets @racket[(_sym _term1 _term2)] using @racket[operator] as a
-binary operator between @racket[_term1] and @racket[_term2].
-
-@with-eval-preserve-source-locations[
-@examples[#:eval the-eval
-(add-compound-rewriters!
- 'plus (binary-rw " + "))
-(with-rewriters
-  (lambda ()
-    (term->pict ZF (plus 1 2))))
-]]
-
-Redex terms may become ambiguous when typeset. To avoid ambiguity, use
-@racket[#:parenthesize-arg] to direct when arguments should be
-parenthesized. If @racket[parenthesize-arg] is @racket[#t], then
-arguments are always parenthesized; if it is @racket[#f], never; if it
-is a list of symbols, then an argument is parenthesized only if the
-argument is a term starting with a symbol in the list; if it is a
-procedure, then the argument is parenthesized if the procedure applied
-to the argument's @racket[lw] struct returns a true value.
-
-@with-eval-preserve-source-locations[
-@interaction[#:eval the-eval
-(add-compound-rewriters!
- 'times (binary-rw " × "))
-(with-rewriters
-  (lambda ()
-    (term->pict ZF (times (plus 1 2) 3))))
-(add-compound-rewriters!
- 'times (binary-rw " × " #:parenthesize-arg '(plus)))
-(with-rewriters
-  (lambda ()
-    (term->pict ZF (times (plus 1 2) 3))))
-]]
-
-The parenthesization rules for left and right arguments can be
-supplied separately through @racket[#:parenthesize-left] and
-@racket[#:parenthesize-right], for example to create left-associated
-or right-associated operators:
-
-@with-eval-preserve-source-locations[
-@interaction[#:eval the-eval
-(add-compound-rewriters!
- 'arrow (binary-rw " → " #:parenthesize-left '(arrow)))
-(with-rewriters
-  (lambda ()
-    (term->pict ZF (arrow (arrow A B) (arrow C D)))))
-]]
-}
-
-@defproc[(prefix-rw [prefix (or/c string? pict? (-> (or/c string? pict?)))]
-                    [#:parenthesize-arg parenthesize-arg
-                                        (or/c #f #t (listof symbol?) (-> lw? any/c))
-                                        #f])
-         compound-rewriter/c]{
-
-Typesets @racket[(_sym _term)] by placing @racket[prefix] before
-@racket[_term].
-
-@with-eval-preserve-source-locations[
-@examples[#:eval the-eval
-(add-compound-rewriters!
- 'not (prefix-rw "¬ "))
-(with-rewriters
-  (lambda ()
-    (term->pict ZF (not (in? x empty)))))
-]]
-}
-
-@defproc[(postfix-rw [postfix (or/c string? pict? (-> (or/c string? pict?)))]
-                     [#:parenthesize-arg parenthesize-arg
-                                         (or/c #f #t (listof symbol?) (-> lw? any/c))
-                                         #f])
-         compound-rewriter/c]{
-
-Typesets @racket[(_sym _term)] by placing @racket[postfix] after
-@racket[_term].
-
-@with-eval-preserve-source-locations[
-@examples[#:eval the-eval
-(add-compound-rewriters!
- 'nonempty (postfix-rw " is nonempty"))
-(with-rewriters
-  (lambda ()
-    (term->pict ZF (nonempty (Set x)))))
-]]
-}
-
-@defproc[(function-rw [function (or/c string? pict? (-> (or/c string? pict?)))])
-         compound-rewriter/c]{
-
-Typesets @racket[(_sym _term ...)] by placing @racket[function] before
-the parenthesized, comma-separated list of @racket[_term]s.
-
-@with-eval-preserve-source-locations[
-@examples[#:eval the-eval
-(add-compound-rewriters!
- 'f (function-rw "f")
- 'max (function-rw (text "max" '(bold . modern) (default-font-size))))
-(with-rewriters
-  (lambda ()
-    (term->pict ZF (max 1 2 (f 3)))))
-]]
-}
-
-@defproc[(only-first-rw)
-         compound-rewriter/c]{
-
-Typesets @racket[(_sym _term1 _term2 ...)] as @racket[_term1]. Useful
-for hiding parameters that are necessary for defining the semantics
-but can be glossed over in its explanation, such as state parameters
-used for generating unique names.
-
-@with-eval-preserve-source-locations[
-@examples[#:eval the-eval
-(add-compound-rewriters!
- 'First (only-first-rw))
-(with-rewriters
-  (lambda ()
-    (term->pict ZF [First (in? x y) counter])))
-]]
-}
-
-@defproc[(splice-rw)
-         compound-rewriter/c]{
-
-Typesets @racket[(_sym _term ...)] by rendering the @racket[_term]s
-side-by-side.
-}
-
-@defproc[(constant-rw [constant (or/c string? pict? (-> (or/c string? pict?)))])
-         compound-rewriter/c]{
-
-Typesets @racket[(_sym _term ...)] as @racket[constant].
-}
-
-@defproc[(bracket-rw [brackets (or/c 'round 'square 'curly 'angle
-                                     (list (or/c string? pict?)
-                                           (or/c string? pict?)))]
-                     [#:comma? comma? any/c #t])
-         compound-rewriter/c]{
-
-Typesets @racket[(_sym _term ...)] by surrounding the comma-separated
-(or space-separated, if @racket[comma?] is false) sequence of
-@racket[_term]s with brackets. If @racket[brackets] is a list, the
-first element is the left bracket and the second is the right bracket;
-@racket['round] is equivalent to @racket['("(" ")")]; @racket['square]
-is equivalent to @racket['("[" "]")]; @racket['curly] is equivalent to
-@racket['("{" "}")]; and @racket['angle] is equivalent to
-@racket['("〈" "〉")].
-
-@with-eval-preserve-source-locations[
-@examples[#:eval the-eval
-(add-compound-rewriters!
- 'Tuple (bracket-rw 'angle))
-(with-rewriters
-  (lambda ()
-    (term->pict ZF (Tuple 1 2 3))))
-]]
-}
-
-@defproc[(set-cons-rw)
-         compound-rewriter/c]{
-
-Rewriter that typesets @racket[(_sym _elem-term _set-term)] as the
-union of the singleton set containing @racket[_elem-term] with the set
-@racket[_set-term].
-
-@with-eval-preserve-source-locations[
-@examples[#:eval the-eval
-(add-compound-rewriters!
- 'set-cons (set-cons-rw))
-(with-rewriters
-  (lambda ()
-    (term->pict ZF (set-cons x S))))
-]]
-}
diff --git a/pkgs/unstable-redex/info.rkt b/pkgs/unstable-redex/info.rkt
deleted file mode 100644
index 3b766a1451..0000000000
--- a/pkgs/unstable-redex/info.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang info
-
-(define collection "unstable")
-
-(define scribblings
-  '(("gui/unstable-redex.scrbl" (multi-page) (experimental))))
-
-(define deps '("base"
-               "pict-lib"
-               "redex-gui-lib"
-               "scribble-lib"
-               "unstable-lib"))
-
-(define build-deps '("pict-doc"
-                     "redex-doc"
-                     "racket-doc"
-                     "unstable-doc"))
-
-(define pkg-desc "Experimental libraries for typesetting PLT Redex models")
-
-(define pkg-authors '(ryanc))
diff --git a/pkgs/web-server-pkgs/web-server-doc/LICENSE.txt b/pkgs/web-server-pkgs/web-server-doc/LICENSE.txt
deleted file mode 100644
index 1123a03fa9..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-web-server-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/web-server-pkgs/web-server-doc/info.rkt b/pkgs/web-server-pkgs/web-server-doc/info.rkt
deleted file mode 100644
index e940e92f72..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/info.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("net-doc"
-                     "rackunit-doc"
-                     "compatibility-doc"
-                     "db-doc"
-                     "scribble-doc"
-                     "unstable-doc"
-                     "compatibility-lib"
-                     "db-lib"
-		     "net-lib"
-                     "rackunit-lib"
-                     "sandbox-lib"
-                     "scribble-lib"
-                     "unstable-contract-lib"
-                     "web-server-lib"
-                     "racket-doc"))
-(define deps '("base"))
-(define update-implies '("web-server-lib"))
-
-(define pkg-desc "documentation part of \"web-server\"")
-
-(define pkg-authors '(jay))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/info.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/info.rkt
deleted file mode 100644
index c18601c83f..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define scribblings
-  '(("scribblings/web-server.scrbl" (multi-page) (tool 100))
-    ("scribblings/web-server-internal.scrbl" (multi-page) (tool))
-    ("scribblings/tutorial/continue.scrbl" () (tutorial 5))))
-
-(define compile-omit-paths '("scribblings/tutorial/examples"))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/cache-table.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/cache-table.scrbl
deleted file mode 100644
index 0d16cc262d..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/cache-table.scrbl
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "cache-table"]{Cache Table}
-@(require (for-label web-server/private/cache-table))
-
-@defmodule[web-server/private/cache-table]{
-
-This module provides a set of caching hash table
-functions.
-
-@defproc[(make-cache-table)
-         cache-table?]{
- Constructs a cache-table.
-}
-
-@defproc[(cache-table-lookup! [ct cache-table?]
-                              [id symbol?]
-                              [mk (-> any/c)])
-         any/c]{
- Looks up @racket[id] in @racket[ct]. If it is not present, then @racket[mk] is
- called to construct the value and add it to @racket[ct].
-}
-
-@defproc[(cache-table-clear! [ct cache-table?])
-         void?]{
- Clears all entries in @racket[ct].
-}
-
-@defproc[(cache-table? [v any/c])
-         boolean?]{
- Determines if @racket[v] is a cache table.
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/closure.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/closure.scrbl
deleted file mode 100644
index 96ae17eab1..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/closure.scrbl
+++ /dev/null
@@ -1,63 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "closure"]{Serializable Closures}
-@(require (for-label racket/serialize
-                     web-server/lang/closure
-                     web-server/lang/serial-lambda
-                     web-server/private/define-closure))
-
-The defunctionalization process of the Web Language (see
-@secref["stateless" #:doc '(lib "web-server/scribblings/web-server.scrbl")])
-requires an explicit representation of closures that is serializable.
-
-@defmodule[web-server/lang/serial-lambda]{
-
-@defform[(serial-lambda formals body ...)]{
-  Returns @racket[(lambda formals body ...)], except it is serializable.
-}
-
-@defform[(serial-case-lambda [formals body ...] ...)]{
- Returns @racket[(case-lambda [formals body ...] ...)], except it is
- serializable.
-}
-
-}
-
-@section[#:style 'hidden]{Definition Syntax}
-
-@defmodule[web-server/private/define-closure]{
-
-@defform[(define-closure tag formals (free-var ...) body)]{
- Defines a closure, constructed with @racket[make-tag] that accepts a closure that returns
- @racket[freevar ...], that when invoked with @racket[formals]
- executes @racket[body].
-}
-
-Here is an example:
-@racketmod[
- racket
-(require racket/serialize)
-
-(define-closure foo (a b) (x y)
-  (+ (- a b)
-     (* x y)))
-
-(define f12 (make-foo (lambda () (values 1 2))))
-(serialize f12)
-#,(racketresult '((1) 1 (('page . foo:deserialize-info)) 0 () () (0 1 2)))
-(f12 6 7)
-#,(racketresult 1)
-(f12 9 1)
-#,(racketresult 10)
-
-(define f45 (make-foo (lambda () (values 4 5))))
-(serialize f45)
-#,(racketresult '((1) 1 (('page . foo:deserialize-info)) 0 () () (0 4 5)))
-(f45 1 2)
-#,(racketresult 19)
-(f45 8 8)
-#,(racketresult 20)
-]
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/connection-manager.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/connection-manager.scrbl
deleted file mode 100644
index 0e1e7bf519..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/connection-manager.scrbl
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "connection-manager"]{Connection Manager}
-@(require (for-label web-server/private/connection-manager
-                     web-server/private/timer))
-
-@defmodule[web-server/private/connection-manager]{
-
-This module provides functionality for managing pairs of
-input and output ports. We have plans to allow a number of different strategies
-for doing this.
-
-@defstruct[connection
-           ([timer timer?]
-            [i-port input-port?] [o-port output-port?] [custodian custodian?]
-            [close? boolean?])]{
- A connection is a pair of ports (@racket[i-port] and @racket[o-port]) that is
- ready to close after the current job if @racket[close?] is @racket[#t]. Resources
- associated with the connection should be allocated under @racket[custodian].
- The connection will last until @racket[timer] triggers.
-}
-
-@defproc[(connection-manager? [x any/c]) boolean?]{
- Determines if @racket[x] is a connection manager.
-}
-
-@defproc[(start-connection-manager)
-         connection-manager?]{
- Runs the connection manager (now just the timer manager).
-}
-
-@defproc[(new-connection [cm connection-manager?]
-                         [timeout number?]
-                         [i-port input-port?]
-                         [o-port output-port?]
-                         [cust custodian?]
-                         [close? boolean?])
-         connection?]{
- Constructs a connection with a timer with a trigger of @racket[timeout] that calls
- @racket[kill-connection!].
-}
-
-@defproc[(kill-connection! [c connection?])
-         void]{
- Closes the ports associated with @racket[c], kills the timer, and shuts down
- the custodian.
-}
-
-@defproc[(adjust-connection-timeout! [c connection?]
-                                     [t number?])
-         void]{
- Calls @racket[increment-timer!] with the timer behind @racket[c] with @racket[t].
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/contracts.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/contracts.scrbl
deleted file mode 100644
index f4c9f187b7..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/contracts.scrbl
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "servlet-structs"]{Responses}
-@(require (for-label web-server/servlet/servlet-structs
-                     web-server/http
-                     web-server/servlet))
-
-@defmodule[web-server/servlet/servlet-structs]{
-
-Servlets communicate to the Web Server by returning HTTP responses. In order to
-accommodate lightweight programs (and backwards compatibility), the Web Server
-provides an indirection from application-specific response formats and the internal
-HTTP response format, @racket[response].
-
-@deftogether[[
-@defproc[(can-be-response? [x any/c])
-          boolean?]
-@defproc[(any->response [x any/c])
-         (or/c false/c response?)]
-@defproc[(set-any->response! [new-any->response (-> any/c (or/c false/c response?))])
-         void]
-]]{
-
-   @racket[any->response] coerces any value into a response or returns @racket[#f] if coercion is not possible.
-   @racket[any->response] guarantees that any @racket[response?] input must always be returned exactly (i.e. @racket[eq?].)
-   The default always returns @racket[#f], signifying that no coercion is possible.
-   
-   @racket[can-be-response?] returns @racket[#t] if @racket[x] is a response or can be turned into a response by calling
-   @racket[any->response].
-   
-   Users of @racket[any->response] should protect themselves by using @racket[can-be-response?] as a contract.
-   If they do so, they can safely ignore the @racket[#f] return case of @racket[any->response].
-   
-   @racket[set-any->response!] replaces the global @racket[any->response] with the supplied argument. This
-   function should return the same value for @racket[eq?] inputs to ensure that @racket[can-be-response?] is
-   any accurate predicate. Similarly, this function should be cheap to call multiple times on the same input,
-   since it will be used in contract checking as well as coercion before transmission. You may want to use a
-   weak @racket[eq?]-based hash-table to cache the results for this purpose. (See @racket[make-weak-hasheq].)
-   
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/ctable-structs.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/ctable-structs.scrbl
deleted file mode 100644
index c982c0a939..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/ctable-structs.scrbl
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "configuration-table-structs"]{Configuration Table Structure}
-@(require (for-label web-server/configuration/configuration-table-structs
-                     web-server/http
-                     net/url
-                     web-server/private/util))
-
-@defmodule[web-server/configuration/configuration-table-structs]{
-
-This module provides the following structures that
-represent a standard configuration (see @secref["web-server-unit"]) of the @web-server .
-The contracts on this structure influence the valid types of values in
-the configuration table S-expression file format described in
-@secref["configuration-table"].
-
-@defstruct[configuration-table
-           ([port port-number?]
-            [max-waiting exact-nonnegative-integer?]
-            [initial-connection-timeout natural-number/c]
-            [default-host host-table?]
-            [virtual-hosts (listof (cons/c string? host-table?))])]
-
-@defstruct[host-table
-           ([indices (listof string?)]
-            [log-format symbol?]
-            [messages messages?]
-            [timeouts timeouts?]
-            [paths paths?])]
-
-@defstruct[host
-           ([indices (listof string?)]
-            [log-format symbol?]
-            [log-path (or/c false/c path-string?)]
-            [passwords (or/c false/c path-string?)]
-            [responders responders?]
-            [timeouts timeouts?]
-            [paths paths?])]
-
-@defstruct[responders
-           ([servlet (url? any/c . -> . response?)]
-            [servlet-loading (url? any/c . -> . response?)]
-            [authentication (url? (cons/c symbol? string?) . -> . response?)]
-            [servlets-refreshed (-> response?)]
-            [passwords-refreshed (-> response?)]
-            [file-not-found (request? . -> . response?)]
-            [protocol (url? . -> . response?)]
-            [collect-garbage (-> response?)])]
-
-@defstruct[messages
-           ([servlet string?]
-            [authentication string?]
-            [servlets-refreshed string?]
-            [passwords-refreshed string?]
-            [file-not-found string?]
-            [protocol string?]
-            [collect-garbage string?])]
-
-@defstruct[timeouts
-           ([default-servlet number?]
-            [password number?]
-            [servlet-connection number?]
-            [file-per-byte number?]
-            [file-base number?])]
-
-@defstruct[paths
-           ([conf (or/c false/c path-string?)]
-            [host-base (or/c false/c path-string?)]
-            [log (or/c false/c path-string?)]
-            [htdocs (or/c false/c path-string?)]
-            [servlet (or/c false/c path-string?)]
-            [mime-types (or/c false/c path-string?)]
-            [passwords (or/c false/c path-string?)])]
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/ctable.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/ctable.scrbl
deleted file mode 100644
index 47a007ceeb..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/ctable.scrbl
+++ /dev/null
@@ -1,109 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "configuration-table"]{Configuration Table}
-@(require (for-label web-server/configuration/configuration-table
-                     web-server/configuration/configuration-table-structs
-                     web-server/dispatchers/dispatch-log))
-
-@defmodule[web-server/configuration/configuration-table]{
-
-This module provides functions for
-reading, writing, parsing, and printing @racket[configuration-table]
-structures.
-
-@defthing[default-configuration-table-path path?]{The default configuration table S-expression file.}
-
-@defthing[configuration-table-sexpr? (any . -> . boolean?)]{
- Equivalent to @racket[list?].
-}
-
-@defproc[(sexpr->configuration-table (sexpr configuration-table-sexpr?))
-         configuration-table?]{
- This function converts a @racket[configuration-table] from an S-expression.
-}
-
-@defproc[(configuration-table->sexpr (ctable configuration-table?))
-         configuration-table-sexpr?]{
- This function converts a @racket[configuration-table] to an S-expression.
-}
-
-@index{Web Server configuration table}
-The configuration table format is:
-
-@index{port} @index{max-waiting} @index{initial-connection-timeout}
-@index{default-host-table} @index{virtual-host-table}
-
-@racketblock[
-`((port ,integer?)
-  (max-waiting ,exact-integer?)
-  (initial-connection-timeout ,integer?)
-  (default-host-table
-    ,host-table-sexpr?)
-  (virtual-host-table
-   (list ,symbol? ,host-table-sexpr?)
-   ...))]
-
-where a @racket[host-table-sexpr] is:
-
-@index{host-table} @index{default-indices} @index{log-format}
-@index{messages} @index{servlet-message}
-@index{authentication-message} @index{servlets-refreshed}
-@index{passwords-refreshed} @index{file-not-found-message}
-@index{protocol-message} @index{collect-garbage} @index{timeouts}
-@index{default-servlet-timeout} @index{password-connection-timeout}
-@index{servlet-connection-timeout}
-@index{file-per-byte-connection-timeout}
-@index{file-base-connection-timeout} @index{paths}
-@index{configuration-root} @index{host-root} @index{log-file-path}
-@index{file-root} @index{servlet-root} @index{mime-types}
-@index{password-authentication}
-
-@racketblock[
-`(host-table
-  (default-indices ,string? ...)
-  (log-format ,symbol?)
-  (messages
-   (servlet-message ,path-string?)
-   (authentication-message ,path-string?)
-   (servlets-refreshed ,path-string?)
-   (passwords-refreshed ,path-string?)
-   (file-not-found-message ,path-string?)
-   (protocol-message ,path-string?)
-   (collect-garbage ,path-string?))
-  (timeouts
-   (default-servlet-timeout ,integer?)
-   (password-connection-timeout ,integer?)
-   (servlet-connection-timeout ,integer?)
-   (file-per-byte-connection-timeout ,integer?)
-   (file-base-connection-timeout ,integer))
-  (paths
-   (configuration-root ,path-string?)
-   (host-root ,path-string?)
-   (log-file-path ,path-string?)
-   (file-root ,path-string?)
-   (servlet-root ,path-string?)
-   (mime-types ,path-string?)
-   (password-authentication ,path-string?)))]
-
-In this syntax, the @racket['messages] paths are relative to the
-@racket['configuration-root] directory.  All the paths in
-@racket['paths] except for @racket['servlet-root] are relative to
-@racket['host-root] (other than @racket['host-root] obviously.)
-The @racket['servlet-root] path is relative to @racket['file-root].
-
-Allowable @racket['log-format]s are those accepted by @racket[log-format->format].
-
-Note: You almost always want to leave everything in the @racket['paths] section the default except the @racket['host-root].
-
-@defproc[(read-configuration-table (path path-string?))
-         configuration-table?]{
-This function reads a @racket[configuration-table] from @racket[path].
-}
-
-@defproc[(write-configuration-table (ctable configuration-table?) (path path-string?))
-         void]{
-This function writes a @racket[configuration-table] to @racket[path].
-}
-              
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatch-server.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatch-server.scrbl
deleted file mode 100644
index d5e7336ec5..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatch-server.scrbl
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "dispatch-server-unit"]{Dispatching Server}
-@(require (for-label web-server/private/dispatch-server-unit
-                     web-server/private/dispatch-server-sig
-                     web-server/private/util
-                     web-server/private/connection-manager
-                     net/tcp-sig
-                     unstable/contract
-                     racket/async-channel
-                     racket/tcp
-                     web-server/web-server-sig))
-
-The @web-server is just a configuration of a dispatching server.
-
-@section{Dispatching Server Signatures}
-
-@defmodule[web-server/private/dispatch-server-sig]{
-
-The @racketmodname[web-server/private/dispatch-server-sig] library
-provides two signatures.
-
-@defsignature[dispatch-server^ ()]{
-
-The @racket[dispatch-server^] signature is an alias for
-@racket[web-server^].
-
- @defproc[(serve) (->* () (#:confirmation-channel (or/c false/c async-channel?)) (-> void))]{
-  Runs the server---the confirmation channel will be send an exception if one occurs starting the server or the port number if there is none---and returns a procedure that shuts down the server.
- }
-
- @defproc[(serve-ports [ip input-port?]
-                       [op output-port?])
-          void]{
- Serves a single connection represented by the ports @racket[ip] and
- @racket[op].
- }
-}
-
-@defsignature[dispatch-server-config^ ()]{
-
- @defthing[port tcp-listen-port?]{Specifies the port to serve on.}
- @defthing[listen-ip (or/c string? false/c)]{Passed to @racket[tcp-listen].}
- @defthing[max-waiting exact-nonnegative-integer?]{Passed to @racket[tcp-listen].}
- @defthing[initial-connection-timeout integer?]{Specifies the initial timeout given to a connection.}
- @defproc[(read-request [c connection?]
-                        [p tcp-listen-port?]
-                        [port-addresses 
-                         (input-port? . -> . (values string? string?))])
-          (values any/c boolean?)]{
-  Defines the way the server reads requests off connections to be passed
-  to @racket[dispatch].
- }
- @defthing[dispatch (-> connection? any/c void)]{How to handle requests.}
-}
-
-}
-
-@section{Dispatching Server Unit}
-
-@defmodule[web-server/private/dispatch-server-unit]{
-
-The @racketmodname[web-server/private/dispatch-server-unit] module
-provides the unit that actually implements a dispatching server.
-
-@defthing[dispatch-server@ (unit/c (import tcp^ dispatch-server-config^) 
-                                   (export dispatch-server^))]{
- Runs the dispatching server config in a very basic way, except that it uses
- @secref["connection-manager"] to manage connections.
-}
-
-}
-
-@section{Threads and Custodians}
-
-The dispatching server runs in a dedicated thread. Every time a connection is initiated, a new thread is started to handle it.
-Connection threads are created inside a dedicated custodian that is a child of the server's custodian. When the server is used to
-provide servlets, each servlet also receives a new custodian that is a child of the server's custodian @bold{not} the connection
-custodian.
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatch-servlets.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatch-servlets.scrbl
deleted file mode 100644
index a184c0f168..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatch-servlets.scrbl
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt"
-          (for-label web-server/http
-                     web-server/private/servlet
-                     web-server/configuration/responders
-                     web-server/dispatchers/filesystem-map
-                     web-server/servlet/setup
-                     net/url
-                     web-server/managers/manager))
-
-@title[#:tag "dispatch-servlets"]{Serving Servlets}
-@a-dispatcher[web-server/dispatchers/dispatch-servlets
-              @elem{defines a dispatcher constructor
-                    that runs servlets.}]{
-          
-@defthing[url->servlet/c contract?]{Equivalent to @racket[(url? . -> . servlet?)]}
-
-@defproc[(make-cached-url->servlet
-          [url->path url->path/c]
-          [path->serlvet path->servlet/c])
-         (values (-> void)
-                 url->servlet/c)]{
- The first return value flushes the cache.  The second is a procedure
- that uses @racket[url->path] to resolve the URL to a path, then uses
- @racket[path->servlet] to resolve that path to a servlet, caching the
- results in an internal table.
-}
-
-@defproc[(make [url->servlet url->servlet/c]
-               [#:responders-servlet-loading
-                responders-servlet-loading
-                (url? exn? . -> . can-be-response?)
-                servlet-loading-responder]
-               [#:responders-servlet
-                responders-servlet
-                (url? exn? . -> . can-be-response?)
-                servlet-error-responder])
-         dispatcher/c]{
- This dispatcher runs racket servlets, using @racket[url->servlet] to
- resolve URLs to the underlying servlets.  If servlets have errors
- loading, then @racket[responders-servlet-loading] is used. Other errors
- are handled with @racket[responders-servlet]. If a servlet raises calls
- @racket[next-dispatcher], then the signal is propagated by this
- dispatcher.
-}
-
-}
-
-@include-section["servlet-setup.scrbl"]
-
-@include-section["namespace.scrbl"]
-
-@section{Internal Servlet Representation}
-
-@defmodule[web-server/private/servlet]{
-  @defstruct[servlet ([custodian custodian?]
-                      [namespace namespace?]
-                      [manager manager?]
-                      [directory path-string?]
-                      [handler (request? . -> . can-be-response?)])
-                     #:mutable]{
-   Instances of this structure hold the necessary parts of a servlet:
-   the @racket[custodian] responsible for the servlet's resources,
-   the @racket[namespace] the servlet is executed within,
-   the @racket[manager] responsible for the servlet's continuations,
-   the current @racket[directory] of the servlet,
-   and the @racket[handler] for all requests to the servlet.
-  }
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatch.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatch.scrbl
deleted file mode 100644
index 3792896a4b..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatch.scrbl
+++ /dev/null
@@ -1,255 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt"
-          racket/sandbox)
-@(require (for-label web-server/servlet
-                     web-server/dispatchers/dispatch
-                     web-server/servlet-env
-                     web-server/dispatch/extend
-                     (except-in syntax/parse attribute)
-                     racket/match
-                     racket/list
-                     net/url
-                     xml))
-
-@(define dispatch-eval
-   (let ([the-eval (make-base-eval)])
-     (the-eval '(require web-server/http
-                         net/url
-                         racket/list 
-                         racket/promise
-                         web-server/dispatch
-                         web-server/dispatch/extend))
-     the-eval))
-
-@title[#:tag "dispatch"]{URL-Based Dispatch}
-
-@defmodule[web-server/dispatch]
-
-The library allows the creation of two-way mappings between permanent URLs and request-handling procedures.
-
-@margin-note{This library was inspired by the @racketmodname[(planet untyped/dispatch)] package.}
-
-@section{Using @racketmodname[web-server/dispatch]}
-
-Suppose you are writing a blog application and want pretty URLs for different views of the site.
-You would define some URL dispatching rules as follows:
-
-@interaction[#:eval dispatch-eval
- (define-values (blog-dispatch blog-url)
-   (dispatch-rules
-    [("") list-posts]
-    [("posts" (string-arg)) review-post]
-    [("archive" (integer-arg) (integer-arg)) review-archive]
-    [else list-posts]))
-]
-
-And define your request handlers as follows:
-@interaction[#:eval dispatch-eval
-(define (list-posts req) `(list-posts))
-(define (review-post req p) `(review-post ,p))
-(define (review-archive req y m) `(review-archive ,y ,m))
-]
-
-Now when a request is sent to your application, it will be directed to the appropriate handler:
-@interaction[#:eval dispatch-eval
-(define (url->request u)
-  (make-request #"GET" (string->url u) empty
-                (delay empty) #f "1.2.3.4" 80 "4.3.2.1"))
-(blog-dispatch 
- (url->request "http://www.chrlsnchrg.com"))
-(blog-dispatch 
- (url->request "http://www.chrlsnchrg.com/"))
-(blog-dispatch
- (url->request 
-  "http://www.chrlsnchrg.com/posts/Extracurricular-Activity"))
-(blog-dispatch
- (url->request "http://www.chrlsnchrg.com/archive/1984/10"))
-(blog-dispatch
- (url->request "http://www.chrlsnchrg.com/contact"))
-]       
-
-You can also generate these pretty URLs from procedure calls:
-@interaction[#:eval dispatch-eval
-(blog-url list-posts)
-(blog-url review-post "Another-Saturday-Night")
-(blog-url review-archive 1984 11)
-]
-
-After mastering the world of blogging software, you decide to put the ubiquitous Add-Two-Numbers.com out of business with Sum.com:
-@interaction[#:eval dispatch-eval
- (define-values (sum-dispatch sum-url)
-   (dispatch-rules
-    [((integer-arg) ...) sum]
-    [else (lambda (req) (sum req empty))]))
- 
- (define (sum req is)
-   (apply + is))
- 
- (sum-dispatch (url->request "http://www.sum.com/"))
- (sum-dispatch (url->request "http://www.sum.com/2"))
- (sum-dispatch (url->request "http://www.sum.com/2/3/4"))
- (sum-dispatch (url->request "http://www.sum.com/5/10/15/20"))
- 
- (sum-url sum empty)
- (sum-url sum (list 1))
- (sum-url sum (list 2 3 5 7))
-]
-
-When you use @racketmodname[web-server/dispatch] with
-@racket[serve/servlet], you almost always want to use the
-@racket[#:servlet-regexp] argument with the value @racket[""] to
-capture all top-level requests. However, make sure you don't include
-an @racket[else] in your rules if you are also serving static files,
-or else the filesystem server will never see the requests.
-
-@section{API Reference}
-
-@defform/subs[#:literals (else)
- (dispatch-rules
-  dispatch-clause ...
-  maybe-else-clause)
-([dispatch-clause
-  [dispatch-pattern maybe-method dispatch-fun]]
- [dispatch-pattern
-  ()
-  (string . dispatch-pattern)
-  (bidi-match-expander ... . dispatch-pattern)
-  (bidi-match-expander . dispatch-pattern)]
- [maybe-method
-  code:blank
-  (code:line #:method method)]
- [method pat]
- [maybe-else-clause
-  code:blank
-  [else else-fun]])
-#:contracts
-([else-fun (request? . -> . any)]
- [dispatch-fun (request? any/c ... . -> . any)])]{
-
- Returns two values: the first is a dispatching function with the
-contract @racket[(request? . -> . any)] that calls the appropriate
-@racket[dispatch-fun] based on the first @racket[dispatch-pattern]
-that matches the request's URL (and method), the second is a URL-generating
-function with the contract @racket[(procedure? any/c ... . ->
-. string?)] that generates a URL using @racket[dispatch-pattern] for
-the @racket[dispatch-fun] given as its first argument.
-
- If @racket[else-fun] is left out, one is provided that calls
-@racket[(next-dispatcher)] to signal to the Web Server that this
-dispatcher does not apply.
-
- The @racket[_method] syntax is used in a @racket[match] expression to
-match the @racket[request-method] part of the incoming request
-object. However, since HTTP allows methods to use any case, the byte
-string from @racket[request-method] is normalized to a lower-case
-string. Thus, valid patterns are things like: @racket["get"],
-@racket["post"], @racket["head"], @racket[(or "get" "post")], etc.
-
- If @racket[_method] is left out, it assumed to apply to requests
-without methods and GET methods.
-}
-
-@defform[
- (dispatch-rules+applies
-  dispatch-clause ...
-  maybe-else-clause)]{
- Like @racket[dispatch-rules], except returns a third value with the contract @racket[(request? . -> . boolean?)] that returns
-      @racket[#t] if the dispatching rules apply to the request and @racket[#f] otherwise.
-      }
-
-@defform[
- (dispatch-case
-  dispatch-clause ...
-  maybe-else-clause)]{
- Returns a dispatching function as described by @racket[dispatch-rules].
-}
-
-@defform[#:literals (else)
-         (dispatch-url
-          [dispatch-pattern dispatch-fun]
-          ...)
-         #:contracts
-         ([dispatch-fun (request? any/c ... . -> . any)])]{
- Returns a URL-generating function as described by @racket[dispatch-rules].
-}
-
-@defproc[(serve/dispatch [dispatch (request? . -> . can-be-response?)])
-         void]{
- Calls @racket[serve/servlet] with a @racket[#:servlet-regexp] argument (@racket[#rx""]) so that every request is handled by @racket[dispatch].
-}
-              
-@section{Imperative Dispatch Containers}
-
-@racket[dispatch-rules] is purely functional. This presents a more declarative interface, but inhibits some programming and modularity patterns. @deftech{Containers} provide an imperative overlay atop @racket[dispatch-rules].
-
-@defproc[(container? [x any/c]) boolean?]{ Identifies @tech{containers}. }
-
-@defform[(define-container container-id (dispatch-id url-id))]{
- Defines @racket[container-id] as a container as well as @racket[dispatch-id] as its dispatching function and @racket[url-id] as its URL lookup function.}
-
-@defform[(dispatch-rules! container-expr [dispatch-pattern dispatch-fun] ...)]{
- Like @racket[dispatch-rules], but imperatively adds the patterns to the container specified by @racket[container-expr]. The new rules are consulted @emph{before} any rules already in the container. }
-              
-@section{Built-in URL patterns}
-
-@racketmodname[web-server/dispatch] builds in a few useful URL component patterns.
-
-@defform[(number-arg)]{
- A @tech{bi-directional match expander} that parses a @racket[number?] from the URL and generates a URL with a number's encoding as a string.
-}
-
-@defform[(integer-arg)]{
- A @tech{bi-directional match expander} that parses a @racket[integer?] from the URL and generates a URL with a integer's encoding as a string.
-}
-
-@defform[(real-arg)]{
- A @tech{bi-directional match expander} that parses a @racket[real?] from the URL and generates a URL with a real's encoding as a string.
-}
-
-@defform[(string-arg)]{
- A @tech{bi-directional match expander} that parses a @racket[string?] from the URL and generates a URL containing the string.
-}
-
-@defform[(symbol-arg)]{
- A @tech{bi-directional match expander} that parses a @racket[symbol?] from the URL and generates a URL with a symbol's encoding as a string.
-}
-
-@section{Extending @racketmodname[web-server/dispatch]}
-
-@defmodule[web-server/dispatch/extend]
-
-You can create new URL component patterns by defining @tech{bi-directional match expanders}.
-
-@defform[(define-bidi-match-expander id in-xform out-xform)]{
- Binds @racket[id] to a @deftech{bi-directional match expander}
- where @racket[in-xform] is a match expander (defined by @racket[define-match-expander]) that is used when parsing URLs
- and @racket[out-xform] is one used when generating URLs.
- 
- Both @racket[in-xform] and @racket[out-xform] should use the syntax @racket[(_xform arg ... _id)] where the @racket[arg]s are 
- specific to @racket[id] and compatible with both @racket[in-xform] and @racket[out-xform]. @racket[_id] will typically be provided
- automatically by @racket[dispatch-rules].
-}
-
-@defidform[bidi-match-going-in?]{
- A @tech[#:doc '(lib "scribblings/reference/reference.scrbl")]{syntax parameter} used by @tech{bi-directional match expanders} to determine if a URL is being parsed or generated.
-}
-
-When defining new patterns, you may find it useful to use these helper functions:
-
-@defform[(define-coercion-match-expander id test? coerce)]{
- Binds @racket[id] to a match expander that expands @racket[(id _x)] to
- @racket[(? test? (app coerce _x))] (i.e., uses @racket[test?] to determine if the pattern matches and @racket[coerce] to transform the binding.)
-}
- 
-@defproc[(make-coerce-safe? [coerce (any/c . -> . any/c)])
-         (any/c . -> . boolean?)]{
- Returns a function that returns @racket[#t] if @racket[coerce] would not throw an exception or return @racket[#f] on its input.
-         
- @examples[#:eval dispatch-eval
-  (define string->number? (make-coerce-safe? string->number))
-  (string->number? "1")
-  (string->number? "1.2")
-  (string->number? "+inf.0")
-  (string->number? "one")
- ]
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatchers.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatchers.scrbl
deleted file mode 100644
index 4a006547a1..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dispatchers.scrbl
+++ /dev/null
@@ -1,428 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt"
-          (for-label web-server/http
-                     net/url
-                     web-server/servlet/setup
-                     web-server/configuration/responders
-                     web-server/private/servlet
-                     racket/date
-                     web-server/private/util
-                     web-server/private/connection-manager
-                     unstable/contract)
-          (for-syntax racket/base))
-
-@title[#:tag "dispatchers"
-       #:style 'toc]{Dispatchers}
-
-Since the @web-server is really just a particular configuration of a
-dispatching server, there are several dispatchers that are defined
-to support the @|web-server|. Other dispatching servers may find these useful. In particular, if you want
-a peculiar processing pipeline for your @web-server installation, refer to this
-documentation.
-
-@local-table-of-contents[]
-
-@; ------------------------------------------------------------
-@section[#:tag "dispatch"]{General}
-@(require (for-label web-server/dispatchers/dispatch))
-
-@defmodule[web-server/dispatchers/dispatch]{
-
-This module provides a few functions for dispatchers in general.
-
-@defthing[dispatcher/c contract?]{
- Equivalent to @racket[(connection? request? . -> . void)].
-}
-
-@defproc[(dispatcher-interface-version/c (any any/c)) boolean?]{
- Equivalent to @racket[(symbols 'v1)]
-}
-
-@defstruct[exn:dispatcher ()]{
- An exception thrown to indicate that a dispatcher does not apply to a particular
- request.
-}
-
-@defproc[(next-dispatcher) void]{
- Raises a @racket[exn:dispatcher]
-}
-
-As the @racket[dispatcher/c] contract suggests, a dispatcher is a function that takes a connection
-and request object and does something to them. Mostly likely it will generate
-some response and output it on the connection, but it may do something
-different. For example, it may apply some test to the request object, perhaps
-checking for a valid source IP address, and error if the test is not passed, and call @racket[next-dispatcher]
-otherwise.
-
-Consider the following example dispatcher, that captures the essence of URL rewriting:
-@racketblock[
- (code:comment "(url? -> url?) dispatcher/c -> dispatcher/c")
- (lambda (rule inner)
-   (lambda (conn req)
-     (code:comment "Call the inner dispatcher...")
-     (inner conn
-            (code:comment "with a new request object...")
-            (struct-copy request req
-                         (code:comment "with a new URL!")
-                         [request-uri (rule (request-uri req))]))))
-]
-
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "filesystem-map"]{Mapping URLs to Paths}
-@(require (for-label web-server/dispatchers/filesystem-map))
-
-@defmodule[web-server/dispatchers/filesystem-map]{
-
-This module provides a means of mapping
-URLs to paths on the filesystem.
-
-@defthing[url->path/c contract?]{
- This contract is equivalent to @racket[((url?) . ->* . (path? (listof path-piece?)))].
- The returned @racket[path?] is the path on disk. The list is the list of
- path elements that correspond to the path of the URL.}
-
-@defproc[(make-url->path (base path-string?))
-         url->path/c]{
- The @racket[url->path/c] returned by this procedure considers the root
- URL to be @racket[base]. It ensures that @racket[".."]s in the URL
- do not escape the @racket[base] and removes them silently otherwise.}
-
-@defproc[(make-url->valid-path (url->path url->path/c))
-         url->path/c]{
- Runs the underlying @racket[url->path], but only returns if the path
- refers to a file that actually exists. If it is does not, then the suffix
- elements of the URL are removed until a file is found. If this never occurs,
- then an error is thrown.
-
- This is primarily useful for dispatchers that allow path information after
- the name of a service to be used for data, but where the service is represented
- by a file. The most prominent example is obviously servlets.}
-
-@defproc[(filter-url->path [regex regexp?]
-                                 [url->path url->path/c])
-         url->path/c]{
- Runs the underlying @racket[url->path] but will only return if the
- path, when considered as a string, matches the @racket[regex]. This is
- useful to disallow strange files, like GIFs, from being considered
- servlets when using the servlet dispatchers. It will return a
- @racket[exn:fail:filesystem:exists?] exception if the path does not
- match.
-}
-
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "dispatch-sequencer"]{Sequencing}
-@a-dispatcher[web-server/dispatchers/dispatch-sequencer
-              @elem{defines a dispatcher constructor
-                 that invokes a sequence of dispatchers until one applies.}]{
-
-@defproc[(make (dispatcher dispatcher/c) ...)
-         dispatcher/c]{
- Invokes each @racket[dispatcher], invoking the next if the first
- calls @racket[next-dispatcher]. If no @racket[dispatcher] applies,
- then it calls @racket[next-dispatcher] itself.
-}}
-
-@; ------------------------------------------------------------
-@section[#:tag "dispatch-timeout"]{Timeouts}
-@a-dispatcher[web-server/dispatchers/dispatch-timeout
-               @elem{defines a dispatcher constructor
-                  that changes the timeout on the connection and calls the next
-                  dispatcher.}]{
-
-@defproc[(make [new-timeout integer?])
-         dispatcher/c]{
- Changes the timeout on the connection with @racket[adjust-connection-timeout!]
- called with @racket[new-timeout].
-}}
-
-@; ------------------------------------------------------------
-@section[#:tag "dispatch-lift"]{Lifting Procedures}
-@a-dispatcher[web-server/dispatchers/dispatch-lift
-              @elem{defines a dispatcher constructor.}]{
-
-@defproc[(make (proc (request? . -> . response?)))
-         dispatcher/c]{
- Constructs a dispatcher that calls @racket[proc] on the request
- object, and outputs the response to the connection.
-}}
-
-@; ------------------------------------------------------------
-@section[#:tag "dispatch-filter"]{Filtering Requests}
-@a-dispatcher[web-server/dispatchers/dispatch-filter
-              @elem{defines a dispatcher constructor
-                 that calls an underlying dispatcher
-                 with all requests that pass a predicate.}]{
-
-@defproc[(make (regex regexp?) (inner dispatcher/c))
-         dispatcher/c]{
- Calls @racket[inner] if the URL path of the request, converted to
- a string, matches @racket[regex]. Otherwise, calls @racket[next-dispatcher].
-}}
-
-@; ------------------------------------------------------------
-@section[#:tag "dispatch-pathprocedure"]{Procedure Invocation upon Request}
-@a-dispatcher[web-server/dispatchers/dispatch-pathprocedure
-              @elem{defines a dispatcher constructor
-                   for invoking a particular procedure when a request is given to a particular
-                   URL path.}]{
-
-@defproc[(make (path string?) (proc (request? . -> . response?)))
-         dispatcher/c]{
- Checks if the request URL path as a string is equal to @racket[path]
- and if so, calls @racket[proc] for a response.
-}
-
-This is used in the standard @web-server pipeline to provide
-a URL that refreshes the password file, servlet cache, etc.}
-
-@; ------------------------------------------------------------
-@section[#:tag "dispatch-log"]{Logging}
-@a-dispatcher[web-server/dispatchers/dispatch-log
-              @elem{defines a dispatcher constructor
-                    for transparent logging of requests.}]{
-
-@defthing[format-req/c contract?]{
- Equivalent to @racket[(request? . -> . string?)].
-}
-
-@defthing[paren-format format-req/c]{
- Formats a request by:
- @racketblock[
-  (format 
-   "~s\n"
-   (list 'from (request-client-ip req)
-         'to (request-host-ip req)
-         'for (url->string (request-uri req)) 'at
-         (date->string
-          (seconds->date (current-seconds)) #t)))
-  ]}
-
-@defthing[extended-format format-req/c]{
- Formats a request by:
- @racketblock[
-  (format 
-   "~s\n"
-   `((client-ip ,(request-client-ip req))
-     (host-ip ,(request-host-ip req))
-     (referer 
-      ,(let ([R (headers-assq* 
-                 #"Referer"
-                 (request-headers/raw req))])
-         (if R
-             (header-value R)
-             #f)))
-     (uri ,(url->string (request-uri req)))
-     (time ,(current-seconds))))
- ]}
-
-@defthing[apache-default-format format-req/c]{
-
- Formats a request like Apache's default. However, Apache's default
- includes information about the response to a request, which this
- function does not have access to, so it defaults the last two fields
- to 200 and 512.
-
-}
-
-@defthing[log-format/c contract?]{
- Equivalent to @racket[(symbols 'parenthesized-default 'extended 'apache-default)].
-}
-
-@defproc[(log-format->format [id log-format/c])
-         format-req/c]{
- Maps @racket['parenthesized-default] to @racket[paren-format],
- @racket['extended] to @racket[extended-format], and
- @racket['apache-default] to @racket[apache-default-format].
-}
-
-@defproc[(make [#:format format format-req/c paren-format]
-               [#:log-path log-path path-string? "log"])
-         dispatcher/c]{
- Logs requests to @racket[log-path] by using @racket[format] to format the requests.
- Then invokes @racket[next-dispatcher].
-}}
-
-@; ------------------------------------------------------------
-@section[#:tag "dispatch-passwords"]{Password Protection}
-@a-dispatcher[web-server/dispatchers/dispatch-passwords
-              @elem{defines a dispatcher constructor
-                    that performs HTTP Basic authentication filtering.}]{
-
-@(require (for-label web-server/http
-                     net/url
-                     web-server/configuration/responders))
-
-@defthing[denied?/c contract?]{
-  Equivalent to @racket[(request? . -> . (or/c false/c string?))].  The
-  return is the authentication realm as a string if the request is not
-  authorized and @racket[#f] if the request @emph{is} authorized.
-}
-
-@defproc[(make [denied? denied?/c]
-               [#:authentication-responder
-                authentication-responder
-                (url? header? . -> . response?)
-                (gen-authentication-responder "forbidden.html")])
-         dispatcher/c]{
-  A dispatcher that checks if the request is denied based on
-  @racket[denied?]. If so, then @racket[authentication-responder] is
-  called with a @racket[header] that requests credentials. If not, then
-  @racket[next-dispatcher] is invoked.
-}
-
-@defthing[authorized?/c contract?]{
- Equivalent to
- @racket[(string? (or/c false/c bytes?) (or/c false/c bytes?) . -> . (or/c false/c string?))].
- The input is the URI as a string and the username and passwords as
- bytes.  The return is the authentication realm as a string if the user
- is not authorized and @racket[#f] if the request @emph{is} authorized.
-}
-
-@defproc[(make-basic-denied?/path [authorized? authorized?/c])
-                                  denied?/c]{
-Creates a denied procedure from an authorized procedure.
-}
-
-@defproc[(password-file->authorized? [password-file path-string?])
-         (values (-> void)
-                 authorized?/c)]{
- Creates an authorization procedure based on the given password
- file. The first returned value is a procedure that refreshes the
- password cache used by the authorization procedure.
-
- @racket[password-file] is parsed as:
- @racketblock[(list ([domain : string?]
-                     [path : string?] (code:comment "This string is interpreted as a regex")
-                     (list [user : symbol?]
-                           [pass : string?])
-                     ...)
-                    ...)]
- For example:
- @racketblock['(("secret stuff" "/secret(/.*)?" (bubba "bbq") (|Billy| "BoB")))]
-}}
-
-@; ------------------------------------------------------------
-@section[#:tag "dispatch-host"]{Virtual Hosts}
-@a-dispatcher[web-server/dispatchers/dispatch-host
-              @elem{defines a dispatcher constructor
-                    that calls a different dispatcher based upon the host requested.}]{
-
-@defproc[(make (lookup-dispatcher (symbol? . -> . dispatcher/c)))
-         dispatcher/c]{
- Extracts a host from the URL requested, or the Host HTTP header,
- calls @racket[lookup-dispatcher] with the host, and invokes the
- returned dispatcher. If no host can be extracted, then @racket['none]
- is used.
-}}
-
-@; ------------------------------------------------------------
-@section[#:tag "dispatch-files"]{Serving Files}
-@a-dispatcher[web-server/dispatchers/dispatch-files
-             @elem{allows files to be served.
-                It defines a dispatcher construction procedure.}]{
-
-@defproc[(make [#:url->path url->path url->path/c]
-               [#:path->mime-type path->mime-type (path? . -> . (or/c false/c bytes)?) (lambda (path) #f)]
-               [#:indices indices (listof string?) (list "index.html" "index.htm")])
-         dispatcher/c]{
- Uses @racket[url->path] to extract a path from the URL in the request
- object. If this path does not exist, then the dispatcher does not apply and 
- @racket[next-dispatcher] is invoked.
- If the path is a directory, then the @racket[indices] are checked in order
- for an index file to serve. In that case, or in the case of a path that is
- a file already, @racket[path->mime-type] is consulted for the MIME
- Type of the path. The file is then
- streamed out the connection object.
-
- This dispatcher supports HTTP Range GET requests and HEAD requests.}}
-
-@; ------------------------------------------------------------
-@include-section["dispatch-servlets.scrbl"]
-
-@; ------------------------------------------------------------
-@section[#:tag "dispatch-stat"]{Statistics}
-@a-dispatcher[web-server/dispatchers/dispatch-stat
-              @elem{provides services related to performance
-                    statistics.}]{
-
-@defproc[(make-gc-thread [time integer?])
-         thread?]{
- Starts a thread that calls @racket[(collect-garbage)] every @racket[time] seconds.
-}
-                 
-@defproc[(make)
-         dispatcher/c]{
- Returns a dispatcher that prints memory usage on every request.
-}}
-
-@; ------------------------------------------------------------
-@section[#:tag "limit"]{Limiting Requests}
-@a-dispatcher[web-server/dispatchers/limit
-              @elem{provides a wrapper dispatcher that limits how many requests are serviced at once.}]{
-
-@defproc[(make [limit number?]
-               [inner dispatcher/c]
-               [#:over-limit over-limit (symbols 'block 'kill-new 'kill-old) 'block])
-         dispatcher/c]{
- Returns a dispatcher that defers to @racket[inner] for work, but will forward a maximum of @racket[limit] requests concurrently.
-         
- If there are no additional spaces inside the limit and a new request is received, the @racket[over-limit] option determines what is done.
- The default (@racket['block]) causes the new request to block until an old request is finished being handled.
- If @racket[over-limit] is @racket['kill-new], then the new request handler is killed---a form of load-shedding.
- If @racket[over-limit] is @racket['kill-old], then the oldest request handler is killed---prioritizing new connections over old.
- (This setting is a little dangerous because requests might never finish if there is constant load.)
-}}
-
-@(require (for-label
-           web-server/web-server
-           web-server/http
-           (prefix-in limit: web-server/dispatchers/limit)
-           (prefix-in filter: web-server/dispatchers/dispatch-filter)
-           (prefix-in sequencer: web-server/dispatchers/dispatch-sequencer)))
-
-Consider this example:
-@racketmod[
- racket
- 
-(require web-server/web-server
-         web-server/http
-         web-server/http/response
-         (prefix-in limit: web-server/dispatchers/limit)
-         (prefix-in filter: web-server/dispatchers/dispatch-filter)
-         (prefix-in sequencer: web-server/dispatchers/dispatch-sequencer))
-
-(serve #:dispatch
-       (sequencer:make
-        (filter:make
-         #rx"/limited"
-         (limit:make
-          5
-          (lambda (conn req)
-            (output-response/method
-             conn
-             (response/full
-              200 #"Okay"
-              (current-seconds) TEXT/HTML-MIME-TYPE
-              empty
-              (list (string->bytes/utf-8
-                     (format "hello world ~a"
-                            (sort (build-list 100000 (λ x (random 1000)))
-                                  <)))))
-             (request-method req)))
-          #:over-limit 'block))
-        (lambda (conn req)          
-          (output-response/method
-           conn
-           (response/full 200 #"Okay"
-                          (current-seconds) TEXT/HTML-MIME-TYPE
-                          empty
-                          (list #"<html><body>Unlimited</body></html>"))
-           (request-method req))))
-       #:port 8080)
-
-(do-not-return)
-]
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dummy-stateless-servlet.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dummy-stateless-servlet.rkt
deleted file mode 100644
index 03f9d0b265..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dummy-stateless-servlet.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-
-(define interface-version #f)
-(define stuffer #f)
-(define manager #f)
-(define start #f)
-
-(provide (all-defined-out))
-
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dummy-v1-servlet.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dummy-v1-servlet.rkt
deleted file mode 100644
index 3270291930..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dummy-v1-servlet.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(define interface-version #f)
-(define timeout #f)
-(define start #f)
-
-(provide (all-defined-out))
-
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dummy-v2-servlet.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dummy-v2-servlet.rkt
deleted file mode 100644
index 11eb0b9f29..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/dummy-v2-servlet.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-(define interface-version #f)
-(define start #f)
-(define manager #f)
-
-(provide (all-defined-out))
-
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/faq.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/faq.scrbl
deleted file mode 100644
index 867aa41c2e..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/faq.scrbl
+++ /dev/null
@@ -1,170 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "faq"]{Troubleshooting and Tips}
-
-@section{Why is my servlet failing with a @racket[can-be-response?] contract violation after updating Racket?}
-
-After 5.0.2, the Web Server had a backwards incompatible change that prevents X-expressions and lists of bytes from being directly returned from servlets. Please read @filepath{PLTHOME/collects/web-server/compat/0/README} to learn about porting your servlets forward. Don't worry. It's easy.
-
-@section{Why are my templates not updating on the server when I change the file on disk?}
-
-Templates are compiled into your application, so when you change them there is no connection between that change in the filesystem and the compiled bytecode that is already loaded in a running Web server process. For more discussion, see @secref["update-servlets"].
-
-@section{Why are templates compiled into programs?}
-
-@(require (for-label web-server/templates))
-
-Since templates can include arbitrary Racket code, macros, etc and refer to
-arbitrary identifiers, @racket[include-template] is really just an obscured
-@racket[require].
-
-@section[#:tag "update-servlets"]{Why are my stateful servlets not updating on the server when I change the file on disk?}
-
-@(require (for-label web-server/dispatchers/dispatch-servlets
-                     web-server/servlet-env))
-
-If you are using @racket[serve/servlet], it starts a Web server that directly references a closure that has no connection
-to some file on the disk.
-
-If you are using the command-line tool, or configuration file, then by default,
-the server uses @racket[make-cached-url->servlet] to load servlets
-from the disk. As it loads them, they are cached and the disk is not referred to for future
-requests. This ensures that there is a single namespace for each servlet, so that different instances
-can share resources, such as database connections, and communicate through the store. The default
-configuration of the server (meaning the dispatcher sequence used when you load a configuration file)
-provides a special URL to localhost that will reset the cache: @filepath{/conf/refresh-servlets}.
-
-If you want the server to reload your changed servlet code, then GET this URL and the server will reload the
-servlet on the next request. However, you may be surprised by what happens on the next request. For more discussion, see @secref["refresh-servlets"].
-
-@section[#:tag "refresh-servlets"]{After refreshing my stateful servlet, old captured continuations don't change or old global effects are gone. Why?}
-
-Every load of your servlet is in a fresh namespace. When you refresh, a new namespace without the old effects is created. Old captured continuations
-refer to the original namespace and will never update. It is impossible, in general, to port a continuation from one namespace to another, because the
-code could be arbitrarily different.
-
-@section{How are stateless servlets different from stateful servlets vis a vis refreshing?}
-
-Continuations are serialized with a hash that ensures that any source
-code modifications makes all the old continuations incompatible for
-the same reason native continuations naturally are.
-
-However, this hash only protects against changes in a single source file. Therefore if you modularize
-your application, then only continuations that refer to changed source files will be incompatible.
-For example, if you put all your templates in a single module, then it can change without
-invalidating old continuations.
-
-@section{What special considerations are there for security with the Web Server?}
-
-The biggest problem is that a naive usage of continuations will allow continuations to subvert
-authentication mechanisms. Typically, all that is necessary to execute a continuation is its URL.
-Thus, URLs must be as protected as the information in the continuation.
-
-Consider if you link to a public site from a private continuation URL: the @exec{Referrer} field in
-the new HTTP request will contain the private URL. Furthermore, if your HTTP traffic is in the clear,
-then these URLs can be easily poached.
-
-One solution to this is to use a special cookie as an authenticator. This way, if a URL escapes, it will
-not be able to be used, unless the cookie is present. For advice about how to do this well, see
-@link["http://cookies.lcs.mit.edu/pubs/webauth.html"]{Dos and Don'ts of Client Authentication on the Web}
-from the MIT Cookie Eaters.
-
-Note: It may be considered a great feature that URLs can be shared this way, because delegation is
-easily built into an application via URLs.
-
-@section{My browser displays my page strangely: my CSS is ignored, sections are missing, etc.}
-
-@(require (for-label xml
-                     web-server/http))
-
-@(define xexpr @tech[#:doc '(lib "xml/xml.scrbl")]{X-expression})
-
-Most @web-server developers use @|xexpr|s for representing the
-HTML of their page. However, @|xexpr|s only represent XML and HTML is not exactly
-XML. This is a common source of problems.
-
-For example, XML allows the "empty tag shorthand", e.g. @litchar{<img
-src='...' />}, on every tag, while HTML occasionally requires an end
-tag,
-e.g. @link["http://www.w3.org/TR/html401/interact/forms.html#h-17.7"]{TEXTAREA}.
-Similarly, XML allows an end tag, e.g. @litchar{<img
-src='...'></img>}, on every tag, while HTML occasionally forbides an
-end tag,
-e.g. @link["http://www.w3.org/TR/html401/struct/objects.html#h-13.2"]{IMG}.
-(Of course, browsers do not necessarily implement their HTML parsing
-as specified and may be more or less lenient towards XML-like HTML, so
-your test browser may not treat these forms as problematic.)
-
-Since the @web-server uses @racketmodname[xml] to format @|xexpr|s, it
-inherits @racketmodname[xml]'s default rendering behavior in general
-and its use of "empty tag shorthand" in
-particular. @racketmodname[xml]'s default is always use the shorthand
-with the tags from @racket[html-empty-tags] and never otherwise. This
-list should contain the W3C's approved list. You can change it with
-the @racket[empty-tag-shorthand] parameter.
-
-You can also change your @xexpr so that an end tag is forced. For
-example, @racket['(textarea [(name "text")])] renders as
-@litchar{<textarea name="text" />}, while @racket['(textarea [(name
-"text")] "")] renders as @litchar{<textarea name="text"></textarea>},
-because of the string content in the @|xexpr|. In this case, the end
-tag will always be present regardless of the value of
-@racket[empty-tag-shorthand]. It is not possible to force the other
-possibility; i.e., never include an end tag.
-
-You may think the @web-server could do a better job advertising that
-the contents it serves is more like XML by default. Unfortunately,
-browser support for such
-@link["http://www.w3.org/TR/xhtml-media-types/#media-types"]{advertisement}
-is @link["http://www.w3.org/MarkUp/2004/xhtml-faq#ie"]{lacking}.  You
-can use @racket[response/xexpr] to easily customize your
-application's MIME type and response headers.
-
-Finally, you may find Web browser inspectors such as the Safari
-Inspector, Firebug, and the Google Chrome error console to be useful
-tools in identifying offending tags.
-
-@section{How do I use templates ``dynamically"?}
-
-@(require (for-label web-server/templates))
-
-A common feature request is to include one template in another dynamically. It should hopefully be obvious that @racket[include-template] can be included in a template to include a @emph{static} sub-template. For example,
-@racketblock[
- (include-template "posts.html")
-]
-may appear inside the @filepath{blog.html} template. But you will quickly find that @racket[(include-template _expr)] will fail when @racket[_expr] is not syntactically a path, e.g.:
-@racketblock[
-....
-(include-template (if logged-in?
-                      "user-info.html"
-                      "auth.html"))
-....
-]
-
-What is the solution? The templating system already allows you to parameterize templates so particular components come from the including scope. There is no reason those values can not be the results of other templates. In the previous example, suppose the includer was
-@racketblock[
-(define (main-page logged-in?)
-  (include-template "site.html"))
-]
-
-We could change it to:
-@racketblock[
-(define (main-page logged-in?)
-  (define user-content
-    (if logged-in?
-        (include-template "user-info.html")
-        (include-template "auth.html")))
-  (include-template "site.html"))
-]
-
-and @filepath{site.html} to:
-@racketblock[
-....
-user-content
-....
-]
-
-This allows you to do the same thing but is safer and more efficient: safer because there is no way to include templates that are not named by the programmer and more efficient because all the templates are compiled (and optimized) with the rest of the code.
-
-If you insist on dynamicism, there is always @racket[eval].
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/file-box.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/file-box.scrbl
deleted file mode 100644
index 922875492c..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/file-box.scrbl
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "lang/file-box"]{File Boxes}
-@(require (for-label web-server/lang/file-box
-                     racket/serialize))
-
-@defmodule[web-server/lang/file-box]{
-
-As mentioned earlier, it is dangerous to rely on the store in
-Web Language servlets, due to the deployment scenarios available
-to them. This module provides a simple API to replace
-boxes in a safe way.
-
-@defproc[(file-box? [v any/c])
-         boolean?]{Checks if @racket[v] is a file-box.}
-
-@defproc[(file-box [p path-string?]
-                   [v serializable?])
-         file-box?]{
- Creates a file-box that is stored at @racket[p], with the default
- contents of @racket[v].
-}
-
-@defproc[(file-unbox [fb file-box?])
-         serializable?]{
- Returns the value inside @racket[fb]
-}
-
-@defproc[(file-box-set? [fb file-box?])
-         boolean?]{
- Returns @racket[#t] if @racket[fb] contains a value.
-}
-
-@defproc[(file-box-set! [fb file-box?]
-                        [v serializable?])
-         void]{
- Saves @racket[v] in the file represented by @racket[fb].
-}
-
-@warning{If you plan on using a load-balancer, make sure your file-boxes
-are on a shared medium.}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/formlets.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/formlets.scrbl
deleted file mode 100644
index 59205af56a..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/formlets.scrbl
+++ /dev/null
@@ -1,541 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-@(require (for-label web-server/servlet
-                     racket/list
-                     xml))
-
-@(define xexpr @tech[#:doc '(lib "xml/xml.scrbl")]{X-expression})
-
-@title[#:tag "formlets"]{Formlets: Functional Form Abstraction}
-
-@defmodule[web-server/formlets]
-
-The @web-server provides a kind of Web form abstraction called a @tech{formlet}.
-
-@margin-note{@tech{Formlet}s originate in the work of the @link["http://groups.inf.ed.ac.uk/links/"]{Links} research group in
-their paper @link["http://groups.inf.ed.ac.uk/links/formlets/"]{The Essence of Form Abstraction}.}
-
-@section{Basic Formlet Usage}
-
-Suppose we want to create an abstraction of entering a date in an HTML form. The following
-@deftech{formlet} captures this idea:
-
-@racketblock[
-(define date-formlet
-  (formlet
-   (div "Month:" ,{input-int . => . month}
-        "Day:" ,{input-int . => . day})
-   (list month day)))
-]
-
-The first part of the @racket[formlet] syntax is the template of an @xexpr that is the rendering
-of the formlet. It can contain elements like @racket[,(_formlet . => . _name)] where @racket[_formlet]
-is a formlet expression and @racket[_name] is an identifier bound in the second part of the @racket[formlet]
-syntax.
-
-This formlet is displayed (with @racket[formlet-display]) as the following @xexpr forest (list):
-
-@racketblock[
-(list 
- '(div "Month:" (input ([name "input_0"]))
-       "Day:" (input ([name "input_1"]))))
-]
-
-@racket[date-formlet] not only captures the rendering of the form, but also the request processing
-logic. If we send it an HTTP request with bindings for @racket["input_0"] to @racket["10"] and
-@racket["input_1"] to @racket["3"], with @racket[formlet-process], then it returns:
-
-@racketblock[
-(list 10 3)
-]
-
-which is the second part of the @racket[formlet] syntax, where @racket[month] has been replaced with the
-integer represented by the @racket["input_0"] and @racket[day] has been replaced with the
-integer represented by the @racket["input_1"].
-
-The real power of formlet is that they can be embedded within one another. For instance, suppose we want to
-combine two date forms to capture a travel itinerary. The following formlet does the job:
-
-@racketblock[
-(define travel-formlet
-  (formlet
-   (div
-    "Name:" ,{input-string . => . name}
-    (div
-     "Arrive:" ,{date-formlet . => . arrive}
-     "Depart:" ,{date-formlet . => . depart})
-   (list name arrive depart))))
-]
-
-(Notice that @racket[date-formlet] is embedded twice.) This is rendered as:
-
-@racketblock[
-(list 
- '(div
-   "Name:"
-   (input ([name "input_0"]))
-   (div
-    "Arrive:"
-    (div "Month:" (input ([name "input_1"]))
-         "Day:" (input ([name "input_2"])))
-    "Depart:"
-    (div "Month:" (input ([name "input_3"]))
-         "Day:" (input ([name "input_4"]))))))
-]
-
-Observe that @racket[formlet-display] has automatically generated unique names for each input element. When we pass
-bindings for these names to @racket[formlet-process], the following list is returned:
-
-@racketblock[
-(list "Jay"
-      (list 10 3)
-      (list 10 6))
-]
-
-In all these examples, we used the @racket[input-int] and
-@racket[input-string] formlets. Any value with the @tech{formlet}
-contract can be used in these positions. For example,
-@racket[(to-string (required (text-input)))] could be used as
-well. The rest of the manual gives the details of @tech{formlet}
-usage, extension, and existing formlet combinators.
-
-@section{Static Syntactic Shorthand}
-
-@(require (for-label web-server/formlets/syntax))
-@defmodule[web-server/formlets/syntax]{
-
-Most users will want to use the syntactic shorthand for creating @tech{formlet}s.
-
-@defform[(formlet rendering-xexpr yields-expr)]{
- Constructs a @tech{formlet} with the specified @racket[rendering-xexpr] and the processing
- result is the evaluation of the @racket[yields-expr] expression. The @racket[rendering-xexpr] form is a quasiquoted
- syntactic @xexpr, with three special caveats:
- 
- @racket[,{_formlet-expr . => . _name}] embeds the
- @tech{formlet} given by @racket[_formlet-expr]; the result of processing this formlet is
- available in the @racket[yields-expr] as @racket[_name]. 
- 
- @racket[,{_formlet-expr . => . (values _name ...)}] embeds the
- @tech{formlet} given by @racket[_formlet-expr]; the results of processing this formlet is
- available in the @racket[yields-expr] as @racket[_name ...]. 
- 
- @racket[(#%# _xexpr ...)] renders an @xexpr forest.
- 
- These forms @emph{may not} appear nested inside @racket[unquote] or @racket[unquote-splicing]. For example, this is illegal:
- @racketblock[
-  (formlet (div ,@(for/list ([i (in-range 10)])
-                    `(p ,((text-input) . => . name))))
-           name)
-  ]
-}
-
-@defidform[#%#]{Only allowed inside @racket[formlet] and @racket[formlet*].}
-
-}
-
-@section{Dynamic Syntactic Shorthand}
-
-@(require (for-label web-server/formlets/dyn-syntax))
-@defmodule[web-server/formlets/dyn-syntax]{
-
-The @racket[formlet] syntax is too restrictive for some applications because it forces the @racket[_rendering]
-to be @emph{syntactically} an @|xexpr|. You may discover you want to use a more "dynamic" shorthand.
-
-@defform[(formlet* rendering-expr yields-expr)]{
- Constructs a @tech{formlet} where @racket[rendering-expr] is evaluated (with caveats) to construct the rendering
- and the processing result is the evaluation of the @racket[yields-expr] expression.
- The @racket[rendering-expr] should evaluate to an "@xexpr" that may embed the results of the following forms
- that only have meaning within @racket[formlet*]:
- 
- @racket[{_formlet-expr . =>* . _name}] embeds the
- @tech{formlet} given by @racket[_formlet-expr]; the result of processing this formlet is
- available in the @racket[yields-expr] as @racket[_name]. 
- 
- @racket[{_formlet-expr . =>* . (values _name ...)}] embeds the
- @tech{formlet} given by @racket[_formlet-expr]; the results of processing this formlet is
- available in the @racket[yields-expr] as @racket[_name ...]. 
- 
- @racket[(#%# _xexpr-expr ...)] renders an @xexpr forest.
- 
- Each of these forms evaluates to an opaque value that @racket[rendering-expr] may not manipulate in any way,
- but if it is returned to @racket[formlet*] as part of an "@xexpr" it will be rendered and the formlets processing
- stages will be executed, etc.
- 
- Because these forms @emph{may} appear anywhere in @racket[rendering-expr], they may be duplicated. Therefore, 
- the formlet may render (and be processed) multiple times. Thus, in @racket[yields-expr] the formlet result names are
- bound to lists of results rather than single results as in @racket[formlet]. The result list is ordered according 
- to the order of the formlets in the result of @racket[rendering-expr]. For example, in 
- @racketblock[
-  (formlet* `(div ,@(for/list ([i (in-range 1 10)])
-                      `(p ,(number->string i)
-                          ,((text-input) . =>* . name))))
-            name)
-  ]
- @racket[name] is bound to a list of strings, not a single string, where the first element is the string that
- was inputted next to the string @litchar{1} on the Web page.
- 
- In this example, it is clear that this is the desired behavior. However, sometimes the value of a formlet's
- result may be surprising. For example, in
- @racketblock[
-  (formlet* `(div (p ,((text-input) . =>* . name)))
-            name)
-  ]
- @racket[name] is bound to a list of strings, because @racket[formlet*] cannot syntactically determine if
- the formlet whose result is bound to @racket[name] is used many times.
- 
-}
-
-@defidform[=>*]{Only allowed inside @racket[formlet*].}
-
-}
-
-@section{Functional Usage}
-
-@(require (for-label web-server/formlets/lib))
-@defmodule[web-server/formlets/lib]{
-
-The syntactic shorthand abbreviates the construction of @tech{formlet}s with the following library.
-These combinators may be used directly to construct low-level formlets, such as those for new INPUT element
-types. Refer to @secref["input-formlets"] for example low-level formlets using these combinators.
-
-@defthing[xexpr-forest/c contract?]{
- Equivalent to @racket[(listof xexpr/c)]
-}
-
-@defproc[(formlet/c [content any/c] ...) contract?]{
- Equivalent to @racket[(integer? . -> . 
-            (values xexpr-forest/c
-                    ((listof binding?) . -> . (values (coerce-contract 'formlet/c content) ...))
-                    integer?))].
-
- A @tech{formlet}'s internal representation is a function from an initial input number
- to an @xexpr forest rendering, a processing function, and the next allowable
- input number.
-}
-
-@defthing[formlet*/c contract?]{
-  Equivalent to @racket[(formlet/c any/c ...)].
-}
-
-@defproc[(pure [value any/c]) (formlet/c any/c)]{
- Constructs a @tech{formlet} that has no rendering and always returns @racket[value] in
- the processing stage.
-}
-
-@defproc[(cross [f (formlet/c procedure?)]
-                [g (formlet/c any/c ...)])
-         (formlet/c any/c ...)]{
- Constructs a @tech{formlet} with a rendering equal to the concatenation of the renderings of @tech{formlet}s @racket[f] and @racket[g];
- a processing stage that applies @racket[g]'s processing results to @racket[f]'s processing result.
-}
-
-@defproc[(cross* [f (formlet/c (() () #:rest (listof any/c) . ->* . any/c))]
-                 [g (formlet/c any/c)] ...)
-         (formlet/c any/c)]{
- Equivalent to @racket[cross] lifted to many arguments.
-}
-
-@defproc[(xml-forest [r xexpr-forest/c])
-         (formlet/c procedure?)]{
-  Constructs a @tech{formlet} with the rendering @racket[r] and the
-  identity procedure as the processing step.
-}
-
-@defproc[(xml [r xexpr/c])
-         (formlet/c procedure?)]{
-  Equivalent to @racket[(xml-forest (list r))].
-}
-
-@defproc[(text [r string?])
-         (formlet/c procedure?)]{
-  Equivalent to @racket[(xml r)].
-}
-
-@defproc[(tag-xexpr [tag symbol?]
-                    [attrs (listof (list/c symbol? string?))]
-                    [inner (formlet/c any/c)])
-         (formlet/c any/c)]{
-  Constructs a @tech{formlet} with the rendering @racket[(list (list*
-  tag attrs inner-rendering))] where @racket[inner-rendering] is the
-  rendering of @racket[inner] and the processing stage identical to
-  @racket[inner].
-}
-
-@defproc[(formlet-display [f (formlet/c any/c)])
-         xexpr-forest/c]{
-  Renders @racket[f].
-}
-
-@defproc[(formlet-process [f (formlet/c any/c ...)]
-                          [r request?])
-         (values any/c ...)]{
-  Runs the processing stage of @racket[f] on the bindings in @racket[r].
-}
-
-}
-
-@section[#:tag "input-formlets"]{Predefined Formlets}
-
-@(require (for-label web-server/formlets/input))
-@defmodule[web-server/formlets/input]{
-
-These @tech{formlet}s are the main combinators for form input.
-
-@defproc[(make-input [render (string? . -> . xexpr/c)])
-         (formlet/c (or/c false/c binding?))]{
- This @tech{formlet} is rendered with @racket[render], which is passed
- the input name, and results in the extracted @racket[binding].
-}
-
-@defproc[(make-input* [render (string? . -> . xexpr/c)])
-         (formlet/c (listof binding?))]{
-  This @tech{formlet} is rendered with @racket[render], which is passed
-  the input name, and results in all the @racket[binding]s that use the
-  name.
-}
-
-@defproc[(input [#:type type string?]
-                [#:value value (or/c false/c bytes? string?) #f]
-                [#:size size (or/c false/c exact-nonnegative-integer?) #f]
-                [#:max-length max-length (or/c false/c exact-nonnegative-integer?) #f]
-                [#:read-only? read-only? boolean? #f]
-                [#:attributes attrs (listof (list/c symbol? string?)) empty])
-         (formlet/c (or/c false/c binding?))]{
-  This @tech{formlet} renders using an INPUT element with specified type
-  and arguments.
-}
-
-@defproc[(text-input [#:value value (or/c false/c bytes? string?) #f]
-                     [#:size size (or/c false/c exact-nonnegative-integer?) #f]
-                     [#:max-length max-length (or/c false/c exact-nonnegative-integer?) #f]
-                     [#:read-only? read-only? boolean? #f]
-                     [#:attributes attrs (listof (list/c symbol? string?)) empty])
-        (formlet/c (or/c false/c binding?))]{
-  This @tech{formlet} renders using an INPUT element with the TEXT type
-  and the attributes given in the arguments.
-}
-
-@defproc[(password-input [#:value value (or/c false/c bytes? string?) #f]
-                         [#:size size (or/c false/c exact-nonnegative-integer?) #f]
-                         [#:max-length max-length (or/c false/c exact-nonnegative-integer?) #f]
-                         [#:read-only? read-only? boolean? #f]
-                         [#:attributes attrs (listof (list/c symbol? string?)) empty])
-        (formlet/c (or/c false/c binding?))]{
-  This @tech{formlet} renders using an INPUT element with the PASSWORD
-  type and the attributes given in the arguments.
-}
-
-@defproc[(textarea-input [#:value value (or/c false/c bytes? string?) #f]
-                         [#:rows rows (or/c false/c number?) #f]
-                         [#:cols cols (or/c false/c number?) #f]
-                         [#:attributes attrs (listof (list/c symbol? string?)) empty])
-        (formlet/c (or/c false/c binding?))]{
-  This @tech{formlet} renders using an TEXTAREA element with attributes
-  given in the arguments.
-}
-
-@defproc[(checkbox [value (or/c bytes? string?)]
-                   [checked? boolean?]
-                   [#:attributes attrs (listof (list/c symbol? string?)) empty])
-         (formlet/c (or/c false/c binding?))]{
-  This @tech{formlet} renders using an INPUT element with the CHECKBOX
-  type and the attributes given in the arguments.
-}
-
-@defproc[(radio [value (or/c bytes? string?)] 
-                [checked? boolean?]
-                [#:attributes attrs (listof (list/c symbol? string?)) empty])
-         (formlet/c (or/c false/c binding?))]{
- This @tech{formlet} renders using an INPUT element with the RADIO type and the attributes given in the arguments.
-}
-
-@defproc[(radio-group [l sequence?]
-                      [#:attributes attrs (any/c . -> . (listof (list/c symbol? string?))) (λ (x) empty)]
-                      [#:checked? checked? (any/c . -> . boolean?) (λ (x) #f)]
-                      [#:display display (any/c . -> . xexpr/c) (λ (x) x)])
-        (formlet/c any/c)]{
-
-  This @tech{formlet} renders using a sequence of INPUT elements of
-RADIO type where each element gets its attributes from @racket[attrs]
-that share a single NAME. An element is checked if @racket[checked?]
-returns @racket[#t]. Elements are followed by the results of
-@racket[display]. The result of processing this formlet is a single
-element of the sequence.
-}
-
-@defproc[(checkbox-group [l sequence?]
-                      [#:attributes attrs (any/c . -> . (listof (list/c symbol? string?))) (λ (x) empty)]
-                      [#:checked? checked? (any/c . -> . boolean?) (λ (x) #f)]
-                      [#:display display (any/c . -> . xexpr/c) (λ (x) x)])
-        (formlet/c (listof any/c))]{
-
-  This @tech{formlet} renders using a sequence of INPUT elements of
-CHECKBOX type where each element gets its attributes from
-@racket[attrs] that share a single NAME. An element is checked if
-@racket[checked?]  returns @racket[#t]. Elements are followed by the
-results of @racket[display]. The result of processing this formlet is
-a list of elements of the sequence.
-}
-
-@defproc[(submit [value (or/c bytes? string?)]
-                 [#:attributes attrs (listof (list/c symbol? string?)) empty])
-         (formlet/c (or/c false/c binding?))]{
-  This @tech{formlet} renders using an INPUT element with the SUBMIT
-  type and the attributes given in the arguments.
-}
-
-@defproc[(reset [value (or/c bytes? string?)]
-                [#:attributes attrs (listof (list/c symbol? string?)) empty])
-         (formlet/c (or/c false/c binding?))]{
-  This @tech{formlet} renders using an INPUT element with the RESET type
-  and the attributes given in the arguments.
-}
-
-@defproc[(file-upload [#:attributes attrs (listof (list/c symbol? string?)) empty])
-         (formlet/c (or/c false/c binding?))]{
-  This @tech{formlet} renders using an INPUT element with the FILE type
-  and the attributes given in the arguments.
-}
-
-@defproc[(hidden [value (or/c bytes? string?)] [#:attributes attrs (listof (list/c symbol? string?)) empty])
-         (formlet/c (or/c false/c binding?))]{
-  This @tech{formlet} renders using an INPUT element with HIDDEN type
-  and the attributes given in the arguments.
-}
-
-@defproc[(img [alt (or/c bytes? string?)]
-              [src (or/c bytes? string?)]
-              [#:height height (or/c false/c exact-nonnegative-integer?) #f]
-              [#:longdesc ldesc (or/c false/c bytes? string?) #f]
-              [#:usemap map (or/c false/c bytes? string?) #f]
-              [#:width width (or/c false/c exact-nonnegative-integer?) #f]
-              [#:attributes attrs (listof (list/c symbol? string?)) empty])
-      (formlet/c (or/c false/c binding?))]{
-  This @tech{formlet} renders using an IMG element with the attributes
-  given in the arguments.
-}
-
-@defproc[(button [type (or/c bytes? string?)]
-                 [button-text (or/c bytes? string?)]
-                 [#:disabled disabled boolean? #f]
-                 [#:value value (or/c false/c bytes? string?) #f]
-                 [#:attributes attrs (listof (list/c symbol? string?)) empty])
-         (formlet/c (or/c false/c binding?))]{
-  This @tech{formlet} renders using a BUTTON element with the attributes
-  given in the arguments. @racket[button-text] is the text that will
-  appear on the button when rendered.
-}
-
-@defproc[(multiselect-input [l sequence?]
-                            [#:attributes attrs (listof (list/c symbol? string?)) empty]
-                            [#:multiple? multiple? boolean? #t]
-                            [#:selected? selected? (any/c . -> . boolean?) (λ (x) #f)]
-                            [#:display display (any/c . -> . xexpr/c) (λ (x) x)])
-        (formlet/c list?)]{
-  This @tech{formlet} renders using an SELECT element with the
-  attributes given with an OPTION for each element of the sequence. If
-  @racket[multiple?] is @racket[#t], then multiple options may be
-  selected. An element is selected if @racket[selected?] returns
-  @racket[#t]. Elements are displayed with @racket[display].
-}
-
-@defproc[(select-input [l sequence?]
-                       [#:attributes attrs (listof (list/c symbol? string?)) empty]
-                       [#:selected? selected? (any/c . -> . boolean?) (λ (x) #f)]
-                       [#:display display (any/c . -> . xexpr/c) (λ (x) x)])
-        (formlet/c any/c)]{
-  This @tech{formlet} renders using an SELECT element with the
-  attributes given with an OPTION for each element of the sequence. An
-  element is selected if @racket[selected?] returns
-  @racket[#t]. Elements are displayed with @racket[display].
-}
-
-@defproc[(required [f (formlet/c (or/c false/c binding?))])
-         (formlet/c bytes?)]{
-  Constructs a @tech{formlet} that extracts the
-  @racket[binding:form-value] from the binding produced by @racket[f],
-  or errors.
-}
-
-@defproc[(default
-           [def bytes?]
-           [f (formlet/c (or/c false/c binding?))])
-         (formlet/c bytes?)]{
-  Constructs a @tech{formlet} that extracts the
-  @racket[binding:form-value] from the binding produced by @racket[f],
-  or returns @racket[def].
-}
-
-@defproc[(to-string [f (formlet/c bytes?)])
-         (formlet/c string?)]{
-  Converts @racket[f]'s output to a string. Equivalent to
-  @racket[(cross (pure bytes->string/utf-8) f)].
-}
-
-@defproc[(to-number [f (formlet/c string?)])
-         (formlet/c number?)]{
-  Converts @racket[f]'s output to a number. Equivalent to @racket[(cross
-  (pure string->number) f)].
-}
-
-@defproc[(to-symbol [f (formlet/c string?)])
-         (formlet/c symbol?)]{
-  Converts @racket[f]'s output to a symbol. Equivalent to
-  @racket[(cross (pure string->symbol) f)].
-}
-
-@defproc[(to-boolean [f (formlet/c bytes?)])
-         (formlet/c boolean?)]{
-  Converts @racket[f]'s output to a boolean, if it is equal to
-  @racket[#"on"].
-}
-
-@defthing[input-string (formlet/c string?)]{
-  Equivalent to @racket[(to-string (required (text-input)))].
-}
-
-@defthing[input-int (formlet/c integer?)]{
-  Equivalent to @racket[(to-number input-string)].
-}
-
-@defthing[input-symbol (formlet/c symbol?)]{
-  Equivalent to @racket[(to-symbol input-string)].
-}
-
-}
-
-@section{Utilities}
-
-@(require (for-label web-server/formlets/servlet
-                     web-server/http))
-@defmodule[web-server/formlets/servlet]{
-
-A few utilities are provided for using @tech{formlet}s in Web applications.
-
-@defproc[(send/formlet [f (formlet/c any/c ...)]
-                       [#:method method
-                                 (or/c "GET" "POST" "get" "post")
-                                 "POST"]
-                       [#:wrap wrapper
-                               (xexpr/c . -> . xexpr/c)
-                               (lambda (form-xexpr)
-                                 `(html (head (title "Form Entry"))
-                                        (body ,form-xexpr)))])
-         (values any/c ...)]{
-
-  Uses @racket[send/suspend] and @racket[response/xexpr] to send
-  @racket[f]'s rendering (wrapped in a FORM tag with method
-  @racket[method] whose action is the continuation URL (wrapped again
-  by @racket[wrapper])) to the client.  When the form is submitted,
-  the request is passed to the processing stage of @racket[f].
-
-}
-
-@defproc[(embed-formlet [embed/url ((request? . -> . any) . -> . string?)]
-                        [f (formlet/c any/c ...)])
-         xexpr/c]{
-  Like @racket[send/formlet], but for use with
-  @racket[send/suspend/dispatch].
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/gzip.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/gzip.scrbl
deleted file mode 100644
index 074f023c4b..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/gzip.scrbl
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "gzip"]{GZip}
-@(require (for-label web-server/private/gzip
-                     file/gzip
-                     file/gunzip))
-
-@defmodule[web-server/private/gzip]{
-
-The @web-server provides a thin wrapper around @racketmodname[file/gzip] and @racketmodname[file/gunzip].
-
-@defproc[(gzip/bytes [ib bytes?])
-         bytes?]{
- GZips @racket[ib] and returns the result.
-}
-                
-@defproc[(gunzip/bytes [ib bytes?])
-         bytes?]{
- GUnzips @racket[ib] and returns the result.
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/http.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/http.scrbl
deleted file mode 100644
index 88183b4e84..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/http.scrbl
+++ /dev/null
@@ -1,622 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "http"]{HTTP: Hypertext Transfer Protocol}
-
-@defmodule[web-server/http]
-
-The @web-server implements many HTTP libraries that are provided by this module.
-
-@; ------------------------------------------------------------
-@section[#:tag "request-structs"]{Requests}
-@(require (for-label web-server/http/request-structs
-                     xml
-                     racket/promise
-                     racket/match))
-
-@defmodule[web-server/http/request-structs]{
-
-@defstruct[header ([field bytes?]
-                   [value bytes?])]{
- Represents a header of @racket[field] to @racket[value].
-}
-
-@defproc[(headers-assq [id bytes?] [heads (listof header?)])
-         (or/c false/c header?)]{
- Returns the header with a field equal to @racket[id] from @racket[heads] or @racket[#f].
-}
-
-@defproc[(headers-assq* [id bytes?] [heads (listof header?)])
-         (or/c false/c header?)]{
- Returns the header with a field case-insensitively equal to @racket[id] from @racket[heads] or @racket[#f].
-
- You almost @bold{always} want to use this, rather than @racket[headers-assq] because Web browsers may send headers with arbitrary casing.
-}
-
-@defstruct[binding ([id bytes?])]{Represents a binding of @racket[id].}
-
-@defstruct[(binding:form binding) ([value bytes?])]{
- Represents a form binding of @racket[id] to @racket[value].
-}
-
-@defstruct[(binding:file binding) ([filename bytes?]
-                                   [headers (listof header?)]
-                                   [content bytes?])]{
- Represents the uploading of the file @racket[filename] with the id @racket[id]
- and the content @racket[content], where @racket[headers] are the additional headers from
- the MIME envelope the file was in. (For example, the @racket[#"Content-Type"] header may
- be included by some browsers.)
-}
-
-@defproc[(bindings-assq [id bytes?]
-                        [binds (listof binding?)])
-         (or/c false/c binding?)]{
- Returns the binding with an id equal to @racket[id] from @racket[binds] or @racket[#f].
-}
-
-@defproc[(bindings-assq-all [id bytes?]
-                            [binds (listof binding?)])
-         (listof binding?)]{
-Like @racket[bindings-assq], but returns a list of all bindings matching @racket[id].
-}
-
-
-@defstruct[request ([method bytes?]
-                    [uri url?]
-                    [headers/raw (listof header?)]
-                    [bindings/raw-promise (promise/c (listof binding?))]
-                    [post-data/raw (or/c false/c bytes?)]
-                    [host-ip string?]
-                    [host-port number?]
-                    [client-ip string?])]{
- An HTTP @racket[method] request to @racket[uri] from @racket[client-ip]
- to the server at @racket[host-ip]:@racket[host-port] with @racket[headers/raw]
- headers, @racket[bindings/raw] GET and POST queries and @racket[post-data/raw]
- POST data.
-
- You are @bold{unlikely to need to construct} a request struct.
-}
-
-@defproc[(request-bindings/raw [r request?])
-         (listof binding?)]{
- Forces @racket[(request-bindings/raw-promise r)].
-}
-
-Here is an example typical of what you will find in many applications:
-@racketblock[
-(define (get-number req)
-  (match
-    (bindings-assq
-      #"number"
-      (request-bindings/raw req))
-    [(? binding:form? b)
-     (string->number
-      (bytes->string/utf-8
-       (binding:form-value b)))]
-    [_
-     (get-number (request-number))]))
-]
-
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "bindings"]{Bindings}
-@(require (for-label web-server/http/bindings))
-
-@defmodule[web-server/http/bindings]{
-
-These functions, while convenient, could introduce subtle errors into your
-application. Examples: that they are case-insensitive could introduce
-an error; if the data submitted is not in UTF-8 format, then the conversion
-to a string will fail; if an attacker submits a form field as if it were
-a file, when it is not, then the @racket[request-bindings] will hold a
-@racket[bytes?] object and your program will error; and, for file uploads
-you lose the filename. @bold{Therefore, we recommend against their use, but
-they are provided for compatibility with old code.}
-
-@defproc[(request-bindings [req request?])
-         (listof (or/c (cons/c symbol? string?)
-                       (cons/c symbol? bytes?)))]{
- Translates the @racket[request-bindings/raw] of @racket[req] by
- interpreting @racket[bytes?] as @racket[string?]s, except in the case
- of @racket[binding:file] bindings, which are left as is. Ids are then
- translated into lowercase symbols.
-}
-
-@defproc[(request-headers [req request?])
-         (listof (cons/c symbol? string?))]{
- Translates the @racket[request-headers/raw] of @racket[req] by
- interpreting @racket[bytes?] as @racket[string?]s. Ids are then
- translated into lowercase symbols.
-}
-
-@defproc[(extract-binding/single [id symbol?]
-                                 [binds (listof (cons/c symbol? string?))])
-         string?]{
- Returns the single binding associated with @racket[id] in the a-list @racket[binds]
- if there is exactly one binding. Otherwise raises @racket[exn:fail].
-}
-
-@defproc[(extract-bindings [id symbol?]
-                           [binds (listof (cons/c symbol? string?))])
-         (listof string?)]{
- Returns a list of all the bindings of @racket[id] in the a-list @racket[binds].
-}
-
-@defproc[(exists-binding? [id symbol?]
-                          [binds (listof (cons/c symbol? string))])
-         boolean?]{
- Returns @racket[#t] if @racket[binds] contains a binding for @racket[id].
- Otherwise, @racket[#f].
-}
-
-Here is an example typical of what you will find in many applications:
-@racketblock[
-(define (get-number req)
-  (string->number
-   (extract-binding/single
-    'number
-    (request-bindings req))))
-]
-
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "response-structs"]{Responses}
-@(require (for-label web-server/http/response-structs))
-
-@defmodule[web-server/http/response-structs]{
-
-@defstruct*[response
-           ([code number?]
-            [message bytes?]
-            [seconds number?]
-            [mime (or/c false/c bytes?)]
-            [headers (listof header?)]
-            [output (output-port? . -> . void)])]{
-
-An HTTP response where @racket[output] produces the body by writing to
-the output port. @racket[code] is the response code, @racket[message]
-the message, @racket[seconds] the generation time, @racket[mime] the
-MIME type of the file, and @racket[headers] are the headers.
-
-If @racket[headers] does not include @litchar{Date},
-@litchar{Last-Modified}, or @litchar{Server} headers, then the server
-will automatically add them, where @litchar{Date} is based on
-@racket[current-seconds], @litchar{Last-Modified} is based on
-@racket[seconds], and @litchar{Server} is @litchar{Racket}.
-
-If @racket[headers] does not include @litchar{Content-Type} and
-@racket[mime] is not @racket[#f], then @racket[mime] is added as a
-@litchar{Content-Type} header.
-
-The server will always replace your @litchar{Connection} header if it
-needs to ensure the connection will be closed. (Typically with an
-HTTP/1.0 client.)
-
-Examples:
- @racketblock[
-  (response
-   301 #"OK"
-   (current-seconds) TEXT/HTML-MIME-TYPE
-   empty
-   (λ (op) (write-bytes #"<html><body>Hello, World!</body></html>" op)))
-  (response
-   301 #"Moved Permanently"
-   (current-seconds) TEXT/HTML-MIME-TYPE
-   (list (make-header #"Location"
-                      #"http://racket-lang.org/download"))
-   (λ (op) (write-bytes #"Moved" op)))
-  (response
-   304 #"Not Modified"
-   (current-seconds) #f
-   (list (make-header #"Location"
-                      #"http://racket-lang.org/download"))
-   void)
- ]
-}
-
-@defproc[(response/full [code number?] [message bytes?] [seconds number?] [mime (or/c false/c bytes?)]
-                        [headers (listof header?)] [body (listof bytes?)])
-         response?]{
- A constructor for responses where @racket[body] is the response body.
-
- Example:
- @racketblock[
-  (response/full
-   301 #"Moved Permanently"
-   (current-seconds) TEXT/HTML-MIME-TYPE
-   (list (make-header #"Location"
-                      #"http://racket-lang.org/download"))
-   (list #"<html><body><p>"
-         #"Please go to <a href=\""
-         #"http://racket-lang.org/download"
-         #"\">here</a> instead."
-         #"</p></body></html>"))
- ]
-}
-                   
-@defproc[(response/output [output (-> output-port? void?)]
-                          [#:code code number? 200]
-                          [#:message message bytes? #"Okay"]
-                          [#:seconds seconds number? (current-seconds)]
-                          [#:mime-type mime-type (or/c bytes? #f) TEXT/HTML-MIME-TYPE]
-                          [#:headers headers (listof header?) '()])
-         response?]{
-Equivalent to
-@racketblock[(response code message seconds mime-type headers output)]
-}
-
-@defthing[TEXT/HTML-MIME-TYPE bytes?]{Equivalent to @racket[#"text/html; charset=utf-8"].}
-
-@warning{If you include a Content-Length header in a response that is inaccurate, there @bold{will be an error} in
-transmission that the server @bold{will not catch}.}
-
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "cookie"]{Placing Cookies}
-
-@(require (for-label net/cookie
-                     web-server/servlet
-                     web-server/http/xexpr
-                     web-server/http/redirect
-                     web-server/http/request-structs
-                     web-server/http/response-structs
-                     web-server/http/cookie))
-
-@defmodule[web-server/http/cookie]{
- This module provides functions to create cookies and responses that set them.
-
- @defproc[(make-cookie [name cookie-name?] [value cookie-value?]
-                       [#:comment comment (or/c false/c string?) #f]
-                       [#:domain domain (or/c false/c valid-domain?) #f]
-                       [#:max-age max-age (or/c false/c exact-nonnegative-integer?) #f]
-                       [#:path path (or/c false/c string?) #f]
-                       [#:expires expires (or/c false/c string?) #f]
-                       [#:secure? secure? (or/c false/c boolean?) #f])
-          cookie?]{
-  Constructs a cookie with the appropriate fields.
- }
-
- @defproc[(cookie->header [c cookie?]) header?]{
-  Constructs a header that sets the cookie.
- }
-
- Examples:
- @racketblock[
-  (define time-cookie
-    (make-cookie "time" (number->string (current-seconds))))
-  (define id-cookie
-    (make-cookie "id" "joseph" #:secure? #t))
-
-  (redirect-to
-   "http://localhost/logged-in"
-   see-other
-   #:headers
-   (map cookie->header
-        (list time-cookie id-cookie)))
-
-  (send/suspend
-   (lambda (k-url)
-     (response/xexpr
-      #:cookies (list time-cookie id-cookie)
-      `(html (head (title "Cookie Example"))
-             (body (h1 "You're cookie'd!"))))))
- ]
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "id-cookie"]{Authenticated Cookies}
-
-@(require (for-label web-server/http/id-cookie))
-@defmodule[web-server/http/id-cookie]{
-
-Cookies are useful for storing information of user's browsers and
-particularly useful for storing identifying information for
-authentication, sessions, etc. However, there are inherent
-difficulties when using cookies as authenticators, because cookie data
-is fully controlled by the user, and thus cannot be trusted.
-
-This module provides functions for creating and verifying
-authenticated cookies that are intrinsically timestamped. It is based
-on the algorithm proposed by the
-@link["http://cookies.lcs.mit.edu/"]{MIT Cookie Eaters}: if you store
-the data @racket[_data] at thime @racket[_authored-seconds], then the
-user will receive @litchar{digest&authored-seconds&data}, where
-@racket[_digest] is an HMAC-SHA1 digest of @racket[_authored-seconds]
-and @racket[_data], using an arbitrary secret key. When you receive a
-cookie, it will reverify this digest and check that the cookie's
-@racket[_authored-seconds] is not after a timeout period, and only
-then return the cookie data to the program.
-
-The interface represents the secret key as a byte string. The best way
-to generate this is by using random bytes from something like OpenSSL
-or
-@tt{/dev/random}. @link["http://www.madboa.com/geek/openssl/#random-generate"]{This
-FAQ} lists a few options. A convenient purely Racket-based option is
-available (@racket[make-secret-salt/file]), but it will not have as
-good entropy, if you care about that sort of thing.
-
- @defproc[(make-id-cookie
-           [name cookie-name?]
-           [secret-salt bytes?]
-           [value cookie-value?]
-           [#:path path (or/c false/c string?) #f])
-          cookie?]{
-  Generates an authenticated cookie named @racket[name] containing @racket[value], signed with @racket[secret-salt].
- }
-
- @defproc[(request-id-cookie
-           [name cookie-name?]
-           [secret-salt bytes?]
-           [request request?]
-           [#:timeout timeout +inf.0])
-          (or/c false/c cookie-value?)]{
-  Extracts the first authenticated cookie named @racket[name] that was previously signed with @racket[secret-salt] before @racket[timeout] from @racket[request]. If no valid cookie is available, returns @racket[#f].
- }
-
- @defproc[(logout-id-cookie
-           [name cookie-name?]
-           [#:path path (or/c false/c string?) #f])
-          cookie?]{
-  Generates a cookie named @racket[name] that is not validly authenticated.
-
-  This will cause non-malicious browsers to overwrite a previously set
-cookie. If you use authenticated cookies for login information, you
-could send this to cause a "logout". However, malicious browsers do
-not need to respect such an overwrite. Therefore, this is not an
-effective way to implement timeouts or protect users on
-public (i.e. possibly compromised) computers. The only way to securely
-logout on the compromised computer is to have server-side state
-keeping track of which cookies (sessions, etc.) are invalid. Depending
-on your application, it may be better to track live sessions or dead
-sessions, or never set cookies to begin with and just use
-continuations, which you can revoke with @racket[send/finish].
- }
-
- @defproc[(make-secret-salt/file
-            [secret-salt-path path-string?])
-           bytes?]{
-
-  Extracts the bytes from @racket[secret-salt-path]. If
-@racket[secret-salt-path] does not exist, then it is created and
-initialized with 128 random bytes.
- }
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "cookie-parse"]{Extracting Cookies}
-
-@(require (for-label web-server/http/cookie-parse
-                     web-server/http/xexpr
-                     net/cookie
-                     net/url
-                     racket/list))
-@defmodule[web-server/http/cookie-parse]{
- @defstruct[client-cookie
-            ([name string?]
-             [value string?]
-             [domain (or/c false/c valid-domain?)]
-             [path (or/c false/c string?)])]{
-
-  While server cookies are represented with @racket[cookie?]s, cookies
-  that come from the client are represented with a
-  @racket[client-cookie] structure.
- }
-
- @defproc[(request-cookies [req request?])
-          (listof client-cookie?)]{
-  Extracts the cookies from @racket[req]'s headers.
- }
-
- Examples:
- @racketblock[
-  (define (start req)
-    (define cookies (request-cookies req))
-    (define id-cookie
-      (findf (lambda (c)
-               (string=? "id" (client-cookie-name c)))
-             cookies))
-    (if id-cookie
-        (hello (client-cookie-value id-cookie))
-        (redirect-to
-         (url->string (request-uri req))
-         see-other
-         #:headers
-         (list
-          (cookie->header (make-cookie "id" "joseph"))))))
-
-   (define (hello who)
-     (response/xexpr
-      `(html (head (title "Hello!"))
-             (body
-              (h1 "Hello "
-                  ,who)))))
- ]
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "redirect"]{Redirect}
-@(require (for-label web-server/http/redirect
-                     web-server/private/util))
-
-@defmodule[web-server/http/redirect]{
-
-@defproc[(redirect-to [uri non-empty-string/c]
-                      [perm/temp redirection-status? temporarily]
-                      [#:headers headers (listof header?) (list)])
-         response?]{
- Generates an HTTP response that redirects the browser to @racket[uri],
- while including the @racket[headers] in the response.
-
- Example:
- @racket[(redirect-to "http://www.add-three-numbers.com" permanently)]
-}
-
-@defproc[(redirection-status? [v any/c])
-         boolean?]{
- Determines if @racket[v] is one of the following values.
-}
-
-@defthing[permanently redirection-status?]{A @racket[redirection-status?] for permanent redirections.}
-
-@defthing[temporarily redirection-status?]{A @racket[redirection-status?] for temporary redirections.}
-
-@defthing[see-other redirection-status?]{A @racket[redirection-status?] for "see-other" redirections.}
-
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "basic-auth"]{Basic Authentication}
-@(require (for-label web-server/http/response-structs
-                     web-server/http/basic-auth))
-
-@defmodule[web-server/http/basic-auth]{
-
-An implementation of HTTP Basic Authentication.
-
-@defproc[(make-basic-auth-header [realm string?])
-         header?]{
- Returns a header that instructs the Web browser to request a username and password from the client using
- Basic authentication with @racket[realm] as the realm.
-}
-
-@defproc[(request->basic-credentials [req request?])
-         (or/c false/c (cons/c bytes? bytes?))]{
- Returns a pair of the username and password from the authentication
- header in @racket[req] if they are present, or @racket[#f].
-}
-
-Example:
-@racketmod[
-web-server/insta
-
-(define (start req)
-  (match (request->basic-credentials req)
-    [(cons user pass)
-     (response/xexpr
-      `(html (head (title "Basic Auth Test"))
-             (body (h1 "User: " ,(bytes->string/utf-8 user))
-                   (h1 "Pass: " ,(bytes->string/utf-8 pass)))))]
-    [else
-     (response
-      401 #"Unauthorized" (current-seconds) TEXT/HTML-MIME-TYPE
-      (list
-       (make-basic-auth-header
-        (format "Basic Auth Test: ~a" (gensym))))
-      void)]))
-]
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "digest-auth"]{Digest Authentication}
-@(require (for-label web-server/http/digest-auth
-                     web-server/http/xexpr
-                     web-server/http/response-structs
-                     racket/pretty))
-
-@defmodule[web-server/http/digest-auth]{
-
-An implementation of HTTP Digest Authentication.
-
-@defproc[(make-digest-auth-header [realm string?] [private-key string?] [opaque string?])
-         header?]{
- Returns a header that instructs the Web browser to request a username and password from the client
- using Digest authentication with @racket[realm] as the realm, @racket[private-key] as the server's
- contribution to the nonce, and @racket[opaque] as the opaque data passed through the client.
-}
-
-@defproc[(request->digest-credentials [req request?])
-         (or/c false/c (listof (cons/c symbol? string?)))]{
- Returns the Digest credentials from @racket[req] (if they appear) as an association list.
-}
-
-@defthing[username*realm->password/c contract?]{
- Used to look up the password for a user is a realm.
-
- Equivalent to @racket[(string? string? . -> . string?)].
-}
-
-@defthing[username*realm->digest-HA1/c contract?]{
- Used to compute the user's secret hash.
-
- Equivalent to @racket[(string? string? . -> . bytes?)].
-}
-
-@defproc[(password->digest-HA1 [lookup-password username*realm->password/c])
-         username*realm->digest-HA1/c]{
- Uses @racket[lookup-password] to find the password, then computes the
- secret hash of it.
-}
-
-@defproc[(make-check-digest-credentials [lookup-HA1 username*realm->digest-HA1/c])
-         (string? (listof (cons/c symbol? string?)) . -> . boolean?)]{
- Constructs a function that checks whether particular Digest credentials
- (the second argument of the returned function) are correct given the
- HTTP method provided as the first argument and the secret hash computed
- by @racket[lookup-HA1].
-
- This is will result in an exception if the Digest credentials are
- missing portions.
-}
-
-Example:
-@racketmod[
-web-server/insta
-(require racket/pretty)
-
-(define private-key "private-key")
-(define opaque "opaque")
-
-(define (start req)
-  (match (request->digest-credentials req)
-    [#f
-     (response
-      401 #"Unauthorized" (current-seconds) TEXT/HTML-MIME-TYPE
-      (list (make-digest-auth-header
-             (format "Digest Auth Test: ~a" (gensym))
-             private-key opaque))
-      void)]
-    [alist
-     (define check
-       (make-check-digest-credentials
-        (password->digest-HA1 (lambda (username realm) "pass"))))
-     (define pass?
-       (check "GET" alist))
-     (response/xexpr
-      `(html (head (title "Digest Auth Test"))
-             (body
-              (h1 ,(if pass? "Pass!" "No Pass!"))
-              (pre ,(pretty-format alist)))))]))
-]
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "xexpr"]{X-expression Support}
-@(require (for-label web-server/http/xexpr
-                     xml))
-
-@defmodule*/no-declare[(web-server/http/xexpr)]{}
-
-@declare-exporting[web-server/http/xexpr web-server]
-
-@defproc[(response/xexpr [xexpr xexpr/c]
-                         [#:code code number? 200]
-                         [#:message message bytes? #"Okay"]
-                         [#:seconds seconds number? (current-seconds)]
-                         [#:mime-type mime-type (or/c false/c bytes?) TEXT/HTML-MIME-TYPE]
-                         [#:headers headers (listof header?) empty]
-                         [#:cookies cookies (listof cookie?) empty]
-                         [#:preamble preamble bytes? #""])
-         response?]{
- Equivalent to
- @racketblock[
- (response/full
-  code message seconds mime-type
-  (append headers (map cookie->header cookies))
-  (list preamble (string->bytes/utf-8 (xexpr->string xexpr))))
- ]
-
- This is a viable function to pass to @racket[set-any->response!].
- }
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/lang-api.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/lang-api.scrbl
deleted file mode 100644
index 5de3f92f6a..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/lang-api.scrbl
+++ /dev/null
@@ -1,83 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "stateless"]{Stateless Servlets}
-
-@defmodulelang*[(web-server/base web-server)]
-
-@section[#:style 'hidden #:tag "stateless-example"]{Example}
-
-A stateless servlet should @racket[provide] the following exports:
-
-@(require (for-label web-server/http
-                     racket/serialize
-                     (except-in web-server/stuffers stuffer)
-                     web-server/managers/none
-                     (except-in web-server/managers/manager manager)
-                     "dummy-stateless-servlet.rkt")) @; to give a binding context
-@declare-exporting[#:use-sources (web-server/scribblings/dummy-stateless-servlet)]
-
-@defthing[interface-version (one-of/c 'stateless)]{
- This indicates that the servlet is a stateless servlet.
-}
-
-@defthing[stuffer (stuffer/c serializable? bytes?)]{
- This is the @tech{stuffer} that will be used for the servlet.
-      
- If it is not provided, it defaults to @racket[default-stuffer].
-}
-
-@defthing[manager manager?]{
- This is the @tech{manager} that will be used for the servlet.
-      
- If it is not provided, it defaults to @racket[(create-none-manager #f)].
-}
-
-@defproc[(start [initial-request request?])
-         response?]{
- This function is called when an instance of this servlet is started.
- The argument is the HTTP request that initiated the instance.
-}
-
-An example @racket['stateless] servlet module:
-@racketmod[
- web-server
- (require web-server/http)
- (provide interface-version stuffer start)
- (define interface-version 'stateless)
- (define stuffer
-   (stuffer-chain
-    serialize-stuffer
-    (md5-stuffer (build-path (find-system-path 'home-dir) ".urls"))))
- (define (start req)
-   (response/xexpr
-    `(html (body (h2 "Look ma, no state!")))))
-]
-
-The @racketmodname[web-server/base] language exports all of the functions
-and syntax from @racketmodname[racket/base] and nothing else.
-
-The @racketmodname[web-server] language exports all of the functions
-and syntax from the following libraries: @racketmodname[racket],
-@racketmodname[net/url], @racketmodname[web-server/http],
-@racketmodname[web-server/http/bindings],
-@racketmodname[web-server/lang/abort-resume],
-@racketmodname[web-server/lang/web],
-@racketmodname[web-server/lang/native],
-@racketmodname[web-server/lang/web-param],
-@racketmodname[web-server/lang/web-cells],
-@racketmodname[web-server/lang/file-box],
-@racketmodname[web-server/lang/soft],
-@racketmodname[web-server/dispatch], and
-@racketmodname[web-server/stuffers].  Some of these are documented in
-the subsections that follow.
-
-@include-section["stateless-usage.scrbl"]
-@include-section["serial.scrbl"]
-@include-section["native.scrbl"]
-@include-section["lang.scrbl"]
-@include-section["lang-web-cells.scrbl"]
-@include-section["file-box.scrbl"]
-@include-section["web-param.scrbl"]
-@include-section["soft.scrbl"]
-@include-section["stuffers.scrbl"]
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/lang-web-cells.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/lang-web-cells.scrbl
deleted file mode 100644
index 6563c26060..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/lang-web-cells.scrbl
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@; ------------------------------------------------------------
-@title[#:tag "lang/web-cells"]{Stateless Web Cells}
-@(require (for-label web-server/lang/web-cells))
-
-@defmodule[web-server/lang/web-cells]{The
-@racketmodname[web-server/lang/web-cells] library provides the same
-API as @racketmodname[web-server/servlet/web-cells], but in a way
-compatible with the Web Language. The one difference is that
-@racket[make-web-cell] is syntax, rather than a function.
-
-@deftogether[(
-@defproc[(web-cell? [v any/c])
-         boolean?]
-@defform[(make-web-cell default-expr)]
-@defproc[(web-cell-ref [wc web-cell?])
-         any/c]
-@defproc[(web-cell-shadow [wc web-cell?]
-                          [v any/c])
-         void]
-)]{
-
-See @racketmodname[web-server/servlet/web-cells].}
-  
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/lang.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/lang.scrbl
deleted file mode 100644
index d011ce655f..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/lang.scrbl
+++ /dev/null
@@ -1,55 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "lang/web"]{Stateless Web Interaction}
-
-@(require (for-label net/url
-                     xml
-                     web-server/lang/web
-                     racket
-                     web-server/http))
-
-@defmodule[web-server/lang/web]{
-
-@defproc[(send/suspend/url [response-generator (url? . -> . response?)])
-         request?]{
- Captures the current continuation. Serializes it and stuffs it into
- a URL. Calls @racket[response-generator] with this URL and delivers
- the response to the client. If the URL is invoked
- the request is returned to this continuation.
-}
-                  
-@defproc[(send/suspend [response-generator (string? . -> . response?)])
-         request?]{
- Like @racket[send/suspend/url] but with a string URL representation.
-}
-
-@defproc[(send/suspend/hidden [response-generator (url? xexpr/c . -> . response?)])
-         request?]{
- Captures the current continuation. Serializes it and stuffs it into a hidden INPUT
- form element.
- Calls @racket[response-generator] with this URL and form field and delivers
- the response to the client. If the URL is invoked with form data containing
- the hidden form,
- the request is returned to this continuation.
-}
-
-@defproc[(send/suspend/url/dispatch [make-response (((request? . -> . any) . -> . url?) . -> . response?)])
-         any]{
- Calls @racket[make-response] with a function that, when called with a procedure from
- @racket[request?] to @racket[any/c] will generate a URL, that when invoked will call
- the function with the @racket[request?] object and return the result to the caller of
- @racket[send/suspend/dispatch].
-}
-               
-@defproc[(send/suspend/dispatch [make-response (((request? . -> . any) . -> . string?) . -> . response?)])
-         request?]{
- Like @racket[send/suspend/url/dispatch] but with a string URL representation.
-}
-
-@deftogether[(
-@defproc[(redirect/get) request?]
-)]{
-
-See @racketmodname[web-server/servlet/web].}
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/launch.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/launch.scrbl
deleted file mode 100644
index 08ac103352..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/launch.scrbl
+++ /dev/null
@@ -1,102 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "web-server"]{Launching Servers}
-
-@(require (for-label web-server/web-server
-                     web-server/dispatchers/filesystem-map
-                     web-server/web-config-unit
-                     web-server/web-config-sig
-                     web-server/private/dispatch-server-unit
-                     web-server/private/dispatch-server-sig
-                     web-server/dispatchers/dispatch
-                     net/tcp-sig
-                     racket/async-channel
-                     unstable/contract
-                     web-server/configuration/configuration-table)
-          (prefix-in raw: (for-label net/tcp-unit))
-          (prefix-in files: (for-label web-server/dispatchers/dispatch-files)))
-
-@defmodule[web-server/web-server]{
-
-This module provides functions for launching dispatching servers.
-
-@defproc[(serve [#:dispatch dispatch dispatcher/c]
-                [#:confirmation-channel confirmation-channel (or/c false/c async-channel?) #f]
-                [#:connection-close? connection-close? boolean? #f]
-                [#:tcp@ tcp@ (unit/c (import) (export tcp^)) raw:tcp@]
-                [#:port port tcp-listen-port? 80]
-                [#:listen-ip listen-ip (or/c string? false/c) #f]
-                [#:max-waiting max-waiting integer? 511]
-                [#:initial-connection-timeout initial-connection-timeout integer? 60])
-         (-> void)]{
- Constructs an appropriate @racket[dispatch-server-config^], invokes the
- @racket[dispatch-server@], and calls its @racket[serve] function.
- 
- If @racket[connection-close?] is @racket[#t], then every connection is closed after one
- request. Otherwise, the client decides based on what HTTP version it uses.
- 
- The @racket[#:tcp@] keyword is provided for building an SSL server. See @secref["faq:https"].
-}
-
-Here's an example of a simple web server that serves files
-from a given path:
-
-@racketblock[
-(define (start-file-server base)
-  (serve
-   #:dispatch
-   (files:make
-    #:url->path (make-url->path base)
-    #:path->mime-type
-    (lambda (path)
-      #"application/octet-stream"))
-   #:port 8080))
-]
-
-@defproc[(serve/ports [#:dispatch dispatch dispatcher/c]
-                      [#:confirmation-channel confirmation-channel (or/c false/c async-channel?) #f]
-                      [#:connection-close? connection-close? boolean? #f]
-                      [#:tcp@ tcp@ (unit/c (import) (export tcp^)) raw:tcp@]
-                      [#:ports ports (listof tcp-listen-port?) (list 80)]
-                      [#:listen-ip listen-ip (or/c string? false/c) #f]
-                      [#:max-waiting max-waiting integer? 511]
-                      [#:initial-connection-timeout initial-connection-timeout integer? 60])
-         (-> void)]{
- Calls @racket[serve] multiple times, once for each @racket[port], and returns
- a function that shuts down all of the server instances.
-}
-
-@defproc[(serve/ips+ports [#:dispatch dispatch dispatcher/c]
-                          [#:confirmation-channel confirmation-channel (or/c false/c async-channel?) #f]
-                          [#:connection-close? connection-close? boolean? #f]
-                          [#:tcp@ tcp@ (unit/c (import) (export tcp^)) raw:tcp@]
-                          [#:ips+ports ips+ports (listof (cons/c (or/c string? false/c) (listof tcp-listen-port?))) (list (cons #f (list 80)))]
-                          [#:max-waiting max-waiting integer? 511]
-                          [#:initial-connection-timeout initial-connection-timeout integer? 60])
-         (-> void)]{
- Calls @racket[serve/ports] multiple times, once for each @racket[ip], and returns
- a function that shuts down all of the server instances.
-}
-                  
-@defproc[(serve/web-config@ [config@ (unit/c (import) (export web-config^))]
-                            [#:tcp@ tcp@ (unit/c (import) (export tcp^)) raw:tcp@])
-         (-> void)]{
- Starts the @web-server with the settings defined by the given @racket[web-config^] unit.
-        
- It is very useful to combine this with @racket[configuration-table->web-config@] and @racket[configuration-table-sexpr->web-config@]:
- 
- @racketblock[
-  (serve/web-config@
-   (configuration-table->web-config@ 
-    default-configuration-table-path))]
-}
-
-@defproc[(do-not-return) void]{
- This function does not return. If you are writing a script to load the @web-server
- you are likely to want to call this functions at the end of your script.
-}
-
-}
-
-@include-section["servlet-env-int.scrbl"]
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/managers.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/managers.scrbl
deleted file mode 100644
index 271256f2ef..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/managers.scrbl
+++ /dev/null
@@ -1,197 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "managers"]{Continuation Managers}
-
-Since Racket servlets store their continuations on the server, they take
-up memory on the server. Furthermore, garbage collection can not be used
-to free this memory, because there are roots outside the system: users'
-browsers, bookmarks, brains, and notebooks. Therefore, some other strategy
-must be used if memory usage is to be controlled. This functionality is
-pluggable through the @deftech{manager} interface.
-
-@; ------------------------------------------------------------
-@section[#:tag "manager"]{General}
-@(require (for-label web-server/managers/manager)
-          (for-label web-server/servlet/servlet-structs))
-
-@defmodule[web-server/managers/manager]{
-
-This module defines the manager interface. It is required by
-the users and implementors of managers.
-
-@defstruct[manager ([create-instance ((-> void) . -> . number?)]
-                    [adjust-timeout! (number? number? . -> . void)]
-                    [clear-continuations! (number? . -> . void)]
-                    [continuation-store! (number? any/c 
-                                                  (or/c false/c
-                                                        (request? . -> . can-be-response?))
-                                                  . -> . (list/c number? number?))]
-                    [continuation-lookup (number? number? number? . -> . any/c)]
-                    [continuation-peek (number? number? number? . -> . any/c)])]{
- @racket[create-instance] is called to initialize a instance, to hold the
- continuations of one servlet session. It is passed
- a function to call when the instance is expired. It runs the id of the
- instance.
-
- @racket[adjust-timeout!] is a to-be-deprecated function that takes an
- instance-id and a number. It is specific to the timeout-based manager
- and will be removed.
-
- @racket[clear-continuations!] expires all the continuations of an instance.
-
- @racket[continuation-store!] is given an instance-id, a continuation value,
- and a function to include in the exception thrown if the continuation is
- looked up and has been expired. The two numbers returned are a
- continuation-id and a nonce.
-
- @racket[continuation-lookup] finds the continuation value associated with
- the instance-id, continuation-id, and nonce triple it is given.
- 
- @racket[continuation-peek] is identical to @racket[continuation-lookup] except that
- its use must not affect the resource management policy decisions on the instance or
- continuation accessed. It is intended to be used by debuggers and benchmarks.
-}
-
-@defstruct[(exn:fail:servlet-manager:no-instance exn:fail)
-           ([expiration-handler 
-             (or/c false/c
-                   (request? . -> . can-be-response?))])]{
- This exception should be thrown by a manager when an instance is looked
- up that does not exist.
-}
-
-@defstruct[(exn:fail:servlet-manager:no-continuation exn:fail)
-           ([expiration-handler 
-             (or/c false/c
-                   (request? . -> . can-be-response?))])]{
- This exception should be thrown by a manager when a continuation is
- looked up that does not exist.
-}
-
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "none"]{No Continuations}
-@(require (for-label web-server/managers/none))
-
-@defmodule[web-server/managers/none]{
-
-This module defines a manager constructor:
-
-@defproc[(create-none-manager 
-          (instance-expiration-handler 
-           (or/c false/c
-                 (request? . -> . can-be-response?))))
-         manager?]{
- This manager does not actually store any continuation or instance data.
- You could use it if you know your servlet does not use the continuation
- capturing functions and want the server to not allocate meta-data
- structures for each instance.
- 
- If you @emph{do} use a continuation capturing function, the continuation is
- simply not stored. If the URL is visited, the @racket[instance-expiration-handler]
- is called with the request.
-}
-
-If you are considering using this manager, also consider using the
-Web Language. (See @secref["stateless"].)
-
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "timeouts"]{Timeouts}
-@(require (for-label web-server/managers/timeouts))
-
-@defmodule[web-server/managers/timeouts]{
-
-This module defines a manager constructor:
-
-@defproc[(create-timeout-manager 
-          [instance-exp-handler 
-           (or/c false/c
-                 (request? . -> . can-be-response?))]
-          [instance-timeout number?]
-          [continuation-timeout number?])
-         manager?]{
- Instances managed by this manager will be expired @racket[instance-timeout]
- seconds after the last time it is accessed. If an expired instance is
- looked up, the @racket[exn:fail:servlet-manager:no-instance] exception
- is thrown with @racket[instance-exp-handler] as the expiration handler.
-
- Continuations managed by this manager will be expired @racket[continuation-timeout]
- seconds after the last time it is accessed. If an expired continuation is looked
- up, the @racket[exn:fail:servlet-manager:no-continuation] exception
- is thrown with @racket[instance-exp-handler] as the expiration handler, if
- no expiration-handler was passed to @racket[continuation-store!].
-
- @racket[adjust-timeout!] corresponds to @racket[reset-timer!] on the timer
- responsible for the servlet instance.
-}
-
-This manager has been found to be... problematic... in large-scale
-deployments of the @web-server .
-
-}
-
-@; ------------------------------------------------------------
-@section[#:tag "lru"]{LRU}
-@(require (for-label web-server/managers/lru))
-
-@defmodule[web-server/managers/lru]{
-
-This module defines a manager constructor:
-
-@defproc[(create-LRU-manager
-          [instance-expiration-handler 
-           (or/c false/c
-                 (request? . -> . can-be-response?))]
-          [check-interval integer?]
-          [collect-interval integer?]
-          [collect? (-> boolean?)]
-          [#:initial-count initial-count integer? 1]
-          [#:inform-p inform-p (integer? . -> . void) (lambda _ (void))])
-         manager?]{
- Instances managed by this manager will be expired if there are no
- continuations associated with them, after the instance is unlocked.
- If an expired instance is looked up, the
- @racket[exn:fail:servlet-manager:no-instance] exception
- is thrown with @racket[instance-exp-handler] as the expiration handler.
-
- Continuations managed by this manager are given a "Life Count" of
- @racket[initial-count] initially. If an expired continuation is looked
- up, the @racket[exn:fail:servlet-manager:no-continuation] exception
- is thrown with @racket[instance-exp-handler] as the expiration handler, if
- no expiration-handler was passed to @racket[continuation-store!].
-
- Every @racket[check-interval] seconds @racket[collect?] is called to determine
- if the collection routine should be run. Every @racket[collect-interval] seconds
- the collection routine is run.
-
- Every time the collection routine runs, the "Life Count" of every
- continuation is decremented by @racket[1]. If a continuation's count
- reaches @racket[0], it is expired. The @racket[inform-p] function
- is called if any continuations are expired, with the number of
- continuations expired.
-}
-                  
-The recommended usage of this manager is codified as the following function:
-
-@defproc[(make-threshold-LRU-manager 
-          [instance-expiration-handler 
-           (or/c false/c
-                 (request? . -> . can-be-response?))]
-          [memory-threshold number?])
-         manager?]{
- This creates an LRU manager with the following behavior:
- The memory limit is set to @racket[memory-threshold] bytes. Continuations start with @racket[24]
- life points. Life points are deducted at the rate of one every @racket[10] minutes, or one
- every @racket[5] seconds when the memory limit is exceeded. Hence the maximum life time for
- a continuation is @racket[4] hours, and the minimum is @racket[2] minutes.
- 
- If the load on the server spikes---as indicated by memory usage---the server will quickly expire
- continuations, until the memory is back under control. If the load
- stays low, it will still efficiently expire old continuations.
-}
- 
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/mime-types.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/mime-types.scrbl
deleted file mode 100644
index 0fd121d1cb..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/mime-types.scrbl
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "mime-types"]{MIME Types}
-@(require (for-label web-server/private/mime-types
-                     racket/contract))
-
-@defmodule[web-server/private/mime-types]{
-
-This module provides function for dealing with @filepath{mime.types}
-files.
-
-@defproc[(read-mime-types [p path-string?])
-         (hash/c symbol? bytes?)]{
- Reads the @filepath{mime.types} file from @racket[p] and constructs a
- hash table mapping extensions to MIME types.
-}
-
-@defproc[(make-path->mime-type [p path-string?])
-         (path? . -> . (or/c false/c bytes?))]{
- Uses a @racket[read-mime-types] with @racket[p] and constructs a
- function from paths to their MIME type.
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/misc-util.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/misc-util.scrbl
deleted file mode 100644
index e8d04dc6ca..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/misc-util.scrbl
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "misc-util" #:style 'toc]{Miscellaneous Utilities}
-
-@(require (for-label web-server/private/util
-                     racket/path))
-
-@defmodule[web-server/private/util]
-
-@defproc[(bytes-ci=? [b1 bytes?] [b2 bytes?]) boolean?]{
- Compares two bytes case insensitively.
-}
-
-@defproc[(url-replace-path [proc ((listof path/param?) . -> . (listof path/param?))]
-                           [u url?])
-         url?]{
- Replaces the URL path of @racket[u] with @racket[proc] of the former path.
-}
-
-@defproc[(url-path->string [url-path (listof path/param?)])
-         string?]{
- Formats @racket[url-path] as a string with @racket["/"] as a delimiter
- and no params.
-}
-
-@defproc[(explode-path* [p path-string?])
-         (listof path-piece?)]{
- Like @racket[normalize-path], but does not resolve symlinks.
-}
-
-@defproc[(path-without-base [base path-string?]
-                            [p path-string?])
-         (listof path-piece?)]{
- Returns, as a list, the portion of @racket[p] after @racket[base],
- assuming @racket[base] is a prefix of @racket[p].
-}
-
-@defproc[(directory-part [p path-string?])
-         path?]{
- Returns the directory part of @racket[p], returning @racket[(current-directory)]
- if it is relative.
-}
-
-@defproc[(build-path-unless-absolute [base path-string?]
-                                     [p path-string?])
-         path?]{
- Prepends @racket[base] to @racket[p], unless @racket[p] is absolute.
-}
-
-@defproc[(network-error [s symbol?]
-                        [fmt string?]
-                        [v any/c] ...)
-         void]{
- Like @racket[error], but throws a @racket[exn:fail:network].
-}
-
-@defproc[(exn->string [exn (or/c exn? any/c)])
-         string?]{
- Formats @racket[exn] with @racket[(error-display-handler)] as a string.
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/mod-map.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/mod-map.scrbl
deleted file mode 100644
index dd0b004be0..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/mod-map.scrbl
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "mod-map"]{Serialization Utilities}
-@(require (for-label web-server/private/mod-map))
-
-@defmodule[web-server/private/mod-map]{
-
-The @racketmodname[racket/serialize] library provides the
-functionality of serializing values. This module
-compresses the serialized representation.
-
-@defproc[(compress-serial [sv list?])
-         list?]{
- Collapses multiple occurrences of the same module in the module
- map of the serialized representation, @racket[sv].
-}
-
-@defproc[(decompress-serial [csv list?])
-         list?]{
- Expands multiple occurrences of the same module in the module
- map of the compressed serialized representation, @racket[csv].
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/namespace.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/namespace.scrbl
deleted file mode 100644
index 18b7ef752e..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/namespace.scrbl
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "namespace"]{Servlet Namespaces}
-@(require (for-label web-server/configuration/namespace))
-
-@defmodule[web-server/configuration/namespace]{
-
-This module provides a function to help create the
-@racket[make-servlet-namespace] procedure needed by the @racket[make] function
-of @racketmodname[web-server/dispatchers/dispatch-servlets].
-
-@defthing[make-servlet-namespace/c contract?]{
- Equivalent to 
- @racketblock[
-(->* ()
-     (#:additional-specs (listof module-path?))
-     namespace?)
-]
-}
-
-@defproc[(make-make-servlet-namespace (#:to-be-copied-module-specs to-be-copied-module-specs (listof module-path?)))
-         make-servlet-namespace/c]{
-This function creates a function that when called will construct a new
-@racket[namespace] that has all the modules from
-@racket[to-be-copied-module-specs] and @racket[additional-specs], as
-well as @racket[racket] and @racket[mred], provided they are already
-attached to the @racket[(current-namespace)] of the call-site.
-
-Example:
-@racketblock[
- (make-make-servlet-namespace
-  #:to-be-copied-module-specs `((lib "database.rkt" "my-module")))
- ]
-}
-
-}
-
-@section{Why this is useful}
-
-A different namespace is needed for each servlet, so that if servlet A
-and servlet B both use a stateful module C, they will be isolated from
-one another. We see the @web-server as an operating system for servlets,
-so we inherit the isolation requirement on operating systems.
-
-However, there are some modules which must be shared. If they were not,
-then structures cannot be passed from the @web-server to the servlets,
-because Racket's structures are generative.
-
-Since, on occasion, a user will actually wanted servlets A and B to
-interact through module C.  A custom @racket[make-servlet-namespace] can
-be created, through this procedure, that attaches module C to all
-servlet namespaces. Through other means (see @secref["dispatchers"])
-different sets of servlets can share different sets of modules.
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/native.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/native.scrbl
deleted file mode 100644
index c21493645f..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/native.scrbl
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[]{Native Interfaces}
-
-@(require (for-label racket
-                     web-server/lang/native
-                     web-server/lang/abort-resume))
-
-@defmodule[web-server/lang/native]{
-
-It is sometimes inconvenient to use @racket[serial->native] and
-@racket[native->serial] throughout your program.  This module provides a
-macro for creating wrappers.
-
-@defform[#:literals (ho)
-         (define-native (native arg-spec ...) original)
-         #:contracts ([arg-spec ho] [arg-spec _])]{
- Builds an interface around @racket[original] named @racket[native] such
- that calls to @racket[native] are wrapped in @racket[serial->native]
- and all arguments marked with @racket[ho] in @racket[arg-spec] are
- assumed to procedures and are wrapped in @racket[native->serial].
-
- For example,
- @racketblock[
-  (define-native (build-list/native _ ho) build-list)
- ]
-
- is equivalent to
- @racketblock[
-  (define (build-list/native fst snd)
-    (serial->native
-     (build-list 
-      fst
-      (lambda args
-        (native->serial
-         (apply snd args))))))
-  ]
- }
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/page.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/page.scrbl
deleted file mode 100644
index 24c0f8e70d..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/page.scrbl
+++ /dev/null
@@ -1,97 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-@(require (for-label web-server/servlet
-                     web-server/page
-                     racket/promise
-                     racket/list
-                     xml))
-
-@title[#:tag "page"]{Page: Short-hand for Common Patterns}
-
-@defmodule[web-server/page]
-
-The @web-server provides a simple utility library for building Web applications that consistent mostly of @racket[send/suspend/dispatch]-created pages and request handling.
-
-Most Web applications rely heavily on @racket[send/suspend/dispatch] and typically use the pattern:
-@racketblock[
- (send/suspend/dispatch
-  (λ (my-embed/url)
-    .... (my-embed/url other-page) ....))]
-
-@defform[(page e ...)]{
-
-The @racket[page] macro automates this by expanding @racket[(page e ...)] to a usage of @racket[send/suspend/dispatch] where the syntax parameter @racket[embed/url] is bound to the argument of @racket[send/suspend/dispatch]. 
-
-}
-
-@defidform[embed/url]{
-When used inside @racket[page] syntactically, a rename transformer for the procedure embedding function; otherwise, a syntax error.}
-
-A simple example:
-@racketblock[
- (page
-  (response/xexpr
-   `(html 
-     (body 
-      (a ([href 
-           ,(embed/url 
-             (λ (req)
-               "You clicked!"))])
-         "Click me")))))]
-
-Similarly, many Web applications make use almost exclusively of
-functions that are arguments to @racket[embed/url] and immediately
-invoke @racket[send/suspend/dispatch].
-
-@deftogether[[@defform[(lambda/page formals e ...)]
-              @defform[(define/page (id . formals) e ...)]]]{
-  The @racket[lambda/page] and @racket[define/page] automate this by
-  expanding to functions that accept a request as the first argument
-  (followed by any arguments specified in @racket[formals]) and
-  immediately wrap their body in @racket[page]. This functions also
-  cooperate with @racket[get-binding] by binding the request to the
-  @racket[current-request] parameter.
-}
-
-The binding interface of @racketmodname[web-server/http] is powerful,
-but subtle to use conveniently due to its protection against hostile
-clients.
-
-@deftogether[[
-@defparam[current-request req request?]
-@defthing[binding-id/c contract?]
-@defthing[binding-format/c contract?]
-@defproc[(get-binding [id binding-id/c]
-                      [req request? (current-request)]
-                      [#:format format binding-format/c 'string])
-         (or/c false/c string? bytes? binding?)]
-@defproc[(get-bindings [id binding-id/c]
-                       [req request? (current-request)]
-                       [#:format format binding-format/c 'string])
-         (listof (or/c string? bytes? binding?))]
-]]{
-
-  The @racket[get-binding](s) interface attempts to resolve this by
-  providing a powerful interface with convenient defaults.
-
-  @racket[get-binding] extracts the first binding of a form input from a
-  request, while @racket[get-bindings] extracts them all.
-
-  They accept a form identifier (@racket[id]) as either a byte string, a
-  string, or a symbol. In each case, the user input is compared in a
-  case-sensitive way with the form input.
-
-  They accept an optional request argument (@racket[req]) that defaults
-  to the value of the @racket[current-request] parameter used by
-  @racket[lambda/page] and @racket[define/page].
-
-  Finally, they accept an optional keyword argument (@racket[format])
-  that specifies the desired return format. The default,
-  @racket['string], produces a UTF-8 string (or @racket[#f] if the byte
-  string cannot be converted to UTF-8.) The @racket['bytes] format
-  always produces the raw byte string. The @racket['file] format
-  produces the file upload content (or @racket[#f] if the form input was
-  not an uploaded file.) The @racket['binding] format produces the
-  binding object.
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/private.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/private.scrbl
deleted file mode 100644
index 57cd7af289..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/private.scrbl
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "private" #:style 'toc]{Internal APIs}
-
-The @web-server is a complicated piece of software and as a result,
-defines a number of interesting and independently useful sub-components.
-Some of these are documented here.
-
-@local-table-of-contents[]
-
-@include-section["timer.scrbl"]
-@include-section["connection-manager.scrbl"]
-@include-section["closure.scrbl"]
-@include-section["cache-table.scrbl"]
-@include-section["mime-types.scrbl"]
-@include-section["mod-map.scrbl"]
-@include-section["url-param.scrbl"]
-@include-section["gzip.scrbl"]
-@include-section["misc-util.scrbl"]
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/responders.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/responders.scrbl
deleted file mode 100644
index 7976d07b41..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/responders.scrbl
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "responders"]{Standard Responders}
-@(require (for-label web-server/configuration/responders
-                     web-server/http
-                     net/url))
-
-@defmodule[web-server/configuration/responders]{
-
-This module provides some functions that help constructing HTTP
-responders.  These functions are used by the default dispatcher
-constructor (see @secref["web-server-unit"]) to turn the paths given in
-the @racket[configuration-table] into responders for the associated
-circumstance.
-
-@defproc[(file-response [http-code natural-number/c]
-                        [short-version string?]
-                        [text-file string?]
-                        [header header?] ...)
-         response?]{
- Generates a @racket[response?] with the given @racket[http-code] and
- @racket[short-version] as the corresponding fields; with the content of
- the @racket[text-file] as the body; and, with the @racket[header]s as,
- you guessed it, headers.
-
-This does not cause redirects to a well-known URL, such as
-@filepath{conf/not-found.html}, but rather use the contents of
-@filepath{not-found.html} (for example) as its contents. Therefore, any
-relative URLs in @racket[text-file] are relative to whatever URL
-@racket[file-response] is used to respond @emph{to}. Thus, you should
-probably use absolute URLs in these files.
-}
-
-@defproc[(servlet-loading-responder [url url?] [exn exn?])
-         response?]{
- Gives @racket[exn] to the @racket[current-error-handler] and response
- with a stack trace and a "Servlet didn't load" message.
-}
-
-@defproc[(gen-servlet-not-found [file path-string?])
-         ((url url?) . -> . response?)]{
- Returns a function that generates a standard "Servlet not found." error
- with content from @racket[file].
-}
-
-@defproc[(servlet-error-responder [url url?] [exn exn?])
-         response?]{
- Gives @racket[exn] to the @racket[current-error-handler] and response
- with a stack trace and a "Servlet error" message.
-}
-
-@defproc[(gen-servlet-responder [file path-string?])
-         ((url url?) (exn any/c) . -> . response?)]{
- Prints the @racket[exn] to standard output and responds with a "Servlet
- error." message with content from @racket[file].
-}
-
-@defproc[(gen-servlets-refreshed [file path-string?])
-         (-> response?)]{
- Returns a function that generates a standard "Servlet cache refreshed."
- message with content from @racket[file].
-}
-
-@defproc[(gen-passwords-refreshed [file path-string?])
-         (-> response?)]{
- Returns a function that generates a standard "Passwords refreshed."
- message with content from @racket[file].
-}
-
-@defproc[(gen-authentication-responder [file path-string?])
-         ((url url?) (header header?) . -> . response?)]{
- Returns a function that generates an authentication failure error with
- content from @racket[file] and @racket[header] as the HTTP header.
-}
-
-@defproc[(gen-protocol-responder [file path-string?])
-         ((url url?) . -> . response?)]{
- Returns a function that generates a "Malformed request" error with
- content from @racket[file].
-}
-
-@defproc[(gen-file-not-found-responder [file path-string?])
-         ((req request?) . -> . response?)]{
- Returns a function that generates a standard "File not found" error
- with content from @racket[file].
-}
-
-@defproc[(gen-collect-garbage-responder [file path-string?])
-         (-> response?)]{
- Returns a function that generates a standard "Garbage collection run"
- message with content from @racket[file].
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/running.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/running.scrbl
deleted file mode 100644
index e4f1fb0322..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/running.scrbl
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "run"]{Running Web Servlets}
-
-There are a number of ways to run Web servlets.
-
-@; ------------------------------------------------------------
-@section[#:tag "insta"]{Instant Servlets}
-@(require (for-label (only-in web-server/insta/insta
-                              no-web-browser static-files-path)
-                     web-server/http
-                     web-server/servlet-env))
-
-@defmodulelang[web-server/insta #:use-sources (web-server/insta/insta)]
-
-The fastest way to get a servlet running in the Web server is to use the 
-"Insta" language in DrRacket. Enter the following into DrRacket:
-
-@racketmod[
-web-server/insta
-
-(define (start req)
-  (response/xexpr
-   `(html (head (title "Hello world!"))
-          (body (p "Hey out there!")))))
-]
-
-And press @onscreen["Run"]. A Web browser will open up showing your new servlet.
-This servlet will only be accessible from your local machine.
-
-Behind the scenes, DrRacket has used @racket[serve/servlet] to start a new server
-that uses your @racket[start] function as the servlet. 
-You are given the entire @racketmodname[web-server/servlet] API.
-
-The following API is provided to customize the server instance:
-
-@defproc[(no-web-browser) void]{
- Calling this will instruct DrRacket to @emph{not} start a Web browser when you press
-  @onscreen["Run"].
-}
-
-@defproc[(static-files-path [path path-string?]) void]{
- This instructs the Web server to serve static files, such as stylesheet and images, from @racket[path].
-}
-
-If you want more control over specific parameters, keep reading about @racketmodname[web-server/servlet-env].
-
-@; ------------------------------------------------------------
-@include-section["servlet-env.scrbl"]
-
-@; ------------------------------------------------------------
-@section[#:tag "command-line-tools"]{Command-line Tools}
-@(require (for-label web-server/configuration/configuration-table
-                     web-server/web-server
-                     web-server/web-config-sig
-                     web-server/web-config-unit
-                     web-server/web-server-unit))
-
-@section-index{plt-web-server}
-
-One command-line utility is provided with the @|web-server|:
-
-@commandline{plt-web-server [-f <file-name> -p <port> -a <ip-address> --ssl]}
-
-The optional file-name argument specifies the path to a
-@racket[configuration-table] S-expression (see @racket[configuration-table->sexpr] for the syntax documentation.)
-If this is not provided, the
-default configuration shipped with the server is used. The optional
-port and ip-address arguments override the corresponding portions of
-the @racket[configuration-table]. If the SSL option is provided, then 
-the server uses HTTPS with @filepath{server-cert.pem} and @filepath{private-key.pem}
-in the current directory, with 443 as the default port. (See the @racketmodname[openssl] 
-module for details on the SSL implementation.)
-
-The @racket[configuration-table] is given to
-@racket[configuration-table->web-config@] and used to construct a
-@racket[web-config^] unit, and is linked with the
-@racket[web-server@] unit. The resulting unit is invoked, and the
-server runs until the process is killed.
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/serial.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/serial.scrbl
deleted file mode 100644
index 1ed9647c95..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/serial.scrbl
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[]{Serializable Continuations}
-
-@(require (for-label web-server/lang/abort-resume
-                     "dummy-stateless-servlet.rkt"
-                     racket/serialize))
-
-@defmodule[web-server/lang/abort-resume]{
-
-The main purpose of the stateless language is to provide serializable continuations to your servlet.
-    
-@defproc[(call-with-serializable-current-continuation [response-generator (continuation? . -> . any)])
-         any]{
- Captures the current continuation in a serializable way and calls @racket[response-generator] with it, returning the result.
-          
- This potentially uses resources of the current servlet's @racket[manager] if @racket[serial->native] and @racket[native->serial] were used
- to capture an untransformable context.
-}
-
-@defform[(serial->native expr)]{
- @racket[serial->native] informs the serializing runtime that @racket[expr] is potentially a call to an untransformed context. 
- This sets up the necessary information for
- @racket[native->serial] to signal to @racket[call-with-serializable-current-continuation] to capture the native (and thus unserializable) section
- of the context and store it on the server.
-}
-
-@defform[(native->serial expr)]{
- @racket[native->serial] informs the serializing runtime that @racket[expr] marks first expression after returning from an untransformed context.
- This captures the
- untransformed context such that @racket[call-with-serializable-current-continuation] can store it on the server and reference it from serializable
- continuations. 
-
- For example,
- @racketblock[
- (build-list 
-  3 
-  (lambda (i) 
-    (call-with-serializable-current-continuation 
-     (lambda (k) (serialize k)))))
- ]
- will fail at runtime because @racket[build-list] is not transformed. However,
- @racketblock[
- (serial->native 
-  (build-list
-   3
-   (lambda (i)
-     (native->serial
-      (call-with-serializable-current-continuation 
-       (lambda (k) (serialize k)))))))
- ]
- will succeed and @racket[k] will reference a cell in the current servlet's @racket[manager] that stores the part of the continuation in
- @racket[build-list].
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/server-faq.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/server-faq.scrbl
deleted file mode 100644
index 0b71be07fa..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/server-faq.scrbl
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-@(require (for-label web-server/dispatchers/dispatch-servlets))
-
-@title{Troubleshooting and Tips}
-
-@section{How do I use Apache with the Racket Web Server?}
-
-You may want to put Apache in front of your Racket Web Server
-application.  Apache can rewrite and proxy requests for a private (or
-public) Racket Web Server:
-
-@verbatim{
-  RewriteEngine on
-  RewriteRule ^(.*)$ http://localhost:8080/$1 [P,NE]
-}
-
-The first argument to @exec{RewriteRule} is a match pattern. The second
-is how to rewrite the URL.  The bracketed part contains flags that
-specify the type of rewrite, in this case the @litchar{P} flag instructs
-Apache to proxy the request.  (If you do not include this, Apache will
-return an HTTP Redirect response and the client will make a second
-request to @litchar{localhost:8080} which will not work on a different
-machine.)  In addition, the @litchar{NE} flag is needed to avoid
-escaping parts of the URL --- without it, a @litchar{;} is escaped as
-@litchar{%3B} which will break the proxied request.
-
-See Apache's documentation for more details on
-@link["http://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriterule"]{RewriteRule}.
-
-@section{Can the server create a PID file?}
-
-The server has no option for this, but you can add it very
-easily. There's two techniques.
-
-First, if you use a UNIX platform, in your shell startup script you can use
-@verbatim{
-  echo $$ > PID
-  exec run-web-server
-}
-
-Using @exec{exec} will reuse the same process, and therefore, the PID
-file will be accurate.
-
-Second, if you want to make your own Racket start-up script, you can write:
-@(require (for-label mzlib/os))
-@racketblock[
-  (require mzlib/os)
-  (with-output-to-file _your-pid-file (lambda () (write (getpid))))
-  (_start-server)
-]
-
-@section[#:tag "faq:https"]{How do I set up the server to use HTTPS?}
-
-This requires an SSL certificate and private key. This is very platform specific, but we will provide
-the details for using OpenSSL on UNIX:
-
-@commandline{openssl genrsa -des3 -out private-key.pem 1024}
-
-This will generate a new private key, but it will have a passphrase on it. You can remove this via:
-
-@commandline{openssl rsa -in private-key.pem -out private-key.pem}
-@commandline{chmod 400 private-key.pem}
-
-Now, we generate a self-signed certificate:
-
-@commandline{openssl req -new -x509 -nodes -sha1 -days 365 -key private-key.pem > server-cert.pem}
-
-(Each certificate authority has different instructions for generating certificate signing requests.)
-
-We can now start the server with:
-
-@commandline{plt-web-server --ssl}
-
-The Web Server will start on port 443 (which can be overridden with the @exec{-p} option) using the
-@filepath{private-key.pem} and @filepath{server-cert.pem} we've created.
-
-@section{How do I limit the number of requests serviced at once by the Web Server?}
-
-Refer to @secref["limit"].
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet-env-int.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet-env-int.scrbl
deleted file mode 100644
index 4186b85c78..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet-env-int.scrbl
+++ /dev/null
@@ -1,92 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[]{Simple Single Servlet Servers}
-@(require (for-label web-server/servlet-env
-                     web-server/servlet-dispatch
-                     web-server/http
-                     web-server/managers/manager
-                     web-server/managers/lru
-                     web-server/private/util
-                     web-server/dispatchers/dispatch
-                     web-server/configuration/configuration-table
-                     web-server/configuration/responders
-                     web-server/dispatchers/dispatch-log
-                     net/url
-                     racket/serialize
-                     web-server/stuffers
-                     racket/list))
-
-@defmodule[web-server/servlet-dispatch]{
-
-These functions optimize the construction of dispatchers and launching of servers for single servlets and interactive development.
-
-@defproc[(dispatch/servlet 
-          [start (request? . -> . response?)]
-          [#:regexp regexp regexp? #rx""]
-          [#:stateless? stateless? boolean? #f]
-          [#:stuffer stuffer (stuffer/c serializable? bytes?) default-stuffer]
-          [#:manager manager manager? (make-threshold-LRU-manager #f (* 1024 1024 64))]
-          [#:current-directory servlet-current-directory path-string? (current-directory)]
-          [#:responders-servlet-loading
-           responders-servlet-loading
-           (url? any/c . -> . can-be-response?)
-           servlet-loading-responder]
-          [#:responders-servlet
-           responders-servlet
-           (url? any/c . -> . can-be-response?)
-           servlet-error-responder])
-         dispatcher/c]{
- @racket[serve/servlet] starts a server and uses a particular dispatching sequence. For some applications, this
- nails down too much, but users are conflicted, because the interface is so convenient. For those users, @racket[dispatch/servlet]
- does the hardest part of @racket[serve/servlet] and constructs a dispatcher just for the @racket[start] servlet.
- 
- The dispatcher responds to requests that match @racket[regexp]. The current directory
- of servlet execution is @racket[servlet-current-directory]. 
- 
- If @racket[stateless?] is true, then the servlet is run as a stateless @racketmod[web-server] module and @racket[stuffer] is used
- as the @tech[#:doc '(lib "web-server/scribblings/web-server.scrbl")]{stuffer}.
-
- The servlet is loaded with @racket[manager] as its continuation manager. (The default manager limits the amount of memory to 64 MB and
- deals with memory pressure as discussed in the @racket[make-threshold-LRU-manager] documentation.)
- 
- The servlet is run in the @racket[(current-namespace)].
-
- If a servlet fails to load, @racket[responders-servlet-loading] is used. If a servlet errors during its operation, @racket[responders-servlet] is used.
-}
-
-@defproc[(serve/launch/wait
-          [make-dispatcher (semaphore? . -> . dispatcher/c)]
-          [#:connection-close? connection-close? boolean? #f]
-          [#:launch-path launch-path (or/c false/c string?) #f]
-          [#:banner? banner? boolean? #f]
-          [#:listen-ip listen-ip (or/c false/c string?) "127.0.0.1"]
-          [#:port port number? 8000]
-          [#:max-waiting max-waiting exact-nonnegative-integer? 511]
-          [#:ssl-cert ssl-cert (or/c false/c path-string?) #f]
-          [#:ssl-key ssl-key (or/c false/c path-string?) #f])
-         void]{
- The other interesting part of @racket[serve/servlet] is its ability to start up a server and immediately
- launch a browser at it. This is provided by @racket[serve/launch/wait].
- 
- It starts a server using the result of @racket[make-dispatcher] as the dispatcher. @racket[make-dispatcher] is supplied
- a semaphore that if posted, will cause the server to quit.
- 
- If @racket[launch-path] is not false, then a browser is launched with that path appended to the URL to the server itself.
- 
- If @racket[banner?] is true, then a banner is printed informing the user of the server's URL.
- 
- The server listens on @racket[listen-ip] and port @racket[port]. If @racket[listen-ip] is @racket[#f], then the server accepts 
- connections to all of the listening machine's addresses. Otherwise, the server accepts connections only at the interface(s) associated with the given string.
- For example, providing @racket["127.0.0.1"] (the default) as @racket[listen-ip] creates a server that accepts only connections to @racket["127.0.0.1"] (the loopback interface) from the local machine.
-
-@racket[max-waiting] is passed to @racket[serve] to control the TCP backlog.
- 
- If @racket[ssl-key] and @racket[ssl-cert] are not false, then the server runs in HTTPS mode with @racket[ssl-cert]
- and @racket[ssl-key] as paths to the certificate and private key.    
- 
- If @racket[connection-close?] is @racket[#t], then every connection is closed after one
- request. Otherwise, the client decides based on what HTTP version it uses.
-}
-              
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet-env.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet-env.scrbl
deleted file mode 100644
index d81de1232f..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet-env.scrbl
+++ /dev/null
@@ -1,241 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "servlet-env"]{Simple Single Servlet Servers}
-@(require (for-label web-server/servlet-env
-                     web-server/http
-                     web-server/managers/lru
-                     web-server/managers/manager
-                     web-server/lang/lang-api
-                     web-server/private/util
-                     web-server/dispatchers/dispatch
-                     web-server/configuration/configuration-table
-                     web-server/configuration/responders
-                     web-server/dispatchers/dispatch-log
-                     net/url
-                     racket/serialize
-                     web-server/stuffers
-                     web-server/servlet/servlet-structs
-                     web-server/servlet-dispatch
-                     racket/list))
-
-@defmodule[web-server/servlet-env]
-
-The @web-server provides a way to quickly configure and start a servlet with more customizability than @racketmodname[web-server/insta] provides. This is provided by the @racketmodname[web-server/servlet-env] module.
-
-@section{Examples}
-
-Here is a simple example of its use:
-@racketmod[
-racket
-(require web-server/servlet
-         web-server/servlet-env)
-
-(define (start req)
-  (response/xexpr
-   `(html (head (title "Hello world!"))
-          (body (p "Hey out there!")))))
-
-(serve/servlet start)
-]
-
-Unlike the @racketmodname[web-server/insta] language, @racket[start] is not a special identifier, so we could just as well have written the example as:
-@racketmod[
-racket
-(require web-server/servlet
-         web-server/servlet-env)
-
-(define (my-app req)
-  (response/xexpr
-   `(html (head (title "Hello world!"))
-          (body (p "Hey out there!")))))
-
-(serve/servlet my-app)
-]
-
-Let's look at some of the customizations @racket[serve/servlet] allows.
-
-Suppose you'd like to change the port to something else, change the last line to:
-@racketblock[
-(serve/servlet my-app 
-               #:port 8080)
-]
-
-Suppose you want to accept connections from external machines:
-@racketblock[
-(serve/servlet my-app 
-               #:listen-ip #f)
-]
-
-By default the URL for your servlet is @filepath{http://localhost:8000/servlets/standalone.rkt}, 
-suppose you wanted it to be @filepath{http://localhost:8000/hello.rkt}:
-@racketblock[
-(serve/servlet my-app
-               #:servlet-path "/hello.rkt")
-]
-
-Suppose you wanted it to capture top-level requests:
-@racketblock[
-(serve/servlet my-app
-               #:servlet-regexp #rx"")
-]
-Or, perhaps just some nice top-level name:
-@racketblock[
-(serve/servlet my-app
-               #:servlet-path "/main")
-]
-
-Suppose you wanted to use a style-sheet (@filepath{style.css}) found on your Desktop (@filepath{/Users/jay/Desktop/}):
-@racketblock[
-(serve/servlet my-app
-               #:extra-files-paths 
-               (list
-                (build-path "/Users/jay/Desktop")))
-]
-These files are served @emph{in addition} to those from the @racket[#:server-root-path] @filepath{htdocs} directory.
-You may pass any number of extra paths.
-
-If you want to use @racket[serve/servlet] in a start up script for a Web application,
-and don't want a browser opened or the DrRacket banner printed, then you can write:
-@racketblock[
-(serve/servlet my-app
-               #:command-line? #t)
-]
-
-@subsection{Stateless Servlets}
-
-Suppose you would like to start a server for a stateless Web servlet @filepath{servlet.rkt} that provides @racketid[start]:
-@racketmod[
- racket
- (require "servlet.rkt"
-          web-server/servlet-env)
-
- (serve/servlet start #:stateless? #t)
-]
-
-You can also put the call to @racket[serve/servlet] in the @racketmodname[web-server] module directly:
-@racketmod[
- web-server
- (require web-server/servlet-env)
- 
- (define (start req)
-   (start
-    (send/suspend
-     (lambda (k-url)
-       (response/xexpr
-        `(html (body (a ([href ,k-url]) "Hello world!"))))))))
- 
- (serve/servlet start #:stateless? #t)
-]
-Like always, you don't even need to save the file.
-
-@section{Full API}
-
-@defproc[(serve/servlet [start (request? . -> . can-be-response?)]
-                        [#:command-line? command-line? boolean? #f]
-                        [#:connection-close? connection-close? boolean? #f]
-                        [#:launch-browser? launch-browser? boolean? (not command-line?)]
-                        [#:quit? quit? boolean? (not command-line?)]
-                        [#:banner? banner? boolean? (not command-line?)]
-                        [#:listen-ip listen-ip (or/c false/c string?) "127.0.0.1"]
-                        [#:port port tcp-listen-port? 8000]
-                        [#:max-waiting max-waiting exact-nonnegative-integer? 511]
-                        [#:servlet-path servlet-path string?
-                                        "/servlets/standalone.rkt"]
-                        [#:servlet-regexp servlet-regexp regexp?
-                                          (regexp 
-                                           (format 
-                                            "^~a$"
-                                            (regexp-quote servlet-path)))]
-                        [#:stateless? stateless? boolean? #f]
-                        [#:stuffer stuffer (stuffer/c serializable? bytes?) default-stuffer]
-                        [#:manager manager manager? (make-threshold-LRU-manager #f (* 128 1024 1024))]
-                        [#:servlet-namespace servlet-namespace (listof module-path?) empty]
-                        [#:server-root-path server-root-path path-string? (collection-path "web-server" "default-web-root")]
-                        [#:extra-files-paths extra-files-paths (listof path-string?) (list (build-path server-root-path "htdocs"))]
-                        [#:servlets-root servlets-root path-string? (build-path server-root-path "htdocs")]
-                        [#:servlet-current-directory servlet-current-directory path-string? servlets-root]
-                        [#:file-not-found-responder file-not-found-responder
-                                                    (request? . -> . can-be-response?)
-                                                    (gen-file-not-found-responder 
-                                                     (build-path
-                                                      server-root-path
-                                                      "conf"
-                                                      "not-found.html"))]
-                        [#:servlet-loading-responder
-                         responders-servlet-loading
-                         (url? any/c . -> . can-be-response?)
-                         servlet-loading-responder]
-                        [#:servlet-responder
-                         responders-servlet
-                         (url? any/c . -> . can-be-response?)
-                         servlet-error-responder]
-                        [#:mime-types-path mime-types-path path-string?
-                                           ....]
-                        [#:ssl? ssl? boolean? #f]
-                        [#:ssl-cert ssl-cert (or/c false/c path-string?) (and ssl? (build-path server-root-path "server-cert.pem"))]
-                        [#:ssl-key ssl-key (or/c false/c path-string?) (and ssl? (build-path server-root-path "private-key.pem"))]
-
-                        [#:log-file log-file (or/c false/c path-string?) #f]
-                        [#:log-format log-format (or/c log-format/c format-req/c) 'apache-default])
-                       void]{
- This sets up and starts a fairly default server instance.
-      
- @racket[start] is loaded as a servlet and responds to requests that match @racket[servlet-regexp]. The current directory
- of servlet execution is @racket[servlet-current-directory].
-
- If @racket[launch-browser?] is true, then a web browser is opened to @filepath{http://localhost:<port><servlet-path>}. @racket[servlet-path] has no other purpose, if @racket[servlet-regexp] is provided.
- 
- If @racket[quit?] is true, then the URL @filepath["/quit"] ends the server.
-  
- If @racket[stateless?] is true, then the servlet is run as a stateless @racketmod[web-server] module and @racket[stuffer] is used
- as the @tech{stuffer}.
-
-@racket[serve/servlet] is simpler interface over
-@racket[serve/launch/wait], @racket[dispatch/servlet], and a few of
-the standard @secref["dispatchers" #:doc
-'(lib "web-server/scribblings/web-server-internal.scrbl")]. Some
-options, like @racket[port] and @racket[max-waiting] are transparently
-passed to @racket[serve/launch/wait]. Some advanced customization
-requires using these underlying pieces of the
-@racketmodname[web-server] directly. However, many simpler
-customizations do not, which the rest of this section describes.
- 
- The server listens on @racket[listen-ip] and port @racket[port]. If @racket[listen-ip] is @racket[#f], then the server accepts 
- connections to all of the listening machine's addresses. Otherwise, the server accepts connections only at the interface(s) associated with the given string.
- For example, providing @racket["127.0.0.1"] (the default) as @racket[listen-ip] creates a server that accepts only connections to @racket["127.0.0.1"] (the loopback interface) from the local machine.
- 
- If @racket[ssl-cert] and @racket[ssl-key] are not false, then the server runs in HTTPS mode with @racket[ssl-cert]
- and @racket[ssl-key] as the certificates and private keys.
- 
- The servlet is loaded with @racket[manager]
- as its continuation manager. (The default manager limits the amount of memory to 64 MB and
- deals with memory pressure as discussed in the @racket[make-threshold-LRU-manager] documentation.)
- 
- The server files are rooted at @racket[server-root-path] (which is
-the @filepath{default-web-root} directory in the
-@racketmodname[web-server] collection by default.)  File paths, in
-addition to the @filepath["htdocs"] directory under
-@racket[server-root-path] may be provided with
-@racket[extra-files-paths]. These paths are checked first, in the
-order they appear in the list.
- 
- Other servlets are served from @racket[servlets-root]. 
- The modules specified by @racket[servlet-namespace] are shared between servlets found in @racket[servlets-root] and the current namespace (and therefore
- the @racket[start] procedure.)
- 
- If a file cannot be found, @racket[file-not-found-responder] is used to generate an error response. If a servlet fails to load, @racket[responders-servlet-loading] is used. If a servlet errors during its operation, @racket[responders-servlet] is used.
-
- If @racket[banner?] is true, then an informative banner is printed. You may want to use this when
- running from the command line, in which case the @racket[command-line?] option controls similar options.
- 
- MIME types are looked up at @racket[mime-types-path]. By default the @filepath{mime.types} file in the
- @racket[server-root-path] is used, but if that file does not exist, then the file that ships with the
- Web Server is used instead. Of course, if a path is given, then it overrides this behavior.
-
- If @racket[log-file] is given, then it used to log requests using @racket[log-format] as the format. Allowable formats
- are those allowed by @racket[log-format->format]. If @racket[log-format] is a function, it is used directly to render the log entry.
- 
- If @racket[connection-close?] is @racket[#t], then every connection is closed after one
- request. Otherwise, the client decides based on what HTTP version it uses.
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet-setup.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet-setup.scrbl
deleted file mode 100644
index 384f1770b3..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet-setup.scrbl
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "setup"]{Setting Up Servlets}
-@(require (for-label web-server/servlet/setup
-                     web-server/http
-                     web-server/private/servlet
-                     web-server/managers/manager
-                     web-server/configuration/namespace
-                     racket/serialize
-                     web-server/stuffers/stuffer))
-
-@defmodule[web-server/servlet/setup]{
-
-This module is used internally to build and load servlets. It may be useful to those who are trying to extend the server.
-
-@defproc[(make-v1.servlet [directory path-string?]
-                          [timeout integer?]
-                          [start (request? . -> . can-be-response?)])
-         servlet?]{
- Creates a version 1 servlet that uses @racket[directory] as its current directory, a timeout manager with a @racket[timeout] timeout, and @racket[start] as the request handler.
-}
-
-@defproc[(make-v2.servlet [directory path-string?]
-                          [manager manager?]
-                          [start (request? . -> . can-be-response?)])
-         servlet?]{
- Creates a version 2 servlet that uses @racket[directory] as its current directory, a @racket[manager] as the continuation manager, and @racket[start] as the request handler.
-}
- 
-@defproc[(make-stateless.servlet [directory path-string?]
-                                 [stuffer (stuffer/c serializable? bytes?)]
-                                 [manager manager?]
-                                 [start (request? . -> . can-be-response?)])
-         servlet?]{
- Creates a stateless @racketmodname[web-server] servlet that uses @racket[directory] as its current directory, @racket[stuffer] as its stuffer, and @racket[manager] as the continuation manager, and @racket[start] as the request handler.
-}
-                  
-@defthing[default-module-specs (listof module-path?)]{
- The modules that the Web Server needs to share with all servlets.
-}
-
-@defthing[path->servlet/c contract?]{
-Equivalent to @racket[(path? . -> . servlet?)].
-}
-
-@defproc[(make-default-path->servlet 
-          [#:make-servlet-namespace
-           make-servlet-namespace
-           make-servlet-namespace/c
-           (make-make-servlet-namespace)]
-          [#:timeouts-default-servlet
-           timeouts-default-servlet
-           integer?
-           30])
-         path->servlet/c]{
- Constructs a procedure that loads a servlet from the path in a namespace created with @racket[make-servlet-namespace],
- using a timeout manager with @racket[timeouts-default-servlet] as the default timeout (if no manager is given.)
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet.scrbl
deleted file mode 100644
index 95a8a54289..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/servlet.scrbl
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "servlet"]{Stateful Servlets}
-
-@defmodule[web-server/servlet]
-
-@section[#:style 'hidden #:tag "servlet-example"]{Example}
-
-A stateful servlet should @racket[provide] the following exports:
-
-@(require (for-label web-server/http
-                     (except-in web-server/managers/manager manager)
-                     "dummy-v2-servlet.rkt")) @; to give a binding context
-@declare-exporting[#:use-sources (web-server/scribblings/dummy-v2-servlet)]
-
-@defthing[interface-version (one-of/c 'v2)]{
- This indicates that the servlet is a version two servlet.
-}
-
-@defthing[manager manager?]{
- The @tech{manager} for the continuations of this servlet. See @secref["managers"] for options.
-}
-
-@defproc[(start [initial-request request?])
-         can-be-response?]{
- This function is called when an instance of this servlet is started.
- The argument is the HTTP request that initiated the instance.
-}
-
-An example version 2 module:
-@(require (for-label web-server/managers/none))
-@racketmod[
- racket
- (require web-server/http
-          web-server/managers/none)
- (provide interface-version manager start)
- 
- (define interface-version 'v2)
- (define manager 
-   (create-none-manager
-    (lambda (req)
-      (response/xexpr
-       `(html (head (title "No Continuations Here!"))
-              (body (h1 "No Continuations Here!")))))))
- (define (start req)
-   (response/xexpr
-    `(html (head (title "Hello World!"))
-           (body (h1 "Hi Mom!")))))
- ]
-
-These servlets have an extensive API available to them: @racketmodname[net/url], @racketmodname[web-server/http],
-      @racketmodname[web-server/http/bindings], @racketmodname[web-server/servlet/servlet-structs], @racketmodname[web-server/servlet/web],
-      @racketmodname[web-server/servlet/web-cells], and @racketmodname[web-server/dispatch].
-      Some of these are documented in the subsections that follow.
-
-@include-section["contracts.scrbl"]
-@include-section["web.scrbl"]
-@include-section["web-cells.scrbl"]
-@include-section["managers.scrbl"]
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/soft.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/soft.scrbl
deleted file mode 100644
index c2b3443503..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/soft.scrbl
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt"
-          (for-label web-server/http
-                     web-server/lang/soft
-                     web-server/lang/web))
-
-@title[]{Soft State}
-
-@defmodule[web-server/lang/soft]{
-
-Sometimes you want to reference a large data-structure from a stateless program without the data-structure being serialized 
-and increasing the size of the serialization. This module provides support for this scenario.
-
-@defproc[(soft-state? [v any/c])
-         boolean?]{
- Determines if @racket[v] is a soft state record.
-}
-                  
-@defproc[(make-soft-state [thnk (-> any/c)])
-         soft-state?]{
- Creates a piece of soft state that is computed by @racket[thnk]. This value is serializable.
-}
-
-@defproc[(soft-state-ref [ss soft-state?])
-         any/c]{
- Extracts the value associated with @racket[ss]. If the value is not
- available (perhaps because of garbage collection, deserialization in an
- uninitialized process, etc), then the thunk associated with @racket[ss]
- is invoked and the value is cached.
-}
-
-@defform[(soft-state expr ...)]{
- Equivalent to @racket[(make-soft-state (lambda () expr ...))].
-}
-
-Here's an example servlet that uses soft state:
-@racketmod[
- web-server
- 
- (provide interface-version start) 
- (define interface-version 'stateless)
- 
- (define softie
-   (soft-state
-    (printf "Doing a long computation...\n")
-    (sleep 1)))
- 
- (define (start req)
-   (soft-state-ref softie)
-   (printf "Done\n")
-   (start
-    (send/suspend
-     (lambda (k-url)
-       (response/xexpr
-        `(html (body (a ([href ,k-url]) "Done"))))))))
-]
-
-When this is run and the link is clicked a few times, the output is:
-@verbatim{
-$ plt-web-server -p 8080
-Doing a long computation...
-Done
-Done
-Done
-Done
-}
-
-If the server is restarted or the hostname in the URL is changed to a different host with the same code, and the URL is clicked:
-@verbatim{
-^Cuser break
-$ plt-web-server -p 8080
-Doing a long computation...
-Done
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/stateless-usage.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/stateless-usage.scrbl
deleted file mode 100644
index 7156d944d2..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/stateless-usage.scrbl
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt"
-          (for-label racket/serialize
-                     web-server/lang/stuff-url
-                     web-server/lang/abort-resume
-                     web-server/lang/web))
-
-@title[#:tag "considerations"]{Usage Considerations}
-
-A stateless servlet has the following process performed on it
-automatically:
-@itemize[
- @item{All uses of @racket[letrec] are removed and replaced with
-       equivalent uses of @racket[let] and imperative features.}
- @item{The program is converted into @link["http://en.wikipedia.org/wiki/Administrative_normal_form"]{ANF} (Administrative Normal Form),
-       making all continuations explicit.}
- @item{All continuations and continuations marks are recorded in the
-       continuation marks of the expression
-       they are the continuation of.}
- @item{All calls to external modules are identified and marked.}
- @item{All uses of @racket[call/cc] are removed and replaced with
-       equivalent gathering of the continuations through the continuation marks installed earlier.}
- @item{The program is defunctionalized with a serializable data-structure for each
-       @racket[lambda].}
-]
-
-This process allows the continuations captured by your servlet to be
-serialized.  This means they may be stored on the client's browser or
-the server's disk.
-
-This means your servlet has no cost to the server other than
-execution. This is very attractive if you've used Racket servlets and
-had memory problems.
-
-This means your server can restart in the middle of a long running Web
-interaction without the URLs that have been shared with the client
-expiring.  This is very attractive if you've used Racket servlets and
-had session timeout problems.
-
-This process is defined on all of Racket and occurs after
-macro-expansion, so you are free to use all interesting features of
-Racket.  However, there are some considerations you must make.
-
-First, this process drastically changes the structure of your program.
-It will create an immense number of lambdas and structures your program
-did not normally contain. The performance implication of this has not
-been studied with Racket.
-
-Second, the defunctionalization process is sensitive to the syntactic
-structure of your program. Therefore, if you change your program in a
-trivial way, for example, changing a constant, then all serialized
-continuations will be obsolete and will error when deserialization is
-attempted. This is a feature, not an error! It is a small price to pay
-for protection from the sorts of errors that would occur if your
-program were changed in a meaningful way. If you use the
-@racket[default-stuffer] or @racketmodname[web-server/stuffers/hash],
-then whenever you change your servlet's code, you can safely delete
-all saved continuations, because they won't be used any longer.
-
-Third, the values in the lexical scope of your continuations must be
-serializable for the continuations itself to be serializable. This means
-that you must use @racket[define-serializable-struct] rather than
-@racket[define-struct], and take care to use modules that do the same.
-Similarly, you may not use @racket[parameterize], because
-parameterizations are not serializable.
-
-Fourth, and related, this process only runs on your code, not on the
-code you @racket[require]. Thus, your continuations---to be
-serializable---must not be in the context of another module. For
-example, the following will fail with an @as-index{"unsafe context"}
-exception:
-
-@racketblock[
- (define requests
-   (map (lambda (rg) (send/suspend/url rg))
-        response-generators))
-]
-because @racket[map] is not transformed by the process. However, if you defined
-your own @racket[map] function, there would be no problem. Another solution is to
-store the @racket[map] part of the continuation on the server with @racket[serial->native]
-and @racket[native->serial]:
-@racketblock[
- (define requests
-   (serial->native
-    (map (lambda (rg) (native->serial (send/suspend/url rg)))
-        response-generators)))
-]
-
-Fifth, the store is @bold{not} serialized. If you rely on the store you will
-be taking huge risks. You will be assuming that the serialized continuation
-is invoked on the same server before the server is restarted or
-the memory is garbage collected.
-
-This process is derived from the papers
-@emph{@link["http://www.cs.brown.edu/~sk/Publications/Papers/Published/pcmkf-cont-from-gen-stack-insp/"]{Continuations from Generalized Stack Inspection}} by Pettyjohn et al. in 2005, 
-@emph{@link["http://faculty.cs.byu.edu/~jay/static/icfp065-mccarthy.pdf"]{Automatically RESTful Web Applications, Or Marking Modular Serializable Continuations}} by Jay McCarthy in 2009,
-and
-@emph{@link["http://faculty.cs.byu.edu/~jay/static/oopsla026-mccarthy.pdf"]{The Two-State Solution: Native and Serializable Continuations Accord}} by Jay McCarthy in 2010,
-We thank Greg Pettyjohn for his initial implementation of this algorithm.
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/stuffers.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/stuffers.scrbl
deleted file mode 100644
index 41e8a10354..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/stuffers.scrbl
+++ /dev/null
@@ -1,252 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@(require 
-  (for-label
-   web-server/stuffers/stuffer
-   web-server/stuffers/base64
-   web-server/stuffers/gzip
-   web-server/stuffers/hash
-   web-server/stuffers/serialize
-   web-server/stuffers/store
-   web-server/stuffers/hmac-sha1
-   (only-in web-server/lang/stuff-url
-            default-stuffer
-            make-default-stuffer
-            is-url-too-big?)))
-
-@title[#:tag "stuffers"]{Stuffers}
-
-@defmodule[web-server/stuffers]
-
-The @racketmodname[web-server] language provides serializable continuations. 
-The serialization functionality is abstracted into @deftech{stuffers} that control how it operates.
-You can supply your own (built with these functions) when you write a stateless servlet.
-
-@section{Basic Combinators}
-
-@defmodule[web-server/stuffers/stuffer]{
-
-@defstruct[stuffer ([in (any/c . -> . any/c)]
-                    [out (any/c . -> . any/c)])]{
-
- A @tech{stuffer} is essentially an invertible function captured in this structure.
- The following should hold:
- @racketblock[
-  (out (in x)) = x
-  (in (out x)) = x
- ]
-}
-
-@defproc[(stuffer/c [dom any/c] [rng any/c])
-         contract?]{
- Constructs a contract for a @tech{stuffer} where @racket[in] has
- the contract @racket[(dom . -> . rng)] and @racket[out] has the contract
- @racket[(rng . -> . dom)].
-}
-                   
-@defthing[id-stuffer (stuffer/c any/c any/c)]{
- The identitiy @tech{stuffer}.
-}
-
-@defproc[(stuffer-compose [g (stuffer/c any/c any/c)]
-                          [f (stuffer/c any/c any/c)])
-         (stuffer/c any/c any/c)]{
- Composes @racket[f] and @racket[g], i.e., applies @racket[f] then
- @racket[g] for @racket[in] and @racket[g] then @racket[f] for
- @racket[out].
-}
-
-@defproc[(stuffer-sequence [f (stuffer/c any/c any/c)]
-                           [g (stuffer/c any/c any/c)])
-         (stuffer/c any/c any/c)]{
- @racket[stuffer-compose] with arguments swapped.
-}
-
-@defproc[(stuffer-if [c (bytes? . -> . boolean?)]
-                     [f (stuffer/c bytes? bytes?)])
-         (stuffer/c bytes? bytes?)]{
- Creates a @tech{stuffer} that stuffs with @racket[f] if @racket[c] is
- true on the input to @racket[in]. Similarly, applies @racket[f] during
- @racket[out] if it was applied during @racket[in] (which is recorded by
- prepending a byte.)
-}
-
-@defproc[(stuffer-chain [x (or/c stuffer? (bytes? . -> . boolean?))]
-                        ...)
-         stuffer?]{
- Applies @racket[stuffer-sequence] and @racket[stuffer-if] to successive tails of @racket[x].
-}
-                  
-}
-
-@section{Serialization}
-
-@(require (for-label racket/serialize
-                     web-server/private/util))
-@defmodule[web-server/stuffers/serialize]{
-
-@defthing[serialize-stuffer (stuffer/c serializable? bytes?)]{
- A @tech{stuffer} that uses @racket[serialize] and @racket[write/bytes]
- and @racket[deserialize] and @racket[read/bytes].
-}
-
-}
-
-@section{Base64 Encoding}
-
-@(require (for-label net/base64))
-@defmodule[web-server/stuffers/base64]{
-
-@defthing[base64-stuffer (stuffer/c bytes? bytes?)]{
- A @tech{stuffer} that uses @racket[base64-encode] and @racket[base64-decode].
-   
- Useful for getting URL-safe bytes.
-}
-         
-}
-
-@section{GZip Compression}
-
-@(require (for-label file/gzip file/gunzip web-server/private/gzip))
-@defmodule[web-server/stuffers/gzip]{
-
-@defthing[gzip-stuffer (stuffer/c bytes? bytes?)]{
- A @tech{stuffer} that uses @racket[gzip/bytes] and @racket[gunzip/bytes].
-
- @warning{You should compose this with @racket[base64-stuffer] to get
- URL-safe bytes.}
-}
-
-}
-
-@section{Key/Value Storage}
-
-The @racketmodname[web-server/stuffers/hash] @tech{stuffers} rely on a
-key/value store.
-
-@defmodule[web-server/stuffers/store]{
-
- @defstruct[store ([write (bytes? bytes? . -> . void)]
-                   [read (bytes? . -> . bytes?)])]{
-  The following should hold:
-  @racketblock[
-   (begin (write k v) (read k)) = v
-  ]
- }
-
- @defproc[(dir-store [root path-string?])
-          store?]{
-  A store that stores key @racket[key]'s value in a file located at 
-  @racketblock[
-  (build-path 
-   root
-   (bytes->string/utf-8 key))
-  ]
- }
-
- It should be easy to use this interface to create store for databases like SQLite, CouchDB, or BerkeleyDB.
-}
-
-@section{Hash-addressed Storage}
-
-@(require (for-label file/md5))
-@defmodule[web-server/stuffers/hash]{
-
- @defthing[hash-fun/c contract?]{
-  Equivalent to @racket[(bytes? . -> . bytes?)].
- }
-
- @defproc[(hash-stuffer [H hash-fun/c]
-                        [store store?])
-          (stuffer/c bytes? bytes?)]{
-  A content-addressed storage @tech{stuffer} that stores input bytes,
-  @racket[input], in @racket[store] with the key @racket[(H input)] and
-  returns the key. Similarly, on @racket[out] the original bytes are
-  looked up.
- }
-
- @defproc[(md5-stuffer [root path-string?])
-          (stuffer/c bytes? bytes?)]{
-  Equivalent to @racket[(hash-stuffer md5 (dir-store root))]
- }
-
-}
-
-@section{HMAC-SHA1 Signing}
-
-@defmodule[web-server/stuffers/hmac-sha1]{
-
- @defproc[(HMAC-SHA1 [kb bytes?] [db bytes?])
-          bytes?]{
-  Performs a HMAC-SHA1 calculation on @racket[db] using @racket[kb] as
-  the key. The result is guaranteed to be 20 bytes.  (You could curry
-  this to use it with @racket[hash-stuffer], but there is little value
-  in doing so over @racket[md5].)
- }
-
- @defproc[(HMAC-SHA1-stuffer [kb bytes?])
-          (stuffer/c bytes? bytes?)]{
-  A @tech{stuffer} that signs input using @racket[HMAC-SHA1] with
-  @racket[kb] as the key. The result of the @tech{stuffer} is the hash
-  prepended to the input data. When the @tech{stuffer} is run in
-  reverse, it checks if the first 20 bytes are the correct has for the
-  rest of the data.
-
-  @warning{You should compose this with @racket[base64-stuffer] to get
-  URL-safe bytes.}
-
-  @warning{Without explicit provision, it is possible for users to
-  modify the continuations they are sent through the other
-  @tech{stuffers}.  This @tech{stuffer} allows the servlet to certify
-  that stuffed data was truly generated by the servlet. Therefore, you
-  @bold{should} use this if you are not using the
-  @racket[hash-stuffer]s.}
-
-  @warning{This @tech{stuffer} does @bold{not} encrypt the data in
-  anyway, so users can still observe the stuffed values.}
- }
-
-}
-
-@section{Helpers}
-
-@defmodule[web-server/lang/stuff-url]{
-
-@defproc[(is-url-too-big? [v bytes?])
-         boolean?]{
- Determines if stuffing @racket[v] into the current servlet's URL would
- result in a URL that is too big for Internet Explorer.
- (@link["http://www.boutell.com/newfaq/misc/urllength.html"]{IE only
- supports URLs up to 2048 characters.})
-}
-
-@defproc[(make-default-stuffer [root path-string?])
-         (stuffer/c serializable? bytes?)]{
- Constructs a @tech{stuffer} that serializes, then if the URL is too
- big, compresses (and base64-encodes), if the URL is still too big then
- it stores it in an MD5-indexed database rooted at @racket[root].
-
- Equivalent to:
- @racketblock[
-  (stuffer-chain
-   serialize-stuffer
-   is-url-too-big?
-   (stuffer-chain
-    gzip-stuffer 
-    base64-stuffer)
-   is-url-too-big?
-   (md5-stuffer root))
- ]
-}
-
-@defthing[default-stuffer (stuffer/c serializable? bytes?)]{
- Equivalent to:
- @racketblock[
-  (make-default-stuffer
-   (build-path 
-    (find-system-path 'home-dir)
-    ".urls"))]
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/templates.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/templates.scrbl
deleted file mode 100644
index 8d6020a6b4..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/templates.scrbl
+++ /dev/null
@@ -1,612 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-@(require (for-label web-server/servlet
-                     web-server/templates
-                     racket/include
-                     racket/promise
-                     racket/list
-                     xml))
-
-@(define xexpr @tech[#:doc '(lib "xml/xml.scrbl")]{X-expression})
-@(define at-reader-ref @secref[#:doc '(lib "scribblings/scribble/scribble.scrbl")]{reader})
-@(define text-ref
-   @secref[#:doc '(lib "scribblings/scribble/scribble-pp.scrbl") "text"])
-
-@title[#:tag "templates"]{Templates: Separation of View}
-
-@defmodule[web-server/templates]
-
-The @web-server provides a powerful Web template system for separating
-the presentation logic of a Web application and enabling non-programmers
-to contribute to Racket-based Web applications.
-
-@margin-note{Although all the examples here generate HTML, the template
-  language and the @text-ref it is based on can be used to generate any
-  text-based format: C, SQL, form emails, reports, etc.}
-
-@section{Static}
-
-Suppose we have a file @filepath{static.html} with the contents:
-@verbatim[#:indent 2]|{
- <html>
-  <head><title>Fastest Templates in the West!</title></head>
-  <body>
-   <h1>Bang!</h1>
-   <h2>Bang!</h2>
-  </body>
- </html>
-}|
-
-If we write the following in our code:
-@racketblock[
- (include-template "static.html")
-]
-
-Then the contents of @filepath{static.html} will be read @emph{at compile time} and compiled into a
-racket program that returns the contents of @filepath{static.html} as a string:
-@racketblock[
- "<html>\n  <head><title>Fastest Templates in the West!</title></head>\n  <body>\n    <h1>Bang!</h1>\n    <h2>Bang!</h2>\n  </body>\n</html>"
-]
-
-@section{Dynamic}
-
-@racket[include-template] gives the template access to the @emph{complete lexical context} of the including program. This context can be
-accessed via the @at-reader-ref syntax. For example, if @filepath{simple.html} contains:
-@verbatim[#:indent 2]|{
- <html>
-  <head><title>Fastest @thing in the West!</title></head>
-  <body>
-   <h1>Bang!</h1>
-   <h2>Bang!</h2>
-  </body>
- </html>
-}|
-
-Then
-@racketblock[
- (let ([thing "Templates"])
-   (include-template "simple.html"))
-]
-evaluates to the same content as the static example.
-
-There are no constraints on how the lexical context of the template is populated. For instance, you can built template abstractions
-by wrapping the inclusion of a template in a function:
-@racketblock[
- (define (fast-template thing)
-   (include-template "simple.html"))
- 
- (fast-template "Templates")
- (fast-template "Noodles")
-]
-evalutes to two strings with the predictable contents:
-@verbatim[#:indent 2]|{
- <html>
-  <head><title>Fastest Templates in the West!</title></head>
-  <body>
-   <h1>Bang!</h1>
-   <h2>Bang!</h2>
-  </body>
- </html>
-}|
-
-and
-
-@verbatim[#:indent 2]|{
- <html>
-  <head><title>Fastest Noodles in the West!</title></head>
-  <body>
-   <h1>Bang!</h1>
-   <h2>Bang!</h2>
-  </body>
- </html>
-}|
-
-Furthermore, there are no constraints on the Racket used by templates: they can use macros, structs, continuation marks, threads, etc.
-However, Racket values that are ultimately returned must be printable by the @|text-ref|.
-For example, consider the following outputs of the 
-title line of different calls to @racket[fast-template]:
-
-@itemize[
-
-@item{
-@racketblock[
- (fast-template 'Templates)
-] 
-@verbatim[#:indent 2]|{
-  ...<title>Fastest Templates in the West!</title>...
-}|
-}
-
-@item{
-@racketblock[
- (fast-template 42)
-] 
-@verbatim[#:indent 2]|{
-  ...<title>Fastest 42 in the West!</title>...
-}|
-}
-
-@item{
-@racketblock[
- (fast-template (list "Noo" "dles"))
-] 
-@verbatim[#:indent 2]|{
-  ...<title>Fastest Noodles in the West!</title>...
-}|
-}
-
-@item{
-@racketblock[
- (fast-template (lambda () "Thunks"))
-] 
-@verbatim[#:indent 2]|{
-  ...<title>Fastest Thunks in the West!</title>...
-}|
-}
-
-@item{
-@racketblock[
- (fast-template (delay "Laziness"))
-] 
-@verbatim[#:indent 2]|{
-  ...<title>Fastest Laziness in the West!</title>...
-}|
-}
- 
-@item{
-@racketblock[
- (fast-template (fast-template "Embedding"))
-] 
-@verbatim[#:indent 2]|{
-  ...<title>Fastest ...<title>Fastest Embedding in the West!</title>... in the West!</title>...
-}|
-}
-]
-
-@section{Gotchas}
-
-To obtain an @litchar["@"] character in template output, you must
-escape the it, because it is the escape character of the
-@at-reader-ref syntax.  For example, to obtain:
-@verbatim[#:indent 2]|{
-  <head><title>Fastest @s in the West!</title></head>
-}|
-You must write:
-@verbatim[#:indent 2]|{
-  <head><title>Fastest @"@"s in the West!</title></head>
-}|
-as your template: literal @litchar["@"]s must be replaced with
-@litchar["@\"@\""].  (Note that the double-quotes are basically a Racket
-expression, which can be used for longer strings too.)
-
-The @at-reader-ref will read Racket identifiers, so it does not terminate identifiers on punctuations or XML angle brackets.  So,
-@verbatim[#:indent 2]|{
-  <head><title>Fastest @thing in the @place!</title></head>
-}|
-will complain that the identifier @racket[place!</title></head>] is
-undefined. You can subvert this by explicitly delimiting the
-identifier:
-@verbatim[#:indent 2]|{
-  <head><title>Fastest @thing in the @|place|!</title></head>
-}|
-
-Another gotcha is that since the template is compiled into a Racket
-program, only its results will be printed. For example, suppose we
-have the template:
-@verbatim[#:indent 2]|{
- <table>
-  @for[([c clients])]{
-   <tr><td>@(car c), @(cdr c)</td></tr>
-  }
- </table>
-}|
-
-If this is included in a lexical context with @racket[clients] bound
-to
-@racketblock[(list (cons "Young" "Brigham") (cons "Smith" "Joseph"))]
-then the template will be printed as:
-@verbatim[#:indent 2]|{
- <table>
- </table>
-}|
-because @racket[for] does not return the value of the body.
-Suppose that we change the template to use @racket[for/list] (which combines them into a list):
-@verbatim[#:indent 2]|{
- <table>
-  @for/list[([c clients])]{
-   <tr><td>@(car c), @(cdr c)</td></tr>
-  }
- </table>
-}|
-
-Now the result is:
-@verbatim[#:indent 2]|{
- <table>
-  </tr>
-  </tr>
- </table>
-}|
-because only the final expression of the body of the @racket[for/list]
-is included in the result. We can capture all the sub-expressions by
-using @racket[list] in the body:
-@verbatim[#:indent 2]|{
- <table>
-  @for/list[([c clients])]{
-   @list{
-    <tr><td>@(car c), @(cdr c)</td></tr>
-   }
-  }
- </table>
-}|
-Now the result is:
-@verbatim[#:indent 2]|{
- <table>
-  <tr><td>Young, Brigham</td></tr>
-  <tr><td>Smith, Joseph</td></tr>
- </table>
-}|
-
-The templating library provides a syntactic form to deal with this
-issue for you called @racket[in]:
-@verbatim[#:indent 2]|{
- <table>
-  @in[c clients]{
-   <tr><td>@(car c), @(cdr c)</td></tr>
-  }
- </table>
-}|
-Notice how it also avoids the absurd amount of punctuation on line two.
-
-@section{Escaping}
-
-@margin-note{Thanks to Michael W. for this section.}
-
-Because templates are useful for many things (scripts, CSS, HTML,
-etc), the Web Server does not assume that the template is for XML-like
-content. Therefore when when templates are expanded, no
-XML escaping is done by default. Beware of @emph{cross-site scripting}
-vulnerabilities! For example, suppose a servlet serves the following
-template where @racket[_some-variable] is an input string supplied by
-the client:
-
-@verbatim[#:indent 2]|{
- <html>
-  <head><title>Fastest Templates in the West!</title></head>
-  <body>
-   @some-variable
-  </body>
- </html>
-}|
-
-If the servlet contains something like the following:
-
-@racketblock[
- (let ([some-variable (get-input-from-user)])
-  (include-template "static.htm"))
-]
-
-There is nothing to prevent an attacker from entering
-@litchar["<script type=\"text/javascript\">...</script>"] to make the
-template expand into:
-
-@verbatim[#:indent 2]|{
- <html>
-  <head><title>Fastest Templates in the West!</title></head>
-  <body>
-   <script type="text/javascript">...</script>
-  </body>
- </html>
-}|
-
-Now the server will send the attacker's code to millions of innocent
-users. To keep this from happening when serving HTML, use the
-@racket[xexpr->string] function from the @racketmodname[xml] module.
-
-This can be done in the servlet:
-
-@racketblock[
- (require xml)
-
- (let ([some-variable (xexpr->string (get-input-from-user))])
-  (include-template "static.htm"))
-]
-
-Alternatively, make the template responsible for its own escaping:
-
-@verbatim[#:indent 2]|{
- <html>
-  <head><title>Fastest Templates in the West!</title></head>
-  <body>
-   @(xexpr->string some-variable)
-  </body>
- </html>
-}|
-
-The improved version renders as:
-
-@verbatim[#:indent 2]|{
- <html>
-  <head><title>Fastest Templates in the West!</title></head>
-  <body>
-    &lt;script type=\"text/javascript\"&gt;...&lt;/script&gt;
-  </body>
- </html>
-}|
-
-When writing templates, always remember to escape user-supplied input.
-
-@section{HTTP Responses}
-
-The quickest way to generate an HTTP response from a template is using
-a @racket[response?] struct:
-@racketblock[
- (response/full
-  200 #"Okay"
-  (current-seconds) TEXT/HTML-MIME-TYPE
-  empty
-  (list (string->bytes/utf-8 (include-template "static.html"))))
-]
-
-Finally, if you want to include the contents of a template inside a larger @xexpr :
-@racketblock[
- `(html ,(include-template "static.html"))
-]
-will result in the literal string being included (and entity-escaped). If you actually want
-the template to be unescaped, then create a @racket[cdata] structure:
-@racketblock[
- `(html ,(make-cdata #f #f (include-template "static.html")))
-]
-
-@section{API Details}
-
-@defform*[((include-template path-spec)
-           (include-template #:command-char command-char path-spec))]{
- Compiles the template at @racket[path-spec] using the @at-reader-ref syntax within the enclosing lexical context. The @racket[path-spec] is the same format used by @racket[include]. Use the @racket[command-char] keyword to customize the escape character.
-
- Examples:
- @racketblock[
-  (include-template "static.html")
-  (include-template #:command-char #\$ "dollar-static.html")
- ]
-}
-
-@defform[(in x xs e ...)]{
- Expands into
- @racketblock[
-  (for/list ([x xs])
-    (begin/text e ...))
- ]
-
- Template Example:
- @verbatim[#:indent 2]|{
-  @in[c clients]{
-   <tr><td>@(car c), @(cdr c)</td></tr>
-  }
- }|
-
- Racket Example:
- @racketblock[
-  (in c clients "<tr><td>" (car c) ", " (cdr c) "</td></tr>")
- ]
-}
-         
-@section{Conversion Example}
-
-Al Church has been maintaining a blog with Racket for some years and would like to convert to @racketmodname[web-server/templates].
-
-The data-structures he uses are defined as:
-@racketblock[
-(define-struct post (title body))
-
-(define posts
-  (list 
-   (make-post
-    "(Y Y) Works: The Why of Y"
-    "Why is Y, that is the question.")
-   (make-post
-    "Church and the States"
-    "As you may know, I grew up in DC, not technically a state.")))
-]
-Actually, Al Church-encodes these posts, but for explanatory reasons, we'll use structs.
-
-He has divided his code into presentation functions and logic functions. We'll look at the presentation functions first.
-
-The first presentation function defines the common layout of all pages.
-@racketblock[
-(define (template section body)
-  (response/xexpr
-   `(html
-     (head (title "Al's Church: " ,section))
-     (body
-      (h1 "Al's Church: " ,section)
-      (div ([id "main"])
-           ,@body)))))
-]
-
-One of the things to notice here is the @racket[unquote-splicing] on the @racket[body] argument.
-This indicates that the @racket[body] is list of @|xexpr|s. If he had accidentally used only @racket[unquote]
-then there would be an error in converting the return value to an HTTP response.
-
-@racketblock[
-(define (blog-posted title body k-url)
-  `((h2 ,title)
-    (p ,body)
-    (h1 (a ([href ,k-url]) "Continue"))))
-]
-
-Here's an example of simple body that uses a list of @|xexpr|s to show the newly posted blog entry, before continuing to redisplay
-the main page. Let's look at a more complicated body:
-
-@racketblock[
-(define (blog-posts k-url)
-  (append
-   (apply append 
-          (for/list ([p posts])
-            `((h2 ,(post-title p))
-              (p ,(post-body p)))))
-   `((h1 "New Post")
-     (form ([action ,k-url])
-           (input ([name "title"]))
-           (input ([name "body"]))
-           (input ([type "submit"]))))))
-]
-
-This function shows a number of common patterns that are required by @|xexpr|s. First, @racket[append] is used to combine
-different @|xexpr| lists. Second, @racket[apply append] is used to collapse and combine the results of a @racket[for/list] 
-where each iteration results in a list of @|xexpr|s. We'll see that these patterns are unnecessary with templates. Another
-annoying patterns shows up when Al tries to add CSS styling and some JavaScript from Google Analytics to all the pages of
-his blog. He changes the @racket[template] function to:
-
-@racketblock[
-(define (template section body)
-  (response/xexpr
-   `(html
-     (head 
-      (title "Al's Church: " ,section)
-      (style ([type "text/css"])                 
-             "body {margin: 0px; padding: 10px;}"
-             "#main {background: #dddddd;}"))
-     (body
-      (script 
-       ([type "text/javascript"])             
-       ,(make-cdata 
-         #f #f
-         "var gaJsHost = ((\"https:\" =="
-         "document.location.protocol)"
-         "? \"https://ssl.\" : \"http://www.\");"
-         "document.write(unescape(\"%3Cscript src='\" + gaJsHost"
-         "+ \"google-analytics.com/ga.js' "
-         "type='text/javascript'%3E%3C/script%3E\"));"))
-      (script
-       ([type "text/javascript"])
-       ,(make-cdata 
-         #f #f
-         "var pageTracker = _gat._getTracker(\"UA-YYYYYYY-Y\");"
-         "pageTracker._trackPageview();"))     
-      (h1 "Al's Church: " ,section)
-      (div ([id "main"])
-           ,@body)))))
-]
-
-@margin-note{Some of these problems go away by using here strings, as described in the documentation on
-                  @secref[#:doc '(lib "scribblings/reference/reference.scrbl")]{parse-string}.}
-
-The first thing we notice is that encoding CSS as a string is rather primitive. Encoding JavaScript with strings is even worse for two
-reasons: first, we are more likely to need to manually escape characters such as @"\""; second, we need to use a CDATA object, because most
-JavaScript code uses characters that "need" to be escaped in XML, such as &, but most browsers will fail if these characters are
-entity-encoded. These are all problems that go away with templates.
-
-
-Before moving to templates, let's look at the logic functions:
-@racketblock[
-(define (extract-post req)
-  (define binds
-    (request-bindings req))
-  (define title 
-    (extract-binding/single 'title binds))
-  (define body
-    (extract-binding/single 'body binds))
-  (set! posts
-        (list* (make-post title body)
-               posts))
-  (send/suspend
-   (lambda (k-url)
-     (template "Posted" (blog-posted title body k-url))))
-  (display-posts))
-
-(define (display-posts)
-  (extract-post
-   (send/suspend
-    (lambda (k-url)
-      (template "Posts" (blog-posts k-url))))))
-
-(define (start req)
-  (display-posts))
-]
-
-To use templates, we need only change @racket[template], @racket[blog-posted], and @racket[blog-posts]:
-
-@racketblock[
-(define (template section body)
-  (response/full
-   200 #"Okay"
-   (current-seconds) TEXT/HTML-MIME-TYPE
-   empty
-   (list (string->bytes/utf-8 (include-template "blog.html")))))
-
-(define (blog-posted title body k-url)
-  (include-template "blog-posted.html"))
-
-(define (blog-posts k-url)
-  (include-template "blog-posts.html"))
-]
-
-Each of the templates are given below:
-
-@filepath{blog.html}:
-@verbatim[#:indent 2]|{
-<html>
- <head>
-  <title>Al's Church: @|section|</title>
-  <style type="text/css">
-   body {
-    margin: 0px;
-    padding: 10px;
-   }
-
-   #main {
-    background: #dddddd;
-   }
-  </style>
- </head>
- <body>
-  <script type="text/javascript">
-   var gaJsHost = (("https:" == document.location.protocol) ?
-     "https://ssl." : "http://www.");
-   document.write(unescape("%3Cscript src='" + gaJsHost +
-     "google-analytics.com/ga.js' 
-      type='text/javascript'%3E%3C/script%3E"));
-  </script>
-  <script type="text/javascript">
-   var pageTracker = _gat._getTracker("UA-YYYYYYY-Y");
-   pageTracker._trackPageview();
-  </script>
-
-  <h1>Al's Church: @|section|</h1>
-  <div id="main">
-    @body
-  </div>
- </body>
-</html>
-}|
-
-Notice that this part of the presentation is much simpler, because the CSS and JavaScript
-can be included verbatim, without resorting to any special escape-escaping patterns.
-Similarly, since the @racket[body] is represented as a string, there is no need to
-remember if splicing is necessary.
-
-@filepath{blog-posted.html}:
-@verbatim[#:indent 2]|{
-<h2>@|title|</h2>
-<p>@|body|</p>
-
-<h1><a href="@|k-url|">Continue</a></h1>
-}|
-
-@filepath{blog-posts.html}:
-@verbatim[#:indent 2]|{
-@in[p posts]{
- <h2>@(post-title p)</h2>
- <p>@(post-body p)</p>
-}
-
-<h1>New Post</h1>
-<form action="@|k-url|">
- <input name="title" />
- <input name="body" />
- <input type="submit" />
-</form>
-}|
-
-Compare this template with the original presentation function: there is no need to worry about managing how lists
-are nested: the defaults @emph{just work}.
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/test.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/test.scrbl
deleted file mode 100644
index 0652335634..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/test.scrbl
+++ /dev/null
@@ -1,109 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt"
-          (for-label web-server/http/request-structs
-                     web-server/dispatchers/dispatch
-                     web-server/servlet/servlet-structs
-                     web-server/servlet-dispatch
-                     xml
-                     web-server/test
-                     net/url
-                     racket/promise
-                     racket/match))
-
-@title[#:tag "test"]{Testing Servlets}
-
-@defmodule[web-server/test]
-
-The @web-server provides a simple facility for writing tests for Web
-servlets and dispatchers.
-
-The core functionality allows a request to be sent to the servlet and the response captured:
-
-@defthing[tester/c contract?]{
-
-This contract is equivalent to 
-@racketblock[
-(->* ()
-       ((or/c string? url? request? false/c)
-        (listof binding?)
-        #:raw? boolean?
-        #:headers? boolean?)
-       (or/c bytes?
-             xexpr?
-             (cons/c bytes?
-                     (or/c bytes?
-                           xexpr?))))             
-]                              
-
-It represents a function that accepts a request and returns the answer the servlet for that request. This interaction function has many possible calling patterns:
-@itemize[
- @item{No arguments: a call to the root URL path with no bindings.}
- @item{At least one argument: this may be a string, URL, or a request data structure.}
- @item{Two arguments: the first argument must be a string or a URL, but the second argument can specify the request bindings.}
- @item{The optional @racket[#:raw?] keyword controls whether an X-expression or a byte string is returned as a result.}
- @item{The optional @racket[#:headers?] keyword controls whether the headers are included in the return value as a byte string. When this is used, the two returns are returned in a cons.}
-]
-
-}
-
-@defproc[(make-servlet-tester
-          [servlet 
-           (-> request?
-               can-be-response?)])
-         tester/c]{
- 
-
-This function accepts a servlet function and provides a tester
-function as described above. It is equivalent to
-@racket[(make-dispatcher-tester (dispatch/servlet servlet))], so if
-you need custom arguments to @racket[dispatch/servlet], use
-@racket[make-dispatcher-tester].
-
-}
-
-@defproc[(make-dispatcher-tester
-          [d dispatcher/c])
-         tester/c]{
-
-This function accepts a dispatcher and provides a tester function as described above. 
-}
-
-This facility is designed to be used in concert with a technique of
-extracting continuation URLs and relevant values;
-@racketmodname[xml/path] is one way to do this. Here is an extended
-example that tests an Add-Two-Numbers.com:
-@(require (for-label xml/path
-                     rackunit
-                     racket/list
-                     racket/promise))
-@racketblock[
-(define (test-add-two-numbers -s>)
-  (define x (random 500))
-  (define xs (string->bytes/utf-8 (number->string x)))
-  (define y (random 500))
-  (define ys (string->bytes/utf-8 (number->string y)))
-  
-  (define r0 (-s>))
-  (define k0 (se-path* '(form #:action) r0))
-  (define i0 (se-path* '(form input #:name) r0))
-  (define r1 
-    (-s> (format "~a?~a=~a" k0 i0 xs)
-         (list (make-binding:form (string->bytes/utf-8 i0) xs))))
-  (define k1 (se-path* '(form #:action) r1))
-  (define i1 (se-path* '(form input #:name) r1))
-  (define r2 
-    (-s> (format "~a?~a=~a" k1 i1 ys)
-         (list (make-binding:form (string->bytes/utf-8 i1) ys))))
-  (define n (se-path* '(p) r2))
-  (check-equal? n
-                (format "The answer is ~a" (+ x y))))
-
-(require
- (prefix-in ex:add1: web-server/default-web-root/htdocs/servlets/examples/add)
- (prefix-in ex:add2: web-server/default-web-root/htdocs/servlets/examples/add-v2))
-
-(test-add-two-numbers 
- (make-servlet-tester ex:add1:start))
-(test-add-two-numbers 
- (make-servlet-tester ex:add2:start))
-]
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/timer.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/timer.scrbl
deleted file mode 100644
index c2a05eddae..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/timer.scrbl
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "timer"]{Timers}
-@(require (for-label web-server/private/timer))
-
-@defmodule[web-server/private/timer]{
-
-This module provides a functionality for running
-procedures after a given amount of time, that may be extended.
-
-@defproc[(timer-manager? [x any/c]) boolean?]{
- Determines if @racket[x] is a timer manager.
-}
-
-@defstruct[timer ([tm timer-manager?]
-                  [evt evt?]
-                  [expire-seconds number?]
-                  [action (-> void)])]{
- @racket[evt] is an @racket[alarm-evt] that is ready at @racket[expire-seconds].
- @racket[action] should be called when this @racket[evt] is ready.
-}
-
-@defproc[(start-timer-manager)
-         timer-manager?]{
- Handles the execution and management of timers.
-}
-
-@defproc[(start-timer [tm timer-manager?]
-                      [s number?]
-                      [action (-> void)])
-         timer?]{
- Registers a timer that runs @racket[action] after @racket[s] seconds.
-}
-
-@defproc[(reset-timer! [t timer?]
-                       [s number?])
-         void]{
- Changes @racket[t] so that it will fire after @racket[s] seconds.
-}
-
-@defproc[(increment-timer! [t timer?]
-                           [s number?])
-         void]{
- Changes @racket[t] so that it will fire after @racket[s] seconds from when
- it does now.
-}
-
-@defproc[(cancel-timer! [t timer?])
-         void]{
- Cancels the firing of @racket[t] ever and frees resources used by @racket[t].
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/continue.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/continue.scrbl
deleted file mode 100644
index 2c3f757b7e..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/continue.scrbl
+++ /dev/null
@@ -1,1442 +0,0 @@
-#lang scribble/doc
-@(require scribble/manual
-          (for-label racket
-                     (except-in web-server/servlet make-url)
-                     db)
-          "tutorial-util.rkt")
-
-@(define xexpr @tech[#:doc '(lib "xml/xml.scrbl")]{X-expression})
-
-@title{Continue: Web Applications in Racket}
-
-@author[(author+email "Danny Yoo" "dyoo@hashcollision.org")
-        (author+email "Jay McCarthy" "jay@cs.byu.edu")]
-
-How do we make dynamic web applications?
-In this tutorial, we show how to use Racket to achieve this goal.
-We explain how to start up a web server, how to generate dynamic web content,
-and how to interact with the user. Our working example will be a simple
-web journal---a ``blog.''
-
-This tutorial is intended for students who have read enough of
-@italic{@link["http://www.htdp.org/"]{How to Design Programs}} to know how to
-use structures, higher-order functions, the @racket[local] syntax, and a little
-bit of mutation.
-
-@section{Getting Started}
-
-Everything you need in this tutorial is provided in
-@link["http://racket-lang.org/"]{Racket}; we will be using the DrRacket module
-language.
-
-Enter the following into DrRacket's Definitions window, then press the
-@onscreen{Run} button.
-
-@racketmod[
-web-server/insta
-(define (start request)
-  (response/xexpr
-   '(html
-     (head (title "My Blog"))
-     (body (h1 "Under construction")))))
-]
-
-If a web browser comes up with an ``Under Construction'' page, then clap your
-hands with delight, because you've built your first web application!  We
-haven't yet gotten it to do much, but we'll get there.  For now,
-press the @onscreen{Stop} button to shut the server down.
-
-@section{The Application}
-
-We want to motivate this tutorial by showing you how to develop a blog.
-Users of the blog should be able to create new posts and add comments to
-existing posts. We'll approach the task iteratively, pointing out one or two
-pitfalls along the way. The game plan will be approximately as follows:
-
-@itemize[
-         @item{Show a static list of posts.}
-         @item{Allow a user to add new posts to the system.}
-         @item{Extend the model to let a user add comments to a post.}
-         @item{Allow all users to share the same set of posts.}
-         @item{Serialize our data structures to disk.}
-         ]
-
-By the end of the tutorial, we'll have a simple blogging application up and
-running.
-
-@section{Basic Blog}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-1)]
-
-We begin by defining the necessary data structures. A post is:
-
-@racketblock[(struct post (title body))]
-
-@(defstruct* post ([title string?] [body string?]))
-
-@bold{Exercise.} Make a few examples of posts.
-
-Next we define a blog to be simply a list of posts:
-
-@(defthing blog (listof post?))
-
-Here, then, is a very simple example of a blog:
-
-@racketblock[
-(define BLOG (list (post "First Post!"
-                         "Hey, this is my first post!")))
-]
-
-Now let's get our web application to show it.
-
-@section{Rendering HTML}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-1)]
-
-When a web browser visits our blog's URL, the browser constructs a request
-structure and sends it across the network to our application.  We need a
-function, which we'll call @racket[start], to consume such requests and produce
-responses to them. One basic kind of response is to show an HTML page; this is
-done by the function @racket[response/xexpr], which takes an @xexpr
-representing the desired HTML. An @xexpr is defined as
-
-@; Very unsure of this change.  A brief look through the xml and web-server
-@; code did not turn up a flat-rec-contract definition of xexpr/c.
-@; -AWest, 18-Dec-2011.
-@racketblock[
- (define xexpr/c
-   (flat-rec-contract
-    xexpr
-    (or/c string?
-          (cons/c symbol? (listof xexpr))
-          (cons/c symbol?
-                  (cons/c (listof (list/c symbol? string?))
-                          (listof xexpr))))))]
-
-and the following examples illustrate how natural it is to use @|xexpr|s
-to represent HTML.
-
-The first alternative in @racket[xexpr/c] is @racket[string?]. For example,
-the HTML @tt{hello} is represented as @racket["hello"]. To guarantee valid 
-HTML, strings are automatically escaped when output. Thus, the @xexpr
-@racket["<b>Unfinished tag"] is rendered as the HTML @tt{&lt;b&gt;Unfinished
-tag}, and not as @tt{<b>Unfinished tag}.  Similarly, @racket["<i>Finished
-tag</i>"] is rendered as @tt{&lt;i&gt;Finished tag&lt;/i&gt;}, and not as
-@tt{<i>Finished tag</i>}.
-
-The second alternative in @racket[xexpr/c] is the recursive contract
-@racket[(cons/c symbol? (listof xexpr))].  For example, the HTML @tt{<p>This is
-an example</p>} is represented by the @xexpr
-
-@racket['(p "This is an example")].
-
-And finally, the third alternative in @racket[xexpr/c] allows for parameters in
-HTML tags.  As examples, @tt{<a href="link.html">Past</a>} is represented by
-
-@racket['(a ((href "link.html")) "Past")]
-
-and @tt{<p>This is <div class="emph">another</div> example.</p>} is represented by
-
-@racket['(p "This is " (div ((class "emph")) "another") " example.")].
-
-We could also have produced these @|xexpr|s ``manually,'' using
-@racket[cons] and @racket[list], but that can get notationally heavy.  For 
-example, the following Racket expressions both evaluate to the same
-@|xexpr|:
-
-@racketblock[
-  (list 'html (list 'head (list 'title "Some title"))
-         (list 'body (list 'p "This is a simple static page.")))
-]
-
-@racketblock[] @; an ugly hack to insert some vertical space -AWest,
-@; 18-Dec-2011
-
-
-@racketblock[
-  '(html (head (title "Some title"))
-         (body (p "This is a simple static page.")))
-]
-
-But the latter is much easier to read and type, because it uses a leading
-forward quote mark to express the list structure concisely. This is
-how to construct static html responses with aplomb! (For more on
-the extended list abbreviation form, see
-@link["http://htdp.org/2003-09-26/Book/curriculum-Z-H-17.html#node_chap_13"]{Section
-13} of @link["http://htdp.org/"]{How to Design Programs}.)
-
-It turns out, however, that this simple kind of list abbreviation cannot
-produce web content that is dynamic. For if we try to inject expressions into
-an @|xexpr| constructed by simple list abbreviation, those expressions will be
-treated as part of the list structure, literally! What we need instead is a
-notation that gives us the convenience of quoted list abbreviations, but that
-also allows us to treat portions of the list structure as normal
-expressions.  That is, we would like to define a @emph{template} whose
-placeholders can be expressed easily and filled in dynamically.
-
-Racket provides this templating functionality, in the form of a notation called
-quasiquote. In quasiquotation a list is abbreviated not with a leading forward
-quote but with a leading back quote. If we wish any subexpression of this
-backquoted list to be evaluated normally (``unquoted''), then all we 
-have to do is place a comma in front that subexpression. For example:
-
-@racketblock[
-@code:comment{render-greeting: string -> response}
-@code:comment{Consumes a name, and produces a dynamic response.}
-(define (render-greeting a-name)
-  (response/xexpr
-   `(html (head (title "Welcome"))
-          (body (p ,(string-append "Hello " a-name))))))
-]
-
-@; Suggestion: insert here a reference to the Guide's discussion of
-@; quasiquotation, akin to the reference to HtDP a couple of paragraphs
-@; above. -AWest, 18-Dec-2011
-@bold{Exercise.} Write a function that consumes a @racket[post] and produces
-an @xexpr representing that content.
-
-@defthing[render-post (post? . -> . xexpr/c)]
-
-As an example, we want:
-
-@racketblock[
-    (render-post (post "First post!" "This is a first post."))
-]
-
-to produce:
-
-@racketblock[
-   '(div ((class "post")) "First post!" (p "This is a first post."))
-]
-
-@centerline{------------}
-
-We will sometimes want to embed a list of @|xexpr|s into
-another list that acts as a template.  For example, given the list of
-@|xexpr|s @racket['((li "Larry") (li "Curly") (li "Moe"))], we may want
-to create the single @|xexpr|
-
-@racketblock[
-'(ul (li "Larry")
-     (li "Curly")
-     (li "Moe"))
-]
-
-This can't be done using plain unquoting, because placing a comma in
-front of @racket['((li "Larry") (li "Curly") (li "Moe"))] will unquote
-the entire list, yielding the malformed expression
-@racket['(ul ((li "Larry") (li "Curly") (li
-"Moe")))].
-
-Instead, we must splice the list in, like so: @racket[`(ul
-,@'((li "Larry") (li "Curly") (li "Moe")))]. The
-@racket[unquote-splicing] form, @racket[,@expression], allows us
-conveniently to splice a list of @|xexpr| fragments into a larger
-template list. To generalize the example, here are two helper
-functions that convert any list of @|xexpr|s into one @|xexpr|
-representing an unordered, itemized HTML list:
-
-@racketblock[
-@code:comment{render-as-itemized-list: (listof xexpr) -> xexpr}
-@code:comment{Consumes a list of items, and produces a rendering}
-@code:comment{as an unordered list.}
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-@code:comment{render-as-item: xexpr -> xexpr}
-@code:comment{Consumes an xexpr, and produces a rendering}
-@code:comment{as a list item.}
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
-]
-
-@bold{Exercise.} Write a function @racket[render-posts] that consumes a @racket[(listof post?)]
-and produces an @|xexpr| for that content.
-
-@defthing[render-posts ((listof post?) . -> . xexpr/c)]
-
-As examples,
-
-@racketblock[
-(render-posts empty)
-]
-
-should produce
-
-@racketblock[
-'(div ((class "posts")))
-]
-
-and
-
-@racketblock[
-(render-posts (list (post "Post 1" "Body 1")
-                    (post "Post 2" "Body 2")))
-]
-
-should produce
-
-@racketblock[
-'(div ((class "posts"))
-      (div ((class "post")) "Post 1" (p "Body 1"))
-      (div ((class "post")) "Post 2" (p "Body 2")))
-]
-
-@centerline{------------}
-
-Now that we have the @racket[render-posts] function handy, let's revisit our
-web application and change our @racket[start] function to return an interesting
-@racket[response].
-
-@external-file["iteration-1.rkt"]
-
-If we press Run, we should see the blog posts in our web browser.
-
-@section{Inspecting Requests}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-2
-                                  web-server/servlet)]
-
-Our application is still a bit too static: we build the 
-page dynamically, but we don't yet provide a way for the user
-to create new posts.  Let's tackle that now, by providing a form that
-lets the user add a new blog entry.  When the user presses the
-submit button, we want the new post to appear at the top of the
-page.
-
-We haven't yet done anything with the @racket[request] object that
-we've been passing around.  As you may already have guessed, it isn't
-really supposed to be ignored so much!
-When a user fills out a web form and submits it, the user's browser constructs
-a new @racket[request] that contains the form's 
-values, which we can extract on our end, using the function
-@racket[request-bindings]:
-
-@defthing[request-bindings (request? . -> . bindings?)]
-
-To extract a single web form value from a set of bindings, Racket provides
-the function @racket[extract-binding/single], which also takes the name
-of the corresponding field of the web form:
-
-@defthing[extract-binding/single (symbol? bindings? . -> . string?)]
-
-To verify that a set of bindings contains a particular field, use
-@racket[exists-binding?]:
-
-@defthing[exists-binding? (symbol? bindings? . -> . boolean?)]
-
-With these functions, we can design functions that consume @racket[request]s
-and respond to them usefully.
-
-@bold{Exercise.} Write a function @racket[can-parse-post?] that consumes a set
-of bindings.
-It should produce @racket[#t] if there exist bindings both for the symbols
-@racket['title] and @racket['body], and @racket[#f] otherwise.
-
-@defthing[can-parse-post? (bindings? . -> . boolean?)]
-
-@bold{Exercise.} Write a function @racket[parse-post] that consumes a set of
-bindings.
-Assuming that the bindings structure has values for the symbols @racket['title]
-and @racket['body], @racket[parse-post] should produce a post containing those
-values.
-
-@defthing[parse-post (bindings? . -> . post?)]
-
-Now that we have these helper functions, we can extend our web
-application to handle form input.  We'll add a small form at the
-bottom of the web page, and we'll adjust our program to handle the addition of new posts. 
-So our new @racket[start] method will check that the @racket[request] has a 
-parsable post, will then try to extend the set of posts, and will finally display the new set of blog posts:
-
-@external-file["iteration-2.rkt"]
-
-This solution seems to work, but it has a flaw!  Try to add
-two new posts.  What happens?
-
-@section{Advanced Control Flow}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-3)]
-
-For the moment, let's ignore the admittedly huge problem of having a
-blog that accepts only one new blog entry.  Don't worry, we'll fix
-this!
-
-The more pressing problem right now is a higher-level one: although we
-do 
-have a function, @racket[start], that responds to @racket[request]s directed
-at our application's URL, that function has begun to take on 
-too much responsibility.  In particular, @racket[start] now handles
-two different kinds of @racket[request]s: those for showing a
-blog, and those for adding new blog posts. It has become a kind of traffic cop
---- a dispatcher --- for all of our web application's behaviors, including any
-new functionality we may want to add later. Life would be easier for
-@racket[start] 
-(and for us) if different kinds of @racket[request]s were instead
-directed automatically to different functions. Is this possible in Racket?
-
-Yes! The web server library provides a function,
-@racket[send/suspend/dispatch], that allows us to create URLs that direct
-@racket[request]s aimed at them to specific functions in our application.  We
-demonstrate with a dizzying example. In a new file, enter the following in
-DrRacket's Definitions window.
-
-@racketmod[
-web-server/insta
-@code:comment{start: request -> response}
-(define (start request)
-  (phase-1 request))
-
-@code:comment{phase-1: request -> response}
-(define (phase-1 request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html 
-               (body (h1 "Phase 1")
-                     (a ((href ,(embed/url phase-2)))
-                        "click me!")))))]
-    (send/suspend/dispatch response-generator)))
-
-@code:comment{phase-2: request -> response}
-(define (phase-2 request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html 
-               (body (h1 "Phase 2")
-                     (a ((href ,(embed/url phase-1)))
-                        "click me!")))))]    
-    (send/suspend/dispatch response-generator)))
-]
-
-This is a web application that goes round and round.  When a user
-first visits the application, the user starts off in @racket[phase-1].  The
-generated page has a hyperlink that, when clicked, continues to
-@racket[phase-2].  The user can click back, and falls back to @racket[phase-1], and the
-cycle repeats.
-
-Let's look more closely at the @racket[send/suspend/dispatch] mechanism.
-@racket[send/suspend/dispatch] consumes a response-generating function and
-gives it another function, called @racket[embed/url], that we'll
-use to build special URLs.  What makes these URLs special is this:
-when a web browser visits one of them, our web application restarts,
-not from @racket[start], but from the handler that we associate with the
-URL. In the handler @racket[phase-1], the use of @racket[embed/url] associates
-the link with the handler @racket[phase-2], and vice versa.
-
-We can be even more sophisticated about the handlers associated with
-@racket[embed/url].  Because a handler is just a request-consuming function,
-it can be defined within a @racket[local] and so can see
-all the other variables in the scope of its definition.  Here's another loopy example:
-
-@racketmod[
-web-server/insta
-@code:comment{start: request -> response}
-(define (start request)
-  (show-counter 0 request))
-
-@code:comment{show-counter: number request -> doesn't return}
-@code:comment{Displays a number that's hyperlinked: when the link is pressed,}
-@code:comment{returns a new page with the incremented number.}
-(define (show-counter n request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Counting example"))
-                    (body
-                     (a ((href ,(embed/url next-number-handler)))
-                        ,(number->string n))))))
-
-          (define (next-number-handler request)
-            (show-counter (+ n 1) request))]
-
-    (send/suspend/dispatch response-generator)))
-]
-
-This example shows that we can accumulate the results of an
-interaction.  Even though the user starts off by visiting and seeing
-zero, the handlers produced by @racket[next-number-handler] continue the interaction, accumulating a larger and larger number.
-
-We're going in circles now, so let's move forward and return to our blog
-application.  We'll adjust the form's action so that it directs a submission
-@racket[request] to a URL associated with a separate handler, called
-@racket[insert-post-handler].
-
-@external-file["iteration-3.rkt"]
-
-Note that the structure of the @racket[render-blog-page] function is very
-similar to that of our last @racket[show-counter] example.  The user can 
-finally add and see multiple posts to the blog.
-
-Unfortunately, our design still suffers from a problem, which can be seen by
-adding a few posts to the system, and then visiting the web application's URL
-in a new browser window.  What happens when you try this?
-
-@section{Share and Share Alike}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-4)]
-
-The problem with our application is that each browser window keeps
-track of its own distinct blog.  For most people, this defeats the
-purpose of a blog, which is to share with others!  When we insert a
-new post, rather than creating a new blog value, we'd like to modify
-@emph{the} blog. In other words, we'd like to make a structural
-change. (@italic{@link["http://www.htdp.org/"]{How to Design
-Programs}}, Chapter 41).  So let's switch from just the @racket[BLOG]
-binding to a list and instead bind it to a mutable structure. If we
-were to just use a structure, we'd write the following:
-
-@racketblock[(struct blog (posts))]
-
-But, by default, structures in Racket are immutable.  To gain access
-to structure mutators, we'll need to override this default, by adding
-the @racket[#:mutable] keyword to some of our structure
-definitions. In particular, if we want to allow changes to a blog, we
-must change our definition of the blog structure to the following:
-
-@racketblock[(struct blog (posts) #:mutable)]
-
-@defstruct*[blog ([posts (listof post?)])]
-
-A mutable structure provides functions that change its fields; in this case, we
-are provided the structure mutator @racket[set-blog-posts!],
-which allows us to change the posts of a blog:
-
-@defthing[set-blog-posts! (blog? (listof post?) . -> . void)]
-
-
-
-@bold{Exercise.} Write a function @racket[blog-insert-post!]
-
-@defthing[blog-insert-post! (blog? post? . -> . void)]
-
-whose intended side effect is to extend a blog's posts.
-
-@centerline{------------}
-
-We must now modify the web application to use our new data representation of a
-blog. Since the blog is now referred to by the global variable
-@racket[BLOG], it no longer needs to be passed as a parameter to handlers like
-@racket[render-blog-page].  Here is our updated web application, after
-adjustments that incorporate @racket[insert-blog-post!], and after a bit of
-variable cleanup:
-
-@external-file["iteration-4.rkt"]
-
-Now visit the blog from two separate browser windows and add
-posts from each of them.  You'll be glad to see that both windows share
-the same blog!
-
-@section{Extending the Model}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-5)]
-
-Next, let's extend the application so that a post can include a list
-of comments. The data definition becomes:
-
-@defstruct*[post ([title string?] [body string?] [comments (listof string?)]) #:mutable]
-
-@bold{Exercise.} Write the updated data structure definition for posts.  Make
-sure to make the structure mutable, since we intend to add comments to
-posts.
-
-@bold{Exercise.} Make up a few examples of posts.
-
-@bold{Exercise.} Define a function @racket[post-add-comment!]
-
-@defthing[post-add-comment! (post? string? . -> . void)]
-
-whose intended side effect is to add a new comment to the end of the post's
-list of comments.
-
-@bold{Exercise.} Adjust @racket[render-post] so that the produced fragment will include the
-comments in an itemized list.
-
-@bold{Exercise.} Because we've extended @racket[post] to include comments, you
-also need to adjust other, post-manipulating parts of the application,
-such as uses of @racket[post].
-
-@centerline{------------}
-
-Now that we've adjusted our functions to accommodate @racket[post]'s new
-structure, our web application should be runnable.  The user may even see some
-of the fruits of our labor: if the initial @racket[BLOG] has a post with
-comments, the user should now see them. On the other hand, something is
-obviously missing: the user is given no interface through which to add
-comments!
-
-
-@section{Breaking Up the Display}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-5)]
-
-How should we incorporate comments more fully into the user's web
-experience?  Seeing all the posts and comments on one page may
-be a bit overwhelming, so maybe we should hold off on showing the
-comments on the main blog page.  Instead, let's make a secondary
-``detail'' view of a post and present its comments there.
-Accordingly, the top-level view of a blog will show only the title and body of
-a post, and the number of its comments.
-
-So now we need a way to visit a post's detail page.  One way to do
-this is to hyperlink a post's title: if one wishes to see a post's
-detail page, one should only have to click the post's title. In that post's
-detail page, we can even add a form to let the user add new comments.
-The page flow of this new version of our web application is then depicted
-simply as:
-
-@image{scribblings/tutorial/images/flow1.png}
-
-Each node (bubble) in this diagram corresponds to a request-consuming handler.
-As you might expect, we'll be using @racket[send/suspend/dispatch] some more.
-Every arrow in the diagram will be realized as a URL that we generate
-with @racket[embed/url].
-
-This approach has a slightly messy consequence. Previously we rendered the list
-of posts without any hyperlinks.  But since any function that generates a
-special dispatching URL must use @racket[embed/url] to do so, we'll need to
-adjust @racket[render-posts] and @racket[render-post] to consume and use
-@racket[embed/url] itself when it makes those hyperlinked titles.
-
-We now have a pretty sophisticated web application, one that permits the
-creation of posts and the addition of comments.  Here is what it looks like:
-
-@external-file["iteration-5.rkt"]
-
-But it still suffers from a problem: once in a @racket[post-detail-page], the
-only way for the user to return to the blog is to use the Back button!
-That's disruptive, and it might allow the user get ``stuck'' in a
-dark corner of the web application. To solve this problem, let's improve the
-page flow.
-
-@section{Adding a Back Button}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-6)]
-
-Perhaps we should simply add a BACK link from the
-@racket[render-post-detail-page], one that returns us to the top-level
-blog. Here's the corresponding page flow diagram:
-
-@image{scribblings/tutorial/images/flow2.png}
-
-@bold{Exercise.} Adjust @racket[render-post-detail-page] to include another link that goes
-back to @racket[render-blog-page].
-
-And since a user may have a change of heart about a comment,
-let's enrich the flow to give the user a chance to back out of submitting one.
-
-@image{scribblings/tutorial/images/flow3.png}
-
-Note that, although this change may seem complicated, it doesn't affect the
-general shape of our handlers:
-
-@external-file["iteration-6.rkt"]
-
-
-@section{Decorating With Style!}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-7
-                                  web-server/insta/insta)]
-
-Our web application is now functionally complete.  But it's visually
-lacking, so let's try to improve its appearance.  One way to add visual panache
-to our web pages is to use a cascading style sheet.  For example, if we'd like
-to make all of our paragraphs green, we might insert the following style
-declaration into a response.
-
-@racket['(style ((type "text/css")) "p { color: green }")]
-
-It is tempting to embed such declarations directly into our
-@racket[response]s. But our source file is already quite busy, and, as a
-matter of principle, we should separate logical representation
-from visual presentation.  So, rather than embed the
-.css in the HTML response directly, let's instead add a link reference to a
-separate .css file.
-
-Up till now, all the content produced by our web application has
-come from a response-generating handler.  But this dynamic generation of HTML
-is not necessary for content that doesn't change.
-Examples of such static resources include images, documents, and .css files.
-To serve them alongside our web applications, we inform the web server of a
-directory that we have created specially for static files. The function
-@racket[static-files-path],
-
-@defthing[static-files-path (path-string? -> void)]
-
-tells the web server to look in the given path whenever it receives a URL
-that looks like a request for a static resource.
-
-@bold{Exercise.} Create a simple web application called @filepath{test-static.rkt} with the
-following content:
-
-@racketmod[
-web-server/insta
-(define (start request)
-  (response/xexpr
-   '(html (head (title "Testing")
-                (link ((rel "stylesheet")
-                       (href "/test-static.css")
-                       (type "text/css"))))          
-          (body (h1 "Testing")
-                (h2 "This is a header")
-                (p "This is " (span ((class "hot")) "hot") ".")))))
-
-(static-files-path "htdocs")
-]
-
-Make a subdirectory called @filepath{htdocs}, rooted in the same directory as
-the @filepath{test-static.rkt} source.  Just to see that we can serve
-this .css page, create a very simple .css file @filepath{test-static.css}
-in @filepath{htdocs/} with the following content:
-
-@verbatim{
-body {
-  margin-left: 10%;
-  margin-right: 10%;
-}
-p { font-family: sans-serif }
-h1 { color: green }
-h2 { font-size: small }
-span.hot { color: red }
-}
-
-Now run the application and look at the browser's output.
-A Spartan web page should appear, but it should still have some color
-in its cheeks.
-
-@centerline{------------}
-
-@bold{Exercise.}
-Improve the presentation of the blog web application by writing
-an external style sheet that suits your tastes.  Adjust all of the HTML
-response handlers to include a link to the style sheet.
-
-@section{The Double Submit Error}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-7
-                                  web-server/servlet)]
-
-Our application has yet another subtle problem.  To see it,
-bring the blog application up again, and add a post.  Then reload the
-page.  Reload the page again.
-
-What you are observing is the well known ``double-submit'' problem.
-Whenever a user presses Reload, a request is sent to our application, and the
-problem is that some requests make the application mutate data structures.
-
-A common technique that web developers use to dodge the double-submission
-problem is to redirect state-mutating requests to a different URL, one that is
-safe to reload.  This trick is implemented in Racket by the function
-@racket[redirect/get]:
-
-@defthing[redirect/get (-> request?)]
-
-Its immediate side effect is to force the user's browser to follow a
-redirection to a safe URL, and it gives us back that fresh new request.
-
-For example, consider a toy application that lets the user add
-names to a roster:
-
-@external-file["no-use-redirect.rkt"]
-
-This application suffers from the same problem as our blog does: if the user
-adds a name, and then presses reload, then the same name will be added
-twice.
-
-We can fix this by changing a single expression; can you find it
-below?
-
-@external-file["use-redirect.rkt"]
-
-So the double-submit error is easy to prevent: whenever you have
-handlers that mutate the state of the system, use @racket[redirect/get] when
-sending back your response.
-
-@bold{Exercise.}
-Use @racket[redirect/get] to fix the double-submit error in the blog
-application.
-
-With these minor fixes, our blog application now looks like this:
-
-@external-file["iteration-7.rkt"]
-
-@section{Abstracting the Model}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-8
-                                  web-server/scribblings/tutorial/examples/model)]
-
-If we ``turn off the lights'' by closing the program, the state of
-our application disappears into the ether.  How do we get our
-ephemeral state to stick around?  Before we tackle this problem, note that it
-does not apply to all of the application's state, for we have no long-term
-interest in things like requests. What we do care about saving is our model of
-the blog.
-
-If we look closely at our web application program, we see a seam
-between the model of our blog, and the web application that uses that
-model.  Let's isolate the model; it's all the stuff near the top:
-
-@racketblock[
-    (struct blog (posts) #:mutable)
-    (struct post (title body comments) #:mutable)
-    (define BLOG ...)
-    (define (blog-insert-post! ...) ...)
-    (define (post-insert-comment! ...) ...)
-]
-
-In realistic web applications, the model and the web application are
-separated by a wall of abstraction.  In theory, this separation
-allows us to make isolated changes in future without breaking the entire
-system. So let's start separating. First we'll rip the model out into a
-separate file, and then we'll look into making the model persistent.
-
-Create a new file called @filepath{model.rkt} with the following content.
-
-@external-file["model.rkt"]
-
-This is essentially a cut-and-paste of the lines we identified as our
-model.  It's written in the @racketmodname[racket] language because
-the model shouldn't need to worry about web-server stuff.  There's one
-additional expression that looks a little odd at first:
-
-@racketblock[
-    (provide (all-defined-out))
-]
-
-It tells Racket to grant other files access to
-everything that's defined in the @filepath{model.rkt} file.
-
-Now we go back to our web application and change it to use this model, by
-replacing the deleted model code with the expression
-
-@racketblock[
-    (require "model.rkt")
-]
-
-which hooks our web application module up to the @racketmodname["model.rkt"]
-module.
-
-@external-file["iteration-8.rkt"]
-
-@section{A Persistent Model}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/iteration-9
-                                  web-server/scribblings/tutorial/examples/model-2)]
-
-Now that the model resides in a separate module, we can more easily modify
-it and, in particular, can make it persistent.
-
-The first step is to make the model structures serializable. Earlier, we made the
-structures mutable by adding @racket[#:mutable] to their
-definitions. Similarly, when the keyword @racket[#:prefab] is added to the
-definition of a structure, Racket understands that the structure can be
-``previously fabricated,'' that is, created before the program started
-running---which is exactly what we want when restoring the blog data from
-disk. Our blog structure definition now looks like:
-
-@racketblock[
-    (struct blog (posts) #:mutable #:prefab)
-]
-
-@racket[blog] structures can now be read from the outside world with
-@racket[read] and written to it with @racket[write]. But we also need to make
-sure that everything inside a @racket[blog] structure is also (transitively) marked
-as @racket[#:prefab].
-
-@bold{Exercise.} Write the new structure definition for posts.
-
-At this point, we @emph{can} read and write the blog to disk. So let's do it.
-First, we'll add to the model a path pointing to where the blog resides on
-disk:
-
-@defstruct*[blog ([home string?] [posts (listof post?)]) #:mutable #:prefab]
-
-Notice that we will need to convert the path into a string. Why didn't we just
-make the blog structure contain paths? Answer: They can't be used with
-@racket[read] and @racket[write].
-
-@bold{Exercise.} Write the new structure definition for blogs.
-
-Next we create a function that allows our application to initialize the blog:
-
-@racketblock[
-@code:comment{initialize-blog! : path? -> blog}
-@code:comment{Reads a blog from a path, if not present, returns default}
-(define (initialize-blog! home)
-  (local [(define (log-missing-exn-handler exn)
-            (blog
-             (path->string home)
-             (list (post "First Post"
-                         "This is my first post"
-                         (list "First comment!"))
-                   (post "Second Post"
-                         "This is another post"
-                         (list)))))
-          (define the-blog
-            (with-handlers ([exn? log-missing-exn-handler])
-              (with-input-from-file home read)))]
-    (set-blog-home! the-blog (path->string home))
-    the-blog))
-]
-
-@racket[initialize-blog!] takes a path and tries to @racket[read] from it. If
-the path contains a @racket[blog] structure, then @racket[read] will parse it,
-because @racket[blog]s are @racket[#:prefab]. If there is no file at the path,
-or if the file has some spurious data, then @racket[read] or
-@racket[with-input-from-file] will throw an exception. @racket[with-handlers]
-supplies an exception handler that reacts to any error by returning the default
-@racket[blog] structure.  After @racket[the-blog] is bound to the newly read
-(or default) structure, we set the home to the correct path. 
-
-Next we need a function to save the model to the disk:
-
-@racketblock[
-@code:comment{save-blog! : blog -> void}
-@code:comment{Saves the contents of a blog to its home}
-(define (save-blog! a-blog)
-  (local [(define (write-to-blog)
-            (write a-blog))]
-    (with-output-to-file (blog-home a-blog) 
-      write-to-blog
-      #:exists 'replace)))
-]
-
-@racket[save-blog!] @racket[write]s the model to its home; by supplying an
-@racket[#:exists] clause to @racket[with-output-to-file], it ensures that the
-old contents on disk will be overwritten.
-
-This function can now be used to save the blog structure whenever it is
-modified by the user. Since modifications are made only by the model, only
-@racket[blog-insert-post!] and @racket[post-insert-comment!] will need to be
-updated.
-
-@bold{Exercise.} Change @racket[blog-insert-post!] and
-@racket[post-insert-comment!] to call @racket[save-blog!].
-
-@centerline{------------}
-
-You may have noticed a problem when trying to update
-@racket[post-insert-comment!]: the function has no blog to pass to
-@racket[save-blog!]. We will therefore need to give it a blog argument and
-change the application appropriately. While we're at it, let's change
-@racket[blog-insert-post!] to accept the contents of the post 
-structure, rather the structure itself. This improves the model's interface, by
-making it more abstract:
-
-@defthing[blog-insert-post! (blog? string? string? . -> . void)]
-@defthing[post-insert-comment! (blog? post? string? . -> . void)]
-
-@bold{Exercise.} Write the new definitions of @racket[blog-insert-post!] and @racket[post-insert-comment!].
-Remember to call @racket[save-blog!].
-
-
-In the previous iteration of the model, we used @racket[(provide
-(all-defined-out))] to expose all of the model's definitions.  This
-transgresses the principle of abstraction, which tells us to hide
-implementation details like private functions and internal data structures.
-We'll conform to that principle now, by using a form of 
-@racket[provide] that names the exposed definitions explicitly.
-
-For example, if we wanted to limit the module's exposure to the functions
-@racket[blog-insert-post!] and @racket[post-insert-comment!], we could
-do this:
-@racketblock[
-    (provide blog-insert-post!
-             post-insert-comment!)
-]
-
-But this is exposing too little! So let's change the @racket[provide] line in
-the model to:
-@racketblock[
-(provide blog? blog-posts
-         post? post-title post-body post-comments
-         initialize-blog!
-         blog-insert-post! post-insert-comment!)
-]
-
-Since these nine functions are all we need from the module, this degree of
-exposure is just right.
-
-
-@centerline{------------}
-
-The last step is to change the application. We need to call
-@racket[initialize-blog!] to read in the blog structure, and, since there is no
-longer a a @racket[BLOG] export, we need to pass the returned blog value around
-the application.
-
-First, change @racket[start] to call @racket[initialize-blog!] with a path in
-our home directory:
-
-@racketblock[
- (define (start request)  
-   (render-blog-page 
-    (initialize-blog! 
-     (build-path (current-directory)
-                 "the-blog-data.db"))
-    request))
-]
-
-@bold{Exercise.} Thread the @racket[blog] structure through the application
-appropriately to give @racket[blog-insert-post!] and
-@racket[post-insert-comment!] the correct values. You'll also need to change
-how @racket[render-blog-page] adds new posts.
-
-@centerline{------------}
-
-Our model is now:
-
-@external-file["model-2.rkt"]
-
-And our application is:
-
-@external-file["iteration-9.rkt"]
-
-@centerline{------------}
-
-This approach to persistence can work surprisingly well for simple
-applications. But as our application's needs grow, we will have to deal with
-concurrency issues, the lack of a simple query language over our data model,
-etc. So, in the next section, we'll explain how to use an SQL database to
-store our blog model.
-
-@section{Using an SQL database}
-@declare-exporting[#:use-sources (web-server/scribblings/tutorial/examples/dummy-10
-                                  web-server/scribblings/tutorial/examples/dummy-3
-                                  web-server/scribblings/tutorial/dummy-sqlite)]
-@(require (for-label web-server/scribblings/tutorial/dummy-sqlite))
-
-To employ an SQL database, we use the following bindings from the
-@racketmodname[db] library: @racket[connection?], @racket[sqlite3-connect],
-@racket[table-exists?], @racket[query-exec], @racket[query-list], and
-@racket[query-value].  Import them by adding the following to the top of the
-model:
-
-@racketblock[
-(require db)
-]
-
-Next, we define a relational structure for our model using the following
-tables:
-
-@verbatim{
- CREATE TABLE posts (id INTEGER PRIMARY KEY, title TEXT, body TEXT)
- CREATE TABLE comments (pid INTEGER, content TEXT)
-}
-
-Like the Racket structure, a post in the database has a title and a body,
-but it also has an identifier. (Actually, the Racket structure had an
-identifier as well---the memory pointer---but the database requires it to be
-explicit.)
-
-As for the comments, each has some textual content and is connected to a post
-via identifier. We could have chosen to serialize comments with
-@racket[write] and add a new TEXT column to the posts table to store
-the value. But a separate comments table conforms better to
-relational style.
-
-A @racket[blog] structure is now simply a container for the database
-handle:
-
-@defstruct*[blog ([db connection?])]
-
-@bold{Exercise.} Write the @racket[blog] structure definition. It
-does not need to be mutable or serializable.
-
-We can now write the code to initialize a @racket[blog] structure:
-@racketblock[
-@code:comment{initialize-blog! : path? -> blog?}
-@code:comment{Sets up a blog database (if it doesn't exist)}
-(define (initialize-blog! home)
-  (define db (sqlite3-connect #:database home #:mode 'create))
-  (define the-blog (blog db))
-  (unless (table-exists? db "posts")
-    (query-exec db
-     (string-append
-      "CREATE TABLE posts "
-      "(id INTEGER PRIMARY KEY, title TEXT, body TEXT)"))
-    (blog-insert-post!
-     the-blog "First Post" "This is my first post")
-    (blog-insert-post!
-     the-blog "Second Post" "This is another post"))
-  (unless (table-exists? db "comments")
-    (query-exec db
-     "CREATE TABLE comments (pid INTEGER, content TEXT)")
-    (post-insert-comment!
-     the-blog (first (blog-posts the-blog))
-     "First comment!"))
-  the-blog)
-]
-
-Given the @racket['create] flag, @racket[sqlite3-connect] creates a database if
-one does not already exist at the @racket[home] path.
-
-We still need to initialize the database with the table
-definitions and initial data. Previously we used @racket[blog-insert-post!] and
-@racket[post-insert-comment!] for this purpose; here are their new
-implementations:
-
-@racketblock[
-@code:comment{blog-insert-post!: blog? string? string? -> void}
-@code:comment{Consumes a blog and a post, adds the post at the top of the blog.}
-(define (blog-insert-post! a-blog title body)
-  (query-exec
-   (blog-db a-blog)
-   "INSERT INTO posts (title, body) VALUES (?, ?)"
-   title body))
-
-@code:comment{post-insert-comment!: blog? post string -> void}
-@code:comment{Consumes a blog, a post and a comment string.  As a side-effect,}
-@code:comment{adds the comment to the bottom of the post's list of comments.}
-(define (post-insert-comment! a-blog p a-comment)
-  (query-exec
-   (blog-db a-blog)
-   "INSERT INTO comments (pid, content) VALUES (?, ?)"
-   (post-id p) a-comment))
-]
-
-@centerline{------------}
-
-Note that the SQL queries above use the SQL placeholder, @litchar{?}, to
-perform string substitution. If they had performed it with
-@racket[format] and @litchar{~a} instead, a malicious user could submit a post with a
-title like @racket["null', 'null') and INSERT INTO accounts (username,
-password) VALUES ('ur','hacked"] and get @racket[query-exec] to make two
-INSERTs instead of one. This is called an SQL injection attack.
-
-SQL placeholders prevent such attacks by ensuring that the query is submitted
-as-is to SQLite, which then parses it and applies the arguments. This approach
-ensures that the arguments are treated strictly as data.
-
-
-@centerline{------------}
-
-In @racket[post-insert-comment!] we use @racket[post-id] but we
-have not yet defined the new @racket[post] structure.  Since the post table
-schema uses an integer as identifier, it would seem sufficient
-to do the same for the @racket[post] structure.
-However, a structure so defined would not indicate which blog, and consequently
-which database, a post belongs to. We would thus be unable to extract
-the title or body values.
-
-The solution, of course, is to associate the blog with each post:
-
-@defstruct*[post ([blog blog?] [id integer?])]
-
-@bold{Exercise.} Write the structure definition for posts.
-
-The only function that creates posts is @racket[blog-posts]:
-
-@racketblock[
-@code:comment{blog-posts : blog -> (listof post?)}
-@code:comment{Queries for the post ids}
-(define (blog-posts a-blog)
-  (local [(define (id->post an-id)
-            (post a-blog an-id))]
-    (map id->post
-         (query-list
-          (blog-db a-blog)
-          "SELECT id FROM posts"))))
-]
-
-@racket[query-list] can be used for queries that return a single
-column (e.g., @racket["SELECT id FROM posts"]), and it returns a list of that
-column's values.
-
-At this point we can write the functions that operate on posts:
-@racketblock[
-@code:comment{post-title : post -> string?}
-@code:comment{Queries for the title}
-(define (post-title a-post)
-  (query-value
-   (blog-db (post-blog a-post))
-   "SELECT title FROM posts WHERE id = ?"
-   (post-id a-post)))
-]
-
-@racket[query-value] is used with queries that return a single
-value (that is, one row and one column).
-
-@bold{Exercise.} Write the definition of @racket[post-body].
-             
-@bold{Exercise.} Write the definition of @racket[post-comments].
-(Hint: Use @racket[blog-posts] as a template, not @racket[post-title].)
-
-@centerline{------------}
-
-The only change that we need to make to the application is to require
-the new model. Note that its interface remains unchanged!
-
-@centerline{------------}
-
-Our model is now:
-
-@external-file["model-3.rkt"]
-
-And our application is:
-
-@racketmod[
-web-server/insta
-
-(require "model-3.rkt")
-
-....
-]
-
-See @secref[#:doc '(lib "db/scribblings/db.scrbl") "intro-servlets"]
-for more information on writing database-backed web servlets.
-
-@section{Using Formlets}
-
-@(require (for-label web-server/formlets))
-
-Now let's go back to the application code. One of our poor design choices is
-to have made a loose connection between the name used to identify a form
-element in the rendering code, and the name used for it in the extracting code:
-
-@racketblock[
-@code:comment{render-blog-page: blog request -> doesnt'}
-@code:comment{Send an HTML page of the content of the}
-@code:comment{blog.}
-(define (render-blog-page a-blog request)
-  (local [(define (response-generator embed/url) 
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts a-blog embed/url)
-                     (form ((action 
-                             ,(embed/url insert-post-handler)))
-                           @code:comment{"title" is used here}
-                           (input ((name "title")))
-                           (input ((name "body")))
-                           (input ((type "submit"))))))))          
-          
-          (define (insert-post-handler request)
-            (define bindings (request-bindings request))
-            (blog-insert-post!
-             a-blog
-             @code:comment{And "title" is used here.}
-             (extract-binding/single 'title bindings)
-             (extract-binding/single 'body bindings))
-            (render-blog-page a-blog (redirect/get)))]
-
-    (send/suspend/dispatch response-generator)))
-]
-
-@(define formlet
-   @tech[#:doc '(lib "web-server/scribblings/web-server.scrbl")]{formlet})
-@(define formlets
-   @tech[#:doc '(lib "web-server/scribblings/web-server.scrbl")]{formlets})
-
-The Racket Web framework provides @formlets to abstract these names away, by
-adjusting them automatically in the HTML, and by presenting the following
-interface for the display and processing of forms:
-@itemize[
-@item{@racket[formlet-display] takes a @formlet and returns its rendering as a
-list of X-expressions. This will generate unique names for its form elements.}
- 
-@item{@racket[formlet-process] takes a @formlet and a request and processes the
-@formlet, i.e., extracts the bindings from the request using the
-names generated by @racket[formlet-display].}
-]
-
-A @formlet is created using the @racket[formlet] syntax. For example, here is
-a @formlet for @racket[render-blog-page]:
-
-@racketblock[
-@code:comment{new-post-formlet : formlet (values string? string?)}
-@code:comment{A formlet for requesting a title and body of a post}
-(define new-post-formlet
-  (formlet
-   (#%# ,{input-string . => . title}
-        ,{input-string . => . body})
-   (values title body)))
-]
-
-The first argument in the @racket[formlet] syntax determines how
-@racket[formlet-display] should display the @|formlet|.
-It is a quoted @|xexpr|, with two important differences:
-@itemize[
-@item{@racket[#%#] introduces a list of @|xexpr|s}
-@item{
-@racket[,{_formlet . => . _id}] embeds the @formlet @racket[_formlet] as a
-sub@|formlet| and it attaches the name @racket[_id] to the result of processing
-this sub@|formlet|.
-
-For example, @racket[input-string] is itself a library
-@formlet that yields a string, and @racket[,{input-string . => . title}] embeds
-@racket[input-string] in @racket[new-post-formlet] and associates the name
-@racket[title] to that string.
-
-@racket[input-string] is rendered as @racketresult[`(input ([type "text"] [name
-,_fresh_name]))], so @racket[(formlet-display
-new-post-formlet)] is rendered as:
-@racketresultblock[
-(list '(input ([type "text"] [name "input_0"]))
-      '(input ([type "text"] [name "input_1"])))
-]
-}
-
-
-]
-
-The second argument of @racket[formlet] determines how @racket[formlet-process]
-should process the @|formlet|. That is, it specifies how to group and order the
-results of processing the @formlet's sub@|formlet|s: the identifiers on the
-right-hand side of @racket[=>] are bound to the results of processing the
-sub@|formlets|.
-
-For example, @racket[input-string] is processed as
-@racket[(extract-binding/single _fresh_name (request-bindings
-request))]. Thus, if @racket[_request] binds @racketresult["input_0"] to
-@racketresult["Title"] and @racketresult["input_1"] to @racketresult["Body"],
-then @racket[(formlet-process new-post-formlet _request)] returns
-@racketresult[(values "Title" "Body")].
-
-
-Finally, here is how to use @racket[new-post-formlet] in @racket[render-blog-page]:
-@racketblock[
-@code:comment{render-blog-page: blog request -> doesn't return}
-@code:comment{Sends an HTML page of the content of the}
-@code:comment{blog.}
-(define (render-blog-page a-blog request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts a-blog embed/url)
-                     (form ([action 
-                             ,(embed/url insert-post-handler)])
-                           ,@(formlet-display new-post-formlet)
-                           (input ([type "submit"])))))))
-          
-          (define (insert-post-handler request)
-            (define-values (title body) 
-              (formlet-process new-post-formlet request))
-            (blog-insert-post! a-blog title body)
-            (render-blog-page a-blog (redirect/get)))]
-    
-    (send/suspend/dispatch response-generator)))
-]
-
-@bold{Alternative.} The formlet shown above uses the
-@racket[input-string] combinator, which combines a bunch of other
-formlets into one container with sensible defaults. Sometimes it is
-useful to break it apart to provide different arguments to the
-subpieces. For example, suppose we wanted to add a CSS class to the
-form elements? Here's how we'd do that:
-
-@racketblock[
-(define new-post-formlet
-  (formlet
-   (#%# ,((to-string 
-           (required 
-            (text-input
-             #:attributes '([class "form-text"]))))
-          . => . title)
-        ,((to-string
-           (required
-            (text-input
-             #:attributes '([class "form-text"]))))
-          . => . body))
-   (values title body)))
-]
-
-@bold{Exercise.} Write a @formlet and use it in @racket[render-post-detail-page].
-
-@centerline{------------}
-
-Our application is now:
-
-@external-file["iteration-11.rkt"]
-
-@section{Leaving DrRacket}
-
-We've been in the habit of pressing the @onscreen{Run} button to run our
-application in DrRacket. But if we were actually to deploy an application, we'd
-need to launch it by a different method.
-
-@(require (for-label web-server/servlet-env)
-          (for-label web-server/managers/lru))
-
-The simplest alternative is to use @racketmodname[web-server/servlet-env].
-First, change the first lines in your application from
-@racketmod[
-web-server/insta
-]
-
-to
-@racketmod[
-racket
-
-(require web-server/servlet)
-(provide/contract (start (request? . -> . response?)))
-]
-
-Second, add the following at the bottom of your application:
-
-@racketblock[
-(require web-server/servlet-env)
-(serve/servlet start 
-               #:launch-browser? #f
-               #:quit? #f
-               #:listen-ip #f
-               #:port 8000 
-               #:extra-files-paths
-               (list (build-path _your-path-here "htdocs"))
-               #:servlet-path
-               "/servlets/APPLICATION.rkt")
-]
-
-Regarding the parameters of @racket[serve/servlet]:
-@itemize[
-@item{You can change the value of the @racket[#:port] parameter to use a
-different port.}
-
-@item{@racket[#:listen-ip] is set to @racket[#f] so that the server will listen
-on @emph{all} available IPs.}
-
-@item{You should change @racket[_your-path-here] to be the path to the parent
-of your @racket[htdocs] directory.}
-
-@item{You should change @racket["APPLICATION.rkt"] to be the name of your
-application.}
-]
-
-Third, to run your server, you can either press @onscreen{Run} in DrRacket, or type
-
-@commandline{racket -t <file.rkt>}
-
-(using your own file name, of course). Both of these will start a Web server
-for your application. 
-
-@centerline{------------}
-
-@racket[serve/servlet] takes other parameters and there are more advanced ways
-of starting the Web Server, but you'll have to refer to the Racket Web Server
-Reference Manual for details.
-
-@section{Using HTTPS}
-
-Finally, here are instructions for using the server in HTTPS mode.
-This requires an SSL certificate and a private key.  It is also very
-platform-specific, but here are the details for using OpenSSL on UNIX:
-
-@commandline{openssl genrsa -des3 -out private-key.pem 1024}
-
-This will generate a new private key, but with a passphrase, which you
-can remove as follows:
-
-@commandline{openssl rsa -in private-key.pem -out private-key.pem}
-@commandline{chmod 400 private-key.pem}
-
-Now we generate a self-signed certificate:
-
-@commandline{openssl req -new -x509 -nodes -sha1 -days 365 -key private-key.pem > server-cert.pem}
-
-(Each certificate authority has a different way of generating
-certificate-signing requests.)
-
-We can now start the server with:
-
-@commandline{plt-web-server --ssl}
-
-The Web Server will start on port 443 (which can be overridden with the @exec{-p} option) using the
-@filepath{private-key.pem} and @filepath{server-cert.pem} we've created.
-
-@section{Moving Forward}
-
-As you move forward with your own applications, you may find many PLaneT packages
-to be useful. There are interfaces to other databases, many tools for generating
-output in HTML, XML, Javascript, etc.
-
-There is also an active community of users on the Racket mailing list. We
-welcome new users!
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/dummy-sqlite.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/dummy-sqlite.rkt
deleted file mode 100644
index 8c8f1ed55b..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/dummy-sqlite.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-
-(define sqlite:db? #f)
-(define sqlite:open #f)
-(define sqlite:exec/ignore #f)
-(define sqlite:select #f)
-(define sqlite:insert #f)
-
-(provide (all-defined-out))
-
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/dummy-10.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/dummy-10.rkt
deleted file mode 100644
index 3295291640..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/dummy-10.rkt
+++ /dev/null
@@ -1,140 +0,0 @@
-#lang web-server/insta
-
-(require "dummy-3.rkt")
-
-;; start: request -> doesn't return
-;; Consumes a request and produces a page that displays
-;; all of the web content.
-(define (start request)  
-  (render-blog-page 
-   (initialize-blog! 
-    (build-path (current-directory)
-                "the-blog-data.sqlite"))
-   request))
-
-;; render-blog-page: blog request -> doesn't return
-;; Produces an HTML page of the content of the
-;; blog.
-(define (render-blog-page a-blog request)
-  (local [(define (response-generator embed/url) 
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts a-blog embed/url)
-                     (form ((action 
-                             ,(embed/url insert-post-handler)))
-                           (input ((name "title")))
-                           (input ((name "body")))
-                           (input ((type "submit"))))))))          
-          
-          (define (insert-post-handler request)
-            (define bindings (request-bindings request))
-            (blog-insert-post!
-             a-blog
-             (extract-binding/single 'title bindings)
-             (extract-binding/single 'body bindings))
-            (render-blog-page a-blog (redirect/get)))]
-
-    (send/suspend/dispatch response-generator)))
-
-;; render-post-detail-page: post request -> doesn't return
-;; Consumes a post and produces a detail page of the post.
-;; The user will be able to either insert new comments
-;; or go back to render-blog-page.
-(define (render-post-detail-page a-blog a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Post Details"))
-                    (body
-                     (h1 "Post Details")
-                     (h2 ,(post-title a-post))
-                     (p ,(post-body a-post))
-                     ,(render-as-itemized-list
-                       (post-comments a-post))
-                     (form ((action 
-                             ,(embed/url insert-comment-handler)))
-                           (input ((name "comment")))
-                           (input ((type "submit"))))
-                     (a ((href ,(embed/url back-handler)))
-                        "Back to the blog")))))
-          
-          (define (parse-comment bindings)
-            (extract-binding/single 'comment bindings))
-          
-          (define (insert-comment-handler request)
-            (render-confirm-add-comment-page
-             a-blog
-             (parse-comment (request-bindings request))
-             a-post
-             request))
-
-          (define (back-handler request)
-            (render-blog-page a-blog request))]
-
-    (send/suspend/dispatch response-generator)))
-
-;; render-confirm-add-comment-page :
-;; blog comment post request -> doesn't return
-;; Consumes a comment that we intend to add to a post, as well
-;; as the request. If the user follows through, adds a comment 
-;; and goes back to the display page. Otherwise, goes back to 
-;; the detail page of the post.
-(define (render-confirm-add-comment-page a-blog a-comment
-                                         a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Add a Comment"))
-                    (body
-                     (h1 "Add a Comment")
-                     "The comment: " (div (p ,a-comment))
-                     "will be added to "                    
-                     (div ,(post-title a-post))
-                     
-                     (p (a ((href ,(embed/url yes-handler)))
-                           "Yes, add the comment."))
-                     (p (a ((href ,(embed/url cancel-handler)))
-                           "No, I changed my mind!"))))))
-          
-          (define (yes-handler request)
-            (post-insert-comment! a-blog a-post a-comment)
-            (render-post-detail-page a-blog a-post (redirect/get)))
-          
-          (define (cancel-handler request)
-            (render-post-detail-page a-blog a-post request))]
-
-    (send/suspend/dispatch response-generator)))
-
-;; render-post: post (handler -> string) -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-;; The fragment contains a link to show a detailed view of the post.
-(define (render-post a-blog a-post embed/url)
-  (local [(define (view-post-handler request)
-            (render-post-detail-page a-blog a-post request))]
-    `(div ((class "post")) 
-          (a ((href ,(embed/url view-post-handler)))
-             ,(post-title a-post))
-          (p ,(post-body a-post))        
-          (div ,(number->string (length (post-comments a-post)))
-               " comment(s)"))))
-
-;; render-posts: blog (handler -> string) -> xexpr
-;; Consumes a embed/url, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts a-blog embed/url)
-  (local [(define (render-post/embed/url a-post)
-            (render-post a-blog a-post embed/url))]
-    `(div ((class "posts"))
-          ,@(map render-post/embed/url (blog-posts a-blog)))))
-
-;; render-as-itemized-list: (listof xexpr) -> xexpr
-;; Consumes a list of items, and produces a rendering as
-;; an unorderered list.
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-;; render-as-item: xexpr -> xexpr
-;; Consumes an xexpr, and produces a rendering
-;; as a list item.
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/dummy-3.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/dummy-3.rkt
deleted file mode 100644
index c0b4011745..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/dummy-3.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/local
-         "../dummy-sqlite.rkt")
-
-;; A blog is a (blog db)
-;; where db is an sqlite database handle
-(struct blog (db))
-
-;; A post is a (post blog id)
-;; where blog is a blog and id is an integer?
-(struct post (blog id))
-
-;; initialize-blog! : path? -> blog?
-;; Sets up a blog database (if it doesn't exist)
-(define (initialize-blog! home)
-  (define db (sqlite:open home))
-  (define the-blog (blog db))
-  (with-handlers ([exn? void])
-    (sqlite:exec/ignore db
-                        (string-append
-                         "CREATE TABLE posts "
-                         "(id INTEGER PRIMARY KEY,"
-                         "title TEXT, body TEXT)"))
-    (blog-insert-post!
-     the-blog "First Post" "This is my first post")
-    (blog-insert-post!
-     the-blog "Second Post" "This is another post")
-    (sqlite:exec/ignore
-     db "CREATE TABLE comments (pid INTEGER, content TEXT)")
-    (post-insert-comment!
-     the-blog (first (blog-posts the-blog))
-     "First comment!"))
-  the-blog)
-
-;; blog-posts : blog -> (listof post?)
-;; Queries for the post ids
-(define (blog-posts a-blog)
-  (local [(define (row->post a-row)
-            (post a-blog (string->number (vector-ref a-row 0))))
-          (define rows (sqlite:select
-                        (blog-db a-blog)
-                        "SELECT id FROM posts"))]
-    (cond [(empty? rows)
-           empty]
-          [else
-           (map row->post (rest rows))])))
-
-;; post-title : post -> string?
-;; Queries for the title
-(define (post-title a-post)
-  (vector-ref 
-   (second 
-    (sqlite:select 
-     (blog-db (post-blog a-post))
-     (format "SELECT title FROM posts WHERE id = '~a'"
-             (post-id a-post))))
-   0))
-
-;; post-body : post -> string?
-;; Queries for the body
-(define (post-body p)
-  (vector-ref 
-   (second 
-    (sqlite:select 
-     (blog-db (post-blog p))
-     (format "SELECT body FROM posts WHERE id = '~a'"
-             (post-id p))))
-   0))
-
-;; post-comments : post -> (listof string?)
-;; Queries for the comments
-(define (post-comments p)
-  (local [(define (row->comment a-row)
-            (vector-ref a-row 0))
-          (define rows 
-            (sqlite:select
-             (blog-db (post-blog p))
-             (format "SELECT content FROM comments WHERE pid = '~a'"
-                     (post-id p))))]
-    (cond
-      [(empty? rows) empty]
-      [else (map row->comment (rest rows))])))
-
-;; blog-insert-post!: blog? string? string? -> void
-;; Consumes a blog and a post, adds the post at the top of the blog.
-(define (blog-insert-post! a-blog title body)
-  (sqlite:insert
-   (blog-db a-blog)
-   (format "INSERT INTO posts (title, body) VALUES ('~a', '~a')"
-           title body)))
-
-;; post-insert-comment!: blog? post string -> void
-;; Consumes a blog, a post and a comment string.  As a side-efect, 
-;; adds the comment to the bottom of the post's list of comments.
-(define (post-insert-comment! a-blog p a-comment)
-  (sqlite:insert 
-   (blog-db a-blog)
-   (format
-    "INSERT INTO comments (pid, content) VALUES ('~a', '~a')"
-    (post-id p) a-comment)))
-
-(provide blog? blog-posts
-         post? post-title post-body post-comments
-         initialize-blog!
-         blog-insert-post! post-insert-comment!)
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/htdocs/test-static.css b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/htdocs/test-static.css
deleted file mode 100644
index c62386b39b..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/htdocs/test-static.css
+++ /dev/null
@@ -1,12 +0,0 @@
-body {
-  margin-left: 10%;
-  margin-right: 10%;
-}
-
-p { font-family: sans-serif; }
-
-h1 { color: green; }
-
-h2 { font-size: small; }
-
-span.hot { color: red; }
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/info.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/info.rkt
deleted file mode 100644
index a5b71b1dd7..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-omit-paths 'all)
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-1.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-1.rkt
deleted file mode 100644
index d35470ecd4..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-1.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang web-server/insta
-
-;; A blog is a (listof post)
-;; and a post is a (post title body)
-(struct post (title body))
-
-;; BLOG: blog
-;; The static blog.
-(define BLOG 
-  (list (post "Second Post" "This is another post")
-        (post "First Post" "This is my first post")))
-
-;; start: request -> response
-;; Consumes a request, and produces a page that displays all of the
-;; web content.
-(define (start request)
-  (render-blog-page BLOG request))
-
-;; render-blog-page: blog request -> response
-;; Consumes a blog and a request, and produces an HTML page
-;; of the content of the blog.
-(define (render-blog-page a-blog request)
-  (response/xexpr
-   `(html (head (title "My Blog"))
-          (body (h1 "My Blog")
-                ,(render-posts a-blog)))))
-
-;; render-post: post -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-(define (render-post a-post)
-  `(div ((class "post")) 
-        ,(post-title a-post)
-        (p ,(post-body a-post))))
-
-;; render-posts: blog -> xexpr
-;; Consumes a blog, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts a-blog)
-  `(div ((class "posts"))
-        ,@(map render-post a-blog)))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-10.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-10.rkt
deleted file mode 100644
index 0febf3c1a9..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-10.rkt
+++ /dev/null
@@ -1,140 +0,0 @@
-#lang web-server/insta
-
-(require "model-3.rkt")
-
-;; start: request -> doesn't return
-;; Consumes a request and produces a page that displays
-;; all of the web content.
-(define (start request)  
-  (render-blog-page 
-   (initialize-blog! 
-    (build-path (current-directory)
-                "the-blog-data.sqlite"))
-   request))
-
-;; render-blog-page: blog request -> doesn't return
-;; Produces an HTML page of the content of the
-;; blog.
-(define (render-blog-page a-blog request)
-  (local [(define (response-generator embed/url)   
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts a-blog embed/url)
-                     (form ((action 
-                             ,(embed/url insert-post-handler)))
-                           (input ((name "title")))
-                           (input ((name "body")))
-                           (input ((type "submit"))))))))          
-          
-          (define (insert-post-handler request)
-            (define bindings (request-bindings request))
-            (blog-insert-post!
-             a-blog
-             (extract-binding/single 'title bindings)
-             (extract-binding/single 'body bindings))
-            (render-blog-page a-blog (redirect/get)))]
-
-    (send/suspend/dispatch response-generator)))
-
-;; render-post-detail-page: post request -> doesn't return
-;; Consumes a post and produces a detail page of the post.
-;; The user will be able to either insert new comments
-;; or go back to render-blog-page.
-(define (render-post-detail-page a-blog a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Post Details"))
-                    (body
-                     (h1 "Post Details")
-                     (h2 ,(post-title a-post))
-                     (p ,(post-body a-post))
-                     ,(render-as-itemized-list
-                       (post-comments a-post))
-                     (form ((action 
-                             ,(embed/url insert-comment-handler)))
-                           (input ((name "comment")))
-                           (input ((type "submit"))))
-                     (a ((href ,(embed/url back-handler)))
-                        "Back to the blog")))))
-          
-          (define (parse-comment bindings)
-            (extract-binding/single 'comment bindings))
-          
-          (define (insert-comment-handler request)
-            (render-confirm-add-comment-page
-             a-blog
-             (parse-comment (request-bindings request))
-             a-post
-             request))
-
-          (define (back-handler request)
-            (render-blog-page a-blog request))]
-
-    (send/suspend/dispatch response-generator)))
-
-;; render-confirm-add-comment-page :
-;; blog comment post request -> doesn't return
-;; Consumes a comment that we intend to add to a post, as well
-;; as the request. If the user follows through, adds a comment 
-;; and goes back to the display page. Otherwise, goes back to 
-;; the detail page of the post.
-(define (render-confirm-add-comment-page a-blog a-comment
-                                         a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Add a Comment"))
-                    (body
-                     (h1 "Add a Comment")
-                     "The comment: " (div (p ,a-comment))
-                     "will be added to "                    
-                     (div ,(post-title a-post))
-                     
-                     (p (a ((href ,(embed/url yes-handler)))
-                           "Yes, add the comment."))
-                     (p (a ((href ,(embed/url cancel-handler)))
-                           "No, I changed my mind!"))))))
-          
-          (define (yes-handler request)
-            (post-insert-comment! a-blog a-post a-comment)
-            (render-post-detail-page a-blog a-post (redirect/get)))
-          
-          (define (cancel-handler request)
-            (render-post-detail-page a-blog a-post request))]
-
-    (send/suspend/dispatch response-generator)))
-
-;; render-post: post (handler -> string) -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-;; The fragment contains a link to show a detailed view of the post.
-(define (render-post a-blog a-post embed/url)
-  (local [(define (view-post-handler request)
-            (render-post-detail-page a-blog a-post request))]
-    `(div ((class "post")) 
-          (a ((href ,(embed/url view-post-handler)))
-             ,(post-title a-post))
-          (p ,(post-body a-post))        
-          (div ,(number->string (length (post-comments a-post)))
-               " comment(s)"))))
-
-;; render-posts: blog (handler -> string) -> xexpr
-;; Consumes a embed/url, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts a-blog embed/url)
-  (local [(define (render-post/embed/url a-post)
-            (render-post a-blog a-post embed/url))]
-    `(div ((class "posts"))
-          ,@(map render-post/embed/url (blog-posts a-blog)))))
-
-;; render-as-itemized-list: (listof xexpr) -> xexpr
-;; Consumes a list of items, and produces a rendering as
-;; an unorderered list.
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-;; render-as-item: xexpr -> xexpr
-;; Consumes an xexpr, and produces a rendering
-;; as a list item.
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-11.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-11.rkt
deleted file mode 100644
index 36ca1525a3..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-11.rkt
+++ /dev/null
@@ -1,148 +0,0 @@
-#lang web-server/insta
-
-(require web-server/formlets
-         "model-3.rkt")
-
-;; start: request -> doesn't return
-;; Consumes a request and produces a page that displays
-;; all of the web content.
-(define (start request)  
-  (render-blog-page 
-   (initialize-blog! 
-    (build-path (current-directory)
-                "the-blog-data.sqlite"))
-   request))
-
-;; new-post-formlet : formlet (values string? string?)
-;; A formlet for requesting a title and body of a post
-(define new-post-formlet
-  (formlet
-   (#%# ,{input-string . => . title}
-        ,{input-string . => . body})
-   (values title body)))
-
-;; render-blog-page: blog request -> doesn't return
-;; Produces an HTML page of the content of the
-;; blog.
-(define (render-blog-page a-blog request)
-  (local [(define (response-generator embed/url)  
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts a-blog embed/url)
-                     (form ([action 
-                             ,(embed/url insert-post-handler)])
-                           ,@(formlet-display new-post-formlet)
-                           (input ([type "submit"])))))))
-          
-          (define (insert-post-handler request)
-            (define-values (title body)
-              (formlet-process new-post-formlet request))
-            (blog-insert-post! a-blog title body)
-            (render-blog-page a-blog (redirect/get)))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; new-comment-formlet : formlet string
-;; A formlet for requesting a comment
-(define new-comment-formlet
-  input-string)
-
-;; render-post-detail-page: post request -> doesn't return
-;; Consumes a post and produces a detail page of the post.
-;; The user will be able to either insert new comments
-;; or go back to render-blog-page.
-(define (render-post-detail-page a-blog a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Post Details"))
-                    (body
-                     (h1 "Post Details")
-                     (h2 ,(post-title a-post))
-                     (p ,(post-body a-post))
-                     ,(render-as-itemized-list
-                       (post-comments a-post))
-                     (form ([action 
-                             ,(embed/url insert-comment-handler)])
-                           ,@(formlet-display new-comment-formlet)
-                           (input ([type "submit"])))
-                     (a ([href ,(embed/url back-handler)])
-                        "Back to the blog")))))
-          
-          (define (insert-comment-handler request)
-            (render-confirm-add-comment-page
-             a-blog 
-             (formlet-process new-comment-formlet request) 
-             a-post
-             request))
-          
-          (define (back-handler request)
-            (render-blog-page a-blog request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-confirm-add-comment-page :
-;; blog comment post request -> doesn't return
-;; Consumes a comment that we intend to add to a post, as well
-;; as the request. If the user follows through, adds a comment 
-;; and goes back to the display page. Otherwise, goes back to 
-;; the detail page of the post.
-(define (render-confirm-add-comment-page a-blog a-comment
-                                         a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Add a Comment"))
-                    (body
-                     (h1 "Add a Comment")
-                     "The comment: " (div (p ,a-comment))
-                     "will be added to "                    
-                     (div ,(post-title a-post))
-                     
-                     (p (a ([href ,(embed/url yes-handler)])
-                           "Yes, add the comment."))
-                     (p (a ([href ,(embed/url cancel-handler)])
-                           "No, I changed my mind!"))))))
-          
-          (define (yes-handler request)
-            (post-insert-comment! a-blog a-post a-comment)
-            (render-post-detail-page a-blog a-post (redirect/get)))
-          
-          (define (cancel-handler request)
-            (render-post-detail-page a-blog a-post request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-post: post (handler -> string) -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-;; The fragment contains a link to show a detailed view of the post.
-(define (render-post a-blog a-post embed/url)
-  (local [(define (view-post-handler request)
-            (render-post-detail-page a-blog a-post request))]
-    `(div ([class "post"]) 
-          (a ([href ,(embed/url view-post-handler)])
-             ,(post-title a-post))
-          (p ,(post-body a-post))        
-          (div ,(number->string (length (post-comments a-post)))
-               " comment(s)"))))
-
-;; render-posts: blog (handler -> string) -> xexpr
-;; Consumes a embed/url, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts a-blog embed/url)
-  (local [(define (render-post/embed/url a-post)
-            (render-post a-blog a-post embed/url))]
-    `(div ([class "posts"])
-          ,@(map render-post/embed/url (blog-posts a-blog)))))
-
-;; render-as-itemized-list: (listof xexpr) -> xexpr
-;; Consumes a list of items, and produces a rendering as
-;; an unorderered list.
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-;; render-as-item: xexpr -> xexpr
-;; Consumes an xexpr, and produces a rendering
-;; as a list item.
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-2.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-2.rkt
deleted file mode 100644
index 5e9715c9f6..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-2.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang web-server/insta
-
-;; A blog is a (listof post)
-;; and a post is a (post title body)
-(struct post (title body))
-
-;; BLOG: blog
-;; The static blog.
-(define BLOG 
-  (list (post "Second Post" "This is another post")
-        (post "First Post" "This is my first post")))
-
-;; start: request -> response
-;; Consumes a request and produces a page that displays all of the
-;; web content.
-(define (start request)
-  (local [(define a-blog 
-            (cond [(can-parse-post? (request-bindings request))
-                   (cons (parse-post (request-bindings request))
-                         BLOG)]
-                  [else
-                   BLOG]))]
-    (render-blog-page a-blog request)))
-
-
-;; can-parse-post?: bindings -> boolean
-;; Produces true if bindings contains values for 'title and 'body.
-(define (can-parse-post? bindings)
-  (and (exists-binding? 'title bindings)
-       (exists-binding? 'body bindings)))
-
-
-;; parse-post: bindings -> post
-;; Consumes a bindings, and produces a post out of the bindings.
-(define (parse-post bindings)
-  (post (extract-binding/single 'title bindings)
-        (extract-binding/single 'body bindings)))
-
-;; render-blog-page: blog request -> response
-;; Consumes a blog and a request, and produces an HTML page
-;; of the content of the blog.
-(define (render-blog-page a-blog request)
-  (response/xexpr
-   `(html (head (title "My Blog"))
-          (body 
-           (h1 "My Blog")
-           ,(render-posts a-blog)
-           (form
-            (input ((name "title")))
-            (input ((name "body")))
-            (input ((type "submit"))))))))
-
-;; render-post: post -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-(define (render-post a-post)
-  `(div ((class "post")) 
-        ,(post-title a-post)
-        (p ,(post-body a-post))))
-
-
-;; render-posts: blog -> xexpr
-;; Consumes a blog, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts a-blog)
-  `(div ((class "posts"))
-        ,@(map render-post a-blog)))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-3.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-3.rkt
deleted file mode 100644
index 51b7da0ba4..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-3.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang web-server/insta
-
-;; A blog is a (listof post)
-;; and a post is a (post title body)
-(struct post (title body))
-
-;; BLOG: blog
-;; The static blog.
-(define BLOG 
-  (list (post "Second Post" "This is another post")
-        (post "First Post" "This is my first post")))
-
-;; start: request -> doesn't return
-;; Consumes a request and produces a page that displays all of the
-;; web content.
-(define (start request)
-  (render-blog-page BLOG request))
-
-;; parse-post: bindings -> post
-;; Extracts a post out of the bindings.
-(define (parse-post bindings)
-  (post (extract-binding/single 'title bindings)
-        (extract-binding/single 'body bindings)))
-
-;; render-blog-page: blog request -> doesn't return
-;; Consumes a blog and a request, and produces an HTML page
-;; of the content of the blog.
-(define (render-blog-page a-blog request)
-  (local [(define (response-generator embed/url)  
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts a-blog)
-                     (form ((action 
-                             ,(embed/url insert-post-handler)))
-                           (input ((name "title")))
-                           (input ((name "body")))
-                           (input ((type "submit"))))))))
-          
-          (define (insert-post-handler request)
-            (render-blog-page 
-             (cons (parse-post (request-bindings request))
-                   a-blog)
-             request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-post: post -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-(define (render-post a-post)
-  `(div ((class "post")) 
-        ,(post-title a-post)
-        (p ,(post-body a-post))))
-
-;; render-posts: blog -> xexpr
-;; Consumes a blog, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts a-blog)
-  `(div ((class "posts"))
-        ,@(map render-post a-blog)))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-4.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-4.rkt
deleted file mode 100644
index 4cfd83d8f0..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-4.rkt
+++ /dev/null
@@ -1,70 +0,0 @@
-#lang web-server/insta
-
-;; A blog is a (blog posts)
-;; where posts is a (listof post)
-(struct blog (posts) #:mutable)
-
-;; and post is a (post title body)
-;; where title is a string, and body is a string
-(struct post (title body))
-
-;; BLOG: blog
-;; The initial BLOG.
-(define BLOG 
-  (blog
-   (list (post "Second Post" "This is another post")
-         (post "First Post" "This is my first post"))))
-
-;; blog-insert-post!: blog post -> void
-;; Consumes a blog and a post, adds the post at the top of the blog.
-(define (blog-insert-post! a-blog a-post)
-  (set-blog-posts! a-blog
-                   (cons a-post (blog-posts a-blog))))
-
-;; start: request -> doesn't return
-;; Consumes a request and produces a page that displays
-;; all of the web content.
-(define (start request)
-  (render-blog-page request))
-
-;; parse-post: bindings -> post
-;; Extracts a post out of the bindings.
-(define (parse-post bindings)
-  (post (extract-binding/single 'title bindings)
-        (extract-binding/single 'body bindings)))
-
-;; render-blog-page: request -> doesn't return
-;; Produces an HTML page of the content of the BLOG.
-(define (render-blog-page request)
-  (local [(define (response-generator embed/url)  
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts)
-                     (form ((action 
-                             ,(embed/url insert-post-handler)))
-                           (input ((name "title")))
-                           (input ((name "body")))
-                           (input ((type "submit"))))))))
-          
-          (define (insert-post-handler request)
-            (blog-insert-post! 
-             BLOG (parse-post (request-bindings request)))
-            (render-blog-page request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-post: post -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-(define (render-post a-post)
-  `(div ((class "post")) 
-        ,(post-title a-post)
-        (p ,(post-body a-post))))
-
-;; render-posts: -> xexpr
-;; Consumes a blog, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts)
-  `(div ((class "posts"))
-        ,@(map render-post (blog-posts BLOG))))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-5.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-5.rkt
deleted file mode 100644
index ad5b1553ae..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-5.rkt
+++ /dev/null
@@ -1,136 +0,0 @@
-#lang web-server/insta
-
-;; A blog is a (blog posts)
-;; where posts is a (listof post)
-(struct blog (posts) #:mutable)
-
-;; and post is a (post title body comments)
-;; where title is a string, body is a string,
-;; and comments is a (listof string)
-(struct post (title body comments) #:mutable)
-
-;; BLOG: blog
-;; The initial BLOG.
-(define BLOG 
-  (blog
-   (list (post "Second Post" 
-               "This is another post"
-               (list))
-         (post "First Post" 
-               "This is my first post" 
-               (list "First comment!")))))
-
-;; blog-insert-post!: blog post -> void
-;; Consumes a blog and a post, adds the post at the top of the blog.
-(define (blog-insert-post! a-blog a-post)
-  (set-blog-posts! a-blog
-                   (cons a-post (blog-posts a-blog))))
-
-
-;; post-insert-comment!: post string -> void
-;; Consumes a post and a comment string.  As a side-efect, 
-;; adds the comment to the bottom of the post's list of comments.
-(define (post-insert-comment! a-post a-comment)
-  (set-post-comments!
-   a-post
-   (append (post-comments a-post) (list a-comment))))
-
-;; start: request -> doesn't return
-;; Consumes a request, and produces a page that displays
-;; all of the web content.
-(define (start request)
-  (render-blog-page request))
-
-;; render-blog-page: request -> doesn't return
-;; Produces an HTML page of the content of the
-;; BLOG.
-(define (render-blog-page request)
-  (local [(define (response-generator embed/url) 
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts embed/url)
-                     (form ((action 
-                             ,(embed/url insert-post-handler)))
-                           (input ((name "title")))
-                           (input ((name "body")))
-                           (input ((type "submit"))))))))
-          
-          ;; parse-post: bindings -> post
-          ;; Extracts a post out of the bindings.
-          (define (parse-post bindings)
-            (post (extract-binding/single 'title bindings)
-                  (extract-binding/single 'body bindings)
-                  (list)))
-          
-          (define (insert-post-handler request)
-            (blog-insert-post!
-             BLOG (parse-post (request-bindings request)))
-            (render-blog-page request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-post-detail-page: post request -> doesn't return
-;; Consumes a post and request, and produces a detail page
-;; of the post. The user will be able to insert new comments.
-(define (render-post-detail-page a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Post Details"))
-                    (body
-                     (h1 "Post Details")
-                     (h2 ,(post-title a-post))
-                     (p ,(post-body a-post))
-                     ,(render-as-itemized-list
-                       (post-comments a-post))
-                     (form ((action 
-                             ,(embed/url insert-comment-handler)))
-                           (input ((name "comment")))
-                           (input ((type "submit"))))))))
-          
-          (define (parse-comment bindings)
-            (extract-binding/single 'comment bindings))
-          
-          (define (insert-comment-handler a-request)
-            (post-insert-comment! 
-             a-post (parse-comment (request-bindings a-request)))
-            (render-post-detail-page a-post a-request))]
-    
-    
-    (send/suspend/dispatch response-generator)))
-
-
-;; render-post: post (handler -> string) -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-;; The fragment contains a link to show a detailed view of the post.
-(define (render-post a-post embed/url)
-  (local [(define (view-post-handler request)
-            (render-post-detail-page a-post request))]
-    `(div ((class "post")) 
-          (a ((href ,(embed/url view-post-handler)))
-             ,(post-title a-post))
-          (p ,(post-body a-post))        
-          (div ,(number->string (length (post-comments a-post)))
-               " comment(s)"))))
-
-;; render-posts: (handler -> string) -> xexpr
-;; Consumes a embed/url, and produces an xexpr fragment
-;; of all its posts.
-(define (render-posts embed/url)
-  (local [(define (render-post/embed/url a-post)
-            (render-post a-post embed/url))]
-    `(div ((class "posts"))
-          ,@(map render-post/embed/url (blog-posts BLOG)))))
-
-;; render-as-itemized-list: (listof xexpr) -> xexpr
-;; Consumes a list of items, and produces a rendering as
-;; an unorderered list.
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-;; render-as-item: xexpr -> xexpr
-;; Consumes an xexpr, and produces a rendering
-;; as a list item.
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-6.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-6.rkt
deleted file mode 100644
index a735f25b44..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-6.rkt
+++ /dev/null
@@ -1,171 +0,0 @@
-#lang web-server/insta
-
-;; A blog is a (blog posts)
-;; where posts is a (listof post)
-(struct blog (posts) #:mutable)
-
-;; and post is a (post title body comments)
-;; where title is a string, body is a string,
-;; and comments is a (listof string)
-(struct post (title body comments) #:mutable)
-
-;; BLOG: blog
-;; The initial BLOG.
-(define BLOG 
-  (blog
-   (list (post "Second Post" 
-               "This is another post"
-               (list))
-         (post "First Post" 
-               "This is my first post" 
-               (list "First comment!")))))
-
-;; blog-insert-post!: blog post -> void
-;; Consumes a blog and a post, adds the post at the top of the blog.
-(define (blog-insert-post! a-blog a-post)
-  (set-blog-posts! a-blog
-                   (cons a-post (blog-posts a-blog))))
-
-
-;; post-insert-comment!: post string -> void
-;; Consumes a post and a comment string.  As a side-efect, 
-;; adds the comment to the bottom of the post's list of comments.
-(define (post-insert-comment! a-post a-comment)
-  (set-post-comments!
-   a-post
-   (append (post-comments a-post) (list a-comment))))
-
-;; start: request -> doesn't return
-;; Consumes a request and produces a page that displays
-;; all of the web content.
-(define (start request)
-  (render-blog-page request))
-
-;; render-blog-page: request -> doesn't return
-;; Produces an HTML page of the content of the
-;; BLOG.
-(define (render-blog-page request)
-  (local [(define (response-generator embed/url) 
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts embed/url)
-                     (form ((action 
-                             ,(embed/url insert-post-handler)))
-                           (input ((name "title")))
-                           (input ((name "body")))
-                           (input ((type "submit"))))))))
-          
-          ;; parse-post: bindings -> post
-          ;; Extracts a post out of the bindings.
-          (define (parse-post bindings)
-            (post (extract-binding/single 'title bindings)
-                  (extract-binding/single 'body bindings)
-                  (list)))
-          
-          (define (insert-post-handler request)
-            (blog-insert-post!
-             BLOG (parse-post (request-bindings request)))
-            (render-blog-page request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-post-detail-page: post request -> doesn't return
-;; Consumes a post and produces a detail page of the post.
-;; The user will be able to either insert new comments
-;; or go back to render-blog-page.
-(define (render-post-detail-page a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Post Details"))
-                    (body
-                     (h1 "Post Details")
-                     (h2 ,(post-title a-post))
-                     (p ,(post-body a-post))
-                     ,(render-as-itemized-list
-                       (post-comments a-post))
-                     (form ((action 
-                             ,(embed/url insert-comment-handler)))
-                           (input ((name "comment")))
-                           (input ((type "submit"))))
-                     (a ((href ,(embed/url back-handler)))
-                        "Back to the blog")))))
-          
-          (define (parse-comment bindings)
-            (extract-binding/single 'comment bindings))
-          
-          (define (insert-comment-handler request)
-            (render-confirm-add-comment-page 
-             (parse-comment (request-bindings request))
-             a-post
-             request))
-          
-          (define (back-handler request)
-            (render-blog-page request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-confirm-add-comment-page :
-;; comment post request -> doesn't return
-;; Consumes a comment that we intend to add to a post, as well
-;; as the request. If the user follows through, adds a comment 
-;; and goes back to the display page. Otherwise, goes back to 
-;; the detail page of the post.
-(define (render-confirm-add-comment-page a-comment a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Add a Comment"))
-                    (body
-                     (h1 "Add a Comment")
-                     "The comment: " (div (p ,a-comment))
-                     "will be added to "                    
-                     (div ,(post-title a-post))
-                     
-                     (p (a ((href ,(embed/url yes-handler))) 
-                           "Yes, add the comment."))
-                     (p (a ((href ,(embed/url cancel-handler))) 
-                           "No, I changed my mind!"))))))
-          
-          (define (yes-handler request)
-            (post-insert-comment! a-post a-comment)
-            (render-post-detail-page a-post request))
-          
-          (define (cancel-handler request)
-            (render-post-detail-page a-post request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-post: post (handler -> string) -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-;; The fragment contains a link to show a detailed view of the post.
-(define (render-post a-post embed/url)
-  (local [(define (view-post-handler request)
-            (render-post-detail-page a-post request))]
-    `(div ((class "post")) 
-          (a ((href ,(embed/url view-post-handler)))
-             ,(post-title a-post))
-          (p ,(post-body a-post))        
-          (div ,(number->string (length (post-comments a-post)))
-               " comment(s)"))))
-
-;; render-posts: (handler -> string) -> xexpr
-;; Consumes a embed/url, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts embed/url)
-  (local [(define (render-post/embed/url a-post)
-            (render-post a-post embed/url))]
-    `(div ((class "posts"))
-          ,@(map render-post/embed/url (blog-posts BLOG)))))
-
-;; render-as-itemized-list: (listof xexpr) -> xexpr
-;; Consumes a list of items, and produces a rendering as
-;; an unorderered list.
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-;; render-as-item: xexpr -> xexpr
-;; Consumes an xexpr, and produces a rendering
-;; as a list item.
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-7.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-7.rkt
deleted file mode 100644
index 9fd2cec13f..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-7.rkt
+++ /dev/null
@@ -1,171 +0,0 @@
-#lang web-server/insta
-
-;; A blog is a (blog posts)
-;; where posts is a (listof post)
-(struct blog (posts) #:mutable)
-
-;; and post is a (post title body comments)
-;; where title is a string, body is a string,
-;; and comments is a (listof string)
-(struct post (title body comments) #:mutable)
-
-;; BLOG: blog
-;; The initial BLOG.
-(define BLOG 
-  (blog
-   (list (post "Second Post" 
-               "This is another post"
-               (list))
-         (post "First Post" 
-               "This is my first post" 
-               (list "First comment!")))))
-
-;; blog-insert-post!: blog post -> void
-;; Consumes a blog and a post, adds the post at the top of the blog.
-(define (blog-insert-post! a-blog a-post)
-  (set-blog-posts! a-blog
-                   (cons a-post (blog-posts a-blog))))
-
-
-;; post-insert-comment!: post string -> void
-;; Consumes a post and a comment string.  As a side-efect, 
-;; adds the comment to the bottom of the post's list of comments.
-(define (post-insert-comment! a-post a-comment)
-  (set-post-comments!
-   a-post
-   (append (post-comments a-post) (list a-comment))))
-
-;; start: request -> doesn't return
-;; Consumes a request and produces a page that displays
-;; all of the web content.
-(define (start request)
-  (render-blog-page request))
-
-;; render-blog-page: request -> doesn't return
-;; Produces an HTML page of the content of the
-;; BLOG.
-(define (render-blog-page request)
-  (local [(define (response-generator embed/url) 
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts embed/url)
-                     (form ((action
-                             ,(embed/url insert-post-handler)))
-                           (input ((name "title")))
-                           (input ((name "body")))
-                           (input ((type "submit"))))))))
-          
-          ;; parse-post: bindings -> post
-          ;; Extracts a post out of the bindings.
-          (define (parse-post bindings)
-            (post (extract-binding/single 'title bindings)
-                  (extract-binding/single 'body bindings)
-                  (list)))
-          
-          (define (insert-post-handler request)
-            (blog-insert-post!
-             BLOG (parse-post (request-bindings request)))
-            (render-blog-page (redirect/get)))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-post-detail-page: post request -> doesn't return
-;; Consumes a post and produces a detail page of the post.
-;; The user will be able to either insert new comments
-;; or go back to render-blog-page.
-(define (render-post-detail-page a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Post Details"))
-                    (body
-                     (h1 "Post Details")
-                     (h2 ,(post-title a-post))
-                     (p ,(post-body a-post))
-                     ,(render-as-itemized-list
-                       (post-comments a-post))
-                     (form ((action 
-                             ,(embed/url insert-comment-handler)))
-                           (input ((name "comment")))
-                           (input ((type "submit"))))
-                     (a ((href ,(embed/url back-handler)))
-                        "Back to the blog")))))
-          
-          (define (parse-comment bindings)
-            (extract-binding/single 'comment bindings))
-          
-          (define (insert-comment-handler request)
-            (render-confirm-add-comment-page 
-             (parse-comment (request-bindings request))
-             a-post
-             request))
-          
-          (define (back-handler request)
-            (render-blog-page request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-confirm-add-comment-page :
-;; comment post request -> doesn't return
-;; Consumes a comment that we intend to add to a post, as well
-;; as the request. If the user follows through, adds a comment 
-;; and goes back to the display page. Otherwise, goes back to 
-;; the detail page of the post.
-(define (render-confirm-add-comment-page a-comment a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Add a Comment"))
-                    (body
-                     (h1 "Add a Comment")
-                     "The comment: " (div (p ,a-comment))
-                     "will be added to "                    
-                     (div ,(post-title a-post))
-                     
-                     (p (a ((href ,(embed/url yes-handler)))
-                           "Yes, add the comment."))
-                     (p (a ((href ,(embed/url cancel-handler)))
-                           "No, I changed my mind!"))))))
-          
-          (define (yes-handler request)
-            (post-insert-comment! a-post a-comment)
-            (render-post-detail-page a-post (redirect/get)))
-          
-          (define (cancel-handler request)
-            (render-post-detail-page a-post request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-post: post (handler -> string) -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-;; The fragment contains a link to show a detailed view of the post.
-(define (render-post a-post embed/url)
-  (local [(define (view-post-handler request)
-            (render-post-detail-page a-post request))]
-    `(div ((class "post")) 
-          (a ((href ,(embed/url view-post-handler)))
-             ,(post-title a-post))
-          (p ,(post-body a-post))        
-          (div ,(number->string (length (post-comments a-post)))
-               " comment(s)"))))
-
-;; render-posts: (handler -> string) -> xexpr
-;; Consumes a embed/url, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts embed/url)
-  (local [(define (render-post/embed/url a-post)
-            (render-post a-post embed/url))]
-    `(div ((class "posts"))
-          ,@(map render-post/embed/url (blog-posts BLOG)))))
-
-;; render-as-itemized-list: (listof xexpr) -> xexpr
-;; Consumes a list of items, and produces a rendering as
-;; an unorderered list.
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-;; render-as-item: xexpr -> xexpr
-;; Consumes an xexpr, and produces a rendering
-;; as a list item.
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-8.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-8.rkt
deleted file mode 100644
index a0d2a6c24d..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-8.rkt
+++ /dev/null
@@ -1,138 +0,0 @@
-#lang web-server/insta
-
-(require "model.rkt")
-
-;; start: request -> doesn't return
-;; Consumes a request and produces a page that displays
-;; all of the web content.
-(define (start request)
-  (render-blog-page request))
-
-;; render-blog-page: request -> doesn't return
-;; Produces an HTML page of the content of the
-;; BLOG.
-(define (render-blog-page request)
-  (local [(define (response-generator embed/url) 
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts embed/url)
-                     (form ((action
-                             ,(embed/url insert-post-handler)))
-                           (input ((name "title")))
-                           (input ((name "body")))
-                           (input ((type "submit"))))))))
-          
-          ;; parse-post: bindings -> post
-          ;; Extracts a post out of the bindings.
-          (define (parse-post bindings)
-            (post (extract-binding/single 'title bindings)
-                  (extract-binding/single 'body bindings)
-                  (list)))
-          
-          (define (insert-post-handler request)
-            (blog-insert-post!
-             BLOG (parse-post (request-bindings request)))
-            (render-blog-page (redirect/get)))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-post-detail-page: post request -> doesn't return
-;; Consumes a post and produces a detail page of the post.
-;; The user will be able to either insert new comments
-;; or go back to render-blog-page.
-(define (render-post-detail-page a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Post Details"))
-                    (body
-                     (h1 "Post Details")
-                     (h2 ,(post-title a-post))
-                     (p ,(post-body a-post))
-                     ,(render-as-itemized-list 
-                       (post-comments a-post))
-                     (form ((action 
-                             ,(embed/url insert-comment-handler)))
-                           (input ((name "comment")))
-                           (input ((type "submit"))))
-                     (a ((href ,(embed/url back-handler)))
-                        "Back to the blog")))))
-          
-          (define (parse-comment bindings)
-            (extract-binding/single 'comment bindings))
-          
-          (define (insert-comment-handler request)
-            (render-confirm-add-comment-page 
-             (parse-comment (request-bindings request))
-             a-post
-             request))
-          
-          (define (back-handler request)
-            (render-blog-page request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-confirm-add-comment-page :
-;; comment post request -> doesn't return
-;; Consumes a comment that we intend to add to a post, as well
-;; as the request. If the user follows through, adds a comment 
-;; and goes back to the display page. Otherwise, goes back to 
-;; the detail page of the post.
-(define (render-confirm-add-comment-page a-comment a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Add a Comment"))
-                    (body
-                     (h1 "Add a Comment")
-                     "The comment: " (div (p ,a-comment))
-                     "will be added to "                    
-                     (div ,(post-title a-post))
-                     
-                     (p (a ((href ,(embed/url yes-handler)))
-                           "Yes, add the comment."))
-                     (p (a ((href ,(embed/url cancel-handler)))
-                           "No, I changed my mind!"))))))
-          
-          (define (yes-handler request)
-            (post-insert-comment! a-post a-comment)
-            (render-post-detail-page a-post (redirect/get)))
-          
-          (define (cancel-handler request)
-            (render-post-detail-page a-post request))]
-    
-    (send/suspend/dispatch response-generator)))
-
-;; render-post: post (handler -> string) -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-;; The fragment contains a link to show a detailed view of the post.
-(define (render-post a-post embed/url)
-  (local [(define (view-post-handler request)
-            (render-post-detail-page a-post request))]
-    `(div ((class "post")) 
-          (a ((href ,(embed/url view-post-handler)))
-             ,(post-title a-post))
-          (p ,(post-body a-post))        
-          (div ,(number->string (length (post-comments a-post)))
-               " comment(s)"))))
-
-;; render-posts: (handler -> string) -> xexpr
-;; Consumes a embed/url, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts embed/url)
-  (local [(define (render-post/embed/url a-post)
-            (render-post a-post embed/url))]
-    `(div ((class "posts"))
-          ,@(map render-post/embed/url (blog-posts BLOG)))))
-
-;; render-as-itemized-list: (listof xexpr) -> xexpr
-;; Consumes a list of items, and produces a rendering as
-;; an unorderered list.
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-;; render-as-item: xexpr -> xexpr
-;; Consumes an xexpr, and produces a rendering 
-;; as a list item.
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-9.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-9.rkt
deleted file mode 100644
index 5a4bdda712..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-9.rkt
+++ /dev/null
@@ -1,140 +0,0 @@
-#lang web-server/insta
-
-(require "model-2.rkt")
-
-;; start: request -> doesn't return
-;; Consumes a request and produces a page that displays
-;; all of the web content.
-(define (start request)  
-  (render-blog-page 
-   (initialize-blog! 
-    (build-path (current-directory)
-                "the-blog-data.db"))
-   request))
-
-;; render-blog-page: blog request -> doesn't return
-;; Produces an HTML page of the content of the
-;; blog.
-(define (render-blog-page a-blog request)
-  (local [(define (response-generator embed/url) 
-            (response/xexpr
-             `(html (head (title "My Blog"))
-                    (body 
-                     (h1 "My Blog")
-                     ,(render-posts a-blog embed/url)
-                     (form ((action 
-                             ,(embed/url insert-post-handler)))
-                           (input ((name "title")))
-                           (input ((name "body")))
-                           (input ((type "submit"))))))))          
-          
-          (define (insert-post-handler request)
-            (define bindings (request-bindings request))
-            (blog-insert-post! 
-             a-blog
-             (extract-binding/single 'title bindings)
-             (extract-binding/single 'body bindings))
-            (render-blog-page a-blog (redirect/get)))]
-
-    (send/suspend/dispatch response-generator)))
-
-;; render-post-detail-page: post request -> doesn't return
-;; Consumes a post and produces a detail page of the post.
-;; The user will be able to either insert new comments
-;; or go back to render-blog-page.
-(define (render-post-detail-page a-blog a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Post Details"))
-                    (body
-                     (h1 "Post Details")
-                     (h2 ,(post-title a-post))
-                     (p ,(post-body a-post))
-                     ,(render-as-itemized-list 
-                       (post-comments a-post))
-                     (form ((action 
-                             ,(embed/url insert-comment-handler)))
-                           (input ((name "comment")))
-                           (input ((type "submit"))))
-                     (a ((href ,(embed/url back-handler)))
-                        "Back to the blog")))))
-          
-          (define (parse-comment bindings)
-            (extract-binding/single 'comment bindings))
-          
-          (define (insert-comment-handler request)
-            (render-confirm-add-comment-page
-             a-blog
-             (parse-comment (request-bindings request))
-             a-post
-             request))
-
-          (define (back-handler request)
-            (render-blog-page a-blog request))]
-
-    (send/suspend/dispatch response-generator)))
-
-;; render-confirm-add-comment-page :
-;; blog comment post request -> doesn't return
-;; Consumes a comment that we intend to add to a post, as well
-;; as the request. If the user follows through, adds a comment 
-;; and goes back to the display page. Otherwise, goes back to 
-;; the detail page of the post.
-(define (render-confirm-add-comment-page a-blog a-comment
-                                         a-post request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Add a Comment"))
-                    (body
-                     (h1 "Add a Comment")
-                     "The comment: " (div (p ,a-comment))
-                     "will be added to "                    
-                     (div ,(post-title a-post))
-                     
-                     (p (a ((href ,(embed/url yes-handler)))
-                           "Yes, add the comment."))
-                     (p (a ((href ,(embed/url cancel-handler)))
-                           "No, I changed my mind!"))))))
-          
-          (define (yes-handler request)
-            (post-insert-comment! a-blog a-post a-comment)
-            (render-post-detail-page a-blog a-post (redirect/get)))
-          
-          (define (cancel-handler request)
-            (render-post-detail-page a-blog a-post request))]
-
-    (send/suspend/dispatch response-generator)))
-
-;; render-post: post (handler -> string) -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-;; The fragment contains a link to show a detailed view of the post.
-(define (render-post a-blog a-post embed/url)
-  (local [(define (view-post-handler request)
-            (render-post-detail-page a-blog a-post request))]
-    `(div ((class "post")) 
-          (a ((href ,(embed/url view-post-handler)))
-             ,(post-title a-post))
-          (p ,(post-body a-post))        
-          (div ,(number->string (length (post-comments a-post)))
-               " comment(s)"))))
-
-;; render-posts: blog (handler -> string) -> xexpr
-;; Consumes a embed/url, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts a-blog embed/url)
-  (local [(define (render-post/embed/url a-post)
-            (render-post a-blog a-post embed/url))]
-    `(div ((class "posts"))
-          ,@(map render-post/embed/url (blog-posts a-blog)))))
-
-;; render-as-itemized-list: (listof xexpr) -> xexpr
-;; Consumes a list of items, and produces a rendering as
-;; an unorderered list.
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-;; render-as-item: xexpr -> xexpr
-;; Consumes an xexpr, and produces a rendering
-;; as a list item.
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-9s.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-9s.rkt
deleted file mode 100644
index b8fe24fa29..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/iteration-9s.rkt
+++ /dev/null
@@ -1,142 +0,0 @@
-#lang web-server
-
-(require "model-2.rkt")
-
-;; start: request -> doesn't return
-;; Consumes a request and produces a page that displays
-;; all of the web content.
-(define (start request)  
-  (render-blog-page 
-   (initialize-blog! 
-    (build-path (current-directory)
-                "the-blog-data.db"))
-   request))
-
-;; render-blog-page: blog request -> doesn't return
-;; Sends an HTML page of the content of the
-;; blog.
-(define (render-blog-page a-blog request)
-  (define (response-generator embed/url) 
-    (response/xexpr
-     `(html (head (title "My Blog"))
-            (body 
-             (h1 "My Blog")
-             ,(render-posts a-blog embed/url)
-             (form ((action 
-                     ,(embed/url insert-post-handler)))
-                   (input ((name "title")))
-                   (input ((name "body")))
-                   (input ((type "submit"))))))))
-  
-  (define (insert-post-handler request)
-    (define bindings (request-bindings/raw request))
-    (blog-insert-post! 
-     a-blog
-     (bytes->string/utf-8 (bindings-assq #"title" bindings))
-     (bytes->string/utf-8 (bindings-assq #"body" bindings)))
-    (render-blog-page a-blog (redirect/get)))
-  
-  (send/suspend/dispatch response-generator))
-
-;; render-post-detail-page: post request -> doesn't return
-;; Consumes a post and produces a detail page of the post.
-;; The user will be able to either insert new comments
-;; or go back to render-blog-page.
-(define (render-post-detail-page a-blog a-post request)
-  (define (response-generator embed/url)
-    (response/xexpr
-     `(html (head (title "Post Details"))
-            (body
-             (h1 "Post Details")
-             (h2 ,(post-title a-post))
-             (p ,(post-body a-post))
-             ,(render-as-itemized-list 
-               (post-comments a-post))
-             (form ((action 
-                     ,(embed/url insert-comment-handler)))
-                   (input ((name "comment")))
-                   (input ((type "submit"))))
-             (a ((href ,(embed/url back-handler)))
-                "Back to the blog")))))
-  
-  (define (parse-comment bindings)
-    (bytes->string/utf-8 (bindings-assq #"comment" bindings)))
-  
-  (define (insert-comment-handler request)
-    (render-confirm-add-comment-page
-     a-blog
-     (parse-comment (request-bindings/raw request))
-     a-post
-     request))
-  
-  (define (back-handler request)
-    (render-blog-page a-blog request))
-  
-  (send/suspend/dispatch response-generator))
-
-;; render-confirm-add-comment-page :
-;; blog comment post request -> doesn't return
-;; Consumes a comment that we intend to add to a post, as well
-;; as the request. If the user follows through, adds a comment 
-;; and goes back to the display page. Otherwise, goes back to 
-;; the detail page of the post.
-(define (render-confirm-add-comment-page a-blog a-comment
-                                         a-post request)
-  (define (response-generator embed/url)
-    (response/xexpr
-     `(html (head (title "Add a Comment"))
-            (body
-             (h1 "Add a Comment")
-             "The comment: " (div (p ,a-comment))
-             "will be added to "                    
-             (div ,(post-title a-post))
-             
-             (p (a ((href ,(embed/url yes-handler)))
-                   "Yes, add the comment."))
-             (p (a ((href ,(embed/url cancel-handler)))
-                   "No, I changed my mind!"))))))
-  
-  (define (yes-handler request)
-    (post-insert-comment! a-blog a-post a-comment)
-    (render-post-detail-page a-blog a-post (redirect/get)))
-  
-  (define (cancel-handler request)
-    (render-post-detail-page a-blog a-post request))
-  
-  (send/suspend/dispatch response-generator))
-
-;; render-post: post (handler -> string) -> xexpr
-;; Consumes a post, produces an xexpr fragment of the post.
-;; The fragment contains a link to show a detailed view of the post.
-(define (render-post a-blog a-post embed/url)
-  (define (view-post-handler request)
-    (render-post-detail-page a-blog a-post request))
-  
-  `(div ((class "post")) 
-        (a ((href ,(embed/url view-post-handler)))
-           ,(post-title a-post))
-        (p ,(post-body a-post))        
-        (div ,(number->string (length (post-comments a-post)))
-             " comment(s)")))
-
-;; render-posts: blog (handler -> string) -> xexpr
-;; Consumes a embed/url, produces an xexpr fragment
-;; of all its posts.
-(define (render-posts a-blog embed/url)
-  (define (render-post/embed/url a-post)
-    (render-post a-blog a-post embed/url))
-  
-  `(div ((class "posts"))
-        ,@(map render-post/embed/url (blog-posts a-blog))))
-
-;; render-as-itemized-list: (listof xexpr) -> xexpr
-;; Consumes a list of items, and produces a rendering as
-;; an unorderered list.
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-;; render-as-item: xexpr -> xexpr
-;; Consumes an xexpr, and produces a rendering
-;; as a list item.
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/model-2.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/model-2.rkt
deleted file mode 100644
index 3b8ae09d85..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/model-2.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-(require racket/local
-         racket/list)
-
-;; A blog is a (blog home posts)
-;; where home is a string, posts is a (listof post)
-(struct blog (home posts) #:mutable #:prefab)
-
-;; and post is a (post blog title body comments)
-;; where title is a string, body is a string,
-;; and comments is a (listof string)
-(struct post (title body comments) #:mutable #:prefab)
-
-;; initialize-blog! : path? -> blog
-;; Reads a blog from a path, if not present, returns default
-(define (initialize-blog! home)
-  (local [(define (log-missing-exn-handler exn)
-            (blog
-             (path->string home)
-             (list (post "Second Post"
-                         "This is another post"
-                         (list))
-                   (post "First Post"
-                         "This is my first post"
-                         (list "First comment!")))))
-          (define the-blog
-            (with-handlers ([exn? log-missing-exn-handler])
-              (with-input-from-file home read)))]
-    (set-blog-home! the-blog (path->string home))
-    the-blog))
-
-;; save-blog! : blog -> void
-;; Saves the contents of a blog to its home
-(define (save-blog! a-blog)
-  (local [(define (write-to-blog)
-            (write a-blog))]
-    (with-output-to-file (blog-home a-blog) 
-      write-to-blog
-      #:exists 'replace)))
-
-;; blog-insert-post!: blog string string -> void
-;; Consumes a blog and a post, adds the post at the top of the blog.
-(define (blog-insert-post! a-blog title body)
-  (set-blog-posts! 
-   a-blog
-   (cons (post title body empty) (blog-posts a-blog)))
-  (save-blog! a-blog))
-
-;; post-insert-comment!: blog post string -> void
-;; Consumes a blog, a post and a comment string.  As a side-efect, 
-;; adds the comment to the bottom of the post's list of comments.
-(define (post-insert-comment! a-blog a-post a-comment)
-  (set-post-comments!
-   a-post
-   (append (post-comments a-post) (list a-comment)))
-  (save-blog! a-blog))
-
-(provide blog? blog-posts
-         post? post-title post-body post-comments
-         initialize-blog!
-         blog-insert-post! post-insert-comment!)
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/model-3.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/model-3.rkt
deleted file mode 100644
index c244db796c..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/model-3.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/local
-         db)
-
-;; A blog is a (blog db)
-;; where db is an sqlite connection
-(struct blog (db))
-
-;; A post is a (post blog id)
-;; where blog is a blog and id is an integer?
-(struct post (blog id))
-
-;; initialize-blog! : path? -> blog?
-;; Sets up a blog database (if it doesn't exist)
-(define (initialize-blog! home)
-  (define db (sqlite3-connect #:database home #:mode 'create))
-  (define the-blog (blog db))
-  (unless (table-exists? db "posts")
-    (query-exec db
-     (string-append
-      "CREATE TABLE posts "
-      "(id INTEGER PRIMARY KEY, title TEXT, body TEXT)"))
-    (blog-insert-post!
-     the-blog "First Post" "This is my first post")
-    (blog-insert-post!
-     the-blog "Second Post" "This is another post"))
-  (unless (table-exists? db "comments")
-    (query-exec db
-     "CREATE TABLE comments (pid INTEGER, content TEXT)")
-    (post-insert-comment!
-     the-blog (first (blog-posts the-blog))
-     "First comment!"))
-  the-blog)
-
-;; blog-posts : blog -> (listof post?)
-;; Queries for the post ids
-(define (blog-posts a-blog)
-  (local [(define (id->post an-id)
-            (post a-blog an-id))]
-    (map id->post
-         (query-list
-          (blog-db a-blog)
-          "SELECT id FROM posts"))))
-
-;; post-title : post -> string?
-;; Queries for the title
-(define (post-title a-post)
-  (query-value
-   (blog-db (post-blog a-post))
-   "SELECT title FROM posts WHERE id = ?"
-   (post-id a-post)))
-
-;; post-body : post -> string?
-;; Queries for the body
-(define (post-body p)
-  (query-value
-   (blog-db (post-blog p))
-   "SELECT body FROM posts WHERE id = ?"
-   (post-id p)))
-
-;; post-comments : post -> (listof string?)
-;; Queries for the comments
-(define (post-comments p)
-  (query-list
-   (blog-db (post-blog p))
-   "SELECT content FROM comments WHERE pid = ?"
-   (post-id p)))
-
-;; blog-insert-post!: blog? string? string? -> void
-;; Consumes a blog and a post, adds the post at the top of the blog.
-(define (blog-insert-post! a-blog title body)
-  (query-exec
-   (blog-db a-blog)
-   "INSERT INTO posts (title, body) VALUES (?, ?)"
-   title body))
-
-;; post-insert-comment!: blog? post string -> void
-;; Consumes a blog, a post and a comment string.  As a side-efect, 
-;; adds the comment to the bottom of the post's list of comments.
-(define (post-insert-comment! a-blog p a-comment)
-  (query-exec
-   (blog-db a-blog)
-   "INSERT INTO comments (pid, content) VALUES (?, ?)"
-   (post-id p) a-comment))
-
-(provide blog? blog-posts
-         post? post-title post-body post-comments
-         initialize-blog!
-         blog-insert-post! post-insert-comment!)
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/model.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/model.rkt
deleted file mode 100644
index 6d80d31f2a..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/model.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket/base
-
-;; A blog is a (blog posts)
-;; where posts is a (listof post)
-(struct blog (posts) #:mutable)
-
-;; and post is a (post title body comments)
-;; where title is a string, body is a string, 
-;; and comments is a (listof string)
-(struct post (title body comments) #:mutable)
-
-;; BLOG: blog
-;; The initial BLOG.
-(define BLOG 
-  (blog
-   (list (post "Second Post" 
-               "This is another post"
-               (list))
-         (post "First Post" 
-               "This is my first post" 
-               (list "First comment!")))))
-
-;; blog-insert-post!: blog post -> void
-;; Consumes a blog and a post, adds the post at the top of the blog.
-(define (blog-insert-post! a-blog a-post)
-  (set-blog-posts! 
-   a-blog
-   (cons a-post (blog-posts a-blog))))
-
-;; post-insert-comment!: post string -> void
-;; Consumes a post and a comment string.  As a side-efect, 
-;; adds the comment to the bottom of the post's list of comments.
-(define (post-insert-comment! a-post a-comment)
-  (set-post-comments!
-   a-post
-   (append (post-comments a-post) (list a-comment))))
-
-(provide (all-defined-out))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/no-use-redirect.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/no-use-redirect.rkt
deleted file mode 100644
index c3641c447f..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/no-use-redirect.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang web-server/insta
-
-;; A roster is a (roster names)
-;; where names is a list of string.
-(struct roster (names) #:mutable)
-
-;; roster-add-name!: roster string -> void
-;; Given a roster and a name, adds the name
-;; to the end of the roster.
-(define (roster-add-name! a-roster a-name)
-  (set-roster-names! a-roster 
-                    (append (roster-names a-roster)
-                            (list a-name))))
-
-(define ROSTER (roster '("kathi" "shriram" "dan")))
-
-;; start: request -> doesn't return
-(define (start request)
-  (show-roster request))
-
-;; show-roster: request -> doesn't return
-(define (show-roster request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Roster"))
-                    (body (h1 "Roster")
-                          ,(render-as-itemized-list
-                            (roster-names ROSTER))
-                          (form ((action
-                                  ,(embed/url add-name-handler)))
-                                (input ((name "a-name")))
-                                (input ((type "submit"))))))))
-          (define (parse-name bindings)
-            (extract-binding/single 'a-name bindings))
-            
-          (define (add-name-handler request)
-            (roster-add-name!
-             ROSTER (parse-name (request-bindings request)))
-            (show-roster request))]
-    (send/suspend/dispatch response-generator))) 
-
-;; render-as-itemized-list: (listof xexpr) -> xexpr
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-;; render-as-item: xexpr -> xexpr
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/send-suspend-1.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/send-suspend-1.rkt
deleted file mode 100644
index 460cc6905c..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/send-suspend-1.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang web-server/insta
-
-;; start: request -> response
-(define (start request)
-  (send/suspend/dispatch
-   (lambda (embed/url)
-     (response/xexpr
-      `(html 
-        (body 
-         (a ((href ,(embed/url link-1))) "Link 1")
-         (a ((href ,(embed/url link-2))) "Link 2")))))))
-
-
-;; link-1: request -> response
-(define (link-1 request)
-  (response/xexpr
-   "This is link-1"))
-
-
-;; link-2: request -> response
-(define (link-2 request)
-  (response/xexpr
-   "This is link-2"))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/send-suspend-2.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/send-suspend-2.rkt
deleted file mode 100644
index 8b538c8f76..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/send-suspend-2.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang web-server/insta
-
-(define (start request)
-  (show-counter 0))
-
-;; show-counter: number -> doesn't return
-(define (show-counter n)
-  (send/suspend/dispatch
-   (lambda (embed/url)
-     (response/xexpr
-      `(html (head (title "Counting example"))
-             (body 
-              (a ((href ,(embed/url 
-                          (lambda (request)
-                            (show-counter (+ n 1))))))
-                 ,(number->string n))))))))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/test-static.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/test-static.rkt
deleted file mode 100644
index d43ef02c3f..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/test-static.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang web-server/insta
-(define (start request)
-  (response/xexpr
-   '(html (head (title "Testing")
-                (link ((rel "stylesheet")
-                       (href "/test-static.css")
-                       (type "text/css"))))          
-          (body (h1 "This is a header")
-                (p "This is " (span ((class "hot")) "hot") ".")))))
-(static-files-path "htdocs")
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/use-redirect.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/use-redirect.rkt
deleted file mode 100644
index d2847bc4c1..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/examples/use-redirect.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang web-server/insta
-
-;; A roster is a (roster names)
-;; where names is a list of string.
-(struct roster (names) #:mutable)
-
-;; roster-add-name!: roster string -> void
-;; Given a roster and a name, adds the name
-;; to the end of the roster.
-(define (roster-add-name! a-roster a-name)
-  (set-roster-names! a-roster 
-                    (append (roster-names a-roster)
-                            (list a-name))))
-
-(define ROSTER (roster '("kathi" "shriram" "dan")))
-
-;; start: request -> doesn't return
-(define (start request)
-  (show-roster request))
-
-;; show-roster: request -> doesn't return
-(define (show-roster request)
-  (local [(define (response-generator embed/url)
-            (response/xexpr
-             `(html (head (title "Roster"))
-                    (body (h1 "Roster")
-                          ,(render-as-itemized-list
-                            (roster-names ROSTER))
-                          (form ((action
-                                  ,(embed/url add-name-handler)))
-                                (input ((name "a-name")))
-                                (input ((type "submit"))))))))
-          (define (parse-name bindings)
-            (extract-binding/single 'a-name bindings))
-            
-          (define (add-name-handler request)
-            (roster-add-name!
-             ROSTER (parse-name (request-bindings request)))
-            (show-roster (redirect/get)))]
-    (send/suspend/dispatch response-generator))) 
-
-;; render-as-itemized-list: (listof xexpr) -> xexpr
-(define (render-as-itemized-list fragments)
-  `(ul ,@(map render-as-item fragments)))
-
-;; render-as-item: xexpr -> xexpr
-(define (render-as-item a-fragment)
-  `(li ,a-fragment))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow1.dia b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow1.dia
deleted file mode 100644
index e16536fda7..0000000000
Binary files a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow1.dia and /dev/null differ
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow1.png b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow1.png
deleted file mode 100644
index c5c94e7436..0000000000
Binary files a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow1.png and /dev/null differ
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow2.dia b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow2.dia
deleted file mode 100644
index eed3017cae..0000000000
Binary files a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow2.dia and /dev/null differ
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow2.png b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow2.png
deleted file mode 100644
index 7ce92ebf56..0000000000
Binary files a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow2.png and /dev/null differ
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow3.dia b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow3.dia
deleted file mode 100644
index eb1275a316..0000000000
Binary files a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow3.dia and /dev/null differ
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow3.png b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow3.png
deleted file mode 100644
index ea285136ca..0000000000
Binary files a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/images/flow3.png and /dev/null differ
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/tutorial-util.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/tutorial-util.rkt
deleted file mode 100644
index 2575376ee0..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/tutorial/tutorial-util.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require scribble/basic
-         (for-syntax racket/base
-                     racket/port)
-         racket/include
-         (except-in scribble/manual link))
-(provide external-file)
-
-; Copied from guide/scribblings/contracts-utils
-(require (for-syntax (only-in scribble/comment-reader [read-syntax comment-reader])))
-(define-for-syntax (comment-racketmod-reader path port)
-  (let ([pb (peek-byte port)])
-    (if (eof-object? pb)
-        pb
-        (let ([m (regexp-match #rx"^#lang " port)])
-          (unless m
-            (raise-syntax-error 'comment-racket-reader "expected a #lang to begin file ~s" path))
-          (let ([np (let-values ([(line col pos) (port-next-location port)])
-                      (relocate-input-port port line 0 pos))])
-            (port-count-lines! np)
-            (let loop ([objects '()])
-              (let ([next (comment-reader path np)])
-                (cond
-                  [(eof-object? next)
-                   #`(racketmod #,@(reverse objects))]
-                  [else
-                   (loop (cons next objects))]))))))))
-
-(define-syntax (external-file stx)
-  (syntax-case stx ()
-    [(_ filename)
-     #`(include/reader #,(format "examples/~a" (syntax-e #'filename))
-                       comment-racketmod-reader)]))
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/url-param.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/url-param.scrbl
deleted file mode 100644
index 435ceedceb..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/url-param.scrbl
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "url-param"]{URL Param}
-@(require (for-label web-server/private/url-param
-                     net/url))
-
-@defmodule[web-server/private/url-param]{
-
-The @web-server needs to encode information in URLs. If this data
-is stored in the query string, than it will be overridden by browsers that
-make GET requests to those URLs with more query data. So, it must be encoded
-in URL params. This module provides functions for helping
-with this process.
-
-@defproc[(insert-param [u url?]
-                       [k string?]
-                       [v string?])
-         url?]{
- Associates @racket[k] with @racket[v] in the final URL param of @racket[u],
- overwritting any current binding for @racket[k].
-}
-
-@defproc[(extract-param [u url?]
-                        [k string?])
-         (or/c string? false/c)]{
- Extracts the string associated with @racket[k] in the final URL param of
- @racket[u], if there is one, returning @racket[#f] otherwise.
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-cells.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-cells.scrbl
deleted file mode 100644
index 8c4bcc7c42..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-cells.scrbl
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "web-cells"]{Web Cells}
-@(require (for-label web-server/http
-                     web-server/servlet/web-cells
-                     web-server/servlet/web))
-
-@defmodule[web-server/servlet/web-cells]{The
-@racketmodname[web-server/servlet/web-cells] library provides the
-interface to Web cells.
-
-A Web cell is a kind of state defined relative to the @defterm{frame tree}.
-The frame-tree is a mirror of the user's browsing session. Every time a
-continuation is invoked, a new frame (called the @defterm{current frame}) is
-created as a child of the current frame when the continuation was captured.
-
-You should use Web cells if you want an effect to be encapsulated in all
-interactions linked from (in a transitive sense) the HTTP response being
-generated. For more information on their semantics, consult the paper 
-@href-link["http://www.cs.brown.edu/~sk/Publications/Papers/Published/mk-int-safe-state-web/"
-"\"Interaction-Safe State for the Web\""].
-
-@defproc[(web-cell? [v any/c])
-         boolean?]{
- Determines if @racket[v] is a web-cell.
-}
-
-@defproc[(make-web-cell [v any/c])
-         web-cell?]{
- Creates a web-cell with a default value of @racket[v].
-}
-
-@defproc[(web-cell-ref [wc web-cell?])
-         any/c]{
- Looks up the value of @racket[wc] found in the nearest
- frame.
-}
-
-@defproc[(web-cell-shadow [wc web-cell?]
-                          [v any/c])
-         void]{
- Binds @racket[wc] to @racket[v] in the current frame, shadowing any
- other bindings to @racket[wc] in the current frame.
-}
-              
-Below is an extended example that demonstrates how Web cells allow
-the creation of reusable Web abstractions without requiring global
-transformations of the program into continuation or store passing style.
-@racketmod[
- web-server/insta
-
- (define (start initial-request)
-   (define counter1 (make-counter))
-   (define counter2 (make-counter))
-   (define include1 (include-counter counter1))
-   (define include2 (include-counter counter2))
-   (send/suspend/dispatch
-    (lambda (embed/url)
-      (response/xexpr
-       `(html
-         (body (h2 "Double Counters")
-               (div (h3 "First")
-                    ,(include1 embed/url))
-               (div (h3 "Second")
-                    ,(include2 embed/url))))))))
-
-(define (make-counter)
-  (make-web-cell 0))
-
-(define (include-counter a-counter)
-  (call-with-current-continuation
-   (λ (k)
-     (let loop ()
-       (k
-        (lambda (embed/url)
-          `(div (h3 ,(number->string (web-cell-ref a-counter)))
-                (a ([href
-                     ,(embed/url
-                       (lambda _
-                         ; A new frame has been created
-                         (define last (web-cell-ref a-counter))
-                         ; We can inspect the value at the parent
-                         (web-cell-shadow a-counter (add1 last))
-                         ; The new frame has been modified
-                         (loop)))])
-                   "+"))))))
-   servlet-prompt))
-]
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-config-unit.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-config-unit.scrbl
deleted file mode 100644
index c657139e3a..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-config-unit.scrbl
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "web-config-unit" #:tag-prefix "web-config"]{Configuration Units}
-@(require (for-label web-server/web-config-unit
-                     web-server/configuration/namespace
-                     web-server/configuration/configuration-table
-                     web-server/configuration/configuration-table-structs
-                     web-server/private/util
-                     web-server/servlet/setup
-                     racket/tcp
-                     (prefix-in servlets: web-server/dispatchers/dispatch-servlets)
-                     web-server/web-config-sig))
-
-@section[#:style 'hidden]{Signature}
-
-@defmodule[web-server/web-config-sig]{
-
-@defsignature[web-config^ ()]{
-
-@signature-desc{
-Provides contains the following identifiers.
-}
-
-@defthing[max-waiting exact-nonnegative-integer?]{
- Passed to @racket[tcp-accept].
-}
-
-@defthing[virtual-hosts (string? . -> . host?)]{
- Contains the configuration of individual virtual hosts.
-}
-
-@defthing[initial-connection-timeout integer?]{
- Specifies the initial timeout given to a connection.
-}
-
-@defthing[port port-number?]{
- Specifies the port to serve HTTP on.
-}
-
-@defthing[listen-ip (or/c false/c string?)]{
- Passed to @racket[tcp-listen].
-}
-
-@defthing[make-servlet-namespace make-servlet-namespace/c]{
- Passed to @racket[servlets:make] through @racket[make-default-path->servlet].
-}
-}
-             
-}
-
-@section[#:style 'hidden]{Unit}
-
-@defmodule[web-server/web-config-unit]{
-
-@defproc[(configuration-table->web-config@ [path path-string?]
-                                           [#:port port (or/c false/c port-number?) #f]
-                                           [#:listen-ip listen-ip (or/c false/c string?) #f]
-                                           [#:make-servlet-namespace make-servlet-namespace make-servlet-namespace/c (make-make-servlet-namespace)])
-         (unit/c (import) (export web-config^))]{
- Reads the S-expression at @racket[path] and calls
- @racket[configuration-table-sexpr->web-config@] appropriately.
-}
-
-@defproc[(configuration-table-sexpr->web-config@ [sexpr list?]
-                                                 [#:web-server-root web-server-root path-string?
-                                                                    (directory-part default-configuration-table-path)]
-                                                 [#:port port (or/c false/c port-number?) #f]
-                                                 [#:listen-ip listen-ip (or/c false/c string?) #f]
-                                                 [#:make-servlet-namespace make-servlet-namespace make-servlet-namespace/c
-                                                                           (make-make-servlet-namespace)])
-         (unit/c (import) (export web-config^))]{
- Parses @racket[sexpr] as a configuration-table and constructs a @racket[web-config^] unit.
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-config.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-config.scrbl
deleted file mode 100644
index 8228483129..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-config.scrbl
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt"
-          (for-label web-server/web-server-unit
-                     web-server/web-server-sig
-                     web-server/web-config-unit
-                     web-server/web-config-sig
-                     web-server/configuration/configuration-table))
-
-@title{Web Servers}
-
-A Web server is a unit with the @racket[web-server^] signature. The most common way to construct one is to provide a @racket[web-config^] unit to the
-@racket[web-server@] unit. The most common way to construct a @racket[web-config^] unit is to use @racket[configuration-table->web-config@] to produce
-one from a configuration table file, such as the one that is shipped with Racket in @racket[default-configuration-table-path].
-
-@include-section["web-server-unit.scrbl"]
-@include-section["web-config-unit.scrbl"]
-@include-section["ctable.scrbl"]
-@include-section["ctable-structs.scrbl"]
-@include-section["responders.scrbl"]
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-param.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-param.scrbl
deleted file mode 100644
index d14b1bc058..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-param.scrbl
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "lang/web-param"]{Stateless Web Parameters}
-@(require (for-label web-server/lang/web-param))
-
-@defmodule[web-server/lang/web-param]{
-
-It is not easy to use @racket[parameterize] in the
-Web Language. This module provides (roughly) the same
-functionality in a way that is serializable. Like other serializable
-things in the Web Language, they are sensitive to source code modification.
-
-@defform[(make-web-parameter default)]{
- Expands to the definition of a web-parameter with
- @racket[default] as the default value. A web-parameter is
- a procedure that, when called with zero arguments, returns @racket[default]
- or the last value @racket[web-parameterize]d in the dynamic context
- of the call.
-}
-
-@defproc[(web-parameter? [v any/c])
-         boolean?]{
- Checks if @racket[v] appears to be a web-parameter.
-}
-
-@defform[(web-parameterize ([web-parameter-expr value-expr] ...) expr ...)]{
- Runs @racket[(begin expr ...)] such that the web-parameters that
- the @racket[web-parameter-expr]s evaluate to are bound to the @racket[value-expr]s.
- From the perspective of the @racket[value-expr]s, this is like @racket[let].
-}
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server-internal.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server-internal.scrbl
deleted file mode 100644
index c425837a5e..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server-internal.scrbl
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "web-server-ref-internal"]{Web Server: HTTP Server}
-
-@author{Jay McCarthy}
-
-This manual describes the internals of the Racket Web Server.
-
-@local-table-of-contents[]
-
-@include-section["dispatch-server.scrbl"]
-@include-section["dispatchers.scrbl"]
-@include-section["launch.scrbl"]
-@include-section["web-config.scrbl"]
-@include-section["private.scrbl"]
-@include-section["server-faq.scrbl"]
-
-@index-section[]
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server-unit.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server-unit.scrbl
deleted file mode 100644
index d40e501ed9..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server-unit.scrbl
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "web-server-unit"]{Server Units}
-@(require (for-label web-server/web-server-sig
-                     web-server/web-server-unit
-                     net/tcp-sig
-                     web-server/dispatchers/dispatch
-                     web-server/web-config-sig
-                     web-server/web-config-unit))
-
-@section[#:tag "ws-sig" #:style 'hidden]{Signature}
-
-@defmodule[web-server/web-server-sig]{
-
-@defsignature[web-server^ ()]{
-
- @defproc[(serve) (-> void)]{
-  Runs the server and returns a procedure that shuts down the server.
- }
-
- @defproc[(serve-ports [ip input-port?]
-                       [op output-port?])
-          void]{
- Serves a single connection represented by the ports @racket[ip] and
- @racket[op].
- }
-}
-
-}
-
-@section[#:tag "ws-unit" #:style 'hidden]{Unit}
-
-@defmodule[web-server/web-server-unit]{
-
-@defthing[web-server@ (unit/c (web-config^ tcp^)
-                              (web-server^))]{
-
-Uses the @racket[web-config^] to construct a @racket[dispatcher/c]
-function that sets up one virtual host dispatcher, for each virtual
-host in the @racket[web-config^], that sequences the following
-operations:
-
-@itemize[
- @item{Logs the incoming request with the given format to the given file}
- @item{Performs HTTP Basic Authentication with the given password file}
- @item{Allows the @racket["/conf/refresh-passwords"] URL to refresh the password file.}
- @item{Allows the @racket["/conf/collect-garbage"] URL to call the garbage collector.}
- @item{Allows the @racket["/conf/refresh-servlets"] URL to refresh the servlets cache.}
- @item{Executes servlets mapping URLs to the given servlet root directory under htdocs.}
- @item{Serves files under the @racket["/"] URL in the given htdocs directory.}
-]
-
-Using this @racket[dispatcher/c], it loads a dispatching server that provides @racket[serve]
-and @racket[serve-ports] functions that operate as expected.
-}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server.rkt b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server.rkt
deleted file mode 100644
index bd5345dc68..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-(require scribble/manual
-         scribble/eval
-         (for-syntax racket/base)
-         (for-label racket/base
-                    racket/contract
-                    racket/unit))
-
-(define web-server "Web Server")
-
-(define (warning . x)
-  (apply elem (bold "Warning: ") x))
-
-(define (href-link url label)
-  (link url label))
-
-(define-syntax (a-dispatcher stx)
-  (syntax-case stx ()
-   [(_ lib-name lib-desc . rest)
-    ;; This macro plays a standard trick for limiting the scope of
-    ;; `require'd bindings: it puts the require and the scope of the
-    ;; require into a macro, which introduces both together
-    #'(begin
-       (define-syntax-rule (intro)
-         ((... ...)
-          (begin
-            (require (for-label lib-name))
-            (defmodule lib-name
-                       "The " (racketmodname lib-name) " module " lib-desc)
-            . rest)))
-       (intro))]))
-
-(provide (all-from-out scribble/manual)
-         (all-from-out scribble/eval)
-         (for-label (all-from-out racket/base
-                                  racket/contract
-                                  racket/unit))
-         a-dispatcher
-         web-server
-         warning
-         href-link)
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server.scrbl
deleted file mode 100644
index 11c610c5c3..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web-server.scrbl
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "web-server-ref"]{Web Applications in Racket}
-
-@author{Jay McCarthy}
-
-This manual describes the Racket libraries for building Web applications.
-
-@secref["run"] describes how to run the servlets you've written. 
-
-@secref["servlet"] and @secref["stateless"] describe two ways to write Web applications. 
-@secref["servlet"] use the entire Racket language, but their continuations are stored in the Web server's memory.
-@secref["stateless"] use a slightly restricted Racket language, but their continuation can be stored by the Web client or on a Web server's disk. If you can, you want to use @secref["stateless"] for the improved scalability.
-
-The @secref["http"] section describes the common library functions for manipulating HTTP requests and creating HTTP responses.
-In particular, this section covers cookies, authentication, and request bindings.
-
-The final five sections (@secref["dispatch"], @secref["formlets"], @secref["templates"], @secref["page"], and @secref["test"]) cover utility libraries that ease the creation of typical Web applications.
-
-This manual closes with a frequently asked questions section: @secref["faq"].
-
-@local-table-of-contents[]
-
-@include-section["running.scrbl"]
-
-@include-section["servlet.scrbl"]
-@include-section["lang-api.scrbl"]
-
-@include-section["http.scrbl"]
-
-@include-section["dispatch.scrbl"]
-@include-section["formlets.scrbl"]
-@include-section["templates.scrbl"]
-@include-section["page.scrbl"]
-
-@include-section["test.scrbl"]
-
-@include-section["faq.scrbl"]
-
-@index-section[]
diff --git a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web.scrbl b/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web.scrbl
deleted file mode 100644
index 2a960f6db7..0000000000
--- a/pkgs/web-server-pkgs/web-server-doc/web-server/scribblings/web.scrbl
+++ /dev/null
@@ -1,218 +0,0 @@
-#lang scribble/doc
-@(require "web-server.rkt")
-
-@title[#:tag "web"]{Web Interaction}
-@(require (for-label web-server/servlet/web
-                     web-server/servlet/servlet-structs
-                     web-server/http
-                     racket/list
-                     net/url))
-
-@defmodule[web-server/servlet/web]{The
-@racketmodname[web-server/servlet/web] library provides the primary
-functions of interest for the servlet developer.
-
-@defproc[(send/back [response can-be-response?])
-         void?]{
- Sends @racket[response] to the client. No continuation is captured, so the servlet is done.
-       
- Example:
- @racketblock[
-  (send/back
-   (response/xexpr
-    `(html
-      (body
-       (h1 "The sum is: "
-           ,(+ first-number
-               second-number))))))
- ]
-}
-
-@defproc[(send/suspend [make-response (string? . -> . can-be-response?)])
-         request?]{
- Captures the current continuation, stores it with @racket[exp] as the expiration
- handler, and binds it to a URL. @racket[make-response] is called with this URL and
- is expected to generate a @racket[can-be-response?], which is sent to the client. If the
- continuation URL is invoked, the captured continuation is invoked and the request is
- returned from this call to @racket[send/suspend].
- 
- Example:
- @racketblock[
-  (send/suspend
-   (lambda (k-url)
-     (response/xexpr
-      `(html (head (title "Enter a number"))
-             (body 
-              (form ([action ,k-url])
-                    "Enter a number: "
-                    (input ([name "number"]))
-                    (input ([type "submit"]))))))))
-  ]
- 
- When this form is submitted by the browser, the request will be sent to the URL generated by @racket[send/suspend].
- Thus, the request will be ``returned'' from @racket[send/suspend] to the continuation of this call.
-}
-                  
-@defproc[(send/suspend/url [make-response (url? . -> . can-be-response?)])
-         request?]{
- Like @racket[send/suspend] but with a URL struct.
-}
-                  
-@defproc[(send/suspend/dispatch [make-response (((request? . -> . any) . -> . string?) . -> . can-be-response?)])
-         any]{
- Calls @racket[make-response] with a function (often named @racket[embed/url]) that, when called with a procedure from
- @racket[request?] to @racket[any/c] will generate a URL, that when invoked will call
- the function with the @racket[request?] object and return the result to the caller of
- @racket[send/suspend/dispatch]. Therefore, if you pass @racket[embed/url] the identity function,
- @racket[send/suspend/dispatch] devolves into @racket[send/suspend]:
- 
- @racketblock[
-  (define (send/suspend response-generator)
-    (send/suspend/dispatch
-     (lambda (embed/url)
-       (response-generator (embed/url (lambda (x) x))))))
-  ]
- 
- Use @racket[send/suspend/dispatch] when there are multiple `logical' continuations of a page.
- For example, we could either add to a number or subtract from it:
- @racketblock[
-  (define (count-dot-com i)
-    (count-dot-com 
-     (send/suspend/dispatch
-      (lambda (embed/url)
-        (response/xexpr
-         `(html 
-           (head (title "Count!"))
-           (body
-            (h2 (a ([href
-                     ,(embed/url
-                       (lambda (req)
-                         (sub1 i)))])
-                   "-"))
-            (h1 ,(number->string i))
-            (h2 (a ([href
-                     ,(embed/url
-                       (lambda (req)
-                         (add1 i)))])
-                   "+")))))))))
-  ]
- Notice that in this example the result of the handlers are returned to the continuation of @racket[send/suspend/dispatch].
- However, it is very common that the return value of @racket[send/suspend/dispatch] is irrelevant in
- your application and you may think of it as ``embedding'' value-less callbacks. Here is the same example in this style:
- @racketblock[
-  (define (count-dot-com i)
-    (send/suspend/dispatch
-     (lambda (embed/url)
-       (response/xexpr
-        `(html 
-          (head (title "Count!"))
-          (body
-           (h2 (a ([href
-                    ,(embed/url
-                      (lambda (req)
-                        (count-dot-com (sub1 i))))])
-                  "-"))
-           (h1 ,(number->string i))
-           (h2 (a ([href
-                    ,(embed/url
-                      (lambda (req)
-                        (count-dot-com (add1 i))))])
-                  "+"))))))))
-  ]
-}
-             
-@defproc[(send/suspend/url/dispatch [make-response (((request? . -> . any) . -> . url?) . -> . can-be-response?)])
-         any]{
- Like @racket[send/suspend/dispatch], but with a URL struct.
-}
-
-@defproc[(send/forward [make-response (string? . -> . can-be-response?)])
-         request?]{
- Calls @racket[clear-continuation-table!], then @racket[send/suspend].
-       
- Use this if the user can logically go `forward' in your application, but cannot go backward.
-}
-
-@defproc[(send/finish [response can-be-response?])
-         void?]{
- Calls @racket[clear-continuation-table!], then @racket[send/back].
-       
- Use this if the user is truly `done' with your application. For example, it may be used to display the post-logout page:
- @racketblock[
-  (send/finish
-   (response/xexpr
-    `(html (head (title "Logged out"))
-           (body (p "Thank you for using the services "
-                    "of the Add Two Numbers, Inc.")))))
-  ]
-}
-
-@defproc[(redirect/get [#:headers hs (listof header?) empty])
-         request?]{
- Calls @racket[send/suspend] with @racket[redirect-to], passing @racket[hs] as the headers.
-       
- This implements the Post-Redirect-Get pattern. 
- Use this to prevent the @onscreen["Refresh"] button from duplicating effects, such as adding items to a database. 
-}
-
-@defproc[(redirect/get/forget [#:headers hs (listof header?) empty])
-         request?]{
- Calls @racket[send/forward] with @racket[redirect-to], passing @racket[hs] as the headers.
-}
-                  
-@defthing[current-servlet-continuation-expiration-handler 
-          (parameter/c (or/c false/c
-                             (request? . -> . can-be-response?)))]{
- Holds the expiration handler to be used when a continuation
- captured in this context is expired, then looked up.
- 
- Example:
- @racketblock[
-  (parameterize 
-      ([current-servlet-continuation-expiration-handler
-        (lambda (req)
-          (response/xexpr
-           `(html (head (title "Custom Expiration!")))))])
-    (send/suspend
-     ....))
-  ]               
-}
-
-@defproc[(clear-continuation-table!)
-         void?]{
- Calls the servlet's manager's @racket[clear-continuation-table!] function. Normally, this deletes all the previously
- captured continuations.
-}
-               
-@defproc[(with-errors-to-browser [send/finish-or-back (can-be-response? . -> . request?)]
-                                 [thunk (-> any)])
-         any]{
- Calls @racket[thunk] with an exception handler that generates an HTML error page
- and calls @racket[send/finish-or-back].
- 
- Example:
- @racketblock[
-  (with-errors-to-browser
-   send/back
-   (lambda ()
-     (/ 1 (get-number (request-number)))))
- ]
-}
-
-@defproc[(adjust-timeout! [t number?])
-         void?]{
- Calls the servlet's manager's @racket[adjust-timeout!] function.
-       
- @warning{This is deprecated and will be removed in a future release.}
-}
-                  
-@defproc[(continuation-url? [u url?])
-         (or/c false/c (list/c number? number? number?))]{
- Checks if @racket[u] is a URL that refers to a continuation, if so
- returns the instance id, continuation id, and nonce.
-}
-
-@defthing[servlet-prompt continuation-prompt-tag?]{
-  The tag used for Web interaction continuation capture.}
-
-}
diff --git a/pkgs/web-server-pkgs/web-server-lib/LICENSE.txt b/pkgs/web-server-pkgs/web-server-lib/LICENSE.txt
deleted file mode 100644
index b9b070f604..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-web-server-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/web-server-pkgs/web-server-lib/info.rkt b/pkgs/web-server-pkgs/web-server-lib/info.rkt
deleted file mode 100644
index 7b03648431..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/info.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("srfi-lite-lib"
-               "base"
-	       "net-lib"
-               "compatibility-lib"
-               "scribble-text-lib"
-               "unstable-list-lib"
-               "unstable-contract-lib"
-               "parser-tools-lib"))
-(define build-deps '("rackunit-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"web-server\"")
-
-(define pkg-authors '(jay))
diff --git a/pkgs/web-server-pkgs/web-server-lib/net/websocket.rkt b/pkgs/web-server-pkgs/web-server-lib/net/websocket.rkt
deleted file mode 100644
index 29c562e47f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/net/websocket.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require net/websocket/client
-         net/websocket/server)
-(provide (all-from-out net/websocket/client
-                       net/websocket/server))
diff --git a/pkgs/web-server-pkgs/web-server-lib/net/websocket/client.rkt b/pkgs/web-server-pkgs/web-server-lib/net/websocket/client.rkt
deleted file mode 100644
index aef067f47a..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/net/websocket/client.rkt
+++ /dev/null
@@ -1,86 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         racket/port
-         racket/contract
-         racket/tcp
-         net/url
-         web-server/http/response
-         web-server/http/request
-         web-server/http/request-structs
-         net/websocket/conn
-         net/websocket/handshake
-         openssl)
-(provide (except-out (all-from-out net/websocket/conn) ws-conn))
-
-(define (wss-url? u)
-  (and (url? u)
-       (equal? (url-scheme u) "wss")))
-
-(define (ws-url? u)
-  (and (url? u)
-       (or (equal? (url-scheme u) "ws")
-           (wss-url? u))))
-
-(provide/contract
- [ws-url? (-> any/c boolean?)]
- [wss-url? (-> any/c boolean?)]
- [ws-connect (->* (ws-url?)
-                  (#:headers (listof header?))
-                  open-ws-conn?)])
-
-(define (ws-connect url
-                    #:headers [headers empty])
-  (define host (or (url-host url) "localhost"))
-  (define port (or (url-port url) 80))
-  (define upath (url-path url))
-  (define the-path
-    (if (empty? upath)
-        "/"
-        (let ([pre-path
-               (add-between
-                (map (λ (pp)
-                       (define p (path/param-path pp))
-                       (case p
-                         [(up) ".."]
-                         [(same) "."]
-                         [else p]))
-                     upath)
-                "/")])
-          (apply string-append
-                 (if (url-path-absolute? url)
-                     (list* "/"
-                            pre-path)
-                     pre-path)))))
-  ; Connect
-  (define connect (if (wss-url? url) ssl-connect tcp-connect))
-  (define-values (ip op) (connect host port))
-  ; Handshake (client)
-  (define-values (key1 key2 key3 client-ans) (generate-key))
-  (write-bytes (call-with-output-bytes
-                (λ (op)
-                  (fprintf op "GET ~a HTTP/1.1\r\n" the-path)
-                  (print-headers
-                   op
-                   (list* (make-header #"Host" (string->bytes/utf-8 host))
-                          (make-header #"Connection" #"Upgrade")
-                          (make-header #"Upgrade" #"WebSocket")
-                          (make-header #"Sec-WebSocket-Key1" (string->bytes/utf-8 key1))
-                          (make-header #"Sec-WebSocket-Key2" (string->bytes/utf-8 key2))
-                          headers))
-                  (write-bytes key3 op)))
-               op)
-  (flush-output op)
-  ; Handshake (server)
-  (define sresponse (read-bytes-line ip 'any))
-  (define rheaders (read-headers ip))
-  (define server-ans (read-bytes 16 ip))
-  (unless (bytes=? client-ans server-ans)
-    (error 'ws-connect "Invalid server handshake response. Expected ~e, got ~e" client-ans server-ans))
-  
-  (ws-conn #f sresponse rheaders ip op))
-
-(define (freadf ip s)
-  (define i (read-line ip 'any))
-  (unless (string=? s i)
-    (error 'ws-connect "Invalid server response. Expected ~e, got ~e" s i)))
diff --git a/pkgs/web-server-pkgs/web-server-lib/net/websocket/conn.rkt b/pkgs/web-server-pkgs/web-server-lib/net/websocket/conn.rkt
deleted file mode 100644
index aeaad3a462..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/net/websocket/conn.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang racket/base
-
-(require racket/match
-         racket/contract
-         web-server/http/request-structs)
-
-(define framing-mode (make-parameter 'old))
-
-(struct ws-conn ([closed? #:mutable] line headers ip op)
-        #:property prop:evt (struct-field-index ip))
-(define (open-ws-conn? x)
-  (and (ws-conn? x) (not (ws-conn-closed? x))))
-(provide/contract
- [framing-mode (parameter/c (symbols 'old 'new))]
- [ws-conn (false/c bytes? (listof header?) input-port? output-port? . -> . open-ws-conn?)]
- [ws-conn? (any/c . -> . boolean?)]
- [open-ws-conn? (any/c . -> . boolean?)]
- [ws-conn-line (ws-conn? . -> . bytes?)]
- [ws-conn-closed? (ws-conn? . -> . boolean?)]
- [ws-conn-headers (ws-conn? . -> . (listof header?))]
- [ws-send! (-> open-ws-conn? string? void)]
- [ws-recv (-> open-ws-conn? (or/c string? eof-object?))]
- [ws-close! (-> open-ws-conn? void)])
-
-(define (write-ws-frame! t s op)
-  (define bs (string->bytes/utf-8 s))
-  (case (framing-mode)
-    [(new)
-     (write-byte t op)
-     (write-bytes (integer->integer-bytes (bytes-length bs) 8 #f #t) op)
-     (write-bytes bs op)]
-    [(old)
-     (write-byte #x00 op)
-     (write-bytes bs op)
-     (write-byte #xff op)])
-  (flush-output op))  
-
-(define (read-ws-frame ip)
-  (case (framing-mode)
-    [(new)
-     (let ()
-       (define frame (read-byte ip))
-       (when (eof-object? frame) (error 'read-ws-frame "Premature connection close"))
-       (define len-bs (read-bytes 8 ip))
-       (when (eof-object? len-bs) (error 'read-ws-frame "Premature connection close"))
-       (define len (integer-bytes->integer len-bs #f #t))
-       (define data-bs (read-bytes len ip))
-       (when (eof-object? data-bs) (error 'read-ws-frame "Premature connection close"))
-       (values frame (bytes->string/utf-8 data-bs)))]
-    [(old)
-     (let ()
-       (define l (read-byte ip))
-       (cond [(eof-object? l) (values #x00 #"")]
-             [(= #xff l)
-              (read-byte ip)
-              (values #x00 #"")]
-             [else
-              (values #xff (bytes->string/utf-8 (read-until-byte #xff ip)))]))]))
-
-(define (read-until-byte b ip)
-  (define ob (open-output-bytes))
-  (let loop ()
-    (define n (read-byte ip))
-    (unless (or (eof-object? n) (= n b))
-      (write-byte n ob)
-      (loop)))
-  (get-output-bytes ob))
-
-(define (ws-send! wsc s)
-  (match-define (ws-conn _ _ _ _ op) wsc)
-  (write-ws-frame! #xff s op))
-
-(define (ws-recv wsc)
-  (match-define (ws-conn _ _ _ ip _) wsc)
-  (define-values (ft m) (read-ws-frame ip))
-  (if (= #x00 ft)
-      eof
-      m))
-
-(define (ws-close! wsc)
-  (match-define (ws-conn _ _ _ ip op) wsc)
-  
-  (case (framing-mode)
-    [(new)
-     (write-ws-frame! #x00 "" op)]
-    [(old)
-     (write-byte #xff op)
-     (write-byte #x00 op)
-     (flush-output op)])
-  
-  (close-input-port ip)
-  (close-output-port op)
-  (set-ws-conn-closed?! wsc #t))
diff --git a/pkgs/web-server-pkgs/web-server-lib/net/websocket/handshake.rkt b/pkgs/web-server-pkgs/web-server-lib/net/websocket/handshake.rkt
deleted file mode 100644
index e05b05d9bb..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/net/websocket/handshake.rkt
+++ /dev/null
@@ -1,90 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         racket/contract
-         file/md5)
-
-(define RANGE 100000)
-
-(provide/contract
- [compute-ans (number? number? bytes? . -> . bytes?)]
- [remove-alphas (string? . -> . string?)]
- [count-spaces (string? . -> . exact-nonnegative-integer?)]
- [key->number (string? . -> . exact-nonnegative-integer?)]
- [handshake-solution (string? string? bytes? . -> . bytes?)]
- [generate-key (-> (values string? string? bytes? bytes?))]
- [random-char-between (char? char? . -> . char?)]
- [random-alpha-char (-> char-alphabetic?)]
- [add-spaces (exact-nonnegative-integer? string? . -> . string?)]
- [add-alphas (string? . -> . string?)]
- [number->key (exact-nonnegative-integer? . -> . string?)])
- 
-(define (compute-ans n1 n2 key3)
-  (md5 (bytes-append (integer->integer-bytes n1 4 #f #t)
-                     (integer->integer-bytes n2 4 #f #t)
-                     key3)
-       #f))
-
-(define (remove-alphas key)
-  (apply string-append
-         (regexp-match* "[0-9]" key)))
-
-(define (count-spaces key)
-  (length (regexp-match* " " key)))
-
-(define (key->number key)
-  (define spaces (count-spaces key))
-  (define n1 (string->number (remove-alphas key)))
-  (/ n1 spaces))
-
-(define (handshake-solution key1 key2 key3)
-  (compute-ans (key->number key1) (key->number key2) key3))
-
-(define (generate-key)
-  (define n1 (random RANGE))
-  (define n2 (random RANGE))
-  (define key1 (number->key n1))
-  (define key2 (number->key n2))
-  (define key3 (apply bytes (build-list 8 (λ (i) (random 256)))))
-  (define ans 
-    (compute-ans n1 n2 key3))
-  (values key1 key2 key3 ans))
-
-(define (random-char-between botc topc)
-  (if (char=? botc topc)
-      botc
-      (let ()
-        (define bot (char->integer botc))
-        (define top (char->integer topc))
-        (integer->char (+ bot (random (- top bot)))))))
-
-(define (random-alpha-char)
-  (case (random 2)
-    [(0) (random-char-between #\a #\z)]
-    [(1) (random-char-between #\A #\Z)]))
-
-(define (add-spaces how-many s0)
-  (list->string
-   (reverse
-    (for/fold ([s1 empty])
-      ([c (in-string s0)]
-       [i (in-naturals)])
-      (if (i . < . how-many)
-          (list* #\space c s1)
-          (list* c s1))))))
-
-(define (add-alphas s0)
-  (list->string
-   (reverse
-    (for/fold ([s1 empty])
-      ([c (in-string s0)]
-       [i (in-naturals)])
-      (if (zero? (random 3))
-          (list* c s1)
-          (list* (random-alpha-char) c s1))))))
-
-(define (number->key n0)
-  (define s0 (number->string n0))
-  (define how-many-spaces (add1 (random (string-length s0))))
-  (define n1 (* n0 how-many-spaces))
-  (add-alphas (add-spaces how-many-spaces (number->string n1))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/net/websocket/server.rkt b/pkgs/web-server-pkgs/web-server-lib/net/websocket/server.rkt
deleted file mode 100644
index e74db8406a..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/net/websocket/server.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang racket/base
-
-(require racket/list
-         racket/unit
-         racket/contract
-         unstable/contract
-         web-server/private/dispatch-server-unit
-         web-server/private/dispatch-server-sig
-         web-server/private/connection-manager
-         web-server/http/response
-         web-server/http/request
-         web-server/http/request-structs
-         racket/async-channel
-         net/tcp-sig
-         (prefix-in raw: net/tcp-unit)
-         net/websocket/conn
-         net/websocket/handshake)
-(provide (except-out (all-from-out net/websocket/conn) ws-conn))
-
-(provide/contract
- [ws-serve
-  (->* ((open-ws-conn? any/c . -> . void))
-       (#:conn-headers 
-        (bytes? (listof header?) . -> . (values (listof header?) any/c))
-        #:tcp@
-        (unit/c (import) (export tcp^))
-        #:port
-        tcp-listen-port?
-        #:listen-ip
-        (or/c string? false/c)
-        #:max-waiting
-        integer?
-        #:timeout
-        integer?
-        #:confirmation-channel
-        (or/c false/c async-channel?))
-       (-> void))])
-
-(define (ws-serve conn-dispatch
-                  #:conn-headers [pre-conn-dispatch (λ (cline hs) (values empty (void)))]
-                  #:tcp@ [tcp@ raw:tcp@]
-                  #:port [port 80]
-                  #:listen-ip [listen-ip #f]
-                  #:max-waiting [max-waiting 4]
-                  #:timeout [initial-connection-timeout (* 60 60)]
-                  #:confirmation-channel [confirm-ch #f])
-  (define (read-request c p port-addresses)
-    (values #f #t))
-  (define (dispatch c _)
-    (define ip (connection-i-port c))
-    (define op (connection-o-port c))
-    (define cline (read-bytes-line ip 'any))
-    (define headers (read-headers ip))
-    (define key1h (headers-assq* #"Sec-WebSocket-Key1" headers))
-    (unless key1h (error 'ws-serve "Invalid WebSocket request, no Key1"))
-    (define key1 (header-value key1h))
-    (define key2h (headers-assq* #"Sec-WebSocket-Key2" headers))
-    (unless key2h (error 'ws-serve "Invalid WebSocket request, no Key2"))
-    (define key2 (header-value key2h))
-    (define key3 (read-bytes 8 ip))
-    
-    (define-values (conn-headers state) (pre-conn-dispatch cline headers))
-    
-    (fprintf op "HTTP/1.1 101 WebSocket Protocol Handshake\r\n")
-    (print-headers 
-     op
-     (list* (make-header #"Upgrade" #"WebSocket")
-            (make-header #"Connection" #"Upgrade")
-            conn-headers))
-    
-    (write-bytes
-     (handshake-solution (bytes->string/utf-8 key1)
-                         (bytes->string/utf-8 key2)
-                         key3)
-     op)
-    (flush-output op)
-    
-    (define conn
-      (ws-conn #f cline conn-headers ip op))
-    
-    (conn-dispatch conn state))
-  
-  (define-unit-binding a-tcp@
-    tcp@ (import) (export tcp^))
-  (define-compound-unit/infer dispatch-server@/tcp@
-    (import dispatch-server-config^)
-    (link a-tcp@ dispatch-server@)
-    (export dispatch-server^))
-  (define-values/invoke-unit
-    dispatch-server@/tcp@
-    (import dispatch-server-config^)
-    (export dispatch-server^))
-  (serve #:confirmation-channel confirm-ch))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/base/lang/reader.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/base/lang/reader.rkt
deleted file mode 100644
index 7781fe91ca..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/base/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-web-server/lang/base
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/README b/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/README
deleted file mode 100644
index d07e4c9f18..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/README
+++ /dev/null
@@ -1,92 +0,0 @@
-In Racket 5.0.2 and before, the Web Server supported implicit
-conversion of X-expressions and lists with the format (cons/c bytes? (listof (or/c string? bytes?))) into response data structures for output.
-
-After 5.0.2, this implicit conversion has been generalized into any->response. In the process, implicit conversion has been completely removed from some internal plumbing AND the response structures have been streamlined---primarily for efficiency.
-
-This document describes the incompatible changes and how to restore the old behavior when that is possible.
-
---- Coercion behavior ---
-
-The old coercion behavior will be dynamically introduced by requiring
-web-server/compat/0/coerce or running:
-
-(require web-server/compat/0/http/response-structs)
-(set-any->response! normalize-response)
-
-Users may want to allow implicit X-expression conversion by
-running
-
-(set-any->response! response/xexpr)
-
---- New response structures ---
-
-The http/response-structs module has changed to be almost
-unrecognizable. http/response-structs was provided through http and
-servlet, so many Web applications implicitly rely on it.
-
-web-server/compat/0/http/response-structs provides a version that
-implements the old behavior without interfering with new version
-(i.e., they can both be required simultaneously.) [N.B. response/port
-was only present for a few weeks, so it is not provided in the
-compatibility library.]
-
---- xexpr-response/cookies ---
-
-The http/cookie module provided xexpr-response/cookies, but that
-functionality is now part of response/xexpr. The old function can be
-required from web-server/compat/0/http/cookie (without interfering
-with any other bindings from the new cookie module.)
-
---- Internal APIs ---
-
-Many internal APIs are restricted to receive only actual response?
-structures:
-
-configuration-table responders
-authentication responder on dispatchers/dispatch-passwords
-dispatchers/dispatch-lift --- make
-dispatchers/dispatch-pathprocedure --- make
-http/response --- output-response and output-response/method
-
-No compatible interface is provided for these functions and data structures.
-
---- External APIs ---
-
-Most external APIs now use the new response/c. Specifically:
-
-dispatch/serve --- serve/dispatch
-servlet-dispatch --- dispatch/servlet
-servlet-env --- serve/servlet
-servlet/web --- send/*, with-errors-to-browser
-dispatchers/dispatch-servlets  --- servlet-loading responder argument
-#lang web-server/insta
-lang/web --- make-stateless-servlet
-private/servlet --- handler field
-servlet/servlet-structs --- response-generator/c, expiration-handler/c
-servlet/setup --- make*servlet
-
-These represent nearly every place where servlets typically interact
-with the server.
-
-However, one function: send/formlet from formlets used to allow any
-old response/c as a wrapper result, while the new version requires
-that the wrapper returns an Xexpr. This changes is justified in that
-formlets already bake in support for Xexpr as a fundamental part of
-their syntax.
-
---- Removed contracts ---
-
-web-server/compat/0/servlet/servlet-structs
-
-is a replacement for the old
-
-web-server/servlet/servlet-structs
-
-because 
-
-k-url?
-response-generator/c
-expiration-handler/c
-
-are now removed. (This change is to ensure that internal uses of these
-have can-be-response? close to where they are used so any->response can be called appropriately.)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/coerce.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/coerce.rkt
deleted file mode 100644
index 3d93f28e92..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/coerce.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang racket/base
-(require "http/response-structs.rkt"
-         web-server/servlet/servlet-structs)
-(set-any->response! normalize-response)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/http/cookie.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/http/cookie.rkt
deleted file mode 100644
index 116e3fc4d4..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/http/cookie.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require web-server/http/xexpr)
-
-(define (xexpr-response/cookies cs xe)
-  (response/xexpr xe #:cookies cs))
-
-(provide (all-from-out))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/http/response-structs.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/http/response-structs.rkt
deleted file mode 100644
index 78b69448c3..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/http/response-structs.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/base
-(require web-server/http/response-structs
-         web-server/http/xexpr
-         racket/list)
-
-(define response/basic? response?)
-(define (make-response/basic c m s mime hs)
-  (response/full c m s mime hs #""))
-(define response/basic-code response-code)
-(define response/basic-message response-message)
-(define response/basic-seconds response-seconds)
-(define response/basic-mime response-mime)
-(define response/basic-headers response-headers)
-
-(define BODIES (make-weak-hasheq))
-(define response/full? response?)
-(define (make-response/full c m s mime hs bs)
-  (define r (response/full c m s mime hs bs))
-  (hash-set! BODIES r bs)
-  r)
-(define response/full-code response-code)
-(define response/full-message response-message)
-(define response/full-seconds response-seconds)
-(define response/full-mime response-mime)
-(define response/full-headers response-headers)
-(define (response/full-body r)
-  (hash-ref BODIES r))
-
-(define GENS (make-weak-hasheq))
-(define response/incremental? response?)
-(define (make-response/incremental c m s mime hs gen)
-  (define r
-    (response c m s mime hs
-              (λ (out)
-                (gen (λ bss
-                       (for ([bs (in-list bss)])
-                         (write-bytes bs out)))))))
-  (hash-set! GENS r gen)
-  r)
-(define response/incremental-code response-code)
-(define response/incremental-message response-message)
-(define response/incremental-seconds response-seconds)
-(define response/incremental-mime response-mime)
-(define response/incremental-headers response-headers)
-(define (response/incremental-body r)
-  (hash-ref GENS r))
-
-(define make-xexpr-response response/xexpr)
-
-(define (normalize-response r [close? #f])
-  (cond
-    [(response? r) r]
-    [(and (pair? r) (bytes? (car r)))
-     (response/full 200 #"Okay" (current-seconds) (car r)
-                    empty
-                    (map (λ (x) (if (bytes? x) x (string->bytes/utf-8 x)))
-                         (cdr r)))]
-    [else
-     (response/xexpr r)]))
-
-(provide 
- (except-out (all-defined-out)
-             BODIES
-             GENS))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/servlet/servlet-structs.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/servlet/servlet-structs.rkt
deleted file mode 100644
index 1b98473cb4..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/0/servlet/servlet-structs.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(require racket/contract
-         web-server/servlet/servlet-structs
-         web-server/http)  
-
-(define k-url?
-  string?)
-
-(define response-generator/c
-  (k-url? . -> . can-be-response?))
-
-(define expiration-handler/c
-  (or/c false/c
-        (request? . -> . can-be-response?)))
-
-(define embed/url/c
-  ((request? . -> . any) . -> . string?))
-
-(provide/contract
- [response-generator/c contract?]
- [k-url? contract?]
- [expiration-handler/c contract?]
- [embed/url/c contract?])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/README b/pkgs/web-server-pkgs/web-server-lib/web-server/compat/README
deleted file mode 100644
index e940f2c59c..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/compat/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Each directory contains a README describing backwards incompatible changes to the Web Server and instructions for using the compatibility interface in newer versions.
-
-Most compatibility interfaces mirror the structure of the Web Server collection. For example, to require the version of web-server/http/cookie before backwards incompatible change 0, require web-server/compat/0/http/cookie.
-
-These compatibility interfaces are not documented in the manual to discourage new programs from using the old interface.
-
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/configuration-table-structs.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/configuration-table-structs.rkt
deleted file mode 100644
index 5754c52287..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/configuration-table-structs.rkt
+++ /dev/null
@@ -1,81 +0,0 @@
-#lang racket/base
-(require mzlib/contract
-         net/url)
-(require web-server/http/response-structs
-         web-server/http/request-structs
-         "../private/util.rkt")           
-
-; configuration-table = (make-configuration-table nat nat num host-table (listof (cons str host-table)))
-(define-struct configuration-table
-  (port max-waiting initial-connection-timeout default-host virtual-hosts))
-
-; host-table = (make-host-table (listof str) sym messages timeouts paths)
-(define-struct host-table (indices log-format messages timeouts paths))
-
-(define-struct host (indices log-format log-path passwords responders timeouts paths))  
-
-(define-struct responders
-  (servlet servlet-loading authentication servlets-refreshed passwords-refreshed file-not-found protocol collect-garbage))
-
-; messages = (make-messages str^6)
-(define-struct messages
-  (servlet authentication servlets-refreshed passwords-refreshed file-not-found protocol collect-garbage))
-
-; timeouts = (make-timeouts nat^5)
-(define-struct timeouts (default-servlet password servlet-connection file-per-byte file-base))
-
-; paths = (make-paths str^6)
-(define-struct paths (conf host-base log htdocs servlet mime-types passwords))
-
-(provide/contract
- [struct configuration-table
-         ([port port-number?]
-          [max-waiting exact-nonnegative-integer?]
-          [initial-connection-timeout natural-number/c]
-          [default-host host-table?]
-          [virtual-hosts (listof (cons/c string? host-table?))])]
- [struct host-table 
-         ([indices (listof string?)]
-          [log-format symbol?]
-          [messages messages?]
-          [timeouts timeouts?]
-          [paths paths?])]
- [struct host 
-         ([indices (listof string?)]
-          [log-format symbol?]
-          [log-path (or/c false/c path-string?)]
-          [passwords (or/c false/c path-string?)]
-          [responders responders?]
-          [timeouts timeouts?]
-          [paths paths?])]
- [struct responders
-         ([servlet (url? any/c . -> . response?)]
-          [servlet-loading (url? any/c . -> . response?)]
-          [authentication (url? header? . -> . response?)]
-          [servlets-refreshed (-> response?)]
-          [passwords-refreshed (-> response?)]
-          [file-not-found (request? . -> . response?)]
-          [protocol (url? . -> . response?)]
-          [collect-garbage (-> response?)])]
- [struct messages
-         ([servlet string?]
-          [authentication string?]
-          [servlets-refreshed string?]
-          [passwords-refreshed string?]
-          [file-not-found string?]
-          [protocol string?]
-          [collect-garbage string?])]
- [struct timeouts 
-         ([default-servlet number?]
-          [password number?]
-          [servlet-connection number?]
-          [file-per-byte number?]
-          [file-base number?])]
- [struct paths 
-         ([conf (or/c false/c path-string?)]
-          [host-base (or/c false/c path-string?)]
-          [log (or/c false/c path-string?)]
-          [htdocs (or/c false/c path-string?)]
-          [servlet (or/c false/c path-string?)]
-          [mime-types (or/c false/c path-string?)]
-          [passwords (or/c false/c path-string?)])])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/configuration-table.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/configuration-table.rkt
deleted file mode 100644
index d74fd87357..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/configuration-table.rkt
+++ /dev/null
@@ -1,142 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         (for-syntax racket/base)
-         racket/pretty
-         racket/runtime-path
-         "configuration-table-structs.rkt"
-         web-server/http/bindings)
-(define configuration-table-sexpr? list?)
-
-(provide/contract
- [configuration-table-sexpr? (any/c . -> . boolean?)]
- [read-configuration-table (path-string? . -> . configuration-table?)]
- [write-configuration-table (configuration-table? path-string? . -> . void)]
- [configuration-table->sexpr (configuration-table? . -> . configuration-table-sexpr?)]
- [sexpr->configuration-table (configuration-table-sexpr? . -> . configuration-table?)]
- [default-configuration-table-path path?])
-
-(define-runtime-path default-configuration-table-path
-  "../default-web-root/configuration-table.rkt")
-
-(define (get-binding key bindings default)
-  (first (get-binding* key bindings (list default))))
-
-(define (get-binding* key bindings default)
-  (with-handlers ([exn:fail? (lambda _ default)])
-    (extract-binding/single key bindings)))
-
-(define (read-configuration-table table-file-name)
-  (sexpr->configuration-table (call-with-input-file table-file-name read)))
-
-; parse-configuration-table : tst -> configuration-table
-(define (sexpr->configuration-table t)
-  (define port (get-binding 'port t 80))
-  (define max-waiting (get-binding 'max-waiting t 511))
-  (define initial-connection-timeout (get-binding 'initial-connection-timeout t 30))
-  (define default-host-table (get-binding* 'default-host-table t `()))
-  (define virtual-host-table (get-binding* 'virtual-host-table t `()))
-  (make-configuration-table
-   port max-waiting initial-connection-timeout
-   (parse-host default-host-table)
-   (map (lambda (h)
-          (cons (car h) (parse-host (cdr h))))
-        virtual-host-table)))
-
-; parse-host : tst -> host-table
-(define (parse-host t)
-  (define host-table (get-binding* 'host-table t `()))
-  (define default-indices (get-binding* 'default-indices host-table `("index.html" "index.htm")))
-  (define log-format (get-binding 'log-format host-table 'parenthesized-default))
-  (define messages (get-binding* 'messages host-table `()))
-  (define servlet-message (get-binding 'servlet-message messages "servlet-error.html"))
-  (define authentication-message (get-binding 'authentication-message messages "forbidden.html"))
-  (define servlets-refreshed (get-binding 'servlets-refreshed messages "servlet-refresh.html"))
-  (define passwords-refreshed (get-binding 'passwords-refreshed messages "passwords-refresh.html"))
-  (define file-not-found-message (get-binding 'file-not-found-message messages "not-found.html"))
-  (define protocol-message (get-binding 'protocol-message messages "protocol-error.html"))
-  (define collect-garbage (get-binding 'collect-garbage messages "collect-garbage.html"))
-  (define timeouts (get-binding* 'timeouts host-table `()))
-  (define default-servlet-timeout (get-binding 'default-servlet-timeout timeouts 30))
-  (define password-connection-timeout (get-binding 'password-connection-timeout timeouts 300))
-  (define servlet-connection-timeout (get-binding 'servlet-connection-timeout timeouts (* 60 60 24)))
-  (define file-per-byte-connection-timeout (get-binding 'file-per-byte-connection-timeout timeouts 1/20))
-  (define file-base-connection-timeout (get-binding 'file-base-connection-timeout timeouts 30))
-  (define paths (get-binding* 'paths host-table `()))
-  (define configuration-root (get-binding 'configuration-root paths "conf"))
-  (define host-root (get-binding 'host-root paths "default-web-root"))
-  (define log-file-path (get-binding 'log-file-path paths "log"))
-  (define file-root (get-binding 'file-root paths "htdocs"))
-  (define servlet-root (get-binding 'servlet-root paths "."))
-  (define mime-types (get-binding 'mime-types paths "mime.types"))
-  (define password-authentication (get-binding 'password-authentication paths "passwords"))
-  (make-host-table
-   default-indices log-format
-   (make-messages servlet-message
-                  authentication-message
-                  servlets-refreshed
-                  passwords-refreshed
-                  file-not-found-message
-                  protocol-message
-                  collect-garbage)
-   (make-timeouts default-servlet-timeout
-                  password-connection-timeout
-                  servlet-connection-timeout
-                  file-per-byte-connection-timeout
-                  file-base-connection-timeout)
-   (make-paths configuration-root
-               host-root
-               log-file-path
-               file-root
-               servlet-root
-               mime-types
-               password-authentication)))
-
-(define (configuration-table->sexpr new)
-  `((port ,(configuration-table-port new))
-    (max-waiting ,(configuration-table-max-waiting new))
-    (initial-connection-timeout ,(configuration-table-initial-connection-timeout new))
-    (default-host-table
-      ,(host-table->sexpr (configuration-table-default-host new)))
-    (virtual-host-table
-     . ,(map (lambda (h) (list (car h) (host-table->sexpr (cdr h))))
-             (configuration-table-virtual-hosts new)))))
-
-; write-configuration-table : configuration-table path -> void
-; writes out the new configuration file
-(define (write-configuration-table new configuration-path)
-  (define sexpr (configuration-table->sexpr new))
-  (call-with-output-file configuration-path
-    (lambda (out) (pretty-write sexpr out))
-    #:exists 'truncate))
-
-; host-table->sexpr : host-table
-(define (host-table->sexpr host)
-  (let ([t (host-table-timeouts host)]
-        [p (host-table-paths host)]
-        [m (host-table-messages host)])
-    `(host-table
-      (default-indices "index.html" "index.htm")
-      (log-format parenthesized-default)
-      (messages
-       (servlet-message ,(messages-servlet m))
-       (authentication-message ,(messages-authentication m))
-       (servlets-refreshed ,(messages-servlets-refreshed m))
-       (passwords-refreshed ,(messages-passwords-refreshed m))
-       (file-not-found-message ,(messages-file-not-found m))
-       (protocol-message ,(messages-protocol m))
-       (collect-garbage ,(messages-collect-garbage m)))
-      (timeouts
-       (default-servlet-timeout ,(timeouts-default-servlet t))
-       (password-connection-timeout ,(timeouts-password t))
-       (servlet-connection-timeout ,(timeouts-servlet-connection t))
-       (file-per-byte-connection-timeout ,(timeouts-file-per-byte t))
-       (file-base-connection-timeout ,(timeouts-file-base t)))
-      (paths
-       (configuration-root ,(paths-conf p))
-       (host-root ,(paths-host-base p))
-       (log-file-path ,(paths-log p))
-       (file-root ,(paths-htdocs p))
-       (servlet-root ,(paths-servlet p))
-       (mime-types ,(paths-mime-types p))
-       (password-authentication ,(paths-passwords p))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/namespace.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/namespace.rkt
deleted file mode 100644
index 96397d364d..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/namespace.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         racket/runtime-path)
-
-(define-runtime-module-path racket-module-spec racket)
-(define mred-module-spec 'mred)
-
-(define default-to-be-copied-module-specs (list racket-module-spec mred-module-spec))
-
-(define-runtime-module-path racket/base-module-spec racket/base)
-
-(define (make-make-servlet-namespace
-         #:to-be-copied-module-specs [to-be-copied-module-specs empty])    
-  ;; get the names of those modules.
-  (define (get-name spec)
-    (if (symbol? spec)
-        spec
-        (with-handlers ([exn:fail? (lambda _ #f)])
-          ((current-module-name-resolver) spec #f #f #t))))
-  (define to-be-copied-module-names
-    (map get-name 
-         (append default-to-be-copied-module-specs
-                 to-be-copied-module-specs)))
-  (lambda (#:additional-specs [additional-specs empty])
-    (define server-namespace (current-namespace))
-    (define new-namespace (make-base-empty-namespace))
-    (define additional-names (map get-name additional-specs))
-    (parameterize ([current-namespace new-namespace])
-      (namespace-require racket/base-module-spec)
-      (for-each (lambda (name)
-                  (with-handlers ([exn:fail? void])
-                    (when name
-                      (namespace-attach-module server-namespace name))))
-                (append to-be-copied-module-names
-                        additional-names))
-      new-namespace)))
-
-(define make-servlet-namespace/c
-  (->* ()
-       (#:additional-specs (listof (or/c resolved-module-path? module-path?)))
-       namespace?))
-
-(provide/contract
- [make-servlet-namespace/c contract?]
- [make-make-servlet-namespace 
-  (->* ()
-       (#:to-be-copied-module-specs (listof (or/c resolved-module-path? module-path?)))
-       make-servlet-namespace/c)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/responders.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/responders.rkt
deleted file mode 100644
index b56fdbf483..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/configuration/responders.rkt
+++ /dev/null
@@ -1,133 +0,0 @@
-#lang racket/base
-(require racket/contract
-         (for-syntax racket/base)
-         racket/runtime-path
-         net/url
-         web-server/private/xexpr
-         web-server/http/xexpr
-         web-server/http/response-structs
-         web-server/http/request-structs)
-
-(define (format-stack-trace trace)
-  `(pre
-    ,@(for/list ([item (in-list trace)])
-        (format "~a at:\n  ~a\n"
-                (if (car item)
-                    (car item)
-                    "<unknown procedure>")
-                (if (cdr item)
-                    (format "line ~a, column ~a, in file ~a"
-                            (srcloc-line (cdr item))
-                            (srcloc-column (cdr item))
-                            (srcloc-source (cdr item)))
-                    "<unknown location>")))))
-
-(define-runtime-path default-error-style-sheet
-  "../default-web-root/htdocs/error.css")
-
-(define (pretty-exception-response url exn)
-  (response/xexpr
-   #:code 500
-   `(html
-     (head
-      (title "Servlet Error")
-      (link ([rel "stylesheet"] [href "/error.css"])))
-     (body
-      (div ([class "section"])
-           (div ([class "title"]) "Exception")
-           (p
-            "The application raised an exception with the message:"
-            (pre ,(if (exn:pretty? exn)
-                      (exn:pretty-xexpr exn)
-                      (exn-message exn))))
-           (p
-            "Stack trace:"
-            ,(format-stack-trace
-              (continuation-mark-set->context (exn-continuation-marks exn)))))))))
-
-
-; file-response : nat str str [(cons sym str) ...] -> response
-; The server should still start without the files there, so the
-; configuration tool still runs.  (Alternatively, find an work around.)
-(define (file-response code short text-file . headers)
-  (response/full code short
-                 (current-seconds) TEXT/HTML-MIME-TYPE
-                 headers
-                 (list (read-file text-file))))
-
-; servlet-loading-responder : url tst -> response
-; This is slightly tricky since the (interesting) content comes from the exception.
-(define (servlet-loading-responder url exn)
-  ((error-display-handler)
-   (format "Servlet (@ ~a) didn't load:\n~a\n" (url->string url) (exn-message exn))
-   exn)
-  (pretty-exception-response url exn))
-
-; gen-servlet-not-found : str -> url -> response
-(define (gen-servlet-not-found file-not-found-file)
-  (lambda (url)
-    (file-response 404 #"Servlet not found" file-not-found-file)))
-
-; servlet-error-response : url exn -> response
-(define (servlet-error-responder url exn)
-  ((error-display-handler)
-   (format "Servlet (@ ~a) exception:\n~a\n" (url->string url) (exn-message exn))
-   exn)
-  (pretty-exception-response url exn))
-
-; gen-servlet-responder : str -> url tst -> response
-(define (gen-servlet-responder servlet-error-file)
-  (lambda (url exn)
-    ((error-display-handler)
-     (format "Servlet (@ ~a) exception:\n~e\n" (url->string url) (exn-message exn))
-     exn)
-    (file-response 500 #"Servlet error" servlet-error-file)))
-
-; gen-servlets-refreshed : str -> -> response
-(define (gen-servlets-refreshed servlet-refresh-file)
-  (lambda ()
-    (file-response 200 #"Servlet cache refreshed" servlet-refresh-file)))
-
-; gen-passwords-refreshed : str -> -> response
-(define (gen-passwords-refreshed password-refresh-file)
-  (lambda ()
-    (file-response 200 #"Passwords refreshed" password-refresh-file)))
-
-; gen-authentication-responder : str -> url (cons sym str) -> response
-(define (gen-authentication-responder access-denied-file)
-  (lambda (uri recommended-header)
-    (file-response 401 #"Authorization Required" access-denied-file
-                   recommended-header)))
-
-; gen-protocol-responder : str -> str -> response
-(define (gen-protocol-responder protocol-file)
-  (lambda (error-message)
-    (file-response 400 #"Malformed Request" protocol-file)))
-
-; gen-file-not-found-responder : str -> req -> response
-(define (gen-file-not-found-responder file-not-found-file)
-  (lambda (req)
-    (file-response 404 #"File not found" file-not-found-file)))
-
-; gen-collect-garbage-responder : str -> -> response
-(define (gen-collect-garbage-responder file)
-  (lambda ()
-    (file-response 200 #"Garbage collected" file)))
-
-; read-file : str -> str
-(define (read-file path)
-  (call-with-input-file path
-    (lambda (in) (read-bytes (file-size path) in))))
-
-(provide/contract
- [file-response ((natural-number/c bytes? path-string?) () #:rest (listof header?) . ->* . response?)]
- [servlet-loading-responder (url? exn? . -> . response?)]
- [gen-servlet-not-found (path-string? . -> . (url? . -> . response?))]
- [servlet-error-responder (url? exn? . -> . response?)]
- [gen-servlet-responder (path-string? . -> . (url? exn? . -> . response?))]
- [gen-servlets-refreshed (path-string? . -> . (-> response?))]
- [gen-passwords-refreshed (path-string? . -> . (-> response?))]
- [gen-authentication-responder (path-string? . -> . (url? header? . -> . response?))]
- [gen-protocol-responder (path-string? . -> . (url? . -> . response?))]
- [gen-file-not-found-responder (path-string? . -> . (request? . -> . response?))]
- [gen-collect-garbage-responder (path-string? . -> . (-> response?))])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/.gitignore b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/.gitignore
deleted file mode 100644
index 31dbbff57c..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/log
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/collect-garbage.html b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/collect-garbage.html
deleted file mode 100644
index 40f210b931..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/collect-garbage.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head><title>Garbage Collect Ran</title></head>
-<body bgcolor='white'>
-<p>The garbage collection routine has run.</p>
-<p>Powered by <a href="http://racket-lang.org/">Racket</a></p>
-</body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/forbidden.html b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/forbidden.html
deleted file mode 100644
index 6a9b3fe5d0..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/forbidden.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head><title>Access Denied</title></head>
-<body>
-<p>The server could not verify that you have permissions to access the requested document.</p>
-<p>Powered by <a href="http://racket-lang.org/">Racket</a></p>
-</body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/not-found.html b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/not-found.html
deleted file mode 100644
index 2234a558a5..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/not-found.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head><title>Not Found</title></head>
-<body bgcolor='white'>
-<p>The file you were looking for was not found on this server.</p>
-<p>Powered by <a href="http://racket-lang.org/">Racket</a></p>
-</body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/passwords-refresh.html b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/passwords-refresh.html
deleted file mode 100644
index b386f80036..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/passwords-refresh.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head><title>Passwords Refreshed</title></head>
-<body bgcolor='white'>
-<p>The Web server is now using the new password file.</p>
-<p>Powered by <a href="http://racket-lang.org/">Racket</a></p>
-</body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/protocol-error.html b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/protocol-error.html
deleted file mode 100644
index 08ebc85ca2..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/protocol-error.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head><title>Browser Error</title></head>
-<body>
-<p>The browser sent a malformed request.</p>
-<p>Powered by <a href="http://racket-lang.org/">Racket</a></p>
-</body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/servlet-error.html b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/servlet-error.html
deleted file mode 100644
index e324b2b5e5..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/servlet-error.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head><title>Servlet Error</title></head>
-<body>
-<p>The servlet terminated abnormally.<br />
-   Please ask the author to fix the problem based on the details in
-   the Web server's log file.</p>
-<p>Powered by <a href="http://racket-lang.org/">Racket</a></p>
-</body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/servlet-refresh.html b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/servlet-refresh.html
deleted file mode 100644
index 4303610d5c..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/conf/servlet-refresh.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head><title>Servlets Refreshed</title></head>
-<body bgcolor='white'>
-<p>Fresh copies of Servlets will now be (re)loaded from disk.</p>
-<p>Powered by <a href="http://racket-lang.org/">Racket</a></p>
-</body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/configuration-table.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/configuration-table.rkt
deleted file mode 100644
index 4d5232caa2..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/configuration-table.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-((port 80)
- (max-waiting 511)
- (initial-connection-timeout 30)
- (default-host-table
-   (host-table
-     (default-indices "index.html" "index.htm")
-     (log-format parenthesized-default)
-     (messages
-       (servlet-message "servlet-error.html")
-       (authentication-message "forbidden.html")
-       (servlets-refreshed "servlet-refresh.html")
-       (passwords-refreshed "passwords-refresh.html")
-       (file-not-found-message "not-found.html")
-       (protocol-message "protocol-error.html")
-       (collect-garbage "collect-garbage.html"))
-     (timeouts
-       (default-servlet-timeout 30)
-       (password-connection-timeout 300)
-       (servlet-connection-timeout 86400)
-       (file-per-byte-connection-timeout 1/20)
-       (file-base-connection-timeout 30))
-     (paths
-      (configuration-root "conf")
-      (host-root ".")
-      (log-file-path "log")
-      (file-root "htdocs")
-      (servlet-root ".")
-      (mime-types "mime.types")
-      (password-authentication "passwords"))))
- (virtual-host-table))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/.gitignore b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/.gitignore
deleted file mode 100644
index cc6360e531..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-the-blog-data.sqlite
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/error.css b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/error.css
deleted file mode 100644
index a31d609f56..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/error.css
+++ /dev/null
@@ -1,36 +0,0 @@
-.section {
-  margin: 25px;
-  font-family: sans-serif;
-  border: 1px solid black;
-}
-
-.title {
-  background-color: #663366;
-  font-size: large;
-  padding: 5px;
-  color: #FFFFFF;
-}
-
-.section > p {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-
-.section > pre {
- white-space: pre-wrap;       /* css-3 */
- white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
- white-space: -pre-wrap;      /* Opera 4-6 */
- white-space: -o-pre-wrap;    /* Opera 7 */
- word-wrap: break-word;       /* Internet Explorer 5.5+ */
- 
-  background-color: #ffccff;
-  margin-left: 5px;
-  margin-right: 5px;
-  padding: 5px;
-  border: 1px solid #ff99ff;
-}
-
-.error {
- color: red;
- font-size: large;
-}
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/index.html b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/index.html
deleted file mode 100644
index b1ad866fa6..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
- <head>
-   <meta http-equiv="pragma" content="no-cache" />
-   <title>Welcome to the Racket Web server!</title>
- </head>
-
- <body bgcolor="white">
-
-<blockquote>
-
-<table width="66%" bgcolor="white">
-<tr><td>
-  <h2>Welcome to the Racket Web Server</h2>
-
-  <p>Find out more about writing servlets by reading the <a href="http://docs.racket-lang.org/continue/index.html">Continue tutorial</a> in the Help Desk.</p>
-  <p>Find out more about the server by reading its <a href="http://docs.racket-lang.org/web-server/index.html">reference manual</a> in the Help Desk.</p>
-
-
-  <p>Please replace this page with your favorite index page.</p>
-
-  <p> Powered by
-  <a href="http://racket-lang.org/">Racket</a>
-  <p><font size="-2">
-  For more information on Racket, please follow the icon link.
-  </font>
-  </p>
-  </p>
-</table>
-
-</blockquote>
-
- </body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-native.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-native.rkt
deleted file mode 100644
index 8ad5c3c778..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-native.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang web-server
-(require web-server/managers/lru)
-
-(define interface-version 'stateless)
-(define manager
-  (make-threshold-LRU-manager #f (* 1024 1024 128)))
-(provide start manager interface-version)
-
-;; get-number-from-user: string -> number
-;; ask the user for a number
-(define (gn msg)
-  (let ([req
-         (send/suspend/url
-          (lambda (k-url)
-            (response/xexpr
-             `(html (head (title ,(format "Get ~a number" msg)))
-                    (body
-                     (form ([action ,(url->string k-url)]
-                            [method "get"]
-                            [enctype "application/x-www-form-urlencoded"])
-                           ,(format "Enter the ~a number to add: " msg)
-                           (input ([type "text"] [name "number"] [value ""]))
-                           (input ([type "submit"]))))))))])
-    (string->number
-     (cdr (assoc 'number (url-query (request-uri req)))))))
-
-(define (gn* m)
-  (first (serial->native (map (lambda (m) (native->serial (gn m))) (list m)))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a"
-                       (+ (gn* "first") (gn* "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-param.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-param.rkt
deleted file mode 100644
index 5c00af335e..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-param.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define msg (make-parameter "unknown"))
-(define printf void)
-
-(define (gn)
-  (printf "gn ~a\n" (msg))
-  (let* ([req
-          (send/suspend/url
-           (lambda (k-url)
-             (printf "ssu ~S\n" (msg))
-             (response/xexpr
-              `(html (head (title ,(format "Get ~a number" (msg))))
-                     (body
-                      (form ([action ,(url->string k-url)]
-                             [method "post"]
-                             [enctype "application/x-www-form-urlencoded"])
-                            ,(format "Enter the ~a number to add: " (msg))
-                            (input ([type "text"] [name "number"] [value ""]))
-                            (input ([type "submit"]))))))))]
-         [num (string->number
-               (bytes->string/utf-8
-                (binding:form-value
-                 (bindings-assq #"number" 
-                                (request-bindings/raw req)))))])
-    (printf "gn ~a ~a\n" (msg) num)
-    num))
-
-(define (start initial-request)
-  (printf "after s-s\n")
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a"
-                       (+ (parameterize ([msg "first"])
-                            (gn))
-                          (parameterize ([msg "second"])
-                            (gn)))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-simple.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-simple.rkt
deleted file mode 100644
index b473f75dac..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-simple.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define msg (make-web-parameter "unknown"))
-(define printf void)
-
-(define (gn)
-  (printf "gn ~a\n" (msg))
-  (let* ([req
-          (send/suspend/url
-           (lambda (k-url)
-             (printf "ssu ~S\n" (msg))
-             (response/xexpr
-              `(html (head (title ,(format "Get ~a number" (msg))))
-                     (body
-                      (form ([action ,(url->string k-url)]
-                             [method "post"]
-                             [enctype "application/x-www-form-urlencoded"])
-                            ,(format "Enter the ~a number to add: " (msg))
-                            (input ([type "text"] [name "number"] [value ""]))
-                            (input ([type "submit"]))))))))]
-         [num (string->number
-               (bytes->string/utf-8
-                (binding:form-value
-                 (bindings-assq #"number" 
-                                (request-bindings/raw req)))))])
-    (printf "gn ~a ~a\n" (msg) num)
-    num))
-
-(define (start initial-request)
-  (printf "after s-s\n")
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a"
-                       (+ (web-parameterize ([msg "first"])
-                                            (gn))
-                          (web-parameterize ([msg "second"])
-                                            (gn)))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-soft.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-soft.rkt
deleted file mode 100644
index f5d57c13c2..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add-soft.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define softie
-  (soft-state
-   "submit"))
-
-;; get-number-from-user: string -> number
-;; ask the user for a number
-(define (gn msg)
-  (let ([req
-         (send/suspend/url
-          (lambda (k-url)
-            (response/xexpr
-             `(html (head (title ,(format "Get ~a number" msg)))
-                    (body
-                     (form ([action ,(url->string k-url)]
-                            [method "get"]
-                            [enctype "application/x-www-form-urlencoded"])
-                           ,(format "Enter the ~a number to add: " msg)
-                           (input ([type "text"] [name "number"] [value ""]))
-                           (input ([type ,(soft-state-ref softie)]))))))))])
-    (string->number
-     (cdr (assoc 'number (url-query (request-uri req)))))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a"
-                       (+ (gn "first") (gn "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add.rkt
deleted file mode 100644
index 5c51c18f5a..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define printf void)
-
-;; get-number-from-user: string -> number
-;; ask the user for a number
-(define (get-number msg)
-  (printf "gn ~a\n" msg)
-  (let* ([req
-          (send/suspend/url
-           (lambda (k-url)
-             (printf "ssu\n")
-             (response/xexpr
-              `(html (head (title ,(format "Get ~a number" msg)))
-                     (body
-                      (form ([action ,(url->string k-url)]
-                             [method "post"]
-                             [enctype "application/x-www-form-urlencoded"])
-                            ,(format "Enter the ~a number to add: " msg)
-                            (input ([type "text"] [name "number"] [value ""]))
-                            (input ([type "submit"]))))))))]
-         [num (string->number
-               (bytes->string/utf-8
-                (binding:form-value
-                 (bindings-assq #"number" 
-                                (request-bindings/raw req)))))])
-    (printf "gn ~a ~a\n" msg num)
-    num))
-
-(define (start initial-request)
-  (printf "after s-s\n")
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a"
-                       (+ (get-number "first") (get-number "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add01.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add01.rkt
deleted file mode 100644
index d706449cbd..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add01.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-(require web-server/http
-         net/url)
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define (start req)
-  (let* ([uri (request-uri req)]
-         [qry (url-query uri)])
-    (cond
-      [(assoc 'second qry)
-       => (lambda (a-pair)
-            (response/xexpr
-             `(html (head (title "Answer Page"))
-                    (body
-                     (h1 "Answer Page")
-                     (p ,(format "The answer is: ~a"
-                                 (+ (string->number (cdr a-pair))
-                                    (string->number (cdr (assoc 'first qry))))))))))]
-      [(assoc 'first qry)
-       => (lambda (a-pair)
-            (response/xexpr
-             `(html (head (title "Second Page"))
-                    (body
-                     (h1 "Second Page")
-                     (form ([action ,(url->string uri)]
-                            [method "get"] [enctype "application/x-www-form-urlencoded"])
-                           "Enter the second number to add: "
-                           (input ([type "hidden"] [name "first"] [value ,(cdr a-pair)]))
-                           (input ([type "text"] [name "second"] [value ""]))
-                           (input ([type "submit"] [name "enter"] [value "Enter"])))))))]
-      [else
-       (response/xexpr
-        `(html (head (title "Hello"))
-               (body
-                (h1 "Hello World!")
-                (form ([action ,(url->string uri)]
-                       [method "get"] [enctype "application/x-www-form-urlencoded"])
-                      "Enter the first number to add: "
-                      (input ([type "text"] [name "first"] [value ""]))
-                      (input ([type "submit"] [name "enter"] [value "Enter"]))))))])))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add02-base.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add02-base.rkt
deleted file mode 100644
index fd279a6cf1..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add02-base.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang web-server/base
-(require web-server/http
-         web-server/lang/web
-         net/url)
-(define interface-version 'stateless)
-(provide start interface-version)
-
-;; get-number-from-user: string -> number
-;; ask the user for a number
-(define (gn msg)
-  (let ([req
-         (send/suspend/url
-          (lambda (k-url)
-            (response/xexpr
-             `(html (head (title ,(format "Get ~a number" msg)))
-                    (body
-                     (form ([action ,(url->string k-url)]
-                            [method "get"]
-                            [enctype "application/x-www-form-urlencoded"])
-                           ,(format "Enter the ~a number to add: " msg)
-                           (input ([type "text"] [name "number"] [value ""]))
-                           (input ([type "submit"]))))))))])
-    (string->number
-     (cdr (assoc 'number (url-query (request-uri req)))))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a"
-                       (+ (gn "first") (gn "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add02.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add02.rkt
deleted file mode 100644
index 3ae844baa7..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add02.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-;; get-number-from-user: string -> number
-;; ask the user for a number
-(define (gn msg)
-  (let ([req
-         (send/suspend/url
-          (lambda (k-url)
-            (response/xexpr
-             `(html (head (title ,(format "Get ~a number" msg)))
-                    (body
-                     (form ([action ,(url->string k-url)]
-                            [method "get"]
-                            [enctype "application/x-www-form-urlencoded"])
-                           ,(format "Enter the ~a number to add: " msg)
-                           (input ([type "text"] [name "number"] [value ""]))
-                           (input ([type "submit"]))))))))])
-    (string->number
-     (cdr (assoc 'number (url-query (request-uri req)))))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a"
-                       (+ (gn "first") (gn "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add03.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add03.rkt
deleted file mode 100644
index 218334e0d5..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add03.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-;; get-number-from-user: string -> number
-;; ask the user for a number
-(define (gn msg)
-  (let ([req
-         (send/suspend/hidden
-          (lambda (ses-url k-hidden)
-            (response/xexpr
-             `(html (head (title ,(format "Get ~a number" msg)))
-                    (body
-                     (form ([action ,(url->string ses-url)]
-                            [method "post"]
-                            [enctype "application/x-www-form-urlencoded"])
-                           ,(format "Enter the ~a number to add: " msg)
-                           (input ([type "text"] [name "number"] [value ""]))
-                           (input ([type "submit"]))
-                           ,k-hidden))))))])
-    (string->number
-     (bytes->string/utf-8
-      (binding:form-value
-       (bindings-assq #"number" 
-                      (request-bindings/raw req)))))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a"
-                       (+ (gn "first") (gn "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add04-stuffer.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add04-stuffer.rkt
deleted file mode 100644
index 3b715ef420..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add04-stuffer.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(define stuffer
-  (stuffer-chain
-   serialize-stuffer
-   (md5-stuffer (build-path (find-system-path 'home-dir) ".urls"))))
-(provide start interface-version stuffer)
-
-;; get-number-from-user: string -> number
-;; ask the user for a number
-(define (gn msg)
-  (let ([req
-         (send/suspend/url
-          (lambda (k-url)
-            (response/xexpr
-             `(html (head (title ,(format "Get ~a number" msg)))
-                    (body
-                     (form ([action ,(url->string k-url)]
-                            [method "post"]
-                            [enctype "application/x-www-form-urlencoded"])
-                           ,(format "Enter the ~a number to add: " msg)
-                           (input ([type "text"] [name "number"] [value ""]))
-                           (input ([type "submit"]))))))))])
-    (string->number
-     (bytes->string/utf-8
-      (binding:form-value
-       (bindings-assq #"number" 
-                      (request-bindings/raw req)))))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a"
-                       (+ (gn "first") (gn "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add04.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add04.rkt
deleted file mode 100644
index a7e828c555..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add04.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-;; get-number-from-user: string -> number
-;; ask the user for a number
-(define (gn msg)
-  (let ([req
-         (send/suspend/url
-          (lambda (k-url)
-            (response/xexpr
-             `(html (head (title ,(format "Get ~a number" msg)))
-                    (body
-                     (form ([action ,(url->string k-url)]
-                            [method "post"]
-                            [enctype "application/x-www-form-urlencoded"])
-                           ,(format "Enter the ~a number to add: " msg)
-                           (input ([type "text"] [name "number"] [value ""]))
-                           (input ([type "submit"]))))))))])
-    (string->number
-     (bytes->string/utf-8
-      (binding:form-value
-       (bindings-assq #"number" 
-                      (request-bindings/raw req)))))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a"
-                       (+ (gn "first") (gn "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add06.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add06.rkt
deleted file mode 100644
index ec7c8b39cd..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/add06.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-;; get-number-from-user: string -> number
-;; ask the user for a number
-(define (gn msg)
-  (send/suspend/url/dispatch
-   (lambda (embed/url)
-     (response/xexpr
-      `(html (head (title ,(format "Get ~a number" msg)))
-             (body
-              (form ([action ,(url->string 
-                               (embed/url 
-                                (lambda (req)
-                                  (string->number
-                                   (bytes->string/utf-8
-                                    (binding:form-value
-                                     (bindings-assq #"number" 
-                                                    (request-bindings/raw req))))))))]
-                     [method "post"]
-                     [enctype "application/x-www-form-urlencoded"])
-                    ,(format "Enter the ~a number to add: " msg)
-                    (input ([type "text"] [name "number"] [value ""]))
-                    (input ([type "submit"])))))))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a" (+ (gn "first") (gn "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/check-dir.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/check-dir.rkt
deleted file mode 100644
index 3e9e741abb..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/check-dir.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define (directory-page n)
-  (send/suspend/url
-   (lambda (k-url)
-     (response/xexpr
-      `(html (head (title ,(format "Page ~a" n)))
-             (body
-              (h1 ,(format "Page ~a" n))
-              (h2 ,(format "The current directory: ~a" (current-directory)))
-              (p "Click " (a ([href ,(url->string k-url)]) "here") " to continue."))))))
-  (directory-page (add1 n)))
-
-(define (start initial-request)
-  (directory-page 1))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/map.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/map.rkt
deleted file mode 100644
index 0a7084f335..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/map.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang web-server
-(require web-server/managers/lru)
-
-(define-native (build-list/native _ ho) build-list)
-
-(define interface-version 'stateless)
-(define manager
-  (make-threshold-LRU-manager #f (* 1024 1024 128)))
-
-(provide start interface-version manager)
-
-;; get-number-from-user: number -> number
-;; ask the user for a number
-(define (get-number-from-user message)
-  (let ([req
-         (send/suspend/url
-          (lambda (k-url)
-            (response/xexpr
-             `(html (head (title ,message))
-                    (body
-                     (form ([action ,(url->string k-url)]
-                            [method "post"]
-                            [enctype "application/x-www-form-urlencoded"])
-                           ,message
-                           (input ([type "text"] [name "number"] [value ""]))
-                           (input ([type "submit"]))))))))])
-    (string->number
-     (bytes->string/utf-8
-      (binding:form-value
-       (bindings-assq #"number" 
-                      (request-bindings/raw req)))))))
-
-(define (start initial-request)
-  (define how-many-numbers
-    (get-number-from-user "How many numbers do you want to add?"))
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Final Page")
-           (p ,(format "The answer is ~a"
-                       (apply +
-                              (build-list/native how-many-numbers
-                                                 (lambda (i)
-                                                   (get-number-from-user
-                                                    (format "Enter number ~a" (add1 i))))))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/mm00.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/mm00.rkt
deleted file mode 100644
index 0cc9738c2c..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/mm00.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define (gn which)
-  (cadr
-   (call-with-serializable-current-continuation
-    (lambda (k)
-      (let ([ignore (printf "Please send the ~a number.\n" which)])
-        k)))))
-
-(define (start initial)
-  (let ([ans (+ (gn "first")
-                (gn "second")
-                (gn "third"))])
-    (printf "The answer is: ~s\n" ans)
-    ans))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/mm01.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/mm01.rkt
deleted file mode 100644
index 734cb9f466..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/mm01.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define (gn which)
-  (cadr
-   (call-with-serializable-current-continuation
-    (lambda (k)
-      (let ([ignore (printf "Please send the ~a number.\n" which)])
-        k)))))
-
-(define (start initial)
-  (gn "first"))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/quiz-lib.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/quiz-lib.rkt
deleted file mode 100644
index 53a03ae268..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/quiz-lib.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang racket/base
-(require racket/serialize
-         web-server/http
-         net/url)
-(provide (struct-out mc-question)
-         make-cue-page
-         quiz)
-
-(define-serializable-struct mc-question (cue answers correct-answer))
-
-;; answer-rows: mc-question -> (listof `(tr ...))
-;; format the answers as rows for an html table
-(define (answer-rows mc-q)
-  (let loop ([i 0] [ans-strs (mc-question-answers mc-q)])
-    (cond
-      [(null? ans-strs) '()]
-      [else
-       (cons `(tr (td (input ([type "radio"]
-                              [name "answs"]
-                              [value ,(number->string i)])
-                             ,(car ans-strs))))
-             (loop (add1 i) (cdr ans-strs)))])))
-
-;; make-cue-page: mc-question -> url hidden-field -> html-page
-;; generate the page for the question
-(define (make-cue-page mc-q)
-  (lambda (ses-url k-hidden)
-    (response/xexpr
-     `(html (head (title "Question"))
-            (body
-             (form ([action ,(url->string ses-url)] [method "post"]
-                                                    [enctype "application/x-www-form-urlencoded"])
-                   ,(mc-question-cue mc-q)
-                   (table () ,@(answer-rows mc-q))
-                   (input ([type "submit"]))
-                   ,k-hidden))))))
-
-(define quiz
-  (list
-   (make-mc-question
-    "How old is the earth?"
-    (list
-     "6004 years"
-     "4.55 billion years"
-     "200,000 years")
-    1)
-   (make-mc-question
-    "Do bears like honey?"
-    (list "yes" "no")
-    0)
-   (make-mc-question
-    "How tall is the empire state building?"
-    (list "1,206 feet"
-          "511 meters"
-          "1,454 feet"
-          "107 floors")
-    2)
-   (make-mc-question
-    "What is the ultimate answer?"
-    (list "10" "true" "64" "42")
-    3)
-   (make-mc-question
-    "Where do babies come from?"
-    (list
-     "The cabbage patch"
-     "The stork"
-     "A watermelon seed"
-     "Wal-Mart")
-    1)
-   (make-mc-question
-    "Who was the first president of the United States?"
-    (list
-     "Thomas Jefferson"
-     "Theodore Roosevelt"
-     "George Washington"
-     "Douglas Fairbanks"
-     "John Adams"
-     )
-    2)
-   (make-mc-question
-    "What makes the world go 'round?"
-    (list
-     "money"
-     "love"
-     "angular momentum"
-     "sex")
-    0)))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/quiz01.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/quiz01.rkt
deleted file mode 100644
index 67e8a48adf..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/quiz01.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang web-server
-(require "quiz-lib.rkt")
-(define interface-version 'stateless)
-(provide start interface-version)
-
-;; get-answer: mc-question -> number
-;; get an answer for a multiple choice question
-(define (get-answer mc-q)
-  (string->number
-   (bytes->string/utf-8
-    (binding:form-value
-     (bindings-assq #"answs" 
-                    (request-bindings/raw 
-                     (send/suspend/hidden (make-cue-page mc-q))))))))
-
-;; get-answers: (listof mc-question) -> (listof number)
-;; get answers for all of the quiz questions.
-(define (get-answers mc-qs)
-  (cond
-    [(null? mc-qs) '()]
-    [else
-     (cons
-      (get-answer (car mc-qs))
-      (get-answers (cdr mc-qs)))]))
-
-;; tally-results: (listof mc-question) (listof number) -> number
-;; count the number of correct answers
-(define (tally-results mc-qs answs)
-  (cond
-    [(null? mc-qs) 0]
-    [(= (car answs)
-        (mc-question-correct-answer (car mc-qs)))
-     (add1 (tally-results (cdr mc-qs) (cdr answs)))]
-    [else (tally-results (cdr mc-qs) (cdr answs))]))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Quiz Results")
-           (p ,(format "You got ~a correct out of ~a questions."
-                       (tally-results quiz (get-answers quiz))
-                       (length quiz)))
-           (p "Thank you for taking the quiz")))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/quiz02.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/quiz02.rkt
deleted file mode 100644
index af049897f8..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/quiz02.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang web-server
-(require "quiz-lib.rkt")
-(define interface-version 'stateless)
-(provide start interface-version)
-
-;; get-answer: mc-question -> number
-;; get an answer for a multiple choice question
-(define (get-answer mc-q)
-  (string->number
-   (bytes->string/utf-8
-    (binding:form-value
-     (bindings-assq #"answs" 
-                    (request-bindings/raw 
-                     (send/suspend/hidden (make-cue-page mc-q))))))))
-
-;; get-answers: (-> (listof mc-question)) -> (listof number)
-;; get answers for all of the quiz questions.
-(define (get-answers get-mc-qs)
-  (cond
-    [(null? (get-mc-qs)) '()]
-    [else
-     (cons
-      (get-answer (car (get-mc-qs)))
-      (get-answers (lambda () (cdr (get-mc-qs)))))]))
-
-;; tally-results: (listof mc-question) (listof number) -> number
-;; count the number of correct answers
-(define (tally-results mc-qs answs)
-  (cond
-    [(null? mc-qs) 0]
-    [(= (car answs)
-        (mc-question-correct-answer (car mc-qs)))
-     (add1 (tally-results (cdr mc-qs) (cdr answs)))]
-    [else (tally-results (cdr mc-qs) (cdr answs))]))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Final Page"))
-          (body
-           (h1 "Quiz Results")
-           (p ,(format "You got ~a correct out of ~a questions."
-                       (tally-results quiz (get-answers (lambda () quiz)))
-                       (length quiz)))
-           (p "Thank you for taking the quiz")))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/redirectget.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/redirectget.rkt
deleted file mode 100644
index 699ffe32c6..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/redirectget.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define (start request)
-  (define request 
-    (send/suspend
-     (λ (url)
-       (response/xexpr
-        `(html
-          (head)
-          (body
-           (form ((action ,url))
-                 (input ((type "submit") (value "submit"))))))))))
-  (redirect/get)
-  (send/suspend
-   (λ (_)
-     (response/xexpr
-      `(html "bye")))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/soft.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/soft.rkt
deleted file mode 100644
index 4ee304ded5..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/soft.rkt
+++ /dev/null
@@ -1,18 +0,0 @@
-#lang web-server
-(provide interface-version start) 
-(define interface-version 'stateless)
-
-(define softie
-  (soft-state
-   (printf "Doing a long computation...\n")
-   (sleep 1)
-   5))
-
-(define (start req)
-  (soft-state-ref softie)
-  (printf "Done\n")
-  (start
-   (send/suspend
-    (lambda (k-url)
-      (response/xexpr
-       `(html (body (a ([href ,k-url]) "Done"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/wc-comp.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/wc-comp.rkt
deleted file mode 100644
index 126ae5d3ec..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/wc-comp.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang web-server
-(require web-server/lang/web-cell-component)
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define (start initial-request)
-  ; A top-level frame must exist
-  (define counter1 (make-counter))
-  (define counter2 (make-counter))
-  ; counter1 and counter2 must have been added to the top-level frame    
-  (define include1 (include-counter counter1))
-  (define include2 (include-counter counter2))
-  ; counter1 and counter2 may have been modified
-  (send/suspend/url/dispatch
-   (lambda (embed/url)
-     (response/xexpr
-      ; The frame (ref) must have been captured, any changes to web-cells after this will be lost
-      `(html 
-        (body (h2 "Web Cell Test")
-              (div (h3 "First")
-                   ,(include1 embed/url))
-              (div (h3 "Second")
-                   ,(include2 embed/url))))))))
-
-(define (make-counter) (make-web-cell 0))
-(define-component (include-counter counter (a-counter) embed/url)
-  `(div (h3 ,(number->string (web-cell-ref a-counter)))
-        (a ([href ,(url->string
-                    (embed/url
-                     (lambda _
-                       ; A new frame has been created
-                       (define last (web-cell-ref a-counter))
-                       ; It is a child of the parent frame, so we can inspect the value
-                       (web-cell-shadow a-counter (add1 last))
-                       ; The new frame has been modified
-                       (counter))))])
-           "+")))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/wc-fake.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/wc-fake.rkt
deleted file mode 100644
index 50cc1c5f20..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/wc-fake.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define (start initial-request)
-  (define counter1 0)
-  (define counter2 0)
-  (send/suspend/url/dispatch
-   (lambda (embed/url)
-     (let*-values ([(inc1 next-counter1 next-counter2) (include-counter counter1 counter2 embed/url)]
-                   [(inc2 next-counter2 next-counter1) (include-counter next-counter2 next-counter1 embed/url)])
-       (response/xexpr
-        `(html 
-          (body (h2 "Web Cell Test")
-                (div (h3 "First") ,(inc1 next-counter1 next-counter2))
-                (div (h3 "Second") ,(inc2 next-counter2 next-counter1)))))))))
-
-(define (include-counter my-counter other-counter embed/url)
-  (let/cc k
-    (letrec ([include
-              (lambda (next-my-counter next-other-counter)
-                `(div (h3 ,(number->string next-my-counter))
-                      (a ([href 
-                           ,(url->string
-                             (embed/url
-                              (lambda _
-                                (k include
-                                   (add1 next-my-counter)
-                                   next-other-counter))))])
-                         "Increment")))])
-      (values include
-              my-counter
-              other-counter))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/wc.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/wc.rkt
deleted file mode 100644
index c0260e3923..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/lang-servlets/wc.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang web-server
-(define interface-version 'stateless)
-(provide start interface-version)
-
-(define (start initial-request)
-  ; A top-level frame must exist
-  (define counter1 (make-counter))
-  (define counter2 (make-counter))
-  ; counter1 and counter2 must have been added to the top-level frame    
-  (define include1 (include-counter counter1))
-  (define include2 (include-counter counter2))
-  ; counter1 and counter2 may have been modified
-  (send/suspend/url/dispatch
-   (lambda (embed/url)
-     (response/xexpr
-      ; The frame (ref) must have been captured, any changes to web-cells after this will be lost
-      `(html 
-        (body (h2 "Web Cell Test")
-              (div (h3 "First")
-                   ,(include1 embed/url))
-              (div (h3 "Second")
-                   ,(include2 embed/url))))))))
-
-(define (make-counter)
-  (make-web-cell 0))
-
-(define (include-counter a-counter)
-  (let/cc k
-    (define (generate)
-      (k
-       (lambda (embed/url)
-         `(div (h3 ,(number->string (web-cell-ref a-counter)))
-               (a ([href ,(url->string
-                           (embed/url
-                            (lambda _
-                              ; A new frame has been created
-                              (define last (web-cell-ref a-counter))
-                              ; It is a child of the parent frame, so we can inspect the value
-                              (web-cell-shadow a-counter (add1 last))
-                              ; The new frame has been modified
-                              (generate))))])
-                  "+")))))
-    (generate)))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/plt-logo.gif b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/plt-logo.gif
deleted file mode 100644
index 99c0e15928..0000000000
Binary files a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/plt-logo.gif and /dev/null differ
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/configure.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/configure.rkt
deleted file mode 100644
index 4aa46e08d7..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/configure.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-; DO NOT DELETE THIS SERVLET,
-; unless you never want to reconfigure the Web server again.
-; The servlet accepts requests only from the *same machine* as the Web server
-; for security purposes.
-#lang racket/base
-(require web-server/private/configure)
-(provide (all-from-out web-server/private/configure))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-compat0.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-compat0.rkt
deleted file mode 100644
index ba71b5866f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-compat0.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-(require web-server/servlet
-         web-server/compat/0/coerce)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-; request-number : str -> num
-(define (request-number which-number)
-  (send/suspend/dispatch
-   (lambda (embed/url)
-     `(html (head (title "Enter a Number to Add"))
-            (body ([bgcolor "white"])
-                  (form ([action ,(embed/url
-                                   (lambda (request)
-                                     (string->number
-                                      (extract-binding/single
-                                       'number
-                                       (request-bindings request)))))]
-                         [method "post"])
-                        "Enter the " ,which-number " number to add: "
-                        (input ([type "text"] [name "number"] [value ""]))
-                        (input ([type "submit"] [name "enter"] [value "Enter"]))))))))
-
-(define (start initial-request)
-  `(html (head (title "Sum"))
-         (body ([bgcolor "white"])
-               (p "The answer is "
-                  ,(number->string (+ (request-number "first") (request-number "second")))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-dispatch.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-dispatch.rkt
deleted file mode 100644
index e8b3609da4..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-dispatch.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang racket/base
-(require web-server/servlet)
-
-(define (extract-number req)
-  (string->number
-   (extract-binding/single
-    'number
-    (request-bindings req))))
-
-; build-request-page : str str -> response
-(define (build-request-page which-number k-url)
-  (response/xexpr
-   `(html (head (title "Enter a Number to Add"))
-          (body ([bgcolor "white"])
-                (form ([action ,k-url] [method "post"])
-                      "Enter the " ,which-number " number to add: "
-                      (input ([type "text"] [name "number"] [value ""]))
-                      (input ([type "submit"] [name "enter"] [value "Enter"])))))))
-
-(define (get-first req)
-  (build-request-page "First" (add-url get-second)))
-
-(define (get-second req)
-  (define fst (extract-number req))
-  (build-request-page "Second" (add-url display-sum fst)))
-
-(define (display-sum req fst)
-  (define snd (extract-number req))
-  (response/xexpr
-   `(html (head (title "Sum"))
-          (body ([bgcolor "white"])
-                (p "The answer is "
-                   ,(number->string (+ fst snd)))))))
-
-(define-values (start add-url)
-  (dispatch-rules
-   [("get-second") get-second]
-   [("display-sum" (integer-arg)) display-sum]
-   [else get-first]))
-
-(serve/dispatch start)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-formlets0.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-formlets0.rkt
deleted file mode 100644
index 4c470e3cc2..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-formlets0.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-(require web-server/servlet
-         web-server/formlets)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-; request-number : str -> num
-(define (request-number which-number)
-  (send/formlet
-   (formlet
-    (#%# "Enter the " ,which-number " number to add: "
-         ,{input-int . => . the-number}
-         (input ([type "submit"] [name "enter"] [value "Enter"])))
-    the-number)
-   #:wrap
-   (lambda (f-expr)
-     `(html (head (title "Enter a Number to Add"))
-            (body ([bgcolor "white"])
-                  ,f-expr)))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Sum"))
-          (body ([bgcolor "white"])
-                (p "The answer is "
-                   ,(number->string (+ (request-number "first") (request-number "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-formlets1.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-formlets1.rkt
deleted file mode 100644
index 97f1a74a20..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-formlets1.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-(require web-server/servlet
-         web-server/formlets)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-; request-number : str -> num
-(define (request-number which-number)
-  (send/formlet
-   (formlet
-    (#%# "Enter the " ,which-number " number to add: "
-         ,{input-int . => . the-number}
-         (input ([type "submit"] [name "enter"] [value "Enter"])))
-    the-number)
-   #:method
-   "GET"
-   #:wrap
-   (lambda (f-expr)
-     `(html (head (title "Enter a Number to Add"))
-            (body ([bgcolor "white"])
-                  ,f-expr)))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Sum"))
-          (body ([bgcolor "white"])
-                (p "The answer is "
-                   ,(number->string (+ (request-number "first") (request-number "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-formlets2.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-formlets2.rkt
deleted file mode 100644
index 0c943bcd4a..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-formlets2.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-(require web-server/servlet
-         web-server/formlets)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-; request-number : str -> num
-(define (request-number which-number)
-  (send/formlet
-   (formlet
-    (#%# "Enter the " ,which-number " number to add: "
-         ,{input-int . => . the-number}
-         (input ([type "submit"] [name "enter"] [value "Enter"])))
-    the-number)
-   #:method
-   "POST"
-   #:wrap
-   (lambda (f-expr)
-     `(html (head (title "Enter a Number to Add"))
-            (body ([bgcolor "white"])
-                  ,f-expr)))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Sum"))
-          (body ([bgcolor "white"])
-                (p "The answer is "
-                   ,(number->string (+ (request-number "first") (request-number "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-page.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-page.rkt
deleted file mode 100644
index d247fc360e..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-page.rkt
+++ /dev/null
@@ -1,29 +0,0 @@
-#lang racket/base
-(require web-server/servlet
-         web-server/page)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-(define (request-number which-number)
-  (let/ec esc
-    (page
-     (response/xexpr
-      `(html (head (title "Enter a Number to Add"))
-             (body ([bgcolor "white"])
-                   (form ([action ,(embed/url
-                                    (lambda/page ()
-                                                 (esc
-                                                  (string->number
-                                                   (get-binding 'number)))))]
-                          [method "post"])
-                         "Enter the " ,which-number " number to add: "
-                         (input ([type "text"] [name "number"] [value ""]))
-                         (input ([type "submit"] [name "enter"] [value "Enter"])))))))))
-
-(define/page (start)
-  (response/xexpr
-   `(html (head (title "Sum"))
-          (body ([bgcolor "white"])
-                (p "The answer is "
-                   ,(number->string (+ (request-number "first") (request-number "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-ssd.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-ssd.rkt
deleted file mode 100644
index 607a5a8b74..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-ssd.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang racket/base
-(require web-server/servlet)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-; request-number : str -> num
-(define (request-number which-number)
-  (send/suspend/dispatch
-   (lambda (embed/url)
-     (response/xexpr
-      `(html (head (title "Enter a Number to Add"))
-             (body ([bgcolor "white"])
-                   (form ([action ,(embed/url
-                                    (lambda (request)
-                                      (string->number
-                                       (extract-binding/single
-                                        'number
-                                        (request-bindings request)))))]
-                          [method "post"])
-                         "Enter the " ,which-number " number to add: "
-                         (input ([type "text"] [name "number"] [value ""]))
-                         (input ([type "submit"] [name "enter"] [value "Enter"])))))))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Sum"))
-          (body ([bgcolor "white"])
-                (p "The answer is "
-                   ,(number->string (+ (request-number "first") (request-number "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-v2.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-v2.rkt
deleted file mode 100644
index 19f49259bc..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add-v2.rkt
+++ /dev/null
@@ -1,34 +0,0 @@
-#lang racket/base
-(require web-server/servlet
-         web-server/managers/timeouts)
-(provide (all-defined-out))
-(define interface-version 'v2)
-(define manager
-  (create-timeout-manager
-   (lambda _ (response/xexpr `(html (body "Expired"))))
-   360 360))
-
-; request-number : str -> num
-(define (request-number which-number)
-  (string->number
-   (extract-binding/single
-    'number
-    (request-bindings (send/suspend (build-request-page which-number))))))
-
-; build-request-page : str -> str -> response
-(define (build-request-page which-number)
-  (lambda (k-url)
-    (response/xexpr
-     `(html (head (title "Enter a Number to Add"))
-            (body ([bgcolor "white"])
-                  (form ([action ,k-url] [method "post"])
-                        "Enter the " ,which-number " number to add: "
-                        (input ([type "text"] [name "number"] [value ""]))
-                        (input ([type "submit"] [name "enter"] [value "Enter"]))))))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Sum"))
-          (body ([bgcolor "white"])
-                (p "The answer is "
-                   ,(number->string (+ (request-number "first") (request-number "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add.rkt
deleted file mode 100644
index 7b67e5bec4..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/add.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang racket/base
-(require web-server/servlet)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-; request-number : str -> num
-(define (request-number which-number)
-  (string->number
-   (extract-binding/single
-    'number
-    (request-bindings (send/suspend (build-request-page which-number))))))
-
-; build-request-page : str -> str -> response
-(define (build-request-page which-number)
-  (lambda (k-url)
-    (response/xexpr
-     `(html (head (title "Enter a Number to Add"))
-            (body ([bgcolor "white"])
-                  (form ([action ,k-url] [method "post"])
-                        "Enter the " ,which-number " number to add: "
-                        (input ([type "text"] [name "number"] [value ""]))
-                        (input ([type "submit"] [name "enter"] [value "Enter"]))))))))
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Sum"))
-          (body ([bgcolor "white"])
-                (p "The answer is "
-                   ,(number->string (+ (request-number "first") (request-number "second"))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/adjust.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/adjust.rkt
deleted file mode 100644
index e82e2cfbdd..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/adjust.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-(require web-server/servlet)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-(define (start initial-request)
-  (adjust-timeout! 1)
-  (send/suspend
-   (lambda (k-url)
-     (response/xexpr
-      `(html (head (title "Hello"))
-             (body (a ([href ,k-url])
-                      "Link"))))))
-  (response/xexpr
-   `(html (body "Should not happen"))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/bad-xexpr.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/bad-xexpr.rkt
deleted file mode 100644
index 663b4a0826..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/bad-xexpr.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang web-server/insta
-(define (start initial-request)
-  (response/xexpr
-   `(html (head (title "Foo"))
-          (body (a ([href #f])
-                   "Zog")))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/basic.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/basic.rkt
deleted file mode 100644
index 1a9c17fc55..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/basic.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang web-server/insta
-
-(define (start req)
-  (match (request->basic-credentials req)
-    [(cons user pass)
-     `(html (head (title "Basic Auth Test"))
-            (body (h1 "User: " ,(bytes->string/utf-8 user))
-                  (h1 "Pass: " ,(bytes->string/utf-8 pass))))]
-    [else
-     (response
-      401 #"Unauthorized" (current-seconds) TEXT/HTML-MIME-TYPE
-      (list (make-basic-auth-header (format "Basic Auth Test: ~a" (gensym))))
-      void)]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/clear.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/clear.rkt
deleted file mode 100644
index a75dc7f3d8..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/clear.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require web-server/servlet)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-(define (start initial-request)
-  (parameterize ([current-servlet-continuation-expiration-handler
-                  (lambda _
-                    (response/xexpr
-                     `(html (body "Expired"))))])
-    (send/suspend (lambda (k-url) (response/xexpr `(html (a ([href ,k-url]) "Link")))))
-    (send/forward (lambda (k-url) (response/xexpr `(html (a ([href ,k-url]) "Link")))))
-    (send/finish (response/xexpr `(html (body "Done."))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/cookie.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/cookie.rkt
deleted file mode 100644
index 2b6fe0ff29..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/cookie.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang web-server/insta
-(require net/url)
-
-(define (start req)
-  (define cookies (request-cookies req))
-  (define id-cookie
-    (findf (lambda (c)
-             (string=? "id" (client-cookie-name c)))
-           cookies))
-  (if id-cookie
-      (hello (client-cookie-value id-cookie))
-      (redirect-to
-       (url->string (request-uri req))
-       see-other
-       #:headers
-       (list
-        (cookie->header (make-cookie "id" "joseph"))))))
-
-(define (hello who)
-  (response/xexpr
-   `(html (head (title "Hello!"))
-          (body
-           (h1 "Hello "
-               ,who)))))
-
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/cookie2.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/cookie2.rkt
deleted file mode 100644
index d7286a5961..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/cookie2.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-#lang web-server/insta
-(require net/url)
-
-(define (start req)
-  (define cookies (request-cookies req))
-  (define id-cookie
-    (findf (lambda (c)
-             (string=? "id" (client-cookie-name c)))
-           cookies))
-  (define who
-    (if id-cookie
-        (client-cookie-value id-cookie)
-        #f))
-  (define new-req
-    (send/suspend
-     (lambda (k-url)
-       (response/xexpr
-        `(html (head (title "Hello!"))
-               (body (h1 "Hello " ,(if who who "<unknown>"))
-                     (form ([action ,k-url])
-                           (input ([name "who"])))))))))
-  (define binds
-    (request-bindings/raw new-req))
-  (match (bindings-assq #"who" binds)
-    [(? binding:form? b)
-     (define new-who 
-       (bytes->string/utf-8 (binding:form-value b)))
-     (redirect-to (url->string (request-uri req))
-                  see-other
-                  #:headers
-                  (list
-                   (cookie->header (make-cookie "id" new-who))))]
-    [else
-     (redirect-to
-      (url->string (request-uri req))
-      see-other)]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/count.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/count.rkt
deleted file mode 100644
index 7da5df717c..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/count.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-(require racket/date
-         web-server/http)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-(define count 0)
-(define a-date (date->string (seconds->date (current-seconds)) #t))
-(define (start initial-request)
-  (define other-count 0)
-  
-  (set! other-count (add1 other-count))
-  (set! count (add1 count))
-  
-  (response/xexpr
-   `(html (head (title "Counter"))
-          (body ([bgcolor "white"])
-                (p "This servlet was called " ,(number->string count)
-                   " times and " ,(number->string other-count)
-                   " times since loaded on " ,a-date ".")))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/digest.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/digest.rkt
deleted file mode 100644
index 0a7a8740e7..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/digest.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang web-server/insta
-(require racket/pretty)
-
-(define private-key "private-key")
-(define opaque "opaque")
-
-(define (start req)
-  (match (request->digest-credentials req)
-    [#f
-     (response
-      401 #"Unauthorized" (current-seconds) TEXT/HTML-MIME-TYPE
-      (list (make-digest-auth-header
-             (format "Digest Auth Test: ~a" (gensym))
-             private-key opaque))
-      void)]
-    [alist
-     (define check
-       (make-check-digest-credentials
-        (password->digest-HA1 (lambda (username realm) "pass"))))
-     (define pass?
-       (check "GET" alist))
-     (response/xexpr
-      `(html (head (title "Digest Auth Test"))
-             (body 
-              (h1 ,(if pass? "Pass!" "No Pass!"))
-              (pre ,(pretty-format alist)))))]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/dir.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/dir.rkt
deleted file mode 100644
index d4c38d4996..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/dir.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require web-server/servlet)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-(define (start initial-request)
-  (send/back
-   (response/xexpr
-    `(html (head (title "Current Directory Page"))
-           (body
-            (h1 "Current Directory Page")
-            (p "The current directory is: " (em ,(path->string (current-directory)))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/english-measure-questions.rktd b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/english-measure-questions.rktd
deleted file mode 100644
index a663164986..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/english-measure-questions.rktd
+++ /dev/null
@@ -1,154 +0,0 @@
-;; Data file for quiz, written by Don Felgar
-("This is a quiz on English weights and measures.  Good luck!"
-  (
-   ("How many imperial gallons in a firkin?"
-    ("4" "5" "8" "9")
-    3
-    "The firkin is a liquor volume, equalling nine imperial gallons.
-An imperial gallon is equals 1.20095 gallons, by the way.
-Alternatively te firkin is one-fourth of a barrel.")
-   ("How many tablespoons in a cup?"
-    ("4" "6" "8" "16")
-    3
-    "Recipes in the US most often use tablespoons, teaspoons, and
-cups.")
-   ("How many teacups in a cup?"
-    ("1/2" "3/4" "1" "1.5")
-    1
-    "")
-   ("A magnum is how many gallons?"
-    ("0.5" "1" "1.5" "2")
-    3
-    "Wine bottles, in order of size, are: bottle, magnum, jeroboam,
-rehoboam, methuselah, salmanazar, balthazar, and nebuchadnezzar, which
-holds 5 gallons.")
-   ("A kilderkin is how many gallons?"
-    ("5" "18" "20" "25")
-    1
-    "")
-   ("How many magnums in a rehoboam?"
-    ("3" "4" "5" "10")
-    0
-    "Wine bottles, in order of size, are: bottle, magnum, jeroboam,
-rehoboam, methuselah, salmanazar, balthazar, and nebuchadnezzar, which
-holds 5 gallons.")
-   ("How many scruples in a Troy ounce?"
-    ("8" "24" "48" "196")
-    1
-    "20 grains in a scruple, 24 scruples in a Troy ounce.  The scruple is an apothecary measurement.")
-   ("How many cups are in a quart?"
-    ("2" "2.5" "3" "4")
-    3
-    "Two cups in a pint, two pints in a quart, four quarts in a gallon.")
-   ("How many cups in a pint?"
-    ("2" "2.5" "3" "4")
-    0
-    "Two cups in a pint, two pints in a quart, four quarts in a gallon.")
-   ("How many pecks in a bushel?"
-    ("4" "5" "8" "10")
-    0
-    "Note: The Winchester bushel, formerly used in England,
-contained 2150.42 cubic inches, being the volume of a cylinder 181/2
-inches in internal diameter and eight inches in depth. The standard
-bushel measures, prepared by the United States Government and
-distributed to the States, hold each 77.6274 pounds of distilled
-water, at 39.8[deg] Fahr. and 30 inches atmospheric pressure, being
-the equivalent of the Winchester bushel. The imperial bushel now in
-use in England is larger than the Winchester bushel, containing 2218.2
-cubic inches, or 80 pounds of water at 62[deg] Fahr.")
-   ("A jigger is:"
-    ("1/3 of a tablespoon" "2 tablespoons" "3 tablespoons" "4 tablespoons")
-    2
-    "A jigger is the amount a shot glass contains.  The pony is
-another drink volume measure, equalling half a jigger.  There's also
-the English beer gallon.")
-   ("How many grains in a pound:"
-    ("400" "500" "512" "7000")
-    3
-    "According to Webster's: \"The unit of the English system of
-weights; -- so called because considered equal to the average of
-grains taken from the middle of the ears of wheat. 7,000 grains
-constitute the pound avoirdupois, and 5,760 grains the pound troy. A
-grain is equal to .0648 gram.\"")
-   ("How many tablespoons in a fluid ounce:"
-    ("0.5" "1" "2" "4")
-    2
-    "Recipes in the US most often use tablespoons, teaspoons, and
-cups.")
-   ("At standard temperature and pressure, one fluid ounce of water
-weighs:"
-    ("1.04158 ounces avoirdupois" "1 ounce avoirdupois" "1 troy ounce" "none of the above")
-    0
-    "Good question.")
-   ("A person who weighs 10 stone weighs how many pounds:"
-    ("90" "100" "120" "140")
-    3
-    "One stone for human weight is 14 pounds. Note: The stone of
-butchers' meat or fish is reckoned at 8 lbs.; of cheese, 16 lbs.; of
-hemp, 32 lbs.; of glass, 5 lbs. (Webster's).  Time to go metric.")
-   ("How many cord foot are in a cord?"
-    ("2" "4" "8" "9")
-    2
-    "According to Webster's, a cord is \"A solid measure,
-equivalent to 128 cubic feet; a pile of wood, or other coarse
-material, eight feet long, four feet high, and four feet broad; --
-originally measured with a cord or line.\"")
-   ("A teacup is how many fluid ounces?"
-    ("4" "5" "6" "8")
-    0
-    "")
-   ("A mile is how many feet?"
-    ("4,000" "5,120" "5,280" "6,000")
-    2
-    "5,280 feet, 1,760 yards.")
-   ("How many acres in a square mile?"
-    ("320" "400" "500" "640")
-    3
-    "")
-   ("How many fluid ounces in a gallon?"
-    ("32" "64" "128" "256")
-    2
-    "")
-   ("In the US we refer to oil quantities in barrels.  How many
-gallons in an oil barrel (also known as petroleum barrel)?"
-    ("42" "120" "128" "150")
-    0
-    "Alternatively, one oil barrel equals 896 tea cups.")
-   ("How many teaspoons in a tablespoon?"
-    ("2" "2.5" "3" "4")
-    2
-    "")
-   ("One fluid dram equals how many fluid ounces:"
-    ("0.1" "0.125" "0.5" "0.75")
-    1
-    "As with the ounce, there is a fluid dram and a weight dram.  A
-weight dram is 0.0625 of an ounce.  What's worse, there is a Troy
-ounce as well as an avoirdupois ounce.")
-   ("One Troy carat is equal to:"
-    ("3.2 grains Troy" "5 grains Troy" "7.5 grains Troy" "10 grains Troy")
-    0
-    "\"Note: The carat equals three and one fifth grains Troy, and is
-divided into four grains, sometimes called carat grains. Diamonds and
-other precious stones are estimated by carats and fractions of carats,
-and pearls, usually, by carat grains. --Tiffany\" (As quoted from
-Webster's).  Additionally, carat can mean 24th part; 22 carat gold is
-22/24's gold.")
-   ("How many Troy ounces are in a pound?"
-    ("8" "10" "12" "16")
-    2
-    "According to Webster's: \"Troy weight, the weight which gold and
-silver, jewels, and the like, are weighed. It was so named from
-Troyes, in France, where it was first adopted in Europe. The troy
-ounce is supposed to have been brought from Cairo during the
-crusades. In this weight the pound is divided into 12 ounces, the
-ounce into 20 pennyweights, and the pennyweight into 24 grains; hence,
-the troy ounce contains 480 grains, and the troy pound contains 5760
-grains. The avoirdupois pound contains 7000 troy grains; so that 175
-pounds troy equal 144 pounds avoirdupois, or 1 pound troy = 0.82286 of
-a pound avoirdupois, and 1 ounce troy = 117/175 or 1.09714 ounce
-avoirdupois. Troy weight when divided, the pound into 12 ounces, the
-ounce into 8 drams, the dram into 3 scruples, and the scruple into 20
-grains, is called apothecaries' weight, used in weighing medicines,
-etc. In the standard weights of the United States, the troy ounce is
-divided decimally down to the 1/10000 part.\"")
-   ))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/error.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/error.rkt
deleted file mode 100644
index d60570a411..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/error.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang racket/base
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-(define (start initial-request)
-  (error 'error "Whoops"))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/fupload.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/fupload.rkt
deleted file mode 100644
index b04923e1c0..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/fupload.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-(require racket/match
-         web-server/servlet)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-(define (start initial-request)
-  (define req
-    (send/suspend
-     (lambda (k-url)
-       (response/xexpr
-        `(html (body (form ([action ,k-url] 
-                            [method "post"]
-                            [enctype "multipart/form-data"])
-                           (input ([type "file"]
-                                   [name "somename"]))
-                           (input ([type "submit"])))))))))
-  (define (header->xexpr h)
-    (match h
-      [(struct header (field value))
-       `(li (ul (li "Field: " ,(bytes->string/utf-8 field))
-                (li "Value: " ,(bytes->string/utf-8 value))))]))
-  (define (binding->xexpr b)
-    (match b
-      [(struct binding:form (field value))
-       `(li (ul (li "Field: " ,(bytes->string/utf-8 field))
-                (li "Value: " ,(bytes->string/utf-8 value))))]
-      [(struct binding:file (field filename headers content))
-       `(li (ul (li "Field: " ,(bytes->string/utf-8 field))
-                (li "Name: " ,(bytes->string/utf-8 filename))
-                (li "Headers: " (ul ,@(map header->xexpr headers)))
-                (li "Contents: " (pre ,(bytes->string/utf-8 content)))))]))
-  (response/xexpr
-   `(html (body ([bgcolor "white"])
-                (p "Uploaded:"
-                   (ul ,@(map binding->xexpr (request-bindings/raw req))))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/hello.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/hello.rkt
deleted file mode 100644
index 83ec2cd184..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/hello.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-(require web-server/http)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-(define (start initial-request)
-  (define the-text "Hello, Web!")
-  (response/xexpr
-   `(html (head (title ,the-text))
-          (body ([bgcolor "white"])
-                (p ,the-text)))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/info.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/info.rkt
deleted file mode 100644
index dd3354d122..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/info.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang info
-
-(define test-omit-paths '("add-dispatch.rkt"
-                          "bad-xexpr.rkt"
-                          "basic.rkt"
-                          "cookie.rkt"
-                          "cookie2.rkt"
-                          "digest.rkt"))
-
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/port.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/port.rkt
deleted file mode 100644
index 4be3a20e25..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/port.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-(require web-server/servlet
-         racket/list)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-(define (start initial-request)
-  (response
-   200 #"Okay" (current-seconds) #"text/html" empty
-   (λ (op)
-     (display #<<END
-<html><body><p>Hello, Web!</p></body></html>
-END
-              op))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/quiz.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/quiz.rkt
deleted file mode 100644
index 0e4fcd55d2..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/quiz.rkt
+++ /dev/null
@@ -1,209 +0,0 @@
-#lang racket/base
-;; Written by Don Felgar, edited by Greg Pettyjohn
-;;
-;; Multiple-choice quiz Racket servlet sample.
-;;
-;;
-;; Question sexp interface:
-;; Questions = (listof intro-text (listof question))
-;; intro-text = string explaining what test is about
-;; question = (question-text choices correct-answer explanation)
-;; question-text = string, the actual question
-;; choices = (listof string), possible answers to the question
-;; correct-answer = integer, index into choices
-;;
-;; Configuration
-(require racket/runtime-path
-         racket/file
-         (for-syntax racket/base))
-(define-runtime-path *data-file*
-  "english-measure-questions.rktd")
-(define *questions-per-quiz* 5)
-
-(require web-server/servlet
-         mzlib/list
-         mzlib/etc)
-
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-;; Accessors into question sexp's
-(define question-text car)
-(define question-choices cadr)
-(define question-answer caddr)
-(define question-explanation cadddr)
-
-(define quiz (file->value *data-file*))
-(define quiz-intro (first quiz))
-(define all-questions (second quiz))
-
-;; ask-question: question number number -> (listof (cons symbol string))
-;; Page for asking quiz question.
-;; result contains a binding for 'answer
-(define (ask-question question-sexp question-number n-questions)
-  (request-bindings
-   (send/suspend
-    (lambda (k-url)
-      (let ((answer-num -1))
-        (response/xexpr
-         `(html
-           (head
-            (title "Quiz Servlet")
-            (body
-             (p ,(format "Question ~A of ~A" (add1 question-number)
-                         n-questions))
-             (p ,(question-text question-sexp))
-             (form ((method "post") (action ,k-url))
-                   ,@(map (lambda (choice)
-                            (set! answer-num (add1 answer-num))
-                            `(p
-                              ,(choice-descriptor answer-num) ". "
-                              (input ((type "radio")
-                                      (name "answer")
-                                      (value ,(number->string
-                                               answer-num))))
-                              ,choice))
-                          (cadr question-sexp))
-                   (input ((type "submit")
-                           (value "Next")))))))))))))
-
-;; ((listof question-sexp) size) -> (listof question-sexp)
-;; Choose a subset (without duplicates) of given size from a given list
-;; assume subset-size <= (length questions)
-(define (random-question-set questions subset-size)
-  (let choose-questions ([questions questions]
-                         [chosen '()])
-    (if (= (length chosen) subset-size)
-        chosen
-        (let ([qstn (list-ref questions (random (length questions)))])
-          (choose-questions
-           (filter
-            (lambda (q)
-              (not (eq? qstn q)))
-            questions)
-           (cons qstn chosen))))))
-
-;; choice-descriptor: number -> character
-;; Map 0 to "A", 1 to "B", etc
-(define (choice-descriptor number)
-  (string (integer->char (+ (char->integer #\A) number))))
-
-;; begin-quiz: -> request
-;; request bindings are not currently used
-(define (begin-quiz)
-  (send/suspend
-   (lambda (k-url)
-     (response/xexpr
-      `(html
-        (head
-         (title "Quiz Servlet"))
-        (body
-         (p ,quiz-intro)
-         (form ((method "post") (action ,k-url))
-               (input ((type "submit")
-                       (value "Begin Quiz"))))))))))
-
-;; Compare list of questions to answers.
-;; ((listof question-sexp) (listof integer|false)) -> (listof integer)
-(define (score-quiz questions answers)
-  (foldr
-   (lambda (question answer csw)
-     (let ([correct-answer (question-answer question)])
-       (apply
-        (lambda (correct skipped wrong)
-          (cond
-            [(not answer)
-             (list correct (add1 skipped) wrong)]
-            [(= answer correct-answer)
-             (list (add1 correct) skipped wrong)]
-            [else
-             (list correct skipped (add1 wrong))]))
-        csw)))
-   (list 0 0 0) questions answers))
-
-;; end-quiz: (listof question) (listof (or/c number false)) -> request
-;; request bindings are not currently used.
-(define (end-quiz questions answers)
-  (send/forward
-   (lambda (k-url)
-     (let* ((score (score-quiz questions answers))
-            (correct (car score))
-            (skipped (cadr score))
-            (wrong (caddr score))
-            (xml
-             (response/xexpr
-              `(html
-                (head
-                 (title "Quiz Servlet"))
-                (body
-                 (p ,(format "Your score: ~A/~A"
-                             correct
-                             (+ correct wrong skipped)))
-                 (p ,(format "Correct: ~A" correct))
-                 (p ,(format "Skipped: ~A" skipped))
-                 (p ,(format "Wrong: ~A" wrong))
-                 (table ((border "5"))
-                        (tr (td "Question") (td "Correct Answer")
-                            (td "Your Answer") (td "Explanation"))
-                        ,@(map
-                           (lambda (q a)
-                             `(tr
-                               (td ,(question-text q))
-                               (td ,(format "~A. ~A"
-                                            (choice-descriptor
-                                             (question-answer q))
-                                            (list-ref (question-choices q)
-                                                      (question-answer q))))
-                               (td ,(if a
-                                        (format "~A. ~A" (choice-descriptor a)
-                                                (list-ref
-                                                 (question-choices q) a))
-                                        "Skipped"))
-                               (td ,(question-explanation q))))
-                           questions answers))
-                 (form ((method "get")
-                        (action ,k-url))
-                       (input ((type "submit")
-                               (value "New Quiz")))))))))
-       xml))))
-
-;; Return the first value for key in bindings, if it at least one
-;; exists, otherwise #f.
-(define (binding-value key bindings)
-  (and (exists-binding? key bindings)
-       (extract-binding/single key bindings)))
-
-;; run-quiz: -> void
-;; run quizzes until the student gets tired
-(define (run-quiz)
-  (let ([*questions-per-quiz*
-         (if (> *questions-per-quiz* (length all-questions))
-             (begin
-               (display (format "~A ~A ~A ~A\n"
-                                "Configuration error.  *questions-per-quiz*:"
-                                *questions-per-quiz*
-                                "for a question list of size"
-                                (length all-questions)))
-               (length all-questions))
-             *questions-per-quiz*)])
-    
-    (let ([questions (random-question-set all-questions
-                                          *questions-per-quiz*)])
-      (begin-quiz)
-      (let ([answers
-             (build-list (length questions)
-                         (lambda (question-number)
-                           (let ([answer
-                                  (binding-value 'answer
-                                                 (ask-question
-                                                  (list-ref questions question-number)
-                                                  question-number
-                                                  *questions-per-quiz*))])
-                             (and answer (string->number answer)))))])
-        (end-quiz questions answers))))
-  (run-quiz))
-
-;; Entry point into servlet.
-(define (start initial-request)
-  (run-quiz))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/response.rktd b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/response.rktd
deleted file mode 100644
index df7278c20d..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/response.rktd
+++ /dev/null
@@ -1,3 +0,0 @@
-`(html (head (title "Hello"))
-       (body ([bgcolor "white"])
-             (p "Hello")))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/static.html b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/static.html
deleted file mode 100644
index b211384e7a..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/static.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-  <head><title>Title</title></head>
-  <body>
-    <table>
-      <tr>
-        <td>Example, Mr.</td>
-        <td><a href="mailto:example@"@"foo.com">example@"@"foo.com</a></td>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-compat0.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-compat0.rkt
deleted file mode 100644
index 4481c5b67a..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-compat0.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-(require web-server/templates
-         web-server/http
-         web-server/compat/0/coerce)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-(define (start initial-request)
-  (cons TEXT/HTML-MIME-TYPE
-        (list (string->bytes/utf-8 (include-template "static.html")))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-full.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-full.rkt
deleted file mode 100644
index 6cf4abb6d2..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-full.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require racket/list
-         web-server/templates
-         web-server/http)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-(define (start initial-request)
-  (response/full
-   200 #"Okay"
-   (current-seconds) TEXT/HTML-MIME-TYPE
-   empty
-   (list (string->bytes/utf-8 (include-template "static.html")))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-simple.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-simple.rkt
deleted file mode 100644
index 6cf4abb6d2..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-simple.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require racket/list
-         web-server/templates
-         web-server/http)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-(define (start initial-request)
-  (response/full
-   200 #"Okay"
-   (current-seconds) TEXT/HTML-MIME-TYPE
-   empty
-   (list (string->bytes/utf-8 (include-template "static.html")))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-xexpr.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-xexpr.rkt
deleted file mode 100644
index 1b25a0826f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/template-xexpr.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require web-server/templates
-         web-server/http
-         xml)
-(provide (all-defined-out))
-(define interface-version 'v1)
-(define timeout +inf.0)
-
-(define (start initial-request)
-  (response/xexpr
-   `(html (pre ,(include-template "static.html"))
-          "versus"
-          ,(make-cdata #f #f (include-template "static.html")))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/wc-fake.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/wc-fake.rkt
deleted file mode 100644
index 67071d9682..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/wc-fake.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-(require web-server/servlet)
-(define interface-version 'v1)
-(define timeout +inf.0)
-(provide start interface-version timeout)
-
-(define (start initial-request)
-  (define counter1 0)
-  (define counter2 0)
-  (send/suspend/dispatch
-   (lambda (embed/url)
-     (let*-values ([(inc1 next-counter1 next-counter2) 
-                    (include-counter counter1 counter2 embed/url)]
-                   [(inc2 next-counter2 next-counter1)
-                    (include-counter next-counter2 next-counter1 embed/url)])
-       (response/xexpr
-        `(html 
-          (body (h2 "Web Cell Test")
-                (div (h3 "First") ,(inc1 next-counter1 next-counter2))
-                (div (h3 "Second") ,(inc2 next-counter2 next-counter1)))))))))
-
-(define (include-counter my-counter other-counter embed/url)
-  ; Note: This shouldn't be necessary (but is for testing, not in production)
-  (call-with-current-continuation
-   (lambda (k)
-     (letrec ([include
-               (lambda (next-my-counter next-other-counter)
-                 `(div (h3 ,(number->string next-my-counter))
-                       (a ([href 
-                            ,(embed/url
-                              (lambda _
-                                (k include
-                                   (add1 next-my-counter)
-                                   next-other-counter)))])
-                          "Increment")))])
-       (values include
-               my-counter
-               other-counter)))
-   servlet-prompt))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/wc.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/wc.rkt
deleted file mode 100644
index 97db212d2e..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/htdocs/servlets/examples/wc.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-(require web-server/servlet)
-(define interface-version 'v1)
-(define timeout +inf.0)
-(provide start interface-version timeout)
-
-(define (start initial-request)
-  ; A top-level frame must exist
-  (define counter1 (make-counter))
-  (define counter2 (make-counter))
-  ; counter1 and counter2 must have been added to the top-level frame    
-  (define include1 (include-counter counter1))
-  (define include2 (include-counter counter2))
-  ; counter1 and counter2 may have been modified
-  (send/suspend/dispatch
-   (lambda (embed/url)
-     (response/xexpr
-      ; The frame (ref) must have been captured, any changes to web-cells after this will be lost
-      `(html 
-        (body (h2 "Web Cell Test")
-              (div (h3 "First")
-                   ,(include1 embed/url))
-              (div (h3 "Second")
-                   ,(include2 embed/url))))))))
-
-(define (make-counter)
-  (make-web-cell 0))
-
-(define (include-counter a-counter)
-  ; Note: This shouldn't be necessary (but is for testing, not in production)
-  (call-with-current-continuation
-   (lambda (k)
-     (define (generate)
-       (k
-        (lambda (embed/url)
-          `(div (h3 ,(number->string (web-cell-ref a-counter)))
-                (a ([href ,(embed/url
-                            (lambda _
-                              ; A new frame has been created
-                              (define last (web-cell-ref a-counter))
-                              ; It is a child of the parent frame, so we can inspect the value
-                              (web-cell-shadow a-counter (add1 last))
-                              ; The new frame has been modified
-                              (generate)))])
-                   "+")))))
-     (generate))
-   servlet-prompt))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/mime.types b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/mime.types
deleted file mode 100644
index 6735f1b0e1..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/mime.types
+++ /dev/null
@@ -1,599 +0,0 @@
-# This is a comment. I love comments.
-
-# This file controls what Internet media types are sent to the client for
-# given file extension(s).  Sending the correct media type to the client
-# is important so they know how to handle the content of the file.
-# Extra types can either be added here or by using an AddType directive
-# in your config files. For more information about Internet media types,
-# please read RFC 2045, 2046, 2047, 2048, and 2077.  The Internet media type
-# registry is at <http://www.iana.org/assignments/media-types/>.
-
-# MIME type			Extensions
-application/activemessage
-application/andrew-inset	ez
-application/applefile
-application/atom+xml		atom
-application/atomicmail
-application/batch-smtp
-application/beep+xml
-application/cals-1840
-application/cnrp+xml
-application/commonground
-application/cpl+xml
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/dvcs
-application/edi-consent
-application/edifact
-application/edi-x12
-application/eshop
-application/font-tdpfr
-application/http
-application/hyperstudio
-application/iges
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/mac-binhex40	hqx
-application/mac-compactpro	cpt
-application/macwriteii
-application/marc
-application/mathematica
-application/mathml+xml		mathml
-application/msword		doc
-application/news-message-id
-application/news-transmission
-application/ocsp-request
-application/ocsp-response
-application/octet-stream	bin dms lha lzh exe class so dll dmg
-application/oda			oda
-application/ogg			ogg
-application/parityfec
-application/pdf			pdf
-application/pgp-encrypted
-application/pgp-keys
-application/pgp-signature
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/pkix-cert
-application/pkix-crl
-application/pkixcmp
-application/postscript		ai eps ps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/prs.plucker
-application/qsig
-application/rdf+xml		rdf
-application/reginfo+xml
-application/remote-printing
-application/riscos
-application/rtf
-application/sdp
-application/set-payment
-application/set-payment-initiation
-application/set-registration
-application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/sieve
-application/slate
-application/smil		smi smil
-application/srgs		gram
-application/srgs+xml		grxml
-application/timestamp-query
-application/timestamp-reply
-application/tve-trigger
-application/vemmi
-application/vnd.3gpp.pic-bw-large
-application/vnd.3gpp.pic-bw-small
-application/vnd.3gpp.pic-bw-var
-application/vnd.3gpp.sms
-application/vnd.3m.post-it-notes
-application/vnd.accpac.simply.aso
-application/vnd.accpac.simply.imp
-application/vnd.acucobol
-application/vnd.acucorp
-application/vnd.adobe.xfdf
-application/vnd.aether.imp
-application/vnd.amiga.ami
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.blueice.multipass
-application/vnd.bmi
-application/vnd.businessobjects
-application/vnd.canon-cpdl
-application/vnd.canon-lips
-application/vnd.cinderella
-application/vnd.claymore
-application/vnd.commerce-battelle
-application/vnd.commonspace
-application/vnd.contact.cmsg
-application/vnd.cosmocaller
-application/vnd.criticaltools.wbs+xml
-application/vnd.ctc-posml
-application/vnd.cups-postscript
-application/vnd.cups-raster
-application/vnd.cups-raw
-application/vnd.curl
-application/vnd.cybank
-application/vnd.data-vision.rdz
-application/vnd.dna
-application/vnd.dpgraph
-application/vnd.dreamfactory
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.esf
-application/vnd.epson.msf
-application/vnd.epson.quickanime
-application/vnd.epson.salt
-application/vnd.epson.ssf
-application/vnd.ericsson.quickcall
-application/vnd.eudora.data
-application/vnd.fdf
-application/vnd.ffsns
-application/vnd.fints
-application/vnd.flographit
-application/vnd.framemaker
-application/vnd.fsc.weblaunch
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.ddd
-application/vnd.fujixerox.docuworks
-application/vnd.fujixerox.docuworks.binder
-application/vnd.fut-misnet
-application/vnd.grafeq
-application/vnd.groove-account
-application/vnd.groove-help
-application/vnd.groove-identity-message
-application/vnd.groove-injector
-application/vnd.groove-tool-message
-application/vnd.groove-tool-template
-application/vnd.groove-vcard
-application/vnd.hbci
-application/vnd.hhe.lesson-player
-application/vnd.hp-hpgl
-application/vnd.hp-hpid
-application/vnd.hp-hps
-application/vnd.hp-pcl
-application/vnd.hp-pclxl
-application/vnd.httphone
-application/vnd.hzn-3d-crossword
-application/vnd.ibm.afplinedata
-application/vnd.ibm.electronic-media
-application/vnd.ibm.minipay
-application/vnd.ibm.modcap
-application/vnd.ibm.rights-management
-application/vnd.ibm.secure-container
-application/vnd.informix-visionary
-application/vnd.intercon.formnet
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.intu.qbo
-application/vnd.intu.qfx
-application/vnd.irepository.package+xml
-application/vnd.is-xpr
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.jisp
-application/vnd.kde.karbon
-application/vnd.kde.kchart
-application/vnd.kde.kformula
-application/vnd.kde.kivio
-application/vnd.kde.kontour
-application/vnd.kde.kpresenter
-application/vnd.kde.kspread
-application/vnd.kde.kword
-application/vnd.kenameaapp
-application/vnd.koan
-application/vnd.liberty-request+xml
-application/vnd.llamagraphics.life-balance.desktop
-application/vnd.llamagraphics.life-balance.exchange+xml
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-notes
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.mcd
-application/vnd.mediastation.cdkey
-application/vnd.meridian-slingshot
-application/vnd.micrografx.flo
-application/vnd.micrografx.igx
-application/vnd.mif		mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf
-application/vnd.mobius.dis
-application/vnd.mobius.mbk
-application/vnd.mobius.mqy
-application/vnd.mobius.msl
-application/vnd.mobius.plc
-application/vnd.mobius.txf
-application/vnd.mophun.application
-application/vnd.mophun.certificate
-application/vnd.motorola.flexsuite
-application/vnd.motorola.flexsuite.adsi
-application/vnd.motorola.flexsuite.fis
-application/vnd.motorola.flexsuite.gotap
-application/vnd.motorola.flexsuite.kmr
-application/vnd.motorola.flexsuite.ttc
-application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml	xul
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel	xls
-application/vnd.ms-lrm
-application/vnd.ms-powerpoint	ppt
-application/vnd.ms-project
-application/vnd.ms-tnef
-application/vnd.ms-works
-application/vnd.ms-wpl
-application/vnd.mseq
-application/vnd.msign
-application/vnd.music-niff
-application/vnd.musician
-application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.edm
-application/vnd.novadigm.edx
-application/vnd.novadigm.ext
-application/vnd.obn
-application/vnd.osa.netdeploy
-application/vnd.palm
-application/vnd.pg.format
-application/vnd.pg.osasli
-application/vnd.powerbuilder6
-application/vnd.powerbuilder6-s
-application/vnd.powerbuilder7
-application/vnd.powerbuilder7-s
-application/vnd.powerbuilder75
-application/vnd.powerbuilder75-s
-application/vnd.previewsystems.box
-application/vnd.publishare-delta-tree
-application/vnd.pvi.ptid1
-application/vnd.pwg-multiplexed
-application/vnd.pwg-xhtml-print+xml
-application/vnd.quark.quarkxpress
-application/vnd.rapid
-application/vnd.rn-realmedia	rm
-application/vnd.s3sms
-application/vnd.sealed.net
-application/vnd.seemail
-application/vnd.shana.informed.formdata
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.smaf
-application/vnd.sss-cod
-application/vnd.sss-dtf
-application/vnd.sss-ntf
-application/vnd.street-stream
-application/vnd.svd
-application/vnd.swiftview-ics
-application/vnd.triscape.mxs
-application/vnd.trueapp
-application/vnd.truedoc
-application/vnd.ufdl
-application/vnd.uplanet.alert
-application/vnd.uplanet.alert-wbxml
-application/vnd.uplanet.bearer-choice
-application/vnd.uplanet.bearer-choice-wbxml
-application/vnd.uplanet.cacheop
-application/vnd.uplanet.cacheop-wbxml
-application/vnd.uplanet.channel
-application/vnd.uplanet.channel-wbxml
-application/vnd.uplanet.list
-application/vnd.uplanet.list-wbxml
-application/vnd.uplanet.listcmd
-application/vnd.uplanet.listcmd-wbxml
-application/vnd.uplanet.signal
-application/vnd.vcx
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio
-application/vnd.visionary
-application/vnd.vividence.scriptfile
-application/vnd.vsf
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml	wbxml
-application/vnd.wap.wmlc	wmlc
-application/vnd.wap.wmlscriptc	wmlsc
-application/vnd.webturbo
-application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf
-application/vnd.wv.csp+wbxml
-application/vnd.xara
-application/vnd.xfdl
-application/vnd.yamaha.hv-dic
-application/vnd.yamaha.hv-script
-application/vnd.yamaha.hv-voice
-application/vnd.yellowriver-custom-menu
-application/voicexml+xml	vxml
-application/watcherinfo+xml
-application/whoispp-query
-application/whoispp-response
-application/wita
-application/wordperfect5.1
-application/x-bcpio		bcpio
-application/x-cdlink		vcd
-application/x-chess-pgn		pgn
-application/x-compress
-application/x-cpio		cpio
-application/x-csh		csh
-application/x-director		dcr dir dxr
-application/x-dvi		dvi
-application/x-futuresplash	spl
-application/x-gtar		gtar
-application/x-gzip
-application/x-hdf		hdf
-application/x-javascript	js
-application/x-java-jnlp-file	jnlp
-application/x-koan		skp skd skt skm
-application/x-latex		latex
-application/x-netcdf		nc cdf
-application/x-sh		sh
-application/x-shar		shar
-application/x-shockwave-flash	swf
-application/x-stuffit		sit
-application/x-sv4cpio		sv4cpio
-application/x-sv4crc		sv4crc
-application/x-tar		tar
-application/x-tcl		tcl
-application/x-tex		tex
-application/x-texinfo		texinfo texi
-application/x-troff		t tr roff
-application/x-troff-man		man
-application/x-troff-me		me
-application/x-troff-ms		ms
-application/x-ustar		ustar
-application/x-wais-source	src
-application/x400-bp
-application/xhtml+xml		xhtml xht
-application/xslt+xml		xslt
-application/xml			xml xsl
-application/xml-dtd		dtd
-application/xml-external-parsed-entity
-application/zip			zip
-audio/32kadpcm
-audio/amr
-audio/amr-wb
-audio/basic			au snd
-audio/cn
-audio/dat12
-audio/dsr-es201108
-audio/dvi4
-audio/evrc
-audio/evrc0
-audio/g722
-audio/g.722.1
-audio/g723
-audio/g726-16
-audio/g726-24
-audio/g726-32
-audio/g726-40
-audio/g728
-audio/g729
-audio/g729D
-audio/g729E
-audio/gsm
-audio/gsm-efr
-audio/l8
-audio/l16
-audio/l20
-audio/l24
-audio/lpc
-audio/midi			mid midi kar
-audio/mpa
-audio/mpa-robust
-audio/mp4a-latm			m4a m4p
-audio/mpeg			mpga mp2 mp3
-audio/parityfec
-audio/pcma
-audio/pcmu
-audio/prs.sid
-audio/qcelp
-audio/red
-audio/smv
-audio/smv0
-audio/telephone-event
-audio/tone
-audio/vdvi
-audio/vnd.3gpp.iufp
-audio/vnd.cisco.nse
-audio/vnd.cns.anp1
-audio/vnd.cns.inf1
-audio/vnd.digital-winds
-audio/vnd.everad.plj
-audio/vnd.lucent.voice
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800
-audio/vnd.nuera.ecelp7470
-audio/vnd.nuera.ecelp9600
-audio/vnd.octel.sbc
-audio/vnd.qcelp
-audio/vnd.rhetorex.32kadpcm
-audio/vnd.vmx.cvsd
-audio/x-aiff			aif aiff aifc
-audio/x-alaw-basic
-audio/x-mpegurl			m3u
-audio/x-pn-realaudio		ram ra
-audio/x-pn-realaudio-plugin
-audio/x-wav			wav
-chemical/x-pdb			pdb
-chemical/x-xyz			xyz
-image/bmp			bmp
-image/cgm			cgm
-image/g3fax
-image/gif			gif
-image/ief			ief
-image/jpeg			jpeg jpg jpe
-image/jp2			jp2
-image/naplps
-image/pict			pict pic pct
-image/png			png
-image/prs.btif
-image/prs.pti
-image/svg+xml			svg
-image/t38
-image/tiff			tiff tif
-image/tiff-fx
-image/vnd.cns.inf2
-image/vnd.djvu			djvu djv
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fastbidsheet
-image/vnd.fpx
-image/vnd.fst
-image/vnd.fujixerox.edmics-mmr
-image/vnd.fujixerox.edmics-rlc
-image/vnd.globalgraphics.pgb
-image/vnd.mix
-image/vnd.ms-modi
-image/vnd.net-fpx
-image/vnd.svf
-image/vnd.wap.wbmp		wbmp
-image/vnd.xiff
-image/x-cmu-raster		ras
-image/x-macpaint		pntg pnt mac
-image/x-icon			ico
-image/x-portable-anymap		pnm
-image/x-portable-bitmap		pbm
-image/x-portable-graymap	pgm
-image/x-portable-pixmap		ppm
-image/x-quicktime		qtif qti
-image/x-rgb			rgb
-image/x-xbitmap			xbm
-image/x-xpixmap			xpm
-image/x-xwindowdump		xwd
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/news
-message/partial
-message/rfc822
-message/s-http
-message/sip
-message/sipfrag
-model/iges			igs iges
-model/mesh			msh mesh silo
-model/vnd.dwf
-model/vnd.flatland.3dml
-model/vnd.gdl
-model/vnd.gs-gdl
-model/vnd.gtw
-model/vnd.mts
-model/vnd.parasolid.transmit.binary
-model/vnd.parasolid.transmit.text
-model/vnd.vtu
-model/vrml			wrl vrml
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-text/calendar			ics ifb
-text/css			css
-text/directory
-text/enriched
-text/html			html htm
-text/parityfec
-text/plain			asc txt
-text/prs.lines.tag
-text/rfc822-headers
-text/richtext			rtx
-text/rtf			rtf
-text/sgml			sgml sgm
-text/t140
-text/tab-separated-values	tsv
-text/uri-list
-text/vnd.abc
-text/vnd.curl
-text/vnd.dmclientscript
-text/vnd.fly
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
-text/vnd.iptc.nitf
-text/vnd.iptc.newsml
-text/vnd.latex-z
-text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
-text/vnd.net2phone.commcenter.command
-text/vnd.sun.j2me.app-descriptor
-text/vnd.wap.si
-text/vnd.wap.sl
-text/vnd.wap.wml		wml
-text/vnd.wap.wmlscript		wmls
-text/x-setext			etx
-text/xml
-text/xml-external-parsed-entity
-video/bmpeg
-video/bt656
-video/celb
-video/dv
-video/h261
-video/h263
-video/h263-1998
-video/h263-2000
-video/jpeg
-video/mp1s
-video/mp2p
-video/mp2t
-video/mp4			mp4
-video/mp4v-es
-video/mpv
-video/mpeg			mpeg mpg mpe
-video/nv
-video/parityfec
-video/pointer
-video/quicktime			qt mov
-video/smpte292m
-video/vnd.fvt
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.mpegurl		mxu m4u
-video/vnd.nokia.interleaved-multimedia
-video/vnd.objectvideo
-video/vnd.vivo
-video/x-dv			dv dif
-video/x-msvideo			avi
-video/x-sgi-movie		movie
-x-conference/x-cooltalk		ice
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/passwords b/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/passwords
deleted file mode 100644
index f589cd75be..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/default-web-root/passwords
+++ /dev/null
@@ -1 +0,0 @@
-'()
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch.rkt
deleted file mode 100644
index 24cda1cc5d..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require web-server/dispatch/syntax
-         web-server/dispatch/serve
-         web-server/dispatch/url-patterns
-         web-server/dispatch/container)
-(provide (all-from-out web-server/dispatch/syntax
-                       web-server/dispatch/serve
-                       web-server/dispatch/url-patterns
-                       web-server/dispatch/container))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/bidi-match.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/bidi-match.rkt
deleted file mode 100644
index 788d1c4ffc..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/bidi-match.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/match
-         racket/stxparam)
-
-(define-syntax-parameter bidi-match-going-in? #t)
-
-(define-syntax (define-bidi-match-expander stx)
-  (syntax-case stx ()
-    [(_ bidi-id in-expander out-expander)
-     (syntax/loc stx
-       (define-match-expander bidi-id
-         (lambda (stx)
-           (syntax-case stx ()
-             [(_ arg (... ...) id)
-              (if (syntax-parameter-value #'bidi-match-going-in?)
-                  (syntax/loc stx (in-expander arg (... ...) id))
-                  (syntax/loc stx (out-expander arg (... ...) id)))]))))]))
-
-(provide bidi-match-going-in?
-         define-bidi-match-expander)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/coercion.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/coercion.rkt
deleted file mode 100644
index ff5bcc3aff..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/coercion.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         (for-syntax racket/base))
-
-(define (make-coerce-safe? coerce)
-  (lambda (x)
-    (with-handlers ([exn:fail? (lambda (x) #f)])
-      (and (coerce x) #t))))
-
-(define-syntax (define-coercion-match-expander stx)
-  (syntax-case stx ()
-    [(_ expander-id test? coerce)
-     (syntax/loc stx
-       (define-match-expander expander-id
-         (lambda (stx)
-           (syntax-case stx ()
-             [(_ id) (identifier? #'id)
-                     (syntax/loc stx
-                       (? test? (app coerce id)))]))))]))
-
-(provide/contract
- [make-coerce-safe? ((any/c . -> . any/c) . -> . (any/c . -> . boolean?))])
-(provide
- define-coercion-match-expander)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/container.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/container.rkt
deleted file mode 100644
index b8e9ae3640..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/container.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang racket/base
-(require web-server/dispatchers/dispatch
-         racket/list
-         racket/contract
-         racket/match
-         "syntax.rkt")
-
-(struct container (bunches) #:mutable)
-(struct bunch (dispatch url))
-
-(define (container-dispatch c)
-  (λ (req)
-    (let/ec esc
-      (for ([d*u (in-list (container-bunches c))])
-        (with-handlers ([exn:dispatcher? void])
-          (esc ((bunch-dispatch d*u) req))))
-      (next-dispatcher))))
-
-(define (container-url c)
-  (λ args
-    (let/ec esc
-      (for ([d*u (in-list (container-bunches c))])
-        (with-handlers ([exn:misc:match? void])
-          (esc (apply (bunch-url d*u) args))))
-      (match args))))
-
-(define-syntax-rule (define-container container-id (container-dispatch-id container-url-id))
-  (begin
-    (define container-id
-      (container empty))
-    (define container-dispatch-id
-      (container-dispatch container-id))
-    (define container-url-id
-      (container-url container-id))))
-
-(define (container-cons! c d u)
-  (set-container-bunches! 
-   c
-   (cons (bunch d u) (container-bunches c))))
-
-#;(define (snoc l x) (append l (list x)))
-#;(define (container-snoc! c d u)
-    (set-container-bunches! 
-     c
-     (snoc (container-bunches c) (bunch d u))))
-
-(define-syntax-rule (dispatch-rules! container-expr pattern-clause ...)
-  (let-values ([(dispatch url) (dispatch-rules pattern-clause ...)])
-    (container-cons! container-expr
-                     dispatch url)))
-
-(provide
- define-container
- dispatch-rules!)
-(provide/contract
- [container? (any/c . -> . boolean?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/extend.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/extend.rkt
deleted file mode 100644
index 4e9a50582e..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/extend.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require web-server/dispatch/coercion
-         web-server/dispatch/bidi-match)
-(provide (all-from-out web-server/dispatch/coercion
-                       web-server/dispatch/bidi-match))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/http-expanders.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/http-expanders.rkt
deleted file mode 100644
index 8178d45e98..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/http-expanders.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-(require racket/match
-         net/url
-         web-server/http)
-
-(define-match-expander url/path
-  (syntax-rules ()
-    [(_ path-pat)
-     ; url = scheme, user, host, port, absolute?, path, query, fragment
-     (struct url (_ _ _ _ _ path-pat _ _))]))
-
-(define-match-expander url/paths
-  (syntax-rules ()
-    [(_ path-pat ...)
-     (url/path (app (lambda (ps) (map path/param-path ps))
-                   (list path-pat ...)))]))
-
-(define (method-downcase x)
-  (cond
-    [(string? x)
-     (string-downcase x)]
-    [(bytes? x)
-     (method-downcase (bytes->string/utf-8 x))]
-    [else 
-     x]))
-
-(define-match-expander request/url
-  (syntax-rules ()
-    [(_ url-pat)
-     ; req = method, url, headers, bindings, post-data, host-ip, host-port, client-ip
-     (request/url (or #f "get") url-pat)]
-    [(_ method url-pat)
-     ; req = method, url, headers, bindings, post-data, host-ip, host-port, client-ip
-     (struct request ((app method-downcase method)
-                      url-pat _ _ _ _ _ _))]))
-
-(provide url/path
-         url/paths
-         request/url)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/pattern.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/pattern.rkt
deleted file mode 100644
index ac724e3217..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/pattern.rkt
+++ /dev/null
@@ -1,96 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/contract)
-
-; A dispatch pattern is either
-; - a string
-; - a bidi match expander
-; - ...
-
-(define (...? stx)
-  (eq? '... (syntax->datum stx)))
-
-(define (string-syntax? stx)
-  (string? (syntax->datum stx)))
-
-(define (dispatch-pattern? stx)
-  (define (dispatch/no-...? stx)
-    (syntax-case stx ()
-      [() #t]
-      [((bidi arg ...) . rest-stx)
-       (dispatch/...? #'rest-stx)]
-      [(string . rest-stx)
-       (string-syntax? #'string)
-       (dispatch/no-...? #'rest-stx)]))
-  (define (dispatch/...? stx)
-    (syntax-case stx ()
-      [() #t]
-      [((bidi arg ...) . rest-stx)
-       (dispatch/...? #'rest-stx)]
-      [(string . rest-stx)
-       (string-syntax? #'string)
-       (dispatch/no-...? #'rest-stx)]
-      [((... ...) . rest-stx)
-       (dispatch/no-...? #'rest-stx)]))    
-  (dispatch/no-...? stx))
-
-(define (dispatch-pattern/ids? stx)
-  (define (dispatch/no-...? stx)
-    (syntax-case stx ()
-      [() #t]
-      [((bidi arg ... id) . rest-stx)
-       (identifier? #'id)
-       (dispatch/...? #'rest-stx)]
-      [(string . rest-stx)
-       (string-syntax? #'string)
-       (dispatch/no-...? #'rest-stx)]))
-  (define (dispatch/...? stx)
-    (syntax-case stx ()
-      [() #t]
-      [((bidi arg ... id) . rest-stx)
-       (identifier? #'id)
-       (dispatch/...? #'rest-stx)]
-      [(string . rest-stx)
-       (string-syntax? #'string)
-       (dispatch/no-...? #'rest-stx)]
-      [((... ...) . rest-stx)
-       (dispatch/no-...? #'rest-stx)]))    
-  (dispatch/no-...? stx))
-
-(define (dispatch-pattern-not-... stx)
-  (filter (compose not ...?) 
-          (syntax->list stx)))
-
-(define (dispatch-pattern-next-...? stx)
-  (let loop ([l (syntax->list stx)])
-    (cond
-      [(empty? l)
-       empty]
-      [(empty? (rest l))
-       (list #f)]
-      [(...? (second l))
-       (list* #t (loop (rest (rest l))))]
-      [else
-       (list* #f (loop (rest l)))])))
-
-(define (dispatch-pattern->dispatch-pattern/ids pps)
-  (map (lambda (pp ppi)
-         (cond
-           [(string-syntax? pp)
-            pp]
-           [(...? pp)
-            pp]
-           [else
-            (with-syntax ([(bidi-id arg ...) pp]
-                          [id ppi])
-              (syntax/loc pp (bidi-id arg ... id)))]))
-       (syntax->list pps)
-       (generate-temporaries pps)))
-
-(provide/contract
- [string-syntax? (syntax? . -> . boolean?)]
- [dispatch-pattern-next-...? (syntax? . -> . (listof boolean?))]
- [dispatch-pattern-not-... (syntax? . -> . (listof syntax?))]
- [dispatch-pattern->dispatch-pattern/ids (syntax? . -> . (listof syntax?))]
- [dispatch-pattern? (syntax? . -> . boolean?)]
- [dispatch-pattern/ids? (syntax? . -> . boolean?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/serve.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/serve.rkt
deleted file mode 100644
index 59d704ff38..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/serve.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require racket/contract
-         web-server/servlet-env
-         web-server/servlet/servlet-structs
-         web-server/http)
-
-(define (serve/dispatch dispatch)
-  (serve/servlet dispatch
-                 #:servlet-path "/"
-                 #:servlet-regexp #rx""))
-
-(provide/contract
- [serve/dispatch ((request? . -> . can-be-response?) . -> . void)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/syntax.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/syntax.rkt
deleted file mode 100644
index faa7080c75..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/syntax.rkt
+++ /dev/null
@@ -1,197 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/match
-         racket/stxparam
-         net/url
-         web-server/dispatchers/dispatch
-         web-server/dispatch/http-expanders
-         web-server/dispatch/bidi-match
-         (for-syntax racket/base
-                     syntax/parse
-                     web-server/dispatch/pattern))
-
-(define (default-else req)
-  (next-dispatcher))
-
-(begin-for-syntax
-  (define default-method #'(or #f "get")))
-
-(define (string-list->url strlist)
-  (url->string
-   (make-url #f #f #f #f #t
-             (if (empty? strlist)
-               (list (make-path/param "" empty))
-               (map (lambda (s) (make-path/param s empty))
-                    strlist))
-             empty #f)))
-
-(define-syntax (dispatch-case stx)
-  (syntax-parse
-      stx #:literals (else)
-      [(_ [(path-pat ...)
-           (~optional (~seq #:method method)
-                      #:defaults ([method default-method]))
-           fun]
-          ...
-          [else else-fun])
-       #:fail-unless 
-       (for-each dispatch-pattern?
-                 (syntax->list #'((path-pat ...) ...)))
-       "Not a dispatch pattern"
-       (with-syntax
-           ([((path-pat/id ...) ...)
-             (map dispatch-pattern->dispatch-pattern/ids
-                  (syntax->list #'((path-pat ...) ...)))])
-         (with-syntax
-             ([((path-pat-id ...) ...)
-               (map (lambda (pp/is)
-                      (map (lambda (bs)
-                             (with-syntax ([(bidi-id arg ... id) bs])
-                               #'id))
-                           (filter (lambda (pp/i)
-                                     (syntax-case pp/i ()
-                                       [(bidi-id arg ... id) #t]
-                                       [_ #f]))
-                                   (syntax->list pp/is))))
-                    (syntax->list #'((path-pat/id ...) ...)))])
-           (syntax/loc stx
-             (lambda (the-req)
-               (syntax-parameterize ([bidi-match-going-in? #t])
-                 (match the-req
-                   [(request/url method (url/paths path-pat/id ...))
-                    (fun the-req path-pat-id ...)]
-                   ...
-                   [_ (else-fun the-req)]))))))]
-      [(dc [(path-pat ...) 
-            (~optional (~seq #:method method)
-                      #:defaults ([method default-method]))
-            fun]
-           ...)
-       (syntax/loc stx
-         (dc [(path-pat ...)
-              #:method method 
-              fun]
-             ...
-             [else default-else]))]))
-
-(define-syntax (dispatch-url stx)
-  (syntax-parse
-      stx
-    [(_ [(path-pat ...) fun]
-        ...)
-     (for-each dispatch-pattern?
-               (syntax->list #'((path-pat ...) ...)))
-     (with-syntax
-         ([((path-pat/id ...) ...)
-           (map dispatch-pattern->dispatch-pattern/ids
-                (syntax->list #'((path-pat ...) ...)))])
-       (with-syntax
-           ([((from-path-pat ...) ...)
-             (map (lambda (pp/is-pre)
-                    (define pp/is 
-                      (datum->syntax pp/is-pre
-                                     (filter (compose not string-syntax?) (syntax->list pp/is-pre))
-                                     pp/is-pre))
-                    (for/list ([pp/i (dispatch-pattern-not-... pp/is)]
-                               [next-...? (dispatch-pattern-next-...? pp/is)])
-                      (with-syntax ([pp pp/i]
-                                    [(bidi-id arg ... id) pp/i])
-                        (if next-...?
-                          (syntax/loc pp/i (list pp (... ...)))
-                          pp/i))))
-                  (syntax->list #'((path-pat/id ...) ...)))]
-            [((from-body ...) ...)
-             (map (lambda (pp/is)
-                    (for/list ([pp/i (dispatch-pattern-not-... pp/is)]
-                               [next-...? (dispatch-pattern-next-...? pp/is)])
-                      (with-syntax ([pp pp/i])
-                        (if (string-syntax? pp/i)
-                          (syntax/loc pp/i (list pp))
-                          (with-syntax ([(bidi-id arg ... id) pp/i])
-                            (if next-...?
-                              (syntax/loc pp/i id)
-                              (syntax/loc pp/i (list id))))))))
-                  (syntax->list #'((path-pat/id ...) ...)))])
-         (syntax/loc stx
-           (syntax-parameterize ([bidi-match-going-in? #f])
-             (match-lambda*
-              [(list (? (lambda (x) (eq? x fun))) from-path-pat ...)
-               (string-list->url (append from-body ...))]
-              ...)))))]))
-
-(define-syntax (dispatch-rules stx)
-  (syntax-parse
-      stx #:literals (else)
-      [(_ [(path-pat ...)
-           (~optional (~seq #:method method)
-                      #:defaults ([method default-method]))
-           fun]
-          ...
-          [else else-fun])
-       (for-each dispatch-pattern?
-                 (syntax->list #'((path-pat ...) ...)))
-       (syntax/loc stx
-         (values
-          (dispatch-case [(path-pat ...)
-                          #:method method
-                          fun]
-                         ...
-                         [else else-fun])
-          (dispatch-url [(path-pat ...) fun]
-                        ...)))]
-      [(dr [(path-pat ...)
-            (~optional (~seq #:method method)
-                       #:defaults ([method default-method]))
-            fun]
-           ...)
-       (syntax/loc stx
-         (dr [(path-pat ...)
-              #:method method
-              fun]
-             ...
-             [else default-else]))]))
-
-(define (dispatch-succ . _) #t)
-(define (dispatch-fail . _) #f)
-
-(define-syntax (dispatch-rules+applies stx)
-  (syntax-parse
-      stx #:literals (else)
-      [(_
-        [pat
-         (~optional (~seq #:method method)
-                    #:defaults ([method default-method]))
-         fun]
-        ...
-        [else else-fun])
-       (syntax/loc stx
-         (let-values ([(dispatch url)
-                       (dispatch-rules
-                        [pat #:method method fun]
-                        ...
-                        [else else-fun])]
-                      [(applies?)
-                       (λ (req) #t)])
-           (values dispatch url applies?)))]
-      [(_
-        [pat
-         (~optional (~seq #:method method)
-                    #:defaults ([method default-method]))
-         fun]
-        ...)
-       (syntax/loc stx
-         (let-values ([(dispatch url)
-                       (dispatch-rules
-                        [pat #:method method fun]
-                        ...)]
-                      [(applies?)
-                       (dispatch-case
-                        [pat #:method method dispatch-succ]
-                        ...
-                        [else dispatch-fail])])
-           (values dispatch url applies?)))]))
-
-(provide dispatch-case
-         dispatch-url
-         dispatch-rules
-         dispatch-rules+applies)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/url-patterns.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/url-patterns.rkt
deleted file mode 100644
index aaf7710c38..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatch/url-patterns.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/base
-(require racket/match
-         web-server/dispatch/coercion
-         web-server/dispatch/bidi-match)
-
-(define-syntax define-bidi-match-expander/coercions
-  (syntax-rules ()
-    [(_ id in-test? in out-test? out)
-     (begin (define-coercion-match-expander in/m in-test? in)
-            (define-coercion-match-expander out/m out-test? out)
-            (define-bidi-match-expander id in/m out/m))]))
-
-; number arg
-(define string->number? (make-coerce-safe? string->number))
-(define-bidi-match-expander/coercions number-arg
-  string->number? string->number
-  number? number->string)
-
-; integer arg
-(define (string->integer x)
-  (define nx (string->number x))
-  (if (integer? nx)
-      nx
-      (error 'string->integer "Not an integer string")))
-(define string->integer? (make-coerce-safe? string->integer))
-(define-bidi-match-expander/coercions integer-arg
-  string->integer? string->integer
-  integer? number->string)
-
-; real arg
-(define (string->real x)
-  (define nx (string->number x))
-  (if (real? nx)
-      nx
-      (error 'string->real "Not an real string")))
-(define string->real? (make-coerce-safe? string->real))
-(define-bidi-match-expander/coercions real-arg
-  string->real? string->real
-  real? number->string)
-
-; string arg
-(define-match-expander string->string/m
-  (syntax-rules ()
-    [(_ str) (? string? str)]))
-
-(define-bidi-match-expander string-arg string->string/m string->string/m)
-
-; symbol arg
-(define-bidi-match-expander/coercions symbol-arg
-  string? string->symbol
-  symbol? symbol->string)
-
-(provide number-arg
-         integer-arg
-         real-arg
-         string-arg
-         symbol-arg)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-files.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-files.rkt
deleted file mode 100644
index 4f8b92d0fa..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-files.rkt
+++ /dev/null
@@ -1,98 +0,0 @@
-#lang racket/base
-(require net/url
-         racket/match
-         racket/contract)
-
-(require web-server/dispatchers/dispatch
-         web-server/private/util
-         web-server/http
-         web-server/http/response
-         web-server/dispatchers/filesystem-map)
-
-(provide/contract
- [interface-version dispatcher-interface-version/c]
- [read-range-header (-> (listof header?) (or/c (listof pair?) false/c))]
- [make
-  (->* (#:url->path url->path/c)
-       (#:path->mime-type (path-string? . -> . (or/c false/c bytes?))
-                          #:indices (listof path-string?))
-       dispatcher/c)])
-
-;; looks-like-directory : str -> bool
-;; to determine if is url style path looks like it refers to a directory
-(define (looks-like-directory? path)
-  (and (regexp-match #rx"/$" path)
-       #t))
-
-(define interface-version 'v1)
-
-(define (make #:url->path url->path
-              #:path->mime-type [path->mime-type (lambda (path) #f)]
-              #:indices [indices (list "index.html" "index.htm")])
-  (lambda (conn req)
-    (define uri (request-uri req))
-    (define method (request-method req))
-    (define-values (path _) (url->path uri))
-    (cond [(file-exists? path)
-           (output-file conn path method (path->mime-type path)
-                        (read-range-header (request-headers/raw req)))]
-          [(directory-exists? path)
-           (if (looks-like-directory? (url-path->string (url-path uri)))
-               (let/ec esc
-                 (for-each (lambda (dir-default)
-                             (define full-name (build-path path dir-default))
-                             (when (file-exists? full-name)
-                               (esc (output-file conn full-name method (path->mime-type full-name)
-                                                 (read-range-header (request-headers/raw req))))))
-                           indices)
-                 (next-dispatcher))
-               (output-response 
-                conn
-                (redirect-to (string-append (url-path->string (url-path uri)) "/"))))]
-          [else (next-dispatcher)])))
-
-;; read-range-header : (listof header) -> (U (alist-of (U integer #f) (U integer #f)) #f)
-;;
-;; Returns a list of pairs of the byte offsets specified in an HTTP Range
-;; header, or #f if the header is missing or malformed.
-;;
-;; The HTTP spec for the Range header can be found here:
-;;
-;;     http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
-;;
-;; More specifically, the (non-#f form of the) result is:
-;;
-;;     (list-of (U byte-range-spec suffix-byte-range-spec))
-;;
-;; where:
-;;
-;;     byte-range-spec : (cons integer (U integer #f))
-;;     suffix-byte-range-spec : (cons #f integer)
-;;
-;; All offsets are inclusive: the integers are precisely those that appear
-;; in the header.
-(define read-range-header
-  (let ([range-header-regexp    #px#"^bytes=(.*)$"]
-        [range-delimiter-regexp #px#","]
-        [range-regexp           #px#"^([0-9]*)-([0-9]*)$"]
-        [range-error            (lambda (header)
-                                  (display (format "Bad Range header: ~s. File a Racket problem report!\n"
-                                                   (header-value header))
-                                           (current-error-port))
-                                  #f)])
-    (lambda (headers)
-      (let ([header (headers-assq* #"Range" headers)])
-        (if header
-            (let/ec escape
-              (match (regexp-match range-header-regexp (header-value header))
-                [(list _ ranges-string)
-                 (let ([ranges (regexp-split range-delimiter-regexp ranges-string)])
-                   (map (lambda (range-string)
-                          (match (regexp-match range-regexp range-string)
-                            [(list _ start-offset end-offset)
-                             (cons (string->number (bytes->string/utf-8 start-offset))
-                                   (string->number (bytes->string/utf-8 end-offset)))]
-                            [#f (escape (range-error header))]))
-                        ranges))]
-                [#f (escape (range-error header))]))
-            #f)))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-filter.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-filter.rkt
deleted file mode 100644
index 09cee5109d..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-filter.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-(require racket/contract
-         net/url)
-(require web-server/dispatchers/dispatch
-         web-server/http
-         web-server/private/util)
-(provide/contract
- [interface-version dispatcher-interface-version/c]
- [make (regexp? dispatcher/c . -> . dispatcher/c)])
-
-(define interface-version 'v1)
-(define ((make regex inner) conn req)
-  (define path (url-path->string (url-path (request-uri req))))
-  #;(printf "~S\n" `(filter ,regex ,(url->string (request-uri req)) ,path ,(regexp-match regex path)))
-  (if (regexp-match regex path)
-      (inner conn req)
-      (next-dispatcher)))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-host.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-host.rkt
deleted file mode 100644
index ae913a11fa..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-host.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         net/url
-         web-server/http
-         web-server/private/util
-         web-server/dispatchers/dispatch)
-(provide/contract
- [interface-version dispatcher-interface-version/c]
- [make ((symbol? . -> . dispatcher/c) . -> . dispatcher/c)])
-
-(define interface-version 'v1)
-(define ((make lookup-dispatcher) conn req)
-  (define host (get-host (request-uri req) (request-headers/raw req)))
-  ((lookup-dispatcher host) conn req))
-
-;; get-host : Url (listof (cons Symbol String)) -> Symbol
-(define (get-host uri headers)
-  (cond
-    [(url-host uri) 
-     => lowercase-symbol!]
-    [(headers-assq* #"Host" headers)
-     => (match-lambda
-          [(struct header (_ v))
-           (lowercase-symbol! v)])]
-    [else 'none]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-lift.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-lift.rkt
deleted file mode 100644
index 37e7d8f14c..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-lift.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-(require racket/contract)
-(require web-server/dispatchers/dispatch
-         web-server/http
-         web-server/http/response)
-(provide/contract
- [interface-version dispatcher-interface-version/c]
- [make ((request? . -> . response?) . -> . dispatcher/c)])
-
-(define interface-version 'v1)
-(define ((make procedure) conn req)
-  (output-response/method
-   conn
-   (procedure req)
-   (request-method req)))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-log.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-log.rkt
deleted file mode 100644
index 8e13f27b1f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-log.rkt
+++ /dev/null
@@ -1,105 +0,0 @@
-#lang racket/base
-(require net/url
-         (prefix-in srfi-date: srfi/19)
-         racket/date
-         racket/async-channel
-         racket/match
-         racket/contract)
-(require web-server/dispatchers/dispatch
-         web-server/http)  
-(define format-req/c (request? . -> . string?))
-(define log-format/c (symbols 'parenthesized-default 'extended 'apache-default))
-
-(provide/contract
- [format-req/c contract?]
- [log-format/c contract?]
- [log-format->format (log-format/c . -> . format-req/c)]
- [paren-format format-req/c]
- [extended-format format-req/c]
- [apache-default-format format-req/c]
- [interface-version dispatcher-interface-version/c]
- [make (->* ()
-            (#:format format-req/c
-             #:log-path path-string?)
-            dispatcher/c)])
-
-(define interface-version 'v1)
-(define (make #:format [format paren-format]
-              #:log-path [log-path "log"])
-  (define log-message (make-log-message log-path format))
-  (lambda (conn req)
-    (log-message req)
-    (next-dispatcher)))
-
-(define (log-format->format log-format)
-  (case log-format
-    [(parenthesized-default)
-     paren-format]
-    [(extended)
-     extended-format]
-    [(apache-default)
-     apache-default-format]))
-
-(define (request-line-raw req)
-  (format "~a ~a HTTP/1.1"
-          (string-upcase (bytes->string/utf-8 (request-method req)))
-          (url->string (request-uri req))))
-(define (apache-default-format req)
-  (define request-time (srfi-date:current-date))
-  (format "~a - - [~a] \"~a\" ~a ~a\n"
-          (request-client-ip req)
-          (srfi-date:date->string request-time "~d/~b/~Y:~T ~z")
-          (request-line-raw req)
-          "-"
-          "-"))
-
-(define (paren-format req)
-  (format "~s\n"
-          (list 'from (request-client-ip req)
-                'to (request-host-ip req)
-                'for (url->string (request-uri req)) 'at
-                (date->string (seconds->date (current-seconds)) #t))))
-
-(define (extended-format req)
-  (format "~s\n"
-          `((client-ip ,(request-client-ip req))
-            (host-ip ,(request-host-ip req))
-            (referer ,(let ([R (headers-assq* #"Referer" (request-headers/raw req))])
-                        (if R
-                            (header-value R)
-                            #f)))                                              
-            (uri ,(url->string (request-uri req)))
-            (time ,(current-seconds)))))
-
-(define (make-log-message log-path format-req)
-  (define log-ch (make-async-channel))
-  (define log-thread
-    (thread/suspend-to-kill
-     (lambda ()
-       (let loop ([log-p #f])
-         (sync
-          (handle-evt 
-           log-ch
-           (match-lambda
-             [(list req)
-              (loop
-               (with-handlers ([exn:fail? (lambda (e)
-                                            ((error-display-handler) "dispatch-log.rkt Error writing log entry" e)
-                                            (with-handlers ([exn:fail? (lambda (e) #f)])
-                                              (close-output-port log-p))
-                                            #f)])
-                 (define the-log-p
-                   (if (not (and log-p (file-exists? log-path)))
-                       (begin
-                         (unless (eq? log-p #f)
-                           (close-output-port log-p))
-                         (let ([new-log-p (open-output-file log-path #:exists 'append)])
-                           (file-stream-buffer-mode new-log-p 'line)
-                           new-log-p))
-                       log-p))
-                 (display (format-req req) the-log-p)
-                 the-log-p))])))))))
-  (lambda args
-    (thread-resume log-thread (current-custodian))
-    (async-channel-put log-ch args)
-    (void)))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-passwords.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-passwords.rkt
deleted file mode 100644
index ca4efa89b5..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-passwords.rkt
+++ /dev/null
@@ -1,143 +0,0 @@
-#lang racket/base
-(require racket/list
-         net/url
-         racket/contract)
-(require web-server/dispatchers/dispatch
-         web-server/private/util
-         web-server/configuration/responders
-         web-server/http
-         web-server/http/response)
-
-(define denied?/c (request? . -> . (or/c false/c string?)))
-(define authorized?/c (string? (or/c false/c bytes?) (or/c false/c bytes?) . -> . (or/c false/c string?)))
-
-(provide/contract
- [interface-version dispatcher-interface-version/c]
- [denied?/c contract?]
- [make (->* (denied?/c)
-            (#:authentication-responder
-             (url? header? . -> . response?))
-            dispatcher/c)]
- [authorized?/c contract?]
- [make-basic-denied?/path
-  (authorized?/c . -> . denied?/c)]
- [password-file->authorized?
-  (path-string? . -> . (values (-> void)
-                               authorized?/c))])
-
-(define interface-version 'v1)
-(define (make denied?
-              #:authentication-responder 
-              [authentication-responder 
-               (gen-authentication-responder "forbidden.html")])
-  (lambda (conn req)
-    (define uri (request-uri req))
-    (define method (request-method req))
-    (cond
-      [(denied? req)
-       => (lambda (realm)
-            (request-authentication conn method uri
-                                    authentication-responder
-                                    realm))]
-      [else
-       (next-dispatcher)])))
-
-(define (make-basic-denied?/path
-         authorized?)  
-  (lambda (req)
-    (define path (url-path->string (url-path (request-uri req))))
-    (cond
-      [(request->basic-credentials req)
-       => (lambda (user*pass)
-            (authorized? path 
-                         (car user*pass)
-                         (cdr user*pass)))]
-      [else
-       (authorized? path #f #f)])))
-
-(define (password-file->authorized? password-file)
-  (define last-read-time (box #f))
-  (define password-cache (box #f))
-  (define (update-password-cache!)
-    (when (and (file-exists? password-file) (memq 'read (file-or-directory-permissions password-file)))
-      (let ([cur-mtime (file-or-directory-modify-seconds password-file)])
-        (when (or (not (unbox last-read-time))
-                  (cur-mtime . > . (unbox last-read-time))
-                  (not (unbox password-cache)))                
-          (set-box! last-read-time cur-mtime)
-          (set-box! password-cache (read-passwords password-file))))))
-  (define (read-password-cache)
-    (update-password-cache!)
-    (unbox password-cache))
-  (values update-password-cache!
-          (lambda (path user pass)
-            (define denied? (read-password-cache))
-            (if denied?
-                (denied? path (if user (lowercase-symbol! user) #f) pass)
-                ; Fail un-safe
-                #f))))
-
-;; pass-entry = (make-pass-entry str regexp (list sym str))
-(define-struct pass-entry (domain pattern users))
-
-(define-struct (exn:password-file exn) ())
-
-;; : host -> (str sym str -> (or/c str #f))
-;; to produce a function that checks if a given url path is accessible by a given user with a given
-;; password.  If not, the produced function returns a string, prompting for the password.
-;; If the password file does not exist, all accesses are allowed.  If the file is malformed, an
-;; exn:password-file is raised.
-(define (read-passwords password-path)
-  (with-handlers ([void (lambda (exn)
-                          (raise (make-exn:password-file
-                                  (format "could not load password file ~a" password-path)
-                                  (current-continuation-marks))))])
-    (let ([passwords
-           (with-input-from-file
-               password-path
-             (lambda ()
-               (let ([raw (second (read))])
-                 (unless (password-list? raw)
-                   (raise "malformed passwords"))
-                 (map (lambda (x) (make-pass-entry (car x) (regexp (cadr x)) (cddr x)))
-                      raw))))])
-      
-      ;; string symbol bytes -> (or/c #f string)
-      (lambda (request-path user-name password)
-        (ormap (lambda (x)
-                 (and (regexp-match (pass-entry-pattern x) request-path)
-                      (let ([name-pass (assq user-name (pass-entry-users x))])
-                        (if (and name-pass
-                                 (string=?
-                                  (cadr name-pass)
-                                  (bytes->string/utf-8 password)))
-                            #f
-                            (pass-entry-domain x)))))
-               passwords)))))
-
-;; password-list? : TST -> bool
-
-;; Note: andmap fails for dotted pairs at end.
-;; This is okay, since #f ends up raising a caught exception anyway.
-(define (password-list? passwords)
-  (and (list? passwords)
-       (andmap (lambda (domain)
-                 (and (pair? domain) (pair? (cdr domain)) (list (cddr domain))
-                      (string? (car domain))
-                      (string? (cadr domain))
-                      (andmap (lambda (x)
-                                (and (pair? x) (pair? (cdr x)) (null? (cddr x))
-                                     (symbol? (car x)) (string? (cadr x))))
-                              (cddr domain))))
-               passwords)))
-
-;; request-authentication : connection Method URL iport oport host str bool -> bool
-;; GregP: at first look, it seems that this gets called when the user
-;; has supplied bad authentication credentials.
-(define (request-authentication conn method uri authentication-responder realm)
-  (output-response/method
-   conn
-   (authentication-responder
-    uri 
-    (make-basic-auth-header realm))
-   method))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-pathprocedure.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-pathprocedure.rkt
deleted file mode 100644
index 885d4be081..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-pathprocedure.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-(require mzlib/contract
-         net/url)
-(require web-server/dispatchers/dispatch
-         web-server/private/util
-         web-server/http
-         web-server/http/response)
-(provide/contract
- [interface-version dispatcher-interface-version/c]
- [make (string? (request? . -> . response?) . -> . dispatcher/c)])
-
-(define interface-version 'v1)
-(define ((make the-path procedure) conn req)
-  (define path (url-path->string (url-path (request-uri req))))
-  (if (string=? the-path path)
-      (output-response/method
-       conn
-       (procedure req)
-       (request-method req))
-      (next-dispatcher)))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-sequencer.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-sequencer.rkt
deleted file mode 100644
index 1cbca8a04e..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-sequencer.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         web-server/dispatchers/dispatch)
-(provide/contract
- [interface-version dispatcher-interface-version/c]
- [make (() () #:rest (listof dispatcher/c) . ->* . dispatcher/c)])
-
-(define interface-version 'v1)
-(define ((make . dispatchers) conn req)
-  (let loop ([dispatchers dispatchers])
-    (if (empty? dispatchers)
-        (next-dispatcher)
-        (with-handlers ([exn:dispatcher?
-                         (lambda (e) (loop (rest dispatchers)))])
-          ((first dispatchers) conn req)))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-servlets.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-servlets.rkt
deleted file mode 100644
index b8ecab2fc6..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-servlets.rkt
+++ /dev/null
@@ -1,95 +0,0 @@
-#lang racket/base
-(require racket/contract)
-(require web-server/servlet/setup
-         web-server/servlet/servlet-structs
-         web-server/managers/manager
-         web-server/http
-         web-server/http/response
-         net/url
-         web-server/dispatchers/dispatch
-         web-server/dispatchers/filesystem-map
-         web-server/configuration/responders
-         web-server/private/connection-manager
-         web-server/private/web-server-structs
-         web-server/private/servlet
-         web-server/private/cache-table)
-(provide/contract
- [interface-version dispatcher-interface-version/c])
-(define interface-version 'v1)
-
-(define url->servlet/c (url? . -> . servlet?))
-(provide/contract
- [url->servlet/c contract?]
- [make-cached-url->servlet
-  (-> url->path/c
-      path->servlet/c
-      (values (-> void)
-              url->servlet/c))])
-
-(define (make-cached-url->servlet         
-         url->path 
-         path->servlet)
-  (define config:scripts (make-cache-table))
-  (values (lambda ()
-            ;; This is broken - only out of date or specifically mentioned scripts should be flushed.  This destroys persistent state!
-            (cache-table-clear! config:scripts))
-          (lambda (uri)
-            (define-values (servlet-path _)
-              (with-handlers
-                  ([void (lambda (e)
-                           (raise (make-exn:fail:filesystem:exists
-                                   (exn-message e)
-                                   (exn-continuation-marks e))))])
-                (url->path uri)))
-            (cache-table-lookup! config:scripts
-                                 (string->symbol (path->string servlet-path))
-                                 (lambda () (path->servlet servlet-path))))))
-
-; -----
-(provide/contract
- [make (->* (url->servlet/c)
-            (#:responders-servlet-loading (url? any/c . -> . can-be-response?)
-                                          #:responders-servlet (url? any/c . -> . can-be-response?))
-            dispatcher/c)])
-
-(define (make url->servlet
-          #:responders-servlet-loading [responders-servlet-loading servlet-loading-responder]
-          #:responders-servlet [responders-servlet servlet-error-responder])
-  (lambda (conn req)
-    (define instance-custodian (make-servlet-custodian))      
-    (parameterize ([current-custodian instance-custodian]
-                   [current-execution-context (make-execution-context req)]
-                   [exit-handler
-                    (lambda (r)
-                      (kill-connection! conn)
-                      (custodian-shutdown-all instance-custodian))])
-      (define uri (request-uri req))
-      (define maybe-response
-        (with-handlers ([exn:fail:filesystem:exists?
-                         (lambda (the-exn) (next-dispatcher))]
-                        [exn:dispatcher? raise]
-                        [(lambda (x) #t)
-                         (lambda (the-exn) 
-                           (responders-servlet-loading uri the-exn))])
-          ;; This could cause the servlet to be initialized, so we
-          ;; need to make sure that if it errors, the right kind of
-          ;; error will happen.
-          (define the-servlet (url->servlet uri))
-          ;; If it didn't cause initialization, then we need to switch
-          ;; to the custodian that it started with, among other
-          ;; things, including throwing a different kind of error
-          (parameterize ([current-servlet the-servlet]
-                         [current-custodian (servlet-custodian the-servlet)]
-                         [current-directory (servlet-directory the-servlet)]
-                         [current-namespace (servlet-namespace the-servlet)])
-            (with-handlers ([exn:dispatcher? raise]
-                            [(lambda (x) #t)
-                             (lambda (exn) (responders-servlet uri exn))])
-              (call-with-continuation-barrier 
-               (lambda ()
-                 (call-with-continuation-prompt
-                  (lambda ()
-                    ((servlet-handler the-servlet) req))
-                  servlet-prompt)))))))
-      
-      (output-response conn (any->response maybe-response)))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-stat.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-stat.rkt
deleted file mode 100644
index 5df1238c2d..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-stat.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-(require racket/contract)
-(require web-server/dispatchers/dispatch
-         web-server/private/web-server-structs
-         web-server/private/connection-manager)
-(provide/contract
- [make-gc-thread (integer? . -> . thread?)]
- [interface-version dispatcher-interface-version/c]
- [make (-> dispatcher/c)])
-
-(define (bytes->mb b)
-  (round (exact->inexact (/ b 1024 1024))))
-
-(define (print-memory-usage)
-  (printf "Usage: ~aMB (of ~aMB)\n"
-          (bytes->mb (current-memory-use (current-server-custodian)))
-          (bytes->mb (current-memory-use))))
-
-(define (make-gc-thread t)
-  (thread
-   (lambda ()
-     (let loop ()
-       (sleep t) 
-       (printf ".")         
-       (collect-garbage)
-       (loop)))))
-
-(define interface-version 'v1)
-(define ((make) conn req)
-  #;(dump-memory-stats)
-  (print-memory-usage)
-  (next-dispatcher))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-timeout.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-timeout.rkt
deleted file mode 100644
index 498813113b..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch-timeout.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require racket/contract)
-(require web-server/dispatchers/dispatch
-         web-server/private/connection-manager)
-(provide/contract
- [interface-version dispatcher-interface-version/c]
- [make (integer? . -> . dispatcher/c)])
-
-(define interface-version 'v1)
-(define ((make new-timeout) conn req)
-  (adjust-connection-timeout! conn new-timeout)
-  (next-dispatcher))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch.rkt
deleted file mode 100644
index 93f0c0a3a1..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/dispatch.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-(require racket/contract)
-(require web-server/private/connection-manager
-         web-server/http)
-
-(define dispatcher/c
-  (connection? request? . -> . void))
-(define dispatcher-interface-version/c
-  (symbols 'v1))
-(define-struct exn:dispatcher ())
-(define (next-dispatcher) (raise (make-exn:dispatcher)))
-
-(provide/contract
- [dispatcher/c contract?]
- [dispatcher-interface-version/c contract?]
- [next-dispatcher (-> void)]
- [struct exn:dispatcher ()])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/filesystem-map.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/filesystem-map.rkt
deleted file mode 100644
index 5ba98c7a2b..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/filesystem-map.rkt
+++ /dev/null
@@ -1,109 +0,0 @@
-#lang racket/base
-(require net/url
-         racket/list
-         racket/match
-         racket/contract)
-(require web-server/private/util)
-(define url->path/c
-  ((url?) () . ->* . (values path? (listof path-piece?))))
-
-(provide/contract
- [url->path/c contract?]
- [make-url->path (path-string? . -> . url->path/c)]
- [make-url->valid-path (url->path/c . -> . url->path/c)]
- [filter-url->path (regexp? url->path/c . -> . url->path/c)])
-
-(define (restrict l)
-  (not
-   (negative?
-    (let loop ([end-in-file? #f] [depth 0] [l l])
-      (match l
-        [(list)
-         (if end-in-file?
-           (sub1 depth)
-           depth)]
-        [(list-rest (or ".." 'up) rst)
-         (loop #f (sub1 depth) rst)]
-        [(list-rest (or "" 'same) rst)
-         (loop #f depth rst)]
-        [(list-rest _ rst)
-         (loop #t (add1 depth) rst)])))))
-
-(module+ test
-  (require rackunit)
-
-  (check-equal? (restrict (list))
-                #t)
-  (check-equal? (restrict (list 'up))
-                #f)
-  (check-equal? (restrict (list ".."))
-                #f)
-  (check-equal? (restrict (list 'same))
-                #t)
-  (check-equal? (restrict (list 'same ".."))
-                #f)
-
-  (check-equal? (restrict (list "foo" 'up "bar"))
-                #t)
-  (check-equal? (restrict (list "foo" 'up 'up "bar"))
-                #f)
-  (check-equal? (restrict (list 'up "bar"))
-                #f)
-  (check-equal? (restrict (list "foo" "bar" 'up "bar"))
-                #t)
-  (check-equal? (restrict (list "foo" "bar" 'up 'up 'up "bar"))
-                #f)
-
-  (check-equal? (restrict (list "foo" 'same "bar" 'up 'up 'up "bar"))
-                #f)
-  (check-equal? (restrict (list "foo" "" "bar" 'up 'up 'up "bar"))
-                #f)
-  (check-equal? (restrict (list "foo" "bar" 'up "bar" 'same))
-                #t)
-  (check-equal? (restrict (list "foo" "bar" 'up "bar" ""))
-                #t))
-
-(define (build-path* . l)
-  (if (empty? l)
-      (build-path 'same)
-      (apply build-path l)))
-
-(define ((make-url->path base) u)
-  (define nbase (path->complete-path base))
-  (define path-from-url
-    (for/list ([p/p (in-list (url-path u))])
-      (match (path/param-path p/p)
-        ["" 'same]
-        [".." 'up]
-        [x x])))
-  (unless (restrict path-from-url)
-    (error 'url->path "Illegal path: ~e outside base: ~e" 
-           path-from-url
-           base))
-  (define the-path
-    (path->complete-path
-     (apply build-path* path-from-url)
-     nbase))
-  (define w/o-base (path-without-base nbase the-path))
-  (values the-path w/o-base))
-
-(define ((make-url->valid-path url->path) u)
-  (let loop ([up (url-path u)])
-    #;(printf "~S\n" `(url->valid-path ,(url->string u) ,up))
-    (with-handlers ([exn:fail? (lambda (exn)
-                                 #;((error-display-handler) (exn-message exn) exn)
-                                 (if (empty? up)
-                                     (raise exn)
-                                     (loop (reverse (rest (reverse up))))))])
-      (define-values (p w/o-base)
-        (url->path (url-replace-path (lambda _ up) u)))
-      (unless (or (file-exists? p) (link-exists? p))
-        (raise (make-exn:fail:filesystem:exists (string->immutable-string (format "No valid path: ~a" p)) (current-continuation-marks))))
-      (values p w/o-base))))
-
-(define ((filter-url->path regex url->path) u)
-  (define-values (p w/o-base) (url->path u))
-  (if (regexp-match regex (path->string p))
-      (values p w/o-base)
-      (raise (make-exn:fail:filesystem:exists (string->immutable-string (format "Does not pass filter: ~a" p))
-                                              (current-continuation-marks)))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/limit.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/limit.rkt
deleted file mode 100644
index 0fe51465ac..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/dispatchers/limit.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         web-server/dispatchers/dispatch)
-(provide/contract
- [interface-version dispatcher-interface-version/c]
- [make ((number? dispatcher/c) (#:over-limit (symbols 'block 'kill-new 'kill-old)) . ->* . dispatcher/c)])
-
-(define interface-version 'v1)
-(define (make num inner #:over-limit [over-limit 'block])
-  (define-struct in-req (partner reply-ch))
-  (define in-ch (make-channel))
-  (define-struct out-req (partner))
-  (define out-ch (make-channel))
-  (define limit-manager
-    (thread
-     (lambda ()
-       (let loop ([i 0]
-                  [partners empty])
-         (apply sync 
-                ; Do we have room for another...
-                (if (< i num)
-                    ; If so, allow them in
-                    (handle-evt in-ch
-                                (lambda (req)
-                                  ; Reply asynchronously
-                                  (thread 
-                                   (lambda ()
-                                     (channel-put (in-req-reply-ch req) #t)))
-                                  (loop (add1 i)
-                                        (list* (in-req-partner req) partners))))
-                    ; Otherwise, decide what to do with new requests
-                    (case over-limit
-                      ; Make them block...
-                      [(block)
-                       never-evt]
-                      ; Instruct the new request to die
-                      [(kill-new)
-                       (handle-evt in-ch
-                                   (lambda (req)
-                                     ; Reply asynchronously
-                                     (thread
-                                      (lambda ()
-                                        (channel-put (in-req-reply-ch req) #f)))
-                                     (loop i partners)))]
-                      ; Kill an old request handler and allow this one
-                      [(kill-old)
-                       (handle-evt in-ch
-                                   (lambda (req)
-                                     (define oldest (last partners))
-                                     (define remaining (take partners (sub1 (length partners))))
-                                     ; Kill the oldest thread
-                                     (kill-thread oldest)
-                                     ; Reply asynchronously
-                                     (thread 
-                                      (lambda ()
-                                        (channel-put (in-req-reply-ch req) #t)))
-                                     (loop i (list* (in-req-partner req) remaining))))]))
-                ; Wait for partners to complete
-                (handle-evt out-ch
-                            (lambda (req)
-                              (loop (sub1 i)
-                                    (remq (out-req-partner req) partners))))
-                ; Check if partners are dead
-                (map (lambda (p)
-                       (handle-evt (thread-dead-evt p)
-                                   (lambda _
-                                     (loop (sub1 i) (remq p partners)))))
-                     partners))))))
-  (define (in)
-    (define reply (make-channel))
-    (channel-put in-ch (make-in-req (current-thread) reply))
-    (unless (channel-get reply)
-      (error 'limit "limit-manager requested load shedding")))
-  (define (out)
-    (channel-put out-ch (make-out-req (current-thread))))
-  (lambda (conn req)
-    (dynamic-wind 
-     in
-     (lambda () 
-       (inner conn req))
-     out)))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/formlets.rkt
deleted file mode 100644
index 333b4bad72..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require web-server/formlets/syntax
-         web-server/formlets/dyn-syntax
-         web-server/formlets/input
-         web-server/formlets/servlet
-         web-server/formlets/lib)
-(provide (all-from-out web-server/formlets/servlet)
-         (all-from-out web-server/formlets/input)
-         (all-from-out web-server/formlets/syntax)
-         (all-from-out web-server/formlets/dyn-syntax)
-         formlet/c
-         formlet-display
-         formlet-process)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/dyn-syntax.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/dyn-syntax.rkt
deleted file mode 100644
index 9548a7c195..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/dyn-syntax.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     racket/local
-                     racket/list
-                     syntax/parse
-                     syntax/strip-context)
-         racket/function
-         racket/list
-         racket/match
-         racket/stxparam
-         "lib.rkt"
-         "syntax.rkt"
-         (for-syntax "lib.rkt"))
-
-(define-syntax-parameter =>*
-  (λ (stx) (raise-syntax-error '=>* "Only allowed inside formlet*" stx)))
-
-(define (snoc x l) (append l (list x)))
-
-(struct label-formlet (p))
-
-(define (label-formlet-answers labels formlet)
-  (label-formlet
-   (cross (pure (λ anss
-                  (λ (answers) 
-                    (for ([label (in-list labels)]
-                          [ans (in-list anss)])
-                      (hash-update! answers label (curry snoc ans) empty)))))
-          formlet)))
-
-(define xexpr-forest->label-formlet
-  (match-lambda
-    [(list)
-     (pure (λ (x) x))]
-    [(list-rest xe xf)
-     (cross* (pure (lambda (xe-populate-hash! xf-populate-hash!)
-                     (lambda (answers)
-                       (xe-populate-hash! answers)
-                       (xf-populate-hash! answers))))
-             (xexpr->label-formlet xe)
-             (xexpr-forest->label-formlet xf))]))
-
-(define xexpr->label-formlet
-  (match-lambda
-    [(#%#-mark l)
-     (xexpr-forest->label-formlet l)]
-    [(list (? symbol? tag) (list (list (? symbol? attr) (? string? str)) ...) xexpr ...)
-     (tag-xexpr tag (map list attr str)
-                (xexpr-forest->label-formlet xexpr))]
-    [(list (? symbol? tag) xexpr ...)
-     (tag-xexpr tag empty
-                (xexpr-forest->label-formlet xexpr))]
-    [(label-formlet p)
-     p]
-    [(? string? s)
-     (text s)]))
-
-(define (label-formlet-cross handler xexpr/labeled-formlets)
-  (cross (pure (λ (populate-hash!)
-                 (define ht (make-hasheq))
-                 (populate-hash! ht)
-                 (handler ht)))
-         (xexpr->label-formlet xexpr/labeled-formlets)))
-
-(struct #%#-mark (l))
-(define-syntax-rule (inner-#%# e ...) (#%#-mark (list e ...)))
-
-(define-syntax (formlet* stx)
-  (syntax-case stx ()
-    [(_ q e)
-     (local [(define label->name (make-hash))
-             (define (this-=>* stx)
-               (syntax-parse stx
-                             #:literals (values)
-                             [(=>* formlet:expr name:id)
-                              #'(=>* formlet (values name))]
-                             [(_ formlet:expr (values name:id ...))
-                              (define names (syntax->list #'(name ...)))
-                              (define labels (map (compose gensym syntax->datum) names))
-                              (for ([label (in-list labels)]
-                                    [name (in-list names)])
-                                (hash-set! label->name label (replace-context #'e name)))
-                              #`(label-formlet-answers '#,labels formlet)]))
-             (define q-raw 
-               (local-expand #`(syntax-parameterize ([=>* #,this-=>*]
-                                                     [#%# (make-rename-transformer #'inner-#%#)])
-                                                    q)
-                             'expression empty))]
-       (with-syntax ([((label . name) ...)
-                      (for/list ([(k v) (in-hash label->name)])
-                        (cons k v))])
-         (quasisyntax/loc stx
-           (label-formlet-cross (lambda (labeled)
-                                  (let ([name (hash-ref labeled 'label empty)]
-                                        ...)
-                                    e))
-                                #,q-raw))))]))
-
-(provide formlet* =>*)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/input.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/input.rkt
deleted file mode 100644
index 40ab000f61..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/input.rkt
+++ /dev/null
@@ -1,459 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         web-server/http
-         web-server/private/xexpr
-         (only-in "lib.rkt"
-                  formlet/c
-                  pure
-                  cross))
-
-;; Convert UTF-8 bytes to string when needed.
-(define (coerce-string/utf-8 bstr-or-str)
-  (if (bytes? bstr-or-str)
-    (bytes->string/utf-8 bstr-or-str)
-    bstr-or-str))
-
-; Low-level
-(define (next-name i)
-  (values (format "input_~a" i) (add1 i)))
-
-(define (make-input*/forest render)
-  (lambda (i)
-    (let-values ([(w i) (next-name i)])
-      (define wb (string->bytes/utf-8 w))
-      (values (render w)
-              (lambda (env) 
-                (for/list ([b (in-list env)]
-                           #:when (bytes=? wb (binding-id b)))
-                  b))
-              i))))
-
-(define (make-input* render)
-  (make-input*/forest
-   (lambda (w)
-     (list (render w)))))
-
-(define (make-input render)
-  (lambda (i)
-    (let-values ([(w i) (next-name i)])
-      (values (list (render w))
-              (lambda (env) (bindings-assq (string->bytes/utf-8 w) env))
-              i))))
-
-(define binding:form-required
-  (pure 
-   (lambda (bf)
-     (if (binding:form? bf)
-         (binding:form-value bf)
-         (error 'formlets "Missing required field")))))
-
-(define (binding:form/default default)
-  (pure
-   (lambda (bf)
-     (if (binding:form? bf)
-         (binding:form-value bf)
-         default))))
-
-(provide/contract
- [make-input* ((string? . -> . pretty-xexpr/c) . -> . (formlet/c (listof binding?)))]
- [make-input ((string? . -> . pretty-xexpr/c) . -> . (formlet/c (or/c false/c binding?)))]
- #;[binding:form-required (formlet/c (binding? . -> . bytes?))]
- #;[binding:form/default (bytes? . -> . (formlet/c (binding? . -> . bytes?)))])
-
-; HTML Spec
-(define (input
-         #:type [type "text"]
-         #:value [value #f]
-         #:size [size #f]
-         #:max-length [max-length #f]
-         #:read-only? [read-only? #f]
-         #:attributes [attrs empty])
-  (make-input
-   (lambda (n)
-     (list 'input
-           (list* (list 'name n)
-                  (list 'type type)
-                  (append
-                   (filter list?
-                           (list (and value (list 'value (coerce-string/utf-8 value)))
-                                 (and size (list 'size (number->string size)))
-                                 (and max-length (list 'maxlength (number->string max-length)))
-                                 (and read-only? (list 'readonly "true"))))
-                   attrs))))))
-
-(define (text-input 
-         #:value [value #f]
-         #:size [size #f]
-         #:max-length [max-length #f]
-         #:read-only? [read-only? #f]
-         #:attributes [attrs empty])
-  (input
-   #:type "text"
-   #:value value
-   #:size size
-   #:max-length max-length
-   #:read-only? read-only?
-   #:attributes attrs))
-
-(define (password-input 
-         #:value [value #f]
-         #:size [size #f]
-         #:max-length [max-length #f]
-         #:read-only? [read-only? #f]
-         #:attributes [attrs empty])
-  (input
-   #:type "password"
-   #:value value
-   #:size size
-   #:max-length max-length
-   #:read-only? read-only?
-   #:attributes attrs))
-
-(define (checkbox value checked?
-                  #:attributes [attrs empty])
-  (input
-   #:type "checkbox"
-   #:value value
-   #:attributes
-   (if checked? (append (list (list 'checked "true")) attrs) attrs)))
-
-(define (radio value checked?
-               #:attributes [attrs empty])
-  (input
-   #:type "radio"
-   #:value value
-   #:attributes
-   (if checked? (append (list (list 'checked "true")) attrs) attrs)))
-
-(define (input-group l
-                     #:kind kind
-                     #:attributes [attrs (λ (x) empty)]
-                     #:checked? [checked? (λ (x) #f)]
-                     #:display [display (λ (x) x)])
-  (define value->element (make-hasheq))
-  (define i 0)
-  (define (remember! e)
-    (define this-i
-      (begin0 i (set! i (add1 i))))
-    (hash-set! value->element this-i e))
-  (define (recall i)
-    (hash-ref value->element i
-              (λ () (error 'input-group "Invalid selection: ~e" i))))
-  (for ([e l])
-    (remember! e))
-  (define (radio-first l)
-    (if (string=? kind "radio")
-        (first l)
-        l))
-  (cross
-   (pure
-    (lambda (bs)
-      (radio-first
-       (map (compose recall string->number
-                     bytes->string/utf-8
-                     binding:form-value)
-            bs))))
-   (make-input*/forest
-    (lambda (name)
-      (apply append
-             (for/list ([vn (in-range i)])
-                       (define e (hash-ref value->element vn))
-                       (define v (number->string vn))
-                       (list
-                        `(input ([name ,name]
-                                 [type ,kind]
-                                 [value ,v]
-                                 ,@(if (checked? e)
-                                       '([checked "true"])
-                                       empty)
-                                 ,@(attrs e)))
-                        (display e))))))))
-
-(define (radio-group l 
-                     #:attributes [attrs (λ (x) empty)]
-                     #:checked? [checked? (λ (x) #f)]
-                     #:display [display (λ (x) x)])
-  (input-group l
-               #:kind "radio"
-               #:attributes attrs
-               #:checked? checked?
-               #:display display))
-
-(define (checkbox-group l 
-                     #:attributes [attrs (λ (x) empty)]
-                     #:checked? [checked? (λ (x) #f)]
-                     #:display [display (λ (x) x)])
-  (input-group l
-               #:kind "checkbox"
-               #:attributes attrs
-               #:checked? checked?
-               #:display display))
-
-(define (submit value
-                #:attributes [attrs empty])
-  (input
-   #:type "submit"
-   #:value value
-   #:attributes attrs))
-
-(define (reset value
-               #:attributes [attrs empty])
-  (input
-   #:type "reset"
-   #:value value
-   #:attributes attrs))
-
-(define (file-upload #:attributes [attrs empty])
-  (input
-   #:type "file"
-   #:attributes attrs))
-
-(define (hidden value #:attributes [attrs empty])
-  (input
-   #:type "hidden"
-   #:value value
-   #:attributes attrs))
-
-(define (button type text
-                #:disabled [disabled #f]
-                #:value [value #f]
-                #:attributes [attrs empty])
-  (make-input
-   (λ (n)
-     (list 'button
-           (list* (list 'name n)
-                  (list 'type (coerce-string/utf-8 type))
-                  (append 
-                   (filter list?
-                           (list (and disabled (list 'disabled (if disabled "true" "false")))
-                                 (and value (list 'value (coerce-string/utf-8 value)))))
-                   attrs))
-           (coerce-string/utf-8 text)))))
-
-(define (img alt src
-             #:height [height #f]
-             #:longdesc [ldesc #f]
-             #:usemap [map #f]
-             #:width [width #f]
-             #:attributes [attrs empty])
-  (make-input
-   (λ (n)
-     (list 'img
-           (list* (list 'name n)
-                  (list 'src (coerce-string/utf-8 src))
-                  (list 'alt (coerce-string/utf-8 alt))
-                  (append
-                   (filter list?
-                           (list (and height (list 'height (number->string height)))
-                                 (and ldesc (list 'longdesc (coerce-string/utf-8 ldesc)))
-                                 (and map (list 'usemap (coerce-string/utf-8 map)))
-                                 (and width (list 'width (number->string width)))))
-                   attrs))))))
-
-(define (multiselect-input l
-                           #:attributes [attrs empty]
-                           #:multiple? [multiple? #t]
-                           #:selected? [selected? (λ (x) #f)]
-                           #:display [display (λ (x) x)])
-  (define value->element (make-hasheq))
-  (define i 0)
-  (define (remember! e)
-    (define this-i
-      (begin0 i (set! i (add1 i))))
-    (hash-set! value->element this-i e))
-  (define (recall i)
-    (hash-ref value->element i
-              (λ () (error 'input-select* "Invalid selection: ~e" i))))
-  (for ([e l])
-    (remember! e))
-  (cross
-   (pure
-    (lambda (bs)
-      (map (compose recall string->number
-                    bytes->string/utf-8
-                    binding:form-value)
-           bs)))
-   (make-input*
-    (lambda (name)
-      `(select (,@(if multiple? '([multiple "true"]) empty)
-                [name ,name]
-                ,@attrs)
-               ,@(for/list ([vn (in-range i)])
-                   (define e (hash-ref value->element vn))
-                   (define v (number->string vn))
-                   `(option ([value ,v]
-                             ,@(if (selected? e)
-                                   '([selected "true"])
-                                   empty))
-                            ,(display e))))))))
-
-(define (select-input l 
-                      #:attributes [attrs empty]
-                      #:selected? [selected? (λ (x) #f)]
-                      #:display [display (λ (x) x)])
-  (cross
-   (pure first)
-   (multiselect-input l
-                      #:attributes attrs
-                      #:multiple? #f
-                      #:selected? selected?
-                      #:display display)))
-
-(define (textarea-input
-         #:value [value #f]
-         #:attributes [attrs empty]
-         #:rows [rows #f]
-         #:cols [cols #f])   
-  (make-input
-   (lambda (n)
-     (list 'textarea
-           (list* (list 'name n)
-                  (append
-                   (filter list?
-                           (list (and rows (list 'rows (number->string rows)))
-                                 (and cols (list 'cols (number->string cols)))))
-                   attrs))
-           (if value (coerce-string/utf-8 value) "")))))
-
-(provide/contract
- [input (()
-         (#:type string?
-          #:value (or/c false/c bytes? string?)
-          #:max-length (or/c false/c exact-nonnegative-integer?)
-          #:read-only? boolean?
-          #:attributes (listof (list/c symbol? string?)))
-          . ->* .
-          (formlet/c (or/c false/c binding?)))]
- [text-input (() 
-              (#:value (or/c false/c bytes? string?)
-                       #:size (or/c false/c exact-nonnegative-integer?)
-                       #:max-length (or/c false/c exact-nonnegative-integer?)
-                       #:read-only? boolean?
-                       #:attributes (listof (list/c symbol? string?)))
-              . ->* . 
-              (formlet/c (or/c false/c binding?)))]
- [password-input (() 
-                  (#:value (or/c false/c bytes? string?)
-                           #:size (or/c false/c exact-nonnegative-integer?)
-                           #:max-length (or/c false/c exact-nonnegative-integer?)
-                           #:read-only? boolean?
-                           #:attributes (listof (list/c symbol? string?)))
-                  . ->* . 
-                  (formlet/c (or/c false/c binding?)))]
- [checkbox (((or/c bytes? string?) boolean?)
-            (#:attributes (listof (list/c symbol? string?)))
-            . ->* .
-            (formlet/c (or/c false/c binding?)))]
- [radio (((or/c bytes? string?) boolean?)
-         (#:attributes (listof (list/c symbol? string?)))
-         . ->* .
-         (formlet/c (or/c false/c binding?)))]
- [radio-group ((sequence?)
-               (#:attributes 
-                (-> any/c (listof (list/c symbol? string?)))
-                #:checked? (any/c . -> . boolean?)
-                #:display (any/c . -> . pretty-xexpr/c))
-               . ->* .
-               (formlet/c any/c))]
- [checkbox-group ((sequence?)
-                  (#:attributes 
-                   (-> any/c (listof (list/c symbol? string?)))
-                   #:checked? (any/c . -> . boolean?)
-                   #:display (any/c . -> . pretty-xexpr/c))
-                  . ->* .
-                  (formlet/c (listof any/c)))]
- [submit (((or/c bytes? string?))
-          (#:attributes (listof (list/c symbol? string?)))
-          . ->* .
-          (formlet/c (or/c false/c binding?)))]
- [reset (((or/c bytes? string?))
-         (#:attributes (listof (list/c symbol? string?)))
-         . ->* .
-         (formlet/c (or/c false/c binding?)))]
- [file-upload (()
-               (#:attributes (listof (list/c symbol? string?)))
-               . ->* .
-               (formlet/c (or/c false/c binding?)))]
- [hidden (((or/c bytes? string?))
-          (#:attributes (listof (list/c symbol? string?)))
-          . ->* .
-          (formlet/c (or/c false/c binding?)))]
- [img (((or/c bytes? string?) (or/c bytes? string?))
-       (#:height (or/c false/c exact-nonnegative-integer?)
-                 #:longdesc (or/c false/c (or/c bytes? string?))
-                 #:usemap (or/c false/c (or/c bytes? string?))
-                 #:width (or/c false/c exact-nonnegative-integer?)
-                 #:attributes (listof (list/c symbol? string?)))
-       . ->* .
-       (formlet/c (or/c false/c binding?)))]
- [button (((or/c bytes? string?) (or/c bytes? string?))
-          (#:disabled
-           boolean?
-           #:value (or/c false/c (or/c bytes? string?))
-           #:attributes (listof (list/c symbol? string?)))
-          . ->* .
-          (formlet/c (or/c false/c binding?)))]
- [multiselect-input ((sequence?)
-                     (#:attributes 
-                      (listof (list/c symbol? string?))
-                      #:multiple? boolean?
-                      #:selected? (any/c . -> . boolean?)
-                      #:display (any/c . -> . pretty-xexpr/c))
-                     . ->* .
-                     (formlet/c (listof any/c)))]
- [select-input ((sequence?)
-                (#:attributes 
-                 (listof (list/c symbol? string?))
-                 #:selected? (any/c . -> . boolean?)
-                 #:display (any/c . -> . pretty-xexpr/c))
-                . ->* .
-                (formlet/c any/c))]
- [textarea-input (()
-                  (#:attributes 
-                   (listof (list/c symbol? string?))
-                   #:value (or/c false/c (or/c bytes? string?))
-                   #:rows number?
-                   #:cols number?)
-                  . ->* .
-                  (formlet/c (or/c false/c binding?)))])
-
-; High-level
-(define (required f)
-  (cross binding:form-required f))
-
-(define (default d f)
-  (cross (binding:form/default d) f))
-
-(define (to-string f)
-  (cross (pure bytes->string/utf-8) f))
-
-(define (to-number f)
-  (cross (pure string->number) f))
-
-(define (to-symbol f)
-  (cross (pure string->symbol) f))
-
-(define (to-boolean f)
-  (cross (pure 
-          (lambda (b)
-            (bytes=? b #"on")))
-         f))
-
-(provide/contract
- [required ((formlet/c (or/c false/c binding?)) . -> . (formlet/c bytes?))]
- [default (bytes? (formlet/c (or/c false/c binding?)) . -> . (formlet/c bytes?))]
- [to-string ((formlet/c bytes?) . -> . (formlet/c string?))]
- [to-number ((formlet/c string?) . -> . (formlet/c number?))]
- [to-symbol ((formlet/c string?) . -> . (formlet/c symbol?))]
- [to-boolean ((formlet/c bytes?) . -> . (formlet/c boolean?))])
-
-; OLD
-(define input-string (to-string (required (text-input))))
-(define input-int (to-number input-string))
-(define input-symbol (to-symbol input-string))
-
-(provide/contract
- [input-string (formlet/c string?)]
- [input-int (formlet/c integer?)]
- [input-symbol (formlet/c symbol?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/lib.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/lib.rkt
deleted file mode 100644
index 999bc727c2..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/lib.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/contract
-         racket/function
-         web-server/http
-         web-server/private/xexpr)
-
-; Combinators
-(define (id x) x)
-
-; Formlets
-(define (pure x)
-  (lambda (i)
-    (values empty (const x) i)))
-
-(define (cross f p)
-  (lambda (i)
-    (let*-values ([(x1 a1 i) (f i)]
-                  [(x2 a2 i) (p i)])
-      (values (append x1 x2)
-              (lambda (env)
-                (call-with-values (lambda () (a2 env)) (a1 env)))
-              i))))
-
-;; This is gross because OCaml auto-curries
-(define (cross* f . gs)
-  (lambda (i)
-    (let*-values ([(fx fp fi) (f i)]
-                  [(gs-x gs-p gs-i)
-                   (let loop ([gs gs]
-                              [xs empty]
-                              [ps empty]
-                              [i fi])
-                     (if (empty? gs)
-                         (values (reverse xs) (reverse ps) i)
-                         (let-values ([(gx gp gi) ((first gs) i)])
-                           (loop (rest gs) (list* gx xs) (list* gp ps) gi))))])
-      (values (apply append fx gs-x)
-              (lambda (env)
-                (let ([fe (fp env)]
-                      [gs-e (map (lambda (g) (g env)) gs-p)])
-                  (apply fe gs-e)))
-              gs-i))))
-
-(define (xml-forest x)
-  (lambda (i)
-    (values x (const id) i)))
-
-(define (xml x)
-  (xml-forest (list x)))
-
-(define (text x)
-  (xml x))
-
-(define (tag-xexpr t ats f)
-  (lambda (i)
-    (let-values ([(x p i) (f i)])
-      (values (list (list* t ats x)) p i))))
-
-; Helpers
-(define (formlet-display f)
-  (let-values ([(x p i) (f 0)])
-    x))
-
-(define (formlet-process f r)
-  (let-values ([(x p i) (f 0)])
-    (p (request-bindings/raw r))))
-
-; Contracts
-(define xexpr-forest/c
-  (listof pretty-xexpr/c))
-
-(define-syntax-rule (formlet/c* c)
-  (integer? . -> . 
-            (values xexpr-forest/c
-                    ((listof binding?) . -> . c)
-                    integer?)))
-(define formlet*/c (formlet/c* any))
-(define (formlet/c . c)
-  (formlet/c* (apply values (map (curry coerce-contract 'formlet/c) c))))
-
-(define alpha any/c)
-(define beta any/c)
-
-(provide/contract
- [xexpr-forest/c contract?]
- [formlet*/c contract?]
- [formlet/c (() () #:rest (listof any/c) . ->* . contract?)]
- [pure (alpha
-        . -> . (formlet/c alpha))]
- [cross ((formlet/c procedure?) formlet*/c . -> . formlet*/c)]
- [cross* (((formlet/c (unconstrained-domain-> beta)))
-          () #:rest (listof (formlet/c alpha))
-          . ->* . (formlet/c beta))]
- [xml-forest (xexpr-forest/c . -> . (formlet/c procedure?))]
- [xml (pretty-xexpr/c . -> . (formlet/c procedure?))] 
- [text (string? . -> . (formlet/c procedure?))]
- [tag-xexpr (symbol? (listof (list/c symbol? string?)) (formlet/c alpha) . -> . (formlet/c alpha))]
- [formlet-display ((formlet/c alpha) . -> . xexpr-forest/c)]
- [formlet-process (formlet*/c request? . -> . any)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/servlet.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/servlet.rkt
deleted file mode 100644
index 5d8832d2fe..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/servlet.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang racket/base
-(require racket/contract
-         web-server/servlet
-         web-server/private/xexpr
-         "lib.rkt")
-
-(provide/contract
- [send/formlet ((formlet*/c)
-                (#:method (or/c "GET" "POST" "get" "post")
-                 #:wrap (pretty-xexpr/c . -> . pretty-xexpr/c))
-                . ->* .
-                any)])
-
-(define (send/formlet f
-                      #:method
-                      [method "POST"]
-                      #:wrap 
-                      [wrapper
-                       (lambda (form-xexpr)
-                         `(html (head (title "Form Entry"))
-                                (body ,form-xexpr)))])
-  (formlet-process 
-   f
-   (send/suspend
-    (lambda (k-url)
-      (response/xexpr
-       (wrapper
-        `(form ([action ,k-url] [method ,method])
-               ,@(formlet-display f))))))))
-
-(provide/contract
- [embed-formlet 
-  (((request? . -> . any) . -> . string?)
-   formlet*/c
-   . -> .
-   pretty-xexpr/c)])
-
-(define (embed-formlet embed/url f)
-  `(form ([action ,(embed/url
-                    (lambda (r)
-                      (formlet-process f r)))])
-         ,@(formlet-display f)))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/syntax.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/syntax.rkt
deleted file mode 100644
index 6bf9dfd2c3..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/formlets/syntax.rkt
+++ /dev/null
@@ -1,64 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base
-                     syntax/parse)
-         racket/stxparam
-         racket/match
-         racket/list
-         "lib.rkt"
-         (for-syntax "lib.rkt"))
-
-(define-syntax-parameter #%# 
-  (λ (stx) (raise-syntax-error '#%# "Only allowed inside formlet or formlet*" stx)))
-
-(define-for-syntax (cross-of stx)
-  (syntax-parse 
-   stx
-   #:literals (unquote unquote-splicing => #%# values)
-   [,(formlet . => . (values name:id ...)) (syntax/loc stx (vector name ...))]
-   [,(formlet . => . name:id) (syntax/loc stx name)]
-   [,e (syntax/loc stx empty)]
-   [,@e (syntax/loc stx empty)]
-   [(#%# n ...)
-    (quasisyntax/loc stx (list #,@(map cross-of (syntax->list #'(n ...)))))]
-   [(t ([k v] ...) n ...)
-    (quasisyntax/loc stx (list #,@(map cross-of (syntax->list #'(n ...)))))]
-   [(t n ...)
-    (quasisyntax/loc stx (list #,@(map cross-of (syntax->list #'(n ...)))))]
-   [s:expr
-    (syntax/loc stx empty)]))
-
-(define-for-syntax (circ-of stx)
-  (syntax-parse
-   stx
-   #:literals (unquote unquote-splicing => #%# values)
-   [,(formlet . => . (values name:id ...)) (syntax/loc stx (cross (pure (lambda (name ...) (vector name ...))) formlet))]
-   [,(formlet . => . name:id) (syntax/loc stx formlet)]
-   [,e (syntax/loc stx (xml e))]
-   [,@e (syntax/loc stx (xml-forest e))]
-   [(#%# n ...)
-    (let ([n-cross (map cross-of (syntax->list #'(n ...)))])
-      (quasisyntax/loc stx
-        (cross*
-         (pure (match-lambda*
-                 [(list #,@n-cross)
-                  (list #,@n-cross)]))
-         #,@(map circ-of (syntax->list #'(n ...))))))]
-   [(t ([k v] ...) n ...)
-    (quasisyntax/loc stx
-      (tag-xexpr `t `([k v] ...)
-                 #,(circ-of (syntax/loc stx (#%# n ...)))))]
-   [(t n ...)
-    (quasisyntax/loc stx
-      (tag-xexpr `t empty
-                 #,(circ-of (syntax/loc stx (#%# n ...)))))]
-   [s:expr
-    (syntax/loc stx (xml 's))]))
-
-(define-syntax (formlet stx)
-  (syntax-case stx ()
-    [(_ q e)
-     (quasisyntax/loc stx
-       (cross (pure (match-lambda [#,(cross-of #'q) e]))
-              #,(circ-of #'q)))]))
-
-(provide formlet #%#)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http.rkt
deleted file mode 100644
index a4be2034b9..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket/base
-(require web-server/http/basic-auth
-         web-server/http/digest-auth
-         web-server/http/request-structs
-         web-server/http/response-structs
-         web-server/http/cookie
-         web-server/http/cookie-parse
-         web-server/http/redirect
-         web-server/http/xexpr)
-(provide (all-from-out web-server/http/basic-auth
-                       web-server/http/digest-auth
-                       web-server/http/request-structs
-                       web-server/http/response-structs
-                       web-server/http/cookie
-                       web-server/http/cookie-parse
-                       web-server/http/redirect
-                       web-server/http/xexpr))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/basic-auth.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/basic-auth.rkt
deleted file mode 100644
index 849568884f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/basic-auth.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         net/base64
-         web-server/http/request-structs)
-
-(define (request->basic-credentials req)
-  (define headers (request-headers/raw req))
-  (match (headers-assq* #"Authorization" headers)
-    [#f #f]
-    [(struct header (_ basic-credentials))
-     (cond
-       [(and (basic? basic-credentials)
-             (regexp-match #rx"([^:]*):(.*)"
-                           (base64-decode (subbytes basic-credentials 6 (bytes-length basic-credentials)))))
-        => (lambda (user-pass)
-             (cons (cadr user-pass) (caddr user-pass)))]
-       [else #f])]))
-
-;; basic?: bytes -> (or/c (listof bytes) #f)
-;; does the second part of the authorization header start with #"Basic "
-(define basic?
-  (let ([rx (byte-regexp #"^Basic .*")])
-    (lambda (a) (regexp-match rx a))))
-
-(define (make-basic-auth-header realm)
-  (make-header #"WWW-Authenticate" (string->bytes/utf-8 (format "Basic realm=\"~a\"" realm))))
-
-(provide/contract
- [make-basic-auth-header (string? . -> . header?)]
- [request->basic-credentials (request? . -> . (or/c false/c (cons/c bytes? bytes?)))])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/bindings.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/bindings.rkt
deleted file mode 100644
index 11a200ec75..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/bindings.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-(require racket/list
-         racket/contract
-         racket/match
-         web-server/private/util
-         web-server/http/request-structs)
-
-(define (request-headers request)
-  (map (match-lambda
-         [(struct header (field value))
-          (cons (lowercase-symbol! (bytes->string/utf-8 field))
-                (bytes->string/utf-8 value))])
-       (request-headers/raw request)))
-(define (request-bindings request)
-  (map (match-lambda
-         [(struct binding:form (id value))
-          (cons (lowercase-symbol! (bytes->string/utf-8 id))
-                (bytes->string/utf-8 value))]
-         [(struct binding:file (id fname headers value))
-          (cons (lowercase-symbol! (bytes->string/utf-8 id))
-                value)])
-       (request-bindings/raw request)))
-
-; extract-binding/single : sym (listof (cons str str)) -> str
-(define (extract-binding/single name bindings)
-  (define lst (extract-bindings name bindings))
-  (cond
-    [(empty? lst)
-     (error 'extract-binding/single "~e not found in ~e" name bindings)]
-    [(empty? (rest lst))
-     (first lst)]
-    [else 
-     (error 'extract-binding/single "~e occurs multiple times in ~e" name bindings)]))
-
-; extract-bindings : sym (listof (cons str str)) -> (listof str)
-(define (extract-bindings name bindings)
-  (map cdr (filter (lambda (x) (equal? name (car x))) bindings)))
-
-; exists-binding? : sym (listof (cons sym str)) -> bool
-; for checkboxes
-(define (exists-binding? name bindings)
-  (if (assq name bindings)
-      #t
-      #f))
-
-(provide/contract
- [extract-binding/single (symbol? (listof (cons/c symbol? any/c)) . -> . any/c)]
- [extract-bindings (symbol? (listof (cons/c symbol? any/c)) . -> . (listof any/c))]
- [exists-binding? (symbol? (listof (cons/c symbol? any/c)) . -> . boolean?)]   
- [request-bindings (request? . -> . (listof (or/c (cons/c symbol? string?)
-                                                  (cons/c symbol? bytes?))))]
- [request-headers (request? . -> . (listof (cons/c symbol? string?)))])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/cookie-parse.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/cookie-parse.rkt
deleted file mode 100644
index b3ffdaee06..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/cookie-parse.rkt
+++ /dev/null
@@ -1,147 +0,0 @@
-#lang racket/base
-(require racket/port
-         racket/match
-         web-server/http/request-structs
-         net/cookie
-         web-server/private/util         
-         racket/contract)
-
-(define-struct client-cookie 
-  (name value domain path)
-  #:prefab)
-
-(provide/contract
- [struct client-cookie 
-         ([name string?]
-          [value string?]
-          [domain (or/c false/c valid-domain?)]
-          [path (or/c false/c string?)])]
- [request-cookies (request? . -> . (listof client-cookie?))])
-
-;; ============================================================
-;; utilities for retrieving cookies
-
-(require parser-tools/lex
-         parser-tools/yacc
-         (prefix-in : parser-tools/lex-sre))
-
-#|
-   cookie          =       "Cookie:" cookie-version
-                           1*((";" | ",") cookie-value)
-   cookie-value    =       NAME "=" VALUE [";" path] [";" domain]
-   cookie-version  =       "$Version" "=" value
-   NAME            =       attr
-   VALUE           =       value
-   path            =       "$Path" "=" value
-   domain          =       "$Domain" "=" value
-
-   value          = token | quoted-string
-
-   token          = 1*<any CHAR except CTLs or tspecials>
-
-   quoted-string  = ( <"> *(qdtext) <"> )
-   qdtext         = <any TEXT except <">>
-|#
-(define-lex-abbrevs
-  (illegal (char-set "()<>@:/[]?{}"))
-  (tspecial (:or (char-set "()<>@,;\\\"/[]?={}") whitespace #\tab))
-  (token-char (:- any-char tspecial iso-control)))
-
-(define-tokens regular (TOKEN QUOTED-STRING ILLEGAL))
-(define-empty-tokens keywords (EQUALS SEMI COMMA PATH DOMAIN VERSION EOF))
-
-(define lex-cookie
-  (lexer-src-pos
-   [(eof) (token-EOF)]
-   [whitespace (return-without-pos (lex-cookie input-port))]
-   ["=" (token-EQUALS)]
-   [";" (token-SEMI)]
-   ["," (token-COMMA)]
-   [(:+ illegal) (token-ILLEGAL lexeme)]
-   ["$Path" (token-PATH)]
-   ["$Domain" (token-DOMAIN)]
-   ["$Version" (token-VERSION)]
-   [(:: #\" (:* (:or (:~ #\") "\\\"")) #\")
-    (token-QUOTED-STRING (substring lexeme 1 (- (string-length lexeme) 1)))]
-   [(:+ token-char) (token-TOKEN lexeme)]))
-
-(define current-source-name (make-parameter #f))
-
-(define (make-srcloc start-pos end-pos)
-  (list (current-source-name) 
-        (position-line start-pos)
-        (position-col start-pos)
-        (position-offset start-pos)
-        (- (position-offset end-pos) (position-offset start-pos))))
-
-(define parse-raw-cookies
-  (parser (src-pos)
-          (start items)
-          (tokens regular keywords)
-          (grammar (items [(item separator items) (cons $1 $3)]
-                          [(item) (list $1)])
-                   (separator [(COMMA) #t]
-                              [(SEMI) #t])
-                   (item [(lhs EQUALS rhs) (cons $1 $3)]
-                         ; This is not part of the spec. It is illegal
-                         [(lhs EQUALS) (cons $1 "")])
-                   (lhs [(VERSION) "$Version"]
-                        [(DOMAIN) 'domain]
-                        [(PATH) 'path]
-                        [(TOKEN) $1])
-                   (rhs [(TOKEN) $1] ; This is legal, but is subsumed by the illegal rule
-                        [(QUOTED-STRING) (regexp-replace* (regexp-quote "\\\"") $1 "\"")]
-                        ; This is not part of the spec. It is illegal
-                        [(illegal) $1])
-                   (illegal
-                    [(EQUALS) "="]
-                    [(ILLEGAL) $1]
-                    [(illegal illegal) (string-append $1 $2)]
-                    [(TOKEN) $1]))
-          (suppress) ; The illegal rule creates many conflicts
-          (end EOF)
-          (error (lambda (tok-ok? tok-name tok-value start-pos end-pos)
-                   (raise-syntax-error
-                    'parse-cookies
-                    (format 
-                     (if tok-ok? 
-                         "Did not expect token ~a"
-                         "Invalid token ~a")
-                     tok-name)
-                    (datum->syntax #f tok-value (make-srcloc start-pos end-pos)))))))
-
-(define (parse-cookie-likes ip)
-  (parse-raw-cookies (λ () (lex-cookie ip))))
-
-(define (parse-cookies str)
-  (with-input-from-string 
-      str
-    (λ () 
-      (define ip (current-input-port))
-      (port-count-lines! ip)
-      (parameterize ([current-source-name (object-name ip)])
-        (raw->cookies (parse-cookie-likes ip))))))
-
-;; raw->cookies : flat-property-list -> (listof cookie)
-(define raw->cookies
-  (match-lambda
-    [(list-rest (cons (? string? key) val) l)
-     (let loop ([l l] [c (make-client-cookie key val #f #f)])
-       (match l
-         [(list)
-          (list c)]
-         [(list-rest (cons (? string? key) val) l)
-          (list* c (loop l (make-client-cookie key val #f #f)))]
-         [(list-rest (cons 'domain val) l)
-          (loop l (struct-copy client-cookie c [domain val]))]
-         [(list-rest (cons 'path val) l)
-          (loop l (struct-copy client-cookie c [path val]))]))]))
-
-;; request-cookies* : request -> (listof cookie)
-(define (request-cookies req)
-  (define hdrs (request-headers/raw req))
-  (apply append
-         (map (compose parse-cookies bytes->string/utf-8 header-value)
-              (filter (lambda (h)
-                        (bytes-ci=? #"Cookie" (header-field h)))
-                      hdrs))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/cookie.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/cookie.rkt
deleted file mode 100644
index 430cb7fdce..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/cookie.rkt
+++ /dev/null
@@ -1,50 +0,0 @@
-#lang racket/base
-(require net/cookie
-         web-server/http/request-structs
-         web-server/http/response-structs
-         xml
-         web-server/private/xexpr
-         racket/contract)
-
-(provide/contract 
- [make-cookie ((cookie-name? cookie-value?)
-               (#:comment (or/c false/c string?)
-                #:domain (or/c false/c valid-domain?)
-                #:max-age (or/c false/c exact-nonnegative-integer?)
-                #:path (or/c false/c string?)
-                #:expires (or/c false/c string?)
-                #:secure? (or/c false/c boolean?))
-               . ->* . cookie?)]
- [cookie->header (cookie? . -> . header?)])
-
-(define-syntax setter
-  (syntax-rules ()
-    [(_ e)
-     e]
-    [(_ e (f arg) . more)
-     (let ([x e])
-       (setter (if arg
-                   (f x arg)
-                   x)
-               . more))]))
-
-(define (make-cookie name val
-                     #:comment [comment #f]
-                     #:domain  [domain #f]
-                     #:max-age [max-age #f]
-                     #:path    [path #f]
-                     #:expires [expires #f]
-                     #:secure? [secure? #f])
-  (setter (set-cookie name val)
-          (cookie:add-comment comment)
-          (cookie:add-domain domain)
-          (cookie:add-expires expires)
-          (cookie:add-max-age max-age)
-          (cookie:add-path path)
-          (cookie:secure secure?)))
-
-;; cookie->header : cookie -> header
-;; gets the header that will set the given cookie
-(define (cookie->header cookie)
-  (make-header #"Set-Cookie" (string->bytes/utf-8 (print-cookie cookie))))
-
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/digest-auth.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/digest-auth.rkt
deleted file mode 100644
index 602b31a66d..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/digest-auth.rkt
+++ /dev/null
@@ -1,196 +0,0 @@
-#lang racket/base
-(require racket/port
-         racket/match
-         racket/contract
-         net/base64
-         file/md5
-         web-server/http/request-structs)
-
-;; Requesting
-(define (make-digest-auth-header realm private-key opaque)
-  (define timestamp
-    (number->string (current-seconds)))
-  (define nonce
-    (base64-encode 
-     (string->bytes/utf-8
-      (format "~a ~a"
-              timestamp
-              (md5 (string->bytes/utf-8 (string-append timestamp ":" private-key)))))))
-  (make-header 
-   #"WWW-Authenticate" 
-   (string->bytes/utf-8
-    (format "Digest realm=\"~a\", qop=\"auth\", nonce=\"~a\" opaque=\"~a\""
-            realm nonce opaque))))
-
-;; Receiving
-(require parser-tools/lex
-         parser-tools/yacc
-         (prefix-in : parser-tools/lex-sre))
-
-#|
-       auth-param     = token "=" ( token | quoted-string )
-       realm       = "realm" "=" realm-value
-       realm-value = quoted-string
-
-      challenge        =  "Digest" digest-challenge
-
-      digest-challenge  = 1#( realm | [ domain ] | nonce |
-                          [ opaque ] |[ stale ] | [ algorithm ] |
-                          [ qop-options ] | [auth-param] )
-
-
-      domain            = "domain" "=" <"> URI ( 1*SP URI ) <">
-      URI               = absoluteURI | abs_path
-      nonce             = "nonce" "=" nonce-value
-      nonce-value       = quoted-string
-      opaque            = "opaque" "=" quoted-string
-      stale             = "stale" "=" ( "true" | "false" )
-      algorithm         = "algorithm" "=" ( "MD5" | "MD5-sess" |
-                           token )
-      qop-options       = "qop" "=" <"> 1#qop-value <">
-      qop-value         = "auth" | "auth-int" | token
-
-       credentials      = "Digest" digest-response
-       digest-response  = 1#( username | realm | nonce | digest-uri
-                       | response | [ algorithm ] | [cnonce] |
-                       [opaque] | [message-qop] |
-                           [nonce-count]  | [auth-param] )
-
-       username         = "username" "=" username-value
-       username-value   = quoted-string
-       digest-uri       = "uri" "=" digest-uri-value
-       digest-uri-value = request-uri   ; As specified by HTTP/1.1
-       message-qop      = "qop" "=" qop-value
-       qop-value        = "auth" | "auth-int" | token
-       cnonce           = "cnonce" "=" cnonce-value
-       cnonce-value     = nonce-value
-       nonce-count      = "nc" "=" nc-value
-       nc-value         = 8LHEX
-       response         = "response" "=" request-digest
-       request-digest = <"> 32LHEX <">
-       LHEX             =  "0" | "1" | "2" | "3" |
-                           "4" | "5" | "6" | "7" |
-                           "8" | "9" | "a" | "b" |
-                           "c" | "d" | "e" | "f" 
-|#
-(define-lex-abbrevs
-  (tspecial (:or (char-set "()<>@,;:\\\"/[]?={}") whitespace #\tab))
-  (hex-char (char-set "0123456789abcdef"))
-  (token-char (:- any-char tspecial iso-control)))
-
-(define-tokens regular (TOKEN QUOTED-STRING 8LHEX 32LHEX))
-(define-empty-tokens keywords (EQUALS COMMA DIGEST USERNAME REALM OPAQUE ALGORITHM MD5 MD5-SESS NONCE URI QOP AUTH AUTH-INT CNONCE NC RESPONSE EOF))
-
-(define digest-lexer
-  (lexer
-   [(eof) (token-EOF)]
-   [whitespace (digest-lexer input-port)]
-   ["=" (token-EQUALS)]
-   ["," (token-COMMA)]
-   ["Digest" (token-DIGEST)]
-   ["username" (token-USERNAME)]
-   ["realm" (token-REALM)]
-   ["nonce" (token-NONCE)]
-   ["uri" (token-URI)]
-   ["qop" (token-QOP)]
-   ["auth" (token-AUTH)]
-   ["opaque" (token-OPAQUE)]
-   ["auth-int" (token-AUTH-INT)]
-   ["cnonce" (token-CNONCE)]
-   ["nc" (token-NC)]
-   ["response" (token-RESPONSE)]
-   [(repetition 8 8 hex-char) (token-8LHEX lexeme)]
-   #;[(:: #\" (repetition 32 32 hex-char) #\") (token-32LHEX lexeme)]
-   [(:: #\" (:* (:or (:~ #\") "\\\"")) #\")
-    (token-QUOTED-STRING (substring lexeme 1 (- (string-length lexeme) 1)))]
-   [(:+ token-char) (token-TOKEN lexeme)]))
-
-(define digest-parser
-  (parser (start credentials)
-          (tokens regular keywords)
-          (grammar (credentials [(DIGEST digest-response) $2])
-                   (digest-response [(dr-part COMMA digest-response) (cons $1 $3)]
-                                    [(dr-part) (list $1)])
-                   (dr-part [(username) $1] [(realm) $1] [(nonce) $1]
-                            [(digest-uri) $1] [(response) $1] [(algorithm) $1]
-                            [(cnonce) $1] [(opaque) $1] [(message-qop) $1]
-                            [(nonce-count) $1] [(auth-param) $1])
-                   (auth-param [(TOKEN EQUALS auth-param-value) (cons (string->symbol $1) $3)])
-                   (auth-param-value [(TOKEN) $1] [(QUOTED-STRING) $1])
-                   (username [(USERNAME EQUALS QUOTED-STRING) (cons 'username $3)])
-                   (realm [(REALM EQUALS QUOTED-STRING) (cons 'realm $3)])
-                   (nonce [(NONCE EQUALS QUOTED-STRING) (cons 'nonce $3)])
-                   (algorithm [(ALGORITHM EQUALS algorithm-value) (cons 'algorithm $3)])
-                   (algorithm-value [(MD5) "md5"] [(MD5-SESS) "md5-sess"] [(TOKEN) $1])
-                   (digest-uri [(URI EQUALS QUOTED-STRING) (cons 'uri $3)])
-                   (opaque [(OPAQUE EQUALS QUOTED-STRING) (cons 'opaque $3)])
-                   (message-qop [(QOP EQUALS qop-value) (cons 'qop $3)])
-                   (qop-value [(AUTH) "auth"] [(AUTH-INT) "auth-int"] [(TOKEN) $1] [(QUOTED-STRING) $1])
-                   (cnonce [(CNONCE EQUALS QUOTED-STRING) (cons 'cnonce $3)])
-                   (nonce-count [(NC EQUALS 8LHEX) (cons 'nc $3)])
-                   (response [(RESPONSE EQUALS QUOTED-STRING) (cons 'response $3)]))
-          (end EOF)
-          (error (lambda (a b c) (error 'digest-parser "Malformed digest: ~v ~v ~v" a b c)))))
-
-(define (do-digest-parse str)
-  (with-handlers ([exn:fail? (lambda _ #f)])
-    (with-input-from-string 
-     str 
-     (lambda ()
-       (digest-parser (λ () (digest-lexer (current-input-port))))))))
-
-(define (request->digest-credentials req)
-  (define headers (request-headers/raw req))
-  (match (headers-assq* #"Authorization" headers)
-    [#f #f]
-    [(struct header (_ auth-bytes))
-     (do-digest-parse (bytes->string/utf-8 auth-bytes))]))
-
-(define username*realm->password/c
-  (string? string? . -> . string?))
-(define (password->digest-HA1 username*realm->password)
-  (lambda (username realm)
-    (define password
-      (username*realm->password username realm))
-    (define A1 
-      (string->bytes/utf-8
-       (format "~a:~a:~a" username realm password)))
-    (define HA1 (md5 A1))
-    HA1))
-
-(define username*realm->digest-HA1/c
-  (string? string? . -> . bytes?))
-(define (make-check-digest-credentials username*realm->HA1)
-  (lambda (method alist)
-    (define (get-binding s l)
-      (define c (assq s l))
-      (if c (cdr c)
-          (error 'make-check-digest-credentials "Missing digest field: ~a" s)))
-    (define username (get-binding 'username alist))
-    (define realm (get-binding 'realm alist))
-    (define digest-uri (get-binding 'uri alist))
-    (define nonce (get-binding 'nonce alist))
-    (define nonce-count (get-binding 'nc alist))
-    (define cnonce (get-binding 'cnonce alist))
-    (define qop (get-binding 'qop alist))
-    (define response (get-binding 'response alist))
-    (define HA1 (username*realm->HA1 username realm))    
-    (define A2
-      (string->bytes/utf-8
-       (format "~a:~a" method digest-uri)))
-    (define HA2 (md5 A2))
-    (define RESPONSE 
-      (md5 
-       (string->bytes/utf-8
-        (format "~a:~a:~a:~a:~a:~a"
-                HA1 nonce nonce-count cnonce qop HA2))))
-    (bytes=? RESPONSE
-             (string->bytes/utf-8 response))))
-
-(provide/contract
- [make-digest-auth-header (string? string? string? . -> . header?)]
- [request->digest-credentials (request? . -> . (or/c false/c (listof (cons/c symbol? string?))))]
- [username*realm->password/c contract?]
- [username*realm->digest-HA1/c contract?]
- [password->digest-HA1 (username*realm->password/c . -> . username*realm->digest-HA1/c)]
- [make-check-digest-credentials (username*realm->digest-HA1/c . -> . (string? (listof (cons/c symbol? string?)) . -> . boolean?))])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/id-cookie.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/id-cookie.rkt
deleted file mode 100644
index 91bee00aba..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/id-cookie.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang racket/base
-(require unstable/bytes
-         net/base64
-         net/cookie
-         racket/match
-         racket/file
-         racket/contract
-         web-server/http
-         web-server/stuffers/hmac-sha1)
-
-(define (substring* s st en)
-  (substring s st (+ (string-length s) en)))
-
-(define (mac key v)
-  (substring*
-   (bytes->string/utf-8
-    (base64-encode (HMAC-SHA1 key (write/bytes v))))
-   0 -3))
-
-(define (make-secret-salt/file secret-salt-path)
-  (unless (file-exists? secret-salt-path)
-    (with-output-to-file secret-salt-path
-      (λ ()
-        (for ([i (in-range 128)])
-          (write-byte (random 256))))))
-  (file->bytes secret-salt-path))
-
-(define (id-cookie? name c)
-  (and (client-cookie? c)
-       (string=? (client-cookie-name c) name)))
-
-(define (make-id-cookie name key data #:path [path #f])
-  (define authored (current-seconds))
-  (define digest
-    (mac key (list authored data)))
-  (make-cookie name
-               #:path path
-               (format "~a&~a&~a"
-                       digest authored data)))
-
-(define (valid-id-cookie? name key timeout c)
-  (and (id-cookie? name c)
-       (with-handlers ([exn:fail? (lambda (x) #f)])
-         (match (client-cookie-value c)
-           [(regexp #rx"^(.+)&(.+)&(.*)$" (list _ digest authored-s data))
-            (define authored (string->number authored-s))
-            (define re-digest (mac key (list authored data)))
-            (and (string=? digest re-digest)
-                 (<= authored timeout)
-                 data)]
-           [cv
-            #f]))))
-
-(define (request-id-cookie
-         name
-         key
-         #:timeout [timeout +inf.0]
-         req)
-  (define cookies (request-cookies req))
-  (for/or ([c (in-list cookies)])
-    (valid-id-cookie? name key timeout c)))
-
-(define (logout-id-cookie name #:path [path #f])
-  (make-cookie name "invalid format" #:path path #:expires "Thu, 01 Jan 1970 00:00:00 GMT"))
-
-(provide
- (contract-out
-  [make-secret-salt/file
-   (-> path-string?
-       bytes?)]
-  [logout-id-cookie
-   (->* (cookie-name?) (#:path string?) cookie?)]
-  [request-id-cookie
-   (->* (cookie-name? bytes? request?)
-        (#:timeout number?)
-        (or/c false/c cookie-value?))]
-  [make-id-cookie
-   (->* (cookie-name? bytes? cookie-value?)
-        (#:path string?)
-        cookie?)]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/redirect.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/redirect.rkt
deleted file mode 100644
index ecc81dec44..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/redirect.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require racket/contract
-         web-server/private/util
-         web-server/http/response-structs
-         web-server/http/request-structs)
-
-; redirection-status = (make-redirection-status nat bytes)
-(define-struct redirection-status (code message))
-
-(define permanently (make-redirection-status 301 #"Moved Permanently"))
-(define temporarily (make-redirection-status 302 #"Moved Temporarily"))
-(define see-other (make-redirection-status 303 #"See Other"))
-
-; : str [redirection-status] -> response
-(define (redirect-to 
-         uri
-         [perm/temp temporarily]
-         #:headers [headers (list)])
-  (response (redirection-status-code perm/temp)
-            (redirection-status-message perm/temp)
-            (current-seconds) #"text/html"
-            (list* (make-header #"Location" (string->bytes/utf-8 uri))
-                   headers)
-            void))
-
-(provide/contract
- [redirect-to
-  (->* (non-empty-string?) (redirection-status? #:headers (listof header?))
-       response?)]
- [redirection-status? (any/c . -> . boolean?)]
- [permanently redirection-status?]
- [temporarily redirection-status?]
- [see-other redirection-status?])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/request-structs.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/request-structs.rkt
deleted file mode 100644
index c87fc50ccc..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/request-structs.rkt
+++ /dev/null
@@ -1,79 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/serialize
-         racket/match
-         racket/promise
-         net/url
-         web-server/private/util)
-
-(define-serializable-struct header (field value) #:transparent)
-(define (headers-assq* f hs)
-  (match hs
-    [(list)
-     #f]
-    [(list-rest (and h (struct header (af aw))) hs)
-     (if (bytes-ci=? af f)
-         h
-         (headers-assq* f hs))]))
-(define (headers-assq f hs)
-  (match hs
-    [(list)
-     #f]
-    [(list-rest (and h (struct header (af av))) hs)
-     (if (bytes=? af f)
-         h
-         (headers-assq f hs))]))
-(provide/contract
- [headers-assq (bytes? (listof header?) . -> . (or/c false/c header?))]
- [headers-assq* (bytes? (listof header?) . -> . (or/c false/c header?))]
- [struct header ([field bytes?]
-                 [value bytes?])])
-
-(define-serializable-struct binding
-  (id) #:transparent)
-(define-serializable-struct (binding:form binding)
-  (value) #:transparent)
-(define-serializable-struct (binding:file binding)
-  (filename headers content) #:transparent)
-(define (bindings-assq ti bs)
-  (match bs
-    [(list)
-     #f]
-    [(list-rest (and b (struct binding (i))) bs)
-     (if (equal? ti i)
-         b
-         (bindings-assq ti bs))]))
-
-(define (bindings-assq-all ti bs)
-  (for/list ([b (in-list bs)]
-             #:when (and (binding? b) (equal? ti (binding-id b))))
-    b))
-
-(provide/contract
- [bindings-assq (bytes? (listof binding?) . -> . (or/c false/c binding?))]
- [bindings-assq-all (bytes? (listof binding?) . -> . (listof binding?))]
- [struct binding ([id bytes?])]
- [struct (binding:form binding) ([id bytes?]
-                                 [value bytes?])]
- [struct (binding:file binding) ([id bytes?]
-                                 [filename bytes?]
-                                 [headers (listof header?)]
-                                 [content bytes?])])
-
-(define-serializable-struct
-  request
-  (method uri headers/raw bindings/raw-promise post-data/raw 
-          host-ip host-port client-ip)
-  #:transparent)
-(define (request-bindings/raw r)
-  (force (request-bindings/raw-promise r)))
-
-(provide/contract
- [request-bindings/raw (request? . -> . (listof binding?))]
- [struct request ([method bytes?]
-                  [uri url?]
-                  [headers/raw (listof header?)]
-                  [bindings/raw-promise (promise/c (listof binding?))]
-                  [post-data/raw (or/c false/c bytes?)]
-                  [host-ip string?] [host-port number?]
-                  [client-ip string?])])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/request.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/request.rkt
deleted file mode 100644
index 7edc3464a8..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/request.rkt
+++ /dev/null
@@ -1,391 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         racket/list
-         racket/promise
-         net/url
-         net/uri-codec
-         unstable/contract
-         web-server/private/util
-         web-server/private/connection-manager
-         web-server/http/request-structs)
-
-(define read-request/c
-  (connection? 
-   tcp-listen-port?
-   (input-port? . -> . (values string? string?))
-   . -> .
-   (values request? boolean?)))
-
-(provide/contract
- [parse-bindings (-> bytes? (listof binding?))]
- [read-headers (-> input-port? (listof header?))]
- [rename make-ext:read-request make-read-request
-         (->* () (#:connection-close? boolean?) read-request/c)]
- [rename ext:read-request read-request
-         read-request/c])
-
-;; **************************************************
-;; read-request: connection number (input-port -> string string) -> request boolean?
-;; read the request line, and the headers, determine if the connection should
-;; be closed after servicing the request and build a request structure
-(define ((make-read-request 
-          #:connection-close? [connection-close? #f])
-         conn host-port port-addresses)
-  (define ip 
-    (connection-i-port conn))
-  (define-values (method uri major minor)
-    (read-request-line ip))
-  (define initial-headers 
-    (read-headers ip))
-  (match (headers-assq* #"Content-Length" initial-headers)
-    [(struct header (f v))
-     ;; Give it one second per byte (with 5 second minimum... a bit
-     ;; arbitrary)
-     (adjust-connection-timeout!
-      conn (max 5 (string->number (bytes->string/utf-8 v))))]
-    [#f
-     (void)])
-  (define-values (data-ip headers)
-    (complete-request ip initial-headers))
-  (define-values (host-ip client-ip)
-    (port-addresses ip))
-  (define-values (bindings/raw-promise raw-post-data)
-    (read-bindings&post-data/raw data-ip method uri headers))
-  (values
-   (make-request method uri headers bindings/raw-promise raw-post-data
-                 host-ip host-port client-ip)
-   (or connection-close?
-       (close-connection? headers major minor
-                          client-ip host-ip))))
-
-;; If the headers says it uses chunked transfer encoding, then decode
-;; it
-(require racket/stxparam
-         (for-syntax racket/base))
-(define-syntax-parameter break 
-  (λ (stx) 
-    (raise-syntax-error 'break "Used outside forever" stx)))
-(define-syntax-rule (forever e ...)
-  (let/ec this-break
-    (let loop ()
-      (syntax-parameterize ([break (make-rename-transformer #'this-break)])
-        (begin e ...))
-      (loop))))
-(define (hex-string->number s)
-  (string->number s 16))
-(define (complete-request real-ip initial-headers)
-  (match (headers-assq* #"Transfer-Encoding" initial-headers)
-    [(struct header (f #"chunked"))
-     (define-values (decoded-ip decode-op) (make-pipe))
-     (define total-size 0)
-     (forever
-      (define size-line (read-line real-ip 'any))
-      (match-define (cons size-in-hex _) (regexp-split #rx";" size-line))
-      (define size-in-bytes (hex-string->number size-in-hex))
-      (set! total-size (+ total-size size-in-bytes))
-      (when (zero? size-in-bytes)
-        (break))
-      (define data-bytes (read-bytes size-in-bytes real-ip))
-      (write-bytes data-bytes decode-op)
-      ;; Ignore CRLF
-      (read-line real-ip 'any))
-     (define more-headers
-       (list* (header #"Content-Length" 
-                      (string->bytes/utf-8 (number->string total-size)))
-              (read-headers real-ip)))
-     (close-output-port decode-op)
-     (values decoded-ip (append initial-headers more-headers))]
-    [_
-     (values real-ip initial-headers)]))
-
-(define (make-ext:read-request 
-         #:connection-close? [connection-close? #f])
-  (define read-request 
-    (make-read-request #:connection-close? connection-close?))
-  (define (ext:read-request conn host-port port-addresses)
-    (with-handlers ([exn:fail?
-                     (lambda (exn)
-                       (kill-connection! conn)
-                       (raise exn))])
-      (read-request conn host-port port-addresses)))
-  ext:read-request)
-
-(define ext:read-request (make-ext:read-request #:connection-close? #f))
-
-;; **************************************************
-;; close-connection?
-
-; close-connection? : (listof (cons symbol bytes)) number number string string -> boolean
-;; determine if this connection should be closed after serving the
-;; response
-(define close-connection? 
-  (let ([rx (byte-regexp #"[cC][lL][oO][sS][eE]")])
-    (lambda (headers major minor client-ip host-ip)
-      (or (< major 1)
-          (and (= major 1) (= minor 0))
-          (match (headers-assq* #"Connection" headers)
-            [(struct header (f v))
-             (and (regexp-match rx v)
-                  #t)]
-            [#f
-             #f])
-          (msie-from-local-machine? headers client-ip host-ip)))))
-
-;; msie-from-local-machine? : table str str -> bool
-
-;; to work around an error in MSIE for documents < 265 bytes when
-;; connecting from the local machine.  The server could pad the
-;; response as MSIIS does, but closing the connection works, too.  We
-;; do not check for version numbers since IE 6 under windows is 5.2
-;; under macosX
-(define msie-from-local-machine?
-  (let ([rx (byte-regexp #"MSIE")])
-    (lambda (headers client-ip host-ip)
-      (and (string=? host-ip client-ip)
-           (match
-               (or (headers-assq* #"HTTP_USER_AGENT" headers)
-                   (headers-assq* #"User-Agent" headers))
-             [(struct header (f v))
-              (and (regexp-match rx v)
-                   #t)]
-             [#f
-              #f])))))
-
-;; **************************************************
-;; read-request-line  
-(define match-method
-  (let ([rx (byte-regexp #"^([^ ]+) (.+) HTTP/([0-9]+)\\.([0-9]+)$")])
-    (lambda (a) (regexp-match rx a))))
-
-; read-request-line : iport -> bytes url number number
-; to read in the first line of an http request, AKA the "request line"
-; effect: in case of errors, complain [MF: where] and close the ports
-(define (read-request-line ip)
-  (define line (read-bytes-line ip 'any))
-  (if (eof-object? line)
-      (network-error 'read-request "http input closed abruptly")
-      (cond
-        [(match-method line)
-         => (match-lambda
-              [(list _ method url major minor)
-               (values method
-                       (string->url (bytes->string/utf-8 url))
-                       (string->number (bytes->string/utf-8 major))
-                       (string->number (bytes->string/utf-8 minor)))])]
-        [else (network-error 'read-request "malformed request ~a" line)])))
-
-;; **************************************************
-;; read-headers  
-(define match-colon
-  (let ([rx (byte-regexp (bytes-append #"^([^:]*):[ " (bytes 9) #"]*(.*)"))])
-    (lambda (a) (regexp-match rx a))))
-
-; read-headers : iport -> (listof header?)
-(define (read-headers in)
-  (let read-header ()
-    (define l (read-bytes-line in 'any))
-    (cond
-      [(eof-object? l) null]
-      [(zero? (bytes-length l)) null]
-      [(match-colon l) 
-       => (match-lambda
-            [(list _ field value)
-             (list* (make-header field (read-one-head in value))
-                    (read-header))])]
-      [else (network-error 'read-headers "malformed header: ~e" l)])))
-
-; read-one-head : iport bytes -> bytes
-(define (read-one-head in rhs)
-  (match (peek-byte in)
-    [(or 32 9) ;(or (eq? c #\space) (eq? c #\tab))
-     ; (read-bytes-line in 'any) can't return eof
-     ; because we just checked with peek-char
-     ; Spidey: FLOW
-     (read-one-head in (bytes-append rhs (read-bytes-line in 'any)))]
-    [_ rhs]))
-
-;; **************************************************
-;; read-bindings
-(define INPUT-BUFFER-SIZE 4096)
-(define (read-to-eof in)
-  (define b (read-bytes INPUT-BUFFER-SIZE in))
-  (if (eof-object? b)
-      empty
-      (list* b (read-to-eof in))))
-
-(define FILE-FORM-REGEXP (byte-regexp #"multipart/form-data; *boundary=(.*)"))
-
-;; read-bindings&post-data/raw: input-port symbol url (listof header?) -> (values (or/c (listof binding?) string?) (or/c bytes? false/c?))
-(define (read-bindings&post-data/raw in meth uri headers)
-  (define bindings-GET
-   (delay
-     (filter-map
-      (match-lambda
-       [(list-rest k v)
-        (if (and (symbol? k) (string? v))
-          (make-binding:form (string->bytes/utf-8 (symbol->string k))
-                             (string->bytes/utf-8 v))
-          #f)])
-      (url-query uri))))
-  (cond
-    [(bytes-ci=? #"GET" meth)
-     (values bindings-GET #f)]
-    [(bytes-ci=? #"POST" meth)
-     (define content-type (headers-assq* #"Content-Type" headers))
-     (cond
-       [(and content-type 
-             (regexp-match FILE-FORM-REGEXP (header-value content-type)))
-        => (match-lambda
-            [(list _ content-boundary)
-             ;; XXX This can't be delay because it reads from the
-             ;;     port, which would otherwise be closed.  I think
-             ;;     this is reasonable because the Content-Type
-             ;;     said it would have this format
-             (define bs
-               (map (match-lambda
-                     [(struct mime-part (headers contents))
-                      (define rhs
-                        (header-value
-                         (headers-assq* #"Content-Disposition" headers)))
-                      (match* 
-                          ((regexp-match #"filename=(\"([^\"]*)\"|([^ ;]*))" rhs)
-                           (regexp-match #"[^e]name=(\"([^\"]*)\"|([^ ;]*))" rhs))
-                        [(#f #f)
-                         (network-error 
-                          'reading-bindings 
-                          "Couldn't extract form field name for file upload")]
-                        [(#f (list _ _ f0 f1))
-                         (make-binding:form (or f0 f1)
-                                            (apply bytes-append contents))]
-                        [((list _ _ f00 f01) (list _ _ f10 f11))
-                         (make-binding:file (or f10 f11)
-                                            (or f00 f01)
-                                            headers
-                                            (apply bytes-append contents))])])
-                    (read-mime-multipart content-boundary in)))
-             (values
-              (delay (append (force bindings-GET) bs))
-              #f)])]
-       [else        
-        (match (headers-assq* #"Content-Length" headers)
-          [(struct header (_ value))
-           (cond
-             [(string->number (bytes->string/utf-8 value))
-              => (lambda (len)
-                   (let ([raw-bytes (read-bytes len in)])
-                     (cond
-                       [(eof-object? raw-bytes)
-                        (network-error
-                         'read-bindings
-                         "Post data ended pre-maturely")]
-                       [else
-                        (values (delay 
-                                  (append
-                                   (parse-bindings raw-bytes)
-                                   (force bindings-GET)))
-                                raw-bytes)])))]
-             [else 
-              (network-error
-               'read-bindings
-               "Post request contained a non-numeric content-length")])]
-          [#f
-           (values (delay empty) #f)])])]
-    [meth
-     (define content-type (headers-assq* #"Content-Type" headers))
-     (match (headers-assq* #"Content-Length" headers)
-       [(struct header (_ value))
-        (cond [(string->number (bytes->string/utf-8 value))
-               => (lambda (len)
-                    (let ([raw-bytes (read-bytes len in)])
-                      (cond
-                        [(eof-object? raw-bytes)
-                         (network-error
-                          'read-bindings
-                          "Post data ended pre-maturely")]
-                        [else
-                         (values (delay empty) raw-bytes)])))]
-              [else
-               (network-error 
-                'read-bindings
-                "Non-GET/POST request contained a non-numeric content-length")])]
-       [#f
-        (values (delay empty) #f)])]))
-
-;; parse-bindings : bytes? -> (listof binding?)
-(define (parse-bindings raw)
-  (define len (bytes-length raw))
-  (let loop ([start 0])
-    (let find= ([key-end start])
-      (if (>= key-end len)
-          empty
-          (if (eq? (bytes-ref raw key-end) (char->integer #\=))
-              (let find-amp ([amp-end (add1 key-end)])
-                (if (or (= amp-end len) (eq? (bytes-ref raw amp-end) (char->integer #\&)))
-                    (list* (make-binding:form
-                            (string->bytes/utf-8
-                             (form-urlencoded-decode
-                              (bytes->string/utf-8
-                               (subbytes raw start key-end))))
-                            (string->bytes/utf-8
-                             (form-urlencoded-decode
-                              (bytes->string/utf-8
-                               (subbytes raw (add1 key-end) amp-end)))))
-                           (loop (add1 amp-end)))
-                    (find-amp (add1 amp-end))))
-              (find= (add1 key-end)))))))
-
-;; **************************************************
-;; read-mime-multipart
-
-; mime-part : (listof header?) * (listof bytes?)
-(define-struct mime-part (headers contents))
-(define CR-NL #"\r\n")
-(define (construct-mime-part headers body)
-  (make-mime-part
-   headers
-   (match body
-     [(list)
-      (list)]
-     [(list-rest fst rst)
-      (list* fst
-             (foldr (lambda (byt acc)
-                      (list* CR-NL byt acc))
-                    empty
-                    rst))])))
-
-; read-mime-multipart : bytes iport -> (listof part)
-(define (read-mime-multipart boundary in)
-  (define boundary-len (bytes-length boundary))
-  (define start-boundary (bytes-append #"--" boundary))
-  (define end-boundary (bytes-append start-boundary #"--"))
-  (let skip-preamble ()
-    (define line (read-bytes-line in 'return-linefeed))
-    (cond
-      [(eof-object? line)
-       (network-error 'read-mime-multipart "Port prematurely closed.")]
-      [(bytes=? line start-boundary)
-       (let read-parts ()
-         (define headers (read-headers in))
-         (let read-mime-part-body 
-           ([more-k (lambda (contents)
-                      (list* (construct-mime-part
-                              headers contents)
-                             (read-parts)))]
-            [end-k (lambda (contents)
-                     (list (construct-mime-part
-                            headers contents)))])
-           (define line (read-bytes-line in 'return-linefeed))
-           (cond
-             [(eof-object? line)
-              (network-error 'read-mime-multipart "Port prematurely closed.")]
-             [(bytes=? line start-boundary)
-              (more-k empty)]
-             [(bytes=? line end-boundary)
-              (end-k empty)]
-             [else 
-              (read-mime-part-body
-               (lambda (x) (more-k (list* line x)))
-               (lambda (x) (end-k (list* line x))))])))]
-      [(bytes=? line end-boundary) null]
-      [else (skip-preamble)])))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/response-structs.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/response-structs.rkt
deleted file mode 100644
index 979962978e..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/response-structs.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang racket/base
-(require racket/contract 
-         web-server/http/request-structs)
-
-(define TEXT/HTML-MIME-TYPE #"text/html; charset=utf-8")
-
-(struct response (code message seconds mime headers output))
-
-(define (response/full code message seconds mime headers body)
-  (response code message seconds mime
-            (list* (make-header #"Content-Length" 
-                                (string->bytes/utf-8
-                                 (number->string
-                                  (for/fold ([len 0])
-                                    ([b (in-list body)])
-                                    (+ len (bytes-length b))))))
-                   headers)
-            (lambda (op)
-              (for ([b (in-list body)])
-                (write-bytes b op)))))
-
-(define (response/output output
-                         #:code [code 200]
-                         #:message [message #"Okay"]
-                         #:seconds [seconds (current-seconds)]
-                         #:mime-type [mime-type TEXT/HTML-MIME-TYPE]
-                         #:headers [headers '()])
-  (response code message seconds mime-type headers
-            output))
-
-
-(provide/contract
- [struct response
-         ([code number?]
-          [message bytes?]
-          [seconds number?]
-          [mime (or/c false/c bytes?)]
-          [headers (listof header?)]
-          [output (output-port? . -> . void)])]
- [response/full (-> number? bytes? number? (or/c false/c bytes?) (listof header?) (listof bytes?) response?)]
- [response/output (->* ((-> output-port? void?))
-                       (#:code number?
-                        #:message bytes?
-                        #:seconds number?
-                        #:mime-type (or/c bytes? #f)
-                        #:headers (listof header?))
-                       response?)]
- [TEXT/HTML-MIME-TYPE bytes?])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/response.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/response.rkt
deleted file mode 100644
index 1f668555af..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/response.rkt
+++ /dev/null
@@ -1,416 +0,0 @@
-#lang racket/base
-(require racket/contract
-         file/md5
-         racket/port
-         racket/list
-         racket/match
-         (only-in srfi/1/list fold)
-         xml/xml
-         web-server/private/connection-manager
-         web-server/http/request-structs
-         web-server/http/response-structs
-         web-server/private/util)
-
-(provide/contract
- [print-headers (output-port? (listof header?) . -> . void)]
- [rename ext:output-response output-response (connection? response? . -> . void)]
- [rename ext:output-response/method output-response/method (connection? response? bytes? . -> . void)]
- [rename ext:output-file output-file (connection? path-string? bytes? (or/c bytes? false/c) (or/c pair? false/c) . -> . void)])
-
-(define (output-response conn resp)
-  (output-response/method conn resp #"GET"))
-
-(define (output-response/method conn resp meth)
-  (cond
-    [(or 
-      ;; If it is terminated, just continue
-      (terminated-response? resp)
-      ;; If it is HTTP/1.0, ditto
-      (connection-close? conn)
-      ;; Or, if it is a HEAD request
-      (bytes-ci=? meth #"HEAD"))
-     (output-response-head conn resp)
-     (unless (bytes-ci=? meth #"HEAD")
-       (output-response-body conn resp))]
-    ;; Otherwise, use chunked encoding
-    [else
-     (output-response-head conn resp
-                           (list (header #"Transfer-Encoding" #"chunked")))
-     (output-response-body/chunked conn resp)]))
-
-;; Write the headers portion of a response to an output port.
-;; NOTE: According to RFC 2145 the server should write HTTP/1.1
-;;       header for *all* clients.
-(define-syntax-rule (maybe-header h k v)
-  (if (hash-has-key? h k)
-    empty
-    (list (header k v))))
-(define-syntax-rule (maybe-headers h [k v] ...)
-  (append (maybe-header h k v)
-          ...))
-
-(define (output-response-head conn bresp [more-hs empty])
-  (fprintf (connection-o-port conn)
-           "HTTP/1.1 ~a ~a\r\n"
-           (response-code bresp)
-           (response-message bresp))
-  (define hs (append (response-headers bresp) more-hs))
-  (define seen? (make-hash))
-  (for ([h (in-list hs)])
-    (hash-set! seen? (header-field h) #t))
-  (output-headers
-   conn
-   (append
-    (maybe-headers
-     seen?
-     [#"Date" 
-      (string->bytes/utf-8 (seconds->gmt-string (current-seconds)))]
-     [#"Last-Modified"
-      (string->bytes/utf-8 (seconds->gmt-string (response-seconds bresp)))]
-     [#"Server"
-      #"Racket"])
-    (if (response-mime bresp)
-        (maybe-headers
-         seen?
-         [#"Content-Type"
-          (response-mime bresp)])
-        empty)
-    (if (connection-close? conn)
-        (maybe-headers
-         seen?
-         [#"Connection" #"close"])
-        empty)
-    hs)))
-
-;; output-headers : connection (list-of header) -> void
-(define (output-headers conn headers)
-  (print-headers (connection-o-port conn) headers))
-
-;; print-headers : output-port (list-of header) -> void
-(define (print-headers out headers)
-  (for-each (match-lambda
-              [(struct header (field value))
-               (fprintf out "~a: ~a\r\n" field value)])
-            headers)
-  (fprintf out "\r\n"))
-
-; RFC 2616 Section 4.4
-(define (terminated-response? r)
-  (define hs (response-headers r))
-  (or (headers-assq* #"Content-Length" hs)
-      (cond 
-        [(headers-assq* #"Transfer-Encoding" hs)
-         => (λ (h) (not (bytes=? (header-value h) #"identity")))]
-        [else #f])))
-
-(define (output-response-body conn bresp)
-  (define o-port (connection-o-port conn))
-  ((response-output bresp) o-port)
-  (flush-output o-port))
-
-(define (output-response-body/chunked conn bresp)
-  (define-values (from-servlet to-chunker) (make-pipe))
-  (define to-client (connection-o-port conn))
-  (define to-chunker-t    
-    (thread (λ () 
-              ((response-output bresp) to-chunker)
-              (close-output-port to-chunker))))
-  (define buffer (make-bytes 1024))
-  (let loop ()
-    (define bytes-read-or-eof
-      (read-bytes-avail! buffer from-servlet))
-    (unless (eof-object? bytes-read-or-eof)
-      (fprintf to-client "~a\r\n" (number->string bytes-read-or-eof 16))
-      (write-bytes buffer to-client 0 bytes-read-or-eof)
-      (fprintf to-client "\r\n")
-      (loop)))
-  (thread-wait to-chunker-t)
-  (fprintf to-client "0\r\n")
-  (fprintf to-client "\r\n")
-  (flush-output to-client))
-
-; seconds->gmt-string : Nat -> String
-; format is rfc1123 compliant according to rfc2068 (http/1.1)
-(define (seconds->gmt-string s)
-  (let* ([local-date (seconds->date s)]
-         [date (seconds->date (- s (date-time-zone-offset local-date)))])
-    (format "~a, ~a ~a ~a ~a:~a:~a GMT"
-            (vector-ref DAYS (date-week-day date))
-            (two-digits (date-day date))
-            (vector-ref MONTHS (sub1 (date-month date)))
-            (date-year date)
-            (two-digits (date-hour date))
-            (two-digits (date-minute date))
-            (two-digits (date-second date)))))
-
-; two-digits : num -> str
-(define (two-digits n)
-  (let ([str (number->string n)])
-    (if (< n 10) (string-append "0" str) str)))
-
-(define MONTHS
-  #("Jan" "Feb" "Mar" "Apr" "May" "Jun" "Jul" "Aug" "Sep" "Oct" "Nov" "Dec"))
-
-(define DAYS
-  #("Sun" "Mon" "Tue" "Wed" "Thu" "Fri" "Sat"))
-
-(define (ext:wrap f)
-  (lambda (conn . args)
-    (with-handlers ([exn:fail? (lambda (exn)
-                                 (kill-connection! conn)
-                                 (raise exn))])
-      (apply f conn args)
-      (flush-output (connection-o-port conn)))))
-
-(define ext:output-response
-  (ext:wrap output-response))
-
-;; output-file: connection
-;;              path
-;;              symbol
-;;              bytes
-;;              (U (listof (U byte-range-spec suffix-byte-range-spec)) #f)
-;;           -> void
-;;
-;; Ranges is #f if the client did not specify a Range header, or:
-;;
-;;     (list-of (U byte-range-spec suffix-byte-range-spec))
-;;
-;; where:
-;;
-;;     byte-range-spec : (cons integer (U integer #f))
-;;     suffix-byte-range-spec : (cons #f integer)
-;;
-;; as described in the comments in dispatchers/dispatch-files.
-;;
-;; A boundary is generated only if a multipart/byteranges response needs
-;; to be generated (i.e. if a Ranges header was specified with more than
-;; one range in it).
-(define (output-file conn file-path method maybe-mime-type ranges)
-  (output-file/boundary
-   conn
-   file-path
-   method
-   maybe-mime-type
-   ranges
-   (if (and ranges (> (length ranges) 1))
-       (md5 (string->bytes/utf-8 (number->string (current-inexact-milliseconds))))
-       #f)))
-
-;; output-file: connection
-;;              path
-;;              symbol
-;;              bytes
-;;              (U (listof (U byte-range-spec suffix-byte-range-spec)) #f)
-;;              (U bytes #f)
-;;           -> void
-(define (output-file/boundary conn file-path method maybe-mime-type ranges boundary)
-  ; total-file-length : integer
-  (define total-file-length
-    (file-size file-path))
-  ; modified-seconds : integer
-  (define modified-seconds
-    (file-or-directory-modify-seconds file-path))
-  ; boundary-length : (U integer #f)
-  (define boundary-length
-    (if boundary
-        (bytes-length boundary)
-        #f))
-  ; If convert-http-ranges fails, send a 416 bad range resposne:
-  (with-handlers ([exn:fail?
-                   (lambda (exn)
-                     (output-response-head
-                      conn
-                      (make-416-response modified-seconds maybe-mime-type)))])
-    (let* (; converted-ranges : (alist-of integer integer)
-           ; This is a list of actual start and end offsets in the file. 
-           ; See the comments for convert-http-ranges for more information.
-           [converted-ranges
-            (if ranges
-                (convert-http-ranges ranges total-file-length)
-                (list (cons 0 total-file-length)))]
-           ; multipart-headers : (list-of bytes)
-           ; This is a list of header blocks to prepend to each range being sent.
-           ; The idea is so we can calculate an overall content-length for the
-           ; response. This *must be* the same length as converted-ranges.
-           [multipart-headers
-            (if (> (length converted-ranges) 1)
-                (prerender-multipart/byteranges-headers maybe-mime-type converted-ranges total-file-length)
-                (list #""))]
-           ; total-content-length : integer
-           [total-content-length
-            (if (= (length converted-ranges) 1)
-                ; One range: content-length is the length of the range being sent:
-                (- (cdar converted-ranges) (caar converted-ranges))
-                ; Multiple ranges: content-length is the length of the multipart,
-                ; including content, headers and boundaries:
-                (fold (lambda (range headers accum)
-                        (+ accum                       ; length so far
-                           (bytes-length headers)      ; length of the headers and header newlinw
-                           (- (cdr range) (car range)) ; length of the content
-                           2))                         ; length of the content newline
-                      (+ (* (+ boundary-length 4) 
-                            (length converted-ranges)) ; length of the intermediate boundaries
-                         (+ boundary-length 6))        ; length of the final boundary
-                      converted-ranges
-                      multipart-headers))])
-      ; Send a 206 iff ranges were specified in the request:
-      (output-response-head
-       conn
-       (if ranges
-           (make-206-response modified-seconds maybe-mime-type total-content-length total-file-length converted-ranges boundary)
-           (make-200-response modified-seconds maybe-mime-type total-content-length)))
-      ; Send the appropriate file content:
-      (when (bytes-ci=? method #"GET")
-        (adjust-connection-timeout! ; Give it one second per byte.
-         conn
-         (apply + (map (lambda (range)
-                         (- (cdr range) (car range)))
-                       converted-ranges)))
-        (with-handlers ([exn:fail? (lambda (exn) (network-error 'output-file (exn-message exn)))])
-          (call-with-input-file* file-path
-            (lambda (input)
-              (if (= (length converted-ranges) 1)
-                  ; Single ranges (in 200 or 206 responses) are sent straight out
-                  ; in their simplest form:
-                  (output-file-range conn input (caar converted-ranges) (cdar converted-ranges))
-                  ; Multiple ranges are encoded as multipart/byteranges:
-                  (let loop ([ranges converted-ranges] [multipart-headers multipart-headers])
-                    (match ranges
-                      [(list) 
-                       ; Final boundary (must start on new line; ends with a new line)
-                       (fprintf (connection-o-port conn) "--~a--\r\n" boundary)
-                       (void)]
-                      [(list-rest (list-rest start end) rest)
-                       ; Intermediate boundary (must start on new line; ends with a new line)
-                       (fprintf (connection-o-port conn) "--~a\r\n" boundary)
-                       ; Headers and new line
-                       (display (car multipart-headers) (connection-o-port conn))
-                       ; Content
-                       (output-file-range conn input start end)
-                       ; Newline before next field
-                       (fprintf (connection-o-port conn) "\r\n")
-                       (loop rest (cdr multipart-headers))]))))))))))
-
-;; prerender-multipart/byteranges-headers : bytes (alist-of integer integer) integer -> (list-of bytes)
-(define (prerender-multipart/byteranges-headers maybe-mime-type converted-ranges total-file-length)
-  (map (lambda (range)
-         (match range
-           [(list-rest start end)
-            (let ([out (open-output-bytes)])
-              (when maybe-mime-type
-                (print-headers out (list (make-header #"Content-Type" maybe-mime-type))))
-              (print-headers out (list (make-content-range-header start end total-file-length)))
-              (begin0 (get-output-bytes out)
-                      (close-output-port out)))]))
-       converted-ranges))
-
-;; output-file-range : connection file-input-port integer integer -> void
-;;
-;; start must be inclusive; end must be exclusive.
-(define (output-file-range conn input start end)
-  (file-position input start)
-  (let ([limited-input (make-limited-input-port input (- end start) #f)])
-    (copy-port limited-input (connection-o-port conn))
-    (close-input-port limited-input)))
-
-;; convert-http-ranges : (alist-of (U integer #f) (U integer #f))
-;;                       integer
-;;                    -> (alist-of integer integer)
-;;
-;; Converts a list of HTTP ranges:
-;;
-;; into pairs of offsets we can use to read from a file:
-;; 
-;;   - suffix-byte-range-specs are converted to pairs of absolute offsets;
-;;   - missing end offsets in byte-range-specs ranges are filled in;
-;;   - end offsets are exclusive (as opposed to the inclusive offsets in ranges and the HTTP spec).
-;;
-;; The HTTP spec recommends that ranges are sent in the order they are specified in the request.
-(define (convert-http-ranges ranges total-file-length)
-  (define converted
-    (filter-map (lambda (range)
-                  ; a : (U integer #f)
-                  ; b : (U integer #f)
-                  ; The original values quoted in the Range header:
-                  (define-values (a b)
-                    (values (car range)
-                            (cdr range)))
-                  ; a* : integer
-                  ; b* : integer
-                  ; Convert inclusive end offsets and suffix ranges:
-                  (define-values (a* b*)
-                    (cond [(not a) (values (- total-file-length b) total-file-length)]
-                          [(not b) (values a total-file-length)]
-                          [else    (values a (add1 b))]))
-                  ; a** : integer
-                  ; b** : integer
-                  ; Trim to the size of the file:
-                  (define-values (a** b**)
-                    (values (max 0 (min total-file-length a*))
-                            (max 0 (min total-file-length b*))))
-                  ; Get rid of zero-length ranges (including ones that are outside the file length):
-                  (if (< a** b**)
-                      (cons a** b**)
-                      #f))
-                ranges))
-  (if (null? converted)
-      (error 'convert-http-ranges "No satisfiable ranges in ~a/~a." ranges total-file-length)
-      converted))
-
-;; make-206-response : integer bytes integer integer (alist-of integer integer) bytes -> basic-response
-(define (make-206-response modified-seconds maybe-mime-type total-content-length total-file-length converted-ranges boundary)
-  (if (= (length converted-ranges) 1)
-      (let ([start (caar converted-ranges)]
-            [end   (cdar converted-ranges)])
-        (response
-         206 #"Partial content"
-         modified-seconds
-         maybe-mime-type 
-         (list (make-header #"Accept-Ranges" #"bytes")
-               (make-content-length-header total-content-length)
-               (make-content-range-header start end total-file-length))
-         void))
-      (response
-       206 #"Partial content"
-       modified-seconds
-       (bytes-append #"multipart/byteranges; boundary=" boundary)
-       (list (make-header #"Accept-Ranges" #"bytes")
-             (make-content-length-header total-content-length))
-       void)))
-
-;; make-200-response : integer bytes integer -> basic-response
-(define (make-200-response modified-seconds maybe-mime-type total-content-length)
-  (response
-   200 #"OK"
-   modified-seconds
-   maybe-mime-type 
-   (list (make-header #"Accept-Ranges" #"bytes")
-         (make-content-length-header total-content-length))
-   void))
-
-;; make-416-response : integer bytes -> basic-response
-(define (make-416-response modified-seconds maybe-mime-type)
-  (response
-   416 #"Invalid range request"
-   modified-seconds
-   maybe-mime-type 
-   null
-   void))
-
-;; make-content-length-header : integer -> header
-(define (make-content-length-header total-content-length)
-  (make-header #"Content-Length" (string->bytes/utf-8 (number->string total-content-length))))
-
-;; make-content-range-header : integer integer integer -> header
-;; start must be inclusive; end must be exclusive.
-(define (make-content-range-header start end total-file-length)
-  (make-header #"Content-Range" 
-               (string->bytes/utf-8
-                (format "bytes ~a-~a/~a" start (sub1 end) total-file-length))))
-
-(define ext:output-file
-  (ext:wrap output-file))
-
-(define ext:output-response/method
-  (ext:wrap output-response/method))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/http/xexpr.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/http/xexpr.rkt
deleted file mode 100644
index 298be367f8..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/http/xexpr.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         xml
-         web-server/private/xexpr
-         net/cookie
-         "request-structs.rkt"
-         "cookie.rkt"
-         "response-structs.rkt")
-
-(define (response/xexpr
-         xexpr
-         #:code [code 200] 
-         #:message [message #"Okay"]
-         #:seconds [seconds (current-seconds)]
-         #:mime-type [mime-type TEXT/HTML-MIME-TYPE]
-         #:cookies [cooks empty]
-         #:headers [hdrs empty]
-         #:preamble [preamble #""])
-  (response
-   code message seconds mime-type 
-   ; rfc2109 also recommends some cache-control stuff here for cookies
-   (append hdrs (map cookie->header cooks))
-   (λ (out)
-     (write-bytes preamble out)
-     (write-xexpr xexpr out))))
-
-(provide/contract
- [response/xexpr 
-  ((pretty-xexpr/c)
-   (#:code number? #:message bytes? #:seconds number? #:mime-type (or/c false/c bytes?) #:cookies (listof cookie?) #:headers (listof header?) #:preamble bytes?)
-   . ->* . response?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/info.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/info.rkt
deleted file mode 100644
index 561ba91e00..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define mzscheme-launcher-libraries '("main.rkt"))
-(define mzscheme-launcher-names     '("PLT Web Server"))
-
-(define compile-omit-paths '("default-web-root/configuration-table.rkt"))
-(define test-omit-paths '("default-web-root/configuration-table.rkt"))
-
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/insta/insta.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/insta/insta.rkt
deleted file mode 100644
index e1bfb66b10..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/insta/insta.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket
-(require web-server/servlet
-         web-server/servlet-env
-         (for-syntax racket)
-         (for-syntax syntax/kerncase))
-
-(provide 
- (all-from-out web-server/servlet)
- (except-out (all-from-out racket) #%module-begin)
- (rename-out [web-module-begin #%module-begin]))
-
-(define extra-files-path #f)
-(define launch-browser? #t)
-
-(provide/contract
- [static-files-path (path-string? . -> . void?)])
-(define (static-files-path path)
-  (set! extra-files-path path))
-
-(provide/contract
- [no-web-browser (-> void)])
-(define (no-web-browser)
-  (set! launch-browser? false))
-
-;; check-for-def : syntax syntax-list -> void
-;; Expands body-stxs and determines if id-stx is bound therein.
-;; If not error w/ error-msg. stx is the root syntax context for everything
-(define-for-syntax (check-for-def stx id-stx error-msg body-stxs)
-  (with-syntax ([(pmb body ...)
-                 (local-expand 
-                  (quasisyntax/loc stx
-                    (#%module-begin #,@body-stxs))
-                  'module-begin 
-                  empty)])
-    (let loop ([syns (syntax->list #'(body ...))])
-      (if (empty? syns)
-          (raise-syntax-error 'insta error-msg stx)
-          (kernel-syntax-case (first syns) #t
-            [(define-values (id ...) expr)
-             (unless
-                 (ormap (lambda (id)
-                          (and (identifier? id)
-                               (free-identifier=? id id-stx)))
-                        (syntax->list #'(id ...)))
-               (loop (rest syns)))
-             ]
-            [_
-             (loop (rest syns))])))
-    (quasisyntax/loc stx
-      (pmb body ...))))
-
-(define-syntax (web-module-begin stx)
-  (syntax-case stx ()
-    [(_ body ...)
-     (let* ([start (datum->syntax stx 'start)]
-            [expanded (check-for-def stx 
-                                     start "You must provide a 'start' request handler."
-                                     #'(body ...))])
-       (quasisyntax/loc stx
-         (#,@expanded
-          (provide/contract (#,start (request? . -> . can-be-response?)))
-          (serve/servlet (contract (request? . -> . can-be-response?) #,start
-                                   'you 'web-server
-                                   "start"
-                                   #f)
-                         #:port 0
-                         #:extra-files-paths (if extra-files-path (list extra-files-path) empty)
-                         #:launch-browser? launch-browser?))))]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/insta/lang/reader.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/insta/lang/reader.rkt
deleted file mode 100644
index 519ca4818a..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/insta/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-web-server/insta/insta
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang.rkt
deleted file mode 100644
index 83dd654628..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket
-(define-syntax-rule (reqpro m ...)
-  (begin (require m ...)
-         (provide (all-from-out m ...))))
-(provide (all-from-out racket))
-(reqpro web-server/lang/base
-        net/url
-        web-server/http
-        web-server/http/bindings
-        web-server/dispatch
-        web-server/stuffers
-        web-server/lang/abort-resume
-        web-server/lang/web
-        web-server/lang/native
-        web-server/lang/web-cells
-        web-server/lang/web-param
-        web-server/lang/file-box
-        web-server/lang/soft)
-
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/abort-resume.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/abort-resume.rkt
deleted file mode 100644
index 115b7ad51e..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/abort-resume.rkt
+++ /dev/null
@@ -1,261 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         racket/match
-         racket/serialize
-         web-server/private/servlet
-         web-server/managers/manager
-         web-server/private/define-closure
-         web-server/lang/web-cells)
-
-;; **********************************************************************
-;; **********************************************************************
-;; AUXILLIARIES  
-(define-struct mark-key ())
-(define the-cont-key (make-mark-key))
-(define the-save-cm-key (make-mark-key))
-(define safe-call? (make-mark-key))
-(define web-prompt (make-continuation-prompt-tag 'web)) 
-
-(define empty-hash 
-  (make-immutable-hash empty))
-(define (with-current-saved-continuation-marks-and key val thnk)
-  (call-with-immediate-continuation-mark
-   the-save-cm-key
-   (lambda (old-cms)
-     (with-continuation-mark the-save-cm-key
-       (hash-set old-cms key val)
-       (thnk)))
-   empty-hash))
-
-;; current-continuation-as-list: -> (listof value)
-;; check the safety marks and return the list of marks representing the continuation
-(define (activation-record-list)
-  (let* ([cm (current-continuation-marks web-prompt)]
-         ; XXX call this once with a non-#f default
-         [sl (continuation-mark-set->list* cm (list safe-call? continuation-of-unsafe-part-mark))])
-    (if (calling-context-okay? sl #f)
-        (store-unsafe-parts-on-server! (continuation-mark-set->list* cm (list the-cont-key the-save-cm-key continuation-of-unsafe-part-mark)))
-        (error "Attempt to capture a continuation from within an unsafe context:" sl))))
-
-;; calling-context-okay? : (listof (vector safe-call? unsafe-continuation-mark)) -> boolean
-(define (calling-context-okay? ctxt native-above?)
-  (match ctxt
-    [(list) #t]
-    [(list-rest (vector (or (list-rest safe-call? _)
-                            safe-call?)
-                        unsafe-part)
-                more-ctxt)
-     (and (or native-above? safe-call?)
-          (calling-context-okay? 
-           more-ctxt
-           (or unsafe-part native-above?)))]))
-
-;; abort: ( -> alpha) -> alpha
-;; erase the stack and apply a thunk
-(define (abort thunk)  
-  (abort-current-continuation web-prompt thunk))
-
-;; with-continuation-marks : (listof (cons any1 any2)) (-> any3) -> any3
-(define (with-continuation-marks cms thnk)
-  (match cms
-    [(list) (thnk)]
-    [(list-rest (cons cm-key cm-val) cms)
-     (with-continuation-mark cm-key cm-val
-       (with-continuation-marks cms thnk))]))
-
-(define (with-continuation-marks/hash cms thnk)
-  (with-continuation-marks 
-   (hash-map cms cons)
-   thnk))
-
-;; resume*: (listof (value -> value)) value -> value
-;; resume a computation given a value and list of frame procedures
-(define (resume* frames val)
-  #;(printf "~S\n" `(resume ,frames ,val))
-  (match frames
-    [(list)
-     #;(printf "Returning value ~S\n" val)
-     (apply values val)]
-    [(list-rest frame fs)
-     #;(printf "Frame ~S\n" frame)
-     (match frame
-       [(vector #f #f #f)
-        ; XXX Perhaps I should err?
-        #;(error 'resume "Empty frame")
-        (resume* fs val)]
-       [(vector f #f #f)
-        (call-with-values (lambda () (with-continuation-mark the-cont-key f (resume* fs val)))
-                          f)]
-       [(vector #f cms #f)
-        (with-continuation-mark the-save-cm-key cms
-          (with-continuation-marks/hash cms (lambda () (resume* fs val))))]
-       [(vector #f #f nkpt-label)
-        (serial->native
-         ((get-unsafe-part-from-server nkpt-label)
-          (with-continuation-mark continuation-of-unsafe-part-mark nkpt-label
-            (resume* fs val))))]
-       [(vector f cms nkpt-label)
-        (resume* (list* (vector f #f #f)
-                       (vector #f cms #f)
-                       (if nkpt-label
-                           (list* (vector #f #f nkpt-label)
-                                  fs)
-                           fs))
-                val)])]))
-
-(define (resume frames val)
-  (resume* (reverse frames) val))
-
-;; rebuild-cms : frames (-> value) -> value
-(define (rebuild-cms frames thunk)
-  #;(printf "~S\n" `(rebuild-cms ,frames ,thunk))
-  (match frames
-    [(list) 
-     (thunk)]
-    [(list-rest frame fs)
-     (match (vector-ref frame 1)
-       [#f
-        (rebuild-cms fs thunk)]
-       [cms
-        (with-continuation-marks/hash cms (lambda () (rebuild-cms fs thunk)))])]))
-
-(define (call-with-web-prompt thunk)
-  (call-with-continuation-prompt
-   thunk
-   web-prompt))
-
-;; a serializable undefined value
-(define-serializable-struct undef ())
-(define the-undef (make-undef))    
-
-;; **********************************************************************
-;; **********************************************************************
-;; "SERVLET" INTERFACE  
-
-(define-closure kont x (wcs current-marks)
-  (abort (lambda ()
-           ; Restoring the web-cells is separate from the continuation
-           (restore-web-cell-set! wcs)
-           (resume current-marks x))))
-
-(define (kont-append-fun k f)
-  (define-values (wcs current-marks) ((kont-env k)))
-  (make-kont 
-   (lambda ()
-     (values wcs (list* (vector f #f #f) current-marks)))))
-
-;; send/suspend: (continuation -> response) -> request
-;; produce the current response and wait for the next request
-(define (call-with-serializable-current-continuation response-maker)
-  (with-continuation-mark safe-call? '(#t send/suspend)
-    (let* ([current-marks (activation-record-list)]
-           [wcs (capture-web-cell-set)]
-           [k (make-kont (lambda () (values wcs current-marks)))])
-      (abort (lambda ()
-               ; Since we escaped from the previous context, we need to re-install the user's continuation-marks
-               (rebuild-cms (reverse current-marks) (lambda () (response-maker k))))))))
-
-;; combining native and transformed continuations
-(define unsafe-barrier-prompt-tag (make-continuation-prompt-tag 'unsafe))
-(define continuation-of-unsafe-part-mark (make-mark-key))
-
-(define (store-unsafe-part-on-server! k)
-  ((manager-continuation-store! (current-servlet-manager))
-   (current-servlet-instance-id) k #f))
-(define (get-unsafe-part-from-server k-label)
-  (apply (manager-continuation-lookup (current-servlet-manager))
-         (current-servlet-instance-id) k-label))
-
-(define store-unsafe-parts-on-server!
-  (match-lambda
-    [(list) empty]
-    [(list-rest (vector f cms unsafe-part) ctxt)
-     (list* (vector f cms
-                    (if unsafe-part
-                        (store-unsafe-part-on-server! unsafe-part)
-                        #f))
-            (store-unsafe-parts-on-server! ctxt))]))
-
-(define-syntax-rule (serial->native f)
-  (serial->native* (lambda () f)))
-(define-syntax-rule (native->serial f)
-  (native->serial* (lambda () f)))
-
-(define (serial->native* thnk)
-  (call-with-continuation-prompt thnk unsafe-barrier-prompt-tag))
-(define (native->serial* thnk)
-  (call-with-composable-continuation 
-   (lambda (unsafe-continuation-portion)
-     (with-continuation-mark
-         continuation-of-unsafe-part-mark unsafe-continuation-portion
-       (thnk)))
-   unsafe-barrier-prompt-tag))
-
-;; **********************************************************************
-;; **********************************************************************
-;; "CLIENT" INTERFACE
-
-;; dispatch-start: (request -> response) request -> reponse
-;; pass the initial request to the starting interaction point
-(define (dispatch-start start req0)
-  (call-with-web-prompt 
-   (lambda ()
-     (with-continuation-mark safe-call? '(#t start)
-       (start
-        (with-continuation-mark the-cont-key start
-          req0))))))
-
-;; dispatch: (request -> (request -> response)) request -> response
-;; lookup the continuation for this request and invoke it
-(define (dispatch decode-continuation req)   
-  (call-with-web-prompt
-   (lambda ()
-     (cond
-       [(decode-continuation req)
-        => (lambda (k) (k req))]
-       [else
-        (error 'dispatch "no continuation associated with the provided request: ~S" req)]))))
-
-;; **********************************************************************
-;; **********************************************************************
-
-; XXX These should really be from web-server/private, but it interferes with testing
-(define request? any/c)
-(define response? any/c)
-
-(define cms? (and/c hash? immutable?))
-
-(define saved-context?
-  (listof (vector/c (or/c false/c procedure?)
-                    (or/c false/c cms?)
-                    (or/c false/c symbol?))))
-
-(provide/contract
- ;; AUXILLIARIES
- [abort ((-> any) . -> . any)]
- [call-with-web-prompt ((-> any) . -> . any)]
- [resume (saved-context? any/c . -> . any)]
- [the-cont-key mark-key?]
- [the-save-cm-key mark-key?]
- [safe-call? mark-key?]
- [the-undef undef?]
- [activation-record-list (-> saved-context?)]
- [with-current-saved-continuation-marks-and (any/c any/c (-> any/c) . -> . any/c)]
- [kont-append-fun (kont? procedure? . -> . kont?)]
- 
- ;; "CLIENT" INTERFACE
- [dispatch ((request? . -> . (request? . -> . response?))
-            request?
-            . -> .
-            response?)]
- [dispatch-start ((request? . -> . response?)
-                  request?
-                  . -> .
-                  response?)])
-(provide
- ;; "SERVLET" INTERFACE
- ; A contract would interfere with the safe-call? key
- native->serial
- serial->native
- call-with-serializable-current-continuation)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/anormal.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/anormal.rkt
deleted file mode 100644
index 8139a6e658..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/anormal.rkt
+++ /dev/null
@@ -1,172 +0,0 @@
-#lang racket/base
-(require (for-template racket/base)
-         syntax/kerncase
-         racket/list
-         racket/contract
-         racket/match
-         "util.rkt")
-(provide/contract
- [make-anormal-term ((syntax? . -> . syntax?) . -> . (syntax? . -> . syntax?))])
-
-; A-Normal Form
-(define (id x) x)
-
-;; a context is either
-;;    frame
-;;    (ccompose context frame)
-
-;; a frame is either
-;;    w -> target-redex
-;;    (listof w) -> target-redex
-
-;; ccompose: (w -> target-expr) (alpha -> target-redex) -> (alpha -> target-expr)
-;; compose a context with a frame
-(define (ccompose ctxt frame)
-  (if (eq? ctxt id) 
-      frame
-      (lambda (val)
-        (let-values ([(x ref-to-x) (generate-formal 'x)])
-          #`(#%plain-app (#%plain-lambda (#,x) #,(ctxt ref-to-x)) #,(frame val))))))
-
-(define (make-anormal-term elim-letrec-term)
-  (define (anormal-term stx)
-    (anormal id stx))
-  
-  (define (anormal ctxt stx)
-    (rearm
-     stx
-     (kernel-syntax-case
-         (disarm stx) (transformer?)
-       [(begin)
-        (anormal ctxt (syntax/loc stx (#%plain-app void)))]
-       [(begin lbe)
-        (anormal ctxt (syntax/loc stx lbe))]
-       [(begin fbe be ...)
-        (anormal ctxt 
-                 (syntax/loc stx 
-                   (#%plain-app call-with-values
-                                (#%plain-lambda () fbe)
-                                (#%plain-lambda throw-away
-                                                (begin be ...)))))]
-       [(begin0 lbe)
-        (anormal ctxt (syntax/loc stx lbe))]
-       [(begin0 fbe be ...)
-        (let-values ([(save ref-to-save) (generate-formal 'save)])
-          (anormal ctxt 
-                   (quasisyntax/loc stx 
-                     (#%plain-app call-with-values
-                                  (#%plain-lambda () fbe)
-                                  (#%plain-lambda #,save
-                                                  (begin be ... 
-                                                         (#%plain-app apply values #,ref-to-save)))))))]
-       [(set! v ve)
-        (anormal
-         (ccompose ctxt
-                   (lambda (val)
-                     (quasisyntax/loc stx (set! v #,val))))
-         #'ve)]
-       [(let-values () be)
-        (anormal ctxt (syntax/loc stx be))]
-       [(let-values ([(v) ve]) be)
-        (anormal ctxt
-                 (syntax/loc stx 
-                   (#%plain-app (#%plain-lambda (v) be)
-                                ve)))]
-       [(let-values ([(v ...) ve]) be)
-        (anormal ctxt
-                 (syntax/loc stx 
-                   (#%plain-app call-with-values
-                                (#%plain-lambda () ve)
-                                (#%plain-lambda (v ...) be))))]
-       [(let-values ([(fv ...) fve] [(v ...) ve] ...) be)
-        (anormal ctxt
-                 (syntax/loc stx 
-                   (let-values ([(fv ...) fve])
-                     (let-values ([(v ...) ve] ...)
-                       be))))]
-       [(let-values ([(v ...) ve] ...) be ...)
-        (anormal ctxt
-                 (syntax/loc stx 
-                   (let-values ([(v ...) ve] ...)
-                     (begin be ...))))]
-       [(letrec-values ([(v ...) ve] ...) be ...)
-        (anormal ctxt
-                 (elim-letrec-term stx))]
-       [(#%plain-lambda formals be ...)
-        (with-syntax ([nbe (anormal-term (syntax/loc stx (begin be ...)))])
-          (ctxt (syntax/loc stx (#%plain-lambda formals nbe))))]
-       [(case-lambda [formals be] ...)
-        (with-syntax ([(be ...) (map anormal-term (syntax->list #'(be ...)))])
-          (ctxt (syntax/loc stx (case-lambda [formals be] ...))))]
-       [(case-lambda [formals be ...] ...)
-        (anormal ctxt
-                 (syntax/loc stx (case-lambda [formals (begin be ...)] ...)))]
-       [(if te ce ae)
-        (anormal
-         (ccompose ctxt
-                   (lambda (val)
-                     (quasisyntax/loc stx 
-                       (if #,val
-                           #,(anormal-term #'ce)
-                           #,(anormal-term #'ae)))))
-         #'te)]
-       [(quote datum)
-        (ctxt stx)]
-       [(quote-syntax datum)
-        (ctxt stx)]
-       [(with-continuation-mark ke me be)
-        (anormal
-         (ccompose ctxt
-                   (lambda (kev)
-                     (anormal 
-                      (lambda (mev)
-                        (quasisyntax/loc stx 
-                          (with-continuation-mark #,kev #,mev
-                            #,(anormal-term #'be))))
-                      #'me)))
-         #'ke)]       
-       [(#%plain-app fe e ...)
-        (anormal
-         (lambda (val0)
-           (anormal*
-            (ccompose ctxt
-                      (lambda (rest-vals)
-                        (quasisyntax/loc stx 
-                          (#%plain-app #,val0 #,@rest-vals))))
-            (syntax->list #'(e ...))))
-         #'fe)]
-       [(#%top . v)
-        (ctxt stx)]
-       [(#%variable-reference . v)
-        (ctxt stx)]
-       [id (identifier? #'id)
-           (ctxt stx)]
-       [(letrec-syntaxes+values ([(sv ...) se] ...)
-          ([(vv ...) ve] ...)
-          be ...)
-        (anormal ctxt (elim-letrec-term stx))]
-       [(#%expression d)
-        (anormal
-         (ccompose ctxt
-                   (lambda (d)
-                     (quasisyntax/loc stx (#%expression #,d))))
-         #'d)]
-       [_
-        (raise-syntax-error 'anormal "Dropped through:" stx)])))
-  
-  ;; anormal*: ((listof w) -> target-expr) (listof source-expr) -> target-expr
-  ;; normalize an expression given as a context and list of sub-expressions
-  (define (anormal* multi-ctxt exprs)
-    (match exprs
-      [(list) 
-       (multi-ctxt '())]
-      [(list-rest fe re)
-       (anormal
-        (lambda (val)
-          (anormal*
-           (lambda (rest-vals)
-             (multi-ctxt (list* val rest-vals)))
-           re))
-        fe)]))
-  
-  anormal-term)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/base.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/base.rkt
deleted file mode 100644
index a944520efa..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/base.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         (for-syntax racket/list)
-         (for-syntax "labels.rkt")
-         (for-syntax "util.rkt")
-         (for-syntax "elim-letrec.rkt")
-         (for-syntax "anormal.rkt")
-         (for-syntax "elim-callcc.rkt")
-         (for-syntax "defun.rkt")
-         "lang-api.rkt")
-
-(provide (rename-out [lang-module-begin #%module-begin])
-         (all-from-out "lang-api.rkt"))
-
-(define-for-syntax anormalize (make-anormal-term elim-letrec-term))
-
-(define-syntax lang-module-begin 
-  (make-lang-module-begin 
-   make-labeling
-   (make-module-case
-    (make-define-case
-     (lambda (stx)
-       (define anf-stx (anormalize stx))
-       (define no-callcc-stx (elim-callcc anf-stx))
-       (define defun-stx (defun no-callcc-stx))
-       defun-stx)))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/closure.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/closure.rkt
deleted file mode 100644
index 8061e66658..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/closure.rkt
+++ /dev/null
@@ -1,128 +0,0 @@
-#lang racket/base
-(require racket/list
-         syntax/free-vars
-         racket/syntax
-         (for-template
-          racket/base
-          racket/serialize)
-         "util.rkt")
-
-(define (define-closure! label fvars stx)
-  ; Boxes
-  (define make-CLOSURE-box
-    (syntax-local-lift-expression
-     (quasisyntax/loc stx
-       (box (lambda (env) (error 'make-CLOSURE "Closure<~.s> not initialized" '#,label))))))
-  (define CLOSURE-set-env!-box
-    (syntax-local-lift-expression
-     (quasisyntax/loc stx
-       (box (lambda (clsr new-env) (error 'CLOSURE-set-env! "Closure<~.s> not initialized" '#,label))))))
-  (define CLOSURE-env-box
-    (syntax-local-lift-expression
-     (quasisyntax/loc stx
-       (box (lambda (clsr) (error 'CLOSURE-env "Closure<~.s> not initialized" '#,label))))))
-  ; Define the deserializer (req closure struct values under lambdas)
-  (define CLOSURE:deserialize-info-id
-    (syntax-local-lift-expression
-     (quasisyntax/loc stx
-       (make-deserialize-info
-        
-        ;; make-proc: value ... -> CLOSURE
-        (lambda args
-          (apply (#%plain-lambda #,fvars
-                                 ((unbox #,make-CLOSURE-box) (#%plain-lambda () (values #,@fvars))))
-                 args))
-        
-        ;; cycle-make-proc: -> (values CLOSURE (CLOSURE -> void))
-        (lambda ()
-          (let ([new-closure
-                 ((unbox #,make-CLOSURE-box)
-                  (#%plain-lambda () (error 'deserialize "closure not initialized")))])
-            (values
-             new-closure
-             (#%plain-lambda (clsr)
-                             ((unbox #,CLOSURE-set-env!-box) new-closure ((unbox #,CLOSURE-env-box) clsr))))))))))
-  ; Define the serializer (req closure struct values + deserializer identifier)
-  (define CLOSURE:serialize-info-id
-    (syntax-local-lift-expression
-     (quasisyntax/loc stx
-       (make-serialize-info
-        
-        ;; to-vector: CLOSURE -> vector
-        (#%plain-lambda (clsr)
-                        (#%plain-app call-with-values
-                                     (#%plain-lambda () (((unbox #,CLOSURE-env-box) clsr)))
-                                     vector))
-        
-        ;; The serializer id: --------------------
-        (quote-syntax #,CLOSURE:deserialize-info-id)
-        
-        ;; can-cycle?
-        #t
-        
-        ;; Directory for last-ditch resolution --------------------
-        (or (current-load-relative-directory) (current-directory))))))
-  ; Define the closure struct (req serialize info value)
-  (define fun-name
-    (or (syntax-local-name) (generate-temporary)))
-  (define-values
-    (make-CLOSURE-id CLOSURE?-id CLOSURE-env-id CLOSURE-set-env!-id)
-    (apply
-     values
-     (syntax-local-lift-values-expression
-      4
-      (quasisyntax/loc stx
-        (letrec-values ([(struct:CLOSURE make-CLOSURE CLOSURE? CLOSURE-ref CLOSURE-set!)
-                         (make-struct-type 
-                          '#,label ;; the tag goes here
-                          #f  ; no super type
-                          1
-                          0   ; number of auto-fields
-                          #f  ; auto-v
-                          
-                          ; prop-vals:
-                          (list
-                           (cons prop:serializable #,CLOSURE:serialize-info-id)
-                           (cons prop:procedure
-                                 (make-keyword-procedure
-                                  (lambda (kws kw-vals clsr . rst)
-                                    (let-values ([#,fvars ((CLOSURE-ref clsr 0))])
-                                      (let ([#,fun-name #,stx])
-                                        (keyword-apply #,fun-name
-                                                       kws kw-vals
-                                                       rst)))))))
-                          
-                          #f  ; inspector
-                          
-                          ;; the struct apply proc:
-                          #f)]
-                        [(CLOSURE-env)
-                         (#%plain-lambda (clsr) (CLOSURE-ref clsr 0))]
-                        [(CLOSURE-set-env!)
-                         (#%plain-lambda (clsr new-env) (CLOSURE-set! clsr 0 new-env))])
-          (set-box! #,CLOSURE-env-box CLOSURE-env)
-          (set-box! #,CLOSURE-set-env!-box CLOSURE-set-env!)
-          (set-box! #,make-CLOSURE-box make-CLOSURE)
-          (values make-CLOSURE CLOSURE? CLOSURE-env CLOSURE-set-env!))))))
-  ; Provide the deserializer (req deserializer identifier)
-  (syntax-local-lift-provide
-   (quasisyntax/loc stx
-     #,CLOSURE:deserialize-info-id))
-  (values make-CLOSURE-id CLOSURE?-id CLOSURE-env-id))
-
-(define (make-closure stx)
-  (syntax-case stx  ()
-    [(_ label lambda-stx)
-     (let*-values 
-         ([(lambda-fe-stx) (local-expand #'lambda-stx 'expression empty)]
-          [(fvars) (free-vars (disarm lambda-fe-stx))]
-          ; Define the closure struct (req serialize info value)
-          [(make-CLOSURE-id CLOSURE?-id CLOSURE-env-id)
-           (define-closure! #'label fvars lambda-fe-stx)])
-       ; Instantiate the closure
-       (quasisyntax/loc stx
-         (#,make-CLOSURE-id (#%plain-lambda () (values #,@fvars)))))]))
-
-(provide
- make-closure
- define-closure!)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/defun.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/defun.rkt
deleted file mode 100644
index 4c5e9e2740..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/defun.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang racket/base
-(require (for-template racket/base)
-         syntax/kerncase
-         racket/contract
-         web-server/lang/closure
-         (for-template web-server/lang/serial-lambda)
-         "util.rkt")
-(provide/contract
- [defun (syntax? . -> . syntax?)])
-
-; make-new-clouse-label : (syntax -> syntax) syntax -> syntax
-(define (make-new-closure-label labeling stx)
-  (labeling stx))
-
-; defun : syntax[1] -> (values syntax?[2] (listof syntax?)[3])
-; defunctionalizes the first syntax, returning the second and the lifted lambdas [3]
-(define (defun stx)  
-  (rearm
-   stx
-   (kernel-syntax-case
-       (disarm stx) (transformer?)
-     [(begin be ...)
-      (let-values ([(nbes) (defun* (syntax->list #'(be ...)))])
-        (quasisyntax/loc stx (begin #,@nbes)))]
-     [(begin0 be ...)
-      (let-values ([(nbes) (defun* (syntax->list #'(be ...)))])
-        (quasisyntax/loc stx (begin0 #,@nbes)))]
-     [(set! v ve)
-      (let-values ([(nve) (defun #'ve)])
-        (quasisyntax/loc stx (set! v #,nve)))]
-     [(let-values ([(v ...) ve] ...) be ...)
-      (let-values ([(nves) (defun* (syntax->list #'(ve ...)))]
-                   [(nbes) (defun* (syntax->list #'(be ...)))])
-        (with-syntax ([(nve ...) nves]
-                      [(nbe ...) nbes])
-          (syntax/loc stx (let-values ([(v ...) nve] ...) nbe ...))))]
-     [(letrec-values ([(v ...) ve] ...) be ...)
-      (let-values ([(nves) (defun* (syntax->list #'(ve ...)))]
-                   [(nbes) (defun* (syntax->list #'(be ...)))])
-        (with-syntax ([(nve ...) nves]
-                      [(nbe ...) nbes])
-          (syntax/loc stx (letrec-values ([(v ...) nve] ...) nbe ...))))]
-     [(#%plain-lambda formals be ...)
-      (let-values ([(nbes) (defun* (syntax->list #'(be ...)))])
-        (with-syntax ([(nbe ...) nbes])
-          (syntax/loc stx
-            (serial-lambda formals nbe ...))
-          #;
-          (make-closure
-           (quasisyntax/loc stx
-             (_ #,(make-new-closure-label (current-code-labeling) stx) (#%plain-lambda formals nbe ...))))))]
-     [(case-lambda [formals be ...] ...)       
-      (let-values ([(nbes) (defun** (syntax->list #'((be ...) ...)))])
-        (with-syntax ([((nbe ...) ...) nbes])
-          (syntax/loc stx
-            (serial-case-lambda
-             [formals nbe ...]
-             ...))
-          #;
-          (make-closure
-           (quasisyntax/loc stx
-             (_ #,(make-new-closure-label (current-code-labeling) stx) (case-lambda [formals nbe ...] ...))))))]
-     [(if te ce ae)
-      (let-values ([(es) (defun* (syntax->list #'(te ce ae)))])
-        (quasisyntax/loc stx (if #,@es)))]
-     [(quote datum)
-      stx]
-     [(quote-syntax datum)
-      stx]
-     [(with-continuation-mark ke me be)
-      (let-values ([(es) (defun* (list #'ke #'me #'be))])
-        (quasisyntax/loc stx (with-continuation-mark #,@es)))]
-     [(#%plain-app e ...)
-      (let-values ([(es) (defun* (syntax->list #'(e ...)))])
-        (quasisyntax/loc stx (#%plain-app #,@es)))]
-     [(#%top . v)
-      stx]
-     [(#%variable-reference . v)
-      stx]
-     [id (identifier? #'id)
-         stx]       
-     [(#%expression d)
-      (let-values ([(nd) (defun #'d)])
-        (quasisyntax/loc stx (#%expression #,nd)))]
-     [_
-      (raise-syntax-error 'defun "Dropped through:" stx)])))
-
-; lift defun to list of syntaxes
-(define (lift-defun defun)
-  (lambda (stxs)
-    (map defun stxs)))
-(define defun* (lift-defun defun))
-(define defun** (lift-defun (lambda (stx) (defun* (syntax->list stx)))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/elim-callcc.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/elim-callcc.rkt
deleted file mode 100644
index 191dc2b48f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/elim-callcc.rkt
+++ /dev/null
@@ -1,173 +0,0 @@
-#lang racket/base
-(require (for-template racket/base)
-         syntax/kerncase
-         racket/contract
-         "abort-resume.rkt"
-         (for-template "abort-resume.rkt")
-         "util.rkt")
-(provide/contract
- [elim-callcc (syntax? . -> . syntax?)])
-
-(define (id x) x)
-
-;; mark-lambda-as-safe: w -> w
-;; If w is a lambda-expression then add #t to the safety mark, otherwise no mark
-(define (mark-lambda-as-safe w)
-  (rearm
-   w
-   (syntax-case (disarm w) (#%plain-lambda case-lambda)
-     [(#%plain-lambda formals be ...)
-      (syntax/loc w
-        (#%plain-lambda formals
-                        (with-continuation-mark safe-call? '(#t (lambda formals))
-                          be ...)))]
-     [(case-lambda [formals be ...] ...)
-      (syntax/loc w
-        (case-lambda [formals 
-                      (with-continuation-mark safe-call? '(#t (case-lambda formals ...))
-                        be ...)] ...))]
-     [_else w])))
-
-(define (elim-callcc stx)
-  (elim-callcc/mark id stx))
-
-(define (elim-callcc/mark markit stx)  
-  (rearm
-   stx
-   (kernel-syntax-case*
-    (disarm stx) (transformer?) (call/cc call-with-values)
-    [(begin be ...)
-     (raise-syntax-error 'elim-callcc/mark "Not in ANF" stx)]
-    [(begin0 be ...)
-     (raise-syntax-error 'elim-callcc/mark "Not in ANF" stx)]
-    [(set! v ve)
-     (with-syntax ([ve (elim-callcc #'ve)])
-       (syntax/loc stx (set! v ve)))]
-    [(let-values ([(v ...) ve] ...) be ...)
-     (raise-syntax-error 'elim-callcc/mark "Not in ANF" stx)]
-    [(letrec-values ([(v ...) ve] ...) be ...)
-     (raise-syntax-error 'elim-callcc/mark "Not in ANF" stx)]
-    [(#%plain-lambda formals be)
-     (mark-lambda-as-safe
-      (with-syntax ([be (elim-callcc #'be)])
-        (syntax/loc stx
-          (#%plain-lambda formals be))))]
-    [(case-lambda [formals be] ...)
-     (mark-lambda-as-safe
-      (with-syntax ([(be ...) (map elim-callcc (syntax->list #'(be ...)))])
-        (syntax/loc stx
-          (case-lambda [formals be] ...))))]
-    [(if te ce ae)
-     (with-syntax ([te (elim-callcc #'te)]
-                   [ce (elim-callcc #'ce)]
-                   [ae (elim-callcc #'ae)])
-       (markit (syntax/loc stx (if te ce ae))))]
-    [(quote datum)
-     stx]
-    [(quote-syntax datum)
-     stx]    
-    [(with-continuation-mark ke me be)
-     (let* ([ke-prime (elim-callcc #'ke)]
-            [me-prime (elim-callcc #'me)]
-            [be-prime (elim-callcc #'be)])
-       ; Could be dangerous to evaluate ke-prime and me-prime twice (but remember, this is in ANF)
-       (markit 
-        (quasisyntax/loc stx
-          (with-continuation-mark #,ke-prime #,me-prime
-            (#%plain-app with-current-saved-continuation-marks-and #,ke-prime #,me-prime
-                         (#%plain-lambda () #,be-prime))))))]
-    [(#%plain-app call/cc w)
-     (let-values ([(cm ref-to-cm) (generate-formal 'current-marks stx)]
-                  [(x ref-to-x) (generate-formal 'x stx)])
-       (markit 
-        (quasisyntax/loc stx
-          (#%plain-app 
-           #,(elim-callcc #'w)
-           (#%plain-app 
-            (#%plain-lambda 
-             (#,cm)
-             (#%plain-lambda #,x
-                             (#%plain-app abort
-                                          ; XXX Do I need to rebuild the CMs?
-                                          (#%plain-lambda () (#%plain-app resume #,ref-to-cm #,ref-to-x)))))
-            (#%plain-app activation-record-list))))))]
-    [(#%plain-app call-with-values (#%plain-lambda () prod) cons)
-     (let-values ([(consumer ref-to-consumer) (generate-formal 'consumer stx)])
-       (quasisyntax/loc stx
-         (let-values ([(#,consumer) #,(mark-lambda-as-safe (elim-callcc #'cons))])
-           #,(markit
-              (quasisyntax/loc stx
-                (#%plain-app 
-                 call-with-values 
-                 #,(mark-lambda-as-safe
-                    (quasisyntax/loc stx
-                      (#%plain-lambda ()
-                                      #,(elim-callcc/mark
-                                         (lambda (x)
-                                           (quasisyntax/loc stx
-                                             (with-continuation-mark the-cont-key #,ref-to-consumer #,x)))
-                                         #'prod))))
-                 #,ref-to-consumer))))))]
-    [(#%plain-app w (#%plain-app . stuff))
-     (with-syntax ([e #'(#%plain-app . stuff)])
-       (syntax-case (disarm #'w) (#%plain-lambda case-lambda)
-         [(#%plain-lambda formals body)
-          (rearm
-           #'w
-           (let-values ([(w-prime ref-to-w-prime) (generate-formal 'l stx)])
-             (quasisyntax/loc stx
-               (let-values ([(#,w-prime) #,(elim-callcc #'w)])
-                 #,(markit
-                    (quasisyntax/loc stx
-                      (#%plain-app #,ref-to-w-prime
-                                   #,(elim-callcc/mark
-                                      (lambda (x)
-                                        (quasisyntax/loc stx
-                                          (with-continuation-mark the-cont-key #,ref-to-w-prime #,x)))
-                                      #'e))))))))]
-         [(case-lambda [formals body] ...)
-          (rearm
-           #'w
-           (let-values ([(w-prime ref-to-w-prime) (generate-formal 'cl stx)])
-             (quasisyntax/loc stx
-               (let-values ([(#,w-prime) #,(elim-callcc #'w)])
-                 #,(markit
-                    (quasisyntax/loc stx
-                      (#%plain-app #,ref-to-w-prime
-                                   #,(elim-callcc/mark
-                                      (lambda (x)
-                                        (quasisyntax/loc stx
-                                          (with-continuation-mark the-cont-key #,ref-to-w-prime #,x)))
-                                      #'e))))))))]
-         [_else
-          (let-values ([(w-prime ref-to-w-prime) (generate-formal 'other stx)])
-            (quasisyntax/loc stx
-              (let ([#,w-prime #,(elim-callcc #'w)])
-                (markit
-                 (quasisyntax/loc stx
-                   (#%plain-app #,ref-to-w-prime
-                                #,(elim-callcc/mark
-                                   (lambda (x)
-                                     #`(with-continuation-mark the-cont-key #,ref-to-w-prime #,x))
-                                   #'e)))))))]))]
-    [(#%plain-app w rest ...)
-     (markit
-      (quasisyntax/loc stx
-        (with-continuation-mark safe-call? '(#f stx)
-          (#%plain-app #,(mark-lambda-as-safe (elim-callcc #'w))
-                       #,@(map 
-                           (lambda (an-expr)
-                             (mark-lambda-as-safe
-                              (elim-callcc
-                               an-expr)))
-                           (syntax->list #'(rest ...)))))))]
-    [(#%top . v)
-     stx]
-    [(#%variable-reference . v)
-     stx]       
-    [id (identifier? #'id)
-        stx]    
-    [(#%expression d)
-     (markit (quasisyntax/loc stx (#%expression #,(elim-callcc #'d))))]
-    [_
-     (raise-syntax-error 'elim-callcc "Dropped through:" stx)])))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/elim-letrec.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/elim-letrec.rkt
deleted file mode 100644
index e5c89b50de..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/elim-letrec.rkt
+++ /dev/null
@@ -1,118 +0,0 @@
-#lang racket/base
-(require (for-template racket/base)         
-         syntax/kerncase
-         racket/list
-         racket/contract
-         (for-template "abort-resume.rkt")
-         "util.rkt")
-(provide/contract
- [elim-letrec ((listof syntax?) . -> . (syntax? . -> . syntax?))]
- [elim-letrec-term (syntax? . -> . syntax?)])
-
-; elim-letrec : (listof identifier-syntax?)[3] -> syntax?[2] -> syntax?[3]
-; Eliminates letrec-values from syntax[2] and correctly handles references to 
-; letrec-bound variables [3] therein. 
-(define ((elim-letrec ids) stx)
-  (rearm
-   stx
-   (kernel-syntax-case
-       (disarm stx) (transformer?)
-     [(begin be ...)
-      (with-syntax ([(be ...) (map (elim-letrec ids) (syntax->list #'(be ...)))])
-        (syntax/loc stx
-          (begin be ...)))]
-     [(begin0 be ...)
-      (with-syntax ([(be ...) (map (elim-letrec ids) (syntax->list #'(be ...)))])
-        (syntax/loc stx
-          (begin0 be ...)))]
-     [(set! id ve)
-      (with-syntax ([ve ((elim-letrec ids) #'ve)])
-        (if (bound-identifier-member? #'id ids)
-            (syntax/loc stx (#%plain-app set-box! id ve))
-            (syntax/loc stx (set! id ve))))]
-     [(let-values ([(v ...) ve] ...) be ...)
-      (with-syntax ([(ve ...) (map (elim-letrec ids) (syntax->list #'(ve ...)))]
-                    [(be ...) (map (elim-letrec ids) (syntax->list #'(be ...)))])
-        (syntax/loc stx
-          (let-values ([(v ...) ve] ...) be ...)))]
-     [(letrec-values ([(v ...) ve] ...) be ...)
-      (let ([new-ids (apply append ids (map syntax->list (syntax->list #'((v ...) ...))))]
-            [gfss (map (lambda (vs)
-                        (map (lambda (v)
-                               (define-values (v-def v-ref) (generate-formal (syntax->datum v) v))
-                               (cons v-def v-ref))
-                             (syntax->list vs)))
-                      (syntax->list #'((v ...) ...)))])
-        (with-syntax 
-            ([((nv-def ...) ...) 
-              (map (lambda (gfs) (map car gfs)) gfss)]
-             [((nv-ref ...) ...) 
-              (map (lambda (gfs) (map cdr gfs)) gfss)]              
-             [((nv-box ...) ...) (map (lambda (nvs)
-                                        (map (lambda (x) (syntax/loc x (#%plain-app box the-undef)))
-                                             (syntax->list nvs)))
-                                      (syntax->list #`((v ...) ...)))]
-             [(ve ...) (map (elim-letrec new-ids) (syntax->list #'(ve ...)))]
-             [(be ...) (map (elim-letrec new-ids) (syntax->list #'(be ...)))])
-          (syntax/loc stx
-            (let-values ([(v ...)
-                          (#%plain-app values nv-box ...)] ...)
-              (begin (#%plain-app call-with-values
-                                  (#%plain-lambda () ve)
-                                  (#%plain-lambda 
-                                   (nv-def ...)
-                                   (#%plain-app set-box! v nv-ref) ...))
-                     ...
-                     be ...)))))]
-     [(#%plain-lambda formals be ...)
-      (with-syntax ([(be ...) (map (elim-letrec ids) (syntax->list #'(be ...)))])
-        (syntax/loc stx
-          (#%plain-lambda formals be ...)))]
-     [(case-lambda [formals be] ...)
-      (with-syntax ([(be ...) (map (elim-letrec ids) (syntax->list #'(be ...)))])
-        (syntax/loc stx
-          (case-lambda [formals be] ...)))]
-     [(case-lambda [formals be ...] ...)
-      ((elim-letrec ids)
-       (syntax/loc stx
-         (case-lambda [formals (begin be ...)] ...)))]
-     [(if te ce ae)
-      (with-syntax ([te ((elim-letrec ids) #'te)]
-                    [ce ((elim-letrec ids) #'ce)]
-                    [ae ((elim-letrec ids) #'ae)])
-        (syntax/loc stx
-          (if te ce ae)))]
-     [(quote datum)
-      stx]
-     [(quote-syntax datum)
-      stx]     
-     [(with-continuation-mark ke me be)
-      (with-syntax ([ke ((elim-letrec ids) #'ke)]
-                    [me ((elim-letrec ids) #'me)]
-                    [be ((elim-letrec ids) #'be)])
-        (syntax/loc stx
-          (with-continuation-mark ke me be)))]     
-     [(#%plain-app e ...)
-      (with-syntax ([(e ...) (map (elim-letrec ids) (syntax->list #'(e ...)))])
-        (syntax/loc stx
-          (#%plain-app e ...)))]
-     [(#%top . v)
-      stx]
-     [(#%variable-reference . v)
-      stx]            
-     [id (identifier? #'id)
-         (if (bound-identifier-member? #'id ids)
-             (syntax/loc stx (#%plain-app unbox id))
-             stx)]
-     [(letrec-syntaxes+values ([(sv ...) se] ...)
-        ([(vv ...) ve] ...)
-        be ...)
-      ((elim-letrec ids)
-       (syntax/loc stx
-         (letrec-values ([(vv ...) ve] ...) be ...)))]
-     [(#%expression d)
-      (quasisyntax/loc stx (#%expression #,((elim-letrec ids) #'d)))]
-     [_
-      (raise-syntax-error 'elim-letrec "Dropped through:" stx)])))
-
-(define elim-letrec-term (elim-letrec empty))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/file-box.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/file-box.rkt
deleted file mode 100644
index 9bb89c1c79..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/file-box.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang racket/base
-(require racket/serialize
-         racket/contract)  
-
-(define-serializable-struct internal-file-box (path))
-(define file-box? internal-file-box?)
-
-(define (file-box path default)
-  (define fb (make-internal-file-box path))
-  (unless (file-box-set? fb)
-    (file-box-set! fb default))
-  fb)
-
-(define (file-box-set? fb)
-  (with-handlers ([exn:fail? (lambda _ #f)])
-    (file-unbox fb)
-    #t))
-
-(define (file-unbox fb)
-  (deserialize (call-with-input-file (internal-file-box-path fb) read)))
-(define (file-box-set! fb v)
-  (with-output-to-file (internal-file-box-path fb) (lambda () (write (serialize v)))
-    #:exists 'replace))
-
-(provide/contract 
- [file-box? (any/c . -> . boolean?)]
- [file-box (path-string? serializable? . -> . file-box?)]
- [file-unbox (file-box? . -> . serializable?)]
- [file-box-set? (file-box? . -> . boolean?)]
- [file-box-set! (file-box? serializable? . -> . void)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/labels.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/labels.rkt
deleted file mode 100644
index d0eed832bc..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/labels.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-#lang racket/base
-(require racket/contract
-         file/md5)
-(provide/contract
- [make-labeling (bytes? . -> . (-> symbol?))])
-
-;; REQUIREMENT: The label code must be non-numeric.
-;; REQUIREMENT: The first numeric character following the label code
-;;              indicates the start of the unique suffix identifying
-;;              the closure struct type.
-
-;; make-labeling: bytes -> (-> symbol)
-;; produce the labeling function for a particular program
-(define (make-labeling pgm)
-  (define count (box 0))
-  (define tag (md5 pgm))
-  (lambda ()
-    (begin0
-      (string->symbol (format "~a:~a" tag (unbox count)))
-      (set-box! count (add1 (unbox count))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/lang-api.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/lang-api.rkt
deleted file mode 100644
index d6a3496f3f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/lang-api.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang racket/base
-(provide (except-out (all-from-out racket/base) #%module-begin))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/native.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/native.rkt
deleted file mode 100644
index f3e1a0193c..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/native.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-(require web-server/lang/abort-resume
-         (for-syntax racket/base))
-
-(define-syntax (define-native stx)
-  (syntax-case stx ()
-    [(_ (id . argspec) original)
-     (quasisyntax/loc stx
-       (define id
-         (lambda id-args
-           (serial->native
-            (apply original
-                   (map (lambda (higher-order? arg)
-                          (if higher-order?
-                              (lambda arg-args
-                                (native->serial (apply arg arg-args)))
-                              arg))
-                        (list #,@(map (lambda (arg)
-                                        (syntax-case arg (ho)
-                                          [ho #t]
-                                          [_ #f]))
-                                      (syntax->list #'argspec)))
-                        id-args))))))]))
-
-(provide define-native)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/reader.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/reader.rkt
deleted file mode 100644
index 16d64b8521..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/reader.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-web-server/lang
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/serial-lambda.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/serial-lambda.rkt
deleted file mode 100644
index 83330b0213..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/serial-lambda.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         racket/serialize
-         (for-syntax racket/base
-                     web-server/lang/closure
-                     web-server/lang/labels))
-
-(define-syntax (serial-lambda stx)
-  (syntax-case stx ()
-    [(_ . lmbda-stx)
-     (let ([labeling (make-labeling (string->bytes/utf-8 (format "~a" (syntax->datum stx))))])
-       (make-closure
-        (quasisyntax/loc stx
-          (_ #,(labeling) (lambda . lmbda-stx)))))]))
-
-(define-syntax (serial-case-lambda stx)
-  (syntax-case stx ()
-    [(_ . lmbda-stx)
-     (let ([labeling (make-labeling (string->bytes/utf-8 (format "~a" (syntax->datum stx))))])
-       (make-closure
-        (quasisyntax/loc stx
-          (_ #,(labeling) (case-lambda . lmbda-stx)))))]))
-
-(provide serial-lambda
-         serial-case-lambda)
-
-(provide/contract
- [closure->deserialize-name (serializable? . -> . symbol?)])
-(define (closure->deserialize-name proc)
-  (string->symbol (cdr (first (third (serialize proc))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/soft.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/soft.rkt
deleted file mode 100644
index 1b2eb34897..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/soft.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         racket/local
-         racket/serialize)
-
-(define-serializable-struct soft-state-record (thnk))
-(define-struct some (value))
-
-(define *soft-state-cache*
-  (make-weak-hash))
-
-(define (make-soft-state thnk)
-  (make-soft-state-record thnk))
-
-(define (soft-state-ref ss)
-  (match ss
-    [(struct soft-state-record (thnk))
-     (define the-weak-box
-       (hash-ref! *soft-state-cache* ss (lambda () (make-weak-box (make-some (thnk))))))
-     (define the-val
-       (weak-box-value the-weak-box))
-     (if (some? the-val)
-         (some-value the-val)
-         (local [(define real-val (thnk))]
-           (hash-set! *soft-state-cache* ss (make-weak-box (make-some real-val)))
-           real-val))]))
-
-(define soft-state? soft-state-record?)
-
-(define-syntax-rule (soft-state expr ...) 
-  (make-soft-state (lambda () expr ...)))
-
-(provide
- soft-state)
-(provide/contract
- [soft-state? (any/c . -> . boolean?)]
- [make-soft-state ((-> any/c) . -> . soft-state?)]
- [soft-state-ref (soft-state? . -> . any/c)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/stuff-url.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/stuff-url.rkt
deleted file mode 100644
index f00e6c53e7..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/stuff-url.rkt
+++ /dev/null
@@ -1,78 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         net/url
-         racket/serialize
-         web-server/private/servlet
-         web-server/stuffers/stuffer
-         web-server/stuffers/serialize
-         web-server/stuffers/gzip
-         web-server/stuffers/base64
-         web-server/stuffers/hash
-         web-server/http
-         web-server/private/url-param)
-
-(define (is-url-too-big? v)
-  (define uri
-    (request-uri 
-     (execution-context-request
-      (current-execution-context))))
-  (> (string-length
-      (url->string
-       (insert-in-uri uri v)))
-     ; http://www.boutell.com/newfaq/misc/urllength.html
-     2048))
-
-(define (make-default-stuffer home)
-  (stuffer-chain
-   serialize-stuffer
-   is-url-too-big?
-   (stuffer-chain
-    gzip-stuffer 
-    base64-stuffer)
-   is-url-too-big?
-   (md5-stuffer home)))
-
-(define default-stuffer
-  (make-default-stuffer
-   (build-path (find-system-path 'home-dir) ".urls")))
-
-(define URL-KEY "c")
-
-(define (insert-in-uri uri c)
-  (insert-param uri URL-KEY (bytes->string/utf-8 c)))
-
-(define serialize-rx #rx"serialize: contract violation\n  expected: serializable\\?\n  given: (.*)")
-
-(define (stuff-url stuffer uri c)
-  (with-handlers
-   ([(lambda (x)
-       (and (exn:fail? x)
-            (regexp-match serialize-rx
-                          (exn-message x))))
-     (lambda (x)
-       (define non
-         (second
-          (regexp-match serialize-rx
-                       (exn-message x))))
-       (error 'stuff-url 
-              "Cannot stuff ~e into a URL because it contains non-serializable pieces. Convert ~a to a serializable struct"
-              c non))])
-   (insert-in-uri
-    uri ((stuffer-in stuffer) c))))
-
-(define (stuffed-url? uri)
-  (string? (extract-param uri URL-KEY)))
-
-(define (unstuff-url stuffer uri)
-  ((stuffer-out stuffer)
-   (string->bytes/utf-8
-    (extract-param uri URL-KEY))))
-
-(provide/contract
- [default-stuffer (stuffer/c serializable? bytes?)]
- [make-default-stuffer (path-string? . -> . (stuffer/c serializable? bytes?))]
- [is-url-too-big? (bytes? . -> . boolean?)]
- [stuff-url ((stuffer/c serializable? bytes?) url? serializable? . -> . url?)]
- [stuffed-url? (url? . -> . boolean?)]
- [unstuff-url ((stuffer/c serializable? bytes?) url? . -> . serializable?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/util.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/util.rkt
deleted file mode 100644
index de3a2c2d0a..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/util.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang racket/base
-(require (for-template racket/base)
-         racket/list
-         racket/contract)
-(provide/contract
- [transformer? (parameter/c boolean?)]
- [disarm (syntax? . -> . syntax?)]
- [rearm (syntax? syntax? . -> . syntax?)]
- [current-code-labeling (parameter/c (syntax? . -> . syntax?))]
- [generate-formal ((symbol?) ((or/c false/c syntax?)) . ->* . (values syntax? syntax?))]
- [formals-list (syntax? . -> . (listof syntax?))]
- [make-define-case ((syntax? . -> . syntax?) . -> . (syntax? . -> . syntax?))]
- [make-module-case ((syntax? . -> . syntax?) . -> . (syntax? . -> . syntax?))]
- [make-lang-module-begin ((bytes? . -> . (-> symbol?)) (syntax? . -> . syntax?) . -> . (syntax? . -> . syntax?))]
- [bound-identifier-member? (syntax? (listof syntax?) . -> . boolean?)])
-
-(define transformer? (make-parameter #f))
-
-(define code-insp
-  (variable-reference->module-declaration-inspector
-   (#%variable-reference)))
-
-(define (disarm expr)
-  (syntax-disarm expr code-insp))
-(define (rearm old-expr expr)
-  (syntax-rearm expr old-expr))
-
-(define current-code-labeling
-  (make-parameter
-   (lambda (stx)
-     (datum->syntax stx 'error))))
-
-(define (generate-formal sym-name [stx-base #f])
-  (let ([name (datum->syntax (and stx-base (disarm stx-base)) (gensym sym-name))])
-    (with-syntax ([(#%plain-lambda (formal) ref-to-formal)
-                   (if (syntax-transforming?)
-                       (local-expand #`(#%plain-lambda (#,name) #,name) 'expression empty)
-                       #`(#%plain-lambda (#,name) #,name))])
-      (values #'formal #'ref-to-formal))))
-
-(define (formals-list stx)
-  (syntax-case stx ()
-    [v (identifier? #'v)
-       (list #'v)]
-    [(v ...)
-     (syntax->list #'(v ...))]
-    [(v ... . rv)
-     (list* #'rv (syntax->list #'(v ...)))]))
-
-(define ((make-define-case inner) stx)
-  (syntax-case stx (define-values define-syntaxes #%require)
-    [(define-syntaxes . ds) stx]      
-    [(#%require . r) stx]
-    [(define-values (v ...) ve)
-     (let-values ([(nve) (inner #'ve)])
-       (quasisyntax/loc stx
-         (define-values (v ...) #,nve)))]
-    [expr
-     (inner #'expr)]))
-
-(define ((make-module-case inner) stx)
-  (syntax-case* stx (#%provide #%declare begin-for-syntax module module*) free-identifier=?     
-    [(#%provide . p) stx]
-    [(#%declare . d) stx]
-    [(module* . m) stx]
-    [(module . m) stx]
-    [(begin-for-syntax . e) stx]
-    [_
-     (inner stx)]))
-
-(define ((make-lang-module-begin make-labeling transform) stx)
-  (rearm
-   stx
-   (syntax-case (disarm stx) ()
-     [(mb forms ...)
-      (let ([stx (local-expand (quasisyntax/loc stx
-                                 (#%module-begin (require web-server/lang/lang-api) forms ...))
-                               'module-begin 
-                               (list #'module*))])
-        (with-syntax ([(pmb body ...) (disarm stx)])
-          (define base-labeling (make-labeling (string->bytes/utf-8 (format "~a" (syntax->datum stx)))))      
-          (define new-defs 
-            (parameterize ([current-code-labeling
-                            (lambda (stx) (datum->syntax stx (base-labeling)))])
-              (map transform (syntax->list #'(body ...)))))
-          (quasisyntax/loc stx
-            (pmb #,@new-defs))))])))
-
-(define (bound-identifier-member? id ids)
-  (ormap
-   (lambda (an-id)
-     (bound-identifier=? id an-id))
-   ids))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web-cell-component.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web-cell-component.rkt
deleted file mode 100644
index fba8a737cf..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web-cell-component.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         (for-template racket/base))
-(provide define-component)
-
-(define-syntax define-component
-  (syntax-rules (define)
-    [(_ (include-name id formals embed/url) body ...)
-     (define include-name
-       (lambda formals
-         (let/cc k
-           (define (id)
-             (k
-              (lambda (embed/url)
-                body ...)))
-           (id))))]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web-cells.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web-cells.rkt
deleted file mode 100644
index 8669eac013..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web-cells.rkt
+++ /dev/null
@@ -1,66 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         racket/serialize
-         web-server/lang/serial-lambda)
-;; Implementation: Have a distinguished frame variable that is read and captured by send/suspend, 
-;; installed on invocations of continuations by the server (and NOT from other continuation invocations)
-
-;; Data types
-(define-serializable-struct primitive-wc (id))
-(define-serializable-struct frame (env))
-
-;; Frames  
-(define *wc-frame* (make-thread-cell (make-frame (make-immutable-hasheq empty)) #t))
-(define (current-frame) (thread-cell-ref *wc-frame*))
-(define (update-frame! nf) (thread-cell-set! *wc-frame* nf))
-
-;; Web Cell Sets
-(define web-cell-set? frame?)
-(define (capture-web-cell-set) (current-frame))
-(define (restore-web-cell-set! wcs) (update-frame! wcs))
-
-(provide/contract
- [web-cell-set? (any/c . -> . boolean?)]
- [capture-web-cell-set (-> web-cell-set?)]
- [restore-web-cell-set! (web-cell-set? . -> . void)])
-
-;; Web Cells
-(define next-web-cell-id
-  (let ([i (box 0)])
-    (lambda ()
-      (begin0 (unbox i)
-              (set-box! i (add1 (unbox i)))))))
-
-(define web-cell? primitive-wc?)
-
-(define-syntax make-web-cell
-  (syntax-rules ()
-    [(_ default)
-     (make-web-cell* (closure->deserialize-name (lambda () 'web-cell))
-                     default)]))
-(define (make-web-cell* label default)
-  (define id (next-web-cell-id))
-  (define key (string->symbol (format "~a-~a" label id)))
-  (define wc (make-primitive-wc key))
-  (web-cell-shadow wc default)
-  wc)
-
-(define (web-cell-ref pwc)
-  (define i (primitive-wc-id pwc))
-  (hash-ref
-   (frame-env (current-frame)) i
-   (lambda ()
-     (error 'web-cell "Undefined web-cell: ~.s" i))))
-
-(define (web-cell-shadow wc nv)
-  (update-frame!
-   (make-frame
-    (hash-set (frame-env (current-frame))
-              (primitive-wc-id wc) nv))))
-
-(provide make-web-cell)
-(provide/contract
- [web-cell? (any/c . -> . boolean?)]
- [web-cell-ref (web-cell? . -> . any/c)]
- [web-cell-shadow (web-cell? any/c . -> . void)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web-param.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web-param.rkt
deleted file mode 100644
index 2af8ec300d..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web-param.rkt
+++ /dev/null
@@ -1,59 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base)
-         racket/contract
-         web-server/lang/serial-lambda
-         racket/list)
-
-(provide/contract
- [web-parameter? (any/c . -> . boolean?)])
-(provide make-web-parameter
-         web-parameterize)
-
-(define (web-parameter? any)
-  (and (procedure? any)
-       (procedure-arity-includes? any 0)
-       (procedure-arity-includes? any 2)))  
-
-(define next-web-parameter-id
-  (let ([i (box 0)])
-    (lambda ()
-      (begin0 (unbox i)
-              (set-box! i (add1 (unbox i)))))))
-
-; This is syntax so that the web-language transformations can occur.
-(define-syntax make-web-parameter
-  (syntax-rules ()
-    [(_ default)
-     ; Key is a lambda, the defunctionalization process will turn it into a serializable value with the module's label embedded in it, that way the parameters are not guessable AND sensitive to changes in the source
-     ; I don't like the assumption of deserialization though, but I have to do this grossness because w-c-m uses equal? and post-deserialization, the two lambdas are not equal.
-     (let* ([id (next-web-parameter-id)]
-            [label (closure->deserialize-name (lambda () 'web-param))]
-            [key (string->symbol (format "~a-~a" label id))])
-       (case-lambda
-         [()
-          (let ([cur
-                 (continuation-mark-set->list 
-                  (current-continuation-marks) 
-                  key)])
-            (if (empty? cur)
-                default
-                (first cur)))]
-         [(v thunk)
-          (with-continuation-mark key v (thunk))]))]))
-
-(define-syntax web-parameterize/values
-  (syntax-rules ()
-    [(_ () e ...)
-     (begin e ...)]
-    [(_ ([wp v]) e ...)
-     (wp v (lambda () e ...))]
-    [(_ ([fwp fv] [wp v] ...) e ...)
-     (web-parameterize/values ([fwp fv]) (web-parameterize/values ([wp v] ...) e ...))]))
-
-(define-syntax (web-parameterize stx)
-  (syntax-case stx ()
-    [(_ ([wp ve] ...) e ...)
-     (with-syntax ([(v ...) (generate-temporaries (syntax->list #'(ve ...)))])
-       (syntax/loc stx
-         (let ([v ve] ...)
-           (web-parameterize/values ([wp v] ...) e ...))))]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web.rkt
deleted file mode 100644
index e9ba3953fe..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/lang/web.rkt
+++ /dev/null
@@ -1,126 +0,0 @@
-#lang racket/base
-(require racket/match
-         net/url
-         racket/contract
-         racket/serialize
-         web-server/servlet/servlet-structs
-         web-server/http
-         web-server/managers/manager
-         web-server/private/define-closure
-         web-server/private/servlet       
-         web-server/stuffers/stuffer
-         web-server/lang/abort-resume
-         web-server/lang/stuff-url)
-
-(define-struct (stateless-servlet servlet) (stuffer))
-
-(provide
- ;; Server Interface
- initialize-servlet 
- 
- ;; Servlet Interface
- send/suspend
- send/suspend/dispatch
- send/suspend/hidden
- send/suspend/url
- send/suspend/url/dispatch
- redirect/get)
-
-(provide/contract
- [make-stateless-servlet
-  (custodian? namespace? manager? path-string? (request? . -> . can-be-response?)
-              (stuffer/c serializable? bytes?) . -> . stateless-servlet?)])
-
-; These contracts interfere with the continuation safety marks
-#;(provide/contract
-   ;; Server Interface
-   [initialize-servlet ((request? . -> . can-be-response?) . -> . (request? . -> . can-be-response?))]
-   
-   ;; Servlet Interface
-   [send/suspend ((string? . -> . can-be-response?) . -> . request?)]
-   [send/suspend/dispatch ((((request? . -> . any/c) . -> . string?) . -> . can-be-response?)
-                           . -> . any/c)]
-   [send/suspend/hidden ((url? list? . -> . can-be-response?) . -> . request?)]
-   [send/suspend/url ((url? . -> . can-be-response?) . -> . request?)]
-   [send/suspend/url/dispatch ((((request? . -> . any/c) . -> . url?) . -> . can-be-response?)
-                               . -> . any/c)]
-   [redirect/get (-> request?)])
-
-;; initial-servlet : (request -> response) -> (request -> can-be-response?)
-(define (initialize-servlet start)
-  (let ([params (current-parameterization)])
-    (lambda (req0)
-      (call-with-parameterization 
-       params
-       (lambda ()
-         (dispatch
-          (lambda (req1)
-            (or (request->continuation req1)
-                ; Try to decode a continuation from the request,
-                ; or, use the start procedure to initialize a session
-                (lambda (req2) (dispatch-start start req2))))
-          req0))))))
-
-;; send/suspend/hidden: (url input-field -> response) -> request
-;; like send/suspend except the continuation is encoded in a hidden field
-(define (send/suspend/hidden page-maker)
-  (call-with-serializable-current-continuation
-   (lambda (k)
-     (define stuffer (stateless-servlet-stuffer (current-servlet)))
-     (define p-cont ((stuffer-in stuffer) k))
-     (page-maker
-      (request-uri (execution-context-request (current-execution-context)))
-      `(input ([type "hidden"] [name "kont"] [value ,(format "~s" p-cont)]))))))
-
-;; send/suspend/url: (url -> response) -> request
-;; like send/suspend except the continuation is encoded in the url
-(define (send/suspend/url page-maker)
-  (call-with-serializable-current-continuation
-   (lambda (k)
-     (define stuffer (stateless-servlet-stuffer (current-servlet)))
-     (page-maker
-      (stuff-url stuffer 
-                 (request-uri (execution-context-request (current-execution-context)))
-                 k)))))
-
-(define (send/suspend page-maker)
-  (send/suspend/url
-   (lambda (k-url)
-     (page-maker (url->string k-url)))))
-
-(define-closure embed/url (proc) (k string?)
-  (let ([url
-         (stuff-url (stateless-servlet-stuffer (current-servlet))
-                    (request-uri (execution-context-request (current-execution-context)))
-                    (kont-append-fun k proc))])
-    (if string?
-        (url->string url)
-        url)))
-
-(define (send/suspend/url/dispatch response-generator)
-  (call-with-serializable-current-continuation
-   (lambda (k)
-     (response-generator (make-embed/url (lambda () (values k #f)))))))
-(define (send/suspend/dispatch response-generator)
-  (call-with-serializable-current-continuation
-   (lambda (k)
-     (response-generator (make-embed/url (lambda () (values k #t)))))))
-
-;; request->continuation: req -> continuation
-;; decode the continuation from the hidden field of a request
-(define (request->continuation req)
-  (define stuffer (stateless-servlet-stuffer (current-servlet)))
-  (or
-   ; Look in url for c=<k>
-   (let ([req-url (request-uri req)])
-     (and (stuffed-url? req-url)
-          (unstuff-url stuffer req-url)))
-   ; Look in query for kont=<k>
-   (match (bindings-assq #"kont" (request-bindings/raw req))
-     [(struct binding:form (id kont))
-      ((stuffer-out stuffer)
-       (read (open-input-bytes kont)))]
-     [_ #f]))) 
-
-(define (redirect/get)
-  (send/suspend/url (lambda (k-url) (redirect-to (url->string k-url) temporarily))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/main.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/main.rkt
deleted file mode 100644
index 940effe8a7..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/main.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require "private/launch.rkt"
-         (only-in "web-server.rkt" do-not-return))
-(void (serve))
-(do-not-return)
-
-(module test racket/base)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/managers/lru.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/managers/lru.rkt
deleted file mode 100644
index f44940e136..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/managers/lru.rkt
+++ /dev/null
@@ -1,210 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/contract)
-(require "manager.rkt"
-         web-server/http
-         web-server/servlet/servlet-structs)
-(provide/contract
- [create-LRU-manager 
-  (->
-   (or/c false/c
-         (request? . -> . can-be-response?))
-   number? number? (-> boolean?)
-   #:initial-count number?
-   #:inform-p (number? . -> . void)
-   manager?)]
- [make-threshold-LRU-manager 
-  (-> 
-   (or/c false/c
-         (request? . -> . can-be-response?))
-   number?
-   manager?)])
-
-;; Utility
-(define (make-counter)
-  (define i 0)
-  (lambda ()
-    (set! i (add1 i))
-    i))
-
-; Copied from InstaServlet, which copied from Continue (I believe?)
-(define (make-threshold-LRU-manager instance-expiration-handler
-                                    memory-threshold)
-  (create-LRU-manager
-   ;; Called when an instance has expired.
-   instance-expiration-handler
-   ;; The condition below is checked every 5 seconds
-   5
-   ;; One 'life point' is deducted every 10 minutes
-   (* 10 60)
-   ;; If this condition is true a 'life point' is deducted
-   ;; from the continuation
-   (lambda ()
-     (define memory-use (current-memory-use))
-     (define collect?   (or (>= memory-use memory-threshold)
-                            (< memory-use 0)))
-     collect?)
-   ;; The number of 'life points' an continuation starts with
-   #:initial-count 24
-   ;; Logging done whenever an continuation is collected
-   #:inform-p (lambda args
-                (void))))
-
-(define-struct (LRU-manager manager) (instance-expiration-handler
-                                      ; Private
-                                      instances
-                                      next-instance-id))
-(define (create-LRU-manager
-         instance-expiration-handler
-         check-interval collect-interval
-         collect?
-         #:initial-count [initial-count 1]
-         #:inform-p [inform-p (lambda _ (void))])
-  (define lock (make-semaphore 1))
-  ;; Instances
-  (define instances (make-hasheq))
-  (define next-instance-id (make-counter))    
-  
-  (define-struct instance (k-table))  
-  (define (create-instance expire-fn)
-    (define instance-id (next-instance-id))
-    (hash-set! instances
-               instance-id
-               (make-instance (create-k-table)))
-    instance-id)
-  (define (adjust-timeout! instance-id secs)
-    (void))
-  
-  (define (instance-lookup instance-id)
-    (define instance
-      (hash-ref instances instance-id
-                (lambda ()
-                  (raise (make-exn:fail:servlet-manager:no-instance
-                          (format "No instance for id: ~a" instance-id)
-                          (current-continuation-marks)
-                          instance-expiration-handler)))))
-    instance)
-  
-  ;; Continuation table
-  (define-struct k-table (next-id-fn htable))
-  (define (create-k-table)
-    (make-k-table (make-counter) (make-hasheq)))
-  
-  ;; Interface
-  (define (clear-continuations! instance-id)
-    (match (instance-lookup instance-id)
-      [(struct instance ((and k-table (struct k-table (next-id-fn htable)))))
-       (hash-for-each
-        htable
-        (match-lambda*
-          [(list k-id (list salt k expiration-handler count))
-           (hash-set! htable k-id
-                      (list salt #f expiration-handler count))]))]))
-  
-  (define (continuation-store! instance-id k expiration-handler)
-    (match (instance-lookup instance-id)
-      [(struct instance ((struct k-table (next-id-fn htable))))
-       (define k-id (next-id-fn))
-       (define salt (random 100000000))
-       (hash-set! htable
-                  k-id
-                  (list salt k expiration-handler initial-count))
-       (list k-id salt)]))
-  (define (continuation-lookup* instance-id a-k-id a-salt peek?)
-    (match (instance-lookup instance-id)
-      [(struct instance ((struct k-table (next-id-fn htable))))
-       (match
-           (hash-ref htable a-k-id
-                     (lambda ()
-                       (raise (make-exn:fail:servlet-manager:no-continuation
-                               (format "No continuation for id: ~a" a-k-id)
-                               (current-continuation-marks)
-                               instance-expiration-handler))))
-         [(list salt k expiration-handler count)
-          (unless peek?
-            (hash-set! htable a-k-id
-                       (list salt k expiration-handler (add1 count))))
-          (if (or (not (eq? salt a-salt))
-                  (not k)
-                  (and (custodian-box? k)
-                       (not (custodian-box-value k))))
-              (raise (make-exn:fail:servlet-manager:no-continuation
-                      (format "No continuation for id: ~a" a-k-id)
-                      (current-continuation-marks)
-                      (if expiration-handler
-                          expiration-handler
-                          instance-expiration-handler)))
-              k)])]))
-  (define (continuation-lookup instance-id a-k-id a-salt)
-    (continuation-lookup* instance-id a-k-id a-salt #f))
-  (define (continuation-peek instance-id a-k-id a-salt)
-    (continuation-lookup* instance-id a-k-id a-salt #t))
-  
-  (define (wrap f)
-    (lambda args
-      (call-with-semaphore lock (lambda () (apply f args)))))
-  
-  (define the-manager
-    (make-LRU-manager (wrap create-instance)
-                      adjust-timeout!
-                      (wrap clear-continuations!)
-                      (wrap continuation-store!)
-                      (wrap continuation-lookup)
-                      (wrap continuation-peek)
-                      ; Specific
-                      instance-expiration-handler
-                      ; Private
-                      instances
-                      next-instance-id))
-  
-  ; Collector
-  (define (collect just-go?)
-    (call-with-semaphore
-     lock
-     (lambda ()
-       (define removed (box 0))
-       (hash-for-each
-        instances
-        (match-lambda*
-          [(list instance-id (struct instance ((struct k-table (next-id-fn htable)))))
-           (define empty? (box #t))
-           (hash-for-each
-            htable
-            (match-lambda*
-              [(list k-id (list s k eh count))
-               (if (zero? count)
-                   (begin (set-box! removed (add1 (unbox removed)))
-                          (hash-remove! htable k-id))
-                   (begin (set-box! empty? #f)
-                          (hash-set! htable k-id
-                                     (list s k eh (sub1 count)))))]))
-           (when (unbox empty?)
-             (set-box! removed (add1 (unbox removed)))
-             (hash-remove! instances instance-id))]))
-       (when (or just-go?
-                 (not (zero? (unbox removed))))
-         (inform-p (unbox removed))
-         (collect-garbage)
-         (collect-garbage)))))
-  
-  (define manager-thread
-    (thread
-     (lambda ()
-       (define (seconds->msecs s)
-         (+ (current-inexact-milliseconds)
-            (* s 1000)))
-       (let loop ([msecs0 (seconds->msecs check-interval)]
-                  [msecs1 (seconds->msecs collect-interval)])
-         (sync (handle-evt
-                (alarm-evt msecs0)
-                (lambda _
-                  (when (collect?)
-                    (collect #f))
-                  (loop (seconds->msecs check-interval) msecs1)))
-               (handle-evt
-                (alarm-evt msecs1)
-                (lambda _
-                  (collect #t)
-                  (loop msecs0 (seconds->msecs collect-interval)))))))))
-  
-  the-manager)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/managers/manager.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/managers/manager.rkt
deleted file mode 100644
index 3834701913..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/managers/manager.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-#lang racket/base
-(require racket/contract
-         web-server/http
-         web-server/servlet/servlet-structs)
-
-(define-struct manager (create-instance 
-                        adjust-timeout!
-                        clear-continuations!
-                        continuation-store!
-                        continuation-lookup
-                        continuation-peek))
-
-(define-struct (exn:fail:servlet-manager:no-instance exn:fail) (expiration-handler))
-(define-struct (exn:fail:servlet-manager:no-continuation exn:fail) (expiration-handler))
-
-(provide/contract
- [struct manager ([create-instance ((-> void) . -> . number?)]
-                  [adjust-timeout! (number? number? . -> . void)]
-                  [clear-continuations! (number? . -> . void)]
-                  [continuation-store! 
-                   (->
-                    number? any/c 
-                    (or/c false/c
-                          (request? . -> . can-be-response?))
-                    (list/c number? number?))]
-                  [continuation-lookup (number? number? number? . -> . any/c)]
-                  [continuation-peek (number? number? number? . -> . any/c)])]
- [struct (exn:fail:servlet-manager:no-instance exn:fail) 
-         ([message string?]
-          [continuation-marks continuation-mark-set?]
-          [expiration-handler 
-           (or/c false/c
-                 (request? . -> . can-be-response?))])]
- [struct (exn:fail:servlet-manager:no-continuation exn:fail)
-         ([message string?]
-          [continuation-marks continuation-mark-set?]
-          [expiration-handler 
-           (or/c false/c
-                 (request? . -> . can-be-response?))])])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/managers/none.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/managers/none.rkt
deleted file mode 100644
index 3843041206..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/managers/none.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket/base
-(require racket/contract)
-(require "manager.rkt")
-(require web-server/servlet/servlet-structs
-         web-server/http)
-(provide/contract
- [create-none-manager
-  (-> 
-   (or/c false/c
-         (request? . -> . can-be-response?))
-   manager?)])
-
-(define-struct (none-manager manager) (instance-expiration-handler))
-(define (create-none-manager
-         instance-expiration-handler)
-  
-  (define (create-instance expire-fn)
-    0)
-  (define (adjust-timeout! instance-id secs)
-    (void))
-  
-  (define (instance-lookup instance-id)
-    (raise (make-exn:fail:servlet-manager:no-instance
-            (format "No instance for id: ~a" instance-id)
-            (current-continuation-marks)
-            instance-expiration-handler)))
-  
-  (define (clear-continuations! instance-id)
-    (instance-lookup instance-id))
-  
-  (define (continuation-store! instance-id k expiration-handler)
-    (instance-lookup instance-id))
-  (define (continuation-lookup instance-id a-k-id a-salt)
-    (instance-lookup instance-id))
-  
-  (make-none-manager create-instance 
-                     adjust-timeout!
-                     clear-continuations!
-                     continuation-store!
-                     continuation-lookup
-                     continuation-lookup
-                     ; Specific
-                     instance-expiration-handler))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/managers/timeouts.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/managers/timeouts.rkt
deleted file mode 100644
index 66b2df35a3..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/managers/timeouts.rkt
+++ /dev/null
@@ -1,141 +0,0 @@
-#lang racket/base
-(require racket/match
-         racket/contract)
-(require "manager.rkt")
-(require web-server/private/timer
-         web-server/http
-         web-server/servlet/servlet-structs)
-(provide/contract
- [create-timeout-manager
-  (->
-   (or/c false/c
-         (request? . -> . can-be-response?))
-   number? number?
-   manager?)])
-
-;; Utility
-(define (make-counter)
-  (let ([i 0])
-    (lambda ()
-      (set! i (add1 i))
-      i)))
-
-(define-struct (timeout-manager manager)
-  (instance-expiration-handler
-   instance-timer-length
-   continuation-timer-length
-                                        ; Private
-   instances
-   next-instance-id))
-(define (create-timeout-manager
-         instance-expiration-handler
-         instance-timer-length
-         continuation-timer-length)
-  (define tm (start-timer-manager))
-
-  ;; Instances
-  (define instances (make-hasheq))
-  (define next-instance-id (make-counter))
-
-  (define-struct instance (k-table timer))
-  (define (create-instance expire-fn)
-    (define instance-id (next-instance-id))
-    (hash-set! instances
-               instance-id
-               (make-instance (create-k-table)
-                              (start-timer tm
-                                           instance-timer-length
-                                           (lambda ()
-                                             (expire-fn)
-                                             (hash-remove! instances instance-id)))))
-    instance-id)
-  (define (adjust-timeout! instance-id secs)
-    (reset-timer! (instance-timer (instance-lookup instance-id #f))
-                  secs))
-
-  (define (instance-lookup instance-id peek?)
-    (define instance
-      (hash-ref instances instance-id
-                (lambda ()
-                  (raise (make-exn:fail:servlet-manager:no-instance
-                          (format "No instance for id: ~a" instance-id)
-                          (current-continuation-marks)
-                          instance-expiration-handler)))))
-    (unless peek?
-      (increment-timer! (instance-timer instance)
-                        instance-timer-length))
-    instance)
-
-  ;; Continuation table
-  (define-struct k-table (next-id-fn htable))
-  (define (create-k-table)
-    (make-k-table (make-counter) (make-hasheq)))
-
-  ;; Interface
-  (define (clear-continuations! instance-id)
-    (match (instance-lookup instance-id #f)
-      [(struct instance ((and k-table (struct k-table (next-id-fn htable))) instance-timer))
-       (hash-for-each
-        htable
-        (match-lambda*
-         [(list k-id (list salt k expiration-handler k-timer))
-          (hash-set! htable k-id
-                     (list salt #f expiration-handler k-timer))]))]))
-
-  (define (continuation-store! instance-id k expiration-handler)
-    (match (instance-lookup instance-id #t)
-      [(struct instance ((struct k-table (next-id-fn htable)) instance-timer))
-       (define k-id (next-id-fn))
-       (define salt (random 100000000))
-       (hash-set! htable
-                  k-id
-                  (list salt k expiration-handler
-                        (start-timer tm continuation-timer-length
-                                     (lambda ()
-                                       (hash-set! htable k-id
-                                                  (list salt #f expiration-handler
-                                                        (start-timer tm 0 void)))))))
-       (list k-id salt)]))
-  (define (continuation-lookup* instance-id a-k-id a-salt peek?)
-    (match (instance-lookup instance-id peek?)
-      [(struct instance ((struct k-table (next-id-fn htable)) instance-timer))
-       (match
-           (hash-ref htable a-k-id
-                     (lambda ()
-                       (raise (make-exn:fail:servlet-manager:no-continuation
-                               (format "No continuation for id: ~a" a-k-id)
-                               (current-continuation-marks)
-                               instance-expiration-handler))))
-         [(list salt k expiration-handler k-timer)
-          (unless peek?
-            (increment-timer! k-timer
-                              continuation-timer-length))
-          (if (or (not (eq? salt a-salt))
-                  (not k)
-                  (and (custodian-box? k)
-                       (not (custodian-box-value k))))
-            (raise (make-exn:fail:servlet-manager:no-continuation
-                    (format "No continuation for id: ~a" a-k-id)
-                    (current-continuation-marks)
-                    (if expiration-handler
-                      expiration-handler
-                      instance-expiration-handler)))
-            k)])]))
-  (define (continuation-lookup instance-id a-k-id a-salt)
-    (continuation-lookup* instance-id a-k-id a-salt #f))
-  (define (continuation-peek instance-id a-k-id a-salt)
-    (continuation-lookup* instance-id a-k-id a-salt #t))
-
-  (make-timeout-manager create-instance
-                        adjust-timeout!
-                        clear-continuations!
-                        continuation-store!
-                        continuation-lookup
-                        continuation-peek
-                                        ; Specific
-                        instance-expiration-handler
-                        instance-timer-length
-                        continuation-timer-length
-                                        ; Private
-                        instances
-                        next-instance-id))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/page.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/page.rkt
deleted file mode 100644
index 7b3f9b10a5..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/page.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require "page/page.rkt")
-(provide (all-from-out "page/page.rkt"))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/page/page.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/page/page.rkt
deleted file mode 100644
index 245a2e7d75..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/page/page.rkt
+++ /dev/null
@@ -1,81 +0,0 @@
-#lang racket/base
-(require web-server/servlet
-         racket/stxparam
-         racket/list
-         racket/contract
-         (for-syntax racket/base))
-
-(define-syntax-parameter embed/url
-  (λ (stx) (raise-syntax-error stx 'embed/url "Used outside page")))
-
-(define-syntax-rule (page e ...)
-  (send/suspend/dispatch
-   (λ (this-embed/url)
-     (syntax-parameterize ([embed/url (make-rename-transformer #'this-embed/url)])
-                          e ...))))
-
-(define current-request (make-parameter #f))
-
-(define-syntax-rule (lambda/page formals e ...)
-  (lambda (req . formals)
-    (parameterize ([current-request req])
-      (page e ...))))
-
-(define-syntax-rule (define/page (id . formals) e ...)
-  (define id
-    (lambda/page formals e ...)))
-
-(define binding-id/c (or/c bytes? string? symbol?))
-(define (binding-id->bytes id)
-  (cond [(bytes? id)
-         id]
-        [(string? id)
-         (string->bytes/utf-8 id)]
-        [(symbol? id)
-         (binding-id->bytes (symbol->string id))]))
-
-(define binding-format/c (symbols 'string 'bytes 'file 'binding))
-(define (convert-binding format b)
-  (case format
-    [(string)
-     (and (binding:form? b)
-          (with-handlers ([exn:fail? (λ (x) #f)])
-            (bytes->string/utf-8 (binding:form-value b))))]
-    [(bytes)
-     (and (binding:form? b)
-          (binding:form-value b))]
-    [(file)
-     (and (binding:file? b)
-          (binding:file-content b))]
-    [(binding)
-     b]))
-          
-(define (get-binding id [req (current-request)]
-                     #:format [format 'string])
-  (convert-binding
-   format
-   (bindings-assq 
-    (binding-id->bytes id) 
-    (request-bindings/raw req))))
-
-(define (get-bindings id [req (current-request)]
-                      #:format [format 'string])
-  (define id-bs (binding-id->bytes id))
-  (filter-map
-   (λ (b)
-     (and (bytes=? id-bs (binding-id b))
-          (convert-binding format b)))
-   (request-bindings/raw req)))
-
-(provide embed/url
-         page
-         lambda/page
-         define/page)
-(provide/contract
- [current-request (parameter/c (or/c false/c request?))]
- [binding-id/c contract?]
- [binding-format/c contract?]
- [get-binding (->* (binding-id/c) (request? #:format binding-format/c)
-                   (or/c false/c string? bytes? binding?))]
- [get-bindings (->* (binding-id/c) (request? #:format binding-format/c)
-                    (listof (or/c string? bytes? binding?)))])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/cache-table.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/cache-table.rkt
deleted file mode 100644
index cd6350c281..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/cache-table.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang racket/base
-(require racket/contract)
-
-(define-struct cache-table (hash semaphore) #:mutable)
-
-(define (new-cache-table)
-  ; Only eq? tables are not locked
-  (make-cache-table (make-hasheq)
-                    (make-semaphore 1)))
-
-(define (cache-table-clear! ct)
-  (call-with-semaphore
-   (cache-table-semaphore ct)
-   (lambda ()
-     (set-cache-table-hash! ct (make-hasheq)))))
-
-(define (cache-table-lookup! ct entry-id entry-thunk)
-  (define ht (cache-table-hash ct))
-  (define sema (cache-table-semaphore ct))
-  ; Fast lookup
-  (hash-ref
-   ht entry-id
-   (lambda ()
-     ; Now lock for relookup and computation
-     (call-with-semaphore
-      sema
-      (lambda ()
-        (hash-ref! ht entry-id entry-thunk))))))
-
-(provide/contract
- [rename new-cache-table make-cache-table
-         (-> cache-table?)]
- [cache-table-lookup! (cache-table? symbol? (-> any/c) . -> . any/c)]
- [cache-table-clear! (cache-table? . -> . void?)]
- [cache-table? (any/c . -> . boolean?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/configure.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/configure.rkt
deleted file mode 100644
index 210a53f68b..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/configure.rkt
+++ /dev/null
@@ -1,834 +0,0 @@
-#lang racket/base
-(require web-server/servlet
-         net/url
-         mzlib/etc
-         (except-in racket/list
-                    drop)
-         racket/pretty
-         (only-in racket/file
-                  make-directory*)
-         web-server/configuration/configuration-table-structs
-         web-server/configuration/configuration-table
-         web-server/private/util
-         racket/runtime-path)
-
-(define-runtime-path default-web-root
-  "../default-web-root")
-
-(provide
- interface-version timeout
- start)
-
-(define timeout (* 12 60 60))
-(define interface-version 'v1)
-
-;; FIX
-; - fuss with changing absolute paths into relative ones internally
-; - move old config files instead of copying default ones
-;   - ask: - move exisiting (don't move defaults)
-;          - copy defaults to new location
-;          - use files existing in the new location (ask only when they exist)
-;   - do this when either
-;     - changing the root dir (and at least one other file depends on it?)
-;     - editing an individual path
-; - change all configuration paths (in the configure servlet and in the server) to
-;   use a platform independent representation (i.e. a listof strings)
-
-; to convert a platform dependent path into a listof path parts such that
-; (forall x (equal? (path->list x) (path->list (apply build-path (path->list x)))))
-(define (path->list p)
-  (let loop ([p p] [acc null])
-    (let-values ([(base name must-be-dir?) (split-path p)])
-      (let ([new-acc (cons name acc)])
-        (cond
-          [(string? base) (loop base new-acc)]
-          [else ; conflate 'relative and #f
-           new-acc])))))
-
-; build-suspender : (listof html) (listof html) [(listof (cons sym str))] [(listof (cons sym str))] -> str -> response
-(define build-suspender
-  (opt-lambda (title content [body-attributes '([bgcolor "white"])] [head-attributes null])
-    (lambda (k-url)
-      (response/xexpr
-       `(html (head ,head-attributes
-                    (meta ([http-equiv "Pragma"] [content "no-cache"])) ; don't cache in netscape
-                    (meta ([http-equiv "Expires"] [content "-1"])) ; don't cache in IE
-                    ; one site said to use -1, another said to use 0.
-                    (title . ,title))
-              (body ,body-attributes
-                    (form ([action ,k-url] [method "post"])
-                          ,@content)))))))
-
-; write-to-file : str TST -> void
-(define (write-to-file file-name x)
-  (call-with-output-file file-name
-    (lambda (out) (pretty-write x out))
-    #:exists 'truncate))
-
-(define default-configuration-path default-configuration-table-path)
-(define (set-config-path! new)
-  (set! default-configuration-path new))
-
-(define CONFIGURE-SERVLET-NAME "configure.rkt")
-(define WIDE "70")
-
-; passwords = (listof realm)
-; realm = (make-realm str str (listof user-pass))
-(define-struct realm (name pattern allowed))
-
-; user-pass = (make-user-pass sym str)
-(define-struct user-pass (user pass))
-
-(define doc-dir "Defaults/documentation")
-
-(define edit-host-button-name "Edit Minor Details")
-
-; build-footer : str -> html
-(define (build-footer base)
-  (let ([scale (lambda (n) (number->string (round (/ n 4))))])
-    `(p "Powered by "
-        (a ([href "http://racket-lang.org/"]) "Racket"))))
-
-(define footer (build-footer "/"))
-
-; access-error-page : html
-(define access-error-page
-  (response/xexpr
-   `(html (head (title "Web Server Configuration Access Error"))
-          (body ([bgcolor "white"])
-                (p "You must connect to the configuration tool from the machine the server runs on using 127.0.0.1 for the host part of the URL.")
-                ,footer))))
-
-; permission-error-page : path -> html
-(define (permission-error-page configuration-path)
-  (response/xexpr
-   `(html (head (title "Web Server Configuration Permissions Error"))
-          (body ([bgcolor "white"])
-                (p "You must have read and write access to "
-                   (code ,(path->string configuration-path))
-                   " in order to configure the server.")))))
-
-; check-ip-address : request -> request
-(define (check-ip-address request)
-  (unless (string=? "127.0.0.1" (request-host-ip request))
-    (send/finish access-error-page))
-  request)
-
-(define web-base (directory-part default-configuration-path))
-
-; interact : (str -> response) -> bindings
-(define (interact page)
-  (request-bindings (check-ip-address (send/suspend page))))
-
-; choose-configuration-file : -> doesn't
-(define (choose-configuration-file)
-  (let ([configuration-path (ask-for-configuration-path)])
-    (let loop ()
-      (if (file-exists? configuration-path)
-          (let ([perms (file-or-directory-permissions configuration-path)])
-            ; race condition - changing the permissions after the check
-            ; will result in an exception later (which serves them right)
-            (if (and (memq 'write perms) (memq 'read perms))
-                (configure-top-level configuration-path)
-                (send/finish (permission-error-page configuration-path))))
-          (begin (send/suspend (copy-configuration-file configuration-path))
-                 (with-handlers ([exn:fail:filesystem:exists? send-exn])
-                   (let-values ([(base name must-be-dir) (split-path configuration-path)])
-                     (ensure-directory-shallow base))
-                   (copy-file default-configuration-path configuration-path))
-                 (loop))))))
-
-; copy-configuration-file : path -> html
-(define (copy-configuration-file configuration-path)
-  (build-suspender
-   '("Copy Configuration File")
-   `((h1 "Copy Configuration File")
-     (p "The configuration file "
-        (blockquote (code ,(path->string configuration-path)))
-        "does not exist.  Would you like to copy the default configuration to this "
-        "location?")
-     (center (input ([type "submit"] [name "ok"] [value "Copy"]))))))
-
-; ask-for-configuration-path : -> path
-(define (ask-for-configuration-path)
-  (build-path
-   (extract-binding/single
-    'path
-    (request-bindings (send/suspend configuration-path-page)))))
-
-; configuration-path-page : str -> html
-(define configuration-path-page
-  (build-suspender
-   '("Choose a Configuration File")
-   `((h1 "Choose a Web Server Configuration File")
-     (p "Choose a Web server configuration file to edit. "
-        (br)
-        "This Web server uses the configuration in "
-        (blockquote (code ,(path->string default-configuration-path))))
-     (table (tr (th "Configuration path")
-                (td (input ([type "text"] [name "path"] [size ,WIDE]
-                                          [value ,(path->string default-configuration-path)]))))
-            (tr (td ([colspan "2"] [align "center"])
-                    (input ([type "submit"] [name "choose-path"] [value "Select"]))))))))
-
-; configure-top-level : path -> doesn't
-(define (configure-top-level configuration-path)
-  (with-handlers ([exn:fail:filesystem:exists? send-exn])
-    (let ([original-configuration (read-configuration configuration-path)])
-      (let loop ([configuration original-configuration])
-        (let* ([update-bindings (interact (request-new-configuration-table configuration original-configuration))]
-               [form-configuration
-                (delete-hosts (update-table configuration update-bindings)
-                              (foldr (lambda (b acc)
-                                       (if (string=? "Delete" (cdr b))
-                                           (cons (symbol->string (car b)) acc)
-                                           acc))
-                                     null
-                                     update-bindings))]
-               [new-configuration
-                (cond
-                  [(assq 'add-host update-bindings)
-                   (add-virtual-host form-configuration (extract-bindings 'host-prefixes update-bindings))]
-                  [(reverse-assoc edit-host-button-name update-bindings)
-                   =>
-                   (lambda (edit)
-                     ; write the configuration twice when editing a host: once before and once after.
-                     ; The after may never happen if the user doesn't continue
-                     (write-configuration form-configuration configuration-path)
-                     (configure-hosts form-configuration (string->number (symbol->string (car edit)))))]
-                  [else form-configuration])])
-          (write-configuration new-configuration configuration-path)
-          (loop new-configuration))))))
-
-; switch-to-current-port : configuration-table -> (U #f configuration-table)
-; doesn't work - the browser doesn't send the port and it wouldn't be reliable anyway
-; perhaps the server could include it?
-#;(define (switch-to-current-port old)
-    (let ([current-port (url-port (request-uri initial-request))])
-      (and (not (= current-port (configuration-table-port old)))
-           (make-configuration-table
-            current-port
-            (configuration-table-max-waiting old)
-            (configuration-table-initial-connection-timeout old)
-            (configuration-table-default-host old)
-            (configuration-table-virtual-hosts old)))))
-
-; send-exn : tst -> doesn't
-(define (send-exn exn)
-  (send/back (exception-error-page exn)))
-
-; reverse-assoc : a (listof (cons b a)) -> (U #f (cons b a))
-(define (reverse-assoc x lst)
-  (cond
-    [(null? lst) #f]
-    [else (if (equal? x (cdar lst))
-              (car lst)
-              (reverse-assoc x (cdr lst)))]))
-
-; add-virtual-host : configuration-table (listof str) -> configuration-table
-(define (add-virtual-host conf existing-prefixes)
-  (update-hosts conf (cons (cons "my-host.my-domain.org"
-                                 (configuration-table-default-host conf))
-                           (configuration-table-virtual-hosts conf))))
-
-; update-hosts : configuration-table (listof (cons str host-table))
-(define (update-hosts conf new-hosts)
-  (make-configuration-table
-   (configuration-table-port conf)
-   (configuration-table-max-waiting conf)
-   (configuration-table-initial-connection-timeout conf)
-   (configuration-table-default-host conf)
-   new-hosts))
-
-; delete-hosts : configuration-table (listof str) -> configuration-table
-; pre: (>= (length (configuration-table-virtual-hosts conf)) (max to-delete))
-(define (delete-hosts conf to-delete)
-  ; the if is not needed, it just avoids some work
-  (if (null? to-delete)
-      conf
-      (update-hosts
-       conf
-       (drop (configuration-table-virtual-hosts conf) to-delete))))
-
-; drop : (listof a) (listof str) -> (listof a)
-; pre: (apply < to-delete)
-; to delete the entries in to-filter indexed by to-delete
-(define (drop to-filter to-delete)
-  (let loop ([to-filter to-filter] [to-delete (map string->number to-delete)] [i 0])
-    (cond
-      [(null? to-delete) to-filter]
-      [else (if (= i (car to-delete))
-                (loop (cdr to-filter) (cdr to-delete) (add1 i))
-                (cons (car to-filter) (loop (cdr to-filter) to-delete (add1 i))))])))
-
-; configure-hosts : configuration-table (U #f nat) -> configuration-table
-; n is either the virtual host number or #f for the default virtual host
-(define (configure-hosts old n)
-  (if n
-      (update-hosts old
-                    ; more here - consider restructuring this map.  Perhaps it is fine.
-                    ; Perhaps it should short circuit.  Perhaps the number of virtual hosts
-                    ; is small so it doesn't matter. Perhaps that is a sloppy way to think/program.
-                    ; The code is really a functional array update except it's on a list.
-                    (map (lambda (host this-n)
-                           (if (= n this-n)
-                               (cons (car host) (configure-host (cdr host)))
-                               host))
-                         (configuration-table-virtual-hosts old)
-                         (build-list (length (configuration-table-virtual-hosts old)) (lambda (x) x))))
-      (make-configuration-table
-       (configuration-table-port old)
-       (configuration-table-max-waiting old)
-       (configuration-table-initial-connection-timeout old)
-       (configure-host (configuration-table-default-host old))
-       (configuration-table-virtual-hosts old))))
-
-; configure-host : host-table -> host-table
-(define (configure-host old)
-  (let* ([bindings (interact (request-new-host-table old))]
-         [new (update-host-table old bindings)])
-    (when (assq 'edit-passwords bindings)
-      (let* ([paths (host-table-paths new)]
-             [password-path
-              ;; build-path-unless-absolute is defined in configuration
-              (build-path-unless-absolute
-               (build-path-unless-absolute web-base (paths-host-base paths))
-               (paths-passwords paths))])
-        (unless (file-exists? password-path)
-          (write-to-file password-path ''()))
-        (configure-passwords password-path)))
-    new))
-
-(define restart-message
-  `((h3 (font ([color "red"]) "Restart the Web server to use the new settings."))))
-
-; request-new-configuration-table : configuration-table configuration-table -> str -> html
-(define (request-new-configuration-table old orig)
-  (build-suspender
-   '("Racket Web Server Configuration")
-   `((h1 "Racket Web Server Configuration Management")
-     "copyright 2001 by Paul Graunke and PLT"
-     (hr)
-     (h2 "Basic Configuration")
-     (table
-      ,(make-tr-num "Port" 'port (configuration-table-port old))
-      ,(make-tr-num "Maximum Waiting Connections"
-                    'waiting (configuration-table-max-waiting old))
-      ,(make-tr-num "Initial Connection Timeout (seconds)" 'time-initial
-                    (configuration-table-initial-connection-timeout old)))
-     (hr)
-     (h2 "Host Name Configuration")
-     (p "The Web server accepts requests on behalf of multiple " (em "hosts")
-        " each corresponding to a domain name."
-        " The table below maps domain names to host specific configurations.")
-     (table ([width "50%"])
-            (tr (th ([align "left"]) "Name") ;(th "Host configuration path")
-                (th "Host Directory")
-                (th nbsp)
-                (th nbsp))
-            (tr (td ,"Default Host")
-                (td ,(make-field-size "text" 'default-host-root
-                                      (table->host-root (configuration-table-default-host old))
-                                      WIDE))
-                (td ([align "center"])
-                    (input ([type "submit"] [name "default"] [value ,edit-host-button-name])))
-                (td nbsp))
-            ,@(map (lambda (host n)
-                     `(tr (td ,(make-field "text" 'host-regexps (car host)))
-                          (td ,(make-field-size "text" 'host-roots (table->host-root (cdr host)) WIDE))
-                          (td ([align "center"])
-                              (input ([type "submit"] [name ,n] [value ,edit-host-button-name])))
-                          (td ([align "center"])
-                              (input ([type "submit"] [name ,n] [value "Delete"])))))
-                   (configuration-table-virtual-hosts old)
-                   (build-list (length (configuration-table-virtual-hosts old)) number->string))
-            (tr (td (input ([type "submit"] [name "add-host"] [value "Add Host"])))
-                (td nbsp); (input ([type "submit"] [name "configure"] [value "Delete"]))
-                ;(td (input ([type "submit"] [name "edit-host-details"] [value "Edit"])))
-                (td nbsp)))
-     (hr)
-     (table ([width "90%"])
-            ,@(if (equal? old orig) ; This only tests eq? because structures are more opaque now.
-                  null
-                  `((tr (td ,@restart-message))))
-            (tr (td (input ([type "submit"] [name "configure"] [value "Update Configuration"])))))
-     (hr)
-     ,footer)))
-
-; table->host-root : host-table -> str
-(define (table->host-root t)
-  (path->string (build-path-unless-absolute web-base (paths-host-base (host-table-paths t)))))
-
-; gen-make-tr : nat -> xexpr sym str [xexpr ...] -> xexpr
-(define (gen-make-tr size-n)
-  (let ([size-str (number->string size-n)])
-    (lambda (label tag default-text . extra-tds)
-      `(tr (td (a ([href ,(format "/~a/terms/~a.html" doc-dir tag)]) ,label))
-           (td ,(make-field-size "text" tag (format "~a" default-text) size-str))
-           . ,extra-tds))))
-
-(define make-tr-num (gen-make-tr 20))
-
-(define make-tr-str (gen-make-tr 70))
-
-; make-field : str sym str -> xexpr
-(define (make-field type label value)
-  (make-field-size type label value "30"))
-
-; make-field-size : str sym str str -> xexpr
-(define (make-field-size type label value size)
-  `(input ([type ,type] [name ,(symbol->string label)] [value ,value] [size ,size])))
-
-; update-table : configuration-table bindings -> configuration-table
-(define (update-table old bindings)
-  (let ([ubp (un-build-path web-base)]) ;; web-base returned by directory-part is a path
-    (make-configuration-table
-     (string->nat (extract-binding/single 'port bindings))
-     (string->nat (extract-binding/single 'waiting bindings))
-     (string->num (extract-binding/single 'time-initial bindings))
-     (update-host-root (configuration-table-default-host old)
-                       (ubp (build-path (extract-binding/single 'default-host-root bindings))))
-     (map (lambda (h root pattern)
-            (cons pattern (update-host-root (cdr h) (ubp (build-path root)))))
-          (configuration-table-virtual-hosts old)
-          (extract-bindings 'host-roots bindings)
-          (extract-bindings 'host-regexps bindings)))))
-
-; update-host-root : host-table str -> host-table
-(define (update-host-root host new-root)
-  (host-table<-paths host (paths<-host-base (host-table-paths host) new-root)))
-
-; host-table<-paths : host-table paths -> host-table
-; more here - create these silly functions automatically from def-struct macro
-(define (host-table<-paths host paths)
-  (make-host-table
-   (host-table-indices host)
-   (host-table-log-format host)
-   (host-table-messages host)
-   (host-table-timeouts host)
-   paths))
-
-; paths<-host-base : paths str -> paths
-; more here - create these silly functions automatically from def-struct macro
-(define (paths<-host-base paths host-base)
-  (make-paths (paths-conf paths)
-              host-base
-              (paths-log paths)
-              (paths-htdocs paths)
-              (paths-servlet paths)
-              (paths-mime-types paths)
-              (paths-passwords paths)))
-
-; string->num : str -> nat
-(define (string->num str)
-  (or (string->number str) (error 'string->nat "~s is not a number" str)))
-
-; string->nat : str -> nat
-(define (string->nat str)
-  (let ([n (string->number str)])
-    (if (and n (integer? n) (exact? n) (>= n 0))
-        n
-        (error 'string->nat "~s is not exactly a natural number" str))))
-
-; request-new-host-table : host-table -> str -> response
-(define (request-new-host-table old)
-  (let* ([timeouts (host-table-timeouts old)]
-         [paths (host-table-paths old)]
-         [m (host-table-messages old)]
-         [host-root (build-path-unless-absolute web-base (paths-host-base paths))]
-         [conf (build-path-unless-absolute host-root (paths-conf paths))])
-    (build-suspender
-     '("Configure Host")
-     `((h1 "Racket Web Server Host configuration")
-       (input ([type "submit"] [value "Save Configuration"]))
-       (hr)
-       (table
-        (tr (th ([colspan "2"]) "Paths"))
-        ,(make-tr-str "Log file"
-                      'path-log (build-path-unless-absolute host-root (paths-log paths)))
-        ,(make-tr-str "Web document root"
-                      'path-htdocs (build-path-unless-absolute host-root (paths-htdocs paths)))
-        ,(make-tr-str "Servlet root"
-                      'path-servlet (build-path-unless-absolute host-root (paths-servlet paths)))
-        ,(make-tr-str "MIME Types"
-                      'path-mime-types (build-path-unless-absolute host-root (paths-mime-types paths)))
-        ,(make-tr-str "Password File"
-                      'path-password (build-path-unless-absolute host-root (paths-passwords paths)))
-        (tr (td ([colspan "2"])
-                ,(make-field "submit" 'edit-passwords "Edit Passwords")))
-        (tr (td ([colspan "2"]) (hr)))
-        (tr (th ([colspan "2"]) "Message Paths"))
-        ,(make-tr-str "Servlet error" 'path-servlet-message
-                      (build-path-unless-absolute conf (messages-servlet m)))
-        ,(make-tr-str "Access Denied" 'path-access-message
-                      (build-path-unless-absolute conf (messages-authentication m)))
-        ,(make-tr-str "Servlet cache refreshed" 'servlet-refresh-message
-                      (build-path-unless-absolute conf (messages-servlets-refreshed m)))
-        ,(make-tr-str "Password cache refreshed" 'password-refresh-message
-                      (build-path-unless-absolute conf (messages-passwords-refreshed m)))
-        ,(make-tr-str "File not found" 'path-not-found-message
-                      (build-path-unless-absolute conf (messages-file-not-found m)))
-        ,(make-tr-str "Protocol error" 'path-protocol-message
-                      (build-path-unless-absolute conf (messages-protocol m)))
-        ,(make-tr-str "Collect garbage" 'path-collect-garbage-message
-                      (build-path-unless-absolute conf (messages-collect-garbage m)))
-        (tr (td ([colspan "2"]) (hr)))
-        (tr (th ([colspan "2"]) "Timeout Seconds"))
-        ,(make-tr-num "Default Servlet" 'time-default-servlet (timeouts-default-servlet timeouts))
-        ,(make-tr-num "Password" 'time-password (timeouts-password timeouts))
-        ,(make-tr-num "Servlet Connection" 'time-servlet-connection (timeouts-servlet-connection timeouts))
-        ,(make-tr-num "per Byte When Transfering Files" 'time-file-per-byte (timeouts-file-per-byte timeouts))
-        ,(make-tr-num "Base When Transfering Files" 'time-file-base (timeouts-file-base timeouts)))
-       (hr)
-       (input ([type "submit"] [value "Save Configuration"]))
-       ,footer))))
-
-; update-host-table : host-table (listof (cons sym str)) -> host-table
-(define (update-host-table old bindings)
-  (let* ([eb (lambda (tag) (build-path (extract-binding/single tag bindings)))]
-         [paths (host-table-paths old)]
-         [host-root (paths-host-base paths)]
-         [expanded-host-root (build-path-unless-absolute web-base host-root)]
-         [conf (build-path-unless-absolute expanded-host-root (paths-conf paths))]
-         [ubp (un-build-path expanded-host-root)]
-         [eb-host-root (lambda (tag) (ubp (eb tag)))]
-         [ubp-conf (un-build-path conf)]
-         [eb-conf (lambda (tag) (ubp-conf (eb tag)))])
-    (make-host-table
-     (host-table-indices old)
-     (host-table-log-format old)
-     (apply make-messages
-            (map eb-conf '(path-servlet-message path-access-message servlet-refresh-message password-refresh-message path-not-found-message path-protocol-message path-collect-garbage-message)))
-     (apply make-timeouts
-            (map (lambda (tag) (string->number (extract-binding/single tag bindings)))
-                 '(time-default-servlet time-password time-servlet-connection time-file-per-byte time-file-base)))
-     (let ([old-paths (host-table-paths old)])
-       (apply make-paths
-              (paths-conf old-paths)
-              ((un-build-path web-base)
-               (build-path (paths-host-base old-paths)))
-              (map eb-host-root '(path-log path-htdocs path-servlet path-mime-types path-password)))))))
-
-; un-build-path : path -> path -> string
-; (GregP) Theory: this should return a string not a path so that the result can be
-;                 written to the configuration file.
-(define (un-build-path possible-base)
-  (let ([base-list (path->list possible-base)])
-    (lambda (path)
-      (let ([path-list (path->list path)])
-        (cond
-          [(suffix base-list path-list)
-           => (lambda (x) (path->string (apply build-path x)))]
-          [else
-           (path->string path)])))))
-
-; suffix : (listof a) (listof a) -> (U #f (listof a))
-; to return the extra elements in b after removing all elements from a in order
-(define (suffix a b)
-  (cond
-    [(null? a) (if (null? b) #f b)]
-    [else (cond
-            [(null? b) #f]
-            [else (and (equal? (car a) (car b))
-                       (suffix (cdr a) (cdr b)))])]))
-
-; Password Configuration
-
-; configure-passwords : path -> void
-(define (configure-passwords password-path)
-  (edit-passwords
-   password-path
-   (if (file-exists? password-path)
-       (call-with-input-file password-path read-passwords)
-       null)))
-
-; edit-passwords : path passwords -> passwords
-(define (edit-passwords which-one passwords)
-  (let* ([bindings (interact (password-updates which-one passwords))]
-         [to-deactivate (extract-bindings 'deactivate bindings)]
-         [again
-          (lambda (new-passwords)
-            (write-to-file which-one (format-passwords new-passwords))
-            (edit-passwords which-one new-passwords))])
-    (cond
-      [(assq 'edit bindings)
-       => (lambda (edit)
-            (again (drop (map (let ([to-edit (string->number (cdr edit))])
-                                (lambda (r n)
-                                  (if (= to-edit n)
-                                      (edit-realm r)
-                                      r)))
-                              passwords
-                              (build-list (length passwords) (lambda (x) x)))
-                         to-deactivate)))]
-      [(assq 'add bindings)
-       (again (cons (make-realm "new realm" "" null)
-                    (drop passwords to-deactivate)))]
-      [else (drop passwords to-deactivate)])))
-
-; password-updates : path passwords -> request
-(define (password-updates which-one passwords)
-  (let ([which-one (path->string which-one)])
-    (build-suspender
-     `("Updating Passwords for " ,which-one)
-     `((h1 "Updating Passwords for ")
-       (h3 ,which-one)
-       (h2 "You may wish to " (font ([color "red"]) "backup") " this password file.")
-       (p "Each authentication " (em "realm") " password protects URLs that match a pattern. "
-          "Choose a realm to edit below:")
-       (table
-        (tr (th "Realm Name") (th "Delete") (th "Edit"))
-        . ,(map (lambda (realm n)
-                  `(tr (td ,(realm-name realm))
-                       (td ,(make-field "checkbox" 'deactivate n))
-                       (td ,(make-field "radio" 'edit n))))
-                passwords
-                (build-list (length passwords) number->string)))
-       ,(make-field "submit" 'add "Add Realm")
-       ,(make-field "submit" 'edit-button "Edit")
-       ,footer))))
-
-; edit-realm : realm -> realm
-(define (edit-realm realm)
-  (let* ([bindings (interact (realm-updates realm))]
-         [new-name (extract-binding/single 'realm-name bindings)]
-         [new-pattern (extract-binding/single 'realm-pattern bindings)]
-         [new-allowed
-          (drop (map (lambda (u p) (make-user-pass (string->symbol u) p))
-                     (extract-bindings 'user bindings)
-                     (extract-bindings 'pass bindings))
-                (extract-bindings 'deactivate bindings))])
-    ; more here - check something?  Everything is a string or symbol, though.
-    (cond
-      [(assq 'add-user bindings)
-       (edit-realm (make-realm new-name new-pattern
-                               (cons (make-user-pass 'ptg "Racket-is-cool!") new-allowed)))]
-      [(assq 'update bindings)
-       (make-realm new-name new-pattern new-allowed)]
-      [else (error 'edit-realm "Didn't find either 'add-user or 'update in ~s" bindings)])))
-
-; realm-updates : realm -> request
-(define (realm-updates realm)
-  (build-suspender
-   `("Update Authentication Realm " ,(realm-name realm))
-   `((h1 "Update Authentication Realm")
-     (table
-      ,(make-tr-str "Realm Name" 'realm-name (realm-name realm))
-      ,(make-tr-str "Protected URL Path Pattern" 'realm-pattern (realm-pattern realm)))
-     (hr)
-     (table
-      (tr (th "User Name") (th "Password") (th "Delete"))
-      . ,(map (lambda (x n)
-                `(tr (td ,(make-field "text" 'user (symbol->string (user-pass-user x))))
-                     (td ,(make-field "text" 'pass (user-pass-pass x)))
-                     (td ,(make-field "checkbox" 'deactivate n))))
-              (realm-allowed realm)
-              (build-list (length (realm-allowed realm)) number->string)))
-     (input ([type "submit"] [name "add-user"] [value "Add User"]))
-     (input ([type "submit"] [name "update"] [value "Update Realm"]))
-     ,footer)))
-
-; read-passwords : iport -> passwords
-; only works if the file starts with (quote ...)
-(define (read-passwords in)
-  (let ([raw (read in)])
-    (unless (and (pair? raw) (eq? 'quote (car raw))
-                 (null? (cddr raw)))
-      (error 'read-passwords "The password file must be quoted to use the configuration tool."))
-    (map (lambda (raw-realm)
-           ; more here - error checking
-           (make-realm (car raw-realm)
-                       (cadr raw-realm)
-                       (map (lambda (x) (make-user-pass (car x) (cadr x)))
-                            (cddr raw-realm))))
-         (cadr raw))))
-
-; format-passwords : passwords -> s-expr
-(define (format-passwords passwords)
-  (list 'quote
-        (map (lambda (r)
-               (list* (realm-name r)
-                      (realm-pattern r)
-                      (map (lambda (x)
-                             (list (user-pass-user x) (user-pass-pass x)))
-                           (realm-allowed r))))
-             passwords)))
-
-; Little Helpers
-
-; initialization-error-page : request -> response
-(define (initialization-error-page initial-request)
-  (response/xexpr
-   `(html (head (title "Web Server Configuration Program Invocation Error"))
-          (body ([bgcolor "white"])
-                (p "Please direct your browser directly to the "
-                   (a ([href ,(url->string (request-uri initial-request))]) "configuration program,")
-                   " not through another URL.")
-                ,footer))))
-
-; done-page : html
-(define done-page
-  (response/xexpr
-   ; more-here - consider adding more useful information
-   `(html (head (title "done"))
-          (body ([bgcolor "white"])
-                (h2 "Configuration Saved.")
-                (p "Click your browser's back button to continue configuring the server.")
-                ,footer))))
-
-; exception-error-page : TST -> html
-(define (exception-error-page exn)
-  (response/xexpr
-   `(html (head (title "Error"))
-          (body ([bgcolor "white"])
-                (p "Servlet exception: "
-                   (pre ,(exn->string exn)))
-                ,footer))))
-
-(define must-select-host-page
-  (response/xexpr
-   `(html (head (title "Web Server Configuration Error"))
-          (body ([bgcolor "white"])
-                (p "Please select which host to edit before clicking the Edit button.")
-                ,footer))))
-
-; io
-
-; read-configuration : path -> configuration-table
-(define (read-configuration configuration-path)
-  (sexpr->configuration-table (call-with-input-file configuration-path read)))
-
-; write-configuration : configuration-table path -> void
-; writes out the new configuration file and
-; also copies the configure servlet to the default-host's servlet directory
-(define (write-configuration new configuration-path)
-  (ensure-configuration-servlet configuration-path (configuration-table-default-host new))
-  (ensure-configuration-paths new)
-  (write-configuration-table new configuration-path))
-
-; ensure-configuration-servlet : path host-table -> void
-(define (ensure-configuration-servlet configuration-path host)
-  (let* ([paths (host-table-paths host)]
-         [root (build-path-unless-absolute web-base
-                                           (paths-host-base paths))]
-         [servlets-path
-          (build-path (build-path-unless-absolute root (paths-servlet paths)) "servlets")])
-    (ensure-config-servlet configuration-path servlets-path)
-    (let ([defaults (build-path "Defaults")])
-      (ensure* (build-path default-web-root "htdocs")
-               (build-path-unless-absolute root (paths-htdocs paths))
-               defaults))))
-
-; ensure-configuration-paths : configuration-table -> void
-; to ensure that all the referenced config files exist for an entire configuration
-(define (ensure-configuration-paths configuration)
-  (ensure-host-configuration (configuration-table-default-host configuration))
-  (for-each (lambda (x) (ensure-host-configuration (cdr x)))
-            (configuration-table-virtual-hosts configuration)))
-
-; ensure-host-configuration : host-table -> void
-; to ensure that all the referenced config files exist for a virtual host
-(define (ensure-host-configuration host)
-  (let* ([paths (host-table-paths host)]
-         [host-base (build-path-unless-absolute web-base (paths-host-base paths))]
-         [conf (build-path-unless-absolute host-base (paths-conf paths))]
-         [log (build-path-unless-absolute host-base (paths-log paths))])
-    ; skip passwords since a missing file is an okay default
-    (ensure-directory-shallow conf)
-    (ensure-directory-shallow host-base)
-    ;(ensure-file log ...) ; empty log file is okay
-    (ensure-directory-shallow (build-path-unless-absolute host-base (paths-htdocs paths)))
-    (ensure-directory-shallow (build-path-unless-absolute host-base (paths-servlet paths)))
-    (let* ([messages (host-table-messages host)]
-           ; more here maybe - check default config file instead? maybe not
-           [from-conf (build-path default-web-root "conf")]
-           [copy-conf
-            (lambda (from to)
-              (let ([to-path (build-path-unless-absolute conf to)])
-                ; more here - check existence of from path
-                (copy-file* (build-path from-conf from) to-path)))])
-      (copy-conf "passwords-refresh.html" (messages-passwords-refreshed messages))
-      (copy-conf "servlet-refresh.html" (messages-servlets-refreshed messages))
-      (copy-conf "forbidden.html" (messages-authentication messages))
-      (copy-conf "protocol-error.html" (messages-protocol messages))
-      (copy-conf "not-found.html" (messages-file-not-found messages))
-      (copy-conf "servlet-error.html" (messages-servlet messages))
-      (copy-conf "collect-garbage.html" (messages-collect-garbage messages)))))
-
-; ensure-file : path path path -> void
-; to copy (build-path from name) to (build-path to name), creating directories as
-; needed if the latter does not already exist.
-(define (ensure-file from to name)
-  (let ([to (simplify-path to)])
-    (ensure-directory-shallow to)
-    (let ([to-path (build-path to name)])
-      (unless (file-exists? to-path)
-        (copy-file (build-path from name) to-path)))))
-
-; copy-file* : str str -> void
-(define (copy-file* from-path to-path)
-  (unless (file-exists? to-path)
-    (let-values ([(to-path-base to-path-name must-be-dir?) (split-path to-path)])
-      (ensure-directory-shallow to-path-base))
-    (copy-file from-path to-path)))
-
-; ensure* : path path path -> void
-;; GregP: Don't know what the heck this does (thanks Paul)
-;;        but the first two arguments are now paths.
-(define (ensure* from to name)
-  (ensure-directory-shallow to)
-  (let ([p (build-path from name)])
-    (cond
-      [(directory-exists? p)
-       (unless (regexp-match? #rx"^(?:[.](?:git.*|svn)|CVS)$" (path->string name)) ; yuck
-         (let ([dest (build-path to name)])
-           (ensure-directory-shallow dest)
-           (for-each (lambda (x) (ensure* p dest x))
-                     (directory-list p))))]
-      [(file-exists? p)
-       (ensure-file from to name)])))
-
-; ensure-directory-shallow : path -> void
-(define (ensure-directory-shallow to)
-  (unless (directory-exists? to)
-    ; race condition - someone else could make the directory
-    (make-directory* to)))
-
-; ensure-config-servlet : str path -> void
-; to create, if necessary, a stub configuration servlet that includes the main configuration servlet
-; at the desired location in a new web tree
-(define (ensure-config-servlet configuration-path servlets-path)
-  (ensure-directory-shallow servlets-path)
-  (let ([file-path (build-path servlets-path CONFIGURE-SERVLET-NAME)])
-    (unless (file-exists? file-path) ; more here - check that it's a well formed servlet?
-      (call-with-output-file
-          file-path
-        (lambda (out)
-          (pretty-write
-           `(module ,CONFIGURE-SERVLET-NAME racket
-              (require (lib ,CONFIGURE-SERVLET-NAME "web-server" "private"))
-              (provide (all-from (lib ,CONFIGURE-SERVLET-NAME "web-server" "private")))
-              (set-config-path! ,(path->string configuration-path)))
-           out)
-          (newline out))))))
-
-; extract-definition : sym (listof s-expr) -> s-expr
-; to return the rhs from (def name rhs) not (def (name . args) body)
-(define (extract-definition name defs)
-  (or (ormap (lambda (def)
-               (and (pair? def) (eq? 'define (car def))
-                    (pair? (cdr def)) (eq? name (cadr def))
-                    (pair? (cddr def))
-                    (caddr def)))
-             defs)
-      (error 'extract-definition "definition for ~a not found" name)))
-
-; passwords = str (i.e. path to a file)
-
-(define build-path-maybe-expression->file-name caddr)
-
-; main
-(define (start initial-request)
-  (error-print-width 800) ; 10-ish lines
-  (check-ip-address initial-request)
-  (choose-configuration-file))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/connection-manager.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/connection-manager.rkt
deleted file mode 100644
index 6ddfe94635..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/connection-manager.rkt
+++ /dev/null
@@ -1,71 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         "timer.rkt")
-
-(struct connection-manager (i tm))
-(define-struct connection (id timer i-port o-port custodian close?)
-  #:mutable)
-
-(provide/contract
- [struct connection
-         ([id integer?]
-          [timer timer?]
-          [i-port input-port?]
-          [o-port output-port?]
-          [custodian custodian?]
-          [close? boolean?])]
- [start-connection-manager
-  (-> connection-manager?)]
- [new-connection 
-  (-> connection-manager? number? input-port? output-port? custodian? boolean?
-      connection?)]
- [kill-connection!
-  (connection? . -> . void)]
- [adjust-connection-timeout!
-  (connection? number? . -> . void)])
-
-;; start-connection-manager: custodian -> connection-manager
-;; calls the timer manager
-(define (start-connection-manager)
-  (connection-manager (box 0) (start-timer-manager)))
-
-;; new-connection: connection-manager number i-port o-port custodian -> connection
-;; ask the connection manager for a new connection
-(define (new-connection cm time-to-live i-port o-port cust close?)
-  (match-define (connection-manager i tm) cm)
-  (define conn
-    (make-connection
-     ;; The id is just for debugging and isn't normally useful
-     0 ;; (begin0 (unbox i) (set-box! i (add1 (unbox i))))
-     #f i-port o-port cust close?))
-  (define conn-wb (make-weak-box conn))
-  (set-connection-timer! 
-   conn
-   (start-timer tm
-                time-to-live
-                (lambda () 
-                  (cond
-                    [(weak-box-value conn-wb)
-                     => kill-connection-w/o-timer!]))))
-  conn)
-
-;; kill-connection!: connection -> void
-;; kill this connection
-(define (kill-connection! conn)
-  #;(printf "K: ~a\n" (connection-id conn))
-  (with-handlers ([exn:fail? void])
-    (cancel-timer! (connection-timer conn)))
-  (kill-connection-w/o-timer! conn))
-
-(define (kill-connection-w/o-timer! conn)  
-  (with-handlers ([exn:fail:network? void])
-    (close-output-port (connection-o-port conn)))
-  (with-handlers ([exn:fail:network? void])
-    (close-input-port (connection-i-port conn)))
-  (custodian-shutdown-all (connection-custodian conn)))
-
-;; adjust-connection-timeout!: connection number -> void
-;; change the expiration time for this connection
-(define (adjust-connection-timeout! conn time)
-  (increment-timer! (connection-timer conn) time))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/define-closure.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/define-closure.rkt
deleted file mode 100644
index a90113e7fa..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/define-closure.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang racket/base
-(require (for-syntax racket
-                     web-server/lang/closure))
-
-(provide define-closure)
-
-(define-syntax (define-closure stx)
-  (syntax-case stx ()
-    [(_ tag formals (free-vars ...) body)
-     (local
-       [(define-values (make-CLOSURE-id CLOSURE?-id CLOSURE-env-id)
-          (define-closure! #'tag #'(free-vars ...) (syntax/loc stx (lambda formals body))))
-        (define make-tag
-          (datum->syntax stx (string->symbol (format "make-~a" (syntax->datum #'tag))) stx))
-        (define tag-env
-          (datum->syntax stx (string->symbol (format "~a-env" (syntax->datum #'tag))) stx))
-        (define tag?
-          (datum->syntax stx (string->symbol (format "~a?" (syntax->datum #'tag))) stx))]
-       (quasisyntax/loc stx
-         (begin
-           (define #,make-tag #,make-CLOSURE-id)
-           (define #,tag? #,CLOSURE?-id)
-           (define #,tag-env #,CLOSURE-env-id))))]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/dispatch-server-sig.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/dispatch-server-sig.rkt
deleted file mode 100644
index 5d7ef45eed..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/dispatch-server-sig.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang racket/base
-(require racket/unit
-         racket/contract
-         racket/async-channel
-         web-server/private/util
-         unstable/contract
-         web-server/private/connection-manager)
-
-(define-signature dispatch-server^
-  ((contracted
-    [serve (->* () (#:confirmation-channel (or/c false/c async-channel?)) (-> void))]
-    [serve-ports (input-port? output-port? . -> . (-> void))])))
-
-(define-signature dispatch-server-config^
-  ((contracted
-    [port tcp-listen-port?]
-    [listen-ip (or/c string? false/c)]
-    [max-waiting exact-nonnegative-integer?]
-    [initial-connection-timeout integer?]
-    [read-request
-     (connection? 
-      tcp-listen-port?
-      (input-port? . -> . (values string? string?))
-      . -> .
-      (values any/c boolean?))]
-    [dispatch 
-     (-> connection? any/c void)])))
-
-(provide
- dispatch-server^ dispatch-server-config^)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/dispatch-server-unit.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/dispatch-server-unit.rkt
deleted file mode 100644
index 26a4434d03..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/dispatch-server-unit.rkt
+++ /dev/null
@@ -1,127 +0,0 @@
-#lang racket/unit
-(require net/tcp-sig
-         racket/async-channel
-         racket/port
-         mzlib/thread)
-(require racket/format)
-(require "web-server-structs.rkt"
-         "connection-manager.rkt"
-         "dispatch-server-sig.rkt")
-
-;; ****************************************
-(import tcp^ (prefix config: dispatch-server-config^))
-(export dispatch-server^)
-
-(define (async-channel-put* ac v)
-  (when ac
-    (async-channel-put ac v)))
-
-;; serve: -> -> void
-;; start the server and return a thunk to shut it down
-(define (serve #:confirmation-channel [confirmation-channel #f])
-  (define the-server-custodian (make-custodian))
-  (parameterize ([current-custodian the-server-custodian]
-                 [current-server-custodian the-server-custodian]
-                 #;[current-thread-initial-stack-size 3])
-    (define cm (start-connection-manager))
-    (thread
-     (lambda ()
-       (run-server
-        ;; This is the port argument, but because we specialize listen, it is ignored.
-        1
-        (handle-connection/cm cm)
-        #f
-        (lambda (exn)
-          ((error-display-handler)
-           (format "Connection error: ~a" (exn-message exn))
-           exn))
-        (lambda (_ mw re)
-          (with-handlers ([exn?
-                           (λ (x)
-                             (async-channel-put* confirmation-channel x)
-                             (raise x))])
-            (define listener
-              (tcp-listen config:port config:max-waiting #t config:listen-ip))
-            (let-values
-                ([(local-addr local-port end-addr end-port)
-                  (tcp-addresses listener #t)])
-              (async-channel-put* confirmation-channel local-port))
-            listener))
-        tcp-close
-        tcp-accept
-        tcp-accept/enable-break))))
-  (lambda ()
-    (custodian-shutdown-all the-server-custodian)))
-
-;; serve-ports : input-port output-port -> void
-;; returns immediately, spawning a thread to handle
-;; the connection
-;; NOTE: (GregP) should allow the user to pass in a connection-custodian
-(define (serve-ports ip op)
-  (define server-cust (make-custodian))
-  (parameterize ([current-custodian server-cust]
-                 [current-server-custodian server-cust])
-    (define connection-cust (make-custodian))
-    (define cm (start-connection-manager))
-    (define handle-connection (handle-connection/cm cm))
-    (parameterize ([current-custodian connection-cust])
-      (thread
-       (lambda ()
-         (handle-connection ip op
-                            #:port-addresses
-                            (lambda (ip)
-                              (values "127.0.0.1"
-                                      "127.0.0.1"))))))))
-
-;; handle-connection : connection-manager input-port output-port (input-port -> string string) -> void
-(define ((handle-connection/cm cm)
-         ip op
-         #:port-addresses [port-addresses tcp-addresses])
-  (define conn
-    (new-connection cm config:initial-connection-timeout
-                    ip op (current-custodian) #f))
-  (with-handlers
-      ([(λ (x)
-          ;; This error is "Connection reset by peer" and doesn't
-          ;; really indicate a problem with the server.
-          (and (exn:fail:network:errno? x)
-               (equal? (cons 54 'posix) (exn:fail:network:errno-errno x))))
-        (λ (x)
-          (kill-connection! conn))])
-    ;; HTTP/1.1 allows any number of requests to come from this input
-    ;; port. However, there is no explicit cancellation of a
-    ;; connection---the browser will just close the port. This leaves
-    ;; the Web server in the unfortunate state of config:read-request
-    ;; trying to read an HTTP and failing---with an ugly error
-    ;; message. This call to peek here will block until at least one
-    ;; character is available and then transfer to read-request. At
-    ;; that point, an error message would be reasonable because the
-    ;; request would be badly formatted or ended early. However, if
-    ;; the connection is closed, then peek will get the EOF and the
-    ;; connection will be closed. This shouldn't change any other
-    ;; behavior: read-request is already blocking, peeking doesn't
-    ;; consume a byte, etc.
-    (define the-evt
-      (choice-evt
-       (handle-evt
-        (port-closed-evt ip)
-        (λ (res)
-          (kill-connection! conn)))
-       (handle-evt
-        (peek-bytes-evt 1 0 #f ip)
-        (λ (res)
-          (cond
-            [(eof-object? res)
-             (kill-connection! conn)]
-            [else
-             (define-values
-               (req close?)
-               (config:read-request conn config:port port-addresses))
-             (set-connection-close?! conn close?)
-             (config:dispatch conn req)
-             (if (connection-close? conn)
-               (kill-connection! conn)
-               (connection-loop))])))))
-    (define (connection-loop)
-      (sync the-evt))
-    (connection-loop)))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/gzip.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/gzip.rkt
deleted file mode 100644
index c8ad8b6c3e..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/gzip.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket/base
-(require racket/contract
-         file/gzip
-         file/gunzip)
-
-(provide/contract
- [gzip/bytes (bytes? . -> . bytes?)]
- [gunzip/bytes (bytes? . -> . bytes?)])
-
-(define (gzip/bytes b)
-  (define gzb-p (open-output-bytes))
-  (gzip-through-ports
-   (open-input-bytes b)
-   gzb-p #f (current-seconds))
-  (get-output-bytes gzb-p))
-
-(define (gunzip/bytes gzb)  
-  (define b-p (open-output-bytes))
-  (gunzip-through-ports
-   (open-input-bytes gzb) b-p)
-  (get-output-bytes b-p))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/launch.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/launch.rkt
deleted file mode 100644
index 9e3983e46d..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/launch.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang racket/base
-(require racket/cmdline
-         racket/unit
-         net/tcp-sig
-         net/tcp-unit
-         net/ssl-tcp-unit)
-(require web-server/configuration/configuration-table
-         (except-in web-server/web-server serve)
-         web-server/web-config-unit)
-
-; this is used by launchers
-; extract-flag : sym (listof (cons sym alpha)) alpha -> alpha
-(define (extract-flag name flags default)
-  (let ([x (assq name flags)])
-    (if x
-        (cdr x)
-        default)))
-
-(define ssl (make-parameter #f))
-(define port (make-parameter #f))
-
-(define configuration@
-  (parse-command-line
-   "plt-web-server"
-   (current-command-line-arguments)
-   `((once-each
-      [("--ssl")
-       ,(lambda (flag)
-          (unless (port) (port 443))
-          (ssl #t))
-       ("Run with SSL using server-cert.pem and private-key.pem in the current directory, with 443 as the default port.")]
-      [("-f" "--configuration-table")
-       ,(lambda (flag file-name)
-          (cond
-            [(not (file-exists? file-name))
-             (error 'web-server "configuration file ~s not found" file-name)]
-            [(not (memq 'read (file-or-directory-permissions file-name)))
-             (error 'web-server "configuration file ~s is not readable" file-name)]
-            [else (cons 'config (string->path file-name))]))
-       ("Use an alternate configuration table" "file-name")]
-      [("-p" "--port")
-       ,(lambda (flag the-port)
-          (let ([p (string->number the-port)])
-            (if (and (integer? p) (<= 1 p 65535))
-              (port p)
-              (error 'web-server "expecting a valid port number, got \"~a\"" the-port))))
-       ("Use an alternate network port." "port")]
-      [("-a" "--ip-address")
-       ,(lambda (flag ip-address)
-          ; note the double backslash I initially left out.  That's a good reason to use Olin's regexps.
-          (let ([addr (regexp-split #px"\\." ip-address)])
-            (if (and (= 4 (length addr))
-                     (andmap (lambda (s)
-                               (let ([n (string->number s)])
-                                 (and (integer? n) (<= 0 n 255))))
-                             addr))
-                (cons 'ip-address ip-address)
-                (error 'web-server "ip-address expects a numeric ip-address (i.e. 127.0.0.1); given ~s" ip-address))))
-       ("Restrict access to come from ip-address" "ip-address")]))
-   (lambda (flags)
-     (configuration-table->web-config@
-      (extract-flag 'config flags default-configuration-table-path)
-      #:port (port)
-      #:listen-ip (extract-flag 'ip-address flags #f)))
-   '()))
-
-(define (serve)
-  (serve/web-config@ 
-   configuration@
-   #:tcp@ (if (ssl)
-              (let ()
-                (define-unit-binding ssl-tcp@
-                  (make-ssl-tcp@ (build-path (current-directory) "server-cert.pem")
-                                 (build-path (current-directory) "private-key.pem")
-                                 #f #f #f #f #f)
-                  (import) (export tcp^))
-                ssl-tcp@)
-              tcp@)))
-
-(provide serve)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/mime-types.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/mime-types.rkt
deleted file mode 100644
index 3f48b5ab77..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/mime-types.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         racket/promise)
-(require "util.rkt"
-         web-server/http)
-(provide/contract
- [read-mime-types (path-string? . -> . (hash/c symbol? bytes?))]
- [make-path->mime-type (path-string? . -> . (path? . -> . (or/c false/c bytes?)))])
-
-; read-mime-types : path? -> hash-table?
-(define (read-mime-types a-path)
-  (define MIME-TYPE-TABLE (make-hasheq))
-  (with-input-from-file a-path
-    (lambda ()
-      (let loop ()
-        (match (read-line (current-input-port) 'any)
-          [(? eof-object?)
-           (void)]
-          [(regexp #rx#"^([^\t ]+)[\t ]+(.+)$" (list _ type exts))
-           (for ([ext (in-list (regexp-split #" " exts))])
-             (hash-set! MIME-TYPE-TABLE (lowercase-symbol! ext) type))
-           (loop)]
-          [_
-           (loop)]))))
-  MIME-TYPE-TABLE)
-
-;; make-get-mime-type : path? -> path? -> bytes?
-;; determine the mime type based on the filename's suffix
-;;
-;; Notes (GregP):
-;; 1. Can we determine the mime type based on file contents?
-;; 2. Assuming that 7-bit ASCII is correct for mime-type
-(define (make-path->mime-type a-path)
-  (define MIME-TYPE-TABLE
-    (delay/sync
-     (read-mime-types a-path)))
-  (lambda (path)
-    (match (path->bytes path)
-      [(regexp #rx#".*\\.([^\\.]*$)" (list _ sffx))
-       (hash-ref (force MIME-TYPE-TABLE)
-                 (lowercase-symbol! sffx)
-                 #f)]
-      [_ #f])))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/mod-map.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/mod-map.rkt
deleted file mode 100644
index 62f439a20f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/mod-map.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         racket/match)
-(provide/contract
- [compress-serial (list? . -> . list?)]
- [decompress-serial (list? . -> . list?)])
-
-;; compress-mod-map : (listof (cons mod-spec symbol)) -> (listof (cons (or mod-spec number) symbol))
-(define (compress-mod-map mm)
-  (compress-mod-map/seen empty mm))
-
-(define (lookup-seen ms seen)
-  (match seen
-    [(list)
-     (values #f (list ms))]
-    [(list-rest ms+ seen+)
-     (if (equal? ms ms+)
-         (values 0 (list* ms+ seen+))
-         (let-values ([(i seen++) (lookup-seen ms seen+)])
-           (values (if i (add1 i) #f) (list* ms+ seen++))))]))
-
-(define (compress-mod-map/seen seen mm)
-  (match mm
-    [(list) 
-     (list)]
-    [(list-rest (list-rest mod-spec sym) mm)
-     (define-values (i seen+) (lookup-seen mod-spec seen))
-     (if i
-         (list* (cons i sym) (compress-mod-map/seen seen+ mm))
-         (list* (cons mod-spec sym) (compress-mod-map/seen seen+ mm)))]))
-
-;; decompress-mod-map : (listof (cons (or mod-spec number) symbol)) -> (listof (cons mod-spec symbol))
-(define (decompress-mod-map cmm)
-  (decompress-mod-map/seen empty cmm))
-
-(define (decompress-mod-map/seen seen cmm)
-  (match cmm
-    [(list)
-     (list)]
-    [(list-rest (list-rest mod-spec-or-n sym) cmm)
-     (if (number? mod-spec-or-n)
-         (list* (cons (list-ref seen mod-spec-or-n) sym)
-                (decompress-mod-map/seen seen cmm))
-         (list* (cons mod-spec-or-n sym)
-                (decompress-mod-map/seen (append seen (list mod-spec-or-n)) cmm)))]))
-
-; compress-serial : serial -> serial (with compressed mod-map)
-(define compress-serial
-  (match-lambda
-    [(list vs e0 mm e2 e3 e4 e5)
-     (list vs e0 (compress-mod-map mm) e2 e3 e4 e5)]))
-
-; decompress-serial : serial (with compressed mod-map) -> serial
-(define decompress-serial
-  (match-lambda
-    [(list vs e0 cmm e2 e3 e4 e5)
-     (list vs e0 (decompress-mod-map cmm) e2 e3 e4 e5)]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/servlet.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/servlet.rkt
deleted file mode 100644
index fc56701af2..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/servlet.rkt
+++ /dev/null
@@ -1,31 +0,0 @@
-#lang racket/base
-(require racket/contract)
-(require web-server/servlet/servlet-structs
-         web-server/managers/manager
-         web-server/http)
-
-(define servlet-prompt (make-continuation-prompt-tag 'servlet))
-(define-struct servlet (custodian namespace manager directory [handler #:mutable]))
-(define-struct execution-context (request))
-
-(define current-servlet (make-parameter #f))
-(define current-servlet-instance-id (make-parameter #f))
-(define current-execution-context (make-parameter #f))
-
-(define (current-servlet-manager)
-  (servlet-manager (current-servlet)))
-
-(provide/contract
- [servlet-prompt continuation-prompt-tag?]
- [struct servlet 
-         ([custodian custodian?]
-          [namespace namespace?]
-          [manager manager?]
-          [directory path-string?]
-          [handler (request? . -> . can-be-response?)])]
- [struct execution-context 
-         ([request request?])]
- [current-servlet (parameter/c (or/c false/c servlet?))]
- [current-servlet-instance-id (parameter/c (or/c false/c number?))]
- [current-execution-context (parameter/c (or/c false/c execution-context?))]
- [current-servlet-manager (-> manager?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/timer.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/timer.rkt
deleted file mode 100644
index f3a50d288f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/timer.rkt
+++ /dev/null
@@ -1,113 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/async-channel)
-
-(struct timer-manager (thread timer-ch))
-(define-struct timer (tm evt expire-seconds action)
-  #:mutable)
-
-;; start-timer-manager : -> timer-manager?
-;; The timer manager thread
-(define (start-timer-manager)
-  (define timer-ch (make-async-channel))
-  (timer-manager
-   (thread
-    (lambda ()
-      (let loop ([timers null])
-        ;; (printf "Timers: ~a\n" (length timers))
-        ;; Wait for either...
-        (apply sync
-               ;; ... a timer-request message ...
-               (handle-evt
-                timer-ch
-                (lambda (req)
-                  ;; represent a req as a (timer-list -> timer-list) function:
-                  ;; add/remove/change timer evet:
-                  (loop (req timers))))
-               ;; ... or a timer
-               (map (lambda (timer)
-                      (handle-evt
-                       (timer-evt timer)
-                       (lambda (_)
-                         ;; execute timer
-                         ((timer-action timer))
-                         (loop (remq timer timers)))))
-                    timers)))))
-   timer-ch))
-
-;; Limitation on this add-timer: thunk cannot make timer
-;;  requests directly, because it's executed directly by
-;;  the timer-manager thread
-;; add-timer : timer-manager number (-> void) -> timer
-(define (add-timer manager msecs thunk)
-  (define now (current-inexact-milliseconds))
-  (define t
-    (timer manager
-           (alarm-evt (+ now msecs))
-           (+ now msecs)
-           thunk))
-  (async-channel-put
-   (timer-manager-timer-ch manager)
-   (lambda (timers)
-     (list* t timers)))
-  t)
-
-;; revise-timer! : timer msecs (-> void) -> timer
-;; revise the timer to ring msecs from now
-(define (revise-timer! timer msecs thunk)
-  (define now (current-inexact-milliseconds))
-  (async-channel-put
-   (timer-manager-timer-ch (timer-tm timer))
-   (lambda (timers)
-     (set-timer-evt! timer (alarm-evt (+ now msecs)))
-     (set-timer-expire-seconds! timer (+ now msecs))
-     (set-timer-action! timer thunk)
-     timers)))
-
-(define (cancel-timer! timer)
-  (async-channel-put
-   (timer-manager-timer-ch (timer-tm timer))
-   (lambda (timers)
-     (remq timer timers))))
-
-;; start-timer : timer-manager num (-> void) -> timer
-;; to make a timer that calls to-do after sec from make-timer's application
-(define (start-timer tm secs to-do)
-  (add-timer tm (* 1000 secs) to-do))
-
-;; reset-timer : timer num -> void
-;; to cause timer to expire after sec from the adjust-msec-to-live's application
-(define (reset-timer! timer secs)
-  (revise-timer! timer (* 1000 secs) (timer-action timer)))
-
-;; increment-timer! : timer num -> void
-;; add secs to the timer, rather than replace
-(define (increment-timer! timer secs)
-  (revise-timer! timer
-                 (+ (- (timer-expire-seconds timer) (current-inexact-milliseconds))
-                    (* 1000 secs))
-                 (timer-action timer)))
-
-
-(provide/contract
- [timer-manager?
-  (-> any/c boolean?)]
- [struct timer ([tm timer-manager?]
-                [evt evt?]
-                [expire-seconds number?]
-                [action (-> void)])]
- [start-timer-manager (-> timer-manager?)]
- [start-timer (timer-manager? number? (-> void) . -> . timer?)]
- [reset-timer! (timer? number? . -> . void)]
- [increment-timer! (timer? number? . -> . void)]
- [cancel-timer! (timer? . -> . void)])
-
-;; --- timeout plan
-
-;; start timeout on connection startup
-;; for POST requests increase the timeout proportionally when content-length is read
-;; adjust timeout in read-to-eof
-;; adjust timeout to starting timeout for next request with persistent connections
-
-;; adjust timeout proportionally when responding
-;; for servlet - make it a day until the output is produced
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/url-param.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/url-param.rkt
deleted file mode 100644
index 07e8278bcf..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/url-param.rkt
+++ /dev/null
@@ -1,45 +0,0 @@
-#lang racket/base
-(require racket/contract
-         net/url
-         racket/match
-         racket/list
-         "util.rkt")
-(provide/contract
- [extract-param (url? string? . -> . (or/c string? false/c))]
- [insert-param (url? string? string? . -> . url?)])
-
-;; extract-param : url string -> string
-(define (extract-param url key)
-  (define ps
-    (apply append
-           (map path/param-param (url-path url))))
-  (let/ec esc
-    (for-each (lambda (p)
-                (with-handlers ([exn:fail? void])
-                  (define l (read/string p))
-                  (esc (cdr (assoc key l)))))
-              ps)
-    #f))
-
-;; insert-param : url string string -> url
-;; add a path/param to the path in a url
-;; (assumes that there is only one path/param)
-(define (insert-param in-url key val)
-  (url-replace-path
-   (match-lambda
-     [(list)
-      (list (make-path/param 
-             ""
-             (list (write/string (list (cons key val))))))]
-     [old
-      (match (reverse old)
-        [(list-rest f r)
-         (reverse (list* (make-path/param 
-                          (path/param-path f)
-                          (list (write/string
-                                 (list* (cons key val)
-                                        (with-handlers ([exn:fail? (lambda _ empty)])
-                                          (filter (lambda (k*v) (not (equal? key (car k*v))))
-                                                  (read/string (first (path/param-param f)))))))))
-                         r))])])
-   in-url))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/util.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/util.rkt
deleted file mode 100644
index a383c4cbc2..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/util.rkt
+++ /dev/null
@@ -1,189 +0,0 @@
-#lang racket/base
-(require racket/contract/base
-         racket/list
-         unstable/list
-         unstable/contract
-         racket/serialize
-         net/url-structs)
-(require unstable/bytes
-         unstable/contract
-         unstable/list)
-(provide
- (all-from-out
-  unstable/bytes
-  unstable/contract
-  unstable/list))
-
-;; --
-
-(define (bytes-ci=? b0 b1)
-  (string-ci=? (bytes->string/utf-8 b0)
-               (bytes->string/utf-8 b1)))
-;; Eli: If this ever gets in, it should say that the memory requirements
-;;   are 4 times the input size, especially since bytes are often used to save
-;;   space.  Also, fails on (bytes-ci=? #"\277" #"\277"), and a trivial fix
-;;   would still fail on (bytes-ci=? #"\276\277" #"\277\276")
-
-(provide/contract
- [bytes-ci=? (bytes? bytes? . -> . boolean?)])
-
-;; --
-
-;; network-error: symbol string . values -> void
-;; throws a formatted exn:fail:network
-(define (network-error src fmt . args)
-  (raise (make-exn:fail:network (format "~a: ~a" src (apply format fmt args))
-                                (current-continuation-marks))))
-
-;; exn->string : (or/c exn any) -> string
-(define (exn->string exn)
-  (if (exn? exn)
-      (parameterize ([current-error-port (open-output-string)])
-        ((error-display-handler) (exn-message exn) exn)
-        (get-output-string (current-error-port)))
-      (format "~s\n" exn)))
-
-(provide/contract
- [network-error (->* [symbol? string?] [] #:rest list? void?)]
- [exn->string (-> any/c string?)])
-
-;; --
-
-; explode-path* : path? -> (listof path?)
-(define (explode-path* p)
-  (let loop ([p p] [r null])
-    (cond 
-      [(eq? 'relative p) r]
-      [(not p) r]
-      [else
-       (let-values ([(base name dir?) (split-path p)])
-         (loop base (list* name r)))])))
-;; Eli: We already have `explode-path', this looks like it's doing the
-;;   same thing, except a little less useful.
-
-; path-without-base : path? path? -> (listof path-piece?)
-(define (path-without-base base path)
-  (define b (explode-path* base))
-  (define p (explode-path* path))
-  (if (list-prefix? b p)
-      (list-tail p (length b))
-      (error 'path-without-base "~a is not a prefix of ~a" base path)))
-;; Eli: see my comment on `list-prefix?' -- it would make this trivial.
-;;   Also, if you want to look for a useful utility to add, search the code for
-;;   `relativize', which is a popular thing that gets written multiple times
-;;   and would be nice to have as a library.  (But there are some differences
-;;   between them, I think.)
-
-;; build-path-unless-absolute : path-string? path-string? -> path?
-(define (build-path-unless-absolute base path)
-  (if (absolute-path? path)
-      (build-path path)
-      (build-path base path)))
-;; Eli: This looks completely unnecessary.  I find the code much easier to
-;;   understand than the long name.
-
-(define (directory-part path)
-  (let-values ([(base name must-be-dir) (split-path path)])
-    (cond
-      [(eq? 'relative base) (current-directory)]
-      [(not base) (error 'directory-part "~a is a top-level directory" path)]
-      [(path? base) base])))
-;; Eli: There is now a `file-name-from-path', which suggests that the name for
-;;   this should be `directory-name-from-path', but perhaps a new name is
-;;   better for both.  Also, I find it questionable to return the current
-;;   directory in the first case.
-
-(provide/contract
- [explode-path* (path-string? . -> . (listof path-piece?))]
- [path-without-base (path-string? path-string? . -> . (listof path-piece?))]
- [directory-part (path-string? . -> . path?)]
- [build-path-unless-absolute (path-string? path-string? . -> . path?)])
-
-;; --
-
-(define (read/string str)
-  (define r (read (open-input-string str)))
-  (cond [(eof-object? r) (raise-type-error 'read/string "nonempty string" str)]
-        [else r]))
-
-;; Eli: Same comments as `read/bytes'.
-
-(define (write/string v)
-  (define str (open-output-string))
-  (write v str)
-  (get-output-string str))
-;; Eli: Same comments as `write/string', and worse -- this is the same as
-;;   (format "~s" v)
-
-; lowercase-symbol! : (or/c string bytes) -> symbol
-(define (lowercase-symbol! s)
-  (string->symbol
-   (string-downcase
-    (if (bytes? s)
-        (bytes->string/utf-8 s)
-        s))))
-;; Eli: This doesn't make any sense at all.  Why is the `!' in the name?  Why
-;;   does it accept bytes?  Why does a function in a "string" library accept
-;;   bytes?  How can I guess that this creates a new symbol from that name?
-;;   (Which makes me think that this is (compose string->symbol string-downcase
-;;   symbol->string))
-
-(provide/contract
- [lowercase-symbol! ((or/c string? bytes?) . -> . symbol?)]
- [read/string (string? . -> . serializable?)]
- [write/string (serializable? . -> . string?)])
-
-;; --
-
-(provide/contract
- [url-replace-path (((listof path/param?) . -> . (listof path/param?)) url? . -> . url?)]
- [url-path->string ((listof path/param?) . -> . string?)])
-
-;; replace-path: (url-path -> url-path) url -> url
-;; make a new url by replacing the path part of a url with a function
-;; of the url's old path
-;; also remove the query
-(define (url-replace-path proc in-url)
-  (let ([new-path (proc (url-path in-url))])
-    (make-url
-     (url-scheme in-url)
-     (url-user in-url)
-     (url-host in-url)
-     (url-port in-url)
-     (url-path-absolute? in-url)
-     new-path
-     empty
-     (url-fragment in-url))))
-;; Eli: if it also removes the query, this it's a bad name, and it's
-;;   questionable whether it is general enough.  Why not make it into a
-;;   keyworded function that can change any part, which sounds like a much more
-;;   useful utility?  Some `foo' that would allow:
-;;     (define (url-replace-path proc in-url)
-;;       (foo in-url #:path (proc (url-path in-url)) #:query '()))
-;;   or even accept a changing function for all keywords:
-;;     (define (url-replace-path proc in-url)
-;;       (foo in-url #:path proc #:query '()))
-
-;; ripped this off from url-unit.rkt
-(define (url-path->string strs)
-  (apply string-append
-         (apply append
-                (map (lambda (s) (list "/" (maybe-join-params s)))
-                     strs))))
-
-;; needs to unquote things!
-(define (maybe-join-params s)
-  (if (string? s)
-      s
-      (let ([s (path/param-path s)])
-        (if (string? s)
-            s
-            (case s
-              [(same) "."]
-              [(up)   ".."]
-              [else (error 'maybe-join-params
-                           "bad value from path/param-path: ~e" s)])))))
-;; Eli: I don't know what this is supposed to be doing -- I don't see any
-;;   "maybe"ness), it throws away the `path/param-param's, and it accepts
-;;   strings too (which makes me wonder how is this related to the url
-;;   library).
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/web-server-structs.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/web-server-structs.rkt
deleted file mode 100644
index 3e5c7b2f9f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/web-server-structs.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require racket/contract)
-
-(define current-server-custodian (make-parameter #f))
-
-;; make-servlet-custodian: -> custodian
-;; create a custodian for the dynamic extent of a servlet continuation
-(define (make-servlet-custodian)
-  (make-custodian (current-server-custodian)))
-
-(provide/contract
- [current-server-custodian (parameter/c custodian?)]
- [make-servlet-custodian (-> custodian?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/private/xexpr.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/private/xexpr.rkt
deleted file mode 100644
index 3267617146..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/private/xexpr.rkt
+++ /dev/null
@@ -1,127 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         racket/list
-         racket/pretty
-         xml)
-
-(define-struct (exn:pretty exn) (xexpr))
-
-(provide/contract
- [struct (exn:pretty exn) ([message string?]
-                           [continuation-marks continuation-mark-set?]
-                           [xexpr xexpr/c])]
- [format-xexpr/errors (any/c . -> . string?)]
- [pretty-xexpr/c contract?])
-
-(define pretty-xexpr/c
-  (make-contract
-   #:name 'pretty-xexpr/c
-   #:projection
-   (lambda (blame)
-     (lambda (val)
-       (define marks (current-continuation-marks))
-       (with-handlers ([exn:fail:contract?
-                        (lambda (exn)
-                          (raise
-                           (make-exn:pretty
-                            (exn-message exn)
-                            marks
-                            `(span ,(drop-after "Context:\n" (exn-message exn)) "\n"
-                                   ,(make-cdata #f #f (format-xexpr/errors val))))))])
-         (((contract-projection xexpr/c) blame) val))))))
-
-(define (drop-after delim str)
-  (match (regexp-match-positions (regexp-quote delim) str)
-    [(list-rest (list-rest start end) _rst)
-     (substring str 0 end)]
-    [_
-     str]))
-
-; Formating Xexprs
-(define (format-xexpr/errors v)
-  (pretty-format (format-xexpr v) 80))
-
-(define-struct xexpr-error (message content)
-  #:property prop:custom-write
-  (lambda (v port write?)
-    (display "<a title=\"" port)
-    (display (xexpr-error-message v) port)
-    (display "\" class=\"error\">" port)
-    ; XXX Can this be XML escaped?
-    (print (xexpr-error-content v) port)
-    (display "</a>" port)))
-(define mark-error make-xexpr-error)
-
-(define (xexpr-datum? v)
-  (or (string? v)
-      (symbol? v)
-      (exact-nonnegative-integer? v)
-      (comment? v)
-      (p-i? v)
-      (pcdata? v)
-      (cdata? v)))
-
-(define (format-xexpr v)
-  (cond
-    [(pair? v)
-     (cond
-       [(empty? v)
-        (mark-error "Not a valid Xexpr element (No tag; Tag must be a symbol.)" v)]
-       [(symbol? (car v))
-        (list* (car v)
-               (format-elements+attributes (cdr v)))]
-       [else
-        (list* (mark-error "Not a valid Xexpr element tag (Must be a symbol.)" (car v))
-               (format-elements+attributes (cdr v)))])]
-    [(xexpr-datum? v) v]
-    [else
-     (mark-error "Not a valid Xexpr datum (Must be a string, symbol, exact nonnegative integer, comment, PI, pcdata, or cdata.)" v)]))
-
-(define (format-elements+attributes l)
-  (match l
-    ; ()
-    [(list) empty]
-    ; (datum ...)
-    [(list-rest (? xexpr-datum?) other-elems)
-     (format-elements l)]
-    ; ((p ...) ...)
-    [(list-rest (list-rest (? symbol?) inner-elems) other-elems)
-     (format-elements l)]
-    ; (attrs ...)
-    [(list-rest attrs elems)
-     (list* (format-attributes attrs)
-            (format-elements elems))]
-    [else
-     (mark-error 
-      "Not a valid Xexpr tag content list. (Must be either (1) a list of Xexprs or (2) An attribute list followed by a list of Xexprs.)"
-      l)]))
-
-(define (format-elements l)
-  (if (list? l)
-      (map format-xexpr l)
-      (mark-error
-       "Expected a list of elements"
-       l)))
-
-(define (format-attributes l)
-  (match l
-    [(list) empty]
-    [(list-rest attr attrs)
-     (list* (format-attribute attr)
-            (format-attributes attrs))]
-    [else
-     (mark-error 
-      "Not a valid attribute list (Must be list of attributes. An attribute is a list containing a symbol and a string.)"
-      l)]))
-
-(define (format-attribute l)
-  (match l
-    [(list (? symbol? attr) (? string? val))
-     l]
-    [(list (? symbol? attr) val)
-     (list attr (mark-error "Not a valid attribute value (Must be string.)" val))]
-    [(list attr (? string? val))
-     (list (mark-error "Not a valid attribute name (Must be symbol.)" attr) val)]
-    [else
-     (mark-error "Not a valid attribute (Must be a list of a symbol and a string.)" l)]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet-dispatch.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/servlet-dispatch.rkt
deleted file mode 100644
index bad85de795..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet-dispatch.rkt
+++ /dev/null
@@ -1,165 +0,0 @@
-;; Derived from plai/web/server, which was based on an older version
-;; of this Also derived from planet/untyped/instaservlet
-#lang racket/base
-(require (prefix-in net: net/sendurl)
-         racket/match
-         racket/local
-         racket/contract
-         racket/async-channel
-         racket/list
-         racket/unit
-         racket/serialize
-         net/tcp-unit
-         net/tcp-sig
-         net/url
-         unstable/contract
-         net/ssl-tcp-unit)
-(require web-server/web-server
-         web-server/managers/lru
-         web-server/managers/manager
-         web-server/configuration/namespace
-         web-server/configuration/responders
-         web-server/http
-         web-server/stuffers
-         web-server/servlet/setup
-         web-server/servlet/servlet-structs
-         web-server/dispatchers/dispatch
-         (prefix-in filter: web-server/dispatchers/dispatch-filter)
-         (prefix-in servlets: web-server/dispatchers/dispatch-servlets))
-
-(define send-url (make-parameter net:send-url))
-
-(provide/contract
- [dispatch/servlet (((request? . -> . can-be-response?))
-                    (#:regexp regexp?
-                              #:current-directory path-string?
-                              #:stateless? boolean?
-                              #:stuffer (stuffer/c serializable? bytes?)
-                              #:manager manager?
-                              #:responders-servlet-loading (url? any/c . -> . can-be-response?)
-                              #:responders-servlet (url? any/c . -> . can-be-response?))
-                    . ->* .
-                    dispatcher/c)]
- [serve/launch/wait (((semaphore? . -> . dispatcher/c))
-                     (#:launch-path (or/c false/c string?)
-                                    #:connection-close? boolean?
-                                    #:banner? boolean?
-                                    #:listen-ip (or/c false/c string?)
-                                    #:port tcp-listen-port?
-                                    #:max-waiting exact-nonnegative-integer?
-                                    #:ssl-cert (or/c false/c path-string?)
-                                    #:ssl-key (or/c false/c path-string?))
-                     . ->* .
-                     void)])
-
-(define (dispatch/servlet 
-         start
-         #:regexp
-         [servlet-regexp #rx""]
-         #:current-directory 
-         [servlet-current-directory (current-directory)]              
-         #:stateless? 
-         [stateless? #f]
-         #:stuffer
-         [stuffer default-stuffer]
-         #:responders-servlet-loading
-         [responders-servlet-loading servlet-loading-responder]
-         #:responders-servlet 
-         [responders-servlet servlet-error-responder]
-         #:manager
-         [manager
-          (make-threshold-LRU-manager
-           (lambda (request)
-             `(html (head (title "Page Has Expired."))
-                    (body (p "Sorry, this page has expired. Please go back."))))
-           (* 64 1024 1024))])
-  (define servlet-box (box #f))
-  (define namespace-now (current-namespace))
-  (filter:make
-   servlet-regexp
-   (servlets:make
-    #:responders-servlet-loading responders-servlet-loading
-    #:responders-servlet responders-servlet
-    (lambda (url)
-      (or (unbox servlet-box)
-          (let ([servlet
-                 (parameterize ([current-custodian (make-custodian)]
-                                [current-namespace namespace-now])
-                   (if stateless?
-                       (make-stateless.servlet servlet-current-directory stuffer manager start)
-                       (make-v2.servlet servlet-current-directory manager start)))])
-            (set-box! servlet-box servlet)
-            servlet))))))
-
-(define (serve/launch/wait
-         dispatcher
-         
-         #:connection-close?
-         [connection-close? #f]
-         #:launch-path
-         [launch-path #f]          
-         #:banner?
-         [banner? #t]
-         
-         #:listen-ip
-         [listen-ip "127.0.0.1"]
-         #:port
-         [port-arg 8000]
-         #:max-waiting
-         [max-waiting 511]
-         #:ssl-cert
-         [ssl-cert #f]
-         #:ssl-key
-         [ssl-key #f])
-  (define ssl? (and ssl-cert ssl-key))
-  (define sema (make-semaphore 0))
-  (define confirm-ch (make-async-channel 1))
-  (define shutdown-server
-    (serve #:confirmation-channel confirm-ch
-           #:connection-close? connection-close?
-           #:dispatch (dispatcher sema)
-           #:listen-ip listen-ip
-           #:port port-arg
-           #:max-waiting max-waiting
-           #:tcp@ (if ssl?
-                      (let ()
-                        (define-unit-binding ssl-tcp@
-                          (make-ssl-tcp@
-                           ssl-cert ssl-key
-                           #f #f #f #f #f)
-                          (import) (export tcp^))
-                        ssl-tcp@)
-                      tcp@)))
-  (define serve-res (async-channel-get confirm-ch))
-  (if (exn? serve-res)
-      (begin
-        (when banner? (eprintf "There was an error starting the Web server.\n"))
-        (match serve-res
-          [(app exn-message (regexp "tcp-listen: listen on .+ failed \\(Address already in use; errno=.+\\)" (list _)))
-           (when banner? (eprintf "\tThe TCP port (~a) is already in use.\n" port-arg))]
-          [_
-           (void)]))
-      (local [(define port serve-res)
-              (define server-url
-                (string-append (if ssl? "https" "http")
-                               "://localhost"
-                               (if (and (not ssl?) (= port 80))
-                                   "" (format ":~a" port))))]
-        (when launch-path
-          ((send-url) (string-append server-url launch-path) #t))
-        (when banner?
-          (printf "Your Web application is running at ~a.\n" 
-                  (if launch-path 
-                      (string-append server-url launch-path)
-                      server-url))
-          (printf "Stop this program at any time to terminate the Web Server.\n")
-          (flush-output))
-        (let ([bye (lambda ()
-                     (when banner? (printf "\nWeb Server stopped.\n"))
-                     (shutdown-server))])
-          (with-handlers ([exn:break? (lambda (exn) (bye))])
-            (semaphore-wait/enable-break sema)
-            ; Give the final response time to get there
-            (sleep 2)
-            ;; We can get here if a /quit url is visited
-            (bye))))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet-env.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/servlet-env.rkt
deleted file mode 100644
index f92c2d06b1..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet-env.rkt
+++ /dev/null
@@ -1,205 +0,0 @@
-; Derived from plai/web/server, which was based on an older version of this
-; Also derived from planet/untyped/instaservlet
-#lang racket/base
-(require racket/contract
-         racket/list
-         racket/serialize
-         racket/runtime-path
-         (for-syntax racket/base))
-(require net/url
-         web-server/managers/lru
-         web-server/managers/manager
-         web-server/configuration/namespace
-         web-server/http
-         web-server/stuffers
-         web-server/configuration/responders
-         web-server/private/mime-types
-         web-server/servlet/setup
-         web-server/servlet/servlet-structs
-         web-server/servlet-dispatch
-         unstable/contract
-         (prefix-in lift: web-server/dispatchers/dispatch-lift)
-         (prefix-in fsmap: web-server/dispatchers/filesystem-map)
-         (prefix-in sequencer: web-server/dispatchers/dispatch-sequencer)
-         (prefix-in files: web-server/dispatchers/dispatch-files)
-         (prefix-in filter: web-server/dispatchers/dispatch-filter)
-         (prefix-in servlets: web-server/dispatchers/dispatch-servlets)
-         (prefix-in log: web-server/dispatchers/dispatch-log))
-
-(define (quit-server sema)
-  (lift:make
-   (lambda (request)
-     (semaphore-post sema)
-     (response/xexpr
-      `(html (head (title "Server Stopped")
-                   (link ([rel "stylesheet"] [href "/error.css"])))
-             (body (div ([class "section"])
-                        (div ([class "title"]) "Server Stopped")
-                        (p "Return to DrRacket."))))))))
-
-(define-runtime-path default-web-root "default-web-root")
-
-(provide/contract
- [serve/servlet (((request? . -> . can-be-response?))
-                 (#:connection-close? boolean?
-                  #:command-line? boolean?
-                  #:launch-browser? boolean?
-                  #:quit? boolean?
-                  #:banner? boolean?
-                  #:listen-ip (or/c false/c string?)
-                  #:port tcp-listen-port?
-                  #:max-waiting exact-nonnegative-integer?
-                  #:ssl? boolean?
-                  #:ssl-cert (or/c false/c path-string?)
-                  #:ssl-key (or/c false/c path-string?)
-                  #:manager manager?
-                  #:servlet-namespace (listof module-path?)
-                  #:server-root-path path-string?
-                  #:stateless? boolean?
-                  #:stuffer (stuffer/c serializable? bytes?)
-                  #:extra-files-paths (listof path-string?)
-                  #:servlets-root path-string?
-                  #:servlet-current-directory path-string?
-                  #:file-not-found-responder (request? . -> . can-be-response?)
-                  #:servlet-loading-responder (url? any/c . -> . can-be-response?)
-                  #:servlet-responder (url? any/c . -> . can-be-response?)
-                  #:mime-types-path path-string?
-                  #:servlet-path string?
-                  #:servlet-regexp regexp?
-                  #:log-file (or/c false/c path-string?)
-                  #:log-format (or/c log:log-format/c log:format-req/c))
-                 . ->* .
-                 void)])
-
-;; utility for conveniently chaining dispatchers
-(define (dispatcher-sequence . dispatchers)
-  (let loop ([ds dispatchers] [r '()])
-    (cond [(null? ds) (apply sequencer:make (reverse r))]
-          [(not (car ds))   (loop (cdr ds) r)]
-          [(list? (car ds)) (loop (append (car ds) (cdr ds)) r)]
-          [else (loop (cdr ds) (cons (car ds) r))])))
-
-(define (serve/servlet
-         start
-         #:connection-close?
-         [connection-close? #f]
-         #:command-line?
-         [command-line? #f]
-         #:launch-browser?
-         [launch-browser? (not command-line?)]
-         #:quit?
-         [quit? (not command-line?)]
-         #:banner?
-         [banner? (not command-line?)]
-
-         #:listen-ip
-         [listen-ip "127.0.0.1"]
-         #:port
-         [the-port 8000]         
-         #:max-waiting
-         [max-waiting 511]
-
-         #:manager
-         [manager
-          (make-threshold-LRU-manager
-           (lambda (request)
-             (response/xexpr
-              `(html (head (title "Page Has Expired."))
-                     (body (p "Sorry, this page has expired. Please go back.")))))
-           (* 128 1024 1024))]
-
-         #:servlet-path
-         [servlet-path "/servlets/standalone.rkt"]
-         #:servlet-regexp
-         [servlet-regexp (regexp (format "^~a$" (regexp-quote servlet-path)))]
-         #:stateless?
-         [stateless? #f]
-         #:stuffer
-         [stuffer default-stuffer]
-
-         #:servlet-namespace
-         [servlet-namespace empty]
-         #:server-root-path
-         [server-root-path default-web-root]
-         #:extra-files-paths
-         [extra-files-paths (list (build-path server-root-path "htdocs"))]
-         #:servlets-root
-         [servlets-root (build-path server-root-path "htdocs")]
-         #:servlet-current-directory
-         [servlet-current-directory servlets-root]
-         #:file-not-found-responder
-         [file-not-found-responder
-          (gen-file-not-found-responder
-           (build-path server-root-path "conf" "not-found.html"))]
-         #:servlet-loading-responder
-         [responders-servlet-loading servlet-loading-responder]
-         #:servlet-responder 
-         [responders-servlet servlet-error-responder]
-
-         #:mime-types-path
-         [mime-types-path (let ([p (build-path server-root-path "mime.types")])
-                            (if (file-exists? p)
-                              p
-                              (build-path default-web-root "mime.types")))]
-         
-         #:ssl?
-         [ssl? #f]
-         #:ssl-cert
-         [ssl-cert (and ssl? (build-path server-root-path "server-cert.pem"))]
-         #:ssl-key
-         [ssl-key (and ssl? (build-path server-root-path "private-key.pem"))]
-
-         #:log-file
-         [log-file #f]
-         #:log-format
-         [log-format 'apache-default])
-  (define (dispatcher sema)
-    (dispatcher-sequence
-     (and log-file (log:make #:format 
-                             (if (symbol? log-format)
-                                 (log:log-format->format log-format)
-                                 log-format)
-                             #:log-path log-file))
-     (and quit? (filter:make #rx"^/quit$" (quit-server sema)))
-     (dispatch/servlet 
-      start
-      #:regexp servlet-regexp
-      #:stateless? stateless?
-      #:stuffer stuffer
-      #:current-directory servlet-current-directory
-      #:manager manager
-      #:responders-servlet-loading
-      responders-servlet-loading
-      #:responders-servlet 
-      responders-servlet)
-     (let-values ([(clear-cache! url->servlet)
-                   (servlets:make-cached-url->servlet
-                    (fsmap:filter-url->path
-                     #rx"\\.(ss|scm|rkt|rktd)$"
-                     (fsmap:make-url->valid-path
-                      (fsmap:make-url->path servlets-root)))
-                    (make-default-path->servlet
-                     #:make-servlet-namespace 
-                     (make-make-servlet-namespace #:to-be-copied-module-specs servlet-namespace)))])
-       (servlets:make url->servlet))
-     (map (lambda (extra-files-path)
-            (files:make
-             #:url->path (fsmap:make-url->path extra-files-path)
-             #:path->mime-type (make-path->mime-type mime-types-path)
-             #:indices (list "index.html" "index.htm")))
-          extra-files-paths)
-     (files:make
-      #:url->path (fsmap:make-url->path (build-path server-root-path "htdocs"))
-      #:path->mime-type (make-path->mime-type mime-types-path)
-      #:indices (list "index.html" "index.htm"))
-     (lift:make (compose any->response file-not-found-responder))))
-  (serve/launch/wait
-   dispatcher  
-   #:connection-close? connection-close?
-   #:launch-path (if launch-browser? servlet-path #f) 
-   #:banner? banner?   
-   #:listen-ip listen-ip
-   #:port the-port
-   #:max-waiting max-waiting
-   #:ssl-cert ssl-cert
-   #:ssl-key ssl-key))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/servlet.rkt
deleted file mode 100644
index 23ef46c8d7..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-(require net/url
-         web-server/servlet/web-cells         
-         web-server/http/bindings
-         web-server/http
-         web-server/dispatch
-         web-server/servlet/servlet-structs
-         web-server/servlet/web)
-(provide (all-from-out net/url
-                       web-server/servlet/web-cells
-                       web-server/http/bindings
-                       web-server/dispatch
-                       web-server/http
-                       web-server/servlet/servlet-structs
-                       web-server/servlet/web))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/servlet-structs.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/servlet-structs.rkt
deleted file mode 100644
index 1830009934..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/servlet-structs.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang racket/base
-(require racket/contract
-         web-server/http)  
-
-(define (real-any->response x)
-  #f)
-
-(define (any->response x)
-  (if (response? x)
-      x
-      (real-any->response x)))
-
-(define (set-any->response! f)
-  (set! real-any->response f))
-
-(define (can-be-response? x)
-  (or (response? x)
-      (and (any->response x)
-           #t)))
-
-(provide/contract
- [any->response (-> any/c (or/c false/c response?))]
- [set-any->response! (-> (-> any/c (or/c false/c response?)) void)]
- [can-be-response? (-> any/c boolean?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/setup.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/setup.rkt
deleted file mode 100644
index ce08f1e14d..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/setup.rkt
+++ /dev/null
@@ -1,187 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match
-         racket/serialize
-         web-server/managers/manager
-         web-server/managers/timeouts
-         web-server/managers/none
-         web-server/lang/stuff-url
-         web-server/stuffers/stuffer
-         (only-in web-server/lang/web
-                  initialize-servlet
-                  make-stateless-servlet)
-         web-server/http
-         web-server/servlet/web
-         web-server/configuration/namespace
-         web-server/servlet/servlet-structs
-         web-server/private/web-server-structs
-         web-server/private/servlet
-         web-server/private/util)
-
-(define path->servlet/c (path? . -> . servlet?))
-(provide/contract
- [path->servlet/c contract?]
- [make-default-path->servlet
-  (->* ()
-       (#:make-servlet-namespace make-servlet-namespace/c
-                                 #:timeouts-default-servlet number?)
-       path->servlet/c)])
-
-(define (v0.response->v1.lambda response response-path)
-  (lambda (initial-request)
-    response))
-
-(define (make-v1.servlet directory timeout start)
-  (make-v2.servlet 
-   directory                   
-   (create-timeout-manager
-    #f timeout timeout)
-   (lambda (initial-request)
-     (adjust-timeout! timeout)
-     (start initial-request))))
-
-(define (make-v2.servlet directory manager start)
-  (make-servlet 
-   (current-custodian)
-   (current-namespace)
-   manager
-   directory                
-   (lambda (req)
-     (define uri (request-uri req))
-     
-     (with-handlers ([exn:fail:servlet-manager:no-instance?
-                      (lambda (the-exn)
-                        ((exn:fail:servlet-manager:no-instance-expiration-handler the-exn) req))]
-                     [exn:fail:servlet-manager:no-continuation?
-                      (lambda (the-exn)
-                        ((exn:fail:servlet-manager:no-continuation-expiration-handler the-exn) req))])
-       
-       (define-values (instance-id handler)
-         (cond
-           [(continuation-url? uri)
-            => (match-lambda
-                 [(list instance-id k-id salt)
-                  (values instance-id
-                          (custodian-box-value ((manager-continuation-lookup manager) instance-id k-id salt)))])]
-           [else
-            (define eh (exit-handler))
-            (values ((manager-create-instance manager) (λ () (eh #f)))
-                    start)]))
-       
-       (parameterize ([current-servlet-instance-id instance-id])
-         (handler req))))))
-
-(define (make-stateless.servlet directory stuffer manager start)
-  (define eh (exit-handler))
-  (define instance-id
-    ((manager-create-instance manager) (λ () (eh #f))))
-  (define ses 
-    (make-stateless-servlet
-     (current-custodian) (current-namespace)
-     manager
-     directory
-     (lambda (req) (error "Session not initialized"))
-     stuffer))
-  (parameterize ([current-directory directory]
-                 [current-servlet-instance-id instance-id]
-                 [current-servlet ses])    
-    (set-servlet-handler! ses (initialize-servlet start)))
-  ses)
-
-(require racket/runtime-path)
-(define-runtime-module-path web-server/private/servlet:module-path web-server/private/servlet)
-(define-runtime-module-path web-server/http:module-path web-server/http)
-(define common-module-specs
-  (list web-server/private/servlet:module-path
-        web-server/http:module-path))
-
-(define-runtime-module-path web-server/servlet/web:module-path web-server/servlet/web)
-(define-runtime-module-path web-server/servlet/web-cells:module-path web-server/servlet/web-cells)
-(define servlet-module-specs
-  (list 'web-server/servlet/web
-        #;web-server/servlet/web:module-path ; XXX Enabling results in error
-        web-server/servlet/web-cells:module-path))
-
-(define-runtime-module-path web-server/lang/web-cells:module-path web-server/lang/web-cells)
-(define-runtime-module-path web-server/lang/web:module-path web-server/lang/web)
-(define-runtime-module-path web-server/lang/abort-resume:module-path web-server/lang/abort-resume)
-(define lang-module-specs
-  (list web-server/lang/web-cells:module-path 
-        #;web-server/lang/abort-resume:module-path ; XXX Enabling results in error
-        'web-server/lang/abort-resume
-        #;web-server/lang/web:module-path ; XXX Enabling results in error
-        'web-server/lang/web))
-(define default-module-specs
-  (append common-module-specs
-          servlet-module-specs
-          lang-module-specs))
-(provide/contract
- [make-v1.servlet (path-string? integer? (request? . -> . can-be-response?) . -> . servlet?)]
- [make-v2.servlet (path-string? manager? (request? . -> . can-be-response?) . -> . servlet?)]
- [make-stateless.servlet (path-string? (stuffer/c serializable? bytes?) manager? (request? . -> . can-be-response?) . -> . servlet?)]
- [default-module-specs (listof (or/c resolved-module-path? module-path?))])
-
-(define (make-default-path->servlet #:make-servlet-namespace [make-servlet-namespace (make-make-servlet-namespace)]
-                                    #:timeouts-default-servlet [timeouts-default-servlet 30])
-  (lambda (a-path)
-    (parameterize ([current-namespace (make-servlet-namespace
-                                       #:additional-specs
-                                       default-module-specs)]
-                   [current-custodian (make-servlet-custodian)])
-      (let* ([path-string (path->string a-path)]
-             [path-sym (string->symbol path-string)]
-             [neg-blame 'web-server]
-             [pos-blame path-sym]
-             [module-name `(file ,path-string)]
-             [loc (make-srcloc a-path #f #f #f #f)]
-             [s (load/use-compiled a-path)])
-        (cond
-          [(void? s)
-           (let ([version 
-                  (contract (symbols 'v1 'v2 'stateless) 
-                            (dynamic-require module-name 'interface-version)
-                            pos-blame neg-blame
-                            "interface-version" loc)])
-             (case version
-               [(v1)
-                (let ([timeout (contract number?
-                                         (dynamic-require module-name 'timeout)
-                                         pos-blame neg-blame
-                                         "timeout" loc)]
-                      [start (contract (request? . -> . can-be-response?)
-                                       (dynamic-require module-name 'start)
-                                       pos-blame neg-blame
-                                       "start" loc)])
-                  (make-v1.servlet (directory-part a-path) timeout start))]
-               [(v2)
-                (let ([start (contract (request? . -> . can-be-response?)
-                                       (dynamic-require module-name 'start)
-                                       pos-blame neg-blame
-                                       "start" loc)]
-                      [manager (contract manager?
-                                         (dynamic-require module-name 'manager)
-                                         pos-blame neg-blame
-                                         "manager" loc)])
-                  (make-v2.servlet (directory-part a-path) manager start))]
-               [(stateless)
-                (let ([start (contract (request? . -> . can-be-response?)
-                                       (dynamic-require module-name 'start)
-                                       pos-blame neg-blame
-                                       "start" loc)]
-                      [manager (contract manager?
-                                         (dynamic-require module-name 'manager 
-                                                          (lambda () (create-none-manager (lambda (req) (error "No continuations!")))))
-                                         pos-blame neg-blame
-                                         "manager" loc)]
-                      [stuffer (contract (stuffer/c serializable? bytes?)
-                                         (dynamic-require module-name 'stuffer (lambda () default-stuffer))
-                                         pos-blame neg-blame
-                                         "stuffer" loc)])
-                  (make-stateless.servlet (directory-part a-path) stuffer manager start))]))]
-          [else
-           (make-v1.servlet (directory-part a-path) timeouts-default-servlet
-                            (v0.response->v1.lambda 
-                             (contract response? (response/xexpr s)
-                                       pos-blame neg-blame
-                                       path-string loc)
-                             a-path))])))))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/web-cells.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/web-cells.rkt
deleted file mode 100644
index 7fad0a788a..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/web-cells.rkt
+++ /dev/null
@@ -1,52 +0,0 @@
-#lang racket/base
-;; Implementation: Have a distinguished frame variable that is read and captured by send/suspend, 
-;; installed on invocations of continuations by the server (and NOT from other continuation invocations)
-(require racket/list
-         racket/contract)
-
-;; Data types
-(define-struct primitive-wc (id))
-(define-struct frame (env))
-
-;; Frames  
-(define *wc-frame* (make-thread-cell (make-frame (make-immutable-hasheq empty)) #t))
-(define (current-frame) (thread-cell-ref *wc-frame*))
-(define (update-frame! nf) (thread-cell-set! *wc-frame* nf))
-
-;; Web Cell Sets
-(define web-cell-set? frame?)
-(define (capture-web-cell-set) (current-frame))
-(define (restore-web-cell-set! wcs) (update-frame! wcs))
-
-(provide/contract
- [web-cell-set? (any/c . -> . boolean?)]
- [capture-web-cell-set (-> web-cell-set?)]
- [restore-web-cell-set! (web-cell-set? . -> . void)])
-
-;; Web Cells
-(define web-cell? primitive-wc?)
-
-(define (make-web-cell default)
-  (define key (gensym 'web-cell))
-  (define wc (make-primitive-wc key))
-  (web-cell-shadow wc default)
-  wc)
-
-(define (web-cell-ref pwc)
-  (define i (primitive-wc-id pwc))
-  (hash-ref
-   (frame-env (current-frame)) i
-   (lambda ()
-     (error 'web-cell "Undefined web-cell: ~.s" i))))
-
-(define (web-cell-shadow wc nv)
-  (update-frame!
-   (make-frame
-    (hash-set (frame-env (current-frame))
-              (primitive-wc-id wc) nv))))
-
-(provide/contract 
- [web-cell? (any/c . -> . boolean?)]
- [make-web-cell (any/c . -> . web-cell?)]
- [web-cell-ref (web-cell? . -> . any/c)]
- [web-cell-shadow (web-cell? any/c . -> . void)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/web.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/web.rkt
deleted file mode 100644
index 78735fb0b2..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/servlet/web.rkt
+++ /dev/null
@@ -1,173 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/list
-         net/url)
-(require web-server/managers/manager
-         web-server/private/util
-         web-server/private/servlet
-         web-server/servlet/web-cells
-         web-server/servlet/servlet-structs
-         web-server/http)
-
-(provide servlet-prompt)
-
-;; ********************************************************************************
-;; Parameter Embedding
-(require web-server/private/url-param)
-
-;; embed-ids: (list number number number) url -> string
-(define (embed-ids v u)
-  (url->string
-   (insert-param 
-    u "k" (write/string v))))
-
-;; continuation-url?: url -> (or/c (list number number number) #f)
-;; determine if this url encodes a continuation and extract the instance id and
-;; continuation id.
-(define (continuation-url? a-url)
-  (parameterize ([read-accept-dot #t])
-    (cond 
-      [(extract-param a-url "k")
-       => read/string]
-      [else
-       #f])))
-
-(provide/contract
- [continuation-url? (url? . -> . (or/c false/c (list/c number? number? number?)))])
-
-;; ********************************************************************************
-
-(provide/contract
- [current-servlet-continuation-expiration-handler 
-  (parameter/c 
-   (or/c false/c
-         (request? . -> . can-be-response?)))]
- [redirect/get (() (#:headers (listof header?)) . ->* . request?)]
- [redirect/get/forget (() (#:headers (listof header?)) . ->* . request?)]
- [adjust-timeout! (number? . -> . void?)]
- [clear-continuation-table! (-> void?)]
- [send/back (can-be-response? . -> . void?)]
- [send/finish (can-be-response? . -> . void?)]
- [send/forward ((string? . -> . can-be-response?) . -> . request?)]
- [send/suspend ((string? . -> . can-be-response?) . -> . request?)]
- [send/suspend/dispatch ((((request? . -> . any) . -> . string?) . -> . can-be-response?) . -> . any)]
- [send/suspend/url ((url? . -> . can-be-response?) . -> . request?)]
- [send/suspend/url/dispatch ((((request? . -> . any) . -> . url?) . -> . can-be-response?) . -> . any)])
-
-;; ************************************************************
-;; EXPORTS
-
-;; current-servlet-continuation-expiration-handler : request -> response
-(define current-servlet-continuation-expiration-handler
-  (make-parameter #f))
-
-;; adjust-timeout! : sec -> void
-;; adjust the timeout on the servlet
-(define (adjust-timeout! secs)
-  ((manager-adjust-timeout! (current-servlet-manager)) (current-servlet-instance-id) secs))
-
-;; ext:clear-continuations! -> void
-(define (clear-continuation-table!)
-  ((manager-clear-continuations! (current-servlet-manager)) (current-servlet-instance-id)))
-
-;; send/back: response -> void
-;; send a response and don't clear the continuation table
-(define (send/back resp)
-  (abort-current-continuation servlet-prompt (lambda () resp)))
-
-;; send/finish: response -> void
-;; send a response and clear the continuation table
-(define (send/finish resp)
-  (clear-continuation-table!)
-  (send/back resp))
-
-;; send/suspend: (url -> response) -> request
-;; send a response and apply the continuation to the next request
-(define (send/suspend response-generator)
-  (define wcs (capture-web-cell-set))
-  (begin0
-    (call-with-composable-continuation
-     (lambda (k)
-       (define instance-id (current-servlet-instance-id))
-       (define ctxt (current-execution-context))
-       (define k-embedding ((manager-continuation-store! (current-servlet-manager))
-                            instance-id
-                            (make-custodian-box (current-custodian) k)
-                            (current-servlet-continuation-expiration-handler)))
-       (define k-url (embed-ids 
-                      (list* instance-id k-embedding)
-                      (request-uri (execution-context-request ctxt))))
-       (send/back (response-generator k-url)))
-     servlet-prompt)
-    (restore-web-cell-set! wcs)))
-
-(define (send/suspend/url response-generator)
-  (send/suspend
-   (lambda (k-url)
-     (response-generator (string->url k-url)))))
-
-;; send/forward: (url -> response) [(request -> response)] -> request
-;; clear the continuation table, then behave like send/suspend
-(define (send/forward response-generator)
-  (clear-continuation-table!)
-  (send/suspend response-generator))
-
-;; send/suspend/dispatch : ((proc -> url) -> response) [(request -> response)] -> request
-;; send/back a response generated from a procedure that may convert
-;; procedures to continuation urls
-(define (send/suspend/dispatch response-generator)
-  ; This restores the tail position.
-  ; Note: Herman's syntactic strategy would fail without the new-request capture.
-  ;       (Moving this to the tail-position is not possible anyway, by the way.)
-  (let ([thunk 
-         (call-with-current-continuation
-          (lambda (k0)
-            (send/back
-             (response-generator
-              (lambda (proc)
-                (let/ec k1 
-                  ; This makes the second continuation captured by send/suspend smaller
-                  (call-with-continuation-prompt
-                   (lambda ()
-                     (let ([new-request (send/suspend k1)])
-                       (k0 (lambda () (proc new-request)))))
-                   servlet-prompt))))))
-          servlet-prompt)])
-    (thunk)))
-
-(define (send/suspend/url/dispatch response-generator)
-  (send/suspend/dispatch
-   (lambda (embed/url)
-     (response-generator
-      (lambda (proc)
-        (string->url (embed/url proc)))))))
-
-;; ************************************************************
-;; HIGHER-LEVEL EXPORTS
-
-(define ((make-redirect/get send/suspend) #:headers [hs empty])
-  (send/suspend (lambda (k-url) (redirect-to k-url temporarily #:headers hs))))
-
-; redirect/get : -> request
-(define redirect/get (make-redirect/get send/suspend))
-(define redirect/get/forget (make-redirect/get send/forward))
-
-(define (with-errors-to-browser send/finish-or-back thunk)
-  (with-handlers 
-      ([exn:fail?
-        (lambda (exn)
-          (send/finish-or-back
-           (response/xexpr
-            #:code 500
-            `(html (head (title "Servlet Error"))
-                   (body ([bgcolor "white"])
-                         (p "The following error occured: "
-                            (pre ,(exn->string exn))))))))])
-    (thunk)))
-
-(provide/contract
- [with-errors-to-browser
-  ((can-be-response? . -> . request?)
-   (-> any)
-   . -> .
-   any)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers.rkt
deleted file mode 100644
index 98710123fd..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket/base
-(require web-server/stuffers/stuffer
-         web-server/stuffers/base64
-         web-server/stuffers/gzip
-         web-server/stuffers/hash
-         web-server/stuffers/serialize
-         web-server/stuffers/store
-         web-server/stuffers/hmac-sha1
-         (only-in web-server/lang/stuff-url
-                  default-stuffer
-                  make-default-stuffer
-                  is-url-too-big?))
-(provide
- (all-from-out web-server/stuffers/stuffer
-               web-server/stuffers/base64
-               web-server/stuffers/gzip
-               web-server/stuffers/hash
-               web-server/stuffers/serialize
-               web-server/stuffers/store
-               web-server/stuffers/hmac-sha1
-               web-server/lang/stuff-url))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/base64.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/base64.rkt
deleted file mode 100644
index f8b00dcfa5..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/base64.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require racket/contract
-         web-server/stuffers/stuffer
-         net/base64)
-
-(define base64-stuffer
-  (make-stuffer base64-encode base64-decode))
-
-(provide/contract
- [base64-stuffer (stuffer/c bytes? bytes?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/gzip.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/gzip.rkt
deleted file mode 100644
index 2b1658d206..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/gzip.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-(require racket/contract
-         web-server/private/gzip
-         web-server/stuffers/stuffer)
-
-(define gzip-stuffer
-  (make-stuffer gzip/bytes gunzip/bytes))
-
-(provide/contract
- [gzip-stuffer (stuffer/c bytes? bytes?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/hash.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/hash.rkt
deleted file mode 100644
index 43c29ed91f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/hash.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-(require racket/contract
-         web-server/stuffers/stuffer
-         web-server/stuffers/store
-         file/md5)
-
-(define hash-fun/c
-  (bytes? . -> . bytes?))
-
-(define (hash-stuffer hash store)
-  (make-stuffer
-   (lambda (v)
-     (define hv (hash v))
-     ((store-write store) hv v)
-     hv)
-   (lambda (hv)
-     ((store-read store) hv))))
-
-(define (md5-stuffer home)
-  (hash-stuffer md5 (dir-store home)))
-
-(provide/contract
- [hash-fun/c contract?]
- [hash-stuffer (hash-fun/c store? . -> . (stuffer/c bytes? bytes?))]
- [md5-stuffer (path-string? . -> . (stuffer/c bytes? bytes?))])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/hmac-sha1.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/hmac-sha1.rkt
deleted file mode 100644
index c81056c23f..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/hmac-sha1.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-(require racket/contract
-         web-server/stuffers/stuffer
-         racket/runtime-path
-         openssl/libcrypto
-         (rename-in ffi/unsafe
-                    [-> f->]))
-
-(define EVP_SHA1
-  (and libcrypto
-       (get-ffi-obj 'EVP_sha1 libcrypto
-                    (_fun f-> _fpointer))))
-
-(define HMAC-SHA1/raw
-  (if libcrypto
-      (get-ffi-obj 'HMAC libcrypto
-                   (_fun [EVP_MD : _fpointer = (EVP_SHA1)]
-                         [key : _bytes]
-                         [key_len : _int = (bytes-length key)]
-                         [data : _bytes]
-                         [data_len : _int = (bytes-length data)]
-                         [md : (_bytes o 20)]
-                         [md_len : (_ptr o _uint)]
-                         f-> _bytes
-                         f-> md))
-      (lambda (key data) (error 'HMAC-SHA1/raw "libcrypto could not load"))))
-
-(define (HMAC-SHA1 key data)
-  (HMAC-SHA1/raw key data)
-  ; It returns the same pointer always
-  #;(bytes-copy
-   ; A SHA1 is 20 bytes, including 0s
-   (make-sized-byte-string (HMAC-SHA1/raw key data) 20)))
-
-(define (HMAC-SHA1-stuffer key)
-  (make-stuffer
-   (lambda (ib)
-     (bytes-append (HMAC-SHA1 key ib) ib))
-   (lambda (ob)
-     (define hib (subbytes ob 0 20))
-     (define ib (subbytes ob 20))
-     (define true-hib (HMAC-SHA1 key ib))
-     (if (bytes=? hib true-hib)
-         ib
-         (error 'HMAC-SHA1-stuffer "Signature does not match!")))))
-
-(provide/contract
- [HMAC-SHA1 (bytes? bytes? . -> . bytes?)]
- [HMAC-SHA1-stuffer (bytes? . -> . (stuffer/c bytes? bytes?))])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/serialize.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/serialize.rkt
deleted file mode 100644
index d81b26cb51..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/serialize.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/serialize
-         web-server/stuffers/stuffer
-         web-server/private/util
-         web-server/private/mod-map)
-
-(define serialize-stuffer
-  (make-stuffer
-   (lambda (v) (write/bytes (compress-serial (serialize v))))
-   (lambda (v) (deserialize (decompress-serial (read/bytes v))))))
-
-(provide/contract
- [serialize-stuffer (stuffer/c serializable? bytes?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/store.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/store.rkt
deleted file mode 100644
index 5bdf11512e..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/store.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-(require racket/contract)
-
-(define-struct store (write read))
-
-(define (dir-store home)
-  (make-store
-   (lambda (key value)
-     (with-output-to-file
-         (build-path home (bytes->string/utf-8 key))
-       (lambda ()
-         (write value))
-       #:exists 'replace))
-   (lambda (key)
-     (with-input-from-file
-         (build-path home (bytes->string/utf-8 key))
-       (lambda () (read))))))
-
-(provide/contract
- [struct store ([write (bytes? bytes? . -> . void)]
-                [read (bytes? . -> . bytes?)])]
- [dir-store (path-string? . -> . store?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/stuffer.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/stuffer.rkt
deleted file mode 100644
index ef8d662457..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/stuffers/stuffer.rkt
+++ /dev/null
@@ -1,80 +0,0 @@
-#lang racket/base
-(require racket/contract
-         racket/match)
-
-(define-struct stuffer (in out))
-(define (stuffer/c dom rng)
-  (define in (dom . -> . rng))
-  (define in-proc (contract-projection in))
-  (define out (rng . -> . dom))  
-  (define out-proc (contract-projection out))
-  (make-contract
-   #:name (build-compound-type-name 'stuffer/c in out)
-   #:projection
-   (λ (blame)
-     (define in-app (in-proc blame))
-     (define out-app (out-proc blame))
-     (λ (val)
-       (unless (stuffer? val)
-         (raise-blame-error
-          blame
-          val
-          "expected <stuffer>, given: ~e"
-          val))
-       (make-stuffer
-        (in-app (stuffer-in val))
-        (out-app (stuffer-out val)))))
-   #:first-order stuffer?))
-
-(define id-stuffer
-  (make-stuffer 
-   (lambda (v) v)
-   (lambda (v) v)))
-
-(define (stuffer-compose g f)
-  (make-stuffer
-   (lambda (v)
-     ((stuffer-in g) ((stuffer-in f) v)))
-   (lambda (v)
-     ((stuffer-out f) ((stuffer-out g) v)))))
-
-(define (stuffer-sequence f g)
-  (stuffer-compose g f))
-
-(define (stuffer-if c f)
-  (make-stuffer
-   (lambda (v)
-     (if (c v)
-         (bytes-append #"1" ((stuffer-in f) v))
-         (bytes-append #"0" v)))
-   (lambda (tv)
-     (define tag (subbytes tv 0 1))
-     (define v (subbytes tv 1))
-     (if (bytes=? tag #"1")
-         ((stuffer-out f) v)
-         v))))
-
-(define (stuffer-chain . ss)
-  (match ss
-    [(list)
-     id-stuffer]
-    [(list-rest f ss)
-     (cond
-       [(stuffer? f)     
-        (stuffer-sequence
-         f (apply stuffer-chain ss))]
-       [(procedure? f)
-        (stuffer-if 
-         f (apply stuffer-chain ss))])]))
-
-(define-values (alpha beta gamma) (values any/c any/c any/c))
-(provide/contract
- [struct stuffer
-         ([in (any/c . -> . any/c)]
-          [out (any/c . -> . any/c)])]
- [stuffer/c (any/c any/c . -> . contract?)]
- [id-stuffer (stuffer/c alpha alpha)]
- [stuffer-compose ((stuffer/c beta gamma) (stuffer/c alpha beta) . -> . (stuffer/c alpha gamma))]
- [stuffer-sequence ((stuffer/c alpha beta) (stuffer/c beta gamma) . -> . (stuffer/c alpha gamma))]
- [stuffer-if ((bytes? . -> . boolean?) (stuffer/c bytes? bytes?) . -> . (stuffer/c bytes? bytes?))]
- [stuffer-chain (() () #:rest (listof (or/c stuffer? (bytes? . -> . boolean?))) . ->* . stuffer?)])
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/templates.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/templates.rkt
deleted file mode 100644
index d953e3f8f5..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/templates.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-(require xml
-         scribble/text
-         (for-syntax racket/base
-                     racket/list
-                     syntax/parse)
-         racket/port)
-
-(define-syntax (include-template stx)
-  (syntax-parse stx
-    [(_ (~optional (~seq #:command-char command-char:expr)) p:expr)
-     (quasisyntax/loc stx
-       (with-output-to-string
-         (lambda ()
-           (output (include/text #,@(if (attribute command-char)
-                                      (list #'#:command-char #'command-char)
-                                      empty)
-                                 p)))))]))
-
-(define-syntax include-template/xexpr
-  (syntax-rules ()
-    [(_ . p)
-     (string->xexpr (include-template . p))]))
-
-(define-syntax in
-  (syntax-rules ()
-    [(_ x xs e ...)
-     (for/list ([x xs])
-       (begin/text e ...))]))
-
-(provide include-template
-         in)
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/test.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/test.rkt
deleted file mode 100644
index 9eeae691f1..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/test.rkt
+++ /dev/null
@@ -1,107 +0,0 @@
-#lang racket/base
-(require racket/contract
-         web-server/dispatchers/dispatch
-         web-server/servlet/servlet-structs)
-
-(define tester/c
-  (->* ()
-       ((or/c string? url? request? false/c)
-        (listof binding?)
-        #:raw? boolean?
-        #:headers? boolean?)
-       (or/c bytes?
-             xexpr?
-             (cons/c bytes?
-                     (or/c bytes?
-                           xexpr?)))))
-
-(provide/contract
- [tester/c contract?]
- [make-servlet-tester
-  (-> (-> request?
-          can-be-response?)
-      tester/c)]
- [make-dispatcher-tester
-  (-> dispatcher/c
-      tester/c)])
-
-;; Real Library
-(require racket/list
-         racket/promise
-         net/url
-         web-server/http
-         web-server/servlet-dispatch)
-
-(define (make-servlet-tester servlet)
-  (define d (dispatch/servlet servlet))
-  (make-dispatcher-tester d))
-
-(define (make-dispatcher-tester d)
-  (λ ([s-or-u-or-req #f]
-      [bs empty]
-      #:raw? [raw? #f]
-      #:headers? [hs? #f])
-    (define req
-      (if (request? s-or-u-or-req)
-        s-or-u-or-req
-        (let ()
-          (define s-or-u
-            (if s-or-u-or-req
-              s-or-u-or-req
-              "/"))
-          (define u
-            (if (string? s-or-u)
-              (string->url s-or-u)
-              s-or-u))
-          (make-request #"GET" u empty (delay bs) #"" "127.0.0.1" 80 "127.0.0.1"))))
-    (call d req #:raw? raw? #:headers? hs?)))
-
-;; Intermediate Library
-(require racket/match
-         xml
-         web-server/private/timer
-         web-server/private/connection-manager
-         web-server/private/web-server-structs)
-
-(define (call d req #:raw? raw? #:headers? hs?)
-  (htxml (collect d req) raw? hs?))
-(define (htxml bs raw? hs?)
-  (match (regexp-match #"^(.+)\r\n\r\n(.*)$" bs)
-    [(list _ h s)
-     (define body
-       (if raw?
-         s
-         (string->xexpr (bytes->string/utf-8 s))))
-     (if hs?
-       (cons h body)
-       body)]
-    [_
-     (error 'servlet "Servlet did not return an HTTP response, instead returned ~v"
-            bs)]))
-
-(define (collect d req)
-  (parameterize ([current-custodian (make-custodian)])
-    (define-values (c i o) (make-mock-connection #""))
-    (parameterize ([current-server-custodian (current-custodian)])
-      (call-with-continuation-barrier
-       (lambda ()
-         (d c req))))
-    (redact (get-output-bytes o))))
-
-(define (make-mock-connection ib)
-  (define ip (open-input-bytes ib))
-  (define op (open-output-bytes))
-  (define tm (start-timer-manager))
-  (values (make-connection 0 (make-timer tm never-evt +inf.0 (lambda () (void)))
-                           ip op (current-custodian) #t)
-          ip
-          op))
-
-(define (redact b)
-  (regexp-replace
-   #"Date: [a-zA-Z0-9:, ]+ GMT\r\n"
-   (regexp-replace
-    #"Last-Modified: [a-zA-Z0-9:, ]+ GMT\r\n"
-    b
-    #"Last-Modified: REDACTED GMT\r\n")
-   #"Date: REDACTED GMT\r\n"))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/web-config-sig.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/web-config-sig.rkt
deleted file mode 100644
index 35a10553fd..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/web-config-sig.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require racket/unit
-         racket/contract
-         web-server/private/util
-         web-server/configuration/namespace
-         web-server/configuration/configuration-table-structs)
-
-(provide
- web-config^)
-
-(define-signature
-  web-config^
-  ((contracted
-    [max-waiting integer?]
-    [virtual-hosts (string? . -> . host?)]
-    [initial-connection-timeout integer?]
-    [port port-number?]
-    [listen-ip (or/c false/c string?)]
-    [make-servlet-namespace make-servlet-namespace/c])))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/web-config-unit.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/web-config-unit.rkt
deleted file mode 100644
index dce9aee515..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/web-config-unit.rkt
+++ /dev/null
@@ -1,140 +0,0 @@
-#lang racket/base
-(require mzlib/unit
-         racket/contract)
-(require web-server/private/util
-         web-server/private/cache-table
-         web-server/configuration/configuration-table-structs
-         web-server/configuration/configuration-table
-         web-server/configuration/namespace
-         web-server/configuration/responders
-         web-server/web-config-sig)
-(provide/contract
- [configuration-table->web-config@
-  (->* (path-string?)
-       (#:port (or/c false/c number?)
-               #:listen-ip (or/c false/c string?)
-               #:make-servlet-namespace make-servlet-namespace/c)
-       (unit/c (import) (export web-config^)))]
- [configuration-table-sexpr->web-config@
-  (->* (configuration-table-sexpr?)
-       (#:web-server-root path-string?
-                          #:port (or/c false/c number?)
-                          #:listen-ip (or/c false/c string?)
-                          #:make-servlet-namespace make-servlet-namespace/c)
-       (unit/c (import) (export web-config^)))])
-
-; configuration-table->web-config@ : path -> configuration
-(define (configuration-table->web-config@ 
-         table-file-name
-         #:port [port #f]
-         #:listen-ip [listen-ip #f]
-         #:make-servlet-namespace [make-servlet-namespace (make-make-servlet-namespace)])
-  (configuration-table-sexpr->web-config@ 
-   (call-with-input-file table-file-name read)
-   #:web-server-root (directory-part table-file-name)
-   #:port port
-   #:listen-ip listen-ip
-   #:make-servlet-namespace make-servlet-namespace))
-
-; configuration-table-sexpr->web-config@ : string? sexp -> configuration
-(define (configuration-table-sexpr->web-config@
-         sexpr
-         #:web-server-root [web-server-root (directory-part default-configuration-table-path)]         
-         #:port [port #f]
-         #:listen-ip [listen-ip #f]
-         #:make-servlet-namespace [make-servlet-namespace (make-make-servlet-namespace)])
-  (complete-configuration
-   web-server-root
-   (sexpr->configuration-table sexpr)
-   #:port port
-   #:listen-ip listen-ip
-   #:make-servlet-namespace make-servlet-namespace))
-
-; : str configuration-table -> configuration
-(define (complete-configuration 
-         base table         
-         #:port [port #f]
-         #:listen-ip [listen-ip #f]
-         #:make-servlet-namespace [make-servlet-namespace (make-make-servlet-namespace)])
-  (define default-host
-    (apply-default-functions-to-host-table
-     base (configuration-table-default-host table)))
-  (define expanded-virtual-host-table
-    (map (lambda (x)
-           (list (regexp (string-append (car x) "(:[0-9]*)?"))
-                 (apply-default-functions-to-host-table base (cdr x))))
-         (configuration-table-virtual-hosts table)))
-  (build-configuration
-   table
-   (gen-virtual-hosts expanded-virtual-host-table default-host)
-   #:port port
-   #:listen-ip listen-ip
-   #:make-servlet-namespace make-servlet-namespace))
-
-; : configuration-table host-table -> configuration
-(define (build-configuration 
-         table the-virtual-hosts
-         #:port [port #f]
-         #:listen-ip [listen-ip #f]
-         #:make-servlet-namespace [make-servlet-namespace (make-make-servlet-namespace)])
-  (define the-port (or port (configuration-table-port table)))
-  (define the-listen-ip (or listen-ip #f))
-  (define the-make-servlet-namespace make-servlet-namespace)
-  (unit
-    (import)
-    (export web-config^)
-    (define port the-port)
-    (define max-waiting (configuration-table-max-waiting table))
-    (define listen-ip the-listen-ip)
-    (define initial-connection-timeout (configuration-table-initial-connection-timeout table))
-    (define virtual-hosts the-virtual-hosts)
-    (define make-servlet-namespace the-make-servlet-namespace)))
-
-; apply-default-functions-to-host-table : str host-table -> host
-;; Greg P: web-server-root is the directory-part of the path to the configuration-table (I don't think I like this.)
-(define (apply-default-functions-to-host-table web-server-root host-table)
-  (let ([paths (expand-paths web-server-root (host-table-paths host-table))])
-    (make-host
-     (host-table-indices host-table)
-     (host-table-log-format host-table) (paths-log paths)
-     (paths-passwords paths)
-     (let ([m (host-table-messages host-table)]
-           [conf (paths-conf paths)])
-       (make-responders
-        servlet-error-responder
-        servlet-loading-responder
-        (gen-authentication-responder (build-path-unless-absolute conf (messages-authentication m)))
-        (gen-servlets-refreshed (build-path-unless-absolute conf (messages-servlets-refreshed m)))
-        (gen-passwords-refreshed (build-path-unless-absolute conf (messages-passwords-refreshed m)))
-        (gen-file-not-found-responder (build-path-unless-absolute conf (messages-file-not-found m)))
-        (gen-protocol-responder (build-path-unless-absolute conf (messages-protocol m)))
-        (gen-collect-garbage-responder (build-path-unless-absolute conf (messages-collect-garbage m)))))
-     (host-table-timeouts host-table)
-     paths)))
-
-; expand-paths : str paths -> paths
-(define (expand-paths web-server-root paths)
-  (let ([build-path-unless-absolute
-         (lambda (b p) 
-           (if p 
-               (build-path-unless-absolute b p)
-               #f))])
-    (let* ([host-base (build-path-unless-absolute web-server-root (paths-host-base paths))]
-           [htdocs-base (build-path-unless-absolute host-base (paths-htdocs paths))])
-      (make-paths (build-path-unless-absolute host-base (paths-conf paths))
-                  host-base
-                  (build-path-unless-absolute host-base (paths-log paths))
-                  htdocs-base
-                  (build-path-unless-absolute htdocs-base (paths-servlet paths))
-                  (build-path-unless-absolute host-base (paths-mime-types paths))                    
-                  (build-path-unless-absolute host-base (paths-passwords paths))))))
-
-; gen-virtual-hosts : (listof (list regexp host)) host ->
-; str -> host-configuration
-(define (gen-virtual-hosts expanded-virtual-host-table default-host)
-  (lambda (host-name-possibly-followed-by-a-collon-and-a-port-number)
-    (or (ormap (lambda (x)
-                 (and (regexp-match (car x) host-name-possibly-followed-by-a-collon-and-a-port-number)
-                      (cadr x)))
-               expanded-virtual-host-table)
-        default-host)))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/web-server-sig.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/web-server-sig.rkt
deleted file mode 100644
index 1d8a21b131..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/web-server-sig.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require web-server/private/dispatch-server-sig)
-(provide (rename-out [dispatch-server^ web-server^]))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/web-server-unit.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/web-server-unit.rkt
deleted file mode 100644
index e575f15a2a..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/web-server-unit.rkt
+++ /dev/null
@@ -1,106 +0,0 @@
-#lang racket/base
-(require net/tcp-sig
-         racket/unit)
-(require web-server/web-server-sig
-         web-server/web-config-sig
-         web-server/private/dispatch-server-unit
-         web-server/private/dispatch-server-sig
-         web-server/private/web-server-structs
-         web-server/private/mime-types
-         web-server/configuration/configuration-table-structs
-         web-server/private/cache-table
-         (prefix-in http: web-server/http/request))
-(require web-server/dispatchers/dispatch
-         web-server/servlet/setup
-         (prefix-in fsmap: web-server/dispatchers/filesystem-map)
-         (prefix-in sequencer: web-server/dispatchers/dispatch-sequencer)
-         (prefix-in timeout: web-server/dispatchers/dispatch-timeout)
-         (prefix-in passwords: web-server/dispatchers/dispatch-passwords)
-         (prefix-in files: web-server/dispatchers/dispatch-files)
-         (prefix-in servlets: web-server/dispatchers/dispatch-servlets)
-         (prefix-in path-procedure: web-server/dispatchers/dispatch-pathprocedure)
-         (prefix-in log: web-server/dispatchers/dispatch-log)
-         (prefix-in host: web-server/dispatchers/dispatch-host)
-         (prefix-in filter: web-server/dispatchers/dispatch-filter)
-         (prefix-in lift: web-server/dispatchers/dispatch-lift))
-
-(provide web-server@)
-
-(define-unit web-config@->dispatch-server-config@
-  (import (prefix config: web-config^))
-  (export dispatch-server-config^)
-  (init-depend web-config^)
-  (define read-request http:read-request)
-  
-  (define port config:port)
-  (define listen-ip config:listen-ip)
-  (define max-waiting config:max-waiting)
-  (define initial-connection-timeout config:initial-connection-timeout)
-  
-  ;; dispatch : connection request -> void
-  (define dispatch-cache (make-cache-table))
-  (define dispatch 
-    (host:make
-     (lambda (host)
-       (cache-table-lookup!
-        dispatch-cache host
-        (lambda ()
-          (parameterize ([current-custodian (current-server-custodian)])
-            (host-info->dispatcher
-             (config:virtual-hosts (symbol->string host)))))))))
-  
-  ;; host-info->dispatcher : host-info -> conn request -> void
-  (define (host-info->dispatcher host-info)
-    (sequencer:make
-     (timeout:make initial-connection-timeout)
-     (if (and (host-log-format host-info)
-              (host-log-path host-info))
-         (log:make #:format (log:log-format->format (host-log-format host-info))
-                   #:log-path (host-log-path host-info))
-         (lambda (conn req) (next-dispatcher)))
-     (if (host-passwords host-info)
-         (let-values ([(update-password-cache! password-check)
-                       (passwords:password-file->authorized? (host-passwords host-info))])
-           (sequencer:make
-            (timeout:make (timeouts-password (host-timeouts host-info)))
-            (passwords:make
-             (passwords:make-basic-denied?/path
-              password-check)
-             #:authentication-responder (responders-authentication (host-responders host-info)))
-            (path-procedure:make "/conf/refresh-passwords"
-                                 (lambda _
-                                   (update-password-cache!)
-                                   ((responders-passwords-refreshed (host-responders host-info)))))))
-         (lambda (conn req) (next-dispatcher)))
-     (path-procedure:make "/conf/collect-garbage"
-                          (lambda _
-                            (collect-garbage)
-                            ((responders-collect-garbage (host-responders host-info)))))     
-     (let-values ([(clear-cache! url->servlet)
-                   (servlets:make-cached-url->servlet
-                    (fsmap:filter-url->path
-                     #rx"\\.(ss|scm|rkt|rktd)$"
-                     (fsmap:make-url->valid-path
-                      (fsmap:make-url->path (paths-servlet (host-paths host-info)))))
-                    (make-default-path->servlet
-                     #:make-servlet-namespace config:make-servlet-namespace
-                     #:timeouts-default-servlet (timeouts-default-servlet (host-timeouts host-info))))])
-       (sequencer:make
-        (path-procedure:make "/conf/refresh-servlets"
-                             (lambda _
-                               (clear-cache!)
-                               ((responders-servlets-refreshed (host-responders host-info)))))
-        (sequencer:make
-         (timeout:make (timeouts-servlet-connection (host-timeouts host-info)))
-         (servlets:make url->servlet
-                        #:responders-servlet-loading (responders-servlet-loading (host-responders host-info))
-                        #:responders-servlet (responders-servlet (host-responders host-info))))))
-     (files:make #:url->path (fsmap:make-url->path (paths-htdocs (host-paths host-info)))
-                 #:path->mime-type (make-path->mime-type (paths-mime-types (host-paths host-info)))
-                 #:indices (host-indices host-info))
-     (lift:make (responders-file-not-found (host-responders host-info))))))
-
-(define-compound-unit/infer web-server@
-  (import tcp^ web-config^)
-  (export web-server^)
-  (link web-config@->dispatch-server-config@ dispatch-server@))
diff --git a/pkgs/web-server-pkgs/web-server-lib/web-server/web-server.rkt b/pkgs/web-server-pkgs/web-server-lib/web-server/web-server.rkt
deleted file mode 100644
index 3b5b559be5..0000000000
--- a/pkgs/web-server-pkgs/web-server-lib/web-server/web-server.rkt
+++ /dev/null
@@ -1,137 +0,0 @@
-#lang racket/base
-(require racket/match
-         net/tcp-sig
-         (prefix-in raw: net/tcp-unit)
-         racket/unit
-         racket/async-channel
-         racket/contract
-         unstable/contract
-         web-server/dispatchers/dispatch
-         web-server/private/dispatch-server-sig
-         web-server/private/dispatch-server-unit
-         web-server/web-config-sig
-         web-server/web-server-sig
-         web-server/web-server-unit
-         (prefix-in http: web-server/http/request))
-(provide/contract
- [serve
-  (->* (#:dispatch dispatcher/c)
-       (#:confirmation-channel (or/c false/c async-channel?)
-                               #:connection-close? boolean?
-                               #:tcp@ (unit/c (import) (export tcp^))
-                               #:port tcp-listen-port?
-                               #:listen-ip (or/c false/c string?)
-                               #:max-waiting exact-nonnegative-integer?
-                               #:initial-connection-timeout number?)
-       (-> void))]
- [serve/ports
-  (->* (#:dispatch dispatcher/c)
-       (#:confirmation-channel (or/c false/c async-channel?)
-                               #:connection-close? boolean?
-                               #:tcp@ (unit/c (import) (export tcp^))
-                               #:ports (listof tcp-listen-port?)
-                               #:listen-ip (or/c false/c string?)
-                               #:max-waiting exact-nonnegative-integer?
-                               #:initial-connection-timeout number?)
-       (-> void))]
- [serve/ips+ports
-  (->* (#:dispatch dispatcher/c)
-       (#:confirmation-channel (or/c false/c async-channel?)
-                               #:connection-close? boolean?
-                               #:tcp@ (unit/c (import) (export tcp^))
-                               #:ips+ports (listof (cons/c (or/c false/c string?) (listof tcp-listen-port?)))
-                               #:max-waiting exact-nonnegative-integer?
-                               #:initial-connection-timeout number?)
-       (-> void))]
- [do-not-return (-> void)]
- [serve/web-config@ (((unit/c (import) (export web-config^))) (#:tcp@ (unit/c (import) (export tcp^))) . ->* . (-> void?))])
-
-(define (do-not-return)
-  (semaphore-wait (make-semaphore 0)))
-
-(define (serve
-         #:dispatch dispatch
-         #:confirmation-channel [confirmation-channel #f]
-         #:connection-close? [connection-close? #f]
-         #:tcp@ [tcp@ raw:tcp@]
-         #:port [port 80]
-         #:listen-ip [listen-ip #f]
-         #:max-waiting [max-waiting 511]
-         #:initial-connection-timeout [initial-connection-timeout 60])
-  (define read-request 
-    (http:make-read-request
-     #:connection-close? connection-close?))
-  (define-unit-binding a-tcp@
-    tcp@ (import) (export tcp^))
-  (define-compound-unit/infer dispatch-server@/tcp@
-    (import dispatch-server-config^)
-    (link a-tcp@ dispatch-server@)
-    (export dispatch-server^))
-  (define-values/invoke-unit
-    dispatch-server@/tcp@
-    (import dispatch-server-config^)
-    (export dispatch-server^))
-  
-  (serve #:confirmation-channel confirmation-channel))
-
-(define (serve/ports
-         #:dispatch dispatch
-         #:confirmation-channel [confirmation-channel #f]
-         #:connection-close? [connection-close? #f]
-         #:tcp@ [tcp@ raw:tcp@]
-         #:ports [ports (list 80)]
-         #:listen-ip [listen-ip #f]
-         #:max-waiting [max-waiting 511]
-         #:initial-connection-timeout [initial-connection-timeout 60])
-  (define shutdowns
-    (map (lambda (port)
-           (serve 
-            #:dispatch dispatch
-            #:confirmation-channel confirmation-channel
-            #:connection-close? connection-close?
-            #:tcp@ tcp@
-            #:port port
-            #:listen-ip listen-ip
-            #:max-waiting max-waiting
-            #:initial-connection-timeout initial-connection-timeout))
-         ports))
-  (lambda ()
-    (for-each apply shutdowns)))
-
-(define (serve/ips+ports
-         #:dispatch dispatch
-         #:confirmation-channel [confirmation-channel #f]
-         #:connection-close? [connection-close? #f]
-         #:tcp@ [tcp@ raw:tcp@]
-         #:ips+ports [ips+ports (list (cons #f (list 80)))]
-         #:max-waiting [max-waiting 511]
-         #:initial-connection-timeout [initial-connection-timeout 60])
-  (define shutdowns
-    (map (match-lambda
-           [(list-rest listen-ip ports)
-            (serve/ports
-             #:dispatch dispatch
-             #:confirmation-channel confirmation-channel
-             #:connection-close? connection-close?
-             #:tcp@ tcp@
-             #:ports ports
-             #:listen-ip listen-ip
-             #:max-waiting max-waiting
-             #:initial-connection-timeout initial-connection-timeout)])
-         ips+ports))
-  (lambda ()
-    (for-each apply shutdowns)))
-
-; serve/config@ : configuration -> (-> void)
-(define (serve/web-config@ config@ #:tcp@ [tcp@ raw:tcp@])
-  (define-unit-binding a-tcp@
-    tcp@ (import) (export tcp^))
-  (define-unit m@ (import web-server^) (export)
-    (init-depend web-server^)
-    (serve))
-  (define-unit-binding c@ config@ (import) (export web-config^))
-  (invoke-unit
-   (compound-unit/infer
-    (import)
-    (link a-tcp@ c@ web-server@ m@)
-    (export))))
diff --git a/pkgs/web-server-pkgs/web-server-test/LICENSE.txt b/pkgs/web-server-pkgs/web-server-test/LICENSE.txt
deleted file mode 100644
index 7b6f804ae7..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-web-server-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/web-server-pkgs/web-server-test/info.rkt b/pkgs/web-server-pkgs/web-server-test/info.rkt
deleted file mode 100644
index 34ec9ad71b..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/info.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '())
-(define build-deps '("base"
-                     "compatibility-lib"
-                     "eli-tester"
-                     "htdp-lib"
-                     "rackunit-lib"
-                     "web-server-lib"))
-(define update-implies '("web-server-lib"))
-
-(define pkg-desc "tests for \"web-server\"")
-
-(define pkg-authors '(jay))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/.gitignore b/pkgs/web-server-pkgs/web-server-test/tests/web-server/.gitignore
deleted file mode 100644
index 086e51e574..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# All key files, in any subdirectories, to avoid bad accidents
-*pem
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/all-web-server-tests.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/all-web-server-tests.rkt
deleted file mode 100644
index 3761ba79e8..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/all-web-server-tests.rkt
+++ /dev/null
@@ -1,33 +0,0 @@
-#lang racket/base
-(require rackunit
-         "configuration/all-configuration-tests.rkt"
-         "dispatchers/all-dispatchers-tests.rkt"           
-         "lang/all-lang-tests.rkt"
-         "lang-test.rkt"
-         "managers/all-managers-tests.rkt"
-         "http/all-http-tests.rkt"
-         "private/all-private-tests.rkt"
-         "servlet/all-servlet-tests.rkt"
-         "stuffers-test.rkt"
-         "formlets-test.rkt"
-         "dispatch-test.rkt"
-         "servlet-env-test.rkt"
-         "test-tests.rkt")
-(provide all-web-server-tests)
-
-(define all-web-server-tests  
-  (test-suite
-   "Web Server"
-   all-http-tests
-   all-stuffers-tests
-   all-formlets-tests
-   all-dispatch-tests
-   all-configuration-tests
-   all-dispatchers-tests
-   all-lang-tests
-   lang-tests
-   all-managers-tests
-   all-private-tests
-   all-servlet-tests
-   servlet-env-tests
-   test-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/configuration/all-configuration-tests.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/configuration/all-configuration-tests.rkt
deleted file mode 100644
index c078eb9b83..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/configuration/all-configuration-tests.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(require rackunit
-         "configuration-table-test.rkt")
-(provide all-configuration-tests)
-
-(define all-configuration-tests  
-  (test-suite
-   "Configuration"
-   configuration-table-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/configuration/configuration-table-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/configuration/configuration-table-test.rkt
deleted file mode 100644
index 3e18e3a991..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/configuration/configuration-table-test.rkt
+++ /dev/null
@@ -1,68 +0,0 @@
-#lang racket/base
-(require rackunit
-         (only-in mzlib/file
-                  make-temporary-file)
-         web-server/configuration/configuration-table)
-(provide configuration-table-tests)
-
-(define configuration-table-tests
-  (test-suite
-   "Configuration Table"
-   
-   (test-case
-    "Default configuration file may be parsed"
-    (check-not-false (read-configuration-table default-configuration-table-path)))
-   
-   (test-case
-    "Default configuration file may be written"
-    (check-not-false (write-configuration-table 
-                      (read-configuration-table default-configuration-table-path)
-                      (make-temporary-file))))
-   
-   (test-case
-    "False allowed in configuration file for passwords"
-    (let ([false-sexpr
-           `((port 80)
-             (max-waiting 40)
-             (initial-connection-timeout 30)
-             (default-host-table
-               (host-table
-                (default-indices "index.html" "index.htm")
-                (log-format parenthesized-default)
-                (messages
-                 (servlet-message "servlet-error.html")
-                 (authentication-message "forbidden.html")
-                 (servlets-refreshed "servlet-refresh.html")
-                 (passwords-refreshed "passwords-refresh.html")
-                 (file-not-found-message "not-found.html")
-                 (protocol-message "protocol-error.html")
-                 (collect-garbage "collect-garbage.html"))
-                (timeouts
-                 (default-servlet-timeout 30)
-                 (password-connection-timeout 300)
-                 (servlet-connection-timeout 86400)
-                 (file-per-byte-connection-timeout 1/20)
-                 (file-base-connection-timeout 30))
-                (paths
-                 (configuration-root "conf")
-                 (host-root ".")
-                 (log-file-path "log")
-                 (file-root "htdocs")
-                 (servlet-root ".")
-                 (mime-types "mime.types")
-                 (password-authentication #f))))
-             (virtual-host-table))])
-      (check-equal? 
-       (configuration-table->sexpr
-        (sexpr->configuration-table
-         false-sexpr))        
-       false-sexpr)))
-   
-   
-   (test-case
-    "Default configuration file may be converted to sexpr and back"
-    (check-not-false
-     (sexpr->configuration-table
-      (configuration-table->sexpr
-       (read-configuration-table
-        default-configuration-table-path)))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatch-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatch-test.rkt
deleted file mode 100644
index c842a6a9ba..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatch-test.rkt
+++ /dev/null
@@ -1,505 +0,0 @@
-#lang racket
-(require rackunit
-         web-server/http
-         web-server/dispatchers/dispatch
-         net/url
-         racket/stxparam
-         web-server/dispatch/coercion
-         web-server/dispatch/bidi-match
-         web-server/dispatch/http-expanders
-         web-server/dispatch/pattern
-         web-server/dispatch/url-patterns
-         web-server/dispatch/syntax
-         web-server/dispatch/serve
-         web-server/dispatch/container)
-(provide all-dispatch-tests)
-
-(define (test-request url #:method [method #"GET"])
-  (make-request method url null (delay null) #f "1.2.3.4" 123 "4.3.2.1"))
-
-(define all-dispatch-tests
-  (test-suite
-   "Dispatch"
-
-   #;(local
-   [(define-syntax test-match=>
-   (syntax-rules ()
-   [(_ val pat res)
-   (test-equal? (format "~S" 'pat)
-   (match=> val [pat => (lambda x x)])
-   res)]))]
-   (test-suite
-   "match"
-
-   (test-match=> (list 1 2) (list a b) (list 1 2))
-   (test-match=> (list 1 2) (list _ b) (list 2))))
-
-   (test-suite
-    "coercion"
-
-    (test-suite "make-coerce-safe?"
-                (local [(define string->number? (make-coerce-safe? string->number))]
-                       (test-not-false "1" (string->number? "1"))
-                       (test-not-false "1.2" (string->number? "1.2"))
-                       (test-not-false "+inf.0" (string->number? "+inf.0"))
-                       (test-false "a" (string->number? "a"))))
-
-
-    (test-suite "define-coercion-match-expander"
-                (local [(define string->number? (make-coerce-safe? string->number))
-                        (define-coercion-match-expander string->number/m string->number? string->number)
-                        (define (test i r)
-                          (test-equal? i (match i [(string->number/m a) a] [_ #f]) r))]
-                       (test "1" 1)
-                       (test "1.2" 1.2)
-                       (test "+inf.0" +inf.0)
-                       (test "a" #f))))
-
-   (local [(define string->number? (make-coerce-safe? string->number))
-           (define-coercion-match-expander string->number/m string->number? string->number)
-           (define-coercion-match-expander number->string/m number? number->string)
-           (define-bidi-match-expander number-arg string->number/m number->string/m)
-           (define (test i r)
-             (cond
-               [(and i r)
-                (test-suite (format "~S" (list i r))
-                            (test-equal? (format "~S" i)
-                                         (syntax-parameterize ([bidi-match-going-in? #t])
-                                           (match i [(number-arg a) a] [_ #f]))
-                                         r)
-                            (test-equal? (format "~S" r)
-                                         (syntax-parameterize ([bidi-match-going-in? #f])
-                                           (match r [(number-arg a) a] [_ #f]))
-                                         i))]
-
-               [i
-                (test-equal? (format "~S" i)
-                             (syntax-parameterize ([bidi-match-going-in? #t])
-                               (match i [(number-arg a) a] [_ #f]))
-                             r)]
-               [r
-                (test-equal? (format "~S" r)
-                             (syntax-parameterize ([bidi-match-going-in? #f])
-                               (match r [(number-arg a) a] [_ #f]))
-                             i)]))]
-          (test-suite
-           "bidi-match"
-           (test "1" 1)
-           (test "1.2" 1.2)
-           (test "+inf.0" +inf.0)
-           (test "a" #f)
-           (test #f "a")))
-
-   (test-suite
-    "http-expanders"
-
-    (test-not-false "http://www.example.com/new"
-                    (match (string->url "http://www.example.com/new")
-                      [(url/paths "new")
-                       #t]
-                      [else
-                       #f]))
-
-    (test-not-false "http://www.example.com/"
-                    (match (string->url "http://www.example.com/")
-                      [(url/paths "")
-                       #t]
-                      [else
-                       #f]))
-
-    (test-not-false "http://www.example.com"
-                    (match (string->url "http://www.example.com")
-                      [(url/paths)
-                       #t]
-                      [else
-                       #f]))
-
-    (test-false "http://www.example.com/foo"
-                (match (string->url "http://www.example.com/foo")
-                  [(url/paths "new")
-                   #t]
-                  [else
-                   #f]))
-
-    (test-equal? "http://www.example.com/new/50"
-                 (match (string->url "http://www.example.com/new/50")
-                   [(url/paths "new" (integer-arg a))
-                    a]
-                   [else
-                    #f])
-                 50)
-
-    (test-false "http://www.example.com/new"
-                (match (string->url "http://www.example.com/new")
-                  [(url/paths "new" (integer-arg a))
-                   a]
-                  [else
-                   #f]))
-
-    (test-not-false "http://www.example.com/new"
-                    (match (test-request (string->url "http://www.example.com/new"))
-                      [(request/url (url/paths "new"))
-                       #t]
-                      [else
-                       #f]))
-
-    (test-equal? "http://www.example.com/new/50"
-                 (match (test-request (string->url "http://www.example.com/new/50"))
-                   [(request/url (url/paths "new" (integer-arg a)))
-                    a]
-                   [else
-                    #f])
-                 50))
-
-   (test-suite
-    "pattern"
-
-    (test-false "string-syntax?" (string-syntax? #'a))
-    (test-false "string-syntax?" (string-syntax? #'(a b)))
-    (test-not-false "string-syntax?" (string-syntax? #'"foo"))
-
-    (test-equal? "dispatch-pattern-next-...?"
-                 (dispatch-pattern-next-...? #'(a))
-                 (list #f))
-    (test-equal? "dispatch-pattern-next-...?"
-                 (dispatch-pattern-next-...? #'(a b))
-                 (list #f #f))
-    (test-equal? "dispatch-pattern-next-...?"
-                 (dispatch-pattern-next-...? #'(a (... ...)))
-                 (list #t))
-
-    (test-equal? "dispatch-pattern-not-..."
-                 (map syntax->datum (dispatch-pattern-not-... #'(a)))
-                 '(a))
-    (test-equal? "dispatch-pattern-not-..."
-                 (map syntax->datum (dispatch-pattern-not-... #'(a b)))
-                 '(a b))
-    (test-equal? "dispatch-pattern-not-..."
-                 (map syntax->datum (dispatch-pattern-not-... #'(a (... ...))))
-                 '(a))
-
-    (local
-     [(define (test in out)
-        (test-equal? "dispatch-pattern->dispatch-pattern/ids"
-                     (map syntax->datum (dispatch-pattern->dispatch-pattern/ids in))
-                     out))]
-     (test-suite
-      "dispatch-pattern->dispatch-pattern/ids"
-      (test #'() empty)
-      (test #'("string") (list "string"))
-      (test #'((... ...)) (list '...))
-
-      (test-case "arg"
-                 (check-equal? (first (first (map syntax->datum (dispatch-pattern->dispatch-pattern/ids #'((string-arg))))))
-                               'string-arg)
-                 (check-pred symbol? (second (first (map syntax->datum (dispatch-pattern->dispatch-pattern/ids #'((string-arg))))))))))
-
-    (test-exn "dispatch-pattern? ..." exn? (lambda () (dispatch-pattern? #'((... ...)))))
-    (test-exn "dispatch-pattern? foo ..." exn? (lambda () (dispatch-pattern? #'("foo" (... ...)))))
-    (test-not-false "dispatch-pattern? integer-arg a ..." (dispatch-pattern? #'((integer-arg a) (... ...))))
-    (test-not-false "dispatch-pattern? integer-arg a " (dispatch-pattern? #'((integer-arg a))))
-    (test-not-false "dispatch-pattern? list a b" (dispatch-pattern? #'((list a b) (... ...))))
-    (test-not-false "dispatch-pattern?" (dispatch-pattern? #'((integer-arg) (... ...))))
-    (test-not-false "dispatch-pattern?" (dispatch-pattern? #'((integer-arg))))
-    (test-not-false "dispatch-pattern?" (dispatch-pattern? #'("foo")))
-
-    (test-exn "dispatch-pattern/ids?" exn? (lambda () (dispatch-pattern/ids? #'((... ...)))))
-    (test-exn "dispatch-pattern/ids?" exn? (lambda () (dispatch-pattern/ids? #'("foo" (... ...)))))
-    (test-not-false "dispatch-pattern/ids?" (dispatch-pattern/ids? #'((integer-arg a) (... ...))))
-    (test-not-false "dispatch-pattern/ids?" (dispatch-pattern/ids? #'((integer-arg a))))
-    (test-not-false "dispatch-pattern/ids?" (dispatch-pattern/ids? #'((list a b) (... ...))))
-    (test-exn "dispatch-pattern/ids?" exn? (lambda () (dispatch-pattern/ids? #'((integer-arg) (... ...)))))
-    (test-exn "dispatch-pattern/ids?" exn? (lambda () (dispatch-pattern/ids? #'((integer-arg)))))
-    (test-not-false "dispatch-pattern/ids?" (dispatch-pattern/ids? #'("foo"))))
-
-   (local [(define-syntax test-arg
-             (syntax-rules ()
-               [(_ (arg arg-a ...)
-                   ([in-expr out-expr] ...)
-                   [in-fail-expr ...]
-                   [out-fail-expr ...])
-                (test-suite (format "~S" 'arg)
-                            (test-equal? (format "in ~S" in-expr)
-                                         (syntax-parameterize ([bidi-match-going-in? #t])
-                                           (match in-expr [(arg arg-a ... a) a]))
-                                         out-expr)
-                            ...
-                            (test-equal? (format "out ~S" out-expr)
-                                         (syntax-parameterize ([bidi-match-going-in? #f])
-                                           (match out-expr [(arg arg-a ... a) a]))
-                                         in-expr)
-                            ...
-                            (test-false (format "in-fail ~S" in-fail-expr)
-                                        (syntax-parameterize ([bidi-match-going-in? #t])
-                                          (match in-fail-expr [(arg arg-a ... a) a] [_ #f])))
-                            ...
-                            (test-false (format "out-fail ~S" out-fail-expr)
-                                        (syntax-parameterize ([bidi-match-going-in? #f])
-                                          (match out-fail-expr [(arg arg-a ... a) a] [_ #f])))
-                            ...)]))]
-          (test-suite
-           "url-patterns"
-
-           (test-arg (number-arg)
-                     (["1" 1]
-                      ["2.3" 2.3]
-                      ["+inf.0" +inf.0])
-                     ["a"]
-                     ['a #t])
-
-           (test-arg (integer-arg)
-                     (["1" 1])
-                     ["a" "2.3" "+inf.0"]
-                     ['a #t 2.3 +inf.0])
-
-           (test-arg (real-arg)
-                     (["1" 1]
-                      ["2.3" 2.3]
-                      ["+inf.0" +inf.0])
-                     ["a"]
-                     ['a #t])
-
-           (test-arg (string-arg)
-                     (["1" "1"]
-                      ["foo" "foo"]
-                      ["/" "/"])
-                     []
-                     ['a #t 5])
-
-           (test-arg (symbol-arg)
-                     (["1" '|1|]
-                      ["foo" 'foo]
-                      ["/" '/])
-                     []
-                     ["a" #t 5])
-
-           (local [(define-match-expander const-m
-                     (syntax-rules ()
-                       [(_ v id) (? (curry equal? v) id)]))
-                   (define-bidi-match-expander const-arg const-m const-m)]
-                  (test-arg (const-arg "1")
-                            (["1" "1"])
-                            ["2"]
-                            ["2"]))))
-
-   (test-suite
-    "syntax"
-
-    (test-suite
-     "methods"
-     (local
-      [(define (get req i) (add1 i))
-       (define (post req i) (sub1 i))
-       (define-values (blog-dispatch blog-url blog-applies?)
-         (dispatch-rules+applies
-          [((integer-arg)) #:method "get" get]
-          [((integer-arg)) #:method "post" post]
-          [((integer-arg)) get]))
-       (define (test-blog-dispatch url method val)
-         (test-equal? url
-                      (blog-dispatch
-                       (test-request #:method method (string->url url)))
-                      val))]
-
-      (test-blog-dispatch "http://www.example.com/5" #"get" 6)
-      (test-blog-dispatch "http://www.example.com/6" #"get" 7)
-      (test-blog-dispatch "http://www.example.com/7" #"post" 6)
-      (test-blog-dispatch "http://www.example.com/8" #"post" 7)))
-
-    (test-suite
-     "applies"
-     (local
-      [(define (list-posts req) `(list-posts))
-       (define (review-post req p) `(review-post ,p))
-       (define (review-archive req y m) `(review-archive ,y ,m))
-       (define-values (blog-dispatch blog-url blog-applies?)
-         (dispatch-rules+applies
-          [("") list-posts]
-          [() list-posts]
-          [("posts" (string-arg)) review-post]
-          [("archive" (integer-arg) (integer-arg)) review-archive]))
-       (define (test-blog-dispatch url)
-         (test-equal? url (blog-applies? (test-request (string->url url))) #t))
-       (define (test-blog-dispatch/exn url)
-         (test-equal? url (blog-applies? (test-request (string->url url))) #f))]
-
-      (test-blog-dispatch "http://www.example.com")
-      (test-blog-dispatch "http://www.example.com/")
-      (test-blog-dispatch "http://www.example.com/posts/hello-world")
-      (test-blog-dispatch "http://www.example.com/archive/2008/02")
-      (test-blog-dispatch/exn "http://www.example.com/posts")
-      (test-blog-dispatch/exn "http://www.example.com/archive/post/02")
-      (test-blog-dispatch/exn "http://www.example.com/archive/2008/post")
-      (test-blog-dispatch/exn "http://www.example.com/foo")))
-
-    (let ()
-      (define (list-posts req) `(list-posts))
-      (define (review-post req p) `(review-post ,p))
-      (define (review-archive req y m) `(review-archive ,y ,m))
-
-      (define (make-dispatch-test-suite blog-dispatch blog-url)
-        (define (test-blog-dispatch url res)
-          (test-equal? url (blog-dispatch (test-request (string->url url))) res))
-        (define (test-blog-url url . args)
-          (test-equal? (format "~S" args)
-                       (apply blog-url args)
-                       url))
-        (define (test-blog-url/exn . args)
-          (test-exn (format "~S" args)
-                    exn?
-                    (lambda ()
-                      (apply blog-url args))))
-        (define (test-blog-dispatch/exn url)
-          (test-exn url exn:dispatcher? (lambda () (blog-dispatch (test-request (string->url url))))))
-
-        (test-suite
-         "blog"
-
-         (test-blog-dispatch "http://www.example.com" `(list-posts))
-         (test-blog-dispatch "http://www.example.com/" `(list-posts))
-         (test-blog-dispatch "http://www.example.com/posts/hello-world" `(review-post "hello-world"))
-         (test-blog-dispatch "http://www.example.com/archive/2008/02" `(review-archive 2008 02))
-         (test-blog-dispatch/exn "http://www.example.com/posts")
-         (test-blog-dispatch/exn "http://www.example.com/archive/post/02")
-         (test-blog-dispatch/exn "http://www.example.com/archive/2008/post")
-         (test-blog-dispatch/exn "http://www.example.com/foo")
-
-         (test-blog-url "/" list-posts)
-         (test-blog-url "/posts/hello-world" review-post "hello-world")
-         (test-blog-url "/archive/2008/2" review-archive 2008 02)
-         (test-blog-url/exn list-posts 50)
-         (test-blog-url/exn +)
-         (test-blog-url/exn review-post 50)
-         (test-blog-url/exn review-post "hello" "world")
-         (test-blog-url/exn review-archive 2008 02 1)
-         (test-blog-url/exn review-archive "2008" 02)
-         (test-blog-url/exn review-archive 2008 "02")))
-
-      (test-suite
-       "dispatch"
-       (let ()
-         (define-values (blog-dispatch blog-url)
-           (dispatch-rules
-            [("") list-posts]
-            [() list-posts]
-            [("posts" (string-arg)) review-post]
-            [("archive" (integer-arg) (integer-arg)) review-archive]))
-         (make-dispatch-test-suite blog-dispatch blog-url))
-
-       (let ()
-         (define-container blog-container
-           (blog-dispatch blog-url))
-         (dispatch-rules! blog-container
-                          [("") list-posts])
-         (dispatch-rules! blog-container
-                          [() list-posts])
-         (dispatch-rules! blog-container
-                          [("posts" (string-arg)) review-post])
-         (dispatch-rules! blog-container
-                          [("archive" (integer-arg) (integer-arg)) review-archive])
-         (make-dispatch-test-suite blog-dispatch blog-url))))
-
-    (local
-     [(define (sum req as) (apply + as))
-      (define-values (rest-dispatch rest-url)
-        (dispatch-rules
-         [((integer-arg) ...) sum]))
-      (define (test-rest-dispatch url res)
-        (test-equal? url (rest-dispatch (test-request (string->url url))) res))
-      (define (test-rest-url url . args)
-        (test-equal? (format "~S" args)
-                     (apply rest-url args)
-                     url))
-      (define (test-rest-url/exn . args)
-        (test-exn (format "~S" args)
-                  exn?
-                  (lambda ()
-                    (apply rest-url args))))
-      (define (test-rest-dispatch/exn url)
-        (test-exn url exn:dispatcher? (lambda () (rest-dispatch (test-request (string->url url))))))]
-     (test-suite
-      "rest args"
-
-      (test-rest-dispatch "http://www.sum.com" 0)
-      (test-rest-dispatch "http://www.sum.com/1" 1)
-      (test-rest-dispatch "http://www.sum.com/1/2" 3)
-      (test-rest-dispatch "http://www.sum.com/1/2/3" 6)
-      (test-rest-dispatch/exn "http://www.sum.com/1/2/3/bar")
-      (test-rest-dispatch/exn "http://www.sum.com/1/bar")
-      (test-rest-dispatch/exn "http://www.sum.com/bar")
-
-      (test-rest-url "/" sum empty)
-      (test-rest-url "/1" sum (list 1))
-      (test-rest-url "/1/2" sum (list 1 2))
-      (test-rest-url "/1/2/3" sum (list 1 2 3))
-      (test-rest-url/exn sum "foo")
-      (test-rest-url/exn sum 'bar)
-      (test-rest-url/exn sum 1)
-      (test-rest-url/exn sum #t)))
-
-    (local
-     [(define (sum req as ss) (list* (apply + as) ss))
-      (define-values (rest-dispatch rest-url)
-        (dispatch-rules
-         [((integer-arg) ... (string-arg) ...) sum]))
-      (define (test-rest-dispatch url res)
-        (test-equal? url (rest-dispatch (test-request (string->url url))) res))
-      (define (test-rest-url url . args)
-        (test-equal? (format "~S" args)
-                     (apply rest-url args)
-                     url))
-      (define (test-rest-url/exn . args)
-        (test-exn (format "~S" args)
-                  exn?
-                  (lambda ()
-                    (apply rest-url args))))
-      (define (test-rest-dispatch/exn url)
-        (test-exn url exn:dispatcher? (lambda () (rest-dispatch (test-request (string->url url))))))]
-     (test-suite
-      "rest args (2)"
-
-      (test-rest-dispatch "http://www.sum.com" (list 0))
-      (test-rest-dispatch "http://www.sum.com/1" (list 1))
-      (test-rest-dispatch "http://www.sum.com/1/2" (list 3))
-      (test-rest-dispatch "http://www.sum.com/1/2/3" (list 6))
-      (test-rest-dispatch "http://www.sum.com/1/2/3/bar" (list 6 "bar"))
-      (test-rest-dispatch "http://www.sum.com/1/bar" (list 1 "bar"))
-      (test-rest-dispatch "http://www.sum.com/1/bar/zog" (list 1 "bar" "zog"))
-      (test-rest-dispatch "http://www.sum.com/bar/zog" (list 0 "bar" "zog"))
-
-      (test-rest-url "/" sum empty empty)
-      (test-rest-url "/1" sum (list 1) empty)
-      (test-rest-url "/1/2" sum (list 1 2) empty)
-      (test-rest-url "/1/2/3" sum (list 1 2 3) empty)
-      (test-rest-url "/bar" sum empty (list "bar"))
-      (test-rest-url "/bar/zog" sum empty (list "bar" "zog"))
-      (test-rest-url "/1/2/bar" sum (list 1 2) (list "bar"))
-      (test-rest-url/exn sum "foo")
-      (test-rest-url/exn sum 'bar)
-      (test-rest-url/exn sum 1)
-      (test-rest-url/exn sum #t))))
-
-   (test-suite
-    "serve")))
-
-(define (test-serve/dispatch)
-  (define-values (start url)
-    (dispatch-rules
-     [("") get-first-number]
-     [("/2nd" (number-arg)) get-second-number]
-     [("sum" (number-arg) (number-arg)) display-sum]))
-  (define (get-first-number req)
-    `(html (head (title "First number"))
-           (a ([href ,(url get-second-number 50)]) (h1 "+ 50"))))
-  (define (get-second-number req fst)
-    `(html (head (title "Second number"))
-           (a ([href ,(url display-sum fst 100)]) (h1 "+ 100"))))
-  (define (display-sum req fst snd)
-    `(html (head (title "Sum"))
-           (h1 ,(number->string (+ fst snd)))))
-
-  (serve/dispatch start))
-
-(module+ main
-  (require rackunit/text-ui)
-  (run-tests all-dispatch-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/all-dispatchers-tests.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/all-dispatchers-tests.rkt
deleted file mode 100644
index b0582687b3..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/all-dispatchers-tests.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require rackunit
-         "dispatch-passwords-test.rkt"
-         "dispatch-files-test.rkt"        
-         "dispatch-servlets-test.rkt"
-         "dispatch-lang-test.rkt"         
-         "dispatch-host-test.rkt"
-         "filesystem-map-test.rkt")
-(provide all-dispatchers-tests)
-
-(define all-dispatchers-tests  
-  (test-suite
-   "Dispatchers"
-   dispatch-passwords-tests
-   dispatch-host-tests
-   dispatch-files-tests
-   dispatch-servlets-tests
-   dispatch-lang-tests
-   filesystem-map-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-files-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-files-test.rkt
deleted file mode 100644
index 0d17dc4537..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-files-test.rkt
+++ /dev/null
@@ -1,124 +0,0 @@
-#lang racket
-(require rackunit
-         (only-in mzlib/file
-                  file-name-from-path
-                  make-temporary-file)
-         net/url
-         mzlib/list
-         xml/xml
-         web-server/http
-         web-server/private/util
-         web-server/dispatchers/dispatch
-         (prefix-in files: web-server/dispatchers/dispatch-files)
-         "../util.rkt")
-(require/expose web-server/dispatchers/dispatch-files
-                (looks-like-directory?))
-(provide dispatch-files-tests)
-
-(define tmp-file (make-temporary-file))
-(with-output-to-file tmp-file 
-  (lambda ()
-    (display
-     (xexpr->string 
-      `(html (head (title "A title"))
-             (body "Here's some content!")))))
-  #:exists 'truncate/replace)
-
-(define a-dir (directory-part tmp-file))
-(define not-there (build-path "I/probably/do/not/exist"))
-
-(define (dispatch i? . paths)
-  (define b (box 0))
-  (files:make #:url->path
-              (lambda (url)
-                (begin0 (values (list-ref paths (min (unbox b) (sub1 (length paths)))) empty)
-                        (set-box! b (add1 (unbox b)))))
-              #:indices (list (if i? (file-name-from-path tmp-file) not-there))))
-
-(define file-url (string->url "http://test.com/foo"))
-(define dir-url (string->url "http://test.com/foo/"))
-(define (req d? meth heads)
-  (make-request meth (if d? dir-url file-url) heads (delay empty) #"" "host" 80 "client"))
-  
-(define-syntax-rule (test-equal?* n lhs rhs)
-  (test-equal? n (bytes-sort lhs) (bytes-sort rhs)))
-
-(define dispatch-files-tests
-  (test-suite
-   "Files"
-   
-   (local [(define (yes s) (test-not-false s (looks-like-directory? s)))
-           (define (no s) (test-false s (looks-like-directory? s)))]
-   (test-suite
-    "Looks like directory"
-
-    (no "") (no "foo") (no "/foo") (no "/foo/bar")
-    (yes "/") (yes "/foo/") (yes "foo/" )(yes "/bar/zog/trog/")))
-   
-   (test-case
-    "read-range-header: missing and badly formed headers"
-    (check-false (files:read-range-header (list (make-header #"Ranges" #"bytes=1-10"))) "check 1")
-    (check-false (parameterize ([current-error-port (open-output-nowhere)])
-                   (files:read-range-header (list (make-header #"Range" #"completely wrong")))) "check 2")
-    (check-false (parameterize ([current-error-port (open-output-nowhere)])
-                   (files:read-range-header (list (make-header #"Range" #"byte=1-10")))) "check 3")
-    (check-false (parameterize ([current-error-port (open-output-nowhere)])
-                   (files:read-range-header (list (make-header #"Range" #"bytes=a-10")))) "check 4")
-    (check-false (parameterize ([current-error-port (open-output-nowhere)])
-                   (files:read-range-header (list (make-header #"Range" #"bytes=1-1.0")))) "check 5"))
-   
-   (test-case
-    "read-range-header: single range"
-    (check-equal? (files:read-range-header (list (make-header #"Range" #"bytes=1-10"))) (list (cons 1 10)) "check 1")
-    (check-equal? (files:read-range-header (list (make-header #"Range" #"bytes=1-"))) (list (cons 1 #f)) "check 2")
-    (check-equal? (files:read-range-header (list (make-header #"Range" #"bytes=-10"))) (list (cons #f 10)) "check 3"))
-   
-   (test-equal?
-    "read-range-header: multiple ranges"
-    (files:read-range-header (list (make-header #"Range" #"bytes=1-10,20-,-30")))
-    (list (cons 1 10) (cons 20 #f) (cons #f 30)))
-   
-   (test-equal?* "file, exists, whole, no Range, get"
-                (collect (dispatch #t tmp-file) (req #f #"GET" empty))
-                #"HTTP/1.1 200 OK\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\n\r\n<html><head><title>A title</title></head><body>Here's some content!</body></html>")
-   (test-equal?* "file, exists, whole, no Range, head"
-                (collect (dispatch #t tmp-file) (req #f #"HEAD" empty))
-                #"HTTP/1.1 200 OK\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\n\r\n")
-   (test-equal?* "file, exists, whole, Range, get"
-                (collect (dispatch #t tmp-file) (req #f #"GET" (list (make-header #"Range" #"bytes=0-80"))))
-                #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\nContent-Range: bytes 0-80/81\r\n\r\n<html><head><title>A title</title></head><body>Here's some content!</body></html>")
-   (test-equal?* "file, exists, whole, Range, head"
-                (collect (dispatch #t tmp-file) (req #f #"HEAD" (list (make-header #"Range" #"bytes=0-80"))))
-                #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\nContent-Range: bytes 0-80/81\r\n\r\n")
-   (test-equal?* "file, exists, part, get"
-                (collect (dispatch #t tmp-file) (req #f #"GET" (list (make-header #"Range" #"bytes=5-9"))))
-                #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nAccept-Ranges: bytes\r\nContent-Length: 5\r\nContent-Range: bytes 5-9/81\r\n\r\n><hea")
-   (test-equal?* "file, exists, part, head"
-                (collect (dispatch #t tmp-file) (req #f #"HEAD" (list (make-header #"Range" #"bytes=5-9"))))
-                #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nAccept-Ranges: bytes\r\nContent-Length: 5\r\nContent-Range: bytes 5-9/81\r\n\r\n")
-   
-   (test-exn "path, non"
-             exn:dispatcher?
-             (lambda () (collect (dispatch #t not-there) (req #f #"GET" empty))))
-   
-   (test-equal?* "dir, exists, no Range, get"
-                (collect (dispatch #t a-dir) (req #t #"GET" empty))
-                #"HTTP/1.1 200 OK\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\n\r\n<html><head><title>A title</title></head><body>Here's some content!</body></html>")
-   (test-equal?* "dir, exists, no Range, head"
-                (collect (dispatch #t a-dir) (req #t #"HEAD" empty))
-                #"HTTP/1.1 200 OK\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\n\r\n")
-   (test-equal?* "dir, exists, Range, get"
-                (collect (dispatch #t a-dir) (req #t #"GET" (list (make-header #"Range" #"bytes=0-80"))))
-                #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\nContent-Range: bytes 0-80/81\r\n\r\n<html><head><title>A title</title></head><body>Here's some content!</body></html>")
-   (test-equal?* "dir, exists, Range, head"
-                (collect (dispatch #t a-dir) (req #t #"HEAD" (list (make-header #"Range" #"bytes=0-80"))))
-                #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\nContent-Range: bytes 0-80/81\r\n\r\n")
-   (test-equal?* "dir, not dir-url, get"
-                (collect (dispatch #t a-dir) (req #f #"GET" empty))
-                #"HTTP/1.1 302 Moved Temporarily\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nLocation: /foo/\r\n\r\n")
-   (test-exn "dir, not exists, get"
-             exn:dispatcher?
-             (lambda () (collect (dispatch #f a-dir) (req #t #"GET" empty))))
-   (test-exn "dir, not exists, head"
-             exn:dispatcher?
-             (lambda () (collect (dispatch #f a-dir) (req #t #"HEAD" empty))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-host-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-host-test.rkt
deleted file mode 100644
index 756eccbc1e..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-host-test.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang racket/base
-(require rackunit
-         (only-in mzlib/file
-                  make-temporary-file)
-         net/url
-         mzlib/list
-         web-server/http
-         web-server/dispatchers/dispatch
-         (prefix-in host: web-server/dispatchers/dispatch-host))
-(provide dispatch-host-tests)
-
-(require/expose web-server/dispatchers/dispatch-host
-                (get-host))
-
-(define lower-url (make-url #f #f "www.racket-lang.org" #f #t empty empty #f))
-(define upper-url (make-url #f #f "www.RACKET-lang.org" #f #t empty empty #f))
-(define no-host-url (make-url #f #f #f #f #t empty empty #f))
-
-(define dispatch-host-tests
-  (test-suite
-   "Host"
-   
-   (test-equal? "get-host - uri - lower"
-                'www.racket-lang.org
-                (get-host lower-url empty))
-   
-   (test-equal? "get-host - uri - upper"
-                'www.racket-lang.org
-                (get-host upper-url empty))
-   
-   (test-equal? "get-host - headers - lower key - lower val"
-                'www.racket-lang.org
-                (get-host no-host-url (list (make-header #"host" #"www.racket-lang.org"))))
-   (test-equal? "get-host - headers - lower key - upper val"
-                'www.racket-lang.org
-                (get-host no-host-url (list (make-header #"host" #"www.RACKET-lang.org"))))
-
-   (test-equal? "get-host - headers - upper key - lower val"
-                'www.racket-lang.org
-                (get-host no-host-url (list (make-header #"Host" #"www.racket-lang.org"))))
-   (test-equal? "get-host - headers - upper key - upper val"
-                'www.racket-lang.org
-                (get-host no-host-url (list (make-header #"Host" #"www.RACKET-lang.org"))))
-
-   (test-equal? "get-host - headers - caps key - lower val"
-                'www.racket-lang.org
-                (get-host no-host-url (list (make-header #"HOST" #"www.racket-lang.org"))))
-   (test-equal? "get-host - headers - caps key - upper val"
-                'www.racket-lang.org
-                (get-host no-host-url (list (make-header #"HOST" #"www.RACKET-lang.org"))))
-   
-   (test-equal? "get-host - none"
-                'none
-                (get-host no-host-url empty))
-   
-   ))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-lang-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-lang-test.rkt
deleted file mode 100644
index 6d387e135b..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-lang-test.rkt
+++ /dev/null
@@ -1,193 +0,0 @@
-#lang racket/base
-(require rackunit
-         mzlib/etc
-         mzlib/list
-         racket/path
-         racket/runtime-path
-         web-server/dispatchers/dispatch
-         web-server/http
-         web-server/configuration/namespace
-         web-server/servlet/setup
-         (prefix-in servlets: web-server/dispatchers/dispatch-servlets)
-         "servlet-test-util.rkt"
-         "../util.rkt")
-(provide dispatch-lang-tests)
-
-#;(define (mkd p)
-  (lang:make #:url->path (lambda _ (values p (list p)))
-             #:make-servlet-namespace
-             (make-make-servlet-namespace)
-             #:responders-servlet-loading
-             (lambda (u exn)
-               ((error-display-handler) (exn-message exn) exn)
-               (raise exn))
-             #:responders-servlet
-             (lambda (u exn)
-               ((error-display-handler) (exn-message exn) exn)
-               (raise exn))))
-
-(define (mkd p)
-  (define-values (! u->s)
-    (servlets:make-cached-url->servlet
-     (lambda _ (values p url0s))
-     (make-default-path->servlet)))
-  (define d
-    (servlets:make u->s
-                   #:responders-servlet-loading
-                   (lambda (u exn)
-                     (raise exn))
-                   #:responders-servlet
-                   (lambda (u exn)
-                     (raise exn))))
-  d)
-
-(define default-web-root
-  (path-only 
-   (collection-file-path "default-web-root/configuration-table.rkt" "web-server")))
-
-(define example-servlets 
-  (build-path default-web-root "htdocs" "lang-servlets/"))
-
-(define dispatch-lang-tests
-  (test-suite
-   "Web Language"
-   
-   (test-exn
-    "add-param.rkt - Parameters, s/s/u (should fail)"
-    exn:fail?
-    (lambda ()
-      (let* ([xs #"10"]
-             [ys #"17"]
-             [d (mkd (build-path example-servlets "add-param.rkt"))]
-             [k0 (simple-xpath* '(form #:action) (call d url0 empty))]
-             [k1 (simple-xpath* '(form #:action) (call d (format "~a?number=~a" k0 xs)
-                                                       (list (make-binding:form #"number" xs))))]
-             [n (simple-xpath* '(p) (call d (format "~a?number=~a" k1 ys)
-                                                    (list (make-binding:form #"number" ys))))])
-        n)))
-   
-   (test-add-two-numbers
-    mkd
-    "add-simple.rkt - Web Parameters, s/s/u"
-    (build-path example-servlets "add-simple.rkt"))
-   
-   (test-add-two-numbers
-    mkd
-    "add.rkt - s/s/u"
-    (build-path example-servlets "add.rkt"))
-   
-   (let* ([x (random 500)]
-          [xs (string->bytes/utf-8 (number->string x))]
-          [y (random 500)]
-          [ys (string->bytes/utf-8 (number->string y))])
-     (test-equal? 
-      "add01.rkt - no s/s, uri"
-      (let* ([d (mkd (build-path example-servlets "add01.rkt"))]
-             [k0 (simple-xpath* '(form #:action) (call d url0 empty))]
-             [k1 (simple-xpath* '(form #:action) (call d (format "~a?first=~a" url0 xs) (list (make-binding:form #"first" xs))))]
-             [n (simple-xpath* '(p) (call d (format "~a?first=~a&second=~a" url0 xs ys)
-                                                    (list (make-binding:form #"first" xs)
-                                                          (make-binding:form #"second" ys))))])
-        n)
-      (format "The answer is: ~a" (+ x y))))
-   
-   (test-add-two-numbers
-    mkd
-    "add02.rkt - s/s/u, uri"
-    (build-path example-servlets "add02.rkt"))
-
-   (test-add-two-numbers
-    mkd
-    "add02-base.rkt - s/s/u, uri"
-    (build-path example-servlets "add02-base.rkt"))
-
-   
-   ; XXX Use kont
-   #;(test-add-two-numbers
-      mkd
-      "add03.rkt - s/s/h"
-      (build-path example-servlets "add03.rkt"))
-   
-   (test-add-two-numbers
-    mkd
-    "add04.rkt - s/s/u"
-    (build-path example-servlets "add04.rkt"))  
-   
-   (test-add-two-numbers
-    mkd
-    "add06.rkt - send/suspend/dispatch"
-    (build-path example-servlets "add06.rkt"))
-   
-   (test-add-two-numbers
-    mkd
-    "add-native.rkt - native continuation parts"
-    (build-path example-servlets "add-native.rkt"))
-   
-   (test-add-two-numbers
-    mkd
-    "add-soft.rkt - soft state"
-    (build-path example-servlets "add-soft.rkt"))
-   
-   ; XXX test something is not d-c
-   (test-double-counters
-    mkd
-    "wc-fake.rkt - no cells"
-    (build-path example-servlets "wc-fake.rkt"))
-   
-   (test-double-counters
-    mkd
-    "wc.rkt - make-web-cell web-cell-ref web-cell-shadow"
-    (build-path example-servlets "wc.rkt"))
-   
-   (test-double-counters
-    mkd
-    "wc-comp.rkt - make-web-cell web-cell-ref web-cell-shadow web-cell-component"
-    (build-path example-servlets "wc-comp.rkt"))
-   
-   (test-equal? "check-dir.rkt"
-                (let* ([d (mkd (build-path example-servlets "check-dir.rkt"))]
-                       [t0 (simple-xpath* '(h2) (call d url0 empty))])
-                  t0)
-                (format "The current directory: ~a/" 
-                        (path->string
-                         (normalize-path example-servlets))))
-   
-   ; XXX Use kont
-   #;(test-equal? "quiz01.rkt"
-                  (let* ([d (mkd (build-path example-servlets "quiz01.rkt"))]
-                         [last
-                          (foldl (lambda (_ k)
-                                   (first ((sxpath "//form/@action/text()") 
-                                           (call d k (list (make-binding:form #"answer" #"0"))))))
-                                 url0
-                                 (build-list 7 (lambda (i) i)))])
-                    (first ((sxpath "//h1/text()") (call d last (list (make-binding:form #"answer" #"0"))))))
-                  "Quiz Results")
-   ; XXX Use kont
-   #;(test-equal? "quiz02.rkt"
-                  (let* ([d (mkd (build-path example-servlets "quiz02.rkt"))]
-                         [last
-                          (foldl (lambda (_ k)
-                                   (first ((sxpath "//form/@action/text()")
-                                           (call d k (list (make-binding:form #"answer" #"0"))))))
-                                 url0
-                                 (build-list 7 (lambda (i) i)))])
-                    (first ((sxpath "//h1/text()") (call d last (list (make-binding:form #"answer" #"0"))))))
-                  "Quiz Results")
-   
-   ; XXX test web-extras.rkt - redirect/get
-   
-   (let* ([x (random 500)]
-          [xs (string->bytes/utf-8 (number->string x))]
-          [y (random 500)]
-          [ys (string->bytes/utf-8 (number->string y))])
-     (test-equal? 
-      "redirectget.rkt"
-      (let* ([d (mkd (build-path example-servlets "redirectget.rkt"))]
-             [k0 (simple-xpath* '(form #:action) (call d url0 empty))]
-             [k1 (call d k0 empty)])
-        k1)
-      ""))
-   
-   
-   ))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-passwords-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-passwords-test.rkt
deleted file mode 100644
index 4822d86f05..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-passwords-test.rkt
+++ /dev/null
@@ -1,99 +0,0 @@
-#lang racket/base
-(require rackunit
-         (only-in mzlib/file
-                  make-temporary-file)
-         net/url
-         racket/promise
-         racket/runtime-path
-         racket/list
-         racket/path
-         racket/serialize
-         web-server/http
-         web-server/dispatchers/dispatch
-         (prefix-in passwords: web-server/dispatchers/dispatch-passwords)
-         "../util.rkt")
-(provide dispatch-passwords-tests)
-
-(require/expose web-server/dispatchers/dispatch-passwords
-                (read-passwords))
-
-(define default-web-root
-  (path-only 
-   (collection-file-path "default-web-root/configuration-table.rkt" "web-server")))
-
-(define default-passwords (build-path default-web-root "passwords"))
-(define test-passwords (make-temporary-file))
-(define (write-test-passwords!)
-  (with-output-to-file test-passwords
-    (lambda ()
-      (write ''(("secret stuff" "/secret(/.*)?" (bubba "bbq") (|Billy| "BoB")
-                                (aladdin "open sesame")))))
-    #:exists 'truncate/replace))
-
-(write-test-passwords!)
-
-(define (compat #:password-file pf
-                #:authentication-responder ar)
-  (let-values ([(update-password-cache! password-check)
-                (passwords:password-file->authorized? pf)])
-    (values update-password-cache!
-            (passwords:make
-             (passwords:make-basic-denied?/path
-              password-check)
-             #:authentication-responder ar))))
-
-(define (runt applies? authorized?)
-  (let/ec esc
-    (define-values (_ d) (compat #:password-file test-passwords
-                                 #:authentication-responder 
-                                 (lambda (u h) (esc h))))
-    (define-values (c i o) (make-mock-connection #""))
-    (d c (make-request #"GET"
-                       (if applies? 
-                           (string->url "http://host/secret/something")
-                           (string->url "http://host/not-secret"))
-                       (if authorized?
-                           (list (make-header #"Authorization" #"Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=="))
-                           empty)
-                       (delay empty) #"" "host" 80 "client"))))
-
-(define dispatch-passwords-tests
-  (test-suite
-   "Passwords"
-   
-   (test-suite
-    "Default configuration"
-    
-    (test-not-false
-     "Distribution file parses"
-     (read-passwords default-passwords))
-    
-    (test-exn
-     "False not allowed as password-file"
-     exn?
-     (lambda ()
-       (passwords:password-file->authorized? #f)))
-    
-    (test-exn "authorized"
-              exn:dispatcher?
-              (lambda () (runt #t #t)))
-    (test-equal? "not authorized"
-                 (let ([v (runt #t #f)])
-                   (list (header-field v) (header-value v)))
-                 (list #"WWW-Authenticate" #"Basic realm=\"secret stuff\""))
-    (test-exn "does not apply"
-              exn:dispatcher?
-              (lambda ()
-                (runt #f #f)))
-    (test-exn "does not apply (authd)"
-              exn:dispatcher?
-              (lambda ()
-                (runt #f #t))))
-   
-   ; XXX test refresh cache
-   
-   ))
-
-(module+ test
-  (require rackunit/text-ui)
-  (run-tests dispatch-passwords-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-servlets-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-servlets-test.rkt
deleted file mode 100644
index c99d9dfba8..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/dispatch-servlets-test.rkt
+++ /dev/null
@@ -1,144 +0,0 @@
-#lang racket/base
-(require rackunit
-         mzlib/etc
-         mzlib/list
-         racket/runtime-path
-         racket/path
-         xml
-         web-server/http
-         web-server/private/cache-table
-         web-server/private/web-server-structs
-         web-server/configuration/namespace
-         web-server/servlet/setup
-         (prefix-in servlets: web-server/dispatchers/dispatch-servlets)
-         "servlet-test-util.rkt"
-         "../util.rkt")
-(provide dispatch-servlets-tests)
-
-(current-server-custodian (make-custodian))
-
-(define (mkd p)
-  (define-values (! u->s)
-    (servlets:make-cached-url->servlet
-     (lambda _ (values p url0s))
-     (make-default-path->servlet)))
-  (define d
-    (servlets:make u->s
-                   #:responders-servlet-loading
-                   (lambda (u exn)
-                     (raise exn))
-                   #:responders-servlet
-                   (lambda (u exn)
-                     (raise exn))))
-  d)
-
-(define default-web-root
-  (path-only 
-   (collection-file-path "default-web-root/configuration-table.rkt" "web-server")))
-(define example-servlets
-  (build-path default-web-root "htdocs" "servlets" "examples/"))
-
-(define dispatch-servlets-tests
-  (test-suite
-   "Servlets"
-
-                                        ; XXX test update cache
-                                        ; XXX redirect/get
-                                        ; XXX web-cells
-
-   (test-pred "configure.rkt"
-              string?
-              (let* ([d (mkd (build-path example-servlets 'up "configure.rkt"))]
-                     [k0 (simple-xpath* '(form #:action) (call d url0 empty))])
-                k0))
-
-   (test-suite
-    "Examples"
-    (test-equal? "hello.rkt - loading"
-                 (let* ([d (mkd (build-path example-servlets "hello.rkt"))]
-                        [t0 (simple-xpath* '(p) (call d url0 empty))])
-                   t0)
-                 "Hello, Web!")
-    (test-equal? "port.rkt"
-                 (let* ([d (mkd (build-path example-servlets "port.rkt"))]
-                        [t0 (simple-xpath* '(p) (call d url0 empty))])
-                   t0)
-                 "Hello, Web!")
-    (test-equal? "response.rktd - loading"
-                 (parameterize ([xexpr-drop-empty-attributes #t])
-                   (let* ([d (mkd (build-path example-servlets "response.rktd"))])
-                     (call d url0 empty)))
-                 `(html (head (title "Hello"))
-                        (body ([bgcolor "white"])
-                              (p "Hello"))))
-    (test-add-two-numbers mkd "add.rkt - send/suspend"
-                          (build-path example-servlets "add.rkt"))
-    (test-add-two-numbers mkd "add-v2.rkt - send/suspend, version 2"
-                          (build-path example-servlets "add-v2.rkt"))
-    (test-add-two-numbers mkd "add-ssd.rkt - send/suspend/dispatch"
-                          (build-path example-servlets "add-ssd.rkt"))
-    (test-add-two-numbers mkd "add-compat0.rkt"
-                          (build-path example-servlets "add-compat0.rkt"))
-    (test-add-two-numbers mkd "add-formlets.rkt - send/formlet"
-                          (build-path example-servlets "add-formlets0.rkt"))
-    (test-add-two-numbers mkd "add-formlets.rkt - send/formlet, get"
-                          (build-path example-servlets "add-formlets1.rkt"))
-    (test-add-two-numbers mkd "add-formlets.rkt - send/formlet, post"
-                          (build-path example-servlets "add-formlets2.rkt"))
-    (test-add-two-numbers mkd "add-page.rkt"
-                          (build-path example-servlets "add-page.rkt"))
-    (test-equal? "count.rkt - state"
-                 (let* ([d (mkd (build-path example-servlets "count.rkt"))]
-                        [ext (lambda (c)
-                               (rest (regexp-match #rx"This servlet was called (.+) times and (.+) times since loaded on" c)))]
-                        [c1 (ext (simple-xpath* '(p) (call d url0 empty)))]
-                        [c2 (ext (simple-xpath* '(p) (call d url0 empty)))])
-                   (list c1 c2))
-                 (list (list "1" "1")
-                       (list "2" "1")))
-    (test-equal? "dir.rkt - current-directory"
-                 (path->string
-                  (normalize-path
-                   (let* ([d (mkd (build-path example-servlets "dir.rkt"))]
-                          [t0 (simple-xpath* '(p em) (call d url0 empty))])
-                     t0)))
-                 (path->string
-                  (normalize-path example-servlets)))
-    (test-pred "quiz.rkt - send/suspend"
-               string?
-               (let* ([d (mkd (build-path example-servlets "quiz.rkt"))])
-                 (foldl (lambda (_ k)
-                          (simple-xpath* '(form #:action) (call d k (list (make-binding:form #"answer" #"0")))))
-                        url0
-                        (build-list 7 (lambda (i) i)))))
-    (test-equal? "clear.rkt - current-servlet-continuation-expiration-handler, clear-continuation-table!, send/finish, send/forward"
-                 (let* ([d (mkd (build-path example-servlets "clear.rkt"))]
-                        [k0 (simple-xpath* '(a #:href) (call d url0 empty))]
-                        [k1 (simple-xpath* '(a #:href) (call d k0 empty))]
-                        [k0-expired (simple-xpath* '(body) (call d k0 empty))]
-                        [done (simple-xpath* '(body) (call d k1 empty))]
-                        [k1-expired (simple-xpath* '(body) (call d k1 empty))])
-                   (list k0-expired
-                         done
-                         k1-expired))
-                 (list "Expired"
-                       "Done."
-                       "Expired"))
-
-    (test-double-counters
-     mkd
-     "wc-fake.rkt - no cells"
-     (build-path example-servlets "wc-fake.rkt"))
-
-    (test-double-counters
-     mkd
-     "wc.rkt - make-web-cell web-cell-ref web-cell-shadow"
-     (build-path example-servlets "wc.rkt"))
-
-                                        ; XXX Broken
-    #;(test-equal? "adjust.rkt - adjust-timeout!"
-    (let* ([d (mkd (build-path example-servlets "adjust.rkt"))]
-    [k0 (first ((sxpath "//a/@href/text()") (call d url0 empty)))])
-    (sleep 3)
-    (call d k0 empty))
-    "#"))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/filesystem-map-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/filesystem-map-test.rkt
deleted file mode 100644
index 0dc25e7e97..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/filesystem-map-test.rkt
+++ /dev/null
@@ -1,91 +0,0 @@
-#lang racket/base
-(require rackunit
-         net/url
-         racket/list
-         racket/path
-         web-server/private/util
-         racket/runtime-path
-         web-server/dispatchers/filesystem-map)
-(provide filesystem-map-tests)
-
-(module+ test
-  (require rackunit/text-ui)
-  (run-tests filesystem-map-tests))
-
-(define base-dir
-  (path-only (collection-file-path "main.rkt" "web-server")))
-
-(define test-map (make-url->path base-dir))
-(define test-valid-map (make-url->valid-path test-map))
-(define test-filter-map (filter-url->path #rx"\\.(ss|scm|rkt)$" test-map))
-(define test-filter-valid-map (filter-url->path #rx"\\.(ss|scm|rkt)$" test-valid-map))
-
-(define (test-url->path
-         url->path file
-         #:url-string
-         [url-string
-          (format "http://test.com/~a" (path->string file))]
-         #:expected
-         [expected file])
-  (define vs
-    (call-with-values
-        (lambda () (url->path (string->url url-string)))
-      (lambda vs vs)))
-  (check-equal? vs (list (build-path base-dir expected) (explode-path* expected))))
-
-(define filesystem-map-tests
-  (test-suite
-   "Filesystem Map"
-
-   (test-suite
-    "url->path"
-    (test-case "Simple case"
-               (test-url->path test-map (build-path "dispatchers/filesystem-map.rkt")))
-    (test-case "Strips parameters"
-               (test-url->path test-map (build-path "dispatchers/filesystem-map.rkt")
-                               #:url-string "http://test.com/dispatchers/filesystem-map.rkt;foo"))
-    (test-case "Strips out bad '..'s"
-               (check-exn exn:fail? (λ () (test-map (string->url "http://test.com/../../dispatchers/filesystem-map.rkt")))))
-    (test-case "Handles // okay"
-               (check-equal? (second (call-with-values (λ () (test-map (string->url "http://test.com//dispatchers/filesystem-map.rkt"))) list))
-                             (list 'same (build-path "dispatchers") (build-path "filesystem-map.rkt"))))
-    (test-case "Leaves in good '..'s"
-               (test-url->path test-map (build-path "dispatchers/../dispatchers/filesystem-map.rkt"))))
-
-   (test-suite
-    "url->valid-path"
-    (test-suite
-     "Preserves url->path"
-     (test-case "Simple case"
-                (test-url->path test-valid-map (build-path "dispatchers/filesystem-map.rkt")))
-     (test-case "Strips parameters"
-                (test-url->path test-valid-map (build-path "dispatchers/filesystem-map.rkt")
-                                #:url-string "http://test.com/dispatchers/filesystem-map.rkt;foo"))
-     (test-case "Strips out bad '..'s"
-                (check-exn exn:fail? (λ () (test-valid-map (string->url "http://test.com/../../dispatchers/filesystem-map.rkt")))))
-     (test-case "Leaves in good '..'s"
-                (test-url->path test-valid-map (build-path "dispatchers/../dispatchers/filesystem-map.rkt"))))
-    (test-case "Finds valid path underneath"
-               (test-url->path test-valid-map (build-path "dispatchers/filesystem-map.rkt/not-a-file")
-                               #:expected (build-path "dispatchers/filesystem-map.rkt"))))
-
-
-   (test-suite
-    "filter-url->path"
-    (test-case "Allows right suffix"
-               (test-url->path test-filter-map (build-path "dispatchers/filesystem-map.rkt")))
-    (test-case "Allows right suffix"
-               (test-url->path test-filter-map (build-path "dispatchers/filesystem-map.scm")))
-    (test-case "Disallows wrong suffix"
-               (check-exn
-                exn:fail:filesystem:exists?
-                (lambda ()
-                  (test-url->path test-filter-map (build-path "dispatchers/filesystem-map.gif")))))
-    (test-case "Disallows wrong suffix"
-               (check-exn
-                exn:fail:filesystem:exists?
-                (lambda ()
-                  (test-url->path test-filter-map (build-path "dispatchers/filesystem-map.html")))))
-    (test-case "Allows content after w/ valid"
-               (test-url->path test-filter-valid-map (build-path "dispatchers/filesystem-map.rkt/extra/info")
-                               #:expected (build-path "dispatchers/filesystem-map.rkt"))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/servlet-test-util.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/servlet-test-util.rkt
deleted file mode 100644
index 924d9019fe..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/dispatchers/servlet-test-util.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-(require rackunit
-         mzlib/list
-         web-server/http
-         "../util.rkt")
-(provide test-add-two-numbers
-         test-double-counters
-         url0
-         url0s)
-
-(define url0 "http://test.com/servlets/example.rkt")
-(define url0s (list (build-path "servlets") (build-path "example.rkt")))
-
-(define (test-add-two-numbers mkd t p)
-  (let* ([x (random 500)]
-         [xs (string->bytes/utf-8 (number->string x))]
-         [y (random 500)]
-         [ys (string->bytes/utf-8 (number->string y))])
-    (test-equal? 
-     t
-     (let* ([d (mkd p)]
-            [r0 (call d url0 empty)]
-            [k0 (simple-xpath* '(form #:action) r0)]
-            [i0 (simple-xpath* '(form input #:name) r0)]
-            [r1 (call d (format "~a?~a=~a" k0 i0 xs)
-                      (list (make-binding:form (string->bytes/utf-8 i0) xs)))]
-            [k1 (simple-xpath* '(form #:action) r1)]
-            [i1 (simple-xpath* '(form input #:name) r1)]
-            [r2 (call d (format "~a?~a=~a" k1 i1 ys)
-                      (list (make-binding:form (string->bytes/utf-8 i1) ys)))]
-            [n (simple-xpath* '(p) r2)])
-       n)
-     (format "The answer is ~a" (+ x y)))))
-
-(define (test-double-counters mkd t p)
-  (define d (mkd p))
-  (define (invoke u)
-    (define sx (call d u empty))
-    (define ks (simple-xpath*/list '(div div a #:href) sx))
-    (values (simple-xpath*/list '(div div h3) sx)
-            (first ks)
-            (second ks)))
-  (test-equal? t
-               (let*-values ([(v0.0 0.0+1 0.0+2) (invoke url0)]
-                             ; One add
-                             [(v1.0 1.0+1 1.0+2) (invoke 0.0+1)] ; XXX infinite loop after this
-                             [(v0.1 0.1+1 0.1+2) (invoke 0.0+2)]
-                             ; Two adds
-                             [(v2.0 2.0+1 2.0+2) (invoke 1.0+1)]
-                             [(v1.1 1.1+1 1.1+2) (invoke 0.1+1)]
-                             [(_v1.1 _1.1+1 _1.1+2) (invoke 1.0+2)]
-                             [(v0.2 0.2+1 0.2+2) (invoke 0.1+2)])
-                 (list v0.0
-                       v1.0 v0.1
-                       v2.0 v1.1 _v1.1 v0.2))
-               (list (list "0" "0")
-                     (list "1" "0") (list "0" "1")
-                     (list "2" "0") (list "1" "1") (list "1" "1") (list "0" "2"))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/formlets-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/formlets-test.rkt
deleted file mode 100644
index ed9fc7868d..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/formlets-test.rkt
+++ /dev/null
@@ -1,714 +0,0 @@
-#lang racket
-(require rackunit
-         net/url
-         web-server/http
-         web-server/formlets
-         web-server/formlets/lib)
-(provide all-formlets-tests)
-
-(define (run-formlet f i)
-  (define-values (r proc post-i) (f i))
-  (list r proc post-i))
-
-(define all-formlets-tests
-  (test-suite
-   "Formlets"
-   
-   (test-suite 
-    "lib"
-    
-    (test-case "pure (render)" (check-equal? (first (run-formlet (pure 0) 0)) empty))
-    (test-case "pure (proc)" 
-               (let ([x (random 1000)])
-                 (check-equal? ((second (run-formlet (pure x) 0)) empty)
-                               x)))
-    (test-case "pure (post-i)"
-               (let ([x (random 1000)])
-                 (check-equal? (third (run-formlet (pure 0) x))
-                               x)))
-    
-    (test-case "xml-forest (render)" (check-equal? (formlet-display (xml-forest (list))) empty))
-    (test-case "xml-forest (render)" (check-equal? (formlet-display (xml-forest (list '(html (body "Hey"))))) 
-                                                   (list '(html (body "Hey")))))
-    (test-case "xml-forest (proc)" 
-               (let ([x (random 1000)])
-                 (check-equal? (((second (run-formlet (xml-forest (list)) 0)) empty) x)
-                               x)))
-    (test-case "xml-forest (proc)" 
-               (let ([x (random 1000)])
-                 (check-equal? (((second (run-formlet (xml-forest (list)) 0)) (list (make-binding:form #"name" #"value"))) x)
-                               x)))
-    (test-case "xml-forest (post-i)"
-               (let ([x (random 1000)])
-                 (check-equal? (third (run-formlet (xml-forest (list)) x))
-                               x)))
-    
-    (test-case "xml (render)" (check-equal? (formlet-display (xml '(html (body "Hey")))) 
-                                            (list '(html (body "Hey")))))
-    (test-case "xml (proc)" 
-               (let ([x (random 1000)])
-                 (check-equal? (((second (run-formlet (xml '(html (body "Hey"))) 0)) empty) x)
-                               x)))
-    (test-case "xml (proc)" 
-               (let ([x (random 1000)])
-                 (check-equal? (((second (run-formlet (xml '(html (body "Hey"))) 0)) (list (make-binding:form #"name" #"value"))) x)
-                               x)))
-    (test-case "xml (post-i)"
-               (let ([x (random 1000)])
-                 (check-equal? (third (run-formlet (xml '(html (body "Hey"))) x))
-                               x)))
-    
-    (test-case "text (render)" (check-equal? (formlet-display (text "Hey"))
-                                             (list "Hey")))
-    (test-case "text (proc)" 
-               (let ([x (random 1000)])
-                 (check-equal? (((second (run-formlet (text "Hey") 0)) empty) x)
-                               x)))
-    (test-case "text (proc)" 
-               (let ([x (random 1000)])
-                 (check-equal? (((second (run-formlet (text "Hey") 0)) (list (make-binding:form #"name" #"value"))) x)
-                               x)))
-    (test-case "text (post-i)"
-               (let ([x (random 1000)])
-                 (check-equal? (third (run-formlet (text "Hey") x))
-                               x)))
-    
-    (test-case "tag-xexpr (render)" (check-equal? (formlet-display (tag-xexpr 'p (list (list 'id "p")) (text "Hey")))
-                                                  '((p ([id "p"]) "Hey"))))
-    (test-case "tag-xexpr (proc)" 
-               (let ([x (random 1000)])
-                 (check-equal? (((second (run-formlet (tag-xexpr 'p (list (list 'id "p")) (text "Hey")) 0)) empty) x)
-                               x)))
-    (test-case "tag-xexpr (proc)" 
-               (let ([x (random 1000)])
-                 (check-equal? (((second (run-formlet (tag-xexpr 'p (list (list 'id "p")) (text "Hey")) 0))
-                                 (list (make-binding:form #"name" #"value"))) x)
-                               x)))
-    (test-case "tag-xexpr (post-i)"
-               (let ([x (random 1000)])
-                 (check-equal? (third (run-formlet (tag-xexpr 'p (list (list 'id "p")) (text "Hey")) x))
-                               x)))
-    
-    (test-case "cross (render)" 
-               (check-equal? (formlet-display (cross (text "One") (text "Two")))
-                             (list "One" "Two")))
-    (test-case "cross (proc)"
-               (let ([x (random 1000)])
-                 (check-equal? (((second (run-formlet (cross (text "One") (text "Two")) 0)) empty) x)
-                               x)))
-    (test-case "cross (proc)"
-               (check-equal? ((second (run-formlet (cross (pure string->number)
-                                                          (pure "100"))
-                                                   0)) empty)
-                             100))
-    (test-case "cross (post-i)"
-               (let ([x (random 1000)])
-                 (check-equal? (third (run-formlet (cross (text "One") (text "Two")) x))
-                               x)))
-    
-    (test-case "cross* (render)" 
-               (check-equal? (formlet-display (cross* (text "One") (text "Two")))
-                             (list "One" "Two")))
-    (test-case "cross* (proc)"
-               (check-equal? ((second (run-formlet (cross* (pure (lambda xs (apply string->number xs)))
-                                                           (pure "100"))
-                                                   0)) empty)
-                             100))
-    (test-case "cross* (post-i)"
-               (let ([x (random 1000)])
-                 (check-equal? (third (run-formlet (cross* (text "One") (text "Two")) x))
-                               x))))
-   
-   (local [(define (->cons bf)
-             (cons (binding-id bf)
-                   (binding:form-value bf)))
-           (define (test-process f bs)
-             (formlet-process f
-                              (make-request #"GET" (string->url "http://test.com")
-                                            empty
-                                            (delay bs)
-                                            #f "127.0.0.1" 80 "127.0.0.1")))
-           (define (test-display f)
-             (formlet-display f))]
-     (test-suite
-      "Input"
-      
-      (test-equal? "make-input"
-                   (->cons (test-process (make-input (lambda (n) n)) (list (make-binding:form #"input_0" #"value"))))
-                   (cons #"input_0" #"value"))
-      (test-equal? "make-input"
-                   (test-process (make-input (lambda (n) n)) empty)
-                   #f)
-      
-      (test-equal? "make-input*"
-                   (map ->cons (test-process (make-input* (lambda (n) n)) (list (make-binding:form #"input_0" #"value"))))
-                   (list (cons #"input_0" #"value")))
-      (test-equal? "make-input*"
-                   (map ->cons (test-process (make-input* (lambda (n) n)) (list (make-binding:form #"input_0" #"value0")
-                                                                                (make-binding:form #"input_0" #"value1"))))
-                   (list (cons #"input_0" #"value0")
-                         (cons #"input_0" #"value1")))
-      (test-equal? "make-input*"
-                   (test-process (make-input* (lambda (n) n)) empty)
-                   empty)
-      
-      ; text
-      (test-equal? "text-input"
-                   (->cons (test-process (text-input) (list (make-binding:form #"input_0" #"value"))))
-                   (cons #"input_0" #"value"))
-      (test-equal? "text-input"
-                   (test-display (text-input))
-                   '((input ((name "input_0") (type "text")))))
-      (test-equal? "text-input"
-                   (test-display (text-input #:value #"test"))
-                   '((input ((name "input_0") (type "text") (value "test")))))
-      (test-equal? "text-input"
-                   (test-display (text-input #:size 20))
-                   '((input ((name "input_0") (type "text") (size "20")))))
-      (test-equal? "text-input"
-                   (test-display (text-input #:max-length 20))
-                   '((input ((name "input_0") (type "text") (maxlength "20")))))
-      (test-equal? "text-input"
-                   (test-display (text-input #:read-only? #t))
-                   '((input ((name "input_0") (type "text") (readonly "true")))))
-      (test-equal? "text-input"
-                   (test-display (text-input #:read-only? #f))
-                   '((input ((name "input_0") (type "text")))))
-      (test-equal? "text-input"
-                   (test-display (text-input #:attributes '([test "Test"])))
-                   '((input ((name "input_0") (type "text") (test "Test")))))
-      
-      ; password
-      (test-equal? "password-input"
-                   (->cons (test-process (password-input) (list (make-binding:form #"input_0" #"value"))))
-                   (cons #"input_0" #"value"))
-      (test-equal? "password-input"
-                   (test-display (password-input))
-                   '((input ((name "input_0") (type "password")))))
-      (test-equal? "password-input"
-                   (test-display (password-input #:value #"test"))
-                   '((input ((name "input_0") (type "password") (value "test")))))
-      (test-equal? "password-input"
-                   (test-display (password-input #:size 20))
-                   '((input ((name "input_0") (type "password") (size "20")))))
-      (test-equal? "password-input"
-                   (test-display (password-input #:max-length 20))
-                   '((input ((name "input_0") (type "password") (maxlength "20")))))
-      (test-equal? "password-input"
-                   (test-display (password-input #:read-only? #t))
-                   '((input ((name "input_0") (type "password") (readonly "true")))))
-      (test-equal? "password-input"
-                   (test-display (password-input #:read-only? #f))
-                   '((input ((name "input_0") (type "password")))))
-      (test-equal? "password-input"
-                   (test-display (password-input #:attributes '([test "Test"])))
-                   '((input ((name "input_0") (type "password") (test "Test")))))
-      
-      ; TEXTAREA element
-      (test-equal? "textarea-input"
-                   (binding:form-value (test-process (textarea-input) (list (make-binding:form #"input_0" #"value"))))
-                   #"value")
-      (test-equal? "textarea-input"
-                   (test-display (textarea-input))
-                   '((textarea ([name "input_0"]) "")))
-      (test-equal? "textarea-input"
-                   (test-display (textarea-input #:rows 80))
-                   '((textarea ([name "input_0"] [rows "80"]) "")))
-      (test-equal? "textarea-input"
-                   (test-display (textarea-input #:cols 80))
-                   '((textarea ([name "input_0"] [cols "80"]) "")))
-      (test-equal? "textarea-input"
-                   (test-display (textarea-input #:value #"starting text" #:cols 80))
-                   '((textarea ([name "input_0"] [cols "80"]) "starting text")))
-      (test-equal? "textarea-input"
-                   (test-display (textarea-input #:cols 80 #:rows 70))
-                   '((textarea ([name "input_0"] [rows "70"] [cols "80"]) "")))
-      (test-equal? "textarea-input"
-                   (test-display (textarea-input #:rows 80 #:attributes '([class "awesome"])))
-                   '((textarea ([name "input_0"] [rows "80"] [class "awesome"]) "")))
-      (test-equal? "textarea-input"
-                   (test-display (textarea-input #:cols 80 #:attributes '([class "awesome"])))
-                   '((textarea ([name "input_0"] [cols "80"] [class "awesome"]) "")))
-      (test-equal? "textarea-input"
-                   (test-display (textarea-input #:cols 80 #:rows 70 #:attributes '([class "awesome"])))
-                   '((textarea ([name "input_0"] [rows "70"] [cols "80"] [class "awesome"]) "")))
-      
-      ; checkbox
-      (test-equal? "checkbox"
-                   (->cons (test-process (checkbox #"start" #t) (list (make-binding:form #"input_0" #"value"))))
-                   (cons #"input_0" #"value"))
-      (test-equal? "checkbox"
-                   (test-display (checkbox #"start" #t))
-                   '((input
-                      ((name "input_0") (type "checkbox") (value "start") (checked "true")))))
-      (test-equal? "checkbox"
-                   (test-display (checkbox #"start" #f))
-                   '((input ((name "input_0") (type "checkbox") (value "start")))))
-      (test-equal? "checkbox"
-                   (test-display (checkbox #"start" #t #:attributes '([test "Test"])))
-                   '((input
-                      ((name "input_0")
-                       (type "checkbox")
-                       (value "start")
-                       (checked "true")
-                       (test "Test")))))
-      
-      ; radio
-      (test-equal? "radio"
-                   (->cons (test-process (radio #"start" #t) (list (make-binding:form #"input_0" #"value"))))
-                   (cons #"input_0" #"value"))
-      (test-equal? "radio"
-                   (test-display (radio #"start" #t))
-                   '((input ((name "input_0") (type "radio") (value "start") (checked "true")))))
-      (test-equal? "radio"
-                   (test-display (radio #"start" #f))
-                   '((input ((name "input_0") (type "radio") (value "start")))))
-      (test-equal? "radio"
-                   (test-display (radio #"start" #t #:attributes '([test "Test"])))
-                   '((input ((name "input_0") (type "radio") (value "start") (checked "true") (test "Test")))))
-
-      ; radio-group
-      (test-equal? "radio-group"
-                   (test-process (radio-group (list "1" "2" "3"))
-                                 (list (make-binding:form #"input_0" #"0")))
-                   "1")
-      (test-equal? "radio-group"
-                   (test-process (radio-group (list 1 2 3) #:display number->string)
-                                 (list (make-binding:form #"input_0" #"0")))
-                   1)
-      (test-equal? "radio-group"
-                   (test-process (radio-group (list 1 2 3) #:display number->string)
-                                 (list (make-binding:form #"input_0" #"0")
-                                       (make-binding:form #"input_0" #"1")))
-                   1)
-      (test-equal? "radio-group"
-                   (test-display (radio-group 
-                                  (list 1 2 3)
-                                  #:display number->string 
-                                  #:checked? even?
-                                  #:attributes (λ (e) (list (list 'plus-one (number->string (add1 e)))))))
-                   '((input ((name "input_0") (type "radio") (value "0") (plus-one "2")))
-                     "1"
-                     (input ((name "input_0") (type "radio") (value "1") (checked "true") (plus-one "3")))
-                     "2"
-                     (input ((name "input_0") (type "radio") (value "2") (plus-one "4")))
-                     "3"))
-
-      ; checkbox-group
-      (test-equal? "checkbox-group"
-                   (test-process (checkbox-group (list "1" "2" "3"))
-                                 (list (make-binding:form #"input_0" #"0")))
-                   (list "1"))
-      (test-equal? "checkbox-group"
-                   (test-process (checkbox-group (list 1 2 3) #:display number->string)
-                                 (list (make-binding:form #"input_0" #"0")))
-                   (list 1))
-      (test-equal? "checkbox-group"
-                   (test-process (checkbox-group (list 1 2 3) #:display number->string)
-                                 (list (make-binding:form #"input_0" #"0")
-                                       (make-binding:form #"input_0" #"1")))
-                   (list 1 2))
-      (test-equal? "checkbox-group"
-                   (test-display (checkbox-group 
-                                  (list 1 2 3)
-                                  #:display number->string 
-                                  #:checked? even?
-                                  #:attributes (λ (e) (list (list 'plus-one (number->string (add1 e)))))))
-                   '((input ((name "input_0") (type "checkbox") (value "0") (plus-one "2")))
-                     "1"
-                     (input ((name "input_0") (type "checkbox") (value "1") (checked "true") (plus-one "3")))
-                     "2"
-                     (input ((name "input_0") (type "checkbox") (value "2") (plus-one "4")))
-                     "3"))
-      
-      ; submit
-      (test-equal? "submit"
-                   (->cons (test-process (submit #"start") (list (make-binding:form #"input_0" #"value"))))
-                   (cons #"input_0" #"value"))
-      (test-equal? "submit"
-                   (test-display (submit #"start"))
-                   '((input ((name "input_0") (type "submit") (value "start")))))
-      (test-equal? "submit"
-                   (test-display (submit #"start" #:attributes '([test "Test"])))
-                   '((input ((name "input_0") (type "submit") (value "start") (test "Test")))))
-      
-      ; reset
-      (test-equal? "reset"
-                   (->cons (test-process (reset #"start") (list (make-binding:form #"input_0" #"value"))))
-                   (cons #"input_0" #"value"))
-      (test-equal? "reset"
-                   (test-display (reset #"start"))
-                   '((input ((name "input_0") (type "reset") (value "start")))))
-      (test-equal? "reset"
-                   (test-display (reset #"start" #:attributes '([test "Test"])))
-                   '((input ((name "input_0") (type "reset") (value "start") (test "Test")))))
-      
-      ; file-upload
-      (test-equal? "file-upload"
-                   (->cons (test-process (file-upload) (list (make-binding:form #"input_0" #"value"))))
-                   (cons #"input_0" #"value"))
-      (test-equal? "file-upload"
-                   (test-display (file-upload))
-                   '((input ((name "input_0") (type "file")))))
-      (test-equal? "file-upload"
-                   (test-display (file-upload #:attributes '([test "Test"])))
-                   '((input ((name "input_0") (type "file") (test "Test")))))
-      
-      ; hidden
-      (test-equal? "hidden"
-                   (->cons (test-process (hidden #"start") (list (make-binding:form #"input_0" #"value"))))
-                   (cons #"input_0" #"value"))
-      (test-equal? "hidden"
-                   (test-display (hidden #"start"))
-                   '((input ((name "input_0") (type "hidden") (value "start")))))
-      (test-equal? "hidden"
-                   (test-display (hidden #"start" #:attributes '([test "Test"])))
-                   '((input ((name "input_0") (type "hidden") (value "start") (test "Test")))))
-      
-      ; IMG elements
-      (test-equal? "img"
-                   (->cons (test-process (img #"start" #"a") (list (make-binding:form #"input_0" #"value"))))
-                   (cons #"input_0" #"value"))
-      (test-equal? "img"
-                   (test-display (img #"pic" #"http://h.d.com/1"))
-                   '((img ((name "input_0") (src "http://h.d.com/1") (alt "pic")))))
-      (test-equal? "img"
-                   (test-display (img #"pic" #"http://h.d.com/1" #:attributes '([test "Test"])))
-                   '((img ((name "input_0") (src "http://h.d.com/1") (alt "pic") (test "Test")))))
-      (test-equal? "img"
-                   (test-display (img #"pic" #"http://h.d.com/1" #:height 12))
-                   '((img ((name "input_0") (src "http://h.d.com/1") (alt "pic") (height "12")))))
-      (test-equal? "img"
-                   (test-display (img #"pic" #"http://h.d.com/1" #:longdesc #"longer desc"))
-                   '((img
-                      ((name "input_0")
-                       (src "http://h.d.com/1")
-                       (alt "pic")
-                       (longdesc "longer desc")))))
-      (test-equal? "img"
-                   (test-display (img #"pic" #"http://h.d.com/1" #:usemap #"#map"))
-                   '((img
-                      ((name "input_0") (src "http://h.d.com/1") (alt "pic") (usemap "#map")))))
-      (test-equal? "img"
-                   (test-display (img #"pic" #"http://h.d.com/1" #:width 50))
-                   '((img ((name "input_0") (src "http://h.d.com/1") (alt "pic") (width "50")))))
-      (test-equal? "img"
-                   (test-display (img #"pic" #"http://h.d.com/1" #:height 12 #:longdesc #"longer desc" #:usemap #"#map" #:width 50))
-                   '((img
-                      ((name "input_0")
-                       (src "http://h.d.com/1")
-                       (alt "pic")
-                       (height "12")
-                       (longdesc "longer desc")
-                       (usemap "#map")
-                       (width "50")))))
-      
-      ; BUTTON element
-      (test-equal? "button"
-                   (->cons (test-process (button #"start" #"a") (list (make-binding:form #"input_0" #"value"))))
-                   (cons #"input_0" #"value"))
-      (test-equal? "button"
-                   (test-display (button #"button" #"click me"))
-                   '((button ((name "input_0") (type "button")) "click me")))
-      (test-equal? "button"
-                   (test-display (button #"button" #"click me" #:attributes '([test "Test"])))
-                   '((button ((name "input_0") (type "button") (test "Test")) "click me")))
-      (test-equal? "button"
-                   (test-display (button #"button" #"click me" #:disabled #t))
-                   '((button ((name "input_0") (type "button") (disabled "true")) "click me")))
-      (test-equal? "button"
-                   (test-display (button #"button" #"click me" #:disabled #f))
-                   '((button ((name "input_0") (type "button")) "click me")))
-      (test-equal? "button"
-                   (test-display (button #"button" #"click me" #:value #"b1"))
-                   '((button ((name "input_0") (type "button") (value "b1")) "click me")))
-      (test-equal? "button"
-                   (test-display (button #"button" #"click me" #:disabled #t #:value #"b2"))
-                   '((button
-                      ((name "input_0") (type "button") (disabled "true") (value "b2"))
-                      "click me")))
-      
-      ; multiselect      
-      (test-equal? "multiselect-input"
-                   (test-process (multiselect-input (list "1" "2" "3"))
-                                 (list (make-binding:form #"input_0" #"0")))
-                   (list "1"))
-      (test-equal? "multiselect-input"
-                   (test-process (multiselect-input (list "1" "2" "3"))
-                                 (list (make-binding:form #"input_0" #"0")
-                                       (make-binding:form #"input_0" #"2")))
-                   (list "1" "3"))
-      (test-equal? "multiselect-input"
-                   (test-process (multiselect-input (list "1" "2" "3"))
-                                 empty)
-                   empty)
-      (test-equal? "multiselect-input"
-                   (test-display (multiselect-input (list "1" "2" "3")))
-                   '((select
-                      ((multiple "true") (name "input_0"))
-                      (option ((value "0")) "1")
-                      (option ((value "1")) "2")
-                      (option ((value "2")) "3"))))
-      (test-equal? "multiselect-input"
-                   (test-display (multiselect-input (list "1" "2" "3") #:attributes '([test "val"])))
-                   '((select
-                      ((multiple "true") (name "input_0") (test "val"))
-                      (option ((value "0")) "1")
-                      (option ((value "1")) "2")
-                      (option ((value "2")) "3"))))
-      (test-equal? "multiselect-input"
-                   (test-display (multiselect-input (list "1" "2" "3") #:multiple? #t))
-                   '((select
-                      ((multiple "true") (name "input_0"))
-                      (option ((value "0")) "1")
-                      (option ((value "1")) "2")
-                      (option ((value "2")) "3"))))
-      (test-equal? "multiselect-input"
-                   (test-display (multiselect-input (list "1" "2" "3") #:multiple? #f))
-                   '((select
-                      ((name "input_0"))
-                      (option ((value "0")) "1")
-                      (option ((value "1")) "2")
-                      (option ((value "2")) "3"))))
-      (test-equal? "multiselect-input"
-                   (test-display (multiselect-input (list "1" "2" "3") #:selected? (compose even? string->number)))
-                   '((select
-                      ((multiple "true") (name "input_0"))
-                      (option ((value "0")) "1")
-                      (option ((value "1") (selected "true")) "2")
-                      (option ((value "2")) "3"))))
-      (test-equal? "multiselect-input"
-                   (test-display (multiselect-input (list 1 2 3) #:display number->string))
-                   '((select
-                      ((multiple "true") (name "input_0"))
-                      (option ((value "0")) "1")
-                      (option ((value "1")) "2")
-                      (option ((value "2")) "3"))))
-      (test-equal? "multiselect-input"
-                   (test-display (multiselect-input (list "xee" "john" "joe") #:display (curry format "something ~a") ))
-                   '((select
-                      ((multiple "true") (name "input_0"))
-                      (option ((value "0")) "something xee")
-                      (option ((value "1")) "something john")
-                      (option ((value "2")) "something joe"))))
-      
-      ; select
-      (test-equal? "select-input"
-                   (test-process (select-input (list "1" "2" "3"))
-                                 (list (make-binding:form #"input_0" #"0")))
-                   "1")
-      (test-equal? "select-input"
-                   (test-process (select-input (list "1" "2" "3"))
-                                 (list (make-binding:form #"input_0" #"0")
-                                       (make-binding:form #"input_0" #"2")))
-                   "1")
-      (test-exn "select-input"
-                exn?
-                (lambda ()
-                  (test-process (select-input (list "1" "2" "3"))
-                                empty)))
-      (test-equal? "select-input"
-                   (test-display (select-input (list "1" "2" "3")))
-                   '((select
-                      ((name "input_0"))
-                      (option ((value "0")) "1")
-                      (option ((value "1")) "2")
-                      (option ((value "2")) "3"))))
-      (test-equal? "select-input"
-                   (test-display (select-input (list "1" "2" "3") #:attributes '([test "val"])))
-                   '((select
-                      ((name "input_0") [test "val"])
-                      (option ((value "0")) "1")
-                      (option ((value "1")) "2")
-                      (option ((value "2")) "3"))))
-      (test-equal? "select-input"
-                   (test-display (select-input (list "1" "2" "3") #:selected? (compose even? string->number)))
-                   '((select
-                      ((name "input_0"))
-                      (option ((value "0")) "1")
-                      (option ((value "1") (selected "true")) "2")
-                      (option ((value "2")) "3"))))
-      (test-equal? "select-input"
-                   (test-display (select-input (list 1 2 3) #:display number->string))
-                   '((select
-                      ((name "input_0"))
-                      (option ((value "0")) "1")
-                      (option ((value "1")) "2")
-                      (option ((value "2")) "3")))) 
-      
-      (test-equal? "required" 
-                   (test-process (required (text-input)) (list (make-binding:form #"input_0" #"value")))
-                   #"value")
-      (test-exn "required"
-                exn?
-                (lambda ()
-                  (test-process (required (text-input)) empty)))
-      
-      (test-equal? "default"
-                   (test-process (default #"def" (text-input)) (list (make-binding:form #"input_0" #"value")))
-                   #"value")
-      (test-equal? "default"
-                   (test-process (default #"def" (text-input)) empty)
-                   #"def")
-      
-      (test-equal? "to-string"
-                   (test-process (to-string (required (text-input))) (list (make-binding:form #"input_0" #"value")))
-                   "value")
-      (test-equal? "to-symbol"
-                   (test-process (to-symbol (to-string (required (text-input)))) (list (make-binding:form #"input_0" #"value")))
-                   'value)
-      (test-equal? "to-number"
-                   (test-process (to-number (to-string (required (text-input)))) (list (make-binding:form #"input_0" #"100")))
-                   100)
-      (test-equal? "to-boolean"
-                   (test-process (to-boolean (required (text-input))) (list (make-binding:form #"input_0" #"on")))
-                   #t)
-      (test-equal? "to-boolean"
-                   (test-process (to-boolean (required (text-input))) (list (make-binding:form #"input_0" #"off")))
-                   #f)
-      
-      ))
-   
-   
-   (local [(define-struct date (month day) #:transparent)
-           (define (date->xml d)
-             (format "~a/~a"
-                     (date-month d)
-                     (date-day d)))      
-           (define (submit t)
-             `(input ([type "submit"]) ,t))
-           (define date-formlet
-             (formlet
-              (div
-               "Month:" ,{input-int . => . month}
-               "Day:" ,{input-int . => . day})
-              (make-date month day)))
-           
-           (define travel-formlet
-             (formlet
-              (div
-               "Name:" ,{input-string . => . name} nbsp
-               (div
-                "Arrive:" ,{date-formlet . => . arrive}
-                "Depart:" ,{date-formlet . => . depart})
-               ,@(list "1" "2" "3")
-               ,(submit "Submit"))
-              (list name arrive depart)))
-           
-           (define display-itinernary
-             (match-lambda
-               [(list name arrive depart)
-                `(html
-                  (head (title "Itinerary"))
-                  (body
-                   "Itinerary for: " ,name
-                   "Arriving:" ,(date->xml arrive)
-                   "Departing:" ,(date->xml depart)))]))]
-     (test-suite
-      "Date"
-      
-      (test-case "date->xml"
-                 (check-equal? (date->xml (make-date 1 2))
-                               "1/2"))
-      (test-case "date-formlet"
-                 (check-equal? (formlet-display date-formlet)
-                               '((div () "Month:" (input ((name "input_0") (type "text"))) "Day:" (input ((name "input_1") (type "text")))))))
-      (test-case "travel-formlet"
-                 (check-equal? (formlet-display travel-formlet)
-                               '((div
-                                  ()
-                                  "Name:"
-                                  (input ((name "input_0") (type "text")))
-                                  nbsp
-                                  (div
-                                   ()
-                                   "Arrive:"
-                                   (div () "Month:" (input ((name "input_1") (type "text"))) "Day:" (input ((name "input_2") (type "text"))))
-                                   "Depart:"
-                                   (div () "Month:" (input ((name "input_3") (type "text"))) "Day:" (input ((name "input_4") (type "text")))))
-                                  "1"
-                                  "2"
-                                  "3"
-                                  (input ((type "submit")) "Submit")))))
-      (test-case "travel-formlet (proc)"
-                 (check-equal? (formlet-process travel-formlet
-                                                (make-request #"GET" (string->url "http://test.com")
-                                                              empty
-                                                              (delay
-                                                                (list (make-binding:form #"input_0" #"Jay")
-                                                                      (make-binding:form #"input_1" #"10")
-                                                                      (make-binding:form #"input_2" #"6")
-                                                                      (make-binding:form #"input_3" #"10")
-                                                                      (make-binding:form #"input_4" #"8")))
-                                                              #f "127.0.0.1" 80 "127.0.0.1"))
-                               (list "Jay" (make-date 10 6) (make-date 10 8))))))
-   
-   ; Multiple value formlets
-   (local [(define (date->xml m d)
-             (format "~a/~a" m d))      
-           (define (submit t)
-             `(input ([type "submit"]) ,t))
-           (define date-formlet
-             (formlet
-              (div
-               "Month:" ,{input-int . => . month}
-               "Day:" ,{input-int . => . day})
-              (values month day)))
-           
-           (define travel-formlet
-             (formlet
-              (div
-               "Name:" ,{input-string . => . name}
-               (div
-                "Arrive:" ,{date-formlet . => . (values arrive-m arrive-d)}
-                "Depart:" ,{date-formlet . => . (values depart-m depart-d)})
-               ,@(list "1" "2" "3")
-               ,(submit "Submit"))
-              (values name arrive-m arrive-d depart-m depart-d)))
-           
-           (define-syntax-rule (check-equal?/values actual-expr expected-expr)
-             (call-with-values (lambda () actual-expr)
-                               (lambda actual
-                                 (call-with-values (lambda () expected-expr)
-                                                   (lambda expected
-                                                     (check-equal? actual expected))))))]
-     (test-suite
-      "Date (values)"
-      
-      (test-case "date->xml"
-                 (check-equal? (date->xml 1 2)
-                               "1/2"))
-      (test-case "date-formlet"
-                 (check-equal? (formlet-display date-formlet)
-                               '((div () "Month:" (input ((name "input_0") (type "text"))) "Day:" (input ((name "input_1") (type "text")))))))
-      (test-case "travel-formlet"
-                 (check-equal? (formlet-display travel-formlet)
-                               '((div
-                                  ()
-                                  "Name:"
-                                  (input ((name "input_0") (type "text")))
-                                  (div
-                                   ()
-                                   "Arrive:"
-                                   (div () "Month:" (input ((name "input_1") (type "text"))) "Day:" (input ((name "input_2") (type "text"))))
-                                   "Depart:"
-                                   (div () "Month:" (input ((name "input_3") (type "text"))) "Day:" (input ((name "input_4") (type "text")))))
-                                  "1"
-                                  "2"
-                                  "3"
-                                  (input ((type "submit")) "Submit")))))
-      (test-case "travel-formlet (proc)"
-                 (check-equal?/values (formlet-process travel-formlet
-                                                       (make-request #"GET" (string->url "http://test.com")
-                                                                     empty
-                                                                     (delay
-                                                                       (list (make-binding:form #"input_0" #"Jay")
-                                                                             (make-binding:form #"input_1" #"10")
-                                                                             (make-binding:form #"input_2" #"6")
-                                                                             (make-binding:form #"input_3" #"10")
-                                                                             (make-binding:form #"input_4" #"8")))
-                                                                     #f "127.0.0.1" 80 "127.0.0.1"))
-                                      (values "Jay" 10 6 10 8)))))
-   
-   ))
-
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/formlets/formlet-star.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/formlets/formlet-star.rkt
deleted file mode 100644
index da57ea74cc..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/formlets/formlet-star.rkt
+++ /dev/null
@@ -1,107 +0,0 @@
-#lang racket
-(require web-server/formlets
-         tests/eli-tester
-         web-server/http
-         net/url)
-
-(define (make-test-req bs)
-  (make-request #"GET" (string->url "http://test.com") empty (delay bs) #f "127.0.0.1" 80 "127.0.0.1"))
-(define (make-test-bindings . bs)
-  (for/list ([b (in-list bs)]
-             [i (in-naturals)])
-    (make-binding:form (string->bytes/utf-8 (format "input_~a" i)) b)))
-(define-syntax-rule (test-formlet formlet display args result)
-  (test (formlet-display formlet) => display
-        (formlet-process formlet (make-test-req (make-test-bindings . args))) => result))
-
-(test
- (test-formlet 
-  (formlet*
-   (list 'p (input-string . =>* . name))
-   name)
-  '((p () (input ((name "input_0") (type "text")))))
-  (#"Jay")
-  '("Jay"))
- 
- (test-formlet 
-  (formlet*
-   `(p ,(input-string . =>* . name))
-   name)
-  '((p () (input ((name "input_0") (type "text")))))
-  (#"Jay")
-  '("Jay"))
- 
- (test-formlet 
-  (formlet*
-   (#%# `(p ,(input-string . =>* . name)))
-   name)
-  '((p () (input ((name "input_0") (type "text")))))
-  (#"Jay")
-  '("Jay"))
- 
- (test-formlet 
-  (formlet*
-   `(div 
-     ,@(for/list ([i (in-range 3)])
-         `(p ,(input-string . =>* . name))))
-   name)
-  '((div ()
-         (p () (input ((name "input_0") (type "text"))))
-         (p () (input ((name "input_1") (type "text"))))
-         (p () (input ((name "input_2") (type "text"))))))
-  (#"Jay" #"Ness" #"Pokey")
-  (list "Jay" "Ness" "Pokey"))
- 
- (test-formlet 
-  (formlet*
-   `(div 
-     ,@(for/list ([i (in-range 0)])
-         `(p ,(input-string . =>* . name))))
-   name)
-  '((div ()))
-  ()
-  (list))
- 
- (local [(define two-names
-           (formlet (#%# ,(input-string . => . first-name)
-                         ,(input-string . => . last-name))
-                    (values first-name last-name)))]
-   (test-formlet 
-    (formlet*
-     `(div 
-       ,@(for/list ([i (in-range 3)])
-           `(p ,(two-names . =>* . (values first-name last-name)))))
-     (map string-append first-name (for/list ([e (in-list first-name)]) " ") last-name))
-    '((div ()
-           (p () (input ((name "input_0") (type "text"))) (input ((name "input_1") (type "text"))))
-           (p () (input ((name "input_2") (type "text"))) (input ((name "input_3") (type "text"))))
-           (p () (input ((name "input_4") (type "text"))) (input ((name "input_5") (type "text"))))))
-    (#"Jay" #"McCarthy"
-     #"Ness" #"Ninten"
-     #"Pokey" #"Porkey")
-    (list "Jay McCarthy" 
-          "Ness Ninten"
-          "Pokey Porkey")))
- 
- (local [(define two-names
-           (formlet* (#%# (input-string . =>* . first-name)
-                          (input-string . =>* . last-name))
-                     (values (first first-name) (first last-name))))]
-   (test-formlet 
-    (formlet*
-     `(div 
-       ,@(for/list ([i (in-range 3)])
-           `(p ,(two-names . =>* . (values first-name last-name)))))
-     (map string-append first-name (for/list ([e (in-list first-name)]) " ") last-name))
-    '((div ()
-           (p () (input ((name "input_0") (type "text"))) (input ((name "input_1") (type "text"))))
-           (p () (input ((name "input_2") (type "text"))) (input ((name "input_3") (type "text"))))
-           (p () (input ((name "input_4") (type "text"))) (input ((name "input_5") (type "text"))))))
-    (#"Jay" #"McCarthy"
-     #"Ness" #"Ninten"
-     #"Pokey" #"Porkey")
-    (list "Jay McCarthy" 
-          "Ness Ninten"
-          "Pokey Porkey")))
- 
- )
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/all-http-tests.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/all-http-tests.rkt
deleted file mode 100644
index a9563f7794..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/all-http-tests.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-(require rackunit
-         "cookies-test.rkt"
-         "digest-auth-test.rkt")
-(provide all-http-tests)
-
-(define all-http-tests
-  (test-suite
-   "HTTP"
-   cookies-tests
-   digest-auth-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/cookies-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/cookies-test.rkt
deleted file mode 100644
index 0026422124..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/cookies-test.rkt
+++ /dev/null
@@ -1,128 +0,0 @@
-#lang racket/base
-(require rackunit
-         racket/promise
-         racket/list
-         net/url
-         web-server/http/request-structs
-         web-server/http/response-structs
-         web-server/http/cookie
-         web-server/http/cookie-parse)
-(provide cookies-tests)
-
-(define (header-equal? h1 h2)
-  (and (bytes=? (header-field h1)
-                (header-field h2))
-       (bytes=? (header-value h1)
-                (header-value h2))))
-
-(define (set-header->read-header h)
-  (make-header #"Cookie" (header-value h)))
-
-(define cookies-tests
-  (test-suite
-   "Cookies"
-
-   (test-suite
-    "cookie.rkt"
-
-    (test-suite
-     "cookie->header and make-cookie"
-     (test-check "Simple" header-equal?
-                 (cookie->header (make-cookie "name" "value"))
-                 (make-header #"Set-Cookie" #"name=value"))
-
-     (test-equal? "Comment"
-                  (header-value (cookie->header (make-cookie "name" "value" #:comment "comment")))
-                  #"name=value; Comment=comment")
-
-     (test-equal? "Domain"
-                  (header-value (cookie->header (make-cookie "name" "value" #:domain ".domain")))
-                  #"name=value; Domain=.domain")
-
-     (test-equal? "max-age"
-                  (header-value (cookie->header (make-cookie "name" "value" #:max-age 24)))
-                  #"name=value; Max-Age=24")
-
-     (test-equal? "path"
-                  (header-value (cookie->header (make-cookie "name" "value" #:path "path")))
-                  #"name=value; Path=path")
-
-     (test-equal? "secure? #t"
-                  (header-value (cookie->header (make-cookie "name" "value" #:secure? #t)))
-                  #"name=value; Secure")
-
-     (test-equal? "secure? #f"
-                  (header-value (cookie->header (make-cookie "name" "value" #:secure? #f)))
-                  #"name=value")))
-
-   (let ()
-     (define (reqcs hs)
-       (request-cookies
-        (make-request
-         #"GET" (string->url "http://test.com/foo")
-         hs (delay empty) #f
-         "host" 80 "client")))
-     (define (reqc h)
-       (reqcs (list (make-header #"Cookie" h))))
-
-     (test-suite
-      "cookie-parse.rkt"
-
-
-      (test-equal? "None"
-                   (reqcs empty)
-                   empty)
-
-      (test-equal? "Simple"
-                   (reqc #"$Version=\"1\"; name=\"value\"")
-                   (list (make-client-cookie "$Version" "1" #f #f)
-                         (make-client-cookie "name" "value" #f #f)))
-
-      (test-equal? "Path"
-                   (reqc #"$Version=\"1\"; name=\"value\"; $Path=\"/acme\"")
-                   (list (make-client-cookie "$Version" "1" #f #f)
-                         (make-client-cookie "name" "value" #f "/acme")))
-
-      (test-equal? "Domain"
-                   (reqc #"$Version=\"1\"; name=\"value\"; $Domain=\".acme\"")
-                   (list (make-client-cookie "$Version" "1" #f #f)
-                         (make-client-cookie "name" "value" ".acme" #f)))
-
-      (test-equal? "Multiple"
-                   (reqc #"$Version=\"1\"; key1=\"value1\"; key2=\"value2\"")
-                   (list (make-client-cookie "$Version" "1" #f #f)
-                         (make-client-cookie "key1" "value1" #f #f)
-                         (make-client-cookie "key2" "value2" #f #f)))
-
-      (test-equal? "Multiple w/ paths & domains"
-                   (reqc #"$Version=\"1\"; key1=\"value1\"; $Path=\"/acme\"; key2=\"value2\"; $Domain=\".acme\"")
-                   (list (make-client-cookie "$Version" "1" #f #f)
-                         (make-client-cookie "key1" "value1" #f "/acme")
-                         (make-client-cookie "key2" "value2" ".acme" #f)))
-
-      (test-equal? "phpBB. PR10689"
-                   (reqc #"style_cookie=null; phpbb3_e1p9b_u=54; phpbb3_e1p9b_k=; phpbb3_e1p9b_sid=3fa8d7a7b65fbabcbe9b345861dc079a")
-                   (list (make-client-cookie "style_cookie" "null" #f #f)
-                         (make-client-cookie "phpbb3_e1p9b_u" "54" #f #f)
-                         (make-client-cookie "phpbb3_e1p9b_k" "" #f #f)
-                         (make-client-cookie "phpbb3_e1p9b_sid" "3fa8d7a7b65fbabcbe9b345861dc079a" #f #f)))
-
-      (test-equal? "Google"
-                   (reqc #"teaching-order=course;
-__utmz=165257760.1272597702.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none)\r\n")
-                   (list (make-client-cookie "teaching-order" "course" #f #f)
-                         (make-client-cookie "__utmz" "165257760.1272597702.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none)" #f #f)))
-
-      (let ()
-        (define in "hell\"w\"o")
-        (define out #"id=\"hell\\\"w\\\"o\"")
-        (test-check "quotes (pr14194)" header-equal?
-                    (cookie->header (make-cookie "id" in))
-                    (make-header #"Set-Cookie" out))
-        (test-equal? "quotes (pr14194)"
-                     (reqc out)
-                     (list (make-client-cookie "id" in #f #f))))))))
-
-(module+ test
-  (require rackunit/text-ui)
-  (run-tests cookies-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/digest-auth-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/digest-auth-test.rkt
deleted file mode 100644
index 321b755d4a..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/digest-auth-test.rkt
+++ /dev/null
@@ -1,135 +0,0 @@
-#lang racket
-(require rackunit
-         web-server/http
-         net/url)
-(provide digest-auth-tests)
-
-(define RFC-Example-bytes
-  (string->bytes/utf-8 #<<END
-Digest username="Mufasa",
-                      realm="testrealm@host.com",
-                      nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093",
-                      uri="/dir/index.html",
-                      qop=auth,
-                      nc=00000001,
-                      cnonce="0a4f113b",
-                      response="6629fae49393a05397450978507c4ef1",
-                      opaque="5ccc069c403ebaf9f0171e9517f40e41"
-END
-                       ))
-(define RFC-Example-alist
-  '([username . "Mufasa"]
-    [realm . "testrealm@host.com"]
-    [nonce . "dcd98b7102dd2f0e8b11d0f600bfb0c093"]
-    [uri . "/dir/index.html"]
-    [qop . "auth"]
-    [nc . "00000001"]
-    [cnonce . "0a4f113b"]
-    [response . "6629fae49393a05397450978507c4ef1"]
-    [opaque . "5ccc069c403ebaf9f0171e9517f40e41"]))
-
-(define Safari-Example-bytes
-  #"Digest username=\"username\", realm=\"Digest Auth Test: g10971\", nonce=\"MTIzMzc2ODU3NCA4MjA2MTAyMDNhYzYyYTRiMTdmOTY4NzVjOWI1MzEwOQ==\", uri=\"/servlets/standalone.ss\", response=\"c3e45e8499e37bf0872930b35fcae291\", cnonce=\"94db38ffd6e360db658e0dbcbf5e43b9\", nc=00000001, qop=\"auth\"")
-(define Safari-Example-alist
-  '([username . "username"]
-    [realm . "Digest Auth Test: g10971"]
-    [nonce . "MTIzMzc2ODU3NCA4MjA2MTAyMDNhYzYyYTRiMTdmOTY4NzVjOWI1MzEwOQ=="]
-    [uri . "/servlets/standalone.ss"]
-    [response . "c3e45e8499e37bf0872930b35fcae291"]
-    [cnonce . "94db38ffd6e360db658e0dbcbf5e43b9"]
-    [nc . "00000001"]
-    [qop . "auth"]))
-
-(define (make-req hs)
-  (make-request 
-   #"GET" (string->url "http://test.com/foo")
-   hs
-   (delay empty) #f
-   "host" 80 "client"))
-
-(define (header->cons h)
-  (cons (header-field h) (header-value h)))
-
-(define digest-auth-tests
-  (test-suite
-   "Digest Authentication"
-   
-   (test-suite
-    "make-digest-auth-header"
-    
-    (test-case "Field"
-               (check-equal? (header-field (make-digest-auth-header "realm" "secret-key" "opaque"))
-                             #"WWW-Authenticate"))
-    
-    (test-case "Value"
-               (check-pred (lambda (v)
-                             (regexp-match #rx"Digest realm=\"realm\", qop=\"auth\", nonce=\".+\" opaque=\"opaque\"" v))
-                           (header-value (make-digest-auth-header "realm" "secret-key" "opaque")))))
-   
-   (test-suite
-    "request->digest-credentials"
-    (test-case "Error"
-               (check-equal?
-                (request->digest-credentials
-                 (make-req (list (make-header #"Authorization" #"Basic bar=\"foo\""))))
-                #f))
-    
-    (test-case "RFC Example"
-               (check-equal? 
-                (request->digest-credentials 
-                 (make-req (list (make-header #"Authorization" RFC-Example-bytes))))
-                RFC-Example-alist))
-    
-    (test-case "Safari Example"
-               (check-equal? 
-                (request->digest-credentials 
-                 (make-req 
-                  (list 
-                   (make-header #"Authorization"
-                                Safari-Example-bytes))))
-                Safari-Example-alist)))
-   
-   (test-suite
-    "password->digest-HA1"
-    (test-case "Simple"
-               (check-equal? ((password->digest-HA1 string-append) "username" "realm")
-                             #"cdc6d76271d05ba4d7afeecfcb451c21"))
-    (test-case "RFC Example"
-               (check-equal? ((password->digest-HA1 (lambda (u r) "Circle Of Life")) "Mufasa" "testrealm@host.com")
-                             #"939e7578ed9e3c518a452acee763bce9"))
-    (test-case "Safari Example"
-               (check-equal? ((password->digest-HA1 (lambda (u r) "password")) "username" "Digest Auth Test: g10971")
-                             #"663c0814b20c2cdabe8baa309c6d7b82")))
-   
-   (test-suite
-    "make-check-digest-credentials"
-    (test-case "RFC Incorrect"
-               (check-equal? ((make-check-digest-credentials (lambda (u r) #"939e7578ed9e3c518a452acee76321e9"))
-                              "GET" RFC-Example-alist)
-                             #f))
-    
-    (test-case "Error"
-               (check-exn exn? 
-                          (lambda ()
-                            ((make-check-digest-credentials (lambda (u r) #"939e7578ed9e3c518a452acee76321e9"))
-                             "GET" 
-                             '([realm . "testrealm@host.com"]
-                               [nonce . "dcd98b7102dd2f0e8b11d0f600bfb0c093"]
-                               [uri . "/dir/index.html"]
-                               [qop . "auth"]
-                               [nc . "00000001"]
-                               [cnonce . "0a4f113b"]
-                               [response . "6629fae49393a05397450978507c4ef1"]
-                               [opaque . "5ccc069c403ebaf9f0171e9517f40e41"])))))
-    
-    (test-case "RFC Example"
-               (check-equal? ((make-check-digest-credentials (lambda (u r) #"939e7578ed9e3c518a452acee763bce9"))
-                              "GET" RFC-Example-alist)
-                             #t))
-    
-    (test-case "Safari Example"
-               (check-equal? ((make-check-digest-credentials (lambda (u r) #"663c0814b20c2cdabe8baa309c6d7b82"))
-                              "GET" Safari-Example-alist)
-                             #t)))
-   
-   ))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/xexpr.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/xexpr.rkt
deleted file mode 100644
index a205f96aef..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/http/xexpr.rkt
+++ /dev/null
@@ -1,82 +0,0 @@
-#lang racket
-(require tests/eli-tester
-         web-server/private/timer
-         web-server/private/connection-manager
-         web-server/http/response
-         web-server/http
-         "../util.rkt")
-
-(define tm (start-timer-manager))
-(define (write-response r [redact? #t])
-  (define-values (i-port o-port) (make-pipe))
-  (define conn
-    (connection 0 (start-timer tm +inf.0 void)
-                i-port o-port (make-custodian) #t))
-  (output-response conn r)
-  (close-output-port o-port)
-  (define bs (port->bytes i-port))
-  (bytes-sort (if redact? (redact bs) bs)))
-
-(test
- (write-response (response/xexpr '(a ([href "#"]) "link")))
- =>
- (bytes-sort
-  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\n\r\n<a href=\"#\">link</a>")
-
- (write-response (response/xexpr '(html)))
- =>
- (bytes-sort
-  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\n\r\n<html></html>")
-
- (write-response (response/xexpr '(img)))
- =>
- (bytes-sort
-  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\n\r\n<img/>")
- 
- (write-response (response/xexpr '(a ([href "#"]) "link")
-                                 #:code 404))
- =>
- (bytes-sort
-  #"HTTP/1.1 404 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\n\r\n<a href=\"#\">link</a>")
- 
- (write-response (response/xexpr '(a ([href "#"]) "link")
-                                 #:message #"Bad request"))
- =>
- (bytes-sort
-  #"HTTP/1.1 200 Bad request\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\n\r\n<a href=\"#\">link</a>")
- 
- (map
-  (λ (b) (regexp-replace 
-          #"Date: [a-zA-Z0-9:, ]+ GMT"
-          b          
-          #"Date: REDACTED GMT"))
-  (write-response (response/xexpr '(a ([href "#"]) "link")
-                                  #:seconds 0)
-                  #f))
- =>
- (bytes-sort
-  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: Wed, 31 Dec 1969 23:00:00 GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n<a href=\"#\">link</a>")
- 
- (write-response (response/xexpr '(a ([href "#"]) "link")
-                                      #:mime-type #"application/xml"))
- =>
- (bytes-sort
-  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: application/xml\r\n\r\n<a href=\"#\">link</a>")
- 
- (write-response (response/xexpr '(a ([href "#"]) "link")
-                                      #:headers (list (header #"head" #"value"))))
- =>
- (bytes-sort
-  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nhead: value\r\n\r\n<a href=\"#\">link</a>")
- 
- (write-response (response/xexpr '(a ([href "#"]) "link")
-                                      #:cookies (list (make-cookie "head" "value"))))
- =>
- (bytes-sort
-  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\nSet-Cookie: head=value\r\n\r\n<a href=\"#\">link</a>")
- 
- (write-response (response/xexpr '(a ([href "#"]) "link")
-                                      #:preamble #"<<!something XMLy>>"))
- =>
- (bytes-sort
-  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\n\r\n<<!something XMLy>><a href=\"#\">link</a>"))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang-test.rkt
deleted file mode 100644
index 45d017507b..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang-test.rkt
+++ /dev/null
@@ -1,604 +0,0 @@
-#lang racket/base
-(require rackunit
-         "util.rkt")
-(provide lang-tests)
-
-(define (catch-unsafe-context-exn thunk)
-  (with-handlers ([void
-                   (lambda (the-exn)
-                     (or
-                      (and
-                       (regexp-match ".*Attempt to capture a continuation from within an unsafe context"
-                                     (exn-message the-exn))
-                       #t)
-                      (raise the-exn)))])
-    (and (thunk) #f)))
-
-(define the-dispatch
-  `(lambda (k*v)
-     (lambda (k*v)
-       ((car k*v) k*v))))
-
-(define lang-tests
-  (test-suite
-   "Web Language Servlets"
-   
-   ;; ****************************************
-   ;; ****************************************
-   ;; BASIC TESTS  
-   (test-suite
-    "Basic Tests"
-    
-    (test-case
-     "Function application with single argument in tail position"
-     (let-values ([(test-m00.4)
-                   (make-module-eval
-                    (module m00.4 web-server/lang
-                      (provide start)
-                      (define (start initial)
-                        (let ([f (let ([m 7]) m)])
-                          (+ f initial)))))])
-       (check = 8 (test-m00.4 '(dispatch-start start 1)))))
-
-    (test-case
-     "set!"
-     (let-values ([(test-m00.4)
-                   (make-module-eval
-                    (module m00.4 web-server/lang
-                            (provide start)
-                            (define x 1)
-                            (define (start initial)
-                              (set! x (add1 x))
-                              x)))])
-       (check = 2 (test-m00.4 '(dispatch-start start #f)))
-       (check = 3 (test-m00.4 '(dispatch-start start #f)))))
-        
-    (test-case
-     "Embedded Definitions"
-     (let-values ([(test-m00.4)
-                   (make-module-eval
-                    (module m00.4 web-server/lang
-                      (provide start)
-                      (define (start initial)
-                        (define m 7)
-                        (define f m)
-                        (+ f initial))))])
-       (check = 8 (test-m00.4 '(dispatch-start start 1)))))
-    
-    (test-case
-     "Embedded Definitions + Intermixed expressions"
-     (let-values ([(test-m00.4)
-                   (make-module-eval
-                    (module m00.4 web-server/lang
-                      (provide start)
-                      (define (start initial)
-                        (define m 7)
-                        (+ m 13)
-                        (define f m)
-                        (+ f initial))))])
-       (check = 8 (test-m00.4 '(dispatch-start start 1)))))
-    
-    (test-case
-     "start-interaction in argument position of a function call"
-     (let-values ([(test-m00.3)
-                   (make-module-eval
-                    (module m00.3 web-server/lang
-                      (define (foo x) 'foo)
-                      (provide start)
-                      (define (start initial)
-                        (foo initial))))])
-       (check eqv? 'foo (test-m00.3 '(dispatch-start start 7)))))
-    
-    (test-case
-     "identity interaction, dispatch-start called multiple times"
-     (let-values ([(test-m00)
-                   (make-module-eval
-                    (module m00 web-server/lang
-                      (define (id x) x)
-                      (provide start)
-                      (define (start initial)
-                        (id initial))))])
-       (check = 7 (test-m00 '(dispatch-start start 7)))
-       (check eqv? 'foo (test-m00 '(dispatch-start start 'foo)))))
-    
-    (test-case
-     "start-interaction in argument position of a primitive"
-     (let-values ([(test-m00.1)
-                   (make-module-eval
-                    (module m00.1 web-server/lang
-                      (provide start)
-                      (define (start initial)
-                        (+ 1 initial))))])         
-       (check = 2 (test-m00.1 '(dispatch-start start 1)))))
-    
-    (test-case
-     "dispatch-start called multiple times for s-i in non-trivial context"
-     (let-values ([(test-m00.2)
-                   (make-module-eval
-                    (module m00.2 web-server/lang
-                      (provide start)
-                      (define (start initial)
-                        (+ (+ 1 1) initial))))])         
-       (check = 14 (test-m00.2 '(dispatch-start start 12)))
-       (check = 20 (test-m00.2 '(dispatch-start start 18)))))
-    
-    (test-case
-     "start-interaction in third position"
-     (let-values ([(test-m01)
-                   (make-module-eval
-                    (module m01 web-server/lang
-                      (provide start)
-                      (define (start initial)
-                        (+ (* 1 2) (* 3 4) initial))))])         
-       (check = 14 (test-m01 '(dispatch-start start 0)))
-       (check = 20 (test-m01 '(dispatch-start start 6))))))          
-   
-   (test-suite
-    "Tests involving multiple values"
-    (test-case
-     "begin with intermediate multiple values"
-     (let-values ([(test)
-                   (make-module-eval
-                    (module m03 web-server/lang
-                      (provide start)
-                      (define (start x)
-                        (begin (printf "Before\n")
-                               (values 1 x)
-                               (printf "After\n")
-                               x))))])
-       (check = 3 (test `(dispatch-start start 3)))))
-    
-    (test-case
-     "begin0 with intermediate multiple values"
-     (let-values ([(test)
-                   (make-module-eval
-                    (module m03 web-server/lang
-                      (provide start)
-                      (define (start x)
-                        (begin0 x
-                                (printf "Before\n")
-                                (values 1 x)
-                                (printf "After\n")))))])
-       (check = 3 (test `(dispatch-start start 3)))))
-    
-    (test-case
-     "begin0 with multiple values"
-     (let-values ([(test)
-                   (make-module-eval
-                    (module m03 web-server/lang
-                      (provide start)
-                      (define (start x)
-                        (let-values ([(_ ans)
-                                      (begin0 (values 1 x) 
-                                              (printf "Before\n")
-                                              x
-                                              (printf "After\n"))])
-                          ans))))])
-       (check = 3 (test `(dispatch-start start 3))))))
-   
-   (test-suite
-    "Tests Involving call/cc"
-    
-    (test-case
-     "continuation invoked in non-trivial context from within proc"
-     (let-values ([(test-m03)
-                   (make-module-eval
-                    (module m03 web-server/lang
-                      (provide start)
-                      (define (start x)
-                        (let/cc k
-                          (+ 2 4 (k 3) 6 8)))))])         
-       (check = 3 (test-m03 '(dispatch-start start 'foo)))
-       (check = 3 (test-m03 '(dispatch-start start 7)))))
-    
-    ;; in the following test, if you modify
-    ;; resume to print the "stack" you will
-    ;; see that this is not tail recursive
-    (test-case
-     "non-tail-recursive 'escaping' continuation"
-     (let-values ([(test-m04)
-                   (make-module-eval
-                    (module m04 web-server/lang
-                      (provide start)
-                      (define (start ln)
-                        (let/cc k
-                          (cond
-                            [(null? ln) 1]
-                            [(zero? (car ln)) (k 0)]
-                            [else
-                             (* (car ln)
-                                (start (cdr ln)))])))))])
-       (check = 0 (test-m04 '(dispatch-start start (list 1 2 3 4 5 6 7 0 8 9))))
-       (check = 120 (test-m04 '(dispatch-start start (list 1 2 3 4 5))))))
-    
-    ;; this version captures the continuation
-    ;; outside the recursion and should be tail
-    ;; recursive. A "stack trace" reveals this
-    ;; as expected.
-    (test-case
-     "tail-recursive escaping continuation"
-     (let-values ([(test-m05)
-                   (make-module-eval
-                    (module m05 web-server/lang
-                      (provide start)                 
-                      
-                      (define (start ln)
-                        (let/cc escape
-                          (mult/escape escape ln)))
-                      
-                      (define (mult/escape escape ln)
-                        (cond
-                          [(null? ln) 1]
-                          [(zero? (car ln)) (escape 0)]
-                          [else
-                           (* (car ln)
-                              (mult/escape escape (cdr ln)))]))))])     
-       (check = 0 (test-m05 '(dispatch-start start (list 1 2 3 0 4 5 6))))
-       (check = 120 (test-m05 '(dispatch-start start (list 1 2 3 4 5)))))))
-   
-   ;; ****************************************
-   ;; ****************************************
-   ;; TESTS INVOLVING call-with-serializable-current-continuation
-   (test-suite
-    "Tests Involving call-with-serializable-current-continuation"
-    
-    (test-case
-     "curried add with call-with-serializable-current-continuation"
-     (let ([table-01-eval
-            (make-module-eval
-             (module table01 racket
-               (provide store-k
-                        lookup-k)
-               
-               (define the-table (make-hash))
-               
-               (define (store-k k)
-                 (let ([key (string->symbol (symbol->string (gensym 'key)))])
-                   (hash-set! the-table key k)
-                   key))
-               (define (lookup-k key-pair)
-                 (hash-ref the-table (car key-pair) (lambda () #f)))))])         
-       (table-01-eval
-        '(module m06 web-server/lang
-           (require 'table01)
-           (provide start)
-           
-           (define (gn which)
-             (cadr
-              (call-with-serializable-current-continuation
-               (lambda (k)
-                 (let ([ignore (printf "Please send the ~a number.\n" which)])
-                   (store-k k))))))
-           
-           (define (start ignore)
-             (let ([result (+ (gn "first") (gn "second"))])
-               (let ([ignore (printf "The answer is: ~s\n" result)])
-                 result)))))         
-       (table-01-eval '(require 'm06))         
-       (let* ([first-key (table-01-eval '(dispatch-start start 'foo))]
-              [second-key (table-01-eval `(dispatch lookup-k '(,first-key 1)))]
-              [third-key (table-01-eval `(dispatch lookup-k '(,first-key -7)))])
-         #;(printf "~S\n" (list first-key second-key third-key))
-         (check = 3 (table-01-eval `(dispatch lookup-k '(,second-key 2))))
-         (check = 4 (table-01-eval `(dispatch lookup-k '(,second-key 3))))
-         (check-true (zero? (table-01-eval `(dispatch lookup-k '(,second-key -1)))))
-         (check = -7 (table-01-eval `(dispatch lookup-k '(,third-key 0))))
-         (check-true (zero? (table-01-eval `(dispatch lookup-k '(,third-key 7))))))))
-    
-    (test-case
-     "curried with call-with-serializable-current-continuation and serializaztion"
-     
-     (let-values ([(test-m06.1)
-                   (make-module-eval
-                    (module m06.1 web-server/lang
-                      (provide start)
-                      (define (gn which)
-                        (cadr
-                         (call-with-serializable-current-continuation
-                          (lambda (k)
-                            (let ([ignore (printf "Please send the ~a number.\n" which)])
-                              k)))))
-                      
-                      (define (start ignore)
-                        (let ([result (+ (gn "first") (gn "second"))])
-                          (let ([ignore (printf "The answer is: ~s\n" result)])
-                            result)))))])
-       (let* ([first-key (test-m06.1 '(dispatch-start start 'foo))]
-              [second-key (test-m06.1 `(dispatch ,the-dispatch (list (deserialize (serialize ,first-key)) 1)))]
-              [third-key (test-m06.1 `(dispatch ,the-dispatch (list (deserialize (serialize ,first-key)) -7)))])
-         (check = 3 (test-m06.1 `(call-with-web-prompt (lambda () (dispatch ,the-dispatch (list ,second-key 2))))))
-         (check = 4 (test-m06.1 `(dispatch ,the-dispatch (list ,second-key 3))))
-         (check-true (zero? (test-m06.1 `(dispatch ,the-dispatch (list ,second-key -1)))))
-         (check = -7 (test-m06.1 `(dispatch ,the-dispatch (list ,third-key 0))))
-         (check-true (zero? (test-m06.1 `(dispatch ,the-dispatch (list ,third-key 7))))))))
-    
-    (test-case
-     "curried with call-with-serializable-current-continuation and serializaztion (keyword args)"
-     
-     (let-values ([(test-m06.2)
-                   (make-module-eval
-                    (module m06.2 web-server/lang
-                      (provide start)
-                      (define (gn #:page which)
-                        (cadr
-                         (call-with-serializable-current-continuation
-                          (lambda (k)
-                            (let ([ignore (printf "Please send the ~a number.\n" which)])
-                              k)))))
-                      
-                      (define (start ignore)
-                        (let ([result (+ (gn #:page "first") (gn #:page "second"))])
-                          (let ([ignore (printf "The answer is: ~s\n" result)])
-                            result)))))])
-       (let* ([first-key (test-m06.2 '(dispatch-start start 'foo))]
-              [second-key (test-m06.2 `(dispatch ,the-dispatch (list (deserialize (serialize ,first-key)) 1)))]
-              [third-key (test-m06.2 `(dispatch ,the-dispatch (list (deserialize (serialize ,first-key)) -7)))])
-         (check = 3 (test-m06.2 `(call-with-web-prompt (lambda () (dispatch ,the-dispatch (list ,second-key 2))))))
-         (check = 4 (test-m06.2 `(dispatch ,the-dispatch (list ,second-key 3))))
-         (check-true (zero? (test-m06.2 `(dispatch ,the-dispatch (list ,second-key -1)))))
-         (check = -7 (test-m06.2 `(dispatch ,the-dispatch (list ,third-key 0))))
-         (check-true (zero? (test-m06.2 `(dispatch ,the-dispatch (list ,third-key 7)))))))))
-   
-   (test-suite
-    "Test the certification process"
-    
-    (test-suite
-     "Splicing tests"
-     
-     (test-case
-      "quasi-quote with splicing: need to recertify context for qq-append"
-      (let-values ([(test-m01.1)
-                    (make-module-eval
-                     (module m01.1 web-server/lang
-                       (provide start)
-                       (define (start initial)
-                         `(,@(list 1 2 initial)))))])         
-        (check equal? (list 1 2 3) (test-m01.1 '(dispatch-start start 3)))
-        (check equal? (list 1 2 'foo) (test-m01.1 '(dispatch-start start 'foo)))))
-     
-     (test-case
-      "recertify context test (1)"
-      (let-values ([(test-m01.2)
-                    (make-module-eval
-                     (module m01.1 web-server/lang
-                       (provide start)
-                       (define (start initial)
-                         `(foo ,@(list 1 2 3)))))])
-        (check-true #t)))
-     
-     (test-case
-      "recertify context test (2)"
-      (let-values ([(test-m01.3)
-                    (make-module-eval  
-                     (module m01.3 web-server/lang
-                       (provide start)
-                       (define (start n)
-                         `(n ,@(list 1 2 3)))))])
-        (check-true #t)))
-     
-     (test-case
-      "recertify context test (3)"
-      (let-values ([(test-m01.4)
-                    (make-module-eval
-                     (module m1 web-server/lang
-                       (provide start)
-                       (define (start initial)
-                         (define (bar n)
-                           `(n ,@(list 1 2 3)))
-                         (bar 7))))])
-        (check-true #t)))))
-   
-   (test-suite
-    "Tests Involving letrec"
-    
-    (test-case
-     "mutually recursive even? and odd?"
-     (let-values ([(test-m07)
-                   (make-module-eval
-                    (module m07 web-server/lang
-                      (provide start)
-                      (define (start initial)
-                        (letrec ([even? (lambda (n)
-                                          (or (zero? n)
-                                              (odd? (sub1 n))))]
-                                 [odd? (lambda (n)
-                                         (and (not (zero? n))
-                                              (even? (sub1 n))))])
-                          (even? initial)))))])         
-       (check-true (test-m07 '(dispatch-start start 0)))
-       (check-true (test-m07 '(dispatch-start start 16)))
-       (check-false (test-m07 '(dispatch-start start 1)))
-       (check-false (test-m07 '(dispatch-start start 7)))))
-    
-    (test-case
-     "call-with-serializable-current-continuation on rhs of letrec binding forms"
-     (let-values ([(test-m08)
-                   (make-module-eval
-                    (module m08 web-server/lang
-                      (provide start)
-                      (define (gn which)
-                        (cadr
-                         (call-with-serializable-current-continuation
-                          (lambda (k)
-                            (let ([ignore (printf "Please send the ~a number.\n" which)])
-                              k)))))
-                      
-                      (define (start ignore)
-                        (letrec ([f (let ([n (gn "first")])
-                                      (lambda (m) (+ n m)))]
-                                 [g (let ([n (gn "second")])
-                                      (lambda (m) (+ n (f m))))])
-                          (let ([result (g (gn "third"))])
-                            (let ([ignore (printf "The answer is: ~s\n" result)])
-                              result))))))])
-       (let* ([k0 (test-m08 '(serialize (dispatch-start start 'foo)))]
-              [k1 (test-m08 `(serialize (dispatch ,the-dispatch (list (deserialize ',k0) 1))))]
-              [k2 (test-m08 `(serialize (dispatch ,the-dispatch (list (deserialize ',k1) 2))))])
-         (check = 6 (test-m08 `(dispatch ,the-dispatch (list (deserialize ',k2) 3))))
-         (check = 9 (test-m08 `(dispatch ,the-dispatch (list (deserialize ',k2) 6))))
-         (let* ([k1.1 (test-m08 `(serialize (dispatch ,the-dispatch (list (deserialize ',k0) -1))))]
-                [k2.1 (test-m08 `(serialize (dispatch ,the-dispatch (list (deserialize ',k1.1) -2))))])
-           (check-true (zero? (test-m08 `(dispatch ,the-dispatch (list (deserialize ',k2.1) 3)))))
-           (check = 6 (test-m08 `(dispatch ,the-dispatch (list (deserialize ',k2) 3)))))))))
-   
-   (test-suite
-    "Unsafe Context Condition Tests"
-    
-    (test-case
-     "simple attempt to capture a continuation from an unsafe context"
-     
-     (let-values ([(nta-eval)
-                   (make-module-eval
-                    (module nta racket
-                      (provide non-tail-apply)
-                      
-                      (define (non-tail-apply f . args)
-                        (let ([result (apply f args)])
-                          (printf "result = ~s\n" result)
-                          result))))])
-       (nta-eval '(module m09 web-server/lang
-                    (require 'nta)
-                    (provide start)
-                    (define (start ignore)
-                      (non-tail-apply (lambda (x) (let/cc k (k x))) 7))))
-       
-       (nta-eval '(require 'm09))
-       
-       (check-true (catch-unsafe-context-exn
-                    (lambda () (nta-eval '(dispatch-start start 'foo)))))))
-    
-    (test-case
-     "sanity-check: capture continuation from safe version of context"
-     
-     (let-values ([(m10-eval)
-                   (make-module-eval
-                    (module m10 web-server/lang
-                      (provide start)
-                      (define (nta f arg)
-                        (let ([result (f arg)])
-                          (printf "result = ~s\n" result)
-                          result))
-                      (define (start ignore)
-                        (nta (lambda (x) (let/cc k (k x))) 7))))])         
-       (check = 7 (m10-eval '(dispatch-start start 'foo)))))
-    
-    (test-case
-     "attempt continuation capture from standard call to map"
-     
-     (let-values ([(m11-eval)
-                   (make-module-eval
-                    (module m11 web-server/lang
-                      (provide start)
-                      (define (start ignore)
-                        (map
-                         (lambda (x) (let/cc k k))
-                         (list 1 2 3)))))])         
-       (check-true (catch-unsafe-context-exn
-                    (lambda () (m11-eval '(dispatch-start start 'foo)))))))
-    
-    ;; if the continuation-capture is attempted in tail position then we
-    ;; should be just fine.
-    (test-case
-     "continuation capture from tail position of untranslated procedure"
-     
-     (let ([ta-eval
-            (make-module-eval
-             (module ta racket
-               (provide tail-apply)
-               
-               (define (tail-apply f . args)
-                 (apply f args))))])
-       
-       (ta-eval '(module m12 web-server/lang
-                   (require 'ta)
-                   (provide start)
-                   (define (start initial)
-                     (+ initial 
-                        (tail-apply (lambda (x) (let/cc k (k x))) 1)))))
-       
-       (ta-eval '(require 'm12))
-       
-       (check = 2 (ta-eval '(dispatch-start start 1)))))
-    
-    (test-case
-     "attempt call-with-serializable-current-continuation from standard call to map"
-     
-     (let-values ([(m13-eval)
-                   (make-module-eval
-                    (module m11 web-server/lang
-                      (provide start)
-                      (define (start initial)
-                        (map
-                         (lambda (n) (call-with-serializable-current-continuation
-                                      (lambda (k)
-                                        (let ([ignore (printf "n = ~s\n" n)])
-                                          k))))
-                         (list 1 2 3)))))])
-       (check-true (catch-unsafe-context-exn
-                    (lambda () (m13-eval '(dispatch-start start 'foo)))))))
-    
-    (test-case
-     "attempt call-with-serializable-current-continuation from tail position of untranslated procedure"
-     
-     (let-values ([(ta-eval)
-                   (make-module-eval
-                    (module ta racket
-                      (provide tail-apply)
-                      
-                      (define (tail-apply f . args)
-                        (apply f args))))])
-       
-       (ta-eval '(module m14 web-server/lang
-                   (require 'ta)
-                   (provide start)
-                   (define (start ignore)
-                     (+ 1 (tail-apply
-                           (lambda (n)
-                             (cadr
-                              (call-with-serializable-current-continuation
-                               (lambda (k)
-                                 (let ([ignore (printf "n = ~s\n" n)])
-                                   k))))) 7)))))
-       (ta-eval '(require 'm14))
-       
-       (let ([k0 (ta-eval '(dispatch-start start 'foo))])
-         (check = 3 (ta-eval `(dispatch ,the-dispatch (list ,k0 2))))
-         (check = 0 (ta-eval `(dispatch ,the-dispatch (list ,k0 -1))))))))
-   
-   (test-suite
-    "Weird Cases"
-    
-    (test-case
-     "provide/contract: simple"
-     (check-not-exn
-      (lambda ()
-        (make-module-eval
-         (module data web-server/lang
-           (require mzlib/contract)
-           
-           (define x 1)
-           (provide/contract
-            [x integer?]))))))
-    
-    
-    (test-case
-     "provide/contract: struct"
-     (check-not-exn
-      (lambda ()
-        (make-module-eval
-         (module data web-server/lang
-           (require mzlib/contract)
-           
-           (define-struct posn (x y) #:mutable)
-           (provide/contract
-            [struct posn ([x integer?] [y integer?])]))))))
-    
-    (test-case
-     "define-values error"
-     (check-not-exn
-      (lambda ()
-        (make-module-eval
-         (module test web-server/lang
-           (define (show-user)
-             (define-values (point i) (values #t 1))
-             i)))))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/abort-resume-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/abort-resume-test.rkt
deleted file mode 100644
index 6cd95a7497..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/abort-resume-test.rkt
+++ /dev/null
@@ -1,306 +0,0 @@
-#lang racket
-(require rackunit
-         web-server/lang/abort-resume)
-(require/expose web-server/lang/abort-resume (web-prompt))
-(provide abort-resume-tests)
-
-(define abort-resume-tests
-  (test-suite
-   "Abort/Resume"
-   
-   (test-suite
-    "with-current-saved-continuation-marks-and"
-    
-    (test-case
-     "Easy"
-     (check-equal? 
-      (call-with-web-prompt
-       (lambda () 
-         (with-current-saved-continuation-marks-and
-          'k1 'v1
-          (lambda ()
-            (continuation-mark-set->list
-             (current-continuation-marks web-prompt)
-             the-save-cm-key)))))
-      (list (make-immutable-hash (list (cons 'k1 'v1))))))
-    
-    (test-case
-     "Preserve (beta)"
-     (check-equal? 
-      (call-with-web-prompt
-       (lambda () 
-         (with-continuation-mark the-save-cm-key
-           (make-immutable-hash (list (cons 'k2 'v2)))
-           
-           (call-with-immediate-continuation-mark
-            the-save-cm-key
-            (lambda (old-cms)
-              (with-continuation-mark the-save-cm-key
-                (hash-set old-cms 'k1 'v1)
-                (continuation-mark-set->list
-                 (current-continuation-marks web-prompt)
-                 the-save-cm-key)))
-            (make-immutable-hash empty)))))
-      (list (make-immutable-hash 
-             (list (cons 'k1 'v1)
-                   (cons 'k2 'v2))))))
-    
-    #;(test-case
-       "Preserve"
-       (check-equal? 
-        (call-with-web-prompt
-         (lambda () 
-           (with-continuation-mark the-save-cm-key
-             (make-immutable-hash (list (cons 'k2 'v2)))
-             (with-current-saved-continuation-marks-and
-              'k1 'v1
-              (lambda ()
-                (continuation-mark-set->list
-                 (current-continuation-marks web-prompt)
-                 the-save-cm-key))))))
-        (list (make-immutable-hash 
-               (list (cons 'k1 'v1)
-                     (cons 'k2 'v2))))))
-    
-    (test-case
-     "Update (beta)"
-     (check-equal? 
-      (call-with-web-prompt
-       (lambda () 
-         (with-continuation-mark the-save-cm-key
-           (make-immutable-hash (list (cons 'k2 'v2) (cons 'k1 'v3)))
-           
-           (call-with-immediate-continuation-mark
-            the-save-cm-key
-            (lambda (old-cms)
-              (with-continuation-mark the-save-cm-key
-                (hash-set old-cms 'k1 'v1)
-                (continuation-mark-set->list
-                 (current-continuation-marks web-prompt)
-                 the-save-cm-key)))
-            (make-immutable-hash empty)))))
-      (list (make-immutable-hash 
-             (list (cons 'k1 'v1)
-                   (cons 'k2 'v2))))))
-    
-    #;(test-case
-       "Update"
-       (check-equal? 
-        (call-with-web-prompt
-         (lambda () 
-           (with-continuation-mark the-save-cm-key
-             (make-immutable-hash (list (cons 'k2 'v2) (cons 'k1 'v3)))
-             (with-current-saved-continuation-marks-and
-              'k1 'v1
-              (lambda ()
-                (continuation-mark-set->list
-                 (current-continuation-marks web-prompt)
-                 the-save-cm-key))))))
-        (list (make-immutable-hash 
-               (list (cons 'k1 'v1)
-                     (cons 'k2 'v2))))))
-    
-    (test-case
-     "Double (beta)"
-     (check-equal? 
-      (call-with-web-prompt
-       (lambda () 
-         (with-continuation-mark the-save-cm-key
-           (make-immutable-hash (list (cons 'k3 'v1) (cons 'k4 'v2)))
-           ((lambda (x) x)
-            (with-continuation-mark the-save-cm-key
-              (make-immutable-hash (list (cons 'k2 'v2) (cons 'k1 'v3)))
-              
-              (call-with-immediate-continuation-mark
-               the-save-cm-key
-               (lambda (old-cms)
-                 (with-continuation-mark the-save-cm-key
-                   (hash-set old-cms 'k1 'v1)
-                   (continuation-mark-set->list
-                    (current-continuation-marks web-prompt)
-                    the-save-cm-key)))
-               (make-immutable-hash empty)))))))
-      (list (make-immutable-hash 
-             (list (cons 'k1 'v1)
-                   (cons 'k2 'v2)))
-            (make-immutable-hash 
-             (list (cons 'k3 'v1)
-                   (cons 'k4 'v2))))))
-    
-    #;(test-case
-       "Double"
-       (check-equal? 
-        (call-with-web-prompt
-         (lambda () 
-           (with-continuation-mark the-save-cm-key
-             (make-immutable-hash (list (cons 'k3 'v1) (cons 'k4 'v2)))
-             ((lambda (x) x)
-              (with-continuation-mark the-save-cm-key
-                (make-immutable-hash (list (cons 'k2 'v2) (cons 'k1 'v3)))
-                (with-current-saved-continuation-marks-and
-                 'k1 'v1
-                 (lambda ()
-                   (continuation-mark-set->list
-                    (current-continuation-marks web-prompt)
-                    the-save-cm-key))))))))
-        (list (make-immutable-hash 
-               (list (cons 'k1 'v1)
-                     (cons 'k2 'v2)))
-              (make-immutable-hash 
-               (list (cons 'k3 'v1)
-                     (cons 'k4 'v2)))))))
-   
-   (test-suite 
-    "activation-record-list"
-    
-    (test-case
-     "Not in prompt"
-     (check-exn exn? (lambda () (activation-record-list))))
-    
-    (test-case
-     "Easy"
-     (check-equal? (call-with-web-prompt
-                    (lambda () (activation-record-list)))
-                   empty))
-    
-    (test-case
-     "Single"
-     (check-equal? (call-with-web-prompt
-                    (lambda () 
-                      (let/ec esc
-                        ('f1 (with-continuation-mark the-cont-key +
-                               (esc (reverse (activation-record-list))))))))
-                   (list (vector + #f #f))))
-    
-    (test-case
-     "Double"
-     (check-equal? (call-with-web-prompt
-                    (lambda () 
-                      (let/ec esc
-                        ('f1 (with-continuation-mark the-cont-key +
-                               ('f2 (with-continuation-mark the-cont-key -
-                                      (esc (reverse (activation-record-list))))))))))
-                   ; Opposite the order of c-c-m
-                   (list (vector + #f #f)
-                         (vector - #f #f))))
-    
-    (test-case
-     "Unsafe"
-     (check-exn
-      exn?
-      (lambda ()
-        (call-with-web-prompt
-         (lambda () 
-           (with-continuation-mark safe-call? #f
-             (activation-record-list))))))))
-   
-   (test-suite
-    "abort"
-    
-    (test-case
-     "Not in prompt"
-     (check-exn exn? (lambda () (abort (lambda () 42)))))
-    
-    (test-case
-     "Simple"
-     (check-equal? (call-with-web-prompt
-                    (lambda () 
-                      (abort (lambda () 42))))
-                   42)))
-   
-   (test-suite
-    "resume"
-    
-    (test-case
-     "Simple"
-     (check-equal? (resume empty (list 42))
-                   42))
-    
-    #;(test-case
-     "Empty frame"
-     (check-exn exn? (lambda () (resume (reverse (list (vector #f #f #f))) (list 42)))))
-    
-    (test-case
-     "Kont"
-     (let ([f (lambda (x) (* x x))])
-       (check-equal? (resume (reverse (list (vector f #f #f))) (list 42))
-                     (f 42))))
-    
-    (test-case
-     "Kont 2"
-     (let ([f (lambda (x) (* x x))]
-           [g (lambda (x) (+ x x))])
-       (check-equal? (resume (reverse (list (vector f #f #f) (vector g #f #f))) (list 42))
-                     (f (g 42)))))
-    
-    (test-case
-     "Cont-key"
-     (let ([f (lambda (x) (* x x))]
-           [g (lambda (x) (+ x x))]
-           [esc-b (box #f)]
-           [capture (lambda _ (reverse (activation-record-list)))])
-       (check-equal? (call-with-web-prompt
-                      (lambda ()
-                        (let/ec esc 
-                          (set-box! esc-b esc)
-                          (resume (reverse
-                                   (list (vector f #f #f) (vector g #f #f)
-                                         (vector esc #f #f) (vector capture #f #f)))
-                                  (list 42)))))
-                     (list (vector f #f #f) (vector g #f #f)
-                           (vector (unbox esc-b) #f #f)))))
-    
-    (test-case
-     "marks"
-     (let ([f (lambda (x) (* x x))]
-           [g (lambda (x) (+ x x))])
-       (check-equal? (call-with-web-prompt
-                      (lambda ()
-                        (let/ec esc 
-                          (resume (reverse
-                                   (list (vector f (make-immutable-hash (list (cons 3 4) (cons 1 2))) #f) 
-                                         (vector g (make-immutable-hash (list (cons 5 6))) #f)
-                                         (vector esc (make-immutable-hash (list (cons 7 8))) #f)
-                                         (vector (lambda _
-                                                   (continuation-mark-set->list*
-                                                    (current-continuation-marks)
-                                                    (list 1 3 5 7)))
-                                                 #f
-                                                 #f)))
-                                  (list 42)))))
-                     (list (vector #f #f #f 8)
-                           (vector #f #f 6 #f)
-                           (vector 2 4 #f #f)))))
-    
-    (test-case
-     "cm-key"
-     (let ([f (lambda (x) (* x x))]
-           [g (lambda (x) (+ x x))]
-           [esc-b (box #f)]
-           [capture (lambda _ (activation-record-list))])
-       (check-equal? (call-with-web-prompt
-                      (lambda ()
-                        (let/ec esc 
-                          (set-box! esc-b esc)
-                          (resume (reverse
-                                   (list (vector f (make-immutable-hash (list (cons 3 4) (cons 1 2))) #f) 
-                                         (vector g (make-immutable-hash (list (cons 5 6))) #f)
-                                         (vector esc (make-immutable-hash (list (cons 7 8))) #f)
-                                         (vector capture #f #f)))
-                                  (list 42)))))
-                     (reverse
-                      (list (vector f (make-immutable-hash (list (cons 3 4) (cons 1 2))) #f) 
-                            (vector g (make-immutable-hash (list (cons 5 6))) #f)
-                            (vector (unbox esc-b) (make-immutable-hash (list (cons 7 8))) #f)))))))
-   
-   ; XXX test kont   
-   
-   ; XXX test kont-append-fun
-   
-   ; XXX test send/suspend
-   
-   ; XXX test dispatch-start
-   
-   ; XXX test dispatch
-   
-   ))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/all-lang-tests.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/all-lang-tests.rkt
deleted file mode 100644
index df938c158b..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/all-lang-tests.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket/base
-(require rackunit
-         "abort-resume-test.rkt"
-         "anormal-test.rkt"
-         "defun-test.rkt"
-         "file-box-test.rkt"
-         "labels-test.rkt"
-         "stuff-url-test.rkt"
-         "web-param-test.rkt")
-(provide all-lang-tests)
-
-(define all-lang-tests  
-  (test-suite
-   "Web Language"
-   abort-resume-tests
-   anormal-tests
-   defun-tests
-   file-box-tests
-   labels-tests
-   stuff-url-tests
-   web-param-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/anormal-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/anormal-test.rkt
deleted file mode 100644
index 293927a7b5..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/anormal-test.rkt
+++ /dev/null
@@ -1,331 +0,0 @@
-#lang racket/base
-(require rackunit
-         web-server/lang/anormal
-         web-server/lang/util)
-(provide anormal-tests)
-
-(define (empty-env var)
-  (error "empty environment"))
-
-(define (extend env vars vals)
-  (lambda (var0)
-    (let loop ([vars vars]
-               [vals vals])
-      (cond
-        [(null? vars) (env var0)]
-        [(eqv? var0 (car vars))
-         (car vals)]
-        [else (loop (cdr vars) (cdr vals))]))))
-
-;; alpha=/env: environment target-expr target-expr -> boolean
-;; are two target expressions alpha-equivalent?
-(define (alpha=/env env1 env2 expr1 expr2)
-  (syntax-case expr1 (if #%plain-app)
-    [(if tst1 csq1 alt1)
-     (syntax-case expr2 (if)
-       [(if tst2 csq2 alt2) (and (alpha=/env env1 env2 #'tst1 #'tst2)
-                                 (alpha=/env env1 env2 #'csq1 #'csq2)
-                                 (alpha=/env env1 env2 #'alt1 #'alt2))]
-       [_else #f])]
-    [(#%plain-app rator1 rands1 ...)
-     (syntax-case expr2 (#%plain-app)
-       [(#%plain-app rator2 rands2 ...)
-        (and (alpha=/env env1 env2 #'rator1 #'rator2)
-             (let loop ([rs1 (syntax->list #'(rands1 ...))]
-                        [rs2 (syntax->list #'(rands2 ...))])
-               (or (and (null? rs1)
-                        (null? rs2))
-                   (and (alpha=/env env1 env2 (car rs1) (car rs2))
-                        (loop (cdr rs1) (cdr rs2))))))]
-       [_else 
-        (raise-syntax-error 'alpha=/env "Dropped through on #%plain-app:" expr2)
-        #f])]
-    [_else (w-alpha=/env env1 env2 expr1 expr2)]))
-
-;; w-alpha=/env: env target-expr target-expr -> boolean
-;; are two target vars or vals alpha-equivalent?
-(define (w-alpha=/env env1 env2 expr1 expr2)
-  (syntax-case expr1 (#%top #%plain-lambda quote #%expression)
-    [(#%top . var1)
-     (syntax-case expr2 (#%top)
-       [(#%top . var2)
-        (eqv? (syntax->datum #'var1)
-              (syntax->datum #'var2))]
-       [_else #f])]
-    [(quote datum1)
-     (syntax-case expr2 (quote)
-       [(quote datum2)
-        (let ([dat1 (syntax->datum #'datum1)]
-              [dat2 (syntax->datum #'datum2)])
-          (equal? dat1 dat2))]
-       [_else #f])]
-    [(#%plain-lambda formals1 body1)
-     (syntax-case expr2 (#%plain-lambda)
-       [(#%plain-lambda formals2 body2)
-        (let ([syms (map gensym (syntax->symbols (formals-list #'formals1)))])
-          (and (= (length syms) (length (formals-list #'formals2)))
-               (alpha=/env
-                (extend env1 (syntax->symbols (formals-list #'formals1)) syms)
-                (extend env2 (syntax->symbols (formals-list #'formals2)) syms)
-                #'body1 #'body2)))]
-       [_else #f])]
-    [(#%expression e1)
-     (syntax-case expr2 (#%expression)
-       [(#%expression e2)
-        (w-alpha=/env env1 env2 #'e1 #'e2)]
-       [_else #f])]
-    [x1 (symbol? (syntax->datum #'x1))
-        (syntax-case expr2 ()
-          [x2 (symbol? (syntax->datum #'x2))
-              (or (free-identifier=? #'x1 #'x2)
-                  (eqv? (env1 (syntax->datum #'x1))
-                        (env2 (syntax->datum #'x2))))]
-          [_else #f])]
-    [_else 
-     (raise-syntax-error 'alpha= "Dropped through:" expr1)
-     #f]))
-
-;; convert syntax into a list of symbols
-(define (syntax->symbols stx)
-  (syntax-case stx ()
-    [(vars ...)
-     (map
-      (lambda (s)
-        (syntax->datum s))
-      (syntax->list #'(vars ...)))]))
-
-;; alph=: target-expr target-expr -> boolean
-;; are two target expressions alpha-equivalent?
-(define (alpha= expr1 expr2)
-  (define r (alpha=/env empty-env empty-env expr1 expr2))
-  (unless r
-    (error 'alpha= "Not alpha=:\t~S\n\t~S\n" (syntax->datum expr1) (syntax->datum expr2)))
-  r)
-
-(define normalize-term (make-anormal-term (lambda _ (error 'anormal "No elim-letrec given."))))
-
-(define anormal-tests
-  (test-suite
-   "Anormalization"
-   (test-suite
-    "Base Cases"
-    
-    (test-case
-     "Top level identifier"
-     (check alpha= (normalize-term (expand-syntax (syntax car)))
-            (expand-syntax (syntax car))))
-    
-    (test-case
-     "Simple arithmetic expression"
-     (check alpha= (normalize-term (expand-syntax (syntax (+ 1 1))))
-            (expand-syntax (syntax (+ 1 1)))))
-    
-    (test-case
-     "lambda-expression with constant body"
-     (check alpha= (normalize-term (expand-syntax (syntax (lambda (x) 3))))
-            (expand-syntax (syntax (lambda (x) 3)))))
-    
-    (test-case
-     "lambda-expression with var-ref body"
-     (check alpha= (normalize-term (expand-syntax (syntax (lambda (x) x))))
-            (expand-syntax (syntax (lambda (x) x)))))
-    
-    (test-case
-     "lambda-expression/constant-body/multiple formals"
-     (check alpha= (normalize-term (expand-syntax (syntax (lambda (x y z) 3))))
-            (expand-syntax (syntax (lambda (x y z) 3)))))       
-    
-    (test-case
-     "two-armed-if"
-     (check alpha= (normalize-term (expand-syntax (syntax (if #t 1 2))))
-            (expand-syntax (syntax (if #t 1 2)))))
-    
-    (test-case
-     "let/var-ref in body"
-     (check alpha= (normalize-term (expand-syntax (syntax (let ([x 1]) x))))
-            (expand-syntax (syntax ((lambda (x) x) 1)))))
-    
-    (test-case
-     "call to void"
-     (check alpha= (normalize-term (expand-syntax (syntax (void))))
-            (expand-syntax (syntax (void)))))
-    
-    (test-case
-     "primitive application/multiple arguments"
-     (check alpha= (normalize-term (expand-syntax (syntax (+ 1 2 3))))
-            (expand-syntax (syntax (+ 1 2 3)))))
-    
-    #;(test-case
-     "empty-list"
-     (check alpha= (normalize-term (expand-syntax (syntax ())))
-            (expand-syntax (syntax ()))))
-    
-    (test-case
-     "quoted list of constants"
-     (check alpha= (normalize-term (expand-syntax (syntax '(1 2 3))))
-            (expand-syntax (syntax '(1 2 3))))))
-   
-   (test-suite
-    "Inductive Cases"
-    
-    (test-case
-     "nested primitive applications with multiple arguments"
-     (check alpha= (normalize-term (expand-syntax (syntax (* (+ 1 2) 3))))
-            (expand-syntax (syntax ((lambda (x) (* x 3)) (+ 1 2))))))
-        
-    (test-case
-     "two-armed if with prim-app in test posn"
-     (check alpha= (normalize-term (expand-syntax (syntax (if (+ 1 2) 3 4))))
-            (expand-syntax (syntax ((lambda (x) (if x 3 4)) (+ 1 2))))))
-    
-    (test-case
-     "nested single argument primitive applications"
-     (check alpha= (normalize-term (expand-syntax (syntax (* (+ 1)))))
-            (expand-syntax (syntax ((lambda (x0) (* x0)) (+ 1))))))
-    
-    (test-case
-     "deeply nested primitive applications"
-     (check alpha= (normalize-term (expand-syntax (syntax (* (+ (+ (+ 1 2) 3) 4) (+ 5 6)))))
-            (expand-syntax (syntax ((lambda (x0)
-                               ((lambda (x1)
-                                  ((lambda (x2)
-                                     ((lambda (x3) (* x2 x3))
-                                      (+ 5 6)))
-                                   (+ x1 4)))
-                                (+ x0 3)))
-                             (+ 1 2))))))
-    
-    (test-case
-     "deeply nested primitive applications"
-     (check alpha= (normalize-term (expand-syntax (syntax (* (+ 1 2) (+ 1 (+ 2 (+ 3 4)))))))
-            (expand-syntax (syntax ((lambda (x0)
-                               ((lambda (x1)
-                                  ((lambda (x2)
-                                     ((lambda (x3)
-                                        (* x0 x3))
-                                      (+ 1 x2)))
-                                   (+ 2 x1)))
-                                (+ 3 4)))
-                             (+ 1 2))))))
-    
-    (test-case
-     "if nested in test position"
-     (check alpha= (normalize-term (expand-syntax (syntax (if (if #t #f #t) #t #t))))
-            (expand-syntax (syntax ((lambda (x) (if x #t #t)) (if #t #f #t))))))
-    
-    (test-case
-     "procedure/body has nested if"
-     (check alpha= (normalize-term (expand-syntax (syntax (lambda (x) (if (if x 1 2) 3 4)))))
-            (expand-syntax (syntax (lambda (x)
-                              ((lambda (y0) (if y0 3 4))
-                               (if x 1 2)))))))
-    
-    (test-case
-     "constant 0-arg procedure application"
-     (check alpha= (normalize-term (expand-syntax (syntax ((lambda () 3)))))
-            (expand-syntax (syntax ((lambda () 3))))))
-    
-    (test-case
-     "if with function application in test"
-     (check alpha= (normalize-term (expand-syntax (syntax (if ((lambda () 7)) 1 2))))
-            (expand-syntax (syntax ((lambda (x) (if x 1 2))
-                             ((lambda () 7)))))))
-    
-    (test-case
-     "if with lambda-expression in consequent and alternative"
-     (check alpha= (normalize-term (expand-syntax (syntax ((if #t (lambda () 1) (lambda () 2))))))
-            (expand-syntax (syntax ((lambda (x) (x)) (if #t (lambda () 1) (lambda () 2)))))))
-    
-    (test-case
-     "call/cc with value argument"
-     (check alpha= (normalize-term (expand-syntax (syntax (call/cc (lambda (x) x)))))
-            (expand-syntax (syntax (call/cc (lambda (x) x))))))
-    
-    (test-case
-     "call/cc with complex expression in argument"
-     (check alpha= (normalize-term (expand-syntax (syntax (call/cc (f (g 7))))))
-            (expand-syntax (syntax ((lambda (x0)
-                               ((lambda (x1) (call/cc x1))
-                                (f x0)))
-                             (g 7)))))))
-   
-   (test-suite
-    "Additional tests"
-    
-    (test-case
-     "multiple body expressions in lambda"
-     (check alpha= (normalize-term (expand-syntax (syntax (lambda (x y z) 3 4))))
-            (expand-syntax (syntax (lambda (x y z) 
-                              (call-with-values (lambda () 3)
-                                                (lambda throw-away 4)))))))
-    
-    (test-case
-     "zero-or-more argument lambda"
-     (check alpha= (normalize-term (expand-syntax (syntax (lambda x x))))
-            (expand-syntax (syntax (lambda x x)))))
-    
-    (test-case
-     "multi-valued let-values"
-     (check alpha= (normalize-term (expand-syntax (syntax (let-values ([(x y) (values 1 2)]) (+ x y)))))
-            (expand-syntax (syntax (call-with-values (lambda () (values 1 2))
-                                              (lambda (x y) (+ x y)))))))
-    (test-case
-     "let/multiple clauses before body"
-     (check alpha= (normalize-term (expand-syntax (syntax (let ([x 1] [y 2]) (+ x y)))))
-            (expand-syntax (syntax ((lambda (x)
-                               ((lambda (y)
-                                  (+ x y))
-                                2))
-                             1))))))
-   
-   (test-suite
-    "Miscellaneous tests"
-    
-    #;(test-case
-     "empty begin"
-     (check alpha= (normalize-term (expand-syntax (syntax (begin))))
-            (expand-syntax (syntax (void)))))
-    
-    (test-case
-     "begin with one expression"
-     (check alpha= (normalize-term (expand-syntax (syntax (begin 1))))
-            (expand-syntax (syntax (quote 1)))))
-    
-    (test-case
-     "begin with multiple expressions"
-     (check alpha= (normalize-term (expand-syntax (syntax (begin 1 2 3))))
-            (normalize-term (expand-syntax (syntax (call-with-values
-                                             (lambda () 1)
-                                             (lambda throw-away
-                                               (call-with-values
-                                                (lambda () 2)
-                                                (lambda throw-away
-                                                  3)))))))))
-    
-    (test-case
-     "cond expression"
-     (check-true
-      (and
-       (with-handlers ([(lambda (x) #t)
-                        (lambda (the-exn) #f)])
-         (normalize-term
-          (expand-syntax
-           (syntax
-            (cond
-              [(null? l) 1]
-              [(zero? (car l)) (k 0)]
-              [else
-               (* (car l) (cdr l))])))))
-       #t)))
-    
-    ; XXX Anormal only works on expressions
-    #;(test-not-exn "define-struct" 
-                  (lambda () (normalize-term (expand-syntax (syntax (define-struct posn (x y)))))))
-    (test-not-exn "quote-syntax: #f" 
-                  (lambda () (parameterize ([transformer? #f])
-                               (normalize-term (expand-syntax (syntax #'provide/contract-id-set-a-date-day!))))))
-    ; XXX I don't know if this SHOULD work
-    #;(test-not-exn "quote-syntax: #t"
-                  (lambda () (parameterize ([transformer? #t])
-                               (normalize-term (expand-syntax (syntax #'provide/contract-id-set-a-date-day!))))))
-    )))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/defun-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/defun-test.rkt
deleted file mode 100644
index bd9a268aa8..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/defun-test.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-#lang racket/base
-(require rackunit
-         web-server/lang/defun
-         web-server/lang/util)
-(provide defun-tests)
-
-(define-syntax vwrap
-  (syntax-rules ()
-    [(_ e)
-     (call-with-values
-      (lambda () e)
-      (lambda x x))]))
-
-(define defun-tests
-  (test-suite
-   "Defunctionalization"
-   
-   ; XXX Doesn't work for non-exp values
-   #;(test-not-exn "define-struct" (lambda () (vwrap (defun (expand (syntax (define-struct posn (x y))))))))
-   (test-not-exn "quote-syntax" (lambda () (vwrap (defun (expand (syntax #'provide/contract-id-set-a-date-day!))))))
-   #;(test-not-exn "provide/contract" (lambda () (vwrap (defun (expand (syntax (module t racket
-                                                                                 (require racket/contract)
-                                                                                 (define x 1)
-                                                                                 (provide/contract
-                                                                                  [x integer?]))))))))
-   ))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/file-box-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/file-box-test.rkt
deleted file mode 100644
index 87e8457e7d..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/file-box-test.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-(require rackunit
-         web-server/lang/file-box
-         (only-in mzlib/file make-temporary-file))
-(provide file-box-tests)
-
-(define file-box-tests
-  (test-suite
-   "File Boxes"
-   (test-case
-    "Creating a file box"
-    (check-not-false (file-box (make-temporary-file) 42)))
-   
-   (test-case
-    "Reading a file box"
-    (check-equal? (file-unbox (file-box (make-temporary-file) 42)) 42))
-   
-   (test-case
-    "Writing a file box"
-    (check-not-false (file-box-set! (file-box (make-temporary-file) 42) 43)))
-   
-   (test-case
-    "Reading and Writing a file box"
-    (check-equal? (let ([fb (file-box (make-temporary-file) 42)])
-                    (file-box-set! fb 43)
-                    (file-unbox fb))
-                  43))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/labels-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/labels-test.rkt
deleted file mode 100644
index 5b70555950..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/labels-test.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket/base
-(require rackunit
-         web-server/lang/labels)
-(provide labels-tests)
-
-(define l1 (make-labeling #"foo"))
-(define l2 (make-labeling #"foo"))
-(define l3 (make-labeling #"bar"))
-(define l4 (make-labeling #"baz"))
-
-(define labels-tests
-  (test-suite
-   "Module Labeling"
-   
-   (test-case
-    "The same program produces the same labeling"
-    (check-eqv? (l1) (l2))
-    (check-eqv? (l1) (l2)))
-   
-   (test-case
-    "Different programs produce different labelings"
-    (check-false (eqv? (l3) (l4))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/stuff-url-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/stuff-url-test.rkt
deleted file mode 100644
index 45f6a6d114..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/stuff-url-test.rkt
+++ /dev/null
@@ -1,57 +0,0 @@
-#lang racket/base
-(require web-server/lang/stuff-url
-         web-server/stuffers
-         rackunit
-         net/url
-         mzlib/serialize
-         "../util.rkt")
-(provide stuff-url-tests)
-
-(define uri0 (string->url "www.google.com")) 
-
-(define test-stuffer serialize-stuffer)
-
-(define (stuff-unstuff svl uri)
-  (let ([result-uri (stuff-url test-stuffer uri svl)])
-    (unstuff-url test-stuffer result-uri)))
-(define (cidentity v)
-  (deserialize 
-   (stuff-unstuff (serialize v) uri0)))
-
-(define the-dispatch
-  `(lambda (k*v)
-     (lambda (k*v)
-       ((car k*v) k*v))))
-
-(define m00 'web-server/default-web-root/htdocs/lang-servlets/mm00) 
-(define m01 'web-server/default-web-root/htdocs/lang-servlets/mm01) 
-
-(define stuff-url-tests
-  (test-suite
-   "Stuff URL"
-   
-   (test-suite
-    "(compose unstuff-url stuff-url) is identity"
-    (test-case "Integers" (check-equal? (cidentity 3) 3))
-    (test-case "Symbols" (check-equal? (cidentity 'foo) 'foo))
-    (test-case "Strings" (check-equal? (cidentity "Bar") "Bar"))
-    (test-case "Vectors" (check-equal? (cidentity (vector 3 1 4)) (vector 3 1 4))))
-   
-   (test-suite
-    "stuffed-url? works"
-    (test-case "Not stuffed URL" (check-false (stuffed-url? uri0)))
-    (test-case "Integers" (check-true (stuffed-url? (stuff-url test-stuffer uri0 (serialize 3)))))
-    (test-case "Symbols" (check-true (stuffed-url? (stuff-url test-stuffer uri0 (serialize 'foo)))))
-    (test-case "Strings" (check-true (stuffed-url? (stuff-url test-stuffer uri0 (serialize "Bar")))))
-    (test-case "Vectors" (check-true (stuffed-url? (stuff-url test-stuffer uri0 (serialize (vector 3 1 4)))))))
-   
-   (test-case 
-    "Using stuff-url with lang.rkt"
-    (let-values ([(ev) (make-eval/mod-path m00)])
-      (let* ([k0 (stuff-unstuff (ev '(serialize (dispatch-start start 'foo)))
-                                uri0)]
-             [k1 (stuff-unstuff (ev `(serialize (dispatch ,the-dispatch (list (deserialize ',k0) 1))))
-                                uri0)]
-             [k2 (stuff-unstuff (ev `(serialize (dispatch ,the-dispatch (list (deserialize ',k1) 2))))
-                                uri0)])
-        (check-true (= 6 (ev `(dispatch ,the-dispatch (list (deserialize ',k2) 3))))))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/web-param-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/web-param-test.rkt
deleted file mode 100644
index 794da34b43..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/lang/web-param-test.rkt
+++ /dev/null
@@ -1,47 +0,0 @@
-#lang racket/base
-(require rackunit
-         "../util.rkt")
-(provide web-param-tests)
-
-(define the-dispatch
-  `(lambda (k*v)
-     (lambda (k*v)
-       ((car k*v) k*v))))
-
-(define web-param-tests
-  (test-suite
-   "Web Parameters"
-   
-   (test-suite
-    "Basic Tests"
-    
-    (test-case
-     "web-parameterize does not overwrite with multiple parameters"
-     (let-values ([(meval)
-                   (make-module-eval
-                    (module m web-server/lang
-                      (define first (make-web-parameter #f))
-                      (define second (make-web-parameter #f))
-                      (provide start)
-                      (define (start initial)
-                        (web-parameterize ([first 1]
-                                           [second 2])
-                                          (+ (first) (second))))))])
-       (check = 3 (meval '(dispatch-start start #f)))))
-    
-    (test-case
-     "web-parameterize does not overwrite with multiple parameters across send/suspend"
-     
-     (let-values ([(meval)
-                   (make-module-eval
-                    (module m web-server/lang
-                      (provide start)
-                      (define first (make-web-parameter #f))
-                      (define second (make-web-parameter #f))
-                      (define (start ignore)
-                        (web-parameterize ([first 1]
-                                           [second 2])
-                                          (call-with-serializable-current-continuation (lambda (k) k))
-                                          (+ (first) (second))))))])
-       (let ([first-key (meval '(dispatch-start start #f))])
-         (check = 3 (meval `(dispatch ,the-dispatch (list ,first-key #f))))))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/managers/all-managers-tests.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/managers/all-managers-tests.rkt
deleted file mode 100644
index b0de222eea..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/managers/all-managers-tests.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-(require rackunit)
-(provide all-managers-tests)
-
-(define all-managers-tests
-  (test-suite
-   "Continuation Managers"
-   
-   ; XXX test timeout.rkt
-   ; XXX test none.rkt
-   ; XXX test lru.rkt
-   ))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/10546.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/10546.rkt
deleted file mode 100644
index eedadd4d44..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/10546.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-#lang racket
-
-(define here (find-system-path 'temp-dir))
-(define txt (build-path here "some.txt"))
-
-(with-output-to-file txt
-  #:exists 'replace
-  (lambda ()
-    (display #<<END
-Here is some text that looks at @this
-END
-  )))
-
-(with-output-to-file (build-path here "relative.rkt")
-  #:exists 'replace
-  (lambda ()
-    (display #<<END
-#lang racket
-(require web-server/templates)
-(provide ans)
-
-(define this 5)
-(define ans (include-template "some.txt"))
-END
-  )))
-
-(with-output-to-file (build-path here "absolute.rkt")
-  #:exists 'replace
-  (lambda ()
-    (display #<<END
-#lang racket
-(require web-server/templates)
-(provide ans)
-
-(define this 5)
-(define ans (include-template (file "
-END
-  )
-
- (display (path->string txt))
-
-(display #<<END
-")))
-END
-)))
-
-(require tests/eli-tester)
-(parameterize ([current-directory here])
-  (define rel (dynamic-require "relative.rkt" 'ans))
-  (define abs (dynamic-require "absolute.rkt" 'ans))
-  (test
-   rel => abs
-   rel => "Here is some text that looks at 5"))
-
-
-
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/11125.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/11125.rkt
deleted file mode 100644
index adb9683b22..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/11125.rkt
+++ /dev/null
@@ -1,74 +0,0 @@
-#lang racket
-(require net/url
-         web-server/http
-         web-server/http/request
-         web-server/servlet-env
-         tests/eli-tester)
-
-(define (do-the-test #:connection-close? connection-close?)
-  (define cust (make-custodian))
-  (begin0
-    (parameterize ([current-custodian cust])
-      (define tc (make-thread-cell 0))
-      
-      (define (start req)
-        (thread-cell-set! tc (add1 (thread-cell-ref tc)))
-        (response/full 200 #"Okay" (current-seconds)
-                       #"text" empty
-                       (list (string->bytes/utf-8 (number->string (thread-cell-ref tc))))))
-      
-      (define-values (pipe-read-p pipe-write-p)
-        (make-pipe))
-      
-      (define server-t
-        (thread
-         (λ ()
-           (parameterize ([current-output-port pipe-write-p])
-             (serve/servlet start
-                            #:launch-browser? #f
-                            #:connection-close? connection-close?
-                            #:quit? #f
-                            #:listen-ip #f
-                            #:port 0
-                            #:servlet-path "/")))))
-      
-      ; Wait for server to start
-      (define port-embedded-line (read-line pipe-read-p))
-      (match-define (regexp #rx"Your Web application is running at http://localhost:([0-9]+)\\." 
-                            (list _ port-string))
-                    port-embedded-line)
-      (define port (string->number port-string))
-      (void (read-line pipe-read-p))
-      
-      (define-values (http-read-p http-write-p)
-        (tcp-connect "localhost" port))
-      
-      (define (get-tc/err http-read-p http-write-p)
-        (with-handlers
-            ([exn?
-              (λ (x)
-                (define-values (new-http-read-p new-http-write-p)
-                  (tcp-connect "localhost" port))
-                (set! http-read-p new-http-read-p)
-                (set! http-write-p new-http-write-p)
-                (get-tc http-read-p http-write-p))])
-          (get-tc http-read-p http-write-p)))
-      
-      (define (get-tc http-read-p http-write-p)
-        (fprintf http-write-p "GET / HTTP/1.1\r\n\r\n")
-        (flush-output http-write-p)
-        
-        (read-line http-read-p)
-        (read-headers http-read-p)
-        (string->number (string (read-char http-read-p))))
-      
-      (begin0
-        (list (get-tc/err http-read-p http-write-p)
-              (get-tc/err http-read-p http-write-p))
-        
-        (kill-thread server-t)))
-    (custodian-shutdown-all cust)))
-  
-  (test
-   (do-the-test #:connection-close? #f) => (list 1 2)
-   (do-the-test #:connection-close? #t) => (list 1 1))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12183.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12183.rkt
deleted file mode 100644
index 018f3e3f90..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12183.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang racket
-(require tests/eli-tester
-         net/url
-         web-server/lang/stuff-url
-         web-server/stuffers/stuffer
-         web-server/stuffers/serialize)
-
-(struct not-serializable ())
-(struct serializable (x) #:prefab)
-
-
-(test
- (stuff-url serialize-stuffer
-           (string->url "http://localhost:8000")
-           (serializable (not-serializable)))
- =>
- (error 'stuff-url "Cannot stuff '#s(serializable #<not-serializable>) into a URL because it contains non-serializable pieces. Convert #<not-serializable> to a serializable struct"))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12271.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12271.rkt
deleted file mode 100644
index d3e08c067b..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12271.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket
-(require tests/eli-tester
-         xml)
-
-(test
- (with-output-to-bytes
-  (lambda ()
-    (write-xexpr
-     `(html (head (title "Form with CDATA"))
-            (body (p "Hello, this is a form")
-                  (p ,(cdata 'cdata-start 'cdata-end "<![CDATA[foo]]>"))
-                  (p ,(p-i 'pis 'pie 'target "instruction"))
-                  (p ,(comment "comment"))
-                  "Something")))))
- =>
- #"<html><head><title>Form with CDATA</title></head><body><p>Hello, this is a form</p><p><![CDATA[foo]]></p><p><?target instruction?></p><p><!--comment--></p>Something</body></html>")
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12638.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12638.rkt
deleted file mode 100644
index fd3a03613d..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12638.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang web-server
-(require racket/runtime-path)
-(define-runtime-path here ".")
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12658-mod.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12658-mod.rkt
deleted file mode 100644
index a7c5579f34..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12658-mod.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang web-server
-
-(define (go)
-  42)
-
-(provide go)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12658.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12658.rkt
deleted file mode 100644
index 0ffc1ef6a3..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/12658.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang racket/base
-(require rackunit
-         "12658-mod.rkt")
-
-(check-equal?
- (with-handlers ([exn? (λ (x) (exn-message x))])
-   (go 42)
-   (error 'go "Failed to throw exn"))
- "go: arity mismatch;\n the expected number of arguments does not match the given number\n  expected: 0\n  given: 1\n  arguments...:\n   42")
-
-
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/bsl.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/bsl.rkt
deleted file mode 100644
index 4c9ef20e4f..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/bsl.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang racket
-(require net/url
-         rackunit
-         tests/eli-tester
-         htdp/bsl/reader
-         web-server/servlet/web)
-(require/expose web-server/servlet/web
-                (embed-ids))
-(require/expose htdp/bsl/reader
-                (wrap-reader))
-
-(define base-url
-  (string->url
-   "http://localhost:8000/servlets/standalone.rkt"))
-(define a-k-url
-  (string->url
-   "http://localhost:8000/servlets/standalone.rkt;((%22k%22%20.%20%22(1%201%2033620206)%22))"))
-(define k-info
-  '(1 1 33620206))
-
-(define (can-encode?)
-  (test
-   (continuation-url? a-k-url) => k-info
-   (embed-ids k-info base-url) => (url->string a-k-url)))
-
-(test
- (can-encode?)
- ((wrap-reader can-encode? empty)))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/cl-long.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/cl-long.rkt
deleted file mode 100644
index 19304ecca3..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/cl-long.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require web-server/http
-         web-server/http/request
-         web-server/http/bindings
-         rackunit
-         "../util.rkt")
-
-(define request-bs
-  #"POST /xapps/agent-stat HTTP/1.1\r\nUser-Agent: curl/7.21.6 (x86_64-pc-linux-gnu) libcurl/7.21.6 OpenSSL/1.0.0e zlib/1.2.3.4 libidn/1.22 librtmp/2.3\r\nHost: localhost:8080\r\nAccept: */*\r\nContent-Length: 95\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\n")
-
-(define-values (conn ip op)
-  (make-mock-connection request-bs))
-(check-exn (λ (x) (regexp-match #rx"Post data" (exn-message x)))
-           (λ () (read-request conn 80 (λ _ (values "to" "from")))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/compat0.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/compat0.rkt
deleted file mode 100644
index 204bcbc081..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/compat0.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require web-server/compat/0/coerce
-         web-server/http/response-structs
-         web-server/compat/0/http/response-structs
-         web-server/http/cookie
-         web-server/compat/0/http/cookie
-         web-server/servlet/servlet-structs
-         web-server/compat/0/servlet/servlet-structs)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/galler.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/galler.rkt
deleted file mode 100644
index fe24e2e438..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/galler.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang web-server
-(require racket/serialize
-         rackunit)
-
-(check-true (serializable? (λ (x) x)))
-(check-true (serializable? (first (list (λ (x) x)))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/galler2.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/galler2.rkt
deleted file mode 100644
index 40709cba15..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/galler2.rkt
+++ /dev/null
@@ -1,38 +0,0 @@
-#lang racket
-(require net/url
-         web-server/http
-         web-server/http/request
-         web-server/servlet-env
-         rackunit)
-
-(define (start req)
-  (error "Bad"))
-
-(define-values (pipe-read-p pipe-write-p)
-  (make-pipe))
-
-(define server-t
-  (thread
-   (λ ()
-     (parameterize ([current-output-port pipe-write-p])
-       (serve/servlet start
-                      #:launch-browser? #f
-                      #:quit? #f
-                      #:listen-ip #f
-                      #:port 0
-                      #:servlet-responder
-                      (λ (url exn)
-                        (response/xexpr
-                         "Good!"))
-                      #:servlet-path "/")))))
-
-;; Wait for server to start
-(define port-embedded-line (read-line pipe-read-p))
-(match-define (regexp #rx"Your Web application is running at http://localhost:([0-9]+)\\."
-                      (list _ port-string))
-              port-embedded-line)
-(define port (string->number port-string))
-(void (read-line pipe-read-p))
-
-(check-equal? "Good!"
-              (port->string (get-pure-port (string->url (format "http://localhost:~a/" port)))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/info.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/info.rkt
deleted file mode 100644
index f3fdec7171..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define test-omit-paths '("length.rkt"
-                          "methods.rkt"))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/lang-modstar.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/lang-modstar.rkt
deleted file mode 100644
index dec32b0547..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/lang-modstar.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang web-server/base
-
-(define f 1)
-
-(module+ test
-  (define g f))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/lang-submod.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/lang-submod.rkt
deleted file mode 100644
index 96fc8668a6..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/lang-submod.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang web-server/base
-
-(define (f a) a)
-
-(module test racket/base
-  (require rackunit)
-  (check-equal? 1 1))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/length.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/length.rkt
deleted file mode 100644
index 5b5c0076f4..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/length.rkt
+++ /dev/null
@@ -1,6 +0,0 @@
-#lang web-server/insta
-
-(define (start req)
-  (response 200 #"Okay" (current-seconds)
-            #"text/html" empty
-            (λ (op) (write-bytes #"PONG" op))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/methods.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/methods.rkt
deleted file mode 100644
index d3b0f3f77f..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/methods.rkt
+++ /dev/null
@@ -1,22 +0,0 @@
-#lang racket
-
-(require web-server/servlet-env
-         web-server/http/xexpr
-         web-server/http/request-structs
-         web-server/dispatch)
-
-(define-values (app-dispatch app-url)
-    (dispatch-rules
-     [("") index]
-     [else index]))
-
-(define (index req)
-  (response/xexpr `(html (p ,(bytes->string/utf-8 (request-method req)))
-                         (p ,(cond ((bytes? (request-post-data/raw req))
-                                    (bytes->string/utf-8 (request-post-data/raw req)))
-                                   (else "No request body"))))))
-
-(serve/servlet app-dispatch
-               #:port 8000
-               #:servlet-regexp #rx""
-               #:command-line? #t)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/post-binding.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/post-binding.rkt
deleted file mode 100644
index 75896ec4ce..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/pr/post-binding.rkt
+++ /dev/null
@@ -1,16 +0,0 @@
-#lang racket/base
-(require web-server/http
-         web-server/http/request
-         web-server/http/bindings
-         rackunit
-         "../util.rkt")
-
-(define request-bs
-  #"POST /xapps/agent-stat HTTP/1.1\r\nUser-Agent: curl/7.21.6 (x86_64-pc-linux-gnu) libcurl/7.21.6 OpenSSL/1.0.0e zlib/1.2.3.4 libidn/1.22 librtmp/2.3\r\nHost: localhost:8080\r\nAccept: */*\r\nContent-Length: 25\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\nstat=testing%20via%20curl")
-
-(define-values (conn ip op)
-  (make-mock-connection request-bs))
-(define-values (req close?)
-  (read-request conn 80 (λ _ (values "to" "from"))))
-(check-equal? (request-bindings req)
-              (list (cons 'stat "testing via curl")))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/all-private-tests.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/all-private-tests.rkt
deleted file mode 100644
index a90bf32253..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/all-private-tests.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-(require rackunit
-         "request-test.rkt"
-         "cache-table-test.rkt"
-         "response-test.rkt"
-         "connection-manager-test.rkt"
-         "define-closure-test.rkt"
-         "mime-types-test.rkt"
-         "url-param-test.rkt"
-         "mod-map-test.rkt"
-         "gzip-test.rkt"
-         "util-test.rkt")
-(provide all-private-tests)
-
-(define all-private-tests
-  (test-suite
-   "Internal"
-   gzip-tests
-   cache-table-tests
-   connection-manager-tests
-   define-closure-tests
-   mime-types-tests
-   mod-map-tests
-   request-tests
-   response-tests   
-   url-param-tests
-   util-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/cache-table-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/cache-table-test.rkt
deleted file mode 100644
index 5c50cdf179..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/cache-table-test.rkt
+++ /dev/null
@@ -1,37 +0,0 @@
-#lang racket/base
-(require rackunit
-         web-server/private/cache-table)
-(provide cache-table-tests)
-
-(define cache-table-tests
-  (test-suite
-   "Cache Table"
-   
-   (test-case
-    "Can construct cache-table"
-    (check-not-false (make-cache-table)))
-   
-   (test-case
-    "make-cache-table returns cache-table?"
-    (check-true (cache-table? (make-cache-table))))
-   
-   (test-case
-    "cache-table? does not recognize hash-tables"
-    (check-false (cache-table? (make-hash))))
-   
-   (test-case
-    "cache-table-lookup: simple"
-    (check-true (cache-table-lookup! (make-cache-table) 'foo (lambda () #t))))
-   
-   (test-case
-    "cache-table-lookup: complicated"
-    (check-true (let ([ct (make-cache-table)])
-                  (cache-table-lookup! ct 'foo (lambda () #t))
-                  (cache-table-lookup! ct 'foo (lambda () #f)))))
-   
-   (test-case
-    "cache-table-clear! is effective"
-    (check-false (let ([ct (make-cache-table)])
-                   (cache-table-lookup! ct 'foo (lambda () #t))
-                   (cache-table-clear! ct)
-                   (cache-table-lookup! ct 'foo (lambda () #f)))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/connection-manager-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/connection-manager-test.rkt
deleted file mode 100644
index 9320852594..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/connection-manager-test.rkt
+++ /dev/null
@@ -1,60 +0,0 @@
-#lang racket/base
-(require rackunit
-         web-server/private/connection-manager)
-(provide connection-manager-tests)
-
-(define cm (start-connection-manager))
-
-(module+ test
-  (require rackunit/text-ui)
-  (run-tests connection-manager-tests))
-
-(define connection-manager-tests
-  (test-suite
-   "Connection Manager"
-   
-   ; (tests rely on timing and may fail for that reason)
-   (test-case
-    "Input closed"
-    (check-true
-     (let ([ib (open-input-bytes #"")]
-           [ob (open-output-bytes)])
-       (new-connection cm 1 ib ob (make-custodian) #t)
-       (sleep 2)
-       (with-handlers ([exn? (lambda _ #t)])
-         (read ib) #f))))
-   
-   (test-case
-    "Output closed"
-    (check-true
-     (let ([ib (open-input-bytes #"")]
-           [ob (open-output-bytes)])
-       (new-connection cm 1 ib ob (make-custodian) #t)
-       (sleep 2)
-       (with-handlers ([exn? (lambda _ #t)])
-         (write 1 ob) #f))))
-   
-   (test-case
-    "Early kill"
-    (check-true
-     (let* ([ib (open-input-bytes #"")]
-            [ob (open-output-bytes)]
-            [c (new-connection cm 1 ib ob (make-custodian) #t)])
-       (kill-connection! c)
-       (and (with-handlers ([exn? (lambda _ #t)])
-              (read ib) #f)
-            (with-handlers ([exn? (lambda _ #t)])
-              (write 1 ob) #f)))))
-   
-   (test-case
-    "Extend timer"
-    (check-true
-     (let* ([ib (open-input-bytes #"")]
-            [ob (open-output-bytes)]
-            [c (new-connection cm 2 ib ob (make-custodian) #t)])
-       (adjust-connection-timeout! c 1)
-       (sleep 4)
-       (and (with-handlers ([exn? (lambda _ #t)])
-              (read ib) #f)
-            (with-handlers ([exn? (lambda _ #t)])
-              (write 1 ob) #f)))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/define-closure-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/define-closure-test.rkt
deleted file mode 100644
index 6ec5946f98..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/define-closure-test.rkt
+++ /dev/null
@@ -1,114 +0,0 @@
-#lang racket/base
-(require rackunit
-         mzlib/serialize
-         mzlib/match
-         web-server/private/define-closure)
-(provide define-closure-tests)
-
-(define-closure id (x) () x)
-
-(define-closure add-y (x) (y) (+ x y))
-(define-closure even-p (n) (odd-p) (or (zero? n)
-                                       (odd-p (sub1 n))))
-(define-closure odd-p (n) (even-p) (or (= 1 n)
-                                       (even-p (sub1 n))))
-
-(define even-p (make-even-p (lambda () odd-p)))
-(define odd-p (make-odd-p (lambda () even-p)))
-
-;; an interpreter
-
-(define-closure the-empty-env (var) ()
-  (error "unbound symbol: " var))
-
-(define-closure extended-env (v) (env var val)
-  (if (eqv? v var) val
-      (env v)))
-
-(define-serializable-struct proc (var body env))
-
-(define-closure clsr:evaluate (expr env) (evaluate eval-app)
-  (match expr
-    [('lambda (var) body) (make-proc var body env)]
-    [(expr1 expr2)
-     (let ([val1 (evaluate expr1 env)]
-           [val2 (evaluate expr2 env)])
-       (eval-app val1 val2))]
-    [(? number? n) n]
-    [var (env var)]))
-
-(define-closure clsr:eval-app (val1 val2) (evaluate)
-  (cond
-    [(proc? val1)
-     (evaluate (proc-body val1)
-               (make-extended-env
-                (lambda () (values (proc-env val1) (proc-var val1) val2))))]
-    [else 
-     (error "stuck term: " (list val1 val2))]))
-
-(define evaluate (make-clsr:evaluate (lambda () (values evaluate eval-app))))
-(define eval-app (make-clsr:eval-app (lambda () evaluate)))
-
-(define define-closure-tests
-  (test-suite
-   "Define Closure"
-   
-   (test-case
-    "serialize id procedure"
-    (check = 7 ((deserialize (serialize (make-id (lambda () (values))))) 7)))
-   
-   (test-case
-    "id procedure"
-    (check = 7 ((make-id (lambda () (values))) 7)))
-   
-   (test-case
-    "add-y procedure"
-    (check = 2 ((make-add-y (lambda () 1)) 1)))
-   
-   (test-case
-    "serialize the add-y procedure"
-    (check = 2 ((deserialize (serialize (make-add-y (lambda () 1)))) 1)))
-   
-   (test-case
-    "even-p procedure"
-    (check-true (even-p 8)))
-   
-   (test-case
-    "serialize the even-p procedure"
-    (check-true ((deserialize (serialize even-p)) 64)))
-   
-   (test-case
-    "simple interpreter case"
-    (check = 3 (evaluate 3 (make-the-empty-env (lambda () (values))))))
-   
-   (test-case
-    "serialize simple interpreter case"
-    (check = 3 ((deserialize (serialize evaluate))
-                3
-                (deserialize (serialize (make-the-empty-env (lambda () (values))))))))
-   
-   (test-case
-    "apply identity"
-    (check = 3 (evaluate '((lambda (x) x) 3) (make-the-empty-env (lambda () (values))))))
-   
-   (test-case
-    "serialize environments"
-    (let* ([e0 (make-the-empty-env (lambda () (values)))]
-           [e1 (make-extended-env (lambda () (values e0 'x 1)))]
-           [e2 (make-extended-env (lambda () (values e1 'y 2)))]
-           [e3 (make-extended-env (lambda () (values e2 'z 3)))]
-           [e4 (make-extended-env (lambda () (values e3 'x 4)))]
-           [e5 (make-extended-env (lambda () (values e4 'y 5)))]
-           [e6 (make-extended-env (lambda () (values e5 'z 6)))]
-           [env3 (deserialize (serialize e3))]
-           [env5 (deserialize (serialize e5))]
-           [env6 (deserialize (serialize e6))])
-      (check = 1 (env3 'x))
-      (check = 2 (env3 'y))
-      (check = 3 (env3 'z))
-      (check = 4 (env5 'x))
-      (check = 5 (env5 'y))
-      (check = 3 (env5 'z))
-      (check = 4 (env6 'x))
-      (check = 5 (env6 'y))
-      (check = 6 (env6 'z))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/gzip-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/gzip-test.rkt
deleted file mode 100644
index 69a4741876..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/gzip-test.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket
-(require rackunit
-         web-server/private/gzip)
-(provide gzip-tests)
-
-(define gzip-tests
-  (test-suite
-   "GZip"
-   
-   #;(test-case 
-    "gzip/bytes"
-    (check-equal? (gzip/bytes #"1234567890")
-                  #"\37\213\b\0\334k\220I\0\0033426153\267\2604\0\0\345\256\35&\n\0\0\0"))
-   
-   (test-case 
-    "gunzip/bytes"
-    (check-equal? (gunzip/bytes #"\37\213\b\0.k\220I\0\0033426153\267\2604\0\0\345\256\35&\n\0\0\0")
-                  #"1234567890"))
-   
-   (test-case
-    "identity"
-    (let* ([k (random 1000)]
-           [b (random 255)]
-           [bs (make-bytes k b)])
-      (check-equal? (gunzip/bytes (gzip/bytes bs))
-                    bs)))
-   
-   (test-case
-    "bad header"
-    (check-exn exn?
-                (lambda ()
-                  (gunzip/bytes #"1234567890"))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/mime-types-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/mime-types-test.rkt
deleted file mode 100644
index 75f92fd9a1..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/mime-types-test.rkt
+++ /dev/null
@@ -1,49 +0,0 @@
-#lang racket/base
-(require rackunit
-         (only-in mzlib/file make-temporary-file)
-         racket/runtime-path
-         racket/path
-         web-server/http
-         web-server/private/mime-types)
-(provide mime-types-tests)
-
-(define test-file (make-temporary-file))
-(with-output-to-file test-file
-  (lambda ()
-    (printf #<<END
-video/mp4                       mp4
-video/mpeg                      mpeg mpg mpe
-END
-            ))
-  #:exists 'replace)  
-
-(define default-web-root
-  (path-only 
-   (collection-file-path "default-web-root/configuration-table.rkt" "web-server")))
-
-(define mime-types-tests
-  (test-suite
-   "MIME Types"
-   
-   (test-case
-    "Distribution mime.types parses"
-    (check-not-false (read-mime-types (build-path default-web-root "mime.types"))))
-   
-   (test-case
-    "Test file parses"
-    (check-not-false (read-mime-types test-file)))
-   (test-case
-    "Default mime-type given"
-    (check-equal? ((make-path->mime-type test-file) (build-path "test.html")) #f))
-   (test-case
-    "MIME type resolves (single in file)"
-    (check-equal? ((make-path->mime-type test-file) (build-path "test.mp4")) #"video/mp4"))
-   (test-case
-    "MIME type resolves (multiple in file)"
-    (check-equal? ((make-path->mime-type test-file) (build-path "test.mpeg")) #"video/mpeg"))
-   (test-case
-    "MIME type resolves (multiple in file)"
-    (check-equal? ((make-path->mime-type test-file) (build-path "test.mpg")) #"video/mpeg"))
-   (test-case
-    "MIME type resolves (multiple in file)"
-    (check-equal? ((make-path->mime-type test-file) (build-path "test.mpe")) #"video/mpeg"))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/mod-map-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/mod-map-test.rkt
deleted file mode 100644
index f6de98603f..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/mod-map-test.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang racket/base
-(require rackunit
-         web-server/private/mod-map
-         mzlib/serialize
-         "../util.rkt")
-(provide mod-map-tests)
-
-(define (simplify-unsimplify v)
-  (decompress-serial
-   (compress-serial
-    v)))
-(define (cidentity v)
-  (deserialize 
-   (simplify-unsimplify 
-    (serialize v))))
-
-(define the-dispatch
-  `(lambda (k*v)
-     (lambda (k*v)
-       ((car k*v) k*v))))  
-
-(define m00 'web-server/default-web-root/htdocs/lang-servlets/mm00) 
-(define m01 'web-server/default-web-root/htdocs/lang-servlets/mm01) 
-
-(define mod-map-tests
-  (test-suite
-   "Module Map"
-   
-   (test-suite
-    "(compose decompress-serial compress-serial) is identity"
-    (test-case "Integers" (check-equal? (cidentity 3) 3))
-    (test-case "Symbols" (check-equal? (cidentity 'foo) 'foo))
-    (test-case "Strings" (check-equal? (cidentity "Bar") "Bar"))
-    (test-case "Vectors" (check-equal? (cidentity (vector 3 1 4)) (vector 3 1 4))))
-   
-   (test-case
-    "Use compress-serial and decompress-serial with lang.rkt (1)"
-    (let-values ([(ev) (make-eval/mod-path m00)])
-      (let* ([k0 (simplify-unsimplify (ev '(serialize (dispatch-start start 'foo))))]
-             [k1 (simplify-unsimplify (ev `(serialize (dispatch ,the-dispatch (list (deserialize ',k0) 1)))))]
-             [k2 (simplify-unsimplify (ev `(serialize (dispatch ,the-dispatch (list (deserialize ',k1) 2)))))])
-        (check-true (= 6 (ev `(dispatch ,the-dispatch (list (deserialize ',k2) 3))))))))
-   
-   (test-case
-    "Use compress-serial and decompress-serial with lang.rkt (2)"
-    (let-values ([(ev) (make-eval/mod-path m01)])
-      (let* ([k0 (simplify-unsimplify (ev '(serialize (dispatch-start start 'foo))))])
-        (check-true (= 7 (ev `(dispatch ,the-dispatch (list (deserialize ',k0) 7))))))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/request-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/request-test.rkt
deleted file mode 100644
index 86525447be..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/request-test.rkt
+++ /dev/null
@@ -1,168 +0,0 @@
-#lang racket
-(require rackunit
-         net/url
-         web-server/private/connection-manager
-         web-server/private/timer
-         web-server/http/request
-         web-server/http)
-(provide request-tests)
-
-(require/expose web-server/http/request
-                (read-bindings&post-data/raw))
-
-;; mock connection object for test on post body parsing
-(define (make-mock-connection&headers post-body)
-  (let* ([b (string->bytes/utf-8 post-body)]
-         [headers (list (make-header
-                         #"Content-Length"
-                         (string->bytes/utf-8
-                          (number->string (bytes-length b)))))]
-         [ip (open-input-bytes b)]
-         [op (open-output-bytes)])
-    (values (make-connection 0 (make-timer tm ip +inf.0 (lambda () (void)))
-                             ip op (make-custodian) #f)
-            headers)))
-
-
-(define (get-bindings post-data)
-  (define-values (conn headers) (make-mock-connection&headers post-data))
-  (call-with-values
-      (lambda ()
-        (read-bindings&post-data/raw (connection-i-port conn) #"POST" (string->url "http://localhost") headers))
-    (lambda (f s) f)))
-
-(define (get-post-data/raw post-data)
-  (define-values (conn headers) (make-mock-connection&headers post-data))
-  (call-with-values 
-      (lambda () 
-        (read-bindings&post-data/raw (connection-i-port conn) #"POST" (string->url "http://localhost") headers))
-    (lambda (f s) s)))
-
-(define tm (start-timer-manager))
-
-(define (test-read-request b)
-  (define ip (open-input-bytes b))
-  (define op (open-output-bytes))
-  (define c
-    (make-connection 0 (make-timer tm ip +inf.0 (lambda () (void)))
-                     ip op (make-custodian) #f))
-  (define-values (req flag)
-    (read-request c 80 (λ (_) (values "to" "from"))))
-  (list (list 'request
-              (map (λ (f) (f req))
-                   (list request-method (compose url->string request-uri)
-                         request-headers/raw
-                         request-bindings/raw request-post-data/raw
-                         request-host-ip request-host-port request-client-ip)))
-        flag))
-
-(define request-tests
-  (test-suite
-   "HTTP Requests"
-
-   (test-suite
-    "Headers"
-    (test-equal? "Simple" (header-value (headers-assq #"key" (list (make-header #"key" #"val")))) #"val")
-    (test-false "Not present" (headers-assq #"key" (list)))
-    (test-false "Case (not present)" (headers-assq* #"Key" (list)))
-    (test-equal? "Case" (header-value (headers-assq* #"Key" (list (make-header #"key" #"val")))) #"val")
-    (test-equal? "Case (not first)"
-                 (header-value (headers-assq* #"Key" (list (make-header #"key1" #"val") (make-header #"key" #"val")))) #"val"))
-
-   (test-suite
-    "Bindings"
-    (test-equal? "Simple" (binding:form-value (bindings-assq #"key" (list (make-binding:form #"key" #"val")))) #"val")
-    (test-equal? "Simple (File)" (binding:file-content (bindings-assq #"key" (list (make-binding:file #"key" #"name" empty #"val")))) #"val")
-    (test-false "Not present" (bindings-assq #"key" (list))))
-
-                                        ; XXX This needs to be really extensive, see what Apache has
-   (test-suite
-    "Parsing"
-    (test-suite
-     "URL Query"
-     (test-not-exn "Unfinished URL query"
-                   (lambda ()
-                     (define ip (open-input-string "GET http://127.0.0.1:8080/servlets/examples/hello.rkt?a=1&b: HTTP/1.1"))
-                     (read-request
-                      (make-connection 0 (make-timer tm ip +inf.0 (lambda () (void)))
-                                       ip
-                                       (open-output-bytes) (make-custodian) #f)
-                      8081
-                      (lambda _ (values "s1" "s2")))
-                     (void))))
-
-    (test-suite
-     "Chunked transfer-encoding"
-     (test-equal? "example"
-                  (test-read-request
-                   #"POST http://127.0.0.1/test HTTP/1.0
-Date: Fri, 31 Dec 1999 23:59:59 GMT
-Content-Type: text/plain
-Content-Length: 42
-
-abcdefghijklmnopqrstuvwxyz1234567890abcdef
-")
-                  (list
-                   (list
-                    'request
-                    (list
-                     #"POST"
-                     "http://127.0.0.1/test"
-                     (list
-                      (header #"Date" #"Fri, 31 Dec 1999 23:59:59 GMT")
-                      (header #"Content-Type" #"text/plain")
-                      (header #"Content-Length" #"42"))
-                     '()
-                     #"abcdefghijklmnopqrstuvwxyz1234567890abcdef"
-                     "to"
-                     80
-                     "from"))
-                   #t))
-     (test-equal? "example"
-                  (test-read-request
-                   #"POST http://127.0.0.1/test HTTP/1.1
-Date: Fri, 31 Dec 1999 23:59:59 GMT
-Content-Type: text/plain
-Transfer-Encoding: chunked
-
-1a; ignore-stuff-here
-abcdefghijklmnopqrstuvwxyz
-10
-1234567890abcdef
-0
-some-footer: some-value
-another-footer: another-value
-")
-                  (list
-                   (list
-                    'request
-                    (list
-                     #"POST"
-                     "http://127.0.0.1/test"
-                     (list
-                      (header #"Date" #"Fri, 31 Dec 1999 23:59:59 GMT")
-                      (header #"Content-Type" #"text/plain")
-                      (header #"Transfer-Encoding" #"chunked")
-                      (header #"Content-Length" #"42")
-                      (header #"some-footer" #"some-value")
-                      (header #"another-footer" #"another-value"))
-                     '()
-                     #"abcdefghijklmnopqrstuvwxyz1234567890abcdef"
-                     "to"
-                     80
-                     "from"))
-                   #f)))
-
-    (test-suite
-     "POST Bindings"
-     (test-equal? "simple test 1"
-                  (get-post-data/raw "hello world") #"hello world")
-     (test-equal? "simple test 2"
-                  (get-post-data/raw "hello=world") #"hello=world")
-     (test-equal? "simple test 3"
-                  (binding:form-value (bindings-assq #"hello" (force (get-bindings "hello=world"))))
-                  #"world")))))
-
-(module+ test
-  (require rackunit/text-ui)
-  (run-tests request-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/response-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/response-test.rkt
deleted file mode 100644
index 400130b119..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/response-test.rkt
+++ /dev/null
@@ -1,311 +0,0 @@
-#lang racket/base
-(require rackunit
-         racket/port
-         xml/xml
-         (only-in mzlib/file
-                  make-temporary-file)
-         web-server/http
-         web-server/http/response
-         (prefix-in compat0: web-server/compat/0/http/response-structs)
-         "../util.rkt")
-
-(require/expose web-server/http/response
-                (convert-http-ranges
-                 make-content-length-header
-                 make-content-range-header
-                 output-file/boundary))
-
-(provide response-tests)
-
-(define (output f . any)
-  (define-values (c i o) (make-mock-connection #""))
-  (apply f c any)
-  (redact (get-output-bytes o)))
-
-(define-syntax-rule (test-equi? t a e)
-  (test-equal? t (bytes-sort a) (bytes-sort e)))
-
-(define output-response-tests
-  (test-suite
-    "output-response"
-    
-    (test-suite 
-     "response"
-     (test-equi? "response" 
-                  (output output-response 
-                          (response 404 #"404" (current-seconds) #"text/html"
-                                    (list) void))
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\n\r\n")
-     (test-equi? "response" 
-                  (output output-response 
-                          (response 404 #"404" (current-seconds) #f
-                                    (list) void))
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\n\r\n")
-     (test-equi? "response (header)" 
-                  (output output-response 
-                          (response 404 #"404" (current-seconds) #"text/html"
-                                    (list (make-header #"Header" #"Value")) void))
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nHeader: Value\r\n\r\n")
-     (test-equi? "response (body)" 
-                  (output output-response 
-                          (response 404 #"404" (current-seconds) #"text/html"
-                                    (list) void))
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\n\r\n")
-     (test-equi? "response (bytes body)"
-                  (output output-response 
-                          (response 404 #"404" (current-seconds) #"text/html"
-                                    (list) void))
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\n\r\n")
-     (test-equi? "response (both)" 
-                  (output output-response 
-                          (response 404 #"404" (current-seconds) #"text/html"
-                                    (list (make-header #"Header" #"Value")) void))
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nHeader: Value\r\n\r\n")
-     (test-equi? "response (both)" 
-                  (output output-response 
-                          (response 404 #"404" (current-seconds) #"text/html"
-                                    (list (make-header #"Header" #"Value1")
-                                          (make-header #"Header" #"Value2")) void))
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nHeader: Value1\r\nHeader: Value2\r\n\r\n"))
-    
-    (test-suite 
-     "response/full"
-     (test-equi? "response/full" 
-                  (output output-response 
-                          (response/full 404 #"404" (current-seconds) #"text/html"
-                                              (list) (list)))
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 0\r\n\r\n")
-     (test-equi? "response/full (header)" 
-                  (output output-response 
-                          (response/full 404 #"404" (current-seconds) #"text/html"
-                                              (list (make-header #"Header" #"Value")) (list)))
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 0\r\nHeader: Value\r\n\r\n")
-     
-     (test-equi? "response/full (bytes body)"
-                  (output output-response 
-                          (response/full 404 #"404" (current-seconds) #"text/html"
-                                              (list) (list #"Content!")))
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 8\r\n\r\nContent!")
-     (test-equi? "response/full (both)" 
-                  (output output-response 
-                          (response/full 404 #"404" (current-seconds) #"text/html"
-                                              (list (make-header #"Header" #"Value")) (list #"Content!")))
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 8\r\nHeader: Value\r\n\r\nContent!"))
-    
-    (test-suite
-     "Simple content"
-     (test-equi? "empty"
-                  (output output-response
-                          (compat0:normalize-response (list #"text/html")))
-                  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 0\r\n\r\n")
-     (test-equi? "not"
-                  (output output-response
-                          (compat0:normalize-response (list #"text/html" "Content")))
-                  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 7\r\n\r\nContent")
-     (test-equi? "not, bytes"
-                  (output output-response
-                          (compat0:normalize-response (list #"text/html" #"Content")))
-                  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 7\r\n\r\nContent"))
-    
-    (test-suite
-     "xexpr"
-     (test-equi? "any"
-                  (output output-response
-                          (response/xexpr `(html (head (title "Hey!")) (body "Content"))))
-                  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\n\r\n<html><head><title>Hey!</title></head><body>Content</body></html>"))
-    ))
-
-(define output-response/method-tests
-  (test-suite
-    "output-response/method"
-    
-    (test-suite 
-     "response/full"
-     (test-equi? "response/full" 
-                  (output output-response/method 
-                          (response/full 404 #"404" (current-seconds) #"text/html"
-                                              (list) (list))
-                          #"HEAD")
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 0\r\n\r\n")
-     (test-equi? "response/full (header)" 
-                  (output output-response/method
-                          (response/full 404 #"404" (current-seconds) #"text/html"
-                                              (list (make-header #"Header" #"Value")) (list))
-                          #"HEAD")
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 0\r\nHeader: Value\r\n\r\n")
-     (test-equi? "response/full (body)" 
-                  (output output-response/method
-                          (response/full 404 #"404" (current-seconds) #"text/html"
-                                              (list) (list #"Content!"))
-                          #"HEAD")
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 8\r\n\r\n")
-     (test-equi? "response/full (bytes body)"
-                  (output output-response/method 
-                          (response/full 404 #"404" (current-seconds) #"text/html"
-                                              (list) (list #"Content!"))
-                          #"HEAD")
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 8\r\n\r\n")
-     (test-equi? "response/full (both)" 
-                  (output output-response/method
-                          (response/full 404 #"404" (current-seconds) #"text/html"
-                                              (list (make-header #"Header" #"Value")) (list #"Content!"))
-                          #"HEAD")
-                  #"HTTP/1.1 404 404\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 8\r\nHeader: Value\r\n\r\n"))
-    
-    (test-suite
-     "Simple content"
-     (test-equi? "empty"
-                  (output output-response/method
-                          (compat0:normalize-response (list #"text/html"))
-                          #"HEAD")
-                  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 0\r\n\r\n")
-     (test-equi? "not"
-                  (output output-response/method
-                          (compat0:normalize-response (list #"text/html" #"Content"))
-                          #"HEAD")
-                  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 7\r\n\r\n")
-     (test-equi? "not, bytes"
-                  (output output-response/method
-                          (compat0:normalize-response (list #"text/html" #"Content"))
-                          #"HEAD")
-                  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nContent-Length: 7\r\n\r\n"))
-    
-    (test-suite
-     "xexpr"
-     (test-equi? "any"
-                  (output output-response/method
-                          (response/xexpr `(html (head (title "Hey!")) (body "Content")))
-                          #"HEAD")
-                  #"HTTP/1.1 200 Okay\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html; charset=utf-8\r\n\r\n"))))
-
-(define response-tests
-  (test-suite
-   "HTTP Responses"
-   
-   output-response-tests
-   
-   output-response/method-tests
-   
-   (let ()
-     (define tmp-file (make-temporary-file))
-     (with-output-to-file tmp-file 
-       (lambda ()
-         (display
-          (xexpr->string 
-           `(html (head (title "A title"))
-                  (body "Here's some content!")))))
-       #:exists 'truncate/replace)
-     
-     (test-equal?
-      "convert-http-ranges"
-      (convert-http-ranges 
-       '((10 . #f) (20 . 30) (#f . 40) (40 . 60) (49 . 60))
-       50)
-      '((10 . 50) (20 . 31) (10 . 50) (40 . 50) (49 . 50)))
-     
-     (test-suite
-      "output-file"
-      
-      (test-equi? "(get) whole file - no Range header"
-                   (output output-file tmp-file #"GET" #"text/html" #f)
-                   #"HTTP/1.1 200 OK\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\n\r\n<html><head><title>A title</title></head><body>Here's some content!</body></html>")
-      
-      (test-equi? "(get) whole file - Range header present"
-                   (output output-file tmp-file #"GET" #"text/html" '((0 . 80)))
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\nContent-Range: bytes 0-80/81\r\n\r\n<html><head><title>A title</title></head><body>Here's some content!</body></html>")
-      
-      (test-equi? "(get) single range - suffix range larger than file"
-                   (output output-file tmp-file #"GET" #"text/html" '((#f . 90)))
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\nContent-Range: bytes 0-80/81\r\n\r\n<html><head><title>A title</title></head><body>Here's some content!</body></html>")
-      
-      (test-equi? "(get) single range - 10 bytes from the start"
-                   (output output-file tmp-file #"GET" #"text/html" '((0 . 9)))
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 10\r\nContent-Range: bytes 0-9/81\r\n\r\n<html><hea")
-      
-      (test-equi? "(get) single range - 10 bytes from the end"
-                   (output output-file tmp-file #"GET" #"text/html" '((71 . #f)))
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 10\r\nContent-Range: bytes 71-80/81\r\n\r\ndy></html>")
-      
-      (test-equi? "(get) single range - 10 bytes from past the end"
-                   (output output-file tmp-file #"GET" #"text/html" '((76 . 86)))
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 5\r\nContent-Range: bytes 76-80/81\r\n\r\nhtml>")
-      
-      (test-equi? "(get) single range - 10 bytes from the middle"
-                   (output output-file tmp-file #"GET" #"text/html" '((10 . 19)))
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 10\r\nContent-Range: bytes 10-19/81\r\n\r\nd><title>A")
-      
-      (test-equi? "(get) multiple ranges"
-                   (output output-file/boundary tmp-file #"GET" #"text/html" '((10 . 19) (30 . 39) (50 . 59)) #"BOUNDARY")
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: multipart/byteranges; boundary=BOUNDARY\r\nAccept-Ranges: bytes\r\nContent-Length: 266\r\n\r\n--BOUNDARY\r\nContent-Type: text/html\r\nContent-Range: bytes 10-19/81\r\n\r\nd><title>A\r\n\r\n--BOUNDARY\r\nContent-Type: text/html\r\nContent-Range: bytes 30-39/81\r\n\r\ntle></head\r\n\r\n--BOUNDARY\r\nContent-Type: text/html\r\nContent-Range: bytes 50-59/81\r\n\r\ne's some c\r\n\r\n--BOUNDARY--\r\n")
-      
-      (test-equi? "(get) some bad ranges"
-                  (parameterize ([current-error-port (open-output-nowhere)])
-                   (output output-file/boundary tmp-file #"GET" #"text/html" '((10 . 19) (1000 . 1050) (30 . 39) (50 . 49)) #"BOUNDARY"))
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: multipart/byteranges; boundary=BOUNDARY\r\nAccept-Ranges: bytes\r\nContent-Length: 182\r\n\r\n--BOUNDARY\r\nContent-Type: text/html\r\nContent-Range: bytes 10-19/81\r\n\r\nd><title>A\r\n\r\n--BOUNDARY\r\nContent-Type: text/html\r\nContent-Range: bytes 30-39/81\r\n\r\ntle></head\r\n\r\n--BOUNDARY--\r\n")
-      
-      (test-equi? "(get) all bad ranges"
-                  (parameterize ([current-error-port (open-output-nowhere)])
-                   (output output-file/boundary tmp-file #"GET" #"text/html" '((-10 . -5) (1000 . 1050) (50 . 49)) #"BOUNDARY"))
-                   #"HTTP/1.1 416 Invalid range request\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\n\r\n")
-      
-      (test-equal? "(get) some bad ranges (error)"
-                   (let ()
-                     (define os (open-output-string))
-                     (parameterize ([current-error-port os])
-                       (output output-file/boundary tmp-file #"GET" #"text/html" '((10 . 19) (1000 . 1050) (30 . 39) (50 . 49)) #"BOUNDARY"))
-                     (get-output-string os))
-                   "")
-      
-      (test-equal? "(get) all bad ranges (error)"
-                   (let ()
-                     (define os (open-output-string))
-                     (parameterize ([current-error-port os])
-                   (output output-file/boundary tmp-file #"GET" #"text/html" '((-10 . -5) (1000 . 1050) (50 . 49)) #"BOUNDARY"))
-                     (get-output-string os))
-                   "")
-      
-      (test-equi? "(head) whole file - no Range header"
-                   (output output-file tmp-file #"HEAD" #"text/html" #f)
-                   #"HTTP/1.1 200 OK\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\n\r\n")
-      
-      (test-equi? "(head) whole file - Range header present"
-                   (output output-file tmp-file #"HEAD" #"text/html" '((0 . 80)))
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 81\r\nContent-Range: bytes 0-80/81\r\n\r\n")
-      
-      (test-equi? "(head) single range - 10 bytes from the start"
-                   (output output-file tmp-file #"HEAD" #"text/html" '((0 . 9)))
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 10\r\nContent-Range: bytes 0-9/81\r\n\r\n")
-      
-      (test-equi? "(head) single range - 10 bytes from the end"
-                   (output output-file tmp-file #"HEAD" #"text/html" '((71 . #f)))
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 10\r\nContent-Range: bytes 71-80/81\r\n\r\n")
-      
-      (test-equi? "(head) single range - 10 bytes from the middle"
-                   (output output-file tmp-file #"HEAD" #"text/html" '((10 . 19)))
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\nAccept-Ranges: bytes\r\nContent-Length: 10\r\nContent-Range: bytes 10-19/81\r\n\r\n")
-      
-      (test-equi? "(head) multiple ranges"
-                   (output output-file/boundary tmp-file #"HEAD" #"text/html" '((10 . 19) (30 . 39) (50 . 59)) #"BOUNDARY")
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: multipart/byteranges; boundary=BOUNDARY\r\nAccept-Ranges: bytes\r\nContent-Length: 266\r\n\r\n")
-      
-      (test-equi? "(head) some bad ranges"
-                   (output output-file/boundary tmp-file #"HEAD" #"text/html" '((10 . 19) (1000 . 1050) (30 . 39) (50 . 49)) #"BOUNDARY")
-                   #"HTTP/1.1 206 Partial content\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: multipart/byteranges; boundary=BOUNDARY\r\nAccept-Ranges: bytes\r\nContent-Length: 182\r\n\r\n")
-      
-      (test-equi? "(head) all bad ranges"
-                  (parameterize ([current-error-port (open-output-nowhere)])
-                   (output output-file/boundary tmp-file #"HEAD" #"text/html" '((-10 . -5) (1000 . 1050) (50 . 49)) #"BOUNDARY"))
-                   #"HTTP/1.1 416 Invalid range request\r\nDate: REDACTED GMT\r\nLast-Modified: REDACTED GMT\r\nServer: Racket\r\nContent-Type: text/html\r\n\r\n")
-      
-      (test-equal? "(head) all bad ranges"
-                  (let ()
-                     (define os (open-output-string))
-                     (parameterize ([current-error-port os])
-                   
-                   (output output-file/boundary tmp-file #"HEAD" #"text/html" '((-10 . -5) (1000 . 1050) (50 . 49)) #"BOUNDARY"))
-                     (get-output-string os))
-                  "")))))
-
-(module+ test
-  (require rackunit/text-ui)
-  (run-tests response-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/url-param-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/url-param-test.rkt
deleted file mode 100644
index 6f3a62e892..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/url-param-test.rkt
+++ /dev/null
@@ -1,32 +0,0 @@
-#lang racket/base
-(require rackunit
-         net/url
-         web-server/private/url-param)
-(provide url-param-tests)
-
-(define url0 (string->url "http://www.test.com/somewhere"))
-
-(define url-param-tests
-  (test-suite
-   "URL Parameters"
-   
-   (test-case 
-    "Insert and extract is identity"
-    (check-equal? (extract-param (insert-param url0 "key" "val0") "key")
-                  "val0"))
-   
-   (test-case 
-    "Insert and extract is identity after multiple"
-    (check-equal? (extract-param (insert-param 
-                                  (insert-param url0 "key" "val0")
-                                  "key" "val1")
-                                 "key")
-                  "val1"))
-   
-   (test-case 
-    "Insert and extract is identity after multiple different"
-    (check-equal? (extract-param (insert-param 
-                                  (insert-param url0 "key0" "val0")
-                                  "key1" "val1")
-                                 "key0")
-                  "val0"))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/util-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/util-test.rkt
deleted file mode 100644
index 65ff0d42a7..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/private/util-test.rkt
+++ /dev/null
@@ -1,157 +0,0 @@
-#lang racket/base
-(require rackunit
-         net/url
-         xml/xml
-         mzlib/contract
-         web-server/private/util)
-(provide util-tests)
-
-(define util-tests
-  (test-suite
-   "Utilities"
-   
-   ; XXX path-element?
-   
-   (test-suite
-    "port-number?"
-    (test-not-exn "80" (lambda () (contract port-number? 80 'pos 'neg)))
-    (test-not-exn "8080" (lambda () (contract port-number? 8080 'pos 'neg)))
-    (test-exn "0" exn:fail:contract? (lambda () (contract port-number? 0 'pos 'neg)))
-    (test-exn "10000000" exn:fail:contract? (lambda () (contract port-number? 10000000 'pos 'neg))))
-   
-   (test-suite
-    "url-replace-path"
-    (test-case
-     "Identity"
-     (check-equal? (url->string (url-replace-path (lambda (x) x) (string->url "http://test.com/foo/bar")))
-                   "http://test.com/foo/bar"))
-    (test-case
-     "Remove"
-     (check-equal? (url->string (url-replace-path (lambda (x) (list)) (string->url "http://test.com/foo/bar")))
-                   "http://test.com")))
-   
-   (test-suite
-    "explode-path*"
-    (test-case
-     "Simple"
-     (check-equal? (explode-path* (build-path "foo" "bar"))
-                   (list (build-path "foo") (build-path "bar")))))
-   
-   (test-suite
-    "path-without-base"
-    (test-case
-     "Simple"
-     (check-equal? (path-without-base (build-path "foo")
-                                      (build-path "foo" "bar"))
-                   (list (build-path "bar"))))
-    (test-case
-     "Exceptional case"
-     (check-exn (lambda _ #t)
-                (lambda () (path-without-base 
-                            (build-path "foo" "bar")
-                            (build-path "foo"))))))
-   
-   (test-suite
-    "list-prefix?"
-    (test-case
-     "Simple"
-     (check-true (list-prefix? '(a b c) '(a b c d))))
-    (test-case
-     "Not prefix"
-     (check-false (list-prefix? '(a b) '(a))))
-    (test-case
-     "Not prefix"
-     (check-false (list-prefix? '(a b c) '(b c d)))))
-   
-   (test-suite
-    "url-path->string"
-    (test-case
-     "Simple (no param)"
-     (check-equal? (url-path->string (url-path (string->url "http://test.com/foo/bar")))
-                   "/foo/bar"))
-    (test-case
-     "Simple (param)"
-     (check-equal? (url-path->string (url-path (string->url "http://test.com/foo/bar;zog")))
-                   "/foo/bar")))
-   
-   (test-suite
-    "network-error"
-    (test-case
-     "Simple"
-     (check-exn exn:fail:network?
-                (lambda () (network-error 'foo "Bar"))))
-    (test-case
-     "Simple (format succeeds)"
-     (check-exn exn:fail:network?
-                (lambda () (network-error 'foo "Bar ~a" 1)))))
-   
-   (test-suite
-    "directory-part"
-    (test-case
-     "Absolute"
-     (check-equal? (directory-part (build-path "/" "foo" "bar"))
-                   (build-path "/" "foo/")))
-    (test-case
-     "Relative"
-     (check-equal? (directory-part (build-path "foo"))
-                   (current-directory)))
-    (test-case
-     "Error"
-     (check-exn (lambda _ #t)
-                (lambda () (directory-part (build-path "/"))))))
-   
-   (test-suite
-    "lowercase-symbol!"
-    (test-case
-     "LC String"
-     (check-eq? (lowercase-symbol! "foo")
-                'foo))
-    (test-case
-     "LC Bytes"
-     (check-eq? (lowercase-symbol! #"foo")
-                'foo))
-    (test-case
-     "UC String"
-     (check-eq? (lowercase-symbol! "FOO")
-                'foo))
-    (test-case
-     "UC Bytes"
-     (check-eq? (lowercase-symbol! #"FOO")
-                'foo)))
-   
-   (test-suite
-    "exn->string"
-    (test-case
-     "Exception"
-     (check-pred string? (with-handlers ([exn? exn->string])
-                           (error 'error "Yup"))))
-    (test-case
-     "Any"
-     (check-equal? (exn->string "foo")
-                   (format "~s\n" "foo"))))
-   
-   (test-suite
-    "build-path-unless-absolute"
-    (test-case
-     "Relative PS"
-     (check-equal? (build-path-unless-absolute "foo" "bar")
-                   (build-path "foo" "bar")))
-    (test-case
-     "Absolute PS"
-     (check-equal? (build-path-unless-absolute "foo" "/bar")
-                   (build-path "/bar")))
-    (test-case
-     "Relative P"
-     (check-equal? (build-path-unless-absolute (build-path "foo") (build-path "bar"))
-                   (build-path "foo" "bar")))
-    (test-case
-     "Absolute P"
-     (check-equal? (build-path-unless-absolute (build-path "foo") (build-path "/bar"))
-                   (build-path "/bar"))))
-   
-   (test-suite
-    "read/string & write/string"
-    (test-case
-     "Identity"
-     (check-equal? (read/string (write/string (vector 1 2 3)))
-                   (vector 1 2 3))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/run-all-tests.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/run-all-tests.rkt
deleted file mode 100644
index 4eda6cb26f..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/run-all-tests.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-(require "all-web-server-tests.rkt")
-
-(require rackunit/text-ui)
-(run-tests all-web-server-tests)
-
-#;(require rackunit/gui)
-#;(test/gui all-web-server-tests)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet-env-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet-env-test.rkt
deleted file mode 100644
index a2272eb958..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet-env-test.rkt
+++ /dev/null
@@ -1,58 +0,0 @@
-#lang racket/base
-(require rackunit
-         mzlib/etc
-         mzlib/list
-         mzlib/pretty
-         net/url
-         web-server/servlet-env
-         web-server/servlet)
-(provide servlet-env-tests)
-
-#;(define (call u bs)
-    (define sx (ssax:xml->sxml (get-pure-port (string->url u)) empty))
-    (pretty-print sx)
-    sx)
-
-(define servlet-env-tests
-  (test-suite
-   "Servlet Environment"
-   
-   ; XXX At least just check whether the server can be started by the servlet-env guts
-   
-   ; XXX Broken
-   #;(test-not-exn "Add two numbers"
-                   (lambda () 
-                     (sleep 2)
-                     (parameterize ([send-url
-                                     (lambda (a-url sep?)
-                                       (let* ([k0 (first ((sxpath "//form/@action/text()") (call a-url empty)))]
-                                              [k1 (first ((sxpath "//form/@action/text()") (call k0 (list (make-binding:form #"number" #"23")))))]
-                                              [n (first ((sxpath "//p/text()") (call k1 (list (make-binding:form #"number" #"12")))))])
-                                         n)
-                                       (void))])
-                       (example))))))
-
-; request-number : str -> num
-(define (request-number which-number)
-  (string->number
-   (extract-binding/single
-    'number
-    (request-bindings (send/suspend (build-request-page which-number))))))
-
-; build-request-page : str -> str -> response
-(define (build-request-page which-number)
-  (lambda (k-url)
-    `(html (head (title "Enter a Number to Add"))
-           (body ([bgcolor "white"])
-                 (form ([action ,k-url] [method "post"])
-                       "Enter the " ,which-number " number to add: "
-                       (input ([type "text"] [name "number"] [value ""]))
-                       (input ([type "submit"] [name "enter"] [value "Enter"])))))))
-(define (example)
-  (serve/servlet
-   (lambda (request)
-     `(html (head (title "Sum"))
-            (body ([bgcolor "white"])
-                  (p "The sum is "
-                     ,(number->string (+ (request-number "first") (request-number "second")))))))
-   #:port 9999))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet-env/env.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet-env/env.rkt
deleted file mode 100644
index 774601cc33..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet-env/env.rkt
+++ /dev/null
@@ -1,30 +0,0 @@
-#lang racket
-(require web-server/servlet
-         web-server/servlet-env)
-
-; request-number : str -> num
-(define (request-number which-number)
-  (string->number
-   (extract-binding/single
-    'number
-    (request-bindings (send/suspend (build-request-page which-number))))))
-
-; build-request-page : str -> str -> response
-(define (build-request-page which-number)
-  (lambda (k-url)
-    `(html (head (title "Enter a Number to Add"))
-           (body ([bgcolor "white"])
-                 (form ([action ,k-url] [method "post"])
-                       "Enter the " ,which-number " number to add: "
-                       (input ([type "text"] [name "number"] [value ""]))
-                       (input ([type "submit"] [name "enter"] [value "Enter"])))))))
-(define (start request)
-  `(html (head (title "Sum"))
-         (body ([bgcolor "white"])
-               (p "The sum is "
-                  ,(number->string (+ (request-number "first") (request-number "second")))))))
-
-(serve/servlet start
-               #:servlet-path "/")
-
-(module test racket/base)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet-env/insta.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet-env/insta.rkt
deleted file mode 100644
index 59df12dc07..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet-env/insta.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-#lang web-server/insta
-; request-number : str -> num
-(define (request-number which-number)
-  (string->number
-   (extract-binding/single
-    'number
-    (request-bindings (send/suspend (build-request-page which-number))))))
-
-; build-request-page : str -> str -> response
-(define (build-request-page which-number)
-  (lambda (k-url)
-    `(html (head (title "Enter a Number to Add"))
-           (body ([bgcolor "white"])
-                 (form ([action ,k-url] [method "post"])
-                       "Enter the " ,which-number " number to add: "
-                       (input ([type "text"] [name "number"] [value ""]))
-                       (input ([type "submit"] [name "enter"] [value "Enter"])))))))
-(define (start request)
-  `(html (head (title "Sum"))
-         (body ([bgcolor "white"])
-               (p "The sum is "
-                  ,(number->string (+ (request-number "first") (request-number "second")))))))
-
-(module test racket/base)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/all-servlet-tests.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/all-servlet-tests.rkt
deleted file mode 100644
index 631447b9cd..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/all-servlet-tests.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-(require rackunit
-         "bindings-test.rkt"
-         "basic-auth-test.rkt"
-         "helpers-test.rkt"
-         "web-test.rkt")
-(provide all-servlet-tests)
-
-(define all-servlet-tests
-  (test-suite
-   "Servlet (Internal)"
-   bindings-tests
-   basic-auth-tests
-   helpers-tests
-   web-tests))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/basic-auth-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/basic-auth-test.rkt
deleted file mode 100644
index 1ac0dd8b4f..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/basic-auth-test.rkt
+++ /dev/null
@@ -1,44 +0,0 @@
-#lang racket
-(require rackunit
-         web-server/http
-         net/url)
-(provide basic-auth-tests)
-
-(define (make-req hs)
-  (make-request 
-   #"GET" (string->url "http://test.com/foo")
-   hs
-   (delay empty) #f
-   "host" 80 "client"))
-
-(define (header->cons h)
-  (cons (header-field h) (header-value h)))
-
-(define basic-auth-tests
-  (test-suite
-   "Basic Authentication"
-   
-   (test-case
-    "make-basic-auth-header"
-    (check-equal? (header->cons (make-basic-auth-header "realm"))
-                  (cons #"WWW-Authenticate"
-                        #"Basic realm=\"realm\"")))
-   
-   (test-case
-    "Simple"
-    (check-equal? (request->basic-credentials
-                   (make-req (list (make-header #"Authorization" #"Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=="))))
-                  (cons #"Aladdin" #"open sesame")))
-   
-   (test-case
-    "Value error"
-    (check-false (request->basic-credentials (make-req (list (make-header #"Authorization" #"Basic adfadQWxhZGRpb124134jpvcGVu="))))))
-   
-   (test-case
-    "No header"
-    (check-false (request->basic-credentials (make-req (list)))))
-   
-   (test-case
-    "Case"
-    (check-equal? (request->basic-credentials (make-req (list (make-header #"AuthoRIZation" #"Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=="))))
-                  (cons #"Aladdin" #"open sesame")))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/bindings-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/bindings-test.rkt
deleted file mode 100644
index a8e07f2f0a..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/bindings-test.rkt
+++ /dev/null
@@ -1,87 +0,0 @@
-#lang racket
-(require rackunit
-         mzlib/list
-         net/url
-         web-server/http
-         web-server/http/bindings)
-(provide bindings-tests)
-
-(define bs `([foo . 3] [foos . 1] [foos . 2]))
-
-(define bindings-tests
-  (test-suite
-   "Bindings"
-   
-   (test-suite
-    "request-bindings"
-    (test-case
-     "Simple"
-     (check-equal? (request-bindings
-                    (make-request #"GET" (string->url "http://test.com/foo")
-                                  empty (delay (list (make-binding:form #"key" #"val"))) #f
-                                  "host" 80 "client"))
-                   '((key . "val"))))
-    (test-case
-     "Case"
-     (check-equal? (request-bindings
-                    (make-request #"GET" (string->url "http://test.com/foo")
-                                  empty (delay (list (make-binding:form #"KEY" #"val"))) #f
-                                  "host" 80 "client"))
-                   '((key . "val"))))
-    (test-case
-     "Multi"
-     (check-equal? (request-bindings
-                    (make-request #"GET" (string->url "http://test.com/foo")
-                                  empty (delay (list (make-binding:form #"key" #"val")
-                                                     (make-binding:form #"key2" #"val")))
-                                  #f
-                                                                                  "host" 80 "client"))
-                   '((key . "val")
-                     (key2 . "val"))))
-    (test-case
-     "File"
-     (check-equal? (request-bindings
-                    (make-request #"GET" (string->url "http://test.com/foo")
-                                  empty (delay (list (make-binding:file #"key" #"file" empty #"val"))) #f
-                                  "host" 80 "client"))
-                   '((key . #"val")))))
-   
-   (test-suite
-    "request-headers"
-    (test-case
-     "Simple"
-     (check-equal? (request-headers
-                    (make-request #"GET" (string->url "http://test.com/foo")
-                                  (list (make-header #"key" #"val")) (delay empty) #f
-                                  "host" 80 "client"))
-                   '((key . "val"))))
-    (test-case
-     "Case"
-     (check-equal? (request-headers
-                    (make-request #"GET" (string->url "http://test.com/foo")
-                                  (list (make-header #"KEY" #"val")) (delay empty) #f
-                                  "host" 80 "client"))
-                   '((key . "val")))))
-   
-   (test-case
-    "exists-binding? - true"
-    (check-true (exists-binding? 'foo bs)))
-   (test-case
-    "exists-binding? - false"
-    (check-false (exists-binding? 'bar bs)))
-   
-   (test-case
-    "extract-bindings"
-    (check-equal? (extract-bindings 'foos bs) (list 1 2)))
-   
-   (test-case
-    "extract-binding/single - success"
-    (check-equal? (extract-binding/single 'foo bs) 3))
-   (test-case
-    "extract-binding/single - failure"
-    (check-exn (lambda (exn) (regexp-match "not found" (exn-message exn)))
-               (lambda () (extract-binding/single 'bar bs) 3)))
-   (test-case
-    "extract-binding/single - multiple"
-    (check-exn (lambda (exn) (regexp-match "multiple times" (exn-message exn)))
-               (lambda () (extract-binding/single 'foos bs) 3)))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/helpers-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/helpers-test.rkt
deleted file mode 100644
index 37f18313fc..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/helpers-test.rkt
+++ /dev/null
@@ -1,54 +0,0 @@
-#lang racket/base
-(require rackunit
-         web-server/servlet)
-(provide helpers-tests)
-
-(define (dehead hs)
-  (map (lambda (h)
-         (list (header-field h)
-               (header-value h)))
-       hs))
-
-(define helpers-tests
-  (test-suite
-   "Helpers"
-   
-   (test-suite
-    "with-errors-to-browser"
-    (test-case
-     "Basic"
-     (check-pred response? (let/ec esc (with-errors-to-browser esc (lambda () (error 'error "Hey!"))))))
-    (test-case
-     "Basic (succ)"
-     (check-true (let/ec esc (with-errors-to-browser esc (lambda () #t))))))
-   
-   (test-suite
-    "redirect-to"
-    (test-exn "Empty"
-              exn:fail:contract?
-              (lambda () (redirect-to "")))
-    (test-equal? "Code (temp)"  
-                 (response-code (redirect-to "http://test.com/foo"))
-                 302)
-    (test-equal? "Message (temp)" 
-                 (response-message (redirect-to "http://test.com/foo"))
-                 #"Moved Temporarily")
-    (test-equal? "Code" 
-                 (response-code (redirect-to "http://test.com/foo" permanently))
-                 301)
-    (test-equal? "Message" 
-                 (response-message (redirect-to "http://test.com/foo" permanently))
-                 #"Moved Permanently")
-    (test-equal? "URL"
-                 (dehead (response-headers (redirect-to "http://test.com/foo")))
-                 (list (list #"Location" #"http://test.com/foo")))
-    (test-equal? "Headers"
-                 (dehead (response-headers (redirect-to "http://test.com/foo" #:headers (list (make-header #"Header" #"Value")))))
-                 (list (list #"Location" #"http://test.com/foo")
-                       (list #"Header" #"Value"))))
-   
-   (test-suite
-    "redirection-status?"
-    (test-case "permanently" (check-true (redirection-status? permanently)))
-    (test-case "temporarily" (check-true (redirection-status? temporarily)))
-    (test-case "see-other" (check-true (redirection-status? see-other))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/web-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/web-test.rkt
deleted file mode 100644
index a8a3b74402..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/servlet/web-test.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang racket/base
-(require rackunit
-         net/url
-         web-server/servlet/web)
-(require/expose web-server/servlet/web
-                (embed-ids))
-
-(provide web-tests)
-
-(define url0 (string->url "http://test.com/servlets/example.rkt"))
-
-(define web-tests
-  (test-suite
-   "Web"
-   
-   (test-suite 
-    "continuation-url? and embed-ids"
-    (test-false "not k-url" (continuation-url? url0))
-    (test-equal? "identity"
-                 (continuation-url? (string->url (embed-ids (list 1 2 3) url0)))
-                 (list 1 2 3)))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/info.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/info.rkt
deleted file mode 100644
index a5b71b1dd7..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-omit-paths 'all)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/.gitignore b/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/.gitignore
deleted file mode 100644
index 70b8a9ff79..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/static.txt
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/Makefile b/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/Makefile
deleted file mode 100644
index 3a9641e113..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-dyn-server: dynamic.rkt
-	ulimit -n 10000
-	racket -t dynamic.rkt
-
-static.txt: dynamic.rkt
-	wget http://localhost:8000 -O static.txt
-
-stat-server: static.txt static.rkt
-	ulimit -n 10000
-	racket -t static.rkt
-
-dyn-httperf:
-	httperf --hog --server localhost --port=8000 --rate=6000 --num-conn=5 --num-calls=1000
-
-stat-httperf:
-	httperf --hog --server localhost --port=8000 --rate=6000 --num-conn=5 --num-calls=1000
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/dynamic.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/dynamic.rkt
deleted file mode 100644
index 71acc5824c..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/dynamic.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require web-server/servlet-env)
-
-(define (fac n a)
-  (if (zero? n) a
-      (fac (sub1 n) (* n a))))
-
-(define (start req)
-  (number->string (fac 10 1)))
-
-(serve/servlet start
-               #:servlet-regexp #rx""
-               #:port 8000
-               #:command-line? #t)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/static.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/static.rkt
deleted file mode 100644
index afdd2a8dfa..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-hop/static.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require web-server/servlet-dispatch
-         racket/runtime-path
-         web-server/dispatchers/dispatch-files)
-
-(define-runtime-path static-path "static.txt")
-
-(serve/launch/wait
- (λ (sema)
-   (make #:url->path (λ (url) (values static-path null))))
- #:launch-path #f
- #:banner? #f
- #:port 8001)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/FiringGeometry.png b/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/FiringGeometry.png
deleted file mode 100644
index f0c189a4fc..0000000000
Binary files a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/FiringGeometry.png and /dev/null differ
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/Makefile b/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/Makefile
deleted file mode 100644
index 4f96c28416..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-dyn-server: dynamic.rkt
-	ulimit -n 10000
-	racket -t dynamic.rkt
-
-stat-server: static.rkt
-	ulimit -n 10000
-	racket -t static.rkt
-
-dyn-httperf:
-	httperf --hog --num-conns 1000 --num-calls 1000 --burst-length 20 --port 8000 --rate 1000 --uri=/pong
-
-stat-httperf:
-	httperf --hog --num-conns 1000 --num-calls 1000 --burst-length 20 --port 8001 --rate 1000 --uri=/FiringGeometry.png
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/dynamic.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/dynamic.rkt
deleted file mode 100644
index 698b25ce1a..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/dynamic.rkt
+++ /dev/null
@@ -1,19 +0,0 @@
-#lang racket/base
-(require web-server/servlet-env
-         web-server/http
-         racket/list)
-
-(define resp
-  (response/full
-   200 #"Okay"
-   (current-seconds) TEXT/HTML-MIME-TYPE
-   empty
-   (list #"PONG")))
-
-(define (start req)
-  resp)
-
-(serve/servlet start
-               #:servlet-regexp #rx""
-               #:port 8000
-               #:command-line? #t)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/static.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/static.rkt
deleted file mode 100644
index 9551ee842c..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stress/vs-snap/static.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang racket/base
-(require web-server/servlet-dispatch
-         racket/runtime-path
-         web-server/dispatchers/dispatch-files)
-
-(define-runtime-path static-path "FiringGeometry.png")
-
-(serve/launch/wait
- (λ (sema)
-   (make #:url->path (λ (url) (values static-path null))))
- #:launch-path #f
- #:banner? #f
- #:port 8001)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stuffers-test.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/stuffers-test.rkt
deleted file mode 100644
index 066ae55db4..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/stuffers-test.rkt
+++ /dev/null
@@ -1,127 +0,0 @@
-#lang racket
-(require rackunit
-         web-server/stuffers
-         web-server/private/servlet
-         web-server/http
-         net/url
-         racket/serialize)
-(provide all-stuffers-tests)
-
-(define (stuffer-test s)
-  (define x (string->bytes/utf-8 (number->string (random 1000))))
-  (check-equal? ((stuffer-out s) ((stuffer-in s) x))
-                x))
-
-(define (store-test s)
-  (define x (string->bytes/utf-8 (number->string (random 1000))))
-  (define y (string->bytes/utf-8 (number->string (random 1000))))
-  (check-equal? (begin ((store-write s) x y)
-                       ((store-read s) x))
-                y))
-
-(define prep-stuffer
-  (make-stuffer
-   (lambda (v) (bytes-append #"20" v))
-   (lambda (v) (subbytes v 2))))
-
-(define (context-wrap thnk)
-  (parameterize ([current-execution-context
-                               (make-execution-context 
-                                (make-request #"GET" (string->url "http://www.google.com") 
-                                              empty (delay empty)
-                                              #"" "127.0.0.1" 80
-                                              "127.0.0.1"))])
-    (thnk)))
-
-(define all-stuffers-tests
-  (test-suite
-   "Stuffers"
-   
-   (test-suite "stuffer"
-               (test-case "id-stuffer" (stuffer-test id-stuffer))
-               
-               (test-case "stuffer-compose" (stuffer-test (stuffer-compose id-stuffer id-stuffer)))
-               (test-case "stuffer-compose" (stuffer-test (stuffer-compose prep-stuffer id-stuffer)))
-               (test-case "stuffer-compose" (stuffer-test (stuffer-compose id-stuffer prep-stuffer)))
-               (test-case "stuffer-compose" (stuffer-test (stuffer-compose prep-stuffer prep-stuffer)))
-               
-               (test-case "stuffer-sequence" (stuffer-test (stuffer-sequence id-stuffer id-stuffer)))
-               (test-case "stuffer-sequence" (stuffer-test (stuffer-sequence prep-stuffer id-stuffer)))
-               (test-case "stuffer-sequence" (stuffer-test (stuffer-sequence id-stuffer prep-stuffer)))
-               (test-case "stuffer-sequence" (stuffer-test (stuffer-sequence prep-stuffer prep-stuffer)))
-               
-               (test-case "stuffer-if" (stuffer-test (stuffer-if (lambda (v) #t) id-stuffer)))
-               (test-case "stuffer-if" (stuffer-test (stuffer-if (lambda (v) #f) id-stuffer)))
-               (test-case "stuffer-if" (stuffer-test (stuffer-if (lambda (v) #t) prep-stuffer)))
-               (test-case "stuffer-if" (stuffer-test (stuffer-if (lambda (v) #f) prep-stuffer)))
-               
-               (test-case "stuffer-chain" (stuffer-test (stuffer-chain)))
-               (test-case "stuffer-chain" (stuffer-test (stuffer-chain (lambda (v) #f))))
-               (test-case "stuffer-chain" (stuffer-test (stuffer-chain (lambda (v) #f) prep-stuffer)))
-               (test-case "stuffer-chain" (stuffer-test (stuffer-chain prep-stuffer (lambda (v) #f) prep-stuffer))))
-   
-   (test-suite "base64"
-               (test-case "base64-stuffer" (stuffer-test base64-stuffer)))
-   
-   (test-suite "gzip"
-               (test-case "gzip-stuffer" (stuffer-test gzip-stuffer)))
-   
-   (test-suite "serialize"
-               (test-case "serialize-stuffer" (stuffer-test serialize-stuffer)))
-   
-   (test-suite "store"
-               (test-case "dir-store" (store-test (dir-store (find-system-path 'temp-dir)))))
-   
-   (test-suite "hash"
-               (test-case "md5-stuffer" (stuffer-test (md5-stuffer (find-system-path 'temp-dir)))))
-   
-   (test-suite "hmac-sha1"
-               (test-case "hmac-sha1 len" 
-                          (check-equal? (bytes-length (HMAC-SHA1 (make-bytes 10 (random 255))
-                                                                 (make-bytes 10 (random 255))))
-                                        20))
-               
-               (test-case "hmac-sha1 len" 
-                          (check-equal? (bytes-length (HMAC-SHA1 (make-bytes 10 (random 255))
-                                                                 (make-bytes 100 (random 255))))
-                                        20))
-               
-               (test-case "hmac-sha1 len" 
-                          (check-equal? (bytes-length (HMAC-SHA1 (make-bytes 10 (random 255))
-                                                                 (make-bytes 1000 (random 255))))
-                                        20))
-               
-               (test-case "hmac-sha1 stuffer" (stuffer-test (HMAC-SHA1-stuffer (make-bytes 10 (random 255)))))
-               
-               (test-case "hmac-sha1 stuffer (err)"
-                          (check-exn exn?
-                                     (lambda ()
-                                       ((stuffer-out (HMAC-SHA1-stuffer (make-bytes 10 (random 255))))
-                                        #"123456789012345678901234567890")))))
-   
-   (test-suite "stuff-url"
-               (test-case "make-default-stuffer"
-                          (context-wrap 
-                           (lambda () 
-                             (stuffer-test (make-default-stuffer (find-system-path 'temp-dir))))))
-               
-               (test-case "is-url-too-big?"
-                          (context-wrap
-                           (lambda ()
-                             (check-false (is-url-too-big? (make-bytes 1 65))))))
-               (test-case "is-url-too-big?"
-                          (context-wrap
-                           (lambda ()
-                             (check-false (is-url-too-big? (make-bytes 10 65))))))
-               (test-case "is-url-too-big?"
-                          (context-wrap
-                           (lambda ()
-                             (check-false (is-url-too-big? (make-bytes 100 65))))))
-               (test-case "is-url-too-big?"
-                          (context-wrap
-                           (lambda ()
-                             (check-false (is-url-too-big? (make-bytes 1000 65))))))
-               (test-case "is-url-too-big?"
-                          (context-wrap
-                           (lambda ()
-                             (check-not-false (is-url-too-big? (make-bytes 3000 65)))))))))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/basic.html b/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/basic.html
deleted file mode 100644
index ed0197c19b..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/basic.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-  <head><title>@title </title></head>
-  <body>
-    <table>
-      @in[c clients]{
-        <tr>
-         <td>@(client-surname c), @(client-firstname c)</td>
-         <td><a href="mailto:@(client-email c)">@(client-email c)</a></td>
-        </tr>
-      }
-    </table>
-  </body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog-posted.html b/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog-posted.html
deleted file mode 100644
index 813539441a..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog-posted.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<h2>@|title|</h2>
-<p>@|body|</p>
-
-<h1><a href="@|k-url|">Continue</a></h1>
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog-posts.html b/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog-posts.html
deleted file mode 100644
index 669399ac7c..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog-posts.html
+++ /dev/null
@@ -1,16 +0,0 @@
-@in[p posts]{
- <h2>@(post-title p)</h2>
- <p>@(post-body p)</p>
- <ul>
-  @in[c (post-comments p)]{
-   <li>@|c|</li>
-  }
- </ul>
-}
-
-<h1>New Post</h1>
-<form action="@|k-url|">
- <input name="title" />
- <input name="body" />
- <input type="submit" />
-</form>
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog-xexpr.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog-xexpr.rkt
deleted file mode 100644
index eb299abd1c..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog-xexpr.rkt
+++ /dev/null
@@ -1,93 +0,0 @@
-#lang racket
-(require web-server/servlet
-         xml
-         web-server/servlet-env)
-
-(define-struct post (title body comments))
-
-(define posts
-  (list 
-   (make-post
-    "(Y Y) Works: The Why of Y"
-    "..."
-    (list 
-     "First post! - A.T."
-     "Didn't I write this? - Matthias"))
-   (make-post
-    "Church and the States"
-    "As you may know, I grew up in DC, not technically a state..."
-    (list
-     "Finally, A Diet That Really Works! As Seen On TV"))))
-
-(define (template section body)
-  `(html
-    (head (title "Alonzo's Church: " ,section)
-          (style ([type "text/css"])
-                 ,(make-cdata #f #f "
-   body {
-    margin: 0px;
-    padding: 10px;
-   }
-
-   #main {
-    background: #dddddd;
-   }")))
-    (body
-     (script ([type "text/javascript"])
-             ,(make-cdata #f #f "
-   var gaJsHost = ((\"https:\" == document.location.protocol) ?
-     \"https://ssl.\" : \"http://www.\");
-   document.write(unescape(\"%3Cscript src='\" + gaJsHost +
-     \"google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E\"));
-"))
-     (script ([type "text/javascript"])
-             ,(make-cdata #f #f "
-   var pageTracker = _gat._getTracker(\"UA-YYYYYYY-Y\");
-   pageTracker._trackPageview();
-"))
-     
-     (h1 "Alonzo's Church: " ,section)
-     (div ([id "main"])
-          ,@body))))
-
-(define (blog-posted title body k-url)
-  `((h2 ,title)
-    (p ,body)
-    (h1 (a ([href ,k-url]) "Continue"))))
-
-(define (extract-post req)
-  (define title (extract-binding/single 'title (request-bindings req)))
-  (define body (extract-binding/single 'body (request-bindings req)))
-  (set! posts
-        (list* (make-post title body empty)
-               posts))
-  (send/suspend
-   (lambda (k-url)
-     (template "Posted" (blog-posted title body k-url))))
-  (display-posts))
-
-(define (blog-posts k-url)
-  (append
-   (apply append 
-          (for/list ([p posts])
-            `((h2 ,(post-title p))
-              (p ,(post-body p))
-              (ul
-               ,@(for/list ([c (post-comments p)])
-                   `(li ,c))))))
-   `((h1 "New Post")
-     (form ([action ,k-url])
-           (input ([name "title"]))
-           (input ([name "body"]))
-           (input ([type "submit"]))))))
-
-(define (display-posts)
-  (extract-post
-   (send/suspend
-    (lambda (k-url)
-      (template "Posts" (blog-posts k-url))))))
-
-(define (start req)
-  (display-posts))
-
-(serve/servlet start)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog.html b/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog.html
deleted file mode 100644
index c5dc3f41bd..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
- <head>
-  <title>Alonzo's Church: @|section|</title>
-  <style type="text/css">
-   body {
-    margin: 0px;
-    padding: 10px;
-   }
-
-   #main {
-    background: #dddddd;
-   }
-  </style>
- </head>
- <body>
-  <script type="text/javascript">
-   var gaJsHost = (("https:" == document.location.protocol) ?
-     "https://ssl." : "http://www.");
-   document.write(unescape("%3Cscript src='" + gaJsHost +
-     "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-  </script>
-  <script type="text/javascript">
-   var pageTracker = _gat._getTracker("UA-YYYYYYY-Y");
-   pageTracker._trackPageview();
-  </script>
-
-  <h1>Alonzo's Church: @|section|</h1>
-  <div id="main">
-    @body
-  </div>
- </body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog.rkt
deleted file mode 100644
index cbbe8fa654..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/blog.rkt
+++ /dev/null
@@ -1,46 +0,0 @@
-#lang racket
-(require web-server/templates
-         web-server/servlet
-         web-server/servlet-env)
-
-(define-struct post (title body comments))
-
-(define posts
-  (list 
-   (make-post
-    "(Y Y) Works: The Why of Y"
-    "..."
-    (list 
-     "First post! - A.T."
-     "Didn't I write this? - Matthias"))
-   (make-post
-    "Church and the States"
-    "As you may know, I grew up in DC, not technically a state..."
-    (list
-     "Finally, A Diet That Really Works! As Seen On TV"))))
-
-(define (template section body)
-  (list TEXT/HTML-MIME-TYPE
-        (include-template "blog.html")))
-
-(define (extract-post req)
-  (define title (extract-binding/single 'title (request-bindings req)))
-  (define body (extract-binding/single 'body (request-bindings req)))
-  (set! posts
-        (list* (make-post title body empty)
-               posts))
-  (send/suspend
-   (lambda (k-url)
-     (template "Posted" (include-template "blog-posted.html"))))
-  (display-posts))
-
-(define (display-posts)
-  (extract-post
-   (send/suspend
-    (lambda (k-url)
-      (template "Posts" (include-template "blog-posts.html"))))))
-
-(define (start req)
-  (display-posts))
-
-(serve/servlet start)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/diff.html b/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/diff.html
deleted file mode 100644
index c11dce5379..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/diff.html
+++ /dev/null
@@ -1,2 +0,0 @@
-This is the number: $(+ 2 40)
-This is not the number: @(+ 2 40)
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/if.html b/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/if.html
deleted file mode 100644
index df0af05025..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/if.html
+++ /dev/null
@@ -1,5 +0,0 @@
-@(if (@monkeys . > . @monkey-limit)
-     @list{<p>There are too many monkeys!</p>}
-     @(if (@monkeys . < . @monkey-minimum)
-             @list{<p>There aren't enough monkeys!</p>}
-             @list{<p>There are just enough monkeys!</p>}))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/run.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/run.rkt
deleted file mode 100644
index 801fdf5cb0..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/run.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang racket
-(require web-server/templates
-         rackunit)
-
-(include-template "static.html")
-
-(define (basic-template title clients client-surname client-firstname client-email)
-  (include-template "basic.html"))
-
-(basic-template "Title"
-                (list (list "First 1" "Second 1" "Third 1")
-                      (list "First 2" "Second 2" "Third 2")
-                      (list "First 3" "Second 3" "Third 3")
-                      (list "First 4" "Second 4" "Third 4"))
-                first second third)
-
-(local ()
-  (define-struct client (surname firstname email))
-  (basic-template "Title"
-                  (list (make-client "First 1" "Second 1" "Third 1")
-                        (make-client "First 2" "Second 2" "Third 2")
-                        (make-client "First 3" "Second 3" "Third 3")
-                        (make-client "First 4" "Second 4" "Third 4"))
-                  client-surname client-firstname client-email))
-
-(define (if-template #:monkeys monkeys
-                     #:monkey-limit monkey-limit
-                     #:monkey-minimum monkey-minimum)
-  (include-template "if.html"))
-
-(if-template #:monkeys 5
-             #:monkey-limit 10
-             #:monkey-minimum 2)
-(if-template #:monkeys 11
-             #:monkey-limit 10
-             #:monkey-minimum 2)
-(if-template #:monkeys 1
-             #:monkey-limit 10
-             #:monkey-minimum 2)
-
-(check-equal? (include-template #:command-char #\$ "diff.html")
-              "This is the number: 42\nThis is not the number: @(+ 2 40)")
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/static.html b/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/static.html
deleted file mode 100644
index b211384e7a..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/examples/static.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-  <head><title>Title</title></head>
-  <body>
-    <table>
-      <tr>
-        <td>Example, Mr.</td>
-        <td><a href="mailto:example@"@"foo.com">example@"@"foo.com</a></td>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/info.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/info.rkt
deleted file mode 100644
index c18e17042c..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/template/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-omit-paths '("examples"))
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/test-ssl.sh b/pkgs/web-server-pkgs/web-server-test/tests/web-server/test-ssl.sh
deleted file mode 100644
index 76b4d6400e..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/test-ssl.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-openssl genrsa -des3 -out private-key.pem 1024
-openssl rsa -in private-key.pem -out private-key.pem
-chmod 400 private-key.pem
-openssl req -new -x509 -nodes -sha1 -days 365 -key private-key.pem > server-cert.pem
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/test-tests.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/test-tests.rkt
deleted file mode 100644
index d4943b57bc..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/test-tests.rkt
+++ /dev/null
@@ -1,100 +0,0 @@
-#lang racket/base
-(require rackunit
-         racket/list
-         racket/match
-         xml/path
-         web-server/test
-         web-server/servlet-dispatch
-         net/url
-         racket/promise
-         web-server/http)
-
-(define (test-add-two-numbers -s>)
-  (define x (random 500))
-  (define xs (string->bytes/utf-8 (number->string x)))
-  (define y (random 500))
-  (define ys (string->bytes/utf-8 (number->string y)))
-
-  (match-define (cons h r0) (-s> #:headers? #t))
-  (define k0 (se-path* '(form #:action) r0))
-  (define i0 (se-path* '(form input #:name) r0))
-  (define r1 
-    (-s> (format "~a?~a=~a" k0 i0 xs)
-         (list (make-binding:form (string->bytes/utf-8 i0) xs))))
-  (define k1 (se-path* '(form #:action) r1))
-  (define i1 (se-path* '(form input #:name) r1))
-  (define r2 
-    (-s> (format "~a?~a=~a" k1 i1 ys)
-         (list (make-binding:form (string->bytes/utf-8 i1) ys))))
-  (define n (se-path* '(p) r2))
-  (check-equal? n
-                (format "The answer is ~a" (+ x y)))
-  
-  (let ()
-    (define r2 
-      (-s> (format "~a?~a=~a" k1 i1 ys)
-           (list (make-binding:form (string->bytes/utf-8 i1) ys))))
-    (check-equal? (se-path* '(html body p) r2)
-                  (format "The answer is ~a" (+ x y))))
-  
-  (let ()    
-    (define r2 
-      (-s> 
-       (make-request #"GET" (string->url (format "~a?~a=~a" k1 i1 ys)) empty
-                     (delay (list (make-binding:form (string->bytes/utf-8 i1) ys)))
-                     #"" "127.0.0.1" 80 "127.0.0.1")))
-    (define n (se-path* '(p) r2))
-    (check-equal? n
-                  (format "The answer is ~a" (+ x y)))))
-
-(require (prefix-in ex:add1: web-server/default-web-root/htdocs/servlets/examples/add)
-         (prefix-in ex:add2: web-server/default-web-root/htdocs/servlets/examples/add-v2)
-         (prefix-in ex:lang:add2: web-server/default-web-root/htdocs/lang-servlets/add02))
-(require (prefix-in ex:double: web-server/default-web-root/htdocs/servlets/examples/wc))
-
-(define (test-double-counters -s>)
-  (define (invoke u)
-    (define sx (-s> u))
-    (define ks (se-path*/list '(div div a #:href) sx))
-    (values (se-path*/list '(div div h3) sx)
-            (first ks)
-            (second ks)))
-  ; One add
-  (define-values (v0.0 0.0+1 0.0+2) (invoke ""))
-  (check-equal? v0.0 (list "0" "0"))
-  (define-values (v1.0 1.0+1 1.0+2) (invoke 0.0+1))
-  (check-equal? v1.0 (list "1" "0")) ; XXX infinite loop after this
-  (define-values (v0.1 0.1+1 0.1+2) (invoke 0.0+2))
-  (check-equal? v0.1 (list "0" "1"))
-  ; Two adds
-  (define-values (v2.0 2.0+1 2.0+2) (invoke 1.0+1))
-  (check-equal? v2.0 (list "2" "0"))
-  (define-values (v1.1 1.1+1 1.1+2) (invoke 0.1+1))
-  (check-equal? v1.1 (list "1" "1"))
-  (define-values (_v1.1 _1.1+1 _1.1+2) (invoke 1.0+2))
-  (check-equal? _v1.1 (list "1" "1"))
-  (define-values (v0.2 0.2+1 0.2+2) (invoke 0.1+2))
-  (check-equal? v0.2 (list "0" "2")))
-
-(define test-tests
-  (test-suite "Servlet testing tests"
-              (test-case "add1"
-                         (test-add-two-numbers 
-                          (make-servlet-tester ex:add1:start)))
-              (test-case "add2"
-                         (test-add-two-numbers 
-                          (make-servlet-tester ex:add2:start)))
-              (test-case "lang add2"
-                         (test-add-two-numbers 
-                          (make-dispatcher-tester 
-                           (dispatch/servlet ex:lang:add2:start #:stateless? #t))))
-              (test-case "double-counters"
-                         (test-double-counters
-                          (make-servlet-tester ex:double:start)))))
-(provide test-tests)
-
-(module+ test
-  (require rackunit/text-ui)
-  (run-tests test-tests))
-
-
diff --git a/pkgs/web-server-pkgs/web-server-test/tests/web-server/util.rkt b/pkgs/web-server-pkgs/web-server-test/tests/web-server/util.rkt
deleted file mode 100644
index d92ae2f19e..0000000000
--- a/pkgs/web-server-pkgs/web-server-test/tests/web-server/util.rkt
+++ /dev/null
@@ -1,103 +0,0 @@
-#lang racket
-(require (for-syntax racket/base)
-         web-server/private/connection-manager
-         web-server/http
-         web-server/private/web-server-structs
-         net/url
-         mzlib/pretty
-         mzlib/list
-         xml
-         tests/eli-tester
-         web-server/private/timer)
-(provide make-module-eval
-         make-eval/mod-path
-         make-mock-connection
-         redact
-         collect
-         htxml
-         call
-         bytes-sort)
-
-(require xml/path)
-(provide (rename-out
-          [se-path* simple-xpath*]
-          [se-path*/list simple-xpath*/list]))
-
-(define (bytes-sort bs)
-  (sort
-   (with-input-from-bytes bs
-     (λ () (port->bytes-lines #:line-mode 'return-linefeed)))
-   bytes<?))
-
-(define (call d u bs)
-  (htxml (collect d (make-request #"GET" (string->url u) empty (delay bs) #"" "127.0.0.1" 80 "127.0.0.1"))))
-(define (htxml bs)
-  (match (regexp-match #"^.+\r\n\r\n(.*)$" bs)
-    [(list _ #"")
-     ""]
-    [(list _ s)
-     (string->xexpr (bytes->string/utf-8 s))]
-    [_
-     (error 'html "Given ~S\n" bs)]))
-
-; This causes errors because s/s/d tries to jump the barrier, but I have no idea why
-(define (collect d req)
-  (define-values (c i o) (make-mock-connection #""))
-  (parameterize ([current-server-custodian (make-custodian)])
-    (call-with-continuation-barrier
-     (lambda ()
-       (d c req))))
-  (redact (get-output-bytes o)))
-
-(define (make-mock-connection ib)
-  (define ip (open-input-bytes ib))
-  (define op (open-output-bytes))
-  (define tm (start-timer-manager))
-  (values (make-connection 0 (make-timer tm never-evt +inf.0 (lambda () (void)))
-                           ip op (make-custodian) #t)
-          ip
-          op))
-
-(define (redact b)
-  (regexp-replace
-   #"Connection: close\r\n"
-   (regexp-replace 
-    #"Date: [a-zA-Z0-9:, ]+ GMT\r\n"
-    (regexp-replace
-     #"Last-Modified: [a-zA-Z0-9:, ]+ GMT\r\n"
-     b
-     #"Last-Modified: REDACTED GMT\r\n")
-    #"Date: REDACTED GMT\r\n")
-   #""))
-
-(define-syntax (make-module-eval m-expr)
-  (syntax-case m-expr (module)
-    [(_ (module m-id . rest))
-     #'(let ([ns (make-base-empty-namespace)])
-         (parameterize ([current-namespace ns])
-           (namespace-require 'racket/base)
-           (namespace-require 'web-server/http)
-           (namespace-require 'web-server/lang/abort-resume)
-           (namespace-require 'mzlib/serialize)
-           (eval '(module m-id . rest))
-           (eval '(require 'm-id)))
-         
-         (lambda (s-expr)
-           (parameterize ([current-namespace ns]
-                          [current-output-port (open-output-nowhere)])
-             (eval s-expr))))]
-    [else
-     (raise-syntax-error #f "make-module-evel: dropped through" m-expr)]))
-
-(define (make-eval/mod-path pth)
-  (let ([ns (make-base-empty-namespace)])
-    (parameterize ([current-namespace ns])
-      (namespace-require 'racket/base)
-      (namespace-require 'web-server/http)
-      (namespace-require 'web-server/lang/abort-resume)
-      (namespace-require 'mzlib/serialize)
-      (namespace-require pth))
-    (lambda (expr)
-      (parameterize ([current-namespace ns]
-                     [current-output-port (open-output-nowhere)])
-        (eval expr)))))
diff --git a/pkgs/web-server-pkgs/web-server/LICENSE.txt b/pkgs/web-server-pkgs/web-server/LICENSE.txt
deleted file mode 100644
index 49b14715fa..0000000000
--- a/pkgs/web-server-pkgs/web-server/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-web-server
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/web-server-pkgs/web-server/info.rkt b/pkgs/web-server-pkgs/web-server/info.rkt
deleted file mode 100644
index 3f2a886090..0000000000
--- a/pkgs/web-server-pkgs/web-server/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("web-server-lib"
-               "web-server-doc"))
-(define implies '("web-server-lib"
-                  "web-server-doc"))
-
-(define pkg-desc "An HTTP server")
-
-(define pkg-authors '(jay))
diff --git a/pkgs/wxme-pkgs/wxme-lib/LICENSE.txt b/pkgs/wxme-pkgs/wxme-lib/LICENSE.txt
deleted file mode 100644
index cc32538e37..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-wxme-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/wxme-pkgs/wxme-lib/info.rkt b/pkgs/wxme-pkgs/wxme-lib/info.rkt
deleted file mode 100644
index 722e5cd31f..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("scheme-lib"
-               "base"
-               "compatibility-lib"
-               "snip-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"wxme\"")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/cache-image.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/cache-image.rkt
deleted file mode 100644
index 1ae1e31d3e..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/cache-image.rkt
+++ /dev/null
@@ -1,36 +0,0 @@
-(module cache-image mzscheme
-  (require mzlib/class
-           "wxme.rkt")
-
-  (provide reader
-           cache-image%)
-
-  (define cache-image%
-    (class object%
-      (init-field argb width height pin-x pin-y)
-      
-      (define (get-argb) argb)
-      (define (get-width) width)
-      (define (get-height) height)
-      (define (get-pin-x) pin-x)
-      (define (get-pin-y) pin-y)
-      
-      (super-new)))
-
-  (define reader
-    (new
-     (class* object% (snip-reader<%>)
-       (define/public (read-header vers stream)
-         (void))
-       (define/public (read-snip text? cvers stream)
-         (let ([content (send stream read-bytes "content")])
-           (if text?
-               #"."
-               (let ([l (read (open-input-bytes content))])
-                 (make-object cache-image% 
-                              (car l)
-                              (cadr l)
-                              (/ (vector-length (car l)) (cadr l) 4)
-                              (caddr l)
-                              (cadddr l))))))
-       (super-new)))))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/comment.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/comment.rkt
deleted file mode 100644
index d72ff94ed2..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/comment.rkt
+++ /dev/null
@@ -1,23 +0,0 @@
-(module comment mzscheme
-  (require mzlib/class
-           mzlib/string
-           "wxme.rkt"
-           "private/readable-editor.rkt")
-
-  (provide reader
-           comment-editor%)
-
-  (define comment-editor% (class readable-editor% (super-new)))
-
-  (define reader
-    (new (class* editor-reader% (snip-reader<%>)
-           (inherit read-editor-snip)
-           (define/override (read-snip text? vers stream)
-             (let ([s (read-editor-snip text? vers stream #f comment-editor%)])
-               (if text?
-                   (apply bytes-append
-                          (map (lambda (s)
-                                 (bytes-append #"; " s #"\n"))
-                               (regexp-split #rx#"\n" s)))
-                   s)))
-           (super-new)))))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/editor.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/editor.rkt
deleted file mode 100644
index c6675e9140..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/editor.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-(module editor mzscheme
-  (require mzlib/class
-           "private/class-help.rkt")
-
-  (provide editor%)
-
-  (define editor%
-    (class object%
-      (init-accessible content-port)
-      (super-new))))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/image.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/image.rkt
deleted file mode 100644
index 241de1ee67..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/image.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-#lang racket/base
-(require racket/class
-         racket/snip
-         "private/class-help.rkt")
-
-(provide image%)
-
-#|
-
-This code is a bit strange in order to attempt to
-preserve backwards compatibility with pre-5.1 versions.
-
-The old version is:
-
-  (define image%
-    (class object%
-      (init-accessible filename data w h dx dy)
-      (super-new))))
-
-The things I attempted to preserve:
-
- - image% as a class whose objects can be tested with is-a?
-
- - the get-* methods that init-accessible provides; with the exception
-   of get-filename, which is now the image-snip% method, these are done
-   still with init-accessible
-
-   The get-filename method changed, tho: it now returns a path (it returned
-   bytes before)
-
- - the constructor arity (there are now additional optional arguments that
-   wxme supplies to be able to call super-make-object)
-
-The main change is to make this file depend on racket/snip so that
-image% can be a subclass of image-snip% and thus work with things like
-the 2htdp/universe libraries (in executables)
-
-
-|#
-
-(define image%
-  (class image-snip%
-    (init filename)
-    (init-accessible data w h dx dy)
-    (init [relative 1] [type 'unknown])
-    ;; the call to super-make-object is intended to mimic the way that racket/snip/private/snip.rkt
-    ;; creates an image-snip% object in the image-snip-class% class's read method
-    (let ([data (get-data)])
-      (super-make-object
-       (if data
-           (let-values ([(in out) (make-pipe)])
-             (thread (λ () (display data out) (close-output-port out)))
-             in)
-           (if (bytes? filename)
-               (bytes->path filename)
-               #f))
-       (if data 'unknown/alpha type)
-       (positive? relative) 
-       (and data #t)))
-    (inherit resize set-offset)
-    (resize (get-w) (get-h))
-    (set-offset (get-dx) (get-dy))))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/info.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/info.rkt
deleted file mode 100644
index b3e92a29a6..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define test-responsibles '(("xml.rkt" jay)))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/main.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/main.rkt
deleted file mode 100644
index 44908f0a8f..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang scheme/base
-
-(require "wxme.rkt")
-(provide (all-from-out "wxme.rkt"))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/number.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/number.rkt
deleted file mode 100644
index b59ffde335..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/number.rkt
+++ /dev/null
@@ -1,20 +0,0 @@
-(module number mzscheme
-  (require mzlib/class
-           "wxme.rkt")
-
-  (provide reader)
-
-  (define reader
-    (new
-     (class* object% (snip-reader<%>)
-       (define/public (read-header vers stream)
-         (void))
-       (define/public (read-snip text? cvers stream)
-         (let ([number (send stream read-bytes "number")]
-               [decimal-prefix (send stream read-bytes "decimal prefix")]
-               [fraction-bytes (send stream read-bytes "fraction")]
-               [expansions (send stream read-bytes "expansions")])
-           (if text?
-               number
-               (string->number (bytes->string/latin-1 number)))))
-       (super-new)))))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/private/class-help.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/private/class-help.rkt
deleted file mode 100644
index c2cba0bba8..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/private/class-help.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-(module class-help mzscheme
-  (require mzlib/class)
-
-  (provide init-accessible)
-
-  ;; like `init-field', but makes a `get-' public method
-  ;;  instead of a public field
-  (define-syntax (init-accessible stx)
-    (syntax-case stx ()
-      [(_ id)
-       (identifier? #'id)
-       #'(init-accessible [id])]
-      [(_ [id . val])
-       (with-syntax ([get-id (datum->syntax-object
-                              #'id
-                              (string->symbol (format "get-~a" (syntax-e #'id)))
-                              #'id)])
-         #'(begin
-             (init [(internal-id id) . val])
-             (define private-id internal-id)
-             (define/public (get-id) private-id)))]
-      [(_ binding ...)
-       #'(begin (init-accessible binding) ...)])))
-
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/private/compat.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/private/compat.rkt
deleted file mode 100644
index f16f7ed98f..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/private/compat.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-(module compat mzscheme
-  (provide register-compatibility-mappings!)
-  
-  (define (register-compatibility-mappings! register-lib-mapping!)
-    (register-lib-mapping!
-     "(lib \"comment-snip.ss\" \"framework\")"
-     '(lib "comment.ss" "wxme"))
-
-    (register-lib-mapping!
-     "drscheme:number"
-     '(lib "number.ss" "wxme"))
-    (register-lib-mapping!
-     "(lib \"number-snip.ss\" \"drscheme\" \"private\")"
-     '(lib "number.ss" "wxme"))
-
-    (register-lib-mapping!
-     "drscheme:xml-snip"
-     '(lib "xml.ss" "wxme"))
-    (register-lib-mapping!
-     "(lib \"xml-snipclass.ss\" \"xml\")"
-     '(lib "xml.ss" "wxme"))
-
-    (register-lib-mapping!
-     "drscheme:scheme-snip"
-     '(lib "scheme.ss" "wxme"))
-    (register-lib-mapping!
-     "(lib \"scheme-snipclass.ss\" \"xml\")"
-     '(lib "scheme.ss" "wxme"))
-
-    (register-lib-mapping!
-     "text-box%"
-     '(lib "text.ss" "wxme"))
-    (register-lib-mapping!
-     "(lib \"text-snipclass.ss\" \"xml\")"
-     '(lib "text.ss" "wxme"))
-
-    (register-lib-mapping!
-     "(lib \"cache-image-snip.ss\" \"mrlib\")"
-     '(lib "cache-image.ss" "wxme"))
-    
-    (register-lib-mapping!
-     "(lib \"image-core.ss\" \"mrlib\")"
-     '(lib "image-core-wxme.rkt" "wxme"))
-
-    (register-lib-mapping!
-     "test-case-box%"
-     '(lib "test-case.ss" "wxme"))))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/private/readable-editor.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/private/readable-editor.rkt
deleted file mode 100644
index d5673e0dad..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/private/readable-editor.rkt
+++ /dev/null
@@ -1,39 +0,0 @@
-(module readable-editor mzscheme
-  (require mzlib/class
-           mzlib/struct
-           "../wxme.rkt"
-           "../editor.rkt")
-
-  (provide readable-editor%
-           editor-reader%)
-
-  (define readable-editor%
-    (class* editor% (readable<%>)
-      (init content reader data)
-      (define the-reader reader)
-      (define the-data data)
-
-      (define/public (read-special src line col pos)
-        (send the-reader generate-special this src line col pos))
-
-      (define/public (get-data)
-        the-data)
-
-      (super-make-object content)))
-
-  (define editor-reader%
-    (class* object% (snip-reader<%>)
-      (define/public (read-header vers stream)
-        (void))
-      (define/public (read-editor-snip text? vers stream data %)
-        (let ([s (send stream read-editor-snip "box content")])
-          (if text?
-              s
-              (make-object % s this data))))
-      (define/public (read-snip text? vers stream)
-        (read-editor-snip text? vers stream #f readable-editor%))
-
-      (define/public (generate-special editor src line col pos)
-        (make-special-comment editor))
-      
-      (super-new))))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/read.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/read.rkt
deleted file mode 100644
index 288d39d096..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/read.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-(module read mzscheme
-  (require "wxme.rkt")
-
-  (provide (rename wxme-read read)
-           (rename wxme-read-syntax read-syntax)))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/scheme.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/scheme.rkt
deleted file mode 100644
index ddc264a0cd..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/scheme.rkt
+++ /dev/null
@@ -1,26 +0,0 @@
-(module scheme mzscheme
-  (require mzlib/class
-           "wxme.rkt"
-           "editor.rkt"
-           "private/readable-editor.rkt")
-
-  (provide reader 
-           scheme-editor%)
-
-  (define scheme-editor% (class readable-editor% (super-new)))
-
-  (define reader
-    (new
-     (class editor-reader%
-       (inherit read-editor-snip)
-       (define/override (read-snip text? vers stream)
-         (let ([splice? (zero? (send stream read-integer "splice?"))])
-           (read-editor-snip text? vers stream splice? scheme-editor%)))
-
-       (define/override (generate-special editor src line col pos)
-         (list (if (send editor get-data)
-                   'unquote-splicing
-                   'unquote)
-               (read (send editor get-content-port))))
-
-       (super-new)))))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/test-case.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/test-case.rkt
deleted file mode 100644
index 441cc1e6a5..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/test-case.rkt
+++ /dev/null
@@ -1,62 +0,0 @@
-(module test-case mzscheme
-  (require mzlib/class
-           "wxme.rkt"
-           "private/class-help.rkt")
-
-  (provide reader
-           test-case%)
-
-  (define test-case%
-    (class object%
-      (init-accessible test
-                       expected
-                       [comment #f]
-                       [predicate #f]
-                       [should-raise #f]
-                       [error-message #f]
-                       [enabled? #t]
-                       [collapsed? #f]
-                       [error-box? #f])
-      (super-new)))
-
-  (define (concat port)
-    (if port
-        (let loop ([accum null])
-          (let ([s (read-bytes 4096 port)])
-            (if (eof-object? s)
-                (apply bytes-append (reverse accum))
-                (loop (cons s accum)))))
-        #""))
-
-  (define reader
-    (new
-     (class* object% (snip-reader<%>)
-       (define/public (read-header vers stream)
-         (void))
-       (define/public (read-snip text? cvers stream)
-         (let ([v (cond
-                   [(= cvers 1)
-                    (new test-case% 
-                         [comment (send stream read-editor-snip "test-case-box content")] 
-                         [test (send stream read-editor-snip "test-case-box test")]
-                         [expected (send stream read-editor-snip "test-case-box expected")])]
-                   [else
-                    (new test-case% 
-                         [test (send stream read-editor-snip "test-case-box test")]
-                         [expected (send stream read-editor-snip "test-case-box expected")]
-                         [predicate (send stream read-editor-snip "test-case-box predicate")]
-                         [should-raise (send stream read-editor-snip "test-case-box should-raise")]
-                         [error-message (send stream read-editor-snip "test-case-box error-message")]
-                         [enabled? (= 1 (send stream read-integer "test-case-box enabled?"))]
-                         [collapsed? (= 1 (send stream read-integer "test-case-box collapsed?"))]
-                         [error-box? (= 1 (send stream read-integer "test-case-box error-box?"))])])])
-           (if text?
-               (bytes-append
-                (or (send v get-comment) #"")
-                (or (send v get-test) #"")
-                (or (send v get-expected) #"")
-                (or (send v get-predicate) #"")
-                (or (send v get-should-raise) #"")
-                (or (send v get-error-message) #""))
-               v)))
-       (super-new)))))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/text.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/text.rkt
deleted file mode 100644
index cd751f3462..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/text.rkt
+++ /dev/null
@@ -1,24 +0,0 @@
-(module text mzscheme
-  (require mzlib/class
-           "wxme.rkt"
-           "editor.rkt"
-           "private/readable-editor.rkt")
-
-  (provide reader
-           text-editor%)
-
-  (define text-editor% (class readable-editor% (super-new)))
-
-  (define reader
-    (new (class editor-reader%
-           (inherit read-editor-snip)
-           (define/override (read-snip text? vers stream)
-             (read-editor-snip text? vers stream #f text-editor%))
-           (define/override (generate-special editor src line col pos)
-             (let ([port (send editor get-content-port)]) 
-               (let loop ([accum null])
-                 (let ([s (read-bytes 4096 port)])
-                   (if (eof-object? s)
-                       (bytes->string/utf-8 (apply bytes-append (reverse accum)))
-                       (loop (cons s accum)))))))
-           (super-new)))))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/wxme.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/wxme.rkt
deleted file mode 100644
index cdcf08a01a..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/wxme.rkt
+++ /dev/null
@@ -1,753 +0,0 @@
-(module wxme mzscheme
-  (require mzlib/port
-           mzlib/string
-           mzlib/kw
-           racket/class
-           racket/contract
-           mzlib/list
-           scheme/gui/dynamic
-           syntax/modread
-           (only racket/snip/private/snip int->img-type)
-           "image.rkt"
-           "editor.rkt"
-           "private/compat.rkt")
-
-  (define (decode who port snip-filter close? skip-content?)
-    (expect #rx#"^WXME" port who "does not start with \"WXME\"")
-    (expect #rx#"^01" port who "unrecognized format (not \"01\")")
-    (let ([vers (string->number
-                 (bytes->string/latin-1
-                  (expect #rx#"^0[1-8]" port who "unrecognized version")))])
-      (unless (vers . < . 4)
-        (expect #rx#"^ ##[ \r\n]" port who "missing \" ## \" tag in the expected place"))
-      (let ([header (read-header who port vers snip-filter skip-content?)])
-        (let ([port (port->decoded-port who port vers header close?)])
-          (if skip-content?
-              (extract-used header port)
-              port)))))
-  
-  (define (expect rx port who msg)
-    (let ([m (regexp-match rx port)])
-      (unless m
-        (error who "bad WXME stream; ~a" msg))
-      (car m)))
-
-  (define (extract-used header port)
-    (let loop ()
-      (unless (eof-object? (read-byte-or-special port))
-        (loop)))
-    (values
-     (filter values (map (lambda (c)
-                           (and (snip-class-used? c)
-                                (bytes->string/latin-1 (snip-class-name c))))
-                         (vector->list (header-classes header))))
-     (filter values (map (lambda (c)
-                           (and (data-class-used? c)
-                                (bytes->string/latin-1 (data-class-name c))))
-                         (vector->list (header-data-classes header))))))
-
-  ;; ----------------------------------------
-  
-  (define-struct header (classes data-classes styles snip-filter skip-unknown? snips-to-go stream skip-content?))
-  (define (header-plain-text? h)
-    (not (header-snip-filter h)))
-
-  (define (read-header who port vers snip-filter skip-content?)
-    (let* ([classes (read-snip-class-list who port vers)]
-           [data-classes (read-data-class-list who port vers)]
-           [header (make-header classes 
-                                data-classes
-                                (make-hash-table) 
-                                snip-filter 
-                                (unknown-extensions-skip-enabled)
-                                0
-                                #f
-                                skip-content?)])
-      (set-header-stream! header (make-object stream% who port vers header))
-      (let ([cnt (read-editor who port vers header)])
-        (set-header-snips-to-go! header cnt))
-      header))
-
-  (define (read-editor who port vers header)
-    (discard-headers/footers who port vers)
-    (read-styles who port vers (header-styles header))
-    (read-class-headers who port vers header)
-    (read-integer who port vers "snip count"))
-
-  (define (read-editor-footers who port vers header)
-    (discard-headers/footers who port vers))
-
-  (define (read-editor-snip who port vers header)
-    (let ([cnt (read-editor who port vers header)])
-      (let loop ([cnt cnt][accum null])
-        (if (zero? cnt)
-            (begin
-              (read-editor-footers who port vers header)
-              (if (header-plain-text? header)
-                  (apply bytes-append (reverse accum))
-                  (snip-results->port 'nested-editor
-                                      (let ([results (reverse accum)])
-                                        (lambda ()
-                                          (and (pair? results)
-                                               (begin0
-                                                (car results)
-                                                (set! results (cdr results))))))
-                                      void)))
-            (loop (sub1 cnt)
-                  (cons (read-snip who port vers header)
-                        accum))))))
-
-  (define-struct snip-class (name version required? manager used?))
-
-  (define (read-snip-class-list who port vers)
-    (let ([cnt (read-integer who port vers "snip-class count")])
-      (list->vector
-       (let loop ([i 0])
-         (if (= i cnt)
-             null
-             (cons
-              (let ([name (read-a-string who port vers "snip-class name")])
-                (make-snip-class name
-                                 (read-integer who port vers "snip-class version")
-                                 (begin (read-integer who port vers "snip-class required?")
-                                        ;; required? value isn't actually used; only a few
-                                        ;;  built-in classes are required
-                                        (member name '(#"wxtext" #"wxtab" #"wxmedia")))
-                                 #f
-                                 #f))
-              (loop (add1 i))))))))
-
-  (define-struct data-class (name required? manager used?))
-
-  (define (read-data-class-list who port vers)
-    (let ([cnt (read-integer who port vers "data-class count")])
-      (list->vector
-       (let loop ([i 0])
-         (if (= i cnt)
-             null
-             (cons
-              (let ([name (read-a-string who port vers "data-class name")])
-                (make-data-class name
-                                 (equal? name #"wxloc")
-                                 #f
-                                 #f))
-              (loop (add1 i))))))))
-
-  (define (discard-headers/footers who port vers)
-    (let ([cnt (read-fixed-integer who port vers "header/footer extension count")])
-      (let loop ([i 0])
-        (unless (= i cnt)
-          (let ([len (read-fixed-integer who port vers "header/footer extension length")])
-            (skip-data port vers len)
-            (loop (add1 i)))))))
-
-  (define (read-styles who port vers styles)
-    (let ([id (read-integer who port vers "style-list id")])
-      (hash-table-get styles id
-                      (lambda ()
-                        (let ([cnt (read-integer who port vers "style count")])
-                          (let loop ([i 1])
-                            (unless (= i cnt)
-                              (unless ((read-integer who port vers "base-style id") . < . i)
-                                (read-error who "integer less than current index" "base-style id" port))
-                              (read-a-string who port vers "style name")
-                              (if (zero? (read-integer who port vers "style is-join?"))
-                                  (begin
-                                    (read-integer who port vers "style family")
-                                    (read-a-string who port vers "style face")
-                                    (read-inexact who port vers "style size multiply")
-                                    (read-integer who port vers "style size addition")
-                                    (read-integer who port vers "style weight on")
-                                    (read-integer who port vers "style weight off")
-                                    (read-integer who port vers "style slant on")
-                                    (read-integer who port vers "style slant off")
-                                    (unless (vers . < . 5)
-                                      (read-integer who port vers "style smoothing on")
-                                      (read-integer who port vers "style smoothing off"))
-                                    (read-integer who port vers "style underlined on")
-                                    (read-integer who port vers "style underlined off")
-                                    (unless (vers . < . 6)
-                                      (read-integer who port vers "style size-in-pixels on")
-                                      (read-integer who port vers "style size-in-pixels off"))
-                                    (unless (vers . < . 3)
-                                      (read-integer who port vers "style transparent on")
-                                      (read-integer who port vers "style transparent off"))
-                                    (read-inexact who port vers "style foreground multiply red")
-                                    (read-inexact who port vers "style foreground multiply green")
-                                    (read-inexact who port vers "style foreground multiply blue")
-                                    (read-inexact who port vers "style background multiply red")
-                                    (read-inexact who port vers "style background multiply green")
-                                    (read-inexact who port vers "style background multiply blue")
-                                    (read-integer who port vers "style foreground addition red")
-                                    (read-integer who port vers "style foreground addition green")
-                                    (read-integer who port vers "style foreground addition blue")
-                                    (read-integer who port vers "style background addition red")
-                                    (read-integer who port vers "style background addition green")
-                                    (read-integer who port vers "style background addition blue")
-                                    (read-integer who port vers "style alignment on")
-                                    (read-integer who port vers "style alignment off"))
-                                  (unless ((read-integer who port vers "shift-style id") . < . i)
-                                    (read-error who "integer less than current index" "shift-style id" port)))
-                              (loop (add1 i)))))
-                        (hash-table-put! styles id id)))))
-
-  (define (read-class-headers who port vers header)
-    (let ([cnt (read-fixed-integer who port vers "class-header count")])
-      (let loop ([i 0])
-        (unless (= i cnt)
-          (let ([pos (read-integer who port vers "class-header class index")]
-                [len (read-fixed-integer who port vers "class-header length")])
-            (let ([class (find-class pos header who port vers #f)])
-              (if (and class
-                       (object? (snip-class-manager class)))
-                  (send (snip-class-manager class) read-header (snip-class-version class) (header-stream header))
-                  (skip-data port vers len)))
-            (loop (add1 i)))))))
-
-  (define (read-snip who port vers header)
-    (let ([pos (read-integer who port vers "snip class index")])
-      (let ([class (find-class pos header who port vers #t)])
-        (let ([len (and (or (not class)
-                            (not (snip-class-required? class)))
-                        (read-fixed-integer who port vers "snip length"))])
-          (if (and class
-                   (snip-class-manager class)
-                   (not (and len
-                             (header-skip-content? header))))
-              (let ([style (read-integer who port vers "snip style index")])
-                (read-snip/given-class class who port vers header #f))
-              (begin
-                (skip-data port vers len)
-                #""))))))
-  
-  (define (read-snip/given-class class who port vers header skip-buffer-data?)
-    (let ([cvers (snip-class-version class)])
-      (define manager (snip-class-manager class))
-      (define name (snip-class-name class))
-      (let ([s (if (procedure? manager)
-                   ;; Built-in snip class:
-                   (manager who port vers cvers header)
-                   ;; Extension snip class:
-                   (let* ([text? (header-plain-text? header)]
-                          [s (send manager read-snip
-                                   text?
-                                   cvers
-                                   (header-stream header))])
-                     (if (and text?
-                              (not (bytes? s)))
-                         (error 'read-snip 
-                                "reader for ~a in text-only mode produced something other than bytes: ~e"
-                                name
-                                s)
-                         s)))])
-        (unless skip-buffer-data? (read-buffer-data who port vers header))
-        (if (header-skip-content? header)
-            #""
-            (if (bytes? s)
-                ;; Return bytes for the stream:
-                s
-                ;; Filter the non-bytes result, and then wrap it as
-                ;;  a special stream result:
-                (let ([s ((header-snip-filter header) s)])
-                  (lambda (src line col pos)
-                    (if (s . is-a? . readable<%>)
-                        (send s read-special src line col pos)
-                        s))))))))
-
-  (define (read-buffer-data who port vers header)
-    (let loop ()
-      (let ([pos (read-integer who port vers "data-class index")])
-        (unless (zero? pos)
-          (let ([data-class (find-data-class pos header who port vers #t)])
-            (let ([len (and (or (not data-class)
-                                (not (data-class-required? data-class)))
-                            (read-fixed-integer who port vers "data length"))])
-              (if data-class
-                  ((data-class-manager data-class) who port vers header)
-                  (skip-data port vers len))))
-          (loop)))))
-
-  ;; ----------------------------------------
-
-  (define (read-raw-string who port vers what)
-    (let ([v (cond
-              [(vers . >= . 8) (plain-read port)]
-              [else (read-integer who port vers what)])])
-      (unless (and (integer? v)
-                   (exact? v)
-                   (v . >= . 0))
-        (read-error who "non-negative exact integer for string length" what port))
-      (let ([s (cond
-                [(vers . >= . 8) (plain-read port)]
-                [else (read-bytes v port)])])
-        (cond
-         [(bytes? s) 
-          (unless (= (bytes-length s) v)
-            (read-error who "byte string whose length matches an integer count" what port))
-          s]
-         [(and (list? s)
-               (andmap bytes? s))
-          (let ([s (apply bytes-append s)])
-            (unless (= (bytes-length s) v)
-              (read-error who "list of byte strings whose total length matches an integer count" what port))
-            s)]
-         [else
-          (read-error who "byte string or byte-string list" what port)]))))
-
-  (define (read-a-string who port vers what)
-    (let ([s (read-raw-string who port vers what)])
-      (let ([len (bytes-length s)])
-        (when (zero? len)
-          (read-error who "non-empty raw string" what port))
-        (subbytes s 0 (sub1 len)))))
-
-  (define (read-integer who port vers what)
-    (cond
-     [(vers . >= . 8)
-      (let ([v (plain-read port)])
-        (unless (and (integer? v)
-                     (exact? v)
-                     (<= (- (expt 2 31)) v (expt 2 31)))
-          (read-error who "exact integer between [-2^31,2^31]" what port))
-        v)]
-     [else
-      (let ([b (read-byte port)])
-        (cond
-         [(not (zero? (bitwise-and b #x80)))
-          (cond
-           [(not (zero? (bitwise-and b #x40)))
-            (cond
-             [(bitwise-and b #x01)
-              (let ([b (read-byte port)])
-                ;; convert to signed:
-                (if (b . > . 127)
-                    (- b 256)
-                    b))]
-             [(not (zero? (bitwise-and b #x02)))
-              (integer-bytes->integer (read-bytes 2 port) #t #t)]
-             [else
-              (integer-bytes->integer (read-bytes 4 port) #t #t)])]
-           [else
-            (bitwise-ior (arithmetic-shift (bitwise-and #x3F b) 8)
-                         (read-byte port))])]
-         [else b]))]))
-
-  (define (read-fixed-integer who port vers what)
-    (cond
-     [(vers . >= . 8)
-      (read-integer who port vers what)]
-     [else
-      (integer-bytes->integer (read-bytes 4 port)
-                              #t
-                              (if (vers . > . 1)
-                                  #t
-                                  (broken-wxme-big-endian?)))]))
-      
-  (define (read-inexact who port vers what)
-    (cond
-     [(vers . >= . 8)
-      (let ([v (plain-read port)])
-        (unless (and (number? v)
-                     (real? v))
-          (read-error who "real number" what port))
-        v)]
-     [else
-      (floating-point-bytes->real (read-bytes 8 port)
-                                  (if (vers . > . 1)
-                                      #t
-                                      (broken-wxme-big-endian?)))]))
-      
-
-  (define (read-error who expected what port)
-    (error who "WXME format problem while reading for ~a (expected ~a) from port: ~e around position: ~a"
-           what expected port
-           (file-position port)))
-
-  (define (skip-data port vers len)
-    (if (vers . >= . 8)
-        (let loop ([len len])
-          (unless (zero? len)
-            (plain-read port)
-            (loop (sub1 len))))
-        (read-bytes len port)))
-
-  ;; ----------------------------------------
-
-  (define snip-reader<%>
-    (interface ()
-      read-header
-      read-snip))
-  
-  (define readable<%>
-    (interface ()
-      read-special))
-  
-  (define (find-class/name name header who port vers used?)
-    (define classes-vec (header-classes header))
-    (define pos 
-      (let loop ([i 0])
-        (cond
-          [(< i (vector-length classes-vec))
-           (if (equal? (bytes->string/latin-1 (snip-class-name (vector-ref classes-vec i)))
-                       name)
-               i
-               (loop (+ i 1)))]
-          [else #f])))
-    (unless pos
-      (read-error who (format "class index for ~s" name) "known class name" port))
-    (find-class pos header who port vers used?))
-  
-  (define (find-class pos header who port vers used?)
-    (define classes (header-classes header))
-    (unless (< -1 pos (vector-length classes))
-      (read-error who "integer less than class-list length" "class index" port))
-    (let ([class (vector-ref classes pos)])
-      (when used?
-        (set-snip-class-used?! class #t))
-      (unless (snip-class-manager class)
-        (set-snip-class-manager!
-         class
-         (let ([name (snip-class-name class)])
-           (cond
-            [(member name '(#"wxtext" #"wxtab"))
-             (lambda (who port vers cvers header)
-               (read-integer who port vers "string-snip flags")
-               (let ([s (read-raw-string who port vers "string-snip content")])
-                 (cond
-                  [(= cvers 1) (string->bytes/utf-8 (bytes->string/latin-1 s))]
-                  [(= cvers 2)
-                   ;; UTF-32!
-                   (unless (zero? (remainder (bytes-length s) 4))
-                     (read-error who "size of read byte string is not a multiple of 4" "string-snip content" port))
-                   (let loop ([pos 0][accum null])
-                     (if (= pos (bytes-length s))
-                         (begin
-                           (string->bytes/utf-8 (apply string (reverse accum))))
-                         (loop (+ pos 4)
-                               (cons (integer->char
-                                      (let ([v (integer-bytes->integer (subbytes s pos (+ pos 4)) #f
-                                                                       (broken-wxme-big-endian?))])
-                                        (unless (or (<= 0 v #xD7FF)
-                                                    (<= #xE000 v #x10FFFF))
-                                          (read-error who "UTF-32 character; probably an endian order mismatch" 
-                                                      "string-snip content" port))
-                                        v))
-                                     accum))))]
-                  [(cvers . > . 2) s])))]
-            [(equal? name #"wxmedia")
-             (lambda (who port vers cvers header)
-               (read-integer who port vers "nested-editor type")
-               (read-integer who port vers "nested-editor border")
-               (read-integer who port vers "nested-editor left margin")
-               (read-integer who port vers "nested-editor top margin")
-               (read-integer who port vers "nested-editor right margin")
-               (read-integer who port vers "nested-editor bottom margin")
-               (read-integer who port vers "nested-editor left inset")
-               (read-integer who port vers "nested-editor top inset")
-               (read-integer who port vers "nested-editor right inset")
-               (read-integer who port vers "nested-editor bottom inset")
-               (read-inexact who port vers "nested-editor min width")
-               (read-inexact who port vers "nested-editor max width")
-               (read-inexact who port vers "nested-editor min height")
-               (read-inexact who port vers "nested-editor max height")
-               (when (cvers . > . 1)
-                 (read-integer who port vers "nested-editor tight-fit?"))
-               (when (cvers . > . 2)
-                 (read-integer who port vers "nested-editor alignment"))
-               (when (cvers . > . 3)
-                 (read-integer who port vers "use background color"))
-               (let ([n (read-editor-snip who port vers header)])
-                 (if (header-plain-text? header)
-                     n
-                     (make-object editor% n))))]
-            [(equal? name #"wximage")
-             (lambda (who port vers cvers header)
-               (let ([filename (read-a-string who port vers "image-snip filename")]
-                     [type (read-integer who port vers "image-snip type")]
-                     [w (read-inexact who port vers "image-snip width")]
-                     [h (read-inexact who port vers "image-snip height")]
-                     [dx (read-inexact who port vers "image-snip x-offset")]
-                     [dy (read-inexact who port vers "image-snip y-offset")]
-                     [relative (read-integer who port vers "image-snip relative?")])
-                 (let ([data
-                        (and (and (equal? filename #"")
-                                  (cvers . > . 1)
-                                  (not (zero? type)))
-                             ;; inlined image
-                             (apply
-                              bytes-append
-                              (let ([len (read-fixed-integer who port vers "image-snip image length")])
-                                (let loop ([i 0])
-                                  (if (= i len)
-                                      null
-                                      (cons
-                                       (read-raw-string who port vers "image-snip image content")
-                                       (loop (add1 i))))))))])
-                   (if (header-plain-text? header)
-                       #"."
-                       (make-object image%
-                         (if data #f filename)
-                         data w h dx dy
-                         relative (int->img-type type))))))]
-            [else
-             (if (header-skip-content? header)
-                 #f
-                 ;; Load a manager for this snip class?
-                 (let ([lib (string->lib-path (bytes->string/latin-1 name) #f)])
-                   (if lib
-                       (let ([mgr (dynamic-require lib 'reader)])
-                         (unless (mgr . is-a? . snip-reader<%>)
-                           (error who "reader provided by ~s is not an instance of snip-reader<%>" lib))
-                         mgr)
-                       (if (header-skip-unknown? header)
-                           #f
-                           (error who "cannot load snip-class reader: ~s" name)))))]))))
-      class))
-
-  (define (find-data-class pos header who port vers used?)
-    (define data-classes (header-data-classes header))
-    (unless (< -1 pos (vector-length data-classes))
-      (read-error who "integer less than data-class-list length" "data-class index" port))
-    (let ([data-class (vector-ref data-classes pos)])
-      (when used?
-        (set-data-class-used?! data-class #t))
-      (unless (data-class-manager data-class)
-        (set-data-class-manager!
-         data-class
-         (case (data-class-name data-class)
-           [(#"wxloc") 
-            (lambda (who port vers header)
-              (read-inexact who port vers "location x")
-              (read-inexact who port vers "location y"))]
-           [else
-            (if (header-skip-content? header)
-                #f
-                ;; Load a manager for this data class?
-                (error who "cannot load data-class managers, yet"))])))
-      data-class))
-
-  (define-local-member-name get-vers get-header get-port)
-  (define stream%
-    (class object%
-      (init-field who port vers header)
-
-      (define/public (get-vers) vers)
-      (define/public (get-header) header)
-      (define/public (get-port) port)
-      
-      (public [rfi read-fixed-integer])
-      (define (rfi what)
-        (read-fixed-integer who port vers what))
-
-      (public [ri read-integer])
-      (define (ri what)
-        (read-integer who port vers what))
-      
-      (public [rix read-inexact])
-      (define (rix what)
-        (read-inexact who port vers what))
-
-      (define/public (read-raw-bytes what)
-        (read-raw-string who port vers what))
-      (define/public (read-bytes what)
-        (read-a-string who port vers what))
-
-      (public [rne read-editor-snip])
-      (define (rne what)
-        (read-editor-snip who port vers header))
-
-      (super-new)))
-
-  (define stream<%> (class->interface stream%))
-
-  ;; ----------------------------------------
-  
-  (define lib-mapping (make-hash-table 'equal))
-
-  (define (ok-string-element? m)
-    (and (string? m)
-         (regexp-match? #rx"^[-a-zA-Z0-9_. ]+$" m)
-         (not (string=? m ".."))
-         (not (string=? m "."))))
-  
-  (define (ok-lib-path? m)
-    (and (pair? m)
-         (eq? 'lib (car m))
-         (pair? (cdr m))
-         (list? m)
-         (andmap ok-string-element? (cdr m))))
-
-  (define (register-lib-mapping! str target)
-    (unless (ok-lib-path? target)
-      (error 'register-lib-mapping! "given target is not a valid marshalable lib path: ~s" target))
-    (hash-table-put! lib-mapping str target))
-
-  (define (string->lib-path str gui?)
-    (or (let ([m (and (regexp-match #rx"^[(].*[)]$" str)
-                      (let* ([p (open-input-string str)]
-                             [m (read p)])
-                        (and (eof-object? (read p))
-                             m)))])
-          (or (and (and (list? m)
-                        (= (length m) 2)
-                        (ok-lib-path? (car m))
-                        (ok-lib-path? (cadr m)))
-                   (if gui?
-                       (car m)
-                       (cadr m)))
-              (and (and (ok-lib-path? m)
-                        gui?)
-                   m)))
-        (and (not gui?)
-             (hash-table-get lib-mapping str #f))))
-
-  (register-compatibility-mappings! register-lib-mapping!)
-
-  ;; ----------------------------------------
-
-  (define plain-params
-    (with-module-reading-parameterization
-     (lambda ()
-      (current-parameterization))))
-
-  (define (plain-read port)
-    (call-with-parameterization 
-     plain-params 
-     (lambda () 
-       (with-handlers ([exn:fail:read? (lambda (x) 'no-good)])
-         (read port)))))
-
-  ;; ----------------------------------------
-
-  (define (port->decoded-port who port vers header close?)
-    (snip-results->port
-     (object-name port)
-     (lambda ()
-       (let ([snips-to-go (header-snips-to-go header)])
-         (cond
-          [(zero? snips-to-go) 
-           (read-editor-footers who port vers header)
-           #f]
-          [else 
-           (set-header-snips-to-go! header (sub1 snips-to-go))
-           (read-snip who port vers header)])))
-     (if close?
-         (lambda () (close-input-port port))
-         void)))
-
-  (define (snip-results->port name next-item! close)
-    (define-values (r w) (make-pipe))
-    (define (read-proc buffer)
-      (if (char-ready? r)
-          (read-bytes-avail! buffer r)
-          (let ([s (next-item!)])
-            (cond
-             [(not s)
-              (close-output-port w)
-              eof]
-             [(bytes? s)
-              (write-bytes s w)
-              (read-proc buffer)]
-             [else s]))))
-    (make-input-port/read-to-peek
-     name
-     read-proc
-     #f
-     close))
-
-  ;; ----------------------------------------
-
-  (define (skip-reader port)
-    (regexp-match/fail-without-reading #rx#"^#reader[(]lib\"read.ss\"\"wxme\"[)]" port))
-
-  (define (wxme-convert-port port close? snip-filter)
-    ;; read optional #reader header:
-    (skip-reader port)
-    ;; decode:
-    (decode 'read-bytes port snip-filter close? #f))
-
-  ;; ----------------------------------------
-
-  (define unknown-extensions-skip-enabled (make-parameter #f))
-
-  (define broken-wxme-big-endian? (make-parameter (system-big-endian?)))
-
-  (define (is-wxme-stream? p)
-    (and (regexp-match-peek #rx#"^(?:#reader[(]lib\"read[.]ss\"\"wxme\"[)])?WXME01[0-9][0-9] ##[ \r\n]" p)
-         #t))
-
-  (define/kw (wxme-port->port port #:optional [close? #t] [snip-filter (lambda (x) x)])
-    (wxme-convert-port port close? snip-filter))
-
-  (define/kw (wxme-port->text-port port #:optional [close? #t])
-    (wxme-convert-port port close? #f))
-
-  (define (do-read orig-port who read)
-    (let ([port (if (gui-available?)
-                    ;; GUI mode, since GRacket is available:
-                    (let ([text% (dynamic-require 'mred 'text%)]
-                          [open-input-text-editor (dynamic-require 'mred 'open-input-text-editor)])
-                      (let ([t (new text%)])
-                        (send t insert-port orig-port 'standard)
-                        (open-input-text-editor t 0 'end values (object-name orig-port) #t)))
-                    ;; Non-GUI mode:
-                    (decode who orig-port (lambda (x) x) #f #f))])
-      ;; Turn on line counting if it was on before:
-      (let-values ([(line col pos) (port-next-location orig-port)])
-        (when line (port-count-lines! port)))
-      ;; Read:
-      (let ([v (read port)])
-        (let ([v2 (let loop ()
-                    (let ([v2 (read port)])
-                      (if (special-comment? v2)
-                          (loop)
-                          v2)))])
-          (if (eof-object? v2)
-              v
-              `(begin
-                 ,@(list* v v2 (let loop ([accum null])
-                                 (let ([v (read port)])
-                                   (cond
-                                    [(eof-object? v) (reverse accum)]
-                                    [(special-comment? v) (loop accum)]
-                                    [else (loop (cons v accum))]))))))))))
-
-  (define (wxme-read port)
-    (do-read port 'read read))
-
-  (define (wxme-read-syntax source-name-v port)
-    (datum->syntax-object
-     #f
-     (do-read port 'read-syntax
-              (lambda (port)
-                (read-syntax source-name-v port)))))
-
-  (define (extract-used-classes port)
-    (if (is-wxme-stream? port)
-        (begin
-          (skip-reader port)
-          (decode 'extract-used-classes port (lambda (x) x) #f #t))
-        (values null null)))
-
-  (define (read-snip-from-port name who stream)
-    (define vers (send stream get-vers))
-    (define header (send stream get-header))
-    (define port (send stream get-port))
-    (define class (find-class/name name header who port vers #t))
-    (read-snip/given-class class who port vers header #t))
-  
-  (provide/contract [is-wxme-stream? (input-port? . -> . any)]
-                    [wxme-port->text-port (->* (input-port?) (any/c) input-port?)]
-                    [wxme-port->port (->* (input-port?) (any/c (any/c . -> . any)) input-port?)]
-                    [register-lib-mapping! (string? string? . -> . void?)]
-                    [string->lib-path (string? any/c . -> . any)]
-                    [extract-used-classes (input-port? . -> . any)]
-                    [read-snip-from-port (-> string? any/c (is-a?/c stream<%>) any)])
-
-  (provide unknown-extensions-skip-enabled
-           broken-wxme-big-endian?
-           snip-reader<%>
-           readable<%>
-           stream<%>
-           wxme-read
-           wxme-read-syntax))
diff --git a/pkgs/wxme-pkgs/wxme-lib/wxme/xml.rkt b/pkgs/wxme-pkgs/wxme-lib/wxme/xml.rkt
deleted file mode 100644
index 6b91f71c10..0000000000
--- a/pkgs/wxme-pkgs/wxme-lib/wxme/xml.rkt
+++ /dev/null
@@ -1,56 +0,0 @@
-(module xml mzscheme
-  (require mzlib/class
-           xml/xml
-           mzlib/list
-           "wxme.rkt"
-           "editor.rkt"
-           "private/readable-editor.rkt")
-
-  (provide reader
-           xml-editor%)
-
-  (define xml-editor% (class readable-editor% (super-new)))
-
-  (define reader
-    (new (class editor-reader%
-           (inherit read-editor-snip)
-           (define/override (read-snip text? vers stream)
-             (let ([elim-whitespace? (zero? (send stream read-integer "elim-whitespace?"))])
-               (read-editor-snip text? vers stream elim-whitespace? xml-editor%)))
-
-           (define/override (generate-special editor src line col pos)
-             (parameterize ([permissive-xexprs #t])
-               (let* ([port (send editor get-content-port)]
-                      [xml (read-xml port)]
-                      [xexpr (xml->xexpr (document-element xml))]
-                      [clean-xexpr (if (send editor get-data)
-                                       (eliminate-whitespace-in-empty-tags xexpr)
-                                       xexpr)])
-                 (list 'quasiquote clean-xexpr))))
-
-           (super-new))))
-
-  ;; FIXME! Copied from xml-snip-helpers.rkt verbatim
-  (define (eliminate-whitespace-in-empty-tags xexpr)
-    (cond
-     [(and (pair? xexpr)
-           (symbol? (car xexpr)))
-      (list* (car xexpr)
-             (cadr xexpr)
-             (map eliminate-whitespace-in-empty-tags
-                  (eliminate-whitespace-in-list (cddr xexpr))))]
-     [else xexpr]))
-  (define (eliminate-whitespace-in-list xexprs)
-    (cond
-     [(andmap (lambda (x) (or (not (string? x))
-                              (string-whitespace? x)))
-              xexprs)
-      (filter (lambda (x) (not (string? x))) xexprs)]
-     [else xexprs]))
-  (define (string-whitespace? str)
-    (let loop ([i (string-length str)])
-      (cond
-       [(zero? i) #t]
-       [(char-whitespace? (string-ref str (- i 1)))
-        (loop (- i 1))]
-       [else #f]))))
diff --git a/pkgs/wxme-pkgs/wxme/LICENSE.txt b/pkgs/wxme-pkgs/wxme/LICENSE.txt
deleted file mode 100644
index a8dd2519c6..0000000000
--- a/pkgs/wxme-pkgs/wxme/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-wxme
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/wxme-pkgs/wxme/info.rkt b/pkgs/wxme-pkgs/wxme/info.rkt
deleted file mode 100644
index 896f32cac6..0000000000
--- a/pkgs/wxme-pkgs/wxme/info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("wxme-lib"
-               "gui-doc"))
-(define implies '("wxme-lib"))
-
-(define pkg-desc "Decoding the WXME graphical file format in a text-only environment")
-
-(define pkg-authors '(mflatt))
diff --git a/pkgs/xrepl-pkgs/xrepl-doc/LICENSE.txt b/pkgs/xrepl-pkgs/xrepl-doc/LICENSE.txt
deleted file mode 100644
index 065d8721b4..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-doc/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-xrepl-doc
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/xrepl-pkgs/xrepl-doc/info.rkt b/pkgs/xrepl-pkgs/xrepl-doc/info.rkt
deleted file mode 100644
index 05d2f94687..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-doc/info.rkt
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define build-deps '("errortrace-doc"
-                     "macro-debugger"
-                     "profile-doc"
-                     "readline-doc"
-                     "macro-debugger-text-lib"
-                     "profile-lib"
-                     "readline-lib"
-                     "xrepl-lib"
-                     "racket-doc"))
-(define deps '("base"
-               "sandbox-lib"
-               "scribble-lib"))
-(define update-implies '("xrepl-lib"))
-
-(define pkg-desc "documentation part of \"xrepl\"")
-
-(define pkg-authors '(eli))
diff --git a/pkgs/xrepl-pkgs/xrepl-doc/xrepl/doc-utils.rkt b/pkgs/xrepl-pkgs/xrepl-doc/xrepl/doc-utils.rkt
deleted file mode 100644
index c69a4b0691..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-doc/xrepl/doc-utils.rkt
+++ /dev/null
@@ -1,81 +0,0 @@
-#lang racket/base
-
-(require scribble/manual scribble/core scribble/decode
-         racket/list racket/sandbox)
-
-(provide (all-from-out scribble/manual)
-         RL GUIDE REFERENCE cmd defcmd check-all-documented)
-
-(define RL '(lib "readline/readline.scrbl"))
-(define GUIDE '(lib "scribblings/guide/guide.scrbl"))
-(define REFERENCE '(lib "scribblings/reference/reference.scrbl"))
-
-(define commands
-  (let ([c #f])
-    (λ ()
-      (unless c
-        (define e (call-with-trusted-sandbox-configuration
-                   (λ () (make-evaluator 'racket/base))))
-        (e '(require xrepl/xrepl))
-        (e '(current-namespace (module->namespace 'xrepl/xrepl)))
-        (set! c (e '(for/list ([c (in-list commands-list)])
-                      (list (car (command-names c))
-                            (cdr (command-names c))
-                            (command-argline c)
-                            (command-blurb c)))))
-        (kill-evaluator e))
-      c)))
-(define documented '())
-
-(define (cmd* name0 . more)
-  (define name (if (symbol? name0) name0 (string->symbol name0)))
-  (define full-name
-    (or (and (assq name (commands)) name)
-        (for/or ([c (in-list (commands))]) (and (memq name (cadr c)) (car c)))
-        (error 'cmd "unknown command: ~s" name)))
-  (define content
-    (litchar (let ([s (format ",~a" name)])
-               (if (pair? more) (apply string-append s " " more) s))))
-  (link-element "plainlink" content `(xrepl ,(format "~a" full-name))))
-
-(define-syntax-rule (cmd name more ...) (cmd* 'name more ...))
-
-(define (cmd-index name)
-  (define namestr (format ",~a" name))
-  (define tag `(xrepl ,(format "~a" name)))
-  (define content (cmd* name))
-  (define ielem
-    (index-element #f content tag (list namestr) (list content)
-                   'xrepl-command))
-  (toc-target-element #f (list ielem) tag))
-
-(define (defcmd* name . text)
-  (set! documented (cons name documented))
-  (define-values [other-names argline blurb]
-    (apply values (cond [(assq name (commands)) => cdr]
-                        [else (error 'defcmd "unknown command: ~s" name)])))
-  (define header
-    (list (cmd-index name) (litchar (string-append " " (or argline "")))))
-  (define desc
-    (list (hspace 2) (make-element 'italic blurb)))
-  (define synonyms
-    (and (pair? other-names)
-         (list (hspace 2)
-               "[Synonyms: "
-               (add-between (map (λ (n) (litchar (format ",~a" n)))
-                                 other-names)
-                            " ")
-               "]")))
-  (splice
-   (list* (tabular #:style 'boxed `((,header) (,desc)
-                                    ,@(if synonyms `((,synonyms)) `())))
-          "\n" "\n" text)))
-
-(define-syntax-rule (defcmd name text ...) (defcmd* 'name text ...))
-
-(define (check-all-documented)
-  (unless (= (length documented) (length (remove-duplicates documented)))
-    (error 'xrepl-docs "some commands were documented multiple times"))
-  (let ([missing (remove* documented (map car (commands)))])
-    (when (pair? missing)
-      (error 'xrepl-docs "missing command documentation: ~s" missing))))
diff --git a/pkgs/xrepl-pkgs/xrepl-doc/xrepl/info.rkt b/pkgs/xrepl-pkgs/xrepl-doc/xrepl/info.rkt
deleted file mode 100644
index 4bda33a44e..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-doc/xrepl/info.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang info
-
-(define name "eXtended REPL")
-
-(define scribblings '(("xrepl.scrbl" () (tool-library))))
diff --git a/pkgs/xrepl-pkgs/xrepl-doc/xrepl/xrepl.scrbl b/pkgs/xrepl-pkgs/xrepl-doc/xrepl/xrepl.scrbl
deleted file mode 100644
index 8ca05c2ce9..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-doc/xrepl/xrepl.scrbl
+++ /dev/null
@@ -1,523 +0,0 @@
-#lang scribble/manual
-@(require "doc-utils.rkt"
-          scribble/decode (only-in scribble/core)
-          (for-label racket readline racket/help racket/enter
-                     racket/trace profile
-                     macro-debugger/stepper-text
-                     macro-debugger/analysis/check-requires))
-
-@title{XREPL: eXtended REPL}
-@author[@author+email["Eli Barzilay" "eli@barzilay.org"]]
-
-@defmodule[xrepl]{
-  Loading the @racketmodname[xrepl] library enables XREPL, which extends
-  the @exec{racket} @tech[#:doc GUIDE]{REPL} significantly, turning it
-  into a more useful tool for interactive exploration and development.
-  Additions include ``meta commands,'' using readline, keeping past
-  evaluation results, and more.}
-
-@; ---------------------------------------------------------------------
-@section{Installing XREPL}
-
-To use XREPL, start @exec{racket} and enter @racket[(require xrepl)].
-You will know that it works when the prompt changes to a @litchar{->},
-and, if you're working on a capable terminal, you will now have readline
-editing.  You can also start @exec{racket} and ask for XREPL to be
-loaded using command-line arguments:
-@commandline{racket -il xrepl}
-
-If you want to enable XREPL automatically, add this expression to your
-Racket initialization file.
-@margin-note*{To load XREPL conditionally (e.g., not in older Racket
-  versions), you can use @racket[(dynamic-require 'xrepl #f)].  This
-  is a plain expression that can be placed inside @racket[when] and
-  elsewhere.}
-An easy way to do the necessary editing is to enter @cmd[install!],
-which will inspect and edit your initialization file (it will describe
-the change and ask for your permission).  Alternatively, you can edit
-the file directly: on Unix, it is @filepath{~/.racketrc}, and for
-other platforms evaluate @racket[(find-system-path 'init-file)] to see
-where it is.
-
-XREPL will set up a readline-based reader, so you do not need to load
-that yourself.  If your initialization file was previously set to load
-readline via @racket[install-readline!], the @cmd[install!] command
-will (notify you and) remove it.  If you added it yourself, consider
-removing it.  (This is not strictly needed, but XREPL is slightly
-better at detecting when to use readline.)
-
-@; ---------------------------------------------------------------------
-@section{Meta REPL Commands}
-
-Most of the XREPL extensions are implemented as meta commands.  These
-commands are entered at the REPL, prefixed by a @litchar{,} and followed
-by the command name.  Note that several commands correspond directly to
-Racket functions (e.g., @cmd[exit]) --- but since they work outside of
-your REPL, they can be used even if the matching bindings are not
-available.
-
-@; ---------------------------------
-@subsection{Generic Commands}
-
-@defcmd[help]{
-  Without an argument, displays a list of all known commands.  Specify a
-  command to get help specific to that command.
-}
-
-@defcmd[exit]{
-  Exits Racket, optionally with an error code (see @racket[exit]).
-}
-
-@defcmd[cd]{
-  Sets the @racket[current-directory] to the given path.  If no path is
-  specified, use your home directory.  Path arguments are passed through
-  @racket[expand-user-path] so you can use @litchar{~}.  An argument of
-  @litchar{-} means ``the previous path''.
-}
-
-@defcmd[pwd]{
-  Reports the value of @racket[current-directory].
-}
-
-@defcmd[shell]{
-  Use @cmd[shell] (or @cmd[sh]) to run a generic shell command (via
-  @racket[system]).  For convenience, a few synonyms are provided ---
-  they run the specified executables (still using @racket[system]).
-
-  When the REPL is in the context of a module with a known source file,
-  the shell command can use the @envvar{F} environment variable as the
-  path to the file.  Otherwise, @envvar{F} is set to an empty string.
-}
-
-@defcmd[edit]{
-  Runs an editor, as specified by your @envvar{EDITOR} environment
-  variable, with the given file/s arguments.  If no files are specified
-  and the REPL is currently inside a module's namespace, then the file
-  for that module is used.  If the @envvar{EDITOR} environment variable
-  is not set, use the @cmd[drracket] command instead.
-}
-
-@defcmd[drracket]{
-  Runs DrRacket with the specified file/s.  If no files are given, and
-  the REPL is currently inside a module, the file for that module is
-  used.
-
-  DrRacket is launched directly, without starting a new subprocess, and
-  it is then kept running in a hidden window so further invocations are
-  immediate.  (When this command is used for the first time, you will
-  see DrRacket start as usual, and then its window will disappear ---
-  that window is keeping DrRacket ready for quick editing.)
-
-  In addition to file arguments, arguments can specify one of a few
-  flags for additional operations:
-  @itemize[
-  @item{@litchar{-new}: opens a new editing window.  This is the default
-    when no files are given and the REPL is not inside a module,}
-  @item{@litchar{-open}: opens the specified file/s (or the current
-    module's file).  This is the default when files are given or when
-    inside a module.}
-  @item{@litchar{-quit}: exits the running DrRacket instance.  Quitting
-    DrRacket is usually not necessary.  Therefore, if you try to quit it
-    from the DrRacket window, it will instead just close the window but
-    DrRacket will still be running in the background.  Use this command
-    in case there is some exceptional problem that requires actually
-    quitting the IDE.  (Once you do so, future uses of this command will
-    start a fresh instance.)}]
-}
-
-@; ---------------------------------
-@subsection{Binding Information}
-
-@defcmd[apropos]{
-  Searches for known bindings in the current namespace.  The arguments
-  specify which binding to look for: use a symbol (without a
-  @litchar{'}) to look for bindings that contain that name, and use a
-  regexp (e.g., @racket[#rx"..."]) to use a regexp for the search.
-  Multiple arguments are and-ed together.
-
-  If no arguments are given, @emph{all} bindings are listed.
-}
-
-@defcmd[describe]{
-  For each of the specified names, describe where where it is coming
-  from and how it was defined if it names a known binding.  In addition,
-  describe the module (list its imports and exports) that is named by
-  arguments that are known module names.
-
-  By default, bindings are searched for at the runtime level (phase 0).
-  You can add a different phase level for identifier lookups as a first
-  argument.  In this case, only a binding can be described, even if the
-  same name is a known module.
-}
-
-@defcmd[doc]{
-  Uses Racket's @racket[help] to browse the documentation, look for a
-  binding, etc.  Note that this can be used even in languages that don't
-  have the @racket[help] binding.
-}
-
-@; ---------------------------------
-@subsection{Requiring and Loading Files}
-
-@defcmd[require]{
-  Most arguments are passed to @racket[require] as is.  As a
-  convenience, if a symbolic argument specifies an existing file name,
-  then use its string form to specify the require, or use a
-  @racket[file] in case of an absolute path.  In addition, an argument
-  that names a known symbolic module name (e.g., one that was defined on
-  the REPL, or a builtin module like @racket[#%network]), then its
-  quoted form is used.  (Note that these shorthands do not work inside
-  require subforms like @racket[only-in].)
-}
-
-@defcmd[require-reloadable]{
-  Same as @cmd[require], but arranges to load the code in a way that
-  makes it possible to reload it later, or if a module was already
-  loaded (using this command) then reload it.  Note that the arguments
-  should be simple module names, without any require macros.  If no
-  arguments are given, use arguments from the last use of this command
-  (if any).
-
-  Module reloading is enabled by turning off the
-  @racket[compile-enforce-module-constants] parameter --- note that this
-  prohibits some optimizations, since the compiler assumes that all
-  bindings may change.
-}
-
-@defcmd[enter]{
-  Uses @racket[enter!] to have the REPL go ``inside'' a given module's
-  namespace.  A module name can specify an existing file as with the
-  @cmd[require-reloadable] command.  If no module is given, and the REPL
-  is already in some module's namespace, then `enter!' is used with that
-  module, causing it to reload if needed.  Using @racket[#f] makes it go
-  back to the toplevel namespace.
-
-  Note that this can be used even in languages that don't have the
-  @racket[enter!] binding.  In addition, @racket[enter!] is used in a
-  way that does not make it require itself into the target namespace.
-}
-
-@defcmd[toplevel]{
-  Makes the REPL go back to the toplevel namespace.  Same as using the
-  @cmd[enter] command with a @racket[#f] argument.
-}
-
-@defcmd[load]{
-  Uses @racket[load] to load the specified file(s).
-}
-
-@; ---------------------------------
-@subsection{Debugging}
-
-@defcmd[backtrace]{
-  Whenever an error is displayed, XREPL will not show its context
-  printout.  Instead, use the @cmd[backtrace] command to display the
-  backtrace for the last error.
-}
-
-@defcmd[time]{
-  Times execution of an expression (or expressions).  This is similar to
-  @racket{time} but the information that is displayed is a bit easier to
-  read.
-
-  In addition, you can provide an initial number to specify repeating
-  the evaluation a number of times.  In this case, each iteration is
-  preceded by two garbage collections, and when the iteration is done
-  its timing information and evaluation result(s) are displayed.  When
-  the requested number of repetitions is done, some extreme results are
-  removed (top and bottom 2/7ths), and the remaining results are be
-  averaged.  Finally, the resulting value(s) are from the last run are
-  returned (and can be accessed via the bindings for the last few
-  results, see @secref["past-vals"]).
-}
-
-@defcmd[trace]{
-  Traces the named function (or functions), using @racket[trace].
-}
-
-@defcmd[untrace]{
-  Untraces the named function (or functions), using @racket[untrace].
-}
-
-@defcmd[errortrace]{
-  @racketmodname[errortrace] is a useful Racket library which can
-  provide a number of useful services like precise profiling, test
-  coverage, and accurate error information.  However, using it can be a
-  little tricky.  @cmd[errortrace] and a few related commands fill this
-  gap, making @racketmodname[errortrace] easier to use.
-
-  @cmd[errortrace] controls global use of @racketmodname[errortrace].
-  With a flag argument of @litchar{+} errortrace instrumentation is
-  turned on, with @litchar{-} it is turned off, and with no arguments it
-  is toggled.  In addition, a @litchar{?} flag displays instrumentation
-  state.
-
-  Remember that @racketmodname[errortrace] instrumentation hooks into
-  the Racket compiler, and applies only to source code that gets loaded
-  from source and therefore compiled.  Therefore, you should use it
-  @emph{before} loading the code that you want to instrument.
-}
-
-@defcmd[profile]{
-  This command can perform profiling of code in one of two very
-  different ways: either statistical profiling via the
-  @racketmodname[profile] library, or using the exact profiler feature
-  of @racketmodname[errortrace].
-
-  When given a parenthesized expression, @cmd[profile] will run it via
-  the statistical profiler, as with the @racket[profile] form, reporting
-  results as usual.  This profiler adds almost no overhead, and it
-  requires no special setup.  In particular, it does not require
-  pre-compiling code in a special way.  However, there are some
-  imprecise elements to this profiling: the profiler samples stack
-  snapshots periodically which can miss certain calls, and it is also
-  sensitive to some compiler optimizations like inlining procedures and
-  thereby not showing them in the displayed analysis.  See
-  @other-doc['(lib "profile/scribblings/profile.scrbl")] for more
-  information.
-
-  In the second mode of operation, @cmd[profile] uses the precise
-  @racketmodname[errortrace] profiler.  This profiler produces precise
-  results, but like other uses of the @racketmodname[errortrace], it
-  must be enabled before loading the code that is to be profiled.  It
-  can add noticeable overhead (potentially affecting the reported
-  runtimes), but the results are accurate in the sense that no procedure
-  is skipped.  (For additional details, see
-  @other-doc['(lib "errortrace/scribblings/errortrace.scrbl")].)
-
-  In this mode, the arguments are flags that control the profiler.  A
-  @litchar{+} flag turns the profiler on --- and as usual with
-  @racketmodname[errortrace] functionality, this applies to code that is
-  compiled from now on.  A @litchar{-} flag turns this instrumentation
-  off, and without any flags it is toggled.  Once the profiler is
-  enabled, you can run some code and then use this command to report
-  profiling results: use @litchar{*} to show profiling results by time,
-  and @litchar{#} for the results by counts.  Once you've seen the
-  results, you can evaluate additional code to collect more profiling
-  information, or you can reset the results with a @litchar{!} flag.
-  You can also combine several flags to perform the associated
-  operations, for example, @cmd[prof]{*!-} will show the accumulated
-  results, clear them, and turn profiler instrumentation off.
-
-  Note that using @emph{any} of these flags turns errortrace
-  instrumentation on, even @cmd[prof]{-} (or no flags).  Use the
-  @cmd[errortrace] command to turn off instrumentation completely.
-}
-
-@defcmd[execution-counts]{
-  This command makes it easy to use the execution counts functionality
-  of @racketmodname[errortrace].  Given a file name (or names),
-  @cmd[execution-counts] will enable errortrace instrumentation for
-  coverage, require the file(s), display the results, disables coverage,
-  and disables instrumentation (if it wasn't previously turned on).
-  This is useful as an indication of how well the test coverage is for
-  some file.
-}
-
-@defcmd[coverage]{
-  Runs a given file and displays coverage information for the run.  This
-  is somewhat similar to the @cmd[execution-counts] command, but instead
-  of using @racketmodname[errortrace] directly, it runs the file in a
-  (trusted) sandbox, using the @racketmodname[racket/sandbox] library
-  and its ability to provide coverage information.
-}
-
-@; ---------------------------------
-@subsection{Miscellaneous Commands}
-
-@defcmd[switch-namespace]{
-  This powerful command controls the REPL's namespace.  While
-  @cmd[enter] can be used to make the REPL go into the namespace of a
-  specific module, the @cmd[switch-namespace] command can switch between
-  @emph{toplevel namespaces}, allowing you to get multiple separate
-  ``workspaces''.
-
-  Namespaces are given names that are symbols or integers, where
-  @litchar{*} is the name for the first initial namespace, serving as
-  the default one.  These names are not bindings --- they are only used
-  to label the known namespaces.
-
-  The most basic usage for this command is to simply specify a new name.
-  A namespace that corresponds to that name will be created and the REPL
-  will switch to that namespace.  The prompt will now indicate this
-  namespace's name.  The name is usually insignificant, except when it
-  is a @racket[require]-able module: in this case, the new namespace is
-  initialized to use that module's bindings.  For example,
-  @cmd[switch]{racket/base} creates a new namespace that is called
-  @litchar{racket/base} and initializes it with
-  @racketmodname[racket/base].  For all other names, the new namespace
-  is initialized the same as the current one.
-
-  Additional @cmd[switch] uses:
-  @itemize[
-  @item{@cmd[switch]{!} --- reset the current namespace, recreating it
-    using the same initial library.  Note that it is forbidden to reset
-    the default initial namespace, the one named @litchar{*} --- this
-    namespace corresponds to the one that Racket was started with, and
-    where XREPL was initialized.  There is no technical reason for
-    forbidding this, but doing so is not useful as no resources will
-    actually be freed.}
-  @item{@cmd[switch]{! <module>} --- resets the current namespace with
-    the explicitly given simple module spec.}
-  @item{@cmd[switch]{<name> !} --- switch to a newly made namespace.  If
-    a namespace by that name already existed, it is rest.}
-  @item{@cmd[switch]{<name> ! <module>} --- same, but reset to the given
-    module instead of what it previously used.}
-  @item{@cmd[switch]{- <name>} --- drop the specified namespace, making
-    it possible to garbage-collect away any associated resources.  You
-    cannot drop the current namespace or the default one (@litchar{*}).}
-  @item{@cmd[switch]{?} --- list all known namespaces.}]
-
-  Do not confuse namespaces with sandboxes or custodians.  The
-  @cmd{switch} command changes @emph{only} the
-  @racket[current-namespace] --- it does not install a new custodian or
-  restricts evaluation in any way.  Note that it is possible to pass
-  around values from one namespace to another via past result reference;
-  see @secref["past-vals"].
-}
-
-@defcmd[syntax]{
-  Manipulate syntaxes and inspect their expansion.
-
-  Useful operations revolve around a ``currently set syntax''.  With no
-  arguments, the currently set syntax is displayed; an argument of
-  @litchar{^} sets the current syntax from the last input to the REPL;
-  and an argument that holds any other s-expression will set it as the
-  current syntax.
-
-  Syntax operations are specified via flags:
-  @itemize[
-  @item{@litchar{+} uses @racket[expand-once] on the current syntax and
-    prints the resulting syntax.  In addition, the result becomes the
-    new ``current'' syntax, so you can use this as a poor-man's syntax
-    stepper.  (Note that in some rare cases expansion via a sequence of
-    @racket[expand-once] might differ from the actual expansion.)}
-  @item{@litchar{!} uses @racket[expand] to completely expand the
-    current syntax.}
-  @item{@litchar{*} uses the macro debugger's textual output to show
-    expansion steps for the current syntax, leaving macros from
-    @racketmodname[racket/base] intact.  Does not change the current
-    syntax.  Uses @racket[expand/step-text], see @other-doc['(lib
-    "macro-debugger/macro-debugger.scrbl")] for details.}
-  @item{@litchar{**} uses the macro debugger similarly to @litchar{*},
-    but expands @racketmodname[racket/base] macros too, showing the
-    resulting full expansion process.}]
-  Several input flags and/or syntaxes can be specified in succession as
-  arguments to @cmd{syntax}.  For example, @cmd[stx]{(when 1 2) ** !}.
-}
-
-@defcmd[check-requires]{
-  Uses @racket[show-requires] to analyze the @racket[require]s of the
-  specified module, defaulting to the currently entered module if we're
-  in one.  See @other-doc['(lib "macro-debugger/macro-debugger.scrbl")]
-  for details.
-}
-
-@defcmd[log]{
-  Starts (or stops) logging events at a specific level.  The level can
-  be:
-  @itemize[
-  @item{a known level name (currently one of @litchar{fatal},
-    @litchar{error}, @litchar{warning}, @litchar{info},
-    @litchar{debug}),}
-  @item{@racket[#f] for no logging,}
-  @item{@racket[#t] for maximum logging,}
-  @item{an integer level specification, with @racket[0] for no logging
-    and bigger ones for additional verbosity.}]
-}
-
-@defcmd[install!]{
-  Convenient utility command to install XREPL in your Racket
-  initialization file.  This is done carefully, you will be notified of
-  potential issues, and asked to authorize changes.
-}
-
-@; ---------------------------------------------------------------------
-@section[#:tag "past-vals"]{Past Evaluation Results}
-
-XREPL makes the last few interaction results available for evaluation
-via special toplevel variables: @racketidfont{^}, @racketidfont{^^},
-..., @racketidfont{^^^^^}.  The first, @racketidfont{^}, refers to the
-last result, @racketidfont{^^} to the previous one and so on.
-
-As with the usual REPL printouts, @void-const results are not kept.  In
-case of multiple results, they are spliced in reverse, so
-@racketidfont{^} refers to the last result of the last evaluation.  For
-example:
-@verbatim[#:indent 4]{
-    -> 1
-    1
-    -> (values 2 3)
-    2
-    3
-    -> (values 4)
-    4
-    -> (list ^ ^^ ^^^ ^^^^)
-    '(4 3 2 1)}
-The rationale for this is that @racketidfont{^} always refers to the
-last @emph{printed} result, @racketidfont{^^} to the one before that,
-etc.
-
-In addition to these names, XREPL also binds @racketidfont{$1},
-@racketidfont{$2}, ..., @racketidfont{$5} to the same references, so you
-can choose the style that you like.  All of these bindings are made
-available only if they are not already defined.  This means that if you
-have code that uses these names, it will continue to work as usual (and
-it will shadow the saved value binding).
-
-The bindings are identifier macros that expand to the literal saved
-values; so referring to a saved value that is missing (because not
-enough values were shown) raises a syntax error.  In addition, the
-values are held in a @tech[#:doc REFERENCE]{weak reference}, so they can disappear after
-a garbage-collection.
-
-Note that this facility can be used to ``transfer'' values from one
-namespace to another---but beware of struct values that might come from
-a different instantiation of a module.
-
-@; ---------------------------------------------------------------------
-@section{Hacking XREPL}
-
-XREPL is mainly a convenience tool, and as such you might want to hack
-it to better suit your needs.  Currently, there is no convenient way to
-customize and extend it, but this will be added in the future.
-
-Meanwhile, if you're interested in tweaking XREPL, the @cmd[enter]
-command can be used as usual to go into its implementation.  For
-example --- change an XREPL parameter:
-@verbatim[#:indent 4]{
-    -> ,en xrepl/xrepl
-    xrepl/xrepl> ,e
-    xrepl/xrepl> (saved-values-char #\~)
-    xrepl/xrepl> ,top
-    -> 123
-    123
-    -> ~
-    123}
-or add a command:
-@verbatim[#:indent 4]{
-  -> ,en xrepl/xrepl
-  xrepl/xrepl> (defcommand eli "stuff" "eli says" ["Make eli say stuff"]
-                 (printf "Eli says: ~a\n" (getarg 'line)))
-  xrepl/xrepl> ,top
-  -> ,eli moo
-  Eli says: moo}
-While this is not intended as @emph{the} way to extend and customize
-XREPL, it is a useful debugging tool should you want to do so.
-
-If you have any useful tweaks and extensions, please mail the author or
-the Racket developer's
-@hyperlink["http://racket-lang.org/community.html"]{mailing list}.
-
-@; ---------------------------------------------------------------------
-@section{License Issues}
-
-Under most circumstances XREPL uses the @racketmodname[readline]
-library, and therefore a similar license caveat applies: XREPL cannot be
-enabled by default because of the @seclink["readline-license" #:doc
-RL]{readline licensing}, you have to explicitly do so yourself to use
-it.  (Note that XREPL is intended to be used only for enhanced
-interaction, not as a library; so there are no additional issues.)
-
-@; ---------------------------------------------------------------------
-@(check-all-documented)
diff --git a/pkgs/xrepl-pkgs/xrepl-lib/LICENSE.txt b/pkgs/xrepl-pkgs/xrepl-lib/LICENSE.txt
deleted file mode 100644
index 43dc7ea3dc..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-lib/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-xrepl-lib
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/xrepl-pkgs/xrepl-lib/info.rkt b/pkgs/xrepl-pkgs/xrepl-lib/info.rkt
deleted file mode 100644
index 3169742b72..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-lib/info.rkt
+++ /dev/null
@@ -1,11 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("base"
-               "readline-lib"
-               "scribble-text-lib"))
-
-(define pkg-desc "implementation (no documentation) part of \"xrepl\"")
-
-(define pkg-authors '(eli))
diff --git a/pkgs/xrepl-pkgs/xrepl-lib/xrepl/info.rkt b/pkgs/xrepl-pkgs/xrepl-lib/xrepl/info.rkt
deleted file mode 100644
index 149f2f0fa4..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-lib/xrepl/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define name "eXtended REPL")
diff --git a/pkgs/xrepl-pkgs/xrepl-lib/xrepl/main.rkt b/pkgs/xrepl-pkgs/xrepl-lib/xrepl/main.rkt
deleted file mode 100644
index 0b3426b0f1..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-lib/xrepl/main.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-
-;; xrepl is intended to be loaded from your init file, see the
-;; documentation for details.
-
-(require "xrepl.rkt")
-
-;; may want to disable inlining to allow redefinitions
-;; (compile-enforce-module-constants #f)
-
-;; start everything
-(setup-xrepl-environment)
diff --git a/pkgs/xrepl-pkgs/xrepl-lib/xrepl/saved-values.rkt b/pkgs/xrepl-pkgs/xrepl-lib/xrepl/saved-values.rkt
deleted file mode 100644
index 67d85747c4..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-lib/xrepl/saved-values.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-
-;; This module is used for saved values bindings.  This would have been
-;; a very simple use case for an identifier macro, but this fail in one
-;; important aspect: in some languages we can't rely on bindings that
-;; we'll expand to to behave as usual.  Specifically, such an expansion
-;; makes using saved values impossible in TR, since the expansion would
-;; eventually be something that has no type (and even if we do some
-;; specific hack and add a type, it would be a useless `Any').
-;;
-;; The solution is a pile of hair...  We define here a syntax-level
-;; variable that holds the saved values parameter, and provide a macro
-;; that sets it.  Then, xrepl calls us with the parameter values
-;; injected directly into the syntax (=> 3d code), which is used to set
-;; the variable.  (The syntax level gets instantiated multiple times, so
-;; this way they all share the same parameter from xrepl.)  Finally, a
-;; reference expands to a `quote' expression with the value injected
-;; 3d-ly, and TR will be happy to see just a literal value as its
-;; expansion.  (Well, mostly happily -- it makes using functions
-;; impossible since TR will infer an `Any' type for them, but that case
-;; is hopeless anyway.)
-
-(require (for-syntax racket/base))
-
-(define-for-syntax saved-values-param #f)
-
-(provide set-saved-values-param!)
-(define-syntax (set-saved-values-param! stx)
-  (syntax-case stx ()
-    [(_ p) (parameter? (syntax-e #'p))
-           (begin (set! saved-values-param (syntax-e #'p))
-                  (datum->syntax #'here (void)))]
-    [_ (raise-syntax-error 'set-saved-values-param! "internal error")]))
-
-(provide saved-value-ref)
-(define-syntax (saved-value-ref stx)
-  (define (ref id)
-    (define (err fmt . args)
-      (raise-syntax-error (syntax-e id) (apply format fmt args)))
-    (unless (parameter? saved-values-param)
-      (err "internal error: no saved-values"))
-    (define saved (saved-values-param))
-    (unless (list? saved) (err "internal error: saved-values isn't a list"))
-    (define str (symbol->string (syntax-e id)))
-    (define n
-      (cond [(regexp-match? #rx"^([^0-9])+$" str) (string-length str)]
-            [(regexp-match #rx"[0-9]+$" str)
-             => (λ (m) (string->number (car m)))]
-            [else (err "unknown name pattern for a saved-value reference")]))
-    (unless (pair? saved)          (err "no saved values, yet"))
-    (when (n . > . (length saved)) (err "no ~a saved values, yet" n))
-    ;; the values are either `#f', or a weak box holding the value
-    (define r
-      (let ([b (list-ref saved (sub1 n))])
-        (and b (or (weak-box-value b)
-                   (err "saved value #~a was garbage-collected" n)))))
-    #`'#,r)
-  (syntax-case stx (set!)
-    [(set! id . xs) (raise-syntax-error 'set! "cannot set history reference")]
-    [(id . xs) (datum->syntax stx (cons (ref #'id) #'xs) stx)]
-    [id (identifier? #'id) (ref #'id)]))
diff --git a/pkgs/xrepl-pkgs/xrepl-lib/xrepl/xrepl.rkt b/pkgs/xrepl-pkgs/xrepl-lib/xrepl/xrepl.rkt
deleted file mode 100644
index f0a03a437d..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-lib/xrepl/xrepl.rkt
+++ /dev/null
@@ -1,1539 +0,0 @@
-#lang racket/base
-
-;; ----------------------------------------------------------------------------
-;; customization
-
-(define toplevel-prefix       (make-parameter "-")) ; when not in a module
-(define saved-values-number   (make-parameter 5))
-(define saved-values-patterns (make-parameter '("^" "$~a")))
-;; TODO: when there's a few more of these, make them come from the prefs
-
-;; ----------------------------------------------------------------------------
-
-(require racket/list racket/match scribble/text/wrap)
-
-;; ----------------------------------------------------------------------------
-;; utilities
-
-(define home-dir (find-system-path 'home-dir))
-
-(define-namespace-anchor anchor)
-(define (here-namespace) (namespace-anchor->namespace anchor))
-
-;; autoloads: avoid loading a ton of stuff to minimize startup penalty
-(define autoloaded-specs (make-hasheq))
-(define (autoloaded? sym) (hash-ref autoloaded-specs sym #f))
-(define-syntax-rule (defautoload libspec id ...)
-  (begin (define id
-           (make-keyword-procedure
-            (λ (kws kw-args . args)
-              (set! id (parameterize ([current-namespace (here-namespace)])
-                         (dynamic-require 'libspec 'id)))
-              (hash-set! autoloaded-specs 'libspec #t)
-              (hash-set! autoloaded-specs 'id #t)
-              (keyword-apply id kws kw-args args))))
-         ...))
-
-(defautoload racket/system          system system*)
-(defautoload racket/file            file->string)
-(defautoload setup/path-to-relative path->relative-string/setup)
-(defautoload syntax/modcode         get-module-code)
-(defautoload racket/path            find-relative-path)
-(defautoload setup/xref             load-collections-xref)
-(defautoload scribble/xref          xref-binding->definition-tag)
-(defautoload scribble/blueboxes     fetch-blueboxes-strs make-blueboxes-cache)
-
-;; similar, but just for identifiers
-(define hidden-namespace (make-base-namespace))
-(define initial-namespace (current-namespace))
-;; when `racket/enter' initializes, it grabs the `current-namespace' to get
-;; back to -- which means it should be instantiated in a top level namespace
-;; rather than in (here-namespace); but if we use `initial-namespace' we
-;; essentially rely on the user to not kill `enter!' (eg, (define enter! 4)).
-;; the solution is to make a `hidden-namespace' where we store these bindings,
-;; then instantiate needed modules in the initial namespace and immediately
-;; attach the modules to the hidden one then use it, so changes to the binding
-;; in `initial-namespace' doesn't affect us.
-(define (make-lazy-identifier sym from)
-  (define id #f)
-  (λ () (or id (begin (parameterize ([current-namespace initial-namespace])
-                        (namespace-require from))
-                      (parameterize ([current-namespace hidden-namespace])
-                        (namespace-attach-module initial-namespace from)
-                        (namespace-require from)
-                        (set! id (namespace-symbol->identifier sym))
-                        id)))))
-
-;; makes it easy to use meta-tools without user-namespace contamination
-(define (eval-sexpr-for-user form)
-  (eval (namespace-syntax-introduce (datum->syntax #f form))))
-
-;; If `mod' is a known module, return it; if it's a symbol and 'mod is
-;; known, return 'mod; otherwise return #f.  If `mode' is 'path, return
-;; a path for modules that come from files and #f otherwise, and if it's
-;; 'path/sym return a path for the same and a symbolic name for known
-;; modules with that name.
-(define (known-module mod [mode #f])
-  (define (known-top mod)
-    (and (not (eq? mode 'path))
-         (with-handlers ([exn:fail? (λ (_) #f)])
-           (module->imports mod)
-           (if (eq? mode 'path/sym) (cadr mod) mod))))
-  (match mod
-    [(list 'quote (? symbol?)) (known-top mod)]
-    [_ (or (with-handlers ([exn:fail? (λ (_) #f)])
-             (define r
-               (resolved-module-path-name
-                ((current-module-name-resolver) mod #f #f #f)))
-             (if (not mode)
-               (and r mod)
-               ;; sanity check that path results exists
-               (and (or (and (path? r) (file-exists? r))
-                        (and (eq? mode 'path/sym) (symbol? r)))
-                    r)))
-           ;; for symbols, try also 'mod
-           (and (symbol? mod) (known-top `',mod)))]))
-(define (module->path module)
-  (resolved-module-path-name ((current-module-name-resolver) module #f #f #f)))
-
-(define (mpi->name mpi)
-  (resolved-module-path-name (module-path-index-resolve mpi)))
-(define (->relname x)
-  (cond [(path-string? x) (path->relative-string/setup x)]
-        [x]))
-
-(define (module-displayable-name mod)
-  (define (choose-path x)
-    ;; choose the shortest from an absolute path, a relative path, and a
-    ;; "~/..." path.
-    (if (not (complete-path? x)) ; shouldn't happen
-      x
-      (let* ([r (path->string (find-relative-path (current-directory) x))]
-             [h (path->string (build-path (string->path-element "~")
-                                          (find-relative-path home-dir x)))]
-             [best (if (< (string-length r) (string-length h)) r h)]
-             [best (if (< (string-length best) (string-length x)) best x)])
-        best)))
-  (define (get-prefix* path)
-    (define x (if (string? path) path (path->string path)))
-    (define y (->relname path))
-    (if (equal? x y)
-      (format "~s" (choose-path x))
-      (regexp-replace #rx"[.]rkt$" y "")))
-  (let loop ([mod mod])
-    (match mod
-      [(? symbol?)                 (symbol->string mod)]
-      [(list 'quote (? symbol? s)) (format "'~a" (loop s))]
-      [(list 'file (? string? s))  (loop (string->path s))]
-      [(or (? path?) (? string?))  (get-prefix* mod)]
-      [_ (error 'xrepl "internal error; ~v" mod)])))
-
-(define (here-source) ; returns a path, a symbol, or #f (= not in a module)
-  (variable-reference->module-source
-   (eval (namespace-syntax-introduce
-          (datum->syntax #f `(,#'#%variable-reference))))))
-
-(define (phase->name phase [fmt #f])
-  (define s
-    (case phase
-      [(0) #f] [(#f) "for-label"] [(1) "for-syntax"] [(-1) "for-template"]
-      [else (format "for-meta:~a" phase)]))
-  (cond [(not fmt) s] [s (format fmt s)] [else ""]))
-
-;; true if (quote sym) is a known module name
-(define (known-module-name? sym)
-  (and (symbol? sym)
-       (with-handlers ([exn? (λ (_) #f)]) (module->imports `',sym) #t)))
-
-(define last-output-port #f)
-(define last-error-port  #f)
-(define (maybe-new-output-ports)
-  (define-syntax-rule (maybe last cur)
-    (unless (eq? last cur)
-      (when last (flush-output last)) ; just in case
-      (set! last cur)
-      (flush-output last)
-      (port-count-lines! last)))
-  (maybe last-output-port (current-output-port))
-  (maybe last-error-port (current-error-port)))
-(define (fresh-line [stderr? #f])
-  (maybe-new-output-ports)
-  (define port (if stderr? last-error-port last-output-port))
-  (flush-output port)
-  (define-values [line col pos] (port-next-location port))
-  (unless (eq? col 0) (newline)))
-(define (zero-column!)
-  ;; there's a problem whenever there's some printout followed by a read: the
-  ;; cursor will at column zero, but the port counting will think that it's
-  ;; still right after the printout; call this function in such cases to adjust
-  ;; the column to 0.
-  (maybe-new-output-ports)
-  (define-values [line col pos] (port-next-location last-output-port))
-  (set-port-next-location! last-output-port line 0 pos))
-
-;; wrapped output
-(define-syntax-rule (with-wrapped-output body ...)
-  (do-xrepl-wrapped-output (λ () body ...)))
-(define (do-xrepl-wrapped-output thunk)
-  (do-wrapped-output thunk #:indent-first -2 #:line-prefix #rx"^;+ *"))
-;; maybe move this into scribble/text/wrap
-(define (do-wrapped-output thunk
-                           #:wrap-width   [width (wrap-width)]
-                           #:line-prefix  [prefix-rx #f] ; not including spaces
-                           #:indent-first [fst-indent 0] ; can be negative
-                           #:split-word   [split-word #f])
-  (define-values [ip op] (make-pipe))
-  (define widths
-    (cond [(fst-indent . > . 0) (cons (- width fst-indent) width)]
-          [(fst-indent . < . 0) (cons width (+ width fst-indent))]
-          [else (cons width width)]))
-  (define indents
-    (let ([spaces (make-bytes (abs fst-indent) (char->integer #\space))])
-      (cond [(fst-indent . > . 0) (cons spaces #"")]
-            [(fst-indent . < . 0) (cons #"" spaces)]
-            [else (cons #"" #"")])))
-  (define out (current-output-port))
-  (define (wrapper)
-    (define m (cond [(regexp-match #rx#"^(?:\n|[^\n]+)" ip) => car] [else #f]))
-    (when m ; #f => we're at the end
-      (if (equal? #"\n" m)
-        (newline out)
-        (let* ([i (cdar (regexp-match-positions #rx#"^ *" m))]
-               [p (regexp-match-positions prefix-rx m i)]
-               [i (if (and p (= (caar p) i)) (cdar p) i)]
-               [j (caar (regexp-match-positions #rx" *$" m))]
-               [widths (cons (- (car widths) i) (- (cdr widths) i))]
-               [lines  (wrap-line (bytes->string/utf-8 (subbytes m i j))
-                                  widths split-word)])
-          (write-bytes m out 0 i)
-          (write-bytes (car indents) out)
-          (write-string (car lines) out)
-          (for ([l (in-list (cdr lines))])
-            (newline out)
-            (write-bytes m out 0 i)
-            (write-bytes (cdr indents) out)
-            (write-string l out))))
-      (wrapper)))
-  (define th (thread wrapper))
-  (parameterize ([current-output-port op]) (thunk))
-  (close-output-port op)
-  (thread-wait th))
-
-;; ----------------------------------------------------------------------------
-;; toplevel "," commands management
-
-(struct command (names argline blurb desc handler))
-(define commands (make-hasheq))
-(define commands-list '()) ; for help displays, in definition order
-(define current-command (make-parameter #f))
-(define (register-command! names blurb argline desc handler)
-  (let* ([names (if (list? names) names (list names))]
-         [cmd (command names blurb argline desc handler)])
-    (for ([n (in-list names)])
-      (if (hash-ref commands n #f)
-        (error 'defcommand "duplicate command name: ~s" n)
-        (hash-set! commands n cmd)))
-    (set! commands-list (cons cmd commands-list))))
-(define-syntax-rule (defcommand cmd+aliases argline blurb [desc ...]
-                      body0 body ...)
-  (register-command! `cmd+aliases `argline `blurb `(desc ...)
-                     (λ () body0 body ...)))
-
-(define (cmderror fmt #:default-who [dwho #f] . args)
-  (let ([cmd (current-command)])
-    (raise-user-error (or (and cmd (string->symbol (format ",~a" cmd)))
-                          dwho '???)
-                      (apply format fmt args))))
-
-;; returns first peeked non-space/tab char (#\return is considered space too)
-(define string->list*
-  (let ([t (make-weak-hasheq)]) ; good for string literals
-    (λ (s) (hash-ref! t s (λ () (string->list s))))))
-(define (skip-spaces/peek [skip " \t\r"])
-  (let ([skip (string->list* skip)])
-    (let loop ()
-      (let ([ch (peek-char)])
-        (if (memq ch skip) (begin (read-char) (loop)) ch)))))
-
-(define (here-path [no-path eof])
-  (let ([x (here-source)]) (if (path? x) x no-path)))
-(define (here-mod-or-eof)
-  (let ([x (here-source)])
-    (if (not x)
-      eof
-      (datum->syntax #f
-        (cond [(symbol? x) `',x]
-              [(path? x)   (let ([s (path->string x)])
-                             (if (absolute-path? x) `(file ,s) s))]
-              [else (error 'here-mod-or-eof "internal error: ~s" x)])))))
-
-(define (getarg kind [flag 'req] #:default [dflt #f])
-  (unless (memq flag '(req opt list list+))
-    (error 'getarg "unknown flag: ~e" flag))
-  (define (argerror fmt . args)
-    (apply cmderror #:default-who 'getarg fmt args))
-  (define (missing) (argerror "missing ~a argument" kind))
-  (define (get read)
-    (define (get-one)
-      (cond [(eq? read read-line-arg) (read)]
-            [(eq? #\newline (skip-spaces/peek)) eof]
-            [else (read)]))
-    (define (get-list)
-      (let ([x (get-one)]) (if (eof-object? x) '() (cons x (get-list)))))
-    (define 0th  (get-one))
-    (define 0th? (not (eof-object? 0th)))
-    (define 1st  (if (and (not 0th?) dflt) (dflt) 0th))
-    (define 1st? (not (eof-object? 1st)))
-    (cond [1st? (if (memq flag '(list list+))
-                  (cons 1st (if 0th? (get-list) '()))
-                  1st)]
-          [(eq? flag 'opt) #f]
-          [(eq? flag 'list) '()]
-          [else (missing)]))
-  (define (read-string-arg)
-    (define ch (skip-spaces/peek " \t\r\n"))
-    (let* ([i (current-input-port)]
-           [m (if (eq? ch #\")
-                (let ([m (regexp-match #px#"((?:\\\\.|[^\"\\\\]+)+)\"" i)])
-                  (and m (regexp-replace* #rx#"\\\\(.)" (cadr m) #"\\1")))
-                (cond [(regexp-match #px#"\\S+" i) => car] [else #f]))])
-      (if m (bytes->string/locale m) eof)))
-  (define (read-line-arg)
-    (regexp-replace* #px"^\\s+|\\s+$" (read-line) ""))
-  (define (symbolic-shorthand x)
-    ;; convenience: symbolic requires that name a file turn to a `file'
-    ;; require, and those that name a known module turn to a (quote sym)
-    (define dtm (if (syntax? x) (syntax->datum x) x))
-    (if (not (symbol? dtm))
-      x
-      (let* (;; try a file
-             [f (expand-user-path (symbol->string dtm))]
-             [f (and (file-exists? f) (path->string f))]
-             [f (and f (if (absolute-path? f) `(file ,f) f))]
-             ;; try a quoted one if the above failed
-             [m (or f (and (known-module-name? dtm) `',dtm))]
-             [m (and m (if (syntax? x) (datum->syntax x m x) m))])
-        (or m x))))
-  (define (process-require req)
-    ;; no verification of requires -- let the usual error happen if needed
-    (symbolic-shorthand req))
-  (define (process-module mod)
-    (or (known-module (symbolic-shorthand mod))
-        (cmderror "unknown module: ~s" mod)))
-  (define (translate arg convert)
-    (and arg (if (memq flag '(list list+)) (map convert arg) (convert arg))))
-  (let loop ([kind kind])
-    (case kind
-      [(line)    (get read-line-arg)]
-      [(string)  (get read-string-arg)]
-      [(path)    (translate (loop 'string) expand-user-path)]
-      [(sexpr)   (get read)]
-      [(syntax)  (translate (get read-syntax) namespace-syntax-introduce)]
-      [(require) (translate (loop 'syntax) process-require)]
-      [(module)  (translate (loop 'sexpr) process-module)]
-      [else (error 'getarg "unknown arg kind: ~e" kind)])))
-
-(define (run-command cmd)
-  (parameterize ([current-command cmd])
-    (with-handlers ([void (λ (e)
-                            (if (exn? e)
-                              (eprintf "~a\n" (exn-message e))
-                              (eprintf "~s\n" e)))])
-      ((command-handler (or (hash-ref commands cmd #f)
-                            (error "Unknown command:" cmd)))))))
-
-(defcommand (help h ?) "[<command-name>]"
-  "display available commands"
-  ["Lists known commands and their help; use with a command name to get"
-   "additional information for that command."]
-  (define arg (match (getarg 'sexpr 'opt) [(list 'unquote x) x] [x x]))
-  (define cmd
-    (and arg (hash-ref commands arg
-                       (λ () (printf "*** Unknown command: `~s'\n" arg) #f))))
-  (define (show-cmd cmd indent)
-    (define names (command-names cmd))
-    (printf "~a~s" indent (car names))
-    (when (pair? (cdr names)) (printf " ~s" (cdr names)))
-    (printf ": ~a\n" (command-blurb cmd)))
-  (with-wrapped-output
-    (if cmd
-      (begin (show-cmd cmd "; ")
-             (printf ";   usage: ,~a" arg)
-             (let ([a (command-argline cmd)]) (when a (printf " ~a" a)))
-             (printf "\n")
-             (for ([d (in-list (command-desc cmd))])
-               (printf "; ~a\n" d)))
-      (begin (printf "; Available commands:\n")
-             (for-each (λ (c) (show-cmd c ";   ")) (reverse commands-list))))))
-
-;; ----------------------------------------------------------------------------
-;; generic commands
-
-(defcommand (exit quit ex) "[<exit-code>]"
-  "exit racket"
-  ["Optional argument specifies exit code."]
-  (cond [(getarg 'sexpr 'opt) => exit] [else (exit)]))
-
-(define last-2dirs
-  (make-parameter (let ([d (current-directory)]) (cons d d))))
-(define (report-directory-change [mode #f])
-  (define curdir (current-directory))
-  (define (report) ; remove last "/" and say where we are
-    (define-values [base name dir?] (split-path curdir))
-    (printf "; now in ~a\n" (if base (build-path base name) curdir)))
-  (cond [(not (equal? (car (last-2dirs)) curdir))
-         (last-2dirs (cons curdir (car (last-2dirs))))
-         (report)]
-        [else (case mode
-                [(pwd) (report)]
-                [(cd)  (printf "; still in the same directory\n")])]))
-
-(defcommand cd "[<path>]"
-  "change the current directory"
-  ["Sets `current-directory'; expands user paths.  With no arguments, goes"
-   "to your home directory.  An argument of `-' indicates the previous"
-   "directory."]
-  (let* ([arg (or (getarg 'path 'opt) home-dir)]
-         [arg (if (equal? arg (string->path "-")) (cdr (last-2dirs)) arg)])
-    (if (directory-exists? arg)
-      (begin (current-directory arg) (report-directory-change 'cd))
-      (eprintf "; cd: no such directory: ~a\n" arg))))
-
-(defcommand pwd #f
-  "display the current directory"
-  ["Displays the value of `current-directory'."]
-  (report-directory-change 'pwd))
-
-(defcommand (shell sh ls cp mv rm md rd git svn) "<shell-command>"
-  "run a shell command"
-  ["`sh' runs a shell command (via `system'), the aliases run a few useful"
-   "unix commands.  (Note: `ls' has some default arguments set.)"
-   "If the REPL is inside some module's namespace, the command can use $F"
-   "which is set to the full path to this module's source file."]
-  (let* ([arg (getarg 'line)]
-         [arg (if (equal? "" arg) #f arg)]
-         [cmd (current-command)])
-    (case cmd
-      [(ls) (set! cmd "ls -F")]
-      [(shell) (set! cmd 'sh)])
-    (let ([cmd (cond [(eq? 'sh cmd) #f]
-                     [(symbol? cmd) (symbol->string cmd)]
-                     [else cmd])]
-          [here (here-path #f)])
-      (putenv "F" (if here (path->string here) ""))
-      (unless (system (cond [(and (not cmd) (not arg)) (getenv "SHELL")]
-                            [(not cmd) arg]
-                            [(not arg) cmd]
-                            [else (string-append cmd " " arg)]))
-        (eprintf "; (exit with an error status)\n"))
-      (when here (putenv "F" ""))
-      (void))))
-
-(defcommand (edit e) "<file> ..."
-  "edit files in your $EDITOR"
-  ["Runs your $EDITOR with the specified file/s.  If no files are given, and"
-   "the REPL is currently inside a module, the file for that module is used."
-   "If $EDITOR is not set, the ,drracket will be used instead."]
-  (define env (let ([e (getenv "EDITOR")]) (and (not (equal? "" e)) e)))
-  (define exe (and env (find-executable-path env)))
-  (cond [(not env)
-         (printf "~a, using the ,drracket command.\n"
-                 (if env
-                   (string-append "$EDITOR ("env") not found in your path")
-                   "no $EDITOR variable"))
-         (run-command 'drracket)]
-        [(not (apply system* exe (getarg 'path 'list #:default here-path)))
-         (eprintf "; (exit with an error status)\n")]
-        [else (void)]))
-
-(define ->running-dr #f)
-(define (->dr . xs) (unless ->running-dr (start-dr)) (->running-dr xs))
-(define (start-dr)
-  (printf "; starting DrRacket...\n")
-  (define c (make-custodian))
-  (define ns ((dynamic-require 'racket/gui 'make-gui-namespace)))
-  (parameterize ([current-custodian c]
-                 [current-namespace ns]
-                 [exit-handler (λ (x)
-                                 (eprintf "; DrRacket shutdown.\n")
-                                 (set! ->running-dr #f)
-                                 (custodian-shutdown-all c))])
-    ;; construct a kind of a fake sandbox to run drracket in
-    (define es
-      (eval '(begin (require racket/class racket/gui framework racket/file)
-                    (define es (make-eventspace))
-                    es)))
-    (define (E expr)
-      (parameterize ([current-custodian c]
-                     [current-namespace ns]
-                     [(eval 'current-eventspace ns) es])
-        (eval expr ns)))
-    (E '(begin
-          (define c (current-custodian))
-          (define-syntax-rule (Q expr ...)
-            (parameterize ([current-eventspace es])
-              (queue-callback
-               (λ () (parameterize ([current-custodian c]) expr ...)))))
-          ;; problem: right after we read commands, readline will save a new
-          ;; history in the prefs file which frequently collides with drr; so
-          ;; make it use a writeback thing, with silent failures.  (actually,
-          ;; this is more likely a result of previously starting drr wrongly,
-          ;; but keep this anyway.)
-          (let ([t (make-hasheq)] [dirty '()])
-            (preferences:low-level-get-preference
-             (λ (sym [dflt (λ () #f)])
-               (hash-ref t sym
-                 (λ () (let ([r (get-preference sym dflt)])
-                         (hash-set! t sym r)
-                         r)))))
-            (preferences:low-level-put-preferences
-             (λ (prefs vals)
-               (Q (set! dirty (append prefs dirty))
-                  (for ([pref (in-list prefs)] [val (in-list vals)])
-                    (hash-set! t pref val)))))
-            (define (flush-prefs)
-              (set! dirty (remove-duplicates dirty))
-              (with-handlers ([void void])
-                (put-preferences dirty (map (λ (p) (hash-ref t p)) dirty))
-                (set! dirty '())))
-            (exit:insert-on-callback flush-prefs)
-            (define (write-loop)
-              (sleep (random 4))
-              (when (pair? dirty) (Q (flush-prefs)))
-              (write-loop))
-            (define th (thread write-loop))
-            (exit:insert-on-callback (λ () (Q (kill-thread th)))))
-          ;; start it
-          (Q (dynamic-require 'drracket #f))
-          ;; hide the first untitled window, so drr runs in "server mode"
-          (Q (dynamic-require 'drracket/tool-lib #f))
-          (define top-window
-            (let ([ch (make-channel)])
-              (Q (let ([r (get-top-level-windows)])
-                   (channel-put ch (and (pair? r) (car r)))))
-              (channel-get ch)))
-          (Q (when top-window (send top-window show #f))
-             ;; and avoid trying to open new windows in there
-             (send (group:get-the-frame-group) clear))
-          ;; avoid being able to quit so the server stays running,
-          ;; also hack: divert quitting into closing all group frames
-          (define should-exit? #f)
-          (exit:insert-can?-callback
-           (λ () (or should-exit?
-                     (let ([g (group:get-the-frame-group)])
-                       (when (send g can-close-all?) (send g on-close-all))
-                       #f))))
-          (require drracket/tool-lib))) ; used as usual below
-    (define (new)
-      (E '(Q (drracket:unit:open-drscheme-window #f))))
-    (define open
-      (case-lambda
-        [() (E '(Q (handler:open-file)))]
-        [paths
-         (let ([paths (map path->string paths)])
-           (E `(Q (let ([f (drracket:unit:open-drscheme-window ,(car paths))])
-                    (send f show #t)
-                    ,@(for/list ([p (in-list (cdr paths))])
-                        `(begin (send f open-in-new-tab ,p)
-                                (send f show #t)))))))]))
-    (define (quit)
-      (E `(Q (set! should-exit? #t) (exit:exit))))
-    (define (loop)
-      (define m (thread-receive))
-      (if (pair? m)
-        (let ([proc (case (car m) [(new) new] [(open) open] [(quit) quit]
-                          [else (cmderror "unknown flag: -~a" (car m))])])
-          (if (procedure-arity-includes? proc (length (cdr m)))
-            (apply proc (cdr m))
-            (cmderror "bad number of arguments for the -~a flag" (car m))))
-        (error '->dr "internal error"))
-      (loop))
-    (define th (thread loop))
-    (set! ->running-dr (λ (xs) (thread-send th xs)))))
-(defcommand (drracket dr drr) "[-flag] <file> ..."
-  "edit files in DrRacket"
-  ["Runs DrRacket with the specified file/s.  If no files are given, and"
-   "the REPL is currently inside a module, the file for that module is used."
-   "DrRacket is launched directly, without starting a new subprocess, and it"
-   "is kept running in a hidden window so further invocations are immediate."
-   "In addition to file arguments, the arguments can have a flag that"
-   "specifies one of a few operations for the running DrRacket:"
-   "* -new: opens a new editing window.  This is the default when no files are"
-   "  given and the REPL is not inside a module,"
-   "* -open: opens the specified file/s (or the current module's file).  This"
-   "  is the default when files are given or when inside a module."
-   "* -quit: exits the running instance.  Quitting the application as usual"
-   "  will only close the visible window, but it will still run in a hidden"
-   "  window.  This command should not be needed under normal circumstances."]
-  (define args (getarg 'path 'list #:default here-path))
-  (if (null? args)
-    (->dr 'new)
-    (let* ([cmd (let ([s (path->string (car args))])
-                  (and (regexp-match? #rx"^-" s)
-                       (string->symbol (substring s 1))))]
-           [args (if cmd (cdr args) args)])
-      (apply ->dr (or cmd 'open) args))))
-
-;; ----------------------------------------------------------------------------
-;; binding related commands
-
-(defcommand (apropos ap) "<search-for> ..."
-  "look for a binding"
-  ["Additional arguments restrict the shown matches.  The search specs can"
-   "have symbols (which specify what to look for in bound names), and regexps"
-   "(for more complicated matches)."]
-  (let* ([look (map (λ (s) (cond [(symbol? s)
-                                  (regexp (regexp-quote (symbol->string s)))]
-                                 [(regexp? s) s]
-                                 [else (cmderror "bad search spec: ~e" s)]))
-                    (getarg 'sexpr 'list))]
-         [look (and (pair? look)
-                    (λ (str) (andmap (λ (rx) (regexp-match? rx str)) look)))]
-         [syms (map (λ (sym) (cons sym (symbol->string sym)))
-                    (namespace-mapped-symbols))]
-         [syms (if look (filter (λ (s) (look (cdr s))) syms) syms)]
-         [syms (sort syms string<? #:key cdr)]
-         [syms (map car syms)])
-    (with-wrapped-output
-      (if (null? syms)
-        (printf "; No matches found")
-        (begin (printf "; Matches: ~s" (car syms))
-               (for ([s (in-list (cdr syms))]) (printf ", ~s" s))))
-      (printf ".\n"))))
-
-(defcommand (describe desc id) "[<phase-number>] <identifier-or-module> ..."
-  "describe a (bound) identifier"
-  ["For a bound identifier, describe where is it coming from; for a known"
-   "module, describe its imports and exports.  You can use this command with"
-   "several identifiers.  An optional numeric argument specifies phase for"
-   "identifier lookup."]
-  (define-values [try-mods? level ids/mods]
-    (let ([xs (getarg 'syntax 'list)])
-      (if (and (pair? xs) (number? (syntax-e (car xs))))
-        (values #f (syntax-e (car xs)) (cdr xs))
-        (values #t 0 xs))))
-  (with-wrapped-output
-    (for ([id/mod (in-list ids/mods)])
-      (define dtm (syntax->datum id/mod))
-      (define mod (and try-mods? (known-module dtm 'path/sym)))
-      (define bind
-        (cond [(identifier? id/mod) (identifier-binding id/mod level)]
-              [mod #f]
-              [else (cmderror "not an identifier or a known module: ~s" dtm)]))
-      (define bind? (or bind (not mod)))
-      (when bind? (describe-binding dtm bind level))
-      (when mod
-        (parameterize (;; without this the reported paths are wrong
-                       [current-load-relative-directory
-                        (and (path? mod)
-                             (let-values ([(base name dir?) (split-path mod)])
-                               (and (path? base) base)))])
-          (describe-module dtm mod bind?))))))
-(define blueboxes-cache #f)
-(define (describe-binding sym b level)
-  (define at-phase (phase->name level " (~a)"))
-  (cond
-    [(not b)
-     (printf "; `~s' is a toplevel (or unbound) identifier~a\n" sym at-phase)]
-    [(eq? b 'lexical)
-     (printf "; `~s' is a lexical identifier~a\n" sym at-phase)]
-    [(or (not (list? b)) (not (= 7 (length b))))
-     (cmderror "*** internal error, racket changed ***")]
-    [else
-     (define-values [src-mod src-id nominal-src-mod nominal-src-id
-                     src-phase import-phase nominal-export-phase]
-       (apply values b))
-     (define tag
-       (xref-binding->definition-tag (load-collections-xref) b 0))
-     (unless blueboxes-cache (set! blueboxes-cache (make-blueboxes-cache #t)))
-     (define bluebox-strs
-       (and tag (fetch-blueboxes-strs tag #:blueboxes-cache blueboxes-cache)))
-     (set! src-mod         (->relname (mpi->name src-mod)))
-     (set! nominal-src-mod (->relname (mpi->name nominal-src-mod)))
-     (printf "; `~s' is a bound identifier~a,\n" sym at-phase)
-     (printf ";   defined~a in ~a~a\n" (phase->name src-phase "-~a") src-mod
-             (if (not (eq? sym src-id)) (format " as `~s'" src-id) ""))
-     (printf ";   required~a ~a\n" (phase->name import-phase "-~a")
-             (if (equal? src-mod nominal-src-mod)
-               "directly"
-               (format "through \"~a\"~a"
-                       nominal-src-mod
-                       (if (not (eq? sym nominal-src-id))
-                         (format " where it is defined as `~s'" nominal-src-id)
-                         ""))))
-     (printf "~a" (phase->name nominal-export-phase ";   (exported-~a)\n"))
-     (when bluebox-strs
-       (displayln ";   documentation:")
-       (for-each (λ (s) (display ";     ") (displayln s))
-                 bluebox-strs))]))
-(define (describe-module sexpr mod-path/sym also?)
-  (define get
-    (if (symbol? mod-path/sym)
-      (let ([spec `',mod-path/sym])
-        (λ (imp?) ((if imp? module->imports module->exports) spec)))
-      (let ([code (get-module-code mod-path/sym)])
-        (λ (imp?)
-          ((if imp? module-compiled-imports module-compiled-exports) code)))))
-  (define (phase<? p1 p2)
-    (cond [(eq? p1 p2) #f]
-          [(or (eq? p1 0) (not p2)) #t]
-          [(or (eq? p2 0) (not p1)) #f]
-          [(and (> p1 0) (> p2 0)) (< p1 p2)]
-          [(and (< p1 0) (< p2 0)) (> p1 p2)]
-          [else (> p1 0)]))
-  (define (modname<? x y)
-    (cond [(and (string? x) (string? y)) (string<? x y)]
-          [(and (symbol? x) (symbol? y))
-           (string<? (symbol->string x) (symbol->string y))]
-          [(and (symbol? x) (string? y)) #t]
-          [(and (string? x) (symbol? y)) #f]
-          [else (error 'describe-module "internal error: ~s, ~s" x y)]))
-  (define imports
-    (filter-map
-     (λ (x)
-       (and (pair? (cdr x))
-            (cons (car x) (sort (map (λ (m) (->relname (mpi->name m))) (cdr x))
-                                modname<?))))
-     (sort (get #t) phase<? #:key car)))
-  (define-values [val-exports stx-exports]
-    (let-values ([(vals stxs) (get #f)])
-      (define (get-directs l)
-        (filter-map
-         (λ (x)
-           (let ([directs (filter-map (λ (b) (and (null? (cadr b)) (car b)))
-                                      (cdr x))])
-             (and (pair? directs) (cons (car x) directs))))
-         (sort l phase<? #:key car)))
-      (values (get-directs vals) (get-directs stxs))))
-  (printf "; `~a' is~a a module,\n" sexpr (if also? " also" ""))
-  (let ([relname (->relname mod-path/sym)])
-    (printf ";   ~a~a\n"
-            (if (symbol? relname) "defined directly as '" "located at ")
-            relname))
-  (if (null? imports)
-    (printf ";   no imports.\n")
-    (for ([imps (in-list imports)])
-      (let ([phase (car imps)] [imps (cdr imps)])
-        (printf ";   imports~a: ~a" (phase->name phase "-~a") (car imps))
-        (for ([imp (in-list (cdr imps))]) (printf ", ~a" imp))
-        (printf ".\n"))))
-  (define (show-exports exports kind)
-    (for ([exps (in-list exports)])
-      (let ([phase (car exps)]
-            [exps (sort (cdr exps) string<? #:key symbol->string)])
-        (printf ";   direct ~a exports~a: ~a"
-                kind (phase->name phase "-~a") (car exps))
-        (for ([exp (in-list (cdr exps))]) (printf ", ~a" exp))
-        (printf ".\n"))))
-  (if (and (null? val-exports) (null? stx-exports))
-    (printf ";   no direct exports.\n")
-    (begin (show-exports val-exports "value")
-           (show-exports stx-exports "syntax"))))
-
-(define help-id (make-lazy-identifier 'help 'racket/help))
-(defcommand doc "<any> ..."
-  "browse the racket documentation"
-  ["Uses Racket's `help' to browse the documentation.  (Note that this can be"
-   "used even in languages that don't have the `help' binding.)"]
-  (eval-sexpr-for-user `(,(help-id) ,@(getarg 'syntax 'list))))
-
-;; ----------------------------------------------------------------------------
-;; require/load commands
-
-(defcommand (require req r) "<require-spec> ...+"
-  "require a module"
-  ["The arguments are usually passed to `require', unless an argument"
-   "specifies an existing filename -- in that case, it's like using a"
-   "\"string\" or a (file \"...\") in `require'.  (Note: this does not"
-   "work in subforms.)"]
-  (more-inputs #`(require #,@(getarg 'require 'list+)))) ; use *our* `require'
-
-(define rr-modules (make-hash)) ; hash to remember reloadable modules
-
-(define last-rr-modules '())
-
-(defcommand (require-reloadable reqr rr) "<module> ..."
-  "require a module, make it reloadable"
-  ["Same as ,require but the module is required in a way that makes it"
-   "possible to reload later.  If it was already loaded then it is reloaded."
-   "Note that this is done by setting `compile-enforce-module-constants' to"
-   "#f, which prohibits some optimizations."]
-  (let ([ms (getarg 'module 'list)])
-    (when (pair? ms) (set! last-rr-modules ms)))
-  (when (null? last-rr-modules) (cmderror "missing module argument(s)"))
-  (parameterize ([compile-enforce-module-constants
-                  (compile-enforce-module-constants)])
-    (compile-enforce-module-constants #f)
-    (for ([mod (in-list last-rr-modules)])
-      (define resolved ((current-module-name-resolver) mod #f #f #f))
-      (define path     (resolved-module-path-name resolved))
-      (define disp     (module-displayable-name mod))
-      (if (hash-ref rr-modules resolved #f)
-        ;; reload
-        (begin (printf "; reloading ~a\n" disp)
-               (parameterize ([current-module-declare-name resolved])
-                 (load/use-compiled path)))
-        ;; require
-        (begin (hash-set! rr-modules resolved #t)
-               (printf "; requiring ~a\n" disp)
-               ;; (namespace-require mod)
-               (eval #`(require #,mod)))))))
-
-(define enter!-id (make-lazy-identifier 'enter! 'racket/enter))
-
-(defcommand (enter en) "[<module>] [noisy?]"
-  "require a module and go into its namespace"
-  ["Uses `enter!' to go into the module's namespace.  A module name can"
-   "specify an existing file as with the ,require command.  If no module is"
-   "given, and the REPL is already in some module's namespace, then `enter!'"
-   "is used with that module, causing it to reload if needed.  (Note that this"
-   "can be used even in languages that don't have the `enter!' binding.)"]
-  (eval-sexpr-for-user `(,(enter!-id)
-                         ,(getarg 'module #:default here-mod-or-eof)
-                         ,@(getarg 'syntax 'list)
-                         #:dont-re-require-enter)))
-
-(defcommand (toplevel top) #f
-  "go back to the toplevel"
-  ["Go back to the toplevel, same as ,enter with no arguments."]
-  (eval-sexpr-for-user `(,(enter!-id) #f)))
-
-(defcommand (load ld) "<filename> ..."
-  "load a file"
-  ["Uses `load' to load the specified file(s)."]
-  (more-inputs* (map (λ (name) #`(load #,name)) (getarg 'path 'list))))
-
-;; ----------------------------------------------------------------------------
-;; debugging commands
-
-;; not useful: catches only escape continuations
-;; (define last-break-exn (make-parameter #f))
-;; (defcommand (continue cont) #f
-;;   "continue from a break"
-;;   ["Continue running from the last break."]
-;;   (if (last-break-exn)
-;;     ((exn:break-continuation (last-break-exn)))
-;;     (cmderror 'continue "no break exception to continue from")))
-
-(define last-backtrace #f)
-(defcommand (backtrace bt) #f
-  "see a backtrace of the last exception"
-  ["Display the last exception with its backtrace."]
-  (printf "; ~a\n"
-          (regexp-replace* #rx"\n+" (or last-backtrace "(no backtrace)")
-                           "\n; ")))
-
-(define time-id
-  (make-lazy-identifier 'time* 'unstable/time))
-(defcommand time "[<count>] <expr> ..."
-  "time an expression"
-  ["Times execution of an expression, similar to `time' but prints a"
-   "little easier to read information.  You can provide an initial number"
-   "that specifies how many times to run the expression -- in this case,"
-   "the expression will be executed that many times, extreme results are"
-   "removed (top and bottom 2/7ths), and the remaining results will be"
-   "averaged.  Two garbage collections are triggered before each run; the"
-   "resulting value(s) are from the last run."]
-  (more-inputs #`(#,(time-id) #,@(getarg 'syntax 'list))))
-
-(define trace-id (make-lazy-identifier 'trace 'racket/trace))
-(defcommand (trace tr) "<function> ..."
-  "trace a function"
-  ["Traces a function (or functions), using the `racket/trace' library."]
-  (eval-sexpr-for-user `(,(trace-id) ,@(getarg 'syntax 'list))))
-
-(define untrace-id (make-lazy-identifier 'untrace 'racket/trace))
-(defcommand (untrace untr) "<function> ..."
-  "untrace a function"
-  ["Untraces functions that were traced with ,trace."]
-  (eval-sexpr-for-user `(,(untrace-id) ,@(getarg 'syntax 'list))))
-
-(defautoload errortrace
-  profiling-enabled instrumenting-enabled clear-profile-results
-  output-profile-results execute-counts-enabled annotate-executed-file)
-
-(defcommand (errortrace errt inst) "[<flag>]"
-  "errortrace instrumentation control"
-  ["An argument is used to perform a specific operation:"
-   "  + : turn errortrace instrumentation on (effective only for code that is"
-   "      evaluated from now on)"
-   "  - : turn it off (also only for future evaluations)"
-   "  ? : show status without changing it"
-   "With no arguments, toggles instrumentation."]
-  (case (getarg 'sexpr 'opt)
-    [(#f) (if (autoloaded? 'errortrace)
-            (instrumenting-enabled (not (instrumenting-enabled)))
-            (instrumenting-enabled #t))]
-    [(-)  (when (autoloaded? 'errortrace) (instrumenting-enabled #f))]
-    [(+)  (instrumenting-enabled #t)]
-    [(?)  (void)]
-    [else (cmderror "unknown subcommand")])
-  (if (autoloaded? 'errortrace)
-    (printf "; errortrace instrumentation is ~a\n"
-            (if (instrumenting-enabled) "on" "off"))
-    (printf "; errortrace not loaded\n")))
-
-(define profile-id
-  (make-lazy-identifier 'profile 'profile))
-(define (statistical-profiler)
-  (more-inputs #`(#,(profile-id) #,(getarg 'syntax))))
-(define (errortrace-profiler)
-  (instrumenting-enabled #t)
-  (define flags (regexp-replace* #rx"[ \t]+" (getarg 'line) ""))
-  (for ([cmd (in-string (if (equal? "" flags)
-                          (if (profiling-enabled) "*!" "+")
-                          flags))])
-    (case cmd
-      [(#\+) (profiling-enabled #t) (printf "; profiling is on\n")]
-      [(#\-) (profiling-enabled #f) (printf "; profiling is off\n")]
-      [(#\*) (output-profile-results #f #t)]
-      [(#\#) (output-profile-results #f #f)]
-      [(#\!) (clear-profile-results) (printf "; profiling data cleared\n")]
-      [else (cmderror "unknown subcommand")])))
-(defcommand (profile prof) "[<expr> | <flag> ...]"
-  "profiler control"
-  ["Runs either the exact errortrace-based profiler, or the statistical one."
-   "* If a parenthesized expression is given, run the statistical profiler"
-   "  while running it.  This profiler requires no special setup and adds"
-   "  almost no overhead, it samples stack traces as execution goes on."
-   "* Otherwise the errortrace profiler is used.  This profiler produces"
-   "  precise results, but like other errortrace uses, it must be enabled"
-   "  before loading the code and it adds noticeable overhead.  In this case,"
-   "  an argument is used to determine a specific operation:"
-   "  + : turn the profiler on (effective only for code that is evaluated"
-   "      from now on)"
-   "  - : turn the profiler off (also only for future evaluations)"
-   "  * : show profiling results by time"
-   "  # : show profiling results by counts"
-   "  ! : clear profiling results"
-   "  Multiple flags can be combined, for example \",prof *!-\" will show"
-   "  profiler results, clear them, and turn it off."
-   "* With no arguments, turns the errortrace profiler on if it's off, and if"
-   "  it's on it shows the collected results and clears them."
-   "Note: using no arguments or *any* of the flags turns errortrace"
-   "  instrumentation on, even a \",prof -\".  Use the ,errortrace command if"
-   "  you want to turn instrumentation off."]
-  (if (memq (skip-spaces/peek) '(#\( #\[ #\{))
-    (statistical-profiler)
-    (errortrace-profiler)))
-
-(defcommand execution-counts "<file> ..."
-  "execution counts"
-  ["Enable errortrace instrumentation for coverage, require the file(s),"
-   "display the results, disables coverage, and disables instrumentation if"
-   "it wasn't previously turned on."]
-  (let ([files (getarg 'path 'list)]
-        [inst? (and (autoloaded? 'errortrace) (instrumenting-enabled))])
-    (more-inputs
-     (λ ()
-       (instrumenting-enabled #t)
-       (execute-counts-enabled #t))
-     #`(require #,@(map (λ (file) `(file ,(path->string file))) files))
-     (λ ()
-       (for ([file (in-list files)])
-         (annotate-executed-file file " 123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ")))
-     (λ ()
-       (execute-counts-enabled #f)
-       (unless inst? (instrumenting-enabled #f))))))
-
-(defautoload racket/sandbox
-  make-module-evaluator kill-evaluator call-with-trusted-sandbox-configuration
-  sandbox-coverage-enabled get-uncovered-expressions)
-
-(defcommand (coverage cover) "<file>"
-  "coverage information via a sandbox"
-  ["Runs the given file in a (trusted) sandbox, and annotates it with"
-   "uncovered expression information."]
-  (let ([file (getarg 'path)])
-    (sandbox-coverage-enabled) ; autoload it
-    (parameterize ([sandbox-coverage-enabled #t])
-      (define e
-        (call-with-trusted-sandbox-configuration
-         (λ () (make-module-evaluator file))))
-      (define uncovered
-        (map (λ (x) (let ([p (sub1 (syntax-position x))])
-                      (cons p (+ p (syntax-span x)))))
-             (get-uncovered-expressions e #t)))
-      (kill-evaluator e)
-      (call-with-input-file file
-        (λ (inp)
-          ;; this is a naive and inefficient solution, could be made efficient
-          ;; using `mzlib/integer-set'
-          (let loop ()
-            (let* ([start  (file-position inp)]
-                   [line   (read-line inp)]
-                   [len    (and (string? line) (string-length line))]
-                   [end    (and len (+ len start))]
-                   [indent (and len (regexp-match-positions #px"\\S" line))]
-                   [indent (and indent (caar indent))])
-              (when len
-                (displayln line)
-                (when indent
-                  (string-fill! line #\space)
-                  (for ([u (in-list uncovered)])
-                    (when (and ((car u) . < . end)
-                               ((cdr u) . > . indent))
-                      (for ([i (in-range (max (- (car u) start) indent)
-                                         (min (- (cdr u) start) len))])
-                        (string-set! line i #\^))))
-                  (displayln (regexp-replace #rx" +$" line "")))
-                (loop)))))))))
-
-;; ----------------------------------------------------------------------------
-;; namespace switching
-
-(define default-namespace-name '*)
-(define current-namespace-name (make-parameter default-namespace-name))
-(define namespaces
-  (let* ([r (namespace-symbol->identifier '#%top-interaction)]
-         [r (identifier-binding r)]
-         [r (and r (mpi->name (caddr r)))]
-         [t (make-hasheq)])
-    (hash-set! t (current-namespace-name) (cons (current-namespace) r))
-    t))
-(defcommand (switch-namespace switch) "[<name>] [? | - | ! [<init>]]"
-  "switch to a different repl namespace"
-  ["Switch to the <name> namespace, creating it if needed.  The <name> of a"
-   "namespace is a symbol or an integer; `*' indicates the initial namespace."
-   "These names are used only by this command, they're not bindings.  A new"
-   "namespace is initialized using the name of the namespace if it names a"
-   "module, or using the same initial module that was used for the current"
-   "namespace."
-   "If `! <init>' is used, the new namespace will be created even if it"
-   "exists, using `<init>' as the initial module.  If `!' is used without an"
-   "<init> to reset an existing namespace its initial module is used again,"
-   "and if it is used to create a new namespace, the initial module in current"
-   "namespace used."
-   "You can also use `-' and a name to drop the corresponding namespace"
-   "(allowing it to be garbage-collected), and `?' to list all known"
-   "namespaces."
-   "A few examples:"
-   "  ,switch !             reset the current namespace"
-   "  ,switch ! racket      reset it using the `racket' language"
-   "  ,switch r5rs          switch to a new `r5rs' namespace, initializing it"
-   "                        with `r5rs'"
-   "  ,switch foo           switch to `foo', creating it if it doesn't exist"
-   "  ,switch foo ! racket  switch to newly made `foo', even if it exists"
-   "  ,switch foo !         same, but using the same <init> as it was created"
-   "                        with, or as the current namespace if `foo' is new"
-   "  ,switch ?             list known namespaces and their initial modules"
-   "  ,switch - r5rs        drop the `r5rs' namespace"
-   "(Note that you can use `^' etc to communicate values between namespaces.)"]
-  (define (list-namespaces)
-    (printf "; namespaces and their languages:\n")
-    (define nss (sort (map (λ (x) (cons (format "~s" (car x)) (cddr x)))
-                           (hash-map namespaces cons))
-                      string<? #:key car))
-    (define maxlen (apply max (map (λ (x) (string-length (car x))) nss)))
-    (for ([x (in-list nss)])
-      (printf "; ~a:~a ~s\n"
-              (car x)
-              (make-string (- maxlen (string-length (car x))) #\space)
-              (cdr x))))
-  (define (delete name)
-    (when (eq? name default-namespace-name)
-      (cmderror "cannot drop the default namespace"))
-    (when (eq? name (current-namespace-name))
-      (cmderror "cannot drop the current namespace"))
-    (unless (hash-ref namespaces name #f)
-      (cmderror "unknown namespace name: ~s" name))
-    (hash-remove! namespaces name)
-    (printf "; namespace dropped: ~s\n" name))
-  (define (switch name force-reset? init)
-    (unless (or (not name) (symbol? name) (fixnum? name))
-      (cmderror "bad namespace name, must be symbol or fixnum"))
-    (define old-namespace (current-namespace))
-    ;; if there's an <init>, then it must be forced
-    (let* ([name (or name (current-namespace-name))]
-           [init
-            (cond [init]
-                  [(or force-reset? (not (hash-ref namespaces name #f)))
-                   (when (eq? name default-namespace-name)
-                     ;; no deep reason for this, but might be usful to keep it
-                     ;; possible to ,en xrepl/xrepl to change options etc
-                     (cmderror "cannot reset the default namespace"))
-                   (cdr (or (hash-ref namespaces name #f)
-                            (let ([k (known-module name)]) (and k (cons #f k)))
-                            (hash-ref namespaces (current-namespace-name) #f)
-                            ;; just in case
-                            (hash-ref namespaces default-namespace-name #f)))]
-                  [else #f])])
-      (when init
-        (printf "; *** ~a `~s' namespace with ~a ***\n"
-                (if (hash-ref namespaces name #f)
-                  "Resetting the" "Initializing a new")
-                name
-                (module-displayable-name init))
-        (current-namespace (make-base-empty-namespace))
-        (unless (known-module init)
-          (parameterize ([current-namespace old-namespace])
-            (dynamic-require init #f)) ; instantiate it if needed
-          (namespace-attach-module old-namespace init))
-        (namespace-require init)
-        (hash-set! namespaces name (cons (current-namespace) init))))
-    (when (and name (not (eq? name (current-namespace-name))))
-      (printf "; *** Switching to the `~s' namespace ***\n" name)
-      (let ([x (hash-ref namespaces (current-namespace-name))])
-        (unless (eq? (car x) old-namespace)
-          (printf "; (note: saving current namespace for `~s')\n"
-                  (current-namespace-name))
-          (hash-set! namespaces (current-namespace-name)
-                     (cons old-namespace (cdr x)))))
-      (current-namespace-name name)
-      (current-namespace (car (hash-ref namespaces name)))))
-  (define (syntax-error)
-    (cmderror "syntax error, see \",help ~s\"" (current-command)))
-  (match (getarg 'sexpr 'list)
-    [(list) (cmderror "what do you want to do?")]
-    [(list '?)           (list-namespaces)]
-    [(list '? _ ...)     (syntax-error)]
-    [(list '- name)      (delete name)]
-    [(list '- _ ...)     (syntax-error)]
-    [(list '!)           (switch #f   #t #f  )]
-    [(list '! init)      (switch #f   #t init)]
-    [(list name)         (switch name #f #f  )]
-    [(list name '!)      (switch name #t #f  )]
-    [(list name '! init) (switch name #t init)]
-    [_      (syntax-error)]))
-
-;; ----------------------------------------------------------------------------
-;; syntax commands
-
-(define current-syntax (make-parameter #f))
-(defautoload racket/pretty pretty-write)
-(defautoload macro-debugger/stepper-text expand/step-text)
-(define not-in-base
-  (λ () (let ([base-stxs #f])
-          (unless base-stxs
-            (set! base-stxs ; all ids that are bound to a syntax in racket/base
-                  (parameterize ([current-namespace hidden-namespace])
-                    (let-values ([(vals stxs) (module->exports 'racket/base)])
-                      (map (λ (s) (namespace-symbol->identifier (car s)))
-                           (cdr (assq 0 stxs)))))))
-          (λ (id) (not (ormap (λ (s) (free-identifier=? id s)) base-stxs))))))
-(define (macro-stepper . args)
-  (define-values [i o] (make-pipe))
-  (parameterize ([current-output-port o])
-    (thread (λ () (apply expand/step-text args) (close-output-port o))))
-  (let loop ()
-    (define l (read-line i))
-    (unless (eof-object? l)
-      ;; hack: beautify the stepper's output -- remove empty line, indent code
-      (unless (equal? "" l)
-        (printf (if (regexp-match? #px"^[A-Z][a-z]+\\b" l)
-                  "; ---- ~a ----\n" "; ~a\n")
-                l))
-      (loop))))
-(defcommand (syntax stx st) "[<expr>] [<flag> ...]"
-  "set syntax object to inspect, and control it"
-  ["With no arguments, will show the previously set (or expanded) syntax"
-   "additional arguments serve as an operation to perform:"
-   "- `^' sets the syntax from the last entered expression"
-   "- other sexprs set the current syntax explicitly"
-   "- `+' will `expand-once' the syntax and show the result (can be used again"
-   "      for additional `expand-once' steps)"
-   "- `!' will `expand' the syntax and show the result"
-   "- `*' will use the syntax stepper to show expansion steps, leaving macros"
-   "      from racket/base intact (does not change the currently set syntax)"
-   "- `**' similar to `*', but expanding everything"
-   "Note that you can specify several syntaxes and operations in a single"
-   "invocation."]
-  (define args (getarg 'syntax 'list))
-  (for ([stx (in-list (if (null? args) '(#f) args))])
-    (define (show/set label stx)
-      (printf "; ~a\n" label)
-      (current-syntax stx)
-      (display "; ") (pretty-write (syntax->datum stx)))
-    (define (cur) (or (current-syntax) (cmderror "no syntax set yet")))
-    (case (and stx (if (identifier? stx) (syntax-e stx) '--none--))
-      [(#f) (show/set "Current syntax:" (cur))]
-      [(^)  (if (last-input-syntax)
-              (show/set "Using last expression:" (last-input-syntax))
-              (cmderror "no expression entered yet"))]
-      [(+)  (show/set "expand-once ->" (expand-once (cur)))]
-      [(!)  (show/set "expand ->" (expand (cur)))]
-      [(*)  (printf "; Stepper:\n") (macro-stepper (cur) (not-in-base))]
-      [(**) (printf "; Stepper:\n") (macro-stepper (cur))]
-      [else
-       (if (syntax? stx)
-         (begin (printf "; Syntax set\n") (current-syntax stx))
-         (cmderror "internal error: ~s ~s" stx (syntax? stx)))])))
-
-(defautoload macro-debugger/analysis/check-requires show-requires)
-(defcommand (check-requires ckreq) "[<module>]"
-  "check the `require's of a module"
-  ["Uses `macro-debugger/analysis/check-requires', see the docs for more"
-   "information."]
-  (define mod (getarg 'module #:default here-mod-or-eof))
-  (define rs (show-requires mod))
-  (with-wrapped-output
-    (for ([decision (in-list '(keep bypass drop))])
-      (define all (filter (λ (x) (eq? decision (car x))) rs))
-      (unless (null? all)
-        (define names (map cadr all))
-        ;; doesn't print the phase number (third element of all members)
-        (printf "; ~a: ~a"
-                (string-titlecase (symbol->string decision)) (car names))
-        (for ([n (in-list (cdr names))]) (printf ", ~a" n))
-        (printf ".\n")))))
-
-;; ----------------------------------------------------------------------------
-;; dynamic log output control
-
-;; defautoload doesn't support keyword args
-(require racket/lazy-require)
-(lazy-require [racket/format (~a)])
-
-(define current-log-receiver-thread (make-parameter #f))
-(define global-logger (current-logger))
-(define other-level 'fatal) ;for "all other" loggers
-
-;; Default some specific loggers one notch above their "noisy"
-;; level. That way, if someone sets "all other" loggers to e.g. debug,
-;; these won't get noisy. They need to be cranked up explicitly.
-(define logger-levels (make-hasheq '([cm-accomplice . warning]
-                                     [gc . info])))
-
-(defcommand log "<opt> ..."
-  "control log output"
-  ["  ,log                  ;show the levels currently in effect."
-   "  ,log <logger> <level> ;set logger to show level"
-   "  ,log <logger> default ;set logger to use the default, 'all other' level."
-   "  ,log <level>          ;set the default level, for 'all other' loggers."
-   "  Valid levels: none, fatal, error, warning, info, debug."]
-  (define (update)
-    (show-logger-levels) ;handy to show new values
-    (cond [(current-log-receiver-thread) => kill-thread])
-    (let* ([args (append (list global-logger)
-                         (flatten (for/list ([(k v) logger-levels])
-                                    (list v k)))
-                         (list other-level))]
-           [r (apply make-log-receiver args)])
-      (current-log-receiver-thread
-       (thread
-        (λ ()
-           (let loop ()
-             (match (sync r)
-               [(vector l m v _)
-                (display (format "; [~a] ~a~a\n"
-                                 l m
-                                 ;; Print v unless opaque/useless
-                                 ;; "#<continuation-mark-set>"
-                                 (if (and v (not (continuation-mark-set? v)))
-                                     (format " ~.s" v) "")))
-                (flush-output)])
-             (loop)))))))
-  (define (show-logger-levels)
-    (define wid 20)
-    (define (pr k v)
-      (printf "; ~a ~a\n"
-              (~a k
-                  #:min-width wid
-                  #:max-width wid
-                  #:limit-marker "...")
-              v))
-    (pr "Logger" "Level")
-    (pr (make-string wid #\-) "-------")
-    (for ([(k v) logger-levels])
-      (pr k v))
-    (pr "[all other]" other-level))
-  (match (getarg 'sexpr 'list)
-    [(list) (show-logger-levels)]
-    [(list (and level (or 'none 'fatal 'error 'warning 'info 'debug)))
-     (set! other-level level)
-     (update)]
-    [(list logger 'default)
-     (hash-remove! logger-levels logger)
-     (update)]
-    [(list logger (and level (or 'none 'fatal 'error 'warning 'info 'debug)))
-     (hash-set! logger-levels logger level)
-     (update)]
-    [_ (cmderror "Bad argument. Enter \",help log\" for usage.")]))
-
-;; ----------------------------------------------------------------------------
-;; meta evaluation hook
-
-;; questionable value, (and need to display the resulting values etc)
-#;
-(defcommand meta "<expr>"
-  "meta evaluation"
-  ["Evaluate the given expression where bindings are taken from the xrepl"
-   "module.  This is convenient when you're in a namespace that does not have"
-   "a specific binding -- for example, you might be using a language that"
-   "doesn't have `current-namespace', so to get it, you can use"
-   "`,eval (current-namespace)'.  The evaluation happens in the repl namespace"
-   "as usual, only the bindings are taken from the xrepl module -- so you can"
-   "use `^' to refer to the result of such an evaluation."]
-  (eval (datum->syntax #'here `(#%top-interaction . ,(getarg 'sexpr))))
-  (void))
-
-;; ----------------------------------------------------------------------------
-;; setup xrepl in the user's racketrc file
-
-(define init-file (find-system-path 'init-file))
-(defcommand install! #f
-  "install xrepl in your Racket init file"
-  ["Installs xrepl in your Racket REPL initialization file.  This is done"
-   "carefully: I will tell you about the change, and ask for permission."
-   "You can then edit the file if you want to; in your system, you can find it"
-   ,(format "at \"~a\"." init-file)]
-  (define comment "The following line loads `xrepl' support")
-  (define expr  "(require xrepl)")
-  (define dexpr "(dynamic-require 'xrepl #f)")
-  (define contents (if (file-exists? init-file) (file->string init-file) ""))
-  ;; discard the newline for further input
-  (let loop () (when (byte-ready?) (read-byte)))
-  (define (look-for comment-rx expr)
-    (let ([m (regexp-match-positions
-              (format "(?<=\r?\n|^) *;+ *~a *\r?\n *~a *(?=\r?\n|$)"
-                      comment-rx (regexp-quote expr))
-              contents)])
-      (and m (car m))))
-  (define existing? (look-for (regexp-quote comment) expr))
-  (define existing-readline?
-    (look-for "load readline support[^\r\n]*" "(require readline/rep)"))
-  (define (yes? question)
-    (define qtext (string->bytes/utf-8 (format "; ~a? " question)))
-    (define inp
-      (case (object-name (current-input-port))
-        [(readline-input)
-         (parameterize ([(dynamic-require 'readline/pread 'readline-prompt)
-                         qtext])
-           (read-line))]
-        [else (write-bytes qtext) (flush-output) (read-line)]))
-    (and (string? inp) (regexp-match? #px"^[[:space:]]*[yY]" inp)))
-  (cond
-    [existing?
-     (printf "; already installed, nothing to do\n")
-     (when existing-readline?
-       (printf "; (better to remove the readline loading, xrepl does that)"))]
-    [(let ([m (regexp-match
-               (string-append (regexp-quote expr) "|" (regexp-quote dexpr))
-               contents)])
-       (and m (begin (printf "; found \"~a\", ~a\n"
-                             (car m) "looks like xrepl is already installed")
-                     (not (yes? "should I continue anyway")))))]
-    [else
-     (when existing-readline?
-       (printf "; found a `readline' loading line\n")
-       (if (yes? "xrepl will already do that, ok to remove")
-         (set! contents (string-append
-                         (substring contents 0 (car existing-readline?))
-                         (substring contents (cdr existing-readline?))))
-         (printf "; it will be kept ~a\n"
-                 "(you can edit the file and removing it later)")))
-     (printf "; writing new contents, with an added \"~a\"\n" expr)
-     (printf "; (if you want to load it conditionally, edit the file and\n")
-     (printf ";  use \"~a\" instead, which is a plain expression)\n" dexpr)
-     (if (yes? "OK to continue")
-       (begin
-         (call-with-output-file* init-file #:exists 'truncate
-           (λ (o) (define new (regexp-replace #rx"(?:\r?\n)+$" contents ""))
-                  (write-string new o)
-                  (unless (equal? "" new) (write-string "\n\n" o))
-                  (fprintf o ";; ~a\n~a\n" comment expr)))
-         (printf "; new contents written to ~a\n" init-file))
-       (printf "; ~a was not updated\n" init-file))])
-  (void))
-
-;; ----------------------------------------------------------------------------
-;; eval hook that keep track of recent evaluation results
-
-;; saved interaction values (can be #f to disable saving)
-(define saved-values (make-parameter '()))
-(define (save-values! xs)
-  (let* ([xs (filter (λ (x) (not (void? x))) xs)] ; don't save void values
-         [xs (map (λ (x) (and x (make-weak-box x))) xs)]) ; save weakly
-    (unless (null? xs)
-      ;; the order is last, 2nd-to-last, ..., same from prev interactions
-      ;; the idea is that `^', `^^', etc refer to the values as displayed
-      (saved-values (append (reverse xs) (saved-values)))
-      (let ([n (saved-values-number)] [l (saved-values)])
-        (when (< n (length l)) (saved-values (take l n)))))))
-
-(define last-saved-names+state (make-parameter '(#f #f #f)))
-(define (get-saved-names)
-  (define last       (last-saved-names+state))
-  (define last-num   (cadr last))
-  (define last-ptrns (caddr last))
-  (define cur-num    (saved-values-number))
-  (define cur-ptrns  (saved-values-patterns))
-  (if (and (equal? last-num cur-num) (equal? last-ptrns cur-ptrns))
-    (car last)
-    (let ([new
-           (for*/list ([i (in-range 1 (add1 (saved-values-number)))]
-                       [p (in-list cur-ptrns)])
-             (string->symbol
-              (cond
-                [(= 1 (string-length p)) (make-string i (string-ref p 0))]
-                [(regexp-match? #rx"^[^~]*~a[^~]*$" p) (format p i)]
-                [else (error 'saved-names "bad name pattern: ~e" p)])))])
-      (last-saved-names+state (list new cur-num cur-ptrns))
-      new)))
-
-;; see comment at the top of this module for the below hair
-(require xrepl/saved-values)
-
-;; make saved values available through bindings, but avoid names that
-;; already exist in the namespace (possibly from a previous initialization)
-(define (initialize-namespace)
-  ;; We might run into circularity problems, give up silently in that case
-  (when (with-handlers ([exn? (λ (_) #f)])
-          (namespace-attach-module (here-namespace) 'xrepl/saved-values)
-          (dynamic-require 'xrepl/saved-values (void))
-          #t)
-    ;; Hack: wire in our parameter for expansions (see comment in saved-values)
-    (eval-sexpr-for-user `(,#'set-saved-values-param! ,saved-values))
-    (for ([sym (in-list (get-saved-names))])
-      (define id (namespace-symbol->identifier sym))
-      (unless (identifier-binding id)
-        (eval-sexpr-for-user
-         `(,#'require (,#'only-in ,#'xrepl/saved-values
-                                  [,#'saved-value-ref ,id])))))))
-
-(require (for-syntax racket/base))
-(define ((make-xrepl-evaluator orig) expr)
-  ;; not useful: catches only escape continuations
-  ;;   (with-handlers ([exn:break? (λ (e) (last-break-exn e) (raise e))]) ...)
-  (if (saved-values)
-    (let ([results (call-with-values (λ () (orig expr)) list)])
-      (save-values! results)
-      (apply values results))
-    (orig expr)))
-
-;; ----------------------------------------------------------------------------
-;; capture ",..." and run the commands, use readline/rep when possible
-
-(define get-prefix ; to show before the "> " prompt
-  (let ()
-    (define (get-prefix)
-      (let* ([x (here-source)]
-             [x (and x (module-displayable-name (if (symbol? x) `',x x)))]
-             [x (or x (toplevel-prefix))]
-             [x (let ([ph (namespace-base-phase)])
-                  (if (eq? 0 ph) x (format "~a[~a]" x ph)))])
-        (if (eq? (current-namespace-name) default-namespace-name)
-          x (format "~a::~a" (current-namespace-name) x))))
-    (define last-directory #f)
-    (define last-namespace #f)
-    (define prefix #f)
-    (λ ()
-      (define curdir (current-directory))
-      (unless (and (equal? (current-namespace) last-namespace)
-                   (equal? curdir last-directory))
-        (report-directory-change)
-        (initialize-namespace)
-        (set! prefix
-              (with-handlers
-                  ([exn? (λ (e)
-                           (eprintf "; error during prompt calculation: ~a\n"
-                                    (exn-message e))
-                           "[internal-error]")])
-                (get-prefix)))
-        (set! last-namespace (current-namespace))
-        (set! last-directory curdir))
-      prefix)))
-
-;; the last non-command expression read
-(define last-input-syntax (make-parameter #f))
-
-(struct more-inputs (list)
-        #:constructor-name more-inputs* #:omit-define-syntaxes)
-(define (more-inputs . inputs) (more-inputs* inputs))
-
-(define (make-xrepl-reader orig)
-  (define (plain-reader prefix) ; a plain reader, without readline
-    (display prefix) (display "> ") (flush-output) (zero-column!)
-    (let ([in ((current-get-interaction-input-port))])
-      ((current-read-interaction) (object-name in) in)))
-  (define RL ; no direct dependency on readline
-    (with-handlers ([exn? (λ (_) #f)])
-      (collection-file-path "pread.rkt" "readline")))
-  (define (make-readline-reader)
-    (let ([p (dynamic-require RL 'current-prompt)]
-          [r (dynamic-require RL 'read-cmdline-syntax)])
-      (λ (prefix) ; uses the readline prompt
-        (parameterize ([p (bytes-append (string->bytes/locale prefix) (p))])
-          (r)))))
-  (define reader
-    (case (object-name (current-input-port))
-      [(stdin)
-       (if (or (not (terminal-port? (current-input-port)))
-               (eq? 'windows (system-type))
-               (regexp-match? #rx"^dumb" (or (getenv "TERM") ""))
-               (not RL))
-         plain-reader
-         (with-handlers ([exn?
-                          (λ (e)
-                            (eprintf "; Warning: no readline support (~a)\n"
-                                     (exn-message e))
-                            plain-reader)])
-           (dynamic-require 'readline/rep-start #f)
-           ;; requiring readline should have changed the reader
-           (if (eq? (current-prompt-read)
-                    (dynamic-require RL 'read-cmdline-syntax))
-             (make-readline-reader)
-             (begin (eprintf "; Warning: could not initialize readline\n")
-                    plain-reader))))]
-      [(readline-input)
-       (eprintf "; Note: readline already loaded\n~a\n"
-                ";   (better to let xrepl load it for you)")
-       (make-readline-reader)]
-      [else plain-reader]))
-  ;; IO management
-  (port-count-lines! (current-input-port))
-  ;; wrap the reader to get the command functionality
-  (define more-inputs '())
-  (define (reader-loop)
-    (parameterize ([saved-values #f])
-      (define from-queue? (pair? more-inputs))
-      (define input
-        (if from-queue?
-          (begin0 (car more-inputs) (set! more-inputs (cdr more-inputs)))
-          (begin (fresh-line) (reader (get-prefix)))))
-      (syntax-case input ()
-        [(uq cmd) (eq? 'unquote (syntax-e #'uq))
-         (let ([r (run-command (syntax->datum #'cmd))])
-           (cond [(void? r) (reader-loop)]
-                 [(more-inputs? r)
-                  (set! more-inputs (append (more-inputs-list r) more-inputs))
-                  (reader-loop)]
-                 [else (eprintf "; Warning: internal weirdness: ~s\n" r) r]))]
-        [_ (begin (unless from-queue? (last-input-syntax input)) input)])))
-  reader-loop)
-
-;; ----------------------------------------------------------------------------
-;; a display handler that omits stacktraces (making them available later)
-
-(define ((make-xrepl-display-handler orig) str exn)
-  (define backtrace?
-    (parameterize ([current-error-port (open-output-string)])
-      (orig str exn)
-      (let* ([s (get-output-string (current-error-port))]
-             [s (regexp-replace* #rx"^\n+|\n+$" s "")]
-             [s (regexp-replace* #rx"\n\n+" s "\n")])
-        ;; temporary hack: this is always on since it shows all fields,
-        ;; so ",bt" is now really a generic "more info"
-        (and ; (not (equal? str s))
-             (begin (set! last-backtrace s) #t)))))
-  (define msg "[,bt for context]")
-  (parameterize ([current-output-port (current-error-port)])
-    (let* ([s (regexp-replace* #rx"^\n+|\n+$" str "")]
-           [s (regexp-replace* #rx"\n\n+" s "\n")]
-           [s (regexp-replace* #rx"\n  [^\n]+\\.\\.\\.:(?:[^\n]+|\n   )+" s "")]
-           [s (regexp-replace* #rx"\n" s "\n; ")]
-           [s (if backtrace?
-                (string-append s (if (regexp-match? #rx"\n" s) "\n; " " ") msg)
-                s)])
-      (fresh-line #t)
-      (with-wrapped-output (printf "; ~a\n" s)))))
-
-;; ----------------------------------------------------------------------------
-;; set up the xrepl environment
-
-(provide setup-xrepl-environment)
-(define (setup-xrepl-environment)
-  (define (tweak param maker) (param (maker (param))))
-  (tweak error-display-handler make-xrepl-display-handler)
-  (tweak current-eval make-xrepl-evaluator)
-  (tweak current-prompt-read make-xrepl-reader))
diff --git a/pkgs/xrepl-pkgs/xrepl-test/LICENSE.txt b/pkgs/xrepl-pkgs/xrepl-test/LICENSE.txt
deleted file mode 100644
index 464a59b8a3..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-test/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-xrepl-test
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/xrepl-pkgs/xrepl-test/info.rkt b/pkgs/xrepl-pkgs/xrepl-test/info.rkt
deleted file mode 100644
index b49ff31902..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-test/info.rkt
+++ /dev/null
@@ -1,13 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '())
-(define build-deps '("at-exp-lib"
-                     "base"
-                     "eli-tester"
-                     "xrepl-lib"))
-(define update-implies '("xrepl-lib"))
-
-(define pkg-desc "tests for \"xrepl\"")
-
-(define pkg-authors '(eli))
diff --git a/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/known-module.rkt b/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/known-module.rkt
deleted file mode 100644
index 3f44e13c44..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/known-module.rkt
+++ /dev/null
@@ -1,61 +0,0 @@
-#lang racket/base
-
-(require xrepl/xrepl tests/eli-tester setup/dirs)
-
-(define known-module
-  (parameterize ([current-namespace (module->namespace 'xrepl/xrepl)])
-    (namespace-variable-value 'known-module)))
-
-(define-namespace-anchor a)
-(parameterize ([current-namespace (namespace-anchor->namespace a)])
-  (for-each eval '[(module top-module racket/base)
-                   (module version/utils racket/base)]))
-
-(define utils-path     (collection-file-path "utils.rkt" "version"))
-(define utils-pathstr  (path->string utils-path))
-(define base-path    (collection-file-path "base.rkt" "racket"))
-(define base-pathstr (path->string base-path))
-
-(provide test-known-module)
-(module+ main (test-known-module))
-(module+ test (test-known-module))
-(define (test-known-module)
-  (parameterize ([current-directory (find-collects-dir)])
-    (test
-     ;; normal mode
-     (known-module 'does-not-exist) => #f
-     (known-module ''top-module)  => ''top-module
-     (known-module 'top-module)   => ''top-module ; guesses the quoted name
-     (known-module ''#%kernel)    => ''#%kernel
-     (known-module '#%kernel)     => ''#%kernel   ; same here
-     (known-module 'racket/base)  => 'racket/base
-     (known-module ''racket/base) => #f ; the quoted name doesn't work
-     (known-module 'version/utils)    => 'version/utils ; symbol known, no guessing
-     (known-module ''version/utils)   => ''version/utils
-     (known-module "version/utils.rkt") => "version/utils.rkt"
-     (known-module `(file ,utils-pathstr)) => `(file ,utils-pathstr)
-     ;; path mode
-     (known-module 'does-not-exist 'path) => #f
-     (known-module ''top-module    'path) => #f
-     (known-module 'top-module     'path) => #f
-     (known-module ''#%kernel      'path) => #f
-     (known-module '#%kernel       'path) => #f
-     (known-module 'racket/base    'path) => base-path
-     (known-module ''racket/base   'path) => #f
-     (known-module 'version/utils      'path) => utils-path
-     (known-module ''version/utils     'path) => #f
-     (known-module "version/utils.rkt" 'path) => utils-path
-     (known-module `(file ,utils-pathstr) 'path) => utils-path
-     ;; path/sym mode
-     (known-module 'does-not-exist 'path/sym) => #f
-     (known-module ''top-module    'path/sym) => 'top-module
-     (known-module 'top-module     'path/sym) => 'top-module
-     (known-module ''#%kernel      'path/sym) => '#%kernel
-     (known-module '#%kernel       'path/sym) => '#%kernel
-     (known-module 'racket/base    'path/sym) => base-path
-     (known-module ''racket/base   'path/sym) => #f
-     (known-module 'version/utils      'path/sym) => utils-path
-     (known-module ''version/utils     'path/sym) => 'version/utils ; we have it too
-     (known-module "version/utils.rkt" 'path/sym) => utils-path
-     (known-module `(file ,utils-pathstr) 'path/sym) => utils-path
-     )))
diff --git a/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/main.rkt b/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/main.rkt
deleted file mode 100644
index 7043b7dd3a..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/main.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang at-exp racket/base
-
-(module test racket/base
-  (displayln "run as program for tests"))
-
-(require "xrepl.rkt" "wrapped-output.rkt" "known-module.rkt" tests/eli-tester)
-(test do (test-wrapped-output)
-      do (test-known-module)
-      do (test-xrepl))
diff --git a/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/wrapped-output.rkt b/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/wrapped-output.rkt
deleted file mode 100644
index 1ee3d0a7a9..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/wrapped-output.rkt
+++ /dev/null
@@ -1,42 +0,0 @@
-#lang at-exp racket/base
-
-(require tests/eli-tester xrepl/xrepl racket/string)
-(define-values [do-xrepl-wrapped-output wrap-width]
-  (parameterize ([current-namespace (module->namespace 'xrepl/xrepl)])
-    (apply values (map namespace-variable-value
-                       '(do-xrepl-wrapped-output wrap-width)))))
-
-(define (wrap . text)
-  (parameterize ([wrap-width 12]
-                 [current-output-port (open-output-string)])
-    ;; use "#"s in the input to avoid messing up highlighting in emacs
-    (do-xrepl-wrapped-output
-      (λ () (display (regexp-replace* #rx"#" (string-append* text) ";"))))
-    (regexp-replace* #rx";" (get-output-string (current-output-port)) "#")))
-
-(provide test-wrapped-output)
-(module+ main (test-wrapped-output))
-(module+ test (test-wrapped-output))
-(define (test-wrapped-output)
-  (define n "\n")
-  (define s string-append)
-  (define w wrap)
-  (test @w{blah}      => @s{blah}
-        @w{blah@n}    => @s{blah@n}
-        @w{#blah}     => @s{#blah}
-        @w{#blah@n}   => @s{#blah@n}
-        @w{#blah @n}  => @s{#blah@n}
-        @w{# blah@n}  => @s{# blah@n}
-        @w{# blah @n} => @s{# blah@n}
-        @w{#blah@|n|#blah@n}
-        => @s{#blah@|n|#blah@n}
-        @w{#ab cd ef gh ij kl mn op qr st}
-        => @s{#ab cd ef gh@|n|#  ij kl mn@|n|#  op qr st}
-        @w{#ab cd ef gh ij kl mn op qr st@n}
-        => @s{#ab cd ef gh@|n|#  ij kl mn@|n|#  op qr st@n}
-        @w{#ab@|n|#cd ef gh ij kl mn op qr st@n}
-        => @s{#ab@|n|#cd ef gh ij@|n|#  kl mn op@|n|#  qr st@n}
-        @w{#  ab@|n|#  cd ef gh ij kl mn op qr st@n}
-        => @s{#  ab@|n|#  cd ef gh@|n|#    ij kl@|n|#    mn op@|n|#    qr st@n}
-        @w{# ab@|n|# cd ef gh ij kl mn         op   qr st@n}
-        => @s{# ab@|n|# cd ef gh@|n|#   ij kl mn@|n|#   op   qr@|n|#   st@n}))
diff --git a/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/xrepl.rkt b/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/xrepl.rkt
deleted file mode 100644
index f43cc86a44..0000000000
--- a/pkgs/xrepl-pkgs/xrepl-test/tests/xrepl/xrepl.rkt
+++ /dev/null
@@ -1,211 +0,0 @@
-#lang at-exp racket/base
-
-;; General note for anyone who tries to run these tests: since the tests check
-;; interactions it can be hard to find the problem, and sometimes it's best to
-;; just comment a suffix of the tests to find it.  In addition, when it fails
-;; it tries to provide information that helps finding the problem, but
-;; sometimes there's very little help, and it might also fail by just getting
-;; stuck.
-
-(define verbose? (make-parameter #f))
-
-(define global-ns (current-namespace))
-
-(define stderr (current-error-port))
-
-(define ((make-xrepl-test . args))
-  (define show-all? (verbose?))
-  (define-values [Ii Io] (make-pipe))
-  (define-values [Oi Oo] (make-pipe))
-  (define repl-thread
-    (parameterize ([current-input-port  Ii]
-                   [current-output-port Oo]
-                   [current-error-port  Oo]
-                   [current-namespace (make-empty-namespace)]
-                   [exit-handler (λ (_) (kill-thread repl-thread))])
-      (thread (λ ()
-                (namespace-attach-module global-ns 'racket/base)
-                (namespace-require 'racket/init)
-                (dynamic-require 'xrepl #f)
-                (parameterize ([current-namespace
-                                (module->namespace 'xrepl/xrepl)])
-                  ((namespace-variable-value 'wrap-width) 77))
-                (read-eval-print-loop)))))
-  (define (repl-> expected)
-    (define output (read-string (string-length expected) Oi))
-    (if (equal? output expected)
-      (when show-all? (display output))
-      (error 'xrepl "test failure at interaction #~a, expected ~s, got ~s"
-             tests-num expected output)))
-  (define tests-num 0)
-  (let loop ([strs args] [input? #f])
-    (cond
-      [(and (pair? strs) (equal? "" (car strs)))
-       (loop (cdr strs) input?)]
-      [(and (thread-dead? repl-thread) (null? strs))
-       (printf "~a interaction tests passed\n" tests-num)]
-      [(thread-dead? repl-thread)
-       (error 'xrepl "test failure, repl thread died unexpectedly")]
-      [(null? strs)
-       (if (sync/timeout 1 repl-thread)
-         (loop strs input?)
-         (error 'xrepl "test failure, repl thread is alive at end of tests"))]
-      [(eq? '« (car strs))
-       (when input? (error 'xrepl "bad test: unterminated `«'"))
-       (set! tests-num (add1 tests-num))
-       (loop (cdr strs) #t)]
-      [(eq? '» (car strs))
-       (unless input? (error 'xrepl "bad test: redundant `»'"))
-       (loop (cdr strs) 'newline)]
-      [(regexp-match #rx"^(.*?)(?: *⇒[^\n]*)(.*)" (car strs))
-       => (λ (m) (loop (list* (cadr m) (caddr m) (cdr strs)) input?))]
-      [(regexp-match #rx"^(.*?)([«»])(.*)" (car strs))
-       => (λ (m) (loop (list* (cadr m) (string->symbol (caddr m)) (cadddr m)
-                              (cdr strs))
-                       input?))]
-      [(eq? 'newline input?)
-       (unless (regexp-match? #rx"^\n" (car strs))
-         (error 'xrepl "bad test: `»' followed by a non-newline"))
-       (newline Io) (flush-output Io)
-       (when show-all? (newline) (flush-output))
-       (loop (cons (substring (car strs) 1) (cdr strs)) #f)]
-      [input?
-       (display (car strs) Io)
-       (when show-all? (display (car strs)) (flush-output))
-       (loop (cdr strs) #t)]
-      [else
-       (repl-> (car strs))
-       (loop (cdr strs) #f)])))
-
-(require setup/dirs)
-(define tmp (path->string (find-system-path 'temp-dir)))
-(define collects (path->string (find-collects-dir)))
-
-(define tmp-no-slash (let-values ([(base name dir?) (split-path tmp)])
-                       (path->string (build-path base name))))
-
-(provide test-xrepl)
-(module+ main (test-xrepl))
-(define test-xrepl @make-xrepl-test{
-  -> «^»
-  ; ^: no saved values, yet [,bt for context]
-  -> «(- 2 1)»
-  1
-  -> «^^»
-  ; ^^: no 2 saved values, yet [,bt for context]
-  -> «(values 2 3)»
-  2
-  3
-  -> «(values 4)»
-  4
-  -> «(list ^ ^^ ^^^ ^^^^)»
-  '(4 3 2 1)
-  -> «(list $1 $2 $3 $4 $5)»
-  '((4 3 2 1) 4 3 2 1)
-  -> «(collect-garbage)»
-  -> «^»
-  ; ^: saved value #1 was garbage-collected [,bt for context]
-  -> «(module foo racket (define x 123))»
-  -> «,en foo»
-  'foo> «x»
-  123
-  'foo> «,top»
-  -> «(define enter! 123)»
-  -> «(enter! 'foo)»
-  ; application: not a procedure;
-  ;  expected a procedure that can be applied to arguments
-  ;   given: 123
-  ; [,bt for context]
-  -> «(enter! 'fooo)»
-  ; application: not a procedure;
-  ;  expected a procedure that can be applied to arguments
-  ;   given: 123
-  ; [,bt for context]
-  -> «,en foo»                          ⇒ but this still works
-  'foo> «,top»
-  -> «,switch foo»
-  ; *** Initializing a new `foo' namespace with 'foo ***
-  ; *** Switching to the `foo' namespace ***
-  foo::-> «,switch typed/racket»
-  ; *** Initializing a new `typed/racket' namespace with typed/racket ***
-  ; *** Switching to the `typed/racket' namespace ***
-  typed/racket::-> «^»                  ⇒ works in TR too
-  - : Integer [more precisely: Positive-Byte]
-  123
-  typed/racket::-> «,switch *»
-  ; *** Switching to the `*' namespace ***
-  -> «bleh»
-  ; bleh: undefined;
-  ;  cannot reference undefined identifier
-  ; [,bt for context]
-  -> «,ap BLEH»
-  ; No matches found.
-  -> «,ap path->»
-  ; Matches: path->bytes, path->complete-path, path->directory-path,
-  ;   path->string, some-system-path->string.
-  -> «,desc cons»
-  ; `cons' is a bound identifier,
-  ;   defined in #%kernel
-  ;   required through "<collects>/racket/init.rkt"
-  -> «,desc lambda»
-  ; `lambda' is a bound identifier,
-  ;   defined in <collects>/racket/private/kw.rkt as `new-lambda'
-  ;   required through "<collects>/racket/init.rkt"
-  -> «,desc racket/runtime-path»
-  ; `racket/runtime-path' is a module,
-  ;   located at <collects>/racket/runtime-path.rkt
-  ;   imports: <collects>/racket/base.rkt, <collects>/racket/list.rkt,
-  ;     <collects>/racket/private/runtime-path-table.rkt,
-  ;     <collects>/racket/private/this-expression-source-directory.rkt,
-  ;     <collects>/setup/dirs.rkt.
-  ;   imports-for-syntax: <collects>/racket/base.rkt.
-  ;   direct syntax exports: define-runtime-module-path,
-  ;     define-runtime-module-path-index, define-runtime-path,
-  ;     define-runtime-path-list, define-runtime-paths, runtime-paths,
-  ;     runtime-require.
-  -> «(current-directory "/( none )")»  ⇒ racket allows this
-  ; now in /( none )                    ⇒ reports without ,cd
-  -> «,cd @|tmp|»
-  ; now in @tmp-no-slash
-  -> «,desc scribble/html»
-  ; `scribble/html' is a module,
-  ;   located at <pkgs>/scribble-html-lib/scribble/html.rkt
-  ;   imports: <collects>/racket/base.rkt,
-  ;     <pkgs>/scribble-html-lib/scribble/html/main.rkt.
-  ;   no direct exports.
-  -> «(module broken racket/base (define foo 123) (error "bleh!"))»
-  -> «,en broken»
-  bleh!                                 ⇒ threw an error...
-  'broken> «foo»
-  123                                   ⇒ ...but we still got in
-  'broken> «,top»
-  -> «string->jsexpr»
-  ; string->jsexpr: undefined;
-  ;  cannot reference undefined identifier
-  ; [,bt for context]
-  -> «,r (only-in json string->jsexpr)» ⇒ works with an expression
-  -> «string->jsexpr»
-  #<procedure:string->jsexpr>
-  -> «jsexpr->string»                   ⇒ didn't get this
-  ; jsexpr->string: undefined;
-  ;  cannot reference undefined identifier
-  ; [,bt for context]
-  -> «,en json»
-  <collects>/json/main> «,sh echo $F»
-  @|collects|/json/main.rkt
-  <collects>/json/main> «,top»
-  -> «(display-to-file "#lang racket\n(provide x)\n(define x 1)\n"
-                       "xrepl-test.rkt" #:exists 'truncate)»
-  -> «,rr "xrepl-test.rkt"»             ⇒ first load
-  ; requiring "xrepl-test.rkt"
-  -> «x»
-  1
-  -> «(display-to-file "#lang racket\n(provide x)\n(define x 2)\n"
-                       "xrepl-test.rkt" #:exists 'truncate)»
-  -> «,rr xrepl-test.rkt»
-  ; reloading "xrepl-test.rkt"
-  -> «,rm xrepl-test.rkt»
-  -> «x»
-  2
-  -> «,ex»
-  @||})
diff --git a/pkgs/xrepl-pkgs/xrepl/LICENSE.txt b/pkgs/xrepl-pkgs/xrepl/LICENSE.txt
deleted file mode 100644
index 7e2b8e469b..0000000000
--- a/pkgs/xrepl-pkgs/xrepl/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-xrepl
-Copyright (c) 2010-2014 PLT Design Inc.
-
-This package is distributed under the GNU Lesser General Public
-License (LGPL).  This means that you can link this package into proprietary
-applications, provided you follow the rules stated in the LGPL.  You
-can also modify this package; if you distribute a modified version,
-you must distribute it under the terms of the LGPL, which in
-particular means that you must release the source code for the
-modified software.  See http://www.gnu.org/copyleft/lesser.html
-for more information.
diff --git a/pkgs/xrepl-pkgs/xrepl/info.rkt b/pkgs/xrepl-pkgs/xrepl/info.rkt
deleted file mode 100644
index cdb572ba2c..0000000000
--- a/pkgs/xrepl-pkgs/xrepl/info.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-(define deps '("xrepl-lib"
-               "xrepl-doc"))
-(define implies '("xrepl-lib"
-                  "xrepl-doc"))
-
-(define pkg-desc "Console-oriented extended REPL for Racket")
-
-(define pkg-authors '(eli))
diff --git a/racket/src/link-all.rkt b/racket/src/link-all.rkt
index 6e743fdfa7..32688f3ffc 100644
--- a/racket/src/link-all.rkt
+++ b/racket/src/link-all.rkt
@@ -184,7 +184,8 @@
                                 (equal? dep "racket")))
            dep))))
     (if (set-empty? new-pkgs)
-        all-pkgs
+        all-pkgs all-pkgs
+        #;
         (loop (set-union new-pkgs all-pkgs) new-pkgs))))
 
 (define (is-auto? name) (not (set-member? pkgs name)))
@@ -228,7 +229,8 @@
 (void
  (parameterize ([current-pkg-scope (path->complete-path devel-pkgs-dir)])
    (with-pkg-lock
-    (pkg-install (for/list ([name (in-list (sort (set->list all-pkgs)
+    (pkg-install #:dep-behavior 'force
+                 (for/list ([name (in-list (sort (set->list all-pkgs)
                                                  ;; Non-auto before auto:
                                                  (lambda (a b)
                                                    (cond